diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml
new file mode 100644
index 0000000000..cb0079a868
--- /dev/null
+++ b/.azure-pipelines/azure-pipelines.yml
@@ -0,0 +1,674 @@
+# azure-pipelines.yml
+# CI pipeline for SerialPrograms
+
+trigger: none
+pr: none
+
+resources:
+  repositories:
+    - repository: Arduino-Source-Internal
+      type: github
+      name: PokemonAutomation/Arduino-Source-Internal
+      endpoint: PokemonAutomation
+
+    - repository: Packages
+      type: github
+      name: PokemonAutomation/Packages
+      endpoint: PokemonAutomation
+
+variables:
+  - group: apple-signing
+  - group: github
+  - group: discord-symbols
+  - group: telemetry
+  - group: alarm_clock
+  - group: artifacts
+
+parameters:
+  - name: buildType
+    displayName: Build Type
+    type: string
+    default: Commit
+    values: [Commit, Release, Beta, PrivateBeta]
+
+  - name: targetOS
+    displayName: Target OS
+    type: string
+    default: All
+    values: [All, Windows, Linux, MacOS]
+
+  - name: versionMajor
+    displayName: Version Major
+    type: number
+    default: 0
+
+  - name: versionMinor
+    displayName: Version Minor
+    type: number
+    default: 0
+
+  - name: versionPatch
+    displayName: Version Patch
+    type: number
+    default: 0
+
+stages:
+
+###########################################
+#        SET VERSION BUILD NUMBER         #
+###########################################
+
+- stage: Set_Build_Number
+  displayName: 'Set Build Number'
+  dependsOn: []
+  condition: succeeded()
+
+  jobs:
+    - job: SetVersion
+      displayName: 'Set Build Number to Version'
+      timeoutInMinutes: 10
+      pool:
+        vmImage: ubuntu-latest
+
+      steps:
+        - script: |
+            VERSION="v${{ parameters.versionMajor }}.${{ parameters.versionMinor }}.${{ parameters.versionPatch }}"
+            echo "Setting build number to $VERSION"
+            echo "##vso[build.updatebuildnumber]$VERSION"
+            echo "##vso[build.addbuildtag]${{ parameters.buildType }}"
+          displayName: 'Set Build Number to Version'
+
+###########################################
+#             WAKE SIGNAL                 #
+###########################################
+- template: templates/sleep-wake-signal.yml
+  parameters:
+    stageName: Sleep_Wake_Signal
+    displayName: 'Send Wake Signal'
+    dependsOn: Set_Build_Number
+    poolName: AlarmClock
+    action: Wake
+    condition: |
+        and(
+          succeeded(),
+          or(
+            eq('${{ parameters.targetOS }}', 'Windows'),
+            eq('${{ parameters.targetOS }}', 'Linux'),
+            eq('${{ parameters.targetOS }}', 'All')
+          )
+        )
+
+###########################################
+#         WINDOWS BUILD JOB               #
+###########################################
+
+- stage: Windows_Build_x64
+  displayName: Windows Build x64
+  dependsOn:
+    - Sleep_Wake_Signal
+  condition: and(succeeded(), or(eq('${{ parameters.targetOS }}', 'Windows'), eq('${{ parameters.targetOS }}', 'All')))
+
+  jobs:
+  - job: Windows
+    timeoutInMinutes: 45
+    cancelTimeoutInMinutes: 1
+    displayName: Windows
+
+    strategy:
+      matrix:
+        MSVC:
+          poolName: 'WindowsPool'
+          imageName: 'windows-2025'
+          architecture: 'x64'
+          compiler: 'MSVC'
+          qt_version: '6.10.2'
+          qt_version_major: '6'
+          qt_modules: 'qtserialport qtmultimedia'
+          cmake_preset: 'Publish'
+          cmake_version_params: '-DVERSION_MAJOR=${{ parameters.versionMajor }} -DVERSION_MINOR=${{ parameters.versionMinor }} -DVERSION_PATCH=${{ parameters.versionPatch }} -DIS_BETA=${{ lower(eq(parameters.buildType, ''PrivateBeta'')) }}'
+          cmake_additional_param: '-DCMAKE_PREFIX_PATH=C:/Qt/$(qt_version)/msvc2022_64/lib/cmake -DIS_AZURE_BUILD=TRUE'
+
+    pool:
+      name: $(poolName)
+
+    steps:
+      - template: templates/checkout.yml
+
+      - task: BatchScript@1
+        inputs:
+          filename: 'C:/Program Files (x86)/Microsoft Visual Studio/2022/BuildTools/Common7/Tools/VsDevCmd.bat'
+          arguments: '-arch=x64'
+          modifyEnvironment: true
+        displayName: 'Initialize VS Environment'
+        condition: succeeded()
+
+      - script: |
+          cd /d "$(Pipeline.Workspace)/Arduino-Source-Internal/Repository/Public/SerialPrograms"
+          cmake --preset=$(cmake_preset) $(cmake_additional_param) $(cmake_version_params)
+        displayName: 'Configure CMake'
+        condition: succeeded()
+
+      - script: |
+          cd /d "$(Pipeline.Workspace)/Arduino-Source-Internal/Repository/Public/SerialPrograms"
+          cmake --build --preset=$(cmake_preset) -j 16
+        displayName: 'Build'
+        condition: succeeded()
+
+      - powershell: |
+          $BUILD_DIR = "$(Pipeline.Workspace)/Arduino-Source-Internal/Repository/Public/build/$(cmake_preset)/Output"
+
+          $cmdContent = @'
+          cd %~dp0
+
+          if not exist Binaries64\ (
+              echo.
+              echo Please unzip the folder before you can use it.
+              echo.
+              pause
+              exit
+          )
+
+          if not exist Binaries64\SerialPrograms.exe (
+              echo.
+              echo Binaries\SerialPrograms.exe not found. Did your anti-virus delete it?
+              echo.
+              pause
+              exit
+          )
+
+          start "" Binaries64\SerialPrograms.exe
+          '@
+
+          Set-Content -Path "$BUILD_DIR/SerialPrograms-Windows.cmd" -Value $cmdContent -Encoding ASCII
+          Write-Host "=== Created SerialPrograms-Windows.cmd launcher ==="
+        displayName: 'Create launcher script'
+        condition: succeeded()
+
+      - powershell: |
+          echo "=== Cleaning up and moving to build cache ==="
+          $BUILD_DIR = "$(Pipeline.Workspace)/Arduino-Source-Internal/Repository/Public/build/$(cmake_preset)/Output"
+          $BUILD_CACHE = "$(Pipeline.Workspace)/Arduino-Source-Internal/Repository/Public/build/$(cmake_preset)/cache-build"
+          $SYMBOLS_CACHE = "$(Pipeline.Workspace)/Arduino-Source-Internal/Repository/Public/build/$(cmake_preset)/cache-symbols"
+
+          New-Item -ItemType Directory -Force -Path $BUILD_CACHE | Out-Null
+          New-Item -ItemType Directory -Force -Path $SYMBOLS_CACHE | Out-Null
+
+          function Invoke-Robocopy {
+              robocopy @args
+              if ($LASTEXITCODE -ge 8) {
+                  throw "Robocopy failed with exit code: $LASTEXITCODE"
+              }
+          }
+
+          Write-Host "=== Excluding unnecessary files from deployment ==="
+          Remove-Item -Path "$BUILD_DIR/Binaries64/opencv_world4120d.dll" -ErrorAction SilentlyContinue
+          Remove-Item -Path "$BUILD_DIR/Binaries64/translations"          -Recurse -Force -ErrorAction SilentlyContinue
+          Remove-Item -Path "$BUILD_DIR/Binaries64/generic"               -Recurse -Force -ErrorAction SilentlyContinue
+          Remove-Item -Path "$BUILD_DIR/Scripts"                          -Recurse -Force -ErrorAction SilentlyContinue
+          Invoke-Robocopy    $BUILD_DIR/Binaries64   $SYMBOLS_CACHE        SerialPrograms.pdb
+          Remove-Item -Path "$BUILD_DIR/Binaries64/SerialPrograms.pdb"    -ErrorAction SilentlyContinue
+          Invoke-Robocopy    $BUILD_DIR              $BUILD_CACHE          /s
+
+          exit 0
+        displayName: 'Clean up, move to build cache'
+        condition: succeeded()
+
+      - powershell: |
+          $root = "$(Pipeline.Workspace)/Arduino-Source-Internal/Repository/Public/build/$(cmake_preset)"
+          $version = "${{ parameters.versionMajor }}.${{ parameters.versionMinor }}.${{ parameters.versionPatch }}"
+          $folderName = "SerialPrograms-$version-Windows-$(architecture)"
+          $name = "SerialPrograms-Windows-$(compiler)-$(architecture)"
+          $buildType = "${{ parameters.buildType }}"
+
+          Write-Host "=== Creating enclosing folder: $folderName ==="
+          $finalFolder = Join-Path $root $folderName
+          Rename-Item "$root/cache-build" $finalFolder
+
+          New-Item -ItemType Directory -Force -Path "$root/cache-build" | Out-Null
+          $zipPath = Join-Path $root "cache-build/$name.zip"
+          if ($buildType -eq "PrivateBeta") {
+              Write-Host "=== Creating password-protected archive ==="
+              & "C:/Program Files/7-Zip/7z.exe" a -tzip -mx=9 "-p$env:ARTIFACT_PASSWORD" -mem=AES256 $zipPath "$finalFolder"
+          } else {
+              Write-Host "=== Creating archive ==="
+              & "C:/Program Files/7-Zip/7z.exe" a -tzip -mx=9 $zipPath "$finalFolder"
+          }
+          if ($LASTEXITCODE -ne 0) {
+              throw "7-Zip failed with exit code: $LASTEXITCODE"
+          }
+          Write-Host "=== Archive created ==="
+        displayName: 'Archive Windows build artifact'
+        condition: succeeded()
+        env:
+          ARTIFACT_PASSWORD: $(ARTIFACT_PASSWORD)
+
+      - task: Cache@2
+        displayName: 'Cache build artifact for GitHub release'
+        inputs:
+          key: 'windows-build | "$(Build.BuildId)"'
+          path: '$(Pipeline.Workspace)/Arduino-Source-Internal/Repository/Public/build/$(cmake_preset)/cache-build'
+        condition: and(succeeded(), eq('${{ parameters.targetOS }}', 'All'), or(eq('${{ parameters.buildType }}', 'Release'), eq('${{ parameters.buildType }}', 'Beta')))
+
+      - task: Cache@2
+        displayName: 'Cache debug symbols'
+        inputs:
+          key: 'windows-symbols | "$(Build.BuildId)"'
+          path: '$(Pipeline.Workspace)/Arduino-Source-Internal/Repository/Public/build/$(cmake_preset)/cache-symbols'
+        condition: succeeded()
+
+      - task: PublishPipelineArtifact@1
+        displayName: 'Publish Windows artifact (PrivateBeta)'
+        inputs:
+          targetPath: '$(Pipeline.Workspace)/Arduino-Source-Internal/Repository/Public/build/$(cmake_preset)/cache-build/SerialPrograms-Windows-$(compiler)-$(architecture).zip'
+          artifactName: 'SerialPrograms-Windows-$(compiler)-$(architecture)'
+          publishLocation: 'pipeline'
+        condition: and(succeeded(), eq('${{ parameters.buildType }}', 'PrivateBeta'))
+
+      - task: PublishPipelineArtifact@1
+        displayName: 'Publish Windows artifact'
+        inputs:
+          targetPath: '$(Pipeline.Workspace)/Arduino-Source-Internal/Repository/Public/build/$(cmake_preset)/SerialPrograms-${{ parameters.versionMajor }}.${{ parameters.versionMinor }}.${{ parameters.versionPatch }}-Windows-$(architecture)'
+          artifactName: 'SerialPrograms-Windows-$(compiler)-$(architecture)'
+          publishLocation: 'pipeline'
+        condition: and(succeeded(), ne('${{ parameters.buildType }}', 'PrivateBeta'))
+
+###########################################
+#         LINUX BUILD JOB                 #
+###########################################
+
+- stage: Linux_Build_x64
+  displayName: Linux Build x64
+  dependsOn:
+    - Sleep_Wake_Signal
+  condition: and(succeeded(), or(eq('${{ parameters.targetOS }}', 'Linux'), eq('${{ parameters.targetOS }}', 'All')))
+
+  jobs:
+  - job: Ubuntu
+    timeoutInMinutes: 45
+    cancelTimeoutInMinutes: 1
+    displayName: Ubuntu
+
+    strategy:
+      matrix:
+        GCC:
+          poolName: 'LinuxPool'
+          imageName: 'ubuntu-24.04'
+          architecture: 'x64'
+          compiler: 'GCC'
+          qt_version: '6.10.2'
+          qt_version_major: '6'
+          qt_modules: 'qtserialport qtmultimedia'
+          cmake_preset: 'RelWithDebInfo'
+          linux_path: '/opt/Qt/$(qt_version)/gcc_64/lib/cmake:/opt/Qt/$(qt_version)/gcc_64/bin:/opt/Qt/$(qt_version)/gcc_64/plugins:$PATH'
+          cmake_version_params: '-DVERSION_MAJOR=${{ parameters.versionMajor }} -DVERSION_MINOR=${{ parameters.versionMinor }} -DVERSION_PATCH=${{ parameters.versionPatch }} -DIS_BETA=${{ lower(eq(parameters.buildType, ''PrivateBeta'')) }}'
+          cmake_additional_param: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DIS_AZURE_BUILD=TRUE'
+
+    pool:
+      name: $(poolName)
+
+    steps:
+      - template: templates/checkout.yml
+
+      - script: |
+          export PATH=$(linux_path)
+          cd "$(Pipeline.Workspace)/Arduino-Source-Internal/Repository/Public/SerialPrograms"
+          cmake --preset=$(cmake_preset) $(cmake_additional_param) $(cmake_version_params)
+        displayName: 'Configure CMake'
+        condition: succeeded()
+
+      - script: |
+          export PATH=$(linux_path)
+          cd "$(Pipeline.Workspace)/Arduino-Source-Internal/Repository/Public/SerialPrograms"
+          cmake --build --preset=$(cmake_preset) -j 16
+        displayName: 'Build'
+        condition: succeeded()
+
+      - script: |
+          set -e
+          export PATH=$(linux_path)
+          BUILD_DIR="$(Pipeline.Workspace)/Arduino-Source-Internal/Repository/Public/build/$(cmake_preset)"
+
+          echo "=== Extracting debug symbols ==="
+          cd "$BUILD_DIR"
+          objcopy --only-keep-debug SerialPrograms SerialPrograms.debug
+          objcopy --strip-debug SerialPrograms
+          objcopy --add-gnu-debuglink=SerialPrograms.debug SerialPrograms
+          mkdir -p "$(Pipeline.Workspace)/Arduino-Source-Internal/Repository/Public/build/$(cmake_preset)/cache-symbols"
+          mv SerialPrograms.debug "$(Pipeline.Workspace)/Arduino-Source-Internal/Repository/Public/build/$(cmake_preset)/cache-symbols/SerialPrograms.debug"
+          echo "=== Debug symbols extracted to SerialPrograms.debug ==="
+        displayName: 'Extract Debug Symbols'
+        condition: succeeded()
+
+      - script: |
+          set -e
+          export LINUXDEPLOY_DISABLE_APPSTREAM=1
+          export PATH=$(linux_path)
+          BUILD_DIR="$(Pipeline.Workspace)/Arduino-Source-Internal/Repository/Public/build/$(cmake_preset)"
+          SRC_DIR="$(Pipeline.Workspace)/Arduino-Source-Internal/Repository/Public"
+          APP_DIR="$BUILD_DIR/AppDir"
+          BUILD_CACHE_DIR="$(Pipeline.Workspace)/Arduino-Source-Internal/Repository/Public/build/$(cmake_preset)/cache-build"
+
+          echo "=== Clean AppDir ==="
+          rm -rf "$APP_DIR"
+          mkdir -p "$APP_DIR"
+          mkdir -p "$APP_DIR/usr/bin"
+          mkdir -p "$APP_DIR/usr/lib"
+          mkdir -p "$APP_DIR/usr/share/applications"
+          mkdir -p "$APP_DIR/usr/share/icons/hicolor/256x256/apps"
+          mkdir -p "$BUILD_CACHE_DIR"
+
+          echo "=== Moving resources ==="
+          mkdir -p "$APP_DIR/usr/plugins/iconengines"
+          cp -a "/opt/Qt/$(qt_version)/gcc_64/plugins/iconengines/" "$APP_DIR/usr/plugins/iconengines/"
+
+          mkdir -p "$APP_DIR/usr/share/metainfo"
+          cp "$SRC_DIR/IconResource/SerialPrograms.desktop" "$APP_DIR/usr/share/applications/"
+          cp "$SRC_DIR/IconResource/SerialPrograms.png" "$APP_DIR/usr/share/icons/hicolor/256x256/apps/"
+          cp "$SRC_DIR/IconResource/SerialPrograms.appdata.xml" "$APP_DIR/usr/share/metainfo/"
+          cp "$BUILD_DIR/SerialPrograms" "$APP_DIR/usr/bin"
+          cp "$SRC_DIR/3rdPartyBinaries/dpp-cacert.pem" "$APP_DIR/usr/bin/"
+
+          echo "=== Extracting Discord Social SDK ==="
+          DISCORD_ZIP="$SRC_DIR/3rdPartyBinaries/discord_social_sdk_linux.zip"
+          DISCORD_DIR="$SRC_DIR/3rdPartyBinaries/discord_social_sdk_linux"
+          rm -rf "$DISCORD_DIR"
+          mkdir -p "$DISCORD_DIR"
+          unzip -q "$DISCORD_ZIP" -d "$SRC_DIR/3rdPartyBinaries"
+          DISCORD_SO="$DISCORD_DIR/lib/release/libdiscord_partner_sdk.so"
+
+          echo "=== Downloading linuxdeploy, Qt plugin, gstreamer plugin ==="
+          cd "$BUILD_DIR"
+          wget -nv https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage
+          wget -nv https://github.com/linuxdeploy/linuxdeploy-plugin-qt/releases/download/continuous/linuxdeploy-plugin-qt-x86_64.AppImage
+          wget -nv https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage
+          wget -nv https://raw.githubusercontent.com/linuxdeploy/linuxdeploy-plugin-gstreamer/master/linuxdeploy-plugin-gstreamer.sh
+          chmod +x linuxdeploy-*.AppImage
+          chmod +x appimagetool-x86_64.AppImage
+          chmod +x linuxdeploy-plugin-gstreamer.sh
+
+          echo "=== Copying Wayland platform plugins ==="
+          mkdir -p "$APP_DIR/usr/plugins/platforms"
+          cp /opt/Qt/$(qt_version)/gcc_64/plugins/platforms/libqwayland*.so \
+             "$APP_DIR/usr/plugins/platforms/" 2>/dev/null || true
+
+          mkdir -p "$APP_DIR/usr/plugins/wayland-decoration-client"
+          cp -a /opt/Qt/$(qt_version)/gcc_64/plugins/wayland-decoration-client/. \
+             "$APP_DIR/usr/plugins/wayland-decoration-client/" 2>/dev/null || true
+
+          mkdir -p "$APP_DIR/usr/plugins/wayland-graphics-integration-client"
+          cp -a /opt/Qt/$(qt_version)/gcc_64/plugins/wayland-graphics-integration-client/. \
+             "$APP_DIR/usr/plugins/wayland-graphics-integration-client/" 2>/dev/null || true
+
+          mkdir -p "$APP_DIR/usr/plugins/wayland-shell-integration"
+          cp -a /opt/Qt/$(qt_version)/gcc_64/plugins/wayland-shell-integration/. \
+             "$APP_DIR/usr/plugins/wayland-shell-integration/" 2>/dev/null || true
+
+          echo "=== Running linuxdeploy to package AppImage ==="
+          export QMAKE="/opt/Qt/$(qt_version)/gcc_64/bin/qmake"
+          export EXTRA_QT_PLUGINS="multimedia;waylandcompositor"
+          ./linuxdeploy-x86_64.AppImage \
+              --appdir "$APP_DIR" \
+              -d "$APP_DIR/usr/share/applications/SerialPrograms.desktop" \
+              -i "$APP_DIR/usr/share/icons/hicolor/256x256/apps/SerialPrograms.png" \
+              -e "$APP_DIR/usr/bin/SerialPrograms" \
+              -l "$DISCORD_SO" \
+              -p qt \
+              -p gstreamer \
+              -v 3
+
+          echo "=== Removing unnecessary Qt files ==="
+          rm -rf "$APP_DIR/usr/translations"
+
+          echo "=== Patching AppRun to force GStreamer backend ==="
+          sed -i '2i export PA_APPIMAGE_DIR=$(cd "$(dirname "$APPIMAGE")" && pwd)' "$APP_DIR/AppRun"
+          sed -i '2i export QT_MEDIA_BACKEND=gstreamer' "$APP_DIR/AppRun"
+          sed -i '2i if [ -n "$WAYLAND_DISPLAY" ] && [ -z "$QT_QPA_PLATFORM" ]; then export QT_QPA_PLATFORM=wayland; elif [ -z "$QT_QPA_PLATFORM" ]; then export QT_QPA_PLATFORM=xcb; fi' "$APP_DIR/AppRun"
+
+          echo "=== Packaging AppImage ==="
+          ./appimagetool-x86_64.AppImage AppDir
+          rm linuxdeploy-*.AppImage
+          rm appimagetool-x86_64.AppImage
+
+          echo "=== Archive Linux AppImage ==="
+          VERSION="${{ parameters.versionMajor }}.${{ parameters.versionMinor }}.${{ parameters.versionPatch }}"
+          FOLDER_NAME="SerialPrograms-$VERSION-Ubuntu-x64"
+          BUILD_TYPE="${{ parameters.buildType }}"
+
+          mkdir -p "$FOLDER_NAME"
+          mv "SerialPrograms-x86_64.AppImage" "$FOLDER_NAME/SerialPrograms.AppImage"
+          chmod +x "$FOLDER_NAME/SerialPrograms.AppImage"
+          cp -a "$SRC_DIR/Packages/Firmware/" "$FOLDER_NAME/"
+          cp -a "$SRC_DIR/Packages/Resources/" "$FOLDER_NAME/"
+
+          if [ "$BUILD_TYPE" != "Commit" ]; then
+              ZIP_NAME="SerialPrograms-Ubuntu-$(compiler)-$(architecture).zip"
+              rm -rf "$BUILD_CACHE_DIR"/*
+              if [ "$BUILD_TYPE" = "PrivateBeta" ]; then
+                  echo "=== Creating password-protected archive ==="
+                  7z a -tzip -mx=9 "-p$ARTIFACT_PASSWORD" -mem=AES256 "$BUILD_CACHE_DIR/$ZIP_NAME" "$FOLDER_NAME"
+              else
+                  echo "=== Creating archive ==="
+                  7z a -tzip -mx=9 "$BUILD_CACHE_DIR/$ZIP_NAME" "$FOLDER_NAME"
+              fi
+              echo "=== Archive created ==="
+          else
+              echo "=== Skipping archive creation for Commit build ==="
+          fi
+        displayName: 'Deploy AppImage'
+        condition: succeeded()
+        env:
+          ARTIFACT_PASSWORD: $(ARTIFACT_PASSWORD)
+
+      - task: Cache@2
+        displayName: 'Cache build artifact for GitHub release'
+        inputs:
+          key: 'ubuntu-build | "$(Build.BuildId)"'
+          path: '$(Pipeline.Workspace)/Arduino-Source-Internal/Repository/Public/build/$(cmake_preset)/cache-build'
+        condition: and(succeeded(), eq('${{ parameters.targetOS }}', 'All'), or(eq('${{ parameters.buildType }}', 'Release'), eq('${{ parameters.buildType }}', 'Beta')))
+
+      - task: Cache@2
+        displayName: 'Cache debug symbols'
+        inputs:
+          key: 'ubuntu-symbols | "$(Build.BuildId)"'
+          path: '$(Pipeline.Workspace)/Arduino-Source-Internal/Repository/Public/build/$(cmake_preset)/cache-symbols'
+        condition: succeeded()
+
+      - task: PublishPipelineArtifact@1
+        displayName: 'Publish Linux artifact (PrivateBeta)'
+        inputs:
+          targetPath: '$(Pipeline.Workspace)/Arduino-Source-Internal/Repository/Public/build/$(cmake_preset)/cache-build/SerialPrograms-Ubuntu-$(compiler)-$(architecture).zip'
+          artifactName: 'SerialPrograms-Linux-$(compiler)-$(architecture)'
+          publishLocation: 'pipeline'
+        condition: and(succeeded(), eq('${{ parameters.buildType }}', 'PrivateBeta'))
+
+      - task: PublishPipelineArtifact@1
+        displayName: 'Publish Linux artifact'
+        inputs:
+          targetPath: '$(Pipeline.Workspace)/Arduino-Source-Internal/Repository/Public/build/$(cmake_preset)/SerialPrograms-${{ parameters.versionMajor }}.${{ parameters.versionMinor }}.${{ parameters.versionPatch }}-Ubuntu-x64'
+          artifactName: 'SerialPrograms-Linux-$(compiler)-$(architecture)'
+          publishLocation: 'pipeline'
+        condition: and(succeeded(), ne('${{ parameters.buildType }}', 'PrivateBeta'))
+
+###########################################
+#           MACOS BUILD STAGES            #
+###########################################
+
+- template: templates/macos-build.yml
+  parameters:
+    stageName: MacOS_Build_ARM64
+    displayName: 'MacOS Build ARM64'
+    dependsOnStage: Set_Build_Number
+    buildType: ${{ parameters.buildType }}
+    targetOS: ${{ parameters.targetOS }}
+    poolName: ApplePool
+    imageName: macos-26
+    architecture: arm64
+    compiler: Clang
+    qt_version: '6.10.2'
+    qt_version_major: '6'
+    qt_modules: 'qtserialport qtmultimedia'
+    cmake_preset: RelWithDebInfo
+    macos_path: '/opt/Qt/6.10.2/macos/lib/cmake:/opt/Qt/6.10.2/macos/bin:/opt/homebrew/bin:/opt/homebrew/sbin:/opt/homebrew:$PATH'
+    openssl_pkcs_args: '-legacy'
+    cmake_version_params: '-DVERSION_MAJOR=${{ parameters.versionMajor }} -DVERSION_MINOR=${{ parameters.versionMinor }} -DVERSION_PATCH=${{ parameters.versionPatch }} -DIS_BETA=${{ lower(eq(parameters.buildType, ''PrivateBeta'')) }}'
+    cmake_additional_param: '-DPACKAGE_BUILD=true -DIS_AZURE_BUILD=TRUE'
+    versionMajor: ${{ parameters.versionMajor }}
+    versionMinor: ${{ parameters.versionMinor }}
+    versionPatch: ${{ parameters.versionPatch }}
+    condition: and(succeeded(), or(eq('${{ parameters.targetOS }}', 'MacOS'), eq('${{ parameters.targetOS }}', 'All')))
+
+- template: templates/macos-build.yml
+  parameters:
+    stageName: MacOS_Build_x64
+    displayName: 'MacOS Build x64'
+    dependsOnStage: Set_Build_Number
+    buildType: ${{ parameters.buildType }}
+    targetOS: ${{ parameters.targetOS }}
+    poolName: ApplePool
+    imageName: macos-15
+    architecture: x64
+    compiler: Clang
+    qt_version: '6.10.2'
+    qt_version_major: '6'
+    qt_modules: 'qtserialport qtmultimedia'
+    cmake_preset: RelWithDebInfo
+    macos_path: '/usr/local/Qt/6.10.2/macos/lib/cmake:/usr/local/Qt/6.10.2/macos/bin:/usr/local/bin:/usr/local/sbin:/usr/local:$PATH'
+    openssl_pkcs_args: '-legacy'
+    cmake_version_params: '-DVERSION_MAJOR=${{ parameters.versionMajor }} -DVERSION_MINOR=${{ parameters.versionMinor }} -DVERSION_PATCH=${{ parameters.versionPatch }} -DIS_BETA=${{ lower(eq(parameters.buildType, ''PrivateBeta'')) }}'
+    cmake_additional_param: '-DPACKAGE_BUILD=true -DIS_AZURE_BUILD=TRUE'
+    versionMajor: ${{ parameters.versionMajor }}
+    versionMinor: ${{ parameters.versionMinor }}
+    versionPatch: ${{ parameters.versionPatch }}
+    condition: and(succeeded(), or(eq('${{ parameters.targetOS }}', 'MacOS'), eq('${{ parameters.targetOS }}', 'All')))
+
+##########################################
+#          UPLOAD DEBUG SYMBOLS          #
+##########################################
+
+- template: templates/upload-symbols.yml
+  parameters:
+    stageName: Upload_Debug_Symbols
+    displayName: 'Upload Debug Symbols'
+    dependsOn:
+      - Windows_Build_x64
+      - Linux_Build_x64
+      - MacOS_Build_ARM64
+      - MacOS_Build_x64
+    platforms:
+      - Windows
+      - Linux
+      - MacOS_ARM64
+      - MacOS_x64
+    poolName: WindowsPool
+    buildType: ${{ parameters.buildType }}
+    versionMajor: ${{ parameters.versionMajor }}
+    versionMinor: ${{ parameters.versionMinor }}
+    versionPatch: ${{ parameters.versionPatch }}
+    condition: succeeded()
+
+###########################################
+#              SLEEP SIGNAL               #
+###########################################
+- template: templates/sleep-wake-signal.yml
+  parameters:
+    stageName: Sleep_Wake_Signal2
+    displayName: 'Send Sleep Signal'
+    dependsOn:
+      - Upload_Debug_Symbols
+    poolName: AlarmClock
+    action: Sleep
+    condition: |
+        and(
+          in(dependencies.Sleep_Wake_Signal.result, 'Succeeded'),
+          or(
+            eq('${{ parameters.targetOS }}', 'Windows'),
+            eq('${{ parameters.targetOS }}', 'Linux'),
+            eq('${{ parameters.targetOS }}', 'All')
+          )
+        )
+
+##########################################
+#          ARTIFACT VALIDATION           #
+##########################################
+
+- stage: Manual_Validation
+  displayName: 'Manual Validation'
+  dependsOn:
+    - Upload_Debug_Symbols
+  condition: and(succeeded(), eq('${{ parameters.targetOS }}', 'All'), ne('${{ parameters.buildType }}', 'Commit'))
+  jobs:
+    - job: ManualValidation
+      displayName: 'Manual Validation'
+      pool: server
+      timeoutInMinutes: 1440
+      steps:
+        - task: ManualValidation@0
+          timeoutInMinutes: 1440
+          inputs:
+            notifyUsers: '$(Build.RequestedForEmail)'
+            instructions: 'Please validate the build artifacts for each platform. Approve to proceed or reject to fail the pipeline.'
+            onTimeout: 'reject'
+
+##########################################
+#         UPDATE TELEMETRY JSON          #
+##########################################
+
+- template: templates/update-github-telemetry.yml
+  parameters:
+    stageName: Update_GitHub_Telemetry_JSON
+    displayName: 'Update GitHub Telemetry JSON'
+    dependsOn:
+      - Manual_Validation
+    buildType: ${{ parameters.buildType }}
+    versionMajor: ${{ parameters.versionMajor }}
+    versionMinor: ${{ parameters.versionMinor }}
+    versionPatch: ${{ parameters.versionPatch }}
+    telemetryRepo: PokemonAutomation/ServerConfigs-PA-SHA
+    condition: and(succeeded(), eq('${{ parameters.targetOS }}', 'All'), ne('${{ parameters.buildType }}', 'Commit'))
+
+##########################################
+#        PUBLISH GITHUB RELEASE          #
+##########################################
+
+- template: templates/github-release.yml
+  parameters:
+    stageName: Publish_GitHub_Release
+    displayName: 'Publish GitHub Release'
+    dependsOn:
+      - Update_GitHub_Telemetry_JSON
+      - Manual_Validation
+    platforms:
+      - Windows
+      - Linux
+      - MacOS_ARM64
+      - MacOS_x64
+    buildType: ${{ parameters.buildType }}
+    versionMajor: ${{ parameters.versionMajor }}
+    versionMinor: ${{ parameters.versionMinor }}
+    versionPatch: ${{ parameters.versionPatch }}
+    targetRepo: PokemonAutomation/ComputerControl
+    condition: and(succeeded(), eq('${{ parameters.targetOS }}', 'All'), or(eq('${{ parameters.buildType }}', 'Release'), eq('${{ parameters.buildType }}', 'Beta')))
+
+##########################################
+#      UPDATE LATEST VERSION JSON        #
+##########################################
+
+- template: templates/update-github-version.yml
+  parameters:
+    stageName: Update_GitHub_Latest_Version_JSON
+    displayName: 'Update GitHub Latest Version JSON'
+    dependsOn:
+      - Publish_GitHub_Release
+      - Manual_Validation
+    buildType: ${{ parameters.buildType }}
+    versionMajor: ${{ parameters.versionMajor }}
+    versionMinor: ${{ parameters.versionMinor }}
+    versionPatch: ${{ parameters.versionPatch }}
+    versionRepo: PokemonAutomation/ComputerControl
+    condition: |
+      and(
+        in(dependencies.Manual_Validation.result, 'Succeeded'),
+        in(dependencies.Publish_GitHub_Release.result, 'Succeeded', 'Skipped'),
+        eq('${{ parameters.targetOS }}', 'All'),
+        ne('${{ parameters.buildType }}', 'Commit')
+      )
diff --git a/.azure-pipelines/templates/checkout.yml b/.azure-pipelines/templates/checkout.yml
new file mode 100644
index 0000000000..86e1706000
--- /dev/null
+++ b/.azure-pipelines/templates/checkout.yml
@@ -0,0 +1,18 @@
+# templates/checkout.yml
+# Template for checking out the Arduino-Source repositories
+
+steps:
+  - checkout: Arduino-Source-Internal
+    path: Arduino-Source-Internal
+    fetchDepth: 1
+    persistCredentials: true
+    sparseCheckoutPatterns: |
+      /*
+      !Repository/Public/*
+      !Repository/Deployment-SerialPrograms-Qt6.10.2-MSVC2022/
+      !Repository/Deployment-SerialPrograms-Qt6.8.3-MSVC2022/
+    workspaceRepo: true
+
+  - checkout: self
+    path: Arduino-Source-Internal/Repository/Public
+    persistCredentials: true
diff --git a/.azure-pipelines/templates/github-release.yml b/.azure-pipelines/templates/github-release.yml
new file mode 100644
index 0000000000..83a8e4cf9c
--- /dev/null
+++ b/.azure-pipelines/templates/github-release.yml
@@ -0,0 +1,387 @@
+# templates/github-release.yml
+# Template for publishing releases to GitHub
+
+parameters:
+  stageName: ''
+  displayName: ''
+  dependsOn: []
+  platforms: []
+  buildType: ''
+  targetRepo: ''
+  versionMajor: 0
+  versionMinor: 0
+  versionPatch: 0
+  condition: ''
+
+stages:
+  - stage: ${{ parameters.stageName }}
+    displayName: ${{ parameters.displayName }}
+    dependsOn: ${{ parameters.dependsOn }}
+    condition: ${{ parameters.condition }}
+
+    jobs:
+      - job: CreateRelease
+        displayName: 'Create GitHub Release'
+        pool:
+          vmImage: ubuntu-latest
+
+        variables:
+          - name: VERSION_TAG
+            value: 'v${{ parameters.versionMajor }}.${{ parameters.versionMinor }}.${{ parameters.versionPatch }}'
+          - name: VERSION_NUMBER
+            value: '${{ parameters.versionMajor }}.${{ parameters.versionMinor }}.${{ parameters.versionPatch }}'
+          - name: IS_PRERELEASE
+            value: ${{ eq(parameters.buildType, 'Beta') }}
+          - name: BUILD_DATE
+            value: $[format('{0:yyyy}{0:MM}{0:dd}', pipeline.startTime)]
+
+        steps:
+          - checkout: none
+
+          - task: Cache@2
+            displayName: 'Restore Windows Artifacts'
+            inputs:
+              key: 'windows-build | "$(Build.BuildId)"'
+              path: '$(Pipeline.Workspace)/artifacts-windows'
+              cacheHitVar: WINDOWS_CACHE_RESTORED
+            condition: and(succeeded(), contains('${{ join(',', parameters.platforms) }}', 'Windows'))
+
+          - task: Cache@2
+            displayName: 'Restore Linux Artifacts'
+            inputs:
+              key: 'ubuntu-build | "$(Build.BuildId)"'
+              path: '$(Pipeline.Workspace)/artifacts-linux'
+              cacheHitVar: LINUX_CACHE_RESTORED
+            condition: and(succeeded(), contains('${{ join(',', parameters.platforms) }}', 'Linux'))
+
+          - task: Cache@2
+            displayName: 'Restore MacOS ARM64 Artifacts'
+            inputs:
+              key: 'macos-notarized-arm64 | "$(Build.BuildId)"'
+              path: '$(Pipeline.Workspace)/artifacts-macos-arm64'
+              cacheHitVar: MACOS_ARM64_CACHE_RESTORED
+            condition: and(succeeded(), contains('${{ join(',', parameters.platforms) }}', 'MacOS_ARM64'))
+
+          - task: Cache@2
+            displayName: 'Restore MacOS x64 Artifacts'
+            inputs:
+              key: 'macos-notarized-x64 | "$(Build.BuildId)"'
+              path: '$(Pipeline.Workspace)/artifacts-macos-x64'
+              cacheHitVar: MACOS_X64_CACHE_RESTORED
+            condition: and(succeeded(), contains('${{ join(',', parameters.platforms) }}', 'MacOS_x64'))
+
+          - script: |
+              type -p curl >/dev/null || (sudo apt update && sudo apt install curl -y)
+              curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg
+              sudo chmod go+r /usr/share/keyrings/githubcli-archive-keyring.gpg
+              echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null
+              sudo apt update
+              sudo apt install gh -y
+              gh --version
+            displayName: 'Install GitHub CLI'
+            condition: succeeded()
+
+          - script: |
+              echo "$(GITHUB_TOKEN)" | gh auth login --with-token
+              gh auth status
+            displayName: 'Authenticate with GitHub'
+            condition: succeeded()
+            env:
+              GITHUB_TOKEN: $(GITHUB_PAT)
+
+          - script: |
+              REPO="${{ parameters.targetRepo }}"
+              echo "Fetching ChangeLog.md from $REPO..."
+
+              gh api repos/$REPO/contents/ChangeLog.md --jq '.content' | base64 -d > changelog-raw.md
+              if [ ! -s changelog-raw.md ]; then
+                echo "✗ Failed to fetch ChangeLog.md or file is empty"
+                exit 1
+              fi
+
+              echo "✓ ChangeLog.md fetched successfully"
+              cat changelog-raw.md
+            displayName: 'Fetch ChangeLog.md'
+            condition: succeeded()
+            env:
+              GITHUB_TOKEN: $(GITHUB_PAT)
+
+          - script: |
+              REPO="${{ parameters.targetRepo }}"
+              echo "Fetching latest commit SHA from $REPO..."
+
+              DEFAULT_BRANCH=$(gh api repos/$REPO --jq '.default_branch')
+              if [ -z "$DEFAULT_BRANCH" ]; then
+                echo "✗ Failed to fetch default branch"
+                exit 1
+              fi
+
+              echo "✓ Default branch: $DEFAULT_BRANCH"
+              COMMIT_SHA=$(gh api repos/$REPO/commits/$DEFAULT_BRANCH --jq '.sha // empty')
+              if [ -z "$COMMIT_SHA" ] || [ ${#COMMIT_SHA} -ne 40 ]; then
+                echo "✗ Failed to fetch commit SHA or invalid SHA received"
+                exit 1
+              fi
+
+              echo "✓ Latest commit SHA: $COMMIT_SHA"
+              echo "##vso[task.setvariable variable=COMMIT_SHA]$COMMIT_SHA"
+            displayName: 'Fetch Latest Commit SHA'
+            condition: succeeded()
+            env:
+              GITHUB_TOKEN: $(GITHUB_PAT)
+
+          - script: |
+              VERSION_TAG="$(VERSION_TAG)"
+              BUILD_TYPE="${{ parameters.buildType }}"
+
+              if [ "$BUILD_TYPE" = "Beta" ]; then
+                VERSION_TAG="${VERSION_TAG}-beta"
+              fi
+
+              echo "Creating release notes from ChangeLog.md..."
+              cp changelog-raw.md release-notes.md
+
+              echo "Release notes created:"
+              cat release-notes.md
+
+              echo "##vso[task.setvariable variable=RELEASE_VERSION]$VERSION_TAG"
+            displayName: 'Prepare Release Notes'
+            condition: succeeded()
+
+          - script: |
+              ARTIFACTS_DIR="$(Pipeline.Workspace)"
+              echo "=== Debugging Cache Contents ==="
+              
+              if [ "$(WINDOWS_CACHE_RESTORED)" = "true" ]; then
+                echo "Windows artifacts directory structure:"
+                ls -lR "$ARTIFACTS_DIR/artifacts-windows/" || echo "Directory not found"
+              fi
+              
+              if [ "$(LINUX_CACHE_RESTORED)" = "true" ]; then
+                echo "Linux artifacts directory structure:"
+                ls -lR "$ARTIFACTS_DIR/artifacts-linux/" || echo "Directory not found"
+              fi
+              
+              if [ "$(MACOS_ARM64_CACHE_RESTORED)" = "true" ]; then
+                echo "MacOS ARM64 artifacts directory structure:"
+                ls -lR "$ARTIFACTS_DIR/artifacts-macos-arm64/" || echo "Directory not found"
+              fi
+              
+              if [ "$(MACOS_X64_CACHE_RESTORED)" = "true" ]; then
+                echo "MacOS X64 artifacts directory structure:"
+                ls -lR "$ARTIFACTS_DIR/artifacts-macos-x64/" || echo "Directory not found"
+              fi
+              
+              echo "=== End Debug ==="
+            displayName: 'Debug: List Cache Contents'
+            condition: succeeded()
+
+          - script: |
+              ARTIFACTS_DIR="$(Pipeline.Workspace)"
+              echo "Validating artifacts..."
+
+              if [ "$(WINDOWS_CACHE_RESTORED)" = "true" ]; then
+                WIN_ARTIFACT=$(find "$ARTIFACTS_DIR/artifacts-windows/" -name "*.zip" -type f | head -n 1)
+                if [ ! -f "$WIN_ARTIFACT" ]; then
+                  echo "✗ Error: Windows artifact not found"
+                  exit 1
+                fi
+                echo "✓ Found Windows artifact: $WIN_ARTIFACT"
+                echo "##vso[task.setvariable variable=WIN_ARTIFACT]$WIN_ARTIFACT"
+              else
+                echo "Skipping Windows artifact validation"
+              fi
+
+              if [ "$(LINUX_CACHE_RESTORED)" = "true" ]; then
+                LINUX_ARTIFACT=$(find "$ARTIFACTS_DIR/artifacts-linux/" -name "*.zip" -type f | head -n 1)
+                if [ ! -f "$LINUX_ARTIFACT" ]; then
+                  echo "✗ Error: Linux artifact not found"
+                  exit 1
+                fi
+                echo "✓ Found Linux artifact: $LINUX_ARTIFACT"
+                echo "##vso[task.setvariable variable=LINUX_ARTIFACT]$LINUX_ARTIFACT"
+              else
+                echo "Skipping Linux artifact validation"
+              fi
+
+              if [ "$(MACOS_ARM64_CACHE_RESTORED)" = "true" ]; then
+                MACOS_ARM64_ARTIFACT=$(find "$ARTIFACTS_DIR/artifacts-macos-arm64/" -name "*.dmg" -not -name "._*" -type f | head -n 1)
+                if [ ! -f "$MACOS_ARM64_ARTIFACT" ]; then
+                  echo "✗ Error: MacOS ARM64 artifact not found"
+                  exit 1
+                fi
+                echo "✓ Found MacOS ARM64 artifact: $MACOS_ARM64_ARTIFACT"
+                echo "##vso[task.setvariable variable=MACOS_ARM64_ARTIFACT]$MACOS_ARM64_ARTIFACT"
+              else
+                echo "Skipping MacOS ARM64 artifact validation"
+              fi
+
+              if [ "$(MACOS_X64_CACHE_RESTORED)" = "true" ]; then
+                MACOS_X64_ARTIFACT=$(find "$ARTIFACTS_DIR/artifacts-macos-x64/" -name "*.dmg" -not -name "._*" -type f | head -n 1)
+                if [ ! -f "$MACOS_X64_ARTIFACT" ]; then
+                  echo "✗ Error: MacOS X64 artifact not found"
+                  exit 1
+                fi
+                echo "✓ Found MacOS X64 artifact: $MACOS_X64_ARTIFACT"
+                echo "##vso[task.setvariable variable=MACOS_X64_ARTIFACT]$MACOS_X64_ARTIFACT"
+              else
+                echo "Skipping MacOS X64 artifact validation"
+              fi
+
+              echo "✓ All required artifacts validated successfully"
+            displayName: 'Validate Artifacts'
+            condition: succeeded()
+
+          - script: |
+              ARTIFACTS_DIR="$(Pipeline.Workspace)"
+              VERSION="$(VERSION_NUMBER)"
+              BUILD_DATE="$(BUILD_DATE)"
+
+              echo "Renaming artifacts to standardized format..."
+              if [ "$(WINDOWS_CACHE_RESTORED)" = "true" ] && [ -n "$(WIN_ARTIFACT)" ]; then
+                OLD_PATH="$(WIN_ARTIFACT)"
+                NEW_NAME="PA-SerialPrograms-Windows-x64-${VERSION}-${BUILD_DATE}.zip"
+                NEW_PATH="$ARTIFACTS_DIR/$NEW_NAME"
+
+                echo "Renaming: $(basename "$OLD_PATH") -> $NEW_NAME"
+                mv "$OLD_PATH" "$NEW_PATH"
+                echo "##vso[task.setvariable variable=WIN_ARTIFACT]$NEW_PATH"
+              fi
+
+              if [ "$(LINUX_CACHE_RESTORED)" = "true" ] && [ -n "$(LINUX_ARTIFACT)" ]; then
+                OLD_PATH="$(LINUX_ARTIFACT)"
+                NEW_NAME="PA-SerialPrograms-Ubuntu-x64-${VERSION}-${BUILD_DATE}.zip"
+                NEW_PATH="$ARTIFACTS_DIR/$NEW_NAME"
+
+                echo "Renaming: $(basename "$OLD_PATH") -> $NEW_NAME"
+                mv "$OLD_PATH" "$NEW_PATH"
+                echo "##vso[task.setvariable variable=LINUX_ARTIFACT]$NEW_PATH"
+              fi
+
+              if [ "$(MACOS_ARM64_CACHE_RESTORED)" = "true" ] && [ -n "$(MACOS_ARM64_ARTIFACT)" ]; then
+                OLD_PATH="$(MACOS_ARM64_ARTIFACT)"
+                NEW_NAME="PA-SerialPrograms-MacOS-ARM64-${VERSION}-${BUILD_DATE}.dmg"
+                NEW_PATH="$ARTIFACTS_DIR/$NEW_NAME"
+
+                echo "Renaming: $(basename "$OLD_PATH") -> $NEW_NAME"
+                mv "$OLD_PATH" "$NEW_PATH"
+                echo "##vso[task.setvariable variable=MACOS_ARM64_ARTIFACT]$NEW_PATH"
+              fi
+
+              if [ "$(MACOS_X64_CACHE_RESTORED)" = "true" ] && [ -n "$(MACOS_X64_ARTIFACT)" ]; then
+                OLD_PATH="$(MACOS_X64_ARTIFACT)"
+                NEW_NAME="PA-SerialPrograms-MacOS-x64-${VERSION}-${BUILD_DATE}.dmg"
+                NEW_PATH="$ARTIFACTS_DIR/$NEW_NAME"
+
+                echo "Renaming: $(basename "$OLD_PATH") -> $NEW_NAME"
+                mv "$OLD_PATH" "$NEW_PATH"
+                echo "##vso[task.setvariable variable=MACOS_X64_ARTIFACT]$NEW_PATH"
+              fi
+
+              echo "✓ All artifacts renamed successfully"
+            displayName: 'Rename Artifacts'
+            condition: succeeded()
+
+          - script: |
+              RELEASE_VERSION="$(RELEASE_VERSION)"
+              REPO="${{ parameters.targetRepo }}"
+              COMMIT_SHA="$(COMMIT_SHA)"
+
+              echo "Creating git tag $RELEASE_VERSION at commit $COMMIT_SHA..."
+              if gh api repos/$REPO/git/refs/tags/$RELEASE_VERSION 2>/dev/null; then
+                echo "Tag $RELEASE_VERSION already exists. Deleting..."
+                gh api -X DELETE repos/$REPO/git/refs/tags/$RELEASE_VERSION
+              fi
+
+              gh api repos/$REPO/git/refs \
+                -f ref="refs/tags/$RELEASE_VERSION" \
+                -f sha="$COMMIT_SHA"
+
+              if [ $? -eq 0 ]; then
+                echo "✓ Tag created successfully"
+              else
+                echo "✗ Failed to create tag"
+                exit 1
+              fi
+            displayName: 'Create Git Tag'
+            condition: succeeded()
+            env:
+              GITHUB_TOKEN: $(GITHUB_PAT)
+
+          - script: |
+              RELEASE_VERSION="$(RELEASE_VERSION)"
+              REPO="${{ parameters.targetRepo }}"
+              IS_PRERELEASE="$(IS_PRERELEASE)" 
+              COMMIT_SHA="$(COMMIT_SHA)"
+
+              echo "Creating GitHub release $RELEASE_VERSION in $REPO..."
+              if gh release view "$RELEASE_VERSION" --repo "$REPO" >/dev/null 2>&1; then
+                echo "Release $RELEASE_VERSION already exists. Deleting..."
+                gh release delete "$RELEASE_VERSION" --repo "$REPO" --yes
+              fi
+
+              if [ "$IS_PRERELEASE" = "True" ]; then
+                gh release create "$RELEASE_VERSION" \
+                  --repo "$REPO" \
+                  --title "Version $RELEASE_VERSION" \
+                  --notes-file release-notes.md \
+                  --prerelease \
+                  --target "$COMMIT_SHA"
+              else
+                gh release create "$RELEASE_VERSION" \
+                  --repo "$REPO" \
+                  --title "SerialPrograms $RELEASE_VERSION" \
+                  --notes-file release-notes.md \
+                  --target "$COMMIT_SHA"
+              fi
+
+              if [ $? -eq 0 ]; then
+                echo "✓ Release created successfully"
+              else
+                echo "✗ Failed to create release"
+                exit 1
+              fi
+            displayName: 'Create GitHub Release'
+            condition: succeeded()
+            env:
+              GITHUB_TOKEN: $(GITHUB_PAT)
+
+          - script: |
+              RELEASE_VERSION="$(RELEASE_VERSION)"
+              REPO="${{ parameters.targetRepo }}"
+              echo "Uploading artifacts to release $RELEASE_VERSION..."
+
+              if [ "$(WINDOWS_CACHE_RESTORED)" = "true" ] && [ -n "$(WIN_ARTIFACT)" ]; then
+                echo "Uploading Windows artifact: $(WIN_ARTIFACT)"
+                gh release upload "$RELEASE_VERSION" "$(WIN_ARTIFACT)" --repo "$REPO" --clobber
+              else
+                echo "Skipping Windows artifact upload"
+              fi
+
+              if [ "$(LINUX_CACHE_RESTORED)" = "true" ] && [ -n "$(LINUX_ARTIFACT)" ]; then
+                echo "Uploading Linux artifact: $(LINUX_ARTIFACT)"
+                gh release upload "$RELEASE_VERSION" "$(LINUX_ARTIFACT)" --repo "$REPO" --clobber
+              else
+                echo "Skipping Linux artifact upload"
+              fi
+
+              if [ "$(MACOS_ARM64_CACHE_RESTORED)" = "true" ] && [ -n "$(MACOS_ARM64_ARTIFACT)" ]; then
+                echo "Uploading MacOS ARM64 artifact: $(MACOS_ARM64_ARTIFACT)"
+                gh release upload "$RELEASE_VERSION" "$(MACOS_ARM64_ARTIFACT)" --repo "$REPO" --clobber
+              else
+                echo "Skipping MacOS ARM64 artifact upload"
+              fi
+
+              if [ "$(MACOS_X64_CACHE_RESTORED)" = "true" ] && [ -n "$(MACOS_X64_ARTIFACT)" ]; then
+                echo "Uploading MacOS X64 artifact: $(MACOS_X64_ARTIFACT)"
+                gh release upload "$RELEASE_VERSION" "$(MACOS_X64_ARTIFACT)" --repo "$REPO" --clobber
+              else
+                echo "Skipping MacOS X64 artifact upload"
+              fi
+
+              echo "✓ All required artifacts uploaded successfully"
+              echo "Release URL: https://github.com/$REPO/releases/tag/$RELEASE_VERSION"
+            displayName: 'Upload Artifacts to Release'
+            condition: succeeded()
+            env:
+              GITHUB_TOKEN: $(GITHUB_PAT)
diff --git a/.azure-pipelines/templates/macos-build.yml b/.azure-pipelines/templates/macos-build.yml
new file mode 100644
index 0000000000..7008d312d7
--- /dev/null
+++ b/.azure-pipelines/templates/macos-build.yml
@@ -0,0 +1,584 @@
+# templates/macos-build.yml
+# Template for building SerialPrograms on MacOS
+
+parameters:
+  stageName: ''
+  displayName: ''
+  dependsOnStage: ''
+  buildType: ''
+  targetOS: ''
+  poolName: ''
+  imageName: ''
+  architecture: ''
+  compiler: ''
+  qt_version: ''
+  qt_version_major: ''
+  qt_modules: ''
+  cmake_preset: ''
+  macos_path: ''
+  cmake_version_params: ''
+  cmake_additional_param: ''
+  openssl_pkcs_args: ''
+  versionMajor: 0
+  versionMinor: 0
+  versionPatch: 0
+  condition: ''
+
+stages:
+- stage: ${{ parameters.stageName }}
+  displayName: ${{ parameters.displayName }}
+  dependsOn: ${{ parameters.dependsOnStage }}
+  condition: ${{ parameters.condition }}
+
+  jobs:
+  - job: MacOS
+    timeoutInMinutes: 180
+    cancelTimeoutInMinutes: 1
+    displayName: MacOS ${{ parameters.architecture }}
+
+    pool:
+      name: ${{ parameters.poolName }}
+      demands:
+        - Agent.OSArchitecture -equals ${{ lower(parameters.architecture) }}
+
+    variables:
+      architecture: ${{ parameters.architecture }}
+      compiler: ${{ parameters.compiler }}
+      qt_version: ${{ parameters.qt_version }}
+      cmake_preset: ${{ parameters.cmake_preset }}
+      macos_path: ${{ parameters.macos_path }}
+      cmake_version_params: ${{ parameters.cmake_version_params }}
+      cmake_additional_param: ${{ parameters.cmake_additional_param }}
+
+    steps:
+      - template: checkout.yml
+
+      #- script: |
+      #    set -e
+      #    PERSISTENT_ONNX="/Users/Shared/onnxruntime"
+      #    WORK_ONNX="$(Pipeline.Workspace)/onnxruntime"
+      #
+      #    if [ -d "$PERSISTENT_ONNX" ]; then
+      #      echo "=== Found ONNX Runtime at $PERSISTENT_ONNX ==="
+      #      if [ ! -L "$WORK_ONNX" ]; then
+      #        ln -sf "$PERSISTENT_ONNX" "$WORK_ONNX"
+      #        echo "=== Created symlink to ONNX Runtime ==="
+      #      fi
+      #    else
+      #      echo "=== ERROR: ONNX Runtime not found at $PERSISTENT_ONNX ==="
+      #      exit 1
+      #    fi
+      #  displayName: 'Link ONNX Runtime'
+      #  condition: succeeded()
+
+      - script: |
+          export PATH=$(macos_path)
+          cd "$(Pipeline.Workspace)/Arduino-Source-Internal/Repository/Public/SerialPrograms"
+          cmake $(cmake_additional_param) $(cmake_version_params) --preset=$(cmake_preset)
+        displayName: 'Configure CMake'
+        condition: succeeded()
+
+      - script: |
+          export PATH=$(macos_path)
+          cd "$(Pipeline.Workspace)/Arduino-Source-Internal/Repository/Public/SerialPrograms"
+          cmake --build --preset=$(cmake_preset) -j $(sysctl -n hw.logicalcpu)
+        displayName: 'Build'
+        condition: succeeded()
+
+      - script: |
+          set -e
+          export PATH=$(macos_path)
+          BUILD_DIR="$(Pipeline.Workspace)/Arduino-Source-Internal/Repository/Public/build/$(cmake_preset)"
+
+          echo "=== Generating dSYM bundle ==="
+          mkdir -p "$(Pipeline.Workspace)/Arduino-Source-Internal/Repository/Public/build/$(cmake_preset)/cache-symbols"
+          cd "$BUILD_DIR"
+          dsymutil SerialPrograms.app/Contents/MacOS/SerialPrograms -o cache-symbols/SerialPrograms.dSYM
+
+          echo "=== dSYM bundle created ==="
+        displayName: 'Generate Debug Symbols'
+        condition: succeeded()
+
+      - script: |
+          set -e
+          export PATH=$(macos_path)
+          APP_DIR="$(Pipeline.Workspace)/Arduino-Source-Internal/Repository/Public/build/$(cmake_preset)/SerialPrograms.app"
+          MACOS_DIR="$APP_DIR/Contents/MacOS"
+          FW_DIR="$APP_DIR/Contents/Frameworks"
+          PLUGINS_DIR="$APP_DIR/Contents/PlugIns"
+          BREW_PREFIX=$(brew --prefix)
+
+          mkdir -p "$FW_DIR" "$PLUGINS_DIR"
+
+          echo "=== Setting up Qt paths ==="
+          if [ "$(architecture)" = "x64" ]; then
+              QT_ROOT="/usr/local/Qt/$(qt_version)/macos"
+              LIPO_ARCH="x86_64"
+          else
+              QT_ROOT="/opt/Qt/$(qt_version)/macos"
+              LIPO_ARCH="arm64"
+          fi
+
+          QT_LIB="$QT_ROOT/lib"
+          QT_PLUGINS="$QT_ROOT/plugins"
+          QT_FRAMEWORKS="Core Gui Widgets Network SerialPort Multimedia MultimediaWidgets Concurrent DBus OpenGL OpenGLWidgets Svg PrintSupport"
+
+          echo "=== Copying Qt frameworks $(architecture) ==="
+          for fw in $QT_FRAMEWORKS; do
+              [ -d "$QT_LIB/Qt${fw}.framework" ] || { echo "WARNING: Qt${fw}.framework not found, skipping"; continue; }
+              cp -R "$QT_LIB/Qt${fw}.framework" "$FW_DIR/"
+              FW_BINARY="$FW_DIR/Qt${fw}.framework/Versions/A/Qt${fw}"
+              if [ -f "$FW_BINARY" ]; then
+                  NUM_ARCHS=$(lipo -archs "$FW_BINARY" 2>/dev/null | wc -w | tr -d ' ')
+                  [ "$NUM_ARCHS" -gt 1 ] && lipo "$FW_BINARY" -thin "$LIPO_ARCH" -output "$FW_BINARY" || true
+              fi
+          done
+
+          echo "=== Copying Qt plugins $(architecture) ==="
+          for plugin_type in imageformats platforms styles iconengines platforminputcontexts multimedia tls; do
+              [ -d "$QT_PLUGINS/$plugin_type" ] || continue
+              mkdir -p "$PLUGINS_DIR/$plugin_type"
+              for plugin in "$QT_PLUGINS/$plugin_type/"*.dylib; do
+                  [ -f "$plugin" ] || continue
+                  dest="$PLUGINS_DIR/$plugin_type/$(basename "$plugin")"
+                  cp "$plugin" "$dest"
+                  NUM_ARCHS=$(lipo -archs "$dest" 2>/dev/null | wc -w | tr -d ' ')
+                  [ "$NUM_ARCHS" -gt 1 ] && lipo "$dest" -thin "$LIPO_ARCH" -output "$dest" || true
+              done
+          done
+
+          echo "=== Recursively resolving all native dependencies ==="
+          ALL_RPATHS=$(otool -l "$MACOS_DIR/SerialPrograms" 2>/dev/null \
+              | awk '/cmd LC_RPATH/{f=1} f && /path /{print $2; f=0}' || true)
+
+          ALL_RPATHS="$ALL_RPATHS
+          $BREW_PREFIX/lib
+          $BREW_PREFIX/opt/gcc/lib/gcc/current"
+
+          add_rpaths_from() {
+              local binary="$1"
+              local new
+              new=$(otool -l "$binary" 2>/dev/null \
+                  | awk '/cmd LC_RPATH/{f=1} f && /path /{print $2; f=0}' || true)
+              if [ -n "$new" ]; then
+                  ALL_RPATHS="$ALL_RPATHS $new"
+              fi
+          }
+
+          resolve_rpath() {
+              local libname="${1#@rpath/}"
+              while IFS= read -r rpath; do
+                  [ -n "$rpath" ] || continue
+                  [ -f "$rpath/$libname" ] && echo "$rpath/$libname" && return 0
+              done <<< "$ALL_RPATHS"
+              return 0
+          }
+
+          copy_dep() {
+              local dep="$1"
+
+              if echo "$dep" | grep -q '^@rpath/'; then
+                  dep=$(resolve_rpath "$dep")
+                  [ -z "$dep" ] && return 0
+              fi
+              case "$dep" in @*|/usr/lib/*|/System/*|/Library/*) return 0 ;; esac
+
+              if echo "$dep" | grep -q '\.framework/'; then
+                  local fw_path fw_name dest_fw fw_bin num
+                  fw_path=$(echo "$dep" | sed 's|\(.*\.framework\)/.*|\1|')
+                  fw_name=$(basename "$fw_path" .framework)
+                  dest_fw="$FW_DIR/${fw_name}.framework"
+                  if [ ! -d "$dest_fw" ]; then
+                      [ -d "$fw_path" ] || return 0
+                      echo "  + framework: $fw_name"
+                      cp -R "$fw_path" "$FW_DIR/" || return 0
+                      fw_bin="$dest_fw/Versions/A/$fw_name"
+                      if [ -f "$fw_bin" ]; then
+                          add_rpaths_from "$fw_path/Versions/A/$fw_name"
+                          num=$(lipo -archs "$fw_bin" 2>/dev/null | wc -w | tr -d ' ')
+                          [ "$num" -gt 1 ] && lipo "$fw_bin" -thin "$LIPO_ARCH" -output "$fw_bin" || true
+                          resolve_deps "$fw_bin" || true
+                      fi
+                  fi
+              else
+                  local base dest num
+                  base=$(basename "$dep")
+                  dest="$FW_DIR/$base"
+                  if [ ! -f "$dest" ] && [ -f "$dep" ]; then
+                      echo "  + dylib: $base"
+                      add_rpaths_from "$dep"
+                      cp "$dep" "$dest" || return 0
+                      num=$(lipo -archs "$dest" 2>/dev/null | wc -w | tr -d ' ')
+                      [ "$num" -gt 1 ] && lipo "$dest" -thin "$LIPO_ARCH" -output "$dest" || true
+                      resolve_deps "$dest" || true
+                  fi
+              fi
+              return 0
+          }
+
+          resolve_deps() {
+              local binary="$1"
+              local dep
+              while IFS= read -r dep; do
+                  copy_dep "$dep"
+              done < <(otool -L "$binary" 2>/dev/null | awk 'NR>1 {print $1}' \
+                       | grep -Ev '^(/usr/lib/|/System/|/Library/)' || true)
+          }
+
+          resolve_deps "$MACOS_DIR/SerialPrograms"
+          for fw in $QT_FRAMEWORKS; do
+              FW_BINARY="$FW_DIR/Qt${fw}.framework/Versions/A/Qt${fw}"
+              if [ -f "$FW_BINARY" ]; then
+                  add_rpaths_from "$QT_LIB/Qt${fw}.framework/Versions/A/Qt${fw}"
+                  resolve_deps "$FW_BINARY"
+              fi
+          done
+
+          find "$PLUGINS_DIR" -name "*.dylib" -type f -print0 | while IFS= read -r -d '' plugin; do
+              add_rpaths_from "$plugin"
+              resolve_deps "$plugin"
+          done
+
+          echo "=== Copying ONNX Runtime ==="
+          ONNX_VERSION="1.23.2"
+          REPO_ROOT="$(Pipeline.Workspace)/Arduino-Source-Internal/Repository/Public"
+          ONNX_LIB_DIR="$REPO_ROOT/3rdPartyBinaries/onnxruntime-osx-$LIPO_ARCH-$ONNX_VERSION/lib"
+          if [ -d "$ONNX_LIB_DIR" ]; then
+              for lib in "$ONNX_LIB_DIR/"libonnxruntime*.dylib; do
+                  real=$(readlink -f "$lib" 2>/dev/null || echo "$lib")
+                  [ -f "$real" ] || continue
+                  real_name=$(basename "$real")
+                  cp "$real" "$FW_DIR/$real_name"
+              done
+          else
+              echo "WARNING: ONNX Runtime not found at $ONNX_LIB_DIR"
+          fi
+
+          echo "=== Copying GCC runtime libraries ==="
+          GCC_LIB_PATH="$(brew --prefix)/opt/gcc/lib/gcc/current"
+          if [ -d "$GCC_LIB_PATH" ]; then
+              for lib in libgcc_s.1.1 libgcc_s.1 libgfortran.5 libquadmath.0 libgomp.1; do
+                  src="$GCC_LIB_PATH/$lib.dylib"
+                  [ -f "$src" ] || [ -L "$src" ] || continue
+                  real=$(readlink -f "$src" 2>/dev/null || echo "$src")
+                  [ -f "$real" ] || continue
+                  real_name=$(basename "$real")
+                  if [ ! -f "$FW_DIR/$real_name" ]; then
+                      echo "  + GCC runtime: $real_name"
+                      cp "$real" "$FW_DIR/$real_name"
+                  fi
+              done
+          else
+              echo "WARNING: GCC runtime not found at $GCC_LIB_PATH"
+          fi
+
+          echo "=== Fixing all install IDs and references ==="
+          fix_refs() {
+              local binary="$1"
+              while IFS= read -r linked; do
+                  if echo "$linked" | grep -q '\.framework/'; then
+                      local fw_name fw_suffix
+                      fw_name=$(echo "$linked" | sed 's|.*[/]\([A-Za-z0-9._-]*\.framework\)/.*|\1|' | sed 's|\.framework$||')
+                      fw_suffix=$(echo "$linked" | sed 's|.*\.framework||')
+                      if [ -d "$FW_DIR/${fw_name}.framework" ]; then
+                          install_name_tool -change "$linked" \
+                              "@executable_path/../Frameworks/${fw_name}.framework${fw_suffix}" \
+                              "$binary" 2>/dev/null || true
+                      fi
+                  else
+                      local base
+                      base=$(basename "$linked")
+                      if [ -f "$FW_DIR/$base" ]; then
+                          install_name_tool -change "$linked" \
+                              "@executable_path/../Frameworks/$base" \
+                              "$binary" 2>/dev/null || true
+                      fi
+                  fi
+              done < <(otool -L "$binary" 2>/dev/null | awk 'NR>1 {print $1}' \
+                       | grep -Ev '^(@executable_path|@loader_path|/usr/lib/|/System/|/Library/)' || true)
+          }
+
+          echo "=== Fix install IDs and refs for flat dylibs ==="
+          find "$FW_DIR" -maxdepth 1 -name "*.dylib" -type f -print0 | while IFS= read -r -d '' dylib; do
+              base=$(basename "$dylib")
+              install_name_tool -id "@executable_path/../Frameworks/$base" "$dylib"
+              fix_refs "$dylib"
+          done
+
+          echo "=== Fix install IDs and refs for Qt framework binaries ==="
+          for fw in $QT_FRAMEWORKS; do
+              FW_BINARY="$FW_DIR/Qt${fw}.framework/Versions/A/Qt${fw}"
+              [ -f "$FW_BINARY" ] || continue
+              install_name_tool -id \
+                  "@executable_path/../Frameworks/Qt${fw}.framework/Versions/A/Qt${fw}" \
+                  "$FW_BINARY"
+              fix_refs "$FW_BINARY"
+          done
+
+          echo "=== Fix plugin refs ==="
+          find "$PLUGINS_DIR" -name "*.dylib" -type f -print0 | while IFS= read -r -d '' plugin; do
+              fix_refs "$plugin"
+          done
+
+          echo "=== Fix main executable refs ==="
+          install_name_tool -add_rpath "$BREW_PREFIX/lib"               "$MACOS_DIR/SerialPrograms" 2>/dev/null || true
+          install_name_tool -add_rpath "@executable_path/../Frameworks" "$MACOS_DIR/SerialPrograms" 2>/dev/null || true
+          fix_refs "$MACOS_DIR/SerialPrograms"
+
+          echo "=== Preparing build folder ==="
+          cd "$(Pipeline.Workspace)/Arduino-Source-Internal/Repository/Public/build/$(cmake_preset)"
+
+          VERSION="${{ parameters.versionMajor }}.${{ parameters.versionMinor }}.${{ parameters.versionPatch }}"
+          FOLDER_NAME="SerialPrograms-$VERSION-MacOS-${{ parameters.architecture }}"
+          mkdir -p "$FOLDER_NAME"
+
+          echo "=== Moving .app bundle and related resources to $FOLDER_NAME ==="
+          mv SerialPrograms.app "$FOLDER_NAME/"
+          mv "Firmware"  "$FOLDER_NAME/"
+          mv "Resources" "$FOLDER_NAME/"
+          mkdir -p "$FOLDER_NAME/SerialPrograms.app/Contents/Resources"
+
+          echo "=== Archiving debug symbols ==="
+          tar -czf "cache-symbols/macos-symbols-${{ parameters.architecture }}.tar.gz" cache-symbols/SerialPrograms.dSYM
+
+          echo "Deployment complete for $(architecture) with enclosing folder: $FOLDER_NAME"
+        displayName: 'Deploy app'
+        condition: succeeded()
+
+      - task: InstallAppleCertificate@2
+        displayName: 'Install Apple certificate'
+        inputs:
+          certSecureFile: 'CodesignCertMac.p12'
+          certPwd: $(CERT_PW)
+          keychain: custom
+          keychainPassword: $(KEYCHAIN_PW)
+          customKeychainPath: '$(HOME)/Library/Keychains/azure-signing.keychain-db'
+          deleteCert: true
+          deleteCustomKeychain: true
+          opensslPkcsArgs: ${{ parameters.openssl_pkcs_args }}
+        condition: succeeded()
+
+      - script: |
+          set -e
+          KEYCHAIN="$HOME/Library/Keychains/azure-signing.keychain-db"
+
+          echo "=== Activating keychain ==="
+          security list-keychains -d user -s "$KEYCHAIN" "$HOME/Library/Keychains/login.keychain-db"
+          security unlock-keychain -p "$(KEYCHAIN_PW)" "$KEYCHAIN"
+
+          echo "=== Allowing codesign to access private key ==="
+          security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k "$(KEYCHAIN_PW)" "$KEYCHAIN"
+
+          echo "=== Verifying identities ==="
+          security find-identity -p codesigning -v
+        env:
+          KEYCHAIN_PW: $(KEYCHAIN_PW)
+        displayName: 'Authorize signing key'
+        condition: succeeded()
+
+      - script: |
+          set -euo pipefail
+          export PATH=${{ parameters.macos_path }}
+          VERSION="${{ parameters.versionMajor }}.${{ parameters.versionMinor }}.${{ parameters.versionPatch }}"
+          FOLDER_NAME="SerialPrograms-$VERSION-MacOS-${{ parameters.architecture }}"
+          BUILD_DIR="$(Pipeline.Workspace)/Arduino-Source-Internal/Repository/Public/build/$(cmake_preset)"
+          APP_DIR="$BUILD_DIR/$FOLDER_NAME/SerialPrograms.app"
+          ENTITLEMENTS_DIR="$(Pipeline.Workspace)/Arduino-Source-Internal/Repository/Public/SerialPrograms/cmake/MacOSXEntitlements.plist"
+
+          echo "=== Signing app ==="
+          codesign --deep --force --options runtime --timestamp --entitlements "$ENTITLEMENTS_DIR" --sign "$SIGN_IDENTITY" "$APP_DIR"
+
+          echo "=== Verifying code signature ==="
+          codesign --verify --deep --strict --verbose=2 "$APP_DIR"
+        env:
+          SIGN_IDENTITY: $(SIGNING_IDENTITY)
+        displayName: '(APP) Codesign, verify'
+        condition: succeeded()
+
+      - script: |
+          set -euo pipefail
+          export PATH=${{ parameters.macos_path }}
+          VERSION="${{ parameters.versionMajor }}.${{ parameters.versionMinor }}.${{ parameters.versionPatch }}"
+          BUILD_TYPE="${{ parameters.buildType }}"
+          FOLDER_NAME="SerialPrograms-$VERSION-MacOS-${{ parameters.architecture }}"
+          BUILD_DIR="$(Pipeline.Workspace)/Arduino-Source-Internal/Repository/Public/build/$(cmake_preset)"
+          DMG_PATH="$(Pipeline.Workspace)/SerialPrograms-MacOS-$(compiler)-$(architecture).dmg"
+          STAGING_DIR="$(Pipeline.Workspace)/dmg-staging"
+          SETTINGS_FILE="$(Pipeline.Workspace)/dmg-settings.py"
+
+          echo "=== Creating DMG staging directory ==="
+          rm -rf "$STAGING_DIR"
+          mkdir -p "$STAGING_DIR"
+          cp -R "$BUILD_DIR/$FOLDER_NAME" "$STAGING_DIR/SerialPrograms"
+
+          echo "=== Setting folder icon ==="
+          ICNS_PATH="$STAGING_DIR/SerialPrograms/SerialPrograms.app/Contents/Resources/icon.icns"
+          fileicon set "$STAGING_DIR/SerialPrograms" "$ICNS_PATH"
+          echo "✓ Folder icon set from $ICNS_PATH"
+
+          echo "=== Writing dmgbuild settings ==="
+          printf '%s\n' \
+              "format = 'UDZO'" \
+              "files = [defines['app']]" \
+              "symlinks = {'Applications': '/Applications'}" \
+              "icon_locations = {'SerialPrograms': (150, 100), 'Applications': (490, 100)}" \
+              "background = 'builtin-arrow'" \
+              "window_rect = ((200, 120), (520, 240))" \
+              "icon_size = 100" \
+              "text_size = 12" \
+              "default_view = 'icon-view'" \
+              "show_icon_preview = False" \
+              > "$SETTINGS_FILE"
+
+          echo "=== Creating DMG ==="
+          python3 -m dmgbuild \
+              -s "$SETTINGS_FILE" \
+              -D app="$STAGING_DIR/SerialPrograms" \
+              "SerialPrograms $VERSION-$BUILD_TYPE" \
+              "$DMG_PATH"
+
+          rm -rf "$STAGING_DIR" "$SETTINGS_FILE"
+          echo "=== DMG created: $DMG_PATH ==="
+        displayName: 'Create DMG'
+        condition: succeeded()
+
+      - script: |
+          set -euo pipefail
+          DMG_PATH="$(Pipeline.Workspace)/SerialPrograms-MacOS-$(compiler)-$(architecture).dmg"
+
+          echo "=== Signing DMG ==="
+          codesign --sign "$SIGN_IDENTITY" --timestamp "$DMG_PATH"
+
+          echo "=== Verifying DMG signature ==="
+          codesign --verify --verbose=2 "$DMG_PATH"
+        env:
+          SIGN_IDENTITY: $(SIGNING_IDENTITY)
+        displayName: '(DMG) Codesign, verify'
+        condition: succeeded()
+
+      - script: |
+          set -euo pipefail
+          DMG_PATH="$(Pipeline.Workspace)/SerialPrograms-MacOS-$(compiler)-$(architecture).dmg"
+
+          SUBMIT_JSON=$(xcrun notarytool submit "$DMG_PATH" \
+            --apple-id "$APPLE_ID" \
+            --password "$APPLE_APP_PW" \
+            --team-id "$APPLE_TEAM_ID" \
+            --output-format json)
+
+          REQUEST_ID=$(echo "$SUBMIT_JSON" | jq -r '.id')
+          [ -n "$REQUEST_ID" ] && [ "$REQUEST_ID" != "null" ]
+
+          echo "##vso[task.setvariable variable=DMG_NOTARY_REQUEST_ID]$REQUEST_ID"
+        env:
+          APPLE_ID: $(APPLE_ID)
+          APPLE_APP_PW: $(APPLE_APP_PW)
+          APPLE_TEAM_ID: $(APPLE_TEAM_ID)
+        displayName: '(DMG) Submit for notarization'
+        condition: succeeded()
+
+      - script: |
+          set -euo pipefail
+          MAX_WAIT=14400
+          INTERVAL=30
+          ELAPSED=0
+
+          while true; do
+            STATUS=$(xcrun notarytool info "$(DMG_NOTARY_REQUEST_ID)" \
+              --apple-id "$APPLE_ID" \
+              --password "$APPLE_APP_PW" \
+              --team-id "$APPLE_TEAM_ID" \
+              --output-format json | jq -r '.status')
+
+            case "$STATUS" in
+              Accepted) break ;;
+              Invalid)
+                xcrun notarytool log "$(DMG_NOTARY_REQUEST_ID)" \
+                  --apple-id "$APPLE_ID" \
+                  --password "$APPLE_APP_PW" \
+                  --team-id "$APPLE_TEAM_ID"
+                exit 1 ;;
+            esac
+
+            sleep "$INTERVAL"
+            ELAPSED=$((ELAPSED + INTERVAL))
+            [ "$ELAPSED" -lt "$MAX_WAIT" ]
+          done
+        env:
+          APPLE_ID: $(APPLE_ID)
+          APPLE_APP_PW: $(APPLE_APP_PW)
+          APPLE_TEAM_ID: $(APPLE_TEAM_ID)
+        displayName: '(DMG) Wait for notarization'
+        condition: succeeded()
+
+      - script: |
+          set -euo pipefail
+          DMG_PATH="$(Pipeline.Workspace)/SerialPrograms-MacOS-$(compiler)-$(architecture).dmg"
+          CACHE_DIR="$(Pipeline.Workspace)/Arduino-Source-Internal/cache-notarized"
+
+          echo "=== Stapling notarization ticket to DMG ==="
+          xcrun stapler staple "$DMG_PATH"
+
+          echo "=== Validating staple ==="
+          xcrun stapler validate "$DMG_PATH"
+
+          echo "=== Gatekeeper assessment ==="
+          spctl --assess --type open --context context:primary-signature --verbose=4 "$DMG_PATH"
+
+          echo "=== Moving DMG to cache ==="
+          rm -rf "$CACHE_DIR"
+          mkdir -p "$CACHE_DIR"
+          mv "$DMG_PATH" "$CACHE_DIR/"
+        displayName: '(DMG) Staple, verify'
+        condition: succeeded()
+
+      - script: |
+          set -e
+          DMG_NAME="SerialPrograms-MacOS-$(compiler)-$(architecture).dmg"
+          ZIP_NAME="SerialPrograms-MacOS-$(compiler)-$(architecture).zip"
+          CACHE_DIR="$(Pipeline.Workspace)/Arduino-Source-Internal/cache-notarized"
+          BUILD_TYPE="${{ parameters.buildType }}"
+
+          cd "$CACHE_DIR"
+          if [ "$BUILD_TYPE" = "PrivateBeta" ]; then
+              echo "=== Creating password-protected archive for PrivateBeta ==="
+              7z a -tzip -mx=9 "-p$ARTIFACT_PASSWORD" -mem=ZipCrypto "$ZIP_NAME" "$DMG_NAME"
+              rm "$DMG_NAME"
+              echo "=== Password-protected .zip created ==="
+          else
+              echo "=== DMG ready for publish ==="
+          fi
+        displayName: 'Prepare artifact for publish'
+        condition: succeeded()
+        env:
+          ARTIFACT_PASSWORD: $(ARTIFACT_PASSWORD)
+
+      - task: Cache@2
+        displayName: 'Cache notarized artifact for GitHub release'
+        inputs:
+          key: 'macos-notarized-${{ parameters.architecture }} | "$(Build.BuildId)"'
+          path: '$(Pipeline.Workspace)/Arduino-Source-Internal/cache-notarized'
+        condition: and(succeeded(), eq('${{ parameters.targetOS }}', 'All'), or(eq('${{ parameters.buildType }}', 'Release'), eq('${{ parameters.buildType }}', 'Beta')))
+
+      - task: Cache@2
+        displayName: 'Cache debug symbols'
+        inputs:
+          key: 'macos-symbols-${{ parameters.architecture }} | "$(Build.BuildId)"'
+          path: '$(Pipeline.Workspace)/Arduino-Source-Internal/Repository/Public/build/$(cmake_preset)/cache-symbols'
+        condition: succeeded()
+
+      - task: PublishPipelineArtifact@1
+        displayName: 'Publish MacOS artifact (PrivateBeta)'
+        inputs:
+          targetPath: '$(Pipeline.Workspace)/Arduino-Source-Internal/cache-notarized/SerialPrograms-MacOS-$(compiler)-$(architecture).zip'
+          artifactName: 'SerialPrograms-MacOS-$(compiler)-$(architecture)'
+          publishLocation: 'pipeline'
+        condition: and(succeeded(), eq('${{ parameters.buildType }}', 'PrivateBeta'))
+
+      - task: PublishPipelineArtifact@1
+        displayName: 'Publish MacOS artifact'
+        inputs:
+          targetPath: '$(Pipeline.Workspace)/Arduino-Source-Internal/cache-notarized/SerialPrograms-MacOS-$(compiler)-$(architecture).dmg'
+          artifactName: 'SerialPrograms-MacOS-$(compiler)-$(architecture)'
+          publishLocation: 'pipeline'
+        condition: and(succeeded(), ne('${{ parameters.buildType }}', 'PrivateBeta'))
diff --git a/.azure-pipelines/templates/sleep-wake-signal.yml b/.azure-pipelines/templates/sleep-wake-signal.yml
new file mode 100644
index 0000000000..48645c1cb8
--- /dev/null
+++ b/.azure-pipelines/templates/sleep-wake-signal.yml
@@ -0,0 +1,78 @@
+# templates/sleep-wake-signal.yml
+# Template for putting Windows/Linux host to sleep/wake via USB relay controller
+# AT commands: AT+CH1=1 (close relay), AT+CH1=0 (open relay)
+
+parameters:
+  stageName: ''
+  displayName: ''
+  dependsOn: []
+  condition: ''
+  action: '' # 'Wake' or 'Sleep'
+
+stages:
+  - stage: ${{ parameters.stageName }}
+    displayName: ${{ parameters.displayName }}
+    dependsOn: ${{ parameters.dependsOn }}
+    condition: ${{ parameters.condition }}
+
+    jobs:
+      - job: SendSleepWakeSignal
+        displayName: Send Sleep/Wake Signal via Relay
+        pool:
+          name: ${{ parameters.poolName }}
+        timeoutInMinutes: 10
+        steps:
+          - checkout: none
+
+          - task: UsePythonVersion@0
+            inputs:
+              versionSpec: '3.14'
+              addToPath: true
+            name: UsePythonVersion
+            displayName: 'Use Python 3.14'
+
+          - powershell: |
+              $action = "${{ parameters.action }}"
+              $pingUrl = "http://$($env:HOST_IP):$($env:HOST_PORT)/ping/"
+              $isAwake = $false
+
+              try {
+                  $response = Invoke-WebRequest -Uri $pingUrl -Headers @{ "X-Auth" = $env:HOST_SECRET } -TimeoutSec 10 -UseBasicParsing -ErrorAction Stop
+                  if ($response.Content.Trim() -eq "ack") {
+                      Write-Host "Ping response: ack. Host is awake."
+                      $isAwake = $true
+                  } else {
+                      Write-Host "Ping response: unexpected content '$($response.Content.Trim())'. Assuming asleep."
+                  }
+              } catch {
+                  Write-Host "Ping failed or no response. Assuming host is asleep: $_"
+              }
+
+              if ($action -eq "Wake" -and $isAwake) {
+                  Write-Host "Action is 'Wake' but host is already awake. Skipping script."
+              } elseif ($action -eq "Sleep" -and -not $isAwake) {
+                  Write-Host "Action is 'Sleep' but host is already asleep. Skipping script."
+              } else {
+                  Write-Host "Running relay script for action: $action"
+                  $f = "$env:TEMP\relay.py"
+                  Set-Content  $f "import serial"
+                  Add-Content  $f "import time"
+                  Add-Content  $f "with serial.Serial('COM3', 9600, timeout=1) as ser:"
+                  Add-Content  $f "    print('Closing the relay...')"
+                  Add-Content  $f "    ser.write(b'AT+CH1=1\r\n')"
+                  Add-Content  $f "    time.sleep(1)"
+                  Add-Content  $f "    print('Opening the relay...')"
+                  Add-Content  $f "    ser.write(b'AT+CH1=0\r\n')"
+                  python $f
+
+                  if ($LASTEXITCODE -ne 0) {
+                      Write-Error "Relay script failed with exit code $LASTEXITCODE"
+                      exit $LASTEXITCODE
+                  }
+              }
+            displayName: 'Send ${{ parameters.action }} Signal via Relay'
+            condition: succeeded()
+            env:
+              HOST_IP: $(host_ip)
+              HOST_PORT: $(host_port)
+              HOST_SECRET: $(host_secret)
diff --git a/.azure-pipelines/templates/update-github-telemetry.yml b/.azure-pipelines/templates/update-github-telemetry.yml
new file mode 100644
index 0000000000..5d1c864ef0
--- /dev/null
+++ b/.azure-pipelines/templates/update-github-telemetry.yml
@@ -0,0 +1,253 @@
+# templates/update-github-telemetry.yml
+# Template for updating GitHub Telemetry JSON file with new telemetry information
+
+parameters:
+  stageName: ''
+  displayName: ''
+  dependsOn: []
+  buildType: ''
+  versionMajor: 0
+  versionMinor: 0
+  versionPatch: 0
+  telemetryRepo: ''
+  condition: ''
+
+stages:
+- stage: ${{ parameters.stageName }}
+  displayName: ${{ parameters.displayName }}
+  dependsOn: ${{ parameters.dependsOn }}
+  condition: ${{ parameters.condition }}
+
+  jobs:
+  - job: UpdateTelemetryJSON
+    displayName: 'Update Telemetry JSON'
+    timeoutInMinutes: 10
+    cancelTimeoutInMinutes: 1
+
+    pool:
+      vmImage: windows-latest
+
+    steps:
+      - checkout: none
+
+      - task: DownloadSecureFile@1
+        name: ObfuscateScript
+        displayName: 'Download Obfuscation Script'
+        inputs:
+          secureFile: 'Obfuscate-Telemetry.ps1'
+
+      - task: PowerShell@2
+        displayName: 'Add v${{ parameters.versionMajor }}.${{ parameters.versionMinor }}.${{ parameters.versionPatch }} to Telemetry JSON'
+        condition: succeeded()
+        inputs:
+          targetType: 'inline'
+          script: |
+            $ErrorActionPreference = "Stop"
+
+            function Compare-Versions {
+                param(
+                    [string]$Version1,
+                    [string]$Version2
+                )
+
+                $v1Parts = $Version1.TrimStart('v').Split('.')
+                $v2Parts = $Version2.TrimStart('v').Split('.')
+
+                if ([int]$v1Parts[0] -gt [int]$v2Parts[0]) { return 1 }
+                if ([int]$v1Parts[0] -lt [int]$v2Parts[0]) { return -1 }
+
+                if ([int]$v1Parts[1] -gt [int]$v2Parts[1]) { return 1 }
+                if ([int]$v1Parts[1] -lt [int]$v2Parts[1]) { return -1 }
+
+                if ([int]$v1Parts[2] -gt [int]$v2Parts[2]) { return 1 }
+                if ([int]$v1Parts[2] -lt [int]$v2Parts[2]) { return -1 }
+
+                return 0
+            }
+
+            $token = $env:GITHUB_TOKEN
+            $repo = "${{ parameters.telemetryRepo }}"
+            $filePath = "Developer/Telemetry.json"
+            $branch = "main"
+            $getUrl = "https://api.github.com/repos/" + $repo + "/contents/" + $filePath + "?ref=" + $branch
+            $versionKey = $env:TELEMETRY_VERSION
+            Write-Host "Constructed URL: $getUrl"
+
+            Write-Host "================================================"
+            Write-Host "Adding $versionKey to Telemetry JSON"
+            Write-Host "Repository: $repo"
+            Write-Host "File: $filePath"
+            Write-Host "================================================"
+            Write-Host ""
+
+            Write-Host "Generating obfuscated metadata..."
+            $scriptPath = "$(obfuscateScript.secureFilePath)"
+            $obfuscatedMetadata = & $scriptPath
+            Write-Host "✓ Generated metadata (length: $($obfuscatedMetadata.Length) chars)"
+            Write-Host ""
+
+            $headers = @{
+                Authorization = "token $token"
+                Accept = "application/vnd.github.v3+json"
+            }
+
+            try {
+                Write-Host "Fetching current Telemetry JSON..."
+                $fileInfo = Invoke-RestMethod -Uri $getUrl -Headers $headers -Method Get
+
+                $currentContent = [System.Text.Encoding]::UTF8.GetString(
+                    [System.Convert]::FromBase64String($fileInfo.content)
+                )
+                $json = $currentContent | ConvertFrom-Json
+
+                if ($json.PSObject.Properties.Name -contains $versionKey) {
+                    Write-Host ""
+                    Write-Host "================================================"
+                    Write-Host "⚠️ Version $versionKey already exists in Telemetry JSON"
+                    Write-Host "Skipping update to prevent duplicates."
+                    Write-Host "================================================"
+                    exit 0
+                }
+
+                $highestVersion = $null
+                foreach ($property in $json.PSObject.Properties) {
+                    $key = $property.Name
+                    if ($key -eq "Default") { continue }
+                    if ($key -match '^v\d+\.\d+\.\d+$') {
+                        if ($null -eq $highestVersion -or (Compare-Versions $key $highestVersion) -gt 0) {
+                            $highestVersion = $key
+                        }
+                    }
+                }
+
+                if ($null -ne $highestVersion) {
+                    Write-Host "Current highest version: $highestVersion"
+                    $comparison = Compare-Versions $versionKey $highestVersion
+
+                    if ($comparison -le 0) {
+                        Write-Host ""
+                        Write-Host "================================================"
+                        Write-Host "⚠️ Version $versionKey is not higher than existing version $highestVersion"
+                        Write-Host "Skipping update. Only higher versions are added."
+                        Write-Host "================================================"
+                        exit 0
+                    }
+
+                    Write-Host "✓ Version $versionKey is higher than $highestVersion - proceeding with update"
+                } else {
+                    Write-Host "No existing versions found - proceeding with update"
+                }
+                Write-Host ""
+
+                $lines = $currentContent -split "`r?`n"
+                $updatedLines = @()
+                $insertionDone = $false
+                $inDefaultSection = $false
+                $bracketDepth = 0
+
+                for ($i = 0; $i -lt $lines.Count; $i++) {
+                    $line = $lines[$i]
+                    $updatedLines += $line
+
+                    if ($line -match '^\s*"Default"\s*:\s*\{') {
+                        $inDefaultSection = $true
+                        $bracketDepth = 1
+                    }
+                    elseif ($inDefaultSection) {
+                        $openBrackets = ([regex]::Matches($line, '\{')).Count
+                        $closeBrackets = ([regex]::Matches($line, '\}')).Count
+                        $bracketDepth += $openBrackets - $closeBrackets
+
+                        if ($bracketDepth -eq 0 -and $line -match '^\s*\}') {
+                            $inDefaultSection = $false
+                            $hasComma = $line -match '\},'
+
+                            if (-not $hasComma) {
+                                $updatedLines[$updatedLines.Count - 1] = $line -replace '\}', '},'
+                            }
+
+                            $baseIndent = "    "
+                            $updatedLines += "$baseIndent`"$versionKey`": {"
+                            $updatedLines += "$baseIndent    `"Metadata`": `"$obfuscatedMetadata`","
+                            $updatedLines += "$baseIndent    `"ReportRate`": 1.0"
+                            $updatedLines += "$baseIndent},"
+
+                            $insertionDone = $true
+                            Write-Host "✓ Inserted $versionKey with generated Metadata and ReportRate: 1.0"
+                        }
+                    }
+                }
+
+                if (-not $insertionDone) {
+                    Write-Host "❌ Failed to find Default section for insertion"
+                    exit 1
+                }
+
+                $newContent = ($updatedLines -join "`n")
+                $contentBytes = [System.Text.Encoding]::UTF8.GetBytes($newContent)
+                $contentBase64 = [System.Convert]::ToBase64String($contentBytes)
+                $commitMessage = "Add $versionKey to Telemetry JSON via Azure Pipelines"
+                $newBranch = "telemetry-update-$($versionKey.Replace('.', '-'))"
+
+                ### Create a new branch and open a PR
+                # Fetch latest commit SHA for the base branch
+                Write-Host "Fetching latest commit SHA for branch $branch..."
+                $refUrl = "https://api.github.com/repos/$repo/git/refs/heads/$branch"
+                $refInfo = Invoke-RestMethod -Uri $refUrl -Headers $headers -Method Get
+                $latestCommitSha = $refInfo.object.sha
+                Write-Host "Latest commit SHA: $latestCommitSha"
+
+                # Create new branch from latest commit
+                Write-Host "Creating new branch $newBranch..."
+                $newRefBody = @{
+                    ref = "refs/heads/$newBranch"
+                    sha = $latestCommitSha
+                } | ConvertTo-Json
+                Invoke-RestMethod -Uri "https://api.github.com/repos/$repo/git/refs" -Headers $headers -Method Post -Body $newRefBody -ContentType "application/json"
+                Write-Host "✓ Created branch $newBranch"
+
+                # Update the file in the new branch
+                $updateBody = @{
+                    message = $commitMessage
+                    content = $contentBase64
+                    sha = $fileInfo.sha
+                    branch = $newBranch
+                } | ConvertTo-Json -Depth 10
+
+                Write-Host "Pushing changes to $newBranch..."
+                $putUrl = "https://api.github.com/repos/$repo/contents/$filePath"
+                Invoke-RestMethod -Uri $putUrl -Headers $headers -Method Put -Body $updateBody -ContentType "application/json"
+                Write-Host "✓ Pushed changes to $newBranch"
+
+                # Create a pull request
+                Write-Host "Creating pull request from $newBranch to $branch..."
+                $prBody = @{
+                    title = $commitMessage
+                    head = $newBranch
+                    base = $branch
+                    body = "This PR was automatically generated by Azure Pipelines to add $versionKey to the Telemetry JSON file."
+                } | ConvertTo-Json
+                $pr = Invoke-RestMethod -Uri "https://api.github.com/repos/$repo/pulls" -Headers $headers -Method Post -Body $prBody -ContentType "application/json"
+
+                Write-Host ""
+                Write-Host "================================================"
+                Write-Host "✅ Successfully created PR #$($pr.number) for $versionKey"
+                Write-Host "PR URL: $($pr.html_url)"
+                Write-Host "================================================"
+
+            } catch {
+                Write-Host ""
+                Write-Host "================================================"
+                Write-Host "❌ Failed to update Telemetry JSON"
+                Write-Host "Error: $($_.Exception.Message)"
+                if ($_.ErrorDetails.Message) {
+                    Write-Host "Details: $($_.ErrorDetails.Message)"
+                }
+                Write-Host "================================================"
+                exit 1
+            }
+        env:
+          GITHUB_TOKEN: $(GITHUB_PAT)
+          TELEMETRY_KEY_1: $(TELEMETRY_KEY_1)
+          TELEMETRY_KEY_2: $(TELEMETRY_KEY_2)
+          TELEMETRY_VERSION: "v${{ parameters.versionMajor }}.${{ parameters.versionMinor }}.${{ parameters.versionPatch }}"
diff --git a/.azure-pipelines/templates/update-github-version.yml b/.azure-pipelines/templates/update-github-version.yml
new file mode 100644
index 0000000000..eb062669da
--- /dev/null
+++ b/.azure-pipelines/templates/update-github-version.yml
@@ -0,0 +1,234 @@
+# templates/update-github-version.yml
+# Template for updating GitHub LatestVersion JSON file with new version information
+
+parameters:
+  stageName: ''
+  displayName: ''
+  dependsOn: []
+  buildType: ''
+  versionMajor: 0
+  versionMinor: 0
+  versionPatch: 0
+  versionRepo: ''
+  condition: ''
+
+stages:
+- stage: ${{ parameters.stageName }}
+  displayName: ${{ parameters.displayName }}
+  dependsOn: ${{ parameters.dependsOn }}
+  condition: ${{ parameters.condition }}
+
+  jobs:
+  - job: UpdateVersionJSON
+    displayName: 'Update LatestVersion JSON'
+    timeoutInMinutes: 10
+    cancelTimeoutInMinutes: 1
+
+    pool:
+      vmImage: ubuntu-latest
+
+    steps:
+      - checkout: none
+
+      - script: |
+          echo "$(GITHUB_TOKEN)" | gh auth login --with-token
+          gh auth status
+        displayName: 'Authenticate with GitHub'
+        condition: succeeded()
+        env:
+          GITHUB_TOKEN: $(GITHUB_PAT)
+
+      - script: |
+          REPO="${{ parameters.versionRepo }}"
+          echo "Fetching ChangeLog.md from $REPO..."
+
+          gh api repos/$REPO/contents/ChangeLog.md --jq '.content' | base64 -d > changelog.md
+          if [ ! -s changelog.md ]; then
+            echo "✗ Failed to fetch ChangeLog.md or file is empty"
+            exit 1
+          fi
+          echo "✓ ChangeLog.md fetched successfully"
+
+          echo "Converting Markdown to HTML..."
+          python3 -m pip install --quiet markdown
+          python3 -c "import markdown; content = open('changelog.md', encoding='utf-8').read(); html = markdown.markdown(content, extensions=['fenced_code', 'tables', 'nl2br']); open('changelog.html', 'w', encoding='utf-8').write(html)"
+
+          if [ ! -s changelog.html ]; then
+            echo "✗ Failed to convert ChangeLog.md to HTML"
+            exit 1
+          fi
+          echo "✓ ChangeLog.md converted to HTML"
+
+          CHANGELOG_CONTENT=$(base64 -w 0 changelog.html)
+          echo "##vso[task.setvariable variable=CHANGELOG_B64]$CHANGELOG_CONTENT"
+        displayName: 'Fetch ChangeLog.md'
+        condition: succeeded()
+        env:
+          GITHUB_TOKEN: $(GITHUB_PAT)
+
+      - task: PowerShell@2
+        name: UpdateVersionJSON
+        displayName: 'Update ${{ parameters.buildType }} Version in GitHub'
+        inputs:
+          targetType: 'inline'
+          pwsh: true
+          script: |
+            $ErrorActionPreference = "Stop"
+
+            $changeLogB64 = "$(CHANGELOG_B64)"
+            $changeLog = [System.Text.Encoding]::UTF8.GetString([System.Convert]::FromBase64String($changeLogB64))
+            Write-Host "✓ ChangeLog decoded successfully"
+            function Compare-Versions {
+                param(
+                    [int]$Major1, [int]$Minor1, [int]$Patch1,
+                    [int]$Major2, [int]$Minor2, [int]$Patch2
+                )
+
+                if ($Major1 -gt $Major2) { return 1 }
+                if ($Major1 -lt $Major2) { return -1 }
+
+                if ($Minor1 -gt $Minor2) { return 1 }
+                if ($Minor1 -lt $Minor2) { return -1 }
+
+                if ($Patch1 -gt $Patch2) { return 1 }
+                if ($Patch1 -lt $Patch2) { return -1 }
+
+                return 0
+            }
+
+            $token = $env:GITHUB_TOKEN
+            $repo = "${{ parameters.versionRepo }}"
+            $filePath = "LatestVersion.json"
+            $changeLogPath = "ChangeLog.md"
+            $branch = "master"
+            $buildType = "${{ parameters.buildType }}"
+            $getUrl = "https://api.github.com/repos/${repo}/contents/${filePath}?ref=${branch}"
+            $versionMajor = ${{ parameters.versionMajor }}
+            $versionMinor = ${{ parameters.versionMinor }}
+            $versionPatch = ${{ parameters.versionPatch }}
+
+            $headers = @{
+                Authorization = "token $token"
+                Accept = "application/vnd.github.v3+json"
+            }
+
+            try {
+                Write-Host "Fetching current JSON file..."
+                $fileInfo = Invoke-RestMethod -Uri $getUrl -Headers $headers -Method Get -Verbose
+                $currentContent = [System.Text.Encoding]::UTF8.GetString(
+                    [System.Convert]::FromBase64String($fileInfo.content)
+                )
+
+                $json = $currentContent | ConvertFrom-Json
+                if ($json.PSObject.Properties.Name -contains $buildType) {
+                    $currentMajor = $json.$buildType.VersionMajor
+                    $currentMinor = $json.$buildType.VersionMinor
+                    $currentPatch = $json.$buildType.VersionPatch
+                    Write-Host "Current $buildType version: v$currentMajor.$currentMinor.$currentPatch"
+
+                    $comparison = Compare-Versions `
+                        -Major1 $versionMajor -Minor1 $versionMinor -Patch1 $versionPatch `
+                        -Major2 $currentMajor -Minor2 $currentMinor -Patch2 $currentPatch
+
+                        if ($comparison -lt 0) {
+                            Write-Host ""
+                            Write-Host "================================================"
+                            Write-Host "⚠️ New version v$versionMajor.$versionMinor.$versionPatch is LOWER than current v$currentMajor.$currentMinor.$currentPatch"
+                            Write-Host "Aborting update. Only higher versions are pushed."
+                            Write-Host "================================================"
+                            exit 1
+                        }
+                        elseif ($comparison -eq 0) {
+                            Write-Host ""
+                            Write-Host "================================================"
+                            Write-Host "⚠️ Version v$versionMajor.$versionMinor.$versionPatch already exists"
+                            Write-Host "Skipping update to prevent duplicate."
+                            Write-Host "================================================"
+                            Write-Host ""
+                            exit 0
+                        }
+                        else {
+                            Write-Host "✓ New version v$versionMajor.$versionMinor.$versionPatch is HIGHER - proceeding with update"
+                        }
+                } else {
+                    Write-Host "No existing $buildType section found - proceeding with update"
+                }
+                Write-Host ""
+
+                $lines = $currentContent -split "`r?`n"
+                $inTargetSection = $false
+                $updatedLines = @()
+
+                foreach ($line in $lines) {
+                    if ($line -match "`"$buildType`"\s*:\s*\{") {
+                        $inTargetSection = $true
+                    }
+
+                    if ($inTargetSection) {
+                        if ($line -match '^\s*"VersionMajor"\s*:\s*\d+') {
+                            $indent = $line -replace '"VersionMajor".*', ''
+                            $line = $indent + '"VersionMajor": ' + $versionMajor + ','
+                        }
+                        elseif ($line -match '^\s*"VersionMinor"\s*:\s*\d+') {
+                            $indent = $line -replace '"VersionMinor".*', ''
+                            $line = $indent + '"VersionMinor": ' + $versionMinor + ','
+                        }
+                        elseif ($line -match '^\s*"VersionPatch"\s*:\s*\d+') {
+                            $indent = $line -replace '"VersionPatch".*', ''
+                            $line = $indent + '"VersionPatch": ' + $versionPatch + ','
+                        }
+                        elseif (($changeLog.Trim() -ne "") -and ($line -match '^\s*"Changes"\s*:')) {
+                            $indent = $line -replace '"Changes".*', ''
+                            $escaped = $changeLog.Trim() `
+                            -replace '\\', '\\' `
+                            -replace '"', '\"' `
+                            -replace "`n", '\n' `
+                            -replace "`r", '' `
+                            -replace "`t", '\t'
+                            $line = $indent + '"Changes": "' + $escaped + '"'
+                        }
+
+                        if ($line -match '^\s*\}') {
+                            $inTargetSection = $false
+                        }
+                    }
+
+                    $updatedLines += $line
+                }
+
+                $newContent = ($updatedLines -join "`n")
+                $contentBytes = [System.Text.Encoding]::UTF8.GetBytes($newContent)
+                $contentBase64 = [System.Convert]::ToBase64String($contentBytes)
+                $commitMessage = "Update $buildType to v$versionMajor.$versionMinor.$versionPatch via Azure Pipelines"
+
+                $updateBody = @{
+                    message = $commitMessage
+                    content = $contentBase64
+                    sha = $fileInfo.sha
+                    branch = $branch
+                } | ConvertTo-Json -Depth 10
+
+                Write-Host "Pushing changes to GitHub..."
+                $putUrl = "https://api.github.com/repos/$repo/contents/$filePath"
+                $response = Invoke-RestMethod -Uri $putUrl -Headers $headers -Method Put -Body $updateBody -ContentType "application/json"
+
+                Write-Host ""
+                Write-Host "================================================"
+                Write-Host "✅ Successfully updated $buildType section"
+                Write-Host "================================================"
+            } catch {
+                Write-Host ""
+                Write-Host "================================================"
+                Write-Host "❌ Failed to update JSON file"
+                Write-Host "Error: $($_.Exception.Message)"
+                Write-Host "Status Code: $($_.Exception.Response.StatusCode.value__)"
+                Write-Host "Request URL: $getUrl"
+                if ($_.ErrorDetails.Message) {
+                    Write-Host "Details: $($_.ErrorDetails.Message)"
+                }
+                Write-Host "================================================"
+                exit 1
+            }
+        condition: succeeded()
+        env:
+          GITHUB_TOKEN: $(GITHUB_PAT)
diff --git a/.azure-pipelines/templates/upload-symbols.yml b/.azure-pipelines/templates/upload-symbols.yml
new file mode 100644
index 0000000000..6397ef5904
--- /dev/null
+++ b/.azure-pipelines/templates/upload-symbols.yml
@@ -0,0 +1,360 @@
+# templates/upload-symbols.yml
+# Template for uploading debug symbols to Discord
+
+parameters:
+  stageName: ''
+  displayName: ''
+  dependsOn: []
+  platforms: []
+  buildType: ''
+  poolName: ''
+  versionMajor: 0
+  versionMinor: 0
+  versionPatch: 0
+  condition: ''
+
+stages:
+  - stage: ${{ parameters.stageName }}
+    displayName: ${{ parameters.displayName }}
+    dependsOn: ${{ parameters.dependsOn }}
+    condition: ${{ parameters.condition }}
+
+    jobs:
+      - job: UploadSymbols
+        displayName: 'Upload Debug Symbols'
+        pool:
+          name: ${{ parameters.poolName }}
+
+        variables:
+          - name: VERSION
+            value: '${{ parameters.versionMajor }}.${{ parameters.versionMinor }}.${{ parameters.versionPatch }}'
+          - name: BUILD_DATE
+            value: $[format('{0:yyyy}{0:MM}{0:dd}', pipeline.startTime)]
+          - name: SHORT_SHA
+            value: $[substring(variables['Build.SourceVersion'], 0, 8)]
+          - name: BUILD_TYPE
+            value: '${{ parameters.buildType }}'
+          - name: WINDOWS_UPLOADED
+            value: 'false'
+          - name: LINUX_UPLOADED
+            value: 'false'
+          - name: MACOS_ARM64_UPLOADED
+            value: 'false'
+          - name: MACOS_X64_UPLOADED
+            value: 'false'
+
+        steps:
+          - checkout: none
+
+          - task: Cache@2
+            displayName: 'Restore Windows symbols'
+            inputs:
+              key: 'windows-symbols | "$(Build.BuildId)"'
+              path: $(Pipeline.Workspace)/symbols-windows
+              cacheHitVar: WINDOWS_CACHE_RESTORED
+            condition: and(succeeded(), contains('${{ join(',', parameters.platforms) }}', 'Windows'))
+
+          - task: Cache@2
+            displayName: 'Restore Linux symbols'
+            inputs:
+              key: 'ubuntu-symbols | "$(Build.BuildId)"'
+              path: $(Pipeline.Workspace)/symbols-linux
+              cacheHitVar: LINUX_CACHE_RESTORED
+            condition: and(succeeded(), contains('${{ join(',', parameters.platforms) }}', 'Linux'))
+
+          - task: Cache@2
+            displayName: 'Restore MacOS ARM64 symbols'
+            inputs:
+              key: 'macos-symbols-arm64 | "$(Build.BuildId)"'
+              path: $(Pipeline.Workspace)/symbols-macos-arm64
+              cacheHitVar: MACOS_ARM64_CACHE_RESTORED
+            condition: and(succeeded(), contains('${{ join(',', parameters.platforms) }}', 'MacOS_ARM64'))
+
+          - task: Cache@2
+            displayName: 'Restore MacOS x64 symbols'
+            inputs:
+              key: 'macos-symbols-x64 | "$(Build.BuildId)"'
+              path: $(Pipeline.Workspace)/symbols-macos-x64
+              cacheHitVar: MACOS_X64_CACHE_RESTORED
+            condition: and(succeeded(), contains('${{ join(',', parameters.platforms) }}', 'MacOS_x64'))
+
+          # Mount NAS share
+          - powershell: |
+              $ErrorActionPreference = 'Stop'
+              
+              $nasName = "$(NAS_NAME)"
+              $shareName = "SerialPrograms Symbols"
+              $nasPath = "\\$nasName\$shareName"
+              $username = "$(NAS_USERNAME)"
+              $password = "$(NAS_PASSWORD)"
+              
+              Write-Host "Mapping network drive to NAS..."
+              $netUseCmd = "net use Z: `"$nasPath`" /user:`"$username`" `"$password`" /persistent:no"
+              Invoke-Expression $netUseCmd
+              
+              if ($LASTEXITCODE -ne 0) {
+                throw "Failed to map network drive"
+              }
+              
+              Write-Host "✓ NAS mounted successfully at Z:"
+            displayName: 'Mount NAS Share'
+            condition: succeeded()
+            env:
+              NAS_USERNAME: $(NAS_USERNAME)
+              NAS_PASSWORD: $(NAS_PASSWORD)
+              NAS_NAME: $(NAS_NAME)
+
+          # Upload Windows symbols
+          - powershell: |
+              $ErrorActionPreference = 'Stop'
+              
+              $version = "$(VERSION)"
+              $symbolsDir = "$(Pipeline.Workspace)\symbols-windows"
+              $buildDate = "$(BUILD_DATE)"
+              $shortSha = "$(SHORT_SHA)"
+              $buildType = "$(BUILD_TYPE)"
+              
+              if (-not (Test-Path $symbolsDir)) {
+                Write-Host "Windows symbols not found"
+                exit 1
+              }
+
+              Write-Host "=== Packaging Windows symbols ==="
+              $archiveName = "SerialPrograms-Windows-$version-$buildDate-$shortSha.zip"
+              $archivePath = Join-Path $symbolsDir $archiveName
+
+              Push-Location $symbolsDir
+              $pdbFiles = Get-ChildItem -Filter "*.pdb"
+              
+              if ($pdbFiles.Count -eq 0) {
+                Write-Host "No Windows symbols found to upload"
+                Pop-Location
+                exit 1
+              }
+              
+              Compress-Archive -Path *.pdb -DestinationPath $archiveName -CompressionLevel Optimal -Force
+              Pop-Location
+              
+              if (-not (Test-Path $archivePath)) {
+                Write-Host "Failed to create archive"
+                exit 1
+              }
+              
+              Copy-Item $archivePath "Z:\Windows\$buildType" -Force
+              Write-Host "##vso[task.setvariable variable=WINDOWS_UPLOADED]true"
+              
+              Write-Host "✓ Windows symbols uploaded to NAS"
+            displayName: 'Upload Windows Symbols'
+            condition: and(succeeded(), eq(variables.WINDOWS_CACHE_RESTORED, 'true'))
+
+          # Upload Linux symbols
+          - powershell: |
+              $ErrorActionPreference = 'Stop'
+              
+              $version = "$(VERSION)"
+              $symbolsDir = "$(Pipeline.Workspace)\symbols-linux"
+              $buildDate = "$(BUILD_DATE)"
+              $shortSha = "$(SHORT_SHA)"
+              $buildType = "$(BUILD_TYPE)"
+              
+              if (-not (Test-Path $symbolsDir)) {
+                Write-Host "Linux symbols not found"
+                exit 1
+              }
+              
+              Write-Host "=== Packaging Linux symbols ==="
+              $archiveName = "SerialPrograms-Linux-$version-$buildDate-$shortSha.tar.gz"
+              $archivePath = Join-Path $symbolsDir $archiveName
+              
+              Push-Location $symbolsDir
+              $debugFiles = Get-ChildItem -Filter "*.debug" -ErrorAction SilentlyContinue
+              $execFile = Get-Item "SerialPrograms" -ErrorAction SilentlyContinue
+              
+              if ($debugFiles.Count -eq 0 -and -not $execFile) {
+                Write-Host "No Linux symbols found to upload"
+                Pop-Location
+                exit 1
+              }
+              
+              Write-Host "Creating tar.gz archive..."
+              $filesToArchive = @()
+              if ($debugFiles) { $filesToArchive += "*.debug" }
+              if ($execFile) { $filesToArchive += "SerialPrograms" }
+              
+              tar -czf $archiveName $filesToArchive
+              Pop-Location
+              
+              if (-not (Test-Path $archivePath)) {
+                Write-Host "Failed to create archive"
+                exit 1
+              }
+              
+              Copy-Item $archivePath "Z:\Linux\$buildType" -Force
+              Write-Host "##vso[task.setvariable variable=LINUX_UPLOADED]true"
+              Write-Host "✓ Linux symbols uploaded to NAS"
+            displayName: 'Upload Linux Symbols'
+            condition: and(succeeded(), eq(variables.LINUX_CACHE_RESTORED, 'true'))
+
+          # Upload MacOS ARM64 symbols
+          - powershell: |
+              $ErrorActionPreference = 'Stop'
+              
+              $version = "$(VERSION)"
+              $symbolsDir = "$(Pipeline.Workspace)\symbols-macos-arm64"
+              $buildDate = "$(BUILD_DATE)"
+              $shortSha = "$(SHORT_SHA)"
+              $buildType = "$(BUILD_TYPE)"
+              
+              if (-not (Test-Path $symbolsDir)) {
+                Write-Host "MacOS ARM64 symbols not found"
+                exit 1
+              }
+              
+              Write-Host "=== Packaging MacOS ARM64 symbols ==="
+              $archiveName = "SerialPrograms-MacOS-ARM64-Symbols-$version-$buildDate-$shortSha.tar.gz"
+              $archivePath = Join-Path $symbolsDir $archiveName
+
+              Push-Location $symbolsDir
+              $dsymFiles = Get-ChildItem -Filter "*.dSYM" -ErrorAction SilentlyContinue
+              $execFile = Get-Item "SerialPrograms" -ErrorAction SilentlyContinue
+              
+              if ($dsymFiles.Count -eq 0 -and -not $execFile) {
+                Write-Host "No MacOS ARM64 symbols found to upload"
+                Pop-Location
+                exit 1
+              }
+              
+              Write-Host "Creating tar.gz archive..."
+              $filesToArchive = @()
+              if ($dsymFiles) { $filesToArchive += "*.dSYM" }
+              if ($execFile) { $filesToArchive += "SerialPrograms" }
+              
+              tar -czf $archiveName $filesToArchive
+              Pop-Location
+              
+              if (-not (Test-Path $archivePath)) {
+                Write-Host "Failed to create archive"
+                exit 1
+              }
+              
+              Copy-Item $archivePath "Z:\MacOS_ARM64\$buildType" -Force
+              Write-Host "##vso[task.setvariable variable=MACOS_ARM64_UPLOADED]true"
+              Write-Host "✓ MacOS ARM64 symbols uploaded to NAS"
+            displayName: 'Upload MacOS ARM64 Symbols'
+            condition: and(succeeded(), eq(variables.MACOS_ARM64_CACHE_RESTORED, 'true'))
+
+          # Upload MacOS x64 symbols
+          - powershell: |
+              $ErrorActionPreference = 'Stop'
+              
+              $version = "$(VERSION)"
+              $symbolsDir = "$(Pipeline.Workspace)\symbols-macos-x64"
+              $buildDate = "$(BUILD_DATE)"
+              $shortSha = "$(SHORT_SHA)"
+              $buildType = "$(BUILD_TYPE)"
+              
+              if (-not (Test-Path $symbolsDir)) {
+                Write-Host "MacOS x64 symbols not found"
+                exit 1
+              }
+              
+              Write-Host "=== Packaging MacOS x64 symbols ==="
+              $archiveName = "SerialPrograms-MacOS-x64-Symbols-$version-$buildDate-$shortSha.tar.gz"
+              $archivePath = Join-Path $symbolsDir $archiveName
+              
+              Push-Location $symbolsDir
+              $dsymFiles = Get-ChildItem -Filter "*.dSYM" -ErrorAction SilentlyContinue
+              $execFile = Get-Item "SerialPrograms" -ErrorAction SilentlyContinue
+              
+              if ($dsymFiles.Count -eq 0 -and -not $execFile) {
+                Write-Host "No MacOS x64 symbols found to upload"
+                Pop-Location
+                exit 1
+              }
+
+              Write-Host "Creating tar.gz archiv..."
+              $filesToArchive = @()
+              if ($dsymFiles) { $filesToArchive += "*.dSYM" }
+              if ($execFile) { $filesToArchive += "SerialPrograms" }
+              
+              tar -czf $archiveName $filesToArchive
+              Pop-Location
+              
+              if (-not (Test-Path $archivePath)) {
+                Write-Host "Failed to create archive"
+                exit 1
+              }
+              
+              Copy-Item $archivePath "Z:\MacOS_x64\$buildType" -Force
+              Write-Host "##vso[task.setvariable variable=MACOS_X64_UPLOADED]true"
+              Write-Host "✓ MacOS x64 symbols uploaded to NAS"
+            displayName: 'Upload MacOS x64 Symbols'
+            condition: and(succeeded(), eq(variables.MACOS_X64_CACHE_RESTORED, 'true'))
+
+          # Send Discord notification
+          - powershell: |
+              $ErrorActionPreference = 'Stop'
+              [Console]::OutputEncoding = [System.Text.Encoding]::UTF8
+              $PSDefaultParameterValues['*:Encoding'] = 'utf8'
+
+              $version = "$(VERSION)"
+              $webhook = "$(DISCORD_SYMBOLS_WEBHOOK)"
+              $nasUrl = "$(NAS_DOMAIN_URL)"
+              $buildId = "$(Build.BuildId)"
+              $buildType = "$(BUILD_TYPE)"
+              $commit = "$(SHORT_SHA)"
+              $buildDate = "$(BUILD_DATE)"
+              $platforms = ""
+
+              if ("$(WINDOWS_UPLOADED)" -eq "true") { $platforms += "✅ Windows (x64, MSVC)`n" }
+              if ("$(LINUX_UPLOADED)" -eq "true") { $platforms += "✅ Linux (x64, GCC)`n" }
+              if ("$(MACOS_ARM64_UPLOADED)" -eq "true") { $platforms += "✅ MacOS (ARM64, Clang)`n" }
+              if ("$(MACOS_X64_UPLOADED)" -eq "true") { $platforms += "✅ MacOS (x64, Clang)`n" }
+
+              $timestamp = (Get-Date).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ssZ")
+              if ([string]::IsNullOrEmpty($platforms)) {
+                Write-Host "No symbols were uploaded"
+                $errorPayload = @{
+                  embeds = @(
+                    @{
+                      title = "No Debug Symbols Uploaded"
+                      description = "No debug symbols were available to upload for this build."
+                      color = 15158332
+                      footer = @{ text = "Azure DevOps Pipeline" }
+                      timestamp = $timestamp
+                    }
+                  )
+                } | ConvertTo-Json -Depth 10
+                
+                Invoke-RestMethod -Uri $webhook -Method Post -Body $errorPayload -ContentType "application/json"
+                exit 1
+              }
+
+              $payload = [PSCustomObject]@{
+                embeds = @(
+                  [PSCustomObject]@{
+                    title = "Debug Symbols Uploaded Successfully"
+                    url = $nasUrl
+                    description = "**Version:** $version`n**Build ID:** $buildId`n**Build Type:** $buildType`n**Short commit SHA:** $commit`n**Date:** $buildDate`n`n**Platforms:**`n$platforms`n`n**[📦 Open NAS Symbols]($nasUrl)**"
+                    color = 3066993
+                    footer = [PSCustomObject]@{ text = "Azure DevOps Pipeline" }
+                    timestamp = $timestamp
+                  }
+                )
+              }
+
+              $json = $payload | ConvertTo-Json -Depth 10 -Compress
+              $utf8Bytes = [System.Text.Encoding]::UTF8.GetBytes($json)
+              Invoke-RestMethod -Uri $webhook -Method Post -Body $utf8Bytes -ContentType "application/json; charset=utf-8"
+              Write-Host "✓ Discord notification sent"
+            displayName: 'Send Discord Notification'
+            condition: always()
+            env:
+              DISCORD_SYMBOLS_WEBHOOK: $(DISCORD_SYMBOLS_WEBHOOK)
+              NAS_DOMAIN_URL: $(NAS_DOMAIN_URL)
+
+          - powershell: |
+              net use Z: /delete /yes 2>$null
+              Write-Host "NAS drive unmounted"
+            displayName: 'Unmount NAS Share'
+            condition: always()
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000000..5378fe089b
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+* -text
\ No newline at end of file
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 0000000000..0065b5763d
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
diff --git a/.github/scripts/clang-query-cached.py b/.github/scripts/clang-query-cached.py
new file mode 100644
index 0000000000..b3e2eec834
--- /dev/null
+++ b/.github/scripts/clang-query-cached.py
@@ -0,0 +1,378 @@
+#!/usr/bin/env python3
+"""Run clang-query on every source file of a build, but skip the files whose result is known.
+
+The "Run clang query" step in ``cpp-ci-serial-programs-base.yml`` runs clang-query on every
+source file to find forbidden code.
+If we run it on all files without a cache, parsing ~1500 files takes 11 to 24 minutes on a
+4-core runner, but most changes touch only a few files.
+So this script utilizes a cache called ``clang-query-passed.txt``. Each line of the file is
+a hash computed from a source file and its dependencies. It tells us which files (or more
+accurately, which file contents) already pass clang-query and don't need to be run on them
+again.
+
+If the source file content changes, the hash will change accordingly, so we know to run
+clang-query on it.
+
+To ensure correctness, the hash is computed by other data as well so we don't miss a file:
+
+- The file that stores the forbidden code query rule (``query.txt``).
+- This script.
+- The clang-query version.
+- The C++ standard library version.
+- The compile command (include folders, defines, flags) of each entry of the file.
+- The content of the file and every header it includes directly and indirectly.
+
+Quick lecture of clang-query:
+clang-query parses C++ code syntax so we can look for forbidden code pattern like building
+a std::filesystem::path from a std::string.
+clang-query runs the clang compiler preprocessor to expand all the macros and replace "#include"
+with header file content. It then parses the code into a syntax tree (AST).
+It takes about 2-4 sec to do the above on a source file.
+To run clang-query:
+
+    clang-query -p SerialPrograms/bin -f query.txt file1.cpp file2.cpp ... fileN.cpp
+
+-p: folder where compile_commands.json is. clang-query reads it to know each file’s compile
+  settings (include folders, defines, flags).
+-f: the query file, the rules to match forbidden code.
+- file1.cpp ... input source file list.
+
+Usage::
+
+    clang-query-cached.py --build-dir SerialPrograms/bin --query query.txt \\
+        --cache clang-query-passed.txt --output clang-query-output.txt
+
+--build-dir: the build folder where compile_commands.json is. clang-query reads it to know each
+  file's compile settings (include folders, defines, flags).
+--query: the query file holding rules to match forbidden code, to pass to clang-query.
+--cache: the cache file to store which files already pass clang-query. It will be read by the
+  script if it exists and then overwritten with the new list.
+--output: the clang-query output goes there. It prints the matched files.
+
+The script exits with 1 if a clang-query process failed, else 0. It also exits with 0 when
+clang-query finds forbidden code, so the caller must look for "Match #" in the output file.
+"""
+
+# Keep the type hints as text, so that hints like ``list[str]`` and ``str | None`` also work on
+# Python 3.8 and 3.9. This script supports Python 3.8 and newer.
+from __future__ import annotations
+
+import argparse
+import concurrent.futures
+import glob
+import hashlib
+import json
+import os
+import re
+import shlex
+import subprocess
+import sys
+from dataclasses import asdict, dataclass, fields
+from typing import Any
+
+
+# Files per clang-query process. clang-query parses all of its files before it matches, and
+# keeps every AST in memory. With 10 files, 4 processes use about 7 GB at most.
+BATCH_SIZE = 10
+
+# List at most this many of the files to check in the log.
+MAX_FILES_TO_LIST = 10
+
+# One word of a make rule: anything but whitespace, where a backslash before a space or a "#"
+# makes that character part of the word.
+MAKE_WORD = re.compile(r"(?:\\[ #]|\S)+")
+
+
+@dataclass
+class CompileCommand:
+    """Represents one entry of ``compile_commands.json``
+
+    Each entry stores how the build compiled one source file for one target.
+    """
+
+    # Root folder the compiler ran in.
+    directory: str
+    # Source file, e.g. ``/src/SerialPrograms/Source/Foo.cpp``. It is an absolute path, or a
+    # path relative to the root folder `directory`.
+    file: str
+    # Compile command as one string. CMake wrote this field.
+    command: str | None = None
+    # Compile command as a list of words. Some other tools wrote this field instead.
+    arguments: list[str] | None = None
+    # Object file, e.g. ``CMakeFiles/SerialProgramsLib.dir/Source/Foo.cpp.o``. The compiler
+    # writes the ``.d`` file next to it.
+    output: str | None = None
+
+
+def make_global_key(query_path: str) -> str:
+    """Return a hash for those that are the same for all files: the query file, this script,
+    and the versions of clang-query and the C++ standard library.
+
+    This global hash will be combined with file-specific hash to create the final hash (the
+    key) of every source file.
+    """
+    hasher = hashlib.sha256()
+    for path in [query_path, __file__]:
+        with open(path, "rb") as file:
+            hasher.update(file.read())
+    version = subprocess.run(["clang-query", "--version"], capture_output=True, check=True)
+    hasher.update(version.stdout)
+    # Hash the names of the installed GCC and C++ standard library version folders, e.g.
+    # ``/usr/include/c++/14``.
+    for pattern in ["/usr/include/c++/*", "/usr/lib/gcc/*/*"]:
+        hasher.update("\n".join(sorted(glob.glob(pattern))).encode())
+    return hasher.hexdigest()
+
+
+def split_make_words(line: str) -> list[str]:
+    """Split one line of a make rule into words.
+
+    A backslash before a space or a ``#`` keeps it in the word, and ``$$`` is a ``$``. For
+    example, ``a\\ b.h c.h`` gives ``["a b.h", "c.h"]``.
+    """
+    return [
+        re.sub(r"\\([ #])", r"\1", word).replace("$$", "$")
+        for word in MAKE_WORD.findall(line)
+    ]
+
+
+def read_dependency_file(path: str) -> list[str] | None:
+    """Return the files listed in the make-style dependency file at `path`, or None if the
+    file does not exist.
+
+    GCC and clang write these files with ``-MD``. They list every file that the compiler
+    opened, at any include depth. For example::
+
+        CMakeFiles/SerialProgramsLib.dir/Source/Foo.cpp.o: \\
+          /src/SerialPrograms/Source/Foo.cpp \\
+          /src/SerialPrograms/Source/Foo.h
+
+    gives ``["/src/SerialPrograms/Source/Foo.cpp", "/src/SerialPrograms/Source/Foo.h"]``.
+    """
+    try:
+        # A path can have bytes that are not UTF-8. "surrogateescape" keeps them as they are.
+        with open(path, encoding="utf-8", errors="surrogateescape") as file:
+            text = file.read()
+    except FileNotFoundError:
+        return None
+    dependencies: list[str] = []
+    # A backslash at the end of a line continues the rule on the next line.
+    for line in text.replace("\\\n", " ").splitlines():
+        words = split_make_words(line)
+        # The word that ends with ":" is the target. The words after it are its dependencies.
+        for index, word in enumerate(words):
+            if word.endswith(":"):
+                dependencies.extend(words[index + 1:])
+                break
+    return dependencies
+
+
+class DependencyHasher:
+    """Acts as a dependency file hash cache so each dependency file is hashed only once.
+
+    Each source file has about 1000 "#include" dependencies, but most of them are headers that
+    hundreds of source files share. So all source files together have only a few thousand
+    different dependencies.
+    """
+
+    def __init__(self) -> None:
+        # (folder of the compile command, path in the ``.d`` file) -> normalized path
+        self.dependency_to_path: dict[tuple[str, str], str] = {}
+        # normalized path -> key part of the file, or None if the file cannot be read
+        self.path_to_key_part: dict[str, str | None] = {}
+
+    def key_part(self, directory: str, dependency: str) -> str | None:
+        """Return the part of a file key for one dependency, or None if it cannot be read.
+
+        Args:
+            directory: folder that the compile command ran in.
+            dependency: path from a ``.d`` file, relative to `directory` if not absolute.
+
+        Returns:
+            the normalized path and the SHA-256 of the contents, as ``"<path>\\0<sha256>\\0"``.
+        """
+        path = self.dependency_to_path.get((directory, dependency))
+        if path is None:
+            path = os.path.normpath(os.path.join(directory, dependency))
+            self.dependency_to_path[(directory, dependency)] = path
+        if path not in self.path_to_key_part:
+            try:
+                with open(path, "rb") as file:
+                    file_hash = hashlib.sha256(file.read()).hexdigest()
+                self.path_to_key_part[path] = f"{path}\0{file_hash}\0"
+            except OSError:
+                self.path_to_key_part[path] = None
+        return self.path_to_key_part[path]
+
+
+def make_file_key(
+    global_key: str, entries: list[CompileCommand], dependency_hasher: DependencyHasher
+) -> str | None:
+    """Return the key of one source file, or None if the key cannot be made.
+
+    The key covers all `entries` of the file, because a file that is built into more than
+    one target has one entry per target, and clang-query checks all of them. A file without
+    a key always runs. That happens when an entry has no ``output``, when its ``.d`` file is
+    missing, or when a file listed there cannot be read.
+    """
+    key = hashlib.sha256(global_key.encode())
+    # Sort the entries, so that the key is the same in any entry order.
+    for entry in sorted(entries, key=lambda e: json.dumps(asdict(e), sort_keys=True)):
+        directory = entry.directory
+        arguments = entry.arguments or shlex.split(entry.command or "")
+        # add compiler command (include folders, defines, flags) to hash
+        key.update(json.dumps([directory, arguments]).encode())
+
+        if entry.output is None:
+            return None
+        dependencies = read_dependency_file(os.path.join(directory, entry.output + ".d"))
+        if dependencies is None:
+            return None
+        key_parts: set[str] = set()
+        for dependency in dependencies:
+            key_part = dependency_hasher.key_part(directory, dependency)
+            if key_part is None:
+                return None
+            key_parts.add(key_part)
+        # add each dependency file hash to hash
+        key.update("".join(sorted(key_parts)).encode())
+    return key.hexdigest()
+
+
+def read_compile_commands(build_dir: str) -> dict[str, list[CompileCommand]]:
+    """Return the entries of ``<build_dir>/compile_commands.json``, grouped by source file.
+
+    For example, ``{"/src/Foo.cpp": [<entry for target A>, <entry for target B>]}``.
+    """
+    with open(os.path.join(build_dir, "compile_commands.json")) as file:
+        json_entries: list[dict[str, Any]] = json.load(file)
+    # Keep only the fields that `CompileCommand` has. Some tools write more fields.
+    field_names = {field.name for field in fields(CompileCommand)}
+    # file path -> list of compile_commands.json entries tied to this file
+    file_to_entries: dict[str, list[CompileCommand]] = {}
+    for json_entry in json_entries:
+        entry = CompileCommand(**{k: v for k, v in json_entry.items() if k in field_names})
+        file_to_entries.setdefault(entry.file, []).append(entry)
+    return file_to_entries
+
+
+def read_passed_keys(cache_path: str) -> set[str]:
+    """Read cache keys from the cache file at `cache_path`.
+
+    Each line of the cache file is a hash as a cache key representing if a file already
+    passes clang-query before.
+
+    If no such file, return an empty set.
+    """
+    if not os.path.exists(cache_path):
+        return set()
+    with open(cache_path) as file:
+        return set(file.read().split())
+
+
+def run_clang_query(build_dir: str, query_file_path: str, files: list[str]) -> tuple[int, str]:
+    """Run one clang-query process on `files`.
+
+    Returns:
+        the exit code, and the output with stdout and stderr together.
+    """
+    result = subprocess.run(
+        ["clang-query", "-p", build_dir, "-f", query_file_path, *files],
+        stdout=subprocess.PIPE,
+        stderr=subprocess.STDOUT,
+        text=True,
+        # The output quotes source code, which can have bytes that are not UTF-8.
+        errors="replace",
+    )
+    return result.returncode, result.stdout
+
+
+def check_files(
+    build_dir: str, query_file_path: str, files_to_check: list[str],
+    file_to_key: dict[str, str | None], output_path: str,
+) -> tuple[set[str], bool]:
+    """Run clang-query on `files_to_check` in batches, one batch per core at a time, and write
+    all of its output to `output_path`.
+
+    Returns:
+        the keys of the files in the batches that passed, and True if a clang-query process
+        failed.
+    """
+    batches = [
+        files_to_check[i:i + BATCH_SIZE] for i in range(0, len(files_to_check), BATCH_SIZE)
+    ]
+    passed_keys: set[str] = set()
+    failed = False
+    with open(output_path, "w") as output, \
+            concurrent.futures.ThreadPoolExecutor(max_workers=os.cpu_count()) as pool:
+        future_to_batch = {
+            pool.submit(run_clang_query, build_dir, query_file_path, batch): batch
+            for batch in batches
+        }
+        for future in concurrent.futures.as_completed(future_to_batch):
+            batch = future_to_batch[future]
+            exit_code, batch_output = future.result()
+            output.write(batch_output)
+            if exit_code != 0:
+                failed = True
+            # A batch with an error or a match adds no keys, so all of its files run again
+            # next time.
+            elif "Match #" not in batch_output:
+                batch_keys = [file_to_key[source_file] for source_file in batch]
+                passed_keys.update(key for key in batch_keys if key is not None)
+    return passed_keys, failed
+
+
+def main() -> int:
+    parser = argparse.ArgumentParser(description=__doc__.splitlines()[0])
+    parser.add_argument("--build-dir", required=True, help="Folder with compile_commands.json.")
+    parser.add_argument("--query", required=True, help="clang-query script to run on each file.")
+    parser.add_argument("--cache", required=True, help="List of keys of files that passed.")
+    parser.add_argument("--output", required=True, help="Where to write the clang-query output.")
+    args = parser.parse_args()
+
+    file_to_entries: dict[str, list[CompileCommand]] = read_compile_commands(args.build_dir)
+    passed_keys_before: set[str] = read_passed_keys(args.cache)
+
+    # make a global key to hash the dependencies that are the same for all the source files:
+    # clang-query version, C++ standard library versions, query file and this script.
+    global_key: str = make_global_key(args.query)
+    dependency_hasher = DependencyHasher()
+    file_to_key: dict[str, str | None] = {}
+    passed_keys_now: set[str] = set()
+    files_to_check: list[str] = []
+    for source_file, entries in sorted(file_to_entries.items()):
+        # compute cache key for each file
+        key = make_file_key(global_key, entries, dependency_hasher)
+        file_to_key[source_file] = key
+        if key is not None and key in passed_keys_before:
+            passed_keys_now.add(key)
+        else:
+            files_to_check.append(source_file)
+
+    files_without_key = sum(1 for key in file_to_key.values() if key is None)
+    print(
+        f"clang-query cache: {len(file_to_entries)} files, {len(passed_keys_now)} passed "
+        f"before and are skipped, {len(files_to_check)} to check ({files_without_key} of them "
+        f"failed to compute a key)."
+    )
+    for source_file in files_to_check[:MAX_FILES_TO_LIST]:
+        no_key_note = "" if file_to_key[source_file] else " (no key)"
+        print(f"    {os.path.relpath(source_file)}{no_key_note}")
+    # Show the summary in the CI log now. Checking the files can take many minutes.
+    sys.stdout.flush()
+
+    # check the other files, and save the new list of files that passed
+    newly_passed_keys, failed = check_files(
+        args.build_dir, args.query, files_to_check, file_to_key, args.output
+    )
+    passed_keys_now |= newly_passed_keys
+    # write the file cache back:
+    with open(args.cache, "w") as file:
+        file.write("".join(key + "\n" for key in sorted(passed_keys_now)))
+    print(f"clang-query cache: {len(passed_keys_now)} files in the new list of files that passed.")
+    return 1 if failed else 0
+
+
+if __name__ == "__main__":
+    sys.exit(main())
diff --git a/.github/scripts/clang-query.sh b/.github/scripts/clang-query.sh
new file mode 100644
index 0000000000..8d1ec28dc4
--- /dev/null
+++ b/.github/scripts/clang-query.sh
@@ -0,0 +1,256 @@
+#!/usr/bin/env bash
+set -e
+
+# This script will get the diff between the current branch and the main branch. 
+# It will then find all files that depend on these diff files, by 
+# using clang-scan-deps to generate the dependency graph.
+# The clang-query is then run on these diffed files (and their dependants).
+# One weakness of this is that this diff only compares the current branch and main branch,
+# and so is mainly helpful for PRs. But doesn't help when committing directly to main, or
+# after merging the PR. This isn't insurmountable, but I felt it was getting too messy.
+
+
+# to get this script to work in Github CI:
+# Update cpp-ci-serial-programs-base.yml: 
+# - Set fetch-depth to 0 to fetch all commits for the diff. with blob:none so you're not downloading all that data
+# with:
+# 	path: 'Arduino-Source'
+# 	submodules: 'recursive'
+# 	fetch-depth: 0
+# 	filter: blob:none
+#
+# - when installing clang-tools, specify a version. e.g. clang-tools-18
+# sudo apt install clang-tools-18 libopencv-dev
+#
+# - under run clang query: set working directory. run this script
+# name: Run clang query
+#      if: inputs.run-clang-query
+#      working-directory: ./Arduino-Source
+#      run : bash ./.github/scripts/clang-query.sh
+# - this script should be placed within the folder .github/scripts
+#
+# other files to consider updating
+# .gitattributes: *.sh text eol=lf
+
+
+# to get this script to work locally in Windows:
+# Open Git Bash. cd to root of the repo (Arduino-Source). Run the following command:
+# sh .github/scripts/clang-query.sh
+
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+REPO_ROOT="$(cd "$SCRIPT_DIR/../.." && pwd)"
+TMP_DIR="$REPO_ROOT/.ci_tmp"
+mkdir -p "$TMP_DIR"
+
+# Define the cleanup function
+cleanup() {
+    echo "Cleaning up temporary files..."
+    rm -rf "$TMP_DIR"
+}
+
+# Register the trap: run cleanup on EXIT, plus common signals like INT (Ctrl+C) or TERM
+# trap cleanup EXIT INT TERM
+
+
+cd "$REPO_ROOT"
+
+# find path to compile_commands.json
+if [ -f "$REPO_ROOT/SerialPrograms/bin/compile_commands.json" ]; then
+    DB_PATH="$REPO_ROOT/SerialPrograms/bin/compile_commands.json"
+elif [ -f "$REPO_ROOT/build/RelWithDebInfo/compile_commands.json" ]; then
+    DB_PATH="$REPO_ROOT/build/RelWithDebInfo/compile_commands.json"
+else
+    echo "Error: compile_commands.json not found!"
+    exit 1
+fi
+
+
+echo "Generating clang-scan-deps experimental-full > deps.json."
+
+# in ubuntu, the command is clang-scan-deps-18. in Windows, it is clang-scan-deps
+SCAN_DEPS=$(command -v clang-scan-deps-18 || command -v clang-scan-deps)
+
+# Safety check: Exit if the tool isn't found
+if [ -z "$SCAN_DEPS" ]; then
+  echo "Error: clang-scan-deps (or version -18) not found in PATH."
+  exit 1
+fi
+
+
+# filter compile_commands.json, to remove .rc files, since clang-scan-deps doesn't recognize this format
+jq '[.[] | select(.file | endswith(".rc") | not)]' "$DB_PATH" > "$TMP_DIR/compile_commands_filtered.json"
+
+# get dependency graph
+"$SCAN_DEPS" -compilation-database "$TMP_DIR/compile_commands_filtered.json" -format experimental-full > "$TMP_DIR/deps.json"
+
+# normalize slashes
+# sed 's|\\\\|/|g' deps.json > normalized_deps.json
+sed -i 's|\\\\|/|g' "$TMP_DIR/deps.json"
+
+# check if deps.json has the expected keys
+# because we are relying on clang-scan-deps experimental-full, where the names of the keys can change.
+TU_KEY="translation-units"
+CMD_KEY="commands"
+DEPS="file-deps"
+INPUT="input-file"
+
+JQ_SCRIPT=$(cat << 'EOF'
+	# 1. Access the target object
+  (.[$TU][0][$CMD][0]) as $target
+  
+  # 2. Define the required keys
+
+  | [$DEPS, $INPUT] as $required
+
+  | (
+	if .[$TU] == null then 
+		"Missing: \($TU). Keys found at top-level: \(keys_unsorted)"
+	elif .[$TU][0] == null then 
+		"Missing: \($TU)[0]"
+	elif .[$TU][0].[$CMD] == null then 
+		"Missing: \($TU)[0].\($CMD). Keys found from \($TU)[0]: \(.[$TU][0] | keys_unsorted)"
+	elif $target == null then 
+		"Missing: \($TU)[0].[$CMD][0]"
+	elif ($required | all(. as $req | $target | has($req)) | not) then
+	  "Missing: One or more required keys \($required). Found: \($target | keys_unsorted)"
+	# elif (.[$TU][0].[$CMD][0] | keys_unsorted | any(. == [$DEPS] or . == [$INPUT]) | not) then
+	#     "Missing: both \($DEPS) and \($INPUT). Found: \(.[$TU][0][$CMD][0] | keys_unsorted)"
+	else 
+	  "All keys \($required) found in \($TU)[0].\($CMD)[0]"
+	end
+  ) as $result
+
+  | if ($result | type == "string" and startswith("Missing:")) then 
+		("\($result). The keys within the experimental-full format from clang-scan-deps can change over time. Please fix the CI to use the correct keys.") | halt_error
+		else $result end
+EOF
+)
+
+echo "Checking keys in deps.json."
+jq -r "$JQ_SCRIPT" \
+	--arg TU "$TU_KEY" \
+	--arg CMD "$CMD_KEY" \
+	--arg DEPS "$DEPS" \
+	--arg INPUT "$INPUT" \
+	"$TMP_DIR/deps.json"
+
+echo "Generating changed_files.txt from git diff."
+
+# git diff with relative paths
+git diff --name-only origin/main...HEAD > "$TMP_DIR/changed_files.txt"
+
+# if [ "$GITHUB_ACTIONS" == "true" ]; then
+#     if [ "$GITHUB_EVENT_NAME" == "pull_request" ]; then
+#         # Compare PR branch to target branch (main)
+#         BASE="origin/$GITHUB_BASE_REF"
+#     else
+#         # Compare current push to previous state
+#         BASE="${{ github.event.before }}"
+#     fi
+#     HEAD="$GITHUB_SHA"
+# else
+#     # LOCAL: Compare local main to the last known state on server
+#     # (Assuming you are on main and want to see what you just pushed/changed)
+#     git fetch origin main
+#     BASE="origin/main"
+#     HEAD="HEAD"
+# fi
+
+echo "Generating files_to_query.txt, based on changed_files.txt and deps.json."
+
+# for each line in changed_files_unix.txt, search deps.json to find all their dependants
+jq -r --rawfile mod "$TMP_DIR/changed_files.txt" \
+	--arg TU "$TU_KEY" \
+	--arg CMD "$CMD_KEY" \
+	--arg DEPS "$DEPS" \
+	--arg INPUT "$INPUT" '
+  # 1. Clean the list of changed files
+  ($mod | split("\n") | map(select(length > 0))) as $changes |
+  
+  # 2. Access the translation-units array
+  [ .[$TU][] | .[$CMD][] | 
+	select(
+	  # 3. Check "file-deps" for matches
+	  .[$DEPS][] | . as $dp | 
+	  any($changes[]; . as $c | $dp | endswith($c))
+	) | 
+	# 4. Get the source file path
+	.[$INPUT] 
+  ] | unique[]
+' "$TMP_DIR/deps.json" | tr -d '\r' > "$TMP_DIR/files_to_query.txt"
+
+
+
+cat << 'EOF' > "$TMP_DIR/query.txt"
+set output dump
+match invocation(
+  isExpansionInFileMatching("SerialPrograms/"),
+  hasDeclaration(cxxConstructorDecl(ofClass(hasName("std::filesystem::path")))),
+  hasArgument(0, hasType(asString("std::string")))
+)
+EOF
+
+echo "Running clang-query."
+
+# files=$(jq -r '.[].file' "$DB_PATH")
+DB_DIR=$(dirname "$DB_PATH")
+#echo "$files" | xargs --max-args=150 clang-query -p "$DB_DIR" -f "$TMP_DIR/query.txt" >> output.txt
+
+# jq -r '.[].file' "$DB_PATH" | sed 's/\\/\//g' | tr -d '\r'  | xargs -d '\n' --max-args=150 clang-query -p "$DB_DIR" -f "$TMP_DIR/query.txt" -- -Wno-unused-command-line-argument >> "$TMP_DIR/output.txt"
+
+# this works
+# jq -r '.[].file' "$DB_PATH" | sed 's/\\/\//g' | tr -d '\r'  | xargs -d '\n' --max-args=150 clang-query -p "$DB_DIR" -f "$TMP_DIR/query.txt" >> "$TMP_DIR/output.txt"
+# jq -r '.[].file' "$DB_PATH" | tr -d '\r'  | xargs -d '\n' --max-args=150 clang-query -p "$DB_DIR" -f "$TMP_DIR/query.txt" >> "$TMP_DIR/output.txt"
+
+# also works
+# jq -r '.[].file' "$DB_PATH" | tr -d '\r' | xargs -d '\n' --max-args=150 \
+# clang-query -p "$DB_DIR" \
+# --extra-arg="-Wno-unused-command-line-argument" \
+# -f "$TMP_DIR/query.txt" >> "$TMP_DIR/output.txt"
+
+# also works
+# jq -r '.[].file' "$DB_PATH" | tr -d '\r' | sed 's|\\|/|g' | \
+# 	xargs -d '\n' --max-args=150 \
+# 	clang-query -p "$DB_DIR" \
+# 	--extra-arg="-Wno-unused-command-line-argument" \
+# 	--extra-arg="-Wno-unused-function" \
+# 	-f "$TMP_DIR/query.txt" >> "$TMP_DIR/output.txt"
+
+# in ubuntu, the command is clang-query-18. in Windows, it is clang-query
+CLANG_QUERY=$(command -v clang-query-18 || command -v clang-query)
+
+if [ -z "$CLANG_QUERY" ]; then
+    echo "Error: clang-query (or version -18) not found!"
+    exit 1
+fi
+
+ONLY_CHECK_CHANGED_FILES=true
+if [ "$ONLY_CHECK_CHANGED_FILES" = "true" ]; then
+    LIST_FILE="$TMP_DIR/files_to_query.txt"
+else # check all files
+	LIST_FILE="$TMP_DIR/file_list.txt"
+    jq -r '.[].file' "$DB_PATH" | tr -d '\r' | sed 's|\\|/|g' > "$LIST_FILE"
+fi
+
+> "$TMP_DIR/output.txt"
+
+# Run clang-query using the list file
+# check if LIST_FILE has any data to analyze
+if [ ! -s "$LIST_FILE" ]; then
+    echo "No files found to analyze. Skipping Clang-Query."
+else
+    xargs -d '\n' -a "$LIST_FILE" --max-args=150 \
+		"$CLANG_QUERY" -p "$DB_DIR" \
+		--extra-arg="-Wno-unused-command-line-argument" \
+		--extra-arg="-Wno-unused-function" \
+		-f "$TMP_DIR/query.txt" >> "$TMP_DIR/output.txt"
+fi
+
+
+
+cat "$TMP_DIR/output.txt"
+if grep --silent "Match #" "$TMP_DIR/output.txt"; then
+  echo "::error Forbidden std::filesystem::path construction detected!"
+  exit 1
+fi
\ No newline at end of file
diff --git a/.github/workflows/cpp-ci-serial-programs-base.yml b/.github/workflows/cpp-ci-serial-programs-base.yml
new file mode 100644
index 0000000000..58f1a9d890
--- /dev/null
+++ b/.github/workflows/cpp-ci-serial-programs-base.yml
@@ -0,0 +1,390 @@
+name: C++ CI Serial Programs base
+on:
+  workflow_call:
+    inputs:
+      os:
+        required: true
+        type: string
+
+      compiler:
+        required: true
+        type: string
+
+      upload-build:
+        type: boolean
+        default: false
+
+      run-tests:
+        type: boolean
+        default: false
+
+      run-clang-query:
+        type: boolean
+        default: false
+
+jobs:
+  build:
+    runs-on: ${{inputs.os}}
+
+    steps:
+      - name: Set variables
+        shell: bash
+        run: |
+          BUILD_PARALLEL=10
+          # Build with Ninja on every OS. The Ubuntu and macOS runner images already have it, so
+          # it needs no install step. It also finds what to rebuild much faster than Make, which
+          # walks CMake's nested makefiles first.
+          CMAKE_GENERATOR="Ninja"
+          if [[ "${{inputs.os}}" == windows* ]]; then
+            # On Windows, Ninja also lets ccache work: ccache can't wrap the compiler under the
+            # Visual Studio generator.
+            # "Ninja Multi-Config" keeps Visual Studio's output layout (bin/RelWithDebInfo/).
+            # ccache also can't cache /FAs listings, so turn them off.
+            # CI needs no debug info, so keep RelWithDebInfo's optimization but leave out its
+            # debug info: with policy CMP0141, an empty CMAKE_MSVC_DEBUG_INFORMATION_FORMAT
+            # drops /Zi, and linking without /debug writes no PDB. Release builds made outside
+            # CI keep their debug info.
+            CMAKE_GENERATOR="Ninja Multi-Config"
+            CMAKE_ADDITIONAL_FLAGS="-DCMAKE_POLICY_DEFAULT_CMP0141=NEW -DCMAKE_MSVC_DEBUG_INFORMATION_FORMAT= -DCMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO=/INCREMENTAL:NO -DPA_ASSEMBLY_LISTINGS=OFF"
+            if [[ "${{inputs.compiler}}" == "clang" ]]; then
+              CMAKE_ADDITIONAL_FLAGS="$CMAKE_ADDITIONAL_FLAGS -DCMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl"
+            else
+              CMAKE_ADDITIONAL_FLAGS="$CMAKE_ADDITIONAL_FLAGS -DCMAKE_C_COMPILER=cl -DCMAKE_CXX_COMPILER=cl"
+            fi
+            # Visual Studio ran about one compile per core (/MP). Keep Ninja near that instead of
+            # 10 at once, so memory use stays close to what the runner handled before.
+            BUILD_PARALLEL=$(( $(nproc) + 2 ))
+          elif [[ "${{inputs.compiler}}" == "clang" && "${{inputs.os}}" == ubuntu* ]]; then
+            # RelWithDebInfo's -O2 without its -g: CI doesn't use the debug info.
+            CMAKE_ADDITIONAL_FLAGS="-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_BUILD_TYPE=RelWithDebInfo '-DCMAKE_C_FLAGS_RELWITHDEBINFO=-O2 -DNDEBUG' '-DCMAKE_CXX_FLAGS_RELWITHDEBINFO=-O2 -DNDEBUG'"
+          fi
+          CMAKE_ADDITIONAL_FLAGS="$CMAKE_ADDITIONAL_FLAGS -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache"
+          echo "CMAKE_GENERATOR=$CMAKE_GENERATOR" >> $GITHUB_ENV
+          echo "CMAKE_ADDITIONAL_FLAGS=$CMAKE_ADDITIONAL_FLAGS" >> $GITHUB_ENV
+          echo "BUILD_PARALLEL=$BUILD_PARALLEL" >> $GITHUB_ENV
+
+          if [[ "${{inputs.os}}" == windows* ]]; then
+            UPLOAD_FOLDER="Arduino-Source/SerialPrograms/bin/RelWithDebInfo"
+          else
+            UPLOAD_FOLDER="Arduino-Source/SerialPrograms/bin"
+          fi
+          echo "UPLOAD_FOLDER=$UPLOAD_FOLDER" >> $GITHUB_ENV
+
+      - name: Checkout Arduino-Source
+        uses: actions/checkout@v7
+        with:
+          path: 'Arduino-Source'
+          submodules: 'recursive'
+
+      # Check out the Packages repo (resources, firmware, scripts) before CMake configures.
+      # Otherwise CMake does a full `git clone` of it (see SerialPrograms/CMakeLists.txt), which
+      # downloads the entire history: every old version of every model and zip ever committed,
+      # which only grows. actions/checkout fetches only the latest commit (fetch-depth: 1), and
+      # CMake skips its own clone when Arduino-Source/Packages already exists.
+      - name: Checkout Packages
+        uses: actions/checkout@v7
+        with:
+          repository: 'PokemonAutomation/Packages'
+          ref: 'master'
+          path: 'Arduino-Source/Packages'
+
+      - name: Install Qt
+        uses: jurplel/install-qt-action@v4
+        with:
+          # Delete aqtsource once https://github.com/miurahr/aqtinstall/issues/1007 is fixed and released
+          aqtsource: 'git+https://github.com/miurahr/aqtinstall'
+          version: '6.10.2'
+          modules: 'qtmultimedia qtserialport'
+          cache: true
+
+      - name: Install dependencies (Ubuntu)
+        if: startsWith(inputs.os, 'ubuntu')
+        run: |
+          cd Arduino-Source
+          sudo apt update
+          sudo apt install ccache clang-tools libopencv-dev libsystemd-dev
+
+          sudo apt install ./3rdPartyBinaries/libdpp-10.1.6-linux-x64.deb
+
+      - name: Install dependencies (Mac)
+        if: startsWith(inputs.os, 'mac')
+        run: |
+          cd Arduino-Source
+          # libsodium, openssl@3, opus and pkgconf are libdpp's dependencies, installed here so
+          # their versions can go into the libdpp cache key below.
+          brew install opencv@4 onnxruntime ccache libsodium openssl@3 opus pkgconf
+
+          brew tap-new --no-git PA/libdpp
+          brew trust PA/libdpp
+          FORMULA_DIR="$(brew --repo PA/libdpp)/Formula"
+          mkdir -p "$FORMULA_DIR"
+          cp 3rdPartyBinaries/libdpp@10.1.6.rb "$FORMULA_DIR/"
+
+          echo "LIBDPP_KEG=$(brew --cellar)/libdpp@10.1.6" >> $GITHUB_ENV
+          echo "LIBDPP_DEPS_HASH=$(brew list --versions libsodium openssl@3 opus | shasum | cut -c1-16)" >> $GITHUB_ENV
+
+      # Homebrew has no prebuilt bottle for our pinned libdpp formula, so `brew install` compiles
+      # DPP from source: about 4 minutes on Apple Silicon and 13 on Intel. Cache the installed keg
+      # instead. The key includes the versions of the libraries libdpp links against, so when
+      # Homebrew updates one of them, libdpp is rebuilt against it rather than restored.
+      - name: Cache libdpp (Mac)
+        id: libdpp-cache
+        if: startsWith(inputs.os, 'mac')
+        uses: actions/cache@v6
+        with:
+          path: ${{env.LIBDPP_KEG}}
+          key: libdpp-${{inputs.os}}-${{hashFiles('Arduino-Source/3rdPartyBinaries/libdpp@10.1.6.rb')}}-${{env.LIBDPP_DEPS_HASH}}
+
+      - name: Install libdpp (Mac)
+        if: startsWith(inputs.os, 'mac')
+        run: |
+          if [[ "${{steps.libdpp-cache.outputs.cache-hit}}" == "true" ]]; then
+            brew link libdpp@10.1.6
+          else
+            brew install libdpp@10.1.6
+          fi
+          # CMake quietly builds without Discord integration when it can't find DPP, so check here.
+          pkg-config --exact-version=10.1.6 dpp
+
+      # Ninja needs the MSVC build environment (cl and link on PATH, INCLUDE, LIB, ...), which the
+      # Visual Studio generator set up by itself. Run vcvars64.bat from the newest Visual Studio,
+      # the one that generator used, and pass every variable it adds or changes to later steps.
+      - name: Set up MSVC environment (Windows)
+        if: startsWith(inputs.os, 'windows')
+        shell: pwsh
+        run: |
+          $vs = & "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe" -latest -products * -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath
+          $vcvars = cmd /c "`"$vs\VC\Auxiliary\Build\vcvars64.bat`" >nul && set"
+          if ($LASTEXITCODE -ne 0) {
+            throw "vcvars64.bat failed with exit code $LASTEXITCODE"
+          }
+          foreach ($line in $vcvars) {
+            # Skip anything that isn't a NAME=value line.
+            if ($line -notmatch '^([^=]+)=(.*)$') {
+              continue
+            }
+            $name = $Matches[1]
+            $value = $Matches[2]
+            if ($name -eq 'Path' -and '${{inputs.compiler}}' -eq 'clang') {
+              # Find Visual Studio's own clang-cl, the one its ClangCL toolset used, before any
+              # other LLVM install on the runner.
+              $value = "$vs\VC\Tools\Llvm\x64\bin;$value"
+            }
+            if ([Environment]::GetEnvironmentVariable($name) -ne $value) {
+              "$name=$value" | Out-File -FilePath $env:GITHUB_ENV -Append -Encoding utf8
+              [Environment]::SetEnvironmentVariable($name, $value)
+            }
+          }
+          if (-not (Get-Command cl -ErrorAction SilentlyContinue)) {
+            throw "cl.exe isn't on PATH after vcvars64.bat"
+          }
+          Get-Command cl, link, clang-cl, ninja, cmake -ErrorAction SilentlyContinue | Format-Table Name, Version, Source -AutoSize
+
+      # Keep compiler outputs between runs, so a build only recompiles what a change affects.
+      # Only pushes to main save the cache: every PR restores main's latest one, and PR runs don't
+      # fill the repo's 10 GB cache quota with entries that no other run can read.
+      # max-size is only a cap: evict-old-files drops everything this build didn't use, so each
+      # saved cache is about one build's worth.
+      # On Windows, install the action's own ccache: the runner's Strawberry Perl puts an older
+      # ccache (4.9.1) on PATH, which the default install: detect would use instead.
+      - name: Set up ccache
+        uses: hendrikmuhs/ccache-action@v1.2.24
+        with:
+          key: ${{inputs.os}}-${{inputs.compiler}}
+          max-size: 5G
+          evict-old-files: job
+          save: ${{github.ref == 'refs/heads/main'}}
+          install: ${{startsWith(inputs.os, 'windows') && 'binary' || 'detect'}}
+
+      - name: Generate binaries
+        env:
+          # Depend mode: on a cache miss, ccache hashes the include files the compiler reports
+          # (-MD or /showIncludes) instead of running the preprocessor a second time, which the
+          # ccache manual says makes a miss much cheaper. In the first runs with ccache, where
+          # every file missed, compiling took 10-40% longer than before on Linux and macOS, and
+          # about twice as long on Windows.
+          CCACHE_DEPEND: 1
+        run: |
+          cd Arduino-Source/SerialPrograms
+          mkdir bin
+          cd bin
+          cmake .. -DQT_MAJOR:STRING=6 ${{env.CMAKE_ADDITIONAL_FLAGS}}
+          # By default Ninja reads each compile's .d dependency file into its own database, then deletes it.
+          # To keep them for the downstream clang-query cache (see .github/scripts/clang-query-cached.py), add
+          # -d keepdepfile
+          cmake --build . --config RelWithDebInfo --parallel ${{env.BUILD_PARALLEL}} -- -d keepdepfile
+
+      - name: Prepare upload build
+        if: inputs.upload-build
+        shell: bash
+        run: |
+          {
+            echo "https://github.com/${{github.repository_owner}}/Arduino-Source/commit/$(git -C Arduino-Source rev-parse HEAD)"
+            echo "https://github.com/${{github.repository_owner}}/Packages/commit/$(git -C Arduino-Source/Packages rev-parse HEAD)"
+          } > ${{env.UPLOAD_FOLDER}}/version.txt
+
+      # Leave out the static libraries, which only the build itself uses. With debug info,
+      # SerialProgramsLib.lib alone was over 1 GB uncompressed.
+      - name: Upload Build
+        uses: actions/upload-artifact@v7
+        if: inputs.upload-build
+        with:
+          name: Serial Programs (os=${{inputs.os}} - compiler=${{inputs.compiler}})
+          path: |
+            ${{env.UPLOAD_FOLDER}}
+            !${{env.UPLOAD_FOLDER}}/*.lib
+
+      - name: Upload Executable Only
+        uses: actions/upload-artifact@v7
+        if: inputs.upload-build && startsWith(inputs.os, 'windows')
+        with:
+          name: Standalone Executable (os=${{inputs.os}})
+          path: ${{env.UPLOAD_FOLDER}}/SerialPrograms.exe
+
+      - name: Checkout CommandLineTests
+        uses: actions/checkout@v7
+        if: inputs.run-tests
+        with:
+          repository: 'PokemonAutomation/CommandLineTests'
+          path: 'CommandLineTests'
+
+      # The unit tests assume the downloadable resources they need are already downloaded
+      # (see Packages/Resources/ResourceDownloadList.json). Unzip them from the Packages
+      # checkout into where the program looks for them, DOWNLOADED_RESOURCE_PATH():
+      # the working directory on Windows/Linux, and ~/Library/Application Support/SerialPrograms
+      # on macOS.
+      - name: Install downloadable resources for tests
+        if: inputs.run-tests
+        shell: bash
+        run: |
+          if [[ "${{inputs.os}}" == mac* ]]; then
+            DOWNLOADED_RESOURCES="$HOME/Library/Application Support/SerialPrograms/DownloadedResources"
+          else
+            DOWNLOADED_RESOURCES="Arduino-Source/SerialPrograms/bin/DownloadedResources"
+          fi
+          for RESOURCE in PaddleOCRDetection; do
+            mkdir -p "$DOWNLOADED_RESOURCES/$RESOURCE"
+            (cd "$DOWNLOADED_RESOURCES/$RESOURCE" && cmake -E tar xf "${{github.workspace}}/Arduino-Source/Packages/DownloadedResources/$RESOURCE.zip")
+            ls -la "$DOWNLOADED_RESOURCES/$RESOURCE"
+          done
+
+      - name: Run tests (Windows)
+        if: startsWith(inputs.os, 'windows') && inputs.run-tests
+        run: |
+          cd Arduino-Source/SerialPrograms/bin
+          $process = Start-Process -FilePath "./RelWithDebInfo/SerialPrograms.exe" `
+                                   -ArgumentList "--command-line-test-mode" `
+                                   -NoNewWindow -Wait -PassThru
+          if ($process.ExitCode -ne 0) {
+              Write-Error "Tests failed with exit code $($process.ExitCode)"
+              exit 1
+          }
+
+      - name: Run tests (Ubuntu)
+        if: startsWith(inputs.os, 'ubuntu') && inputs.run-tests
+        env:
+          QT_QPA_PLATFORM: offscreen
+          TESSDATA_PREFIX: ${{ github.workspace }}/Arduino-Source/SerialPrograms/bin/Resources/Tesseract
+        run: |
+          cd Arduino-Source/SerialPrograms/bin
+          ./SerialPrograms --command-line-test-mode
+
+      - name: Run tests (Mac)
+        if: startsWith(inputs.os, 'mac') && inputs.run-tests
+        run: |
+          cd Arduino-Source/SerialPrograms/bin
+          ./SerialPrograms.app/Contents/MacOS/SerialPrograms --command-line-test-mode
+
+      # The list of files that passed clang-query, from the latest run on this branch or on main.
+      # See .github/scripts/clang-query-cached.py. Unlike ccache, every run saves it: it is only
+      # about 100 KB, and a PR's next push then checks only the files that changed since.
+      - name: Restore clang query cache
+        if: inputs.run-clang-query
+        uses: actions/cache/restore@v6
+        with:
+          path: Arduino-Source/clang-query-passed.txt
+          key: clang-query-${{github.run_id}}-${{github.run_attempt}}
+          restore-keys: clang-query-
+
+      - name: Run clang query
+        if: inputs.run-clang-query
+        shell: bash
+        run: |
+          cd Arduino-Source
+
+          # Both rules share one matcher and one traversal of each translation unit.
+          cat << 'EOF' > query.txt
+          let convertedView expr(
+            ignoringParenImpCasts(ignoringImplicit(equalsBoundNode("snapshot_view")))
+          )
+          let storedView expr(ignoringParenImpCasts(ignoringImplicit(
+            expr(anyOf(
+              convertedView,
+              initListExpr(has(convertedView)),
+              explicitCastExpr(hasSourceExpression(convertedView))
+            ))
+          )))
+          match expr(
+            anyOf(
+              cxxConstructExpr(
+                hasDeclaration(cxxConstructorDecl(ofClass(hasName("std::filesystem::path")))),
+                hasArgument(0, hasType(asString("std::string")))
+              ).bind("path_from_string"),
+              cxxMemberCallExpr(
+                callee(cxxConversionDecl(
+                  ofClass(hasName("PokemonAutomation::VideoSnapshot")),
+                  returns(hasDeclaration(cxxRecordDecl(hasName("PokemonAutomation::ImageViewRGB32"))))
+                )),
+                expr().bind("snapshot_view"),
+                anyOf(
+                  hasAncestor(varDecl(hasInitializer(storedView))),
+                  hasAncestor(fieldDecl(hasInClassInitializer(storedView))),
+                  hasAncestor(returnStmt(hasReturnValue(storedView))),
+                  hasAncestor(cxxConstructorDecl(forEachConstructorInitializer(withInitializer(storedView)))),
+                  hasAncestor(cxxOperatorCallExpr(
+                    hasOverloadedOperatorName("="),
+                    hasArgument(1, storedView)
+                  ))
+                )
+              )
+            ),
+            isExpansionInFileMatching("SerialPrograms[/\\]")
+          )
+          EOF
+
+          # Check each source file in batches, one batch per core, and skip the files that passed
+          # before with the same file, headers, compile command, query and tools.
+          status=0
+          python3 .github/scripts/clang-query-cached.py --build-dir SerialPrograms/bin \
+            --query query.txt --cache clang-query-passed.txt --output clang-query-output.txt ||
+            status=$?
+          echo "Clang query output (begin)"
+          cat clang-query-output.txt
+          echo "Clang query output (end)"
+          if [[ $status -ne 0 ]]; then
+            echo "::error::clang-query failed on some files (exit code $status). See the output above."
+            exit 1
+          fi
+          if grep --silent "Match #" clang-query-output.txt; then
+            echo "::error Forbidden code detected! It can be one of the following:"
+            echo "::error - std::filesystem::path created from std::string. More information https://discord.com/channels/695809740428673034/1462210406616531259/1462567541825339635"
+            echo "::error - ImageViewRGB32 created from VideoSnapshot&& that is stored. It is a dangling pointer as nothing hold the data anymore"
+            echo "::error You can read more about the exact error with the artifact below."
+            exit 1
+          fi
+
+      - name: Save clang query cache
+        if: always() && inputs.run-clang-query && hashFiles('Arduino-Source/clang-query-passed.txt') != ''
+        uses: actions/cache/save@v6
+        with:
+          path: Arduino-Source/clang-query-passed.txt
+          key: clang-query-${{github.run_id}}-${{github.run_attempt}}
+
+      - name: Upload Clang query output
+        uses: actions/upload-artifact@v7
+        if: inputs.run-clang-query && always()
+        with:
+          name: Clang query output (compiler=${{inputs.compiler}})
+          path: |
+            Arduino-Source/SerialPrograms/bin/compile_commands.json
+            Arduino-Source/clang-query-output.txt
\ No newline at end of file
diff --git a/.github/workflows/cpp-ci-serial-programs-mac-intel.yml b/.github/workflows/cpp-ci-serial-programs-mac-intel.yml
new file mode 100644
index 0000000000..3713668295
--- /dev/null
+++ b/.github/workflows/cpp-ci-serial-programs-mac-intel.yml
@@ -0,0 +1,22 @@
+name: C++ CI Serial Programs Mac Intel
+on:
+  push:
+    branches: [main]
+  workflow_dispatch:
+  pull_request:
+    types: [opened, synchronize, reopened, ready_for_review]
+
+# When a new event arrives on the same ref (e.g. a new commit pushed to a PR),
+# immediately cancel the in-progress workflow started by the older event.
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
+
+jobs:
+  build:
+    if: github.event_name != 'pull_request' || github.event.pull_request.draft == false
+    uses: ./.github/workflows/cpp-ci-serial-programs-base.yml
+    with:
+      os: macos-15-intel
+      compiler: default
+      run-tests: true
diff --git a/.github/workflows/cpp-ci-serial-programs-mac.yml b/.github/workflows/cpp-ci-serial-programs-mac.yml
new file mode 100644
index 0000000000..d4c2fb493b
--- /dev/null
+++ b/.github/workflows/cpp-ci-serial-programs-mac.yml
@@ -0,0 +1,22 @@
+name: C++ CI Serial Programs Mac
+on:
+  push:
+    branches: [main]
+  workflow_dispatch:
+  pull_request:
+    types: [opened, synchronize, reopened, ready_for_review]
+
+# When a new event arrives on the same ref (e.g. a new commit pushed to a PR),
+# immediately cancel the in-progress workflow started by the older event.
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
+
+jobs:
+  build:
+    if: github.event_name != 'pull_request' || github.event.pull_request.draft == false
+    uses: ./.github/workflows/cpp-ci-serial-programs-base.yml
+    with:
+      os: macos-15
+      compiler: default
+      run-tests: true
diff --git a/.github/workflows/cpp-ci-serial-programs-ubuntu-clang.yml b/.github/workflows/cpp-ci-serial-programs-ubuntu-clang.yml
new file mode 100644
index 0000000000..69461036bb
--- /dev/null
+++ b/.github/workflows/cpp-ci-serial-programs-ubuntu-clang.yml
@@ -0,0 +1,22 @@
+name: C++ CI Serial Programs Ubuntu clang
+on:
+  push:
+    branches: [main]
+  workflow_dispatch:
+  pull_request:
+    types: [opened, synchronize, reopened, ready_for_review]
+
+# When a new event arrives on the same ref (e.g. a new commit pushed to a PR),
+# immediately cancel the in-progress workflow started by the older event.
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
+
+jobs:
+  build:
+    if: github.event_name != 'pull_request' || github.event.pull_request.draft == false
+    uses: ./.github/workflows/cpp-ci-serial-programs-base.yml
+    with:
+      os: ubuntu-26.04
+      compiler: clang
+      run-tests: true
diff --git a/.github/workflows/cpp-ci-serial-programs-ubuntu-default.yml b/.github/workflows/cpp-ci-serial-programs-ubuntu-default.yml
new file mode 100644
index 0000000000..1c173602dd
--- /dev/null
+++ b/.github/workflows/cpp-ci-serial-programs-ubuntu-default.yml
@@ -0,0 +1,25 @@
+name: C++ CI Serial Programs Ubuntu Default
+on:
+  push:
+    branches: [main]
+  workflow_dispatch:
+  pull_request:
+    types: [opened, synchronize, reopened, ready_for_review]
+
+# When a new event arrives on the same ref (e.g. a new commit pushed to a PR),
+# immediately cancel the in-progress workflow started by the older event.
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
+
+jobs:
+  build:
+    if: github.event_name != 'pull_request' || github.event.pull_request.draft == false
+    uses: ./.github/workflows/cpp-ci-serial-programs-base.yml
+    with:
+      os: ubuntu-26.04
+      compiler: default
+      # clang-query checks the source, not the compiled code, so it only needs to run in one
+      # job. This is the fastest Linux build (GCC with no optimization).
+      run-clang-query: true
+      run-tests: true
diff --git a/.github/workflows/cpp-ci-serial-programs-windows-clang.yml b/.github/workflows/cpp-ci-serial-programs-windows-clang.yml
new file mode 100644
index 0000000000..629f9f8058
--- /dev/null
+++ b/.github/workflows/cpp-ci-serial-programs-windows-clang.yml
@@ -0,0 +1,24 @@
+name: C++ CI Serial Programs Windows Clang
+on:
+  push:
+    branches: [main]
+  workflow_dispatch:
+  pull_request:
+    types: [opened, synchronize, reopened, ready_for_review]
+
+# When a new event arrives on the same ref (e.g. a new commit pushed to a PR),
+# immediately cancel the in-progress workflow started by the older event.
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
+
+
+jobs:
+  build:
+    if: github.event_name != 'pull_request' || github.event.pull_request.draft == false
+    uses: ./.github/workflows/cpp-ci-serial-programs-base.yml
+    with:
+      os: windows-2025
+      compiler: clang
+      upload-build: true
+      run-tests: true
diff --git a/.github/workflows/cpp-ci-serial-programs-windows-default.yml b/.github/workflows/cpp-ci-serial-programs-windows-default.yml
new file mode 100644
index 0000000000..ad91e2c405
--- /dev/null
+++ b/.github/workflows/cpp-ci-serial-programs-windows-default.yml
@@ -0,0 +1,23 @@
+name: C++ CI Serial Programs Windows Default
+on:
+  push:
+    branches: [main]
+  workflow_dispatch:
+  pull_request:
+    types: [opened, synchronize, reopened, ready_for_review]
+
+# When a new event arrives on the same ref (e.g. a new commit pushed to a PR),
+# immediately cancel the in-progress workflow started by the older event.
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
+
+jobs:
+  build:
+    if: github.event_name != 'pull_request' || github.event.pull_request.draft == false
+    uses: ./.github/workflows/cpp-ci-serial-programs-base.yml
+    with:
+      os: windows-2025
+      compiler: default
+      upload-build: true
+      run-tests: true
diff --git a/.github/workflows/cpp-ci-serial-programs.yml b/.github/workflows/cpp-ci-serial-programs.yml
deleted file mode 100644
index 0ceef64d8d..0000000000
--- a/.github/workflows/cpp-ci-serial-programs.yml
+++ /dev/null
@@ -1,156 +0,0 @@
-name: C++ CI Serial Programs
-
-on: [push, pull_request, workflow_dispatch]
-
-jobs:
-  build:
-    runs-on: ${{ matrix.os }}
-
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [windows-2022, macos-12, ubuntu-22.04]
-        qt_version: ['5.12.12', '6.3.2', '6.5.0']
-        include:
-        # Windows / Qt 5.12.12
-        - os: windows-2022
-          qt_version: '5.12.12'
-          qt_version_major: '5'
-          host: 'windows'
-          cmake_args: '-G "Visual Studio 17 2022"'
-          qt_arch: 'win64_msvc2017_64'
-          qt_arch_path: 'msvc2017_64'
-          qt_modules: ''
-
-        # Windows / Qt 6.3.2
-        - os: windows-2022
-          qt_version: '6.3.2'
-          qt_version_major: '6'
-          host: 'windows'
-          cmake_args: '-G "Visual Studio 17 2022"'
-          qt_arch: 'win64_msvc2019_64'
-          qt_arch_path: 'msvc2019_64'
-          qt_modules: '-m qtmultimedia qtserialport'
-
-        # Windows / Qt 6.5.0
-        - os: windows-2022
-          qt_version: '6.5.0'
-          qt_version_major: '6'
-          host: 'windows'
-          cmake_args: '-G "Visual Studio 17 2022"'
-          qt_arch: 'win64_msvc2019_64'
-          qt_arch_path: 'msvc2019_64'
-          qt_modules: '-m qtmultimedia qtserialport'
-
-        # Mac / Qt 5.12.12
-        - os: macos-12
-          qt_version: '5.12.12'
-          qt_version_major: '5'
-          host: 'mac'
-          cmake_args: ''
-          qt_arch: 'clang_64'
-          qt_arch_path: 'clang_64'
-          qt_modules: ''
-
-        # Mac / Qt 6.3.2
-        - os: macos-12
-          qt_version: '6.3.2'
-          qt_version_major: '6'
-          host: 'mac'
-          cmake_args: ''
-          qt_arch: 'clang_64'
-          qt_arch_path: 'macos'
-          qt_modules: '-m qtmultimedia qtserialport'
-
-          # Mac / Qt 6.5.0
-        - os: macos-12
-          qt_version: '6.5.0'
-          qt_version_major: '6'
-          host: 'mac'
-          cmake_args: ''
-          qt_arch: 'clang_64'
-          qt_arch_path: 'macos'
-          qt_modules: '-m qtmultimedia qtserialport'
-
-        # Linux / Qt 5.12.12
-        - os: ubuntu-22.04
-          qt_version: '5.12.12'
-          qt_version_major: '5'
-          host: 'linux'
-          cmake_args: ''
-          qt_arch: gcc_64
-          qt_arch_path: gcc_64
-          qt_modules: ''
-
-        # Linux / Qt 6.3.2
-        - os: ubuntu-22.04
-          qt_version: '6.3.2'
-          qt_version_major: '6'
-          host: 'linux'
-          cmake_args: ''
-          qt_arch: gcc_64
-          qt_arch_path: gcc_64
-          qt_modules: '-m qtmultimedia qtserialport'
-
-          # Linux / Qt 6.5.0
-        - os: ubuntu-22.04
-          qt_version: '6.5.0'
-          qt_version_major: '6'
-          host: 'linux'
-          cmake_args: ''
-          qt_arch: gcc_64
-          qt_arch_path: gcc_64
-          qt_modules: '-m qtmultimedia qtserialport'
-    steps:
-    - uses: actions/checkout@v3
-      with:
-        path: Arduino-Source
-    - uses: actions/checkout@v3
-      with:
-        repository: 'PokemonAutomation/Packages'
-        path: Packages
-    - name: Add msbuild to PATH
-      if: startsWith(matrix.os, 'windows')
-      uses: ilammy/msvc-dev-cmd@v1
-    - name: Install dependencies
-      if: startsWith(matrix.os, 'ubuntu')
-      run: |
-        sudo apt update
-        sudo apt install mesa-common-dev libglu1-mesa-dev libegl1 libpulse-dev libgstreamer-gl1.0-0 libgstreamer-plugins-base1.0-0 libopencv-dev
-    - name: Install dependencies
-      if: startsWith(matrix.os, 'mac')
-      run: |
-        brew install opencv
-    - name: Install Qt
-      run: |
-        python3 -m pip install aqtinstall
-        python3 -m aqt install-qt ${{ matrix.host }} desktop ${{ matrix.qt_version }} ${{ matrix.qt_arch }} ${{ matrix.qt_modules }}
-    - name: Run cmake
-      run: |
-        cd Arduino-Source/SerialPrograms
-        mkdir bin
-        cd bin
-        cmake .. -DCMAKE_PREFIX_PATH=${{ github.workspace }}/${{ matrix.qt_version }}/${{ matrix.qt_arch_path }} -DQT_MAJOR:STRING=${{ matrix.qt_version_major }} ${{ matrix.cmake_args }}
-    - name: Generate binaries
-      if: startsWith(matrix.os, 'windows')
-      run: |
-        cd Arduino-Source/SerialPrograms/bin
-        MSBuild.exe ./SerialPrograms.vcxproj /p:Configuration=Release /p:Platform=x64
-    - name: Generate binaries
-      if: ${{ !startsWith(matrix.os, 'windows') }}
-      run: |
-        cd Arduino-Source/SerialPrograms/bin
-        cmake --build . -j 10
-    - name: Copy resources
-      if: startsWith(matrix.os, 'windows')
-      run: |
-        robocopy Packages/SerialPrograms/Resources          Output/Resources /s
-        robocopy Packages/PABotBase/PABotBase-Switch        Output/PABotBase /s
-        robocopy Arduino-Source/SerialPrograms/bin          Output/Binaries dpp.dll libcrypto-1_1-x64.dll libsodium.dll libssl-1_1-x64.dll opencv_world460.dll opus.dll Sleepy.dll tesseractPA.dll zlib1.dll
-        robocopy Arduino-Source/SerialPrograms/bin/Release  Output/Binaries SerialPrograms.exe
-        exit 0
-    - uses: actions/upload-artifact@v3
-      if: startsWith(matrix.os, 'windows')
-      with:
-        name: Serial Programs for windows (${{ matrix.qt_version }})
-        path: Output
diff --git a/.github/workflows/tabs.yml b/.github/workflows/tabs.yml
new file mode 100644
index 0000000000..5d1c3def4e
--- /dev/null
+++ b/.github/workflows/tabs.yml
@@ -0,0 +1,71 @@
+name: Check for Tabs
+# Pushes to other branches are checked by their pull requests.
+on:
+  push:
+    branches: [main]
+  pull_request:
+
+jobs:
+  no-tabs:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v7
+
+      - name: Fail if tabs are found in source files
+        # Exclude specific file types if necessary (e.g., binaries, .md files, etc.)
+        run: |
+          # Define folders to check
+          FOLDERS=("Common" "SerialPrograms")
+          
+          # Define file extensions to check
+          EXTENSIONS=("h" "c" "cpp" "tpp")
+          
+          echo "Searching for Git-tracked files with tabs..."
+          echo "Folders: ${FOLDERS[@]}"
+          echo "Extensions: ${EXTENSIONS[@]}"
+          echo ""
+          
+          # Build git ls-files patterns
+          PATTERNS=()
+          for folder in "${FOLDERS[@]}"; do
+            for ext in "${EXTENSIONS[@]}"; do
+              PATTERNS+=("$folder/**/*.$ext")
+            done
+          done
+          
+          # Get all matching Git-tracked files
+          ALL_FILES=$(git ls-files "${PATTERNS[@]}" 2>/dev/null | sort -u)
+          
+          if [ -z "$ALL_FILES" ]; then
+            echo "No Git-tracked source files found to check"
+            exit 0
+          fi
+          
+          echo "Found $(echo "$ALL_FILES" | wc -l) files to check"
+          echo ""
+          
+          # Check each file for tabs
+          FILES_WITH_TABS=""
+          while IFS= read -r file; do
+            if [ -f "$file" ] && grep -q $'\t' "$file" 2>/dev/null; then
+              FILES_WITH_TABS+="$file"$'\n'
+            fi
+          done <<< "$ALL_FILES"
+          
+          # Check results and print
+          if [ -n "$FILES_WITH_TABS" ]; then
+            echo "::error::The following files contain tabs:"
+            echo ""
+            echo "$FILES_WITH_TABS" | while IFS= read -r file; do
+              if [ -n "$file" ]; then
+                echo "  $file"
+                echo "::error file=$file::File contains tabs"
+              fi
+            done
+            echo ""
+            echo "Please replace tabs with spaces in the files listed above."
+            exit 1
+          else
+            echo "✓ No tabs found in any Git-tracked source files"
+          fi
diff --git a/.gitignore b/.gitignore
index d590b02524..053e1db970 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,52 +1,79 @@
-SerialPrograms/bin/
-
-.vscode
-
-# macOS hidden system file
-.DS_Store
-
-build*/
-
-# Qt config file on a user basis
-*.pro.user
-
-# all other common C++ ignorables
-# Prerequisites
-*.d
-
-# Compiled Object files
-*.slo
-*.lo
-*.o
-*.obj
-
-# Precompiled Headers
-*.gch
-*.pch
-
-# Compiled Dynamic libraries
-*.so
-*.dylib
-*.dll
-
-# Fortran module files
-*.mod
-*.smod
-
-# Compiled Static libraries
-*.lai
-*.la
-*.a
-*.lib
-
-# Executables
-*.exe
-*.out
-*.app
-
-.vs
-Resources/*
-SerialPrograms/CMakeLists.txt.user
-
-# Python cache
-__pycache__
+SerialPrograms/bin/
+
+.vscode
+.qtcreator
+
+discord_social_sdk_win/
+discord_partner_sdk.dll
+3rdPartyBinaries/discord_social_sdk_mac/
+3rdPartyBinaries/discord_social_sdk_linux/
+3rdPartyBinaries/onnxruntime-osx-arm64-*/
+3rdPartyBinaries/onnxruntime-osx-x86_64-*/
+
+
+# macOS hidden system file
+.DS_Store
+
+build-*/
+build/
+
+# Qt config file on a user basis
+*.pro.user
+*.txt.user
+
+# all other common C++ ignorables
+# Prerequisites
+*.d
+
+# Compiled Object files
+*.slo
+*.lo
+*.o
+*.obj
+
+# Precompiled Headers
+*.gch
+*.pch
+
+# Compiled Dynamic libraries
+SerialPrograms/*.so
+SerialPrograms/*.dylib
+SerialPrograms/*.dll
+
+# Fortran module files
+*.mod
+*.smod
+
+# Compiled Static libraries
+SerialPrograms/*.lai
+SerialPrograms/*.la
+SerialPrograms/*.a
+SerialPrograms/*.lib
+
+# Executables
+*.exe
+*.out
+*.app
+
+.vs
+Resources/*
+Packages/
+SerialPrograms/CMakeLists.txt.user
+opencv_world4120.dll
+opencv_world4120d.dll
+
+# Python cache
+__pycache__
+
+# Jupyter Notebooks
+*.ipynb
+
+vcpkg/
+
+CLAUDE.md
+.claude/
+
+build_*/
+.cache/*
+Packages/*
+
diff --git a/3rdParty-Core/miniz-3.1.1/miniz.c b/3rdParty-Core/miniz-3.1.1/miniz.c
new file mode 100644
index 0000000000..ba65c28eaf
--- /dev/null
+++ b/3rdParty-Core/miniz-3.1.1/miniz.c
@@ -0,0 +1,7909 @@
+#include "miniz.h"
+/**************************************************************************
+ *
+ * Copyright 2013-2014 RAD Game Tools and Valve Software
+ * Copyright 2010-2014 Rich Geldreich and Tenacious Software LLC
+ * All Rights Reserved.
+ *
+ * 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.
+ *
+ **************************************************************************/
+
+
+
+typedef unsigned char mz_validate_uint16[sizeof(mz_uint16) == 2 ? 1 : -1];
+typedef unsigned char mz_validate_uint32[sizeof(mz_uint32) == 4 ? 1 : -1];
+typedef unsigned char mz_validate_uint64[sizeof(mz_uint64) == 8 ? 1 : -1];
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+    /* ------------------- zlib-style API's */
+
+    mz_ulong mz_adler32(mz_ulong adler, const unsigned char *ptr, size_t buf_len)
+    {
+        mz_uint32 i, s1 = (mz_uint32)(adler & 0xffff), s2 = (mz_uint32)(adler >> 16);
+        size_t block_len = buf_len % 5552;
+        if (!ptr)
+            return MZ_ADLER32_INIT;
+        while (buf_len)
+        {
+            for (i = 0; i + 7 < block_len; i += 8, ptr += 8)
+            {
+                s1 += ptr[0], s2 += s1;
+                s1 += ptr[1], s2 += s1;
+                s1 += ptr[2], s2 += s1;
+                s1 += ptr[3], s2 += s1;
+                s1 += ptr[4], s2 += s1;
+                s1 += ptr[5], s2 += s1;
+                s1 += ptr[6], s2 += s1;
+                s1 += ptr[7], s2 += s1;
+            }
+            for (; i < block_len; ++i)
+                s1 += *ptr++, s2 += s1;
+            s1 %= 65521U, s2 %= 65521U;
+            buf_len -= block_len;
+            block_len = 5552;
+        }
+        return (s2 << 16) + s1;
+    }
+
+/* Karl Malbrain's compact CRC-32. See "A compact CCITT crc16 and crc32 C implementation that balances processor cache usage against speed": http://www.geocities.com/malbrain/ */
+#if 0
+    mz_ulong mz_crc32(mz_ulong crc, const mz_uint8 *ptr, size_t buf_len)
+    {
+        static const mz_uint32 s_crc32[16] = { 0, 0x1db71064, 0x3b6e20c8, 0x26d930ac, 0x76dc4190, 0x6b6b51f4, 0x4db26158, 0x5005713c,
+                                               0xedb88320, 0xf00f9344, 0xd6d6a3e8, 0xcb61b38c, 0x9b64c2b0, 0x86d3d2d4, 0xa00ae278, 0xbdbdf21c };
+        mz_uint32 crcu32 = (mz_uint32)crc;
+        if (!ptr)
+            return MZ_CRC32_INIT;
+        crcu32 = ~crcu32;
+        while (buf_len--)
+        {
+            mz_uint8 b = *ptr++;
+            crcu32 = (crcu32 >> 4) ^ s_crc32[(crcu32 & 0xF) ^ (b & 0xF)];
+            crcu32 = (crcu32 >> 4) ^ s_crc32[(crcu32 & 0xF) ^ (b >> 4)];
+        }
+        return ~crcu32;
+    }
+#elif defined(USE_EXTERNAL_MZCRC)
+/* If USE_EXTERNAL_CRC is defined, an external module will export the
+ * mz_crc32() symbol for us to use, e.g. an SSE-accelerated version.
+ * Depending on the impl, it may be necessary to ~ the input/output crc values.
+ */
+mz_ulong mz_crc32(mz_ulong crc, const mz_uint8 *ptr, size_t buf_len);
+#else
+/* Faster, but larger CPU cache footprint.
+ */
+mz_ulong mz_crc32(mz_ulong crc, const mz_uint8 *ptr, size_t buf_len)
+{
+    static const mz_uint32 s_crc_table[256] = {
+        0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA, 0x076DC419, 0x706AF48F, 0xE963A535,
+        0x9E6495A3, 0x0EDB8832, 0x79DCB8A4, 0xE0D5E91E, 0x97D2D988, 0x09B64C2B, 0x7EB17CBD,
+        0xE7B82D07, 0x90BF1D91, 0x1DB71064, 0x6AB020F2, 0xF3B97148, 0x84BE41DE, 0x1ADAD47D,
+        0x6DDDE4EB, 0xF4D4B551, 0x83D385C7, 0x136C9856, 0x646BA8C0, 0xFD62F97A, 0x8A65C9EC,
+        0x14015C4F, 0x63066CD9, 0xFA0F3D63, 0x8D080DF5, 0x3B6E20C8, 0x4C69105E, 0xD56041E4,
+        0xA2677172, 0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B, 0x35B5A8FA, 0x42B2986C,
+        0xDBBBC9D6, 0xACBCF940, 0x32D86CE3, 0x45DF5C75, 0xDCD60DCF, 0xABD13D59, 0x26D930AC,
+        0x51DE003A, 0xC8D75180, 0xBFD06116, 0x21B4F4B5, 0x56B3C423, 0xCFBA9599, 0xB8BDA50F,
+        0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924, 0x2F6F7C87, 0x58684C11, 0xC1611DAB,
+        0xB6662D3D, 0x76DC4190, 0x01DB7106, 0x98D220BC, 0xEFD5102A, 0x71B18589, 0x06B6B51F,
+        0x9FBFE4A5, 0xE8B8D433, 0x7807C9A2, 0x0F00F934, 0x9609A88E, 0xE10E9818, 0x7F6A0DBB,
+        0x086D3D2D, 0x91646C97, 0xE6635C01, 0x6B6B51F4, 0x1C6C6162, 0x856530D8, 0xF262004E,
+        0x6C0695ED, 0x1B01A57B, 0x8208F4C1, 0xF50FC457, 0x65B0D9C6, 0x12B7E950, 0x8BBEB8EA,
+        0xFCB9887C, 0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3, 0xFBD44C65, 0x4DB26158, 0x3AB551CE,
+        0xA3BC0074, 0xD4BB30E2, 0x4ADFA541, 0x3DD895D7, 0xA4D1C46D, 0xD3D6F4FB, 0x4369E96A,
+        0x346ED9FC, 0xAD678846, 0xDA60B8D0, 0x44042D73, 0x33031DE5, 0xAA0A4C5F, 0xDD0D7CC9,
+        0x5005713C, 0x270241AA, 0xBE0B1010, 0xC90C2086, 0x5768B525, 0x206F85B3, 0xB966D409,
+        0xCE61E49F, 0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4, 0x59B33D17, 0x2EB40D81,
+        0xB7BD5C3B, 0xC0BA6CAD, 0xEDB88320, 0x9ABFB3B6, 0x03B6E20C, 0x74B1D29A, 0xEAD54739,
+        0x9DD277AF, 0x04DB2615, 0x73DC1683, 0xE3630B12, 0x94643B84, 0x0D6D6A3E, 0x7A6A5AA8,
+        0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1, 0xF00F9344, 0x8708A3D2, 0x1E01F268,
+        0x6906C2FE, 0xF762575D, 0x806567CB, 0x196C3671, 0x6E6B06E7, 0xFED41B76, 0x89D32BE0,
+        0x10DA7A5A, 0x67DD4ACC, 0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5, 0xD6D6A3E8,
+        0xA1D1937E, 0x38D8C2C4, 0x4FDFF252, 0xD1BB67F1, 0xA6BC5767, 0x3FB506DD, 0x48B2364B,
+        0xD80D2BDA, 0xAF0A1B4C, 0x36034AF6, 0x41047A60, 0xDF60EFC3, 0xA867DF55, 0x316E8EEF,
+        0x4669BE79, 0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236, 0xCC0C7795, 0xBB0B4703,
+        0x220216B9, 0x5505262F, 0xC5BA3BBE, 0xB2BD0B28, 0x2BB45A92, 0x5CB36A04, 0xC2D7FFA7,
+        0xB5D0CF31, 0x2CD99E8B, 0x5BDEAE1D, 0x9B64C2B0, 0xEC63F226, 0x756AA39C, 0x026D930A,
+        0x9C0906A9, 0xEB0E363F, 0x72076785, 0x05005713, 0x95BF4A82, 0xE2B87A14, 0x7BB12BAE,
+        0x0CB61B38, 0x92D28E9B, 0xE5D5BE0D, 0x7CDCEFB7, 0x0BDBDF21, 0x86D3D2D4, 0xF1D4E242,
+        0x68DDB3F8, 0x1FDA836E, 0x81BE16CD, 0xF6B9265B, 0x6FB077E1, 0x18B74777, 0x88085AE6,
+        0xFF0F6A70, 0x66063BCA, 0x11010B5C, 0x8F659EFF, 0xF862AE69, 0x616BFFD3, 0x166CCF45,
+        0xA00AE278, 0xD70DD2EE, 0x4E048354, 0x3903B3C2, 0xA7672661, 0xD06016F7, 0x4969474D,
+        0x3E6E77DB, 0xAED16A4A, 0xD9D65ADC, 0x40DF0B66, 0x37D83BF0, 0xA9BCAE53, 0xDEBB9EC5,
+        0x47B2CF7F, 0x30B5FFE9, 0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6, 0xBAD03605,
+        0xCDD70693, 0x54DE5729, 0x23D967BF, 0xB3667A2E, 0xC4614AB8, 0x5D681B02, 0x2A6F2B94,
+        0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D
+    };
+
+    mz_uint32 crc32 = (mz_uint32)crc ^ 0xFFFFFFFF;
+    const mz_uint8 *pByte_buf = (const mz_uint8 *)ptr;
+
+    while (buf_len >= 4)
+    {
+        crc32 = (crc32 >> 8) ^ s_crc_table[(crc32 ^ pByte_buf[0]) & 0xFF];
+        crc32 = (crc32 >> 8) ^ s_crc_table[(crc32 ^ pByte_buf[1]) & 0xFF];
+        crc32 = (crc32 >> 8) ^ s_crc_table[(crc32 ^ pByte_buf[2]) & 0xFF];
+        crc32 = (crc32 >> 8) ^ s_crc_table[(crc32 ^ pByte_buf[3]) & 0xFF];
+        pByte_buf += 4;
+        buf_len -= 4;
+    }
+
+    while (buf_len)
+    {
+        crc32 = (crc32 >> 8) ^ s_crc_table[(crc32 ^ pByte_buf[0]) & 0xFF];
+        ++pByte_buf;
+        --buf_len;
+    }
+
+    return ~crc32;
+}
+#endif
+
+    void mz_free(void *p)
+    {
+        MZ_FREE(p);
+    }
+
+    MINIZ_EXPORT void *miniz_def_alloc_func(void *opaque, size_t items, size_t size)
+    {
+        (void)opaque, (void)items, (void)size;
+        return MZ_MALLOC(items * size);
+    }
+    MINIZ_EXPORT void miniz_def_free_func(void *opaque, void *address)
+    {
+        (void)opaque, (void)address;
+        MZ_FREE(address);
+    }
+    MINIZ_EXPORT void *miniz_def_realloc_func(void *opaque, void *address, size_t items, size_t size)
+    {
+        (void)opaque, (void)address, (void)items, (void)size;
+        return MZ_REALLOC(address, items * size);
+    }
+
+    const char *mz_version(void)
+    {
+        return MZ_VERSION;
+    }
+
+#ifndef MINIZ_NO_ZLIB_APIS
+
+#ifndef MINIZ_NO_DEFLATE_APIS
+
+    int mz_deflateInit(mz_streamp pStream, int level)
+    {
+        return mz_deflateInit2(pStream, level, MZ_DEFLATED, MZ_DEFAULT_WINDOW_BITS, 9, MZ_DEFAULT_STRATEGY);
+    }
+
+    int mz_deflateInit2(mz_streamp pStream, int level, int method, int window_bits, int mem_level, int strategy)
+    {
+        tdefl_compressor *pComp;
+        mz_uint comp_flags = TDEFL_COMPUTE_ADLER32 | tdefl_create_comp_flags_from_zip_params(level, window_bits, strategy);
+
+        if (!pStream)
+            return MZ_STREAM_ERROR;
+        if ((method != MZ_DEFLATED) || ((mem_level < 1) || (mem_level > 9)) || ((window_bits != MZ_DEFAULT_WINDOW_BITS) && (-window_bits != MZ_DEFAULT_WINDOW_BITS)))
+            return MZ_PARAM_ERROR;
+
+        pStream->data_type = 0;
+        pStream->adler = MZ_ADLER32_INIT;
+        pStream->msg = NULL;
+        pStream->reserved = 0;
+        pStream->total_in = 0;
+        pStream->total_out = 0;
+        if (!pStream->zalloc)
+            pStream->zalloc = miniz_def_alloc_func;
+        if (!pStream->zfree)
+            pStream->zfree = miniz_def_free_func;
+
+        pComp = (tdefl_compressor *)pStream->zalloc(pStream->opaque, 1, sizeof(tdefl_compressor));
+        if (!pComp)
+            return MZ_MEM_ERROR;
+
+        pStream->state = (struct mz_internal_state *)pComp;
+
+        if (tdefl_init(pComp, NULL, NULL, comp_flags) != TDEFL_STATUS_OKAY)
+        {
+            mz_deflateEnd(pStream);
+            return MZ_PARAM_ERROR;
+        }
+
+        return MZ_OK;
+    }
+
+    int mz_deflateReset(mz_streamp pStream)
+    {
+        if ((!pStream) || (!pStream->state) || (!pStream->zalloc) || (!pStream->zfree))
+            return MZ_STREAM_ERROR;
+        pStream->total_in = pStream->total_out = 0;
+        tdefl_init((tdefl_compressor *)pStream->state, NULL, NULL, ((tdefl_compressor *)pStream->state)->m_flags);
+        return MZ_OK;
+    }
+
+    int mz_deflate(mz_streamp pStream, int flush)
+    {
+        size_t in_bytes, out_bytes;
+        mz_ulong orig_total_in, orig_total_out;
+        int mz_status = MZ_OK;
+
+        if ((!pStream) || (!pStream->state) || (flush < 0) || (flush > MZ_FINISH) || (!pStream->next_out))
+            return MZ_STREAM_ERROR;
+        if (!pStream->avail_out)
+            return MZ_BUF_ERROR;
+
+        if (flush == MZ_PARTIAL_FLUSH)
+            flush = MZ_SYNC_FLUSH;
+
+        if (((tdefl_compressor *)pStream->state)->m_prev_return_status == TDEFL_STATUS_DONE)
+            return (flush == MZ_FINISH) ? MZ_STREAM_END : MZ_BUF_ERROR;
+
+        orig_total_in = pStream->total_in;
+        orig_total_out = pStream->total_out;
+        for (;;)
+        {
+            tdefl_status defl_status;
+            in_bytes = pStream->avail_in;
+            out_bytes = pStream->avail_out;
+
+            defl_status = tdefl_compress((tdefl_compressor *)pStream->state, pStream->next_in, &in_bytes, pStream->next_out, &out_bytes, (tdefl_flush)flush);
+            pStream->next_in += (mz_uint)in_bytes;
+            pStream->avail_in -= (mz_uint)in_bytes;
+            pStream->total_in += (mz_uint)in_bytes;
+            pStream->adler = tdefl_get_adler32((tdefl_compressor *)pStream->state);
+
+            pStream->next_out += (mz_uint)out_bytes;
+            pStream->avail_out -= (mz_uint)out_bytes;
+            pStream->total_out += (mz_uint)out_bytes;
+
+            if (defl_status < 0)
+            {
+                mz_status = MZ_STREAM_ERROR;
+                break;
+            }
+            else if (defl_status == TDEFL_STATUS_DONE)
+            {
+                mz_status = MZ_STREAM_END;
+                break;
+            }
+            else if (!pStream->avail_out)
+                break;
+            else if ((!pStream->avail_in) && (flush != MZ_FINISH))
+            {
+                if ((flush) || (pStream->total_in != orig_total_in) || (pStream->total_out != orig_total_out))
+                    break;
+                return MZ_BUF_ERROR; /* Can't make forward progress without some input.
+                                      */
+            }
+        }
+        return mz_status;
+    }
+
+    int mz_deflateEnd(mz_streamp pStream)
+    {
+        if (!pStream)
+            return MZ_STREAM_ERROR;
+        if (pStream->state)
+        {
+            pStream->zfree(pStream->opaque, pStream->state);
+            pStream->state = NULL;
+        }
+        return MZ_OK;
+    }
+
+    mz_ulong mz_deflateBound(mz_streamp pStream, mz_ulong source_len)
+    {
+        (void)pStream;
+        /* This is really over conservative. (And lame, but it's actually pretty tricky to compute a true upper bound given the way tdefl's blocking works.) */
+        return MZ_MAX(128 + (source_len * 110) / 100, 128 + source_len + ((source_len / (31 * 1024)) + 1) * 5);
+    }
+
+    int mz_compress2(unsigned char *pDest, mz_ulong *pDest_len, const unsigned char *pSource, mz_ulong source_len, int level)
+    {
+        int status;
+        mz_stream stream;
+        memset(&stream, 0, sizeof(stream));
+
+        /* In case mz_ulong is 64-bits (argh I hate longs). */
+        if ((mz_uint64)(source_len | *pDest_len) > 0xFFFFFFFFU)
+            return MZ_PARAM_ERROR;
+
+        stream.next_in = pSource;
+        stream.avail_in = (mz_uint32)source_len;
+        stream.next_out = pDest;
+        stream.avail_out = (mz_uint32)*pDest_len;
+
+        status = mz_deflateInit(&stream, level);
+        if (status != MZ_OK)
+            return status;
+
+        status = mz_deflate(&stream, MZ_FINISH);
+        if (status != MZ_STREAM_END)
+        {
+            mz_deflateEnd(&stream);
+            return (status == MZ_OK) ? MZ_BUF_ERROR : status;
+        }
+
+        *pDest_len = stream.total_out;
+        return mz_deflateEnd(&stream);
+    }
+
+    int mz_compress(unsigned char *pDest, mz_ulong *pDest_len, const unsigned char *pSource, mz_ulong source_len)
+    {
+        return mz_compress2(pDest, pDest_len, pSource, source_len, MZ_DEFAULT_COMPRESSION);
+    }
+
+    mz_ulong mz_compressBound(mz_ulong source_len)
+    {
+        return mz_deflateBound(NULL, source_len);
+    }
+
+#endif /*#ifndef MINIZ_NO_DEFLATE_APIS*/
+
+#ifndef MINIZ_NO_INFLATE_APIS
+
+    typedef struct
+    {
+        tinfl_decompressor m_decomp;
+        mz_uint m_dict_ofs, m_dict_avail, m_first_call, m_has_flushed;
+        int m_window_bits;
+        mz_uint8 m_dict[TINFL_LZ_DICT_SIZE];
+        tinfl_status m_last_status;
+    } inflate_state;
+
+    int mz_inflateInit2(mz_streamp pStream, int window_bits)
+    {
+        inflate_state *pDecomp;
+        if (!pStream)
+            return MZ_STREAM_ERROR;
+        if ((window_bits != MZ_DEFAULT_WINDOW_BITS) && (-window_bits != MZ_DEFAULT_WINDOW_BITS))
+            return MZ_PARAM_ERROR;
+
+        pStream->data_type = 0;
+        pStream->adler = 0;
+        pStream->msg = NULL;
+        pStream->total_in = 0;
+        pStream->total_out = 0;
+        pStream->reserved = 0;
+        if (!pStream->zalloc)
+            pStream->zalloc = miniz_def_alloc_func;
+        if (!pStream->zfree)
+            pStream->zfree = miniz_def_free_func;
+
+        pDecomp = (inflate_state *)pStream->zalloc(pStream->opaque, 1, sizeof(inflate_state));
+        if (!pDecomp)
+            return MZ_MEM_ERROR;
+
+        pStream->state = (struct mz_internal_state *)pDecomp;
+
+        tinfl_init(&pDecomp->m_decomp);
+        pDecomp->m_dict_ofs = 0;
+        pDecomp->m_dict_avail = 0;
+        pDecomp->m_last_status = TINFL_STATUS_NEEDS_MORE_INPUT;
+        pDecomp->m_first_call = 1;
+        pDecomp->m_has_flushed = 0;
+        pDecomp->m_window_bits = window_bits;
+
+        return MZ_OK;
+    }
+
+    int mz_inflateInit(mz_streamp pStream)
+    {
+        return mz_inflateInit2(pStream, MZ_DEFAULT_WINDOW_BITS);
+    }
+
+    int mz_inflateReset(mz_streamp pStream)
+    {
+        inflate_state *pDecomp;
+        if (!pStream)
+            return MZ_STREAM_ERROR;
+
+        pStream->data_type = 0;
+        pStream->adler = 0;
+        pStream->msg = NULL;
+        pStream->total_in = 0;
+        pStream->total_out = 0;
+        pStream->reserved = 0;
+
+        pDecomp = (inflate_state *)pStream->state;
+
+        tinfl_init(&pDecomp->m_decomp);
+        pDecomp->m_dict_ofs = 0;
+        pDecomp->m_dict_avail = 0;
+        pDecomp->m_last_status = TINFL_STATUS_NEEDS_MORE_INPUT;
+        pDecomp->m_first_call = 1;
+        pDecomp->m_has_flushed = 0;
+        /* pDecomp->m_window_bits = window_bits */;
+
+        return MZ_OK;
+    }
+
+    int mz_inflate(mz_streamp pStream, int flush)
+    {
+        inflate_state *pState;
+        mz_uint n, first_call, decomp_flags = TINFL_FLAG_COMPUTE_ADLER32;
+        size_t in_bytes, out_bytes, orig_avail_in;
+        tinfl_status status;
+
+        if ((!pStream) || (!pStream->state))
+            return MZ_STREAM_ERROR;
+        if (flush == MZ_PARTIAL_FLUSH)
+            flush = MZ_SYNC_FLUSH;
+        if ((flush) && (flush != MZ_SYNC_FLUSH) && (flush != MZ_FINISH))
+            return MZ_STREAM_ERROR;
+
+        pState = (inflate_state *)pStream->state;
+        if (pState->m_window_bits > 0)
+            decomp_flags |= TINFL_FLAG_PARSE_ZLIB_HEADER;
+        orig_avail_in = pStream->avail_in;
+
+        first_call = pState->m_first_call;
+        pState->m_first_call = 0;
+        if (pState->m_last_status < 0)
+            return MZ_DATA_ERROR;
+
+        if (pState->m_has_flushed && (flush != MZ_FINISH))
+            return MZ_STREAM_ERROR;
+        pState->m_has_flushed |= (flush == MZ_FINISH);
+
+        if ((flush == MZ_FINISH) && (first_call))
+        {
+            /* MZ_FINISH on the first call implies that the input and output buffers are large enough to hold the entire compressed/decompressed file. */
+            decomp_flags |= TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF;
+            in_bytes = pStream->avail_in;
+            out_bytes = pStream->avail_out;
+            status = tinfl_decompress(&pState->m_decomp, pStream->next_in, &in_bytes, pStream->next_out, pStream->next_out, &out_bytes, decomp_flags);
+            pState->m_last_status = status;
+            pStream->next_in += (mz_uint)in_bytes;
+            pStream->avail_in -= (mz_uint)in_bytes;
+            pStream->total_in += (mz_uint)in_bytes;
+            pStream->adler = tinfl_get_adler32(&pState->m_decomp);
+            pStream->next_out += (mz_uint)out_bytes;
+            pStream->avail_out -= (mz_uint)out_bytes;
+            pStream->total_out += (mz_uint)out_bytes;
+
+            if (status < 0)
+                return MZ_DATA_ERROR;
+            else if (status != TINFL_STATUS_DONE)
+            {
+                pState->m_last_status = TINFL_STATUS_FAILED;
+                return MZ_BUF_ERROR;
+            }
+            return MZ_STREAM_END;
+        }
+        /* flush != MZ_FINISH then we must assume there's more input. */
+        if (flush != MZ_FINISH)
+            decomp_flags |= TINFL_FLAG_HAS_MORE_INPUT;
+
+        if (pState->m_dict_avail)
+        {
+            n = MZ_MIN(pState->m_dict_avail, pStream->avail_out);
+            memcpy(pStream->next_out, pState->m_dict + pState->m_dict_ofs, n);
+            pStream->next_out += n;
+            pStream->avail_out -= n;
+            pStream->total_out += n;
+            pState->m_dict_avail -= n;
+            pState->m_dict_ofs = (pState->m_dict_ofs + n) & (TINFL_LZ_DICT_SIZE - 1);
+            return ((pState->m_last_status == TINFL_STATUS_DONE) && (!pState->m_dict_avail)) ? MZ_STREAM_END : MZ_OK;
+        }
+
+        for (;;)
+        {
+            in_bytes = pStream->avail_in;
+            out_bytes = TINFL_LZ_DICT_SIZE - pState->m_dict_ofs;
+
+            status = tinfl_decompress(&pState->m_decomp, pStream->next_in, &in_bytes, pState->m_dict, pState->m_dict + pState->m_dict_ofs, &out_bytes, decomp_flags);
+            pState->m_last_status = status;
+
+            pStream->next_in += (mz_uint)in_bytes;
+            pStream->avail_in -= (mz_uint)in_bytes;
+            pStream->total_in += (mz_uint)in_bytes;
+            pStream->adler = tinfl_get_adler32(&pState->m_decomp);
+
+            pState->m_dict_avail = (mz_uint)out_bytes;
+
+            n = MZ_MIN(pState->m_dict_avail, pStream->avail_out);
+            memcpy(pStream->next_out, pState->m_dict + pState->m_dict_ofs, n);
+            pStream->next_out += n;
+            pStream->avail_out -= n;
+            pStream->total_out += n;
+            pState->m_dict_avail -= n;
+            pState->m_dict_ofs = (pState->m_dict_ofs + n) & (TINFL_LZ_DICT_SIZE - 1);
+
+            if (status < 0)
+                return MZ_DATA_ERROR; /* Stream is corrupted (there could be some uncompressed data left in the output dictionary - oh well). */
+            else if ((status == TINFL_STATUS_NEEDS_MORE_INPUT) && (!orig_avail_in))
+                return MZ_BUF_ERROR; /* Signal caller that we can't make forward progress without supplying more input or by setting flush to MZ_FINISH. */
+            else if (flush == MZ_FINISH)
+            {
+                /* The output buffer MUST be large to hold the remaining uncompressed data when flush==MZ_FINISH. */
+                if (status == TINFL_STATUS_DONE)
+                    return pState->m_dict_avail ? MZ_BUF_ERROR : MZ_STREAM_END;
+                /* status here must be TINFL_STATUS_HAS_MORE_OUTPUT, which means there's at least 1 more byte on the way. If there's no more room left in the output buffer then something is wrong. */
+                else if (!pStream->avail_out)
+                    return MZ_BUF_ERROR;
+            }
+            else if ((status == TINFL_STATUS_DONE) || (!pStream->avail_in) || (!pStream->avail_out) || (pState->m_dict_avail))
+                break;
+        }
+
+        return ((status == TINFL_STATUS_DONE) && (!pState->m_dict_avail)) ? MZ_STREAM_END : MZ_OK;
+    }
+
+    int mz_inflateEnd(mz_streamp pStream)
+    {
+        if (!pStream)
+            return MZ_STREAM_ERROR;
+        if (pStream->state)
+        {
+            pStream->zfree(pStream->opaque, pStream->state);
+            pStream->state = NULL;
+        }
+        return MZ_OK;
+    }
+    int mz_uncompress2(unsigned char *pDest, mz_ulong *pDest_len, const unsigned char *pSource, mz_ulong *pSource_len)
+    {
+        mz_stream stream;
+        int status;
+        memset(&stream, 0, sizeof(stream));
+
+        /* In case mz_ulong is 64-bits (argh I hate longs). */
+        if ((mz_uint64)(*pSource_len | *pDest_len) > 0xFFFFFFFFU)
+            return MZ_PARAM_ERROR;
+
+        stream.next_in = pSource;
+        stream.avail_in = (mz_uint32)*pSource_len;
+        stream.next_out = pDest;
+        stream.avail_out = (mz_uint32)*pDest_len;
+
+        status = mz_inflateInit(&stream);
+        if (status != MZ_OK)
+            return status;
+
+        status = mz_inflate(&stream, MZ_FINISH);
+        *pSource_len = *pSource_len - stream.avail_in;
+        if (status != MZ_STREAM_END)
+        {
+            mz_inflateEnd(&stream);
+            return ((status == MZ_BUF_ERROR) && (!stream.avail_in)) ? MZ_DATA_ERROR : status;
+        }
+        *pDest_len = stream.total_out;
+
+        return mz_inflateEnd(&stream);
+    }
+
+    int mz_uncompress(unsigned char *pDest, mz_ulong *pDest_len, const unsigned char *pSource, mz_ulong source_len)
+    {
+        return mz_uncompress2(pDest, pDest_len, pSource, &source_len);
+    }
+
+#endif /*#ifndef MINIZ_NO_INFLATE_APIS*/
+
+    const char *mz_error(int err)
+    {
+        static struct
+        {
+            int m_err;
+            const char *m_pDesc;
+        } s_error_descs[] = {
+            { MZ_OK, "" }, { MZ_STREAM_END, "stream end" }, { MZ_NEED_DICT, "need dictionary" }, { MZ_ERRNO, "file error" }, { MZ_STREAM_ERROR, "stream error" }, { MZ_DATA_ERROR, "data error" }, { MZ_MEM_ERROR, "out of memory" }, { MZ_BUF_ERROR, "buf error" }, { MZ_VERSION_ERROR, "version error" }, { MZ_PARAM_ERROR, "parameter error" }
+        };
+        mz_uint i;
+        for (i = 0; i < sizeof(s_error_descs) / sizeof(s_error_descs[0]); ++i)
+            if (s_error_descs[i].m_err == err)
+                return s_error_descs[i].m_pDesc;
+        return NULL;
+    }
+
+#endif /*MINIZ_NO_ZLIB_APIS */
+
+#ifdef __cplusplus
+}
+#endif
+
+/*
+  This is free and unencumbered software released into the public domain.
+
+  Anyone is free to copy, modify, publish, use, compile, sell, or
+  distribute this software, either in source code form or as a compiled
+  binary, for any purpose, commercial or non-commercial, and by any
+  means.
+
+  In jurisdictions that recognize copyright laws, the author or authors
+  of this software dedicate any and all copyright interest in the
+  software to the public domain. We make this dedication for the benefit
+  of the public at large and to the detriment of our heirs and
+  successors. We intend this dedication to be an overt act of
+  relinquishment in perpetuity of all present and future rights to this
+  software under copyright law.
+
+  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 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.
+
+  For more information, please refer to <http://unlicense.org/>
+*/
+/**************************************************************************
+ *
+ * Copyright 2013-2014 RAD Game Tools and Valve Software
+ * Copyright 2010-2014 Rich Geldreich and Tenacious Software LLC
+ * All Rights Reserved.
+ *
+ * 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.
+ *
+ **************************************************************************/
+
+
+
+#ifndef MINIZ_NO_DEFLATE_APIS
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+    /* ------------------- Low-level Compression (independent from all decompression API's) */
+
+    /* Purposely making these tables static for faster init and thread safety. */
+    static const mz_uint16 s_tdefl_len_sym[256] = {
+        257, 258, 259, 260, 261, 262, 263, 264, 265, 265, 266, 266, 267, 267, 268, 268, 269, 269, 269, 269, 270, 270, 270, 270, 271, 271, 271, 271, 272, 272, 272, 272,
+        273, 273, 273, 273, 273, 273, 273, 273, 274, 274, 274, 274, 274, 274, 274, 274, 275, 275, 275, 275, 275, 275, 275, 275, 276, 276, 276, 276, 276, 276, 276, 276,
+        277, 277, 277, 277, 277, 277, 277, 277, 277, 277, 277, 277, 277, 277, 277, 277, 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, 278, 278,
+        279, 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, 280, 280,
+        281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281, 281,
+        282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282, 282,
+        283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283, 283,
+        284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 284, 285
+    };
+
+    static const mz_uint8 s_tdefl_len_extra[256] = {
+        0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+        4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+        5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
+        5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 0
+    };
+
+    static const mz_uint8 s_tdefl_small_dist_sym[512] = {
+        0, 1, 2, 3, 4, 4, 5, 5, 6, 6, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 11, 11, 11, 11, 11, 11,
+        11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 13,
+        13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
+        14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
+        14, 14, 14, 14, 14, 14, 14, 14, 14, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+        15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+        16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+        16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+        16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+        17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+        17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
+        17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17
+    };
+
+    static const mz_uint8 s_tdefl_small_dist_extra[512] = {
+        0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5,
+        5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+        6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+        6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+        7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+        7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+        7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+        7, 7, 7, 7, 7, 7, 7, 7
+    };
+
+    static const mz_uint8 s_tdefl_large_dist_sym[128] = {
+        0, 0, 18, 19, 20, 20, 21, 21, 22, 22, 22, 22, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 25, 25, 25, 25, 25, 25, 25, 25, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
+        26, 26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
+        28, 28, 28, 28, 28, 28, 28, 28, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29
+    };
+
+    static const mz_uint8 s_tdefl_large_dist_extra[128] = {
+        0, 0, 8, 8, 9, 9, 9, 9, 10, 10, 10, 10, 10, 10, 10, 10, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
+        12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+        13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13
+    };
+
+    /* Radix sorts tdefl_sym_freq[] array by 16-bit key m_key. Returns ptr to sorted values. */
+    typedef struct
+    {
+        mz_uint16 m_key, m_sym_index;
+    } tdefl_sym_freq;
+    static tdefl_sym_freq *tdefl_radix_sort_syms(mz_uint num_syms, tdefl_sym_freq *pSyms0, tdefl_sym_freq *pSyms1)
+    {
+        mz_uint32 total_passes = 2, pass_shift, pass, i, hist[256 * 2];
+        tdefl_sym_freq *pCur_syms = pSyms0, *pNew_syms = pSyms1;
+        MZ_CLEAR_ARR(hist);
+        for (i = 0; i < num_syms; i++)
+        {
+            mz_uint freq = pSyms0[i].m_key;
+            hist[freq & 0xFF]++;
+            hist[256 + ((freq >> 8) & 0xFF)]++;
+        }
+        while ((total_passes > 1) && (num_syms == hist[(total_passes - 1) * 256]))
+            total_passes--;
+        for (pass_shift = 0, pass = 0; pass < total_passes; pass++, pass_shift += 8)
+        {
+            const mz_uint32 *pHist = &hist[pass << 8];
+            mz_uint offsets[256], cur_ofs = 0;
+            for (i = 0; i < 256; i++)
+            {
+                offsets[i] = cur_ofs;
+                cur_ofs += pHist[i];
+            }
+            for (i = 0; i < num_syms; i++)
+                pNew_syms[offsets[(pCur_syms[i].m_key >> pass_shift) & 0xFF]++] = pCur_syms[i];
+            {
+                tdefl_sym_freq *t = pCur_syms;
+                pCur_syms = pNew_syms;
+                pNew_syms = t;
+            }
+        }
+        return pCur_syms;
+    }
+
+    /* tdefl_calculate_minimum_redundancy() originally written by: Alistair Moffat, alistair@cs.mu.oz.au, Jyrki Katajainen, jyrki@diku.dk, November 1996. */
+    static void tdefl_calculate_minimum_redundancy(tdefl_sym_freq *A, int n)
+    {
+        int root, leaf, next, avbl, used, dpth;
+        if (n == 0)
+            return;
+        else if (n == 1)
+        {
+            A[0].m_key = 1;
+            return;
+        }
+        A[0].m_key += A[1].m_key;
+        root = 0;
+        leaf = 2;
+        for (next = 1; next < n - 1; next++)
+        {
+            if (leaf >= n || A[root].m_key < A[leaf].m_key)
+            {
+                A[next].m_key = A[root].m_key;
+                A[root++].m_key = (mz_uint16)next;
+            }
+            else
+                A[next].m_key = A[leaf++].m_key;
+            if (leaf >= n || (root < next && A[root].m_key < A[leaf].m_key))
+            {
+                A[next].m_key = (mz_uint16)(A[next].m_key + A[root].m_key);
+                A[root++].m_key = (mz_uint16)next;
+            }
+            else
+                A[next].m_key = (mz_uint16)(A[next].m_key + A[leaf++].m_key);
+        }
+        A[n - 2].m_key = 0;
+        for (next = n - 3; next >= 0; next--)
+            A[next].m_key = A[A[next].m_key].m_key + 1;
+        avbl = 1;
+        used = dpth = 0;
+        root = n - 2;
+        next = n - 1;
+        while (avbl > 0)
+        {
+            while (root >= 0 && (int)A[root].m_key == dpth)
+            {
+                used++;
+                root--;
+            }
+            while (avbl > used)
+            {
+                A[next--].m_key = (mz_uint16)(dpth);
+                avbl--;
+            }
+            avbl = 2 * used;
+            dpth++;
+            used = 0;
+        }
+    }
+
+    /* Limits canonical Huffman code table's max code size. */
+    enum
+    {
+        TDEFL_MAX_SUPPORTED_HUFF_CODESIZE = 32
+    };
+    static void tdefl_huffman_enforce_max_code_size(int *pNum_codes, int code_list_len, int max_code_size)
+    {
+        int i;
+        mz_uint32 total = 0;
+        if (code_list_len <= 1)
+            return;
+        for (i = max_code_size + 1; i <= TDEFL_MAX_SUPPORTED_HUFF_CODESIZE; i++)
+            pNum_codes[max_code_size] += pNum_codes[i];
+        for (i = max_code_size; i > 0; i--)
+            total += (((mz_uint32)pNum_codes[i]) << (max_code_size - i));
+        while (total != (1UL << max_code_size))
+        {
+            pNum_codes[max_code_size]--;
+            for (i = max_code_size - 1; i > 0; i--)
+                if (pNum_codes[i])
+                {
+                    pNum_codes[i]--;
+                    pNum_codes[i + 1] += 2;
+                    break;
+                }
+            total--;
+        }
+    }
+
+    static void tdefl_optimize_huffman_table(tdefl_compressor *d, int table_num, int table_len, int code_size_limit, int static_table)
+    {
+        int i, j, l, num_codes[1 + TDEFL_MAX_SUPPORTED_HUFF_CODESIZE];
+        mz_uint next_code[TDEFL_MAX_SUPPORTED_HUFF_CODESIZE + 1];
+        MZ_CLEAR_ARR(num_codes);
+        if (static_table)
+        {
+            for (i = 0; i < table_len; i++)
+                num_codes[d->m_huff_code_sizes[table_num][i]]++;
+        }
+        else
+        {
+            tdefl_sym_freq syms0[TDEFL_MAX_HUFF_SYMBOLS], syms1[TDEFL_MAX_HUFF_SYMBOLS], *pSyms;
+            int num_used_syms = 0;
+            const mz_uint16 *pSym_count = &d->m_huff_count[table_num][0];
+            for (i = 0; i < table_len; i++)
+                if (pSym_count[i])
+                {
+                    syms0[num_used_syms].m_key = (mz_uint16)pSym_count[i];
+                    syms0[num_used_syms++].m_sym_index = (mz_uint16)i;
+                }
+
+            pSyms = tdefl_radix_sort_syms(num_used_syms, syms0, syms1);
+            tdefl_calculate_minimum_redundancy(pSyms, num_used_syms);
+
+            for (i = 0; i < num_used_syms; i++)
+                num_codes[pSyms[i].m_key]++;
+
+            tdefl_huffman_enforce_max_code_size(num_codes, num_used_syms, code_size_limit);
+
+            MZ_CLEAR_ARR(d->m_huff_code_sizes[table_num]);
+            MZ_CLEAR_ARR(d->m_huff_codes[table_num]);
+            for (i = 1, j = num_used_syms; i <= code_size_limit; i++)
+                for (l = num_codes[i]; l > 0; l--)
+                    d->m_huff_code_sizes[table_num][pSyms[--j].m_sym_index] = (mz_uint8)(i);
+        }
+
+        next_code[1] = 0;
+        for (j = 0, i = 2; i <= code_size_limit; i++)
+            next_code[i] = j = ((j + num_codes[i - 1]) << 1);
+
+        for (i = 0; i < table_len; i++)
+        {
+            mz_uint rev_code = 0, code, code_size;
+            if ((code_size = d->m_huff_code_sizes[table_num][i]) == 0)
+                continue;
+            code = next_code[code_size]++;
+            for (l = code_size; l > 0; l--, code >>= 1)
+                rev_code = (rev_code << 1) | (code & 1);
+            d->m_huff_codes[table_num][i] = (mz_uint16)rev_code;
+        }
+    }
+
+#define TDEFL_PUT_BITS(b, l)                                       \
+    do                                                             \
+    {                                                              \
+        mz_uint bits = b;                                          \
+        mz_uint len = l;                                           \
+        MZ_ASSERT(bits <= ((1U << len) - 1U));                     \
+        d->m_bit_buffer |= (bits << d->m_bits_in);                 \
+        d->m_bits_in += len;                                       \
+        while (d->m_bits_in >= 8)                                  \
+        {                                                          \
+            if (d->m_pOutput_buf < d->m_pOutput_buf_end)           \
+                *d->m_pOutput_buf++ = (mz_uint8)(d->m_bit_buffer); \
+            d->m_bit_buffer >>= 8;                                 \
+            d->m_bits_in -= 8;                                     \
+        }                                                          \
+    }                                                              \
+    MZ_MACRO_END
+
+#define TDEFL_RLE_PREV_CODE_SIZE()                                                                                       \
+    {                                                                                                                    \
+        if (rle_repeat_count)                                                                                            \
+        {                                                                                                                \
+            if (rle_repeat_count < 3)                                                                                    \
+            {                                                                                                            \
+                d->m_huff_count[2][prev_code_size] = (mz_uint16)(d->m_huff_count[2][prev_code_size] + rle_repeat_count); \
+                while (rle_repeat_count--)                                                                               \
+                    packed_code_sizes[num_packed_code_sizes++] = prev_code_size;                                         \
+            }                                                                                                            \
+            else                                                                                                         \
+            {                                                                                                            \
+                d->m_huff_count[2][16] = (mz_uint16)(d->m_huff_count[2][16] + 1);                                        \
+                packed_code_sizes[num_packed_code_sizes++] = 16;                                                         \
+                packed_code_sizes[num_packed_code_sizes++] = (mz_uint8)(rle_repeat_count - 3);                           \
+            }                                                                                                            \
+            rle_repeat_count = 0;                                                                                        \
+        }                                                                                                                \
+    }
+
+#define TDEFL_RLE_ZERO_CODE_SIZE()                                                         \
+    {                                                                                      \
+        if (rle_z_count)                                                                   \
+        {                                                                                  \
+            if (rle_z_count < 3)                                                           \
+            {                                                                              \
+                d->m_huff_count[2][0] = (mz_uint16)(d->m_huff_count[2][0] + rle_z_count);  \
+                while (rle_z_count--)                                                      \
+                    packed_code_sizes[num_packed_code_sizes++] = 0;                        \
+            }                                                                              \
+            else if (rle_z_count <= 10)                                                    \
+            {                                                                              \
+                d->m_huff_count[2][17] = (mz_uint16)(d->m_huff_count[2][17] + 1);          \
+                packed_code_sizes[num_packed_code_sizes++] = 17;                           \
+                packed_code_sizes[num_packed_code_sizes++] = (mz_uint8)(rle_z_count - 3);  \
+            }                                                                              \
+            else                                                                           \
+            {                                                                              \
+                d->m_huff_count[2][18] = (mz_uint16)(d->m_huff_count[2][18] + 1);          \
+                packed_code_sizes[num_packed_code_sizes++] = 18;                           \
+                packed_code_sizes[num_packed_code_sizes++] = (mz_uint8)(rle_z_count - 11); \
+            }                                                                              \
+            rle_z_count = 0;                                                               \
+        }                                                                                  \
+    }
+
+    static const mz_uint8 s_tdefl_packed_code_size_syms_swizzle[] = { 16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15 };
+
+    static void tdefl_start_dynamic_block(tdefl_compressor *d)
+    {
+        int num_lit_codes, num_dist_codes, num_bit_lengths;
+        mz_uint i, total_code_sizes_to_pack, num_packed_code_sizes, rle_z_count, rle_repeat_count, packed_code_sizes_index;
+        mz_uint8 code_sizes_to_pack[TDEFL_MAX_HUFF_SYMBOLS_0 + TDEFL_MAX_HUFF_SYMBOLS_1], packed_code_sizes[TDEFL_MAX_HUFF_SYMBOLS_0 + TDEFL_MAX_HUFF_SYMBOLS_1], prev_code_size = 0xFF;
+
+        d->m_huff_count[0][256] = 1;
+
+        tdefl_optimize_huffman_table(d, 0, TDEFL_MAX_HUFF_SYMBOLS_0, 15, MZ_FALSE);
+        tdefl_optimize_huffman_table(d, 1, TDEFL_MAX_HUFF_SYMBOLS_1, 15, MZ_FALSE);
+
+        for (num_lit_codes = 286; num_lit_codes > 257; num_lit_codes--)
+            if (d->m_huff_code_sizes[0][num_lit_codes - 1])
+                break;
+        for (num_dist_codes = 30; num_dist_codes > 1; num_dist_codes--)
+            if (d->m_huff_code_sizes[1][num_dist_codes - 1])
+                break;
+
+        memcpy(code_sizes_to_pack, &d->m_huff_code_sizes[0][0], num_lit_codes);
+        memcpy(code_sizes_to_pack + num_lit_codes, &d->m_huff_code_sizes[1][0], num_dist_codes);
+        total_code_sizes_to_pack = num_lit_codes + num_dist_codes;
+        num_packed_code_sizes = 0;
+        rle_z_count = 0;
+        rle_repeat_count = 0;
+
+        memset(&d->m_huff_count[2][0], 0, sizeof(d->m_huff_count[2][0]) * TDEFL_MAX_HUFF_SYMBOLS_2);
+        for (i = 0; i < total_code_sizes_to_pack; i++)
+        {
+            mz_uint8 code_size = code_sizes_to_pack[i];
+            if (!code_size)
+            {
+                TDEFL_RLE_PREV_CODE_SIZE();
+                if (++rle_z_count == 138)
+                {
+                    TDEFL_RLE_ZERO_CODE_SIZE();
+                }
+            }
+            else
+            {
+                TDEFL_RLE_ZERO_CODE_SIZE();
+                if (code_size != prev_code_size)
+                {
+                    TDEFL_RLE_PREV_CODE_SIZE();
+                    d->m_huff_count[2][code_size] = (mz_uint16)(d->m_huff_count[2][code_size] + 1);
+                    packed_code_sizes[num_packed_code_sizes++] = code_size;
+                }
+                else if (++rle_repeat_count == 6)
+                {
+                    TDEFL_RLE_PREV_CODE_SIZE();
+                }
+            }
+            prev_code_size = code_size;
+        }
+        if (rle_repeat_count)
+        {
+            TDEFL_RLE_PREV_CODE_SIZE();
+        }
+        else
+        {
+            TDEFL_RLE_ZERO_CODE_SIZE();
+        }
+
+        tdefl_optimize_huffman_table(d, 2, TDEFL_MAX_HUFF_SYMBOLS_2, 7, MZ_FALSE);
+
+        TDEFL_PUT_BITS(2, 2);
+
+        TDEFL_PUT_BITS(num_lit_codes - 257, 5);
+        TDEFL_PUT_BITS(num_dist_codes - 1, 5);
+
+        for (num_bit_lengths = 18; num_bit_lengths >= 0; num_bit_lengths--)
+            if (d->m_huff_code_sizes[2][s_tdefl_packed_code_size_syms_swizzle[num_bit_lengths]])
+                break;
+        num_bit_lengths = MZ_MAX(4, (num_bit_lengths + 1));
+        TDEFL_PUT_BITS(num_bit_lengths - 4, 4);
+        for (i = 0; (int)i < num_bit_lengths; i++)
+            TDEFL_PUT_BITS(d->m_huff_code_sizes[2][s_tdefl_packed_code_size_syms_swizzle[i]], 3);
+
+        for (packed_code_sizes_index = 0; packed_code_sizes_index < num_packed_code_sizes;)
+        {
+            mz_uint code = packed_code_sizes[packed_code_sizes_index++];
+            MZ_ASSERT(code < TDEFL_MAX_HUFF_SYMBOLS_2);
+            TDEFL_PUT_BITS(d->m_huff_codes[2][code], d->m_huff_code_sizes[2][code]);
+            if (code >= 16)
+                TDEFL_PUT_BITS(packed_code_sizes[packed_code_sizes_index++], "\02\03\07"[code - 16]);
+        }
+    }
+
+    static void tdefl_start_static_block(tdefl_compressor *d)
+    {
+        mz_uint i;
+        mz_uint8 *p = &d->m_huff_code_sizes[0][0];
+
+        for (i = 0; i <= 143; ++i)
+            *p++ = 8;
+        for (; i <= 255; ++i)
+            *p++ = 9;
+        for (; i <= 279; ++i)
+            *p++ = 7;
+        for (; i <= 287; ++i)
+            *p++ = 8;
+
+        memset(d->m_huff_code_sizes[1], 5, 32);
+
+        tdefl_optimize_huffman_table(d, 0, 288, 15, MZ_TRUE);
+        tdefl_optimize_huffman_table(d, 1, 32, 15, MZ_TRUE);
+
+        TDEFL_PUT_BITS(1, 2);
+    }
+
+    static const mz_uint mz_bitmasks[17] = { 0x0000, 0x0001, 0x0003, 0x0007, 0x000F, 0x001F, 0x003F, 0x007F, 0x00FF, 0x01FF, 0x03FF, 0x07FF, 0x0FFF, 0x1FFF, 0x3FFF, 0x7FFF, 0xFFFF };
+
+#if MINIZ_USE_UNALIGNED_LOADS_AND_STORES && MINIZ_LITTLE_ENDIAN && MINIZ_HAS_64BIT_REGISTERS
+    static mz_bool tdefl_compress_lz_codes(tdefl_compressor *d)
+    {
+        mz_uint flags;
+        mz_uint8 *pLZ_codes;
+        mz_uint8 *pOutput_buf = d->m_pOutput_buf;
+        mz_uint8 *pLZ_code_buf_end = d->m_pLZ_code_buf;
+        mz_uint64 bit_buffer = d->m_bit_buffer;
+        mz_uint bits_in = d->m_bits_in;
+
+#define TDEFL_PUT_BITS_FAST(b, l)                    \
+    {                                                \
+        bit_buffer |= (((mz_uint64)(b)) << bits_in); \
+        bits_in += (l);                              \
+    }
+
+        flags = 1;
+        for (pLZ_codes = d->m_lz_code_buf; pLZ_codes < pLZ_code_buf_end; flags >>= 1)
+        {
+            if (flags == 1)
+                flags = *pLZ_codes++ | 0x100;
+
+            if (flags & 1)
+            {
+                mz_uint s0, s1, n0, n1, sym, num_extra_bits;
+                mz_uint match_len = pLZ_codes[0];
+                mz_uint match_dist = (pLZ_codes[1] | (pLZ_codes[2] << 8));
+                pLZ_codes += 3;
+
+                MZ_ASSERT(d->m_huff_code_sizes[0][s_tdefl_len_sym[match_len]]);
+                TDEFL_PUT_BITS_FAST(d->m_huff_codes[0][s_tdefl_len_sym[match_len]], d->m_huff_code_sizes[0][s_tdefl_len_sym[match_len]]);
+                TDEFL_PUT_BITS_FAST(match_len & mz_bitmasks[s_tdefl_len_extra[match_len]], s_tdefl_len_extra[match_len]);
+
+                /* This sequence coaxes MSVC into using cmov's vs. jmp's. */
+                s0 = s_tdefl_small_dist_sym[match_dist & 511];
+                n0 = s_tdefl_small_dist_extra[match_dist & 511];
+                s1 = s_tdefl_large_dist_sym[match_dist >> 8];
+                n1 = s_tdefl_large_dist_extra[match_dist >> 8];
+                sym = (match_dist < 512) ? s0 : s1;
+                num_extra_bits = (match_dist < 512) ? n0 : n1;
+
+                MZ_ASSERT(d->m_huff_code_sizes[1][sym]);
+                TDEFL_PUT_BITS_FAST(d->m_huff_codes[1][sym], d->m_huff_code_sizes[1][sym]);
+                TDEFL_PUT_BITS_FAST(match_dist & mz_bitmasks[num_extra_bits], num_extra_bits);
+            }
+            else
+            {
+                mz_uint lit = *pLZ_codes++;
+                MZ_ASSERT(d->m_huff_code_sizes[0][lit]);
+                TDEFL_PUT_BITS_FAST(d->m_huff_codes[0][lit], d->m_huff_code_sizes[0][lit]);
+
+                if (((flags & 2) == 0) && (pLZ_codes < pLZ_code_buf_end))
+                {
+                    flags >>= 1;
+                    lit = *pLZ_codes++;
+                    MZ_ASSERT(d->m_huff_code_sizes[0][lit]);
+                    TDEFL_PUT_BITS_FAST(d->m_huff_codes[0][lit], d->m_huff_code_sizes[0][lit]);
+
+                    if (((flags & 2) == 0) && (pLZ_codes < pLZ_code_buf_end))
+                    {
+                        flags >>= 1;
+                        lit = *pLZ_codes++;
+                        MZ_ASSERT(d->m_huff_code_sizes[0][lit]);
+                        TDEFL_PUT_BITS_FAST(d->m_huff_codes[0][lit], d->m_huff_code_sizes[0][lit]);
+                    }
+                }
+            }
+
+            if (pOutput_buf >= d->m_pOutput_buf_end)
+                return MZ_FALSE;
+
+            memcpy(pOutput_buf, &bit_buffer, sizeof(mz_uint64));
+            pOutput_buf += (bits_in >> 3);
+            bit_buffer >>= (bits_in & ~7);
+            bits_in &= 7;
+        }
+
+#undef TDEFL_PUT_BITS_FAST
+
+        d->m_pOutput_buf = pOutput_buf;
+        d->m_bits_in = 0;
+        d->m_bit_buffer = 0;
+
+        while (bits_in)
+        {
+            mz_uint32 n = MZ_MIN(bits_in, 16);
+            TDEFL_PUT_BITS((mz_uint)bit_buffer & mz_bitmasks[n], n);
+            bit_buffer >>= n;
+            bits_in -= n;
+        }
+
+        TDEFL_PUT_BITS(d->m_huff_codes[0][256], d->m_huff_code_sizes[0][256]);
+
+        return (d->m_pOutput_buf < d->m_pOutput_buf_end);
+    }
+#else
+static mz_bool tdefl_compress_lz_codes(tdefl_compressor *d)
+{
+    mz_uint flags;
+    mz_uint8 *pLZ_codes;
+
+    flags = 1;
+    for (pLZ_codes = d->m_lz_code_buf; pLZ_codes < d->m_pLZ_code_buf; flags >>= 1)
+    {
+        if (flags == 1)
+            flags = *pLZ_codes++ | 0x100;
+        if (flags & 1)
+        {
+            mz_uint sym, num_extra_bits;
+            mz_uint match_len = pLZ_codes[0], match_dist = (pLZ_codes[1] | (pLZ_codes[2] << 8));
+            pLZ_codes += 3;
+
+            MZ_ASSERT(d->m_huff_code_sizes[0][s_tdefl_len_sym[match_len]]);
+            TDEFL_PUT_BITS(d->m_huff_codes[0][s_tdefl_len_sym[match_len]], d->m_huff_code_sizes[0][s_tdefl_len_sym[match_len]]);
+            TDEFL_PUT_BITS(match_len & mz_bitmasks[s_tdefl_len_extra[match_len]], s_tdefl_len_extra[match_len]);
+
+            if (match_dist < 512)
+            {
+                sym = s_tdefl_small_dist_sym[match_dist];
+                num_extra_bits = s_tdefl_small_dist_extra[match_dist];
+            }
+            else
+            {
+                sym = s_tdefl_large_dist_sym[match_dist >> 8];
+                num_extra_bits = s_tdefl_large_dist_extra[match_dist >> 8];
+            }
+            MZ_ASSERT(d->m_huff_code_sizes[1][sym]);
+            TDEFL_PUT_BITS(d->m_huff_codes[1][sym], d->m_huff_code_sizes[1][sym]);
+            TDEFL_PUT_BITS(match_dist & mz_bitmasks[num_extra_bits], num_extra_bits);
+        }
+        else
+        {
+            mz_uint lit = *pLZ_codes++;
+            MZ_ASSERT(d->m_huff_code_sizes[0][lit]);
+            TDEFL_PUT_BITS(d->m_huff_codes[0][lit], d->m_huff_code_sizes[0][lit]);
+        }
+    }
+
+    TDEFL_PUT_BITS(d->m_huff_codes[0][256], d->m_huff_code_sizes[0][256]);
+
+    return (d->m_pOutput_buf < d->m_pOutput_buf_end);
+}
+#endif /* MINIZ_USE_UNALIGNED_LOADS_AND_STORES && MINIZ_LITTLE_ENDIAN && MINIZ_HAS_64BIT_REGISTERS */
+
+    static mz_bool tdefl_compress_block(tdefl_compressor *d, mz_bool static_block)
+    {
+        if (static_block)
+            tdefl_start_static_block(d);
+        else
+            tdefl_start_dynamic_block(d);
+        return tdefl_compress_lz_codes(d);
+    }
+
+    static const mz_uint s_tdefl_num_probes[11] = { 0, 1, 6, 32, 16, 32, 128, 256, 512, 768, 1500 };
+
+    static int tdefl_flush_block(tdefl_compressor *d, int flush)
+    {
+        mz_uint saved_bit_buf, saved_bits_in;
+        mz_uint8 *pSaved_output_buf;
+        mz_bool comp_block_succeeded = MZ_FALSE;
+        int n, use_raw_block = ((d->m_flags & TDEFL_FORCE_ALL_RAW_BLOCKS) != 0) && (d->m_lookahead_pos - d->m_lz_code_buf_dict_pos) <= d->m_dict_size;
+        mz_uint8 *pOutput_buf_start = ((d->m_pPut_buf_func == NULL) && ((*d->m_pOut_buf_size - d->m_out_buf_ofs) >= TDEFL_OUT_BUF_SIZE)) ? ((mz_uint8 *)d->m_pOut_buf + d->m_out_buf_ofs) : d->m_output_buf;
+
+        d->m_pOutput_buf = pOutput_buf_start;
+        d->m_pOutput_buf_end = d->m_pOutput_buf + TDEFL_OUT_BUF_SIZE - 16;
+
+        MZ_ASSERT(!d->m_output_flush_remaining);
+        d->m_output_flush_ofs = 0;
+        d->m_output_flush_remaining = 0;
+
+        *d->m_pLZ_flags = (mz_uint8)(*d->m_pLZ_flags >> d->m_num_flags_left);
+        d->m_pLZ_code_buf -= (d->m_num_flags_left == 8);
+
+        if ((d->m_flags & TDEFL_WRITE_ZLIB_HEADER) && (!d->m_block_index))
+        {
+            const mz_uint8 cmf = 0x78;
+            mz_uint8 flg, flevel = 3;
+            mz_uint header, i, mz_un = sizeof(s_tdefl_num_probes) / sizeof(mz_uint);
+
+            /* Determine compression level by reversing the process in tdefl_create_comp_flags_from_zip_params() */
+            for (i = 0; i < mz_un; i++)
+                if (s_tdefl_num_probes[i] == (d->m_flags & 0xFFF))
+                    break;
+
+            if (i < 2)
+                flevel = 0;
+            else if (i < 6)
+                flevel = 1;
+            else if (i == 6)
+                flevel = 2;
+
+            header = cmf << 8 | (flevel << 6);
+            header += 31 - (header % 31);
+            flg = header & 0xFF;
+
+            TDEFL_PUT_BITS(cmf, 8);
+            TDEFL_PUT_BITS(flg, 8);
+        }
+
+        TDEFL_PUT_BITS(flush == TDEFL_FINISH, 1);
+
+        pSaved_output_buf = d->m_pOutput_buf;
+        saved_bit_buf = d->m_bit_buffer;
+        saved_bits_in = d->m_bits_in;
+
+        if (!use_raw_block)
+            comp_block_succeeded = tdefl_compress_block(d, (d->m_flags & TDEFL_FORCE_ALL_STATIC_BLOCKS) || (d->m_total_lz_bytes < 48));
+
+        /* If the block gets expanded, forget the current contents of the output buffer and send a raw block instead. */
+        if (((use_raw_block) || ((d->m_total_lz_bytes) && ((d->m_pOutput_buf - pSaved_output_buf + 1U) >= d->m_total_lz_bytes))) &&
+            ((d->m_lookahead_pos - d->m_lz_code_buf_dict_pos) <= d->m_dict_size))
+        {
+            mz_uint i;
+            d->m_pOutput_buf = pSaved_output_buf;
+            d->m_bit_buffer = saved_bit_buf, d->m_bits_in = saved_bits_in;
+            TDEFL_PUT_BITS(0, 2);
+            if (d->m_bits_in)
+            {
+                TDEFL_PUT_BITS(0, 8 - d->m_bits_in);
+            }
+            for (i = 2; i; --i, d->m_total_lz_bytes ^= 0xFFFF)
+            {
+                TDEFL_PUT_BITS(d->m_total_lz_bytes & 0xFFFF, 16);
+            }
+            for (i = 0; i < d->m_total_lz_bytes; ++i)
+            {
+                TDEFL_PUT_BITS(d->m_dict[(d->m_lz_code_buf_dict_pos + i) & TDEFL_LZ_DICT_SIZE_MASK], 8);
+            }
+        }
+        /* Check for the extremely unlikely (if not impossible) case of the compressed block not fitting into the output buffer when using dynamic codes. */
+        else if (!comp_block_succeeded)
+        {
+            d->m_pOutput_buf = pSaved_output_buf;
+            d->m_bit_buffer = saved_bit_buf, d->m_bits_in = saved_bits_in;
+            tdefl_compress_block(d, MZ_TRUE);
+        }
+
+        if (flush)
+        {
+            if (flush == TDEFL_FINISH)
+            {
+                if (d->m_bits_in)
+                {
+                    TDEFL_PUT_BITS(0, 8 - d->m_bits_in);
+                }
+                if (d->m_flags & TDEFL_WRITE_ZLIB_HEADER)
+                {
+                    mz_uint i, a = d->m_adler32;
+                    for (i = 0; i < 4; i++)
+                    {
+                        TDEFL_PUT_BITS((a >> 24) & 0xFF, 8);
+                        a <<= 8;
+                    }
+                }
+            }
+            else
+            {
+                mz_uint i, z = 0;
+                TDEFL_PUT_BITS(0, 3);
+                if (d->m_bits_in)
+                {
+                    TDEFL_PUT_BITS(0, 8 - d->m_bits_in);
+                }
+                for (i = 2; i; --i, z ^= 0xFFFF)
+                {
+                    TDEFL_PUT_BITS(z & 0xFFFF, 16);
+                }
+            }
+        }
+
+        MZ_ASSERT(d->m_pOutput_buf < d->m_pOutput_buf_end);
+
+        memset(&d->m_huff_count[0][0], 0, sizeof(d->m_huff_count[0][0]) * TDEFL_MAX_HUFF_SYMBOLS_0);
+        memset(&d->m_huff_count[1][0], 0, sizeof(d->m_huff_count[1][0]) * TDEFL_MAX_HUFF_SYMBOLS_1);
+
+        d->m_pLZ_code_buf = d->m_lz_code_buf + 1;
+        d->m_pLZ_flags = d->m_lz_code_buf;
+        d->m_num_flags_left = 8;
+        d->m_lz_code_buf_dict_pos += d->m_total_lz_bytes;
+        d->m_total_lz_bytes = 0;
+        d->m_block_index++;
+
+        if ((n = (int)(d->m_pOutput_buf - pOutput_buf_start)) != 0)
+        {
+            if (d->m_pPut_buf_func)
+            {
+                *d->m_pIn_buf_size = d->m_pSrc - (const mz_uint8 *)d->m_pIn_buf;
+                if (!(*d->m_pPut_buf_func)(d->m_output_buf, n, d->m_pPut_buf_user))
+                    return (d->m_prev_return_status = TDEFL_STATUS_PUT_BUF_FAILED);
+            }
+            else if (pOutput_buf_start == d->m_output_buf)
+            {
+                int bytes_to_copy = (int)MZ_MIN((size_t)n, (size_t)(*d->m_pOut_buf_size - d->m_out_buf_ofs));
+                memcpy((mz_uint8 *)d->m_pOut_buf + d->m_out_buf_ofs, d->m_output_buf, bytes_to_copy);
+                d->m_out_buf_ofs += bytes_to_copy;
+                if ((n -= bytes_to_copy) != 0)
+                {
+                    d->m_output_flush_ofs = bytes_to_copy;
+                    d->m_output_flush_remaining = n;
+                }
+            }
+            else
+            {
+                d->m_out_buf_ofs += n;
+            }
+        }
+
+        return d->m_output_flush_remaining;
+    }
+
+#if MINIZ_USE_UNALIGNED_LOADS_AND_STORES
+#ifdef MINIZ_UNALIGNED_USE_MEMCPY
+    static mz_uint16 TDEFL_READ_UNALIGNED_WORD(const mz_uint8 *p)
+    {
+        mz_uint16 ret;
+        memcpy(&ret, p, sizeof(mz_uint16));
+        return ret;
+    }
+    static mz_uint16 TDEFL_READ_UNALIGNED_WORD2(const mz_uint16 *p)
+    {
+        mz_uint16 ret;
+        memcpy(&ret, p, sizeof(mz_uint16));
+        return ret;
+    }
+#else
+#define TDEFL_READ_UNALIGNED_WORD(p) *(const mz_uint16 *)(p)
+#define TDEFL_READ_UNALIGNED_WORD2(p) *(const mz_uint16 *)(p)
+#endif
+    static MZ_FORCEINLINE void tdefl_find_match(tdefl_compressor *d, mz_uint lookahead_pos, mz_uint max_dist, mz_uint max_match_len, mz_uint *pMatch_dist, mz_uint *pMatch_len)
+    {
+        mz_uint dist, pos = lookahead_pos & TDEFL_LZ_DICT_SIZE_MASK, match_len = *pMatch_len, probe_pos = pos, next_probe_pos, probe_len;
+        mz_uint num_probes_left = d->m_max_probes[match_len >= 32];
+        const mz_uint16 *s = (const mz_uint16 *)(d->m_dict + pos), *p, *q;
+        mz_uint16 c01 = TDEFL_READ_UNALIGNED_WORD(&d->m_dict[pos + match_len - 1]), s01 = TDEFL_READ_UNALIGNED_WORD2(s);
+        MZ_ASSERT(max_match_len <= TDEFL_MAX_MATCH_LEN);
+        if (max_match_len <= match_len)
+            return;
+        for (;;)
+        {
+            for (;;)
+            {
+                if (--num_probes_left == 0)
+                    return;
+#define TDEFL_PROBE                                                                             \
+    next_probe_pos = d->m_next[probe_pos];                                                      \
+    if ((!next_probe_pos) || ((dist = (mz_uint16)(lookahead_pos - next_probe_pos)) > max_dist)) \
+        return;                                                                                 \
+    probe_pos = next_probe_pos & TDEFL_LZ_DICT_SIZE_MASK;                                       \
+    if (TDEFL_READ_UNALIGNED_WORD(&d->m_dict[probe_pos + match_len - 1]) == c01)                \
+        break;
+                TDEFL_PROBE;
+                TDEFL_PROBE;
+                TDEFL_PROBE;
+            }
+            if (!dist)
+                break;
+            q = (const mz_uint16 *)(d->m_dict + probe_pos);
+            if (TDEFL_READ_UNALIGNED_WORD2(q) != s01)
+                continue;
+            p = s;
+            probe_len = 32;
+            do
+            {
+            } while ((TDEFL_READ_UNALIGNED_WORD2(++p) == TDEFL_READ_UNALIGNED_WORD2(++q)) && (TDEFL_READ_UNALIGNED_WORD2(++p) == TDEFL_READ_UNALIGNED_WORD2(++q)) &&
+                     (TDEFL_READ_UNALIGNED_WORD2(++p) == TDEFL_READ_UNALIGNED_WORD2(++q)) && (TDEFL_READ_UNALIGNED_WORD2(++p) == TDEFL_READ_UNALIGNED_WORD2(++q)) && (--probe_len > 0));
+            if (!probe_len)
+            {
+                *pMatch_dist = dist;
+                *pMatch_len = MZ_MIN(max_match_len, (mz_uint)TDEFL_MAX_MATCH_LEN);
+                break;
+            }
+            else if ((probe_len = ((mz_uint)(p - s) * 2) + (mz_uint)(*(const mz_uint8 *)p == *(const mz_uint8 *)q)) > match_len)
+            {
+                *pMatch_dist = dist;
+                if ((*pMatch_len = match_len = MZ_MIN(max_match_len, probe_len)) == max_match_len)
+                    break;
+                c01 = TDEFL_READ_UNALIGNED_WORD(&d->m_dict[pos + match_len - 1]);
+            }
+        }
+    }
+#else
+static MZ_FORCEINLINE void tdefl_find_match(tdefl_compressor *d, mz_uint lookahead_pos, mz_uint max_dist, mz_uint max_match_len, mz_uint *pMatch_dist, mz_uint *pMatch_len)
+{
+    mz_uint dist, pos = lookahead_pos & TDEFL_LZ_DICT_SIZE_MASK, match_len = *pMatch_len, probe_pos = pos, next_probe_pos, probe_len;
+    mz_uint num_probes_left = d->m_max_probes[match_len >= 32];
+    const mz_uint8 *s = d->m_dict + pos, *p, *q;
+    mz_uint8 c0 = d->m_dict[pos + match_len], c1 = d->m_dict[pos + match_len - 1];
+    MZ_ASSERT(max_match_len <= TDEFL_MAX_MATCH_LEN);
+    if (max_match_len <= match_len)
+        return;
+    for (;;)
+    {
+        for (;;)
+        {
+            if (--num_probes_left == 0)
+                return;
+#define TDEFL_PROBE                                                                               \
+    next_probe_pos = d->m_next[probe_pos];                                                        \
+    if ((!next_probe_pos) || ((dist = (mz_uint16)(lookahead_pos - next_probe_pos)) > max_dist))   \
+        return;                                                                                   \
+    probe_pos = next_probe_pos & TDEFL_LZ_DICT_SIZE_MASK;                                         \
+    if ((d->m_dict[probe_pos + match_len] == c0) && (d->m_dict[probe_pos + match_len - 1] == c1)) \
+        break;
+            TDEFL_PROBE;
+            TDEFL_PROBE;
+            TDEFL_PROBE;
+        }
+        if (!dist)
+            break;
+        p = s;
+        q = d->m_dict + probe_pos;
+        for (probe_len = 0; probe_len < max_match_len; probe_len++)
+            if (*p++ != *q++)
+                break;
+        if (probe_len > match_len)
+        {
+            *pMatch_dist = dist;
+            if ((*pMatch_len = match_len = probe_len) == max_match_len)
+                return;
+            c0 = d->m_dict[pos + match_len];
+            c1 = d->m_dict[pos + match_len - 1];
+        }
+    }
+}
+#endif /* #if MINIZ_USE_UNALIGNED_LOADS_AND_STORES */
+
+#if MINIZ_USE_UNALIGNED_LOADS_AND_STORES && MINIZ_LITTLE_ENDIAN
+#ifdef MINIZ_UNALIGNED_USE_MEMCPY
+    static mz_uint32 TDEFL_READ_UNALIGNED_WORD32(const mz_uint8 *p)
+    {
+        mz_uint32 ret;
+        memcpy(&ret, p, sizeof(mz_uint32));
+        return ret;
+    }
+#else
+#define TDEFL_READ_UNALIGNED_WORD32(p) *(const mz_uint32 *)(p)
+#endif
+    static mz_bool tdefl_compress_fast(tdefl_compressor *d)
+    {
+        /* Faster, minimally featured LZRW1-style match+parse loop with better register utilization. Intended for applications where raw throughput is valued more highly than ratio. */
+        mz_uint lookahead_pos = d->m_lookahead_pos, lookahead_size = d->m_lookahead_size, dict_size = d->m_dict_size, total_lz_bytes = d->m_total_lz_bytes, num_flags_left = d->m_num_flags_left;
+        mz_uint8 *pLZ_code_buf = d->m_pLZ_code_buf, *pLZ_flags = d->m_pLZ_flags;
+        mz_uint cur_pos = lookahead_pos & TDEFL_LZ_DICT_SIZE_MASK;
+
+        while ((d->m_src_buf_left) || ((d->m_flush) && (lookahead_size)))
+        {
+            const mz_uint TDEFL_COMP_FAST_LOOKAHEAD_SIZE = 4096;
+            mz_uint dst_pos = (lookahead_pos + lookahead_size) & TDEFL_LZ_DICT_SIZE_MASK;
+            mz_uint num_bytes_to_process = (mz_uint)MZ_MIN(d->m_src_buf_left, TDEFL_COMP_FAST_LOOKAHEAD_SIZE - lookahead_size);
+            d->m_src_buf_left -= num_bytes_to_process;
+            lookahead_size += num_bytes_to_process;
+
+            while (num_bytes_to_process)
+            {
+                mz_uint32 n = MZ_MIN(TDEFL_LZ_DICT_SIZE - dst_pos, num_bytes_to_process);
+                memcpy(d->m_dict + dst_pos, d->m_pSrc, n);
+                if (dst_pos < (TDEFL_MAX_MATCH_LEN - 1))
+                    memcpy(d->m_dict + TDEFL_LZ_DICT_SIZE + dst_pos, d->m_pSrc, MZ_MIN(n, (TDEFL_MAX_MATCH_LEN - 1) - dst_pos));
+                d->m_pSrc += n;
+                dst_pos = (dst_pos + n) & TDEFL_LZ_DICT_SIZE_MASK;
+                num_bytes_to_process -= n;
+            }
+
+            dict_size = MZ_MIN(TDEFL_LZ_DICT_SIZE - lookahead_size, dict_size);
+            if ((!d->m_flush) && (lookahead_size < TDEFL_COMP_FAST_LOOKAHEAD_SIZE))
+                break;
+
+            while (lookahead_size >= 4)
+            {
+                mz_uint cur_match_dist, cur_match_len = 1;
+                mz_uint8 *pCur_dict = d->m_dict + cur_pos;
+                mz_uint first_trigram = TDEFL_READ_UNALIGNED_WORD32(pCur_dict) & 0xFFFFFF;
+                mz_uint hash = (first_trigram ^ (first_trigram >> (24 - (TDEFL_LZ_HASH_BITS - 8)))) & TDEFL_LEVEL1_HASH_SIZE_MASK;
+                mz_uint probe_pos = d->m_hash[hash];
+                d->m_hash[hash] = (mz_uint16)lookahead_pos;
+
+                if (((cur_match_dist = (mz_uint16)(lookahead_pos - probe_pos)) <= dict_size) && ((TDEFL_READ_UNALIGNED_WORD32(d->m_dict + (probe_pos &= TDEFL_LZ_DICT_SIZE_MASK)) & 0xFFFFFF) == first_trigram))
+                {
+                    const mz_uint16 *p = (const mz_uint16 *)pCur_dict;
+                    const mz_uint16 *q = (const mz_uint16 *)(d->m_dict + probe_pos);
+                    mz_uint32 probe_len = 32;
+                    do
+                    {
+                    } while ((TDEFL_READ_UNALIGNED_WORD2(++p) == TDEFL_READ_UNALIGNED_WORD2(++q)) && (TDEFL_READ_UNALIGNED_WORD2(++p) == TDEFL_READ_UNALIGNED_WORD2(++q)) &&
+                             (TDEFL_READ_UNALIGNED_WORD2(++p) == TDEFL_READ_UNALIGNED_WORD2(++q)) && (TDEFL_READ_UNALIGNED_WORD2(++p) == TDEFL_READ_UNALIGNED_WORD2(++q)) && (--probe_len > 0));
+                    cur_match_len = ((mz_uint)(p - (const mz_uint16 *)pCur_dict) * 2) + (mz_uint)(*(const mz_uint8 *)p == *(const mz_uint8 *)q);
+                    if (!probe_len)
+                        cur_match_len = cur_match_dist ? TDEFL_MAX_MATCH_LEN : 0;
+
+                    if ((cur_match_len < TDEFL_MIN_MATCH_LEN) || ((cur_match_len == TDEFL_MIN_MATCH_LEN) && (cur_match_dist >= 8U * 1024U)))
+                    {
+                        cur_match_len = 1;
+                        *pLZ_code_buf++ = (mz_uint8)first_trigram;
+                        *pLZ_flags = (mz_uint8)(*pLZ_flags >> 1);
+                        d->m_huff_count[0][(mz_uint8)first_trigram]++;
+                    }
+                    else
+                    {
+                        mz_uint32 s0, s1;
+                        cur_match_len = MZ_MIN(cur_match_len, lookahead_size);
+
+                        MZ_ASSERT((cur_match_len >= TDEFL_MIN_MATCH_LEN) && (cur_match_dist >= 1) && (cur_match_dist <= TDEFL_LZ_DICT_SIZE));
+
+                        cur_match_dist--;
+
+                        pLZ_code_buf[0] = (mz_uint8)(cur_match_len - TDEFL_MIN_MATCH_LEN);
+#ifdef MINIZ_UNALIGNED_USE_MEMCPY
+                        memcpy(&pLZ_code_buf[1], &cur_match_dist, sizeof(cur_match_dist));
+#else
+                        *(mz_uint16 *)(&pLZ_code_buf[1]) = (mz_uint16)cur_match_dist;
+#endif
+                        pLZ_code_buf += 3;
+                        *pLZ_flags = (mz_uint8)((*pLZ_flags >> 1) | 0x80);
+
+                        s0 = s_tdefl_small_dist_sym[cur_match_dist & 511];
+                        s1 = s_tdefl_large_dist_sym[cur_match_dist >> 8];
+                        d->m_huff_count[1][(cur_match_dist < 512) ? s0 : s1]++;
+
+                        d->m_huff_count[0][s_tdefl_len_sym[cur_match_len - TDEFL_MIN_MATCH_LEN]]++;
+                    }
+                }
+                else
+                {
+                    *pLZ_code_buf++ = (mz_uint8)first_trigram;
+                    *pLZ_flags = (mz_uint8)(*pLZ_flags >> 1);
+                    d->m_huff_count[0][(mz_uint8)first_trigram]++;
+                }
+
+                if (--num_flags_left == 0)
+                {
+                    num_flags_left = 8;
+                    pLZ_flags = pLZ_code_buf++;
+                }
+
+                total_lz_bytes += cur_match_len;
+                lookahead_pos += cur_match_len;
+                dict_size = MZ_MIN(dict_size + cur_match_len, (mz_uint)TDEFL_LZ_DICT_SIZE);
+                cur_pos = (cur_pos + cur_match_len) & TDEFL_LZ_DICT_SIZE_MASK;
+                MZ_ASSERT(lookahead_size >= cur_match_len);
+                lookahead_size -= cur_match_len;
+
+                if (pLZ_code_buf > &d->m_lz_code_buf[TDEFL_LZ_CODE_BUF_SIZE - 8])
+                {
+                    int n;
+                    d->m_lookahead_pos = lookahead_pos;
+                    d->m_lookahead_size = lookahead_size;
+                    d->m_dict_size = dict_size;
+                    d->m_total_lz_bytes = total_lz_bytes;
+                    d->m_pLZ_code_buf = pLZ_code_buf;
+                    d->m_pLZ_flags = pLZ_flags;
+                    d->m_num_flags_left = num_flags_left;
+                    if ((n = tdefl_flush_block(d, 0)) != 0)
+                        return (n < 0) ? MZ_FALSE : MZ_TRUE;
+                    total_lz_bytes = d->m_total_lz_bytes;
+                    pLZ_code_buf = d->m_pLZ_code_buf;
+                    pLZ_flags = d->m_pLZ_flags;
+                    num_flags_left = d->m_num_flags_left;
+                }
+            }
+
+            while (lookahead_size)
+            {
+                mz_uint8 lit = d->m_dict[cur_pos];
+
+                total_lz_bytes++;
+                *pLZ_code_buf++ = lit;
+                *pLZ_flags = (mz_uint8)(*pLZ_flags >> 1);
+                if (--num_flags_left == 0)
+                {
+                    num_flags_left = 8;
+                    pLZ_flags = pLZ_code_buf++;
+                }
+
+                d->m_huff_count[0][lit]++;
+
+                lookahead_pos++;
+                dict_size = MZ_MIN(dict_size + 1, (mz_uint)TDEFL_LZ_DICT_SIZE);
+                cur_pos = (cur_pos + 1) & TDEFL_LZ_DICT_SIZE_MASK;
+                lookahead_size--;
+
+                if (pLZ_code_buf > &d->m_lz_code_buf[TDEFL_LZ_CODE_BUF_SIZE - 8])
+                {
+                    int n;
+                    d->m_lookahead_pos = lookahead_pos;
+                    d->m_lookahead_size = lookahead_size;
+                    d->m_dict_size = dict_size;
+                    d->m_total_lz_bytes = total_lz_bytes;
+                    d->m_pLZ_code_buf = pLZ_code_buf;
+                    d->m_pLZ_flags = pLZ_flags;
+                    d->m_num_flags_left = num_flags_left;
+                    if ((n = tdefl_flush_block(d, 0)) != 0)
+                        return (n < 0) ? MZ_FALSE : MZ_TRUE;
+                    total_lz_bytes = d->m_total_lz_bytes;
+                    pLZ_code_buf = d->m_pLZ_code_buf;
+                    pLZ_flags = d->m_pLZ_flags;
+                    num_flags_left = d->m_num_flags_left;
+                }
+            }
+        }
+
+        d->m_lookahead_pos = lookahead_pos;
+        d->m_lookahead_size = lookahead_size;
+        d->m_dict_size = dict_size;
+        d->m_total_lz_bytes = total_lz_bytes;
+        d->m_pLZ_code_buf = pLZ_code_buf;
+        d->m_pLZ_flags = pLZ_flags;
+        d->m_num_flags_left = num_flags_left;
+        return MZ_TRUE;
+    }
+#endif /* MINIZ_USE_UNALIGNED_LOADS_AND_STORES && MINIZ_LITTLE_ENDIAN */
+
+    static MZ_FORCEINLINE void tdefl_record_literal(tdefl_compressor *d, mz_uint8 lit)
+    {
+        d->m_total_lz_bytes++;
+        *d->m_pLZ_code_buf++ = lit;
+        *d->m_pLZ_flags = (mz_uint8)(*d->m_pLZ_flags >> 1);
+        if (--d->m_num_flags_left == 0)
+        {
+            d->m_num_flags_left = 8;
+            d->m_pLZ_flags = d->m_pLZ_code_buf++;
+        }
+        d->m_huff_count[0][lit]++;
+    }
+
+    static MZ_FORCEINLINE void tdefl_record_match(tdefl_compressor *d, mz_uint match_len, mz_uint match_dist)
+    {
+        mz_uint32 s0, s1;
+
+        MZ_ASSERT((match_len >= TDEFL_MIN_MATCH_LEN) && (match_dist >= 1) && (match_dist <= TDEFL_LZ_DICT_SIZE));
+
+        d->m_total_lz_bytes += match_len;
+
+        d->m_pLZ_code_buf[0] = (mz_uint8)(match_len - TDEFL_MIN_MATCH_LEN);
+
+        match_dist -= 1;
+        d->m_pLZ_code_buf[1] = (mz_uint8)(match_dist & 0xFF);
+        d->m_pLZ_code_buf[2] = (mz_uint8)(match_dist >> 8);
+        d->m_pLZ_code_buf += 3;
+
+        *d->m_pLZ_flags = (mz_uint8)((*d->m_pLZ_flags >> 1) | 0x80);
+        if (--d->m_num_flags_left == 0)
+        {
+            d->m_num_flags_left = 8;
+            d->m_pLZ_flags = d->m_pLZ_code_buf++;
+        }
+
+        s0 = s_tdefl_small_dist_sym[match_dist & 511];
+        s1 = s_tdefl_large_dist_sym[(match_dist >> 8) & 127];
+        d->m_huff_count[1][(match_dist < 512) ? s0 : s1]++;
+        d->m_huff_count[0][s_tdefl_len_sym[match_len - TDEFL_MIN_MATCH_LEN]]++;
+    }
+
+    static mz_bool tdefl_compress_normal(tdefl_compressor *d)
+    {
+        const mz_uint8 *pSrc = d->m_pSrc;
+        size_t src_buf_left = d->m_src_buf_left;
+        tdefl_flush flush = d->m_flush;
+
+        while ((src_buf_left) || ((flush) && (d->m_lookahead_size)))
+        {
+            mz_uint len_to_move, cur_match_dist, cur_match_len, cur_pos;
+            /* Update dictionary and hash chains. Keeps the lookahead size equal to TDEFL_MAX_MATCH_LEN. */
+            if ((d->m_lookahead_size + d->m_dict_size) >= (TDEFL_MIN_MATCH_LEN - 1))
+            {
+                mz_uint dst_pos = (d->m_lookahead_pos + d->m_lookahead_size) & TDEFL_LZ_DICT_SIZE_MASK, ins_pos = d->m_lookahead_pos + d->m_lookahead_size - 2;
+                mz_uint hash = (d->m_dict[ins_pos & TDEFL_LZ_DICT_SIZE_MASK] << TDEFL_LZ_HASH_SHIFT) ^ d->m_dict[(ins_pos + 1) & TDEFL_LZ_DICT_SIZE_MASK];
+                mz_uint num_bytes_to_process = (mz_uint)MZ_MIN(src_buf_left, TDEFL_MAX_MATCH_LEN - d->m_lookahead_size);
+                const mz_uint8 *pSrc_end = pSrc ? pSrc + num_bytes_to_process : NULL;
+                src_buf_left -= num_bytes_to_process;
+                d->m_lookahead_size += num_bytes_to_process;
+                while (pSrc != pSrc_end)
+                {
+                    mz_uint8 c = *pSrc++;
+                    d->m_dict[dst_pos] = c;
+                    if (dst_pos < (TDEFL_MAX_MATCH_LEN - 1))
+                        d->m_dict[TDEFL_LZ_DICT_SIZE + dst_pos] = c;
+                    hash = ((hash << TDEFL_LZ_HASH_SHIFT) ^ c) & (TDEFL_LZ_HASH_SIZE - 1);
+                    d->m_next[ins_pos & TDEFL_LZ_DICT_SIZE_MASK] = d->m_hash[hash];
+                    d->m_hash[hash] = (mz_uint16)(ins_pos);
+                    dst_pos = (dst_pos + 1) & TDEFL_LZ_DICT_SIZE_MASK;
+                    ins_pos++;
+                }
+            }
+            else
+            {
+                while ((src_buf_left) && (d->m_lookahead_size < TDEFL_MAX_MATCH_LEN))
+                {
+                    mz_uint8 c = *pSrc++;
+                    mz_uint dst_pos = (d->m_lookahead_pos + d->m_lookahead_size) & TDEFL_LZ_DICT_SIZE_MASK;
+                    src_buf_left--;
+                    d->m_dict[dst_pos] = c;
+                    if (dst_pos < (TDEFL_MAX_MATCH_LEN - 1))
+                        d->m_dict[TDEFL_LZ_DICT_SIZE + dst_pos] = c;
+                    if ((++d->m_lookahead_size + d->m_dict_size) >= TDEFL_MIN_MATCH_LEN)
+                    {
+                        mz_uint ins_pos = d->m_lookahead_pos + (d->m_lookahead_size - 1) - 2;
+                        mz_uint hash = ((d->m_dict[ins_pos & TDEFL_LZ_DICT_SIZE_MASK] << (TDEFL_LZ_HASH_SHIFT * 2)) ^ (d->m_dict[(ins_pos + 1) & TDEFL_LZ_DICT_SIZE_MASK] << TDEFL_LZ_HASH_SHIFT) ^ c) & (TDEFL_LZ_HASH_SIZE - 1);
+                        d->m_next[ins_pos & TDEFL_LZ_DICT_SIZE_MASK] = d->m_hash[hash];
+                        d->m_hash[hash] = (mz_uint16)(ins_pos);
+                    }
+                }
+            }
+            d->m_dict_size = MZ_MIN(TDEFL_LZ_DICT_SIZE - d->m_lookahead_size, d->m_dict_size);
+            if ((!flush) && (d->m_lookahead_size < TDEFL_MAX_MATCH_LEN))
+                break;
+
+            /* Simple lazy/greedy parsing state machine. */
+            len_to_move = 1;
+            cur_match_dist = 0;
+            cur_match_len = d->m_saved_match_len ? d->m_saved_match_len : (TDEFL_MIN_MATCH_LEN - 1);
+            cur_pos = d->m_lookahead_pos & TDEFL_LZ_DICT_SIZE_MASK;
+            if (d->m_flags & (TDEFL_RLE_MATCHES | TDEFL_FORCE_ALL_RAW_BLOCKS))
+            {
+                if ((d->m_dict_size) && (!(d->m_flags & TDEFL_FORCE_ALL_RAW_BLOCKS)))
+                {
+                    mz_uint8 c = d->m_dict[(cur_pos - 1) & TDEFL_LZ_DICT_SIZE_MASK];
+                    cur_match_len = 0;
+                    while (cur_match_len < d->m_lookahead_size)
+                    {
+                        if (d->m_dict[cur_pos + cur_match_len] != c)
+                            break;
+                        cur_match_len++;
+                    }
+                    if (cur_match_len < TDEFL_MIN_MATCH_LEN)
+                        cur_match_len = 0;
+                    else
+                        cur_match_dist = 1;
+                }
+            }
+            else
+            {
+                tdefl_find_match(d, d->m_lookahead_pos, d->m_dict_size, d->m_lookahead_size, &cur_match_dist, &cur_match_len);
+            }
+            if (((cur_match_len == TDEFL_MIN_MATCH_LEN) && (cur_match_dist >= 8U * 1024U)) || (cur_pos == cur_match_dist) || ((d->m_flags & TDEFL_FILTER_MATCHES) && (cur_match_len <= 5)))
+            {
+                cur_match_dist = cur_match_len = 0;
+            }
+            if (d->m_saved_match_len)
+            {
+                if (cur_match_len > d->m_saved_match_len)
+                {
+                    tdefl_record_literal(d, (mz_uint8)d->m_saved_lit);
+                    if (cur_match_len >= 128)
+                    {
+                        tdefl_record_match(d, cur_match_len, cur_match_dist);
+                        d->m_saved_match_len = 0;
+                        len_to_move = cur_match_len;
+                    }
+                    else
+                    {
+                        d->m_saved_lit = d->m_dict[cur_pos];
+                        d->m_saved_match_dist = cur_match_dist;
+                        d->m_saved_match_len = cur_match_len;
+                    }
+                }
+                else
+                {
+                    tdefl_record_match(d, d->m_saved_match_len, d->m_saved_match_dist);
+                    len_to_move = d->m_saved_match_len - 1;
+                    d->m_saved_match_len = 0;
+                }
+            }
+            else if (!cur_match_dist)
+                tdefl_record_literal(d, d->m_dict[MZ_MIN(cur_pos, sizeof(d->m_dict) - 1)]);
+            else if ((d->m_greedy_parsing) || (d->m_flags & TDEFL_RLE_MATCHES) || (cur_match_len >= 128))
+            {
+                tdefl_record_match(d, cur_match_len, cur_match_dist);
+                len_to_move = cur_match_len;
+            }
+            else
+            {
+                d->m_saved_lit = d->m_dict[MZ_MIN(cur_pos, sizeof(d->m_dict) - 1)];
+                d->m_saved_match_dist = cur_match_dist;
+                d->m_saved_match_len = cur_match_len;
+            }
+            /* Move the lookahead forward by len_to_move bytes. */
+            d->m_lookahead_pos += len_to_move;
+            MZ_ASSERT(d->m_lookahead_size >= len_to_move);
+            d->m_lookahead_size -= len_to_move;
+            d->m_dict_size = MZ_MIN(d->m_dict_size + len_to_move, (mz_uint)TDEFL_LZ_DICT_SIZE);
+            /* Check if it's time to flush the current LZ codes to the internal output buffer. */
+            if ((d->m_pLZ_code_buf > &d->m_lz_code_buf[TDEFL_LZ_CODE_BUF_SIZE - 8]) ||
+                ((d->m_total_lz_bytes > 31 * 1024) && (((((mz_uint)(d->m_pLZ_code_buf - d->m_lz_code_buf) * 115) >> 7) >= d->m_total_lz_bytes) || (d->m_flags & TDEFL_FORCE_ALL_RAW_BLOCKS))))
+            {
+                int n;
+                d->m_pSrc = pSrc;
+                d->m_src_buf_left = src_buf_left;
+                if ((n = tdefl_flush_block(d, 0)) != 0)
+                    return (n < 0) ? MZ_FALSE : MZ_TRUE;
+            }
+        }
+
+        d->m_pSrc = pSrc;
+        d->m_src_buf_left = src_buf_left;
+        return MZ_TRUE;
+    }
+
+    static tdefl_status tdefl_flush_output_buffer(tdefl_compressor *d)
+    {
+        if (d->m_pIn_buf_size)
+        {
+            *d->m_pIn_buf_size = d->m_pSrc - (const mz_uint8 *)d->m_pIn_buf;
+        }
+
+        if (d->m_pOut_buf_size)
+        {
+            size_t n = MZ_MIN(*d->m_pOut_buf_size - d->m_out_buf_ofs, d->m_output_flush_remaining);
+            memcpy((mz_uint8 *)d->m_pOut_buf + d->m_out_buf_ofs, d->m_output_buf + d->m_output_flush_ofs, n);
+            d->m_output_flush_ofs += (mz_uint)n;
+            d->m_output_flush_remaining -= (mz_uint)n;
+            d->m_out_buf_ofs += n;
+
+            *d->m_pOut_buf_size = d->m_out_buf_ofs;
+        }
+
+        return (d->m_finished && !d->m_output_flush_remaining) ? TDEFL_STATUS_DONE : TDEFL_STATUS_OKAY;
+    }
+
+    tdefl_status tdefl_compress(tdefl_compressor *d, const void *pIn_buf, size_t *pIn_buf_size, void *pOut_buf, size_t *pOut_buf_size, tdefl_flush flush)
+    {
+        if (!d)
+        {
+            if (pIn_buf_size)
+                *pIn_buf_size = 0;
+            if (pOut_buf_size)
+                *pOut_buf_size = 0;
+            return TDEFL_STATUS_BAD_PARAM;
+        }
+
+        d->m_pIn_buf = pIn_buf;
+        d->m_pIn_buf_size = pIn_buf_size;
+        d->m_pOut_buf = pOut_buf;
+        d->m_pOut_buf_size = pOut_buf_size;
+        d->m_pSrc = (const mz_uint8 *)(pIn_buf);
+        d->m_src_buf_left = pIn_buf_size ? *pIn_buf_size : 0;
+        d->m_out_buf_ofs = 0;
+        d->m_flush = flush;
+
+        if (((d->m_pPut_buf_func != NULL) == ((pOut_buf != NULL) || (pOut_buf_size != NULL))) || (d->m_prev_return_status != TDEFL_STATUS_OKAY) ||
+            (d->m_wants_to_finish && (flush != TDEFL_FINISH)) || (pIn_buf_size && *pIn_buf_size && !pIn_buf) || (pOut_buf_size && *pOut_buf_size && !pOut_buf))
+        {
+            if (pIn_buf_size)
+                *pIn_buf_size = 0;
+            if (pOut_buf_size)
+                *pOut_buf_size = 0;
+            return (d->m_prev_return_status = TDEFL_STATUS_BAD_PARAM);
+        }
+        d->m_wants_to_finish |= (flush == TDEFL_FINISH);
+
+        if ((d->m_output_flush_remaining) || (d->m_finished))
+            return (d->m_prev_return_status = tdefl_flush_output_buffer(d));
+
+#if MINIZ_USE_UNALIGNED_LOADS_AND_STORES && MINIZ_LITTLE_ENDIAN
+        if (((d->m_flags & TDEFL_MAX_PROBES_MASK) == 1) &&
+            ((d->m_flags & TDEFL_GREEDY_PARSING_FLAG) != 0) &&
+            ((d->m_flags & (TDEFL_FILTER_MATCHES | TDEFL_FORCE_ALL_RAW_BLOCKS | TDEFL_RLE_MATCHES)) == 0))
+        {
+            if (!tdefl_compress_fast(d))
+                return d->m_prev_return_status;
+        }
+        else
+#endif /* #if MINIZ_USE_UNALIGNED_LOADS_AND_STORES && MINIZ_LITTLE_ENDIAN */
+        {
+            if (!tdefl_compress_normal(d))
+                return d->m_prev_return_status;
+        }
+
+        if ((d->m_flags & (TDEFL_WRITE_ZLIB_HEADER | TDEFL_COMPUTE_ADLER32)) && (pIn_buf))
+            d->m_adler32 = (mz_uint32)mz_adler32(d->m_adler32, (const mz_uint8 *)pIn_buf, d->m_pSrc - (const mz_uint8 *)pIn_buf);
+
+        if ((flush) && (!d->m_lookahead_size) && (!d->m_src_buf_left) && (!d->m_output_flush_remaining))
+        {
+            if (tdefl_flush_block(d, flush) < 0)
+                return d->m_prev_return_status;
+            d->m_finished = (flush == TDEFL_FINISH);
+            if (flush == TDEFL_FULL_FLUSH)
+            {
+                MZ_CLEAR_ARR(d->m_hash);
+                MZ_CLEAR_ARR(d->m_next);
+                d->m_dict_size = 0;
+            }
+        }
+
+        return (d->m_prev_return_status = tdefl_flush_output_buffer(d));
+    }
+
+    tdefl_status tdefl_compress_buffer(tdefl_compressor *d, const void *pIn_buf, size_t in_buf_size, tdefl_flush flush)
+    {
+        MZ_ASSERT(d->m_pPut_buf_func);
+        return tdefl_compress(d, pIn_buf, &in_buf_size, NULL, NULL, flush);
+    }
+
+    tdefl_status tdefl_init(tdefl_compressor *d, tdefl_put_buf_func_ptr pPut_buf_func, void *pPut_buf_user, int flags)
+    {
+        d->m_pPut_buf_func = pPut_buf_func;
+        d->m_pPut_buf_user = pPut_buf_user;
+        d->m_flags = (mz_uint)(flags);
+        d->m_max_probes[0] = 1 + ((flags & 0xFFF) + 2) / 3;
+        d->m_greedy_parsing = (flags & TDEFL_GREEDY_PARSING_FLAG) != 0;
+        d->m_max_probes[1] = 1 + (((flags & 0xFFF) >> 2) + 2) / 3;
+        if (!(flags & TDEFL_NONDETERMINISTIC_PARSING_FLAG))
+            MZ_CLEAR_ARR(d->m_hash);
+        d->m_lookahead_pos = d->m_lookahead_size = d->m_dict_size = d->m_total_lz_bytes = d->m_lz_code_buf_dict_pos = d->m_bits_in = 0;
+        d->m_output_flush_ofs = d->m_output_flush_remaining = d->m_finished = d->m_block_index = d->m_bit_buffer = d->m_wants_to_finish = 0;
+        d->m_pLZ_code_buf = d->m_lz_code_buf + 1;
+        d->m_pLZ_flags = d->m_lz_code_buf;
+        *d->m_pLZ_flags = 0;
+        d->m_num_flags_left = 8;
+        d->m_pOutput_buf = d->m_output_buf;
+        d->m_pOutput_buf_end = d->m_output_buf;
+        d->m_prev_return_status = TDEFL_STATUS_OKAY;
+        d->m_saved_match_dist = d->m_saved_match_len = d->m_saved_lit = 0;
+        d->m_adler32 = 1;
+        d->m_pIn_buf = NULL;
+        d->m_pOut_buf = NULL;
+        d->m_pIn_buf_size = NULL;
+        d->m_pOut_buf_size = NULL;
+        d->m_flush = TDEFL_NO_FLUSH;
+        d->m_pSrc = NULL;
+        d->m_src_buf_left = 0;
+        d->m_out_buf_ofs = 0;
+        if (!(flags & TDEFL_NONDETERMINISTIC_PARSING_FLAG))
+            MZ_CLEAR_ARR(d->m_dict);
+        memset(&d->m_huff_count[0][0], 0, sizeof(d->m_huff_count[0][0]) * TDEFL_MAX_HUFF_SYMBOLS_0);
+        memset(&d->m_huff_count[1][0], 0, sizeof(d->m_huff_count[1][0]) * TDEFL_MAX_HUFF_SYMBOLS_1);
+        return TDEFL_STATUS_OKAY;
+    }
+
+    tdefl_status tdefl_get_prev_return_status(tdefl_compressor *d)
+    {
+        return d->m_prev_return_status;
+    }
+
+    mz_uint32 tdefl_get_adler32(tdefl_compressor *d)
+    {
+        return d->m_adler32;
+    }
+
+    mz_bool tdefl_compress_mem_to_output(const void *pBuf, size_t buf_len, tdefl_put_buf_func_ptr pPut_buf_func, void *pPut_buf_user, int flags)
+    {
+        tdefl_compressor *pComp;
+        mz_bool succeeded;
+        if (((buf_len) && (!pBuf)) || (!pPut_buf_func))
+            return MZ_FALSE;
+        pComp = (tdefl_compressor *)MZ_MALLOC(sizeof(tdefl_compressor));
+        if (!pComp)
+            return MZ_FALSE;
+        succeeded = (tdefl_init(pComp, pPut_buf_func, pPut_buf_user, flags) == TDEFL_STATUS_OKAY);
+        succeeded = succeeded && (tdefl_compress_buffer(pComp, pBuf, buf_len, TDEFL_FINISH) == TDEFL_STATUS_DONE);
+        MZ_FREE(pComp);
+        return succeeded;
+    }
+
+    typedef struct
+    {
+        size_t m_size, m_capacity;
+        mz_uint8 *m_pBuf;
+        mz_bool m_expandable;
+    } tdefl_output_buffer;
+
+    static mz_bool tdefl_output_buffer_putter(const void *pBuf, int len, void *pUser)
+    {
+        tdefl_output_buffer *p = (tdefl_output_buffer *)pUser;
+        size_t new_size = p->m_size + len;
+        if (new_size > p->m_capacity)
+        {
+            size_t new_capacity = p->m_capacity;
+            mz_uint8 *pNew_buf;
+            if (!p->m_expandable)
+                return MZ_FALSE;
+            do
+            {
+                new_capacity = MZ_MAX(128U, new_capacity << 1U);
+            } while (new_size > new_capacity);
+            pNew_buf = (mz_uint8 *)MZ_REALLOC(p->m_pBuf, new_capacity);
+            if (!pNew_buf)
+                return MZ_FALSE;
+            p->m_pBuf = pNew_buf;
+            p->m_capacity = new_capacity;
+        }
+        memcpy((mz_uint8 *)p->m_pBuf + p->m_size, pBuf, len);
+        p->m_size = new_size;
+        return MZ_TRUE;
+    }
+
+    void *tdefl_compress_mem_to_heap(const void *pSrc_buf, size_t src_buf_len, size_t *pOut_len, int flags)
+    {
+        tdefl_output_buffer out_buf;
+        MZ_CLEAR_OBJ(out_buf);
+        if (!pOut_len)
+            return MZ_FALSE;
+        else
+            *pOut_len = 0;
+        out_buf.m_expandable = MZ_TRUE;
+        if (!tdefl_compress_mem_to_output(pSrc_buf, src_buf_len, tdefl_output_buffer_putter, &out_buf, flags))
+            return NULL;
+        *pOut_len = out_buf.m_size;
+        return out_buf.m_pBuf;
+    }
+
+    size_t tdefl_compress_mem_to_mem(void *pOut_buf, size_t out_buf_len, const void *pSrc_buf, size_t src_buf_len, int flags)
+    {
+        tdefl_output_buffer out_buf;
+        MZ_CLEAR_OBJ(out_buf);
+        if (!pOut_buf)
+            return 0;
+        out_buf.m_pBuf = (mz_uint8 *)pOut_buf;
+        out_buf.m_capacity = out_buf_len;
+        if (!tdefl_compress_mem_to_output(pSrc_buf, src_buf_len, tdefl_output_buffer_putter, &out_buf, flags))
+            return 0;
+        return out_buf.m_size;
+    }
+
+    /* level may actually range from [0,10] (10 is a "hidden" max level, where we want a bit more compression and it's fine if throughput to fall off a cliff on some files). */
+    mz_uint tdefl_create_comp_flags_from_zip_params(int level, int window_bits, int strategy)
+    {
+        mz_uint comp_flags = s_tdefl_num_probes[(level >= 0) ? MZ_MIN(10, level) : MZ_DEFAULT_LEVEL] | ((level <= 3) ? TDEFL_GREEDY_PARSING_FLAG : 0);
+        if (window_bits > 0)
+            comp_flags |= TDEFL_WRITE_ZLIB_HEADER;
+
+        if (!level)
+            comp_flags |= TDEFL_FORCE_ALL_RAW_BLOCKS;
+        else if (strategy == MZ_FILTERED)
+            comp_flags |= TDEFL_FILTER_MATCHES;
+        else if (strategy == MZ_HUFFMAN_ONLY)
+            comp_flags &= ~TDEFL_MAX_PROBES_MASK;
+        else if (strategy == MZ_FIXED)
+            comp_flags |= TDEFL_FORCE_ALL_STATIC_BLOCKS;
+        else if (strategy == MZ_RLE)
+            comp_flags |= TDEFL_RLE_MATCHES;
+
+        return comp_flags;
+    }
+
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4204) /* nonstandard extension used : non-constant aggregate initializer (also supported by GNU C and C99, so no big deal) */
+#endif
+
+    /* Simple PNG writer function by Alex Evans, 2011. Released into the public domain: https://gist.github.com/908299, more context at
+     http://altdevblogaday.org/2011/04/06/a-smaller-jpg-encoder/.
+     This is actually a modification of Alex's original code so PNG files generated by this function pass pngcheck. */
+    void *tdefl_write_image_to_png_file_in_memory_ex(const void *pImage, int w, int h, int num_chans, size_t *pLen_out, mz_uint level, mz_bool flip)
+    {
+        /* Using a local copy of this array here in case MINIZ_NO_ZLIB_APIS was defined. */
+        static const mz_uint s_tdefl_png_num_probes[11] = { 0, 1, 6, 32, 16, 32, 128, 256, 512, 768, 1500 };
+        tdefl_compressor *pComp = (tdefl_compressor *)MZ_MALLOC(sizeof(tdefl_compressor));
+        tdefl_output_buffer out_buf;
+        int i, bpl = w * num_chans, y, z;
+        mz_uint32 c;
+        *pLen_out = 0;
+        if (!pComp)
+            return NULL;
+        MZ_CLEAR_OBJ(out_buf);
+        out_buf.m_expandable = MZ_TRUE;
+        out_buf.m_capacity = 57 + MZ_MAX(64, (1 + bpl) * h);
+        if (NULL == (out_buf.m_pBuf = (mz_uint8 *)MZ_MALLOC(out_buf.m_capacity)))
+        {
+            MZ_FREE(pComp);
+            return NULL;
+        }
+        /* write dummy header */
+        for (z = 41; z; --z)
+            tdefl_output_buffer_putter(&z, 1, &out_buf);
+        /* compress image data */
+        tdefl_init(pComp, tdefl_output_buffer_putter, &out_buf, s_tdefl_png_num_probes[MZ_MIN(10, level)] | TDEFL_WRITE_ZLIB_HEADER);
+        for (y = 0; y < h; ++y)
+        {
+            tdefl_compress_buffer(pComp, &z, 1, TDEFL_NO_FLUSH);
+            tdefl_compress_buffer(pComp, (mz_uint8 *)pImage + (flip ? (h - 1 - y) : y) * bpl, bpl, TDEFL_NO_FLUSH);
+        }
+        if (tdefl_compress_buffer(pComp, NULL, 0, TDEFL_FINISH) != TDEFL_STATUS_DONE)
+        {
+            MZ_FREE(pComp);
+            MZ_FREE(out_buf.m_pBuf);
+            return NULL;
+        }
+        /* write real header */
+        *pLen_out = out_buf.m_size - 41;
+        {
+            static const mz_uint8 chans[] = { 0x00, 0x00, 0x04, 0x02, 0x06 };
+            mz_uint8 pnghdr[41] = { 0x89, 0x50, 0x4e, 0x47, 0x0d,
+                                    0x0a, 0x1a, 0x0a, 0x00, 0x00,
+                                    0x00, 0x0d, 0x49, 0x48, 0x44,
+                                    0x52, 0x00, 0x00, 0x00, 0x00,
+                                    0x00, 0x00, 0x00, 0x00, 0x08,
+                                    0x00, 0x00, 0x00, 0x00, 0x00,
+                                    0x00, 0x00, 0x00, 0x00, 0x00,
+                                    0x00, 0x00, 0x49, 0x44, 0x41,
+                                    0x54 };
+            pnghdr[18] = (mz_uint8)(w >> 8);
+            pnghdr[19] = (mz_uint8)w;
+            pnghdr[22] = (mz_uint8)(h >> 8);
+            pnghdr[23] = (mz_uint8)h;
+            pnghdr[25] = chans[num_chans];
+            pnghdr[33] = (mz_uint8)(*pLen_out >> 24);
+            pnghdr[34] = (mz_uint8)(*pLen_out >> 16);
+            pnghdr[35] = (mz_uint8)(*pLen_out >> 8);
+            pnghdr[36] = (mz_uint8)*pLen_out;
+            c = (mz_uint32)mz_crc32(MZ_CRC32_INIT, pnghdr + 12, 17);
+            for (i = 0; i < 4; ++i, c <<= 8)
+                ((mz_uint8 *)(pnghdr + 29))[i] = (mz_uint8)(c >> 24);
+            memcpy(out_buf.m_pBuf, pnghdr, 41);
+        }
+        /* write footer (IDAT CRC-32, followed by IEND chunk) */
+        if (!tdefl_output_buffer_putter("\0\0\0\0\0\0\0\0\x49\x45\x4e\x44\xae\x42\x60\x82", 16, &out_buf))
+        {
+            *pLen_out = 0;
+            MZ_FREE(pComp);
+            MZ_FREE(out_buf.m_pBuf);
+            return NULL;
+        }
+        c = (mz_uint32)mz_crc32(MZ_CRC32_INIT, out_buf.m_pBuf + 41 - 4, *pLen_out + 4);
+        for (i = 0; i < 4; ++i, c <<= 8)
+            (out_buf.m_pBuf + out_buf.m_size - 16)[i] = (mz_uint8)(c >> 24);
+        /* compute final size of file, grab compressed data buffer and return */
+        *pLen_out += 57;
+        MZ_FREE(pComp);
+        return out_buf.m_pBuf;
+    }
+    void *tdefl_write_image_to_png_file_in_memory(const void *pImage, int w, int h, int num_chans, size_t *pLen_out)
+    {
+        /* Level 6 corresponds to TDEFL_DEFAULT_MAX_PROBES or MZ_DEFAULT_LEVEL (but we can't depend on MZ_DEFAULT_LEVEL being available in case the zlib API's where #defined out) */
+        return tdefl_write_image_to_png_file_in_memory_ex(pImage, w, h, num_chans, pLen_out, 6, MZ_FALSE);
+    }
+
+#ifndef MINIZ_NO_MALLOC
+    /* Allocate the tdefl_compressor and tinfl_decompressor structures in C so that */
+    /* non-C language bindings to tdefL_ and tinfl_ API don't need to worry about */
+    /* structure size and allocation mechanism. */
+    tdefl_compressor *tdefl_compressor_alloc(void)
+    {
+        return (tdefl_compressor *)MZ_MALLOC(sizeof(tdefl_compressor));
+    }
+
+    void tdefl_compressor_free(tdefl_compressor *pComp)
+    {
+        MZ_FREE(pComp);
+    }
+#endif
+
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*#ifndef MINIZ_NO_DEFLATE_APIS*/
+ /**************************************************************************
+ *
+ * Copyright 2013-2014 RAD Game Tools and Valve Software
+ * Copyright 2010-2014 Rich Geldreich and Tenacious Software LLC
+ * All Rights Reserved.
+ *
+ * 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.
+ *
+ **************************************************************************/
+
+
+
+#ifndef MINIZ_NO_INFLATE_APIS
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+    /* ------------------- Low-level Decompression (completely independent from all compression API's) */
+
+#define TINFL_MEMCPY(d, s, l) memcpy(d, s, l)
+#define TINFL_MEMSET(p, c, l) memset(p, c, l)
+
+#define TINFL_CR_BEGIN  \
+    switch (r->m_state) \
+    {                   \
+        case 0:
+#define TINFL_CR_RETURN(state_index, result) \
+    do                                       \
+    {                                        \
+        status = result;                     \
+        r->m_state = state_index;            \
+        goto common_exit;                    \
+        case state_index:;                   \
+    }                                        \
+    MZ_MACRO_END
+#define TINFL_CR_RETURN_FOREVER(state_index, result) \
+    do                                               \
+    {                                                \
+        for (;;)                                     \
+        {                                            \
+            TINFL_CR_RETURN(state_index, result);    \
+        }                                            \
+    }                                                \
+    MZ_MACRO_END
+#define TINFL_CR_FINISH }
+
+#define TINFL_GET_BYTE(state_index, c)                                                                                                                           \
+    do                                                                                                                                                           \
+    {                                                                                                                                                            \
+        while (pIn_buf_cur >= pIn_buf_end)                                                                                                                       \
+        {                                                                                                                                                        \
+            TINFL_CR_RETURN(state_index, (decomp_flags & TINFL_FLAG_HAS_MORE_INPUT) ? TINFL_STATUS_NEEDS_MORE_INPUT : TINFL_STATUS_FAILED_CANNOT_MAKE_PROGRESS); \
+        }                                                                                                                                                        \
+        c = *pIn_buf_cur++;                                                                                                                                      \
+    }                                                                                                                                                            \
+    MZ_MACRO_END
+
+#define TINFL_NEED_BITS(state_index, n)                \
+    do                                                 \
+    {                                                  \
+        mz_uint c;                                     \
+        TINFL_GET_BYTE(state_index, c);                \
+        bit_buf |= (((tinfl_bit_buf_t)c) << num_bits); \
+        num_bits += 8;                                 \
+    } while (num_bits < (mz_uint)(n))
+#define TINFL_SKIP_BITS(state_index, n)      \
+    do                                       \
+    {                                        \
+        if (num_bits < (mz_uint)(n))         \
+        {                                    \
+            TINFL_NEED_BITS(state_index, n); \
+        }                                    \
+        bit_buf >>= (n);                     \
+        num_bits -= (n);                     \
+    }                                        \
+    MZ_MACRO_END
+#define TINFL_GET_BITS(state_index, b, n)    \
+    do                                       \
+    {                                        \
+        if (num_bits < (mz_uint)(n))         \
+        {                                    \
+            TINFL_NEED_BITS(state_index, n); \
+        }                                    \
+        b = bit_buf & ((1 << (n)) - 1);      \
+        bit_buf >>= (n);                     \
+        num_bits -= (n);                     \
+    }                                        \
+    MZ_MACRO_END
+
+/* TINFL_HUFF_BITBUF_FILL() is only used rarely, when the number of bytes remaining in the input buffer falls below 2. */
+/* It reads just enough bytes from the input stream that are needed to decode the next Huffman code (and absolutely no more). It works by trying to fully decode a */
+/* Huffman code by using whatever bits are currently present in the bit buffer. If this fails, it reads another byte, and tries again until it succeeds or until the */
+/* bit buffer contains >=15 bits (deflate's max. Huffman code size). */
+#define TINFL_HUFF_BITBUF_FILL(state_index, pLookUp, pTree)          \
+    do                                                               \
+    {                                                                \
+        temp = pLookUp[bit_buf & (TINFL_FAST_LOOKUP_SIZE - 1)];      \
+        if (temp >= 0)                                               \
+        {                                                            \
+            code_len = temp >> 9;                                    \
+            if ((code_len) && (num_bits >= code_len))                \
+                break;                                               \
+        }                                                            \
+        else if (num_bits > TINFL_FAST_LOOKUP_BITS)                  \
+        {                                                            \
+            code_len = TINFL_FAST_LOOKUP_BITS;                       \
+            do                                                       \
+            {                                                        \
+                temp = pTree[~temp + ((bit_buf >> code_len++) & 1)]; \
+            } while ((temp < 0) && (num_bits >= (code_len + 1)));    \
+            if (temp >= 0)                                           \
+                break;                                               \
+        }                                                            \
+        TINFL_GET_BYTE(state_index, c);                              \
+        bit_buf |= (((tinfl_bit_buf_t)c) << num_bits);               \
+        num_bits += 8;                                               \
+    } while (num_bits < 15);
+
+/* TINFL_HUFF_DECODE() decodes the next Huffman coded symbol. It's more complex than you would initially expect because the zlib API expects the decompressor to never read */
+/* beyond the final byte of the deflate stream. (In other words, when this macro wants to read another byte from the input, it REALLY needs another byte in order to fully */
+/* decode the next Huffman code.) Handling this properly is particularly important on raw deflate (non-zlib) streams, which aren't followed by a byte aligned adler-32. */
+/* The slow path is only executed at the very end of the input buffer. */
+/* v1.16: The original macro handled the case at the very end of the passed-in input buffer, but we also need to handle the case where the user passes in 1+zillion bytes */
+/* following the deflate data and our non-conservative read-ahead path won't kick in here on this code. This is much trickier. */
+#define TINFL_HUFF_DECODE(state_index, sym, pLookUp, pTree)                                                                         \
+    do                                                                                                                              \
+    {                                                                                                                               \
+        int temp;                                                                                                                   \
+        mz_uint code_len, c;                                                                                                        \
+        if (num_bits < 15)                                                                                                          \
+        {                                                                                                                           \
+            if ((pIn_buf_end - pIn_buf_cur) < 2)                                                                                    \
+            {                                                                                                                       \
+                TINFL_HUFF_BITBUF_FILL(state_index, pLookUp, pTree);                                                                \
+            }                                                                                                                       \
+            else                                                                                                                    \
+            {                                                                                                                       \
+                bit_buf |= (((tinfl_bit_buf_t)pIn_buf_cur[0]) << num_bits) | (((tinfl_bit_buf_t)pIn_buf_cur[1]) << (num_bits + 8)); \
+                pIn_buf_cur += 2;                                                                                                   \
+                num_bits += 16;                                                                                                     \
+            }                                                                                                                       \
+        }                                                                                                                           \
+        if ((temp = pLookUp[bit_buf & (TINFL_FAST_LOOKUP_SIZE - 1)]) >= 0)                                                          \
+            code_len = temp >> 9, temp &= 511;                                                                                      \
+        else                                                                                                                        \
+        {                                                                                                                           \
+            code_len = TINFL_FAST_LOOKUP_BITS;                                                                                      \
+            do                                                                                                                      \
+            {                                                                                                                       \
+                temp = pTree[~temp + ((bit_buf >> code_len++) & 1)];                                                                \
+            } while (temp < 0);                                                                                                     \
+        }                                                                                                                           \
+        sym = temp;                                                                                                                 \
+        bit_buf >>= code_len;                                                                                                       \
+        num_bits -= code_len;                                                                                                       \
+    }                                                                                                                               \
+    MZ_MACRO_END
+
+    static void tinfl_clear_tree(tinfl_decompressor *r)
+    {
+        if (r->m_type == 0)
+            MZ_CLEAR_ARR(r->m_tree_0);
+        else if (r->m_type == 1)
+            MZ_CLEAR_ARR(r->m_tree_1);
+        else
+            MZ_CLEAR_ARR(r->m_tree_2);
+    }
+
+    tinfl_status tinfl_decompress(tinfl_decompressor *r, const mz_uint8 *pIn_buf_next, size_t *pIn_buf_size, mz_uint8 *pOut_buf_start, mz_uint8 *pOut_buf_next, size_t *pOut_buf_size, const mz_uint32 decomp_flags)
+    {
+        static const mz_uint16 s_length_base[31] = { 3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31, 35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0 };
+        static const mz_uint8 s_length_extra[31] = { 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 0, 0, 0 };
+        static const mz_uint16 s_dist_base[32] = { 1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193, 257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145, 8193, 12289, 16385, 24577, 0, 0 };
+        static const mz_uint8 s_dist_extra[32] = { 0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13 };
+        static const mz_uint8 s_length_dezigzag[19] = { 16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15 };
+        static const mz_uint16 s_min_table_sizes[3] = { 257, 1, 4 };
+
+        mz_int16 *pTrees[3];
+        mz_uint8 *pCode_sizes[3];
+
+        tinfl_status status = TINFL_STATUS_FAILED;
+        mz_uint32 num_bits, dist, counter, num_extra;
+        tinfl_bit_buf_t bit_buf;
+        const mz_uint8 *pIn_buf_cur = pIn_buf_next, *const pIn_buf_end = pIn_buf_next + *pIn_buf_size;
+        mz_uint8 *pOut_buf_cur = pOut_buf_next, *const pOut_buf_end = pOut_buf_next ? pOut_buf_next + *pOut_buf_size : NULL;
+        size_t out_buf_size_mask = (decomp_flags & TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF) ? (size_t)-1 : ((pOut_buf_next - pOut_buf_start) + *pOut_buf_size) - 1, dist_from_out_buf_start;
+
+        /* Ensure the output buffer's size is a power of 2, unless the output buffer is large enough to hold the entire output file (in which case it doesn't matter). */
+        if (((out_buf_size_mask + 1) & out_buf_size_mask) || (pOut_buf_next < pOut_buf_start))
+        {
+            *pIn_buf_size = *pOut_buf_size = 0;
+            return TINFL_STATUS_BAD_PARAM;
+        }
+
+        pTrees[0] = r->m_tree_0;
+        pTrees[1] = r->m_tree_1;
+        pTrees[2] = r->m_tree_2;
+        pCode_sizes[0] = r->m_code_size_0;
+        pCode_sizes[1] = r->m_code_size_1;
+        pCode_sizes[2] = r->m_code_size_2;
+
+        num_bits = r->m_num_bits;
+        bit_buf = r->m_bit_buf;
+        dist = r->m_dist;
+        counter = r->m_counter;
+        num_extra = r->m_num_extra;
+        dist_from_out_buf_start = r->m_dist_from_out_buf_start;
+        TINFL_CR_BEGIN
+
+        bit_buf = num_bits = dist = counter = num_extra = r->m_zhdr0 = r->m_zhdr1 = 0;
+        r->m_z_adler32 = r->m_check_adler32 = 1;
+        if (decomp_flags & TINFL_FLAG_PARSE_ZLIB_HEADER)
+        {
+            TINFL_GET_BYTE(1, r->m_zhdr0);
+            TINFL_GET_BYTE(2, r->m_zhdr1);
+            counter = (((r->m_zhdr0 * 256 + r->m_zhdr1) % 31 != 0) || (r->m_zhdr1 & 32) || ((r->m_zhdr0 & 15) != 8));
+            if (!(decomp_flags & TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF))
+                counter |= (((1U << (8U + (r->m_zhdr0 >> 4))) > 32768U) || ((out_buf_size_mask + 1) < (size_t)((size_t)1 << (8U + (r->m_zhdr0 >> 4)))));
+            if (counter)
+            {
+                TINFL_CR_RETURN_FOREVER(36, TINFL_STATUS_FAILED);
+            }
+        }
+
+        do
+        {
+            TINFL_GET_BITS(3, r->m_final, 3);
+            r->m_type = r->m_final >> 1;
+            if (r->m_type == 0)
+            {
+                TINFL_SKIP_BITS(5, num_bits & 7);
+                for (counter = 0; counter < 4; ++counter)
+                {
+                    if (num_bits)
+                        TINFL_GET_BITS(6, r->m_raw_header[counter], 8);
+                    else
+                        TINFL_GET_BYTE(7, r->m_raw_header[counter]);
+                }
+                if ((counter = (r->m_raw_header[0] | (r->m_raw_header[1] << 8))) != (mz_uint)(0xFFFF ^ (r->m_raw_header[2] | (r->m_raw_header[3] << 8))))
+                {
+                    TINFL_CR_RETURN_FOREVER(39, TINFL_STATUS_FAILED);
+                }
+                while ((counter) && (num_bits))
+                {
+                    TINFL_GET_BITS(51, dist, 8);
+                    while (pOut_buf_cur >= pOut_buf_end)
+                    {
+                        TINFL_CR_RETURN(52, TINFL_STATUS_HAS_MORE_OUTPUT);
+                    }
+                    *pOut_buf_cur++ = (mz_uint8)dist;
+                    counter--;
+                }
+                while (counter)
+                {
+                    size_t n;
+                    while (pOut_buf_cur >= pOut_buf_end)
+                    {
+                        TINFL_CR_RETURN(9, TINFL_STATUS_HAS_MORE_OUTPUT);
+                    }
+                    while (pIn_buf_cur >= pIn_buf_end)
+                    {
+                        TINFL_CR_RETURN(38, (decomp_flags & TINFL_FLAG_HAS_MORE_INPUT) ? TINFL_STATUS_NEEDS_MORE_INPUT : TINFL_STATUS_FAILED_CANNOT_MAKE_PROGRESS);
+                    }
+                    n = MZ_MIN(MZ_MIN((size_t)(pOut_buf_end - pOut_buf_cur), (size_t)(pIn_buf_end - pIn_buf_cur)), counter);
+                    TINFL_MEMCPY(pOut_buf_cur, pIn_buf_cur, n);
+                    pIn_buf_cur += n;
+                    pOut_buf_cur += n;
+                    counter -= (mz_uint)n;
+                }
+            }
+            else if (r->m_type == 3)
+            {
+                TINFL_CR_RETURN_FOREVER(10, TINFL_STATUS_FAILED);
+            }
+            else
+            {
+                if (r->m_type == 1)
+                {
+                    mz_uint8 *p = r->m_code_size_0;
+                    mz_uint i;
+                    r->m_table_sizes[0] = 288;
+                    r->m_table_sizes[1] = 32;
+                    TINFL_MEMSET(r->m_code_size_1, 5, 32);
+                    for (i = 0; i <= 143; ++i)
+                        *p++ = 8;
+                    for (; i <= 255; ++i)
+                        *p++ = 9;
+                    for (; i <= 279; ++i)
+                        *p++ = 7;
+                    for (; i <= 287; ++i)
+                        *p++ = 8;
+                }
+                else
+                {
+                    for (counter = 0; counter < 3; counter++)
+                    {
+                        TINFL_GET_BITS(11, r->m_table_sizes[counter], "\05\05\04"[counter]);
+                        r->m_table_sizes[counter] += s_min_table_sizes[counter];
+                    }
+                    MZ_CLEAR_ARR(r->m_code_size_2);
+                    for (counter = 0; counter < r->m_table_sizes[2]; counter++)
+                    {
+                        mz_uint s;
+                        TINFL_GET_BITS(14, s, 3);
+                        r->m_code_size_2[s_length_dezigzag[counter]] = (mz_uint8)s;
+                    }
+                    r->m_table_sizes[2] = 19;
+                }
+                for (; (int)r->m_type >= 0; r->m_type--)
+                {
+                    int tree_next, tree_cur;
+                    mz_int16 *pLookUp;
+                    mz_int16 *pTree;
+                    mz_uint8 *pCode_size;
+                    mz_uint i, j, used_syms, total, sym_index, next_code[17], total_syms[16];
+                    pLookUp = r->m_look_up[r->m_type];
+                    pTree = pTrees[r->m_type];
+                    pCode_size = pCode_sizes[r->m_type];
+                    MZ_CLEAR_ARR(total_syms);
+                    TINFL_MEMSET(pLookUp, 0, sizeof(r->m_look_up[0]));
+                    tinfl_clear_tree(r);
+                    for (i = 0; i < r->m_table_sizes[r->m_type]; ++i)
+                        total_syms[pCode_size[i]]++;
+                    used_syms = 0, total = 0;
+                    next_code[0] = next_code[1] = 0;
+                    for (i = 1; i <= 15; ++i)
+                    {
+                        used_syms += total_syms[i];
+                        next_code[i + 1] = (total = ((total + total_syms[i]) << 1));
+                    }
+                    if ((65536 != total) && (used_syms > 1))
+                    {
+                        TINFL_CR_RETURN_FOREVER(35, TINFL_STATUS_FAILED);
+                    }
+                    for (tree_next = -1, sym_index = 0; sym_index < r->m_table_sizes[r->m_type]; ++sym_index)
+                    {
+                        mz_uint rev_code = 0, l, cur_code, code_size = pCode_size[sym_index];
+                        if (!code_size)
+                            continue;
+                        cur_code = next_code[code_size]++;
+                        for (l = code_size; l > 0; l--, cur_code >>= 1)
+                            rev_code = (rev_code << 1) | (cur_code & 1);
+                        if (code_size <= TINFL_FAST_LOOKUP_BITS)
+                        {
+                            mz_int16 k = (mz_int16)((code_size << 9) | sym_index);
+                            while (rev_code < TINFL_FAST_LOOKUP_SIZE)
+                            {
+                                pLookUp[rev_code] = k;
+                                rev_code += (1 << code_size);
+                            }
+                            continue;
+                        }
+                        if (0 == (tree_cur = pLookUp[rev_code & (TINFL_FAST_LOOKUP_SIZE - 1)]))
+                        {
+                            pLookUp[rev_code & (TINFL_FAST_LOOKUP_SIZE - 1)] = (mz_int16)tree_next;
+                            tree_cur = tree_next;
+                            tree_next -= 2;
+                        }
+                        rev_code >>= (TINFL_FAST_LOOKUP_BITS - 1);
+                        for (j = code_size; j > (TINFL_FAST_LOOKUP_BITS + 1); j--)
+                        {
+                            tree_cur -= ((rev_code >>= 1) & 1);
+                            if (!pTree[-tree_cur - 1])
+                            {
+                                pTree[-tree_cur - 1] = (mz_int16)tree_next;
+                                tree_cur = tree_next;
+                                tree_next -= 2;
+                            }
+                            else
+                                tree_cur = pTree[-tree_cur - 1];
+                        }
+                        tree_cur -= ((rev_code >>= 1) & 1);
+                        pTree[-tree_cur - 1] = (mz_int16)sym_index;
+                    }
+                    if (r->m_type == 2)
+                    {
+                        for (counter = 0; counter < (r->m_table_sizes[0] + r->m_table_sizes[1]);)
+                        {
+                            mz_uint s;
+                            TINFL_HUFF_DECODE(16, dist, r->m_look_up[2], r->m_tree_2);
+                            if (dist < 16)
+                            {
+                                r->m_len_codes[counter++] = (mz_uint8)dist;
+                                continue;
+                            }
+                            if ((dist == 16) && (!counter))
+                            {
+                                TINFL_CR_RETURN_FOREVER(17, TINFL_STATUS_FAILED);
+                            }
+                            num_extra = "\02\03\07"[dist - 16];
+                            TINFL_GET_BITS(18, s, num_extra);
+                            s += "\03\03\013"[dist - 16];
+                            TINFL_MEMSET(r->m_len_codes + counter, (dist == 16) ? r->m_len_codes[counter - 1] : 0, s);
+                            counter += s;
+                        }
+                        if ((r->m_table_sizes[0] + r->m_table_sizes[1]) != counter)
+                        {
+                            TINFL_CR_RETURN_FOREVER(21, TINFL_STATUS_FAILED);
+                        }
+                        TINFL_MEMCPY(r->m_code_size_0, r->m_len_codes, r->m_table_sizes[0]);
+                        TINFL_MEMCPY(r->m_code_size_1, r->m_len_codes + r->m_table_sizes[0], r->m_table_sizes[1]);
+                    }
+                }
+                for (;;)
+                {
+                    mz_uint8 *pSrc;
+                    for (;;)
+                    {
+                        if (((pIn_buf_end - pIn_buf_cur) < 4) || ((pOut_buf_end - pOut_buf_cur) < 2))
+                        {
+                            TINFL_HUFF_DECODE(23, counter, r->m_look_up[0], r->m_tree_0);
+                            if (counter >= 256)
+                                break;
+                            while (pOut_buf_cur >= pOut_buf_end)
+                            {
+                                TINFL_CR_RETURN(24, TINFL_STATUS_HAS_MORE_OUTPUT);
+                            }
+                            *pOut_buf_cur++ = (mz_uint8)counter;
+                        }
+                        else
+                        {
+                            int sym2;
+                            mz_uint code_len;
+#if TINFL_USE_64BIT_BITBUF
+                            if (num_bits < 30)
+                            {
+                                bit_buf |= (((tinfl_bit_buf_t)MZ_READ_LE32(pIn_buf_cur)) << num_bits);
+                                pIn_buf_cur += 4;
+                                num_bits += 32;
+                            }
+#else
+                        if (num_bits < 15)
+                        {
+                            bit_buf |= (((tinfl_bit_buf_t)MZ_READ_LE16(pIn_buf_cur)) << num_bits);
+                            pIn_buf_cur += 2;
+                            num_bits += 16;
+                        }
+#endif
+                            if ((sym2 = r->m_look_up[0][bit_buf & (TINFL_FAST_LOOKUP_SIZE - 1)]) >= 0)
+                                code_len = sym2 >> 9;
+                            else
+                            {
+                                code_len = TINFL_FAST_LOOKUP_BITS;
+                                do
+                                {
+                                    sym2 = r->m_tree_0[~sym2 + ((bit_buf >> code_len++) & 1)];
+                                } while (sym2 < 0);
+                            }
+                            counter = sym2;
+                            bit_buf >>= code_len;
+                            num_bits -= code_len;
+                            if (counter & 256)
+                                break;
+
+#if !TINFL_USE_64BIT_BITBUF
+                            if (num_bits < 15)
+                            {
+                                bit_buf |= (((tinfl_bit_buf_t)MZ_READ_LE16(pIn_buf_cur)) << num_bits);
+                                pIn_buf_cur += 2;
+                                num_bits += 16;
+                            }
+#endif
+                            if ((sym2 = r->m_look_up[0][bit_buf & (TINFL_FAST_LOOKUP_SIZE - 1)]) >= 0)
+                                code_len = sym2 >> 9;
+                            else
+                            {
+                                code_len = TINFL_FAST_LOOKUP_BITS;
+                                do
+                                {
+                                    sym2 = r->m_tree_0[~sym2 + ((bit_buf >> code_len++) & 1)];
+                                } while (sym2 < 0);
+                            }
+                            bit_buf >>= code_len;
+                            num_bits -= code_len;
+
+                            pOut_buf_cur[0] = (mz_uint8)counter;
+                            if (sym2 & 256)
+                            {
+                                pOut_buf_cur++;
+                                counter = sym2;
+                                break;
+                            }
+                            pOut_buf_cur[1] = (mz_uint8)sym2;
+                            pOut_buf_cur += 2;
+                        }
+                    }
+                    if ((counter &= 511) == 256)
+                        break;
+
+                    num_extra = s_length_extra[counter - 257];
+                    counter = s_length_base[counter - 257];
+                    if (num_extra)
+                    {
+                        mz_uint extra_bits;
+                        TINFL_GET_BITS(25, extra_bits, num_extra);
+                        counter += extra_bits;
+                    }
+
+                    TINFL_HUFF_DECODE(26, dist, r->m_look_up[1], r->m_tree_1);
+                    num_extra = s_dist_extra[dist];
+                    dist = s_dist_base[dist];
+                    if (num_extra)
+                    {
+                        mz_uint extra_bits;
+                        TINFL_GET_BITS(27, extra_bits, num_extra);
+                        dist += extra_bits;
+                    }
+
+                    dist_from_out_buf_start = pOut_buf_cur - pOut_buf_start;
+                    if ((dist == 0 || dist > dist_from_out_buf_start || dist_from_out_buf_start == 0) && (decomp_flags & TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF))
+                    {
+                        TINFL_CR_RETURN_FOREVER(37, TINFL_STATUS_FAILED);
+                    }
+
+                    pSrc = pOut_buf_start + ((dist_from_out_buf_start - dist) & out_buf_size_mask);
+
+                    if ((MZ_MAX(pOut_buf_cur, pSrc) + counter) > pOut_buf_end)
+                    {
+                        while (counter--)
+                        {
+                            while (pOut_buf_cur >= pOut_buf_end)
+                            {
+                                TINFL_CR_RETURN(53, TINFL_STATUS_HAS_MORE_OUTPUT);
+                            }
+                            *pOut_buf_cur++ = pOut_buf_start[(dist_from_out_buf_start++ - dist) & out_buf_size_mask];
+                        }
+                        continue;
+                    }
+#if MINIZ_USE_UNALIGNED_LOADS_AND_STORES
+                    else if ((counter >= 9) && (counter <= dist))
+                    {
+                        const mz_uint8 *pSrc_end = pSrc + (counter & ~7);
+                        do
+                        {
+#ifdef MINIZ_UNALIGNED_USE_MEMCPY
+                            memcpy(pOut_buf_cur, pSrc, sizeof(mz_uint32) * 2);
+#else
+                            ((mz_uint32 *)pOut_buf_cur)[0] = ((const mz_uint32 *)pSrc)[0];
+                            ((mz_uint32 *)pOut_buf_cur)[1] = ((const mz_uint32 *)pSrc)[1];
+#endif
+                            pOut_buf_cur += 8;
+                        } while ((pSrc += 8) < pSrc_end);
+                        if ((counter &= 7) < 3)
+                        {
+                            if (counter)
+                            {
+                                pOut_buf_cur[0] = pSrc[0];
+                                if (counter > 1)
+                                    pOut_buf_cur[1] = pSrc[1];
+                                pOut_buf_cur += counter;
+                            }
+                            continue;
+                        }
+                    }
+#endif
+                    while (counter > 2)
+                    {
+                        pOut_buf_cur[0] = pSrc[0];
+                        pOut_buf_cur[1] = pSrc[1];
+                        pOut_buf_cur[2] = pSrc[2];
+                        pOut_buf_cur += 3;
+                        pSrc += 3;
+                        counter -= 3;
+                    }
+                    if (counter > 0)
+                    {
+                        pOut_buf_cur[0] = pSrc[0];
+                        if (counter > 1)
+                            pOut_buf_cur[1] = pSrc[1];
+                        pOut_buf_cur += counter;
+                    }
+                }
+            }
+        } while (!(r->m_final & 1));
+
+        /* Ensure byte alignment and put back any bytes from the bitbuf if we've looked ahead too far on gzip, or other Deflate streams followed by arbitrary data. */
+        /* I'm being super conservative here. A number of simplifications can be made to the byte alignment part, and the Adler32 check shouldn't ever need to worry about reading from the bitbuf now. */
+        TINFL_SKIP_BITS(32, num_bits & 7);
+        while ((pIn_buf_cur > pIn_buf_next) && (num_bits >= 8))
+        {
+            --pIn_buf_cur;
+            num_bits -= 8;
+        }
+        bit_buf &= ~(~(tinfl_bit_buf_t)0 << num_bits);
+        MZ_ASSERT(!num_bits); /* if this assert fires then we've read beyond the end of non-deflate/zlib streams with following data (such as gzip streams). */
+
+        if (decomp_flags & TINFL_FLAG_PARSE_ZLIB_HEADER)
+        {
+            for (counter = 0; counter < 4; ++counter)
+            {
+                mz_uint s;
+                if (num_bits)
+                    TINFL_GET_BITS(41, s, 8);
+                else
+                    TINFL_GET_BYTE(42, s);
+                r->m_z_adler32 = (r->m_z_adler32 << 8) | s;
+            }
+        }
+        TINFL_CR_RETURN_FOREVER(34, TINFL_STATUS_DONE);
+
+        TINFL_CR_FINISH
+
+    common_exit:
+        /* As long as we aren't telling the caller that we NEED more input to make forward progress: */
+        /* Put back any bytes from the bitbuf in case we've looked ahead too far on gzip, or other Deflate streams followed by arbitrary data. */
+        /* We need to be very careful here to NOT push back any bytes we definitely know we need to make forward progress, though, or we'll lock the caller up into an inf loop. */
+        if ((status != TINFL_STATUS_NEEDS_MORE_INPUT) && (status != TINFL_STATUS_FAILED_CANNOT_MAKE_PROGRESS))
+        {
+            while ((pIn_buf_cur > pIn_buf_next) && (num_bits >= 8))
+            {
+                --pIn_buf_cur;
+                num_bits -= 8;
+            }
+        }
+        r->m_num_bits = num_bits;
+        r->m_bit_buf = bit_buf & ~(~(tinfl_bit_buf_t)0 << num_bits);
+        r->m_dist = dist;
+        r->m_counter = counter;
+        r->m_num_extra = num_extra;
+        r->m_dist_from_out_buf_start = dist_from_out_buf_start;
+        *pIn_buf_size = pIn_buf_cur - pIn_buf_next;
+        *pOut_buf_size = pOut_buf_cur - pOut_buf_next;
+        if ((decomp_flags & (TINFL_FLAG_PARSE_ZLIB_HEADER | TINFL_FLAG_COMPUTE_ADLER32)) && (status >= 0))
+        {
+            const mz_uint8 *ptr = pOut_buf_next;
+            size_t buf_len = *pOut_buf_size;
+            mz_uint32 i, s1 = r->m_check_adler32 & 0xffff, s2 = r->m_check_adler32 >> 16;
+            size_t block_len = buf_len % 5552;
+            while (buf_len)
+            {
+                for (i = 0; i + 7 < block_len; i += 8, ptr += 8)
+                {
+                    s1 += ptr[0], s2 += s1;
+                    s1 += ptr[1], s2 += s1;
+                    s1 += ptr[2], s2 += s1;
+                    s1 += ptr[3], s2 += s1;
+                    s1 += ptr[4], s2 += s1;
+                    s1 += ptr[5], s2 += s1;
+                    s1 += ptr[6], s2 += s1;
+                    s1 += ptr[7], s2 += s1;
+                }
+                for (; i < block_len; ++i)
+                    s1 += *ptr++, s2 += s1;
+                s1 %= 65521U, s2 %= 65521U;
+                buf_len -= block_len;
+                block_len = 5552;
+            }
+            r->m_check_adler32 = (s2 << 16) + s1;
+            if ((status == TINFL_STATUS_DONE) && (decomp_flags & TINFL_FLAG_PARSE_ZLIB_HEADER) && (r->m_check_adler32 != r->m_z_adler32))
+                status = TINFL_STATUS_ADLER32_MISMATCH;
+        }
+        return status;
+    }
+
+    /* Higher level helper functions. */
+    void *tinfl_decompress_mem_to_heap(const void *pSrc_buf, size_t src_buf_len, size_t *pOut_len, int flags)
+    {
+        tinfl_decompressor decomp;
+        void *pBuf = NULL, *pNew_buf;
+        size_t src_buf_ofs = 0, out_buf_capacity = 0;
+        *pOut_len = 0;
+        tinfl_init(&decomp);
+        for (;;)
+        {
+            size_t src_buf_size = src_buf_len - src_buf_ofs, dst_buf_size = out_buf_capacity - *pOut_len, new_out_buf_capacity;
+            tinfl_status status = tinfl_decompress(&decomp, (const mz_uint8 *)pSrc_buf + src_buf_ofs, &src_buf_size, (mz_uint8 *)pBuf, pBuf ? (mz_uint8 *)pBuf + *pOut_len : NULL, &dst_buf_size,
+                                                   (flags & ~TINFL_FLAG_HAS_MORE_INPUT) | TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF);
+            if ((status < 0) || (status == TINFL_STATUS_NEEDS_MORE_INPUT))
+            {
+                MZ_FREE(pBuf);
+                *pOut_len = 0;
+                return NULL;
+            }
+            src_buf_ofs += src_buf_size;
+            *pOut_len += dst_buf_size;
+            if (status == TINFL_STATUS_DONE)
+                break;
+            new_out_buf_capacity = out_buf_capacity * 2;
+            if (new_out_buf_capacity < 128)
+                new_out_buf_capacity = 128;
+            pNew_buf = MZ_REALLOC(pBuf, new_out_buf_capacity);
+            if (!pNew_buf)
+            {
+                MZ_FREE(pBuf);
+                *pOut_len = 0;
+                return NULL;
+            }
+            pBuf = pNew_buf;
+            out_buf_capacity = new_out_buf_capacity;
+        }
+        return pBuf;
+    }
+
+    size_t tinfl_decompress_mem_to_mem(void *pOut_buf, size_t out_buf_len, const void *pSrc_buf, size_t src_buf_len, int flags)
+    {
+        tinfl_decompressor decomp;
+        tinfl_status status;
+        tinfl_init(&decomp);
+        status = tinfl_decompress(&decomp, (const mz_uint8 *)pSrc_buf, &src_buf_len, (mz_uint8 *)pOut_buf, (mz_uint8 *)pOut_buf, &out_buf_len, (flags & ~TINFL_FLAG_HAS_MORE_INPUT) | TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF);
+        return (status != TINFL_STATUS_DONE) ? TINFL_DECOMPRESS_MEM_TO_MEM_FAILED : out_buf_len;
+    }
+
+    int tinfl_decompress_mem_to_callback(const void *pIn_buf, size_t *pIn_buf_size, tinfl_put_buf_func_ptr pPut_buf_func, void *pPut_buf_user, int flags)
+    {
+        int result = 0;
+        tinfl_decompressor decomp;
+        mz_uint8 *pDict = (mz_uint8 *)MZ_MALLOC(TINFL_LZ_DICT_SIZE);
+        size_t in_buf_ofs = 0, dict_ofs = 0;
+        if (!pDict)
+            return TINFL_STATUS_FAILED;
+        memset(pDict, 0, TINFL_LZ_DICT_SIZE);
+        tinfl_init(&decomp);
+        for (;;)
+        {
+            size_t in_buf_size = *pIn_buf_size - in_buf_ofs, dst_buf_size = TINFL_LZ_DICT_SIZE - dict_ofs;
+            tinfl_status status = tinfl_decompress(&decomp, (const mz_uint8 *)pIn_buf + in_buf_ofs, &in_buf_size, pDict, pDict + dict_ofs, &dst_buf_size,
+                                                   (flags & ~(TINFL_FLAG_HAS_MORE_INPUT | TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF)));
+            in_buf_ofs += in_buf_size;
+            if ((dst_buf_size) && (!(*pPut_buf_func)(pDict + dict_ofs, (int)dst_buf_size, pPut_buf_user)))
+                break;
+            if (status != TINFL_STATUS_HAS_MORE_OUTPUT)
+            {
+                result = (status == TINFL_STATUS_DONE);
+                break;
+            }
+            dict_ofs = (dict_ofs + dst_buf_size) & (TINFL_LZ_DICT_SIZE - 1);
+        }
+        MZ_FREE(pDict);
+        *pIn_buf_size = in_buf_ofs;
+        return result;
+    }
+
+#ifndef MINIZ_NO_MALLOC
+    tinfl_decompressor *tinfl_decompressor_alloc(void)
+    {
+        tinfl_decompressor *pDecomp = (tinfl_decompressor *)MZ_MALLOC(sizeof(tinfl_decompressor));
+        if (pDecomp)
+            tinfl_init(pDecomp);
+        return pDecomp;
+    }
+
+    void tinfl_decompressor_free(tinfl_decompressor *pDecomp)
+    {
+        MZ_FREE(pDecomp);
+    }
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*#ifndef MINIZ_NO_INFLATE_APIS*/
+ /**************************************************************************
+ *
+ * Copyright 2013-2014 RAD Game Tools and Valve Software
+ * Copyright 2010-2014 Rich Geldreich and Tenacious Software LLC
+ * Copyright 2016 Martin Raiber
+ * All Rights Reserved.
+ *
+ * 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.
+ *
+ **************************************************************************/
+
+
+#ifndef MINIZ_NO_ARCHIVE_APIS
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+    /* ------------------- .ZIP archive reading */
+
+#ifdef MINIZ_NO_STDIO
+#define MZ_FILE void *
+#else
+#include <sys/stat.h>
+
+#if defined(_MSC_VER) || defined(__MINGW64__) || defined(__MINGW32__)
+
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+#ifndef __cplusplus
+#define MICROSOFT_WINDOWS_WINBASE_H_DEFINE_INTERLOCKED_CPLUSPLUS_OVERLOADS 0
+#endif
+#ifndef NOMINMAX
+#define NOMINMAX
+#endif
+#include <windows.h>
+
+static WCHAR *mz_utf8z_to_widechar(const char *str)
+{
+    int reqChars = MultiByteToWideChar(CP_UTF8, 0, str, -1, NULL, 0);
+    WCHAR *wStr = (WCHAR *)malloc(reqChars * sizeof(WCHAR));
+    MultiByteToWideChar(CP_UTF8, 0, str, -1, wStr, reqChars);
+    return wStr;
+}
+
+static FILE *mz_fopen(const char *pFilename, const char *pMode)
+{
+    WCHAR *wFilename = mz_utf8z_to_widechar(pFilename);
+    WCHAR *wMode = mz_utf8z_to_widechar(pMode);
+    FILE *pFile = NULL;
+    errno_t err = _wfopen_s(&pFile, wFilename, wMode);
+    free(wFilename);
+    free(wMode);
+    return err ? NULL : pFile;
+}
+
+static FILE *mz_freopen(const char *pPath, const char *pMode, FILE *pStream)
+{
+    WCHAR *wPath = mz_utf8z_to_widechar(pPath);
+    WCHAR *wMode = mz_utf8z_to_widechar(pMode);
+    FILE *pFile = NULL;
+    errno_t err = _wfreopen_s(&pFile, wPath, wMode, pStream);
+    free(wPath);
+    free(wMode);
+    return err ? NULL : pFile;
+}
+
+#if defined(__MINGW32__)
+static int mz_stat(const char *path, struct _stat *buffer)
+{
+    WCHAR *wPath = mz_utf8z_to_widechar(path);
+    int res = _wstat(wPath, buffer);
+    free(wPath);
+    return res;
+}
+#else
+static int mz_stat64(const char *path, struct __stat64 *buffer)
+{
+    WCHAR *wPath = mz_utf8z_to_widechar(path);
+    int res = _wstat64(wPath, buffer);
+    free(wPath);
+    return res;
+}
+#endif
+
+#ifndef MINIZ_NO_TIME
+#include <sys/utime.h>
+#endif
+#define MZ_FOPEN mz_fopen
+#define MZ_FCLOSE fclose
+#define MZ_FREAD fread
+#define MZ_FWRITE fwrite
+#define MZ_FTELL64 _ftelli64
+#define MZ_FSEEK64 _fseeki64
+#if defined(__MINGW32__)
+#define MZ_FILE_STAT_STRUCT _stat
+#define MZ_FILE_STAT mz_stat
+#else
+#define MZ_FILE_STAT_STRUCT _stat64
+#define MZ_FILE_STAT mz_stat64
+#endif
+#define MZ_FFLUSH fflush
+#define MZ_FREOPEN mz_freopen
+#define MZ_DELETE_FILE remove
+
+#elif defined(__WATCOMC__)
+#ifndef MINIZ_NO_TIME
+#include <sys/utime.h>
+#endif
+#define MZ_FOPEN(f, m) fopen(f, m)
+#define MZ_FCLOSE fclose
+#define MZ_FREAD fread
+#define MZ_FWRITE fwrite
+#define MZ_FTELL64 _ftelli64
+#define MZ_FSEEK64 _fseeki64
+#define MZ_FILE_STAT_STRUCT stat
+#define MZ_FILE_STAT stat
+#define MZ_FFLUSH fflush
+#define MZ_FREOPEN(f, m, s) freopen(f, m, s)
+#define MZ_DELETE_FILE remove
+
+#elif defined(__TINYC__)
+#ifndef MINIZ_NO_TIME
+#include <sys/utime.h>
+#endif
+#define MZ_FOPEN(f, m) fopen(f, m)
+#define MZ_FCLOSE fclose
+#define MZ_FREAD fread
+#define MZ_FWRITE fwrite
+#define MZ_FTELL64 ftell
+#define MZ_FSEEK64 fseek
+#define MZ_FILE_STAT_STRUCT stat
+#define MZ_FILE_STAT stat
+#define MZ_FFLUSH fflush
+#define MZ_FREOPEN(f, m, s) freopen(f, m, s)
+#define MZ_DELETE_FILE remove
+
+#elif defined(__USE_LARGEFILE64) /* gcc, clang */
+#ifndef MINIZ_NO_TIME
+#include <utime.h>
+#endif
+#define MZ_FOPEN(f, m) fopen64(f, m)
+#define MZ_FCLOSE fclose
+#define MZ_FREAD fread
+#define MZ_FWRITE fwrite
+#define MZ_FTELL64 ftello64
+#define MZ_FSEEK64 fseeko64
+#define MZ_FILE_STAT_STRUCT stat64
+#define MZ_FILE_STAT stat64
+#define MZ_FFLUSH fflush
+#define MZ_FREOPEN(p, m, s) freopen64(p, m, s)
+#define MZ_DELETE_FILE remove
+
+#elif defined(__APPLE__) || defined(__FreeBSD__) || (defined(__linux__) && defined(__x86_64__))
+#ifndef MINIZ_NO_TIME
+#include <utime.h>
+#endif
+#define MZ_FOPEN(f, m) fopen(f, m)
+#define MZ_FCLOSE fclose
+#define MZ_FREAD fread
+#define MZ_FWRITE fwrite
+#define MZ_FTELL64 ftello
+#define MZ_FSEEK64 fseeko
+#define MZ_FILE_STAT_STRUCT stat
+#define MZ_FILE_STAT stat
+#define MZ_FFLUSH fflush
+#define MZ_FREOPEN(p, m, s) freopen(p, m, s)
+#define MZ_DELETE_FILE remove
+
+#else
+#pragma message("Using fopen, ftello, fseeko, stat() etc. path for file I/O - this path may not support large files.")
+#ifndef MINIZ_NO_TIME
+#include <utime.h>
+#endif
+#define MZ_FOPEN(f, m) fopen(f, m)
+#define MZ_FCLOSE fclose
+#define MZ_FREAD fread
+#define MZ_FWRITE fwrite
+#ifdef __STRICT_ANSI__
+#define MZ_FTELL64 ftell
+#define MZ_FSEEK64 fseek
+#else
+#define MZ_FTELL64 ftello
+#define MZ_FSEEK64 fseeko
+#endif
+#define MZ_FILE_STAT_STRUCT stat
+#define MZ_FILE_STAT stat
+#define MZ_FFLUSH fflush
+#define MZ_FREOPEN(f, m, s) freopen(f, m, s)
+#define MZ_DELETE_FILE remove
+#endif /* #ifdef _MSC_VER */
+#endif /* #ifdef MINIZ_NO_STDIO */
+
+#define MZ_TOLOWER(c) ((((c) >= 'A') && ((c) <= 'Z')) ? ((c) - 'A' + 'a') : (c))
+
+    /* Various ZIP archive enums. To completely avoid cross platform compiler alignment and platform endian issues, miniz.c doesn't use structs for any of this stuff. */
+    enum
+    {
+        /* ZIP archive identifiers and record sizes */
+        MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIG = 0x06054b50,
+        MZ_ZIP_CENTRAL_DIR_HEADER_SIG = 0x02014b50,
+        MZ_ZIP_LOCAL_DIR_HEADER_SIG = 0x04034b50,
+        MZ_ZIP_LOCAL_DIR_HEADER_SIZE = 30,
+        MZ_ZIP_CENTRAL_DIR_HEADER_SIZE = 46,
+        MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE = 22,
+
+        /* ZIP64 archive identifier and record sizes */
+        MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIG = 0x06064b50,
+        MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIG = 0x07064b50,
+        MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIZE = 56,
+        MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIZE = 20,
+        MZ_ZIP64_EXTENDED_INFORMATION_FIELD_HEADER_ID = 0x0001,
+        MZ_ZIP_DATA_DESCRIPTOR_ID = 0x08074b50,
+        MZ_ZIP_DATA_DESCRIPTER_SIZE64 = 24,
+        MZ_ZIP_DATA_DESCRIPTER_SIZE32 = 16,
+
+        /* Central directory header record offsets */
+        MZ_ZIP_CDH_SIG_OFS = 0,
+        MZ_ZIP_CDH_VERSION_MADE_BY_OFS = 4,
+        MZ_ZIP_CDH_VERSION_NEEDED_OFS = 6,
+        MZ_ZIP_CDH_BIT_FLAG_OFS = 8,
+        MZ_ZIP_CDH_METHOD_OFS = 10,
+        MZ_ZIP_CDH_FILE_TIME_OFS = 12,
+        MZ_ZIP_CDH_FILE_DATE_OFS = 14,
+        MZ_ZIP_CDH_CRC32_OFS = 16,
+        MZ_ZIP_CDH_COMPRESSED_SIZE_OFS = 20,
+        MZ_ZIP_CDH_DECOMPRESSED_SIZE_OFS = 24,
+        MZ_ZIP_CDH_FILENAME_LEN_OFS = 28,
+        MZ_ZIP_CDH_EXTRA_LEN_OFS = 30,
+        MZ_ZIP_CDH_COMMENT_LEN_OFS = 32,
+        MZ_ZIP_CDH_DISK_START_OFS = 34,
+        MZ_ZIP_CDH_INTERNAL_ATTR_OFS = 36,
+        MZ_ZIP_CDH_EXTERNAL_ATTR_OFS = 38,
+        MZ_ZIP_CDH_LOCAL_HEADER_OFS = 42,
+
+        /* Local directory header offsets */
+        MZ_ZIP_LDH_SIG_OFS = 0,
+        MZ_ZIP_LDH_VERSION_NEEDED_OFS = 4,
+        MZ_ZIP_LDH_BIT_FLAG_OFS = 6,
+        MZ_ZIP_LDH_METHOD_OFS = 8,
+        MZ_ZIP_LDH_FILE_TIME_OFS = 10,
+        MZ_ZIP_LDH_FILE_DATE_OFS = 12,
+        MZ_ZIP_LDH_CRC32_OFS = 14,
+        MZ_ZIP_LDH_COMPRESSED_SIZE_OFS = 18,
+        MZ_ZIP_LDH_DECOMPRESSED_SIZE_OFS = 22,
+        MZ_ZIP_LDH_FILENAME_LEN_OFS = 26,
+        MZ_ZIP_LDH_EXTRA_LEN_OFS = 28,
+        MZ_ZIP_LDH_BIT_FLAG_HAS_LOCATOR = 1 << 3,
+
+        /* End of central directory offsets */
+        MZ_ZIP_ECDH_SIG_OFS = 0,
+        MZ_ZIP_ECDH_NUM_THIS_DISK_OFS = 4,
+        MZ_ZIP_ECDH_NUM_DISK_CDIR_OFS = 6,
+        MZ_ZIP_ECDH_CDIR_NUM_ENTRIES_ON_DISK_OFS = 8,
+        MZ_ZIP_ECDH_CDIR_TOTAL_ENTRIES_OFS = 10,
+        MZ_ZIP_ECDH_CDIR_SIZE_OFS = 12,
+        MZ_ZIP_ECDH_CDIR_OFS_OFS = 16,
+        MZ_ZIP_ECDH_COMMENT_SIZE_OFS = 20,
+
+        /* ZIP64 End of central directory locator offsets */
+        MZ_ZIP64_ECDL_SIG_OFS = 0,                    /* 4 bytes */
+        MZ_ZIP64_ECDL_NUM_DISK_CDIR_OFS = 4,          /* 4 bytes */
+        MZ_ZIP64_ECDL_REL_OFS_TO_ZIP64_ECDR_OFS = 8,  /* 8 bytes */
+        MZ_ZIP64_ECDL_TOTAL_NUMBER_OF_DISKS_OFS = 16, /* 4 bytes */
+
+        /* ZIP64 End of central directory header offsets */
+        MZ_ZIP64_ECDH_SIG_OFS = 0,                       /* 4 bytes */
+        MZ_ZIP64_ECDH_SIZE_OF_RECORD_OFS = 4,            /* 8 bytes */
+        MZ_ZIP64_ECDH_VERSION_MADE_BY_OFS = 12,          /* 2 bytes */
+        MZ_ZIP64_ECDH_VERSION_NEEDED_OFS = 14,           /* 2 bytes */
+        MZ_ZIP64_ECDH_NUM_THIS_DISK_OFS = 16,            /* 4 bytes */
+        MZ_ZIP64_ECDH_NUM_DISK_CDIR_OFS = 20,            /* 4 bytes */
+        MZ_ZIP64_ECDH_CDIR_NUM_ENTRIES_ON_DISK_OFS = 24, /* 8 bytes */
+        MZ_ZIP64_ECDH_CDIR_TOTAL_ENTRIES_OFS = 32,       /* 8 bytes */
+        MZ_ZIP64_ECDH_CDIR_SIZE_OFS = 40,                /* 8 bytes */
+        MZ_ZIP64_ECDH_CDIR_OFS_OFS = 48,                 /* 8 bytes */
+        MZ_ZIP_VERSION_MADE_BY_DOS_FILESYSTEM_ID = 0,
+        MZ_ZIP_DOS_DIR_ATTRIBUTE_BITFLAG = 0x10,
+        MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_IS_ENCRYPTED = 1,
+        MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_COMPRESSED_PATCH_FLAG = 32,
+        MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_USES_STRONG_ENCRYPTION = 64,
+        MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_LOCAL_DIR_IS_MASKED = 8192,
+        MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_UTF8 = 1 << 11
+    };
+
+    typedef struct
+    {
+        void *m_p;
+        size_t m_size, m_capacity;
+        mz_uint m_element_size;
+    } mz_zip_array;
+
+    struct mz_zip_internal_state_tag
+    {
+        mz_zip_array m_central_dir;
+        mz_zip_array m_central_dir_offsets;
+        mz_zip_array m_sorted_central_dir_offsets;
+
+        /* The flags passed in when the archive is initially opened. */
+        mz_uint32 m_init_flags;
+
+        /* MZ_TRUE if the archive has a zip64 end of central directory headers, etc. */
+        mz_bool m_zip64;
+
+        /* MZ_TRUE if we found zip64 extended info in the central directory (m_zip64 will also be slammed to true too, even if we didn't find a zip64 end of central dir header, etc.) */
+        mz_bool m_zip64_has_extended_info_fields;
+
+        /* These fields are used by the file, FILE, memory, and memory/heap read/write helpers. */
+        MZ_FILE *m_pFile;
+        mz_uint64 m_file_archive_start_ofs;
+
+        void *m_pMem;
+        size_t m_mem_size;
+        size_t m_mem_capacity;
+    };
+
+#define MZ_ZIP_ARRAY_SET_ELEMENT_SIZE(array_ptr, element_size) (array_ptr)->m_element_size = element_size
+
+#if defined(DEBUG) || defined(_DEBUG)
+    static MZ_FORCEINLINE mz_uint mz_zip_array_range_check(const mz_zip_array *pArray, mz_uint index)
+    {
+        MZ_ASSERT(index < pArray->m_size);
+        return index;
+    }
+#define MZ_ZIP_ARRAY_ELEMENT(array_ptr, element_type, index) ((element_type *)((array_ptr)->m_p))[mz_zip_array_range_check(array_ptr, index)]
+#else
+#define MZ_ZIP_ARRAY_ELEMENT(array_ptr, element_type, index) ((element_type *)((array_ptr)->m_p))[index]
+#endif
+
+    static MZ_FORCEINLINE void mz_zip_array_init(mz_zip_array *pArray, mz_uint32 element_size)
+    {
+        memset(pArray, 0, sizeof(mz_zip_array));
+        pArray->m_element_size = element_size;
+    }
+
+    static MZ_FORCEINLINE void mz_zip_array_clear(mz_zip_archive *pZip, mz_zip_array *pArray)
+    {
+        pZip->m_pFree(pZip->m_pAlloc_opaque, pArray->m_p);
+        memset(pArray, 0, sizeof(mz_zip_array));
+    }
+
+    static mz_bool mz_zip_array_ensure_capacity(mz_zip_archive *pZip, mz_zip_array *pArray, size_t min_new_capacity, mz_uint growing)
+    {
+        void *pNew_p;
+        size_t new_capacity = min_new_capacity;
+        MZ_ASSERT(pArray->m_element_size);
+        if (pArray->m_capacity >= min_new_capacity)
+            return MZ_TRUE;
+        if (growing)
+        {
+            new_capacity = MZ_MAX(1, pArray->m_capacity);
+            while (new_capacity < min_new_capacity)
+                new_capacity *= 2;
+        }
+        if (NULL == (pNew_p = pZip->m_pRealloc(pZip->m_pAlloc_opaque, pArray->m_p, pArray->m_element_size, new_capacity)))
+            return MZ_FALSE;
+        pArray->m_p = pNew_p;
+        pArray->m_capacity = new_capacity;
+        return MZ_TRUE;
+    }
+
+    static MZ_FORCEINLINE mz_bool mz_zip_array_reserve(mz_zip_archive *pZip, mz_zip_array *pArray, size_t new_capacity, mz_uint growing)
+    {
+        if (new_capacity > pArray->m_capacity)
+        {
+            if (!mz_zip_array_ensure_capacity(pZip, pArray, new_capacity, growing))
+                return MZ_FALSE;
+        }
+        return MZ_TRUE;
+    }
+
+    static MZ_FORCEINLINE mz_bool mz_zip_array_resize(mz_zip_archive *pZip, mz_zip_array *pArray, size_t new_size, mz_uint growing)
+    {
+        if (new_size > pArray->m_capacity)
+        {
+            if (!mz_zip_array_ensure_capacity(pZip, pArray, new_size, growing))
+                return MZ_FALSE;
+        }
+        pArray->m_size = new_size;
+        return MZ_TRUE;
+    }
+
+    static MZ_FORCEINLINE mz_bool mz_zip_array_ensure_room(mz_zip_archive *pZip, mz_zip_array *pArray, size_t n)
+    {
+        return mz_zip_array_reserve(pZip, pArray, pArray->m_size + n, MZ_TRUE);
+    }
+
+    static MZ_FORCEINLINE mz_bool mz_zip_array_push_back(mz_zip_archive *pZip, mz_zip_array *pArray, const void *pElements, size_t n)
+    {
+        size_t orig_size = pArray->m_size;
+        if (!mz_zip_array_resize(pZip, pArray, orig_size + n, MZ_TRUE))
+            return MZ_FALSE;
+        if (n > 0)
+            memcpy((mz_uint8 *)pArray->m_p + orig_size * pArray->m_element_size, pElements, n * pArray->m_element_size);
+        return MZ_TRUE;
+    }
+
+#ifndef MINIZ_NO_TIME
+    static MZ_TIME_T mz_zip_dos_to_time_t(int dos_time, int dos_date)
+    {
+        struct tm tm;
+        memset(&tm, 0, sizeof(tm));
+        tm.tm_isdst = -1;
+        tm.tm_year = ((dos_date >> 9) & 127) + 1980 - 1900;
+        tm.tm_mon = ((dos_date >> 5) & 15) - 1;
+        tm.tm_mday = dos_date & 31;
+        tm.tm_hour = (dos_time >> 11) & 31;
+        tm.tm_min = (dos_time >> 5) & 63;
+        tm.tm_sec = (dos_time << 1) & 62;
+        return mktime(&tm);
+    }
+
+#ifndef MINIZ_NO_ARCHIVE_WRITING_APIS
+    static void mz_zip_time_t_to_dos_time(MZ_TIME_T time, mz_uint16 *pDOS_time, mz_uint16 *pDOS_date)
+    {
+#ifdef _MSC_VER
+        struct tm tm_struct;
+        struct tm *tm = &tm_struct;
+        errno_t err = localtime_s(tm, &time);
+        if (err)
+        {
+            *pDOS_date = 0;
+            *pDOS_time = 0;
+            return;
+        }
+#else
+        struct tm *tm = localtime(&time);
+#endif /* #ifdef _MSC_VER */
+
+        *pDOS_time = (mz_uint16)(((tm->tm_hour) << 11) + ((tm->tm_min) << 5) + ((tm->tm_sec) >> 1));
+        *pDOS_date = (mz_uint16)(((tm->tm_year + 1900 - 1980) << 9) + ((tm->tm_mon + 1) << 5) + tm->tm_mday);
+    }
+#endif /* MINIZ_NO_ARCHIVE_WRITING_APIS */
+
+#ifndef MINIZ_NO_STDIO
+#ifndef MINIZ_NO_ARCHIVE_WRITING_APIS
+    static mz_bool mz_zip_get_file_modified_time(const char *pFilename, MZ_TIME_T *pTime)
+    {
+        struct MZ_FILE_STAT_STRUCT file_stat;
+
+        /* On Linux with x86 glibc, this call will fail on large files (I think >= 0x80000000 bytes) unless you compiled with _LARGEFILE64_SOURCE. Argh. */
+        if (MZ_FILE_STAT(pFilename, &file_stat) != 0)
+            return MZ_FALSE;
+
+        *pTime = file_stat.st_mtime;
+
+        return MZ_TRUE;
+    }
+#endif /* #ifndef MINIZ_NO_ARCHIVE_WRITING_APIS*/
+
+    static mz_bool mz_zip_set_file_times(const char *pFilename, MZ_TIME_T access_time, MZ_TIME_T modified_time)
+    {
+        struct utimbuf t;
+
+        memset(&t, 0, sizeof(t));
+        t.actime = access_time;
+        t.modtime = modified_time;
+
+        return !utime(pFilename, &t);
+    }
+#endif /* #ifndef MINIZ_NO_STDIO */
+#endif /* #ifndef MINIZ_NO_TIME */
+
+    static MZ_FORCEINLINE mz_bool mz_zip_set_error(mz_zip_archive *pZip, mz_zip_error err_num)
+    {
+        if (pZip)
+            pZip->m_last_error = err_num;
+        return MZ_FALSE;
+    }
+
+    static mz_bool mz_zip_reader_init_internal(mz_zip_archive *pZip, mz_uint flags)
+    {
+        (void)flags;
+        if ((!pZip) || (pZip->m_pState) || (pZip->m_zip_mode != MZ_ZIP_MODE_INVALID))
+            return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
+
+        if (!pZip->m_pAlloc)
+            pZip->m_pAlloc = miniz_def_alloc_func;
+        if (!pZip->m_pFree)
+            pZip->m_pFree = miniz_def_free_func;
+        if (!pZip->m_pRealloc)
+            pZip->m_pRealloc = miniz_def_realloc_func;
+
+        pZip->m_archive_size = 0;
+        pZip->m_central_directory_file_ofs = 0;
+        pZip->m_total_files = 0;
+        pZip->m_last_error = MZ_ZIP_NO_ERROR;
+
+        if (NULL == (pZip->m_pState = (mz_zip_internal_state *)pZip->m_pAlloc(pZip->m_pAlloc_opaque, 1, sizeof(mz_zip_internal_state))))
+            return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
+
+        memset(pZip->m_pState, 0, sizeof(mz_zip_internal_state));
+        MZ_ZIP_ARRAY_SET_ELEMENT_SIZE(&pZip->m_pState->m_central_dir, sizeof(mz_uint8));
+        MZ_ZIP_ARRAY_SET_ELEMENT_SIZE(&pZip->m_pState->m_central_dir_offsets, sizeof(mz_uint32));
+        MZ_ZIP_ARRAY_SET_ELEMENT_SIZE(&pZip->m_pState->m_sorted_central_dir_offsets, sizeof(mz_uint32));
+        pZip->m_pState->m_init_flags = flags;
+        pZip->m_pState->m_zip64 = MZ_FALSE;
+        pZip->m_pState->m_zip64_has_extended_info_fields = MZ_FALSE;
+
+        pZip->m_zip_mode = MZ_ZIP_MODE_READING;
+
+        return MZ_TRUE;
+    }
+
+    static MZ_FORCEINLINE mz_bool mz_zip_reader_filename_less(const mz_zip_array *pCentral_dir_array, const mz_zip_array *pCentral_dir_offsets, mz_uint l_index, mz_uint r_index)
+    {
+        const mz_uint8 *pL = &MZ_ZIP_ARRAY_ELEMENT(pCentral_dir_array, mz_uint8, MZ_ZIP_ARRAY_ELEMENT(pCentral_dir_offsets, mz_uint32, l_index)), *pE;
+        const mz_uint8 *pR = &MZ_ZIP_ARRAY_ELEMENT(pCentral_dir_array, mz_uint8, MZ_ZIP_ARRAY_ELEMENT(pCentral_dir_offsets, mz_uint32, r_index));
+        mz_uint l_len = MZ_READ_LE16(pL + MZ_ZIP_CDH_FILENAME_LEN_OFS), r_len = MZ_READ_LE16(pR + MZ_ZIP_CDH_FILENAME_LEN_OFS);
+        mz_uint8 l = 0, r = 0;
+        pL += MZ_ZIP_CENTRAL_DIR_HEADER_SIZE;
+        pR += MZ_ZIP_CENTRAL_DIR_HEADER_SIZE;
+        pE = pL + MZ_MIN(l_len, r_len);
+        while (pL < pE)
+        {
+            if ((l = MZ_TOLOWER(*pL)) != (r = MZ_TOLOWER(*pR)))
+                break;
+            pL++;
+            pR++;
+        }
+        return (pL == pE) ? (l_len < r_len) : (l < r);
+    }
+
+#define MZ_SWAP_UINT32(a, b) \
+    do                       \
+    {                        \
+        mz_uint32 t = a;     \
+        a = b;               \
+        b = t;               \
+    }                        \
+    MZ_MACRO_END
+
+    /* Heap sort of lowercased filenames, used to help accelerate plain central directory searches by mz_zip_reader_locate_file(). (Could also use qsort(), but it could allocate memory.) */
+    static void mz_zip_reader_sort_central_dir_offsets_by_filename(mz_zip_archive *pZip)
+    {
+        mz_zip_internal_state *pState = pZip->m_pState;
+        const mz_zip_array *pCentral_dir_offsets = &pState->m_central_dir_offsets;
+        const mz_zip_array *pCentral_dir = &pState->m_central_dir;
+        mz_uint32 *pIndices;
+        mz_uint32 start, end;
+        const mz_uint32 size = pZip->m_total_files;
+
+        if (size <= 1U)
+            return;
+
+        pIndices = &MZ_ZIP_ARRAY_ELEMENT(&pState->m_sorted_central_dir_offsets, mz_uint32, 0);
+
+        start = (size - 2U) >> 1U;
+        for (;;)
+        {
+            mz_uint64 child, root = start;
+            for (;;)
+            {
+                if ((child = (root << 1U) + 1U) >= size)
+                    break;
+                child += (((child + 1U) < size) && (mz_zip_reader_filename_less(pCentral_dir, pCentral_dir_offsets, pIndices[child], pIndices[child + 1U])));
+                if (!mz_zip_reader_filename_less(pCentral_dir, pCentral_dir_offsets, pIndices[root], pIndices[child]))
+                    break;
+                MZ_SWAP_UINT32(pIndices[root], pIndices[child]);
+                root = child;
+            }
+            if (!start)
+                break;
+            start--;
+        }
+
+        end = size - 1;
+        while (end > 0)
+        {
+            mz_uint64 child, root = 0;
+            MZ_SWAP_UINT32(pIndices[end], pIndices[0]);
+            for (;;)
+            {
+                if ((child = (root << 1U) + 1U) >= end)
+                    break;
+                child += (((child + 1U) < end) && mz_zip_reader_filename_less(pCentral_dir, pCentral_dir_offsets, pIndices[child], pIndices[child + 1U]));
+                if (!mz_zip_reader_filename_less(pCentral_dir, pCentral_dir_offsets, pIndices[root], pIndices[child]))
+                    break;
+                MZ_SWAP_UINT32(pIndices[root], pIndices[child]);
+                root = child;
+            }
+            end--;
+        }
+    }
+
+    static mz_bool mz_zip_reader_locate_header_sig(mz_zip_archive *pZip, mz_uint32 record_sig, mz_uint32 record_size, mz_int64 *pOfs)
+    {
+        mz_int64 cur_file_ofs;
+        mz_uint32 buf_u32[4096 / sizeof(mz_uint32)];
+        mz_uint8 *pBuf = (mz_uint8 *)buf_u32;
+
+        /* Basic sanity checks - reject files which are too small */
+        if (pZip->m_archive_size < record_size)
+            return MZ_FALSE;
+
+        /* Find the record by scanning the file from the end towards the beginning. */
+        cur_file_ofs = MZ_MAX((mz_int64)pZip->m_archive_size - (mz_int64)sizeof(buf_u32), 0);
+        for (;;)
+        {
+            int i, n = (int)MZ_MIN(sizeof(buf_u32), pZip->m_archive_size - cur_file_ofs);
+
+            if (pZip->m_pRead(pZip->m_pIO_opaque, cur_file_ofs, pBuf, n) != (mz_uint)n)
+                return MZ_FALSE;
+
+            for (i = n - 4; i >= 0; --i)
+            {
+                mz_uint s = MZ_READ_LE32(pBuf + i);
+                if (s == record_sig)
+                {
+                    if ((pZip->m_archive_size - (cur_file_ofs + i)) >= record_size)
+                        break;
+                }
+            }
+
+            if (i >= 0)
+            {
+                cur_file_ofs += i;
+                break;
+            }
+
+            /* Give up if we've searched the entire file, or we've gone back "too far" (~64kb) */
+            if ((!cur_file_ofs) || ((pZip->m_archive_size - cur_file_ofs) >= ((mz_uint64)(MZ_UINT16_MAX) + record_size)))
+                return MZ_FALSE;
+
+            cur_file_ofs = MZ_MAX(cur_file_ofs - (sizeof(buf_u32) - 3), 0);
+        }
+
+        *pOfs = cur_file_ofs;
+        return MZ_TRUE;
+    }
+
+    static mz_bool mz_zip_reader_eocd64_valid(mz_zip_archive *pZip, uint64_t offset, uint8_t *buf)
+    {
+        if (pZip->m_pRead(pZip->m_pIO_opaque, offset, buf, MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIZE) == MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIZE)
+        {
+            if (MZ_READ_LE32(buf + MZ_ZIP64_ECDH_SIG_OFS) == MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIG)
+            {
+                return MZ_TRUE;
+            }
+        }
+
+        return MZ_FALSE;
+    }
+
+    static mz_bool mz_zip_reader_read_central_dir(mz_zip_archive *pZip, mz_uint flags)
+    {
+        mz_uint cdir_size = 0, cdir_entries_on_this_disk = 0, num_this_disk = 0, cdir_disk_index = 0;
+        mz_uint64 cdir_ofs = 0, eocd_ofs = 0, archive_ofs = 0;
+        mz_int64 cur_file_ofs = 0;
+        const mz_uint8 *p;
+
+        mz_uint32 buf_u32[4096 / sizeof(mz_uint32)];
+        mz_uint8 *pBuf = (mz_uint8 *)buf_u32;
+        mz_bool sort_central_dir = ((flags & MZ_ZIP_FLAG_DO_NOT_SORT_CENTRAL_DIRECTORY) == 0);
+        mz_uint32 zip64_end_of_central_dir_locator_u32[(MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIZE + sizeof(mz_uint32) - 1) / sizeof(mz_uint32)];
+        mz_uint8 *pZip64_locator = (mz_uint8 *)zip64_end_of_central_dir_locator_u32;
+
+        mz_uint32 zip64_end_of_central_dir_header_u32[(MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIZE + sizeof(mz_uint32) - 1) / sizeof(mz_uint32)];
+        mz_uint8 *pZip64_end_of_central_dir = (mz_uint8 *)zip64_end_of_central_dir_header_u32;
+
+        mz_uint64 zip64_end_of_central_dir_ofs = 0;
+
+        /* Basic sanity checks - reject files which are too small, and check the first 4 bytes of the file to make sure a local header is there. */
+        if (pZip->m_archive_size < MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE)
+            return mz_zip_set_error(pZip, MZ_ZIP_NOT_AN_ARCHIVE);
+
+        if (!mz_zip_reader_locate_header_sig(pZip, MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIG, MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE, &cur_file_ofs))
+            return mz_zip_set_error(pZip, MZ_ZIP_FAILED_FINDING_CENTRAL_DIR);
+
+        eocd_ofs = cur_file_ofs;
+        /* Read and verify the end of central directory record. */
+        if (pZip->m_pRead(pZip->m_pIO_opaque, cur_file_ofs, pBuf, MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE) != MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE)
+            return mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED);
+
+        if (MZ_READ_LE32(pBuf + MZ_ZIP_ECDH_SIG_OFS) != MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIG)
+            return mz_zip_set_error(pZip, MZ_ZIP_NOT_AN_ARCHIVE);
+
+        if (cur_file_ofs >= (MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIZE + MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIZE))
+        {
+            if (pZip->m_pRead(pZip->m_pIO_opaque, cur_file_ofs - MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIZE, pZip64_locator, MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIZE) == MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIZE)
+            {
+                if (MZ_READ_LE32(pZip64_locator + MZ_ZIP64_ECDL_SIG_OFS) == MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIG)
+                {
+                    pZip->m_pState->m_zip64 = MZ_TRUE;
+                }
+            }
+        }
+
+        if (pZip->m_pState->m_zip64)
+        {
+            /* Try locating the EOCD64 right before the EOCD64 locator. This works even
+             * when the effective start of the zip header is not yet known. */
+            if (cur_file_ofs < MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIZE +
+                                   MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIZE)
+                return mz_zip_set_error(pZip, MZ_ZIP_NOT_AN_ARCHIVE);
+
+            zip64_end_of_central_dir_ofs = cur_file_ofs -
+                                           MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIZE -
+                                           MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIZE;
+
+            if (!mz_zip_reader_eocd64_valid(pZip, zip64_end_of_central_dir_ofs,
+                                            pZip64_end_of_central_dir))
+            {
+                /* That failed, try reading where the locator tells us to. */
+                zip64_end_of_central_dir_ofs = MZ_READ_LE64(
+                    pZip64_locator + MZ_ZIP64_ECDL_REL_OFS_TO_ZIP64_ECDR_OFS);
+
+                if (zip64_end_of_central_dir_ofs >
+                    (pZip->m_archive_size - MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIZE))
+                    return mz_zip_set_error(pZip, MZ_ZIP_NOT_AN_ARCHIVE);
+
+                if (!mz_zip_reader_eocd64_valid(pZip, zip64_end_of_central_dir_ofs,
+                                                pZip64_end_of_central_dir))
+                    return mz_zip_set_error(pZip, MZ_ZIP_NOT_AN_ARCHIVE);
+            }
+        }
+
+        pZip->m_total_files = MZ_READ_LE16(pBuf + MZ_ZIP_ECDH_CDIR_TOTAL_ENTRIES_OFS);
+        cdir_entries_on_this_disk = MZ_READ_LE16(pBuf + MZ_ZIP_ECDH_CDIR_NUM_ENTRIES_ON_DISK_OFS);
+        num_this_disk = MZ_READ_LE16(pBuf + MZ_ZIP_ECDH_NUM_THIS_DISK_OFS);
+        cdir_disk_index = MZ_READ_LE16(pBuf + MZ_ZIP_ECDH_NUM_DISK_CDIR_OFS);
+        cdir_size = MZ_READ_LE32(pBuf + MZ_ZIP_ECDH_CDIR_SIZE_OFS);
+        cdir_ofs = MZ_READ_LE32(pBuf + MZ_ZIP_ECDH_CDIR_OFS_OFS);
+
+        if (pZip->m_pState->m_zip64)
+        {
+            mz_uint32 zip64_total_num_of_disks = MZ_READ_LE32(pZip64_locator + MZ_ZIP64_ECDL_TOTAL_NUMBER_OF_DISKS_OFS);
+            mz_uint64 zip64_cdir_total_entries = MZ_READ_LE64(pZip64_end_of_central_dir + MZ_ZIP64_ECDH_CDIR_TOTAL_ENTRIES_OFS);
+            mz_uint64 zip64_cdir_total_entries_on_this_disk = MZ_READ_LE64(pZip64_end_of_central_dir + MZ_ZIP64_ECDH_CDIR_NUM_ENTRIES_ON_DISK_OFS);
+            mz_uint64 zip64_size_of_end_of_central_dir_record = MZ_READ_LE64(pZip64_end_of_central_dir + MZ_ZIP64_ECDH_SIZE_OF_RECORD_OFS);
+            mz_uint64 zip64_size_of_central_directory = MZ_READ_LE64(pZip64_end_of_central_dir + MZ_ZIP64_ECDH_CDIR_SIZE_OFS);
+
+            if (zip64_size_of_end_of_central_dir_record < (MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIZE - 12))
+                return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
+
+            if (zip64_total_num_of_disks != 1U)
+                return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_MULTIDISK);
+
+            /* Check for miniz's practical limits */
+            if (zip64_cdir_total_entries > MZ_UINT32_MAX)
+                return mz_zip_set_error(pZip, MZ_ZIP_TOO_MANY_FILES);
+
+            pZip->m_total_files = (mz_uint32)zip64_cdir_total_entries;
+
+            if (zip64_cdir_total_entries_on_this_disk > MZ_UINT32_MAX)
+                return mz_zip_set_error(pZip, MZ_ZIP_TOO_MANY_FILES);
+
+            cdir_entries_on_this_disk = (mz_uint32)zip64_cdir_total_entries_on_this_disk;
+
+            /* Check for miniz's current practical limits (sorry, this should be enough for millions of files) */
+            if (zip64_size_of_central_directory > MZ_UINT32_MAX)
+                return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_CDIR_SIZE);
+
+            cdir_size = (mz_uint32)zip64_size_of_central_directory;
+
+            num_this_disk = MZ_READ_LE32(pZip64_end_of_central_dir + MZ_ZIP64_ECDH_NUM_THIS_DISK_OFS);
+
+            cdir_disk_index = MZ_READ_LE32(pZip64_end_of_central_dir + MZ_ZIP64_ECDH_NUM_DISK_CDIR_OFS);
+
+            cdir_ofs = MZ_READ_LE64(pZip64_end_of_central_dir + MZ_ZIP64_ECDH_CDIR_OFS_OFS);
+        }
+
+        if (pZip->m_total_files != cdir_entries_on_this_disk)
+            return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_MULTIDISK);
+
+        if (((num_this_disk | cdir_disk_index) != 0) && ((num_this_disk != 1) || (cdir_disk_index != 1)))
+            return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_MULTIDISK);
+
+        if (cdir_size < (mz_uint64)pZip->m_total_files * MZ_ZIP_CENTRAL_DIR_HEADER_SIZE)
+            return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
+
+        if ((cdir_ofs + (mz_uint64)cdir_size) > pZip->m_archive_size)
+            return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
+
+        if (eocd_ofs < cdir_ofs + cdir_size)
+            return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
+
+        /* The end of central dir follows the central dir, unless the zip file has
+         * some trailing data (e.g. it is appended to an executable file). */
+        archive_ofs = eocd_ofs - (cdir_ofs + cdir_size);
+        if (pZip->m_pState->m_zip64)
+        {
+            if (archive_ofs < MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIZE +
+                                  MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIZE)
+                return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
+
+            archive_ofs -= MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIZE +
+                           MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIZE;
+        }
+
+        /* Update the archive start position, but only if not specified. */
+        if ((pZip->m_zip_type == MZ_ZIP_TYPE_FILE || pZip->m_zip_type == MZ_ZIP_TYPE_CFILE ||
+            pZip->m_zip_type == MZ_ZIP_TYPE_USER) && pZip->m_pState->m_file_archive_start_ofs == 0)
+        {
+            pZip->m_pState->m_file_archive_start_ofs = archive_ofs;
+            pZip->m_archive_size -= archive_ofs;
+        }
+
+        pZip->m_central_directory_file_ofs = cdir_ofs;
+
+        if (pZip->m_total_files)
+        {
+            mz_uint i, n;
+            /* Read the entire central directory into a heap block, and allocate another heap block to hold the unsorted central dir file record offsets, and possibly another to hold the sorted indices. */
+            if ((!mz_zip_array_resize(pZip, &pZip->m_pState->m_central_dir, cdir_size, MZ_FALSE)) ||
+                (!mz_zip_array_resize(pZip, &pZip->m_pState->m_central_dir_offsets, pZip->m_total_files, MZ_FALSE)))
+                return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
+
+            if (sort_central_dir)
+            {
+                if (!mz_zip_array_resize(pZip, &pZip->m_pState->m_sorted_central_dir_offsets, pZip->m_total_files, MZ_FALSE))
+                    return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
+            }
+
+            if (pZip->m_pRead(pZip->m_pIO_opaque, cdir_ofs, pZip->m_pState->m_central_dir.m_p, cdir_size) != cdir_size)
+                return mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED);
+
+            /* Now create an index into the central directory file records, do some basic sanity checking on each record */
+            p = (const mz_uint8 *)pZip->m_pState->m_central_dir.m_p;
+            for (n = cdir_size, i = 0; i < pZip->m_total_files; ++i)
+            {
+                mz_uint total_header_size, disk_index, bit_flags, filename_size, ext_data_size;
+                mz_uint64 comp_size, decomp_size, local_header_ofs;
+
+                if ((n < MZ_ZIP_CENTRAL_DIR_HEADER_SIZE) || (MZ_READ_LE32(p) != MZ_ZIP_CENTRAL_DIR_HEADER_SIG))
+                    return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
+
+                MZ_ZIP_ARRAY_ELEMENT(&pZip->m_pState->m_central_dir_offsets, mz_uint32, i) = (mz_uint32)(p - (const mz_uint8 *)pZip->m_pState->m_central_dir.m_p);
+
+                if (sort_central_dir)
+                    MZ_ZIP_ARRAY_ELEMENT(&pZip->m_pState->m_sorted_central_dir_offsets, mz_uint32, i) = i;
+
+                comp_size = MZ_READ_LE32(p + MZ_ZIP_CDH_COMPRESSED_SIZE_OFS);
+                decomp_size = MZ_READ_LE32(p + MZ_ZIP_CDH_DECOMPRESSED_SIZE_OFS);
+                local_header_ofs = MZ_READ_LE32(p + MZ_ZIP_CDH_LOCAL_HEADER_OFS);
+                filename_size = MZ_READ_LE16(p + MZ_ZIP_CDH_FILENAME_LEN_OFS);
+                ext_data_size = MZ_READ_LE16(p + MZ_ZIP_CDH_EXTRA_LEN_OFS);
+
+                if ((!pZip->m_pState->m_zip64_has_extended_info_fields) &&
+                    (ext_data_size) &&
+                    (MZ_MAX(MZ_MAX(comp_size, decomp_size), local_header_ofs) == MZ_UINT32_MAX))
+                {
+                    /* Attempt to find zip64 extended information field in the entry's extra data */
+                    mz_uint32 extra_size_remaining = ext_data_size;
+
+                    if (extra_size_remaining)
+                    {
+                        const mz_uint8 *pExtra_data;
+                        void *buf = NULL;
+
+                        if (MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + filename_size + ext_data_size > n)
+                        {
+                            buf = MZ_MALLOC(ext_data_size);
+                            if (buf == NULL)
+                                return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
+
+                            if (pZip->m_pRead(pZip->m_pIO_opaque, cdir_ofs + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + filename_size, buf, ext_data_size) != ext_data_size)
+                            {
+                                MZ_FREE(buf);
+                                return mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED);
+                            }
+
+                            pExtra_data = (mz_uint8 *)buf;
+                        }
+                        else
+                        {
+                            pExtra_data = p + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + filename_size;
+                        }
+
+                        do
+                        {
+                            mz_uint32 field_id;
+                            mz_uint32 field_data_size;
+
+                            if (extra_size_remaining < (sizeof(mz_uint16) * 2))
+                            {
+                                MZ_FREE(buf);
+                                return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
+                            }
+
+                            field_id = MZ_READ_LE16(pExtra_data);
+                            field_data_size = MZ_READ_LE16(pExtra_data + sizeof(mz_uint16));
+
+                            if ((field_data_size + sizeof(mz_uint16) * 2) > extra_size_remaining)
+                            {
+                                MZ_FREE(buf);
+                                return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
+                            }
+
+                            if (field_id == MZ_ZIP64_EXTENDED_INFORMATION_FIELD_HEADER_ID)
+                            {
+                                /* Ok, the archive didn't have any zip64 headers but it uses a zip64 extended information field so mark it as zip64 anyway (this can occur with infozip's zip util when it reads compresses files from stdin). */
+                                pZip->m_pState->m_zip64 = MZ_TRUE;
+                                pZip->m_pState->m_zip64_has_extended_info_fields = MZ_TRUE;
+                                break;
+                            }
+
+                            pExtra_data += sizeof(mz_uint16) * 2 + field_data_size;
+                            extra_size_remaining = extra_size_remaining - sizeof(mz_uint16) * 2 - field_data_size;
+                        } while (extra_size_remaining);
+
+                        MZ_FREE(buf);
+                    }
+                }
+
+                /* I've seen archives that aren't marked as zip64 that uses zip64 ext data, argh */
+                if ((comp_size != MZ_UINT32_MAX) && (decomp_size != MZ_UINT32_MAX))
+                {
+                    if (((!MZ_READ_LE32(p + MZ_ZIP_CDH_METHOD_OFS)) && (decomp_size != comp_size)) || (decomp_size && !comp_size))
+                        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
+                }
+
+                disk_index = MZ_READ_LE16(p + MZ_ZIP_CDH_DISK_START_OFS);
+                if ((disk_index == MZ_UINT16_MAX) || ((disk_index != num_this_disk) && (disk_index != 1)))
+                    return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_MULTIDISK);
+
+                if (comp_size != MZ_UINT32_MAX)
+                {
+                    if (((mz_uint64)MZ_READ_LE32(p + MZ_ZIP_CDH_LOCAL_HEADER_OFS) + MZ_ZIP_LOCAL_DIR_HEADER_SIZE + comp_size) > pZip->m_archive_size)
+                        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
+                }
+
+                bit_flags = MZ_READ_LE16(p + MZ_ZIP_CDH_BIT_FLAG_OFS);
+                if (bit_flags & MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_LOCAL_DIR_IS_MASKED)
+                    return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_ENCRYPTION);
+
+                if ((total_header_size = MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + MZ_READ_LE16(p + MZ_ZIP_CDH_FILENAME_LEN_OFS) + MZ_READ_LE16(p + MZ_ZIP_CDH_EXTRA_LEN_OFS) + MZ_READ_LE16(p + MZ_ZIP_CDH_COMMENT_LEN_OFS)) > n)
+                    return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
+
+                n -= total_header_size;
+                p += total_header_size;
+            }
+        }
+
+        if (sort_central_dir)
+            mz_zip_reader_sort_central_dir_offsets_by_filename(pZip);
+
+        return MZ_TRUE;
+    }
+
+    void mz_zip_zero_struct(mz_zip_archive *pZip)
+    {
+        if (pZip)
+            MZ_CLEAR_PTR(pZip);
+    }
+
+    static mz_bool mz_zip_reader_end_internal(mz_zip_archive *pZip, mz_bool set_last_error)
+    {
+        mz_bool status = MZ_TRUE;
+
+        if (!pZip)
+            return MZ_FALSE;
+
+        if ((!pZip->m_pState) || (!pZip->m_pAlloc) || (!pZip->m_pFree) || (pZip->m_zip_mode != MZ_ZIP_MODE_READING))
+        {
+            if (set_last_error)
+                pZip->m_last_error = MZ_ZIP_INVALID_PARAMETER;
+
+            return MZ_FALSE;
+        }
+
+        if (pZip->m_pState)
+        {
+            mz_zip_internal_state *pState = pZip->m_pState;
+            pZip->m_pState = NULL;
+
+            mz_zip_array_clear(pZip, &pState->m_central_dir);
+            mz_zip_array_clear(pZip, &pState->m_central_dir_offsets);
+            mz_zip_array_clear(pZip, &pState->m_sorted_central_dir_offsets);
+
+#ifndef MINIZ_NO_STDIO
+            if (pState->m_pFile)
+            {
+                if (pZip->m_zip_type == MZ_ZIP_TYPE_FILE)
+                {
+                    if (MZ_FCLOSE(pState->m_pFile) == EOF)
+                    {
+                        if (set_last_error)
+                            pZip->m_last_error = MZ_ZIP_FILE_CLOSE_FAILED;
+                        status = MZ_FALSE;
+                    }
+                }
+                pState->m_pFile = NULL;
+            }
+#endif /* #ifndef MINIZ_NO_STDIO */
+
+            pZip->m_pFree(pZip->m_pAlloc_opaque, pState);
+        }
+        pZip->m_zip_mode = MZ_ZIP_MODE_INVALID;
+
+        return status;
+    }
+
+    mz_bool mz_zip_reader_end(mz_zip_archive *pZip)
+    {
+        return mz_zip_reader_end_internal(pZip, MZ_TRUE);
+    }
+    mz_bool mz_zip_reader_init(mz_zip_archive *pZip, mz_uint64 size, mz_uint flags)
+    {
+        if ((!pZip) || (!pZip->m_pRead))
+            return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
+
+        if (!mz_zip_reader_init_internal(pZip, flags))
+            return MZ_FALSE;
+
+        pZip->m_zip_type = MZ_ZIP_TYPE_USER;
+        pZip->m_archive_size = size;
+
+        if (!mz_zip_reader_read_central_dir(pZip, flags))
+        {
+            mz_zip_reader_end_internal(pZip, MZ_FALSE);
+            return MZ_FALSE;
+        }
+
+        return MZ_TRUE;
+    }
+
+    static size_t mz_zip_mem_read_func(void *pOpaque, mz_uint64 file_ofs, void *pBuf, size_t n)
+    {
+        mz_zip_archive *pZip = (mz_zip_archive *)pOpaque;
+        size_t s = (file_ofs >= pZip->m_archive_size) ? 0 : (size_t)MZ_MIN(pZip->m_archive_size - file_ofs, n);
+        memcpy(pBuf, (const mz_uint8 *)pZip->m_pState->m_pMem + file_ofs, s);
+        return s;
+    }
+
+    mz_bool mz_zip_reader_init_mem(mz_zip_archive *pZip, const void *pMem, size_t size, mz_uint flags)
+    {
+        if (!pMem)
+            return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
+
+        if (size < MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE)
+            return mz_zip_set_error(pZip, MZ_ZIP_NOT_AN_ARCHIVE);
+
+        if (!mz_zip_reader_init_internal(pZip, flags))
+            return MZ_FALSE;
+
+        pZip->m_zip_type = MZ_ZIP_TYPE_MEMORY;
+        pZip->m_archive_size = size;
+        pZip->m_pRead = mz_zip_mem_read_func;
+        pZip->m_pIO_opaque = pZip;
+        pZip->m_pNeeds_keepalive = NULL;
+
+#ifdef __cplusplus
+        pZip->m_pState->m_pMem = const_cast<void *>(pMem);
+#else
+    pZip->m_pState->m_pMem = (void *)pMem;
+#endif
+
+        pZip->m_pState->m_mem_size = size;
+
+        if (!mz_zip_reader_read_central_dir(pZip, flags))
+        {
+            mz_zip_reader_end_internal(pZip, MZ_FALSE);
+            return MZ_FALSE;
+        }
+
+        return MZ_TRUE;
+    }
+
+#ifndef MINIZ_NO_STDIO
+    static size_t mz_zip_file_read_func(void *pOpaque, mz_uint64 file_ofs, void *pBuf, size_t n)
+    {
+        mz_zip_archive *pZip = (mz_zip_archive *)pOpaque;
+        mz_int64 cur_ofs = MZ_FTELL64(pZip->m_pState->m_pFile);
+
+        file_ofs += pZip->m_pState->m_file_archive_start_ofs;
+
+        if (((mz_int64)file_ofs < 0) || (((cur_ofs != (mz_int64)file_ofs)) && (MZ_FSEEK64(pZip->m_pState->m_pFile, (mz_int64)file_ofs, SEEK_SET))))
+            return 0;
+
+        return MZ_FREAD(pBuf, 1, n, pZip->m_pState->m_pFile);
+    }
+
+    mz_bool mz_zip_reader_init_file(mz_zip_archive *pZip, const char *pFilename, mz_uint32 flags)
+    {
+        return mz_zip_reader_init_file_v2(pZip, pFilename, flags, 0, 0);
+    }
+
+    mz_bool mz_zip_reader_init_file_v2(mz_zip_archive *pZip, const char *pFilename, mz_uint flags, mz_uint64 file_start_ofs, mz_uint64 archive_size)
+    {
+        mz_uint64 file_size;
+        MZ_FILE *pFile;
+
+        if ((!pZip) || (!pFilename) || ((archive_size) && (archive_size < MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE)))
+            return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
+
+        pFile = MZ_FOPEN(pFilename, (flags & MZ_ZIP_FLAG_READ_ALLOW_WRITING ) ? "r+b" : "rb");
+        if (!pFile)
+            return mz_zip_set_error(pZip, MZ_ZIP_FILE_OPEN_FAILED);
+
+        file_size = archive_size;
+        if (!file_size)
+        {
+            if (MZ_FSEEK64(pFile, 0, SEEK_END))
+            {
+                MZ_FCLOSE(pFile);
+                return mz_zip_set_error(pZip, MZ_ZIP_FILE_SEEK_FAILED);
+            }
+
+            file_size = MZ_FTELL64(pFile);
+        }
+
+        /* TODO: Better sanity check archive_size and the # of actual remaining bytes */
+
+        if (file_size < MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE)
+        {
+            MZ_FCLOSE(pFile);
+            return mz_zip_set_error(pZip, MZ_ZIP_NOT_AN_ARCHIVE);
+        }
+
+        if (!mz_zip_reader_init_internal(pZip, flags))
+        {
+            MZ_FCLOSE(pFile);
+            return MZ_FALSE;
+        }
+
+        pZip->m_zip_type = MZ_ZIP_TYPE_FILE;
+        pZip->m_pRead = mz_zip_file_read_func;
+        pZip->m_pIO_opaque = pZip;
+        pZip->m_pState->m_pFile = pFile;
+        pZip->m_archive_size = file_size;
+        pZip->m_pState->m_file_archive_start_ofs = file_start_ofs;
+
+        if (!mz_zip_reader_read_central_dir(pZip, flags))
+        {
+            mz_zip_reader_end_internal(pZip, MZ_FALSE);
+            return MZ_FALSE;
+        }
+
+        return MZ_TRUE;
+    }
+
+    mz_bool mz_zip_reader_init_cfile(mz_zip_archive *pZip, MZ_FILE *pFile, mz_uint64 archive_size, mz_uint flags)
+    {
+        mz_uint64 cur_file_ofs;
+
+        if ((!pZip) || (!pFile))
+            return mz_zip_set_error(pZip, MZ_ZIP_FILE_OPEN_FAILED);
+
+        cur_file_ofs = MZ_FTELL64(pFile);
+
+        if (!archive_size)
+        {
+            if (MZ_FSEEK64(pFile, 0, SEEK_END))
+                return mz_zip_set_error(pZip, MZ_ZIP_FILE_SEEK_FAILED);
+
+            archive_size = MZ_FTELL64(pFile) - cur_file_ofs;
+
+            if (archive_size < MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE)
+                return mz_zip_set_error(pZip, MZ_ZIP_NOT_AN_ARCHIVE);
+        }
+
+        if (!mz_zip_reader_init_internal(pZip, flags))
+            return MZ_FALSE;
+
+        pZip->m_zip_type = MZ_ZIP_TYPE_CFILE;
+        pZip->m_pRead = mz_zip_file_read_func;
+
+        pZip->m_pIO_opaque = pZip;
+        pZip->m_pState->m_pFile = pFile;
+        pZip->m_archive_size = archive_size;
+        pZip->m_pState->m_file_archive_start_ofs = cur_file_ofs;
+
+        if (!mz_zip_reader_read_central_dir(pZip, flags))
+        {
+            mz_zip_reader_end_internal(pZip, MZ_FALSE);
+            return MZ_FALSE;
+        }
+
+        return MZ_TRUE;
+    }
+
+#endif /* #ifndef MINIZ_NO_STDIO */
+
+    static MZ_FORCEINLINE const mz_uint8 *mz_zip_get_cdh(mz_zip_archive *pZip, mz_uint file_index)
+    {
+        if ((!pZip) || (!pZip->m_pState) || (file_index >= pZip->m_total_files))
+            return NULL;
+        return &MZ_ZIP_ARRAY_ELEMENT(&pZip->m_pState->m_central_dir, mz_uint8, MZ_ZIP_ARRAY_ELEMENT(&pZip->m_pState->m_central_dir_offsets, mz_uint32, file_index));
+    }
+
+    mz_bool mz_zip_reader_is_file_encrypted(mz_zip_archive *pZip, mz_uint file_index)
+    {
+        mz_uint m_bit_flag;
+        const mz_uint8 *p = mz_zip_get_cdh(pZip, file_index);
+        if (!p)
+        {
+            mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
+            return MZ_FALSE;
+        }
+
+        m_bit_flag = MZ_READ_LE16(p + MZ_ZIP_CDH_BIT_FLAG_OFS);
+        return (m_bit_flag & (MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_IS_ENCRYPTED | MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_USES_STRONG_ENCRYPTION)) != 0;
+    }
+
+    mz_bool mz_zip_reader_is_file_supported(mz_zip_archive *pZip, mz_uint file_index)
+    {
+        mz_uint bit_flag;
+        mz_uint method;
+
+        const mz_uint8 *p = mz_zip_get_cdh(pZip, file_index);
+        if (!p)
+        {
+            mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
+            return MZ_FALSE;
+        }
+
+        method = MZ_READ_LE16(p + MZ_ZIP_CDH_METHOD_OFS);
+        bit_flag = MZ_READ_LE16(p + MZ_ZIP_CDH_BIT_FLAG_OFS);
+
+        if ((method != 0) && (method != MZ_DEFLATED))
+        {
+            mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_METHOD);
+            return MZ_FALSE;
+        }
+
+        if (bit_flag & (MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_IS_ENCRYPTED | MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_USES_STRONG_ENCRYPTION))
+        {
+            mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_ENCRYPTION);
+            return MZ_FALSE;
+        }
+
+        if (bit_flag & MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_COMPRESSED_PATCH_FLAG)
+        {
+            mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_FEATURE);
+            return MZ_FALSE;
+        }
+
+        return MZ_TRUE;
+    }
+
+    mz_bool mz_zip_reader_is_file_a_directory(mz_zip_archive *pZip, mz_uint file_index)
+    {
+        mz_uint filename_len, attribute_mapping_id, external_attr;
+        const mz_uint8 *p = mz_zip_get_cdh(pZip, file_index);
+        if (!p)
+        {
+            mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
+            return MZ_FALSE;
+        }
+
+        filename_len = MZ_READ_LE16(p + MZ_ZIP_CDH_FILENAME_LEN_OFS);
+        if (filename_len)
+        {
+            if (*(p + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + filename_len - 1) == '/')
+                return MZ_TRUE;
+        }
+
+        /* Bugfix: This code was also checking if the internal attribute was non-zero, which wasn't correct. */
+        /* Most/all zip writers (hopefully) set DOS file/directory attributes in the low 16-bits, so check for the DOS directory flag and ignore the source OS ID in the created by field. */
+        /* FIXME: Remove this check? Is it necessary - we already check the filename. */
+        attribute_mapping_id = MZ_READ_LE16(p + MZ_ZIP_CDH_VERSION_MADE_BY_OFS) >> 8;
+        (void)attribute_mapping_id;
+
+        external_attr = MZ_READ_LE32(p + MZ_ZIP_CDH_EXTERNAL_ATTR_OFS);
+        if ((external_attr & MZ_ZIP_DOS_DIR_ATTRIBUTE_BITFLAG) != 0)
+        {
+            return MZ_TRUE;
+        }
+
+        return MZ_FALSE;
+    }
+
+    static mz_bool mz_zip_file_stat_internal(mz_zip_archive *pZip, mz_uint file_index, const mz_uint8 *pCentral_dir_header, mz_zip_archive_file_stat *pStat, mz_bool *pFound_zip64_extra_data)
+    {
+        mz_uint n;
+        const mz_uint8 *p = pCentral_dir_header;
+
+        if (pFound_zip64_extra_data)
+            *pFound_zip64_extra_data = MZ_FALSE;
+
+        if ((!p) || (!pStat))
+            return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
+
+        /* Extract fields from the central directory record. */
+        pStat->m_file_index = file_index;
+        pStat->m_central_dir_ofs = MZ_ZIP_ARRAY_ELEMENT(&pZip->m_pState->m_central_dir_offsets, mz_uint32, file_index);
+        pStat->m_version_made_by = MZ_READ_LE16(p + MZ_ZIP_CDH_VERSION_MADE_BY_OFS);
+        pStat->m_version_needed = MZ_READ_LE16(p + MZ_ZIP_CDH_VERSION_NEEDED_OFS);
+        pStat->m_bit_flag = MZ_READ_LE16(p + MZ_ZIP_CDH_BIT_FLAG_OFS);
+        pStat->m_method = MZ_READ_LE16(p + MZ_ZIP_CDH_METHOD_OFS);
+#ifndef MINIZ_NO_TIME
+        pStat->m_time = mz_zip_dos_to_time_t(MZ_READ_LE16(p + MZ_ZIP_CDH_FILE_TIME_OFS), MZ_READ_LE16(p + MZ_ZIP_CDH_FILE_DATE_OFS));
+#endif
+        pStat->m_crc32 = MZ_READ_LE32(p + MZ_ZIP_CDH_CRC32_OFS);
+        pStat->m_comp_size = MZ_READ_LE32(p + MZ_ZIP_CDH_COMPRESSED_SIZE_OFS);
+        pStat->m_uncomp_size = MZ_READ_LE32(p + MZ_ZIP_CDH_DECOMPRESSED_SIZE_OFS);
+        pStat->m_internal_attr = MZ_READ_LE16(p + MZ_ZIP_CDH_INTERNAL_ATTR_OFS);
+        pStat->m_external_attr = MZ_READ_LE32(p + MZ_ZIP_CDH_EXTERNAL_ATTR_OFS);
+        pStat->m_local_header_ofs = MZ_READ_LE32(p + MZ_ZIP_CDH_LOCAL_HEADER_OFS);
+
+        /* Copy as much of the filename and comment as possible. */
+        n = MZ_READ_LE16(p + MZ_ZIP_CDH_FILENAME_LEN_OFS);
+        n = MZ_MIN(n, MZ_ZIP_MAX_ARCHIVE_FILENAME_SIZE - 1);
+        memcpy(pStat->m_filename, p + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE, n);
+        pStat->m_filename[n] = '\0';
+
+        n = MZ_READ_LE16(p + MZ_ZIP_CDH_COMMENT_LEN_OFS);
+        n = MZ_MIN(n, MZ_ZIP_MAX_ARCHIVE_FILE_COMMENT_SIZE - 1);
+        pStat->m_comment_size = n;
+        memcpy(pStat->m_comment, p + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + MZ_READ_LE16(p + MZ_ZIP_CDH_FILENAME_LEN_OFS) + MZ_READ_LE16(p + MZ_ZIP_CDH_EXTRA_LEN_OFS), n);
+        pStat->m_comment[n] = '\0';
+
+        /* Set some flags for convienance */
+        pStat->m_is_directory = mz_zip_reader_is_file_a_directory(pZip, file_index);
+        pStat->m_is_encrypted = mz_zip_reader_is_file_encrypted(pZip, file_index);
+        pStat->m_is_supported = mz_zip_reader_is_file_supported(pZip, file_index);
+
+        /* See if we need to read any zip64 extended information fields. */
+        /* Confusingly, these zip64 fields can be present even on non-zip64 archives (Debian zip on a huge files from stdin piped to stdout creates them). */
+        if (MZ_MAX(MZ_MAX(pStat->m_comp_size, pStat->m_uncomp_size), pStat->m_local_header_ofs) == MZ_UINT32_MAX)
+        {
+            /* Attempt to find zip64 extended information field in the entry's extra data */
+            mz_uint32 extra_size_remaining = MZ_READ_LE16(p + MZ_ZIP_CDH_EXTRA_LEN_OFS);
+
+            if (extra_size_remaining)
+            {
+                const mz_uint8 *pExtra_data = p + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + MZ_READ_LE16(p + MZ_ZIP_CDH_FILENAME_LEN_OFS);
+
+                do
+                {
+                    mz_uint32 field_id;
+                    mz_uint32 field_data_size;
+
+                    if (extra_size_remaining < (sizeof(mz_uint16) * 2))
+                        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
+
+                    field_id = MZ_READ_LE16(pExtra_data);
+                    field_data_size = MZ_READ_LE16(pExtra_data + sizeof(mz_uint16));
+
+                    if ((field_data_size + sizeof(mz_uint16) * 2) > extra_size_remaining)
+                        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
+
+                    if (field_id == MZ_ZIP64_EXTENDED_INFORMATION_FIELD_HEADER_ID)
+                    {
+                        const mz_uint8 *pField_data = pExtra_data + sizeof(mz_uint16) * 2;
+                        mz_uint32 field_data_remaining = field_data_size;
+
+                        if (pFound_zip64_extra_data)
+                            *pFound_zip64_extra_data = MZ_TRUE;
+
+                        if (pStat->m_uncomp_size == MZ_UINT32_MAX)
+                        {
+                            if (field_data_remaining < sizeof(mz_uint64))
+                                return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
+
+                            pStat->m_uncomp_size = MZ_READ_LE64(pField_data);
+                            pField_data += sizeof(mz_uint64);
+                            field_data_remaining -= sizeof(mz_uint64);
+                        }
+
+                        if (pStat->m_comp_size == MZ_UINT32_MAX)
+                        {
+                            if (field_data_remaining < sizeof(mz_uint64))
+                                return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
+
+                            pStat->m_comp_size = MZ_READ_LE64(pField_data);
+                            pField_data += sizeof(mz_uint64);
+                            field_data_remaining -= sizeof(mz_uint64);
+                        }
+
+                        if (pStat->m_local_header_ofs == MZ_UINT32_MAX)
+                        {
+                            if (field_data_remaining < sizeof(mz_uint64))
+                                return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
+
+                            pStat->m_local_header_ofs = MZ_READ_LE64(pField_data);
+                            pField_data += sizeof(mz_uint64);
+                            field_data_remaining -= sizeof(mz_uint64);
+                        }
+
+                        break;
+                    }
+
+                    pExtra_data += sizeof(mz_uint16) * 2 + field_data_size;
+                    extra_size_remaining = extra_size_remaining - sizeof(mz_uint16) * 2 - field_data_size;
+                } while (extra_size_remaining);
+            }
+        }
+
+        return MZ_TRUE;
+    }
+
+    static MZ_FORCEINLINE mz_bool mz_zip_string_equal(const char *pA, const char *pB, mz_uint len, mz_uint flags)
+    {
+        mz_uint i;
+        if (flags & MZ_ZIP_FLAG_CASE_SENSITIVE)
+            return 0 == memcmp(pA, pB, len);
+        for (i = 0; i < len; ++i)
+            if (MZ_TOLOWER(pA[i]) != MZ_TOLOWER(pB[i]))
+                return MZ_FALSE;
+        return MZ_TRUE;
+    }
+
+    static MZ_FORCEINLINE int mz_zip_filename_compare(const mz_zip_array *pCentral_dir_array, const mz_zip_array *pCentral_dir_offsets, mz_uint l_index, const char *pR, mz_uint r_len)
+    {
+        const mz_uint8 *pL = &MZ_ZIP_ARRAY_ELEMENT(pCentral_dir_array, mz_uint8, MZ_ZIP_ARRAY_ELEMENT(pCentral_dir_offsets, mz_uint32, l_index)), *pE;
+        mz_uint l_len = MZ_READ_LE16(pL + MZ_ZIP_CDH_FILENAME_LEN_OFS);
+        mz_uint8 l = 0, r = 0;
+        pL += MZ_ZIP_CENTRAL_DIR_HEADER_SIZE;
+        pE = pL + MZ_MIN(l_len, r_len);
+        while (pL < pE)
+        {
+            if ((l = MZ_TOLOWER(*pL)) != (r = MZ_TOLOWER(*pR)))
+                break;
+            pL++;
+            pR++;
+        }
+        return (pL == pE) ? (int)(l_len - r_len) : (l - r);
+    }
+
+    static mz_bool mz_zip_locate_file_binary_search(mz_zip_archive *pZip, const char *pFilename, mz_uint32 *pIndex)
+    {
+        mz_zip_internal_state *pState = pZip->m_pState;
+        const mz_zip_array *pCentral_dir_offsets = &pState->m_central_dir_offsets;
+        const mz_zip_array *pCentral_dir = &pState->m_central_dir;
+        mz_uint32 *pIndices = &MZ_ZIP_ARRAY_ELEMENT(&pState->m_sorted_central_dir_offsets, mz_uint32, 0);
+        const mz_uint32 size = pZip->m_total_files;
+        const mz_uint filename_len = (mz_uint)strlen(pFilename);
+
+        if (pIndex)
+            *pIndex = 0;
+
+        if (size)
+        {
+            /* yes I could use uint32_t's, but then we would have to add some special case checks in the loop, argh, and */
+            /* honestly the major expense here on 32-bit CPU's will still be the filename compare */
+            mz_int64 l = 0, h = (mz_int64)size - 1;
+
+            while (l <= h)
+            {
+                mz_int64 m = l + ((h - l) >> 1);
+                mz_uint32 file_index = pIndices[(mz_uint32)m];
+
+                int comp = mz_zip_filename_compare(pCentral_dir, pCentral_dir_offsets, file_index, pFilename, filename_len);
+                if (!comp)
+                {
+                    if (pIndex)
+                        *pIndex = file_index;
+                    return MZ_TRUE;
+                }
+                else if (comp < 0)
+                    l = m + 1;
+                else
+                    h = m - 1;
+            }
+        }
+
+        return mz_zip_set_error(pZip, MZ_ZIP_FILE_NOT_FOUND);
+    }
+
+    int mz_zip_reader_locate_file(mz_zip_archive *pZip, const char *pName, const char *pComment, mz_uint flags)
+    {
+        mz_uint32 index;
+        if (!mz_zip_reader_locate_file_v2(pZip, pName, pComment, flags, &index))
+            return -1;
+        else
+            return (int)index;
+    }
+
+    mz_bool mz_zip_reader_locate_file_v2(mz_zip_archive *pZip, const char *pName, const char *pComment, mz_uint flags, mz_uint32 *pIndex)
+    {
+        mz_uint file_index;
+        size_t name_len, comment_len;
+
+        if (pIndex)
+            *pIndex = 0;
+
+        if ((!pZip) || (!pZip->m_pState) || (!pName))
+            return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
+
+        /* See if we can use a binary search */
+        if (((pZip->m_pState->m_init_flags & MZ_ZIP_FLAG_DO_NOT_SORT_CENTRAL_DIRECTORY) == 0) &&
+            (pZip->m_zip_mode == MZ_ZIP_MODE_READING) &&
+            ((flags & (MZ_ZIP_FLAG_IGNORE_PATH | MZ_ZIP_FLAG_CASE_SENSITIVE)) == 0) && (!pComment) && (pZip->m_pState->m_sorted_central_dir_offsets.m_size))
+        {
+            return mz_zip_locate_file_binary_search(pZip, pName, pIndex);
+        }
+
+        /* Locate the entry by scanning the entire central directory */
+        name_len = strlen(pName);
+        if (name_len > MZ_UINT16_MAX)
+            return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
+
+        comment_len = pComment ? strlen(pComment) : 0;
+        if (comment_len > MZ_UINT16_MAX)
+            return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
+
+        for (file_index = 0; file_index < pZip->m_total_files; file_index++)
+        {
+            const mz_uint8 *pHeader = &MZ_ZIP_ARRAY_ELEMENT(&pZip->m_pState->m_central_dir, mz_uint8, MZ_ZIP_ARRAY_ELEMENT(&pZip->m_pState->m_central_dir_offsets, mz_uint32, file_index));
+            mz_uint filename_len = MZ_READ_LE16(pHeader + MZ_ZIP_CDH_FILENAME_LEN_OFS);
+            const char *pFilename = (const char *)pHeader + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE;
+            if (filename_len < name_len)
+                continue;
+            if (comment_len)
+            {
+                mz_uint file_extra_len = MZ_READ_LE16(pHeader + MZ_ZIP_CDH_EXTRA_LEN_OFS), file_comment_len = MZ_READ_LE16(pHeader + MZ_ZIP_CDH_COMMENT_LEN_OFS);
+                const char *pFile_comment = pFilename + filename_len + file_extra_len;
+                if ((file_comment_len != comment_len) || (!mz_zip_string_equal(pComment, pFile_comment, file_comment_len, flags)))
+                    continue;
+            }
+            if ((flags & MZ_ZIP_FLAG_IGNORE_PATH) && (filename_len))
+            {
+                int ofs = filename_len - 1;
+                do
+                {
+                    if ((pFilename[ofs] == '/') || (pFilename[ofs] == '\\') || (pFilename[ofs] == ':'))
+                        break;
+                } while (--ofs >= 0);
+                ofs++;
+                pFilename += ofs;
+                filename_len -= ofs;
+            }
+            if ((filename_len == name_len) && (mz_zip_string_equal(pName, pFilename, filename_len, flags)))
+            {
+                if (pIndex)
+                    *pIndex = file_index;
+                return MZ_TRUE;
+            }
+        }
+
+        return mz_zip_set_error(pZip, MZ_ZIP_FILE_NOT_FOUND);
+    }
+
+    static mz_bool mz_zip_reader_extract_to_mem_no_alloc1(mz_zip_archive *pZip, mz_uint file_index, void *pBuf, size_t buf_size, mz_uint flags, void *pUser_read_buf, size_t user_read_buf_size, const mz_zip_archive_file_stat *st)
+    {
+        int status = TINFL_STATUS_DONE;
+        mz_uint64 needed_size, cur_file_ofs, comp_remaining, out_buf_ofs = 0, read_buf_size, read_buf_ofs = 0, read_buf_avail;
+        mz_zip_archive_file_stat file_stat;
+        void *pRead_buf;
+        mz_uint32 local_header_u32[(MZ_ZIP_LOCAL_DIR_HEADER_SIZE + sizeof(mz_uint32) - 1) / sizeof(mz_uint32)];
+        mz_uint8 *pLocal_header = (mz_uint8 *)local_header_u32;
+        tinfl_decompressor inflator;
+
+        if ((!pZip) || (!pZip->m_pState) || ((buf_size) && (!pBuf)) || ((user_read_buf_size) && (!pUser_read_buf)) || (!pZip->m_pRead))
+            return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
+
+        if (st)
+        {
+            file_stat = *st;
+        }
+        else if (!mz_zip_reader_file_stat(pZip, file_index, &file_stat))
+            return MZ_FALSE;
+
+        /* A directory or zero length file */
+        if ((file_stat.m_is_directory) || (!file_stat.m_comp_size))
+            return MZ_TRUE;
+
+        /* Encryption and patch files are not supported. */
+        if (file_stat.m_bit_flag & (MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_IS_ENCRYPTED | MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_USES_STRONG_ENCRYPTION | MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_COMPRESSED_PATCH_FLAG))
+            return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_ENCRYPTION);
+
+        /* This function only supports decompressing stored and deflate. */
+        if ((!(flags & MZ_ZIP_FLAG_COMPRESSED_DATA)) && (file_stat.m_method != 0) && (file_stat.m_method != MZ_DEFLATED))
+            return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_METHOD);
+
+        /* Ensure supplied output buffer is large enough. */
+        needed_size = (flags & MZ_ZIP_FLAG_COMPRESSED_DATA) ? file_stat.m_comp_size : file_stat.m_uncomp_size;
+        if (buf_size < needed_size)
+            return mz_zip_set_error(pZip, MZ_ZIP_BUF_TOO_SMALL);
+
+        /* Read and parse the local directory entry. */
+        cur_file_ofs = file_stat.m_local_header_ofs;
+        if (pZip->m_pRead(pZip->m_pIO_opaque, cur_file_ofs, pLocal_header, MZ_ZIP_LOCAL_DIR_HEADER_SIZE) != MZ_ZIP_LOCAL_DIR_HEADER_SIZE)
+            return mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED);
+
+        if (MZ_READ_LE32(pLocal_header) != MZ_ZIP_LOCAL_DIR_HEADER_SIG)
+            return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
+
+        cur_file_ofs += (mz_uint64)(MZ_ZIP_LOCAL_DIR_HEADER_SIZE) + MZ_READ_LE16(pLocal_header + MZ_ZIP_LDH_FILENAME_LEN_OFS) + MZ_READ_LE16(pLocal_header + MZ_ZIP_LDH_EXTRA_LEN_OFS);
+        if ((cur_file_ofs + file_stat.m_comp_size) > pZip->m_archive_size)
+            return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
+
+        if ((flags & MZ_ZIP_FLAG_COMPRESSED_DATA) || (!file_stat.m_method))
+        {
+            /* The file is stored or the caller has requested the compressed data. */
+            if (pZip->m_pRead(pZip->m_pIO_opaque, cur_file_ofs, pBuf, (size_t)needed_size) != needed_size)
+                return mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED);
+
+#ifndef MINIZ_DISABLE_ZIP_READER_CRC32_CHECKS
+            if ((flags & MZ_ZIP_FLAG_COMPRESSED_DATA) == 0)
+            {
+                if (mz_crc32(MZ_CRC32_INIT, (const mz_uint8 *)pBuf, (size_t)file_stat.m_uncomp_size) != file_stat.m_crc32)
+                    return mz_zip_set_error(pZip, MZ_ZIP_CRC_CHECK_FAILED);
+            }
+#endif
+
+            return MZ_TRUE;
+        }
+
+        /* Decompress the file either directly from memory or from a file input buffer. */
+        tinfl_init(&inflator);
+
+        if (pZip->m_pState->m_pMem)
+        {
+            /* Read directly from the archive in memory. */
+            pRead_buf = (mz_uint8 *)pZip->m_pState->m_pMem + cur_file_ofs;
+            read_buf_size = read_buf_avail = file_stat.m_comp_size;
+            comp_remaining = 0;
+        }
+        else if (pUser_read_buf)
+        {
+            /* Use a user provided read buffer. */
+            if (!user_read_buf_size)
+                return MZ_FALSE;
+            pRead_buf = (mz_uint8 *)pUser_read_buf;
+            read_buf_size = user_read_buf_size;
+            read_buf_avail = 0;
+            comp_remaining = file_stat.m_comp_size;
+        }
+        else
+        {
+            /* Temporarily allocate a read buffer. */
+            read_buf_size = MZ_MIN(file_stat.m_comp_size, (mz_uint64)MZ_ZIP_MAX_IO_BUF_SIZE);
+            if (((sizeof(size_t) == sizeof(mz_uint32))) && (read_buf_size > 0x7FFFFFFF))
+                return mz_zip_set_error(pZip, MZ_ZIP_INTERNAL_ERROR);
+
+            if (NULL == (pRead_buf = pZip->m_pAlloc(pZip->m_pAlloc_opaque, 1, (size_t)read_buf_size)))
+                return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
+
+            read_buf_avail = 0;
+            comp_remaining = file_stat.m_comp_size;
+        }
+
+        do
+        {
+            /* The size_t cast here should be OK because we've verified that the output buffer is >= file_stat.m_uncomp_size above */
+            size_t in_buf_size, out_buf_size = (size_t)(file_stat.m_uncomp_size - out_buf_ofs);
+            if ((!read_buf_avail) && (!pZip->m_pState->m_pMem))
+            {
+                read_buf_avail = MZ_MIN(read_buf_size, comp_remaining);
+                if (pZip->m_pRead(pZip->m_pIO_opaque, cur_file_ofs, pRead_buf, (size_t)read_buf_avail) != read_buf_avail)
+                {
+                    status = TINFL_STATUS_FAILED;
+                    mz_zip_set_error(pZip, MZ_ZIP_DECOMPRESSION_FAILED);
+                    break;
+                }
+                cur_file_ofs += read_buf_avail;
+                comp_remaining -= read_buf_avail;
+                read_buf_ofs = 0;
+            }
+            in_buf_size = (size_t)read_buf_avail;
+            status = tinfl_decompress(&inflator, (mz_uint8 *)pRead_buf + read_buf_ofs, &in_buf_size, (mz_uint8 *)pBuf, (mz_uint8 *)pBuf + out_buf_ofs, &out_buf_size, TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF | (comp_remaining ? TINFL_FLAG_HAS_MORE_INPUT : 0));
+            read_buf_avail -= in_buf_size;
+            read_buf_ofs += in_buf_size;
+            out_buf_ofs += out_buf_size;
+        } while (status == TINFL_STATUS_NEEDS_MORE_INPUT);
+
+        if (status == TINFL_STATUS_DONE)
+        {
+            /* Make sure the entire file was decompressed, and check its CRC. */
+            if (out_buf_ofs != file_stat.m_uncomp_size)
+            {
+                mz_zip_set_error(pZip, MZ_ZIP_UNEXPECTED_DECOMPRESSED_SIZE);
+                status = TINFL_STATUS_FAILED;
+            }
+#ifndef MINIZ_DISABLE_ZIP_READER_CRC32_CHECKS
+            else if (mz_crc32(MZ_CRC32_INIT, (const mz_uint8 *)pBuf, (size_t)file_stat.m_uncomp_size) != file_stat.m_crc32)
+            {
+                mz_zip_set_error(pZip, MZ_ZIP_CRC_CHECK_FAILED);
+                status = TINFL_STATUS_FAILED;
+            }
+#endif
+        }
+
+        if ((!pZip->m_pState->m_pMem) && (!pUser_read_buf))
+            pZip->m_pFree(pZip->m_pAlloc_opaque, pRead_buf);
+
+        return status == TINFL_STATUS_DONE;
+    }
+
+    mz_bool mz_zip_reader_extract_to_mem_no_alloc(mz_zip_archive *pZip, mz_uint file_index, void *pBuf, size_t buf_size, mz_uint flags, void *pUser_read_buf, size_t user_read_buf_size)
+    {
+        return mz_zip_reader_extract_to_mem_no_alloc1(pZip, file_index, pBuf, buf_size, flags, pUser_read_buf, user_read_buf_size, NULL);
+    }
+
+    mz_bool mz_zip_reader_extract_file_to_mem_no_alloc(mz_zip_archive *pZip, const char *pFilename, void *pBuf, size_t buf_size, mz_uint flags, void *pUser_read_buf, size_t user_read_buf_size)
+    {
+        mz_uint32 file_index;
+        if (!mz_zip_reader_locate_file_v2(pZip, pFilename, NULL, flags, &file_index))
+            return MZ_FALSE;
+        return mz_zip_reader_extract_to_mem_no_alloc1(pZip, file_index, pBuf, buf_size, flags, pUser_read_buf, user_read_buf_size, NULL);
+    }
+
+    mz_bool mz_zip_reader_extract_to_mem(mz_zip_archive *pZip, mz_uint file_index, void *pBuf, size_t buf_size, mz_uint flags)
+    {
+        return mz_zip_reader_extract_to_mem_no_alloc1(pZip, file_index, pBuf, buf_size, flags, NULL, 0, NULL);
+    }
+
+    mz_bool mz_zip_reader_extract_file_to_mem(mz_zip_archive *pZip, const char *pFilename, void *pBuf, size_t buf_size, mz_uint flags)
+    {
+        return mz_zip_reader_extract_file_to_mem_no_alloc(pZip, pFilename, pBuf, buf_size, flags, NULL, 0);
+    }
+
+    void *mz_zip_reader_extract_to_heap(mz_zip_archive *pZip, mz_uint file_index, size_t *pSize, mz_uint flags)
+    {
+        mz_zip_archive_file_stat file_stat;
+        mz_uint64 alloc_size;
+        void *pBuf;
+
+        if (pSize)
+            *pSize = 0;
+
+        if (!mz_zip_reader_file_stat(pZip, file_index, &file_stat))
+            return NULL;
+
+        alloc_size = (flags & MZ_ZIP_FLAG_COMPRESSED_DATA) ? file_stat.m_comp_size : file_stat.m_uncomp_size;
+        if (((sizeof(size_t) == sizeof(mz_uint32))) && (alloc_size > 0x7FFFFFFF))
+        {
+            mz_zip_set_error(pZip, MZ_ZIP_INTERNAL_ERROR);
+            return NULL;
+        }
+
+        if (NULL == (pBuf = pZip->m_pAlloc(pZip->m_pAlloc_opaque, 1, (size_t)alloc_size)))
+        {
+            mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
+            return NULL;
+        }
+
+        if (!mz_zip_reader_extract_to_mem_no_alloc1(pZip, file_index, pBuf, (size_t)alloc_size, flags, NULL, 0, &file_stat))
+        {
+            pZip->m_pFree(pZip->m_pAlloc_opaque, pBuf);
+            return NULL;
+        }
+
+        if (pSize)
+            *pSize = (size_t)alloc_size;
+        return pBuf;
+    }
+
+    void *mz_zip_reader_extract_file_to_heap(mz_zip_archive *pZip, const char *pFilename, size_t *pSize, mz_uint flags)
+    {
+        mz_uint32 file_index;
+        if (!mz_zip_reader_locate_file_v2(pZip, pFilename, NULL, flags, &file_index))
+        {
+            if (pSize)
+                *pSize = 0;
+            return MZ_FALSE;
+        }
+        return mz_zip_reader_extract_to_heap(pZip, file_index, pSize, flags);
+    }
+
+    mz_bool mz_zip_reader_extract_to_callback(mz_zip_archive *pZip, mz_uint file_index, mz_file_write_func pCallback, void *pOpaque, mz_uint flags)
+    {
+        int status = TINFL_STATUS_DONE;
+#ifndef MINIZ_DISABLE_ZIP_READER_CRC32_CHECKS
+        mz_uint file_crc32 = MZ_CRC32_INIT;
+#endif
+        mz_uint64 read_buf_size, read_buf_ofs = 0, read_buf_avail, comp_remaining, out_buf_ofs = 0, cur_file_ofs;
+        mz_zip_archive_file_stat file_stat;
+        void *pRead_buf = NULL;
+        void *pWrite_buf = NULL;
+        mz_uint32 local_header_u32[(MZ_ZIP_LOCAL_DIR_HEADER_SIZE + sizeof(mz_uint32) - 1) / sizeof(mz_uint32)];
+        mz_uint8 *pLocal_header = (mz_uint8 *)local_header_u32;
+
+        if ((!pZip) || (!pZip->m_pState) || (!pCallback) || (!pZip->m_pRead))
+            return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
+
+        if (!mz_zip_reader_file_stat(pZip, file_index, &file_stat))
+            return MZ_FALSE;
+
+        /* A directory or zero length file */
+        if ((file_stat.m_is_directory) || (!file_stat.m_comp_size))
+            return MZ_TRUE;
+
+        /* Encryption and patch files are not supported. */
+        if (file_stat.m_bit_flag & (MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_IS_ENCRYPTED | MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_USES_STRONG_ENCRYPTION | MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_COMPRESSED_PATCH_FLAG))
+            return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_ENCRYPTION);
+
+        /* This function only supports decompressing stored and deflate. */
+        if ((!(flags & MZ_ZIP_FLAG_COMPRESSED_DATA)) && (file_stat.m_method != 0) && (file_stat.m_method != MZ_DEFLATED))
+            return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_METHOD);
+
+        /* Read and do some minimal validation of the local directory entry (this doesn't crack the zip64 stuff, which we already have from the central dir) */
+        cur_file_ofs = file_stat.m_local_header_ofs;
+        if (pZip->m_pRead(pZip->m_pIO_opaque, cur_file_ofs, pLocal_header, MZ_ZIP_LOCAL_DIR_HEADER_SIZE) != MZ_ZIP_LOCAL_DIR_HEADER_SIZE)
+            return mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED);
+
+        if (MZ_READ_LE32(pLocal_header) != MZ_ZIP_LOCAL_DIR_HEADER_SIG)
+            return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
+
+        cur_file_ofs += (mz_uint64)(MZ_ZIP_LOCAL_DIR_HEADER_SIZE) + MZ_READ_LE16(pLocal_header + MZ_ZIP_LDH_FILENAME_LEN_OFS) + MZ_READ_LE16(pLocal_header + MZ_ZIP_LDH_EXTRA_LEN_OFS);
+        if ((cur_file_ofs + file_stat.m_comp_size) > pZip->m_archive_size)
+            return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
+
+        /* Decompress the file either directly from memory or from a file input buffer. */
+        if (pZip->m_pState->m_pMem)
+        {
+            pRead_buf = (mz_uint8 *)pZip->m_pState->m_pMem + cur_file_ofs;
+            read_buf_size = read_buf_avail = file_stat.m_comp_size;
+            comp_remaining = 0;
+        }
+        else
+        {
+            read_buf_size = MZ_MIN(file_stat.m_comp_size, (mz_uint64)MZ_ZIP_MAX_IO_BUF_SIZE);
+            if (NULL == (pRead_buf = pZip->m_pAlloc(pZip->m_pAlloc_opaque, 1, (size_t)read_buf_size)))
+                return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
+
+            read_buf_avail = 0;
+            comp_remaining = file_stat.m_comp_size;
+        }
+
+        if ((flags & MZ_ZIP_FLAG_COMPRESSED_DATA) || (!file_stat.m_method))
+        {
+            /* The file is stored or the caller has requested the compressed data. */
+            if (pZip->m_pState->m_pMem)
+            {
+                if (((sizeof(size_t) == sizeof(mz_uint32))) && (file_stat.m_comp_size > MZ_UINT32_MAX))
+                    return mz_zip_set_error(pZip, MZ_ZIP_INTERNAL_ERROR);
+
+                if (pCallback(pOpaque, out_buf_ofs, pRead_buf, (size_t)file_stat.m_comp_size) != file_stat.m_comp_size)
+                {
+                    mz_zip_set_error(pZip, MZ_ZIP_WRITE_CALLBACK_FAILED);
+                    status = TINFL_STATUS_FAILED;
+                }
+                else if (!(flags & MZ_ZIP_FLAG_COMPRESSED_DATA))
+                {
+#ifndef MINIZ_DISABLE_ZIP_READER_CRC32_CHECKS
+                    file_crc32 = (mz_uint32)mz_crc32(file_crc32, (const mz_uint8 *)pRead_buf, (size_t)file_stat.m_comp_size);
+#endif
+                }
+
+                cur_file_ofs += file_stat.m_comp_size;
+                out_buf_ofs += file_stat.m_comp_size;
+                comp_remaining = 0;
+            }
+            else
+            {
+                while (comp_remaining)
+                {
+                    read_buf_avail = MZ_MIN(read_buf_size, comp_remaining);
+                    if (pZip->m_pRead(pZip->m_pIO_opaque, cur_file_ofs, pRead_buf, (size_t)read_buf_avail) != read_buf_avail)
+                    {
+                        mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED);
+                        status = TINFL_STATUS_FAILED;
+                        break;
+                    }
+
+#ifndef MINIZ_DISABLE_ZIP_READER_CRC32_CHECKS
+                    if (!(flags & MZ_ZIP_FLAG_COMPRESSED_DATA))
+                    {
+                        file_crc32 = (mz_uint32)mz_crc32(file_crc32, (const mz_uint8 *)pRead_buf, (size_t)read_buf_avail);
+                    }
+#endif
+
+                    if (pCallback(pOpaque, out_buf_ofs, pRead_buf, (size_t)read_buf_avail) != read_buf_avail)
+                    {
+                        mz_zip_set_error(pZip, MZ_ZIP_WRITE_CALLBACK_FAILED);
+                        status = TINFL_STATUS_FAILED;
+                        break;
+                    }
+
+                    cur_file_ofs += read_buf_avail;
+                    out_buf_ofs += read_buf_avail;
+                    comp_remaining -= read_buf_avail;
+                }
+            }
+        }
+        else
+        {
+            tinfl_decompressor inflator;
+            tinfl_init(&inflator);
+
+            if (NULL == (pWrite_buf = pZip->m_pAlloc(pZip->m_pAlloc_opaque, 1, TINFL_LZ_DICT_SIZE)))
+            {
+                mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
+                status = TINFL_STATUS_FAILED;
+            }
+            else
+            {
+                do
+                {
+                    mz_uint8 *pWrite_buf_cur = (mz_uint8 *)pWrite_buf + (out_buf_ofs & (TINFL_LZ_DICT_SIZE - 1));
+                    size_t in_buf_size, out_buf_size = TINFL_LZ_DICT_SIZE - (out_buf_ofs & (TINFL_LZ_DICT_SIZE - 1));
+                    if ((!read_buf_avail) && (!pZip->m_pState->m_pMem))
+                    {
+                        read_buf_avail = MZ_MIN(read_buf_size, comp_remaining);
+                        if (pZip->m_pRead(pZip->m_pIO_opaque, cur_file_ofs, pRead_buf, (size_t)read_buf_avail) != read_buf_avail)
+                        {
+                            mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED);
+                            status = TINFL_STATUS_FAILED;
+                            break;
+                        }
+                        cur_file_ofs += read_buf_avail;
+                        comp_remaining -= read_buf_avail;
+                        read_buf_ofs = 0;
+                    }
+
+                    in_buf_size = (size_t)read_buf_avail;
+                    status = tinfl_decompress(&inflator, (const mz_uint8 *)pRead_buf + read_buf_ofs, &in_buf_size, (mz_uint8 *)pWrite_buf, pWrite_buf_cur, &out_buf_size, comp_remaining ? TINFL_FLAG_HAS_MORE_INPUT : 0);
+                    read_buf_avail -= in_buf_size;
+                    read_buf_ofs += in_buf_size;
+
+                    if (out_buf_size)
+                    {
+                        if (pCallback(pOpaque, out_buf_ofs, pWrite_buf_cur, out_buf_size) != out_buf_size)
+                        {
+                            mz_zip_set_error(pZip, MZ_ZIP_WRITE_CALLBACK_FAILED);
+                            status = TINFL_STATUS_FAILED;
+                            break;
+                        }
+
+#ifndef MINIZ_DISABLE_ZIP_READER_CRC32_CHECKS
+                        file_crc32 = (mz_uint32)mz_crc32(file_crc32, pWrite_buf_cur, out_buf_size);
+#endif
+                        if ((out_buf_ofs += out_buf_size) > file_stat.m_uncomp_size)
+                        {
+                            mz_zip_set_error(pZip, MZ_ZIP_DECOMPRESSION_FAILED);
+                            status = TINFL_STATUS_FAILED;
+                            break;
+                        }
+                    }
+                } while ((status == TINFL_STATUS_NEEDS_MORE_INPUT) || (status == TINFL_STATUS_HAS_MORE_OUTPUT));
+            }
+        }
+
+        if ((status == TINFL_STATUS_DONE) && (!(flags & MZ_ZIP_FLAG_COMPRESSED_DATA)))
+        {
+            /* Make sure the entire file was decompressed, and check its CRC. */
+            if (out_buf_ofs != file_stat.m_uncomp_size)
+            {
+                mz_zip_set_error(pZip, MZ_ZIP_UNEXPECTED_DECOMPRESSED_SIZE);
+                status = TINFL_STATUS_FAILED;
+            }
+#ifndef MINIZ_DISABLE_ZIP_READER_CRC32_CHECKS
+            else if (file_crc32 != file_stat.m_crc32)
+            {
+                mz_zip_set_error(pZip, MZ_ZIP_DECOMPRESSION_FAILED);
+                status = TINFL_STATUS_FAILED;
+            }
+#endif
+        }
+
+        if (!pZip->m_pState->m_pMem)
+            pZip->m_pFree(pZip->m_pAlloc_opaque, pRead_buf);
+
+        if (pWrite_buf)
+            pZip->m_pFree(pZip->m_pAlloc_opaque, pWrite_buf);
+
+        return status == TINFL_STATUS_DONE;
+    }
+
+    mz_bool mz_zip_reader_extract_file_to_callback(mz_zip_archive *pZip, const char *pFilename, mz_file_write_func pCallback, void *pOpaque, mz_uint flags)
+    {
+        mz_uint32 file_index;
+        if (!mz_zip_reader_locate_file_v2(pZip, pFilename, NULL, flags, &file_index))
+            return MZ_FALSE;
+
+        return mz_zip_reader_extract_to_callback(pZip, file_index, pCallback, pOpaque, flags);
+    }
+
+    mz_zip_reader_extract_iter_state *mz_zip_reader_extract_iter_new(mz_zip_archive *pZip, mz_uint file_index, mz_uint flags)
+    {
+        mz_zip_reader_extract_iter_state *pState;
+        mz_uint32 local_header_u32[(MZ_ZIP_LOCAL_DIR_HEADER_SIZE + sizeof(mz_uint32) - 1) / sizeof(mz_uint32)];
+        mz_uint8 *pLocal_header = (mz_uint8 *)local_header_u32;
+
+        /* Argument sanity check */
+        if ((!pZip) || (!pZip->m_pState))
+            return NULL;
+
+        /* Allocate an iterator status structure */
+        pState = (mz_zip_reader_extract_iter_state *)pZip->m_pAlloc(pZip->m_pAlloc_opaque, 1, sizeof(mz_zip_reader_extract_iter_state));
+        if (!pState)
+        {
+            mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
+            return NULL;
+        }
+
+        /* Fetch file details */
+        if (!mz_zip_reader_file_stat(pZip, file_index, &pState->file_stat))
+        {
+            pZip->m_pFree(pZip->m_pAlloc_opaque, pState);
+            return NULL;
+        }
+
+        /* Encryption and patch files are not supported. */
+        if (pState->file_stat.m_bit_flag & (MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_IS_ENCRYPTED | MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_USES_STRONG_ENCRYPTION | MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_COMPRESSED_PATCH_FLAG))
+        {
+            mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_ENCRYPTION);
+            pZip->m_pFree(pZip->m_pAlloc_opaque, pState);
+            return NULL;
+        }
+
+        /* This function only supports decompressing stored and deflate. */
+        if ((!(flags & MZ_ZIP_FLAG_COMPRESSED_DATA)) && (pState->file_stat.m_method != 0) && (pState->file_stat.m_method != MZ_DEFLATED))
+        {
+            mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_METHOD);
+            pZip->m_pFree(pZip->m_pAlloc_opaque, pState);
+            return NULL;
+        }
+
+        /* Init state - save args */
+        pState->pZip = pZip;
+        pState->flags = flags;
+
+        /* Init state - reset variables to defaults */
+        pState->status = TINFL_STATUS_DONE;
+#ifndef MINIZ_DISABLE_ZIP_READER_CRC32_CHECKS
+        pState->file_crc32 = MZ_CRC32_INIT;
+#endif
+        pState->read_buf_ofs = 0;
+        pState->out_buf_ofs = 0;
+        pState->pRead_buf = NULL;
+        pState->pWrite_buf = NULL;
+        pState->out_blk_remain = 0;
+
+        /* Read and parse the local directory entry. */
+        pState->cur_file_ofs = pState->file_stat.m_local_header_ofs;
+        if (pZip->m_pRead(pZip->m_pIO_opaque, pState->cur_file_ofs, pLocal_header, MZ_ZIP_LOCAL_DIR_HEADER_SIZE) != MZ_ZIP_LOCAL_DIR_HEADER_SIZE)
+        {
+            mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED);
+            pZip->m_pFree(pZip->m_pAlloc_opaque, pState);
+            return NULL;
+        }
+
+        if (MZ_READ_LE32(pLocal_header) != MZ_ZIP_LOCAL_DIR_HEADER_SIG)
+        {
+            mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
+            pZip->m_pFree(pZip->m_pAlloc_opaque, pState);
+            return NULL;
+        }
+
+        pState->cur_file_ofs += (mz_uint64)(MZ_ZIP_LOCAL_DIR_HEADER_SIZE) + MZ_READ_LE16(pLocal_header + MZ_ZIP_LDH_FILENAME_LEN_OFS) + MZ_READ_LE16(pLocal_header + MZ_ZIP_LDH_EXTRA_LEN_OFS);
+        if ((pState->cur_file_ofs + pState->file_stat.m_comp_size) > pZip->m_archive_size)
+        {
+            mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
+            pZip->m_pFree(pZip->m_pAlloc_opaque, pState);
+            return NULL;
+        }
+
+        /* Decompress the file either directly from memory or from a file input buffer. */
+        if (pZip->m_pState->m_pMem)
+        {
+            pState->pRead_buf = (mz_uint8 *)pZip->m_pState->m_pMem + pState->cur_file_ofs;
+            pState->read_buf_size = pState->read_buf_avail = pState->file_stat.m_comp_size;
+            pState->comp_remaining = pState->file_stat.m_comp_size;
+        }
+        else
+        {
+            if (!((flags & MZ_ZIP_FLAG_COMPRESSED_DATA) || (!pState->file_stat.m_method)))
+            {
+                /* Decompression required, therefore intermediate read buffer required */
+                pState->read_buf_size = MZ_MIN(pState->file_stat.m_comp_size, (mz_uint64)MZ_ZIP_MAX_IO_BUF_SIZE);
+                if (NULL == (pState->pRead_buf = pZip->m_pAlloc(pZip->m_pAlloc_opaque, 1, (size_t)pState->read_buf_size)))
+                {
+                    mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
+                    pZip->m_pFree(pZip->m_pAlloc_opaque, pState);
+                    return NULL;
+                }
+            }
+            else
+            {
+                /* Decompression not required - we will be reading directly into user buffer, no temp buf required */
+                pState->read_buf_size = 0;
+            }
+            pState->read_buf_avail = 0;
+            pState->comp_remaining = pState->file_stat.m_comp_size;
+        }
+
+        if (!((flags & MZ_ZIP_FLAG_COMPRESSED_DATA) || (!pState->file_stat.m_method)))
+        {
+            /* Decompression required, init decompressor */
+            tinfl_init(&pState->inflator);
+
+            /* Allocate write buffer */
+            if (NULL == (pState->pWrite_buf = pZip->m_pAlloc(pZip->m_pAlloc_opaque, 1, TINFL_LZ_DICT_SIZE)))
+            {
+                mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
+                if (pState->pRead_buf)
+                    pZip->m_pFree(pZip->m_pAlloc_opaque, pState->pRead_buf);
+                pZip->m_pFree(pZip->m_pAlloc_opaque, pState);
+                return NULL;
+            }
+        }
+
+        return pState;
+    }
+
+    mz_zip_reader_extract_iter_state *mz_zip_reader_extract_file_iter_new(mz_zip_archive *pZip, const char *pFilename, mz_uint flags)
+    {
+        mz_uint32 file_index;
+
+        /* Locate file index by name */
+        if (!mz_zip_reader_locate_file_v2(pZip, pFilename, NULL, flags, &file_index))
+            return NULL;
+
+        /* Construct iterator */
+        return mz_zip_reader_extract_iter_new(pZip, file_index, flags);
+    }
+
+    size_t mz_zip_reader_extract_iter_read(mz_zip_reader_extract_iter_state *pState, void *pvBuf, size_t buf_size)
+    {
+        size_t copied_to_caller = 0;
+
+        /* Argument sanity check */
+        if ((!pState) || (!pState->pZip) || (!pState->pZip->m_pState) || (!pvBuf))
+            return 0;
+
+        if ((pState->flags & MZ_ZIP_FLAG_COMPRESSED_DATA) || (!pState->file_stat.m_method))
+        {
+            /* The file is stored or the caller has requested the compressed data, calc amount to return. */
+            copied_to_caller = (size_t)MZ_MIN(buf_size, pState->comp_remaining);
+
+            /* Zip is in memory....or requires reading from a file? */
+            if (pState->pZip->m_pState->m_pMem)
+            {
+                /* Copy data to caller's buffer */
+                memcpy(pvBuf, pState->pRead_buf, copied_to_caller);
+                pState->pRead_buf = ((mz_uint8 *)pState->pRead_buf) + copied_to_caller;
+            }
+            else
+            {
+                /* Read directly into caller's buffer */
+                if (pState->pZip->m_pRead(pState->pZip->m_pIO_opaque, pState->cur_file_ofs, pvBuf, copied_to_caller) != copied_to_caller)
+                {
+                    /* Failed to read all that was asked for, flag failure and alert user */
+                    mz_zip_set_error(pState->pZip, MZ_ZIP_FILE_READ_FAILED);
+                    pState->status = TINFL_STATUS_FAILED;
+                    copied_to_caller = 0;
+                }
+            }
+
+#ifndef MINIZ_DISABLE_ZIP_READER_CRC32_CHECKS
+            /* Compute CRC if not returning compressed data only */
+            if (!(pState->flags & MZ_ZIP_FLAG_COMPRESSED_DATA))
+                pState->file_crc32 = (mz_uint32)mz_crc32(pState->file_crc32, (const mz_uint8 *)pvBuf, copied_to_caller);
+#endif
+
+            /* Advance offsets, dec counters */
+            pState->cur_file_ofs += copied_to_caller;
+            pState->out_buf_ofs += copied_to_caller;
+            pState->comp_remaining -= copied_to_caller;
+        }
+        else
+        {
+            do
+            {
+                /* Calc ptr to write buffer - given current output pos and block size */
+                mz_uint8 *pWrite_buf_cur = (mz_uint8 *)pState->pWrite_buf + (pState->out_buf_ofs & (TINFL_LZ_DICT_SIZE - 1));
+
+                /* Calc max output size - given current output pos and block size */
+                size_t in_buf_size, out_buf_size = TINFL_LZ_DICT_SIZE - (pState->out_buf_ofs & (TINFL_LZ_DICT_SIZE - 1));
+
+                if (!pState->out_blk_remain)
+                {
+                    /* Read more data from file if none available (and reading from file) */
+                    if ((!pState->read_buf_avail) && (!pState->pZip->m_pState->m_pMem))
+                    {
+                        /* Calc read size */
+                        pState->read_buf_avail = MZ_MIN(pState->read_buf_size, pState->comp_remaining);
+                        if (pState->pZip->m_pRead(pState->pZip->m_pIO_opaque, pState->cur_file_ofs, pState->pRead_buf, (size_t)pState->read_buf_avail) != pState->read_buf_avail)
+                        {
+                            mz_zip_set_error(pState->pZip, MZ_ZIP_FILE_READ_FAILED);
+                            pState->status = TINFL_STATUS_FAILED;
+                            break;
+                        }
+
+                        /* Advance offsets, dec counters */
+                        pState->cur_file_ofs += pState->read_buf_avail;
+                        pState->comp_remaining -= pState->read_buf_avail;
+                        pState->read_buf_ofs = 0;
+                    }
+
+                    /* Perform decompression */
+                    in_buf_size = (size_t)pState->read_buf_avail;
+                    pState->status = tinfl_decompress(&pState->inflator, (const mz_uint8 *)pState->pRead_buf + pState->read_buf_ofs, &in_buf_size, (mz_uint8 *)pState->pWrite_buf, pWrite_buf_cur, &out_buf_size, pState->comp_remaining ? TINFL_FLAG_HAS_MORE_INPUT : 0);
+                    pState->read_buf_avail -= in_buf_size;
+                    pState->read_buf_ofs += in_buf_size;
+
+                    /* Update current output block size remaining */
+                    pState->out_blk_remain = out_buf_size;
+                }
+
+                if (pState->out_blk_remain)
+                {
+                    /* Calc amount to return. */
+                    size_t to_copy = MZ_MIN((buf_size - copied_to_caller), pState->out_blk_remain);
+
+                    /* Copy data to caller's buffer */
+                    memcpy((mz_uint8 *)pvBuf + copied_to_caller, pWrite_buf_cur, to_copy);
+
+#ifndef MINIZ_DISABLE_ZIP_READER_CRC32_CHECKS
+                    /* Perform CRC */
+                    pState->file_crc32 = (mz_uint32)mz_crc32(pState->file_crc32, pWrite_buf_cur, to_copy);
+#endif
+
+                    /* Decrement data consumed from block */
+                    pState->out_blk_remain -= to_copy;
+
+                    /* Inc output offset, while performing sanity check */
+                    if ((pState->out_buf_ofs += to_copy) > pState->file_stat.m_uncomp_size)
+                    {
+                        mz_zip_set_error(pState->pZip, MZ_ZIP_DECOMPRESSION_FAILED);
+                        pState->status = TINFL_STATUS_FAILED;
+                        break;
+                    }
+
+                    /* Increment counter of data copied to caller */
+                    copied_to_caller += to_copy;
+                }
+            } while ((copied_to_caller < buf_size) && ((pState->status == TINFL_STATUS_NEEDS_MORE_INPUT) || (pState->status == TINFL_STATUS_HAS_MORE_OUTPUT)));
+        }
+
+        /* Return how many bytes were copied into user buffer */
+        return copied_to_caller;
+    }
+
+    mz_bool mz_zip_reader_extract_iter_free(mz_zip_reader_extract_iter_state *pState)
+    {
+        int status;
+
+        /* Argument sanity check */
+        if ((!pState) || (!pState->pZip) || (!pState->pZip->m_pState))
+            return MZ_FALSE;
+
+        /* Was decompression completed and requested? */
+        if ((pState->status == TINFL_STATUS_DONE) && (!(pState->flags & MZ_ZIP_FLAG_COMPRESSED_DATA)))
+        {
+            /* Make sure the entire file was decompressed, and check its CRC. */
+            if (pState->out_buf_ofs != pState->file_stat.m_uncomp_size)
+            {
+                mz_zip_set_error(pState->pZip, MZ_ZIP_UNEXPECTED_DECOMPRESSED_SIZE);
+                pState->status = TINFL_STATUS_FAILED;
+            }
+#ifndef MINIZ_DISABLE_ZIP_READER_CRC32_CHECKS
+            else if (pState->file_crc32 != pState->file_stat.m_crc32)
+            {
+                mz_zip_set_error(pState->pZip, MZ_ZIP_DECOMPRESSION_FAILED);
+                pState->status = TINFL_STATUS_FAILED;
+            }
+#endif
+        }
+
+        /* Free buffers */
+        if (!pState->pZip->m_pState->m_pMem)
+            pState->pZip->m_pFree(pState->pZip->m_pAlloc_opaque, pState->pRead_buf);
+        if (pState->pWrite_buf)
+            pState->pZip->m_pFree(pState->pZip->m_pAlloc_opaque, pState->pWrite_buf);
+
+        /* Save status */
+        status = pState->status;
+
+        /* Free context */
+        pState->pZip->m_pFree(pState->pZip->m_pAlloc_opaque, pState);
+
+        return status == TINFL_STATUS_DONE;
+    }
+
+#ifndef MINIZ_NO_STDIO
+    static size_t mz_zip_file_write_callback(void *pOpaque, mz_uint64 ofs, const void *pBuf, size_t n)
+    {
+        (void)ofs;
+
+        return MZ_FWRITE(pBuf, 1, n, (MZ_FILE *)pOpaque);
+    }
+
+    mz_bool mz_zip_reader_extract_to_file(mz_zip_archive *pZip, mz_uint file_index, const char *pDst_filename, mz_uint flags)
+    {
+        mz_bool status;
+        mz_zip_archive_file_stat file_stat;
+        MZ_FILE *pFile;
+
+        if (!mz_zip_reader_file_stat(pZip, file_index, &file_stat))
+            return MZ_FALSE;
+
+        if ((file_stat.m_is_directory) || (!file_stat.m_is_supported))
+            return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_FEATURE);
+
+        pFile = MZ_FOPEN(pDst_filename, "wb");
+        if (!pFile)
+            return mz_zip_set_error(pZip, MZ_ZIP_FILE_OPEN_FAILED);
+
+        status = mz_zip_reader_extract_to_callback(pZip, file_index, mz_zip_file_write_callback, pFile, flags);
+
+        if (MZ_FCLOSE(pFile) == EOF)
+        {
+            if (status)
+                mz_zip_set_error(pZip, MZ_ZIP_FILE_CLOSE_FAILED);
+
+            status = MZ_FALSE;
+        }
+
+#if !defined(MINIZ_NO_TIME) && !defined(MINIZ_NO_STDIO)
+        if (status)
+            mz_zip_set_file_times(pDst_filename, file_stat.m_time, file_stat.m_time);
+#endif
+
+        return status;
+    }
+
+    mz_bool mz_zip_reader_extract_file_to_file(mz_zip_archive *pZip, const char *pArchive_filename, const char *pDst_filename, mz_uint flags)
+    {
+        mz_uint32 file_index;
+        if (!mz_zip_reader_locate_file_v2(pZip, pArchive_filename, NULL, flags, &file_index))
+            return MZ_FALSE;
+
+        return mz_zip_reader_extract_to_file(pZip, file_index, pDst_filename, flags);
+    }
+
+    mz_bool mz_zip_reader_extract_to_cfile(mz_zip_archive *pZip, mz_uint file_index, MZ_FILE *pFile, mz_uint flags)
+    {
+        mz_zip_archive_file_stat file_stat;
+
+        if (!mz_zip_reader_file_stat(pZip, file_index, &file_stat))
+            return MZ_FALSE;
+
+        if ((file_stat.m_is_directory) || (!file_stat.m_is_supported))
+            return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_FEATURE);
+
+        return mz_zip_reader_extract_to_callback(pZip, file_index, mz_zip_file_write_callback, pFile, flags);
+    }
+
+    mz_bool mz_zip_reader_extract_file_to_cfile(mz_zip_archive *pZip, const char *pArchive_filename, MZ_FILE *pFile, mz_uint flags)
+    {
+        mz_uint32 file_index;
+        if (!mz_zip_reader_locate_file_v2(pZip, pArchive_filename, NULL, flags, &file_index))
+            return MZ_FALSE;
+
+        return mz_zip_reader_extract_to_cfile(pZip, file_index, pFile, flags);
+    }
+#endif /* #ifndef MINIZ_NO_STDIO */
+
+    static size_t mz_zip_compute_crc32_callback(void *pOpaque, mz_uint64 file_ofs, const void *pBuf, size_t n)
+    {
+        mz_uint32 *p = (mz_uint32 *)pOpaque;
+        (void)file_ofs;
+        *p = (mz_uint32)mz_crc32(*p, (const mz_uint8 *)pBuf, n);
+        return n;
+    }
+
+    mz_bool mz_zip_validate_file(mz_zip_archive *pZip, mz_uint file_index, mz_uint flags)
+    {
+        mz_zip_archive_file_stat file_stat;
+        mz_zip_internal_state *pState;
+        const mz_uint8 *pCentral_dir_header;
+        mz_bool found_zip64_ext_data_in_cdir = MZ_FALSE;
+        mz_bool found_zip64_ext_data_in_ldir = MZ_FALSE;
+        mz_uint32 local_header_u32[(MZ_ZIP_LOCAL_DIR_HEADER_SIZE + sizeof(mz_uint32) - 1) / sizeof(mz_uint32)];
+        mz_uint8 *pLocal_header = (mz_uint8 *)local_header_u32;
+        mz_uint64 local_header_ofs = 0;
+        mz_uint32 local_header_filename_len, local_header_extra_len, local_header_crc32;
+        mz_uint64 local_header_comp_size, local_header_uncomp_size;
+        mz_uint32 uncomp_crc32 = MZ_CRC32_INIT;
+        mz_bool has_data_descriptor;
+        mz_uint32 local_header_bit_flags;
+
+        mz_zip_array file_data_array;
+        mz_zip_array_init(&file_data_array, 1);
+
+        if ((!pZip) || (!pZip->m_pState) || (!pZip->m_pAlloc) || (!pZip->m_pFree) || (!pZip->m_pRead))
+            return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
+
+        if (file_index > pZip->m_total_files)
+            return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
+
+        pState = pZip->m_pState;
+
+        pCentral_dir_header = mz_zip_get_cdh(pZip, file_index);
+
+        if (!mz_zip_file_stat_internal(pZip, file_index, pCentral_dir_header, &file_stat, &found_zip64_ext_data_in_cdir))
+            return MZ_FALSE;
+
+        /* A directory or zero length file */
+        if ((file_stat.m_is_directory) || (!file_stat.m_uncomp_size))
+            return MZ_TRUE;
+
+        /* Encryption and patch files are not supported. */
+        if (file_stat.m_is_encrypted)
+            return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_ENCRYPTION);
+
+        /* This function only supports stored and deflate. */
+        if ((file_stat.m_method != 0) && (file_stat.m_method != MZ_DEFLATED))
+            return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_METHOD);
+
+        if (!file_stat.m_is_supported)
+            return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_FEATURE);
+
+        /* Read and parse the local directory entry. */
+        local_header_ofs = file_stat.m_local_header_ofs;
+        if (pZip->m_pRead(pZip->m_pIO_opaque, local_header_ofs, pLocal_header, MZ_ZIP_LOCAL_DIR_HEADER_SIZE) != MZ_ZIP_LOCAL_DIR_HEADER_SIZE)
+            return mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED);
+
+        if (MZ_READ_LE32(pLocal_header) != MZ_ZIP_LOCAL_DIR_HEADER_SIG)
+            return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
+
+        local_header_filename_len = MZ_READ_LE16(pLocal_header + MZ_ZIP_LDH_FILENAME_LEN_OFS);
+        local_header_extra_len = MZ_READ_LE16(pLocal_header + MZ_ZIP_LDH_EXTRA_LEN_OFS);
+        local_header_comp_size = MZ_READ_LE32(pLocal_header + MZ_ZIP_LDH_COMPRESSED_SIZE_OFS);
+        local_header_uncomp_size = MZ_READ_LE32(pLocal_header + MZ_ZIP_LDH_DECOMPRESSED_SIZE_OFS);
+        local_header_crc32 = MZ_READ_LE32(pLocal_header + MZ_ZIP_LDH_CRC32_OFS);
+        local_header_bit_flags = MZ_READ_LE16(pLocal_header + MZ_ZIP_LDH_BIT_FLAG_OFS);
+        has_data_descriptor = (local_header_bit_flags & 8) != 0;
+
+        if (local_header_filename_len != strlen(file_stat.m_filename))
+            return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
+
+        if ((local_header_ofs + MZ_ZIP_LOCAL_DIR_HEADER_SIZE + local_header_filename_len + local_header_extra_len + file_stat.m_comp_size) > pZip->m_archive_size)
+            return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
+
+        if (!mz_zip_array_resize(pZip, &file_data_array, MZ_MAX(local_header_filename_len, local_header_extra_len), MZ_FALSE))
+        {
+            mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
+            goto handle_failure;
+        }
+
+        if (local_header_filename_len)
+        {
+            if (pZip->m_pRead(pZip->m_pIO_opaque, local_header_ofs + MZ_ZIP_LOCAL_DIR_HEADER_SIZE, file_data_array.m_p, local_header_filename_len) != local_header_filename_len)
+            {
+                mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED);
+                goto handle_failure;
+            }
+
+            /* I've seen 1 archive that had the same pathname, but used backslashes in the local dir and forward slashes in the central dir. Do we care about this? For now, this case will fail validation. */
+            if (memcmp(file_stat.m_filename, file_data_array.m_p, local_header_filename_len) != 0)
+            {
+                mz_zip_set_error(pZip, MZ_ZIP_VALIDATION_FAILED);
+                goto handle_failure;
+            }
+        }
+
+        if ((local_header_extra_len) && ((local_header_comp_size == MZ_UINT32_MAX) || (local_header_uncomp_size == MZ_UINT32_MAX)))
+        {
+            mz_uint32 extra_size_remaining = local_header_extra_len;
+            const mz_uint8 *pExtra_data = (const mz_uint8 *)file_data_array.m_p;
+
+            if (pZip->m_pRead(pZip->m_pIO_opaque, local_header_ofs + MZ_ZIP_LOCAL_DIR_HEADER_SIZE + local_header_filename_len, file_data_array.m_p, local_header_extra_len) != local_header_extra_len)
+            {
+                mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED);
+                goto handle_failure;
+            }
+
+            do
+            {
+                mz_uint32 field_id, field_data_size, field_total_size;
+
+                if (extra_size_remaining < (sizeof(mz_uint16) * 2))
+                {
+                    mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
+                    goto handle_failure;
+                }
+
+                field_id = MZ_READ_LE16(pExtra_data);
+                field_data_size = MZ_READ_LE16(pExtra_data + sizeof(mz_uint16));
+                field_total_size = field_data_size + sizeof(mz_uint16) * 2;
+
+                if (field_total_size > extra_size_remaining)
+                {
+                    mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
+                    goto handle_failure;
+                }
+
+                if (field_id == MZ_ZIP64_EXTENDED_INFORMATION_FIELD_HEADER_ID)
+                {
+                    const mz_uint8 *pSrc_field_data = pExtra_data + sizeof(mz_uint32);
+
+                    if (field_data_size < sizeof(mz_uint64) * 2)
+                    {
+                        mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
+                        goto handle_failure;
+                    }
+
+                    local_header_uncomp_size = MZ_READ_LE64(pSrc_field_data);
+                    local_header_comp_size = MZ_READ_LE64(pSrc_field_data + sizeof(mz_uint64));
+
+                    found_zip64_ext_data_in_ldir = MZ_TRUE;
+                    break;
+                }
+
+                pExtra_data += field_total_size;
+                extra_size_remaining -= field_total_size;
+            } while (extra_size_remaining);
+        }
+
+        /* TODO: parse local header extra data when local_header_comp_size is 0xFFFFFFFF! (big_descriptor.zip) */
+        /* I've seen zips in the wild with the data descriptor bit set, but proper local header values and bogus data descriptors */
+        if ((has_data_descriptor) && (!local_header_comp_size) && (!local_header_crc32))
+        {
+            mz_uint8 descriptor_buf[32];
+            mz_bool has_id;
+            const mz_uint8 *pSrc;
+            mz_uint32 file_crc32;
+            mz_uint64 comp_size = 0, uncomp_size = 0;
+
+            mz_uint32 num_descriptor_uint32s = ((pState->m_zip64) || (found_zip64_ext_data_in_ldir)) ? 6 : 4;
+
+            if (pZip->m_pRead(pZip->m_pIO_opaque, local_header_ofs + MZ_ZIP_LOCAL_DIR_HEADER_SIZE + local_header_filename_len + local_header_extra_len + file_stat.m_comp_size, descriptor_buf, sizeof(mz_uint32) * num_descriptor_uint32s) != (sizeof(mz_uint32) * num_descriptor_uint32s))
+            {
+                mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED);
+                goto handle_failure;
+            }
+
+            has_id = (MZ_READ_LE32(descriptor_buf) == MZ_ZIP_DATA_DESCRIPTOR_ID);
+            pSrc = has_id ? (descriptor_buf + sizeof(mz_uint32)) : descriptor_buf;
+
+            file_crc32 = MZ_READ_LE32(pSrc);
+
+            if ((pState->m_zip64) || (found_zip64_ext_data_in_ldir))
+            {
+                comp_size = MZ_READ_LE64(pSrc + sizeof(mz_uint32));
+                uncomp_size = MZ_READ_LE64(pSrc + sizeof(mz_uint32) + sizeof(mz_uint64));
+            }
+            else
+            {
+                comp_size = MZ_READ_LE32(pSrc + sizeof(mz_uint32));
+                uncomp_size = MZ_READ_LE32(pSrc + sizeof(mz_uint32) + sizeof(mz_uint32));
+            }
+
+            if ((file_crc32 != file_stat.m_crc32) || (comp_size != file_stat.m_comp_size) || (uncomp_size != file_stat.m_uncomp_size))
+            {
+                mz_zip_set_error(pZip, MZ_ZIP_VALIDATION_FAILED);
+                goto handle_failure;
+            }
+        }
+        else
+        {
+            if ((local_header_crc32 != file_stat.m_crc32) || (local_header_comp_size != file_stat.m_comp_size) || (local_header_uncomp_size != file_stat.m_uncomp_size))
+            {
+                mz_zip_set_error(pZip, MZ_ZIP_VALIDATION_FAILED);
+                goto handle_failure;
+            }
+        }
+
+        mz_zip_array_clear(pZip, &file_data_array);
+
+        if ((flags & MZ_ZIP_FLAG_VALIDATE_HEADERS_ONLY) == 0)
+        {
+            if (!mz_zip_reader_extract_to_callback(pZip, file_index, mz_zip_compute_crc32_callback, &uncomp_crc32, 0))
+                return MZ_FALSE;
+
+            /* 1 more check to be sure, although the extract checks too. */
+            if (uncomp_crc32 != file_stat.m_crc32)
+            {
+                mz_zip_set_error(pZip, MZ_ZIP_VALIDATION_FAILED);
+                return MZ_FALSE;
+            }
+        }
+
+        return MZ_TRUE;
+
+    handle_failure:
+        mz_zip_array_clear(pZip, &file_data_array);
+        return MZ_FALSE;
+    }
+
+    mz_bool mz_zip_validate_archive(mz_zip_archive *pZip, mz_uint flags)
+    {
+        mz_zip_internal_state *pState;
+        mz_uint32 i;
+
+        if ((!pZip) || (!pZip->m_pState) || (!pZip->m_pAlloc) || (!pZip->m_pFree) || (!pZip->m_pRead))
+            return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
+
+        pState = pZip->m_pState;
+
+        /* Basic sanity checks */
+        if (!pState->m_zip64)
+        {
+            if (pZip->m_total_files > MZ_UINT16_MAX)
+                return mz_zip_set_error(pZip, MZ_ZIP_ARCHIVE_TOO_LARGE);
+
+            if (pZip->m_archive_size > MZ_UINT32_MAX)
+                return mz_zip_set_error(pZip, MZ_ZIP_ARCHIVE_TOO_LARGE);
+        }
+        else
+        {
+            if (pState->m_central_dir.m_size >= MZ_UINT32_MAX)
+                return mz_zip_set_error(pZip, MZ_ZIP_ARCHIVE_TOO_LARGE);
+        }
+
+        for (i = 0; i < pZip->m_total_files; i++)
+        {
+            if (MZ_ZIP_FLAG_VALIDATE_LOCATE_FILE_FLAG & flags)
+            {
+                mz_uint32 found_index;
+                mz_zip_archive_file_stat stat;
+
+                if (!mz_zip_reader_file_stat(pZip, i, &stat))
+                    return MZ_FALSE;
+
+                if (!mz_zip_reader_locate_file_v2(pZip, stat.m_filename, NULL, 0, &found_index))
+                    return MZ_FALSE;
+
+                /* This check can fail if there are duplicate filenames in the archive (which we don't check for when writing - that's up to the user) */
+                if (found_index != i)
+                    return mz_zip_set_error(pZip, MZ_ZIP_VALIDATION_FAILED);
+            }
+
+            if (!mz_zip_validate_file(pZip, i, flags))
+                return MZ_FALSE;
+        }
+
+        return MZ_TRUE;
+    }
+
+    mz_bool mz_zip_validate_mem_archive(const void *pMem, size_t size, mz_uint flags, mz_zip_error *pErr)
+    {
+        mz_bool success = MZ_TRUE;
+        mz_zip_archive zip;
+        mz_zip_error actual_err = MZ_ZIP_NO_ERROR;
+
+        if ((!pMem) || (!size))
+        {
+            if (pErr)
+                *pErr = MZ_ZIP_INVALID_PARAMETER;
+            return MZ_FALSE;
+        }
+
+        mz_zip_zero_struct(&zip);
+
+        if (!mz_zip_reader_init_mem(&zip, pMem, size, flags))
+        {
+            if (pErr)
+                *pErr = zip.m_last_error;
+            return MZ_FALSE;
+        }
+
+        if (!mz_zip_validate_archive(&zip, flags))
+        {
+            actual_err = zip.m_last_error;
+            success = MZ_FALSE;
+        }
+
+        if (!mz_zip_reader_end_internal(&zip, success))
+        {
+            if (!actual_err)
+                actual_err = zip.m_last_error;
+            success = MZ_FALSE;
+        }
+
+        if (pErr)
+            *pErr = actual_err;
+
+        return success;
+    }
+
+#ifndef MINIZ_NO_STDIO
+    mz_bool mz_zip_validate_file_archive(const char *pFilename, mz_uint flags, mz_zip_error *pErr)
+    {
+        mz_bool success = MZ_TRUE;
+        mz_zip_archive zip;
+        mz_zip_error actual_err = MZ_ZIP_NO_ERROR;
+
+        if (!pFilename)
+        {
+            if (pErr)
+                *pErr = MZ_ZIP_INVALID_PARAMETER;
+            return MZ_FALSE;
+        }
+
+        mz_zip_zero_struct(&zip);
+
+        if (!mz_zip_reader_init_file_v2(&zip, pFilename, flags, 0, 0))
+        {
+            if (pErr)
+                *pErr = zip.m_last_error;
+            return MZ_FALSE;
+        }
+
+        if (!mz_zip_validate_archive(&zip, flags))
+        {
+            actual_err = zip.m_last_error;
+            success = MZ_FALSE;
+        }
+
+        if (!mz_zip_reader_end_internal(&zip, success))
+        {
+            if (!actual_err)
+                actual_err = zip.m_last_error;
+            success = MZ_FALSE;
+        }
+
+        if (pErr)
+            *pErr = actual_err;
+
+        return success;
+    }
+#endif /* #ifndef MINIZ_NO_STDIO */
+
+    /* ------------------- .ZIP archive writing */
+
+#ifndef MINIZ_NO_ARCHIVE_WRITING_APIS
+
+    static MZ_FORCEINLINE void mz_write_le16(mz_uint8 *p, mz_uint16 v)
+    {
+        p[0] = (mz_uint8)v;
+        p[1] = (mz_uint8)(v >> 8);
+    }
+    static MZ_FORCEINLINE void mz_write_le32(mz_uint8 *p, mz_uint32 v)
+    {
+        p[0] = (mz_uint8)v;
+        p[1] = (mz_uint8)(v >> 8);
+        p[2] = (mz_uint8)(v >> 16);
+        p[3] = (mz_uint8)(v >> 24);
+    }
+    static MZ_FORCEINLINE void mz_write_le64(mz_uint8 *p, mz_uint64 v)
+    {
+        mz_write_le32(p, (mz_uint32)v);
+        mz_write_le32(p + sizeof(mz_uint32), (mz_uint32)(v >> 32));
+    }
+
+#define MZ_WRITE_LE16(p, v) mz_write_le16((mz_uint8 *)(p), (mz_uint16)(v))
+#define MZ_WRITE_LE32(p, v) mz_write_le32((mz_uint8 *)(p), (mz_uint32)(v))
+#define MZ_WRITE_LE64(p, v) mz_write_le64((mz_uint8 *)(p), (mz_uint64)(v))
+
+    static size_t mz_zip_heap_write_func(void *pOpaque, mz_uint64 file_ofs, const void *pBuf, size_t n)
+    {
+        mz_zip_archive *pZip = (mz_zip_archive *)pOpaque;
+        mz_zip_internal_state *pState = pZip->m_pState;
+        mz_uint64 new_size = MZ_MAX(file_ofs + n, pState->m_mem_size);
+
+        if (!n)
+            return 0;
+
+        /* An allocation this big is likely to just fail on 32-bit systems, so don't even go there. */
+        if ((sizeof(size_t) == sizeof(mz_uint32)) && (new_size > 0x7FFFFFFF))
+        {
+            mz_zip_set_error(pZip, MZ_ZIP_FILE_TOO_LARGE);
+            return 0;
+        }
+
+        if (new_size > pState->m_mem_capacity)
+        {
+            void *pNew_block;
+            size_t new_capacity = MZ_MAX(64, pState->m_mem_capacity);
+
+            while (new_capacity < new_size)
+                new_capacity *= 2;
+
+            if (NULL == (pNew_block = pZip->m_pRealloc(pZip->m_pAlloc_opaque, pState->m_pMem, 1, new_capacity)))
+            {
+                mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
+                return 0;
+            }
+
+            pState->m_pMem = pNew_block;
+            pState->m_mem_capacity = new_capacity;
+        }
+        memcpy((mz_uint8 *)pState->m_pMem + file_ofs, pBuf, n);
+        pState->m_mem_size = (size_t)new_size;
+        return n;
+    }
+
+    static mz_bool mz_zip_writer_end_internal(mz_zip_archive *pZip, mz_bool set_last_error)
+    {
+        mz_zip_internal_state *pState;
+        mz_bool status = MZ_TRUE;
+
+        if ((!pZip) || (!pZip->m_pState) || (!pZip->m_pAlloc) || (!pZip->m_pFree) || ((pZip->m_zip_mode != MZ_ZIP_MODE_WRITING) && (pZip->m_zip_mode != MZ_ZIP_MODE_WRITING_HAS_BEEN_FINALIZED)))
+        {
+            if (set_last_error)
+                mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
+            return MZ_FALSE;
+        }
+
+        pState = pZip->m_pState;
+        pZip->m_pState = NULL;
+        mz_zip_array_clear(pZip, &pState->m_central_dir);
+        mz_zip_array_clear(pZip, &pState->m_central_dir_offsets);
+        mz_zip_array_clear(pZip, &pState->m_sorted_central_dir_offsets);
+
+#ifndef MINIZ_NO_STDIO
+        if (pState->m_pFile)
+        {
+            if (pZip->m_zip_type == MZ_ZIP_TYPE_FILE)
+            {
+                if (MZ_FCLOSE(pState->m_pFile) == EOF)
+                {
+                    if (set_last_error)
+                        mz_zip_set_error(pZip, MZ_ZIP_FILE_CLOSE_FAILED);
+                    status = MZ_FALSE;
+                }
+            }
+
+            pState->m_pFile = NULL;
+        }
+#endif /* #ifndef MINIZ_NO_STDIO */
+
+        if ((pZip->m_pWrite == mz_zip_heap_write_func) && (pState->m_pMem))
+        {
+            pZip->m_pFree(pZip->m_pAlloc_opaque, pState->m_pMem);
+            pState->m_pMem = NULL;
+        }
+
+        pZip->m_pFree(pZip->m_pAlloc_opaque, pState);
+        pZip->m_zip_mode = MZ_ZIP_MODE_INVALID;
+        return status;
+    }
+
+    mz_bool mz_zip_writer_init_v2(mz_zip_archive *pZip, mz_uint64 existing_size, mz_uint flags)
+    {
+        mz_bool zip64 = (flags & MZ_ZIP_FLAG_WRITE_ZIP64) != 0;
+
+        if ((!pZip) || (pZip->m_pState) || (!pZip->m_pWrite) || (pZip->m_zip_mode != MZ_ZIP_MODE_INVALID))
+            return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
+
+        if (flags & MZ_ZIP_FLAG_WRITE_ALLOW_READING)
+        {
+            if (!pZip->m_pRead)
+                return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
+        }
+
+        if (pZip->m_file_offset_alignment)
+        {
+            /* Ensure user specified file offset alignment is a power of 2. */
+            if (pZip->m_file_offset_alignment & (pZip->m_file_offset_alignment - 1))
+                return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
+        }
+
+        if (!pZip->m_pAlloc)
+            pZip->m_pAlloc = miniz_def_alloc_func;
+        if (!pZip->m_pFree)
+            pZip->m_pFree = miniz_def_free_func;
+        if (!pZip->m_pRealloc)
+            pZip->m_pRealloc = miniz_def_realloc_func;
+
+        pZip->m_archive_size = existing_size;
+        pZip->m_central_directory_file_ofs = 0;
+        pZip->m_total_files = 0;
+
+        if (NULL == (pZip->m_pState = (mz_zip_internal_state *)pZip->m_pAlloc(pZip->m_pAlloc_opaque, 1, sizeof(mz_zip_internal_state))))
+            return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
+
+        memset(pZip->m_pState, 0, sizeof(mz_zip_internal_state));
+
+        MZ_ZIP_ARRAY_SET_ELEMENT_SIZE(&pZip->m_pState->m_central_dir, sizeof(mz_uint8));
+        MZ_ZIP_ARRAY_SET_ELEMENT_SIZE(&pZip->m_pState->m_central_dir_offsets, sizeof(mz_uint32));
+        MZ_ZIP_ARRAY_SET_ELEMENT_SIZE(&pZip->m_pState->m_sorted_central_dir_offsets, sizeof(mz_uint32));
+
+        pZip->m_pState->m_zip64 = zip64;
+        pZip->m_pState->m_zip64_has_extended_info_fields = zip64;
+
+        pZip->m_zip_type = MZ_ZIP_TYPE_USER;
+        pZip->m_zip_mode = MZ_ZIP_MODE_WRITING;
+
+        return MZ_TRUE;
+    }
+
+    mz_bool mz_zip_writer_init(mz_zip_archive *pZip, mz_uint64 existing_size)
+    {
+        return mz_zip_writer_init_v2(pZip, existing_size, 0);
+    }
+
+    mz_bool mz_zip_writer_init_heap_v2(mz_zip_archive *pZip, size_t size_to_reserve_at_beginning, size_t initial_allocation_size, mz_uint flags)
+    {
+        pZip->m_pWrite = mz_zip_heap_write_func;
+        pZip->m_pNeeds_keepalive = NULL;
+
+        if (flags & MZ_ZIP_FLAG_WRITE_ALLOW_READING)
+            pZip->m_pRead = mz_zip_mem_read_func;
+
+        pZip->m_pIO_opaque = pZip;
+
+        if (!mz_zip_writer_init_v2(pZip, size_to_reserve_at_beginning, flags))
+            return MZ_FALSE;
+
+        pZip->m_zip_type = MZ_ZIP_TYPE_HEAP;
+
+        if (0 != (initial_allocation_size = MZ_MAX(initial_allocation_size, size_to_reserve_at_beginning)))
+        {
+            if (NULL == (pZip->m_pState->m_pMem = pZip->m_pAlloc(pZip->m_pAlloc_opaque, 1, initial_allocation_size)))
+            {
+                mz_zip_writer_end_internal(pZip, MZ_FALSE);
+                return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
+            }
+            pZip->m_pState->m_mem_capacity = initial_allocation_size;
+        }
+
+        return MZ_TRUE;
+    }
+
+    mz_bool mz_zip_writer_init_heap(mz_zip_archive *pZip, size_t size_to_reserve_at_beginning, size_t initial_allocation_size)
+    {
+        return mz_zip_writer_init_heap_v2(pZip, size_to_reserve_at_beginning, initial_allocation_size, 0);
+    }
+
+#ifndef MINIZ_NO_STDIO
+    static size_t mz_zip_file_write_func(void *pOpaque, mz_uint64 file_ofs, const void *pBuf, size_t n)
+    {
+        mz_zip_archive *pZip = (mz_zip_archive *)pOpaque;
+        mz_int64 cur_ofs = MZ_FTELL64(pZip->m_pState->m_pFile);
+
+        file_ofs += pZip->m_pState->m_file_archive_start_ofs;
+
+        if (((mz_int64)file_ofs < 0) || (((cur_ofs != (mz_int64)file_ofs)) && (MZ_FSEEK64(pZip->m_pState->m_pFile, (mz_int64)file_ofs, SEEK_SET))))
+        {
+            mz_zip_set_error(pZip, MZ_ZIP_FILE_SEEK_FAILED);
+            return 0;
+        }
+
+        return MZ_FWRITE(pBuf, 1, n, pZip->m_pState->m_pFile);
+    }
+
+    mz_bool mz_zip_writer_init_file(mz_zip_archive *pZip, const char *pFilename, mz_uint64 size_to_reserve_at_beginning)
+    {
+        return mz_zip_writer_init_file_v2(pZip, pFilename, size_to_reserve_at_beginning, 0);
+    }
+
+    mz_bool mz_zip_writer_init_file_v2(mz_zip_archive *pZip, const char *pFilename, mz_uint64 size_to_reserve_at_beginning, mz_uint flags)
+    {
+        MZ_FILE *pFile;
+
+        pZip->m_pWrite = mz_zip_file_write_func;
+        pZip->m_pNeeds_keepalive = NULL;
+
+        if (flags & MZ_ZIP_FLAG_WRITE_ALLOW_READING)
+            pZip->m_pRead = mz_zip_file_read_func;
+
+        pZip->m_pIO_opaque = pZip;
+
+        if (!mz_zip_writer_init_v2(pZip, size_to_reserve_at_beginning, flags))
+            return MZ_FALSE;
+
+        if (NULL == (pFile = MZ_FOPEN(pFilename, (flags & MZ_ZIP_FLAG_WRITE_ALLOW_READING) ? "w+b" : "wb")))
+        {
+            mz_zip_writer_end(pZip);
+            return mz_zip_set_error(pZip, MZ_ZIP_FILE_OPEN_FAILED);
+        }
+
+        pZip->m_pState->m_pFile = pFile;
+        pZip->m_zip_type = MZ_ZIP_TYPE_FILE;
+
+        if (size_to_reserve_at_beginning)
+        {
+            mz_uint64 cur_ofs = 0;
+            char buf[4096];
+
+            MZ_CLEAR_ARR(buf);
+
+            do
+            {
+                size_t n = (size_t)MZ_MIN(sizeof(buf), size_to_reserve_at_beginning);
+                if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_ofs, buf, n) != n)
+                {
+                    mz_zip_writer_end(pZip);
+                    return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
+                }
+                cur_ofs += n;
+                size_to_reserve_at_beginning -= n;
+            } while (size_to_reserve_at_beginning);
+        }
+
+        return MZ_TRUE;
+    }
+
+    mz_bool mz_zip_writer_init_cfile(mz_zip_archive *pZip, MZ_FILE *pFile, mz_uint flags)
+    {
+        pZip->m_pWrite = mz_zip_file_write_func;
+        pZip->m_pNeeds_keepalive = NULL;
+
+        if (flags & MZ_ZIP_FLAG_WRITE_ALLOW_READING)
+            pZip->m_pRead = mz_zip_file_read_func;
+
+        pZip->m_pIO_opaque = pZip;
+
+        if (!mz_zip_writer_init_v2(pZip, 0, flags))
+            return MZ_FALSE;
+
+        pZip->m_pState->m_pFile = pFile;
+        pZip->m_pState->m_file_archive_start_ofs = MZ_FTELL64(pZip->m_pState->m_pFile);
+        pZip->m_zip_type = MZ_ZIP_TYPE_CFILE;
+
+        return MZ_TRUE;
+    }
+#endif /* #ifndef MINIZ_NO_STDIO */
+
+    mz_bool mz_zip_writer_init_from_reader_v2(mz_zip_archive *pZip, const char *pFilename, mz_uint flags)
+    {
+        mz_zip_internal_state *pState;
+
+        if ((!pZip) || (!pZip->m_pState) || (pZip->m_zip_mode != MZ_ZIP_MODE_READING))
+            return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
+
+        if (flags & MZ_ZIP_FLAG_WRITE_ZIP64)
+        {
+            /* We don't support converting a non-zip64 file to zip64 - this seems like more trouble than it's worth. (What about the existing 32-bit data descriptors that could follow the compressed data?) */
+            if (!pZip->m_pState->m_zip64)
+                return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
+        }
+
+        /* No sense in trying to write to an archive that's already at the support max size */
+        if (pZip->m_pState->m_zip64)
+        {
+            if (pZip->m_total_files == MZ_UINT32_MAX)
+                return mz_zip_set_error(pZip, MZ_ZIP_TOO_MANY_FILES);
+        }
+        else
+        {
+            if (pZip->m_total_files == MZ_UINT16_MAX)
+                return mz_zip_set_error(pZip, MZ_ZIP_TOO_MANY_FILES);
+
+            if ((pZip->m_archive_size + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + MZ_ZIP_LOCAL_DIR_HEADER_SIZE) > MZ_UINT32_MAX)
+                return mz_zip_set_error(pZip, MZ_ZIP_FILE_TOO_LARGE);
+        }
+
+        pState = pZip->m_pState;
+
+        if (pState->m_pFile)
+        {
+#ifdef MINIZ_NO_STDIO
+            (void)pFilename;
+            return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
+#else
+            if (pZip->m_pIO_opaque != pZip)
+                return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
+
+            if (pZip->m_zip_type == MZ_ZIP_TYPE_FILE &&
+                !(flags & MZ_ZIP_FLAG_READ_ALLOW_WRITING) )
+            {
+                if (!pFilename)
+                    return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
+
+                /* Archive is being read from stdio and was originally opened only for reading. Try to reopen as writable. */
+                if (NULL == (pState->m_pFile = MZ_FREOPEN(pFilename, "r+b", pState->m_pFile)))
+                {
+                    /* The mz_zip_archive is now in a bogus state because pState->m_pFile is NULL, so just close it. */
+                    mz_zip_reader_end_internal(pZip, MZ_FALSE);
+                    return mz_zip_set_error(pZip, MZ_ZIP_FILE_OPEN_FAILED);
+                }
+            }
+
+            pZip->m_pWrite = mz_zip_file_write_func;
+            pZip->m_pNeeds_keepalive = NULL;
+#endif /* #ifdef MINIZ_NO_STDIO */
+        }
+        else if (pState->m_pMem)
+        {
+            /* Archive lives in a memory block. Assume it's from the heap that we can resize using the realloc callback. */
+            if (pZip->m_pIO_opaque != pZip)
+                return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
+
+            pState->m_mem_capacity = pState->m_mem_size;
+            pZip->m_pWrite = mz_zip_heap_write_func;
+            pZip->m_pNeeds_keepalive = NULL;
+        }
+        /* Archive is being read via a user provided read function - make sure the user has specified a write function too. */
+        else if (!pZip->m_pWrite)
+            return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
+
+        /* Start writing new files at the archive's current central directory location. */
+        /* TODO: We could add a flag that lets the user start writing immediately AFTER the existing central dir - this would be safer. */
+        pZip->m_archive_size = pZip->m_central_directory_file_ofs;
+        pZip->m_central_directory_file_ofs = 0;
+
+        /* Clear the sorted central dir offsets, they aren't useful or maintained now. */
+        /* Even though we're now in write mode, files can still be extracted and verified, but file locates will be slow. */
+        /* TODO: We could easily maintain the sorted central directory offsets. */
+        mz_zip_array_clear(pZip, &pZip->m_pState->m_sorted_central_dir_offsets);
+
+        pZip->m_zip_mode = MZ_ZIP_MODE_WRITING;
+
+        return MZ_TRUE;
+    }
+
+    mz_bool mz_zip_writer_init_from_reader(mz_zip_archive *pZip, const char *pFilename)
+    {
+        return mz_zip_writer_init_from_reader_v2(pZip, pFilename, 0);
+    }
+
+    /* TODO: pArchive_name is a terrible name here! */
+    mz_bool mz_zip_writer_add_mem(mz_zip_archive *pZip, const char *pArchive_name, const void *pBuf, size_t buf_size, mz_uint level_and_flags)
+    {
+        return mz_zip_writer_add_mem_ex(pZip, pArchive_name, pBuf, buf_size, NULL, 0, level_and_flags, 0, 0);
+    }
+
+    typedef struct
+    {
+        mz_zip_archive *m_pZip;
+        mz_uint64 m_cur_archive_file_ofs;
+        mz_uint64 m_comp_size;
+    } mz_zip_writer_add_state;
+
+    static mz_bool mz_zip_writer_add_put_buf_callback(const void *pBuf, int len, void *pUser)
+    {
+        mz_zip_writer_add_state *pState = (mz_zip_writer_add_state *)pUser;
+        if ((int)pState->m_pZip->m_pWrite(pState->m_pZip->m_pIO_opaque, pState->m_cur_archive_file_ofs, pBuf, len) != len)
+            return MZ_FALSE;
+
+        pState->m_cur_archive_file_ofs += len;
+        pState->m_comp_size += len;
+        return MZ_TRUE;
+    }
+
+#define MZ_ZIP64_MAX_LOCAL_EXTRA_FIELD_SIZE (sizeof(mz_uint16) * 2 + sizeof(mz_uint64) * 2)
+#define MZ_ZIP64_MAX_CENTRAL_EXTRA_FIELD_SIZE (sizeof(mz_uint16) * 2 + sizeof(mz_uint64) * 3)
+    static mz_uint32 mz_zip_writer_create_zip64_extra_data(mz_uint8 *pBuf, mz_uint64 *pUncomp_size, mz_uint64 *pComp_size, mz_uint64 *pLocal_header_ofs)
+    {
+        mz_uint8 *pDst = pBuf;
+        mz_uint32 field_size = 0;
+
+        MZ_WRITE_LE16(pDst + 0, MZ_ZIP64_EXTENDED_INFORMATION_FIELD_HEADER_ID);
+        MZ_WRITE_LE16(pDst + 2, 0);
+        pDst += sizeof(mz_uint16) * 2;
+
+        if (pUncomp_size)
+        {
+            MZ_WRITE_LE64(pDst, *pUncomp_size);
+            pDst += sizeof(mz_uint64);
+            field_size += sizeof(mz_uint64);
+        }
+
+        if (pComp_size)
+        {
+            MZ_WRITE_LE64(pDst, *pComp_size);
+            pDst += sizeof(mz_uint64);
+            field_size += sizeof(mz_uint64);
+        }
+
+        if (pLocal_header_ofs)
+        {
+            MZ_WRITE_LE64(pDst, *pLocal_header_ofs);
+            pDst += sizeof(mz_uint64);
+            field_size += sizeof(mz_uint64);
+        }
+
+        MZ_WRITE_LE16(pBuf + 2, field_size);
+
+        return (mz_uint32)(pDst - pBuf);
+    }
+
+    static mz_bool mz_zip_writer_create_local_dir_header(mz_zip_archive *pZip, mz_uint8 *pDst, mz_uint16 filename_size, mz_uint16 extra_size, mz_uint64 uncomp_size, mz_uint64 comp_size, mz_uint32 uncomp_crc32, mz_uint16 method, mz_uint16 bit_flags, mz_uint16 dos_time, mz_uint16 dos_date)
+    {
+        (void)pZip;
+        memset(pDst, 0, MZ_ZIP_LOCAL_DIR_HEADER_SIZE);
+        MZ_WRITE_LE32(pDst + MZ_ZIP_LDH_SIG_OFS, MZ_ZIP_LOCAL_DIR_HEADER_SIG);
+        MZ_WRITE_LE16(pDst + MZ_ZIP_LDH_VERSION_NEEDED_OFS, method ? 20 : 0);
+        MZ_WRITE_LE16(pDst + MZ_ZIP_LDH_BIT_FLAG_OFS, bit_flags);
+        MZ_WRITE_LE16(pDst + MZ_ZIP_LDH_METHOD_OFS, method);
+        MZ_WRITE_LE16(pDst + MZ_ZIP_LDH_FILE_TIME_OFS, dos_time);
+        MZ_WRITE_LE16(pDst + MZ_ZIP_LDH_FILE_DATE_OFS, dos_date);
+        MZ_WRITE_LE32(pDst + MZ_ZIP_LDH_CRC32_OFS, uncomp_crc32);
+        MZ_WRITE_LE32(pDst + MZ_ZIP_LDH_COMPRESSED_SIZE_OFS, MZ_MIN(comp_size, MZ_UINT32_MAX));
+        MZ_WRITE_LE32(pDst + MZ_ZIP_LDH_DECOMPRESSED_SIZE_OFS, MZ_MIN(uncomp_size, MZ_UINT32_MAX));
+        MZ_WRITE_LE16(pDst + MZ_ZIP_LDH_FILENAME_LEN_OFS, filename_size);
+        MZ_WRITE_LE16(pDst + MZ_ZIP_LDH_EXTRA_LEN_OFS, extra_size);
+        return MZ_TRUE;
+    }
+
+    static mz_bool mz_zip_writer_create_central_dir_header(mz_zip_archive *pZip, mz_uint8 *pDst,
+                                                           mz_uint16 filename_size, mz_uint16 extra_size, mz_uint16 comment_size,
+                                                           mz_uint64 uncomp_size, mz_uint64 comp_size, mz_uint32 uncomp_crc32,
+                                                           mz_uint16 method, mz_uint16 bit_flags, mz_uint16 dos_time, mz_uint16 dos_date,
+                                                           mz_uint64 local_header_ofs, mz_uint32 ext_attributes)
+    {
+        (void)pZip;
+        memset(pDst, 0, MZ_ZIP_CENTRAL_DIR_HEADER_SIZE);
+        MZ_WRITE_LE32(pDst + MZ_ZIP_CDH_SIG_OFS, MZ_ZIP_CENTRAL_DIR_HEADER_SIG);
+        MZ_WRITE_LE16(pDst + MZ_ZIP_CDH_VERSION_NEEDED_OFS, method ? 20 : 0);
+        MZ_WRITE_LE16(pDst + MZ_ZIP_CDH_BIT_FLAG_OFS, bit_flags);
+        MZ_WRITE_LE16(pDst + MZ_ZIP_CDH_METHOD_OFS, method);
+        MZ_WRITE_LE16(pDst + MZ_ZIP_CDH_FILE_TIME_OFS, dos_time);
+        MZ_WRITE_LE16(pDst + MZ_ZIP_CDH_FILE_DATE_OFS, dos_date);
+        MZ_WRITE_LE32(pDst + MZ_ZIP_CDH_CRC32_OFS, uncomp_crc32);
+        MZ_WRITE_LE32(pDst + MZ_ZIP_CDH_COMPRESSED_SIZE_OFS, MZ_MIN(comp_size, MZ_UINT32_MAX));
+        MZ_WRITE_LE32(pDst + MZ_ZIP_CDH_DECOMPRESSED_SIZE_OFS, MZ_MIN(uncomp_size, MZ_UINT32_MAX));
+        MZ_WRITE_LE16(pDst + MZ_ZIP_CDH_FILENAME_LEN_OFS, filename_size);
+        MZ_WRITE_LE16(pDst + MZ_ZIP_CDH_EXTRA_LEN_OFS, extra_size);
+        MZ_WRITE_LE16(pDst + MZ_ZIP_CDH_COMMENT_LEN_OFS, comment_size);
+        MZ_WRITE_LE32(pDst + MZ_ZIP_CDH_EXTERNAL_ATTR_OFS, ext_attributes);
+        MZ_WRITE_LE32(pDst + MZ_ZIP_CDH_LOCAL_HEADER_OFS, MZ_MIN(local_header_ofs, MZ_UINT32_MAX));
+        return MZ_TRUE;
+    }
+
+    static mz_bool mz_zip_writer_add_to_central_dir(mz_zip_archive *pZip, const char *pFilename, mz_uint16 filename_size,
+                                                    const void *pExtra, mz_uint16 extra_size, const void *pComment, mz_uint16 comment_size,
+                                                    mz_uint64 uncomp_size, mz_uint64 comp_size, mz_uint32 uncomp_crc32,
+                                                    mz_uint16 method, mz_uint16 bit_flags, mz_uint16 dos_time, mz_uint16 dos_date,
+                                                    mz_uint64 local_header_ofs, mz_uint32 ext_attributes,
+                                                    const char *user_extra_data, mz_uint user_extra_data_len)
+    {
+        mz_zip_internal_state *pState = pZip->m_pState;
+        mz_uint32 central_dir_ofs = (mz_uint32)pState->m_central_dir.m_size;
+        size_t orig_central_dir_size = pState->m_central_dir.m_size;
+        mz_uint8 central_dir_header[MZ_ZIP_CENTRAL_DIR_HEADER_SIZE];
+
+        if (!pZip->m_pState->m_zip64)
+        {
+            if (local_header_ofs > 0xFFFFFFFF)
+                return mz_zip_set_error(pZip, MZ_ZIP_FILE_TOO_LARGE);
+        }
+
+        /* miniz doesn't support central dirs >= MZ_UINT32_MAX bytes yet */
+        if (((mz_uint64)pState->m_central_dir.m_size + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + filename_size + extra_size + user_extra_data_len + comment_size) >= MZ_UINT32_MAX)
+            return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_CDIR_SIZE);
+
+        if (!mz_zip_writer_create_central_dir_header(pZip, central_dir_header, filename_size, (mz_uint16)(extra_size + user_extra_data_len), comment_size, uncomp_size, comp_size, uncomp_crc32, method, bit_flags, dos_time, dos_date, local_header_ofs, ext_attributes))
+            return mz_zip_set_error(pZip, MZ_ZIP_INTERNAL_ERROR);
+
+        if ((!mz_zip_array_push_back(pZip, &pState->m_central_dir, central_dir_header, MZ_ZIP_CENTRAL_DIR_HEADER_SIZE)) ||
+            (!mz_zip_array_push_back(pZip, &pState->m_central_dir, pFilename, filename_size)) ||
+            (!mz_zip_array_push_back(pZip, &pState->m_central_dir, pExtra, extra_size)) ||
+            (!mz_zip_array_push_back(pZip, &pState->m_central_dir, user_extra_data, user_extra_data_len)) ||
+            (!mz_zip_array_push_back(pZip, &pState->m_central_dir, pComment, comment_size)) ||
+            (!mz_zip_array_push_back(pZip, &pState->m_central_dir_offsets, &central_dir_ofs, 1)))
+        {
+            /* Try to resize the central directory array back into its original state. */
+            mz_zip_array_resize(pZip, &pState->m_central_dir, orig_central_dir_size, MZ_FALSE);
+            return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
+        }
+
+        return MZ_TRUE;
+    }
+
+    static mz_bool mz_zip_writer_validate_archive_name(const char *pArchive_name)
+    {
+        /* Basic ZIP archive filename validity checks: Valid filenames cannot start with a forward slash, cannot contain a drive letter, and cannot use DOS-style backward slashes. */
+        if (*pArchive_name == '/')
+            return MZ_FALSE;
+
+        /* Making sure the name does not contain drive letters or DOS style backward slashes is the responsibility of the program using miniz*/
+
+        return MZ_TRUE;
+    }
+
+    static mz_uint mz_zip_writer_compute_padding_needed_for_file_alignment(mz_zip_archive *pZip)
+    {
+        mz_uint32 n;
+        if (!pZip->m_file_offset_alignment)
+            return 0;
+        n = (mz_uint32)(pZip->m_archive_size & (pZip->m_file_offset_alignment - 1));
+        return (mz_uint)((pZip->m_file_offset_alignment - n) & (pZip->m_file_offset_alignment - 1));
+    }
+
+    static mz_bool mz_zip_writer_write_zeros(mz_zip_archive *pZip, mz_uint64 cur_file_ofs, mz_uint32 n)
+    {
+        char buf[4096];
+        memset(buf, 0, MZ_MIN(sizeof(buf), n));
+        while (n)
+        {
+            mz_uint32 s = MZ_MIN(sizeof(buf), n);
+            if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_file_ofs, buf, s) != s)
+                return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
+
+            cur_file_ofs += s;
+            n -= s;
+        }
+        return MZ_TRUE;
+    }
+
+    mz_bool mz_zip_writer_add_mem_ex(mz_zip_archive *pZip, const char *pArchive_name, const void *pBuf, size_t buf_size, const void *pComment, mz_uint16 comment_size, mz_uint level_and_flags,
+                                     mz_uint64 uncomp_size, mz_uint32 uncomp_crc32)
+    {
+        return mz_zip_writer_add_mem_ex_v2(pZip, pArchive_name, pBuf, buf_size, pComment, comment_size, level_and_flags, uncomp_size, uncomp_crc32, NULL, NULL, 0, NULL, 0);
+    }
+
+    mz_bool mz_zip_writer_add_mem_ex_v2(mz_zip_archive *pZip, const char *pArchive_name, const void *pBuf, size_t buf_size, const void *pComment, mz_uint16 comment_size,
+                                        mz_uint level_and_flags, mz_uint64 uncomp_size, mz_uint32 uncomp_crc32, MZ_TIME_T *last_modified,
+                                        const char *user_extra_data, mz_uint user_extra_data_len, const char *user_extra_data_central, mz_uint user_extra_data_central_len)
+    {
+        mz_uint16 method = 0, dos_time = 0, dos_date = 0;
+        mz_uint level, ext_attributes = 0, num_alignment_padding_bytes;
+        mz_uint64 local_dir_header_ofs = pZip->m_archive_size, cur_archive_file_ofs = pZip->m_archive_size, comp_size = 0;
+        size_t archive_name_size;
+        mz_uint8 local_dir_header[MZ_ZIP_LOCAL_DIR_HEADER_SIZE];
+        tdefl_compressor *pComp = NULL;
+        mz_bool store_data_uncompressed;
+        mz_zip_internal_state *pState;
+        mz_uint8 *pExtra_data = NULL;
+        mz_uint32 extra_size = 0;
+        mz_uint8 extra_data[MZ_ZIP64_MAX_CENTRAL_EXTRA_FIELD_SIZE];
+        mz_uint16 bit_flags = 0;
+
+        if ((int)level_and_flags < 0)
+            level_and_flags = MZ_DEFAULT_LEVEL;
+
+        if (uncomp_size || (buf_size && !(level_and_flags & MZ_ZIP_FLAG_COMPRESSED_DATA)))
+            bit_flags |= MZ_ZIP_LDH_BIT_FLAG_HAS_LOCATOR;
+
+        if (!(level_and_flags & MZ_ZIP_FLAG_ASCII_FILENAME))
+            bit_flags |= MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_UTF8;
+
+        level = level_and_flags & 0xF;
+        store_data_uncompressed = ((!level) || (level_and_flags & MZ_ZIP_FLAG_COMPRESSED_DATA));
+
+        if ((!pZip) || (!pZip->m_pState) || (pZip->m_zip_mode != MZ_ZIP_MODE_WRITING) || ((buf_size) && (!pBuf)) || (!pArchive_name) || ((comment_size) && (!pComment)) || (level > MZ_UBER_COMPRESSION))
+            return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
+
+        pState = pZip->m_pState;
+
+        if (pState->m_zip64)
+        {
+            if (pZip->m_total_files == MZ_UINT32_MAX)
+                return mz_zip_set_error(pZip, MZ_ZIP_TOO_MANY_FILES);
+        }
+        else
+        {
+            if (pZip->m_total_files == MZ_UINT16_MAX)
+            {
+                pState->m_zip64 = MZ_TRUE;
+                /*return mz_zip_set_error(pZip, MZ_ZIP_TOO_MANY_FILES); */
+            }
+            if (((mz_uint64)buf_size > 0xFFFFFFFF) || (uncomp_size > 0xFFFFFFFF))
+            {
+                pState->m_zip64 = MZ_TRUE;
+                /*return mz_zip_set_error(pZip, MZ_ZIP_ARCHIVE_TOO_LARGE); */
+            }
+        }
+
+        if ((!(level_and_flags & MZ_ZIP_FLAG_COMPRESSED_DATA)) && (uncomp_size))
+            return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
+
+        if (!mz_zip_writer_validate_archive_name(pArchive_name))
+            return mz_zip_set_error(pZip, MZ_ZIP_INVALID_FILENAME);
+
+#ifndef MINIZ_NO_TIME
+        if (last_modified != NULL)
+        {
+            mz_zip_time_t_to_dos_time(*last_modified, &dos_time, &dos_date);
+        }
+        else
+        {
+            MZ_TIME_T cur_time;
+            time(&cur_time);
+            mz_zip_time_t_to_dos_time(cur_time, &dos_time, &dos_date);
+        }
+#else
+        (void)last_modified;
+#endif /* #ifndef MINIZ_NO_TIME */
+
+        if (!(level_and_flags & MZ_ZIP_FLAG_COMPRESSED_DATA))
+        {
+            uncomp_crc32 = (mz_uint32)mz_crc32(MZ_CRC32_INIT, (const mz_uint8 *)pBuf, buf_size);
+            uncomp_size = buf_size;
+            if (uncomp_size <= 3)
+            {
+                level = 0;
+                store_data_uncompressed = MZ_TRUE;
+            }
+        }
+
+        archive_name_size = strlen(pArchive_name);
+        if (archive_name_size > MZ_UINT16_MAX)
+            return mz_zip_set_error(pZip, MZ_ZIP_INVALID_FILENAME);
+
+        num_alignment_padding_bytes = mz_zip_writer_compute_padding_needed_for_file_alignment(pZip);
+
+        /* miniz doesn't support central dirs >= MZ_UINT32_MAX bytes yet */
+        if (((mz_uint64)pState->m_central_dir.m_size + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + archive_name_size + MZ_ZIP64_MAX_CENTRAL_EXTRA_FIELD_SIZE + comment_size) >= MZ_UINT32_MAX)
+            return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_CDIR_SIZE);
+
+        if (!pState->m_zip64)
+        {
+            /* Bail early if the archive would obviously become too large */
+            if ((pZip->m_archive_size + num_alignment_padding_bytes + MZ_ZIP_LOCAL_DIR_HEADER_SIZE + archive_name_size + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + archive_name_size + comment_size + user_extra_data_len +
+                 pState->m_central_dir.m_size + MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE + user_extra_data_central_len + MZ_ZIP_DATA_DESCRIPTER_SIZE32) > 0xFFFFFFFF)
+            {
+                pState->m_zip64 = MZ_TRUE;
+                /*return mz_zip_set_error(pZip, MZ_ZIP_ARCHIVE_TOO_LARGE); */
+            }
+        }
+
+        if ((archive_name_size) && (pArchive_name[archive_name_size - 1] == '/'))
+        {
+            /* Set DOS Subdirectory attribute bit. */
+            ext_attributes |= MZ_ZIP_DOS_DIR_ATTRIBUTE_BITFLAG;
+
+            /* Subdirectories cannot contain data. */
+            if ((buf_size) || (uncomp_size))
+                return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
+        }
+
+        /* Try to do any allocations before writing to the archive, so if an allocation fails the file remains unmodified. (A good idea if we're doing an in-place modification.) */
+        if ((!mz_zip_array_ensure_room(pZip, &pState->m_central_dir, MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + archive_name_size + comment_size + (pState->m_zip64 ? MZ_ZIP64_MAX_CENTRAL_EXTRA_FIELD_SIZE : 0))) || (!mz_zip_array_ensure_room(pZip, &pState->m_central_dir_offsets, 1)))
+            return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
+
+        if ((!store_data_uncompressed) && (buf_size))
+        {
+            if (NULL == (pComp = (tdefl_compressor *)pZip->m_pAlloc(pZip->m_pAlloc_opaque, 1, sizeof(tdefl_compressor))))
+                return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
+        }
+
+        if (!mz_zip_writer_write_zeros(pZip, cur_archive_file_ofs, num_alignment_padding_bytes))
+        {
+            pZip->m_pFree(pZip->m_pAlloc_opaque, pComp);
+            return MZ_FALSE;
+        }
+
+        local_dir_header_ofs += num_alignment_padding_bytes;
+        if (pZip->m_file_offset_alignment)
+        {
+            MZ_ASSERT((local_dir_header_ofs & (pZip->m_file_offset_alignment - 1)) == 0);
+        }
+        cur_archive_file_ofs += num_alignment_padding_bytes;
+
+        MZ_CLEAR_ARR(local_dir_header);
+
+        if (!store_data_uncompressed || (level_and_flags & MZ_ZIP_FLAG_COMPRESSED_DATA))
+        {
+            method = MZ_DEFLATED;
+        }
+
+        if (pState->m_zip64)
+        {
+            if (uncomp_size >= MZ_UINT32_MAX || local_dir_header_ofs >= MZ_UINT32_MAX)
+            {
+                pExtra_data = extra_data;
+                extra_size = mz_zip_writer_create_zip64_extra_data(extra_data, (uncomp_size >= MZ_UINT32_MAX) ? &uncomp_size : NULL,
+                                                                   (uncomp_size >= MZ_UINT32_MAX) ? &comp_size : NULL, (local_dir_header_ofs >= MZ_UINT32_MAX) ? &local_dir_header_ofs : NULL);
+            }
+
+            if (!mz_zip_writer_create_local_dir_header(pZip, local_dir_header, (mz_uint16)archive_name_size, (mz_uint16)(extra_size + user_extra_data_len), 0, 0, 0, method, bit_flags, dos_time, dos_date))
+                return mz_zip_set_error(pZip, MZ_ZIP_INTERNAL_ERROR);
+
+            if (pZip->m_pWrite(pZip->m_pIO_opaque, local_dir_header_ofs, local_dir_header, sizeof(local_dir_header)) != sizeof(local_dir_header))
+                return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
+
+            cur_archive_file_ofs += sizeof(local_dir_header);
+
+            if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_file_ofs, pArchive_name, archive_name_size) != archive_name_size)
+            {
+                pZip->m_pFree(pZip->m_pAlloc_opaque, pComp);
+                return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
+            }
+            cur_archive_file_ofs += archive_name_size;
+
+            if (pExtra_data != NULL)
+            {
+                if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_file_ofs, extra_data, extra_size) != extra_size)
+                    return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
+
+                cur_archive_file_ofs += extra_size;
+            }
+        }
+        else
+        {
+            if ((comp_size > MZ_UINT32_MAX) || (cur_archive_file_ofs > MZ_UINT32_MAX))
+                return mz_zip_set_error(pZip, MZ_ZIP_ARCHIVE_TOO_LARGE);
+            if (!mz_zip_writer_create_local_dir_header(pZip, local_dir_header, (mz_uint16)archive_name_size, (mz_uint16)user_extra_data_len, 0, 0, 0, method, bit_flags, dos_time, dos_date))
+                return mz_zip_set_error(pZip, MZ_ZIP_INTERNAL_ERROR);
+
+            if (pZip->m_pWrite(pZip->m_pIO_opaque, local_dir_header_ofs, local_dir_header, sizeof(local_dir_header)) != sizeof(local_dir_header))
+                return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
+
+            cur_archive_file_ofs += sizeof(local_dir_header);
+
+            if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_file_ofs, pArchive_name, archive_name_size) != archive_name_size)
+            {
+                pZip->m_pFree(pZip->m_pAlloc_opaque, pComp);
+                return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
+            }
+            cur_archive_file_ofs += archive_name_size;
+        }
+
+        if (user_extra_data_len > 0)
+        {
+            if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_file_ofs, user_extra_data, user_extra_data_len) != user_extra_data_len)
+                return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
+
+            cur_archive_file_ofs += user_extra_data_len;
+        }
+
+        if (store_data_uncompressed)
+        {
+            if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_file_ofs, pBuf, buf_size) != buf_size)
+            {
+                pZip->m_pFree(pZip->m_pAlloc_opaque, pComp);
+                return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
+            }
+
+            cur_archive_file_ofs += buf_size;
+            comp_size = buf_size;
+        }
+        else if (buf_size)
+        {
+            mz_zip_writer_add_state state;
+
+            state.m_pZip = pZip;
+            state.m_cur_archive_file_ofs = cur_archive_file_ofs;
+            state.m_comp_size = 0;
+
+            if ((tdefl_init(pComp, mz_zip_writer_add_put_buf_callback, &state, tdefl_create_comp_flags_from_zip_params(level, -15, MZ_DEFAULT_STRATEGY)) != TDEFL_STATUS_OKAY) ||
+                (tdefl_compress_buffer(pComp, pBuf, buf_size, TDEFL_FINISH) != TDEFL_STATUS_DONE))
+            {
+                pZip->m_pFree(pZip->m_pAlloc_opaque, pComp);
+                return mz_zip_set_error(pZip, MZ_ZIP_COMPRESSION_FAILED);
+            }
+
+            comp_size = state.m_comp_size;
+            cur_archive_file_ofs = state.m_cur_archive_file_ofs;
+        }
+
+        pZip->m_pFree(pZip->m_pAlloc_opaque, pComp);
+        pComp = NULL;
+
+        if (uncomp_size)
+        {
+            mz_uint8 local_dir_footer[MZ_ZIP_DATA_DESCRIPTER_SIZE64];
+            mz_uint32 local_dir_footer_size = MZ_ZIP_DATA_DESCRIPTER_SIZE32;
+
+            MZ_ASSERT(bit_flags & MZ_ZIP_LDH_BIT_FLAG_HAS_LOCATOR);
+
+            MZ_WRITE_LE32(local_dir_footer + 0, MZ_ZIP_DATA_DESCRIPTOR_ID);
+            MZ_WRITE_LE32(local_dir_footer + 4, uncomp_crc32);
+            if (pExtra_data == NULL)
+            {
+                if (comp_size > MZ_UINT32_MAX)
+                    return mz_zip_set_error(pZip, MZ_ZIP_ARCHIVE_TOO_LARGE);
+
+                MZ_WRITE_LE32(local_dir_footer + 8, comp_size);
+                MZ_WRITE_LE32(local_dir_footer + 12, uncomp_size);
+            }
+            else
+            {
+                MZ_WRITE_LE64(local_dir_footer + 8, comp_size);
+                MZ_WRITE_LE64(local_dir_footer + 16, uncomp_size);
+                local_dir_footer_size = MZ_ZIP_DATA_DESCRIPTER_SIZE64;
+            }
+
+            if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_file_ofs, local_dir_footer, local_dir_footer_size) != local_dir_footer_size)
+                return MZ_FALSE;
+
+            cur_archive_file_ofs += local_dir_footer_size;
+        }
+
+        if (pExtra_data != NULL)
+        {
+            extra_size = mz_zip_writer_create_zip64_extra_data(extra_data, (uncomp_size >= MZ_UINT32_MAX) ? &uncomp_size : NULL,
+                                                               (uncomp_size >= MZ_UINT32_MAX) ? &comp_size : NULL, (local_dir_header_ofs >= MZ_UINT32_MAX) ? &local_dir_header_ofs : NULL);
+        }
+
+        if (!mz_zip_writer_add_to_central_dir(pZip, pArchive_name, (mz_uint16)archive_name_size, pExtra_data, (mz_uint16)extra_size, pComment,
+                                              comment_size, uncomp_size, comp_size, uncomp_crc32, method, bit_flags, dos_time, dos_date, local_dir_header_ofs, ext_attributes,
+                                              user_extra_data_central, user_extra_data_central_len))
+            return MZ_FALSE;
+
+        pZip->m_total_files++;
+        pZip->m_archive_size = cur_archive_file_ofs;
+
+        return MZ_TRUE;
+    }
+
+    mz_bool mz_zip_writer_add_read_buf_callback(mz_zip_archive *pZip, const char *pArchive_name, mz_file_read_func read_callback, void *callback_opaque, mz_uint64 max_size, const MZ_TIME_T *pFile_time, const void *pComment, mz_uint16 comment_size, mz_uint level_and_flags,
+                                                const char *user_extra_data, mz_uint user_extra_data_len, const char *user_extra_data_central, mz_uint user_extra_data_central_len)
+    {
+        mz_uint16 gen_flags;
+        mz_uint uncomp_crc32 = MZ_CRC32_INIT, level, num_alignment_padding_bytes;
+        mz_uint16 method = 0, dos_time = 0, dos_date = 0, ext_attributes = 0;
+        mz_uint64 local_dir_header_ofs, cur_archive_file_ofs = pZip->m_archive_size, uncomp_size = 0, comp_size = 0;
+        size_t archive_name_size;
+        mz_uint8 local_dir_header[MZ_ZIP_LOCAL_DIR_HEADER_SIZE];
+        mz_uint8 *pExtra_data = NULL;
+        mz_uint32 extra_size = 0;
+        mz_uint8 extra_data[MZ_ZIP64_MAX_CENTRAL_EXTRA_FIELD_SIZE];
+        mz_zip_internal_state *pState;
+        mz_uint64 file_ofs = 0, cur_archive_header_file_ofs;
+
+        if ((int)level_and_flags < 0)
+            level_and_flags = MZ_DEFAULT_LEVEL;
+        level = level_and_flags & 0xF;
+
+        gen_flags = (level_and_flags & MZ_ZIP_FLAG_WRITE_HEADER_SET_SIZE) ? 0 : MZ_ZIP_LDH_BIT_FLAG_HAS_LOCATOR;
+
+        if (!(level_and_flags & MZ_ZIP_FLAG_ASCII_FILENAME))
+            gen_flags |= MZ_ZIP_GENERAL_PURPOSE_BIT_FLAG_UTF8;
+
+        /* Sanity checks */
+        if ((!pZip) || (!pZip->m_pState) || (pZip->m_zip_mode != MZ_ZIP_MODE_WRITING) || (!pArchive_name) || ((comment_size) && (!pComment)) || (level > MZ_UBER_COMPRESSION))
+            return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
+
+        pState = pZip->m_pState;
+
+        if ((!pState->m_zip64) && (max_size > MZ_UINT32_MAX))
+        {
+            /* Source file is too large for non-zip64 */
+            /*return mz_zip_set_error(pZip, MZ_ZIP_ARCHIVE_TOO_LARGE); */
+            pState->m_zip64 = MZ_TRUE;
+        }
+
+        /* We could support this, but why? */
+        if (level_and_flags & MZ_ZIP_FLAG_COMPRESSED_DATA)
+            return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
+
+        if (!mz_zip_writer_validate_archive_name(pArchive_name))
+            return mz_zip_set_error(pZip, MZ_ZIP_INVALID_FILENAME);
+
+        if (pState->m_zip64)
+        {
+            if (pZip->m_total_files == MZ_UINT32_MAX)
+                return mz_zip_set_error(pZip, MZ_ZIP_TOO_MANY_FILES);
+        }
+        else
+        {
+            if (pZip->m_total_files == MZ_UINT16_MAX)
+            {
+                pState->m_zip64 = MZ_TRUE;
+                /*return mz_zip_set_error(pZip, MZ_ZIP_TOO_MANY_FILES); */
+            }
+        }
+
+        archive_name_size = strlen(pArchive_name);
+        if (archive_name_size > MZ_UINT16_MAX)
+            return mz_zip_set_error(pZip, MZ_ZIP_INVALID_FILENAME);
+
+        num_alignment_padding_bytes = mz_zip_writer_compute_padding_needed_for_file_alignment(pZip);
+
+        /* miniz doesn't support central dirs >= MZ_UINT32_MAX bytes yet */
+        if (((mz_uint64)pState->m_central_dir.m_size + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + archive_name_size + MZ_ZIP64_MAX_CENTRAL_EXTRA_FIELD_SIZE + comment_size) >= MZ_UINT32_MAX)
+            return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_CDIR_SIZE);
+
+        if (!pState->m_zip64)
+        {
+            /* Bail early if the archive would obviously become too large */
+            if ((pZip->m_archive_size + num_alignment_padding_bytes + MZ_ZIP_LOCAL_DIR_HEADER_SIZE + archive_name_size + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + archive_name_size + comment_size + user_extra_data_len + pState->m_central_dir.m_size + MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE + 1024 + MZ_ZIP_DATA_DESCRIPTER_SIZE32 + user_extra_data_central_len) > 0xFFFFFFFF)
+            {
+                pState->m_zip64 = MZ_TRUE;
+                /*return mz_zip_set_error(pZip, MZ_ZIP_ARCHIVE_TOO_LARGE); */
+            }
+        }
+
+#ifndef MINIZ_NO_TIME
+        if (pFile_time)
+        {
+            mz_zip_time_t_to_dos_time(*pFile_time, &dos_time, &dos_date);
+        }
+#else
+        (void)pFile_time;
+#endif
+
+        if (max_size <= 3)
+            level = 0;
+
+        if (!mz_zip_writer_write_zeros(pZip, cur_archive_file_ofs, num_alignment_padding_bytes))
+        {
+            return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
+        }
+
+        cur_archive_file_ofs += num_alignment_padding_bytes;
+        local_dir_header_ofs = cur_archive_file_ofs;
+
+        if (pZip->m_file_offset_alignment)
+        {
+            MZ_ASSERT((cur_archive_file_ofs & (pZip->m_file_offset_alignment - 1)) == 0);
+        }
+
+        if (max_size && level)
+        {
+            method = MZ_DEFLATED;
+        }
+
+        MZ_CLEAR_ARR(local_dir_header);
+        if (pState->m_zip64)
+        {
+            if (max_size >= MZ_UINT32_MAX || local_dir_header_ofs >= MZ_UINT32_MAX)
+            {
+                pExtra_data = extra_data;
+                if (level_and_flags & MZ_ZIP_FLAG_WRITE_HEADER_SET_SIZE)
+                    extra_size = mz_zip_writer_create_zip64_extra_data(extra_data, (max_size >= MZ_UINT32_MAX) ? &uncomp_size : NULL,
+                                                                       (max_size >= MZ_UINT32_MAX) ? &comp_size : NULL,
+                                                                       (local_dir_header_ofs >= MZ_UINT32_MAX) ? &local_dir_header_ofs : NULL);
+                else
+                    extra_size = mz_zip_writer_create_zip64_extra_data(extra_data, NULL,
+                                                                       NULL,
+                                                                       (local_dir_header_ofs >= MZ_UINT32_MAX) ? &local_dir_header_ofs : NULL);
+            }
+
+            if (!mz_zip_writer_create_local_dir_header(pZip, local_dir_header, (mz_uint16)archive_name_size, (mz_uint16)(extra_size + user_extra_data_len), 0, 0, 0, method, gen_flags, dos_time, dos_date))
+                return mz_zip_set_error(pZip, MZ_ZIP_INTERNAL_ERROR);
+
+            if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_file_ofs, local_dir_header, sizeof(local_dir_header)) != sizeof(local_dir_header))
+                return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
+
+            cur_archive_file_ofs += sizeof(local_dir_header);
+
+            if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_file_ofs, pArchive_name, archive_name_size) != archive_name_size)
+            {
+                return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
+            }
+
+            cur_archive_file_ofs += archive_name_size;
+
+            if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_file_ofs, extra_data, extra_size) != extra_size)
+                return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
+
+            cur_archive_file_ofs += extra_size;
+        }
+        else
+        {
+            if ((comp_size > MZ_UINT32_MAX) || (cur_archive_file_ofs > MZ_UINT32_MAX))
+                return mz_zip_set_error(pZip, MZ_ZIP_ARCHIVE_TOO_LARGE);
+            if (!mz_zip_writer_create_local_dir_header(pZip, local_dir_header, (mz_uint16)archive_name_size, (mz_uint16)user_extra_data_len, 0, 0, 0, method, gen_flags, dos_time, dos_date))
+                return mz_zip_set_error(pZip, MZ_ZIP_INTERNAL_ERROR);
+
+            if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_file_ofs, local_dir_header, sizeof(local_dir_header)) != sizeof(local_dir_header))
+                return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
+
+            cur_archive_file_ofs += sizeof(local_dir_header);
+
+            if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_file_ofs, pArchive_name, archive_name_size) != archive_name_size)
+            {
+                return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
+            }
+
+            cur_archive_file_ofs += archive_name_size;
+        }
+
+        if (user_extra_data_len > 0)
+        {
+            if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_file_ofs, user_extra_data, user_extra_data_len) != user_extra_data_len)
+                return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
+
+            cur_archive_file_ofs += user_extra_data_len;
+        }
+
+        if (max_size)
+        {
+            void *pRead_buf = pZip->m_pAlloc(pZip->m_pAlloc_opaque, 1, MZ_ZIP_MAX_IO_BUF_SIZE);
+            if (!pRead_buf)
+            {
+                return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
+            }
+
+            if (!level)
+            {
+                while (1)
+                {
+                    size_t n = read_callback(callback_opaque, file_ofs, pRead_buf, MZ_ZIP_MAX_IO_BUF_SIZE);
+                    if (n == 0)
+                        break;
+
+                    if ((n > MZ_ZIP_MAX_IO_BUF_SIZE) || (file_ofs + n > max_size))
+                    {
+                        pZip->m_pFree(pZip->m_pAlloc_opaque, pRead_buf);
+                        return mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED);
+                    }
+                    if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_file_ofs, pRead_buf, n) != n)
+                    {
+                        pZip->m_pFree(pZip->m_pAlloc_opaque, pRead_buf);
+                        return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
+                    }
+                    file_ofs += n;
+                    uncomp_crc32 = (mz_uint32)mz_crc32(uncomp_crc32, (const mz_uint8 *)pRead_buf, n);
+                    cur_archive_file_ofs += n;
+                }
+                uncomp_size = file_ofs;
+                comp_size = uncomp_size;
+            }
+            else
+            {
+                mz_bool result = MZ_FALSE;
+                mz_zip_writer_add_state state;
+                tdefl_compressor *pComp = (tdefl_compressor *)pZip->m_pAlloc(pZip->m_pAlloc_opaque, 1, sizeof(tdefl_compressor));
+                if (!pComp)
+                {
+                    pZip->m_pFree(pZip->m_pAlloc_opaque, pRead_buf);
+                    return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
+                }
+
+                state.m_pZip = pZip;
+                state.m_cur_archive_file_ofs = cur_archive_file_ofs;
+                state.m_comp_size = 0;
+
+                if (tdefl_init(pComp, mz_zip_writer_add_put_buf_callback, &state, tdefl_create_comp_flags_from_zip_params(level, -15, MZ_DEFAULT_STRATEGY)) != TDEFL_STATUS_OKAY)
+                {
+                    pZip->m_pFree(pZip->m_pAlloc_opaque, pComp);
+                    pZip->m_pFree(pZip->m_pAlloc_opaque, pRead_buf);
+                    return mz_zip_set_error(pZip, MZ_ZIP_INTERNAL_ERROR);
+                }
+
+                for (;;)
+                {
+                    tdefl_status status;
+                    tdefl_flush flush = TDEFL_NO_FLUSH;
+
+                    size_t n = read_callback(callback_opaque, file_ofs, pRead_buf, MZ_ZIP_MAX_IO_BUF_SIZE);
+                    if ((n > MZ_ZIP_MAX_IO_BUF_SIZE) || (file_ofs + n > max_size))
+                    {
+                        mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED);
+                        break;
+                    }
+
+                    file_ofs += n;
+                    uncomp_crc32 = (mz_uint32)mz_crc32(uncomp_crc32, (const mz_uint8 *)pRead_buf, n);
+
+                    if (pZip->m_pNeeds_keepalive != NULL && pZip->m_pNeeds_keepalive(pZip->m_pIO_opaque))
+                        flush = TDEFL_FULL_FLUSH;
+
+                    if (n == 0)
+                        flush = TDEFL_FINISH;
+
+                    status = tdefl_compress_buffer(pComp, pRead_buf, n, flush);
+                    if (status == TDEFL_STATUS_DONE)
+                    {
+                        result = MZ_TRUE;
+                        break;
+                    }
+                    else if (status != TDEFL_STATUS_OKAY)
+                    {
+                        mz_zip_set_error(pZip, MZ_ZIP_COMPRESSION_FAILED);
+                        break;
+                    }
+                }
+
+                pZip->m_pFree(pZip->m_pAlloc_opaque, pComp);
+
+                if (!result)
+                {
+                    pZip->m_pFree(pZip->m_pAlloc_opaque, pRead_buf);
+                    return MZ_FALSE;
+                }
+
+                uncomp_size = file_ofs;
+                comp_size = state.m_comp_size;
+                cur_archive_file_ofs = state.m_cur_archive_file_ofs;
+            }
+
+            pZip->m_pFree(pZip->m_pAlloc_opaque, pRead_buf);
+        }
+
+        if (!(level_and_flags & MZ_ZIP_FLAG_WRITE_HEADER_SET_SIZE))
+        {
+            mz_uint8 local_dir_footer[MZ_ZIP_DATA_DESCRIPTER_SIZE64];
+            mz_uint32 local_dir_footer_size = MZ_ZIP_DATA_DESCRIPTER_SIZE32;
+
+            MZ_WRITE_LE32(local_dir_footer + 0, MZ_ZIP_DATA_DESCRIPTOR_ID);
+            MZ_WRITE_LE32(local_dir_footer + 4, uncomp_crc32);
+            if (pExtra_data == NULL)
+            {
+                if (comp_size > MZ_UINT32_MAX)
+                    return mz_zip_set_error(pZip, MZ_ZIP_ARCHIVE_TOO_LARGE);
+
+                MZ_WRITE_LE32(local_dir_footer + 8, comp_size);
+                MZ_WRITE_LE32(local_dir_footer + 12, uncomp_size);
+            }
+            else
+            {
+                MZ_WRITE_LE64(local_dir_footer + 8, comp_size);
+                MZ_WRITE_LE64(local_dir_footer + 16, uncomp_size);
+                local_dir_footer_size = MZ_ZIP_DATA_DESCRIPTER_SIZE64;
+            }
+
+            if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_file_ofs, local_dir_footer, local_dir_footer_size) != local_dir_footer_size)
+                return MZ_FALSE;
+
+            cur_archive_file_ofs += local_dir_footer_size;
+        }
+
+        if (level_and_flags & MZ_ZIP_FLAG_WRITE_HEADER_SET_SIZE)
+        {
+            if (pExtra_data != NULL)
+            {
+                extra_size = mz_zip_writer_create_zip64_extra_data(extra_data, (max_size >= MZ_UINT32_MAX) ? &uncomp_size : NULL,
+                                                                   (max_size >= MZ_UINT32_MAX) ? &comp_size : NULL, (local_dir_header_ofs >= MZ_UINT32_MAX) ? &local_dir_header_ofs : NULL);
+            }
+
+            if (!mz_zip_writer_create_local_dir_header(pZip, local_dir_header,
+                                                       (mz_uint16)archive_name_size, (mz_uint16)(extra_size + user_extra_data_len),
+                                                       (max_size >= MZ_UINT32_MAX) ? MZ_UINT32_MAX : uncomp_size,
+                                                       (max_size >= MZ_UINT32_MAX) ? MZ_UINT32_MAX : comp_size,
+                                                       uncomp_crc32, method, gen_flags, dos_time, dos_date))
+                return mz_zip_set_error(pZip, MZ_ZIP_INTERNAL_ERROR);
+
+            cur_archive_header_file_ofs = local_dir_header_ofs;
+
+            if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_header_file_ofs, local_dir_header, sizeof(local_dir_header)) != sizeof(local_dir_header))
+                return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
+
+            if (pExtra_data != NULL)
+            {
+                cur_archive_header_file_ofs += sizeof(local_dir_header);
+
+                if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_header_file_ofs, pArchive_name, archive_name_size) != archive_name_size)
+                {
+                    return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
+                }
+
+                cur_archive_header_file_ofs += archive_name_size;
+
+                if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_header_file_ofs, extra_data, extra_size) != extra_size)
+                    return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
+
+                cur_archive_header_file_ofs += extra_size;
+            }
+        }
+
+        if (pExtra_data != NULL)
+        {
+            extra_size = mz_zip_writer_create_zip64_extra_data(extra_data, (uncomp_size >= MZ_UINT32_MAX) ? &uncomp_size : NULL,
+                                                               (uncomp_size >= MZ_UINT32_MAX) ? &comp_size : NULL, (local_dir_header_ofs >= MZ_UINT32_MAX) ? &local_dir_header_ofs : NULL);
+        }
+
+        if (!mz_zip_writer_add_to_central_dir(pZip, pArchive_name, (mz_uint16)archive_name_size, pExtra_data, (mz_uint16)extra_size, pComment, comment_size,
+                                              uncomp_size, comp_size, uncomp_crc32, method, gen_flags, dos_time, dos_date, local_dir_header_ofs, ext_attributes,
+                                              user_extra_data_central, user_extra_data_central_len))
+            return MZ_FALSE;
+
+        pZip->m_total_files++;
+        pZip->m_archive_size = cur_archive_file_ofs;
+
+        return MZ_TRUE;
+    }
+
+#ifndef MINIZ_NO_STDIO
+
+    static size_t mz_file_read_func_stdio(void *pOpaque, mz_uint64 file_ofs, void *pBuf, size_t n)
+    {
+        MZ_FILE *pSrc_file = (MZ_FILE *)pOpaque;
+        mz_int64 cur_ofs = MZ_FTELL64(pSrc_file);
+
+        if (((mz_int64)file_ofs < 0) || (((cur_ofs != (mz_int64)file_ofs)) && (MZ_FSEEK64(pSrc_file, (mz_int64)file_ofs, SEEK_SET))))
+            return 0;
+
+        return MZ_FREAD(pBuf, 1, n, pSrc_file);
+    }
+
+    mz_bool mz_zip_writer_add_cfile(mz_zip_archive *pZip, const char *pArchive_name, MZ_FILE *pSrc_file, mz_uint64 max_size, const MZ_TIME_T *pFile_time, const void *pComment, mz_uint16 comment_size, mz_uint level_and_flags,
+                                    const char *user_extra_data, mz_uint user_extra_data_len, const char *user_extra_data_central, mz_uint user_extra_data_central_len)
+    {
+        return mz_zip_writer_add_read_buf_callback(pZip, pArchive_name, mz_file_read_func_stdio, pSrc_file, max_size, pFile_time, pComment, comment_size, level_and_flags,
+                                                   user_extra_data, user_extra_data_len, user_extra_data_central, user_extra_data_central_len);
+    }
+
+    mz_bool mz_zip_writer_add_file(mz_zip_archive *pZip, const char *pArchive_name, const char *pSrc_filename, const void *pComment, mz_uint16 comment_size, mz_uint level_and_flags)
+    {
+        MZ_FILE *pSrc_file = NULL;
+        mz_uint64 uncomp_size = 0;
+        MZ_TIME_T file_modified_time;
+        MZ_TIME_T *pFile_time = NULL;
+        mz_bool status;
+
+        memset(&file_modified_time, 0, sizeof(file_modified_time));
+
+#if !defined(MINIZ_NO_TIME) && !defined(MINIZ_NO_STDIO)
+        pFile_time = &file_modified_time;
+        if (!mz_zip_get_file_modified_time(pSrc_filename, &file_modified_time))
+            return mz_zip_set_error(pZip, MZ_ZIP_FILE_STAT_FAILED);
+#endif
+
+        pSrc_file = MZ_FOPEN(pSrc_filename, "rb");
+        if (!pSrc_file)
+            return mz_zip_set_error(pZip, MZ_ZIP_FILE_OPEN_FAILED);
+
+        MZ_FSEEK64(pSrc_file, 0, SEEK_END);
+        uncomp_size = MZ_FTELL64(pSrc_file);
+        MZ_FSEEK64(pSrc_file, 0, SEEK_SET);
+
+        status = mz_zip_writer_add_cfile(pZip, pArchive_name, pSrc_file, uncomp_size, pFile_time, pComment, comment_size, level_and_flags, NULL, 0, NULL, 0);
+
+        MZ_FCLOSE(pSrc_file);
+
+        return status;
+    }
+#endif /* #ifndef MINIZ_NO_STDIO */
+
+    static mz_bool mz_zip_writer_update_zip64_extension_block(mz_zip_array *pNew_ext, mz_zip_archive *pZip, const mz_uint8 *pExt, mz_uint32 ext_len, mz_uint64 *pComp_size, mz_uint64 *pUncomp_size, mz_uint64 *pLocal_header_ofs, mz_uint32 *pDisk_start)
+    {
+        /* + 64 should be enough for any new zip64 data */
+        if (!mz_zip_array_reserve(pZip, pNew_ext, ext_len + 64, MZ_FALSE))
+            return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
+
+        mz_zip_array_resize(pZip, pNew_ext, 0, MZ_FALSE);
+
+        if ((pUncomp_size) || (pComp_size) || (pLocal_header_ofs) || (pDisk_start))
+        {
+            mz_uint8 new_ext_block[64];
+            mz_uint8 *pDst = new_ext_block;
+            mz_write_le16(pDst, MZ_ZIP64_EXTENDED_INFORMATION_FIELD_HEADER_ID);
+            mz_write_le16(pDst + sizeof(mz_uint16), 0);
+            pDst += sizeof(mz_uint16) * 2;
+
+            if (pUncomp_size)
+            {
+                mz_write_le64(pDst, *pUncomp_size);
+                pDst += sizeof(mz_uint64);
+            }
+
+            if (pComp_size)
+            {
+                mz_write_le64(pDst, *pComp_size);
+                pDst += sizeof(mz_uint64);
+            }
+
+            if (pLocal_header_ofs)
+            {
+                mz_write_le64(pDst, *pLocal_header_ofs);
+                pDst += sizeof(mz_uint64);
+            }
+
+            if (pDisk_start)
+            {
+                mz_write_le32(pDst, *pDisk_start);
+                pDst += sizeof(mz_uint32);
+            }
+
+            mz_write_le16(new_ext_block + sizeof(mz_uint16), (mz_uint16)((pDst - new_ext_block) - sizeof(mz_uint16) * 2));
+
+            if (!mz_zip_array_push_back(pZip, pNew_ext, new_ext_block, pDst - new_ext_block))
+                return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
+        }
+
+        if ((pExt) && (ext_len))
+        {
+            mz_uint32 extra_size_remaining = ext_len;
+            const mz_uint8 *pExtra_data = pExt;
+
+            do
+            {
+                mz_uint32 field_id, field_data_size, field_total_size;
+
+                if (extra_size_remaining < (sizeof(mz_uint16) * 2))
+                    return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
+
+                field_id = MZ_READ_LE16(pExtra_data);
+                field_data_size = MZ_READ_LE16(pExtra_data + sizeof(mz_uint16));
+                field_total_size = field_data_size + sizeof(mz_uint16) * 2;
+
+                if (field_total_size > extra_size_remaining)
+                    return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
+
+                if (field_id != MZ_ZIP64_EXTENDED_INFORMATION_FIELD_HEADER_ID)
+                {
+                    if (!mz_zip_array_push_back(pZip, pNew_ext, pExtra_data, field_total_size))
+                        return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
+                }
+
+                pExtra_data += field_total_size;
+                extra_size_remaining -= field_total_size;
+            } while (extra_size_remaining);
+        }
+
+        return MZ_TRUE;
+    }
+
+    /* TODO: This func is now pretty freakin complex due to zip64, split it up? */
+    mz_bool mz_zip_writer_add_from_zip_reader(mz_zip_archive *pZip, mz_zip_archive *pSource_zip, mz_uint src_file_index)
+    {
+        mz_uint n, bit_flags, num_alignment_padding_bytes, src_central_dir_following_data_size;
+        mz_uint64 src_archive_bytes_remaining, local_dir_header_ofs;
+        mz_uint64 cur_src_file_ofs, cur_dst_file_ofs;
+        mz_uint32 local_header_u32[(MZ_ZIP_LOCAL_DIR_HEADER_SIZE + sizeof(mz_uint32) - 1) / sizeof(mz_uint32)];
+        mz_uint8 *pLocal_header = (mz_uint8 *)local_header_u32;
+        mz_uint8 new_central_header[MZ_ZIP_CENTRAL_DIR_HEADER_SIZE];
+        size_t orig_central_dir_size;
+        mz_zip_internal_state *pState;
+        void *pBuf;
+        const mz_uint8 *pSrc_central_header;
+        mz_zip_archive_file_stat src_file_stat;
+        mz_uint32 src_filename_len, src_comment_len, src_ext_len;
+        mz_uint32 local_header_filename_size, local_header_extra_len;
+        mz_uint64 local_header_comp_size, local_header_uncomp_size;
+        mz_bool found_zip64_ext_data_in_ldir = MZ_FALSE;
+
+        /* Sanity checks */
+        if ((!pZip) || (!pZip->m_pState) || (pZip->m_zip_mode != MZ_ZIP_MODE_WRITING) || (!pSource_zip->m_pRead))
+            return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
+
+        pState = pZip->m_pState;
+
+        /* Don't support copying files from zip64 archives to non-zip64, even though in some cases this is possible */
+        if ((pSource_zip->m_pState->m_zip64) && (!pZip->m_pState->m_zip64))
+            return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
+
+        /* Get pointer to the source central dir header and crack it */
+        if (NULL == (pSrc_central_header = mz_zip_get_cdh(pSource_zip, src_file_index)))
+            return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
+
+        if (MZ_READ_LE32(pSrc_central_header + MZ_ZIP_CDH_SIG_OFS) != MZ_ZIP_CENTRAL_DIR_HEADER_SIG)
+            return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
+
+        src_filename_len = MZ_READ_LE16(pSrc_central_header + MZ_ZIP_CDH_FILENAME_LEN_OFS);
+        src_comment_len = MZ_READ_LE16(pSrc_central_header + MZ_ZIP_CDH_COMMENT_LEN_OFS);
+        src_ext_len = MZ_READ_LE16(pSrc_central_header + MZ_ZIP_CDH_EXTRA_LEN_OFS);
+        src_central_dir_following_data_size = src_filename_len + src_ext_len + src_comment_len;
+
+        /* TODO: We don't support central dir's >= MZ_UINT32_MAX bytes right now (+32 fudge factor in case we need to add more extra data) */
+        if ((pState->m_central_dir.m_size + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + src_central_dir_following_data_size + 32) >= MZ_UINT32_MAX)
+            return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_CDIR_SIZE);
+
+        num_alignment_padding_bytes = mz_zip_writer_compute_padding_needed_for_file_alignment(pZip);
+
+        if (!pState->m_zip64)
+        {
+            if (pZip->m_total_files == MZ_UINT16_MAX)
+                return mz_zip_set_error(pZip, MZ_ZIP_TOO_MANY_FILES);
+        }
+        else
+        {
+            /* TODO: Our zip64 support still has some 32-bit limits that may not be worth fixing. */
+            if (pZip->m_total_files == MZ_UINT32_MAX)
+                return mz_zip_set_error(pZip, MZ_ZIP_TOO_MANY_FILES);
+        }
+
+        if (!mz_zip_file_stat_internal(pSource_zip, src_file_index, pSrc_central_header, &src_file_stat, NULL))
+            return MZ_FALSE;
+
+        cur_src_file_ofs = src_file_stat.m_local_header_ofs;
+        cur_dst_file_ofs = pZip->m_archive_size;
+
+        /* Read the source archive's local dir header */
+        if (pSource_zip->m_pRead(pSource_zip->m_pIO_opaque, cur_src_file_ofs, pLocal_header, MZ_ZIP_LOCAL_DIR_HEADER_SIZE) != MZ_ZIP_LOCAL_DIR_HEADER_SIZE)
+            return mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED);
+
+        if (MZ_READ_LE32(pLocal_header) != MZ_ZIP_LOCAL_DIR_HEADER_SIG)
+            return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
+
+        cur_src_file_ofs += MZ_ZIP_LOCAL_DIR_HEADER_SIZE;
+
+        /* Compute the total size we need to copy (filename+extra data+compressed data) */
+        local_header_filename_size = MZ_READ_LE16(pLocal_header + MZ_ZIP_LDH_FILENAME_LEN_OFS);
+        local_header_extra_len = MZ_READ_LE16(pLocal_header + MZ_ZIP_LDH_EXTRA_LEN_OFS);
+        local_header_comp_size = MZ_READ_LE32(pLocal_header + MZ_ZIP_LDH_COMPRESSED_SIZE_OFS);
+        local_header_uncomp_size = MZ_READ_LE32(pLocal_header + MZ_ZIP_LDH_DECOMPRESSED_SIZE_OFS);
+        src_archive_bytes_remaining = src_file_stat.m_comp_size + local_header_filename_size + local_header_extra_len;
+
+        /* Try to find a zip64 extended information field */
+        if ((local_header_extra_len) && ((local_header_comp_size == MZ_UINT32_MAX) || (local_header_uncomp_size == MZ_UINT32_MAX)))
+        {
+            mz_zip_array file_data_array;
+            const mz_uint8 *pExtra_data;
+            mz_uint32 extra_size_remaining = local_header_extra_len;
+
+            mz_zip_array_init(&file_data_array, 1);
+            if (!mz_zip_array_resize(pZip, &file_data_array, local_header_extra_len, MZ_FALSE))
+            {
+                return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
+            }
+
+            if (pSource_zip->m_pRead(pSource_zip->m_pIO_opaque, src_file_stat.m_local_header_ofs + MZ_ZIP_LOCAL_DIR_HEADER_SIZE + local_header_filename_size, file_data_array.m_p, local_header_extra_len) != local_header_extra_len)
+            {
+                mz_zip_array_clear(pZip, &file_data_array);
+                return mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED);
+            }
+
+            pExtra_data = (const mz_uint8 *)file_data_array.m_p;
+
+            do
+            {
+                mz_uint32 field_id, field_data_size, field_total_size;
+
+                if (extra_size_remaining < (sizeof(mz_uint16) * 2))
+                {
+                    mz_zip_array_clear(pZip, &file_data_array);
+                    return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
+                }
+
+                field_id = MZ_READ_LE16(pExtra_data);
+                field_data_size = MZ_READ_LE16(pExtra_data + sizeof(mz_uint16));
+                field_total_size = field_data_size + sizeof(mz_uint16) * 2;
+
+                if (field_total_size > extra_size_remaining)
+                {
+                    mz_zip_array_clear(pZip, &file_data_array);
+                    return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
+                }
+
+                if (field_id == MZ_ZIP64_EXTENDED_INFORMATION_FIELD_HEADER_ID)
+                {
+                    const mz_uint8 *pSrc_field_data = pExtra_data + sizeof(mz_uint32);
+
+                    if (field_data_size < sizeof(mz_uint64) * 2)
+                    {
+                        mz_zip_array_clear(pZip, &file_data_array);
+                        return mz_zip_set_error(pZip, MZ_ZIP_INVALID_HEADER_OR_CORRUPTED);
+                    }
+
+                    local_header_uncomp_size = MZ_READ_LE64(pSrc_field_data);
+                    local_header_comp_size = MZ_READ_LE64(pSrc_field_data + sizeof(mz_uint64)); /* may be 0 if there's a descriptor */
+
+                    found_zip64_ext_data_in_ldir = MZ_TRUE;
+                    break;
+                }
+
+                pExtra_data += field_total_size;
+                extra_size_remaining -= field_total_size;
+            } while (extra_size_remaining);
+
+            mz_zip_array_clear(pZip, &file_data_array);
+        }
+
+        if (!pState->m_zip64)
+        {
+            /* Try to detect if the new archive will most likely wind up too big and bail early (+(sizeof(mz_uint32) * 4) is for the optional descriptor which could be present, +64 is a fudge factor). */
+            /* We also check when the archive is finalized so this doesn't need to be perfect. */
+            mz_uint64 approx_new_archive_size = cur_dst_file_ofs + num_alignment_padding_bytes + MZ_ZIP_LOCAL_DIR_HEADER_SIZE + src_archive_bytes_remaining + (sizeof(mz_uint32) * 4) +
+                                                pState->m_central_dir.m_size + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + src_central_dir_following_data_size + MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE + 64;
+
+            if (approx_new_archive_size >= MZ_UINT32_MAX)
+                return mz_zip_set_error(pZip, MZ_ZIP_ARCHIVE_TOO_LARGE);
+        }
+
+        /* Write dest archive padding */
+        if (!mz_zip_writer_write_zeros(pZip, cur_dst_file_ofs, num_alignment_padding_bytes))
+            return MZ_FALSE;
+
+        cur_dst_file_ofs += num_alignment_padding_bytes;
+
+        local_dir_header_ofs = cur_dst_file_ofs;
+        if (pZip->m_file_offset_alignment)
+        {
+            MZ_ASSERT((local_dir_header_ofs & (pZip->m_file_offset_alignment - 1)) == 0);
+        }
+
+        /* The original zip's local header+ext block doesn't change, even with zip64, so we can just copy it over to the dest zip */
+        if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_dst_file_ofs, pLocal_header, MZ_ZIP_LOCAL_DIR_HEADER_SIZE) != MZ_ZIP_LOCAL_DIR_HEADER_SIZE)
+            return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
+
+        cur_dst_file_ofs += MZ_ZIP_LOCAL_DIR_HEADER_SIZE;
+
+        /* Copy over the source archive bytes to the dest archive, also ensure we have enough buf space to handle optional data descriptor */
+        if (NULL == (pBuf = pZip->m_pAlloc(pZip->m_pAlloc_opaque, 1, (size_t)MZ_MAX(32U, MZ_MIN((mz_uint64)MZ_ZIP_MAX_IO_BUF_SIZE, src_archive_bytes_remaining)))))
+            return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
+
+        while (src_archive_bytes_remaining)
+        {
+            n = (mz_uint)MZ_MIN((mz_uint64)MZ_ZIP_MAX_IO_BUF_SIZE, src_archive_bytes_remaining);
+            if (pSource_zip->m_pRead(pSource_zip->m_pIO_opaque, cur_src_file_ofs, pBuf, n) != n)
+            {
+                pZip->m_pFree(pZip->m_pAlloc_opaque, pBuf);
+                return mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED);
+            }
+            cur_src_file_ofs += n;
+
+            if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_dst_file_ofs, pBuf, n) != n)
+            {
+                pZip->m_pFree(pZip->m_pAlloc_opaque, pBuf);
+                return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
+            }
+            cur_dst_file_ofs += n;
+
+            src_archive_bytes_remaining -= n;
+        }
+
+        /* Now deal with the optional data descriptor */
+        bit_flags = MZ_READ_LE16(pLocal_header + MZ_ZIP_LDH_BIT_FLAG_OFS);
+        if (bit_flags & 8)
+        {
+            /* Copy data descriptor */
+            if ((pSource_zip->m_pState->m_zip64) || (found_zip64_ext_data_in_ldir))
+            {
+                /* src is zip64, dest must be zip64 */
+
+                /* name			uint32_t's */
+                /* id				1 (optional in zip64?) */
+                /* crc			1 */
+                /* comp_size	2 */
+                /* uncomp_size 2 */
+                if (pSource_zip->m_pRead(pSource_zip->m_pIO_opaque, cur_src_file_ofs, pBuf, (sizeof(mz_uint32) * 6)) != (sizeof(mz_uint32) * 6))
+                {
+                    pZip->m_pFree(pZip->m_pAlloc_opaque, pBuf);
+                    return mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED);
+                }
+
+                n = sizeof(mz_uint32) * ((MZ_READ_LE32(pBuf) == MZ_ZIP_DATA_DESCRIPTOR_ID) ? 6 : 5);
+            }
+            else
+            {
+                /* src is NOT zip64 */
+                mz_bool has_id;
+
+                if (pSource_zip->m_pRead(pSource_zip->m_pIO_opaque, cur_src_file_ofs, pBuf, sizeof(mz_uint32) * 4) != sizeof(mz_uint32) * 4)
+                {
+                    pZip->m_pFree(pZip->m_pAlloc_opaque, pBuf);
+                    return mz_zip_set_error(pZip, MZ_ZIP_FILE_READ_FAILED);
+                }
+
+                has_id = (MZ_READ_LE32(pBuf) == MZ_ZIP_DATA_DESCRIPTOR_ID);
+
+                if (pZip->m_pState->m_zip64)
+                {
+                    /* dest is zip64, so upgrade the data descriptor */
+                    const mz_uint8 *pSrc_descriptor = (const mz_uint8 *)pBuf + (has_id ? sizeof(mz_uint32) : 0);
+                    const mz_uint32 src_crc32 = MZ_READ_LE32(pSrc_descriptor);
+                    const mz_uint64 src_comp_size = MZ_READ_LE32(pSrc_descriptor + sizeof(mz_uint32));
+                    const mz_uint64 src_uncomp_size = MZ_READ_LE32(pSrc_descriptor + 2 * sizeof(mz_uint32));
+
+                    mz_write_le32((mz_uint8 *)pBuf, MZ_ZIP_DATA_DESCRIPTOR_ID);
+                    mz_write_le32((mz_uint8 *)pBuf + sizeof(mz_uint32) * 1, src_crc32);
+                    mz_write_le64((mz_uint8 *)pBuf + sizeof(mz_uint32) * 2, src_comp_size);
+                    mz_write_le64((mz_uint8 *)pBuf + sizeof(mz_uint32) * 4, src_uncomp_size);
+
+                    n = sizeof(mz_uint32) * 6;
+                }
+                else
+                {
+                    /* dest is NOT zip64, just copy it as-is */
+                    n = sizeof(mz_uint32) * (has_id ? 4 : 3);
+                }
+            }
+
+            if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_dst_file_ofs, pBuf, n) != n)
+            {
+                pZip->m_pFree(pZip->m_pAlloc_opaque, pBuf);
+                return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
+            }
+
+            cur_src_file_ofs += n;
+            cur_dst_file_ofs += n;
+        }
+        pZip->m_pFree(pZip->m_pAlloc_opaque, pBuf);
+
+        /* Finally, add the new central dir header */
+        orig_central_dir_size = pState->m_central_dir.m_size;
+
+        memcpy(new_central_header, pSrc_central_header, MZ_ZIP_CENTRAL_DIR_HEADER_SIZE);
+
+        if (pState->m_zip64)
+        {
+            /* This is the painful part: We need to write a new central dir header + ext block with updated zip64 fields, and ensure the old fields (if any) are not included. */
+            const mz_uint8 *pSrc_ext = pSrc_central_header + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + src_filename_len;
+            mz_zip_array new_ext_block;
+
+            mz_zip_array_init(&new_ext_block, sizeof(mz_uint8));
+
+            MZ_WRITE_LE32(new_central_header + MZ_ZIP_CDH_COMPRESSED_SIZE_OFS, MZ_UINT32_MAX);
+            MZ_WRITE_LE32(new_central_header + MZ_ZIP_CDH_DECOMPRESSED_SIZE_OFS, MZ_UINT32_MAX);
+            MZ_WRITE_LE32(new_central_header + MZ_ZIP_CDH_LOCAL_HEADER_OFS, MZ_UINT32_MAX);
+
+            if (!mz_zip_writer_update_zip64_extension_block(&new_ext_block, pZip, pSrc_ext, src_ext_len, &src_file_stat.m_comp_size, &src_file_stat.m_uncomp_size, &local_dir_header_ofs, NULL))
+            {
+                mz_zip_array_clear(pZip, &new_ext_block);
+                return MZ_FALSE;
+            }
+
+            MZ_WRITE_LE16(new_central_header + MZ_ZIP_CDH_EXTRA_LEN_OFS, new_ext_block.m_size);
+
+            if (!mz_zip_array_push_back(pZip, &pState->m_central_dir, new_central_header, MZ_ZIP_CENTRAL_DIR_HEADER_SIZE))
+            {
+                mz_zip_array_clear(pZip, &new_ext_block);
+                return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
+            }
+
+            if (!mz_zip_array_push_back(pZip, &pState->m_central_dir, pSrc_central_header + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE, src_filename_len))
+            {
+                mz_zip_array_clear(pZip, &new_ext_block);
+                mz_zip_array_resize(pZip, &pState->m_central_dir, orig_central_dir_size, MZ_FALSE);
+                return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
+            }
+
+            if (!mz_zip_array_push_back(pZip, &pState->m_central_dir, new_ext_block.m_p, new_ext_block.m_size))
+            {
+                mz_zip_array_clear(pZip, &new_ext_block);
+                mz_zip_array_resize(pZip, &pState->m_central_dir, orig_central_dir_size, MZ_FALSE);
+                return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
+            }
+
+            if (!mz_zip_array_push_back(pZip, &pState->m_central_dir, pSrc_central_header + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + src_filename_len + src_ext_len, src_comment_len))
+            {
+                mz_zip_array_clear(pZip, &new_ext_block);
+                mz_zip_array_resize(pZip, &pState->m_central_dir, orig_central_dir_size, MZ_FALSE);
+                return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
+            }
+
+            mz_zip_array_clear(pZip, &new_ext_block);
+        }
+        else
+        {
+            /* sanity checks */
+            if (cur_dst_file_ofs > MZ_UINT32_MAX)
+                return mz_zip_set_error(pZip, MZ_ZIP_ARCHIVE_TOO_LARGE);
+
+            if (local_dir_header_ofs >= MZ_UINT32_MAX)
+                return mz_zip_set_error(pZip, MZ_ZIP_ARCHIVE_TOO_LARGE);
+
+            MZ_WRITE_LE32(new_central_header + MZ_ZIP_CDH_LOCAL_HEADER_OFS, local_dir_header_ofs);
+
+            if (!mz_zip_array_push_back(pZip, &pState->m_central_dir, new_central_header, MZ_ZIP_CENTRAL_DIR_HEADER_SIZE))
+                return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
+
+            if (!mz_zip_array_push_back(pZip, &pState->m_central_dir, pSrc_central_header + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE, src_central_dir_following_data_size))
+            {
+                mz_zip_array_resize(pZip, &pState->m_central_dir, orig_central_dir_size, MZ_FALSE);
+                return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
+            }
+        }
+
+        /* This shouldn't trigger unless we screwed up during the initial sanity checks */
+        if (pState->m_central_dir.m_size >= MZ_UINT32_MAX)
+        {
+            /* TODO: Support central dirs >= 32-bits in size */
+            mz_zip_array_resize(pZip, &pState->m_central_dir, orig_central_dir_size, MZ_FALSE);
+            return mz_zip_set_error(pZip, MZ_ZIP_UNSUPPORTED_CDIR_SIZE);
+        }
+
+        n = (mz_uint32)orig_central_dir_size;
+        if (!mz_zip_array_push_back(pZip, &pState->m_central_dir_offsets, &n, 1))
+        {
+            mz_zip_array_resize(pZip, &pState->m_central_dir, orig_central_dir_size, MZ_FALSE);
+            return mz_zip_set_error(pZip, MZ_ZIP_ALLOC_FAILED);
+        }
+
+        pZip->m_total_files++;
+        pZip->m_archive_size = cur_dst_file_ofs;
+
+        return MZ_TRUE;
+    }
+
+    mz_bool mz_zip_writer_finalize_archive(mz_zip_archive *pZip)
+    {
+        mz_zip_internal_state *pState;
+        mz_uint64 central_dir_ofs, central_dir_size;
+        mz_uint8 hdr[256];
+
+        if ((!pZip) || (!pZip->m_pState) || (pZip->m_zip_mode != MZ_ZIP_MODE_WRITING))
+            return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
+
+        pState = pZip->m_pState;
+
+        if (pState->m_zip64)
+        {
+            if ((mz_uint64)pState->m_central_dir.m_size >= MZ_UINT32_MAX)
+                return mz_zip_set_error(pZip, MZ_ZIP_TOO_MANY_FILES);
+        }
+        else
+        {
+            if ((pZip->m_total_files > MZ_UINT16_MAX) || ((pZip->m_archive_size + pState->m_central_dir.m_size + MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE) > MZ_UINT32_MAX))
+                return mz_zip_set_error(pZip, MZ_ZIP_TOO_MANY_FILES);
+        }
+
+        central_dir_ofs = 0;
+        central_dir_size = 0;
+        if (pZip->m_total_files)
+        {
+            /* Write central directory */
+            central_dir_ofs = pZip->m_archive_size;
+            central_dir_size = pState->m_central_dir.m_size;
+            pZip->m_central_directory_file_ofs = central_dir_ofs;
+            if (pZip->m_pWrite(pZip->m_pIO_opaque, central_dir_ofs, pState->m_central_dir.m_p, (size_t)central_dir_size) != central_dir_size)
+                return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
+
+            pZip->m_archive_size += central_dir_size;
+        }
+
+        if (pState->m_zip64)
+        {
+            /* Write zip64 end of central directory header */
+            mz_uint64 rel_ofs_to_zip64_ecdr = pZip->m_archive_size;
+
+            MZ_CLEAR_ARR(hdr);
+            MZ_WRITE_LE32(hdr + MZ_ZIP64_ECDH_SIG_OFS, MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIG);
+            MZ_WRITE_LE64(hdr + MZ_ZIP64_ECDH_SIZE_OF_RECORD_OFS, MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIZE - sizeof(mz_uint32) - sizeof(mz_uint64));
+            MZ_WRITE_LE16(hdr + MZ_ZIP64_ECDH_VERSION_MADE_BY_OFS, 0x031E); /* TODO: always Unix */
+            MZ_WRITE_LE16(hdr + MZ_ZIP64_ECDH_VERSION_NEEDED_OFS, 0x002D);
+            MZ_WRITE_LE64(hdr + MZ_ZIP64_ECDH_CDIR_NUM_ENTRIES_ON_DISK_OFS, pZip->m_total_files);
+            MZ_WRITE_LE64(hdr + MZ_ZIP64_ECDH_CDIR_TOTAL_ENTRIES_OFS, pZip->m_total_files);
+            MZ_WRITE_LE64(hdr + MZ_ZIP64_ECDH_CDIR_SIZE_OFS, central_dir_size);
+            MZ_WRITE_LE64(hdr + MZ_ZIP64_ECDH_CDIR_OFS_OFS, central_dir_ofs);
+            if (pZip->m_pWrite(pZip->m_pIO_opaque, pZip->m_archive_size, hdr, MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIZE) != MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIZE)
+                return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
+
+            pZip->m_archive_size += MZ_ZIP64_END_OF_CENTRAL_DIR_HEADER_SIZE;
+
+            /* Write zip64 end of central directory locator */
+            MZ_CLEAR_ARR(hdr);
+            MZ_WRITE_LE32(hdr + MZ_ZIP64_ECDL_SIG_OFS, MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIG);
+            MZ_WRITE_LE64(hdr + MZ_ZIP64_ECDL_REL_OFS_TO_ZIP64_ECDR_OFS, rel_ofs_to_zip64_ecdr);
+            MZ_WRITE_LE32(hdr + MZ_ZIP64_ECDL_TOTAL_NUMBER_OF_DISKS_OFS, 1);
+            if (pZip->m_pWrite(pZip->m_pIO_opaque, pZip->m_archive_size, hdr, MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIZE) != MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIZE)
+                return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
+
+            pZip->m_archive_size += MZ_ZIP64_END_OF_CENTRAL_DIR_LOCATOR_SIZE;
+        }
+
+        /* Write end of central directory record */
+        MZ_CLEAR_ARR(hdr);
+        MZ_WRITE_LE32(hdr + MZ_ZIP_ECDH_SIG_OFS, MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIG);
+        MZ_WRITE_LE16(hdr + MZ_ZIP_ECDH_CDIR_NUM_ENTRIES_ON_DISK_OFS, MZ_MIN(MZ_UINT16_MAX, pZip->m_total_files));
+        MZ_WRITE_LE16(hdr + MZ_ZIP_ECDH_CDIR_TOTAL_ENTRIES_OFS, MZ_MIN(MZ_UINT16_MAX, pZip->m_total_files));
+        MZ_WRITE_LE32(hdr + MZ_ZIP_ECDH_CDIR_SIZE_OFS, MZ_MIN(MZ_UINT32_MAX, central_dir_size));
+        MZ_WRITE_LE32(hdr + MZ_ZIP_ECDH_CDIR_OFS_OFS, MZ_MIN(MZ_UINT32_MAX, central_dir_ofs));
+
+        if (pZip->m_pWrite(pZip->m_pIO_opaque, pZip->m_archive_size, hdr, MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE) != MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE)
+            return mz_zip_set_error(pZip, MZ_ZIP_FILE_WRITE_FAILED);
+
+#ifndef MINIZ_NO_STDIO
+        if ((pState->m_pFile) && (MZ_FFLUSH(pState->m_pFile) == EOF))
+            return mz_zip_set_error(pZip, MZ_ZIP_FILE_CLOSE_FAILED);
+#endif /* #ifndef MINIZ_NO_STDIO */
+
+        pZip->m_archive_size += MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE;
+
+        pZip->m_zip_mode = MZ_ZIP_MODE_WRITING_HAS_BEEN_FINALIZED;
+        return MZ_TRUE;
+    }
+
+    mz_bool mz_zip_writer_finalize_heap_archive(mz_zip_archive *pZip, void **ppBuf, size_t *pSize)
+    {
+        if ((!ppBuf) || (!pSize))
+            return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
+
+        *ppBuf = NULL;
+        *pSize = 0;
+
+        if ((!pZip) || (!pZip->m_pState))
+            return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
+
+        if (pZip->m_pWrite != mz_zip_heap_write_func)
+            return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
+
+        if (!mz_zip_writer_finalize_archive(pZip))
+            return MZ_FALSE;
+
+        *ppBuf = pZip->m_pState->m_pMem;
+        *pSize = pZip->m_pState->m_mem_size;
+        pZip->m_pState->m_pMem = NULL;
+        pZip->m_pState->m_mem_size = pZip->m_pState->m_mem_capacity = 0;
+
+        return MZ_TRUE;
+    }
+
+    mz_bool mz_zip_writer_end(mz_zip_archive *pZip)
+    {
+        return mz_zip_writer_end_internal(pZip, MZ_TRUE);
+    }
+
+#ifndef MINIZ_NO_STDIO
+    mz_bool mz_zip_add_mem_to_archive_file_in_place(const char *pZip_filename, const char *pArchive_name, const void *pBuf, size_t buf_size, const void *pComment, mz_uint16 comment_size, mz_uint level_and_flags)
+    {
+        return mz_zip_add_mem_to_archive_file_in_place_v2(pZip_filename, pArchive_name, pBuf, buf_size, pComment, comment_size, level_and_flags, NULL);
+    }
+
+    mz_bool mz_zip_add_mem_to_archive_file_in_place_v2(const char *pZip_filename, const char *pArchive_name, const void *pBuf, size_t buf_size, const void *pComment, mz_uint16 comment_size, mz_uint level_and_flags, mz_zip_error *pErr)
+    {
+        mz_bool status, created_new_archive = MZ_FALSE;
+        mz_zip_archive zip_archive;
+        struct MZ_FILE_STAT_STRUCT file_stat;
+        mz_zip_error actual_err = MZ_ZIP_NO_ERROR;
+
+        mz_zip_zero_struct(&zip_archive);
+        if ((int)level_and_flags < 0)
+            level_and_flags = MZ_DEFAULT_LEVEL;
+
+        if ((!pZip_filename) || (!pArchive_name) || ((buf_size) && (!pBuf)) || ((comment_size) && (!pComment)) || ((level_and_flags & 0xF) > MZ_UBER_COMPRESSION))
+        {
+            if (pErr)
+                *pErr = MZ_ZIP_INVALID_PARAMETER;
+            return MZ_FALSE;
+        }
+
+        if (!mz_zip_writer_validate_archive_name(pArchive_name))
+        {
+            if (pErr)
+                *pErr = MZ_ZIP_INVALID_FILENAME;
+            return MZ_FALSE;
+        }
+
+        /* Important: The regular non-64 bit version of stat() can fail here if the file is very large, which could cause the archive to be overwritten. */
+        /* So be sure to compile with _LARGEFILE64_SOURCE 1 */
+        if (MZ_FILE_STAT(pZip_filename, &file_stat) != 0)
+        {
+            /* Create a new archive. */
+            if (!mz_zip_writer_init_file_v2(&zip_archive, pZip_filename, 0, level_and_flags))
+            {
+                if (pErr)
+                    *pErr = zip_archive.m_last_error;
+                return MZ_FALSE;
+            }
+
+            created_new_archive = MZ_TRUE;
+        }
+        else
+        {
+            /* Append to an existing archive. */
+            if (!mz_zip_reader_init_file_v2(&zip_archive, pZip_filename, level_and_flags | MZ_ZIP_FLAG_DO_NOT_SORT_CENTRAL_DIRECTORY | MZ_ZIP_FLAG_READ_ALLOW_WRITING, 0, 0))
+            {
+                if (pErr)
+                    *pErr = zip_archive.m_last_error;
+                return MZ_FALSE;
+            }
+
+            if (!mz_zip_writer_init_from_reader_v2(&zip_archive, pZip_filename, level_and_flags | MZ_ZIP_FLAG_READ_ALLOW_WRITING))
+            {
+                if (pErr)
+                    *pErr = zip_archive.m_last_error;
+
+                mz_zip_reader_end_internal(&zip_archive, MZ_FALSE);
+
+                return MZ_FALSE;
+            }
+        }
+
+        status = mz_zip_writer_add_mem_ex(&zip_archive, pArchive_name, pBuf, buf_size, pComment, comment_size, level_and_flags, 0, 0);
+        actual_err = zip_archive.m_last_error;
+
+        /* Always finalize, even if adding failed for some reason, so we have a valid central directory. (This may not always succeed, but we can try.) */
+        if (!mz_zip_writer_finalize_archive(&zip_archive))
+        {
+            if (!actual_err)
+                actual_err = zip_archive.m_last_error;
+
+            status = MZ_FALSE;
+        }
+
+        if (!mz_zip_writer_end_internal(&zip_archive, status))
+        {
+            if (!actual_err)
+                actual_err = zip_archive.m_last_error;
+
+            status = MZ_FALSE;
+        }
+
+        if ((!status) && (created_new_archive))
+        {
+            /* It's a new archive and something went wrong, so just delete it. */
+            int ignoredStatus = MZ_DELETE_FILE(pZip_filename);
+            (void)ignoredStatus;
+        }
+
+        if (pErr)
+            *pErr = actual_err;
+
+        return status;
+    }
+
+    void *mz_zip_extract_archive_file_to_heap_v2(const char *pZip_filename, const char *pArchive_name, const char *pComment, size_t *pSize, mz_uint flags, mz_zip_error *pErr)
+    {
+        mz_uint32 file_index;
+        mz_zip_archive zip_archive;
+        void *p = NULL;
+
+        if (pSize)
+            *pSize = 0;
+
+        if ((!pZip_filename) || (!pArchive_name))
+        {
+            if (pErr)
+                *pErr = MZ_ZIP_INVALID_PARAMETER;
+
+            return NULL;
+        }
+
+        mz_zip_zero_struct(&zip_archive);
+        if (!mz_zip_reader_init_file_v2(&zip_archive, pZip_filename, flags | MZ_ZIP_FLAG_DO_NOT_SORT_CENTRAL_DIRECTORY, 0, 0))
+        {
+            if (pErr)
+                *pErr = zip_archive.m_last_error;
+
+            return NULL;
+        }
+
+        if (mz_zip_reader_locate_file_v2(&zip_archive, pArchive_name, pComment, flags, &file_index))
+        {
+            p = mz_zip_reader_extract_to_heap(&zip_archive, file_index, pSize, flags);
+        }
+
+        mz_zip_reader_end_internal(&zip_archive, p != NULL);
+
+        if (pErr)
+            *pErr = zip_archive.m_last_error;
+
+        return p;
+    }
+
+    void *mz_zip_extract_archive_file_to_heap(const char *pZip_filename, const char *pArchive_name, size_t *pSize, mz_uint flags)
+    {
+        return mz_zip_extract_archive_file_to_heap_v2(pZip_filename, pArchive_name, NULL, pSize, flags, NULL);
+    }
+
+#endif /* #ifndef MINIZ_NO_STDIO */
+
+#endif /* #ifndef MINIZ_NO_ARCHIVE_WRITING_APIS */
+
+    /* ------------------- Misc utils */
+
+    mz_zip_mode mz_zip_get_mode(mz_zip_archive *pZip)
+    {
+        return pZip ? pZip->m_zip_mode : MZ_ZIP_MODE_INVALID;
+    }
+
+    mz_zip_type mz_zip_get_type(mz_zip_archive *pZip)
+    {
+        return pZip ? pZip->m_zip_type : MZ_ZIP_TYPE_INVALID;
+    }
+
+    mz_zip_error mz_zip_set_last_error(mz_zip_archive *pZip, mz_zip_error err_num)
+    {
+        mz_zip_error prev_err;
+
+        if (!pZip)
+            return MZ_ZIP_INVALID_PARAMETER;
+
+        prev_err = pZip->m_last_error;
+
+        pZip->m_last_error = err_num;
+        return prev_err;
+    }
+
+    mz_zip_error mz_zip_peek_last_error(mz_zip_archive *pZip)
+    {
+        if (!pZip)
+            return MZ_ZIP_INVALID_PARAMETER;
+
+        return pZip->m_last_error;
+    }
+
+    mz_zip_error mz_zip_clear_last_error(mz_zip_archive *pZip)
+    {
+        return mz_zip_set_last_error(pZip, MZ_ZIP_NO_ERROR);
+    }
+
+    mz_zip_error mz_zip_get_last_error(mz_zip_archive *pZip)
+    {
+        mz_zip_error prev_err;
+
+        if (!pZip)
+            return MZ_ZIP_INVALID_PARAMETER;
+
+        prev_err = pZip->m_last_error;
+
+        pZip->m_last_error = MZ_ZIP_NO_ERROR;
+        return prev_err;
+    }
+
+    const char *mz_zip_get_error_string(mz_zip_error mz_err)
+    {
+        switch (mz_err)
+        {
+            case MZ_ZIP_NO_ERROR:
+                return "no error";
+            case MZ_ZIP_UNDEFINED_ERROR:
+                return "undefined error";
+            case MZ_ZIP_TOO_MANY_FILES:
+                return "too many files";
+            case MZ_ZIP_FILE_TOO_LARGE:
+                return "file too large";
+            case MZ_ZIP_UNSUPPORTED_METHOD:
+                return "unsupported method";
+            case MZ_ZIP_UNSUPPORTED_ENCRYPTION:
+                return "unsupported encryption";
+            case MZ_ZIP_UNSUPPORTED_FEATURE:
+                return "unsupported feature";
+            case MZ_ZIP_FAILED_FINDING_CENTRAL_DIR:
+                return "failed finding central directory";
+            case MZ_ZIP_NOT_AN_ARCHIVE:
+                return "not a ZIP archive";
+            case MZ_ZIP_INVALID_HEADER_OR_CORRUPTED:
+                return "invalid header or archive is corrupted";
+            case MZ_ZIP_UNSUPPORTED_MULTIDISK:
+                return "unsupported multidisk archive";
+            case MZ_ZIP_DECOMPRESSION_FAILED:
+                return "decompression failed or archive is corrupted";
+            case MZ_ZIP_COMPRESSION_FAILED:
+                return "compression failed";
+            case MZ_ZIP_UNEXPECTED_DECOMPRESSED_SIZE:
+                return "unexpected decompressed size";
+            case MZ_ZIP_CRC_CHECK_FAILED:
+                return "CRC-32 check failed";
+            case MZ_ZIP_UNSUPPORTED_CDIR_SIZE:
+                return "unsupported central directory size";
+            case MZ_ZIP_ALLOC_FAILED:
+                return "allocation failed";
+            case MZ_ZIP_FILE_OPEN_FAILED:
+                return "file open failed";
+            case MZ_ZIP_FILE_CREATE_FAILED:
+                return "file create failed";
+            case MZ_ZIP_FILE_WRITE_FAILED:
+                return "file write failed";
+            case MZ_ZIP_FILE_READ_FAILED:
+                return "file read failed";
+            case MZ_ZIP_FILE_CLOSE_FAILED:
+                return "file close failed";
+            case MZ_ZIP_FILE_SEEK_FAILED:
+                return "file seek failed";
+            case MZ_ZIP_FILE_STAT_FAILED:
+                return "file stat failed";
+            case MZ_ZIP_INVALID_PARAMETER:
+                return "invalid parameter";
+            case MZ_ZIP_INVALID_FILENAME:
+                return "invalid filename";
+            case MZ_ZIP_BUF_TOO_SMALL:
+                return "buffer too small";
+            case MZ_ZIP_INTERNAL_ERROR:
+                return "internal error";
+            case MZ_ZIP_FILE_NOT_FOUND:
+                return "file not found";
+            case MZ_ZIP_ARCHIVE_TOO_LARGE:
+                return "archive is too large";
+            case MZ_ZIP_VALIDATION_FAILED:
+                return "validation failed";
+            case MZ_ZIP_WRITE_CALLBACK_FAILED:
+                return "write callback failed";
+            case MZ_ZIP_TOTAL_ERRORS:
+                return "total errors";
+            default:
+                break;
+        }
+
+        return "unknown error";
+    }
+
+    /* Note: Just because the archive is not zip64 doesn't necessarily mean it doesn't have Zip64 extended information extra field, argh. */
+    mz_bool mz_zip_is_zip64(mz_zip_archive *pZip)
+    {
+        if ((!pZip) || (!pZip->m_pState))
+            return MZ_FALSE;
+
+        return pZip->m_pState->m_zip64;
+    }
+
+    size_t mz_zip_get_central_dir_size(mz_zip_archive *pZip)
+    {
+        if ((!pZip) || (!pZip->m_pState))
+            return 0;
+
+        return pZip->m_pState->m_central_dir.m_size;
+    }
+
+    mz_uint mz_zip_reader_get_num_files(mz_zip_archive *pZip)
+    {
+        return pZip ? pZip->m_total_files : 0;
+    }
+
+    mz_uint64 mz_zip_get_archive_size(mz_zip_archive *pZip)
+    {
+        if (!pZip)
+            return 0;
+        return pZip->m_archive_size;
+    }
+
+    mz_uint64 mz_zip_get_archive_file_start_offset(mz_zip_archive *pZip)
+    {
+        if ((!pZip) || (!pZip->m_pState))
+            return 0;
+        return pZip->m_pState->m_file_archive_start_ofs;
+    }
+
+    MZ_FILE *mz_zip_get_cfile(mz_zip_archive *pZip)
+    {
+        if ((!pZip) || (!pZip->m_pState))
+            return 0;
+        return pZip->m_pState->m_pFile;
+    }
+
+    size_t mz_zip_read_archive_data(mz_zip_archive *pZip, mz_uint64 file_ofs, void *pBuf, size_t n)
+    {
+        if ((!pZip) || (!pZip->m_pState) || (!pBuf) || (!pZip->m_pRead))
+            return mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
+
+        return pZip->m_pRead(pZip->m_pIO_opaque, file_ofs, pBuf, n);
+    }
+
+    mz_uint mz_zip_reader_get_filename(mz_zip_archive *pZip, mz_uint file_index, char *pFilename, mz_uint filename_buf_size)
+    {
+        mz_uint n;
+        const mz_uint8 *p = mz_zip_get_cdh(pZip, file_index);
+        if (!p)
+        {
+            if (filename_buf_size)
+                pFilename[0] = '\0';
+            mz_zip_set_error(pZip, MZ_ZIP_INVALID_PARAMETER);
+            return 0;
+        }
+        n = MZ_READ_LE16(p + MZ_ZIP_CDH_FILENAME_LEN_OFS);
+        if (filename_buf_size)
+        {
+            n = MZ_MIN(n, filename_buf_size - 1);
+            memcpy(pFilename, p + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE, n);
+            pFilename[n] = '\0';
+        }
+        return n + 1;
+    }
+
+    mz_bool mz_zip_reader_file_stat(mz_zip_archive *pZip, mz_uint file_index, mz_zip_archive_file_stat *pStat)
+    {
+        return mz_zip_file_stat_internal(pZip, file_index, mz_zip_get_cdh(pZip, file_index), pStat, NULL);
+    }
+
+    mz_bool mz_zip_end(mz_zip_archive *pZip)
+    {
+        if (!pZip)
+            return MZ_FALSE;
+
+        if (pZip->m_zip_mode == MZ_ZIP_MODE_READING)
+            return mz_zip_reader_end(pZip);
+#ifndef MINIZ_NO_ARCHIVE_WRITING_APIS
+        else if ((pZip->m_zip_mode == MZ_ZIP_MODE_WRITING) || (pZip->m_zip_mode == MZ_ZIP_MODE_WRITING_HAS_BEEN_FINALIZED))
+            return mz_zip_writer_end(pZip);
+#endif
+
+        return MZ_FALSE;
+    }
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*#ifndef MINIZ_NO_ARCHIVE_APIS*/
diff --git a/3rdParty-Core/miniz-3.1.1/miniz.h b/3rdParty-Core/miniz-3.1.1/miniz.h
new file mode 100644
index 0000000000..45ee4c1569
--- /dev/null
+++ b/3rdParty-Core/miniz-3.1.1/miniz.h
@@ -0,0 +1,1510 @@
+#ifndef MINIZ_EXPORT
+#define MINIZ_EXPORT
+#endif
+/* miniz.c 3.1.0 - public domain deflate/inflate, zlib-subset, ZIP reading/writing/appending, PNG writing
+   See "unlicense" statement at the end of this file.
+   Rich Geldreich <richgel99@gmail.com>, last updated Oct. 13, 2013
+   Implements RFC 1950: http://www.ietf.org/rfc/rfc1950.txt and RFC 1951: http://www.ietf.org/rfc/rfc1951.txt
+
+   Most API's defined in miniz.c are optional. For example, to disable the archive related functions just define
+   MINIZ_NO_ARCHIVE_APIS, or to get rid of all stdio usage define MINIZ_NO_STDIO (see the list below for more macros).
+
+   * Low-level Deflate/Inflate implementation notes:
+
+     Compression: Use the "tdefl" API's. The compressor supports raw, static, and dynamic blocks, lazy or
+     greedy parsing, match length filtering, RLE-only, and Huffman-only streams. It performs and compresses
+     approximately as well as zlib.
+
+     Decompression: Use the "tinfl" API's. The entire decompressor is implemented as a single function
+     coroutine: see tinfl_decompress(). It supports decompression into a 32KB (or larger power of 2) wrapping buffer, or into a memory
+     block large enough to hold the entire file.
+
+     The low-level tdefl/tinfl API's do not make any use of dynamic memory allocation.
+
+   * zlib-style API notes:
+
+     miniz.c implements a fairly large subset of zlib. There's enough functionality present for it to be a drop-in
+     zlib replacement in many apps:
+        The z_stream struct, optional memory allocation callbacks
+        deflateInit/deflateInit2/deflate/deflateReset/deflateEnd/deflateBound
+        inflateInit/inflateInit2/inflate/inflateReset/inflateEnd
+        compress, compress2, compressBound, uncompress
+        CRC-32, Adler-32 - Using modern, minimal code size, CPU cache friendly routines.
+        Supports raw deflate streams or standard zlib streams with adler-32 checking.
+
+     Limitations:
+      The callback API's are not implemented yet. No support for gzip headers or zlib static dictionaries.
+      I've tried to closely emulate zlib's various flavors of stream flushing and return status codes, but
+      there are no guarantees that miniz.c pulls this off perfectly.
+
+   * PNG writing: See the tdefl_write_image_to_png_file_in_memory() function, originally written by
+     Alex Evans. Supports 1-4 bytes/pixel images.
+
+   * ZIP archive API notes:
+
+     The ZIP archive API's where designed with simplicity and efficiency in mind, with just enough abstraction to
+     get the job done with minimal fuss. There are simple API's to retrieve file information, read files from
+     existing archives, create new archives, append new files to existing archives, or clone archive data from
+     one archive to another. It supports archives located in memory or the heap, on disk (using stdio.h),
+     or you can specify custom file read/write callbacks.
+
+     - Archive reading: Just call this function to read a single file from a disk archive:
+
+      void *mz_zip_extract_archive_file_to_heap(const char *pZip_filename, const char *pArchive_name,
+        size_t *pSize, mz_uint zip_flags);
+
+     For more complex cases, use the "mz_zip_reader" functions. Upon opening an archive, the entire central
+     directory is located and read as-is into memory, and subsequent file access only occurs when reading individual files.
+
+     - Archives file scanning: The simple way is to use this function to scan a loaded archive for a specific file:
+
+     int mz_zip_reader_locate_file(mz_zip_archive *pZip, const char *pName, const char *pComment, mz_uint flags);
+
+     The locate operation can optionally check file comments too, which (as one example) can be used to identify
+     multiple versions of the same file in an archive. This function uses a simple linear search through the central
+     directory, so it's not very fast.
+
+     Alternately, you can iterate through all the files in an archive (using mz_zip_reader_get_num_files()) and
+     retrieve detailed info on each file by calling mz_zip_reader_file_stat().
+
+     - Archive creation: Use the "mz_zip_writer" functions. The ZIP writer immediately writes compressed file data
+     to disk and builds an exact image of the central directory in memory. The central directory image is written
+     all at once at the end of the archive file when the archive is finalized.
+
+     The archive writer can optionally align each file's local header and file data to any power of 2 alignment,
+     which can be useful when the archive will be read from optical media. Also, the writer supports placing
+     arbitrary data blobs at the very beginning of ZIP archives. Archives written using either feature are still
+     readable by any ZIP tool.
+
+     - Archive appending: The simple way to add a single file to an archive is to call this function:
+
+      mz_bool mz_zip_add_mem_to_archive_file_in_place(const char *pZip_filename, const char *pArchive_name,
+        const void *pBuf, size_t buf_size, const void *pComment, mz_uint16 comment_size, mz_uint level_and_flags);
+
+     The archive will be created if it doesn't already exist, otherwise it'll be appended to.
+     Note the appending is done in-place and is not an atomic operation, so if something goes wrong
+     during the operation it's possible the archive could be left without a central directory (although the local
+     file headers and file data will be fine, so the archive will be recoverable).
+
+     For more complex archive modification scenarios:
+     1. The safest way is to use a mz_zip_reader to read the existing archive, cloning only those bits you want to
+     preserve into a new archive using using the mz_zip_writer_add_from_zip_reader() function (which compiles the
+     compressed file data as-is). When you're done, delete the old archive and rename the newly written archive, and
+     you're done. This is safe but requires a bunch of temporary disk space or heap memory.
+
+     2. Or, you can convert an mz_zip_reader in-place to an mz_zip_writer using mz_zip_writer_init_from_reader(),
+     append new files as needed, then finalize the archive which will write an updated central directory to the
+     original archive. (This is basically what mz_zip_add_mem_to_archive_file_in_place() does.) There's a
+     possibility that the archive's central directory could be lost with this method if anything goes wrong, though.
+
+     - ZIP archive support limitations:
+     No spanning support. Extraction functions can only handle unencrypted, stored or deflated files.
+     Requires streams capable of seeking.
+
+   * This is a header file library, like stb_image.c. To get only a header file, either cut and paste the
+     below header, or create miniz.h, #define MINIZ_HEADER_FILE_ONLY, and then include miniz.c from it.
+
+   * Important: For best perf. be sure to customize the below macros for your target platform:
+     #define MINIZ_USE_UNALIGNED_LOADS_AND_STORES 1
+     #define MINIZ_LITTLE_ENDIAN 1
+     #define MINIZ_HAS_64BIT_REGISTERS 1
+
+   * On platforms using glibc, Be sure to "#define _LARGEFILE64_SOURCE 1" before including miniz.c to ensure miniz
+     uses the 64-bit variants: fopen64(), stat64(), etc. Otherwise you won't be able to process large files
+     (i.e. 32-bit stat() fails for me on files > 0x7FFFFFFF bytes).
+*/
+#pragma once
+
+
+
+#if defined(__STRICT_ANSI__)
+#define MZ_FORCEINLINE
+#elif defined(_MSC_VER)
+#define MZ_FORCEINLINE __forceinline
+#elif defined(__GNUC__)
+#define MZ_FORCEINLINE __inline__ __attribute__((__always_inline__))
+#else
+#define MZ_FORCEINLINE inline
+#endif
+
+/* Defines to completely disable specific portions of miniz.c:
+   If all macros here are defined the only functionality remaining will be CRC-32 and adler-32. */
+
+/* Define MINIZ_NO_STDIO to disable all usage and any functions which rely on stdio for file I/O. */
+/*#define MINIZ_NO_STDIO */
+
+/* If MINIZ_NO_TIME is specified then the ZIP archive functions will not be able to get the current time, or */
+/* get/set file times, and the C run-time funcs that get/set times won't be called. */
+/* The current downside is the times written to your archives will be from 1979. */
+/*#define MINIZ_NO_TIME */
+
+/* Define MINIZ_NO_DEFLATE_APIS to disable all compression API's. */
+/*#define MINIZ_NO_DEFLATE_APIS */
+
+/* Define MINIZ_NO_INFLATE_APIS to disable all decompression API's. */
+/*#define MINIZ_NO_INFLATE_APIS */
+
+/* Define MINIZ_NO_ARCHIVE_APIS to disable all ZIP archive API's. */
+/*#define MINIZ_NO_ARCHIVE_APIS */
+
+/* Define MINIZ_NO_ARCHIVE_WRITING_APIS to disable all writing related ZIP archive API's. */
+/*#define MINIZ_NO_ARCHIVE_WRITING_APIS */
+
+/* Define MINIZ_NO_ZLIB_APIS to remove all ZLIB-style compression/decompression API's. */
+/*#define MINIZ_NO_ZLIB_APIS */
+
+/* Define MINIZ_NO_ZLIB_COMPATIBLE_NAME to disable zlib names, to prevent conflicts against stock zlib. */
+/*#define MINIZ_NO_ZLIB_COMPATIBLE_NAMES */
+
+/* Define MINIZ_NO_MALLOC to disable all calls to malloc, free, and realloc.
+   Note if MINIZ_NO_MALLOC is defined then the user must always provide custom user alloc/free/realloc
+   callbacks to the zlib and archive API's, and a few stand-alone helper API's which don't provide custom user
+   functions (such as tdefl_compress_mem_to_heap() and tinfl_decompress_mem_to_heap()) won't work. */
+/*#define MINIZ_NO_MALLOC */
+
+#ifdef MINIZ_NO_INFLATE_APIS
+#define MINIZ_NO_ARCHIVE_APIS
+#endif
+
+#ifdef MINIZ_NO_DEFLATE_APIS
+#define MINIZ_NO_ARCHIVE_WRITING_APIS
+#endif
+
+#if defined(__TINYC__) && (defined(__linux) || defined(__linux__))
+/* TODO: Work around "error: include file 'sys\utime.h' when compiling with tcc on Linux */
+#define MINIZ_NO_TIME
+#endif
+
+#include <stddef.h>
+
+#if !defined(MINIZ_NO_TIME) && !defined(MINIZ_NO_ARCHIVE_APIS)
+#include <time.h>
+#endif
+
+#if defined(_M_IX86) || defined(_M_X64) || defined(__i386__) || defined(__i386) || defined(__i486__) || defined(__i486) || defined(i386) || defined(__ia64__) || defined(__x86_64__)
+/* MINIZ_X86_OR_X64_CPU is only used to help set the below macros. */
+#define MINIZ_X86_OR_X64_CPU 1
+#else
+#define MINIZ_X86_OR_X64_CPU 0
+#endif
+
+/* Set MINIZ_LITTLE_ENDIAN only if not set */
+#if !defined(MINIZ_LITTLE_ENDIAN)
+#if defined(__BYTE_ORDER__) && defined(__ORDER_LITTLE_ENDIAN__)
+
+#if (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
+/* Set MINIZ_LITTLE_ENDIAN to 1 if the processor is little endian. */
+#define MINIZ_LITTLE_ENDIAN 1
+#else
+#define MINIZ_LITTLE_ENDIAN 0
+#endif
+
+#else
+
+#if MINIZ_X86_OR_X64_CPU
+#define MINIZ_LITTLE_ENDIAN 1
+#else
+#define MINIZ_LITTLE_ENDIAN 0
+#endif
+
+#endif
+#endif
+
+/* Using unaligned loads and stores causes errors when using UBSan */
+#if defined(__has_feature)
+#if __has_feature(undefined_behavior_sanitizer)
+#define MINIZ_USE_UNALIGNED_LOADS_AND_STORES 0
+#endif
+#endif
+
+/* Set MINIZ_USE_UNALIGNED_LOADS_AND_STORES only if not set */
+#if !defined(MINIZ_USE_UNALIGNED_LOADS_AND_STORES)
+#if MINIZ_X86_OR_X64_CPU
+/* Set MINIZ_USE_UNALIGNED_LOADS_AND_STORES to 1 on CPU's that permit efficient integer loads and stores from unaligned addresses. */
+#define MINIZ_USE_UNALIGNED_LOADS_AND_STORES 0
+#define MINIZ_UNALIGNED_USE_MEMCPY
+#else
+#define MINIZ_USE_UNALIGNED_LOADS_AND_STORES 0
+#endif
+#endif
+
+#if defined(_M_X64) || defined(_WIN64) || defined(__MINGW64__) || defined(_LP64) || defined(__LP64__) || defined(__ia64__) || defined(__x86_64__)
+/* Set MINIZ_HAS_64BIT_REGISTERS to 1 if operations on 64-bit integers are reasonably fast (and don't involve compiler generated calls to helper functions). */
+#define MINIZ_HAS_64BIT_REGISTERS 1
+#else
+#define MINIZ_HAS_64BIT_REGISTERS 0
+#endif
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+    /* ------------------- zlib-style API Definitions. */
+
+    /* For more compatibility with zlib, miniz.c uses unsigned long for some parameters/struct members. Beware: mz_ulong can be either 32 or 64-bits! */
+    typedef unsigned long mz_ulong;
+
+    /* mz_free() internally uses the MZ_FREE() macro (which by default calls free() unless you've modified the MZ_MALLOC macro) to release a block allocated from the heap. */
+    MINIZ_EXPORT void mz_free(void *p);
+
+#define MZ_ADLER32_INIT (1)
+    /* mz_adler32() returns the initial adler-32 value to use when called with ptr==NULL. */
+    MINIZ_EXPORT mz_ulong mz_adler32(mz_ulong adler, const unsigned char *ptr, size_t buf_len);
+
+#define MZ_CRC32_INIT (0)
+    /* mz_crc32() returns the initial CRC-32 value to use when called with ptr==NULL. */
+    MINIZ_EXPORT mz_ulong mz_crc32(mz_ulong crc, const unsigned char *ptr, size_t buf_len);
+
+    /* Compression strategies. */
+    enum
+    {
+        MZ_DEFAULT_STRATEGY = 0,
+        MZ_FILTERED = 1,
+        MZ_HUFFMAN_ONLY = 2,
+        MZ_RLE = 3,
+        MZ_FIXED = 4
+    };
+
+/* Method */
+#define MZ_DEFLATED 8
+
+    /* Heap allocation callbacks.
+    Note that mz_alloc_func parameter types purposely differ from zlib's: items/size is size_t, not unsigned long. */
+    typedef void *(*mz_alloc_func)(void *opaque, size_t items, size_t size);
+    typedef void (*mz_free_func)(void *opaque, void *address);
+    typedef void *(*mz_realloc_func)(void *opaque, void *address, size_t items, size_t size);
+
+    /* Compression levels: 0-9 are the standard zlib-style levels, 10 is best possible compression (not zlib compatible, and may be very slow), MZ_DEFAULT_COMPRESSION=MZ_DEFAULT_LEVEL. */
+    enum
+    {
+        MZ_NO_COMPRESSION = 0,
+        MZ_BEST_SPEED = 1,
+        MZ_BEST_COMPRESSION = 9,
+        MZ_UBER_COMPRESSION = 10,
+        MZ_DEFAULT_LEVEL = 6,
+        MZ_DEFAULT_COMPRESSION = -1
+    };
+
+#define MZ_VERSION "11.3.1"
+#define MZ_VERNUM 0xB301
+#define MZ_VER_MAJOR 11
+#define MZ_VER_MINOR 3
+#define MZ_VER_REVISION 1
+#define MZ_VER_SUBREVISION 0
+
+#ifndef MINIZ_NO_ZLIB_APIS
+
+    /* Flush values. For typical usage you only need MZ_NO_FLUSH and MZ_FINISH. The other values are for advanced use (refer to the zlib docs). */
+    enum
+    {
+        MZ_NO_FLUSH = 0,
+        MZ_PARTIAL_FLUSH = 1,
+        MZ_SYNC_FLUSH = 2,
+        MZ_FULL_FLUSH = 3,
+        MZ_FINISH = 4,
+        MZ_BLOCK = 5
+    };
+
+    /* Return status codes. MZ_PARAM_ERROR is non-standard. */
+    enum
+    {
+        MZ_OK = 0,
+        MZ_STREAM_END = 1,
+        MZ_NEED_DICT = 2,
+        MZ_ERRNO = -1,
+        MZ_STREAM_ERROR = -2,
+        MZ_DATA_ERROR = -3,
+        MZ_MEM_ERROR = -4,
+        MZ_BUF_ERROR = -5,
+        MZ_VERSION_ERROR = -6,
+        MZ_PARAM_ERROR = -10000
+    };
+
+/* Window bits */
+#define MZ_DEFAULT_WINDOW_BITS 15
+
+    struct mz_internal_state;
+
+    /* Compression/decompression stream struct. */
+    typedef struct mz_stream_s
+    {
+        const unsigned char *next_in; /* pointer to next byte to read */
+        unsigned int avail_in;        /* number of bytes available at next_in */
+        mz_ulong total_in;            /* total number of bytes consumed so far */
+
+        unsigned char *next_out; /* pointer to next byte to write */
+        unsigned int avail_out;  /* number of bytes that can be written to next_out */
+        mz_ulong total_out;      /* total number of bytes produced so far */
+
+        char *msg;                       /* error msg (unused) */
+        struct mz_internal_state *state; /* internal state, allocated by zalloc/zfree */
+
+        mz_alloc_func zalloc; /* optional heap allocation function (defaults to malloc) */
+        mz_free_func zfree;   /* optional heap free function (defaults to free) */
+        void *opaque;         /* heap alloc function user pointer */
+
+        int data_type;     /* data_type (unused) */
+        mz_ulong adler;    /* adler32 of the source or uncompressed data */
+        mz_ulong reserved; /* not used */
+    } mz_stream;
+
+    typedef mz_stream *mz_streamp;
+
+    /* Returns the version string of miniz.c. */
+    MINIZ_EXPORT const char *mz_version(void);
+
+#ifndef MINIZ_NO_DEFLATE_APIS
+
+    /* mz_deflateInit() initializes a compressor with default options: */
+    /* Parameters: */
+    /*  pStream must point to an initialized mz_stream struct. */
+    /*  level must be between [MZ_NO_COMPRESSION, MZ_BEST_COMPRESSION]. */
+    /*  level 1 enables a specially optimized compression function that's been optimized purely for performance, not ratio. */
+    /*  (This special func. is currently only enabled when MINIZ_USE_UNALIGNED_LOADS_AND_STORES and MINIZ_LITTLE_ENDIAN are defined.) */
+    /* Return values: */
+    /*  MZ_OK on success. */
+    /*  MZ_STREAM_ERROR if the stream is bogus. */
+    /*  MZ_PARAM_ERROR if the input parameters are bogus. */
+    /*  MZ_MEM_ERROR on out of memory. */
+    MINIZ_EXPORT int mz_deflateInit(mz_streamp pStream, int level);
+
+    /* mz_deflateInit2() is like mz_deflate(), except with more control: */
+    /* Additional parameters: */
+    /*   method must be MZ_DEFLATED */
+    /*   window_bits must be MZ_DEFAULT_WINDOW_BITS (to wrap the deflate stream with zlib header/adler-32 footer) or -MZ_DEFAULT_WINDOW_BITS (raw deflate/no header or footer) */
+    /*   mem_level must be between [1, 9] (it's checked but ignored by miniz.c) */
+    MINIZ_EXPORT int mz_deflateInit2(mz_streamp pStream, int level, int method, int window_bits, int mem_level, int strategy);
+
+    /* Quickly resets a compressor without having to reallocate anything. Same as calling mz_deflateEnd() followed by mz_deflateInit()/mz_deflateInit2(). */
+    MINIZ_EXPORT int mz_deflateReset(mz_streamp pStream);
+
+    /* mz_deflate() compresses the input to output, consuming as much of the input and producing as much output as possible. */
+    /* Parameters: */
+    /*   pStream is the stream to read from and write to. You must initialize/update the next_in, avail_in, next_out, and avail_out members. */
+    /*   flush may be MZ_NO_FLUSH, MZ_PARTIAL_FLUSH/MZ_SYNC_FLUSH, MZ_FULL_FLUSH, or MZ_FINISH. */
+    /* Return values: */
+    /*   MZ_OK on success (when flushing, or if more input is needed but not available, and/or there's more output to be written but the output buffer is full). */
+    /*   MZ_STREAM_END if all input has been consumed and all output bytes have been written. Don't call mz_deflate() on the stream anymore. */
+    /*   MZ_STREAM_ERROR if the stream is bogus. */
+    /*   MZ_PARAM_ERROR if one of the parameters is invalid. */
+    /*   MZ_BUF_ERROR if no forward progress is possible because the input and/or output buffers are empty. (Fill up the input buffer or free up some output space and try again.) */
+    MINIZ_EXPORT int mz_deflate(mz_streamp pStream, int flush);
+
+    /* mz_deflateEnd() deinitializes a compressor: */
+    /* Return values: */
+    /*  MZ_OK on success. */
+    /*  MZ_STREAM_ERROR if the stream is bogus. */
+    MINIZ_EXPORT int mz_deflateEnd(mz_streamp pStream);
+
+    /* mz_deflateBound() returns a (very) conservative upper bound on the amount of data that could be generated by deflate(), assuming flush is set to only MZ_NO_FLUSH or MZ_FINISH. */
+    MINIZ_EXPORT mz_ulong mz_deflateBound(mz_streamp pStream, mz_ulong source_len);
+
+    /* Single-call compression functions mz_compress() and mz_compress2(): */
+    /* Returns MZ_OK on success, or one of the error codes from mz_deflate() on failure. */
+    MINIZ_EXPORT int mz_compress(unsigned char *pDest, mz_ulong *pDest_len, const unsigned char *pSource, mz_ulong source_len);
+    MINIZ_EXPORT int mz_compress2(unsigned char *pDest, mz_ulong *pDest_len, const unsigned char *pSource, mz_ulong source_len, int level);
+
+    /* mz_compressBound() returns a (very) conservative upper bound on the amount of data that could be generated by calling mz_compress(). */
+    MINIZ_EXPORT mz_ulong mz_compressBound(mz_ulong source_len);
+
+#endif /*#ifndef MINIZ_NO_DEFLATE_APIS*/
+
+#ifndef MINIZ_NO_INFLATE_APIS
+
+    /* Initializes a decompressor. */
+    MINIZ_EXPORT int mz_inflateInit(mz_streamp pStream);
+
+    /* mz_inflateInit2() is like mz_inflateInit() with an additional option that controls the window size and whether or not the stream has been wrapped with a zlib header/footer: */
+    /* window_bits must be MZ_DEFAULT_WINDOW_BITS (to parse zlib header/footer) or -MZ_DEFAULT_WINDOW_BITS (raw deflate). */
+    MINIZ_EXPORT int mz_inflateInit2(mz_streamp pStream, int window_bits);
+
+    /* Quickly resets a compressor without having to reallocate anything. Same as calling mz_inflateEnd() followed by mz_inflateInit()/mz_inflateInit2(). */
+    MINIZ_EXPORT int mz_inflateReset(mz_streamp pStream);
+
+    /* Decompresses the input stream to the output, consuming only as much of the input as needed, and writing as much to the output as possible. */
+    /* Parameters: */
+    /*   pStream is the stream to read from and write to. You must initialize/update the next_in, avail_in, next_out, and avail_out members. */
+    /*   flush may be MZ_NO_FLUSH, MZ_SYNC_FLUSH, or MZ_FINISH. */
+    /*   On the first call, if flush is MZ_FINISH it's assumed the input and output buffers are both sized large enough to decompress the entire stream in a single call (this is slightly faster). */
+    /*   MZ_FINISH implies that there are no more source bytes available beside what's already in the input buffer, and that the output buffer is large enough to hold the rest of the decompressed data. */
+    /* Return values: */
+    /*   MZ_OK on success. Either more input is needed but not available, and/or there's more output to be written but the output buffer is full. */
+    /*   MZ_STREAM_END if all needed input has been consumed and all output bytes have been written. For zlib streams, the adler-32 of the decompressed data has also been verified. */
+    /*   MZ_STREAM_ERROR if the stream is bogus. */
+    /*   MZ_DATA_ERROR if the deflate stream is invalid. */
+    /*   MZ_PARAM_ERROR if one of the parameters is invalid. */
+    /*   MZ_BUF_ERROR if no forward progress is possible because the input buffer is empty but the inflater needs more input to continue, or if the output buffer is not large enough. Call mz_inflate() again */
+    /*   with more input data, or with more room in the output buffer (except when using single call decompression, described above). */
+    MINIZ_EXPORT int mz_inflate(mz_streamp pStream, int flush);
+
+    /* Deinitializes a decompressor. */
+    MINIZ_EXPORT int mz_inflateEnd(mz_streamp pStream);
+
+    /* Single-call decompression. */
+    /* Returns MZ_OK on success, or one of the error codes from mz_inflate() on failure. */
+    MINIZ_EXPORT int mz_uncompress(unsigned char *pDest, mz_ulong *pDest_len, const unsigned char *pSource, mz_ulong source_len);
+    MINIZ_EXPORT int mz_uncompress2(unsigned char *pDest, mz_ulong *pDest_len, const unsigned char *pSource, mz_ulong *pSource_len);
+#endif /*#ifndef MINIZ_NO_INFLATE_APIS*/
+
+    /* Returns a string description of the specified error code, or NULL if the error code is invalid. */
+    MINIZ_EXPORT const char *mz_error(int err);
+
+/* Redefine zlib-compatible names to miniz equivalents, so miniz.c can be used as a drop-in replacement for the subset of zlib that miniz.c supports. */
+/* Define MINIZ_NO_ZLIB_COMPATIBLE_NAMES to disable zlib-compatibility if you use zlib in the same project. */
+#ifndef MINIZ_NO_ZLIB_COMPATIBLE_NAMES
+    typedef unsigned char Byte;
+    typedef unsigned int uInt;
+    typedef mz_ulong uLong;
+    typedef Byte Bytef;
+    typedef uInt uIntf;
+    typedef char charf;
+    typedef int intf;
+    typedef void *voidpf;
+    typedef uLong uLongf;
+    typedef void *voidp;
+    typedef void *const voidpc;
+#define Z_NULL 0
+#define Z_NO_FLUSH MZ_NO_FLUSH
+#define Z_PARTIAL_FLUSH MZ_PARTIAL_FLUSH
+#define Z_SYNC_FLUSH MZ_SYNC_FLUSH
+#define Z_FULL_FLUSH MZ_FULL_FLUSH
+#define Z_FINISH MZ_FINISH
+#define Z_BLOCK MZ_BLOCK
+#define Z_OK MZ_OK
+#define Z_STREAM_END MZ_STREAM_END
+#define Z_NEED_DICT MZ_NEED_DICT
+#define Z_ERRNO MZ_ERRNO
+#define Z_STREAM_ERROR MZ_STREAM_ERROR
+#define Z_DATA_ERROR MZ_DATA_ERROR
+#define Z_MEM_ERROR MZ_MEM_ERROR
+#define Z_BUF_ERROR MZ_BUF_ERROR
+#define Z_VERSION_ERROR MZ_VERSION_ERROR
+#define Z_PARAM_ERROR MZ_PARAM_ERROR
+#define Z_NO_COMPRESSION MZ_NO_COMPRESSION
+#define Z_BEST_SPEED MZ_BEST_SPEED
+#define Z_BEST_COMPRESSION MZ_BEST_COMPRESSION
+#define Z_DEFAULT_COMPRESSION MZ_DEFAULT_COMPRESSION
+#define Z_DEFAULT_STRATEGY MZ_DEFAULT_STRATEGY
+#define Z_FILTERED MZ_FILTERED
+#define Z_HUFFMAN_ONLY MZ_HUFFMAN_ONLY
+#define Z_RLE MZ_RLE
+#define Z_FIXED MZ_FIXED
+#define Z_DEFLATED MZ_DEFLATED
+#define Z_DEFAULT_WINDOW_BITS MZ_DEFAULT_WINDOW_BITS
+    /* See mz_alloc_func */
+    typedef void *(*alloc_func)(void *opaque, size_t items, size_t size);
+    /* See mz_free_func */
+    typedef void (*free_func)(void *opaque, void *address);
+
+#define internal_state mz_internal_state
+#define z_stream mz_stream
+
+#ifndef MINIZ_NO_DEFLATE_APIS
+    /* Compatiblity with zlib API. See called functions for documentation */
+    static MZ_FORCEINLINE int deflateInit(mz_streamp pStream, int level)
+    {
+        return mz_deflateInit(pStream, level);
+    }
+    static MZ_FORCEINLINE int deflateInit2(mz_streamp pStream, int level, int method, int window_bits, int mem_level, int strategy)
+    {
+        return mz_deflateInit2(pStream, level, method, window_bits, mem_level, strategy);
+    }
+    static MZ_FORCEINLINE int deflateReset(mz_streamp pStream)
+    {
+        return mz_deflateReset(pStream);
+    }
+    static MZ_FORCEINLINE int deflate(mz_streamp pStream, int flush)
+    {
+        return mz_deflate(pStream, flush);
+    }
+    static MZ_FORCEINLINE int deflateEnd(mz_streamp pStream)
+    {
+        return mz_deflateEnd(pStream);
+    }
+    static MZ_FORCEINLINE mz_ulong deflateBound(mz_streamp pStream, mz_ulong source_len)
+    {
+        return mz_deflateBound(pStream, source_len);
+    }
+    static MZ_FORCEINLINE int compress(unsigned char *pDest, mz_ulong *pDest_len, const unsigned char *pSource, mz_ulong source_len)
+    {
+        return mz_compress(pDest, pDest_len, pSource, source_len);
+    }
+    static MZ_FORCEINLINE int compress2(unsigned char *pDest, mz_ulong *pDest_len, const unsigned char *pSource, mz_ulong source_len, int level)
+    {
+        return mz_compress2(pDest, pDest_len, pSource, source_len, level);
+    }
+    static MZ_FORCEINLINE mz_ulong compressBound(mz_ulong source_len)
+    {
+        return mz_compressBound(source_len);
+    }
+#endif /*#ifndef MINIZ_NO_DEFLATE_APIS*/
+
+#ifndef MINIZ_NO_INFLATE_APIS
+    /* Compatiblity with zlib API. See called functions for documentation */
+    static MZ_FORCEINLINE int inflateInit(mz_streamp pStream)
+    {
+        return mz_inflateInit(pStream);
+    }
+
+    static MZ_FORCEINLINE int inflateInit2(mz_streamp pStream, int window_bits)
+    {
+        return mz_inflateInit2(pStream, window_bits);
+    }
+
+    static MZ_FORCEINLINE int inflateReset(mz_streamp pStream)
+    {
+        return mz_inflateReset(pStream);
+    }
+
+    static MZ_FORCEINLINE int inflate(mz_streamp pStream, int flush)
+    {
+        return mz_inflate(pStream, flush);
+    }
+
+    static MZ_FORCEINLINE int inflateEnd(mz_streamp pStream)
+    {
+        return mz_inflateEnd(pStream);
+    }
+
+    static MZ_FORCEINLINE int uncompress(unsigned char* pDest, mz_ulong* pDest_len, const unsigned char* pSource, mz_ulong source_len)
+    {
+        return mz_uncompress(pDest, pDest_len, pSource, source_len);
+    }
+
+    static MZ_FORCEINLINE int uncompress2(unsigned char* pDest, mz_ulong* pDest_len, const unsigned char* pSource, mz_ulong* pSource_len)
+    {
+        return mz_uncompress2(pDest, pDest_len, pSource, pSource_len);
+    }
+#endif /*#ifndef MINIZ_NO_INFLATE_APIS*/
+
+    static MZ_FORCEINLINE mz_ulong crc32(mz_ulong crc, const unsigned char *ptr, size_t buf_len)
+    {
+        return mz_crc32(crc, ptr, buf_len);
+    }
+
+    static MZ_FORCEINLINE mz_ulong adler32(mz_ulong adler, const unsigned char *ptr, size_t buf_len)
+    {
+        return mz_adler32(adler, ptr, buf_len);
+    }
+    
+#define MAX_WBITS 15
+#define MAX_MEM_LEVEL 9
+
+    static MZ_FORCEINLINE const char* zError(int err)
+    {
+        return mz_error(err);
+    }
+#define ZLIB_VERSION MZ_VERSION
+#define ZLIB_VERNUM MZ_VERNUM
+#define ZLIB_VER_MAJOR MZ_VER_MAJOR
+#define ZLIB_VER_MINOR MZ_VER_MINOR
+#define ZLIB_VER_REVISION MZ_VER_REVISION
+#define ZLIB_VER_SUBREVISION MZ_VER_SUBREVISION
+
+#define zlibVersion mz_version
+#define zlib_version mz_version()
+#endif /* #ifndef MINIZ_NO_ZLIB_COMPATIBLE_NAMES */
+
+#endif /* MINIZ_NO_ZLIB_APIS */
+
+#ifdef __cplusplus
+}
+#endif
+
+
+
+
+
+#pragma once
+#include <assert.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+
+
+
+/* ------------------- Types and macros */
+typedef unsigned char mz_uint8;
+typedef int16_t mz_int16;
+typedef uint16_t mz_uint16;
+typedef uint32_t mz_uint32;
+typedef uint32_t mz_uint;
+typedef int64_t mz_int64;
+typedef uint64_t mz_uint64;
+typedef int mz_bool;
+
+#define MZ_FALSE (0)
+#define MZ_TRUE (1)
+
+/* Works around MSVC's spammy "warning C4127: conditional expression is constant" message. */
+#ifdef _MSC_VER
+#define MZ_MACRO_END while (0, 0)
+#else
+#define MZ_MACRO_END while (0)
+#endif
+
+#ifdef MINIZ_NO_STDIO
+#define MZ_FILE void *
+#else
+#include <stdio.h>
+#define MZ_FILE FILE
+#endif /* #ifdef MINIZ_NO_STDIO */
+
+#ifdef MINIZ_NO_TIME
+typedef struct mz_dummy_time_t_tag
+{
+    mz_uint32 m_dummy1;
+    mz_uint32 m_dummy2;
+} mz_dummy_time_t;
+#define MZ_TIME_T mz_dummy_time_t
+#else
+#define MZ_TIME_T time_t
+#endif
+
+#define MZ_ASSERT(x) assert(x)
+
+#ifdef MINIZ_NO_MALLOC
+#define MZ_MALLOC(x) NULL
+#define MZ_FREE(x) (void)x, ((void)0)
+#define MZ_REALLOC(p, x) NULL
+#else
+#define MZ_MALLOC(x) malloc(x)
+#define MZ_FREE(x) free(x)
+#define MZ_REALLOC(p, x) realloc(p, x)
+#endif
+
+#define MZ_MAX(a, b) (((a) > (b)) ? (a) : (b))
+#define MZ_MIN(a, b) (((a) < (b)) ? (a) : (b))
+#define MZ_CLEAR_OBJ(obj) memset(&(obj), 0, sizeof(obj))
+#define MZ_CLEAR_ARR(obj) memset((obj), 0, sizeof(obj))
+#define MZ_CLEAR_PTR(obj) memset((obj), 0, sizeof(*obj))
+
+#if MINIZ_USE_UNALIGNED_LOADS_AND_STORES && MINIZ_LITTLE_ENDIAN
+#define MZ_READ_LE16(p) *((const mz_uint16 *)(p))
+#define MZ_READ_LE32(p) *((const mz_uint32 *)(p))
+#else
+#define MZ_READ_LE16(p) ((mz_uint32)(((const mz_uint8 *)(p))[0]) | ((mz_uint32)(((const mz_uint8 *)(p))[1]) << 8U))
+#define MZ_READ_LE32(p) ((mz_uint32)(((const mz_uint8 *)(p))[0]) | ((mz_uint32)(((const mz_uint8 *)(p))[1]) << 8U) | ((mz_uint32)(((const mz_uint8 *)(p))[2]) << 16U) | ((mz_uint32)(((const mz_uint8 *)(p))[3]) << 24U))
+#endif
+
+#define MZ_READ_LE64(p) (((mz_uint64)MZ_READ_LE32(p)) | (((mz_uint64)MZ_READ_LE32((const mz_uint8 *)(p) + sizeof(mz_uint32))) << 32U))
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+    extern MINIZ_EXPORT void *miniz_def_alloc_func(void *opaque, size_t items, size_t size);
+    extern MINIZ_EXPORT void miniz_def_free_func(void *opaque, void *address);
+    extern MINIZ_EXPORT void *miniz_def_realloc_func(void *opaque, void *address, size_t items, size_t size);
+
+#define MZ_UINT16_MAX (0xFFFFU)
+#define MZ_UINT32_MAX (0xFFFFFFFFU)
+
+#ifdef __cplusplus
+}
+#endif
+ #pragma once
+
+
+#ifndef MINIZ_NO_DEFLATE_APIS
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+/* ------------------- Low-level Compression API Definitions */
+
+/* Set TDEFL_LESS_MEMORY to 1 to use less memory (compression will be slightly slower, and raw/dynamic blocks will be output more frequently). */
+#ifndef TDEFL_LESS_MEMORY
+#define TDEFL_LESS_MEMORY 0
+#endif
+
+    /* tdefl_init() compression flags logically OR'd together (low 12 bits contain the max. number of probes per dictionary search): */
+    /* TDEFL_DEFAULT_MAX_PROBES: The compressor defaults to 128 dictionary probes per dictionary search. 0=Huffman only, 1=Huffman+LZ (fastest/crap compression), 4095=Huffman+LZ (slowest/best compression). */
+    enum
+    {
+        TDEFL_HUFFMAN_ONLY = 0,
+        TDEFL_DEFAULT_MAX_PROBES = 128,
+        TDEFL_MAX_PROBES_MASK = 0xFFF
+    };
+
+    /* TDEFL_WRITE_ZLIB_HEADER: If set, the compressor outputs a zlib header before the deflate data, and the Adler-32 of the source data at the end. Otherwise, you'll get raw deflate data. */
+    /* TDEFL_COMPUTE_ADLER32: Always compute the adler-32 of the input data (even when not writing zlib headers). */
+    /* TDEFL_GREEDY_PARSING_FLAG: Set to use faster greedy parsing, instead of more efficient lazy parsing. */
+    /* TDEFL_NONDETERMINISTIC_PARSING_FLAG: Enable to decrease the compressor's initialization time to the minimum, but the output may vary from run to run given the same input (depending on the contents of memory). */
+    /* TDEFL_RLE_MATCHES: Only look for RLE matches (matches with a distance of 1) */
+    /* TDEFL_FILTER_MATCHES: Discards matches <= 5 chars if enabled. */
+    /* TDEFL_FORCE_ALL_STATIC_BLOCKS: Disable usage of optimized Huffman tables. */
+    /* TDEFL_FORCE_ALL_RAW_BLOCKS: Only use raw (uncompressed) deflate blocks. */
+    /* The low 12 bits are reserved to control the max # of hash probes per dictionary lookup (see TDEFL_MAX_PROBES_MASK). */
+    enum
+    {
+        TDEFL_WRITE_ZLIB_HEADER = 0x01000,
+        TDEFL_COMPUTE_ADLER32 = 0x02000,
+        TDEFL_GREEDY_PARSING_FLAG = 0x04000,
+        TDEFL_NONDETERMINISTIC_PARSING_FLAG = 0x08000,
+        TDEFL_RLE_MATCHES = 0x10000,
+        TDEFL_FILTER_MATCHES = 0x20000,
+        TDEFL_FORCE_ALL_STATIC_BLOCKS = 0x40000,
+        TDEFL_FORCE_ALL_RAW_BLOCKS = 0x80000
+    };
+
+    /* High level compression functions: */
+    /* tdefl_compress_mem_to_heap() compresses a block in memory to a heap block allocated via malloc(). */
+    /* On entry: */
+    /*  pSrc_buf, src_buf_len: Pointer and size of source block to compress. */
+    /*  flags: The max match finder probes (default is 128) logically OR'd against the above flags. Higher probes are slower but improve compression. */
+    /* On return: */
+    /*  Function returns a pointer to the compressed data, or NULL on failure. */
+    /*  *pOut_len will be set to the compressed data's size, which could be larger than src_buf_len on uncompressible data. */
+    /*  The caller must free() the returned block when it's no longer needed. */
+    MINIZ_EXPORT void *tdefl_compress_mem_to_heap(const void *pSrc_buf, size_t src_buf_len, size_t *pOut_len, int flags);
+
+    /* tdefl_compress_mem_to_mem() compresses a block in memory to another block in memory. */
+    /* Returns 0 on failure. */
+    MINIZ_EXPORT size_t tdefl_compress_mem_to_mem(void *pOut_buf, size_t out_buf_len, const void *pSrc_buf, size_t src_buf_len, int flags);
+
+    /* Compresses an image to a compressed PNG file in memory. */
+    /* On entry: */
+    /*  pImage, w, h, and num_chans describe the image to compress. num_chans may be 1, 2, 3, or 4. */
+    /*  The image pitch in bytes per scanline will be w*num_chans. The leftmost pixel on the top scanline is stored first in memory. */
+    /*  level may range from [0,10], use MZ_NO_COMPRESSION, MZ_BEST_SPEED, MZ_BEST_COMPRESSION, etc. or a decent default is MZ_DEFAULT_LEVEL */
+    /*  If flip is true, the image will be flipped on the Y axis (useful for OpenGL apps). */
+    /* On return: */
+    /*  Function returns a pointer to the compressed data, or NULL on failure. */
+    /*  *pLen_out will be set to the size of the PNG image file. */
+    /*  The caller must mz_free() the returned heap block (which will typically be larger than *pLen_out) when it's no longer needed. */
+    MINIZ_EXPORT void *tdefl_write_image_to_png_file_in_memory_ex(const void *pImage, int w, int h, int num_chans, size_t *pLen_out, mz_uint level, mz_bool flip);
+    MINIZ_EXPORT void *tdefl_write_image_to_png_file_in_memory(const void *pImage, int w, int h, int num_chans, size_t *pLen_out);
+
+    /* Output stream interface. The compressor uses this interface to write compressed data. It'll typically be called TDEFL_OUT_BUF_SIZE at a time. */
+    typedef mz_bool (*tdefl_put_buf_func_ptr)(const void *pBuf, int len, void *pUser);
+
+    /* tdefl_compress_mem_to_output() compresses a block to an output stream. The above helpers use this function internally. */
+    MINIZ_EXPORT mz_bool tdefl_compress_mem_to_output(const void *pBuf, size_t buf_len, tdefl_put_buf_func_ptr pPut_buf_func, void *pPut_buf_user, int flags);
+
+    enum
+    {
+        TDEFL_MAX_HUFF_TABLES = 3,
+        TDEFL_MAX_HUFF_SYMBOLS_0 = 288,
+        TDEFL_MAX_HUFF_SYMBOLS_1 = 32,
+        TDEFL_MAX_HUFF_SYMBOLS_2 = 19,
+        TDEFL_LZ_DICT_SIZE = 32768,
+        TDEFL_LZ_DICT_SIZE_MASK = TDEFL_LZ_DICT_SIZE - 1,
+        TDEFL_MIN_MATCH_LEN = 3,
+        TDEFL_MAX_MATCH_LEN = 258
+    };
+
+/* TDEFL_OUT_BUF_SIZE MUST be large enough to hold a single entire compressed output block (using static/fixed Huffman codes). */
+#if TDEFL_LESS_MEMORY
+    enum
+    {
+        TDEFL_LZ_CODE_BUF_SIZE = 24 * 1024,
+        TDEFL_OUT_BUF_SIZE = (TDEFL_LZ_CODE_BUF_SIZE * 13) / 10,
+        TDEFL_MAX_HUFF_SYMBOLS = 288,
+        TDEFL_LZ_HASH_BITS = 12,
+        TDEFL_LEVEL1_HASH_SIZE_MASK = 4095,
+        TDEFL_LZ_HASH_SHIFT = (TDEFL_LZ_HASH_BITS + 2) / 3,
+        TDEFL_LZ_HASH_SIZE = 1 << TDEFL_LZ_HASH_BITS
+    };
+#else
+enum
+{
+    TDEFL_LZ_CODE_BUF_SIZE = 64 * 1024,
+    TDEFL_OUT_BUF_SIZE = (mz_uint)((TDEFL_LZ_CODE_BUF_SIZE * 13) / 10),
+    TDEFL_MAX_HUFF_SYMBOLS = 288,
+    TDEFL_LZ_HASH_BITS = 15,
+    TDEFL_LEVEL1_HASH_SIZE_MASK = 4095,
+    TDEFL_LZ_HASH_SHIFT = (TDEFL_LZ_HASH_BITS + 2) / 3,
+    TDEFL_LZ_HASH_SIZE = 1 << TDEFL_LZ_HASH_BITS
+};
+#endif
+
+    /* The low-level tdefl functions below may be used directly if the above helper functions aren't flexible enough. The low-level functions don't make any heap allocations, unlike the above helper functions. */
+    typedef enum
+    {
+        TDEFL_STATUS_BAD_PARAM = -2,
+        TDEFL_STATUS_PUT_BUF_FAILED = -1,
+        TDEFL_STATUS_OKAY = 0,
+        TDEFL_STATUS_DONE = 1
+    } tdefl_status;
+
+    /* Must map to MZ_NO_FLUSH, MZ_SYNC_FLUSH, etc. enums */
+    typedef enum
+    {
+        TDEFL_NO_FLUSH = 0,
+        TDEFL_SYNC_FLUSH = 2,
+        TDEFL_FULL_FLUSH = 3,
+        TDEFL_FINISH = 4
+    } tdefl_flush;
+
+    /* tdefl's compression state structure. */
+    typedef struct
+    {
+        tdefl_put_buf_func_ptr m_pPut_buf_func;
+        void *m_pPut_buf_user;
+        mz_uint m_flags, m_max_probes[2];
+        int m_greedy_parsing;
+        mz_uint m_adler32, m_lookahead_pos, m_lookahead_size, m_dict_size;
+        mz_uint8 *m_pLZ_code_buf, *m_pLZ_flags, *m_pOutput_buf, *m_pOutput_buf_end;
+        mz_uint m_num_flags_left, m_total_lz_bytes, m_lz_code_buf_dict_pos, m_bits_in, m_bit_buffer;
+        mz_uint m_saved_match_dist, m_saved_match_len, m_saved_lit, m_output_flush_ofs, m_output_flush_remaining, m_finished, m_block_index, m_wants_to_finish;
+        tdefl_status m_prev_return_status;
+        const void *m_pIn_buf;
+        void *m_pOut_buf;
+        size_t *m_pIn_buf_size, *m_pOut_buf_size;
+        tdefl_flush m_flush;
+        const mz_uint8 *m_pSrc;
+        size_t m_src_buf_left, m_out_buf_ofs;
+        mz_uint8 m_dict[TDEFL_LZ_DICT_SIZE + TDEFL_MAX_MATCH_LEN - 1];
+        mz_uint16 m_huff_count[TDEFL_MAX_HUFF_TABLES][TDEFL_MAX_HUFF_SYMBOLS];
+        mz_uint16 m_huff_codes[TDEFL_MAX_HUFF_TABLES][TDEFL_MAX_HUFF_SYMBOLS];
+        mz_uint8 m_huff_code_sizes[TDEFL_MAX_HUFF_TABLES][TDEFL_MAX_HUFF_SYMBOLS];
+        mz_uint8 m_lz_code_buf[TDEFL_LZ_CODE_BUF_SIZE];
+        mz_uint16 m_next[TDEFL_LZ_DICT_SIZE];
+        mz_uint16 m_hash[TDEFL_LZ_HASH_SIZE];
+        mz_uint8 m_output_buf[TDEFL_OUT_BUF_SIZE];
+    } tdefl_compressor;
+
+    /* Initializes the compressor. */
+    /* There is no corresponding deinit() function because the tdefl API's do not dynamically allocate memory. */
+    /* pBut_buf_func: If NULL, output data will be supplied to the specified callback. In this case, the user should call the tdefl_compress_buffer() API for compression. */
+    /* If pBut_buf_func is NULL the user should always call the tdefl_compress() API. */
+    /* flags: See the above enums (TDEFL_HUFFMAN_ONLY, TDEFL_WRITE_ZLIB_HEADER, etc.) */
+    MINIZ_EXPORT tdefl_status tdefl_init(tdefl_compressor *d, tdefl_put_buf_func_ptr pPut_buf_func, void *pPut_buf_user, int flags);
+
+    /* Compresses a block of data, consuming as much of the specified input buffer as possible, and writing as much compressed data to the specified output buffer as possible. */
+    MINIZ_EXPORT tdefl_status tdefl_compress(tdefl_compressor *d, const void *pIn_buf, size_t *pIn_buf_size, void *pOut_buf, size_t *pOut_buf_size, tdefl_flush flush);
+
+    /* tdefl_compress_buffer() is only usable when the tdefl_init() is called with a non-NULL tdefl_put_buf_func_ptr. */
+    /* tdefl_compress_buffer() always consumes the entire input buffer. */
+    MINIZ_EXPORT tdefl_status tdefl_compress_buffer(tdefl_compressor *d, const void *pIn_buf, size_t in_buf_size, tdefl_flush flush);
+
+    MINIZ_EXPORT tdefl_status tdefl_get_prev_return_status(tdefl_compressor *d);
+    MINIZ_EXPORT mz_uint32 tdefl_get_adler32(tdefl_compressor *d);
+
+    /* Create tdefl_compress() flags given zlib-style compression parameters. */
+    /* level may range from [0,10] (where 10 is absolute max compression, but may be much slower on some files) */
+    /* window_bits may be -15 (raw deflate) or 15 (zlib) */
+    /* strategy may be either MZ_DEFAULT_STRATEGY, MZ_FILTERED, MZ_HUFFMAN_ONLY, MZ_RLE, or MZ_FIXED */
+    MINIZ_EXPORT mz_uint tdefl_create_comp_flags_from_zip_params(int level, int window_bits, int strategy);
+
+#ifndef MINIZ_NO_MALLOC
+    /* Allocate the tdefl_compressor structure in C so that */
+    /* non-C language bindings to tdefl_ API don't need to worry about */
+    /* structure size and allocation mechanism. */
+    MINIZ_EXPORT tdefl_compressor *tdefl_compressor_alloc(void);
+    MINIZ_EXPORT void tdefl_compressor_free(tdefl_compressor *pComp);
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*#ifndef MINIZ_NO_DEFLATE_APIS*/
+ #pragma once
+
+/* ------------------- Low-level Decompression API Definitions */
+
+#ifndef MINIZ_NO_INFLATE_APIS
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+    /* Decompression flags used by tinfl_decompress(). */
+    /* TINFL_FLAG_PARSE_ZLIB_HEADER: If set, the input has a valid zlib header and ends with an adler32 checksum (it's a valid zlib stream). Otherwise, the input is a raw deflate stream. */
+    /* TINFL_FLAG_HAS_MORE_INPUT: If set, there are more input bytes available beyond the end of the supplied input buffer. If clear, the input buffer contains all remaining input. */
+    /* TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF: If set, the output buffer is large enough to hold the entire decompressed stream. If clear, the output buffer is at least the size of the dictionary (typically 32KB). */
+    /* TINFL_FLAG_COMPUTE_ADLER32: Force adler-32 checksum computation of the decompressed bytes. */
+    enum
+    {
+        TINFL_FLAG_PARSE_ZLIB_HEADER = 1,
+        TINFL_FLAG_HAS_MORE_INPUT = 2,
+        TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF = 4,
+        TINFL_FLAG_COMPUTE_ADLER32 = 8
+    };
+
+    /* High level decompression functions: */
+    /* tinfl_decompress_mem_to_heap() decompresses a block in memory to a heap block allocated via malloc(). */
+    /* On entry: */
+    /*  pSrc_buf, src_buf_len: Pointer and size of the Deflate or zlib source data to decompress. */
+    /* On return: */
+    /*  Function returns a pointer to the decompressed data, or NULL on failure. */
+    /*  *pOut_len will be set to the decompressed data's size, which could be larger than src_buf_len on uncompressible data. */
+    /*  The caller must call mz_free() on the returned block when it's no longer needed. */
+    MINIZ_EXPORT void *tinfl_decompress_mem_to_heap(const void *pSrc_buf, size_t src_buf_len, size_t *pOut_len, int flags);
+
+/* tinfl_decompress_mem_to_mem() decompresses a block in memory to another block in memory. */
+/* Returns TINFL_DECOMPRESS_MEM_TO_MEM_FAILED on failure, or the number of bytes written on success. */
+#define TINFL_DECOMPRESS_MEM_TO_MEM_FAILED ((size_t)(-1))
+    MINIZ_EXPORT size_t tinfl_decompress_mem_to_mem(void *pOut_buf, size_t out_buf_len, const void *pSrc_buf, size_t src_buf_len, int flags);
+
+    /* tinfl_decompress_mem_to_callback() decompresses a block in memory to an internal 32KB buffer, and a user provided callback function will be called to flush the buffer. */
+    /* Returns 1 on success or 0 on failure. */
+    typedef int (*tinfl_put_buf_func_ptr)(const void *pBuf, int len, void *pUser);
+    MINIZ_EXPORT int tinfl_decompress_mem_to_callback(const void *pIn_buf, size_t *pIn_buf_size, tinfl_put_buf_func_ptr pPut_buf_func, void *pPut_buf_user, int flags);
+
+    struct tinfl_decompressor_tag;
+    typedef struct tinfl_decompressor_tag tinfl_decompressor;
+
+#ifndef MINIZ_NO_MALLOC
+    /* Allocate the tinfl_decompressor structure in C so that */
+    /* non-C language bindings to tinfl_ API don't need to worry about */
+    /* structure size and allocation mechanism. */
+    MINIZ_EXPORT tinfl_decompressor *tinfl_decompressor_alloc(void);
+    MINIZ_EXPORT void tinfl_decompressor_free(tinfl_decompressor *pDecomp);
+#endif
+
+/* Max size of LZ dictionary. */
+#define TINFL_LZ_DICT_SIZE 32768
+
+    /* Return status. */
+    typedef enum
+    {
+        /* This flags indicates the inflator needs 1 or more input bytes to make forward progress, but the caller is indicating that no more are available. The compressed data */
+        /* is probably corrupted. If you call the inflator again with more bytes it'll try to continue processing the input but this is a BAD sign (either the data is corrupted or you called it incorrectly). */
+        /* If you call it again with no input you'll just get TINFL_STATUS_FAILED_CANNOT_MAKE_PROGRESS again. */
+        TINFL_STATUS_FAILED_CANNOT_MAKE_PROGRESS = -4,
+
+        /* This flag indicates that one or more of the input parameters was obviously bogus. (You can try calling it again, but if you get this error the calling code is wrong.) */
+        TINFL_STATUS_BAD_PARAM = -3,
+
+        /* This flags indicate the inflator is finished but the adler32 check of the uncompressed data didn't match. If you call it again it'll return TINFL_STATUS_DONE. */
+        TINFL_STATUS_ADLER32_MISMATCH = -2,
+
+        /* This flags indicate the inflator has somehow failed (bad code, corrupted input, etc.). If you call it again without resetting via tinfl_init() it it'll just keep on returning the same status failure code. */
+        TINFL_STATUS_FAILED = -1,
+
+        /* Any status code less than TINFL_STATUS_DONE must indicate a failure. */
+
+        /* This flag indicates the inflator has returned every byte of uncompressed data that it can, has consumed every byte that it needed, has successfully reached the end of the deflate stream, and */
+        /* if zlib headers and adler32 checking enabled that it has successfully checked the uncompressed data's adler32. If you call it again you'll just get TINFL_STATUS_DONE over and over again. */
+        TINFL_STATUS_DONE = 0,
+
+        /* This flag indicates the inflator MUST have more input data (even 1 byte) before it can make any more forward progress, or you need to clear the TINFL_FLAG_HAS_MORE_INPUT */
+        /* flag on the next call if you don't have any more source data. If the source data was somehow corrupted it's also possible (but unlikely) for the inflator to keep on demanding input to */
+        /* proceed, so be sure to properly set the TINFL_FLAG_HAS_MORE_INPUT flag. */
+        TINFL_STATUS_NEEDS_MORE_INPUT = 1,
+
+        /* This flag indicates the inflator definitely has 1 or more bytes of uncompressed data available, but it cannot write this data into the output buffer. */
+        /* Note if the source compressed data was corrupted it's possible for the inflator to return a lot of uncompressed data to the caller. I've been assuming you know how much uncompressed data to expect */
+        /* (either exact or worst case) and will stop calling the inflator and fail after receiving too much. In pure streaming scenarios where you have no idea how many bytes to expect this may not be possible */
+        /* so I may need to add some code to address this. */
+        TINFL_STATUS_HAS_MORE_OUTPUT = 2
+    } tinfl_status;
+
+/* Initializes the decompressor to its initial state. */
+#define tinfl_init(r)     \
+    do                    \
+    {                     \
+        (r)->m_state = 0; \
+    }                     \
+    MZ_MACRO_END
+#define tinfl_get_adler32(r) (r)->m_check_adler32
+
+    /* Main low-level decompressor coroutine function. This is the only function actually needed for decompression. All the other functions are just high-level helpers for improved usability. */
+    /* This is a universal API, i.e. it can be used as a building block to build any desired higher level decompression API. In the limit case, it can be called once per every byte input or output. */
+    MINIZ_EXPORT tinfl_status tinfl_decompress(tinfl_decompressor *r, const mz_uint8 *pIn_buf_next, size_t *pIn_buf_size, mz_uint8 *pOut_buf_start, mz_uint8 *pOut_buf_next, size_t *pOut_buf_size, const mz_uint32 decomp_flags);
+
+    /* Internal/private bits follow. */
+    enum
+    {
+        TINFL_MAX_HUFF_TABLES = 3,
+        TINFL_MAX_HUFF_SYMBOLS_0 = 288,
+        TINFL_MAX_HUFF_SYMBOLS_1 = 32,
+        TINFL_MAX_HUFF_SYMBOLS_2 = 19,
+        TINFL_FAST_LOOKUP_BITS = 10,
+        TINFL_FAST_LOOKUP_SIZE = 1 << TINFL_FAST_LOOKUP_BITS
+    };
+
+#if MINIZ_HAS_64BIT_REGISTERS
+#define TINFL_USE_64BIT_BITBUF 1
+#else
+#define TINFL_USE_64BIT_BITBUF 0
+#endif
+
+#if TINFL_USE_64BIT_BITBUF
+    typedef mz_uint64 tinfl_bit_buf_t;
+#define TINFL_BITBUF_SIZE (64)
+#else
+typedef mz_uint32 tinfl_bit_buf_t;
+#define TINFL_BITBUF_SIZE (32)
+#endif
+
+    struct tinfl_decompressor_tag
+    {
+        mz_uint32 m_state, m_num_bits, m_zhdr0, m_zhdr1, m_z_adler32, m_final, m_type, m_check_adler32, m_dist, m_counter, m_num_extra, m_table_sizes[TINFL_MAX_HUFF_TABLES];
+        tinfl_bit_buf_t m_bit_buf;
+        size_t m_dist_from_out_buf_start;
+        mz_int16 m_look_up[TINFL_MAX_HUFF_TABLES][TINFL_FAST_LOOKUP_SIZE];
+        mz_int16 m_tree_0[TINFL_MAX_HUFF_SYMBOLS_0 * 2];
+        mz_int16 m_tree_1[TINFL_MAX_HUFF_SYMBOLS_1 * 2];
+        mz_int16 m_tree_2[TINFL_MAX_HUFF_SYMBOLS_2 * 2];
+        mz_uint8 m_code_size_0[TINFL_MAX_HUFF_SYMBOLS_0];
+        mz_uint8 m_code_size_1[TINFL_MAX_HUFF_SYMBOLS_1];
+        mz_uint8 m_code_size_2[TINFL_MAX_HUFF_SYMBOLS_2];
+        mz_uint8 m_raw_header[4], m_len_codes[TINFL_MAX_HUFF_SYMBOLS_0 + TINFL_MAX_HUFF_SYMBOLS_1 + 137];
+    };
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*#ifndef MINIZ_NO_INFLATE_APIS*/
+ 
+#pragma once
+
+
+/* ------------------- ZIP archive reading/writing */
+
+#ifndef MINIZ_NO_ARCHIVE_APIS
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+    enum
+    {
+        /* Note: These enums can be reduced as needed to save memory or stack space - they are pretty conservative. */
+        MZ_ZIP_MAX_IO_BUF_SIZE = 64 * 1024,
+        MZ_ZIP_MAX_ARCHIVE_FILENAME_SIZE = 512,
+        MZ_ZIP_MAX_ARCHIVE_FILE_COMMENT_SIZE = 512
+    };
+
+    typedef struct
+    {
+        /* Central directory file index. */
+        mz_uint32 m_file_index;
+
+        /* Byte offset of this entry in the archive's central directory. Note we currently only support up to UINT_MAX or less bytes in the central dir. */
+        mz_uint64 m_central_dir_ofs;
+
+        /* These fields are copied directly from the zip's central dir. */
+        mz_uint16 m_version_made_by;
+        mz_uint16 m_version_needed;
+        mz_uint16 m_bit_flag;
+        mz_uint16 m_method;
+
+        /* CRC-32 of uncompressed data. */
+        mz_uint32 m_crc32;
+
+        /* File's compressed size. */
+        mz_uint64 m_comp_size;
+
+        /* File's uncompressed size. Note, I've seen some old archives where directory entries had 512 bytes for their uncompressed sizes, but when you try to unpack them you actually get 0 bytes. */
+        mz_uint64 m_uncomp_size;
+
+        /* Zip internal and external file attributes. */
+        mz_uint16 m_internal_attr;
+        mz_uint32 m_external_attr;
+
+        /* Entry's local header file offset in bytes. */
+        mz_uint64 m_local_header_ofs;
+
+        /* Size of comment in bytes. */
+        mz_uint32 m_comment_size;
+
+        /* MZ_TRUE if the entry appears to be a directory. */
+        mz_bool m_is_directory;
+
+        /* MZ_TRUE if the entry uses encryption/strong encryption (which miniz_zip doesn't support) */
+        mz_bool m_is_encrypted;
+
+        /* MZ_TRUE if the file is not encrypted, a patch file, and if it uses a compression method we support. */
+        mz_bool m_is_supported;
+
+        /* Filename. If string ends in '/' it's a subdirectory entry. */
+        /* Guaranteed to be zero terminated, may be truncated to fit. */
+        char m_filename[MZ_ZIP_MAX_ARCHIVE_FILENAME_SIZE];
+
+        /* Comment field. */
+        /* Guaranteed to be zero terminated, may be truncated to fit. */
+        char m_comment[MZ_ZIP_MAX_ARCHIVE_FILE_COMMENT_SIZE];
+
+#ifdef MINIZ_NO_TIME
+        MZ_TIME_T m_padding;
+#else
+    MZ_TIME_T m_time;
+#endif
+    } mz_zip_archive_file_stat;
+
+    typedef size_t (*mz_file_read_func)(void *pOpaque, mz_uint64 file_ofs, void *pBuf, size_t n);
+    typedef size_t (*mz_file_write_func)(void *pOpaque, mz_uint64 file_ofs, const void *pBuf, size_t n);
+    typedef mz_bool (*mz_file_needs_keepalive)(void *pOpaque);
+
+    struct mz_zip_internal_state_tag;
+    typedef struct mz_zip_internal_state_tag mz_zip_internal_state;
+
+    typedef enum
+    {
+        MZ_ZIP_MODE_INVALID = 0,
+        MZ_ZIP_MODE_READING = 1,
+        MZ_ZIP_MODE_WRITING = 2,
+        MZ_ZIP_MODE_WRITING_HAS_BEEN_FINALIZED = 3
+    } mz_zip_mode;
+
+    typedef enum
+    {
+        MZ_ZIP_FLAG_CASE_SENSITIVE = 0x0100,
+        MZ_ZIP_FLAG_IGNORE_PATH = 0x0200,
+        MZ_ZIP_FLAG_COMPRESSED_DATA = 0x0400,
+        MZ_ZIP_FLAG_DO_NOT_SORT_CENTRAL_DIRECTORY = 0x0800,
+        MZ_ZIP_FLAG_VALIDATE_LOCATE_FILE_FLAG = 0x1000, /* if enabled, mz_zip_reader_locate_file() will be called on each file as its validated to ensure the func finds the file in the central dir (intended for testing) */
+        MZ_ZIP_FLAG_VALIDATE_HEADERS_ONLY = 0x2000,     /* validate the local headers, but don't decompress the entire file and check the crc32 */
+        MZ_ZIP_FLAG_WRITE_ZIP64 = 0x4000,               /* always use the zip64 file format, instead of the original zip file format with automatic switch to zip64. Use as flags parameter with mz_zip_writer_init*_v2 */
+        MZ_ZIP_FLAG_WRITE_ALLOW_READING = 0x8000,
+        MZ_ZIP_FLAG_ASCII_FILENAME = 0x10000,
+        /*After adding a compressed file, seek back
+        to local file header and set the correct sizes*/
+        MZ_ZIP_FLAG_WRITE_HEADER_SET_SIZE = 0x20000,
+        MZ_ZIP_FLAG_READ_ALLOW_WRITING = 0x40000
+    } mz_zip_flags;
+
+    typedef enum
+    {
+        MZ_ZIP_TYPE_INVALID = 0,
+        MZ_ZIP_TYPE_USER,
+        MZ_ZIP_TYPE_MEMORY,
+        MZ_ZIP_TYPE_HEAP,
+        MZ_ZIP_TYPE_FILE,
+        MZ_ZIP_TYPE_CFILE,
+        MZ_ZIP_TOTAL_TYPES
+    } mz_zip_type;
+
+    /* miniz error codes. Be sure to update mz_zip_get_error_string() if you add or modify this enum. */
+    typedef enum
+    {
+        MZ_ZIP_NO_ERROR = 0,
+        MZ_ZIP_UNDEFINED_ERROR,
+        MZ_ZIP_TOO_MANY_FILES,
+        MZ_ZIP_FILE_TOO_LARGE,
+        MZ_ZIP_UNSUPPORTED_METHOD,
+        MZ_ZIP_UNSUPPORTED_ENCRYPTION,
+        MZ_ZIP_UNSUPPORTED_FEATURE,
+        MZ_ZIP_FAILED_FINDING_CENTRAL_DIR,
+        MZ_ZIP_NOT_AN_ARCHIVE,
+        MZ_ZIP_INVALID_HEADER_OR_CORRUPTED,
+        MZ_ZIP_UNSUPPORTED_MULTIDISK,
+        MZ_ZIP_DECOMPRESSION_FAILED,
+        MZ_ZIP_COMPRESSION_FAILED,
+        MZ_ZIP_UNEXPECTED_DECOMPRESSED_SIZE,
+        MZ_ZIP_CRC_CHECK_FAILED,
+        MZ_ZIP_UNSUPPORTED_CDIR_SIZE,
+        MZ_ZIP_ALLOC_FAILED,
+        MZ_ZIP_FILE_OPEN_FAILED,
+        MZ_ZIP_FILE_CREATE_FAILED,
+        MZ_ZIP_FILE_WRITE_FAILED,
+        MZ_ZIP_FILE_READ_FAILED,
+        MZ_ZIP_FILE_CLOSE_FAILED,
+        MZ_ZIP_FILE_SEEK_FAILED,
+        MZ_ZIP_FILE_STAT_FAILED,
+        MZ_ZIP_INVALID_PARAMETER,
+        MZ_ZIP_INVALID_FILENAME,
+        MZ_ZIP_BUF_TOO_SMALL,
+        MZ_ZIP_INTERNAL_ERROR,
+        MZ_ZIP_FILE_NOT_FOUND,
+        MZ_ZIP_ARCHIVE_TOO_LARGE,
+        MZ_ZIP_VALIDATION_FAILED,
+        MZ_ZIP_WRITE_CALLBACK_FAILED,
+        MZ_ZIP_TOTAL_ERRORS
+    } mz_zip_error;
+
+    typedef struct
+    {
+        mz_uint64 m_archive_size;
+        mz_uint64 m_central_directory_file_ofs;
+
+        /* We only support up to UINT32_MAX files in zip64 mode. */
+        mz_uint32 m_total_files;
+        mz_zip_mode m_zip_mode;
+        mz_zip_type m_zip_type;
+        mz_zip_error m_last_error;
+
+        mz_uint64 m_file_offset_alignment;
+
+        mz_alloc_func m_pAlloc;
+        mz_free_func m_pFree;
+        mz_realloc_func m_pRealloc;
+        void *m_pAlloc_opaque;
+
+        mz_file_read_func m_pRead;
+        mz_file_write_func m_pWrite;
+        mz_file_needs_keepalive m_pNeeds_keepalive;
+        void *m_pIO_opaque;
+
+        mz_zip_internal_state *m_pState;
+
+    } mz_zip_archive;
+
+    typedef struct
+    {
+        mz_zip_archive *pZip;
+        mz_uint flags;
+
+        int status;
+
+        mz_uint64 read_buf_size, read_buf_ofs, read_buf_avail, comp_remaining, out_buf_ofs, cur_file_ofs;
+        mz_zip_archive_file_stat file_stat;
+        void *pRead_buf;
+        void *pWrite_buf;
+
+        size_t out_blk_remain;
+
+        tinfl_decompressor inflator;
+
+#ifdef MINIZ_DISABLE_ZIP_READER_CRC32_CHECKS
+        mz_uint padding;
+#else
+    mz_uint file_crc32;
+#endif
+
+    } mz_zip_reader_extract_iter_state;
+
+    /* -------- ZIP reading */
+
+    /* Inits a ZIP archive reader. */
+    /* These functions read and validate the archive's central directory. */
+    MINIZ_EXPORT mz_bool mz_zip_reader_init(mz_zip_archive *pZip, mz_uint64 size, mz_uint flags);
+
+    MINIZ_EXPORT mz_bool mz_zip_reader_init_mem(mz_zip_archive *pZip, const void *pMem, size_t size, mz_uint flags);
+
+#ifndef MINIZ_NO_STDIO
+    /* Read a archive from a disk file. */
+    /* file_start_ofs is the file offset where the archive actually begins, or 0. */
+    /* actual_archive_size is the true total size of the archive, which may be smaller than the file's actual size on disk. If zero the entire file is treated as the archive. */
+    MINIZ_EXPORT mz_bool mz_zip_reader_init_file(mz_zip_archive *pZip, const char *pFilename, mz_uint32 flags);
+    MINIZ_EXPORT mz_bool mz_zip_reader_init_file_v2(mz_zip_archive *pZip, const char *pFilename, mz_uint flags, mz_uint64 file_start_ofs, mz_uint64 archive_size);
+
+    /* Read an archive from an already opened FILE, beginning at the current file position. */
+    /* The archive is assumed to be archive_size bytes long. If archive_size is 0, then the entire rest of the file is assumed to contain the archive. */
+    /* The FILE will NOT be closed when mz_zip_reader_end() is called. */
+    MINIZ_EXPORT mz_bool mz_zip_reader_init_cfile(mz_zip_archive *pZip, MZ_FILE *pFile, mz_uint64 archive_size, mz_uint flags);
+#endif
+
+    /* Ends archive reading, freeing all allocations, and closing the input archive file if mz_zip_reader_init_file() was used. */
+    MINIZ_EXPORT mz_bool mz_zip_reader_end(mz_zip_archive *pZip);
+
+    /* -------- ZIP reading or writing */
+
+    /* Clears a mz_zip_archive struct to all zeros. */
+    /* Important: This must be done before passing the struct to any mz_zip functions. */
+    MINIZ_EXPORT void mz_zip_zero_struct(mz_zip_archive *pZip);
+
+    MINIZ_EXPORT mz_zip_mode mz_zip_get_mode(mz_zip_archive *pZip);
+    MINIZ_EXPORT mz_zip_type mz_zip_get_type(mz_zip_archive *pZip);
+
+    /* Returns the total number of files in the archive. */
+    MINIZ_EXPORT mz_uint mz_zip_reader_get_num_files(mz_zip_archive *pZip);
+
+    MINIZ_EXPORT mz_uint64 mz_zip_get_archive_size(mz_zip_archive *pZip);
+    MINIZ_EXPORT mz_uint64 mz_zip_get_archive_file_start_offset(mz_zip_archive *pZip);
+    MINIZ_EXPORT MZ_FILE *mz_zip_get_cfile(mz_zip_archive *pZip);
+
+    /* Reads n bytes of raw archive data, starting at file offset file_ofs, to pBuf. */
+    MINIZ_EXPORT size_t mz_zip_read_archive_data(mz_zip_archive *pZip, mz_uint64 file_ofs, void *pBuf, size_t n);
+
+    /* All mz_zip funcs set the m_last_error field in the mz_zip_archive struct. These functions retrieve/manipulate this field. */
+    /* Note that the m_last_error functionality is not thread safe. */
+    MINIZ_EXPORT mz_zip_error mz_zip_set_last_error(mz_zip_archive *pZip, mz_zip_error err_num);
+    MINIZ_EXPORT mz_zip_error mz_zip_peek_last_error(mz_zip_archive *pZip);
+    MINIZ_EXPORT mz_zip_error mz_zip_clear_last_error(mz_zip_archive *pZip);
+    MINIZ_EXPORT mz_zip_error mz_zip_get_last_error(mz_zip_archive *pZip);
+    MINIZ_EXPORT const char *mz_zip_get_error_string(mz_zip_error mz_err);
+
+    /* MZ_TRUE if the archive file entry is a directory entry. */
+    MINIZ_EXPORT mz_bool mz_zip_reader_is_file_a_directory(mz_zip_archive *pZip, mz_uint file_index);
+
+    /* MZ_TRUE if the file is encrypted/strong encrypted. */
+    MINIZ_EXPORT mz_bool mz_zip_reader_is_file_encrypted(mz_zip_archive *pZip, mz_uint file_index);
+
+    /* MZ_TRUE if the compression method is supported, and the file is not encrypted, and the file is not a compressed patch file. */
+    MINIZ_EXPORT mz_bool mz_zip_reader_is_file_supported(mz_zip_archive *pZip, mz_uint file_index);
+
+    /* Retrieves the filename of an archive file entry. */
+    /* Returns the number of bytes written to pFilename, or if filename_buf_size is 0 this function returns the number of bytes needed to fully store the filename. */
+    MINIZ_EXPORT mz_uint mz_zip_reader_get_filename(mz_zip_archive *pZip, mz_uint file_index, char *pFilename, mz_uint filename_buf_size);
+
+    /* Attempts to locates a file in the archive's central directory. */
+    /* Valid flags: MZ_ZIP_FLAG_CASE_SENSITIVE, MZ_ZIP_FLAG_IGNORE_PATH */
+    /* Returns -1 if the file cannot be found. */
+    MINIZ_EXPORT int mz_zip_reader_locate_file(mz_zip_archive *pZip, const char *pName, const char *pComment, mz_uint flags);
+    MINIZ_EXPORT mz_bool mz_zip_reader_locate_file_v2(mz_zip_archive *pZip, const char *pName, const char *pComment, mz_uint flags, mz_uint32 *file_index);
+
+    /* Returns detailed information about an archive file entry. */
+    MINIZ_EXPORT mz_bool mz_zip_reader_file_stat(mz_zip_archive *pZip, mz_uint file_index, mz_zip_archive_file_stat *pStat);
+
+    /* MZ_TRUE if the file is in zip64 format. */
+    /* A file is considered zip64 if it contained a zip64 end of central directory marker, or if it contained any zip64 extended file information fields in the central directory. */
+    MINIZ_EXPORT mz_bool mz_zip_is_zip64(mz_zip_archive *pZip);
+
+    /* Returns the total central directory size in bytes. */
+    /* The current max supported size is <= MZ_UINT32_MAX. */
+    MINIZ_EXPORT size_t mz_zip_get_central_dir_size(mz_zip_archive *pZip);
+
+    /* Extracts a archive file to a memory buffer using no memory allocation. */
+    /* There must be at least enough room on the stack to store the inflator's state (~34KB or so). */
+    MINIZ_EXPORT mz_bool mz_zip_reader_extract_to_mem_no_alloc(mz_zip_archive *pZip, mz_uint file_index, void *pBuf, size_t buf_size, mz_uint flags, void *pUser_read_buf, size_t user_read_buf_size);
+    MINIZ_EXPORT mz_bool mz_zip_reader_extract_file_to_mem_no_alloc(mz_zip_archive *pZip, const char *pFilename, void *pBuf, size_t buf_size, mz_uint flags, void *pUser_read_buf, size_t user_read_buf_size);
+
+    /* Extracts a archive file to a memory buffer. */
+    MINIZ_EXPORT mz_bool mz_zip_reader_extract_to_mem(mz_zip_archive *pZip, mz_uint file_index, void *pBuf, size_t buf_size, mz_uint flags);
+    MINIZ_EXPORT mz_bool mz_zip_reader_extract_file_to_mem(mz_zip_archive *pZip, const char *pFilename, void *pBuf, size_t buf_size, mz_uint flags);
+
+    /* Extracts a archive file to a dynamically allocated heap buffer. */
+    /* The memory will be allocated via the mz_zip_archive's alloc/realloc functions. */
+    /* Returns NULL and sets the last error on failure. */
+    MINIZ_EXPORT void *mz_zip_reader_extract_to_heap(mz_zip_archive *pZip, mz_uint file_index, size_t *pSize, mz_uint flags);
+    MINIZ_EXPORT void *mz_zip_reader_extract_file_to_heap(mz_zip_archive *pZip, const char *pFilename, size_t *pSize, mz_uint flags);
+
+    /* Extracts a archive file using a callback function to output the file's data. */
+    MINIZ_EXPORT mz_bool mz_zip_reader_extract_to_callback(mz_zip_archive *pZip, mz_uint file_index, mz_file_write_func pCallback, void *pOpaque, mz_uint flags);
+    MINIZ_EXPORT mz_bool mz_zip_reader_extract_file_to_callback(mz_zip_archive *pZip, const char *pFilename, mz_file_write_func pCallback, void *pOpaque, mz_uint flags);
+
+    /* Extract a file iteratively */
+    MINIZ_EXPORT mz_zip_reader_extract_iter_state *mz_zip_reader_extract_iter_new(mz_zip_archive *pZip, mz_uint file_index, mz_uint flags);
+    MINIZ_EXPORT mz_zip_reader_extract_iter_state *mz_zip_reader_extract_file_iter_new(mz_zip_archive *pZip, const char *pFilename, mz_uint flags);
+    MINIZ_EXPORT size_t mz_zip_reader_extract_iter_read(mz_zip_reader_extract_iter_state *pState, void *pvBuf, size_t buf_size);
+    MINIZ_EXPORT mz_bool mz_zip_reader_extract_iter_free(mz_zip_reader_extract_iter_state *pState);
+
+#ifndef MINIZ_NO_STDIO
+    /* Extracts a archive file to a disk file and sets its last accessed and modified times. */
+    /* This function only extracts files, not archive directory records. */
+    MINIZ_EXPORT mz_bool mz_zip_reader_extract_to_file(mz_zip_archive *pZip, mz_uint file_index, const char *pDst_filename, mz_uint flags);
+    MINIZ_EXPORT mz_bool mz_zip_reader_extract_file_to_file(mz_zip_archive *pZip, const char *pArchive_filename, const char *pDst_filename, mz_uint flags);
+
+    /* Extracts a archive file starting at the current position in the destination FILE stream. */
+    MINIZ_EXPORT mz_bool mz_zip_reader_extract_to_cfile(mz_zip_archive *pZip, mz_uint file_index, MZ_FILE *File, mz_uint flags);
+    MINIZ_EXPORT mz_bool mz_zip_reader_extract_file_to_cfile(mz_zip_archive *pZip, const char *pArchive_filename, MZ_FILE *pFile, mz_uint flags);
+#endif
+
+#if 0
+/* TODO */
+	typedef void *mz_zip_streaming_extract_state_ptr;
+	mz_zip_streaming_extract_state_ptr mz_zip_streaming_extract_begin(mz_zip_archive *pZip, mz_uint file_index, mz_uint flags);
+	mz_uint64 mz_zip_streaming_extract_get_size(mz_zip_archive *pZip, mz_zip_streaming_extract_state_ptr pState);
+	mz_uint64 mz_zip_streaming_extract_get_cur_ofs(mz_zip_archive *pZip, mz_zip_streaming_extract_state_ptr pState);
+	mz_bool mz_zip_streaming_extract_seek(mz_zip_archive *pZip, mz_zip_streaming_extract_state_ptr pState, mz_uint64 new_ofs);
+	size_t mz_zip_streaming_extract_read(mz_zip_archive *pZip, mz_zip_streaming_extract_state_ptr pState, void *pBuf, size_t buf_size);
+	mz_bool mz_zip_streaming_extract_end(mz_zip_archive *pZip, mz_zip_streaming_extract_state_ptr pState);
+#endif
+
+    /* This function compares the archive's local headers, the optional local zip64 extended information block, and the optional descriptor following the compressed data vs. the data in the central directory. */
+    /* It also validates that each file can be successfully uncompressed unless the MZ_ZIP_FLAG_VALIDATE_HEADERS_ONLY is specified. */
+    MINIZ_EXPORT mz_bool mz_zip_validate_file(mz_zip_archive *pZip, mz_uint file_index, mz_uint flags);
+
+    /* Validates an entire archive by calling mz_zip_validate_file() on each file. */
+    MINIZ_EXPORT mz_bool mz_zip_validate_archive(mz_zip_archive *pZip, mz_uint flags);
+
+    /* Misc utils/helpers, valid for ZIP reading or writing */
+    MINIZ_EXPORT mz_bool mz_zip_validate_mem_archive(const void *pMem, size_t size, mz_uint flags, mz_zip_error *pErr);
+#ifndef MINIZ_NO_STDIO
+    MINIZ_EXPORT mz_bool mz_zip_validate_file_archive(const char *pFilename, mz_uint flags, mz_zip_error *pErr);
+#endif
+
+    /* Universal end function - calls either mz_zip_reader_end() or mz_zip_writer_end(). */
+    MINIZ_EXPORT mz_bool mz_zip_end(mz_zip_archive *pZip);
+
+    /* -------- ZIP writing */
+
+#ifndef MINIZ_NO_ARCHIVE_WRITING_APIS
+
+    /* Inits a ZIP archive writer. */
+    /*Set pZip->m_pWrite (and pZip->m_pIO_opaque) before calling mz_zip_writer_init or mz_zip_writer_init_v2*/
+    /*The output is streamable, i.e. file_ofs in mz_file_write_func always increases only by n*/
+    MINIZ_EXPORT mz_bool mz_zip_writer_init(mz_zip_archive *pZip, mz_uint64 existing_size);
+    MINIZ_EXPORT mz_bool mz_zip_writer_init_v2(mz_zip_archive *pZip, mz_uint64 existing_size, mz_uint flags);
+
+    MINIZ_EXPORT mz_bool mz_zip_writer_init_heap(mz_zip_archive *pZip, size_t size_to_reserve_at_beginning, size_t initial_allocation_size);
+    MINIZ_EXPORT mz_bool mz_zip_writer_init_heap_v2(mz_zip_archive *pZip, size_t size_to_reserve_at_beginning, size_t initial_allocation_size, mz_uint flags);
+
+#ifndef MINIZ_NO_STDIO
+    MINIZ_EXPORT mz_bool mz_zip_writer_init_file(mz_zip_archive *pZip, const char *pFilename, mz_uint64 size_to_reserve_at_beginning);
+    MINIZ_EXPORT mz_bool mz_zip_writer_init_file_v2(mz_zip_archive *pZip, const char *pFilename, mz_uint64 size_to_reserve_at_beginning, mz_uint flags);
+    MINIZ_EXPORT mz_bool mz_zip_writer_init_cfile(mz_zip_archive *pZip, MZ_FILE *pFile, mz_uint flags);
+#endif
+
+    /* Converts a ZIP archive reader object into a writer object, to allow efficient in-place file appends to occur on an existing archive. */
+    /* For archives opened using mz_zip_reader_init_file, pFilename must be the archive's filename so it can be reopened for writing. If the file can't be reopened, mz_zip_reader_end() will be called. */
+    /* For archives opened using mz_zip_reader_init_mem, the memory block must be growable using the realloc callback (which defaults to realloc unless you've overridden it). */
+    /* Finally, for archives opened using mz_zip_reader_init, the mz_zip_archive's user provided m_pWrite function cannot be NULL. */
+    /* Note: In-place archive modification is not recommended unless you know what you're doing, because if execution stops or something goes wrong before */
+    /* the archive is finalized the file's central directory will be hosed. */
+    MINIZ_EXPORT mz_bool mz_zip_writer_init_from_reader(mz_zip_archive *pZip, const char *pFilename);
+    MINIZ_EXPORT mz_bool mz_zip_writer_init_from_reader_v2(mz_zip_archive *pZip, const char *pFilename, mz_uint flags);
+
+    /* Adds the contents of a memory buffer to an archive. These functions record the current local time into the archive. */
+    /* To add a directory entry, call this method with an archive name ending in a forwardslash with an empty buffer. */
+    /* level_and_flags - compression level (0-10, see MZ_BEST_SPEED, MZ_BEST_COMPRESSION, etc.) logically OR'd with zero or more mz_zip_flags, or just set to MZ_DEFAULT_COMPRESSION. */
+    MINIZ_EXPORT mz_bool mz_zip_writer_add_mem(mz_zip_archive *pZip, const char *pArchive_name, const void *pBuf, size_t buf_size, mz_uint level_and_flags);
+
+    /* Like mz_zip_writer_add_mem(), except you can specify a file comment field, and optionally supply the function with already compressed data. */
+    /* uncomp_size/uncomp_crc32 are only used if the MZ_ZIP_FLAG_COMPRESSED_DATA flag is specified. */
+    MINIZ_EXPORT mz_bool mz_zip_writer_add_mem_ex(mz_zip_archive *pZip, const char *pArchive_name, const void *pBuf, size_t buf_size, const void *pComment, mz_uint16 comment_size, mz_uint level_and_flags,
+                                                  mz_uint64 uncomp_size, mz_uint32 uncomp_crc32);
+
+    MINIZ_EXPORT mz_bool mz_zip_writer_add_mem_ex_v2(mz_zip_archive *pZip, const char *pArchive_name, const void *pBuf, size_t buf_size, const void *pComment, mz_uint16 comment_size, mz_uint level_and_flags,
+                                                     mz_uint64 uncomp_size, mz_uint32 uncomp_crc32, MZ_TIME_T *last_modified, const char *user_extra_data_local, mz_uint user_extra_data_local_len,
+                                                     const char *user_extra_data_central, mz_uint user_extra_data_central_len);
+
+    /* Adds the contents of a file to an archive. This function also records the disk file's modified time into the archive. */
+    /* File data is supplied via a read callback function. User mz_zip_writer_add_(c)file to add a file directly.*/
+    MINIZ_EXPORT mz_bool mz_zip_writer_add_read_buf_callback(mz_zip_archive *pZip, const char *pArchive_name, mz_file_read_func read_callback, void *callback_opaque, mz_uint64 max_size,
+                                                             const MZ_TIME_T *pFile_time, const void *pComment, mz_uint16 comment_size, mz_uint level_and_flags, const char *user_extra_data_local, mz_uint user_extra_data_local_len,
+                                                             const char *user_extra_data_central, mz_uint user_extra_data_central_len);
+
+#ifndef MINIZ_NO_STDIO
+    /* Adds the contents of a disk file to an archive. This function also records the disk file's modified time into the archive. */
+    /* level_and_flags - compression level (0-10, see MZ_BEST_SPEED, MZ_BEST_COMPRESSION, etc.) logically OR'd with zero or more mz_zip_flags, or just set to MZ_DEFAULT_COMPRESSION. */
+    MINIZ_EXPORT mz_bool mz_zip_writer_add_file(mz_zip_archive *pZip, const char *pArchive_name, const char *pSrc_filename, const void *pComment, mz_uint16 comment_size, mz_uint level_and_flags);
+
+    /* Like mz_zip_writer_add_file(), except the file data is read from the specified FILE stream. */
+    MINIZ_EXPORT mz_bool mz_zip_writer_add_cfile(mz_zip_archive *pZip, const char *pArchive_name, MZ_FILE *pSrc_file, mz_uint64 max_size,
+                                                 const MZ_TIME_T *pFile_time, const void *pComment, mz_uint16 comment_size, mz_uint level_and_flags, const char *user_extra_data_local, mz_uint user_extra_data_local_len,
+                                                 const char *user_extra_data_central, mz_uint user_extra_data_central_len);
+#endif
+
+    /* Adds a file to an archive by fully cloning the data from another archive. */
+    /* This function fully clones the source file's compressed data (no recompression), along with its full filename, extra data (it may add or modify the zip64 local header extra data field), and the optional descriptor following the compressed data. */
+    MINIZ_EXPORT mz_bool mz_zip_writer_add_from_zip_reader(mz_zip_archive *pZip, mz_zip_archive *pSource_zip, mz_uint src_file_index);
+
+    /* Finalizes the archive by writing the central directory records followed by the end of central directory record. */
+    /* After an archive is finalized, the only valid call on the mz_zip_archive struct is mz_zip_writer_end(). */
+    /* An archive must be manually finalized by calling this function for it to be valid. */
+    MINIZ_EXPORT mz_bool mz_zip_writer_finalize_archive(mz_zip_archive *pZip);
+
+    /* Finalizes a heap archive, returning a pointer to the heap block and its size. */
+    /* The heap block will be allocated using the mz_zip_archive's alloc/realloc callbacks. */
+    MINIZ_EXPORT mz_bool mz_zip_writer_finalize_heap_archive(mz_zip_archive *pZip, void **ppBuf, size_t *pSize);
+
+    /* Ends archive writing, freeing all allocations, and closing the output file if mz_zip_writer_init_file() was used. */
+    /* Note for the archive to be valid, it *must* have been finalized before ending (this function will not do it for you). */
+    MINIZ_EXPORT mz_bool mz_zip_writer_end(mz_zip_archive *pZip);
+
+    /* -------- Misc. high-level helper functions: */
+
+    /* mz_zip_add_mem_to_archive_file_in_place() efficiently (but not atomically) appends a memory blob to a ZIP archive. */
+    /* Note this is NOT a fully safe operation. If it crashes or dies in some way your archive can be left in a screwed up state (without a central directory). */
+    /* level_and_flags - compression level (0-10, see MZ_BEST_SPEED, MZ_BEST_COMPRESSION, etc.) logically OR'd with zero or more mz_zip_flags, or just set to MZ_DEFAULT_COMPRESSION. */
+    /* TODO: Perhaps add an option to leave the existing central dir in place in case the add dies? We could then truncate the file (so the old central dir would be at the end) if something goes wrong. */
+    MINIZ_EXPORT mz_bool mz_zip_add_mem_to_archive_file_in_place(const char *pZip_filename, const char *pArchive_name, const void *pBuf, size_t buf_size, const void *pComment, mz_uint16 comment_size, mz_uint level_and_flags);
+    MINIZ_EXPORT mz_bool mz_zip_add_mem_to_archive_file_in_place_v2(const char *pZip_filename, const char *pArchive_name, const void *pBuf, size_t buf_size, const void *pComment, mz_uint16 comment_size, mz_uint level_and_flags, mz_zip_error *pErr);
+
+#ifndef MINIZ_NO_STDIO
+    /* Reads a single file from an archive into a heap block. */
+    /* If pComment is not NULL, only the file with the specified comment will be extracted. */
+    /* Returns NULL on failure. */
+    MINIZ_EXPORT void *mz_zip_extract_archive_file_to_heap(const char *pZip_filename, const char *pArchive_name, size_t *pSize, mz_uint flags);
+    MINIZ_EXPORT void *mz_zip_extract_archive_file_to_heap_v2(const char *pZip_filename, const char *pArchive_name, const char *pComment, size_t *pSize, mz_uint flags, mz_zip_error *pErr);
+#endif
+
+#endif /* #ifndef MINIZ_NO_ARCHIVE_WRITING_APIS */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* MINIZ_NO_ARCHIVE_APIS */
diff --git a/3rdParty-Core/nlohmann/json.hpp b/3rdParty-Core/nlohmann/json.hpp
new file mode 100644
index 0000000000..d28bfa6d16
--- /dev/null
+++ b/3rdParty-Core/nlohmann/json.hpp
@@ -0,0 +1,25526 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013 - 2025 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+/****************************************************************************\
+ * Note on documentation: The source files contain links to the online      *
+ * documentation of the public API at https://json.nlohmann.me. This URL    *
+ * contains the most recent documentation and should also be applicable to  *
+ * previous versions; documentation for deprecated functions is not         *
+ * removed, but marked deprecated. See "Generate documentation" section in  *
+ * file docs/README.md.                                                     *
+\****************************************************************************/
+
+#ifndef INCLUDE_NLOHMANN_JSON_HPP_
+#define INCLUDE_NLOHMANN_JSON_HPP_
+
+#include <algorithm> // all_of, find, for_each
+#include <cstddef> // nullptr_t, ptrdiff_t, size_t
+#include <functional> // hash, less
+#include <initializer_list> // initializer_list
+#ifndef JSON_NO_IO
+    #include <iosfwd> // istream, ostream
+#endif  // JSON_NO_IO
+#include <iterator> // random_access_iterator_tag
+#include <memory> // unique_ptr
+#include <string> // string, stoi, to_string
+#include <utility> // declval, forward, move, pair, swap
+#include <vector> // vector
+
+// #include <nlohmann/adl_serializer.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013 - 2025 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <utility>
+
+// #include <nlohmann/detail/abi_macros.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013 - 2025 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+// This file contains all macro definitions affecting or depending on the ABI
+
+#ifndef JSON_SKIP_LIBRARY_VERSION_CHECK
+    #if defined(NLOHMANN_JSON_VERSION_MAJOR) && defined(NLOHMANN_JSON_VERSION_MINOR) && defined(NLOHMANN_JSON_VERSION_PATCH)
+        #if NLOHMANN_JSON_VERSION_MAJOR != 3 || NLOHMANN_JSON_VERSION_MINOR != 12 || NLOHMANN_JSON_VERSION_PATCH != 0
+            #warning "Already included a different version of the library!"
+        #endif
+    #endif
+#endif
+
+#define NLOHMANN_JSON_VERSION_MAJOR 3   // NOLINT(modernize-macro-to-enum)
+#define NLOHMANN_JSON_VERSION_MINOR 12  // NOLINT(modernize-macro-to-enum)
+#define NLOHMANN_JSON_VERSION_PATCH 0   // NOLINT(modernize-macro-to-enum)
+
+#ifndef JSON_DIAGNOSTICS
+    #define JSON_DIAGNOSTICS 0
+#endif
+
+#ifndef JSON_DIAGNOSTIC_POSITIONS
+    #define JSON_DIAGNOSTIC_POSITIONS 0
+#endif
+
+#ifndef JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON
+    #define JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON 0
+#endif
+
+#if JSON_DIAGNOSTICS
+    #define NLOHMANN_JSON_ABI_TAG_DIAGNOSTICS _diag
+#else
+    #define NLOHMANN_JSON_ABI_TAG_DIAGNOSTICS
+#endif
+
+#if JSON_DIAGNOSTIC_POSITIONS
+    #define NLOHMANN_JSON_ABI_TAG_DIAGNOSTIC_POSITIONS _dp
+#else
+    #define NLOHMANN_JSON_ABI_TAG_DIAGNOSTIC_POSITIONS
+#endif
+
+#if JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON
+    #define NLOHMANN_JSON_ABI_TAG_LEGACY_DISCARDED_VALUE_COMPARISON _ldvcmp
+#else
+    #define NLOHMANN_JSON_ABI_TAG_LEGACY_DISCARDED_VALUE_COMPARISON
+#endif
+
+#ifndef NLOHMANN_JSON_NAMESPACE_NO_VERSION
+    #define NLOHMANN_JSON_NAMESPACE_NO_VERSION 0
+#endif
+
+// Construct the namespace ABI tags component
+#define NLOHMANN_JSON_ABI_TAGS_CONCAT_EX(a, b, c) json_abi ## a ## b ## c
+#define NLOHMANN_JSON_ABI_TAGS_CONCAT(a, b, c) \
+    NLOHMANN_JSON_ABI_TAGS_CONCAT_EX(a, b, c)
+
+#define NLOHMANN_JSON_ABI_TAGS                                       \
+    NLOHMANN_JSON_ABI_TAGS_CONCAT(                                   \
+            NLOHMANN_JSON_ABI_TAG_DIAGNOSTICS,                       \
+            NLOHMANN_JSON_ABI_TAG_LEGACY_DISCARDED_VALUE_COMPARISON, \
+            NLOHMANN_JSON_ABI_TAG_DIAGNOSTIC_POSITIONS)
+
+// Construct the namespace version component
+#define NLOHMANN_JSON_NAMESPACE_VERSION_CONCAT_EX(major, minor, patch) \
+    _v ## major ## _ ## minor ## _ ## patch
+#define NLOHMANN_JSON_NAMESPACE_VERSION_CONCAT(major, minor, patch) \
+    NLOHMANN_JSON_NAMESPACE_VERSION_CONCAT_EX(major, minor, patch)
+
+#if NLOHMANN_JSON_NAMESPACE_NO_VERSION
+#define NLOHMANN_JSON_NAMESPACE_VERSION
+#else
+#define NLOHMANN_JSON_NAMESPACE_VERSION                                 \
+    NLOHMANN_JSON_NAMESPACE_VERSION_CONCAT(NLOHMANN_JSON_VERSION_MAJOR, \
+                                           NLOHMANN_JSON_VERSION_MINOR, \
+                                           NLOHMANN_JSON_VERSION_PATCH)
+#endif
+
+// Combine namespace components
+#define NLOHMANN_JSON_NAMESPACE_CONCAT_EX(a, b) a ## b
+#define NLOHMANN_JSON_NAMESPACE_CONCAT(a, b) \
+    NLOHMANN_JSON_NAMESPACE_CONCAT_EX(a, b)
+
+#ifndef NLOHMANN_JSON_NAMESPACE
+#define NLOHMANN_JSON_NAMESPACE               \
+    nlohmann::NLOHMANN_JSON_NAMESPACE_CONCAT( \
+            NLOHMANN_JSON_ABI_TAGS,           \
+            NLOHMANN_JSON_NAMESPACE_VERSION)
+#endif
+
+#ifndef NLOHMANN_JSON_NAMESPACE_BEGIN
+#define NLOHMANN_JSON_NAMESPACE_BEGIN                \
+    namespace nlohmann                               \
+    {                                                \
+    inline namespace NLOHMANN_JSON_NAMESPACE_CONCAT( \
+                NLOHMANN_JSON_ABI_TAGS,              \
+                NLOHMANN_JSON_NAMESPACE_VERSION)     \
+    {
+#endif
+
+#ifndef NLOHMANN_JSON_NAMESPACE_END
+#define NLOHMANN_JSON_NAMESPACE_END                                     \
+    }  /* namespace (inline namespace) NOLINT(readability/namespace) */ \
+    }  // namespace nlohmann
+#endif
+
+// #include <nlohmann/detail/conversions/from_json.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013 - 2025 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <algorithm> // transform
+#include <array> // array
+#include <forward_list> // forward_list
+#include <iterator> // inserter, front_inserter, end
+#include <map> // map
+#ifdef JSON_HAS_CPP_17
+    #include <optional> // optional
+#endif
+#include <string> // string
+#include <tuple> // tuple, make_tuple
+#include <type_traits> // is_arithmetic, is_same, is_enum, underlying_type, is_convertible
+#include <unordered_map> // unordered_map
+#include <utility> // pair, declval
+#include <valarray> // valarray
+
+// #include <nlohmann/detail/exceptions.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013 - 2025 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <cstddef> // nullptr_t
+#include <exception> // exception
+#if JSON_DIAGNOSTICS
+    #include <numeric> // accumulate
+#endif
+#include <stdexcept> // runtime_error
+#include <string> // to_string
+#include <vector> // vector
+
+// #include <nlohmann/detail/value_t.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013 - 2025 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <array> // array
+#include <cstddef> // size_t
+#include <cstdint> // uint8_t
+#include <string> // string
+
+// #include <nlohmann/detail/macro_scope.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013 - 2025 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <utility> // declval, pair
+// #include <nlohmann/detail/meta/detected.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013 - 2025 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <type_traits>
+
+// #include <nlohmann/detail/meta/void_t.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013 - 2025 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+// #include <nlohmann/detail/abi_macros.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+template<typename ...Ts> struct make_void
+{
+    using type = void;
+};
+template<typename ...Ts> using void_t = typename make_void<Ts...>::type;
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+// https://en.cppreference.com/w/cpp/experimental/is_detected
+struct nonesuch
+{
+    nonesuch() = delete;
+    ~nonesuch() = delete;
+    nonesuch(nonesuch const&) = delete;
+    nonesuch(nonesuch const&&) = delete;
+    void operator=(nonesuch const&) = delete;
+    void operator=(nonesuch&&) = delete;
+};
+
+template<class Default,
+         class AlwaysVoid,
+         template<class...> class Op,
+         class... Args>
+struct detector
+{
+    using value_t = std::false_type;
+    using type = Default;
+};
+
+template<class Default, template<class...> class Op, class... Args>
+struct detector<Default, void_t<Op<Args...>>, Op, Args...>
+{
+    using value_t = std::true_type;
+    using type = Op<Args...>;
+};
+
+template<template<class...> class Op, class... Args>
+using is_detected = typename detector<nonesuch, void, Op, Args...>::value_t;
+
+template<template<class...> class Op, class... Args>
+struct is_detected_lazy : is_detected<Op, Args...> { };
+
+template<template<class...> class Op, class... Args>
+using detected_t = typename detector<nonesuch, void, Op, Args...>::type;
+
+template<class Default, template<class...> class Op, class... Args>
+using detected_or = detector<Default, void, Op, Args...>;
+
+template<class Default, template<class...> class Op, class... Args>
+using detected_or_t = typename detected_or<Default, Op, Args...>::type;
+
+template<class Expected, template<class...> class Op, class... Args>
+using is_detected_exact = std::is_same<Expected, detected_t<Op, Args...>>;
+
+template<class To, template<class...> class Op, class... Args>
+using is_detected_convertible =
+    std::is_convertible<detected_t<Op, Args...>, To>;
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/thirdparty/hedley/hedley.hpp>
+
+
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013 - 2025 Niels Lohmann <https://nlohmann.me>
+// SPDX-FileCopyrightText: 2016 - 2021 Evan Nemerson <evan@nemerson.com>
+// SPDX-License-Identifier: MIT
+
+/* Hedley - https://nemequ.github.io/hedley
+ * Created by Evan Nemerson <evan@nemerson.com>
+ */
+
+#if !defined(JSON_HEDLEY_VERSION) || (JSON_HEDLEY_VERSION < 15)
+#if defined(JSON_HEDLEY_VERSION)
+    #undef JSON_HEDLEY_VERSION
+#endif
+#define JSON_HEDLEY_VERSION 15
+
+#if defined(JSON_HEDLEY_STRINGIFY_EX)
+    #undef JSON_HEDLEY_STRINGIFY_EX
+#endif
+#define JSON_HEDLEY_STRINGIFY_EX(x) #x
+
+#if defined(JSON_HEDLEY_STRINGIFY)
+    #undef JSON_HEDLEY_STRINGIFY
+#endif
+#define JSON_HEDLEY_STRINGIFY(x) JSON_HEDLEY_STRINGIFY_EX(x)
+
+#if defined(JSON_HEDLEY_CONCAT_EX)
+    #undef JSON_HEDLEY_CONCAT_EX
+#endif
+#define JSON_HEDLEY_CONCAT_EX(a,b) a##b
+
+#if defined(JSON_HEDLEY_CONCAT)
+    #undef JSON_HEDLEY_CONCAT
+#endif
+#define JSON_HEDLEY_CONCAT(a,b) JSON_HEDLEY_CONCAT_EX(a,b)
+
+#if defined(JSON_HEDLEY_CONCAT3_EX)
+    #undef JSON_HEDLEY_CONCAT3_EX
+#endif
+#define JSON_HEDLEY_CONCAT3_EX(a,b,c) a##b##c
+
+#if defined(JSON_HEDLEY_CONCAT3)
+    #undef JSON_HEDLEY_CONCAT3
+#endif
+#define JSON_HEDLEY_CONCAT3(a,b,c) JSON_HEDLEY_CONCAT3_EX(a,b,c)
+
+#if defined(JSON_HEDLEY_VERSION_ENCODE)
+    #undef JSON_HEDLEY_VERSION_ENCODE
+#endif
+#define JSON_HEDLEY_VERSION_ENCODE(major,minor,revision) (((major) * 1000000) + ((minor) * 1000) + (revision))
+
+#if defined(JSON_HEDLEY_VERSION_DECODE_MAJOR)
+    #undef JSON_HEDLEY_VERSION_DECODE_MAJOR
+#endif
+#define JSON_HEDLEY_VERSION_DECODE_MAJOR(version) ((version) / 1000000)
+
+#if defined(JSON_HEDLEY_VERSION_DECODE_MINOR)
+    #undef JSON_HEDLEY_VERSION_DECODE_MINOR
+#endif
+#define JSON_HEDLEY_VERSION_DECODE_MINOR(version) (((version) % 1000000) / 1000)
+
+#if defined(JSON_HEDLEY_VERSION_DECODE_REVISION)
+    #undef JSON_HEDLEY_VERSION_DECODE_REVISION
+#endif
+#define JSON_HEDLEY_VERSION_DECODE_REVISION(version) ((version) % 1000)
+
+#if defined(JSON_HEDLEY_GNUC_VERSION)
+    #undef JSON_HEDLEY_GNUC_VERSION
+#endif
+#if defined(__GNUC__) && defined(__GNUC_PATCHLEVEL__)
+    #define JSON_HEDLEY_GNUC_VERSION JSON_HEDLEY_VERSION_ENCODE(__GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__)
+#elif defined(__GNUC__)
+    #define JSON_HEDLEY_GNUC_VERSION JSON_HEDLEY_VERSION_ENCODE(__GNUC__, __GNUC_MINOR__, 0)
+#endif
+
+#if defined(JSON_HEDLEY_GNUC_VERSION_CHECK)
+    #undef JSON_HEDLEY_GNUC_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_GNUC_VERSION)
+    #define JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_GNUC_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_MSVC_VERSION)
+    #undef JSON_HEDLEY_MSVC_VERSION
+#endif
+#if defined(_MSC_FULL_VER) && (_MSC_FULL_VER >= 140000000) && !defined(__ICL)
+    #define JSON_HEDLEY_MSVC_VERSION JSON_HEDLEY_VERSION_ENCODE(_MSC_FULL_VER / 10000000, (_MSC_FULL_VER % 10000000) / 100000, (_MSC_FULL_VER % 100000) / 100)
+#elif defined(_MSC_FULL_VER) && !defined(__ICL)
+    #define JSON_HEDLEY_MSVC_VERSION JSON_HEDLEY_VERSION_ENCODE(_MSC_FULL_VER / 1000000, (_MSC_FULL_VER % 1000000) / 10000, (_MSC_FULL_VER % 10000) / 10)
+#elif defined(_MSC_VER) && !defined(__ICL)
+    #define JSON_HEDLEY_MSVC_VERSION JSON_HEDLEY_VERSION_ENCODE(_MSC_VER / 100, _MSC_VER % 100, 0)
+#endif
+
+#if defined(JSON_HEDLEY_MSVC_VERSION_CHECK)
+    #undef JSON_HEDLEY_MSVC_VERSION_CHECK
+#endif
+#if !defined(JSON_HEDLEY_MSVC_VERSION)
+    #define JSON_HEDLEY_MSVC_VERSION_CHECK(major,minor,patch) (0)
+#elif defined(_MSC_VER) && (_MSC_VER >= 1400)
+    #define JSON_HEDLEY_MSVC_VERSION_CHECK(major,minor,patch) (_MSC_FULL_VER >= ((major * 10000000) + (minor * 100000) + (patch)))
+#elif defined(_MSC_VER) && (_MSC_VER >= 1200)
+    #define JSON_HEDLEY_MSVC_VERSION_CHECK(major,minor,patch) (_MSC_FULL_VER >= ((major * 1000000) + (minor * 10000) + (patch)))
+#else
+    #define JSON_HEDLEY_MSVC_VERSION_CHECK(major,minor,patch) (_MSC_VER >= ((major * 100) + (minor)))
+#endif
+
+#if defined(JSON_HEDLEY_INTEL_VERSION)
+    #undef JSON_HEDLEY_INTEL_VERSION
+#endif
+#if defined(__INTEL_COMPILER) && defined(__INTEL_COMPILER_UPDATE) && !defined(__ICL)
+    #define JSON_HEDLEY_INTEL_VERSION JSON_HEDLEY_VERSION_ENCODE(__INTEL_COMPILER / 100, __INTEL_COMPILER % 100, __INTEL_COMPILER_UPDATE)
+#elif defined(__INTEL_COMPILER) && !defined(__ICL)
+    #define JSON_HEDLEY_INTEL_VERSION JSON_HEDLEY_VERSION_ENCODE(__INTEL_COMPILER / 100, __INTEL_COMPILER % 100, 0)
+#endif
+
+#if defined(JSON_HEDLEY_INTEL_VERSION_CHECK)
+    #undef JSON_HEDLEY_INTEL_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_INTEL_VERSION)
+    #define JSON_HEDLEY_INTEL_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_INTEL_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_INTEL_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_INTEL_CL_VERSION)
+    #undef JSON_HEDLEY_INTEL_CL_VERSION
+#endif
+#if defined(__INTEL_COMPILER) && defined(__INTEL_COMPILER_UPDATE) && defined(__ICL)
+    #define JSON_HEDLEY_INTEL_CL_VERSION JSON_HEDLEY_VERSION_ENCODE(__INTEL_COMPILER, __INTEL_COMPILER_UPDATE, 0)
+#endif
+
+#if defined(JSON_HEDLEY_INTEL_CL_VERSION_CHECK)
+    #undef JSON_HEDLEY_INTEL_CL_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_INTEL_CL_VERSION)
+    #define JSON_HEDLEY_INTEL_CL_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_INTEL_CL_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_INTEL_CL_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_PGI_VERSION)
+    #undef JSON_HEDLEY_PGI_VERSION
+#endif
+#if defined(__PGI) && defined(__PGIC__) && defined(__PGIC_MINOR__) && defined(__PGIC_PATCHLEVEL__)
+    #define JSON_HEDLEY_PGI_VERSION JSON_HEDLEY_VERSION_ENCODE(__PGIC__, __PGIC_MINOR__, __PGIC_PATCHLEVEL__)
+#endif
+
+#if defined(JSON_HEDLEY_PGI_VERSION_CHECK)
+    #undef JSON_HEDLEY_PGI_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_PGI_VERSION)
+    #define JSON_HEDLEY_PGI_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_PGI_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_PGI_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_SUNPRO_VERSION)
+    #undef JSON_HEDLEY_SUNPRO_VERSION
+#endif
+#if defined(__SUNPRO_C) && (__SUNPRO_C > 0x1000)
+    #define JSON_HEDLEY_SUNPRO_VERSION JSON_HEDLEY_VERSION_ENCODE((((__SUNPRO_C >> 16) & 0xf) * 10) + ((__SUNPRO_C >> 12) & 0xf), (((__SUNPRO_C >> 8) & 0xf) * 10) + ((__SUNPRO_C >> 4) & 0xf), (__SUNPRO_C & 0xf) * 10)
+#elif defined(__SUNPRO_C)
+    #define JSON_HEDLEY_SUNPRO_VERSION JSON_HEDLEY_VERSION_ENCODE((__SUNPRO_C >> 8) & 0xf, (__SUNPRO_C >> 4) & 0xf, (__SUNPRO_C) & 0xf)
+#elif defined(__SUNPRO_CC) && (__SUNPRO_CC > 0x1000)
+    #define JSON_HEDLEY_SUNPRO_VERSION JSON_HEDLEY_VERSION_ENCODE((((__SUNPRO_CC >> 16) & 0xf) * 10) + ((__SUNPRO_CC >> 12) & 0xf), (((__SUNPRO_CC >> 8) & 0xf) * 10) + ((__SUNPRO_CC >> 4) & 0xf), (__SUNPRO_CC & 0xf) * 10)
+#elif defined(__SUNPRO_CC)
+    #define JSON_HEDLEY_SUNPRO_VERSION JSON_HEDLEY_VERSION_ENCODE((__SUNPRO_CC >> 8) & 0xf, (__SUNPRO_CC >> 4) & 0xf, (__SUNPRO_CC) & 0xf)
+#endif
+
+#if defined(JSON_HEDLEY_SUNPRO_VERSION_CHECK)
+    #undef JSON_HEDLEY_SUNPRO_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_SUNPRO_VERSION)
+    #define JSON_HEDLEY_SUNPRO_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_SUNPRO_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_SUNPRO_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_EMSCRIPTEN_VERSION)
+    #undef JSON_HEDLEY_EMSCRIPTEN_VERSION
+#endif
+#if defined(__EMSCRIPTEN__)
+    #define JSON_HEDLEY_EMSCRIPTEN_VERSION JSON_HEDLEY_VERSION_ENCODE(__EMSCRIPTEN_major__, __EMSCRIPTEN_minor__, __EMSCRIPTEN_tiny__)
+#endif
+
+#if defined(JSON_HEDLEY_EMSCRIPTEN_VERSION_CHECK)
+    #undef JSON_HEDLEY_EMSCRIPTEN_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_EMSCRIPTEN_VERSION)
+    #define JSON_HEDLEY_EMSCRIPTEN_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_EMSCRIPTEN_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_EMSCRIPTEN_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_ARM_VERSION)
+    #undef JSON_HEDLEY_ARM_VERSION
+#endif
+#if defined(__CC_ARM) && defined(__ARMCOMPILER_VERSION)
+    #define JSON_HEDLEY_ARM_VERSION JSON_HEDLEY_VERSION_ENCODE(__ARMCOMPILER_VERSION / 1000000, (__ARMCOMPILER_VERSION % 1000000) / 10000, (__ARMCOMPILER_VERSION % 10000) / 100)
+#elif defined(__CC_ARM) && defined(__ARMCC_VERSION)
+    #define JSON_HEDLEY_ARM_VERSION JSON_HEDLEY_VERSION_ENCODE(__ARMCC_VERSION / 1000000, (__ARMCC_VERSION % 1000000) / 10000, (__ARMCC_VERSION % 10000) / 100)
+#endif
+
+#if defined(JSON_HEDLEY_ARM_VERSION_CHECK)
+    #undef JSON_HEDLEY_ARM_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_ARM_VERSION)
+    #define JSON_HEDLEY_ARM_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_ARM_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_ARM_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_IBM_VERSION)
+    #undef JSON_HEDLEY_IBM_VERSION
+#endif
+#if defined(__ibmxl__)
+    #define JSON_HEDLEY_IBM_VERSION JSON_HEDLEY_VERSION_ENCODE(__ibmxl_version__, __ibmxl_release__, __ibmxl_modification__)
+#elif defined(__xlC__) && defined(__xlC_ver__)
+    #define JSON_HEDLEY_IBM_VERSION JSON_HEDLEY_VERSION_ENCODE(__xlC__ >> 8, __xlC__ & 0xff, (__xlC_ver__ >> 8) & 0xff)
+#elif defined(__xlC__)
+    #define JSON_HEDLEY_IBM_VERSION JSON_HEDLEY_VERSION_ENCODE(__xlC__ >> 8, __xlC__ & 0xff, 0)
+#endif
+
+#if defined(JSON_HEDLEY_IBM_VERSION_CHECK)
+    #undef JSON_HEDLEY_IBM_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_IBM_VERSION)
+    #define JSON_HEDLEY_IBM_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_IBM_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_IBM_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_TI_VERSION)
+    #undef JSON_HEDLEY_TI_VERSION
+#endif
+#if \
+    defined(__TI_COMPILER_VERSION__) && \
+    ( \
+      defined(__TMS470__) || defined(__TI_ARM__) || \
+      defined(__MSP430__) || \
+      defined(__TMS320C2000__) \
+    )
+#if (__TI_COMPILER_VERSION__ >= 16000000)
+    #define JSON_HEDLEY_TI_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000))
+#endif
+#endif
+
+#if defined(JSON_HEDLEY_TI_VERSION_CHECK)
+    #undef JSON_HEDLEY_TI_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_TI_VERSION)
+    #define JSON_HEDLEY_TI_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_TI_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_TI_CL2000_VERSION)
+    #undef JSON_HEDLEY_TI_CL2000_VERSION
+#endif
+#if defined(__TI_COMPILER_VERSION__) && defined(__TMS320C2000__)
+    #define JSON_HEDLEY_TI_CL2000_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000))
+#endif
+
+#if defined(JSON_HEDLEY_TI_CL2000_VERSION_CHECK)
+    #undef JSON_HEDLEY_TI_CL2000_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_TI_CL2000_VERSION)
+    #define JSON_HEDLEY_TI_CL2000_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_CL2000_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_TI_CL2000_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_TI_CL430_VERSION)
+    #undef JSON_HEDLEY_TI_CL430_VERSION
+#endif
+#if defined(__TI_COMPILER_VERSION__) && defined(__MSP430__)
+    #define JSON_HEDLEY_TI_CL430_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000))
+#endif
+
+#if defined(JSON_HEDLEY_TI_CL430_VERSION_CHECK)
+    #undef JSON_HEDLEY_TI_CL430_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_TI_CL430_VERSION)
+    #define JSON_HEDLEY_TI_CL430_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_CL430_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_TI_CL430_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_TI_ARMCL_VERSION)
+    #undef JSON_HEDLEY_TI_ARMCL_VERSION
+#endif
+#if defined(__TI_COMPILER_VERSION__) && (defined(__TMS470__) || defined(__TI_ARM__))
+    #define JSON_HEDLEY_TI_ARMCL_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000))
+#endif
+
+#if defined(JSON_HEDLEY_TI_ARMCL_VERSION_CHECK)
+    #undef JSON_HEDLEY_TI_ARMCL_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_TI_ARMCL_VERSION)
+    #define JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_ARMCL_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_TI_CL6X_VERSION)
+    #undef JSON_HEDLEY_TI_CL6X_VERSION
+#endif
+#if defined(__TI_COMPILER_VERSION__) && defined(__TMS320C6X__)
+    #define JSON_HEDLEY_TI_CL6X_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000))
+#endif
+
+#if defined(JSON_HEDLEY_TI_CL6X_VERSION_CHECK)
+    #undef JSON_HEDLEY_TI_CL6X_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_TI_CL6X_VERSION)
+    #define JSON_HEDLEY_TI_CL6X_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_CL6X_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_TI_CL6X_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_TI_CL7X_VERSION)
+    #undef JSON_HEDLEY_TI_CL7X_VERSION
+#endif
+#if defined(__TI_COMPILER_VERSION__) && defined(__C7000__)
+    #define JSON_HEDLEY_TI_CL7X_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000))
+#endif
+
+#if defined(JSON_HEDLEY_TI_CL7X_VERSION_CHECK)
+    #undef JSON_HEDLEY_TI_CL7X_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_TI_CL7X_VERSION)
+    #define JSON_HEDLEY_TI_CL7X_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_CL7X_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_TI_CL7X_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_TI_CLPRU_VERSION)
+    #undef JSON_HEDLEY_TI_CLPRU_VERSION
+#endif
+#if defined(__TI_COMPILER_VERSION__) && defined(__PRU__)
+    #define JSON_HEDLEY_TI_CLPRU_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000))
+#endif
+
+#if defined(JSON_HEDLEY_TI_CLPRU_VERSION_CHECK)
+    #undef JSON_HEDLEY_TI_CLPRU_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_TI_CLPRU_VERSION)
+    #define JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_CLPRU_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_CRAY_VERSION)
+    #undef JSON_HEDLEY_CRAY_VERSION
+#endif
+#if defined(_CRAYC)
+    #if defined(_RELEASE_PATCHLEVEL)
+        #define JSON_HEDLEY_CRAY_VERSION JSON_HEDLEY_VERSION_ENCODE(_RELEASE_MAJOR, _RELEASE_MINOR, _RELEASE_PATCHLEVEL)
+    #else
+        #define JSON_HEDLEY_CRAY_VERSION JSON_HEDLEY_VERSION_ENCODE(_RELEASE_MAJOR, _RELEASE_MINOR, 0)
+    #endif
+#endif
+
+#if defined(JSON_HEDLEY_CRAY_VERSION_CHECK)
+    #undef JSON_HEDLEY_CRAY_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_CRAY_VERSION)
+    #define JSON_HEDLEY_CRAY_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_CRAY_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_CRAY_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_IAR_VERSION)
+    #undef JSON_HEDLEY_IAR_VERSION
+#endif
+#if defined(__IAR_SYSTEMS_ICC__)
+    #if __VER__ > 1000
+        #define JSON_HEDLEY_IAR_VERSION JSON_HEDLEY_VERSION_ENCODE((__VER__ / 1000000), ((__VER__ / 1000) % 1000), (__VER__ % 1000))
+    #else
+        #define JSON_HEDLEY_IAR_VERSION JSON_HEDLEY_VERSION_ENCODE(__VER__ / 100, __VER__ % 100, 0)
+    #endif
+#endif
+
+#if defined(JSON_HEDLEY_IAR_VERSION_CHECK)
+    #undef JSON_HEDLEY_IAR_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_IAR_VERSION)
+    #define JSON_HEDLEY_IAR_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_IAR_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_IAR_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_TINYC_VERSION)
+    #undef JSON_HEDLEY_TINYC_VERSION
+#endif
+#if defined(__TINYC__)
+    #define JSON_HEDLEY_TINYC_VERSION JSON_HEDLEY_VERSION_ENCODE(__TINYC__ / 1000, (__TINYC__ / 100) % 10, __TINYC__ % 100)
+#endif
+
+#if defined(JSON_HEDLEY_TINYC_VERSION_CHECK)
+    #undef JSON_HEDLEY_TINYC_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_TINYC_VERSION)
+    #define JSON_HEDLEY_TINYC_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TINYC_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_TINYC_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_DMC_VERSION)
+    #undef JSON_HEDLEY_DMC_VERSION
+#endif
+#if defined(__DMC__)
+    #define JSON_HEDLEY_DMC_VERSION JSON_HEDLEY_VERSION_ENCODE(__DMC__ >> 8, (__DMC__ >> 4) & 0xf, __DMC__ & 0xf)
+#endif
+
+#if defined(JSON_HEDLEY_DMC_VERSION_CHECK)
+    #undef JSON_HEDLEY_DMC_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_DMC_VERSION)
+    #define JSON_HEDLEY_DMC_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_DMC_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_DMC_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_COMPCERT_VERSION)
+    #undef JSON_HEDLEY_COMPCERT_VERSION
+#endif
+#if defined(__COMPCERT_VERSION__)
+    #define JSON_HEDLEY_COMPCERT_VERSION JSON_HEDLEY_VERSION_ENCODE(__COMPCERT_VERSION__ / 10000, (__COMPCERT_VERSION__ / 100) % 100, __COMPCERT_VERSION__ % 100)
+#endif
+
+#if defined(JSON_HEDLEY_COMPCERT_VERSION_CHECK)
+    #undef JSON_HEDLEY_COMPCERT_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_COMPCERT_VERSION)
+    #define JSON_HEDLEY_COMPCERT_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_COMPCERT_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_COMPCERT_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_PELLES_VERSION)
+    #undef JSON_HEDLEY_PELLES_VERSION
+#endif
+#if defined(__POCC__)
+    #define JSON_HEDLEY_PELLES_VERSION JSON_HEDLEY_VERSION_ENCODE(__POCC__ / 100, __POCC__ % 100, 0)
+#endif
+
+#if defined(JSON_HEDLEY_PELLES_VERSION_CHECK)
+    #undef JSON_HEDLEY_PELLES_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_PELLES_VERSION)
+    #define JSON_HEDLEY_PELLES_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_PELLES_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_PELLES_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_MCST_LCC_VERSION)
+    #undef JSON_HEDLEY_MCST_LCC_VERSION
+#endif
+#if defined(__LCC__) && defined(__LCC_MINOR__)
+    #define JSON_HEDLEY_MCST_LCC_VERSION JSON_HEDLEY_VERSION_ENCODE(__LCC__ / 100, __LCC__ % 100, __LCC_MINOR__)
+#endif
+
+#if defined(JSON_HEDLEY_MCST_LCC_VERSION_CHECK)
+    #undef JSON_HEDLEY_MCST_LCC_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_MCST_LCC_VERSION)
+    #define JSON_HEDLEY_MCST_LCC_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_MCST_LCC_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_MCST_LCC_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_GCC_VERSION)
+    #undef JSON_HEDLEY_GCC_VERSION
+#endif
+#if \
+    defined(JSON_HEDLEY_GNUC_VERSION) && \
+    !defined(__clang__) && \
+    !defined(JSON_HEDLEY_INTEL_VERSION) && \
+    !defined(JSON_HEDLEY_PGI_VERSION) && \
+    !defined(JSON_HEDLEY_ARM_VERSION) && \
+    !defined(JSON_HEDLEY_CRAY_VERSION) && \
+    !defined(JSON_HEDLEY_TI_VERSION) && \
+    !defined(JSON_HEDLEY_TI_ARMCL_VERSION) && \
+    !defined(JSON_HEDLEY_TI_CL430_VERSION) && \
+    !defined(JSON_HEDLEY_TI_CL2000_VERSION) && \
+    !defined(JSON_HEDLEY_TI_CL6X_VERSION) && \
+    !defined(JSON_HEDLEY_TI_CL7X_VERSION) && \
+    !defined(JSON_HEDLEY_TI_CLPRU_VERSION) && \
+    !defined(__COMPCERT__) && \
+    !defined(JSON_HEDLEY_MCST_LCC_VERSION)
+    #define JSON_HEDLEY_GCC_VERSION JSON_HEDLEY_GNUC_VERSION
+#endif
+
+#if defined(JSON_HEDLEY_GCC_VERSION_CHECK)
+    #undef JSON_HEDLEY_GCC_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_GCC_VERSION)
+    #define JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_GCC_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_HAS_ATTRIBUTE)
+    #undef JSON_HEDLEY_HAS_ATTRIBUTE
+#endif
+#if \
+  defined(__has_attribute) && \
+  ( \
+    (!defined(JSON_HEDLEY_IAR_VERSION) || JSON_HEDLEY_IAR_VERSION_CHECK(8,5,9)) \
+  )
+#  define JSON_HEDLEY_HAS_ATTRIBUTE(attribute) __has_attribute(attribute)
+#else
+#  define JSON_HEDLEY_HAS_ATTRIBUTE(attribute) (0)
+#endif
+
+#if defined(JSON_HEDLEY_GNUC_HAS_ATTRIBUTE)
+    #undef JSON_HEDLEY_GNUC_HAS_ATTRIBUTE
+#endif
+#if defined(__has_attribute)
+    #define JSON_HEDLEY_GNUC_HAS_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_HAS_ATTRIBUTE(attribute)
+#else
+    #define JSON_HEDLEY_GNUC_HAS_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_GCC_HAS_ATTRIBUTE)
+    #undef JSON_HEDLEY_GCC_HAS_ATTRIBUTE
+#endif
+#if defined(__has_attribute)
+    #define JSON_HEDLEY_GCC_HAS_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_HAS_ATTRIBUTE(attribute)
+#else
+    #define JSON_HEDLEY_GCC_HAS_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_HAS_CPP_ATTRIBUTE)
+    #undef JSON_HEDLEY_HAS_CPP_ATTRIBUTE
+#endif
+#if \
+    defined(__has_cpp_attribute) && \
+    defined(__cplusplus) && \
+    (!defined(JSON_HEDLEY_SUNPRO_VERSION) || JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,15,0))
+    #define JSON_HEDLEY_HAS_CPP_ATTRIBUTE(attribute) __has_cpp_attribute(attribute)
+#else
+    #define JSON_HEDLEY_HAS_CPP_ATTRIBUTE(attribute) (0)
+#endif
+
+#if defined(JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS)
+    #undef JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS
+#endif
+#if !defined(__cplusplus) || !defined(__has_cpp_attribute)
+    #define JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS(ns,attribute) (0)
+#elif \
+    !defined(JSON_HEDLEY_PGI_VERSION) && \
+    !defined(JSON_HEDLEY_IAR_VERSION) && \
+    (!defined(JSON_HEDLEY_SUNPRO_VERSION) || JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,15,0)) && \
+    (!defined(JSON_HEDLEY_MSVC_VERSION) || JSON_HEDLEY_MSVC_VERSION_CHECK(19,20,0))
+    #define JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS(ns,attribute) JSON_HEDLEY_HAS_CPP_ATTRIBUTE(ns::attribute)
+#else
+    #define JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS(ns,attribute) (0)
+#endif
+
+#if defined(JSON_HEDLEY_GNUC_HAS_CPP_ATTRIBUTE)
+    #undef JSON_HEDLEY_GNUC_HAS_CPP_ATTRIBUTE
+#endif
+#if defined(__has_cpp_attribute) && defined(__cplusplus)
+    #define JSON_HEDLEY_GNUC_HAS_CPP_ATTRIBUTE(attribute,major,minor,patch) __has_cpp_attribute(attribute)
+#else
+    #define JSON_HEDLEY_GNUC_HAS_CPP_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_GCC_HAS_CPP_ATTRIBUTE)
+    #undef JSON_HEDLEY_GCC_HAS_CPP_ATTRIBUTE
+#endif
+#if defined(__has_cpp_attribute) && defined(__cplusplus)
+    #define JSON_HEDLEY_GCC_HAS_CPP_ATTRIBUTE(attribute,major,minor,patch) __has_cpp_attribute(attribute)
+#else
+    #define JSON_HEDLEY_GCC_HAS_CPP_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_HAS_BUILTIN)
+    #undef JSON_HEDLEY_HAS_BUILTIN
+#endif
+#if defined(__has_builtin)
+    #define JSON_HEDLEY_HAS_BUILTIN(builtin) __has_builtin(builtin)
+#else
+    #define JSON_HEDLEY_HAS_BUILTIN(builtin) (0)
+#endif
+
+#if defined(JSON_HEDLEY_GNUC_HAS_BUILTIN)
+    #undef JSON_HEDLEY_GNUC_HAS_BUILTIN
+#endif
+#if defined(__has_builtin)
+    #define JSON_HEDLEY_GNUC_HAS_BUILTIN(builtin,major,minor,patch) __has_builtin(builtin)
+#else
+    #define JSON_HEDLEY_GNUC_HAS_BUILTIN(builtin,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_GCC_HAS_BUILTIN)
+    #undef JSON_HEDLEY_GCC_HAS_BUILTIN
+#endif
+#if defined(__has_builtin)
+    #define JSON_HEDLEY_GCC_HAS_BUILTIN(builtin,major,minor,patch) __has_builtin(builtin)
+#else
+    #define JSON_HEDLEY_GCC_HAS_BUILTIN(builtin,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_HAS_FEATURE)
+    #undef JSON_HEDLEY_HAS_FEATURE
+#endif
+#if defined(__has_feature)
+    #define JSON_HEDLEY_HAS_FEATURE(feature) __has_feature(feature)
+#else
+    #define JSON_HEDLEY_HAS_FEATURE(feature) (0)
+#endif
+
+#if defined(JSON_HEDLEY_GNUC_HAS_FEATURE)
+    #undef JSON_HEDLEY_GNUC_HAS_FEATURE
+#endif
+#if defined(__has_feature)
+    #define JSON_HEDLEY_GNUC_HAS_FEATURE(feature,major,minor,patch) __has_feature(feature)
+#else
+    #define JSON_HEDLEY_GNUC_HAS_FEATURE(feature,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_GCC_HAS_FEATURE)
+    #undef JSON_HEDLEY_GCC_HAS_FEATURE
+#endif
+#if defined(__has_feature)
+    #define JSON_HEDLEY_GCC_HAS_FEATURE(feature,major,minor,patch) __has_feature(feature)
+#else
+    #define JSON_HEDLEY_GCC_HAS_FEATURE(feature,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_HAS_EXTENSION)
+    #undef JSON_HEDLEY_HAS_EXTENSION
+#endif
+#if defined(__has_extension)
+    #define JSON_HEDLEY_HAS_EXTENSION(extension) __has_extension(extension)
+#else
+    #define JSON_HEDLEY_HAS_EXTENSION(extension) (0)
+#endif
+
+#if defined(JSON_HEDLEY_GNUC_HAS_EXTENSION)
+    #undef JSON_HEDLEY_GNUC_HAS_EXTENSION
+#endif
+#if defined(__has_extension)
+    #define JSON_HEDLEY_GNUC_HAS_EXTENSION(extension,major,minor,patch) __has_extension(extension)
+#else
+    #define JSON_HEDLEY_GNUC_HAS_EXTENSION(extension,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_GCC_HAS_EXTENSION)
+    #undef JSON_HEDLEY_GCC_HAS_EXTENSION
+#endif
+#if defined(__has_extension)
+    #define JSON_HEDLEY_GCC_HAS_EXTENSION(extension,major,minor,patch) __has_extension(extension)
+#else
+    #define JSON_HEDLEY_GCC_HAS_EXTENSION(extension,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE)
+    #undef JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE
+#endif
+#if defined(__has_declspec_attribute)
+    #define JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE(attribute) __has_declspec_attribute(attribute)
+#else
+    #define JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE(attribute) (0)
+#endif
+
+#if defined(JSON_HEDLEY_GNUC_HAS_DECLSPEC_ATTRIBUTE)
+    #undef JSON_HEDLEY_GNUC_HAS_DECLSPEC_ATTRIBUTE
+#endif
+#if defined(__has_declspec_attribute)
+    #define JSON_HEDLEY_GNUC_HAS_DECLSPEC_ATTRIBUTE(attribute,major,minor,patch) __has_declspec_attribute(attribute)
+#else
+    #define JSON_HEDLEY_GNUC_HAS_DECLSPEC_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_GCC_HAS_DECLSPEC_ATTRIBUTE)
+    #undef JSON_HEDLEY_GCC_HAS_DECLSPEC_ATTRIBUTE
+#endif
+#if defined(__has_declspec_attribute)
+    #define JSON_HEDLEY_GCC_HAS_DECLSPEC_ATTRIBUTE(attribute,major,minor,patch) __has_declspec_attribute(attribute)
+#else
+    #define JSON_HEDLEY_GCC_HAS_DECLSPEC_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_HAS_WARNING)
+    #undef JSON_HEDLEY_HAS_WARNING
+#endif
+#if defined(__has_warning)
+    #define JSON_HEDLEY_HAS_WARNING(warning) __has_warning(warning)
+#else
+    #define JSON_HEDLEY_HAS_WARNING(warning) (0)
+#endif
+
+#if defined(JSON_HEDLEY_GNUC_HAS_WARNING)
+    #undef JSON_HEDLEY_GNUC_HAS_WARNING
+#endif
+#if defined(__has_warning)
+    #define JSON_HEDLEY_GNUC_HAS_WARNING(warning,major,minor,patch) __has_warning(warning)
+#else
+    #define JSON_HEDLEY_GNUC_HAS_WARNING(warning,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_GCC_HAS_WARNING)
+    #undef JSON_HEDLEY_GCC_HAS_WARNING
+#endif
+#if defined(__has_warning)
+    #define JSON_HEDLEY_GCC_HAS_WARNING(warning,major,minor,patch) __has_warning(warning)
+#else
+    #define JSON_HEDLEY_GCC_HAS_WARNING(warning,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if \
+    (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)) || \
+    defined(__clang__) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(3,0,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0) || \
+    JSON_HEDLEY_PGI_VERSION_CHECK(18,4,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
+    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,7,0) || \
+    JSON_HEDLEY_TI_CL430_VERSION_CHECK(2,0,1) || \
+    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,1,0) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,0,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
+    JSON_HEDLEY_CRAY_VERSION_CHECK(5,0,0) || \
+    JSON_HEDLEY_TINYC_VERSION_CHECK(0,9,17) || \
+    JSON_HEDLEY_SUNPRO_VERSION_CHECK(8,0,0) || \
+    (JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) && defined(__C99_PRAGMA_OPERATOR))
+    #define JSON_HEDLEY_PRAGMA(value) _Pragma(#value)
+#elif JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0)
+    #define JSON_HEDLEY_PRAGMA(value) __pragma(value)
+#else
+    #define JSON_HEDLEY_PRAGMA(value)
+#endif
+
+#if defined(JSON_HEDLEY_DIAGNOSTIC_PUSH)
+    #undef JSON_HEDLEY_DIAGNOSTIC_PUSH
+#endif
+#if defined(JSON_HEDLEY_DIAGNOSTIC_POP)
+    #undef JSON_HEDLEY_DIAGNOSTIC_POP
+#endif
+#if defined(__clang__)
+    #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("clang diagnostic push")
+    #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("clang diagnostic pop")
+#elif JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("warning(push)")
+    #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("warning(pop)")
+#elif JSON_HEDLEY_GCC_VERSION_CHECK(4,6,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("GCC diagnostic push")
+    #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("GCC diagnostic pop")
+#elif \
+    JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0) || \
+    JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_PUSH __pragma(warning(push))
+    #define JSON_HEDLEY_DIAGNOSTIC_POP __pragma(warning(pop))
+#elif JSON_HEDLEY_ARM_VERSION_CHECK(5,6,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("push")
+    #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("pop")
+#elif \
+    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
+    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
+    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,4,0) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,1,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("diag_push")
+    #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("diag_pop")
+#elif JSON_HEDLEY_PELLES_VERSION_CHECK(2,90,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("warning(push)")
+    #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("warning(pop)")
+#else
+    #define JSON_HEDLEY_DIAGNOSTIC_PUSH
+    #define JSON_HEDLEY_DIAGNOSTIC_POP
+#endif
+
+/* JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_ is for
+   HEDLEY INTERNAL USE ONLY.  API subject to change without notice. */
+#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_)
+    #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_
+#endif
+#if defined(__cplusplus)
+#  if JSON_HEDLEY_HAS_WARNING("-Wc++98-compat")
+#    if JSON_HEDLEY_HAS_WARNING("-Wc++17-extensions")
+#      if JSON_HEDLEY_HAS_WARNING("-Wc++1z-extensions")
+#        define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(xpr) \
+    JSON_HEDLEY_DIAGNOSTIC_PUSH \
+    _Pragma("clang diagnostic ignored \"-Wc++98-compat\"") \
+    _Pragma("clang diagnostic ignored \"-Wc++17-extensions\"") \
+    _Pragma("clang diagnostic ignored \"-Wc++1z-extensions\"") \
+    xpr \
+    JSON_HEDLEY_DIAGNOSTIC_POP
+#      else
+#        define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(xpr) \
+    JSON_HEDLEY_DIAGNOSTIC_PUSH \
+    _Pragma("clang diagnostic ignored \"-Wc++98-compat\"") \
+    _Pragma("clang diagnostic ignored \"-Wc++17-extensions\"") \
+    xpr \
+    JSON_HEDLEY_DIAGNOSTIC_POP
+#      endif
+#    else
+#      define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(xpr) \
+    JSON_HEDLEY_DIAGNOSTIC_PUSH \
+    _Pragma("clang diagnostic ignored \"-Wc++98-compat\"") \
+    xpr \
+    JSON_HEDLEY_DIAGNOSTIC_POP
+#    endif
+#  endif
+#endif
+#if !defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(x) x
+#endif
+
+#if defined(JSON_HEDLEY_CONST_CAST)
+    #undef JSON_HEDLEY_CONST_CAST
+#endif
+#if defined(__cplusplus)
+#  define JSON_HEDLEY_CONST_CAST(T, expr) (const_cast<T>(expr))
+#elif \
+  JSON_HEDLEY_HAS_WARNING("-Wcast-qual") || \
+  JSON_HEDLEY_GCC_VERSION_CHECK(4,6,0) || \
+  JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
+#  define JSON_HEDLEY_CONST_CAST(T, expr) (__extension__ ({ \
+        JSON_HEDLEY_DIAGNOSTIC_PUSH \
+        JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL \
+        ((T) (expr)); \
+        JSON_HEDLEY_DIAGNOSTIC_POP \
+    }))
+#else
+#  define JSON_HEDLEY_CONST_CAST(T, expr) ((T) (expr))
+#endif
+
+#if defined(JSON_HEDLEY_REINTERPRET_CAST)
+    #undef JSON_HEDLEY_REINTERPRET_CAST
+#endif
+#if defined(__cplusplus)
+    #define JSON_HEDLEY_REINTERPRET_CAST(T, expr) (reinterpret_cast<T>(expr))
+#else
+    #define JSON_HEDLEY_REINTERPRET_CAST(T, expr) ((T) (expr))
+#endif
+
+#if defined(JSON_HEDLEY_STATIC_CAST)
+    #undef JSON_HEDLEY_STATIC_CAST
+#endif
+#if defined(__cplusplus)
+    #define JSON_HEDLEY_STATIC_CAST(T, expr) (static_cast<T>(expr))
+#else
+    #define JSON_HEDLEY_STATIC_CAST(T, expr) ((T) (expr))
+#endif
+
+#if defined(JSON_HEDLEY_CPP_CAST)
+    #undef JSON_HEDLEY_CPP_CAST
+#endif
+#if defined(__cplusplus)
+#  if JSON_HEDLEY_HAS_WARNING("-Wold-style-cast")
+#    define JSON_HEDLEY_CPP_CAST(T, expr) \
+    JSON_HEDLEY_DIAGNOSTIC_PUSH \
+    _Pragma("clang diagnostic ignored \"-Wold-style-cast\"") \
+    ((T) (expr)) \
+    JSON_HEDLEY_DIAGNOSTIC_POP
+#  elif JSON_HEDLEY_IAR_VERSION_CHECK(8,3,0)
+#    define JSON_HEDLEY_CPP_CAST(T, expr) \
+    JSON_HEDLEY_DIAGNOSTIC_PUSH \
+    _Pragma("diag_suppress=Pe137") \
+    JSON_HEDLEY_DIAGNOSTIC_POP
+#  else
+#    define JSON_HEDLEY_CPP_CAST(T, expr) ((T) (expr))
+#  endif
+#else
+#  define JSON_HEDLEY_CPP_CAST(T, expr) (expr)
+#endif
+
+#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED)
+    #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED
+#endif
+#if JSON_HEDLEY_HAS_WARNING("-Wdeprecated-declarations")
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("clang diagnostic ignored \"-Wdeprecated-declarations\"")
+#elif JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("warning(disable:1478 1786)")
+#elif JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED __pragma(warning(disable:1478 1786))
+#elif JSON_HEDLEY_PGI_VERSION_CHECK(20,7,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("diag_suppress 1215,1216,1444,1445")
+#elif JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("diag_suppress 1215,1444")
+#elif JSON_HEDLEY_GCC_VERSION_CHECK(4,3,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"")
+#elif JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED __pragma(warning(disable:4996))
+#elif JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("diag_suppress 1215,1444")
+#elif \
+    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
+    (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
+    (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
+    (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
+    (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("diag_suppress 1291,1718")
+#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,13,0) && !defined(__cplusplus)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("error_messages(off,E_DEPRECATED_ATT,E_DEPRECATED_ATT_MESS)")
+#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,13,0) && defined(__cplusplus)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("error_messages(off,symdeprecated,symdeprecated2)")
+#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("diag_suppress=Pe1444,Pe1215")
+#elif JSON_HEDLEY_PELLES_VERSION_CHECK(2,90,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("warn(disable:2241)")
+#else
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED
+#endif
+
+#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS)
+    #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS
+#endif
+#if JSON_HEDLEY_HAS_WARNING("-Wunknown-pragmas")
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("clang diagnostic ignored \"-Wunknown-pragmas\"")
+#elif JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("warning(disable:161)")
+#elif JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS __pragma(warning(disable:161))
+#elif JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("diag_suppress 1675")
+#elif JSON_HEDLEY_GCC_VERSION_CHECK(4,3,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("GCC diagnostic ignored \"-Wunknown-pragmas\"")
+#elif JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS __pragma(warning(disable:4068))
+#elif \
+    JSON_HEDLEY_TI_VERSION_CHECK(16,9,0) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,0,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,3,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("diag_suppress 163")
+#elif JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("diag_suppress 163")
+#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("diag_suppress=Pe161")
+#elif JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("diag_suppress 161")
+#else
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS
+#endif
+
+#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES)
+    #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES
+#endif
+#if JSON_HEDLEY_HAS_WARNING("-Wunknown-attributes")
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("clang diagnostic ignored \"-Wunknown-attributes\"")
+#elif JSON_HEDLEY_GCC_VERSION_CHECK(4,6,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"")
+#elif JSON_HEDLEY_INTEL_VERSION_CHECK(17,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("warning(disable:1292)")
+#elif JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES __pragma(warning(disable:1292))
+#elif JSON_HEDLEY_MSVC_VERSION_CHECK(19,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES __pragma(warning(disable:5030))
+#elif JSON_HEDLEY_PGI_VERSION_CHECK(20,7,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("diag_suppress 1097,1098")
+#elif JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("diag_suppress 1097")
+#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,14,0) && defined(__cplusplus)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("error_messages(off,attrskipunsup)")
+#elif \
+    JSON_HEDLEY_TI_VERSION_CHECK(18,1,0) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,3,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("diag_suppress 1173")
+#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("diag_suppress=Pe1097")
+#elif JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("diag_suppress 1097")
+#else
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES
+#endif
+
+#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL)
+    #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL
+#endif
+#if JSON_HEDLEY_HAS_WARNING("-Wcast-qual")
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL _Pragma("clang diagnostic ignored \"-Wcast-qual\"")
+#elif JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL _Pragma("warning(disable:2203 2331)")
+#elif JSON_HEDLEY_GCC_VERSION_CHECK(3,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL _Pragma("GCC diagnostic ignored \"-Wcast-qual\"")
+#else
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL
+#endif
+
+#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION)
+    #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION
+#endif
+#if JSON_HEDLEY_HAS_WARNING("-Wunused-function")
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION _Pragma("clang diagnostic ignored \"-Wunused-function\"")
+#elif JSON_HEDLEY_GCC_VERSION_CHECK(3,4,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION _Pragma("GCC diagnostic ignored \"-Wunused-function\"")
+#elif JSON_HEDLEY_MSVC_VERSION_CHECK(1,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION __pragma(warning(disable:4505))
+#elif JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION _Pragma("diag_suppress 3142")
+#else
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION
+#endif
+
+#if defined(JSON_HEDLEY_DEPRECATED)
+    #undef JSON_HEDLEY_DEPRECATED
+#endif
+#if defined(JSON_HEDLEY_DEPRECATED_FOR)
+    #undef JSON_HEDLEY_DEPRECATED_FOR
+#endif
+#if \
+    JSON_HEDLEY_MSVC_VERSION_CHECK(14,0,0) || \
+    JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
+    #define JSON_HEDLEY_DEPRECATED(since) __declspec(deprecated("Since " # since))
+    #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) __declspec(deprecated("Since " #since "; use " #replacement))
+#elif \
+    (JSON_HEDLEY_HAS_EXTENSION(attribute_deprecated_with_message) && !defined(JSON_HEDLEY_IAR_VERSION)) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(4,5,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(5,6,0) || \
+    JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,13,0) || \
+    JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) || \
+    JSON_HEDLEY_TI_VERSION_CHECK(18,1,0) || \
+    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(18,1,0) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,3,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,3,0) || \
+    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+    #define JSON_HEDLEY_DEPRECATED(since) __attribute__((__deprecated__("Since " #since)))
+    #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) __attribute__((__deprecated__("Since " #since "; use " #replacement)))
+#elif defined(__cplusplus) && (__cplusplus >= 201402L)
+    #define JSON_HEDLEY_DEPRECATED(since) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[deprecated("Since " #since)]])
+    #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[deprecated("Since " #since "; use " #replacement)]])
+#elif \
+    JSON_HEDLEY_HAS_ATTRIBUTE(deprecated) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(3,1,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
+    (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
+    (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
+    (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
+    (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
+    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) || \
+    JSON_HEDLEY_IAR_VERSION_CHECK(8,10,0)
+    #define JSON_HEDLEY_DEPRECATED(since) __attribute__((__deprecated__))
+    #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) __attribute__((__deprecated__))
+#elif \
+    JSON_HEDLEY_MSVC_VERSION_CHECK(13,10,0) || \
+    JSON_HEDLEY_PELLES_VERSION_CHECK(6,50,0) || \
+    JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
+    #define JSON_HEDLEY_DEPRECATED(since) __declspec(deprecated)
+    #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) __declspec(deprecated)
+#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
+    #define JSON_HEDLEY_DEPRECATED(since) _Pragma("deprecated")
+    #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) _Pragma("deprecated")
+#else
+    #define JSON_HEDLEY_DEPRECATED(since)
+    #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement)
+#endif
+
+#if defined(JSON_HEDLEY_UNAVAILABLE)
+    #undef JSON_HEDLEY_UNAVAILABLE
+#endif
+#if \
+    JSON_HEDLEY_HAS_ATTRIBUTE(warning) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(4,3,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+    #define JSON_HEDLEY_UNAVAILABLE(available_since) __attribute__((__warning__("Not available until " #available_since)))
+#else
+    #define JSON_HEDLEY_UNAVAILABLE(available_since)
+#endif
+
+#if defined(JSON_HEDLEY_WARN_UNUSED_RESULT)
+    #undef JSON_HEDLEY_WARN_UNUSED_RESULT
+#endif
+#if defined(JSON_HEDLEY_WARN_UNUSED_RESULT_MSG)
+    #undef JSON_HEDLEY_WARN_UNUSED_RESULT_MSG
+#endif
+#if \
+    JSON_HEDLEY_HAS_ATTRIBUTE(warn_unused_result) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(3,4,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
+    (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
+    (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
+    (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
+    (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
+    (JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,15,0) && defined(__cplusplus)) || \
+    JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) || \
+    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+    #define JSON_HEDLEY_WARN_UNUSED_RESULT __attribute__((__warn_unused_result__))
+    #define JSON_HEDLEY_WARN_UNUSED_RESULT_MSG(msg) __attribute__((__warn_unused_result__))
+#elif (JSON_HEDLEY_HAS_CPP_ATTRIBUTE(nodiscard) >= 201907L)
+    #define JSON_HEDLEY_WARN_UNUSED_RESULT JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[nodiscard]])
+    #define JSON_HEDLEY_WARN_UNUSED_RESULT_MSG(msg) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[nodiscard(msg)]])
+#elif JSON_HEDLEY_HAS_CPP_ATTRIBUTE(nodiscard)
+    #define JSON_HEDLEY_WARN_UNUSED_RESULT JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[nodiscard]])
+    #define JSON_HEDLEY_WARN_UNUSED_RESULT_MSG(msg) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[nodiscard]])
+#elif defined(_Check_return_) /* SAL */
+    #define JSON_HEDLEY_WARN_UNUSED_RESULT _Check_return_
+    #define JSON_HEDLEY_WARN_UNUSED_RESULT_MSG(msg) _Check_return_
+#else
+    #define JSON_HEDLEY_WARN_UNUSED_RESULT
+    #define JSON_HEDLEY_WARN_UNUSED_RESULT_MSG(msg)
+#endif
+
+#if defined(JSON_HEDLEY_SENTINEL)
+    #undef JSON_HEDLEY_SENTINEL
+#endif
+#if \
+    JSON_HEDLEY_HAS_ATTRIBUTE(sentinel) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(4,0,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(5,4,0) || \
+    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+    #define JSON_HEDLEY_SENTINEL(position) __attribute__((__sentinel__(position)))
+#else
+    #define JSON_HEDLEY_SENTINEL(position)
+#endif
+
+#if defined(JSON_HEDLEY_NO_RETURN)
+    #undef JSON_HEDLEY_NO_RETURN
+#endif
+#if JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
+    #define JSON_HEDLEY_NO_RETURN __noreturn
+#elif \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+    #define JSON_HEDLEY_NO_RETURN __attribute__((__noreturn__))
+#elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L
+    #define JSON_HEDLEY_NO_RETURN _Noreturn
+#elif defined(__cplusplus) && (__cplusplus >= 201103L)
+    #define JSON_HEDLEY_NO_RETURN JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[noreturn]])
+#elif \
+    JSON_HEDLEY_HAS_ATTRIBUTE(noreturn) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(3,2,0) || \
+    JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+    JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
+    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
+    (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
+    (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
+    (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
+    (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
+    JSON_HEDLEY_IAR_VERSION_CHECK(8,10,0)
+    #define JSON_HEDLEY_NO_RETURN __attribute__((__noreturn__))
+#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0)
+    #define JSON_HEDLEY_NO_RETURN _Pragma("does_not_return")
+#elif \
+    JSON_HEDLEY_MSVC_VERSION_CHECK(13,10,0) || \
+    JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
+    #define JSON_HEDLEY_NO_RETURN __declspec(noreturn)
+#elif JSON_HEDLEY_TI_CL6X_VERSION_CHECK(6,0,0) && defined(__cplusplus)
+    #define JSON_HEDLEY_NO_RETURN _Pragma("FUNC_NEVER_RETURNS;")
+#elif JSON_HEDLEY_COMPCERT_VERSION_CHECK(3,2,0)
+    #define JSON_HEDLEY_NO_RETURN __attribute((noreturn))
+#elif JSON_HEDLEY_PELLES_VERSION_CHECK(9,0,0)
+    #define JSON_HEDLEY_NO_RETURN __declspec(noreturn)
+#else
+    #define JSON_HEDLEY_NO_RETURN
+#endif
+
+#if defined(JSON_HEDLEY_NO_ESCAPE)
+    #undef JSON_HEDLEY_NO_ESCAPE
+#endif
+#if JSON_HEDLEY_HAS_ATTRIBUTE(noescape)
+    #define JSON_HEDLEY_NO_ESCAPE __attribute__((__noescape__))
+#else
+    #define JSON_HEDLEY_NO_ESCAPE
+#endif
+
+#if defined(JSON_HEDLEY_UNREACHABLE)
+    #undef JSON_HEDLEY_UNREACHABLE
+#endif
+#if defined(JSON_HEDLEY_UNREACHABLE_RETURN)
+    #undef JSON_HEDLEY_UNREACHABLE_RETURN
+#endif
+#if defined(JSON_HEDLEY_ASSUME)
+    #undef JSON_HEDLEY_ASSUME
+#endif
+#if \
+    JSON_HEDLEY_MSVC_VERSION_CHECK(13,10,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
+    #define JSON_HEDLEY_ASSUME(expr) __assume(expr)
+#elif JSON_HEDLEY_HAS_BUILTIN(__builtin_assume)
+    #define JSON_HEDLEY_ASSUME(expr) __builtin_assume(expr)
+#elif \
+    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,2,0) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(4,0,0)
+    #if defined(__cplusplus)
+        #define JSON_HEDLEY_ASSUME(expr) std::_nassert(expr)
+    #else
+        #define JSON_HEDLEY_ASSUME(expr) _nassert(expr)
+    #endif
+#endif
+#if \
+    (JSON_HEDLEY_HAS_BUILTIN(__builtin_unreachable) && (!defined(JSON_HEDLEY_ARM_VERSION))) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(4,5,0) || \
+    JSON_HEDLEY_PGI_VERSION_CHECK(18,10,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_IBM_VERSION_CHECK(13,1,5) || \
+    JSON_HEDLEY_CRAY_VERSION_CHECK(10,0,0) || \
+    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+    #define JSON_HEDLEY_UNREACHABLE() __builtin_unreachable()
+#elif defined(JSON_HEDLEY_ASSUME)
+    #define JSON_HEDLEY_UNREACHABLE() JSON_HEDLEY_ASSUME(0)
+#endif
+#if !defined(JSON_HEDLEY_ASSUME)
+    #if defined(JSON_HEDLEY_UNREACHABLE)
+        #define JSON_HEDLEY_ASSUME(expr) JSON_HEDLEY_STATIC_CAST(void, ((expr) ? 1 : (JSON_HEDLEY_UNREACHABLE(), 1)))
+    #else
+        #define JSON_HEDLEY_ASSUME(expr) JSON_HEDLEY_STATIC_CAST(void, expr)
+    #endif
+#endif
+#if defined(JSON_HEDLEY_UNREACHABLE)
+    #if  \
+        JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,2,0) || \
+        JSON_HEDLEY_TI_CL6X_VERSION_CHECK(4,0,0)
+        #define JSON_HEDLEY_UNREACHABLE_RETURN(value) return (JSON_HEDLEY_STATIC_CAST(void, JSON_HEDLEY_ASSUME(0)), (value))
+    #else
+        #define JSON_HEDLEY_UNREACHABLE_RETURN(value) JSON_HEDLEY_UNREACHABLE()
+    #endif
+#else
+    #define JSON_HEDLEY_UNREACHABLE_RETURN(value) return (value)
+#endif
+#if !defined(JSON_HEDLEY_UNREACHABLE)
+    #define JSON_HEDLEY_UNREACHABLE() JSON_HEDLEY_ASSUME(0)
+#endif
+
+JSON_HEDLEY_DIAGNOSTIC_PUSH
+#if JSON_HEDLEY_HAS_WARNING("-Wpedantic")
+    #pragma clang diagnostic ignored "-Wpedantic"
+#endif
+#if JSON_HEDLEY_HAS_WARNING("-Wc++98-compat-pedantic") && defined(__cplusplus)
+    #pragma clang diagnostic ignored "-Wc++98-compat-pedantic"
+#endif
+#if JSON_HEDLEY_GCC_HAS_WARNING("-Wvariadic-macros",4,0,0)
+    #if defined(__clang__)
+        #pragma clang diagnostic ignored "-Wvariadic-macros"
+    #elif defined(JSON_HEDLEY_GCC_VERSION)
+        #pragma GCC diagnostic ignored "-Wvariadic-macros"
+    #endif
+#endif
+#if defined(JSON_HEDLEY_NON_NULL)
+    #undef JSON_HEDLEY_NON_NULL
+#endif
+#if \
+    JSON_HEDLEY_HAS_ATTRIBUTE(nonnull) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(3,3,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0)
+    #define JSON_HEDLEY_NON_NULL(...) __attribute__((__nonnull__(__VA_ARGS__)))
+#else
+    #define JSON_HEDLEY_NON_NULL(...)
+#endif
+JSON_HEDLEY_DIAGNOSTIC_POP
+
+#if defined(JSON_HEDLEY_PRINTF_FORMAT)
+    #undef JSON_HEDLEY_PRINTF_FORMAT
+#endif
+#if defined(__MINGW32__) && JSON_HEDLEY_GCC_HAS_ATTRIBUTE(format,4,4,0) && !defined(__USE_MINGW_ANSI_STDIO)
+    #define JSON_HEDLEY_PRINTF_FORMAT(string_idx,first_to_check) __attribute__((__format__(ms_printf, string_idx, first_to_check)))
+#elif defined(__MINGW32__) && JSON_HEDLEY_GCC_HAS_ATTRIBUTE(format,4,4,0) && defined(__USE_MINGW_ANSI_STDIO)
+    #define JSON_HEDLEY_PRINTF_FORMAT(string_idx,first_to_check) __attribute__((__format__(gnu_printf, string_idx, first_to_check)))
+#elif \
+    JSON_HEDLEY_HAS_ATTRIBUTE(format) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(3,1,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(5,6,0) || \
+    JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
+    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
+    (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
+    (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
+    (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
+    (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
+    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+    #define JSON_HEDLEY_PRINTF_FORMAT(string_idx,first_to_check) __attribute__((__format__(__printf__, string_idx, first_to_check)))
+#elif JSON_HEDLEY_PELLES_VERSION_CHECK(6,0,0)
+    #define JSON_HEDLEY_PRINTF_FORMAT(string_idx,first_to_check) __declspec(vaformat(printf,string_idx,first_to_check))
+#else
+    #define JSON_HEDLEY_PRINTF_FORMAT(string_idx,first_to_check)
+#endif
+
+#if defined(JSON_HEDLEY_CONSTEXPR)
+    #undef JSON_HEDLEY_CONSTEXPR
+#endif
+#if defined(__cplusplus)
+    #if __cplusplus >= 201103L
+        #define JSON_HEDLEY_CONSTEXPR JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(constexpr)
+    #endif
+#endif
+#if !defined(JSON_HEDLEY_CONSTEXPR)
+    #define JSON_HEDLEY_CONSTEXPR
+#endif
+
+#if defined(JSON_HEDLEY_PREDICT)
+    #undef JSON_HEDLEY_PREDICT
+#endif
+#if defined(JSON_HEDLEY_LIKELY)
+    #undef JSON_HEDLEY_LIKELY
+#endif
+#if defined(JSON_HEDLEY_UNLIKELY)
+    #undef JSON_HEDLEY_UNLIKELY
+#endif
+#if defined(JSON_HEDLEY_UNPREDICTABLE)
+    #undef JSON_HEDLEY_UNPREDICTABLE
+#endif
+#if JSON_HEDLEY_HAS_BUILTIN(__builtin_unpredictable)
+    #define JSON_HEDLEY_UNPREDICTABLE(expr) __builtin_unpredictable((expr))
+#endif
+#if \
+  (JSON_HEDLEY_HAS_BUILTIN(__builtin_expect_with_probability) && !defined(JSON_HEDLEY_PGI_VERSION)) || \
+  JSON_HEDLEY_GCC_VERSION_CHECK(9,0,0) || \
+  JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+#  define JSON_HEDLEY_PREDICT(expr, value, probability) __builtin_expect_with_probability(  (expr), (value), (probability))
+#  define JSON_HEDLEY_PREDICT_TRUE(expr, probability)   __builtin_expect_with_probability(!!(expr),    1   , (probability))
+#  define JSON_HEDLEY_PREDICT_FALSE(expr, probability)  __builtin_expect_with_probability(!!(expr),    0   , (probability))
+#  define JSON_HEDLEY_LIKELY(expr)                      __builtin_expect                 (!!(expr),    1                  )
+#  define JSON_HEDLEY_UNLIKELY(expr)                    __builtin_expect                 (!!(expr),    0                  )
+#elif \
+  (JSON_HEDLEY_HAS_BUILTIN(__builtin_expect) && !defined(JSON_HEDLEY_INTEL_CL_VERSION)) || \
+  JSON_HEDLEY_GCC_VERSION_CHECK(3,0,0) || \
+  JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+  (JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,15,0) && defined(__cplusplus)) || \
+  JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+  JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
+  JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
+  JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,7,0) || \
+  JSON_HEDLEY_TI_CL430_VERSION_CHECK(3,1,0) || \
+  JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,1,0) || \
+  JSON_HEDLEY_TI_CL6X_VERSION_CHECK(6,1,0) || \
+  JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+  JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
+  JSON_HEDLEY_TINYC_VERSION_CHECK(0,9,27) || \
+  JSON_HEDLEY_CRAY_VERSION_CHECK(8,1,0) || \
+  JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+#  define JSON_HEDLEY_PREDICT(expr, expected, probability) \
+    (((probability) >= 0.9) ? __builtin_expect((expr), (expected)) : (JSON_HEDLEY_STATIC_CAST(void, expected), (expr)))
+#  define JSON_HEDLEY_PREDICT_TRUE(expr, probability) \
+    (__extension__ ({ \
+        double hedley_probability_ = (probability); \
+        ((hedley_probability_ >= 0.9) ? __builtin_expect(!!(expr), 1) : ((hedley_probability_ <= 0.1) ? __builtin_expect(!!(expr), 0) : !!(expr))); \
+    }))
+#  define JSON_HEDLEY_PREDICT_FALSE(expr, probability) \
+    (__extension__ ({ \
+        double hedley_probability_ = (probability); \
+        ((hedley_probability_ >= 0.9) ? __builtin_expect(!!(expr), 0) : ((hedley_probability_ <= 0.1) ? __builtin_expect(!!(expr), 1) : !!(expr))); \
+    }))
+#  define JSON_HEDLEY_LIKELY(expr)   __builtin_expect(!!(expr), 1)
+#  define JSON_HEDLEY_UNLIKELY(expr) __builtin_expect(!!(expr), 0)
+#else
+#  define JSON_HEDLEY_PREDICT(expr, expected, probability) (JSON_HEDLEY_STATIC_CAST(void, expected), (expr))
+#  define JSON_HEDLEY_PREDICT_TRUE(expr, probability) (!!(expr))
+#  define JSON_HEDLEY_PREDICT_FALSE(expr, probability) (!!(expr))
+#  define JSON_HEDLEY_LIKELY(expr) (!!(expr))
+#  define JSON_HEDLEY_UNLIKELY(expr) (!!(expr))
+#endif
+#if !defined(JSON_HEDLEY_UNPREDICTABLE)
+    #define JSON_HEDLEY_UNPREDICTABLE(expr) JSON_HEDLEY_PREDICT(expr, 1, 0.5)
+#endif
+
+#if defined(JSON_HEDLEY_MALLOC)
+    #undef JSON_HEDLEY_MALLOC
+#endif
+#if \
+    JSON_HEDLEY_HAS_ATTRIBUTE(malloc) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(3,1,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+    JSON_HEDLEY_IBM_VERSION_CHECK(12,1,0) || \
+    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
+    (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
+    (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
+    (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
+    (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
+    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+    #define JSON_HEDLEY_MALLOC __attribute__((__malloc__))
+#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0)
+    #define JSON_HEDLEY_MALLOC _Pragma("returns_new_memory")
+#elif \
+    JSON_HEDLEY_MSVC_VERSION_CHECK(14,0,0) || \
+    JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
+    #define JSON_HEDLEY_MALLOC __declspec(restrict)
+#else
+    #define JSON_HEDLEY_MALLOC
+#endif
+
+#if defined(JSON_HEDLEY_PURE)
+    #undef JSON_HEDLEY_PURE
+#endif
+#if \
+  JSON_HEDLEY_HAS_ATTRIBUTE(pure) || \
+  JSON_HEDLEY_GCC_VERSION_CHECK(2,96,0) || \
+  JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+  JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \
+  JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+  JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
+  JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
+  (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+  JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
+  (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+  JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
+  (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+  JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
+  (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+  JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
+  JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+  JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
+  JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) || \
+  JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+#  define JSON_HEDLEY_PURE __attribute__((__pure__))
+#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0)
+#  define JSON_HEDLEY_PURE _Pragma("does_not_write_global_data")
+#elif defined(__cplusplus) && \
+    ( \
+      JSON_HEDLEY_TI_CL430_VERSION_CHECK(2,0,1) || \
+      JSON_HEDLEY_TI_CL6X_VERSION_CHECK(4,0,0) || \
+      JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) \
+    )
+#  define JSON_HEDLEY_PURE _Pragma("FUNC_IS_PURE;")
+#else
+#  define JSON_HEDLEY_PURE
+#endif
+
+#if defined(JSON_HEDLEY_CONST)
+    #undef JSON_HEDLEY_CONST
+#endif
+#if \
+    JSON_HEDLEY_HAS_ATTRIBUTE(const) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(2,5,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+    JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
+    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
+    (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
+    (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
+    (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
+    (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
+    JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) || \
+    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+    #define JSON_HEDLEY_CONST __attribute__((__const__))
+#elif \
+    JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0)
+    #define JSON_HEDLEY_CONST _Pragma("no_side_effect")
+#else
+    #define JSON_HEDLEY_CONST JSON_HEDLEY_PURE
+#endif
+
+#if defined(JSON_HEDLEY_RESTRICT)
+    #undef JSON_HEDLEY_RESTRICT
+#endif
+#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) && !defined(__cplusplus)
+    #define JSON_HEDLEY_RESTRICT restrict
+#elif \
+    JSON_HEDLEY_GCC_VERSION_CHECK(3,1,0) || \
+    JSON_HEDLEY_MSVC_VERSION_CHECK(14,0,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+    JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
+    JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) || \
+    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
+    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,2,4) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,1,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+    (JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,14,0) && defined(__cplusplus)) || \
+    JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0) || \
+    defined(__clang__) || \
+    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+    #define JSON_HEDLEY_RESTRICT __restrict
+#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,3,0) && !defined(__cplusplus)
+    #define JSON_HEDLEY_RESTRICT _Restrict
+#else
+    #define JSON_HEDLEY_RESTRICT
+#endif
+
+#if defined(JSON_HEDLEY_INLINE)
+    #undef JSON_HEDLEY_INLINE
+#endif
+#if \
+    (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)) || \
+    (defined(__cplusplus) && (__cplusplus >= 199711L))
+    #define JSON_HEDLEY_INLINE inline
+#elif \
+    defined(JSON_HEDLEY_GCC_VERSION) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(6,2,0)
+    #define JSON_HEDLEY_INLINE __inline__
+#elif \
+    JSON_HEDLEY_MSVC_VERSION_CHECK(12,0,0) || \
+    JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,1,0) || \
+    JSON_HEDLEY_TI_CL430_VERSION_CHECK(3,1,0) || \
+    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,2,0) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,0,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
+    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+    #define JSON_HEDLEY_INLINE __inline
+#else
+    #define JSON_HEDLEY_INLINE
+#endif
+
+#if defined(JSON_HEDLEY_ALWAYS_INLINE)
+    #undef JSON_HEDLEY_ALWAYS_INLINE
+#endif
+#if \
+  JSON_HEDLEY_HAS_ATTRIBUTE(always_inline) || \
+  JSON_HEDLEY_GCC_VERSION_CHECK(4,0,0) || \
+  JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+  JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \
+  JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+  JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
+  JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
+  (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+  JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
+  (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+  JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
+  (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+  JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
+  (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+  JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
+  JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+  JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
+  JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) || \
+  JSON_HEDLEY_IAR_VERSION_CHECK(8,10,0)
+#  define JSON_HEDLEY_ALWAYS_INLINE __attribute__((__always_inline__)) JSON_HEDLEY_INLINE
+#elif \
+  JSON_HEDLEY_MSVC_VERSION_CHECK(12,0,0) || \
+  JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
+#  define JSON_HEDLEY_ALWAYS_INLINE __forceinline
+#elif defined(__cplusplus) && \
+    ( \
+      JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
+      JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
+      JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
+      JSON_HEDLEY_TI_CL6X_VERSION_CHECK(6,1,0) || \
+      JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+      JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) \
+    )
+#  define JSON_HEDLEY_ALWAYS_INLINE _Pragma("FUNC_ALWAYS_INLINE;")
+#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
+#  define JSON_HEDLEY_ALWAYS_INLINE _Pragma("inline=forced")
+#else
+#  define JSON_HEDLEY_ALWAYS_INLINE JSON_HEDLEY_INLINE
+#endif
+
+#if defined(JSON_HEDLEY_NEVER_INLINE)
+    #undef JSON_HEDLEY_NEVER_INLINE
+#endif
+#if \
+    JSON_HEDLEY_HAS_ATTRIBUTE(noinline) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(4,0,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+    JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
+    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
+    (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
+    (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
+    (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
+    (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
+    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) || \
+    JSON_HEDLEY_IAR_VERSION_CHECK(8,10,0)
+    #define JSON_HEDLEY_NEVER_INLINE __attribute__((__noinline__))
+#elif \
+    JSON_HEDLEY_MSVC_VERSION_CHECK(13,10,0) || \
+    JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
+    #define JSON_HEDLEY_NEVER_INLINE __declspec(noinline)
+#elif JSON_HEDLEY_PGI_VERSION_CHECK(10,2,0)
+    #define JSON_HEDLEY_NEVER_INLINE _Pragma("noinline")
+#elif JSON_HEDLEY_TI_CL6X_VERSION_CHECK(6,0,0) && defined(__cplusplus)
+    #define JSON_HEDLEY_NEVER_INLINE _Pragma("FUNC_CANNOT_INLINE;")
+#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
+    #define JSON_HEDLEY_NEVER_INLINE _Pragma("inline=never")
+#elif JSON_HEDLEY_COMPCERT_VERSION_CHECK(3,2,0)
+    #define JSON_HEDLEY_NEVER_INLINE __attribute((noinline))
+#elif JSON_HEDLEY_PELLES_VERSION_CHECK(9,0,0)
+    #define JSON_HEDLEY_NEVER_INLINE __declspec(noinline)
+#else
+    #define JSON_HEDLEY_NEVER_INLINE
+#endif
+
+#if defined(JSON_HEDLEY_PRIVATE)
+    #undef JSON_HEDLEY_PRIVATE
+#endif
+#if defined(JSON_HEDLEY_PUBLIC)
+    #undef JSON_HEDLEY_PUBLIC
+#endif
+#if defined(JSON_HEDLEY_IMPORT)
+    #undef JSON_HEDLEY_IMPORT
+#endif
+#if defined(_WIN32) || defined(__CYGWIN__)
+#  define JSON_HEDLEY_PRIVATE
+#  define JSON_HEDLEY_PUBLIC   __declspec(dllexport)
+#  define JSON_HEDLEY_IMPORT   __declspec(dllimport)
+#else
+#  if \
+    JSON_HEDLEY_HAS_ATTRIBUTE(visibility) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(3,3,0) || \
+    JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+    JSON_HEDLEY_IBM_VERSION_CHECK(13,1,0) || \
+    ( \
+      defined(__TI_EABI__) && \
+      ( \
+        (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+        JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) \
+      ) \
+    ) || \
+    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+#    define JSON_HEDLEY_PRIVATE __attribute__((__visibility__("hidden")))
+#    define JSON_HEDLEY_PUBLIC  __attribute__((__visibility__("default")))
+#  else
+#    define JSON_HEDLEY_PRIVATE
+#    define JSON_HEDLEY_PUBLIC
+#  endif
+#  define JSON_HEDLEY_IMPORT    extern
+#endif
+
+#if defined(JSON_HEDLEY_NO_THROW)
+    #undef JSON_HEDLEY_NO_THROW
+#endif
+#if \
+    JSON_HEDLEY_HAS_ATTRIBUTE(nothrow) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(3,3,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+    #define JSON_HEDLEY_NO_THROW __attribute__((__nothrow__))
+#elif \
+    JSON_HEDLEY_MSVC_VERSION_CHECK(13,1,0) || \
+    JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0)
+    #define JSON_HEDLEY_NO_THROW __declspec(nothrow)
+#else
+    #define JSON_HEDLEY_NO_THROW
+#endif
+
+#if defined(JSON_HEDLEY_FALL_THROUGH)
+    #undef JSON_HEDLEY_FALL_THROUGH
+#endif
+#if \
+    JSON_HEDLEY_HAS_ATTRIBUTE(fallthrough) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(7,0,0) || \
+    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+    #define JSON_HEDLEY_FALL_THROUGH __attribute__((__fallthrough__))
+#elif JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS(clang,fallthrough)
+    #define JSON_HEDLEY_FALL_THROUGH JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[clang::fallthrough]])
+#elif JSON_HEDLEY_HAS_CPP_ATTRIBUTE(fallthrough)
+    #define JSON_HEDLEY_FALL_THROUGH JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[fallthrough]])
+#elif defined(__fallthrough) /* SAL */
+    #define JSON_HEDLEY_FALL_THROUGH __fallthrough
+#else
+    #define JSON_HEDLEY_FALL_THROUGH
+#endif
+
+#if defined(JSON_HEDLEY_RETURNS_NON_NULL)
+    #undef JSON_HEDLEY_RETURNS_NON_NULL
+#endif
+#if \
+    JSON_HEDLEY_HAS_ATTRIBUTE(returns_nonnull) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(4,9,0) || \
+    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+    #define JSON_HEDLEY_RETURNS_NON_NULL __attribute__((__returns_nonnull__))
+#elif defined(_Ret_notnull_) /* SAL */
+    #define JSON_HEDLEY_RETURNS_NON_NULL _Ret_notnull_
+#else
+    #define JSON_HEDLEY_RETURNS_NON_NULL
+#endif
+
+#if defined(JSON_HEDLEY_ARRAY_PARAM)
+    #undef JSON_HEDLEY_ARRAY_PARAM
+#endif
+#if \
+    defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) && \
+    !defined(__STDC_NO_VLA__) && \
+    !defined(__cplusplus) && \
+    !defined(JSON_HEDLEY_PGI_VERSION) && \
+    !defined(JSON_HEDLEY_TINYC_VERSION)
+    #define JSON_HEDLEY_ARRAY_PARAM(name) (name)
+#else
+    #define JSON_HEDLEY_ARRAY_PARAM(name)
+#endif
+
+#if defined(JSON_HEDLEY_IS_CONSTANT)
+    #undef JSON_HEDLEY_IS_CONSTANT
+#endif
+#if defined(JSON_HEDLEY_REQUIRE_CONSTEXPR)
+    #undef JSON_HEDLEY_REQUIRE_CONSTEXPR
+#endif
+/* JSON_HEDLEY_IS_CONSTEXPR_ is for
+   HEDLEY INTERNAL USE ONLY.  API subject to change without notice. */
+#if defined(JSON_HEDLEY_IS_CONSTEXPR_)
+    #undef JSON_HEDLEY_IS_CONSTEXPR_
+#endif
+#if \
+    JSON_HEDLEY_HAS_BUILTIN(__builtin_constant_p) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(3,4,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_TINYC_VERSION_CHECK(0,9,19) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+    JSON_HEDLEY_IBM_VERSION_CHECK(13,1,0) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(6,1,0) || \
+    (JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0) && !defined(__cplusplus)) || \
+    JSON_HEDLEY_CRAY_VERSION_CHECK(8,1,0) || \
+    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+    #define JSON_HEDLEY_IS_CONSTANT(expr) __builtin_constant_p(expr)
+#endif
+#if !defined(__cplusplus)
+#  if \
+       JSON_HEDLEY_HAS_BUILTIN(__builtin_types_compatible_p) || \
+       JSON_HEDLEY_GCC_VERSION_CHECK(3,4,0) || \
+       JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+       JSON_HEDLEY_IBM_VERSION_CHECK(13,1,0) || \
+       JSON_HEDLEY_CRAY_VERSION_CHECK(8,1,0) || \
+       JSON_HEDLEY_ARM_VERSION_CHECK(5,4,0) || \
+       JSON_HEDLEY_TINYC_VERSION_CHECK(0,9,24)
+#if defined(__INTPTR_TYPE__)
+    #define JSON_HEDLEY_IS_CONSTEXPR_(expr) __builtin_types_compatible_p(__typeof__((1 ? (void*) ((__INTPTR_TYPE__) ((expr) * 0)) : (int*) 0)), int*)
+#else
+    #include <stdint.h>
+    #define JSON_HEDLEY_IS_CONSTEXPR_(expr) __builtin_types_compatible_p(__typeof__((1 ? (void*) ((intptr_t) ((expr) * 0)) : (int*) 0)), int*)
+#endif
+#  elif \
+       ( \
+          defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L) && \
+          !defined(JSON_HEDLEY_SUNPRO_VERSION) && \
+          !defined(JSON_HEDLEY_PGI_VERSION) && \
+          !defined(JSON_HEDLEY_IAR_VERSION)) || \
+       (JSON_HEDLEY_HAS_EXTENSION(c_generic_selections) && !defined(JSON_HEDLEY_IAR_VERSION)) || \
+       JSON_HEDLEY_GCC_VERSION_CHECK(4,9,0) || \
+       JSON_HEDLEY_INTEL_VERSION_CHECK(17,0,0) || \
+       JSON_HEDLEY_IBM_VERSION_CHECK(12,1,0) || \
+       JSON_HEDLEY_ARM_VERSION_CHECK(5,3,0)
+#if defined(__INTPTR_TYPE__)
+    #define JSON_HEDLEY_IS_CONSTEXPR_(expr) _Generic((1 ? (void*) ((__INTPTR_TYPE__) ((expr) * 0)) : (int*) 0), int*: 1, void*: 0)
+#else
+    #include <stdint.h>
+    #define JSON_HEDLEY_IS_CONSTEXPR_(expr) _Generic((1 ? (void*) ((intptr_t) * 0) : (int*) 0), int*: 1, void*: 0)
+#endif
+#  elif \
+       defined(JSON_HEDLEY_GCC_VERSION) || \
+       defined(JSON_HEDLEY_INTEL_VERSION) || \
+       defined(JSON_HEDLEY_TINYC_VERSION) || \
+       defined(JSON_HEDLEY_TI_ARMCL_VERSION) || \
+       JSON_HEDLEY_TI_CL430_VERSION_CHECK(18,12,0) || \
+       defined(JSON_HEDLEY_TI_CL2000_VERSION) || \
+       defined(JSON_HEDLEY_TI_CL6X_VERSION) || \
+       defined(JSON_HEDLEY_TI_CL7X_VERSION) || \
+       defined(JSON_HEDLEY_TI_CLPRU_VERSION) || \
+       defined(__clang__)
+#    define JSON_HEDLEY_IS_CONSTEXPR_(expr) ( \
+        sizeof(void) != \
+        sizeof(*( \
+                  1 ? \
+                  ((void*) ((expr) * 0L) ) : \
+((struct { char v[sizeof(void) * 2]; } *) 1) \
+                ) \
+              ) \
+                                            )
+#  endif
+#endif
+#if defined(JSON_HEDLEY_IS_CONSTEXPR_)
+    #if !defined(JSON_HEDLEY_IS_CONSTANT)
+        #define JSON_HEDLEY_IS_CONSTANT(expr) JSON_HEDLEY_IS_CONSTEXPR_(expr)
+    #endif
+    #define JSON_HEDLEY_REQUIRE_CONSTEXPR(expr) (JSON_HEDLEY_IS_CONSTEXPR_(expr) ? (expr) : (-1))
+#else
+    #if !defined(JSON_HEDLEY_IS_CONSTANT)
+        #define JSON_HEDLEY_IS_CONSTANT(expr) (0)
+    #endif
+    #define JSON_HEDLEY_REQUIRE_CONSTEXPR(expr) (expr)
+#endif
+
+#if defined(JSON_HEDLEY_BEGIN_C_DECLS)
+    #undef JSON_HEDLEY_BEGIN_C_DECLS
+#endif
+#if defined(JSON_HEDLEY_END_C_DECLS)
+    #undef JSON_HEDLEY_END_C_DECLS
+#endif
+#if defined(JSON_HEDLEY_C_DECL)
+    #undef JSON_HEDLEY_C_DECL
+#endif
+#if defined(__cplusplus)
+    #define JSON_HEDLEY_BEGIN_C_DECLS extern "C" {
+    #define JSON_HEDLEY_END_C_DECLS }
+    #define JSON_HEDLEY_C_DECL extern "C"
+#else
+    #define JSON_HEDLEY_BEGIN_C_DECLS
+    #define JSON_HEDLEY_END_C_DECLS
+    #define JSON_HEDLEY_C_DECL
+#endif
+
+#if defined(JSON_HEDLEY_STATIC_ASSERT)
+    #undef JSON_HEDLEY_STATIC_ASSERT
+#endif
+#if \
+  !defined(__cplusplus) && ( \
+      (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L)) || \
+      (JSON_HEDLEY_HAS_FEATURE(c_static_assert) && !defined(JSON_HEDLEY_INTEL_CL_VERSION)) || \
+      JSON_HEDLEY_GCC_VERSION_CHECK(6,0,0) || \
+      JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+      defined(_Static_assert) \
+    )
+#  define JSON_HEDLEY_STATIC_ASSERT(expr, message) _Static_assert(expr, message)
+#elif \
+  (defined(__cplusplus) && (__cplusplus >= 201103L)) || \
+  JSON_HEDLEY_MSVC_VERSION_CHECK(16,0,0) || \
+  JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
+#  define JSON_HEDLEY_STATIC_ASSERT(expr, message) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(static_assert(expr, message))
+#else
+#  define JSON_HEDLEY_STATIC_ASSERT(expr, message)
+#endif
+
+#if defined(JSON_HEDLEY_NULL)
+    #undef JSON_HEDLEY_NULL
+#endif
+#if defined(__cplusplus)
+    #if __cplusplus >= 201103L
+        #define JSON_HEDLEY_NULL JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(nullptr)
+    #elif defined(NULL)
+        #define JSON_HEDLEY_NULL NULL
+    #else
+        #define JSON_HEDLEY_NULL JSON_HEDLEY_STATIC_CAST(void*, 0)
+    #endif
+#elif defined(NULL)
+    #define JSON_HEDLEY_NULL NULL
+#else
+    #define JSON_HEDLEY_NULL ((void*) 0)
+#endif
+
+#if defined(JSON_HEDLEY_MESSAGE)
+    #undef JSON_HEDLEY_MESSAGE
+#endif
+#if JSON_HEDLEY_HAS_WARNING("-Wunknown-pragmas")
+#  define JSON_HEDLEY_MESSAGE(msg) \
+    JSON_HEDLEY_DIAGNOSTIC_PUSH \
+    JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS \
+    JSON_HEDLEY_PRAGMA(message msg) \
+    JSON_HEDLEY_DIAGNOSTIC_POP
+#elif \
+  JSON_HEDLEY_GCC_VERSION_CHECK(4,4,0) || \
+  JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
+#  define JSON_HEDLEY_MESSAGE(msg) JSON_HEDLEY_PRAGMA(message msg)
+#elif JSON_HEDLEY_CRAY_VERSION_CHECK(5,0,0)
+#  define JSON_HEDLEY_MESSAGE(msg) JSON_HEDLEY_PRAGMA(_CRI message msg)
+#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
+#  define JSON_HEDLEY_MESSAGE(msg) JSON_HEDLEY_PRAGMA(message(msg))
+#elif JSON_HEDLEY_PELLES_VERSION_CHECK(2,0,0)
+#  define JSON_HEDLEY_MESSAGE(msg) JSON_HEDLEY_PRAGMA(message(msg))
+#else
+#  define JSON_HEDLEY_MESSAGE(msg)
+#endif
+
+#if defined(JSON_HEDLEY_WARNING)
+    #undef JSON_HEDLEY_WARNING
+#endif
+#if JSON_HEDLEY_HAS_WARNING("-Wunknown-pragmas")
+#  define JSON_HEDLEY_WARNING(msg) \
+    JSON_HEDLEY_DIAGNOSTIC_PUSH \
+    JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS \
+    JSON_HEDLEY_PRAGMA(clang warning msg) \
+    JSON_HEDLEY_DIAGNOSTIC_POP
+#elif \
+  JSON_HEDLEY_GCC_VERSION_CHECK(4,8,0) || \
+  JSON_HEDLEY_PGI_VERSION_CHECK(18,4,0) || \
+  JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
+#  define JSON_HEDLEY_WARNING(msg) JSON_HEDLEY_PRAGMA(GCC warning msg)
+#elif \
+  JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0) || \
+  JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
+#  define JSON_HEDLEY_WARNING(msg) JSON_HEDLEY_PRAGMA(message(msg))
+#else
+#  define JSON_HEDLEY_WARNING(msg) JSON_HEDLEY_MESSAGE(msg)
+#endif
+
+#if defined(JSON_HEDLEY_REQUIRE)
+    #undef JSON_HEDLEY_REQUIRE
+#endif
+#if defined(JSON_HEDLEY_REQUIRE_MSG)
+    #undef JSON_HEDLEY_REQUIRE_MSG
+#endif
+#if JSON_HEDLEY_HAS_ATTRIBUTE(diagnose_if)
+#  if JSON_HEDLEY_HAS_WARNING("-Wgcc-compat")
+#    define JSON_HEDLEY_REQUIRE(expr) \
+    JSON_HEDLEY_DIAGNOSTIC_PUSH \
+    _Pragma("clang diagnostic ignored \"-Wgcc-compat\"") \
+    __attribute__((diagnose_if(!(expr), #expr, "error"))) \
+    JSON_HEDLEY_DIAGNOSTIC_POP
+#    define JSON_HEDLEY_REQUIRE_MSG(expr,msg) \
+    JSON_HEDLEY_DIAGNOSTIC_PUSH \
+    _Pragma("clang diagnostic ignored \"-Wgcc-compat\"") \
+    __attribute__((diagnose_if(!(expr), msg, "error"))) \
+    JSON_HEDLEY_DIAGNOSTIC_POP
+#  else
+#    define JSON_HEDLEY_REQUIRE(expr) __attribute__((diagnose_if(!(expr), #expr, "error")))
+#    define JSON_HEDLEY_REQUIRE_MSG(expr,msg) __attribute__((diagnose_if(!(expr), msg, "error")))
+#  endif
+#else
+#  define JSON_HEDLEY_REQUIRE(expr)
+#  define JSON_HEDLEY_REQUIRE_MSG(expr,msg)
+#endif
+
+#if defined(JSON_HEDLEY_FLAGS)
+    #undef JSON_HEDLEY_FLAGS
+#endif
+#if JSON_HEDLEY_HAS_ATTRIBUTE(flag_enum) && (!defined(__cplusplus) || JSON_HEDLEY_HAS_WARNING("-Wbitfield-enum-conversion"))
+    #define JSON_HEDLEY_FLAGS __attribute__((__flag_enum__))
+#else
+    #define JSON_HEDLEY_FLAGS
+#endif
+
+#if defined(JSON_HEDLEY_FLAGS_CAST)
+    #undef JSON_HEDLEY_FLAGS_CAST
+#endif
+#if JSON_HEDLEY_INTEL_VERSION_CHECK(19,0,0)
+#  define JSON_HEDLEY_FLAGS_CAST(T, expr) (__extension__ ({ \
+        JSON_HEDLEY_DIAGNOSTIC_PUSH \
+        _Pragma("warning(disable:188)") \
+        ((T) (expr)); \
+        JSON_HEDLEY_DIAGNOSTIC_POP \
+    }))
+#else
+#  define JSON_HEDLEY_FLAGS_CAST(T, expr) JSON_HEDLEY_STATIC_CAST(T, expr)
+#endif
+
+#if defined(JSON_HEDLEY_EMPTY_BASES)
+    #undef JSON_HEDLEY_EMPTY_BASES
+#endif
+#if \
+    (JSON_HEDLEY_MSVC_VERSION_CHECK(19,0,23918) && !JSON_HEDLEY_MSVC_VERSION_CHECK(20,0,0)) || \
+    JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
+    #define JSON_HEDLEY_EMPTY_BASES __declspec(empty_bases)
+#else
+    #define JSON_HEDLEY_EMPTY_BASES
+#endif
+
+/* Remaining macros are deprecated. */
+
+#if defined(JSON_HEDLEY_GCC_NOT_CLANG_VERSION_CHECK)
+    #undef JSON_HEDLEY_GCC_NOT_CLANG_VERSION_CHECK
+#endif
+#if defined(__clang__)
+    #define JSON_HEDLEY_GCC_NOT_CLANG_VERSION_CHECK(major,minor,patch) (0)
+#else
+    #define JSON_HEDLEY_GCC_NOT_CLANG_VERSION_CHECK(major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_CLANG_HAS_ATTRIBUTE)
+    #undef JSON_HEDLEY_CLANG_HAS_ATTRIBUTE
+#endif
+#define JSON_HEDLEY_CLANG_HAS_ATTRIBUTE(attribute) JSON_HEDLEY_HAS_ATTRIBUTE(attribute)
+
+#if defined(JSON_HEDLEY_CLANG_HAS_CPP_ATTRIBUTE)
+    #undef JSON_HEDLEY_CLANG_HAS_CPP_ATTRIBUTE
+#endif
+#define JSON_HEDLEY_CLANG_HAS_CPP_ATTRIBUTE(attribute) JSON_HEDLEY_HAS_CPP_ATTRIBUTE(attribute)
+
+#if defined(JSON_HEDLEY_CLANG_HAS_BUILTIN)
+    #undef JSON_HEDLEY_CLANG_HAS_BUILTIN
+#endif
+#define JSON_HEDLEY_CLANG_HAS_BUILTIN(builtin) JSON_HEDLEY_HAS_BUILTIN(builtin)
+
+#if defined(JSON_HEDLEY_CLANG_HAS_FEATURE)
+    #undef JSON_HEDLEY_CLANG_HAS_FEATURE
+#endif
+#define JSON_HEDLEY_CLANG_HAS_FEATURE(feature) JSON_HEDLEY_HAS_FEATURE(feature)
+
+#if defined(JSON_HEDLEY_CLANG_HAS_EXTENSION)
+    #undef JSON_HEDLEY_CLANG_HAS_EXTENSION
+#endif
+#define JSON_HEDLEY_CLANG_HAS_EXTENSION(extension) JSON_HEDLEY_HAS_EXTENSION(extension)
+
+#if defined(JSON_HEDLEY_CLANG_HAS_DECLSPEC_DECLSPEC_ATTRIBUTE)
+    #undef JSON_HEDLEY_CLANG_HAS_DECLSPEC_DECLSPEC_ATTRIBUTE
+#endif
+#define JSON_HEDLEY_CLANG_HAS_DECLSPEC_ATTRIBUTE(attribute) JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE(attribute)
+
+#if defined(JSON_HEDLEY_CLANG_HAS_WARNING)
+    #undef JSON_HEDLEY_CLANG_HAS_WARNING
+#endif
+#define JSON_HEDLEY_CLANG_HAS_WARNING(warning) JSON_HEDLEY_HAS_WARNING(warning)
+
+#endif /* !defined(JSON_HEDLEY_VERSION) || (JSON_HEDLEY_VERSION < X) */
+
+
+// This file contains all internal macro definitions (except those affecting ABI)
+// You MUST include macro_unscope.hpp at the end of json.hpp to undef all of them
+
+// #include <nlohmann/detail/abi_macros.hpp>
+
+
+// exclude unsupported compilers
+#if !defined(JSON_SKIP_UNSUPPORTED_COMPILER_CHECK)
+    #if defined(__clang__)
+        #if (__clang_major__ * 10000 + __clang_minor__ * 100 + __clang_patchlevel__) < 30400
+            #error "unsupported Clang version - see https://github.com/nlohmann/json#supported-compilers"
+        #endif
+    #elif defined(__GNUC__) && !(defined(__ICC) || defined(__INTEL_COMPILER))
+        #if (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) < 40800
+            #error "unsupported GCC version - see https://github.com/nlohmann/json#supported-compilers"
+        #endif
+    #endif
+#endif
+
+// C++ language standard detection
+// if the user manually specified the used c++ version this is skipped
+#if !defined(JSON_HAS_CPP_23) && !defined(JSON_HAS_CPP_20) && !defined(JSON_HAS_CPP_17) && !defined(JSON_HAS_CPP_14) && !defined(JSON_HAS_CPP_11)
+    #if (defined(__cplusplus) && __cplusplus > 202002L) || (defined(_MSVC_LANG) && _MSVC_LANG > 202002L)
+        #define JSON_HAS_CPP_23
+        #define JSON_HAS_CPP_20
+        #define JSON_HAS_CPP_17
+        #define JSON_HAS_CPP_14
+    #elif (defined(__cplusplus) && __cplusplus > 201703L) || (defined(_MSVC_LANG) && _MSVC_LANG > 201703L)
+        #define JSON_HAS_CPP_20
+        #define JSON_HAS_CPP_17
+        #define JSON_HAS_CPP_14
+    #elif (defined(__cplusplus) && __cplusplus > 201402L) || (defined(_HAS_CXX17) && _HAS_CXX17 == 1) // fix for issue #464
+        #define JSON_HAS_CPP_17
+        #define JSON_HAS_CPP_14
+    #elif (defined(__cplusplus) && __cplusplus > 201103L) || (defined(_HAS_CXX14) && _HAS_CXX14 == 1)
+        #define JSON_HAS_CPP_14
+    #endif
+    // the cpp 11 flag is always specified because it is the minimal required version
+    #define JSON_HAS_CPP_11
+#endif
+
+#ifdef __has_include
+    #if __has_include(<version>)
+        #include <version>
+    #endif
+#endif
+
+#if !defined(JSON_HAS_FILESYSTEM) && !defined(JSON_HAS_EXPERIMENTAL_FILESYSTEM)
+    #ifdef JSON_HAS_CPP_17
+        #if defined(__cpp_lib_filesystem)
+            #define JSON_HAS_FILESYSTEM 1
+        #elif defined(__cpp_lib_experimental_filesystem)
+            #define JSON_HAS_EXPERIMENTAL_FILESYSTEM 1
+        #elif !defined(__has_include)
+            #define JSON_HAS_EXPERIMENTAL_FILESYSTEM 1
+        #elif __has_include(<filesystem>)
+            #define JSON_HAS_FILESYSTEM 1
+        #elif __has_include(<experimental/filesystem>)
+            #define JSON_HAS_EXPERIMENTAL_FILESYSTEM 1
+        #endif
+
+        // std::filesystem does not work on MinGW GCC 8: https://sourceforge.net/p/mingw-w64/bugs/737/
+        #if defined(__MINGW32__) && defined(__GNUC__) && __GNUC__ == 8
+            #undef JSON_HAS_FILESYSTEM
+            #undef JSON_HAS_EXPERIMENTAL_FILESYSTEM
+        #endif
+
+        // no filesystem support before GCC 8: https://en.cppreference.com/w/cpp/compiler_support
+        #if defined(__GNUC__) && !defined(__clang__) && __GNUC__ < 8
+            #undef JSON_HAS_FILESYSTEM
+            #undef JSON_HAS_EXPERIMENTAL_FILESYSTEM
+        #endif
+
+        // no filesystem support before Clang 7: https://en.cppreference.com/w/cpp/compiler_support
+        #if defined(__clang_major__) && __clang_major__ < 7
+            #undef JSON_HAS_FILESYSTEM
+            #undef JSON_HAS_EXPERIMENTAL_FILESYSTEM
+        #endif
+
+        // no filesystem support before MSVC 19.14: https://en.cppreference.com/w/cpp/compiler_support
+        #if defined(_MSC_VER) && _MSC_VER < 1914
+            #undef JSON_HAS_FILESYSTEM
+            #undef JSON_HAS_EXPERIMENTAL_FILESYSTEM
+        #endif
+
+        // no filesystem support before iOS 13
+        #if defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && __IPHONE_OS_VERSION_MIN_REQUIRED < 130000
+            #undef JSON_HAS_FILESYSTEM
+            #undef JSON_HAS_EXPERIMENTAL_FILESYSTEM
+        #endif
+
+        // no filesystem support before macOS Catalina
+        #if defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101500
+            #undef JSON_HAS_FILESYSTEM
+            #undef JSON_HAS_EXPERIMENTAL_FILESYSTEM
+        #endif
+    #endif
+#endif
+
+#ifndef JSON_HAS_EXPERIMENTAL_FILESYSTEM
+    #define JSON_HAS_EXPERIMENTAL_FILESYSTEM 0
+#endif
+
+#ifndef JSON_HAS_FILESYSTEM
+    #define JSON_HAS_FILESYSTEM 0
+#endif
+
+#ifndef JSON_HAS_THREE_WAY_COMPARISON
+    #if defined(__cpp_impl_three_way_comparison) && __cpp_impl_three_way_comparison >= 201907L \
+        && defined(__cpp_lib_three_way_comparison) && __cpp_lib_three_way_comparison >= 201907L
+        #define JSON_HAS_THREE_WAY_COMPARISON 1
+    #else
+        #define JSON_HAS_THREE_WAY_COMPARISON 0
+    #endif
+#endif
+
+#ifndef JSON_HAS_RANGES
+    // ranges header shipping in GCC 11.1.0 (released 2021-04-27) has syntax error
+    #if defined(__GLIBCXX__) && __GLIBCXX__ == 20210427
+        #define JSON_HAS_RANGES 0
+    #elif defined(__cpp_lib_ranges)
+        #define JSON_HAS_RANGES 1
+    #else
+        #define JSON_HAS_RANGES 0
+    #endif
+#endif
+
+#ifndef JSON_HAS_STATIC_RTTI
+    #if !defined(_HAS_STATIC_RTTI) || _HAS_STATIC_RTTI != 0
+        #define JSON_HAS_STATIC_RTTI 1
+    #else
+        #define JSON_HAS_STATIC_RTTI 0
+    #endif
+#endif
+
+#ifdef JSON_HAS_CPP_17
+    #define JSON_INLINE_VARIABLE inline
+#else
+    #define JSON_INLINE_VARIABLE
+#endif
+
+#if JSON_HEDLEY_HAS_ATTRIBUTE(no_unique_address)
+    #define JSON_NO_UNIQUE_ADDRESS [[no_unique_address]]
+#else
+    #define JSON_NO_UNIQUE_ADDRESS
+#endif
+
+// disable documentation warnings on clang
+#if defined(__clang__)
+    #pragma clang diagnostic push
+    #pragma clang diagnostic ignored "-Wdocumentation"
+    #pragma clang diagnostic ignored "-Wdocumentation-unknown-command"
+#endif
+
+// allow disabling exceptions
+#if (defined(__cpp_exceptions) || defined(__EXCEPTIONS) || defined(_CPPUNWIND)) && !defined(JSON_NOEXCEPTION)
+    #define JSON_THROW(exception) throw exception
+    #define JSON_TRY try
+    #define JSON_CATCH(exception) catch(exception)
+    #define JSON_INTERNAL_CATCH(exception) catch(exception)
+#else
+    #include <cstdlib>
+    #define JSON_THROW(exception) std::abort()
+    #define JSON_TRY if(true)
+    #define JSON_CATCH(exception) if(false)
+    #define JSON_INTERNAL_CATCH(exception) if(false)
+#endif
+
+// override exception macros
+#if defined(JSON_THROW_USER)
+    #undef JSON_THROW
+    #define JSON_THROW JSON_THROW_USER
+#endif
+#if defined(JSON_TRY_USER)
+    #undef JSON_TRY
+    #define JSON_TRY JSON_TRY_USER
+#endif
+#if defined(JSON_CATCH_USER)
+    #undef JSON_CATCH
+    #define JSON_CATCH JSON_CATCH_USER
+    #undef JSON_INTERNAL_CATCH
+    #define JSON_INTERNAL_CATCH JSON_CATCH_USER
+#endif
+#if defined(JSON_INTERNAL_CATCH_USER)
+    #undef JSON_INTERNAL_CATCH
+    #define JSON_INTERNAL_CATCH JSON_INTERNAL_CATCH_USER
+#endif
+
+// allow overriding assert
+#if !defined(JSON_ASSERT)
+    #include <cassert> // assert
+    #define JSON_ASSERT(x) assert(x)
+#endif
+
+// allow to access some private functions (needed by the test suite)
+#if defined(JSON_TESTS_PRIVATE)
+    #define JSON_PRIVATE_UNLESS_TESTED public
+#else
+    #define JSON_PRIVATE_UNLESS_TESTED private
+#endif
+
+/*!
+@brief macro to briefly define a mapping between an enum and JSON
+@def NLOHMANN_JSON_SERIALIZE_ENUM
+@since version 3.4.0
+*/
+#define NLOHMANN_JSON_SERIALIZE_ENUM(ENUM_TYPE, ...)                                            \
+    template<typename BasicJsonType>                                                            \
+    inline void to_json(BasicJsonType& j, const ENUM_TYPE& e)                                   \
+    {                                                                                           \
+        /* NOLINTNEXTLINE(modernize-type-traits) we use C++11 */                                \
+        static_assert(std::is_enum<ENUM_TYPE>::value, #ENUM_TYPE " must be an enum!");          \
+        /* NOLINTNEXTLINE(modernize-avoid-c-arrays) we don't want to depend on <array> */       \
+        static const std::pair<ENUM_TYPE, BasicJsonType> m[] = __VA_ARGS__;                     \
+        auto it = std::find_if(std::begin(m), std::end(m),                                      \
+                               [e](const std::pair<ENUM_TYPE, BasicJsonType>& ej_pair) -> bool  \
+        {                                                                                       \
+            return ej_pair.first == e;                                                          \
+        });                                                                                     \
+        j = ((it != std::end(m)) ? it : std::begin(m))->second;                                 \
+    }                                                                                           \
+    template<typename BasicJsonType>                                                            \
+    inline void from_json(const BasicJsonType& j, ENUM_TYPE& e)                                 \
+    {                                                                                           \
+        /* NOLINTNEXTLINE(modernize-type-traits) we use C++11 */                                \
+        static_assert(std::is_enum<ENUM_TYPE>::value, #ENUM_TYPE " must be an enum!");          \
+        /* NOLINTNEXTLINE(modernize-avoid-c-arrays) we don't want to depend on <array> */       \
+        static const std::pair<ENUM_TYPE, BasicJsonType> m[] = __VA_ARGS__;                     \
+        auto it = std::find_if(std::begin(m), std::end(m),                                      \
+                               [&j](const std::pair<ENUM_TYPE, BasicJsonType>& ej_pair) -> bool \
+        {                                                                                       \
+            return ej_pair.second == j;                                                         \
+        });                                                                                     \
+        e = ((it != std::end(m)) ? it : std::begin(m))->first;                                  \
+    }
+
+// Ugly macros to avoid uglier copy-paste when specializing basic_json. They
+// may be removed in the future once the class is split.
+
+#define NLOHMANN_BASIC_JSON_TPL_DECLARATION                                \
+    template<template<typename, typename, typename...> class ObjectType,   \
+             template<typename, typename...> class ArrayType,              \
+             class StringType, class BooleanType, class NumberIntegerType, \
+             class NumberUnsignedType, class NumberFloatType,              \
+             template<typename> class AllocatorType,                       \
+             template<typename, typename = void> class JSONSerializer,     \
+             class BinaryType,                                             \
+             class CustomBaseClass>
+
+#define NLOHMANN_BASIC_JSON_TPL                                            \
+    basic_json<ObjectType, ArrayType, StringType, BooleanType,             \
+    NumberIntegerType, NumberUnsignedType, NumberFloatType,                \
+    AllocatorType, JSONSerializer, BinaryType, CustomBaseClass>
+
+// Macros to simplify conversion from/to types
+
+#define NLOHMANN_JSON_EXPAND( x ) x
+#define NLOHMANN_JSON_GET_MACRO(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50, _51, _52, _53, _54, _55, _56, _57, _58, _59, _60, _61, _62, _63, _64, NAME,...) NAME
+#define NLOHMANN_JSON_PASTE(...) NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_GET_MACRO(__VA_ARGS__, \
+        NLOHMANN_JSON_PASTE64, \
+        NLOHMANN_JSON_PASTE63, \
+        NLOHMANN_JSON_PASTE62, \
+        NLOHMANN_JSON_PASTE61, \
+        NLOHMANN_JSON_PASTE60, \
+        NLOHMANN_JSON_PASTE59, \
+        NLOHMANN_JSON_PASTE58, \
+        NLOHMANN_JSON_PASTE57, \
+        NLOHMANN_JSON_PASTE56, \
+        NLOHMANN_JSON_PASTE55, \
+        NLOHMANN_JSON_PASTE54, \
+        NLOHMANN_JSON_PASTE53, \
+        NLOHMANN_JSON_PASTE52, \
+        NLOHMANN_JSON_PASTE51, \
+        NLOHMANN_JSON_PASTE50, \
+        NLOHMANN_JSON_PASTE49, \
+        NLOHMANN_JSON_PASTE48, \
+        NLOHMANN_JSON_PASTE47, \
+        NLOHMANN_JSON_PASTE46, \
+        NLOHMANN_JSON_PASTE45, \
+        NLOHMANN_JSON_PASTE44, \
+        NLOHMANN_JSON_PASTE43, \
+        NLOHMANN_JSON_PASTE42, \
+        NLOHMANN_JSON_PASTE41, \
+        NLOHMANN_JSON_PASTE40, \
+        NLOHMANN_JSON_PASTE39, \
+        NLOHMANN_JSON_PASTE38, \
+        NLOHMANN_JSON_PASTE37, \
+        NLOHMANN_JSON_PASTE36, \
+        NLOHMANN_JSON_PASTE35, \
+        NLOHMANN_JSON_PASTE34, \
+        NLOHMANN_JSON_PASTE33, \
+        NLOHMANN_JSON_PASTE32, \
+        NLOHMANN_JSON_PASTE31, \
+        NLOHMANN_JSON_PASTE30, \
+        NLOHMANN_JSON_PASTE29, \
+        NLOHMANN_JSON_PASTE28, \
+        NLOHMANN_JSON_PASTE27, \
+        NLOHMANN_JSON_PASTE26, \
+        NLOHMANN_JSON_PASTE25, \
+        NLOHMANN_JSON_PASTE24, \
+        NLOHMANN_JSON_PASTE23, \
+        NLOHMANN_JSON_PASTE22, \
+        NLOHMANN_JSON_PASTE21, \
+        NLOHMANN_JSON_PASTE20, \
+        NLOHMANN_JSON_PASTE19, \
+        NLOHMANN_JSON_PASTE18, \
+        NLOHMANN_JSON_PASTE17, \
+        NLOHMANN_JSON_PASTE16, \
+        NLOHMANN_JSON_PASTE15, \
+        NLOHMANN_JSON_PASTE14, \
+        NLOHMANN_JSON_PASTE13, \
+        NLOHMANN_JSON_PASTE12, \
+        NLOHMANN_JSON_PASTE11, \
+        NLOHMANN_JSON_PASTE10, \
+        NLOHMANN_JSON_PASTE9, \
+        NLOHMANN_JSON_PASTE8, \
+        NLOHMANN_JSON_PASTE7, \
+        NLOHMANN_JSON_PASTE6, \
+        NLOHMANN_JSON_PASTE5, \
+        NLOHMANN_JSON_PASTE4, \
+        NLOHMANN_JSON_PASTE3, \
+        NLOHMANN_JSON_PASTE2, \
+        NLOHMANN_JSON_PASTE1)(__VA_ARGS__))
+#define NLOHMANN_JSON_PASTE2(func, v1) func(v1)
+#define NLOHMANN_JSON_PASTE3(func, v1, v2) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE2(func, v2)
+#define NLOHMANN_JSON_PASTE4(func, v1, v2, v3) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE3(func, v2, v3)
+#define NLOHMANN_JSON_PASTE5(func, v1, v2, v3, v4) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE4(func, v2, v3, v4)
+#define NLOHMANN_JSON_PASTE6(func, v1, v2, v3, v4, v5) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE5(func, v2, v3, v4, v5)
+#define NLOHMANN_JSON_PASTE7(func, v1, v2, v3, v4, v5, v6) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE6(func, v2, v3, v4, v5, v6)
+#define NLOHMANN_JSON_PASTE8(func, v1, v2, v3, v4, v5, v6, v7) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE7(func, v2, v3, v4, v5, v6, v7)
+#define NLOHMANN_JSON_PASTE9(func, v1, v2, v3, v4, v5, v6, v7, v8) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE8(func, v2, v3, v4, v5, v6, v7, v8)
+#define NLOHMANN_JSON_PASTE10(func, v1, v2, v3, v4, v5, v6, v7, v8, v9) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE9(func, v2, v3, v4, v5, v6, v7, v8, v9)
+#define NLOHMANN_JSON_PASTE11(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE10(func, v2, v3, v4, v5, v6, v7, v8, v9, v10)
+#define NLOHMANN_JSON_PASTE12(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE11(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11)
+#define NLOHMANN_JSON_PASTE13(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE12(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12)
+#define NLOHMANN_JSON_PASTE14(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE13(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13)
+#define NLOHMANN_JSON_PASTE15(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE14(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14)
+#define NLOHMANN_JSON_PASTE16(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE15(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15)
+#define NLOHMANN_JSON_PASTE17(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE16(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16)
+#define NLOHMANN_JSON_PASTE18(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE17(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17)
+#define NLOHMANN_JSON_PASTE19(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE18(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18)
+#define NLOHMANN_JSON_PASTE20(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE19(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19)
+#define NLOHMANN_JSON_PASTE21(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE20(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20)
+#define NLOHMANN_JSON_PASTE22(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE21(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21)
+#define NLOHMANN_JSON_PASTE23(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE22(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22)
+#define NLOHMANN_JSON_PASTE24(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE23(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23)
+#define NLOHMANN_JSON_PASTE25(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE24(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24)
+#define NLOHMANN_JSON_PASTE26(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE25(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25)
+#define NLOHMANN_JSON_PASTE27(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE26(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26)
+#define NLOHMANN_JSON_PASTE28(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE27(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27)
+#define NLOHMANN_JSON_PASTE29(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE28(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28)
+#define NLOHMANN_JSON_PASTE30(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE29(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29)
+#define NLOHMANN_JSON_PASTE31(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE30(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30)
+#define NLOHMANN_JSON_PASTE32(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE31(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31)
+#define NLOHMANN_JSON_PASTE33(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE32(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32)
+#define NLOHMANN_JSON_PASTE34(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE33(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33)
+#define NLOHMANN_JSON_PASTE35(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE34(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34)
+#define NLOHMANN_JSON_PASTE36(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE35(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35)
+#define NLOHMANN_JSON_PASTE37(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE36(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36)
+#define NLOHMANN_JSON_PASTE38(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE37(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37)
+#define NLOHMANN_JSON_PASTE39(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE38(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38)
+#define NLOHMANN_JSON_PASTE40(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE39(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39)
+#define NLOHMANN_JSON_PASTE41(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE40(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40)
+#define NLOHMANN_JSON_PASTE42(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE41(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41)
+#define NLOHMANN_JSON_PASTE43(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE42(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42)
+#define NLOHMANN_JSON_PASTE44(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE43(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43)
+#define NLOHMANN_JSON_PASTE45(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE44(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44)
+#define NLOHMANN_JSON_PASTE46(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE45(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45)
+#define NLOHMANN_JSON_PASTE47(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE46(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46)
+#define NLOHMANN_JSON_PASTE48(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE47(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47)
+#define NLOHMANN_JSON_PASTE49(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE48(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48)
+#define NLOHMANN_JSON_PASTE50(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE49(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49)
+#define NLOHMANN_JSON_PASTE51(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE50(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50)
+#define NLOHMANN_JSON_PASTE52(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE51(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51)
+#define NLOHMANN_JSON_PASTE53(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE52(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52)
+#define NLOHMANN_JSON_PASTE54(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE53(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53)
+#define NLOHMANN_JSON_PASTE55(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE54(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54)
+#define NLOHMANN_JSON_PASTE56(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE55(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55)
+#define NLOHMANN_JSON_PASTE57(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE56(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56)
+#define NLOHMANN_JSON_PASTE58(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE57(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57)
+#define NLOHMANN_JSON_PASTE59(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE58(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58)
+#define NLOHMANN_JSON_PASTE60(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE59(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59)
+#define NLOHMANN_JSON_PASTE61(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE60(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60)
+#define NLOHMANN_JSON_PASTE62(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE61(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61)
+#define NLOHMANN_JSON_PASTE63(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61, v62) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE62(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61, v62)
+#define NLOHMANN_JSON_PASTE64(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61, v62, v63) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE63(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61, v62, v63)
+
+#define NLOHMANN_JSON_TO(v1) nlohmann_json_j[#v1] = nlohmann_json_t.v1;
+#define NLOHMANN_JSON_FROM(v1) nlohmann_json_j.at(#v1).get_to(nlohmann_json_t.v1);
+#define NLOHMANN_JSON_FROM_WITH_DEFAULT(v1) nlohmann_json_t.v1 = !nlohmann_json_j.is_null() ? nlohmann_json_j.value(#v1, nlohmann_json_default_obj.v1) : nlohmann_json_default_obj.v1;
+
+/*!
+@brief macro
+@def NLOHMANN_DEFINE_TYPE_INTRUSIVE
+@since version 3.9.0
+@sa https://json.nlohmann.me/api/macros/nlohmann_define_type_intrusive/
+*/
+#define NLOHMANN_DEFINE_TYPE_INTRUSIVE(Type, ...)  \
+    template<typename BasicJsonType, nlohmann::detail::enable_if_t<nlohmann::detail::is_basic_json<BasicJsonType>::value, int> = 0> \
+    friend void to_json(BasicJsonType& nlohmann_json_j, const Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) } \
+    template<typename BasicJsonType, nlohmann::detail::enable_if_t<nlohmann::detail::is_basic_json<BasicJsonType>::value, int> = 0> \
+    friend void from_json(const BasicJsonType& nlohmann_json_j, Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_FROM, __VA_ARGS__)) }
+
+/*!
+@brief macro
+@def NLOHMANN_DEFINE_TYPE_INTRUSIVE_WITH_DEFAULT
+@since version 3.11.0
+@sa https://json.nlohmann.me/api/macros/nlohmann_define_type_intrusive/
+*/
+#define NLOHMANN_DEFINE_TYPE_INTRUSIVE_WITH_DEFAULT(Type, ...)  \
+    template<typename BasicJsonType, nlohmann::detail::enable_if_t<nlohmann::detail::is_basic_json<BasicJsonType>::value, int> = 0> \
+    friend void to_json(BasicJsonType& nlohmann_json_j, const Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) } \
+    template<typename BasicJsonType, nlohmann::detail::enable_if_t<nlohmann::detail::is_basic_json<BasicJsonType>::value, int> = 0> \
+    friend void from_json(const BasicJsonType& nlohmann_json_j, Type& nlohmann_json_t) { const Type nlohmann_json_default_obj{}; NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_FROM_WITH_DEFAULT, __VA_ARGS__)) }
+
+/*!
+@brief macro
+@def NLOHMANN_DEFINE_TYPE_INTRUSIVE_ONLY_SERIALIZE
+@since version 3.11.3
+@sa https://json.nlohmann.me/api/macros/nlohmann_define_type_intrusive/
+*/
+#define NLOHMANN_DEFINE_TYPE_INTRUSIVE_ONLY_SERIALIZE(Type, ...)  \
+    template<typename BasicJsonType, nlohmann::detail::enable_if_t<nlohmann::detail::is_basic_json<BasicJsonType>::value, int> = 0> \
+    friend void to_json(BasicJsonType& nlohmann_json_j, const Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) }
+
+/*!
+@brief macro
+@def NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE
+@since version 3.9.0
+@sa https://json.nlohmann.me/api/macros/nlohmann_define_type_non_intrusive/
+*/
+#define NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(Type, ...)  \
+    template<typename BasicJsonType, nlohmann::detail::enable_if_t<nlohmann::detail::is_basic_json<BasicJsonType>::value, int> = 0> \
+    void to_json(BasicJsonType& nlohmann_json_j, const Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) } \
+    template<typename BasicJsonType, nlohmann::detail::enable_if_t<nlohmann::detail::is_basic_json<BasicJsonType>::value, int> = 0> \
+    void from_json(const BasicJsonType& nlohmann_json_j, Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_FROM, __VA_ARGS__)) }
+
+/*!
+@brief macro
+@def NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_WITH_DEFAULT
+@since version 3.11.0
+@sa https://json.nlohmann.me/api/macros/nlohmann_define_type_non_intrusive/
+*/
+#define NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_WITH_DEFAULT(Type, ...)  \
+    template<typename BasicJsonType, nlohmann::detail::enable_if_t<nlohmann::detail::is_basic_json<BasicJsonType>::value, int> = 0> \
+    void to_json(BasicJsonType& nlohmann_json_j, const Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) } \
+    template<typename BasicJsonType, nlohmann::detail::enable_if_t<nlohmann::detail::is_basic_json<BasicJsonType>::value, int> = 0> \
+    void from_json(const BasicJsonType& nlohmann_json_j, Type& nlohmann_json_t) { const Type nlohmann_json_default_obj{}; NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_FROM_WITH_DEFAULT, __VA_ARGS__)) }
+
+/*!
+@brief macro
+@def NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_ONLY_SERIALIZE
+@since version 3.11.3
+@sa https://json.nlohmann.me/api/macros/nlohmann_define_type_non_intrusive/
+*/
+#define NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_ONLY_SERIALIZE(Type, ...)  \
+    template<typename BasicJsonType, nlohmann::detail::enable_if_t<nlohmann::detail::is_basic_json<BasicJsonType>::value, int> = 0> \
+    void to_json(BasicJsonType& nlohmann_json_j, const Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) }
+
+/*!
+@brief macro
+@def NLOHMANN_DEFINE_DERIVED_TYPE_INTRUSIVE
+@since version 3.12.0
+@sa https://json.nlohmann.me/api/macros/nlohmann_define_derived_type/
+*/
+#define NLOHMANN_DEFINE_DERIVED_TYPE_INTRUSIVE(Type, BaseType, ...)  \
+    template<typename BasicJsonType, nlohmann::detail::enable_if_t<nlohmann::detail::is_basic_json<BasicJsonType>::value, int> = 0> \
+    friend void to_json(BasicJsonType& nlohmann_json_j, const Type& nlohmann_json_t) { nlohmann::to_json(nlohmann_json_j, static_cast<const BaseType &>(nlohmann_json_t)); NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) } \
+    template<typename BasicJsonType, nlohmann::detail::enable_if_t<nlohmann::detail::is_basic_json<BasicJsonType>::value, int> = 0> \
+    friend void from_json(const BasicJsonType& nlohmann_json_j, Type& nlohmann_json_t) { nlohmann::from_json(nlohmann_json_j, static_cast<BaseType&>(nlohmann_json_t)); NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_FROM, __VA_ARGS__)) }
+
+/*!
+@brief macro
+@def NLOHMANN_DEFINE_DERIVED_TYPE_INTRUSIVE_WITH_DEFAULT
+@since version 3.12.0
+@sa https://json.nlohmann.me/api/macros/nlohmann_define_derived_type/
+*/
+#define NLOHMANN_DEFINE_DERIVED_TYPE_INTRUSIVE_WITH_DEFAULT(Type, BaseType, ...)  \
+    template<typename BasicJsonType, nlohmann::detail::enable_if_t<nlohmann::detail::is_basic_json<BasicJsonType>::value, int> = 0> \
+    friend void to_json(BasicJsonType& nlohmann_json_j, const Type& nlohmann_json_t) { nlohmann::to_json(nlohmann_json_j, static_cast<const BaseType&>(nlohmann_json_t)); NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) } \
+    template<typename BasicJsonType, nlohmann::detail::enable_if_t<nlohmann::detail::is_basic_json<BasicJsonType>::value, int> = 0> \
+    friend void from_json(const BasicJsonType& nlohmann_json_j, Type& nlohmann_json_t) { nlohmann::from_json(nlohmann_json_j, static_cast<BaseType&>(nlohmann_json_t)); const Type nlohmann_json_default_obj{}; NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_FROM_WITH_DEFAULT, __VA_ARGS__)) }
+
+/*!
+@brief macro
+@def NLOHMANN_DEFINE_DERIVED_TYPE_INTRUSIVE_ONLY_SERIALIZE
+@since version 3.12.0
+@sa https://json.nlohmann.me/api/macros/nlohmann_define_derived_type/
+*/
+#define NLOHMANN_DEFINE_DERIVED_TYPE_INTRUSIVE_ONLY_SERIALIZE(Type, BaseType, ...)  \
+    template<typename BasicJsonType, nlohmann::detail::enable_if_t<nlohmann::detail::is_basic_json<BasicJsonType>::value, int> = 0> \
+    friend void to_json(BasicJsonType& nlohmann_json_j, const Type& nlohmann_json_t) { nlohmann::to_json(nlohmann_json_j, static_cast<const BaseType &>(nlohmann_json_t)); NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) }
+
+/*!
+@brief macro
+@def NLOHMANN_DEFINE_DERIVED_TYPE_NON_INTRUSIVE
+@since version 3.12.0
+@sa https://json.nlohmann.me/api/macros/nlohmann_define_derived_type/
+*/
+#define NLOHMANN_DEFINE_DERIVED_TYPE_NON_INTRUSIVE(Type, BaseType, ...)  \
+    template<typename BasicJsonType, nlohmann::detail::enable_if_t<nlohmann::detail::is_basic_json<BasicJsonType>::value, int> = 0> \
+    void to_json(BasicJsonType& nlohmann_json_j, const Type& nlohmann_json_t) { nlohmann::to_json(nlohmann_json_j, static_cast<const BaseType &>(nlohmann_json_t)); NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) } \
+    template<typename BasicJsonType, nlohmann::detail::enable_if_t<nlohmann::detail::is_basic_json<BasicJsonType>::value, int> = 0> \
+    void from_json(const BasicJsonType& nlohmann_json_j, Type& nlohmann_json_t) { nlohmann::from_json(nlohmann_json_j, static_cast<BaseType&>(nlohmann_json_t)); NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_FROM, __VA_ARGS__)) }
+
+/*!
+@brief macro
+@def NLOHMANN_DEFINE_DERIVED_TYPE_NON_INTRUSIVE_WITH_DEFAULT
+@since version 3.12.0
+@sa https://json.nlohmann.me/api/macros/nlohmann_define_derived_type/
+*/
+#define NLOHMANN_DEFINE_DERIVED_TYPE_NON_INTRUSIVE_WITH_DEFAULT(Type, BaseType, ...)  \
+    template<typename BasicJsonType, nlohmann::detail::enable_if_t<nlohmann::detail::is_basic_json<BasicJsonType>::value, int> = 0> \
+    void to_json(BasicJsonType& nlohmann_json_j, const Type& nlohmann_json_t) { nlohmann::to_json(nlohmann_json_j, static_cast<const BaseType &>(nlohmann_json_t)); NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) } \
+    template<typename BasicJsonType, nlohmann::detail::enable_if_t<nlohmann::detail::is_basic_json<BasicJsonType>::value, int> = 0> \
+    void from_json(const BasicJsonType& nlohmann_json_j, Type& nlohmann_json_t) { nlohmann::from_json(nlohmann_json_j, static_cast<BaseType&>(nlohmann_json_t)); const Type nlohmann_json_default_obj{}; NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_FROM_WITH_DEFAULT, __VA_ARGS__)) }
+
+/*!
+@brief macro
+@def NLOHMANN_DEFINE_DERIVED_TYPE_NON_INTRUSIVE_ONLY_SERIALIZE
+@since version 3.12.0
+@sa https://json.nlohmann.me/api/macros/nlohmann_define_derived_type/
+*/
+#define NLOHMANN_DEFINE_DERIVED_TYPE_NON_INTRUSIVE_ONLY_SERIALIZE(Type, BaseType, ...)  \
+    template<typename BasicJsonType, nlohmann::detail::enable_if_t<nlohmann::detail::is_basic_json<BasicJsonType>::value, int> = 0> \
+    void to_json(BasicJsonType& nlohmann_json_j, const Type& nlohmann_json_t) { nlohmann::to_json(nlohmann_json_j, static_cast<const BaseType &>(nlohmann_json_t)); NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) }
+
+// inspired from https://stackoverflow.com/a/26745591
+// allows calling any std function as if (e.g., with begin):
+// using std::begin; begin(x);
+//
+// it allows using the detected idiom to retrieve the return type
+// of such an expression
+#define NLOHMANN_CAN_CALL_STD_FUNC_IMPL(std_name)                                 \
+    namespace detail {                                                            \
+    using std::std_name;                                                          \
+    \
+    template<typename... T>                                                       \
+    using result_of_##std_name = decltype(std_name(std::declval<T>()...));        \
+    }                                                                             \
+    \
+    namespace detail2 {                                                           \
+    struct std_name##_tag                                                         \
+    {                                                                             \
+    };                                                                            \
+    \
+    template<typename... T>                                                       \
+    std_name##_tag std_name(T&&...);                                              \
+    \
+    template<typename... T>                                                       \
+    using result_of_##std_name = decltype(std_name(std::declval<T>()...));        \
+    \
+    template<typename... T>                                                       \
+    struct would_call_std_##std_name                                              \
+    {                                                                             \
+        static constexpr auto const value = ::nlohmann::detail::                  \
+                                            is_detected_exact<std_name##_tag, result_of_##std_name, T...>::value; \
+    };                                                                            \
+    } /* namespace detail2 */ \
+    \
+    template<typename... T>                                                       \
+    struct would_call_std_##std_name : detail2::would_call_std_##std_name<T...>   \
+    {                                                                             \
+    }
+
+#ifndef JSON_USE_IMPLICIT_CONVERSIONS
+    #define JSON_USE_IMPLICIT_CONVERSIONS 1
+#endif
+
+#if JSON_USE_IMPLICIT_CONVERSIONS
+    #define JSON_EXPLICIT
+#else
+    #define JSON_EXPLICIT explicit
+#endif
+
+#ifndef JSON_DISABLE_ENUM_SERIALIZATION
+    #define JSON_DISABLE_ENUM_SERIALIZATION 0
+#endif
+
+#ifndef JSON_USE_GLOBAL_UDLS
+    #define JSON_USE_GLOBAL_UDLS 1
+#endif
+
+#if JSON_HAS_THREE_WAY_COMPARISON
+    #include <compare> // partial_ordering
+#endif
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+///////////////////////////
+// JSON type enumeration //
+///////////////////////////
+
+/*!
+@brief the JSON type enumeration
+
+This enumeration collects the different JSON types. It is internally used to
+distinguish the stored values, and the functions @ref basic_json::is_null(),
+@ref basic_json::is_object(), @ref basic_json::is_array(),
+@ref basic_json::is_string(), @ref basic_json::is_boolean(),
+@ref basic_json::is_number() (with @ref basic_json::is_number_integer(),
+@ref basic_json::is_number_unsigned(), and @ref basic_json::is_number_float()),
+@ref basic_json::is_discarded(), @ref basic_json::is_primitive(), and
+@ref basic_json::is_structured() rely on it.
+
+@note There are three enumeration entries (number_integer, number_unsigned, and
+number_float), because the library distinguishes these three types for numbers:
+@ref basic_json::number_unsigned_t is used for unsigned integers,
+@ref basic_json::number_integer_t is used for signed integers, and
+@ref basic_json::number_float_t is used for floating-point numbers or to
+approximate integers which do not fit in the limits of their respective type.
+
+@sa see @ref basic_json::basic_json(const value_t value_type) -- create a JSON
+value with the default value for a given type
+
+@since version 1.0.0
+*/
+enum class value_t : std::uint8_t
+{
+    null,             ///< null value
+    object,           ///< object (unordered set of name/value pairs)
+    array,            ///< array (ordered collection of values)
+    string,           ///< string value
+    boolean,          ///< boolean value
+    number_integer,   ///< number value (signed integer)
+    number_unsigned,  ///< number value (unsigned integer)
+    number_float,     ///< number value (floating-point)
+    binary,           ///< binary array (ordered collection of bytes)
+    discarded         ///< discarded by the parser callback function
+};
+
+/*!
+@brief comparison operator for JSON types
+
+Returns an ordering that is similar to Python:
+- order: null < boolean < number < object < array < string < binary
+- furthermore, each type is not smaller than itself
+- discarded values are not comparable
+- binary is represented as a b"" string in python and directly comparable to a
+  string; however, making a binary array directly comparable with a string would
+  be surprising behavior in a JSON file.
+
+@since version 1.0.0
+*/
+#if JSON_HAS_THREE_WAY_COMPARISON
+    inline std::partial_ordering operator<=>(const value_t lhs, const value_t rhs) noexcept // *NOPAD*
+#else
+    inline bool operator<(const value_t lhs, const value_t rhs) noexcept
+#endif
+{
+    static constexpr std::array<std::uint8_t, 9> order = {{
+            0 /* null */, 3 /* object */, 4 /* array */, 5 /* string */,
+            1 /* boolean */, 2 /* integer */, 2 /* unsigned */, 2 /* float */,
+            6 /* binary */
+        }
+    };
+
+    const auto l_index = static_cast<std::size_t>(lhs);
+    const auto r_index = static_cast<std::size_t>(rhs);
+#if JSON_HAS_THREE_WAY_COMPARISON
+    if (l_index < order.size() && r_index < order.size())
+    {
+        return order[l_index] <=> order[r_index]; // *NOPAD*
+    }
+    return std::partial_ordering::unordered;
+#else
+    return l_index < order.size() && r_index < order.size() && order[l_index] < order[r_index];
+#endif
+}
+
+// GCC selects the built-in operator< over an operator rewritten from
+// a user-defined spaceship operator
+// Clang, MSVC, and ICC select the rewritten candidate
+// (see GCC bug https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105200)
+#if JSON_HAS_THREE_WAY_COMPARISON && defined(__GNUC__)
+inline bool operator<(const value_t lhs, const value_t rhs) noexcept
+{
+    return std::is_lt(lhs <=> rhs); // *NOPAD*
+}
+#endif
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/string_escape.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013 - 2025 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+// #include <nlohmann/detail/abi_macros.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+/*!
+@brief replace all occurrences of a substring by another string
+
+@param[in,out] s  the string to manipulate; changed so that all
+               occurrences of @a f are replaced with @a t
+@param[in]     f  the substring to replace with @a t
+@param[in]     t  the string to replace @a f
+
+@pre The search string @a f must not be empty. **This precondition is
+enforced with an assertion.**
+
+@since version 2.0.0
+*/
+template<typename StringType>
+inline void replace_substring(StringType& s, const StringType& f,
+                              const StringType& t)
+{
+    JSON_ASSERT(!f.empty());
+    for (auto pos = s.find(f);                // find first occurrence of f
+            pos != StringType::npos;          // make sure f was found
+            s.replace(pos, f.size(), t),      // replace with t, and
+            pos = s.find(f, pos + t.size()))  // find next occurrence of f
+    {}
+}
+
+/*!
+ * @brief string escaping as described in RFC 6901 (Sect. 4)
+ * @param[in] s string to escape
+ * @return    escaped string
+ *
+ * Note the order of escaping "~" to "~0" and "/" to "~1" is important.
+ */
+template<typename StringType>
+inline StringType escape(StringType s)
+{
+    replace_substring(s, StringType{"~"}, StringType{"~0"});
+    replace_substring(s, StringType{"/"}, StringType{"~1"});
+    return s;
+}
+
+/*!
+ * @brief string unescaping as described in RFC 6901 (Sect. 4)
+ * @param[in] s string to unescape
+ * @return    unescaped string
+ *
+ * Note the order of escaping "~1" to "/" and "~0" to "~" is important.
+ */
+template<typename StringType>
+static void unescape(StringType& s)
+{
+    replace_substring(s, StringType{"~1"}, StringType{"/"});
+    replace_substring(s, StringType{"~0"}, StringType{"~"});
+}
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/input/position_t.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013 - 2025 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <cstddef> // size_t
+
+// #include <nlohmann/detail/abi_macros.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+/// struct to capture the start position of the current token
+struct position_t
+{
+    /// the total number of characters read
+    std::size_t chars_read_total = 0;
+    /// the number of characters read in the current line
+    std::size_t chars_read_current_line = 0;
+    /// the number of lines read
+    std::size_t lines_read = 0;
+
+    /// conversion to size_t to preserve SAX interface
+    constexpr operator size_t() const
+    {
+        return chars_read_total;
+    }
+};
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/meta/cpp_future.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013 - 2025 Niels Lohmann <https://nlohmann.me>
+// SPDX-FileCopyrightText: 2018 The Abseil Authors
+// SPDX-License-Identifier: MIT
+
+
+
+#include <array> // array
+#include <cstddef> // size_t
+#include <type_traits> // conditional, enable_if, false_type, integral_constant, is_constructible, is_integral, is_same, remove_cv, remove_reference, true_type
+#include <utility> // index_sequence, make_index_sequence, index_sequence_for
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+template<typename T>
+using uncvref_t = typename std::remove_cv<typename std::remove_reference<T>::type>::type;
+
+#ifdef JSON_HAS_CPP_14
+
+// the following utilities are natively available in C++14
+using std::enable_if_t;
+using std::index_sequence;
+using std::make_index_sequence;
+using std::index_sequence_for;
+
+#else
+
+// alias templates to reduce boilerplate
+template<bool B, typename T = void>
+using enable_if_t = typename std::enable_if<B, T>::type;
+
+// The following code is taken from https://github.com/abseil/abseil-cpp/blob/10cb35e459f5ecca5b2ff107635da0bfa41011b4/absl/utility/utility.h
+// which is part of Google Abseil (https://github.com/abseil/abseil-cpp), licensed under the Apache License 2.0.
+
+//// START OF CODE FROM GOOGLE ABSEIL
+
+// integer_sequence
+//
+// Class template representing a compile-time integer sequence. An instantiation
+// of `integer_sequence<T, Ints...>` has a sequence of integers encoded in its
+// type through its template arguments (which is a common need when
+// working with C++11 variadic templates). `absl::integer_sequence` is designed
+// to be a drop-in replacement for C++14's `std::integer_sequence`.
+//
+// Example:
+//
+//   template< class T, T... Ints >
+//   void user_function(integer_sequence<T, Ints...>);
+//
+//   int main()
+//   {
+//     // user_function's `T` will be deduced to `int` and `Ints...`
+//     // will be deduced to `0, 1, 2, 3, 4`.
+//     user_function(make_integer_sequence<int, 5>());
+//   }
+template <typename T, T... Ints>
+struct integer_sequence
+{
+    using value_type = T;
+    static constexpr std::size_t size() noexcept
+    {
+        return sizeof...(Ints);
+    }
+};
+
+// index_sequence
+//
+// A helper template for an `integer_sequence` of `size_t`,
+// `absl::index_sequence` is designed to be a drop-in replacement for C++14's
+// `std::index_sequence`.
+template <size_t... Ints>
+using index_sequence = integer_sequence<size_t, Ints...>;
+
+namespace utility_internal
+{
+
+template <typename Seq, size_t SeqSize, size_t Rem>
+struct Extend;
+
+// Note that SeqSize == sizeof...(Ints). It's passed explicitly for efficiency.
+template <typename T, T... Ints, size_t SeqSize>
+struct Extend<integer_sequence<T, Ints...>, SeqSize, 0>
+{
+    using type = integer_sequence < T, Ints..., (Ints + SeqSize)... >;
+};
+
+template <typename T, T... Ints, size_t SeqSize>
+struct Extend<integer_sequence<T, Ints...>, SeqSize, 1>
+{
+    using type = integer_sequence < T, Ints..., (Ints + SeqSize)..., 2 * SeqSize >;
+};
+
+// Recursion helper for 'make_integer_sequence<T, N>'.
+// 'Gen<T, N>::type' is an alias for 'integer_sequence<T, 0, 1, ... N-1>'.
+template <typename T, size_t N>
+struct Gen
+{
+    using type =
+        typename Extend < typename Gen < T, N / 2 >::type, N / 2, N % 2 >::type;
+};
+
+template <typename T>
+struct Gen<T, 0>
+{
+    using type = integer_sequence<T>;
+};
+
+}  // namespace utility_internal
+
+// Compile-time sequences of integers
+
+// make_integer_sequence
+//
+// This template alias is equivalent to
+// `integer_sequence<int, 0, 1, ..., N-1>`, and is designed to be a drop-in
+// replacement for C++14's `std::make_integer_sequence`.
+template <typename T, T N>
+using make_integer_sequence = typename utility_internal::Gen<T, N>::type;
+
+// make_index_sequence
+//
+// This template alias is equivalent to `index_sequence<0, 1, ..., N-1>`,
+// and is designed to be a drop-in replacement for C++14's
+// `std::make_index_sequence`.
+template <size_t N>
+using make_index_sequence = make_integer_sequence<size_t, N>;
+
+// index_sequence_for
+//
+// Converts a typename pack into an index sequence of the same length, and
+// is designed to be a drop-in replacement for C++14's
+// `std::index_sequence_for()`
+template <typename... Ts>
+using index_sequence_for = make_index_sequence<sizeof...(Ts)>;
+
+//// END OF CODE FROM GOOGLE ABSEIL
+
+#endif
+
+// dispatch utility (taken from ranges-v3)
+template<unsigned N> struct priority_tag : priority_tag < N - 1 > {};
+template<> struct priority_tag<0> {};
+
+// taken from ranges-v3
+template<typename T>
+struct static_const
+{
+    static JSON_INLINE_VARIABLE constexpr T value{};
+};
+
+#ifndef JSON_HAS_CPP_17
+    template<typename T>
+    constexpr T static_const<T>::value;
+#endif
+
+template<typename T, typename... Args>
+constexpr std::array<T, sizeof...(Args)> make_array(Args&& ... args)
+{
+    return std::array<T, sizeof...(Args)> {{static_cast<T>(std::forward<Args>(args))...}};
+}
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/meta/type_traits.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013 - 2025 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <limits> // numeric_limits
+#include <string> // char_traits
+#include <tuple> // tuple
+#include <type_traits> // false_type, is_constructible, is_integral, is_same, true_type
+#include <utility> // declval
+
+// #include <nlohmann/detail/iterators/iterator_traits.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013 - 2025 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <iterator> // random_access_iterator_tag
+
+// #include <nlohmann/detail/abi_macros.hpp>
+
+// #include <nlohmann/detail/meta/void_t.hpp>
+
+// #include <nlohmann/detail/meta/cpp_future.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+template<typename It, typename = void>
+struct iterator_types {};
+
+template<typename It>
+struct iterator_types <
+    It,
+    void_t<typename It::difference_type, typename It::value_type, typename It::pointer,
+    typename It::reference, typename It::iterator_category >>
+{
+    using difference_type = typename It::difference_type;
+    using value_type = typename It::value_type;
+    using pointer = typename It::pointer;
+    using reference = typename It::reference;
+    using iterator_category = typename It::iterator_category;
+};
+
+// This is required as some compilers implement std::iterator_traits in a way that
+// doesn't work with SFINAE. See https://github.com/nlohmann/json/issues/1341.
+template<typename T, typename = void>
+struct iterator_traits
+{
+};
+
+template<typename T>
+struct iterator_traits < T, enable_if_t < !std::is_pointer<T>::value >>
+    : iterator_types<T>
+{
+};
+
+template<typename T>
+struct iterator_traits<T*, enable_if_t<std::is_object<T>::value>>
+{
+    using iterator_category = std::random_access_iterator_tag;
+    using value_type = T;
+    using difference_type = ptrdiff_t;
+    using pointer = T*;
+    using reference = T&;
+};
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/meta/call_std/begin.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013 - 2025 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+
+NLOHMANN_CAN_CALL_STD_FUNC_IMPL(begin);
+
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/meta/call_std/end.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013 - 2025 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+
+NLOHMANN_CAN_CALL_STD_FUNC_IMPL(end);
+
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/meta/cpp_future.hpp>
+
+// #include <nlohmann/detail/meta/detected.hpp>
+
+// #include <nlohmann/json_fwd.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013 - 2025 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+#ifndef INCLUDE_NLOHMANN_JSON_FWD_HPP_
+    #define INCLUDE_NLOHMANN_JSON_FWD_HPP_
+
+    #include <cstdint> // int64_t, uint64_t
+    #include <map> // map
+    #include <memory> // allocator
+    #include <string> // string
+    #include <vector> // vector
+
+    // #include <nlohmann/detail/abi_macros.hpp>
+
+
+    /*!
+    @brief namespace for Niels Lohmann
+    @see https://github.com/nlohmann
+    @since version 1.0.0
+    */
+    NLOHMANN_JSON_NAMESPACE_BEGIN
+
+    /*!
+    @brief default JSONSerializer template argument
+
+    This serializer ignores the template arguments and uses ADL
+    ([argument-dependent lookup](https://en.cppreference.com/w/cpp/language/adl))
+    for serialization.
+    */
+    template<typename T = void, typename SFINAE = void>
+    struct adl_serializer;
+
+    /// a class to store JSON values
+    /// @sa https://json.nlohmann.me/api/basic_json/
+    template<template<typename U, typename V, typename... Args> class ObjectType =
+    std::map,
+    template<typename U, typename... Args> class ArrayType = std::vector,
+    class StringType = std::string, class BooleanType = bool,
+    class NumberIntegerType = std::int64_t,
+    class NumberUnsignedType = std::uint64_t,
+    class NumberFloatType = double,
+    template<typename U> class AllocatorType = std::allocator,
+    template<typename T, typename SFINAE = void> class JSONSerializer =
+    adl_serializer,
+    class BinaryType = std::vector<std::uint8_t>, // cppcheck-suppress syntaxError
+    class CustomBaseClass = void>
+    class basic_json;
+
+    /// @brief JSON Pointer defines a string syntax for identifying a specific value within a JSON document
+    /// @sa https://json.nlohmann.me/api/json_pointer/
+    template<typename RefStringType>
+    class json_pointer;
+
+    /*!
+    @brief default specialization
+    @sa https://json.nlohmann.me/api/json/
+    */
+    using json = basic_json<>;
+
+    /// @brief a minimal map-like container that preserves insertion order
+    /// @sa https://json.nlohmann.me/api/ordered_map/
+    template<class Key, class T, class IgnoredLess, class Allocator>
+    struct ordered_map;
+
+    /// @brief specialization that maintains the insertion order of object keys
+    /// @sa https://json.nlohmann.me/api/ordered_json/
+    using ordered_json = basic_json<nlohmann::ordered_map>;
+
+    NLOHMANN_JSON_NAMESPACE_END
+
+#endif  // INCLUDE_NLOHMANN_JSON_FWD_HPP_
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+/*!
+@brief detail namespace with internal helper functions
+
+This namespace collects functions that should not be exposed,
+implementations of some @ref basic_json methods, and meta-programming helpers.
+
+@since version 2.1.0
+*/
+namespace detail
+{
+
+/////////////
+// helpers //
+/////////////
+
+// Note to maintainers:
+//
+// Every trait in this file expects a non CV-qualified type.
+// The only exceptions are in the 'aliases for detected' section
+// (i.e. those of the form: decltype(T::member_function(std::declval<T>())))
+//
+// In this case, T has to be properly CV-qualified to constraint the function arguments
+// (e.g. to_json(BasicJsonType&, const T&))
+
+template<typename> struct is_basic_json : std::false_type {};
+
+NLOHMANN_BASIC_JSON_TPL_DECLARATION
+struct is_basic_json<NLOHMANN_BASIC_JSON_TPL> : std::true_type {};
+
+// used by exceptions create() member functions
+// true_type for pointer to possibly cv-qualified basic_json or std::nullptr_t
+// false_type otherwise
+template<typename BasicJsonContext>
+struct is_basic_json_context :
+    std::integral_constant < bool,
+    is_basic_json<typename std::remove_cv<typename std::remove_pointer<BasicJsonContext>::type>::type>::value
+    || std::is_same<BasicJsonContext, std::nullptr_t>::value >
+{};
+
+//////////////////////
+// json_ref helpers //
+//////////////////////
+
+template<typename>
+class json_ref;
+
+template<typename>
+struct is_json_ref : std::false_type {};
+
+template<typename T>
+struct is_json_ref<json_ref<T>> : std::true_type {};
+
+//////////////////////////
+// aliases for detected //
+//////////////////////////
+
+template<typename T>
+using mapped_type_t = typename T::mapped_type;
+
+template<typename T>
+using key_type_t = typename T::key_type;
+
+template<typename T>
+using value_type_t = typename T::value_type;
+
+template<typename T>
+using difference_type_t = typename T::difference_type;
+
+template<typename T>
+using pointer_t = typename T::pointer;
+
+template<typename T>
+using reference_t = typename T::reference;
+
+template<typename T>
+using iterator_category_t = typename T::iterator_category;
+
+template<typename T, typename... Args>
+using to_json_function = decltype(T::to_json(std::declval<Args>()...));
+
+template<typename T, typename... Args>
+using from_json_function = decltype(T::from_json(std::declval<Args>()...));
+
+template<typename T, typename U>
+using get_template_function = decltype(std::declval<T>().template get<U>());
+
+// trait checking if JSONSerializer<T>::from_json(json const&, udt&) exists
+template<typename BasicJsonType, typename T, typename = void>
+struct has_from_json : std::false_type {};
+
+// trait checking if j.get<T> is valid
+// use this trait instead of std::is_constructible or std::is_convertible,
+// both rely on, or make use of implicit conversions, and thus fail when T
+// has several constructors/operator= (see https://github.com/nlohmann/json/issues/958)
+template <typename BasicJsonType, typename T>
+struct is_getable
+{
+    static constexpr bool value = is_detected<get_template_function, const BasicJsonType&, T>::value;
+};
+
+template<typename BasicJsonType, typename T>
+struct has_from_json < BasicJsonType, T, enable_if_t < !is_basic_json<T>::value >>
+{
+    using serializer = typename BasicJsonType::template json_serializer<T, void>;
+
+    static constexpr bool value =
+        is_detected_exact<void, from_json_function, serializer,
+        const BasicJsonType&, T&>::value;
+};
+
+// This trait checks if JSONSerializer<T>::from_json(json const&) exists
+// this overload is used for non-default-constructible user-defined-types
+template<typename BasicJsonType, typename T, typename = void>
+struct has_non_default_from_json : std::false_type {};
+
+template<typename BasicJsonType, typename T>
+struct has_non_default_from_json < BasicJsonType, T, enable_if_t < !is_basic_json<T>::value >>
+{
+    using serializer = typename BasicJsonType::template json_serializer<T, void>;
+
+    static constexpr bool value =
+        is_detected_exact<T, from_json_function, serializer,
+        const BasicJsonType&>::value;
+};
+
+// This trait checks if BasicJsonType::json_serializer<T>::to_json exists
+// Do not evaluate the trait when T is a basic_json type, to avoid template instantiation infinite recursion.
+template<typename BasicJsonType, typename T, typename = void>
+struct has_to_json : std::false_type {};
+
+template<typename BasicJsonType, typename T>
+struct has_to_json < BasicJsonType, T, enable_if_t < !is_basic_json<T>::value >>
+{
+    using serializer = typename BasicJsonType::template json_serializer<T, void>;
+
+    static constexpr bool value =
+        is_detected_exact<void, to_json_function, serializer, BasicJsonType&,
+        T>::value;
+};
+
+template<typename T>
+using detect_key_compare = typename T::key_compare;
+
+template<typename T>
+struct has_key_compare : std::integral_constant<bool, is_detected<detect_key_compare, T>::value> {};
+
+// obtains the actual object key comparator
+template<typename BasicJsonType>
+struct actual_object_comparator
+{
+    using object_t = typename BasicJsonType::object_t;
+    using object_comparator_t = typename BasicJsonType::default_object_comparator_t;
+    using type = typename std::conditional < has_key_compare<object_t>::value,
+          typename object_t::key_compare, object_comparator_t>::type;
+};
+
+template<typename BasicJsonType>
+using actual_object_comparator_t = typename actual_object_comparator<BasicJsonType>::type;
+
+/////////////////
+// char_traits //
+/////////////////
+
+// Primary template of char_traits calls std char_traits
+template<typename T>
+struct char_traits : std::char_traits<T>
+{};
+
+// Explicitly define char traits for unsigned char since it is not standard
+template<>
+struct char_traits<unsigned char> : std::char_traits<char>
+{
+    using char_type = unsigned char;
+    using int_type = uint64_t;
+
+    // Redefine to_int_type function
+    static int_type to_int_type(char_type c) noexcept
+    {
+        return static_cast<int_type>(c);
+    }
+
+    static char_type to_char_type(int_type i) noexcept
+    {
+        return static_cast<char_type>(i);
+    }
+
+    static constexpr int_type eof() noexcept
+    {
+        return static_cast<int_type>(std::char_traits<char>::eof());
+    }
+};
+
+// Explicitly define char traits for signed char since it is not standard
+template<>
+struct char_traits<signed char> : std::char_traits<char>
+{
+    using char_type = signed char;
+    using int_type = uint64_t;
+
+    // Redefine to_int_type function
+    static int_type to_int_type(char_type c) noexcept
+    {
+        return static_cast<int_type>(c);
+    }
+
+    static char_type to_char_type(int_type i) noexcept
+    {
+        return static_cast<char_type>(i);
+    }
+
+    static constexpr int_type eof() noexcept
+    {
+        return static_cast<int_type>(std::char_traits<char>::eof());
+    }
+};
+
+///////////////////
+// is_ functions //
+///////////////////
+
+// https://en.cppreference.com/w/cpp/types/conjunction
+template<class...> struct conjunction : std::true_type { };
+template<class B> struct conjunction<B> : B { };
+template<class B, class... Bn>
+struct conjunction<B, Bn...>
+: std::conditional<static_cast<bool>(B::value), conjunction<Bn...>, B>::type {};
+
+// https://en.cppreference.com/w/cpp/types/negation
+template<class B> struct negation : std::integral_constant < bool, !B::value > { };
+
+// Reimplementation of is_constructible and is_default_constructible, due to them being broken for
+// std::pair and std::tuple until LWG 2367 fix (see https://cplusplus.github.io/LWG/lwg-defects.html#2367).
+// This causes compile errors in e.g. clang 3.5 or gcc 4.9.
+template <typename T>
+struct is_default_constructible : std::is_default_constructible<T> {};
+
+template <typename T1, typename T2>
+struct is_default_constructible<std::pair<T1, T2>>
+    : conjunction<is_default_constructible<T1>, is_default_constructible<T2>> {};
+
+template <typename T1, typename T2>
+struct is_default_constructible<const std::pair<T1, T2>>
+    : conjunction<is_default_constructible<T1>, is_default_constructible<T2>> {};
+
+template <typename... Ts>
+struct is_default_constructible<std::tuple<Ts...>>
+    : conjunction<is_default_constructible<Ts>...> {};
+
+template <typename... Ts>
+struct is_default_constructible<const std::tuple<Ts...>>
+    : conjunction<is_default_constructible<Ts>...> {};
+
+template <typename T, typename... Args>
+struct is_constructible : std::is_constructible<T, Args...> {};
+
+template <typename T1, typename T2>
+struct is_constructible<std::pair<T1, T2>> : is_default_constructible<std::pair<T1, T2>> {};
+
+template <typename T1, typename T2>
+struct is_constructible<const std::pair<T1, T2>> : is_default_constructible<const std::pair<T1, T2>> {};
+
+template <typename... Ts>
+struct is_constructible<std::tuple<Ts...>> : is_default_constructible<std::tuple<Ts...>> {};
+
+template <typename... Ts>
+struct is_constructible<const std::tuple<Ts...>> : is_default_constructible<const std::tuple<Ts...>> {};
+
+template<typename T, typename = void>
+struct is_iterator_traits : std::false_type {};
+
+template<typename T>
+struct is_iterator_traits<iterator_traits<T>>
+{
+  private:
+    using traits = iterator_traits<T>;
+
+  public:
+    static constexpr auto value =
+        is_detected<value_type_t, traits>::value &&
+        is_detected<difference_type_t, traits>::value &&
+        is_detected<pointer_t, traits>::value &&
+        is_detected<iterator_category_t, traits>::value &&
+        is_detected<reference_t, traits>::value;
+};
+
+template<typename T>
+struct is_range
+{
+  private:
+    using t_ref = typename std::add_lvalue_reference<T>::type;
+
+    using iterator = detected_t<result_of_begin, t_ref>;
+    using sentinel = detected_t<result_of_end, t_ref>;
+
+    // to be 100% correct, it should use https://en.cppreference.com/w/cpp/iterator/input_or_output_iterator
+    // and https://en.cppreference.com/w/cpp/iterator/sentinel_for
+    // but reimplementing these would be too much work, as a lot of other concepts are used underneath
+    static constexpr auto is_iterator_begin =
+        is_iterator_traits<iterator_traits<iterator>>::value;
+
+  public:
+    static constexpr bool value = !std::is_same<iterator, nonesuch>::value && !std::is_same<sentinel, nonesuch>::value && is_iterator_begin;
+};
+
+template<typename R>
+using iterator_t = enable_if_t<is_range<R>::value, result_of_begin<decltype(std::declval<R&>())>>;
+
+template<typename T>
+using range_value_t = value_type_t<iterator_traits<iterator_t<T>>>;
+
+// The following implementation of is_complete_type is taken from
+// https://blogs.msdn.microsoft.com/vcblog/2015/12/02/partial-support-for-expression-sfinae-in-vs-2015-update-1/
+// and is written by Xiang Fan who agreed to using it in this library.
+
+template<typename T, typename = void>
+struct is_complete_type : std::false_type {};
+
+template<typename T>
+struct is_complete_type<T, decltype(void(sizeof(T)))> : std::true_type {};
+
+template<typename BasicJsonType, typename CompatibleObjectType,
+         typename = void>
+struct is_compatible_object_type_impl : std::false_type {};
+
+template<typename BasicJsonType, typename CompatibleObjectType>
+struct is_compatible_object_type_impl <
+    BasicJsonType, CompatibleObjectType,
+    enable_if_t < is_detected<mapped_type_t, CompatibleObjectType>::value&&
+    is_detected<key_type_t, CompatibleObjectType>::value >>
+{
+    using object_t = typename BasicJsonType::object_t;
+
+    // macOS's is_constructible does not play well with nonesuch...
+    static constexpr bool value =
+        is_constructible<typename object_t::key_type,
+        typename CompatibleObjectType::key_type>::value &&
+        is_constructible<typename object_t::mapped_type,
+        typename CompatibleObjectType::mapped_type>::value;
+};
+
+template<typename BasicJsonType, typename CompatibleObjectType>
+struct is_compatible_object_type
+    : is_compatible_object_type_impl<BasicJsonType, CompatibleObjectType> {};
+
+template<typename BasicJsonType, typename ConstructibleObjectType,
+         typename = void>
+struct is_constructible_object_type_impl : std::false_type {};
+
+template<typename BasicJsonType, typename ConstructibleObjectType>
+struct is_constructible_object_type_impl <
+    BasicJsonType, ConstructibleObjectType,
+    enable_if_t < is_detected<mapped_type_t, ConstructibleObjectType>::value&&
+    is_detected<key_type_t, ConstructibleObjectType>::value >>
+{
+    using object_t = typename BasicJsonType::object_t;
+
+    static constexpr bool value =
+        (is_default_constructible<ConstructibleObjectType>::value &&
+         (std::is_move_assignable<ConstructibleObjectType>::value ||
+          std::is_copy_assignable<ConstructibleObjectType>::value) &&
+         (is_constructible<typename ConstructibleObjectType::key_type,
+          typename object_t::key_type>::value &&
+          std::is_same <
+          typename object_t::mapped_type,
+          typename ConstructibleObjectType::mapped_type >::value)) ||
+        (has_from_json<BasicJsonType,
+         typename ConstructibleObjectType::mapped_type>::value ||
+         has_non_default_from_json <
+         BasicJsonType,
+         typename ConstructibleObjectType::mapped_type >::value);
+};
+
+template<typename BasicJsonType, typename ConstructibleObjectType>
+struct is_constructible_object_type
+    : is_constructible_object_type_impl<BasicJsonType,
+      ConstructibleObjectType> {};
+
+template<typename BasicJsonType, typename CompatibleStringType>
+struct is_compatible_string_type
+{
+    static constexpr auto value =
+        is_constructible<typename BasicJsonType::string_t, CompatibleStringType>::value;
+};
+
+template<typename BasicJsonType, typename ConstructibleStringType>
+struct is_constructible_string_type
+{
+    // launder type through decltype() to fix compilation failure on ICPC
+#ifdef __INTEL_COMPILER
+    using laundered_type = decltype(std::declval<ConstructibleStringType>());
+#else
+    using laundered_type = ConstructibleStringType;
+#endif
+
+    static constexpr auto value =
+        conjunction <
+        is_constructible<laundered_type, typename BasicJsonType::string_t>,
+        is_detected_exact<typename BasicJsonType::string_t::value_type,
+        value_type_t, laundered_type >>::value;
+};
+
+template<typename BasicJsonType, typename CompatibleArrayType, typename = void>
+struct is_compatible_array_type_impl : std::false_type {};
+
+template<typename BasicJsonType, typename CompatibleArrayType>
+struct is_compatible_array_type_impl <
+    BasicJsonType, CompatibleArrayType,
+    enable_if_t <
+    is_detected<iterator_t, CompatibleArrayType>::value&&
+    is_iterator_traits<iterator_traits<detected_t<iterator_t, CompatibleArrayType>>>::value&&
+// special case for types like std::filesystem::path whose iterator's value_type are themselves
+// c.f. https://github.com/nlohmann/json/pull/3073
+    !std::is_same<CompatibleArrayType, detected_t<range_value_t, CompatibleArrayType>>::value >>
+{
+    static constexpr bool value =
+        is_constructible<BasicJsonType,
+        range_value_t<CompatibleArrayType>>::value;
+};
+
+template<typename BasicJsonType, typename CompatibleArrayType>
+struct is_compatible_array_type
+    : is_compatible_array_type_impl<BasicJsonType, CompatibleArrayType> {};
+
+template<typename BasicJsonType, typename ConstructibleArrayType, typename = void>
+struct is_constructible_array_type_impl : std::false_type {};
+
+template<typename BasicJsonType, typename ConstructibleArrayType>
+struct is_constructible_array_type_impl <
+    BasicJsonType, ConstructibleArrayType,
+    enable_if_t<std::is_same<ConstructibleArrayType,
+    typename BasicJsonType::value_type>::value >>
+            : std::true_type {};
+
+template<typename BasicJsonType, typename ConstructibleArrayType>
+struct is_constructible_array_type_impl <
+    BasicJsonType, ConstructibleArrayType,
+    enable_if_t < !std::is_same<ConstructibleArrayType,
+    typename BasicJsonType::value_type>::value&&
+    !is_compatible_string_type<BasicJsonType, ConstructibleArrayType>::value&&
+    is_default_constructible<ConstructibleArrayType>::value&&
+(std::is_move_assignable<ConstructibleArrayType>::value ||
+ std::is_copy_assignable<ConstructibleArrayType>::value)&&
+is_detected<iterator_t, ConstructibleArrayType>::value&&
+is_iterator_traits<iterator_traits<detected_t<iterator_t, ConstructibleArrayType>>>::value&&
+is_detected<range_value_t, ConstructibleArrayType>::value&&
+// special case for types like std::filesystem::path whose iterator's value_type are themselves
+// c.f. https://github.com/nlohmann/json/pull/3073
+!std::is_same<ConstructibleArrayType, detected_t<range_value_t, ConstructibleArrayType>>::value&&
+is_complete_type <
+detected_t<range_value_t, ConstructibleArrayType >>::value >>
+{
+    using value_type = range_value_t<ConstructibleArrayType>;
+
+    static constexpr bool value =
+        std::is_same<value_type,
+        typename BasicJsonType::array_t::value_type>::value ||
+        has_from_json<BasicJsonType,
+        value_type>::value ||
+        has_non_default_from_json <
+        BasicJsonType,
+        value_type >::value;
+};
+
+template<typename BasicJsonType, typename ConstructibleArrayType>
+struct is_constructible_array_type
+    : is_constructible_array_type_impl<BasicJsonType, ConstructibleArrayType> {};
+
+template<typename RealIntegerType, typename CompatibleNumberIntegerType,
+         typename = void>
+struct is_compatible_integer_type_impl : std::false_type {};
+
+template<typename RealIntegerType, typename CompatibleNumberIntegerType>
+struct is_compatible_integer_type_impl <
+    RealIntegerType, CompatibleNumberIntegerType,
+    enable_if_t < std::is_integral<RealIntegerType>::value&&
+    std::is_integral<CompatibleNumberIntegerType>::value&&
+    !std::is_same<bool, CompatibleNumberIntegerType>::value >>
+{
+    // is there an assert somewhere on overflows?
+    using RealLimits = std::numeric_limits<RealIntegerType>;
+    using CompatibleLimits = std::numeric_limits<CompatibleNumberIntegerType>;
+
+    static constexpr auto value =
+        is_constructible<RealIntegerType,
+        CompatibleNumberIntegerType>::value &&
+        CompatibleLimits::is_integer &&
+        RealLimits::is_signed == CompatibleLimits::is_signed;
+};
+
+template<typename RealIntegerType, typename CompatibleNumberIntegerType>
+struct is_compatible_integer_type
+    : is_compatible_integer_type_impl<RealIntegerType,
+      CompatibleNumberIntegerType> {};
+
+template<typename BasicJsonType, typename CompatibleType, typename = void>
+struct is_compatible_type_impl: std::false_type {};
+
+template<typename BasicJsonType, typename CompatibleType>
+struct is_compatible_type_impl <
+    BasicJsonType, CompatibleType,
+    enable_if_t<is_complete_type<CompatibleType>::value >>
+{
+    static constexpr bool value =
+        has_to_json<BasicJsonType, CompatibleType>::value;
+};
+
+template<typename BasicJsonType, typename CompatibleType>
+struct is_compatible_type
+    : is_compatible_type_impl<BasicJsonType, CompatibleType> {};
+
+template<typename T1, typename T2>
+struct is_constructible_tuple : std::false_type {};
+
+template<typename T1, typename... Args>
+struct is_constructible_tuple<T1, std::tuple<Args...>> : conjunction<is_constructible<T1, Args>...> {};
+
+template<typename BasicJsonType, typename T>
+struct is_json_iterator_of : std::false_type {};
+
+template<typename BasicJsonType>
+struct is_json_iterator_of<BasicJsonType, typename BasicJsonType::iterator> : std::true_type {};
+
+template<typename BasicJsonType>
+struct is_json_iterator_of<BasicJsonType, typename BasicJsonType::const_iterator> : std::true_type
+{};
+
+// checks if a given type T is a template specialization of Primary
+template<template <typename...> class Primary, typename T>
+struct is_specialization_of : std::false_type {};
+
+template<template <typename...> class Primary, typename... Args>
+struct is_specialization_of<Primary, Primary<Args...>> : std::true_type {};
+
+template<typename T>
+using is_json_pointer = is_specialization_of<::nlohmann::json_pointer, uncvref_t<T>>;
+
+// checks if A and B are comparable using Compare functor
+template<typename Compare, typename A, typename B, typename = void>
+struct is_comparable : std::false_type {};
+
+template<typename Compare, typename A, typename B>
+struct is_comparable<Compare, A, B, void_t<
+decltype(std::declval<Compare>()(std::declval<A>(), std::declval<B>())),
+decltype(std::declval<Compare>()(std::declval<B>(), std::declval<A>()))
+>> : std::true_type {};
+
+template<typename T>
+using detect_is_transparent = typename T::is_transparent;
+
+// type trait to check if KeyType can be used as object key (without a BasicJsonType)
+// see is_usable_as_basic_json_key_type below
+template<typename Comparator, typename ObjectKeyType, typename KeyTypeCVRef, bool RequireTransparentComparator = true,
+         bool ExcludeObjectKeyType = RequireTransparentComparator, typename KeyType = uncvref_t<KeyTypeCVRef>>
+using is_usable_as_key_type = typename std::conditional <
+                              is_comparable<Comparator, ObjectKeyType, KeyTypeCVRef>::value
+                              && !(ExcludeObjectKeyType && std::is_same<KeyType,
+                                   ObjectKeyType>::value)
+                              && (!RequireTransparentComparator
+                                  || is_detected <detect_is_transparent, Comparator>::value)
+                              && !is_json_pointer<KeyType>::value,
+                              std::true_type,
+                              std::false_type >::type;
+
+// type trait to check if KeyType can be used as object key
+// true if:
+//   - KeyType is comparable with BasicJsonType::object_t::key_type
+//   - if ExcludeObjectKeyType is true, KeyType is not BasicJsonType::object_t::key_type
+//   - the comparator is transparent or RequireTransparentComparator is false
+//   - KeyType is not a JSON iterator or json_pointer
+template<typename BasicJsonType, typename KeyTypeCVRef, bool RequireTransparentComparator = true,
+         bool ExcludeObjectKeyType = RequireTransparentComparator, typename KeyType = uncvref_t<KeyTypeCVRef>>
+using is_usable_as_basic_json_key_type = typename std::conditional <
+    is_usable_as_key_type<typename BasicJsonType::object_comparator_t,
+    typename BasicJsonType::object_t::key_type, KeyTypeCVRef,
+    RequireTransparentComparator, ExcludeObjectKeyType>::value
+    && !is_json_iterator_of<BasicJsonType, KeyType>::value,
+    std::true_type,
+    std::false_type >::type;
+
+template<typename ObjectType, typename KeyType>
+using detect_erase_with_key_type = decltype(std::declval<ObjectType&>().erase(std::declval<KeyType>()));
+
+// type trait to check if object_t has an erase() member functions accepting KeyType
+template<typename BasicJsonType, typename KeyType>
+using has_erase_with_key_type = typename std::conditional <
+                                is_detected <
+                                detect_erase_with_key_type,
+                                typename BasicJsonType::object_t, KeyType >::value,
+                                std::true_type,
+                                std::false_type >::type;
+
+// a naive helper to check if a type is an ordered_map (exploits the fact that
+// ordered_map inherits capacity() from std::vector)
+template <typename T>
+struct is_ordered_map
+{
+    using one = char;
+
+    struct two
+    {
+        char x[2]; // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
+    };
+
+    template <typename C> static one test( decltype(&C::capacity) ) ;
+    template <typename C> static two test(...);
+
+    enum { value = sizeof(test<T>(nullptr)) == sizeof(char) }; // NOLINT(cppcoreguidelines-pro-type-vararg,hicpp-vararg)
+};
+
+// to avoid useless casts (see https://github.com/nlohmann/json/issues/2893#issuecomment-889152324)
+template < typename T, typename U, enable_if_t < !std::is_same<T, U>::value, int > = 0 >
+T conditional_static_cast(U value)
+{
+    return static_cast<T>(value);
+}
+
+template<typename T, typename U, enable_if_t<std::is_same<T, U>::value, int> = 0>
+T conditional_static_cast(U value)
+{
+    return value;
+}
+
+template<typename... Types>
+using all_integral = conjunction<std::is_integral<Types>...>;
+
+template<typename... Types>
+using all_signed = conjunction<std::is_signed<Types>...>;
+
+template<typename... Types>
+using all_unsigned = conjunction<std::is_unsigned<Types>...>;
+
+// there's a disjunction trait in another PR; replace when merged
+template<typename... Types>
+using same_sign = std::integral_constant < bool,
+      all_signed<Types...>::value || all_unsigned<Types...>::value >;
+
+template<typename OfType, typename T>
+using never_out_of_range = std::integral_constant < bool,
+      (std::is_signed<OfType>::value && (sizeof(T) < sizeof(OfType)))
+      || (same_sign<OfType, T>::value && sizeof(OfType) == sizeof(T)) >;
+
+template<typename OfType, typename T,
+         bool OfTypeSigned = std::is_signed<OfType>::value,
+         bool TSigned = std::is_signed<T>::value>
+struct value_in_range_of_impl2;
+
+template<typename OfType, typename T>
+struct value_in_range_of_impl2<OfType, T, false, false>
+{
+    static constexpr bool test(T val)
+    {
+        using CommonType = typename std::common_type<OfType, T>::type;
+        return static_cast<CommonType>(val) <= static_cast<CommonType>((std::numeric_limits<OfType>::max)());
+    }
+};
+
+template<typename OfType, typename T>
+struct value_in_range_of_impl2<OfType, T, true, false>
+{
+    static constexpr bool test(T val)
+    {
+        using CommonType = typename std::common_type<OfType, T>::type;
+        return static_cast<CommonType>(val) <= static_cast<CommonType>((std::numeric_limits<OfType>::max)());
+    }
+};
+
+template<typename OfType, typename T>
+struct value_in_range_of_impl2<OfType, T, false, true>
+{
+    static constexpr bool test(T val)
+    {
+        using CommonType = typename std::common_type<OfType, T>::type;
+        return val >= 0 && static_cast<CommonType>(val) <= static_cast<CommonType>((std::numeric_limits<OfType>::max)());
+    }
+};
+
+template<typename OfType, typename T>
+struct value_in_range_of_impl2<OfType, T, true, true>
+{
+    static constexpr bool test(T val)
+    {
+        using CommonType = typename std::common_type<OfType, T>::type;
+        return static_cast<CommonType>(val) >= static_cast<CommonType>((std::numeric_limits<OfType>::min)())
+               && static_cast<CommonType>(val) <= static_cast<CommonType>((std::numeric_limits<OfType>::max)());
+    }
+};
+
+template<typename OfType, typename T,
+         bool NeverOutOfRange = never_out_of_range<OfType, T>::value,
+         typename = detail::enable_if_t<all_integral<OfType, T>::value>>
+struct value_in_range_of_impl1;
+
+template<typename OfType, typename T>
+struct value_in_range_of_impl1<OfType, T, false>
+{
+    static constexpr bool test(T val)
+    {
+        return value_in_range_of_impl2<OfType, T>::test(val);
+    }
+};
+
+template<typename OfType, typename T>
+struct value_in_range_of_impl1<OfType, T, true>
+{
+    static constexpr bool test(T /*val*/)
+    {
+        return true;
+    }
+};
+
+template<typename OfType, typename T>
+constexpr bool value_in_range_of(T val)
+{
+    return value_in_range_of_impl1<OfType, T>::test(val);
+}
+
+template<bool Value>
+using bool_constant = std::integral_constant<bool, Value>;
+
+///////////////////////////////////////////////////////////////////////////////
+// is_c_string
+///////////////////////////////////////////////////////////////////////////////
+
+namespace impl
+{
+
+template<typename T>
+constexpr bool is_c_string()
+{
+    using TUnExt = typename std::remove_extent<T>::type;
+    using TUnCVExt = typename std::remove_cv<TUnExt>::type;
+    using TUnPtr = typename std::remove_pointer<T>::type;
+    using TUnCVPtr = typename std::remove_cv<TUnPtr>::type;
+    return
+        (std::is_array<T>::value && std::is_same<TUnCVExt, char>::value)
+        || (std::is_pointer<T>::value && std::is_same<TUnCVPtr, char>::value);
+}
+
+}  // namespace impl
+
+// checks whether T is a [cv] char */[cv] char[] C string
+template<typename T>
+struct is_c_string : bool_constant<impl::is_c_string<T>()> {};
+
+template<typename T>
+using is_c_string_uncvref = is_c_string<uncvref_t<T>>;
+
+///////////////////////////////////////////////////////////////////////////////
+// is_transparent
+///////////////////////////////////////////////////////////////////////////////
+
+namespace impl
+{
+
+template<typename T>
+constexpr bool is_transparent()
+{
+    return is_detected<detect_is_transparent, T>::value;
+}
+
+}  // namespace impl
+
+// checks whether T has a member named is_transparent
+template<typename T>
+struct is_transparent : bool_constant<impl::is_transparent<T>()> {};
+
+///////////////////////////////////////////////////////////////////////////////
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/string_concat.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013 - 2025 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <cstring> // strlen
+#include <string> // string
+#include <utility> // forward
+
+// #include <nlohmann/detail/meta/cpp_future.hpp>
+
+// #include <nlohmann/detail/meta/detected.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+inline std::size_t concat_length()
+{
+    return 0;
+}
+
+template<typename... Args>
+inline std::size_t concat_length(const char* cstr, const Args& ... rest);
+
+template<typename StringType, typename... Args>
+inline std::size_t concat_length(const StringType& str, const Args& ... rest);
+
+template<typename... Args>
+inline std::size_t concat_length(const char /*c*/, const Args& ... rest)
+{
+    return 1 + concat_length(rest...);
+}
+
+template<typename... Args>
+inline std::size_t concat_length(const char* cstr, const Args& ... rest)
+{
+    // cppcheck-suppress ignoredReturnValue
+    return ::strlen(cstr) + concat_length(rest...);
+}
+
+template<typename StringType, typename... Args>
+inline std::size_t concat_length(const StringType& str, const Args& ... rest)
+{
+    return str.size() + concat_length(rest...);
+}
+
+template<typename OutStringType>
+inline void concat_into(OutStringType& /*out*/)
+{}
+
+template<typename StringType, typename Arg>
+using string_can_append = decltype(std::declval<StringType&>().append(std::declval < Arg && > ()));
+
+template<typename StringType, typename Arg>
+using detect_string_can_append = is_detected<string_can_append, StringType, Arg>;
+
+template<typename StringType, typename Arg>
+using string_can_append_op = decltype(std::declval<StringType&>() += std::declval < Arg && > ());
+
+template<typename StringType, typename Arg>
+using detect_string_can_append_op = is_detected<string_can_append_op, StringType, Arg>;
+
+template<typename StringType, typename Arg>
+using string_can_append_iter = decltype(std::declval<StringType&>().append(std::declval<const Arg&>().begin(), std::declval<const Arg&>().end()));
+
+template<typename StringType, typename Arg>
+using detect_string_can_append_iter = is_detected<string_can_append_iter, StringType, Arg>;
+
+template<typename StringType, typename Arg>
+using string_can_append_data = decltype(std::declval<StringType&>().append(std::declval<const Arg&>().data(), std::declval<const Arg&>().size()));
+
+template<typename StringType, typename Arg>
+using detect_string_can_append_data = is_detected<string_can_append_data, StringType, Arg>;
+
+template < typename OutStringType, typename Arg, typename... Args,
+           enable_if_t < !detect_string_can_append<OutStringType, Arg>::value
+                         && detect_string_can_append_op<OutStringType, Arg>::value, int > = 0 >
+inline void concat_into(OutStringType& out, Arg && arg, Args && ... rest);
+
+template < typename OutStringType, typename Arg, typename... Args,
+           enable_if_t < !detect_string_can_append<OutStringType, Arg>::value
+                         && !detect_string_can_append_op<OutStringType, Arg>::value
+                         && detect_string_can_append_iter<OutStringType, Arg>::value, int > = 0 >
+inline void concat_into(OutStringType& out, const Arg& arg, Args && ... rest);
+
+template < typename OutStringType, typename Arg, typename... Args,
+           enable_if_t < !detect_string_can_append<OutStringType, Arg>::value
+                         && !detect_string_can_append_op<OutStringType, Arg>::value
+                         && !detect_string_can_append_iter<OutStringType, Arg>::value
+                         && detect_string_can_append_data<OutStringType, Arg>::value, int > = 0 >
+inline void concat_into(OutStringType& out, const Arg& arg, Args && ... rest);
+
+template<typename OutStringType, typename Arg, typename... Args,
+         enable_if_t<detect_string_can_append<OutStringType, Arg>::value, int> = 0>
+inline void concat_into(OutStringType& out, Arg && arg, Args && ... rest)
+{
+    out.append(std::forward<Arg>(arg));
+    concat_into(out, std::forward<Args>(rest)...);
+}
+
+template < typename OutStringType, typename Arg, typename... Args,
+           enable_if_t < !detect_string_can_append<OutStringType, Arg>::value
+                         && detect_string_can_append_op<OutStringType, Arg>::value, int > >
+inline void concat_into(OutStringType& out, Arg&& arg, Args&& ... rest)
+{
+    out += std::forward<Arg>(arg);
+    concat_into(out, std::forward<Args>(rest)...);
+}
+
+template < typename OutStringType, typename Arg, typename... Args,
+           enable_if_t < !detect_string_can_append<OutStringType, Arg>::value
+                         && !detect_string_can_append_op<OutStringType, Arg>::value
+                         && detect_string_can_append_iter<OutStringType, Arg>::value, int > >
+inline void concat_into(OutStringType& out, const Arg& arg, Args&& ... rest)
+{
+    out.append(arg.begin(), arg.end());
+    concat_into(out, std::forward<Args>(rest)...);
+}
+
+template < typename OutStringType, typename Arg, typename... Args,
+           enable_if_t < !detect_string_can_append<OutStringType, Arg>::value
+                         && !detect_string_can_append_op<OutStringType, Arg>::value
+                         && !detect_string_can_append_iter<OutStringType, Arg>::value
+                         && detect_string_can_append_data<OutStringType, Arg>::value, int > >
+inline void concat_into(OutStringType& out, const Arg& arg, Args&& ... rest)
+{
+    out.append(arg.data(), arg.size());
+    concat_into(out, std::forward<Args>(rest)...);
+}
+
+template<typename OutStringType = std::string, typename... Args>
+inline OutStringType concat(Args && ... args)
+{
+    OutStringType str;
+    str.reserve(concat_length(args...));
+    concat_into(str, std::forward<Args>(args)...);
+    return str;
+}
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+
+// With -Wweak-vtables, Clang will complain about the exception classes as they
+// have no out-of-line virtual method definitions and their vtable will be
+// emitted in every translation unit. This issue cannot be fixed with a
+// header-only library as there is no implementation file to move these
+// functions to. As a result, we suppress this warning here to avoid client
+// code to stumble over this. See https://github.com/nlohmann/json/issues/4087
+// for a discussion.
+#if defined(__clang__)
+    #pragma clang diagnostic push
+    #pragma clang diagnostic ignored "-Wweak-vtables"
+#endif
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+////////////////
+// exceptions //
+////////////////
+
+/// @brief general exception of the @ref basic_json class
+/// @sa https://json.nlohmann.me/api/basic_json/exception/
+class exception : public std::exception
+{
+  public:
+    /// returns the explanatory string
+    const char* what() const noexcept override
+    {
+        return m.what();
+    }
+
+    /// the id of the exception
+    const int id; // NOLINT(cppcoreguidelines-non-private-member-variables-in-classes)
+
+  protected:
+    JSON_HEDLEY_NON_NULL(3)
+    exception(int id_, const char* what_arg) : id(id_), m(what_arg) {} // NOLINT(bugprone-throw-keyword-missing)
+
+    static std::string name(const std::string& ename, int id_)
+    {
+        return concat("[json.exception.", ename, '.', std::to_string(id_), "] ");
+    }
+
+    static std::string diagnostics(std::nullptr_t /*leaf_element*/)
+    {
+        return "";
+    }
+
+    template<typename BasicJsonType>
+    static std::string diagnostics(const BasicJsonType* leaf_element)
+    {
+#if JSON_DIAGNOSTICS
+        std::vector<std::string> tokens;
+        for (const auto* current = leaf_element; current != nullptr && current->m_parent != nullptr; current = current->m_parent)
+        {
+            switch (current->m_parent->type())
+            {
+                case value_t::array:
+                {
+                    for (std::size_t i = 0; i < current->m_parent->m_data.m_value.array->size(); ++i)
+                    {
+                        if (&current->m_parent->m_data.m_value.array->operator[](i) == current)
+                        {
+                            tokens.emplace_back(std::to_string(i));
+                            break;
+                        }
+                    }
+                    break;
+                }
+
+                case value_t::object:
+                {
+                    for (const auto& element : *current->m_parent->m_data.m_value.object)
+                    {
+                        if (&element.second == current)
+                        {
+                            tokens.emplace_back(element.first.c_str());
+                            break;
+                        }
+                    }
+                    break;
+                }
+
+                case value_t::null: // LCOV_EXCL_LINE
+                case value_t::string: // LCOV_EXCL_LINE
+                case value_t::boolean: // LCOV_EXCL_LINE
+                case value_t::number_integer: // LCOV_EXCL_LINE
+                case value_t::number_unsigned: // LCOV_EXCL_LINE
+                case value_t::number_float: // LCOV_EXCL_LINE
+                case value_t::binary: // LCOV_EXCL_LINE
+                case value_t::discarded: // LCOV_EXCL_LINE
+                default:   // LCOV_EXCL_LINE
+                    break; // LCOV_EXCL_LINE
+            }
+        }
+
+        if (tokens.empty())
+        {
+            return "";
+        }
+
+        auto str = std::accumulate(tokens.rbegin(), tokens.rend(), std::string{},
+                                   [](const std::string & a, const std::string & b)
+        {
+            return concat(a, '/', detail::escape(b));
+        });
+
+        return concat('(', str, ") ", get_byte_positions(leaf_element));
+#else
+        return get_byte_positions(leaf_element);
+#endif
+    }
+
+  private:
+    /// an exception object as storage for error messages
+    std::runtime_error m;
+#if JSON_DIAGNOSTIC_POSITIONS
+    template<typename BasicJsonType>
+    static std::string get_byte_positions(const BasicJsonType* leaf_element)
+    {
+        if ((leaf_element->start_pos() != std::string::npos) && (leaf_element->end_pos() != std::string::npos))
+        {
+            return concat("(bytes ", std::to_string(leaf_element->start_pos()), "-", std::to_string(leaf_element->end_pos()), ") ");
+        }
+        return "";
+    }
+#else
+    template<typename BasicJsonType>
+    static std::string get_byte_positions(const BasicJsonType* leaf_element)
+    {
+        static_cast<void>(leaf_element);
+        return "";
+    }
+#endif
+};
+
+/// @brief exception indicating a parse error
+/// @sa https://json.nlohmann.me/api/basic_json/parse_error/
+class parse_error : public exception
+{
+  public:
+    /*!
+    @brief create a parse error exception
+    @param[in] id_       the id of the exception
+    @param[in] pos       the position where the error occurred (or with
+                         chars_read_total=0 if the position cannot be
+                         determined)
+    @param[in] what_arg  the explanatory string
+    @return parse_error object
+    */
+    template<typename BasicJsonContext, enable_if_t<is_basic_json_context<BasicJsonContext>::value, int> = 0>
+    static parse_error create(int id_, const position_t& pos, const std::string& what_arg, BasicJsonContext context)
+    {
+        const std::string w = concat(exception::name("parse_error", id_), "parse error",
+                                     position_string(pos), ": ", exception::diagnostics(context), what_arg);
+        return {id_, pos.chars_read_total, w.c_str()};
+    }
+
+    template<typename BasicJsonContext, enable_if_t<is_basic_json_context<BasicJsonContext>::value, int> = 0>
+    static parse_error create(int id_, std::size_t byte_, const std::string& what_arg, BasicJsonContext context)
+    {
+        const std::string w = concat(exception::name("parse_error", id_), "parse error",
+                                     (byte_ != 0 ? (concat(" at byte ", std::to_string(byte_))) : ""),
+                                     ": ", exception::diagnostics(context), what_arg);
+        return {id_, byte_, w.c_str()};
+    }
+
+    /*!
+    @brief byte index of the parse error
+
+    The byte index of the last read character in the input file.
+
+    @note For an input with n bytes, 1 is the index of the first character and
+          n+1 is the index of the terminating null byte or the end of file.
+          This also holds true when reading a byte vector (CBOR or MessagePack).
+    */
+    const std::size_t byte;
+
+  private:
+    parse_error(int id_, std::size_t byte_, const char* what_arg)
+        : exception(id_, what_arg), byte(byte_) {}
+
+    static std::string position_string(const position_t& pos)
+    {
+        return concat(" at line ", std::to_string(pos.lines_read + 1),
+                      ", column ", std::to_string(pos.chars_read_current_line));
+    }
+};
+
+/// @brief exception indicating errors with iterators
+/// @sa https://json.nlohmann.me/api/basic_json/invalid_iterator/
+class invalid_iterator : public exception
+{
+  public:
+    template<typename BasicJsonContext, enable_if_t<is_basic_json_context<BasicJsonContext>::value, int> = 0>
+    static invalid_iterator create(int id_, const std::string& what_arg, BasicJsonContext context)
+    {
+        const std::string w = concat(exception::name("invalid_iterator", id_), exception::diagnostics(context), what_arg);
+        return {id_, w.c_str()};
+    }
+
+  private:
+    JSON_HEDLEY_NON_NULL(3)
+    invalid_iterator(int id_, const char* what_arg)
+        : exception(id_, what_arg) {}
+};
+
+/// @brief exception indicating executing a member function with a wrong type
+/// @sa https://json.nlohmann.me/api/basic_json/type_error/
+class type_error : public exception
+{
+  public:
+    template<typename BasicJsonContext, enable_if_t<is_basic_json_context<BasicJsonContext>::value, int> = 0>
+    static type_error create(int id_, const std::string& what_arg, BasicJsonContext context)
+    {
+        const std::string w = concat(exception::name("type_error", id_), exception::diagnostics(context), what_arg);
+        return {id_, w.c_str()};
+    }
+
+  private:
+    JSON_HEDLEY_NON_NULL(3)
+    type_error(int id_, const char* what_arg) : exception(id_, what_arg) {}
+};
+
+/// @brief exception indicating access out of the defined range
+/// @sa https://json.nlohmann.me/api/basic_json/out_of_range/
+class out_of_range : public exception
+{
+  public:
+    template<typename BasicJsonContext, enable_if_t<is_basic_json_context<BasicJsonContext>::value, int> = 0>
+    static out_of_range create(int id_, const std::string& what_arg, BasicJsonContext context)
+    {
+        const std::string w = concat(exception::name("out_of_range", id_), exception::diagnostics(context), what_arg);
+        return {id_, w.c_str()};
+    }
+
+  private:
+    JSON_HEDLEY_NON_NULL(3)
+    out_of_range(int id_, const char* what_arg) : exception(id_, what_arg) {}
+};
+
+/// @brief exception indicating other library errors
+/// @sa https://json.nlohmann.me/api/basic_json/other_error/
+class other_error : public exception
+{
+  public:
+    template<typename BasicJsonContext, enable_if_t<is_basic_json_context<BasicJsonContext>::value, int> = 0>
+    static other_error create(int id_, const std::string& what_arg, BasicJsonContext context)
+    {
+        const std::string w = concat(exception::name("other_error", id_), exception::diagnostics(context), what_arg);
+        return {id_, w.c_str()};
+    }
+
+  private:
+    JSON_HEDLEY_NON_NULL(3)
+    other_error(int id_, const char* what_arg) : exception(id_, what_arg) {}
+};
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+#if defined(__clang__)
+    #pragma clang diagnostic pop
+#endif
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/meta/cpp_future.hpp>
+
+// #include <nlohmann/detail/meta/identity_tag.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013 - 2025 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+// #include <nlohmann/detail/abi_macros.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+// dispatching helper struct
+template <class T> struct identity_tag {};
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/meta/std_fs.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013 - 2025 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+
+#if JSON_HAS_EXPERIMENTAL_FILESYSTEM
+#include <experimental/filesystem>
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+namespace std_fs = std::experimental::filesystem;
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+#elif JSON_HAS_FILESYSTEM
+#include <filesystem> // NOLINT(build/c++17)
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+namespace std_fs = std::filesystem;
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+#endif
+
+// #include <nlohmann/detail/meta/type_traits.hpp>
+
+// #include <nlohmann/detail/string_concat.hpp>
+
+// #include <nlohmann/detail/value_t.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+template<typename BasicJsonType>
+inline void from_json(const BasicJsonType& j, typename std::nullptr_t& n)
+{
+    if (JSON_HEDLEY_UNLIKELY(!j.is_null()))
+    {
+        JSON_THROW(type_error::create(302, concat("type must be null, but is ", j.type_name()), &j));
+    }
+    n = nullptr;
+}
+
+#ifdef JSON_HAS_CPP_17
+#ifndef JSON_USE_IMPLICIT_CONVERSIONS
+template<typename BasicJsonType, typename T>
+void from_json(const BasicJsonType& j, std::optional<T>& opt)
+{
+    if (j.is_null())
+    {
+        opt = std::nullopt;
+    }
+    else
+    {
+        opt.emplace(j.template get<T>());
+    }
+}
+
+#endif // JSON_USE_IMPLICIT_CONVERSIONS
+#endif // JSON_HAS_CPP_17
+
+// overloads for basic_json template parameters
+template < typename BasicJsonType, typename ArithmeticType,
+           enable_if_t < std::is_arithmetic<ArithmeticType>::value&&
+                         !std::is_same<ArithmeticType, typename BasicJsonType::boolean_t>::value,
+                         int > = 0 >
+void get_arithmetic_value(const BasicJsonType& j, ArithmeticType& val)
+{
+    switch (static_cast<value_t>(j))
+    {
+        case value_t::number_unsigned:
+        {
+            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::number_unsigned_t*>());
+            break;
+        }
+        case value_t::number_integer:
+        {
+            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::number_integer_t*>());
+            break;
+        }
+        case value_t::number_float:
+        {
+            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::number_float_t*>());
+            break;
+        }
+
+        case value_t::null:
+        case value_t::object:
+        case value_t::array:
+        case value_t::string:
+        case value_t::boolean:
+        case value_t::binary:
+        case value_t::discarded:
+        default:
+            JSON_THROW(type_error::create(302, concat("type must be number, but is ", j.type_name()), &j));
+    }
+}
+
+template<typename BasicJsonType>
+inline void from_json(const BasicJsonType& j, typename BasicJsonType::boolean_t& b)
+{
+    if (JSON_HEDLEY_UNLIKELY(!j.is_boolean()))
+    {
+        JSON_THROW(type_error::create(302, concat("type must be boolean, but is ", j.type_name()), &j));
+    }
+    b = *j.template get_ptr<const typename BasicJsonType::boolean_t*>();
+}
+
+template<typename BasicJsonType>
+inline void from_json(const BasicJsonType& j, typename BasicJsonType::string_t& s)
+{
+    if (JSON_HEDLEY_UNLIKELY(!j.is_string()))
+    {
+        JSON_THROW(type_error::create(302, concat("type must be string, but is ", j.type_name()), &j));
+    }
+    s = *j.template get_ptr<const typename BasicJsonType::string_t*>();
+}
+
+template <
+    typename BasicJsonType, typename StringType,
+    enable_if_t <
+        std::is_assignable<StringType&, const typename BasicJsonType::string_t>::value
+        && is_detected_exact<typename BasicJsonType::string_t::value_type, value_type_t, StringType>::value
+        && !std::is_same<typename BasicJsonType::string_t, StringType>::value
+        && !is_json_ref<StringType>::value, int > = 0 >
+inline void from_json(const BasicJsonType& j, StringType& s)
+{
+    if (JSON_HEDLEY_UNLIKELY(!j.is_string()))
+    {
+        JSON_THROW(type_error::create(302, concat("type must be string, but is ", j.type_name()), &j));
+    }
+
+    s = *j.template get_ptr<const typename BasicJsonType::string_t*>();
+}
+
+template<typename BasicJsonType>
+inline void from_json(const BasicJsonType& j, typename BasicJsonType::number_float_t& val)
+{
+    get_arithmetic_value(j, val);
+}
+
+template<typename BasicJsonType>
+inline void from_json(const BasicJsonType& j, typename BasicJsonType::number_unsigned_t& val)
+{
+    get_arithmetic_value(j, val);
+}
+
+template<typename BasicJsonType>
+inline void from_json(const BasicJsonType& j, typename BasicJsonType::number_integer_t& val)
+{
+    get_arithmetic_value(j, val);
+}
+
+#if !JSON_DISABLE_ENUM_SERIALIZATION
+template<typename BasicJsonType, typename EnumType,
+         enable_if_t<std::is_enum<EnumType>::value, int> = 0>
+inline void from_json(const BasicJsonType& j, EnumType& e)
+{
+    typename std::underlying_type<EnumType>::type val;
+    get_arithmetic_value(j, val);
+    e = static_cast<EnumType>(val);
+}
+#endif  // JSON_DISABLE_ENUM_SERIALIZATION
+
+// forward_list doesn't have an insert method
+template<typename BasicJsonType, typename T, typename Allocator,
+         enable_if_t<is_getable<BasicJsonType, T>::value, int> = 0>
+inline void from_json(const BasicJsonType& j, std::forward_list<T, Allocator>& l)
+{
+    if (JSON_HEDLEY_UNLIKELY(!j.is_array()))
+    {
+        JSON_THROW(type_error::create(302, concat("type must be array, but is ", j.type_name()), &j));
+    }
+    l.clear();
+    std::transform(j.rbegin(), j.rend(),
+                   std::front_inserter(l), [](const BasicJsonType & i)
+    {
+        return i.template get<T>();
+    });
+}
+
+// valarray doesn't have an insert method
+template<typename BasicJsonType, typename T,
+         enable_if_t<is_getable<BasicJsonType, T>::value, int> = 0>
+inline void from_json(const BasicJsonType& j, std::valarray<T>& l)
+{
+    if (JSON_HEDLEY_UNLIKELY(!j.is_array()))
+    {
+        JSON_THROW(type_error::create(302, concat("type must be array, but is ", j.type_name()), &j));
+    }
+    l.resize(j.size());
+    std::transform(j.begin(), j.end(), std::begin(l),
+                   [](const BasicJsonType & elem)
+    {
+        return elem.template get<T>();
+    });
+}
+
+template<typename BasicJsonType, typename T, std::size_t N>
+auto from_json(const BasicJsonType& j, T (&arr)[N])  // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
+-> decltype(j.template get<T>(), void())
+{
+    for (std::size_t i = 0; i < N; ++i)
+    {
+        arr[i] = j.at(i).template get<T>();
+    }
+}
+
+template<typename BasicJsonType, typename T, std::size_t N1, std::size_t N2>
+auto from_json(const BasicJsonType& j, T (&arr)[N1][N2])  // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
+-> decltype(j.template get<T>(), void())
+{
+    for (std::size_t i1 = 0; i1 < N1; ++i1)
+    {
+        for (std::size_t i2 = 0; i2 < N2; ++i2)
+        {
+            arr[i1][i2] = j.at(i1).at(i2).template get<T>();
+        }
+    }
+}
+
+template<typename BasicJsonType, typename T, std::size_t N1, std::size_t N2, std::size_t N3>
+auto from_json(const BasicJsonType& j, T (&arr)[N1][N2][N3])  // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
+-> decltype(j.template get<T>(), void())
+{
+    for (std::size_t i1 = 0; i1 < N1; ++i1)
+    {
+        for (std::size_t i2 = 0; i2 < N2; ++i2)
+        {
+            for (std::size_t i3 = 0; i3 < N3; ++i3)
+            {
+                arr[i1][i2][i3] = j.at(i1).at(i2).at(i3).template get<T>();
+            }
+        }
+    }
+}
+
+template<typename BasicJsonType, typename T, std::size_t N1, std::size_t N2, std::size_t N3, std::size_t N4>
+auto from_json(const BasicJsonType& j, T (&arr)[N1][N2][N3][N4])  // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
+-> decltype(j.template get<T>(), void())
+{
+    for (std::size_t i1 = 0; i1 < N1; ++i1)
+    {
+        for (std::size_t i2 = 0; i2 < N2; ++i2)
+        {
+            for (std::size_t i3 = 0; i3 < N3; ++i3)
+            {
+                for (std::size_t i4 = 0; i4 < N4; ++i4)
+                {
+                    arr[i1][i2][i3][i4] = j.at(i1).at(i2).at(i3).at(i4).template get<T>();
+                }
+            }
+        }
+    }
+}
+
+template<typename BasicJsonType>
+inline void from_json_array_impl(const BasicJsonType& j, typename BasicJsonType::array_t& arr, priority_tag<3> /*unused*/)
+{
+    arr = *j.template get_ptr<const typename BasicJsonType::array_t*>();
+}
+
+template<typename BasicJsonType, typename T, std::size_t N>
+auto from_json_array_impl(const BasicJsonType& j, std::array<T, N>& arr,
+                          priority_tag<2> /*unused*/)
+-> decltype(j.template get<T>(), void())
+{
+    for (std::size_t i = 0; i < N; ++i)
+    {
+        arr[i] = j.at(i).template get<T>();
+    }
+}
+
+template<typename BasicJsonType, typename ConstructibleArrayType,
+         enable_if_t<
+             std::is_assignable<ConstructibleArrayType&, ConstructibleArrayType>::value,
+             int> = 0>
+auto from_json_array_impl(const BasicJsonType& j, ConstructibleArrayType& arr, priority_tag<1> /*unused*/)
+-> decltype(
+    arr.reserve(std::declval<typename ConstructibleArrayType::size_type>()),
+    j.template get<typename ConstructibleArrayType::value_type>(),
+    void())
+{
+    using std::end;
+
+    ConstructibleArrayType ret;
+    ret.reserve(j.size());
+    std::transform(j.begin(), j.end(),
+                   std::inserter(ret, end(ret)), [](const BasicJsonType & i)
+    {
+        // get<BasicJsonType>() returns *this, this won't call a from_json
+        // method when value_type is BasicJsonType
+        return i.template get<typename ConstructibleArrayType::value_type>();
+    });
+    arr = std::move(ret);
+}
+
+template<typename BasicJsonType, typename ConstructibleArrayType,
+         enable_if_t<
+             std::is_assignable<ConstructibleArrayType&, ConstructibleArrayType>::value,
+             int> = 0>
+inline void from_json_array_impl(const BasicJsonType& j, ConstructibleArrayType& arr,
+                                 priority_tag<0> /*unused*/)
+{
+    using std::end;
+
+    ConstructibleArrayType ret;
+    std::transform(
+        j.begin(), j.end(), std::inserter(ret, end(ret)),
+        [](const BasicJsonType & i)
+    {
+        // get<BasicJsonType>() returns *this, this won't call a from_json
+        // method when value_type is BasicJsonType
+        return i.template get<typename ConstructibleArrayType::value_type>();
+    });
+    arr = std::move(ret);
+}
+
+template < typename BasicJsonType, typename ConstructibleArrayType,
+           enable_if_t <
+               is_constructible_array_type<BasicJsonType, ConstructibleArrayType>::value&&
+               !is_constructible_object_type<BasicJsonType, ConstructibleArrayType>::value&&
+               !is_constructible_string_type<BasicJsonType, ConstructibleArrayType>::value&&
+               !std::is_same<ConstructibleArrayType, typename BasicJsonType::binary_t>::value&&
+               !is_basic_json<ConstructibleArrayType>::value,
+               int > = 0 >
+auto from_json(const BasicJsonType& j, ConstructibleArrayType& arr)
+-> decltype(from_json_array_impl(j, arr, priority_tag<3> {}),
+j.template get<typename ConstructibleArrayType::value_type>(),
+void())
+{
+    if (JSON_HEDLEY_UNLIKELY(!j.is_array()))
+    {
+        JSON_THROW(type_error::create(302, concat("type must be array, but is ", j.type_name()), &j));
+    }
+
+    from_json_array_impl(j, arr, priority_tag<3> {});
+}
+
+template < typename BasicJsonType, typename T, std::size_t... Idx >
+std::array<T, sizeof...(Idx)> from_json_inplace_array_impl(BasicJsonType&& j,
+                     identity_tag<std::array<T, sizeof...(Idx)>> /*unused*/, index_sequence<Idx...> /*unused*/)
+{
+    return { { std::forward<BasicJsonType>(j).at(Idx).template get<T>()... } };
+}
+
+template < typename BasicJsonType, typename T, std::size_t N >
+auto from_json(BasicJsonType&& j, identity_tag<std::array<T, N>> tag)
+-> decltype(from_json_inplace_array_impl(std::forward<BasicJsonType>(j), tag, make_index_sequence<N> {}))
+{
+    if (JSON_HEDLEY_UNLIKELY(!j.is_array()))
+    {
+        JSON_THROW(type_error::create(302, concat("type must be array, but is ", j.type_name()), &j));
+    }
+
+    return from_json_inplace_array_impl(std::forward<BasicJsonType>(j), tag, make_index_sequence<N> {});
+}
+
+template<typename BasicJsonType>
+inline void from_json(const BasicJsonType& j, typename BasicJsonType::binary_t& bin)
+{
+    if (JSON_HEDLEY_UNLIKELY(!j.is_binary()))
+    {
+        JSON_THROW(type_error::create(302, concat("type must be binary, but is ", j.type_name()), &j));
+    }
+
+    bin = *j.template get_ptr<const typename BasicJsonType::binary_t*>();
+}
+
+template<typename BasicJsonType, typename ConstructibleObjectType,
+         enable_if_t<is_constructible_object_type<BasicJsonType, ConstructibleObjectType>::value, int> = 0>
+inline void from_json(const BasicJsonType& j, ConstructibleObjectType& obj)
+{
+    if (JSON_HEDLEY_UNLIKELY(!j.is_object()))
+    {
+        JSON_THROW(type_error::create(302, concat("type must be object, but is ", j.type_name()), &j));
+    }
+
+    ConstructibleObjectType ret;
+    const auto* inner_object = j.template get_ptr<const typename BasicJsonType::object_t*>();
+    using value_type = typename ConstructibleObjectType::value_type;
+    std::transform(
+        inner_object->begin(), inner_object->end(),
+        std::inserter(ret, ret.begin()),
+        [](typename BasicJsonType::object_t::value_type const & p)
+    {
+        return value_type(p.first, p.second.template get<typename ConstructibleObjectType::mapped_type>());
+    });
+    obj = std::move(ret);
+}
+
+// overload for arithmetic types, not chosen for basic_json template arguments
+// (BooleanType, etc..); note: Is it really necessary to provide explicit
+// overloads for boolean_t etc. in case of a custom BooleanType which is not
+// an arithmetic type?
+template < typename BasicJsonType, typename ArithmeticType,
+           enable_if_t <
+               std::is_arithmetic<ArithmeticType>::value&&
+               !std::is_same<ArithmeticType, typename BasicJsonType::number_unsigned_t>::value&&
+               !std::is_same<ArithmeticType, typename BasicJsonType::number_integer_t>::value&&
+               !std::is_same<ArithmeticType, typename BasicJsonType::number_float_t>::value&&
+               !std::is_same<ArithmeticType, typename BasicJsonType::boolean_t>::value,
+               int > = 0 >
+inline void from_json(const BasicJsonType& j, ArithmeticType& val)
+{
+    switch (static_cast<value_t>(j))
+    {
+        case value_t::number_unsigned:
+        {
+            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::number_unsigned_t*>());
+            break;
+        }
+        case value_t::number_integer:
+        {
+            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::number_integer_t*>());
+            break;
+        }
+        case value_t::number_float:
+        {
+            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::number_float_t*>());
+            break;
+        }
+        case value_t::boolean:
+        {
+            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::boolean_t*>());
+            break;
+        }
+
+        case value_t::null:
+        case value_t::object:
+        case value_t::array:
+        case value_t::string:
+        case value_t::binary:
+        case value_t::discarded:
+        default:
+            JSON_THROW(type_error::create(302, concat("type must be number, but is ", j.type_name()), &j));
+    }
+}
+
+template<typename BasicJsonType, typename... Args, std::size_t... Idx>
+std::tuple<Args...> from_json_tuple_impl_base(BasicJsonType&& j, index_sequence<Idx...> /*unused*/)
+{
+    return std::make_tuple(std::forward<BasicJsonType>(j).at(Idx).template get<Args>()...);
+}
+
+template<typename BasicJsonType>
+std::tuple<> from_json_tuple_impl_base(BasicJsonType& /*unused*/, index_sequence<> /*unused*/)
+{
+    return {};
+}
+
+template < typename BasicJsonType, class A1, class A2 >
+std::pair<A1, A2> from_json_tuple_impl(BasicJsonType&& j, identity_tag<std::pair<A1, A2>> /*unused*/, priority_tag<0> /*unused*/)
+{
+    return {std::forward<BasicJsonType>(j).at(0).template get<A1>(),
+            std::forward<BasicJsonType>(j).at(1).template get<A2>()};
+}
+
+template<typename BasicJsonType, typename A1, typename A2>
+inline void from_json_tuple_impl(BasicJsonType&& j, std::pair<A1, A2>& p, priority_tag<1> /*unused*/)
+{
+    p = from_json_tuple_impl(std::forward<BasicJsonType>(j), identity_tag<std::pair<A1, A2>> {}, priority_tag<0> {});
+}
+
+template<typename BasicJsonType, typename... Args>
+std::tuple<Args...> from_json_tuple_impl(BasicJsonType&& j, identity_tag<std::tuple<Args...>> /*unused*/, priority_tag<2> /*unused*/)
+{
+    return from_json_tuple_impl_base<BasicJsonType, Args...>(std::forward<BasicJsonType>(j), index_sequence_for<Args...> {});
+}
+
+template<typename BasicJsonType, typename... Args>
+inline void from_json_tuple_impl(BasicJsonType&& j, std::tuple<Args...>& t, priority_tag<3> /*unused*/)
+{
+    t = from_json_tuple_impl_base<BasicJsonType, Args...>(std::forward<BasicJsonType>(j), index_sequence_for<Args...> {});
+}
+
+template<typename BasicJsonType, typename TupleRelated>
+auto from_json(BasicJsonType&& j, TupleRelated&& t)
+-> decltype(from_json_tuple_impl(std::forward<BasicJsonType>(j), std::forward<TupleRelated>(t), priority_tag<3> {}))
+{
+    if (JSON_HEDLEY_UNLIKELY(!j.is_array()))
+    {
+        JSON_THROW(type_error::create(302, concat("type must be array, but is ", j.type_name()), &j));
+    }
+
+    return from_json_tuple_impl(std::forward<BasicJsonType>(j), std::forward<TupleRelated>(t), priority_tag<3> {});
+}
+
+template < typename BasicJsonType, typename Key, typename Value, typename Compare, typename Allocator,
+           typename = enable_if_t < !std::is_constructible <
+                                        typename BasicJsonType::string_t, Key >::value >>
+inline void from_json(const BasicJsonType& j, std::map<Key, Value, Compare, Allocator>& m)
+{
+    if (JSON_HEDLEY_UNLIKELY(!j.is_array()))
+    {
+        JSON_THROW(type_error::create(302, concat("type must be array, but is ", j.type_name()), &j));
+    }
+    m.clear();
+    for (const auto& p : j)
+    {
+        if (JSON_HEDLEY_UNLIKELY(!p.is_array()))
+        {
+            JSON_THROW(type_error::create(302, concat("type must be array, but is ", p.type_name()), &j));
+        }
+        m.emplace(p.at(0).template get<Key>(), p.at(1).template get<Value>());
+    }
+}
+
+template < typename BasicJsonType, typename Key, typename Value, typename Hash, typename KeyEqual, typename Allocator,
+           typename = enable_if_t < !std::is_constructible <
+                                        typename BasicJsonType::string_t, Key >::value >>
+inline void from_json(const BasicJsonType& j, std::unordered_map<Key, Value, Hash, KeyEqual, Allocator>& m)
+{
+    if (JSON_HEDLEY_UNLIKELY(!j.is_array()))
+    {
+        JSON_THROW(type_error::create(302, concat("type must be array, but is ", j.type_name()), &j));
+    }
+    m.clear();
+    for (const auto& p : j)
+    {
+        if (JSON_HEDLEY_UNLIKELY(!p.is_array()))
+        {
+            JSON_THROW(type_error::create(302, concat("type must be array, but is ", p.type_name()), &j));
+        }
+        m.emplace(p.at(0).template get<Key>(), p.at(1).template get<Value>());
+    }
+}
+
+#if JSON_HAS_FILESYSTEM || JSON_HAS_EXPERIMENTAL_FILESYSTEM
+template<typename BasicJsonType>
+inline void from_json(const BasicJsonType& j, std_fs::path& p)
+{
+    if (JSON_HEDLEY_UNLIKELY(!j.is_string()))
+    {
+        JSON_THROW(type_error::create(302, concat("type must be string, but is ", j.type_name()), &j));
+    }
+    const auto& s = *j.template get_ptr<const typename BasicJsonType::string_t*>();
+#ifdef JSON_HAS_CPP_20
+    p = std_fs::path(std::u8string_view(reinterpret_cast<const char8_t*>(s.data()), s.size()));
+#else
+    p = std_fs::u8path(s); // accepts UTF-8 encoded std::string in C++17, deprecated in C++20
+#endif
+}
+#endif
+
+struct from_json_fn
+{
+    template<typename BasicJsonType, typename T>
+    auto operator()(const BasicJsonType& j, T&& val) const
+    noexcept(noexcept(from_json(j, std::forward<T>(val))))
+    -> decltype(from_json(j, std::forward<T>(val)))
+    {
+        return from_json(j, std::forward<T>(val));
+    }
+};
+
+}  // namespace detail
+
+#ifndef JSON_HAS_CPP_17
+/// namespace to hold default `from_json` function
+/// to see why this is required:
+/// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2015/n4381.html
+namespace // NOLINT(cert-dcl59-cpp,fuchsia-header-anon-namespaces,google-build-namespaces)
+{
+#endif
+JSON_INLINE_VARIABLE constexpr const auto& from_json = // NOLINT(misc-definitions-in-headers)
+    detail::static_const<detail::from_json_fn>::value;
+#ifndef JSON_HAS_CPP_17
+}  // namespace
+#endif
+
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/conversions/to_json.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013 - 2025 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+// #include <nlohmann/detail/macro_scope.hpp>
+// JSON_HAS_CPP_17
+#ifdef JSON_HAS_CPP_17
+    #include <optional> // optional
+#endif
+
+#include <algorithm> // copy
+#include <iterator> // begin, end
+#include <string> // string
+#include <tuple> // tuple, get
+#include <type_traits> // is_same, is_constructible, is_floating_point, is_enum, underlying_type
+#include <utility> // move, forward, declval, pair
+#include <valarray> // valarray
+#include <vector> // vector
+
+// #include <nlohmann/detail/iterators/iteration_proxy.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013 - 2025 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <cstddef> // size_t
+#include <iterator> // forward_iterator_tag
+#include <tuple> // tuple_size, get, tuple_element
+#include <utility> // move
+
+#if JSON_HAS_RANGES
+    #include <ranges> // enable_borrowed_range
+#endif
+
+// #include <nlohmann/detail/abi_macros.hpp>
+
+// #include <nlohmann/detail/meta/type_traits.hpp>
+
+// #include <nlohmann/detail/string_utils.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013 - 2025 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <cstddef> // size_t
+#include <string> // string, to_string
+
+// #include <nlohmann/detail/abi_macros.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+template<typename StringType>
+void int_to_string(StringType& target, std::size_t value)
+{
+    // For ADL
+    using std::to_string;
+    target = to_string(value);
+}
+
+template<typename StringType>
+StringType to_string(std::size_t value)
+{
+    StringType result;
+    int_to_string(result, value);
+    return result;
+}
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/value_t.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+template<typename IteratorType> class iteration_proxy_value
+{
+  public:
+    using difference_type = std::ptrdiff_t;
+    using value_type = iteration_proxy_value;
+    using pointer = value_type *;
+    using reference = value_type &;
+    using iterator_category = std::forward_iterator_tag;
+    using string_type = typename std::remove_cv< typename std::remove_reference<decltype( std::declval<IteratorType>().key() ) >::type >::type;
+
+  private:
+    /// the iterator
+    IteratorType anchor{};
+    /// an index for arrays (used to create key names)
+    std::size_t array_index = 0;
+    /// last stringified array index
+    mutable std::size_t array_index_last = 0;
+    /// a string representation of the array index
+    mutable string_type array_index_str = "0";
+    /// an empty string (to return a reference for primitive values)
+    string_type empty_str{};
+
+  public:
+    explicit iteration_proxy_value() = default;
+    explicit iteration_proxy_value(IteratorType it, std::size_t array_index_ = 0)
+    noexcept(std::is_nothrow_move_constructible<IteratorType>::value
+             && std::is_nothrow_default_constructible<string_type>::value)
+        : anchor(std::move(it))
+        , array_index(array_index_)
+    {}
+
+    iteration_proxy_value(iteration_proxy_value const&) = default;
+    iteration_proxy_value& operator=(iteration_proxy_value const&) = default;
+    // older GCCs are a bit fussy and require explicit noexcept specifiers on defaulted functions
+    iteration_proxy_value(iteration_proxy_value&&)
+    noexcept(std::is_nothrow_move_constructible<IteratorType>::value
+             && std::is_nothrow_move_constructible<string_type>::value) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor,cppcoreguidelines-noexcept-move-operations)
+    iteration_proxy_value& operator=(iteration_proxy_value&&)
+    noexcept(std::is_nothrow_move_assignable<IteratorType>::value
+             && std::is_nothrow_move_assignable<string_type>::value) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor,cppcoreguidelines-noexcept-move-operations)
+    ~iteration_proxy_value() = default;
+
+    /// dereference operator (needed for range-based for)
+    const iteration_proxy_value& operator*() const
+    {
+        return *this;
+    }
+
+    /// increment operator (needed for range-based for)
+    iteration_proxy_value& operator++()
+    {
+        ++anchor;
+        ++array_index;
+
+        return *this;
+    }
+
+    iteration_proxy_value operator++(int)& // NOLINT(cert-dcl21-cpp)
+    {
+        auto tmp = iteration_proxy_value(anchor, array_index);
+        ++anchor;
+        ++array_index;
+        return tmp;
+    }
+
+    /// equality operator (needed for InputIterator)
+    bool operator==(const iteration_proxy_value& o) const
+    {
+        return anchor == o.anchor;
+    }
+
+    /// inequality operator (needed for range-based for)
+    bool operator!=(const iteration_proxy_value& o) const
+    {
+        return anchor != o.anchor;
+    }
+
+    /// return key of the iterator
+    const string_type& key() const
+    {
+        JSON_ASSERT(anchor.m_object != nullptr);
+
+        switch (anchor.m_object->type())
+        {
+            // use integer array index as key
+            case value_t::array:
+            {
+                if (array_index != array_index_last)
+                {
+                    int_to_string( array_index_str, array_index );
+                    array_index_last = array_index;
+                }
+                return array_index_str;
+            }
+
+            // use key from the object
+            case value_t::object:
+                return anchor.key();
+
+            // use an empty key for all primitive types
+            case value_t::null:
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+                return empty_str;
+        }
+    }
+
+    /// return value of the iterator
+    typename IteratorType::reference value() const
+    {
+        return anchor.value();
+    }
+};
+
+/// proxy class for the items() function
+template<typename IteratorType> class iteration_proxy
+{
+  private:
+    /// the container to iterate
+    typename IteratorType::pointer container = nullptr;
+
+  public:
+    explicit iteration_proxy() = default;
+
+    /// construct iteration proxy from a container
+    explicit iteration_proxy(typename IteratorType::reference cont) noexcept
+        : container(&cont) {}
+
+    iteration_proxy(iteration_proxy const&) = default;
+    iteration_proxy& operator=(iteration_proxy const&) = default;
+    iteration_proxy(iteration_proxy&&) noexcept = default;
+    iteration_proxy& operator=(iteration_proxy&&) noexcept = default;
+    ~iteration_proxy() = default;
+
+    /// return iterator begin (needed for range-based for)
+    iteration_proxy_value<IteratorType> begin() const noexcept
+    {
+        return iteration_proxy_value<IteratorType>(container->begin());
+    }
+
+    /// return iterator end (needed for range-based for)
+    iteration_proxy_value<IteratorType> end() const noexcept
+    {
+        return iteration_proxy_value<IteratorType>(container->end());
+    }
+};
+
+// Structured Bindings Support
+// For further reference see https://blog.tartanllama.xyz/structured-bindings/
+// And see https://github.com/nlohmann/json/pull/1391
+template<std::size_t N, typename IteratorType, enable_if_t<N == 0, int> = 0>
+auto get(const nlohmann::detail::iteration_proxy_value<IteratorType>& i) -> decltype(i.key())
+{
+    return i.key();
+}
+// Structured Bindings Support
+// For further reference see https://blog.tartanllama.xyz/structured-bindings/
+// And see https://github.com/nlohmann/json/pull/1391
+template<std::size_t N, typename IteratorType, enable_if_t<N == 1, int> = 0>
+auto get(const nlohmann::detail::iteration_proxy_value<IteratorType>& i) -> decltype(i.value())
+{
+    return i.value();
+}
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// The Addition to the STD Namespace is required to add
+// Structured Bindings Support to the iteration_proxy_value class
+// For further reference see https://blog.tartanllama.xyz/structured-bindings/
+// And see https://github.com/nlohmann/json/pull/1391
+namespace std
+{
+
+#if defined(__clang__)
+    // Fix: https://github.com/nlohmann/json/issues/1401
+    #pragma clang diagnostic push
+    #pragma clang diagnostic ignored "-Wmismatched-tags"
+#endif
+template<typename IteratorType>
+class tuple_size<::nlohmann::detail::iteration_proxy_value<IteratorType>> // NOLINT(cert-dcl58-cpp)
+    : public std::integral_constant<std::size_t, 2> {};
+
+template<std::size_t N, typename IteratorType>
+class tuple_element<N, ::nlohmann::detail::iteration_proxy_value<IteratorType >> // NOLINT(cert-dcl58-cpp)
+{
+  public:
+    using type = decltype(
+                     get<N>(std::declval <
+                            ::nlohmann::detail::iteration_proxy_value<IteratorType >> ()));
+};
+#if defined(__clang__)
+    #pragma clang diagnostic pop
+#endif
+
+}  // namespace std
+
+#if JSON_HAS_RANGES
+    template <typename IteratorType>
+    inline constexpr bool ::std::ranges::enable_borrowed_range<::nlohmann::detail::iteration_proxy<IteratorType>> = true;
+#endif
+
+// #include <nlohmann/detail/meta/cpp_future.hpp>
+
+// #include <nlohmann/detail/meta/std_fs.hpp>
+
+// #include <nlohmann/detail/meta/type_traits.hpp>
+
+// #include <nlohmann/detail/value_t.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+//////////////////
+// constructors //
+//////////////////
+
+/*
+ * Note all external_constructor<>::construct functions need to call
+ * j.m_data.m_value.destroy(j.m_data.m_type) to avoid a memory leak in case j contains an
+ * allocated value (e.g., a string). See bug issue
+ * https://github.com/nlohmann/json/issues/2865 for more information.
+ */
+
+template<value_t> struct external_constructor;
+
+template<>
+struct external_constructor<value_t::boolean>
+{
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, typename BasicJsonType::boolean_t b) noexcept
+    {
+        j.m_data.m_value.destroy(j.m_data.m_type);
+        j.m_data.m_type = value_t::boolean;
+        j.m_data.m_value = b;
+        j.assert_invariant();
+    }
+};
+
+template<>
+struct external_constructor<value_t::string>
+{
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, const typename BasicJsonType::string_t& s)
+    {
+        j.m_data.m_value.destroy(j.m_data.m_type);
+        j.m_data.m_type = value_t::string;
+        j.m_data.m_value = s;
+        j.assert_invariant();
+    }
+
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, typename BasicJsonType::string_t&& s)
+    {
+        j.m_data.m_value.destroy(j.m_data.m_type);
+        j.m_data.m_type = value_t::string;
+        j.m_data.m_value = std::move(s);
+        j.assert_invariant();
+    }
+
+    template < typename BasicJsonType, typename CompatibleStringType,
+               enable_if_t < !std::is_same<CompatibleStringType, typename BasicJsonType::string_t>::value,
+                             int > = 0 >
+    static void construct(BasicJsonType& j, const CompatibleStringType& str)
+    {
+        j.m_data.m_value.destroy(j.m_data.m_type);
+        j.m_data.m_type = value_t::string;
+        j.m_data.m_value.string = j.template create<typename BasicJsonType::string_t>(str);
+        j.assert_invariant();
+    }
+};
+
+template<>
+struct external_constructor<value_t::binary>
+{
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, const typename BasicJsonType::binary_t& b)
+    {
+        j.m_data.m_value.destroy(j.m_data.m_type);
+        j.m_data.m_type = value_t::binary;
+        j.m_data.m_value = typename BasicJsonType::binary_t(b);
+        j.assert_invariant();
+    }
+
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, typename BasicJsonType::binary_t&& b)
+    {
+        j.m_data.m_value.destroy(j.m_data.m_type);
+        j.m_data.m_type = value_t::binary;
+        j.m_data.m_value = typename BasicJsonType::binary_t(std::move(b));
+        j.assert_invariant();
+    }
+};
+
+template<>
+struct external_constructor<value_t::number_float>
+{
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, typename BasicJsonType::number_float_t val) noexcept
+    {
+        j.m_data.m_value.destroy(j.m_data.m_type);
+        j.m_data.m_type = value_t::number_float;
+        j.m_data.m_value = val;
+        j.assert_invariant();
+    }
+};
+
+template<>
+struct external_constructor<value_t::number_unsigned>
+{
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, typename BasicJsonType::number_unsigned_t val) noexcept
+    {
+        j.m_data.m_value.destroy(j.m_data.m_type);
+        j.m_data.m_type = value_t::number_unsigned;
+        j.m_data.m_value = val;
+        j.assert_invariant();
+    }
+};
+
+template<>
+struct external_constructor<value_t::number_integer>
+{
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, typename BasicJsonType::number_integer_t val) noexcept
+    {
+        j.m_data.m_value.destroy(j.m_data.m_type);
+        j.m_data.m_type = value_t::number_integer;
+        j.m_data.m_value = val;
+        j.assert_invariant();
+    }
+};
+
+template<>
+struct external_constructor<value_t::array>
+{
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, const typename BasicJsonType::array_t& arr)
+    {
+        j.m_data.m_value.destroy(j.m_data.m_type);
+        j.m_data.m_type = value_t::array;
+        j.m_data.m_value = arr;
+        j.set_parents();
+        j.assert_invariant();
+    }
+
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, typename BasicJsonType::array_t&& arr)
+    {
+        j.m_data.m_value.destroy(j.m_data.m_type);
+        j.m_data.m_type = value_t::array;
+        j.m_data.m_value = std::move(arr);
+        j.set_parents();
+        j.assert_invariant();
+    }
+
+    template < typename BasicJsonType, typename CompatibleArrayType,
+               enable_if_t < !std::is_same<CompatibleArrayType, typename BasicJsonType::array_t>::value,
+                             int > = 0 >
+    static void construct(BasicJsonType& j, const CompatibleArrayType& arr)
+    {
+        using std::begin;
+        using std::end;
+
+        j.m_data.m_value.destroy(j.m_data.m_type);
+        j.m_data.m_type = value_t::array;
+        j.m_data.m_value.array = j.template create<typename BasicJsonType::array_t>(begin(arr), end(arr));
+        j.set_parents();
+        j.assert_invariant();
+    }
+
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, const std::vector<bool>& arr)
+    {
+        j.m_data.m_value.destroy(j.m_data.m_type);
+        j.m_data.m_type = value_t::array;
+        j.m_data.m_value = value_t::array;
+        j.m_data.m_value.array->reserve(arr.size());
+        for (const bool x : arr)
+        {
+            j.m_data.m_value.array->push_back(x);
+            j.set_parent(j.m_data.m_value.array->back());
+        }
+        j.assert_invariant();
+    }
+
+    template<typename BasicJsonType, typename T,
+             enable_if_t<std::is_convertible<T, BasicJsonType>::value, int> = 0>
+    static void construct(BasicJsonType& j, const std::valarray<T>& arr)
+    {
+        j.m_data.m_value.destroy(j.m_data.m_type);
+        j.m_data.m_type = value_t::array;
+        j.m_data.m_value = value_t::array;
+        j.m_data.m_value.array->resize(arr.size());
+        if (arr.size() > 0)
+        {
+            std::copy(std::begin(arr), std::end(arr), j.m_data.m_value.array->begin());
+        }
+        j.set_parents();
+        j.assert_invariant();
+    }
+};
+
+template<>
+struct external_constructor<value_t::object>
+{
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, const typename BasicJsonType::object_t& obj)
+    {
+        j.m_data.m_value.destroy(j.m_data.m_type);
+        j.m_data.m_type = value_t::object;
+        j.m_data.m_value = obj;
+        j.set_parents();
+        j.assert_invariant();
+    }
+
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, typename BasicJsonType::object_t&& obj)
+    {
+        j.m_data.m_value.destroy(j.m_data.m_type);
+        j.m_data.m_type = value_t::object;
+        j.m_data.m_value = std::move(obj);
+        j.set_parents();
+        j.assert_invariant();
+    }
+
+    template < typename BasicJsonType, typename CompatibleObjectType,
+               enable_if_t < !std::is_same<CompatibleObjectType, typename BasicJsonType::object_t>::value, int > = 0 >
+    static void construct(BasicJsonType& j, const CompatibleObjectType& obj)
+    {
+        using std::begin;
+        using std::end;
+
+        j.m_data.m_value.destroy(j.m_data.m_type);
+        j.m_data.m_type = value_t::object;
+        j.m_data.m_value.object = j.template create<typename BasicJsonType::object_t>(begin(obj), end(obj));
+        j.set_parents();
+        j.assert_invariant();
+    }
+};
+
+/////////////
+// to_json //
+/////////////
+
+#ifdef JSON_HAS_CPP_17
+template<typename BasicJsonType, typename T,
+         enable_if_t<std::is_constructible<BasicJsonType, T>::value, int> = 0>
+void to_json(BasicJsonType& j, const std::optional<T>& opt)
+{
+    if (opt.has_value())
+    {
+        j = *opt;
+    }
+    else
+    {
+        j = nullptr;
+    }
+}
+#endif
+
+template<typename BasicJsonType, typename T,
+         enable_if_t<std::is_same<T, typename BasicJsonType::boolean_t>::value, int> = 0>
+inline void to_json(BasicJsonType& j, T b) noexcept
+{
+    external_constructor<value_t::boolean>::construct(j, b);
+}
+
+template < typename BasicJsonType, typename BoolRef,
+           enable_if_t <
+               ((std::is_same<std::vector<bool>::reference, BoolRef>::value
+                 && !std::is_same <std::vector<bool>::reference, typename BasicJsonType::boolean_t&>::value)
+                || (std::is_same<std::vector<bool>::const_reference, BoolRef>::value
+                    && !std::is_same <detail::uncvref_t<std::vector<bool>::const_reference>,
+                                      typename BasicJsonType::boolean_t >::value))
+               && std::is_convertible<const BoolRef&, typename BasicJsonType::boolean_t>::value, int > = 0 >
+inline void to_json(BasicJsonType& j, const BoolRef& b) noexcept
+{
+    external_constructor<value_t::boolean>::construct(j, static_cast<typename BasicJsonType::boolean_t>(b));
+}
+
+template<typename BasicJsonType, typename CompatibleString,
+         enable_if_t<std::is_constructible<typename BasicJsonType::string_t, CompatibleString>::value, int> = 0>
+inline void to_json(BasicJsonType& j, const CompatibleString& s)
+{
+    external_constructor<value_t::string>::construct(j, s);
+}
+
+template<typename BasicJsonType>
+inline void to_json(BasicJsonType& j, typename BasicJsonType::string_t&& s)
+{
+    external_constructor<value_t::string>::construct(j, std::move(s));
+}
+
+template<typename BasicJsonType, typename FloatType,
+         enable_if_t<std::is_floating_point<FloatType>::value, int> = 0>
+inline void to_json(BasicJsonType& j, FloatType val) noexcept
+{
+    external_constructor<value_t::number_float>::construct(j, static_cast<typename BasicJsonType::number_float_t>(val));
+}
+
+template<typename BasicJsonType, typename CompatibleNumberUnsignedType,
+         enable_if_t<is_compatible_integer_type<typename BasicJsonType::number_unsigned_t, CompatibleNumberUnsignedType>::value, int> = 0>
+inline void to_json(BasicJsonType& j, CompatibleNumberUnsignedType val) noexcept
+{
+    external_constructor<value_t::number_unsigned>::construct(j, static_cast<typename BasicJsonType::number_unsigned_t>(val));
+}
+
+template<typename BasicJsonType, typename CompatibleNumberIntegerType,
+         enable_if_t<is_compatible_integer_type<typename BasicJsonType::number_integer_t, CompatibleNumberIntegerType>::value, int> = 0>
+inline void to_json(BasicJsonType& j, CompatibleNumberIntegerType val) noexcept
+{
+    external_constructor<value_t::number_integer>::construct(j, static_cast<typename BasicJsonType::number_integer_t>(val));
+}
+
+#if !JSON_DISABLE_ENUM_SERIALIZATION
+template<typename BasicJsonType, typename EnumType,
+         enable_if_t<std::is_enum<EnumType>::value, int> = 0>
+inline void to_json(BasicJsonType& j, EnumType e) noexcept
+{
+    using underlying_type = typename std::underlying_type<EnumType>::type;
+    static constexpr value_t integral_value_t = std::is_unsigned<underlying_type>::value ? value_t::number_unsigned : value_t::number_integer;
+    external_constructor<integral_value_t>::construct(j, static_cast<underlying_type>(e));
+}
+#endif  // JSON_DISABLE_ENUM_SERIALIZATION
+
+template<typename BasicJsonType>
+inline void to_json(BasicJsonType& j, const std::vector<bool>& e)
+{
+    external_constructor<value_t::array>::construct(j, e);
+}
+
+template < typename BasicJsonType, typename CompatibleArrayType,
+           enable_if_t < is_compatible_array_type<BasicJsonType,
+                         CompatibleArrayType>::value&&
+                         !is_compatible_object_type<BasicJsonType, CompatibleArrayType>::value&&
+                         !is_compatible_string_type<BasicJsonType, CompatibleArrayType>::value&&
+                         !std::is_same<typename BasicJsonType::binary_t, CompatibleArrayType>::value&&
+                         !is_basic_json<CompatibleArrayType>::value,
+                         int > = 0 >
+inline void to_json(BasicJsonType& j, const CompatibleArrayType& arr)
+{
+    external_constructor<value_t::array>::construct(j, arr);
+}
+
+template<typename BasicJsonType>
+inline void to_json(BasicJsonType& j, const typename BasicJsonType::binary_t& bin)
+{
+    external_constructor<value_t::binary>::construct(j, bin);
+}
+
+template<typename BasicJsonType, typename T,
+         enable_if_t<std::is_convertible<T, BasicJsonType>::value, int> = 0>
+inline void to_json(BasicJsonType& j, const std::valarray<T>& arr)
+{
+    external_constructor<value_t::array>::construct(j, std::move(arr));
+}
+
+template<typename BasicJsonType>
+inline void to_json(BasicJsonType& j, typename BasicJsonType::array_t&& arr)
+{
+    external_constructor<value_t::array>::construct(j, std::move(arr));
+}
+
+template < typename BasicJsonType, typename CompatibleObjectType,
+           enable_if_t < is_compatible_object_type<BasicJsonType, CompatibleObjectType>::value&& !is_basic_json<CompatibleObjectType>::value, int > = 0 >
+inline void to_json(BasicJsonType& j, const CompatibleObjectType& obj)
+{
+    external_constructor<value_t::object>::construct(j, obj);
+}
+
+template<typename BasicJsonType>
+inline void to_json(BasicJsonType& j, typename BasicJsonType::object_t&& obj)
+{
+    external_constructor<value_t::object>::construct(j, std::move(obj));
+}
+
+template <
+    typename BasicJsonType, typename T, std::size_t N,
+    enable_if_t < !std::is_constructible<typename BasicJsonType::string_t,
+                  const T(&)[N]>::value, // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
+                  int > = 0 >
+inline void to_json(BasicJsonType& j, const T(&arr)[N]) // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
+{
+    external_constructor<value_t::array>::construct(j, arr);
+}
+
+template < typename BasicJsonType, typename T1, typename T2, enable_if_t < std::is_constructible<BasicJsonType, T1>::value&& std::is_constructible<BasicJsonType, T2>::value, int > = 0 >
+inline void to_json(BasicJsonType& j, const std::pair<T1, T2>& p)
+{
+    j = { p.first, p.second };
+}
+
+// for https://github.com/nlohmann/json/pull/1134
+template<typename BasicJsonType, typename T,
+         enable_if_t<std::is_same<T, iteration_proxy_value<typename BasicJsonType::iterator>>::value, int> = 0>
+inline void to_json(BasicJsonType& j, const T& b)
+{
+    j = { {b.key(), b.value()} };
+}
+
+template<typename BasicJsonType, typename Tuple, std::size_t... Idx>
+inline void to_json_tuple_impl(BasicJsonType& j, const Tuple& t, index_sequence<Idx...> /*unused*/)
+{
+    j = { std::get<Idx>(t)... };
+}
+
+template<typename BasicJsonType, typename Tuple>
+inline void to_json_tuple_impl(BasicJsonType& j, const Tuple& /*unused*/, index_sequence<> /*unused*/)
+{
+    using array_t = typename BasicJsonType::array_t;
+    j = array_t();
+}
+
+template<typename BasicJsonType, typename T, enable_if_t<is_constructible_tuple<BasicJsonType, T>::value, int > = 0>
+inline void to_json(BasicJsonType& j, const T& t)
+{
+    to_json_tuple_impl(j, t, make_index_sequence<std::tuple_size<T>::value> {});
+}
+
+#if JSON_HAS_FILESYSTEM || JSON_HAS_EXPERIMENTAL_FILESYSTEM
+template<typename BasicJsonType>
+inline void to_json(BasicJsonType& j, const std_fs::path& p)
+{
+#ifdef JSON_HAS_CPP_20
+    const std::u8string s = p.u8string();
+    j = std::string(s.begin(), s.end());
+#else
+    j = p.u8string(); // returns std::string in C++17
+#endif
+}
+#endif
+
+struct to_json_fn
+{
+    template<typename BasicJsonType, typename T>
+    auto operator()(BasicJsonType& j, T&& val) const noexcept(noexcept(to_json(j, std::forward<T>(val))))
+    -> decltype(to_json(j, std::forward<T>(val)), void())
+    {
+        return to_json(j, std::forward<T>(val));
+    }
+};
+}  // namespace detail
+
+#ifndef JSON_HAS_CPP_17
+/// namespace to hold default `to_json` function
+/// to see why this is required:
+/// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2015/n4381.html
+namespace // NOLINT(cert-dcl59-cpp,fuchsia-header-anon-namespaces,google-build-namespaces)
+{
+#endif
+JSON_INLINE_VARIABLE constexpr const auto& to_json = // NOLINT(misc-definitions-in-headers)
+    detail::static_const<detail::to_json_fn>::value;
+#ifndef JSON_HAS_CPP_17
+}  // namespace
+#endif
+
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/meta/identity_tag.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+
+/// @sa https://json.nlohmann.me/api/adl_serializer/
+template<typename ValueType, typename>
+struct adl_serializer
+{
+    /// @brief convert a JSON value to any value type
+    /// @sa https://json.nlohmann.me/api/adl_serializer/from_json/
+    template<typename BasicJsonType, typename TargetType = ValueType>
+    static auto from_json(BasicJsonType && j, TargetType& val) noexcept(
+        noexcept(::nlohmann::from_json(std::forward<BasicJsonType>(j), val)))
+    -> decltype(::nlohmann::from_json(std::forward<BasicJsonType>(j), val), void())
+    {
+        ::nlohmann::from_json(std::forward<BasicJsonType>(j), val);
+    }
+
+    /// @brief convert a JSON value to any value type
+    /// @sa https://json.nlohmann.me/api/adl_serializer/from_json/
+    template<typename BasicJsonType, typename TargetType = ValueType>
+    static auto from_json(BasicJsonType && j) noexcept(
+    noexcept(::nlohmann::from_json(std::forward<BasicJsonType>(j), detail::identity_tag<TargetType> {})))
+    -> decltype(::nlohmann::from_json(std::forward<BasicJsonType>(j), detail::identity_tag<TargetType> {}))
+    {
+        return ::nlohmann::from_json(std::forward<BasicJsonType>(j), detail::identity_tag<TargetType> {});
+    }
+
+    /// @brief convert any value type to a JSON value
+    /// @sa https://json.nlohmann.me/api/adl_serializer/to_json/
+    template<typename BasicJsonType, typename TargetType = ValueType>
+    static auto to_json(BasicJsonType& j, TargetType && val) noexcept(
+        noexcept(::nlohmann::to_json(j, std::forward<TargetType>(val))))
+    -> decltype(::nlohmann::to_json(j, std::forward<TargetType>(val)), void())
+    {
+        ::nlohmann::to_json(j, std::forward<TargetType>(val));
+    }
+};
+
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/byte_container_with_subtype.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013 - 2025 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <cstdint> // uint8_t, uint64_t
+#include <tuple> // tie
+#include <utility> // move
+
+// #include <nlohmann/detail/abi_macros.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+
+/// @brief an internal type for a backed binary type
+/// @sa https://json.nlohmann.me/api/byte_container_with_subtype/
+template<typename BinaryType>
+class byte_container_with_subtype : public BinaryType
+{
+  public:
+    using container_type = BinaryType;
+    using subtype_type = std::uint64_t;
+
+    /// @sa https://json.nlohmann.me/api/byte_container_with_subtype/byte_container_with_subtype/
+    byte_container_with_subtype() noexcept(noexcept(container_type()))
+        : container_type()
+    {}
+
+    /// @sa https://json.nlohmann.me/api/byte_container_with_subtype/byte_container_with_subtype/
+    byte_container_with_subtype(const container_type& b) noexcept(noexcept(container_type(b)))
+        : container_type(b)
+    {}
+
+    /// @sa https://json.nlohmann.me/api/byte_container_with_subtype/byte_container_with_subtype/
+    byte_container_with_subtype(container_type&& b) noexcept(noexcept(container_type(std::move(b))))
+        : container_type(std::move(b))
+    {}
+
+    /// @sa https://json.nlohmann.me/api/byte_container_with_subtype/byte_container_with_subtype/
+    byte_container_with_subtype(const container_type& b, subtype_type subtype_) noexcept(noexcept(container_type(b)))
+        : container_type(b)
+        , m_subtype(subtype_)
+        , m_has_subtype(true)
+    {}
+
+    /// @sa https://json.nlohmann.me/api/byte_container_with_subtype/byte_container_with_subtype/
+    byte_container_with_subtype(container_type&& b, subtype_type subtype_) noexcept(noexcept(container_type(std::move(b))))
+        : container_type(std::move(b))
+        , m_subtype(subtype_)
+        , m_has_subtype(true)
+    {}
+
+    bool operator==(const byte_container_with_subtype& rhs) const
+    {
+        return std::tie(static_cast<const BinaryType&>(*this), m_subtype, m_has_subtype) ==
+               std::tie(static_cast<const BinaryType&>(rhs), rhs.m_subtype, rhs.m_has_subtype);
+    }
+
+    bool operator!=(const byte_container_with_subtype& rhs) const
+    {
+        return !(rhs == *this);
+    }
+
+    /// @brief sets the binary subtype
+    /// @sa https://json.nlohmann.me/api/byte_container_with_subtype/set_subtype/
+    void set_subtype(subtype_type subtype_) noexcept
+    {
+        m_subtype = subtype_;
+        m_has_subtype = true;
+    }
+
+    /// @brief return the binary subtype
+    /// @sa https://json.nlohmann.me/api/byte_container_with_subtype/subtype/
+    constexpr subtype_type subtype() const noexcept
+    {
+        return m_has_subtype ? m_subtype : static_cast<subtype_type>(-1);
+    }
+
+    /// @brief return whether the value has a subtype
+    /// @sa https://json.nlohmann.me/api/byte_container_with_subtype/has_subtype/
+    constexpr bool has_subtype() const noexcept
+    {
+        return m_has_subtype;
+    }
+
+    /// @brief clears the binary subtype
+    /// @sa https://json.nlohmann.me/api/byte_container_with_subtype/clear_subtype/
+    void clear_subtype() noexcept
+    {
+        m_subtype = 0;
+        m_has_subtype = false;
+    }
+
+  private:
+    subtype_type m_subtype = 0;
+    bool m_has_subtype = false;
+};
+
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/conversions/from_json.hpp>
+
+// #include <nlohmann/detail/conversions/to_json.hpp>
+
+// #include <nlohmann/detail/exceptions.hpp>
+
+// #include <nlohmann/detail/hash.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013 - 2025 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <cstdint> // uint8_t
+#include <cstddef> // size_t
+#include <functional> // hash
+
+// #include <nlohmann/detail/abi_macros.hpp>
+
+// #include <nlohmann/detail/value_t.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+// boost::hash_combine
+inline std::size_t combine(std::size_t seed, std::size_t h) noexcept
+{
+    seed ^= h + 0x9e3779b9 + (seed << 6U) + (seed >> 2U);
+    return seed;
+}
+
+/*!
+@brief hash a JSON value
+
+The hash function tries to rely on std::hash where possible. Furthermore, the
+type of the JSON value is taken into account to have different hash values for
+null, 0, 0U, and false, etc.
+
+@tparam BasicJsonType basic_json specialization
+@param j JSON value to hash
+@return hash value of j
+*/
+template<typename BasicJsonType>
+std::size_t hash(const BasicJsonType& j)
+{
+    using string_t = typename BasicJsonType::string_t;
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+
+    const auto type = static_cast<std::size_t>(j.type());
+    switch (j.type())
+    {
+        case BasicJsonType::value_t::null:
+        case BasicJsonType::value_t::discarded:
+        {
+            return combine(type, 0);
+        }
+
+        case BasicJsonType::value_t::object:
+        {
+            auto seed = combine(type, j.size());
+            for (const auto& element : j.items())
+            {
+                const auto h = std::hash<string_t> {}(element.key());
+                seed = combine(seed, h);
+                seed = combine(seed, hash(element.value()));
+            }
+            return seed;
+        }
+
+        case BasicJsonType::value_t::array:
+        {
+            auto seed = combine(type, j.size());
+            for (const auto& element : j)
+            {
+                seed = combine(seed, hash(element));
+            }
+            return seed;
+        }
+
+        case BasicJsonType::value_t::string:
+        {
+            const auto h = std::hash<string_t> {}(j.template get_ref<const string_t&>());
+            return combine(type, h);
+        }
+
+        case BasicJsonType::value_t::boolean:
+        {
+            const auto h = std::hash<bool> {}(j.template get<bool>());
+            return combine(type, h);
+        }
+
+        case BasicJsonType::value_t::number_integer:
+        {
+            const auto h = std::hash<number_integer_t> {}(j.template get<number_integer_t>());
+            return combine(type, h);
+        }
+
+        case BasicJsonType::value_t::number_unsigned:
+        {
+            const auto h = std::hash<number_unsigned_t> {}(j.template get<number_unsigned_t>());
+            return combine(type, h);
+        }
+
+        case BasicJsonType::value_t::number_float:
+        {
+            const auto h = std::hash<number_float_t> {}(j.template get<number_float_t>());
+            return combine(type, h);
+        }
+
+        case BasicJsonType::value_t::binary:
+        {
+            auto seed = combine(type, j.get_binary().size());
+            const auto h = std::hash<bool> {}(j.get_binary().has_subtype());
+            seed = combine(seed, h);
+            seed = combine(seed, static_cast<std::size_t>(j.get_binary().subtype()));
+            for (const auto byte : j.get_binary())
+            {
+                seed = combine(seed, std::hash<std::uint8_t> {}(byte));
+            }
+            return seed;
+        }
+
+        default:                   // LCOV_EXCL_LINE
+            JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
+            return 0;              // LCOV_EXCL_LINE
+    }
+}
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/input/binary_reader.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013 - 2025 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <algorithm> // generate_n
+#include <array> // array
+#include <cmath> // ldexp
+#include <cstddef> // size_t
+#include <cstdint> // uint8_t, uint16_t, uint32_t, uint64_t
+#include <cstdio> // snprintf
+#include <cstring> // memcpy
+#include <iterator> // back_inserter
+#include <limits> // numeric_limits
+#include <string> // char_traits, string
+#include <utility> // make_pair, move
+#include <vector> // vector
+#ifdef __cpp_lib_byteswap
+    #include <bit>  //byteswap
+#endif
+
+// #include <nlohmann/detail/exceptions.hpp>
+
+// #include <nlohmann/detail/input/input_adapters.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013 - 2025 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <array> // array
+#include <cstddef> // size_t
+#include <cstring> // strlen
+#include <iterator> // begin, end, iterator_traits, random_access_iterator_tag, distance, next
+#include <memory> // shared_ptr, make_shared, addressof
+#include <numeric> // accumulate
+#include <string> // string, char_traits
+#include <type_traits> // enable_if, is_base_of, is_pointer, is_integral, remove_pointer
+#include <utility> // pair, declval
+
+#ifndef JSON_NO_IO
+    #include <cstdio>   // FILE *
+    #include <istream>  // istream
+#endif                  // JSON_NO_IO
+
+// #include <nlohmann/detail/exceptions.hpp>
+
+// #include <nlohmann/detail/iterators/iterator_traits.hpp>
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/meta/type_traits.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+/// the supported input formats
+enum class input_format_t { json, cbor, msgpack, ubjson, bson, bjdata };
+
+////////////////////
+// input adapters //
+////////////////////
+
+#ifndef JSON_NO_IO
+/*!
+Input adapter for stdio file access. This adapter read only 1 byte and do not use any
+ buffer. This adapter is a very low level adapter.
+*/
+class file_input_adapter
+{
+  public:
+    using char_type = char;
+
+    JSON_HEDLEY_NON_NULL(2)
+    explicit file_input_adapter(std::FILE* f) noexcept
+        : m_file(f)
+    {
+        JSON_ASSERT(m_file != nullptr);
+    }
+
+    // make class move-only
+    file_input_adapter(const file_input_adapter&) = delete;
+    file_input_adapter(file_input_adapter&&) noexcept = default;
+    file_input_adapter& operator=(const file_input_adapter&) = delete;
+    file_input_adapter& operator=(file_input_adapter&&) = delete;
+    ~file_input_adapter() = default;
+
+    std::char_traits<char>::int_type get_character() noexcept
+    {
+        return std::fgetc(m_file);
+    }
+
+    // returns the number of characters successfully read
+    template<class T>
+    std::size_t get_elements(T* dest, std::size_t count = 1)
+    {
+        return fread(dest, 1, sizeof(T) * count, m_file);
+    }
+
+  private:
+    /// the file pointer to read from
+    std::FILE* m_file;
+};
+
+/*!
+Input adapter for a (caching) istream. Ignores a UFT Byte Order Mark at
+beginning of input. Does not support changing the underlying std::streambuf
+in mid-input. Maintains underlying std::istream and std::streambuf to support
+subsequent use of standard std::istream operations to process any input
+characters following those used in parsing the JSON input.  Clears the
+std::istream flags; any input errors (e.g., EOF) will be detected by the first
+subsequent call for input from the std::istream.
+*/
+class input_stream_adapter
+{
+  public:
+    using char_type = char;
+
+    ~input_stream_adapter()
+    {
+        // clear stream flags; we use underlying streambuf I/O, do not
+        // maintain ifstream flags, except eof
+        if (is != nullptr)
+        {
+            is->clear(is->rdstate() & std::ios::eofbit);
+        }
+    }
+
+    explicit input_stream_adapter(std::istream& i)
+        : is(&i), sb(i.rdbuf())
+    {}
+
+    // delete because of pointer members
+    input_stream_adapter(const input_stream_adapter&) = delete;
+    input_stream_adapter& operator=(input_stream_adapter&) = delete;
+    input_stream_adapter& operator=(input_stream_adapter&&) = delete;
+
+    input_stream_adapter(input_stream_adapter&& rhs) noexcept
+        : is(rhs.is), sb(rhs.sb)
+    {
+        rhs.is = nullptr;
+        rhs.sb = nullptr;
+    }
+
+    // std::istream/std::streambuf use std::char_traits<char>::to_int_type, to
+    // ensure that std::char_traits<char>::eof() and the character 0xFF do not
+    // end up as the same value, e.g. 0xFFFFFFFF.
+    std::char_traits<char>::int_type get_character()
+    {
+        auto res = sb->sbumpc();
+        // set eof manually, as we don't use the istream interface.
+        if (JSON_HEDLEY_UNLIKELY(res == std::char_traits<char>::eof()))
+        {
+            is->clear(is->rdstate() | std::ios::eofbit);
+        }
+        return res;
+    }
+
+    template<class T>
+    std::size_t get_elements(T* dest, std::size_t count = 1)
+    {
+        auto res = static_cast<std::size_t>(sb->sgetn(reinterpret_cast<char*>(dest), static_cast<std::streamsize>(count * sizeof(T))));
+        if (JSON_HEDLEY_UNLIKELY(res < count * sizeof(T)))
+        {
+            is->clear(is->rdstate() | std::ios::eofbit);
+        }
+        return res;
+    }
+
+  private:
+    /// the associated input stream
+    std::istream* is = nullptr;
+    std::streambuf* sb = nullptr;
+};
+#endif  // JSON_NO_IO
+
+// General-purpose iterator-based adapter. It might not be as fast as
+// theoretically possible for some containers, but it is extremely versatile.
+template<typename IteratorType>
+class iterator_input_adapter
+{
+  public:
+    using char_type = typename std::iterator_traits<IteratorType>::value_type;
+
+    iterator_input_adapter(IteratorType first, IteratorType last)
+        : current(std::move(first)), end(std::move(last))
+    {}
+
+    typename char_traits<char_type>::int_type get_character()
+    {
+        if (JSON_HEDLEY_LIKELY(current != end))
+        {
+            auto result = char_traits<char_type>::to_int_type(*current);
+            std::advance(current, 1);
+            return result;
+        }
+
+        return char_traits<char_type>::eof();
+    }
+
+    // for general iterators, we cannot really do something better than falling back to processing the range one-by-one
+    template<class T>
+    std::size_t get_elements(T* dest, std::size_t count = 1)
+    {
+        auto* ptr = reinterpret_cast<char*>(dest);
+        for (std::size_t read_index = 0; read_index < count * sizeof(T); ++read_index)
+        {
+            if (JSON_HEDLEY_LIKELY(current != end))
+            {
+                ptr[read_index] = static_cast<char>(*current);
+                std::advance(current, 1);
+            }
+            else
+            {
+                return read_index;
+            }
+        }
+        return count * sizeof(T);
+    }
+
+  private:
+    IteratorType current;
+    IteratorType end;
+
+    template<typename BaseInputAdapter, size_t T>
+    friend struct wide_string_input_helper;
+
+    bool empty() const
+    {
+        return current == end;
+    }
+};
+
+template<typename BaseInputAdapter, size_t T>
+struct wide_string_input_helper;
+
+template<typename BaseInputAdapter>
+struct wide_string_input_helper<BaseInputAdapter, 4>
+{
+    // UTF-32
+    static void fill_buffer(BaseInputAdapter& input,
+                            std::array<std::char_traits<char>::int_type, 4>& utf8_bytes,
+                            size_t& utf8_bytes_index,
+                            size_t& utf8_bytes_filled)
+    {
+        utf8_bytes_index = 0;
+
+        if (JSON_HEDLEY_UNLIKELY(input.empty()))
+        {
+            utf8_bytes[0] = std::char_traits<char>::eof();
+            utf8_bytes_filled = 1;
+        }
+        else
+        {
+            // get the current character
+            const auto wc = input.get_character();
+
+            // UTF-32 to UTF-8 encoding
+            if (wc < 0x80)
+            {
+                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(wc);
+                utf8_bytes_filled = 1;
+            }
+            else if (wc <= 0x7FF)
+            {
+                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(0xC0u | ((static_cast<unsigned int>(wc) >> 6u) & 0x1Fu));
+                utf8_bytes[1] = static_cast<std::char_traits<char>::int_type>(0x80u | (static_cast<unsigned int>(wc) & 0x3Fu));
+                utf8_bytes_filled = 2;
+            }
+            else if (wc <= 0xFFFF)
+            {
+                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(0xE0u | ((static_cast<unsigned int>(wc) >> 12u) & 0x0Fu));
+                utf8_bytes[1] = static_cast<std::char_traits<char>::int_type>(0x80u | ((static_cast<unsigned int>(wc) >> 6u) & 0x3Fu));
+                utf8_bytes[2] = static_cast<std::char_traits<char>::int_type>(0x80u | (static_cast<unsigned int>(wc) & 0x3Fu));
+                utf8_bytes_filled = 3;
+            }
+            else if (wc <= 0x10FFFF)
+            {
+                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(0xF0u | ((static_cast<unsigned int>(wc) >> 18u) & 0x07u));
+                utf8_bytes[1] = static_cast<std::char_traits<char>::int_type>(0x80u | ((static_cast<unsigned int>(wc) >> 12u) & 0x3Fu));
+                utf8_bytes[2] = static_cast<std::char_traits<char>::int_type>(0x80u | ((static_cast<unsigned int>(wc) >> 6u) & 0x3Fu));
+                utf8_bytes[3] = static_cast<std::char_traits<char>::int_type>(0x80u | (static_cast<unsigned int>(wc) & 0x3Fu));
+                utf8_bytes_filled = 4;
+            }
+            else
+            {
+                // unknown character
+                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(wc);
+                utf8_bytes_filled = 1;
+            }
+        }
+    }
+};
+
+template<typename BaseInputAdapter>
+struct wide_string_input_helper<BaseInputAdapter, 2>
+{
+    // UTF-16
+    static void fill_buffer(BaseInputAdapter& input,
+                            std::array<std::char_traits<char>::int_type, 4>& utf8_bytes,
+                            size_t& utf8_bytes_index,
+                            size_t& utf8_bytes_filled)
+    {
+        utf8_bytes_index = 0;
+
+        if (JSON_HEDLEY_UNLIKELY(input.empty()))
+        {
+            utf8_bytes[0] = std::char_traits<char>::eof();
+            utf8_bytes_filled = 1;
+        }
+        else
+        {
+            // get the current character
+            const auto wc = input.get_character();
+
+            // UTF-16 to UTF-8 encoding
+            if (wc < 0x80)
+            {
+                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(wc);
+                utf8_bytes_filled = 1;
+            }
+            else if (wc <= 0x7FF)
+            {
+                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(0xC0u | ((static_cast<unsigned int>(wc) >> 6u)));
+                utf8_bytes[1] = static_cast<std::char_traits<char>::int_type>(0x80u | (static_cast<unsigned int>(wc) & 0x3Fu));
+                utf8_bytes_filled = 2;
+            }
+            else if (0xD800 > wc || wc >= 0xE000)
+            {
+                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(0xE0u | ((static_cast<unsigned int>(wc) >> 12u)));
+                utf8_bytes[1] = static_cast<std::char_traits<char>::int_type>(0x80u | ((static_cast<unsigned int>(wc) >> 6u) & 0x3Fu));
+                utf8_bytes[2] = static_cast<std::char_traits<char>::int_type>(0x80u | (static_cast<unsigned int>(wc) & 0x3Fu));
+                utf8_bytes_filled = 3;
+            }
+            else
+            {
+                if (JSON_HEDLEY_UNLIKELY(!input.empty()))
+                {
+                    const auto wc2 = static_cast<unsigned int>(input.get_character());
+                    const auto charcode = 0x10000u + (((static_cast<unsigned int>(wc) & 0x3FFu) << 10u) | (wc2 & 0x3FFu));
+                    utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(0xF0u | (charcode >> 18u));
+                    utf8_bytes[1] = static_cast<std::char_traits<char>::int_type>(0x80u | ((charcode >> 12u) & 0x3Fu));
+                    utf8_bytes[2] = static_cast<std::char_traits<char>::int_type>(0x80u | ((charcode >> 6u) & 0x3Fu));
+                    utf8_bytes[3] = static_cast<std::char_traits<char>::int_type>(0x80u | (charcode & 0x3Fu));
+                    utf8_bytes_filled = 4;
+                }
+                else
+                {
+                    utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(wc);
+                    utf8_bytes_filled = 1;
+                }
+            }
+        }
+    }
+};
+
+// Wraps another input adapter to convert wide character types into individual bytes.
+template<typename BaseInputAdapter, typename WideCharType>
+class wide_string_input_adapter
+{
+  public:
+    using char_type = char;
+
+    wide_string_input_adapter(BaseInputAdapter base)
+        : base_adapter(base) {}
+
+    typename std::char_traits<char>::int_type get_character() noexcept
+    {
+        // check if buffer needs to be filled
+        if (utf8_bytes_index == utf8_bytes_filled)
+        {
+            fill_buffer<sizeof(WideCharType)>();
+
+            JSON_ASSERT(utf8_bytes_filled > 0);
+            JSON_ASSERT(utf8_bytes_index == 0);
+        }
+
+        // use buffer
+        JSON_ASSERT(utf8_bytes_filled > 0);
+        JSON_ASSERT(utf8_bytes_index < utf8_bytes_filled);
+        return utf8_bytes[utf8_bytes_index++];
+    }
+
+    // parsing binary with wchar doesn't make sense, but since the parsing mode can be runtime, we need something here
+    template<class T>
+    std::size_t get_elements(T* /*dest*/, std::size_t /*count*/ = 1)
+    {
+        JSON_THROW(parse_error::create(112, 1, "wide string type cannot be interpreted as binary data", nullptr));
+    }
+
+  private:
+    BaseInputAdapter base_adapter;
+
+    template<size_t T>
+    void fill_buffer()
+    {
+        wide_string_input_helper<BaseInputAdapter, T>::fill_buffer(base_adapter, utf8_bytes, utf8_bytes_index, utf8_bytes_filled);
+    }
+
+    /// a buffer for UTF-8 bytes
+    std::array<std::char_traits<char>::int_type, 4> utf8_bytes = {{0, 0, 0, 0}};
+
+    /// index to the utf8_codes array for the next valid byte
+    std::size_t utf8_bytes_index = 0;
+    /// number of valid bytes in the utf8_codes array
+    std::size_t utf8_bytes_filled = 0;
+};
+
+template<typename IteratorType, typename Enable = void>
+struct iterator_input_adapter_factory
+{
+    using iterator_type = IteratorType;
+    using char_type = typename std::iterator_traits<iterator_type>::value_type;
+    using adapter_type = iterator_input_adapter<iterator_type>;
+
+    static adapter_type create(IteratorType first, IteratorType last)
+    {
+        return adapter_type(std::move(first), std::move(last));
+    }
+};
+
+template<typename T>
+struct is_iterator_of_multibyte
+{
+    using value_type = typename std::iterator_traits<T>::value_type;
+    enum
+    {
+        value = sizeof(value_type) > 1
+    };
+};
+
+template<typename IteratorType>
+struct iterator_input_adapter_factory<IteratorType, enable_if_t<is_iterator_of_multibyte<IteratorType>::value>>
+{
+    using iterator_type = IteratorType;
+    using char_type = typename std::iterator_traits<iterator_type>::value_type;
+    using base_adapter_type = iterator_input_adapter<iterator_type>;
+    using adapter_type = wide_string_input_adapter<base_adapter_type, char_type>;
+
+    static adapter_type create(IteratorType first, IteratorType last)
+    {
+        return adapter_type(base_adapter_type(std::move(first), std::move(last)));
+    }
+};
+
+// General purpose iterator-based input
+template<typename IteratorType>
+typename iterator_input_adapter_factory<IteratorType>::adapter_type input_adapter(IteratorType first, IteratorType last)
+{
+    using factory_type = iterator_input_adapter_factory<IteratorType>;
+    return factory_type::create(first, last);
+}
+
+// Convenience shorthand from container to iterator
+// Enables ADL on begin(container) and end(container)
+// Encloses the using declarations in namespace for not to leak them to outside scope
+
+namespace container_input_adapter_factory_impl
+{
+
+using std::begin;
+using std::end;
+
+template<typename ContainerType, typename Enable = void>
+struct container_input_adapter_factory {};
+
+template<typename ContainerType>
+struct container_input_adapter_factory< ContainerType,
+       void_t<decltype(begin(std::declval<ContainerType>()), end(std::declval<ContainerType>()))>>
+       {
+           using adapter_type = decltype(input_adapter(begin(std::declval<ContainerType>()), end(std::declval<ContainerType>())));
+
+           static adapter_type create(const ContainerType& container)
+{
+    return input_adapter(begin(container), end(container));
+}
+       };
+
+}  // namespace container_input_adapter_factory_impl
+
+template<typename ContainerType>
+typename container_input_adapter_factory_impl::container_input_adapter_factory<ContainerType>::adapter_type input_adapter(const ContainerType& container)
+{
+    return container_input_adapter_factory_impl::container_input_adapter_factory<ContainerType>::create(container);
+}
+
+// specialization for std::string
+using string_input_adapter_type = decltype(input_adapter(std::declval<std::string>()));
+
+#ifndef JSON_NO_IO
+// Special cases with fast paths
+inline file_input_adapter input_adapter(std::FILE* file)
+{
+    if (file == nullptr)
+    {
+        JSON_THROW(parse_error::create(101, 0, "attempting to parse an empty input; check that your input string or stream contains the expected JSON", nullptr));
+    }
+    return file_input_adapter(file);
+}
+
+inline input_stream_adapter input_adapter(std::istream& stream)
+{
+    return input_stream_adapter(stream);
+}
+
+inline input_stream_adapter input_adapter(std::istream&& stream)
+{
+    return input_stream_adapter(stream);
+}
+#endif  // JSON_NO_IO
+
+using contiguous_bytes_input_adapter = decltype(input_adapter(std::declval<const char*>(), std::declval<const char*>()));
+
+// Null-delimited strings, and the like.
+template < typename CharT,
+           typename std::enable_if <
+               std::is_pointer<CharT>::value&&
+               !std::is_array<CharT>::value&&
+               std::is_integral<typename std::remove_pointer<CharT>::type>::value&&
+               sizeof(typename std::remove_pointer<CharT>::type) == 1,
+               int >::type = 0 >
+contiguous_bytes_input_adapter input_adapter(CharT b)
+{
+    if (b == nullptr)
+    {
+        JSON_THROW(parse_error::create(101, 0, "attempting to parse an empty input; check that your input string or stream contains the expected JSON", nullptr));
+    }
+    auto length = std::strlen(reinterpret_cast<const char*>(b));
+    const auto* ptr = reinterpret_cast<const char*>(b);
+    return input_adapter(ptr, ptr + length); // cppcheck-suppress[nullPointerArithmeticRedundantCheck]
+}
+
+template<typename T, std::size_t N>
+auto input_adapter(T (&array)[N]) -> decltype(input_adapter(array, array + N)) // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
+{
+    return input_adapter(array, array + N);
+}
+
+// This class only handles inputs of input_buffer_adapter type.
+// It's required so that expressions like {ptr, len} can be implicitly cast
+// to the correct adapter.
+class span_input_adapter
+{
+  public:
+    template < typename CharT,
+               typename std::enable_if <
+                   std::is_pointer<CharT>::value&&
+                   std::is_integral<typename std::remove_pointer<CharT>::type>::value&&
+                   sizeof(typename std::remove_pointer<CharT>::type) == 1,
+                   int >::type = 0 >
+    span_input_adapter(CharT b, std::size_t l)
+        : ia(reinterpret_cast<const char*>(b), reinterpret_cast<const char*>(b) + l) {}
+
+    template<class IteratorType,
+             typename std::enable_if<
+                 std::is_same<typename iterator_traits<IteratorType>::iterator_category, std::random_access_iterator_tag>::value,
+                 int>::type = 0>
+    span_input_adapter(IteratorType first, IteratorType last)
+        : ia(input_adapter(first, last)) {}
+
+    contiguous_bytes_input_adapter&& get()
+    {
+        return std::move(ia); // NOLINT(hicpp-move-const-arg,performance-move-const-arg)
+    }
+
+  private:
+    contiguous_bytes_input_adapter ia;
+};
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/input/json_sax.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013 - 2025 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <cstddef>
+#include <string> // string
+#include <type_traits> // enable_if_t
+#include <utility> // move
+#include <vector> // vector
+
+// #include <nlohmann/detail/exceptions.hpp>
+
+// #include <nlohmann/detail/input/lexer.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013 - 2025 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <array> // array
+#include <clocale> // localeconv
+#include <cstddef> // size_t
+#include <cstdio> // snprintf
+#include <cstdlib> // strtof, strtod, strtold, strtoll, strtoull
+#include <initializer_list> // initializer_list
+#include <string> // char_traits, string
+#include <utility> // move
+#include <vector> // vector
+
+// #include <nlohmann/detail/input/input_adapters.hpp>
+
+// #include <nlohmann/detail/input/position_t.hpp>
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/meta/type_traits.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+///////////
+// lexer //
+///////////
+
+template<typename BasicJsonType>
+class lexer_base
+{
+  public:
+    /// token types for the parser
+    enum class token_type
+    {
+        uninitialized,    ///< indicating the scanner is uninitialized
+        literal_true,     ///< the `true` literal
+        literal_false,    ///< the `false` literal
+        literal_null,     ///< the `null` literal
+        value_string,     ///< a string -- use get_string() for actual value
+        value_unsigned,   ///< an unsigned integer -- use get_number_unsigned() for actual value
+        value_integer,    ///< a signed integer -- use get_number_integer() for actual value
+        value_float,      ///< an floating point number -- use get_number_float() for actual value
+        begin_array,      ///< the character for array begin `[`
+        begin_object,     ///< the character for object begin `{`
+        end_array,        ///< the character for array end `]`
+        end_object,       ///< the character for object end `}`
+        name_separator,   ///< the name separator `:`
+        value_separator,  ///< the value separator `,`
+        parse_error,      ///< indicating a parse error
+        end_of_input,     ///< indicating the end of the input buffer
+        literal_or_value  ///< a literal or the begin of a value (only for diagnostics)
+    };
+
+    /// return name of values of type token_type (only used for errors)
+    JSON_HEDLEY_RETURNS_NON_NULL
+    JSON_HEDLEY_CONST
+    static const char* token_type_name(const token_type t) noexcept
+    {
+        switch (t)
+        {
+            case token_type::uninitialized:
+                return "<uninitialized>";
+            case token_type::literal_true:
+                return "true literal";
+            case token_type::literal_false:
+                return "false literal";
+            case token_type::literal_null:
+                return "null literal";
+            case token_type::value_string:
+                return "string literal";
+            case token_type::value_unsigned:
+            case token_type::value_integer:
+            case token_type::value_float:
+                return "number literal";
+            case token_type::begin_array:
+                return "'['";
+            case token_type::begin_object:
+                return "'{'";
+            case token_type::end_array:
+                return "']'";
+            case token_type::end_object:
+                return "'}'";
+            case token_type::name_separator:
+                return "':'";
+            case token_type::value_separator:
+                return "','";
+            case token_type::parse_error:
+                return "<parse error>";
+            case token_type::end_of_input:
+                return "end of input";
+            case token_type::literal_or_value:
+                return "'[', '{', or a literal";
+            // LCOV_EXCL_START
+            default: // catch non-enum values
+                return "unknown token";
+                // LCOV_EXCL_STOP
+        }
+    }
+};
+/*!
+@brief lexical analysis
+
+This class organizes the lexical analysis during JSON deserialization.
+*/
+template<typename BasicJsonType, typename InputAdapterType>
+class lexer : public lexer_base<BasicJsonType>
+{
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+    using string_t = typename BasicJsonType::string_t;
+    using char_type = typename InputAdapterType::char_type;
+    using char_int_type = typename char_traits<char_type>::int_type;
+
+  public:
+    using token_type = typename lexer_base<BasicJsonType>::token_type;
+
+    explicit lexer(InputAdapterType&& adapter, bool ignore_comments_ = false) noexcept
+        : ia(std::move(adapter))
+        , ignore_comments(ignore_comments_)
+        , decimal_point_char(static_cast<char_int_type>(get_decimal_point()))
+    {}
+
+    // delete because of pointer members
+    lexer(const lexer&) = delete;
+    lexer(lexer&&) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor)
+    lexer& operator=(lexer&) = delete;
+    lexer& operator=(lexer&&) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor)
+    ~lexer() = default;
+
+  private:
+    /////////////////////
+    // locales
+    /////////////////////
+
+    /// return the locale-dependent decimal point
+    JSON_HEDLEY_PURE
+    static char get_decimal_point() noexcept
+    {
+        const auto* loc = localeconv();
+        JSON_ASSERT(loc != nullptr);
+        return (loc->decimal_point == nullptr) ? '.' : *(loc->decimal_point);
+    }
+
+    /////////////////////
+    // scan functions
+    /////////////////////
+
+    /*!
+    @brief get codepoint from 4 hex characters following `\u`
+
+    For input "\u c1 c2 c3 c4" the codepoint is:
+      (c1 * 0x1000) + (c2 * 0x0100) + (c3 * 0x0010) + c4
+    = (c1 << 12) + (c2 << 8) + (c3 << 4) + (c4 << 0)
+
+    Furthermore, the possible characters '0'..'9', 'A'..'F', and 'a'..'f'
+    must be converted to the integers 0x0..0x9, 0xA..0xF, 0xA..0xF, resp. The
+    conversion is done by subtracting the offset (0x30, 0x37, and 0x57)
+    between the ASCII value of the character and the desired integer value.
+
+    @return codepoint (0x0000..0xFFFF) or -1 in case of an error (e.g. EOF or
+            non-hex character)
+    */
+    int get_codepoint()
+    {
+        // this function only makes sense after reading `\u`
+        JSON_ASSERT(current == 'u');
+        int codepoint = 0;
+
+        const auto factors = { 12u, 8u, 4u, 0u };
+        for (const auto factor : factors)
+        {
+            get();
+
+            if (current >= '0' && current <= '9')
+            {
+                codepoint += static_cast<int>((static_cast<unsigned int>(current) - 0x30u) << factor);
+            }
+            else if (current >= 'A' && current <= 'F')
+            {
+                codepoint += static_cast<int>((static_cast<unsigned int>(current) - 0x37u) << factor);
+            }
+            else if (current >= 'a' && current <= 'f')
+            {
+                codepoint += static_cast<int>((static_cast<unsigned int>(current) - 0x57u) << factor);
+            }
+            else
+            {
+                return -1;
+            }
+        }
+
+        JSON_ASSERT(0x0000 <= codepoint && codepoint <= 0xFFFF);
+        return codepoint;
+    }
+
+    /*!
+    @brief check if the next byte(s) are inside a given range
+
+    Adds the current byte and, for each passed range, reads a new byte and
+    checks if it is inside the range. If a violation was detected, set up an
+    error message and return false. Otherwise, return true.
+
+    @param[in] ranges  list of integers; interpreted as list of pairs of
+                       inclusive lower and upper bound, respectively
+
+    @pre The passed list @a ranges must have 2, 4, or 6 elements; that is,
+         1, 2, or 3 pairs. This precondition is enforced by an assertion.
+
+    @return true if and only if no range violation was detected
+    */
+    bool next_byte_in_range(std::initializer_list<char_int_type> ranges)
+    {
+        JSON_ASSERT(ranges.size() == 2 || ranges.size() == 4 || ranges.size() == 6);
+        add(current);
+
+        for (auto range = ranges.begin(); range != ranges.end(); ++range)
+        {
+            get();
+            if (JSON_HEDLEY_LIKELY(*range <= current && current <= *(++range))) // NOLINT(bugprone-inc-dec-in-conditions)
+            {
+                add(current);
+            }
+            else
+            {
+                error_message = "invalid string: ill-formed UTF-8 byte";
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /*!
+    @brief scan a string literal
+
+    This function scans a string according to Sect. 7 of RFC 8259. While
+    scanning, bytes are escaped and copied into buffer token_buffer. Then the
+    function returns successfully, token_buffer is *not* null-terminated (as it
+    may contain \0 bytes), and token_buffer.size() is the number of bytes in the
+    string.
+
+    @return token_type::value_string if string could be successfully scanned,
+            token_type::parse_error otherwise
+
+    @note In case of errors, variable error_message contains a textual
+          description.
+    */
+    token_type scan_string()
+    {
+        // reset token_buffer (ignore opening quote)
+        reset();
+
+        // we entered the function by reading an open quote
+        JSON_ASSERT(current == '\"');
+
+        while (true)
+        {
+            // get next character
+            switch (get())
+            {
+                // end of file while parsing string
+                case char_traits<char_type>::eof():
+                {
+                    error_message = "invalid string: missing closing quote";
+                    return token_type::parse_error;
+                }
+
+                // closing quote
+                case '\"':
+                {
+                    return token_type::value_string;
+                }
+
+                // escapes
+                case '\\':
+                {
+                    switch (get())
+                    {
+                        // quotation mark
+                        case '\"':
+                            add('\"');
+                            break;
+                        // reverse solidus
+                        case '\\':
+                            add('\\');
+                            break;
+                        // solidus
+                        case '/':
+                            add('/');
+                            break;
+                        // backspace
+                        case 'b':
+                            add('\b');
+                            break;
+                        // form feed
+                        case 'f':
+                            add('\f');
+                            break;
+                        // line feed
+                        case 'n':
+                            add('\n');
+                            break;
+                        // carriage return
+                        case 'r':
+                            add('\r');
+                            break;
+                        // tab
+                        case 't':
+                            add('\t');
+                            break;
+
+                        // unicode escapes
+                        case 'u':
+                        {
+                            const int codepoint1 = get_codepoint();
+                            int codepoint = codepoint1; // start with codepoint1
+
+                            if (JSON_HEDLEY_UNLIKELY(codepoint1 == -1))
+                            {
+                                error_message = "invalid string: '\\u' must be followed by 4 hex digits";
+                                return token_type::parse_error;
+                            }
+
+                            // check if code point is a high surrogate
+                            if (0xD800 <= codepoint1 && codepoint1 <= 0xDBFF)
+                            {
+                                // expect next \uxxxx entry
+                                if (JSON_HEDLEY_LIKELY(get() == '\\' && get() == 'u'))
+                                {
+                                    const int codepoint2 = get_codepoint();
+
+                                    if (JSON_HEDLEY_UNLIKELY(codepoint2 == -1))
+                                    {
+                                        error_message = "invalid string: '\\u' must be followed by 4 hex digits";
+                                        return token_type::parse_error;
+                                    }
+
+                                    // check if codepoint2 is a low surrogate
+                                    if (JSON_HEDLEY_LIKELY(0xDC00 <= codepoint2 && codepoint2 <= 0xDFFF))
+                                    {
+                                        // overwrite codepoint
+                                        codepoint = static_cast<int>(
+                                                        // high surrogate occupies the most significant 22 bits
+                                                        (static_cast<unsigned int>(codepoint1) << 10u)
+                                                        // low surrogate occupies the least significant 15 bits
+                                                        + static_cast<unsigned int>(codepoint2)
+                                                        // there is still the 0xD800, 0xDC00 and 0x10000 noise
+                                                        // in the result, so we have to subtract with:
+                                                        // (0xD800 << 10) + DC00 - 0x10000 = 0x35FDC00
+                                                        - 0x35FDC00u);
+                                    }
+                                    else
+                                    {
+                                        error_message = "invalid string: surrogate U+D800..U+DBFF must be followed by U+DC00..U+DFFF";
+                                        return token_type::parse_error;
+                                    }
+                                }
+                                else
+                                {
+                                    error_message = "invalid string: surrogate U+D800..U+DBFF must be followed by U+DC00..U+DFFF";
+                                    return token_type::parse_error;
+                                }
+                            }
+                            else
+                            {
+                                if (JSON_HEDLEY_UNLIKELY(0xDC00 <= codepoint1 && codepoint1 <= 0xDFFF))
+                                {
+                                    error_message = "invalid string: surrogate U+DC00..U+DFFF must follow U+D800..U+DBFF";
+                                    return token_type::parse_error;
+                                }
+                            }
+
+                            // result of the above calculation yields a proper codepoint
+                            JSON_ASSERT(0x00 <= codepoint && codepoint <= 0x10FFFF);
+
+                            // translate codepoint into bytes
+                            if (codepoint < 0x80)
+                            {
+                                // 1-byte characters: 0xxxxxxx (ASCII)
+                                add(static_cast<char_int_type>(codepoint));
+                            }
+                            else if (codepoint <= 0x7FF)
+                            {
+                                // 2-byte characters: 110xxxxx 10xxxxxx
+                                add(static_cast<char_int_type>(0xC0u | (static_cast<unsigned int>(codepoint) >> 6u)));
+                                add(static_cast<char_int_type>(0x80u | (static_cast<unsigned int>(codepoint) & 0x3Fu)));
+                            }
+                            else if (codepoint <= 0xFFFF)
+                            {
+                                // 3-byte characters: 1110xxxx 10xxxxxx 10xxxxxx
+                                add(static_cast<char_int_type>(0xE0u | (static_cast<unsigned int>(codepoint) >> 12u)));
+                                add(static_cast<char_int_type>(0x80u | ((static_cast<unsigned int>(codepoint) >> 6u) & 0x3Fu)));
+                                add(static_cast<char_int_type>(0x80u | (static_cast<unsigned int>(codepoint) & 0x3Fu)));
+                            }
+                            else
+                            {
+                                // 4-byte characters: 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
+                                add(static_cast<char_int_type>(0xF0u | (static_cast<unsigned int>(codepoint) >> 18u)));
+                                add(static_cast<char_int_type>(0x80u | ((static_cast<unsigned int>(codepoint) >> 12u) & 0x3Fu)));
+                                add(static_cast<char_int_type>(0x80u | ((static_cast<unsigned int>(codepoint) >> 6u) & 0x3Fu)));
+                                add(static_cast<char_int_type>(0x80u | (static_cast<unsigned int>(codepoint) & 0x3Fu)));
+                            }
+
+                            break;
+                        }
+
+                        // other characters after escape
+                        default:
+                            error_message = "invalid string: forbidden character after backslash";
+                            return token_type::parse_error;
+                    }
+
+                    break;
+                }
+
+                // invalid control characters
+                case 0x00:
+                {
+                    error_message = "invalid string: control character U+0000 (NUL) must be escaped to \\u0000";
+                    return token_type::parse_error;
+                }
+
+                case 0x01:
+                {
+                    error_message = "invalid string: control character U+0001 (SOH) must be escaped to \\u0001";
+                    return token_type::parse_error;
+                }
+
+                case 0x02:
+                {
+                    error_message = "invalid string: control character U+0002 (STX) must be escaped to \\u0002";
+                    return token_type::parse_error;
+                }
+
+                case 0x03:
+                {
+                    error_message = "invalid string: control character U+0003 (ETX) must be escaped to \\u0003";
+                    return token_type::parse_error;
+                }
+
+                case 0x04:
+                {
+                    error_message = "invalid string: control character U+0004 (EOT) must be escaped to \\u0004";
+                    return token_type::parse_error;
+                }
+
+                case 0x05:
+                {
+                    error_message = "invalid string: control character U+0005 (ENQ) must be escaped to \\u0005";
+                    return token_type::parse_error;
+                }
+
+                case 0x06:
+                {
+                    error_message = "invalid string: control character U+0006 (ACK) must be escaped to \\u0006";
+                    return token_type::parse_error;
+                }
+
+                case 0x07:
+                {
+                    error_message = "invalid string: control character U+0007 (BEL) must be escaped to \\u0007";
+                    return token_type::parse_error;
+                }
+
+                case 0x08:
+                {
+                    error_message = "invalid string: control character U+0008 (BS) must be escaped to \\u0008 or \\b";
+                    return token_type::parse_error;
+                }
+
+                case 0x09:
+                {
+                    error_message = "invalid string: control character U+0009 (HT) must be escaped to \\u0009 or \\t";
+                    return token_type::parse_error;
+                }
+
+                case 0x0A:
+                {
+                    error_message = "invalid string: control character U+000A (LF) must be escaped to \\u000A or \\n";
+                    return token_type::parse_error;
+                }
+
+                case 0x0B:
+                {
+                    error_message = "invalid string: control character U+000B (VT) must be escaped to \\u000B";
+                    return token_type::parse_error;
+                }
+
+                case 0x0C:
+                {
+                    error_message = "invalid string: control character U+000C (FF) must be escaped to \\u000C or \\f";
+                    return token_type::parse_error;
+                }
+
+                case 0x0D:
+                {
+                    error_message = "invalid string: control character U+000D (CR) must be escaped to \\u000D or \\r";
+                    return token_type::parse_error;
+                }
+
+                case 0x0E:
+                {
+                    error_message = "invalid string: control character U+000E (SO) must be escaped to \\u000E";
+                    return token_type::parse_error;
+                }
+
+                case 0x0F:
+                {
+                    error_message = "invalid string: control character U+000F (SI) must be escaped to \\u000F";
+                    return token_type::parse_error;
+                }
+
+                case 0x10:
+                {
+                    error_message = "invalid string: control character U+0010 (DLE) must be escaped to \\u0010";
+                    return token_type::parse_error;
+                }
+
+                case 0x11:
+                {
+                    error_message = "invalid string: control character U+0011 (DC1) must be escaped to \\u0011";
+                    return token_type::parse_error;
+                }
+
+                case 0x12:
+                {
+                    error_message = "invalid string: control character U+0012 (DC2) must be escaped to \\u0012";
+                    return token_type::parse_error;
+                }
+
+                case 0x13:
+                {
+                    error_message = "invalid string: control character U+0013 (DC3) must be escaped to \\u0013";
+                    return token_type::parse_error;
+                }
+
+                case 0x14:
+                {
+                    error_message = "invalid string: control character U+0014 (DC4) must be escaped to \\u0014";
+                    return token_type::parse_error;
+                }
+
+                case 0x15:
+                {
+                    error_message = "invalid string: control character U+0015 (NAK) must be escaped to \\u0015";
+                    return token_type::parse_error;
+                }
+
+                case 0x16:
+                {
+                    error_message = "invalid string: control character U+0016 (SYN) must be escaped to \\u0016";
+                    return token_type::parse_error;
+                }
+
+                case 0x17:
+                {
+                    error_message = "invalid string: control character U+0017 (ETB) must be escaped to \\u0017";
+                    return token_type::parse_error;
+                }
+
+                case 0x18:
+                {
+                    error_message = "invalid string: control character U+0018 (CAN) must be escaped to \\u0018";
+                    return token_type::parse_error;
+                }
+
+                case 0x19:
+                {
+                    error_message = "invalid string: control character U+0019 (EM) must be escaped to \\u0019";
+                    return token_type::parse_error;
+                }
+
+                case 0x1A:
+                {
+                    error_message = "invalid string: control character U+001A (SUB) must be escaped to \\u001A";
+                    return token_type::parse_error;
+                }
+
+                case 0x1B:
+                {
+                    error_message = "invalid string: control character U+001B (ESC) must be escaped to \\u001B";
+                    return token_type::parse_error;
+                }
+
+                case 0x1C:
+                {
+                    error_message = "invalid string: control character U+001C (FS) must be escaped to \\u001C";
+                    return token_type::parse_error;
+                }
+
+                case 0x1D:
+                {
+                    error_message = "invalid string: control character U+001D (GS) must be escaped to \\u001D";
+                    return token_type::parse_error;
+                }
+
+                case 0x1E:
+                {
+                    error_message = "invalid string: control character U+001E (RS) must be escaped to \\u001E";
+                    return token_type::parse_error;
+                }
+
+                case 0x1F:
+                {
+                    error_message = "invalid string: control character U+001F (US) must be escaped to \\u001F";
+                    return token_type::parse_error;
+                }
+
+                // U+0020..U+007F (except U+0022 (quote) and U+005C (backspace))
+                case 0x20:
+                case 0x21:
+                case 0x23:
+                case 0x24:
+                case 0x25:
+                case 0x26:
+                case 0x27:
+                case 0x28:
+                case 0x29:
+                case 0x2A:
+                case 0x2B:
+                case 0x2C:
+                case 0x2D:
+                case 0x2E:
+                case 0x2F:
+                case 0x30:
+                case 0x31:
+                case 0x32:
+                case 0x33:
+                case 0x34:
+                case 0x35:
+                case 0x36:
+                case 0x37:
+                case 0x38:
+                case 0x39:
+                case 0x3A:
+                case 0x3B:
+                case 0x3C:
+                case 0x3D:
+                case 0x3E:
+                case 0x3F:
+                case 0x40:
+                case 0x41:
+                case 0x42:
+                case 0x43:
+                case 0x44:
+                case 0x45:
+                case 0x46:
+                case 0x47:
+                case 0x48:
+                case 0x49:
+                case 0x4A:
+                case 0x4B:
+                case 0x4C:
+                case 0x4D:
+                case 0x4E:
+                case 0x4F:
+                case 0x50:
+                case 0x51:
+                case 0x52:
+                case 0x53:
+                case 0x54:
+                case 0x55:
+                case 0x56:
+                case 0x57:
+                case 0x58:
+                case 0x59:
+                case 0x5A:
+                case 0x5B:
+                case 0x5D:
+                case 0x5E:
+                case 0x5F:
+                case 0x60:
+                case 0x61:
+                case 0x62:
+                case 0x63:
+                case 0x64:
+                case 0x65:
+                case 0x66:
+                case 0x67:
+                case 0x68:
+                case 0x69:
+                case 0x6A:
+                case 0x6B:
+                case 0x6C:
+                case 0x6D:
+                case 0x6E:
+                case 0x6F:
+                case 0x70:
+                case 0x71:
+                case 0x72:
+                case 0x73:
+                case 0x74:
+                case 0x75:
+                case 0x76:
+                case 0x77:
+                case 0x78:
+                case 0x79:
+                case 0x7A:
+                case 0x7B:
+                case 0x7C:
+                case 0x7D:
+                case 0x7E:
+                case 0x7F:
+                {
+                    add(current);
+                    break;
+                }
+
+                // U+0080..U+07FF: bytes C2..DF 80..BF
+                case 0xC2:
+                case 0xC3:
+                case 0xC4:
+                case 0xC5:
+                case 0xC6:
+                case 0xC7:
+                case 0xC8:
+                case 0xC9:
+                case 0xCA:
+                case 0xCB:
+                case 0xCC:
+                case 0xCD:
+                case 0xCE:
+                case 0xCF:
+                case 0xD0:
+                case 0xD1:
+                case 0xD2:
+                case 0xD3:
+                case 0xD4:
+                case 0xD5:
+                case 0xD6:
+                case 0xD7:
+                case 0xD8:
+                case 0xD9:
+                case 0xDA:
+                case 0xDB:
+                case 0xDC:
+                case 0xDD:
+                case 0xDE:
+                case 0xDF:
+                {
+                    if (JSON_HEDLEY_UNLIKELY(!next_byte_in_range({0x80, 0xBF})))
+                    {
+                        return token_type::parse_error;
+                    }
+                    break;
+                }
+
+                // U+0800..U+0FFF: bytes E0 A0..BF 80..BF
+                case 0xE0:
+                {
+                    if (JSON_HEDLEY_UNLIKELY(!(next_byte_in_range({0xA0, 0xBF, 0x80, 0xBF}))))
+                    {
+                        return token_type::parse_error;
+                    }
+                    break;
+                }
+
+                // U+1000..U+CFFF: bytes E1..EC 80..BF 80..BF
+                // U+E000..U+FFFF: bytes EE..EF 80..BF 80..BF
+                case 0xE1:
+                case 0xE2:
+                case 0xE3:
+                case 0xE4:
+                case 0xE5:
+                case 0xE6:
+                case 0xE7:
+                case 0xE8:
+                case 0xE9:
+                case 0xEA:
+                case 0xEB:
+                case 0xEC:
+                case 0xEE:
+                case 0xEF:
+                {
+                    if (JSON_HEDLEY_UNLIKELY(!(next_byte_in_range({0x80, 0xBF, 0x80, 0xBF}))))
+                    {
+                        return token_type::parse_error;
+                    }
+                    break;
+                }
+
+                // U+D000..U+D7FF: bytes ED 80..9F 80..BF
+                case 0xED:
+                {
+                    if (JSON_HEDLEY_UNLIKELY(!(next_byte_in_range({0x80, 0x9F, 0x80, 0xBF}))))
+                    {
+                        return token_type::parse_error;
+                    }
+                    break;
+                }
+
+                // U+10000..U+3FFFF F0 90..BF 80..BF 80..BF
+                case 0xF0:
+                {
+                    if (JSON_HEDLEY_UNLIKELY(!(next_byte_in_range({0x90, 0xBF, 0x80, 0xBF, 0x80, 0xBF}))))
+                    {
+                        return token_type::parse_error;
+                    }
+                    break;
+                }
+
+                // U+40000..U+FFFFF F1..F3 80..BF 80..BF 80..BF
+                case 0xF1:
+                case 0xF2:
+                case 0xF3:
+                {
+                    if (JSON_HEDLEY_UNLIKELY(!(next_byte_in_range({0x80, 0xBF, 0x80, 0xBF, 0x80, 0xBF}))))
+                    {
+                        return token_type::parse_error;
+                    }
+                    break;
+                }
+
+                // U+100000..U+10FFFF F4 80..8F 80..BF 80..BF
+                case 0xF4:
+                {
+                    if (JSON_HEDLEY_UNLIKELY(!(next_byte_in_range({0x80, 0x8F, 0x80, 0xBF, 0x80, 0xBF}))))
+                    {
+                        return token_type::parse_error;
+                    }
+                    break;
+                }
+
+                // remaining bytes (80..C1 and F5..FF) are ill-formed
+                default:
+                {
+                    error_message = "invalid string: ill-formed UTF-8 byte";
+                    return token_type::parse_error;
+                }
+            }
+        }
+    }
+
+    /*!
+     * @brief scan a comment
+     * @return whether comment could be scanned successfully
+     */
+    bool scan_comment()
+    {
+        switch (get())
+        {
+            // single-line comments skip input until a newline or EOF is read
+            case '/':
+            {
+                while (true)
+                {
+                    switch (get())
+                    {
+                        case '\n':
+                        case '\r':
+                        case char_traits<char_type>::eof():
+                        case '\0':
+                            return true;
+
+                        default:
+                            break;
+                    }
+                }
+            }
+
+            // multi-line comments skip input until */ is read
+            case '*':
+            {
+                while (true)
+                {
+                    switch (get())
+                    {
+                        case char_traits<char_type>::eof():
+                        case '\0':
+                        {
+                            error_message = "invalid comment; missing closing '*/'";
+                            return false;
+                        }
+
+                        case '*':
+                        {
+                            switch (get())
+                            {
+                                case '/':
+                                    return true;
+
+                                default:
+                                {
+                                    unget();
+                                    continue;
+                                }
+                            }
+                        }
+
+                        default:
+                            continue;
+                    }
+                }
+            }
+
+            // unexpected character after reading '/'
+            default:
+            {
+                error_message = "invalid comment; expecting '/' or '*' after '/'";
+                return false;
+            }
+        }
+    }
+
+    JSON_HEDLEY_NON_NULL(2)
+    static void strtof(float& f, const char* str, char** endptr) noexcept
+    {
+        f = std::strtof(str, endptr);
+    }
+
+    JSON_HEDLEY_NON_NULL(2)
+    static void strtof(double& f, const char* str, char** endptr) noexcept
+    {
+        f = std::strtod(str, endptr);
+    }
+
+    JSON_HEDLEY_NON_NULL(2)
+    static void strtof(long double& f, const char* str, char** endptr) noexcept
+    {
+        f = std::strtold(str, endptr);
+    }
+
+    /*!
+    @brief scan a number literal
+
+    This function scans a string according to Sect. 6 of RFC 8259.
+
+    The function is realized with a deterministic finite state machine derived
+    from the grammar described in RFC 8259. Starting in state "init", the
+    input is read and used to determined the next state. Only state "done"
+    accepts the number. State "error" is a trap state to model errors. In the
+    table below, "anything" means any character but the ones listed before.
+
+    state    | 0        | 1-9      | e E      | +       | -       | .        | anything
+    ---------|----------|----------|----------|---------|---------|----------|-----------
+    init     | zero     | any1     | [error]  | [error] | minus   | [error]  | [error]
+    minus    | zero     | any1     | [error]  | [error] | [error] | [error]  | [error]
+    zero     | done     | done     | exponent | done    | done    | decimal1 | done
+    any1     | any1     | any1     | exponent | done    | done    | decimal1 | done
+    decimal1 | decimal2 | decimal2 | [error]  | [error] | [error] | [error]  | [error]
+    decimal2 | decimal2 | decimal2 | exponent | done    | done    | done     | done
+    exponent | any2     | any2     | [error]  | sign    | sign    | [error]  | [error]
+    sign     | any2     | any2     | [error]  | [error] | [error] | [error]  | [error]
+    any2     | any2     | any2     | done     | done    | done    | done     | done
+
+    The state machine is realized with one label per state (prefixed with
+    "scan_number_") and `goto` statements between them. The state machine
+    contains cycles, but any cycle can be left when EOF is read. Therefore,
+    the function is guaranteed to terminate.
+
+    During scanning, the read bytes are stored in token_buffer. This string is
+    then converted to a signed integer, an unsigned integer, or a
+    floating-point number.
+
+    @return token_type::value_unsigned, token_type::value_integer, or
+            token_type::value_float if number could be successfully scanned,
+            token_type::parse_error otherwise
+
+    @note The scanner is independent of the current locale. Internally, the
+          locale's decimal point is used instead of `.` to work with the
+          locale-dependent converters.
+    */
+    token_type scan_number()  // lgtm [cpp/use-of-goto] `goto` is used in this function to implement the number-parsing state machine described above. By design, any finite input will eventually reach the "done" state or return token_type::parse_error. In each intermediate state, 1 byte of the input is appended to the token_buffer vector, and only the already initialized variables token_buffer, number_type, and error_message are manipulated.
+    {
+        // reset token_buffer to store the number's bytes
+        reset();
+
+        // the type of the parsed number; initially set to unsigned; will be
+        // changed if minus sign, decimal point or exponent is read
+        token_type number_type = token_type::value_unsigned;
+
+        // state (init): we just found out we need to scan a number
+        switch (current)
+        {
+            case '-':
+            {
+                add(current);
+                goto scan_number_minus;
+            }
+
+            case '0':
+            {
+                add(current);
+                goto scan_number_zero;
+            }
+
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+            {
+                add(current);
+                goto scan_number_any1;
+            }
+
+            // all other characters are rejected outside scan_number()
+            default:            // LCOV_EXCL_LINE
+                JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
+        }
+
+scan_number_minus:
+        // state: we just parsed a leading minus sign
+        number_type = token_type::value_integer;
+        switch (get())
+        {
+            case '0':
+            {
+                add(current);
+                goto scan_number_zero;
+            }
+
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+            {
+                add(current);
+                goto scan_number_any1;
+            }
+
+            default:
+            {
+                error_message = "invalid number; expected digit after '-'";
+                return token_type::parse_error;
+            }
+        }
+
+scan_number_zero:
+        // state: we just parse a zero (maybe with a leading minus sign)
+        switch (get())
+        {
+            case '.':
+            {
+                add(decimal_point_char);
+                decimal_point_position = token_buffer.size() - 1;
+                goto scan_number_decimal1;
+            }
+
+            case 'e':
+            case 'E':
+            {
+                add(current);
+                goto scan_number_exponent;
+            }
+
+            default:
+                goto scan_number_done;
+        }
+
+scan_number_any1:
+        // state: we just parsed a number 0-9 (maybe with a leading minus sign)
+        switch (get())
+        {
+            case '0':
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+            {
+                add(current);
+                goto scan_number_any1;
+            }
+
+            case '.':
+            {
+                add(decimal_point_char);
+                decimal_point_position = token_buffer.size() - 1;
+                goto scan_number_decimal1;
+            }
+
+            case 'e':
+            case 'E':
+            {
+                add(current);
+                goto scan_number_exponent;
+            }
+
+            default:
+                goto scan_number_done;
+        }
+
+scan_number_decimal1:
+        // state: we just parsed a decimal point
+        number_type = token_type::value_float;
+        switch (get())
+        {
+            case '0':
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+            {
+                add(current);
+                goto scan_number_decimal2;
+            }
+
+            default:
+            {
+                error_message = "invalid number; expected digit after '.'";
+                return token_type::parse_error;
+            }
+        }
+
+scan_number_decimal2:
+        // we just parsed at least one number after a decimal point
+        switch (get())
+        {
+            case '0':
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+            {
+                add(current);
+                goto scan_number_decimal2;
+            }
+
+            case 'e':
+            case 'E':
+            {
+                add(current);
+                goto scan_number_exponent;
+            }
+
+            default:
+                goto scan_number_done;
+        }
+
+scan_number_exponent:
+        // we just parsed an exponent
+        number_type = token_type::value_float;
+        switch (get())
+        {
+            case '+':
+            case '-':
+            {
+                add(current);
+                goto scan_number_sign;
+            }
+
+            case '0':
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+            {
+                add(current);
+                goto scan_number_any2;
+            }
+
+            default:
+            {
+                error_message =
+                    "invalid number; expected '+', '-', or digit after exponent";
+                return token_type::parse_error;
+            }
+        }
+
+scan_number_sign:
+        // we just parsed an exponent sign
+        switch (get())
+        {
+            case '0':
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+            {
+                add(current);
+                goto scan_number_any2;
+            }
+
+            default:
+            {
+                error_message = "invalid number; expected digit after exponent sign";
+                return token_type::parse_error;
+            }
+        }
+
+scan_number_any2:
+        // we just parsed a number after the exponent or exponent sign
+        switch (get())
+        {
+            case '0':
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+            {
+                add(current);
+                goto scan_number_any2;
+            }
+
+            default:
+                goto scan_number_done;
+        }
+
+scan_number_done:
+        // unget the character after the number (we only read it to know that
+        // we are done scanning a number)
+        unget();
+
+        char* endptr = nullptr; // NOLINT(misc-const-correctness,cppcoreguidelines-pro-type-vararg,hicpp-vararg)
+        errno = 0;
+
+        // try to parse integers first and fall back to floats
+        if (number_type == token_type::value_unsigned)
+        {
+            const auto x = std::strtoull(token_buffer.data(), &endptr, 10);
+
+            // we checked the number format before
+            JSON_ASSERT(endptr == token_buffer.data() + token_buffer.size());
+
+            if (errno != ERANGE)
+            {
+                value_unsigned = static_cast<number_unsigned_t>(x);
+                if (value_unsigned == x)
+                {
+                    return token_type::value_unsigned;
+                }
+            }
+        }
+        else if (number_type == token_type::value_integer)
+        {
+            const auto x = std::strtoll(token_buffer.data(), &endptr, 10);
+
+            // we checked the number format before
+            JSON_ASSERT(endptr == token_buffer.data() + token_buffer.size());
+
+            if (errno != ERANGE)
+            {
+                value_integer = static_cast<number_integer_t>(x);
+                if (value_integer == x)
+                {
+                    return token_type::value_integer;
+                }
+            }
+        }
+
+        // this code is reached if we parse a floating-point number or if an
+        // integer conversion above failed
+        strtof(value_float, token_buffer.data(), &endptr);
+
+        // we checked the number format before
+        JSON_ASSERT(endptr == token_buffer.data() + token_buffer.size());
+
+        return token_type::value_float;
+    }
+
+    /*!
+    @param[in] literal_text  the literal text to expect
+    @param[in] length        the length of the passed literal text
+    @param[in] return_type   the token type to return on success
+    */
+    JSON_HEDLEY_NON_NULL(2)
+    token_type scan_literal(const char_type* literal_text, const std::size_t length,
+                            token_type return_type)
+    {
+        JSON_ASSERT(char_traits<char_type>::to_char_type(current) == literal_text[0]);
+        for (std::size_t i = 1; i < length; ++i)
+        {
+            if (JSON_HEDLEY_UNLIKELY(char_traits<char_type>::to_char_type(get()) != literal_text[i]))
+            {
+                error_message = "invalid literal";
+                return token_type::parse_error;
+            }
+        }
+        return return_type;
+    }
+
+    /////////////////////
+    // input management
+    /////////////////////
+
+    /// reset token_buffer; current character is beginning of token
+    void reset() noexcept
+    {
+        token_buffer.clear();
+        token_string.clear();
+        decimal_point_position = std::string::npos;
+        token_string.push_back(char_traits<char_type>::to_char_type(current));
+    }
+
+    /*
+    @brief get next character from the input
+
+    This function provides the interface to the used input adapter. It does
+    not throw in case the input reached EOF, but returns a
+    `char_traits<char>::eof()` in that case.  Stores the scanned characters
+    for use in error messages.
+
+    @return character read from the input
+    */
+    char_int_type get()
+    {
+        ++position.chars_read_total;
+        ++position.chars_read_current_line;
+
+        if (next_unget)
+        {
+            // just reset the next_unget variable and work with current
+            next_unget = false;
+        }
+        else
+        {
+            current = ia.get_character();
+        }
+
+        if (JSON_HEDLEY_LIKELY(current != char_traits<char_type>::eof()))
+        {
+            token_string.push_back(char_traits<char_type>::to_char_type(current));
+        }
+
+        if (current == '\n')
+        {
+            ++position.lines_read;
+            position.chars_read_current_line = 0;
+        }
+
+        return current;
+    }
+
+    /*!
+    @brief unget current character (read it again on next get)
+
+    We implement unget by setting variable next_unget to true. The input is not
+    changed - we just simulate ungetting by modifying chars_read_total,
+    chars_read_current_line, and token_string. The next call to get() will
+    behave as if the unget character is read again.
+    */
+    void unget()
+    {
+        next_unget = true;
+
+        --position.chars_read_total;
+
+        // in case we "unget" a newline, we have to also decrement the lines_read
+        if (position.chars_read_current_line == 0)
+        {
+            if (position.lines_read > 0)
+            {
+                --position.lines_read;
+            }
+        }
+        else
+        {
+            --position.chars_read_current_line;
+        }
+
+        if (JSON_HEDLEY_LIKELY(current != char_traits<char_type>::eof()))
+        {
+            JSON_ASSERT(!token_string.empty());
+            token_string.pop_back();
+        }
+    }
+
+    /// add a character to token_buffer
+    void add(char_int_type c)
+    {
+        token_buffer.push_back(static_cast<typename string_t::value_type>(c));
+    }
+
+  public:
+    /////////////////////
+    // value getters
+    /////////////////////
+
+    /// return integer value
+    constexpr number_integer_t get_number_integer() const noexcept
+    {
+        return value_integer;
+    }
+
+    /// return unsigned integer value
+    constexpr number_unsigned_t get_number_unsigned() const noexcept
+    {
+        return value_unsigned;
+    }
+
+    /// return floating-point value
+    constexpr number_float_t get_number_float() const noexcept
+    {
+        return value_float;
+    }
+
+    /// return current string value (implicitly resets the token; useful only once)
+    string_t& get_string()
+    {
+        // translate decimal points from locale back to '.' (#4084)
+        if (decimal_point_char != '.' && decimal_point_position != std::string::npos)
+        {
+            token_buffer[decimal_point_position] = '.';
+        }
+        return token_buffer;
+    }
+
+    /////////////////////
+    // diagnostics
+    /////////////////////
+
+    /// return position of last read token
+    constexpr position_t get_position() const noexcept
+    {
+        return position;
+    }
+
+    /// return the last read token (for errors only).  Will never contain EOF
+    /// (an arbitrary value that is not a valid char value, often -1), because
+    /// 255 may legitimately occur.  May contain NUL, which should be escaped.
+    std::string get_token_string() const
+    {
+        // escape control characters
+        std::string result;
+        for (const auto c : token_string)
+        {
+            if (static_cast<unsigned char>(c) <= '\x1F')
+            {
+                // escape control characters
+                std::array<char, 9> cs{{}};
+                static_cast<void>((std::snprintf)(cs.data(), cs.size(), "<U+%.4X>", static_cast<unsigned char>(c))); // NOLINT(cppcoreguidelines-pro-type-vararg,hicpp-vararg)
+                result += cs.data();
+            }
+            else
+            {
+                // add character as is
+                result.push_back(static_cast<std::string::value_type>(c));
+            }
+        }
+
+        return result;
+    }
+
+    /// return syntax error message
+    JSON_HEDLEY_RETURNS_NON_NULL
+    constexpr const char* get_error_message() const noexcept
+    {
+        return error_message;
+    }
+
+    /////////////////////
+    // actual scanner
+    /////////////////////
+
+    /*!
+    @brief skip the UTF-8 byte order mark
+    @return true iff there is no BOM or the correct BOM has been skipped
+    */
+    bool skip_bom()
+    {
+        if (get() == 0xEF)
+        {
+            // check if we completely parse the BOM
+            return get() == 0xBB && get() == 0xBF;
+        }
+
+        // the first character is not the beginning of the BOM; unget it to
+        // process is later
+        unget();
+        return true;
+    }
+
+    void skip_whitespace()
+    {
+        do
+        {
+            get();
+        }
+        while (current == ' ' || current == '\t' || current == '\n' || current == '\r');
+    }
+
+    token_type scan()
+    {
+        // initially, skip the BOM
+        if (position.chars_read_total == 0 && !skip_bom())
+        {
+            error_message = "invalid BOM; must be 0xEF 0xBB 0xBF if given";
+            return token_type::parse_error;
+        }
+
+        // read next character and ignore whitespace
+        skip_whitespace();
+
+        // ignore comments
+        while (ignore_comments && current == '/')
+        {
+            if (!scan_comment())
+            {
+                return token_type::parse_error;
+            }
+
+            // skip following whitespace
+            skip_whitespace();
+        }
+
+        switch (current)
+        {
+            // structural characters
+            case '[':
+                return token_type::begin_array;
+            case ']':
+                return token_type::end_array;
+            case '{':
+                return token_type::begin_object;
+            case '}':
+                return token_type::end_object;
+            case ':':
+                return token_type::name_separator;
+            case ',':
+                return token_type::value_separator;
+
+            // literals
+            case 't':
+            {
+                std::array<char_type, 4> true_literal = {{static_cast<char_type>('t'), static_cast<char_type>('r'), static_cast<char_type>('u'), static_cast<char_type>('e')}};
+                return scan_literal(true_literal.data(), true_literal.size(), token_type::literal_true);
+            }
+            case 'f':
+            {
+                std::array<char_type, 5> false_literal = {{static_cast<char_type>('f'), static_cast<char_type>('a'), static_cast<char_type>('l'), static_cast<char_type>('s'), static_cast<char_type>('e')}};
+                return scan_literal(false_literal.data(), false_literal.size(), token_type::literal_false);
+            }
+            case 'n':
+            {
+                std::array<char_type, 4> null_literal = {{static_cast<char_type>('n'), static_cast<char_type>('u'), static_cast<char_type>('l'), static_cast<char_type>('l')}};
+                return scan_literal(null_literal.data(), null_literal.size(), token_type::literal_null);
+            }
+
+            // string
+            case '\"':
+                return scan_string();
+
+            // number
+            case '-':
+            case '0':
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+                return scan_number();
+
+            // end of input (the null byte is needed when parsing from
+            // string literals)
+            case '\0':
+            case char_traits<char_type>::eof():
+                return token_type::end_of_input;
+
+            // error
+            default:
+                error_message = "invalid literal";
+                return token_type::parse_error;
+        }
+    }
+
+  private:
+    /// input adapter
+    InputAdapterType ia;
+
+    /// whether comments should be ignored (true) or signaled as errors (false)
+    const bool ignore_comments = false;
+
+    /// the current character
+    char_int_type current = char_traits<char_type>::eof();
+
+    /// whether the next get() call should just return current
+    bool next_unget = false;
+
+    /// the start position of the current token
+    position_t position {};
+
+    /// raw input token string (for error messages)
+    std::vector<char_type> token_string {};
+
+    /// buffer for variable-length tokens (numbers, strings)
+    string_t token_buffer {};
+
+    /// a description of occurred lexer errors
+    const char* error_message = "";
+
+    // number values
+    number_integer_t value_integer = 0;
+    number_unsigned_t value_unsigned = 0;
+    number_float_t value_float = 0;
+
+    /// the decimal point
+    const char_int_type decimal_point_char = '.';
+    /// the position of the decimal point in the input
+    std::size_t decimal_point_position = std::string::npos;
+};
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/string_concat.hpp>
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+
+/*!
+@brief SAX interface
+
+This class describes the SAX interface used by @ref nlohmann::json::sax_parse.
+Each function is called in different situations while the input is parsed. The
+boolean return value informs the parser whether to continue processing the
+input.
+*/
+template<typename BasicJsonType>
+struct json_sax
+{
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+    using string_t = typename BasicJsonType::string_t;
+    using binary_t = typename BasicJsonType::binary_t;
+
+    /*!
+    @brief a null value was read
+    @return whether parsing should proceed
+    */
+    virtual bool null() = 0;
+
+    /*!
+    @brief a boolean value was read
+    @param[in] val  boolean value
+    @return whether parsing should proceed
+    */
+    virtual bool boolean(bool val) = 0;
+
+    /*!
+    @brief an integer number was read
+    @param[in] val  integer value
+    @return whether parsing should proceed
+    */
+    virtual bool number_integer(number_integer_t val) = 0;
+
+    /*!
+    @brief an unsigned integer number was read
+    @param[in] val  unsigned integer value
+    @return whether parsing should proceed
+    */
+    virtual bool number_unsigned(number_unsigned_t val) = 0;
+
+    /*!
+    @brief a floating-point number was read
+    @param[in] val  floating-point value
+    @param[in] s    raw token value
+    @return whether parsing should proceed
+    */
+    virtual bool number_float(number_float_t val, const string_t& s) = 0;
+
+    /*!
+    @brief a string value was read
+    @param[in] val  string value
+    @return whether parsing should proceed
+    @note It is safe to move the passed string value.
+    */
+    virtual bool string(string_t& val) = 0;
+
+    /*!
+    @brief a binary value was read
+    @param[in] val  binary value
+    @return whether parsing should proceed
+    @note It is safe to move the passed binary value.
+    */
+    virtual bool binary(binary_t& val) = 0;
+
+    /*!
+    @brief the beginning of an object was read
+    @param[in] elements  number of object elements or -1 if unknown
+    @return whether parsing should proceed
+    @note binary formats may report the number of elements
+    */
+    virtual bool start_object(std::size_t elements) = 0;
+
+    /*!
+    @brief an object key was read
+    @param[in] val  object key
+    @return whether parsing should proceed
+    @note It is safe to move the passed string.
+    */
+    virtual bool key(string_t& val) = 0;
+
+    /*!
+    @brief the end of an object was read
+    @return whether parsing should proceed
+    */
+    virtual bool end_object() = 0;
+
+    /*!
+    @brief the beginning of an array was read
+    @param[in] elements  number of array elements or -1 if unknown
+    @return whether parsing should proceed
+    @note binary formats may report the number of elements
+    */
+    virtual bool start_array(std::size_t elements) = 0;
+
+    /*!
+    @brief the end of an array was read
+    @return whether parsing should proceed
+    */
+    virtual bool end_array() = 0;
+
+    /*!
+    @brief a parse error occurred
+    @param[in] position    the position in the input where the error occurs
+    @param[in] last_token  the last read token
+    @param[in] ex          an exception object describing the error
+    @return whether parsing should proceed (must return false)
+    */
+    virtual bool parse_error(std::size_t position,
+                             const std::string& last_token,
+                             const detail::exception& ex) = 0;
+
+    json_sax() = default;
+    json_sax(const json_sax&) = default;
+    json_sax(json_sax&&) noexcept = default;
+    json_sax& operator=(const json_sax&) = default;
+    json_sax& operator=(json_sax&&) noexcept = default;
+    virtual ~json_sax() = default;
+};
+
+namespace detail
+{
+constexpr std::size_t unknown_size()
+{
+    return (std::numeric_limits<std::size_t>::max)();
+}
+
+/*!
+@brief SAX implementation to create a JSON value from SAX events
+
+This class implements the @ref json_sax interface and processes the SAX events
+to create a JSON value which makes it basically a DOM parser. The structure or
+hierarchy of the JSON value is managed by the stack `ref_stack` which contains
+a pointer to the respective array or object for each recursion depth.
+
+After successful parsing, the value that is passed by reference to the
+constructor contains the parsed value.
+
+@tparam BasicJsonType  the JSON type
+*/
+template<typename BasicJsonType, typename InputAdapterType>
+class json_sax_dom_parser
+{
+  public:
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+    using string_t = typename BasicJsonType::string_t;
+    using binary_t = typename BasicJsonType::binary_t;
+    using lexer_t = lexer<BasicJsonType, InputAdapterType>;
+
+    /*!
+    @param[in,out] r  reference to a JSON value that is manipulated while
+                       parsing
+    @param[in] allow_exceptions_  whether parse errors yield exceptions
+    */
+    explicit json_sax_dom_parser(BasicJsonType& r, const bool allow_exceptions_ = true, lexer_t* lexer_ = nullptr)
+        : root(r), allow_exceptions(allow_exceptions_), m_lexer_ref(lexer_)
+    {}
+
+    // make class move-only
+    json_sax_dom_parser(const json_sax_dom_parser&) = delete;
+    json_sax_dom_parser(json_sax_dom_parser&&) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor)
+    json_sax_dom_parser& operator=(const json_sax_dom_parser&) = delete;
+    json_sax_dom_parser& operator=(json_sax_dom_parser&&) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor)
+    ~json_sax_dom_parser() = default;
+
+    bool null()
+    {
+        handle_value(nullptr);
+        return true;
+    }
+
+    bool boolean(bool val)
+    {
+        handle_value(val);
+        return true;
+    }
+
+    bool number_integer(number_integer_t val)
+    {
+        handle_value(val);
+        return true;
+    }
+
+    bool number_unsigned(number_unsigned_t val)
+    {
+        handle_value(val);
+        return true;
+    }
+
+    bool number_float(number_float_t val, const string_t& /*unused*/)
+    {
+        handle_value(val);
+        return true;
+    }
+
+    bool string(string_t& val)
+    {
+        handle_value(val);
+        return true;
+    }
+
+    bool binary(binary_t& val)
+    {
+        handle_value(std::move(val));
+        return true;
+    }
+
+    bool start_object(std::size_t len)
+    {
+        ref_stack.push_back(handle_value(BasicJsonType::value_t::object));
+
+#if JSON_DIAGNOSTIC_POSITIONS
+        // Manually set the start position of the object here.
+        // Ensure this is after the call to handle_value to ensure correct start position.
+        if (m_lexer_ref)
+        {
+            // Lexer has read the first character of the object, so
+            // subtract 1 from the position to get the correct start position.
+            ref_stack.back()->start_position = m_lexer_ref->get_position() - 1;
+        }
+#endif
+
+        if (JSON_HEDLEY_UNLIKELY(len != detail::unknown_size() && len > ref_stack.back()->max_size()))
+        {
+            JSON_THROW(out_of_range::create(408, concat("excessive object size: ", std::to_string(len)), ref_stack.back()));
+        }
+
+        return true;
+    }
+
+    bool key(string_t& val)
+    {
+        JSON_ASSERT(!ref_stack.empty());
+        JSON_ASSERT(ref_stack.back()->is_object());
+
+        // add null at given key and store the reference for later
+        object_element = &(ref_stack.back()->m_data.m_value.object->operator[](val));
+        return true;
+    }
+
+    bool end_object()
+    {
+        JSON_ASSERT(!ref_stack.empty());
+        JSON_ASSERT(ref_stack.back()->is_object());
+
+#if JSON_DIAGNOSTIC_POSITIONS
+        if (m_lexer_ref)
+        {
+            // Lexer's position is past the closing brace, so set that as the end position.
+            ref_stack.back()->end_position = m_lexer_ref->get_position();
+        }
+#endif
+
+        ref_stack.back()->set_parents();
+        ref_stack.pop_back();
+        return true;
+    }
+
+    bool start_array(std::size_t len)
+    {
+        ref_stack.push_back(handle_value(BasicJsonType::value_t::array));
+
+#if JSON_DIAGNOSTIC_POSITIONS
+        // Manually set the start position of the array here.
+        // Ensure this is after the call to handle_value to ensure correct start position.
+        if (m_lexer_ref)
+        {
+            ref_stack.back()->start_position = m_lexer_ref->get_position() - 1;
+        }
+#endif
+
+        if (JSON_HEDLEY_UNLIKELY(len != detail::unknown_size() && len > ref_stack.back()->max_size()))
+        {
+            JSON_THROW(out_of_range::create(408, concat("excessive array size: ", std::to_string(len)), ref_stack.back()));
+        }
+
+        return true;
+    }
+
+    bool end_array()
+    {
+        JSON_ASSERT(!ref_stack.empty());
+        JSON_ASSERT(ref_stack.back()->is_array());
+
+#if JSON_DIAGNOSTIC_POSITIONS
+        if (m_lexer_ref)
+        {
+            // Lexer's position is past the closing bracket, so set that as the end position.
+            ref_stack.back()->end_position = m_lexer_ref->get_position();
+        }
+#endif
+
+        ref_stack.back()->set_parents();
+        ref_stack.pop_back();
+        return true;
+    }
+
+    template<class Exception>
+    bool parse_error(std::size_t /*unused*/, const std::string& /*unused*/,
+                     const Exception& ex)
+    {
+        errored = true;
+        static_cast<void>(ex);
+        if (allow_exceptions)
+        {
+            JSON_THROW(ex);
+        }
+        return false;
+    }
+
+    constexpr bool is_errored() const
+    {
+        return errored;
+    }
+
+  private:
+
+#if JSON_DIAGNOSTIC_POSITIONS
+    void handle_diagnostic_positions_for_json_value(BasicJsonType& v)
+    {
+        if (m_lexer_ref)
+        {
+            // Lexer has read past the current field value, so set the end position to the current position.
+            // The start position will be set below based on the length of the string representation
+            // of the value.
+            v.end_position = m_lexer_ref->get_position();
+
+            switch (v.type())
+            {
+                case value_t::boolean:
+                {
+                    // 4 and 5 are the string length of "true" and "false"
+                    v.start_position = v.end_position - (v.m_data.m_value.boolean ? 4 : 5);
+                    break;
+                }
+
+                case value_t::null:
+                {
+                    // 4 is the string length of "null"
+                    v.start_position = v.end_position - 4;
+                    break;
+                }
+
+                case value_t::string:
+                {
+                    // include the length of the quotes, which is 2
+                    v.start_position = v.end_position - v.m_data.m_value.string->size() - 2;
+                    break;
+                }
+
+                // As we handle the start and end positions for values created during parsing,
+                // we do not expect the following value type to be called. Regardless, set the positions
+                // in case this is created manually or through a different constructor. Exclude from lcov
+                // since the exact condition of this switch is esoteric.
+                // LCOV_EXCL_START
+                case value_t::discarded:
+                {
+                    v.end_position = std::string::npos;
+                    v.start_position = v.end_position;
+                    break;
+                }
+                // LCOV_EXCL_STOP
+                case value_t::binary:
+                case value_t::number_integer:
+                case value_t::number_unsigned:
+                case value_t::number_float:
+                {
+                    v.start_position = v.end_position - m_lexer_ref->get_string().size();
+                    break;
+                }
+                case value_t::object:
+                case value_t::array:
+                {
+                    // object and array are handled in start_object() and start_array() handlers
+                    // skip setting the values here.
+                    break;
+                }
+                default: // LCOV_EXCL_LINE
+                    // Handle all possible types discretely, default handler should never be reached.
+                    JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert,-warnings-as-errors) LCOV_EXCL_LINE
+            }
+        }
+    }
+#endif
+
+    /*!
+    @invariant If the ref stack is empty, then the passed value will be the new
+               root.
+    @invariant If the ref stack contains a value, then it is an array or an
+               object to which we can add elements
+    */
+    template<typename Value>
+    JSON_HEDLEY_RETURNS_NON_NULL
+    BasicJsonType* handle_value(Value&& v)
+    {
+        if (ref_stack.empty())
+        {
+            root = BasicJsonType(std::forward<Value>(v));
+
+#if JSON_DIAGNOSTIC_POSITIONS
+            handle_diagnostic_positions_for_json_value(root);
+#endif
+
+            return &root;
+        }
+
+        JSON_ASSERT(ref_stack.back()->is_array() || ref_stack.back()->is_object());
+
+        if (ref_stack.back()->is_array())
+        {
+            ref_stack.back()->m_data.m_value.array->emplace_back(std::forward<Value>(v));
+
+#if JSON_DIAGNOSTIC_POSITIONS
+            handle_diagnostic_positions_for_json_value(ref_stack.back()->m_data.m_value.array->back());
+#endif
+
+            return &(ref_stack.back()->m_data.m_value.array->back());
+        }
+
+        JSON_ASSERT(ref_stack.back()->is_object());
+        JSON_ASSERT(object_element);
+        *object_element = BasicJsonType(std::forward<Value>(v));
+
+#if JSON_DIAGNOSTIC_POSITIONS
+        handle_diagnostic_positions_for_json_value(*object_element);
+#endif
+
+        return object_element;
+    }
+
+    /// the parsed JSON value
+    BasicJsonType& root;
+    /// stack to model hierarchy of values
+    std::vector<BasicJsonType*> ref_stack {};
+    /// helper to hold the reference for the next object element
+    BasicJsonType* object_element = nullptr;
+    /// whether a syntax error occurred
+    bool errored = false;
+    /// whether to throw exceptions in case of errors
+    const bool allow_exceptions = true;
+    /// the lexer reference to obtain the current position
+    lexer_t* m_lexer_ref = nullptr;
+};
+
+template<typename BasicJsonType, typename InputAdapterType>
+class json_sax_dom_callback_parser
+{
+  public:
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+    using string_t = typename BasicJsonType::string_t;
+    using binary_t = typename BasicJsonType::binary_t;
+    using parser_callback_t = typename BasicJsonType::parser_callback_t;
+    using parse_event_t = typename BasicJsonType::parse_event_t;
+    using lexer_t = lexer<BasicJsonType, InputAdapterType>;
+
+    json_sax_dom_callback_parser(BasicJsonType& r,
+                                 parser_callback_t cb,
+                                 const bool allow_exceptions_ = true,
+                                 lexer_t* lexer_ = nullptr)
+        : root(r), callback(std::move(cb)), allow_exceptions(allow_exceptions_), m_lexer_ref(lexer_)
+    {
+        keep_stack.push_back(true);
+    }
+
+    // make class move-only
+    json_sax_dom_callback_parser(const json_sax_dom_callback_parser&) = delete;
+    json_sax_dom_callback_parser(json_sax_dom_callback_parser&&) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor)
+    json_sax_dom_callback_parser& operator=(const json_sax_dom_callback_parser&) = delete;
+    json_sax_dom_callback_parser& operator=(json_sax_dom_callback_parser&&) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor)
+    ~json_sax_dom_callback_parser() = default;
+
+    bool null()
+    {
+        handle_value(nullptr);
+        return true;
+    }
+
+    bool boolean(bool val)
+    {
+        handle_value(val);
+        return true;
+    }
+
+    bool number_integer(number_integer_t val)
+    {
+        handle_value(val);
+        return true;
+    }
+
+    bool number_unsigned(number_unsigned_t val)
+    {
+        handle_value(val);
+        return true;
+    }
+
+    bool number_float(number_float_t val, const string_t& /*unused*/)
+    {
+        handle_value(val);
+        return true;
+    }
+
+    bool string(string_t& val)
+    {
+        handle_value(val);
+        return true;
+    }
+
+    bool binary(binary_t& val)
+    {
+        handle_value(std::move(val));
+        return true;
+    }
+
+    bool start_object(std::size_t len)
+    {
+        // check callback for object start
+        const bool keep = callback(static_cast<int>(ref_stack.size()), parse_event_t::object_start, discarded);
+        keep_stack.push_back(keep);
+
+        auto val = handle_value(BasicJsonType::value_t::object, true);
+        ref_stack.push_back(val.second);
+
+        if (ref_stack.back())
+        {
+
+#if JSON_DIAGNOSTIC_POSITIONS
+            // Manually set the start position of the object here.
+            // Ensure this is after the call to handle_value to ensure correct start position.
+            if (m_lexer_ref)
+            {
+                // Lexer has read the first character of the object, so
+                // subtract 1 from the position to get the correct start position.
+                ref_stack.back()->start_position = m_lexer_ref->get_position() - 1;
+            }
+#endif
+
+            // check object limit
+            if (JSON_HEDLEY_UNLIKELY(len != detail::unknown_size() && len > ref_stack.back()->max_size()))
+            {
+                JSON_THROW(out_of_range::create(408, concat("excessive object size: ", std::to_string(len)), ref_stack.back()));
+            }
+        }
+        return true;
+    }
+
+    bool key(string_t& val)
+    {
+        BasicJsonType k = BasicJsonType(val);
+
+        // check callback for key
+        const bool keep = callback(static_cast<int>(ref_stack.size()), parse_event_t::key, k);
+        key_keep_stack.push_back(keep);
+
+        // add discarded value at given key and store the reference for later
+        if (keep && ref_stack.back())
+        {
+            object_element = &(ref_stack.back()->m_data.m_value.object->operator[](val) = discarded);
+        }
+
+        return true;
+    }
+
+    bool end_object()
+    {
+        if (ref_stack.back())
+        {
+            if (!callback(static_cast<int>(ref_stack.size()) - 1, parse_event_t::object_end, *ref_stack.back()))
+            {
+                // discard object
+                *ref_stack.back() = discarded;
+
+#if JSON_DIAGNOSTIC_POSITIONS
+                // Set start/end positions for discarded object.
+                handle_diagnostic_positions_for_json_value(*ref_stack.back());
+#endif
+            }
+            else
+            {
+
+#if JSON_DIAGNOSTIC_POSITIONS
+                if (m_lexer_ref)
+                {
+                    // Lexer's position is past the closing brace, so set that as the end position.
+                    ref_stack.back()->end_position = m_lexer_ref->get_position();
+                }
+#endif
+
+                ref_stack.back()->set_parents();
+            }
+        }
+
+        JSON_ASSERT(!ref_stack.empty());
+        JSON_ASSERT(!keep_stack.empty());
+        ref_stack.pop_back();
+        keep_stack.pop_back();
+
+        if (!ref_stack.empty() && ref_stack.back() && ref_stack.back()->is_structured())
+        {
+            // remove discarded value
+            for (auto it = ref_stack.back()->begin(); it != ref_stack.back()->end(); ++it)
+            {
+                if (it->is_discarded())
+                {
+                    ref_stack.back()->erase(it);
+                    break;
+                }
+            }
+        }
+
+        return true;
+    }
+
+    bool start_array(std::size_t len)
+    {
+        const bool keep = callback(static_cast<int>(ref_stack.size()), parse_event_t::array_start, discarded);
+        keep_stack.push_back(keep);
+
+        auto val = handle_value(BasicJsonType::value_t::array, true);
+        ref_stack.push_back(val.second);
+
+        if (ref_stack.back())
+        {
+
+#if JSON_DIAGNOSTIC_POSITIONS
+            // Manually set the start position of the array here.
+            // Ensure this is after the call to handle_value to ensure correct start position.
+            if (m_lexer_ref)
+            {
+                // Lexer has read the first character of the array, so
+                // subtract 1 from the position to get the correct start position.
+                ref_stack.back()->start_position = m_lexer_ref->get_position() - 1;
+            }
+#endif
+
+            // check array limit
+            if (JSON_HEDLEY_UNLIKELY(len != detail::unknown_size() && len > ref_stack.back()->max_size()))
+            {
+                JSON_THROW(out_of_range::create(408, concat("excessive array size: ", std::to_string(len)), ref_stack.back()));
+            }
+        }
+
+        return true;
+    }
+
+    bool end_array()
+    {
+        bool keep = true;
+
+        if (ref_stack.back())
+        {
+            keep = callback(static_cast<int>(ref_stack.size()) - 1, parse_event_t::array_end, *ref_stack.back());
+            if (keep)
+            {
+
+#if JSON_DIAGNOSTIC_POSITIONS
+                if (m_lexer_ref)
+                {
+                    // Lexer's position is past the closing bracket, so set that as the end position.
+                    ref_stack.back()->end_position = m_lexer_ref->get_position();
+                }
+#endif
+
+                ref_stack.back()->set_parents();
+            }
+            else
+            {
+                // discard array
+                *ref_stack.back() = discarded;
+
+#if JSON_DIAGNOSTIC_POSITIONS
+                // Set start/end positions for discarded array.
+                handle_diagnostic_positions_for_json_value(*ref_stack.back());
+#endif
+            }
+        }
+
+        JSON_ASSERT(!ref_stack.empty());
+        JSON_ASSERT(!keep_stack.empty());
+        ref_stack.pop_back();
+        keep_stack.pop_back();
+
+        // remove discarded value
+        if (!keep && !ref_stack.empty() && ref_stack.back()->is_array())
+        {
+            ref_stack.back()->m_data.m_value.array->pop_back();
+        }
+
+        return true;
+    }
+
+    template<class Exception>
+    bool parse_error(std::size_t /*unused*/, const std::string& /*unused*/,
+                     const Exception& ex)
+    {
+        errored = true;
+        static_cast<void>(ex);
+        if (allow_exceptions)
+        {
+            JSON_THROW(ex);
+        }
+        return false;
+    }
+
+    constexpr bool is_errored() const
+    {
+        return errored;
+    }
+
+  private:
+
+#if JSON_DIAGNOSTIC_POSITIONS
+    void handle_diagnostic_positions_for_json_value(BasicJsonType& v)
+    {
+        if (m_lexer_ref)
+        {
+            // Lexer has read past the current field value, so set the end position to the current position.
+            // The start position will be set below based on the length of the string representation
+            // of the value.
+            v.end_position = m_lexer_ref->get_position();
+
+            switch (v.type())
+            {
+                case value_t::boolean:
+                {
+                    // 4 and 5 are the string length of "true" and "false"
+                    v.start_position = v.end_position - (v.m_data.m_value.boolean ? 4 : 5);
+                    break;
+                }
+
+                case value_t::null:
+                {
+                    // 4 is the string length of "null"
+                    v.start_position = v.end_position - 4;
+                    break;
+                }
+
+                case value_t::string:
+                {
+                    // include the length of the quotes, which is 2
+                    v.start_position = v.end_position - v.m_data.m_value.string->size() - 2;
+                    break;
+                }
+
+                case value_t::discarded:
+                {
+                    v.end_position = std::string::npos;
+                    v.start_position = v.end_position;
+                    break;
+                }
+
+                case value_t::binary:
+                case value_t::number_integer:
+                case value_t::number_unsigned:
+                case value_t::number_float:
+                {
+                    v.start_position = v.end_position - m_lexer_ref->get_string().size();
+                    break;
+                }
+
+                case value_t::object:
+                case value_t::array:
+                {
+                    // object and array are handled in start_object() and start_array() handlers
+                    // skip setting the values here.
+                    break;
+                }
+                default: // LCOV_EXCL_LINE
+                    // Handle all possible types discretely, default handler should never be reached.
+                    JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert,-warnings-as-errors) LCOV_EXCL_LINE
+            }
+        }
+    }
+#endif
+
+    /*!
+    @param[in] v  value to add to the JSON value we build during parsing
+    @param[in] skip_callback  whether we should skip calling the callback
+               function; this is required after start_array() and
+               start_object() SAX events, because otherwise we would call the
+               callback function with an empty array or object, respectively.
+
+    @invariant If the ref stack is empty, then the passed value will be the new
+               root.
+    @invariant If the ref stack contains a value, then it is an array or an
+               object to which we can add elements
+
+    @return pair of boolean (whether value should be kept) and pointer (to the
+            passed value in the ref_stack hierarchy; nullptr if not kept)
+    */
+    template<typename Value>
+    std::pair<bool, BasicJsonType*> handle_value(Value&& v, const bool skip_callback = false)
+    {
+        JSON_ASSERT(!keep_stack.empty());
+
+        // do not handle this value if we know it would be added to a discarded
+        // container
+        if (!keep_stack.back())
+        {
+            return {false, nullptr};
+        }
+
+        // create value
+        auto value = BasicJsonType(std::forward<Value>(v));
+
+#if JSON_DIAGNOSTIC_POSITIONS
+        handle_diagnostic_positions_for_json_value(value);
+#endif
+
+        // check callback
+        const bool keep = skip_callback || callback(static_cast<int>(ref_stack.size()), parse_event_t::value, value);
+
+        // do not handle this value if we just learnt it shall be discarded
+        if (!keep)
+        {
+            return {false, nullptr};
+        }
+
+        if (ref_stack.empty())
+        {
+            root = std::move(value);
+            return {true, & root};
+        }
+
+        // skip this value if we already decided to skip the parent
+        // (https://github.com/nlohmann/json/issues/971#issuecomment-413678360)
+        if (!ref_stack.back())
+        {
+            return {false, nullptr};
+        }
+
+        // we now only expect arrays and objects
+        JSON_ASSERT(ref_stack.back()->is_array() || ref_stack.back()->is_object());
+
+        // array
+        if (ref_stack.back()->is_array())
+        {
+            ref_stack.back()->m_data.m_value.array->emplace_back(std::move(value));
+            return {true, & (ref_stack.back()->m_data.m_value.array->back())};
+        }
+
+        // object
+        JSON_ASSERT(ref_stack.back()->is_object());
+        // check if we should store an element for the current key
+        JSON_ASSERT(!key_keep_stack.empty());
+        const bool store_element = key_keep_stack.back();
+        key_keep_stack.pop_back();
+
+        if (!store_element)
+        {
+            return {false, nullptr};
+        }
+
+        JSON_ASSERT(object_element);
+        *object_element = std::move(value);
+        return {true, object_element};
+    }
+
+    /// the parsed JSON value
+    BasicJsonType& root;
+    /// stack to model hierarchy of values
+    std::vector<BasicJsonType*> ref_stack {};
+    /// stack to manage which values to keep
+    std::vector<bool> keep_stack {}; // NOLINT(readability-redundant-member-init)
+    /// stack to manage which object keys to keep
+    std::vector<bool> key_keep_stack {}; // NOLINT(readability-redundant-member-init)
+    /// helper to hold the reference for the next object element
+    BasicJsonType* object_element = nullptr;
+    /// whether a syntax error occurred
+    bool errored = false;
+    /// callback function
+    const parser_callback_t callback = nullptr;
+    /// whether to throw exceptions in case of errors
+    const bool allow_exceptions = true;
+    /// a discarded value for the callback
+    BasicJsonType discarded = BasicJsonType::value_t::discarded;
+    /// the lexer reference to obtain the current position
+    lexer_t* m_lexer_ref = nullptr;
+};
+
+template<typename BasicJsonType>
+class json_sax_acceptor
+{
+  public:
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+    using string_t = typename BasicJsonType::string_t;
+    using binary_t = typename BasicJsonType::binary_t;
+
+    bool null()
+    {
+        return true;
+    }
+
+    bool boolean(bool /*unused*/)
+    {
+        return true;
+    }
+
+    bool number_integer(number_integer_t /*unused*/)
+    {
+        return true;
+    }
+
+    bool number_unsigned(number_unsigned_t /*unused*/)
+    {
+        return true;
+    }
+
+    bool number_float(number_float_t /*unused*/, const string_t& /*unused*/)
+    {
+        return true;
+    }
+
+    bool string(string_t& /*unused*/)
+    {
+        return true;
+    }
+
+    bool binary(binary_t& /*unused*/)
+    {
+        return true;
+    }
+
+    bool start_object(std::size_t /*unused*/ = detail::unknown_size())
+    {
+        return true;
+    }
+
+    bool key(string_t& /*unused*/)
+    {
+        return true;
+    }
+
+    bool end_object()
+    {
+        return true;
+    }
+
+    bool start_array(std::size_t /*unused*/ = detail::unknown_size())
+    {
+        return true;
+    }
+
+    bool end_array()
+    {
+        return true;
+    }
+
+    bool parse_error(std::size_t /*unused*/, const std::string& /*unused*/, const detail::exception& /*unused*/)
+    {
+        return false;
+    }
+};
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/input/lexer.hpp>
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/meta/is_sax.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013 - 2025 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <cstdint> // size_t
+#include <utility> // declval
+#include <string> // string
+
+// #include <nlohmann/detail/abi_macros.hpp>
+
+// #include <nlohmann/detail/meta/detected.hpp>
+
+// #include <nlohmann/detail/meta/type_traits.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+template<typename T>
+using null_function_t = decltype(std::declval<T&>().null());
+
+template<typename T>
+using boolean_function_t =
+    decltype(std::declval<T&>().boolean(std::declval<bool>()));
+
+template<typename T, typename Integer>
+using number_integer_function_t =
+    decltype(std::declval<T&>().number_integer(std::declval<Integer>()));
+
+template<typename T, typename Unsigned>
+using number_unsigned_function_t =
+    decltype(std::declval<T&>().number_unsigned(std::declval<Unsigned>()));
+
+template<typename T, typename Float, typename String>
+using number_float_function_t = decltype(std::declval<T&>().number_float(
+                                    std::declval<Float>(), std::declval<const String&>()));
+
+template<typename T, typename String>
+using string_function_t =
+    decltype(std::declval<T&>().string(std::declval<String&>()));
+
+template<typename T, typename Binary>
+using binary_function_t =
+    decltype(std::declval<T&>().binary(std::declval<Binary&>()));
+
+template<typename T>
+using start_object_function_t =
+    decltype(std::declval<T&>().start_object(std::declval<std::size_t>()));
+
+template<typename T, typename String>
+using key_function_t =
+    decltype(std::declval<T&>().key(std::declval<String&>()));
+
+template<typename T>
+using end_object_function_t = decltype(std::declval<T&>().end_object());
+
+template<typename T>
+using start_array_function_t =
+    decltype(std::declval<T&>().start_array(std::declval<std::size_t>()));
+
+template<typename T>
+using end_array_function_t = decltype(std::declval<T&>().end_array());
+
+template<typename T, typename Exception>
+using parse_error_function_t = decltype(std::declval<T&>().parse_error(
+        std::declval<std::size_t>(), std::declval<const std::string&>(),
+        std::declval<const Exception&>()));
+
+template<typename SAX, typename BasicJsonType>
+struct is_sax
+{
+  private:
+    static_assert(is_basic_json<BasicJsonType>::value,
+                  "BasicJsonType must be of type basic_json<...>");
+
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+    using string_t = typename BasicJsonType::string_t;
+    using binary_t = typename BasicJsonType::binary_t;
+    using exception_t = typename BasicJsonType::exception;
+
+  public:
+    static constexpr bool value =
+        is_detected_exact<bool, null_function_t, SAX>::value &&
+        is_detected_exact<bool, boolean_function_t, SAX>::value &&
+        is_detected_exact<bool, number_integer_function_t, SAX, number_integer_t>::value &&
+        is_detected_exact<bool, number_unsigned_function_t, SAX, number_unsigned_t>::value &&
+        is_detected_exact<bool, number_float_function_t, SAX, number_float_t, string_t>::value &&
+        is_detected_exact<bool, string_function_t, SAX, string_t>::value &&
+        is_detected_exact<bool, binary_function_t, SAX, binary_t>::value &&
+        is_detected_exact<bool, start_object_function_t, SAX>::value &&
+        is_detected_exact<bool, key_function_t, SAX, string_t>::value &&
+        is_detected_exact<bool, end_object_function_t, SAX>::value &&
+        is_detected_exact<bool, start_array_function_t, SAX>::value &&
+        is_detected_exact<bool, end_array_function_t, SAX>::value &&
+        is_detected_exact<bool, parse_error_function_t, SAX, exception_t>::value;
+};
+
+template<typename SAX, typename BasicJsonType>
+struct is_sax_static_asserts
+{
+  private:
+    static_assert(is_basic_json<BasicJsonType>::value,
+                  "BasicJsonType must be of type basic_json<...>");
+
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+    using string_t = typename BasicJsonType::string_t;
+    using binary_t = typename BasicJsonType::binary_t;
+    using exception_t = typename BasicJsonType::exception;
+
+  public:
+    static_assert(is_detected_exact<bool, null_function_t, SAX>::value,
+                  "Missing/invalid function: bool null()");
+    static_assert(is_detected_exact<bool, boolean_function_t, SAX>::value,
+                  "Missing/invalid function: bool boolean(bool)");
+    static_assert(is_detected_exact<bool, boolean_function_t, SAX>::value,
+                  "Missing/invalid function: bool boolean(bool)");
+    static_assert(
+        is_detected_exact<bool, number_integer_function_t, SAX,
+        number_integer_t>::value,
+        "Missing/invalid function: bool number_integer(number_integer_t)");
+    static_assert(
+        is_detected_exact<bool, number_unsigned_function_t, SAX,
+        number_unsigned_t>::value,
+        "Missing/invalid function: bool number_unsigned(number_unsigned_t)");
+    static_assert(is_detected_exact<bool, number_float_function_t, SAX,
+                  number_float_t, string_t>::value,
+                  "Missing/invalid function: bool number_float(number_float_t, const string_t&)");
+    static_assert(
+        is_detected_exact<bool, string_function_t, SAX, string_t>::value,
+        "Missing/invalid function: bool string(string_t&)");
+    static_assert(
+        is_detected_exact<bool, binary_function_t, SAX, binary_t>::value,
+        "Missing/invalid function: bool binary(binary_t&)");
+    static_assert(is_detected_exact<bool, start_object_function_t, SAX>::value,
+                  "Missing/invalid function: bool start_object(std::size_t)");
+    static_assert(is_detected_exact<bool, key_function_t, SAX, string_t>::value,
+                  "Missing/invalid function: bool key(string_t&)");
+    static_assert(is_detected_exact<bool, end_object_function_t, SAX>::value,
+                  "Missing/invalid function: bool end_object()");
+    static_assert(is_detected_exact<bool, start_array_function_t, SAX>::value,
+                  "Missing/invalid function: bool start_array(std::size_t)");
+    static_assert(is_detected_exact<bool, end_array_function_t, SAX>::value,
+                  "Missing/invalid function: bool end_array()");
+    static_assert(
+        is_detected_exact<bool, parse_error_function_t, SAX, exception_t>::value,
+        "Missing/invalid function: bool parse_error(std::size_t, const "
+        "std::string&, const exception&)");
+};
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/meta/type_traits.hpp>
+
+// #include <nlohmann/detail/string_concat.hpp>
+
+// #include <nlohmann/detail/value_t.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+/// how to treat CBOR tags
+enum class cbor_tag_handler_t
+{
+    error,   ///< throw a parse_error exception in case of a tag
+    ignore,  ///< ignore tags
+    store    ///< store tags as binary type
+};
+
+/*!
+@brief determine system byte order
+
+@return true if and only if system's byte order is little endian
+
+@note from https://stackoverflow.com/a/1001328/266378
+*/
+static inline bool little_endianness(int num = 1) noexcept
+{
+    return *reinterpret_cast<char*>(&num) == 1;
+}
+
+///////////////////
+// binary reader //
+///////////////////
+
+/*!
+@brief deserialization of CBOR, MessagePack, and UBJSON values
+*/
+template<typename BasicJsonType, typename InputAdapterType, typename SAX = json_sax_dom_parser<BasicJsonType, InputAdapterType>>
+class binary_reader
+{
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+    using string_t = typename BasicJsonType::string_t;
+    using binary_t = typename BasicJsonType::binary_t;
+    using json_sax_t = SAX;
+    using char_type = typename InputAdapterType::char_type;
+    using char_int_type = typename char_traits<char_type>::int_type;
+
+  public:
+    /*!
+    @brief create a binary reader
+
+    @param[in] adapter  input adapter to read from
+    */
+    explicit binary_reader(InputAdapterType&& adapter, const input_format_t format = input_format_t::json) noexcept : ia(std::move(adapter)), input_format(format)
+    {
+        (void)detail::is_sax_static_asserts<SAX, BasicJsonType> {};
+    }
+
+    // make class move-only
+    binary_reader(const binary_reader&) = delete;
+    binary_reader(binary_reader&&) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor)
+    binary_reader& operator=(const binary_reader&) = delete;
+    binary_reader& operator=(binary_reader&&) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor)
+    ~binary_reader() = default;
+
+    /*!
+    @param[in] format  the binary format to parse
+    @param[in] sax_    a SAX event processor
+    @param[in] strict  whether to expect the input to be consumed completed
+    @param[in] tag_handler  how to treat CBOR tags
+
+    @return whether parsing was successful
+    */
+    JSON_HEDLEY_NON_NULL(3)
+    bool sax_parse(const input_format_t format,
+                   json_sax_t* sax_,
+                   const bool strict = true,
+                   const cbor_tag_handler_t tag_handler = cbor_tag_handler_t::error)
+    {
+        sax = sax_;
+        bool result = false;
+
+        switch (format)
+        {
+            case input_format_t::bson:
+                result = parse_bson_internal();
+                break;
+
+            case input_format_t::cbor:
+                result = parse_cbor_internal(true, tag_handler);
+                break;
+
+            case input_format_t::msgpack:
+                result = parse_msgpack_internal();
+                break;
+
+            case input_format_t::ubjson:
+            case input_format_t::bjdata:
+                result = parse_ubjson_internal();
+                break;
+
+            case input_format_t::json: // LCOV_EXCL_LINE
+            default:            // LCOV_EXCL_LINE
+                JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
+        }
+
+        // strict mode: next byte must be EOF
+        if (result && strict)
+        {
+            if (input_format == input_format_t::ubjson || input_format == input_format_t::bjdata)
+            {
+                get_ignore_noop();
+            }
+            else
+            {
+                get();
+            }
+
+            if (JSON_HEDLEY_UNLIKELY(current != char_traits<char_type>::eof()))
+            {
+                return sax->parse_error(chars_read, get_token_string(), parse_error::create(110, chars_read,
+                                        exception_message(input_format, concat("expected end of input; last byte: 0x", get_token_string()), "value"), nullptr));
+            }
+        }
+
+        return result;
+    }
+
+  private:
+    //////////
+    // BSON //
+    //////////
+
+    /*!
+    @brief Reads in a BSON-object and passes it to the SAX-parser.
+    @return whether a valid BSON-value was passed to the SAX parser
+    */
+    bool parse_bson_internal()
+    {
+        std::int32_t document_size{};
+        get_number<std::int32_t, true>(input_format_t::bson, document_size);
+
+        if (JSON_HEDLEY_UNLIKELY(!sax->start_object(detail::unknown_size())))
+        {
+            return false;
+        }
+
+        if (JSON_HEDLEY_UNLIKELY(!parse_bson_element_list(/*is_array*/false)))
+        {
+            return false;
+        }
+
+        return sax->end_object();
+    }
+
+    /*!
+    @brief Parses a C-style string from the BSON input.
+    @param[in,out] result  A reference to the string variable where the read
+                            string is to be stored.
+    @return `true` if the \x00-byte indicating the end of the string was
+             encountered before the EOF; false` indicates an unexpected EOF.
+    */
+    bool get_bson_cstr(string_t& result)
+    {
+        auto out = std::back_inserter(result);
+        while (true)
+        {
+            get();
+            if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::bson, "cstring")))
+            {
+                return false;
+            }
+            if (current == 0x00)
+            {
+                return true;
+            }
+            *out++ = static_cast<typename string_t::value_type>(current);
+        }
+    }
+
+    /*!
+    @brief Parses a zero-terminated string of length @a len from the BSON
+           input.
+    @param[in] len  The length (including the zero-byte at the end) of the
+                    string to be read.
+    @param[in,out] result  A reference to the string variable where the read
+                            string is to be stored.
+    @tparam NumberType The type of the length @a len
+    @pre len >= 1
+    @return `true` if the string was successfully parsed
+    */
+    template<typename NumberType>
+    bool get_bson_string(const NumberType len, string_t& result)
+    {
+        if (JSON_HEDLEY_UNLIKELY(len < 1))
+        {
+            auto last_token = get_token_string();
+            return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read,
+                                    exception_message(input_format_t::bson, concat("string length must be at least 1, is ", std::to_string(len)), "string"), nullptr));
+        }
+
+        return get_string(input_format_t::bson, len - static_cast<NumberType>(1), result) && get() != char_traits<char_type>::eof();
+    }
+
+    /*!
+    @brief Parses a byte array input of length @a len from the BSON input.
+    @param[in] len  The length of the byte array to be read.
+    @param[in,out] result  A reference to the binary variable where the read
+                            array is to be stored.
+    @tparam NumberType The type of the length @a len
+    @pre len >= 0
+    @return `true` if the byte array was successfully parsed
+    */
+    template<typename NumberType>
+    bool get_bson_binary(const NumberType len, binary_t& result)
+    {
+        if (JSON_HEDLEY_UNLIKELY(len < 0))
+        {
+            auto last_token = get_token_string();
+            return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read,
+                                    exception_message(input_format_t::bson, concat("byte array length cannot be negative, is ", std::to_string(len)), "binary"), nullptr));
+        }
+
+        // All BSON binary values have a subtype
+        std::uint8_t subtype{};
+        get_number<std::uint8_t>(input_format_t::bson, subtype);
+        result.set_subtype(subtype);
+
+        return get_binary(input_format_t::bson, len, result);
+    }
+
+    /*!
+    @brief Read a BSON document element of the given @a element_type.
+    @param[in] element_type The BSON element type, c.f. http://bsonspec.org/spec.html
+    @param[in] element_type_parse_position The position in the input stream,
+               where the `element_type` was read.
+    @warning Not all BSON element types are supported yet. An unsupported
+             @a element_type will give rise to a parse_error.114:
+             Unsupported BSON record type 0x...
+    @return whether a valid BSON-object/array was passed to the SAX parser
+    */
+    bool parse_bson_element_internal(const char_int_type element_type,
+                                     const std::size_t element_type_parse_position)
+    {
+        switch (element_type)
+        {
+            case 0x01: // double
+            {
+                double number{};
+                return get_number<double, true>(input_format_t::bson, number) && sax->number_float(static_cast<number_float_t>(number), "");
+            }
+
+            case 0x02: // string
+            {
+                std::int32_t len{};
+                string_t value;
+                return get_number<std::int32_t, true>(input_format_t::bson, len) && get_bson_string(len, value) && sax->string(value);
+            }
+
+            case 0x03: // object
+            {
+                return parse_bson_internal();
+            }
+
+            case 0x04: // array
+            {
+                return parse_bson_array();
+            }
+
+            case 0x05: // binary
+            {
+                std::int32_t len{};
+                binary_t value;
+                return get_number<std::int32_t, true>(input_format_t::bson, len) && get_bson_binary(len, value) && sax->binary(value);
+            }
+
+            case 0x08: // boolean
+            {
+                return sax->boolean(get() != 0);
+            }
+
+            case 0x0A: // null
+            {
+                return sax->null();
+            }
+
+            case 0x10: // int32
+            {
+                std::int32_t value{};
+                return get_number<std::int32_t, true>(input_format_t::bson, value) && sax->number_integer(value);
+            }
+
+            case 0x12: // int64
+            {
+                std::int64_t value{};
+                return get_number<std::int64_t, true>(input_format_t::bson, value) && sax->number_integer(value);
+            }
+
+            case 0x11: // uint64
+            {
+                std::uint64_t value{};
+                return get_number<std::uint64_t, true>(input_format_t::bson, value) && sax->number_unsigned(value);
+            }
+
+            default: // anything else not supported (yet)
+            {
+                std::array<char, 3> cr{{}};
+                static_cast<void>((std::snprintf)(cr.data(), cr.size(), "%.2hhX", static_cast<unsigned char>(element_type))); // NOLINT(cppcoreguidelines-pro-type-vararg,hicpp-vararg)
+                const std::string cr_str{cr.data()};
+                return sax->parse_error(element_type_parse_position, cr_str,
+                                        parse_error::create(114, element_type_parse_position, concat("Unsupported BSON record type 0x", cr_str), nullptr));
+            }
+        }
+    }
+
+    /*!
+    @brief Read a BSON element list (as specified in the BSON-spec)
+
+    The same binary layout is used for objects and arrays, hence it must be
+    indicated with the argument @a is_array which one is expected
+    (true --> array, false --> object).
+
+    @param[in] is_array Determines if the element list being read is to be
+                        treated as an object (@a is_array == false), or as an
+                        array (@a is_array == true).
+    @return whether a valid BSON-object/array was passed to the SAX parser
+    */
+    bool parse_bson_element_list(const bool is_array)
+    {
+        string_t key;
+
+        while (auto element_type = get())
+        {
+            if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::bson, "element list")))
+            {
+                return false;
+            }
+
+            const std::size_t element_type_parse_position = chars_read;
+            if (JSON_HEDLEY_UNLIKELY(!get_bson_cstr(key)))
+            {
+                return false;
+            }
+
+            if (!is_array && !sax->key(key))
+            {
+                return false;
+            }
+
+            if (JSON_HEDLEY_UNLIKELY(!parse_bson_element_internal(element_type, element_type_parse_position)))
+            {
+                return false;
+            }
+
+            // get_bson_cstr only appends
+            key.clear();
+        }
+
+        return true;
+    }
+
+    /*!
+    @brief Reads an array from the BSON input and passes it to the SAX-parser.
+    @return whether a valid BSON-array was passed to the SAX parser
+    */
+    bool parse_bson_array()
+    {
+        std::int32_t document_size{};
+        get_number<std::int32_t, true>(input_format_t::bson, document_size);
+
+        if (JSON_HEDLEY_UNLIKELY(!sax->start_array(detail::unknown_size())))
+        {
+            return false;
+        }
+
+        if (JSON_HEDLEY_UNLIKELY(!parse_bson_element_list(/*is_array*/true)))
+        {
+            return false;
+        }
+
+        return sax->end_array();
+    }
+
+    //////////
+    // CBOR //
+    //////////
+
+    /*!
+    @param[in] get_char  whether a new character should be retrieved from the
+                         input (true) or whether the last read character should
+                         be considered instead (false)
+    @param[in] tag_handler how CBOR tags should be treated
+
+    @return whether a valid CBOR value was passed to the SAX parser
+    */
+    bool parse_cbor_internal(const bool get_char,
+                             const cbor_tag_handler_t tag_handler)
+    {
+        switch (get_char ? get() : current)
+        {
+            // EOF
+            case char_traits<char_type>::eof():
+                return unexpect_eof(input_format_t::cbor, "value");
+
+            // Integer 0x00..0x17 (0..23)
+            case 0x00:
+            case 0x01:
+            case 0x02:
+            case 0x03:
+            case 0x04:
+            case 0x05:
+            case 0x06:
+            case 0x07:
+            case 0x08:
+            case 0x09:
+            case 0x0A:
+            case 0x0B:
+            case 0x0C:
+            case 0x0D:
+            case 0x0E:
+            case 0x0F:
+            case 0x10:
+            case 0x11:
+            case 0x12:
+            case 0x13:
+            case 0x14:
+            case 0x15:
+            case 0x16:
+            case 0x17:
+                return sax->number_unsigned(static_cast<number_unsigned_t>(current));
+
+            case 0x18: // Unsigned integer (one-byte uint8_t follows)
+            {
+                std::uint8_t number{};
+                return get_number(input_format_t::cbor, number) && sax->number_unsigned(number);
+            }
+
+            case 0x19: // Unsigned integer (two-byte uint16_t follows)
+            {
+                std::uint16_t number{};
+                return get_number(input_format_t::cbor, number) && sax->number_unsigned(number);
+            }
+
+            case 0x1A: // Unsigned integer (four-byte uint32_t follows)
+            {
+                std::uint32_t number{};
+                return get_number(input_format_t::cbor, number) && sax->number_unsigned(number);
+            }
+
+            case 0x1B: // Unsigned integer (eight-byte uint64_t follows)
+            {
+                std::uint64_t number{};
+                return get_number(input_format_t::cbor, number) && sax->number_unsigned(number);
+            }
+
+            // Negative integer -1-0x00..-1-0x17 (-1..-24)
+            case 0x20:
+            case 0x21:
+            case 0x22:
+            case 0x23:
+            case 0x24:
+            case 0x25:
+            case 0x26:
+            case 0x27:
+            case 0x28:
+            case 0x29:
+            case 0x2A:
+            case 0x2B:
+            case 0x2C:
+            case 0x2D:
+            case 0x2E:
+            case 0x2F:
+            case 0x30:
+            case 0x31:
+            case 0x32:
+            case 0x33:
+            case 0x34:
+            case 0x35:
+            case 0x36:
+            case 0x37:
+                return sax->number_integer(static_cast<std::int8_t>(0x20 - 1 - current));
+
+            case 0x38: // Negative integer (one-byte uint8_t follows)
+            {
+                std::uint8_t number{};
+                return get_number(input_format_t::cbor, number) && sax->number_integer(static_cast<number_integer_t>(-1) - number);
+            }
+
+            case 0x39: // Negative integer -1-n (two-byte uint16_t follows)
+            {
+                std::uint16_t number{};
+                return get_number(input_format_t::cbor, number) && sax->number_integer(static_cast<number_integer_t>(-1) - number);
+            }
+
+            case 0x3A: // Negative integer -1-n (four-byte uint32_t follows)
+            {
+                std::uint32_t number{};
+                return get_number(input_format_t::cbor, number) && sax->number_integer(static_cast<number_integer_t>(-1) - number);
+            }
+
+            case 0x3B: // Negative integer -1-n (eight-byte uint64_t follows)
+            {
+                std::uint64_t number{};
+                return get_number(input_format_t::cbor, number) && sax->number_integer(static_cast<number_integer_t>(-1)
+                        - static_cast<number_integer_t>(number));
+            }
+
+            // Binary data (0x00..0x17 bytes follow)
+            case 0x40:
+            case 0x41:
+            case 0x42:
+            case 0x43:
+            case 0x44:
+            case 0x45:
+            case 0x46:
+            case 0x47:
+            case 0x48:
+            case 0x49:
+            case 0x4A:
+            case 0x4B:
+            case 0x4C:
+            case 0x4D:
+            case 0x4E:
+            case 0x4F:
+            case 0x50:
+            case 0x51:
+            case 0x52:
+            case 0x53:
+            case 0x54:
+            case 0x55:
+            case 0x56:
+            case 0x57:
+            case 0x58: // Binary data (one-byte uint8_t for n follows)
+            case 0x59: // Binary data (two-byte uint16_t for n follow)
+            case 0x5A: // Binary data (four-byte uint32_t for n follow)
+            case 0x5B: // Binary data (eight-byte uint64_t for n follow)
+            case 0x5F: // Binary data (indefinite length)
+            {
+                binary_t b;
+                return get_cbor_binary(b) && sax->binary(b);
+            }
+
+            // UTF-8 string (0x00..0x17 bytes follow)
+            case 0x60:
+            case 0x61:
+            case 0x62:
+            case 0x63:
+            case 0x64:
+            case 0x65:
+            case 0x66:
+            case 0x67:
+            case 0x68:
+            case 0x69:
+            case 0x6A:
+            case 0x6B:
+            case 0x6C:
+            case 0x6D:
+            case 0x6E:
+            case 0x6F:
+            case 0x70:
+            case 0x71:
+            case 0x72:
+            case 0x73:
+            case 0x74:
+            case 0x75:
+            case 0x76:
+            case 0x77:
+            case 0x78: // UTF-8 string (one-byte uint8_t for n follows)
+            case 0x79: // UTF-8 string (two-byte uint16_t for n follow)
+            case 0x7A: // UTF-8 string (four-byte uint32_t for n follow)
+            case 0x7B: // UTF-8 string (eight-byte uint64_t for n follow)
+            case 0x7F: // UTF-8 string (indefinite length)
+            {
+                string_t s;
+                return get_cbor_string(s) && sax->string(s);
+            }
+
+            // array (0x00..0x17 data items follow)
+            case 0x80:
+            case 0x81:
+            case 0x82:
+            case 0x83:
+            case 0x84:
+            case 0x85:
+            case 0x86:
+            case 0x87:
+            case 0x88:
+            case 0x89:
+            case 0x8A:
+            case 0x8B:
+            case 0x8C:
+            case 0x8D:
+            case 0x8E:
+            case 0x8F:
+            case 0x90:
+            case 0x91:
+            case 0x92:
+            case 0x93:
+            case 0x94:
+            case 0x95:
+            case 0x96:
+            case 0x97:
+                return get_cbor_array(
+                           conditional_static_cast<std::size_t>(static_cast<unsigned int>(current) & 0x1Fu), tag_handler);
+
+            case 0x98: // array (one-byte uint8_t for n follows)
+            {
+                std::uint8_t len{};
+                return get_number(input_format_t::cbor, len) && get_cbor_array(static_cast<std::size_t>(len), tag_handler);
+            }
+
+            case 0x99: // array (two-byte uint16_t for n follow)
+            {
+                std::uint16_t len{};
+                return get_number(input_format_t::cbor, len) && get_cbor_array(static_cast<std::size_t>(len), tag_handler);
+            }
+
+            case 0x9A: // array (four-byte uint32_t for n follow)
+            {
+                std::uint32_t len{};
+                return get_number(input_format_t::cbor, len) && get_cbor_array(conditional_static_cast<std::size_t>(len), tag_handler);
+            }
+
+            case 0x9B: // array (eight-byte uint64_t for n follow)
+            {
+                std::uint64_t len{};
+                return get_number(input_format_t::cbor, len) && get_cbor_array(conditional_static_cast<std::size_t>(len), tag_handler);
+            }
+
+            case 0x9F: // array (indefinite length)
+                return get_cbor_array(detail::unknown_size(), tag_handler);
+
+            // map (0x00..0x17 pairs of data items follow)
+            case 0xA0:
+            case 0xA1:
+            case 0xA2:
+            case 0xA3:
+            case 0xA4:
+            case 0xA5:
+            case 0xA6:
+            case 0xA7:
+            case 0xA8:
+            case 0xA9:
+            case 0xAA:
+            case 0xAB:
+            case 0xAC:
+            case 0xAD:
+            case 0xAE:
+            case 0xAF:
+            case 0xB0:
+            case 0xB1:
+            case 0xB2:
+            case 0xB3:
+            case 0xB4:
+            case 0xB5:
+            case 0xB6:
+            case 0xB7:
+                return get_cbor_object(conditional_static_cast<std::size_t>(static_cast<unsigned int>(current) & 0x1Fu), tag_handler);
+
+            case 0xB8: // map (one-byte uint8_t for n follows)
+            {
+                std::uint8_t len{};
+                return get_number(input_format_t::cbor, len) && get_cbor_object(static_cast<std::size_t>(len), tag_handler);
+            }
+
+            case 0xB9: // map (two-byte uint16_t for n follow)
+            {
+                std::uint16_t len{};
+                return get_number(input_format_t::cbor, len) && get_cbor_object(static_cast<std::size_t>(len), tag_handler);
+            }
+
+            case 0xBA: // map (four-byte uint32_t for n follow)
+            {
+                std::uint32_t len{};
+                return get_number(input_format_t::cbor, len) && get_cbor_object(conditional_static_cast<std::size_t>(len), tag_handler);
+            }
+
+            case 0xBB: // map (eight-byte uint64_t for n follow)
+            {
+                std::uint64_t len{};
+                return get_number(input_format_t::cbor, len) && get_cbor_object(conditional_static_cast<std::size_t>(len), tag_handler);
+            }
+
+            case 0xBF: // map (indefinite length)
+                return get_cbor_object(detail::unknown_size(), tag_handler);
+
+            case 0xC6: // tagged item
+            case 0xC7:
+            case 0xC8:
+            case 0xC9:
+            case 0xCA:
+            case 0xCB:
+            case 0xCC:
+            case 0xCD:
+            case 0xCE:
+            case 0xCF:
+            case 0xD0:
+            case 0xD1:
+            case 0xD2:
+            case 0xD3:
+            case 0xD4:
+            case 0xD8: // tagged item (1 bytes follow)
+            case 0xD9: // tagged item (2 bytes follow)
+            case 0xDA: // tagged item (4 bytes follow)
+            case 0xDB: // tagged item (8 bytes follow)
+            {
+                switch (tag_handler)
+                {
+                    case cbor_tag_handler_t::error:
+                    {
+                        auto last_token = get_token_string();
+                        return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read,
+                                                exception_message(input_format_t::cbor, concat("invalid byte: 0x", last_token), "value"), nullptr));
+                    }
+
+                    case cbor_tag_handler_t::ignore:
+                    {
+                        // ignore binary subtype
+                        switch (current)
+                        {
+                            case 0xD8:
+                            {
+                                std::uint8_t subtype_to_ignore{};
+                                get_number(input_format_t::cbor, subtype_to_ignore);
+                                break;
+                            }
+                            case 0xD9:
+                            {
+                                std::uint16_t subtype_to_ignore{};
+                                get_number(input_format_t::cbor, subtype_to_ignore);
+                                break;
+                            }
+                            case 0xDA:
+                            {
+                                std::uint32_t subtype_to_ignore{};
+                                get_number(input_format_t::cbor, subtype_to_ignore);
+                                break;
+                            }
+                            case 0xDB:
+                            {
+                                std::uint64_t subtype_to_ignore{};
+                                get_number(input_format_t::cbor, subtype_to_ignore);
+                                break;
+                            }
+                            default:
+                                break;
+                        }
+                        return parse_cbor_internal(true, tag_handler);
+                    }
+
+                    case cbor_tag_handler_t::store:
+                    {
+                        binary_t b;
+                        // use binary subtype and store in binary container
+                        switch (current)
+                        {
+                            case 0xD8:
+                            {
+                                std::uint8_t subtype{};
+                                get_number(input_format_t::cbor, subtype);
+                                b.set_subtype(detail::conditional_static_cast<typename binary_t::subtype_type>(subtype));
+                                break;
+                            }
+                            case 0xD9:
+                            {
+                                std::uint16_t subtype{};
+                                get_number(input_format_t::cbor, subtype);
+                                b.set_subtype(detail::conditional_static_cast<typename binary_t::subtype_type>(subtype));
+                                break;
+                            }
+                            case 0xDA:
+                            {
+                                std::uint32_t subtype{};
+                                get_number(input_format_t::cbor, subtype);
+                                b.set_subtype(detail::conditional_static_cast<typename binary_t::subtype_type>(subtype));
+                                break;
+                            }
+                            case 0xDB:
+                            {
+                                std::uint64_t subtype{};
+                                get_number(input_format_t::cbor, subtype);
+                                b.set_subtype(detail::conditional_static_cast<typename binary_t::subtype_type>(subtype));
+                                break;
+                            }
+                            default:
+                                return parse_cbor_internal(true, tag_handler);
+                        }
+                        get();
+                        return get_cbor_binary(b) && sax->binary(b);
+                    }
+
+                    default:                 // LCOV_EXCL_LINE
+                        JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
+                        return false;        // LCOV_EXCL_LINE
+                }
+            }
+
+            case 0xF4: // false
+                return sax->boolean(false);
+
+            case 0xF5: // true
+                return sax->boolean(true);
+
+            case 0xF6: // null
+                return sax->null();
+
+            case 0xF9: // Half-Precision Float (two-byte IEEE 754)
+            {
+                const auto byte1_raw = get();
+                if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::cbor, "number")))
+                {
+                    return false;
+                }
+                const auto byte2_raw = get();
+                if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::cbor, "number")))
+                {
+                    return false;
+                }
+
+                const auto byte1 = static_cast<unsigned char>(byte1_raw);
+                const auto byte2 = static_cast<unsigned char>(byte2_raw);
+
+                // code from RFC 7049, Appendix D, Figure 3:
+                // As half-precision floating-point numbers were only added
+                // to IEEE 754 in 2008, today's programming platforms often
+                // still only have limited support for them. It is very
+                // easy to include at least decoding support for them even
+                // without such support. An example of a small decoder for
+                // half-precision floating-point numbers in the C language
+                // is shown in Fig. 3.
+                const auto half = static_cast<unsigned int>((byte1 << 8u) + byte2);
+                const double val = [&half]
+                {
+                    const int exp = (half >> 10u) & 0x1Fu;
+                    const unsigned int mant = half & 0x3FFu;
+                    JSON_ASSERT(0 <= exp&& exp <= 32);
+                    JSON_ASSERT(mant <= 1024);
+                    switch (exp)
+                    {
+                        case 0:
+                            return std::ldexp(mant, -24);
+                        case 31:
+                            return (mant == 0)
+                            ? std::numeric_limits<double>::infinity()
+                            : std::numeric_limits<double>::quiet_NaN();
+                        default:
+                            return std::ldexp(mant + 1024, exp - 25);
+                    }
+                }();
+                return sax->number_float((half & 0x8000u) != 0
+                                         ? static_cast<number_float_t>(-val)
+                                         : static_cast<number_float_t>(val), "");
+            }
+
+            case 0xFA: // Single-Precision Float (four-byte IEEE 754)
+            {
+                float number{};
+                return get_number(input_format_t::cbor, number) && sax->number_float(static_cast<number_float_t>(number), "");
+            }
+
+            case 0xFB: // Double-Precision Float (eight-byte IEEE 754)
+            {
+                double number{};
+                return get_number(input_format_t::cbor, number) && sax->number_float(static_cast<number_float_t>(number), "");
+            }
+
+            default: // anything else (0xFF is handled inside the other types)
+            {
+                auto last_token = get_token_string();
+                return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read,
+                                        exception_message(input_format_t::cbor, concat("invalid byte: 0x", last_token), "value"), nullptr));
+            }
+        }
+    }
+
+    /*!
+    @brief reads a CBOR string
+
+    This function first reads starting bytes to determine the expected
+    string length and then copies this number of bytes into a string.
+    Additionally, CBOR's strings with indefinite lengths are supported.
+
+    @param[out] result  created string
+
+    @return whether string creation completed
+    */
+    bool get_cbor_string(string_t& result)
+    {
+        if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::cbor, "string")))
+        {
+            return false;
+        }
+
+        switch (current)
+        {
+            // UTF-8 string (0x00..0x17 bytes follow)
+            case 0x60:
+            case 0x61:
+            case 0x62:
+            case 0x63:
+            case 0x64:
+            case 0x65:
+            case 0x66:
+            case 0x67:
+            case 0x68:
+            case 0x69:
+            case 0x6A:
+            case 0x6B:
+            case 0x6C:
+            case 0x6D:
+            case 0x6E:
+            case 0x6F:
+            case 0x70:
+            case 0x71:
+            case 0x72:
+            case 0x73:
+            case 0x74:
+            case 0x75:
+            case 0x76:
+            case 0x77:
+            {
+                return get_string(input_format_t::cbor, static_cast<unsigned int>(current) & 0x1Fu, result);
+            }
+
+            case 0x78: // UTF-8 string (one-byte uint8_t for n follows)
+            {
+                std::uint8_t len{};
+                return get_number(input_format_t::cbor, len) && get_string(input_format_t::cbor, len, result);
+            }
+
+            case 0x79: // UTF-8 string (two-byte uint16_t for n follow)
+            {
+                std::uint16_t len{};
+                return get_number(input_format_t::cbor, len) && get_string(input_format_t::cbor, len, result);
+            }
+
+            case 0x7A: // UTF-8 string (four-byte uint32_t for n follow)
+            {
+                std::uint32_t len{};
+                return get_number(input_format_t::cbor, len) && get_string(input_format_t::cbor, len, result);
+            }
+
+            case 0x7B: // UTF-8 string (eight-byte uint64_t for n follow)
+            {
+                std::uint64_t len{};
+                return get_number(input_format_t::cbor, len) && get_string(input_format_t::cbor, len, result);
+            }
+
+            case 0x7F: // UTF-8 string (indefinite length)
+            {
+                while (get() != 0xFF)
+                {
+                    string_t chunk;
+                    if (!get_cbor_string(chunk))
+                    {
+                        return false;
+                    }
+                    result.append(chunk);
+                }
+                return true;
+            }
+
+            default:
+            {
+                auto last_token = get_token_string();
+                return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read,
+                                        exception_message(input_format_t::cbor, concat("expected length specification (0x60-0x7B) or indefinite string type (0x7F); last byte: 0x", last_token), "string"), nullptr));
+            }
+        }
+    }
+
+    /*!
+    @brief reads a CBOR byte array
+
+    This function first reads starting bytes to determine the expected
+    byte array length and then copies this number of bytes into the byte array.
+    Additionally, CBOR's byte arrays with indefinite lengths are supported.
+
+    @param[out] result  created byte array
+
+    @return whether byte array creation completed
+    */
+    bool get_cbor_binary(binary_t& result)
+    {
+        if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::cbor, "binary")))
+        {
+            return false;
+        }
+
+        switch (current)
+        {
+            // Binary data (0x00..0x17 bytes follow)
+            case 0x40:
+            case 0x41:
+            case 0x42:
+            case 0x43:
+            case 0x44:
+            case 0x45:
+            case 0x46:
+            case 0x47:
+            case 0x48:
+            case 0x49:
+            case 0x4A:
+            case 0x4B:
+            case 0x4C:
+            case 0x4D:
+            case 0x4E:
+            case 0x4F:
+            case 0x50:
+            case 0x51:
+            case 0x52:
+            case 0x53:
+            case 0x54:
+            case 0x55:
+            case 0x56:
+            case 0x57:
+            {
+                return get_binary(input_format_t::cbor, static_cast<unsigned int>(current) & 0x1Fu, result);
+            }
+
+            case 0x58: // Binary data (one-byte uint8_t for n follows)
+            {
+                std::uint8_t len{};
+                return get_number(input_format_t::cbor, len) &&
+                       get_binary(input_format_t::cbor, len, result);
+            }
+
+            case 0x59: // Binary data (two-byte uint16_t for n follow)
+            {
+                std::uint16_t len{};
+                return get_number(input_format_t::cbor, len) &&
+                       get_binary(input_format_t::cbor, len, result);
+            }
+
+            case 0x5A: // Binary data (four-byte uint32_t for n follow)
+            {
+                std::uint32_t len{};
+                return get_number(input_format_t::cbor, len) &&
+                       get_binary(input_format_t::cbor, len, result);
+            }
+
+            case 0x5B: // Binary data (eight-byte uint64_t for n follow)
+            {
+                std::uint64_t len{};
+                return get_number(input_format_t::cbor, len) &&
+                       get_binary(input_format_t::cbor, len, result);
+            }
+
+            case 0x5F: // Binary data (indefinite length)
+            {
+                while (get() != 0xFF)
+                {
+                    binary_t chunk;
+                    if (!get_cbor_binary(chunk))
+                    {
+                        return false;
+                    }
+                    result.insert(result.end(), chunk.begin(), chunk.end());
+                }
+                return true;
+            }
+
+            default:
+            {
+                auto last_token = get_token_string();
+                return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read,
+                                        exception_message(input_format_t::cbor, concat("expected length specification (0x40-0x5B) or indefinite binary array type (0x5F); last byte: 0x", last_token), "binary"), nullptr));
+            }
+        }
+    }
+
+    /*!
+    @param[in] len  the length of the array or detail::unknown_size() for an
+                    array of indefinite size
+    @param[in] tag_handler how CBOR tags should be treated
+    @return whether array creation completed
+    */
+    bool get_cbor_array(const std::size_t len,
+                        const cbor_tag_handler_t tag_handler)
+    {
+        if (JSON_HEDLEY_UNLIKELY(!sax->start_array(len)))
+        {
+            return false;
+        }
+
+        if (len != detail::unknown_size())
+        {
+            for (std::size_t i = 0; i < len; ++i)
+            {
+                if (JSON_HEDLEY_UNLIKELY(!parse_cbor_internal(true, tag_handler)))
+                {
+                    return false;
+                }
+            }
+        }
+        else
+        {
+            while (get() != 0xFF)
+            {
+                if (JSON_HEDLEY_UNLIKELY(!parse_cbor_internal(false, tag_handler)))
+                {
+                    return false;
+                }
+            }
+        }
+
+        return sax->end_array();
+    }
+
+    /*!
+    @param[in] len  the length of the object or detail::unknown_size() for an
+                    object of indefinite size
+    @param[in] tag_handler how CBOR tags should be treated
+    @return whether object creation completed
+    */
+    bool get_cbor_object(const std::size_t len,
+                         const cbor_tag_handler_t tag_handler)
+    {
+        if (JSON_HEDLEY_UNLIKELY(!sax->start_object(len)))
+        {
+            return false;
+        }
+
+        if (len != 0)
+        {
+            string_t key;
+            if (len != detail::unknown_size())
+            {
+                for (std::size_t i = 0; i < len; ++i)
+                {
+                    get();
+                    if (JSON_HEDLEY_UNLIKELY(!get_cbor_string(key) || !sax->key(key)))
+                    {
+                        return false;
+                    }
+
+                    if (JSON_HEDLEY_UNLIKELY(!parse_cbor_internal(true, tag_handler)))
+                    {
+                        return false;
+                    }
+                    key.clear();
+                }
+            }
+            else
+            {
+                while (get() != 0xFF)
+                {
+                    if (JSON_HEDLEY_UNLIKELY(!get_cbor_string(key) || !sax->key(key)))
+                    {
+                        return false;
+                    }
+
+                    if (JSON_HEDLEY_UNLIKELY(!parse_cbor_internal(true, tag_handler)))
+                    {
+                        return false;
+                    }
+                    key.clear();
+                }
+            }
+        }
+
+        return sax->end_object();
+    }
+
+    /////////////
+    // MsgPack //
+    /////////////
+
+    /*!
+    @return whether a valid MessagePack value was passed to the SAX parser
+    */
+    bool parse_msgpack_internal()
+    {
+        switch (get())
+        {
+            // EOF
+            case char_traits<char_type>::eof():
+                return unexpect_eof(input_format_t::msgpack, "value");
+
+            // positive fixint
+            case 0x00:
+            case 0x01:
+            case 0x02:
+            case 0x03:
+            case 0x04:
+            case 0x05:
+            case 0x06:
+            case 0x07:
+            case 0x08:
+            case 0x09:
+            case 0x0A:
+            case 0x0B:
+            case 0x0C:
+            case 0x0D:
+            case 0x0E:
+            case 0x0F:
+            case 0x10:
+            case 0x11:
+            case 0x12:
+            case 0x13:
+            case 0x14:
+            case 0x15:
+            case 0x16:
+            case 0x17:
+            case 0x18:
+            case 0x19:
+            case 0x1A:
+            case 0x1B:
+            case 0x1C:
+            case 0x1D:
+            case 0x1E:
+            case 0x1F:
+            case 0x20:
+            case 0x21:
+            case 0x22:
+            case 0x23:
+            case 0x24:
+            case 0x25:
+            case 0x26:
+            case 0x27:
+            case 0x28:
+            case 0x29:
+            case 0x2A:
+            case 0x2B:
+            case 0x2C:
+            case 0x2D:
+            case 0x2E:
+            case 0x2F:
+            case 0x30:
+            case 0x31:
+            case 0x32:
+            case 0x33:
+            case 0x34:
+            case 0x35:
+            case 0x36:
+            case 0x37:
+            case 0x38:
+            case 0x39:
+            case 0x3A:
+            case 0x3B:
+            case 0x3C:
+            case 0x3D:
+            case 0x3E:
+            case 0x3F:
+            case 0x40:
+            case 0x41:
+            case 0x42:
+            case 0x43:
+            case 0x44:
+            case 0x45:
+            case 0x46:
+            case 0x47:
+            case 0x48:
+            case 0x49:
+            case 0x4A:
+            case 0x4B:
+            case 0x4C:
+            case 0x4D:
+            case 0x4E:
+            case 0x4F:
+            case 0x50:
+            case 0x51:
+            case 0x52:
+            case 0x53:
+            case 0x54:
+            case 0x55:
+            case 0x56:
+            case 0x57:
+            case 0x58:
+            case 0x59:
+            case 0x5A:
+            case 0x5B:
+            case 0x5C:
+            case 0x5D:
+            case 0x5E:
+            case 0x5F:
+            case 0x60:
+            case 0x61:
+            case 0x62:
+            case 0x63:
+            case 0x64:
+            case 0x65:
+            case 0x66:
+            case 0x67:
+            case 0x68:
+            case 0x69:
+            case 0x6A:
+            case 0x6B:
+            case 0x6C:
+            case 0x6D:
+            case 0x6E:
+            case 0x6F:
+            case 0x70:
+            case 0x71:
+            case 0x72:
+            case 0x73:
+            case 0x74:
+            case 0x75:
+            case 0x76:
+            case 0x77:
+            case 0x78:
+            case 0x79:
+            case 0x7A:
+            case 0x7B:
+            case 0x7C:
+            case 0x7D:
+            case 0x7E:
+            case 0x7F:
+                return sax->number_unsigned(static_cast<number_unsigned_t>(current));
+
+            // fixmap
+            case 0x80:
+            case 0x81:
+            case 0x82:
+            case 0x83:
+            case 0x84:
+            case 0x85:
+            case 0x86:
+            case 0x87:
+            case 0x88:
+            case 0x89:
+            case 0x8A:
+            case 0x8B:
+            case 0x8C:
+            case 0x8D:
+            case 0x8E:
+            case 0x8F:
+                return get_msgpack_object(conditional_static_cast<std::size_t>(static_cast<unsigned int>(current) & 0x0Fu));
+
+            // fixarray
+            case 0x90:
+            case 0x91:
+            case 0x92:
+            case 0x93:
+            case 0x94:
+            case 0x95:
+            case 0x96:
+            case 0x97:
+            case 0x98:
+            case 0x99:
+            case 0x9A:
+            case 0x9B:
+            case 0x9C:
+            case 0x9D:
+            case 0x9E:
+            case 0x9F:
+                return get_msgpack_array(conditional_static_cast<std::size_t>(static_cast<unsigned int>(current) & 0x0Fu));
+
+            // fixstr
+            case 0xA0:
+            case 0xA1:
+            case 0xA2:
+            case 0xA3:
+            case 0xA4:
+            case 0xA5:
+            case 0xA6:
+            case 0xA7:
+            case 0xA8:
+            case 0xA9:
+            case 0xAA:
+            case 0xAB:
+            case 0xAC:
+            case 0xAD:
+            case 0xAE:
+            case 0xAF:
+            case 0xB0:
+            case 0xB1:
+            case 0xB2:
+            case 0xB3:
+            case 0xB4:
+            case 0xB5:
+            case 0xB6:
+            case 0xB7:
+            case 0xB8:
+            case 0xB9:
+            case 0xBA:
+            case 0xBB:
+            case 0xBC:
+            case 0xBD:
+            case 0xBE:
+            case 0xBF:
+            case 0xD9: // str 8
+            case 0xDA: // str 16
+            case 0xDB: // str 32
+            {
+                string_t s;
+                return get_msgpack_string(s) && sax->string(s);
+            }
+
+            case 0xC0: // nil
+                return sax->null();
+
+            case 0xC2: // false
+                return sax->boolean(false);
+
+            case 0xC3: // true
+                return sax->boolean(true);
+
+            case 0xC4: // bin 8
+            case 0xC5: // bin 16
+            case 0xC6: // bin 32
+            case 0xC7: // ext 8
+            case 0xC8: // ext 16
+            case 0xC9: // ext 32
+            case 0xD4: // fixext 1
+            case 0xD5: // fixext 2
+            case 0xD6: // fixext 4
+            case 0xD7: // fixext 8
+            case 0xD8: // fixext 16
+            {
+                binary_t b;
+                return get_msgpack_binary(b) && sax->binary(b);
+            }
+
+            case 0xCA: // float 32
+            {
+                float number{};
+                return get_number(input_format_t::msgpack, number) && sax->number_float(static_cast<number_float_t>(number), "");
+            }
+
+            case 0xCB: // float 64
+            {
+                double number{};
+                return get_number(input_format_t::msgpack, number) && sax->number_float(static_cast<number_float_t>(number), "");
+            }
+
+            case 0xCC: // uint 8
+            {
+                std::uint8_t number{};
+                return get_number(input_format_t::msgpack, number) && sax->number_unsigned(number);
+            }
+
+            case 0xCD: // uint 16
+            {
+                std::uint16_t number{};
+                return get_number(input_format_t::msgpack, number) && sax->number_unsigned(number);
+            }
+
+            case 0xCE: // uint 32
+            {
+                std::uint32_t number{};
+                return get_number(input_format_t::msgpack, number) && sax->number_unsigned(number);
+            }
+
+            case 0xCF: // uint 64
+            {
+                std::uint64_t number{};
+                return get_number(input_format_t::msgpack, number) && sax->number_unsigned(number);
+            }
+
+            case 0xD0: // int 8
+            {
+                std::int8_t number{};
+                return get_number(input_format_t::msgpack, number) && sax->number_integer(number);
+            }
+
+            case 0xD1: // int 16
+            {
+                std::int16_t number{};
+                return get_number(input_format_t::msgpack, number) && sax->number_integer(number);
+            }
+
+            case 0xD2: // int 32
+            {
+                std::int32_t number{};
+                return get_number(input_format_t::msgpack, number) && sax->number_integer(number);
+            }
+
+            case 0xD3: // int 64
+            {
+                std::int64_t number{};
+                return get_number(input_format_t::msgpack, number) && sax->number_integer(number);
+            }
+
+            case 0xDC: // array 16
+            {
+                std::uint16_t len{};
+                return get_number(input_format_t::msgpack, len) && get_msgpack_array(static_cast<std::size_t>(len));
+            }
+
+            case 0xDD: // array 32
+            {
+                std::uint32_t len{};
+                return get_number(input_format_t::msgpack, len) && get_msgpack_array(conditional_static_cast<std::size_t>(len));
+            }
+
+            case 0xDE: // map 16
+            {
+                std::uint16_t len{};
+                return get_number(input_format_t::msgpack, len) && get_msgpack_object(static_cast<std::size_t>(len));
+            }
+
+            case 0xDF: // map 32
+            {
+                std::uint32_t len{};
+                return get_number(input_format_t::msgpack, len) && get_msgpack_object(conditional_static_cast<std::size_t>(len));
+            }
+
+            // negative fixint
+            case 0xE0:
+            case 0xE1:
+            case 0xE2:
+            case 0xE3:
+            case 0xE4:
+            case 0xE5:
+            case 0xE6:
+            case 0xE7:
+            case 0xE8:
+            case 0xE9:
+            case 0xEA:
+            case 0xEB:
+            case 0xEC:
+            case 0xED:
+            case 0xEE:
+            case 0xEF:
+            case 0xF0:
+            case 0xF1:
+            case 0xF2:
+            case 0xF3:
+            case 0xF4:
+            case 0xF5:
+            case 0xF6:
+            case 0xF7:
+            case 0xF8:
+            case 0xF9:
+            case 0xFA:
+            case 0xFB:
+            case 0xFC:
+            case 0xFD:
+            case 0xFE:
+            case 0xFF:
+                return sax->number_integer(static_cast<std::int8_t>(current));
+
+            default: // anything else
+            {
+                auto last_token = get_token_string();
+                return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read,
+                                        exception_message(input_format_t::msgpack, concat("invalid byte: 0x", last_token), "value"), nullptr));
+            }
+        }
+    }
+
+    /*!
+    @brief reads a MessagePack string
+
+    This function first reads starting bytes to determine the expected
+    string length and then copies this number of bytes into a string.
+
+    @param[out] result  created string
+
+    @return whether string creation completed
+    */
+    bool get_msgpack_string(string_t& result)
+    {
+        if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::msgpack, "string")))
+        {
+            return false;
+        }
+
+        switch (current)
+        {
+            // fixstr
+            case 0xA0:
+            case 0xA1:
+            case 0xA2:
+            case 0xA3:
+            case 0xA4:
+            case 0xA5:
+            case 0xA6:
+            case 0xA7:
+            case 0xA8:
+            case 0xA9:
+            case 0xAA:
+            case 0xAB:
+            case 0xAC:
+            case 0xAD:
+            case 0xAE:
+            case 0xAF:
+            case 0xB0:
+            case 0xB1:
+            case 0xB2:
+            case 0xB3:
+            case 0xB4:
+            case 0xB5:
+            case 0xB6:
+            case 0xB7:
+            case 0xB8:
+            case 0xB9:
+            case 0xBA:
+            case 0xBB:
+            case 0xBC:
+            case 0xBD:
+            case 0xBE:
+            case 0xBF:
+            {
+                return get_string(input_format_t::msgpack, static_cast<unsigned int>(current) & 0x1Fu, result);
+            }
+
+            case 0xD9: // str 8
+            {
+                std::uint8_t len{};
+                return get_number(input_format_t::msgpack, len) && get_string(input_format_t::msgpack, len, result);
+            }
+
+            case 0xDA: // str 16
+            {
+                std::uint16_t len{};
+                return get_number(input_format_t::msgpack, len) && get_string(input_format_t::msgpack, len, result);
+            }
+
+            case 0xDB: // str 32
+            {
+                std::uint32_t len{};
+                return get_number(input_format_t::msgpack, len) && get_string(input_format_t::msgpack, len, result);
+            }
+
+            default:
+            {
+                auto last_token = get_token_string();
+                return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read,
+                                        exception_message(input_format_t::msgpack, concat("expected length specification (0xA0-0xBF, 0xD9-0xDB); last byte: 0x", last_token), "string"), nullptr));
+            }
+        }
+    }
+
+    /*!
+    @brief reads a MessagePack byte array
+
+    This function first reads starting bytes to determine the expected
+    byte array length and then copies this number of bytes into a byte array.
+
+    @param[out] result  created byte array
+
+    @return whether byte array creation completed
+    */
+    bool get_msgpack_binary(binary_t& result)
+    {
+        // helper function to set the subtype
+        auto assign_and_return_true = [&result](std::int8_t subtype)
+        {
+            result.set_subtype(static_cast<std::uint8_t>(subtype));
+            return true;
+        };
+
+        switch (current)
+        {
+            case 0xC4: // bin 8
+            {
+                std::uint8_t len{};
+                return get_number(input_format_t::msgpack, len) &&
+                       get_binary(input_format_t::msgpack, len, result);
+            }
+
+            case 0xC5: // bin 16
+            {
+                std::uint16_t len{};
+                return get_number(input_format_t::msgpack, len) &&
+                       get_binary(input_format_t::msgpack, len, result);
+            }
+
+            case 0xC6: // bin 32
+            {
+                std::uint32_t len{};
+                return get_number(input_format_t::msgpack, len) &&
+                       get_binary(input_format_t::msgpack, len, result);
+            }
+
+            case 0xC7: // ext 8
+            {
+                std::uint8_t len{};
+                std::int8_t subtype{};
+                return get_number(input_format_t::msgpack, len) &&
+                       get_number(input_format_t::msgpack, subtype) &&
+                       get_binary(input_format_t::msgpack, len, result) &&
+                       assign_and_return_true(subtype);
+            }
+
+            case 0xC8: // ext 16
+            {
+                std::uint16_t len{};
+                std::int8_t subtype{};
+                return get_number(input_format_t::msgpack, len) &&
+                       get_number(input_format_t::msgpack, subtype) &&
+                       get_binary(input_format_t::msgpack, len, result) &&
+                       assign_and_return_true(subtype);
+            }
+
+            case 0xC9: // ext 32
+            {
+                std::uint32_t len{};
+                std::int8_t subtype{};
+                return get_number(input_format_t::msgpack, len) &&
+                       get_number(input_format_t::msgpack, subtype) &&
+                       get_binary(input_format_t::msgpack, len, result) &&
+                       assign_and_return_true(subtype);
+            }
+
+            case 0xD4: // fixext 1
+            {
+                std::int8_t subtype{};
+                return get_number(input_format_t::msgpack, subtype) &&
+                       get_binary(input_format_t::msgpack, 1, result) &&
+                       assign_and_return_true(subtype);
+            }
+
+            case 0xD5: // fixext 2
+            {
+                std::int8_t subtype{};
+                return get_number(input_format_t::msgpack, subtype) &&
+                       get_binary(input_format_t::msgpack, 2, result) &&
+                       assign_and_return_true(subtype);
+            }
+
+            case 0xD6: // fixext 4
+            {
+                std::int8_t subtype{};
+                return get_number(input_format_t::msgpack, subtype) &&
+                       get_binary(input_format_t::msgpack, 4, result) &&
+                       assign_and_return_true(subtype);
+            }
+
+            case 0xD7: // fixext 8
+            {
+                std::int8_t subtype{};
+                return get_number(input_format_t::msgpack, subtype) &&
+                       get_binary(input_format_t::msgpack, 8, result) &&
+                       assign_and_return_true(subtype);
+            }
+
+            case 0xD8: // fixext 16
+            {
+                std::int8_t subtype{};
+                return get_number(input_format_t::msgpack, subtype) &&
+                       get_binary(input_format_t::msgpack, 16, result) &&
+                       assign_and_return_true(subtype);
+            }
+
+            default:           // LCOV_EXCL_LINE
+                return false;  // LCOV_EXCL_LINE
+        }
+    }
+
+    /*!
+    @param[in] len  the length of the array
+    @return whether array creation completed
+    */
+    bool get_msgpack_array(const std::size_t len)
+    {
+        if (JSON_HEDLEY_UNLIKELY(!sax->start_array(len)))
+        {
+            return false;
+        }
+
+        for (std::size_t i = 0; i < len; ++i)
+        {
+            if (JSON_HEDLEY_UNLIKELY(!parse_msgpack_internal()))
+            {
+                return false;
+            }
+        }
+
+        return sax->end_array();
+    }
+
+    /*!
+    @param[in] len  the length of the object
+    @return whether object creation completed
+    */
+    bool get_msgpack_object(const std::size_t len)
+    {
+        if (JSON_HEDLEY_UNLIKELY(!sax->start_object(len)))
+        {
+            return false;
+        }
+
+        string_t key;
+        for (std::size_t i = 0; i < len; ++i)
+        {
+            get();
+            if (JSON_HEDLEY_UNLIKELY(!get_msgpack_string(key) || !sax->key(key)))
+            {
+                return false;
+            }
+
+            if (JSON_HEDLEY_UNLIKELY(!parse_msgpack_internal()))
+            {
+                return false;
+            }
+            key.clear();
+        }
+
+        return sax->end_object();
+    }
+
+    ////////////
+    // UBJSON //
+    ////////////
+
+    /*!
+    @param[in] get_char  whether a new character should be retrieved from the
+                         input (true, default) or whether the last read
+                         character should be considered instead
+
+    @return whether a valid UBJSON value was passed to the SAX parser
+    */
+    bool parse_ubjson_internal(const bool get_char = true)
+    {
+        return get_ubjson_value(get_char ? get_ignore_noop() : current);
+    }
+
+    /*!
+    @brief reads a UBJSON string
+
+    This function is either called after reading the 'S' byte explicitly
+    indicating a string, or in case of an object key where the 'S' byte can be
+    left out.
+
+    @param[out] result   created string
+    @param[in] get_char  whether a new character should be retrieved from the
+                         input (true, default) or whether the last read
+                         character should be considered instead
+
+    @return whether string creation completed
+    */
+    bool get_ubjson_string(string_t& result, const bool get_char = true)
+    {
+        if (get_char)
+        {
+            get();  // TODO(niels): may we ignore N here?
+        }
+
+        if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format, "value")))
+        {
+            return false;
+        }
+
+        switch (current)
+        {
+            case 'U':
+            {
+                std::uint8_t len{};
+                return get_number(input_format, len) && get_string(input_format, len, result);
+            }
+
+            case 'i':
+            {
+                std::int8_t len{};
+                return get_number(input_format, len) && get_string(input_format, len, result);
+            }
+
+            case 'I':
+            {
+                std::int16_t len{};
+                return get_number(input_format, len) && get_string(input_format, len, result);
+            }
+
+            case 'l':
+            {
+                std::int32_t len{};
+                return get_number(input_format, len) && get_string(input_format, len, result);
+            }
+
+            case 'L':
+            {
+                std::int64_t len{};
+                return get_number(input_format, len) && get_string(input_format, len, result);
+            }
+
+            case 'u':
+            {
+                if (input_format != input_format_t::bjdata)
+                {
+                    break;
+                }
+                std::uint16_t len{};
+                return get_number(input_format, len) && get_string(input_format, len, result);
+            }
+
+            case 'm':
+            {
+                if (input_format != input_format_t::bjdata)
+                {
+                    break;
+                }
+                std::uint32_t len{};
+                return get_number(input_format, len) && get_string(input_format, len, result);
+            }
+
+            case 'M':
+            {
+                if (input_format != input_format_t::bjdata)
+                {
+                    break;
+                }
+                std::uint64_t len{};
+                return get_number(input_format, len) && get_string(input_format, len, result);
+            }
+
+            default:
+                break;
+        }
+        auto last_token = get_token_string();
+        std::string message;
+
+        if (input_format != input_format_t::bjdata)
+        {
+            message = "expected length type specification (U, i, I, l, L); last byte: 0x" + last_token;
+        }
+        else
+        {
+            message = "expected length type specification (U, i, u, I, m, l, M, L); last byte: 0x" + last_token;
+        }
+        return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format, message, "string"), nullptr));
+    }
+
+    /*!
+    @param[out] dim  an integer vector storing the ND array dimensions
+    @return whether reading ND array size vector is successful
+    */
+    bool get_ubjson_ndarray_size(std::vector<size_t>& dim)
+    {
+        std::pair<std::size_t, char_int_type> size_and_type;
+        size_t dimlen = 0;
+        bool no_ndarray = true;
+
+        if (JSON_HEDLEY_UNLIKELY(!get_ubjson_size_type(size_and_type, no_ndarray)))
+        {
+            return false;
+        }
+
+        if (size_and_type.first != npos)
+        {
+            if (size_and_type.second != 0)
+            {
+                if (size_and_type.second != 'N')
+                {
+                    for (std::size_t i = 0; i < size_and_type.first; ++i)
+                    {
+                        if (JSON_HEDLEY_UNLIKELY(!get_ubjson_size_value(dimlen, no_ndarray, size_and_type.second)))
+                        {
+                            return false;
+                        }
+                        dim.push_back(dimlen);
+                    }
+                }
+            }
+            else
+            {
+                for (std::size_t i = 0; i < size_and_type.first; ++i)
+                {
+                    if (JSON_HEDLEY_UNLIKELY(!get_ubjson_size_value(dimlen, no_ndarray)))
+                    {
+                        return false;
+                    }
+                    dim.push_back(dimlen);
+                }
+            }
+        }
+        else
+        {
+            while (current != ']')
+            {
+                if (JSON_HEDLEY_UNLIKELY(!get_ubjson_size_value(dimlen, no_ndarray, current)))
+                {
+                    return false;
+                }
+                dim.push_back(dimlen);
+                get_ignore_noop();
+            }
+        }
+        return true;
+    }
+
+    /*!
+    @param[out] result  determined size
+    @param[in,out] is_ndarray  for input, `true` means already inside an ndarray vector
+                               or ndarray dimension is not allowed; `false` means ndarray
+                               is allowed; for output, `true` means an ndarray is found;
+                               is_ndarray can only return `true` when its initial value
+                               is `false`
+    @param[in] prefix  type marker if already read, otherwise set to 0
+
+    @return whether size determination completed
+    */
+    bool get_ubjson_size_value(std::size_t& result, bool& is_ndarray, char_int_type prefix = 0)
+    {
+        if (prefix == 0)
+        {
+            prefix = get_ignore_noop();
+        }
+
+        switch (prefix)
+        {
+            case 'U':
+            {
+                std::uint8_t number{};
+                if (JSON_HEDLEY_UNLIKELY(!get_number(input_format, number)))
+                {
+                    return false;
+                }
+                result = static_cast<std::size_t>(number);
+                return true;
+            }
+
+            case 'i':
+            {
+                std::int8_t number{};
+                if (JSON_HEDLEY_UNLIKELY(!get_number(input_format, number)))
+                {
+                    return false;
+                }
+                if (number < 0)
+                {
+                    return sax->parse_error(chars_read, get_token_string(), parse_error::create(113, chars_read,
+                                            exception_message(input_format, "count in an optimized container must be positive", "size"), nullptr));
+                }
+                result = static_cast<std::size_t>(number); // NOLINT(bugprone-signed-char-misuse,cert-str34-c): number is not a char
+                return true;
+            }
+
+            case 'I':
+            {
+                std::int16_t number{};
+                if (JSON_HEDLEY_UNLIKELY(!get_number(input_format, number)))
+                {
+                    return false;
+                }
+                if (number < 0)
+                {
+                    return sax->parse_error(chars_read, get_token_string(), parse_error::create(113, chars_read,
+                                            exception_message(input_format, "count in an optimized container must be positive", "size"), nullptr));
+                }
+                result = static_cast<std::size_t>(number);
+                return true;
+            }
+
+            case 'l':
+            {
+                std::int32_t number{};
+                if (JSON_HEDLEY_UNLIKELY(!get_number(input_format, number)))
+                {
+                    return false;
+                }
+                if (number < 0)
+                {
+                    return sax->parse_error(chars_read, get_token_string(), parse_error::create(113, chars_read,
+                                            exception_message(input_format, "count in an optimized container must be positive", "size"), nullptr));
+                }
+                result = static_cast<std::size_t>(number);
+                return true;
+            }
+
+            case 'L':
+            {
+                std::int64_t number{};
+                if (JSON_HEDLEY_UNLIKELY(!get_number(input_format, number)))
+                {
+                    return false;
+                }
+                if (number < 0)
+                {
+                    return sax->parse_error(chars_read, get_token_string(), parse_error::create(113, chars_read,
+                                            exception_message(input_format, "count in an optimized container must be positive", "size"), nullptr));
+                }
+                if (!value_in_range_of<std::size_t>(number))
+                {
+                    return sax->parse_error(chars_read, get_token_string(), out_of_range::create(408,
+                                            exception_message(input_format, "integer value overflow", "size"), nullptr));
+                }
+                result = static_cast<std::size_t>(number);
+                return true;
+            }
+
+            case 'u':
+            {
+                if (input_format != input_format_t::bjdata)
+                {
+                    break;
+                }
+                std::uint16_t number{};
+                if (JSON_HEDLEY_UNLIKELY(!get_number(input_format, number)))
+                {
+                    return false;
+                }
+                result = static_cast<std::size_t>(number);
+                return true;
+            }
+
+            case 'm':
+            {
+                if (input_format != input_format_t::bjdata)
+                {
+                    break;
+                }
+                std::uint32_t number{};
+                if (JSON_HEDLEY_UNLIKELY(!get_number(input_format, number)))
+                {
+                    return false;
+                }
+                result = conditional_static_cast<std::size_t>(number);
+                return true;
+            }
+
+            case 'M':
+            {
+                if (input_format != input_format_t::bjdata)
+                {
+                    break;
+                }
+                std::uint64_t number{};
+                if (JSON_HEDLEY_UNLIKELY(!get_number(input_format, number)))
+                {
+                    return false;
+                }
+                if (!value_in_range_of<std::size_t>(number))
+                {
+                    return sax->parse_error(chars_read, get_token_string(), out_of_range::create(408,
+                                            exception_message(input_format, "integer value overflow", "size"), nullptr));
+                }
+                result = detail::conditional_static_cast<std::size_t>(number);
+                return true;
+            }
+
+            case '[':
+            {
+                if (input_format != input_format_t::bjdata)
+                {
+                    break;
+                }
+                if (is_ndarray) // ndarray dimensional vector can only contain integers, and can not embed another array
+                {
+                    return sax->parse_error(chars_read, get_token_string(), parse_error::create(113, chars_read, exception_message(input_format, "ndarray dimensional vector is not allowed", "size"), nullptr));
+                }
+                std::vector<size_t> dim;
+                if (JSON_HEDLEY_UNLIKELY(!get_ubjson_ndarray_size(dim)))
+                {
+                    return false;
+                }
+                if (dim.size() == 1 || (dim.size() == 2 && dim.at(0) == 1)) // return normal array size if 1D row vector
+                {
+                    result = dim.at(dim.size() - 1);
+                    return true;
+                }
+                if (!dim.empty())  // if ndarray, convert to an object in JData annotated array format
+                {
+                    for (auto i : dim) // test if any dimension in an ndarray is 0, if so, return a 1D empty container
+                    {
+                        if ( i == 0 )
+                        {
+                            result = 0;
+                            return true;
+                        }
+                    }
+
+                    string_t key = "_ArraySize_";
+                    if (JSON_HEDLEY_UNLIKELY(!sax->start_object(3) || !sax->key(key) || !sax->start_array(dim.size())))
+                    {
+                        return false;
+                    }
+                    result = 1;
+                    for (auto i : dim)
+                    {
+                        result *= i;
+                        if (result == 0 || result == npos) // because dim elements shall not have zeros, result = 0 means overflow happened; it also can't be npos as it is used to initialize size in get_ubjson_size_type()
+                        {
+                            return sax->parse_error(chars_read, get_token_string(), out_of_range::create(408, exception_message(input_format, "excessive ndarray size caused overflow", "size"), nullptr));
+                        }
+                        if (JSON_HEDLEY_UNLIKELY(!sax->number_unsigned(static_cast<number_unsigned_t>(i))))
+                        {
+                            return false;
+                        }
+                    }
+                    is_ndarray = true;
+                    return sax->end_array();
+                }
+                result = 0;
+                return true;
+            }
+
+            default:
+                break;
+        }
+        auto last_token = get_token_string();
+        std::string message;
+
+        if (input_format != input_format_t::bjdata)
+        {
+            message = "expected length type specification (U, i, I, l, L) after '#'; last byte: 0x" + last_token;
+        }
+        else
+        {
+            message = "expected length type specification (U, i, u, I, m, l, M, L) after '#'; last byte: 0x" + last_token;
+        }
+        return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format, message, "size"), nullptr));
+    }
+
+    /*!
+    @brief determine the type and size for a container
+
+    In the optimized UBJSON format, a type and a size can be provided to allow
+    for a more compact representation.
+
+    @param[out] result  pair of the size and the type
+    @param[in] inside_ndarray  whether the parser is parsing an ND array dimensional vector
+
+    @return whether pair creation completed
+    */
+    bool get_ubjson_size_type(std::pair<std::size_t, char_int_type>& result, bool inside_ndarray = false)
+    {
+        result.first = npos; // size
+        result.second = 0; // type
+        bool is_ndarray = false;
+
+        get_ignore_noop();
+
+        if (current == '$')
+        {
+            result.second = get();  // must not ignore 'N', because 'N' maybe the type
+            if (input_format == input_format_t::bjdata
+                    && JSON_HEDLEY_UNLIKELY(std::binary_search(bjd_optimized_type_markers.begin(), bjd_optimized_type_markers.end(), result.second)))
+            {
+                auto last_token = get_token_string();
+                return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read,
+                                        exception_message(input_format, concat("marker 0x", last_token, " is not a permitted optimized array type"), "type"), nullptr));
+            }
+
+            if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format, "type")))
+            {
+                return false;
+            }
+
+            get_ignore_noop();
+            if (JSON_HEDLEY_UNLIKELY(current != '#'))
+            {
+                if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format, "value")))
+                {
+                    return false;
+                }
+                auto last_token = get_token_string();
+                return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read,
+                                        exception_message(input_format, concat("expected '#' after type information; last byte: 0x", last_token), "size"), nullptr));
+            }
+
+            const bool is_error = get_ubjson_size_value(result.first, is_ndarray);
+            if (input_format == input_format_t::bjdata && is_ndarray)
+            {
+                if (inside_ndarray)
+                {
+                    return sax->parse_error(chars_read, get_token_string(), parse_error::create(112, chars_read,
+                                            exception_message(input_format, "ndarray can not be recursive", "size"), nullptr));
+                }
+                result.second |= (1 << 8); // use bit 8 to indicate ndarray, all UBJSON and BJData markers should be ASCII letters
+            }
+            return is_error;
+        }
+
+        if (current == '#')
+        {
+            const bool is_error = get_ubjson_size_value(result.first, is_ndarray);
+            if (input_format == input_format_t::bjdata && is_ndarray)
+            {
+                return sax->parse_error(chars_read, get_token_string(), parse_error::create(112, chars_read,
+                                        exception_message(input_format, "ndarray requires both type and size", "size"), nullptr));
+            }
+            return is_error;
+        }
+
+        return true;
+    }
+
+    /*!
+    @param prefix  the previously read or set type prefix
+    @return whether value creation completed
+    */
+    bool get_ubjson_value(const char_int_type prefix)
+    {
+        switch (prefix)
+        {
+            case char_traits<char_type>::eof():  // EOF
+                return unexpect_eof(input_format, "value");
+
+            case 'T':  // true
+                return sax->boolean(true);
+            case 'F':  // false
+                return sax->boolean(false);
+
+            case 'Z':  // null
+                return sax->null();
+
+            case 'B':  // byte
+            {
+                if (input_format != input_format_t::bjdata)
+                {
+                    break;
+                }
+                std::uint8_t number{};
+                return get_number(input_format, number) && sax->number_unsigned(number);
+            }
+
+            case 'U':
+            {
+                std::uint8_t number{};
+                return get_number(input_format, number) && sax->number_unsigned(number);
+            }
+
+            case 'i':
+            {
+                std::int8_t number{};
+                return get_number(input_format, number) && sax->number_integer(number);
+            }
+
+            case 'I':
+            {
+                std::int16_t number{};
+                return get_number(input_format, number) && sax->number_integer(number);
+            }
+
+            case 'l':
+            {
+                std::int32_t number{};
+                return get_number(input_format, number) && sax->number_integer(number);
+            }
+
+            case 'L':
+            {
+                std::int64_t number{};
+                return get_number(input_format, number) && sax->number_integer(number);
+            }
+
+            case 'u':
+            {
+                if (input_format != input_format_t::bjdata)
+                {
+                    break;
+                }
+                std::uint16_t number{};
+                return get_number(input_format, number) && sax->number_unsigned(number);
+            }
+
+            case 'm':
+            {
+                if (input_format != input_format_t::bjdata)
+                {
+                    break;
+                }
+                std::uint32_t number{};
+                return get_number(input_format, number) && sax->number_unsigned(number);
+            }
+
+            case 'M':
+            {
+                if (input_format != input_format_t::bjdata)
+                {
+                    break;
+                }
+                std::uint64_t number{};
+                return get_number(input_format, number) && sax->number_unsigned(number);
+            }
+
+            case 'h':
+            {
+                if (input_format != input_format_t::bjdata)
+                {
+                    break;
+                }
+                const auto byte1_raw = get();
+                if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format, "number")))
+                {
+                    return false;
+                }
+                const auto byte2_raw = get();
+                if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format, "number")))
+                {
+                    return false;
+                }
+
+                const auto byte1 = static_cast<unsigned char>(byte1_raw);
+                const auto byte2 = static_cast<unsigned char>(byte2_raw);
+
+                // code from RFC 7049, Appendix D, Figure 3:
+                // As half-precision floating-point numbers were only added
+                // to IEEE 754 in 2008, today's programming platforms often
+                // still only have limited support for them. It is very
+                // easy to include at least decoding support for them even
+                // without such support. An example of a small decoder for
+                // half-precision floating-point numbers in the C language
+                // is shown in Fig. 3.
+                const auto half = static_cast<unsigned int>((byte2 << 8u) + byte1);
+                const double val = [&half]
+                {
+                    const int exp = (half >> 10u) & 0x1Fu;
+                    const unsigned int mant = half & 0x3FFu;
+                    JSON_ASSERT(0 <= exp&& exp <= 32);
+                    JSON_ASSERT(mant <= 1024);
+                    switch (exp)
+                    {
+                        case 0:
+                            return std::ldexp(mant, -24);
+                        case 31:
+                            return (mant == 0)
+                            ? std::numeric_limits<double>::infinity()
+                            : std::numeric_limits<double>::quiet_NaN();
+                        default:
+                            return std::ldexp(mant + 1024, exp - 25);
+                    }
+                }();
+                return sax->number_float((half & 0x8000u) != 0
+                                         ? static_cast<number_float_t>(-val)
+                                         : static_cast<number_float_t>(val), "");
+            }
+
+            case 'd':
+            {
+                float number{};
+                return get_number(input_format, number) && sax->number_float(static_cast<number_float_t>(number), "");
+            }
+
+            case 'D':
+            {
+                double number{};
+                return get_number(input_format, number) && sax->number_float(static_cast<number_float_t>(number), "");
+            }
+
+            case 'H':
+            {
+                return get_ubjson_high_precision_number();
+            }
+
+            case 'C':  // char
+            {
+                get();
+                if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format, "char")))
+                {
+                    return false;
+                }
+                if (JSON_HEDLEY_UNLIKELY(current > 127))
+                {
+                    auto last_token = get_token_string();
+                    return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read,
+                                            exception_message(input_format, concat("byte after 'C' must be in range 0x00..0x7F; last byte: 0x", last_token), "char"), nullptr));
+                }
+                string_t s(1, static_cast<typename string_t::value_type>(current));
+                return sax->string(s);
+            }
+
+            case 'S':  // string
+            {
+                string_t s;
+                return get_ubjson_string(s) && sax->string(s);
+            }
+
+            case '[':  // array
+                return get_ubjson_array();
+
+            case '{':  // object
+                return get_ubjson_object();
+
+            default: // anything else
+                break;
+        }
+        auto last_token = get_token_string();
+        return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format, "invalid byte: 0x" + last_token, "value"), nullptr));
+    }
+
+    /*!
+    @return whether array creation completed
+    */
+    bool get_ubjson_array()
+    {
+        std::pair<std::size_t, char_int_type> size_and_type;
+        if (JSON_HEDLEY_UNLIKELY(!get_ubjson_size_type(size_and_type)))
+        {
+            return false;
+        }
+
+        // if bit-8 of size_and_type.second is set to 1, encode bjdata ndarray as an object in JData annotated array format (https://github.com/NeuroJSON/jdata):
+        // {"_ArrayType_" : "typeid", "_ArraySize_" : [n1, n2, ...], "_ArrayData_" : [v1, v2, ...]}
+
+        if (input_format == input_format_t::bjdata && size_and_type.first != npos && (size_and_type.second & (1 << 8)) != 0)
+        {
+            size_and_type.second &= ~(static_cast<char_int_type>(1) << 8);  // use bit 8 to indicate ndarray, here we remove the bit to restore the type marker
+            auto it = std::lower_bound(bjd_types_map.begin(), bjd_types_map.end(), size_and_type.second, [](const bjd_type & p, char_int_type t)
+            {
+                return p.first < t;
+            });
+            string_t key = "_ArrayType_";
+            if (JSON_HEDLEY_UNLIKELY(it == bjd_types_map.end() || it->first != size_and_type.second))
+            {
+                auto last_token = get_token_string();
+                return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read,
+                                        exception_message(input_format, "invalid byte: 0x" + last_token, "type"), nullptr));
+            }
+
+            string_t type = it->second; // sax->string() takes a reference
+            if (JSON_HEDLEY_UNLIKELY(!sax->key(key) || !sax->string(type)))
+            {
+                return false;
+            }
+
+            if (size_and_type.second == 'C' || size_and_type.second == 'B')
+            {
+                size_and_type.second = 'U';
+            }
+
+            key = "_ArrayData_";
+            if (JSON_HEDLEY_UNLIKELY(!sax->key(key) || !sax->start_array(size_and_type.first) ))
+            {
+                return false;
+            }
+
+            for (std::size_t i = 0; i < size_and_type.first; ++i)
+            {
+                if (JSON_HEDLEY_UNLIKELY(!get_ubjson_value(size_and_type.second)))
+                {
+                    return false;
+                }
+            }
+
+            return (sax->end_array() && sax->end_object());
+        }
+
+        // If BJData type marker is 'B' decode as binary
+        if (input_format == input_format_t::bjdata && size_and_type.first != npos && size_and_type.second == 'B')
+        {
+            binary_t result;
+            return get_binary(input_format, size_and_type.first, result) && sax->binary(result);
+        }
+
+        if (size_and_type.first != npos)
+        {
+            if (JSON_HEDLEY_UNLIKELY(!sax->start_array(size_and_type.first)))
+            {
+                return false;
+            }
+
+            if (size_and_type.second != 0)
+            {
+                if (size_and_type.second != 'N')
+                {
+                    for (std::size_t i = 0; i < size_and_type.first; ++i)
+                    {
+                        if (JSON_HEDLEY_UNLIKELY(!get_ubjson_value(size_and_type.second)))
+                        {
+                            return false;
+                        }
+                    }
+                }
+            }
+            else
+            {
+                for (std::size_t i = 0; i < size_and_type.first; ++i)
+                {
+                    if (JSON_HEDLEY_UNLIKELY(!parse_ubjson_internal()))
+                    {
+                        return false;
+                    }
+                }
+            }
+        }
+        else
+        {
+            if (JSON_HEDLEY_UNLIKELY(!sax->start_array(detail::unknown_size())))
+            {
+                return false;
+            }
+
+            while (current != ']')
+            {
+                if (JSON_HEDLEY_UNLIKELY(!parse_ubjson_internal(false)))
+                {
+                    return false;
+                }
+                get_ignore_noop();
+            }
+        }
+
+        return sax->end_array();
+    }
+
+    /*!
+    @return whether object creation completed
+    */
+    bool get_ubjson_object()
+    {
+        std::pair<std::size_t, char_int_type> size_and_type;
+        if (JSON_HEDLEY_UNLIKELY(!get_ubjson_size_type(size_and_type)))
+        {
+            return false;
+        }
+
+        // do not accept ND-array size in objects in BJData
+        if (input_format == input_format_t::bjdata && size_and_type.first != npos && (size_and_type.second & (1 << 8)) != 0)
+        {
+            auto last_token = get_token_string();
+            return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read,
+                                    exception_message(input_format, "BJData object does not support ND-array size in optimized format", "object"), nullptr));
+        }
+
+        string_t key;
+        if (size_and_type.first != npos)
+        {
+            if (JSON_HEDLEY_UNLIKELY(!sax->start_object(size_and_type.first)))
+            {
+                return false;
+            }
+
+            if (size_and_type.second != 0)
+            {
+                for (std::size_t i = 0; i < size_and_type.first; ++i)
+                {
+                    if (JSON_HEDLEY_UNLIKELY(!get_ubjson_string(key) || !sax->key(key)))
+                    {
+                        return false;
+                    }
+                    if (JSON_HEDLEY_UNLIKELY(!get_ubjson_value(size_and_type.second)))
+                    {
+                        return false;
+                    }
+                    key.clear();
+                }
+            }
+            else
+            {
+                for (std::size_t i = 0; i < size_and_type.first; ++i)
+                {
+                    if (JSON_HEDLEY_UNLIKELY(!get_ubjson_string(key) || !sax->key(key)))
+                    {
+                        return false;
+                    }
+                    if (JSON_HEDLEY_UNLIKELY(!parse_ubjson_internal()))
+                    {
+                        return false;
+                    }
+                    key.clear();
+                }
+            }
+        }
+        else
+        {
+            if (JSON_HEDLEY_UNLIKELY(!sax->start_object(detail::unknown_size())))
+            {
+                return false;
+            }
+
+            while (current != '}')
+            {
+                if (JSON_HEDLEY_UNLIKELY(!get_ubjson_string(key, false) || !sax->key(key)))
+                {
+                    return false;
+                }
+                if (JSON_HEDLEY_UNLIKELY(!parse_ubjson_internal()))
+                {
+                    return false;
+                }
+                get_ignore_noop();
+                key.clear();
+            }
+        }
+
+        return sax->end_object();
+    }
+
+    // Note, no reader for UBJSON binary types is implemented because they do
+    // not exist
+
+    bool get_ubjson_high_precision_number()
+    {
+        // get size of following number string
+        std::size_t size{};
+        bool no_ndarray = true;
+        auto res = get_ubjson_size_value(size, no_ndarray);
+        if (JSON_HEDLEY_UNLIKELY(!res))
+        {
+            return res;
+        }
+
+        // get number string
+        std::vector<char> number_vector;
+        for (std::size_t i = 0; i < size; ++i)
+        {
+            get();
+            if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format, "number")))
+            {
+                return false;
+            }
+            number_vector.push_back(static_cast<char>(current));
+        }
+
+        // parse number string
+        using ia_type = decltype(detail::input_adapter(number_vector));
+        auto number_lexer = detail::lexer<BasicJsonType, ia_type>(detail::input_adapter(number_vector), false);
+        const auto result_number = number_lexer.scan();
+        const auto number_string = number_lexer.get_token_string();
+        const auto result_remainder = number_lexer.scan();
+
+        using token_type = typename detail::lexer_base<BasicJsonType>::token_type;
+
+        if (JSON_HEDLEY_UNLIKELY(result_remainder != token_type::end_of_input))
+        {
+            return sax->parse_error(chars_read, number_string, parse_error::create(115, chars_read,
+                                    exception_message(input_format, concat("invalid number text: ", number_lexer.get_token_string()), "high-precision number"), nullptr));
+        }
+
+        switch (result_number)
+        {
+            case token_type::value_integer:
+                return sax->number_integer(number_lexer.get_number_integer());
+            case token_type::value_unsigned:
+                return sax->number_unsigned(number_lexer.get_number_unsigned());
+            case token_type::value_float:
+                return sax->number_float(number_lexer.get_number_float(), std::move(number_string));
+            case token_type::uninitialized:
+            case token_type::literal_true:
+            case token_type::literal_false:
+            case token_type::literal_null:
+            case token_type::value_string:
+            case token_type::begin_array:
+            case token_type::begin_object:
+            case token_type::end_array:
+            case token_type::end_object:
+            case token_type::name_separator:
+            case token_type::value_separator:
+            case token_type::parse_error:
+            case token_type::end_of_input:
+            case token_type::literal_or_value:
+            default:
+                return sax->parse_error(chars_read, number_string, parse_error::create(115, chars_read,
+                                        exception_message(input_format, concat("invalid number text: ", number_lexer.get_token_string()), "high-precision number"), nullptr));
+        }
+    }
+
+    ///////////////////////
+    // Utility functions //
+    ///////////////////////
+
+    /*!
+    @brief get next character from the input
+
+    This function provides the interface to the used input adapter. It does
+    not throw in case the input reached EOF, but returns a -'ve valued
+    `char_traits<char_type>::eof()` in that case.
+
+    @return character read from the input
+    */
+    char_int_type get()
+    {
+        ++chars_read;
+        return current = ia.get_character();
+    }
+
+    /*!
+    @brief get_to read into a primitive type
+
+    This function provides the interface to the used input adapter. It does
+    not throw in case the input reached EOF, but returns false instead
+
+    @return bool, whether the read was successful
+    */
+    template<class T>
+    bool get_to(T& dest, const input_format_t format, const char* context)
+    {
+        auto new_chars_read = ia.get_elements(&dest);
+        chars_read += new_chars_read;
+        if (JSON_HEDLEY_UNLIKELY(new_chars_read < sizeof(T)))
+        {
+            // in case of failure, advance position by 1 to report failing location
+            ++chars_read;
+            sax->parse_error(chars_read, "<end of file>", parse_error::create(110, chars_read, exception_message(format, "unexpected end of input", context), nullptr));
+            return false;
+        }
+        return true;
+    }
+
+    /*!
+    @return character read from the input after ignoring all 'N' entries
+    */
+    char_int_type get_ignore_noop()
+    {
+        do
+        {
+            get();
+        }
+        while (current == 'N');
+
+        return current;
+    }
+
+    template<class NumberType>
+    static void byte_swap(NumberType& number)
+    {
+        constexpr std::size_t sz = sizeof(number);
+#ifdef __cpp_lib_byteswap
+        if constexpr (sz == 1)
+        {
+            return;
+        }
+        if constexpr(std::is_integral_v<NumberType>)
+        {
+            number = std::byteswap(number);
+            return;
+        }
+#endif
+        auto* ptr = reinterpret_cast<std::uint8_t*>(&number);
+        for (std::size_t i = 0; i < sz / 2; ++i)
+        {
+            std::swap(ptr[i], ptr[sz - i - 1]);
+        }
+    }
+
+    /*
+    @brief read a number from the input
+
+    @tparam NumberType the type of the number
+    @param[in] format   the current format (for diagnostics)
+    @param[out] result  number of type @a NumberType
+
+    @return whether conversion completed
+
+    @note This function needs to respect the system's endianness, because
+          bytes in CBOR, MessagePack, and UBJSON are stored in network order
+          (big endian) and therefore need reordering on little endian systems.
+          On the other hand, BSON and BJData use little endian and should reorder
+          on big endian systems.
+    */
+    template<typename NumberType, bool InputIsLittleEndian = false>
+    bool get_number(const input_format_t format, NumberType& result)
+    {
+        // read in the original format
+
+        if (JSON_HEDLEY_UNLIKELY(!get_to(result, format, "number")))
+        {
+            return false;
+        }
+        if (is_little_endian != (InputIsLittleEndian || format == input_format_t::bjdata))
+        {
+            byte_swap(result);
+        }
+        return true;
+    }
+
+    /*!
+    @brief create a string by reading characters from the input
+
+    @tparam NumberType the type of the number
+    @param[in] format the current format (for diagnostics)
+    @param[in] len number of characters to read
+    @param[out] result string created by reading @a len bytes
+
+    @return whether string creation completed
+
+    @note We can not reserve @a len bytes for the result, because @a len
+          may be too large. Usually, @ref unexpect_eof() detects the end of
+          the input before we run out of string memory.
+    */
+    template<typename NumberType>
+    bool get_string(const input_format_t format,
+                    const NumberType len,
+                    string_t& result)
+    {
+        bool success = true;
+        for (NumberType i = 0; i < len; i++)
+        {
+            get();
+            if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(format, "string")))
+            {
+                success = false;
+                break;
+            }
+            result.push_back(static_cast<typename string_t::value_type>(current));
+        }
+        return success;
+    }
+
+    /*!
+    @brief create a byte array by reading bytes from the input
+
+    @tparam NumberType the type of the number
+    @param[in] format the current format (for diagnostics)
+    @param[in] len number of bytes to read
+    @param[out] result byte array created by reading @a len bytes
+
+    @return whether byte array creation completed
+
+    @note We can not reserve @a len bytes for the result, because @a len
+          may be too large. Usually, @ref unexpect_eof() detects the end of
+          the input before we run out of memory.
+    */
+    template<typename NumberType>
+    bool get_binary(const input_format_t format,
+                    const NumberType len,
+                    binary_t& result)
+    {
+        bool success = true;
+        for (NumberType i = 0; i < len; i++)
+        {
+            get();
+            if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(format, "binary")))
+            {
+                success = false;
+                break;
+            }
+            result.push_back(static_cast<std::uint8_t>(current));
+        }
+        return success;
+    }
+
+    /*!
+    @param[in] format   the current format (for diagnostics)
+    @param[in] context  further context information (for diagnostics)
+    @return whether the last read character is not EOF
+    */
+    JSON_HEDLEY_NON_NULL(3)
+    bool unexpect_eof(const input_format_t format, const char* context) const
+    {
+        if (JSON_HEDLEY_UNLIKELY(current == char_traits<char_type>::eof()))
+        {
+            return sax->parse_error(chars_read, "<end of file>",
+                                    parse_error::create(110, chars_read, exception_message(format, "unexpected end of input", context), nullptr));
+        }
+        return true;
+    }
+
+    /*!
+    @return a string representation of the last read byte
+    */
+    std::string get_token_string() const
+    {
+        std::array<char, 3> cr{{}};
+        static_cast<void>((std::snprintf)(cr.data(), cr.size(), "%.2hhX", static_cast<unsigned char>(current))); // NOLINT(cppcoreguidelines-pro-type-vararg,hicpp-vararg)
+        return std::string{cr.data()};
+    }
+
+    /*!
+    @param[in] format   the current format
+    @param[in] detail   a detailed error message
+    @param[in] context  further context information
+    @return a message string to use in the parse_error exceptions
+    */
+    std::string exception_message(const input_format_t format,
+                                  const std::string& detail,
+                                  const std::string& context) const
+    {
+        std::string error_msg = "syntax error while parsing ";
+
+        switch (format)
+        {
+            case input_format_t::cbor:
+                error_msg += "CBOR";
+                break;
+
+            case input_format_t::msgpack:
+                error_msg += "MessagePack";
+                break;
+
+            case input_format_t::ubjson:
+                error_msg += "UBJSON";
+                break;
+
+            case input_format_t::bson:
+                error_msg += "BSON";
+                break;
+
+            case input_format_t::bjdata:
+                error_msg += "BJData";
+                break;
+
+            case input_format_t::json: // LCOV_EXCL_LINE
+            default:            // LCOV_EXCL_LINE
+                JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
+        }
+
+        return concat(error_msg, ' ', context, ": ", detail);
+    }
+
+  private:
+    static JSON_INLINE_VARIABLE constexpr std::size_t npos = detail::unknown_size();
+
+    /// input adapter
+    InputAdapterType ia;
+
+    /// the current character
+    char_int_type current = char_traits<char_type>::eof();
+
+    /// the number of characters read
+    std::size_t chars_read = 0;
+
+    /// whether we can assume little endianness
+    const bool is_little_endian = little_endianness();
+
+    /// input format
+    const input_format_t input_format = input_format_t::json;
+
+    /// the SAX parser
+    json_sax_t* sax = nullptr;
+
+    // excluded markers in bjdata optimized type
+#define JSON_BINARY_READER_MAKE_BJD_OPTIMIZED_TYPE_MARKERS_ \
+    make_array<char_int_type>('F', 'H', 'N', 'S', 'T', 'Z', '[', '{')
+
+#define JSON_BINARY_READER_MAKE_BJD_TYPES_MAP_ \
+    make_array<bjd_type>(                      \
+    bjd_type{'B', "byte"},                     \
+    bjd_type{'C', "char"},                     \
+    bjd_type{'D', "double"},                   \
+    bjd_type{'I', "int16"},                    \
+    bjd_type{'L', "int64"},                    \
+    bjd_type{'M', "uint64"},                   \
+    bjd_type{'U', "uint8"},                    \
+    bjd_type{'d', "single"},                   \
+    bjd_type{'i', "int8"},                     \
+    bjd_type{'l', "int32"},                    \
+    bjd_type{'m', "uint32"},                   \
+    bjd_type{'u', "uint16"})
+
+  JSON_PRIVATE_UNLESS_TESTED:
+    // lookup tables
+    // NOLINTNEXTLINE(cppcoreguidelines-non-private-member-variables-in-classes)
+    const decltype(JSON_BINARY_READER_MAKE_BJD_OPTIMIZED_TYPE_MARKERS_) bjd_optimized_type_markers =
+        JSON_BINARY_READER_MAKE_BJD_OPTIMIZED_TYPE_MARKERS_;
+
+    using bjd_type = std::pair<char_int_type, string_t>;
+    // NOLINTNEXTLINE(cppcoreguidelines-non-private-member-variables-in-classes)
+    const decltype(JSON_BINARY_READER_MAKE_BJD_TYPES_MAP_) bjd_types_map =
+        JSON_BINARY_READER_MAKE_BJD_TYPES_MAP_;
+
+#undef JSON_BINARY_READER_MAKE_BJD_OPTIMIZED_TYPE_MARKERS_
+#undef JSON_BINARY_READER_MAKE_BJD_TYPES_MAP_
+};
+
+#ifndef JSON_HAS_CPP_17
+    template<typename BasicJsonType, typename InputAdapterType, typename SAX>
+    constexpr std::size_t binary_reader<BasicJsonType, InputAdapterType, SAX>::npos;
+#endif
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/input/input_adapters.hpp>
+
+// #include <nlohmann/detail/input/lexer.hpp>
+
+// #include <nlohmann/detail/input/parser.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013 - 2025 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <cmath> // isfinite
+#include <cstdint> // uint8_t
+#include <functional> // function
+#include <string> // string
+#include <utility> // move
+#include <vector> // vector
+
+// #include <nlohmann/detail/exceptions.hpp>
+
+// #include <nlohmann/detail/input/input_adapters.hpp>
+
+// #include <nlohmann/detail/input/json_sax.hpp>
+
+// #include <nlohmann/detail/input/lexer.hpp>
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/meta/is_sax.hpp>
+
+// #include <nlohmann/detail/string_concat.hpp>
+
+// #include <nlohmann/detail/value_t.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+////////////
+// parser //
+////////////
+
+enum class parse_event_t : std::uint8_t
+{
+    /// the parser read `{` and started to process a JSON object
+    object_start,
+    /// the parser read `}` and finished processing a JSON object
+    object_end,
+    /// the parser read `[` and started to process a JSON array
+    array_start,
+    /// the parser read `]` and finished processing a JSON array
+    array_end,
+    /// the parser read a key of a value in an object
+    key,
+    /// the parser finished reading a JSON value
+    value
+};
+
+template<typename BasicJsonType>
+using parser_callback_t =
+    std::function<bool(int /*depth*/, parse_event_t /*event*/, BasicJsonType& /*parsed*/)>;
+
+/*!
+@brief syntax analysis
+
+This class implements a recursive descent parser.
+*/
+template<typename BasicJsonType, typename InputAdapterType>
+class parser
+{
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+    using string_t = typename BasicJsonType::string_t;
+    using lexer_t = lexer<BasicJsonType, InputAdapterType>;
+    using token_type = typename lexer_t::token_type;
+
+  public:
+    /// a parser reading from an input adapter
+    explicit parser(InputAdapterType&& adapter,
+                    parser_callback_t<BasicJsonType> cb = nullptr,
+                    const bool allow_exceptions_ = true,
+                    const bool skip_comments = false)
+        : callback(std::move(cb))
+        , m_lexer(std::move(adapter), skip_comments)
+        , allow_exceptions(allow_exceptions_)
+    {
+        // read first token
+        get_token();
+    }
+
+    /*!
+    @brief public parser interface
+
+    @param[in] strict      whether to expect the last token to be EOF
+    @param[in,out] result  parsed JSON value
+
+    @throw parse_error.101 in case of an unexpected token
+    @throw parse_error.102 if to_unicode fails or surrogate error
+    @throw parse_error.103 if to_unicode fails
+    */
+    void parse(const bool strict, BasicJsonType& result)
+    {
+        if (callback)
+        {
+            json_sax_dom_callback_parser<BasicJsonType, InputAdapterType> sdp(result, callback, allow_exceptions, &m_lexer);
+            sax_parse_internal(&sdp);
+
+            // in strict mode, input must be completely read
+            if (strict && (get_token() != token_type::end_of_input))
+            {
+                sdp.parse_error(m_lexer.get_position(),
+                                m_lexer.get_token_string(),
+                                parse_error::create(101, m_lexer.get_position(),
+                                                    exception_message(token_type::end_of_input, "value"), nullptr));
+            }
+
+            // in case of an error, return discarded value
+            if (sdp.is_errored())
+            {
+                result = value_t::discarded;
+                return;
+            }
+
+            // set top-level value to null if it was discarded by the callback
+            // function
+            if (result.is_discarded())
+            {
+                result = nullptr;
+            }
+        }
+        else
+        {
+            json_sax_dom_parser<BasicJsonType, InputAdapterType> sdp(result, allow_exceptions, &m_lexer);
+            sax_parse_internal(&sdp);
+
+            // in strict mode, input must be completely read
+            if (strict && (get_token() != token_type::end_of_input))
+            {
+                sdp.parse_error(m_lexer.get_position(),
+                                m_lexer.get_token_string(),
+                                parse_error::create(101, m_lexer.get_position(), exception_message(token_type::end_of_input, "value"), nullptr));
+            }
+
+            // in case of an error, return discarded value
+            if (sdp.is_errored())
+            {
+                result = value_t::discarded;
+                return;
+            }
+        }
+
+        result.assert_invariant();
+    }
+
+    /*!
+    @brief public accept interface
+
+    @param[in] strict  whether to expect the last token to be EOF
+    @return whether the input is a proper JSON text
+    */
+    bool accept(const bool strict = true)
+    {
+        json_sax_acceptor<BasicJsonType> sax_acceptor;
+        return sax_parse(&sax_acceptor, strict);
+    }
+
+    template<typename SAX>
+    JSON_HEDLEY_NON_NULL(2)
+    bool sax_parse(SAX* sax, const bool strict = true)
+    {
+        (void)detail::is_sax_static_asserts<SAX, BasicJsonType> {};
+        const bool result = sax_parse_internal(sax);
+
+        // strict mode: next byte must be EOF
+        if (result && strict && (get_token() != token_type::end_of_input))
+        {
+            return sax->parse_error(m_lexer.get_position(),
+                                    m_lexer.get_token_string(),
+                                    parse_error::create(101, m_lexer.get_position(), exception_message(token_type::end_of_input, "value"), nullptr));
+        }
+
+        return result;
+    }
+
+  private:
+    template<typename SAX>
+    JSON_HEDLEY_NON_NULL(2)
+    bool sax_parse_internal(SAX* sax)
+    {
+        // stack to remember the hierarchy of structured values we are parsing
+        // true = array; false = object
+        std::vector<bool> states;
+        // value to avoid a goto (see comment where set to true)
+        bool skip_to_state_evaluation = false;
+
+        while (true)
+        {
+            if (!skip_to_state_evaluation)
+            {
+                // invariant: get_token() was called before each iteration
+                switch (last_token)
+                {
+                    case token_type::begin_object:
+                    {
+                        if (JSON_HEDLEY_UNLIKELY(!sax->start_object(detail::unknown_size())))
+                        {
+                            return false;
+                        }
+
+                        // closing } -> we are done
+                        if (get_token() == token_type::end_object)
+                        {
+                            if (JSON_HEDLEY_UNLIKELY(!sax->end_object()))
+                            {
+                                return false;
+                            }
+                            break;
+                        }
+
+                        // parse key
+                        if (JSON_HEDLEY_UNLIKELY(last_token != token_type::value_string))
+                        {
+                            return sax->parse_error(m_lexer.get_position(),
+                                                    m_lexer.get_token_string(),
+                                                    parse_error::create(101, m_lexer.get_position(), exception_message(token_type::value_string, "object key"), nullptr));
+                        }
+                        if (JSON_HEDLEY_UNLIKELY(!sax->key(m_lexer.get_string())))
+                        {
+                            return false;
+                        }
+
+                        // parse separator (:)
+                        if (JSON_HEDLEY_UNLIKELY(get_token() != token_type::name_separator))
+                        {
+                            return sax->parse_error(m_lexer.get_position(),
+                                                    m_lexer.get_token_string(),
+                                                    parse_error::create(101, m_lexer.get_position(), exception_message(token_type::name_separator, "object separator"), nullptr));
+                        }
+
+                        // remember we are now inside an object
+                        states.push_back(false);
+
+                        // parse values
+                        get_token();
+                        continue;
+                    }
+
+                    case token_type::begin_array:
+                    {
+                        if (JSON_HEDLEY_UNLIKELY(!sax->start_array(detail::unknown_size())))
+                        {
+                            return false;
+                        }
+
+                        // closing ] -> we are done
+                        if (get_token() == token_type::end_array)
+                        {
+                            if (JSON_HEDLEY_UNLIKELY(!sax->end_array()))
+                            {
+                                return false;
+                            }
+                            break;
+                        }
+
+                        // remember we are now inside an array
+                        states.push_back(true);
+
+                        // parse values (no need to call get_token)
+                        continue;
+                    }
+
+                    case token_type::value_float:
+                    {
+                        const auto res = m_lexer.get_number_float();
+
+                        if (JSON_HEDLEY_UNLIKELY(!std::isfinite(res)))
+                        {
+                            return sax->parse_error(m_lexer.get_position(),
+                                                    m_lexer.get_token_string(),
+                                                    out_of_range::create(406, concat("number overflow parsing '", m_lexer.get_token_string(), '\''), nullptr));
+                        }
+
+                        if (JSON_HEDLEY_UNLIKELY(!sax->number_float(res, m_lexer.get_string())))
+                        {
+                            return false;
+                        }
+
+                        break;
+                    }
+
+                    case token_type::literal_false:
+                    {
+                        if (JSON_HEDLEY_UNLIKELY(!sax->boolean(false)))
+                        {
+                            return false;
+                        }
+                        break;
+                    }
+
+                    case token_type::literal_null:
+                    {
+                        if (JSON_HEDLEY_UNLIKELY(!sax->null()))
+                        {
+                            return false;
+                        }
+                        break;
+                    }
+
+                    case token_type::literal_true:
+                    {
+                        if (JSON_HEDLEY_UNLIKELY(!sax->boolean(true)))
+                        {
+                            return false;
+                        }
+                        break;
+                    }
+
+                    case token_type::value_integer:
+                    {
+                        if (JSON_HEDLEY_UNLIKELY(!sax->number_integer(m_lexer.get_number_integer())))
+                        {
+                            return false;
+                        }
+                        break;
+                    }
+
+                    case token_type::value_string:
+                    {
+                        if (JSON_HEDLEY_UNLIKELY(!sax->string(m_lexer.get_string())))
+                        {
+                            return false;
+                        }
+                        break;
+                    }
+
+                    case token_type::value_unsigned:
+                    {
+                        if (JSON_HEDLEY_UNLIKELY(!sax->number_unsigned(m_lexer.get_number_unsigned())))
+                        {
+                            return false;
+                        }
+                        break;
+                    }
+
+                    case token_type::parse_error:
+                    {
+                        // using "uninitialized" to avoid "expected" message
+                        return sax->parse_error(m_lexer.get_position(),
+                                                m_lexer.get_token_string(),
+                                                parse_error::create(101, m_lexer.get_position(), exception_message(token_type::uninitialized, "value"), nullptr));
+                    }
+                    case token_type::end_of_input:
+                    {
+                        if (JSON_HEDLEY_UNLIKELY(m_lexer.get_position().chars_read_total == 1))
+                        {
+                            return sax->parse_error(m_lexer.get_position(),
+                                                    m_lexer.get_token_string(),
+                                                    parse_error::create(101, m_lexer.get_position(),
+                                                            "attempting to parse an empty input; check that your input string or stream contains the expected JSON", nullptr));
+                        }
+
+                        return sax->parse_error(m_lexer.get_position(),
+                                                m_lexer.get_token_string(),
+                                                parse_error::create(101, m_lexer.get_position(), exception_message(token_type::literal_or_value, "value"), nullptr));
+                    }
+                    case token_type::uninitialized:
+                    case token_type::end_array:
+                    case token_type::end_object:
+                    case token_type::name_separator:
+                    case token_type::value_separator:
+                    case token_type::literal_or_value:
+                    default: // the last token was unexpected
+                    {
+                        return sax->parse_error(m_lexer.get_position(),
+                                                m_lexer.get_token_string(),
+                                                parse_error::create(101, m_lexer.get_position(), exception_message(token_type::literal_or_value, "value"), nullptr));
+                    }
+                }
+            }
+            else
+            {
+                skip_to_state_evaluation = false;
+            }
+
+            // we reached this line after we successfully parsed a value
+            if (states.empty())
+            {
+                // empty stack: we reached the end of the hierarchy: done
+                return true;
+            }
+
+            if (states.back())  // array
+            {
+                // comma -> next value
+                if (get_token() == token_type::value_separator)
+                {
+                    // parse a new value
+                    get_token();
+                    continue;
+                }
+
+                // closing ]
+                if (JSON_HEDLEY_LIKELY(last_token == token_type::end_array))
+                {
+                    if (JSON_HEDLEY_UNLIKELY(!sax->end_array()))
+                    {
+                        return false;
+                    }
+
+                    // We are done with this array. Before we can parse a
+                    // new value, we need to evaluate the new state first.
+                    // By setting skip_to_state_evaluation to false, we
+                    // are effectively jumping to the beginning of this if.
+                    JSON_ASSERT(!states.empty());
+                    states.pop_back();
+                    skip_to_state_evaluation = true;
+                    continue;
+                }
+
+                return sax->parse_error(m_lexer.get_position(),
+                                        m_lexer.get_token_string(),
+                                        parse_error::create(101, m_lexer.get_position(), exception_message(token_type::end_array, "array"), nullptr));
+            }
+
+            // states.back() is false -> object
+
+            // comma -> next value
+            if (get_token() == token_type::value_separator)
+            {
+                // parse key
+                if (JSON_HEDLEY_UNLIKELY(get_token() != token_type::value_string))
+                {
+                    return sax->parse_error(m_lexer.get_position(),
+                                            m_lexer.get_token_string(),
+                                            parse_error::create(101, m_lexer.get_position(), exception_message(token_type::value_string, "object key"), nullptr));
+                }
+
+                if (JSON_HEDLEY_UNLIKELY(!sax->key(m_lexer.get_string())))
+                {
+                    return false;
+                }
+
+                // parse separator (:)
+                if (JSON_HEDLEY_UNLIKELY(get_token() != token_type::name_separator))
+                {
+                    return sax->parse_error(m_lexer.get_position(),
+                                            m_lexer.get_token_string(),
+                                            parse_error::create(101, m_lexer.get_position(), exception_message(token_type::name_separator, "object separator"), nullptr));
+                }
+
+                // parse values
+                get_token();
+                continue;
+            }
+
+            // closing }
+            if (JSON_HEDLEY_LIKELY(last_token == token_type::end_object))
+            {
+                if (JSON_HEDLEY_UNLIKELY(!sax->end_object()))
+                {
+                    return false;
+                }
+
+                // We are done with this object. Before we can parse a
+                // new value, we need to evaluate the new state first.
+                // By setting skip_to_state_evaluation to false, we
+                // are effectively jumping to the beginning of this if.
+                JSON_ASSERT(!states.empty());
+                states.pop_back();
+                skip_to_state_evaluation = true;
+                continue;
+            }
+
+            return sax->parse_error(m_lexer.get_position(),
+                                    m_lexer.get_token_string(),
+                                    parse_error::create(101, m_lexer.get_position(), exception_message(token_type::end_object, "object"), nullptr));
+        }
+    }
+
+    /// get next token from lexer
+    token_type get_token()
+    {
+        return last_token = m_lexer.scan();
+    }
+
+    std::string exception_message(const token_type expected, const std::string& context)
+    {
+        std::string error_msg = "syntax error ";
+
+        if (!context.empty())
+        {
+            error_msg += concat("while parsing ", context, ' ');
+        }
+
+        error_msg += "- ";
+
+        if (last_token == token_type::parse_error)
+        {
+            error_msg += concat(m_lexer.get_error_message(), "; last read: '",
+                                m_lexer.get_token_string(), '\'');
+        }
+        else
+        {
+            error_msg += concat("unexpected ", lexer_t::token_type_name(last_token));
+        }
+
+        if (expected != token_type::uninitialized)
+        {
+            error_msg += concat("; expected ", lexer_t::token_type_name(expected));
+        }
+
+        return error_msg;
+    }
+
+  private:
+    /// callback function
+    const parser_callback_t<BasicJsonType> callback = nullptr;
+    /// the type of the last read token
+    token_type last_token = token_type::uninitialized;
+    /// the lexer
+    lexer_t m_lexer;
+    /// whether to throw exceptions in case of errors
+    const bool allow_exceptions = true;
+};
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/iterators/internal_iterator.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013 - 2025 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+// #include <nlohmann/detail/abi_macros.hpp>
+
+// #include <nlohmann/detail/iterators/primitive_iterator.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013 - 2025 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <cstddef> // ptrdiff_t
+#include <limits>  // numeric_limits
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+/*
+@brief an iterator for primitive JSON types
+
+This class models an iterator for primitive JSON types (boolean, number,
+string). It's only purpose is to allow the iterator/const_iterator classes
+to "iterate" over primitive values. Internally, the iterator is modeled by
+a `difference_type` variable. Value begin_value (`0`) models the begin,
+end_value (`1`) models past the end.
+*/
+class primitive_iterator_t
+{
+  private:
+    using difference_type = std::ptrdiff_t;
+    static constexpr difference_type begin_value = 0;
+    static constexpr difference_type end_value = begin_value + 1;
+
+  JSON_PRIVATE_UNLESS_TESTED:
+    /// iterator as signed integer type
+    difference_type m_it = (std::numeric_limits<std::ptrdiff_t>::min)();
+
+  public:
+    constexpr difference_type get_value() const noexcept
+    {
+        return m_it;
+    }
+
+    /// set iterator to a defined beginning
+    void set_begin() noexcept
+    {
+        m_it = begin_value;
+    }
+
+    /// set iterator to a defined past the end
+    void set_end() noexcept
+    {
+        m_it = end_value;
+    }
+
+    /// return whether the iterator can be dereferenced
+    constexpr bool is_begin() const noexcept
+    {
+        return m_it == begin_value;
+    }
+
+    /// return whether the iterator is at end
+    constexpr bool is_end() const noexcept
+    {
+        return m_it == end_value;
+    }
+
+    friend constexpr bool operator==(primitive_iterator_t lhs, primitive_iterator_t rhs) noexcept
+    {
+        return lhs.m_it == rhs.m_it;
+    }
+
+    friend constexpr bool operator<(primitive_iterator_t lhs, primitive_iterator_t rhs) noexcept
+    {
+        return lhs.m_it < rhs.m_it;
+    }
+
+    primitive_iterator_t operator+(difference_type n) noexcept
+    {
+        auto result = *this;
+        result += n;
+        return result;
+    }
+
+    friend constexpr difference_type operator-(primitive_iterator_t lhs, primitive_iterator_t rhs) noexcept
+    {
+        return lhs.m_it - rhs.m_it;
+    }
+
+    primitive_iterator_t& operator++() noexcept
+    {
+        ++m_it;
+        return *this;
+    }
+
+    primitive_iterator_t operator++(int)& noexcept // NOLINT(cert-dcl21-cpp)
+    {
+        auto result = *this;
+        ++m_it;
+        return result;
+    }
+
+    primitive_iterator_t& operator--() noexcept
+    {
+        --m_it;
+        return *this;
+    }
+
+    primitive_iterator_t operator--(int)& noexcept // NOLINT(cert-dcl21-cpp)
+    {
+        auto result = *this;
+        --m_it;
+        return result;
+    }
+
+    primitive_iterator_t& operator+=(difference_type n) noexcept
+    {
+        m_it += n;
+        return *this;
+    }
+
+    primitive_iterator_t& operator-=(difference_type n) noexcept
+    {
+        m_it -= n;
+        return *this;
+    }
+};
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+/*!
+@brief an iterator value
+
+@note This structure could easily be a union, but MSVC currently does not allow
+unions members with complex constructors, see https://github.com/nlohmann/json/pull/105.
+*/
+template<typename BasicJsonType> struct internal_iterator
+{
+    /// iterator for JSON objects
+    typename BasicJsonType::object_t::iterator object_iterator {};
+    /// iterator for JSON arrays
+    typename BasicJsonType::array_t::iterator array_iterator {};
+    /// generic iterator for all other types
+    primitive_iterator_t primitive_iterator {};
+};
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/iterators/iter_impl.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013 - 2025 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <iterator> // iterator, random_access_iterator_tag, bidirectional_iterator_tag, advance, next
+#include <type_traits> // conditional, is_const, remove_const
+
+// #include <nlohmann/detail/exceptions.hpp>
+
+// #include <nlohmann/detail/iterators/internal_iterator.hpp>
+
+// #include <nlohmann/detail/iterators/primitive_iterator.hpp>
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/meta/cpp_future.hpp>
+
+// #include <nlohmann/detail/meta/type_traits.hpp>
+
+// #include <nlohmann/detail/value_t.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+// forward declare, to be able to friend it later on
+template<typename IteratorType> class iteration_proxy;
+template<typename IteratorType> class iteration_proxy_value;
+
+/*!
+@brief a template for a bidirectional iterator for the @ref basic_json class
+This class implements a both iterators (iterator and const_iterator) for the
+@ref basic_json class.
+@note An iterator is called *initialized* when a pointer to a JSON value has
+      been set (e.g., by a constructor or a copy assignment). If the iterator is
+      default-constructed, it is *uninitialized* and most methods are undefined.
+      **The library uses assertions to detect calls on uninitialized iterators.**
+@requirement The class satisfies the following concept requirements:
+-
+[BidirectionalIterator](https://en.cppreference.com/w/cpp/named_req/BidirectionalIterator):
+  The iterator that can be moved can be moved in both directions (i.e.
+  incremented and decremented).
+@since version 1.0.0, simplified in version 2.0.9, change to bidirectional
+       iterators in version 3.0.0 (see https://github.com/nlohmann/json/issues/593)
+*/
+template<typename BasicJsonType>
+class iter_impl // NOLINT(cppcoreguidelines-special-member-functions,hicpp-special-member-functions)
+{
+    /// the iterator with BasicJsonType of different const-ness
+    using other_iter_impl = iter_impl<typename std::conditional<std::is_const<BasicJsonType>::value, typename std::remove_const<BasicJsonType>::type, const BasicJsonType>::type>;
+    /// allow basic_json to access private members
+    friend other_iter_impl;
+    friend BasicJsonType;
+    friend iteration_proxy<iter_impl>;
+    friend iteration_proxy_value<iter_impl>;
+
+    using object_t = typename BasicJsonType::object_t;
+    using array_t = typename BasicJsonType::array_t;
+    // make sure BasicJsonType is basic_json or const basic_json
+    static_assert(is_basic_json<typename std::remove_const<BasicJsonType>::type>::value,
+                  "iter_impl only accepts (const) basic_json");
+    // superficial check for the LegacyBidirectionalIterator named requirement
+    static_assert(std::is_base_of<std::bidirectional_iterator_tag, std::bidirectional_iterator_tag>::value
+                  &&  std::is_base_of<std::bidirectional_iterator_tag, typename std::iterator_traits<typename array_t::iterator>::iterator_category>::value,
+                  "basic_json iterator assumes array and object type iterators satisfy the LegacyBidirectionalIterator named requirement.");
+
+  public:
+    /// The std::iterator class template (used as a base class to provide typedefs) is deprecated in C++17.
+    /// The C++ Standard has never required user-defined iterators to derive from std::iterator.
+    /// A user-defined iterator should provide publicly accessible typedefs named
+    /// iterator_category, value_type, difference_type, pointer, and reference.
+    /// Note that value_type is required to be non-const, even for constant iterators.
+    using iterator_category = std::bidirectional_iterator_tag;
+
+    /// the type of the values when the iterator is dereferenced
+    using value_type = typename BasicJsonType::value_type;
+    /// a type to represent differences between iterators
+    using difference_type = typename BasicJsonType::difference_type;
+    /// defines a pointer to the type iterated over (value_type)
+    using pointer = typename std::conditional<std::is_const<BasicJsonType>::value,
+          typename BasicJsonType::const_pointer,
+          typename BasicJsonType::pointer>::type;
+    /// defines a reference to the type iterated over (value_type)
+    using reference =
+        typename std::conditional<std::is_const<BasicJsonType>::value,
+        typename BasicJsonType::const_reference,
+        typename BasicJsonType::reference>::type;
+
+    iter_impl() = default;
+    ~iter_impl() = default;
+    iter_impl(iter_impl&&) noexcept = default;
+    iter_impl& operator=(iter_impl&&) noexcept = default;
+
+    /*!
+    @brief constructor for a given JSON instance
+    @param[in] object  pointer to a JSON object for this iterator
+    @pre object != nullptr
+    @post The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    explicit iter_impl(pointer object) noexcept : m_object(object)
+    {
+        JSON_ASSERT(m_object != nullptr);
+
+        switch (m_object->m_data.m_type)
+        {
+            case value_t::object:
+            {
+                m_it.object_iterator = typename object_t::iterator();
+                break;
+            }
+
+            case value_t::array:
+            {
+                m_it.array_iterator = typename array_t::iterator();
+                break;
+            }
+
+            case value_t::null:
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+            {
+                m_it.primitive_iterator = primitive_iterator_t();
+                break;
+            }
+        }
+    }
+
+    /*!
+    @note The conventional copy constructor and copy assignment are implicitly
+          defined. Combined with the following converting constructor and
+          assignment, they support: (1) copy from iterator to iterator, (2)
+          copy from const iterator to const iterator, and (3) conversion from
+          iterator to const iterator. However conversion from const iterator
+          to iterator is not defined.
+    */
+
+    /*!
+    @brief const copy constructor
+    @param[in] other const iterator to copy from
+    @note This copy constructor had to be defined explicitly to circumvent a bug
+          occurring on msvc v19.0 compiler (VS 2015) debug build. For more
+          information refer to: https://github.com/nlohmann/json/issues/1608
+    */
+    iter_impl(const iter_impl<const BasicJsonType>& other) noexcept
+        : m_object(other.m_object), m_it(other.m_it)
+    {}
+
+    /*!
+    @brief converting assignment
+    @param[in] other const iterator to copy from
+    @return const/non-const iterator
+    @note It is not checked whether @a other is initialized.
+    */
+    iter_impl& operator=(const iter_impl<const BasicJsonType>& other) noexcept
+    {
+        if (&other != this)
+        {
+            m_object = other.m_object;
+            m_it = other.m_it;
+        }
+        return *this;
+    }
+
+    /*!
+    @brief converting constructor
+    @param[in] other  non-const iterator to copy from
+    @note It is not checked whether @a other is initialized.
+    */
+    iter_impl(const iter_impl<typename std::remove_const<BasicJsonType>::type>& other) noexcept
+        : m_object(other.m_object), m_it(other.m_it)
+    {}
+
+    /*!
+    @brief converting assignment
+    @param[in] other  non-const iterator to copy from
+    @return const/non-const iterator
+    @note It is not checked whether @a other is initialized.
+    */
+    iter_impl& operator=(const iter_impl<typename std::remove_const<BasicJsonType>::type>& other) noexcept // NOLINT(cert-oop54-cpp)
+    {
+        m_object = other.m_object;
+        m_it = other.m_it;
+        return *this;
+    }
+
+  JSON_PRIVATE_UNLESS_TESTED:
+    /*!
+    @brief set the iterator to the first value
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    void set_begin() noexcept
+    {
+        JSON_ASSERT(m_object != nullptr);
+
+        switch (m_object->m_data.m_type)
+        {
+            case value_t::object:
+            {
+                m_it.object_iterator = m_object->m_data.m_value.object->begin();
+                break;
+            }
+
+            case value_t::array:
+            {
+                m_it.array_iterator = m_object->m_data.m_value.array->begin();
+                break;
+            }
+
+            case value_t::null:
+            {
+                // set to end so begin()==end() is true: null is empty
+                m_it.primitive_iterator.set_end();
+                break;
+            }
+
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+            {
+                m_it.primitive_iterator.set_begin();
+                break;
+            }
+        }
+    }
+
+    /*!
+    @brief set the iterator past the last value
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    void set_end() noexcept
+    {
+        JSON_ASSERT(m_object != nullptr);
+
+        switch (m_object->m_data.m_type)
+        {
+            case value_t::object:
+            {
+                m_it.object_iterator = m_object->m_data.m_value.object->end();
+                break;
+            }
+
+            case value_t::array:
+            {
+                m_it.array_iterator = m_object->m_data.m_value.array->end();
+                break;
+            }
+
+            case value_t::null:
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+            {
+                m_it.primitive_iterator.set_end();
+                break;
+            }
+        }
+    }
+
+  public:
+    /*!
+    @brief return a reference to the value pointed to by the iterator
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    reference operator*() const
+    {
+        JSON_ASSERT(m_object != nullptr);
+
+        switch (m_object->m_data.m_type)
+        {
+            case value_t::object:
+            {
+                JSON_ASSERT(m_it.object_iterator != m_object->m_data.m_value.object->end());
+                return m_it.object_iterator->second;
+            }
+
+            case value_t::array:
+            {
+                JSON_ASSERT(m_it.array_iterator != m_object->m_data.m_value.array->end());
+                return *m_it.array_iterator;
+            }
+
+            case value_t::null:
+                JSON_THROW(invalid_iterator::create(214, "cannot get value", m_object));
+
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+            {
+                if (JSON_HEDLEY_LIKELY(m_it.primitive_iterator.is_begin()))
+                {
+                    return *m_object;
+                }
+
+                JSON_THROW(invalid_iterator::create(214, "cannot get value", m_object));
+            }
+        }
+    }
+
+    /*!
+    @brief dereference the iterator
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    pointer operator->() const
+    {
+        JSON_ASSERT(m_object != nullptr);
+
+        switch (m_object->m_data.m_type)
+        {
+            case value_t::object:
+            {
+                JSON_ASSERT(m_it.object_iterator != m_object->m_data.m_value.object->end());
+                return &(m_it.object_iterator->second);
+            }
+
+            case value_t::array:
+            {
+                JSON_ASSERT(m_it.array_iterator != m_object->m_data.m_value.array->end());
+                return &*m_it.array_iterator;
+            }
+
+            case value_t::null:
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+            {
+                if (JSON_HEDLEY_LIKELY(m_it.primitive_iterator.is_begin()))
+                {
+                    return m_object;
+                }
+
+                JSON_THROW(invalid_iterator::create(214, "cannot get value", m_object));
+            }
+        }
+    }
+
+    /*!
+    @brief post-increment (it++)
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    iter_impl operator++(int)& // NOLINT(cert-dcl21-cpp)
+    {
+        auto result = *this;
+        ++(*this);
+        return result;
+    }
+
+    /*!
+    @brief pre-increment (++it)
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    iter_impl& operator++()
+    {
+        JSON_ASSERT(m_object != nullptr);
+
+        switch (m_object->m_data.m_type)
+        {
+            case value_t::object:
+            {
+                std::advance(m_it.object_iterator, 1);
+                break;
+            }
+
+            case value_t::array:
+            {
+                std::advance(m_it.array_iterator, 1);
+                break;
+            }
+
+            case value_t::null:
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+            {
+                ++m_it.primitive_iterator;
+                break;
+            }
+        }
+
+        return *this;
+    }
+
+    /*!
+    @brief post-decrement (it--)
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    iter_impl operator--(int)& // NOLINT(cert-dcl21-cpp)
+    {
+        auto result = *this;
+        --(*this);
+        return result;
+    }
+
+    /*!
+    @brief pre-decrement (--it)
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    iter_impl& operator--()
+    {
+        JSON_ASSERT(m_object != nullptr);
+
+        switch (m_object->m_data.m_type)
+        {
+            case value_t::object:
+            {
+                std::advance(m_it.object_iterator, -1);
+                break;
+            }
+
+            case value_t::array:
+            {
+                std::advance(m_it.array_iterator, -1);
+                break;
+            }
+
+            case value_t::null:
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+            {
+                --m_it.primitive_iterator;
+                break;
+            }
+        }
+
+        return *this;
+    }
+
+    /*!
+    @brief comparison: equal
+    @pre (1) Both iterators are initialized to point to the same object, or (2) both iterators are value-initialized.
+    */
+    template < typename IterImpl, detail::enable_if_t < (std::is_same<IterImpl, iter_impl>::value || std::is_same<IterImpl, other_iter_impl>::value), std::nullptr_t > = nullptr >
+    bool operator==(const IterImpl& other) const
+    {
+        // if objects are not the same, the comparison is undefined
+        if (JSON_HEDLEY_UNLIKELY(m_object != other.m_object))
+        {
+            JSON_THROW(invalid_iterator::create(212, "cannot compare iterators of different containers", m_object));
+        }
+
+        // value-initialized forward iterators can be compared, and must compare equal to other value-initialized iterators of the same type #4493
+        if (m_object == nullptr)
+        {
+            return true;
+        }
+
+        switch (m_object->m_data.m_type)
+        {
+            case value_t::object:
+                return (m_it.object_iterator == other.m_it.object_iterator);
+
+            case value_t::array:
+                return (m_it.array_iterator == other.m_it.array_iterator);
+
+            case value_t::null:
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+                return (m_it.primitive_iterator == other.m_it.primitive_iterator);
+        }
+    }
+
+    /*!
+    @brief comparison: not equal
+    @pre (1) Both iterators are initialized to point to the same object, or (2) both iterators are value-initialized.
+    */
+    template < typename IterImpl, detail::enable_if_t < (std::is_same<IterImpl, iter_impl>::value || std::is_same<IterImpl, other_iter_impl>::value), std::nullptr_t > = nullptr >
+    bool operator!=(const IterImpl& other) const
+    {
+        return !operator==(other);
+    }
+
+    /*!
+    @brief comparison: smaller
+    @pre (1) Both iterators are initialized to point to the same object, or (2) both iterators are value-initialized.
+    */
+    bool operator<(const iter_impl& other) const
+    {
+        // if objects are not the same, the comparison is undefined
+        if (JSON_HEDLEY_UNLIKELY(m_object != other.m_object))
+        {
+            JSON_THROW(invalid_iterator::create(212, "cannot compare iterators of different containers", m_object));
+        }
+
+        // value-initialized forward iterators can be compared, and must compare equal to other value-initialized iterators of the same type #4493
+        if (m_object == nullptr)
+        {
+            // the iterators are both value-initialized and are to be considered equal, but this function checks for smaller, so we return false
+            return false;
+        }
+
+        switch (m_object->m_data.m_type)
+        {
+            case value_t::object:
+                JSON_THROW(invalid_iterator::create(213, "cannot compare order of object iterators", m_object));
+
+            case value_t::array:
+                return (m_it.array_iterator < other.m_it.array_iterator);
+
+            case value_t::null:
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+                return (m_it.primitive_iterator < other.m_it.primitive_iterator);
+        }
+    }
+
+    /*!
+    @brief comparison: less than or equal
+    @pre (1) Both iterators are initialized to point to the same object, or (2) both iterators are value-initialized.
+    */
+    bool operator<=(const iter_impl& other) const
+    {
+        return !other.operator < (*this);
+    }
+
+    /*!
+    @brief comparison: greater than
+    @pre (1) Both iterators are initialized to point to the same object, or (2) both iterators are value-initialized.
+    */
+    bool operator>(const iter_impl& other) const
+    {
+        return !operator<=(other);
+    }
+
+    /*!
+    @brief comparison: greater than or equal
+    @pre (1) The iterator is initialized; i.e. `m_object != nullptr`, or (2) both iterators are value-initialized.
+    */
+    bool operator>=(const iter_impl& other) const
+    {
+        return !operator<(other);
+    }
+
+    /*!
+    @brief add to iterator
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    iter_impl& operator+=(difference_type i)
+    {
+        JSON_ASSERT(m_object != nullptr);
+
+        switch (m_object->m_data.m_type)
+        {
+            case value_t::object:
+                JSON_THROW(invalid_iterator::create(209, "cannot use offsets with object iterators", m_object));
+
+            case value_t::array:
+            {
+                std::advance(m_it.array_iterator, i);
+                break;
+            }
+
+            case value_t::null:
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+            {
+                m_it.primitive_iterator += i;
+                break;
+            }
+        }
+
+        return *this;
+    }
+
+    /*!
+    @brief subtract from iterator
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    iter_impl& operator-=(difference_type i)
+    {
+        return operator+=(-i);
+    }
+
+    /*!
+    @brief add to iterator
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    iter_impl operator+(difference_type i) const
+    {
+        auto result = *this;
+        result += i;
+        return result;
+    }
+
+    /*!
+    @brief addition of distance and iterator
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    friend iter_impl operator+(difference_type i, const iter_impl& it)
+    {
+        auto result = it;
+        result += i;
+        return result;
+    }
+
+    /*!
+    @brief subtract from iterator
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    iter_impl operator-(difference_type i) const
+    {
+        auto result = *this;
+        result -= i;
+        return result;
+    }
+
+    /*!
+    @brief return difference
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    difference_type operator-(const iter_impl& other) const
+    {
+        JSON_ASSERT(m_object != nullptr);
+
+        switch (m_object->m_data.m_type)
+        {
+            case value_t::object:
+                JSON_THROW(invalid_iterator::create(209, "cannot use offsets with object iterators", m_object));
+
+            case value_t::array:
+                return m_it.array_iterator - other.m_it.array_iterator;
+
+            case value_t::null:
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+                return m_it.primitive_iterator - other.m_it.primitive_iterator;
+        }
+    }
+
+    /*!
+    @brief access to successor
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    reference operator[](difference_type n) const
+    {
+        JSON_ASSERT(m_object != nullptr);
+
+        switch (m_object->m_data.m_type)
+        {
+            case value_t::object:
+                JSON_THROW(invalid_iterator::create(208, "cannot use operator[] for object iterators", m_object));
+
+            case value_t::array:
+                return *std::next(m_it.array_iterator, n);
+
+            case value_t::null:
+                JSON_THROW(invalid_iterator::create(214, "cannot get value", m_object));
+
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+            {
+                if (JSON_HEDLEY_LIKELY(m_it.primitive_iterator.get_value() == -n))
+                {
+                    return *m_object;
+                }
+
+                JSON_THROW(invalid_iterator::create(214, "cannot get value", m_object));
+            }
+        }
+    }
+
+    /*!
+    @brief return the key of an object iterator
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    const typename object_t::key_type& key() const
+    {
+        JSON_ASSERT(m_object != nullptr);
+
+        if (JSON_HEDLEY_LIKELY(m_object->is_object()))
+        {
+            return m_it.object_iterator->first;
+        }
+
+        JSON_THROW(invalid_iterator::create(207, "cannot use key() for non-object iterators", m_object));
+    }
+
+    /*!
+    @brief return the value of an iterator
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    reference value() const
+    {
+        return operator*();
+    }
+
+  JSON_PRIVATE_UNLESS_TESTED:
+    /// associated JSON instance
+    pointer m_object = nullptr;
+    /// the actual iterator of the associated instance
+    internal_iterator<typename std::remove_const<BasicJsonType>::type> m_it {};
+};
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/iterators/iteration_proxy.hpp>
+
+// #include <nlohmann/detail/iterators/json_reverse_iterator.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013 - 2025 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <cstddef> // ptrdiff_t
+#include <iterator> // reverse_iterator
+#include <utility> // declval
+
+// #include <nlohmann/detail/abi_macros.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+//////////////////////
+// reverse_iterator //
+//////////////////////
+
+/*!
+@brief a template for a reverse iterator class
+
+@tparam Base the base iterator type to reverse. Valid types are @ref
+iterator (to create @ref reverse_iterator) and @ref const_iterator (to
+create @ref const_reverse_iterator).
+
+@requirement The class satisfies the following concept requirements:
+-
+[BidirectionalIterator](https://en.cppreference.com/w/cpp/named_req/BidirectionalIterator):
+  The iterator that can be moved can be moved in both directions (i.e.
+  incremented and decremented).
+- [OutputIterator](https://en.cppreference.com/w/cpp/named_req/OutputIterator):
+  It is possible to write to the pointed-to element (only if @a Base is
+  @ref iterator).
+
+@since version 1.0.0
+*/
+template<typename Base>
+class json_reverse_iterator : public std::reverse_iterator<Base>
+{
+  public:
+    using difference_type = std::ptrdiff_t;
+    /// shortcut to the reverse iterator adapter
+    using base_iterator = std::reverse_iterator<Base>;
+    /// the reference type for the pointed-to element
+    using reference = typename Base::reference;
+
+    /// create reverse iterator from iterator
+    explicit json_reverse_iterator(const typename base_iterator::iterator_type& it) noexcept
+        : base_iterator(it) {}
+
+    /// create reverse iterator from base class
+    explicit json_reverse_iterator(const base_iterator& it) noexcept : base_iterator(it) {}
+
+    /// post-increment (it++)
+    json_reverse_iterator operator++(int)& // NOLINT(cert-dcl21-cpp)
+    {
+        return static_cast<json_reverse_iterator>(base_iterator::operator++(1));
+    }
+
+    /// pre-increment (++it)
+    json_reverse_iterator& operator++()
+    {
+        return static_cast<json_reverse_iterator&>(base_iterator::operator++());
+    }
+
+    /// post-decrement (it--)
+    json_reverse_iterator operator--(int)& // NOLINT(cert-dcl21-cpp)
+    {
+        return static_cast<json_reverse_iterator>(base_iterator::operator--(1));
+    }
+
+    /// pre-decrement (--it)
+    json_reverse_iterator& operator--()
+    {
+        return static_cast<json_reverse_iterator&>(base_iterator::operator--());
+    }
+
+    /// add to iterator
+    json_reverse_iterator& operator+=(difference_type i)
+    {
+        return static_cast<json_reverse_iterator&>(base_iterator::operator+=(i));
+    }
+
+    /// add to iterator
+    json_reverse_iterator operator+(difference_type i) const
+    {
+        return static_cast<json_reverse_iterator>(base_iterator::operator+(i));
+    }
+
+    /// subtract from iterator
+    json_reverse_iterator operator-(difference_type i) const
+    {
+        return static_cast<json_reverse_iterator>(base_iterator::operator-(i));
+    }
+
+    /// return difference
+    difference_type operator-(const json_reverse_iterator& other) const
+    {
+        return base_iterator(*this) - base_iterator(other);
+    }
+
+    /// access to successor
+    reference operator[](difference_type n) const
+    {
+        return *(this->operator+(n));
+    }
+
+    /// return the key of an object iterator
+    auto key() const -> decltype(std::declval<Base>().key())
+    {
+        auto it = --this->base();
+        return it.key();
+    }
+
+    /// return the value of an iterator
+    reference value() const
+    {
+        auto it = --this->base();
+        return it.operator * ();
+    }
+};
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/iterators/primitive_iterator.hpp>
+
+// #include <nlohmann/detail/json_custom_base_class.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013 - 2025 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <type_traits> // conditional, is_same
+
+// #include <nlohmann/detail/abi_macros.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+/*!
+@brief Default base class of the @ref basic_json class.
+
+So that the correct implementations of the copy / move ctors / assign operators
+of @ref basic_json do not require complex case distinctions
+(no base class / custom base class used as customization point),
+@ref basic_json always has a base class.
+By default, this class is used because it is empty and thus has no effect
+on the behavior of @ref basic_json.
+*/
+struct json_default_base {};
+
+template<class T>
+using json_base_class = typename std::conditional <
+                        std::is_same<T, void>::value,
+                        json_default_base,
+                        T
+                        >::type;
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/json_pointer.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013 - 2025 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <algorithm> // all_of
+#include <cctype> // isdigit
+#include <cerrno> // errno, ERANGE
+#include <cstdlib> // strtoull
+#ifndef JSON_NO_IO
+    #include <iosfwd> // ostream
+#endif  // JSON_NO_IO
+#include <limits> // max
+#include <numeric> // accumulate
+#include <string> // string
+#include <utility> // move
+#include <vector> // vector
+
+// #include <nlohmann/detail/exceptions.hpp>
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/string_concat.hpp>
+
+// #include <nlohmann/detail/string_escape.hpp>
+
+// #include <nlohmann/detail/value_t.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+
+/// @brief JSON Pointer defines a string syntax for identifying a specific value within a JSON document
+/// @sa https://json.nlohmann.me/api/json_pointer/
+template<typename RefStringType>
+class json_pointer
+{
+    // allow basic_json to access private members
+    NLOHMANN_BASIC_JSON_TPL_DECLARATION
+    friend class basic_json;
+
+    template<typename>
+    friend class json_pointer;
+
+    template<typename T>
+    struct string_t_helper
+    {
+        using type = T;
+    };
+
+    NLOHMANN_BASIC_JSON_TPL_DECLARATION
+    struct string_t_helper<NLOHMANN_BASIC_JSON_TPL>
+    {
+        using type = StringType;
+    };
+
+  public:
+    // for backwards compatibility accept BasicJsonType
+    using string_t = typename string_t_helper<RefStringType>::type;
+
+    /// @brief create JSON pointer
+    /// @sa https://json.nlohmann.me/api/json_pointer/json_pointer/
+    explicit json_pointer(const string_t& s = "")
+        : reference_tokens(split(s))
+    {}
+
+    /// @brief return a string representation of the JSON pointer
+    /// @sa https://json.nlohmann.me/api/json_pointer/to_string/
+    string_t to_string() const
+    {
+        return std::accumulate(reference_tokens.begin(), reference_tokens.end(),
+                               string_t{},
+                               [](const string_t& a, const string_t& b)
+        {
+            return detail::concat(a, '/', detail::escape(b));
+        });
+    }
+
+    /// @brief return a string representation of the JSON pointer
+    /// @sa https://json.nlohmann.me/api/json_pointer/operator_string/
+    JSON_HEDLEY_DEPRECATED_FOR(3.11.0, to_string())
+    operator string_t() const
+    {
+        return to_string();
+    }
+
+#ifndef JSON_NO_IO
+    /// @brief write string representation of the JSON pointer to stream
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_ltlt/
+    friend std::ostream& operator<<(std::ostream& o, const json_pointer& ptr)
+    {
+        o << ptr.to_string();
+        return o;
+    }
+#endif
+
+    /// @brief append another JSON pointer at the end of this JSON pointer
+    /// @sa https://json.nlohmann.me/api/json_pointer/operator_slasheq/
+    json_pointer& operator/=(const json_pointer& ptr)
+    {
+        reference_tokens.insert(reference_tokens.end(),
+                                ptr.reference_tokens.begin(),
+                                ptr.reference_tokens.end());
+        return *this;
+    }
+
+    /// @brief append an unescaped reference token at the end of this JSON pointer
+    /// @sa https://json.nlohmann.me/api/json_pointer/operator_slasheq/
+    json_pointer& operator/=(string_t token)
+    {
+        push_back(std::move(token));
+        return *this;
+    }
+
+    /// @brief append an array index at the end of this JSON pointer
+    /// @sa https://json.nlohmann.me/api/json_pointer/operator_slasheq/
+    json_pointer& operator/=(std::size_t array_idx)
+    {
+        return *this /= std::to_string(array_idx);
+    }
+
+    /// @brief create a new JSON pointer by appending the right JSON pointer at the end of the left JSON pointer
+    /// @sa https://json.nlohmann.me/api/json_pointer/operator_slash/
+    friend json_pointer operator/(const json_pointer& lhs,
+                                  const json_pointer& rhs)
+    {
+        return json_pointer(lhs) /= rhs;
+    }
+
+    /// @brief create a new JSON pointer by appending the unescaped token at the end of the JSON pointer
+    /// @sa https://json.nlohmann.me/api/json_pointer/operator_slash/
+    friend json_pointer operator/(const json_pointer& lhs, string_t token) // NOLINT(performance-unnecessary-value-param)
+    {
+        return json_pointer(lhs) /= std::move(token);
+    }
+
+    /// @brief create a new JSON pointer by appending the array-index-token at the end of the JSON pointer
+    /// @sa https://json.nlohmann.me/api/json_pointer/operator_slash/
+    friend json_pointer operator/(const json_pointer& lhs, std::size_t array_idx)
+    {
+        return json_pointer(lhs) /= array_idx;
+    }
+
+    /// @brief returns the parent of this JSON pointer
+    /// @sa https://json.nlohmann.me/api/json_pointer/parent_pointer/
+    json_pointer parent_pointer() const
+    {
+        if (empty())
+        {
+            return *this;
+        }
+
+        json_pointer res = *this;
+        res.pop_back();
+        return res;
+    }
+
+    /// @brief remove last reference token
+    /// @sa https://json.nlohmann.me/api/json_pointer/pop_back/
+    void pop_back()
+    {
+        if (JSON_HEDLEY_UNLIKELY(empty()))
+        {
+            JSON_THROW(detail::out_of_range::create(405, "JSON pointer has no parent", nullptr));
+        }
+
+        reference_tokens.pop_back();
+    }
+
+    /// @brief return last reference token
+    /// @sa https://json.nlohmann.me/api/json_pointer/back/
+    const string_t& back() const
+    {
+        if (JSON_HEDLEY_UNLIKELY(empty()))
+        {
+            JSON_THROW(detail::out_of_range::create(405, "JSON pointer has no parent", nullptr));
+        }
+
+        return reference_tokens.back();
+    }
+
+    /// @brief append an unescaped token at the end of the reference pointer
+    /// @sa https://json.nlohmann.me/api/json_pointer/push_back/
+    void push_back(const string_t& token)
+    {
+        reference_tokens.push_back(token);
+    }
+
+    /// @brief append an unescaped token at the end of the reference pointer
+    /// @sa https://json.nlohmann.me/api/json_pointer/push_back/
+    void push_back(string_t&& token)
+    {
+        reference_tokens.push_back(std::move(token));
+    }
+
+    /// @brief return whether pointer points to the root document
+    /// @sa https://json.nlohmann.me/api/json_pointer/empty/
+    bool empty() const noexcept
+    {
+        return reference_tokens.empty();
+    }
+
+  private:
+    /*!
+    @param[in] s  reference token to be converted into an array index
+
+    @return integer representation of @a s
+
+    @throw parse_error.106  if an array index begins with '0'
+    @throw parse_error.109  if an array index begins not with a digit
+    @throw out_of_range.404 if string @a s could not be converted to an integer
+    @throw out_of_range.410 if an array index exceeds size_type
+    */
+    template<typename BasicJsonType>
+    static typename BasicJsonType::size_type array_index(const string_t& s)
+    {
+        using size_type = typename BasicJsonType::size_type;
+
+        // error condition (cf. RFC 6901, Sect. 4)
+        if (JSON_HEDLEY_UNLIKELY(s.size() > 1 && s[0] == '0'))
+        {
+            JSON_THROW(detail::parse_error::create(106, 0, detail::concat("array index '", s, "' must not begin with '0'"), nullptr));
+        }
+
+        // error condition (cf. RFC 6901, Sect. 4)
+        if (JSON_HEDLEY_UNLIKELY(s.size() > 1 && !(s[0] >= '1' && s[0] <= '9')))
+        {
+            JSON_THROW(detail::parse_error::create(109, 0, detail::concat("array index '", s, "' is not a number"), nullptr));
+        }
+
+        const char* p = s.c_str();
+        char* p_end = nullptr; // NOLINT(misc-const-correctness)
+        errno = 0; // strtoull doesn't reset errno
+        const unsigned long long res = std::strtoull(p, &p_end, 10); // NOLINT(runtime/int)
+        if (p == p_end // invalid input or empty string
+                || errno == ERANGE // out of range
+                || JSON_HEDLEY_UNLIKELY(static_cast<std::size_t>(p_end - p) != s.size())) // incomplete read
+        {
+            JSON_THROW(detail::out_of_range::create(404, detail::concat("unresolved reference token '", s, "'"), nullptr));
+        }
+
+        // only triggered on special platforms (like 32bit), see also
+        // https://github.com/nlohmann/json/pull/2203
+        if (res >= static_cast<unsigned long long>((std::numeric_limits<size_type>::max)()))  // NOLINT(runtime/int)
+        {
+            JSON_THROW(detail::out_of_range::create(410, detail::concat("array index ", s, " exceeds size_type"), nullptr));   // LCOV_EXCL_LINE
+        }
+
+        return static_cast<size_type>(res);
+    }
+
+  JSON_PRIVATE_UNLESS_TESTED:
+    json_pointer top() const
+    {
+        if (JSON_HEDLEY_UNLIKELY(empty()))
+        {
+            JSON_THROW(detail::out_of_range::create(405, "JSON pointer has no parent", nullptr));
+        }
+
+        json_pointer result = *this;
+        result.reference_tokens = {reference_tokens[0]};
+        return result;
+    }
+
+  private:
+    /*!
+    @brief create and return a reference to the pointed to value
+
+    @complexity Linear in the number of reference tokens.
+
+    @throw parse_error.109 if array index is not a number
+    @throw type_error.313 if value cannot be unflattened
+    */
+    template<typename BasicJsonType>
+    BasicJsonType& get_and_create(BasicJsonType& j) const
+    {
+        auto* result = &j;
+
+        // in case no reference tokens exist, return a reference to the JSON value
+        // j which will be overwritten by a primitive value
+        for (const auto& reference_token : reference_tokens)
+        {
+            switch (result->type())
+            {
+                case detail::value_t::null:
+                {
+                    if (reference_token == "0")
+                    {
+                        // start a new array if reference token is 0
+                        result = &result->operator[](0);
+                    }
+                    else
+                    {
+                        // start a new object otherwise
+                        result = &result->operator[](reference_token);
+                    }
+                    break;
+                }
+
+                case detail::value_t::object:
+                {
+                    // create an entry in the object
+                    result = &result->operator[](reference_token);
+                    break;
+                }
+
+                case detail::value_t::array:
+                {
+                    // create an entry in the array
+                    result = &result->operator[](array_index<BasicJsonType>(reference_token));
+                    break;
+                }
+
+                /*
+                The following code is only reached if there exists a reference
+                token _and_ the current value is primitive. In this case, we have
+                an error situation, because primitive values may only occur as
+                single value; that is, with an empty list of reference tokens.
+                */
+                case detail::value_t::string:
+                case detail::value_t::boolean:
+                case detail::value_t::number_integer:
+                case detail::value_t::number_unsigned:
+                case detail::value_t::number_float:
+                case detail::value_t::binary:
+                case detail::value_t::discarded:
+                default:
+                    JSON_THROW(detail::type_error::create(313, "invalid value to unflatten", &j));
+            }
+        }
+
+        return *result;
+    }
+
+    /*!
+    @brief return a reference to the pointed to value
+
+    @note This version does not throw if a value is not present, but tries to
+          create nested values instead. For instance, calling this function
+          with pointer `"/this/that"` on a null value is equivalent to calling
+          `operator[]("this").operator[]("that")` on that value, effectively
+          changing the null value to an object.
+
+    @param[in] ptr  a JSON value
+
+    @return reference to the JSON value pointed to by the JSON pointer
+
+    @complexity Linear in the length of the JSON pointer.
+
+    @throw parse_error.106   if an array index begins with '0'
+    @throw parse_error.109   if an array index was not a number
+    @throw out_of_range.404  if the JSON pointer can not be resolved
+    */
+    template<typename BasicJsonType>
+    BasicJsonType& get_unchecked(BasicJsonType* ptr) const
+    {
+        for (const auto& reference_token : reference_tokens)
+        {
+            // convert null values to arrays or objects before continuing
+            if (ptr->is_null())
+            {
+                // check if reference token is a number
+                const bool nums =
+                    std::all_of(reference_token.begin(), reference_token.end(),
+                                [](const unsigned char x)
+                {
+                    return std::isdigit(x);
+                });
+
+                // change value to array for numbers or "-" or to object otherwise
+                *ptr = (nums || reference_token == "-")
+                       ? detail::value_t::array
+                       : detail::value_t::object;
+            }
+
+            switch (ptr->type())
+            {
+                case detail::value_t::object:
+                {
+                    // use unchecked object access
+                    ptr = &ptr->operator[](reference_token);
+                    break;
+                }
+
+                case detail::value_t::array:
+                {
+                    if (reference_token == "-")
+                    {
+                        // explicitly treat "-" as index beyond the end
+                        ptr = &ptr->operator[](ptr->m_data.m_value.array->size());
+                    }
+                    else
+                    {
+                        // convert array index to number; unchecked access
+                        ptr = &ptr->operator[](array_index<BasicJsonType>(reference_token));
+                    }
+                    break;
+                }
+
+                case detail::value_t::null:
+                case detail::value_t::string:
+                case detail::value_t::boolean:
+                case detail::value_t::number_integer:
+                case detail::value_t::number_unsigned:
+                case detail::value_t::number_float:
+                case detail::value_t::binary:
+                case detail::value_t::discarded:
+                default:
+                    JSON_THROW(detail::out_of_range::create(404, detail::concat("unresolved reference token '", reference_token, "'"), ptr));
+            }
+        }
+
+        return *ptr;
+    }
+
+    /*!
+    @throw parse_error.106   if an array index begins with '0'
+    @throw parse_error.109   if an array index was not a number
+    @throw out_of_range.402  if the array index '-' is used
+    @throw out_of_range.404  if the JSON pointer can not be resolved
+    */
+    template<typename BasicJsonType>
+    BasicJsonType& get_checked(BasicJsonType* ptr) const
+    {
+        for (const auto& reference_token : reference_tokens)
+        {
+            switch (ptr->type())
+            {
+                case detail::value_t::object:
+                {
+                    // note: at performs range check
+                    ptr = &ptr->at(reference_token);
+                    break;
+                }
+
+                case detail::value_t::array:
+                {
+                    if (JSON_HEDLEY_UNLIKELY(reference_token == "-"))
+                    {
+                        // "-" always fails the range check
+                        JSON_THROW(detail::out_of_range::create(402, detail::concat(
+                                "array index '-' (", std::to_string(ptr->m_data.m_value.array->size()),
+                                ") is out of range"), ptr));
+                    }
+
+                    // note: at performs range check
+                    ptr = &ptr->at(array_index<BasicJsonType>(reference_token));
+                    break;
+                }
+
+                case detail::value_t::null:
+                case detail::value_t::string:
+                case detail::value_t::boolean:
+                case detail::value_t::number_integer:
+                case detail::value_t::number_unsigned:
+                case detail::value_t::number_float:
+                case detail::value_t::binary:
+                case detail::value_t::discarded:
+                default:
+                    JSON_THROW(detail::out_of_range::create(404, detail::concat("unresolved reference token '", reference_token, "'"), ptr));
+            }
+        }
+
+        return *ptr;
+    }
+
+    /*!
+    @brief return a const reference to the pointed to value
+
+    @param[in] ptr  a JSON value
+
+    @return const reference to the JSON value pointed to by the JSON
+    pointer
+
+    @throw parse_error.106   if an array index begins with '0'
+    @throw parse_error.109   if an array index was not a number
+    @throw out_of_range.402  if the array index '-' is used
+    @throw out_of_range.404  if the JSON pointer can not be resolved
+    */
+    template<typename BasicJsonType>
+    const BasicJsonType& get_unchecked(const BasicJsonType* ptr) const
+    {
+        for (const auto& reference_token : reference_tokens)
+        {
+            switch (ptr->type())
+            {
+                case detail::value_t::object:
+                {
+                    // use unchecked object access
+                    ptr = &ptr->operator[](reference_token);
+                    break;
+                }
+
+                case detail::value_t::array:
+                {
+                    if (JSON_HEDLEY_UNLIKELY(reference_token == "-"))
+                    {
+                        // "-" cannot be used for const access
+                        JSON_THROW(detail::out_of_range::create(402, detail::concat("array index '-' (", std::to_string(ptr->m_data.m_value.array->size()), ") is out of range"), ptr));
+                    }
+
+                    // use unchecked array access
+                    ptr = &ptr->operator[](array_index<BasicJsonType>(reference_token));
+                    break;
+                }
+
+                case detail::value_t::null:
+                case detail::value_t::string:
+                case detail::value_t::boolean:
+                case detail::value_t::number_integer:
+                case detail::value_t::number_unsigned:
+                case detail::value_t::number_float:
+                case detail::value_t::binary:
+                case detail::value_t::discarded:
+                default:
+                    JSON_THROW(detail::out_of_range::create(404, detail::concat("unresolved reference token '", reference_token, "'"), ptr));
+            }
+        }
+
+        return *ptr;
+    }
+
+    /*!
+    @throw parse_error.106   if an array index begins with '0'
+    @throw parse_error.109   if an array index was not a number
+    @throw out_of_range.402  if the array index '-' is used
+    @throw out_of_range.404  if the JSON pointer can not be resolved
+    */
+    template<typename BasicJsonType>
+    const BasicJsonType& get_checked(const BasicJsonType* ptr) const
+    {
+        for (const auto& reference_token : reference_tokens)
+        {
+            switch (ptr->type())
+            {
+                case detail::value_t::object:
+                {
+                    // note: at performs range check
+                    ptr = &ptr->at(reference_token);
+                    break;
+                }
+
+                case detail::value_t::array:
+                {
+                    if (JSON_HEDLEY_UNLIKELY(reference_token == "-"))
+                    {
+                        // "-" always fails the range check
+                        JSON_THROW(detail::out_of_range::create(402, detail::concat(
+                                "array index '-' (", std::to_string(ptr->m_data.m_value.array->size()),
+                                ") is out of range"), ptr));
+                    }
+
+                    // note: at performs range check
+                    ptr = &ptr->at(array_index<BasicJsonType>(reference_token));
+                    break;
+                }
+
+                case detail::value_t::null:
+                case detail::value_t::string:
+                case detail::value_t::boolean:
+                case detail::value_t::number_integer:
+                case detail::value_t::number_unsigned:
+                case detail::value_t::number_float:
+                case detail::value_t::binary:
+                case detail::value_t::discarded:
+                default:
+                    JSON_THROW(detail::out_of_range::create(404, detail::concat("unresolved reference token '", reference_token, "'"), ptr));
+            }
+        }
+
+        return *ptr;
+    }
+
+    /*!
+    @throw parse_error.106   if an array index begins with '0'
+    @throw parse_error.109   if an array index was not a number
+    */
+    template<typename BasicJsonType>
+    bool contains(const BasicJsonType* ptr) const
+    {
+        for (const auto& reference_token : reference_tokens)
+        {
+            switch (ptr->type())
+            {
+                case detail::value_t::object:
+                {
+                    if (!ptr->contains(reference_token))
+                    {
+                        // we did not find the key in the object
+                        return false;
+                    }
+
+                    ptr = &ptr->operator[](reference_token);
+                    break;
+                }
+
+                case detail::value_t::array:
+                {
+                    if (JSON_HEDLEY_UNLIKELY(reference_token == "-"))
+                    {
+                        // "-" always fails the range check
+                        return false;
+                    }
+                    if (JSON_HEDLEY_UNLIKELY(reference_token.size() == 1 && !("0" <= reference_token && reference_token <= "9")))
+                    {
+                        // invalid char
+                        return false;
+                    }
+                    if (JSON_HEDLEY_UNLIKELY(reference_token.size() > 1))
+                    {
+                        if (JSON_HEDLEY_UNLIKELY(!('1' <= reference_token[0] && reference_token[0] <= '9')))
+                        {
+                            // first char should be between '1' and '9'
+                            return false;
+                        }
+                        for (std::size_t i = 1; i < reference_token.size(); i++)
+                        {
+                            if (JSON_HEDLEY_UNLIKELY(!('0' <= reference_token[i] && reference_token[i] <= '9')))
+                            {
+                                // other char should be between '0' and '9'
+                                return false;
+                            }
+                        }
+                    }
+
+                    const auto idx = array_index<BasicJsonType>(reference_token);
+                    if (idx >= ptr->size())
+                    {
+                        // index out of range
+                        return false;
+                    }
+
+                    ptr = &ptr->operator[](idx);
+                    break;
+                }
+
+                case detail::value_t::null:
+                case detail::value_t::string:
+                case detail::value_t::boolean:
+                case detail::value_t::number_integer:
+                case detail::value_t::number_unsigned:
+                case detail::value_t::number_float:
+                case detail::value_t::binary:
+                case detail::value_t::discarded:
+                default:
+                {
+                    // we do not expect primitive values if there is still a
+                    // reference token to process
+                    return false;
+                }
+            }
+        }
+
+        // no reference token left means we found a primitive value
+        return true;
+    }
+
+    /*!
+    @brief split the string input to reference tokens
+
+    @note This function is only called by the json_pointer constructor.
+          All exceptions below are documented there.
+
+    @throw parse_error.107  if the pointer is not empty or begins with '/'
+    @throw parse_error.108  if character '~' is not followed by '0' or '1'
+    */
+    static std::vector<string_t> split(const string_t& reference_string)
+    {
+        std::vector<string_t> result;
+
+        // special case: empty reference string -> no reference tokens
+        if (reference_string.empty())
+        {
+            return result;
+        }
+
+        // check if nonempty reference string begins with slash
+        if (JSON_HEDLEY_UNLIKELY(reference_string[0] != '/'))
+        {
+            JSON_THROW(detail::parse_error::create(107, 1, detail::concat("JSON pointer must be empty or begin with '/' - was: '", reference_string, "'"), nullptr));
+        }
+
+        // extract the reference tokens:
+        // - slash: position of the last read slash (or end of string)
+        // - start: position after the previous slash
+        for (
+            // search for the first slash after the first character
+            std::size_t slash = reference_string.find_first_of('/', 1),
+            // set the beginning of the first reference token
+            start = 1;
+            // we can stop if start == 0 (if slash == string_t::npos)
+            start != 0;
+            // set the beginning of the next reference token
+            // (will eventually be 0 if slash == string_t::npos)
+            start = (slash == string_t::npos) ? 0 : slash + 1,
+            // find next slash
+            slash = reference_string.find_first_of('/', start))
+        {
+            // use the text between the beginning of the reference token
+            // (start) and the last slash (slash).
+            auto reference_token = reference_string.substr(start, slash - start);
+
+            // check reference tokens are properly escaped
+            for (std::size_t pos = reference_token.find_first_of('~');
+                    pos != string_t::npos;
+                    pos = reference_token.find_first_of('~', pos + 1))
+            {
+                JSON_ASSERT(reference_token[pos] == '~');
+
+                // ~ must be followed by 0 or 1
+                if (JSON_HEDLEY_UNLIKELY(pos == reference_token.size() - 1 ||
+                                         (reference_token[pos + 1] != '0' &&
+                                          reference_token[pos + 1] != '1')))
+                {
+                    JSON_THROW(detail::parse_error::create(108, 0, "escape character '~' must be followed with '0' or '1'", nullptr));
+                }
+            }
+
+            // finally, store the reference token
+            detail::unescape(reference_token);
+            result.push_back(reference_token);
+        }
+
+        return result;
+    }
+
+  private:
+    /*!
+    @param[in] reference_string  the reference string to the current value
+    @param[in] value             the value to consider
+    @param[in,out] result        the result object to insert values to
+
+    @note Empty objects or arrays are flattened to `null`.
+    */
+    template<typename BasicJsonType>
+    static void flatten(const string_t& reference_string,
+                        const BasicJsonType& value,
+                        BasicJsonType& result)
+    {
+        switch (value.type())
+        {
+            case detail::value_t::array:
+            {
+                if (value.m_data.m_value.array->empty())
+                {
+                    // flatten empty array as null
+                    result[reference_string] = nullptr;
+                }
+                else
+                {
+                    // iterate array and use index as reference string
+                    for (std::size_t i = 0; i < value.m_data.m_value.array->size(); ++i)
+                    {
+                        flatten(detail::concat<string_t>(reference_string, '/', std::to_string(i)),
+                                value.m_data.m_value.array->operator[](i), result);
+                    }
+                }
+                break;
+            }
+
+            case detail::value_t::object:
+            {
+                if (value.m_data.m_value.object->empty())
+                {
+                    // flatten empty object as null
+                    result[reference_string] = nullptr;
+                }
+                else
+                {
+                    // iterate object and use keys as reference string
+                    for (const auto& element : *value.m_data.m_value.object)
+                    {
+                        flatten(detail::concat<string_t>(reference_string, '/', detail::escape(element.first)), element.second, result);
+                    }
+                }
+                break;
+            }
+
+            case detail::value_t::null:
+            case detail::value_t::string:
+            case detail::value_t::boolean:
+            case detail::value_t::number_integer:
+            case detail::value_t::number_unsigned:
+            case detail::value_t::number_float:
+            case detail::value_t::binary:
+            case detail::value_t::discarded:
+            default:
+            {
+                // add primitive value with its reference string
+                result[reference_string] = value;
+                break;
+            }
+        }
+    }
+
+    /*!
+    @param[in] value  flattened JSON
+
+    @return unflattened JSON
+
+    @throw parse_error.109 if array index is not a number
+    @throw type_error.314  if value is not an object
+    @throw type_error.315  if object values are not primitive
+    @throw type_error.313  if value cannot be unflattened
+    */
+    template<typename BasicJsonType>
+    static BasicJsonType
+    unflatten(const BasicJsonType& value)
+    {
+        if (JSON_HEDLEY_UNLIKELY(!value.is_object()))
+        {
+            JSON_THROW(detail::type_error::create(314, "only objects can be unflattened", &value));
+        }
+
+        BasicJsonType result;
+
+        // iterate the JSON object values
+        for (const auto& element : *value.m_data.m_value.object)
+        {
+            if (JSON_HEDLEY_UNLIKELY(!element.second.is_primitive()))
+            {
+                JSON_THROW(detail::type_error::create(315, "values in object must be primitive", &element.second));
+            }
+
+            // assign value to reference pointed to by JSON pointer; Note that if
+            // the JSON pointer is "" (i.e., points to the whole value), function
+            // get_and_create returns a reference to result itself. An assignment
+            // will then create a primitive value.
+            json_pointer(element.first).get_and_create(result) = element.second;
+        }
+
+        return result;
+    }
+
+    // can't use conversion operator because of ambiguity
+    json_pointer<string_t> convert() const&
+    {
+        json_pointer<string_t> result;
+        result.reference_tokens = reference_tokens;
+        return result;
+    }
+
+    json_pointer<string_t> convert()&&
+    {
+        json_pointer<string_t> result;
+        result.reference_tokens = std::move(reference_tokens);
+        return result;
+    }
+
+  public:
+#if JSON_HAS_THREE_WAY_COMPARISON
+    /// @brief compares two JSON pointers for equality
+    /// @sa https://json.nlohmann.me/api/json_pointer/operator_eq/
+    template<typename RefStringTypeRhs>
+    bool operator==(const json_pointer<RefStringTypeRhs>& rhs) const noexcept
+    {
+        return reference_tokens == rhs.reference_tokens;
+    }
+
+    /// @brief compares JSON pointer and string for equality
+    /// @sa https://json.nlohmann.me/api/json_pointer/operator_eq/
+    JSON_HEDLEY_DEPRECATED_FOR(3.11.2, operator==(json_pointer))
+    bool operator==(const string_t& rhs) const
+    {
+        return *this == json_pointer(rhs);
+    }
+
+    /// @brief 3-way compares two JSON pointers
+    template<typename RefStringTypeRhs>
+    std::strong_ordering operator<=>(const json_pointer<RefStringTypeRhs>& rhs) const noexcept // *NOPAD*
+    {
+        return  reference_tokens <=> rhs.reference_tokens; // *NOPAD*
+    }
+#else
+    /// @brief compares two JSON pointers for equality
+    /// @sa https://json.nlohmann.me/api/json_pointer/operator_eq/
+    template<typename RefStringTypeLhs, typename RefStringTypeRhs>
+    // NOLINTNEXTLINE(readability-redundant-declaration)
+    friend bool operator==(const json_pointer<RefStringTypeLhs>& lhs,
+                           const json_pointer<RefStringTypeRhs>& rhs) noexcept;
+
+    /// @brief compares JSON pointer and string for equality
+    /// @sa https://json.nlohmann.me/api/json_pointer/operator_eq/
+    template<typename RefStringTypeLhs, typename StringType>
+    // NOLINTNEXTLINE(readability-redundant-declaration)
+    friend bool operator==(const json_pointer<RefStringTypeLhs>& lhs,
+                           const StringType& rhs);
+
+    /// @brief compares string and JSON pointer for equality
+    /// @sa https://json.nlohmann.me/api/json_pointer/operator_eq/
+    template<typename RefStringTypeRhs, typename StringType>
+    // NOLINTNEXTLINE(readability-redundant-declaration)
+    friend bool operator==(const StringType& lhs,
+                           const json_pointer<RefStringTypeRhs>& rhs);
+
+    /// @brief compares two JSON pointers for inequality
+    /// @sa https://json.nlohmann.me/api/json_pointer/operator_ne/
+    template<typename RefStringTypeLhs, typename RefStringTypeRhs>
+    // NOLINTNEXTLINE(readability-redundant-declaration)
+    friend bool operator!=(const json_pointer<RefStringTypeLhs>& lhs,
+                           const json_pointer<RefStringTypeRhs>& rhs) noexcept;
+
+    /// @brief compares JSON pointer and string for inequality
+    /// @sa https://json.nlohmann.me/api/json_pointer/operator_ne/
+    template<typename RefStringTypeLhs, typename StringType>
+    // NOLINTNEXTLINE(readability-redundant-declaration)
+    friend bool operator!=(const json_pointer<RefStringTypeLhs>& lhs,
+                           const StringType& rhs);
+
+    /// @brief compares string and JSON pointer for inequality
+    /// @sa https://json.nlohmann.me/api/json_pointer/operator_ne/
+    template<typename RefStringTypeRhs, typename StringType>
+    // NOLINTNEXTLINE(readability-redundant-declaration)
+    friend bool operator!=(const StringType& lhs,
+                           const json_pointer<RefStringTypeRhs>& rhs);
+
+    /// @brief compares two JSON pointer for less-than
+    template<typename RefStringTypeLhs, typename RefStringTypeRhs>
+    // NOLINTNEXTLINE(readability-redundant-declaration)
+    friend bool operator<(const json_pointer<RefStringTypeLhs>& lhs,
+                          const json_pointer<RefStringTypeRhs>& rhs) noexcept;
+#endif
+
+  private:
+    /// the reference tokens
+    std::vector<string_t> reference_tokens;
+};
+
+#if !JSON_HAS_THREE_WAY_COMPARISON
+// functions cannot be defined inside class due to ODR violations
+template<typename RefStringTypeLhs, typename RefStringTypeRhs>
+inline bool operator==(const json_pointer<RefStringTypeLhs>& lhs,
+                       const json_pointer<RefStringTypeRhs>& rhs) noexcept
+{
+    return lhs.reference_tokens == rhs.reference_tokens;
+}
+
+template<typename RefStringTypeLhs,
+         typename StringType = typename json_pointer<RefStringTypeLhs>::string_t>
+JSON_HEDLEY_DEPRECATED_FOR(3.11.2, operator==(json_pointer, json_pointer))
+inline bool operator==(const json_pointer<RefStringTypeLhs>& lhs,
+                       const StringType& rhs)
+{
+    return lhs == json_pointer<RefStringTypeLhs>(rhs);
+}
+
+template<typename RefStringTypeRhs,
+         typename StringType = typename json_pointer<RefStringTypeRhs>::string_t>
+JSON_HEDLEY_DEPRECATED_FOR(3.11.2, operator==(json_pointer, json_pointer))
+inline bool operator==(const StringType& lhs,
+                       const json_pointer<RefStringTypeRhs>& rhs)
+{
+    return json_pointer<RefStringTypeRhs>(lhs) == rhs;
+}
+
+template<typename RefStringTypeLhs, typename RefStringTypeRhs>
+inline bool operator!=(const json_pointer<RefStringTypeLhs>& lhs,
+                       const json_pointer<RefStringTypeRhs>& rhs) noexcept
+{
+    return !(lhs == rhs);
+}
+
+template<typename RefStringTypeLhs,
+         typename StringType = typename json_pointer<RefStringTypeLhs>::string_t>
+JSON_HEDLEY_DEPRECATED_FOR(3.11.2, operator!=(json_pointer, json_pointer))
+inline bool operator!=(const json_pointer<RefStringTypeLhs>& lhs,
+                       const StringType& rhs)
+{
+    return !(lhs == rhs);
+}
+
+template<typename RefStringTypeRhs,
+         typename StringType = typename json_pointer<RefStringTypeRhs>::string_t>
+JSON_HEDLEY_DEPRECATED_FOR(3.11.2, operator!=(json_pointer, json_pointer))
+inline bool operator!=(const StringType& lhs,
+                       const json_pointer<RefStringTypeRhs>& rhs)
+{
+    return !(lhs == rhs);
+}
+
+template<typename RefStringTypeLhs, typename RefStringTypeRhs>
+inline bool operator<(const json_pointer<RefStringTypeLhs>& lhs,
+                      const json_pointer<RefStringTypeRhs>& rhs) noexcept
+{
+    return lhs.reference_tokens < rhs.reference_tokens;
+}
+#endif
+
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/json_ref.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013 - 2025 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <initializer_list>
+#include <utility>
+
+// #include <nlohmann/detail/abi_macros.hpp>
+
+// #include <nlohmann/detail/meta/type_traits.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+template<typename BasicJsonType>
+class json_ref
+{
+  public:
+    using value_type = BasicJsonType;
+
+    json_ref(value_type&& value)
+        : owned_value(std::move(value))
+    {}
+
+    json_ref(const value_type& value)
+        : value_ref(&value)
+    {}
+
+    json_ref(std::initializer_list<json_ref> init)
+        : owned_value(init)
+    {}
+
+    template <
+        class... Args,
+        enable_if_t<std::is_constructible<value_type, Args...>::value, int> = 0 >
+    json_ref(Args && ... args)
+        : owned_value(std::forward<Args>(args)...)
+    {}
+
+    // class should be movable only
+    json_ref(json_ref&&) noexcept = default;
+    json_ref(const json_ref&) = delete;
+    json_ref& operator=(const json_ref&) = delete;
+    json_ref& operator=(json_ref&&) = delete;
+    ~json_ref() = default;
+
+    value_type moved_or_copied() const
+    {
+        if (value_ref == nullptr)
+        {
+            return std::move(owned_value);
+        }
+        return *value_ref;
+    }
+
+    value_type const& operator*() const
+    {
+        return value_ref ? *value_ref : owned_value;
+    }
+
+    value_type const* operator->() const
+    {
+        return &** this;
+    }
+
+  private:
+    mutable value_type owned_value = nullptr;
+    value_type const* value_ref = nullptr;
+};
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/string_concat.hpp>
+
+// #include <nlohmann/detail/string_escape.hpp>
+
+// #include <nlohmann/detail/string_utils.hpp>
+
+// #include <nlohmann/detail/meta/cpp_future.hpp>
+
+// #include <nlohmann/detail/meta/type_traits.hpp>
+
+// #include <nlohmann/detail/output/binary_writer.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013 - 2025 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <algorithm> // reverse
+#include <array> // array
+#include <map> // map
+#include <cmath> // isnan, isinf
+#include <cstdint> // uint8_t, uint16_t, uint32_t, uint64_t
+#include <cstring> // memcpy
+#include <limits> // numeric_limits
+#include <string> // string
+#include <utility> // move
+#include <vector> // vector
+
+// #include <nlohmann/detail/input/binary_reader.hpp>
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/output/output_adapters.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013 - 2025 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <algorithm> // copy
+#include <cstddef> // size_t
+#include <iterator> // back_inserter
+#include <memory> // shared_ptr, make_shared
+#include <string> // basic_string
+#include <vector> // vector
+
+#ifndef JSON_NO_IO
+    #include <ios>      // streamsize
+    #include <ostream>  // basic_ostream
+#endif  // JSON_NO_IO
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+/// abstract output adapter interface
+template<typename CharType> struct output_adapter_protocol
+{
+    virtual void write_character(CharType c) = 0;
+    virtual void write_characters(const CharType* s, std::size_t length) = 0;
+    virtual ~output_adapter_protocol() = default;
+
+    output_adapter_protocol() = default;
+    output_adapter_protocol(const output_adapter_protocol&) = default;
+    output_adapter_protocol(output_adapter_protocol&&) noexcept = default;
+    output_adapter_protocol& operator=(const output_adapter_protocol&) = default;
+    output_adapter_protocol& operator=(output_adapter_protocol&&) noexcept = default;
+};
+
+/// a type to simplify interfaces
+template<typename CharType>
+using output_adapter_t = std::shared_ptr<output_adapter_protocol<CharType>>;
+
+/// output adapter for byte vectors
+template<typename CharType, typename AllocatorType = std::allocator<CharType>>
+class output_vector_adapter : public output_adapter_protocol<CharType>
+{
+  public:
+    explicit output_vector_adapter(std::vector<CharType, AllocatorType>& vec) noexcept
+        : v(vec)
+    {}
+
+    void write_character(CharType c) override
+    {
+        v.push_back(c);
+    }
+
+    JSON_HEDLEY_NON_NULL(2)
+    void write_characters(const CharType* s, std::size_t length) override
+    {
+        v.insert(v.end(), s, s + length);
+    }
+
+  private:
+    std::vector<CharType, AllocatorType>& v;
+};
+
+#ifndef JSON_NO_IO
+/// output adapter for output streams
+template<typename CharType>
+class output_stream_adapter : public output_adapter_protocol<CharType>
+{
+  public:
+    explicit output_stream_adapter(std::basic_ostream<CharType>& s) noexcept
+        : stream(s)
+    {}
+
+    void write_character(CharType c) override
+    {
+        stream.put(c);
+    }
+
+    JSON_HEDLEY_NON_NULL(2)
+    void write_characters(const CharType* s, std::size_t length) override
+    {
+        stream.write(s, static_cast<std::streamsize>(length));
+    }
+
+  private:
+    std::basic_ostream<CharType>& stream;
+};
+#endif  // JSON_NO_IO
+
+/// output adapter for basic_string
+template<typename CharType, typename StringType = std::basic_string<CharType>>
+class output_string_adapter : public output_adapter_protocol<CharType>
+{
+  public:
+    explicit output_string_adapter(StringType& s) noexcept
+        : str(s)
+    {}
+
+    void write_character(CharType c) override
+    {
+        str.push_back(c);
+    }
+
+    JSON_HEDLEY_NON_NULL(2)
+    void write_characters(const CharType* s, std::size_t length) override
+    {
+        str.append(s, length);
+    }
+
+  private:
+    StringType& str;
+};
+
+template<typename CharType, typename StringType = std::basic_string<CharType>>
+class output_adapter
+{
+  public:
+    template<typename AllocatorType = std::allocator<CharType>>
+    output_adapter(std::vector<CharType, AllocatorType>& vec)
+        : oa(std::make_shared<output_vector_adapter<CharType, AllocatorType>>(vec)) {}
+
+#ifndef JSON_NO_IO
+    output_adapter(std::basic_ostream<CharType>& s)
+        : oa(std::make_shared<output_stream_adapter<CharType>>(s)) {}
+#endif  // JSON_NO_IO
+
+    output_adapter(StringType& s)
+        : oa(std::make_shared<output_string_adapter<CharType, StringType>>(s)) {}
+
+    operator output_adapter_t<CharType>()
+    {
+        return oa;
+    }
+
+  private:
+    output_adapter_t<CharType> oa = nullptr;
+};
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/string_concat.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+/// how to encode BJData
+enum class bjdata_version_t
+{
+    draft2,
+    draft3,
+};
+
+///////////////////
+// binary writer //
+///////////////////
+
+/*!
+@brief serialization to CBOR and MessagePack values
+*/
+template<typename BasicJsonType, typename CharType>
+class binary_writer
+{
+    using string_t = typename BasicJsonType::string_t;
+    using binary_t = typename BasicJsonType::binary_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+
+  public:
+    /*!
+    @brief create a binary writer
+
+    @param[in] adapter  output adapter to write to
+    */
+    explicit binary_writer(output_adapter_t<CharType> adapter) : oa(std::move(adapter))
+    {
+        JSON_ASSERT(oa);
+    }
+
+    /*!
+    @param[in] j  JSON value to serialize
+    @pre       j.type() == value_t::object
+    */
+    void write_bson(const BasicJsonType& j)
+    {
+        switch (j.type())
+        {
+            case value_t::object:
+            {
+                write_bson_object(*j.m_data.m_value.object);
+                break;
+            }
+
+            case value_t::null:
+            case value_t::array:
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+            {
+                JSON_THROW(type_error::create(317, concat("to serialize to BSON, top-level type must be object, but is ", j.type_name()), &j));
+            }
+        }
+    }
+
+    /*!
+    @param[in] j  JSON value to serialize
+    */
+    void write_cbor(const BasicJsonType& j)
+    {
+        switch (j.type())
+        {
+            case value_t::null:
+            {
+                oa->write_character(to_char_type(0xF6));
+                break;
+            }
+
+            case value_t::boolean:
+            {
+                oa->write_character(j.m_data.m_value.boolean
+                                    ? to_char_type(0xF5)
+                                    : to_char_type(0xF4));
+                break;
+            }
+
+            case value_t::number_integer:
+            {
+                if (j.m_data.m_value.number_integer >= 0)
+                {
+                    // CBOR does not differentiate between positive signed
+                    // integers and unsigned integers. Therefore, we used the
+                    // code from the value_t::number_unsigned case here.
+                    if (j.m_data.m_value.number_integer <= 0x17)
+                    {
+                        write_number(static_cast<std::uint8_t>(j.m_data.m_value.number_integer));
+                    }
+                    else if (j.m_data.m_value.number_integer <= (std::numeric_limits<std::uint8_t>::max)())
+                    {
+                        oa->write_character(to_char_type(0x18));
+                        write_number(static_cast<std::uint8_t>(j.m_data.m_value.number_integer));
+                    }
+                    else if (j.m_data.m_value.number_integer <= (std::numeric_limits<std::uint16_t>::max)())
+                    {
+                        oa->write_character(to_char_type(0x19));
+                        write_number(static_cast<std::uint16_t>(j.m_data.m_value.number_integer));
+                    }
+                    else if (j.m_data.m_value.number_integer <= (std::numeric_limits<std::uint32_t>::max)())
+                    {
+                        oa->write_character(to_char_type(0x1A));
+                        write_number(static_cast<std::uint32_t>(j.m_data.m_value.number_integer));
+                    }
+                    else
+                    {
+                        oa->write_character(to_char_type(0x1B));
+                        write_number(static_cast<std::uint64_t>(j.m_data.m_value.number_integer));
+                    }
+                }
+                else
+                {
+                    // The conversions below encode the sign in the first
+                    // byte, and the value is converted to a positive number.
+                    const auto positive_number = -1 - j.m_data.m_value.number_integer;
+                    if (j.m_data.m_value.number_integer >= -24)
+                    {
+                        write_number(static_cast<std::uint8_t>(0x20 + positive_number));
+                    }
+                    else if (positive_number <= (std::numeric_limits<std::uint8_t>::max)())
+                    {
+                        oa->write_character(to_char_type(0x38));
+                        write_number(static_cast<std::uint8_t>(positive_number));
+                    }
+                    else if (positive_number <= (std::numeric_limits<std::uint16_t>::max)())
+                    {
+                        oa->write_character(to_char_type(0x39));
+                        write_number(static_cast<std::uint16_t>(positive_number));
+                    }
+                    else if (positive_number <= (std::numeric_limits<std::uint32_t>::max)())
+                    {
+                        oa->write_character(to_char_type(0x3A));
+                        write_number(static_cast<std::uint32_t>(positive_number));
+                    }
+                    else
+                    {
+                        oa->write_character(to_char_type(0x3B));
+                        write_number(static_cast<std::uint64_t>(positive_number));
+                    }
+                }
+                break;
+            }
+
+            case value_t::number_unsigned:
+            {
+                if (j.m_data.m_value.number_unsigned <= 0x17)
+                {
+                    write_number(static_cast<std::uint8_t>(j.m_data.m_value.number_unsigned));
+                }
+                else if (j.m_data.m_value.number_unsigned <= (std::numeric_limits<std::uint8_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x18));
+                    write_number(static_cast<std::uint8_t>(j.m_data.m_value.number_unsigned));
+                }
+                else if (j.m_data.m_value.number_unsigned <= (std::numeric_limits<std::uint16_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x19));
+                    write_number(static_cast<std::uint16_t>(j.m_data.m_value.number_unsigned));
+                }
+                else if (j.m_data.m_value.number_unsigned <= (std::numeric_limits<std::uint32_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x1A));
+                    write_number(static_cast<std::uint32_t>(j.m_data.m_value.number_unsigned));
+                }
+                else
+                {
+                    oa->write_character(to_char_type(0x1B));
+                    write_number(static_cast<std::uint64_t>(j.m_data.m_value.number_unsigned));
+                }
+                break;
+            }
+
+            case value_t::number_float:
+            {
+                if (std::isnan(j.m_data.m_value.number_float))
+                {
+                    // NaN is 0xf97e00 in CBOR
+                    oa->write_character(to_char_type(0xF9));
+                    oa->write_character(to_char_type(0x7E));
+                    oa->write_character(to_char_type(0x00));
+                }
+                else if (std::isinf(j.m_data.m_value.number_float))
+                {
+                    // Infinity is 0xf97c00, -Infinity is 0xf9fc00
+                    oa->write_character(to_char_type(0xf9));
+                    oa->write_character(j.m_data.m_value.number_float > 0 ? to_char_type(0x7C) : to_char_type(0xFC));
+                    oa->write_character(to_char_type(0x00));
+                }
+                else
+                {
+                    write_compact_float(j.m_data.m_value.number_float, detail::input_format_t::cbor);
+                }
+                break;
+            }
+
+            case value_t::string:
+            {
+                // step 1: write control byte and the string length
+                const auto N = j.m_data.m_value.string->size();
+                if (N <= 0x17)
+                {
+                    write_number(static_cast<std::uint8_t>(0x60 + N));
+                }
+                else if (N <= (std::numeric_limits<std::uint8_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x78));
+                    write_number(static_cast<std::uint8_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint16_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x79));
+                    write_number(static_cast<std::uint16_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint32_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x7A));
+                    write_number(static_cast<std::uint32_t>(N));
+                }
+                // LCOV_EXCL_START
+                else if (N <= (std::numeric_limits<std::uint64_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x7B));
+                    write_number(static_cast<std::uint64_t>(N));
+                }
+                // LCOV_EXCL_STOP
+
+                // step 2: write the string
+                oa->write_characters(
+                    reinterpret_cast<const CharType*>(j.m_data.m_value.string->c_str()),
+                    j.m_data.m_value.string->size());
+                break;
+            }
+
+            case value_t::array:
+            {
+                // step 1: write control byte and the array size
+                const auto N = j.m_data.m_value.array->size();
+                if (N <= 0x17)
+                {
+                    write_number(static_cast<std::uint8_t>(0x80 + N));
+                }
+                else if (N <= (std::numeric_limits<std::uint8_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x98));
+                    write_number(static_cast<std::uint8_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint16_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x99));
+                    write_number(static_cast<std::uint16_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint32_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x9A));
+                    write_number(static_cast<std::uint32_t>(N));
+                }
+                // LCOV_EXCL_START
+                else if (N <= (std::numeric_limits<std::uint64_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x9B));
+                    write_number(static_cast<std::uint64_t>(N));
+                }
+                // LCOV_EXCL_STOP
+
+                // step 2: write each element
+                for (const auto& el : *j.m_data.m_value.array)
+                {
+                    write_cbor(el);
+                }
+                break;
+            }
+
+            case value_t::binary:
+            {
+                if (j.m_data.m_value.binary->has_subtype())
+                {
+                    if (j.m_data.m_value.binary->subtype() <= (std::numeric_limits<std::uint8_t>::max)())
+                    {
+                        write_number(static_cast<std::uint8_t>(0xd8));
+                        write_number(static_cast<std::uint8_t>(j.m_data.m_value.binary->subtype()));
+                    }
+                    else if (j.m_data.m_value.binary->subtype() <= (std::numeric_limits<std::uint16_t>::max)())
+                    {
+                        write_number(static_cast<std::uint8_t>(0xd9));
+                        write_number(static_cast<std::uint16_t>(j.m_data.m_value.binary->subtype()));
+                    }
+                    else if (j.m_data.m_value.binary->subtype() <= (std::numeric_limits<std::uint32_t>::max)())
+                    {
+                        write_number(static_cast<std::uint8_t>(0xda));
+                        write_number(static_cast<std::uint32_t>(j.m_data.m_value.binary->subtype()));
+                    }
+                    else if (j.m_data.m_value.binary->subtype() <= (std::numeric_limits<std::uint64_t>::max)())
+                    {
+                        write_number(static_cast<std::uint8_t>(0xdb));
+                        write_number(static_cast<std::uint64_t>(j.m_data.m_value.binary->subtype()));
+                    }
+                }
+
+                // step 1: write control byte and the binary array size
+                const auto N = j.m_data.m_value.binary->size();
+                if (N <= 0x17)
+                {
+                    write_number(static_cast<std::uint8_t>(0x40 + N));
+                }
+                else if (N <= (std::numeric_limits<std::uint8_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x58));
+                    write_number(static_cast<std::uint8_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint16_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x59));
+                    write_number(static_cast<std::uint16_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint32_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x5A));
+                    write_number(static_cast<std::uint32_t>(N));
+                }
+                // LCOV_EXCL_START
+                else if (N <= (std::numeric_limits<std::uint64_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x5B));
+                    write_number(static_cast<std::uint64_t>(N));
+                }
+                // LCOV_EXCL_STOP
+
+                // step 2: write each element
+                oa->write_characters(
+                    reinterpret_cast<const CharType*>(j.m_data.m_value.binary->data()),
+                    N);
+
+                break;
+            }
+
+            case value_t::object:
+            {
+                // step 1: write control byte and the object size
+                const auto N = j.m_data.m_value.object->size();
+                if (N <= 0x17)
+                {
+                    write_number(static_cast<std::uint8_t>(0xA0 + N));
+                }
+                else if (N <= (std::numeric_limits<std::uint8_t>::max)())
+                {
+                    oa->write_character(to_char_type(0xB8));
+                    write_number(static_cast<std::uint8_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint16_t>::max)())
+                {
+                    oa->write_character(to_char_type(0xB9));
+                    write_number(static_cast<std::uint16_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint32_t>::max)())
+                {
+                    oa->write_character(to_char_type(0xBA));
+                    write_number(static_cast<std::uint32_t>(N));
+                }
+                // LCOV_EXCL_START
+                else if (N <= (std::numeric_limits<std::uint64_t>::max)())
+                {
+                    oa->write_character(to_char_type(0xBB));
+                    write_number(static_cast<std::uint64_t>(N));
+                }
+                // LCOV_EXCL_STOP
+
+                // step 2: write each element
+                for (const auto& el : *j.m_data.m_value.object)
+                {
+                    write_cbor(el.first);
+                    write_cbor(el.second);
+                }
+                break;
+            }
+
+            case value_t::discarded:
+            default:
+                break;
+        }
+    }
+
+    /*!
+    @param[in] j  JSON value to serialize
+    */
+    void write_msgpack(const BasicJsonType& j)
+    {
+        switch (j.type())
+        {
+            case value_t::null: // nil
+            {
+                oa->write_character(to_char_type(0xC0));
+                break;
+            }
+
+            case value_t::boolean: // true and false
+            {
+                oa->write_character(j.m_data.m_value.boolean
+                                    ? to_char_type(0xC3)
+                                    : to_char_type(0xC2));
+                break;
+            }
+
+            case value_t::number_integer:
+            {
+                if (j.m_data.m_value.number_integer >= 0)
+                {
+                    // MessagePack does not differentiate between positive
+                    // signed integers and unsigned integers. Therefore, we used
+                    // the code from the value_t::number_unsigned case here.
+                    if (j.m_data.m_value.number_unsigned < 128)
+                    {
+                        // positive fixnum
+                        write_number(static_cast<std::uint8_t>(j.m_data.m_value.number_integer));
+                    }
+                    else if (j.m_data.m_value.number_unsigned <= (std::numeric_limits<std::uint8_t>::max)())
+                    {
+                        // uint 8
+                        oa->write_character(to_char_type(0xCC));
+                        write_number(static_cast<std::uint8_t>(j.m_data.m_value.number_integer));
+                    }
+                    else if (j.m_data.m_value.number_unsigned <= (std::numeric_limits<std::uint16_t>::max)())
+                    {
+                        // uint 16
+                        oa->write_character(to_char_type(0xCD));
+                        write_number(static_cast<std::uint16_t>(j.m_data.m_value.number_integer));
+                    }
+                    else if (j.m_data.m_value.number_unsigned <= (std::numeric_limits<std::uint32_t>::max)())
+                    {
+                        // uint 32
+                        oa->write_character(to_char_type(0xCE));
+                        write_number(static_cast<std::uint32_t>(j.m_data.m_value.number_integer));
+                    }
+                    else if (j.m_data.m_value.number_unsigned <= (std::numeric_limits<std::uint64_t>::max)())
+                    {
+                        // uint 64
+                        oa->write_character(to_char_type(0xCF));
+                        write_number(static_cast<std::uint64_t>(j.m_data.m_value.number_integer));
+                    }
+                }
+                else
+                {
+                    if (j.m_data.m_value.number_integer >= -32)
+                    {
+                        // negative fixnum
+                        write_number(static_cast<std::int8_t>(j.m_data.m_value.number_integer));
+                    }
+                    else if (j.m_data.m_value.number_integer >= (std::numeric_limits<std::int8_t>::min)() &&
+                             j.m_data.m_value.number_integer <= (std::numeric_limits<std::int8_t>::max)())
+                    {
+                        // int 8
+                        oa->write_character(to_char_type(0xD0));
+                        write_number(static_cast<std::int8_t>(j.m_data.m_value.number_integer));
+                    }
+                    else if (j.m_data.m_value.number_integer >= (std::numeric_limits<std::int16_t>::min)() &&
+                             j.m_data.m_value.number_integer <= (std::numeric_limits<std::int16_t>::max)())
+                    {
+                        // int 16
+                        oa->write_character(to_char_type(0xD1));
+                        write_number(static_cast<std::int16_t>(j.m_data.m_value.number_integer));
+                    }
+                    else if (j.m_data.m_value.number_integer >= (std::numeric_limits<std::int32_t>::min)() &&
+                             j.m_data.m_value.number_integer <= (std::numeric_limits<std::int32_t>::max)())
+                    {
+                        // int 32
+                        oa->write_character(to_char_type(0xD2));
+                        write_number(static_cast<std::int32_t>(j.m_data.m_value.number_integer));
+                    }
+                    else if (j.m_data.m_value.number_integer >= (std::numeric_limits<std::int64_t>::min)() &&
+                             j.m_data.m_value.number_integer <= (std::numeric_limits<std::int64_t>::max)())
+                    {
+                        // int 64
+                        oa->write_character(to_char_type(0xD3));
+                        write_number(static_cast<std::int64_t>(j.m_data.m_value.number_integer));
+                    }
+                }
+                break;
+            }
+
+            case value_t::number_unsigned:
+            {
+                if (j.m_data.m_value.number_unsigned < 128)
+                {
+                    // positive fixnum
+                    write_number(static_cast<std::uint8_t>(j.m_data.m_value.number_integer));
+                }
+                else if (j.m_data.m_value.number_unsigned <= (std::numeric_limits<std::uint8_t>::max)())
+                {
+                    // uint 8
+                    oa->write_character(to_char_type(0xCC));
+                    write_number(static_cast<std::uint8_t>(j.m_data.m_value.number_integer));
+                }
+                else if (j.m_data.m_value.number_unsigned <= (std::numeric_limits<std::uint16_t>::max)())
+                {
+                    // uint 16
+                    oa->write_character(to_char_type(0xCD));
+                    write_number(static_cast<std::uint16_t>(j.m_data.m_value.number_integer));
+                }
+                else if (j.m_data.m_value.number_unsigned <= (std::numeric_limits<std::uint32_t>::max)())
+                {
+                    // uint 32
+                    oa->write_character(to_char_type(0xCE));
+                    write_number(static_cast<std::uint32_t>(j.m_data.m_value.number_integer));
+                }
+                else if (j.m_data.m_value.number_unsigned <= (std::numeric_limits<std::uint64_t>::max)())
+                {
+                    // uint 64
+                    oa->write_character(to_char_type(0xCF));
+                    write_number(static_cast<std::uint64_t>(j.m_data.m_value.number_integer));
+                }
+                break;
+            }
+
+            case value_t::number_float:
+            {
+                write_compact_float(j.m_data.m_value.number_float, detail::input_format_t::msgpack);
+                break;
+            }
+
+            case value_t::string:
+            {
+                // step 1: write control byte and the string length
+                const auto N = j.m_data.m_value.string->size();
+                if (N <= 31)
+                {
+                    // fixstr
+                    write_number(static_cast<std::uint8_t>(0xA0 | N));
+                }
+                else if (N <= (std::numeric_limits<std::uint8_t>::max)())
+                {
+                    // str 8
+                    oa->write_character(to_char_type(0xD9));
+                    write_number(static_cast<std::uint8_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint16_t>::max)())
+                {
+                    // str 16
+                    oa->write_character(to_char_type(0xDA));
+                    write_number(static_cast<std::uint16_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint32_t>::max)())
+                {
+                    // str 32
+                    oa->write_character(to_char_type(0xDB));
+                    write_number(static_cast<std::uint32_t>(N));
+                }
+
+                // step 2: write the string
+                oa->write_characters(
+                    reinterpret_cast<const CharType*>(j.m_data.m_value.string->c_str()),
+                    j.m_data.m_value.string->size());
+                break;
+            }
+
+            case value_t::array:
+            {
+                // step 1: write control byte and the array size
+                const auto N = j.m_data.m_value.array->size();
+                if (N <= 15)
+                {
+                    // fixarray
+                    write_number(static_cast<std::uint8_t>(0x90 | N));
+                }
+                else if (N <= (std::numeric_limits<std::uint16_t>::max)())
+                {
+                    // array 16
+                    oa->write_character(to_char_type(0xDC));
+                    write_number(static_cast<std::uint16_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint32_t>::max)())
+                {
+                    // array 32
+                    oa->write_character(to_char_type(0xDD));
+                    write_number(static_cast<std::uint32_t>(N));
+                }
+
+                // step 2: write each element
+                for (const auto& el : *j.m_data.m_value.array)
+                {
+                    write_msgpack(el);
+                }
+                break;
+            }
+
+            case value_t::binary:
+            {
+                // step 0: determine if the binary type has a set subtype to
+                // determine whether to use the ext or fixext types
+                const bool use_ext = j.m_data.m_value.binary->has_subtype();
+
+                // step 1: write control byte and the byte string length
+                const auto N = j.m_data.m_value.binary->size();
+                if (N <= (std::numeric_limits<std::uint8_t>::max)())
+                {
+                    std::uint8_t output_type{};
+                    bool fixed = true;
+                    if (use_ext)
+                    {
+                        switch (N)
+                        {
+                            case 1:
+                                output_type = 0xD4; // fixext 1
+                                break;
+                            case 2:
+                                output_type = 0xD5; // fixext 2
+                                break;
+                            case 4:
+                                output_type = 0xD6; // fixext 4
+                                break;
+                            case 8:
+                                output_type = 0xD7; // fixext 8
+                                break;
+                            case 16:
+                                output_type = 0xD8; // fixext 16
+                                break;
+                            default:
+                                output_type = 0xC7; // ext 8
+                                fixed = false;
+                                break;
+                        }
+
+                    }
+                    else
+                    {
+                        output_type = 0xC4; // bin 8
+                        fixed = false;
+                    }
+
+                    oa->write_character(to_char_type(output_type));
+                    if (!fixed)
+                    {
+                        write_number(static_cast<std::uint8_t>(N));
+                    }
+                }
+                else if (N <= (std::numeric_limits<std::uint16_t>::max)())
+                {
+                    const std::uint8_t output_type = use_ext
+                                                     ? 0xC8 // ext 16
+                                                     : 0xC5; // bin 16
+
+                    oa->write_character(to_char_type(output_type));
+                    write_number(static_cast<std::uint16_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint32_t>::max)())
+                {
+                    const std::uint8_t output_type = use_ext
+                                                     ? 0xC9 // ext 32
+                                                     : 0xC6; // bin 32
+
+                    oa->write_character(to_char_type(output_type));
+                    write_number(static_cast<std::uint32_t>(N));
+                }
+
+                // step 1.5: if this is an ext type, write the subtype
+                if (use_ext)
+                {
+                    write_number(static_cast<std::int8_t>(j.m_data.m_value.binary->subtype()));
+                }
+
+                // step 2: write the byte string
+                oa->write_characters(
+                    reinterpret_cast<const CharType*>(j.m_data.m_value.binary->data()),
+                    N);
+
+                break;
+            }
+
+            case value_t::object:
+            {
+                // step 1: write control byte and the object size
+                const auto N = j.m_data.m_value.object->size();
+                if (N <= 15)
+                {
+                    // fixmap
+                    write_number(static_cast<std::uint8_t>(0x80 | (N & 0xF)));
+                }
+                else if (N <= (std::numeric_limits<std::uint16_t>::max)())
+                {
+                    // map 16
+                    oa->write_character(to_char_type(0xDE));
+                    write_number(static_cast<std::uint16_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint32_t>::max)())
+                {
+                    // map 32
+                    oa->write_character(to_char_type(0xDF));
+                    write_number(static_cast<std::uint32_t>(N));
+                }
+
+                // step 2: write each element
+                for (const auto& el : *j.m_data.m_value.object)
+                {
+                    write_msgpack(el.first);
+                    write_msgpack(el.second);
+                }
+                break;
+            }
+
+            case value_t::discarded:
+            default:
+                break;
+        }
+    }
+
+    /*!
+    @param[in] j  JSON value to serialize
+    @param[in] use_count   whether to use '#' prefixes (optimized format)
+    @param[in] use_type    whether to use '$' prefixes (optimized format)
+    @param[in] add_prefix  whether prefixes need to be used for this value
+    @param[in] use_bjdata  whether write in BJData format, default is false
+    @param[in] bjdata_version  which BJData version to use, default is draft2
+    */
+    void write_ubjson(const BasicJsonType& j, const bool use_count,
+                      const bool use_type, const bool add_prefix = true,
+                      const bool use_bjdata = false, const bjdata_version_t bjdata_version = bjdata_version_t::draft2)
+    {
+        const bool bjdata_draft3 = use_bjdata && bjdata_version == bjdata_version_t::draft3;
+
+        switch (j.type())
+        {
+            case value_t::null:
+            {
+                if (add_prefix)
+                {
+                    oa->write_character(to_char_type('Z'));
+                }
+                break;
+            }
+
+            case value_t::boolean:
+            {
+                if (add_prefix)
+                {
+                    oa->write_character(j.m_data.m_value.boolean
+                                        ? to_char_type('T')
+                                        : to_char_type('F'));
+                }
+                break;
+            }
+
+            case value_t::number_integer:
+            {
+                write_number_with_ubjson_prefix(j.m_data.m_value.number_integer, add_prefix, use_bjdata);
+                break;
+            }
+
+            case value_t::number_unsigned:
+            {
+                write_number_with_ubjson_prefix(j.m_data.m_value.number_unsigned, add_prefix, use_bjdata);
+                break;
+            }
+
+            case value_t::number_float:
+            {
+                write_number_with_ubjson_prefix(j.m_data.m_value.number_float, add_prefix, use_bjdata);
+                break;
+            }
+
+            case value_t::string:
+            {
+                if (add_prefix)
+                {
+                    oa->write_character(to_char_type('S'));
+                }
+                write_number_with_ubjson_prefix(j.m_data.m_value.string->size(), true, use_bjdata);
+                oa->write_characters(
+                    reinterpret_cast<const CharType*>(j.m_data.m_value.string->c_str()),
+                    j.m_data.m_value.string->size());
+                break;
+            }
+
+            case value_t::array:
+            {
+                if (add_prefix)
+                {
+                    oa->write_character(to_char_type('['));
+                }
+
+                bool prefix_required = true;
+                if (use_type && !j.m_data.m_value.array->empty())
+                {
+                    JSON_ASSERT(use_count);
+                    const CharType first_prefix = ubjson_prefix(j.front(), use_bjdata);
+                    const bool same_prefix = std::all_of(j.begin() + 1, j.end(),
+                                                         [this, first_prefix, use_bjdata](const BasicJsonType & v)
+                    {
+                        return ubjson_prefix(v, use_bjdata) == first_prefix;
+                    });
+
+                    std::vector<CharType> bjdx = {'[', '{', 'S', 'H', 'T', 'F', 'N', 'Z'}; // excluded markers in bjdata optimized type
+
+                    if (same_prefix && !(use_bjdata && std::find(bjdx.begin(), bjdx.end(), first_prefix) != bjdx.end()))
+                    {
+                        prefix_required = false;
+                        oa->write_character(to_char_type('$'));
+                        oa->write_character(first_prefix);
+                    }
+                }
+
+                if (use_count)
+                {
+                    oa->write_character(to_char_type('#'));
+                    write_number_with_ubjson_prefix(j.m_data.m_value.array->size(), true, use_bjdata);
+                }
+
+                for (const auto& el : *j.m_data.m_value.array)
+                {
+                    write_ubjson(el, use_count, use_type, prefix_required, use_bjdata, bjdata_version);
+                }
+
+                if (!use_count)
+                {
+                    oa->write_character(to_char_type(']'));
+                }
+
+                break;
+            }
+
+            case value_t::binary:
+            {
+                if (add_prefix)
+                {
+                    oa->write_character(to_char_type('['));
+                }
+
+                if (use_type && (bjdata_draft3 || !j.m_data.m_value.binary->empty()))
+                {
+                    JSON_ASSERT(use_count);
+                    oa->write_character(to_char_type('$'));
+                    oa->write_character(bjdata_draft3 ? 'B' : 'U');
+                }
+
+                if (use_count)
+                {
+                    oa->write_character(to_char_type('#'));
+                    write_number_with_ubjson_prefix(j.m_data.m_value.binary->size(), true, use_bjdata);
+                }
+
+                if (use_type)
+                {
+                    oa->write_characters(
+                        reinterpret_cast<const CharType*>(j.m_data.m_value.binary->data()),
+                        j.m_data.m_value.binary->size());
+                }
+                else
+                {
+                    for (size_t i = 0; i < j.m_data.m_value.binary->size(); ++i)
+                    {
+                        oa->write_character(to_char_type(bjdata_draft3 ? 'B' : 'U'));
+                        oa->write_character(j.m_data.m_value.binary->data()[i]);
+                    }
+                }
+
+                if (!use_count)
+                {
+                    oa->write_character(to_char_type(']'));
+                }
+
+                break;
+            }
+
+            case value_t::object:
+            {
+                if (use_bjdata && j.m_data.m_value.object->size() == 3 && j.m_data.m_value.object->find("_ArrayType_") != j.m_data.m_value.object->end() && j.m_data.m_value.object->find("_ArraySize_") != j.m_data.m_value.object->end() && j.m_data.m_value.object->find("_ArrayData_") != j.m_data.m_value.object->end())
+                {
+                    if (!write_bjdata_ndarray(*j.m_data.m_value.object, use_count, use_type, bjdata_version))  // decode bjdata ndarray in the JData format (https://github.com/NeuroJSON/jdata)
+                    {
+                        break;
+                    }
+                }
+
+                if (add_prefix)
+                {
+                    oa->write_character(to_char_type('{'));
+                }
+
+                bool prefix_required = true;
+                if (use_type && !j.m_data.m_value.object->empty())
+                {
+                    JSON_ASSERT(use_count);
+                    const CharType first_prefix = ubjson_prefix(j.front(), use_bjdata);
+                    const bool same_prefix = std::all_of(j.begin(), j.end(),
+                                                         [this, first_prefix, use_bjdata](const BasicJsonType & v)
+                    {
+                        return ubjson_prefix(v, use_bjdata) == first_prefix;
+                    });
+
+                    std::vector<CharType> bjdx = {'[', '{', 'S', 'H', 'T', 'F', 'N', 'Z'}; // excluded markers in bjdata optimized type
+
+                    if (same_prefix && !(use_bjdata && std::find(bjdx.begin(), bjdx.end(), first_prefix) != bjdx.end()))
+                    {
+                        prefix_required = false;
+                        oa->write_character(to_char_type('$'));
+                        oa->write_character(first_prefix);
+                    }
+                }
+
+                if (use_count)
+                {
+                    oa->write_character(to_char_type('#'));
+                    write_number_with_ubjson_prefix(j.m_data.m_value.object->size(), true, use_bjdata);
+                }
+
+                for (const auto& el : *j.m_data.m_value.object)
+                {
+                    write_number_with_ubjson_prefix(el.first.size(), true, use_bjdata);
+                    oa->write_characters(
+                        reinterpret_cast<const CharType*>(el.first.c_str()),
+                        el.first.size());
+                    write_ubjson(el.second, use_count, use_type, prefix_required, use_bjdata, bjdata_version);
+                }
+
+                if (!use_count)
+                {
+                    oa->write_character(to_char_type('}'));
+                }
+
+                break;
+            }
+
+            case value_t::discarded:
+            default:
+                break;
+        }
+    }
+
+  private:
+    //////////
+    // BSON //
+    //////////
+
+    /*!
+    @return The size of a BSON document entry header, including the id marker
+            and the entry name size (and its null-terminator).
+    */
+    static std::size_t calc_bson_entry_header_size(const string_t& name, const BasicJsonType& j)
+    {
+        const auto it = name.find(static_cast<typename string_t::value_type>(0));
+        if (JSON_HEDLEY_UNLIKELY(it != BasicJsonType::string_t::npos))
+        {
+            JSON_THROW(out_of_range::create(409, concat("BSON key cannot contain code point U+0000 (at byte ", std::to_string(it), ")"), &j));
+            static_cast<void>(j);
+        }
+
+        return /*id*/ 1ul + name.size() + /*zero-terminator*/1u;
+    }
+
+    /*!
+    @brief Writes the given @a element_type and @a name to the output adapter
+    */
+    void write_bson_entry_header(const string_t& name,
+                                 const std::uint8_t element_type)
+    {
+        oa->write_character(to_char_type(element_type)); // boolean
+        oa->write_characters(
+            reinterpret_cast<const CharType*>(name.c_str()),
+            name.size() + 1u);
+    }
+
+    /*!
+    @brief Writes a BSON element with key @a name and boolean value @a value
+    */
+    void write_bson_boolean(const string_t& name,
+                            const bool value)
+    {
+        write_bson_entry_header(name, 0x08);
+        oa->write_character(value ? to_char_type(0x01) : to_char_type(0x00));
+    }
+
+    /*!
+    @brief Writes a BSON element with key @a name and double value @a value
+    */
+    void write_bson_double(const string_t& name,
+                           const double value)
+    {
+        write_bson_entry_header(name, 0x01);
+        write_number<double>(value, true);
+    }
+
+    /*!
+    @return The size of the BSON-encoded string in @a value
+    */
+    static std::size_t calc_bson_string_size(const string_t& value)
+    {
+        return sizeof(std::int32_t) + value.size() + 1ul;
+    }
+
+    /*!
+    @brief Writes a BSON element with key @a name and string value @a value
+    */
+    void write_bson_string(const string_t& name,
+                           const string_t& value)
+    {
+        write_bson_entry_header(name, 0x02);
+
+        write_number<std::int32_t>(static_cast<std::int32_t>(value.size() + 1ul), true);
+        oa->write_characters(
+            reinterpret_cast<const CharType*>(value.c_str()),
+            value.size() + 1);
+    }
+
+    /*!
+    @brief Writes a BSON element with key @a name and null value
+    */
+    void write_bson_null(const string_t& name)
+    {
+        write_bson_entry_header(name, 0x0A);
+    }
+
+    /*!
+    @return The size of the BSON-encoded integer @a value
+    */
+    static std::size_t calc_bson_integer_size(const std::int64_t value)
+    {
+        return (std::numeric_limits<std::int32_t>::min)() <= value && value <= (std::numeric_limits<std::int32_t>::max)()
+               ? sizeof(std::int32_t)
+               : sizeof(std::int64_t);
+    }
+
+    /*!
+    @brief Writes a BSON element with key @a name and integer @a value
+    */
+    void write_bson_integer(const string_t& name,
+                            const std::int64_t value)
+    {
+        if ((std::numeric_limits<std::int32_t>::min)() <= value && value <= (std::numeric_limits<std::int32_t>::max)())
+        {
+            write_bson_entry_header(name, 0x10); // int32
+            write_number<std::int32_t>(static_cast<std::int32_t>(value), true);
+        }
+        else
+        {
+            write_bson_entry_header(name, 0x12); // int64
+            write_number<std::int64_t>(static_cast<std::int64_t>(value), true);
+        }
+    }
+
+    /*!
+    @return The size of the BSON-encoded unsigned integer in @a j
+    */
+    static constexpr std::size_t calc_bson_unsigned_size(const std::uint64_t value) noexcept
+    {
+        return (value <= static_cast<std::uint64_t>((std::numeric_limits<std::int32_t>::max)()))
+               ? sizeof(std::int32_t)
+               : sizeof(std::int64_t);
+    }
+
+    /*!
+    @brief Writes a BSON element with key @a name and unsigned @a value
+    */
+    void write_bson_unsigned(const string_t& name,
+                             const BasicJsonType& j)
+    {
+        if (j.m_data.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::int32_t>::max)()))
+        {
+            write_bson_entry_header(name, 0x10 /* int32 */);
+            write_number<std::int32_t>(static_cast<std::int32_t>(j.m_data.m_value.number_unsigned), true);
+        }
+        else if (j.m_data.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::int64_t>::max)()))
+        {
+            write_bson_entry_header(name, 0x12 /* int64 */);
+            write_number<std::int64_t>(static_cast<std::int64_t>(j.m_data.m_value.number_unsigned), true);
+        }
+        else
+        {
+            write_bson_entry_header(name, 0x11 /* uint64 */);
+            write_number<std::uint64_t>(static_cast<std::uint64_t>(j.m_data.m_value.number_unsigned), true);
+        }
+    }
+
+    /*!
+    @brief Writes a BSON element with key @a name and object @a value
+    */
+    void write_bson_object_entry(const string_t& name,
+                                 const typename BasicJsonType::object_t& value)
+    {
+        write_bson_entry_header(name, 0x03); // object
+        write_bson_object(value);
+    }
+
+    /*!
+    @return The size of the BSON-encoded array @a value
+    */
+    static std::size_t calc_bson_array_size(const typename BasicJsonType::array_t& value)
+    {
+        std::size_t array_index = 0ul;
+
+        const std::size_t embedded_document_size = std::accumulate(std::begin(value), std::end(value), static_cast<std::size_t>(0), [&array_index](std::size_t result, const typename BasicJsonType::array_t::value_type & el)
+        {
+            return result + calc_bson_element_size(std::to_string(array_index++), el);
+        });
+
+        return sizeof(std::int32_t) + embedded_document_size + 1ul;
+    }
+
+    /*!
+    @return The size of the BSON-encoded binary array @a value
+    */
+    static std::size_t calc_bson_binary_size(const typename BasicJsonType::binary_t& value)
+    {
+        return sizeof(std::int32_t) + value.size() + 1ul;
+    }
+
+    /*!
+    @brief Writes a BSON element with key @a name and array @a value
+    */
+    void write_bson_array(const string_t& name,
+                          const typename BasicJsonType::array_t& value)
+    {
+        write_bson_entry_header(name, 0x04); // array
+        write_number<std::int32_t>(static_cast<std::int32_t>(calc_bson_array_size(value)), true);
+
+        std::size_t array_index = 0ul;
+
+        for (const auto& el : value)
+        {
+            write_bson_element(std::to_string(array_index++), el);
+        }
+
+        oa->write_character(to_char_type(0x00));
+    }
+
+    /*!
+    @brief Writes a BSON element with key @a name and binary value @a value
+    */
+    void write_bson_binary(const string_t& name,
+                           const binary_t& value)
+    {
+        write_bson_entry_header(name, 0x05);
+
+        write_number<std::int32_t>(static_cast<std::int32_t>(value.size()), true);
+        write_number(value.has_subtype() ? static_cast<std::uint8_t>(value.subtype()) : static_cast<std::uint8_t>(0x00));
+
+        oa->write_characters(reinterpret_cast<const CharType*>(value.data()), value.size());
+    }
+
+    /*!
+    @brief Calculates the size necessary to serialize the JSON value @a j with its @a name
+    @return The calculated size for the BSON document entry for @a j with the given @a name.
+    */
+    static std::size_t calc_bson_element_size(const string_t& name,
+            const BasicJsonType& j)
+    {
+        const auto header_size = calc_bson_entry_header_size(name, j);
+        switch (j.type())
+        {
+            case value_t::object:
+                return header_size + calc_bson_object_size(*j.m_data.m_value.object);
+
+            case value_t::array:
+                return header_size + calc_bson_array_size(*j.m_data.m_value.array);
+
+            case value_t::binary:
+                return header_size + calc_bson_binary_size(*j.m_data.m_value.binary);
+
+            case value_t::boolean:
+                return header_size + 1ul;
+
+            case value_t::number_float:
+                return header_size + 8ul;
+
+            case value_t::number_integer:
+                return header_size + calc_bson_integer_size(j.m_data.m_value.number_integer);
+
+            case value_t::number_unsigned:
+                return header_size + calc_bson_unsigned_size(j.m_data.m_value.number_unsigned);
+
+            case value_t::string:
+                return header_size + calc_bson_string_size(*j.m_data.m_value.string);
+
+            case value_t::null:
+                return header_size + 0ul;
+
+            // LCOV_EXCL_START
+            case value_t::discarded:
+            default:
+                JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert)
+                return 0ul;
+                // LCOV_EXCL_STOP
+        }
+    }
+
+    /*!
+    @brief Serializes the JSON value @a j to BSON and associates it with the
+           key @a name.
+    @param name The name to associate with the JSON entity @a j within the
+                current BSON document
+    */
+    void write_bson_element(const string_t& name,
+                            const BasicJsonType& j)
+    {
+        switch (j.type())
+        {
+            case value_t::object:
+                return write_bson_object_entry(name, *j.m_data.m_value.object);
+
+            case value_t::array:
+                return write_bson_array(name, *j.m_data.m_value.array);
+
+            case value_t::binary:
+                return write_bson_binary(name, *j.m_data.m_value.binary);
+
+            case value_t::boolean:
+                return write_bson_boolean(name, j.m_data.m_value.boolean);
+
+            case value_t::number_float:
+                return write_bson_double(name, j.m_data.m_value.number_float);
+
+            case value_t::number_integer:
+                return write_bson_integer(name, j.m_data.m_value.number_integer);
+
+            case value_t::number_unsigned:
+                return write_bson_unsigned(name, j);
+
+            case value_t::string:
+                return write_bson_string(name, *j.m_data.m_value.string);
+
+            case value_t::null:
+                return write_bson_null(name);
+
+            // LCOV_EXCL_START
+            case value_t::discarded:
+            default:
+                JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert)
+                return;
+                // LCOV_EXCL_STOP
+        }
+    }
+
+    /*!
+    @brief Calculates the size of the BSON serialization of the given
+           JSON-object @a j.
+    @param[in] value  JSON value to serialize
+    @pre       value.type() == value_t::object
+    */
+    static std::size_t calc_bson_object_size(const typename BasicJsonType::object_t& value)
+    {
+        const std::size_t document_size = std::accumulate(value.begin(), value.end(), static_cast<std::size_t>(0),
+                                          [](size_t result, const typename BasicJsonType::object_t::value_type & el)
+        {
+            return result += calc_bson_element_size(el.first, el.second);
+        });
+
+        return sizeof(std::int32_t) + document_size + 1ul;
+    }
+
+    /*!
+    @param[in] value  JSON value to serialize
+    @pre       value.type() == value_t::object
+    */
+    void write_bson_object(const typename BasicJsonType::object_t& value)
+    {
+        write_number<std::int32_t>(static_cast<std::int32_t>(calc_bson_object_size(value)), true);
+
+        for (const auto& el : value)
+        {
+            write_bson_element(el.first, el.second);
+        }
+
+        oa->write_character(to_char_type(0x00));
+    }
+
+    //////////
+    // CBOR //
+    //////////
+
+    static constexpr CharType get_cbor_float_prefix(float /*unused*/)
+    {
+        return to_char_type(0xFA);  // Single-Precision Float
+    }
+
+    static constexpr CharType get_cbor_float_prefix(double /*unused*/)
+    {
+        return to_char_type(0xFB);  // Double-Precision Float
+    }
+
+    /////////////
+    // MsgPack //
+    /////////////
+
+    static constexpr CharType get_msgpack_float_prefix(float /*unused*/)
+    {
+        return to_char_type(0xCA);  // float 32
+    }
+
+    static constexpr CharType get_msgpack_float_prefix(double /*unused*/)
+    {
+        return to_char_type(0xCB);  // float 64
+    }
+
+    ////////////
+    // UBJSON //
+    ////////////
+
+    // UBJSON: write number (floating point)
+    template<typename NumberType, typename std::enable_if<
+                 std::is_floating_point<NumberType>::value, int>::type = 0>
+    void write_number_with_ubjson_prefix(const NumberType n,
+                                         const bool add_prefix,
+                                         const bool use_bjdata)
+    {
+        if (add_prefix)
+        {
+            oa->write_character(get_ubjson_float_prefix(n));
+        }
+        write_number(n, use_bjdata);
+    }
+
+    // UBJSON: write number (unsigned integer)
+    template<typename NumberType, typename std::enable_if<
+                 std::is_unsigned<NumberType>::value, int>::type = 0>
+    void write_number_with_ubjson_prefix(const NumberType n,
+                                         const bool add_prefix,
+                                         const bool use_bjdata)
+    {
+        if (n <= static_cast<std::uint64_t>((std::numeric_limits<std::int8_t>::max)()))
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('i'));  // int8
+            }
+            write_number(static_cast<std::uint8_t>(n), use_bjdata);
+        }
+        else if (n <= (std::numeric_limits<std::uint8_t>::max)())
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('U'));  // uint8
+            }
+            write_number(static_cast<std::uint8_t>(n), use_bjdata);
+        }
+        else if (n <= static_cast<std::uint64_t>((std::numeric_limits<std::int16_t>::max)()))
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('I'));  // int16
+            }
+            write_number(static_cast<std::int16_t>(n), use_bjdata);
+        }
+        else if (use_bjdata && n <= static_cast<uint64_t>((std::numeric_limits<uint16_t>::max)()))
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('u'));  // uint16 - bjdata only
+            }
+            write_number(static_cast<std::uint16_t>(n), use_bjdata);
+        }
+        else if (n <= static_cast<std::uint64_t>((std::numeric_limits<std::int32_t>::max)()))
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('l'));  // int32
+            }
+            write_number(static_cast<std::int32_t>(n), use_bjdata);
+        }
+        else if (use_bjdata && n <= static_cast<uint64_t>((std::numeric_limits<uint32_t>::max)()))
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('m'));  // uint32 - bjdata only
+            }
+            write_number(static_cast<std::uint32_t>(n), use_bjdata);
+        }
+        else if (n <= static_cast<std::uint64_t>((std::numeric_limits<std::int64_t>::max)()))
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('L'));  // int64
+            }
+            write_number(static_cast<std::int64_t>(n), use_bjdata);
+        }
+        else if (use_bjdata && n <= (std::numeric_limits<uint64_t>::max)())
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('M'));  // uint64 - bjdata only
+            }
+            write_number(static_cast<std::uint64_t>(n), use_bjdata);
+        }
+        else
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('H'));  // high-precision number
+            }
+
+            const auto number = BasicJsonType(n).dump();
+            write_number_with_ubjson_prefix(number.size(), true, use_bjdata);
+            for (std::size_t i = 0; i < number.size(); ++i)
+            {
+                oa->write_character(to_char_type(static_cast<std::uint8_t>(number[i])));
+            }
+        }
+    }
+
+    // UBJSON: write number (signed integer)
+    template < typename NumberType, typename std::enable_if <
+                   std::is_signed<NumberType>::value&&
+                   !std::is_floating_point<NumberType>::value, int >::type = 0 >
+    void write_number_with_ubjson_prefix(const NumberType n,
+                                         const bool add_prefix,
+                                         const bool use_bjdata)
+    {
+        if ((std::numeric_limits<std::int8_t>::min)() <= n && n <= (std::numeric_limits<std::int8_t>::max)())
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('i'));  // int8
+            }
+            write_number(static_cast<std::int8_t>(n), use_bjdata);
+        }
+        else if (static_cast<std::int64_t>((std::numeric_limits<std::uint8_t>::min)()) <= n && n <= static_cast<std::int64_t>((std::numeric_limits<std::uint8_t>::max)()))
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('U'));  // uint8
+            }
+            write_number(static_cast<std::uint8_t>(n), use_bjdata);
+        }
+        else if ((std::numeric_limits<std::int16_t>::min)() <= n && n <= (std::numeric_limits<std::int16_t>::max)())
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('I'));  // int16
+            }
+            write_number(static_cast<std::int16_t>(n), use_bjdata);
+        }
+        else if (use_bjdata && (static_cast<std::int64_t>((std::numeric_limits<std::uint16_t>::min)()) <= n && n <= static_cast<std::int64_t>((std::numeric_limits<std::uint16_t>::max)())))
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('u'));  // uint16 - bjdata only
+            }
+            write_number(static_cast<uint16_t>(n), use_bjdata);
+        }
+        else if ((std::numeric_limits<std::int32_t>::min)() <= n && n <= (std::numeric_limits<std::int32_t>::max)())
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('l'));  // int32
+            }
+            write_number(static_cast<std::int32_t>(n), use_bjdata);
+        }
+        else if (use_bjdata && (static_cast<std::int64_t>((std::numeric_limits<std::uint32_t>::min)()) <= n && n <= static_cast<std::int64_t>((std::numeric_limits<std::uint32_t>::max)())))
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('m'));  // uint32 - bjdata only
+            }
+            write_number(static_cast<uint32_t>(n), use_bjdata);
+        }
+        else if ((std::numeric_limits<std::int64_t>::min)() <= n && n <= (std::numeric_limits<std::int64_t>::max)())
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('L'));  // int64
+            }
+            write_number(static_cast<std::int64_t>(n), use_bjdata);
+        }
+        // LCOV_EXCL_START
+        else
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('H'));  // high-precision number
+            }
+
+            const auto number = BasicJsonType(n).dump();
+            write_number_with_ubjson_prefix(number.size(), true, use_bjdata);
+            for (std::size_t i = 0; i < number.size(); ++i)
+            {
+                oa->write_character(to_char_type(static_cast<std::uint8_t>(number[i])));
+            }
+        }
+        // LCOV_EXCL_STOP
+    }
+
+    /*!
+    @brief determine the type prefix of container values
+    */
+    CharType ubjson_prefix(const BasicJsonType& j, const bool use_bjdata) const noexcept
+    {
+        switch (j.type())
+        {
+            case value_t::null:
+                return 'Z';
+
+            case value_t::boolean:
+                return j.m_data.m_value.boolean ? 'T' : 'F';
+
+            case value_t::number_integer:
+            {
+                if ((std::numeric_limits<std::int8_t>::min)() <= j.m_data.m_value.number_integer && j.m_data.m_value.number_integer <= (std::numeric_limits<std::int8_t>::max)())
+                {
+                    return 'i';
+                }
+                if ((std::numeric_limits<std::uint8_t>::min)() <= j.m_data.m_value.number_integer && j.m_data.m_value.number_integer <= (std::numeric_limits<std::uint8_t>::max)())
+                {
+                    return 'U';
+                }
+                if ((std::numeric_limits<std::int16_t>::min)() <= j.m_data.m_value.number_integer && j.m_data.m_value.number_integer <= (std::numeric_limits<std::int16_t>::max)())
+                {
+                    return 'I';
+                }
+                if (use_bjdata && ((std::numeric_limits<std::uint16_t>::min)() <= j.m_data.m_value.number_integer && j.m_data.m_value.number_integer <= (std::numeric_limits<std::uint16_t>::max)()))
+                {
+                    return 'u';
+                }
+                if ((std::numeric_limits<std::int32_t>::min)() <= j.m_data.m_value.number_integer && j.m_data.m_value.number_integer <= (std::numeric_limits<std::int32_t>::max)())
+                {
+                    return 'l';
+                }
+                if (use_bjdata && ((std::numeric_limits<std::uint32_t>::min)() <= j.m_data.m_value.number_integer && j.m_data.m_value.number_integer <= (std::numeric_limits<std::uint32_t>::max)()))
+                {
+                    return 'm';
+                }
+                if ((std::numeric_limits<std::int64_t>::min)() <= j.m_data.m_value.number_integer && j.m_data.m_value.number_integer <= (std::numeric_limits<std::int64_t>::max)())
+                {
+                    return 'L';
+                }
+                // anything else is treated as high-precision number
+                return 'H'; // LCOV_EXCL_LINE
+            }
+
+            case value_t::number_unsigned:
+            {
+                if (j.m_data.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::int8_t>::max)()))
+                {
+                    return 'i';
+                }
+                if (j.m_data.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::uint8_t>::max)()))
+                {
+                    return 'U';
+                }
+                if (j.m_data.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::int16_t>::max)()))
+                {
+                    return 'I';
+                }
+                if (use_bjdata && j.m_data.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::uint16_t>::max)()))
+                {
+                    return 'u';
+                }
+                if (j.m_data.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::int32_t>::max)()))
+                {
+                    return 'l';
+                }
+                if (use_bjdata && j.m_data.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::uint32_t>::max)()))
+                {
+                    return 'm';
+                }
+                if (j.m_data.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::int64_t>::max)()))
+                {
+                    return 'L';
+                }
+                if (use_bjdata && j.m_data.m_value.number_unsigned <= (std::numeric_limits<std::uint64_t>::max)())
+                {
+                    return 'M';
+                }
+                // anything else is treated as high-precision number
+                return 'H'; // LCOV_EXCL_LINE
+            }
+
+            case value_t::number_float:
+                return get_ubjson_float_prefix(j.m_data.m_value.number_float);
+
+            case value_t::string:
+                return 'S';
+
+            case value_t::array: // fallthrough
+            case value_t::binary:
+                return '[';
+
+            case value_t::object:
+                return '{';
+
+            case value_t::discarded:
+            default:  // discarded values
+                return 'N';
+        }
+    }
+
+    static constexpr CharType get_ubjson_float_prefix(float /*unused*/)
+    {
+        return 'd';  // float 32
+    }
+
+    static constexpr CharType get_ubjson_float_prefix(double /*unused*/)
+    {
+        return 'D';  // float 64
+    }
+
+    /*!
+    @return false if the object is successfully converted to a bjdata ndarray, true if the type or size is invalid
+    */
+    bool write_bjdata_ndarray(const typename BasicJsonType::object_t& value, const bool use_count, const bool use_type, const bjdata_version_t bjdata_version)
+    {
+        std::map<string_t, CharType> bjdtype = {{"uint8", 'U'},  {"int8", 'i'},  {"uint16", 'u'}, {"int16", 'I'},
+            {"uint32", 'm'}, {"int32", 'l'}, {"uint64", 'M'}, {"int64", 'L'}, {"single", 'd'}, {"double", 'D'},
+            {"char", 'C'}, {"byte", 'B'}
+        };
+
+        string_t key = "_ArrayType_";
+        auto it = bjdtype.find(static_cast<string_t>(value.at(key)));
+        if (it == bjdtype.end())
+        {
+            return true;
+        }
+        CharType dtype = it->second;
+
+        key = "_ArraySize_";
+        std::size_t len = (value.at(key).empty() ? 0 : 1);
+        for (const auto& el : value.at(key))
+        {
+            len *= static_cast<std::size_t>(el.m_data.m_value.number_unsigned);
+        }
+
+        key = "_ArrayData_";
+        if (value.at(key).size() != len)
+        {
+            return true;
+        }
+
+        oa->write_character('[');
+        oa->write_character('$');
+        oa->write_character(dtype);
+        oa->write_character('#');
+
+        key = "_ArraySize_";
+        write_ubjson(value.at(key), use_count, use_type, true,  true, bjdata_version);
+
+        key = "_ArrayData_";
+        if (dtype == 'U' || dtype == 'C' || dtype == 'B')
+        {
+            for (const auto& el : value.at(key))
+            {
+                write_number(static_cast<std::uint8_t>(el.m_data.m_value.number_unsigned), true);
+            }
+        }
+        else if (dtype == 'i')
+        {
+            for (const auto& el : value.at(key))
+            {
+                write_number(static_cast<std::int8_t>(el.m_data.m_value.number_integer), true);
+            }
+        }
+        else if (dtype == 'u')
+        {
+            for (const auto& el : value.at(key))
+            {
+                write_number(static_cast<std::uint16_t>(el.m_data.m_value.number_unsigned), true);
+            }
+        }
+        else if (dtype == 'I')
+        {
+            for (const auto& el : value.at(key))
+            {
+                write_number(static_cast<std::int16_t>(el.m_data.m_value.number_integer), true);
+            }
+        }
+        else if (dtype == 'm')
+        {
+            for (const auto& el : value.at(key))
+            {
+                write_number(static_cast<std::uint32_t>(el.m_data.m_value.number_unsigned), true);
+            }
+        }
+        else if (dtype == 'l')
+        {
+            for (const auto& el : value.at(key))
+            {
+                write_number(static_cast<std::int32_t>(el.m_data.m_value.number_integer), true);
+            }
+        }
+        else if (dtype == 'M')
+        {
+            for (const auto& el : value.at(key))
+            {
+                write_number(static_cast<std::uint64_t>(el.m_data.m_value.number_unsigned), true);
+            }
+        }
+        else if (dtype == 'L')
+        {
+            for (const auto& el : value.at(key))
+            {
+                write_number(static_cast<std::int64_t>(el.m_data.m_value.number_integer), true);
+            }
+        }
+        else if (dtype == 'd')
+        {
+            for (const auto& el : value.at(key))
+            {
+                write_number(static_cast<float>(el.m_data.m_value.number_float), true);
+            }
+        }
+        else if (dtype == 'D')
+        {
+            for (const auto& el : value.at(key))
+            {
+                write_number(static_cast<double>(el.m_data.m_value.number_float), true);
+            }
+        }
+        return false;
+    }
+
+    ///////////////////////
+    // Utility functions //
+    ///////////////////////
+
+    /*
+    @brief write a number to output input
+    @param[in] n number of type @a NumberType
+    @param[in] OutputIsLittleEndian Set to true if output data is
+                                 required to be little endian
+    @tparam NumberType the type of the number
+
+    @note This function needs to respect the system's endianness, because bytes
+          in CBOR, MessagePack, and UBJSON are stored in network order (big
+          endian) and therefore need reordering on little endian systems.
+          On the other hand, BSON and BJData use little endian and should reorder
+          on big endian systems.
+    */
+    template<typename NumberType>
+    void write_number(const NumberType n, const bool OutputIsLittleEndian = false)
+    {
+        // step 1: write number to array of length NumberType
+        std::array<CharType, sizeof(NumberType)> vec{};
+        std::memcpy(vec.data(), &n, sizeof(NumberType));
+
+        // step 2: write array to output (with possible reordering)
+        if (is_little_endian != OutputIsLittleEndian)
+        {
+            // reverse byte order prior to conversion if necessary
+            std::reverse(vec.begin(), vec.end());
+        }
+
+        oa->write_characters(vec.data(), sizeof(NumberType));
+    }
+
+    void write_compact_float(const number_float_t n, detail::input_format_t format)
+    {
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wfloat-equal"
+#endif
+        if (static_cast<double>(n) >= static_cast<double>(std::numeric_limits<float>::lowest()) &&
+                static_cast<double>(n) <= static_cast<double>((std::numeric_limits<float>::max)()) &&
+                static_cast<double>(static_cast<float>(n)) == static_cast<double>(n))
+        {
+            oa->write_character(format == detail::input_format_t::cbor
+                                ? get_cbor_float_prefix(static_cast<float>(n))
+                                : get_msgpack_float_prefix(static_cast<float>(n)));
+            write_number(static_cast<float>(n));
+        }
+        else
+        {
+            oa->write_character(format == detail::input_format_t::cbor
+                                ? get_cbor_float_prefix(n)
+                                : get_msgpack_float_prefix(n));
+            write_number(n);
+        }
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
+    }
+
+  public:
+    // The following to_char_type functions are implement the conversion
+    // between uint8_t and CharType. In case CharType is not unsigned,
+    // such a conversion is required to allow values greater than 128.
+    // See <https://github.com/nlohmann/json/issues/1286> for a discussion.
+    template < typename C = CharType,
+               enable_if_t < std::is_signed<C>::value && std::is_signed<char>::value > * = nullptr >
+    static constexpr CharType to_char_type(std::uint8_t x) noexcept
+    {
+        return *reinterpret_cast<char*>(&x);
+    }
+
+    template < typename C = CharType,
+               enable_if_t < std::is_signed<C>::value && std::is_unsigned<char>::value > * = nullptr >
+    static CharType to_char_type(std::uint8_t x) noexcept
+    {
+        static_assert(sizeof(std::uint8_t) == sizeof(CharType), "size of CharType must be equal to std::uint8_t");
+        static_assert(std::is_trivial<CharType>::value, "CharType must be trivial");
+        CharType result;
+        std::memcpy(&result, &x, sizeof(x));
+        return result;
+    }
+
+    template<typename C = CharType,
+             enable_if_t<std::is_unsigned<C>::value>* = nullptr>
+    static constexpr CharType to_char_type(std::uint8_t x) noexcept
+    {
+        return x;
+    }
+
+    template < typename InputCharType, typename C = CharType,
+               enable_if_t <
+                   std::is_signed<C>::value &&
+                   std::is_signed<char>::value &&
+                   std::is_same<char, typename std::remove_cv<InputCharType>::type>::value
+                   > * = nullptr >
+    static constexpr CharType to_char_type(InputCharType x) noexcept
+    {
+        return x;
+    }
+
+  private:
+    /// whether we can assume little endianness
+    const bool is_little_endian = little_endianness();
+
+    /// the output
+    output_adapter_t<CharType> oa = nullptr;
+};
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/output/output_adapters.hpp>
+
+// #include <nlohmann/detail/output/serializer.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2008 - 2009 Björn Hoehrmann <bjoern@hoehrmann.de>
+// SPDX-FileCopyrightText: 2013 - 2025 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <algorithm> // reverse, remove, fill, find, none_of
+#include <array> // array
+#include <clocale> // localeconv, lconv
+#include <cmath> // labs, isfinite, isnan, signbit
+#include <cstddef> // size_t, ptrdiff_t
+#include <cstdint> // uint8_t
+#include <cstdio> // snprintf
+#include <limits> // numeric_limits
+#include <string> // string, char_traits
+#include <iomanip> // setfill, setw
+#include <type_traits> // is_same
+#include <utility> // move
+
+// #include <nlohmann/detail/conversions/to_chars.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2009 Florian Loitsch <https://florian.loitsch.com/>
+// SPDX-FileCopyrightText: 2013 - 2025 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <array> // array
+#include <cmath>   // signbit, isfinite
+#include <cstdint> // intN_t, uintN_t
+#include <cstring> // memcpy, memmove
+#include <limits> // numeric_limits
+#include <type_traits> // conditional
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+/*!
+@brief implements the Grisu2 algorithm for binary to decimal floating-point
+conversion.
+
+This implementation is a slightly modified version of the reference
+implementation which may be obtained from
+http://florian.loitsch.com/publications (bench.tar.gz).
+
+The code is distributed under the MIT license, Copyright (c) 2009 Florian Loitsch.
+
+For a detailed description of the algorithm see:
+
+[1] Loitsch, "Printing Floating-Point Numbers Quickly and Accurately with
+    Integers", Proceedings of the ACM SIGPLAN 2010 Conference on Programming
+    Language Design and Implementation, PLDI 2010
+[2] Burger, Dybvig, "Printing Floating-Point Numbers Quickly and Accurately",
+    Proceedings of the ACM SIGPLAN 1996 Conference on Programming Language
+    Design and Implementation, PLDI 1996
+*/
+namespace dtoa_impl
+{
+
+template<typename Target, typename Source>
+Target reinterpret_bits(const Source source)
+{
+    static_assert(sizeof(Target) == sizeof(Source), "size mismatch");
+
+    Target target;
+    std::memcpy(&target, &source, sizeof(Source));
+    return target;
+}
+
+struct diyfp // f * 2^e
+{
+    static constexpr int kPrecision = 64; // = q
+
+    std::uint64_t f = 0;
+    int e = 0;
+
+    constexpr diyfp(std::uint64_t f_, int e_) noexcept : f(f_), e(e_) {}
+
+    /*!
+    @brief returns x - y
+    @pre x.e == y.e and x.f >= y.f
+    */
+    static diyfp sub(const diyfp& x, const diyfp& y) noexcept
+    {
+        JSON_ASSERT(x.e == y.e);
+        JSON_ASSERT(x.f >= y.f);
+
+        return {x.f - y.f, x.e};
+    }
+
+    /*!
+    @brief returns x * y
+    @note The result is rounded. (Only the upper q bits are returned.)
+    */
+    static diyfp mul(const diyfp& x, const diyfp& y) noexcept
+    {
+        static_assert(kPrecision == 64, "internal error");
+
+        // Computes:
+        //  f = round((x.f * y.f) / 2^q)
+        //  e = x.e + y.e + q
+
+        // Emulate the 64-bit * 64-bit multiplication:
+        //
+        // p = u * v
+        //   = (u_lo + 2^32 u_hi) (v_lo + 2^32 v_hi)
+        //   = (u_lo v_lo         ) + 2^32 ((u_lo v_hi         ) + (u_hi v_lo         )) + 2^64 (u_hi v_hi         )
+        //   = (p0                ) + 2^32 ((p1                ) + (p2                )) + 2^64 (p3                )
+        //   = (p0_lo + 2^32 p0_hi) + 2^32 ((p1_lo + 2^32 p1_hi) + (p2_lo + 2^32 p2_hi)) + 2^64 (p3                )
+        //   = (p0_lo             ) + 2^32 (p0_hi + p1_lo + p2_lo                      ) + 2^64 (p1_hi + p2_hi + p3)
+        //   = (p0_lo             ) + 2^32 (Q                                          ) + 2^64 (H                 )
+        //   = (p0_lo             ) + 2^32 (Q_lo + 2^32 Q_hi                           ) + 2^64 (H                 )
+        //
+        // (Since Q might be larger than 2^32 - 1)
+        //
+        //   = (p0_lo + 2^32 Q_lo) + 2^64 (Q_hi + H)
+        //
+        // (Q_hi + H does not overflow a 64-bit int)
+        //
+        //   = p_lo + 2^64 p_hi
+
+        const std::uint64_t u_lo = x.f & 0xFFFFFFFFu;
+        const std::uint64_t u_hi = x.f >> 32u;
+        const std::uint64_t v_lo = y.f & 0xFFFFFFFFu;
+        const std::uint64_t v_hi = y.f >> 32u;
+
+        const std::uint64_t p0 = u_lo * v_lo;
+        const std::uint64_t p1 = u_lo * v_hi;
+        const std::uint64_t p2 = u_hi * v_lo;
+        const std::uint64_t p3 = u_hi * v_hi;
+
+        const std::uint64_t p0_hi = p0 >> 32u;
+        const std::uint64_t p1_lo = p1 & 0xFFFFFFFFu;
+        const std::uint64_t p1_hi = p1 >> 32u;
+        const std::uint64_t p2_lo = p2 & 0xFFFFFFFFu;
+        const std::uint64_t p2_hi = p2 >> 32u;
+
+        std::uint64_t Q = p0_hi + p1_lo + p2_lo;
+
+        // The full product might now be computed as
+        //
+        // p_hi = p3 + p2_hi + p1_hi + (Q >> 32)
+        // p_lo = p0_lo + (Q << 32)
+        //
+        // But in this particular case here, the full p_lo is not required.
+        // Effectively we only need to add the highest bit in p_lo to p_hi (and
+        // Q_hi + 1 does not overflow).
+
+        Q += std::uint64_t{1} << (64u - 32u - 1u); // round, ties up
+
+        const std::uint64_t h = p3 + p2_hi + p1_hi + (Q >> 32u);
+
+        return {h, x.e + y.e + 64};
+    }
+
+    /*!
+    @brief normalize x such that the significand is >= 2^(q-1)
+    @pre x.f != 0
+    */
+    static diyfp normalize(diyfp x) noexcept
+    {
+        JSON_ASSERT(x.f != 0);
+
+        while ((x.f >> 63u) == 0)
+        {
+            x.f <<= 1u;
+            x.e--;
+        }
+
+        return x;
+    }
+
+    /*!
+    @brief normalize x such that the result has the exponent E
+    @pre e >= x.e and the upper e - x.e bits of x.f must be zero.
+    */
+    static diyfp normalize_to(const diyfp& x, const int target_exponent) noexcept
+    {
+        const int delta = x.e - target_exponent;
+
+        JSON_ASSERT(delta >= 0);
+        JSON_ASSERT(((x.f << delta) >> delta) == x.f);
+
+        return {x.f << delta, target_exponent};
+    }
+};
+
+struct boundaries
+{
+    diyfp w;
+    diyfp minus;
+    diyfp plus;
+};
+
+/*!
+Compute the (normalized) diyfp representing the input number 'value' and its
+boundaries.
+
+@pre value must be finite and positive
+*/
+template<typename FloatType>
+boundaries compute_boundaries(FloatType value)
+{
+    JSON_ASSERT(std::isfinite(value));
+    JSON_ASSERT(value > 0);
+
+    // Convert the IEEE representation into a diyfp.
+    //
+    // If v is denormal:
+    //      value = 0.F * 2^(1 - bias) = (          F) * 2^(1 - bias - (p-1))
+    // If v is normalized:
+    //      value = 1.F * 2^(E - bias) = (2^(p-1) + F) * 2^(E - bias - (p-1))
+
+    static_assert(std::numeric_limits<FloatType>::is_iec559,
+                  "internal error: dtoa_short requires an IEEE-754 floating-point implementation");
+
+    constexpr int      kPrecision = std::numeric_limits<FloatType>::digits; // = p (includes the hidden bit)
+    constexpr int      kBias      = std::numeric_limits<FloatType>::max_exponent - 1 + (kPrecision - 1);
+    constexpr int      kMinExp    = 1 - kBias;
+    constexpr std::uint64_t kHiddenBit = std::uint64_t{1} << (kPrecision - 1); // = 2^(p-1)
+
+    using bits_type = typename std::conditional<kPrecision == 24, std::uint32_t, std::uint64_t >::type;
+
+    const auto bits = static_cast<std::uint64_t>(reinterpret_bits<bits_type>(value));
+    const std::uint64_t E = bits >> (kPrecision - 1);
+    const std::uint64_t F = bits & (kHiddenBit - 1);
+
+    const bool is_denormal = E == 0;
+    const diyfp v = is_denormal
+                    ? diyfp(F, kMinExp)
+                    : diyfp(F + kHiddenBit, static_cast<int>(E) - kBias);
+
+    // Compute the boundaries m- and m+ of the floating-point value
+    // v = f * 2^e.
+    //
+    // Determine v- and v+, the floating-point predecessor and successor if v,
+    // respectively.
+    //
+    //      v- = v - 2^e        if f != 2^(p-1) or e == e_min                (A)
+    //         = v - 2^(e-1)    if f == 2^(p-1) and e > e_min                (B)
+    //
+    //      v+ = v + 2^e
+    //
+    // Let m- = (v- + v) / 2 and m+ = (v + v+) / 2. All real numbers _strictly_
+    // between m- and m+ round to v, regardless of how the input rounding
+    // algorithm breaks ties.
+    //
+    //      ---+-------------+-------------+-------------+-------------+---  (A)
+    //         v-            m-            v             m+            v+
+    //
+    //      -----------------+------+------+-------------+-------------+---  (B)
+    //                       v-     m-     v             m+            v+
+
+    const bool lower_boundary_is_closer = F == 0 && E > 1;
+    const diyfp m_plus = diyfp((2 * v.f) + 1, v.e - 1);
+    const diyfp m_minus = lower_boundary_is_closer
+                          ? diyfp((4 * v.f) - 1, v.e - 2)  // (B)
+                          : diyfp((2 * v.f) - 1, v.e - 1); // (A)
+
+    // Determine the normalized w+ = m+.
+    const diyfp w_plus = diyfp::normalize(m_plus);
+
+    // Determine w- = m- such that e_(w-) = e_(w+).
+    const diyfp w_minus = diyfp::normalize_to(m_minus, w_plus.e);
+
+    return {diyfp::normalize(v), w_minus, w_plus};
+}
+
+// Given normalized diyfp w, Grisu needs to find a (normalized) cached
+// power-of-ten c, such that the exponent of the product c * w = f * 2^e lies
+// within a certain range [alpha, gamma] (Definition 3.2 from [1])
+//
+//      alpha <= e = e_c + e_w + q <= gamma
+//
+// or
+//
+//      f_c * f_w * 2^alpha <= f_c 2^(e_c) * f_w 2^(e_w) * 2^q
+//                          <= f_c * f_w * 2^gamma
+//
+// Since c and w are normalized, i.e. 2^(q-1) <= f < 2^q, this implies
+//
+//      2^(q-1) * 2^(q-1) * 2^alpha <= c * w * 2^q < 2^q * 2^q * 2^gamma
+//
+// or
+//
+//      2^(q - 2 + alpha) <= c * w < 2^(q + gamma)
+//
+// The choice of (alpha,gamma) determines the size of the table and the form of
+// the digit generation procedure. Using (alpha,gamma)=(-60,-32) works out well
+// in practice:
+//
+// The idea is to cut the number c * w = f * 2^e into two parts, which can be
+// processed independently: An integral part p1, and a fractional part p2:
+//
+//      f * 2^e = ( (f div 2^-e) * 2^-e + (f mod 2^-e) ) * 2^e
+//              = (f div 2^-e) + (f mod 2^-e) * 2^e
+//              = p1 + p2 * 2^e
+//
+// The conversion of p1 into decimal form requires a series of divisions and
+// modulos by (a power of) 10. These operations are faster for 32-bit than for
+// 64-bit integers, so p1 should ideally fit into a 32-bit integer. This can be
+// achieved by choosing
+//
+//      -e >= 32   or   e <= -32 := gamma
+//
+// In order to convert the fractional part
+//
+//      p2 * 2^e = p2 / 2^-e = d[-1] / 10^1 + d[-2] / 10^2 + ...
+//
+// into decimal form, the fraction is repeatedly multiplied by 10 and the digits
+// d[-i] are extracted in order:
+//
+//      (10 * p2) div 2^-e = d[-1]
+//      (10 * p2) mod 2^-e = d[-2] / 10^1 + ...
+//
+// The multiplication by 10 must not overflow. It is sufficient to choose
+//
+//      10 * p2 < 16 * p2 = 2^4 * p2 <= 2^64.
+//
+// Since p2 = f mod 2^-e < 2^-e,
+//
+//      -e <= 60   or   e >= -60 := alpha
+
+constexpr int kAlpha = -60;
+constexpr int kGamma = -32;
+
+struct cached_power // c = f * 2^e ~= 10^k
+{
+    std::uint64_t f;
+    int e;
+    int k;
+};
+
+/*!
+For a normalized diyfp w = f * 2^e, this function returns a (normalized) cached
+power-of-ten c = f_c * 2^e_c, such that the exponent of the product w * c
+satisfies (Definition 3.2 from [1])
+
+     alpha <= e_c + e + q <= gamma.
+*/
+inline cached_power get_cached_power_for_binary_exponent(int e)
+{
+    // Now
+    //
+    //      alpha <= e_c + e + q <= gamma                                    (1)
+    //      ==> f_c * 2^alpha <= c * 2^e * 2^q
+    //
+    // and since the c's are normalized, 2^(q-1) <= f_c,
+    //
+    //      ==> 2^(q - 1 + alpha) <= c * 2^(e + q)
+    //      ==> 2^(alpha - e - 1) <= c
+    //
+    // If c were an exact power of ten, i.e. c = 10^k, one may determine k as
+    //
+    //      k = ceil( log_10( 2^(alpha - e - 1) ) )
+    //        = ceil( (alpha - e - 1) * log_10(2) )
+    //
+    // From the paper:
+    // "In theory the result of the procedure could be wrong since c is rounded,
+    //  and the computation itself is approximated [...]. In practice, however,
+    //  this simple function is sufficient."
+    //
+    // For IEEE double precision floating-point numbers converted into
+    // normalized diyfp's w = f * 2^e, with q = 64,
+    //
+    //      e >= -1022      (min IEEE exponent)
+    //           -52        (p - 1)
+    //           -52        (p - 1, possibly normalize denormal IEEE numbers)
+    //           -11        (normalize the diyfp)
+    //         = -1137
+    //
+    // and
+    //
+    //      e <= +1023      (max IEEE exponent)
+    //           -52        (p - 1)
+    //           -11        (normalize the diyfp)
+    //         = 960
+    //
+    // This binary exponent range [-1137,960] results in a decimal exponent
+    // range [-307,324]. One does not need to store a cached power for each
+    // k in this range. For each such k it suffices to find a cached power
+    // such that the exponent of the product lies in [alpha,gamma].
+    // This implies that the difference of the decimal exponents of adjacent
+    // table entries must be less than or equal to
+    //
+    //      floor( (gamma - alpha) * log_10(2) ) = 8.
+    //
+    // (A smaller distance gamma-alpha would require a larger table.)
+
+    // NB:
+    // Actually this function returns c, such that -60 <= e_c + e + 64 <= -34.
+
+    constexpr int kCachedPowersMinDecExp = -300;
+    constexpr int kCachedPowersDecStep = 8;
+
+    static constexpr std::array<cached_power, 79> kCachedPowers =
+    {
+        {
+            { 0xAB70FE17C79AC6CA, -1060, -300 },
+            { 0xFF77B1FCBEBCDC4F, -1034, -292 },
+            { 0xBE5691EF416BD60C, -1007, -284 },
+            { 0x8DD01FAD907FFC3C,  -980, -276 },
+            { 0xD3515C2831559A83,  -954, -268 },
+            { 0x9D71AC8FADA6C9B5,  -927, -260 },
+            { 0xEA9C227723EE8BCB,  -901, -252 },
+            { 0xAECC49914078536D,  -874, -244 },
+            { 0x823C12795DB6CE57,  -847, -236 },
+            { 0xC21094364DFB5637,  -821, -228 },
+            { 0x9096EA6F3848984F,  -794, -220 },
+            { 0xD77485CB25823AC7,  -768, -212 },
+            { 0xA086CFCD97BF97F4,  -741, -204 },
+            { 0xEF340A98172AACE5,  -715, -196 },
+            { 0xB23867FB2A35B28E,  -688, -188 },
+            { 0x84C8D4DFD2C63F3B,  -661, -180 },
+            { 0xC5DD44271AD3CDBA,  -635, -172 },
+            { 0x936B9FCEBB25C996,  -608, -164 },
+            { 0xDBAC6C247D62A584,  -582, -156 },
+            { 0xA3AB66580D5FDAF6,  -555, -148 },
+            { 0xF3E2F893DEC3F126,  -529, -140 },
+            { 0xB5B5ADA8AAFF80B8,  -502, -132 },
+            { 0x87625F056C7C4A8B,  -475, -124 },
+            { 0xC9BCFF6034C13053,  -449, -116 },
+            { 0x964E858C91BA2655,  -422, -108 },
+            { 0xDFF9772470297EBD,  -396, -100 },
+            { 0xA6DFBD9FB8E5B88F,  -369,  -92 },
+            { 0xF8A95FCF88747D94,  -343,  -84 },
+            { 0xB94470938FA89BCF,  -316,  -76 },
+            { 0x8A08F0F8BF0F156B,  -289,  -68 },
+            { 0xCDB02555653131B6,  -263,  -60 },
+            { 0x993FE2C6D07B7FAC,  -236,  -52 },
+            { 0xE45C10C42A2B3B06,  -210,  -44 },
+            { 0xAA242499697392D3,  -183,  -36 },
+            { 0xFD87B5F28300CA0E,  -157,  -28 },
+            { 0xBCE5086492111AEB,  -130,  -20 },
+            { 0x8CBCCC096F5088CC,  -103,  -12 },
+            { 0xD1B71758E219652C,   -77,   -4 },
+            { 0x9C40000000000000,   -50,    4 },
+            { 0xE8D4A51000000000,   -24,   12 },
+            { 0xAD78EBC5AC620000,     3,   20 },
+            { 0x813F3978F8940984,    30,   28 },
+            { 0xC097CE7BC90715B3,    56,   36 },
+            { 0x8F7E32CE7BEA5C70,    83,   44 },
+            { 0xD5D238A4ABE98068,   109,   52 },
+            { 0x9F4F2726179A2245,   136,   60 },
+            { 0xED63A231D4C4FB27,   162,   68 },
+            { 0xB0DE65388CC8ADA8,   189,   76 },
+            { 0x83C7088E1AAB65DB,   216,   84 },
+            { 0xC45D1DF942711D9A,   242,   92 },
+            { 0x924D692CA61BE758,   269,  100 },
+            { 0xDA01EE641A708DEA,   295,  108 },
+            { 0xA26DA3999AEF774A,   322,  116 },
+            { 0xF209787BB47D6B85,   348,  124 },
+            { 0xB454E4A179DD1877,   375,  132 },
+            { 0x865B86925B9BC5C2,   402,  140 },
+            { 0xC83553C5C8965D3D,   428,  148 },
+            { 0x952AB45CFA97A0B3,   455,  156 },
+            { 0xDE469FBD99A05FE3,   481,  164 },
+            { 0xA59BC234DB398C25,   508,  172 },
+            { 0xF6C69A72A3989F5C,   534,  180 },
+            { 0xB7DCBF5354E9BECE,   561,  188 },
+            { 0x88FCF317F22241E2,   588,  196 },
+            { 0xCC20CE9BD35C78A5,   614,  204 },
+            { 0x98165AF37B2153DF,   641,  212 },
+            { 0xE2A0B5DC971F303A,   667,  220 },
+            { 0xA8D9D1535CE3B396,   694,  228 },
+            { 0xFB9B7CD9A4A7443C,   720,  236 },
+            { 0xBB764C4CA7A44410,   747,  244 },
+            { 0x8BAB8EEFB6409C1A,   774,  252 },
+            { 0xD01FEF10A657842C,   800,  260 },
+            { 0x9B10A4E5E9913129,   827,  268 },
+            { 0xE7109BFBA19C0C9D,   853,  276 },
+            { 0xAC2820D9623BF429,   880,  284 },
+            { 0x80444B5E7AA7CF85,   907,  292 },
+            { 0xBF21E44003ACDD2D,   933,  300 },
+            { 0x8E679C2F5E44FF8F,   960,  308 },
+            { 0xD433179D9C8CB841,   986,  316 },
+            { 0x9E19DB92B4E31BA9,  1013,  324 },
+        }
+    };
+
+    // This computation gives exactly the same results for k as
+    //      k = ceil((kAlpha - e - 1) * 0.30102999566398114)
+    // for |e| <= 1500, but doesn't require floating-point operations.
+    // NB: log_10(2) ~= 78913 / 2^18
+    JSON_ASSERT(e >= -1500);
+    JSON_ASSERT(e <=  1500);
+    const int f = kAlpha - e - 1;
+    const int k = ((f * 78913) / (1 << 18)) + static_cast<int>(f > 0);
+
+    const int index = (-kCachedPowersMinDecExp + k + (kCachedPowersDecStep - 1)) / kCachedPowersDecStep;
+    JSON_ASSERT(index >= 0);
+    JSON_ASSERT(static_cast<std::size_t>(index) < kCachedPowers.size());
+
+    const cached_power cached = kCachedPowers[static_cast<std::size_t>(index)];
+    JSON_ASSERT(kAlpha <= cached.e + e + 64);
+    JSON_ASSERT(kGamma >= cached.e + e + 64);
+
+    return cached;
+}
+
+/*!
+For n != 0, returns k, such that pow10 := 10^(k-1) <= n < 10^k.
+For n == 0, returns 1 and sets pow10 := 1.
+*/
+inline int find_largest_pow10(const std::uint32_t n, std::uint32_t& pow10)
+{
+    // LCOV_EXCL_START
+    if (n >= 1000000000)
+    {
+        pow10 = 1000000000;
+        return 10;
+    }
+    // LCOV_EXCL_STOP
+    if (n >= 100000000)
+    {
+        pow10 = 100000000;
+        return  9;
+    }
+    if (n >= 10000000)
+    {
+        pow10 = 10000000;
+        return  8;
+    }
+    if (n >= 1000000)
+    {
+        pow10 = 1000000;
+        return  7;
+    }
+    if (n >= 100000)
+    {
+        pow10 = 100000;
+        return  6;
+    }
+    if (n >= 10000)
+    {
+        pow10 = 10000;
+        return  5;
+    }
+    if (n >= 1000)
+    {
+        pow10 = 1000;
+        return  4;
+    }
+    if (n >= 100)
+    {
+        pow10 = 100;
+        return  3;
+    }
+    if (n >= 10)
+    {
+        pow10 = 10;
+        return  2;
+    }
+
+    pow10 = 1;
+    return 1;
+}
+
+inline void grisu2_round(char* buf, int len, std::uint64_t dist, std::uint64_t delta,
+                         std::uint64_t rest, std::uint64_t ten_k)
+{
+    JSON_ASSERT(len >= 1);
+    JSON_ASSERT(dist <= delta);
+    JSON_ASSERT(rest <= delta);
+    JSON_ASSERT(ten_k > 0);
+
+    //               <--------------------------- delta ---->
+    //                                  <---- dist --------->
+    // --------------[------------------+-------------------]--------------
+    //               M-                 w                   M+
+    //
+    //                                  ten_k
+    //                                <------>
+    //                                       <---- rest ---->
+    // --------------[------------------+----+--------------]--------------
+    //                                  w    V
+    //                                       = buf * 10^k
+    //
+    // ten_k represents a unit-in-the-last-place in the decimal representation
+    // stored in buf.
+    // Decrement buf by ten_k while this takes buf closer to w.
+
+    // The tests are written in this order to avoid overflow in unsigned
+    // integer arithmetic.
+
+    while (rest < dist
+            && delta - rest >= ten_k
+            && (rest + ten_k < dist || dist - rest > rest + ten_k - dist))
+    {
+        JSON_ASSERT(buf[len - 1] != '0');
+        buf[len - 1]--;
+        rest += ten_k;
+    }
+}
+
+/*!
+Generates V = buffer * 10^decimal_exponent, such that M- <= V <= M+.
+M- and M+ must be normalized and share the same exponent -60 <= e <= -32.
+*/
+inline void grisu2_digit_gen(char* buffer, int& length, int& decimal_exponent,
+                             diyfp M_minus, diyfp w, diyfp M_plus)
+{
+    static_assert(kAlpha >= -60, "internal error");
+    static_assert(kGamma <= -32, "internal error");
+
+    // Generates the digits (and the exponent) of a decimal floating-point
+    // number V = buffer * 10^decimal_exponent in the range [M-, M+]. The diyfp's
+    // w, M- and M+ share the same exponent e, which satisfies alpha <= e <= gamma.
+    //
+    //               <--------------------------- delta ---->
+    //                                  <---- dist --------->
+    // --------------[------------------+-------------------]--------------
+    //               M-                 w                   M+
+    //
+    // Grisu2 generates the digits of M+ from left to right and stops as soon as
+    // V is in [M-,M+].
+
+    JSON_ASSERT(M_plus.e >= kAlpha);
+    JSON_ASSERT(M_plus.e <= kGamma);
+
+    std::uint64_t delta = diyfp::sub(M_plus, M_minus).f; // (significand of (M+ - M-), implicit exponent is e)
+    std::uint64_t dist  = diyfp::sub(M_plus, w      ).f; // (significand of (M+ - w ), implicit exponent is e)
+
+    // Split M+ = f * 2^e into two parts p1 and p2 (note: e < 0):
+    //
+    //      M+ = f * 2^e
+    //         = ((f div 2^-e) * 2^-e + (f mod 2^-e)) * 2^e
+    //         = ((p1        ) * 2^-e + (p2        )) * 2^e
+    //         = p1 + p2 * 2^e
+
+    const diyfp one(std::uint64_t{1} << -M_plus.e, M_plus.e);
+
+    auto p1 = static_cast<std::uint32_t>(M_plus.f >> -one.e); // p1 = f div 2^-e (Since -e >= 32, p1 fits into a 32-bit int.)
+    std::uint64_t p2 = M_plus.f & (one.f - 1);                    // p2 = f mod 2^-e
+
+    // 1)
+    //
+    // Generate the digits of the integral part p1 = d[n-1]...d[1]d[0]
+
+    JSON_ASSERT(p1 > 0);
+
+    std::uint32_t pow10{};
+    const int k = find_largest_pow10(p1, pow10);
+
+    //      10^(k-1) <= p1 < 10^k, pow10 = 10^(k-1)
+    //
+    //      p1 = (p1 div 10^(k-1)) * 10^(k-1) + (p1 mod 10^(k-1))
+    //         = (d[k-1]         ) * 10^(k-1) + (p1 mod 10^(k-1))
+    //
+    //      M+ = p1                                             + p2 * 2^e
+    //         = d[k-1] * 10^(k-1) + (p1 mod 10^(k-1))          + p2 * 2^e
+    //         = d[k-1] * 10^(k-1) + ((p1 mod 10^(k-1)) * 2^-e + p2) * 2^e
+    //         = d[k-1] * 10^(k-1) + (                         rest) * 2^e
+    //
+    // Now generate the digits d[n] of p1 from left to right (n = k-1,...,0)
+    //
+    //      p1 = d[k-1]...d[n] * 10^n + d[n-1]...d[0]
+    //
+    // but stop as soon as
+    //
+    //      rest * 2^e = (d[n-1]...d[0] * 2^-e + p2) * 2^e <= delta * 2^e
+
+    int n = k;
+    while (n > 0)
+    {
+        // Invariants:
+        //      M+ = buffer * 10^n + (p1 + p2 * 2^e)    (buffer = 0 for n = k)
+        //      pow10 = 10^(n-1) <= p1 < 10^n
+        //
+        const std::uint32_t d = p1 / pow10;  // d = p1 div 10^(n-1)
+        const std::uint32_t r = p1 % pow10;  // r = p1 mod 10^(n-1)
+        //
+        //      M+ = buffer * 10^n + (d * 10^(n-1) + r) + p2 * 2^e
+        //         = (buffer * 10 + d) * 10^(n-1) + (r + p2 * 2^e)
+        //
+        JSON_ASSERT(d <= 9);
+        buffer[length++] = static_cast<char>('0' + d); // buffer := buffer * 10 + d
+        //
+        //      M+ = buffer * 10^(n-1) + (r + p2 * 2^e)
+        //
+        p1 = r;
+        n--;
+        //
+        //      M+ = buffer * 10^n + (p1 + p2 * 2^e)
+        //      pow10 = 10^n
+        //
+
+        // Now check if enough digits have been generated.
+        // Compute
+        //
+        //      p1 + p2 * 2^e = (p1 * 2^-e + p2) * 2^e = rest * 2^e
+        //
+        // Note:
+        // Since rest and delta share the same exponent e, it suffices to
+        // compare the significands.
+        const std::uint64_t rest = (std::uint64_t{p1} << -one.e) + p2;
+        if (rest <= delta)
+        {
+            // V = buffer * 10^n, with M- <= V <= M+.
+
+            decimal_exponent += n;
+
+            // We may now just stop. But instead look if the buffer could be
+            // decremented to bring V closer to w.
+            //
+            // pow10 = 10^n is now 1 ulp in the decimal representation V.
+            // The rounding procedure works with diyfp's with an implicit
+            // exponent of e.
+            //
+            //      10^n = (10^n * 2^-e) * 2^e = ulp * 2^e
+            //
+            const std::uint64_t ten_n = std::uint64_t{pow10} << -one.e;
+            grisu2_round(buffer, length, dist, delta, rest, ten_n);
+
+            return;
+        }
+
+        pow10 /= 10;
+        //
+        //      pow10 = 10^(n-1) <= p1 < 10^n
+        // Invariants restored.
+    }
+
+    // 2)
+    //
+    // The digits of the integral part have been generated:
+    //
+    //      M+ = d[k-1]...d[1]d[0] + p2 * 2^e
+    //         = buffer            + p2 * 2^e
+    //
+    // Now generate the digits of the fractional part p2 * 2^e.
+    //
+    // Note:
+    // No decimal point is generated: the exponent is adjusted instead.
+    //
+    // p2 actually represents the fraction
+    //
+    //      p2 * 2^e
+    //          = p2 / 2^-e
+    //          = d[-1] / 10^1 + d[-2] / 10^2 + ...
+    //
+    // Now generate the digits d[-m] of p1 from left to right (m = 1,2,...)
+    //
+    //      p2 * 2^e = d[-1]d[-2]...d[-m] * 10^-m
+    //                      + 10^-m * (d[-m-1] / 10^1 + d[-m-2] / 10^2 + ...)
+    //
+    // using
+    //
+    //      10^m * p2 = ((10^m * p2) div 2^-e) * 2^-e + ((10^m * p2) mod 2^-e)
+    //                = (                   d) * 2^-e + (                   r)
+    //
+    // or
+    //      10^m * p2 * 2^e = d + r * 2^e
+    //
+    // i.e.
+    //
+    //      M+ = buffer + p2 * 2^e
+    //         = buffer + 10^-m * (d + r * 2^e)
+    //         = (buffer * 10^m + d) * 10^-m + 10^-m * r * 2^e
+    //
+    // and stop as soon as 10^-m * r * 2^e <= delta * 2^e
+
+    JSON_ASSERT(p2 > delta);
+
+    int m = 0;
+    for (;;)
+    {
+        // Invariant:
+        //      M+ = buffer * 10^-m + 10^-m * (d[-m-1] / 10 + d[-m-2] / 10^2 + ...) * 2^e
+        //         = buffer * 10^-m + 10^-m * (p2                                 ) * 2^e
+        //         = buffer * 10^-m + 10^-m * (1/10 * (10 * p2)                   ) * 2^e
+        //         = buffer * 10^-m + 10^-m * (1/10 * ((10*p2 div 2^-e) * 2^-e + (10*p2 mod 2^-e)) * 2^e
+        //
+        JSON_ASSERT(p2 <= (std::numeric_limits<std::uint64_t>::max)() / 10);
+        p2 *= 10;
+        const std::uint64_t d = p2 >> -one.e;     // d = (10 * p2) div 2^-e
+        const std::uint64_t r = p2 & (one.f - 1); // r = (10 * p2) mod 2^-e
+        //
+        //      M+ = buffer * 10^-m + 10^-m * (1/10 * (d * 2^-e + r) * 2^e
+        //         = buffer * 10^-m + 10^-m * (1/10 * (d + r * 2^e))
+        //         = (buffer * 10 + d) * 10^(-m-1) + 10^(-m-1) * r * 2^e
+        //
+        JSON_ASSERT(d <= 9);
+        buffer[length++] = static_cast<char>('0' + d); // buffer := buffer * 10 + d
+        //
+        //      M+ = buffer * 10^(-m-1) + 10^(-m-1) * r * 2^e
+        //
+        p2 = r;
+        m++;
+        //
+        //      M+ = buffer * 10^-m + 10^-m * p2 * 2^e
+        // Invariant restored.
+
+        // Check if enough digits have been generated.
+        //
+        //      10^-m * p2 * 2^e <= delta * 2^e
+        //              p2 * 2^e <= 10^m * delta * 2^e
+        //                    p2 <= 10^m * delta
+        delta *= 10;
+        dist  *= 10;
+        if (p2 <= delta)
+        {
+            break;
+        }
+    }
+
+    // V = buffer * 10^-m, with M- <= V <= M+.
+
+    decimal_exponent -= m;
+
+    // 1 ulp in the decimal representation is now 10^-m.
+    // Since delta and dist are now scaled by 10^m, we need to do the
+    // same with ulp in order to keep the units in sync.
+    //
+    //      10^m * 10^-m = 1 = 2^-e * 2^e = ten_m * 2^e
+    //
+    const std::uint64_t ten_m = one.f;
+    grisu2_round(buffer, length, dist, delta, p2, ten_m);
+
+    // By construction this algorithm generates the shortest possible decimal
+    // number (Loitsch, Theorem 6.2) which rounds back to w.
+    // For an input number of precision p, at least
+    //
+    //      N = 1 + ceil(p * log_10(2))
+    //
+    // decimal digits are sufficient to identify all binary floating-point
+    // numbers (Matula, "In-and-Out conversions").
+    // This implies that the algorithm does not produce more than N decimal
+    // digits.
+    //
+    //      N = 17 for p = 53 (IEEE double precision)
+    //      N = 9  for p = 24 (IEEE single precision)
+}
+
+/*!
+v = buf * 10^decimal_exponent
+len is the length of the buffer (number of decimal digits)
+The buffer must be large enough, i.e. >= max_digits10.
+*/
+JSON_HEDLEY_NON_NULL(1)
+inline void grisu2(char* buf, int& len, int& decimal_exponent,
+                   diyfp m_minus, diyfp v, diyfp m_plus)
+{
+    JSON_ASSERT(m_plus.e == m_minus.e);
+    JSON_ASSERT(m_plus.e == v.e);
+
+    //  --------(-----------------------+-----------------------)--------    (A)
+    //          m-                      v                       m+
+    //
+    //  --------------------(-----------+-----------------------)--------    (B)
+    //                      m-          v                       m+
+    //
+    // First scale v (and m- and m+) such that the exponent is in the range
+    // [alpha, gamma].
+
+    const cached_power cached = get_cached_power_for_binary_exponent(m_plus.e);
+
+    const diyfp c_minus_k(cached.f, cached.e); // = c ~= 10^-k
+
+    // The exponent of the products is = v.e + c_minus_k.e + q and is in the range [alpha,gamma]
+    const diyfp w       = diyfp::mul(v,       c_minus_k);
+    const diyfp w_minus = diyfp::mul(m_minus, c_minus_k);
+    const diyfp w_plus  = diyfp::mul(m_plus,  c_minus_k);
+
+    //  ----(---+---)---------------(---+---)---------------(---+---)----
+    //          w-                      w                       w+
+    //          = c*m-                  = c*v                   = c*m+
+    //
+    // diyfp::mul rounds its result and c_minus_k is approximated too. w, w- and
+    // w+ are now off by a small amount.
+    // In fact:
+    //
+    //      w - v * 10^k < 1 ulp
+    //
+    // To account for this inaccuracy, add resp. subtract 1 ulp.
+    //
+    //  --------+---[---------------(---+---)---------------]---+--------
+    //          w-  M-                  w                   M+  w+
+    //
+    // Now any number in [M-, M+] (bounds included) will round to w when input,
+    // regardless of how the input rounding algorithm breaks ties.
+    //
+    // And digit_gen generates the shortest possible such number in [M-, M+].
+    // Note that this does not mean that Grisu2 always generates the shortest
+    // possible number in the interval (m-, m+).
+    const diyfp M_minus(w_minus.f + 1, w_minus.e);
+    const diyfp M_plus (w_plus.f  - 1, w_plus.e );
+
+    decimal_exponent = -cached.k; // = -(-k) = k
+
+    grisu2_digit_gen(buf, len, decimal_exponent, M_minus, w, M_plus);
+}
+
+/*!
+v = buf * 10^decimal_exponent
+len is the length of the buffer (number of decimal digits)
+The buffer must be large enough, i.e. >= max_digits10.
+*/
+template<typename FloatType>
+JSON_HEDLEY_NON_NULL(1)
+void grisu2(char* buf, int& len, int& decimal_exponent, FloatType value)
+{
+    static_assert(diyfp::kPrecision >= std::numeric_limits<FloatType>::digits + 3,
+                  "internal error: not enough precision");
+
+    JSON_ASSERT(std::isfinite(value));
+    JSON_ASSERT(value > 0);
+
+    // If the neighbors (and boundaries) of 'value' are always computed for double-precision
+    // numbers, all float's can be recovered using strtod (and strtof). However, the resulting
+    // decimal representations are not exactly "short".
+    //
+    // The documentation for 'std::to_chars' (https://en.cppreference.com/w/cpp/utility/to_chars)
+    // says "value is converted to a string as if by std::sprintf in the default ("C") locale"
+    // and since sprintf promotes floats to doubles, I think this is exactly what 'std::to_chars'
+    // does.
+    // On the other hand, the documentation for 'std::to_chars' requires that "parsing the
+    // representation using the corresponding std::from_chars function recovers value exactly". That
+    // indicates that single precision floating-point numbers should be recovered using
+    // 'std::strtof'.
+    //
+    // NB: If the neighbors are computed for single-precision numbers, there is a single float
+    //     (7.0385307e-26f) which can't be recovered using strtod. The resulting double precision
+    //     value is off by 1 ulp.
+#if 0 // NOLINT(readability-avoid-unconditional-preprocessor-if)
+    const boundaries w = compute_boundaries(static_cast<double>(value));
+#else
+    const boundaries w = compute_boundaries(value);
+#endif
+
+    grisu2(buf, len, decimal_exponent, w.minus, w.w, w.plus);
+}
+
+/*!
+@brief appends a decimal representation of e to buf
+@return a pointer to the element following the exponent.
+@pre -1000 < e < 1000
+*/
+JSON_HEDLEY_NON_NULL(1)
+JSON_HEDLEY_RETURNS_NON_NULL
+inline char* append_exponent(char* buf, int e)
+{
+    JSON_ASSERT(e > -1000);
+    JSON_ASSERT(e <  1000);
+
+    if (e < 0)
+    {
+        e = -e;
+        *buf++ = '-';
+    }
+    else
+    {
+        *buf++ = '+';
+    }
+
+    auto k = static_cast<std::uint32_t>(e);
+    if (k < 10)
+    {
+        // Always print at least two digits in the exponent.
+        // This is for compatibility with printf("%g").
+        *buf++ = '0';
+        *buf++ = static_cast<char>('0' + k);
+    }
+    else if (k < 100)
+    {
+        *buf++ = static_cast<char>('0' + (k / 10));
+        k %= 10;
+        *buf++ = static_cast<char>('0' + k);
+    }
+    else
+    {
+        *buf++ = static_cast<char>('0' + (k / 100));
+        k %= 100;
+        *buf++ = static_cast<char>('0' + (k / 10));
+        k %= 10;
+        *buf++ = static_cast<char>('0' + k);
+    }
+
+    return buf;
+}
+
+/*!
+@brief prettify v = buf * 10^decimal_exponent
+
+If v is in the range [10^min_exp, 10^max_exp) it will be printed in fixed-point
+notation. Otherwise it will be printed in exponential notation.
+
+@pre min_exp < 0
+@pre max_exp > 0
+*/
+JSON_HEDLEY_NON_NULL(1)
+JSON_HEDLEY_RETURNS_NON_NULL
+inline char* format_buffer(char* buf, int len, int decimal_exponent,
+                           int min_exp, int max_exp)
+{
+    JSON_ASSERT(min_exp < 0);
+    JSON_ASSERT(max_exp > 0);
+
+    const int k = len;
+    const int n = len + decimal_exponent;
+
+    // v = buf * 10^(n-k)
+    // k is the length of the buffer (number of decimal digits)
+    // n is the position of the decimal point relative to the start of the buffer.
+
+    if (k <= n && n <= max_exp)
+    {
+        // digits[000]
+        // len <= max_exp + 2
+
+        std::memset(buf + k, '0', static_cast<size_t>(n) - static_cast<size_t>(k));
+        // Make it look like a floating-point number (#362, #378)
+        buf[n + 0] = '.';
+        buf[n + 1] = '0';
+        return buf + (static_cast<size_t>(n) + 2);
+    }
+
+    if (0 < n && n <= max_exp)
+    {
+        // dig.its
+        // len <= max_digits10 + 1
+
+        JSON_ASSERT(k > n);
+
+        std::memmove(buf + (static_cast<size_t>(n) + 1), buf + n, static_cast<size_t>(k) - static_cast<size_t>(n));
+        buf[n] = '.';
+        return buf + (static_cast<size_t>(k) + 1U);
+    }
+
+    if (min_exp < n && n <= 0)
+    {
+        // 0.[000]digits
+        // len <= 2 + (-min_exp - 1) + max_digits10
+
+        std::memmove(buf + (2 + static_cast<size_t>(-n)), buf, static_cast<size_t>(k));
+        buf[0] = '0';
+        buf[1] = '.';
+        std::memset(buf + 2, '0', static_cast<size_t>(-n));
+        return buf + (2U + static_cast<size_t>(-n) + static_cast<size_t>(k));
+    }
+
+    if (k == 1)
+    {
+        // dE+123
+        // len <= 1 + 5
+
+        buf += 1;
+    }
+    else
+    {
+        // d.igitsE+123
+        // len <= max_digits10 + 1 + 5
+
+        std::memmove(buf + 2, buf + 1, static_cast<size_t>(k) - 1);
+        buf[1] = '.';
+        buf += 1 + static_cast<size_t>(k);
+    }
+
+    *buf++ = 'e';
+    return append_exponent(buf, n - 1);
+}
+
+}  // namespace dtoa_impl
+
+/*!
+@brief generates a decimal representation of the floating-point number value in [first, last).
+
+The format of the resulting decimal representation is similar to printf's %g
+format. Returns an iterator pointing past-the-end of the decimal representation.
+
+@note The input number must be finite, i.e. NaN's and Inf's are not supported.
+@note The buffer must be large enough.
+@note The result is NOT null-terminated.
+*/
+template<typename FloatType>
+JSON_HEDLEY_NON_NULL(1, 2)
+JSON_HEDLEY_RETURNS_NON_NULL
+char* to_chars(char* first, const char* last, FloatType value)
+{
+    static_cast<void>(last); // maybe unused - fix warning
+    JSON_ASSERT(std::isfinite(value));
+
+    // Use signbit(value) instead of (value < 0) since signbit works for -0.
+    if (std::signbit(value))
+    {
+        value = -value;
+        *first++ = '-';
+    }
+
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wfloat-equal"
+#endif
+    if (value == 0) // +-0
+    {
+        *first++ = '0';
+        // Make it look like a floating-point number (#362, #378)
+        *first++ = '.';
+        *first++ = '0';
+        return first;
+    }
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
+
+    JSON_ASSERT(last - first >= std::numeric_limits<FloatType>::max_digits10);
+
+    // Compute v = buffer * 10^decimal_exponent.
+    // The decimal digits are stored in the buffer, which needs to be interpreted
+    // as an unsigned decimal integer.
+    // len is the length of the buffer, i.e. the number of decimal digits.
+    int len = 0;
+    int decimal_exponent = 0;
+    dtoa_impl::grisu2(first, len, decimal_exponent, value);
+
+    JSON_ASSERT(len <= std::numeric_limits<FloatType>::max_digits10);
+
+    // Format the buffer like printf("%.*g", prec, value)
+    constexpr int kMinExp = -4;
+    // Use digits10 here to increase compatibility with version 2.
+    constexpr int kMaxExp = std::numeric_limits<FloatType>::digits10;
+
+    JSON_ASSERT(last - first >= kMaxExp + 2);
+    JSON_ASSERT(last - first >= 2 + (-kMinExp - 1) + std::numeric_limits<FloatType>::max_digits10);
+    JSON_ASSERT(last - first >= std::numeric_limits<FloatType>::max_digits10 + 6);
+
+    return dtoa_impl::format_buffer(first, len, decimal_exponent, kMinExp, kMaxExp);
+}
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/exceptions.hpp>
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/meta/cpp_future.hpp>
+
+// #include <nlohmann/detail/output/binary_writer.hpp>
+
+// #include <nlohmann/detail/output/output_adapters.hpp>
+
+// #include <nlohmann/detail/string_concat.hpp>
+
+// #include <nlohmann/detail/value_t.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+///////////////////
+// serialization //
+///////////////////
+
+/// how to treat decoding errors
+enum class error_handler_t
+{
+    strict,  ///< throw a type_error exception in case of invalid UTF-8
+    replace, ///< replace invalid UTF-8 sequences with U+FFFD
+    ignore   ///< ignore invalid UTF-8 sequences
+};
+
+template<typename BasicJsonType>
+class serializer
+{
+    using string_t = typename BasicJsonType::string_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    using binary_char_t = typename BasicJsonType::binary_t::value_type;
+    static constexpr std::uint8_t UTF8_ACCEPT = 0;
+    static constexpr std::uint8_t UTF8_REJECT = 1;
+
+  public:
+    /*!
+    @param[in] s  output stream to serialize to
+    @param[in] ichar  indentation character to use
+    @param[in] error_handler_  how to react on decoding errors
+    */
+    serializer(output_adapter_t<char> s, const char ichar,
+               error_handler_t error_handler_ = error_handler_t::strict)
+        : o(std::move(s))
+        , loc(std::localeconv())
+        , thousands_sep(loc->thousands_sep == nullptr ? '\0' : std::char_traits<char>::to_char_type(* (loc->thousands_sep)))
+        , decimal_point(loc->decimal_point == nullptr ? '\0' : std::char_traits<char>::to_char_type(* (loc->decimal_point)))
+        , indent_char(ichar)
+        , indent_string(512, indent_char)
+        , error_handler(error_handler_)
+    {}
+
+    // delete because of pointer members
+    serializer(const serializer&) = delete;
+    serializer& operator=(const serializer&) = delete;
+    serializer(serializer&&) = delete;
+    serializer& operator=(serializer&&) = delete;
+    ~serializer() = default;
+
+    /*!
+    @brief internal implementation of the serialization function
+
+    This function is called by the public member function dump and organizes
+    the serialization internally. The indentation level is propagated as
+    additional parameter. In case of arrays and objects, the function is
+    called recursively.
+
+    - strings and object keys are escaped using `escape_string()`
+    - integer numbers are converted implicitly via `operator<<`
+    - floating-point numbers are converted to a string using `"%g"` format
+    - binary values are serialized as objects containing the subtype and the
+      byte array
+
+    @param[in] val               value to serialize
+    @param[in] pretty_print      whether the output shall be pretty-printed
+    @param[in] ensure_ascii If @a ensure_ascii is true, all non-ASCII characters
+    in the output are escaped with `\uXXXX` sequences, and the result consists
+    of ASCII characters only.
+    @param[in] indent_step       the indent level
+    @param[in] current_indent    the current indent level (only used internally)
+    */
+    void dump(const BasicJsonType& val,
+              const bool pretty_print,
+              const bool ensure_ascii,
+              const unsigned int indent_step,
+              const unsigned int current_indent = 0)
+    {
+        switch (val.m_data.m_type)
+        {
+            case value_t::object:
+            {
+                if (val.m_data.m_value.object->empty())
+                {
+                    o->write_characters("{}", 2);
+                    return;
+                }
+
+                if (pretty_print)
+                {
+                    o->write_characters("{\n", 2);
+
+                    // variable to hold indentation for recursive calls
+                    const auto new_indent = current_indent + indent_step;
+                    if (JSON_HEDLEY_UNLIKELY(indent_string.size() < new_indent))
+                    {
+                        indent_string.resize(indent_string.size() * 2, ' ');
+                    }
+
+                    // first n-1 elements
+                    auto i = val.m_data.m_value.object->cbegin();
+                    for (std::size_t cnt = 0; cnt < val.m_data.m_value.object->size() - 1; ++cnt, ++i)
+                    {
+                        o->write_characters(indent_string.c_str(), new_indent);
+                        o->write_character('\"');
+                        dump_escaped(i->first, ensure_ascii);
+                        o->write_characters("\": ", 3);
+                        dump(i->second, true, ensure_ascii, indent_step, new_indent);
+                        o->write_characters(",\n", 2);
+                    }
+
+                    // last element
+                    JSON_ASSERT(i != val.m_data.m_value.object->cend());
+                    JSON_ASSERT(std::next(i) == val.m_data.m_value.object->cend());
+                    o->write_characters(indent_string.c_str(), new_indent);
+                    o->write_character('\"');
+                    dump_escaped(i->first, ensure_ascii);
+                    o->write_characters("\": ", 3);
+                    dump(i->second, true, ensure_ascii, indent_step, new_indent);
+
+                    o->write_character('\n');
+                    o->write_characters(indent_string.c_str(), current_indent);
+                    o->write_character('}');
+                }
+                else
+                {
+                    o->write_character('{');
+
+                    // first n-1 elements
+                    auto i = val.m_data.m_value.object->cbegin();
+                    for (std::size_t cnt = 0; cnt < val.m_data.m_value.object->size() - 1; ++cnt, ++i)
+                    {
+                        o->write_character('\"');
+                        dump_escaped(i->first, ensure_ascii);
+                        o->write_characters("\":", 2);
+                        dump(i->second, false, ensure_ascii, indent_step, current_indent);
+                        o->write_character(',');
+                    }
+
+                    // last element
+                    JSON_ASSERT(i != val.m_data.m_value.object->cend());
+                    JSON_ASSERT(std::next(i) == val.m_data.m_value.object->cend());
+                    o->write_character('\"');
+                    dump_escaped(i->first, ensure_ascii);
+                    o->write_characters("\":", 2);
+                    dump(i->second, false, ensure_ascii, indent_step, current_indent);
+
+                    o->write_character('}');
+                }
+
+                return;
+            }
+
+            case value_t::array:
+            {
+                if (val.m_data.m_value.array->empty())
+                {
+                    o->write_characters("[]", 2);
+                    return;
+                }
+
+                if (pretty_print)
+                {
+                    o->write_characters("[\n", 2);
+
+                    // variable to hold indentation for recursive calls
+                    const auto new_indent = current_indent + indent_step;
+                    if (JSON_HEDLEY_UNLIKELY(indent_string.size() < new_indent))
+                    {
+                        indent_string.resize(indent_string.size() * 2, ' ');
+                    }
+
+                    // first n-1 elements
+                    for (auto i = val.m_data.m_value.array->cbegin();
+                            i != val.m_data.m_value.array->cend() - 1; ++i)
+                    {
+                        o->write_characters(indent_string.c_str(), new_indent);
+                        dump(*i, true, ensure_ascii, indent_step, new_indent);
+                        o->write_characters(",\n", 2);
+                    }
+
+                    // last element
+                    JSON_ASSERT(!val.m_data.m_value.array->empty());
+                    o->write_characters(indent_string.c_str(), new_indent);
+                    dump(val.m_data.m_value.array->back(), true, ensure_ascii, indent_step, new_indent);
+
+                    o->write_character('\n');
+                    o->write_characters(indent_string.c_str(), current_indent);
+                    o->write_character(']');
+                }
+                else
+                {
+                    o->write_character('[');
+
+                    // first n-1 elements
+                    for (auto i = val.m_data.m_value.array->cbegin();
+                            i != val.m_data.m_value.array->cend() - 1; ++i)
+                    {
+                        dump(*i, false, ensure_ascii, indent_step, current_indent);
+                        o->write_character(',');
+                    }
+
+                    // last element
+                    JSON_ASSERT(!val.m_data.m_value.array->empty());
+                    dump(val.m_data.m_value.array->back(), false, ensure_ascii, indent_step, current_indent);
+
+                    o->write_character(']');
+                }
+
+                return;
+            }
+
+            case value_t::string:
+            {
+                o->write_character('\"');
+                dump_escaped(*val.m_data.m_value.string, ensure_ascii);
+                o->write_character('\"');
+                return;
+            }
+
+            case value_t::binary:
+            {
+                if (pretty_print)
+                {
+                    o->write_characters("{\n", 2);
+
+                    // variable to hold indentation for recursive calls
+                    const auto new_indent = current_indent + indent_step;
+                    if (JSON_HEDLEY_UNLIKELY(indent_string.size() < new_indent))
+                    {
+                        indent_string.resize(indent_string.size() * 2, ' ');
+                    }
+
+                    o->write_characters(indent_string.c_str(), new_indent);
+
+                    o->write_characters("\"bytes\": [", 10);
+
+                    if (!val.m_data.m_value.binary->empty())
+                    {
+                        for (auto i = val.m_data.m_value.binary->cbegin();
+                                i != val.m_data.m_value.binary->cend() - 1; ++i)
+                        {
+                            dump_integer(*i);
+                            o->write_characters(", ", 2);
+                        }
+                        dump_integer(val.m_data.m_value.binary->back());
+                    }
+
+                    o->write_characters("],\n", 3);
+                    o->write_characters(indent_string.c_str(), new_indent);
+
+                    o->write_characters("\"subtype\": ", 11);
+                    if (val.m_data.m_value.binary->has_subtype())
+                    {
+                        dump_integer(val.m_data.m_value.binary->subtype());
+                    }
+                    else
+                    {
+                        o->write_characters("null", 4);
+                    }
+                    o->write_character('\n');
+                    o->write_characters(indent_string.c_str(), current_indent);
+                    o->write_character('}');
+                }
+                else
+                {
+                    o->write_characters("{\"bytes\":[", 10);
+
+                    if (!val.m_data.m_value.binary->empty())
+                    {
+                        for (auto i = val.m_data.m_value.binary->cbegin();
+                                i != val.m_data.m_value.binary->cend() - 1; ++i)
+                        {
+                            dump_integer(*i);
+                            o->write_character(',');
+                        }
+                        dump_integer(val.m_data.m_value.binary->back());
+                    }
+
+                    o->write_characters("],\"subtype\":", 12);
+                    if (val.m_data.m_value.binary->has_subtype())
+                    {
+                        dump_integer(val.m_data.m_value.binary->subtype());
+                        o->write_character('}');
+                    }
+                    else
+                    {
+                        o->write_characters("null}", 5);
+                    }
+                }
+                return;
+            }
+
+            case value_t::boolean:
+            {
+                if (val.m_data.m_value.boolean)
+                {
+                    o->write_characters("true", 4);
+                }
+                else
+                {
+                    o->write_characters("false", 5);
+                }
+                return;
+            }
+
+            case value_t::number_integer:
+            {
+                dump_integer(val.m_data.m_value.number_integer);
+                return;
+            }
+
+            case value_t::number_unsigned:
+            {
+                dump_integer(val.m_data.m_value.number_unsigned);
+                return;
+            }
+
+            case value_t::number_float:
+            {
+                dump_float(val.m_data.m_value.number_float);
+                return;
+            }
+
+            case value_t::discarded:
+            {
+                o->write_characters("<discarded>", 11);
+                return;
+            }
+
+            case value_t::null:
+            {
+                o->write_characters("null", 4);
+                return;
+            }
+
+            default:            // LCOV_EXCL_LINE
+                JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
+        }
+    }
+
+  JSON_PRIVATE_UNLESS_TESTED:
+    /*!
+    @brief dump escaped string
+
+    Escape a string by replacing certain special characters by a sequence of an
+    escape character (backslash) and another character and other control
+    characters by a sequence of "\u" followed by a four-digit hex
+    representation. The escaped string is written to output stream @a o.
+
+    @param[in] s  the string to escape
+    @param[in] ensure_ascii  whether to escape non-ASCII characters with
+                             \uXXXX sequences
+
+    @complexity Linear in the length of string @a s.
+    */
+    void dump_escaped(const string_t& s, const bool ensure_ascii)
+    {
+        std::uint32_t codepoint{};
+        std::uint8_t state = UTF8_ACCEPT;
+        std::size_t bytes = 0;  // number of bytes written to string_buffer
+
+        // number of bytes written at the point of the last valid byte
+        std::size_t bytes_after_last_accept = 0;
+        std::size_t undumped_chars = 0;
+
+        for (std::size_t i = 0; i < s.size(); ++i)
+        {
+            const auto byte = static_cast<std::uint8_t>(s[i]);
+
+            switch (decode(state, codepoint, byte))
+            {
+                case UTF8_ACCEPT:  // decode found a new code point
+                {
+                    switch (codepoint)
+                    {
+                        case 0x08: // backspace
+                        {
+                            string_buffer[bytes++] = '\\';
+                            string_buffer[bytes++] = 'b';
+                            break;
+                        }
+
+                        case 0x09: // horizontal tab
+                        {
+                            string_buffer[bytes++] = '\\';
+                            string_buffer[bytes++] = 't';
+                            break;
+                        }
+
+                        case 0x0A: // newline
+                        {
+                            string_buffer[bytes++] = '\\';
+                            string_buffer[bytes++] = 'n';
+                            break;
+                        }
+
+                        case 0x0C: // formfeed
+                        {
+                            string_buffer[bytes++] = '\\';
+                            string_buffer[bytes++] = 'f';
+                            break;
+                        }
+
+                        case 0x0D: // carriage return
+                        {
+                            string_buffer[bytes++] = '\\';
+                            string_buffer[bytes++] = 'r';
+                            break;
+                        }
+
+                        case 0x22: // quotation mark
+                        {
+                            string_buffer[bytes++] = '\\';
+                            string_buffer[bytes++] = '\"';
+                            break;
+                        }
+
+                        case 0x5C: // reverse solidus
+                        {
+                            string_buffer[bytes++] = '\\';
+                            string_buffer[bytes++] = '\\';
+                            break;
+                        }
+
+                        default:
+                        {
+                            // escape control characters (0x00..0x1F) or, if
+                            // ensure_ascii parameter is used, non-ASCII characters
+                            if ((codepoint <= 0x1F) || (ensure_ascii && (codepoint >= 0x7F)))
+                            {
+                                if (codepoint <= 0xFFFF)
+                                {
+                                    // NOLINTNEXTLINE(cppcoreguidelines-pro-type-vararg,hicpp-vararg)
+                                    static_cast<void>((std::snprintf)(string_buffer.data() + bytes, 7, "\\u%04x",
+                                                                      static_cast<std::uint16_t>(codepoint)));
+                                    bytes += 6;
+                                }
+                                else
+                                {
+                                    // NOLINTNEXTLINE(cppcoreguidelines-pro-type-vararg,hicpp-vararg)
+                                    static_cast<void>((std::snprintf)(string_buffer.data() + bytes, 13, "\\u%04x\\u%04x",
+                                                                      static_cast<std::uint16_t>(0xD7C0u + (codepoint >> 10u)),
+                                                                      static_cast<std::uint16_t>(0xDC00u + (codepoint & 0x3FFu))));
+                                    bytes += 12;
+                                }
+                            }
+                            else
+                            {
+                                // copy byte to buffer (all previous bytes
+                                // been copied have in default case above)
+                                string_buffer[bytes++] = s[i];
+                            }
+                            break;
+                        }
+                    }
+
+                    // write buffer and reset index; there must be 13 bytes
+                    // left, as this is the maximal number of bytes to be
+                    // written ("\uxxxx\uxxxx\0") for one code point
+                    if (string_buffer.size() - bytes < 13)
+                    {
+                        o->write_characters(string_buffer.data(), bytes);
+                        bytes = 0;
+                    }
+
+                    // remember the byte position of this accept
+                    bytes_after_last_accept = bytes;
+                    undumped_chars = 0;
+                    break;
+                }
+
+                case UTF8_REJECT:  // decode found invalid UTF-8 byte
+                {
+                    switch (error_handler)
+                    {
+                        case error_handler_t::strict:
+                        {
+                            JSON_THROW(type_error::create(316, concat("invalid UTF-8 byte at index ", std::to_string(i), ": 0x", hex_bytes(byte | 0)), nullptr));
+                        }
+
+                        case error_handler_t::ignore:
+                        case error_handler_t::replace:
+                        {
+                            // in case we saw this character the first time, we
+                            // would like to read it again, because the byte
+                            // may be OK for itself, but just not OK for the
+                            // previous sequence
+                            if (undumped_chars > 0)
+                            {
+                                --i;
+                            }
+
+                            // reset length buffer to the last accepted index;
+                            // thus removing/ignoring the invalid characters
+                            bytes = bytes_after_last_accept;
+
+                            if (error_handler == error_handler_t::replace)
+                            {
+                                // add a replacement character
+                                if (ensure_ascii)
+                                {
+                                    string_buffer[bytes++] = '\\';
+                                    string_buffer[bytes++] = 'u';
+                                    string_buffer[bytes++] = 'f';
+                                    string_buffer[bytes++] = 'f';
+                                    string_buffer[bytes++] = 'f';
+                                    string_buffer[bytes++] = 'd';
+                                }
+                                else
+                                {
+                                    string_buffer[bytes++] = detail::binary_writer<BasicJsonType, char>::to_char_type('\xEF');
+                                    string_buffer[bytes++] = detail::binary_writer<BasicJsonType, char>::to_char_type('\xBF');
+                                    string_buffer[bytes++] = detail::binary_writer<BasicJsonType, char>::to_char_type('\xBD');
+                                }
+
+                                // write buffer and reset index; there must be 13 bytes
+                                // left, as this is the maximal number of bytes to be
+                                // written ("\uxxxx\uxxxx\0") for one code point
+                                if (string_buffer.size() - bytes < 13)
+                                {
+                                    o->write_characters(string_buffer.data(), bytes);
+                                    bytes = 0;
+                                }
+
+                                bytes_after_last_accept = bytes;
+                            }
+
+                            undumped_chars = 0;
+
+                            // continue processing the string
+                            state = UTF8_ACCEPT;
+                            break;
+                        }
+
+                        default:            // LCOV_EXCL_LINE
+                            JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
+                    }
+                    break;
+                }
+
+                default:  // decode found yet incomplete multi-byte code point
+                {
+                    if (!ensure_ascii)
+                    {
+                        // code point will not be escaped - copy byte to buffer
+                        string_buffer[bytes++] = s[i];
+                    }
+                    ++undumped_chars;
+                    break;
+                }
+            }
+        }
+
+        // we finished processing the string
+        if (JSON_HEDLEY_LIKELY(state == UTF8_ACCEPT))
+        {
+            // write buffer
+            if (bytes > 0)
+            {
+                o->write_characters(string_buffer.data(), bytes);
+            }
+        }
+        else
+        {
+            // we finish reading, but do not accept: string was incomplete
+            switch (error_handler)
+            {
+                case error_handler_t::strict:
+                {
+                    JSON_THROW(type_error::create(316, concat("incomplete UTF-8 string; last byte: 0x", hex_bytes(static_cast<std::uint8_t>(s.back() | 0))), nullptr));
+                }
+
+                case error_handler_t::ignore:
+                {
+                    // write all accepted bytes
+                    o->write_characters(string_buffer.data(), bytes_after_last_accept);
+                    break;
+                }
+
+                case error_handler_t::replace:
+                {
+                    // write all accepted bytes
+                    o->write_characters(string_buffer.data(), bytes_after_last_accept);
+                    // add a replacement character
+                    if (ensure_ascii)
+                    {
+                        o->write_characters("\\ufffd", 6);
+                    }
+                    else
+                    {
+                        o->write_characters("\xEF\xBF\xBD", 3);
+                    }
+                    break;
+                }
+
+                default:            // LCOV_EXCL_LINE
+                    JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
+            }
+        }
+    }
+
+  private:
+    /*!
+    @brief count digits
+
+    Count the number of decimal (base 10) digits for an input unsigned integer.
+
+    @param[in] x  unsigned integer number to count its digits
+    @return    number of decimal digits
+    */
+    unsigned int count_digits(number_unsigned_t x) noexcept
+    {
+        unsigned int n_digits = 1;
+        for (;;)
+        {
+            if (x < 10)
+            {
+                return n_digits;
+            }
+            if (x < 100)
+            {
+                return n_digits + 1;
+            }
+            if (x < 1000)
+            {
+                return n_digits + 2;
+            }
+            if (x < 10000)
+            {
+                return n_digits + 3;
+            }
+            x = x / 10000u;
+            n_digits += 4;
+        }
+    }
+
+    /*!
+     * @brief convert a byte to a uppercase hex representation
+     * @param[in] byte byte to represent
+     * @return representation ("00".."FF")
+     */
+    static std::string hex_bytes(std::uint8_t byte)
+    {
+        std::string result = "FF";
+        constexpr const char* nibble_to_hex = "0123456789ABCDEF";
+        result[0] = nibble_to_hex[byte / 16];
+        result[1] = nibble_to_hex[byte % 16];
+        return result;
+    }
+
+    // templates to avoid warnings about useless casts
+    template <typename NumberType, enable_if_t<std::is_signed<NumberType>::value, int> = 0>
+    bool is_negative_number(NumberType x)
+    {
+        return x < 0;
+    }
+
+    template < typename NumberType, enable_if_t <std::is_unsigned<NumberType>::value, int > = 0 >
+    bool is_negative_number(NumberType /*unused*/)
+    {
+        return false;
+    }
+
+    /*!
+    @brief dump an integer
+
+    Dump a given integer to output stream @a o. Works internally with
+    @a number_buffer.
+
+    @param[in] x  integer number (signed or unsigned) to dump
+    @tparam NumberType either @a number_integer_t or @a number_unsigned_t
+    */
+    template < typename NumberType, detail::enable_if_t <
+                   std::is_integral<NumberType>::value ||
+                   std::is_same<NumberType, number_unsigned_t>::value ||
+                   std::is_same<NumberType, number_integer_t>::value ||
+                   std::is_same<NumberType, binary_char_t>::value,
+                   int > = 0 >
+    void dump_integer(NumberType x)
+    {
+        static constexpr std::array<std::array<char, 2>, 100> digits_to_99
+        {
+            {
+                {{'0', '0'}}, {{'0', '1'}}, {{'0', '2'}}, {{'0', '3'}}, {{'0', '4'}}, {{'0', '5'}}, {{'0', '6'}}, {{'0', '7'}}, {{'0', '8'}}, {{'0', '9'}},
+                {{'1', '0'}}, {{'1', '1'}}, {{'1', '2'}}, {{'1', '3'}}, {{'1', '4'}}, {{'1', '5'}}, {{'1', '6'}}, {{'1', '7'}}, {{'1', '8'}}, {{'1', '9'}},
+                {{'2', '0'}}, {{'2', '1'}}, {{'2', '2'}}, {{'2', '3'}}, {{'2', '4'}}, {{'2', '5'}}, {{'2', '6'}}, {{'2', '7'}}, {{'2', '8'}}, {{'2', '9'}},
+                {{'3', '0'}}, {{'3', '1'}}, {{'3', '2'}}, {{'3', '3'}}, {{'3', '4'}}, {{'3', '5'}}, {{'3', '6'}}, {{'3', '7'}}, {{'3', '8'}}, {{'3', '9'}},
+                {{'4', '0'}}, {{'4', '1'}}, {{'4', '2'}}, {{'4', '3'}}, {{'4', '4'}}, {{'4', '5'}}, {{'4', '6'}}, {{'4', '7'}}, {{'4', '8'}}, {{'4', '9'}},
+                {{'5', '0'}}, {{'5', '1'}}, {{'5', '2'}}, {{'5', '3'}}, {{'5', '4'}}, {{'5', '5'}}, {{'5', '6'}}, {{'5', '7'}}, {{'5', '8'}}, {{'5', '9'}},
+                {{'6', '0'}}, {{'6', '1'}}, {{'6', '2'}}, {{'6', '3'}}, {{'6', '4'}}, {{'6', '5'}}, {{'6', '6'}}, {{'6', '7'}}, {{'6', '8'}}, {{'6', '9'}},
+                {{'7', '0'}}, {{'7', '1'}}, {{'7', '2'}}, {{'7', '3'}}, {{'7', '4'}}, {{'7', '5'}}, {{'7', '6'}}, {{'7', '7'}}, {{'7', '8'}}, {{'7', '9'}},
+                {{'8', '0'}}, {{'8', '1'}}, {{'8', '2'}}, {{'8', '3'}}, {{'8', '4'}}, {{'8', '5'}}, {{'8', '6'}}, {{'8', '7'}}, {{'8', '8'}}, {{'8', '9'}},
+                {{'9', '0'}}, {{'9', '1'}}, {{'9', '2'}}, {{'9', '3'}}, {{'9', '4'}}, {{'9', '5'}}, {{'9', '6'}}, {{'9', '7'}}, {{'9', '8'}}, {{'9', '9'}},
+            }
+        };
+
+        // special case for "0"
+        if (x == 0)
+        {
+            o->write_character('0');
+            return;
+        }
+
+        // use a pointer to fill the buffer
+        auto buffer_ptr = number_buffer.begin(); // NOLINT(llvm-qualified-auto,readability-qualified-auto,cppcoreguidelines-pro-type-vararg,hicpp-vararg)
+
+        number_unsigned_t abs_value;
+
+        unsigned int n_chars{};
+
+        if (is_negative_number(x))
+        {
+            *buffer_ptr = '-';
+            abs_value = remove_sign(static_cast<number_integer_t>(x));
+
+            // account one more byte for the minus sign
+            n_chars = 1 + count_digits(abs_value);
+        }
+        else
+        {
+            abs_value = static_cast<number_unsigned_t>(x);
+            n_chars = count_digits(abs_value);
+        }
+
+        // spare 1 byte for '\0'
+        JSON_ASSERT(n_chars < number_buffer.size() - 1);
+
+        // jump to the end to generate the string from backward,
+        // so we later avoid reversing the result
+        buffer_ptr += n_chars;
+
+        // Fast int2ascii implementation inspired by "Fastware" talk by Andrei Alexandrescu
+        // See: https://www.youtube.com/watch?v=o4-CwDo2zpg
+        while (abs_value >= 100)
+        {
+            const auto digits_index = static_cast<unsigned>((abs_value % 100));
+            abs_value /= 100;
+            *(--buffer_ptr) = digits_to_99[digits_index][1];
+            *(--buffer_ptr) = digits_to_99[digits_index][0];
+        }
+
+        if (abs_value >= 10)
+        {
+            const auto digits_index = static_cast<unsigned>(abs_value);
+            *(--buffer_ptr) = digits_to_99[digits_index][1];
+            *(--buffer_ptr) = digits_to_99[digits_index][0];
+        }
+        else
+        {
+            *(--buffer_ptr) = static_cast<char>('0' + abs_value);
+        }
+
+        o->write_characters(number_buffer.data(), n_chars);
+    }
+
+    /*!
+    @brief dump a floating-point number
+
+    Dump a given floating-point number to output stream @a o. Works internally
+    with @a number_buffer.
+
+    @param[in] x  floating-point number to dump
+    */
+    void dump_float(number_float_t x)
+    {
+        // NaN / inf
+        if (!std::isfinite(x))
+        {
+            o->write_characters("null", 4);
+            return;
+        }
+
+        // If number_float_t is an IEEE-754 single or double precision number,
+        // use the Grisu2 algorithm to produce short numbers which are
+        // guaranteed to round-trip, using strtof and strtod, resp.
+        //
+        // NB: The test below works if <long double> == <double>.
+        static constexpr bool is_ieee_single_or_double
+            = (std::numeric_limits<number_float_t>::is_iec559 && std::numeric_limits<number_float_t>::digits == 24 && std::numeric_limits<number_float_t>::max_exponent == 128) ||
+              (std::numeric_limits<number_float_t>::is_iec559 && std::numeric_limits<number_float_t>::digits == 53 && std::numeric_limits<number_float_t>::max_exponent == 1024);
+
+        dump_float(x, std::integral_constant<bool, is_ieee_single_or_double>());
+    }
+
+    void dump_float(number_float_t x, std::true_type /*is_ieee_single_or_double*/)
+    {
+        auto* begin = number_buffer.data();
+        auto* end = ::nlohmann::detail::to_chars(begin, begin + number_buffer.size(), x);
+
+        o->write_characters(begin, static_cast<size_t>(end - begin));
+    }
+
+    void dump_float(number_float_t x, std::false_type /*is_ieee_single_or_double*/)
+    {
+        // get number of digits for a float -> text -> float round-trip
+        static constexpr auto d = std::numeric_limits<number_float_t>::max_digits10;
+
+        // the actual conversion
+        // NOLINTNEXTLINE(cppcoreguidelines-pro-type-vararg,hicpp-vararg)
+        std::ptrdiff_t len = (std::snprintf)(number_buffer.data(), number_buffer.size(), "%.*g", d, x);
+
+        // negative value indicates an error
+        JSON_ASSERT(len > 0);
+        // check if buffer was large enough
+        JSON_ASSERT(static_cast<std::size_t>(len) < number_buffer.size());
+
+        // erase thousands separator
+        if (thousands_sep != '\0')
+        {
+            // NOLINTNEXTLINE(readability-qualified-auto,llvm-qualified-auto): std::remove returns an iterator, see https://github.com/nlohmann/json/issues/3081
+            const auto end = std::remove(number_buffer.begin(), number_buffer.begin() + len, thousands_sep);
+            std::fill(end, number_buffer.end(), '\0');
+            JSON_ASSERT((end - number_buffer.begin()) <= len);
+            len = (end - number_buffer.begin());
+        }
+
+        // convert decimal point to '.'
+        if (decimal_point != '\0' && decimal_point != '.')
+        {
+            // NOLINTNEXTLINE(readability-qualified-auto,llvm-qualified-auto): std::find returns an iterator, see https://github.com/nlohmann/json/issues/3081
+            const auto dec_pos = std::find(number_buffer.begin(), number_buffer.end(), decimal_point);
+            if (dec_pos != number_buffer.end())
+            {
+                *dec_pos = '.';
+            }
+        }
+
+        o->write_characters(number_buffer.data(), static_cast<std::size_t>(len));
+
+        // determine if we need to append ".0"
+        const bool value_is_int_like =
+            std::none_of(number_buffer.begin(), number_buffer.begin() + len + 1,
+                         [](char c)
+        {
+            return c == '.' || c == 'e';
+        });
+
+        if (value_is_int_like)
+        {
+            o->write_characters(".0", 2);
+        }
+    }
+
+    /*!
+    @brief check whether a string is UTF-8 encoded
+
+    The function checks each byte of a string whether it is UTF-8 encoded. The
+    result of the check is stored in the @a state parameter. The function must
+    be called initially with state 0 (accept). State 1 means the string must
+    be rejected, because the current byte is not allowed. If the string is
+    completely processed, but the state is non-zero, the string ended
+    prematurely; that is, the last byte indicated more bytes should have
+    followed.
+
+    @param[in,out] state  the state of the decoding
+    @param[in,out] codep  codepoint (valid only if resulting state is UTF8_ACCEPT)
+    @param[in] byte       next byte to decode
+    @return               new state
+
+    @note The function has been edited: a std::array is used.
+
+    @copyright Copyright (c) 2008-2009 Bjoern Hoehrmann <bjoern@hoehrmann.de>
+    @sa http://bjoern.hoehrmann.de/utf-8/decoder/dfa/
+    */
+    static std::uint8_t decode(std::uint8_t& state, std::uint32_t& codep, const std::uint8_t byte) noexcept
+    {
+        static const std::array<std::uint8_t, 400> utf8d =
+        {
+            {
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 00..1F
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 20..3F
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 40..5F
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 60..7F
+                1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, // 80..9F
+                7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // A0..BF
+                8, 8, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, // C0..DF
+                0xA, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x4, 0x3, 0x3, // E0..EF
+                0xB, 0x6, 0x6, 0x6, 0x5, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, // F0..FF
+                0x0, 0x1, 0x2, 0x3, 0x5, 0x8, 0x7, 0x1, 0x1, 0x1, 0x4, 0x6, 0x1, 0x1, 0x1, 0x1, // s0..s0
+                1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, // s1..s2
+                1, 2, 1, 1, 1, 1, 1, 2, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, // s3..s4
+                1, 2, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 3, 1, 1, 1, 1, 1, 1, // s5..s6
+                1, 3, 1, 1, 1, 1, 1, 3, 1, 3, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 // s7..s8
+            }
+        };
+
+        JSON_ASSERT(byte < utf8d.size());
+        const std::uint8_t type = utf8d[byte];
+
+        codep = (state != UTF8_ACCEPT)
+                ? (byte & 0x3fu) | (codep << 6u)
+                : (0xFFu >> type) & (byte);
+
+        const std::size_t index = 256u + (static_cast<size_t>(state) * 16u) + static_cast<size_t>(type);
+        JSON_ASSERT(index < utf8d.size());
+        state = utf8d[index];
+        return state;
+    }
+
+    /*
+     * Overload to make the compiler happy while it is instantiating
+     * dump_integer for number_unsigned_t.
+     * Must never be called.
+     */
+    number_unsigned_t remove_sign(number_unsigned_t x)
+    {
+        JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
+        return x; // LCOV_EXCL_LINE
+    }
+
+    /*
+     * Helper function for dump_integer
+     *
+     * This function takes a negative signed integer and returns its absolute
+     * value as unsigned integer. The plus/minus shuffling is necessary as we can
+     * not directly remove the sign of an arbitrary signed integer as the
+     * absolute values of INT_MIN and INT_MAX are usually not the same. See
+     * #1708 for details.
+     */
+    number_unsigned_t remove_sign(number_integer_t x) noexcept
+    {
+        JSON_ASSERT(x < 0 && x < (std::numeric_limits<number_integer_t>::max)()); // NOLINT(misc-redundant-expression)
+        return static_cast<number_unsigned_t>(-(x + 1)) + 1;
+    }
+
+  private:
+    /// the output of the serializer
+    output_adapter_t<char> o = nullptr;
+
+    /// a (hopefully) large enough character buffer
+    std::array<char, 64> number_buffer{{}};
+
+    /// the locale
+    const std::lconv* loc = nullptr;
+    /// the locale's thousand separator character
+    const char thousands_sep = '\0';
+    /// the locale's decimal point character
+    const char decimal_point = '\0';
+
+    /// string buffer
+    std::array<char, 512> string_buffer{{}};
+
+    /// the indentation character
+    const char indent_char;
+    /// the indentation string
+    string_t indent_string;
+
+    /// error_handler how to react on decoding errors
+    const error_handler_t error_handler;
+};
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/value_t.hpp>
+
+// #include <nlohmann/json_fwd.hpp>
+
+// #include <nlohmann/ordered_map.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013 - 2025 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <functional> // equal_to, less
+#include <initializer_list> // initializer_list
+#include <iterator> // input_iterator_tag, iterator_traits
+#include <memory> // allocator
+#include <stdexcept> // for out_of_range
+#include <type_traits> // enable_if, is_convertible
+#include <utility> // pair
+#include <vector> // vector
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/meta/type_traits.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+
+/// ordered_map: a minimal map-like container that preserves insertion order
+/// for use within nlohmann::basic_json<ordered_map>
+template <class Key, class T, class IgnoredLess = std::less<Key>,
+          class Allocator = std::allocator<std::pair<const Key, T>>>
+              struct ordered_map : std::vector<std::pair<const Key, T>, Allocator>
+{
+    using key_type = Key;
+    using mapped_type = T;
+    using Container = std::vector<std::pair<const Key, T>, Allocator>;
+    using iterator = typename Container::iterator;
+    using const_iterator = typename Container::const_iterator;
+    using size_type = typename Container::size_type;
+    using value_type = typename Container::value_type;
+#ifdef JSON_HAS_CPP_14
+    using key_compare = std::equal_to<>;
+#else
+    using key_compare = std::equal_to<Key>;
+#endif
+
+    // Explicit constructors instead of `using Container::Container`
+    // otherwise older compilers choke on it (GCC <= 5.5, xcode <= 9.4)
+    ordered_map() noexcept(noexcept(Container())) : Container{} {}
+    explicit ordered_map(const Allocator& alloc) noexcept(noexcept(Container(alloc))) : Container{alloc} {}
+    template <class It>
+    ordered_map(It first, It last, const Allocator& alloc = Allocator())
+        : Container{first, last, alloc} {}
+    ordered_map(std::initializer_list<value_type> init, const Allocator& alloc = Allocator() )
+        : Container{init, alloc} {}
+
+    std::pair<iterator, bool> emplace(const key_type& key, T&& t)
+    {
+        for (auto it = this->begin(); it != this->end(); ++it)
+        {
+            if (m_compare(it->first, key))
+            {
+                return {it, false};
+            }
+        }
+        Container::emplace_back(key, std::forward<T>(t));
+        return {std::prev(this->end()), true};
+    }
+
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_key_type<key_compare, key_type, KeyType>::value, int> = 0>
+    std::pair<iterator, bool> emplace(KeyType && key, T && t)
+    {
+        for (auto it = this->begin(); it != this->end(); ++it)
+        {
+            if (m_compare(it->first, key))
+            {
+                return {it, false};
+            }
+        }
+        Container::emplace_back(std::forward<KeyType>(key), std::forward<T>(t));
+        return {std::prev(this->end()), true};
+    }
+
+    T& operator[](const key_type& key)
+    {
+        return emplace(key, T{}).first->second;
+    }
+
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_key_type<key_compare, key_type, KeyType>::value, int> = 0>
+    T & operator[](KeyType && key)
+    {
+        return emplace(std::forward<KeyType>(key), T{}).first->second;
+    }
+
+    const T& operator[](const key_type& key) const
+    {
+        return at(key);
+    }
+
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_key_type<key_compare, key_type, KeyType>::value, int> = 0>
+    const T & operator[](KeyType && key) const
+    {
+        return at(std::forward<KeyType>(key));
+    }
+
+    T& at(const key_type& key)
+    {
+        for (auto it = this->begin(); it != this->end(); ++it)
+        {
+            if (m_compare(it->first, key))
+            {
+                return it->second;
+            }
+        }
+
+        JSON_THROW(std::out_of_range("key not found"));
+    }
+
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_key_type<key_compare, key_type, KeyType>::value, int> = 0>
+    T & at(KeyType && key) // NOLINT(cppcoreguidelines-missing-std-forward)
+    {
+        for (auto it = this->begin(); it != this->end(); ++it)
+        {
+            if (m_compare(it->first, key))
+            {
+                return it->second;
+            }
+        }
+
+        JSON_THROW(std::out_of_range("key not found"));
+    }
+
+    const T& at(const key_type& key) const
+    {
+        for (auto it = this->begin(); it != this->end(); ++it)
+        {
+            if (m_compare(it->first, key))
+            {
+                return it->second;
+            }
+        }
+
+        JSON_THROW(std::out_of_range("key not found"));
+    }
+
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_key_type<key_compare, key_type, KeyType>::value, int> = 0>
+    const T & at(KeyType && key) const // NOLINT(cppcoreguidelines-missing-std-forward)
+    {
+        for (auto it = this->begin(); it != this->end(); ++it)
+        {
+            if (m_compare(it->first, key))
+            {
+                return it->second;
+            }
+        }
+
+        JSON_THROW(std::out_of_range("key not found"));
+    }
+
+    size_type erase(const key_type& key)
+    {
+        for (auto it = this->begin(); it != this->end(); ++it)
+        {
+            if (m_compare(it->first, key))
+            {
+                // Since we cannot move const Keys, re-construct them in place
+                for (auto next = it; ++next != this->end(); ++it)
+                {
+                    it->~value_type(); // Destroy but keep allocation
+                    new (&*it) value_type{std::move(*next)};
+                }
+                Container::pop_back();
+                return 1;
+            }
+        }
+        return 0;
+    }
+
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_key_type<key_compare, key_type, KeyType>::value, int> = 0>
+    size_type erase(KeyType && key) // NOLINT(cppcoreguidelines-missing-std-forward)
+    {
+        for (auto it = this->begin(); it != this->end(); ++it)
+        {
+            if (m_compare(it->first, key))
+            {
+                // Since we cannot move const Keys, re-construct them in place
+                for (auto next = it; ++next != this->end(); ++it)
+                {
+                    it->~value_type(); // Destroy but keep allocation
+                    new (&*it) value_type{std::move(*next)};
+                }
+                Container::pop_back();
+                return 1;
+            }
+        }
+        return 0;
+    }
+
+    iterator erase(iterator pos)
+    {
+        return erase(pos, std::next(pos));
+    }
+
+    iterator erase(iterator first, iterator last)
+    {
+        if (first == last)
+        {
+            return first;
+        }
+
+        const auto elements_affected = std::distance(first, last);
+        const auto offset = std::distance(Container::begin(), first);
+
+        // This is the start situation. We need to delete elements_affected
+        // elements (3 in this example: e, f, g), and need to return an
+        // iterator past the last deleted element (h in this example).
+        // Note that offset is the distance from the start of the vector
+        // to first. We will need this later.
+
+        // [ a, b, c, d, e, f, g, h, i, j ]
+        //               ^        ^
+        //             first    last
+
+        // Since we cannot move const Keys, we re-construct them in place.
+        // We start at first and re-construct (viz. copy) the elements from
+        // the back of the vector. Example for first iteration:
+
+        //               ,--------.
+        //               v        |   destroy e and re-construct with h
+        // [ a, b, c, d, e, f, g, h, i, j ]
+        //               ^        ^
+        //               it       it + elements_affected
+
+        for (auto it = first; std::next(it, elements_affected) != Container::end(); ++it)
+        {
+            it->~value_type(); // destroy but keep allocation
+            new (&*it) value_type{std::move(*std::next(it, elements_affected))}; // "move" next element to it
+        }
+
+        // [ a, b, c, d, h, i, j, h, i, j ]
+        //               ^        ^
+        //             first    last
+
+        // remove the unneeded elements at the end of the vector
+        Container::resize(this->size() - static_cast<size_type>(elements_affected));
+
+        // [ a, b, c, d, h, i, j ]
+        //               ^        ^
+        //             first    last
+
+        // first is now pointing past the last deleted element, but we cannot
+        // use this iterator, because it may have been invalidated by the
+        // resize call. Instead, we can return begin() + offset.
+        return Container::begin() + offset;
+    }
+
+    size_type count(const key_type& key) const
+    {
+        for (auto it = this->begin(); it != this->end(); ++it)
+        {
+            if (m_compare(it->first, key))
+            {
+                return 1;
+            }
+        }
+        return 0;
+    }
+
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_key_type<key_compare, key_type, KeyType>::value, int> = 0>
+    size_type count(KeyType && key) const // NOLINT(cppcoreguidelines-missing-std-forward)
+    {
+        for (auto it = this->begin(); it != this->end(); ++it)
+        {
+            if (m_compare(it->first, key))
+            {
+                return 1;
+            }
+        }
+        return 0;
+    }
+
+    iterator find(const key_type& key)
+    {
+        for (auto it = this->begin(); it != this->end(); ++it)
+        {
+            if (m_compare(it->first, key))
+            {
+                return it;
+            }
+        }
+        return Container::end();
+    }
+
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_key_type<key_compare, key_type, KeyType>::value, int> = 0>
+    iterator find(KeyType && key) // NOLINT(cppcoreguidelines-missing-std-forward)
+    {
+        for (auto it = this->begin(); it != this->end(); ++it)
+        {
+            if (m_compare(it->first, key))
+            {
+                return it;
+            }
+        }
+        return Container::end();
+    }
+
+    const_iterator find(const key_type& key) const
+    {
+        for (auto it = this->begin(); it != this->end(); ++it)
+        {
+            if (m_compare(it->first, key))
+            {
+                return it;
+            }
+        }
+        return Container::end();
+    }
+
+    std::pair<iterator, bool> insert( value_type&& value )
+    {
+        return emplace(value.first, std::move(value.second));
+    }
+
+    std::pair<iterator, bool> insert( const value_type& value )
+    {
+        for (auto it = this->begin(); it != this->end(); ++it)
+        {
+            if (m_compare(it->first, value.first))
+            {
+                return {it, false};
+            }
+        }
+        Container::push_back(value);
+        return {--this->end(), true};
+    }
+
+    template<typename InputIt>
+    using require_input_iter = typename std::enable_if<std::is_convertible<typename std::iterator_traits<InputIt>::iterator_category,
+        std::input_iterator_tag>::value>::type;
+
+    template<typename InputIt, typename = require_input_iter<InputIt>>
+    void insert(InputIt first, InputIt last)
+    {
+        for (auto it = first; it != last; ++it)
+        {
+            insert(*it);
+        }
+    }
+
+private:
+    JSON_NO_UNIQUE_ADDRESS key_compare m_compare = key_compare();
+};
+
+NLOHMANN_JSON_NAMESPACE_END
+
+
+#if defined(JSON_HAS_CPP_17)
+    #if JSON_HAS_STATIC_RTTI
+        #include <any>
+    #endif
+    #include <string_view>
+#endif
+
+/*!
+@brief namespace for Niels Lohmann
+@see https://github.com/nlohmann
+@since version 1.0.0
+*/
+NLOHMANN_JSON_NAMESPACE_BEGIN
+
+/*!
+@brief a class to store JSON values
+
+@internal
+@invariant The member variables @a m_value and @a m_type have the following
+relationship:
+- If `m_type == value_t::object`, then `m_value.object != nullptr`.
+- If `m_type == value_t::array`, then `m_value.array != nullptr`.
+- If `m_type == value_t::string`, then `m_value.string != nullptr`.
+The invariants are checked by member function assert_invariant().
+
+@note ObjectType trick from https://stackoverflow.com/a/9860911
+@endinternal
+
+@since version 1.0.0
+
+@nosubgrouping
+*/
+NLOHMANN_BASIC_JSON_TPL_DECLARATION
+class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-special-member-functions)
+    : public ::nlohmann::detail::json_base_class<CustomBaseClass>
+{
+  private:
+    template<detail::value_t> friend struct detail::external_constructor;
+
+    template<typename>
+    friend class ::nlohmann::json_pointer;
+    // can be restored when json_pointer backwards compatibility is removed
+    // friend ::nlohmann::json_pointer<StringType>;
+
+    template<typename BasicJsonType, typename InputType>
+    friend class ::nlohmann::detail::parser;
+    friend ::nlohmann::detail::serializer<basic_json>;
+    template<typename BasicJsonType>
+    friend class ::nlohmann::detail::iter_impl;
+    template<typename BasicJsonType, typename CharType>
+    friend class ::nlohmann::detail::binary_writer;
+    template<typename BasicJsonType, typename InputType, typename SAX>
+    friend class ::nlohmann::detail::binary_reader;
+    template<typename BasicJsonType, typename InputAdapterType>
+    friend class ::nlohmann::detail::json_sax_dom_parser;
+    template<typename BasicJsonType, typename InputAdapterType>
+    friend class ::nlohmann::detail::json_sax_dom_callback_parser;
+    friend class ::nlohmann::detail::exception;
+
+    /// workaround type for MSVC
+    using basic_json_t = NLOHMANN_BASIC_JSON_TPL;
+    using json_base_class_t = ::nlohmann::detail::json_base_class<CustomBaseClass>;
+
+  JSON_PRIVATE_UNLESS_TESTED:
+    // convenience aliases for types residing in namespace detail;
+    using lexer = ::nlohmann::detail::lexer_base<basic_json>;
+
+    template<typename InputAdapterType>
+    static ::nlohmann::detail::parser<basic_json, InputAdapterType> parser(
+        InputAdapterType adapter,
+        detail::parser_callback_t<basic_json>cb = nullptr,
+        const bool allow_exceptions = true,
+        const bool ignore_comments = false
+                                 )
+    {
+        return ::nlohmann::detail::parser<basic_json, InputAdapterType>(std::move(adapter),
+            std::move(cb), allow_exceptions, ignore_comments);
+    }
+
+  private:
+    using primitive_iterator_t = ::nlohmann::detail::primitive_iterator_t;
+    template<typename BasicJsonType>
+    using internal_iterator = ::nlohmann::detail::internal_iterator<BasicJsonType>;
+    template<typename BasicJsonType>
+    using iter_impl = ::nlohmann::detail::iter_impl<BasicJsonType>;
+    template<typename Iterator>
+    using iteration_proxy = ::nlohmann::detail::iteration_proxy<Iterator>;
+    template<typename Base> using json_reverse_iterator = ::nlohmann::detail::json_reverse_iterator<Base>;
+
+    template<typename CharType>
+    using output_adapter_t = ::nlohmann::detail::output_adapter_t<CharType>;
+
+    template<typename InputType>
+    using binary_reader = ::nlohmann::detail::binary_reader<basic_json, InputType>;
+    template<typename CharType> using binary_writer = ::nlohmann::detail::binary_writer<basic_json, CharType>;
+
+  JSON_PRIVATE_UNLESS_TESTED:
+    using serializer = ::nlohmann::detail::serializer<basic_json>;
+
+  public:
+    using value_t = detail::value_t;
+    /// JSON Pointer, see @ref nlohmann::json_pointer
+    using json_pointer = ::nlohmann::json_pointer<StringType>;
+    template<typename T, typename SFINAE>
+    using json_serializer = JSONSerializer<T, SFINAE>;
+    /// how to treat decoding errors
+    using error_handler_t = detail::error_handler_t;
+    /// how to treat CBOR tags
+    using cbor_tag_handler_t = detail::cbor_tag_handler_t;
+    /// how to encode BJData
+    using bjdata_version_t = detail::bjdata_version_t;
+    /// helper type for initializer lists of basic_json values
+    using initializer_list_t = std::initializer_list<detail::json_ref<basic_json>>;
+
+    using input_format_t = detail::input_format_t;
+    /// SAX interface type, see @ref nlohmann::json_sax
+    using json_sax_t = json_sax<basic_json>;
+
+    ////////////////
+    // exceptions //
+    ////////////////
+
+    /// @name exceptions
+    /// Classes to implement user-defined exceptions.
+    /// @{
+
+    using exception = detail::exception;
+    using parse_error = detail::parse_error;
+    using invalid_iterator = detail::invalid_iterator;
+    using type_error = detail::type_error;
+    using out_of_range = detail::out_of_range;
+    using other_error = detail::other_error;
+
+    /// @}
+
+    /////////////////////
+    // container types //
+    /////////////////////
+
+    /// @name container types
+    /// The canonic container types to use @ref basic_json like any other STL
+    /// container.
+    /// @{
+
+    /// the type of elements in a basic_json container
+    using value_type = basic_json;
+
+    /// the type of an element reference
+    using reference = value_type&;
+    /// the type of an element const reference
+    using const_reference = const value_type&;
+
+    /// a type to represent differences between iterators
+    using difference_type = std::ptrdiff_t;
+    /// a type to represent container sizes
+    using size_type = std::size_t;
+
+    /// the allocator type
+    using allocator_type = AllocatorType<basic_json>;
+
+    /// the type of an element pointer
+    using pointer = typename std::allocator_traits<allocator_type>::pointer;
+    /// the type of an element const pointer
+    using const_pointer = typename std::allocator_traits<allocator_type>::const_pointer;
+
+    /// an iterator for a basic_json container
+    using iterator = iter_impl<basic_json>;
+    /// a const iterator for a basic_json container
+    using const_iterator = iter_impl<const basic_json>;
+    /// a reverse iterator for a basic_json container
+    using reverse_iterator = json_reverse_iterator<typename basic_json::iterator>;
+    /// a const reverse iterator for a basic_json container
+    using const_reverse_iterator = json_reverse_iterator<typename basic_json::const_iterator>;
+
+    /// @}
+
+    /// @brief returns the allocator associated with the container
+    /// @sa https://json.nlohmann.me/api/basic_json/get_allocator/
+    static allocator_type get_allocator()
+    {
+        return allocator_type();
+    }
+
+    /// @brief returns version information on the library
+    /// @sa https://json.nlohmann.me/api/basic_json/meta/
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json meta()
+    {
+        basic_json result;
+
+        result["copyright"] = "(C) 2013-2025 Niels Lohmann";
+        result["name"] = "JSON for Modern C++";
+        result["url"] = "https://github.com/nlohmann/json";
+        result["version"]["string"] =
+            detail::concat(std::to_string(NLOHMANN_JSON_VERSION_MAJOR), '.',
+                           std::to_string(NLOHMANN_JSON_VERSION_MINOR), '.',
+                           std::to_string(NLOHMANN_JSON_VERSION_PATCH));
+        result["version"]["major"] = NLOHMANN_JSON_VERSION_MAJOR;
+        result["version"]["minor"] = NLOHMANN_JSON_VERSION_MINOR;
+        result["version"]["patch"] = NLOHMANN_JSON_VERSION_PATCH;
+
+#ifdef _WIN32
+        result["platform"] = "win32";
+#elif defined __linux__
+        result["platform"] = "linux";
+#elif defined __APPLE__
+        result["platform"] = "apple";
+#elif defined __unix__
+        result["platform"] = "unix";
+#else
+        result["platform"] = "unknown";
+#endif
+
+#if defined(__ICC) || defined(__INTEL_COMPILER)
+        result["compiler"] = {{"family", "icc"}, {"version", __INTEL_COMPILER}};
+#elif defined(__clang__)
+        result["compiler"] = {{"family", "clang"}, {"version", __clang_version__}};
+#elif defined(__GNUC__) || defined(__GNUG__)
+        result["compiler"] = {{"family", "gcc"}, {"version", detail::concat(
+                    std::to_string(__GNUC__), '.',
+                    std::to_string(__GNUC_MINOR__), '.',
+                    std::to_string(__GNUC_PATCHLEVEL__))
+            }
+        };
+#elif defined(__HP_cc) || defined(__HP_aCC)
+        result["compiler"] = "hp"
+#elif defined(__IBMCPP__)
+        result["compiler"] = {{"family", "ilecpp"}, {"version", __IBMCPP__}};
+#elif defined(_MSC_VER)
+        result["compiler"] = {{"family", "msvc"}, {"version", _MSC_VER}};
+#elif defined(__PGI)
+        result["compiler"] = {{"family", "pgcpp"}, {"version", __PGI}};
+#elif defined(__SUNPRO_CC)
+        result["compiler"] = {{"family", "sunpro"}, {"version", __SUNPRO_CC}};
+#else
+        result["compiler"] = {{"family", "unknown"}, {"version", "unknown"}};
+#endif
+
+#if defined(_MSVC_LANG)
+        result["compiler"]["c++"] = std::to_string(_MSVC_LANG);
+#elif defined(__cplusplus)
+        result["compiler"]["c++"] = std::to_string(__cplusplus);
+#else
+        result["compiler"]["c++"] = "unknown";
+#endif
+        return result;
+    }
+
+    ///////////////////////////
+    // JSON value data types //
+    ///////////////////////////
+
+    /// @name JSON value data types
+    /// The data types to store a JSON value. These types are derived from
+    /// the template arguments passed to class @ref basic_json.
+    /// @{
+
+    /// @brief default object key comparator type
+    /// The actual object key comparator type (@ref object_comparator_t) may be
+    /// different.
+    /// @sa https://json.nlohmann.me/api/basic_json/default_object_comparator_t/
+#if defined(JSON_HAS_CPP_14)
+    // use of transparent comparator avoids unnecessary repeated construction of temporaries
+    // in functions involving lookup by key with types other than object_t::key_type (aka. StringType)
+    using default_object_comparator_t = std::less<>;
+#else
+    using default_object_comparator_t = std::less<StringType>;
+#endif
+
+    /// @brief a type for an object
+    /// @sa https://json.nlohmann.me/api/basic_json/object_t/
+    using object_t = ObjectType<StringType,
+          basic_json,
+          default_object_comparator_t,
+          AllocatorType<std::pair<const StringType,
+          basic_json>>>;
+
+    /// @brief a type for an array
+    /// @sa https://json.nlohmann.me/api/basic_json/array_t/
+    using array_t = ArrayType<basic_json, AllocatorType<basic_json>>;
+
+    /// @brief a type for a string
+    /// @sa https://json.nlohmann.me/api/basic_json/string_t/
+    using string_t = StringType;
+
+    /// @brief a type for a boolean
+    /// @sa https://json.nlohmann.me/api/basic_json/boolean_t/
+    using boolean_t = BooleanType;
+
+    /// @brief a type for a number (integer)
+    /// @sa https://json.nlohmann.me/api/basic_json/number_integer_t/
+    using number_integer_t = NumberIntegerType;
+
+    /// @brief a type for a number (unsigned)
+    /// @sa https://json.nlohmann.me/api/basic_json/number_unsigned_t/
+    using number_unsigned_t = NumberUnsignedType;
+
+    /// @brief a type for a number (floating-point)
+    /// @sa https://json.nlohmann.me/api/basic_json/number_float_t/
+    using number_float_t = NumberFloatType;
+
+    /// @brief a type for a packed binary type
+    /// @sa https://json.nlohmann.me/api/basic_json/binary_t/
+    using binary_t = nlohmann::byte_container_with_subtype<BinaryType>;
+
+    /// @brief object key comparator type
+    /// @sa https://json.nlohmann.me/api/basic_json/object_comparator_t/
+    using object_comparator_t = detail::actual_object_comparator_t<basic_json>;
+
+    /// @}
+
+  private:
+
+    /// helper for exception-safe object creation
+    template<typename T, typename... Args>
+    JSON_HEDLEY_RETURNS_NON_NULL
+    static T* create(Args&& ... args)
+    {
+        AllocatorType<T> alloc;
+        using AllocatorTraits = std::allocator_traits<AllocatorType<T>>;
+
+        auto deleter = [&](T * obj)
+        {
+            AllocatorTraits::deallocate(alloc, obj, 1);
+        };
+        std::unique_ptr<T, decltype(deleter)> obj(AllocatorTraits::allocate(alloc, 1), deleter);
+        AllocatorTraits::construct(alloc, obj.get(), std::forward<Args>(args)...);
+        JSON_ASSERT(obj != nullptr);
+        return obj.release();
+    }
+
+    ////////////////////////
+    // JSON value storage //
+    ////////////////////////
+
+  JSON_PRIVATE_UNLESS_TESTED:
+    /*!
+    @brief a JSON value
+
+    The actual storage for a JSON value of the @ref basic_json class. This
+    union combines the different storage types for the JSON value types
+    defined in @ref value_t.
+
+    JSON type | value_t type    | used type
+    --------- | --------------- | ------------------------
+    object    | object          | pointer to @ref object_t
+    array     | array           | pointer to @ref array_t
+    string    | string          | pointer to @ref string_t
+    boolean   | boolean         | @ref boolean_t
+    number    | number_integer  | @ref number_integer_t
+    number    | number_unsigned | @ref number_unsigned_t
+    number    | number_float    | @ref number_float_t
+    binary    | binary          | pointer to @ref binary_t
+    null      | null            | *no value is stored*
+
+    @note Variable-length types (objects, arrays, and strings) are stored as
+    pointers. The size of the union should not exceed 64 bits if the default
+    value types are used.
+
+    @since version 1.0.0
+    */
+    union json_value
+    {
+        /// object (stored with pointer to save storage)
+        object_t* object;
+        /// array (stored with pointer to save storage)
+        array_t* array;
+        /// string (stored with pointer to save storage)
+        string_t* string;
+        /// binary (stored with pointer to save storage)
+        binary_t* binary;
+        /// boolean
+        boolean_t boolean;
+        /// number (integer)
+        number_integer_t number_integer;
+        /// number (unsigned integer)
+        number_unsigned_t number_unsigned;
+        /// number (floating-point)
+        number_float_t number_float;
+
+        /// default constructor (for null values)
+        json_value() = default;
+        /// constructor for booleans
+        json_value(boolean_t v) noexcept : boolean(v) {}
+        /// constructor for numbers (integer)
+        json_value(number_integer_t v) noexcept : number_integer(v) {}
+        /// constructor for numbers (unsigned)
+        json_value(number_unsigned_t v) noexcept : number_unsigned(v) {}
+        /// constructor for numbers (floating-point)
+        json_value(number_float_t v) noexcept : number_float(v) {}
+        /// constructor for empty values of a given type
+        json_value(value_t t)
+        {
+            switch (t)
+            {
+                case value_t::object:
+                {
+                    object = create<object_t>();
+                    break;
+                }
+
+                case value_t::array:
+                {
+                    array = create<array_t>();
+                    break;
+                }
+
+                case value_t::string:
+                {
+                    string = create<string_t>("");
+                    break;
+                }
+
+                case value_t::binary:
+                {
+                    binary = create<binary_t>();
+                    break;
+                }
+
+                case value_t::boolean:
+                {
+                    boolean = static_cast<boolean_t>(false);
+                    break;
+                }
+
+                case value_t::number_integer:
+                {
+                    number_integer = static_cast<number_integer_t>(0);
+                    break;
+                }
+
+                case value_t::number_unsigned:
+                {
+                    number_unsigned = static_cast<number_unsigned_t>(0);
+                    break;
+                }
+
+                case value_t::number_float:
+                {
+                    number_float = static_cast<number_float_t>(0.0);
+                    break;
+                }
+
+                case value_t::null:
+                {
+                    object = nullptr;  // silence warning, see #821
+                    break;
+                }
+
+                case value_t::discarded:
+                default:
+                {
+                    object = nullptr;  // silence warning, see #821
+                    if (JSON_HEDLEY_UNLIKELY(t == value_t::null))
+                    {
+                        JSON_THROW(other_error::create(500, "961c151d2e87f2686a955a9be24d316f1362bf21 3.12.0", nullptr)); // LCOV_EXCL_LINE
+                    }
+                    break;
+                }
+            }
+        }
+
+        /// constructor for strings
+        json_value(const string_t& value) : string(create<string_t>(value)) {}
+
+        /// constructor for rvalue strings
+        json_value(string_t&& value) : string(create<string_t>(std::move(value))) {}
+
+        /// constructor for objects
+        json_value(const object_t& value) : object(create<object_t>(value)) {}
+
+        /// constructor for rvalue objects
+        json_value(object_t&& value) : object(create<object_t>(std::move(value))) {}
+
+        /// constructor for arrays
+        json_value(const array_t& value) : array(create<array_t>(value)) {}
+
+        /// constructor for rvalue arrays
+        json_value(array_t&& value) : array(create<array_t>(std::move(value))) {}
+
+        /// constructor for binary arrays
+        json_value(const typename binary_t::container_type& value) : binary(create<binary_t>(value)) {}
+
+        /// constructor for rvalue binary arrays
+        json_value(typename binary_t::container_type&& value) : binary(create<binary_t>(std::move(value))) {}
+
+        /// constructor for binary arrays (internal type)
+        json_value(const binary_t& value) : binary(create<binary_t>(value)) {}
+
+        /// constructor for rvalue binary arrays (internal type)
+        json_value(binary_t&& value) : binary(create<binary_t>(std::move(value))) {}
+
+        void destroy(value_t t)
+        {
+            if (
+                (t == value_t::object && object == nullptr) ||
+                (t == value_t::array && array == nullptr) ||
+                (t == value_t::string && string == nullptr) ||
+                (t == value_t::binary && binary == nullptr)
+            )
+            {
+                //not initialized (e.g. due to exception in the ctor)
+                return;
+            }
+            if (t == value_t::array || t == value_t::object)
+            {
+                // flatten the current json_value to a heap-allocated stack
+                std::vector<basic_json> stack;
+
+                // move the top-level items to stack
+                if (t == value_t::array)
+                {
+                    stack.reserve(array->size());
+                    std::move(array->begin(), array->end(), std::back_inserter(stack));
+                }
+                else
+                {
+                    stack.reserve(object->size());
+                    for (auto&& it : *object)
+                    {
+                        stack.push_back(std::move(it.second));
+                    }
+                }
+
+                while (!stack.empty())
+                {
+                    // move the last item to local variable to be processed
+                    basic_json current_item(std::move(stack.back()));
+                    stack.pop_back();
+
+                    // if current_item is array/object, move
+                    // its children to the stack to be processed later
+                    if (current_item.is_array())
+                    {
+                        std::move(current_item.m_data.m_value.array->begin(), current_item.m_data.m_value.array->end(), std::back_inserter(stack));
+
+                        current_item.m_data.m_value.array->clear();
+                    }
+                    else if (current_item.is_object())
+                    {
+                        for (auto&& it : *current_item.m_data.m_value.object)
+                        {
+                            stack.push_back(std::move(it.second));
+                        }
+
+                        current_item.m_data.m_value.object->clear();
+                    }
+
+                    // it's now safe that current_item get destructed
+                    // since it doesn't have any children
+                }
+            }
+
+            switch (t)
+            {
+                case value_t::object:
+                {
+                    AllocatorType<object_t> alloc;
+                    std::allocator_traits<decltype(alloc)>::destroy(alloc, object);
+                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, object, 1);
+                    break;
+                }
+
+                case value_t::array:
+                {
+                    AllocatorType<array_t> alloc;
+                    std::allocator_traits<decltype(alloc)>::destroy(alloc, array);
+                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, array, 1);
+                    break;
+                }
+
+                case value_t::string:
+                {
+                    AllocatorType<string_t> alloc;
+                    std::allocator_traits<decltype(alloc)>::destroy(alloc, string);
+                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, string, 1);
+                    break;
+                }
+
+                case value_t::binary:
+                {
+                    AllocatorType<binary_t> alloc;
+                    std::allocator_traits<decltype(alloc)>::destroy(alloc, binary);
+                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, binary, 1);
+                    break;
+                }
+
+                case value_t::null:
+                case value_t::boolean:
+                case value_t::number_integer:
+                case value_t::number_unsigned:
+                case value_t::number_float:
+                case value_t::discarded:
+                default:
+                {
+                    break;
+                }
+            }
+        }
+    };
+
+  private:
+    /*!
+    @brief checks the class invariants
+
+    This function asserts the class invariants. It needs to be called at the
+    end of every constructor to make sure that created objects respect the
+    invariant. Furthermore, it has to be called each time the type of a JSON
+    value is changed, because the invariant expresses a relationship between
+    @a m_type and @a m_value.
+
+    Furthermore, the parent relation is checked for arrays and objects: If
+    @a check_parents true and the value is an array or object, then the
+    container's elements must have the current value as parent.
+
+    @param[in] check_parents  whether the parent relation should be checked.
+               The value is true by default and should only be set to false
+               during destruction of objects when the invariant does not
+               need to hold.
+    */
+    void assert_invariant(bool check_parents = true) const noexcept
+    {
+        JSON_ASSERT(m_data.m_type != value_t::object || m_data.m_value.object != nullptr);
+        JSON_ASSERT(m_data.m_type != value_t::array || m_data.m_value.array != nullptr);
+        JSON_ASSERT(m_data.m_type != value_t::string || m_data.m_value.string != nullptr);
+        JSON_ASSERT(m_data.m_type != value_t::binary || m_data.m_value.binary != nullptr);
+
+#if JSON_DIAGNOSTICS
+        JSON_TRY
+        {
+            // cppcheck-suppress assertWithSideEffect
+            JSON_ASSERT(!check_parents || !is_structured() || std::all_of(begin(), end(), [this](const basic_json & j)
+            {
+                return j.m_parent == this;
+            }));
+        }
+        JSON_CATCH(...) {} // LCOV_EXCL_LINE
+#endif
+        static_cast<void>(check_parents);
+    }
+
+    void set_parents()
+    {
+#if JSON_DIAGNOSTICS
+        switch (m_data.m_type)
+        {
+            case value_t::array:
+            {
+                for (auto& element : *m_data.m_value.array)
+                {
+                    element.m_parent = this;
+                }
+                break;
+            }
+
+            case value_t::object:
+            {
+                for (auto& element : *m_data.m_value.object)
+                {
+                    element.second.m_parent = this;
+                }
+                break;
+            }
+
+            case value_t::null:
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+                break;
+        }
+#endif
+    }
+
+    iterator set_parents(iterator it, typename iterator::difference_type count_set_parents)
+    {
+#if JSON_DIAGNOSTICS
+        for (typename iterator::difference_type i = 0; i < count_set_parents; ++i)
+        {
+            (it + i)->m_parent = this;
+        }
+#else
+        static_cast<void>(count_set_parents);
+#endif
+        return it;
+    }
+
+    reference set_parent(reference j, std::size_t old_capacity = detail::unknown_size())
+    {
+#if JSON_DIAGNOSTICS
+        if (old_capacity != detail::unknown_size())
+        {
+            // see https://github.com/nlohmann/json/issues/2838
+            JSON_ASSERT(type() == value_t::array);
+            if (JSON_HEDLEY_UNLIKELY(m_data.m_value.array->capacity() != old_capacity))
+            {
+                // capacity has changed: update all parents
+                set_parents();
+                return j;
+            }
+        }
+
+        // ordered_json uses a vector internally, so pointers could have
+        // been invalidated; see https://github.com/nlohmann/json/issues/2962
+#ifdef JSON_HEDLEY_MSVC_VERSION
+#pragma warning(push )
+#pragma warning(disable : 4127) // ignore warning to replace if with if constexpr
+#endif
+        if (detail::is_ordered_map<object_t>::value)
+        {
+            set_parents();
+            return j;
+        }
+#ifdef JSON_HEDLEY_MSVC_VERSION
+#pragma warning( pop )
+#endif
+
+        j.m_parent = this;
+#else
+        static_cast<void>(j);
+        static_cast<void>(old_capacity);
+#endif
+        return j;
+    }
+
+  public:
+    //////////////////////////
+    // JSON parser callback //
+    //////////////////////////
+
+    /// @brief parser event types
+    /// @sa https://json.nlohmann.me/api/basic_json/parse_event_t/
+    using parse_event_t = detail::parse_event_t;
+
+    /// @brief per-element parser callback type
+    /// @sa https://json.nlohmann.me/api/basic_json/parser_callback_t/
+    using parser_callback_t = detail::parser_callback_t<basic_json>;
+
+    //////////////////
+    // constructors //
+    //////////////////
+
+    /// @name constructors and destructors
+    /// Constructors of class @ref basic_json, copy/move constructor, copy
+    /// assignment, static functions creating objects, and the destructor.
+    /// @{
+
+    /// @brief create an empty value with a given type
+    /// @sa https://json.nlohmann.me/api/basic_json/basic_json/
+    basic_json(const value_t v)
+        : m_data(v)
+    {
+        assert_invariant();
+    }
+
+    /// @brief create a null object
+    /// @sa https://json.nlohmann.me/api/basic_json/basic_json/
+    basic_json(std::nullptr_t = nullptr) noexcept // NOLINT(bugprone-exception-escape)
+        : basic_json(value_t::null)
+    {
+        assert_invariant();
+    }
+
+    /// @brief create a JSON value from compatible types
+    /// @sa https://json.nlohmann.me/api/basic_json/basic_json/
+    template < typename CompatibleType,
+               typename U = detail::uncvref_t<CompatibleType>,
+               detail::enable_if_t <
+                   !detail::is_basic_json<U>::value && detail::is_compatible_type<basic_json_t, U>::value, int > = 0 >
+    basic_json(CompatibleType && val) noexcept(noexcept( // NOLINT(bugprone-forwarding-reference-overload,bugprone-exception-escape)
+            JSONSerializer<U>::to_json(std::declval<basic_json_t&>(),
+                                       std::forward<CompatibleType>(val))))
+    {
+        JSONSerializer<U>::to_json(*this, std::forward<CompatibleType>(val));
+        set_parents();
+        assert_invariant();
+    }
+
+    /// @brief create a JSON value from an existing one
+    /// @sa https://json.nlohmann.me/api/basic_json/basic_json/
+    template < typename BasicJsonType,
+               detail::enable_if_t <
+                   detail::is_basic_json<BasicJsonType>::value&& !std::is_same<basic_json, BasicJsonType>::value, int > = 0 >
+    basic_json(const BasicJsonType& val)
+#if JSON_DIAGNOSTIC_POSITIONS
+        : start_position(val.start_pos()),
+          end_position(val.end_pos())
+#endif
+    {
+        using other_boolean_t = typename BasicJsonType::boolean_t;
+        using other_number_float_t = typename BasicJsonType::number_float_t;
+        using other_number_integer_t = typename BasicJsonType::number_integer_t;
+        using other_number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+        using other_string_t = typename BasicJsonType::string_t;
+        using other_object_t = typename BasicJsonType::object_t;
+        using other_array_t = typename BasicJsonType::array_t;
+        using other_binary_t = typename BasicJsonType::binary_t;
+
+        switch (val.type())
+        {
+            case value_t::boolean:
+                JSONSerializer<other_boolean_t>::to_json(*this, val.template get<other_boolean_t>());
+                break;
+            case value_t::number_float:
+                JSONSerializer<other_number_float_t>::to_json(*this, val.template get<other_number_float_t>());
+                break;
+            case value_t::number_integer:
+                JSONSerializer<other_number_integer_t>::to_json(*this, val.template get<other_number_integer_t>());
+                break;
+            case value_t::number_unsigned:
+                JSONSerializer<other_number_unsigned_t>::to_json(*this, val.template get<other_number_unsigned_t>());
+                break;
+            case value_t::string:
+                JSONSerializer<other_string_t>::to_json(*this, val.template get_ref<const other_string_t&>());
+                break;
+            case value_t::object:
+                JSONSerializer<other_object_t>::to_json(*this, val.template get_ref<const other_object_t&>());
+                break;
+            case value_t::array:
+                JSONSerializer<other_array_t>::to_json(*this, val.template get_ref<const other_array_t&>());
+                break;
+            case value_t::binary:
+                JSONSerializer<other_binary_t>::to_json(*this, val.template get_ref<const other_binary_t&>());
+                break;
+            case value_t::null:
+                *this = nullptr;
+                break;
+            case value_t::discarded:
+                m_data.m_type = value_t::discarded;
+                break;
+            default:            // LCOV_EXCL_LINE
+                JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
+        }
+        JSON_ASSERT(m_data.m_type == val.type());
+
+        set_parents();
+        assert_invariant();
+    }
+
+    /// @brief create a container (array or object) from an initializer list
+    /// @sa https://json.nlohmann.me/api/basic_json/basic_json/
+    basic_json(initializer_list_t init,
+               bool type_deduction = true,
+               value_t manual_type = value_t::array)
+    {
+        // check if each element is an array with two elements whose first
+        // element is a string
+        bool is_an_object = std::all_of(init.begin(), init.end(),
+                                        [](const detail::json_ref<basic_json>& element_ref)
+        {
+            // The cast is to ensure op[size_type] is called, bearing in mind size_type may not be int;
+            // (many string types can be constructed from 0 via its null-pointer guise, so we get a
+            // broken call to op[key_type], the wrong semantics and a 4804 warning on Windows)
+            return element_ref->is_array() && element_ref->size() == 2 && (*element_ref)[static_cast<size_type>(0)].is_string();
+        });
+
+        // adjust type if type deduction is not wanted
+        if (!type_deduction)
+        {
+            // if array is wanted, do not create an object though possible
+            if (manual_type == value_t::array)
+            {
+                is_an_object = false;
+            }
+
+            // if object is wanted but impossible, throw an exception
+            if (JSON_HEDLEY_UNLIKELY(manual_type == value_t::object && !is_an_object))
+            {
+                JSON_THROW(type_error::create(301, "cannot create object from initializer list", nullptr));
+            }
+        }
+
+        if (is_an_object)
+        {
+            // the initializer list is a list of pairs -> create object
+            m_data.m_type = value_t::object;
+            m_data.m_value = value_t::object;
+
+            for (auto& element_ref : init)
+            {
+                auto element = element_ref.moved_or_copied();
+                m_data.m_value.object->emplace(
+                    std::move(*((*element.m_data.m_value.array)[0].m_data.m_value.string)),
+                    std::move((*element.m_data.m_value.array)[1]));
+            }
+        }
+        else
+        {
+            // the initializer list describes an array -> create array
+            m_data.m_type = value_t::array;
+            m_data.m_value.array = create<array_t>(init.begin(), init.end());
+        }
+
+        set_parents();
+        assert_invariant();
+    }
+
+    /// @brief explicitly create a binary array (without subtype)
+    /// @sa https://json.nlohmann.me/api/basic_json/binary/
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json binary(const typename binary_t::container_type& init)
+    {
+        auto res = basic_json();
+        res.m_data.m_type = value_t::binary;
+        res.m_data.m_value = init;
+        return res;
+    }
+
+    /// @brief explicitly create a binary array (with subtype)
+    /// @sa https://json.nlohmann.me/api/basic_json/binary/
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json binary(const typename binary_t::container_type& init, typename binary_t::subtype_type subtype)
+    {
+        auto res = basic_json();
+        res.m_data.m_type = value_t::binary;
+        res.m_data.m_value = binary_t(init, subtype);
+        return res;
+    }
+
+    /// @brief explicitly create a binary array
+    /// @sa https://json.nlohmann.me/api/basic_json/binary/
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json binary(typename binary_t::container_type&& init)
+    {
+        auto res = basic_json();
+        res.m_data.m_type = value_t::binary;
+        res.m_data.m_value = std::move(init);
+        return res;
+    }
+
+    /// @brief explicitly create a binary array (with subtype)
+    /// @sa https://json.nlohmann.me/api/basic_json/binary/
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json binary(typename binary_t::container_type&& init, typename binary_t::subtype_type subtype)
+    {
+        auto res = basic_json();
+        res.m_data.m_type = value_t::binary;
+        res.m_data.m_value = binary_t(std::move(init), subtype);
+        return res;
+    }
+
+    /// @brief explicitly create an array from an initializer list
+    /// @sa https://json.nlohmann.me/api/basic_json/array/
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json array(initializer_list_t init = {})
+    {
+        return basic_json(init, false, value_t::array);
+    }
+
+    /// @brief explicitly create an object from an initializer list
+    /// @sa https://json.nlohmann.me/api/basic_json/object/
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json object(initializer_list_t init = {})
+    {
+        return basic_json(init, false, value_t::object);
+    }
+
+    /// @brief construct an array with count copies of given value
+    /// @sa https://json.nlohmann.me/api/basic_json/basic_json/
+    basic_json(size_type cnt, const basic_json& val):
+        m_data{cnt, val}
+    {
+        set_parents();
+        assert_invariant();
+    }
+
+    /// @brief construct a JSON container given an iterator range
+    /// @sa https://json.nlohmann.me/api/basic_json/basic_json/
+    template < class InputIT, typename std::enable_if <
+                   std::is_same<InputIT, typename basic_json_t::iterator>::value ||
+                   std::is_same<InputIT, typename basic_json_t::const_iterator>::value, int >::type = 0 >
+    basic_json(InputIT first, InputIT last) // NOLINT(performance-unnecessary-value-param)
+    {
+        JSON_ASSERT(first.m_object != nullptr);
+        JSON_ASSERT(last.m_object != nullptr);
+
+        // make sure iterator fits the current value
+        if (JSON_HEDLEY_UNLIKELY(first.m_object != last.m_object))
+        {
+            JSON_THROW(invalid_iterator::create(201, "iterators are not compatible", nullptr));
+        }
+
+        // copy type from first iterator
+        m_data.m_type = first.m_object->m_data.m_type;
+
+        // check if iterator range is complete for primitive values
+        switch (m_data.m_type)
+        {
+            case value_t::boolean:
+            case value_t::number_float:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::string:
+            {
+                if (JSON_HEDLEY_UNLIKELY(!first.m_it.primitive_iterator.is_begin()
+                                         || !last.m_it.primitive_iterator.is_end()))
+                {
+                    JSON_THROW(invalid_iterator::create(204, "iterators out of range", first.m_object));
+                }
+                break;
+            }
+
+            case value_t::null:
+            case value_t::object:
+            case value_t::array:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+                break;
+        }
+
+        switch (m_data.m_type)
+        {
+            case value_t::number_integer:
+            {
+                m_data.m_value.number_integer = first.m_object->m_data.m_value.number_integer;
+                break;
+            }
+
+            case value_t::number_unsigned:
+            {
+                m_data.m_value.number_unsigned = first.m_object->m_data.m_value.number_unsigned;
+                break;
+            }
+
+            case value_t::number_float:
+            {
+                m_data.m_value.number_float = first.m_object->m_data.m_value.number_float;
+                break;
+            }
+
+            case value_t::boolean:
+            {
+                m_data.m_value.boolean = first.m_object->m_data.m_value.boolean;
+                break;
+            }
+
+            case value_t::string:
+            {
+                m_data.m_value = *first.m_object->m_data.m_value.string;
+                break;
+            }
+
+            case value_t::object:
+            {
+                m_data.m_value.object = create<object_t>(first.m_it.object_iterator,
+                                        last.m_it.object_iterator);
+                break;
+            }
+
+            case value_t::array:
+            {
+                m_data.m_value.array = create<array_t>(first.m_it.array_iterator,
+                                                       last.m_it.array_iterator);
+                break;
+            }
+
+            case value_t::binary:
+            {
+                m_data.m_value = *first.m_object->m_data.m_value.binary;
+                break;
+            }
+
+            case value_t::null:
+            case value_t::discarded:
+            default:
+                JSON_THROW(invalid_iterator::create(206, detail::concat("cannot construct with iterators from ", first.m_object->type_name()), first.m_object));
+        }
+
+        set_parents();
+        assert_invariant();
+    }
+
+    ///////////////////////////////////////
+    // other constructors and destructor //
+    ///////////////////////////////////////
+
+    template<typename JsonRef,
+             detail::enable_if_t<detail::conjunction<detail::is_json_ref<JsonRef>,
+                                 std::is_same<typename JsonRef::value_type, basic_json>>::value, int> = 0 >
+    basic_json(const JsonRef& ref) : basic_json(ref.moved_or_copied()) {}
+
+    /// @brief copy constructor
+    /// @sa https://json.nlohmann.me/api/basic_json/basic_json/
+    basic_json(const basic_json& other)
+        : json_base_class_t(other)
+#if JSON_DIAGNOSTIC_POSITIONS
+        , start_position(other.start_position)
+        , end_position(other.end_position)
+#endif
+    {
+        m_data.m_type = other.m_data.m_type;
+        // check of passed value is valid
+        other.assert_invariant();
+
+        switch (m_data.m_type)
+        {
+            case value_t::object:
+            {
+                m_data.m_value = *other.m_data.m_value.object;
+                break;
+            }
+
+            case value_t::array:
+            {
+                m_data.m_value = *other.m_data.m_value.array;
+                break;
+            }
+
+            case value_t::string:
+            {
+                m_data.m_value = *other.m_data.m_value.string;
+                break;
+            }
+
+            case value_t::boolean:
+            {
+                m_data.m_value = other.m_data.m_value.boolean;
+                break;
+            }
+
+            case value_t::number_integer:
+            {
+                m_data.m_value = other.m_data.m_value.number_integer;
+                break;
+            }
+
+            case value_t::number_unsigned:
+            {
+                m_data.m_value = other.m_data.m_value.number_unsigned;
+                break;
+            }
+
+            case value_t::number_float:
+            {
+                m_data.m_value = other.m_data.m_value.number_float;
+                break;
+            }
+
+            case value_t::binary:
+            {
+                m_data.m_value = *other.m_data.m_value.binary;
+                break;
+            }
+
+            case value_t::null:
+            case value_t::discarded:
+            default:
+                break;
+        }
+
+        set_parents();
+        assert_invariant();
+    }
+
+    /// @brief move constructor
+    /// @sa https://json.nlohmann.me/api/basic_json/basic_json/
+    basic_json(basic_json&& other) noexcept
+        : json_base_class_t(std::forward<json_base_class_t>(other)),
+          m_data(std::move(other.m_data)) // cppcheck-suppress[accessForwarded] TODO check
+#if JSON_DIAGNOSTIC_POSITIONS
+        , start_position(other.start_position) // cppcheck-suppress[accessForwarded] TODO check
+        , end_position(other.end_position) // cppcheck-suppress[accessForwarded] TODO check
+#endif
+    {
+        // check that passed value is valid
+        other.assert_invariant(false); // cppcheck-suppress[accessForwarded]
+
+        // invalidate payload
+        other.m_data.m_type = value_t::null;
+        other.m_data.m_value = {};
+
+#if JSON_DIAGNOSTIC_POSITIONS
+        other.start_position = std::string::npos;
+        other.end_position = std::string::npos;
+#endif
+
+        set_parents();
+        assert_invariant();
+    }
+
+    /// @brief copy assignment
+    /// @sa https://json.nlohmann.me/api/basic_json/operator=/
+    basic_json& operator=(basic_json other) noexcept (
+        std::is_nothrow_move_constructible<value_t>::value&&
+        std::is_nothrow_move_assignable<value_t>::value&&
+        std::is_nothrow_move_constructible<json_value>::value&&
+        std::is_nothrow_move_assignable<json_value>::value&&
+        std::is_nothrow_move_assignable<json_base_class_t>::value
+    )
+    {
+        // check that passed value is valid
+        other.assert_invariant();
+
+        using std::swap;
+        swap(m_data.m_type, other.m_data.m_type);
+        swap(m_data.m_value, other.m_data.m_value);
+
+#if JSON_DIAGNOSTIC_POSITIONS
+        swap(start_position, other.start_position);
+        swap(end_position, other.end_position);
+#endif
+
+        json_base_class_t::operator=(std::move(other));
+
+        set_parents();
+        assert_invariant();
+        return *this;
+    }
+
+    /// @brief destructor
+    /// @sa https://json.nlohmann.me/api/basic_json/~basic_json/
+    ~basic_json() noexcept
+    {
+        assert_invariant(false);
+    }
+
+    /// @}
+
+  public:
+    ///////////////////////
+    // object inspection //
+    ///////////////////////
+
+    /// @name object inspection
+    /// Functions to inspect the type of a JSON value.
+    /// @{
+
+    /// @brief serialization
+    /// @sa https://json.nlohmann.me/api/basic_json/dump/
+    string_t dump(const int indent = -1,
+                  const char indent_char = ' ',
+                  const bool ensure_ascii = false,
+                  const error_handler_t error_handler = error_handler_t::strict) const
+    {
+        string_t result;
+        serializer s(detail::output_adapter<char, string_t>(result), indent_char, error_handler);
+
+        if (indent >= 0)
+        {
+            s.dump(*this, true, ensure_ascii, static_cast<unsigned int>(indent));
+        }
+        else
+        {
+            s.dump(*this, false, ensure_ascii, 0);
+        }
+
+        return result;
+    }
+
+    /// @brief return the type of the JSON value (explicit)
+    /// @sa https://json.nlohmann.me/api/basic_json/type/
+    constexpr value_t type() const noexcept
+    {
+        return m_data.m_type;
+    }
+
+    /// @brief return whether type is primitive
+    /// @sa https://json.nlohmann.me/api/basic_json/is_primitive/
+    constexpr bool is_primitive() const noexcept
+    {
+        return is_null() || is_string() || is_boolean() || is_number() || is_binary();
+    }
+
+    /// @brief return whether type is structured
+    /// @sa https://json.nlohmann.me/api/basic_json/is_structured/
+    constexpr bool is_structured() const noexcept
+    {
+        return is_array() || is_object();
+    }
+
+    /// @brief return whether value is null
+    /// @sa https://json.nlohmann.me/api/basic_json/is_null/
+    constexpr bool is_null() const noexcept
+    {
+        return m_data.m_type == value_t::null;
+    }
+
+    /// @brief return whether value is a boolean
+    /// @sa https://json.nlohmann.me/api/basic_json/is_boolean/
+    constexpr bool is_boolean() const noexcept
+    {
+        return m_data.m_type == value_t::boolean;
+    }
+
+    /// @brief return whether value is a number
+    /// @sa https://json.nlohmann.me/api/basic_json/is_number/
+    constexpr bool is_number() const noexcept
+    {
+        return is_number_integer() || is_number_float();
+    }
+
+    /// @brief return whether value is an integer number
+    /// @sa https://json.nlohmann.me/api/basic_json/is_number_integer/
+    constexpr bool is_number_integer() const noexcept
+    {
+        return m_data.m_type == value_t::number_integer || m_data.m_type == value_t::number_unsigned;
+    }
+
+    /// @brief return whether value is an unsigned integer number
+    /// @sa https://json.nlohmann.me/api/basic_json/is_number_unsigned/
+    constexpr bool is_number_unsigned() const noexcept
+    {
+        return m_data.m_type == value_t::number_unsigned;
+    }
+
+    /// @brief return whether value is a floating-point number
+    /// @sa https://json.nlohmann.me/api/basic_json/is_number_float/
+    constexpr bool is_number_float() const noexcept
+    {
+        return m_data.m_type == value_t::number_float;
+    }
+
+    /// @brief return whether value is an object
+    /// @sa https://json.nlohmann.me/api/basic_json/is_object/
+    constexpr bool is_object() const noexcept
+    {
+        return m_data.m_type == value_t::object;
+    }
+
+    /// @brief return whether value is an array
+    /// @sa https://json.nlohmann.me/api/basic_json/is_array/
+    constexpr bool is_array() const noexcept
+    {
+        return m_data.m_type == value_t::array;
+    }
+
+    /// @brief return whether value is a string
+    /// @sa https://json.nlohmann.me/api/basic_json/is_string/
+    constexpr bool is_string() const noexcept
+    {
+        return m_data.m_type == value_t::string;
+    }
+
+    /// @brief return whether value is a binary array
+    /// @sa https://json.nlohmann.me/api/basic_json/is_binary/
+    constexpr bool is_binary() const noexcept
+    {
+        return m_data.m_type == value_t::binary;
+    }
+
+    /// @brief return whether value is discarded
+    /// @sa https://json.nlohmann.me/api/basic_json/is_discarded/
+    constexpr bool is_discarded() const noexcept
+    {
+        return m_data.m_type == value_t::discarded;
+    }
+
+    /// @brief return the type of the JSON value (implicit)
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_value_t/
+    constexpr operator value_t() const noexcept
+    {
+        return m_data.m_type;
+    }
+
+    /// @}
+
+  private:
+    //////////////////
+    // value access //
+    //////////////////
+
+    /// get a boolean (explicit)
+    boolean_t get_impl(boolean_t* /*unused*/) const
+    {
+        if (JSON_HEDLEY_LIKELY(is_boolean()))
+        {
+            return m_data.m_value.boolean;
+        }
+
+        JSON_THROW(type_error::create(302, detail::concat("type must be boolean, but is ", type_name()), this));
+    }
+
+    /// get a pointer to the value (object)
+    object_t* get_impl_ptr(object_t* /*unused*/) noexcept
+    {
+        return is_object() ? m_data.m_value.object : nullptr;
+    }
+
+    /// get a pointer to the value (object)
+    constexpr const object_t* get_impl_ptr(const object_t* /*unused*/) const noexcept
+    {
+        return is_object() ? m_data.m_value.object : nullptr;
+    }
+
+    /// get a pointer to the value (array)
+    array_t* get_impl_ptr(array_t* /*unused*/) noexcept
+    {
+        return is_array() ? m_data.m_value.array : nullptr;
+    }
+
+    /// get a pointer to the value (array)
+    constexpr const array_t* get_impl_ptr(const array_t* /*unused*/) const noexcept
+    {
+        return is_array() ? m_data.m_value.array : nullptr;
+    }
+
+    /// get a pointer to the value (string)
+    string_t* get_impl_ptr(string_t* /*unused*/) noexcept
+    {
+        return is_string() ? m_data.m_value.string : nullptr;
+    }
+
+    /// get a pointer to the value (string)
+    constexpr const string_t* get_impl_ptr(const string_t* /*unused*/) const noexcept
+    {
+        return is_string() ? m_data.m_value.string : nullptr;
+    }
+
+    /// get a pointer to the value (boolean)
+    boolean_t* get_impl_ptr(boolean_t* /*unused*/) noexcept
+    {
+        return is_boolean() ? &m_data.m_value.boolean : nullptr;
+    }
+
+    /// get a pointer to the value (boolean)
+    constexpr const boolean_t* get_impl_ptr(const boolean_t* /*unused*/) const noexcept
+    {
+        return is_boolean() ? &m_data.m_value.boolean : nullptr;
+    }
+
+    /// get a pointer to the value (integer number)
+    number_integer_t* get_impl_ptr(number_integer_t* /*unused*/) noexcept
+    {
+        return m_data.m_type == value_t::number_integer ? &m_data.m_value.number_integer : nullptr;
+    }
+
+    /// get a pointer to the value (integer number)
+    constexpr const number_integer_t* get_impl_ptr(const number_integer_t* /*unused*/) const noexcept
+    {
+        return m_data.m_type == value_t::number_integer ? &m_data.m_value.number_integer : nullptr;
+    }
+
+    /// get a pointer to the value (unsigned number)
+    number_unsigned_t* get_impl_ptr(number_unsigned_t* /*unused*/) noexcept
+    {
+        return is_number_unsigned() ? &m_data.m_value.number_unsigned : nullptr;
+    }
+
+    /// get a pointer to the value (unsigned number)
+    constexpr const number_unsigned_t* get_impl_ptr(const number_unsigned_t* /*unused*/) const noexcept
+    {
+        return is_number_unsigned() ? &m_data.m_value.number_unsigned : nullptr;
+    }
+
+    /// get a pointer to the value (floating-point number)
+    number_float_t* get_impl_ptr(number_float_t* /*unused*/) noexcept
+    {
+        return is_number_float() ? &m_data.m_value.number_float : nullptr;
+    }
+
+    /// get a pointer to the value (floating-point number)
+    constexpr const number_float_t* get_impl_ptr(const number_float_t* /*unused*/) const noexcept
+    {
+        return is_number_float() ? &m_data.m_value.number_float : nullptr;
+    }
+
+    /// get a pointer to the value (binary)
+    binary_t* get_impl_ptr(binary_t* /*unused*/) noexcept
+    {
+        return is_binary() ? m_data.m_value.binary : nullptr;
+    }
+
+    /// get a pointer to the value (binary)
+    constexpr const binary_t* get_impl_ptr(const binary_t* /*unused*/) const noexcept
+    {
+        return is_binary() ? m_data.m_value.binary : nullptr;
+    }
+
+    /*!
+    @brief helper function to implement get_ref()
+
+    This function helps to implement get_ref() without code duplication for
+    const and non-const overloads
+
+    @tparam ThisType will be deduced as `basic_json` or `const basic_json`
+
+    @throw type_error.303 if ReferenceType does not match underlying value
+    type of the current JSON
+    */
+    template<typename ReferenceType, typename ThisType>
+    static ReferenceType get_ref_impl(ThisType& obj)
+    {
+        // delegate the call to get_ptr<>()
+        auto* ptr = obj.template get_ptr<typename std::add_pointer<ReferenceType>::type>();
+
+        if (JSON_HEDLEY_LIKELY(ptr != nullptr))
+        {
+            return *ptr;
+        }
+
+        JSON_THROW(type_error::create(303, detail::concat("incompatible ReferenceType for get_ref, actual type is ", obj.type_name()), &obj));
+    }
+
+  public:
+    /// @name value access
+    /// Direct access to the stored value of a JSON value.
+    /// @{
+
+    /// @brief get a pointer value (implicit)
+    /// @sa https://json.nlohmann.me/api/basic_json/get_ptr/
+    template<typename PointerType, typename std::enable_if<
+                 std::is_pointer<PointerType>::value, int>::type = 0>
+    auto get_ptr() noexcept -> decltype(std::declval<basic_json_t&>().get_impl_ptr(std::declval<PointerType>()))
+    {
+        // delegate the call to get_impl_ptr<>()
+        return get_impl_ptr(static_cast<PointerType>(nullptr));
+    }
+
+    /// @brief get a pointer value (implicit)
+    /// @sa https://json.nlohmann.me/api/basic_json/get_ptr/
+    template < typename PointerType, typename std::enable_if <
+                   std::is_pointer<PointerType>::value&&
+                   std::is_const<typename std::remove_pointer<PointerType>::type>::value, int >::type = 0 >
+    constexpr auto get_ptr() const noexcept -> decltype(std::declval<const basic_json_t&>().get_impl_ptr(std::declval<PointerType>()))
+    {
+        // delegate the call to get_impl_ptr<>() const
+        return get_impl_ptr(static_cast<PointerType>(nullptr));
+    }
+
+  private:
+    /*!
+    @brief get a value (explicit)
+
+    Explicit type conversion between the JSON value and a compatible value
+    which is [CopyConstructible](https://en.cppreference.com/w/cpp/named_req/CopyConstructible)
+    and [DefaultConstructible](https://en.cppreference.com/w/cpp/named_req/DefaultConstructible).
+    The value is converted by calling the @ref json_serializer<ValueType>
+    `from_json()` method.
+
+    The function is equivalent to executing
+    @code {.cpp}
+    ValueType ret;
+    JSONSerializer<ValueType>::from_json(*this, ret);
+    return ret;
+    @endcode
+
+    This overloads is chosen if:
+    - @a ValueType is not @ref basic_json,
+    - @ref json_serializer<ValueType> has a `from_json()` method of the form
+      `void from_json(const basic_json&, ValueType&)`, and
+    - @ref json_serializer<ValueType> does not have a `from_json()` method of
+      the form `ValueType from_json(const basic_json&)`
+
+    @tparam ValueType the returned value type
+
+    @return copy of the JSON value, converted to @a ValueType
+
+    @throw what @ref json_serializer<ValueType> `from_json()` method throws
+
+    @liveexample{The example below shows several conversions from JSON values
+    to other types. There a few things to note: (1) Floating-point numbers can
+    be converted to integers\, (2) A JSON array can be converted to a standard
+    `std::vector<short>`\, (3) A JSON object can be converted to C++
+    associative containers such as `std::unordered_map<std::string\,
+    json>`.,get__ValueType_const}
+
+    @since version 2.1.0
+    */
+    template < typename ValueType,
+               detail::enable_if_t <
+                   detail::is_default_constructible<ValueType>::value&&
+                   detail::has_from_json<basic_json_t, ValueType>::value,
+                   int > = 0 >
+    ValueType get_impl(detail::priority_tag<0> /*unused*/) const noexcept(noexcept(
+            JSONSerializer<ValueType>::from_json(std::declval<const basic_json_t&>(), std::declval<ValueType&>())))
+    {
+        auto ret = ValueType();
+        JSONSerializer<ValueType>::from_json(*this, ret);
+        return ret;
+    }
+
+    /*!
+    @brief get a value (explicit); special case
+
+    Explicit type conversion between the JSON value and a compatible value
+    which is **not** [CopyConstructible](https://en.cppreference.com/w/cpp/named_req/CopyConstructible)
+    and **not** [DefaultConstructible](https://en.cppreference.com/w/cpp/named_req/DefaultConstructible).
+    The value is converted by calling the @ref json_serializer<ValueType>
+    `from_json()` method.
+
+    The function is equivalent to executing
+    @code {.cpp}
+    return JSONSerializer<ValueType>::from_json(*this);
+    @endcode
+
+    This overloads is chosen if:
+    - @a ValueType is not @ref basic_json and
+    - @ref json_serializer<ValueType> has a `from_json()` method of the form
+      `ValueType from_json(const basic_json&)`
+
+    @note If @ref json_serializer<ValueType> has both overloads of
+    `from_json()`, this one is chosen.
+
+    @tparam ValueType the returned value type
+
+    @return copy of the JSON value, converted to @a ValueType
+
+    @throw what @ref json_serializer<ValueType> `from_json()` method throws
+
+    @since version 2.1.0
+    */
+    template < typename ValueType,
+               detail::enable_if_t <
+                   detail::has_non_default_from_json<basic_json_t, ValueType>::value,
+                   int > = 0 >
+    ValueType get_impl(detail::priority_tag<1> /*unused*/) const noexcept(noexcept(
+            JSONSerializer<ValueType>::from_json(std::declval<const basic_json_t&>())))
+    {
+        return JSONSerializer<ValueType>::from_json(*this);
+    }
+
+    /*!
+    @brief get special-case overload
+
+    This overloads converts the current @ref basic_json in a different
+    @ref basic_json type
+
+    @tparam BasicJsonType == @ref basic_json
+
+    @return a copy of *this, converted into @a BasicJsonType
+
+    @complexity Depending on the implementation of the called `from_json()`
+                method.
+
+    @since version 3.2.0
+    */
+    template < typename BasicJsonType,
+               detail::enable_if_t <
+                   detail::is_basic_json<BasicJsonType>::value,
+                   int > = 0 >
+    BasicJsonType get_impl(detail::priority_tag<2> /*unused*/) const
+    {
+        return *this;
+    }
+
+    /*!
+    @brief get special-case overload
+
+    This overloads avoids a lot of template boilerplate, it can be seen as the
+    identity method
+
+    @tparam BasicJsonType == @ref basic_json
+
+    @return a copy of *this
+
+    @complexity Constant.
+
+    @since version 2.1.0
+    */
+    template<typename BasicJsonType,
+             detail::enable_if_t<
+                 std::is_same<BasicJsonType, basic_json_t>::value,
+                 int> = 0>
+    basic_json get_impl(detail::priority_tag<3> /*unused*/) const
+    {
+        return *this;
+    }
+
+    /*!
+    @brief get a pointer value (explicit)
+    @copydoc get()
+    */
+    template<typename PointerType,
+             detail::enable_if_t<
+                 std::is_pointer<PointerType>::value,
+                 int> = 0>
+    constexpr auto get_impl(detail::priority_tag<4> /*unused*/) const noexcept
+    -> decltype(std::declval<const basic_json_t&>().template get_ptr<PointerType>())
+    {
+        // delegate the call to get_ptr
+        return get_ptr<PointerType>();
+    }
+
+  public:
+    /*!
+    @brief get a (pointer) value (explicit)
+
+    Performs explicit type conversion between the JSON value and a compatible value if required.
+
+    - If the requested type is a pointer to the internally stored JSON value that pointer is returned.
+    No copies are made.
+
+    - If the requested type is the current @ref basic_json, or a different @ref basic_json convertible
+    from the current @ref basic_json.
+
+    - Otherwise the value is converted by calling the @ref json_serializer<ValueType> `from_json()`
+    method.
+
+    @tparam ValueTypeCV the provided value type
+    @tparam ValueType the returned value type
+
+    @return copy of the JSON value, converted to @tparam ValueType if necessary
+
+    @throw what @ref json_serializer<ValueType> `from_json()` method throws if conversion is required
+
+    @since version 2.1.0
+    */
+    template < typename ValueTypeCV, typename ValueType = detail::uncvref_t<ValueTypeCV>>
+#if defined(JSON_HAS_CPP_14)
+    constexpr
+#endif
+    auto get() const noexcept(
+    noexcept(std::declval<const basic_json_t&>().template get_impl<ValueType>(detail::priority_tag<4> {})))
+    -> decltype(std::declval<const basic_json_t&>().template get_impl<ValueType>(detail::priority_tag<4> {}))
+    {
+        // we cannot static_assert on ValueTypeCV being non-const, because
+        // there is support for get<const basic_json_t>(), which is why we
+        // still need the uncvref
+        static_assert(!std::is_reference<ValueTypeCV>::value,
+                      "get() cannot be used with reference types, you might want to use get_ref()");
+        return get_impl<ValueType>(detail::priority_tag<4> {});
+    }
+
+    /*!
+    @brief get a pointer value (explicit)
+
+    Explicit pointer access to the internally stored JSON value. No copies are
+    made.
+
+    @warning The pointer becomes invalid if the underlying JSON object
+    changes.
+
+    @tparam PointerType pointer type; must be a pointer to @ref array_t, @ref
+    object_t, @ref string_t, @ref boolean_t, @ref number_integer_t,
+    @ref number_unsigned_t, or @ref number_float_t.
+
+    @return pointer to the internally stored JSON value if the requested
+    pointer type @a PointerType fits to the JSON value; `nullptr` otherwise
+
+    @complexity Constant.
+
+    @liveexample{The example below shows how pointers to internal values of a
+    JSON value can be requested. Note that no type conversions are made and a
+    `nullptr` is returned if the value and the requested pointer type does not
+    match.,get__PointerType}
+
+    @sa see @ref get_ptr() for explicit pointer-member access
+
+    @since version 1.0.0
+    */
+    template<typename PointerType, typename std::enable_if<
+                 std::is_pointer<PointerType>::value, int>::type = 0>
+    auto get() noexcept -> decltype(std::declval<basic_json_t&>().template get_ptr<PointerType>())
+    {
+        // delegate the call to get_ptr
+        return get_ptr<PointerType>();
+    }
+
+    /// @brief get a value (explicit)
+    /// @sa https://json.nlohmann.me/api/basic_json/get_to/
+    template < typename ValueType,
+               detail::enable_if_t <
+                   !detail::is_basic_json<ValueType>::value&&
+                   detail::has_from_json<basic_json_t, ValueType>::value,
+                   int > = 0 >
+    ValueType & get_to(ValueType& v) const noexcept(noexcept(
+            JSONSerializer<ValueType>::from_json(std::declval<const basic_json_t&>(), v)))
+    {
+        JSONSerializer<ValueType>::from_json(*this, v);
+        return v;
+    }
+
+    // specialization to allow calling get_to with a basic_json value
+    // see https://github.com/nlohmann/json/issues/2175
+    template<typename ValueType,
+             detail::enable_if_t <
+                 detail::is_basic_json<ValueType>::value,
+                 int> = 0>
+    ValueType & get_to(ValueType& v) const
+    {
+        v = *this;
+        return v;
+    }
+
+    template <
+        typename T, std::size_t N,
+        typename Array = T (&)[N], // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
+        detail::enable_if_t <
+            detail::has_from_json<basic_json_t, Array>::value, int > = 0 >
+    Array get_to(T (&v)[N]) const // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
+    noexcept(noexcept(JSONSerializer<Array>::from_json(
+                          std::declval<const basic_json_t&>(), v)))
+    {
+        JSONSerializer<Array>::from_json(*this, v);
+        return v;
+    }
+
+    /// @brief get a reference value (implicit)
+    /// @sa https://json.nlohmann.me/api/basic_json/get_ref/
+    template<typename ReferenceType, typename std::enable_if<
+                 std::is_reference<ReferenceType>::value, int>::type = 0>
+    ReferenceType get_ref()
+    {
+        // delegate call to get_ref_impl
+        return get_ref_impl<ReferenceType>(*this);
+    }
+
+    /// @brief get a reference value (implicit)
+    /// @sa https://json.nlohmann.me/api/basic_json/get_ref/
+    template < typename ReferenceType, typename std::enable_if <
+                   std::is_reference<ReferenceType>::value&&
+                   std::is_const<typename std::remove_reference<ReferenceType>::type>::value, int >::type = 0 >
+    ReferenceType get_ref() const
+    {
+        // delegate call to get_ref_impl
+        return get_ref_impl<ReferenceType>(*this);
+    }
+
+    /*!
+    @brief get a value (implicit)
+
+    Implicit type conversion between the JSON value and a compatible value.
+    The call is realized by calling @ref get() const.
+
+    @tparam ValueType non-pointer type compatible to the JSON value, for
+    instance `int` for JSON integer numbers, `bool` for JSON booleans, or
+    `std::vector` types for JSON arrays. The character type of @ref string_t
+    as well as an initializer list of this type is excluded to avoid
+    ambiguities as these types implicitly convert to `std::string`.
+
+    @return copy of the JSON value, converted to type @a ValueType
+
+    @throw type_error.302 in case passed type @a ValueType is incompatible
+    to the JSON value type (e.g., the JSON value is of type boolean, but a
+    string is requested); see example below
+
+    @complexity Linear in the size of the JSON value.
+
+    @liveexample{The example below shows several conversions from JSON values
+    to other types. There a few things to note: (1) Floating-point numbers can
+    be converted to integers\, (2) A JSON array can be converted to a standard
+    `std::vector<short>`\, (3) A JSON object can be converted to C++
+    associative containers such as `std::unordered_map<std::string\,
+    json>`.,operator__ValueType}
+
+    @since version 1.0.0
+    */
+    template < typename ValueType, typename std::enable_if <
+                   detail::conjunction <
+                       detail::negation<std::is_pointer<ValueType>>,
+                       detail::negation<std::is_same<ValueType, std::nullptr_t>>,
+                       detail::negation<std::is_same<ValueType, detail::json_ref<basic_json>>>,
+                                        detail::negation<std::is_same<ValueType, typename string_t::value_type>>,
+                                        detail::negation<detail::is_basic_json<ValueType>>,
+                                        detail::negation<std::is_same<ValueType, std::initializer_list<typename string_t::value_type>>>,
+#if defined(JSON_HAS_CPP_17) && (defined(__GNUC__) || (defined(_MSC_VER) && _MSC_VER >= 1910 && _MSC_VER <= 1914))
+                                                detail::negation<std::is_same<ValueType, std::string_view>>,
+#endif
+#if defined(JSON_HAS_CPP_17) && JSON_HAS_STATIC_RTTI
+                                                detail::negation<std::is_same<ValueType, std::any>>,
+#endif
+                                                detail::is_detected_lazy<detail::get_template_function, const basic_json_t&, ValueType>
+                                                >::value, int >::type = 0 >
+                                        JSON_EXPLICIT operator ValueType() const
+    {
+        // delegate the call to get<>() const
+        return get<ValueType>();
+    }
+
+    /// @brief get a binary value
+    /// @sa https://json.nlohmann.me/api/basic_json/get_binary/
+    binary_t& get_binary()
+    {
+        if (!is_binary())
+        {
+            JSON_THROW(type_error::create(302, detail::concat("type must be binary, but is ", type_name()), this));
+        }
+
+        return *get_ptr<binary_t*>();
+    }
+
+    /// @brief get a binary value
+    /// @sa https://json.nlohmann.me/api/basic_json/get_binary/
+    const binary_t& get_binary() const
+    {
+        if (!is_binary())
+        {
+            JSON_THROW(type_error::create(302, detail::concat("type must be binary, but is ", type_name()), this));
+        }
+
+        return *get_ptr<const binary_t*>();
+    }
+
+    /// @}
+
+    ////////////////////
+    // element access //
+    ////////////////////
+
+    /// @name element access
+    /// Access to the JSON value.
+    /// @{
+
+    /// @brief access specified array element with bounds checking
+    /// @sa https://json.nlohmann.me/api/basic_json/at/
+    reference at(size_type idx)
+    {
+        // at only works for arrays
+        if (JSON_HEDLEY_LIKELY(is_array()))
+        {
+            JSON_TRY
+            {
+                return set_parent(m_data.m_value.array->at(idx));
+            }
+            JSON_CATCH (std::out_of_range&)
+            {
+                // create better exception explanation
+                JSON_THROW(out_of_range::create(401, detail::concat("array index ", std::to_string(idx), " is out of range"), this));
+            } // cppcheck-suppress[missingReturn]
+        }
+        else
+        {
+            JSON_THROW(type_error::create(304, detail::concat("cannot use at() with ", type_name()), this));
+        }
+    }
+
+    /// @brief access specified array element with bounds checking
+    /// @sa https://json.nlohmann.me/api/basic_json/at/
+    const_reference at(size_type idx) const
+    {
+        // at only works for arrays
+        if (JSON_HEDLEY_LIKELY(is_array()))
+        {
+            JSON_TRY
+            {
+                return m_data.m_value.array->at(idx);
+            }
+            JSON_CATCH (std::out_of_range&)
+            {
+                // create better exception explanation
+                JSON_THROW(out_of_range::create(401, detail::concat("array index ", std::to_string(idx), " is out of range"), this));
+            } // cppcheck-suppress[missingReturn]
+        }
+        else
+        {
+            JSON_THROW(type_error::create(304, detail::concat("cannot use at() with ", type_name()), this));
+        }
+    }
+
+    /// @brief access specified object element with bounds checking
+    /// @sa https://json.nlohmann.me/api/basic_json/at/
+    reference at(const typename object_t::key_type& key)
+    {
+        // at only works for objects
+        if (JSON_HEDLEY_UNLIKELY(!is_object()))
+        {
+            JSON_THROW(type_error::create(304, detail::concat("cannot use at() with ", type_name()), this));
+        }
+
+        auto it = m_data.m_value.object->find(key);
+        if (it == m_data.m_value.object->end())
+        {
+            JSON_THROW(out_of_range::create(403, detail::concat("key '", key, "' not found"), this));
+        }
+        return set_parent(it->second);
+    }
+
+    /// @brief access specified object element with bounds checking
+    /// @sa https://json.nlohmann.me/api/basic_json/at/
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_basic_json_key_type<basic_json_t, KeyType>::value, int> = 0>
+    reference at(KeyType && key)
+    {
+        // at only works for objects
+        if (JSON_HEDLEY_UNLIKELY(!is_object()))
+        {
+            JSON_THROW(type_error::create(304, detail::concat("cannot use at() with ", type_name()), this));
+        }
+
+        auto it = m_data.m_value.object->find(std::forward<KeyType>(key));
+        if (it == m_data.m_value.object->end())
+        {
+            JSON_THROW(out_of_range::create(403, detail::concat("key '", string_t(std::forward<KeyType>(key)), "' not found"), this));
+        }
+        return set_parent(it->second);
+    }
+
+    /// @brief access specified object element with bounds checking
+    /// @sa https://json.nlohmann.me/api/basic_json/at/
+    const_reference at(const typename object_t::key_type& key) const
+    {
+        // at only works for objects
+        if (JSON_HEDLEY_UNLIKELY(!is_object()))
+        {
+            JSON_THROW(type_error::create(304, detail::concat("cannot use at() with ", type_name()), this));
+        }
+
+        auto it = m_data.m_value.object->find(key);
+        if (it == m_data.m_value.object->end())
+        {
+            JSON_THROW(out_of_range::create(403, detail::concat("key '", key, "' not found"), this));
+        }
+        return it->second;
+    }
+
+    /// @brief access specified object element with bounds checking
+    /// @sa https://json.nlohmann.me/api/basic_json/at/
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_basic_json_key_type<basic_json_t, KeyType>::value, int> = 0>
+    const_reference at(KeyType && key) const
+    {
+        // at only works for objects
+        if (JSON_HEDLEY_UNLIKELY(!is_object()))
+        {
+            JSON_THROW(type_error::create(304, detail::concat("cannot use at() with ", type_name()), this));
+        }
+
+        auto it = m_data.m_value.object->find(std::forward<KeyType>(key));
+        if (it == m_data.m_value.object->end())
+        {
+            JSON_THROW(out_of_range::create(403, detail::concat("key '", string_t(std::forward<KeyType>(key)), "' not found"), this));
+        }
+        return it->second;
+    }
+
+    /// @brief access specified array element
+    /// @sa https://json.nlohmann.me/api/basic_json/operator%5B%5D/
+    reference operator[](size_type idx)
+    {
+        // implicitly convert null value to an empty array
+        if (is_null())
+        {
+            m_data.m_type = value_t::array;
+            m_data.m_value.array = create<array_t>();
+            assert_invariant();
+        }
+
+        // operator[] only works for arrays
+        if (JSON_HEDLEY_LIKELY(is_array()))
+        {
+            // fill up array with null values if given idx is outside range
+            if (idx >= m_data.m_value.array->size())
+            {
+#if JSON_DIAGNOSTICS
+                // remember array size & capacity before resizing
+                const auto old_size = m_data.m_value.array->size();
+                const auto old_capacity = m_data.m_value.array->capacity();
+#endif
+                m_data.m_value.array->resize(idx + 1);
+
+#if JSON_DIAGNOSTICS
+                if (JSON_HEDLEY_UNLIKELY(m_data.m_value.array->capacity() != old_capacity))
+                {
+                    // capacity has changed: update all parents
+                    set_parents();
+                }
+                else
+                {
+                    // set parent for values added above
+                    set_parents(begin() + static_cast<typename iterator::difference_type>(old_size), static_cast<typename iterator::difference_type>(idx + 1 - old_size));
+                }
+#endif
+                assert_invariant();
+            }
+
+            return m_data.m_value.array->operator[](idx);
+        }
+
+        JSON_THROW(type_error::create(305, detail::concat("cannot use operator[] with a numeric argument with ", type_name()), this));
+    }
+
+    /// @brief access specified array element
+    /// @sa https://json.nlohmann.me/api/basic_json/operator%5B%5D/
+    const_reference operator[](size_type idx) const
+    {
+        // const operator[] only works for arrays
+        if (JSON_HEDLEY_LIKELY(is_array()))
+        {
+            return m_data.m_value.array->operator[](idx);
+        }
+
+        JSON_THROW(type_error::create(305, detail::concat("cannot use operator[] with a numeric argument with ", type_name()), this));
+    }
+
+    /// @brief access specified object element
+    /// @sa https://json.nlohmann.me/api/basic_json/operator%5B%5D/
+    reference operator[](typename object_t::key_type key) // NOLINT(performance-unnecessary-value-param)
+    {
+        // implicitly convert null value to an empty object
+        if (is_null())
+        {
+            m_data.m_type = value_t::object;
+            m_data.m_value.object = create<object_t>();
+            assert_invariant();
+        }
+
+        // operator[] only works for objects
+        if (JSON_HEDLEY_LIKELY(is_object()))
+        {
+            auto result = m_data.m_value.object->emplace(std::move(key), nullptr);
+            return set_parent(result.first->second);
+        }
+
+        JSON_THROW(type_error::create(305, detail::concat("cannot use operator[] with a string argument with ", type_name()), this));
+    }
+
+    /// @brief access specified object element
+    /// @sa https://json.nlohmann.me/api/basic_json/operator%5B%5D/
+    const_reference operator[](const typename object_t::key_type& key) const
+    {
+        // const operator[] only works for objects
+        if (JSON_HEDLEY_LIKELY(is_object()))
+        {
+            auto it = m_data.m_value.object->find(key);
+            JSON_ASSERT(it != m_data.m_value.object->end());
+            return it->second;
+        }
+
+        JSON_THROW(type_error::create(305, detail::concat("cannot use operator[] with a string argument with ", type_name()), this));
+    }
+
+    // these two functions resolve a (const) char * ambiguity affecting Clang and MSVC
+    // (they seemingly cannot be constrained to resolve the ambiguity)
+    template<typename T>
+    reference operator[](T* key)
+    {
+        return operator[](typename object_t::key_type(key));
+    }
+
+    template<typename T>
+    const_reference operator[](T* key) const
+    {
+        return operator[](typename object_t::key_type(key));
+    }
+
+    /// @brief access specified object element
+    /// @sa https://json.nlohmann.me/api/basic_json/operator%5B%5D/
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_basic_json_key_type<basic_json_t, KeyType>::value, int > = 0 >
+    reference operator[](KeyType && key)
+    {
+        // implicitly convert null value to an empty object
+        if (is_null())
+        {
+            m_data.m_type = value_t::object;
+            m_data.m_value.object = create<object_t>();
+            assert_invariant();
+        }
+
+        // operator[] only works for objects
+        if (JSON_HEDLEY_LIKELY(is_object()))
+        {
+            auto result = m_data.m_value.object->emplace(std::forward<KeyType>(key), nullptr);
+            return set_parent(result.first->second);
+        }
+
+        JSON_THROW(type_error::create(305, detail::concat("cannot use operator[] with a string argument with ", type_name()), this));
+    }
+
+    /// @brief access specified object element
+    /// @sa https://json.nlohmann.me/api/basic_json/operator%5B%5D/
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_basic_json_key_type<basic_json_t, KeyType>::value, int > = 0 >
+    const_reference operator[](KeyType && key) const
+    {
+        // const operator[] only works for objects
+        if (JSON_HEDLEY_LIKELY(is_object()))
+        {
+            auto it = m_data.m_value.object->find(std::forward<KeyType>(key));
+            JSON_ASSERT(it != m_data.m_value.object->end());
+            return it->second;
+        }
+
+        JSON_THROW(type_error::create(305, detail::concat("cannot use operator[] with a string argument with ", type_name()), this));
+    }
+
+  private:
+    template<typename KeyType>
+    using is_comparable_with_object_key = detail::is_comparable <
+        object_comparator_t, const typename object_t::key_type&, KeyType >;
+
+    template<typename ValueType>
+    using value_return_type = std::conditional <
+        detail::is_c_string_uncvref<ValueType>::value,
+        string_t, typename std::decay<ValueType>::type >;
+
+  public:
+    /// @brief access specified object element with default value
+    /// @sa https://json.nlohmann.me/api/basic_json/value/
+    template < class ValueType, detail::enable_if_t <
+                   !detail::is_transparent<object_comparator_t>::value
+                   && detail::is_getable<basic_json_t, ValueType>::value
+                   && !std::is_same<value_t, detail::uncvref_t<ValueType>>::value, int > = 0 >
+    ValueType value(const typename object_t::key_type& key, const ValueType& default_value) const
+    {
+        // value only works for objects
+        if (JSON_HEDLEY_LIKELY(is_object()))
+        {
+            // if key is found, return value and given default value otherwise
+            const auto it = find(key);
+            if (it != end())
+            {
+                return it->template get<ValueType>();
+            }
+
+            return default_value;
+        }
+
+        JSON_THROW(type_error::create(306, detail::concat("cannot use value() with ", type_name()), this));
+    }
+
+    /// @brief access specified object element with default value
+    /// @sa https://json.nlohmann.me/api/basic_json/value/
+    template < class ValueType, class ReturnType = typename value_return_type<ValueType>::type,
+               detail::enable_if_t <
+                   !detail::is_transparent<object_comparator_t>::value
+                   && detail::is_getable<basic_json_t, ReturnType>::value
+                   && !std::is_same<value_t, detail::uncvref_t<ValueType>>::value, int > = 0 >
+    ReturnType value(const typename object_t::key_type& key, ValueType && default_value) const
+    {
+        // value only works for objects
+        if (JSON_HEDLEY_LIKELY(is_object()))
+        {
+            // if key is found, return value and given default value otherwise
+            const auto it = find(key);
+            if (it != end())
+            {
+                return it->template get<ReturnType>();
+            }
+
+            return std::forward<ValueType>(default_value);
+        }
+
+        JSON_THROW(type_error::create(306, detail::concat("cannot use value() with ", type_name()), this));
+    }
+
+    /// @brief access specified object element with default value
+    /// @sa https://json.nlohmann.me/api/basic_json/value/
+    template < class ValueType, class KeyType, detail::enable_if_t <
+                   detail::is_transparent<object_comparator_t>::value
+                   && !detail::is_json_pointer<KeyType>::value
+                   && is_comparable_with_object_key<KeyType>::value
+                   && detail::is_getable<basic_json_t, ValueType>::value
+                   && !std::is_same<value_t, detail::uncvref_t<ValueType>>::value, int > = 0 >
+    ValueType value(KeyType && key, const ValueType& default_value) const
+    {
+        // value only works for objects
+        if (JSON_HEDLEY_LIKELY(is_object()))
+        {
+            // if key is found, return value and given default value otherwise
+            const auto it = find(std::forward<KeyType>(key));
+            if (it != end())
+            {
+                return it->template get<ValueType>();
+            }
+
+            return default_value;
+        }
+
+        JSON_THROW(type_error::create(306, detail::concat("cannot use value() with ", type_name()), this));
+    }
+
+    /// @brief access specified object element via JSON Pointer with default value
+    /// @sa https://json.nlohmann.me/api/basic_json/value/
+    template < class ValueType, class KeyType, class ReturnType = typename value_return_type<ValueType>::type,
+               detail::enable_if_t <
+                   detail::is_transparent<object_comparator_t>::value
+                   && !detail::is_json_pointer<KeyType>::value
+                   && is_comparable_with_object_key<KeyType>::value
+                   && detail::is_getable<basic_json_t, ReturnType>::value
+                   && !std::is_same<value_t, detail::uncvref_t<ValueType>>::value, int > = 0 >
+    ReturnType value(KeyType && key, ValueType && default_value) const
+    {
+        // value only works for objects
+        if (JSON_HEDLEY_LIKELY(is_object()))
+        {
+            // if key is found, return value and given default value otherwise
+            const auto it = find(std::forward<KeyType>(key));
+            if (it != end())
+            {
+                return it->template get<ReturnType>();
+            }
+
+            return std::forward<ValueType>(default_value);
+        }
+
+        JSON_THROW(type_error::create(306, detail::concat("cannot use value() with ", type_name()), this));
+    }
+
+    /// @brief access specified object element via JSON Pointer with default value
+    /// @sa https://json.nlohmann.me/api/basic_json/value/
+    template < class ValueType, detail::enable_if_t <
+                   detail::is_getable<basic_json_t, ValueType>::value
+                   && !std::is_same<value_t, detail::uncvref_t<ValueType>>::value, int > = 0 >
+    ValueType value(const json_pointer& ptr, const ValueType& default_value) const
+    {
+        // value only works for objects
+        if (JSON_HEDLEY_LIKELY(is_object()))
+        {
+            // if pointer resolves a value, return it or use default value
+            JSON_TRY
+            {
+                return ptr.get_checked(this).template get<ValueType>();
+            }
+            JSON_INTERNAL_CATCH (out_of_range&)
+            {
+                return default_value;
+            }
+        }
+
+        JSON_THROW(type_error::create(306, detail::concat("cannot use value() with ", type_name()), this));
+    }
+
+    /// @brief access specified object element via JSON Pointer with default value
+    /// @sa https://json.nlohmann.me/api/basic_json/value/
+    template < class ValueType, class ReturnType = typename value_return_type<ValueType>::type,
+               detail::enable_if_t <
+                   detail::is_getable<basic_json_t, ReturnType>::value
+                   && !std::is_same<value_t, detail::uncvref_t<ValueType>>::value, int > = 0 >
+    ReturnType value(const json_pointer& ptr, ValueType && default_value) const
+    {
+        // value only works for objects
+        if (JSON_HEDLEY_LIKELY(is_object()))
+        {
+            // if pointer resolves a value, return it or use default value
+            JSON_TRY
+            {
+                return ptr.get_checked(this).template get<ReturnType>();
+            }
+            JSON_INTERNAL_CATCH (out_of_range&)
+            {
+                return std::forward<ValueType>(default_value);
+            }
+        }
+
+        JSON_THROW(type_error::create(306, detail::concat("cannot use value() with ", type_name()), this));
+    }
+
+    template < class ValueType, class BasicJsonType, detail::enable_if_t <
+                   detail::is_basic_json<BasicJsonType>::value
+                   && detail::is_getable<basic_json_t, ValueType>::value
+                   && !std::is_same<value_t, detail::uncvref_t<ValueType>>::value, int > = 0 >
+    JSON_HEDLEY_DEPRECATED_FOR(3.11.0, basic_json::json_pointer or nlohmann::json_pointer<basic_json::string_t>) // NOLINT(readability/alt_tokens)
+    ValueType value(const ::nlohmann::json_pointer<BasicJsonType>& ptr, const ValueType& default_value) const
+    {
+        return value(ptr.convert(), default_value);
+    }
+
+    template < class ValueType, class BasicJsonType, class ReturnType = typename value_return_type<ValueType>::type,
+               detail::enable_if_t <
+                   detail::is_basic_json<BasicJsonType>::value
+                   && detail::is_getable<basic_json_t, ReturnType>::value
+                   && !std::is_same<value_t, detail::uncvref_t<ValueType>>::value, int > = 0 >
+    JSON_HEDLEY_DEPRECATED_FOR(3.11.0, basic_json::json_pointer or nlohmann::json_pointer<basic_json::string_t>) // NOLINT(readability/alt_tokens)
+    ReturnType value(const ::nlohmann::json_pointer<BasicJsonType>& ptr, ValueType && default_value) const
+    {
+        return value(ptr.convert(), std::forward<ValueType>(default_value));
+    }
+
+    /// @brief access the first element
+    /// @sa https://json.nlohmann.me/api/basic_json/front/
+    reference front()
+    {
+        return *begin();
+    }
+
+    /// @brief access the first element
+    /// @sa https://json.nlohmann.me/api/basic_json/front/
+    const_reference front() const
+    {
+        return *cbegin();
+    }
+
+    /// @brief access the last element
+    /// @sa https://json.nlohmann.me/api/basic_json/back/
+    reference back()
+    {
+        auto tmp = end();
+        --tmp;
+        return *tmp;
+    }
+
+    /// @brief access the last element
+    /// @sa https://json.nlohmann.me/api/basic_json/back/
+    const_reference back() const
+    {
+        auto tmp = cend();
+        --tmp;
+        return *tmp;
+    }
+
+    /// @brief remove element given an iterator
+    /// @sa https://json.nlohmann.me/api/basic_json/erase/
+    template < class IteratorType, detail::enable_if_t <
+                   std::is_same<IteratorType, typename basic_json_t::iterator>::value ||
+                   std::is_same<IteratorType, typename basic_json_t::const_iterator>::value, int > = 0 >
+    IteratorType erase(IteratorType pos) // NOLINT(performance-unnecessary-value-param)
+    {
+        // make sure iterator fits the current value
+        if (JSON_HEDLEY_UNLIKELY(this != pos.m_object))
+        {
+            JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value", this));
+        }
+
+        IteratorType result = end();
+
+        switch (m_data.m_type)
+        {
+            case value_t::boolean:
+            case value_t::number_float:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::string:
+            case value_t::binary:
+            {
+                if (JSON_HEDLEY_UNLIKELY(!pos.m_it.primitive_iterator.is_begin()))
+                {
+                    JSON_THROW(invalid_iterator::create(205, "iterator out of range", this));
+                }
+
+                if (is_string())
+                {
+                    AllocatorType<string_t> alloc;
+                    std::allocator_traits<decltype(alloc)>::destroy(alloc, m_data.m_value.string);
+                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, m_data.m_value.string, 1);
+                    m_data.m_value.string = nullptr;
+                }
+                else if (is_binary())
+                {
+                    AllocatorType<binary_t> alloc;
+                    std::allocator_traits<decltype(alloc)>::destroy(alloc, m_data.m_value.binary);
+                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, m_data.m_value.binary, 1);
+                    m_data.m_value.binary = nullptr;
+                }
+
+                m_data.m_type = value_t::null;
+                assert_invariant();
+                break;
+            }
+
+            case value_t::object:
+            {
+                result.m_it.object_iterator = m_data.m_value.object->erase(pos.m_it.object_iterator);
+                break;
+            }
+
+            case value_t::array:
+            {
+                result.m_it.array_iterator = m_data.m_value.array->erase(pos.m_it.array_iterator);
+                break;
+            }
+
+            case value_t::null:
+            case value_t::discarded:
+            default:
+                JSON_THROW(type_error::create(307, detail::concat("cannot use erase() with ", type_name()), this));
+        }
+
+        return result;
+    }
+
+    /// @brief remove elements given an iterator range
+    /// @sa https://json.nlohmann.me/api/basic_json/erase/
+    template < class IteratorType, detail::enable_if_t <
+                   std::is_same<IteratorType, typename basic_json_t::iterator>::value ||
+                   std::is_same<IteratorType, typename basic_json_t::const_iterator>::value, int > = 0 >
+    IteratorType erase(IteratorType first, IteratorType last) // NOLINT(performance-unnecessary-value-param)
+    {
+        // make sure iterator fits the current value
+        if (JSON_HEDLEY_UNLIKELY(this != first.m_object || this != last.m_object))
+        {
+            JSON_THROW(invalid_iterator::create(203, "iterators do not fit current value", this));
+        }
+
+        IteratorType result = end();
+
+        switch (m_data.m_type)
+        {
+            case value_t::boolean:
+            case value_t::number_float:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::string:
+            case value_t::binary:
+            {
+                if (JSON_HEDLEY_LIKELY(!first.m_it.primitive_iterator.is_begin()
+                                       || !last.m_it.primitive_iterator.is_end()))
+                {
+                    JSON_THROW(invalid_iterator::create(204, "iterators out of range", this));
+                }
+
+                if (is_string())
+                {
+                    AllocatorType<string_t> alloc;
+                    std::allocator_traits<decltype(alloc)>::destroy(alloc, m_data.m_value.string);
+                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, m_data.m_value.string, 1);
+                    m_data.m_value.string = nullptr;
+                }
+                else if (is_binary())
+                {
+                    AllocatorType<binary_t> alloc;
+                    std::allocator_traits<decltype(alloc)>::destroy(alloc, m_data.m_value.binary);
+                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, m_data.m_value.binary, 1);
+                    m_data.m_value.binary = nullptr;
+                }
+
+                m_data.m_type = value_t::null;
+                assert_invariant();
+                break;
+            }
+
+            case value_t::object:
+            {
+                result.m_it.object_iterator = m_data.m_value.object->erase(first.m_it.object_iterator,
+                                              last.m_it.object_iterator);
+                break;
+            }
+
+            case value_t::array:
+            {
+                result.m_it.array_iterator = m_data.m_value.array->erase(first.m_it.array_iterator,
+                                             last.m_it.array_iterator);
+                break;
+            }
+
+            case value_t::null:
+            case value_t::discarded:
+            default:
+                JSON_THROW(type_error::create(307, detail::concat("cannot use erase() with ", type_name()), this));
+        }
+
+        return result;
+    }
+
+  private:
+    template < typename KeyType, detail::enable_if_t <
+                   detail::has_erase_with_key_type<basic_json_t, KeyType>::value, int > = 0 >
+    size_type erase_internal(KeyType && key)
+    {
+        // this erase only works for objects
+        if (JSON_HEDLEY_UNLIKELY(!is_object()))
+        {
+            JSON_THROW(type_error::create(307, detail::concat("cannot use erase() with ", type_name()), this));
+        }
+
+        return m_data.m_value.object->erase(std::forward<KeyType>(key));
+    }
+
+    template < typename KeyType, detail::enable_if_t <
+                   !detail::has_erase_with_key_type<basic_json_t, KeyType>::value, int > = 0 >
+    size_type erase_internal(KeyType && key)
+    {
+        // this erase only works for objects
+        if (JSON_HEDLEY_UNLIKELY(!is_object()))
+        {
+            JSON_THROW(type_error::create(307, detail::concat("cannot use erase() with ", type_name()), this));
+        }
+
+        const auto it = m_data.m_value.object->find(std::forward<KeyType>(key));
+        if (it != m_data.m_value.object->end())
+        {
+            m_data.m_value.object->erase(it);
+            return 1;
+        }
+        return 0;
+    }
+
+  public:
+
+    /// @brief remove element from a JSON object given a key
+    /// @sa https://json.nlohmann.me/api/basic_json/erase/
+    size_type erase(const typename object_t::key_type& key)
+    {
+        // the indirection via erase_internal() is added to avoid making this
+        // function a template and thus de-rank it during overload resolution
+        return erase_internal(key);
+    }
+
+    /// @brief remove element from a JSON object given a key
+    /// @sa https://json.nlohmann.me/api/basic_json/erase/
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_basic_json_key_type<basic_json_t, KeyType>::value, int> = 0>
+    size_type erase(KeyType && key)
+    {
+        return erase_internal(std::forward<KeyType>(key));
+    }
+
+    /// @brief remove element from a JSON array given an index
+    /// @sa https://json.nlohmann.me/api/basic_json/erase/
+    void erase(const size_type idx)
+    {
+        // this erase only works for arrays
+        if (JSON_HEDLEY_LIKELY(is_array()))
+        {
+            if (JSON_HEDLEY_UNLIKELY(idx >= size()))
+            {
+                JSON_THROW(out_of_range::create(401, detail::concat("array index ", std::to_string(idx), " is out of range"), this));
+            }
+
+            m_data.m_value.array->erase(m_data.m_value.array->begin() + static_cast<difference_type>(idx));
+        }
+        else
+        {
+            JSON_THROW(type_error::create(307, detail::concat("cannot use erase() with ", type_name()), this));
+        }
+    }
+
+    /// @}
+
+    ////////////
+    // lookup //
+    ////////////
+
+    /// @name lookup
+    /// @{
+
+    /// @brief find an element in a JSON object
+    /// @sa https://json.nlohmann.me/api/basic_json/find/
+    iterator find(const typename object_t::key_type& key)
+    {
+        auto result = end();
+
+        if (is_object())
+        {
+            result.m_it.object_iterator = m_data.m_value.object->find(key);
+        }
+
+        return result;
+    }
+
+    /// @brief find an element in a JSON object
+    /// @sa https://json.nlohmann.me/api/basic_json/find/
+    const_iterator find(const typename object_t::key_type& key) const
+    {
+        auto result = cend();
+
+        if (is_object())
+        {
+            result.m_it.object_iterator = m_data.m_value.object->find(key);
+        }
+
+        return result;
+    }
+
+    /// @brief find an element in a JSON object
+    /// @sa https://json.nlohmann.me/api/basic_json/find/
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_basic_json_key_type<basic_json_t, KeyType>::value, int> = 0>
+    iterator find(KeyType && key)
+    {
+        auto result = end();
+
+        if (is_object())
+        {
+            result.m_it.object_iterator = m_data.m_value.object->find(std::forward<KeyType>(key));
+        }
+
+        return result;
+    }
+
+    /// @brief find an element in a JSON object
+    /// @sa https://json.nlohmann.me/api/basic_json/find/
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_basic_json_key_type<basic_json_t, KeyType>::value, int> = 0>
+    const_iterator find(KeyType && key) const
+    {
+        auto result = cend();
+
+        if (is_object())
+        {
+            result.m_it.object_iterator = m_data.m_value.object->find(std::forward<KeyType>(key));
+        }
+
+        return result;
+    }
+
+    /// @brief returns the number of occurrences of a key in a JSON object
+    /// @sa https://json.nlohmann.me/api/basic_json/count/
+    size_type count(const typename object_t::key_type& key) const
+    {
+        // return 0 for all nonobject types
+        return is_object() ? m_data.m_value.object->count(key) : 0;
+    }
+
+    /// @brief returns the number of occurrences of a key in a JSON object
+    /// @sa https://json.nlohmann.me/api/basic_json/count/
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_basic_json_key_type<basic_json_t, KeyType>::value, int> = 0>
+    size_type count(KeyType && key) const
+    {
+        // return 0 for all nonobject types
+        return is_object() ? m_data.m_value.object->count(std::forward<KeyType>(key)) : 0;
+    }
+
+    /// @brief check the existence of an element in a JSON object
+    /// @sa https://json.nlohmann.me/api/basic_json/contains/
+    bool contains(const typename object_t::key_type& key) const
+    {
+        return is_object() && m_data.m_value.object->find(key) != m_data.m_value.object->end();
+    }
+
+    /// @brief check the existence of an element in a JSON object
+    /// @sa https://json.nlohmann.me/api/basic_json/contains/
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_basic_json_key_type<basic_json_t, KeyType>::value, int> = 0>
+    bool contains(KeyType && key) const
+    {
+        return is_object() && m_data.m_value.object->find(std::forward<KeyType>(key)) != m_data.m_value.object->end();
+    }
+
+    /// @brief check the existence of an element in a JSON object given a JSON pointer
+    /// @sa https://json.nlohmann.me/api/basic_json/contains/
+    bool contains(const json_pointer& ptr) const
+    {
+        return ptr.contains(this);
+    }
+
+    template<typename BasicJsonType, detail::enable_if_t<detail::is_basic_json<BasicJsonType>::value, int> = 0>
+    JSON_HEDLEY_DEPRECATED_FOR(3.11.0, basic_json::json_pointer or nlohmann::json_pointer<basic_json::string_t>) // NOLINT(readability/alt_tokens)
+    bool contains(const typename ::nlohmann::json_pointer<BasicJsonType>& ptr) const
+    {
+        return ptr.contains(this);
+    }
+
+    /// @}
+
+    ///////////////
+    // iterators //
+    ///////////////
+
+    /// @name iterators
+    /// @{
+
+    /// @brief returns an iterator to the first element
+    /// @sa https://json.nlohmann.me/api/basic_json/begin/
+    iterator begin() noexcept
+    {
+        iterator result(this);
+        result.set_begin();
+        return result;
+    }
+
+    /// @brief returns an iterator to the first element
+    /// @sa https://json.nlohmann.me/api/basic_json/begin/
+    const_iterator begin() const noexcept
+    {
+        return cbegin();
+    }
+
+    /// @brief returns a const iterator to the first element
+    /// @sa https://json.nlohmann.me/api/basic_json/cbegin/
+    const_iterator cbegin() const noexcept
+    {
+        const_iterator result(this);
+        result.set_begin();
+        return result;
+    }
+
+    /// @brief returns an iterator to one past the last element
+    /// @sa https://json.nlohmann.me/api/basic_json/end/
+    iterator end() noexcept
+    {
+        iterator result(this);
+        result.set_end();
+        return result;
+    }
+
+    /// @brief returns an iterator to one past the last element
+    /// @sa https://json.nlohmann.me/api/basic_json/end/
+    const_iterator end() const noexcept
+    {
+        return cend();
+    }
+
+    /// @brief returns an iterator to one past the last element
+    /// @sa https://json.nlohmann.me/api/basic_json/cend/
+    const_iterator cend() const noexcept
+    {
+        const_iterator result(this);
+        result.set_end();
+        return result;
+    }
+
+    /// @brief returns an iterator to the reverse-beginning
+    /// @sa https://json.nlohmann.me/api/basic_json/rbegin/
+    reverse_iterator rbegin() noexcept
+    {
+        return reverse_iterator(end());
+    }
+
+    /// @brief returns an iterator to the reverse-beginning
+    /// @sa https://json.nlohmann.me/api/basic_json/rbegin/
+    const_reverse_iterator rbegin() const noexcept
+    {
+        return crbegin();
+    }
+
+    /// @brief returns an iterator to the reverse-end
+    /// @sa https://json.nlohmann.me/api/basic_json/rend/
+    reverse_iterator rend() noexcept
+    {
+        return reverse_iterator(begin());
+    }
+
+    /// @brief returns an iterator to the reverse-end
+    /// @sa https://json.nlohmann.me/api/basic_json/rend/
+    const_reverse_iterator rend() const noexcept
+    {
+        return crend();
+    }
+
+    /// @brief returns a const reverse iterator to the last element
+    /// @sa https://json.nlohmann.me/api/basic_json/crbegin/
+    const_reverse_iterator crbegin() const noexcept
+    {
+        return const_reverse_iterator(cend());
+    }
+
+    /// @brief returns a const reverse iterator to one before the first
+    /// @sa https://json.nlohmann.me/api/basic_json/crend/
+    const_reverse_iterator crend() const noexcept
+    {
+        return const_reverse_iterator(cbegin());
+    }
+
+  public:
+    /// @brief wrapper to access iterator member functions in range-based for
+    /// @sa https://json.nlohmann.me/api/basic_json/items/
+    /// @deprecated This function is deprecated since 3.1.0 and will be removed in
+    ///             version 4.0.0 of the library. Please use @ref items() instead;
+    ///             that is, replace `json::iterator_wrapper(j)` with `j.items()`.
+    JSON_HEDLEY_DEPRECATED_FOR(3.1.0, items())
+    static iteration_proxy<iterator> iterator_wrapper(reference ref) noexcept
+    {
+        return ref.items();
+    }
+
+    /// @brief wrapper to access iterator member functions in range-based for
+    /// @sa https://json.nlohmann.me/api/basic_json/items/
+    /// @deprecated This function is deprecated since 3.1.0 and will be removed in
+    ///         version 4.0.0 of the library. Please use @ref items() instead;
+    ///         that is, replace `json::iterator_wrapper(j)` with `j.items()`.
+    JSON_HEDLEY_DEPRECATED_FOR(3.1.0, items())
+    static iteration_proxy<const_iterator> iterator_wrapper(const_reference ref) noexcept
+    {
+        return ref.items();
+    }
+
+    /// @brief helper to access iterator member functions in range-based for
+    /// @sa https://json.nlohmann.me/api/basic_json/items/
+    iteration_proxy<iterator> items() noexcept
+    {
+        return iteration_proxy<iterator>(*this);
+    }
+
+    /// @brief helper to access iterator member functions in range-based for
+    /// @sa https://json.nlohmann.me/api/basic_json/items/
+    iteration_proxy<const_iterator> items() const noexcept
+    {
+        return iteration_proxy<const_iterator>(*this);
+    }
+
+    /// @}
+
+    //////////////
+    // capacity //
+    //////////////
+
+    /// @name capacity
+    /// @{
+
+    /// @brief checks whether the container is empty.
+    /// @sa https://json.nlohmann.me/api/basic_json/empty/
+    bool empty() const noexcept
+    {
+        switch (m_data.m_type)
+        {
+            case value_t::null:
+            {
+                // null values are empty
+                return true;
+            }
+
+            case value_t::array:
+            {
+                // delegate call to array_t::empty()
+                return m_data.m_value.array->empty();
+            }
+
+            case value_t::object:
+            {
+                // delegate call to object_t::empty()
+                return m_data.m_value.object->empty();
+            }
+
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+            {
+                // all other types are nonempty
+                return false;
+            }
+        }
+    }
+
+    /// @brief returns the number of elements
+    /// @sa https://json.nlohmann.me/api/basic_json/size/
+    size_type size() const noexcept
+    {
+        switch (m_data.m_type)
+        {
+            case value_t::null:
+            {
+                // null values are empty
+                return 0;
+            }
+
+            case value_t::array:
+            {
+                // delegate call to array_t::size()
+                return m_data.m_value.array->size();
+            }
+
+            case value_t::object:
+            {
+                // delegate call to object_t::size()
+                return m_data.m_value.object->size();
+            }
+
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+            {
+                // all other types have size 1
+                return 1;
+            }
+        }
+    }
+
+    /// @brief returns the maximum possible number of elements
+    /// @sa https://json.nlohmann.me/api/basic_json/max_size/
+    size_type max_size() const noexcept
+    {
+        switch (m_data.m_type)
+        {
+            case value_t::array:
+            {
+                // delegate call to array_t::max_size()
+                return m_data.m_value.array->max_size();
+            }
+
+            case value_t::object:
+            {
+                // delegate call to object_t::max_size()
+                return m_data.m_value.object->max_size();
+            }
+
+            case value_t::null:
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+            {
+                // all other types have max_size() == size()
+                return size();
+            }
+        }
+    }
+
+    /// @}
+
+    ///////////////
+    // modifiers //
+    ///////////////
+
+    /// @name modifiers
+    /// @{
+
+    /// @brief clears the contents
+    /// @sa https://json.nlohmann.me/api/basic_json/clear/
+    void clear() noexcept
+    {
+        switch (m_data.m_type)
+        {
+            case value_t::number_integer:
+            {
+                m_data.m_value.number_integer = 0;
+                break;
+            }
+
+            case value_t::number_unsigned:
+            {
+                m_data.m_value.number_unsigned = 0;
+                break;
+            }
+
+            case value_t::number_float:
+            {
+                m_data.m_value.number_float = 0.0;
+                break;
+            }
+
+            case value_t::boolean:
+            {
+                m_data.m_value.boolean = false;
+                break;
+            }
+
+            case value_t::string:
+            {
+                m_data.m_value.string->clear();
+                break;
+            }
+
+            case value_t::binary:
+            {
+                m_data.m_value.binary->clear();
+                break;
+            }
+
+            case value_t::array:
+            {
+                m_data.m_value.array->clear();
+                break;
+            }
+
+            case value_t::object:
+            {
+                m_data.m_value.object->clear();
+                break;
+            }
+
+            case value_t::null:
+            case value_t::discarded:
+            default:
+                break;
+        }
+    }
+
+    /// @brief add an object to an array
+    /// @sa https://json.nlohmann.me/api/basic_json/push_back/
+    void push_back(basic_json&& val)
+    {
+        // push_back only works for null objects or arrays
+        if (JSON_HEDLEY_UNLIKELY(!(is_null() || is_array())))
+        {
+            JSON_THROW(type_error::create(308, detail::concat("cannot use push_back() with ", type_name()), this));
+        }
+
+        // transform null object into an array
+        if (is_null())
+        {
+            m_data.m_type = value_t::array;
+            m_data.m_value = value_t::array;
+            assert_invariant();
+        }
+
+        // add element to array (move semantics)
+        const auto old_capacity = m_data.m_value.array->capacity();
+        m_data.m_value.array->push_back(std::move(val));
+        set_parent(m_data.m_value.array->back(), old_capacity);
+        // if val is moved from, basic_json move constructor marks it null, so we do not call the destructor
+    }
+
+    /// @brief add an object to an array
+    /// @sa https://json.nlohmann.me/api/basic_json/operator+=/
+    reference operator+=(basic_json&& val)
+    {
+        push_back(std::move(val));
+        return *this;
+    }
+
+    /// @brief add an object to an array
+    /// @sa https://json.nlohmann.me/api/basic_json/push_back/
+    void push_back(const basic_json& val)
+    {
+        // push_back only works for null objects or arrays
+        if (JSON_HEDLEY_UNLIKELY(!(is_null() || is_array())))
+        {
+            JSON_THROW(type_error::create(308, detail::concat("cannot use push_back() with ", type_name()), this));
+        }
+
+        // transform null object into an array
+        if (is_null())
+        {
+            m_data.m_type = value_t::array;
+            m_data.m_value = value_t::array;
+            assert_invariant();
+        }
+
+        // add element to array
+        const auto old_capacity = m_data.m_value.array->capacity();
+        m_data.m_value.array->push_back(val);
+        set_parent(m_data.m_value.array->back(), old_capacity);
+    }
+
+    /// @brief add an object to an array
+    /// @sa https://json.nlohmann.me/api/basic_json/operator+=/
+    reference operator+=(const basic_json& val)
+    {
+        push_back(val);
+        return *this;
+    }
+
+    /// @brief add an object to an object
+    /// @sa https://json.nlohmann.me/api/basic_json/push_back/
+    void push_back(const typename object_t::value_type& val)
+    {
+        // push_back only works for null objects or objects
+        if (JSON_HEDLEY_UNLIKELY(!(is_null() || is_object())))
+        {
+            JSON_THROW(type_error::create(308, detail::concat("cannot use push_back() with ", type_name()), this));
+        }
+
+        // transform null object into an object
+        if (is_null())
+        {
+            m_data.m_type = value_t::object;
+            m_data.m_value = value_t::object;
+            assert_invariant();
+        }
+
+        // add element to object
+        auto res = m_data.m_value.object->insert(val);
+        set_parent(res.first->second);
+    }
+
+    /// @brief add an object to an object
+    /// @sa https://json.nlohmann.me/api/basic_json/operator+=/
+    reference operator+=(const typename object_t::value_type& val)
+    {
+        push_back(val);
+        return *this;
+    }
+
+    /// @brief add an object to an object
+    /// @sa https://json.nlohmann.me/api/basic_json/push_back/
+    void push_back(initializer_list_t init)
+    {
+        if (is_object() && init.size() == 2 && (*init.begin())->is_string())
+        {
+            basic_json&& key = init.begin()->moved_or_copied();
+            push_back(typename object_t::value_type(
+                          std::move(key.get_ref<string_t&>()), (init.begin() + 1)->moved_or_copied()));
+        }
+        else
+        {
+            push_back(basic_json(init));
+        }
+    }
+
+    /// @brief add an object to an object
+    /// @sa https://json.nlohmann.me/api/basic_json/operator+=/
+    reference operator+=(initializer_list_t init)
+    {
+        push_back(init);
+        return *this;
+    }
+
+    /// @brief add an object to an array
+    /// @sa https://json.nlohmann.me/api/basic_json/emplace_back/
+    template<class... Args>
+    reference emplace_back(Args&& ... args)
+    {
+        // emplace_back only works for null objects or arrays
+        if (JSON_HEDLEY_UNLIKELY(!(is_null() || is_array())))
+        {
+            JSON_THROW(type_error::create(311, detail::concat("cannot use emplace_back() with ", type_name()), this));
+        }
+
+        // transform null object into an array
+        if (is_null())
+        {
+            m_data.m_type = value_t::array;
+            m_data.m_value = value_t::array;
+            assert_invariant();
+        }
+
+        // add element to array (perfect forwarding)
+        const auto old_capacity = m_data.m_value.array->capacity();
+        m_data.m_value.array->emplace_back(std::forward<Args>(args)...);
+        return set_parent(m_data.m_value.array->back(), old_capacity);
+    }
+
+    /// @brief add an object to an object if key does not exist
+    /// @sa https://json.nlohmann.me/api/basic_json/emplace/
+    template<class... Args>
+    std::pair<iterator, bool> emplace(Args&& ... args)
+    {
+        // emplace only works for null objects or arrays
+        if (JSON_HEDLEY_UNLIKELY(!(is_null() || is_object())))
+        {
+            JSON_THROW(type_error::create(311, detail::concat("cannot use emplace() with ", type_name()), this));
+        }
+
+        // transform null object into an object
+        if (is_null())
+        {
+            m_data.m_type = value_t::object;
+            m_data.m_value = value_t::object;
+            assert_invariant();
+        }
+
+        // add element to array (perfect forwarding)
+        auto res = m_data.m_value.object->emplace(std::forward<Args>(args)...);
+        set_parent(res.first->second);
+
+        // create result iterator and set iterator to the result of emplace
+        auto it = begin();
+        it.m_it.object_iterator = res.first;
+
+        // return pair of iterator and boolean
+        return {it, res.second};
+    }
+
+    /// Helper for insertion of an iterator
+    /// @note: This uses std::distance to support GCC 4.8,
+    ///        see https://github.com/nlohmann/json/pull/1257
+    template<typename... Args>
+    iterator insert_iterator(const_iterator pos, Args&& ... args) // NOLINT(performance-unnecessary-value-param)
+    {
+        iterator result(this);
+        JSON_ASSERT(m_data.m_value.array != nullptr);
+
+        auto insert_pos = std::distance(m_data.m_value.array->begin(), pos.m_it.array_iterator);
+        m_data.m_value.array->insert(pos.m_it.array_iterator, std::forward<Args>(args)...);
+        result.m_it.array_iterator = m_data.m_value.array->begin() + insert_pos;
+
+        // This could have been written as:
+        // result.m_it.array_iterator = m_data.m_value.array->insert(pos.m_it.array_iterator, cnt, val);
+        // but the return value of insert is missing in GCC 4.8, so it is written this way instead.
+
+        set_parents();
+        return result;
+    }
+
+    /// @brief inserts element into array
+    /// @sa https://json.nlohmann.me/api/basic_json/insert/
+    iterator insert(const_iterator pos, const basic_json& val) // NOLINT(performance-unnecessary-value-param)
+    {
+        // insert only works for arrays
+        if (JSON_HEDLEY_LIKELY(is_array()))
+        {
+            // check if iterator pos fits to this JSON value
+            if (JSON_HEDLEY_UNLIKELY(pos.m_object != this))
+            {
+                JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value", this));
+            }
+
+            // insert to array and return iterator
+            return insert_iterator(pos, val);
+        }
+
+        JSON_THROW(type_error::create(309, detail::concat("cannot use insert() with ", type_name()), this));
+    }
+
+    /// @brief inserts element into array
+    /// @sa https://json.nlohmann.me/api/basic_json/insert/
+    iterator insert(const_iterator pos, basic_json&& val) // NOLINT(performance-unnecessary-value-param)
+    {
+        return insert(pos, val);
+    }
+
+    /// @brief inserts copies of element into array
+    /// @sa https://json.nlohmann.me/api/basic_json/insert/
+    iterator insert(const_iterator pos, size_type cnt, const basic_json& val) // NOLINT(performance-unnecessary-value-param)
+    {
+        // insert only works for arrays
+        if (JSON_HEDLEY_LIKELY(is_array()))
+        {
+            // check if iterator pos fits to this JSON value
+            if (JSON_HEDLEY_UNLIKELY(pos.m_object != this))
+            {
+                JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value", this));
+            }
+
+            // insert to array and return iterator
+            return insert_iterator(pos, cnt, val);
+        }
+
+        JSON_THROW(type_error::create(309, detail::concat("cannot use insert() with ", type_name()), this));
+    }
+
+    /// @brief inserts range of elements into array
+    /// @sa https://json.nlohmann.me/api/basic_json/insert/
+    iterator insert(const_iterator pos, const_iterator first, const_iterator last) // NOLINT(performance-unnecessary-value-param)
+    {
+        // insert only works for arrays
+        if (JSON_HEDLEY_UNLIKELY(!is_array()))
+        {
+            JSON_THROW(type_error::create(309, detail::concat("cannot use insert() with ", type_name()), this));
+        }
+
+        // check if iterator pos fits to this JSON value
+        if (JSON_HEDLEY_UNLIKELY(pos.m_object != this))
+        {
+            JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value", this));
+        }
+
+        // check if range iterators belong to the same JSON object
+        if (JSON_HEDLEY_UNLIKELY(first.m_object != last.m_object))
+        {
+            JSON_THROW(invalid_iterator::create(210, "iterators do not fit", this));
+        }
+
+        if (JSON_HEDLEY_UNLIKELY(first.m_object == this))
+        {
+            JSON_THROW(invalid_iterator::create(211, "passed iterators may not belong to container", this));
+        }
+
+        // insert to array and return iterator
+        return insert_iterator(pos, first.m_it.array_iterator, last.m_it.array_iterator);
+    }
+
+    /// @brief inserts elements from initializer list into array
+    /// @sa https://json.nlohmann.me/api/basic_json/insert/
+    iterator insert(const_iterator pos, initializer_list_t ilist) // NOLINT(performance-unnecessary-value-param)
+    {
+        // insert only works for arrays
+        if (JSON_HEDLEY_UNLIKELY(!is_array()))
+        {
+            JSON_THROW(type_error::create(309, detail::concat("cannot use insert() with ", type_name()), this));
+        }
+
+        // check if iterator pos fits to this JSON value
+        if (JSON_HEDLEY_UNLIKELY(pos.m_object != this))
+        {
+            JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value", this));
+        }
+
+        // insert to array and return iterator
+        return insert_iterator(pos, ilist.begin(), ilist.end());
+    }
+
+    /// @brief inserts range of elements into object
+    /// @sa https://json.nlohmann.me/api/basic_json/insert/
+    void insert(const_iterator first, const_iterator last) // NOLINT(performance-unnecessary-value-param)
+    {
+        // insert only works for objects
+        if (JSON_HEDLEY_UNLIKELY(!is_object()))
+        {
+            JSON_THROW(type_error::create(309, detail::concat("cannot use insert() with ", type_name()), this));
+        }
+
+        // check if range iterators belong to the same JSON object
+        if (JSON_HEDLEY_UNLIKELY(first.m_object != last.m_object))
+        {
+            JSON_THROW(invalid_iterator::create(210, "iterators do not fit", this));
+        }
+
+        // passed iterators must belong to objects
+        if (JSON_HEDLEY_UNLIKELY(!first.m_object->is_object()))
+        {
+            JSON_THROW(invalid_iterator::create(202, "iterators first and last must point to objects", this));
+        }
+
+        m_data.m_value.object->insert(first.m_it.object_iterator, last.m_it.object_iterator);
+        set_parents();
+    }
+
+    /// @brief updates a JSON object from another object, overwriting existing keys
+    /// @sa https://json.nlohmann.me/api/basic_json/update/
+    void update(const_reference j, bool merge_objects = false)
+    {
+        update(j.begin(), j.end(), merge_objects);
+    }
+
+    /// @brief updates a JSON object from another object, overwriting existing keys
+    /// @sa https://json.nlohmann.me/api/basic_json/update/
+    void update(const_iterator first, const_iterator last, bool merge_objects = false) // NOLINT(performance-unnecessary-value-param)
+    {
+        // implicitly convert null value to an empty object
+        if (is_null())
+        {
+            m_data.m_type = value_t::object;
+            m_data.m_value.object = create<object_t>();
+            assert_invariant();
+        }
+
+        if (JSON_HEDLEY_UNLIKELY(!is_object()))
+        {
+            JSON_THROW(type_error::create(312, detail::concat("cannot use update() with ", type_name()), this));
+        }
+
+        // check if range iterators belong to the same JSON object
+        if (JSON_HEDLEY_UNLIKELY(first.m_object != last.m_object))
+        {
+            JSON_THROW(invalid_iterator::create(210, "iterators do not fit", this));
+        }
+
+        // passed iterators must belong to objects
+        if (JSON_HEDLEY_UNLIKELY(!first.m_object->is_object()))
+        {
+            JSON_THROW(type_error::create(312, detail::concat("cannot use update() with ", first.m_object->type_name()), first.m_object));
+        }
+
+        for (auto it = first; it != last; ++it)
+        {
+            if (merge_objects && it.value().is_object())
+            {
+                auto it2 = m_data.m_value.object->find(it.key());
+                if (it2 != m_data.m_value.object->end())
+                {
+                    it2->second.update(it.value(), true);
+                    continue;
+                }
+            }
+            m_data.m_value.object->operator[](it.key()) = it.value();
+#if JSON_DIAGNOSTICS
+            m_data.m_value.object->operator[](it.key()).m_parent = this;
+#endif
+        }
+    }
+
+    /// @brief exchanges the values
+    /// @sa https://json.nlohmann.me/api/basic_json/swap/
+    void swap(reference other) noexcept (
+        std::is_nothrow_move_constructible<value_t>::value&&
+        std::is_nothrow_move_assignable<value_t>::value&&
+        std::is_nothrow_move_constructible<json_value>::value&& // NOLINT(cppcoreguidelines-noexcept-swap,performance-noexcept-swap)
+        std::is_nothrow_move_assignable<json_value>::value
+    )
+    {
+        std::swap(m_data.m_type, other.m_data.m_type);
+        std::swap(m_data.m_value, other.m_data.m_value);
+
+        set_parents();
+        other.set_parents();
+        assert_invariant();
+    }
+
+    /// @brief exchanges the values
+    /// @sa https://json.nlohmann.me/api/basic_json/swap/
+    friend void swap(reference left, reference right) noexcept (
+        std::is_nothrow_move_constructible<value_t>::value&&
+        std::is_nothrow_move_assignable<value_t>::value&&
+        std::is_nothrow_move_constructible<json_value>::value&& // NOLINT(cppcoreguidelines-noexcept-swap,performance-noexcept-swap)
+        std::is_nothrow_move_assignable<json_value>::value
+    )
+    {
+        left.swap(right);
+    }
+
+    /// @brief exchanges the values
+    /// @sa https://json.nlohmann.me/api/basic_json/swap/
+    void swap(array_t& other) // NOLINT(bugprone-exception-escape,cppcoreguidelines-noexcept-swap,performance-noexcept-swap)
+    {
+        // swap only works for arrays
+        if (JSON_HEDLEY_LIKELY(is_array()))
+        {
+            using std::swap;
+            swap(*(m_data.m_value.array), other);
+        }
+        else
+        {
+            JSON_THROW(type_error::create(310, detail::concat("cannot use swap(array_t&) with ", type_name()), this));
+        }
+    }
+
+    /// @brief exchanges the values
+    /// @sa https://json.nlohmann.me/api/basic_json/swap/
+    void swap(object_t& other) // NOLINT(bugprone-exception-escape,cppcoreguidelines-noexcept-swap,performance-noexcept-swap)
+    {
+        // swap only works for objects
+        if (JSON_HEDLEY_LIKELY(is_object()))
+        {
+            using std::swap;
+            swap(*(m_data.m_value.object), other);
+        }
+        else
+        {
+            JSON_THROW(type_error::create(310, detail::concat("cannot use swap(object_t&) with ", type_name()), this));
+        }
+    }
+
+    /// @brief exchanges the values
+    /// @sa https://json.nlohmann.me/api/basic_json/swap/
+    void swap(string_t& other) // NOLINT(bugprone-exception-escape,cppcoreguidelines-noexcept-swap,performance-noexcept-swap)
+    {
+        // swap only works for strings
+        if (JSON_HEDLEY_LIKELY(is_string()))
+        {
+            using std::swap;
+            swap(*(m_data.m_value.string), other);
+        }
+        else
+        {
+            JSON_THROW(type_error::create(310, detail::concat("cannot use swap(string_t&) with ", type_name()), this));
+        }
+    }
+
+    /// @brief exchanges the values
+    /// @sa https://json.nlohmann.me/api/basic_json/swap/
+    void swap(binary_t& other) // NOLINT(bugprone-exception-escape,cppcoreguidelines-noexcept-swap,performance-noexcept-swap)
+    {
+        // swap only works for strings
+        if (JSON_HEDLEY_LIKELY(is_binary()))
+        {
+            using std::swap;
+            swap(*(m_data.m_value.binary), other);
+        }
+        else
+        {
+            JSON_THROW(type_error::create(310, detail::concat("cannot use swap(binary_t&) with ", type_name()), this));
+        }
+    }
+
+    /// @brief exchanges the values
+    /// @sa https://json.nlohmann.me/api/basic_json/swap/
+    void swap(typename binary_t::container_type& other) // NOLINT(bugprone-exception-escape)
+    {
+        // swap only works for strings
+        if (JSON_HEDLEY_LIKELY(is_binary()))
+        {
+            using std::swap;
+            swap(*(m_data.m_value.binary), other);
+        }
+        else
+        {
+            JSON_THROW(type_error::create(310, detail::concat("cannot use swap(binary_t::container_type&) with ", type_name()), this));
+        }
+    }
+
+    /// @}
+
+    //////////////////////////////////////////
+    // lexicographical comparison operators //
+    //////////////////////////////////////////
+
+    /// @name lexicographical comparison operators
+    /// @{
+
+    // note parentheses around operands are necessary; see
+    // https://github.com/nlohmann/json/issues/1530
+#define JSON_IMPLEMENT_OPERATOR(op, null_result, unordered_result, default_result)                       \
+    const auto lhs_type = lhs.type();                                                                    \
+    const auto rhs_type = rhs.type();                                                                    \
+    \
+    if (lhs_type == rhs_type) /* NOLINT(readability/braces) */                                           \
+    {                                                                                                    \
+        switch (lhs_type)                                                                                \
+        {                                                                                                \
+            case value_t::array:                                                                         \
+                return (*lhs.m_data.m_value.array) op (*rhs.m_data.m_value.array);                                     \
+                \
+            case value_t::object:                                                                        \
+                return (*lhs.m_data.m_value.object) op (*rhs.m_data.m_value.object);                                   \
+                \
+            case value_t::null:                                                                          \
+                return (null_result);                                                                    \
+                \
+            case value_t::string:                                                                        \
+                return (*lhs.m_data.m_value.string) op (*rhs.m_data.m_value.string);                                   \
+                \
+            case value_t::boolean:                                                                       \
+                return (lhs.m_data.m_value.boolean) op (rhs.m_data.m_value.boolean);                                   \
+                \
+            case value_t::number_integer:                                                                \
+                return (lhs.m_data.m_value.number_integer) op (rhs.m_data.m_value.number_integer);                     \
+                \
+            case value_t::number_unsigned:                                                               \
+                return (lhs.m_data.m_value.number_unsigned) op (rhs.m_data.m_value.number_unsigned);                   \
+                \
+            case value_t::number_float:                                                                  \
+                return (lhs.m_data.m_value.number_float) op (rhs.m_data.m_value.number_float);                         \
+                \
+            case value_t::binary:                                                                        \
+                return (*lhs.m_data.m_value.binary) op (*rhs.m_data.m_value.binary);                                   \
+                \
+            case value_t::discarded:                                                                     \
+            default:                                                                                     \
+                return (unordered_result);                                                               \
+        }                                                                                                \
+    }                                                                                                    \
+    else if (lhs_type == value_t::number_integer && rhs_type == value_t::number_float)                   \
+    {                                                                                                    \
+        return static_cast<number_float_t>(lhs.m_data.m_value.number_integer) op rhs.m_data.m_value.number_float;      \
+    }                                                                                                    \
+    else if (lhs_type == value_t::number_float && rhs_type == value_t::number_integer)                   \
+    {                                                                                                    \
+        return lhs.m_data.m_value.number_float op static_cast<number_float_t>(rhs.m_data.m_value.number_integer);      \
+    }                                                                                                    \
+    else if (lhs_type == value_t::number_unsigned && rhs_type == value_t::number_float)                  \
+    {                                                                                                    \
+        return static_cast<number_float_t>(lhs.m_data.m_value.number_unsigned) op rhs.m_data.m_value.number_float;     \
+    }                                                                                                    \
+    else if (lhs_type == value_t::number_float && rhs_type == value_t::number_unsigned)                  \
+    {                                                                                                    \
+        return lhs.m_data.m_value.number_float op static_cast<number_float_t>(rhs.m_data.m_value.number_unsigned);     \
+    }                                                                                                    \
+    else if (lhs_type == value_t::number_unsigned && rhs_type == value_t::number_integer)                \
+    {                                                                                                    \
+        return static_cast<number_integer_t>(lhs.m_data.m_value.number_unsigned) op rhs.m_data.m_value.number_integer; \
+    }                                                                                                    \
+    else if (lhs_type == value_t::number_integer && rhs_type == value_t::number_unsigned)                \
+    {                                                                                                    \
+        return lhs.m_data.m_value.number_integer op static_cast<number_integer_t>(rhs.m_data.m_value.number_unsigned); \
+    }                                                                                                    \
+    else if(compares_unordered(lhs, rhs))\
+    {\
+        return (unordered_result);\
+    }\
+    \
+    return (default_result);
+
+  JSON_PRIVATE_UNLESS_TESTED:
+    // returns true if:
+    // - any operand is NaN and the other operand is of number type
+    // - any operand is discarded
+    // in legacy mode, discarded values are considered ordered if
+    // an operation is computed as an odd number of inverses of others
+    static bool compares_unordered(const_reference lhs, const_reference rhs, bool inverse = false) noexcept
+    {
+        if ((lhs.is_number_float() && std::isnan(lhs.m_data.m_value.number_float) && rhs.is_number())
+                || (rhs.is_number_float() && std::isnan(rhs.m_data.m_value.number_float) && lhs.is_number()))
+        {
+            return true;
+        }
+#if JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON
+        return (lhs.is_discarded() || rhs.is_discarded()) && !inverse;
+#else
+        static_cast<void>(inverse);
+        return lhs.is_discarded() || rhs.is_discarded();
+#endif
+    }
+
+  private:
+    bool compares_unordered(const_reference rhs, bool inverse = false) const noexcept
+    {
+        return compares_unordered(*this, rhs, inverse);
+    }
+
+  public:
+#if JSON_HAS_THREE_WAY_COMPARISON
+    /// @brief comparison: equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_eq/
+    bool operator==(const_reference rhs) const noexcept
+    {
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wfloat-equal"
+#endif
+        const_reference lhs = *this;
+        JSON_IMPLEMENT_OPERATOR( ==, true, false, false)
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
+    }
+
+    /// @brief comparison: equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_eq/
+    template<typename ScalarType>
+    requires std::is_scalar_v<ScalarType>
+    bool operator==(ScalarType rhs) const noexcept
+    {
+        return *this == basic_json(rhs);
+    }
+
+    /// @brief comparison: not equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_ne/
+    bool operator!=(const_reference rhs) const noexcept
+    {
+        if (compares_unordered(rhs, true))
+        {
+            return false;
+        }
+        return !operator==(rhs);
+    }
+
+    /// @brief comparison: 3-way
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_spaceship/
+    std::partial_ordering operator<=>(const_reference rhs) const noexcept // *NOPAD*
+    {
+        const_reference lhs = *this;
+        // default_result is used if we cannot compare values. In that case,
+        // we compare types.
+        JSON_IMPLEMENT_OPERATOR(<=>, // *NOPAD*
+                                std::partial_ordering::equivalent,
+                                std::partial_ordering::unordered,
+                                lhs_type <=> rhs_type) // *NOPAD*
+    }
+
+    /// @brief comparison: 3-way
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_spaceship/
+    template<typename ScalarType>
+    requires std::is_scalar_v<ScalarType>
+    std::partial_ordering operator<=>(ScalarType rhs) const noexcept // *NOPAD*
+    {
+        return *this <=> basic_json(rhs); // *NOPAD*
+    }
+
+#if JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON
+    // all operators that are computed as an odd number of inverses of others
+    // need to be overloaded to emulate the legacy comparison behavior
+
+    /// @brief comparison: less than or equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_le/
+    JSON_HEDLEY_DEPRECATED_FOR(3.11.0, undef JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON)
+    bool operator<=(const_reference rhs) const noexcept
+    {
+        if (compares_unordered(rhs, true))
+        {
+            return false;
+        }
+        return !(rhs < *this);
+    }
+
+    /// @brief comparison: less than or equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_le/
+    template<typename ScalarType>
+    requires std::is_scalar_v<ScalarType>
+    bool operator<=(ScalarType rhs) const noexcept
+    {
+        return *this <= basic_json(rhs);
+    }
+
+    /// @brief comparison: greater than or equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_ge/
+    JSON_HEDLEY_DEPRECATED_FOR(3.11.0, undef JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON)
+    bool operator>=(const_reference rhs) const noexcept
+    {
+        if (compares_unordered(rhs, true))
+        {
+            return false;
+        }
+        return !(*this < rhs);
+    }
+
+    /// @brief comparison: greater than or equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_ge/
+    template<typename ScalarType>
+    requires std::is_scalar_v<ScalarType>
+    bool operator>=(ScalarType rhs) const noexcept
+    {
+        return *this >= basic_json(rhs);
+    }
+#endif
+#else
+    /// @brief comparison: equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_eq/
+    friend bool operator==(const_reference lhs, const_reference rhs) noexcept
+    {
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wfloat-equal"
+#endif
+        JSON_IMPLEMENT_OPERATOR( ==, true, false, false)
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
+    }
+
+    /// @brief comparison: equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_eq/
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator==(const_reference lhs, ScalarType rhs) noexcept
+    {
+        return lhs == basic_json(rhs);
+    }
+
+    /// @brief comparison: equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_eq/
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator==(ScalarType lhs, const_reference rhs) noexcept
+    {
+        return basic_json(lhs) == rhs;
+    }
+
+    /// @brief comparison: not equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_ne/
+    friend bool operator!=(const_reference lhs, const_reference rhs) noexcept
+    {
+        if (compares_unordered(lhs, rhs, true))
+        {
+            return false;
+        }
+        return !(lhs == rhs);
+    }
+
+    /// @brief comparison: not equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_ne/
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator!=(const_reference lhs, ScalarType rhs) noexcept
+    {
+        return lhs != basic_json(rhs);
+    }
+
+    /// @brief comparison: not equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_ne/
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator!=(ScalarType lhs, const_reference rhs) noexcept
+    {
+        return basic_json(lhs) != rhs;
+    }
+
+    /// @brief comparison: less than
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_lt/
+    friend bool operator<(const_reference lhs, const_reference rhs) noexcept
+    {
+        // default_result is used if we cannot compare values. In that case,
+        // we compare types. Note we have to call the operator explicitly,
+        // because MSVC has problems otherwise.
+        JSON_IMPLEMENT_OPERATOR( <, false, false, operator<(lhs_type, rhs_type))
+    }
+
+    /// @brief comparison: less than
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_lt/
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator<(const_reference lhs, ScalarType rhs) noexcept
+    {
+        return lhs < basic_json(rhs);
+    }
+
+    /// @brief comparison: less than
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_lt/
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator<(ScalarType lhs, const_reference rhs) noexcept
+    {
+        return basic_json(lhs) < rhs;
+    }
+
+    /// @brief comparison: less than or equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_le/
+    friend bool operator<=(const_reference lhs, const_reference rhs) noexcept
+    {
+        if (compares_unordered(lhs, rhs, true))
+        {
+            return false;
+        }
+        return !(rhs < lhs);
+    }
+
+    /// @brief comparison: less than or equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_le/
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator<=(const_reference lhs, ScalarType rhs) noexcept
+    {
+        return lhs <= basic_json(rhs);
+    }
+
+    /// @brief comparison: less than or equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_le/
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator<=(ScalarType lhs, const_reference rhs) noexcept
+    {
+        return basic_json(lhs) <= rhs;
+    }
+
+    /// @brief comparison: greater than
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_gt/
+    friend bool operator>(const_reference lhs, const_reference rhs) noexcept
+    {
+        // double inverse
+        if (compares_unordered(lhs, rhs))
+        {
+            return false;
+        }
+        return !(lhs <= rhs);
+    }
+
+    /// @brief comparison: greater than
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_gt/
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator>(const_reference lhs, ScalarType rhs) noexcept
+    {
+        return lhs > basic_json(rhs);
+    }
+
+    /// @brief comparison: greater than
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_gt/
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator>(ScalarType lhs, const_reference rhs) noexcept
+    {
+        return basic_json(lhs) > rhs;
+    }
+
+    /// @brief comparison: greater than or equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_ge/
+    friend bool operator>=(const_reference lhs, const_reference rhs) noexcept
+    {
+        if (compares_unordered(lhs, rhs, true))
+        {
+            return false;
+        }
+        return !(lhs < rhs);
+    }
+
+    /// @brief comparison: greater than or equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_ge/
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator>=(const_reference lhs, ScalarType rhs) noexcept
+    {
+        return lhs >= basic_json(rhs);
+    }
+
+    /// @brief comparison: greater than or equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_ge/
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator>=(ScalarType lhs, const_reference rhs) noexcept
+    {
+        return basic_json(lhs) >= rhs;
+    }
+#endif
+
+#undef JSON_IMPLEMENT_OPERATOR
+
+    /// @}
+
+    ///////////////////
+    // serialization //
+    ///////////////////
+
+    /// @name serialization
+    /// @{
+#ifndef JSON_NO_IO
+    /// @brief serialize to stream
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_ltlt/
+    friend std::ostream& operator<<(std::ostream& o, const basic_json& j)
+    {
+        // read width member and use it as indentation parameter if nonzero
+        const bool pretty_print = o.width() > 0;
+        const auto indentation = pretty_print ? o.width() : 0;
+
+        // reset width to 0 for subsequent calls to this stream
+        o.width(0);
+
+        // do the actual serialization
+        serializer s(detail::output_adapter<char>(o), o.fill());
+        s.dump(j, pretty_print, false, static_cast<unsigned int>(indentation));
+        return o;
+    }
+
+    /// @brief serialize to stream
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_ltlt/
+    /// @deprecated This function is deprecated since 3.0.0 and will be removed in
+    ///             version 4.0.0 of the library. Please use
+    ///             operator<<(std::ostream&, const basic_json&) instead; that is,
+    ///             replace calls like `j >> o;` with `o << j;`.
+    JSON_HEDLEY_DEPRECATED_FOR(3.0.0, operator<<(std::ostream&, const basic_json&))
+    friend std::ostream& operator>>(const basic_json& j, std::ostream& o)
+    {
+        return o << j;
+    }
+#endif  // JSON_NO_IO
+    /// @}
+
+    /////////////////////
+    // deserialization //
+    /////////////////////
+
+    /// @name deserialization
+    /// @{
+
+    /// @brief deserialize from a compatible input
+    /// @sa https://json.nlohmann.me/api/basic_json/parse/
+    template<typename InputType>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json parse(InputType&& i,
+                            parser_callback_t cb = nullptr,
+                            const bool allow_exceptions = true,
+                            const bool ignore_comments = false)
+    {
+        basic_json result;
+        parser(detail::input_adapter(std::forward<InputType>(i)), std::move(cb), allow_exceptions, ignore_comments).parse(true, result); // cppcheck-suppress[accessMoved,accessForwarded]
+        return result;
+    }
+
+    /// @brief deserialize from a pair of character iterators
+    /// @sa https://json.nlohmann.me/api/basic_json/parse/
+    template<typename IteratorType>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json parse(IteratorType first,
+                            IteratorType last,
+                            parser_callback_t cb = nullptr,
+                            const bool allow_exceptions = true,
+                            const bool ignore_comments = false)
+    {
+        basic_json result;
+        parser(detail::input_adapter(std::move(first), std::move(last)), std::move(cb), allow_exceptions, ignore_comments).parse(true, result); // cppcheck-suppress[accessMoved]
+        return result;
+    }
+
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, parse(ptr, ptr + len))
+    static basic_json parse(detail::span_input_adapter&& i,
+                            parser_callback_t cb = nullptr,
+                            const bool allow_exceptions = true,
+                            const bool ignore_comments = false)
+    {
+        basic_json result;
+        parser(i.get(), std::move(cb), allow_exceptions, ignore_comments).parse(true, result); // cppcheck-suppress[accessMoved]
+        return result;
+    }
+
+    /// @brief check if the input is valid JSON
+    /// @sa https://json.nlohmann.me/api/basic_json/accept/
+    template<typename InputType>
+    static bool accept(InputType&& i,
+                       const bool ignore_comments = false)
+    {
+        return parser(detail::input_adapter(std::forward<InputType>(i)), nullptr, false, ignore_comments).accept(true);
+    }
+
+    /// @brief check if the input is valid JSON
+    /// @sa https://json.nlohmann.me/api/basic_json/accept/
+    template<typename IteratorType>
+    static bool accept(IteratorType first, IteratorType last,
+                       const bool ignore_comments = false)
+    {
+        return parser(detail::input_adapter(std::move(first), std::move(last)), nullptr, false, ignore_comments).accept(true);
+    }
+
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, accept(ptr, ptr + len))
+    static bool accept(detail::span_input_adapter&& i,
+                       const bool ignore_comments = false)
+    {
+        return parser(i.get(), nullptr, false, ignore_comments).accept(true);
+    }
+
+    /// @brief generate SAX events
+    /// @sa https://json.nlohmann.me/api/basic_json/sax_parse/
+    template <typename InputType, typename SAX>
+    JSON_HEDLEY_NON_NULL(2)
+    static bool sax_parse(InputType&& i, SAX* sax,
+                          input_format_t format = input_format_t::json,
+                          const bool strict = true,
+                          const bool ignore_comments = false)
+    {
+        auto ia = detail::input_adapter(std::forward<InputType>(i));
+        return format == input_format_t::json
+               ? parser(std::move(ia), nullptr, true, ignore_comments).sax_parse(sax, strict)
+               : detail::binary_reader<basic_json, decltype(ia), SAX>(std::move(ia), format).sax_parse(format, sax, strict);
+    }
+
+    /// @brief generate SAX events
+    /// @sa https://json.nlohmann.me/api/basic_json/sax_parse/
+    template<class IteratorType, class SAX>
+    JSON_HEDLEY_NON_NULL(3)
+    static bool sax_parse(IteratorType first, IteratorType last, SAX* sax,
+                          input_format_t format = input_format_t::json,
+                          const bool strict = true,
+                          const bool ignore_comments = false)
+    {
+        auto ia = detail::input_adapter(std::move(first), std::move(last));
+        return format == input_format_t::json
+               ? parser(std::move(ia), nullptr, true, ignore_comments).sax_parse(sax, strict)
+               : detail::binary_reader<basic_json, decltype(ia), SAX>(std::move(ia), format).sax_parse(format, sax, strict);
+    }
+
+    /// @brief generate SAX events
+    /// @sa https://json.nlohmann.me/api/basic_json/sax_parse/
+    /// @deprecated This function is deprecated since 3.8.0 and will be removed in
+    ///             version 4.0.0 of the library. Please use
+    ///             sax_parse(ptr, ptr + len) instead.
+    template <typename SAX>
+    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, sax_parse(ptr, ptr + len, ...))
+    JSON_HEDLEY_NON_NULL(2)
+    static bool sax_parse(detail::span_input_adapter&& i, SAX* sax,
+                          input_format_t format = input_format_t::json,
+                          const bool strict = true,
+                          const bool ignore_comments = false)
+    {
+        auto ia = i.get();
+        return format == input_format_t::json
+               // NOLINTNEXTLINE(hicpp-move-const-arg,performance-move-const-arg)
+               ? parser(std::move(ia), nullptr, true, ignore_comments).sax_parse(sax, strict)
+               // NOLINTNEXTLINE(hicpp-move-const-arg,performance-move-const-arg)
+               : detail::binary_reader<basic_json, decltype(ia), SAX>(std::move(ia), format).sax_parse(format, sax, strict);
+    }
+#ifndef JSON_NO_IO
+    /// @brief deserialize from stream
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_gtgt/
+    /// @deprecated This stream operator is deprecated since 3.0.0 and will be removed in
+    ///             version 4.0.0 of the library. Please use
+    ///             operator>>(std::istream&, basic_json&) instead; that is,
+    ///             replace calls like `j << i;` with `i >> j;`.
+    JSON_HEDLEY_DEPRECATED_FOR(3.0.0, operator>>(std::istream&, basic_json&))
+    friend std::istream& operator<<(basic_json& j, std::istream& i)
+    {
+        return operator>>(i, j);
+    }
+
+    /// @brief deserialize from stream
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_gtgt/
+    friend std::istream& operator>>(std::istream& i, basic_json& j)
+    {
+        parser(detail::input_adapter(i)).parse(false, j);
+        return i;
+    }
+#endif  // JSON_NO_IO
+    /// @}
+
+    ///////////////////////////
+    // convenience functions //
+    ///////////////////////////
+
+    /// @brief return the type as string
+    /// @sa https://json.nlohmann.me/api/basic_json/type_name/
+    JSON_HEDLEY_RETURNS_NON_NULL
+    const char* type_name() const noexcept
+    {
+        switch (m_data.m_type)
+        {
+            case value_t::null:
+                return "null";
+            case value_t::object:
+                return "object";
+            case value_t::array:
+                return "array";
+            case value_t::string:
+                return "string";
+            case value_t::boolean:
+                return "boolean";
+            case value_t::binary:
+                return "binary";
+            case value_t::discarded:
+                return "discarded";
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            default:
+                return "number";
+        }
+    }
+
+  JSON_PRIVATE_UNLESS_TESTED:
+    //////////////////////
+    // member variables //
+    //////////////////////
+
+    struct data
+    {
+        /// the type of the current element
+        value_t m_type = value_t::null;
+
+        /// the value of the current element
+        json_value m_value = {};
+
+        data(const value_t v)
+            : m_type(v), m_value(v)
+        {
+        }
+
+        data(size_type cnt, const basic_json& val)
+            : m_type(value_t::array)
+        {
+            m_value.array = create<array_t>(cnt, val);
+        }
+
+        data() noexcept = default;
+        data(data&&) noexcept = default;
+        data(const data&) noexcept = delete;
+        data& operator=(data&&) noexcept = delete;
+        data& operator=(const data&) noexcept = delete;
+
+        ~data() noexcept
+        {
+            m_value.destroy(m_type);
+        }
+    };
+
+    data m_data = {};
+
+#if JSON_DIAGNOSTICS
+    /// a pointer to a parent value (for debugging purposes)
+    basic_json* m_parent = nullptr;
+#endif
+
+#if JSON_DIAGNOSTIC_POSITIONS
+    /// the start position of the value
+    std::size_t start_position = std::string::npos;
+    /// the end position of the value
+    std::size_t end_position = std::string::npos;
+  public:
+    constexpr std::size_t start_pos() const noexcept
+    {
+        return start_position;
+    }
+
+    constexpr std::size_t end_pos() const noexcept
+    {
+        return end_position;
+    }
+#endif
+
+    //////////////////////////////////////////
+    // binary serialization/deserialization //
+    //////////////////////////////////////////
+
+    /// @name binary serialization/deserialization support
+    /// @{
+
+  public:
+    /// @brief create a CBOR serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_cbor/
+    static std::vector<std::uint8_t> to_cbor(const basic_json& j)
+    {
+        std::vector<std::uint8_t> result;
+        to_cbor(j, result);
+        return result;
+    }
+
+    /// @brief create a CBOR serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_cbor/
+    static void to_cbor(const basic_json& j, detail::output_adapter<std::uint8_t> o)
+    {
+        binary_writer<std::uint8_t>(o).write_cbor(j);
+    }
+
+    /// @brief create a CBOR serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_cbor/
+    static void to_cbor(const basic_json& j, detail::output_adapter<char> o)
+    {
+        binary_writer<char>(o).write_cbor(j);
+    }
+
+    /// @brief create a MessagePack serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_msgpack/
+    static std::vector<std::uint8_t> to_msgpack(const basic_json& j)
+    {
+        std::vector<std::uint8_t> result;
+        to_msgpack(j, result);
+        return result;
+    }
+
+    /// @brief create a MessagePack serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_msgpack/
+    static void to_msgpack(const basic_json& j, detail::output_adapter<std::uint8_t> o)
+    {
+        binary_writer<std::uint8_t>(o).write_msgpack(j);
+    }
+
+    /// @brief create a MessagePack serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_msgpack/
+    static void to_msgpack(const basic_json& j, detail::output_adapter<char> o)
+    {
+        binary_writer<char>(o).write_msgpack(j);
+    }
+
+    /// @brief create a UBJSON serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_ubjson/
+    static std::vector<std::uint8_t> to_ubjson(const basic_json& j,
+            const bool use_size = false,
+            const bool use_type = false)
+    {
+        std::vector<std::uint8_t> result;
+        to_ubjson(j, result, use_size, use_type);
+        return result;
+    }
+
+    /// @brief create a UBJSON serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_ubjson/
+    static void to_ubjson(const basic_json& j, detail::output_adapter<std::uint8_t> o,
+                          const bool use_size = false, const bool use_type = false)
+    {
+        binary_writer<std::uint8_t>(o).write_ubjson(j, use_size, use_type);
+    }
+
+    /// @brief create a UBJSON serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_ubjson/
+    static void to_ubjson(const basic_json& j, detail::output_adapter<char> o,
+                          const bool use_size = false, const bool use_type = false)
+    {
+        binary_writer<char>(o).write_ubjson(j, use_size, use_type);
+    }
+
+    /// @brief create a BJData serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_bjdata/
+    static std::vector<std::uint8_t> to_bjdata(const basic_json& j,
+            const bool use_size = false,
+            const bool use_type = false,
+            const bjdata_version_t version = bjdata_version_t::draft2)
+    {
+        std::vector<std::uint8_t> result;
+        to_bjdata(j, result, use_size, use_type, version);
+        return result;
+    }
+
+    /// @brief create a BJData serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_bjdata/
+    static void to_bjdata(const basic_json& j, detail::output_adapter<std::uint8_t> o,
+                          const bool use_size = false, const bool use_type = false,
+                          const bjdata_version_t version = bjdata_version_t::draft2)
+    {
+        binary_writer<std::uint8_t>(o).write_ubjson(j, use_size, use_type, true, true, version);
+    }
+
+    /// @brief create a BJData serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_bjdata/
+    static void to_bjdata(const basic_json& j, detail::output_adapter<char> o,
+                          const bool use_size = false, const bool use_type = false,
+                          const bjdata_version_t version = bjdata_version_t::draft2)
+    {
+        binary_writer<char>(o).write_ubjson(j, use_size, use_type, true, true, version);
+    }
+
+    /// @brief create a BSON serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_bson/
+    static std::vector<std::uint8_t> to_bson(const basic_json& j)
+    {
+        std::vector<std::uint8_t> result;
+        to_bson(j, result);
+        return result;
+    }
+
+    /// @brief create a BSON serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_bson/
+    static void to_bson(const basic_json& j, detail::output_adapter<std::uint8_t> o)
+    {
+        binary_writer<std::uint8_t>(o).write_bson(j);
+    }
+
+    /// @brief create a BSON serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_bson/
+    static void to_bson(const basic_json& j, detail::output_adapter<char> o)
+    {
+        binary_writer<char>(o).write_bson(j);
+    }
+
+    /// @brief create a JSON value from an input in CBOR format
+    /// @sa https://json.nlohmann.me/api/basic_json/from_cbor/
+    template<typename InputType>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json from_cbor(InputType&& i,
+                                const bool strict = true,
+                                const bool allow_exceptions = true,
+                                const cbor_tag_handler_t tag_handler = cbor_tag_handler_t::error)
+    {
+        basic_json result;
+        auto ia = detail::input_adapter(std::forward<InputType>(i));
+        detail::json_sax_dom_parser<basic_json, decltype(ia)> sdp(result, allow_exceptions);
+        const bool res = binary_reader<decltype(ia)>(std::move(ia), input_format_t::cbor).sax_parse(input_format_t::cbor, &sdp, strict, tag_handler); // cppcheck-suppress[accessMoved]
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+    /// @brief create a JSON value from an input in CBOR format
+    /// @sa https://json.nlohmann.me/api/basic_json/from_cbor/
+    template<typename IteratorType>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json from_cbor(IteratorType first, IteratorType last,
+                                const bool strict = true,
+                                const bool allow_exceptions = true,
+                                const cbor_tag_handler_t tag_handler = cbor_tag_handler_t::error)
+    {
+        basic_json result;
+        auto ia = detail::input_adapter(std::move(first), std::move(last));
+        detail::json_sax_dom_parser<basic_json, decltype(ia)> sdp(result, allow_exceptions);
+        const bool res = binary_reader<decltype(ia)>(std::move(ia), input_format_t::cbor).sax_parse(input_format_t::cbor, &sdp, strict, tag_handler); // cppcheck-suppress[accessMoved]
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+    template<typename T>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_cbor(ptr, ptr + len))
+    static basic_json from_cbor(const T* ptr, std::size_t len,
+                                const bool strict = true,
+                                const bool allow_exceptions = true,
+                                const cbor_tag_handler_t tag_handler = cbor_tag_handler_t::error)
+    {
+        return from_cbor(ptr, ptr + len, strict, allow_exceptions, tag_handler);
+    }
+
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_cbor(ptr, ptr + len))
+    static basic_json from_cbor(detail::span_input_adapter&& i,
+                                const bool strict = true,
+                                const bool allow_exceptions = true,
+                                const cbor_tag_handler_t tag_handler = cbor_tag_handler_t::error)
+    {
+        basic_json result;
+        auto ia = i.get();
+        detail::json_sax_dom_parser<basic_json, decltype(ia)> sdp(result, allow_exceptions);
+        // NOLINTNEXTLINE(hicpp-move-const-arg,performance-move-const-arg)
+        const bool res = binary_reader<decltype(ia)>(std::move(ia), input_format_t::cbor).sax_parse(input_format_t::cbor, &sdp, strict, tag_handler); // cppcheck-suppress[accessMoved]
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+    /// @brief create a JSON value from an input in MessagePack format
+    /// @sa https://json.nlohmann.me/api/basic_json/from_msgpack/
+    template<typename InputType>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json from_msgpack(InputType&& i,
+                                   const bool strict = true,
+                                   const bool allow_exceptions = true)
+    {
+        basic_json result;
+        auto ia = detail::input_adapter(std::forward<InputType>(i));
+        detail::json_sax_dom_parser<basic_json, decltype(ia)> sdp(result, allow_exceptions);
+        const bool res = binary_reader<decltype(ia)>(std::move(ia), input_format_t::msgpack).sax_parse(input_format_t::msgpack, &sdp, strict); // cppcheck-suppress[accessMoved]
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+    /// @brief create a JSON value from an input in MessagePack format
+    /// @sa https://json.nlohmann.me/api/basic_json/from_msgpack/
+    template<typename IteratorType>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json from_msgpack(IteratorType first, IteratorType last,
+                                   const bool strict = true,
+                                   const bool allow_exceptions = true)
+    {
+        basic_json result;
+        auto ia = detail::input_adapter(std::move(first), std::move(last));
+        detail::json_sax_dom_parser<basic_json, decltype(ia)> sdp(result, allow_exceptions);
+        const bool res = binary_reader<decltype(ia)>(std::move(ia), input_format_t::msgpack).sax_parse(input_format_t::msgpack, &sdp, strict); // cppcheck-suppress[accessMoved]
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+    template<typename T>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_msgpack(ptr, ptr + len))
+    static basic_json from_msgpack(const T* ptr, std::size_t len,
+                                   const bool strict = true,
+                                   const bool allow_exceptions = true)
+    {
+        return from_msgpack(ptr, ptr + len, strict, allow_exceptions);
+    }
+
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_msgpack(ptr, ptr + len))
+    static basic_json from_msgpack(detail::span_input_adapter&& i,
+                                   const bool strict = true,
+                                   const bool allow_exceptions = true)
+    {
+        basic_json result;
+        auto ia = i.get();
+        detail::json_sax_dom_parser<basic_json, decltype(ia)> sdp(result, allow_exceptions);
+        // NOLINTNEXTLINE(hicpp-move-const-arg,performance-move-const-arg)
+        const bool res = binary_reader<decltype(ia)>(std::move(ia), input_format_t::msgpack).sax_parse(input_format_t::msgpack, &sdp, strict); // cppcheck-suppress[accessMoved]
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+    /// @brief create a JSON value from an input in UBJSON format
+    /// @sa https://json.nlohmann.me/api/basic_json/from_ubjson/
+    template<typename InputType>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json from_ubjson(InputType&& i,
+                                  const bool strict = true,
+                                  const bool allow_exceptions = true)
+    {
+        basic_json result;
+        auto ia = detail::input_adapter(std::forward<InputType>(i));
+        detail::json_sax_dom_parser<basic_json, decltype(ia)> sdp(result, allow_exceptions);
+        const bool res = binary_reader<decltype(ia)>(std::move(ia), input_format_t::ubjson).sax_parse(input_format_t::ubjson, &sdp, strict); // cppcheck-suppress[accessMoved]
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+    /// @brief create a JSON value from an input in UBJSON format
+    /// @sa https://json.nlohmann.me/api/basic_json/from_ubjson/
+    template<typename IteratorType>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json from_ubjson(IteratorType first, IteratorType last,
+                                  const bool strict = true,
+                                  const bool allow_exceptions = true)
+    {
+        basic_json result;
+        auto ia = detail::input_adapter(std::move(first), std::move(last));
+        detail::json_sax_dom_parser<basic_json, decltype(ia)> sdp(result, allow_exceptions);
+        const bool res = binary_reader<decltype(ia)>(std::move(ia), input_format_t::ubjson).sax_parse(input_format_t::ubjson, &sdp, strict); // cppcheck-suppress[accessMoved]
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+    template<typename T>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_ubjson(ptr, ptr + len))
+    static basic_json from_ubjson(const T* ptr, std::size_t len,
+                                  const bool strict = true,
+                                  const bool allow_exceptions = true)
+    {
+        return from_ubjson(ptr, ptr + len, strict, allow_exceptions);
+    }
+
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_ubjson(ptr, ptr + len))
+    static basic_json from_ubjson(detail::span_input_adapter&& i,
+                                  const bool strict = true,
+                                  const bool allow_exceptions = true)
+    {
+        basic_json result;
+        auto ia = i.get();
+        detail::json_sax_dom_parser<basic_json, decltype(ia)> sdp(result, allow_exceptions);
+        // NOLINTNEXTLINE(hicpp-move-const-arg,performance-move-const-arg)
+        const bool res = binary_reader<decltype(ia)>(std::move(ia), input_format_t::ubjson).sax_parse(input_format_t::ubjson, &sdp, strict); // cppcheck-suppress[accessMoved]
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+    /// @brief create a JSON value from an input in BJData format
+    /// @sa https://json.nlohmann.me/api/basic_json/from_bjdata/
+    template<typename InputType>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json from_bjdata(InputType&& i,
+                                  const bool strict = true,
+                                  const bool allow_exceptions = true)
+    {
+        basic_json result;
+        auto ia = detail::input_adapter(std::forward<InputType>(i));
+        detail::json_sax_dom_parser<basic_json, decltype(ia)> sdp(result, allow_exceptions);
+        const bool res = binary_reader<decltype(ia)>(std::move(ia), input_format_t::bjdata).sax_parse(input_format_t::bjdata, &sdp, strict); // cppcheck-suppress[accessMoved]
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+    /// @brief create a JSON value from an input in BJData format
+    /// @sa https://json.nlohmann.me/api/basic_json/from_bjdata/
+    template<typename IteratorType>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json from_bjdata(IteratorType first, IteratorType last,
+                                  const bool strict = true,
+                                  const bool allow_exceptions = true)
+    {
+        basic_json result;
+        auto ia = detail::input_adapter(std::move(first), std::move(last));
+        detail::json_sax_dom_parser<basic_json, decltype(ia)> sdp(result, allow_exceptions);
+        const bool res = binary_reader<decltype(ia)>(std::move(ia), input_format_t::bjdata).sax_parse(input_format_t::bjdata, &sdp, strict); // cppcheck-suppress[accessMoved]
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+    /// @brief create a JSON value from an input in BSON format
+    /// @sa https://json.nlohmann.me/api/basic_json/from_bson/
+    template<typename InputType>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json from_bson(InputType&& i,
+                                const bool strict = true,
+                                const bool allow_exceptions = true)
+    {
+        basic_json result;
+        auto ia = detail::input_adapter(std::forward<InputType>(i));
+        detail::json_sax_dom_parser<basic_json, decltype(ia)> sdp(result, allow_exceptions);
+        const bool res = binary_reader<decltype(ia)>(std::move(ia), input_format_t::bson).sax_parse(input_format_t::bson, &sdp, strict); // cppcheck-suppress[accessMoved]
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+    /// @brief create a JSON value from an input in BSON format
+    /// @sa https://json.nlohmann.me/api/basic_json/from_bson/
+    template<typename IteratorType>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json from_bson(IteratorType first, IteratorType last,
+                                const bool strict = true,
+                                const bool allow_exceptions = true)
+    {
+        basic_json result;
+        auto ia = detail::input_adapter(std::move(first), std::move(last));
+        detail::json_sax_dom_parser<basic_json, decltype(ia)> sdp(result, allow_exceptions);
+        const bool res = binary_reader<decltype(ia)>(std::move(ia), input_format_t::bson).sax_parse(input_format_t::bson, &sdp, strict); // cppcheck-suppress[accessMoved]
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+    template<typename T>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_bson(ptr, ptr + len))
+    static basic_json from_bson(const T* ptr, std::size_t len,
+                                const bool strict = true,
+                                const bool allow_exceptions = true)
+    {
+        return from_bson(ptr, ptr + len, strict, allow_exceptions);
+    }
+
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_bson(ptr, ptr + len))
+    static basic_json from_bson(detail::span_input_adapter&& i,
+                                const bool strict = true,
+                                const bool allow_exceptions = true)
+    {
+        basic_json result;
+        auto ia = i.get();
+        detail::json_sax_dom_parser<basic_json, decltype(ia)> sdp(result, allow_exceptions);
+        // NOLINTNEXTLINE(hicpp-move-const-arg,performance-move-const-arg)
+        const bool res = binary_reader<decltype(ia)>(std::move(ia), input_format_t::bson).sax_parse(input_format_t::bson, &sdp, strict); // cppcheck-suppress[accessMoved]
+        return res ? result : basic_json(value_t::discarded);
+    }
+    /// @}
+
+    //////////////////////////
+    // JSON Pointer support //
+    //////////////////////////
+
+    /// @name JSON Pointer functions
+    /// @{
+
+    /// @brief access specified element via JSON Pointer
+    /// @sa https://json.nlohmann.me/api/basic_json/operator%5B%5D/
+    reference operator[](const json_pointer& ptr)
+    {
+        return ptr.get_unchecked(this);
+    }
+
+    template<typename BasicJsonType, detail::enable_if_t<detail::is_basic_json<BasicJsonType>::value, int> = 0>
+    JSON_HEDLEY_DEPRECATED_FOR(3.11.0, basic_json::json_pointer or nlohmann::json_pointer<basic_json::string_t>) // NOLINT(readability/alt_tokens)
+    reference operator[](const ::nlohmann::json_pointer<BasicJsonType>& ptr)
+    {
+        return ptr.get_unchecked(this);
+    }
+
+    /// @brief access specified element via JSON Pointer
+    /// @sa https://json.nlohmann.me/api/basic_json/operator%5B%5D/
+    const_reference operator[](const json_pointer& ptr) const
+    {
+        return ptr.get_unchecked(this);
+    }
+
+    template<typename BasicJsonType, detail::enable_if_t<detail::is_basic_json<BasicJsonType>::value, int> = 0>
+    JSON_HEDLEY_DEPRECATED_FOR(3.11.0, basic_json::json_pointer or nlohmann::json_pointer<basic_json::string_t>) // NOLINT(readability/alt_tokens)
+    const_reference operator[](const ::nlohmann::json_pointer<BasicJsonType>& ptr) const
+    {
+        return ptr.get_unchecked(this);
+    }
+
+    /// @brief access specified element via JSON Pointer
+    /// @sa https://json.nlohmann.me/api/basic_json/at/
+    reference at(const json_pointer& ptr)
+    {
+        return ptr.get_checked(this);
+    }
+
+    template<typename BasicJsonType, detail::enable_if_t<detail::is_basic_json<BasicJsonType>::value, int> = 0>
+    JSON_HEDLEY_DEPRECATED_FOR(3.11.0, basic_json::json_pointer or nlohmann::json_pointer<basic_json::string_t>) // NOLINT(readability/alt_tokens)
+    reference at(const ::nlohmann::json_pointer<BasicJsonType>& ptr)
+    {
+        return ptr.get_checked(this);
+    }
+
+    /// @brief access specified element via JSON Pointer
+    /// @sa https://json.nlohmann.me/api/basic_json/at/
+    const_reference at(const json_pointer& ptr) const
+    {
+        return ptr.get_checked(this);
+    }
+
+    template<typename BasicJsonType, detail::enable_if_t<detail::is_basic_json<BasicJsonType>::value, int> = 0>
+    JSON_HEDLEY_DEPRECATED_FOR(3.11.0, basic_json::json_pointer or nlohmann::json_pointer<basic_json::string_t>) // NOLINT(readability/alt_tokens)
+    const_reference at(const ::nlohmann::json_pointer<BasicJsonType>& ptr) const
+    {
+        return ptr.get_checked(this);
+    }
+
+    /// @brief return flattened JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/flatten/
+    basic_json flatten() const
+    {
+        basic_json result(value_t::object);
+        json_pointer::flatten("", *this, result);
+        return result;
+    }
+
+    /// @brief unflatten a previously flattened JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/unflatten/
+    basic_json unflatten() const
+    {
+        return json_pointer::unflatten(*this);
+    }
+
+    /// @}
+
+    //////////////////////////
+    // JSON Patch functions //
+    //////////////////////////
+
+    /// @name JSON Patch functions
+    /// @{
+
+    /// @brief applies a JSON patch in-place without copying the object
+    /// @sa https://json.nlohmann.me/api/basic_json/patch/
+    void patch_inplace(const basic_json& json_patch)
+    {
+        basic_json& result = *this;
+        // the valid JSON Patch operations
+        enum class patch_operations {add, remove, replace, move, copy, test, invalid};
+
+        const auto get_op = [](const string_t& op)
+        {
+            if (op == "add")
+            {
+                return patch_operations::add;
+            }
+            if (op == "remove")
+            {
+                return patch_operations::remove;
+            }
+            if (op == "replace")
+            {
+                return patch_operations::replace;
+            }
+            if (op == "move")
+            {
+                return patch_operations::move;
+            }
+            if (op == "copy")
+            {
+                return patch_operations::copy;
+            }
+            if (op == "test")
+            {
+                return patch_operations::test;
+            }
+
+            return patch_operations::invalid;
+        };
+
+        // wrapper for "add" operation; add value at ptr
+        const auto operation_add = [&result](json_pointer & ptr, const basic_json & val)
+        {
+            // adding to the root of the target document means replacing it
+            if (ptr.empty())
+            {
+                result = val;
+                return;
+            }
+
+            // make sure the top element of the pointer exists
+            json_pointer const top_pointer = ptr.top();
+            if (top_pointer != ptr)
+            {
+                result.at(top_pointer);
+            }
+
+            // get reference to parent of JSON pointer ptr
+            const auto last_path = ptr.back();
+            ptr.pop_back();
+            // parent must exist when performing patch add per RFC6902 specs
+            basic_json& parent = result.at(ptr);
+
+            switch (parent.m_data.m_type)
+            {
+                case value_t::null:
+                case value_t::object:
+                {
+                    // use operator[] to add value
+                    parent[last_path] = val;
+                    break;
+                }
+
+                case value_t::array:
+                {
+                    if (last_path == "-")
+                    {
+                        // special case: append to back
+                        parent.push_back(val);
+                    }
+                    else
+                    {
+                        const auto idx = json_pointer::template array_index<basic_json_t>(last_path);
+                        if (JSON_HEDLEY_UNLIKELY(idx > parent.size()))
+                        {
+                            // avoid undefined behavior
+                            JSON_THROW(out_of_range::create(401, detail::concat("array index ", std::to_string(idx), " is out of range"), &parent));
+                        }
+
+                        // default case: insert add offset
+                        parent.insert(parent.begin() + static_cast<difference_type>(idx), val);
+                    }
+                    break;
+                }
+
+                // if there exists a parent it cannot be primitive
+                case value_t::string: // LCOV_EXCL_LINE
+                case value_t::boolean: // LCOV_EXCL_LINE
+                case value_t::number_integer: // LCOV_EXCL_LINE
+                case value_t::number_unsigned: // LCOV_EXCL_LINE
+                case value_t::number_float: // LCOV_EXCL_LINE
+                case value_t::binary: // LCOV_EXCL_LINE
+                case value_t::discarded: // LCOV_EXCL_LINE
+                default:            // LCOV_EXCL_LINE
+                    JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
+            }
+        };
+
+        // wrapper for "remove" operation; remove value at ptr
+        const auto operation_remove = [this, & result](json_pointer & ptr)
+        {
+            // get reference to parent of JSON pointer ptr
+            const auto last_path = ptr.back();
+            ptr.pop_back();
+            basic_json& parent = result.at(ptr);
+
+            // remove child
+            if (parent.is_object())
+            {
+                // perform range check
+                auto it = parent.find(last_path);
+                if (JSON_HEDLEY_LIKELY(it != parent.end()))
+                {
+                    parent.erase(it);
+                }
+                else
+                {
+                    JSON_THROW(out_of_range::create(403, detail::concat("key '", last_path, "' not found"), this));
+                }
+            }
+            else if (parent.is_array())
+            {
+                // note erase performs range check
+                parent.erase(json_pointer::template array_index<basic_json_t>(last_path));
+            }
+        };
+
+        // type check: top level value must be an array
+        if (JSON_HEDLEY_UNLIKELY(!json_patch.is_array()))
+        {
+            JSON_THROW(parse_error::create(104, 0, "JSON patch must be an array of objects", &json_patch));
+        }
+
+        // iterate and apply the operations
+        for (const auto& val : json_patch)
+        {
+            // wrapper to get a value for an operation
+            const auto get_value = [&val](const string_t& op,
+                                          const string_t& member,
+                                          bool string_type) -> basic_json &
+            {
+                // find value
+                auto it = val.m_data.m_value.object->find(member);
+
+                // context-sensitive error message
+                const auto error_msg = (op == "op") ? "operation" : detail::concat("operation '", op, '\''); // NOLINT(bugprone-unused-local-non-trivial-variable)
+
+                // check if desired value is present
+                if (JSON_HEDLEY_UNLIKELY(it == val.m_data.m_value.object->end()))
+                {
+                    // NOLINTNEXTLINE(performance-inefficient-string-concatenation)
+                    JSON_THROW(parse_error::create(105, 0, detail::concat(error_msg, " must have member '", member, "'"), &val));
+                }
+
+                // check if result is of type string
+                if (JSON_HEDLEY_UNLIKELY(string_type && !it->second.is_string()))
+                {
+                    // NOLINTNEXTLINE(performance-inefficient-string-concatenation)
+                    JSON_THROW(parse_error::create(105, 0, detail::concat(error_msg, " must have string member '", member, "'"), &val));
+                }
+
+                // no error: return value
+                return it->second;
+            };
+
+            // type check: every element of the array must be an object
+            if (JSON_HEDLEY_UNLIKELY(!val.is_object()))
+            {
+                JSON_THROW(parse_error::create(104, 0, "JSON patch must be an array of objects", &val));
+            }
+
+            // collect mandatory members
+            const auto op = get_value("op", "op", true).template get<string_t>();
+            const auto path = get_value(op, "path", true).template get<string_t>();
+            json_pointer ptr(path);
+
+            switch (get_op(op))
+            {
+                case patch_operations::add:
+                {
+                    operation_add(ptr, get_value("add", "value", false));
+                    break;
+                }
+
+                case patch_operations::remove:
+                {
+                    operation_remove(ptr);
+                    break;
+                }
+
+                case patch_operations::replace:
+                {
+                    // the "path" location must exist - use at()
+                    result.at(ptr) = get_value("replace", "value", false);
+                    break;
+                }
+
+                case patch_operations::move:
+                {
+                    const auto from_path = get_value("move", "from", true).template get<string_t>();
+                    json_pointer from_ptr(from_path);
+
+                    // the "from" location must exist - use at()
+                    basic_json const v = result.at(from_ptr);
+
+                    // The move operation is functionally identical to a
+                    // "remove" operation on the "from" location, followed
+                    // immediately by an "add" operation at the target
+                    // location with the value that was just removed.
+                    operation_remove(from_ptr);
+                    operation_add(ptr, v);
+                    break;
+                }
+
+                case patch_operations::copy:
+                {
+                    const auto from_path = get_value("copy", "from", true).template get<string_t>();
+                    const json_pointer from_ptr(from_path);
+
+                    // the "from" location must exist - use at()
+                    basic_json const v = result.at(from_ptr);
+
+                    // The copy is functionally identical to an "add"
+                    // operation at the target location using the value
+                    // specified in the "from" member.
+                    operation_add(ptr, v);
+                    break;
+                }
+
+                case patch_operations::test:
+                {
+                    bool success = false;
+                    JSON_TRY
+                    {
+                        // check if "value" matches the one at "path"
+                        // the "path" location must exist - use at()
+                        success = (result.at(ptr) == get_value("test", "value", false));
+                    }
+                    JSON_INTERNAL_CATCH (out_of_range&)
+                    {
+                        // ignore out of range errors: success remains false
+                    }
+
+                    // throw an exception if test fails
+                    if (JSON_HEDLEY_UNLIKELY(!success))
+                    {
+                        JSON_THROW(other_error::create(501, detail::concat("unsuccessful: ", val.dump()), &val));
+                    }
+
+                    break;
+                }
+
+                case patch_operations::invalid:
+                default:
+                {
+                    // op must be "add", "remove", "replace", "move", "copy", or
+                    // "test"
+                    JSON_THROW(parse_error::create(105, 0, detail::concat("operation value '", op, "' is invalid"), &val));
+                }
+            }
+        }
+    }
+
+    /// @brief applies a JSON patch to a copy of the current object
+    /// @sa https://json.nlohmann.me/api/basic_json/patch/
+    basic_json patch(const basic_json& json_patch) const
+    {
+        basic_json result = *this;
+        result.patch_inplace(json_patch);
+        return result;
+    }
+
+    /// @brief creates a diff as a JSON patch
+    /// @sa https://json.nlohmann.me/api/basic_json/diff/
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json diff(const basic_json& source, const basic_json& target,
+                           const string_t& path = "")
+    {
+        // the patch
+        basic_json result(value_t::array);
+
+        // if the values are the same, return empty patch
+        if (source == target)
+        {
+            return result;
+        }
+
+        if (source.type() != target.type())
+        {
+            // different types: replace value
+            result.push_back(
+            {
+                {"op", "replace"}, {"path", path}, {"value", target}
+            });
+            return result;
+        }
+
+        switch (source.type())
+        {
+            case value_t::array:
+            {
+                // first pass: traverse common elements
+                std::size_t i = 0;
+                while (i < source.size() && i < target.size())
+                {
+                    // recursive call to compare array values at index i
+                    auto temp_diff = diff(source[i], target[i], detail::concat<string_t>(path, '/', detail::to_string<string_t>(i)));
+                    result.insert(result.end(), temp_diff.begin(), temp_diff.end());
+                    ++i;
+                }
+
+                // We now reached the end of at least one array
+                // in a second pass, traverse the remaining elements
+
+                // remove my remaining elements
+                const auto end_index = static_cast<difference_type>(result.size());
+                while (i < source.size())
+                {
+                    // add operations in reverse order to avoid invalid
+                    // indices
+                    result.insert(result.begin() + end_index, object(
+                    {
+                        {"op", "remove"},
+                        {"path", detail::concat<string_t>(path, '/', detail::to_string<string_t>(i))}
+                    }));
+                    ++i;
+                }
+
+                // add other remaining elements
+                while (i < target.size())
+                {
+                    result.push_back(
+                    {
+                        {"op", "add"},
+                        {"path", detail::concat<string_t>(path, "/-")},
+                        {"value", target[i]}
+                    });
+                    ++i;
+                }
+
+                break;
+            }
+
+            case value_t::object:
+            {
+                // first pass: traverse this object's elements
+                for (auto it = source.cbegin(); it != source.cend(); ++it)
+                {
+                    // escape the key name to be used in a JSON patch
+                    const auto path_key = detail::concat<string_t>(path, '/', detail::escape(it.key()));
+
+                    if (target.find(it.key()) != target.end())
+                    {
+                        // recursive call to compare object values at key it
+                        auto temp_diff = diff(it.value(), target[it.key()], path_key);
+                        result.insert(result.end(), temp_diff.begin(), temp_diff.end());
+                    }
+                    else
+                    {
+                        // found a key that is not in o -> remove it
+                        result.push_back(object(
+                        {
+                            {"op", "remove"}, {"path", path_key}
+                        }));
+                    }
+                }
+
+                // second pass: traverse other object's elements
+                for (auto it = target.cbegin(); it != target.cend(); ++it)
+                {
+                    if (source.find(it.key()) == source.end())
+                    {
+                        // found a key that is not in this -> add it
+                        const auto path_key = detail::concat<string_t>(path, '/', detail::escape(it.key()));
+                        result.push_back(
+                        {
+                            {"op", "add"}, {"path", path_key},
+                            {"value", it.value()}
+                        });
+                    }
+                }
+
+                break;
+            }
+
+            case value_t::null:
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+            {
+                // both primitive type: replace value
+                result.push_back(
+                {
+                    {"op", "replace"}, {"path", path}, {"value", target}
+                });
+                break;
+            }
+        }
+
+        return result;
+    }
+    /// @}
+
+    ////////////////////////////////
+    // JSON Merge Patch functions //
+    ////////////////////////////////
+
+    /// @name JSON Merge Patch functions
+    /// @{
+
+    /// @brief applies a JSON Merge Patch
+    /// @sa https://json.nlohmann.me/api/basic_json/merge_patch/
+    void merge_patch(const basic_json& apply_patch)
+    {
+        if (apply_patch.is_object())
+        {
+            if (!is_object())
+            {
+                *this = object();
+            }
+            for (auto it = apply_patch.begin(); it != apply_patch.end(); ++it)
+            {
+                if (it.value().is_null())
+                {
+                    erase(it.key());
+                }
+                else
+                {
+                    operator[](it.key()).merge_patch(it.value());
+                }
+            }
+        }
+        else
+        {
+            *this = apply_patch;
+        }
+    }
+
+    /// @}
+};
+
+/// @brief user-defined to_string function for JSON values
+/// @sa https://json.nlohmann.me/api/basic_json/to_string/
+NLOHMANN_BASIC_JSON_TPL_DECLARATION
+std::string to_string(const NLOHMANN_BASIC_JSON_TPL& j)
+{
+    return j.dump();
+}
+
+inline namespace literals
+{
+inline namespace json_literals
+{
+
+/// @brief user-defined string literal for JSON values
+/// @sa https://json.nlohmann.me/api/basic_json/operator_literal_json/
+JSON_HEDLEY_NON_NULL(1)
+#if !defined(JSON_HEDLEY_GCC_VERSION) || JSON_HEDLEY_GCC_VERSION_CHECK(4,9,0)
+    inline nlohmann::json operator ""_json(const char* s, std::size_t n)
+#else
+    inline nlohmann::json operator "" _json(const char* s, std::size_t n)
+#endif
+{
+    return nlohmann::json::parse(s, s + n);
+}
+
+/// @brief user-defined string literal for JSON pointer
+/// @sa https://json.nlohmann.me/api/basic_json/operator_literal_json_pointer/
+JSON_HEDLEY_NON_NULL(1)
+#if !defined(JSON_HEDLEY_GCC_VERSION) || JSON_HEDLEY_GCC_VERSION_CHECK(4,9,0)
+    inline nlohmann::json::json_pointer operator ""_json_pointer(const char* s, std::size_t n)
+#else
+    inline nlohmann::json::json_pointer operator "" _json_pointer(const char* s, std::size_t n)
+#endif
+{
+    return nlohmann::json::json_pointer(std::string(s, n));
+}
+
+}  // namespace json_literals
+}  // namespace literals
+NLOHMANN_JSON_NAMESPACE_END
+
+///////////////////////
+// nonmember support //
+///////////////////////
+
+namespace std // NOLINT(cert-dcl58-cpp)
+{
+
+/// @brief hash value for JSON objects
+/// @sa https://json.nlohmann.me/api/basic_json/std_hash/
+NLOHMANN_BASIC_JSON_TPL_DECLARATION
+struct hash<nlohmann::NLOHMANN_BASIC_JSON_TPL> // NOLINT(cert-dcl58-cpp)
+{
+    std::size_t operator()(const nlohmann::NLOHMANN_BASIC_JSON_TPL& j) const
+    {
+        return nlohmann::detail::hash(j);
+    }
+};
+
+// specialization for std::less<value_t>
+template<>
+struct less< ::nlohmann::detail::value_t> // do not remove the space after '<', see https://github.com/nlohmann/json/pull/679
+{
+    /*!
+    @brief compare two value_t enum values
+    @since version 3.0.0
+    */
+    bool operator()(::nlohmann::detail::value_t lhs,
+                    ::nlohmann::detail::value_t rhs) const noexcept
+    {
+#if JSON_HAS_THREE_WAY_COMPARISON
+        return std::is_lt(lhs <=> rhs); // *NOPAD*
+#else
+        return ::nlohmann::detail::operator<(lhs, rhs);
+#endif
+    }
+};
+
+// C++20 prohibit function specialization in the std namespace.
+#ifndef JSON_HAS_CPP_20
+
+/// @brief exchanges the values of two JSON objects
+/// @sa https://json.nlohmann.me/api/basic_json/std_swap/
+NLOHMANN_BASIC_JSON_TPL_DECLARATION
+inline void swap(nlohmann::NLOHMANN_BASIC_JSON_TPL& j1, nlohmann::NLOHMANN_BASIC_JSON_TPL& j2) noexcept(  // NOLINT(readability-inconsistent-declaration-parameter-name, cert-dcl58-cpp)
+    is_nothrow_move_constructible<nlohmann::NLOHMANN_BASIC_JSON_TPL>::value&&                          // NOLINT(misc-redundant-expression,cppcoreguidelines-noexcept-swap,performance-noexcept-swap)
+    is_nothrow_move_assignable<nlohmann::NLOHMANN_BASIC_JSON_TPL>::value)
+{
+    j1.swap(j2);
+}
+
+#endif
+
+}  // namespace std
+
+#if JSON_USE_GLOBAL_UDLS
+    #if !defined(JSON_HEDLEY_GCC_VERSION) || JSON_HEDLEY_GCC_VERSION_CHECK(4,9,0)
+        using nlohmann::literals::json_literals::operator ""_json; // NOLINT(misc-unused-using-decls,google-global-names-in-headers)
+        using nlohmann::literals::json_literals::operator ""_json_pointer; //NOLINT(misc-unused-using-decls,google-global-names-in-headers)
+    #else
+        using nlohmann::literals::json_literals::operator "" _json; // NOLINT(misc-unused-using-decls,google-global-names-in-headers)
+        using nlohmann::literals::json_literals::operator "" _json_pointer; //NOLINT(misc-unused-using-decls,google-global-names-in-headers)
+    #endif
+#endif
+
+// #include <nlohmann/detail/macro_unscope.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013 - 2025 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+// restore clang diagnostic settings
+#if defined(__clang__)
+    #pragma clang diagnostic pop
+#endif
+
+// clean up
+#undef JSON_ASSERT
+#undef JSON_INTERNAL_CATCH
+#undef JSON_THROW
+#undef JSON_PRIVATE_UNLESS_TESTED
+#undef NLOHMANN_BASIC_JSON_TPL_DECLARATION
+#undef NLOHMANN_BASIC_JSON_TPL
+#undef JSON_EXPLICIT
+#undef NLOHMANN_CAN_CALL_STD_FUNC_IMPL
+#undef JSON_INLINE_VARIABLE
+#undef JSON_NO_UNIQUE_ADDRESS
+#undef JSON_DISABLE_ENUM_SERIALIZATION
+#undef JSON_USE_GLOBAL_UDLS
+
+#ifndef JSON_TEST_KEEP_MACROS
+    #undef JSON_CATCH
+    #undef JSON_TRY
+    #undef JSON_HAS_CPP_11
+    #undef JSON_HAS_CPP_14
+    #undef JSON_HAS_CPP_17
+    #undef JSON_HAS_CPP_20
+    #undef JSON_HAS_CPP_23
+    #undef JSON_HAS_FILESYSTEM
+    #undef JSON_HAS_EXPERIMENTAL_FILESYSTEM
+    #undef JSON_HAS_THREE_WAY_COMPARISON
+    #undef JSON_HAS_RANGES
+    #undef JSON_HAS_STATIC_RTTI
+    #undef JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON
+#endif
+
+// #include <nlohmann/thirdparty/hedley/hedley_undef.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013 - 2025 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#undef JSON_HEDLEY_ALWAYS_INLINE
+#undef JSON_HEDLEY_ARM_VERSION
+#undef JSON_HEDLEY_ARM_VERSION_CHECK
+#undef JSON_HEDLEY_ARRAY_PARAM
+#undef JSON_HEDLEY_ASSUME
+#undef JSON_HEDLEY_BEGIN_C_DECLS
+#undef JSON_HEDLEY_CLANG_HAS_ATTRIBUTE
+#undef JSON_HEDLEY_CLANG_HAS_BUILTIN
+#undef JSON_HEDLEY_CLANG_HAS_CPP_ATTRIBUTE
+#undef JSON_HEDLEY_CLANG_HAS_DECLSPEC_DECLSPEC_ATTRIBUTE
+#undef JSON_HEDLEY_CLANG_HAS_EXTENSION
+#undef JSON_HEDLEY_CLANG_HAS_FEATURE
+#undef JSON_HEDLEY_CLANG_HAS_WARNING
+#undef JSON_HEDLEY_COMPCERT_VERSION
+#undef JSON_HEDLEY_COMPCERT_VERSION_CHECK
+#undef JSON_HEDLEY_CONCAT
+#undef JSON_HEDLEY_CONCAT3
+#undef JSON_HEDLEY_CONCAT3_EX
+#undef JSON_HEDLEY_CONCAT_EX
+#undef JSON_HEDLEY_CONST
+#undef JSON_HEDLEY_CONSTEXPR
+#undef JSON_HEDLEY_CONST_CAST
+#undef JSON_HEDLEY_CPP_CAST
+#undef JSON_HEDLEY_CRAY_VERSION
+#undef JSON_HEDLEY_CRAY_VERSION_CHECK
+#undef JSON_HEDLEY_C_DECL
+#undef JSON_HEDLEY_DEPRECATED
+#undef JSON_HEDLEY_DEPRECATED_FOR
+#undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL
+#undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_
+#undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED
+#undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES
+#undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS
+#undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION
+#undef JSON_HEDLEY_DIAGNOSTIC_POP
+#undef JSON_HEDLEY_DIAGNOSTIC_PUSH
+#undef JSON_HEDLEY_DMC_VERSION
+#undef JSON_HEDLEY_DMC_VERSION_CHECK
+#undef JSON_HEDLEY_EMPTY_BASES
+#undef JSON_HEDLEY_EMSCRIPTEN_VERSION
+#undef JSON_HEDLEY_EMSCRIPTEN_VERSION_CHECK
+#undef JSON_HEDLEY_END_C_DECLS
+#undef JSON_HEDLEY_FLAGS
+#undef JSON_HEDLEY_FLAGS_CAST
+#undef JSON_HEDLEY_GCC_HAS_ATTRIBUTE
+#undef JSON_HEDLEY_GCC_HAS_BUILTIN
+#undef JSON_HEDLEY_GCC_HAS_CPP_ATTRIBUTE
+#undef JSON_HEDLEY_GCC_HAS_DECLSPEC_ATTRIBUTE
+#undef JSON_HEDLEY_GCC_HAS_EXTENSION
+#undef JSON_HEDLEY_GCC_HAS_FEATURE
+#undef JSON_HEDLEY_GCC_HAS_WARNING
+#undef JSON_HEDLEY_GCC_NOT_CLANG_VERSION_CHECK
+#undef JSON_HEDLEY_GCC_VERSION
+#undef JSON_HEDLEY_GCC_VERSION_CHECK
+#undef JSON_HEDLEY_GNUC_HAS_ATTRIBUTE
+#undef JSON_HEDLEY_GNUC_HAS_BUILTIN
+#undef JSON_HEDLEY_GNUC_HAS_CPP_ATTRIBUTE
+#undef JSON_HEDLEY_GNUC_HAS_DECLSPEC_ATTRIBUTE
+#undef JSON_HEDLEY_GNUC_HAS_EXTENSION
+#undef JSON_HEDLEY_GNUC_HAS_FEATURE
+#undef JSON_HEDLEY_GNUC_HAS_WARNING
+#undef JSON_HEDLEY_GNUC_VERSION
+#undef JSON_HEDLEY_GNUC_VERSION_CHECK
+#undef JSON_HEDLEY_HAS_ATTRIBUTE
+#undef JSON_HEDLEY_HAS_BUILTIN
+#undef JSON_HEDLEY_HAS_CPP_ATTRIBUTE
+#undef JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS
+#undef JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE
+#undef JSON_HEDLEY_HAS_EXTENSION
+#undef JSON_HEDLEY_HAS_FEATURE
+#undef JSON_HEDLEY_HAS_WARNING
+#undef JSON_HEDLEY_IAR_VERSION
+#undef JSON_HEDLEY_IAR_VERSION_CHECK
+#undef JSON_HEDLEY_IBM_VERSION
+#undef JSON_HEDLEY_IBM_VERSION_CHECK
+#undef JSON_HEDLEY_IMPORT
+#undef JSON_HEDLEY_INLINE
+#undef JSON_HEDLEY_INTEL_CL_VERSION
+#undef JSON_HEDLEY_INTEL_CL_VERSION_CHECK
+#undef JSON_HEDLEY_INTEL_VERSION
+#undef JSON_HEDLEY_INTEL_VERSION_CHECK
+#undef JSON_HEDLEY_IS_CONSTANT
+#undef JSON_HEDLEY_IS_CONSTEXPR_
+#undef JSON_HEDLEY_LIKELY
+#undef JSON_HEDLEY_MALLOC
+#undef JSON_HEDLEY_MCST_LCC_VERSION
+#undef JSON_HEDLEY_MCST_LCC_VERSION_CHECK
+#undef JSON_HEDLEY_MESSAGE
+#undef JSON_HEDLEY_MSVC_VERSION
+#undef JSON_HEDLEY_MSVC_VERSION_CHECK
+#undef JSON_HEDLEY_NEVER_INLINE
+#undef JSON_HEDLEY_NON_NULL
+#undef JSON_HEDLEY_NO_ESCAPE
+#undef JSON_HEDLEY_NO_RETURN
+#undef JSON_HEDLEY_NO_THROW
+#undef JSON_HEDLEY_NULL
+#undef JSON_HEDLEY_PELLES_VERSION
+#undef JSON_HEDLEY_PELLES_VERSION_CHECK
+#undef JSON_HEDLEY_PGI_VERSION
+#undef JSON_HEDLEY_PGI_VERSION_CHECK
+#undef JSON_HEDLEY_PREDICT
+#undef JSON_HEDLEY_PRINTF_FORMAT
+#undef JSON_HEDLEY_PRIVATE
+#undef JSON_HEDLEY_PUBLIC
+#undef JSON_HEDLEY_PURE
+#undef JSON_HEDLEY_REINTERPRET_CAST
+#undef JSON_HEDLEY_REQUIRE
+#undef JSON_HEDLEY_REQUIRE_CONSTEXPR
+#undef JSON_HEDLEY_REQUIRE_MSG
+#undef JSON_HEDLEY_RESTRICT
+#undef JSON_HEDLEY_RETURNS_NON_NULL
+#undef JSON_HEDLEY_SENTINEL
+#undef JSON_HEDLEY_STATIC_ASSERT
+#undef JSON_HEDLEY_STATIC_CAST
+#undef JSON_HEDLEY_STRINGIFY
+#undef JSON_HEDLEY_STRINGIFY_EX
+#undef JSON_HEDLEY_SUNPRO_VERSION
+#undef JSON_HEDLEY_SUNPRO_VERSION_CHECK
+#undef JSON_HEDLEY_TINYC_VERSION
+#undef JSON_HEDLEY_TINYC_VERSION_CHECK
+#undef JSON_HEDLEY_TI_ARMCL_VERSION
+#undef JSON_HEDLEY_TI_ARMCL_VERSION_CHECK
+#undef JSON_HEDLEY_TI_CL2000_VERSION
+#undef JSON_HEDLEY_TI_CL2000_VERSION_CHECK
+#undef JSON_HEDLEY_TI_CL430_VERSION
+#undef JSON_HEDLEY_TI_CL430_VERSION_CHECK
+#undef JSON_HEDLEY_TI_CL6X_VERSION
+#undef JSON_HEDLEY_TI_CL6X_VERSION_CHECK
+#undef JSON_HEDLEY_TI_CL7X_VERSION
+#undef JSON_HEDLEY_TI_CL7X_VERSION_CHECK
+#undef JSON_HEDLEY_TI_CLPRU_VERSION
+#undef JSON_HEDLEY_TI_CLPRU_VERSION_CHECK
+#undef JSON_HEDLEY_TI_VERSION
+#undef JSON_HEDLEY_TI_VERSION_CHECK
+#undef JSON_HEDLEY_UNAVAILABLE
+#undef JSON_HEDLEY_UNLIKELY
+#undef JSON_HEDLEY_UNPREDICTABLE
+#undef JSON_HEDLEY_UNREACHABLE
+#undef JSON_HEDLEY_UNREACHABLE_RETURN
+#undef JSON_HEDLEY_VERSION
+#undef JSON_HEDLEY_VERSION_DECODE_MAJOR
+#undef JSON_HEDLEY_VERSION_DECODE_MINOR
+#undef JSON_HEDLEY_VERSION_DECODE_REVISION
+#undef JSON_HEDLEY_VERSION_ENCODE
+#undef JSON_HEDLEY_WARNING
+#undef JSON_HEDLEY_WARN_UNUSED_RESULT
+#undef JSON_HEDLEY_WARN_UNUSED_RESULT_MSG
+#undef JSON_HEDLEY_FALL_THROUGH
+
+
+
+#endif  // INCLUDE_NLOHMANN_JSON_HPP_
diff --git a/3rdParty-Core/nlohmann/json_fwd.hpp b/3rdParty-Core/nlohmann/json_fwd.hpp
new file mode 100644
index 0000000000..c3f7e90a50
--- /dev/null
+++ b/3rdParty-Core/nlohmann/json_fwd.hpp
@@ -0,0 +1,187 @@
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013 - 2025 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+#ifndef INCLUDE_NLOHMANN_JSON_FWD_HPP_
+#define INCLUDE_NLOHMANN_JSON_FWD_HPP_
+
+#include <cstdint> // int64_t, uint64_t
+#include <map> // map
+#include <memory> // allocator
+#include <string> // string
+#include <vector> // vector
+
+// #include <nlohmann/detail/abi_macros.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013 - 2025 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+// This file contains all macro definitions affecting or depending on the ABI
+
+#ifndef JSON_SKIP_LIBRARY_VERSION_CHECK
+    #if defined(NLOHMANN_JSON_VERSION_MAJOR) && defined(NLOHMANN_JSON_VERSION_MINOR) && defined(NLOHMANN_JSON_VERSION_PATCH)
+        #if NLOHMANN_JSON_VERSION_MAJOR != 3 || NLOHMANN_JSON_VERSION_MINOR != 12 || NLOHMANN_JSON_VERSION_PATCH != 0
+            #warning "Already included a different version of the library!"
+        #endif
+    #endif
+#endif
+
+#define NLOHMANN_JSON_VERSION_MAJOR 3   // NOLINT(modernize-macro-to-enum)
+#define NLOHMANN_JSON_VERSION_MINOR 12  // NOLINT(modernize-macro-to-enum)
+#define NLOHMANN_JSON_VERSION_PATCH 0   // NOLINT(modernize-macro-to-enum)
+
+#ifndef JSON_DIAGNOSTICS
+    #define JSON_DIAGNOSTICS 0
+#endif
+
+#ifndef JSON_DIAGNOSTIC_POSITIONS
+    #define JSON_DIAGNOSTIC_POSITIONS 0
+#endif
+
+#ifndef JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON
+    #define JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON 0
+#endif
+
+#if JSON_DIAGNOSTICS
+    #define NLOHMANN_JSON_ABI_TAG_DIAGNOSTICS _diag
+#else
+    #define NLOHMANN_JSON_ABI_TAG_DIAGNOSTICS
+#endif
+
+#if JSON_DIAGNOSTIC_POSITIONS
+    #define NLOHMANN_JSON_ABI_TAG_DIAGNOSTIC_POSITIONS _dp
+#else
+    #define NLOHMANN_JSON_ABI_TAG_DIAGNOSTIC_POSITIONS
+#endif
+
+#if JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON
+    #define NLOHMANN_JSON_ABI_TAG_LEGACY_DISCARDED_VALUE_COMPARISON _ldvcmp
+#else
+    #define NLOHMANN_JSON_ABI_TAG_LEGACY_DISCARDED_VALUE_COMPARISON
+#endif
+
+#ifndef NLOHMANN_JSON_NAMESPACE_NO_VERSION
+    #define NLOHMANN_JSON_NAMESPACE_NO_VERSION 0
+#endif
+
+// Construct the namespace ABI tags component
+#define NLOHMANN_JSON_ABI_TAGS_CONCAT_EX(a, b, c) json_abi ## a ## b ## c
+#define NLOHMANN_JSON_ABI_TAGS_CONCAT(a, b, c) \
+    NLOHMANN_JSON_ABI_TAGS_CONCAT_EX(a, b, c)
+
+#define NLOHMANN_JSON_ABI_TAGS                                       \
+    NLOHMANN_JSON_ABI_TAGS_CONCAT(                                   \
+            NLOHMANN_JSON_ABI_TAG_DIAGNOSTICS,                       \
+            NLOHMANN_JSON_ABI_TAG_LEGACY_DISCARDED_VALUE_COMPARISON, \
+            NLOHMANN_JSON_ABI_TAG_DIAGNOSTIC_POSITIONS)
+
+// Construct the namespace version component
+#define NLOHMANN_JSON_NAMESPACE_VERSION_CONCAT_EX(major, minor, patch) \
+    _v ## major ## _ ## minor ## _ ## patch
+#define NLOHMANN_JSON_NAMESPACE_VERSION_CONCAT(major, minor, patch) \
+    NLOHMANN_JSON_NAMESPACE_VERSION_CONCAT_EX(major, minor, patch)
+
+#if NLOHMANN_JSON_NAMESPACE_NO_VERSION
+#define NLOHMANN_JSON_NAMESPACE_VERSION
+#else
+#define NLOHMANN_JSON_NAMESPACE_VERSION                                 \
+    NLOHMANN_JSON_NAMESPACE_VERSION_CONCAT(NLOHMANN_JSON_VERSION_MAJOR, \
+                                           NLOHMANN_JSON_VERSION_MINOR, \
+                                           NLOHMANN_JSON_VERSION_PATCH)
+#endif
+
+// Combine namespace components
+#define NLOHMANN_JSON_NAMESPACE_CONCAT_EX(a, b) a ## b
+#define NLOHMANN_JSON_NAMESPACE_CONCAT(a, b) \
+    NLOHMANN_JSON_NAMESPACE_CONCAT_EX(a, b)
+
+#ifndef NLOHMANN_JSON_NAMESPACE
+#define NLOHMANN_JSON_NAMESPACE               \
+    nlohmann::NLOHMANN_JSON_NAMESPACE_CONCAT( \
+            NLOHMANN_JSON_ABI_TAGS,           \
+            NLOHMANN_JSON_NAMESPACE_VERSION)
+#endif
+
+#ifndef NLOHMANN_JSON_NAMESPACE_BEGIN
+#define NLOHMANN_JSON_NAMESPACE_BEGIN                \
+    namespace nlohmann                               \
+    {                                                \
+    inline namespace NLOHMANN_JSON_NAMESPACE_CONCAT( \
+                NLOHMANN_JSON_ABI_TAGS,              \
+                NLOHMANN_JSON_NAMESPACE_VERSION)     \
+    {
+#endif
+
+#ifndef NLOHMANN_JSON_NAMESPACE_END
+#define NLOHMANN_JSON_NAMESPACE_END                                     \
+    }  /* namespace (inline namespace) NOLINT(readability/namespace) */ \
+    }  // namespace nlohmann
+#endif
+
+
+/*!
+@brief namespace for Niels Lohmann
+@see https://github.com/nlohmann
+@since version 1.0.0
+*/
+NLOHMANN_JSON_NAMESPACE_BEGIN
+
+/*!
+@brief default JSONSerializer template argument
+
+This serializer ignores the template arguments and uses ADL
+([argument-dependent lookup](https://en.cppreference.com/w/cpp/language/adl))
+for serialization.
+*/
+template<typename T = void, typename SFINAE = void>
+struct adl_serializer;
+
+/// a class to store JSON values
+/// @sa https://json.nlohmann.me/api/basic_json/
+template<template<typename U, typename V, typename... Args> class ObjectType =
+         std::map,
+         template<typename U, typename... Args> class ArrayType = std::vector,
+         class StringType = std::string, class BooleanType = bool,
+         class NumberIntegerType = std::int64_t,
+         class NumberUnsignedType = std::uint64_t,
+         class NumberFloatType = double,
+         template<typename U> class AllocatorType = std::allocator,
+         template<typename T, typename SFINAE = void> class JSONSerializer =
+         adl_serializer,
+         class BinaryType = std::vector<std::uint8_t>, // cppcheck-suppress syntaxError
+         class CustomBaseClass = void>
+class basic_json;
+
+/// @brief JSON Pointer defines a string syntax for identifying a specific value within a JSON document
+/// @sa https://json.nlohmann.me/api/json_pointer/
+template<typename RefStringType>
+class json_pointer;
+
+/*!
+@brief default specialization
+@sa https://json.nlohmann.me/api/json/
+*/
+using json = basic_json<>;
+
+/// @brief a minimal map-like container that preserves insertion order
+/// @sa https://json.nlohmann.me/api/ordered_map/
+template<class Key, class T, class IgnoredLess, class Allocator>
+struct ordered_map;
+
+/// @brief specialization that maintains the insertion order of object keys
+/// @sa https://json.nlohmann.me/api/ordered_json/
+using ordered_json = basic_json<nlohmann::ordered_map>;
+
+NLOHMANN_JSON_NAMESPACE_END
+
+#endif  // INCLUDE_NLOHMANN_JSON_FWD_HPP_
diff --git a/3rdParty/ONNX/OnnxToolsPA.h b/3rdParty/ONNX/OnnxToolsPA.h
new file mode 100644
index 0000000000..ca60cf4245
--- /dev/null
+++ b/3rdParty/ONNX/OnnxToolsPA.h
@@ -0,0 +1,38 @@
+/*  Simple Integer Option
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *      This option is thread-safe.
+ *
+ */
+
+#ifndef PokemonAutomation_3rdParty_OnnxToolsPA_H
+#define PokemonAutomation_3rdParty_OnnxToolsPA_H
+
+#include <string>
+#include <onnxruntime_c_api.h>
+#include "Common/Cpp/Strings/Unicode.h"
+
+namespace PokemonAutomation{
+
+#ifdef _WIN32
+
+inline std::wstring str_to_onnx_str(const std::string& str){
+    return utf8_to_wstr(str);
+}
+
+
+#else
+
+
+inline std::string str_to_onnx_str(std::string str){
+    return str;
+}
+
+
+#endif
+
+
+
+}
+#endif
diff --git a/3rdParty/ONNX/cpu_provider_factory.h b/3rdParty/ONNX/cpu_provider_factory.h
new file mode 100644
index 0000000000..3aa39ca860
--- /dev/null
+++ b/3rdParty/ONNX/cpu_provider_factory.h
@@ -0,0 +1,19 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+#include "onnxruntime_c_api.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * \param use_arena zero: false. non-zero: true.
+ */
+ORT_EXPORT
+ORT_API_STATUS(OrtSessionOptionsAppendExecutionProvider_CPU, _In_ OrtSessionOptions* options, int use_arena)
+ORT_ALL_ARGS_NONNULL;
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/3rdParty/ONNX/onnxruntime_c_api.h b/3rdParty/ONNX/onnxruntime_c_api.h
new file mode 100644
index 0000000000..6cda7f00f4
--- /dev/null
+++ b/3rdParty/ONNX/onnxruntime_c_api.h
@@ -0,0 +1,6195 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// See docs\c_cxx\README.md on generating the Doxygen documentation from this file
+
+/** \mainpage ONNX Runtime
+ *
+ * ONNX Runtime is a high-performance inference and training graph execution engine for deep learning models.
+ *
+ * ONNX Runtime's C, C++ APIs offer an easy to use interface to onboard and execute onnx models.
+ * - \subpage c_cpp_api "Core C, C++ APIs"
+ * - \subpage training_c_cpp_api "Training C, C++ APIs for on-device training"
+ *
+ * \page c_cpp_api Core C, C++ APIs
+ * <h1>C</h1>
+ *
+ * ::OrtApi - Click here to go to the structure with all C API functions.
+ *
+ * <h1>C++</h1>
+ *
+ * ::Ort - Click here to go to the namespace holding all of the C++ wrapper classes
+ *
+ * It is a set of header only wrapper classes around the C API. The goal is to turn the C style return value error codes into C++ exceptions, and to
+ * automate memory management through standard C++ RAII principles.
+ *
+ * \addtogroup Global
+ * ONNX Runtime C API
+ * @{
+ */
+
+#pragma once
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+
+/** \brief The API version defined in this header
+ *
+ * This value is used by some API functions to behave as this version of the header expects.
+ */
+#define ORT_API_VERSION 22
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+//! @}
+// SAL2 Definitions
+#ifndef _MSC_VER
+#define _In_
+#define _In_z_
+#define _In_opt_
+#define _In_opt_z_
+#define _Out_
+#define _Outptr_
+#define _Out_opt_
+#define _Inout_
+#define _Inout_opt_
+#define _Frees_ptr_opt_
+#define _Ret_maybenull_
+#define _Ret_notnull_
+#define _Check_return_
+#define _Outptr_result_maybenull_
+#define _In_reads_(X)
+#define _Inout_updates_(X)
+#define _Out_writes_(X)
+#define _Inout_updates_all_(X)
+#define _Out_writes_bytes_all_(X)
+#define _Out_writes_all_(X)
+#define _Success_(X)
+#define _Outptr_result_buffer_maybenull_(X)
+#define ORT_ALL_ARGS_NONNULL __attribute__((nonnull))
+#else
+#include <specstrings.h>
+#define ORT_ALL_ARGS_NONNULL
+#endif
+
+#ifdef _WIN32
+// Define ORT_DLL_IMPORT if your program is dynamically linked to Ort.
+// dllexport is not used, we use a .def file.
+#ifdef ORT_DLL_IMPORT
+#define ORT_EXPORT __declspec(dllimport)
+#else
+#define ORT_EXPORT
+#endif
+#define ORT_API_CALL _stdcall
+#define ORT_MUST_USE_RESULT
+#define ORTCHAR_T wchar_t
+#else
+// To make symbols visible on macOS/iOS
+#ifdef __APPLE__
+#define ORT_EXPORT __attribute__((visibility("default")))
+#else
+#define ORT_EXPORT
+#endif
+#define ORT_API_CALL
+#define ORT_MUST_USE_RESULT __attribute__((warn_unused_result))
+#define ORTCHAR_T char
+#endif
+
+/// ORTCHAR_T, ORT_TSTR are reserved specifically for path handling.
+/// All other strings are UTF-8 encoded, use char and std::string
+#ifndef ORT_TSTR
+#ifdef _WIN32
+#define ORT_TSTR(X) L##X
+// When X is a macro, L##X is not defined. In this case, we need to use ORT_TSTR_ON_MACRO.
+#define ORT_TSTR_ON_MACRO(X) L"" X
+#else
+#define ORT_TSTR(X) X
+#define ORT_TSTR_ON_MACRO(X) X
+#endif
+#endif
+
+// On Windows, ORT_FILE is a wchar_t version of the __FILE__ macro.
+// Otherwise, ORT_FILE is equivalent to __FILE__.
+#ifndef ORT_FILE
+#define ORT_FILE_INTERNAL(x) ORT_TSTR(x)
+#define ORT_FILE ORT_FILE_INTERNAL(__FILE__)
+#endif
+
+// Any pointer marked with _In_ or _Out_, cannot be NULL.
+
+// Windows users should use unicode paths when possible to bypass the MAX_PATH limitation
+// Every pointer marked with _In_ or _Out_, cannot be NULL. Caller should ensure that.
+// for ReleaseXXX(...) functions, they can accept NULL pointer.
+
+#ifdef __cplusplus
+// For any compiler with C++11 support, MSVC 2015 and greater, or Clang version supporting noexcept.
+// Such complex condition is needed because compilers set __cplusplus value differently.
+#ifndef __has_feature
+#define __has_feature(x) 0
+#endif
+#if ((__cplusplus >= 201103L) || (_MSC_VER >= 1900) || (defined(__has_feature) && __has_feature(cxx_noexcept)))
+#define NO_EXCEPTION noexcept
+#else
+#define NO_EXCEPTION throw()
+#endif
+#else
+#define NO_EXCEPTION
+#endif
+
+// __VA_ARGS__ on Windows and Linux are different
+#define ORT_API(RETURN_TYPE, NAME, ...) RETURN_TYPE ORT_API_CALL NAME(__VA_ARGS__) NO_EXCEPTION
+
+#define ORT_API_STATUS(NAME, ...)                                                                   \
+  _Success_(return == 0) _Check_return_ _Ret_maybenull_ OrtStatusPtr ORT_API_CALL NAME(__VA_ARGS__) \
+  NO_EXCEPTION ORT_MUST_USE_RESULT
+
+// XXX: Unfortunately, SAL annotations are known to not work with function pointers
+#define ORT_API2_STATUS(NAME, ...) \
+  _Check_return_ _Ret_maybenull_ OrtStatusPtr(ORT_API_CALL* NAME)(__VA_ARGS__) NO_EXCEPTION ORT_MUST_USE_RESULT
+
+// Used in *.cc files. Almost as same as ORT_API_STATUS, except without ORT_MUST_USE_RESULT and ORT_EXPORT
+#define ORT_API_STATUS_IMPL(NAME, ...) \
+  _Success_(return == 0) _Check_return_ _Ret_maybenull_ OrtStatusPtr ORT_API_CALL NAME(__VA_ARGS__) NO_EXCEPTION
+
+#define ORT_CLASS_RELEASE(X) void(ORT_API_CALL * Release##X)(_Frees_ptr_opt_ Ort##X * input)
+
+#ifdef __DOXYGEN__
+#undef ORT_API_STATUS
+#define ORT_API_STATUS(NAME, ...) OrtStatus* NAME(__VA_ARGS__)
+#undef ORT_API2_STATUS
+#define ORT_API2_STATUS(NAME, ...) OrtStatus* NAME(__VA_ARGS__)
+#undef ORT_CLASS_RELEASE
+#define ORT_CLASS_RELEASE(X) void Release##X(Ort##X* input)
+#undef NO_EXCEPTION
+#define NO_EXCEPTION
+#endif
+/** \addtogroup Global
+ * ONNX Runtime C API
+ * @{
+ */
+
+/** Copied from TensorProto::DataType
+ * Currently, Ort doesn't support complex64, complex128
+ */
+typedef enum ONNXTensorElementDataType {
+  ONNX_TENSOR_ELEMENT_DATA_TYPE_UNDEFINED,
+  ONNX_TENSOR_ELEMENT_DATA_TYPE_FLOAT,   // maps to c type float
+  ONNX_TENSOR_ELEMENT_DATA_TYPE_UINT8,   // maps to c type uint8_t
+  ONNX_TENSOR_ELEMENT_DATA_TYPE_INT8,    // maps to c type int8_t
+  ONNX_TENSOR_ELEMENT_DATA_TYPE_UINT16,  // maps to c type uint16_t
+  ONNX_TENSOR_ELEMENT_DATA_TYPE_INT16,   // maps to c type int16_t
+  ONNX_TENSOR_ELEMENT_DATA_TYPE_INT32,   // maps to c type int32_t
+  ONNX_TENSOR_ELEMENT_DATA_TYPE_INT64,   // maps to c type int64_t
+  ONNX_TENSOR_ELEMENT_DATA_TYPE_STRING,  // maps to c++ type std::string
+  ONNX_TENSOR_ELEMENT_DATA_TYPE_BOOL,
+  ONNX_TENSOR_ELEMENT_DATA_TYPE_FLOAT16,
+  ONNX_TENSOR_ELEMENT_DATA_TYPE_DOUBLE,      // maps to c type double
+  ONNX_TENSOR_ELEMENT_DATA_TYPE_UINT32,      // maps to c type uint32_t
+  ONNX_TENSOR_ELEMENT_DATA_TYPE_UINT64,      // maps to c type uint64_t
+  ONNX_TENSOR_ELEMENT_DATA_TYPE_COMPLEX64,   // complex with float32 real and imaginary components
+  ONNX_TENSOR_ELEMENT_DATA_TYPE_COMPLEX128,  // complex with float64 real and imaginary components
+  ONNX_TENSOR_ELEMENT_DATA_TYPE_BFLOAT16,    // Non-IEEE floating-point format based on IEEE754 single-precision
+  // float 8 types were introduced in onnx 1.14, see https://onnx.ai/onnx/technical/float8.html
+  ONNX_TENSOR_ELEMENT_DATA_TYPE_FLOAT8E4M3FN,    // Non-IEEE floating-point format based on IEEE754 single-precision
+  ONNX_TENSOR_ELEMENT_DATA_TYPE_FLOAT8E4M3FNUZ,  // Non-IEEE floating-point format based on IEEE754 single-precision
+  ONNX_TENSOR_ELEMENT_DATA_TYPE_FLOAT8E5M2,      // Non-IEEE floating-point format based on IEEE754 single-precision
+  ONNX_TENSOR_ELEMENT_DATA_TYPE_FLOAT8E5M2FNUZ,  // Non-IEEE floating-point format based on IEEE754 single-precision
+  // Int4 types were introduced in ONNX 1.16. See https://onnx.ai/onnx/technical/int4.html
+  ONNX_TENSOR_ELEMENT_DATA_TYPE_UINT4,  // maps to a pair of packed uint4 values (size == 1 byte)
+  ONNX_TENSOR_ELEMENT_DATA_TYPE_INT4    // maps to a pair of packed int4 values (size == 1 byte)
+} ONNXTensorElementDataType;
+
+// Synced with onnx TypeProto oneof
+typedef enum ONNXType {
+  ONNX_TYPE_UNKNOWN,
+  ONNX_TYPE_TENSOR,
+  ONNX_TYPE_SEQUENCE,
+  ONNX_TYPE_MAP,
+  ONNX_TYPE_OPAQUE,
+  ONNX_TYPE_SPARSETENSOR,
+  ONNX_TYPE_OPTIONAL
+} ONNXType;
+
+// These types are synced with internal
+// SparseFormatFlags
+typedef enum OrtSparseFormat {
+  ORT_SPARSE_UNDEFINED = 0,
+  ORT_SPARSE_COO = 0x1,
+  ORT_SPARSE_CSRC = 0x2,
+  ORT_SPARSE_BLOCK_SPARSE = 0x4
+} OrtSparseFormat;
+
+// Enum allows to query sparse tensor indices
+enum OrtSparseIndicesFormat {
+  ORT_SPARSE_COO_INDICES,
+  ORT_SPARSE_CSR_INNER_INDICES,
+  ORT_SPARSE_CSR_OUTER_INDICES,
+  ORT_SPARSE_BLOCK_SPARSE_INDICES
+};
+
+/** \brief Logging severity levels
+ *
+ * In typical API usage, specifying a logging severity level specifies the minimum severity of log messages to show.
+ */
+typedef enum OrtLoggingLevel {
+  ORT_LOGGING_LEVEL_VERBOSE,  ///< Verbose informational messages (least severe).
+  ORT_LOGGING_LEVEL_INFO,     ///< Informational messages.
+  ORT_LOGGING_LEVEL_WARNING,  ///< Warning messages.
+  ORT_LOGGING_LEVEL_ERROR,    ///< Error messages.
+  ORT_LOGGING_LEVEL_FATAL,    ///< Fatal error messages (most severe).
+} OrtLoggingLevel;
+
+typedef enum OrtErrorCode {
+  ORT_OK,
+  ORT_FAIL,
+  ORT_INVALID_ARGUMENT,
+  ORT_NO_SUCHFILE,
+  ORT_NO_MODEL,
+  ORT_ENGINE_ERROR,
+  ORT_RUNTIME_EXCEPTION,
+  ORT_INVALID_PROTOBUF,
+  ORT_MODEL_LOADED,
+  ORT_NOT_IMPLEMENTED,
+  ORT_INVALID_GRAPH,
+  ORT_EP_FAIL,
+  ORT_MODEL_LOAD_CANCELED,
+  ORT_MODEL_REQUIRES_COMPILATION,
+} OrtErrorCode;
+
+typedef enum OrtOpAttrType {
+  ORT_OP_ATTR_UNDEFINED = 0,
+  ORT_OP_ATTR_INT,
+  ORT_OP_ATTR_INTS,
+  ORT_OP_ATTR_FLOAT,
+  ORT_OP_ATTR_FLOATS,
+  ORT_OP_ATTR_STRING,
+  ORT_OP_ATTR_STRINGS,
+} OrtOpAttrType;
+
+//! @}
+#define ORT_RUNTIME_CLASS(X) \
+  struct Ort##X;             \
+  typedef struct Ort##X Ort##X
+
+/** \addtogroup Global
+ * ONNX Runtime C API
+ * @{
+ */
+// The actual types defined have an Ort prefix
+ORT_RUNTIME_CLASS(Env);
+ORT_RUNTIME_CLASS(Status);  // nullptr for Status* indicates success
+ORT_RUNTIME_CLASS(MemoryInfo);
+ORT_RUNTIME_CLASS(IoBinding);
+ORT_RUNTIME_CLASS(Session);  // Don't call ReleaseSession from Dllmain (because session owns a thread pool)
+ORT_RUNTIME_CLASS(Value);
+ORT_RUNTIME_CLASS(RunOptions);
+ORT_RUNTIME_CLASS(TypeInfo);
+ORT_RUNTIME_CLASS(TensorTypeAndShapeInfo);
+ORT_RUNTIME_CLASS(MapTypeInfo);
+ORT_RUNTIME_CLASS(SequenceTypeInfo);
+ORT_RUNTIME_CLASS(OptionalTypeInfo);
+ORT_RUNTIME_CLASS(SessionOptions);
+ORT_RUNTIME_CLASS(CustomOpDomain);
+ORT_RUNTIME_CLASS(ModelMetadata);
+ORT_RUNTIME_CLASS(ThreadPoolParams);
+ORT_RUNTIME_CLASS(ThreadingOptions);
+ORT_RUNTIME_CLASS(ArenaCfg);
+ORT_RUNTIME_CLASS(PrepackedWeightsContainer);
+ORT_RUNTIME_CLASS(TensorRTProviderOptionsV2);
+ORT_RUNTIME_CLASS(NvTensorRtRtxProviderOptions);
+ORT_RUNTIME_CLASS(CUDAProviderOptionsV2);
+ORT_RUNTIME_CLASS(CANNProviderOptions);
+ORT_RUNTIME_CLASS(DnnlProviderOptions);
+ORT_RUNTIME_CLASS(Op);
+ORT_RUNTIME_CLASS(OpAttr);
+ORT_RUNTIME_CLASS(Logger);
+ORT_RUNTIME_CLASS(ShapeInferContext);
+ORT_RUNTIME_CLASS(LoraAdapter);
+ORT_RUNTIME_CLASS(ValueInfo);
+ORT_RUNTIME_CLASS(Node);
+ORT_RUNTIME_CLASS(Graph);
+ORT_RUNTIME_CLASS(Model);
+ORT_RUNTIME_CLASS(ModelCompilationOptions);
+ORT_RUNTIME_CLASS(HardwareDevice);
+ORT_RUNTIME_CLASS(EpDevice);
+ORT_RUNTIME_CLASS(KeyValuePairs);
+
+#ifdef _MSC_VER
+typedef _Return_type_success_(return == 0) OrtStatus* OrtStatusPtr;
+#else
+typedef OrtStatus* OrtStatusPtr;
+#endif
+
+/** \brief Memory allocation interface
+ *
+ * Structure of function pointers that defines a memory allocator. This can be created and filled in by the user for custom allocators.
+ *
+ * When an allocator is passed to any function, be sure that the allocator object is not destroyed until the last allocated object using it is freed.
+ */
+typedef struct OrtAllocator {
+  uint32_t version;                                                                   ///< Must be initialized to ORT_API_VERSION
+  void*(ORT_API_CALL* Alloc)(struct OrtAllocator* this_, size_t size);                ///< Returns a pointer to an allocated block of `size` bytes
+  void(ORT_API_CALL* Free)(struct OrtAllocator* this_, void* p);                      ///< Free a block of memory previously allocated with OrtAllocator::Alloc
+  const struct OrtMemoryInfo*(ORT_API_CALL* Info)(const struct OrtAllocator* this_);  ///< Return a pointer to an ::OrtMemoryInfo that describes this allocator
+  /**
+   * @brief Optional allocation function to use for memory allocations made during session initialization.
+   * Use this function if you want to separate allocations made by ORT during Run() calls from
+   * those made during session initialization. This allows for separate memory management strategies for these allocations.
+   */
+  void*(ORT_API_CALL* Reserve)(struct OrtAllocator* this_, size_t size);  ///< Returns a pointer to an allocated block of `size` bytes
+} OrtAllocator;
+
+typedef void(ORT_API_CALL* OrtLoggingFunction)(
+    void* param, OrtLoggingLevel severity, const char* category, const char* logid, const char* code_location,
+    const char* message);
+
+/** \brief Graph optimization level
+ *
+ * Refer to https://www.onnxruntime.ai/docs/performance/graph-optimizations.html#graph-optimization-levels
+ * for an in-depth understanding of the Graph Optimization Levels.
+ */
+typedef enum GraphOptimizationLevel {
+  ORT_DISABLE_ALL = 0,
+  ORT_ENABLE_BASIC = 1,
+  ORT_ENABLE_EXTENDED = 2,
+  ORT_ENABLE_ALL = 99
+} GraphOptimizationLevel;
+
+typedef enum ExecutionMode {
+  ORT_SEQUENTIAL = 0,
+  ORT_PARALLEL = 1,
+} ExecutionMode;
+
+/** \brief Language projection identifiers
+ * /see OrtApi::SetLanguageProjection
+ */
+typedef enum OrtLanguageProjection {
+  ORT_PROJECTION_C = 0,
+  ORT_PROJECTION_CPLUSPLUS = 1,
+  ORT_PROJECTION_CSHARP = 2,
+  ORT_PROJECTION_PYTHON = 3,
+  ORT_PROJECTION_JAVA = 4,
+  ORT_PROJECTION_WINML = 5,
+  ORT_PROJECTION_NODEJS = 6,
+} OrtLanguageProjection;
+
+struct OrtKernelInfo;
+typedef struct OrtKernelInfo OrtKernelInfo;
+struct OrtKernelContext;
+typedef struct OrtKernelContext OrtKernelContext;
+struct OrtCustomOp;
+typedef struct OrtCustomOp OrtCustomOp;
+
+typedef enum OrtAllocatorType {
+  OrtInvalidAllocator = -1,
+  OrtDeviceAllocator = 0,
+  OrtArenaAllocator = 1
+} OrtAllocatorType;
+
+/** \brief Memory types for allocated memory, execution provider specific types should be extended in each provider.
+ */
+// Whenever this struct is updated, please also update the MakeKey function in onnxruntime / core / framework / execution_provider.cc
+typedef enum OrtMemType {
+  OrtMemTypeCPUInput = -2,              ///< Any CPU memory used by non-CPU execution provider
+  OrtMemTypeCPUOutput = -1,             ///< CPU accessible memory outputted by non-CPU execution provider, i.e. CUDA_PINNED
+  OrtMemTypeCPU = OrtMemTypeCPUOutput,  ///< Temporary CPU accessible memory allocated by non-CPU execution provider, i.e. CUDA_PINNED
+  OrtMemTypeDefault = 0,                ///< The default allocator for execution provider
+} OrtMemType;
+
+/** \brief This mimics OrtDevice type constants so they can be returned in the API
+ */
+typedef enum OrtMemoryInfoDeviceType {
+  OrtMemoryInfoDeviceType_CPU = 0,
+  OrtMemoryInfoDeviceType_GPU = 1,
+  OrtMemoryInfoDeviceType_FPGA = 2
+} OrtMemoryInfoDeviceType;
+
+typedef enum OrtHardwareDeviceType {
+  OrtHardwareDeviceType_CPU,
+  OrtHardwareDeviceType_GPU,
+  OrtHardwareDeviceType_NPU
+} OrtHardwareDeviceType;
+
+/** \brief These are the default EP selection policies used by ORT when doing automatic EP selection.
+ */
+typedef enum OrtExecutionProviderDevicePolicy {
+  OrtExecutionProviderDevicePolicy_DEFAULT,
+  OrtExecutionProviderDevicePolicy_PREFER_CPU,
+  OrtExecutionProviderDevicePolicy_PREFER_NPU,
+  OrtExecutionProviderDevicePolicy_PREFER_GPU,
+  OrtExecutionProviderDevicePolicy_MAX_PERFORMANCE,
+  OrtExecutionProviderDevicePolicy_MAX_EFFICIENCY,
+  OrtExecutionProviderDevicePolicy_MIN_OVERALL_POWER,
+} OrtExecutionProviderDevicePolicy;
+
+/** \brief Delegate to allow providing custom OrtEpDevice selection logic
+ *
+ * This delegate is called by the EP selection code to allow the user to provide custom device selection logic.
+ * The user can use this to select OrtEpDevice instances from the list of available devices.
+ *
+ * \param ep_devices The list of available devices.
+ * \param num_devices The number of available devices.
+ * \param model_metadata The model metadata.
+ * \param runtime_metadata The runtime metadata. May be nullptr.
+ * \param selected Pre-allocated array to populate with selected OrtEpDevice pointers from ep_devices.
+ * \param max_ep_devices The maximum number of devices that can be selected in the pre-allocated array.
+                         Currently the maximum is 8.
+ * \param num_ep_devices The number of selected devices.
+ * \param state Opaque pointer. Required to use the delegate from other languages like C# and python.
+ *
+ * \return OrtStatus* Selection status. Return nullptr on success.
+ *                    Use CreateStatus to provide error info. Use ORT_FAIL as the error code.
+ *                    ORT will release the OrtStatus* if not null.
+ */
+typedef OrtStatus* (*EpSelectionDelegate)(_In_ const OrtEpDevice** ep_devices,
+                                          _In_ size_t num_devices,
+                                          _In_ const OrtKeyValuePairs* model_metadata,
+                                          _In_opt_ const OrtKeyValuePairs* runtime_metadata,
+                                          _Inout_ const OrtEpDevice** selected,
+                                          _In_ size_t max_selected,
+                                          _Out_ size_t* num_selected,
+                                          _In_ void* state);
+
+/** \brief Algorithm to use for cuDNN Convolution Op
+ */
+typedef enum OrtCudnnConvAlgoSearch {
+  OrtCudnnConvAlgoSearchExhaustive,  // expensive exhaustive benchmarking using cudnnFindConvolutionForwardAlgorithmEx
+  OrtCudnnConvAlgoSearchHeuristic,   // lightweight heuristic based search using cudnnGetConvolutionForwardAlgorithm_v7
+  OrtCudnnConvAlgoSearchDefault,     // default algorithm using CUDNN_CONVOLUTION_FWD_ALGO_IMPLICIT_PRECOMP_GEMM
+} OrtCudnnConvAlgoSearch;
+
+/** \brief CUDA Provider Options
+ *
+ * \see OrtApi::SessionOptionsAppendExecutionProvider_CUDA
+ */
+typedef struct OrtCUDAProviderOptions {
+#ifdef __cplusplus
+  OrtCUDAProviderOptions()
+      : device_id{},
+        cudnn_conv_algo_search{OrtCudnnConvAlgoSearchExhaustive},
+        gpu_mem_limit{SIZE_MAX},
+        arena_extend_strategy{},
+        do_copy_in_default_stream{1},
+        has_user_compute_stream{},
+        user_compute_stream{},
+        default_memory_arena_cfg{},
+        tunable_op_enable{false},
+        tunable_op_tuning_enable{false},
+        tunable_op_max_tuning_duration_ms{} {}
+#endif
+
+  /** \brief CUDA device Id
+   *   Defaults to 0.
+   */
+  int device_id;
+
+  /** \brief CUDA Convolution algorithm search configuration.
+   *   See enum OrtCudnnConvAlgoSearch for more details.
+   *   Defaults to OrtCudnnConvAlgoSearchExhaustive.
+   */
+  OrtCudnnConvAlgoSearch cudnn_conv_algo_search;
+
+  /** \brief CUDA memory limit (To use all possible memory pass in maximum size_t)
+   *   Defaults to SIZE_MAX.
+   *   \note If a ::OrtArenaCfg has been applied, it will override this field
+   */
+  size_t gpu_mem_limit;
+
+  /** \brief Strategy used to grow the memory arena
+   *   0 = kNextPowerOfTwo<br>
+   *   1 = kSameAsRequested<br>
+   *   Defaults to 0.
+   *   \note If a ::OrtArenaCfg has been applied, it will override this field
+   */
+  int arena_extend_strategy;
+
+  /** \brief Flag indicating if copying needs to take place on the same stream as the compute stream in the CUDA EP
+   *   0 = Use separate streams for copying and compute.
+   *   1 = Use the same stream for copying and compute.
+   *   Defaults to 1.
+   *   WARNING: Setting this to 0 may result in data races for some models.
+   *   Please see issue #4829 for more details.
+   */
+  int do_copy_in_default_stream;
+
+  /** \brief Flag indicating if there is a user provided compute stream
+   *   Defaults to 0.
+   */
+  int has_user_compute_stream;
+
+  /** \brief User provided compute stream.
+   *   If provided, please set `has_user_compute_stream` to 1.
+   */
+  void* user_compute_stream;
+
+  /** \brief CUDA memory arena configuration parameters
+   */
+  OrtArenaCfg* default_memory_arena_cfg;
+
+  /** \brief Enable TunableOp for using.
+   *   Set it to 1/0 to enable/disable TunableOp. Otherwise, it is disabled by default.
+   *   This option can be overridden by environment variable ORT_CUDA_TUNABLE_OP_ENABLE.
+   */
+  int tunable_op_enable;
+
+  /** \brief Enable TunableOp for tuning.
+   *   Set it to 1/0 to enable/disable TunableOp tuning. Otherwise, it is disabled by default.
+   *   This option can be overridden by environment variable ORT_CUDA_TUNABLE_OP_TUNING_ENABLE.
+   */
+  int tunable_op_tuning_enable;
+
+  /** \brief Max tuning duration time limit for each instance of TunableOp.
+   *   Defaults to 0 to disable the limit.
+   */
+  int tunable_op_max_tuning_duration_ms;
+
+} OrtCUDAProviderOptions;
+
+/** \brief ROCM Provider Options
+ *
+ * \see OrtApi::SessionOptionsAppendExecutionProvider_ROCM
+ */
+typedef struct OrtROCMProviderOptions {
+#ifdef __cplusplus
+  OrtROCMProviderOptions()
+      : device_id{},
+        miopen_conv_exhaustive_search{0},
+        gpu_mem_limit{SIZE_MAX},
+        arena_extend_strategy{},
+        do_copy_in_default_stream{1},
+        has_user_compute_stream{},
+        user_compute_stream{},
+        default_memory_arena_cfg{},
+        enable_hip_graph{false},
+        tunable_op_enable{false},
+        tunable_op_tuning_enable{false},
+        tunable_op_max_tuning_duration_ms{} {}
+#endif
+
+  /** \brief ROCM device Id
+   *   Defaults to 0.
+   */
+  int device_id;
+
+  /** \brief ROCM MIOpen Convolution algorithm exaustive search option.
+   *   Defaults to 0 (false).
+   */
+  int miopen_conv_exhaustive_search;
+
+  /** \brief ROCM memory limit (To use all possible memory pass in maximum size_t)
+   *   Defaults to SIZE_MAX.
+   *   \note If a ::OrtArenaCfg has been applied, it will override this field
+   */
+  size_t gpu_mem_limit;
+
+  /** \brief Strategy used to grow the memory arena
+   *   0 = kNextPowerOfTwo<br>
+   *   1 = kSameAsRequested<br>
+   *   Defaults to 0.
+   *   \note If a ::OrtArenaCfg has been applied, it will override this field
+   */
+  int arena_extend_strategy;
+
+  /** \brief Flag indicating if copying needs to take place on the same stream as the compute stream in the ROCM EP
+   *   0 = Use separate streams for copying and compute.
+   *   1 = Use the same stream for copying and compute.
+   *   Defaults to 1.
+   *   WARNING: Setting this to 0 may result in data races for some models.
+   *   Please see issue #4829 for more details.
+   */
+  int do_copy_in_default_stream;
+
+  /** \brief Flag indicating if there is a user provided compute stream
+   *   Defaults to 0.
+   */
+  int has_user_compute_stream;
+
+  /** \brief User provided compute stream.
+   *   If provided, please set `has_user_compute_stream` to 1.
+   */
+  void* user_compute_stream;
+
+  /** \brief ROCM memory arena configuration parameters
+   */
+  OrtArenaCfg* default_memory_arena_cfg;
+
+  int enable_hip_graph;
+
+  /** \brief Enable TunableOp for using.
+   *   Set it to 1/0 to enable/disable TunableOp. Otherwise, it is disabled by default.
+   *   This option can be overridden by environment variable ORT_ROCM_TUNABLE_OP_ENABLE.
+   */
+  int tunable_op_enable;
+
+  /** \brief Enable TunableOp for tuning.
+   *   Set it to 1/0 to enable/disable TunableOp tuning. Otherwise, it is disabled by default.
+   *   This option can be overridden by environment variable ORT_ROCM_TUNABLE_OP_TUNING_ENABLE.
+   */
+  int tunable_op_tuning_enable;
+
+  /** \brief Max tuning duration time limit for each instance of TunableOp.
+   *   Defaults to 0 to disable the limit.
+   */
+  int tunable_op_max_tuning_duration_ms;
+
+} OrtROCMProviderOptions;
+
+/** \brief TensorRT Provider Options
+ *
+ * \see OrtApi::SessionOptionsAppendExecutionProvider_TensorRT
+ */
+typedef struct OrtTensorRTProviderOptions {
+  int device_id;                                ///< CUDA device id (0 = default device)
+  int has_user_compute_stream;                  // indicator of user specified CUDA compute stream.
+  void* user_compute_stream;                    // user specified CUDA compute stream.
+  int trt_max_partition_iterations;             // maximum iterations for TensorRT parser to get capability
+  int trt_min_subgraph_size;                    // minimum size of TensorRT subgraphs
+  size_t trt_max_workspace_size;                // maximum workspace size for TensorRT.
+  int trt_fp16_enable;                          // enable TensorRT FP16 precision. Default 0 = false, nonzero = true
+  int trt_int8_enable;                          // enable TensorRT INT8 precision. Default 0 = false, nonzero = true
+  const char* trt_int8_calibration_table_name;  // TensorRT INT8 calibration table name.
+  int trt_int8_use_native_calibration_table;    // use native TensorRT generated calibration table. Default 0 = false, nonzero = true
+  int trt_dla_enable;                           // enable DLA. Default 0 = false, nonzero = true
+  int trt_dla_core;                             // DLA core number. Default 0
+  int trt_dump_subgraphs;                       // dump TRT subgraph. Default 0 = false, nonzero = true
+  int trt_engine_cache_enable;                  // enable engine caching. Default 0 = false, nonzero = true
+  const char* trt_engine_cache_path;            // specify engine cache path
+  int trt_engine_decryption_enable;             // enable engine decryption. Default 0 = false, nonzero = true
+  const char* trt_engine_decryption_lib_path;   // specify engine decryption library path
+  int trt_force_sequential_engine_build;        // force building TensorRT engine sequentially. Default 0 = false, nonzero = true
+  // This is the legacy struct and don't add new fields here.
+  // For new field that can be represented by string, please add it in include/onnxruntime/core/providers/tensorrt/tensorrt_provider_options.h
+  // For non-string field, need to create a new separate api to handle it.
+} OrtTensorRTProviderOptions;
+
+/** \brief MIGraphX Provider Options
+ *
+ * \see OrtApi::SessionOptionsAppendExecutionProvider_MIGraphX
+ */
+typedef struct OrtMIGraphXProviderOptions {
+  int device_id;                                     // hip device id.
+  int migraphx_fp16_enable;                          // MIGraphX FP16 precision. Default 0 = false, nonzero = true
+  int migraphx_int8_enable;                          // MIGraphX INT8 precision. Default 0 = false, nonzero = true
+  int migraphx_use_native_calibration_table;         // MIGraphx INT8 cal table. Default 0 = false, noznero = true
+  const char* migraphx_int8_calibration_table_name;  // MIGraphx INT8 calibration table name
+  int migraphx_save_compiled_model;                  // migraphx save compiled model. Default 0 = false, noznero = true
+  const char* migraphx_save_model_path;              // migraphx model path name
+  int migraphx_load_compiled_model;                  // migraphx int8 cal table. Default 0 = false, noznero = true
+  const char* migraphx_load_model_path;              // migraphx model path name
+  bool migraphx_exhaustive_tune;                     // migraphx tuned compile  Default = false
+} OrtMIGraphXProviderOptions;
+
+/** \brief OpenVINO Provider Options
+ *  \brief This Struct is frozen since ORT 1.13.0. Its maintained part of Legacy API for compatibility.
+ *  \brief For latest OpenVINO Provider Options update to the ProviderOptions map.
+ *  \brief Latest OpenVINO Provider Options are listed in the
+ *  \htmlonly
+ *  <a href="https://onnxruntime.ai/docs/execution-providers/OpenVINO-ExecutionProvider.html#summary-of-options">onnxruntime document.</a>
+ *  \endhtmlonly
+ * \see OrtApi::SessionOptionsAppendExecutionProvider()
+ */
+typedef struct OrtOpenVINOProviderOptions {
+#ifdef __cplusplus
+  OrtOpenVINOProviderOptions() : device_type{},
+                                 enable_npu_fast_compile{},
+                                 device_id{},
+                                 num_of_threads{},
+                                 cache_dir{},
+                                 context{},
+                                 enable_opencl_throttling{},
+                                 enable_dynamic_shapes{} {}
+#endif
+  /** \brief Device type string
+   *
+   * Valid settings are one of: "CPU_FP32", "CPU_FP16", "GPU_FP32", "GPU_FP16"
+   */
+  const char* device_type;
+  unsigned char enable_npu_fast_compile;  ///< 0 = disabled, nonzero = enabled
+  const char* device_id;
+  size_t num_of_threads;  ///< 0 = Use default number of threads
+  const char* cache_dir;  // path is set to empty by default
+  void* context;
+  unsigned char enable_opencl_throttling;  ///< 0 = disabled, nonzero = enabled
+  unsigned char enable_dynamic_shapes;     ///< 0 = disabled, nonzero = enabled
+} OrtOpenVINOProviderOptions;
+
+struct OrtApi;
+typedef struct OrtApi OrtApi;
+
+struct OrtTrainingApi;
+typedef struct OrtTrainingApi OrtTrainingApi;
+
+struct OrtModelEditorApi;
+typedef struct OrtModelEditorApi OrtModelEditorApi;
+
+struct OrtCompileApi;
+typedef struct OrtCompileApi OrtCompileApi;
+
+struct OrtEpApi;
+typedef struct OrtEpApi OrtEpApi;
+
+/** \brief The helper interface to get the right version of OrtApi
+ *
+ * Get a pointer to this structure through ::OrtGetApiBase
+ */
+struct OrtApiBase {
+  /** \brief Get a pointer to the requested version of the ::OrtApi
+   *
+   * \param[in] version Must be ::ORT_API_VERSION
+   * \return The ::OrtApi for the version requested, nullptr will be returned if this version is unsupported, for example when using a runtime
+   *   older than the version created with this header file.
+   *
+   * One can call GetVersionString() to get the version of the Onnxruntime library for logging
+   * and error reporting purposes.
+   */
+  const OrtApi*(ORT_API_CALL* GetApi)(uint32_t version)NO_EXCEPTION;
+
+  /** \brief Returns a null terminated string of the version of the Onnxruntime library (eg: "1.8.1")
+   *
+   *  \return UTF-8 encoded version string. Do not deallocate the returned buffer.
+   */
+  const char*(ORT_API_CALL* GetVersionString)(void)NO_EXCEPTION;
+};
+
+typedef struct OrtApiBase OrtApiBase;
+
+/** \brief The Onnxruntime library's entry point to access the C API
+ *
+ * Call this to get the a pointer to an ::OrtApiBase
+ */
+ORT_EXPORT const OrtApiBase* ORT_API_CALL OrtGetApiBase(void) NO_EXCEPTION;
+
+/** \brief Thread work loop function
+ *
+ * Onnxruntime will provide the working loop on custom thread creation
+ * Argument is an onnxruntime built-in type which will be provided when thread pool calls OrtCustomCreateThreadFn
+ */
+typedef void (*OrtThreadWorkerFn)(void* ort_worker_fn_param);
+
+typedef const struct OrtCustomHandleType {
+  char __place_holder;
+}* OrtCustomThreadHandle;
+
+/** \brief Ort custom thread creation function
+ *
+ * The function should return a thread handle to be used in onnxruntime thread pools
+ * Onnxruntime will throw exception on return value of nullptr or 0, indicating that the function failed to create a thread
+ */
+typedef OrtCustomThreadHandle (*OrtCustomCreateThreadFn)(void* ort_custom_thread_creation_options, OrtThreadWorkerFn ort_thread_worker_fn, void* ort_worker_fn_param);
+
+/** \brief Custom thread join function
+ *
+ * Onnxruntime thread pool destructor will call the function to join a custom thread.
+ * Argument ort_custom_thread_handle is the value returned by OrtCustomCreateThreadFn
+ */
+typedef void (*OrtCustomJoinThreadFn)(OrtCustomThreadHandle ort_custom_thread_handle);
+
+typedef OrtStatus*(ORT_API_CALL* RegisterCustomOpsFn)(OrtSessionOptions* options, const OrtApiBase* api);
+
+/** \brief Callback function for RunAsync
+ *
+ * \param[in] user_data User specific data that passed back to the callback
+ * \param[out] outputs On succeed, outputs host inference results, on error, the value will be nullptr
+ * \param[out] num_outputs Number of outputs, on error, the value will be zero
+ * \param[out] status On error, status will provide details
+ */
+typedef void (*RunAsyncCallbackFn)(void* user_data, OrtValue** outputs, size_t num_outputs, OrtStatusPtr status);
+
+/** \brief The C API
+ *
+ * All C API functions are defined inside this structure as pointers to functions.
+ * Call OrtApiBase::GetApi to get a pointer to it
+ *
+ * \nosubgrouping
+ */
+struct OrtApi {
+  /// \name OrtStatus
+  /// @{
+
+  /**
+   * \brief Create an OrtStatus from a null terminated string
+   *
+   * \param[in] code
+   * \param[in] msg A null-terminated string. Its contents will be copied.
+   * \return A new OrtStatus object, must be destroyed with OrtApi::ReleaseStatus
+   */
+  OrtStatus*(ORT_API_CALL* CreateStatus)(OrtErrorCode code, _In_ const char* msg)NO_EXCEPTION ORT_ALL_ARGS_NONNULL;
+
+  /** \brief Get OrtErrorCode from OrtStatus
+   *
+   * \param[in] status
+   * \return OrtErrorCode that \p status was created with
+   */
+  OrtErrorCode(ORT_API_CALL* GetErrorCode)(_In_ const OrtStatus* status) NO_EXCEPTION ORT_ALL_ARGS_NONNULL;
+
+  /** \brief Get error string from OrtStatus
+   *
+   * \param[in] status
+   * \return The error message inside the `status`. Do not free the returned value.
+   */
+  const char*(ORT_API_CALL* GetErrorMessage)(_In_ const OrtStatus* status)NO_EXCEPTION ORT_ALL_ARGS_NONNULL;
+
+  /// @}
+  /// \name OrtEnv
+  /// @{
+
+  /** \brief Create an OrtEnv
+   *
+   * \note Invoking this function will return the same instance of the environment as that returned by a previous call
+   * to another env creation function; all arguments to this function will be ignored.
+   * \param[in] log_severity_level The log severity level.
+   * \param[in] logid The log identifier.
+   * \param[out] out Returned newly created OrtEnv. Must be freed with OrtApi::ReleaseEnv
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(CreateEnv, OrtLoggingLevel log_severity_level, _In_ const char* logid, _Outptr_ OrtEnv** out);
+
+  /** \brief Create an OrtEnv
+   *
+   * \note Invoking this function will return the same instance of the environment as that returned by a previous call
+   * to another env creation function; all arguments to this function will be ignored. If you want to provide your
+   * own logging function, consider setting it using the SetUserLoggingFunction API instead.
+   * \param[in] logging_function A pointer to a logging function.
+   * \param[in] logger_param A pointer to arbitrary data passed as the ::OrtLoggingFunction `param` parameter to
+   *                         `logging_function`. This parameter is optional.
+   * \param[in] log_severity_level The log severity level.
+   * \param[in] logid The log identifier.
+   * \param[out] out Returned newly created OrtEnv. Must be freed with OrtApi::ReleaseEnv
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(CreateEnvWithCustomLogger, _In_ OrtLoggingFunction logging_function, _In_opt_ void* logger_param,
+                  _In_ OrtLoggingLevel log_severity_level, _In_ const char* logid, _Outptr_ OrtEnv** out);
+
+  /** \brief Enable Telemetry
+   *
+   * \note Telemetry events are on by default since they are lightweight
+   * \param[in] env
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(EnableTelemetryEvents, _In_ const OrtEnv* env);
+  /** \brief Disable Telemetry
+   *
+   * \see OrtApi::EnableTelemetryEvents
+   * \param[in] env
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(DisableTelemetryEvents, _In_ const OrtEnv* env);
+
+  /// @}
+  /// \name OrtSession
+  /// @{
+
+  /** \brief Create an OrtSession from a model file
+   *
+   * \param[in] env
+   * \param[in] model_path
+   * \param[in] options
+   * \param[out] out Returned newly created OrtSession. Must be freed with OrtApi::ReleaseSession
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  // TODO: document the path separator convention? '/' vs '\'
+  // TODO: should specify the access characteristics of model_path. Is this read only during the
+  // execution of CreateSession, or does the OrtSession retain a handle to the file/directory
+  // and continue to access throughout the OrtSession lifetime?
+  //  What sort of access is needed to model_path : read or read/write?
+  ORT_API2_STATUS(CreateSession, _In_ const OrtEnv* env, _In_ const ORTCHAR_T* model_path,
+                  _In_ const OrtSessionOptions* options, _Outptr_ OrtSession** out);
+
+  /** \brief Create an OrtSession from memory
+   *
+   * \param[in] env
+   * \param[in] model_data
+   * \param[in] model_data_length
+   * \param[in] options
+   * \param[out] out Returned newly created OrtSession. Must be freed with OrtApi::ReleaseSession
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(CreateSessionFromArray, _In_ const OrtEnv* env,
+                  _In_ const void* model_data, size_t model_data_length,
+                  _In_ const OrtSessionOptions* options, _Outptr_ OrtSession** out);
+
+  /** \brief Run the model in an ::OrtSession
+   *
+   * Will not return until the model run has completed. Multiple threads might be used to run the model based on
+   * the options in the ::OrtSession and settings used when creating the ::OrtEnv
+   *
+   * \param[in] session
+   * \param[in] run_options If nullptr, will use a default ::OrtRunOptions
+   * \param[in] input_names Array of null terminated UTF8 encoded strings of the input names
+   * \param[in] inputs Array of ::OrtValue%s of the input values
+   * \param[in] input_len Number of elements in the input_names and inputs arrays
+   * \param[in] output_names Array of null terminated UTF8 encoded strings of the output names
+   * \param[in] output_names_len Number of elements in the output_names and outputs array
+   * \param[out] outputs Array of ::OrtValue%s that the outputs are stored in. This can also be
+   *     an array of nullptr values, in this case ::OrtValue objects will be allocated and pointers
+   *     to them will be set into the `outputs` array.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(Run, _Inout_ OrtSession* session, _In_opt_ const OrtRunOptions* run_options,
+                  _In_reads_(input_len) const char* const* input_names,
+                  _In_reads_(input_len) const OrtValue* const* inputs, size_t input_len,
+                  _In_reads_(output_names_len) const char* const* output_names, size_t output_names_len,
+                  _Inout_updates_all_(output_names_len) OrtValue** outputs);
+
+  /// @}
+  /// \name OrtSessionOptions
+  /// @{
+
+  /** \brief Create an ::OrtSessionOptions object
+   *
+   * To use additional providers, you must build ORT with the extra providers enabled. Then call one of these
+   * functions to enable them in the session:<br>
+   *   OrtSessionOptionsAppendExecutionProvider_CPU<br>
+   *   OrtSessionOptionsAppendExecutionProvider_CUDA<br>
+   *   OrtSessionOptionsAppendExecutionProvider_(remaining providers...)<br>
+   * The order they are called indicates the preference order as well. In other words call this method
+   * on your most preferred execution provider first followed by the less preferred ones.
+   * If none are called Ort will use its internal CPU execution provider.
+   *
+   * \param[out] options The newly created OrtSessionOptions. Must be freed with OrtApi::ReleaseSessionOptions
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(CreateSessionOptions, _Outptr_ OrtSessionOptions** options);
+
+  /** \brief Set filepath to save optimized model after graph level transformations
+   *
+   * \param[in] options
+   * \param[in] optimized_model_filepath
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(SetOptimizedModelFilePath, _Inout_ OrtSessionOptions* options,
+                  _In_ const ORTCHAR_T* optimized_model_filepath);
+
+  /** \brief Create a copy of an existing ::OrtSessionOptions
+   *
+   * \param[in] in_options OrtSessionOptions to copy
+   * \param[out] out_options Returned newly created ::OrtSessionOptions. Must be freed with OrtApi::ReleaseSessionOptions
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(CloneSessionOptions, _In_ const OrtSessionOptions* in_options,
+                  _Outptr_ OrtSessionOptions** out_options);
+
+  /** \brief Set execution mode
+   *
+   * Controls whether you want to execute operators in your graph sequentially or in parallel. Usually when the model
+   *  has many branches, setting this option to ExecutionMode.ORT_PARALLEL will give you better performance.
+   *  See [docs/ONNX_Runtime_Perf_Tuning.md] for more details.
+   *
+   * \param[in] options
+   * \param[in] execution_mode
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(SetSessionExecutionMode, _Inout_ OrtSessionOptions* options, ExecutionMode execution_mode);
+
+  /** \brief Enable profiling for a session
+   *
+   * \param[in] options
+   * \param[in] profile_file_prefix
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(EnableProfiling, _Inout_ OrtSessionOptions* options, _In_ const ORTCHAR_T* profile_file_prefix);
+
+  /** \brief Disable profiling for a session
+   *
+   * \param[in] options
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(DisableProfiling, _Inout_ OrtSessionOptions* options);
+
+  /** \brief Enable the memory pattern optimization
+   *
+   * The idea is if the input shapes are the same, we could trace the internal memory allocation
+   * and generate a memory pattern for future request. So next time we could just do one allocation
+   * with a big chunk for all the internal memory allocation.
+   * \note Memory pattern optimization is only available when Sequential Execution mode is enabled (see OrtApi::SetSessionExecutionMode)
+   *
+   * \see OrtApi::DisableMemPattern
+   *
+   * \param[in] options
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(EnableMemPattern, _Inout_ OrtSessionOptions* options);
+
+  /** \brief Disable the memory pattern optimization
+   *
+   * \see OrtApi::EnableMemPattern
+   *
+   * \param[in] options
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(DisableMemPattern, _Inout_ OrtSessionOptions* options);
+
+  /** \brief Enable the memory arena on CPU
+   *
+   * Arena may pre-allocate memory for future usage.
+   *
+   * \param[in] options
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(EnableCpuMemArena, _Inout_ OrtSessionOptions* options);
+
+  /** \brief Disable the memory arena on CPU
+   *
+   * \param[in] options
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(DisableCpuMemArena, _Inout_ OrtSessionOptions* options);
+
+  /** \brief Set session log id
+   *
+   * \param[in] options
+   * \param[in] logid The log identifier.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(SetSessionLogId, _Inout_ OrtSessionOptions* options, const char* logid);
+
+  /** \brief Set session log verbosity level
+   *
+   * Applies to session load, initialization, etc
+   *
+   * \param[in] options
+   * \param[in] session_log_verbosity_level \snippet{doc} snippets.dox Log Verbosity Level
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(SetSessionLogVerbosityLevel, _Inout_ OrtSessionOptions* options, int session_log_verbosity_level);
+
+  /** \brief Set session log severity level
+   *
+   * \param[in] options
+   * \param[in] session_log_severity_level The log severity level (refer to ::OrtLoggingLevel for possible values).
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(SetSessionLogSeverityLevel, _Inout_ OrtSessionOptions* options, int session_log_severity_level);
+
+  /** \brief Set the optimization level to apply when loading a graph
+   *
+   * Please see https://onnxruntime.ai/docs/performance/model-optimizations/graph-optimizations.html for an in-depth explanation
+   * \param[in,out] options The session options object
+   * \param[in] graph_optimization_level The optimization level
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(SetSessionGraphOptimizationLevel, _Inout_ OrtSessionOptions* options,
+                  GraphOptimizationLevel graph_optimization_level);
+
+  /** \brief Sets the number of threads used to parallelize the execution within nodes
+   *
+   * When running a single node operation, ex. add, this sets the maximum number of threads to use.
+   *
+   * \note If built with OpenMP, this has no effect on the number of threads used. In this case
+   *       use the OpenMP env variables to configure the number of intra op num threads.
+   *
+   * \param[in] options
+   * \param[in] intra_op_num_threads Number of threads to use<br>
+   *   A value of 0 will use the default number of threads<br>
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(SetIntraOpNumThreads, _Inout_ OrtSessionOptions* options, int intra_op_num_threads);
+
+  /** \brief Sets the number of threads used to parallelize the execution of the graph
+   *
+   * If nodes can be run in parallel, this sets the maximum number of threads to use to run them in parallel.
+   *
+   * \note If sequential execution is enabled this value is ignored, it acts as if it was set to 1.
+   *
+   * \param[in] options
+   * \param[in] inter_op_num_threads Number of threads to use<br>
+   *   A value of 0 will use the default number of threads<br>
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(SetInterOpNumThreads, _Inout_ OrtSessionOptions* options, int inter_op_num_threads);
+
+  /// @}
+  /// \name OrtCustomOpDomain
+  /// @{
+
+  /** \brief Create a custom op domain
+   *
+   * \param[in] domain
+   * \param[out] out Newly created domain. Must be freed with OrtApi::ReleaseCustomOpDomain
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(CreateCustomOpDomain, _In_ const char* domain, _Outptr_ OrtCustomOpDomain** out);
+
+  /** \brief Add a custom op to a custom op domain
+   *
+   * \note The OrtCustomOp* pointer must remain valid until the ::OrtCustomOpDomain using it is released
+   *
+   * \param[in] custom_op_domain
+   * \param[in] op
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(CustomOpDomain_Add, _Inout_ OrtCustomOpDomain* custom_op_domain, _In_ const OrtCustomOp* op);
+
+  /// @}
+  /// \name OrtSessionOptions
+  /// @{
+
+  /** \brief Add custom op domain to a session options
+   *
+   * \note The OrtCustomOpDomain* must not be deleted until all sessions using it are released
+   *
+   * \param[in] options
+   * \param[in] custom_op_domain
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(AddCustomOpDomain, _Inout_ OrtSessionOptions* options, _In_ OrtCustomOpDomain* custom_op_domain);
+
+  /** \deprecated Use OrtApi::RegisterCustomOpsLibrary_V2.
+   *
+   * Registers custom ops from a shared library.
+   *
+   * Loads a shared library (dll on windows, so on linux, etc) named 'library_path' and looks for this entry point:
+   *		OrtStatus* RegisterCustomOps(OrtSessionOptions * options, const OrtApiBase* api);
+   * It then passes in the provided session options to this function along with the api base.
+   * The handle to the loaded library is returned in library_handle. It can be freed by the caller after all sessions using the passed in
+   * session options are destroyed, or if an error occurs and it is non null.
+   *
+   * \param[in] options
+   * \param[in] library_path
+   * \param[out] library_handle OS specific handle to the loaded library (Use FreeLibrary on Windows, dlclose on Linux, etc.. to unload)
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(RegisterCustomOpsLibrary, _Inout_ OrtSessionOptions* options, _In_ const char* library_path, _Outptr_ void** library_handle);
+
+  /// @}
+  /// \name OrtSession
+  /// @{
+
+  /** \brief Get input count for a session
+   *
+   * This number must also match the number of inputs passed to OrtApi::Run
+   *
+   * \see OrtApi::SessionGetInputTypeInfo, OrtApi::SessionGetInputName, OrtApi::Session
+   *
+   * \param[in] session
+   * \param[out] out Number of inputs
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(SessionGetInputCount, _In_ const OrtSession* session, _Out_ size_t* out);
+
+  /** \brief Get output count for a session
+   *
+   * This number must also match the number of outputs returned by OrtApi::Run
+   *
+   * \see OrtApi::SessionGetOutputTypeInfo, OrtApi::SessionGetOutputName, OrtApi::Session
+   *
+   * \param[in] session
+   * \param[out] out Number of outputs
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(SessionGetOutputCount, _In_ const OrtSession* session, _Out_ size_t* out);
+
+  /** \brief Get overridable initializer count
+   *
+   * \see OrtApi::SessionGetOverridableInitializerTypeInfo, OrtApi::SessionGetOverridableInitializerName
+   *
+   * \param[in] session
+   * \param[in] out
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(SessionGetOverridableInitializerCount, _In_ const OrtSession* session, _Out_ size_t* out);
+
+  /** \brief Get input type information
+   *
+   * \param[in] session
+   * \param[in] index Must be between 0 (inclusive) and what OrtApi::SessionGetInputCount returns (exclusive)
+   * \param[out] type_info Must be freed with OrtApi::ReleaseTypeInfo
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(SessionGetInputTypeInfo, _In_ const OrtSession* session, size_t index, _Outptr_ OrtTypeInfo** type_info);
+
+  /** \brief Get output type information
+   *
+   * \param[in] session
+   * \param[in] index Must be between 0 (inclusive) and what OrtApi::SessionGetOutputCount returns (exclusive)
+   * \param[out] type_info Must be freed with OrtApi::ReleaseTypeInfo
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(SessionGetOutputTypeInfo, _In_ const OrtSession* session, size_t index, _Outptr_ OrtTypeInfo** type_info);
+
+  /** \brief Get overridable initializer type information
+   *
+   * \param[in] session
+   * \param[in] index Must be between 0 (inclusive) and what OrtApi::SessionGetOverridableInitializerCount returns (exclusive)
+   * \param[out] type_info Must be freed with OrtApi::ReleaseTypeInfo
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(SessionGetOverridableInitializerTypeInfo, _In_ const OrtSession* session, size_t index, _Outptr_ OrtTypeInfo** type_info);
+
+  /** \brief Get input name
+   *
+   * \param[in] session
+   * \param[in] index Must be between 0 (inclusive) and what OrtApi::SessionGetInputCount returns (exclusive)
+   * \param[in] allocator
+   * \param[out] value Set to a null terminated UTF-8 encoded string allocated using `allocator`. Must be freed using `allocator`.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(SessionGetInputName, _In_ const OrtSession* session, size_t index, _Inout_ OrtAllocator* allocator, _Outptr_ char** value);
+
+  /** \brief Get output name
+   *
+   * \param[in] session
+   * \param[in] index Must be between 0 (inclusive) and what OrtApi::SessionGetOutputCount returns (exclusive)
+   * \param[in] allocator
+   * \param[out] value Set to a null terminated UTF-8 encoded string allocated using `allocator`. Must be freed using `allocator`.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(SessionGetOutputName, _In_ const OrtSession* session, size_t index, _Inout_ OrtAllocator* allocator, _Outptr_ char** value);
+
+  /** \brief Get overridable initializer name
+   *
+   * \param[in] session
+   * \param[in] index Must be between 0 (inclusive) and what OrtApi::SessionGetOverridableInitializerCount returns (exclusive)
+   * \param[in] allocator
+   * \param[out] value Set to a null terminated UTF-8 encoded string allocated using `allocator`. Must be freed using `allocator`.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(SessionGetOverridableInitializerName, _In_ const OrtSession* session, size_t index,
+                  _Inout_ OrtAllocator* allocator, _Outptr_ char** value);
+
+  /// @}
+  /// \name OrtRunOptions
+  /// @{
+
+  /** \brief Create an OrtRunOptions
+   *
+   * \param[out] out Returned newly created ::OrtRunOptions. Must be freed with OrtApi::ReleaseRunOptions
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(CreateRunOptions, _Outptr_ OrtRunOptions** out);
+
+  /** \brief Set per-run log verbosity level
+   *
+   * \see OrtApi::RunOptionsGetRunLogVerbosityLevel
+   *
+   * \param[in] options
+   * \param[in] log_verbosity_level \snippet{doc} snippets.dox Log Verbosity Level
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(RunOptionsSetRunLogVerbosityLevel, _Inout_ OrtRunOptions* options, int log_verbosity_level);
+
+  /** \brief Set per-run log severity level
+   *
+   * \see OrtApi::RunOptionsGetRunLogSeverityLevel
+   *
+   * \param[in] options
+   * \param[in] log_severity_level The log severity level (refer to ::OrtLoggingLevel for possible values).
+   */
+  ORT_API2_STATUS(RunOptionsSetRunLogSeverityLevel, _Inout_ OrtRunOptions* options, int log_severity_level);
+
+  /** \brief Set per-run tag
+   *
+   * This is used in a per-run log identifier.
+   *
+   * \see OrtApi::RunOptionsGetRunTag
+   *
+   * \param[in] options
+   * \param[in] run_tag The run tag.
+   */
+  ORT_API2_STATUS(RunOptionsSetRunTag, _Inout_ OrtRunOptions* options, _In_ const char* run_tag);
+
+  /** \brief Get per-run log verbosity level
+   *
+   * \see OrtApi::RunOptionsSetRunLogVerbosityLevel
+   *
+   * \param[in] options
+   * \param[out] log_verbosity_level \snippet{doc} snippets.dox Log Verbosity Level
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(RunOptionsGetRunLogVerbosityLevel, _In_ const OrtRunOptions* options,
+                  _Out_ int* log_verbosity_level);
+
+  /** \brief Get per-run log severity level
+   *
+   * \see OrtApi::RunOptionsSetRunLogSeverityLevel
+   *
+   * \param[in] options
+   * \param[out] log_severity_level The log severity level (refer to ::OrtLoggingLevel for possible values).
+   */
+  ORT_API2_STATUS(RunOptionsGetRunLogSeverityLevel, _In_ const OrtRunOptions* options, _Out_ int* log_severity_level);
+
+  /** \brief Get per-run tag
+   *
+   * This is used in a per-run log identifier.
+   *
+   * \see OrtApi::RunOptionsSetRunTag
+   *
+   * \param[in] options
+   * \param[out] run_tag The run tag.
+   *                     Do not free this value, it is owned by `options`. It will be invalidated if the run tag
+   *                     changes (i.e., with OrtApi::RunOptionsSetRunTag) or `options` is freed.
+   */
+  ORT_API2_STATUS(RunOptionsGetRunTag, _In_ const OrtRunOptions* options, _Out_ const char** run_tag);
+
+  /** \brief Set terminate flag
+   *
+   * If a currently executing session needs to be force terminated, this can be called from another thread to force it to fail with an error.
+   *
+   * \param[in] options
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(RunOptionsSetTerminate, _Inout_ OrtRunOptions* options);
+
+  /** \brief Clears the terminate flag
+   *
+   * Used so the OrtRunOptions instance can be used in a new OrtApi::Run call without it instantly terminating
+   *
+   * \param[in] options
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(RunOptionsUnsetTerminate, _Inout_ OrtRunOptions* options);
+
+  /// @}
+  /// \name OrtValue
+  /// @{
+
+  /** \brief Create a tensor
+   *
+   * Create a tensor using a supplied ::OrtAllocator
+   *
+   * \param[in] allocator
+   * \param[in] shape Pointer to the tensor shape dimensions.
+   * \param[in] shape_len The number of tensor shape dimensions.
+   * \param[in] type
+   * \param[out] out Returns newly created ::OrtValue. Must be freed with OrtApi::ReleaseValue
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(CreateTensorAsOrtValue, _Inout_ OrtAllocator* allocator, _In_ const int64_t* shape, size_t shape_len,
+                  ONNXTensorElementDataType type, _Outptr_ OrtValue** out);
+
+  /** \brief Create a tensor backed by a user supplied buffer
+   *
+   * Create a tensor with user's buffer. You can fill the buffer either before calling this function or after.
+   * p_data is owned by caller. ReleaseValue won't release p_data.
+   *
+   * If you wish to transfer ownership of p_data to ORT use CreateTensorWithDataAndDeleterAsOrtValue.
+   *
+   * \param[in] info Memory description of where the p_data buffer resides (CPU vs GPU etc).
+   * \param[in] p_data Pointer to the data buffer.
+   * \param[in] p_data_len The number of bytes in the data buffer.
+   * \param[in] shape Pointer to the tensor shape dimensions.
+   * \param[in] shape_len The number of tensor shape dimensions.
+   * \param[in] type The data type.
+   * \param[out] out Returns newly created ::OrtValue. Must be freed with OrtApi::ReleaseValue
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(CreateTensorWithDataAsOrtValue, _In_ const OrtMemoryInfo* info, _Inout_ void* p_data,
+                  size_t p_data_len, _In_ const int64_t* shape, size_t shape_len, ONNXTensorElementDataType type,
+                  _Outptr_ OrtValue** out);
+
+  /** \brief Return if an ::OrtValue is a tensor type
+   *
+   * \param[in] value A tensor type (string tensors are not supported)
+   * \param[out] out Set to 1 iff ::OrtValue is a tensor, 0 otherwise
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(IsTensor, _In_ const OrtValue* value, _Out_ int* out);
+
+  /** \brief Get a pointer to the raw data inside a tensor
+   *
+   * Used to read/write/modify the internal tensor data directly.
+   * \note The returned pointer is valid until the \p value is destroyed.
+   *
+   * \param[in] value A tensor type (string tensors are not supported)
+   * \param[out] out Filled in with a pointer to the internal storage
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(GetTensorMutableData, _In_ OrtValue* value, _Outptr_ void** out);
+
+  /** \brief Set all strings at once in a string tensor
+   *
+   * \param[in,out] value A tensor of type ONNX_TENSOR_ELEMENT_DATA_TYPE_STRING
+   * \param[in] s An array of strings. Each string in this array must be null terminated.
+   * \param[in] s_len Count of strings in s (Must match the size of \p value's tensor shape)
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(FillStringTensor, _Inout_ OrtValue* value, _In_ const char* const* s, size_t s_len);
+
+  /** \brief Get total byte length for all strings in a string tensor
+   *
+   * Typically used with OrtApi::GetStringTensorContent
+   *
+   * \param[in] value A tensor of type ONNX_TENSOR_ELEMENT_DATA_TYPE_STRING
+   * \param[out] len Total byte length of all strings (does not include trailing nulls)
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(GetStringTensorDataLength, _In_ const OrtValue* value, _Out_ size_t* len);
+
+  /** \brief Get all strings from a string tensor
+   *
+   * An example of the results:<br>
+   * Given \p value is a string tensor with the strings { "This" "is" "a" "test" }<br>
+   * \p s must have a size of 11 bytes<br>
+   * \p offsets must have 4 elements<br>
+   * After the call, these values will be filled in:<br>
+   * \p s will contain "Thisisatest"<br>
+   * \p offsets will contain { 0, 4, 6, 7 }<br>
+   * The length of the last string is just s_len - offsets[last]
+   *
+   * \param[in] value A tensor of type ONNX_TENSOR_ELEMENT_DATA_TYPE_STRING
+   * \param[in] s Buffer to sequentially write all tensor strings to. Each string is NOT null-terminated.
+   * \param[in] s_len Number of bytes of buffer pointed to by \p s (Get it from OrtApi::GetStringTensorDataLength)
+   * \param[out] offsets Array of start offsets into the strings written to \p s
+   * \param[in] offsets_len Number of elements in offsets
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(GetStringTensorContent, _In_ const OrtValue* value, _Out_writes_bytes_all_(s_len) void* s,
+                  size_t s_len, _Out_writes_all_(offsets_len) size_t* offsets, size_t offsets_len);
+
+  /// @}
+  /// \name OrtTypeInfo
+  /// @{
+
+  /** \brief Get ::OrtTensorTypeAndShapeInfo from an ::OrtTypeInfo
+   *
+   * \param[in] type_info
+   * \param[out] out Do not free this value, it will be valid until type_info is freed.
+   *             If type_info does not represent tensor, this value will be set to nullptr.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(CastTypeInfoToTensorInfo, _In_ const OrtTypeInfo* type_info,
+                  _Outptr_result_maybenull_ const OrtTensorTypeAndShapeInfo** out);
+
+  /** \brief Get ::ONNXType from ::OrtTypeInfo
+   *
+   * \param[in] type_info
+   * \param[out] out
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(GetOnnxTypeFromTypeInfo, _In_ const OrtTypeInfo* type_info, _Out_ enum ONNXType* out);
+
+  /// @}
+  /// \name OrtTensorTypeAndShapeInfo
+  /// @{
+
+  /** \brief Create an ::OrtTensorTypeAndShapeInfo object
+   *
+   * \param[out] out Returns newly created ::OrtTensorTypeAndShapeInfo. Must be freed with OrtApi::ReleaseTensorTypeAndShapeInfo
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(CreateTensorTypeAndShapeInfo, _Outptr_ OrtTensorTypeAndShapeInfo** out);
+
+  /** \brief Set element type in ::OrtTensorTypeAndShapeInfo
+   *
+   * \param[in] info
+   * \param[in] type
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(SetTensorElementType, _Inout_ OrtTensorTypeAndShapeInfo* info, enum ONNXTensorElementDataType type);
+
+  /** \brief Set shape information in ::OrtTensorTypeAndShapeInfo
+   *
+   * \param[in] info
+   * \param[in] dim_values Array with `dim_count` elements. Can contain negative values.
+   * \param[in] dim_count Number of elements in `dim_values`
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(SetDimensions, OrtTensorTypeAndShapeInfo* info, _In_ const int64_t* dim_values, size_t dim_count);
+
+  /** \brief Get element type in ::OrtTensorTypeAndShapeInfo
+   *
+   * \see OrtApi::SetTensorElementType
+   *
+   * \param[in] info
+   * \param[out] out
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(GetTensorElementType, _In_ const OrtTensorTypeAndShapeInfo* info,
+                  _Out_ enum ONNXTensorElementDataType* out);
+
+  /** \brief Get dimension count in ::OrtTensorTypeAndShapeInfo
+   *
+   * \see OrtApi::GetDimensions
+   *
+   * \param[in] info
+   * \param[out] out
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(GetDimensionsCount, _In_ const OrtTensorTypeAndShapeInfo* info, _Out_ size_t* out);
+
+  /** \brief Get dimensions in ::OrtTensorTypeAndShapeInfo
+   *
+   * \param[in] info
+   * \param[out] dim_values Array with `dim_values_length` elements. On return, filled with the dimensions stored in the ::OrtTensorTypeAndShapeInfo
+   * \param[in] dim_values_length Number of elements in `dim_values`. Use OrtApi::GetDimensionsCount to get this value
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(GetDimensions, _In_ const OrtTensorTypeAndShapeInfo* info, _Out_ int64_t* dim_values,
+                  size_t dim_values_length);
+
+  /** \brief Get symbolic dimension names in ::OrtTensorTypeAndShapeInfo
+   *
+   * \param[in] info
+   * \param[in] dim_params Array with `dim_params_length` elements. On return filled with pointers to null terminated strings of the dimension names
+   * \param[in] dim_params_length Number of elements in `dim_params`. Use OrtApi::GetDimensionsCount to get this value
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(GetSymbolicDimensions, _In_ const OrtTensorTypeAndShapeInfo* info,
+                  _Out_writes_all_(dim_params_length) const char* dim_params[], size_t dim_params_length);
+
+  /** \brief Get total number of elements in a tensor shape from an ::OrtTensorTypeAndShapeInfo
+   *
+   * Return the number of elements specified by the tensor shape (all dimensions multiplied by each other).
+   * For 0 dimensions, 1 is returned. If any dimension is less than 0, the result is always -1.
+   *
+   * Examples:<br>
+   * [] = 1<br>
+   * [1,3,4] = 12<br>
+   * [2,0,4] = 0<br>
+   * [-1,3,4] = -1<br>
+   *
+   * \param[in] info
+   * \param[out] out Number of elements
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(GetTensorShapeElementCount, _In_ const OrtTensorTypeAndShapeInfo* info, _Out_ size_t* out);
+
+  /// @}
+  /// \name OrtValue
+  /// @{
+
+  /** \brief Get type and shape information from a tensor ::OrtValue
+   *
+   * \param[in] value Must be a tensor (not a map/sequence/etc) or will return failure
+   * \param[out] out Newly created ::OrtTensorTypeAndShapeInfo. Must be freed with OrtApi::ReleaseTensorTypeAndShapeInfo
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(GetTensorTypeAndShape, _In_ const OrtValue* value, _Outptr_ OrtTensorTypeAndShapeInfo** out);
+
+  /** \brief Get type information of an OrtValue
+   *
+   * \param[in] value
+   * \param[out] out Newly created ::OrtTypeInfo. Must be freed with OrtApi::ReleaseTypeInfo
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(GetTypeInfo, _In_ const OrtValue* value, _Outptr_result_maybenull_ OrtTypeInfo** out);
+
+  /** \brief Get ONNXType of an ::OrtValue
+   *
+   * \param[in] value
+   * \param[out] out
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(GetValueType, _In_ const OrtValue* value, _Out_ enum ONNXType* out);
+
+  /// @}
+  /// \name OrtMemoryInfo
+  /// @{
+
+  /** \brief Create an ::OrtMemoryInfo
+   *
+   * \param[in] name
+   * \param[in] type
+   * \param[in] id
+   * \param[in] mem_type
+   * \param[out] out Newly created ::OrtMemoryInfo. Must be freed with OrtAPi::ReleaseMemoryInfo
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(CreateMemoryInfo, _In_ const char* name, enum OrtAllocatorType type, int id,
+                  enum OrtMemType mem_type, _Outptr_ OrtMemoryInfo** out);
+
+  /** \brief Create an ::OrtMemoryInfo for CPU memory
+   *
+   * Special case version of OrtApi::CreateMemoryInfo for CPU based memory. Same as using OrtApi::CreateMemoryInfo with name = "Cpu" and id = 0.
+   *
+   * \param[in] type
+   * \param[in] mem_type
+   * \param[out] out
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(CreateCpuMemoryInfo, enum OrtAllocatorType type, enum OrtMemType mem_type,
+                  _Outptr_ OrtMemoryInfo** out);
+
+  /** \brief Compare ::OrtMemoryInfo objects for equality
+   *
+   * Compares all settings of each ::OrtMemoryInfo for equality
+   *
+   * \param[in] info1
+   * \param[in] info2
+   * \param[out] out Set to 0 if equal, -1 if not equal
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(CompareMemoryInfo, _In_ const OrtMemoryInfo* info1, _In_ const OrtMemoryInfo* info2, _Out_ int* out);
+
+  /** \brief Get name from ::OrtMemoryInfo
+   *
+   * \param[in] ptr
+   * \param[out] out Writes null terminated string to this pointer. Do NOT free the returned pointer. It is valid for the lifetime of the ::OrtMemoryInfo
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(MemoryInfoGetName, _In_ const OrtMemoryInfo* ptr, _Out_ const char** out);
+
+  /** \brief Get the id from ::OrtMemoryInfo
+   */
+  ORT_API2_STATUS(MemoryInfoGetId, _In_ const OrtMemoryInfo* ptr, _Out_ int* out);
+
+  /** \brief Get the ::OrtMemType from ::OrtMemoryInfo
+   */
+  ORT_API2_STATUS(MemoryInfoGetMemType, _In_ const OrtMemoryInfo* ptr, _Out_ OrtMemType* out);
+
+  /** \brief Get the ::OrtAllocatorType from ::OrtMemoryInfo
+   */
+  ORT_API2_STATUS(MemoryInfoGetType, _In_ const OrtMemoryInfo* ptr, _Out_ OrtAllocatorType* out);
+
+  /// @}
+  /// \name OrtAllocator
+  /// @{
+
+  /// \brief Calls OrtAllocator::Alloc function
+  ORT_API2_STATUS(AllocatorAlloc, _Inout_ OrtAllocator* ort_allocator, size_t size, _Outptr_ void** out);
+  /// \brief Calls OrtAllocator::Free function
+  ORT_API2_STATUS(AllocatorFree, _Inout_ OrtAllocator* ort_allocator, void* p);
+  /// \brief Calls OrtAllocator::Info function
+  ORT_API2_STATUS(AllocatorGetInfo, _In_ const OrtAllocator* ort_allocator, _Outptr_ const struct OrtMemoryInfo** out);
+
+  /** \brief Get the default allocator
+   *
+   * The default allocator is a CPU based, non-arena. Always returns the same pointer to the same default allocator.
+   *
+   * \param[out] out Returned value should NOT be freed
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(GetAllocatorWithDefaultOptions, _Outptr_ OrtAllocator** out);
+
+  /// @}
+  /// \name OrtSessionOptions
+  /// @{
+
+  /** \brief Override session symbolic dimensions
+   *
+   * Override symbolic dimensions (by specific denotation strings) with actual values if known at session initialization time to enable
+   * optimizations that can take advantage of fixed values (such as memory planning, etc)
+   *
+   * \param[in] options
+   * \param[in] dim_denotation
+   * \param[in] dim_value
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(AddFreeDimensionOverride, _Inout_ OrtSessionOptions* options, _In_ const char* dim_denotation,
+                  _In_ int64_t dim_value);
+
+  /// @}
+  /// \name OrtValue
+  /// @{
+
+  /* Internal information (not seen in Doxygen)
+   *
+   * APIs to support non-tensor types - map and sequence.
+   * Currently only the following types are supported
+   * Note: the following types should be kept in sync with data_types.h
+   * Map types
+   * =========
+   * std::map<std::string, std::string>
+   * std::map<std::string, int64_t>
+   * std::map<std::string, float>
+   * std::map<std::string, double>
+   * std::map<int64_t, std::string>
+   * std::map<int64_t, int64_t>
+   * std::map<int64_t, float>
+   * std::map<int64_t, double>
+   *
+   * Sequence types
+   * ==============
+   * std::vector<std::string>
+   * std::vector<int64_t>
+   * std::vector<float>
+   * std::vector<double>
+   * std::vector<std::map<std::string, float>>
+   * std::vector<std::map<int64_t, float>
+   */
+
+  /** \brief Get non tensor data from an ::OrtValue
+   *
+   * If `value` is of type ONNX_TYPE_MAP, you need to retrieve the keys and values
+   * separately. Use index=0 to retrieve keys and index=1 to retrieve values.
+   * If `value` is of type ONNX_TYPE_SEQUENCE, use index to retrieve the index'th element
+   * of the sequence.
+   *
+   * \param[in] value
+   * \param[in] index See above for usage based on `value` type
+   * \param[in] allocator Allocator used to allocate ::OrtValue
+   * \param[out] out Created ::OrtValue that holds the element requested. Must be freed with OrtApi::ReleaseValue
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(GetValue, _In_ const OrtValue* value, int index, _Inout_ OrtAllocator* allocator,
+                  _Outptr_ OrtValue** out);
+
+  /** \brief Get non tensor value count from an ::OrtValue
+   *
+   * If `value` is of type ONNX_TYPE_MAP 2 will always be returned. For ONNX_TYPE_SEQUENCE
+   * the number of elements in the sequence will be returned
+   *
+   * \param[in] value
+   * \param[out] out
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(GetValueCount, _In_ const OrtValue* value, _Out_ size_t* out);
+
+  /** \brief Create a map or sequence ::OrtValue
+   *
+   * To construct a map (ONNX_TYPE_MAP), use num_values = 2 and `in` should be an array of 2 ::OrtValue%s
+   * representing keys and values.<br>
+   *
+   * To construct a sequence (ONNX_TYPE_SEQUENCE), use num_values = N where N is the number of the elements in the
+   * sequence. 'in' should be an array of N ::OrtValue%s.
+   *
+   * \param[in] in See above for details
+   * \param[in] num_values
+   * \param[in] value_type Must be either ONNX_TYPE_MAP or ONNX_TYPE_SEQUENCE
+   * \param[out] out Newly created ::OrtValue. Must be freed with OrtApi::ReleaseValue
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(CreateValue, _In_reads_(num_values) const OrtValue* const* in, size_t num_values,
+                  enum ONNXType value_type, _Outptr_ OrtValue** out);
+
+  /** \brief Create an opaque (custom user defined type) ::OrtValue
+   *
+   * Constructs an ::OrtValue that contains a value of non-standard type created for
+   * experiments or while awaiting standardization. ::OrtValue in this case would contain
+   * an internal representation of the Opaque type. Opaque types are distinguished from
+   * each other by two strings 1) domain and 2) type name. The combination of the two
+   * must be unique, so the type representation is properly identified internally. The combination
+   * must be properly registered from within ORT at both compile/run time or by another API.
+   *
+   * To construct the ::OrtValue pass domain and type names, also a pointer to a data container
+   * the type of which must be known to both ORT and the client program. That data container may or may
+   * not match the internal representation of the Opaque type. The sizeof(data_container) is passed for
+   * verification purposes.
+   *
+   * \param[in] domain_name Null terminated string of the domain name
+   * \param[in] type_name Null terminated string of the type name
+   * \param[in] data_container User pointer Data to populate ::OrtValue
+   * \param[in] data_container_size Size in bytes of what `data_container` points to
+   * \param[out] out Newly created ::OrtValue. Must be freed with OrtApi::ReleaseValue
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(CreateOpaqueValue, _In_z_ const char* domain_name, _In_z_ const char* type_name,
+                  _In_ const void* data_container, size_t data_container_size, _Outptr_ OrtValue** out);
+
+  /** \brief Get internal data from an opaque (custom user defined type) ::OrtValue
+   *
+   * Copies internal data from an opaque value into a user provided buffer
+   *
+   * \see OrtApi::CreateOpaqueValue
+   *
+   * \param[in] domain_name Null terminated string of the domain name
+   * \param[in] type_name Null terminated string of the type name
+   * \param[in] in The opaque ::OrtValue
+   * \param[out] data_container Buffer to copy data into
+   * \param[out] data_container_size Size in bytes of the buffer pointed to by data_container. Must match the size of the internal buffer.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(GetOpaqueValue, _In_ const char* domain_name, _In_ const char* type_name, _In_ const OrtValue* in,
+                  _Out_ void* data_container, size_t data_container_size);
+
+  /// @}
+  /// \name OrtKernelInfo
+  /// Custom operator APIs.
+  /// @{
+
+  /** \brief Get a float stored as an attribute in the graph node
+   *
+   * \param[in] info ::OrtKernelInfo instance
+   * \param[in] name Null terminated string of the name of the attribute
+   * \param[out] out Pointer to memory where the attribute will be stored
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(KernelInfoGetAttribute_float, _In_ const OrtKernelInfo* info, _In_ const char* name,
+                  _Out_ float* out);
+
+  /** \brief Fetch a 64-bit int stored as an attribute in the graph node
+   *
+   * \param[in] info ::OrtKernelInfo instance
+   * \param[in] name Null terminated string of the name of the attribute
+   * \param[out] out Pointer to memory where the attribute will be stored
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(KernelInfoGetAttribute_int64, _In_ const OrtKernelInfo* info, _In_ const char* name,
+                  _Out_ int64_t* out);
+
+  /** \brief Fetch a string stored as an attribute in the graph node
+   *
+   * If `out` is nullptr, the value of `size` is set to the true size of the string
+   * attribute, and a success status is returned.
+   *
+   * If the `size` parameter is greater than or equal to the actual string attribute's size,
+   * the value of `size` is set to the true size of the string attribute, the provided memory
+   * is filled with the attribute's contents, and a success status is returned.
+   *
+   * If the `size` parameter is less than the actual string attribute's size and `out`
+   * is not nullptr, the value of `size` is set to the true size of the string attribute
+   * and a failure status is returned.)
+   *
+   * \param[in] info ::OrtKernelInfo instance
+   * \param[in] name Null terminated string of the name of the attribute
+   * \param[out] out Pointer to memory where the attribute will be stored
+   * \param[in,out] size See above comments for details
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(KernelInfoGetAttribute_string, _In_ const OrtKernelInfo* info, _In_ const char* name, _Out_ char* out,
+                  _Inout_ size_t* size);
+
+  /// @}
+  /// \name OrtKernelContext
+  /// Custom operator APIs.
+  /// @{
+
+  /** \brief Used for custom operators, get the input count of a kernel
+   *
+   * \see ::OrtCustomOp
+   */
+  ORT_API2_STATUS(KernelContext_GetInputCount, _In_ const OrtKernelContext* context, _Out_ size_t* out);
+
+  /** \brief Used for custom operators, get the output count of a kernel
+   *
+   * \see ::OrtCustomOp
+   */
+  ORT_API2_STATUS(KernelContext_GetOutputCount, _In_ const OrtKernelContext* context, _Out_ size_t* out);
+
+  /** \brief Used for custom operators, get an input of a kernel
+   *
+   * The function attempts fetches the input of the kernel. If the input is optional
+   * and not present, the function returns success and out is set to nullptr.
+   *
+   * \param[in] context ::OrtKernelContext instance
+   * \param[in] index See KernelContext_GetInputCount for boundaries check.
+   * \param[out] out OrtValue if the input is present otherwise is set nullptr
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(KernelContext_GetInput, _In_ const OrtKernelContext* context, _In_ size_t index,
+                  _Out_ const OrtValue** out);
+
+  /** \brief Used for custom operators, get an output of a kernel
+   *
+   * The function attempts fetches the output of the kernel. If the output is optional
+   * and not present, the function returns success and out is set to nullptr.
+   *
+   * \param[in] context ::OrtKernelContext instance
+   * \param[in] index See KernelContext_GetOutputCount for boundaries check.
+   * \param[in] dim_values output dimensions
+   * \param[in] dim_count number of dimensions
+   * \param[out] out a ptr to OrtValue to output otherwise set to nullptr
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(KernelContext_GetOutput, _Inout_ OrtKernelContext* context, _In_ size_t index,
+                  _In_ const int64_t* dim_values, size_t dim_count, _Outptr_ OrtValue** out);
+
+  /// @}
+  /// \name OrtEnv
+  /// @{
+  ORT_CLASS_RELEASE(Env);
+  /// @}
+  /// \name OrtStatus
+  /// @{
+  ORT_CLASS_RELEASE(Status);
+  /// @}
+  /// \name OrtMemoryInfo
+  /// @{
+  ORT_CLASS_RELEASE(MemoryInfo);
+  /// @}
+  /// \name OrtSession
+  /// @{
+  ORT_CLASS_RELEASE(Session);  // Don't call ReleaseSession from Dllmain (because session owns a thread pool)
+  /// @}
+  /// \name OrtValue
+  /// @{
+  ORT_CLASS_RELEASE(Value);
+  /// @}
+  /// \name OrtRunOptions
+  /// @{
+  ORT_CLASS_RELEASE(RunOptions);
+  /// @}
+  /// \name OrtTypeInfo
+  /// @{
+  ORT_CLASS_RELEASE(TypeInfo);
+  /// @}
+  /// \name OrtTensorTypeAndShapeInfo
+  /// @{
+  ORT_CLASS_RELEASE(TensorTypeAndShapeInfo);
+  /// @}
+  /// \name OrtSessionOptions
+  /// @{
+  ORT_CLASS_RELEASE(SessionOptions);
+  /// @}
+  /// \name OrtCustomOpDomain
+  /// @{
+  ORT_CLASS_RELEASE(CustomOpDomain);
+
+  /// @}
+  /// \name OrtTypeInfo
+  /// @{
+
+  /** \brief Get denotation from type information
+   *
+   * Augments ::OrtTypeInfo to return denotations on the type.
+   *
+   * This is used by WinML to determine if an input/output is intended to be an Image or a Tensor.
+   *
+   * \param[in] type_info
+   * \param[out] denotation Pointer to the null terminated denotation string is written to this pointer. This pointer is valid until the object is destroyed or the name is changed, do not free.
+   * \param[out] len Length in bytes of the string returned in `denotation`
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(GetDenotationFromTypeInfo, _In_ const OrtTypeInfo* type_info, _Out_ const char** const denotation,
+                  _Out_ size_t* len);
+
+  /** \brief Get detailed map information from an ::OrtTypeInfo
+   *
+   * This augments ::OrtTypeInfo to return an ::OrtMapTypeInfo when the type is a map.
+   * The OrtMapTypeInfo has additional information about the map's key type and value type.
+   *
+   * This is used by WinML to support model reflection APIs.
+   *
+   * \param[out] type_info
+   * \param[out] out A pointer to the ::OrtMapTypeInfo. Do not free this value. If type_info
+   *             does not contain a map, this value will be set to nullptr.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(CastTypeInfoToMapTypeInfo, _In_ const OrtTypeInfo* type_info,
+                  _Outptr_result_maybenull_ const OrtMapTypeInfo** out);
+
+  /** \brief Cast ::OrtTypeInfo to an ::OrtSequenceTypeInfo
+   *
+   * This api augments ::OrtTypeInfo to return an ::OrtSequenceTypeInfo when the type is a sequence.
+   * The ::OrtSequenceTypeInfo has additional information about the sequence's element type.
+   *
+   * This is used by WinML to support model reflection APIs.
+   *
+   * \param[in] type_info
+   * \param[out] out A pointer to the OrtSequenceTypeInfo. Do not free this value. If type_info
+   *             doesn not contain a sequence, this value will be set to nullptr.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(CastTypeInfoToSequenceTypeInfo, _In_ const OrtTypeInfo* type_info,
+                  _Outptr_result_maybenull_ const OrtSequenceTypeInfo** out);
+
+  /// @}
+  /// \name OrtMapTypeInfo
+  /// @{
+
+  /** \brief Get key type from an ::OrtMapTypeInfo
+   *
+   * Key types are restricted to being scalar types.
+   *
+   * This is used by WinML to support model reflection APIs.
+   *
+   * \param[in] map_type_info
+   * \param[out] out
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(GetMapKeyType, _In_ const OrtMapTypeInfo* map_type_info, _Out_ enum ONNXTensorElementDataType* out);
+
+  /** \brief Get the value type from an ::OrtMapTypeInfo
+   *
+   * \param[in] map_type_info
+   * \param[out] type_info A copy of the OrtTypeInfo for the map value type.
+   *                       The user must free this value with ReleaseTypeInfo.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(GetMapValueType, _In_ const OrtMapTypeInfo* map_type_info, _Outptr_ OrtTypeInfo** type_info);
+
+  /// @}
+  /// \name OrtSequenceTypeInfo
+  /// @{
+
+  /** \brief Get element type from an ::OrtSequenceTypeInfo
+   *
+   * This is used by WinML to support model reflection APIs.
+   *
+   * \param[in] sequence_type_info
+   * \param[out] type_info A copy of the OrtTypeInfo for the sequence element type.
+   *                       The user must free this value with ReleaseTypeInfo.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(GetSequenceElementType, _In_ const OrtSequenceTypeInfo* sequence_type_info,
+                  _Outptr_ OrtTypeInfo** type_info);
+
+  /// @}
+  /// \name OrtMapTypeInfo
+  /// @{
+  ORT_CLASS_RELEASE(MapTypeInfo);
+  /// @}
+  /// \name OrtSequenceTypeInfo
+  /// @{
+  ORT_CLASS_RELEASE(SequenceTypeInfo);
+
+  /// @}
+  /// \name OrtSession
+  /// @{
+
+  /** \brief End profiling and return filename of the profile data
+   *
+   * Profiling is turned on through OrtApi::EnableProfiling
+   *
+   * \param[in] session
+   * \param[in] allocator
+   * \param[out] out Null terminated string of the filename, allocated using `allocator`. Must be freed using `allocator`
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(SessionEndProfiling, _In_ OrtSession* session, _Inout_ OrtAllocator* allocator, _Outptr_ char** out);
+
+  /** \brief Get ::OrtModelMetadata from an ::OrtSession
+   *
+   * \param[in] session
+   * \param[out] out Newly created ::OrtModelMetadata. Must be freed using OrtApi::ReleaseModelMetadata
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(SessionGetModelMetadata, _In_ const OrtSession* session, _Outptr_ OrtModelMetadata** out);
+
+  /// @}
+  /// \name OrtModelMetadata
+  /// @{
+
+  /** \brief Get `producer name` from an ::OrtModelMetadata
+   *
+   * \param[in] model_metadata
+   * \param[in] allocator
+   * \param[out] value Set to a null terminated string allocated using `allocator`. Must be freed using `allocator`
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(ModelMetadataGetProducerName, _In_ const OrtModelMetadata* model_metadata,
+                  _Inout_ OrtAllocator* allocator, _Outptr_ char** value);
+
+  /** \brief Get `graph name` from an ::OrtModelMetadata
+   *
+   * \param[in] model_metadata
+   * \param[in] allocator
+   * \param[out] value Set to a null terminated string allocated using `allocator`. Must be freed using `allocator`
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(ModelMetadataGetGraphName, _In_ const OrtModelMetadata* model_metadata,
+                  _Inout_ OrtAllocator* allocator, _Outptr_ char** value);
+
+  /** \brief Get `domain` from an ::OrtModelMetadata
+   *
+   * \param[in] model_metadata
+   * \param[in] allocator
+   * \param[out] value Set to a null terminated string allocated using `allocator`. Must be freed using `allocator`
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(ModelMetadataGetDomain, _In_ const OrtModelMetadata* model_metadata, _Inout_ OrtAllocator* allocator,
+                  _Outptr_ char** value);
+
+  /** \brief Get `description` from an ::OrtModelMetadata
+   *
+   * \param[in] model_metadata
+   * \param[in] allocator
+   * \param[out] value Set to a null terminated string allocated using `allocator`. Must be freed using `allocator`
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(ModelMetadataGetDescription, _In_ const OrtModelMetadata* model_metadata,
+                  _Inout_ OrtAllocator* allocator, _Outptr_ char** value);
+
+  /** \brief Return data for a key in the custom metadata map in an ::OrtModelMetadata
+   *
+   * \param[in] model_metadata
+   * \param[in] allocator
+   * \param[in] key Null terminated string
+   * \param[out] value Set to a null terminated string allocated using `allocator`. Must be freed using `allocator`
+   * `value` will be set to nullptr if the given key is not found in the custom metadata map.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(ModelMetadataLookupCustomMetadataMap, _In_ const OrtModelMetadata* model_metadata,
+                  _Inout_ OrtAllocator* allocator, _In_ const char* key, _Outptr_result_maybenull_ char** value);
+
+  /** \brief Get version number from an ::OrtModelMetadata
+   *
+   * \param[in] model_metadata
+   * \param[out] value Set to the version number
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(ModelMetadataGetVersion, _In_ const OrtModelMetadata* model_metadata, _Out_ int64_t* value);
+
+  ORT_CLASS_RELEASE(ModelMetadata);
+
+  /// @}
+  /// \name OrtEnv
+  /// @{
+
+  /** \brief Create an OrtEnv
+   *
+   * Create an environment with global threadpools that will be shared across sessions.
+   * Use this in conjunction with OrtApi::DisablePerSessionThreads or else the session will use
+   * its own thread pools.
+   *
+   * \param[in] log_severity_level The log severity level.
+   * \param[in] logid The log identifier.
+   * \param[in] tp_options
+   * \param[out] out Returned newly created OrtEnv. Must be freed with OrtApi::ReleaseEnv
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(CreateEnvWithGlobalThreadPools, OrtLoggingLevel log_severity_level, _In_ const char* logid,
+                  _In_ const OrtThreadingOptions* tp_options, _Outptr_ OrtEnv** out);
+
+  /// @}
+  /// \name OrtSessionOptions
+  /// @{
+
+  /** \brief Use global thread pool on a session
+   *
+   * Disable using per session thread pool and use the shared global threadpool.
+   * This should be used in conjunction with OrtApi::CreateEnvWithGlobalThreadPools.
+   *
+   * \param[in] options
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(DisablePerSessionThreads, _Inout_ OrtSessionOptions* options);
+
+  /// @}
+  /// \name OrtThreadingOptions
+  /// @{
+
+  /** \brief Create an ::OrtThreadingOptions
+   *
+   * \param[out] out Newly created ::OrtThreadingOptions. Must be freed with OrtApi::ReleaseThreadingOptions
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(CreateThreadingOptions, _Outptr_ OrtThreadingOptions** out);
+
+  ORT_CLASS_RELEASE(ThreadingOptions);
+
+  /// @}
+  /// \name OrtModelMetadata
+  /// @{
+
+  /**
+   *
+   * \param[in] model_metadata
+   * \param[in] allocator
+   * \param[out] keys Array of null terminated strings (array count = num_keys) allocated using `allocator`.
+   *  The strings and the pointer array must be freed using `allocator`
+   *  `keys` will be set to nullptr if the custom metadata map is empty.
+   * \param[out] num_keys Set to the number of elements in the `keys` array
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(ModelMetadataGetCustomMetadataMapKeys, _In_ const OrtModelMetadata* model_metadata,
+                  _Inout_ OrtAllocator* allocator, _Outptr_result_buffer_maybenull_(*num_keys) char*** keys, _Out_ int64_t* num_keys);
+
+  /// @}
+  /// \name OrtSessionOptions
+  /// @{
+
+  /**
+   *
+   * Override symbolic dimensions (by specific name strings) with actual values
+   * if known at session initialization time to enable optimizations that can
+   * take advantage of fixed values (such as memory planning, etc)
+   *
+   */
+  ORT_API2_STATUS(AddFreeDimensionOverrideByName,
+                  _Inout_ OrtSessionOptions* options, _In_ const char* dim_name,
+                  _In_ int64_t dim_value);
+
+  /// @}
+  /// \name Misc
+  /// @{
+
+  /** \brief Get the names of all available providers
+   *
+   * \note The providers in the list are not guaranteed to be usable. They may fail to load due to missing system dependencies.
+   *    For example, if the CUDA/cuDNN libraries are not installed, the CUDA provider will report an error when it is added to the session options.
+   *
+   * \param[out] out_ptr Set to a pointer to an array of null terminated strings of the available providers. The entries and the
+   *    array itself must be freed using OrtApi::ReleaseAvailableProviders
+   * \param[out] provider_length Set to the number of entries in the `out_ptr` array
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(GetAvailableProviders, _Outptr_ char*** out_ptr, _Out_ int* provider_length);
+
+  /** \brief Release data from OrtApi::GetAvailableProviders. This API will never fail
+   * so you can rely on it in a noexcept code.
+   *
+   * \param[in] ptr The `out_ptr` result from OrtApi::GetAvailableProviders.
+   * \param[in] providers_length The `provider_length` result from OrtApi::GetAvailableProviders
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(ReleaseAvailableProviders, _In_ char** ptr,
+                  _In_ int providers_length);
+
+  /// @}
+  /// \name OrtValue
+  /// @{
+
+  /** \brief Get the length of a single string in a string tensor
+   *
+   * \param[in] value A string tensor
+   * \param[in] index Index of the string in the tensor
+   * \param[out] out Set to number of bytes of the string element
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(GetStringTensorElementLength, _In_ const OrtValue* value, size_t index, _Out_ size_t* out);
+
+  /** \brief Get a single string from a string tensor
+   *
+   * \param[in] value A string tensor
+   * \param[in] s_len Number of bytes in the `s` buffer. Must match the value returned by OrtApi::GetStringTensorElementLength.
+   * \param[in] index Index of the string in the tensor
+   * \param[out] s The string element contents in UTF-8 encoding. The string is NOT null-terminated.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(GetStringTensorElement, _In_ const OrtValue* value, size_t s_len, size_t index, _Out_writes_bytes_all_(s_len) void* s);
+
+  /** \brief Set a single string in a string tensor
+   *
+   * \param[in] value A string tensor
+   * \param[in] s A null terminated UTF-8 encoded string
+   * \param[in] index Index of the string in the tensor to set
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(FillStringTensorElement, _Inout_ OrtValue* value, _In_ const char* s, size_t index);
+
+  /// @}
+  /// \name OrtSessionOptions
+  /// @{
+
+  /** \brief Set a session configuration entry as a pair of strings
+   *
+   * If a configuration with same key exists, this will overwrite the configuration with the given config_value.
+   *
+   * The config_key and the format of config_value are defined in onnxruntime_session_options_config_keys.h
+   *
+   * \param[in] options
+   * \param[in] config_key A null terminated string representation of the config key
+   * \param[in] config_value A null terminated string representation of the config value
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(AddSessionConfigEntry, _Inout_ OrtSessionOptions* options,
+                  _In_z_ const char* config_key, _In_z_ const char* config_value);
+
+  /// @}
+  /// \name OrtAllocator
+  /// @{
+
+  /** \brief Create an allocator for an ::OrtSession following an ::OrtMemoryInfo
+   *
+   * \param[in] session
+   * \param[in] mem_info valid ::OrtMemoryInfo instance
+   * \param[out] out Newly created ::OrtAllocator. Must be freed with OrtApi::ReleaseAllocator
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(CreateAllocator, _In_ const OrtSession* session, _In_ const OrtMemoryInfo* mem_info,
+                  _Outptr_ OrtAllocator** out);
+
+  /** \brief Release an ::OrtAllocator obtained from OrtApi::CreateAllocator
+   */
+  ORT_CLASS_RELEASE(Allocator);
+
+  /// @}
+  /// \name OrtSession
+  /// @{
+
+  /** \brief Run a model using Io Bindings for the inputs & outputs
+   *
+   * \see OrtApi::Run
+   *
+   * \param[in] session
+   * \param[in] run_options
+   * \param[in] binding_ptr
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(RunWithBinding, _Inout_ OrtSession* session, _In_ const OrtRunOptions* run_options, _In_ const OrtIoBinding* binding_ptr);
+
+  /** \brief Create an ::OrtIoBinding instance
+   *
+   * An IoBinding object allows one to bind pre-allocated ::OrtValue%s to input names.
+   * Thus if you want to use a raw on device buffer as input or output you can avoid
+   * extra copy during runtime.
+   *
+   * \param[in] session
+   * \param[out] out Newly created ::OrtIoBinding. Must be freed with OrtApi::ReleaseIoBinding
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(CreateIoBinding, _Inout_ OrtSession* session, _Outptr_ OrtIoBinding** out);
+
+  /// @}
+  /// \name OrtIoBinding
+  /// @{
+
+  /** \brief Release an ::OrtIoBinding obtained from OrtApi::CreateIoBinding
+   */
+  ORT_CLASS_RELEASE(IoBinding);
+
+  /** \brief Bind an ::OrtValue to an ::OrtIoBinding input
+   *
+   * When using OrtApi::RunWithBinding this value is used for the named input
+   *
+   * \param[in] binding_ptr
+   * \param[in] name Name for the model input
+   * \param[in] val_ptr ::OrtValue of Tensor type.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(BindInput, _Inout_ OrtIoBinding* binding_ptr, _In_ const char* name, _In_ const OrtValue* val_ptr);
+
+  /** \brief Bind an ::OrtValue to an ::OrtIoBinding output
+   *
+   * When using OrtApi::RunWithBinding this value is used for the named output
+   *
+   * \param[in] binding_ptr
+   * \param[in] name Null terminated string of the model output name
+   * \param[in] val_ptr ::OrtValue of Tensor type.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(BindOutput, _Inout_ OrtIoBinding* binding_ptr, _In_ const char* name, _In_ const OrtValue* val_ptr);
+
+  /** \brief Bind an ::OrtIoBinding output to a device
+   *
+   * Binds the ::OrtValue to a device which is specified by ::OrtMemoryInfo.
+   * You can either create an instance of ::OrtMemoryInfo with a device id or obtain one from the allocator that you have created/are using
+   * This is useful when one or more outputs have dynamic shapes and, it is hard to pre-allocate and bind a chunk of
+   * memory within ::OrtValue ahead of time.
+   *
+   * \see OrtApi::RunWithBinding
+   *
+   * \param[in] binding_ptr
+   * \param[in] name Null terminated string of the device name
+   * \param[in] mem_info_ptr
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(BindOutputToDevice, _Inout_ OrtIoBinding* binding_ptr, _In_ const char* name, _In_ const OrtMemoryInfo* mem_info_ptr);
+
+  /** \brief Get the names of an ::OrtIoBinding's outputs
+   *
+   * Returns the names of the outputs in the order they were bound. This is useful after running the model
+   * with bound outputs because the returned names are in order in which output ::OrtValue are returned. This is useful if
+   * the order of outputs and their names is not known.
+   *
+   * \param[in] binding_ptr
+   * \param[in] allocator Allocator used to allocate continuous buffers for output strings and lengths.
+   * \param[out] buffer Returns an array of non-null terminated UTF-8 strings. The number of strings stored is returned in the count parameter.
+   *   This buffer is allocated using `allocator` and must be freed using it.
+   * \param[out] lengths Returns an array of `count` lengths of the strings returned in `buffer`
+   *   This buffer is allocated using `allocator` and must be freed using it.
+   * \param[out] count Number of strings returned. If `binding_ptr` has no bound outputs, zero is returned,
+   *              no memory allocation is performed and buffer and lengths are set to nullptr.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(GetBoundOutputNames, _In_ const OrtIoBinding* binding_ptr, _In_ OrtAllocator* allocator,
+                  _Out_ char** buffer, _Out_writes_all_(count) size_t** lengths, _Out_ size_t* count);
+
+  /** \brief Get the output ::OrtValue objects from an ::OrtIoBinding
+   *
+   * Returns an array of pointers to individually allocated ::OrtValue%s that contain results of a model execution with OrtApi::RunWithBinding
+   * The array contains the same number of ::OrtValue%s and they are in the same order as they were bound with OrtApi::BindOutput
+   * or OrtApi::BindOutputToDevice.
+   *
+   * The returned ::OrtValue%s must be released using OrtApi::ReleaseValue after they are no longer needed.
+   * The array is allocated using the specified instance of the allocator and must be freed using the same allocator after
+   * all the ::OrtValue%s contained therein are individually released.
+   *
+   * \param[in] binding_ptr
+   * \param[in] allocator Allocator used to allocate output array
+   * \param[out] output Set to the allocated array of allocated ::OrtValue outputs. Set to nullptr if there are 0 outputs.
+   * \param[out] output_count Set to number of ::OrtValue%s returned
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(GetBoundOutputValues, _In_ const OrtIoBinding* binding_ptr, _In_ OrtAllocator* allocator,
+                  _Out_writes_all_(output_count) OrtValue*** output, _Out_ size_t* output_count);
+
+  /** \brief Clears any previously set Inputs for an ::OrtIoBinding
+   */
+  void(ORT_API_CALL* ClearBoundInputs)(_Inout_ OrtIoBinding* binding_ptr) NO_EXCEPTION ORT_ALL_ARGS_NONNULL;
+
+  /** \brief Clears any previously set Outputs for an ::OrtIoBinding
+   */
+  void(ORT_API_CALL* ClearBoundOutputs)(_Inout_ OrtIoBinding* binding_ptr) NO_EXCEPTION ORT_ALL_ARGS_NONNULL;
+
+  /// @}
+  /// \name OrtValue
+  /// @{
+
+  /** \brief Direct memory access to a specified tensor element
+   *
+   * For example, given a tensor with shape of [3,224,224], a pointer to the element at location [2,150,128] can be retrieved
+   *
+   * This function only works for numeric type tensors (No strings, etc).
+   * This is a no-copy method whose returned pointer is valid until the passed in ::OrtValue is free'd.
+   *
+   * \param[in] value
+   * \param[in] location_values Pointer to an array of index values that specify an element's location relative to its shape
+   * \param[in] location_values_count Number of elements in location_values. Must match the number of elements in the tensor's shape.
+   * \param[out] out Set to a pointer to the element specified
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(TensorAt, _Inout_ OrtValue* value, const int64_t* location_values, size_t location_values_count, _Outptr_ void** out);
+
+  /// @}
+  /// \name OrtEnv
+  /// @{
+
+  /** \brief Create an allocator and register it with the ::OrtEnv
+   *
+   * Enables sharing the allocator between multiple sessions that use the same env instance.
+   * Lifetime of the created allocator will be valid for the duration of the environment.
+   * Returns an error if an allocator with the same ::OrtMemoryInfo is already registered.
+   *
+   * See https://onnxruntime.ai/docs/get-started/with-c.html for details.
+   *
+   * \param[in] env ::OrtEnv instance
+   * \param[in] mem_info
+   * \param[in] arena_cfg Pass nullptr for defaults
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(CreateAndRegisterAllocator, _Inout_ OrtEnv* env, _In_ const OrtMemoryInfo* mem_info,
+                  _In_ const OrtArenaCfg* arena_cfg);
+
+  /** \brief Set language projection
+   *
+   * Set the language projection for collecting telemetry data when Env is created.
+   *
+   * The default is ORT_PROJECTION_C, which means it will classify the language not in the list to C also.
+   *
+   * \param[in] ort_env
+   * \param[in] projection
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(SetLanguageProjection, _In_ const OrtEnv* ort_env, _In_ OrtLanguageProjection projection);
+
+  /// @}
+  /// \name OrtSession
+  /// @{
+
+  /** \brief Return the time that profiling was started
+   *
+   * \note The timer precision varies per platform. On Windows and MacOS, the precision will be ~100ns
+   *
+   * \param[in] session
+   * \param[out] out nanoseconds of profiling's start time
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(SessionGetProfilingStartTimeNs, _In_ const OrtSession* session, _Outptr_ uint64_t* out);
+
+  /// @}
+  /// \name OrtThreadingOptions
+  /// @{
+
+  /** \brief Set global intra-op thread count
+   *
+   * This configures the global thread pool options to be used in the call to OrtApi::CreateEnvWithGlobalThreadPools
+   *
+   * \param[in] tp_options
+   * \param[in] intra_op_num_threads Number of threads, special values:<br>
+   *    0 = Use default thread count<br>
+   *    1 = The invoking thread will be used; no threads will be created in the thread pool.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(SetGlobalIntraOpNumThreads, _Inout_ OrtThreadingOptions* tp_options, int intra_op_num_threads);
+
+  /** \brief Set global inter-op thread count
+   *
+   * This configures the global thread pool options to be used in the call to OrtApi::CreateEnvWithGlobalThreadPools
+   *
+   * \param[in] tp_options
+   * \param[in] inter_op_num_threads Number of threads, special values:<br>
+   *    0 = Use default thread count<br>
+   *    1 = The invoking thread will be used; no threads will be created in the thread pool.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(SetGlobalInterOpNumThreads, _Inout_ OrtThreadingOptions* tp_options, int inter_op_num_threads);
+
+  /** \brief Set global spin control options
+   *
+   * This will configure the global thread pool options to be used in the call to OrtApi::CreateEnvWithGlobalThreadPools.
+   * Allow spinning of thread pools when their queues are empty. This will set the value for both
+   * inter_op and intra_op threadpools.
+   *
+   * \param[in] tp_options
+   * \param[in] allow_spinning Valid values are 0 or 1.<br>
+   *   0 = It won't spin (recommended if CPU usage is high)<br>
+   *   1 = Threadpool will spin to wait for queue to become non-empty
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(SetGlobalSpinControl, _Inout_ OrtThreadingOptions* tp_options, int allow_spinning);
+
+  /// @}
+  /// \name OrtSessionOptions
+  /// @{
+
+  /** \brief Add a pre-allocated initializer to a session
+   *
+   * If a model contains an initializer with a name that is same as the name passed to this call,
+   * ORT will use this initializer instance instead of deserializing one from the model file. This
+   * is useful when you want to share the same initializer across sessions.
+   *
+   * \param[in] options
+   * \param[in] name Null terminated string of the initializer name
+   * \param[in] val ::OrtValue containing the initializer. Its lifetime and the underlying initializer buffer must be
+   *   managed by the user (created using the OrtApi::CreateTensorWithDataAsOrtValue) and it must outlive the session object
+   *   to which it is added.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(AddInitializer, _Inout_ OrtSessionOptions* options, _In_z_ const char* name,
+                  _In_ const OrtValue* val);
+
+  /// @}
+  /// \name OrtEnv
+  /// @{
+
+  /**
+   * Create a custom environment with global threadpools and logger that will be shared across sessions.
+   * Use this in conjunction with OrtApi::DisablePerSessionThreads or else the session will use
+   * its own thread pools.
+   *
+   * \param[in] logging_function A pointer to a logging function.
+   * \param[in] logger_param A pointer to arbitrary data passed as the ::OrtLoggingFunction `param` parameter to
+   *                         `logging_function`.
+   * \param[in] log_severity_level The log severity level.
+   * \param[in] logid The log identifier.
+   * \param[in] tp_options
+   * \param[out] out Newly created OrtEnv. Must be freed with OrtApi::ReleaseEnv
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(CreateEnvWithCustomLoggerAndGlobalThreadPools, OrtLoggingFunction logging_function, _In_opt_ void* logger_param, OrtLoggingLevel log_severity_level,
+                  _In_ const char* logid, _In_ const struct OrtThreadingOptions* tp_options, _Outptr_ OrtEnv** out);
+
+  /// @}
+  /// \name OrtSessionOptions
+  /// @{
+
+  /** \brief Append CUDA provider to session options
+   *
+   * If CUDA is not available (due to a non CUDA enabled build, or if CUDA is not installed on the system), this function will return failure.
+   *
+   * \param[in] options
+   * \param[in] cuda_options
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(SessionOptionsAppendExecutionProvider_CUDA,
+                  _In_ OrtSessionOptions* options, _In_ const OrtCUDAProviderOptions* cuda_options);
+
+  /** \brief Append ROCM execution provider to the session options
+   *
+   * If ROCM is not available (due to a non ROCM enabled build, or if ROCM is not installed on the system), this function will return failure.
+   *
+   * \param[in] options
+   * \param[in] rocm_options
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(SessionOptionsAppendExecutionProvider_ROCM,
+                  _In_ OrtSessionOptions* options, _In_ const OrtROCMProviderOptions* rocm_options);
+
+  /** \brief Append OpenVINO execution provider to the session options
+   *
+   * If OpenVINO is not available (due to a non OpenVINO enabled build, or if OpenVINO is not installed on the system), this function will fail.
+   *
+   * \param[in] options
+   * \param[in] provider_options
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(SessionOptionsAppendExecutionProvider_OpenVINO,
+                  _In_ OrtSessionOptions* options, _In_ const OrtOpenVINOProviderOptions* provider_options);
+
+  /// @}
+  /// \name OrtThreadingOptions
+  /// @{
+
+  /** \brief Set threading flush-to-zero and denormal-as-zero
+   *
+   * Sets global thread pool options to be used in the call to OrtApi::CreateEnvWithGlobalThreadPools.
+   * Flush-to-zero and denormal-as-zero are applied to threads in both intra and inter global thread pool.
+   * \note This option is not needed if the models used have no denormals. Having no denormals is recommended as this option may hurt model accuracy.
+   *
+   * \param[in] tp_options
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(SetGlobalDenormalAsZero, _Inout_ OrtThreadingOptions* tp_options);
+
+  /// @}
+  /// \name OrtArenaCfg
+  /// @{
+
+  /** \deprecated Use OrtApi::CreateArenaCfgV2
+   *
+   * This will create the configuration of an arena that can eventually be used to define an arena based allocator's behavior
+   *
+   * \param[in] max_mem Use 0 to allow ORT to choose the default
+   * \param[in] arena_extend_strategy Use -1 to allow ORT to choose the default, 0 = kNextPowerOfTwo, 1 = kSameAsRequested
+   * \param[in] initial_chunk_size_bytes Use -1 to allow ORT to choose the default
+   * \param[in] max_dead_bytes_per_chunk Use -1 to allow ORT to choose the default
+   * \param[in] out A pointer to an OrtArenaCfg instance
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(CreateArenaCfg, _In_ size_t max_mem, int arena_extend_strategy, int initial_chunk_size_bytes,
+                  int max_dead_bytes_per_chunk, _Outptr_ OrtArenaCfg** out);
+
+  ORT_CLASS_RELEASE(ArenaCfg);
+
+  /// @}
+  /// \name OrtModelMetadata
+  /// @{
+
+  /**
+   * Use this to obtain the description of the graph present in the model
+   * (doc_string field of the GraphProto message within the ModelProto message).
+   * If it doesn't exist, an empty string will be returned.
+   *
+   * \param[in] model_metadata An instance of ::OrtModelMetadata
+   * \param[in] allocator Allocator used to allocate the string that will be returned back
+   * \param[out] value Set to a null terminated string allocated using `allocator`.  The caller is responsible for freeing it using `allocator`
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(ModelMetadataGetGraphDescription, _In_ const OrtModelMetadata* model_metadata,
+                  _Inout_ OrtAllocator* allocator, _Outptr_ char** value);
+
+  /// @}
+  /// \name OrtSessionOptions
+  /// @{
+
+  /** \brief Append TensorRT provider to session options
+   *
+   * If TensorRT is not available (due to a non TensorRT enabled build, or if TensorRT is not installed on the system), this function will return failure.
+   *
+   * \param[in] options
+   * \param[in] tensorrt_options
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(SessionOptionsAppendExecutionProvider_TensorRT,
+                  _In_ OrtSessionOptions* options, _In_ const OrtTensorRTProviderOptions* tensorrt_options);
+
+  /// @}
+  /// \name Misc
+  /// @{
+
+  /** \brief Set current GPU device ID
+   *
+   * Set the current device id of the GPU execution provider (CUDA/tensorrt/rocm). The device id should be less
+   * than the total number of devices available. This is only useful when multiple-GPUs are installed and it is
+   * required to restrict execution to a single GPU.
+   *
+   * \param[in] device_id
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(SetCurrentGpuDeviceId, _In_ int device_id);
+
+  /** \brief Get current GPU device ID
+   *
+   * Get the current device id of the GPU execution provider (CUDA/tensorrt/rocm).
+   *
+   * \see OrtApi::SetCurrentGpuDeviceId
+   *
+   * \param[out] device_id
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(GetCurrentGpuDeviceId, _In_ int* device_id);
+
+  /// @}
+  /// \name OrtKernelInfo
+  /// Custom operator APIs.
+  /// @{
+
+  /** \brief Fetch an array of int64_t values stored as an attribute in the graph node
+   *
+   *
+   * If `out` is nullptr, the value of `size` is set to the true size of the attribute
+   * array's size, and a success status is returned.
+   *
+   * If the `size` parameter is greater than or equal to the actual attribute array's size,
+   * the value of `size` is set to the true size of the attribute array's size,
+   * the provided memory is filled with the attribute's contents,
+   * and a success status is returned.
+   *
+   * If the `size` parameter is less than the actual attribute array's size and `out`
+   * is not nullptr, the value of `size` is set to the true size of the attribute array's size
+   * and a failure status is returned.)
+   *
+   * \param[in] info instance
+   * \param[in] name name of the attribute to be parsed
+   * \param[out] out pointer to memory where the attribute's contents are to be stored
+   * \param[in, out] size actual size of attribute array
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(KernelInfoGetAttributeArray_float, _In_ const OrtKernelInfo* info, _In_ const char* name,
+                  _Out_ float* out, _Inout_ size_t* size);
+
+  /** \brief Fetch an array of int64_t values stored as an attribute in the graph node
+   *
+   * If `out` is nullptr, the value of `size` is set to the true size of the attribute
+   * array's size, and a success status is returned.
+   *
+   * If the `size` parameter is greater than or equal to the actual attribute array's size,
+   * the value of `size` is set to the true size of the attribute array's size,
+   * the provided memory is filled with the attribute's contents,
+   * and a success status is returned.
+   *
+   * If the `size` parameter is less than the actual attribute array's size and `out`
+   * is not nullptr, the value of `size` is set to the true size of the attribute array's size
+   * and a failure status is returned.)
+   *
+   * \param[in] info instance
+   * \param[in] name name of the attribute to be parsed
+   * \param[out] out pointer to memory where the attribute's contents are to be stored
+   * \param[in, out] size actual size of attribute array
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(KernelInfoGetAttributeArray_int64, _In_ const OrtKernelInfo* info, _In_ const char* name,
+                  _Out_ int64_t* out, _Inout_ size_t* size);
+
+  /// @}
+  /// \name OrtArenaCfg
+  /// @{
+
+  /** \brief Create an ::OrtArenaCfg
+   *
+   * Create the configuration of an arena that can eventually be used to define an arena based allocator's behavior.
+   *
+   * Supported keys are (See https://onnxruntime.ai/docs/get-started/with-c.html for details on what the
+   * following parameters mean and how to choose these values.):
+   * "max_mem": Maximum memory that can be allocated by the arena based allocator.
+   *  Use 0 for ORT to pick the best value. Default is 0.
+   * "arena_extend_strategy": 0 = kNextPowerOfTwo, 1 = kSameAsRequested.
+   *  Use -1 to allow ORT to choose the default.
+   * "initial_chunk_size_bytes": (Possible) Size of the first allocation in the arena.
+   *  Only relevant if arena strategy is `kNextPowerOfTwo`. Use -1 to allow ORT to choose the default.
+   *  Ultimately, the first allocation size is determined by the allocation memory request.
+   * "max_dead_bytes_per_chunk": Threshold of unused memory in an allocated chunk of arena memory after
+   *  crossing which the current chunk is chunked into 2.
+   * "initial_growth_chunk_size_bytes": (Possible) Size of the second allocation in the arena.
+   *  Only relevant if arena strategy is `kNextPowerOfTwo`. Use -1 to allow ORT to choose the default.
+   * "max_power_of_two_extend_bytes": The maximum enxtend size if arena strategy is `kNextPowerOfTwo`.
+   *  It is not an allocation limit, it is only a limit for extension when requested byte is less than the limit.
+   *  When requested bytes is more than the limit, allocator will still return as requested.
+   *  Use -1 to allow ORT to choose the default 1GB for max_power_of_two_extend_bytes.
+   *  Ultimately, the allocation size is determined by the allocation memory request.
+   *  Further allocation sizes are governed by the arena extend strategy.
+   *
+   * \param[in] arena_config_keys Keys to configure the arena
+   * \param[in] arena_config_values Values to configure the arena
+   * \param[in] num_keys Number of keys in `arena_config_keys` and `arena_config_values`
+   * \param[out] out Newly created ::OrtArenaCfg. Must be freed with OrtApi::ReleaseArenaCfg
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(CreateArenaCfgV2, _In_reads_(num_keys) const char* const* arena_config_keys,
+                  _In_reads_(num_keys) const size_t* arena_config_values, _In_ size_t num_keys,
+                  _Outptr_ OrtArenaCfg** out);
+
+  /// @}
+  /// \name OrtRunOptions
+  /// @{
+
+  /** \brief Set a single run configuration entry as a pair of strings
+   *
+   * If a configuration with same key exists, this will overwrite the configuration with the given config_value
+   *
+   * The config_key and the format of config_value are defined in onnxruntime_run_options_config_keys.h
+   *
+   * \param[in] options
+   * \param[in] config_key A null terminated string representation of the config key
+   * \param[in] config_value  A null terminated string representation of the config value
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(AddRunConfigEntry, _Inout_ OrtRunOptions* options,
+                  _In_z_ const char* config_key, _In_z_ const char* config_value);
+
+  /// @}
+  /// \name OrtPrepackedWeightsContainer
+  /// @{
+
+  /** \brief Create an ::OrtPrepackedWeightsContainer
+   *
+   * This container will hold pre-packed buffers of shared initializers for sharing between sessions
+   * (i.e.) if there are shared initializers that can be shared between sessions, the pre-packed buffers
+   * of these (if any) may possibly be shared to provide memory footprint savings. Pass this container
+   * to sessions that you would like to share pre-packed buffers of shared initializers at session
+   * creation time.
+   *
+   *  \param[out] out Newly created ::OrtPrepackedWeightsContainer. Must be freed with OrtApi::ReleasePrepackedWeightsContainer
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(CreatePrepackedWeightsContainer, _Outptr_ OrtPrepackedWeightsContainer** out);
+
+  /** \brief Release OrtPrepackedWeightsContainer instance
+   *
+   * \note instance must not be released until the sessions using it are released
+   */
+  ORT_CLASS_RELEASE(PrepackedWeightsContainer);
+
+  /// @}
+  /// \name OrtSession
+  /// @{
+
+  /** \brief Create session with prepacked weights container
+   *
+   * Same functionality offered by OrtApi::CreateSession except that a container that contains
+   * pre-packed weights' buffers is written into/read from by the created session.
+   * This is useful when used in conjunction with OrtApi::AddInitializer which injects
+   * shared initializer info into sessions. Wherever possible, the pre-packed versions of these
+   * shared initializers are cached in this container so that multiple sessions can just re-use
+   * these instead of duplicating these in memory.
+   *
+   * \param[in] env OrtEnv instance instance
+   * \param[in] model_path Null terminated string of the path (wchar on Windows, char otherwise)
+   * \param[in] options
+   * \param[in] prepacked_weights_container
+   * \param[out] out Newly created ::OrtSession. Must be freed with OrtApi::ReleaseSession
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(CreateSessionWithPrepackedWeightsContainer, _In_ const OrtEnv* env, _In_ const ORTCHAR_T* model_path,
+                  _In_ const OrtSessionOptions* options,
+                  _Inout_ OrtPrepackedWeightsContainer* prepacked_weights_container,
+                  _Outptr_ OrtSession** out);
+
+  /** \brief Create session from memory with prepacked weights container
+   *
+   * Same functionality offered by OrtApi::CreateSessionFromArray except that a container that contains
+   * pre-packed weights' buffers is written into/read from by the created session.
+   * This is useful when used in conjunction with OrtApi::AddInitializer which injects
+   * shared initializer info into sessions. Wherever possible, the pre-packed versions of these
+   * shared initializers are cached in this container so that multiple sessions can just re-use
+   * these instead of duplicating these in memory.
+   *
+   * \param[in] env
+   * \param[in] model_data Array of bytes holding the model
+   * \param[in] model_data_length Number of bytes in `model_data_model`
+   * \param[in] options
+   * \param[in] prepacked_weights_container
+   * \param[out] out Newly created ::OrtSession. Must be freed with OrtApi::ReleaseSession
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(CreateSessionFromArrayWithPrepackedWeightsContainer, _In_ const OrtEnv* env,
+                  _In_ const void* model_data, size_t model_data_length,
+                  _In_ const OrtSessionOptions* options,
+                  _Inout_ OrtPrepackedWeightsContainer* prepacked_weights_container,
+                  _Outptr_ OrtSession** out);
+
+  /// @}
+  /// \name OrtSessionOptions
+  /// @{
+
+  /** \brief Append TensorRT execution provider to the session options
+   *
+   * If TensorRT is not available (due to a non TensorRT enabled build), this function will return failure.
+   *
+   * This is slightly different from OrtApi::SessionOptionsAppendExecutionProvider_TensorRT, it takes an
+   * ::OrtTensorRTProviderOptions which is publicly defined. This takes an opaque ::OrtTensorRTProviderOptionsV2
+   * which must be created with OrtApi::CreateTensorRTProviderOptions.
+   *
+   * For OrtApi::SessionOptionsAppendExecutionProvider_TensorRT, the user needs to instantiate ::OrtTensorRTProviderOptions
+   * as well as allocate/release buffers for some members of ::OrtTensorRTProviderOptions.
+   * Here, OrtApi::CreateTensorRTProviderOptions and Ortapi::ReleaseTensorRTProviderOptions will do the memory management for you.
+   *
+   * \param[in] options
+   * \param[in] tensorrt_options
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(SessionOptionsAppendExecutionProvider_TensorRT_V2,
+                  _In_ OrtSessionOptions* options, _In_ const OrtTensorRTProviderOptionsV2* tensorrt_options);
+
+  /// @}
+  /// \name OrtTensorRTProviderOptionsV2
+  /// @{
+
+  /** \brief Create an OrtTensorRTProviderOptionsV2
+   *
+   * \param[out] out Newly created ::OrtTensorRTProviderOptionsV2. Must be released with OrtApi::ReleaseTensorRTProviderOptions
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(CreateTensorRTProviderOptions, _Outptr_ OrtTensorRTProviderOptionsV2** out);
+
+  /** \brief Set options in a TensorRT Execution Provider.
+   *
+   * Please refer to https://onnxruntime.ai/docs/execution-providers/TensorRT-ExecutionProvider.html#cc
+   * to know the available keys and values. Key should be in null terminated string format of the member of ::OrtTensorRTProviderOptionsV2
+   * and value should be its related range. Recreates the options and only sets the supplied values.
+   *
+   * For example, key="trt_max_workspace_size" and value="2147483648"
+   *
+   * \param[in] tensorrt_options
+   * \param[in] provider_options_keys Array of UTF-8 null-terminated string for provider options keys
+   * \param[in] provider_options_values Array of UTF-8 null-terminated string for provider options values
+   * \param[in] num_keys Number of elements in the `provider_option_keys` and `provider_options_values` arrays
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(UpdateTensorRTProviderOptions, _Inout_ OrtTensorRTProviderOptionsV2* tensorrt_options,
+                  _In_reads_(num_keys) const char* const* provider_options_keys,
+                  _In_reads_(num_keys) const char* const* provider_options_values,
+                  _In_ size_t num_keys);
+
+  /** \brief Get serialized TensorRT provider options string.
+   *
+   * For example, "trt_max_workspace_size=2147483648;trt_max_partition_iterations=10;trt_int8_enable=1;......"
+   *
+   * \param tensorrt_options - OrtTensorRTProviderOptionsV2 instance
+   * \param allocator - a ptr to an instance of OrtAllocator obtained with OrtApi::CreateAllocator or OrtApi::GetAllocatorWithDefaultOptions
+   *                      the specified allocator will be used to allocate continuous buffers for output strings and lengths.
+   * \param ptr - is a UTF-8 null terminated string allocated using 'allocator'. The caller is responsible for using the same allocator to free it.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(GetTensorRTProviderOptionsAsString, _In_ const OrtTensorRTProviderOptionsV2* tensorrt_options, _Inout_ OrtAllocator* allocator, _Outptr_ char** ptr);
+
+  /** \brief Release an ::OrtTensorRTProviderOptionsV2
+   *
+   * \note This is an exception in the naming convention of other Release* functions, as the name of the method does not have the V2 suffix, but the type does
+   */
+  void(ORT_API_CALL* ReleaseTensorRTProviderOptions)(_Frees_ptr_opt_ OrtTensorRTProviderOptionsV2* input);
+
+  /// @}
+  /// \name OrtSessionOptions
+  /// @{
+
+  /** \brief Enable custom operators
+   *
+   * See onnxruntime-extensions: https://github.com/microsoft/onnxruntime-extensions.git
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(EnableOrtCustomOps, _Inout_ OrtSessionOptions* options);
+
+  /// @}
+  /// \name OrtAllocator
+  /// @{
+
+  /** \brief Register a custom allocator
+   *
+   * Enables sharing between multiple sessions that use the same env instance.
+   * Returns an error if an allocator with the same ::OrtMemoryInfo is already registered.
+   *
+   * The behavior of this is exactly the same as OrtApi::CreateAndRegisterAllocator except
+   * instead of ORT creating an allocator based on provided info, in this case
+   * ORT uses the user-provided custom allocator.
+   * See https://onnxruntime.ai/docs/get-started/with-c.html for details.
+   *
+   * \param[in] env
+   * \param[in] allocator User provided allocator
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(RegisterAllocator, _Inout_ OrtEnv* env, _In_ OrtAllocator* allocator);
+
+  /** \brief Unregister a custom allocator
+   *
+   * It is an error if you provide an ::OrtMemoryInfo not corresponding to any
+   * registered allocators for sharing.
+   *
+   * \param[in] env
+   * \param[in] mem_info
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(UnregisterAllocator, _Inout_ OrtEnv* env,
+                  _In_ const OrtMemoryInfo* mem_info);
+
+  /// @}
+  /// \name OrtValue
+  /// @{
+
+  /** \brief Sets *out to 1 iff an ::OrtValue is a SparseTensor, and 0 otherwise
+   *
+   * \param[in] value existing ::OrtValue
+   * \param[out] out unless an error occurs, contains 1 iff the value contains an instance
+   *  of sparse tensor or 0 otherwise.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(IsSparseTensor, _In_ const OrtValue* value, _Out_ int* out);
+
+  /** \brief Create an ::OrtValue with a sparse tensor that is empty.
+   *
+   * Use FillSparseTensor<Format>() functions to populate sparse tensor with non-zero values and
+   * format specific indices data.
+   * Use ReleaseValue to destroy the sparse tensor, this will also release the buffer inside the output value
+   * if any was allocated.
+   * \param[in,out] allocator allocator to use when performing an allocation. Allocation will be performed
+   *   by FillSparseTensor<Format>() APIs. The lifespan of the allocator instance must eclipse the lifespan
+   *   this sparse tensor instance as the same allocator will be used to free memory.
+   * \param[in] dense_shape shape of the original dense tensor
+   * \param[in] dense_shape_len number of shape dimensions being passed
+   * \param[in] type must be one of TENSOR_ELEMENT_DATA_TYPE_xxxx
+   * \param[out] out Should be freed by calling ReleaseValue
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(CreateSparseTensorAsOrtValue, _Inout_ OrtAllocator* allocator, _In_ const int64_t* dense_shape,
+                  size_t dense_shape_len, ONNXTensorElementDataType type, _Outptr_ OrtValue** out);
+
+  /**
+   * This fills populates an empty tensor that was created using OrtApi::CreateSparseTensorAsOrtValue.
+   * This will allocate required memory and copy the supplied NNZ values and COO indices into that memory allocation.
+   * Memory allocation is performed using the allocator that was specified with OrtApi::CreateSparseTensorAsOrtValue.
+   *
+   * \param[in,out] ort_value ::OrtValue to populate with data
+   * \param[in] data_mem_info serves to identify the location of the data to be copied. If the allocator specified
+   *  at the creation time has memory info that is not the same as mem_info argument to this function a X-device copy will be performed.
+   *  String data is assumed to be on CPU and will only be copied into a CPU allocated buffer.
+   * \param[in] values_shape pointer to values shape array
+   * \param[in] values_shape_len length of the values_shape
+   * \param[in] values pointer to an array of values. For strings, pass const char**.
+   * \param[in] indices_data pointer to a location of COO indices
+   * \param[in] indices_num number of COO indices
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(FillSparseTensorCoo, _Inout_ OrtValue* ort_value, _In_ const OrtMemoryInfo* data_mem_info,
+                  _In_ const int64_t* values_shape, size_t values_shape_len, _In_ const void* values,
+                  _In_ const int64_t* indices_data, size_t indices_num);
+
+  /**
+   * This fills populates an empty tensor that was created using OrtApi::CreateSparseTensorAsOrtValue.
+   * This will allocate required memory and copy the supplied NNZ values and CSR indices into that memory allocation.
+   * Memory allocation is performed using the allocator that was specified with OrtApi::CreateSparseTensorAsOrtValue.
+   *
+   * \param[in,out] ort_value ::OrtValue to populate with data
+   * \param[in] data_mem_info serves to identify the location of the data to be copied. If the allocator specified
+   *  at the creation time has memory info that is not the same as mem_info argument to this function a X-device copy will be performed.
+   *  String data is assumed to be on CPU and will only be copied into a CPU allocated buffer.
+   * \param[in] values_shape pointer to values shape array
+   * \param[in] values_shape_len length of the values_shape
+   * \param[in] values - pointer to an array of values. For strings, pass const char**.
+   * \param[in] inner_indices_data pointer to a location of CSR inner indices
+   * \param[in] inner_indices_num number of CSR inner indices
+   * \param[in] outer_indices_data pointer to a location of CSR outer indices
+   * \param[in] outer_indices_num number of CSR outer indices
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(FillSparseTensorCsr, _Inout_ OrtValue* ort_value, _In_ const OrtMemoryInfo* data_mem_info,
+                  _In_ const int64_t* values_shape, size_t values_shape_len, _In_ const void* values,
+                  _In_ const int64_t* inner_indices_data, size_t inner_indices_num,
+                  _In_ const int64_t* outer_indices_data, size_t outer_indices_num);
+
+  /**
+   * This fills populates an empty tensor that was created using OrtApi::CreateSparseTensorAsOrtValue.
+   * This will allocate required memory and copy the supplied NNZ values and BlockSparse indices into that memory allocation.
+   * Memory allocation is performed using the allocator that was specified with OrtApi::CreateSparseTensorAsOrtValue.
+   *
+   * \param[in,out] ort_value ::OrtValue to populate with data
+   * \param[in] data_mem_info serves to identify the location of the data to be copied. If the allocator specified
+   *  at the creation time has memory info that is not the same as mem_info argument to this function a X-device copy will be performed.
+   *  String data is assumed to be on CPU and will only be copied into a CPU allocated buffer.
+   * \param[in] values_shape
+   * \param[in] values_shape_len
+   * \param[in] values structure with values information
+   * \param[in] indices_shape_data pointer to a location of indices shape
+   * \param[in] indices_shape_len length of the block sparse indices shape
+   * \param[in] indices_data pointer to a location of indices data. Shape will determine the length of the indices data.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(FillSparseTensorBlockSparse, _Inout_ OrtValue* ort_value, _In_ const OrtMemoryInfo* data_mem_info,
+                  _In_ const int64_t* values_shape, size_t values_shape_len, _In_ const void* values,
+                  _In_ const int64_t* indices_shape_data, size_t indices_shape_len,
+                  _In_ const int32_t* indices_data);
+
+  /**
+   * Create an ::OrtValue with a sparse tensor. This is the first step.
+   * Next, use Use<Format>Indices() functions to supply sparse tensor with
+   * format specific indices data and set its sparse format to a specific enum value.
+   * This will not perform memory allocations. It will
+   * use supplied user buffer which should outlive the created sparse tensor.
+   * Use OrtApi::ReleaseValue to destroy the sparse tensor. It would not release the supplied values buffer.
+   * This function can not be used to map strings from the user allocated memory. Strings must always be copied
+   * and have UTF-8 encoding. Therefore, use OrtApi::CreateSparseTensorAsOrtValue above and then fill it with data
+   * using appropriate Make*() function.
+   *
+   * \param[in] info memory info where sparse values reside.
+   * \param[in,out] p_data pointer to a user allocated buffer with values. To create a full sparse tensor with no non-zero
+   *   values, pass nullptr
+   * \param[in] dense_shape shape of the original dense tensor
+   * \param[in] dense_shape_len number of shape dimensions being passed
+   * \param[in] values_shape shape of the values data. To create a fully sparse tensor with no non-zero values,
+   *   pass {0} shape.
+   * \param[in] values_shape_len number of values shape dimensions
+   * \param[in] type must be one of TENSOR_ELEMENT_DATA_TYPE_xxxx
+   * \param[out] out Should be freed by calling ReleaseValue
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(CreateSparseTensorWithValuesAsOrtValue, _In_ const OrtMemoryInfo* info, _Inout_ void* p_data,
+                  _In_ const int64_t* dense_shape, size_t dense_shape_len,
+                  _In_ const int64_t* values_shape, size_t values_shape_len,
+                  ONNXTensorElementDataType type, _Outptr_ OrtValue** out);
+
+  /**
+   * This assigns Coo format indices to the SparseTensor that was created by
+   * OrtApi::CreateSparseTensorWithValuesAsOrtValue above. It also sets OrtSparseFormat to
+   * ORT_SPARSE_COO. This will not allocate any additional memory for data. The life span of
+   * indices_data buffer should eclipse the life span of this ::OrtValue.
+   *
+   * \param[in,out] ort_value ::OrtValue instance constructed with OrtApi::CreateSparseTensorWithValuesAsOrtValue
+   * \param[in,out] indices_data pointer to a user pre-allocated buffer or nullptr for fully sparse tensors.
+   * \param[in] indices_num  number of COO indices. Should either be 0 for fully sparse tensors, be equal
+   *  to the number of nnz values specified to OrtApi::CreateSparseTensorWithValuesAsOrtValue for 1-D {nnz} indices or
+   *  be twice as number of nnz values for a  2-D indices {nnz, 2}
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(UseCooIndices, _Inout_ OrtValue* ort_value, _Inout_ int64_t* indices_data, size_t indices_num);
+
+  /**
+   * The assigns CSR format indices to the SparseTensor that was created by
+   * OrtApi::CreateSparseTensorWithValuesAsOrtValue above. It also sets OrtSparseFormat to
+   * ORT_SPARSE_CSRC. This will not allocate any additional memory for data. The life spans of
+   * inner_data and outer_data buffers should eclipse the life span of this ::OrtValue.
+   *
+   * \param[in,out] ort_value ::OrtValue instance constructed with OrtApi::CreateSparseTensorWithValuesAsOrtValue
+   * \param[in,out] inner_data pointer to a user pre-allocated buffer or nullptr for fully sparse tensors.
+   * \param[in] inner_num  number of inner CSR indices. Should either be 0 for fully sparse tensors or be equal
+   * to the number of nnz values specified to OrtApi::CreateSparseTensorWithValuesAsOrtValue.
+   * \param[in,out] outer_data pointer to user pre-allocated buffer or nullptr for fully sparse tensors.
+   * \param[in] outer_num number of CSR outer indices. Should either be 0 for fully sparse tensors or
+   * equal to rows + 1 of the dense shape.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(UseCsrIndices, _Inout_ OrtValue* ort_value, _Inout_ int64_t* inner_data, size_t inner_num,
+                  _Inout_ int64_t* outer_data, size_t outer_num);
+
+  /**
+   * The assigns BlockSparse format indices to the SparseTensor that was created by
+   * OrtApi::CreateSparseTensorWithValuesAsOrtValue above. It also sets OrtSparseFormat to
+   * ORT_SPARSE_BLOCK_SPARSE. This will not allocate any additional memory for data. The life span of
+   * indices_data buffer must eclipse the lifespan of this ::OrtValue.
+   *
+   * \param[in,out] ort_value OrtValue instance constructed with OrtApi::CreateSparseTensorWithValuesAsOrtValue
+   * \param[in] indices_shape pointer to indices shape. Use {0} for fully sparse tensors
+   * \param[in] indices_shape_len length of the indices shape
+   * \param[in,out] indices_data pointer to user pre-allocated buffer or nullptr for fully sparse tensors.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(UseBlockSparseIndices, _Inout_ OrtValue* ort_value, const int64_t* indices_shape, size_t indices_shape_len, _Inout_ int32_t* indices_data);
+
+  /** \brief Returns sparse tensor format enum iff a given ort value contains an instance of sparse tensor.
+   *
+   * \param[in] ort_value ::OrtValue that contains an instance of sparse tensor
+   * \param[out] out pointer to out parameter
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(GetSparseTensorFormat, _In_ const OrtValue* ort_value, _Out_ enum OrtSparseFormat* out);
+
+  /** \brief Returns data type and shape of sparse tensor values (nnz) iff ::OrtValue contains a SparseTensor.
+   *
+   * \param[in] ort_value An ::OrtValue that contains a fully constructed sparse tensor
+   * \param[out] out Must be freed by OrtApi::ReleaseTensorTypeAndShapeInfo
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(GetSparseTensorValuesTypeAndShape, _In_ const OrtValue* ort_value, _Outptr_ OrtTensorTypeAndShapeInfo** out);
+
+  /** \brief Returns numeric data for sparse tensor values (nnz). For string values use GetStringTensor*().
+   *
+   * \param[in] ort_value an instance of ::OrtValue containing sparse tensor
+   * \param[out] out returns a pointer to values data.  Do not attempt to free this ptr.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(GetSparseTensorValues, _In_ const OrtValue* ort_value, _Outptr_ const void** out);
+
+  /** \brief Returns data type, shape for the type of indices specified by indices_format.
+   *
+   * \param[in] ort_value ::OrtValue containing sparse tensor.
+   * \param[in] indices_format One of the indices formats. It is an error to request a format that the sparse
+   * tensor does not contain.
+   * \param[out] out an instance of ::OrtTensorTypeAndShapeInfo. Must be freed by OrtApi::ReleaseTensorTypeAndShapeInfo
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(GetSparseTensorIndicesTypeShape, _In_ const OrtValue* ort_value, enum OrtSparseIndicesFormat indices_format, _Outptr_ OrtTensorTypeAndShapeInfo** out);
+
+  /** \brief Returns indices data for the type of the indices specified by indices_format
+   *
+   * \param[in] ort_value ::OrtValue containing sparse tensor.
+   * \param[in] indices_format One of the indices formats. It is an error to request a format that the sparse tensor does not contain.
+   * \param[out] num_indices Pointer to where the number of indices entries is returned
+   * \param[out] indices Returned pointer to the indices data. Do not free the returned pointer as it refers to internal data owned by the ::OrtValue
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(GetSparseTensorIndices, _In_ const OrtValue* ort_value, enum OrtSparseIndicesFormat indices_format, _Out_ size_t* num_indices, _Outptr_ const void** indices);
+  /// @}
+  /// \name OrtSessionOptions
+  /// @{
+
+  /**
+   * \brief Sets out to 1 iff an optional type OrtValue has an element, 0 otherwise (OrtValue is None)
+   * Use this API to find if the optional type OrtValue is None or not.
+   * If the optional type OrtValue is not None, use the OrtValue just like any other OrtValue.
+   * For example, if you get an OrtValue that corresponds to Optional(tensor) and
+   * if HasValue() returns true, use it as tensor and so on.
+
+   * \param[in] value Input OrtValue.
+   * \param[out] out indicating if the input OrtValue contains data (1) or if it is a None (0)
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(HasValue, _In_ const OrtValue* value, _Out_ int* out);
+
+  /// @}
+  /// \name OrtKernelContext
+  /// Custom operator APIs.
+  /// @{
+
+  /** \brief Used for custom operators, gets the GPU compute stream to use to launch the custom a GPU kernel
+   *   \see ::OrtCustomOp
+   * \param[in]  context OrtKernelContext instance
+   * \param[out] out Returns pointer to a GPU compute stream that can be used to launch the custom GPU kernel.
+   *             If retrieving the GPU compute stream is not relevant (GPU not enabled in the build, kernel partitioned to
+   *             some other EP), then a nullptr is returned as the output param.
+   *             Do not free or mutate the returned pointer as it refers to internal data owned by the underlying session.
+   *             Only use it for custom kernel launching.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(KernelContext_GetGPUComputeStream, _In_ const OrtKernelContext* context, _Outptr_ void** out);
+
+  /// @}
+  /// \name GetTensorMemoryInfo
+  /// @{
+  /** \brief Returns a pointer to the ::OrtMemoryInfo of a Tensor
+   * \param[in] value ::OrtValue containing tensor.
+   * \param[out] mem_info ::OrtMemoryInfo of the tensor. Do NOT free the returned pointer. It is valid for the lifetime of the ::OrtValue
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(GetTensorMemoryInfo, _In_ const OrtValue* value, _Out_ const OrtMemoryInfo** mem_info);
+
+  /// @}
+  /// \name GetExecutionProviderApi
+  /// @{
+  /** \brief Get a pointer to the requested version of the Execution Provider specific
+   * API extensions to the OrtApi
+   * \param[in] provider_name The name of the execution provider name. Currently only the following
+   * values are supported: "DML".
+   * \param[in] version Must be ::ORT_API_VERSION.
+   * \param[out] provider_api A void pointer containing a reference to the execution provider versioned api structure.
+   * For example, the provider_api pointer can be cast to the OrtDmlApi* when the provider_name is "DML".
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(GetExecutionProviderApi, _In_ const char* provider_name, _In_ uint32_t version, _Outptr_ const void** provider_api);
+
+  /// @}
+
+  /// \name SessionOptions
+  /// @{
+  /** \brief Set custom thread creation function
+   *
+   * \param[in] options Session options
+   * \param[in] ort_custom_create_thread_fn Custom thread creation function
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(SessionOptionsSetCustomCreateThreadFn, _Inout_ OrtSessionOptions* options, _In_ OrtCustomCreateThreadFn ort_custom_create_thread_fn);
+
+  /** \brief Set creation options for custom thread
+   *
+   * \param[in] options Session options
+   * \param[in] ort_custom_thread_creation_options Custom thread creation options (can be nullptr)
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(SessionOptionsSetCustomThreadCreationOptions, _Inout_ OrtSessionOptions* options, _In_ void* ort_custom_thread_creation_options);
+
+  /** \brief Set custom thread join function
+   *
+   * \param[in] options Session options
+   * \param[in] ort_custom_join_thread_fn Custom join thread function, must not be nullptr when ort_custom_create_thread_fn is set
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(SessionOptionsSetCustomJoinThreadFn, _Inout_ OrtSessionOptions* options, _In_ OrtCustomJoinThreadFn ort_custom_join_thread_fn);
+  /// @}
+
+  /// \name OrtThreadingOptions
+  /// @{
+  /** \brief Set custom thread creation function for global thread pools
+   *
+   * \param[inout] tp_options
+   * \param[in] ort_custom_create_thread_fn Custom thread creation function
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(SetGlobalCustomCreateThreadFn, _Inout_ OrtThreadingOptions* tp_options, _In_ OrtCustomCreateThreadFn ort_custom_create_thread_fn);
+
+  /** \brief Set custom thread creation options for global thread pools
+   *
+   * \param[inout] tp_options
+   * \param[in] ort_custom_thread_creation_options Custom thread creation options (can be nullptr)
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(SetGlobalCustomThreadCreationOptions, _Inout_ OrtThreadingOptions* tp_options, _In_ void* ort_custom_thread_creation_options);
+
+  /** \brief Set custom thread join function for global thread pools
+   *
+   * \param[inout] tp_options
+   * \param[in] ort_custom_join_thread_fn Custom thread join function, must not be nullptr when global ort_custom_create_thread_fn is set
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(SetGlobalCustomJoinThreadFn, _Inout_ OrtThreadingOptions* tp_options, _In_ OrtCustomJoinThreadFn ort_custom_join_thread_fn);
+  /// @}
+
+  /** \brief Synchronize bound inputs. The call may be necessary for some providers, such as cuda,
+   *   in case the system that allocated bound memory operated on a different stream. However, the
+   *   operation is provider specific and could be a no-op.
+   *
+   * \param[inout] binding_ptr
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(SynchronizeBoundInputs, _Inout_ OrtIoBinding* binding_ptr);
+
+  /** \brief Synchronize bound outputs. The call may be necessary for some providers, such as cuda,
+   *   in case the system that allocated bound memory operated on a different stream. However, the
+   *   operation is provider specific and could be a no-op.
+   *
+   * \param[inout] binding_ptr
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(SynchronizeBoundOutputs, _Inout_ OrtIoBinding* binding_ptr);
+
+  /// \name OrtSessionOptions
+  /// @{
+
+  /** \brief Append CUDA execution provider to the session options
+   *
+   * If CUDA is not available (due to a non CUDA enabled build), this function will return failure.
+   *
+   * This is slightly different from OrtApi::SessionOptionsAppendExecutionProvider_CUDA, it takes an
+   * ::OrtCUDAProviderOptions which is publicly defined. This takes an opaque ::OrtCUDAProviderOptionsV2
+   * which must be created with OrtApi::CreateCUDAProviderOptions.
+   *
+   * For OrtApi::SessionOptionsAppendExecutionProvider_CUDA, the user needs to instantiate ::OrtCUDAProviderOptions
+   * as well as allocate/release buffers for some members of ::OrtCUDAProviderOptions.
+   * Here, OrtApi::CreateCUDAProviderOptions and Ortapi::ReleaseCUDAProviderOptions will do the memory management for you.
+   *
+   * \param[in] options
+   * \param[in] cuda_options
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   *
+   * \since Version 1.11.
+   */
+  ORT_API2_STATUS(SessionOptionsAppendExecutionProvider_CUDA_V2,
+                  _In_ OrtSessionOptions* options, _In_ const OrtCUDAProviderOptionsV2* cuda_options);
+
+  /// @}
+  /// \name OrtCUDAProviderOptionsV2
+  /// @{
+
+  /** \brief Create an OrtCUDAProviderOptionsV2
+   *
+   * \param[out] out Newly created ::OrtCUDAProviderOptionsV2. Must be released with OrtApi::ReleaseCudaProviderOptions
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   *
+   * \since Version 1.11.
+   */
+  ORT_API2_STATUS(CreateCUDAProviderOptions, _Outptr_ OrtCUDAProviderOptionsV2** out);
+
+  /** \brief Set options in a CUDA Execution Provider.
+   *
+   * Please refer to https://onnxruntime.ai/docs/execution-providers/CUDA-ExecutionProvider.html#configuration-options
+   * to know the available keys and values. Key should be in null terminated string format of the member of ::OrtCUDAProviderOptionsV2
+   * and value should be its related range. Recreates the options and only sets the supplied values.
+   *
+   * For example, key="device_id" and value="0"
+   *
+   * \param[in] cuda_options
+   * \param[in] provider_options_keys Array of UTF-8 null-terminated string for provider options keys
+   * \param[in] provider_options_values Array of UTF-8 null-terminated string for provider options values
+   * \param[in] num_keys Number of elements in the `provider_option_keys` and `provider_options_values` arrays
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   *
+   * \since Version 1.11.
+   */
+  ORT_API2_STATUS(UpdateCUDAProviderOptions, _Inout_ OrtCUDAProviderOptionsV2* cuda_options,
+                  _In_reads_(num_keys) const char* const* provider_options_keys,
+                  _In_reads_(num_keys) const char* const* provider_options_values,
+                  _In_ size_t num_keys);
+
+  /**
+   * Get serialized CUDA provider options string.
+   *
+   * For example, "device_id=0;arena_extend_strategy=0;......"
+   *
+   * \param cuda_options - OrtCUDAProviderOptionsV2 instance
+   * \param allocator - a ptr to an instance of OrtAllocator obtained with CreateAllocator() or GetAllocatorWithDefaultOptions()
+   *                      the specified allocator will be used to allocate continuous buffers for output strings and lengths.
+   * \param ptr - is a UTF-8 null terminated string allocated using 'allocator'. The caller is responsible for using the same allocator to free it.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   *
+   * \since Version 1.11.
+   */
+  ORT_API2_STATUS(GetCUDAProviderOptionsAsString, _In_ const OrtCUDAProviderOptionsV2* cuda_options, _Inout_ OrtAllocator* allocator, _Outptr_ char** ptr);
+
+  /** \brief Release an ::OrtCUDAProviderOptionsV2
+   *
+   * \note This is an exception in the naming convention of other Release* functions, as the name of the method does not have the V2 suffix, but the type does
+   *
+   * \since Version 1.11.
+   */
+  void(ORT_API_CALL* ReleaseCUDAProviderOptions)(_Frees_ptr_opt_ OrtCUDAProviderOptionsV2* input);
+
+  /// @}
+
+  /** \brief Append MIGraphX provider to session options
+   *
+   * If MIGraphX is not available (due to a non MIGraphX enabled build, or if MIGraphX is not installed on the system), this function will return failure.
+   *
+   * \param[in] options
+   * \param[in] migraphx_options
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   *
+   * \since Version 1.11.
+   */
+  ORT_API2_STATUS(SessionOptionsAppendExecutionProvider_MIGraphX,
+                  _In_ OrtSessionOptions* options, _In_ const OrtMIGraphXProviderOptions* migraphx_options);
+
+  /** \brief Replace initialized Tensors with external data with the data provided in initializers.
+   *
+   * The function will find the initialized TensorProtos with external data in the graph with the provided names and
+   * replace them with the provided tensors. The API verifies that the TensorProto being replaced
+   * has an external data reference and has the same name, dimensions and data type as its replacement. The replacement
+   * will occur before any of the optimizations take place. The data will be copied into the graph
+   * since TensorProto can't refer to the user provided buffers.
+   *
+   * Once the model has been loaded, the OrtValue(s) added to SessionOptions instance will be removed
+   * from the internal SessionOptions copy to save memory, the user provided buffers can then be deallocated
+   * and the SessionOptions instance that refers to them can be destroyed.
+   *
+   * \param[in] options
+   * \param[in] initializer_names Array of null terminated UTF-8 encoded strings of the initializers names.
+   * \param[in] initializers Array of ::OrtValue type
+   * \param[in] num_initializers Number of elements in the initializer_names and initializers
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   *
+   * \since Version 1.12.
+   */
+  ORT_API2_STATUS(AddExternalInitializers, _In_ OrtSessionOptions* options,
+                  _In_reads_(num_initializers) const char* const* initializer_names,
+                  _In_reads_(num_initializers) const OrtValue* const* initializers, size_t num_initializers);
+
+  /** \brief: Create attribute of onnxruntime operator
+   *
+   * \param[in] name Name of the attribute
+   * \param[in] data Data content of the attribute
+   * \param[in] len Number of bytes stored in data
+   * \param[in] type Data type
+   * \param[out] op_attr Attribute that has been created, which must be released by OrtApi::ReleaseOpAttr
+   *
+   * \since Version 1.12.
+   */
+  ORT_API2_STATUS(CreateOpAttr,
+                  _In_ const char* name,
+                  _In_ const void* data,
+                  _In_ int len,
+                  _In_ OrtOpAttrType type,
+                  _Outptr_ OrtOpAttr** op_attr);
+
+  /* \brief: Release op attribute
+   *
+   * \param[in] opAttr Attribute created by OrtApi::CreateOpAttr
+   *
+   * \since Version 1.12.
+   */
+  ORT_CLASS_RELEASE(OpAttr);
+
+  /** \brief: Create onnxruntime native operator
+   *
+   * \param[in] info Kernel info
+   * \param[in] op_name Operator name
+   * \param[in] domain Operator domain
+   * \param[in] version Operator opset version
+   * \param[in] type_constraint_names Name of the type contraints, such as "T" or "T1"
+   * \param[in] type_constraint_values Type of each contraints
+   * \param[in] type_constraint_count Number of contraints
+   * \param[in] attr_values Attributes used to initialize the operator
+   * \param[in] attr_count Number of the attributes
+   * \param[in] input_count Number of inputs
+   * \param[in] output_count Number of outputs
+   * \param[out] ort_op Operator that has been created
+   *
+   * \since Version 1.12.
+   */
+  ORT_API2_STATUS(CreateOp,
+                  _In_ const OrtKernelInfo* info,
+                  _In_z_ const char* op_name,
+                  _In_z_ const char* domain,
+                  int version,
+                  _In_reads_(type_constraint_count) const char** type_constraint_names,
+                  _In_reads_(type_constraint_count) const ONNXTensorElementDataType* type_constraint_values,
+                  int type_constraint_count,
+                  _In_reads_(attr_count) const OrtOpAttr* const* attr_values,
+                  int attr_count,
+                  int input_count,
+                  int output_count,
+                  _Outptr_ OrtOp** ort_op);
+
+  /** \brief: Invoke the operator created by OrtApi::CreateOp
+   * The inputs must follow the order as specified in onnx specification
+   *
+   * \param[in] context Kernel context
+   * \param[in] ort_op Operator that has been created
+   * \param[in] input_values Array of inputs
+   * \param[in] input_count Number of inputs
+   * \param[in] output_values Array of outputs
+   * \param[in] output_count Number of outputs
+   *
+   * \since Version 1.12.
+   */
+  ORT_API2_STATUS(InvokeOp,
+                  _In_ const OrtKernelContext* context,
+                  _In_ const OrtOp* ort_op,
+                  _In_ const OrtValue* const* input_values,
+                  _In_ int input_count,
+                  _Inout_ OrtValue* const* output_values,
+                  _In_ int output_count);
+
+  /* \brief: Release an onnxruntime operator
+   *
+   * \param[in] Op Operator created by OrtApi::CreateOp
+   *
+   * \since Version 1.12.
+   */
+  ORT_CLASS_RELEASE(Op);
+
+  /** \brief: Append execution provider to the session options.
+   * \param[in] options
+   * \param[in] provider_name - provider to add.
+   * \param[in] provider_options_keys - keys to configure the provider options
+   * \param[in] provider_options_values - values to configure the provider options
+   * \param[in] num_keys - number of keys passed in
+   *
+   * Currently supported provider names:
+   *   QNNExecutionProvider (or QNN)
+   *   OpenVINOExecutionProvider (or OpenVINO)
+   *   XnnpackExecutionProvider (or XNNPACK)
+   *   WebNNExecutionProvider (or WEBNN)
+   *   WebGpuExecutionProvider (or WebGPU)
+   *   AzureExecutionProvider (or AZURE)
+   *   JsExecutionProvider (or JS)
+   *   VitisAIExecutionProvider (or VitisAI)
+   *   CoreMLExecutionProvider (or CoreML)
+   *
+   * Note: If an execution provider has a dedicated SessionOptionsAppendExecutionProvider_<provider name> function
+   *       that should be used to add it.
+   *
+   * QNN supported keys:
+   *   "backend_type": Type of QNN backend. Specifies a backend path that is the associated QNN backend library file
+   *      name. E.g., given backend type "htp", on Windows, the backend path would be "QnnHtp.dll", and on other
+   *      platforms, it would be "libQnnHtp.so". Mutually exclusive with "backend_path".
+   *      Available options:
+   *      -# "cpu"
+   *      -# "gpu"
+   *      -# "htp": Default.
+   *      -# "saver"
+   *   "backend_path": File path to QNN backend library. Mutually exclusive with "backend_type".
+   *   "profiling_level": QNN profiling level.
+   *      Available options:
+   *      -# "off": Default.
+   *      -# "basic"
+   *      -# "detailed"
+   *   "profiling_file_path": QNN profiling file path if ETW not enabled.
+   *   "rpc_control_latency": QNN RPC control latency.
+   *   "vtcm_mb": QNN VTCM size in MB. default to 0(not set).
+   *   "htp_performance_mode": QNN performance mode.
+   *      Available options:
+   *      -# "burst"
+   *      -# "balanced"
+   *      -# "default": Default.
+   *      -# "high_performance"
+   *      -# "high_power_saver"
+   *      -# "low_balanced"
+   *      -# "extreme_power_saver"
+   *      -# "low_power_saver"
+   *      -# "power_saver"
+   *      -# "sustained_high_performance"
+   *   "qnn_saver_path": File path to the QNN Saver backend library. If specified, QNN Saver will be enabled and will
+   *      dump QNN API calls to disk for replay/debugging. QNN Saver produces incorrect model inference results and
+   *      may alter model/EP partitioning. Use only for debugging.
+   *   "qnn_context_priority": QNN context priority.
+   *      Available options:
+   *      -# "low"
+   *      -# "normal": Default.
+   *      -# "normal_high"
+   *      -# "high"
+   *   "htp_graph_finalization_optimization_mode": Set the optimization mode for graph finalization on the HTP backend.
+   *      Available options:
+   *      -# "0": Default.
+   *      -# "1": Faster preparation time, less optimal graph.
+   *      -# "2": Longer preparation time, more optimal graph.
+   *      -# "3": Longest preparation time, most likely even more optimal graph. See QNN SDK documentation for specific
+   *        details.
+   *   "soc_model": The SoC model number. Refer to the QNN SDK documentation for valid values.
+   *      Defaults to "0" (unknown).
+   *   "htp_arch": The minimum HTP architecture the driver will use to select compatible QNN operators.
+   *      Available options:
+   *      -# "0": Default (none).
+   *      -# "68"
+   *      -# "69"
+   *      -# "73"
+   *      -# "75"
+   *   "device_id": The ID of the device to use when setting 'htp_arch'. Defaults to "0" (for single device).
+   *   "enable_htp_fp16_precision": Used for float32 model for HTP backend.
+   *      Enable the float32 model to be inferenced with fp16 precision. Otherwise, it will be fp32 precision.
+   *      -# "0": With fp32 precision.
+   *      -# "1": Default. With fp16 precision.
+   *   "offload_graph_io_quantization": Offload graph input quantization and graph output dequantization to another
+   *      execution provider (typically CPU EP).
+   *      -# "0": Disabled. QNN EP will handle quantization and dequantization of graph I/O.
+   *      -# "1": Enabled. This is the default value.
+   *   "enable_htp_spill_fill_buffer": Enable HTP spill fill buffer setting. The flag is used while generating context
+   *      binary.
+   *      -# "0": Default. Disabled.
+   *      -# "1": Enabled.
+   *   "enable_htp_shared_memory_allocator": Enable the QNN HTP shared memory allocator. Requires libcdsprpc.so/dll to
+   *      be available.
+   *      -# "0": Default. Disabled.
+   *      -# "1": Enabled.
+   *   "dump_json_qnn_graph": Set to "1" to dump QNN graphs generated by QNN EP as JSON files. Each graph partition
+   *      assigned to QNN EP is dumped to a separate file.
+   *   "json_qnn_graph_dir": Directory in which to dump QNN JSON graphs. If not specified, QNN graphs are dumped in the
+   *      program's current working directory. Ignored if "dump_json_qnn_graph" is not set.
+   *
+   * XNNPACK supported keys:
+   *   "intra_op_num_threads": number of thread-pool size to use for XNNPACK execution provider.
+   *      default value is 0, which means to use the session thread-pool size.
+   *
+   * \since Version 1.12.
+   */
+  ORT_API2_STATUS(SessionOptionsAppendExecutionProvider, _In_ OrtSessionOptions* options,
+                  _In_ const char* provider_name,
+                  _In_reads_(num_keys) const char* const* provider_options_keys,
+                  _In_reads_(num_keys) const char* const* provider_options_values,
+                  _In_ size_t num_keys);
+
+  /* \brief: Get a copy of kernel info
+   *
+   * \param[in] info Kernel info
+   * \param[out] info_copy Copy of kernel info
+   *
+   * \since Version 1.12.
+   */
+  ORT_API2_STATUS(CopyKernelInfo,
+                  _In_ const OrtKernelInfo* info,
+                  _Outptr_ OrtKernelInfo** info_copy);
+
+  /* \brief: Release kernel info
+   *
+   * \param[in] KernelInfo A copy of kernel info returned by CopyKernelInfo
+   *
+   * \since Version 1.12.
+   */
+  ORT_CLASS_RELEASE(KernelInfo);
+
+  /// \name Ort Training
+  /// @{
+  /** \brief Gets the Training C Api struct
+   *
+   * Call this function to access the ::OrtTrainingApi structure that holds pointers to functions that enable
+   * training with onnxruntime.
+   * \note A NULL pointer will be returned and no error message will be printed if the training api
+   * is not supported with this build. A NULL pointer will be returned and an error message will be
+   * printed if the provided version is unsupported, for example when using a runtime older than the
+   * version created with this header file.
+   *
+   * \param[in] version Must be ::ORT_API_VERSION
+   * \return The ::OrtTrainingApi struct for the version requested.
+   *
+   * \since Version 1.13
+   */
+  const OrtTrainingApi*(ORT_API_CALL* GetTrainingApi)(uint32_t version)NO_EXCEPTION;
+
+  /// @}
+
+  /** \brief Append CANN provider to session options
+   *
+   * If CANN is not available (due to a non CANN enabled build, or if CANN is not installed on the system), this function will return failure.
+   *
+   * \param[in] options
+   * \param[in] cann_options
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   *
+   * \since Version 1.13.
+   */
+  ORT_API2_STATUS(SessionOptionsAppendExecutionProvider_CANN,
+                  _In_ OrtSessionOptions* options, _In_ const OrtCANNProviderOptions* cann_options);
+
+  /** \brief Create an OrtCANNProviderOptions
+   *
+   * \param[out] out created ::OrtCANNProviderOptions. Must be released with OrtApi::ReleaseCANNProviderOptions
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   *
+   * \since Version 1.13.
+   */
+  ORT_API2_STATUS(CreateCANNProviderOptions, _Outptr_ OrtCANNProviderOptions** out);
+
+  /** \brief Set options in a CANN Execution Provider.
+   *
+   * \param[in] cann_options
+   * \param[in] provider_options_keys Array of UTF-8 null-terminated string for provider options keys
+   * \param[in] provider_options_values Array of UTF-8 null-terminated string for provider options values
+   * \param[in] num_keys Number of elements in the `provider_option_keys` and `provider_options_values` arrays
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   *
+   * \since Version 1.13.
+   */
+  ORT_API2_STATUS(UpdateCANNProviderOptions, _Inout_ OrtCANNProviderOptions* cann_options,
+                  _In_reads_(num_keys) const char* const* provider_options_keys,
+                  _In_reads_(num_keys) const char* const* provider_options_values,
+                  _In_ size_t num_keys);
+
+  /** \brief Get serialized CANN provider options string.
+   *
+   * \param[in] cann_options OrtCANNProviderOptions instance
+   * \param[in] allocator a ptr to an instance of OrtAllocator obtained with CreateAllocator()
+   *                      or GetAllocatorWithDefaultOptions(), the specified allocator will be used to allocate
+   *                      continuous buffers for output strings and lengths.
+   * \param[out] ptr is a UTF-8 null terminated string allocated using 'allocator'.
+   *                 The caller is responsible for using the same allocator to free it.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   *
+   * \since Version 1.13.
+   */
+  ORT_API2_STATUS(GetCANNProviderOptionsAsString, _In_ const OrtCANNProviderOptions* cann_options,
+                  _Inout_ OrtAllocator* allocator, _Outptr_ char** ptr);
+
+  /** \brief Release an OrtCANNProviderOptions
+   *
+   * \param[in] input The pointer of OrtCANNProviderOptions which will been deleted
+   *
+   * \since Version 1.13.
+   */
+  void(ORT_API_CALL* ReleaseCANNProviderOptions)(_Frees_ptr_opt_ OrtCANNProviderOptions* input);
+
+  /*  \brief Get OrtDevice type from MemoryInfo
+   *
+   *  \since Version 1.14
+   */
+  void(ORT_API_CALL* MemoryInfoGetDeviceType)(_In_ const OrtMemoryInfo* ptr, _Out_ OrtMemoryInfoDeviceType* out);
+
+  /* \brief Update the OrtEnv instance with custom log severity level
+   *
+   * \param[in] ort_env The OrtEnv instance being used
+   * \param[in] log_severity_level The log severity level.
+   *
+   * \since Version 1.14.
+   */
+  ORT_API2_STATUS(UpdateEnvWithCustomLogLevel, _In_ OrtEnv* ort_env, OrtLoggingLevel log_severity_level);
+
+  /*  \brief Set affinities for intra op threads
+   *
+   * Affinity string follows format:
+   * logical_processor_id,logical_processor_id;logical_processor_id,logical_processor_id
+   * Semicolon isolates configurations among threads, while comma split processors where ith thread expected to attach to.
+   * e.g. 1,2,3;4,5
+   * specifies affinities for two threads, with the 1st thread attach to the 1st, 2nd, and 3rd processor, and 2nd thread to the 4th and 5th.
+   * To ease the configuration, an "interval" is also allowed:
+   * e.g. 1-8;8-16;17-24
+   * orders that the 1st thread runs on first eight processors, 2nd thread runs on next eight processors, and so forth.
+   * Note:
+   * 1. Once set, the number of thread affinities must equal to intra_op_num_threads - 1,
+   *    ort does not set affinity on the main thread which is started and managed by the calling app;
+   * 2. For windows, ort will infer the group id from a logical processor id, for example, assuming there are two groups with each has 64 logical processors,
+   *    an id of 64 will be inferred as the last processor of the 1st group, while 65 will be interpreted as the 1st processor of the second group.
+   *    Hence 64-65 is an invalid configuration, because a windows thread cannot be attached to processors across group boundary.
+   *
+   *  \since Version 1.14
+   */
+  ORT_API2_STATUS(SetGlobalIntraOpThreadAffinity, _Inout_ OrtThreadingOptions* tp_options, const char* affinity_string);
+
+  /** \brief Register custom ops from a shared library.
+   *
+   * Loads a shared library (.dll on windows, .so on linux, etc) named 'library_name' and looks for this entry point:
+   *		OrtStatus* RegisterCustomOps(OrtSessionOptions * options, const OrtApiBase* api);
+   * It then passes in the provided session options to this function along with the api base.
+   *
+   * The handle to the loaded library is automatically released by ORT when the last OrtSession that references the
+   * library handle is released. If no OrtSession is created, then the library handle is released when the provided
+   * OrtSessionOptions is released.
+   *
+   * \param[in] options The session options.
+   * \param[in] library_name The name of the shared library to load and register. Refer to OS-specific dynamic library
+   *                         loading utilities (e.g., LoadLibraryEx on Windows or dlopen on Linux/MacOS) for information
+   *                         on the format of library names and search paths.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   * \since Version 1.14
+   */
+  ORT_API2_STATUS(RegisterCustomOpsLibrary_V2, _Inout_ OrtSessionOptions* options, _In_ const ORTCHAR_T* library_name);
+
+  /** \brief Register custom ops by calling a RegisterCustomOpsFn function.
+   *
+   * Searches for registration_func_name and if found calls it.
+   *
+   * The library containing the function must either be linked against or previously loaded by the executable.
+   *
+   * If you want ONNX Runtime to load the library and manage its lifetime, use RegisterCustomOpsLibrary_V2.
+   *
+   * RegisterCustomOpsUsingFunction can be used in scenarios where it may not be possible for ONNX Runtime to load
+   * the library from a path. e.g. mobile platforms where the library must be linked into the app.
+   *
+   * The registration function must have the signature of RegisterCustomOpsFn:
+   *    OrtStatus* (*fn)(OrtSessionOptions* options, const OrtApiBase* api);
+   *
+   * See https://onnxruntime.ai/docs/reference/operators/add-custom-op.html for details on how the registration
+   * function should be implemented.
+   *
+   * \param[in] options OrtSessionOptions that is passed through as the first argument in the call to the
+   *                    registration function.
+   * \param[in] registration_func_name Name of registration function to use.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   * \since Version 1.14
+   */
+  ORT_API2_STATUS(RegisterCustomOpsUsingFunction, _Inout_ OrtSessionOptions* options,
+                  _In_ const char* registration_func_name);
+
+  /// \name OrtKernelInfo
+  /// Custom operator APIs.
+  /// @{
+
+  /** \brief Get the number of inputs from ::OrtKernelInfo.
+   *
+   * Used in the CreateKernel callback of an OrtCustomOp to query the number of inputs
+   * during kernel/session creation.
+   *
+   * \param[in] info Instance of ::OrtKernelInfo.
+   * \param[out] out Pointer to variable assigned with the result on success.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   * \since Version 1.14
+   */
+  ORT_API2_STATUS(KernelInfo_GetInputCount, _In_ const OrtKernelInfo* info, _Out_ size_t* out);
+
+  /** \brief Get the number of outputs from ::OrtKernelInfo.
+   *
+   * Used in the CreateKernel callback of an OrtCustomOp to query the number of outputs
+   * during kernel/session creation.
+   *
+   * \param[in] info Instance of ::OrtKernelInfo.
+   * \param[out] out Pointer to variable assigned with the result on success.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   * \since Version 1.14
+   */
+  ORT_API2_STATUS(KernelInfo_GetOutputCount, _In_ const OrtKernelInfo* info, _Out_ size_t* out);
+
+  /** \brief Get the name of a ::OrtKernelInfo's input.
+   *
+   * Used in the CreateKernel callback of an OrtCustomOp to query an input's name
+   * during kernel/session creation.
+   *
+   * If `out` is nullptr, the value of `size` is set to the size of the name
+   * string (including null-terminator), and a success status is returned.
+   *
+   * If the `size` parameter is greater than or equal to the name string's size,
+   * the value of `size` is set to the true size of the string (including null-terminator),
+   * the provided memory is filled with the string's contents, and a success status is returned.
+   *
+   * If the `size` parameter is less than the actual string's size and `out`
+   * is not nullptr, the value of `size` is set to the true size of the string
+   * and a failure status is returned.
+   *
+   * \param[in] info An instance of ::OrtKernelInfo.
+   * \param[in] index The index of the input name to get. Returns a failure status if out-of-bounds.
+   * \param[out] out Memory location into which to write the UTF-8 null-terminated string representing the input's name.
+   * \param[in,out] size Pointer to the size of the `out` buffer. See above comments for details.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   * \since Version 1.14
+   */
+  ORT_API2_STATUS(KernelInfo_GetInputName, _In_ const OrtKernelInfo* info, size_t index, _Out_ char* out,
+                  _Inout_ size_t* size);
+
+  /** \brief Get the name of a ::OrtKernelInfo's output.
+   *
+   * Used in the CreateKernel callback of an OrtCustomOp to query an output's name
+   * during kernel/session creation.
+   *
+   * If `out` is nullptr, the value of `size` is set to the size of the name
+   * string (including null-terminator), and a success status is returned.
+   *
+   * If the `size` parameter is greater than or equal to the name string's size,
+   * the value of `size` is set to the true size of the string (including null-terminator),
+   * the provided memory is filled with the string's contents, and a success status is returned.
+   *
+   * If the `size` parameter is less than the actual string's size and `out`
+   * is not nullptr, the value of `size` is set to the true size of the string
+   * and a failure status is returned.
+   *
+   * \param[in] info An instance of ::OrtKernelInfo.
+   * \param[in] index The index of the output name to get. Returns a failure status if out-of-bounds.
+   * \param[out] out Memory location into which to write the UTF-8 null-terminated string representing the output's
+   *                 name.
+   * \param[in,out] size Pointer to the size of the `out` buffer. See above comments for details.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   * \since Version 1.14
+   */
+  ORT_API2_STATUS(KernelInfo_GetOutputName, _In_ const OrtKernelInfo* info, size_t index, _Out_ char* out,
+                  _Inout_ size_t* size);
+
+  /** \brief Get the type information for a ::OrtKernelInfo's input.
+   *
+   * Used in the CreateKernel callback of an OrtCustomOp to query the shape and type information
+   * of an input during kernel/session creation.
+   *
+   * \param[in] info An instance of ::OrtKernelInfo.
+   * \param[in] index Which input to get the type information for
+   * \param[out] type_info Pointer set to the resulting ::OrtTypeInfo. Must be freed with OrtApi::ReleaseTypeInfo.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   * \since Version 1.14
+   */
+  ORT_API2_STATUS(KernelInfo_GetInputTypeInfo, _In_ const OrtKernelInfo* info, size_t index,
+                  _Outptr_ OrtTypeInfo** type_info);
+
+  /** \brief Get the type information for a ::OrtKernelInfo's output.
+   *
+   * Used in the CreateKernel callback of an OrtCustomOp to query the shape and type information
+   * of an output during kernel/session creation.
+   *
+   * \param[in] info An instance of ::OrtKernelInfo.
+   * \param[in] index Which input to get the type information for
+   * \param[out] type_info Pointer set to the resulting ::OrtTypeInfo. Must be freed with OrtApi::ReleaseTypeInfo.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   * \since Version 1.14
+   */
+  ORT_API2_STATUS(KernelInfo_GetOutputTypeInfo, _In_ const OrtKernelInfo* info, size_t index,
+                  _Outptr_ OrtTypeInfo** type_info);
+
+  /** \brief Get a ::OrtValue tensor stored as an attribute in the graph node.
+   *
+   * Used in the CreateKernel callback of an OrtCustomOp to get a tensor attribute.
+   *
+   * \param[in] info ::OrtKernelInfo instance.
+   * \param[in] name UTF-8 null-terminated string representing the attribute's name.
+   * \param[in] allocator Allocator used to allocate the internal tensor state.
+   * \param[out] out Returns newly created ::OrtValue. Must be freed with OrtApi::ReleaseValue,
+   *                 which will also free internal tensor state allocated with the provided allocator.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(KernelInfoGetAttribute_tensor, _In_ const OrtKernelInfo* info, _In_z_ const char* name,
+                  _Inout_ OrtAllocator* allocator, _Outptr_ OrtValue** out);
+
+  /// @}
+  /// \name OrtSessionOptions
+  /// Custom operator APIs
+  /// @{
+
+  /** \brief Checks if the given session configuration entry exists.
+   *
+   * The config_key formats are defined in onnxruntime_session_options_config_keys.h
+   *
+   * Can be used in a custom operator library to check for session configuration entries
+   * that target one or more custom operators in the library. Example: The config entry
+   * custom_op.myop.some_key targets a custom op named "myop".
+   *
+   * \param[in] options The ::OrtSessionOptions instance.
+   * \param[in] config_key A null-terminated UTF-8 string representation of the configuration key.
+   * \param[out] out Pointer set to 1 if the entry exists and 0 otherwise.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   * \since Version 1.14
+   */
+  ORT_API2_STATUS(HasSessionConfigEntry, _In_ const OrtSessionOptions* options,
+                  _In_z_ const char* config_key, _Out_ int* out);
+
+  /** \brief Get a session configuration value.
+   *
+   * Returns a failure status if the configuration key does not exist.
+   * The config_key and the format of config_value are defined in onnxruntime_session_options_config_keys.h
+   *
+   * If `config_value` is nullptr, the value of `size` is set to the true size of the string
+   * value (including null-terminator), and a success status is returned.
+   *
+   * If the `size` parameter is greater than or equal to the actual string value's size,
+   * the value of `size` is set to the true size of the string value, the provided memory
+   * is filled with the value's contents, and a success status is returned.
+   *
+   * If the `size` parameter is less than the actual string value's size and `config_value`
+   * is not nullptr, the value of `size` is set to the true size of the string value
+   * and a failure status is returned.
+   *
+   * Can be used in a custom operator library to get session configuration entries
+   * that target one or more custom operators in the library. Example: The config entry
+   * custom_op.myop.some_key targets a custom op named "myop".
+   *
+   * \param[in] options The session options.
+   * \param[in] config_key A null-terminated UTF-8 string representation of the config key.
+   * \param[in] config_value Pointer to memory where the null-terminated UTF-8 string value will be stored.
+   * \param[in,out] size Pointer to the size of the `config_value` buffer. See above comments for details.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   * \since Version 1.14
+   */
+  ORT_API2_STATUS(GetSessionConfigEntry, _In_ const OrtSessionOptions* options,
+                  _In_z_ const char* config_key, _Out_ char* config_value, _Inout_ size_t* size);
+
+  /// @}
+
+  /** \brief Append dnnl provider to session options
+   *
+   * If oneDNN is not available, this function will return failure.
+   *
+   * \param[in] options
+   * \param[in] dnnl_options
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   *
+   * \since Version 1.15.
+   */
+  ORT_API2_STATUS(SessionOptionsAppendExecutionProvider_Dnnl,
+                  _In_ OrtSessionOptions* options, _In_ const OrtDnnlProviderOptions* dnnl_options);
+
+  /** \brief Create an OrtDnnlProviderOptions
+   *
+   * \param[out] out Newly created ::OrtDnnlProviderOptions. Must be released with OrtApi::ReleaseDnnlProviderOptions
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   *
+   * \since Version 1.15.
+   */
+  ORT_API2_STATUS(CreateDnnlProviderOptions, _Outptr_ OrtDnnlProviderOptions** out);
+
+  /** \brief Set options in a oneDNN Execution Provider.
+   *
+   * Key should be in null terminated string format of the member of ::OrtDnnlProviderOptions
+   * and value should be its related range.
+   *
+   * For example, key="use_arena" and value="1"
+   *
+   * \param[in] dnnl_options
+   * \param[in] provider_options_keys Array of UTF-8 null-terminated string for provider options keys
+   * \param[in] provider_options_values Array of UTF-8 null-terminated string for provider options values
+   * \param[in] num_keys Number of elements in the `provider_option_keys` and `provider_options_values` arrays
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   *
+   * \since Version 1.15.
+   */
+  ORT_API2_STATUS(UpdateDnnlProviderOptions, _Inout_ OrtDnnlProviderOptions* dnnl_options,
+                  _In_reads_(num_keys) const char* const* provider_options_keys,
+                  _In_reads_(num_keys) const char* const* provider_options_values,
+                  _In_ size_t num_keys);
+
+  /**
+   * Get serialized oneDNN provider options string.
+   *
+   * For example, "use_arena=1;......"
+   *
+   * \param dnnl_options - OrtDnnlProviderOptions instance
+   * \param allocator - a ptr to an instance of OrtAllocator obtained with CreateAllocator() or GetAllocatorWithDefaultOptions()
+   *                      the specified allocator will be used to allocate continuous buffers for output strings and lengths.
+   * \param ptr - is a UTF-8 null terminated string allocated using 'allocator'. The caller is responsible for using the same allocator to free it.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   *
+   * \since Version 1.15.
+   */
+  ORT_API2_STATUS(GetDnnlProviderOptionsAsString, _In_ const OrtDnnlProviderOptions* dnnl_options, _Inout_ OrtAllocator* allocator, _Outptr_ char** ptr);
+
+  /** \brief Release an ::OrtDnnlProviderOptions
+   *
+   * \since Version 1.15.
+   */
+  void(ORT_API_CALL* ReleaseDnnlProviderOptions)(_Frees_ptr_opt_ OrtDnnlProviderOptions* input);
+
+  /// \name OrtKernelInfo
+  /// Custom operator APIs.
+  /// @{
+
+  /** \brief Get the graph node name from ::OrtKernelInfo.
+   *
+   * If `out` is nullptr, the value of `size` is set to the size of the name
+   * string (including null-terminator), and a success status is returned.
+   *
+   * If the `size` parameter is greater than or equal to the name string's size,
+   * the value of `size` is set to the true size of the string (including null-terminator),
+   * the provided memory is filled with the string's contents, and a success status is returned.
+   *
+   * If the `size` parameter is less than the actual string's size and `out`
+   * is not nullptr, the value of `size` is set to the true size of the string
+   * and a failure status is returned.
+   *
+   * Can be used in a custom operator's CreateKernel callback to get the name of the operator's node name in the graph.
+   *
+   * \param[in] info An instance of ::OrtKernelInfo.
+   * \param[out] out Memory location into which to write the UTF-8 null-terminated string representing the name.
+   * \param[in,out] size Pointer to the size of the `out` buffer. See above comments for details.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   * \since Version 1.15
+   */
+  ORT_API2_STATUS(KernelInfo_GetNodeName, _In_ const OrtKernelInfo* info, _Out_ char* out, _Inout_ size_t* size);
+
+  /** \brief Get the session logger from ::OrtKernelInfo.
+   *
+   * Used in the CreateKernel callback of an OrtCustomOp to get a logger that can be used to log
+   * messages.
+   *
+   * \param[in] info An instance of ::OrtKernelInfo.
+   * \param[out] logger Pointer set to the session's ::OrtLogger. Owned by ONNX Runtime, so do not free.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   * \since Version 1.15
+   */
+  ORT_API2_STATUS(KernelInfo_GetLogger, _In_ const OrtKernelInfo* info, _Outptr_ const OrtLogger** logger);
+
+  /// @}
+  /// \name OrtKernelContext
+  /// Custom operator APIs.
+  /// @{
+
+  /** \brief Get the runtime logger from ::OrtKernelContext.
+   *
+   * Used in the KernelCompute callback of an OrtCustomOp to get a logger that can be used to log
+   * messages during inference.
+   *
+   * \param[in] context An instance of ::OrtKernelContext.
+   * \param[out] logger Pointer set to the kernel context's ::OrtLogger. Owned by ONNX Runtime, so do not free.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   * \since Version 1.15
+   */
+  ORT_API2_STATUS(KernelContext_GetLogger, _In_ const OrtKernelContext* context, _Outptr_ const OrtLogger** logger);
+
+  /// @}
+  /// \name OrtLogger
+  /// Custom operator APIs.
+  /// @{
+
+  /** \brief Logs a message at the given severity level using the provided ::OrtLogger.
+   *
+   * Only messages with a severity level equal or greater than the ::OrtLogger's logging severity level
+   * are logged. Use OrtApi::Logger_GetLoggingSeverityLevel to get the ::OrtLogger's logging severity
+   * level.
+   *
+   * Can be used in custom operators to log messages with the logger retrieved via OrtApi::KernelInfo_GetLogger.
+   *
+   * \param[in] logger The ::OrtLogger instance.
+   * \param[in] log_severity_level The message's severity level.
+   * \param[in] message The message to log.
+   * \param[in] file_path The filepath of the file in which the message is logged. Usually the value of ORT_FILE.
+   * \param[in] line_number The file line number in which the message is logged. Usually the value of __LINE__.
+   * \param[in] func_name The name of the function in which the message is logged. Usually the value of __FUNCTION__.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   * \since Version 1.15
+   */
+  ORT_API2_STATUS(Logger_LogMessage, _In_ const OrtLogger* logger, OrtLoggingLevel log_severity_level,
+                  _In_z_ const char* message, _In_z_ const ORTCHAR_T* file_path, int line_number,
+                  _In_z_ const char* func_name);
+
+  /** \brief Get the logging severity level of the ::OrtLogger.
+   *
+   * Can be used in a custom operator to get the logging serverity level of the ::OrtLogger associated with
+   * the ::OrtKernelInfo.
+   *
+   * \param[in] logger The ::OrtLogger instance.
+   * \param[out] out Pointer to variable assigned with the logging severity level on success.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   * \since Version 1.15
+   */
+  ORT_API2_STATUS(Logger_GetLoggingSeverityLevel, _In_ const OrtLogger* logger, _Out_ OrtLoggingLevel* out);
+
+  /// @}
+
+  /** \brief Get a ::OrtValue tensor stored as a constant initializer in the graph node.
+   *
+   * Used in the CreateKernel callback of an OrtCustomOp to get a tensor value.
+   *
+   * \param[in] info ::OrtKernelInfo instance.
+   * \param[in] index The node index.
+   * \param[out] is_constant Is it a constant node input or not.
+   * \param[out] out The OrtValue tensor value.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   *
+   * \since Version 1.15.
+   */
+  ORT_API2_STATUS(KernelInfoGetConstantInput_tensor, _In_ const OrtKernelInfo* info, size_t index, _Out_ int* is_constant, _Outptr_ const OrtValue** out);
+
+  /** \brief Get Optional Type information from an ::OrtTypeInfo
+   *
+   * This augments ::OrtTypeInfo to return an ::OrtOptionalTypeInfo when the type is optional.
+   * The OrtOptionalTypeInfo also has a nested ::OrtTypeInfo that describes the type of the optional value.
+   * ::OrtOptionalTypeInfo type can only appear within model metadata to describe inputs/outputs.
+   * The actual OrtValues that are supplied in place of optional type inputs should contain
+   * specific type that is described by ::OrtOptionalTypeInfo.
+   *
+   * So the picture: ::OrtTypeInfo -> ::OrtOptionalTypeInfo -> ::OrtTypeInfo (describes the type that can be supplied
+   * in place of the optional type when creating the actual ::OrtValue).
+   *
+   * \param[in] type_info
+   * \param[out] out A pointer to the ::OrtOptionalTypeInfo. Do not free this value,
+   *                 it is owned by OrtTypeInfo instance. When the type_info does not represent
+   *                 optional type, nullptr is returned in out.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   *
+   * \since Version 1.15.
+   */
+  ORT_API2_STATUS(CastTypeInfoToOptionalTypeInfo, _In_ const OrtTypeInfo* type_info,
+                  _Outptr_result_maybenull_ const OrtOptionalTypeInfo** out);
+
+  /** \brief Get OrtTypeInfo for the allowed contained type from an ::OrtOptionalTypeInfo.
+   *
+   * This augments ::OrtOptionalTypeInfo to return an ::OrtTypeInfo for the contained type.
+   * The OrtOptionalTypeInfo has a nested ::OrtTypeInfo that describes the type of the optional value.
+   * ::OrtOptionalTypeInfo type can only appear within model metadata to describe inputs/outputs.
+   * The actual OrtValues that are supplied in place of optional type inputs should contain
+   * specific type that is described by the returned ::OrtTypeInfo.
+   *
+   * \param[in] optional_type_info
+   * \param[out] out A copy of ::OrtTypeInfo for what the optional value could be.
+   *                 The user must free this value with ReleaseTypeInfo.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   *
+   * \since Version 1.15.
+   */
+  ORT_API2_STATUS(GetOptionalContainedTypeInfo, _In_ const OrtOptionalTypeInfo* optional_type_info,
+                  _Outptr_ OrtTypeInfo** out);
+
+  /** \brief Set a single string in a string tensor
+   *  Do not zero terminate the string data.
+   *
+   * \param[in] value A string tensor
+   * \param[in] index - flat index of the element
+   * \param[in] length_in_bytes length of the buffer in utf-8 bytes (without the null terminator)
+   * \param[inout] buffer - address of return value
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   */
+  ORT_API2_STATUS(GetResizedStringTensorElementBuffer, _Inout_ OrtValue* value, _In_ size_t index, _In_ size_t length_in_bytes, _Inout_ char** buffer);
+
+  /** \brief Get Allocator from KernelContext for a specific memoryInfo. Please use C API ReleaseAllocator to release out object
+   *
+   * \param[in] context OrtKernelContext instance
+   * \param[in] mem_info OrtMemoryInfo instance
+   * \param[out] out A pointer to OrtAllocator.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   *
+   * \since Version 1.15.
+   */
+  ORT_API2_STATUS(KernelContext_GetAllocator, _In_ const OrtKernelContext* context, _In_ const OrtMemoryInfo* mem_info, _Outptr_ OrtAllocator** out);
+
+  /** \brief Returns a null terminated string of the build info including git info and cxx flags
+   *
+   * \return UTF-8 encoded version string. Do not deallocate the returned buffer.
+   *
+   * \since Version 1.15.
+   */
+  const char*(ORT_API_CALL* GetBuildInfoString)(void);
+
+  /// \name OrtROCMProviderOptions
+  /// @{
+
+  /** \brief Create an OrtROCMProviderOptions
+   *
+   * \param[out] out Newly created ::OrtROCMProviderOptions. Must be released with OrtApi::ReleaseROCMProviderOptions
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   *
+   * \since Version 1.16.
+   */
+  ORT_API2_STATUS(CreateROCMProviderOptions, _Outptr_ OrtROCMProviderOptions** out);
+
+  /** \brief Set options in a ROCm Execution Provider.
+   *
+   * Please refer to https://onnxruntime.ai/docs/execution-providers/ROCm-ExecutionProvider.html
+   * to know the available keys and values. Key should be in null terminated string format of the member of
+   * ::OrtROCMProviderOptions and value should be its related range.
+   *
+   * For example, key="device_id" and value="0"
+   *
+   * \param[in] rocm_options
+   * \param[in] provider_options_keys Array of UTF-8 null-terminated string for provider options keys
+   * \param[in] provider_options_values Array of UTF-8 null-terminated string for provider options values
+   * \param[in] num_keys Number of elements in the `provider_option_keys` and `provider_options_values` arrays
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   *
+   * \since Version 1.16.
+   */
+  ORT_API2_STATUS(UpdateROCMProviderOptions, _Inout_ OrtROCMProviderOptions* rocm_options,
+                  _In_reads_(num_keys) const char* const* provider_options_keys,
+                  _In_reads_(num_keys) const char* const* provider_options_values,
+                  _In_ size_t num_keys);
+
+  /**
+   * Get serialized ROCm provider options string.
+   *
+   * For example, "device_id=0;arena_extend_strategy=0;......"
+   *
+   * \param rocm_options - OrtROCMProviderOptions instance
+   * \param allocator - a ptr to an instance of OrtAllocator obtained with CreateAllocator() or GetAllocatorWithDefaultOptions()
+   *                      the specified allocator will be used to allocate continuous buffers for output strings and lengths.
+   * \param ptr - is a UTF-8 null terminated string allocated using 'allocator'. The caller is responsible for using the same allocator to free it.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   *
+   * \since Version 1.16.
+   */
+  ORT_API2_STATUS(GetROCMProviderOptionsAsString, _In_ const OrtROCMProviderOptions* rocm_options, _Inout_ OrtAllocator* allocator, _Outptr_ char** ptr);
+
+  /** \brief Release an ::OrtROCMProviderOptions
+   *
+   * \note This is an exception in the naming convention of other Release* functions, as the name of the method does not have the V2 suffix, but the type does
+   *
+   * \since Version 1.16.
+   */
+  void(ORT_API_CALL* ReleaseROCMProviderOptions)(_Frees_ptr_opt_ OrtROCMProviderOptions* input);
+
+  /** \brief Create an allocator with specific type and register it with the ::OrtEnv
+   *  This API enhance CreateAndRegisterAllocator that it can create an allocator with specific type, not just CPU allocator
+   *  Enables sharing the allocator between multiple sessions that use the same env instance.
+   *  Lifetime of the created allocator will be valid for the duration of the environment.
+   *  Returns an error if an allocator with the same ::OrtMemoryInfo is already registered.
+   *  \param[in] env OrtEnv instance
+   *  \param[in] provider_type ExecutionProvider type
+   *  \param[in] mem_info OrtMemoryInfo instance
+   *  \param[in] arena_cfg Arena configuration
+   *  \param[in] provider_options_keys key of the provider options map
+   *  \param[in] provider_options_values value of the provider options map
+   *  \param[in] num_keys Length of the provider options map
+   */
+  ORT_API2_STATUS(CreateAndRegisterAllocatorV2, _Inout_ OrtEnv* env, _In_ const char* provider_type, _In_ const OrtMemoryInfo* mem_info, _In_ const OrtArenaCfg* arena_cfg,
+                  _In_reads_(num_keys) const char* const* provider_options_keys, _In_reads_(num_keys) const char* const* provider_options_values, _In_ size_t num_keys);
+
+  /** \brief Run the model asynchronously in a thread owned by intra op thread pool
+   *
+   * \param[in] session
+   * \param[in] run_options If nullptr, will use a default ::OrtRunOptions
+   * \param[in] input_names Array of null terminated UTF8 encoded strings of the input names
+   * \param[in] input Array of ::OrtValue%s of the input values
+   * \param[in] input_len Number of elements in the input_names and inputs arrays
+   * \param[in] output_names Array of null terminated UTF8 encoded strings of the output names
+   * \param[in] output_names_len Number of elements in the output_names and outputs array
+   * \param[out] output OrtValue* array of size output_names_len.
+   *             On calling RunAsync, output[i] could either be a null or a pointer to a preallocated OrtValue.
+   *             Later, the output array will be passed to run_async_callback with all null(s) filled with valid
+   *             OrtValue pointer(s) allocated by onnxruntime.
+   *             NOTE: it is customer's duty to finally release the output array and each of its member,
+   *             regardless of whether the member (OrtValue*) is allocated by onnxruntime or preallocated by the customer.
+   * \param[in] run_async_callback Callback function on model run completion
+   * \param[in] user_data User data that pass back to run_async_callback
+   */
+  ORT_API2_STATUS(RunAsync, _Inout_ OrtSession* session, _In_opt_ const OrtRunOptions* run_options,
+                  _In_reads_(input_len) const char* const* input_names,
+                  _In_reads_(input_len) const OrtValue* const* input, size_t input_len,
+                  _In_reads_(output_names_len) const char* const* output_names, size_t output_names_len,
+                  _Inout_updates_all_(output_names_len) OrtValue** output,
+                  _In_ RunAsyncCallbackFn run_async_callback, _In_opt_ void* user_data);
+
+  /**
+   * Update TensorRT EP provider option where its data type is pointer, for example 'user_compute_stream'.
+   * If the data type of the provider option can be represented by string please use UpdateTensorRTProviderOptions.
+   *
+   * Note: It's caller's responsibility to properly manage the lifetime of the instance pointed by this pointer.
+   *
+   * \param tensorrt_options - OrtTensorRTProviderOptionsV2 instance
+   * \param key - Name of the provider option
+   * \param value - A pointer to the instance that will be assigned to this provider option
+   *
+   * \since Version 1.16.
+   */
+  ORT_API2_STATUS(UpdateTensorRTProviderOptionsWithValue, _Inout_ OrtTensorRTProviderOptionsV2* tensorrt_options, _In_ const char* key, _In_ void* value);
+
+  /**
+   * Get TensorRT EP provider option where its data type is pointer.
+   * If the data type of the provider option can be represented by string please use GetTensorRTProviderOptionsAsString.
+   *
+   * \param tensorrt_options - OrtTensorRTProviderOptionsV2 instance
+   * \param key - Name of the provider option
+   * \param ptr - A pointer to the instance that is kept by the provider option
+   *
+   * \since Version 1.16.
+   */
+  ORT_API2_STATUS(GetTensorRTProviderOptionsByName, _In_ const OrtTensorRTProviderOptionsV2* tensorrt_options, _In_ const char* key, _Outptr_ void** ptr);
+
+  /**
+   * Update CUDA EP provider option where its data type is pointer, for example 'user_compute_stream'.
+   * If the data type of the provider option can be represented by string please use UpdateCUDAProviderOptions.
+   *
+   * Note: It's caller's responsibility to properly manage the lifetime of the instance pointed by this pointer.
+   *
+   * \param cuda_options - OrtCUDAProviderOptionsV2 instance
+   * \param key - Name of the provider option
+   * \param value - A pointer to the instance that will be assigned to this provider option
+   *
+   * \since Version 1.16.
+   */
+  ORT_API2_STATUS(UpdateCUDAProviderOptionsWithValue, _Inout_ OrtCUDAProviderOptionsV2* cuda_options, _In_ const char* key, _In_ void* value);
+
+  /**
+   * Get CUDA EP provider option where its data type is pointer.
+   * If the data type of the provider option can be represented by string please use GetCUDAProviderOptionsAsString.
+   *
+   * \param cuda_options - OrtCUDAProviderOptionsV2 instance
+   * \param key - Name of the provider option
+   * \param ptr - A pointer to the instance that is kept by the provider option
+   *
+   * \since Version 1.16.
+   */
+  ORT_API2_STATUS(GetCUDAProviderOptionsByName, _In_ const OrtCUDAProviderOptionsV2* cuda_options, _In_ const char* key, _Outptr_ void** ptr);
+
+  /**
+   * Get a EP resource.
+   * E.g. a cuda stream or a cublas handle
+   *
+   * \param context - Kernel context
+   * \param resource_version - Version of the resource
+   * \param resource_id - Type of resource
+   * \param resource - A pointer to returned resource
+   *
+   * \since Version 1.16.
+   */
+  ORT_API2_STATUS(KernelContext_GetResource, _In_ const OrtKernelContext* context, _In_ int resource_version,
+                  _In_ int resource_id, _Outptr_ void** resource);
+
+  /** \brief Set user logging function
+   *
+   *  By default the logger created by the CreateEnv* functions is used to create the session logger as well.
+   *  This function allows a user to override this default session logger with a logger of their own choosing. This way
+   *  the user doesn't have to create a separate environment with a custom logger. This addresses the problem when
+   *  the user already created an env but now wants to use a different logger for a specific session (for debugging or
+   *  other reasons).
+   *
+   * \param[in] options
+   * \param[in] user_logging_function A pointer to a logging function.
+   * \param[in] user_logging_param A pointer to arbitrary data passed as the ::OrtLoggingFunction `param` parameter to
+   *                         `user_logging_function`. This parameter is optional.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   *
+   * \since Version 1.17.
+   */
+  ORT_API2_STATUS(SetUserLoggingFunction, _Inout_ OrtSessionOptions* options,
+                  _In_ OrtLoggingFunction user_logging_function, _In_opt_ void* user_logging_param);
+
+  /**
+   * Get number of input from OrtShapeInferContext
+   *
+   * \param[in] context
+   * \param[out] out The number of inputs
+   *
+   * \since Version 1.17.
+   */
+  ORT_API2_STATUS(ShapeInferContext_GetInputCount, _In_ const OrtShapeInferContext* context, _Out_ size_t* out);
+
+  /**
+   * Get type and shape info of an input
+   *
+   * \param[in] context
+   * \param[in] index The index of the input
+   * \param[out] info Type shape info of the input
+   *
+   * \since Version 1.17.
+   */
+  ORT_API2_STATUS(ShapeInferContext_GetInputTypeShape, _In_ const OrtShapeInferContext* context, _In_ size_t index, _Outptr_ OrtTensorTypeAndShapeInfo** info);
+
+  /**
+   * Get attribute from OrtShapeInferContext. Note that OrtShapeInferContext is a per-node context, one could only read attribute from current node.
+   *
+   * \param[in] context
+   * \param[in] attr_name Name of the attribute
+   * \param[out] attr Handle of the attribute fetched
+   *
+   * \since Version 1.17.
+   */
+  ORT_API2_STATUS(ShapeInferContext_GetAttribute, _In_ const OrtShapeInferContext* context, _In_ const char* attr_name, _Outptr_ const OrtOpAttr** attr);
+
+  /**
+   * Set type and shape info of an output
+   *
+   * \param[in] context
+   * \param[in] index The index of the output
+   * \param[out] info Type shape info of the output
+   *
+   * \since Version 1.17.
+   */
+  ORT_API2_STATUS(ShapeInferContext_SetOutputTypeShape, _In_ const OrtShapeInferContext* context, _In_ size_t index, _In_ const OrtTensorTypeAndShapeInfo* info);
+
+  /**
+   * Set symbolic shape to type shape info
+   *
+   * \param[in] info Type shape info
+   * \param[in] dim_params Symbolic strings
+   * \param[in] dim_params_length Number of strings
+   *
+   * \since Version 1.17.
+   */
+  ORT_API2_STATUS(SetSymbolicDimensions, _In_ OrtTensorTypeAndShapeInfo* info, _In_ const char* dim_params[], _In_ size_t dim_params_length);
+
+  /**
+   * Read contents of an attribute to data
+   *
+   * \param[in] op_attr
+   * \param[in] type Attribute type
+   * \param[out] data Memory address to save raw content of the attribute
+   * \param[in] len Number of bytes allowed to store in data
+   * \param[out] out Number of bytes required to save the data when the call failed, or the real number of bytes saved to data on success
+   *
+   * \since Version 1.17.
+   */
+  ORT_API2_STATUS(ReadOpAttr, _In_ const OrtOpAttr* op_attr, _In_ OrtOpAttrType type, _Inout_ void* data, _In_ size_t len, _Out_ size_t* out);
+
+  /** \brief Set whether to use deterministic compute.
+   *
+   * Default is false. If set to true, this will enable deterministic compute for GPU kernels where possible.
+   * Note that this most likely will have a performance cost.
+   *
+   * \param[in] options
+   * \param[in] value
+   *
+   * \since Version 1.17.
+   */
+  ORT_API2_STATUS(SetDeterministicCompute, _Inout_ OrtSessionOptions* options, bool value);
+
+  /**
+   * Run fn in parallel
+   *
+   * \param[in] context
+   * \param[in] fn Function accepting usr_data and an integer as iterator
+   * \param[in] total The number of times fn is to be invoked
+   * \param[in] num_batch Number of batches by which the "total" is to be divided in maximum. When zero, there is no limit
+   * \param[in] usr_data User data to be passed back to fn
+   *
+   * \since Version 1.17.
+   */
+  ORT_API2_STATUS(KernelContext_ParallelFor, _In_ const OrtKernelContext* context, _In_ void (*fn)(void*, size_t), _In_ size_t total, _In_ size_t num_batch, _In_ void* usr_data);
+
+  /** \brief Append OpenVINO execution provider to the session options
+   *
+   * If OpenVINO is not available (due to a non OpenVINO enabled build, or if OpenVINO is not installed on the system), this function will fail.
+   *
+   * \param[in] options
+   * \param[in] provider_options_keys
+   * \param[in] provider_options_values
+   * \param[in] num_keys
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   *
+   * \since Version 1.17.
+   */
+  ORT_API2_STATUS(SessionOptionsAppendExecutionProvider_OpenVINO_V2,
+                  _In_ OrtSessionOptions* options,
+                  _In_reads_(num_keys) const char* const* provider_options_keys,
+                  _In_reads_(num_keys) const char* const* provider_options_values,
+                  _In_ size_t num_keys);
+
+  /** \brief Append VitisAI provider to session options
+   *
+   * If VitisAI is not available (due to a non VitisAI enabled build, or if VitisAI is not installed on the system), this function will return failure.
+   *
+   * \param[in] options
+   * \param[in] provider_options_keys
+   * \param[in] provider_options_values
+   * \param[in] num_keys
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   *
+   * \since Version 1.18.
+   */
+  ORT_API2_STATUS(SessionOptionsAppendExecutionProvider_VitisAI,
+                  _In_ OrtSessionOptions* options,
+                  _In_reads_(num_keys) const char* const* provider_options_keys,
+                  _In_reads_(num_keys) const char* const* provider_options_values,
+                  _In_ size_t num_keys);
+
+  /** \brief Get scratch buffer from the corresponding allocator under the sepcific OrtMemoryInfo object.
+   *         NOTE: callers are responsible to release this scratch buffer from the corresponding allocator
+   *  \param[in] context OrtKernelContext instance
+   *  \param[in] mem_info OrtMemoryInfo instance
+   *  \param[in] count_or_bytes How many bytes is this scratch buffer
+   *  \param[out] out A pointer to the scrach buffer
+   *
+   *  \snippet{doc} snippets.dox OrtStatus Return Value
+   *
+   * \since Version 1.18.
+   */
+  ORT_API2_STATUS(KernelContext_GetScratchBuffer, _In_ const OrtKernelContext* context, _In_ const OrtMemoryInfo* mem_info, _In_ size_t count_or_bytes, _Outptr_ void** out);
+
+  /** \brief Get allocator from KernelInfo for a specific memory type. Please use C API ReleaseAllocator to release out object
+   *
+   * \param[in] info OrtKernelInfo instance
+   * \param[in] mem_type OrtMemType object
+   * \param[out] out A pointer to OrtAllocator
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   *
+   * \since Version 1.18.
+   */
+  ORT_API2_STATUS(KernelInfoGetAllocator, _In_ const OrtKernelInfo* info, _In_ OrtMemType mem_type, _Outptr_ OrtAllocator** out);
+
+  /** \brief Replace initialized Tensors with external data with the provided files in memory
+   *
+   * The function will find the initialized TensorProtos with external data in the graph with the provided
+   * external file names and the file content in memory. The API gets the external file name, offset, data length
+   * from TensorProto, and locate the tensor data from the file in memory buffer.
+   * It creates a Tensor to replace the existing Tensor in graph. The replacement
+   * will occur before any of the optimizations take place. The data will be copied into the graph
+   * since TensorProto can't refer to the user provided buffers.
+   *
+   * \param[in] options
+   * \param[in] external_initializer_file_names Array of null terminated UTF-8 encoded strings of the file names
+   *            which holds the external initializers.
+   * \param[in] external_initializer_file_buffer_array Array of pointers to the buffer of the file content.
+   *            The buffer can be freed after session creation.
+   * \param[in] external_initializer_file_lengths Array of size_t to indicate the length of file content
+   * \param[in] num_external_initializer_files Number of external files
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   *
+   * \since Version 1.18.
+   */
+  ORT_API2_STATUS(AddExternalInitializersFromFilesInMemory, _In_ OrtSessionOptions* options,
+                  _In_reads_(num_external_initializer_files) const ORTCHAR_T* const* external_initializer_file_names,
+                  _In_reads_(num_external_initializer_files) char* const* external_initializer_file_buffer_array,
+                  _In_reads_(num_external_initializer_files) const size_t* external_initializer_file_lengths,
+                  size_t num_external_initializer_files);
+
+  /** \brief Create an OrtLoraAdapter
+   *
+   * The function attempts to locate file specified by adapter_file_path, read it and create an OrtLoraAdapter
+   * instance. The adapter_file_path should be a valid path to a file that contains a valid Lora Adapter
+   * format. The function attempts to validate the format at load time. The file will always be memory mapped, unless
+   * the platform does not support memory mapping, in which case the file will be read into memory.
+   *
+   * \param[in] adapter_file_path adapter file path.
+   * \param[in] allocator optional pointer to a device allocator. If specified
+   *            data is copied to the device at some point before Run() is invoked. If nullptr, data stays on CPU.
+   *            The data would still be copied to device if required by the model at inference time.
+   * \param[out] out A pointer to a newly created OrtLoraAdapter instance. Must be released with
+   *                  OrtApi::ReleaseLoraAdapter.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   *
+   * \since Version 1.20.
+   */
+  ORT_API2_STATUS(CreateLoraAdapter, const ORTCHAR_T* adapter_file_path, _In_ OrtAllocator* allocator,
+                  _Outptr_ OrtLoraAdapter** out);
+
+  /** \brief Create an OrtLoraAdapter
+   *
+   * The function copies the bytes from the array and creates an OrtLoraAdapter instance.
+   *
+   *
+   * \param[in] bytes pointer to a valid Lora Adapter format buffer.
+   * \param[in] num_bytes length of bytes buffer.
+   * \param[in] allocator optional pointer to a device allocator. If specified
+   *            data is copied to the device at some point before Run() is invoked. If nullptr, data stays on CPU.
+   *            The data would still be copied to device if required by the model at inference time.
+   * \param[out] out A pointer to a newly created OrtLoraAdapter instance. Must be released with
+   *                  OrtApi::ReleaseLoraAdapter.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   *
+   * \since Version 1.20.
+   */
+  ORT_API2_STATUS(CreateLoraAdapterFromArray, _In_ const void* bytes, size_t num_bytes, _In_ OrtAllocator* allocator,
+                  _Outptr_ OrtLoraAdapter** out);
+
+  /** \brief Release an ::OrtLoraAdapter obtained from OrtApi::CreateLoraAdapter
+   */
+  ORT_CLASS_RELEASE(LoraAdapter);
+
+  /** \brief Add the Lora Adapter to the list of active adapters.
+   *
+   * The function adds the Lora Adapter to the list of active adapters. The Lora Adapter must be created with
+   * OrtApi::CreateLoraAdapter or FromArray. The Lora Adapter will be used by the session to run the model.
+   * The instance of the OrtRunOptions can then be used to customize the Run() calls.
+   * More than one OrtLoraAdapter can be active at the same time. Lora Parameters that belong to different
+   * Lora adapters that will be active at the same time must not overlap.
+   * This setting does not affect RunWithBinding.
+   *
+   * \param[in] options OrtRunOptions instance
+   * \param[in] adapter OrtLoraAdapter instance
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   *
+   * \since Version 1.20.
+   */
+  ORT_API2_STATUS(RunOptionsAddActiveLoraAdapter, _Inout_ OrtRunOptions* options, _In_ const OrtLoraAdapter* adapter);
+
+  /// @}
+  /// \name OrtEpDynamicOptions
+  /// @{
+
+  /** \brief Set DynamicOptions for EPs (Execution Providers)
+   *
+   * Valid options can be found in `include\onnxruntime\core\session\onnxruntime_session_options_config_keys.h`
+   * Look for `kOrtEpDynamicOptions`
+   *
+   * \param[in] sess OrtSession
+   * \param[in] keys Array of null terminated UTF8 encoded strings of EP dynamic option keys
+   * \param[in] values Array of null terminated UTF8 encoded string of EP dynamic option values
+   * \param[in] kv_len Number of elements in the keys and values arrays
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   *
+   * \since Version 1.20.
+   */
+  ORT_API2_STATUS(SetEpDynamicOptions, _Inout_ OrtSession* sess, _In_reads_(kv_len) const char* const* keys,
+                  _In_reads_(kv_len) const char* const* values, _In_ size_t kv_len);
+
+  /** \brief Release an OrtValueInfo instance if it was not added to an OrtGraph.
+   * \since Version 1.22.
+   */
+  ORT_CLASS_RELEASE(ValueInfo);
+
+  /** \brief Release an OrtNode if it was not added to an OrtGraph.
+   * \since Version 1.22.
+   */
+  ORT_CLASS_RELEASE(Node);
+
+  /** \brief Release an OrtGraph.
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   * \since Version 1.22.
+   */
+  ORT_CLASS_RELEASE(Graph);
+
+  /** \brief Release an OrtModel.
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   * \since Version 1.22.
+   */
+  ORT_CLASS_RELEASE(Model);
+
+  /** \brief Get the value name from an OrtValueInfo instance.
+   * \param[in] value_info The OrtValueInfo instance.
+   * \param[out] name The name of the OrtValueInfo
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   * \since Version 1.22.
+   */
+  ORT_API2_STATUS(GetValueInfoName, _In_ const OrtValueInfo* value_info, _Out_ const char** name);
+
+  /** \brief Get the type information from an OrtValueInfo instance.
+   * \param[in] value_info The OrtValueInfo instance.
+   * \param[out] type_info The type info of the OrtValueInfo
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   * \since Version 1.22.
+   */
+  ORT_API2_STATUS(GetValueInfoTypeInfo, _In_ const OrtValueInfo* value_info, _Outptr_ const OrtTypeInfo** type_info);
+
+  /** \brief Get the Model Editor API instance
+   *
+   * Get the Model Editor API instance to create a new model or augment an existing model.
+   *
+   * \return Model Editor API struct
+   *
+   * \since Version 1.22.
+   */
+  const OrtModelEditorApi*(ORT_API_CALL* GetModelEditorApi)();
+
+  /** \brief Create an OrtValue for a Tensor that uses pre-existing memory.
+   *
+   * ORT will take ownership of the memory and free it using the provided deleter when no longer in use.
+   *
+   * \param[in] deleter OrtAllocator instance that will be used to free the memory.
+   *                    Only the OrtAllocator:Info and OrtAllocator::Release functions are required.
+   *                    The OrtMemoryInfo returned by OrtAllocator::Info must match the location of p_data.
+   * \param[in] p_data Pointer to the memory that will be used by the Tensor. ORT will take ownership of the memory.
+   * \param[in] p_data_len Length of the memory in bytes.
+   * \param[in] shape Dimensions of the Tensor. All values should be > 0.
+   * \param[in] shape_len Number of dimensions in the shape array.
+   * \param[in] type Data type of the Tensor.
+   * \param[out] out Newly created ::OrtValue. Must be freed with OrtApi::ReleaseValue
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   *
+   * \since Version 1.22.
+   */
+  ORT_API2_STATUS(CreateTensorWithDataAndDeleterAsOrtValue, _In_ OrtAllocator* deleter,
+                  _In_ void* p_data, size_t p_data_len,
+                  _In_ const int64_t* shape, size_t shape_len,
+                  ONNXTensorElementDataType type,
+                  _Outptr_ OrtValue** out);
+
+  /** \brief sets load cancellation flag to abort session loading process.
+   *
+   * \param[in] options instance that was passed to the session at creation time.
+   * \param[in] cancel setting this to true after model loading process was initiated will
+   *            attempt to cancel the loading process. If cancellation is successful, CreateSession()
+   *            CreateSessionFromArray() or any other session creation API that take session options as an
+   *            argument will return an OrtStatus indicating that session loading was canceled at user request,
+   *            error code ORT_MODEL_LOAD_CANCELED.
+   *            The APIs above would not return any valid Session instance. This is the best case effort and the result
+   *            is not guaranteed. The session may have already been created and initialized
+   *            before the cancellation request was issued.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   *
+   * \since Version 1.22.
+   */
+  ORT_API2_STATUS(SessionOptionsSetLoadCancellationFlag, _Inout_ OrtSessionOptions* options,
+                  _In_ bool cancel);
+
+  /** \brief Get the Compile API instance.
+   *
+   * Get the Compile API instance to compile ONNX models. Execution providers that support compilation fuse a subgraph
+   * into an EPContext node that wraps a provider-specific binary representation of the subgraph.
+   * For more details about the EPContext design, refer to:
+   *  \htmlonly
+   *  <a href="https://onnxruntime.ai/docs/execution-providers/EP-Context-Design.html">EPContext design document.</a>
+   *  \endhtmlonly
+   *
+   * \return Compile API struct instance.
+   *
+   * \since Version 1.22.
+   */
+  const OrtCompileApi*(ORT_API_CALL* GetCompileApi)();
+
+  //
+  // OrtKeyValuePairs
+  //
+
+  /** \brief Create an OrtKeyValuePairs instance.
+   *
+   * \param[out] out A pointer to a newly created OrtKeyValuePairs instance.
+   *
+   * \note Must be released by calling ReleaseKeyValuePairs.
+   *
+   * \since Version 1.22.
+   */
+  void(ORT_API_CALL* CreateKeyValuePairs)(_Outptr_ OrtKeyValuePairs** out);
+
+  /** \brief Add a key-value pair to the OrtKeyValuePairs instance.
+   *
+   * \param[in] kvps OrtKeyValuePairs instance.
+   * \param[in] key Key to be added.
+   * \param[in] value Value to be added.
+   *
+   * \note The `key` and `value` are copied internally.
+   *
+   * \since Version 1.22.
+   */
+
+  void(ORT_API_CALL* AddKeyValuePair)(_In_ OrtKeyValuePairs* kvps, _In_ const char* key, _In_ const char* value);
+
+  /** \brief Get the value associated with a key in the OrtKeyValuePairs instance.
+   *
+   * \param[in] kvps OrtKeyValuePairs instance.
+   * \param[in] key Key to be searched.
+   *
+   * \return The value associated with the key, or nullptr if the key does not exist.
+   *
+   * \since Version 1.22.
+   */
+  const char*(ORT_API_CALL* GetKeyValue)(_In_ const OrtKeyValuePairs* kvps, _In_ const char* key);
+
+  /** \brief Get all the key-value pairs from the OrtKeyValuePairs instance.
+   *
+   * \param[in] kvps OrtKeyValuePairs instance.
+   * \param[out] keys Array of keys from `kvps`.
+   * \param[out] values Array of values from `kvps`.
+   * \param[out] num_entries Number of entries in `keys` and `values`.
+   *
+   * \since Version 1.22.
+   */
+  void(ORT_API_CALL* GetKeyValuePairs)(_In_ const OrtKeyValuePairs* kvps,
+                                       _Outptr_ const char* const** keys, _Outptr_ const char* const** values,
+                                       _Out_ size_t* num_entries);
+
+  /** \brief Remove a key-value pair from the OrtKeyValuePairs instance.
+   *
+   * \param[in] kvps OrtKeyValuePairs instance.
+   * \param[in] key Key to be removed. No error if not found.
+   *
+   * \since Version 1.22.
+   */
+  void(ORT_API_CALL* RemoveKeyValuePair)(_In_ OrtKeyValuePairs* kvps, _In_ const char* key);
+
+  /** \brief Release an OrtKeyValuePairs instance.
+   *
+   * \param[in] input OrtKeyValuePairs instance to be released.
+   *
+   * \since Version 1.22.
+   */
+  ORT_CLASS_RELEASE(KeyValuePairs);
+
+  /** \brief Register an execution provider library with ORT.
+   *
+   * The library must export 'CreateEpFactories' and 'ReleaseEpFactory' functions.
+   * See OrtEpApi for more details.
+   *
+   * \param[in] env The OrtEnv instance to register the library in.
+   * \param[in] registration_name The name to register the execution provider library under.
+   * \param[in] path The path to the execution provider library.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   *
+   * \since Version 1.22.
+   */
+  ORT_API2_STATUS(RegisterExecutionProviderLibrary, _In_ OrtEnv* env, _In_ const char* registration_name,
+                  _In_ const ORTCHAR_T* path);
+
+  /** \brief Unregister an execution provider library with ORT.
+   *
+   * ORT will call ReleaseEpFactory for all factories created by the library, and unload the library.
+   *
+   * You <b>MUST</b> ensure there are no Session instances using execution providers created by the library
+   * before calling this function.
+   *
+   * \param[in] env The OrtEnv instance to unregister the library from.
+   * \param[in] registration_name The name the execution provider library was registered under.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   *
+   * \since Version 1.22.
+   */
+  ORT_API2_STATUS(UnregisterExecutionProviderLibrary, _In_ OrtEnv* env, _In_ const char* registration_name);
+
+  /** \brief Get the list of available OrtEpDevice instances.
+   *
+   * Each OrtEpDevice instance contains details of the execution provider and the device it will use.
+   *
+   * \param[in] env The OrtEnv instance to query.
+   * \param[out] ep_devices The OrtEpDevice instances that the execution provider will use.
+   * \param[out] num_ep_devices The number of OrtEpDevice instances returned.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   *
+   * \since Version 1.22.
+   */
+  ORT_API2_STATUS(GetEpDevices, _In_ const OrtEnv* env,
+                  _Outptr_ const OrtEpDevice* const** ep_devices, _Out_ size_t* num_ep_devices);
+
+  /** \brief Append the execution provider that is responsible for the selected OrtEpDevice instances
+   *         to the session options.
+   *
+   * \param[in] session_options Session options to add execution provider to.
+   * \param[in] env Environment that execution providers were registered with.
+   * \param[in] ep_devices One or more OrtEpDevice instances to create an execution provider for.
+   *                       Obtain from GetEpDevices. All OrtEpDevice instances must be from the same execution
+   *                       provider. It is only necessary to provide multiple OrtEpDevices if you want to use the
+   *                       same execution provider for multiple devices.
+   *                       e.g. the EP is capable of running on GPU and NPU.
+   * \param[in] num_ep_devices Number of OrtEpDevice instances.
+   * \param[in] ep_option_keys Optional keys to configure the execution provider.
+   * \param[in] ep_option_vals Optional values to configure the execution provider.
+   * \param[in] num_ep_options Number of execution provide options to add.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   *
+   * \since Version 1.22.
+   */
+  ORT_API2_STATUS(SessionOptionsAppendExecutionProvider_V2, _In_ OrtSessionOptions* session_options,
+                  _In_ OrtEnv* env,
+                  _In_reads_(num_ep_devices) const OrtEpDevice* const* ep_devices, _In_ size_t num_ep_devices,
+                  _In_reads_(num_op_options) const char* const* ep_option_keys,
+                  _In_reads_(num_op_options) const char* const* ep_option_vals,
+                  size_t num_ep_options);
+
+  /** \brief Set the execution provider selection policy for the session.
+   *
+   * Allows users to specify a device selection policy for automatic execution provider (EP) selection.
+   * If custom selection is required please use SessionOptionsSetEpSelectionPolicyDelegate instead.
+   *
+   * \param[in] session_options The OrtSessionOptions instance.
+   * \param[in] policy The device selection policy to use (see OrtExecutionProviderDevicePolicy).
+   *
+   * \since Version 1.22
+   */
+  ORT_API2_STATUS(SessionOptionsSetEpSelectionPolicy, _In_ OrtSessionOptions* session_options,
+                  _In_ OrtExecutionProviderDevicePolicy policy);
+
+  /** \brief Set the execution provider selection policy delegate for the session.
+   *
+   * Allows users to provide a custom device selection policy for automatic execution provider (EP) selection.
+   *
+   * \param[in] session_options The OrtSessionOptions instance.
+   * \param[in] delegate Delegate callback for custom selection.
+   * \param[in] delegate_state Optional state that will be passed to the delegate callback. nullptr if not required.
+   *
+   * \since Version 1.22
+   */
+  ORT_API2_STATUS(SessionOptionsSetEpSelectionPolicyDelegate, _In_ OrtSessionOptions* session_options,
+                  _In_ EpSelectionDelegate delegate,
+                  _In_opt_ void* delegate_state);
+
+  /** \brief Get the hardware device type.
+   *
+   * \param[in] device The OrtHardwareDevice instance to query.
+   * \return The hardware device type.
+   *
+   * \since Version 1.22.
+   */
+  OrtHardwareDeviceType(ORT_API_CALL* HardwareDevice_Type)(_In_ const OrtHardwareDevice* device);
+
+  /** \brief Get the hardware device's vendor identifier.
+   *
+   * \param[in] device The OrtHardwareDevice instance to query.
+   * \return The hardware device vendor identifier.
+   *
+   * \since Version 1.22.
+   */
+  uint32_t(ORT_API_CALL* HardwareDevice_VendorId)(_In_ const OrtHardwareDevice* device);
+
+  /** \brief Get the hardware device's vendor name.
+   *
+   * \param[in] device The OrtHardwareDevice instance to query.
+   * \return The hardware device's vendor name.
+   *
+   * \since Version 1.22.
+   */
+  const char*(ORT_API_CALL* HardwareDevice_Vendor)(_In_ const OrtHardwareDevice* device);
+
+  /** \brief Get the hardware device's unique identifier.
+   *
+   * \param[in] device The OrtHardwareDevice instance to query.
+   * \return The device id.
+   *
+   * \note This is not a unique identifier. It identifies the hardware type when combined with vendor id.
+   * \since Version 1.22.
+   */
+  uint32_t(ORT_API_CALL* HardwareDevice_DeviceId)(_In_ const OrtHardwareDevice* device);
+
+  /** \brief Get hardware device metadata.
+   *
+   * \param[in] device The OrtHardwareDevice instance to query.
+   * \return An OrtKeyValuePairs instance containing the metadata for the device.
+   *         Note: ORT owns the instance so the user must not call ReleaseKeyValuePairs with it.
+   *
+   * \since Version 1.22.
+   */
+  const OrtKeyValuePairs*(ORT_API_CALL* HardwareDevice_Metadata)(_In_ const OrtHardwareDevice* device);
+
+  /** \brief Get the execution provider name.
+   *
+   * \param[in] ep_device The OrtEpDevice instance to query.
+   * \return The execution provider name.
+   *
+   * \since Version 1.22.
+   */
+  const char*(ORT_API_CALL* EpDevice_EpName)(_In_ const OrtEpDevice* ep_device);
+
+  /** \brief Get the execution provider's vendor name.
+   *
+   * \param[in] ep_device The OrtEpDevice instance to query.
+   * \return The execution provider's vendor name.
+   *
+   * \since Version 1.22.
+   */
+  const char*(ORT_API_CALL* EpDevice_EpVendor)(_In_ const OrtEpDevice* ep_device);
+
+  /** \brief Get the metadata for the OrtEpDevice.
+   *
+   * \param[in] ep_device The OrtEpDevice instance to query.
+   * \return An OrtKeyValuePairs instance containing the metadata for the device.
+   *
+   * \since Version 1.22.
+   */
+  const OrtKeyValuePairs*(ORT_API_CALL* EpDevice_EpMetadata)(_In_ const OrtEpDevice* ep_device);
+
+  /** \brief Get the execution provider options for the OrtEpDevice.
+   *
+   * \param[in] ep_device The OrtEpDevice instance to query.
+   * \return An OrtKeyValuePairs instance containing the execution provider options for the device.
+   *
+   * \since Version 1.22.
+   */
+  const OrtKeyValuePairs*(ORT_API_CALL* EpDevice_EpOptions)(_In_ const OrtEpDevice* ep_device);
+
+  /** \brief Get the OrtHardwareDevice instance for the OrtEpDevice.
+   *
+   * \param[in] ep_device The OrtEpDevice instance to query.
+   * \return The OrtHardwareDevice instance for the device.
+   *
+   * \since Version 1.22.
+   */
+  const OrtHardwareDevice*(ORT_API_CALL* EpDevice_Device)(_In_ const OrtEpDevice* ep_device);
+
+  /** \brief Get the OrtEpApi instance for implementing an execution provider.
+   *
+   * \since Version 1.22.
+   */
+  const OrtEpApi*(ORT_API_CALL* GetEpApi)();
+};
+
+/*
+ * Steps to use a custom op:
+ *   1 Create an OrtCustomOpDomain with the domain name used by the custom ops
+ *   2 Create an OrtCustomOp structure for each op and add them to the domain
+ *   3 Call OrtAddCustomOpDomain to add the custom domain of ops to the session options
+ */
+
+// Specifies some characteristics of inputs/outputs of custom ops:
+// Specify if the inputs/outputs are one of:
+// 1) Non-optional (input/output must be present in the node)
+// 2) Optional (input/output may be absent in the node)
+// 3) Variadic: A variadic input or output specifies N (i.e., the minimum arity) or more operands.
+//              Only the last input or output of a custom op may be marked as variadic.
+//              The homogeneity of the variadic input or output determines whether all operands must be of the same
+//              tensor element type.
+typedef enum OrtCustomOpInputOutputCharacteristic {
+  INPUT_OUTPUT_REQUIRED = 0,
+  INPUT_OUTPUT_OPTIONAL,
+  INPUT_OUTPUT_VARIADIC,
+} OrtCustomOpInputOutputCharacteristic;
+
+/*
+ * The OrtCustomOp structure defines a custom op's schema and its kernel callbacks. The callbacks are filled in by
+ * the implementor of the custom op.
+ */
+struct OrtCustomOp {
+  uint32_t version;  // Must be initialized to ORT_API_VERSION
+
+  // This callback creates the kernel, which is a user defined
+  // parameter that is passed to the Kernel* callbacks below. It is
+  // recommended to use CreateKernelV2 which allows for a safe error
+  // propagation by returning an OrtStatusPtr.
+  void*(ORT_API_CALL* CreateKernel)(_In_ const struct OrtCustomOp* op, _In_ const OrtApi* api,
+                                    _In_ const OrtKernelInfo* info);
+
+  // Returns the name of the op
+  const char*(ORT_API_CALL* GetName)(_In_ const struct OrtCustomOp* op);
+
+  // Returns the type of the execution provider, return nullptr to use CPU execution provider
+  const char*(ORT_API_CALL* GetExecutionProviderType)(_In_ const struct OrtCustomOp* op);
+
+  // Returns the count and types of the input & output tensors
+  ONNXTensorElementDataType(ORT_API_CALL* GetInputType)(_In_ const struct OrtCustomOp* op, _In_ size_t index);
+  size_t(ORT_API_CALL* GetInputTypeCount)(_In_ const struct OrtCustomOp* op);
+  ONNXTensorElementDataType(ORT_API_CALL* GetOutputType)(_In_ const struct OrtCustomOp* op, _In_ size_t index);
+  size_t(ORT_API_CALL* GetOutputTypeCount)(_In_ const struct OrtCustomOp* op);
+
+  // Perform a computation step.  It is recommended to use
+  // KernelComputeV2 which allows for a safe error propagation by
+  // returning an OrtStatusPtr.
+  void(ORT_API_CALL* KernelCompute)(_In_ void* op_kernel, _In_ OrtKernelContext* context);
+  void(ORT_API_CALL* KernelDestroy)(_In_ void* op_kernel);
+
+  // Returns the characteristics of the input & output tensors
+  OrtCustomOpInputOutputCharacteristic(ORT_API_CALL* GetInputCharacteristic)(_In_ const struct OrtCustomOp* op, _In_ size_t index);
+  OrtCustomOpInputOutputCharacteristic(ORT_API_CALL* GetOutputCharacteristic)(_In_ const struct OrtCustomOp* op, _In_ size_t index);
+
+  // Returns the memory type of the input tensors. This API allows the custom op
+  // to place the inputs on specific devices. By default, it returns
+  // OrtMemTypeDefault, which means the input is placed on the default device for
+  // the execution provider. If the inputs need to be with different memory tyeps,
+  // this function can be overridden to return the specific memory types.
+  OrtMemType(ORT_API_CALL* GetInputMemoryType)(_In_ const struct OrtCustomOp* op, _In_ size_t index);
+
+  // Returns the minimum number of input arguments expected for the variadic input.
+  // Applicable only for custom ops that have a variadic input.
+  int(ORT_API_CALL* GetVariadicInputMinArity)(_In_ const struct OrtCustomOp* op);
+
+  // Returns true (non-zero) if all arguments of a variadic input have to be of the same type (homogeneous),
+  // and false (zero) otherwise.
+  // Applicable only for custom ops that have a variadic input.
+  int(ORT_API_CALL* GetVariadicInputHomogeneity)(_In_ const struct OrtCustomOp* op);
+
+  // Returns the minimum number of output values expected for the variadic output.
+  // Applicable only for custom ops that have a variadic output.
+  int(ORT_API_CALL* GetVariadicOutputMinArity)(_In_ const struct OrtCustomOp* op);
+
+  // Returns true (non-zero) if all outputs values of a variadic output have to be of the same type (homogeneous),
+  // and false (zero) otherwise.
+  // Applicable only for custom ops that have a variadic output.
+  int(ORT_API_CALL* GetVariadicOutputHomogeneity)(_In_ const struct OrtCustomOp* op);
+
+  // Create the kernel state which is passed to each compute call.
+  OrtStatusPtr(ORT_API_CALL* CreateKernelV2)(_In_ const struct OrtCustomOp* op, _In_ const OrtApi* api,
+                                             _In_ const OrtKernelInfo* info,
+                                             _Out_ void** kernel);
+
+  // Perform the computation step.
+  OrtStatusPtr(ORT_API_CALL* KernelComputeV2)(_In_ void* op_kernel, _In_ OrtKernelContext* context);
+
+  OrtStatusPtr(ORT_API_CALL* InferOutputShapeFn)(_In_ const struct OrtCustomOp* op, _In_ OrtShapeInferContext*);
+
+  // Get start range
+  int(ORT_API_CALL* GetStartVersion)(_In_ const struct OrtCustomOp* op);
+  int(ORT_API_CALL* GetEndVersion)(_In_ const struct OrtCustomOp* op);
+
+  // Get the inplace_map that defines which output can reuse which input
+  // Callers will provide 2 raw int* and pass in their address, this function will fill these 2 arrays
+  // when return, output (*output_index)[i] may reuse the input (*input_index[i]).
+  // The return value is the size of these 2 arrays.
+  // Callers are responsible to delete these 2 arrays after use by calling OrtCustomOp::ReleaseMayInplace().
+  size_t(ORT_API_CALL* GetMayInplace)(_Out_ int** input_index, _Out_ int** output_index);
+
+  // Release the pointer input_index and output_index allocated from GetMayInplace() function.
+  // If GetMayInplace() is defined, this function MUST be defined as well.
+  void(ORT_API_CALL* ReleaseMayInplace)(_Frees_ptr_opt_ int* input_index, _Frees_ptr_opt_ int* output_index);
+
+  // Same as GetMayInplace() and ReleaseMayInplace()
+  size_t(ORT_API_CALL* GetAliasMap)(_Out_ int** input_index, _Out_ int** output_index);
+  void(ORT_API_CALL* ReleaseAliasMap)(_Frees_ptr_opt_ int* input_index, _Frees_ptr_opt_ int* output_index);
+};
+
+/**
+ * ORT Model Editor API
+ */
+
+/**
+ * \brief The OrtModelEditorApi struct provides functions to create or edit an ONNX model.
+ *
+ * See onnxruntime/test/shared_lib/test_model_editor_api.cc for example usage.
+ *
+ * \since Version 1.22.
+ */
+struct OrtModelEditorApi {
+  // Model building/editing requires a full build. We return nullptr from GetModelEditorApi if this is a minimal
+  // build, so it doesn't matter if there are no function pointers in this struct as a user will never get an
+  // OrtModelEditorApi instance. We do however need a dummy field to avoid empty struct warning.
+#if defined(ORT_MINIMAL_BUILD)
+  const bool not_defined_in_this_build;
+#else
+  /** \brief Create an OrtTypeInfo instance for a Tensor.
+   *
+   * Create an OrtTypeInfo instance for a Tensor to use as graph inputs/outputs with the Model Editor API.
+   *
+   * User can release `tensor_info` after creating the OrtTypeInfo.
+   *
+   * \param[in] tensor_info Tensor type and shape information.
+   * \param[out] type_info TypeInfo instance for the tensor.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   *
+   * \since Version 1.22.
+   */
+  ORT_API2_STATUS(CreateTensorTypeInfo, _In_ const OrtTensorTypeAndShapeInfo* tensor_info,
+                  _Outptr_ OrtTypeInfo** type_info);
+
+  /** \brief Create an OrtTypeInfo instance for a SparseTensor.
+   *
+   * Create an OrtTypeInfo instance for a SparseTensor to use as graph inputs/outputs with the Model Editor API.
+   *
+   * User can release `tensor_info` after creating the OrtTypeInfo.
+   *
+   * \param[in] tensor_info SparseTensor type and shape information.
+   * \param[out] type_info TypeInfo instance for the tensor.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   *
+   * \since Version 1.22.
+   */
+  ORT_API2_STATUS(CreateSparseTensorTypeInfo, _In_ const OrtTensorTypeAndShapeInfo* tensor_info,
+                  _Outptr_ OrtTypeInfo** type_info);
+
+  /** \brief Create an OrtTypeInfo instance for a Map.
+   *
+   * Create an OrtTypeInfo instance for a Map to use as graph inputs/outputs with the Model Editor API.
+   *
+   * User can release `map_value_type` after creating the OrtTypeInfo.
+   *
+   * \param[in] map_key_type Key type for the map.
+   * \param[in] map_value_type Value type for the map.
+   * \param[out] type_info TypeInfo instance for the map.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   *
+   * \since Version 1.22.
+   */
+  ORT_API2_STATUS(CreateMapTypeInfo, ONNXTensorElementDataType map_key_type, _In_ const OrtTypeInfo* map_value_type,
+                  _Outptr_ OrtTypeInfo** type_info);
+
+  /** \brief Create an OrtTypeInfo instance for a Sequence.
+   *
+   * Create an OrtTypeInfo instance for a Sequence to use as graph inputs/outputs with the Model Editor API.
+   *
+   * User can release `sequence_type` after creating the OrtTypeInfo.
+   *
+   * \param[in] sequence_type Sequence type and shape information.
+   * \param[out] type_info TypeInfo instance for the sequence.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   *
+   * \since Version 1.22.
+   */
+  ORT_API2_STATUS(CreateSequenceTypeInfo, _In_ const OrtTypeInfo* sequence_type, _Outptr_ OrtTypeInfo** type_info);
+
+  /** \brief Create an OrtTypeInfo instance for an Optional.
+   *
+   * Create an OrtTypeInfo instance for an Optional to use as graph inputs/outputs with the Model Editor API.
+   *
+   * User can release `contained_type` after creating the OrtTypeInfo.
+   *
+   * \param[in] contained_type Tensor type and shape information.
+   * \param[out] type_info TypeInfo instance for the tensor.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   *
+   * \since Version 1.22.
+   */
+  ORT_API2_STATUS(CreateOptionalTypeInfo, _In_ const OrtTypeInfo* contained_type, _Outptr_ OrtTypeInfo** type_info);
+
+  /** \brief Create an OrtValueInfo for use as an OrtGraph input or output.
+   *
+   * \param[in] name The name of the input or output.
+   * \param[in] type_info The type information for the input or output. The provided value is copied.
+   * \param[out] value_info The OrtValueInfo instance.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   *
+   * \since Version 1.22.
+   */
+  ORT_API2_STATUS(CreateValueInfo, _In_ const char* name, _In_ const OrtTypeInfo* type_info,
+                  _Outptr_ OrtValueInfo** value_info);
+
+  /** \brief Create an OrtNode to add to an OrtGraph.
+   *
+   * Create an OrtNode.
+   *
+   * Create attributes with CreateOpAttr. OrtOpAttr instances are copied.
+   *
+   * \param[in] operator_name The name of the operator.
+   * \param[in] domain_name The domain of the operator. Use an empty string for ONNX operators.
+   * \param[in] node_name The name of the node.
+   * \param[in] input_names The names of the inputs.
+   * \param[in] input_names_len The number of input names.
+   * \param[in] output_names The names of the outputs.
+   * \param[in] output_names_len The number of output names.
+   * \param[in] attributes The optional attributes of the node.
+   * \param[in] attribs_len The number of attributes. May be zero.
+   * \param[out] node The OrtNode instance.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   *
+   * \since Version 1.22.
+   */
+  ORT_API2_STATUS(CreateNode, _In_ const char* operator_name, _In_ const char* domain_name, _In_ const char* node_name,
+                  _In_reads_(input_names_len) const char* const* input_names, size_t input_names_len,
+                  _In_reads_(output_names_len) const char* const* output_names, size_t output_names_len,
+                  _In_reads_(attribs_len) _In_opt_ OrtOpAttr** attributes, _In_ size_t attribs_len,
+                  _Outptr_ OrtNode** node);
+
+  /** \brief Create an OrtGraph
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   * \since Version 1.22.
+   */
+  ORT_API2_STATUS(CreateGraph, _Outptr_ OrtGraph** graph);
+
+  /** \brief Set the inputs for the OrtGraph.
+   *
+   * Set the graph inputs. This will replace any existing inputs with the new values.
+   * The OrtGraph takes ownership of the OrtValueInfo instances and you should NOT call ReleaseOrtValueInfo.
+   *
+   * \param[in] graph The OrtGraph instance to update.
+   * \param[in] inputs The input OrtValueInfo instances.
+   * \param[in] inputs_len The number of input OrtValueInfo instances.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   *
+   * \since Version 1.22.
+   */
+  ORT_API2_STATUS(SetGraphInputs, _Inout_ OrtGraph* graph,
+                  _In_reads_(inputs_len) _In_ OrtValueInfo** inputs, _In_ size_t inputs_len);
+
+  /** \brief Set the outputs for the OrtGraph.
+   *
+   * Set the graph outputs. This will replace any existing outputs with the new values.
+   * The OrtGraph takes ownership of the OrtValueInfo instances provided and you should NOT call ReleaseOrtValueInfo.
+   *
+   * \param[in] graph The OrtGraph instance to update.
+   * \param[in] outputs The output OrtValueInfo instances.
+   * \param[in] outputs_len The number of output OrtValueInfo instances.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   *
+   * \since Version 1.22.
+   */
+  ORT_API2_STATUS(SetGraphOutputs, _Inout_ OrtGraph* graph,
+                  _In_reads_(outputs_len) _In_ OrtValueInfo** outputs, _In_ size_t outputs_len);
+
+  /** \brief Add an initializer to the OrtGraph
+   *
+   * ORT will take ownership of the OrtValue and you should NOT call ReleaseOrtValue.
+   *
+   * Two options:
+   *
+   * Allocated memory:
+   *    Use CreateTensorAsOrtValue (allocates memory) and populate the tensor with the data.
+   *    Set `data_is_external` to false.
+   *
+   * Pre-existing memory:
+   *    Use CreateTensorWithDataAsOrtValue or CreateTensorWithDataAndDeleterAsOrtValue to create an OrtValue
+   *    with a tensor that contains a pointer to the existing data.
+   *    Set `data_is_external` to true.
+   *
+   *    The pointer must remain valid for the duration of the inference session.
+   *    If using CreateTensorWithDataAsOrtValue you are responsible for freeing the memory after the inference session
+   *    is released.
+   *    If using CreateTensorWithDataAndDeleterAsOrtValue, ORT will free the memory using the provided deleter as
+   *    soon as the OrtValue is no longer in use.
+   *
+   *    NOTE: A tensor containing pre-existing memory MUST have 128 bytes of data or more.
+   *          For smaller tensors use CreateTensorAsOrtValue.
+   *
+   *          ONNX shape inferencing does not support external data. An initializer involved in shape inferencing is
+   *          typically small (a single value or limited by the rank of a tensor) and uses less than 128 bytes of
+   *          memory, so this limit acts as a simple catch-all rule to avoid issues.
+   *          e.g. Reshape's `shape`, Clip's `min` and `max`, various ops `axes`.
+   *
+   * \param[in] graph The OrtGraph instance to update.
+   * \param[in] name The value name for the initializer.
+   * \param[in] tensor The OrtValue instance containing the tensor data.
+   * \param[in] data_is_external Set to true if the data is external and should not be copied.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   *
+   * \since Version 1.22.
+   */
+  ORT_API2_STATUS(AddInitializerToGraph, _Inout_ OrtGraph* graph, _In_ const char* name, _In_ OrtValue* tensor,
+                  bool data_is_external);
+
+  /** \brief Add an OrtNode to an OrtGraph
+   *
+   * Add the node to the graph. The OrtGraph will take ownership of OrtNode and you should NOT call ReleaseOrtNode.
+   *
+   * \param[in] graph The OrtGraph instance to update.
+   * \param[in] node The OrtNode instance to add to the graph.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   *
+   * \since Version 1.22.
+   */
+  ORT_API2_STATUS(AddNodeToGraph, _Inout_ OrtGraph* graph, _In_ OrtNode* node);
+
+  /** \brief Create an OrtModel.
+   *
+   * Create an OrtModel.
+   *
+   * This can be used to build a new model, or to augment an existing model.
+   *
+   * \param[in] domain_names The domain names for the model.
+   *                         If augmenting an existing model add additional domains if needed.
+   * \param[in] opset_versions The opset versions for the model.
+   *                           If augmenting an existing model add additional opset versions if needed.
+   * \param[in] opset_entries_len The number of domain_names and opset_versions entries.
+   *                              Domain and opset entries should be 1:1
+   * \param[out] model The OrtModel instance.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   *
+   * \since Version 1.22.
+   */
+  ORT_API2_STATUS(CreateModel,
+                  _In_reads_(opset_entries_len) const char* const* domain_names,
+                  _In_reads_(opset_entries_len) const int* opset_versions,
+                  size_t opset_entries_len,
+                  _Outptr_ OrtModel** model);
+
+  /** \brief Add an OrtGraph to an OrtModel.
+   *
+   * Add the graph to a model. This should be called once when creating a new model.
+   *
+   * The OrtModel takes ownership of the OrtGraph and you should NOT call ReleaseOrtGraph.
+   *
+   * \param[in] model The OrtModel instance to update.
+   * \param[in] graph The OrtGraph instance to add to the model.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   *
+   * \since Version 1.22.
+   */
+  ORT_API2_STATUS(AddGraphToModel, _Inout_ OrtModel* model, _In_ OrtGraph* graph);
+
+  /** \brief Create an OrtSession using the OrtModel.
+   *
+   * Create an inference session using the OrtModel instance.
+   * The OrtModel should have been populated with an OrtGraph containing nodes and initializers, and SetGraphInputs
+   * and SetGraphOutputs must have been called.
+   * This will validate the model, run optimizers, and prepare the session for inferencing.
+   *
+   * ReleaseOrtModel must be called to free the OrtModel after session creation.
+   *
+   * \param[in] env The OrtEnv instance.
+   * \param[in] model The OrtModel instance.
+   * \param[in] options The OrtSessionOptions instance.
+   * \param[out] out The OrtSession instance.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   *
+   * \since Version 1.22.
+   */
+  ORT_API2_STATUS(CreateSessionFromModel, _In_ const OrtEnv* env, _In_ const OrtModel* model,
+                  _In_ const OrtSessionOptions* options, _Outptr_ OrtSession** out);
+
+  /** \brief Create an OrtSession to augment an existing model.
+   *
+   * Create an OrtSession with an existing model that will be augmented with additional nodes and initializers.
+   * Nodes can be added before or after the existing nodes in the model. ONNX Runtime will connect the nodes when the
+   * model is finalized.
+   *
+   * To add nodes and initializers to the existing model, first create an OrtModel using CreateModel.
+   * Add nodes and initializers to the OrtModel using AddNodeToGraph and AddInitializerToGraph.
+   * Graph inputs/outputs should be updated with SetGraphInputs and SetGraphOutputs as needed to reflect changes made
+   * by the new nodes. The list of graph inputs/outputs should be for the overall model and not just the new nodes.
+   *
+   * Add the new information from the OrtModel to the original model using ApplyModelToSession, and prepare the
+   * session for inferencing by calling FinalizeModelEditorSession.
+   *
+   * \param{in} env The OrtEnv instance.
+   * \param{in} model_path The path to the existing ONNX model to augment.
+   * \param{in} options The OrtSessionOptions instance.
+   * \param{out} out The created OrtSession instance.
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   *
+   * \since Version 1.22.
+   */
+  ORT_API2_STATUS(CreateModelEditorSession, _In_ const OrtEnv* env, _In_ const ORTCHAR_T* model_path,
+                  _In_ const OrtSessionOptions* options,
+                  _Outptr_ OrtSession** out);
+
+  /** \brief Create an OrtSession to augment an existing model.
+   *
+   * Create an OrtSession with an existing model that will be augmented with additional nodes and initializers.
+   * Nodes can be added before or after the existing nodes in the model. ONNX Runtime will connect the nodes when the
+   * model is finalized.
+   *
+   * To add nodes and initializers to the existing model, first create an OrtModel using CreateModel.
+   * Add nodes and initializers to the OrtModel using AddNodeToGraph and AddInitializerToGraph.
+   * Graph inputs/outputs should be updated with SetGraphInputs and SetGraphOutputs as needed to reflect changes made
+   * by the new nodes. The list of graph inputs/outputs should be for the overall model and not just the new nodes.
+   *
+   * Add the new information from the OrtModel to the original model using ApplyModelToSession, and prepare the
+   * session for inferencing by calling FinalizeModelEditorSession.
+   *
+   * \param{in} env The OrtEnv instance.
+   * \param{in} model_data The model data for the existing model to augment.
+   * \param{in} model_data_length The length of the model data.
+   * \param{in} options The OrtSessionOptions instance.
+   * \param{out} out The created OrtSession instance.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   *
+   * \since Version 1.22.
+   */
+  ORT_API2_STATUS(CreateModelEditorSessionFromArray, _In_ const OrtEnv* env,
+                  _In_ const void* model_data, size_t model_data_length,
+                  _In_ const OrtSessionOptions* options,
+                  _Outptr_ OrtSession** out);
+
+  /** \brief Query the session for the opset version of a domain.
+   *
+   * When using the Model Editor API to augment a model, any new nodes must conform to the opset version of the
+   * original model. To do that the user must be able to discover that opset version.
+   * Returns an error if the domain is not used in the model.
+   *
+   * \param[in] session OrtSession to query
+   * \param[in] domain Domain to query. The ONNX domain is an empty string.
+   * \param[out] opset The opset version of the domain.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   *
+   * \since Version 1.22.
+   */
+  ORT_API2_STATUS(SessionGetOpsetForDomain, _In_ const OrtSession* session, _In_ const char* domain, _Out_ int* opset);
+
+  /** \brief Apply changes to augment the ONNX model in a session created using CreateModelEditorSession[FromArray]
+   *
+   * Adds new nodes and updates graph inputs/outputs using `model` to augment the original ONNX model in the session.
+   * All changes will be validated.
+   * Call FinalizeModelEditorSession to prepare the session for inferencing.
+   *
+   * Existing input/outputs will only be updated if the OrtGraph inputs/outputs are set in the OrtModel.
+   *   i.e. you don't need to call SetGraphInputs/SetGraphOutputs if they are unchanged.
+   *
+   * ReleaseOrtModel must be called to free the OrtModel after it is applied to the session.
+   *
+   * \param[in] session OrtSession to update. Session must have been created using CreateModelEditorSession[FromArray].
+   * \param[in] model OrtModel containing new nodes, new initializers, and updated graph input and/or output info.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   *
+   * \since Version 1.22.
+   */
+  ORT_API2_STATUS(ApplyModelToModelEditorSession, _Inout_ OrtSession* session, _In_ OrtModel* model);
+
+  /** \brief Finalize the Model Editor session that was created using CreateModelEditorSession[FromArray].
+   *
+   * Finalize the Model Editor session that augmented an ONNX model by adding new nodes.
+   * This will run optimizers and prepare the session for inferencing.
+   *
+   * \param[in] session OrtSession to finalize. Session must have been created using CreateModelEditorSession[FromArray].
+   * \param[in] options OrtSessionOptions to use for the session.
+   * \param[in] prepacked_weights_container Optional OrtPrepackedWeightsContainer to use for the session.
+                Set to nullptr if not used.
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   *
+   * \since Version 1.22.
+   */
+  ORT_API2_STATUS(FinalizeModelEditorSession, _Inout_ OrtSession* session, _In_ const OrtSessionOptions* options,
+                  _In_opt_ OrtPrepackedWeightsContainer* prepacked_weights_container);
+#endif  // !defined(ORT_MINIMAL_BUILD)
+};
+
+/**
+ * ORT Compile API
+ */
+
+/**
+ * \brief The OrtCompileApi struct provides functions to compile ONNX models.
+ *
+ * Execution providers that support compilation fuse a subgraph into an EPContext node that wraps a provider-specific
+ * binary representation of the subgraph.
+ * For more details about the EPContext design, refer to:
+ *  \htmlonly
+ *  <a href="https://onnxruntime.ai/docs/execution-providers/EP-Context-Design.html">EPContext design document.</a>
+ *  \endhtmlonly
+ *
+ * Example (error handling not shown):
+ *   OrtStatus* status = NULL;
+ *   OrtCompileApi* compile_api = ort_api->GetCompileApi();
+ *   OrtModelCompilationOptions* compile_options = NULL;
+ *
+ *   status = compile_api->CreateModelCompilationOptionsFromSessionOptions(env, session_options, &compile_options);
+ *   status = compile_api->ModelCompilationOptions_SetInputModelPath(compile_options, ORT_TSTR("model.onnx"));
+ *   status = compile_api->ModelCompilationOptions_SetOutputModelPath(compile_options, ORT_TSTR("model.compiled.onnx"));
+ *   status = compile_api->CompileModel(env, compile_options);
+ *   compile_api->ReleaseModelCompilationOptions(compile_options);
+ *
+ * \since Version 1.22.
+ */
+struct OrtCompileApi {
+  /// @}
+  /// \name OrtModelCompilationOptions
+  /// @{
+  ORT_CLASS_RELEASE(ModelCompilationOptions);
+
+  /** \brief Creates an OrtModelCompilationOptions object from an existing OrtSessionOptions object.
+   *
+   * An OrtModelCompilationOptions object contains the settings used to generate a compiled ONNX model.
+   * The OrtSessionOptions object has the execution providers with which the model will be compiled.
+   *
+   * ReleaseOrtModelCompilationsOptions must be called to free the OrtModelCompilationOptions after calling
+   * CompileModel.
+   *
+   * \param[in] env OrtEnv object.
+   * \param[in] session_options The OrtSessionOptions instance from which to create the OrtModelCompilationOptions.
+   * \param[out] out The created OrtModelCompilationOptions instance.
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   *
+   * \since Version 1.22.
+   */
+  ORT_API2_STATUS(CreateModelCompilationOptionsFromSessionOptions, _In_ const OrtEnv* env,
+                  _In_ const OrtSessionOptions* session_options, _Outptr_ OrtModelCompilationOptions** out);
+
+  /** \brief Sets the file path to the input ONNX model to compile.
+   *
+   * The input model's location (e.g., file path or memory buffer) must be set with either
+   * ModelCompilationOptions_SetInputModelPath or ModelCompilationOptions_SetInputModelFromBuffer.
+   *
+   * \param[in] model_compile_options The OrtModelCompilationOptions instance.
+   * \param[in] input_model_path Null terminated string of the path (wchar on Windows, char otherwise).
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   *
+   * \since Version 1.22.
+   */
+  ORT_API2_STATUS(ModelCompilationOptions_SetInputModelPath, _In_ OrtModelCompilationOptions* model_compile_options,
+                  _In_ const ORTCHAR_T* input_model_path);
+
+  /** \brief Sets the buffer that stores the bytes of the loaded ONNX model to compile.
+   *
+   * The input model's location (e.g., file path or memory buffer) must be set with either
+   * ModelCompilationOptions_SetInputModelPath or ModelCompilationOptions_SetInputModelFromBuffer.
+   *
+   * \param[in] model_compile_options The OrtModelCompilationOptions instance.
+   * \param[in] input_model_data Buffer containing the loaded ONNX model bytes.
+   * \param[in] input_model_data_size The number of bytes in the `input_model_data` buffer.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   *
+   * \since Version 1.22.
+   */
+  ORT_API2_STATUS(ModelCompilationOptions_SetInputModelFromBuffer,
+                  _In_ OrtModelCompilationOptions* model_compile_options,
+                  _In_ const void* input_model_data,
+                  size_t input_model_data_size);
+
+  /** \brief Sets the file path for the output ONNX model generated by CompileModel.
+   *
+   * The output model's location (e.g., file path or memory buffer) can be set with either
+   * ModelCompilationOptions_SetOutputModelPath or ModelCompilationOptions_SetOutputModelBuffer.
+   *
+   * If the output model's location is not set, ONNX Runtime will generate an output file with a path based on
+   * the input model's file path. Examples:
+   *   /Path/my_model.onnx -> /Path/my_model_ctx.onnx
+   *   /Path/my_model -> /Path/my_model_ctx.onnx
+   *
+   * \param[in] model_compile_options The OrtModelCompilationOptions instance.
+   * \param[in] output_model_path Null terminated string of the path (wchar on Windows, char otherwise).
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   *
+   * \since Version 1.22.
+   */
+  ORT_API2_STATUS(ModelCompilationOptions_SetOutputModelPath, _In_ OrtModelCompilationOptions* model_compile_options,
+                  _In_ const ORTCHAR_T* output_model_path);
+
+  /** \brief Optionally sets the file that should store external initializers for the compiled ONNX model.
+   * If not set, initializers are stored within the model.
+   *
+   * Only initializers for nodes that were not compiled are stored in the external initializers file.
+   * Compiled nodes contain their initializer data within the `ep_cache_context` attribute of EPContext nodes.
+   * Refer to ModelCompilationOptions_SetEpContextEmbedMode.
+   *
+   * \param[in] model_compile_options The OrtModelCompilationOptions instance.
+   * \param[in] external_initializers_file_path Null terminated string of the path to the file.
+   * \param[in] external_initializers_size_threshold Initializers larger than this threshold are stored in the file.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   *
+   * \since Version 1.22.
+   */
+  ORT_API2_STATUS(ModelCompilationOptions_SetOutputModelExternalInitializersFile,
+                  _In_ OrtModelCompilationOptions* model_compile_options,
+                  _In_ const ORTCHAR_T* external_initializers_file_path,
+                  size_t external_initializers_size_threshold);
+
+  /** \brief Configures model compilation to store the output compiled ONNX model in a buffer.
+   *
+   * The caller passes an OrtAllocator that ONNX Runtime uses to allocate memory for the buffer.
+   *
+   * The output model's location (e.g., file path or memory buffer) can be set with either
+   * ModelCompilationOptions_SetOutputModelPath or ModelCompilationOptions_SetOutputModelBuffer.
+   *
+   * If the output model's location is not set, ONNX Runtime will generate an output file with a path based on
+   * the input model's file path. Examples:
+   *   /Path/my_model.onnx -> /Path/my_model_ctx.onnx
+   *   /Path/my_model -> /Path/my_model_ctx.onnx
+   *
+   * \param[in] model_compile_options The OrtModelCompilationOptions instance.
+   * \param[in] allocator The allocator used to allocate the buffer for the compiled model.
+   * \param[out] output_model_buffer_ptr Pointer to the buffer that stores the compiled model.
+   * \param[out] output_model_buffer_size_ptr Pointer set to the size of output model in bytes.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   *
+   * \since Version 1.22.
+   */
+  ORT_API2_STATUS(ModelCompilationOptions_SetOutputModelBuffer,
+                  _In_ OrtModelCompilationOptions* model_compile_options,
+                  _Inout_ OrtAllocator* allocator,
+                  _Outptr_ void** output_model_buffer_ptr,
+                  _Out_ size_t* output_model_buffer_size_ptr);
+
+  /** \brief Enables or disables the embedding of EPContext binary data into the `ep_cache_context` attribute
+   * of EPContext nodes. Defaults to false.
+   *
+   * If enabled, the `ep_cache_context` attribute of EPContext nodes will store the context binary data, which may
+   * include weights for compiled subgraphs.
+   *
+   * If disabled, the `ep_cache_context` attribute of EPContext nodes will contain the path to the file containing the
+   * context binary data. The path is set by the execution provider creating the EPContext node.
+   *
+   * More details relate to EPContext design refers to:
+   *  \htmlonly
+   *  <a href="https://onnxruntime.ai/docs/execution-providers/EP-Context-Design.html">EPContext design document.</a>
+   *  \endhtmlonly
+   *
+   * \param[in] model_compile_options The OrtModelCompilationOptions instance.
+   * \param[in] embed_ep_context_in_model True to embed EPContext binary data into the EPContext node
+   *                                      `ep_cache_context` attributes.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   *
+   * \since Version 1.22.
+   */
+  ORT_API2_STATUS(ModelCompilationOptions_SetEpContextEmbedMode, _In_ OrtModelCompilationOptions* model_compile_options,
+                  bool embed_ep_context_in_model);
+
+  /** \brief Compiles an input ONNX model with the given compilation options.
+   *
+   * \param[in] env OrtEnv object.
+   * \param[in] model_options The compilation options that defines compilation options for a model.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   *
+   * \since Version 1.22.
+   */
+  ORT_API2_STATUS(CompileModel, _In_ const OrtEnv* env, _In_ const OrtModelCompilationOptions* model_options);
+};
+
+ORT_RUNTIME_CLASS(Ep);
+ORT_RUNTIME_CLASS(EpFactory);
+
+struct OrtEpApi {
+  /** \brief Create an OrtEpDevice for the EP and an OrtHardwareDevice.
+   * \param[in] ep_factory Execution provider factory that is creating the instance.
+   * \param[in] hardware_device Hardware device that the EP can utilize.
+   * \param[in] ep_metadata Optional OrtKeyValuePairs instance for execution provider metadata that may be used
+   *                        during execution provider selection and passed to CreateEp.
+   *                        ep_device will copy this instance and the user should call ReleaseKeyValuePairs.
+   * \param[in] ep_options  Optional OrtKeyValuePairs instance for execution provider options that will be added
+   *                        to the Session configuration options if the execution provider is selected.
+   *                        ep_device will copy this instance and the user should call ReleaseKeyValuePairs.
+   * \param ep_device OrtExecutionDevice that is created.
+   *
+   * \since Version 1.22.
+   */
+  ORT_API2_STATUS(CreateEpDevice, _In_ OrtEpFactory* ep_factory,
+                  _In_ const OrtHardwareDevice* hardware_device,
+                  _In_opt_ const OrtKeyValuePairs* ep_metadata,
+                  _In_opt_ const OrtKeyValuePairs* ep_options,
+                  _Out_ OrtEpDevice** ep_device);
+
+  ORT_CLASS_RELEASE(EpDevice);
+};
+
+/**
+ * \brief The OrtEp struct provides functions to implement for an execution provider.
+ * \since Version 1.22.
+ */
+struct OrtEp {
+  /** \brief The ONNX Runtime version the execution provider was compiled with.
+   *
+   * Implementation should set to ORT_API_VERSION.
+   * ORT will use this to ensure it does not call functions that were not available when the library was compiled.
+   *
+   * \since Version 1.22.
+   */
+  uint32_t ort_version_supported;
+
+  /** \brief Get the execution provider name.
+   *
+   * \param[in] this_ptr The OrtEp instance.
+   * \return The execution provider name.
+   *
+   * \note Returned string is owned by ORT and valid until UnregisterExecutionProviderLibrary is called.
+   *
+   * \since Version 1.22.
+   */
+  const char*(ORT_API_CALL* GetName)(const OrtEp* this_ptr);
+
+  // OrtStatus* GetCapability(OrtEp* ep, const OrtGraph* graph,
+  //                          size_t* num_supported_subgraphs,
+  //                          OrtIndexedSubgraph** supported_subgraphs, OrtAllocator* allocator);
+
+  // OrtStatus* Compile(OrtEp* ep, const OrtGraph** graphs, OrtNode** fused_graph_nodes,
+  //                    size_t count, OrtNodeComputeInfo* node_compute_infos);
+
+  // TODO: Implement OrtEpApi and the complete OrtEp interface as the next step.
+};
+
+/** \brief The function signature that ORT will call to create OrtEpFactory instances.
+ *
+ * This must be available in a function called 'CreateEpFactories' in the execution provider library.
+ *
+ * \param[in] registered_name The name the execution library is registered with by RegisterExecutionProviderLibrary
+ * \param[in] ort_api_base The OrtApiBase instance that is used by the factory to get the OrtApi instance for the
+ *                         version of ORT that the library was compiled against.
+ * \param[in,out] factories The implementation should create and add OrtEpFactory instances to this
+ *                          pre-allocated array.
+ *                          i.e. usage is `factories[0] = new MyEpFactory();`
+ * \param[in] max_factories The maximum number of OrtEpFactory instances that can be added to `factories`.
+ *                          Current default is to allow 4 factories. This can be increased in the future if needed.
+ * \param[out] num_factories The number of OrtEpFactory instances created by the factory and added to `factories`.
+ *
+ * \snippet{doc} snippets.dox OrtStatus Return Value
+ *
+ * \since Version 1.22.
+ */
+typedef OrtStatus* (*CreateEpApiFactoriesFn)(_In_ const char* registered_name, _In_ const OrtApiBase* ort_api_base,
+                                             _Inout_ OrtEpFactory** factories, _In_ size_t max_factories,
+                                             _Out_ size_t* num_factories);
+
+/** \brief The function signature that ORT will call to release an OrtEpFactory instance.
+ *
+ * This must be available in a function called 'ReleaseEpFactory' in the execution provider library.
+ *
+ * \param[in] factory The OrtEpFactory instance to release.
+ *
+ * \snippet{doc} snippets.dox OrtStatus Return Value
+ *
+ * \since Version 1.22.
+ */
+typedef OrtStatus* (*ReleaseEpApiFactoryFn)(_In_ OrtEpFactory* factory);
+
+/**
+ * \brief The OrtEpFactory provides functions to create and manage execution providers.
+ * \since Version 1.22.
+ */
+struct OrtEpFactory {
+  /** \brief The ONNX Runtime version the execution provider was compiled with.
+   *
+   * Implementation should set to ORT_API_VERSION.
+   * ORT will use this to ensure it does not call functions that were not available when the library was compiled.
+   *
+   * \since Version 1.22.
+   */
+  uint32_t ort_version_supported;
+
+  /** \brief Get the name the of the execution provider that the factory creates.
+   *
+   * \param[in] this_ptr The OrtEpFactory instance.
+   * \return The name of the execution provider the factory creates.
+   *
+   * \since Version 1.22.
+   */
+  const char*(ORT_API_CALL* GetName)(const OrtEpFactory* this_ptr);
+
+  /** \brief Get the name of vendor who owns the execution provider that the factory creates.
+   *
+   * \param[in] this_ptr The OrtEpFactory instance.
+   * \return vendor The vendor name of the execution provider the factory creates.
+   *
+   * \since Version 1.22.
+   */
+  const char*(ORT_API_CALL* GetVendor)(const OrtEpFactory* this_ptr);  // return EP vendor
+
+  /** \brief Get information from the execution provider if it supports the OrtHardwareDevice.
+   *
+   * \param[in] this_ptr The OrtEpFactory instance.
+   *                     Non-const as the factory is passed through to the CreateEp call via the OrtEpDevice.
+   * \param[in] devices The OrtHardwareDevice instances that are available.
+   * \param[in] num_devices The number of OrtHardwareDevice instances.
+   * \param[out] ep_devices OrtEpDevice instances for each OrtHardwareDevice that the EP can use.
+   *                        The implementation should call OrtEpApi::CreateEpDevice to create, and add the OrtEpDevice
+   *                        instances to this pre-allocated array. ORT will take ownership of the values returned.
+   *                        i.e. usage is `ep_devices[0] = <ptr to OrtEpDevice created with OrtEpApi::CreateEpDevice>;`
+   * \param[in] max_ep_devices The maximum number of OrtEpDevices that can be added to ep_devices.
+   *                           Current default is 8. This can be increased if needed.
+   * \param[out] num_ep_devices The number of EP devices added to ep_devices.
+   * \return true if the factory can create an execution provider that uses `device`.
+   *
+   * \note ORT will take ownership or ep_metadata and/or ep_options if they are not null.
+   *
+   * \since Version 1.22.
+   */
+  OrtStatus*(ORT_API_CALL* GetSupportedDevices)(_In_ OrtEpFactory* this_ptr,
+                                                _In_reads_(num_devices) const OrtHardwareDevice* const* devices,
+                                                _In_ size_t num_devices,
+                                                _Inout_ OrtEpDevice** ep_devices,
+                                                _In_ size_t max_ep_devices,
+                                                _Out_ size_t* num_ep_devices);
+
+  /** \brief Function to create an OrtEp instance for use in a Session.
+   *
+   *  ORT will call ReleaseEp to release the instance when it is no longer needed.
+   *
+   * \param[in] this_ptr The OrtEpFactory instance.
+   * \param[in] devices The OrtHardwareDevice instances that the execution provider was selected to use.
+   * \param[in] ep_metadata_pairs Execution provider metadata that was provided to OrtEpApi::CreateEpDevice, for each
+   *                              device.
+   * \param[in] num_devices The number of devices the execution provider was selected for.
+   * \param[in] session_options The OrtSessionOptions instance that contains the configuration options for the
+   *                            session. This will include ep_options from GetSupportedDevices as well as any
+   *                            user provided overrides.
+   *                            Execution provider options will have been added with a prefix of 'ep.<ep name>.'.
+   *                            The OrtSessionOptions instance will NOT be valid after this call and should not be
+   *                            stored for later use.
+   * \param[in] logger The OrtLogger instance for the session that the execution provider should use for logging.
+   * \param[out] ep The OrtEp instance created by the factory.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   *
+   * \since Version <coming soon>. This is a placeholder.
+   */
+  OrtStatus*(ORT_API_CALL* CreateEp)(_In_ OrtEpFactory* this_ptr,
+                                     _In_reads_(num_devices) const OrtHardwareDevice* const* devices,
+                                     _In_reads_(num_devices) const OrtKeyValuePairs* const* ep_metadata_pairs,
+                                     _In_ size_t num_devices,
+                                     _In_ const OrtSessionOptions* session_options,
+                                     _In_ const OrtLogger* logger, _Outptr_ OrtEp** ep);
+
+  /** \brief Release the OrtEp instance.
+   *
+   * \param[in] this_ptr The OrtEpFactory instance.
+   * \param[in] ep The OrtEp instance to release.
+   *
+   * \since Version <coming soon>. This is a placeholder.
+   */
+  void(ORT_API_CALL* ReleaseEp)(OrtEpFactory* this_ptr, struct OrtEp* ep);
+};
+
+/*
+ * This is the old way to add the CUDA provider to the session, please use SessionOptionsAppendExecutionProvider_CUDA above to access the latest functionality
+ * This function always exists, but will only succeed if Onnxruntime was built with CUDA support and the CUDA provider shared library exists
+ *
+ * \param device_id CUDA device id, starts from zero.
+ */
+ORT_API_STATUS(OrtSessionOptionsAppendExecutionProvider_CUDA, _In_ OrtSessionOptions* options, int device_id);
+
+/*
+ * This is the old way to add the ROCm provider to the session, please use
+ * SessionOptionsAppendExecutionProvider_ROCM above to access the latest functionality
+ * This function always exists, but will only succeed if Onnxruntime was built with
+ * HIP support and the ROCm provider shared library exists
+ *
+ * \param device_id HIP device id, starts from zero.
+ */
+ORT_API_STATUS(OrtSessionOptionsAppendExecutionProvider_ROCM, _In_ OrtSessionOptions* options, int device_id);
+
+/*
+ * This is the old way to add the MIGraphX provider to the session, please use
+ * SessionOptionsAppendExecutionProvider_MIGraphX above to access the latest functionality
+ * This function always exists, but will only succeed if Onnxruntime was built with
+ * HIP support and the MIGraphX provider shared library exists
+ *
+ * \param device_id HIP device id, starts from zero.
+ */
+ORT_API_STATUS(OrtSessionOptionsAppendExecutionProvider_MIGraphX, _In_ OrtSessionOptions* options, int device_id);
+
+/*
+ * This is the old way to add the oneDNN provider to the session, please use
+ * SessionOptionsAppendExecutionProvider_oneDNN above to access the latest functionality
+ * This function always exists, but will only succeed if Onnxruntime was built with
+ * oneDNN support and the oneDNN provider shared library exists
+ *
+ * \param use_arena zero: false. non-zero: true.
+ */
+ORT_API_STATUS(OrtSessionOptionsAppendExecutionProvider_Dnnl, _In_ OrtSessionOptions* options, int use_arena);
+
+/*
+ * This is the old way to add the TensorRT provider to the session, please use SessionOptionsAppendExecutionProvider_TensorRT_V2 above to access the latest functionality
+ * This function always exists, but will only succeed if Onnxruntime was built with TensorRT support and the TensorRT provider shared library exists
+ *
+ * \param device_id CUDA device id, starts from zero.
+ */
+ORT_API_STATUS(OrtSessionOptionsAppendExecutionProvider_Tensorrt, _In_ OrtSessionOptions* options, int device_id);
+
+#ifdef __cplusplus
+}
+#endif
+/// @}
diff --git a/3rdParty/ONNX/onnxruntime_cxx_api.h b/3rdParty/ONNX/onnxruntime_cxx_api.h
new file mode 100644
index 0000000000..1bf2e2f104
--- /dev/null
+++ b/3rdParty/ONNX/onnxruntime_cxx_api.h
@@ -0,0 +1,2865 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// Summary: The Ort C++ API is a header only wrapper around the Ort C API.
+//
+// The C++ API simplifies usage by returning values directly instead of error codes, throwing exceptions on errors
+// and automatically releasing resources in the destructors. The primary purpose of C++ API is exception safety so
+// all the resources follow RAII and do not leak memory.
+//
+// Each of the C++ wrapper classes holds only a pointer to the C internal object. Treat them like smart pointers.
+// To create an empty object, pass 'nullptr' to the constructor (for example, Env e{nullptr};). However, you can't use them
+// until you assign an instance that actually holds an underlying object.
+//
+// For Ort objects only move assignment between objects is allowed, there are no copy constructors.
+// Some objects have explicit 'Clone' methods for this purpose.
+//
+// ConstXXXX types are copyable since they do not own the underlying C object, so you can pass them to functions as arguments
+// by value or by reference. ConstXXXX types are restricted to const only interfaces.
+//
+// UnownedXXXX are similar to ConstXXXX but also allow non-const interfaces.
+//
+// The lifetime of the corresponding owning object must eclipse the lifetimes of the ConstXXXX/UnownedXXXX types. They exists so you do not
+// have to fallback to C types and the API with the usual pitfalls. In general, do not use C API from your C++ code.
+
+#pragma once
+#include "onnxruntime_c_api.h"
+#include "onnxruntime_float16.h"
+
+#include <array>
+#include <cstddef>
+#include <cstdio>
+#include <memory>
+#include <stdexcept>
+#include <string>
+#include <type_traits>
+#include <unordered_map>
+#include <utility>
+#include <variant>
+#include <vector>
+
+#ifdef ORT_NO_EXCEPTIONS
+#include <iostream>
+#endif
+
+/** \brief All C++ Onnxruntime APIs are defined inside this namespace
+ *
+ */
+namespace Ort {
+
+/** \brief All C++ methods that can fail will throw an exception of this type
+ *
+ * If <tt>ORT_NO_EXCEPTIONS</tt> is defined, then any error will result in a call to abort()
+ */
+struct Exception : std::exception {
+  Exception(std::string&& string, OrtErrorCode code) : message_{std::move(string)}, code_{code} {}
+
+  OrtErrorCode GetOrtErrorCode() const { return code_; }
+  const char* what() const noexcept override { return message_.c_str(); }
+
+ private:
+  std::string message_;
+  OrtErrorCode code_;
+};
+
+#ifdef ORT_NO_EXCEPTIONS
+// The #ifndef is for the very special case where the user of this library wants to define their own way of handling errors.
+// NOTE: This header expects control flow to not continue after calling ORT_CXX_API_THROW
+#ifndef ORT_CXX_API_THROW
+#define ORT_CXX_API_THROW(string, code)       \
+  do {                                        \
+    std::cerr << Ort::Exception(string, code) \
+                     .what()                  \
+              << std::endl;                   \
+    abort();                                  \
+  } while (false)
+#endif
+#else
+#define ORT_CXX_API_THROW(string, code) \
+  throw Ort::Exception(string, code)
+#endif
+
+// This is used internally by the C++ API. This class holds the global variable that points to the OrtApi,
+//  it's in a template so that we can define a global variable in a header and make
+// it transparent to the users of the API.
+template <typename T>
+struct Global {
+  static const OrtApi* api_;
+};
+
+// If macro ORT_API_MANUAL_INIT is defined, no static initialization will be performed. Instead, user must call InitApi() before using it.
+template <typename T>
+#ifdef ORT_API_MANUAL_INIT
+const OrtApi* Global<T>::api_{};
+inline void InitApi() noexcept { Global<void>::api_ = OrtGetApiBase()->GetApi(ORT_API_VERSION); }
+
+// Used by custom operator libraries that are not linked to onnxruntime. Sets the global API object, which is
+// required by C++ APIs.
+//
+// Example mycustomop.cc:
+//
+// #define ORT_API_MANUAL_INIT
+// #include <onnxruntime_cxx_api.h>
+// #undef ORT_API_MANUAL_INIT
+//
+// OrtStatus* ORT_API_CALL RegisterCustomOps(OrtSessionOptions* options, const OrtApiBase* api_base) {
+//   Ort::InitApi(api_base->GetApi(ORT_API_VERSION));
+//   // ...
+// }
+//
+inline void InitApi(const OrtApi* api) noexcept { Global<void>::api_ = api; }
+#else
+#if defined(_MSC_VER) && !defined(__clang__)
+#pragma warning(push)
+// "Global initializer calls a non-constexpr function." Therefore you can't use ORT APIs in the other global initializers.
+// Please define ORT_API_MANUAL_INIT if it conerns you.
+#pragma warning(disable : 26426)
+#endif
+const OrtApi* Global<T>::api_ = OrtGetApiBase()->GetApi(ORT_API_VERSION);
+#if defined(_MSC_VER) && !defined(__clang__)
+#pragma warning(pop)
+#endif
+#endif
+
+/// This returns a reference to the ORT C API.
+inline const OrtApi& GetApi() noexcept { return *Global<void>::api_; }
+
+/// <summary>
+/// This function returns the onnxruntime version string
+/// </summary>
+/// <returns>version string major.minor.rev</returns>
+std::string GetVersionString();
+
+/// <summary>
+/// This function returns the onnxruntime build information: including git branch,
+/// git commit id, build type(Debug/Release/RelWithDebInfo) and cmake cpp flags.
+/// </summary>
+/// <returns>string</returns>
+std::string GetBuildInfoString();
+
+/// <summary>
+/// This is a C++ wrapper for OrtApi::GetAvailableProviders() and
+/// returns a vector of strings representing the available execution providers.
+/// </summary>
+/// <returns>vector of strings</returns>
+std::vector<std::string> GetAvailableProviders();
+
+/// <summary>
+/// This returns a reference to the ORT C Model Editor API. Used if building or augmenting a model at runtime.
+/// </summary>
+/// <returns>ORT C Model Editor API reference</returns>
+inline const OrtModelEditorApi& GetModelEditorApi() {
+  auto* api = GetApi().GetModelEditorApi();
+  if (api == nullptr) {
+    // minimal build
+    ORT_CXX_API_THROW("Model Editor API is not available in this build", ORT_FAIL);
+  }
+
+  return *api;
+}
+
+/// <summary>
+/// This returns a reference to the ORT C Compile API. Used if compiling a model at runtime.
+/// </summary>
+/// <returns>ORT C Compile API reference</returns>
+inline const OrtCompileApi& GetCompileApi() {
+  auto* api = GetApi().GetCompileApi();
+  if (api == nullptr) {
+    // minimal build
+    ORT_CXX_API_THROW("Compile API is not available in this build", ORT_FAIL);
+  }
+
+  return *api;
+}
+
+/// <summary>
+/// This returns a reference to the ORT C EP API. Used if authoring a plugin execution provider.
+/// </summary>
+/// <returns>ORT C EP API reference</returns>
+inline const OrtEpApi& GetEpApi() {
+  auto* api = GetApi().GetEpApi();
+  if (api == nullptr) {
+    // minimal build
+    ORT_CXX_API_THROW("EP API is not available in this build", ORT_FAIL);
+  }
+
+  return *api;
+}
+
+/** \brief IEEE 754 half-precision floating point data type
+ *
+ * \details This struct is used for converting float to float16 and back
+ * so the user could feed inputs and fetch outputs using these type.
+ *
+ * The size of the structure should align with uint16_t and one can freely cast
+ * uint16_t buffers to/from Ort::Float16_t to feed and retrieve data.
+ *
+ * \code{.unparsed}
+ * // This example demonstrates converion from float to float16
+ * constexpr float values[] = {1.f, 2.f, 3.f, 4.f, 5.f};
+ * std::vector<Ort::Float16_t> fp16_values;
+ * fp16_values.reserve(std::size(values));
+ * std::transform(std::begin(values), std::end(values), std::back_inserter(fp16_values),
+ *     [](float value) { return Ort::Float16_t(value); });
+ *
+ * \endcode
+ */
+struct Float16_t : onnxruntime_float16::Float16Impl<Float16_t> {
+ private:
+  /// <summary>
+  /// Constructor from a 16-bit representation of a float16 value
+  /// No conversion is done here.
+  /// </summary>
+  /// <param name="v">16-bit representation</param>
+  constexpr explicit Float16_t(uint16_t v) noexcept { val = v; }
+
+ public:
+  using Base = onnxruntime_float16::Float16Impl<Float16_t>;
+
+  /// <summary>
+  /// Default constructor
+  /// </summary>
+  Float16_t() = default;
+
+  /// <summary>
+  /// Explicit conversion to uint16_t representation of float16.
+  /// </summary>
+  /// <param name="v">uint16_t bit representation of float16</param>
+  /// <returns>new instance of Float16_t</returns>
+  constexpr static Float16_t FromBits(uint16_t v) noexcept { return Float16_t(v); }
+
+  /// <summary>
+  /// __ctor from float. Float is converted into float16 16-bit representation.
+  /// </summary>
+  /// <param name="v">float value</param>
+  explicit Float16_t(float v) noexcept { val = Base::ToUint16Impl(v); }
+
+  /// <summary>
+  /// Converts float16 to float
+  /// </summary>
+  /// <returns>float representation of float16 value</returns>
+  float ToFloat() const noexcept { return Base::ToFloatImpl(); }
+
+  /// <summary>
+  /// Checks if the value is negative
+  /// </summary>
+  /// <returns>true if negative</returns>
+  using Base::IsNegative;
+
+  /// <summary>
+  /// Tests if the value is NaN
+  /// </summary>
+  /// <returns>true if NaN</returns>
+  using Base::IsNaN;
+
+  /// <summary>
+  /// Tests if the value is finite
+  /// </summary>
+  /// <returns>true if finite</returns>
+  using Base::IsFinite;
+
+  /// <summary>
+  /// Tests if the value represents positive infinity.
+  /// </summary>
+  /// <returns>true if positive infinity</returns>
+  using Base::IsPositiveInfinity;
+
+  /// <summary>
+  /// Tests if the value represents negative infinity
+  /// </summary>
+  /// <returns>true if negative infinity</returns>
+  using Base::IsNegativeInfinity;
+
+  /// <summary>
+  /// Tests if the value is either positive or negative infinity.
+  /// </summary>
+  /// <returns>True if absolute value is infinity</returns>
+  using Base::IsInfinity;
+
+  /// <summary>
+  /// Tests if the value is NaN or zero. Useful for comparisons.
+  /// </summary>
+  /// <returns>True if NaN or zero.</returns>
+  using Base::IsNaNOrZero;
+
+  /// <summary>
+  /// Tests if the value is normal (not zero, subnormal, infinite, or NaN).
+  /// </summary>
+  /// <returns>True if so</returns>
+  using Base::IsNormal;
+
+  /// <summary>
+  /// Tests if the value is subnormal (denormal).
+  /// </summary>
+  /// <returns>True if so</returns>
+  using Base::IsSubnormal;
+
+  /// <summary>
+  /// Creates an instance that represents absolute value.
+  /// </summary>
+  /// <returns>Absolute value</returns>
+  using Base::Abs;
+
+  /// <summary>
+  /// Creates a new instance with the sign flipped.
+  /// </summary>
+  /// <returns>Flipped sign instance</returns>
+  using Base::Negate;
+
+  /// <summary>
+  /// IEEE defines that positive and negative zero are equal, this gives us a quick equality check
+  /// for two values by or'ing the private bits together and stripping the sign. They are both zero,
+  /// and therefore equivalent, if the resulting value is still zero.
+  /// </summary>
+  /// <param name="lhs">first value</param>
+  /// <param name="rhs">second value</param>
+  /// <returns>True if both arguments represent zero</returns>
+  using Base::AreZero;
+
+  /// <summary>
+  /// User defined conversion operator. Converts Float16_t to float.
+  /// </summary>
+  explicit operator float() const noexcept { return ToFloat(); }
+
+  using Base::operator==;
+  using Base::operator!=;
+  using Base::operator<;
+};
+
+static_assert(sizeof(Float16_t) == sizeof(uint16_t), "Sizes must match");
+
+/** \brief bfloat16 (Brain Floating Point) data type
+ *
+ * \details This struct is used for converting float to bfloat16 and back
+ * so the user could feed inputs and fetch outputs using these type.
+ *
+ * The size of the structure should align with uint16_t and one can freely cast
+ * uint16_t buffers to/from Ort::BFloat16_t to feed and retrieve data.
+ *
+ * \code{.unparsed}
+ * // This example demonstrates converion from float to float16
+ * constexpr float values[] = {1.f, 2.f, 3.f, 4.f, 5.f};
+ * std::vector<Ort::BFloat16_t> bfp16_values;
+ * bfp16_values.reserve(std::size(values));
+ * std::transform(std::begin(values), std::end(values), std::back_inserter(bfp16_values),
+ *     [](float value) { return Ort::BFloat16_t(value); });
+ *
+ * \endcode
+ */
+struct BFloat16_t : onnxruntime_float16::BFloat16Impl<BFloat16_t> {
+ private:
+  /// <summary>
+  /// Constructor from a uint16_t representation of bfloat16
+  /// used in FromBits() to escape overload resolution issue with
+  /// constructor from float.
+  /// No conversion is done.
+  /// </summary>
+  /// <param name="v">16-bit bfloat16 value</param>
+  constexpr explicit BFloat16_t(uint16_t v) noexcept { val = v; }
+
+ public:
+  using Base = onnxruntime_float16::BFloat16Impl<BFloat16_t>;
+
+  BFloat16_t() = default;
+
+  /// <summary>
+  /// Explicit conversion to uint16_t representation of bfloat16.
+  /// </summary>
+  /// <param name="v">uint16_t bit representation of bfloat16</param>
+  /// <returns>new instance of BFloat16_t</returns>
+  static constexpr BFloat16_t FromBits(uint16_t v) noexcept { return BFloat16_t(v); }
+
+  /// <summary>
+  /// __ctor from float. Float is converted into bfloat16 16-bit representation.
+  /// </summary>
+  /// <param name="v">float value</param>
+  explicit BFloat16_t(float v) noexcept { val = Base::ToUint16Impl(v); }
+
+  /// <summary>
+  /// Converts bfloat16 to float
+  /// </summary>
+  /// <returns>float representation of bfloat16 value</returns>
+  float ToFloat() const noexcept { return Base::ToFloatImpl(); }
+
+  /// <summary>
+  /// Checks if the value is negative
+  /// </summary>
+  /// <returns>true if negative</returns>
+  using Base::IsNegative;
+
+  /// <summary>
+  /// Tests if the value is NaN
+  /// </summary>
+  /// <returns>true if NaN</returns>
+  using Base::IsNaN;
+
+  /// <summary>
+  /// Tests if the value is finite
+  /// </summary>
+  /// <returns>true if finite</returns>
+  using Base::IsFinite;
+
+  /// <summary>
+  /// Tests if the value represents positive infinity.
+  /// </summary>
+  /// <returns>true if positive infinity</returns>
+  using Base::IsPositiveInfinity;
+
+  /// <summary>
+  /// Tests if the value represents negative infinity
+  /// </summary>
+  /// <returns>true if negative infinity</returns>
+  using Base::IsNegativeInfinity;
+
+  /// <summary>
+  /// Tests if the value is either positive or negative infinity.
+  /// </summary>
+  /// <returns>True if absolute value is infinity</returns>
+  using Base::IsInfinity;
+
+  /// <summary>
+  /// Tests if the value is NaN or zero. Useful for comparisons.
+  /// </summary>
+  /// <returns>True if NaN or zero.</returns>
+  using Base::IsNaNOrZero;
+
+  /// <summary>
+  /// Tests if the value is normal (not zero, subnormal, infinite, or NaN).
+  /// </summary>
+  /// <returns>True if so</returns>
+  using Base::IsNormal;
+
+  /// <summary>
+  /// Tests if the value is subnormal (denormal).
+  /// </summary>
+  /// <returns>True if so</returns>
+  using Base::IsSubnormal;
+
+  /// <summary>
+  /// Creates an instance that represents absolute value.
+  /// </summary>
+  /// <returns>Absolute value</returns>
+  using Base::Abs;
+
+  /// <summary>
+  /// Creates a new instance with the sign flipped.
+  /// </summary>
+  /// <returns>Flipped sign instance</returns>
+  using Base::Negate;
+
+  /// <summary>
+  /// IEEE defines that positive and negative zero are equal, this gives us a quick equality check
+  /// for two values by or'ing the private bits together and stripping the sign. They are both zero,
+  /// and therefore equivalent, if the resulting value is still zero.
+  /// </summary>
+  /// <param name="lhs">first value</param>
+  /// <param name="rhs">second value</param>
+  /// <returns>True if both arguments represent zero</returns>
+  using Base::AreZero;
+
+  /// <summary>
+  /// User defined conversion operator. Converts BFloat16_t to float.
+  /// </summary>
+  explicit operator float() const noexcept { return ToFloat(); }
+
+  // We do not have an inherited impl for the below operators
+  // as the internal class implements them a little differently
+  bool operator==(const BFloat16_t& rhs) const noexcept;
+  bool operator!=(const BFloat16_t& rhs) const noexcept { return !(*this == rhs); }
+  bool operator<(const BFloat16_t& rhs) const noexcept;
+};
+
+static_assert(sizeof(BFloat16_t) == sizeof(uint16_t), "Sizes must match");
+
+/** \brief float8e4m3fn (Float8 Floating Point) data type
+ * \details It is necessary for type dispatching to make use of C++ API
+ * The type is implicitly convertible to/from uint8_t.
+ * See https://onnx.ai/onnx/technical/float8.html for further details.
+ */
+struct Float8E4M3FN_t {
+  uint8_t value;
+  constexpr Float8E4M3FN_t() noexcept : value(0) {}
+  constexpr Float8E4M3FN_t(uint8_t v) noexcept : value(v) {}
+  constexpr operator uint8_t() const noexcept { return value; }
+  // nan values are treated like any other value for operator ==, !=
+  constexpr bool operator==(const Float8E4M3FN_t& rhs) const noexcept { return value == rhs.value; };
+  constexpr bool operator!=(const Float8E4M3FN_t& rhs) const noexcept { return value != rhs.value; };
+};
+
+static_assert(sizeof(Float8E4M3FN_t) == sizeof(uint8_t), "Sizes must match");
+
+/** \brief float8e4m3fnuz (Float8 Floating Point) data type
+ * \details It is necessary for type dispatching to make use of C++ API
+ * The type is implicitly convertible to/from uint8_t.
+ * See https://onnx.ai/onnx/technical/float8.html for further details.
+ */
+struct Float8E4M3FNUZ_t {
+  uint8_t value;
+  constexpr Float8E4M3FNUZ_t() noexcept : value(0) {}
+  constexpr Float8E4M3FNUZ_t(uint8_t v) noexcept : value(v) {}
+  constexpr operator uint8_t() const noexcept { return value; }
+  // nan values are treated like any other value for operator ==, !=
+  constexpr bool operator==(const Float8E4M3FNUZ_t& rhs) const noexcept { return value == rhs.value; };
+  constexpr bool operator!=(const Float8E4M3FNUZ_t& rhs) const noexcept { return value != rhs.value; };
+};
+
+static_assert(sizeof(Float8E4M3FNUZ_t) == sizeof(uint8_t), "Sizes must match");
+
+/** \brief float8e5m2 (Float8 Floating Point) data type
+ * \details It is necessary for type dispatching to make use of C++ API
+ * The type is implicitly convertible to/from uint8_t.
+ * See https://onnx.ai/onnx/technical/float8.html for further details.
+ */
+struct Float8E5M2_t {
+  uint8_t value;
+  constexpr Float8E5M2_t() noexcept : value(0) {}
+  constexpr Float8E5M2_t(uint8_t v) noexcept : value(v) {}
+  constexpr operator uint8_t() const noexcept { return value; }
+  // nan values are treated like any other value for operator ==, !=
+  constexpr bool operator==(const Float8E5M2_t& rhs) const noexcept { return value == rhs.value; };
+  constexpr bool operator!=(const Float8E5M2_t& rhs) const noexcept { return value != rhs.value; };
+};
+
+static_assert(sizeof(Float8E5M2_t) == sizeof(uint8_t), "Sizes must match");
+
+/** \brief float8e5m2fnuz (Float8 Floating Point) data type
+ * \details It is necessary for type dispatching to make use of C++ API
+ * The type is implicitly convertible to/from uint8_t.
+ * See https://onnx.ai/onnx/technical/float8.html for further details.
+ */
+struct Float8E5M2FNUZ_t {
+  uint8_t value;
+  constexpr Float8E5M2FNUZ_t() noexcept : value(0) {}
+  constexpr Float8E5M2FNUZ_t(uint8_t v) noexcept : value(v) {}
+  constexpr operator uint8_t() const noexcept { return value; }
+  // nan values are treated like any other value for operator ==, !=
+  constexpr bool operator==(const Float8E5M2FNUZ_t& rhs) const noexcept { return value == rhs.value; };
+  constexpr bool operator!=(const Float8E5M2FNUZ_t& rhs) const noexcept { return value != rhs.value; };
+};
+
+static_assert(sizeof(Float8E5M2FNUZ_t) == sizeof(uint8_t), "Sizes must match");
+
+namespace detail {
+// This is used internally by the C++ API. This macro is to make it easy to generate overloaded methods for all of the various OrtRelease* functions for every Ort* type
+// This can't be done in the C API since C doesn't have function overloading.
+#define ORT_DEFINE_RELEASE(NAME) \
+  inline void OrtRelease(Ort##NAME* ptr) { GetApi().Release##NAME(ptr); }
+
+#define ORT_DEFINE_RELEASE_FROM_API_STRUCT(NAME, API_GETTER) \
+  inline void OrtRelease(Ort##NAME* ptr) { API_GETTER().Release##NAME(ptr); }
+
+ORT_DEFINE_RELEASE(Allocator);
+ORT_DEFINE_RELEASE(MemoryInfo);
+ORT_DEFINE_RELEASE(CustomOpDomain);
+ORT_DEFINE_RELEASE(ThreadingOptions);
+ORT_DEFINE_RELEASE(Env);
+ORT_DEFINE_RELEASE(RunOptions);
+ORT_DEFINE_RELEASE(LoraAdapter);
+ORT_DEFINE_RELEASE(Session);
+ORT_DEFINE_RELEASE(SessionOptions);
+ORT_DEFINE_RELEASE(TensorTypeAndShapeInfo);
+ORT_DEFINE_RELEASE(SequenceTypeInfo);
+ORT_DEFINE_RELEASE(MapTypeInfo);
+ORT_DEFINE_RELEASE(TypeInfo);
+ORT_DEFINE_RELEASE(Value);
+ORT_DEFINE_RELEASE(ModelMetadata);
+ORT_DEFINE_RELEASE(IoBinding);
+ORT_DEFINE_RELEASE(ArenaCfg);
+ORT_DEFINE_RELEASE(Status);
+ORT_DEFINE_RELEASE(OpAttr);
+ORT_DEFINE_RELEASE(Op);
+ORT_DEFINE_RELEASE(KernelInfo);
+ORT_DEFINE_RELEASE(ValueInfo);
+ORT_DEFINE_RELEASE(Node);
+ORT_DEFINE_RELEASE(Graph);
+ORT_DEFINE_RELEASE(Model);
+ORT_DEFINE_RELEASE(KeyValuePairs)
+ORT_DEFINE_RELEASE_FROM_API_STRUCT(ModelCompilationOptions, GetCompileApi);
+ORT_DEFINE_RELEASE_FROM_API_STRUCT(EpDevice, GetEpApi);
+
+#undef ORT_DEFINE_RELEASE
+#undef ORT_DEFINE_RELEASE_FROM_API_STRUCT
+
+/** \brief This is a tagging template type. Use it with Base<T> to indicate that the C++ interface object
+ *   has no ownership of the underlying C object.
+ */
+template <typename T>
+struct Unowned {
+  using Type = T;
+};
+
+/** \brief Used internally by the C++ API. C++ wrapper types inherit from this.
+ *   This is a zero cost abstraction to wrap the C API objects and delete them on destruction.
+ *
+ * All of the C++ classes
+ *  a) serve as containers for pointers to objects that are created by the underlying C API.
+ *     Their size is just a pointer size, no need to dynamically allocate them. Use them by value.
+ *  b) Each of struct XXXX, XXX instances function as smart pointers to the underlying C API objects.
+ *     they would release objects owned automatically when going out of scope, they are move-only.
+ *  c) ConstXXXX and UnownedXXX structs function as non-owning, copyable containers for the above pointers.
+ *     ConstXXXX allow calling const interfaces only. They give access to objects that are owned by somebody else
+ *     such as Onnxruntime or instances of XXXX classes.
+ *  d) serve convenient interfaces that return C++ objects and further enhance exception and type safety so they can be used
+ *     in C++ code.
+ *
+ */
+
+/// <summary>
+/// This is a non-const pointer holder that is move-only. Disposes of the pointer on destruction.
+/// </summary>
+template <typename T>
+struct Base {
+  using contained_type = T;
+
+  constexpr Base() = default;
+  constexpr explicit Base(contained_type* p) noexcept : p_{p} {}
+  ~Base() {
+    OrtRelease(p_);
+  }
+
+  Base(const Base&) = delete;
+  Base& operator=(const Base&) = delete;
+
+  Base(Base&& v) noexcept : p_{v.p_} { v.p_ = nullptr; }
+  Base& operator=(Base&& v) noexcept {
+    OrtRelease(p_);
+    p_ = v.release();
+    return *this;
+  }
+
+  constexpr operator contained_type*() const noexcept { return p_; }
+
+  /// \brief Relinquishes ownership of the contained C object pointer
+  /// The underlying object is not destroyed
+  contained_type* release() {
+    T* p = p_;
+    p_ = nullptr;
+    return p;
+  }
+
+ protected:
+  contained_type* p_{};
+};
+
+// Undefined. For const types use Base<Unowned<const T>>
+template <typename T>
+struct Base<const T>;
+
+/// <summary>
+/// Covers unowned pointers owned by either the ORT
+/// or some other instance of CPP wrappers.
+/// Used for ConstXXX and UnownedXXXX types that are copyable.
+/// Also convenient to wrap raw OrtXX pointers .
+/// </summary>
+/// <typeparam name="T"></typeparam>
+template <typename T>
+struct Base<Unowned<T>> {
+  using contained_type = typename Unowned<T>::Type;
+
+  constexpr Base() = default;
+  constexpr explicit Base(contained_type* p) noexcept : p_{p} {}
+
+  ~Base() = default;
+
+  Base(const Base&) = default;
+  Base& operator=(const Base&) = default;
+
+  Base(Base&& v) noexcept : p_{v.p_} { v.p_ = nullptr; }
+  Base& operator=(Base&& v) noexcept {
+    p_ = nullptr;
+    std::swap(p_, v.p_);
+    return *this;
+  }
+
+  constexpr operator contained_type*() const noexcept { return p_; }
+
+ protected:
+  contained_type* p_{};
+};
+
+// Light functor to release memory with OrtAllocator
+struct AllocatedFree {
+  OrtAllocator* allocator_;
+  explicit AllocatedFree(OrtAllocator* allocator)
+      : allocator_(allocator) {}
+  void operator()(void* ptr) const {
+    if (ptr) allocator_->Free(allocator_, ptr);
+  }
+};
+
+}  // namespace detail
+
+struct AllocatorWithDefaultOptions;
+struct Env;
+struct EpDevice;
+struct Graph;
+struct Model;
+struct Node;
+struct ModelMetadata;
+struct TypeInfo;
+struct Value;
+struct ValueInfo;
+
+/** \brief unique_ptr typedef used to own strings allocated by OrtAllocators
+ *  and release them at the end of the scope. The lifespan of the given allocator
+ *  must eclipse the lifespan of AllocatedStringPtr instance
+ */
+using AllocatedStringPtr = std::unique_ptr<char, detail::AllocatedFree>;
+
+/** \brief The Status that holds ownership of OrtStatus received from C API
+ *  Use it to safely destroy OrtStatus* returned from the C API. Use appropriate
+ *  constructors to construct an instance of a Status object from exceptions.
+ */
+struct Status : detail::Base<OrtStatus> {
+  using Base = detail::Base<OrtStatus>;
+  using Base::Base;
+
+  explicit Status(std::nullptr_t) noexcept {}               ///< Create an empty object, must be assigned a valid one to be used
+  explicit Status(OrtStatus* status) noexcept;              ///< Takes ownership of OrtStatus instance returned from the C API.
+  explicit Status(const Exception&) noexcept;               ///< Creates status instance out of exception
+  explicit Status(const std::exception&) noexcept;          ///< Creates status instance out of exception
+  Status(const char* message, OrtErrorCode code) noexcept;  ///< Creates status instance out of null-terminated string message.
+  std::string GetErrorMessage() const;
+  OrtErrorCode GetErrorCode() const;
+  bool IsOK() const noexcept;  ///< Returns true if instance represents an OK (non-error) status.
+};
+
+/** \brief The ThreadingOptions
+ *
+ * The ThreadingOptions used for set global threadpools' options of The Env.
+ */
+struct ThreadingOptions : detail::Base<OrtThreadingOptions> {
+  /// \brief Wraps OrtApi::CreateThreadingOptions
+  ThreadingOptions();
+
+  /// \brief Wraps OrtApi::SetGlobalIntraOpNumThreads
+  ThreadingOptions& SetGlobalIntraOpNumThreads(int intra_op_num_threads);
+
+  /// \brief Wraps OrtApi::SetGlobalInterOpNumThreads
+  ThreadingOptions& SetGlobalInterOpNumThreads(int inter_op_num_threads);
+
+  /// \brief Wraps OrtApi::SetGlobalSpinControl
+  ThreadingOptions& SetGlobalSpinControl(int allow_spinning);
+
+  /// \brief Wraps OrtApi::SetGlobalDenormalAsZero
+  ThreadingOptions& SetGlobalDenormalAsZero();
+
+  /// \brief Wraps OrtApi::SetGlobalCustomCreateThreadFn
+  ThreadingOptions& SetGlobalCustomCreateThreadFn(OrtCustomCreateThreadFn ort_custom_create_thread_fn);
+
+  /// \brief Wraps OrtApi::SetGlobalCustomThreadCreationOptions
+  ThreadingOptions& SetGlobalCustomThreadCreationOptions(void* ort_custom_thread_creation_options);
+
+  /// \brief Wraps OrtApi::SetGlobalCustomJoinThreadFn
+  ThreadingOptions& SetGlobalCustomJoinThreadFn(OrtCustomJoinThreadFn ort_custom_join_thread_fn);
+};
+
+namespace detail {
+template <typename T>
+struct KeyValuePairsImpl : Ort::detail::Base<T> {
+  using B = Ort::detail::Base<T>;
+  using B::B;
+
+  const char* GetValue(const char* key) const;
+
+  // get the pairs in unordered_map. needs to copy to std::string so the hash works as expected
+  std::unordered_map<std::string, std::string> GetKeyValuePairs() const;
+  // get the pairs in two vectors. entries will be 1:1 between keys and values. avoids copying to std::string
+  void GetKeyValuePairs(std::vector<const char*>& keys, std::vector<const char*>& values) const;
+};
+}  // namespace detail
+
+// Const object holder that does not own the underlying object
+using ConstKeyValuePairs = detail::KeyValuePairsImpl<Ort::detail::Unowned<const OrtKeyValuePairs>>;
+
+/** \brief Wrapper around ::OrtKeyValuePair */
+struct KeyValuePairs : detail::KeyValuePairsImpl<OrtKeyValuePairs> {
+  explicit KeyValuePairs(std::nullptr_t) {}  ///< No instance is created
+  /// Take ownership of a pointer created by C API
+  explicit KeyValuePairs(OrtKeyValuePairs* p) : KeyValuePairsImpl<OrtKeyValuePairs>{p} {}
+
+  /// \brief Wraps OrtApi::CreateKeyValuePairs
+  explicit KeyValuePairs();
+
+  /// \brief Wraps OrtApi::CreateKeyValuePairs and OrtApi::AddKeyValuePair
+  explicit KeyValuePairs(const std::unordered_map<std::string, std::string>& kv_pairs);
+
+  /// \brief Wraps OrtApi::AddKeyValuePair
+  void Add(const char* key, const char* value);
+
+  /// \brief Wraps OrtApi::RemoveKeyValuePair
+  void Remove(const char* key);
+
+  ConstKeyValuePairs GetConst() const { return ConstKeyValuePairs{this->p_}; }
+};
+
+namespace detail {
+template <typename T>
+struct HardwareDeviceImpl : Ort::detail::Base<T> {
+  using B = Ort::detail::Base<T>;
+  using B::B;
+
+  OrtHardwareDeviceType Type() const;
+  uint32_t VendorId() const;
+  uint32_t DeviceId() const;
+  const char* Vendor() const;
+  ConstKeyValuePairs Metadata() const;
+};
+}  // namespace detail
+
+/** \brief Wrapper around ::OrtHardwareDevice
+ * \remarks HardwareDevice is always read-only for API users.
+ */
+using ConstHardwareDevice = detail::HardwareDeviceImpl<Ort::detail::Unowned<const OrtHardwareDevice>>;
+
+namespace detail {
+template <typename T>
+struct EpDeviceImpl : Ort::detail::Base<T> {
+  using B = Ort::detail::Base<T>;
+  using B::B;
+
+  const char* EpName() const;
+  const char* EpVendor() const;
+  ConstKeyValuePairs EpMetadata() const;
+  ConstKeyValuePairs EpOptions() const;
+  ConstHardwareDevice Device() const;
+};
+}  // namespace detail
+
+/** \brief Wrapper around ::OrtEpDevice
+ * \remarks EpDevice is always read-only for ORT API users.
+ */
+using ConstEpDevice = detail::EpDeviceImpl<Ort::detail::Unowned<const OrtEpDevice>>;
+
+/** \brief Mutable EpDevice that is created by EpApi users.
+ */
+struct EpDevice : detail::EpDeviceImpl<OrtEpDevice> {
+  explicit EpDevice(std::nullptr_t) {}                                 ///< No instance is created
+  explicit EpDevice(OrtEpDevice* p) : EpDeviceImpl<OrtEpDevice>{p} {}  ///< Take ownership of a pointer created by C API
+
+  /// \brief Wraps OrtEpApi::CreateEpDevice
+  EpDevice(OrtEpFactory& ep_factory, ConstHardwareDevice& hardware_device,
+           ConstKeyValuePairs ep_metadata = {}, ConstKeyValuePairs ep_options = {});
+};
+
+/** \brief The Env (Environment)
+ *
+ * The Env holds the logging state used by all other objects.
+ * <b>Note:</b> One Env must be created before using any other Onnxruntime functionality
+ */
+struct Env : detail::Base<OrtEnv> {
+  explicit Env(std::nullptr_t) {}  ///< Create an empty Env object, must be assigned a valid one to be used
+
+  /// \brief Wraps OrtApi::CreateEnv
+  Env(OrtLoggingLevel logging_level = ORT_LOGGING_LEVEL_WARNING, _In_ const char* logid = "");
+
+  /// \brief Wraps OrtApi::CreateEnvWithCustomLogger
+  Env(OrtLoggingLevel logging_level, const char* logid, OrtLoggingFunction logging_function, void* logger_param);
+
+  /// \brief Wraps OrtApi::CreateEnvWithGlobalThreadPools
+  Env(const OrtThreadingOptions* tp_options, OrtLoggingLevel logging_level = ORT_LOGGING_LEVEL_WARNING, _In_ const char* logid = "");
+
+  /// \brief Wraps OrtApi::CreateEnvWithCustomLoggerAndGlobalThreadPools
+  Env(const OrtThreadingOptions* tp_options, OrtLoggingFunction logging_function, void* logger_param,
+      OrtLoggingLevel logging_level = ORT_LOGGING_LEVEL_WARNING, _In_ const char* logid = "");
+
+  /// \brief C Interop Helper
+  explicit Env(OrtEnv* p) : Base<OrtEnv>{p} {}
+
+  Env& EnableTelemetryEvents();   ///< Wraps OrtApi::EnableTelemetryEvents
+  Env& DisableTelemetryEvents();  ///< Wraps OrtApi::DisableTelemetryEvents
+
+  Env& UpdateEnvWithCustomLogLevel(OrtLoggingLevel log_severity_level);  ///< Wraps OrtApi::UpdateEnvWithCustomLogLevel
+
+  Env& CreateAndRegisterAllocator(const OrtMemoryInfo* mem_info, const OrtArenaCfg* arena_cfg);  ///< Wraps OrtApi::CreateAndRegisterAllocator
+
+  Env& CreateAndRegisterAllocatorV2(const std::string& provider_type, const OrtMemoryInfo* mem_info,
+                                    const std::unordered_map<std::string, std::string>& options,
+                                    const OrtArenaCfg* arena_cfg);  ///< Wraps OrtApi::CreateAndRegisterAllocatorV2
+
+  Env& RegisterExecutionProviderLibrary(const char* registration_name, const std::basic_string<ORTCHAR_T>& path);  ///< Wraps OrtApi::RegisterExecutionProviderLibrary
+  Env& UnregisterExecutionProviderLibrary(const char* registration_name);                                          ///< Wraps OrtApi::UnregisterExecutionProviderLibrary
+
+  std::vector<ConstEpDevice> GetEpDevices() const;
+};
+
+/** \brief Custom Op Domain
+ *
+ */
+struct CustomOpDomain : detail::Base<OrtCustomOpDomain> {
+  using Base = detail::Base<OrtCustomOpDomain>;
+  using Base::Base;
+
+  explicit CustomOpDomain(std::nullptr_t) {}  ///< Create an empty CustomOpDomain object, must be assigned a valid one to be used
+
+  /// \brief Wraps OrtApi::CreateCustomOpDomain
+  explicit CustomOpDomain(const char* domain);
+
+  // This does not take ownership of the op, simply registers it.
+  void Add(const OrtCustomOp* op);  ///< Wraps CustomOpDomain_Add
+};
+
+/// \brief LoraAdapter holds a set of Lora Parameters loaded from a single file
+struct LoraAdapter : detail::Base<OrtLoraAdapter> {
+  using Base = detail::Base<OrtLoraAdapter>;
+  using Base::Base;
+
+  explicit LoraAdapter(std::nullptr_t) {}  ///< Create an empty LoraAdapter object, must be assigned a valid one to be used
+  /// \brief Wraps OrtApi::CreateLoraAdapter
+  ///
+  /// The function attempts to load the adapter from the specified file
+  /// \param adapter_path The path to the Lora adapter
+  /// \param allocator optional pointer to a device allocator. If nullptr, the data stays on CPU. It would still
+  ///        be copied to device if required by the model at inference time.
+  static LoraAdapter CreateLoraAdapter(const std::basic_string<ORTCHAR_T>& adapter_path,
+                                       OrtAllocator* allocator);
+
+  /// \brief Wraps OrtApi::CreateLoraAdapterFromArray
+  ///
+  /// The function attempts to load the adapter from the specified byte array.
+  /// \param bytes The byte array containing file LoraAdapter format
+  /// \param num_bytes The number of bytes in the byte array
+  /// \param allocator optional pointer to a device allocator. If nullptr, the data stays on CPU. It would still
+  ///        be copied to device if required by the model at inference time.
+  static LoraAdapter CreateLoraAdapterFromArray(const void* bytes, size_t num_bytes,
+                                                OrtAllocator* allocator);
+};
+
+/** \brief RunOptions
+ *
+ */
+struct RunOptions : detail::Base<OrtRunOptions> {
+  explicit RunOptions(std::nullptr_t) {}  ///< Create an empty RunOptions object, must be assigned a valid one to be used
+  RunOptions();                           ///< Wraps OrtApi::CreateRunOptions
+
+  RunOptions& SetRunLogVerbosityLevel(int);  ///< Wraps OrtApi::RunOptionsSetRunLogVerbosityLevel
+  int GetRunLogVerbosityLevel() const;       ///< Wraps OrtApi::RunOptionsGetRunLogVerbosityLevel
+
+  RunOptions& SetRunLogSeverityLevel(int);  ///< Wraps OrtApi::RunOptionsSetRunLogSeverityLevel
+  int GetRunLogSeverityLevel() const;       ///< Wraps OrtApi::RunOptionsGetRunLogSeverityLevel
+
+  RunOptions& SetRunTag(const char* run_tag);  ///< wraps OrtApi::RunOptionsSetRunTag
+  const char* GetRunTag() const;               ///< Wraps OrtApi::RunOptionsGetRunTag
+
+  RunOptions& AddConfigEntry(const char* config_key, const char* config_value);  ///< Wraps OrtApi::AddRunConfigEntry
+
+  /** \brief Terminates all currently executing Session::Run calls that were made using this RunOptions instance
+   *
+   * If a currently executing session needs to be force terminated, this can be called from another thread to force it to fail with an error
+   * Wraps OrtApi::RunOptionsSetTerminate
+   */
+  RunOptions& SetTerminate();
+
+  /** \brief Clears the terminate flag so this RunOptions instance can be used in a new Session::Run call without it instantly terminating
+   *
+   * Wraps OrtApi::RunOptionsUnsetTerminate
+   */
+  RunOptions& UnsetTerminate();
+
+  /** \brief Add the LoraAdapter to the list of active adapters.
+   *  The setting does not affect RunWithBinding() calls.
+   *
+   * Wraps OrtApi::RunOptionsAddActiveLoraAdapter
+   * \param adapter The LoraAdapter to be used as the active adapter
+   */
+  RunOptions& AddActiveLoraAdapter(const LoraAdapter& adapter);
+};
+
+namespace detail {
+// Utility function that returns a SessionOption config entry key for a specific custom operator.
+// Ex: custom_op.[custom_op_name].[config]
+std::string MakeCustomOpConfigEntryKey(const char* custom_op_name, const char* config);
+}  // namespace detail
+
+/// <summary>
+/// Class that represents session configuration entries for one or more custom operators.
+///
+/// Example:
+///   Ort::CustomOpConfigs op_configs;
+///   op_configs.AddConfig("my_custom_op", "device_type", "CPU");
+///
+/// Passed to Ort::SessionOptions::RegisterCustomOpsLibrary.
+/// </summary>
+struct CustomOpConfigs {
+  CustomOpConfigs() = default;
+  ~CustomOpConfigs() = default;
+  CustomOpConfigs(const CustomOpConfigs&) = default;
+  CustomOpConfigs& operator=(const CustomOpConfigs&) = default;
+  CustomOpConfigs(CustomOpConfigs&& o) = default;
+  CustomOpConfigs& operator=(CustomOpConfigs&& o) = default;
+
+  /** \brief Adds a session configuration entry/value for a specific custom operator.
+   *
+   * \param custom_op_name The name of the custom operator for which to add a configuration entry.
+   *                       Must match the name returned by the CustomOp's GetName() method.
+   * \param config_key The name of the configuration entry.
+   * \param config_value The value of the configuration entry.
+   * \return A reference to this object to enable call chaining.
+   */
+  CustomOpConfigs& AddConfig(const char* custom_op_name, const char* config_key, const char* config_value);
+
+  /** \brief Returns a flattened map of custom operator configuration entries and their values.
+   *
+   * The keys has been flattened to include both the custom operator name and the configuration entry key name.
+   * For example, a prior call to AddConfig("my_op", "key", "value") corresponds to the flattened key/value pair
+   * {"my_op.key", "value"}.
+   *
+   * \return An unordered map of flattened configurations.
+   */
+  const std::unordered_map<std::string, std::string>& GetFlattenedConfigs() const;
+
+ private:
+  std::unordered_map<std::string, std::string> flat_configs_;
+};
+
+/** \brief Options object used when creating a new Session object
+ *
+ * Wraps ::OrtSessionOptions object and methods
+ */
+
+struct SessionOptions;
+
+namespace detail {
+// we separate const-only methods because passing const ptr to non-const methods
+// is only discovered when inline methods are compiled which is counter-intuitive
+template <typename T>
+struct ConstSessionOptionsImpl : Base<T> {
+  using B = Base<T>;
+  using B::B;
+
+  SessionOptions Clone() const;  ///< Creates and returns a copy of this SessionOptions object. Wraps OrtApi::CloneSessionOptions
+
+  std::string GetConfigEntry(const char* config_key) const;  ///< Wraps OrtApi::GetSessionConfigEntry
+  bool HasConfigEntry(const char* config_key) const;         ///< Wraps OrtApi::HasSessionConfigEntry
+  std::string GetConfigEntryOrDefault(const char* config_key, const std::string& def) const;
+};
+
+template <typename T>
+struct SessionOptionsImpl : ConstSessionOptionsImpl<T> {
+  using B = ConstSessionOptionsImpl<T>;
+  using B::B;
+
+  SessionOptionsImpl& SetIntraOpNumThreads(int intra_op_num_threads);                              ///< Wraps OrtApi::SetIntraOpNumThreads
+  SessionOptionsImpl& SetInterOpNumThreads(int inter_op_num_threads);                              ///< Wraps OrtApi::SetInterOpNumThreads
+  SessionOptionsImpl& SetGraphOptimizationLevel(GraphOptimizationLevel graph_optimization_level);  ///< Wraps OrtApi::SetSessionGraphOptimizationLevel
+  SessionOptionsImpl& SetDeterministicCompute(bool value);                                         ///< Wraps OrtApi::SetDeterministicCompute
+
+  SessionOptionsImpl& EnableCpuMemArena();   ///< Wraps OrtApi::EnableCpuMemArena
+  SessionOptionsImpl& DisableCpuMemArena();  ///< Wraps OrtApi::DisableCpuMemArena
+
+  SessionOptionsImpl& SetOptimizedModelFilePath(const ORTCHAR_T* optimized_model_file);  ///< Wraps OrtApi::SetOptimizedModelFilePath
+
+  SessionOptionsImpl& EnableProfiling(const ORTCHAR_T* profile_file_prefix);  ///< Wraps OrtApi::EnableProfiling
+  SessionOptionsImpl& DisableProfiling();                                     ///< Wraps OrtApi::DisableProfiling
+
+  SessionOptionsImpl& EnableOrtCustomOps();  ///< Wraps OrtApi::EnableOrtCustomOps
+
+  SessionOptionsImpl& EnableMemPattern();   ///< Wraps OrtApi::EnableMemPattern
+  SessionOptionsImpl& DisableMemPattern();  ///< Wraps OrtApi::DisableMemPattern
+
+  SessionOptionsImpl& SetExecutionMode(ExecutionMode execution_mode);  ///< Wraps OrtApi::SetSessionExecutionMode
+
+  SessionOptionsImpl& SetLoadCancellationFlag(bool value);  ///< Wraps OrtApi::SessionOptionsSetLoadCancellationFlag
+
+  SessionOptionsImpl& SetLogId(const char* logid);     ///< Wraps OrtApi::SetSessionLogId
+  SessionOptionsImpl& SetLogSeverityLevel(int level);  ///< Wraps OrtApi::SetSessionLogSeverityLevel
+
+  SessionOptionsImpl& Add(OrtCustomOpDomain* custom_op_domain);  ///< Wraps OrtApi::AddCustomOpDomain
+
+  SessionOptionsImpl& DisablePerSessionThreads();  ///< Wraps OrtApi::DisablePerSessionThreads
+
+  SessionOptionsImpl& AddConfigEntry(const char* config_key, const char* config_value);  ///< Wraps OrtApi::AddSessionConfigEntry
+
+  SessionOptionsImpl& AddInitializer(const char* name, const OrtValue* ort_val);                                             ///< Wraps OrtApi::AddInitializer
+  SessionOptionsImpl& AddExternalInitializers(const std::vector<std::string>& names, const std::vector<Value>& ort_values);  ///< Wraps OrtApi::AddExternalInitializers
+  SessionOptionsImpl& AddExternalInitializersFromFilesInMemory(const std::vector<std::basic_string<ORTCHAR_T>>& external_initializer_file_names,
+                                                               const std::vector<char*>& external_initializer_file_buffer_array,
+                                                               const std::vector<size_t>& external_initializer_file_lengths);  ///< Wraps OrtApi::AddExternalInitializersFromFilesInMemory
+
+  SessionOptionsImpl& AppendExecutionProvider_CUDA(const OrtCUDAProviderOptions& provider_options);          ///< Wraps OrtApi::SessionOptionsAppendExecutionProvider_CUDA
+  SessionOptionsImpl& AppendExecutionProvider_CUDA_V2(const OrtCUDAProviderOptionsV2& provider_options);     ///< Wraps OrtApi::SessionOptionsAppendExecutionProvider_CUDA_V2
+  SessionOptionsImpl& AppendExecutionProvider_ROCM(const OrtROCMProviderOptions& provider_options);          ///< Wraps OrtApi::SessionOptionsAppendExecutionProvider_ROCM
+  SessionOptionsImpl& AppendExecutionProvider_OpenVINO(const OrtOpenVINOProviderOptions& provider_options);  ///< Wraps OrtApi::SessionOptionsAppendExecutionProvider_OpenVINO
+  ///< Wraps OrtApi::SessionOptionsAppendExecutionProvider_OpenVINO_V2
+  SessionOptionsImpl& AppendExecutionProvider_OpenVINO_V2(const std::unordered_map<std::string, std::string>& provider_options = {});
+  SessionOptionsImpl& AppendExecutionProvider_TensorRT(const OrtTensorRTProviderOptions& provider_options);       ///< Wraps OrtApi::SessionOptionsAppendExecutionProvider_TensorRT
+  SessionOptionsImpl& AppendExecutionProvider_TensorRT_V2(const OrtTensorRTProviderOptionsV2& provider_options);  ///< Wraps OrtApi::SessionOptionsAppendExecutionProvider_TensorRT
+  SessionOptionsImpl& AppendExecutionProvider_MIGraphX(const OrtMIGraphXProviderOptions& provider_options);       ///< Wraps OrtApi::SessionOptionsAppendExecutionProvider_MIGraphX
+  /// Wraps OrtApi::SessionOptionsAppendExecutionProvider_CANN
+  SessionOptionsImpl& AppendExecutionProvider_CANN(const OrtCANNProviderOptions& provider_options);
+  /// Wraps OrtApi::SessionOptionsAppendExecutionProvider_Dnnl
+  SessionOptionsImpl& AppendExecutionProvider_Dnnl(const OrtDnnlProviderOptions& provider_options);
+  /// Wraps OrtApi::SessionOptionsAppendExecutionProvider. Currently supports QNN, SNPE and XNNPACK.
+  SessionOptionsImpl& AppendExecutionProvider(const std::string& provider_name,
+                                              const std::unordered_map<std::string, std::string>& provider_options = {});
+
+  /// Append EPs that have been registered previously with the OrtEnv.
+  /// Wraps OrtApi::SessionOptionsAppendExecutionProvider_V2
+  SessionOptionsImpl& AppendExecutionProvider_V2(Env& env, const std::vector<ConstEpDevice>& ep_devices,
+                                                 const KeyValuePairs& ep_options);
+  /// Append EPs that have been registered previously with the OrtEnv.
+  /// Wraps OrtApi::SessionOptionsAppendExecutionProvider_V2
+  SessionOptionsImpl& AppendExecutionProvider_V2(Env& env, const std::vector<ConstEpDevice>& ep_devices,
+                                                 const std::unordered_map<std::string, std::string>& ep_options);
+
+  /// Wraps OrtApi::SessionOptionsSetEpSelectionPolicy
+  SessionOptionsImpl& SetEpSelectionPolicy(OrtExecutionProviderDevicePolicy policy);
+
+  /// Wraps OrtApi::SessionOptionsSetEpSelectionPolicyDelegate
+  SessionOptionsImpl& SetEpSelectionPolicy(EpSelectionDelegate delegate, void* state = nullptr);
+
+  SessionOptionsImpl& SetCustomCreateThreadFn(OrtCustomCreateThreadFn ort_custom_create_thread_fn);  ///< Wraps OrtApi::SessionOptionsSetCustomCreateThreadFn
+  SessionOptionsImpl& SetCustomThreadCreationOptions(void* ort_custom_thread_creation_options);      ///< Wraps OrtApi::SessionOptionsSetCustomThreadCreationOptions
+  SessionOptionsImpl& SetCustomJoinThreadFn(OrtCustomJoinThreadFn ort_custom_join_thread_fn);        ///< Wraps OrtApi::SessionOptionsSetCustomJoinThreadFn
+
+  ///< Registers the custom operator from the specified shared library via OrtApi::RegisterCustomOpsLibrary_V2.
+  ///< The custom operator configurations are optional. If provided, custom operator configs are set via
+  ///< OrtApi::AddSessionConfigEntry.
+  SessionOptionsImpl& RegisterCustomOpsLibrary(const ORTCHAR_T* library_name, const CustomOpConfigs& custom_op_configs = {});
+
+  SessionOptionsImpl& RegisterCustomOpsUsingFunction(const char* function_name);  ///< Wraps OrtApi::RegisterCustomOpsUsingFunction
+
+  ///< Wraps OrtApi::SessionOptionsAppendExecutionProvider_VitisAI
+  SessionOptionsImpl& AppendExecutionProvider_VitisAI(const std::unordered_map<std::string, std::string>& provider_options = {});
+};
+}  // namespace detail
+
+using UnownedSessionOptions = detail::SessionOptionsImpl<detail::Unowned<OrtSessionOptions>>;
+using ConstSessionOptions = detail::ConstSessionOptionsImpl<detail::Unowned<const OrtSessionOptions>>;
+
+/** \brief Wrapper around ::OrtSessionOptions
+ *
+ */
+struct SessionOptions : detail::SessionOptionsImpl<OrtSessionOptions> {
+  explicit SessionOptions(std::nullptr_t) {}                                                   ///< Create an empty SessionOptions object, must be assigned a valid one to be used
+  SessionOptions();                                                                            ///< Wraps OrtApi::CreateSessionOptions
+  explicit SessionOptions(OrtSessionOptions* p) : SessionOptionsImpl<OrtSessionOptions>{p} {}  ///< Used for interop with the C API
+  UnownedSessionOptions GetUnowned() const { return UnownedSessionOptions{this->p_}; }
+  ConstSessionOptions GetConst() const { return ConstSessionOptions{this->p_}; }
+};
+
+/** \brief Options object used when compiling a model.
+ *
+ * Wraps ::OrtModelCompilationOptions object and methods
+ */
+struct ModelCompilationOptions : detail::Base<OrtModelCompilationOptions> {
+  using Base = detail::Base<OrtModelCompilationOptions>;
+  using Base::Base;
+
+  explicit ModelCompilationOptions(std::nullptr_t) {}  ///< Create an empty ModelCompilationOptions object, must be assigned a valid one to be used.
+
+  ModelCompilationOptions(const Env& env, const SessionOptions& session_options);  ///< Wraps OrtApi::CreateModelCompilationOptionsFromSessionOptions
+  ModelCompilationOptions(const Env& env, ConstSessionOptions session_options);    ///< Wraps OrtApi::CreateModelCompilationOptionsFromSessionOptions
+
+  ModelCompilationOptions& SetInputModelPath(const ORTCHAR_T* input_model_path);  ///< Wraps OrtApi::ModelCompilationOptions_SetInputModelPath
+  ModelCompilationOptions& SetInputModelFromBuffer(const void* input_model_data,
+                                                   size_t input_model_data_size);   ///< Wraps OrtApi::ModelCompilationOptions_SetInputModelFromBuffer
+  ModelCompilationOptions& SetEpContextEmbedMode(bool embed_ep_context_in_model);   ///< Wraps OrtApi::ModelCompilationOptions_SetEpContextEmbedMode
+  ModelCompilationOptions& SetOutputModelPath(const ORTCHAR_T* output_model_path);  ///< Wraps OrtApi::ModelCompilationOptions_SetOutputModelPath
+  ModelCompilationOptions& SetOutputModelExternalInitializersFile(const ORTCHAR_T* file_path,
+                                                                  size_t initializer_size_threshold);  ///< Wraps OrtApi::ModelCompilationOptions_SetOutputModelExternalInitializersFile
+  ModelCompilationOptions& SetOutputModelBuffer(OrtAllocator* allocator, void** output_model_buffer_ptr,
+                                                size_t* output_model_buffer_size_ptr);  ///< Wraps OrtApi::ModelCompilationOptions_SetOutputModelBuffer
+};
+
+/** \brief Compiles an input model to generate a model with EPContext nodes that execute EP-specific kernels. Wraps OrtApi::CompileModels.
+ *
+ * \param env: ORT environment object.
+ * \param model_compilation_options: Compilation options for a model.
+ * \return A Status indicating success or failure.
+ */
+Status CompileModel(const Env& env, const ModelCompilationOptions& model_compilation_options);
+
+/** \brief Wrapper around ::OrtModelMetadata
+ *
+ */
+struct ModelMetadata : detail::Base<OrtModelMetadata> {
+  using Base = detail::Base<OrtModelMetadata>;
+  using Base::Base;
+
+  explicit ModelMetadata(std::nullptr_t) {}  ///< Create an empty ModelMetadata object, must be assigned a valid one to be used
+
+  /** \brief Returns a copy of the producer name.
+   *
+   * \param allocator to allocate memory for the copy of the name returned
+   * \return a instance of smart pointer that would deallocate the buffer when out of scope.
+   *  The OrtAllocator instances must be valid at the point of memory release.
+   */
+  AllocatedStringPtr GetProducerNameAllocated(OrtAllocator* allocator) const;  ///< Wraps OrtApi::ModelMetadataGetProducerName
+
+  /** \brief Returns a copy of the graph name.
+   *
+   * \param allocator to allocate memory for the copy of the name returned
+   * \return a instance of smart pointer that would deallocate the buffer when out of scope.
+   *  The OrtAllocator instances must be valid at the point of memory release.
+   */
+  AllocatedStringPtr GetGraphNameAllocated(OrtAllocator* allocator) const;  ///< Wraps OrtApi::ModelMetadataGetGraphName
+
+  /** \brief Returns a copy of the domain name.
+   *
+   * \param allocator to allocate memory for the copy of the name returned
+   * \return a instance of smart pointer that would deallocate the buffer when out of scope.
+   *  The OrtAllocator instances must be valid at the point of memory release.
+   */
+  AllocatedStringPtr GetDomainAllocated(OrtAllocator* allocator) const;  ///< Wraps OrtApi::ModelMetadataGetDomain
+
+  /** \brief Returns a copy of the description.
+   *
+   * \param allocator to allocate memory for the copy of the string returned
+   * \return a instance of smart pointer that would deallocate the buffer when out of scope.
+   *  The OrtAllocator instances must be valid at the point of memory release.
+   */
+  AllocatedStringPtr GetDescriptionAllocated(OrtAllocator* allocator) const;  ///< Wraps OrtApi::ModelMetadataGetDescription
+
+  /** \brief Returns a copy of the graph description.
+   *
+   * \param allocator to allocate memory for the copy of the string returned
+   * \return a instance of smart pointer that would deallocate the buffer when out of scope.
+   *  The OrtAllocator instances must be valid at the point of memory release.
+   */
+  AllocatedStringPtr GetGraphDescriptionAllocated(OrtAllocator* allocator) const;  ///< Wraps OrtApi::ModelMetadataGetGraphDescription
+
+  /** \brief Returns a vector of copies of the custom metadata keys.
+   *
+   * \param allocator to allocate memory for the copy of the string returned
+   * \return a instance std::vector of smart pointers that would deallocate the buffers when out of scope.
+   *  The OrtAllocator instance must be valid at the point of memory release.
+   */
+  std::vector<AllocatedStringPtr> GetCustomMetadataMapKeysAllocated(OrtAllocator* allocator) const;  ///< Wraps OrtApi::ModelMetadataGetCustomMetadataMapKeys
+
+  /** \brief Looks up a value by a key in the Custom Metadata map
+   *
+   * \param key zero terminated string key to lookup
+   * \param allocator to allocate memory for the copy of the string returned
+   * \return a instance of smart pointer that would deallocate the buffer when out of scope.
+   *  maybe nullptr if key is not found.
+   *
+   *  The OrtAllocator instances must be valid at the point of memory release.
+   */
+  AllocatedStringPtr LookupCustomMetadataMapAllocated(const char* key, OrtAllocator* allocator) const;  ///< Wraps OrtApi::ModelMetadataLookupCustomMetadataMap
+
+  int64_t GetVersion() const;  ///< Wraps OrtApi::ModelMetadataGetVersion
+};
+
+struct IoBinding;
+
+namespace detail {
+
+// we separate const-only methods because passing const ptr to non-const methods
+// is only discovered when inline methods are compiled which is counter-intuitive
+template <typename T>
+struct ConstSessionImpl : Base<T> {
+  using B = Base<T>;
+  using B::B;
+
+  size_t GetInputCount() const;                   ///< Returns the number of model inputs
+  size_t GetOutputCount() const;                  ///< Returns the number of model outputs
+  size_t GetOverridableInitializerCount() const;  ///< Returns the number of inputs that have defaults that can be overridden
+
+  std::vector<std::string> GetInputNames() const;
+  std::vector<std::string> GetOutputNames() const;
+  std::vector<std::string> GetOverridableInitializerNames() const;
+
+  /** \brief Returns a copy of input name at the specified index.
+   *
+   * \param index must less than the value returned by GetInputCount()
+   * \param allocator to allocate memory for the copy of the name returned
+   * \return a instance of smart pointer that would deallocate the buffer when out of scope.
+   *  The OrtAllocator instances must be valid at the point of memory release.
+   */
+  AllocatedStringPtr GetInputNameAllocated(size_t index, OrtAllocator* allocator) const;
+
+  /** \brief Returns a copy of output name at then specified index.
+   *
+   * \param index must less than the value returned by GetOutputCount()
+   * \param allocator to allocate memory for the copy of the name returned
+   * \return a instance of smart pointer that would deallocate the buffer when out of scope.
+   *  The OrtAllocator instances must be valid at the point of memory release.
+   */
+  AllocatedStringPtr GetOutputNameAllocated(size_t index, OrtAllocator* allocator) const;
+
+  /** \brief Returns a copy of the overridable initializer name at then specified index.
+   *
+   * \param index must less than the value returned by GetOverridableInitializerCount()
+   * \param allocator to allocate memory for the copy of the name returned
+   * \return a instance of smart pointer that would deallocate the buffer when out of scope.
+   *  The OrtAllocator instances must be valid at the point of memory release.
+   */
+  AllocatedStringPtr GetOverridableInitializerNameAllocated(size_t index, OrtAllocator* allocator) const;  ///< Wraps OrtApi::SessionGetOverridableInitializerName
+
+  uint64_t GetProfilingStartTimeNs() const;  ///< Wraps OrtApi::SessionGetProfilingStartTimeNs
+  ModelMetadata GetModelMetadata() const;    ///< Wraps OrtApi::SessionGetModelMetadata
+
+  TypeInfo GetInputTypeInfo(size_t index) const;                   ///< Wraps OrtApi::SessionGetInputTypeInfo
+  TypeInfo GetOutputTypeInfo(size_t index) const;                  ///< Wraps OrtApi::SessionGetOutputTypeInfo
+  TypeInfo GetOverridableInitializerTypeInfo(size_t index) const;  ///< Wraps OrtApi::SessionGetOverridableInitializerTypeInfo
+
+  int GetOpset(const std::string& domain) const;  ///< Wraps OrtApi::SessionGetOpsetForDomain
+
+  // Will move before checkin if that's the case.
+  std::vector<ValueInfo> GetInputs() const;
+  std::vector<ValueInfo> GetOutputs() const;
+};
+
+template <typename T>
+struct SessionImpl : ConstSessionImpl<T> {
+  using B = ConstSessionImpl<T>;
+  using B::B;
+
+  /** \brief Run the model returning results in an Ort allocated vector.
+   *
+   * Wraps OrtApi::Run
+   *
+   * The caller provides a list of inputs and a list of the desired outputs to return.
+   *
+   * See the output logs for more information on warnings/errors that occur while processing the model.
+   * Common errors are.. (TODO)
+   *
+   * \param[in] run_options
+   * \param[in] input_names Array of null terminated strings of length input_count that is the list of input names
+   * \param[in] input_values Array of Value objects of length input_count that is the list of input values
+   * \param[in] input_count Number of inputs (the size of the input_names & input_values arrays)
+   * \param[in] output_names Array of C style strings of length output_count that is the list of output names
+   * \param[in] output_count Number of outputs (the size of the output_names array)
+   * \return A std::vector of Value objects that directly maps to the output_names array (eg. output_name[0] is the first entry of the returned vector)
+   */
+  std::vector<Value> Run(const RunOptions& run_options, const char* const* input_names, const Value* input_values, size_t input_count,
+                         const char* const* output_names, size_t output_count);
+
+  /** \brief Run the model returning results in user provided outputs
+   * Same as Run(const RunOptions&, const char* const*, const Value*, size_t,const char* const*, size_t)
+   */
+  void Run(const RunOptions& run_options, const char* const* input_names, const Value* input_values, size_t input_count,
+           const char* const* output_names, Value* output_values, size_t output_count);
+
+  void Run(const RunOptions& run_options, const IoBinding&);  ///< Wraps OrtApi::RunWithBinding
+
+  /** \brief Run the model asynchronously in a thread owned by intra op thread pool
+   *
+   * Wraps OrtApi::RunAsync
+   *
+   * \param[in] run_options
+   * \param[in] input_names Array of null terminated UTF8 encoded strings of the input names
+   * \param[in] input_values Array of Value objects of length input_count
+   * \param[in] input_count Number of elements in the input_names and inputs arrays
+   * \param[in] output_names Array of null terminated UTF8 encoded strings of the output names
+   * \param[out] output_values Array of provided Values to be filled with outputs.
+   *             On calling RunAsync, output_values[i] could either be initialized by a null pointer or a preallocated OrtValue*.
+   *             Later, on invoking the callback, each output_values[i] of null will be filled with an OrtValue* allocated by onnxruntime.
+   *             Then, an OrtValue** pointer will be casted from output_values, and pass to the callback.
+   *             NOTE: it is customer's duty to finally release output_values and each of its member,
+   *             regardless of whether the member (Ort::Value) is allocated by onnxruntime or preallocated by the customer.
+   * \param[in] output_count Number of elements in the output_names and outputs array
+   * \param[in] callback Callback function on model run completion
+   * \param[in] user_data User data that pass back to the callback
+   */
+  void RunAsync(const RunOptions& run_options, const char* const* input_names, const Value* input_values, size_t input_count,
+                const char* const* output_names, Value* output_values, size_t output_count, RunAsyncCallbackFn callback, void* user_data);
+
+  /** \brief End profiling and return a copy of the profiling file name.
+   *
+   * \param allocator to allocate memory for the copy of the string returned
+   * \return a instance of smart pointer that would deallocate the buffer when out of scope.
+   *  The OrtAllocator instances must be valid at the point of memory release.
+   */
+  AllocatedStringPtr EndProfilingAllocated(OrtAllocator* allocator);  ///< Wraps OrtApi::SessionEndProfiling
+
+  /** \brief Set DynamicOptions for EPs (Execution Providers)
+   *
+   * Wraps OrtApi::SetEpDynamicOptions
+   *
+   * Valid options can be found in `include\onnxruntime\core\session\onnxruntime_session_options_config_keys.h`
+   * Look for `kOrtEpDynamicOptions`
+   *
+   * \param[in] keys Array of null terminated UTF8 encoded strings of EP dynamic option keys
+   * \param[in] values Array of null terminated UTF8 encoded string of EP dynamic option values
+   * \param[in] kv_len Number of elements in the keys and values arrays
+   */
+  void SetEpDynamicOptions(const char* const* keys, const char* const* values, size_t kv_len);
+
+  void FinalizeModelEditorSession(const Model& model, const SessionOptions& options,
+                                  OrtPrepackedWeightsContainer* prepacked_weights_container = nullptr);
+};
+
+}  // namespace detail
+
+using ConstSession = detail::ConstSessionImpl<detail::Unowned<const OrtSession>>;
+using UnownedSession = detail::SessionImpl<detail::Unowned<OrtSession>>;
+
+/** \brief Wrapper around ::OrtSession
+ *
+ */
+struct Session : detail::SessionImpl<OrtSession> {
+  /// Create an empty Session object, must be assigned a valid one to be used. Wraps OrtApi::CreateSession
+  explicit Session(std::nullptr_t) {}
+  explicit Session(OrtSession* p) : SessionImpl{p} {}  ///< C API Interop
+
+  Session(const Env& env, const ORTCHAR_T* model_path, const SessionOptions& options);
+
+  /// Wraps OrtApi::CreateSessionWithPrepackedWeightsContainer
+  Session(const Env& env, const ORTCHAR_T* model_path, const SessionOptions& options,
+          OrtPrepackedWeightsContainer* prepacked_weights_container);
+
+  /// Wraps OrtApi::CreateSessionFromArray
+  Session(const Env& env, const void* model_data, size_t model_data_length, const SessionOptions& options);
+
+  /// Wraps OrtApi::CreateSessionFromArrayWithPrepackedWeightsContainer
+  Session(const Env& env, const void* model_data, size_t model_data_length, const SessionOptions& options,
+          OrtPrepackedWeightsContainer* prepacked_weights_container);
+
+#if !defined(ORT_MINIMAL_BUILD)
+  /// Wraps OrtModelEditorApi::CreateSessionFromModel
+  Session(const Env& env, const Model& model, const SessionOptions& options);
+
+  /// Wraps OrtModelEditorApi::CreateModelEditorSession
+  static Session CreateModelEditorSession(const Env& env, const ORTCHAR_T* model_path, const SessionOptions& options);
+
+  /// Wraps OrtModelEditorApi::CreateModelEditorSession
+  static Session CreateModelEditorSession(const Env& env, const void* model_data, size_t model_data_length,
+                                          const SessionOptions& options);
+#endif  // !defined(ORT_MINIMAL_BUILD)
+
+  ConstSession GetConst() const { return ConstSession{this->p_}; }
+  UnownedSession GetUnowned() const { return UnownedSession{this->p_}; }
+};
+
+namespace detail {
+template <typename T>
+struct MemoryInfoImpl : Base<T> {
+  using B = Base<T>;
+  using B::B;
+
+  std::string GetAllocatorName() const;
+  OrtAllocatorType GetAllocatorType() const;
+  int GetDeviceId() const;
+  OrtMemoryInfoDeviceType GetDeviceType() const;
+  OrtMemType GetMemoryType() const;
+
+  template <typename U>
+  bool operator==(const MemoryInfoImpl<U>& o) const;
+};
+}  // namespace detail
+
+// Const object holder that does not own the underlying object
+using ConstMemoryInfo = detail::MemoryInfoImpl<detail::Unowned<const OrtMemoryInfo>>;
+
+/** \brief Wrapper around ::OrtMemoryInfo
+ *
+ */
+struct MemoryInfo : detail::MemoryInfoImpl<OrtMemoryInfo> {
+  static MemoryInfo CreateCpu(OrtAllocatorType type, OrtMemType mem_type1);
+  explicit MemoryInfo(std::nullptr_t) {}                                       ///< No instance is created
+  explicit MemoryInfo(OrtMemoryInfo* p) : MemoryInfoImpl<OrtMemoryInfo>{p} {}  ///< Take ownership of a pointer created by C API
+  MemoryInfo(const char* name, OrtAllocatorType type, int id, OrtMemType mem_type);
+  ConstMemoryInfo GetConst() const { return ConstMemoryInfo{this->p_}; }
+};
+
+namespace detail {
+template <typename T>
+struct TensorTypeAndShapeInfoImpl : Base<T> {
+  using B = Base<T>;
+  using B::B;
+
+  ONNXTensorElementDataType GetElementType() const;  ///< Wraps OrtApi::GetTensorElementType
+  size_t GetElementCount() const;                    ///< Wraps OrtApi::GetTensorShapeElementCount
+
+  size_t GetDimensionsCount() const;  ///< Wraps OrtApi::GetDimensionsCount
+
+  /** \deprecated use GetShape() returning std::vector
+   * [[deprecated]]
+   * This interface is unsafe to use
+   */
+  [[deprecated("use GetShape()")]] void GetDimensions(int64_t* values, size_t values_count) const;  ///< Wraps OrtApi::GetDimensions
+
+  void GetSymbolicDimensions(const char** values, size_t values_count) const;  ///< Wraps OrtApi::GetSymbolicDimensions
+  std::vector<const char*> GetSymbolicDimensions() const;
+
+  std::vector<int64_t> GetShape() const;  ///< Uses GetDimensionsCount & GetDimensions to return a std::vector of the shape
+};
+
+}  // namespace detail
+
+using ConstTensorTypeAndShapeInfo = detail::TensorTypeAndShapeInfoImpl<detail::Unowned<const OrtTensorTypeAndShapeInfo>>;
+
+/** \brief Wrapper around ::OrtTensorTypeAndShapeInfo
+ *
+ */
+struct TensorTypeAndShapeInfo : detail::TensorTypeAndShapeInfoImpl<OrtTensorTypeAndShapeInfo> {
+  using Base = detail::TensorTypeAndShapeInfoImpl<OrtTensorTypeAndShapeInfo>;
+  using Base::Base;
+
+  /// Create an empty TensorTypeAndShapeInfo object, must be assigned a valid one to be used
+  explicit TensorTypeAndShapeInfo(std::nullptr_t) {}
+  /// Used for interop with the C API
+  explicit TensorTypeAndShapeInfo(OrtTensorTypeAndShapeInfo* p) : TensorTypeAndShapeInfoImpl{p} {}
+
+  // Create a TensorTypeAndShapeInfo object with the specified element type and dimensions
+  // symbolic_dims are optional, but should be 1:1 with dims.
+  // The value in symbolic_dims will be used for all entries in dims that are -1.
+  explicit TensorTypeAndShapeInfo(ONNXTensorElementDataType element_type,
+                                  const std::vector<int64_t>& dims,
+                                  const std::vector<std::string>* symbolic_dims = nullptr);
+
+  ConstTensorTypeAndShapeInfo GetConst() const { return ConstTensorTypeAndShapeInfo{this->p_}; }
+};
+
+namespace detail {
+template <typename T>
+struct SequenceTypeInfoImpl : Base<T> {
+  using B = Base<T>;
+  using B::B;
+  TypeInfo GetSequenceElementType() const;  ///< Wraps OrtApi::GetSequenceElementType
+};
+
+}  // namespace detail
+
+using ConstSequenceTypeInfo = detail::SequenceTypeInfoImpl<detail::Unowned<const OrtSequenceTypeInfo>>;
+
+/** \brief Wrapper around ::OrtSequenceTypeInfo
+ *
+ */
+struct SequenceTypeInfo : detail::SequenceTypeInfoImpl<OrtSequenceTypeInfo> {
+  using Base = detail::SequenceTypeInfoImpl<OrtSequenceTypeInfo>;
+  using Base::Base;
+
+  explicit SequenceTypeInfo(std::nullptr_t) {}                                                         ///< Create an empty SequenceTypeInfo object, must be assigned a valid one to be used
+  explicit SequenceTypeInfo(OrtSequenceTypeInfo* p) : SequenceTypeInfoImpl<OrtSequenceTypeInfo>{p} {}  ///< Used for interop with the C API
+  ConstSequenceTypeInfo GetConst() const { return ConstSequenceTypeInfo{this->p_}; }
+};
+
+namespace detail {
+template <typename T>
+struct OptionalTypeInfoImpl : Base<T> {
+  using B = Base<T>;
+  using B::B;
+  TypeInfo GetOptionalElementType() const;  ///< Wraps OrtApi::CastOptionalTypeToContainedTypeInfo
+};
+
+}  // namespace detail
+
+// This is always owned by the TypeInfo and can only be obtained from it.
+using ConstOptionalTypeInfo = detail::OptionalTypeInfoImpl<detail::Unowned<const OrtOptionalTypeInfo>>;
+
+namespace detail {
+template <typename T>
+struct MapTypeInfoImpl : detail::Base<T> {
+  using B = Base<T>;
+  using B::B;
+  ONNXTensorElementDataType GetMapKeyType() const;  ///< Wraps OrtApi::GetMapKeyType
+  TypeInfo GetMapValueType() const;                 ///< Wraps OrtApi::GetMapValueType
+};
+
+}  // namespace detail
+
+using ConstMapTypeInfo = detail::MapTypeInfoImpl<detail::Unowned<const OrtMapTypeInfo>>;
+
+/** \brief Wrapper around ::OrtMapTypeInfo
+ *
+ */
+struct MapTypeInfo : detail::MapTypeInfoImpl<OrtMapTypeInfo> {
+  using Base = detail::MapTypeInfoImpl<OrtMapTypeInfo>;
+  using Base::Base;
+
+  explicit MapTypeInfo(std::nullptr_t) {}                                          ///< Create an empty MapTypeInfo object, must be assigned a valid one to be used
+  explicit MapTypeInfo(OrtMapTypeInfo* p) : MapTypeInfoImpl<OrtMapTypeInfo>{p} {}  ///< Used for interop with the C API
+  ConstMapTypeInfo GetConst() const { return ConstMapTypeInfo{this->p_}; }
+};
+
+namespace detail {
+template <typename T>
+struct TypeInfoImpl : detail::Base<T> {
+  using B = Base<T>;
+  using B::B;
+
+  ConstTensorTypeAndShapeInfo GetTensorTypeAndShapeInfo() const;  ///< Wraps OrtApi::CastTypeInfoToTensorInfo
+  ConstSequenceTypeInfo GetSequenceTypeInfo() const;              ///< Wraps OrtApi::CastTypeInfoToSequenceTypeInfo
+  ConstMapTypeInfo GetMapTypeInfo() const;                        ///< Wraps OrtApi::CastTypeInfoToMapTypeInfo
+  ConstOptionalTypeInfo GetOptionalTypeInfo() const;              ///< wraps OrtApi::CastTypeInfoToOptionalTypeInfo
+
+  ONNXType GetONNXType() const;
+};
+}  // namespace detail
+
+/// <summary>
+/// Contains a constant, unowned OrtTypeInfo that can be copied and passed around by value.
+/// Provides access to const OrtTypeInfo APIs.
+/// </summary>
+using ConstTypeInfo = detail::TypeInfoImpl<detail::Unowned<const OrtTypeInfo>>;
+
+/// <summary>
+/// Type information that may contain either TensorTypeAndShapeInfo or
+/// the information about contained sequence or map depending on the ONNXType.
+/// </summary>
+struct TypeInfo : detail::TypeInfoImpl<OrtTypeInfo> {
+  using Base = detail::TypeInfoImpl<OrtTypeInfo>;
+  using Base::Base;
+
+  /// Create an empty TypeInfo object, must be assigned a valid one to be used
+  explicit TypeInfo(std::nullptr_t) {}
+  explicit TypeInfo(OrtTypeInfo* p) : TypeInfoImpl<OrtTypeInfo>{p} {}  ///< C API Interop
+
+#if !defined(ORT_MINIMAL_BUILD)
+  static TypeInfo CreateTensorInfo(ConstTensorTypeAndShapeInfo tensor_info);
+  static TypeInfo CreateSparseTensorInfo(ConstTensorTypeAndShapeInfo sparse_tensor_info);
+  static TypeInfo CreateSequenceTypeInfo(ConstTypeInfo sequence_type);
+  static TypeInfo CreateMapTypeInfo(ONNXTensorElementDataType key_type, ConstTypeInfo value_type);
+  static TypeInfo CreateOptionalTypeInfo(ConstTypeInfo contained_type);
+#endif  // !defined(ORT_MINIMAL_BUILD)
+
+  ConstTypeInfo GetConst() const { return ConstTypeInfo{this->p_}; }
+};
+
+namespace detail {
+// This structure is used to feed  sparse tensor values
+// information for use with FillSparseTensor<Format>() API
+// if the data type for the sparse tensor values is numeric
+// use data.p_data, otherwise, use data.str pointer to feed
+// values. data.str is an array of const char* that are zero terminated.
+// number of strings in the array must match shape size.
+// For fully sparse tensors use shape {0} and set p_data/str
+// to nullptr.
+struct OrtSparseValuesParam {
+  const int64_t* values_shape;
+  size_t values_shape_len;
+  union {
+    const void* p_data;
+    const char** str;
+  } data;
+};
+
+// Provides a way to pass shape in a single
+// argument
+struct Shape {
+  const int64_t* shape;
+  size_t shape_len;
+};
+
+template <typename T>
+struct ConstValueImpl : Base<T> {
+  using B = Base<T>;
+  using B::B;
+
+  /// <summary>
+  /// Obtains a pointer to a user defined data for experimental purposes
+  /// </summary>
+  template <typename R>
+  void GetOpaqueData(const char* domain, const char* type_name, R&) const;  ///< Wraps OrtApi::GetOpaqueValue
+
+  bool IsTensor() const;  ///< Returns true if Value is a tensor, false for other types like map/sequence/etc
+  bool HasValue() const;  /// < Return true if OrtValue contains data and returns false if the OrtValue is a None
+
+  size_t GetCount() const;  // If a non tensor, returns 2 for map and N for sequence, where N is the number of elements
+  Value GetValue(int index, OrtAllocator* allocator) const;
+
+  /// <summary>
+  /// This API returns a full length of string data contained within either a tensor or a sparse Tensor.
+  /// For sparse tensor it returns a full length of stored non-empty strings (values). The API is useful
+  /// for allocating necessary memory and calling GetStringTensorContent().
+  /// </summary>
+  /// <returns>total length of UTF-8 encoded bytes contained. No zero terminators counted.</returns>
+  size_t GetStringTensorDataLength() const;
+
+  /// <summary>
+  /// The API copies all of the UTF-8 encoded string data contained within a tensor or a sparse tensor
+  /// into a supplied buffer. Use GetStringTensorDataLength() to find out the length of the buffer to allocate.
+  /// The user must also allocate offsets buffer with the number of entries equal to that of the contained
+  /// strings.
+  ///
+  /// Strings are always assumed to be on CPU, no X-device copy.
+  /// </summary>
+  /// <param name="buffer">user allocated buffer</param>
+  /// <param name="buffer_length">length in bytes of the allocated buffer</param>
+  /// <param name="offsets">a pointer to the offsets user allocated buffer</param>
+  /// <param name="offsets_count">count of offsets, must be equal to the number of strings contained.
+  ///   that can be obtained from the shape of the tensor or from GetSparseTensorValuesTypeAndShapeInfo()
+  ///   for sparse tensors</param>
+  void GetStringTensorContent(void* buffer, size_t buffer_length, size_t* offsets, size_t offsets_count) const;
+
+  /// <summary>
+  /// Returns a const typed pointer to the tensor contained data.
+  /// No type checking is performed, the caller must ensure the type matches the tensor type.
+  /// </summary>
+  /// <typeparam name="T"></typeparam>
+  /// <returns>const pointer to data, no copies made</returns>
+  template <typename R>
+  const R* GetTensorData() const;  ///< Wraps OrtApi::GetTensorMutableData   /// <summary>
+
+  /// <summary>
+  /// Returns a non-typed pointer to a tensor contained data.
+  /// </summary>
+  /// <returns>const pointer to data, no copies made</returns>
+  const void* GetTensorRawData() const;
+
+  /// <summary>
+  /// The API returns type information for data contained in a tensor. For sparse
+  /// tensors it returns type information for contained non-zero values.
+  /// It returns dense shape for sparse tensors.
+  /// </summary>
+  /// <returns>TypeInfo</returns>
+  TypeInfo GetTypeInfo() const;
+
+  /// <summary>
+  /// The API returns type information for data contained in a tensor. For sparse
+  /// tensors it returns type information for contained non-zero values.
+  /// It returns dense shape for sparse tensors.
+  /// </summary>
+  /// <returns>TensorTypeAndShapeInfo</returns>
+  TensorTypeAndShapeInfo GetTensorTypeAndShapeInfo() const;
+
+  /// <summary>
+  /// This API returns information about the memory allocation used to hold data.
+  /// </summary>
+  /// <returns>Non owning instance of MemoryInfo</returns>
+  ConstMemoryInfo GetTensorMemoryInfo() const;
+
+  /// <summary>
+  /// The API copies UTF-8 encoded bytes for the requested string element
+  /// contained within a tensor or a sparse tensor into a provided buffer.
+  /// Use GetStringTensorElementLength() to obtain the length of the buffer to allocate.
+  /// </summary>
+  /// <param name="buffer_length"></param>
+  /// <param name="element_index"></param>
+  /// <param name="buffer"></param>
+  void GetStringTensorElement(size_t buffer_length, size_t element_index, void* buffer) const;
+
+  /// <summary>
+  /// Returns string tensor UTF-8 encoded string element.
+  /// Use of this API is recommended over GetStringTensorElement() that takes void* buffer pointer.
+  /// </summary>
+  /// <param name="element_index"></param>
+  /// <returns>std::string</returns>
+  std::string GetStringTensorElement(size_t element_index) const;
+
+  /// <summary>
+  /// The API returns a byte length of UTF-8 encoded string element
+  /// contained in either a tensor or a spare tensor values.
+  /// </summary>
+  /// <param name="element_index"></param>
+  /// <returns>byte length for the specified string element</returns>
+  size_t GetStringTensorElementLength(size_t element_index) const;
+
+#if !defined(DISABLE_SPARSE_TENSORS)
+  /// <summary>
+  /// The API returns the sparse data format this OrtValue holds in a sparse tensor.
+  /// If the sparse tensor was not fully constructed, i.e. Use*() or Fill*() API were not used
+  /// the value returned is ORT_SPARSE_UNDEFINED.
+  /// </summary>
+  /// <returns>Format enum</returns>
+  OrtSparseFormat GetSparseFormat() const;
+
+  /// <summary>
+  /// The API returns type and shape information for stored non-zero values of the
+  /// sparse tensor. Use GetSparseTensorValues() to obtain values buffer pointer.
+  /// </summary>
+  /// <returns>TensorTypeAndShapeInfo values information</returns>
+  TensorTypeAndShapeInfo GetSparseTensorValuesTypeAndShapeInfo() const;
+
+  /// <summary>
+  /// The API returns type and shape information for the specified indices. Each supported
+  /// indices have their own enum values even if a give format has more than one kind of indices.
+  /// Use GetSparseTensorIndicesData() to obtain pointer to indices buffer.
+  /// </summary>
+  /// <param name="format">enum requested</param>
+  /// <returns>type and shape information</returns>
+  TensorTypeAndShapeInfo GetSparseTensorIndicesTypeShapeInfo(OrtSparseIndicesFormat format) const;
+
+  /// <summary>
+  /// The API retrieves a pointer to the internal indices buffer. The API merely performs
+  /// a convenience data type casting on the return type pointer. Make sure you are requesting
+  /// the right type, use GetSparseTensorIndicesTypeShapeInfo();
+  /// </summary>
+  /// <typeparam name="T">type to cast to</typeparam>
+  /// <param name="indices_format">requested indices kind</param>
+  /// <param name="num_indices">number of indices entries</param>
+  /// <returns>Pinter to the internal sparse tensor buffer containing indices. Do not free this pointer.</returns>
+  template <typename R>
+  const R* GetSparseTensorIndicesData(OrtSparseIndicesFormat indices_format, size_t& num_indices) const;
+
+  /// <summary>
+  /// Returns true if the OrtValue contains a sparse tensor
+  /// </summary>
+  /// <returns></returns>
+  bool IsSparseTensor() const;
+
+  /// <summary>
+  /// The API returns a pointer to an internal buffer of the sparse tensor
+  /// containing non-zero values. The API merely does casting. Make sure you
+  /// are requesting the right data type by calling GetSparseTensorValuesTypeAndShapeInfo()
+  /// first.
+  /// </summary>
+  /// <typeparam name="T">numeric data types only. Use GetStringTensor*() to retrieve strings.</typeparam>
+  /// <returns>a pointer to the internal values buffer. Do not free this pointer.</returns>
+  template <typename R>
+  const R* GetSparseTensorValues() const;
+
+#endif
+};
+
+template <typename T>
+struct ValueImpl : ConstValueImpl<T> {
+  using B = ConstValueImpl<T>;
+  using B::B;
+
+  /// <summary>
+  /// Returns a non-const typed pointer to an OrtValue/Tensor contained buffer
+  /// No type checking is performed, the caller must ensure the type matches the tensor type.
+  /// </summary>
+  /// <returns>non-const pointer to data, no copies made</returns>
+  template <typename R>
+  R* GetTensorMutableData();
+
+  /// <summary>
+  /// Returns a non-typed non-const pointer to a tensor contained data.
+  /// </summary>
+  /// <returns>pointer to data, no copies made</returns>
+  void* GetTensorMutableRawData();
+
+  /// <summary>
+  //  Obtain a reference to an element of data at the location specified
+  /// by the vector of dims.
+  /// </summary>
+  /// <typeparam name="R"></typeparam>
+  /// <param name="location">[in] expressed by a vecotr of dimensions offsets</param>
+  /// <returns></returns>
+  template <typename R>
+  R& At(const std::vector<int64_t>& location);
+
+  /// <summary>
+  /// Set all strings at once in a string tensor
+  /// </summary>
+  /// <param name="s">[in] An array of strings. Each string in this array must be null terminated.</param>
+  /// <param name="s_len">[in] Count of strings in s (Must match the size of \p value's tensor shape)</param>
+  void FillStringTensor(const char* const* s, size_t s_len);
+
+  /// <summary>
+  /// Set a single string in a string tensor
+  /// </summary>
+  /// <param name="s">[in] A null terminated UTF-8 encoded string</param>
+  /// <param name="index">[in] Index of the string in the tensor to set</param>
+  void FillStringTensorElement(const char* s, size_t index);
+
+  /// <summary>
+  /// Allocate if necessary and obtain a pointer to a UTF-8
+  /// encoded string element buffer indexed by the flat element index,
+  /// of the specified length.
+  ///
+  /// This API is for advanced usage. It avoids a need to construct
+  /// an auxiliary array of string pointers, and allows to write data directly
+  /// (do not zero terminate).
+  /// </summary>
+  /// <param name="index"></param>
+  /// <param name="buffer_length"></param>
+  /// <returns>a pointer to a writable buffer</returns>
+  char* GetResizedStringTensorElementBuffer(size_t index, size_t buffer_length);
+
+#if !defined(DISABLE_SPARSE_TENSORS)
+  /// <summary>
+  /// Supplies COO format specific indices and marks the contained sparse tensor as being a COO format tensor.
+  /// Values are supplied with a CreateSparseTensor() API. The supplied indices are not copied and the user
+  /// allocated buffers lifespan must eclipse that of the OrtValue.
+  /// The location of the indices is assumed to be the same as specified by OrtMemoryInfo argument at the creation time.
+  /// </summary>
+  /// <param name="indices_data">pointer to the user allocated buffer with indices. Use nullptr for fully sparse tensors.</param>
+  /// <param name="indices_num">number of indices entries. Use 0 for fully sparse tensors</param>
+  void UseCooIndices(int64_t* indices_data, size_t indices_num);
+
+  /// <summary>
+  /// Supplies CSR format specific indices and marks the contained sparse tensor as being a CSR format tensor.
+  /// Values are supplied with a CreateSparseTensor() API. The supplied indices are not copied and the user
+  /// allocated buffers lifespan must eclipse that of the OrtValue.
+  /// The location of the indices is assumed to be the same as specified by OrtMemoryInfo argument at the creation time.
+  /// </summary>
+  /// <param name="inner_data">pointer to the user allocated buffer with inner indices or nullptr for fully sparse tensors</param>
+  /// <param name="inner_num">number of csr inner indices or 0 for fully sparse tensors</param>
+  /// <param name="outer_data">pointer to the user allocated buffer with outer indices or nullptr for fully sparse tensors</param>
+  /// <param name="outer_num">number of csr outer indices or 0 for fully sparse tensors</param>
+  void UseCsrIndices(int64_t* inner_data, size_t inner_num, int64_t* outer_data, size_t outer_num);
+
+  /// <summary>
+  /// Supplies BlockSparse format specific indices and marks the contained sparse tensor as being a BlockSparse format tensor.
+  /// Values are supplied with a CreateSparseTensor() API. The supplied indices are not copied and the user
+  /// allocated buffers lifespan must eclipse that of the OrtValue.
+  /// The location of the indices is assumed to be the same as specified by OrtMemoryInfo argument at the creation time.
+  /// </summary>
+  /// <param name="indices_shape">indices shape or a {0} for fully sparse</param>
+  /// <param name="indices_data">user allocated buffer with indices or nullptr for fully spare tensors</param>
+  void UseBlockSparseIndices(const Shape& indices_shape, int32_t* indices_data);
+
+  /// <summary>
+  /// The API will allocate memory using the allocator instance supplied to the CreateSparseTensor() API
+  /// and copy the values and COO indices into it. If data_mem_info specifies that the data is located
+  /// at difference device than the allocator, a X-device copy will be performed if possible.
+  /// </summary>
+  /// <param name="data_mem_info">specified buffer memory description</param>
+  /// <param name="values_param">values buffer information.</param>
+  /// <param name="indices_data">coo indices buffer or nullptr for fully sparse data</param>
+  /// <param name="indices_num">number of COO indices or 0 for fully sparse data</param>
+  void FillSparseTensorCoo(const OrtMemoryInfo* data_mem_info, const OrtSparseValuesParam& values_param,
+                           const int64_t* indices_data, size_t indices_num);
+
+  /// <summary>
+  /// The API will allocate memory using the allocator instance supplied to the CreateSparseTensor() API
+  /// and copy the values and CSR indices into it. If data_mem_info specifies that the data is located
+  /// at difference device than the allocator, a X-device copy will be performed if possible.
+  /// </summary>
+  /// <param name="data_mem_info">specified buffer memory description</param>
+  /// <param name="values">values buffer information</param>
+  /// <param name="inner_indices_data">csr inner indices pointer or nullptr for fully sparse tensors</param>
+  /// <param name="inner_indices_num">number of csr inner indices or 0 for fully sparse tensors</param>
+  /// <param name="outer_indices_data">pointer to csr indices data or nullptr for fully sparse tensors</param>
+  /// <param name="outer_indices_num">number of csr outer indices or 0</param>
+  void FillSparseTensorCsr(const OrtMemoryInfo* data_mem_info,
+                           const OrtSparseValuesParam& values,
+                           const int64_t* inner_indices_data, size_t inner_indices_num,
+                           const int64_t* outer_indices_data, size_t outer_indices_num);
+
+  /// <summary>
+  /// The API will allocate memory using the allocator instance supplied to the CreateSparseTensor() API
+  /// and copy the values and BlockSparse indices into it. If data_mem_info specifies that the data is located
+  /// at difference device than the allocator, a X-device copy will be performed if possible.
+  /// </summary>
+  /// <param name="data_mem_info">specified buffer memory description</param>
+  /// <param name="values">values buffer information</param>
+  /// <param name="indices_shape">indices shape. use {0} for fully sparse tensors</param>
+  /// <param name="indices_data">pointer to indices data or nullptr for fully sparse tensors</param>
+  void FillSparseTensorBlockSparse(const OrtMemoryInfo* data_mem_info,
+                                   const OrtSparseValuesParam& values,
+                                   const Shape& indices_shape,
+                                   const int32_t* indices_data);
+
+#endif
+};
+
+}  // namespace detail
+
+using ConstValue = detail::ConstValueImpl<detail::Unowned<const OrtValue>>;
+using UnownedValue = detail::ValueImpl<detail::Unowned<OrtValue>>;
+
+/** \brief Wrapper around ::OrtValue
+ *
+ */
+struct Value : detail::ValueImpl<OrtValue> {
+  using Base = detail::ValueImpl<OrtValue>;
+  using Base::Base;
+  using OrtSparseValuesParam = detail::OrtSparseValuesParam;
+  using Shape = detail::Shape;
+
+  explicit Value(std::nullptr_t) {}  ///< Create an empty Value object, must be assigned a valid one to be used
+  Value(Value&&) = default;
+  Value& operator=(Value&&) = default;
+
+  ConstValue GetConst() const { return ConstValue{this->p_}; }
+  UnownedValue GetUnowned() const { return UnownedValue{this->p_}; }
+
+  /** \brief Creates a tensor with a user supplied buffer. Wraps OrtApi::CreateTensorWithDataAsOrtValue.
+   * \tparam T The numeric datatype. This API is not suitable for strings.
+   * \param info Memory description of where the p_data buffer resides (CPU vs GPU etc).
+   * \param p_data Pointer to the data buffer.
+   * \param p_data_element_count The number of elements in the data buffer.
+   * \param shape Pointer to the tensor shape dimensions.
+   * \param shape_len The number of tensor shape dimensions.
+   */
+  template <typename T>
+  static Value CreateTensor(const OrtMemoryInfo* info, T* p_data, size_t p_data_element_count,
+                            const int64_t* shape, size_t shape_len);
+
+  /** \brief Creates a tensor with a user supplied buffer. Wraps OrtApi::CreateTensorWithDataAsOrtValue.
+   *
+   * \param info Memory description of where the p_data buffer resides (CPU vs GPU etc).
+   * \param p_data Pointer to the data buffer.
+   * \param p_data_byte_count The number of bytes in the data buffer.
+   * \param shape Pointer to the tensor shape dimensions.
+   * \param shape_len The number of tensor shape dimensions.
+   * \param type The data type.
+   */
+  static Value CreateTensor(const OrtMemoryInfo* info, void* p_data, size_t p_data_byte_count,
+                            const int64_t* shape, size_t shape_len,
+                            ONNXTensorElementDataType type);
+
+  /** \brief Creates a tensor with a user supplied buffer. Wraps OrtApi::CreateTensorWithDataAndDeleterAsOrtValue.
+   *
+   * \param deleter OrtAllocator that will be used to free the buffer when no longer required.
+   * \param p_data Pointer to the data buffer.
+   * \param p_data_byte_count The number of bytes in the data buffer.
+   * \param shape Pointer to the tensor shape dimensions.
+   * \param shape_len The number of tensor shape dimensions.
+   * \param type The data type.
+   */
+  static Value CreateTensor(OrtAllocator* deleter, void* p_data, size_t p_data_byte_count,
+                            const int64_t* shape, size_t shape_len,
+                            ONNXTensorElementDataType type);
+
+  /** \brief Creates an OrtValue with a tensor using a supplied OrtAllocator. Wraps OrtApi::CreateTensorAsOrtValue.
+   *         This overload will allocate the buffer for the tensor according to the supplied shape and data type.
+   *         The allocated buffer will be owned by the returned OrtValue and will be freed when the OrtValue is released.
+   *         The input data would need to be copied into the allocated buffer.
+   *         This API is not suitable for strings.
+   *
+   * \tparam T The numeric datatype. This API is not suitable for strings.
+   * \param allocator The allocator to use.
+   * \param shape Pointer to the tensor shape dimensions.
+   * \param shape_len The number of tensor shape dimensions.
+   */
+  template <typename T>
+  static Value CreateTensor(OrtAllocator* allocator, const int64_t* shape, size_t shape_len);
+
+  /** \brief Creates an OrtValue with a tensor using the supplied OrtAllocator.
+   *   Wraps OrtApi::CreateTensorAsOrtValue.
+   *   The allocated buffer will be owned by the returned OrtValue and will be freed when the OrtValue is released.
+   *   The input data would need to be copied into the allocated buffer.
+   *   This API is not suitable for strings.
+   *
+   * \param allocator The allocator to use.
+   * \param shape Pointer to the tensor shape dimensions.
+   * \param shape_len The number of tensor shape dimensions.
+   * \param type The data type.
+   */
+  static Value CreateTensor(OrtAllocator* allocator, const int64_t* shape, size_t shape_len,
+                            ONNXTensorElementDataType type);
+
+  /** \brief Creates an OrtValue with a Map Onnx type representation.
+   *  The API would ref-count the supplied OrtValues and they will be released
+   *  when the returned OrtValue is released. The caller may release keys and values after the call
+   *  returns.
+   *
+   * \param keys an OrtValue containing a tensor with primitive data type keys.
+   * \param values an OrtValue that may contain a tensor. Ort currently supports only primitive data type values.
+   */
+  static Value CreateMap(const Value& keys, const Value& values);  ///< Wraps OrtApi::CreateValue
+
+  /** \brief Creates an OrtValue with a Sequence Onnx type representation.
+   *  The API would ref-count the supplied OrtValues and they will be released
+   *  when the returned OrtValue is released. The caller may release the values after the call
+   *  returns.
+   *
+   * \param values a vector of OrtValues that must have the same Onnx value type.
+   */
+  static Value CreateSequence(const std::vector<Value>& values);  ///< Wraps OrtApi::CreateValue
+
+  /** \brief Creates an OrtValue wrapping an Opaque type.
+   *  This is used for experimental support of non-tensor types.
+   *
+   * \tparam T - the type of the value.
+   * \param domain - zero terminated utf-8 string. Domain of the type.
+   * \param type_name - zero terminated utf-8 string. Name of the type.
+   * \param value - the value to be wrapped.
+   */
+  template <typename T>
+  static Value CreateOpaque(const char* domain, const char* type_name, const T& value);  ///< Wraps OrtApi::CreateOpaqueValue
+
+#if !defined(DISABLE_SPARSE_TENSORS)
+  /// <summary>
+  /// This is a simple forwarding method to the other overload that helps deducing
+  /// data type enum value from the type of the buffer.
+  /// </summary>
+  /// <typeparam name="T">numeric datatype. This API is not suitable for strings.</typeparam>
+  /// <param name="info">Memory description where the user buffers reside (CPU vs GPU etc)</param>
+  /// <param name="p_data">pointer to the user supplied buffer, use nullptr for fully sparse tensors</param>
+  /// <param name="dense_shape">a would be dense shape of the tensor</param>
+  /// <param name="values_shape">non zero values shape. Use a single 0 shape for fully sparse tensors.</param>
+  /// <returns></returns>
+  template <typename T>
+  static Value CreateSparseTensor(const OrtMemoryInfo* info, T* p_data, const Shape& dense_shape,
+                                  const Shape& values_shape);
+
+  /// <summary>
+  /// Creates an OrtValue instance containing SparseTensor. This constructs
+  /// a sparse tensor that makes use of user allocated buffers. It does not make copies
+  /// of the user provided data and does not modify it. The lifespan of user provided buffers should
+  /// eclipse the life span of the resulting OrtValue. This call constructs an instance that only contain
+  /// a pointer to non-zero values. To fully populate the sparse tensor call Use<Format>Indices() API below
+  /// to supply a sparse format specific indices.
+  /// This API is not suitable for string data. Use CreateSparseTensor() with allocator specified so strings
+  /// can be properly copied into the allocated buffer.
+  /// </summary>
+  /// <param name="info">Memory description where the user buffers reside (CPU vs GPU etc)</param>
+  /// <param name="p_data">pointer to the user supplied buffer, use nullptr for fully sparse tensors</param>
+  /// <param name="dense_shape">a would be dense shape of the tensor</param>
+  /// <param name="values_shape">non zero values shape. Use a single 0 shape for fully sparse tensors.</param>
+  /// <param name="type">data type</param>
+  /// <returns>Ort::Value instance containing SparseTensor</returns>
+  static Value CreateSparseTensor(const OrtMemoryInfo* info, void* p_data, const Shape& dense_shape,
+                                  const Shape& values_shape, ONNXTensorElementDataType type);
+
+  /// <summary>
+  /// This is a simple forwarding method to the below CreateSparseTensor.
+  /// This helps to specify data type enum in terms of C++ data type.
+  /// Use CreateSparseTensor<T>
+  /// </summary>
+  /// <typeparam name="T">numeric data type only. String data enum must be specified explicitly.</typeparam>
+  /// <param name="allocator">allocator to use</param>
+  /// <param name="dense_shape">a would be dense shape of the tensor</param>
+  /// <returns>Ort::Value</returns>
+  template <typename T>
+  static Value CreateSparseTensor(OrtAllocator* allocator, const Shape& dense_shape);
+
+  /// <summary>
+  /// Creates an instance of OrtValue containing sparse tensor. The created instance has no data.
+  /// The data must be supplied by on of the FillSparseTensor<Format>() methods that take both non-zero values
+  /// and indices. The data will be copied into a buffer that would be allocated using the supplied allocator.
+  /// Use this API to create OrtValues that contain sparse tensors with all supported data types including
+  /// strings.
+  /// </summary>
+  /// <param name="allocator">allocator to use. The allocator lifespan must eclipse that of the resulting OrtValue</param>
+  /// <param name="dense_shape">a would be dense shape of the tensor</param>
+  /// <param name="type">data type</param>
+  /// <returns>an instance of Ort::Value</returns>
+  static Value CreateSparseTensor(OrtAllocator* allocator, const Shape& dense_shape, ONNXTensorElementDataType type);
+
+#endif  // !defined(DISABLE_SPARSE_TENSORS)
+};
+
+/// <summary>
+/// Represents native memory allocation coming from one of the
+/// OrtAllocators registered with OnnxRuntime.
+/// Use it to wrap an allocation made by an allocator
+/// so it can be automatically released when no longer needed.
+/// </summary>
+struct MemoryAllocation {
+  MemoryAllocation(OrtAllocator* allocator, void* p, size_t size);
+  ~MemoryAllocation();
+  MemoryAllocation(const MemoryAllocation&) = delete;
+  MemoryAllocation& operator=(const MemoryAllocation&) = delete;
+  MemoryAllocation(MemoryAllocation&&) noexcept;
+  MemoryAllocation& operator=(MemoryAllocation&&) noexcept;
+
+  void* get() { return p_; }
+  size_t size() const { return size_; }
+
+ private:
+  OrtAllocator* allocator_;
+  void* p_;
+  size_t size_;
+};
+
+namespace detail {
+template <typename T>
+struct AllocatorImpl : Base<T> {
+  using B = Base<T>;
+  using B::B;
+
+  void* Alloc(size_t size);
+  MemoryAllocation GetAllocation(size_t size);
+  void Free(void* p);
+  ConstMemoryInfo GetInfo() const;
+};
+
+}  // namespace detail
+
+/** \brief Wrapper around ::OrtAllocator default instance that is owned by Onnxruntime
+ *
+ */
+struct AllocatorWithDefaultOptions : detail::AllocatorImpl<detail::Unowned<OrtAllocator>> {
+  explicit AllocatorWithDefaultOptions(std::nullptr_t) {}  ///< Convenience to create a class member and then replace with an instance
+  AllocatorWithDefaultOptions();
+};
+
+/** \brief Wrapper around ::OrtAllocator
+ *
+ */
+struct Allocator : detail::AllocatorImpl<OrtAllocator> {
+  explicit Allocator(std::nullptr_t) {}  ///< Convenience to create a class member and then replace with an instance
+  Allocator(const Session& session, const OrtMemoryInfo*);
+};
+
+using UnownedAllocator = detail::AllocatorImpl<detail::Unowned<OrtAllocator>>;
+
+namespace detail {
+namespace binding_utils {
+// Bring these out of template
+std::vector<std::string> GetOutputNamesHelper(const OrtIoBinding* binding, OrtAllocator*);
+std::vector<Value> GetOutputValuesHelper(const OrtIoBinding* binding, OrtAllocator*);
+}  // namespace binding_utils
+
+template <typename T>
+struct ConstIoBindingImpl : Base<T> {
+  using B = Base<T>;
+  using B::B;
+
+  std::vector<std::string> GetOutputNames() const;
+  std::vector<std::string> GetOutputNames(OrtAllocator*) const;
+  std::vector<Value> GetOutputValues() const;
+  std::vector<Value> GetOutputValues(OrtAllocator*) const;
+};
+
+template <typename T>
+struct IoBindingImpl : ConstIoBindingImpl<T> {
+  using B = ConstIoBindingImpl<T>;
+  using B::B;
+
+  void BindInput(const char* name, const Value&);
+  void BindOutput(const char* name, const Value&);
+  void BindOutput(const char* name, const OrtMemoryInfo*);
+  void ClearBoundInputs();
+  void ClearBoundOutputs();
+  void SynchronizeInputs();
+  void SynchronizeOutputs();
+};
+
+}  // namespace detail
+
+using ConstIoBinding = detail::ConstIoBindingImpl<detail::Unowned<const OrtIoBinding>>;
+using UnownedIoBinding = detail::IoBindingImpl<detail::Unowned<OrtIoBinding>>;
+
+/** \brief Wrapper around ::OrtIoBinding
+ *
+ */
+struct IoBinding : detail::IoBindingImpl<OrtIoBinding> {
+  explicit IoBinding(std::nullptr_t) {}  ///< Create an empty object for convenience. Sometimes, we want to initialize members later.
+  explicit IoBinding(Session& session);
+  ConstIoBinding GetConst() const { return ConstIoBinding{this->p_}; }
+  UnownedIoBinding GetUnowned() const { return UnownedIoBinding{this->p_}; }
+};
+
+/*! \struct Ort::ArenaCfg
+ * \brief it is a structure that represents the configuration of an arena based allocator
+ * \details Please see docs/C_API.md for details
+ */
+struct ArenaCfg : detail::Base<OrtArenaCfg> {
+  explicit ArenaCfg(std::nullptr_t) {}  ///< Create an empty ArenaCfg object, must be assigned a valid one to be used
+  /**
+   * Wraps OrtApi::CreateArenaCfg
+   * \param max_mem - use 0 to allow ORT to choose the default
+   * \param arena_extend_strategy -  use -1 to allow ORT to choose the default, 0 = kNextPowerOfTwo, 1 = kSameAsRequested
+   * \param initial_chunk_size_bytes - use -1 to allow ORT to choose the default
+   * \param max_dead_bytes_per_chunk - use -1 to allow ORT to choose the default
+   * See docs/C_API.md for details on what the following parameters mean and how to choose these values
+   */
+  ArenaCfg(size_t max_mem, int arena_extend_strategy, int initial_chunk_size_bytes, int max_dead_bytes_per_chunk);
+};
+
+//
+// Custom OPs (only needed to implement custom OPs)
+//
+
+/// <summary>
+/// This struct provides life time management for custom op attribute
+/// </summary>
+struct OpAttr : detail::Base<OrtOpAttr> {
+  using Base = detail::Base<OrtOpAttr>;
+  using Base::Base;
+
+  explicit OpAttr(std::nullptr_t) {}
+  OpAttr(const char* name, const void* data, int len, OrtOpAttrType type);
+};
+
+/**
+ * Macro that logs a message using the provided logger. Throws an exception if OrtApi::Logger_LogMessage fails.
+ * Example: ORT_CXX_LOG(logger, ORT_LOGGING_LEVEL_INFO, "Log a message");
+ *
+ * \param logger The Ort::Logger instance to use. Must be a value or reference.
+ * \param message_severity The logging severity level of the message.
+ * \param message A null-terminated UTF-8 message to log.
+ */
+#define ORT_CXX_LOG(logger, message_severity, message)                                       \
+  do {                                                                                       \
+    if (message_severity >= logger.GetLoggingSeverityLevel()) {                              \
+      Ort::ThrowOnError(logger.LogMessage(message_severity, ORT_FILE, __LINE__,              \
+                                          static_cast<const char*>(__FUNCTION__), message)); \
+    }                                                                                        \
+  } while (false)
+
+/**
+ * Macro that logs a message using the provided logger. Can be used in noexcept code since errors are silently ignored.
+ * Example: ORT_CXX_LOG_NOEXCEPT(logger, ORT_LOGGING_LEVEL_INFO, "Log a message");
+ *
+ * \param logger The Ort::Logger instance to use. Must be a value or reference.
+ * \param message_severity The logging severity level of the message.
+ * \param message A null-terminated UTF-8 message to log.
+ */
+#define ORT_CXX_LOG_NOEXCEPT(logger, message_severity, message)                              \
+  do {                                                                                       \
+    if (message_severity >= logger.GetLoggingSeverityLevel()) {                              \
+      static_cast<void>(logger.LogMessage(message_severity, ORT_FILE, __LINE__,              \
+                                          static_cast<const char*>(__FUNCTION__), message)); \
+    }                                                                                        \
+  } while (false)
+
+/**
+ * Macro that logs a printf-like formatted message using the provided logger. Throws an exception if
+ * OrtApi::Logger_LogMessage fails or if a formatting error occurs.
+ * Example: ORT_CXX_LOGF(logger, ORT_LOGGING_LEVEL_INFO, "Log an int: %d", 12);
+ *
+ * \param logger The Ort::Logger instance to use. Must be a value or reference.
+ * \param message_severity The logging severity level of the message.
+ * \param format A null-terminated UTF-8 format string forwarded to a printf-like function.
+ *               Refer to https://en.cppreference.com/w/cpp/io/c/fprintf for information on valid formats.
+ * \param ... Zero or more variadic arguments referenced by the format string.
+ */
+#define ORT_CXX_LOGF(logger, message_severity, /*format,*/...)                                            \
+  do {                                                                                                    \
+    if (message_severity >= logger.GetLoggingSeverityLevel()) {                                           \
+      Ort::ThrowOnError(logger.LogFormattedMessage(message_severity, ORT_FILE, __LINE__,                  \
+                                                   static_cast<const char*>(__FUNCTION__), __VA_ARGS__)); \
+    }                                                                                                     \
+  } while (false)
+
+/**
+ * Macro that logs a printf-like formatted message using the provided logger. Can be used in noexcept code since errors
+ * are silently ignored.
+ * Example: ORT_CXX_LOGF_NOEXCEPT(logger, ORT_LOGGING_LEVEL_INFO, "Log an int: %d", 12);
+ *
+ * \param logger The Ort::Logger instance to use. Must be a value or reference.
+ * \param message_severity The logging severity level of the message.
+ * \param format A null-terminated UTF-8 format string forwarded to a printf-like function.
+ *               Refer to https://en.cppreference.com/w/cpp/io/c/fprintf for information on valid formats.
+ * \param ... Zero or more variadic arguments referenced by the format string.
+ */
+#define ORT_CXX_LOGF_NOEXCEPT(logger, message_severity, /*format,*/...)                                   \
+  do {                                                                                                    \
+    if (message_severity >= logger.GetLoggingSeverityLevel()) {                                           \
+      static_cast<void>(logger.LogFormattedMessage(message_severity, ORT_FILE, __LINE__,                  \
+                                                   static_cast<const char*>(__FUNCTION__), __VA_ARGS__)); \
+    }                                                                                                     \
+  } while (false)
+
+/// <summary>
+/// This class represents an ONNX Runtime logger that can be used to log information with an
+/// associated severity level and source code location (file path, line number, function name).
+///
+/// A Logger can be obtained from within custom operators by calling Ort::KernelInfo::GetLogger().
+/// Instances of Ort::Logger are the size of two pointers and can be passed by value.
+///
+/// Use the ORT_CXX_LOG macros to ensure the source code location is set properly from the callsite
+/// and to take advantage of a cached logging severity level that can bypass calls to the underlying C API.
+/// </summary>
+struct Logger {
+  /**
+   * Creates an empty Ort::Logger. Must be initialized from a valid Ort::Logger before use.
+   */
+  Logger() = default;
+
+  /**
+   * Creates an empty Ort::Logger. Must be initialized from a valid Ort::Logger before use.
+   */
+  explicit Logger(std::nullptr_t) {}
+
+  /**
+   * Creates a logger from an ::OrtLogger instance. Caches the logger's current severity level by calling
+   * OrtApi::Logger_GetLoggingSeverityLevel. Throws an exception if OrtApi::Logger_GetLoggingSeverityLevel fails.
+   *
+   * \param logger The ::OrtLogger to wrap.
+   */
+  explicit Logger(const OrtLogger* logger);
+
+  ~Logger() = default;
+
+  Logger(const Logger&) = default;
+  Logger& operator=(const Logger&) = default;
+
+  Logger(Logger&& v) noexcept = default;
+  Logger& operator=(Logger&& v) noexcept = default;
+
+  /**
+   * Returns the logger's current severity level from the cached member.
+   *
+   * \return The current ::OrtLoggingLevel.
+   */
+  OrtLoggingLevel GetLoggingSeverityLevel() const noexcept;
+
+  /**
+   * Logs the provided message via OrtApi::Logger_LogMessage. Use the ORT_CXX_LOG or ORT_CXX_LOG_NOEXCEPT
+   * macros to properly set the source code location and to use the cached severity level to potentially bypass
+   * calls to the underlying C API.
+   *
+   * \param log_severity_level The message's logging severity level.
+   * \param file_path The filepath of the file in which the message is logged. Usually the value of ORT_FILE.
+   * \param line_number The file line number in which the message is logged. Usually the value of __LINE__.
+   * \param func_name The name of the function in which the message is logged. Usually the value of __FUNCTION__.
+   * \param message The message to log.
+   * \return A Ort::Status value to indicate error or success.
+   */
+  Status LogMessage(OrtLoggingLevel log_severity_level, const ORTCHAR_T* file_path, int line_number,
+                    const char* func_name, const char* message) const noexcept;
+
+  /**
+   * Logs a printf-like formatted message via OrtApi::Logger_LogMessage. Use the ORT_CXX_LOGF or ORT_CXX_LOGF_NOEXCEPT
+   * macros to properly set the source code location and to use the cached severity level to potentially bypass
+   * calls to the underlying C API. Returns an error status if a formatting error occurs.
+   *
+   * \param log_severity_level The message's logging severity level.
+   * \param file_path The filepath of the file in which the message is logged. Usually the value of ORT_FILE.
+   * \param line_number The file line number in which the message is logged. Usually the value of __LINE__.
+   * \param func_name The name of the function in which the message is logged. Usually the value of __FUNCTION__.
+   * \param format A null-terminated UTF-8 format string forwarded to a printf-like function.
+   *               Refer to https://en.cppreference.com/w/cpp/io/c/fprintf for information on valid formats.
+   * \param args Zero or more variadic arguments referenced by the format string.
+   * \return A Ort::Status value to indicate error or success.
+   */
+  template <typename... Args>
+  Status LogFormattedMessage(OrtLoggingLevel log_severity_level, const ORTCHAR_T* file_path, int line_number,
+                             const char* func_name, const char* format, Args&&... args) const noexcept;
+
+ private:
+  const OrtLogger* logger_{};
+  OrtLoggingLevel cached_severity_level_{};
+};
+
+/// <summary>
+/// This class wraps a raw pointer OrtKernelContext* that is being passed
+/// to the custom kernel Compute() method. Use it to safely access context
+/// attributes, input and output parameters with exception safety guarantees.
+/// See usage example in onnxruntime/test/testdata/custom_op_library/custom_op_library.cc
+/// </summary>
+struct KernelContext {
+  explicit KernelContext(OrtKernelContext* context);
+  size_t GetInputCount() const;
+  size_t GetOutputCount() const;
+  // If input is optional and is not present, the method returns an empty ConstValue
+  // which can be compared to nullptr.
+  ConstValue GetInput(size_t index) const;
+  // If output is optional and is not present, the method returns an empty UnownedValue
+  // which can be compared to nullptr.
+  UnownedValue GetOutput(size_t index, const int64_t* dim_values, size_t dim_count) const;
+  UnownedValue GetOutput(size_t index, const std::vector<int64_t>& dims) const;
+  void* GetGPUComputeStream() const;
+  Logger GetLogger() const;
+  OrtAllocator* GetAllocator(const OrtMemoryInfo& memory_info) const;
+  OrtKernelContext* GetOrtKernelContext() const { return ctx_; }
+  void ParallelFor(void (*fn)(void*, size_t), size_t total, size_t num_batch, void* usr_data) const;
+
+ private:
+  OrtKernelContext* ctx_;
+};
+
+struct KernelInfo;
+
+namespace detail {
+namespace attr_utils {
+void GetAttr(const OrtKernelInfo* p, const char* name, float&);
+void GetAttr(const OrtKernelInfo* p, const char* name, int64_t&);
+void GetAttr(const OrtKernelInfo* p, const char* name, std::string&);
+void GetAttrs(const OrtKernelInfo* p, const char* name, std::vector<float>&);
+void GetAttrs(const OrtKernelInfo* p, const char* name, std::vector<int64_t>&);
+}  // namespace attr_utils
+
+template <typename T>
+struct KernelInfoImpl : Base<T> {
+  using B = Base<T>;
+  using B::B;
+
+  KernelInfo Copy() const;
+
+  template <typename R>  // R is only implemented for float, int64_t, and string
+  R GetAttribute(const char* name) const {
+    R val;
+    attr_utils::GetAttr(this->p_, name, val);
+    return val;
+  }
+
+  template <typename R>  // R is only implemented for std::vector<float>, std::vector<int64_t>
+  std::vector<R> GetAttributes(const char* name) const {
+    std::vector<R> result;
+    attr_utils::GetAttrs(this->p_, name, result);
+    return result;
+  }
+
+  Value GetTensorAttribute(const char* name, OrtAllocator* allocator) const;
+
+  size_t GetInputCount() const;
+  size_t GetOutputCount() const;
+
+  std::string GetInputName(size_t index) const;
+  std::string GetOutputName(size_t index) const;
+
+  TypeInfo GetInputTypeInfo(size_t index) const;
+  TypeInfo GetOutputTypeInfo(size_t index) const;
+
+  ConstValue GetTensorConstantInput(size_t index, int* is_constant) const;
+
+  std::string GetNodeName() const;
+  Logger GetLogger() const;
+};
+
+}  // namespace detail
+
+using ConstKernelInfo = detail::KernelInfoImpl<detail::Unowned<const OrtKernelInfo>>;
+
+/// <summary>
+/// This struct owns the OrtKernInfo* pointer when a copy is made.
+/// For convenient wrapping of OrtKernelInfo* passed to kernel constructor
+/// and query attributes, warp the pointer with Ort::Unowned<KernelInfo> instance
+/// so it does not destroy the pointer the kernel does not own.
+/// </summary>
+struct KernelInfo : detail::KernelInfoImpl<OrtKernelInfo> {
+  using Base = detail::KernelInfoImpl<OrtKernelInfo>;
+  using Base::Base;
+  explicit KernelInfo(std::nullptr_t) {}     ///< Create an empty instance to initialize later
+  explicit KernelInfo(OrtKernelInfo* info);  ///< Take ownership of the instance
+  ConstKernelInfo GetConst() const { return ConstKernelInfo{this->p_}; }
+};
+
+/// <summary>
+/// Create and own custom defined operation.
+/// </summary>
+struct Op : detail::Base<OrtOp> {
+  using Base = detail::Base<OrtOp>;
+  using Base::Base;
+
+  explicit Op(std::nullptr_t) {}  ///< Create an empty Operator object, must be assigned a valid one to be used
+
+  explicit Op(OrtOp*);  ///< Take ownership of the OrtOp
+
+  static Op Create(const OrtKernelInfo* info, const char* op_name, const char* domain,
+                   int version, const char** type_constraint_names,
+                   const ONNXTensorElementDataType* type_constraint_values,
+                   size_t type_constraint_count,
+                   const OpAttr* attr_values,
+                   size_t attr_count,
+                   size_t input_count, size_t output_count);
+
+  void Invoke(const OrtKernelContext* context,
+              const Value* input_values,
+              size_t input_count,
+              Value* output_values,
+              size_t output_count);
+
+  // For easier refactoring
+  void Invoke(const OrtKernelContext* context,
+              const OrtValue* const* input_values,
+              size_t input_count,
+              OrtValue* const* output_values,
+              size_t output_count);
+};
+
+/// <summary>
+/// Provide access to per-node attributes and input shapes, so one could compute and set output shapes.
+/// </summary>
+struct ShapeInferContext {
+  struct SymbolicInteger {
+    SymbolicInteger(int64_t i) : i_(i), is_int_(true) {};
+    SymbolicInteger(const char* s) : s_(s), is_int_(false) {};
+    SymbolicInteger(const SymbolicInteger&) = default;
+    SymbolicInteger(SymbolicInteger&&) = default;
+
+    SymbolicInteger& operator=(const SymbolicInteger&) = default;
+    SymbolicInteger& operator=(SymbolicInteger&&) = default;
+
+    bool operator==(const SymbolicInteger& dim) const {
+      if (is_int_ == dim.is_int_) {
+        if (is_int_) {
+          return i_ == dim.i_;
+        } else {
+          return std::string{s_} == std::string{dim.s_};
+        }
+      }
+      return false;
+    }
+
+    bool IsInt() const { return is_int_; }
+    int64_t AsInt() const { return i_; }
+    const char* AsSym() const { return s_; }
+
+    static constexpr int INVALID_INT_DIM = -2;
+
+   private:
+    union {
+      int64_t i_;
+      const char* s_;
+    };
+    bool is_int_;
+  };
+
+  using Shape = std::vector<SymbolicInteger>;
+
+  ShapeInferContext(const OrtApi* ort_api, OrtShapeInferContext* ctx);
+
+  const Shape& GetInputShape(size_t indice) const { return input_shapes_.at(indice); }
+
+  size_t GetInputCount() const { return input_shapes_.size(); }
+
+  Status SetOutputShape(size_t indice, const Shape& shape, ONNXTensorElementDataType type = ONNX_TENSOR_ELEMENT_DATA_TYPE_FLOAT);
+
+  int64_t GetAttrInt(const char* attr_name);
+
+  using Ints = std::vector<int64_t>;
+  Ints GetAttrInts(const char* attr_name);
+
+  float GetAttrFloat(const char* attr_name);
+
+  using Floats = std::vector<float>;
+  Floats GetAttrFloats(const char* attr_name);
+
+  std::string GetAttrString(const char* attr_name);
+
+  using Strings = std::vector<std::string>;
+  Strings GetAttrStrings(const char* attr_name);
+
+ private:
+  const OrtOpAttr* GetAttrHdl(const char* attr_name) const;
+  const OrtApi* ort_api_;
+  OrtShapeInferContext* ctx_;
+  std::vector<Shape> input_shapes_;
+};
+
+using ShapeInferFn = Ort::Status (*)(Ort::ShapeInferContext&);
+
+#define MAX_CUSTOM_OP_END_VER (1UL << 31) - 1
+
+template <typename TOp, typename TKernel, bool WithStatus = false>
+struct CustomOpBase : OrtCustomOp {
+  CustomOpBase() {
+    OrtCustomOp::version = ORT_API_VERSION;
+    OrtCustomOp::GetName = [](const OrtCustomOp* this_) { return static_cast<const TOp*>(this_)->GetName(); };
+
+    OrtCustomOp::GetExecutionProviderType = [](const OrtCustomOp* this_) { return static_cast<const TOp*>(this_)->GetExecutionProviderType(); };
+
+    OrtCustomOp::GetInputTypeCount = [](const OrtCustomOp* this_) { return static_cast<const TOp*>(this_)->GetInputTypeCount(); };
+    OrtCustomOp::GetInputType = [](const OrtCustomOp* this_, size_t index) { return static_cast<const TOp*>(this_)->GetInputType(index); };
+    OrtCustomOp::GetInputMemoryType = [](const OrtCustomOp* this_, size_t index) { return static_cast<const TOp*>(this_)->GetInputMemoryType(index); };
+
+    OrtCustomOp::GetOutputTypeCount = [](const OrtCustomOp* this_) { return static_cast<const TOp*>(this_)->GetOutputTypeCount(); };
+    OrtCustomOp::GetOutputType = [](const OrtCustomOp* this_, size_t index) { return static_cast<const TOp*>(this_)->GetOutputType(index); };
+
+#if defined(_MSC_VER) && !defined(__clang__)
+#pragma warning(push)
+#pragma warning(disable : 26409)
+#endif
+    OrtCustomOp::KernelDestroy = [](void* op_kernel) { delete static_cast<TKernel*>(op_kernel); };
+#if defined(_MSC_VER) && !defined(__clang__)
+#pragma warning(pop)
+#endif
+    OrtCustomOp::GetInputCharacteristic = [](const OrtCustomOp* this_, size_t index) { return static_cast<const TOp*>(this_)->GetInputCharacteristic(index); };
+    OrtCustomOp::GetOutputCharacteristic = [](const OrtCustomOp* this_, size_t index) { return static_cast<const TOp*>(this_)->GetOutputCharacteristic(index); };
+
+    OrtCustomOp::GetVariadicInputMinArity = [](const OrtCustomOp* this_) { return static_cast<const TOp*>(this_)->GetVariadicInputMinArity(); };
+    OrtCustomOp::GetVariadicInputHomogeneity = [](const OrtCustomOp* this_) { return static_cast<int>(static_cast<const TOp*>(this_)->GetVariadicInputHomogeneity()); };
+    OrtCustomOp::GetVariadicOutputMinArity = [](const OrtCustomOp* this_) { return static_cast<const TOp*>(this_)->GetVariadicOutputMinArity(); };
+    OrtCustomOp::GetVariadicOutputHomogeneity = [](const OrtCustomOp* this_) { return static_cast<int>(static_cast<const TOp*>(this_)->GetVariadicOutputHomogeneity()); };
+#ifdef __cpp_if_constexpr
+    if constexpr (WithStatus) {
+#else
+    if (WithStatus) {
+#endif
+      OrtCustomOp::CreateKernelV2 = [](const OrtCustomOp* this_, const OrtApi* api, const OrtKernelInfo* info, void** op_kernel) -> OrtStatusPtr {
+        return static_cast<const TOp*>(this_)->CreateKernelV2(*api, info, op_kernel);
+      };
+      OrtCustomOp::KernelComputeV2 = [](void* op_kernel, OrtKernelContext* context) -> OrtStatusPtr {
+        return static_cast<TKernel*>(op_kernel)->ComputeV2(context);
+      };
+    } else {
+      OrtCustomOp::CreateKernelV2 = nullptr;
+      OrtCustomOp::KernelComputeV2 = nullptr;
+
+      OrtCustomOp::CreateKernel = [](const OrtCustomOp* this_, const OrtApi* api, const OrtKernelInfo* info) { return static_cast<const TOp*>(this_)->CreateKernel(*api, info); };
+      OrtCustomOp::KernelCompute = [](void* op_kernel, OrtKernelContext* context) {
+        static_cast<TKernel*>(op_kernel)->Compute(context);
+      };
+    }
+
+    SetShapeInferFn<TOp>(0);
+
+    OrtCustomOp::GetStartVersion = [](const OrtCustomOp* this_) {
+      return static_cast<const TOp*>(this_)->start_ver_;
+    };
+
+    OrtCustomOp::GetEndVersion = [](const OrtCustomOp* this_) {
+      return static_cast<const TOp*>(this_)->end_ver_;
+    };
+
+    OrtCustomOp::GetMayInplace = nullptr;
+    OrtCustomOp::ReleaseMayInplace = nullptr;
+    OrtCustomOp::GetAliasMap = nullptr;
+    OrtCustomOp::ReleaseAliasMap = nullptr;
+  }
+
+  // Default implementation of GetExecutionProviderType that returns nullptr to default to the CPU provider
+  const char* GetExecutionProviderType() const { return nullptr; }
+
+  // Default implementations of GetInputCharacteristic() and GetOutputCharacteristic() below
+  // (inputs and outputs are required by default)
+  OrtCustomOpInputOutputCharacteristic GetInputCharacteristic(size_t /*index*/) const {
+    return OrtCustomOpInputOutputCharacteristic::INPUT_OUTPUT_REQUIRED;
+  }
+
+  OrtCustomOpInputOutputCharacteristic GetOutputCharacteristic(size_t /*index*/) const {
+    return OrtCustomOpInputOutputCharacteristic::INPUT_OUTPUT_REQUIRED;
+  }
+
+  // Default implemention of GetInputMemoryType() that returns OrtMemTypeDefault
+  OrtMemType GetInputMemoryType(size_t /*index*/) const {
+    return OrtMemTypeDefault;
+  }
+
+  // Default implementation of GetVariadicInputMinArity() returns 1 to specify that a variadic input
+  // should expect at least 1 argument.
+  int GetVariadicInputMinArity() const {
+    return 1;
+  }
+
+  // Default implementation of GetVariadicInputHomegeneity() returns true to specify that all arguments
+  // to a variadic input should be of the same type.
+  bool GetVariadicInputHomogeneity() const {
+    return true;
+  }
+
+  // Default implementation of GetVariadicOutputMinArity() returns 1 to specify that a variadic output
+  // should produce at least 1 output value.
+  int GetVariadicOutputMinArity() const {
+    return 1;
+  }
+
+  // Default implementation of GetVariadicOutputHomegeneity() returns true to specify that all output values
+  // produced by a variadic output should be of the same type.
+  bool GetVariadicOutputHomogeneity() const {
+    return true;
+  }
+
+  // Declare list of session config entries used by this Custom Op.
+  // Implement this function in order to get configs from CustomOpBase::GetSessionConfigs().
+  // This default implementation returns an empty vector of config entries.
+  std::vector<std::string> GetSessionConfigKeys() const {
+    return std::vector<std::string>{};
+  }
+
+  // Ort::CustomOpBase derived class should provide the following static method with the type/shape inferencing
+  // implementation if needed:
+  //   static OrtStatusPtr InferOutputShape(Ort::ShapeInferContext& context)
+  template <typename C>
+  decltype(&C::InferOutputShape) SetShapeInferFn(decltype(&C::InferOutputShape)) {
+    OrtCustomOp::InferOutputShapeFn = [](const OrtCustomOp*, OrtShapeInferContext* ort_ctx) -> OrtStatusPtr {
+      ShapeInferContext ctx(&GetApi(), ort_ctx);
+      return C::InferOutputShape(ctx);
+    };
+    return {};
+  }
+
+  template <typename C>
+  void SetShapeInferFn(...) {
+    OrtCustomOp::InferOutputShapeFn = {};
+  }
+
+ protected:
+  // Helper function that returns a map of session config entries specified by CustomOpBase::GetSessionConfigKeys.
+  void GetSessionConfigs(std::unordered_map<std::string, std::string>& out, ConstSessionOptions options) const;
+
+  int start_ver_ = 1;
+  int end_ver_ = MAX_CUSTOM_OP_END_VER;
+};
+
+namespace detail {
+template <typename T>
+struct ValueInfoImpl : Ort::detail::Base<T> {
+  using B = Ort::detail::Base<T>;
+  using B::B;
+
+  std::string Name() const;
+  ConstTypeInfo TypeInfo() const;
+};
+}  // namespace detail
+
+// Const object holder that does not own the underlying object
+using ConstValueInfo = detail::ValueInfoImpl<Ort::detail::Unowned<const OrtValueInfo>>;
+
+/** \brief Wrapper around ::OrtValueInfo
+ *
+ */
+struct ValueInfo : detail::ValueInfoImpl<OrtValueInfo> {
+  explicit ValueInfo(std::nullptr_t) {}  ///< No instance is created
+  /// Take ownership of a pointer created by C API
+  explicit ValueInfo(OrtValueInfo* p) : ValueInfoImpl<OrtValueInfo>{p} {}
+
+  // Create ValueInfo for a tensor
+  explicit ValueInfo(const std::string& name, const ConstTypeInfo& type_info);
+
+  ConstValueInfo GetConst() const { return ConstValueInfo{this->p_}; }
+};
+
+namespace detail {
+template <typename T>
+struct NodeImpl : Ort::detail::Base<T> {
+  using B = Ort::detail::Base<T>;
+  using B::B;
+};
+}  // namespace detail
+
+/** \brief Wrapper around ::OrtNode
+ *
+ */
+struct Node : detail::NodeImpl<OrtNode> {
+  explicit Node(std::nullptr_t) {}                     ///< No instance is created
+  explicit Node(OrtNode* p) : NodeImpl<OrtNode>{p} {}  ///< Take ownership of a pointer created by C API
+
+#if !defined(ORT_MINIMAL_BUILD)
+  Node(const std::string& operator_name, const std::string& operator_domain,
+       const std::string& node_name,
+       const std::vector<std::string>& input_names,
+       const std::vector<std::string>& output_names);
+
+  /// <summary>
+  /// Wraps CreateNode. Node takes ownership of attributes on success and updates the OpAttr in `attributes` to do so.
+  /// </summary>
+  Node(const std::string& operator_name, const std::string& operator_domain,
+       const std::string& node_name,
+       const std::vector<std::string>& input_names,
+       const std::vector<std::string>& output_names,
+       std::vector<OpAttr>& attributes);
+
+ private:
+  static void Init(const std::string& operator_name, const std::string& operator_domain,
+                   const std::string& node_name,
+                   const std::vector<std::string>& input_names,
+                   const std::vector<std::string>& output_names,
+                   std::vector<OpAttr>& attributes,
+                   OrtNode*& node);
+#endif  // !defined(ORT_MINIMAL_BUILD)
+};
+
+namespace detail {
+template <typename T>
+struct GraphImpl : Ort::detail::Base<T> {
+  using B = Ort::detail::Base<T>;
+  using B::B;
+
+#if !defined(ORT_MINIMAL_BUILD)
+  void SetInputs(std::vector<ValueInfo>& inputs);
+  void SetOutputs(std::vector<ValueInfo>& outputs);
+  void AddInitializer(const std::string& name, Value& initializer, bool data_is_external);  // Graph takes ownership of Value
+  void AddNode(Node& node);                                                                 // Graph takes ownership of Node
+#endif                                                                                      // !defined(ORT_MINIMAL_BUILD)
+};
+}  // namespace detail
+
+/** \brief Wrapper around ::OrtGraph
+ *
+ */
+struct Graph : detail::GraphImpl<OrtGraph> {
+  explicit Graph(std::nullptr_t) {}                        ///< No instance is created
+  explicit Graph(OrtGraph* p) : GraphImpl<OrtGraph>{p} {}  ///< Take ownership of a pointer created by C API
+#if !defined(ORT_MINIMAL_BUILD)
+  Graph();
+#endif
+};
+
+namespace detail {
+template <typename T>
+struct ModelImpl : Ort::detail::Base<T> {
+  using B = Ort::detail::Base<T>;
+  using B::B;
+
+#if !defined(ORT_MINIMAL_BUILD)
+  void AddGraph(Graph& graph);
+#endif
+};
+}  // namespace detail
+
+// Const object holder that does not own the underlying object
+using ConstModel = detail::ModelImpl<Ort::detail::Unowned<const OrtModel>>;
+
+/** \brief Wrapper around ::OrtModel
+ *
+ */
+struct Model : detail::ModelImpl<OrtModel> {
+  using DomainOpsetPair = std::pair<std::string, int>;
+
+  explicit Model(std::nullptr_t) {}                        ///< No instance is created
+  explicit Model(OrtModel* p) : ModelImpl<OrtModel>{p} {}  ///< Take ownership of a pointer created by C API
+
+#if !defined(ORT_MINIMAL_BUILD)
+  explicit Model(const std::vector<DomainOpsetPair>& opsets);
+#endif
+
+  ConstModel GetConst() const { return ConstModel{this->p_}; }
+};
+}  // namespace Ort
+#include "onnxruntime_cxx_inline.h"
diff --git a/3rdParty/ONNX/onnxruntime_cxx_inline.h b/3rdParty/ONNX/onnxruntime_cxx_inline.h
new file mode 100644
index 0000000000..64cd09f93d
--- /dev/null
+++ b/3rdParty/ONNX/onnxruntime_cxx_inline.h
@@ -0,0 +1,2778 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// Do not include this file directly. Please include "onnxruntime_cxx_api.h" instead.
+// If interested in trying out features of the new experimental C++ API, include "experimental_onnxruntime_cxx_api.h" instead.
+//
+// These are the inline implementations of the C++ header APIs. They're in this separate file as to not clutter
+// the main C++ file with implementation details.
+
+#include <algorithm>
+#include <functional>
+#include <iterator>
+#include <string>
+#include <type_traits>
+#include <vector>
+
+// Convert OrtStatus to Ort::Status and return
+// instead of throwing
+#define ORT_CXX_RETURN_ON_API_FAIL(expression) \
+  {                                            \
+    auto ort_status = (expression);            \
+    if (ort_status) {                          \
+      return Ort::Status(ort_status);          \
+    }                                          \
+  }
+
+#ifdef __cpp_if_constexpr
+#define ORT_CXX_IF_CONSTEXPR if constexpr
+#else
+#define ORT_CXX_IF_CONSTEXPR if
+#endif
+
+namespace Ort {
+
+namespace detail {
+inline void ThrowStatus(const Status& st) {
+  std::string error_message = st.GetErrorMessage();
+  OrtErrorCode error_code = st.GetErrorCode();
+  ORT_CXX_API_THROW(std::move(error_message), error_code);
+}
+}  // namespace detail
+
+inline void ThrowOnError(OrtStatus* ort_status) {
+  if (ort_status) {
+    Ort::Status st(ort_status);
+    detail::ThrowStatus(st);
+  }
+}
+
+inline void ThrowOnError(const Status& st) {
+  if (st) {
+    detail::ThrowStatus(st);
+  }
+}
+
+inline Status::Status(OrtStatus* status) noexcept : detail::Base<OrtStatus>{status} {
+}
+
+inline Status::Status(const std::exception& e) noexcept {
+  p_ = GetApi().CreateStatus(ORT_FAIL, e.what());
+}
+
+inline Status::Status(const Exception& e) noexcept {
+  p_ = GetApi().CreateStatus(e.GetOrtErrorCode(), e.what());
+}
+
+inline Status::Status(const char* message, OrtErrorCode code) noexcept {
+  p_ = GetApi().CreateStatus(code, message);
+}
+
+inline std::string Status::GetErrorMessage() const {
+  std::string message(GetApi().GetErrorMessage(p_));
+  return message;
+}
+
+inline OrtErrorCode Status::GetErrorCode() const {
+  return GetApi().GetErrorCode(p_);
+}
+
+inline bool Status::IsOK() const noexcept {
+  return (p_ == nullptr);
+}
+
+// This template converts a C++ type into it's ONNXTensorElementDataType
+template <typename T>
+struct TypeToTensorType;
+template <>
+struct TypeToTensorType<float> {
+  static constexpr ONNXTensorElementDataType type = ONNX_TENSOR_ELEMENT_DATA_TYPE_FLOAT;
+};
+template <>
+struct TypeToTensorType<Float16_t> {
+  static constexpr ONNXTensorElementDataType type = ONNX_TENSOR_ELEMENT_DATA_TYPE_FLOAT16;
+};
+template <>
+struct TypeToTensorType<BFloat16_t> {
+  static constexpr ONNXTensorElementDataType type = ONNX_TENSOR_ELEMENT_DATA_TYPE_BFLOAT16;
+};
+template <>
+struct TypeToTensorType<double> {
+  static constexpr ONNXTensorElementDataType type = ONNX_TENSOR_ELEMENT_DATA_TYPE_DOUBLE;
+};
+template <>
+struct TypeToTensorType<int8_t> {
+  static constexpr ONNXTensorElementDataType type = ONNX_TENSOR_ELEMENT_DATA_TYPE_INT8;
+};
+template <>
+struct TypeToTensorType<int16_t> {
+  static constexpr ONNXTensorElementDataType type = ONNX_TENSOR_ELEMENT_DATA_TYPE_INT16;
+};
+template <>
+struct TypeToTensorType<int32_t> {
+  static constexpr ONNXTensorElementDataType type = ONNX_TENSOR_ELEMENT_DATA_TYPE_INT32;
+};
+template <>
+struct TypeToTensorType<int64_t> {
+  static constexpr ONNXTensorElementDataType type = ONNX_TENSOR_ELEMENT_DATA_TYPE_INT64;
+};
+template <>
+struct TypeToTensorType<uint8_t> {
+  static constexpr ONNXTensorElementDataType type = ONNX_TENSOR_ELEMENT_DATA_TYPE_UINT8;
+};
+template <>
+struct TypeToTensorType<uint16_t> {
+  static constexpr ONNXTensorElementDataType type = ONNX_TENSOR_ELEMENT_DATA_TYPE_UINT16;
+};
+template <>
+struct TypeToTensorType<uint32_t> {
+  static constexpr ONNXTensorElementDataType type = ONNX_TENSOR_ELEMENT_DATA_TYPE_UINT32;
+};
+template <>
+struct TypeToTensorType<uint64_t> {
+  static constexpr ONNXTensorElementDataType type = ONNX_TENSOR_ELEMENT_DATA_TYPE_UINT64;
+};
+template <>
+struct TypeToTensorType<bool> {
+  static constexpr ONNXTensorElementDataType type = ONNX_TENSOR_ELEMENT_DATA_TYPE_BOOL;
+};
+
+template <>
+struct TypeToTensorType<Float8E4M3FN_t> {
+  static constexpr ONNXTensorElementDataType type = ONNX_TENSOR_ELEMENT_DATA_TYPE_FLOAT8E4M3FN;
+};
+template <>
+struct TypeToTensorType<Float8E4M3FNUZ_t> {
+  static constexpr ONNXTensorElementDataType type = ONNX_TENSOR_ELEMENT_DATA_TYPE_FLOAT8E4M3FNUZ;
+};
+template <>
+struct TypeToTensorType<Float8E5M2_t> {
+  static constexpr ONNXTensorElementDataType type = ONNX_TENSOR_ELEMENT_DATA_TYPE_FLOAT8E5M2;
+};
+template <>
+struct TypeToTensorType<Float8E5M2FNUZ_t> {
+  static constexpr ONNXTensorElementDataType type = ONNX_TENSOR_ELEMENT_DATA_TYPE_FLOAT8E5M2FNUZ;
+};
+
+inline bool BFloat16_t::operator==(const BFloat16_t& rhs) const noexcept {
+  if (IsNaN() || rhs.IsNaN()) {
+    // IEEE defines that NaN is not equal to anything, including itself.
+    return false;
+  }
+  return val == rhs.val;
+}
+
+inline bool BFloat16_t::operator<(const BFloat16_t& rhs) const noexcept {
+  if (IsNaN() || rhs.IsNaN()) {
+    // IEEE defines that NaN is unordered with respect to everything, including itself.
+    return false;
+  }
+
+  const bool left_is_negative = IsNegative();
+  if (left_is_negative != rhs.IsNegative()) {
+    // When the signs of left and right differ, we know that left is less than right if it is
+    // the negative value. The exception to this is if both values are zero, in which case IEEE
+    // says they should be equal, even if the signs differ.
+    return left_is_negative && !AreZero(*this, rhs);
+  }
+  return (val != rhs.val) && ((val < rhs.val) ^ left_is_negative);
+}
+
+inline MemoryAllocation::MemoryAllocation(OrtAllocator* allocator, void* p, size_t size)
+    : allocator_(allocator), p_(p), size_(size) {
+}
+
+inline MemoryAllocation::~MemoryAllocation() {
+  if (p_ != nullptr) {
+    // We do not throw out of destructor
+    auto ret = GetApi().AllocatorFree(allocator_, p_);
+    static_cast<void>(ret);
+  }
+}
+
+inline MemoryAllocation::MemoryAllocation(MemoryAllocation&& o) noexcept : allocator_(nullptr), p_(nullptr), size_(0) {
+  *this = std::move(o);
+}
+
+inline MemoryAllocation& MemoryAllocation::operator=(MemoryAllocation&& o) noexcept {
+  OrtAllocator* alloc = nullptr;
+  void* p = nullptr;
+  size_t sz = 0;
+
+  // Swap out this
+  std::swap(alloc, allocator_);
+  std::swap(p, p_);
+  std::swap(sz, size_);
+
+  // Swap with incoming
+  std::swap(allocator_, o.allocator_);
+  std::swap(p_, o.p_);
+  std::swap(size_, o.size_);
+
+  // Destroy this instance if needed
+  MemoryAllocation this_alloc(alloc, p, sz);
+  return *this;
+}
+
+namespace detail {
+
+template <typename T>
+inline void* AllocatorImpl<T>::Alloc(size_t size) {
+  void* out;
+  ThrowOnError(GetApi().AllocatorAlloc(this->p_, size, &out));
+  return out;
+}
+
+template <typename T>
+inline MemoryAllocation AllocatorImpl<T>::GetAllocation(size_t size) {
+  void* out;
+  ThrowOnError(GetApi().AllocatorAlloc(this->p_, size, &out));
+  MemoryAllocation result(this->p_, out, size);
+  return result;
+}
+
+template <typename T>
+inline void AllocatorImpl<T>::Free(void* p) {
+  ThrowOnError(GetApi().AllocatorFree(this->p_, p));
+}
+
+template <typename T>
+inline ConstMemoryInfo AllocatorImpl<T>::GetInfo() const {
+  const OrtMemoryInfo* out;
+  ThrowOnError(GetApi().AllocatorGetInfo(this->p_, &out));
+  return ConstMemoryInfo{out};
+}
+
+}  // namespace detail
+
+inline AllocatorWithDefaultOptions::AllocatorWithDefaultOptions() {
+  ThrowOnError(GetApi().GetAllocatorWithDefaultOptions(&this->p_));
+}
+
+inline Allocator::Allocator(const Session& sess, const OrtMemoryInfo* mem_info) {
+  ThrowOnError(GetApi().CreateAllocator(sess, mem_info, &this->p_));
+}
+
+namespace detail {
+
+template <typename T>
+inline std::string MemoryInfoImpl<T>::GetAllocatorName() const {
+  const char* name = nullptr;
+  ThrowOnError(GetApi().MemoryInfoGetName(this->p_, &name));
+  return std::string(name);
+}
+
+template <typename T>
+inline OrtAllocatorType MemoryInfoImpl<T>::GetAllocatorType() const {
+  OrtAllocatorType type;
+  ThrowOnError(GetApi().MemoryInfoGetType(this->p_, &type));
+  return type;
+}
+
+template <typename T>
+inline int MemoryInfoImpl<T>::GetDeviceId() const {
+  int id = 0;
+  ThrowOnError(GetApi().MemoryInfoGetId(this->p_, &id));
+  return id;
+}
+
+template <typename T>
+inline OrtMemoryInfoDeviceType MemoryInfoImpl<T>::GetDeviceType() const {
+  OrtMemoryInfoDeviceType type;
+  GetApi().MemoryInfoGetDeviceType(this->p_, &type);
+  return type;
+}
+
+template <typename T>
+inline OrtMemType MemoryInfoImpl<T>::GetMemoryType() const {
+  OrtMemType type;
+  ThrowOnError(GetApi().MemoryInfoGetMemType(this->p_, &type));
+  return type;
+}
+
+template <typename T>
+template <typename U>
+inline bool MemoryInfoImpl<T>::operator==(const MemoryInfoImpl<U>& o) const {
+  int comp_result = 0;
+  ThrowOnError(Ort::GetApi().CompareMemoryInfo(this->p_, o, &comp_result));
+  return comp_result == 0;
+}
+
+}  // namespace detail
+
+inline MemoryInfo MemoryInfo::CreateCpu(OrtAllocatorType type, OrtMemType mem_type) {
+  OrtMemoryInfo* p;
+  ThrowOnError(GetApi().CreateCpuMemoryInfo(type, mem_type, &p));
+  return MemoryInfo(p);
+}
+
+inline MemoryInfo::MemoryInfo(const char* name, OrtAllocatorType type, int id, OrtMemType mem_type) {
+  ThrowOnError(GetApi().CreateMemoryInfo(name, type, id, mem_type, &this->p_));
+}
+
+namespace detail {
+template <typename T>
+inline std::vector<std::string> ConstIoBindingImpl<T>::GetOutputNames() const {
+  AllocatorWithDefaultOptions allocator;
+  return binding_utils::GetOutputNamesHelper(this->p_, allocator);
+}
+
+template <typename T>
+inline std::vector<std::string> ConstIoBindingImpl<T>::GetOutputNames(OrtAllocator* allocator) const {
+  return binding_utils::GetOutputNamesHelper(this->p_, allocator);
+}
+
+template <typename T>
+inline std::vector<Value> ConstIoBindingImpl<T>::GetOutputValues() const {
+  AllocatorWithDefaultOptions allocator;
+  return binding_utils::GetOutputValuesHelper(this->p_, allocator);
+}
+
+template <typename T>
+inline std::vector<Value> ConstIoBindingImpl<T>::GetOutputValues(OrtAllocator* allocator) const {
+  return binding_utils::GetOutputValuesHelper(this->p_, allocator);
+}
+
+template <typename T>
+inline void IoBindingImpl<T>::BindInput(const char* name, const Value& value) {
+  ThrowOnError(GetApi().BindInput(this->p_, name, value));
+}
+
+template <typename T>
+inline void IoBindingImpl<T>::BindOutput(const char* name, const Value& value) {
+  ThrowOnError(GetApi().BindOutput(this->p_, name, value));
+}
+
+template <typename T>
+inline void IoBindingImpl<T>::BindOutput(const char* name, const OrtMemoryInfo* mem_info) {
+  ThrowOnError(GetApi().BindOutputToDevice(this->p_, name, mem_info));
+}
+
+template <typename T>
+inline void IoBindingImpl<T>::ClearBoundInputs() {
+  GetApi().ClearBoundInputs(this->p_);
+}
+
+template <typename T>
+inline void IoBindingImpl<T>::ClearBoundOutputs() {
+  GetApi().ClearBoundOutputs(this->p_);
+}
+
+template <typename T>
+inline void IoBindingImpl<T>::SynchronizeInputs() {
+  ThrowOnError(GetApi().SynchronizeBoundInputs(this->p_));
+}
+
+template <typename T>
+inline void IoBindingImpl<T>::SynchronizeOutputs() {
+  ThrowOnError(GetApi().SynchronizeBoundOutputs(this->p_));
+}
+
+namespace binding_utils {
+inline std::vector<std::string> GetOutputNamesHelper(const OrtIoBinding* binding, OrtAllocator* allocator) {
+  std::vector<std::string> result;
+  auto free_fn = detail::AllocatedFree(allocator);
+  using Ptr = std::unique_ptr<void, decltype(free_fn)>;
+
+  char* buffer = nullptr;
+  size_t* lengths = nullptr;
+  size_t count = 0;
+  ThrowOnError(GetApi().GetBoundOutputNames(binding, allocator, &buffer, &lengths, &count));
+
+  if (count == 0) {
+    return result;
+  }
+
+  Ptr buffer_g(buffer, free_fn);
+  Ptr lengths_g(lengths, free_fn);
+
+  result.reserve(count);
+  for (size_t i = 0; i < count; ++i) {
+    auto sz = *lengths;
+    result.emplace_back(buffer, sz);
+    buffer += sz;
+    ++lengths;
+  }
+  return result;
+}
+
+inline std::vector<Value> GetOutputValuesHelper(const OrtIoBinding* binding, OrtAllocator* allocator) {
+  std::vector<Value> result;
+  size_t owned = 0;
+  size_t output_count = 0;
+  // Lambda to release the buffer when no longer needed and
+  // make sure that we destroy all instances on exception
+  auto free_fn = [&owned, &output_count, allocator](OrtValue** buffer) {
+    if (buffer) {
+      while (owned < output_count) {
+        auto* p = buffer + owned++;
+        GetApi().ReleaseValue(*p);
+      }
+      allocator->Free(allocator, buffer);
+    }
+  };
+  using Ptr = std::unique_ptr<OrtValue*, decltype(free_fn)>;
+
+  OrtValue** output_buffer = nullptr;
+  ThrowOnError(GetApi().GetBoundOutputValues(binding, allocator, &output_buffer, &output_count));
+  if (output_count == 0) {
+    return result;
+  }
+
+  Ptr buffer_g(output_buffer, free_fn);
+
+  result.reserve(output_count);
+  for (size_t i = 0; i < output_count; ++i) {
+    result.emplace_back(output_buffer[i]);
+    ++owned;
+  }
+  return result;
+}
+
+}  // namespace binding_utils
+}  // namespace detail
+
+inline IoBinding::IoBinding(Session& session) {
+  ThrowOnError(GetApi().CreateIoBinding(session, &this->p_));
+}
+
+inline ArenaCfg::ArenaCfg(size_t max_mem, int arena_extend_strategy, int initial_chunk_size_bytes, int max_dead_bytes_per_chunk) {
+  ThrowOnError(GetApi().CreateArenaCfg(max_mem, arena_extend_strategy, initial_chunk_size_bytes, max_dead_bytes_per_chunk, &p_));
+}
+
+inline ThreadingOptions::ThreadingOptions() {
+  ThrowOnError(GetApi().CreateThreadingOptions(&p_));
+}
+
+inline ThreadingOptions& ThreadingOptions::SetGlobalIntraOpNumThreads(int intra_op_num_threads) {
+  ThrowOnError(GetApi().SetGlobalIntraOpNumThreads(p_, intra_op_num_threads));
+  return *this;
+}
+
+inline ThreadingOptions& ThreadingOptions::SetGlobalInterOpNumThreads(int inter_op_num_threads) {
+  ThrowOnError(GetApi().SetGlobalInterOpNumThreads(p_, inter_op_num_threads));
+  return *this;
+}
+
+inline ThreadingOptions& ThreadingOptions::SetGlobalSpinControl(int allow_spinning) {
+  ThrowOnError(GetApi().SetGlobalSpinControl(p_, allow_spinning));
+  return *this;
+}
+
+inline ThreadingOptions& ThreadingOptions::SetGlobalDenormalAsZero() {
+  ThrowOnError(GetApi().SetGlobalDenormalAsZero(p_));
+  return *this;
+}
+
+inline ThreadingOptions& ThreadingOptions::SetGlobalCustomCreateThreadFn(OrtCustomCreateThreadFn ort_custom_create_thread_fn) {
+  ThrowOnError(GetApi().SetGlobalCustomCreateThreadFn(p_, ort_custom_create_thread_fn));
+  return *this;
+}
+
+inline ThreadingOptions& ThreadingOptions::SetGlobalCustomThreadCreationOptions(void* ort_custom_thread_creation_options) {
+  ThrowOnError(GetApi().SetGlobalCustomThreadCreationOptions(p_, ort_custom_thread_creation_options));
+  return *this;
+}
+
+inline ThreadingOptions& ThreadingOptions::SetGlobalCustomJoinThreadFn(OrtCustomJoinThreadFn ort_custom_join_thread_fn) {
+  ThrowOnError(GetApi().SetGlobalCustomJoinThreadFn(p_, ort_custom_join_thread_fn));
+  return *this;
+}
+
+namespace detail {
+template <typename T>
+inline const char* KeyValuePairsImpl<T>::GetValue(const char* key) const {
+  return GetApi().GetKeyValue(this->p_, key);
+}
+
+template <typename T>
+inline std::unordered_map<std::string, std::string> KeyValuePairsImpl<T>::GetKeyValuePairs() const {
+  std::unordered_map<std::string, std::string> out;
+
+  size_t num_pairs = 0;
+  const char* const* keys = nullptr;
+  const char* const* values = nullptr;
+  GetApi().GetKeyValuePairs(this->p_, &keys, &values, &num_pairs);
+  if (num_pairs > 0) {
+    out.reserve(num_pairs);
+    for (size_t i = 0; i < num_pairs; ++i) {
+      out.emplace(keys[i], values[i]);
+    }
+  }
+
+  return out;
+}
+
+template <typename T>
+inline void KeyValuePairsImpl<T>::GetKeyValuePairs(std::vector<const char*>& keys,
+                                                   std::vector<const char*>& values) const {
+  keys.clear();
+  values.clear();
+
+  size_t num_pairs = 0;
+  const char* const* keys_ptr = nullptr;
+  const char* const* values_ptr = nullptr;
+  GetApi().GetKeyValuePairs(this->p_, &keys_ptr, &values_ptr, &num_pairs);
+  if (num_pairs > 0) {
+    keys.resize(num_pairs);
+    values.resize(num_pairs);
+    std::copy(keys_ptr, keys_ptr + num_pairs, keys.begin());
+    std::copy(values_ptr, values_ptr + num_pairs, values.begin());
+  }
+}
+}  // namespace detail
+
+inline KeyValuePairs::KeyValuePairs() {
+  GetApi().CreateKeyValuePairs(&p_);
+}
+
+inline KeyValuePairs::KeyValuePairs(const std::unordered_map<std::string, std::string>& kv_pairs) {
+  GetApi().CreateKeyValuePairs(&p_);
+  for (const auto& kv : kv_pairs) {
+    GetApi().AddKeyValuePair(this->p_, kv.first.c_str(), kv.second.c_str());
+  }
+}
+
+inline void KeyValuePairs::Add(const char* key, const char* value) {
+  GetApi().AddKeyValuePair(this->p_, key, value);
+}
+
+inline void KeyValuePairs::Remove(const char* key) {
+  GetApi().RemoveKeyValuePair(this->p_, key);
+}
+
+namespace detail {
+template <typename T>
+inline OrtHardwareDeviceType HardwareDeviceImpl<T>::Type() const {
+  return GetApi().HardwareDevice_Type(this->p_);
+}
+
+template <typename T>
+inline uint32_t HardwareDeviceImpl<T>::VendorId() const {
+  return GetApi().HardwareDevice_VendorId(this->p_);
+}
+
+template <typename T>
+inline uint32_t HardwareDeviceImpl<T>::DeviceId() const {
+  return GetApi().HardwareDevice_DeviceId(this->p_);
+}
+
+template <typename T>
+inline const char* HardwareDeviceImpl<T>::Vendor() const {
+  return GetApi().HardwareDevice_Vendor(this->p_);
+}
+
+template <typename T>
+inline ConstKeyValuePairs HardwareDeviceImpl<T>::Metadata() const {
+  return ConstKeyValuePairs{GetApi().HardwareDevice_Metadata(this->p_)};
+}
+
+template <typename T>
+inline const char* EpDeviceImpl<T>::EpName() const {
+  return GetApi().EpDevice_EpName(this->p_);
+}
+
+template <typename T>
+inline const char* EpDeviceImpl<T>::EpVendor() const {
+  return GetApi().EpDevice_EpVendor(this->p_);
+}
+
+template <typename T>
+inline ConstKeyValuePairs EpDeviceImpl<T>::EpMetadata() const {
+  return ConstKeyValuePairs(GetApi().EpDevice_EpMetadata(this->p_));
+}
+
+template <typename T>
+inline ConstKeyValuePairs EpDeviceImpl<T>::EpOptions() const {
+  return ConstKeyValuePairs(GetApi().EpDevice_EpOptions(this->p_));
+}
+
+template <typename T>
+inline ConstHardwareDevice EpDeviceImpl<T>::Device() const {
+  return ConstHardwareDevice(GetApi().EpDevice_Device(this->p_));
+}
+}  // namespace detail
+
+inline EpDevice::EpDevice(OrtEpFactory& ep_factory, ConstHardwareDevice& hardware_device,
+                          ConstKeyValuePairs ep_metadata, ConstKeyValuePairs ep_options) {
+  ThrowOnError(GetEpApi().CreateEpDevice(&ep_factory, hardware_device, ep_metadata, ep_options, &p_));
+}
+
+inline Env::Env(OrtLoggingLevel logging_level, _In_ const char* logid) {
+  ThrowOnError(GetApi().CreateEnv(logging_level, logid, &p_));
+  if (strcmp(logid, "onnxruntime-node") == 0) {
+    ThrowOnError(GetApi().SetLanguageProjection(p_, OrtLanguageProjection::ORT_PROJECTION_NODEJS));
+  } else {
+    ThrowOnError(GetApi().SetLanguageProjection(p_, OrtLanguageProjection::ORT_PROJECTION_CPLUSPLUS));
+  }
+}
+
+inline Env::Env(OrtLoggingLevel logging_level, const char* logid, OrtLoggingFunction logging_function, void* logger_param) {
+  ThrowOnError(GetApi().CreateEnvWithCustomLogger(logging_function, logger_param, logging_level, logid, &p_));
+  if (strcmp(logid, "onnxruntime-node") == 0) {
+    ThrowOnError(GetApi().SetLanguageProjection(p_, OrtLanguageProjection::ORT_PROJECTION_NODEJS));
+  } else {
+    ThrowOnError(GetApi().SetLanguageProjection(p_, OrtLanguageProjection::ORT_PROJECTION_CPLUSPLUS));
+  }
+}
+
+inline Env::Env(const OrtThreadingOptions* tp_options, OrtLoggingLevel logging_level, _In_ const char* logid) {
+  ThrowOnError(GetApi().CreateEnvWithGlobalThreadPools(logging_level, logid, tp_options, &p_));
+  if (strcmp(logid, "onnxruntime-node") == 0) {
+    ThrowOnError(GetApi().SetLanguageProjection(p_, OrtLanguageProjection::ORT_PROJECTION_NODEJS));
+  } else {
+    ThrowOnError(GetApi().SetLanguageProjection(p_, OrtLanguageProjection::ORT_PROJECTION_CPLUSPLUS));
+  }
+}
+
+inline Env::Env(const OrtThreadingOptions* tp_options, OrtLoggingFunction logging_function, void* logger_param,
+                OrtLoggingLevel logging_level, _In_ const char* logid) {
+  ThrowOnError(GetApi().CreateEnvWithCustomLoggerAndGlobalThreadPools(logging_function, logger_param, logging_level, logid, tp_options, &p_));
+  if (strcmp(logid, "onnxruntime-node") == 0) {
+    ThrowOnError(GetApi().SetLanguageProjection(p_, OrtLanguageProjection::ORT_PROJECTION_NODEJS));
+  } else {
+    ThrowOnError(GetApi().SetLanguageProjection(p_, OrtLanguageProjection::ORT_PROJECTION_CPLUSPLUS));
+  }
+}
+
+inline Env& Env::EnableTelemetryEvents() {
+  ThrowOnError(GetApi().EnableTelemetryEvents(p_));
+  return *this;
+}
+
+inline Env& Env::DisableTelemetryEvents() {
+  ThrowOnError(GetApi().DisableTelemetryEvents(p_));
+  return *this;
+}
+
+inline Env& Env::UpdateEnvWithCustomLogLevel(OrtLoggingLevel log_severity_level) {
+  ThrowOnError(GetApi().UpdateEnvWithCustomLogLevel(p_, log_severity_level));
+  return *this;
+}
+
+inline Env& Env::CreateAndRegisterAllocator(const OrtMemoryInfo* mem_info, const OrtArenaCfg* arena_cfg) {
+  ThrowOnError(GetApi().CreateAndRegisterAllocator(p_, mem_info, arena_cfg));
+  return *this;
+}
+
+inline Env& Env::CreateAndRegisterAllocatorV2(const std::string& provider_type, const OrtMemoryInfo* mem_info, const std::unordered_map<std::string, std::string>& options, const OrtArenaCfg* arena_cfg) {
+  std::vector<const char*> keys, values;
+  auto num_entries = options.size();
+  if (num_entries > 0) {
+    keys.reserve(num_entries);
+    values.reserve(num_entries);
+    for (const auto& entry : options) {
+      keys.push_back(entry.first.c_str());
+      values.push_back(entry.second.c_str());
+    }
+  }
+  ThrowOnError(GetApi().CreateAndRegisterAllocatorV2(p_, provider_type.c_str(), mem_info, arena_cfg, keys.data(), values.data(), num_entries));
+  return *this;
+}
+
+inline Env& Env::RegisterExecutionProviderLibrary(const char* registration_name,
+                                                  const std::basic_string<ORTCHAR_T>& path) {
+  ThrowOnError(GetApi().RegisterExecutionProviderLibrary(p_, registration_name, path.c_str()));
+  return *this;
+}
+
+inline Env& Env::UnregisterExecutionProviderLibrary(const char* registration_name) {
+  ThrowOnError(GetApi().UnregisterExecutionProviderLibrary(p_, registration_name));
+  return *this;
+}
+
+inline std::vector<ConstEpDevice> Env::GetEpDevices() const {
+  size_t num_devices = 0;
+  const OrtEpDevice* const* device_ptrs = nullptr;
+  ThrowOnError(GetApi().GetEpDevices(p_, &device_ptrs, &num_devices));
+
+  std::vector<ConstEpDevice> devices;
+  if (num_devices > 0) {
+    devices.reserve(num_devices);
+    for (size_t i = 0; i < num_devices; ++i) {
+      devices.emplace_back(device_ptrs[i]);
+    }
+  }
+
+  return devices;
+}
+
+inline CustomOpDomain::CustomOpDomain(const char* domain) {
+  ThrowOnError(GetApi().CreateCustomOpDomain(domain, &p_));
+}
+
+inline void CustomOpDomain::Add(const OrtCustomOp* op) {
+  ThrowOnError(GetApi().CustomOpDomain_Add(p_, op));
+}
+
+inline LoraAdapter LoraAdapter::CreateLoraAdapter(const std::basic_string<ORTCHAR_T>& adapter_path,
+                                                  OrtAllocator* allocator) {
+  OrtLoraAdapter* p;
+  ThrowOnError(GetApi().CreateLoraAdapter(adapter_path.c_str(), allocator, &p));
+  return LoraAdapter{p};
+}
+
+inline LoraAdapter LoraAdapter::CreateLoraAdapterFromArray(const void* bytes, size_t num_bytes,
+                                                           OrtAllocator* allocator) {
+  OrtLoraAdapter* p;
+  ThrowOnError(GetApi().CreateLoraAdapterFromArray(bytes, num_bytes, allocator, &p));
+  return LoraAdapter{p};
+}
+
+inline RunOptions::RunOptions() {
+  ThrowOnError(GetApi().CreateRunOptions(&p_));
+}
+
+inline RunOptions& RunOptions::SetRunLogVerbosityLevel(int level) {
+  ThrowOnError(GetApi().RunOptionsSetRunLogVerbosityLevel(p_, level));
+  return *this;
+}
+
+inline RunOptions& RunOptions::SetRunLogSeverityLevel(int level) {
+  ThrowOnError(GetApi().RunOptionsSetRunLogSeverityLevel(p_, level));
+  return *this;
+}
+
+inline int RunOptions::GetRunLogVerbosityLevel() const {
+  int out;
+  ThrowOnError(GetApi().RunOptionsGetRunLogVerbosityLevel(p_, &out));
+  return out;
+}
+
+inline int RunOptions::GetRunLogSeverityLevel() const {
+  int out;
+  ThrowOnError(GetApi().RunOptionsGetRunLogSeverityLevel(p_, &out));
+  return out;
+}
+
+inline RunOptions& RunOptions::SetRunTag(const char* run_tag) {
+  ThrowOnError(GetApi().RunOptionsSetRunTag(p_, run_tag));
+  return *this;
+}
+
+inline const char* RunOptions::GetRunTag() const {
+  const char* out;
+  ThrowOnError(GetApi().RunOptionsGetRunTag(p_, &out));
+  return out;
+}
+
+inline RunOptions& RunOptions::AddConfigEntry(const char* config_key, const char* config_value) {
+  ThrowOnError(GetApi().AddRunConfigEntry(p_, config_key, config_value));
+  return *this;
+}
+
+inline RunOptions& RunOptions::SetTerminate() {
+  ThrowOnError(GetApi().RunOptionsSetTerminate(p_));
+  return *this;
+}
+
+inline RunOptions& RunOptions::UnsetTerminate() {
+  ThrowOnError(GetApi().RunOptionsUnsetTerminate(p_));
+  return *this;
+}
+
+inline RunOptions& RunOptions::AddActiveLoraAdapter(const LoraAdapter& adapter) {
+  ThrowOnError(GetApi().RunOptionsAddActiveLoraAdapter(p_, adapter));
+  return *this;
+}
+
+inline ModelCompilationOptions::ModelCompilationOptions(const Env& env, const SessionOptions& session_options) {
+  ThrowOnError(GetCompileApi().CreateModelCompilationOptionsFromSessionOptions(env, session_options, &this->p_));
+}
+
+inline ModelCompilationOptions::ModelCompilationOptions(const Env& env, ConstSessionOptions session_options) {
+  ThrowOnError(GetCompileApi().CreateModelCompilationOptionsFromSessionOptions(env, session_options, &this->p_));
+}
+
+inline Status CompileModel(const Env& env, const ModelCompilationOptions& model_compilation_options) {
+  return Ort::Status(GetCompileApi().CompileModel(env, model_compilation_options));
+}
+
+inline ModelCompilationOptions& ModelCompilationOptions::SetInputModelPath(
+    const ORTCHAR_T* input_model_path) {
+  Ort::ThrowOnError(GetCompileApi().ModelCompilationOptions_SetInputModelPath(this->p_, input_model_path));
+  return *this;
+}
+
+inline ModelCompilationOptions& ModelCompilationOptions::SetInputModelFromBuffer(
+    const void* input_model_data, size_t input_model_data_size) {
+  Ort::ThrowOnError(GetCompileApi().ModelCompilationOptions_SetInputModelFromBuffer(this->p_, input_model_data,
+                                                                                    input_model_data_size));
+  return *this;
+}
+
+inline ModelCompilationOptions& ModelCompilationOptions::SetOutputModelPath(
+    const ORTCHAR_T* output_model_path) {
+  Ort::ThrowOnError(GetCompileApi().ModelCompilationOptions_SetOutputModelPath(this->p_, output_model_path));
+  return *this;
+}
+
+inline ModelCompilationOptions& ModelCompilationOptions::SetOutputModelExternalInitializersFile(
+    const ORTCHAR_T* file_path, size_t initializer_size_threshold) {
+  Ort::ThrowOnError(GetCompileApi().ModelCompilationOptions_SetOutputModelExternalInitializersFile(
+      this->p_,
+      file_path,
+      initializer_size_threshold));
+  return *this;
+}
+
+inline ModelCompilationOptions& ModelCompilationOptions::SetOutputModelBuffer(
+    OrtAllocator* allocator, void** output_model_buffer_ptr, size_t* output_model_buffer_size_ptr) {
+  Ort::ThrowOnError(GetCompileApi().ModelCompilationOptions_SetOutputModelBuffer(this->p_, allocator,
+                                                                                 output_model_buffer_ptr,
+                                                                                 output_model_buffer_size_ptr));
+  return *this;
+}
+
+inline ModelCompilationOptions& ModelCompilationOptions::SetEpContextEmbedMode(
+    bool embed_ep_context_in_model) {
+  Ort::ThrowOnError(GetCompileApi().ModelCompilationOptions_SetEpContextEmbedMode(
+      this->p_,
+      embed_ep_context_in_model));
+  return *this;
+}
+
+namespace detail {
+
+template <typename T>
+inline Ort::SessionOptions ConstSessionOptionsImpl<T>::Clone() const {
+  OrtSessionOptions* out;
+  ThrowOnError(GetApi().CloneSessionOptions(this->p_, &out));
+  return SessionOptions{out};
+}
+
+template <typename T>
+inline std::string ConstSessionOptionsImpl<T>::GetConfigEntry(const char* config_key) const {
+  size_t size = 0;
+  // Feed nullptr for the data buffer to query the true size of the string value
+  Ort::ThrowOnError(GetApi().GetSessionConfigEntry(this->p_, config_key, nullptr, &size));
+
+  std::string out;
+  out.resize(size);
+  Ort::ThrowOnError(GetApi().GetSessionConfigEntry(this->p_, config_key, &out[0], &size));
+  out.resize(size - 1);  // remove the terminating character '\0'
+
+  return out;
+}
+
+template <typename T>
+inline bool ConstSessionOptionsImpl<T>::HasConfigEntry(const char* config_key) const {
+  int out = 0;
+  Ort::ThrowOnError(GetApi().HasSessionConfigEntry(this->p_, config_key, &out));
+  return static_cast<bool>(out);
+}
+
+template <typename T>
+inline std::string ConstSessionOptionsImpl<T>::GetConfigEntryOrDefault(const char* config_key,
+                                                                       const std::string& def) const {
+  if (!this->HasConfigEntry(config_key)) {
+    return def;
+  }
+
+  return this->GetConfigEntry(config_key);
+}
+
+template <typename T>
+inline SessionOptionsImpl<T>& SessionOptionsImpl<T>::SetIntraOpNumThreads(int intra_op_num_threads) {
+  ThrowOnError(GetApi().SetIntraOpNumThreads(this->p_, intra_op_num_threads));
+  return *this;
+}
+
+template <typename T>
+inline SessionOptionsImpl<T>& SessionOptionsImpl<T>::SetInterOpNumThreads(int inter_op_num_threads) {
+  ThrowOnError(GetApi().SetInterOpNumThreads(this->p_, inter_op_num_threads));
+  return *this;
+}
+
+template <typename T>
+inline SessionOptionsImpl<T>& SessionOptionsImpl<T>::SetGraphOptimizationLevel(GraphOptimizationLevel graph_optimization_level) {
+  ThrowOnError(GetApi().SetSessionGraphOptimizationLevel(this->p_, graph_optimization_level));
+  return *this;
+}
+
+template <typename T>
+inline SessionOptionsImpl<T>& SessionOptionsImpl<T>::SetDeterministicCompute(bool value) {
+  ThrowOnError(GetApi().SetDeterministicCompute(this->p_, value));
+  return *this;
+}
+
+template <typename T>
+inline SessionOptionsImpl<T>& SessionOptionsImpl<T>::SetOptimizedModelFilePath(const ORTCHAR_T* optimized_model_filepath) {
+  ThrowOnError(GetApi().SetOptimizedModelFilePath(this->p_, optimized_model_filepath));
+  return *this;
+}
+
+template <typename T>
+inline SessionOptionsImpl<T>& SessionOptionsImpl<T>::EnableProfiling(const ORTCHAR_T* profile_file_prefix) {
+  ThrowOnError(GetApi().EnableProfiling(this->p_, profile_file_prefix));
+  return *this;
+}
+
+template <typename T>
+inline SessionOptionsImpl<T>& SessionOptionsImpl<T>::DisableProfiling() {
+  ThrowOnError(GetApi().DisableProfiling(this->p_));
+  return *this;
+}
+
+template <typename T>
+inline SessionOptionsImpl<T>& SessionOptionsImpl<T>::EnableOrtCustomOps() {
+  ThrowOnError(GetApi().EnableOrtCustomOps(this->p_));
+  return *this;
+}
+
+template <typename T>
+inline SessionOptionsImpl<T>& SessionOptionsImpl<T>::EnableMemPattern() {
+  ThrowOnError(GetApi().EnableMemPattern(this->p_));
+  return *this;
+}
+
+template <typename T>
+inline SessionOptionsImpl<T>& SessionOptionsImpl<T>::DisableMemPattern() {
+  ThrowOnError(GetApi().DisableMemPattern(this->p_));
+  return *this;
+}
+
+template <typename T>
+inline SessionOptionsImpl<T>& SessionOptionsImpl<T>::EnableCpuMemArena() {
+  ThrowOnError(GetApi().EnableCpuMemArena(this->p_));
+  return *this;
+}
+
+template <typename T>
+inline SessionOptionsImpl<T>& SessionOptionsImpl<T>::DisableCpuMemArena() {
+  ThrowOnError(GetApi().DisableCpuMemArena(this->p_));
+  return *this;
+}
+
+template <typename T>
+inline SessionOptionsImpl<T>& SessionOptionsImpl<T>::SetExecutionMode(ExecutionMode execution_mode) {
+  ThrowOnError(GetApi().SetSessionExecutionMode(this->p_, execution_mode));
+  return *this;
+}
+
+template <typename T>
+inline SessionOptionsImpl<T>& SessionOptionsImpl<T>::SetLoadCancellationFlag(bool value) {
+  ThrowOnError(GetApi().SessionOptionsSetLoadCancellationFlag(this->p_, value));
+  return *this;
+}
+
+template <typename T>
+inline SessionOptionsImpl<T>& SessionOptionsImpl<T>::SetLogId(const char* logid) {
+  ThrowOnError(GetApi().SetSessionLogId(this->p_, logid));
+  return *this;
+}
+
+template <typename T>
+inline SessionOptionsImpl<T>& SessionOptionsImpl<T>::SetLogSeverityLevel(int level) {
+  ThrowOnError(GetApi().SetSessionLogSeverityLevel(this->p_, level));
+  return *this;
+}
+
+template <typename T>
+inline SessionOptionsImpl<T>& SessionOptionsImpl<T>::Add(OrtCustomOpDomain* custom_op_domain) {
+  ThrowOnError(GetApi().AddCustomOpDomain(this->p_, custom_op_domain));
+  return *this;
+}
+
+template <typename T>
+inline SessionOptionsImpl<T>& SessionOptionsImpl<T>::AddConfigEntry(const char* config_key, const char* config_value) {
+  ThrowOnError(GetApi().AddSessionConfigEntry(this->p_, config_key, config_value));
+  return *this;
+}
+
+template <typename T>
+inline SessionOptionsImpl<T>& SessionOptionsImpl<T>::AddInitializer(const char* name, const OrtValue* ort_val) {
+  ThrowOnError(GetApi().AddInitializer(this->p_, name, ort_val));
+  return *this;
+}
+
+template <typename T>
+inline SessionOptionsImpl<T>& SessionOptionsImpl<T>::DisablePerSessionThreads() {
+  ThrowOnError(GetApi().DisablePerSessionThreads(this->p_));
+  return *this;
+}
+
+template <typename T>
+inline SessionOptionsImpl<T>& SessionOptionsImpl<T>::AddExternalInitializers(const std::vector<std::string>& names,
+                                                                             const std::vector<Value>& ort_values) {
+  const size_t inputs_num = names.size();
+  if (inputs_num != ort_values.size()) {
+    ORT_CXX_API_THROW("Expecting names and ort_values to have the same length", ORT_INVALID_ARGUMENT);
+  }
+  std::vector<const char*> names_ptr;
+  std::vector<const OrtValue*> ort_values_ptrs;
+  names_ptr.reserve(inputs_num);
+  ort_values_ptrs.reserve(inputs_num);
+  for (size_t i = 0; i < inputs_num; ++i) {
+    names_ptr.push_back(names[i].c_str());
+    ort_values_ptrs.push_back(ort_values[i]);
+  }
+  ThrowOnError(GetApi().AddExternalInitializers(this->p_, names_ptr.data(), ort_values_ptrs.data(), inputs_num));
+  return *this;
+}
+
+template <typename T>
+inline SessionOptionsImpl<T>& SessionOptionsImpl<T>::AddExternalInitializersFromFilesInMemory(const std::vector<std::basic_string<ORTCHAR_T>>& file_names,
+                                                                                              const std::vector<char*>& buffer_array,
+                                                                                              const std::vector<size_t>& file_lengths) {
+  const size_t inputs_num = file_names.size();
+  if (inputs_num != buffer_array.size()) {
+    ORT_CXX_API_THROW("Expecting names and buffer_array to have the same length", ORT_INVALID_ARGUMENT);
+  }
+  if (inputs_num != file_lengths.size()) {
+    ORT_CXX_API_THROW("Expecting names and file_lengths to have the same length", ORT_INVALID_ARGUMENT);
+  }
+  std::vector<const ORTCHAR_T*> names_ptr;
+  names_ptr.reserve(inputs_num);
+  for (size_t i = 0; i < inputs_num; ++i) {
+    names_ptr.push_back(file_names[i].c_str());
+  }
+  ThrowOnError(GetApi().AddExternalInitializersFromFilesInMemory(this->p_, names_ptr.data(), buffer_array.data(),
+                                                                 file_lengths.data(), inputs_num));
+  return *this;
+}
+
+template <typename T>
+inline SessionOptionsImpl<T>& SessionOptionsImpl<T>::AppendExecutionProvider_CUDA(const OrtCUDAProviderOptions& provider_options) {
+  ThrowOnError(GetApi().SessionOptionsAppendExecutionProvider_CUDA(this->p_, &provider_options));
+  return *this;
+}
+
+template <typename T>
+inline SessionOptionsImpl<T>& SessionOptionsImpl<T>::AppendExecutionProvider_CUDA_V2(const OrtCUDAProviderOptionsV2& provider_options) {
+  ThrowOnError(GetApi().SessionOptionsAppendExecutionProvider_CUDA_V2(this->p_, &provider_options));
+  return *this;
+}
+
+template <typename T>
+inline SessionOptionsImpl<T>& SessionOptionsImpl<T>::AppendExecutionProvider_ROCM(const OrtROCMProviderOptions& provider_options) {
+  ThrowOnError(GetApi().SessionOptionsAppendExecutionProvider_ROCM(this->p_, &provider_options));
+  return *this;
+}
+
+template <typename T>
+inline SessionOptionsImpl<T>& SessionOptionsImpl<T>::AppendExecutionProvider_TensorRT(const OrtTensorRTProviderOptions& provider_options) {
+  ThrowOnError(GetApi().SessionOptionsAppendExecutionProvider_TensorRT(this->p_, &provider_options));
+  return *this;
+}
+
+template <typename T>
+inline SessionOptionsImpl<T>& SessionOptionsImpl<T>::AppendExecutionProvider_TensorRT_V2(const OrtTensorRTProviderOptionsV2& provider_options) {
+  ThrowOnError(GetApi().SessionOptionsAppendExecutionProvider_TensorRT_V2(this->p_, &provider_options));
+  return *this;
+}
+
+template <typename T>
+inline SessionOptionsImpl<T>& SessionOptionsImpl<T>::AppendExecutionProvider_MIGraphX(const OrtMIGraphXProviderOptions& provider_options) {
+  ThrowOnError(GetApi().SessionOptionsAppendExecutionProvider_MIGraphX(this->p_, &provider_options));
+  return *this;
+}
+
+template <typename T>
+inline SessionOptionsImpl<T>& SessionOptionsImpl<T>::AppendExecutionProvider_CANN(const OrtCANNProviderOptions& provider_options) {
+  ThrowOnError(GetApi().SessionOptionsAppendExecutionProvider_CANN(this->p_, &provider_options));
+  return *this;
+}
+
+template <typename T>
+inline SessionOptionsImpl<T>& SessionOptionsImpl<T>::AppendExecutionProvider_Dnnl(const OrtDnnlProviderOptions& provider_options) {
+  ThrowOnError(GetApi().SessionOptionsAppendExecutionProvider_Dnnl(this->p_, &provider_options));
+  return *this;
+}
+
+template <typename T>
+inline SessionOptionsImpl<T>& SessionOptionsImpl<T>::AppendExecutionProvider(
+    const std::string& provider_name,
+    const std::unordered_map<std::string, std::string>& provider_options) {
+  auto num_entries = provider_options.size();
+  std::vector<const char*> keys, values;
+  if (num_entries > 0) {
+    keys.reserve(num_entries);
+    values.reserve(num_entries);
+
+    for (const auto& entry : provider_options) {
+      keys.push_back(entry.first.c_str());
+      values.push_back(entry.second.c_str());
+    }
+  }
+
+  ThrowOnError(GetApi().SessionOptionsAppendExecutionProvider(this->p_, provider_name.c_str(),
+                                                              keys.data(), values.data(), num_entries));
+
+  return *this;
+}
+
+namespace {
+template <typename T>
+void SessionOptionsAppendEP(detail::SessionOptionsImpl<T>& session_options,
+                            Env& env, const std::vector<ConstEpDevice>& ep_devices,
+                            const std::vector<const char*>& ep_options_keys,
+                            const std::vector<const char*>& ep_options_values) {
+  std::vector<const OrtEpDevice*> ep_devices_ptrs;
+  ep_devices_ptrs.reserve(ep_devices.size());
+  for (const auto& ep_device : ep_devices) {
+    ep_devices_ptrs.push_back(ep_device);
+  }
+
+  ThrowOnError(GetApi().SessionOptionsAppendExecutionProvider_V2(
+      session_options, env, ep_devices_ptrs.data(), ep_devices_ptrs.size(),
+      ep_options_keys.data(), ep_options_values.data(), ep_options_keys.size()));
+}
+}  // namespace
+
+template <typename T>
+inline SessionOptionsImpl<T>& SessionOptionsImpl<T>::AppendExecutionProvider_V2(
+    Env& env, const std::vector<ConstEpDevice>& ep_devices, const KeyValuePairs& ep_options) {
+  std::vector<const char*> ep_options_keys, ep_options_values;
+  ep_options.GetKeyValuePairs(ep_options_keys, ep_options_values);
+
+  SessionOptionsAppendEP(*this, env, ep_devices, ep_options_keys, ep_options_values);
+
+  return *this;
+}
+
+template <typename T>
+inline SessionOptionsImpl<T>& SessionOptionsImpl<T>::AppendExecutionProvider_V2(
+    Env& env, const std::vector<ConstEpDevice>& ep_devices,
+    const std::unordered_map<std::string, std::string>& ep_options) {
+  std::vector<const char*> ep_options_keys, ep_options_values;
+  ep_options_keys.reserve(ep_options.size());
+  ep_options_values.reserve(ep_options.size());
+
+  for (const auto& [key, value] : ep_options) {
+    ep_options_keys.push_back(key.c_str());
+    ep_options_values.push_back(value.c_str());
+  }
+
+  SessionOptionsAppendEP(*this, env, ep_devices, ep_options_keys, ep_options_values);
+
+  return *this;
+}
+
+template <typename T>
+inline SessionOptionsImpl<T>& SessionOptionsImpl<T>::SetEpSelectionPolicy(OrtExecutionProviderDevicePolicy policy) {
+  ThrowOnError(GetApi().SessionOptionsSetEpSelectionPolicy(this->p_, policy));
+  return *this;
+}
+
+template <typename T>
+inline SessionOptionsImpl<T>& SessionOptionsImpl<T>::SetEpSelectionPolicy(EpSelectionDelegate delegate, void* state) {
+  ThrowOnError(GetApi().SessionOptionsSetEpSelectionPolicyDelegate(this->p_, delegate, state));
+  return *this;
+}
+
+template <typename T>
+inline SessionOptionsImpl<T>& SessionOptionsImpl<T>::SetCustomCreateThreadFn(OrtCustomCreateThreadFn ort_custom_create_thread_fn) {
+  ThrowOnError(GetApi().SessionOptionsSetCustomCreateThreadFn(this->p_, ort_custom_create_thread_fn));
+  return *this;
+}
+
+template <typename T>
+inline SessionOptionsImpl<T>& SessionOptionsImpl<T>::SetCustomThreadCreationOptions(void* ort_custom_thread_creation_options) {
+  ThrowOnError(GetApi().SessionOptionsSetCustomThreadCreationOptions(this->p_, ort_custom_thread_creation_options));
+  return *this;
+}
+
+template <typename T>
+inline SessionOptionsImpl<T>& SessionOptionsImpl<T>::SetCustomJoinThreadFn(OrtCustomJoinThreadFn ort_custom_join_thread_fn) {
+  ThrowOnError(GetApi().SessionOptionsSetCustomJoinThreadFn(this->p_, ort_custom_join_thread_fn));
+  return *this;
+}
+
+template <typename T>
+inline SessionOptionsImpl<T>& SessionOptionsImpl<T>::AppendExecutionProvider_OpenVINO(const OrtOpenVINOProviderOptions& provider_options) {
+  ThrowOnError(GetApi().SessionOptionsAppendExecutionProvider_OpenVINO(this->p_, &provider_options));
+  return *this;
+}
+
+template <typename T>
+inline SessionOptionsImpl<T>& SessionOptionsImpl<T>::AppendExecutionProvider_OpenVINO_V2(const std::unordered_map<std::string, std::string>& provider_options) {
+  auto num_entries = provider_options.size();
+  std::vector<const char*> keys, values;
+  if (num_entries > 0) {
+    keys.reserve(num_entries);
+    values.reserve(num_entries);
+
+    for (const auto& entry : provider_options) {
+      keys.push_back(entry.first.c_str());
+      values.push_back(entry.second.c_str());
+    }
+  }
+
+  ThrowOnError(GetApi().SessionOptionsAppendExecutionProvider_OpenVINO_V2(this->p_,
+                                                                          keys.data(), values.data(), num_entries));
+
+  return *this;
+}
+
+template <typename T>
+inline SessionOptionsImpl<T>& SessionOptionsImpl<T>::AppendExecutionProvider_VitisAI(const std::unordered_map<std::string, std::string>& provider_options) {
+  auto num_entries = provider_options.size();
+  std::vector<const char*> keys, values;
+  if (num_entries > 0) {
+    keys.reserve(num_entries);
+    values.reserve(num_entries);
+
+    for (const auto& entry : provider_options) {
+      keys.push_back(entry.first.c_str());
+      values.push_back(entry.second.c_str());
+    }
+  }
+
+  ThrowOnError(GetApi().SessionOptionsAppendExecutionProvider_VitisAI(this->p_, keys.data(), values.data(), num_entries));
+
+  return *this;
+}
+
+template <typename T>
+inline SessionOptionsImpl<T>& SessionOptionsImpl<T>::RegisterCustomOpsLibrary(const ORTCHAR_T* library_name,
+                                                                              const CustomOpConfigs& custom_op_configs) {
+  // Add custom op config entries before registering the custom op library. Otherwise, the config entries _may_ be ignored by
+  // the custom op library.
+  for (const auto& config_iter : custom_op_configs.GetFlattenedConfigs()) {
+    AddConfigEntry(config_iter.first.c_str(), config_iter.second.c_str());
+  }
+
+  ThrowOnError(GetApi().RegisterCustomOpsLibrary_V2(this->p_, library_name));
+  return *this;
+}
+
+template <typename T>
+inline SessionOptionsImpl<T>& SessionOptionsImpl<T>::RegisterCustomOpsUsingFunction(const char* registration_function_name) {
+  ThrowOnError(GetApi().RegisterCustomOpsUsingFunction(this->p_, registration_function_name));
+  return *this;
+}
+
+/// Session
+template <typename T>
+inline size_t ConstSessionImpl<T>::GetInputCount() const {
+  size_t out;
+  ThrowOnError(GetApi().SessionGetInputCount(this->p_, &out));
+  return out;
+}
+
+template <typename T>
+inline size_t ConstSessionImpl<T>::GetOutputCount() const {
+  size_t out;
+  ThrowOnError(GetApi().SessionGetOutputCount(this->p_, &out));
+  return out;
+}
+
+template <typename T>
+inline size_t ConstSessionImpl<T>::GetOverridableInitializerCount() const {
+  size_t out;
+  ThrowOnError(GetApi().SessionGetOverridableInitializerCount(this->p_, &out));
+  return out;
+}
+
+template <typename T>
+inline std::vector<std::string> ConstSessionImpl<T>::GetInputNames() const {
+  AllocatorWithDefaultOptions allocator;
+
+  auto num_inputs = GetInputCount();
+  std::vector<std::string> input_names;
+  input_names.reserve(num_inputs);
+
+  for (size_t i = 0; i < num_inputs; ++i) {
+    char* name = nullptr;
+    ThrowOnError(GetApi().SessionGetInputName(this->p_, i, allocator, &name));
+    input_names.push_back(name);
+    allocator.Free(name);
+  }
+
+  return input_names;
+}
+
+template <typename T>
+inline std::vector<std::string> ConstSessionImpl<T>::GetOutputNames() const {
+  AllocatorWithDefaultOptions allocator;
+
+  auto num_inputs = GetOutputCount();
+  std::vector<std::string> output_names;
+  output_names.reserve(num_inputs);
+
+  for (size_t i = 0; i < num_inputs; ++i) {
+    char* name = nullptr;
+    ThrowOnError(GetApi().SessionGetOutputName(this->p_, i, allocator, &name));
+    output_names.push_back(name);
+    allocator.Free(name);
+  }
+
+  return output_names;
+}
+
+template <typename T>
+inline std::vector<std::string> ConstSessionImpl<T>::GetOverridableInitializerNames() const {
+  AllocatorWithDefaultOptions allocator;
+
+  auto num_initializers = GetOverridableInitializerCount();
+  std::vector<std::string> initializer_names;
+  initializer_names.reserve(num_initializers);
+
+  for (size_t i = 0; i < num_initializers; ++i) {
+    char* name = nullptr;
+    ThrowOnError(GetApi().SessionGetOverridableInitializerName(this->p_, i, allocator, &name));
+    initializer_names.push_back(name);
+  }
+
+  return initializer_names;
+}
+
+template <typename T>
+inline AllocatedStringPtr ConstSessionImpl<T>::GetInputNameAllocated(size_t index, OrtAllocator* allocator) const {
+  char* out;
+  ThrowOnError(GetApi().SessionGetInputName(this->p_, index, allocator, &out));
+  return AllocatedStringPtr(out, detail::AllocatedFree(allocator));
+}
+
+template <typename T>
+inline AllocatedStringPtr ConstSessionImpl<T>::GetOutputNameAllocated(size_t index, OrtAllocator* allocator) const {
+  char* out;
+  ThrowOnError(GetApi().SessionGetOutputName(this->p_, index, allocator, &out));
+  return AllocatedStringPtr(out, detail::AllocatedFree(allocator));
+}
+
+template <typename T>
+inline AllocatedStringPtr ConstSessionImpl<T>::GetOverridableInitializerNameAllocated(size_t index, OrtAllocator* allocator) const {
+  char* out;
+  ThrowOnError(GetApi().SessionGetOverridableInitializerName(this->p_, index, allocator, &out));
+  return AllocatedStringPtr(out, detail::AllocatedFree(allocator));
+}
+
+template <typename T>
+inline uint64_t ConstSessionImpl<T>::GetProfilingStartTimeNs() const {
+  uint64_t out;
+  ThrowOnError(GetApi().SessionGetProfilingStartTimeNs(this->p_, &out));
+  return out;
+}
+
+template <typename T>
+inline ModelMetadata ConstSessionImpl<T>::GetModelMetadata() const {
+  OrtModelMetadata* out;
+  ThrowOnError(GetApi().SessionGetModelMetadata(this->p_, &out));
+  return ModelMetadata{out};
+}
+
+template <typename T>
+inline TypeInfo ConstSessionImpl<T>::GetInputTypeInfo(size_t index) const {
+  OrtTypeInfo* out;
+  ThrowOnError(GetApi().SessionGetInputTypeInfo(this->p_, index, &out));
+  return TypeInfo{out};
+}
+
+template <typename T>
+inline TypeInfo ConstSessionImpl<T>::GetOutputTypeInfo(size_t index) const {
+  OrtTypeInfo* out;
+  ThrowOnError(GetApi().SessionGetOutputTypeInfo(this->p_, index, &out));
+  return TypeInfo{out};
+}
+
+template <typename T>
+inline TypeInfo ConstSessionImpl<T>::GetOverridableInitializerTypeInfo(size_t index) const {
+  OrtTypeInfo* out;
+  ThrowOnError(GetApi().SessionGetOverridableInitializerTypeInfo(this->p_, index, &out));
+  return TypeInfo{out};
+}
+
+#if !defined(ORT_MINIMAL_BUILD)
+template <typename T>
+inline int ConstSessionImpl<T>::GetOpset(const std::string& domain) const {
+  int opset;
+  ThrowOnError(GetModelEditorApi().SessionGetOpsetForDomain(this->p_, domain.c_str(), &opset));
+  return opset;
+}
+#endif  // !defined(ORT_MINIMAL_BUILD)
+
+template <typename T>
+std::vector<ValueInfo> ConstSessionImpl<T>::GetInputs() const {
+  const std::vector<std::string> input_names = GetInputNames();
+
+  std::vector<ValueInfo> inputs;
+  inputs.reserve(input_names.size());
+
+  for (size_t i = 0; i < input_names.size(); ++i) {
+    auto type_info = GetInputTypeInfo(i);
+    inputs.emplace_back(ValueInfo{input_names[i], type_info.GetConst()});
+  }
+
+  return inputs;
+}
+
+template <typename T>
+std::vector<ValueInfo> ConstSessionImpl<T>::GetOutputs() const {
+  const std::vector<std::string> output_names = GetOutputNames();
+
+  std::vector<ValueInfo> outputs;
+  outputs.reserve(output_names.size());
+
+  for (size_t i = 0; i < output_names.size(); ++i) {
+    auto type_info = GetOutputTypeInfo(i);
+    outputs.emplace_back(ValueInfo{output_names[i], type_info.GetConst()});
+  }
+
+  return outputs;
+}
+
+template <typename T>
+inline std::vector<Value> SessionImpl<T>::Run(const RunOptions& run_options, const char* const* input_names, const Value* input_values, size_t input_count,
+                                              const char* const* output_names, size_t output_count) {
+  std::vector<Value> output_values;
+  output_values.reserve(output_count);
+  for (size_t i = 0; i < output_count; i++)
+    output_values.emplace_back(nullptr);
+  Run(run_options, input_names, input_values, input_count, output_names, output_values.data(), output_count);
+  return output_values;
+}
+
+template <typename T>
+inline void SessionImpl<T>::Run(const RunOptions& run_options, const char* const* input_names, const Value* input_values, size_t input_count,
+                                const char* const* output_names, Value* output_values, size_t output_count) {
+  static_assert(sizeof(Value) == sizeof(OrtValue*), "Value is really just an array of OrtValue* in memory, so we can reinterpret_cast safely");
+  auto ort_input_values = reinterpret_cast<const OrtValue* const*>(input_values);
+  auto ort_output_values = reinterpret_cast<OrtValue**>(output_values);
+  ThrowOnError(GetApi().Run(this->p_, run_options, input_names, ort_input_values, input_count, output_names, output_count, ort_output_values));
+}
+
+template <typename T>
+inline void SessionImpl<T>::Run(const RunOptions& run_options, const IoBinding& io_binding) {
+  ThrowOnError(GetApi().RunWithBinding(this->p_, run_options, io_binding));
+}
+
+template <typename T>
+inline void SessionImpl<T>::RunAsync(const RunOptions& run_options, const char* const* input_names, const Value* input_values, size_t input_count,
+                                     const char* const* output_names, Value* output_values, size_t output_count, RunAsyncCallbackFn callback, void* user_data) {
+  auto ort_input_values = reinterpret_cast<const OrtValue* const*>(input_values);
+  auto ort_output_values = reinterpret_cast<OrtValue**>(output_values);
+  ThrowOnError(GetApi().RunAsync(this->p_, run_options, input_names,
+                                 ort_input_values, input_count, output_names, output_count,
+                                 ort_output_values, callback, user_data));
+}
+
+template <typename T>
+inline AllocatedStringPtr SessionImpl<T>::EndProfilingAllocated(OrtAllocator* allocator) {
+  char* out = nullptr;
+  ThrowOnError(GetApi().SessionEndProfiling(this->p_, allocator, &out));
+  return AllocatedStringPtr(out, detail::AllocatedFree(allocator));
+}
+
+template <typename T>
+inline void SessionImpl<T>::SetEpDynamicOptions(const char* const* keys, const char* const* values, size_t kv_len) {
+  ThrowOnError(GetApi().SetEpDynamicOptions(this->p_, keys, values, kv_len));
+}
+
+#if !defined(ORT_MINIMAL_BUILD)
+template <typename T>
+inline void SessionImpl<T>::FinalizeModelEditorSession(const Model& model, const SessionOptions& options,
+                                                       OrtPrepackedWeightsContainer* prepacked_weights_container) {
+  ThrowOnError(GetModelEditorApi().ApplyModelToModelEditorSession(this->p_, model));
+  ThrowOnError(GetModelEditorApi().FinalizeModelEditorSession(this->p_, options, prepacked_weights_container));
+}
+#endif  // #if !defined(ORT_MINIMAL_BUILD)
+
+}  // namespace detail
+
+inline SessionOptions::SessionOptions() {
+  ThrowOnError(GetApi().CreateSessionOptions(&this->p_));
+}
+
+/// CustomOpConfigs
+inline std::string detail::MakeCustomOpConfigEntryKey(const char* custom_op_name, const char* config) {
+  std::string config_key = "custom_op.";
+
+  config_key += custom_op_name;
+  config_key += ".";
+  config_key += config;
+
+  return config_key;
+}
+
+inline CustomOpConfigs& CustomOpConfigs::AddConfig(const char* custom_op_name, const char* config_key, const char* config_value) {
+  const std::string full_flat_key = detail::MakeCustomOpConfigEntryKey(custom_op_name, config_key);
+  flat_configs_[full_flat_key] = config_value;
+  return *this;
+}
+
+inline const std::unordered_map<std::string, std::string>& CustomOpConfigs::GetFlattenedConfigs() const {
+  return flat_configs_;
+}
+
+inline Session::Session(const Env& env, const ORTCHAR_T* model_path, const SessionOptions& options) {
+  ThrowOnError(GetApi().CreateSession(env, model_path, options, &this->p_));
+}
+
+inline Session::Session(const Env& env, const ORTCHAR_T* model_path, const SessionOptions& options,
+                        OrtPrepackedWeightsContainer* prepacked_weights_container) {
+  ThrowOnError(GetApi().CreateSessionWithPrepackedWeightsContainer(env, model_path, options, prepacked_weights_container, &this->p_));
+}
+
+inline Session::Session(const Env& env, const void* model_data, size_t model_data_length, const SessionOptions& options) {
+  ThrowOnError(GetApi().CreateSessionFromArray(env, model_data, model_data_length, options, &this->p_));
+}
+
+inline Session::Session(const Env& env, const void* model_data, size_t model_data_length,
+                        const SessionOptions& options, OrtPrepackedWeightsContainer* prepacked_weights_container) {
+  ThrowOnError(GetApi().CreateSessionFromArrayWithPrepackedWeightsContainer(env, model_data, model_data_length, options,
+                                                                            prepacked_weights_container, &this->p_));
+}
+
+#if !defined(ORT_MINIMAL_BUILD)
+inline Session::Session(const Env& env, const Model& model, const SessionOptions& options) {
+  ThrowOnError(GetModelEditorApi().CreateSessionFromModel(env, model.GetConst(), options, &this->p_));
+}
+
+// static
+inline Session Session::CreateModelEditorSession(const Env& env, const ORTCHAR_T* model_path,
+                                                 const SessionOptions& options) {
+  OrtSession* session = nullptr;
+  ThrowOnError(GetModelEditorApi().CreateModelEditorSession(env, model_path, options, &session));
+  return Session(session);
+}
+
+// static
+inline Session Session::CreateModelEditorSession(const Env& env, const void* model_data, size_t model_data_length,
+                                                 const SessionOptions& options) {
+  OrtSession* session = nullptr;
+  ThrowOnError(GetModelEditorApi().CreateModelEditorSessionFromArray(env, model_data, model_data_length, options,
+                                                                     &session));
+  return Session(session);
+}
+
+void FinalizeModelEditorSession(const Model& model, const SessionOptions& options,
+                                OrtPrepackedWeightsContainer* prepacked_weights_container);
+#endif  // #if !defined(ORT_MINIMAL_BUILD)
+
+inline AllocatedStringPtr ModelMetadata::GetProducerNameAllocated(OrtAllocator* allocator) const {
+  char* out;
+  ThrowOnError(GetApi().ModelMetadataGetProducerName(p_, allocator, &out));
+  return AllocatedStringPtr(out, detail::AllocatedFree(allocator));
+}
+
+inline AllocatedStringPtr ModelMetadata::GetGraphNameAllocated(OrtAllocator* allocator) const {
+  char* out;
+  ThrowOnError(GetApi().ModelMetadataGetGraphName(p_, allocator, &out));
+  return AllocatedStringPtr(out, detail::AllocatedFree(allocator));
+}
+
+inline AllocatedStringPtr ModelMetadata::GetDomainAllocated(OrtAllocator* allocator) const {
+  char* out;
+  ThrowOnError(GetApi().ModelMetadataGetDomain(p_, allocator, &out));
+  return AllocatedStringPtr(out, detail::AllocatedFree(allocator));
+}
+
+inline AllocatedStringPtr Ort::ModelMetadata::GetDescriptionAllocated(OrtAllocator* allocator) const {
+  char* out;
+  ThrowOnError(GetApi().ModelMetadataGetDescription(p_, allocator, &out));
+  return AllocatedStringPtr(out, detail::AllocatedFree(allocator));
+}
+
+inline AllocatedStringPtr ModelMetadata::GetGraphDescriptionAllocated(OrtAllocator* allocator) const {
+  char* out;
+  ThrowOnError(GetApi().ModelMetadataGetGraphDescription(p_, allocator, &out));
+  return AllocatedStringPtr(out, detail::AllocatedFree(allocator));
+}
+
+inline AllocatedStringPtr ModelMetadata::LookupCustomMetadataMapAllocated(const char* key, OrtAllocator* allocator) const {
+  char* out;
+  ThrowOnError(GetApi().ModelMetadataLookupCustomMetadataMap(p_, allocator, key, &out));
+  return AllocatedStringPtr(out, detail::AllocatedFree(allocator));
+}
+
+inline std::vector<AllocatedStringPtr> ModelMetadata::GetCustomMetadataMapKeysAllocated(OrtAllocator* allocator) const {
+  auto deletor = detail::AllocatedFree(allocator);
+  std::vector<AllocatedStringPtr> result;
+
+  char** out = nullptr;
+  int64_t num_keys = 0;
+  ThrowOnError(GetApi().ModelMetadataGetCustomMetadataMapKeys(p_, allocator, &out, &num_keys));
+  if (num_keys <= 0) {
+    return result;
+  }
+
+  // array of pointers will be freed
+  std::unique_ptr<void, decltype(deletor)> array_guard(out, deletor);
+  // reserve may throw
+  auto strings_deletor = [&deletor, num_keys](char** out) { for(int64_t i = 0; i < num_keys; ++i) deletor(out[i]); };
+  std::unique_ptr<char*, decltype(strings_deletor)> strings_guard(out, strings_deletor);
+  result.reserve(static_cast<size_t>(num_keys));
+  strings_guard.release();
+  for (int64_t i = 0; i < num_keys; ++i) {
+    result.push_back(AllocatedStringPtr(out[i], deletor));
+  }
+
+  return result;
+}
+
+inline int64_t ModelMetadata::GetVersion() const {
+  int64_t out;
+  ThrowOnError(GetApi().ModelMetadataGetVersion(p_, &out));
+  return out;
+}
+
+inline TensorTypeAndShapeInfo::TensorTypeAndShapeInfo(ONNXTensorElementDataType element_type,
+                                                      const std::vector<int64_t>& dims,
+                                                      const std::vector<std::string>* symbolic_dims) {
+  ThrowOnError(GetApi().CreateTensorTypeAndShapeInfo(&p_));
+  ThrowOnError(GetApi().SetTensorElementType(p_, element_type));
+  ThrowOnError(GetApi().SetDimensions(p_, dims.data(), dims.size()));
+
+  if (symbolic_dims) {
+    std::vector<const char*> symbolic_dims_cstr;
+    symbolic_dims_cstr.reserve(symbolic_dims->size());
+    std::transform(symbolic_dims->begin(), symbolic_dims->end(), std::back_inserter(symbolic_dims_cstr),
+                   [](const std::string& s) { return s.c_str(); });
+    ThrowOnError(GetApi().SetSymbolicDimensions(p_, symbolic_dims_cstr.data(), symbolic_dims_cstr.size()));
+  }
+}
+
+#if !defined(ORT_MINIMAL_BUILD)
+// static
+inline TypeInfo TypeInfo::CreateTensorInfo(ConstTensorTypeAndShapeInfo tensor_type_and_shape_info) {
+  OrtTypeInfo* output = nullptr;
+  ThrowOnError(GetModelEditorApi().CreateTensorTypeInfo(tensor_type_and_shape_info, &output));
+  return TypeInfo{output};
+}
+
+// static
+inline TypeInfo TypeInfo::CreateSparseTensorInfo(ConstTensorTypeAndShapeInfo sparse_tensor_type_and_shape_info) {
+  OrtTypeInfo* output = nullptr;
+  ThrowOnError(GetModelEditorApi().CreateSparseTensorTypeInfo(sparse_tensor_type_and_shape_info, &output));
+  return TypeInfo{output};
+}
+
+// static
+inline TypeInfo TypeInfo::CreateSequenceTypeInfo(ConstTypeInfo sequence_type) {
+  OrtTypeInfo* output;
+  ThrowOnError(GetModelEditorApi().CreateSequenceTypeInfo(sequence_type, &output));
+  return TypeInfo{output};
+}
+
+// static
+inline TypeInfo TypeInfo::CreateMapTypeInfo(ONNXTensorElementDataType key_type, ConstTypeInfo value_type) {
+  OrtTypeInfo* output;
+  ThrowOnError(GetModelEditorApi().CreateMapTypeInfo(key_type, value_type, &output));
+  return TypeInfo{output};
+}
+
+// static
+inline TypeInfo TypeInfo::CreateOptionalTypeInfo(ConstTypeInfo contained_type) {
+  OrtTypeInfo* output;
+  ThrowOnError(GetModelEditorApi().CreateOptionalTypeInfo(contained_type, &output));
+  return TypeInfo{output};
+}
+#endif  // #if !defined(ORT_MINIMAL_BUILD)
+
+namespace detail {
+
+template <typename T>
+inline ONNXTensorElementDataType TensorTypeAndShapeInfoImpl<T>::GetElementType() const {
+  ONNXTensorElementDataType out;
+  ThrowOnError(GetApi().GetTensorElementType(this->p_, &out));
+  return out;
+}
+
+template <typename T>
+inline size_t TensorTypeAndShapeInfoImpl<T>::GetElementCount() const {
+  size_t out;
+  ThrowOnError(GetApi().GetTensorShapeElementCount(this->p_, &out));
+  return static_cast<size_t>(out);
+}
+
+template <typename T>
+inline size_t TensorTypeAndShapeInfoImpl<T>::GetDimensionsCount() const {
+  size_t out;
+  ThrowOnError(GetApi().GetDimensionsCount(this->p_, &out));
+  return out;
+}
+
+template <typename T>
+inline void TensorTypeAndShapeInfoImpl<T>::GetDimensions(int64_t* values, size_t values_count) const {
+  ThrowOnError(GetApi().GetDimensions(this->p_, values, values_count));
+}
+
+template <typename T>
+inline void TensorTypeAndShapeInfoImpl<T>::GetSymbolicDimensions(const char** values, size_t values_count) const {
+  ThrowOnError(GetApi().GetSymbolicDimensions(this->p_, values, values_count));
+}
+
+template <typename T>
+inline std::vector<const char*> TensorTypeAndShapeInfoImpl<T>::GetSymbolicDimensions() const {
+  std::vector<const char*> out(GetDimensionsCount(), nullptr);
+  ThrowOnError(GetApi().GetSymbolicDimensions(this->p_, out.data(), out.size()));
+  return out;
+}
+
+template <typename T>
+inline std::vector<int64_t> TensorTypeAndShapeInfoImpl<T>::GetShape() const {
+  std::vector<int64_t> out(GetDimensionsCount(), -1);
+  ThrowOnError(GetApi().GetDimensions(this->p_, out.data(), out.size()));
+  return out;
+}
+
+template <typename T>
+inline ConstTensorTypeAndShapeInfo TypeInfoImpl<T>::GetTensorTypeAndShapeInfo() const {
+  const OrtTensorTypeAndShapeInfo* out;
+  ThrowOnError(GetApi().CastTypeInfoToTensorInfo(this->p_, &out));
+  return ConstTensorTypeAndShapeInfo{out};
+}
+
+template <typename T>
+inline ConstSequenceTypeInfo TypeInfoImpl<T>::GetSequenceTypeInfo() const {
+  const OrtSequenceTypeInfo* out;
+  ThrowOnError(GetApi().CastTypeInfoToSequenceTypeInfo(this->p_, &out));
+  return ConstSequenceTypeInfo{out};
+}
+
+template <typename T>
+inline ConstMapTypeInfo TypeInfoImpl<T>::GetMapTypeInfo() const {
+  const OrtMapTypeInfo* out;
+  ThrowOnError(GetApi().CastTypeInfoToMapTypeInfo(this->p_, &out));
+  return ConstMapTypeInfo{out};
+}
+
+template <typename T>
+inline ONNXType TypeInfoImpl<T>::GetONNXType() const {
+  ONNXType out;
+  ThrowOnError(GetApi().GetOnnxTypeFromTypeInfo(this->p_, &out));
+  return out;
+}
+
+template <typename T>
+inline TypeInfo SequenceTypeInfoImpl<T>::GetSequenceElementType() const {
+  OrtTypeInfo* output;
+  ThrowOnError(GetApi().GetSequenceElementType(this->p_, &output));
+  return TypeInfo{output};
+}
+
+template <typename T>
+inline TypeInfo OptionalTypeInfoImpl<T>::GetOptionalElementType() const {
+  OrtTypeInfo* info;
+  ThrowOnError(GetApi().GetOptionalContainedTypeInfo(this->p_, &info));
+  return TypeInfo{info};
+}
+
+template <typename T>
+inline ONNXTensorElementDataType MapTypeInfoImpl<T>::GetMapKeyType() const {
+  ONNXTensorElementDataType out;
+  ThrowOnError(GetApi().GetMapKeyType(this->p_, &out));
+  return out;
+}
+
+template <typename T>
+inline TypeInfo MapTypeInfoImpl<T>::GetMapValueType() const {
+  OrtTypeInfo* output;
+  ThrowOnError(GetApi().GetMapValueType(this->p_, &output));
+  return TypeInfo{output};
+}
+
+template <typename T>
+inline ConstOptionalTypeInfo TypeInfoImpl<T>::GetOptionalTypeInfo() const {
+  const OrtOptionalTypeInfo* info;
+  ThrowOnError(GetApi().CastTypeInfoToOptionalTypeInfo(this->p_, &info));
+  return ConstOptionalTypeInfo{info};
+}
+
+}  // namespace detail
+
+namespace detail {
+
+template <typename T>
+template <typename R>
+inline void ConstValueImpl<T>::GetOpaqueData(const char* domain, const char* type_name, R& out) const {
+  ThrowOnError(GetApi().GetOpaqueValue(domain, type_name, this->p_, &out, sizeof(R)));
+}
+
+template <typename T>
+inline bool ConstValueImpl<T>::IsTensor() const {
+  int out;
+  ThrowOnError(GetApi().IsTensor(this->p_, &out));
+  return out != 0;
+}
+
+template <typename T>
+inline bool ConstValueImpl<T>::HasValue() const {
+  int out;
+  ThrowOnError(GetApi().HasValue(this->p_, &out));
+  return out != 0;
+}
+
+template <typename T>
+inline size_t ConstValueImpl<T>::GetCount() const {
+  size_t out;
+  ThrowOnError(GetApi().GetValueCount(this->p_, &out));
+  return out;
+}
+
+template <typename T>
+inline Value ConstValueImpl<T>::GetValue(int index, OrtAllocator* allocator) const {
+  OrtValue* out;
+  ThrowOnError(GetApi().GetValue(this->p_, index, allocator, &out));
+  return Value{out};
+}
+
+template <typename T>
+inline size_t ConstValueImpl<T>::GetStringTensorDataLength() const {
+  size_t out;
+  ThrowOnError(GetApi().GetStringTensorDataLength(this->p_, &out));
+  return out;
+}
+
+template <typename T>
+inline size_t ConstValueImpl<T>::GetStringTensorElementLength(size_t element_index) const {
+  size_t out;
+  ThrowOnError(GetApi().GetStringTensorElementLength(this->p_, element_index, &out));
+  return out;
+}
+
+template <typename T>
+template <typename R>
+inline const R* ConstValueImpl<T>::GetTensorData() const {
+  R* out;
+  ThrowOnError(GetApi().GetTensorMutableData(const_cast<OrtValue*>(this->p_), (void**)&out));
+  return out;
+}
+
+template <typename T>
+inline const void* ConstValueImpl<T>::GetTensorRawData() const {
+  void* out;
+  ThrowOnError(GetApi().GetTensorMutableData(const_cast<OrtValue*>(this->p_), &out));
+  return out;
+}
+
+template <typename T>
+inline TypeInfo ConstValueImpl<T>::GetTypeInfo() const {
+  OrtTypeInfo* output;
+  ThrowOnError(GetApi().GetTypeInfo(this->p_, &output));
+  return TypeInfo{output};
+}
+
+template <typename T>
+inline TensorTypeAndShapeInfo ConstValueImpl<T>::GetTensorTypeAndShapeInfo() const {
+  OrtTensorTypeAndShapeInfo* output;
+  ThrowOnError(GetApi().GetTensorTypeAndShape(this->p_, &output));
+  return TensorTypeAndShapeInfo{output};
+}
+
+template <typename T>
+inline ConstMemoryInfo ConstValueImpl<T>::GetTensorMemoryInfo() const {
+  const OrtMemoryInfo* mem_info;
+  ThrowOnError(GetApi().GetTensorMemoryInfo(this->p_, &mem_info));
+  return ConstMemoryInfo(mem_info);
+}
+
+template <typename T>
+inline void ConstValueImpl<T>::GetStringTensorElement(size_t buffer_length, size_t element_index, void* buffer) const {
+  ThrowOnError(GetApi().GetStringTensorElement(this->p_, buffer_length, element_index, buffer));
+}
+
+template <typename T>
+inline std::string ConstValueImpl<T>::GetStringTensorElement(size_t element_index) const {
+  size_t buffer_length;
+  ThrowOnError(GetApi().GetStringTensorElementLength(this->p_, element_index, &buffer_length));
+
+  std::string s;
+  s.resize(buffer_length);
+  ThrowOnError(GetApi().GetStringTensorElement(this->p_, buffer_length, element_index, &s[0]));
+  return s;
+}
+
+template <typename T>
+inline void ConstValueImpl<T>::GetStringTensorContent(void* buffer, size_t buffer_length, size_t* offsets, size_t offsets_count) const {
+  ThrowOnError(GetApi().GetStringTensorContent(this->p_, buffer, buffer_length, offsets, offsets_count));
+}
+
+#if !defined(DISABLE_SPARSE_TENSORS)
+template <typename T>
+inline OrtSparseFormat ConstValueImpl<T>::GetSparseFormat() const {
+  OrtSparseFormat format;
+  ThrowOnError(GetApi().GetSparseTensorFormat(this->p_, &format));
+  return format;
+}
+
+template <typename T>
+inline TensorTypeAndShapeInfo ConstValueImpl<T>::GetSparseTensorValuesTypeAndShapeInfo() const {
+  OrtTensorTypeAndShapeInfo* output;
+  ThrowOnError(GetApi().GetSparseTensorValuesTypeAndShape(this->p_, &output));
+  return TensorTypeAndShapeInfo{output};
+}
+
+template <typename T>
+inline TensorTypeAndShapeInfo ConstValueImpl<T>::GetSparseTensorIndicesTypeShapeInfo(OrtSparseIndicesFormat indices_format) const {
+  OrtTensorTypeAndShapeInfo* output;
+  ThrowOnError(GetApi().GetSparseTensorIndicesTypeShape(this->p_, indices_format, &output));
+  return TensorTypeAndShapeInfo{output};
+}
+
+template <typename T>
+template <typename R>
+inline const R* ConstValueImpl<T>::GetSparseTensorIndicesData(OrtSparseIndicesFormat indices_format, size_t& num_indices) const {
+  const void* out;
+  ThrowOnError(GetApi().GetSparseTensorIndices(this->p_, indices_format, &num_indices, &out));
+  return reinterpret_cast<const R*>(out);
+}
+
+template <typename T>
+inline bool ConstValueImpl<T>::IsSparseTensor() const {
+  int out;
+  ThrowOnError(GetApi().IsSparseTensor(this->p_, &out));
+  return out != 0;
+}
+
+template <typename T>
+template <typename R>
+inline const R* ConstValueImpl<T>::GetSparseTensorValues() const {
+  const void* out;
+  ThrowOnError(GetApi().GetSparseTensorValues(this->p_, &out));
+  return reinterpret_cast<const R*>(out);
+}
+
+#endif
+
+template <typename T>
+void ValueImpl<T>::FillStringTensor(const char* const* s, size_t s_len) {
+  ThrowOnError(GetApi().FillStringTensor(this->p_, s, s_len));
+}
+
+template <typename T>
+void ValueImpl<T>::FillStringTensorElement(const char* s, size_t index) {
+  ThrowOnError(GetApi().FillStringTensorElement(this->p_, s, index));
+}
+
+template <typename T>
+inline char* ValueImpl<T>::GetResizedStringTensorElementBuffer(size_t index, size_t buffer_length) {
+  char* result;
+  ThrowOnError(GetApi().GetResizedStringTensorElementBuffer(this->p_, index, buffer_length, &result));
+  return result;
+}
+
+template <typename T>
+void* ValueImpl<T>::GetTensorMutableRawData() {
+  void* out;
+  ThrowOnError(GetApi().GetTensorMutableData(this->p_, &out));
+  return out;
+}
+
+template <typename T>
+template <typename R>
+R* ValueImpl<T>::GetTensorMutableData() {
+  R* out;
+  ThrowOnError(GetApi().GetTensorMutableData(this->p_, (void**)&out));
+  return out;
+}
+
+template <typename T>
+template <typename R>
+R& ValueImpl<T>::At(const std::vector<int64_t>& location) {
+  static_assert(!std::is_same<T, std::string>::value, "this api does not support std::string");
+  R* out;
+  ThrowOnError(GetApi().TensorAt(this->p_, location.data(), location.size(), (void**)&out));
+  return *out;
+}
+
+#if !defined(DISABLE_SPARSE_TENSORS)
+template <typename T>
+void ValueImpl<T>::UseCooIndices(int64_t* indices_data, size_t indices_num) {
+  ThrowOnError(GetApi().UseCooIndices(this->p_, indices_data, indices_num));
+}
+
+template <typename T>
+void ValueImpl<T>::UseCsrIndices(int64_t* inner_data, size_t inner_num, int64_t* outer_data, size_t outer_num) {
+  ThrowOnError(GetApi().UseCsrIndices(this->p_, inner_data, inner_num, outer_data, outer_num));
+}
+
+template <typename T>
+void ValueImpl<T>::UseBlockSparseIndices(const Shape& indices_shape, int32_t* indices_data) {
+  ThrowOnError(GetApi().UseBlockSparseIndices(this->p_, indices_shape.shape, indices_shape.shape_len, indices_data));
+}
+
+template <typename T>
+void ValueImpl<T>::FillSparseTensorCoo(const OrtMemoryInfo* mem_info, const OrtSparseValuesParam& values_param,
+                                       const int64_t* indices_data, size_t indices_num) {
+  ThrowOnError(GetApi().FillSparseTensorCoo(this->p_, mem_info, values_param.values_shape,
+                                            values_param.values_shape_len, values_param.data.p_data,
+                                            indices_data, indices_num));
+}
+
+template <typename T>
+void ValueImpl<T>::FillSparseTensorCsr(const OrtMemoryInfo* data_mem_info,
+                                       const OrtSparseValuesParam& values,
+                                       const int64_t* inner_indices_data, size_t inner_indices_num,
+                                       const int64_t* outer_indices_data, size_t outer_indices_num) {
+  ThrowOnError(GetApi().FillSparseTensorCsr(this->p_, data_mem_info, values.values_shape, values.values_shape_len, values.data.p_data,
+                                            inner_indices_data, inner_indices_num,
+                                            outer_indices_data, outer_indices_num));
+}
+
+template <typename T>
+void ValueImpl<T>::FillSparseTensorBlockSparse(const OrtMemoryInfo* data_mem_info,
+                                               const OrtSparseValuesParam& values,
+                                               const Shape& indices_shape,
+                                               const int32_t* indices_data) {
+  ThrowOnError(GetApi().FillSparseTensorBlockSparse(this->p_, data_mem_info, values.values_shape, values.values_shape_len, values.data.p_data,
+                                                    indices_shape.shape, indices_shape.shape_len,
+                                                    indices_data));
+}
+
+#endif  // !defined(DISABLE_SPARSE_TENSORS)
+
+}  // namespace detail
+
+template <typename T>
+inline Value Value::CreateTensor(const OrtMemoryInfo* info, T* p_data, size_t p_data_element_count,
+                                 const int64_t* shape, size_t shape_len) {
+  return CreateTensor(info, p_data, p_data_element_count * sizeof(T), shape, shape_len, TypeToTensorType<T>::type);
+}
+
+inline Value Value::CreateTensor(const OrtMemoryInfo* info, void* p_data, size_t p_data_byte_count,
+                                 const int64_t* shape, size_t shape_len,
+                                 ONNXTensorElementDataType type) {
+  OrtValue* out;
+  ThrowOnError(GetApi().CreateTensorWithDataAsOrtValue(info, p_data, p_data_byte_count, shape, shape_len, type, &out));
+  return Value{out};
+}
+
+inline Value Value::CreateTensor(OrtAllocator* deleter, void* p_data, size_t p_data_byte_count,
+                                 const int64_t* shape, size_t shape_len,
+                                 ONNXTensorElementDataType type) {
+  OrtValue* out;
+  ThrowOnError(GetApi().CreateTensorWithDataAndDeleterAsOrtValue(deleter, p_data, p_data_byte_count,
+                                                                 shape, shape_len, type, &out));
+  return Value{out};
+}
+
+template <typename T>
+inline Value Value::CreateTensor(OrtAllocator* allocator, const int64_t* shape, size_t shape_len) {
+  return CreateTensor(allocator, shape, shape_len, TypeToTensorType<T>::type);
+}
+
+inline Value Value::CreateTensor(OrtAllocator* allocator, const int64_t* shape, size_t shape_len,
+                                 ONNXTensorElementDataType type) {
+  OrtValue* out;
+  ThrowOnError(GetApi().CreateTensorAsOrtValue(allocator, shape, shape_len, type, &out));
+  return Value{out};
+}
+
+#if !defined(DISABLE_SPARSE_TENSORS)
+
+template <typename T>
+inline Value Value::CreateSparseTensor(const OrtMemoryInfo* info, T* p_data, const Shape& dense_shape,
+                                       const Shape& values_shape) {
+  return CreateSparseTensor(info, p_data, dense_shape, values_shape, TypeToTensorType<T>::type);
+}
+
+inline Value Value::CreateSparseTensor(const OrtMemoryInfo* info, void* p_data, const Shape& dense_shape,
+                                       const Shape& values_shape, ONNXTensorElementDataType type) {
+  OrtValue* out;
+  ThrowOnError(GetApi().CreateSparseTensorWithValuesAsOrtValue(info, p_data, dense_shape.shape, dense_shape.shape_len,
+                                                               values_shape.shape, values_shape.shape_len, type,
+                                                               &out));
+  return Value{out};
+}
+
+template <typename T>
+inline Value Value::CreateSparseTensor(OrtAllocator* allocator, const Shape& dense_shape) {
+  return CreateSparseTensor(allocator, dense_shape, TypeToTensorType<T>::type);
+}
+
+inline Value Value::CreateSparseTensor(OrtAllocator* allocator, const Shape& dense_shape,
+                                       ONNXTensorElementDataType type) {
+  OrtValue* out;
+  ThrowOnError(GetApi().CreateSparseTensorAsOrtValue(allocator, dense_shape.shape, dense_shape.shape_len, type, &out));
+  return Value{out};
+}
+#endif  // !defined(DISABLE_SPARSE_TENSORS)
+
+inline Value Value::CreateMap(const Value& keys, const Value& values) {
+  OrtValue* out;
+  const OrtValue* inputs[2] = {keys, values};
+  ThrowOnError(GetApi().CreateValue(inputs, 2, ONNX_TYPE_MAP, &out));
+  return Value{out};
+}
+
+inline Value Value::CreateSequence(const std::vector<Value>& values) {
+  OrtValue* out;
+  std::vector<const OrtValue*> values_ort{values.data(), values.data() + values.size()};
+  ThrowOnError(GetApi().CreateValue(values_ort.data(), values_ort.size(), ONNX_TYPE_SEQUENCE, &out));
+  return Value{out};
+}
+
+template <typename T>
+inline Value Value::CreateOpaque(const char* domain, const char* type_name, const T& data_container) {
+  OrtValue* out;
+  ThrowOnError(GetApi().CreateOpaqueValue(domain, type_name, &data_container, sizeof(T), &out));
+  return Value{out};
+}
+
+//
+// Custom OP Inlines
+//
+inline Logger::Logger(const OrtLogger* logger) : logger_(logger) {
+  Ort::ThrowOnError(GetApi().Logger_GetLoggingSeverityLevel(this->logger_, &this->cached_severity_level_));
+}
+
+inline OrtLoggingLevel Logger::GetLoggingSeverityLevel() const noexcept {
+  return cached_severity_level_;
+}
+
+inline Status Logger::LogMessage(OrtLoggingLevel log_severity_level, const ORTCHAR_T* file_path, int line_number,
+                                 const char* func_name, const char* message) const noexcept {
+  OrtStatus* status = GetApi().Logger_LogMessage(logger_, log_severity_level, message, file_path, line_number,
+                                                 func_name);
+  return Status{status};
+}
+
+// Disable warnings about the format string not being a literal (-Wformat-nonliteral and -Wformat-security)
+// for gcc and clang. The alternative is to use actual C-style variadic parameters and apply
+// __attribute__(format(printf...)), which does not work with variadic templates.
+#if defined(__GNUC__)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat-nonliteral"
+#pragma GCC diagnostic ignored "-Wformat-security"
+#elif defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wformat-nonliteral"
+#pragma clang diagnostic ignored "-Wformat-security"
+#endif
+template <typename... Args>
+inline Status Logger::LogFormattedMessage(OrtLoggingLevel log_severity_level, const ORTCHAR_T* file_path,
+                                          int line_number, const char* func_name, const char* format,
+                                          Args&&... args) const noexcept {
+  int msg_len = std::snprintf(nullptr, 0U, format, std::forward<Args>(args)...);
+
+  if (msg_len < 0) {  // Formatting error
+    return Status("Failed to log message due to formatting error", OrtErrorCode::ORT_FAIL);
+  }
+
+  OrtStatus* status = nullptr;
+  const size_t buffer_size = static_cast<size_t>(msg_len) + 1U;
+
+  constexpr size_t kStackBufferSize = 1024;
+
+  if (buffer_size < kStackBufferSize) {
+    char buffer[kStackBufferSize];
+    snprintf(buffer, kStackBufferSize, format, std::forward<Args>(args)...);
+    status = GetApi().Logger_LogMessage(logger_, log_severity_level, buffer, file_path, line_number, func_name);
+  } else {
+    // std::make_unique is only supported starting at C++14.
+#if (__cplusplus >= 201402L) || (_MSC_VER >= 1900)
+    auto buffer = std::make_unique<char[]>(buffer_size);
+#else
+    std::unique_ptr<char[]> buffer(new char[buffer_size]);
+#endif
+    std::snprintf(buffer.get(), buffer_size, format, std::forward<Args>(args)...);
+    status = GetApi().Logger_LogMessage(logger_, log_severity_level, buffer.get(), file_path, line_number, func_name);
+  }
+
+  return Status{status};
+}
+// Re-enable -Wformat-nonliteral and -Wformat-security
+#if defined(__GNUC__)
+#pragma GCC diagnostic pop
+#elif defined(__clang__)
+#pragma clang diagnostic pop
+#endif
+
+inline KernelContext::KernelContext(OrtKernelContext* context) : ctx_(context) {
+}
+
+inline size_t KernelContext::GetInputCount() const {
+  size_t out = 0;
+  Ort::ThrowOnError(GetApi().KernelContext_GetInputCount(ctx_, &out));
+  return out;
+}
+
+inline size_t KernelContext::GetOutputCount() const {
+  size_t out = 0;
+  Ort::ThrowOnError(GetApi().KernelContext_GetOutputCount(ctx_, &out));
+  return out;
+}
+
+inline ConstValue KernelContext::GetInput(size_t index) const {
+  const OrtValue* out = nullptr;
+  Ort::ThrowOnError(GetApi().KernelContext_GetInput(ctx_, index, &out));
+  return ConstValue{out};
+}
+
+inline UnownedValue KernelContext::GetOutput(size_t index, const int64_t* dim_values, size_t dim_count) const {
+  OrtValue* out = nullptr;
+  Ort::ThrowOnError(GetApi().KernelContext_GetOutput(ctx_, index, dim_values, dim_count, &out));
+  return UnownedValue(out);
+}
+
+inline UnownedValue KernelContext::GetOutput(size_t index, const std::vector<int64_t>& dims) const {
+  OrtValue* out = nullptr;
+  Ort::ThrowOnError(GetApi().KernelContext_GetOutput(ctx_, index, dims.data(), dims.size(), &out));
+  return UnownedValue(out);
+}
+
+inline void* KernelContext::GetGPUComputeStream() const {
+  void* out = nullptr;
+  Ort::ThrowOnError(GetApi().KernelContext_GetGPUComputeStream(ctx_, &out));
+  return out;
+}
+
+inline OrtAllocator* KernelContext::GetAllocator(const OrtMemoryInfo& memory_info) const {
+  OrtAllocator* out = nullptr;
+  Ort::ThrowOnError(GetApi().KernelContext_GetAllocator(ctx_, &memory_info, &out));
+  return out;
+}
+
+inline Logger KernelContext::GetLogger() const {
+  const OrtLogger* out = nullptr;
+  ThrowOnError(GetApi().KernelContext_GetLogger(this->ctx_, &out));
+  return Logger{out};
+}
+
+inline void KernelContext::ParallelFor(void (*fn)(void*, size_t), size_t total, size_t num_batch, void* usr_data) const {
+  ThrowOnError(GetApi().KernelContext_ParallelFor(ctx_, fn, total, num_batch, usr_data));
+}
+
+inline OpAttr::OpAttr(const char* name, const void* data, int len, OrtOpAttrType type) {
+  Ort::ThrowOnError(GetApi().CreateOpAttr(name, data, len, type, &p_));
+}
+
+namespace detail {
+template <typename T>
+inline KernelInfo KernelInfoImpl<T>::Copy() const {
+  OrtKernelInfo* info_copy = nullptr;
+  Ort::ThrowOnError(GetApi().CopyKernelInfo(this->p_, &info_copy));
+  return KernelInfo{info_copy};
+}
+
+template <typename T>
+inline size_t KernelInfoImpl<T>::GetInputCount() const {
+  size_t out = 0;
+  ThrowOnError(GetApi().KernelInfo_GetInputCount(this->p_, &out));
+  return out;
+}
+
+template <typename T>
+inline size_t KernelInfoImpl<T>::GetOutputCount() const {
+  size_t out = 0;
+  ThrowOnError(GetApi().KernelInfo_GetOutputCount(this->p_, &out));
+  return out;
+}
+
+template <typename T>
+inline std::string KernelInfoImpl<T>::GetInputName(size_t index) const {
+  size_t size = 0;
+
+  // Feed nullptr for the data buffer to query the true size of the string value
+  Ort::ThrowOnError(GetApi().KernelInfo_GetInputName(this->p_, index, nullptr, &size));
+
+  std::string out;
+  out.resize(size);
+  Ort::ThrowOnError(GetApi().KernelInfo_GetInputName(this->p_, index, &out[0], &size));
+  out.resize(size - 1);  // remove the terminating character '\0'
+
+  return out;
+}
+
+template <typename T>
+inline std::string KernelInfoImpl<T>::GetOutputName(size_t index) const {
+  size_t size = 0;
+
+  // Feed nullptr for the data buffer to query the true size of the string value
+  Ort::ThrowOnError(GetApi().KernelInfo_GetOutputName(this->p_, index, nullptr, &size));
+
+  std::string out;
+  out.resize(size);
+  Ort::ThrowOnError(GetApi().KernelInfo_GetOutputName(this->p_, index, &out[0], &size));
+  out.resize(size - 1);  // remove the terminating character '\0'
+
+  return out;
+}
+
+template <typename T>
+inline TypeInfo KernelInfoImpl<T>::GetInputTypeInfo(size_t index) const {
+  OrtTypeInfo* out = nullptr;
+  ThrowOnError(GetApi().KernelInfo_GetInputTypeInfo(this->p_, index, &out));
+  return TypeInfo{out};
+}
+
+template <typename T>
+inline TypeInfo KernelInfoImpl<T>::GetOutputTypeInfo(size_t index) const {
+  OrtTypeInfo* out = nullptr;
+  ThrowOnError(GetApi().KernelInfo_GetOutputTypeInfo(this->p_, index, &out));
+  return TypeInfo{out};
+}
+
+template <typename T>
+inline Value KernelInfoImpl<T>::GetTensorAttribute(const char* name, OrtAllocator* allocator) const {
+  OrtValue* out = nullptr;
+  ThrowOnError(GetApi().KernelInfoGetAttribute_tensor(this->p_, name, allocator, &out));
+  return Value{out};
+}
+
+template <typename T>
+inline ConstValue KernelInfoImpl<T>::GetTensorConstantInput(size_t index, int* is_constant) const {
+  const OrtValue* out = nullptr;
+  ThrowOnError(GetApi().KernelInfoGetConstantInput_tensor(this->p_, index, is_constant, &out));
+  return ConstValue{out};
+}
+
+template <typename T>
+inline std::string KernelInfoImpl<T>::GetNodeName() const {
+  size_t size = 0;
+
+  // Feed nullptr for the data buffer to query the true size of the string value
+  Ort::ThrowOnError(GetApi().KernelInfo_GetNodeName(this->p_, nullptr, &size));
+
+  std::string out;
+  out.resize(size);
+  Ort::ThrowOnError(GetApi().KernelInfo_GetNodeName(this->p_, &out[0], &size));
+  out.resize(size - 1);  // remove the terminating character '\0'
+
+  return out;
+}
+
+template <typename T>
+inline Logger KernelInfoImpl<T>::GetLogger() const {
+  const OrtLogger* out = nullptr;
+  ThrowOnError(GetApi().KernelInfo_GetLogger(this->p_, &out));
+  return Logger{out};
+}
+
+inline void attr_utils::GetAttr(const OrtKernelInfo* p, const char* name, float& out) {
+  Ort::ThrowOnError(GetApi().KernelInfoGetAttribute_float(p, name, &out));
+}
+
+inline void attr_utils::GetAttr(const OrtKernelInfo* p, const char* name, int64_t& out) {
+  Ort::ThrowOnError(GetApi().KernelInfoGetAttribute_int64(p, name, &out));
+}
+
+inline void attr_utils::GetAttr(const OrtKernelInfo* p, const char* name, std::string& result) {
+  size_t size = 0;
+  // Feed nullptr for the data buffer to query the true size of the string attribute
+  Ort::ThrowOnError(GetApi().KernelInfoGetAttribute_string(p, name, nullptr, &size));
+
+  std::string out;
+  out.resize(size);
+  Ort::ThrowOnError(GetApi().KernelInfoGetAttribute_string(p, name, &out[0], &size));
+  out.resize(size - 1);  // remove the terminating character '\0'
+  out.swap(result);
+}
+
+inline void attr_utils::GetAttrs(const OrtKernelInfo* p, const char* name, std::vector<float>& result) {
+  size_t size = 0;
+  // Feed nullptr for the data buffer to query the true size of the attribute
+  Ort::ThrowOnError(GetApi().KernelInfoGetAttributeArray_float(p, name, nullptr, &size));
+
+  std::vector<float> out;
+  out.resize(size);
+  Ort::ThrowOnError(GetApi().KernelInfoGetAttributeArray_float(p, name, out.data(), &size));
+  out.swap(result);
+}
+
+inline void attr_utils::GetAttrs(const OrtKernelInfo* p, const char* name, std::vector<int64_t>& result) {
+  size_t size = 0;
+
+  // Feed nullptr for the data buffer to query the true size of the attribute
+  Ort::ThrowOnError(GetApi().KernelInfoGetAttributeArray_int64(p, name, nullptr, &size));
+
+  std::vector<int64_t> out;
+  out.resize(size);
+  Ort::ThrowOnError(GetApi().KernelInfoGetAttributeArray_int64(p, name, out.data(), &size));
+  out.swap(result);
+}
+}  // namespace detail
+
+inline KernelInfo::KernelInfo(OrtKernelInfo* info) : detail::KernelInfoImpl<OrtKernelInfo>{info} {}
+
+inline Op::Op(OrtOp* p) : detail::Base<OrtOp>(p) {}
+
+inline Op Op::Create(const OrtKernelInfo* info, const char* op_name, const char* domain, int version,
+                     const char** type_constraint_names,
+                     const ONNXTensorElementDataType* type_constraint_values,
+                     size_t type_constraint_count,
+                     const OpAttr* attr_values, size_t attr_count,
+                     size_t input_count, size_t output_count) {
+  static_assert(sizeof(OpAttr) == sizeof(OrtOpAttr*),
+                "OpAttr's is expected to be just an array of OrtOpAttr in memory so we can reinterpret safely");
+  auto attr_input_values = reinterpret_cast<const OrtOpAttr* const*>(attr_values);
+  OrtOp* op;
+  Ort::ThrowOnError(GetApi().CreateOp(info, op_name, domain, version, type_constraint_names, type_constraint_values,
+                                      static_cast<int>(type_constraint_count),
+                                      attr_input_values,
+                                      static_cast<int>(attr_count),
+                                      static_cast<int>(input_count),
+                                      static_cast<int>(output_count), &op));
+  return Op{op};
+}
+
+inline void Op::Invoke(const OrtKernelContext* context,
+                       const Value* input_values,
+                       size_t input_count,
+                       Value* output_values,
+                       size_t output_count) {
+  static_assert(sizeof(Value) == sizeof(OrtValue*),
+                "Value is really just an array of OrtValue* in memory, so we can reinterpret_cast safely");
+  auto ort_input_values = reinterpret_cast<const OrtValue* const*>(input_values);
+  auto ort_output_values = reinterpret_cast<OrtValue**>(output_values);
+  Ort::ThrowOnError(GetApi().InvokeOp(context, p_, ort_input_values, static_cast<int>(input_count),
+                                      ort_output_values, static_cast<int>(output_count)));
+}
+
+inline void Op::Invoke(const OrtKernelContext* context,
+                       const OrtValue* const* input_values,
+                       size_t input_count,
+                       OrtValue* const* output_values,
+                       size_t output_count) {
+  Ort::ThrowOnError(GetApi().InvokeOp(context, p_, input_values, static_cast<int>(input_count),
+                                      output_values, static_cast<int>(output_count)));
+}
+
+inline std::string GetVersionString() {
+  return OrtGetApiBase()->GetVersionString();
+}
+
+inline std::string GetBuildInfoString() {
+  return GetApi().GetBuildInfoString();
+}
+
+inline std::vector<std::string> GetAvailableProviders() {
+  char** providers;
+  int len;
+
+  auto release_fn = [&len](char** providers) {
+    // This should always return nullptr.
+    ThrowOnError(GetApi().ReleaseAvailableProviders(providers, len));
+  };
+
+  ThrowOnError(GetApi().GetAvailableProviders(&providers, &len));
+  std::unique_ptr<char*, decltype(release_fn)> guard(providers, release_fn);
+  std::vector<std::string> available_providers;
+  available_providers.reserve(static_cast<size_t>(len));
+  for (int i = 0; i < len; ++i) {
+    available_providers.emplace_back(providers[i]);
+  }
+  return available_providers;
+}
+
+template <typename TOp, typename TKernel, bool WithStatus>
+void CustomOpBase<TOp, TKernel, WithStatus>::GetSessionConfigs(std::unordered_map<std::string, std::string>& out,
+                                                               ConstSessionOptions options) const {
+  const TOp* derived = static_cast<const TOp*>(this);
+  std::vector<std::string> keys = derived->GetSessionConfigKeys();
+
+  out.reserve(keys.size());
+
+  std::string config_entry_key = detail::MakeCustomOpConfigEntryKey(derived->GetName(), "");
+  const size_t prefix_size = config_entry_key.length();
+
+  for (const auto& key : keys) {
+    config_entry_key.resize(prefix_size);
+    config_entry_key.append(key);
+    out[key] = options.GetConfigEntryOrDefault(config_entry_key.c_str(), "");
+  }
+}
+
+inline ShapeInferContext::ShapeInferContext(const OrtApi* ort_api,
+                                            OrtShapeInferContext* ctx) : ort_api_(ort_api), ctx_(ctx) {
+  size_t input_count = 0;
+  Ort::ThrowOnError(ort_api_->ShapeInferContext_GetInputCount(ctx_, &input_count));
+  for (size_t ith_input = 0; ith_input < input_count; ++ith_input) {
+    OrtTensorTypeAndShapeInfo* info{};
+    Ort::ThrowOnError(ort_api_->ShapeInferContext_GetInputTypeShape(ctx, ith_input, &info));
+    TensorTypeAndShapeInfo type_shape_info(info);
+    auto integer_shape = type_shape_info.GetShape();
+    std::vector<const char*> symbolic_shape(integer_shape.size(), {});
+    if (!integer_shape.empty()) {
+      type_shape_info.GetSymbolicDimensions(&symbolic_shape[0], integer_shape.size());
+    }
+    Shape shape;
+    for (size_t ith = 0; ith < integer_shape.size(); ++ith) {
+      if (symbolic_shape[ith] && std::string{symbolic_shape[ith]}.size() > 0) {
+        shape.emplace_back(symbolic_shape[ith]);
+      } else {
+        shape.emplace_back(integer_shape[ith]);
+      }
+    }
+    input_shapes_.push_back(std::move(shape));
+    type_shape_info.release();
+  }
+}
+
+inline Status ShapeInferContext::SetOutputShape(size_t indice, const Shape& shape, ONNXTensorElementDataType type) {
+  OrtTensorTypeAndShapeInfo* info = {};
+  ORT_CXX_RETURN_ON_API_FAIL(ort_api_->CreateTensorTypeAndShapeInfo(&info));
+  ORT_CXX_RETURN_ON_API_FAIL(ort_api_->SetTensorElementType(info, type));
+
+  using InfoPtr = std::unique_ptr<OrtTensorTypeAndShapeInfo, std::function<void(OrtTensorTypeAndShapeInfo*)>>;
+
+  InfoPtr info_ptr(info, [this](OrtTensorTypeAndShapeInfo* obj) {
+    ort_api_->ReleaseTensorTypeAndShapeInfo(obj);
+  });
+
+  std::vector<int64_t> integer_dims;
+  std::vector<const char*> symbolic_dims;
+
+  for (const auto dim : shape) {
+    if (dim.IsInt()) {
+      integer_dims.push_back(dim.AsInt());
+      symbolic_dims.push_back("");
+    } else {
+      if (!dim.AsSym() || std::string{dim.AsSym()}.empty()) {
+        ORT_CXX_API_THROW("Symbolic dim must not be an empty string", ORT_INVALID_ARGUMENT);
+      }
+      integer_dims.push_back(SymbolicInteger::INVALID_INT_DIM);
+      symbolic_dims.push_back(dim.AsSym());
+    }
+  }
+
+  ORT_CXX_RETURN_ON_API_FAIL(ort_api_->SetDimensions(info, integer_dims.data(), integer_dims.size()));
+  ORT_CXX_RETURN_ON_API_FAIL(ort_api_->SetSymbolicDimensions(info, symbolic_dims.data(), symbolic_dims.size()));
+  ORT_CXX_RETURN_ON_API_FAIL(ort_api_->ShapeInferContext_SetOutputTypeShape(ctx_, indice, info));
+  return Status{nullptr};
+}
+
+inline int64_t ShapeInferContext::GetAttrInt(const char* attr_name) {
+  const auto* attr = GetAttrHdl(attr_name);
+  int64_t i = {};
+  size_t out = {};
+  Ort::ThrowOnError(ort_api_->ReadOpAttr(attr, ORT_OP_ATTR_INT, &i, sizeof(i), &out));
+  return i;
+}
+
+inline ShapeInferContext::Ints ShapeInferContext::GetAttrInts(const char* attr_name) {
+  const auto* attr = GetAttrHdl(attr_name);
+  int64_t i = {};
+  size_t out = {};
+  // first call to get the bytes needed
+  // 1. A status == nullptr means that ReadOpAttr was successful. A status != nullptr means failure.
+  // 2. The ReadOpAttr function should normally be called twice: once to get the needed buffer size (returns a status != nullptr), and a second time to actually read the ints (returns status == null on success).
+  // 3. This code tries a subtle optimization in the first call to ReadOpAttr. It passes in a buffer (&i) of size 1 just in case there is only 1 int. In this case, status == nullptr and we need to return {i}.
+  auto status = ort_api_->ReadOpAttr(attr, ORT_OP_ATTR_INTS, &i, sizeof(i), &out);
+  if (status) {
+    size_t num_i = out / sizeof(int64_t);
+    ShapeInferContext::Ints ints(num_i, 0);
+    Ort::ThrowOnError(ort_api_->ReadOpAttr(attr, ORT_OP_ATTR_INTS, ints.data(), out, &out));
+    return ints;
+  } else {
+    if (out == 0u) {
+      return {};
+    }
+    return {i};
+  }
+}
+
+inline float ShapeInferContext::GetAttrFloat(const char* attr_name) {
+  const auto* attr = GetAttrHdl(attr_name);
+  float f = {};
+  size_t out = {};
+  Ort::ThrowOnError(ort_api_->ReadOpAttr(attr, ORT_OP_ATTR_FLOAT, &f, sizeof(f), &out));
+  return f;
+}
+
+inline ShapeInferContext::Floats ShapeInferContext::GetAttrFloats(const char* attr_name) {
+  const auto* attr = GetAttrHdl(attr_name);
+  float f = {};
+  size_t out = {};
+  // first call to get the bytes needed
+  // 1. A status == nullptr means that ReadOpAttr was successful. A status != nullptr means failure.
+  // 2. The ReadOpAttr function should normally be called twice: once to get the needed buffer size (returns a status != nullptr), and a second time to actually read the ints (returns status == null on success).
+  // 3. This code tries a subtle optimization in the first call to ReadOpAttr. It passes in a buffer (&i) of size 1 just in case there is only 1 int. In this case, status == nullptr and we need to return {i}.
+  auto status = ort_api_->ReadOpAttr(attr, ORT_OP_ATTR_FLOATS, &f, sizeof(f), &out);
+  if (status) {
+    size_t num_f = out / sizeof(float);
+    ShapeInferContext::Floats floats(num_f, 0);
+    Ort::ThrowOnError(ort_api_->ReadOpAttr(attr, ORT_OP_ATTR_FLOATS, floats.data(), out, &out));
+    return floats;
+  } else {
+    if (out == 0u) {
+      return {};
+    }
+    return {f};
+  }
+}
+
+inline std::string ShapeInferContext::GetAttrString(const char* attr_name) {
+  const auto* attr = GetAttrHdl(attr_name);
+  char c = {};
+  size_t out = {};
+  // first call to get the bytes needed
+  auto status = ort_api_->ReadOpAttr(attr, ORT_OP_ATTR_STRING, &c, sizeof(char), &out);
+  if (status) {
+    std::vector<char> chars(out, '\0');
+    Ort::ThrowOnError(ort_api_->ReadOpAttr(attr, ORT_OP_ATTR_STRING, chars.data(), out, &out));
+    return {chars.data()};
+  } else {
+    return {c};
+  }
+}
+
+inline ShapeInferContext::Strings ShapeInferContext::GetAttrStrings(const char* attr_name) {
+  const auto* attr = GetAttrHdl(attr_name);
+  char c = {};
+  size_t out = {};
+  // first call to get the bytes needed
+  // 1. A status == nullptr means that ReadOpAttr was successful. A status != nullptr means failure.
+  // 2. The ReadOpAttr function should normally be called twice: once to get the needed buffer size (returns a status != nullptr), and a second time to actually read the ints (returns status == null on success).
+  // 3. This code tries a subtle optimization in the first call to ReadOpAttr. It passes in a buffer (&i) of size 1 just in case there is only 1 int. In this case, status == nullptr and we need to return {i}.
+  auto status = ort_api_->ReadOpAttr(attr, ORT_OP_ATTR_STRINGS, &c, sizeof(char), &out);
+  if (status) {
+    std::vector<char> chars(out, '\0');
+    Ort::ThrowOnError(ort_api_->ReadOpAttr(attr, ORT_OP_ATTR_STRINGS, chars.data(), out, &out));
+    ShapeInferContext::Strings strings;
+    char* char_st = chars.data();
+    char* char_ed = char_st + out;
+    while (char_st < char_ed) {
+      strings.emplace_back(char_st);
+      while (*char_st != '\0') {
+        char_st++;
+      }
+      char_st++;
+    }
+    return strings;
+  } else {
+    if (out == 0u) {
+      return {};
+    }
+    return {std::string{c}};
+  }
+}
+
+inline const OrtOpAttr* ShapeInferContext::GetAttrHdl(const char* attr_name) const {
+  const OrtOpAttr* attr_hdl = {};
+  Ort::ThrowOnError(ort_api_->ShapeInferContext_GetAttribute(ctx_, attr_name, &attr_hdl));
+  return attr_hdl;
+}
+
+namespace detail {
+inline std::vector<const char*> StringsToCharPtrs(const std::vector<std::string>& strings) {
+  std::vector<const char*> ptrs;
+  ptrs.reserve(strings.size());
+  std::transform(strings.begin(), strings.end(), std::back_inserter(ptrs),
+                 [](const std::string& s) { return s.c_str(); });
+
+  return ptrs;
+}
+}  // namespace detail
+
+#if !defined(ORT_MINIMAL_BUILD)
+// static
+inline void Node::Init(const std::string& operator_name, const std::string& operator_domain,
+                       const std::string& node_name,
+                       const std::vector<std::string>& input_names,
+                       const std::vector<std::string>& output_names,
+                       std::vector<OpAttr>& attributes,
+                       OrtNode*& node) {
+  auto inputs = detail::StringsToCharPtrs(input_names);
+  auto outputs = detail::StringsToCharPtrs(output_names);
+
+  std::vector<OrtOpAttr*> attributes_ptrs;
+  attributes_ptrs.reserve(attributes.size());
+  std::transform(attributes.begin(), attributes.end(), std::back_inserter(attributes_ptrs),
+                 [](OpAttr& attr) -> OrtOpAttr* { return attr; });
+
+  ThrowOnError(GetModelEditorApi().CreateNode(operator_name.c_str(), operator_domain.c_str(), node_name.c_str(),
+                                              inputs.data(), inputs.size(),
+                                              outputs.data(), outputs.size(),
+                                              attributes_ptrs.data(), attributes_ptrs.size(),
+                                              &node));
+
+  // Node now owns the attributes
+  std::for_each(attributes.begin(), attributes.end(), [](OpAttr& attr) { attr.release(); });
+}
+
+inline Node::Node(const std::string& operator_name, const std::string& operator_domain,
+                  const std::string& node_name,
+                  const std::vector<std::string>& input_names,
+                  const std::vector<std::string>& output_names,
+                  std::vector<OpAttr>& attributes) {
+  Init(operator_name, operator_domain, node_name, input_names, output_names, attributes, p_);
+}
+
+inline Node::Node(const std::string& operator_name, const std::string& operator_domain,
+                  const std::string& node_name,
+                  const std::vector<std::string>& input_names,
+                  const std::vector<std::string>& output_names) {
+  std::vector<OpAttr> empty_attributes;
+  Init(operator_name, operator_domain, node_name, input_names, output_names, empty_attributes, p_);
+}
+
+inline Graph::Graph() {
+  ThrowOnError(GetModelEditorApi().CreateGraph(&p_));
+}
+
+inline Model::Model(const std::vector<DomainOpsetPair>& opsets) {
+  std::vector<const char*> domains;
+  std::vector<int> versions;
+  domains.reserve(opsets.size());
+  versions.reserve(opsets.size());
+
+  for (const auto& pair : opsets) {
+    domains.push_back(pair.first.c_str());
+    versions.push_back(pair.second);
+  }
+
+  ThrowOnError(GetModelEditorApi().CreateModel(domains.data(), versions.data(), opsets.size(), &p_));
+}
+
+inline ValueInfo::ValueInfo(const std::string& name, const ConstTypeInfo& type_info) {
+  ThrowOnError(GetModelEditorApi().CreateValueInfo(name.c_str(), type_info, &p_));
+}
+#endif  // !defined(ORT_MINIMAL_BUILD)
+
+namespace detail {
+template <>
+inline std::string ValueInfoImpl<OrtValueInfo>::Name() const {
+  const char* name = nullptr;
+  ThrowOnError(GetApi().GetValueInfoName(this->p_, &name));
+  return name;
+}
+
+template <>
+inline ConstTypeInfo ValueInfoImpl<OrtValueInfo>::TypeInfo() const {
+  const OrtTypeInfo* type_info = nullptr;
+  ThrowOnError(GetApi().GetValueInfoTypeInfo(this->p_, &type_info));
+  return ConstTypeInfo{type_info};
+}
+
+#if !defined(ORT_MINIMAL_BUILD)
+template <>
+inline void GraphImpl<OrtGraph>::SetInputs(std::vector<ValueInfo>& inputs) {
+  std::vector<OrtValueInfo*> inputs_ptrs;
+  inputs_ptrs.reserve(inputs.size());
+  std::transform(inputs.begin(), inputs.end(), std::back_inserter(inputs_ptrs),
+                 [](ValueInfo& vi) -> OrtValueInfo* { return vi; });
+
+  ThrowOnError(GetModelEditorApi().SetGraphInputs(p_, inputs_ptrs.data(), inputs_ptrs.size()));
+
+  // Graph now owns the inputs
+  std::for_each(inputs.begin(), inputs.end(), [](ValueInfo& vi) { vi.release(); });
+}
+
+template <>
+inline void GraphImpl<OrtGraph>::SetOutputs(std::vector<ValueInfo>& outputs) {
+  std::vector<OrtValueInfo*> outputs_ptrs;
+  outputs_ptrs.reserve(outputs.size());
+  std::transform(outputs.begin(), outputs.end(), std::back_inserter(outputs_ptrs),
+                 [](ValueInfo& vi) -> OrtValueInfo* { return vi; });
+
+  ThrowOnError(GetModelEditorApi().SetGraphOutputs(p_, outputs_ptrs.data(), outputs_ptrs.size()));
+
+  // Graph now owns the outputs
+  std::for_each(outputs.begin(), outputs.end(), [](ValueInfo& vi) { vi.release(); });
+}
+
+template <>
+inline void GraphImpl<OrtGraph>::AddInitializer(const std::string& name, Value& initializer, bool data_is_external) {
+  // Graph takes ownership of `initializer`
+  ThrowOnError(GetModelEditorApi().AddInitializerToGraph(p_, name.c_str(), initializer.release(), data_is_external));
+}
+
+template <>
+inline void GraphImpl<OrtGraph>::AddNode(Node& node) {
+  // Graph takes ownership of `node`
+  ThrowOnError(GetModelEditorApi().AddNodeToGraph(p_, node.release()));
+}
+
+template <>
+inline void ModelImpl<OrtModel>::AddGraph(Graph& graph) {
+  // Model takes ownership of `graph`
+  ThrowOnError(GetModelEditorApi().AddGraphToModel(p_, graph.release()));
+}
+#endif  // !defined(ORT_MINIMAL_BUILD)
+
+}  // namespace detail
+}  // namespace Ort
diff --git a/3rdParty/ONNX/onnxruntime_float16.h b/3rdParty/ONNX/onnxruntime_float16.h
new file mode 100644
index 0000000000..a6923ddd43
--- /dev/null
+++ b/3rdParty/ONNX/onnxruntime_float16.h
@@ -0,0 +1,535 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+#pragma once
+
+#include <stdint.h>
+#include <cmath>
+#include <cstring>
+#include <limits>
+
+namespace onnxruntime_float16 {
+
+namespace detail {
+
+enum class endian {
+#if defined(_WIN32)
+  little = 0,
+  big = 1,
+  native = little,
+#elif defined(__GNUC__) || defined(__clang__)
+  little = __ORDER_LITTLE_ENDIAN__,
+  big = __ORDER_BIG_ENDIAN__,
+  native = __BYTE_ORDER__,
+#else
+#error onnxruntime_float16::detail::endian is not implemented in this environment.
+#endif
+};
+
+static_assert(
+    endian::native == endian::little || endian::native == endian::big,
+    "Only little-endian or big-endian native byte orders are supported.");
+
+}  // namespace detail
+
+/// <summary>
+/// Shared implementation between public and internal classes. CRTP pattern.
+/// </summary>
+template <class Derived>
+struct Float16Impl {
+ protected:
+  /// <summary>
+  /// Converts from float to uint16_t float16 representation
+  /// </summary>
+  /// <param name="v"></param>
+  /// <returns></returns>
+  constexpr static uint16_t ToUint16Impl(float v) noexcept;
+
+  /// <summary>
+  /// Converts float16 to float
+  /// </summary>
+  /// <returns>float representation of float16 value</returns>
+  float ToFloatImpl() const noexcept;
+
+  /// <summary>
+  /// Creates an instance that represents absolute value.
+  /// </summary>
+  /// <returns>Absolute value</returns>
+  uint16_t AbsImpl() const noexcept {
+    return static_cast<uint16_t>(val & ~kSignMask);
+  }
+
+  /// <summary>
+  /// Creates a new instance with the sign flipped.
+  /// </summary>
+  /// <returns>Flipped sign instance</returns>
+  uint16_t NegateImpl() const noexcept {
+    return IsNaN() ? val : static_cast<uint16_t>(val ^ kSignMask);
+  }
+
+ public:
+  // uint16_t special values
+  static constexpr uint16_t kSignMask = 0x8000U;
+  static constexpr uint16_t kBiasedExponentMask = 0x7C00U;
+  static constexpr uint16_t kPositiveInfinityBits = 0x7C00U;
+  static constexpr uint16_t kNegativeInfinityBits = 0xFC00U;
+  static constexpr uint16_t kPositiveQNaNBits = 0x7E00U;
+  static constexpr uint16_t kNegativeQNaNBits = 0xFE00U;
+  static constexpr uint16_t kMaxValueBits = 0x7BFFU;  // Largest normal number
+  static constexpr uint16_t kOneBits = 0x3C00U;
+  static constexpr uint16_t kMinusOneBits = 0xBC00U;
+
+  uint16_t val{0};
+
+  Float16Impl() = default;
+
+  /// <summary>
+  /// Checks if the value is negative
+  /// </summary>
+  /// <returns>true if negative</returns>
+  bool IsNegative() const noexcept {
+    return static_cast<int16_t>(val) < 0;
+  }
+
+  /// <summary>
+  /// Tests if the value is NaN
+  /// </summary>
+  /// <returns>true if NaN</returns>
+  bool IsNaN() const noexcept {
+    return AbsImpl() > kPositiveInfinityBits;
+  }
+
+  /// <summary>
+  /// Tests if the value is finite
+  /// </summary>
+  /// <returns>true if finite</returns>
+  bool IsFinite() const noexcept {
+    return AbsImpl() < kPositiveInfinityBits;
+  }
+
+  /// <summary>
+  /// Tests if the value represents positive infinity.
+  /// </summary>
+  /// <returns>true if positive infinity</returns>
+  bool IsPositiveInfinity() const noexcept {
+    return val == kPositiveInfinityBits;
+  }
+
+  /// <summary>
+  /// Tests if the value represents negative infinity
+  /// </summary>
+  /// <returns>true if negative infinity</returns>
+  bool IsNegativeInfinity() const noexcept {
+    return val == kNegativeInfinityBits;
+  }
+
+  /// <summary>
+  /// Tests if the value is either positive or negative infinity.
+  /// </summary>
+  /// <returns>True if absolute value is infinity</returns>
+  bool IsInfinity() const noexcept {
+    return AbsImpl() == kPositiveInfinityBits;
+  }
+
+  /// <summary>
+  /// Tests if the value is NaN or zero. Useful for comparisons.
+  /// </summary>
+  /// <returns>True if NaN or zero.</returns>
+  bool IsNaNOrZero() const noexcept {
+    auto abs = AbsImpl();
+    return (abs == 0 || abs > kPositiveInfinityBits);
+  }
+
+  /// <summary>
+  /// Tests if the value is normal (not zero, subnormal, infinite, or NaN).
+  /// </summary>
+  /// <returns>True if so</returns>
+  bool IsNormal() const noexcept {
+    auto abs = AbsImpl();
+    return (abs < kPositiveInfinityBits)           // is finite
+           && (abs != 0)                           // is not zero
+           && ((abs & kBiasedExponentMask) != 0);  // is not subnormal (has a non-zero exponent)
+  }
+
+  /// <summary>
+  /// Tests if the value is subnormal (denormal).
+  /// </summary>
+  /// <returns>True if so</returns>
+  bool IsSubnormal() const noexcept {
+    auto abs = AbsImpl();
+    return (abs < kPositiveInfinityBits)           // is finite
+           && (abs != 0)                           // is not zero
+           && ((abs & kBiasedExponentMask) == 0);  // is subnormal (has a zero exponent)
+  }
+
+  /// <summary>
+  /// Creates an instance that represents absolute value.
+  /// </summary>
+  /// <returns>Absolute value</returns>
+  Derived Abs() const noexcept { return Derived::FromBits(AbsImpl()); }
+
+  /// <summary>
+  /// Creates a new instance with the sign flipped.
+  /// </summary>
+  /// <returns>Flipped sign instance</returns>
+  Derived Negate() const noexcept { return Derived::FromBits(NegateImpl()); }
+
+  /// <summary>
+  /// IEEE defines that positive and negative zero are equal, this gives us a quick equality check
+  /// for two values by or'ing the private bits together and stripping the sign. They are both zero,
+  /// and therefore equivalent, if the resulting value is still zero.
+  /// </summary>
+  /// <param name="lhs">first value</param>
+  /// <param name="rhs">second value</param>
+  /// <returns>True if both arguments represent zero</returns>
+  static bool AreZero(const Float16Impl& lhs, const Float16Impl& rhs) noexcept {
+    return static_cast<uint16_t>((lhs.val | rhs.val) & ~kSignMask) == 0;
+  }
+
+  bool operator==(const Float16Impl& rhs) const noexcept {
+    if (IsNaN() || rhs.IsNaN()) {
+      // IEEE defines that NaN is not equal to anything, including itself.
+      return false;
+    }
+    return val == rhs.val;
+  }
+
+  bool operator!=(const Float16Impl& rhs) const noexcept { return !(*this == rhs); }
+
+  bool operator<(const Float16Impl& rhs) const noexcept {
+    if (IsNaN() || rhs.IsNaN()) {
+      // IEEE defines that NaN is unordered with respect to everything, including itself.
+      return false;
+    }
+
+    const bool left_is_negative = IsNegative();
+    if (left_is_negative != rhs.IsNegative()) {
+      // When the signs of left and right differ, we know that left is less than right if it is
+      // the negative value. The exception to this is if both values are zero, in which case IEEE
+      // says they should be equal, even if the signs differ.
+      return left_is_negative && !AreZero(*this, rhs);
+    }
+    return (val != rhs.val) && ((val < rhs.val) ^ left_is_negative);
+  }
+};
+
+// The following Float16_t conversions are based on the code from
+// Eigen library.
+
+// The conversion routines are Copyright (c) Fabian Giesen, 2016.
+// The original license follows:
+//
+// Copyright (c) Fabian Giesen, 2016
+// All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted.
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+namespace detail {
+union float32_bits {
+  unsigned int u;
+  float f;
+};
+}  // namespace detail
+
+template <class Derived>
+inline constexpr uint16_t Float16Impl<Derived>::ToUint16Impl(float v) noexcept {
+  detail::float32_bits f{};
+  f.f = v;
+
+  constexpr detail::float32_bits f32infty = {255 << 23};
+  constexpr detail::float32_bits f16max = {(127 + 16) << 23};
+  constexpr detail::float32_bits denorm_magic = {((127 - 15) + (23 - 10) + 1) << 23};
+  constexpr unsigned int sign_mask = 0x80000000u;
+  uint16_t val = static_cast<uint16_t>(0x0u);
+
+  unsigned int sign = f.u & sign_mask;
+  f.u ^= sign;
+
+  // NOTE all the integer compares in this function can be safely
+  // compiled into signed compares since all operands are below
+  // 0x80000000. Important if you want fast straight SSE2 code
+  // (since there's no unsigned PCMPGTD).
+
+  if (f.u >= f16max.u) {                         // result is Inf or NaN (all exponent bits set)
+    val = (f.u > f32infty.u) ? 0x7e00 : 0x7c00;  // NaN->qNaN and Inf->Inf
+  } else {                                       // (De)normalized number or zero
+    if (f.u < (113 << 23)) {                     // resulting FP16 is subnormal or zero
+      // use a magic value to align our 10 mantissa bits at the bottom of
+      // the float. as long as FP addition is round-to-nearest-even this
+      // just works.
+      f.f += denorm_magic.f;
+
+      // and one integer subtract of the bias later, we have our final float!
+      val = static_cast<uint16_t>(f.u - denorm_magic.u);
+    } else {
+      unsigned int mant_odd = (f.u >> 13) & 1;  // resulting mantissa is odd
+
+      // update exponent, rounding bias part 1
+      // Equivalent to `f.u += ((unsigned int)(15 - 127) << 23) + 0xfff`, but
+      // without arithmetic overflow.
+      f.u += 0xc8000fffU;
+      // rounding bias part 2
+      f.u += mant_odd;
+      // take the bits!
+      val = static_cast<uint16_t>(f.u >> 13);
+    }
+  }
+
+  val |= static_cast<uint16_t>(sign >> 16);
+  return val;
+}
+
+template <class Derived>
+inline float Float16Impl<Derived>::ToFloatImpl() const noexcept {
+  constexpr detail::float32_bits magic = {113 << 23};
+  constexpr unsigned int shifted_exp = 0x7c00 << 13;  // exponent mask after shift
+  detail::float32_bits o{};
+
+  o.u = (val & 0x7fff) << 13;            // exponent/mantissa bits
+  unsigned int exp = shifted_exp & o.u;  // just the exponent
+  o.u += (127 - 15) << 23;               // exponent adjust
+
+  // handle exponent special cases
+  if (exp == shifted_exp) {   // Inf/NaN?
+    o.u += (128 - 16) << 23;  // extra exp adjust
+  } else if (exp == 0) {      // Zero/Denormal?
+    o.u += 1 << 23;           // extra exp adjust
+    o.f -= magic.f;           // re-normalize
+  }
+
+  // Attempt to workaround the Internal Compiler Error on ARM64
+  // for bitwise | operator, including std::bitset
+#if (defined _MSC_VER) && (defined _M_ARM || defined _M_ARM64 || defined _M_ARM64EC)
+  if (IsNegative()) {
+    return -o.f;
+  }
+#else
+  // original code:
+  o.u |= (val & 0x8000U) << 16U;  // sign bit
+#endif
+  return o.f;
+}
+
+/// Shared implementation between public and internal classes. CRTP pattern.
+template <class Derived>
+struct BFloat16Impl {
+ protected:
+  /// <summary>
+  /// Converts from float to uint16_t float16 representation
+  /// </summary>
+  /// <param name="v"></param>
+  /// <returns></returns>
+  static uint16_t ToUint16Impl(float v) noexcept;
+
+  /// <summary>
+  /// Converts bfloat16 to float
+  /// </summary>
+  /// <returns>float representation of bfloat16 value</returns>
+  float ToFloatImpl() const noexcept;
+
+  /// <summary>
+  /// Creates an instance that represents absolute value.
+  /// </summary>
+  /// <returns>Absolute value</returns>
+  uint16_t AbsImpl() const noexcept {
+    return static_cast<uint16_t>(val & ~kSignMask);
+  }
+
+  /// <summary>
+  /// Creates a new instance with the sign flipped.
+  /// </summary>
+  /// <returns>Flipped sign instance</returns>
+  uint16_t NegateImpl() const noexcept {
+    return IsNaN() ? val : static_cast<uint16_t>(val ^ kSignMask);
+  }
+
+ public:
+  // uint16_t special values
+  static constexpr uint16_t kSignMask = 0x8000U;
+  static constexpr uint16_t kBiasedExponentMask = 0x7F80U;
+  static constexpr uint16_t kPositiveInfinityBits = 0x7F80U;
+  static constexpr uint16_t kNegativeInfinityBits = 0xFF80U;
+  static constexpr uint16_t kPositiveQNaNBits = 0x7FC1U;
+  static constexpr uint16_t kNegativeQNaNBits = 0xFFC1U;
+  static constexpr uint16_t kMaxValueBits = 0x7F7FU;
+  static constexpr uint16_t kRoundToNearest = 0x7FFFU;
+  static constexpr uint16_t kOneBits = 0x3F80U;
+  static constexpr uint16_t kMinusOneBits = 0xBF80U;
+
+  uint16_t val{0};
+
+  BFloat16Impl() = default;
+
+  /// <summary>
+  /// Checks if the value is negative
+  /// </summary>
+  /// <returns>true if negative</returns>
+  bool IsNegative() const noexcept {
+    return static_cast<int16_t>(val) < 0;
+  }
+
+  /// <summary>
+  /// Tests if the value is NaN
+  /// </summary>
+  /// <returns>true if NaN</returns>
+  bool IsNaN() const noexcept {
+    return AbsImpl() > kPositiveInfinityBits;
+  }
+
+  /// <summary>
+  /// Tests if the value is finite
+  /// </summary>
+  /// <returns>true if finite</returns>
+  bool IsFinite() const noexcept {
+    return AbsImpl() < kPositiveInfinityBits;
+  }
+
+  /// <summary>
+  /// Tests if the value represents positive infinity.
+  /// </summary>
+  /// <returns>true if positive infinity</returns>
+  bool IsPositiveInfinity() const noexcept {
+    return val == kPositiveInfinityBits;
+  }
+
+  /// <summary>
+  /// Tests if the value represents negative infinity
+  /// </summary>
+  /// <returns>true if negative infinity</returns>
+  bool IsNegativeInfinity() const noexcept {
+    return val == kNegativeInfinityBits;
+  }
+
+  /// <summary>
+  /// Tests if the value is either positive or negative infinity.
+  /// </summary>
+  /// <returns>True if absolute value is infinity</returns>
+  bool IsInfinity() const noexcept {
+    return AbsImpl() == kPositiveInfinityBits;
+  }
+
+  /// <summary>
+  /// Tests if the value is NaN or zero. Useful for comparisons.
+  /// </summary>
+  /// <returns>True if NaN or zero.</returns>
+  bool IsNaNOrZero() const noexcept {
+    auto abs = AbsImpl();
+    return (abs == 0 || abs > kPositiveInfinityBits);
+  }
+
+  /// <summary>
+  /// Tests if the value is normal (not zero, subnormal, infinite, or NaN).
+  /// </summary>
+  /// <returns>True if so</returns>
+  bool IsNormal() const noexcept {
+    auto abs = AbsImpl();
+    return (abs < kPositiveInfinityBits)           // is finite
+           && (abs != 0)                           // is not zero
+           && ((abs & kBiasedExponentMask) != 0);  // is not subnormal (has a non-zero exponent)
+  }
+
+  /// <summary>
+  /// Tests if the value is subnormal (denormal).
+  /// </summary>
+  /// <returns>True if so</returns>
+  bool IsSubnormal() const noexcept {
+    auto abs = AbsImpl();
+    return (abs < kPositiveInfinityBits)           // is finite
+           && (abs != 0)                           // is not zero
+           && ((abs & kBiasedExponentMask) == 0);  // is subnormal (has a zero exponent)
+  }
+
+  /// <summary>
+  /// Creates an instance that represents absolute value.
+  /// </summary>
+  /// <returns>Absolute value</returns>
+  Derived Abs() const noexcept { return Derived::FromBits(AbsImpl()); }
+
+  /// <summary>
+  /// Creates a new instance with the sign flipped.
+  /// </summary>
+  /// <returns>Flipped sign instance</returns>
+  Derived Negate() const noexcept { return Derived::FromBits(NegateImpl()); }
+
+  /// <summary>
+  /// IEEE defines that positive and negative zero are equal, this gives us a quick equality check
+  /// for two values by or'ing the private bits together and stripping the sign. They are both zero,
+  /// and therefore equivalent, if the resulting value is still zero.
+  /// </summary>
+  /// <param name="lhs">first value</param>
+  /// <param name="rhs">second value</param>
+  /// <returns>True if both arguments represent zero</returns>
+  static bool AreZero(const BFloat16Impl& lhs, const BFloat16Impl& rhs) noexcept {
+    // IEEE defines that positive and negative zero are equal, this gives us a quick equality check
+    // for two values by or'ing the private bits together and stripping the sign. They are both zero,
+    // and therefore equivalent, if the resulting value is still zero.
+    return static_cast<uint16_t>((lhs.val | rhs.val) & ~kSignMask) == 0;
+  }
+};
+
+template <class Derived>
+inline uint16_t BFloat16Impl<Derived>::ToUint16Impl(float v) noexcept {
+  uint16_t result;
+  if (std::isnan(v)) {
+    result = kPositiveQNaNBits;
+  } else {
+    auto get_msb_half = [](float fl) {
+      uint16_t result;
+#ifdef __cpp_if_constexpr
+      if constexpr (detail::endian::native == detail::endian::little) {
+#else
+      if (detail::endian::native == detail::endian::little) {
+#endif
+        std::memcpy(&result, reinterpret_cast<char*>(&fl) + sizeof(uint16_t), sizeof(uint16_t));
+      } else {
+        std::memcpy(&result, &fl, sizeof(uint16_t));
+      }
+      return result;
+    };
+
+    uint16_t upper_bits = get_msb_half(v);
+    union {
+      uint32_t U32;
+      float F32;
+    };
+    F32 = v;
+    U32 += (upper_bits & 1) + kRoundToNearest;
+    result = get_msb_half(F32);
+  }
+  return result;
+}
+
+template <class Derived>
+inline float BFloat16Impl<Derived>::ToFloatImpl() const noexcept {
+  if (IsNaN()) {
+    return std::numeric_limits<float>::quiet_NaN();
+  }
+  float result;
+  char* const first = reinterpret_cast<char*>(&result);
+  char* const second = first + sizeof(uint16_t);
+#ifdef __cpp_if_constexpr
+  if constexpr (detail::endian::native == detail::endian::little) {
+#else
+  if (detail::endian::native == detail::endian::little) {
+#endif
+    std::memset(first, 0, sizeof(uint16_t));
+    std::memcpy(second, &val, sizeof(uint16_t));
+  } else {
+    std::memcpy(first, &val, sizeof(uint16_t));
+    std::memset(second, 0, sizeof(uint16_t));
+  }
+  return result;
+}
+
+}  // namespace onnxruntime_float16
diff --git a/3rdParty/ONNX/onnxruntime_lite_custom_op.h b/3rdParty/ONNX/onnxruntime_lite_custom_op.h
new file mode 100644
index 0000000000..e8aa0342d6
--- /dev/null
+++ b/3rdParty/ONNX/onnxruntime_lite_custom_op.h
@@ -0,0 +1,1119 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// Summary
+// The header has APIs to save custom op authors the trouble of defining schemas,
+// which will be inferred by functions' signature, as long as their argument list has types supported here.
+// Input could be:
+// 1. Tensor of onnx data types.
+// 2. Span of onnx data types.
+// 3. Scalar of onnx data types.
+// A input could be optional if indicated as std::optional<...>.
+// For an output, it must be a tensor of onnx data types.
+// Further, the header also has utility for a simple custom struct, where resources could be kept, to be registered as a custom op.
+// For concrete examples, please search keyword "LiteCustomOpTest" under "<cloned_src_dir>/onnxruntime/test/".
+// Note - all APIs in this header are ABI.
+
+#pragma once
+#include "onnxruntime_cxx_api.h"
+#include <optional>
+#include <numeric>
+#include <functional>
+#include <unordered_set>
+
+namespace Ort {
+namespace Custom {
+
+class ArgBase {
+ public:
+  ArgBase(OrtKernelContext* ctx,
+          size_t indice,
+          bool is_input) : ctx_(ctx), indice_(indice), is_input_(is_input) {}
+  virtual ~ArgBase() {};
+
+ protected:
+  struct KernelContext ctx_;
+  size_t indice_;
+  bool is_input_;
+};
+
+using ArgPtr = std::unique_ptr<Custom::ArgBase>;
+using ArgPtrs = std::vector<ArgPtr>;
+
+class TensorBase : public ArgBase {
+ public:
+  TensorBase(OrtKernelContext* ctx,
+             size_t indice,
+             bool is_input) : ArgBase(ctx, indice, is_input) {}
+
+  operator bool() const {
+    return shape_.has_value();
+  }
+
+  const std::vector<int64_t>& Shape() const {
+    if (!shape_.has_value()) {
+      ORT_CXX_API_THROW("tensor shape is not yet initialized", OrtErrorCode::ORT_RUNTIME_EXCEPTION);
+    }
+    return shape_.value();
+  }
+
+  ONNXTensorElementDataType Type() const {
+    return type_;
+  }
+
+  int64_t NumberOfElement() const {
+    if (shape_.has_value()) {
+      return std::accumulate(shape_->begin(), shape_->end(), 1LL, std::multiplies<int64_t>());
+    } else {
+      return 0;
+    }
+  }
+
+  std::string Shape2Str() const {
+    if (shape_.has_value()) {
+      std::string shape_str;
+      for (const auto& dim : *shape_) {
+        shape_str.append(std::to_string(dim));
+        shape_str.append(", ");
+      }
+      return shape_str;
+    } else {
+      return "empty";
+    }
+  }
+
+  bool IsCpuTensor() const {
+    return strcmp("Cpu", mem_type_) == 0;
+  }
+
+  virtual const void* DataRaw() const = 0;
+  virtual size_t SizeInBytes() const = 0;
+
+ protected:
+  std::optional<std::vector<int64_t>> shape_;
+  ONNXTensorElementDataType type_ = ONNX_TENSOR_ELEMENT_DATA_TYPE_UNDEFINED;
+  const char* mem_type_ = "Cpu";
+};
+
+template <typename T>
+struct Span {
+  const T* data_ = {};
+  size_t size_ = {};
+  void Assign(const T* data, size_t size) {
+    data_ = data;
+    size_ = size;
+  }
+  size_t size() const { return size_; }
+  T operator[](size_t indice) const {
+    return data_[indice];
+  }
+  const T* data() const { return data_; }
+};
+
+template <typename T>
+class Tensor : public TensorBase {
+ public:
+  using TT = typename std::remove_reference<T>::type;
+  Tensor(OrtKernelContext* ctx, size_t indice, bool is_input) : TensorBase(ctx, indice, is_input) {
+    if (is_input_) {
+      if (indice >= ctx_.GetInputCount()) {
+        ORT_CXX_API_THROW("invalid indice for Ort::Custom::Tensor", OrtErrorCode::ORT_INVALID_ARGUMENT);
+      }
+      const_value_ = ctx_.GetInput(indice);
+      auto type_shape_info = const_value_.GetTensorTypeAndShapeInfo();
+      shape_ = type_shape_info.GetShape();
+    }
+  }
+  const TT* Data() const {
+    return reinterpret_cast<const TT*>(const_value_.GetTensorRawData());
+  }
+  TT* Allocate(const std::vector<int64_t>& shape) {
+    shape_ = shape;
+    if (!data_) {
+      shape_ = shape;
+      data_ = ctx_.GetOutput(indice_, shape).template GetTensorMutableData<TT>();
+    }
+    return data_;
+  }
+  static TT GetT() { return (TT)0; }
+  const Span<T>& AsSpan() {
+    if (!shape_.has_value() || shape_->size() != 1) {
+      ORT_CXX_API_THROW("invalid shape while trying to get a span out of Ort::Custom::Tensor",
+                        OrtErrorCode::ORT_RUNTIME_EXCEPTION);
+    }
+    span_.Assign(Data(), static_cast<size_t>((*shape_)[0]));
+    return span_;
+  }
+  const T& AsScalar() {
+    if (!shape_.has_value() || shape_->size() != 1 || (*shape_)[0] != 1) {
+      ORT_CXX_API_THROW("invalid shape while trying to get a scalar from Ort::Custom::Tensor",
+                        OrtErrorCode::ORT_RUNTIME_EXCEPTION);
+    }
+    return *Data();
+  }
+  const void* DataRaw() const override {
+    return reinterpret_cast<const void*>(Data());
+  }
+
+  size_t SizeInBytes() const override {
+    return sizeof(TT) * static_cast<size_t>(NumberOfElement());
+  }
+
+ private:
+  ConstValue const_value_;  // for input
+  TT* data_{};              // for output
+  Span<T> span_;
+};
+
+template <>
+class Tensor<std::string> : public TensorBase {
+ public:
+  using strings = std::vector<std::string>;
+
+  Tensor(OrtKernelContext* ctx, size_t indice, bool is_input) : TensorBase(ctx, indice, is_input) {
+    if (is_input_) {
+      if (indice >= ctx_.GetInputCount()) {
+        ORT_CXX_API_THROW("invalid indice for Ort::Custom::Tensor", OrtErrorCode::ORT_INVALID_ARGUMENT);
+      }
+      auto const_value = ctx_.GetInput(indice);
+      auto type_shape_info = const_value.GetTensorTypeAndShapeInfo();
+      shape_ = type_shape_info.GetShape();
+      auto num_chars = const_value.GetStringTensorDataLength();
+      // note - there will be copy ...
+      auto num_strings = static_cast<size_t>(NumberOfElement());
+      if (num_strings) {
+        std::vector<char> chars(num_chars + 1, '\0');
+        std::vector<size_t> offsets(num_strings);
+        const_value.GetStringTensorContent(static_cast<void*>(chars.data()), num_chars, offsets.data(), offsets.size());
+        auto upper_bound = num_strings - 1;
+        input_strings_.resize(num_strings);
+        for (size_t i = upper_bound;; --i) {
+          if (i < upper_bound) {
+            chars[offsets[i + 1]] = '\0';
+          }
+          input_strings_[i] = chars.data() + offsets[i];
+          if (0 == i) {
+            break;
+          }
+        }
+      }
+    }
+  }
+  const strings& Data() const {
+    return input_strings_;
+  }
+  const void* DataRaw() const override {
+    if (input_strings_.size() != 1) {
+      ORT_CXX_API_THROW("DataRaw() only applies to string scalar", ORT_RUNTIME_EXCEPTION);
+    }
+    return reinterpret_cast<const void*>(input_strings_[0].c_str());
+  }
+  size_t SizeInBytes() const override {
+    if (input_strings_.size() != 1) {
+      ORT_CXX_API_THROW("SizeInBytes() only applies to string scalar", ORT_RUNTIME_EXCEPTION);
+    }
+    return input_strings_[0].size();
+  }
+  void SetStringOutput(const strings& ss, const std::vector<int64_t>& dims) {
+    shape_ = dims;
+    std::vector<const char*> raw;
+    for (const auto& s : ss) {
+      raw.push_back(s.data());
+    }
+    auto output = ctx_.GetOutput(indice_, dims.data(), dims.size());
+    // note - there will be copy ...
+    output.FillStringTensor(raw.data(), raw.size());
+  }
+  const Span<std::string>& AsSpan() {
+    ORT_CXX_API_THROW("span for TensorT of string not implemented", OrtErrorCode::ORT_RUNTIME_EXCEPTION);
+  }
+  const std::string& AsScalar() {
+    if (input_strings_.size() != 1) {
+      ORT_CXX_API_THROW("invalid shape while trying to get a scalar string from Ort::Custom::Tensor",
+                        OrtErrorCode::ORT_RUNTIME_EXCEPTION);
+    }
+    return input_strings_[0];
+  }
+
+ private:
+  std::vector<std::string> input_strings_;  // for input
+};
+
+template <>
+class Tensor<std::string_view> : public TensorBase {
+ public:
+  using strings = std::vector<std::string>;
+  using string_views = std::vector<std::string_view>;
+
+  Tensor(OrtKernelContext* ctx, size_t indice, bool is_input) : TensorBase(ctx, indice, is_input) {
+    if (is_input_) {
+      if (indice >= ctx_.GetInputCount()) {
+        ORT_CXX_API_THROW("invalid indice for Ort::Custom::Tensor", OrtErrorCode::ORT_INVALID_ARGUMENT);
+      }
+      auto const_value = ctx_.GetInput(indice);
+      auto type_shape_info = const_value.GetTensorTypeAndShapeInfo();
+      shape_ = type_shape_info.GetShape();
+      auto num_chars = const_value.GetStringTensorDataLength();
+      chars_.resize(num_chars + 1, '\0');
+      auto num_strings = static_cast<size_t>(NumberOfElement());
+      if (num_strings) {
+        std::vector<size_t> offsets(num_strings);
+        const_value.GetStringTensorContent(static_cast<void*>(chars_.data()), num_chars, offsets.data(), offsets.size());
+        offsets.push_back(num_chars);
+        for (size_t i = 0; i < num_strings; ++i) {
+          input_string_views_.emplace_back(chars_.data() + offsets[i], offsets[i + 1] - offsets[i]);
+        }
+      }
+    }
+  }
+  const string_views& Data() const {
+    return input_string_views_;
+  }
+  const void* DataRaw() const override {
+    if (input_string_views_.size() != 1) {
+      ORT_CXX_API_THROW("DataRaw() only applies to string scalar", ORT_RUNTIME_EXCEPTION);
+    }
+    return reinterpret_cast<const void*>(input_string_views_[0].data());
+  }
+  size_t SizeInBytes() const override {
+    if (input_string_views_.size() != 1) {
+      ORT_CXX_API_THROW("SizeInBytes() only applies to string scalar", ORT_RUNTIME_EXCEPTION);
+    }
+    return input_string_views_[0].size();
+  }
+  void SetStringOutput(const strings& ss, const std::vector<int64_t>& dims) {
+    shape_ = dims;
+    std::vector<const char*> raw;
+    for (const auto& s : ss) {
+      raw.push_back(s.data());
+    }
+    auto output = ctx_.GetOutput(indice_, dims.data(), dims.size());
+    // note - there will be copy ...
+    output.FillStringTensor(raw.data(), raw.size());
+  }
+  const Span<std::string_view>& AsSpan() {
+    ORT_CXX_API_THROW("span for TensorT of string view not implemented", OrtErrorCode::ORT_RUNTIME_EXCEPTION);
+  }
+  std::string_view AsScalar() {
+    if (input_string_views_.size() != 1) {
+      ORT_CXX_API_THROW("invalid shape while trying to get a scalar string view from Ort::Custom::Tensor",
+                        OrtErrorCode::ORT_RUNTIME_EXCEPTION);
+    }
+    return input_string_views_[0];
+  }
+
+ private:
+  std::vector<char> chars_;                           // for input
+  std::vector<std::string_view> input_string_views_;  // for input
+};
+
+using TensorPtr = std::unique_ptr<Custom::TensorBase>;
+using TensorPtrs = std::vector<TensorPtr>;
+
+struct TensorArray : public ArgBase {
+  TensorArray(OrtKernelContext* ctx,
+              size_t start_indice,
+              bool is_input) : ArgBase(ctx,
+                                       start_indice,
+                                       is_input) {
+    if (is_input) {
+      auto input_count = ctx_.GetInputCount();
+      for (size_t ith_input = start_indice; ith_input < input_count; ++ith_input) {
+        auto const_value = ctx_.GetInput(start_indice);
+        auto type_shape_info = const_value.GetTensorTypeAndShapeInfo();
+        auto type = type_shape_info.GetElementType();
+        TensorPtr tensor;
+        switch (type) {
+          case ONNX_TENSOR_ELEMENT_DATA_TYPE_BOOL:
+            tensor = std::make_unique<Custom::Tensor<bool>>(ctx, ith_input, true);
+            break;
+          case ONNX_TENSOR_ELEMENT_DATA_TYPE_FLOAT:
+            tensor = std::make_unique<Custom::Tensor<float>>(ctx, ith_input, true);
+            break;
+          case ONNX_TENSOR_ELEMENT_DATA_TYPE_DOUBLE:
+            tensor = std::make_unique<Custom::Tensor<double>>(ctx, ith_input, true);
+            break;
+          case ONNX_TENSOR_ELEMENT_DATA_TYPE_UINT8:
+            tensor = std::make_unique<Custom::Tensor<uint8_t>>(ctx, ith_input, true);
+            break;
+          case ONNX_TENSOR_ELEMENT_DATA_TYPE_INT8:
+            tensor = std::make_unique<Custom::Tensor<int8_t>>(ctx, ith_input, true);
+            break;
+          case ONNX_TENSOR_ELEMENT_DATA_TYPE_UINT16:
+            tensor = std::make_unique<Custom::Tensor<uint16_t>>(ctx, ith_input, true);
+            break;
+          case ONNX_TENSOR_ELEMENT_DATA_TYPE_INT16:
+            tensor = std::make_unique<Custom::Tensor<int16_t>>(ctx, ith_input, true);
+            break;
+          case ONNX_TENSOR_ELEMENT_DATA_TYPE_UINT32:
+            tensor = std::make_unique<Custom::Tensor<uint32_t>>(ctx, ith_input, true);
+            break;
+          case ONNX_TENSOR_ELEMENT_DATA_TYPE_INT32:
+            tensor = std::make_unique<Custom::Tensor<int32_t>>(ctx, ith_input, true);
+            break;
+          case ONNX_TENSOR_ELEMENT_DATA_TYPE_UINT64:
+            tensor = std::make_unique<Custom::Tensor<uint64_t>>(ctx, ith_input, true);
+            break;
+          case ONNX_TENSOR_ELEMENT_DATA_TYPE_INT64:
+            tensor = std::make_unique<Custom::Tensor<int64_t>>(ctx, ith_input, true);
+            break;
+          case ONNX_TENSOR_ELEMENT_DATA_TYPE_STRING:
+            tensor = std::make_unique<Custom::Tensor<std::string>>(ctx, ith_input, true);
+            break;
+          default:
+            ORT_CXX_API_THROW("unknow input type", ORT_RUNTIME_EXCEPTION);
+            break;
+        }
+        tensors_.emplace_back(tensor.release());
+      }  // for
+    }
+  }
+  template <typename T>
+  T* AllocateOutput(size_t ith_output, const std::vector<int64_t>& shape) {
+    // ith_output is the indice of output relative to the tensor array
+    // indice_ + ith_output is the indice relative to context
+    auto tensor = std::make_unique<Tensor<T>>(ctx_.GetOrtKernelContext(), indice_ + ith_output, false);
+    auto raw_output = tensor.get()->Allocate(shape);
+    tensors_.emplace_back(tensor.release());
+    return raw_output;
+  }
+  Tensor<std::string>& AllocateStringTensor(size_t ith_output) {
+    // ith_output is the indice of output relative to the tensor array
+    // indice_ + ith_output is the indice relative to context
+    auto tensor = std::make_unique<Tensor<std::string>>(ctx_.GetOrtKernelContext(), indice_ + ith_output, false);
+    Tensor<std::string>& output = *tensor;
+    tensors_.emplace_back(tensor.release());
+    return output;
+  }
+  size_t Size() const {
+    return tensors_.size();
+  }
+  const TensorPtr& operator[](size_t ith_input) const {
+    // ith_input is the indice of output relative to the tensor array
+    return tensors_.at(ith_input);
+  }
+
+ private:
+  TensorPtrs tensors_;
+};
+
+using Variadic = TensorArray;
+
+/*
+Note:
+OrtLiteCustomOp inherits from OrtCustomOp to bridge tween a custom func/struct and ort core.
+The lifetime of an OrtLiteCustomOp instance is managed by customer code, not ort, so:
+1. DO NOT cast OrtLiteCustomOp to OrtCustomOp and release since there is no virtual destructor in the hierarchy.
+2. OrtLiteCustomFunc and OrtLiteCustomStruct, as two sub-structs, can be released in form of OrtLiteCustomOp since all members are kept in the OrtLiteCustomOp,
+   hence memory could still be recycled properly.
+Further, OrtCustomOp is a c struct bearing no v-table, so offspring structs are by design to be of zero virtual functions to maintain cast safety.
+*/
+struct OrtLiteCustomOp : public OrtCustomOp {
+  using ConstOptionalFloatTensor = std::optional<const Custom::Tensor<float>&>;
+  using OptionalFloatTensor = std::optional<Custom::Tensor<float>>;
+
+  // CreateTuple
+  template <size_t ith_input, size_t ith_output, typename... Ts>
+  static typename std::enable_if<sizeof...(Ts) == 0, std::tuple<>>::type
+  CreateTuple(OrtKernelContext*, ArgPtrs&, size_t, size_t, const std::string&) {
+    return std::make_tuple();
+  }
+
+  template <size_t ith_input, size_t ith_output, typename T, typename... Ts>
+  static typename std::enable_if<std::is_same<T, OrtKernelContext*>::value, std::tuple<T, Ts...>>::type
+  CreateTuple(OrtKernelContext* context, ArgPtrs& args, size_t num_input, size_t num_output, const std::string& ep) {
+    std::tuple<T> current = std::tuple<OrtKernelContext*>{context};
+    auto next = CreateTuple<ith_input, ith_output, Ts...>(context, args, num_input, num_output, ep);
+    return std::tuple_cat(current, next);
+  }
+
+  template <size_t ith_input, size_t ith_output, typename T, typename... Ts>
+  static typename std::enable_if<std::is_same<T, OrtKernelContext&>::value, std::tuple<T, Ts...>>::type
+  CreateTuple(OrtKernelContext* context, ArgPtrs& args, size_t num_input, size_t num_output, const std::string& ep) {
+    std::tuple<T> current = std::tuple<OrtKernelContext&>{*context};
+    auto next = CreateTuple<ith_input, ith_output, Ts...>(context, args, num_input, num_output, ep);
+    return std::tuple_cat(current, next);
+  }
+
+#ifdef ORT_CUDA_CTX
+  template <size_t ith_input, size_t ith_output, typename T, typename... Ts>
+  static typename std::enable_if<std::is_same<T, const CudaContext&>::value, std::tuple<T, Ts...>>::type
+  CreateTuple(OrtKernelContext* context, ArgPtrs& args, size_t num_input, size_t num_output, const std::string& ep) {
+    thread_local CudaContext cuda_context;
+    cuda_context.Init(*context);
+    std::tuple<T> current = std::tuple<const CudaContext&>{cuda_context};
+    auto next = CreateTuple<ith_input, ith_output, Ts...>(context, args, num_input, num_output, ep);
+    return std::tuple_cat(current, next);
+  }
+#endif
+
+#ifdef ORT_ROCM_CTX
+  template <size_t ith_input, size_t ith_output, typename T, typename... Ts>
+  static typename std::enable_if<std::is_same<T, const RocmContext&>::value, std::tuple<T, Ts...>>::type
+  CreateTuple(OrtKernelContext* context, ArgPtrs& args, size_t num_input, size_t num_output, const std::string& ep) {
+    thread_local RocmContext rocm_context;
+    rocm_context.Init(*context);
+    std::tuple<T> current = std::tuple<const RocmContext&>{rocm_context};
+    auto next = CreateTuple<ith_input, ith_output, Ts...>(context, args, num_input, num_output, ep);
+    return std::tuple_cat(current, next);
+  }
+#endif
+
+  template <size_t ith_input, size_t ith_output, typename T, typename... Ts>
+  static typename std::enable_if<std::is_same<T, const TensorArray*>::value, std::tuple<T, Ts...>>::type
+  CreateTuple(OrtKernelContext* context, ArgPtrs& args, size_t num_input, size_t num_output, const std::string& ep) {
+    args.push_back(std::make_unique<TensorArray>(context, ith_input, true));
+    std::tuple<T> current = std::tuple<T>{reinterpret_cast<T>(args.back().get())};
+    auto next = CreateTuple<ith_input + 1, ith_output, Ts...>(context, args, num_input, num_output, ep);
+    return std::tuple_cat(current, next);
+  }
+
+  template <size_t ith_input, size_t ith_output, typename T, typename... Ts>
+  static typename std::enable_if<std::is_same<T, const TensorArray&>::value, std::tuple<T, Ts...>>::type
+  CreateTuple(OrtKernelContext* context, ArgPtrs& args, size_t num_input, size_t num_output, const std::string& ep) {
+    args.push_back(std::make_unique<TensorArray>(context, ith_input, true));
+    std::tuple<T> current = std::tuple<T>{reinterpret_cast<T>(*args.back().get())};
+    auto next = CreateTuple<ith_input + 1, ith_output, Ts...>(context, args, num_input, num_output, ep);
+    return std::tuple_cat(current, next);
+  }
+
+  template <size_t ith_input, size_t ith_output, typename T, typename... Ts>
+  static typename std::enable_if<std::is_same<T, TensorArray*>::value, std::tuple<T, Ts...>>::type
+  CreateTuple(OrtKernelContext* context, ArgPtrs& args, size_t num_input, size_t num_output, const std::string& ep) {
+    args.push_back(std::make_unique<TensorArray>(context, ith_output, false));
+    std::tuple<T> current = std::tuple<T>{reinterpret_cast<T>(args.back().get())};
+    auto next = CreateTuple<ith_input, ith_output + 1, Ts...>(context, args, num_input, num_output, ep);
+    return std::tuple_cat(current, next);
+  }
+
+  template <size_t ith_input, size_t ith_output, typename T, typename... Ts>
+  static typename std::enable_if<std::is_same<T, TensorArray&>::value, std::tuple<T, Ts...>>::type
+  CreateTuple(OrtKernelContext* context, ArgPtrs& args, size_t num_input, size_t num_output, const std::string& ep) {
+    args.push_back(std::make_unique<TensorArray>(context, ith_output, false));
+    std::tuple<T> current = std::tuple<T>{reinterpret_cast<T>(*args.back().get())};
+    auto next = CreateTuple<ith_input, ith_output + 1, Ts...>(context, args, num_input, num_output, ep);
+    return std::tuple_cat(current, next);
+  }
+
+#define CREATE_TUPLE_INPUT(data_type)                                                                                                 \
+  template <size_t ith_input, size_t ith_output, typename T, typename... Ts>                                                          \
+  static typename std::enable_if<std::is_same<T, const Custom::Tensor<data_type>*>::value, std::tuple<T, Ts...>>::type                \
+  CreateTuple(OrtKernelContext* context, ArgPtrs& args, size_t num_input, size_t num_output, const std::string& ep) {                 \
+    args.push_back(std::make_unique<Custom::Tensor<data_type>>(context, ith_input, true));                                            \
+    std::tuple<T> current = std::tuple<T>{reinterpret_cast<T>(args.back().get())};                                                    \
+    auto next = CreateTuple<ith_input + 1, ith_output, Ts...>(context, args, num_input, num_output, ep);                              \
+    return std::tuple_cat(current, next);                                                                                             \
+  }                                                                                                                                   \
+  template <size_t ith_input, size_t ith_output, typename T, typename... Ts>                                                          \
+  static typename std::enable_if<std::is_same<T, const Custom::Tensor<data_type>&>::value, std::tuple<T, Ts...>>::type                \
+  CreateTuple(OrtKernelContext* context, ArgPtrs& args, size_t num_input, size_t num_output, const std::string& ep) {                 \
+    args.push_back(std::make_unique<Custom::Tensor<data_type>>(context, ith_input, true));                                            \
+    std::tuple<T> current = std::tuple<T>{reinterpret_cast<T>(*args.back().get())};                                                   \
+    auto next = CreateTuple<ith_input + 1, ith_output, Ts...>(context, args, num_input, num_output, ep);                              \
+    return std::tuple_cat(current, next);                                                                                             \
+  }                                                                                                                                   \
+  template <size_t ith_input, size_t ith_output, typename T, typename... Ts>                                                          \
+  static typename std::enable_if<std::is_same<T, std::optional<const Custom::Tensor<data_type>*>>::value, std::tuple<T, Ts...>>::type \
+  CreateTuple(OrtKernelContext* context, ArgPtrs& args, size_t num_input, size_t num_output, const std::string& ep) {                 \
+    if (ith_input < num_input) {                                                                                                      \
+      args.push_back(std::make_unique<Custom::Tensor<data_type>>(context, ith_input, true));                                          \
+      std::tuple<T> current = std::tuple<T>{reinterpret_cast<Custom::Tensor<data_type>*>(args.back().get())};                         \
+      auto next = CreateTuple<ith_input + 1, ith_output, Ts...>(context, args, num_input, num_output, ep);                            \
+      return std::tuple_cat(current, next);                                                                                           \
+    } else {                                                                                                                          \
+      std::tuple<T> current = std::tuple<T>{};                                                                                        \
+      auto next = CreateTuple<ith_input + 1, ith_output, Ts...>(context, args, num_input, num_output, ep);                            \
+      return std::tuple_cat(current, next);                                                                                           \
+    }                                                                                                                                 \
+  }                                                                                                                                   \
+  template <size_t ith_input, size_t ith_output, typename T, typename... Ts>                                                          \
+  static typename std::enable_if<std::is_same<T, const Custom::Span<data_type>*>::value, std::tuple<T, Ts...>>::type                  \
+  CreateTuple(OrtKernelContext* context, ArgPtrs& args, size_t num_input, size_t num_output, const std::string& ep) {                 \
+    if ("CPUExecutionProvider" != ep) {                                                                                               \
+      ORT_CXX_API_THROW("span input could only be applied to CPU EP", OrtErrorCode::ORT_RUNTIME_EXCEPTION);                           \
+    }                                                                                                                                 \
+    args.push_back(std::make_unique<Custom::Tensor<data_type>>(context, ith_input, true));                                            \
+    std::tuple<T> current = std::tuple<T>{&reinterpret_cast<Custom::Tensor<data_type>*>(args.back().get())->AsSpan()};                \
+    auto next = CreateTuple<ith_input + 1, ith_output, Ts...>(context, args, num_input, num_output, ep);                              \
+    return std::tuple_cat(current, next);                                                                                             \
+  }                                                                                                                                   \
+  template <size_t ith_input, size_t ith_output, typename T, typename... Ts>                                                          \
+  static typename std::enable_if<std::is_same<T, const Custom::Span<data_type>&>::value, std::tuple<T, Ts...>>::type                  \
+  CreateTuple(OrtKernelContext* context, ArgPtrs& args, size_t num_input, size_t num_output, const std::string& ep) {                 \
+    if ("CPUExecutionProvider" != ep) {                                                                                               \
+      ORT_CXX_API_THROW("span input could only be applied to CPU EP", OrtErrorCode::ORT_RUNTIME_EXCEPTION);                           \
+    }                                                                                                                                 \
+    args.push_back(std::make_unique<Custom::Tensor<data_type>>(context, ith_input, true));                                            \
+    std::tuple<T> current = std::tuple<T>{reinterpret_cast<Custom::Tensor<data_type>*>(args.back().get())->AsSpan()};                 \
+    auto next = CreateTuple<ith_input + 1, ith_output, Ts...>(context, args, num_input, num_output, ep);                              \
+    return std::tuple_cat(current, next);                                                                                             \
+  }                                                                                                                                   \
+  template <size_t ith_input, size_t ith_output, typename T, typename... Ts>                                                          \
+  static typename std::enable_if<std::is_same<T, std::optional<const Custom::Span<data_type>*>>::value, std::tuple<T, Ts...>>::type   \
+  CreateTuple(OrtKernelContext* context, ArgPtrs& args, size_t num_input, size_t num_output, const std::string& ep) {                 \
+    if (ith_input < num_input) {                                                                                                      \
+      if ("CPUExecutionProvider" != ep) {                                                                                             \
+        ORT_CXX_API_THROW("span input could only be applied to CPU EP", OrtErrorCode::ORT_RUNTIME_EXCEPTION);                         \
+      }                                                                                                                               \
+      args.push_back(std::make_unique<Custom::Tensor<data_type>>(context, ith_input, true));                                          \
+      std::tuple<T> current = std::tuple<T>{&reinterpret_cast<Custom::Tensor<data_type>*>(args.back().get())->AsSpan()};              \
+      auto next = CreateTuple<ith_input + 1, ith_output, Ts...>(context, args, num_input, num_output, ep);                            \
+      return std::tuple_cat(current, next);                                                                                           \
+    } else {                                                                                                                          \
+      std::tuple<T> current = std::tuple<T>{};                                                                                        \
+      auto next = CreateTuple<ith_input + 1, ith_output, Ts...>(context, args, num_input, num_output, ep);                            \
+      return std::tuple_cat(current, next);                                                                                           \
+    }                                                                                                                                 \
+  }                                                                                                                                   \
+  template <size_t ith_input, size_t ith_output, typename T, typename... Ts>                                                          \
+  static typename std::enable_if<std::is_same<T, data_type>::value, std::tuple<T, Ts...>>::type                                       \
+  CreateTuple(OrtKernelContext* context, ArgPtrs& args, size_t num_input, size_t num_output, const std::string& ep) {                 \
+    if ("CPUExecutionProvider" != ep) {                                                                                               \
+      ORT_CXX_API_THROW("scalar input could only be applied to CPU EP", OrtErrorCode::ORT_RUNTIME_EXCEPTION);                         \
+    }                                                                                                                                 \
+    args.push_back(std::make_unique<Custom::Tensor<data_type>>(context, ith_input, true));                                            \
+    std::tuple<T> current = std::tuple<T>{reinterpret_cast<Custom::Tensor<data_type>*>(args.back().get())->AsScalar()};               \
+    auto next = CreateTuple<ith_input + 1, ith_output, Ts...>(context, args, num_input, num_output, ep);                              \
+    return std::tuple_cat(current, next);                                                                                             \
+  }                                                                                                                                   \
+  template <size_t ith_input, size_t ith_output, typename T, typename... Ts>                                                          \
+  static typename std::enable_if<std::is_same<T, std::optional<data_type>>::value, std::tuple<T, Ts...>>::type                        \
+  CreateTuple(OrtKernelContext* context, ArgPtrs& args, size_t num_input, size_t num_output, const std::string& ep) {                 \
+    if (ith_input < num_input) {                                                                                                      \
+      if ("CPUExecutionProvider" != ep) {                                                                                             \
+        ORT_CXX_API_THROW("scalar input could only be applied to CPU EP", OrtErrorCode::ORT_RUNTIME_EXCEPTION);                       \
+      }                                                                                                                               \
+      args.push_back(std::make_unique<Custom::Tensor<data_type>>(context, ith_input, true));                                          \
+      std::tuple<T> current = std::tuple<T>{reinterpret_cast<Custom::Tensor<data_type>*>(args.back().get())->AsScalar()};             \
+      auto next = CreateTuple<ith_input + 1, ith_output, Ts...>(context, args, num_input, num_output, ep);                            \
+      return std::tuple_cat(current, next);                                                                                           \
+    } else {                                                                                                                          \
+      std::tuple<T> current = std::tuple<T>{};                                                                                        \
+      auto next = CreateTuple<ith_input + 1, ith_output, Ts...>(context, args, num_input, num_output, ep);                            \
+      return std::tuple_cat(current, next);                                                                                           \
+    }                                                                                                                                 \
+  }
+#define CREATE_TUPLE_OUTPUT(data_type)                                                                                          \
+  template <size_t ith_input, size_t ith_output, typename T, typename... Ts>                                                    \
+  static typename std::enable_if<std::is_same<T, Custom::Tensor<data_type>*>::value, std::tuple<T, Ts...>>::type                \
+  CreateTuple(OrtKernelContext* context, ArgPtrs& args, size_t num_input, size_t num_output, const std::string& ep) {           \
+    args.push_back(std::make_unique<Custom::Tensor<data_type>>(context, ith_output, false));                                    \
+    std::tuple<T> current = std::tuple<T>{reinterpret_cast<T>(args.back().get())};                                              \
+    auto next = CreateTuple<ith_input, ith_output + 1, Ts...>(context, args, num_input, num_output, ep);                        \
+    return std::tuple_cat(current, next);                                                                                       \
+  }                                                                                                                             \
+  template <size_t ith_input, size_t ith_output, typename T, typename... Ts>                                                    \
+  static typename std::enable_if<std::is_same<T, Custom::Tensor<data_type>&>::value, std::tuple<T, Ts...>>::type                \
+  CreateTuple(OrtKernelContext* context, ArgPtrs& args, size_t num_input, size_t num_output, const std::string& ep) {           \
+    args.push_back(std::make_unique<Custom::Tensor<data_type>>(context, ith_output, false));                                    \
+    std::tuple<T> current = std::tuple<T>{reinterpret_cast<T>(*args.back().get())};                                             \
+    auto next = CreateTuple<ith_input, ith_output + 1, Ts...>(context, args, num_input, num_output, ep);                        \
+    return std::tuple_cat(current, next);                                                                                       \
+  }                                                                                                                             \
+  template <size_t ith_input, size_t ith_output, typename T, typename... Ts>                                                    \
+  static typename std::enable_if<std::is_same<T, std::optional<Custom::Tensor<data_type>*>>::value, std::tuple<T, Ts...>>::type \
+  CreateTuple(OrtKernelContext* context, ArgPtrs& args, size_t num_input, size_t num_output, const std::string& ep) {           \
+    if (ith_output < num_output) {                                                                                              \
+      args.push_back(std::make_unique<Custom::Tensor<data_type>>(context, ith_output, false));                                  \
+      std::tuple<T> current = std::tuple<T>{reinterpret_cast<Custom::Tensor<data_type>*>(args.back().get())};                   \
+      auto next = CreateTuple<ith_input, ith_output + 1, Ts...>(context, args, num_input, num_output, ep);                      \
+      return std::tuple_cat(current, next);                                                                                     \
+    } else {                                                                                                                    \
+      std::tuple<T> current = std::tuple<T>{};                                                                                  \
+      auto next = CreateTuple<ith_input, ith_output + 1, Ts...>(context, args, num_input, num_output, ep);                      \
+      return std::tuple_cat(current, next);                                                                                     \
+    }                                                                                                                           \
+  }
+#define CREATE_TUPLE(data_type) \
+  CREATE_TUPLE_INPUT(data_type) \
+  CREATE_TUPLE_OUTPUT(data_type)
+
+  CREATE_TUPLE(bool)
+  CREATE_TUPLE(float)
+  CREATE_TUPLE(Ort::Float16_t)
+  CREATE_TUPLE(Ort::BFloat16_t)
+  CREATE_TUPLE(double)
+  CREATE_TUPLE(int8_t)
+  CREATE_TUPLE(int16_t)
+  CREATE_TUPLE(int32_t)
+  CREATE_TUPLE(int64_t)
+  CREATE_TUPLE(uint8_t)
+  CREATE_TUPLE(uint16_t)
+  CREATE_TUPLE(uint32_t)
+  CREATE_TUPLE(uint64_t)
+  CREATE_TUPLE(std::string)
+  CREATE_TUPLE_INPUT(std::string_view)
+  CREATE_TUPLE(Ort::Float8E4M3FN_t)
+  CREATE_TUPLE(Ort::Float8E4M3FNUZ_t)
+  CREATE_TUPLE(Ort::Float8E5M2_t)
+  CREATE_TUPLE(Ort::Float8E5M2FNUZ_t)
+
+  // ParseArgs ...
+  template <typename... Ts>
+  static typename std::enable_if<0 == sizeof...(Ts)>::type
+  ParseArgs(std::vector<ONNXTensorElementDataType>&, std::vector<ONNXTensorElementDataType>&) {
+  }
+
+  template <typename T, typename... Ts>
+  static typename std::enable_if<0 <= sizeof...(Ts) && std::is_same<T, OrtKernelContext*>::value>::type
+  ParseArgs(std::vector<ONNXTensorElementDataType>& input_types, std::vector<ONNXTensorElementDataType>& output_types) {
+    ParseArgs<Ts...>(input_types, output_types);
+  }
+
+  template <typename T, typename... Ts>
+  static typename std::enable_if<0 <= sizeof...(Ts) && std::is_same<T, OrtKernelContext&>::value>::type
+  ParseArgs(std::vector<ONNXTensorElementDataType>& input_types, std::vector<ONNXTensorElementDataType>& output_types) {
+    ParseArgs<Ts...>(input_types, output_types);
+  }
+
+#ifdef ORT_CUDA_CTX
+  template <typename T, typename... Ts>
+  static typename std::enable_if<0 <= sizeof...(Ts) && std::is_same<T, const CudaContext&>::value>::type
+  ParseArgs(std::vector<ONNXTensorElementDataType>& input_types, std::vector<ONNXTensorElementDataType>& output_types) {
+    ParseArgs<Ts...>(input_types, output_types);
+  }
+#endif
+
+#ifdef ORT_ROCM_CTX
+  template <typename T, typename... Ts>
+  static typename std::enable_if<0 <= sizeof...(Ts) && std::is_same<T, const RocmContext&>::value>::type
+  ParseArgs(std::vector<ONNXTensorElementDataType>& input_types, std::vector<ONNXTensorElementDataType>& output_types) {
+    ParseArgs<Ts...>(input_types, output_types);
+  }
+#endif
+
+  template <typename T, typename... Ts>
+  static typename std::enable_if<0 <= sizeof...(Ts) && std::is_same<T, const TensorArray&>::value>::type
+  ParseArgs(std::vector<ONNXTensorElementDataType>& input_types, std::vector<ONNXTensorElementDataType>& output_types) {
+    input_types.push_back(ONNX_TENSOR_ELEMENT_DATA_TYPE_UNDEFINED);
+    ParseArgs<Ts...>(input_types, output_types);
+  }
+
+  template <typename T, typename... Ts>
+  static typename std::enable_if<0 <= sizeof...(Ts) && std::is_same<T, const TensorArray*>::value>::type
+  ParseArgs(std::vector<ONNXTensorElementDataType>& input_types, std::vector<ONNXTensorElementDataType>& output_types) {
+    input_types.push_back(ONNX_TENSOR_ELEMENT_DATA_TYPE_UNDEFINED);
+    ParseArgs<Ts...>(input_types, output_types);
+  }
+
+  template <typename T, typename... Ts>
+  static typename std::enable_if<0 <= sizeof...(Ts) && std::is_same<T, TensorArray&>::value>::type
+  ParseArgs(std::vector<ONNXTensorElementDataType>& input_types, std::vector<ONNXTensorElementDataType>& output_types) {
+    output_types.push_back(ONNX_TENSOR_ELEMENT_DATA_TYPE_UNDEFINED);
+    ParseArgs<Ts...>(input_types, output_types);
+  }
+
+  template <typename T, typename... Ts>
+  static typename std::enable_if<0 <= sizeof...(Ts) && std::is_same<T, TensorArray*>::value>::type
+  ParseArgs(std::vector<ONNXTensorElementDataType>& input_types, std::vector<ONNXTensorElementDataType>& output_types) {
+    output_types.push_back(ONNX_TENSOR_ELEMENT_DATA_TYPE_UNDEFINED);
+    ParseArgs<Ts...>(input_types, output_types);
+  }
+
+#define PARSE_INPUT_BASE(pack_type, onnx_type)                                                                           \
+  template <typename T, typename... Ts>                                                                                  \
+  static typename std::enable_if<0 <= sizeof...(Ts) && std::is_same<T, pack_type>::value>::type                          \
+  ParseArgs(std::vector<ONNXTensorElementDataType>& input_types, std::vector<ONNXTensorElementDataType>& output_types) { \
+    input_types.push_back(onnx_type);                                                                                    \
+    ParseArgs<Ts...>(input_types, output_types);                                                                         \
+  }                                                                                                                      \
+  template <typename T, typename... Ts>                                                                                  \
+  static typename std::enable_if<0 <= sizeof...(Ts) && std::is_same<T, const std::optional<pack_type>>::value>::type     \
+  ParseArgs(std::vector<ONNXTensorElementDataType>& input_types, std::vector<ONNXTensorElementDataType>& output_types) { \
+    input_types.push_back(onnx_type);                                                                                    \
+    ParseArgs<Ts...>(input_types, output_types);                                                                         \
+  }                                                                                                                      \
+  template <typename T, typename... Ts>                                                                                  \
+  static typename std::enable_if<0 <= sizeof...(Ts) && std::is_same<T, std::optional<pack_type>>::value>::type           \
+  ParseArgs(std::vector<ONNXTensorElementDataType>& input_types, std::vector<ONNXTensorElementDataType>& output_types) { \
+    input_types.push_back(onnx_type);                                                                                    \
+    ParseArgs<Ts...>(input_types, output_types);                                                                         \
+  }
+
+#define PARSE_INPUT(data_type, onnx_type)                       \
+  PARSE_INPUT_BASE(const Custom::Tensor<data_type>*, onnx_type) \
+  PARSE_INPUT_BASE(const Custom::Tensor<data_type>&, onnx_type) \
+  PARSE_INPUT_BASE(const Custom::Span<data_type>*, onnx_type)   \
+  PARSE_INPUT_BASE(const Custom::Span<data_type>&, onnx_type)   \
+  PARSE_INPUT_BASE(data_type, onnx_type)
+
+#define PARSE_OUTPUT(data_type, onnx_type)                                                                                      \
+  template <typename T, typename... Ts>                                                                                         \
+  static typename std::enable_if<0 <= sizeof...(Ts) && std::is_same<T, Custom::Tensor<data_type>*>::value>::type                \
+  ParseArgs(std::vector<ONNXTensorElementDataType>& input_types, std::vector<ONNXTensorElementDataType>& output_types) {        \
+    output_types.push_back(onnx_type);                                                                                          \
+    ParseArgs<Ts...>(input_types, output_types);                                                                                \
+  }                                                                                                                             \
+  template <typename T, typename... Ts>                                                                                         \
+  static typename std::enable_if<0 <= sizeof...(Ts) && std::is_same<T, Custom::Tensor<data_type>&>::value>::type                \
+  ParseArgs(std::vector<ONNXTensorElementDataType>& input_types, std::vector<ONNXTensorElementDataType>& output_types) {        \
+    output_types.push_back(onnx_type);                                                                                          \
+    ParseArgs<Ts...>(input_types, output_types);                                                                                \
+  }                                                                                                                             \
+  template <typename T, typename... Ts>                                                                                         \
+  static typename std::enable_if<0 <= sizeof...(Ts) && std::is_same<T, std::optional<Custom::Tensor<data_type>*>>::value>::type \
+  ParseArgs(std::vector<ONNXTensorElementDataType>& input_types, std::vector<ONNXTensorElementDataType>& output_types) {        \
+    output_types.push_back(onnx_type);                                                                                          \
+    ParseArgs<Ts...>(input_types, output_types);                                                                                \
+  }
+
+#define PARSE_ARGS(data_type, onnx_type) \
+  PARSE_INPUT(data_type, onnx_type)      \
+  PARSE_OUTPUT(data_type, onnx_type)
+
+  PARSE_ARGS(bool, ONNX_TENSOR_ELEMENT_DATA_TYPE_BOOL)
+  PARSE_ARGS(float, ONNX_TENSOR_ELEMENT_DATA_TYPE_FLOAT)
+  PARSE_ARGS(Ort::Float16_t, ONNX_TENSOR_ELEMENT_DATA_TYPE_FLOAT16)
+  PARSE_ARGS(Ort::BFloat16_t, ONNX_TENSOR_ELEMENT_DATA_TYPE_BFLOAT16)
+  PARSE_ARGS(double, ONNX_TENSOR_ELEMENT_DATA_TYPE_DOUBLE)
+  PARSE_ARGS(int8_t, ONNX_TENSOR_ELEMENT_DATA_TYPE_INT8)
+  PARSE_ARGS(int16_t, ONNX_TENSOR_ELEMENT_DATA_TYPE_INT16)
+  PARSE_ARGS(int32_t, ONNX_TENSOR_ELEMENT_DATA_TYPE_INT32)
+  PARSE_ARGS(int64_t, ONNX_TENSOR_ELEMENT_DATA_TYPE_INT64)
+  PARSE_ARGS(uint8_t, ONNX_TENSOR_ELEMENT_DATA_TYPE_UINT8)
+  PARSE_ARGS(uint16_t, ONNX_TENSOR_ELEMENT_DATA_TYPE_UINT16)
+  PARSE_ARGS(uint32_t, ONNX_TENSOR_ELEMENT_DATA_TYPE_UINT32)
+  PARSE_ARGS(uint64_t, ONNX_TENSOR_ELEMENT_DATA_TYPE_UINT64)
+  PARSE_ARGS(std::string, ONNX_TENSOR_ELEMENT_DATA_TYPE_STRING)
+  PARSE_ARGS(std::string_view, ONNX_TENSOR_ELEMENT_DATA_TYPE_STRING)  // todo - remove string_view output
+  PARSE_ARGS(Ort::Float8E4M3FN_t, ONNX_TENSOR_ELEMENT_DATA_TYPE_FLOAT8E4M3FN)
+  PARSE_ARGS(Ort::Float8E4M3FNUZ_t, ONNX_TENSOR_ELEMENT_DATA_TYPE_FLOAT8E4M3FNUZ)
+  PARSE_ARGS(Ort::Float8E5M2_t, ONNX_TENSOR_ELEMENT_DATA_TYPE_FLOAT8E5M2)
+  PARSE_ARGS(Ort::Float8E5M2FNUZ_t, ONNX_TENSOR_ELEMENT_DATA_TYPE_FLOAT8E5M2FNUZ)
+
+  OrtLiteCustomOp(const char* op_name,
+                  const char* execution_provider,
+                  ShapeInferFn shape_infer_fn,
+                  int start_ver = 1,
+                  int end_ver = MAX_CUSTOM_OP_END_VER) : op_name_(op_name),
+                                                         execution_provider_(execution_provider),
+                                                         shape_infer_fn_(shape_infer_fn),
+                                                         start_ver_(start_ver),
+                                                         end_ver_(end_ver) {
+    OrtCustomOp::version = ORT_API_VERSION;
+
+    OrtCustomOp::GetName = [](const OrtCustomOp* op) { return static_cast<const OrtLiteCustomOp*>(op)->op_name_.c_str(); };
+    OrtCustomOp::GetExecutionProviderType = [](const OrtCustomOp* op) { return ((OrtLiteCustomOp*)op)->execution_provider_.c_str(); };
+    OrtCustomOp::GetInputMemoryType = [](const OrtCustomOp*, size_t) { return OrtMemTypeDefault; };
+
+    OrtCustomOp::GetInputTypeCount = [](const OrtCustomOp* op) {
+      auto self = reinterpret_cast<const OrtLiteCustomOp*>(op);
+      return self->input_types_.size();
+    };
+
+    OrtCustomOp::GetInputType = [](const OrtCustomOp* op, size_t indice) {
+      auto self = reinterpret_cast<const OrtLiteCustomOp*>(op);
+      return self->input_types_[indice];
+    };
+
+    OrtCustomOp::GetOutputTypeCount = [](const OrtCustomOp* op) {
+      auto self = reinterpret_cast<const OrtLiteCustomOp*>(op);
+      return self->output_types_.size();
+    };
+
+    OrtCustomOp::GetOutputType = [](const OrtCustomOp* op, size_t indice) {
+      auto self = reinterpret_cast<const OrtLiteCustomOp*>(op);
+      return self->output_types_[indice];
+    };
+
+    OrtCustomOp::GetInputCharacteristic = [](const OrtCustomOp* op, size_t indice) {
+      auto self = reinterpret_cast<const OrtLiteCustomOp*>(op);
+      return self->input_types_[indice] == ONNX_TENSOR_ELEMENT_DATA_TYPE_UNDEFINED ? INPUT_OUTPUT_VARIADIC : INPUT_OUTPUT_OPTIONAL;
+    };
+
+    OrtCustomOp::GetOutputCharacteristic = [](const OrtCustomOp* op, size_t indice) {
+      auto self = reinterpret_cast<const OrtLiteCustomOp*>(op);
+      return self->output_types_[indice] == ONNX_TENSOR_ELEMENT_DATA_TYPE_UNDEFINED ? INPUT_OUTPUT_VARIADIC : INPUT_OUTPUT_OPTIONAL;
+    };
+
+    OrtCustomOp::GetVariadicInputMinArity = [](const OrtCustomOp*) {
+      return 1;
+    };
+
+    OrtCustomOp::GetVariadicInputHomogeneity = [](const OrtCustomOp*) {
+      return 0;
+    };
+
+    OrtCustomOp::GetVariadicOutputMinArity = [](const OrtCustomOp*) {
+      return 1;
+    };
+
+    OrtCustomOp::GetVariadicOutputHomogeneity = [](const OrtCustomOp*) {
+      return 0;
+    };
+
+    OrtCustomOp::GetVariadicInputMinArity = [](const OrtCustomOp*) { return 0; };
+    OrtCustomOp::GetVariadicInputHomogeneity = [](const OrtCustomOp*) { return 0; };
+    OrtCustomOp::GetVariadicOutputMinArity = [](const OrtCustomOp*) { return 0; };
+    OrtCustomOp::GetVariadicOutputHomogeneity = [](const OrtCustomOp*) { return 0; };
+
+    OrtCustomOp::CreateKernelV2 = {};
+    OrtCustomOp::KernelComputeV2 = {};
+    OrtCustomOp::KernelCompute = {};
+
+    OrtCustomOp::InferOutputShapeFn = {};
+
+    OrtCustomOp::GetStartVersion = [](const OrtCustomOp* op) {
+      auto self = reinterpret_cast<const OrtLiteCustomOp*>(op);
+      return self->start_ver_;
+    };
+
+    OrtCustomOp::GetEndVersion = [](const OrtCustomOp* op) {
+      auto self = reinterpret_cast<const OrtLiteCustomOp*>(op);
+      return self->end_ver_;
+    };
+
+    OrtCustomOp::GetMayInplace = {};
+    OrtCustomOp::ReleaseMayInplace = {};
+    OrtCustomOp::GetAliasMap = {};
+    OrtCustomOp::ReleaseAliasMap = {};
+  }
+
+  const std::string op_name_;
+  const std::string execution_provider_;
+
+  std::vector<ONNXTensorElementDataType> input_types_;
+  std::vector<ONNXTensorElementDataType> output_types_;
+
+  ShapeInferFn shape_infer_fn_ = {};
+
+  int start_ver_ = 1;
+  int end_ver_ = MAX_CUSTOM_OP_END_VER;
+
+  void* compute_fn_ = {};
+  void* compute_fn_return_status_ = {};
+};
+
+//////////////////////////// OrtLiteCustomFunc ////////////////////////////////
+// The struct is to implement function-as-op.
+// E.g. a function might be defined as:
+//   void Filter(const Ort::Custom::Tensor<float>& floats_in, Ort::Custom::Tensor<float>& floats_out) { ... }
+// It could be registered this way:
+//   Ort::CustomOpDomain v2_domain{"v2"};
+//   std::unique_ptr<OrtLiteCustomOp> fil_op_ptr{Ort::Custom::CreateLiteCustomOp("Filter", "CPUExecutionProvider", Filter)};
+//   v2_domain.Add(fil_op_ptr.get());
+//   session_options.Add(v2_domain);
+// For the complete example, please search keyword "LiteCustomOpTest" under "<cloned_src_dir>/onnxruntime/test/".
+template <typename... Args>
+struct OrtLiteCustomFunc : public OrtLiteCustomOp {
+  using ComputeFn = void (*)(Args...);
+  using ComputeFnReturnStatus = Status (*)(Args...);
+  using MyType = OrtLiteCustomFunc<Args...>;
+
+  struct Kernel {
+    size_t num_input_{};
+    size_t num_output_{};
+    ComputeFn compute_fn_{};
+    ComputeFnReturnStatus compute_fn_return_status_{};
+    std::string ep_{};
+  };
+
+  OrtLiteCustomFunc(const char* op_name,
+                    const char* execution_provider,
+                    ComputeFn compute_fn,
+                    ShapeInferFn shape_infer_fn = {},
+                    int start_ver = 1,
+                    int end_ver = MAX_CUSTOM_OP_END_VER) : OrtLiteCustomOp(op_name, execution_provider, shape_infer_fn, start_ver, end_ver) {
+    compute_fn_ = reinterpret_cast<void*>(compute_fn);
+    ParseArgs<Args...>(input_types_, output_types_);
+
+    OrtCustomOp::KernelCompute = [](void* op_kernel, OrtKernelContext* context) {
+      auto kernel = reinterpret_cast<Kernel*>(op_kernel);
+      std::vector<ArgPtr> args;
+      auto t = CreateTuple<0, 0, Args...>(context, args, kernel->num_input_, kernel->num_output_, kernel->ep_);
+      std::apply([kernel](Args const&... t_args) { kernel->compute_fn_(t_args...); }, t);
+    };
+
+    OrtCustomOp::CreateKernel = [](const OrtCustomOp* this_, const OrtApi* ort_api, const OrtKernelInfo* info) {
+      auto kernel = std::make_unique<Kernel>();
+      auto me = static_cast<const MyType*>(this_);
+      kernel->compute_fn_ = reinterpret_cast<ComputeFn>(me->compute_fn_);
+      Ort::ThrowOnError(ort_api->KernelInfo_GetInputCount(info, &kernel->num_input_));
+      Ort::ThrowOnError(ort_api->KernelInfo_GetOutputCount(info, &kernel->num_output_));
+      auto self = static_cast<const OrtLiteCustomFunc*>(this_);
+      kernel->ep_ = self->execution_provider_;
+      return reinterpret_cast<void*>(kernel.release());
+    };
+
+    OrtCustomOp::KernelDestroy = [](void* op_kernel) {
+      delete reinterpret_cast<Kernel*>(op_kernel);
+    };
+
+    if (shape_infer_fn_) {
+      OrtCustomOp::InferOutputShapeFn = [](const OrtCustomOp* op, OrtShapeInferContext* ort_ctx) -> OrtStatusPtr {
+        auto shape_info_fn = static_cast<const MyType*>(op)->shape_infer_fn_;
+        ShapeInferContext ctx(&GetApi(), ort_ctx);
+        return shape_info_fn(ctx);
+      };
+    }
+  }
+
+  OrtLiteCustomFunc(const char* op_name,
+                    const char* execution_provider,
+                    ComputeFnReturnStatus compute_fn_return_status,
+                    ShapeInferFn shape_infer_fn = {},
+                    int start_ver = 1,
+                    int end_ver = MAX_CUSTOM_OP_END_VER) : OrtLiteCustomOp(op_name, execution_provider, shape_infer_fn, start_ver, end_ver) {
+    compute_fn_return_status_ = reinterpret_cast<void*>(compute_fn_return_status);
+    ParseArgs<Args...>(input_types_, output_types_);
+
+    OrtCustomOp::KernelComputeV2 = [](void* op_kernel, OrtKernelContext* context) -> OrtStatusPtr {
+      auto kernel = reinterpret_cast<Kernel*>(op_kernel);
+      std::vector<ArgPtr> args;
+      auto t = CreateTuple<0, 0, Args...>(context, args, kernel->num_input_, kernel->num_output_, kernel->ep_);
+      return std::apply([kernel](Args const&... t_args) { Status status = kernel->compute_fn_return_status_(t_args...); return status.release(); }, t);
+    };
+
+    OrtCustomOp::CreateKernel = [](const OrtCustomOp* this_, const OrtApi* ort_api, const OrtKernelInfo* info) {
+      auto kernel = std::make_unique<Kernel>();
+      auto me = static_cast<const MyType*>(this_);
+      kernel->compute_fn_return_status_ = reinterpret_cast<ComputeFnReturnStatus>(me->compute_fn_return_status_);
+      Ort::ThrowOnError(ort_api->KernelInfo_GetInputCount(info, &kernel->num_input_));
+      Ort::ThrowOnError(ort_api->KernelInfo_GetOutputCount(info, &kernel->num_output_));
+      auto self = static_cast<const OrtLiteCustomFunc*>(this_);
+      kernel->ep_ = self->execution_provider_;
+      return reinterpret_cast<void*>(kernel.release());
+    };
+
+    OrtCustomOp::KernelDestroy = [](void* op_kernel) {
+      delete reinterpret_cast<Kernel*>(op_kernel);
+    };
+
+    if (shape_infer_fn_) {
+      OrtCustomOp::InferOutputShapeFn = [](const OrtCustomOp* op, OrtShapeInferContext* ort_ctx) -> OrtStatusPtr {
+        auto shape_info_fn = static_cast<const MyType*>(op)->shape_infer_fn_;
+        ShapeInferContext ctx(&GetApi(), ort_ctx);
+        return shape_info_fn(ctx);
+      };
+    }
+  }
+};  // struct OrtLiteCustomFunc
+
+/////////////////////////// OrtLiteCustomStruct ///////////////////////////
+// The struct is to implement struct-as-op.
+// E.g. a struct might be defined as:
+//   struct Merge {
+//      Merge(const OrtApi* ort_api, const OrtKernelInfo* info) {...}
+//      void Compute(const Ort::Custom::Tensor<std::string_view>& strings_in,
+//                   std::string_view string_in,
+//                   Ort::Custom::Tensor<std::string>* strings_out) {...}
+//      bool reverse_ = false;
+//   };
+// It could be registered this way:
+//   Ort::CustomOpDomain v2_domain{"v2"};
+//   std::unique_ptr<OrtLiteCustomOp> mrg_op_ptr{Ort::Custom::CreateLiteCustomOp<Merge>("Merge", "CPUExecutionProvider")};
+//   v2_domain.Add(mrg_op_ptr.get());
+//   session_options.Add(v2_domain);
+// For the complete example, please search keyword "LiteCustomOpTest" under "<cloned_src_dir>/onnxruntime/test/".
+template <typename CustomOp>
+struct OrtLiteCustomStruct : public OrtLiteCustomOp {
+  template <typename... Args>
+  using CustomComputeFn = void (CustomOp::*)(Args...);
+
+  template <typename... Args>
+  using CustomComputeFnReturnStatus = Status (CustomOp::*)(Args...);
+
+  using MyType = OrtLiteCustomStruct<CustomOp>;
+
+  struct Kernel {
+    size_t num_input_{};
+    size_t num_output_{};
+    std::unique_ptr<CustomOp> custom_op_;
+    std::string ep_{};
+  };
+
+  OrtLiteCustomStruct(const char* op_name,
+                      const char* execution_provider,
+                      int start_ver = 1,
+                      int end_ver = MAX_CUSTOM_OP_END_VER) : OrtLiteCustomOp(op_name, execution_provider, {}, start_ver, end_ver) {
+    SetCompute(&CustomOp::Compute);
+
+    OrtCustomOp::CreateKernel = [](const OrtCustomOp* this_, const OrtApi* ort_api, const OrtKernelInfo* info) {
+      auto kernel = std::make_unique<Kernel>();
+      Ort::ThrowOnError(ort_api->KernelInfo_GetInputCount(info, &kernel->num_input_));
+      Ort::ThrowOnError(ort_api->KernelInfo_GetOutputCount(info, &kernel->num_output_));
+      kernel->custom_op_ = std::make_unique<CustomOp>(ort_api, info);
+      auto self = static_cast<const OrtLiteCustomStruct*>(this_);
+      kernel->ep_ = self->execution_provider_;
+      return reinterpret_cast<void*>(kernel.release());
+    };
+
+    OrtCustomOp::KernelDestroy = [](void* op_kernel) {
+      delete reinterpret_cast<Kernel*>(op_kernel);
+    };
+
+    SetShapeInfer<CustomOp>(0);
+  }
+
+  template <typename... Args>
+  void SetCompute(CustomComputeFn<Args...>) {
+    ParseArgs<Args...>(input_types_, output_types_);
+    OrtCustomOp::KernelCompute = [](void* op_kernel, OrtKernelContext* context) {
+      auto kernel = reinterpret_cast<Kernel*>(op_kernel);
+      ArgPtrs args;
+      auto t = CreateTuple<0, 0, Args...>(context, args, kernel->num_input_, kernel->num_output_, kernel->ep_);
+      std::apply([kernel](Args const&... t_args) { kernel->custom_op_->Compute(t_args...); }, t);
+    };
+  }
+
+  template <typename... Args>
+  void SetCompute(CustomComputeFnReturnStatus<Args...>) {
+    ParseArgs<Args...>(input_types_, output_types_);
+    OrtCustomOp::KernelComputeV2 = [](void* op_kernel, OrtKernelContext* context) -> OrtStatusPtr {
+      auto kernel = reinterpret_cast<Kernel*>(op_kernel);
+      ArgPtrs args;
+      auto t = CreateTuple<0, 0, Args...>(context, args, kernel->num_input_, kernel->num_output_, kernel->ep_);
+      return std::apply([kernel](Args const&... t_args) { Status status = kernel->custom_op_->Compute(t_args...); return status.release(); }, t);
+    };
+  }
+
+  template <typename C>
+  decltype(&C::InferOutputShape) SetShapeInfer(decltype(&C::InferOutputShape)) {
+    OrtCustomOp::InferOutputShapeFn = [](const OrtCustomOp*, OrtShapeInferContext* ort_ctx) -> OrtStatusPtr {
+      ShapeInferContext ctx(&GetApi(), ort_ctx);
+      return C::InferOutputShape(ctx);
+    };
+    return {};
+  }
+
+  template <typename C>
+  void SetShapeInfer(...) {
+    OrtCustomOp::InferOutputShapeFn = {};
+  }
+};  // struct OrtLiteCustomStruct
+
+/////////////////////////// CreateLiteCustomOp ////////////////////////////
+
+template <typename... Args>
+OrtLiteCustomOp* CreateLiteCustomOp(const char* op_name,
+                                    const char* execution_provider,
+                                    void (*custom_compute_fn)(Args...),
+                                    Status (*shape_infer_fn)(ShapeInferContext&) = {},
+                                    int start_ver = 1,
+                                    int end_ver = MAX_CUSTOM_OP_END_VER) {
+  using LiteOp = OrtLiteCustomFunc<Args...>;
+  return std::make_unique<LiteOp>(op_name, execution_provider, custom_compute_fn, shape_infer_fn, start_ver, end_ver).release();
+}
+
+template <typename... Args>
+OrtLiteCustomOp* CreateLiteCustomOp(const char* op_name,
+                                    const char* execution_provider,
+                                    Status (*custom_compute_fn_v2)(Args...),
+                                    Status (*shape_infer_fn)(ShapeInferContext&) = {},
+                                    int start_ver = 1,
+                                    int end_ver = MAX_CUSTOM_OP_END_VER) {
+  using LiteOp = OrtLiteCustomFunc<Args...>;
+  return std::make_unique<LiteOp>(op_name, execution_provider, custom_compute_fn_v2, shape_infer_fn, start_ver, end_ver).release();
+}
+
+template <typename CustomOp>
+OrtLiteCustomOp* CreateLiteCustomOp(const char* op_name,
+                                    const char* execution_provider,
+                                    int start_ver = 1,
+                                    int end_ver = MAX_CUSTOM_OP_END_VER) {
+  using LiteOp = OrtLiteCustomStruct<CustomOp>;
+  return std::make_unique<LiteOp>(op_name, execution_provider, start_ver, end_ver).release();
+}
+
+}  // namespace Custom
+}  // namespace Ort
diff --git a/3rdParty/ONNX/onnxruntime_run_options_config_keys.h b/3rdParty/ONNX/onnxruntime_run_options_config_keys.h
new file mode 100644
index 0000000000..bb4ce8d3fa
--- /dev/null
+++ b/3rdParty/ONNX/onnxruntime_run_options_config_keys.h
@@ -0,0 +1,54 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+#pragma once
+
+/*
+ * This file defines RunOptions Config Keys and format of the Config Values.
+ *
+ * The Naming Convention for a RunOptions Config Key,
+ * "[Area][.[SubArea1].[SubArea2]...].[Keyname]"
+ * Such as "ep.cuda.use_arena"
+ * The Config Key cannot be empty
+ * The maximum length of the Config Key is 128
+ *
+ * The string format of a RunOptions Config Value is defined individually for each Config.
+ * The maximum length of the Config Value is 1024
+ */
+
+// Key for enabling shrinkages of user listed device memory arenas.
+// Expects a list of semi-colon separated key value pairs separated by colon in the following format:
+// "device_0:device_id_0;device_1:device_id_1"
+// No white-spaces allowed in the provided list string.
+// Currently, the only supported devices are : "cpu", "gpu" (case sensitive).
+// If "cpu" is included in the list, DisableCpuMemArena() API must not be called (i.e.) arena for cpu should be enabled.
+// Example usage: "cpu:0;gpu:0" (or) "gpu:0"
+// By default, the value for this key is empty (i.e.) no memory arenas are shrunk
+static const char* const kOrtRunOptionsConfigEnableMemoryArenaShrinkage = "memory.enable_memory_arena_shrinkage";
+
+// Set to '1' to not synchronize execution providers with CPU at the end of session run.
+// Per default it will be set to '0'
+// Taking CUDA EP as an example, it omit triggering cudaStreamSynchronize on the compute stream.
+static const char* const kOrtRunOptionsConfigDisableSynchronizeExecutionProviders = "disable_synchronize_execution_providers";
+
+// Set HTP performance mode for QNN HTP backend before session run.
+// options for HTP performance mode: "burst", "balanced", "default", "high_performance",
+// "high_power_saver", "low_balanced", "extreme_power_saver", "low_power_saver", "power_saver",
+// "sustained_high_performance". Default to "default".
+static const char* const kOrtRunOptionsConfigQnnPerfMode = "qnn.htp_perf_mode";
+
+// Set HTP performance mode for QNN HTP backend post session run.
+static const char* const kOrtRunOptionsConfigQnnPerfModePostRun = "qnn.htp_perf_mode_post_run";
+
+// Set RPC control latency for QNN HTP backend
+static const char* const kOrtRunOptionsConfigQnnRpcControlLatency = "qnn.rpc_control_latency";
+
+// Set QNN Lora Config File for apply Lora in QNN context binary
+static const char* const kOrtRunOptionsConfigQnnLoraConfig = "qnn.lora_config";
+
+// Set graph annotation id for CUDA EP. Use with enable_cuda_graph=true.
+// The value should be an integer. If the value is not set, the default value is 0 and
+// ORT session only captures one cuda graph before another capture is requested.
+// If the value is set to -1, cuda graph capture/replay is disabled in that run.
+// User are not expected to set the value to 0 as it is reserved for internal use.
+static const char* const kOrtRunOptionsConfigCudaGraphAnnotation = "gpu_graph_id";
diff --git a/3rdParty/ONNX/onnxruntime_session_options_config_keys.h b/3rdParty/ONNX/onnxruntime_session_options_config_keys.h
new file mode 100644
index 0000000000..dec8e2b84d
--- /dev/null
+++ b/3rdParty/ONNX/onnxruntime_session_options_config_keys.h
@@ -0,0 +1,366 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+#pragma once
+
+/*
+ * This file defines SessionOptions Config Keys and format of the Config Values.
+ *
+ * The Naming Convention for a SessionOptions Config Key,
+ * "[Area][.[SubArea1].[SubArea2]...].[Keyname]"
+ * Such as "ep.cuda.use_arena"
+ * The Config Key cannot be empty
+ * The maximum length of the Config Key is 1024
+ *
+ * The string format of a SessionOptions Config Value is defined individually for each Config.
+ * The maximum length of the Config Value is 2048
+ */
+
+// Key for disable PrePacking,
+// If the config value is set to "1" then the prepacking is disabled, otherwise prepacking is enabled (default value)
+static const char* const kOrtSessionOptionsConfigDisablePrepacking = "session.disable_prepacking";
+
+// A value of "1" means allocators registered in the env will be used. "0" means the allocators created in the session
+// will be used. Use this to override the usage of env allocators on a per session level.
+static const char* const kOrtSessionOptionsConfigUseEnvAllocators = "session.use_env_allocators";
+
+// Set to 'ORT' (case sensitive) to load an ORT format model.
+// If unset, model type will default to ONNX unless inferred from filename ('.ort' == ORT format) or bytes to be ORT
+static const char* const kOrtSessionOptionsConfigLoadModelFormat = "session.load_model_format";
+
+// Set to 'ORT' (case sensitive) to save optimized model in ORT format when SessionOptions.optimized_model_path is set.
+// If unset, format will default to ONNX unless optimized_model_filepath ends in '.ort'.
+static const char* const kOrtSessionOptionsConfigSaveModelFormat = "session.save_model_format";
+
+// If a value is "1", flush-to-zero and denormal-as-zero are applied. The default is "0".
+// When multiple sessions are created, a main thread doesn't override changes from succeeding session options,
+// but threads in session thread pools follow option changes.
+// When ORT runs with OpenMP, the same rule is applied, i.e. the first session option to flush-to-zero and
+// denormal-as-zero is only applied to global OpenMP thread pool, which doesn't support per-session thread pool.
+// Note that an alternative way not using this option at runtime is to train and export a model without denormals
+// and that's recommended because turning this option on may hurt model accuracy.
+static const char* const kOrtSessionOptionsConfigSetDenormalAsZero = "session.set_denormal_as_zero";
+
+// It controls to run quantization model in QDQ (QuantizelinearDeQuantizelinear) format or not.
+// "0": enable. ORT does fusion logic for QDQ format.
+// "1": disable. ORT doesn't do fusion logic for QDQ format.
+// Its default value is "0" unless the DirectML execution provider is registered, in which case it defaults to "1".
+static const char* const kOrtSessionOptionsDisableQuantQDQ = "session.disable_quant_qdq";
+
+// It controls whether to enable Double QDQ remover and Identical Children Consolidation
+// "0": not to disable. ORT does remove the middle 2 Nodes from a Q->(QD->Q)->QD pairs
+// "1": disable. ORT doesn't remove the middle 2 Nodes from a Q->(QD->Q)->QD pairs
+// Its default value is "0"
+static const char* const kOrtSessionOptionsDisableDoubleQDQRemover = "session.disable_double_qdq_remover";
+
+// If set to "1", enables the removal of QuantizeLinear/DequantizeLinear node pairs once all QDQ handling has been
+// completed. e.g. If after all QDQ handling has completed and we have -> FloatOp -> Q -> DQ -> FloatOp -> the
+// Q -> DQ could potentially be removed. This will provide a performance benefit by avoiding going from float to
+// 8-bit and back to float, but could impact accuracy. The impact on accuracy will be model specific and depend on
+// other factors like whether the model was created using Quantization Aware Training or Post Training Quantization.
+// As such, it's best to test to determine if enabling this works well for your scenario.
+// The default value is "0"
+// Available since version 1.11.
+static const char* const kOrtSessionOptionsEnableQuantQDQCleanup = "session.enable_quant_qdq_cleanup";
+
+// Enable or disable gelu approximation in graph optimization. "0": disable; "1": enable. The default is "0".
+// GeluApproximation has side effects which may change the inference results. It is disabled by default due to this.
+static const char* const kOrtSessionOptionsEnableGeluApproximation = "optimization.enable_gelu_approximation";
+
+// This setting controls whether to enable AheadOfTime function inlining.
+// AOT function inlining examines the graph and attempts to inline as many locally defined functions in the model
+// as possible with the help of enabled execution providers.
+// This can reduce the number of function calls and improve performance because it is done before
+// Level1 optimizers and constant folding. However, under some circumstances, when the EPs are not available,
+// one can disable the AOT inlining, produce an optimized model and postpone AOT until run time.
+// "0": enable; "1": disable.
+// Its default value is "0".
+static const char* const kOrtSessionOptionsDisableAheadOfTimeFunctionInlining = "session.disable_aot_function_inlining";
+
+#ifdef ENABLE_TRAINING
+// Specifies a path of the file containing a list of memory optimization configurations.
+// The value should be a string indicating the file path of the config file.
+// The content of the config file is a JSON struct like this:
+// [
+//   "Gelu+Cast+:1:0",
+//   "Dropout+:1:1"
+// ]
+// Taking the example of "Gelu+Cast+:1:0",
+// > "Gelu+Cast+" is the subgraph string, a valid "subgraph string" should be one subgraph representation
+//    output by ORT graph transformations.
+// > "1" is "optimization strategy", valid values: 0 - disabled, 1 - recompute.
+// > "0" is "number of subgraph to apply" which is used to control how many subgraphs to apply optimization,
+//    to avoid "oversaving" the memory.
+static const char* const kOrtSessionOptionsMemoryOptimizerApplyConfig = "optimization.memory_optimizer_config";
+
+// Specifies the config for detecting subgraphs for memory footprint reduction.
+// The value should be a string contains int separated using commas. The default value is "0:0".
+static const char* const kOrtSessionOptionsMemoryOptimizerProbeConfig = "optimization.enable_memory_probe_recompute_config";
+#endif
+
+// This setting if set should contain a comma separated list of optimizers names that should be disabled.
+// Optimizers may take time to execute and affect model loading time. If you feel that a specific optimizer
+// does not provider runtime benefits, but affects your model loading time you may disable it using this config
+// entry. This option is not enabled in ORT_MINIMAL_BUILD build.
+// A list of optimizes is available in onnxruntime/core/optimizer/graph_transformer_utils.cc
+//
+// Default is an empty string which means no optimizers are disabled.
+static const char* const kOrtSessionOptionsDisableSpecifiedOptimizers = "optimization.disable_specified_optimizers";
+
+// Enable or disable using device allocator for allocating initialized tensor memory. "1": enable; "0": disable. The default is "0".
+// Using device allocators means the memory allocation is made using malloc/new.
+static const char* const kOrtSessionOptionsUseDeviceAllocatorForInitializers = "session.use_device_allocator_for_initializers";
+
+// Configure whether to allow the inter_op/intra_op threads spinning a number of times before blocking
+// "0": thread will block if found no job to run
+// "1": default, thread will spin a number of times before blocking
+static const char* const kOrtSessionOptionsConfigAllowInterOpSpinning = "session.inter_op.allow_spinning";
+static const char* const kOrtSessionOptionsConfigAllowIntraOpSpinning = "session.intra_op.allow_spinning";
+
+// Key for using model bytes directly for ORT format
+// If a session is created using an input byte array contains the ORT format model data,
+// By default we will copy the model bytes at the time of session creation to ensure the model bytes
+// buffer is valid.
+// Setting this option to "1" will disable copy the model bytes, and use the model bytes directly. The caller
+// has to guarantee that the model bytes are valid until the ORT session using the model bytes is destroyed.
+static const char* const kOrtSessionOptionsConfigUseORTModelBytesDirectly = "session.use_ort_model_bytes_directly";
+
+/// <summary>
+/// Key for using the ORT format model flatbuffer bytes directly for initializers.
+/// This avoids copying the bytes and reduces peak memory usage during model loading and initialization.
+/// Requires `session.use_ort_model_bytes_directly` to be true.
+/// If set, the flatbuffer bytes provided when creating the InferenceSession MUST remain valid for the entire
+/// duration of the InferenceSession.
+/// </summary>
+static const char* const kOrtSessionOptionsConfigUseORTModelBytesForInitializers =
+    "session.use_ort_model_bytes_for_initializers";
+
+// This should only be specified when exporting an ORT format model for use on a different platform.
+// If the ORT format model will be used on ARM platforms set to "1". For other platforms set to "0"
+// Available since version 1.11.
+static const char* const kOrtSessionOptionsQDQIsInt8Allowed = "session.qdqisint8allowed";
+
+// x64 SSE4.1/AVX2/AVX512(with no VNNI) has overflow problem with quantizied matrix multiplication with U8S8.
+// To avoid this we need to use slower U8U8 matrix multiplication instead. This option, if
+// turned on, use slower U8U8 matrix multiplications. Only effective with AVX2 or AVX512
+// platforms.
+static const char* const kOrtSessionOptionsAvx2PrecisionMode = "session.x64quantprecision";
+
+// Specifies how minimal build graph optimizations are handled in a full build.
+// These optimizations are at the extended level or higher.
+// Possible values and their effects are:
+// "save": Save runtime optimizations when saving an ORT format model.
+// "apply": Only apply optimizations available in a minimal build.
+// ""/<unspecified>: Apply optimizations available in a full build.
+// Available since version 1.11.
+static const char* const kOrtSessionOptionsConfigMinimalBuildOptimizations =
+    "optimization.minimal_build_optimizations";
+
+// Note: The options specific to an EP should be specified prior to appending that EP to the session options object in
+// order for them to take effect.
+
+// Specifies a list of stop op types. Nodes of a type in the stop op types and nodes downstream from them will not be
+// run by the NNAPI EP.
+// The value should be a ","-delimited list of op types. For example, "Add,Sub".
+// If not specified, the default set of stop ops is used. To specify an empty stop ops types list and disable stop op
+// exclusion, set the value to "".
+static const char* const kOrtSessionOptionsConfigNnapiEpPartitioningStopOps = "ep.nnapi.partitioning_stop_ops";
+
+// Enabling dynamic block-sizing for multithreading.
+// With a positive value, thread pool will split a task of N iterations to blocks of size starting from:
+// N / (num_of_threads * dynamic_block_base)
+// As execution progresses, the size will decrease according to the diminishing residual of N,
+// meaning the task will be distributed in smaller granularity for better parallelism.
+// For some models, it helps to reduce the variance of E2E inference latency and boost performance.
+// The feature will not function by default, specify any positive integer, e.g. "4", to enable it.
+// Available since version 1.11.
+static const char* const kOrtSessionOptionsConfigDynamicBlockBase = "session.dynamic_block_base";
+
+// This option allows to decrease CPU usage between infrequent
+// requests and forces any TP threads spinning stop immediately when the last of
+// concurrent Run() call returns.
+// Spinning is restarted on the next Run() call.
+// Applies only to internal thread-pools
+static const char* const kOrtSessionOptionsConfigForceSpinningStop = "session.force_spinning_stop";
+
+// "1": all inconsistencies encountered during shape and type inference
+// will result in failures.
+// "0": in some cases warnings will be logged but processing will continue. The default.
+// May be useful to expose bugs in models.
+static const char* const kOrtSessionOptionsConfigStrictShapeTypeInference = "session.strict_shape_type_inference";
+
+// "1": every model using a more recent opset than the latest released one will fail
+// "0": the model may or may not work if onnxruntime cannot find an implementation, this option
+// is used for development purpose.
+static const char* const kOrtSessionOptionsConfigStrictAllowReleasedOpsetsOnly = "session.allow_released_opsets_only";
+
+// The file saves configuration for partitioning node among logic streams
+static const char* const kNodePartitionConfigFile = "session.node_partition_config_file";
+
+// This Option allows setting affinities for intra op threads.
+// Affinity string follows format:
+// logical_processor_id,logical_processor_id;logical_processor_id,logical_processor_id
+// Semicolon isolates configurations among threads, while comma split processors where ith thread expected to attach to.
+// e.g.1,2,3;4,5
+// specifies affinities for two threads, with the 1st thread attach to the 1st, 2nd, and 3rd processor, and 2nd thread to the 4th and 5th.
+// To ease the configuration, an "interval" is also allowed:
+// e.g. 1-8;8-16;17-24
+// orders that the 1st thread runs on first eight processors, 2nd thread runs on next eight processors, and so forth.
+// Note:
+// 1. Once set, the number of thread affinities must equal to intra_op_num_threads - 1, since ort does not set affinity on the main thread which
+//    is started and managed by the calling app;
+// 2. For windows, ort will infer the group id from a logical processor id, for example, assuming there are two groups with each has 64 logical processors,
+//    an id of 64 will be inferred as the last processor of the 1st group, while 65 will be interpreted as the 1st processor of the second group.
+//    Hence 64-65 is an invalid configuration, because a windows thread cannot be attached to processors across group boundary.
+static const char* const kOrtSessionOptionsConfigIntraOpThreadAffinities = "session.intra_op_thread_affinities";
+
+// This option will dump out the model to assist debugging any issues with layout transformation,
+// and is primarily intended for developer usage. It is only relevant if an execution provider that requests
+// NHWC layout is enabled such as NNAPI, XNNPACK or QNN.
+//
+// Default is off. Set to "1" to enable.
+//
+// If modified by layout transformation the model will be dumped after these steps:
+//   1) insertion of the layout transformation Transpose nodes
+//   2) after those are optimized using the transpose optimizer,
+//   3) after the L1 transformers are applied to the updated graph.
+// The model will be saved to filename post_layout_transform_step_<step_number>.onnx.
+static const char* const kDebugLayoutTransformation = "session.debug_layout_transformation";
+
+// Graph nodes that are not supported by the execution providers (EPs) explicitly added to the session are
+// assigned (i.e., "fallback") to the CPU EP by default.
+//
+// This option allows the user to disable the fallback of unsupported graph nodes to the CPU EP.
+// If this option is set to "1", session creation will fail if the execution providers other than the CPU EP cannot
+// fully support all of the nodes in the graph.
+//
+// It is invalid to set this option and explicitly add the CPU EP to the session. In this case, session creation
+// will also fail with an error.
+//
+// Option values:
+// - "0": CPU EP fallback is not disabled. [DEFAULT]
+// - "1": CPU EP fallback is disabled.
+static const char* const kOrtSessionOptionsDisableCPUEPFallback = "session.disable_cpu_ep_fallback";
+
+// Use this config when serializing a large model after optimization to specify an external initializers file
+static const char* const kOrtSessionOptionsOptimizedModelExternalInitializersFileName =
+    "session.optimized_model_external_initializers_file_name";
+
+// Use this config to control the minimum size of the initializer when externalizing it during serialization
+static const char* const kOrtSessionOptionsOptimizedModelExternalInitializersMinSizeInBytes =
+    "session.optimized_model_external_initializers_min_size_in_bytes";
+
+// When loading model from memory buffer and the model has external initializers
+// Use this config to set the external data file folder path
+// All external data files should be in the same folder
+static const char* const kOrtSessionOptionsModelExternalInitializersFileFolderPath =
+    "session.model_external_initializers_file_folder_path";
+
+// Use this config when saving pre-packed constant initializers to an external data file.
+// This allows you to memory map pre-packed initializers on model load and leave it to
+// to the OS the amount of memory consumed by the pre-packed initializers. Otherwise,
+// pre-packed data resides on the heap.
+//
+// - "0": Default is not save pre-packed initializers to a data file.
+// - "1": Save pre-packed constant initializers to an external data file.
+// Sample usage: sess_options.add_session_config_entry(kOrtSessionOptionsSavePrePackedConstantInitializers,  "1")
+static const char* const kOrtSessionOptionsSavePrePackedConstantInitializers =
+    "session.save_external_prepacked_constant_initializers";
+
+// Use this config when you want to collect memory stats for each node in the graph.
+// The file format is a CSV file with the following columns:
+// The file will be created if it does not exist, and will be overwritten if it does.
+//
+// The content of the file can be used to estimate memory requirements at run time including
+// the temporary allocations. This operation is preferably done on a CPU device, as the model may exceed
+// device memory limits in constrained environments. When enabling this option, it is important to disable
+// memory patterns, as they tend to allocate large blocks to avoid fragmentation and accommodate needs of multiple
+// kernels. Memory patterns may make it difficult to allocate on a device with limited memory.
+//
+// The collected stats then can be used to partition the graph among the devices in a way that only the
+// required memory is allocated on each device.
+//
+// node_name, initializers_memory, dynamic_outputs_sizes, temp_allocations_size
+//
+// - "full path to file": there is not a default for this option. If the file can not be opened for writing, an error will be returned.
+static const char* const kOrtSessionOptionsCollectNodeMemoryStatsToFile = "session.collect_node_memory_stats_to_file";
+
+/// This is a composite CSV setting formatted as "memory limit in kb,file name for collected stats"
+/// "limit > 0": enables Capacity Aware Partitioning for Cuda EP. `limit` is optional and when absent
+/// the provider may attempt to figure out the memory available automatically.
+/// The setting with no limit is expected to look like: ",file name for collected stats"
+///  The EP will place nodes on device "file name" :
+/// this file is expected to be found at the same folder with the model. The file contains
+/// pre-recorded stats collected when running with kOrtSessionOptionsCollectNodeMemoryStatsToFile enforce (see above)
+static const char* const kOrtSessionOptionsResourceCudaPartitioningSettings =
+    "session.resource_cuda_partitioning_settings";
+
+// Enable EP context feature to dump the partitioned graph which includes the EP context into Onnx file.
+// The dumped Onnx model with EP context can be used for future inference to avoid the EP graph partitioning/compile overhead.
+// "0": disable. (default)
+// "1": enable.
+static const char* const kOrtSessionOptionEpContextEnable = "ep.context_enable";
+
+// Specify the file path for the Onnx model which has EP context.
+// Default to original_file_name_ctx.onnx if not specified
+// Folder is not a valid option
+static const char* const kOrtSessionOptionEpContextFilePath = "ep.context_file_path";
+
+// Flag to specify whether to dump the EP context into the Onnx model.
+// "0": dump the EP context into separate file, keep the file name in the Onnx model. (default).
+// "1": dump the EP context into the Onnx model.
+static const char* const kOrtSessionOptionEpContextEmbedMode = "ep.context_embed_mode";
+
+// Specify the EPContext node name prefix to make it unique
+// in case user need to merge/connect multiple EPContext nodes in one model
+static const char* const kOrtSessionOptionEpContextNodeNamePrefix = "ep.context_node_name_prefix";
+
+// Share EP related resources across sessions
+static const char* const kOrtSessionOptionShareEpContexts = "ep.share_ep_contexts";
+
+// Stop to share EP related resources across sessions from then on
+static const char* const kOrtSessionOptionStopShareEpContexts = "ep.stop_share_ep_contexts";
+
+// Used only for context model generation.
+// This configuration is used when some nodes are partitioned on the CPU EP and those nodes have external initializers.
+// When generating the EP context model, the new model should not rely on the old external data file used by the source ONNX model.
+// Use this setting when dumping the EP context model with an external initializers file.
+// If specified, all initializers will be placed inside the external data file.
+// Otherwise, all initializers will be embedded inside the generated ONNX file.
+// By default, this option is not set, meaning all initializers will be included within the ONNX file.
+static const char* const kOrtSessionOptionsEpContextModelExternalInitializersFileName =
+    "ep.context_model_external_initializers_file_name";
+
+// Gemm fastmath mode provides fp32 gemm acceleration with bfloat16 based matmul.
+// Option values:
+// - "0": Gemm FastMath mode is not enabled. [DEFAULT]
+// - "1": Gemm FastMath mode is enabled.
+static const char* const kOrtSessionOptionsMlasGemmFastMathArm64Bfloat16 = "mlas.enable_gemm_fastmath_arm64_bfloat16";
+
+// When converting DQ + MatMul -> MatMulNBits, the accuracy level of the MatMulNBits is controlled by this option.
+// Refer to MatMulNBits op schema for more details.
+// If not provided, default is 4.
+static const char* const kOrtSessionOptionsQDQMatMulNBitsAccuracyLevel = "session.qdq_matmulnbits_accuracy_level";
+
+// THIS OPTION IS NOT A REGULAR SESSION OPTION SINCE IT CAN BE MODIFIED AT ANY TIME
+// Meant to be used with SetEpDynamicOptions
+// Specify the type of workload for this session.
+// “Default”: OS determines the scheduling priority and processor performance to service this workload. [Default]
+// “Efficient”: OS treats this workload is efficiency oriented with low scheduling priority and efficient processor performance.
+static const char* const kOrtEpDynamicOptionsWorkloadType = "ep.dynamic.workload_type";
+
+// Disables model compilation during session initialization.
+//
+// If this option is set to "1", inference session creation will fail with error code ORT_MODEL_REQUIRES_COMPILATION
+// if compilation is required to run the model on any Execution Provider added to the session.
+// Only the following kinds of models are valid when this option is set to "1":
+//   - Pre-compiled models that have EPContext nodes for the compiling Execution Providers in the session.
+//   - Non-compiled models that run only on non-compiling Execution Providers, like CPU EP.
+//
+// See \href https://onnxruntime.ai/docs/execution-providers/EP-Context-Design.html for details about
+// compiled models with EPContext nodes.
+//
+// Option values:
+// - "0": EP compile is not disabled. [DEFAULT]
+// - "1": EP compile is disabled.
+static const char* const kOrtSessionOptionsDisableModelCompile = "session.disable_model_compile";
diff --git a/3rdParty/ONNX/onnxruntime_training_c_api.h b/3rdParty/ONNX/onnxruntime_training_c_api.h
new file mode 100644
index 0000000000..f5897d535c
--- /dev/null
+++ b/3rdParty/ONNX/onnxruntime_training_c_api.h
@@ -0,0 +1,731 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// This file contains the training c apis.
+
+#pragma once
+#include <stdbool.h>
+#include "onnxruntime_c_api.h"
+
+/** \page training_c_cpp_api Training C & C++ APIs
+ *
+ * Training C and C++ APIs are an extension of the \ref c_cpp_api "onnxruntime core C and C++ APIs" and should be used in conjunction with them.
+ *
+ * In order to train a model with onnxruntime, the following training artifacts must be generated:
+ * - The training onnx model
+ * - The checkpoint file
+ * - The optimizer onnx model
+ * - The eval onnx model model (optional)
+ *
+ * These training artifacts can be generated as part of an offline step using the python [utilities](https://github.com/microsoft/onnxruntime/blob/main/orttraining/orttraining/python/training/onnxblock/README.md) made available in the `onnxruntime-training` python package.
+ *
+ * After these artifacts have been generated, the C and C++ utilities listed in this documentation can be leveraged to perform training.
+ *
+ * If any problem is encountered, please create an [issue](https://github.com/microsoft/onnxruntime/issues/new) with your scenario and requirements, and we will be sure to respond and follow up on the request.
+ *
+ * <h1>Training C API</h1>
+ *
+ * ::OrtTrainingApi - Training C API functions.
+ *
+ * This C structure contains functions that enable users to perform training with onnxruntime.
+ *
+ * _Sample Code_:
+ *
+ * ```c
+ * #include <onnxruntime_training_api.h>
+ *
+ * OrtApi* g_ort_api = OrtGetApiBase()->GetApi(ORT_API_VERSION);
+ * OrtTrainingApi* g_ort_training_api = g_ort_api->GetTrainingApi(ORT_API_VERSION);
+ *
+ * OrtEnv* env = NULL;
+ * g_ort_api->CreateEnv(logging_level, logid, &env);
+ * OrtSessionOptions* session_options = NULL;
+ * g_ort_api->CreateSessionOptions(&session_options);
+ *
+ * OrtCheckpointState* state = NULL;
+ * g_ort_training_api->LoadCheckpoint(path_to_checkpoint, &state);
+ *
+ * OrtTrainingSession* training_session = NULL;
+ * g_ort_training_api->CreateTrainingSession(env, session_options, training_model_path,
+ *                                           state, eval_model_path, optimizer_model_path,
+ *                                           &training_session);
+ * // Training loop
+ * {
+ *     g_ort_training_api->TrainStep(...);
+ *     g_ort_training_api->OptimizerStep(...);
+ *     g_ort_training_api->LazyResetGrad(...);
+ * }
+ *
+ * g_ort_training_api->ExportModelForInferencing(training_session, inference_model_path, ...);
+ * g_ort_training_api->SaveCheckpoint(state, path_to_checkpoint, false);
+ *
+ * g_ort_training_api->ReleaseTrainingSession(training_session);
+ * g_ort_training_api->ReleaseCheckpointState(state);
+ * ```
+ *
+ * > **Note**
+ * > The ::OrtCheckpointState contains the entire training state that the ::OrtTrainingSession uses. As a result, the training session must always have access to the state. That is to say, the ::OrtCheckpointState instance must outlive the lifetime of the ::OrtTrainingSession instance.
+ *
+ * <h1>Training C++ API</h1>
+ *
+ * @ref TrainingCpp - Training C++ API classes and functions.
+ *
+ * These C++ classes and functions enable users to perform training with onnxruntime.
+ *
+ * _Sample Code_:
+ *
+ * ```cc
+ * #include <onnxruntime_training_cxx_api.h>
+ *
+ * Ort::Env env;
+ * Ort::SessionOptions session_options;
+ *
+ * auto state = Ort::CheckpointState::LoadCheckpoint(path_to_checkpoint);
+ * auto training_session = Ort::TrainingSession(env, session_options, state, training_model_path,
+ *                                              eval_model_path, optimizer_model_path);
+ *
+ * // Training Loop
+ * {
+ *     training_session.TrainStep(...);
+ *     training_session.OptimizerStep(...);
+ *     training_session.LazyResetGrad(...);
+ * }
+ *
+ * training_session->ExportModelForInferencing(inference_model_path, ...);
+ * Ort::CheckpointState::SaveCheckpoint(state, path_to_checkpoint, false);
+ * ```
+ * > **Note**
+ * > The ::Ort::CheckpointState contains the entire training state that the ::Ort::TrainingSession uses. As a result, the training session must always have access to the state. That is to say, the ::Ort::CheckpointState instance must outlive the lifetime of the ::Ort::TrainingSession instance.
+ */
+
+/** @defgroup TrainingC Ort Training C API
+ * @{
+ */
+ORT_RUNTIME_CLASS(TrainingSession);  // Type that enables performing training for the given user models.
+ORT_RUNTIME_CLASS(CheckpointState);  // Type that holds the training states for the training session.
+
+/** \brief Type of property to be added to or returned from the ::OrtCheckpointState.
+ */
+typedef enum OrtPropertyType {
+  OrtIntProperty = 0,
+  OrtFloatProperty = 1,
+  OrtStringProperty = 2,
+} OrtPropertyType;
+
+/** \brief The Training C API that holds onnxruntime training function pointers
+ *
+ * All the Training C API functions are defined inside this structure as pointers to functions.
+ * Call OrtApi::GetTrainingApi to get a pointer to this struct.
+ *
+ * \nosubgrouping
+ */
+struct OrtTrainingApi {
+  /// \name Accessing The Training Session State
+  /// @{
+
+  /** \brief Load a checkpoint state from a file on disk into checkpoint_state.
+   *
+   * This function will parse a checkpoint file, pull relevant data and load the training
+   * state into the checkpoint_state. This checkpoint state can then be used to create the
+   * training session by invoking OrtTrainingApi::CreateTrainingSession. By doing so, the training
+   * session will resume training from the given checkpoint state.
+   * \note Note that the training session created with a checkpoint state uses this state to store the entire
+   * training state (including model parameters, its gradients, the optimizer states and the properties).
+   * As a result, it is required that the checkpoint state outlive the lifetime of the training session.
+   * \note Note that the checkpoint file can be either the complete checkpoint or the nominal checkpoint.
+   *
+   * \param[in] checkpoint_path Path to the checkpoint file
+   * \param[out] checkpoint_state Checkpoint state that contains the states of the training session.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   *
+   */
+  ORT_API2_STATUS(LoadCheckpoint, _In_ const ORTCHAR_T* checkpoint_path,
+                  _Outptr_ OrtCheckpointState** checkpoint_state);
+
+  /** \brief Save the given state to a checkpoint file on disk.
+   *
+   * This function serializes the provided checkpoint state to a file on disk.
+   * This checkpoint can later be loaded by invoking OrtTrainingApi::LoadCheckpoint to resume
+   * training from this snapshot of the state.
+   *
+   * \param[in] checkpoint_state The checkpoint state to save.
+   * \param[in] checkpoint_path Path to the checkpoint file.
+   * \param[in] include_optimizer_state Flag to indicate whether to save the optimizer state or not.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   *
+   */
+  ORT_API2_STATUS(SaveCheckpoint, _In_ OrtCheckpointState* checkpoint_state, _In_ const ORTCHAR_T* checkpoint_path,
+                  const bool include_optimizer_state);
+
+  /// @}
+
+  /// \name Implementing The Training Loop
+  /// @{
+  /** \brief Create a training session that can be used to begin or resume training.
+   *
+   * This function creates a training session based on the env and session options provided that can
+   * begin or resume training from a given checkpoint state for the given onnx models.
+   * The checkpoint state represents the parameters of the training session which will be moved
+   * to the device specified by the user through the session options (if necessary).
+   * The training session requires four training artifacts
+   * - The training onnx model
+   * - The evaluation onnx model (optional)
+   * - The optimizer onnx model
+   * - The checkpoint file
+   *
+   * These artifacts can be generated using the `onnxruntime-training` python [utility](https://github.com/microsoft/onnxruntime/blob/main/orttraining/orttraining/python/training/onnxblock/README.md).
+   *
+   * \param[in] env Environment to be used for the training session.
+   * \param[in] options Session options that the user can customize for this training session.
+   * \param[in] checkpoint_state Training states that the training session uses as a starting point for training.
+   * \param[in] train_model_path Model to be used to perform training.
+   * \param[in] eval_model_path Model to be used to perform evaluation.
+   * \param[in] optimizer_model_path Model to be used to perform gradient descent.
+   * \param[out] out Created training session.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   *
+   */
+  ORT_API2_STATUS(CreateTrainingSession, _In_ const OrtEnv* env, _In_ const OrtSessionOptions* options,
+                  _Inout_ OrtCheckpointState* checkpoint_state, _In_ const ORTCHAR_T* train_model_path,
+                  _In_ const ORTCHAR_T* eval_model_path, _In_ const ORTCHAR_T* optimizer_model_path,
+                  _Outptr_result_maybenull_ OrtTrainingSession** out);
+
+  /** \brief Create a training session that can be used to begin or resume training.
+   * This api provides a way to load all the training artifacts from buffers instead of files.
+   *
+   * \param[in] env Environment to be used for the training session.
+   * \param[in] options Session options that the user can customize for this training session.
+   * \param[in] checkpoint_state Training states that the training session uses as a starting point for training.
+   * \param[in] train_model_data Buffer containing the model data to be used to perform training
+   * \param[in] train_data_length Length of the buffer containing train_model_data
+   * \param[in] eval_model_data Buffer containing the model data to be used to perform evaluation
+   * \param[in] eval_data_length Length of the buffer containing eval_model_data
+   * \param[in] optim_model_data Buffer containing the model data to be used to perform weight update
+   * \param[in] optim_data_length Length of the buffer containing optim_model_data
+   * \param[out] out Created training session.
+   *
+   */
+  ORT_API2_STATUS(CreateTrainingSessionFromBuffer, _In_ const OrtEnv* env,
+                  _In_ const OrtSessionOptions* options, _Inout_ OrtCheckpointState* checkpoint_state,
+                  _In_ const void* train_model_data, size_t train_data_length,
+                  _In_ const void* eval_model_data, size_t eval_data_length,
+                  _In_ const void* optim_model_data, size_t optim_data_length,
+                  _Outptr_result_maybenull_ OrtTrainingSession** out);
+
+  /// @}
+
+  /// \name Model IO Information
+  /// @{
+
+  /** \brief Retrieves the number of user outputs in the training model.
+   *
+   * This function returns the number of outputs of the training model so that the user can
+   * allocate space for the number of outputs when OrtTrainingApi::TrainStep is invoked.
+   *
+   * \param[in] sess The `this` pointer to the training session.
+   * \param[out] out Number of user outputs in the training model.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   *
+   */
+  ORT_API2_STATUS(TrainingSessionGetTrainingModelOutputCount, _In_ const OrtTrainingSession* sess, _Out_ size_t* out);
+
+  /** \brief Retrieves the number of user outputs in the eval model.
+   *
+   * This function returns the number of outputs of the eval model so that the user can
+   * allocate space for the number of outputs when OrtTrainingApi::EvalStep is invoked.
+   *
+   * \param[in] sess The `this` pointer to the training session.
+   * \param[out] out Number of user outputs in the eval model.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   *
+   */
+  ORT_API2_STATUS(TrainingSessionGetEvalModelOutputCount, _In_ const OrtTrainingSession* sess, _Out_ size_t* out);
+
+  /** \brief Retrieves the names of user outputs in the training model.
+   *
+   * This function returns the names of outputs of the training model that can be associated with the OrtValue(s)
+   * returned by the OrtTrainingApi::TrainStep function.
+   *
+   * \param[in] sess The `this` pointer to the training session.
+   * \param[in] index Index of the output name requested.
+   * \param[in] allocator Allocator to use to allocate the memory for the name.
+   * \param[out] output Name of the training model output at the given index.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   *
+   */
+  ORT_API2_STATUS(TrainingSessionGetTrainingModelOutputName, _In_ const OrtTrainingSession* sess, size_t index, _Inout_ OrtAllocator* allocator, _Outptr_ char** output);
+
+  /** \brief Retrieves the names of user outputs in the eval model.
+   *
+   * This function returns the names of outputs of the eval model that can be associated with the OrtValue(s) returned
+   * by the OrtTrainingApi::EvalStep function.
+   *
+   * \param[in] sess The `this` pointer to the training session.
+   * \param[in] index Index of the output name requested.
+   * \param[in] allocator Allocator to use to allocate the memory for the name.
+   * \param[out] output Name of the eval model output at the given index.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   *
+   */
+  ORT_API2_STATUS(TrainingSessionGetEvalModelOutputName, _In_ const OrtTrainingSession* sess, size_t index, _Inout_ OrtAllocator* allocator, _Outptr_ char** output);
+
+  /// @}
+
+  /// \name Implementing The Training Loop
+  /// @{
+
+  /** \brief Reset the gradients of all trainable parameters to zero lazily.
+   *
+   * This function sets the internal state of the training session such that the gradients of the trainable
+   * parameters in the OrtCheckpointState will be scheduled to be reset just before the new gradients are
+   * computed on the next invocation of the next OrtTrainingApi::TrainStep.
+   *
+   * \param[in] session The `this` pointer to the training session.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   *
+   */
+  ORT_API2_STATUS(LazyResetGrad, _Inout_ OrtTrainingSession* session);
+
+  /** \brief Computes the outputs of the training model and the gradients of the trainable parameters for the given inputs
+   *
+   * This function performs a training step that computes the outputs of the training model and the gradients
+   * of the trainable parameters for the given inputs. The train step is performed based on the training model
+   * that was provided to the training session.
+   * The OrtTrainingApi::TrainStep is equivalent of running forward propagation and backward propagation in a single
+   * step.
+   * The gradients computed are stored inside the training session state so they can be later consumed
+   * by the OrtTrainingApi::OptimizerStep function.
+   * The gradients can be lazily reset by invoking the OrtTrainingApi::LazyResetGrad function.
+   *
+   * \param[in] sess The `this` pointer to the training session.
+   * \param[in] run_options Run options for this training step.
+   * \param[in] inputs_len Number of user inputs to the training model.
+   * \param[in] inputs The user inputs to the training model.
+   * \param[in] outputs_len Number of user outputs expected from this training step.
+   * \param[out] outputs User outputs computed by train step.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   *
+   */
+  ORT_API2_STATUS(TrainStep, _Inout_ OrtTrainingSession* sess, _In_opt_ const OrtRunOptions* run_options,
+                  _In_ size_t inputs_len, _In_reads_(inputs_len) const OrtValue* const* inputs,
+                  _In_ size_t outputs_len, _Inout_updates_all_(outputs_len) OrtValue** outputs);
+
+  /** \brief Computes the outputs for the eval model for the given inputs
+   *
+   * This function performs an eval step that computes the outputs of the eval model for the given inputs.
+   * The eval step is performed based on the eval model that was provided to the training session.
+   *
+   * \param[in] sess The `this` pointer to the training session.
+   * \param[in] run_options Run options for this eval step.
+   * \param[in] inputs_len Number of user inputs to the eval model.
+   * \param[in] inputs The user inputs to the eval model.
+   * \param[in] outputs_len Number of user outputs expected from this eval step.
+   * \param[out] outputs User outputs computed by eval step.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   *
+   */
+  ORT_API2_STATUS(EvalStep, _In_ const OrtTrainingSession* sess, _In_opt_ const OrtRunOptions* run_options,
+                  _In_ size_t inputs_len, _In_reads_(inputs_len) const OrtValue* const* inputs,
+                  _In_ size_t outputs_len, _Inout_updates_all_(outputs_len) OrtValue** outputs);
+
+  /** \brief Sets the learning rate for this training session.
+   *
+   * This function allows users to set the learning rate for the training session. The current
+   * learning rate is maintained by the training session and can be overwritten by invoking
+   * this function with the desired learning rate. This function should not be used when a valid
+   * learning rate scheduler is registered. It should be used either to set the learning rate
+   * derived from a custom learning rate scheduler or to set a constant learning rate to be used
+   * throughout the training session.
+   * \note Please note that this function does not set the initial learning rate that may be needed
+   * by the predefined learning rate schedulers. To set the initial learning rate for learning
+   * rate schedulers, please look at the function OrtTrainingApi::RegisterLinearLRScheduler.
+   *
+   * \param[in] sess The `this` pointer to the training session.
+   * \param[in] learning_rate Desired learning rate to be set.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   *
+   */
+  ORT_API2_STATUS(SetLearningRate, _Inout_ OrtTrainingSession* sess, _In_ float learning_rate);
+
+  /** \brief Gets the current learning rate for this training session.
+   *
+   * This function allows users to get the learning rate for the training session. The current
+   * learning rate is maintained by the training session, and users can query it for the purpose
+   * of implementing their own learning rate schedulers.
+   *
+   * \param[in] sess The `this` pointer to the training session.
+   * \param[out] learning_rate Learning rate currently in use by the training session.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   *
+   */
+  ORT_API2_STATUS(GetLearningRate, _Inout_ OrtTrainingSession* sess, _Out_ float* learning_rate);
+
+  /** \brief Performs the weight updates for the trainable parameters using the optimizer model.
+   *
+   * This function performs the weight update step that updates the trainable parameters such that they
+   * take a step in the direction of their gradients (gradient descent). The optimizer step is performed
+   * based on the optimizer model that was provided to the training session.
+   * The updated parameters are stored inside the training state so that they can be used by the next
+   * OrtTrainingApi::TrainStep function call.
+   *
+   * \param[in] sess The `this` pointer to the training session.
+   * \param[in] run_options Run options for this optimizer step.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   *
+   */
+  ORT_API2_STATUS(OptimizerStep, _Inout_ OrtTrainingSession* sess,
+                  _In_opt_ const OrtRunOptions* run_options);
+
+  /** \brief Registers a linear learning rate scheduler for the training session.
+   *
+   * Register a linear learning rate scheduler that decays the learning rate by linearly updated
+   * multiplicative factor from the initial learning rate set on the training session to 0. The decay
+   * is performed after the initial warm up phase where the learning rate is linearly incremented
+   * from 0 to the initial learning rate provided.
+   *
+   * \param[in] sess The `this` pointer to the training session.
+   * \param[in] warmup_step_count Warmup steps for LR warmup.
+   * \param[in] total_step_count Total step count.
+   * \param[in] initial_lr The initial learning rate to be used by the training session.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   *
+   */
+  ORT_API2_STATUS(RegisterLinearLRScheduler, _Inout_ OrtTrainingSession* sess, _In_ const int64_t warmup_step_count,
+                  _In_ const int64_t total_step_count, _In_ const float initial_lr);
+
+  /** \brief Update the learning rate based on the registered learing rate scheduler.
+   *
+   * Takes a scheduler step that updates the learning rate that is being used by the training session.
+   * This function should typically be called before invoking the optimizer step for each round,
+   * or as determined necessary to update the learning rate being used by the training session.
+   * \note Please note that a valid predefined learning rate scheduler must be first registered to invoke this
+   * function.
+   *
+   * \param[in] sess The `this` pointer to the training session.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   *
+   */
+  ORT_API2_STATUS(SchedulerStep, _Inout_ OrtTrainingSession* sess);
+
+  /// @}
+
+  /// \name Accessing The Training Session State
+  /// @{
+  /** \brief Retrieves the size of all the parameters.
+   *
+   * Calculates the total number of primitive (datatype of the parameters) elements of all the parameters in the
+   * training state.
+   * When trainable_only argument is true, the size is calculated for trainable params only.
+   *
+   * \param[in] sess The `this` pointer to the training session.
+   * \param[out] out Size of all parameter elements.
+   * \param[in] trainable_only Whether to skip non-trainable parameters
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   *
+   */
+  ORT_API2_STATUS(GetParametersSize, _Inout_ OrtTrainingSession* sess, _Out_ size_t* out, bool trainable_only);
+
+  /** \brief Copy all parameters to a contiguous buffer held by the argument parameters_buffer
+   *
+   * The parameters_buffer has to be of the size given by GetParametersSize api call,
+   * with matching setting for the argument trainable_only. All the target parameters must be of the same
+   * datatype. The OrtValue must be pre-allocated onto
+   * the desired device. This is a complementary function to OrtTrainingApi::CopyBufferToParameters.
+   * Parameter ordering is preserved.
+   * User is responsible for allocating and freeing the resources used by the parameters_buffer.
+   *
+   * \param[in] sess The `this` pointer to the training session.
+   * \param[in] trainable_only Whether to skip non-trainable parameters
+   * \param[out] parameters_buffer The pre-allocated OrtValue buffer to copy onto.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   *
+   */
+  ORT_API2_STATUS(CopyParametersToBuffer, _Inout_ OrtTrainingSession* sess,
+                  _Inout_ OrtValue* parameters_buffer, bool trainable_only);
+
+  /** \brief Copy parameter values from the given contiguous buffer held by parameters_buffer to the training state
+   *
+   * The parameters_buffer argument has to be of the size given by OrtTrainingApi::GetParametersSize api call,
+   * with matching setting for trainable_only argument. All the target parameters must be of the same
+   * datatype. This is a complementary function to OrtTrainingApi::CopyParametersToBuffer
+   * and can be used to load updated buffer values onto the training state.
+   * Parameter ordering is preserved.
+   * User is responsible for allocating and freeing the resources used by the parameters_buffer.
+   * In case the training session was created with a nominal checkpoint, invoking this function is required
+   * to load the updated parameters onto the checkpoint to complete it.
+   *
+   * \param[in] sess The `this` pointer to the training session.
+   * \param[in] trainable_only Whether to skip non-trainable parameters
+   * \param[out] parameters_buffer The pre-allocated OrtValue buffer to copy from.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   *
+   */
+  ORT_API2_STATUS(CopyBufferToParameters, _Inout_ OrtTrainingSession* sess,
+                  _Inout_ OrtValue* parameters_buffer, bool trainable_only);
+
+  /// @}
+
+  /// \name Release Training Resources
+  /// @{
+
+  /** \brief Frees up the memory used up by the training session.
+   *
+   * This function frees up any memory that was allocated in the training session. The training
+   * session can no longer be used after this call.
+   *
+   */
+  ORT_CLASS_RELEASE(TrainingSession);
+
+  /** \brief Frees up the memory used up by the checkpoint state.
+   *
+   * This function frees up any memory that was allocated in the checkpoint state. The checkpoint
+   * state can no longer be used after this call.
+   * \note Note that the checkpoint state must be released only after the training session has been released.
+   *
+   */
+  ORT_CLASS_RELEASE(CheckpointState);
+
+  /// @}
+
+  /// \name Prepare For Inferencing
+  /// @{
+  /** \brief Export a model that can be used for inferencing.
+   *
+   * If the training session was provided with an eval model, the training session can generate
+   * an inference model if it knows the inference graph outputs. The input inference graph outputs
+   * are used to prune the eval model so that the inference model's outputs align with the provided outputs.
+   * The exported model is saved at the path provided and can be used for inferencing with InferenceSession.
+   * \note Note that the function re-loads the eval model from the path provided to OrtTrainingApi::CreateTrainingSession
+   * and expects that this path still be valid.
+   *
+   * \param[in] sess The `this` pointer to the training session.
+   * \param[in] inference_model_path Path where the inference model should be serialized to.
+   * \param[in] graph_outputs_len Size of the graph output names array.
+   * \param[in] graph_output_names Names of the outputs that are needed in the inference model.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   *
+   */
+  ORT_API2_STATUS(ExportModelForInferencing, _Inout_ OrtTrainingSession* sess,
+                  _In_ const ORTCHAR_T* inference_model_path, size_t graph_outputs_len,
+                  _In_reads_(graph_outputs_len) const char* const* graph_output_names);
+
+  /// @}
+
+  /// \name Training Utilities
+  /// @{
+  /** \brief Sets the seed used for random number generation in Onnxruntime.
+   *
+   * Use this function to generate reproducible results. It should be noted that completely reproducible
+   * results are not guaranteed.
+   *
+   * \param[in] seed The seed to be set.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   *
+   */
+  ORT_API2_STATUS(SetSeed, _In_ const int64_t seed);
+
+  /// @}
+
+  /// \name Model IO Information
+  /// @{
+  /** \brief Retrieves the number of user inputs in the training model.
+   *
+   * This function returns the number of inputs of the training model so that the user can accordingly
+   * allocate the OrtValue(s) provided to the OrtTrainingApi::TrainStep function.
+   *
+   * \param[in] sess The `this` pointer to the training session.
+   * \param[out] out Number of user inputs in the training model.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   *
+   */
+  ORT_API2_STATUS(TrainingSessionGetTrainingModelInputCount, _In_ const OrtTrainingSession* sess, _Out_ size_t* out);
+
+  /** \brief Retrieves the number of user inputs in the eval model.
+   *
+   * This function returns the number of inputs of the eval model so that the user can accordingly
+   * allocate the OrtValue(s) provided to the OrtTrainingApi::EvalStep function.
+   *
+   * \param[in] sess The `this` pointer to the training session.
+   * \param[out] out Number of user inputs in the eval model.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   *
+   */
+  ORT_API2_STATUS(TrainingSessionGetEvalModelInputCount, _In_ const OrtTrainingSession* sess, _Out_ size_t* out);
+
+  /** \brief Retrieves the name of the user input at given index in the training model.
+   *
+   * This function returns the names of inputs of the training model that can be associated with the
+   * OrtValue(s) provided to the OrtTrainingApi::TrainStep function.
+   *
+   * \param[in] sess The `this` pointer to the training session.
+   * \param[in] index The index of the training model input name requested.
+   * \param[in] allocator The allocator to use to allocate the memory for the requested name.
+   * \param[out] output Name of the user input for the training model at the given index.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   *
+   */
+  ORT_API2_STATUS(TrainingSessionGetTrainingModelInputName, _In_ const OrtTrainingSession* sess, size_t index,
+                  _In_ OrtAllocator* allocator, _Outptr_ char** output);
+
+  /** \brief Retrieves the name of the user input at given index in the eval model.
+   *
+   * This function returns the names of inputs of the eval model that can be associated with the OrtValue(s) provided
+   * to the OrtTrainingApi::EvalStep function.
+   *
+   * \param[in] sess The `this` pointer to the training session.
+   * \param[in] index The index of the eval model input name requested.
+   * \param[in] allocator The allocator to use to allocate the memory for the requested name.
+   * \param[out] output Name of the user input for the eval model at the given index.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   *
+   */
+  ORT_API2_STATUS(TrainingSessionGetEvalModelInputName, _In_ const OrtTrainingSession* sess, size_t index,
+                  _In_ OrtAllocator* allocator, _Outptr_ char** output);
+
+  /// @}
+
+  /// \name Accessing The Training Session State
+  /// @{
+
+  /** \brief Adds or updates the given property to/in the checkpoint state.
+   *
+   * Runtime properties such as epoch, training step, best score, and others can be added to the checkpoint
+   * state by the user by calling this function with the corresponding property name and value.
+   * The given property name must be unique to be able to successfully add the property.
+   *
+   * \param[in] checkpoint_state The checkpoint state which should hold the property.
+   * \param[in] property_name Name of the property being added or updated.
+   * \param[in] property_type Type of the property associated with the given name.
+   * \param[in] property_value Property value associated with the given name.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   *
+   */
+  ORT_API2_STATUS(AddProperty, _Inout_ OrtCheckpointState* checkpoint_state,
+                  _In_ const char* property_name, _In_ enum OrtPropertyType property_type,
+                  _In_ void* property_value);
+
+  /** \brief Gets the property value associated with the given name from the checkpoint state.
+   *
+   * Gets the property value from an existing entry in the checkpoint state. The property must
+   * exist in the checkpoint state to be able to retrieve it successfully.
+   *
+   * \param[in] checkpoint_state The checkpoint state that is currently holding the property.
+   * \param[in] property_name Name of the property being retrieved.
+   * \param[in] allocator Allocator used to allocate the memory for the property_value.
+   * \param[out] property_type Type of the property associated with the given name.
+   * \param[out] property_value Property value associated with the given name.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   *
+   */
+  ORT_API2_STATUS(GetProperty, _In_ const OrtCheckpointState* checkpoint_state,
+                  _In_ const char* property_name, _Inout_ OrtAllocator* allocator,
+                  _Out_ enum OrtPropertyType* property_type, _Outptr_ void** property_value);
+
+  /// @}
+
+  /// \name Accessing The Training Session State
+  /// @{
+
+  /** \brief Load a checkpoint state from a buffer into checkpoint_state.
+   *
+   * This function will parse a checkpoint bytes buffer, pull relevant data and load the training
+   * state into the checkpoint_state. This checkpoint state can then be used to create the
+   * training session by invoking OrtTrainingApi::CreateTrainingSession. By doing so, the training
+   * session will resume training from the given checkpoint state.
+   * \note Note that the training session created with a checkpoint state uses this state to store the entire
+   * training state (including model parameters, its gradients, the optimizer states and the properties).
+   * As a result, it is required that the checkpoint state outlive the lifetime of the training session.
+   *
+   * \param[in] checkpoint_buffer Path to the checkpoint bytes buffer.
+   * \param[in] num_bytes Number of bytes in the checkpoint buffer.
+   * \param[out] checkpoint_state Checkpoint state that contains the states of the training session.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   *
+   */
+  ORT_API2_STATUS(LoadCheckpointFromBuffer, _In_ const void* checkpoint_buffer,
+                  _In_ const size_t num_bytes, _Outptr_ OrtCheckpointState** checkpoint_state);
+
+  /** \brief Retrieves the type and shape information of the parameter associated with the given parameter name.
+   *
+   * This function retrieves the type and shape of the parameter associated with the given parameter name.
+   * The parameter must exist in the checkpoint state to be able to retrieve its type and shape information successfully.
+   *
+   * \param[in] checkpoint_state The checkpoint state.
+   * \param[in] parameter_name Name of the parameter being retrieved.
+   * \param[out] parameter_type_and_shape The type and shape of the parameter being retrieved.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   *
+   */
+  ORT_API2_STATUS(GetParameterTypeAndShape, _In_ const OrtCheckpointState* checkpoint_state,
+                  _In_ const char* parameter_name, _Outptr_ OrtTensorTypeAndShapeInfo** parameter_type_and_shape);
+
+  /** \brief Updates the data associated with the model parameter in the checkpoint state for the given parameter name.
+   *
+   * This function updates a model parameter in the checkpoint state with the given parameter data.
+   * The training session must be already created with the checkpoint state that contains the parameter
+   * being updated. The given parameter is copied over to the registered device for the training session.
+   * The parameter must exist in the checkpoint state to be able to update it successfully.
+   *
+   * \param[in] checkpoint_state The checkpoint state.
+   * \param[in] parameter_name Name of the parameter being updated.
+   * \param[in] parameter The parameter data that should replace the existing parameter data.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   *
+   */
+  ORT_API2_STATUS(UpdateParameter, _Inout_ OrtCheckpointState* checkpoint_state,
+                  _In_ const char* parameter_name, _In_ OrtValue* parameter);
+
+  /** \brief Gets the data associated with the model parameter from the checkpoint state for the given parameter name.
+   *
+   * This function retrieves the model parameter data from the checkpoint state for the given parameter name.
+   * The parameter is copied over and returned as an OrtValue. The training session must be already created
+   * with the checkpoint state that contains the parameter being retrieved.
+   * The parameter must exist in the checkpoint state to be able to retrieve it successfully.
+   *
+   * \param[in] checkpoint_state The checkpoint state.
+   * \param[in] parameter_name Name of the parameter being retrieved.
+   * \param[in] allocator Allocator used to allocate the memory for the parameter.
+   * \param[out] parameter The parameter data that is retrieved from the checkpoint state.
+   *
+   * \snippet{doc} snippets.dox OrtStatus Return Value
+   *
+   */
+  ORT_API2_STATUS(GetParameter, _In_ const OrtCheckpointState* checkpoint_state,
+                  _In_ const char* parameter_name, _Inout_ OrtAllocator* allocator,
+                  _Outptr_ OrtValue** parameter);
+
+  /// @}
+};
+
+typedef struct OrtTrainingApi OrtTrainingApi;
+
+/// @}
diff --git a/3rdParty/ONNX/onnxruntime_training_cxx_api.h b/3rdParty/ONNX/onnxruntime_training_cxx_api.h
new file mode 100644
index 0000000000..2697db5c21
--- /dev/null
+++ b/3rdParty/ONNX/onnxruntime_training_cxx_api.h
@@ -0,0 +1,418 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+#pragma once
+#include "onnxruntime_training_c_api.h"
+#include <optional>
+#include <variant>
+
+namespace Ort::detail {
+
+#define ORT_DECLARE_TRAINING_RELEASE(NAME) \
+  void OrtRelease(Ort##NAME* ptr);
+
+// These release methods must be forward declared before including onnxruntime_cxx_api.h
+// otherwise class Base won't be aware of them
+ORT_DECLARE_TRAINING_RELEASE(CheckpointState);
+ORT_DECLARE_TRAINING_RELEASE(TrainingSession);
+
+}  // namespace Ort::detail
+
+#include "onnxruntime_cxx_api.h"
+
+namespace Ort {
+
+/// <summary>
+/// This function returns the C training api struct with the pointers to the ort training C functions.
+/// If using C++, please use the class instances instead of invoking the C functions directly.
+/// </summary>
+/// <returns>OrtTrainingApi struct with ort training C function pointers.</returns>
+inline const OrtTrainingApi& GetTrainingApi() { return *GetApi().GetTrainingApi(ORT_API_VERSION); }
+
+namespace detail {
+
+#define ORT_DEFINE_TRAINING_RELEASE(NAME) \
+  inline void OrtRelease(Ort##NAME* ptr) { GetTrainingApi().Release##NAME(ptr); }
+
+ORT_DEFINE_TRAINING_RELEASE(CheckpointState);
+ORT_DEFINE_TRAINING_RELEASE(TrainingSession);
+
+#undef ORT_DECLARE_TRAINING_RELEASE
+#undef ORT_DEFINE_TRAINING_RELEASE
+
+}  // namespace detail
+
+using Property = std::variant<int64_t, float, std::string>;
+
+/**
+ * \defgroup TrainingCpp Ort Training C++ API
+ * @{
+ */
+
+/** \brief Holds the state of the training session.
+ *
+ * This class holds the entire training session state that includes model parameters, their gradients,
+ * optimizer parameters, and user properties. The Ort::TrainingSession leverages the Ort::CheckpointState
+ * by accessing and updating the contained training state.
+ * \note Note that the training session created with a checkpoint state uses this state to store the entire
+ * training state (including model parameters, its gradients, the optimizer states and the properties).
+ * The Ort::TrainingSession does not hold a copy of the Ort::CheckpointState and as a result, it is required
+ * that the checkpoint state outlive the lifetime of the training session.
+ * \note Note that the checkpoint state can be either the complete checkpoint state or the nominal checkpoint
+ * state depending on the version provided while loading the checkpoint.
+ *
+ */
+class CheckpointState : public detail::Base<OrtCheckpointState> {
+ private:
+  CheckpointState(OrtCheckpointState* checkpoint_state) { p_ = checkpoint_state; }
+
+ public:
+  // Construct the checkpoint state by loading the checkpoint by calling LoadCheckpoint
+  CheckpointState() = delete;
+
+  /// \name Accessing The Training Session State
+  /// @{
+
+  /** \brief Load a checkpoint state from a file on disk into checkpoint_state.
+   *
+   * This function will parse a checkpoint file, pull relevant data and load the training
+   * state and return an instance of Ort::CheckpointState. This checkpoint state can then be used to create the
+   * training session by instantiating Ort::TrainingSession. By doing so, the training session will resume
+   * training from the given checkpoint state.
+   *
+   * \param[in] path_to_checkpoint Path to the checkpoint file
+   * \return Ort::CheckpointState object which holds the state of the training session parameters.
+   *
+   */
+  static CheckpointState LoadCheckpoint(const std::basic_string<ORTCHAR_T>& path_to_checkpoint);
+
+  /** \brief Load a checkpoint state from a buffer.
+   *
+   * This function will parse a checkpoint buffer, pull relevant data and load the training
+   * state and return an instance of Ort::CheckpointState. This checkpoint state can then be used to create the
+   * training session by instantiating Ort::TrainingSession. By doing so, the training session will resume
+   * training from the given checkpoint state.
+   *
+   * \param[in] buffer Buffer containing the checkpoint data.
+   * \return Ort::CheckpointState object which holds the state of the training session parameters.
+   *
+   */
+  static CheckpointState LoadCheckpointFromBuffer(const std::vector<uint8_t>& buffer);
+
+  /** \brief Save the given state to a checkpoint file on disk.
+   *
+   * This function serializes the provided checkpoint state to a file on disk.
+   * This checkpoint can later be loaded by invoking Ort::CheckpointState::LoadCheckpoint to resume
+   * training from this snapshot of the state.
+   *
+   * \param[in] checkpoint_state The checkpoint state to save.
+   * \param[in] path_to_checkpoint Path to the checkpoint file.
+   * \param[in] include_optimizer_state Flag to indicate whether to save the optimizer state or not.
+   *
+   */
+  static void SaveCheckpoint(const CheckpointState& checkpoint_state,
+                             const std::basic_string<ORTCHAR_T>& path_to_checkpoint,
+                             const bool include_optimizer_state = false);
+
+  /** \brief Adds or updates the given property to/in the checkpoint state.
+   *
+   * Runtime properties such as epoch, training step, best score, and others can be added to the checkpoint
+   * state by the user by calling this function with the corresponding property name and value.
+   * The given property name must be unique to be able to successfully add the property.
+   *
+   * \param[in] property_name Name of the property being added or updated.
+   * \param[in] property_value Property value associated with the given name.
+   *
+   */
+  void AddProperty(const std::string& property_name, const Property& property_value);
+
+  /** \brief Gets the property value associated with the given name from the checkpoint state.
+   *
+   * Gets the property value from an existing entry in the checkpoint state. The property must
+   * exist in the checkpoint state to be able to retrieve it successfully.
+   *
+   * \param[in] property_name Name of the property being retrieved.
+   * \return Property value associated with the given property name.
+   *
+   */
+  Property GetProperty(const std::string& property_name);
+
+  /** \brief Updates the data associated with the model parameter in the checkpoint state for the given parameter name.
+   *
+   * This function updates a model parameter in the checkpoint state with the given parameter data.
+   * The training session must be already created with the checkpoint state that contains the parameter
+   * being updated. The given parameter is copied over to the registered device for the training session.
+   * The parameter must exist in the checkpoint state to be able to update it successfully.
+   *
+   * \param[in] parameter_name Name of the parameter being updated.
+   * \param[in] parameter The parameter data that should replace the existing parameter data.
+   *
+   */
+  void UpdateParameter(const std::string& parameter_name, const Value& parameter);
+
+  /** \brief Gets the data associated with the model parameter from the checkpoint state for the given parameter name.
+   *
+   * This function retrieves the model parameter data from the checkpoint state for the given parameter name.
+   * The parameter is copied over to the provided OrtValue. The training session must be already created
+   * with the checkpoint state that contains the parameter being retrieved.
+   * The parameter must exist in the checkpoint state to be able to retrieve it successfully.
+   *
+   * \param[in] parameter_name Name of the parameter being retrieved.
+   * \return The parameter data that is retrieved from the checkpoint state.
+   *
+   */
+  Value GetParameter(const std::string& parameter_name);
+
+  /// @}
+};
+
+/** \brief Trainer class that provides training, evaluation and optimizer methods for training an ONNX models.
+ *
+ * The training session requires four training artifacts
+ * - The training onnx model
+ * - The evaluation onnx model (optional)
+ * - The optimizer onnx model
+ * - The checkpoint file
+ *
+ * These artifacts can be generated using the `onnxruntime-training` python [utility](https://github.com/microsoft/onnxruntime/blob/main/orttraining/orttraining/python/training/onnxblock/README.md).
+ *
+ */
+class TrainingSession : public detail::Base<OrtTrainingSession> {
+ private:
+  size_t training_model_output_count_, eval_model_output_count_;
+
+ public:
+  /// \name Constructing the Training Session
+  /// @{
+  /** \brief Create a training session that can be used to begin or resume training.
+   *
+   * This constructor instantiates the training session based on the env and session options provided that can
+   * begin or resume training from a given checkpoint state for the given onnx models.
+   * The checkpoint state represents the parameters of the training session which will be moved
+   * to the device specified by the user through the session options (if necessary).
+   *
+   * \param[in] env Env to be used for the training session.
+   * \param[in] session_options SessionOptions that the user can customize for this training session.
+   * \param[in] checkpoint_state Training states that the training session uses as a starting point for training.
+   * \param[in] train_model_path Model to be used to perform training.
+   * \param[in] eval_model_path Model to be used to perform evaluation.
+   * \param[in] optimizer_model_path Model to be used to perform gradient descent.
+   *
+   */
+  TrainingSession(const Env& env, const SessionOptions& session_options, CheckpointState& checkpoint_state,
+                  const std::basic_string<ORTCHAR_T>& train_model_path,
+                  const std::optional<std::basic_string<ORTCHAR_T>>& eval_model_path = std::nullopt,
+                  const std::optional<std::basic_string<ORTCHAR_T>>& optimizer_model_path = std::nullopt);
+
+  /** \brief Create a training session that can be used to begin or resume training.
+   * This constructor allows the users to load the models from buffers instead of files.
+   *
+   * \param[in] env Env to be used for the training session.
+   * \param[in] session_options SessionOptions that the user can customize for this training session.
+   * \param[in] checkpoint_state Training states that the training session uses as a starting point for training.
+   * \param[in] train_model_data Buffer containing training model data.
+   * \param[in] eval_model_data Buffer containing evaluation model data.
+   * \param[in] optim_model_data Buffer containing optimizer model (used for performing weight/parameter update).
+   *
+   */
+  TrainingSession(const Env& env, const SessionOptions& session_options, CheckpointState& checkpoint_state,
+                  const std::vector<uint8_t>& train_model_data, const std::vector<uint8_t>& eval_model_data = {},
+                  const std::vector<uint8_t>& optim_model_data = {});
+  /// @}
+
+  /// \name Implementing The Training Loop
+  /// @{
+  /** \brief Computes the outputs of the training model and the gradients of the trainable parameters for the given inputs
+   *
+   * This function performs a training step that computes the outputs of the training model and the gradients
+   * of the trainable parameters for the given inputs. The train step is performed based on the training model
+   * that was provided to the training session.
+   * The Ort::TrainingSession::TrainStep is equivalent of running forward propagation and backward propagation in a single
+   * step.
+   * The gradients computed are stored inside the training session state so they can be later consumed
+   * by the Ort::TrainingSession::OptimizerStep function.
+   * The gradients can be lazily reset by invoking the Ort::TrainingSession::LazyResetGrad function.
+   *
+   * \param[in] input_values The user inputs to the training model.
+   * \return A std::vector of Ort::Value objects that represents the output of the forward pass of the training model.
+   *
+   *
+   */
+  std::vector<Value> TrainStep(const std::vector<Value>& input_values);
+
+  /** \brief Reset the gradients of all trainable parameters to zero lazily.
+   *
+   * This function sets the internal state of the training session such that the gradients of the trainable
+   * parameters in the OrtCheckpointState will be scheduled to be reset just before the new gradients are
+   * computed on the next invocation of the next Ort::TrainingSession::TrainStep.
+   *
+   */
+  void LazyResetGrad();
+
+  /** \brief Computes the outputs for the eval model for the given inputs
+   *
+   * This function performs an eval step that computes the outputs of the eval model for the given inputs.
+   * The eval step is performed based on the eval model that was provided to the training session.
+   *
+   * \param[in] input_values The user inputs to the eval model.
+   * \return A std::vector of Ort::Value objects that represents the output of the eval pass.
+   *
+   */
+  std::vector<Value> EvalStep(const std::vector<Value>& input_values);
+
+  /** \brief Sets the learning rate for this training session.
+   *
+   * This function allows users to set the learning rate for the training session. The current
+   * learning rate is maintained by the training session and can be overwritten by invoking
+   * this function with the desired learning rate. This function should not be used when a valid
+   * learning rate scheduler is registered. It should be used either to set the learning rate
+   * derived from a custom learning rate scheduler or to set a constant learning rate to be used
+   * throughout the training session.
+   * \note Please note that this function does not set the initial learning rate that may be needed
+   * by the predefined learning rate schedulers. To set the initial learning rate for learning
+   * rate schedulers, please look at the function Ort::TrainingSession::RegisterLinearLRScheduler.
+   *
+   * \param[in] learning_rate Desired learning rate to be set.
+   *
+   */
+  void SetLearningRate(float learning_rate);
+
+  /** \brief Gets the current learning rate for this training session.
+   *
+   * This function allows users to get the learning rate for the training session. The current
+   * learning rate is maintained by the training session, and users can query it for the purpose
+   * of implementing their own learning rate schedulers.
+   *
+   * \return float representing the current learning rate.
+   *
+   */
+  float GetLearningRate() const;
+
+  /** \brief Registers a linear learning rate scheduler for the training session.
+   *
+   * Register a linear learning rate scheduler that decays the learning rate by linearly updated
+   * multiplicative factor from the initial learning rate set on the training session to 0. The decay
+   * is performed after the initial warm up phase where the learning rate is linearly incremented
+   * from 0 to the initial learning rate provided.
+   *
+   * \param[in] warmup_step_count Warmup steps for LR warmup.
+   * \param[in] total_step_count Total step count.
+   * \param[in] initial_lr The initial learning rate to be used by the training session.
+   *
+   */
+  void RegisterLinearLRScheduler(int64_t warmup_step_count, int64_t total_step_count,
+                                 float initial_lr);
+
+  /** \brief Update the learning rate based on the registered learing rate scheduler.
+   *
+   * Takes a scheduler step that updates the learning rate that is being used by the training session.
+   * This function should typically be called before invoking the optimizer step for each round,
+   * or as determined necessary to update the learning rate being used by the training session.
+   * \note Please note that a valid predefined learning rate scheduler must be first registered to invoke this
+   * function.
+   *
+   */
+  void SchedulerStep();
+
+  /** \brief Performs the weight updates for the trainable parameters using the optimizer model.
+   *
+   * This function performs the weight update step that updates the trainable parameters such that they
+   * take a step in the direction of their gradients (gradient descent). The optimizer step is performed
+   * based on the optimizer model that was provided to the training session.
+   * The updated parameters are stored inside the training state so that they can be used by the next
+   * Ort::TrainingSession::TrainStep function call.
+   *
+   */
+  void OptimizerStep();
+
+  /// @}
+
+  /// \name Prepare For Inferencing
+  /// @{
+
+  /** \brief Export a model that can be used for inferencing.
+   *
+   * If the training session was provided with an eval model, the training session can generate
+   * an inference model if it knows the inference graph outputs. The input inference graph outputs
+   * are used to prune the eval model so that the inference model's outputs align with the provided outputs.
+   * The exported model is saved at the path provided and can be used for inferencing with Ort::Session.
+   * \note Note that the function re-loads the eval model from the path provided to Ort::TrainingSession
+   * and expects that this path still be valid.
+   *
+   * \param[in] inference_model_path Path where the inference model should be serialized to.
+   * \param[in] graph_output_names Names of the outputs that are needed in the inference model.
+   *
+   */
+  void ExportModelForInferencing(const std::basic_string<ORTCHAR_T>& inference_model_path,
+                                 const std::vector<std::string>& graph_output_names);
+
+  /// @}
+
+  /// \name Model IO Information
+  /// @{
+  /** \brief Retrieves the names of the user inputs for the training and eval models.
+   *
+   * This function returns the names of inputs of the training or eval model that can be associated
+   * with the Ort::Value(s) provided to the Ort::TrainingSession::TrainStep or Ort::TrainingSession::EvalStep
+   * function.
+   *
+   * \param[in] training Whether the training model input names are requested or eval model input names.
+   * \return Graph input names for either the training model or the eval model.
+   *
+   */
+  std::vector<std::string> InputNames(const bool training);
+
+  /** \brief Retrieves the names of the user outputs for the training and eval models.
+   *
+   * This function returns the names of outputs of the training or eval model that can be associated
+   * with the Ort::Value(s) returned by the Ort::TrainingSession::TrainStep or Ort::TrainingSession::EvalStep
+   * function.
+   *
+   * \param[in] training Whether the training model output names are requested or eval model output names.
+   * \return Graph output names for either the training model or the eval model.
+   *
+   */
+  std::vector<std::string> OutputNames(const bool training);
+
+  /// @}
+
+  /// \name Accessing The Training Session State
+  /// @{
+
+  /** \brief Returns a contiguous buffer that holds a copy of all training state parameters
+   *
+   * \param[in] only_trainable Whether to only copy trainable parameters or to copy all parameters.
+   * \return Contiguous buffer to the model parameters.
+   *
+   */
+  Value ToBuffer(const bool only_trainable);
+
+  /** \brief Loads the training session model parameters from a contiguous buffer
+   *
+   * In case the training session was created with a nominal checkpoint, invoking this function is required
+   * to load the updated parameters onto the checkpoint to complete it.
+   *
+   * \param[in] buffer Contiguous buffer to load the parameters from.
+   */
+  void FromBuffer(Value& buffer);
+
+  /// @}
+};
+
+/// \name Training Utilities
+/// @{
+/** \brief This function sets the seed for generating random numbers.
+ *
+ * Use this function to generate reproducible results. It should be noted that completely
+ * reproducible results are not guaranteed.
+ *
+ * \param[in] seed Manual seed to use for random number generation.
+ */
+void SetSeed(const int64_t seed);
+/// @}
+
+/// @}
+
+}  // namespace Ort
+
+#include "onnxruntime_training_cxx_inline.h"
diff --git a/3rdParty/ONNX/onnxruntime_training_cxx_inline.h b/3rdParty/ONNX/onnxruntime_training_cxx_inline.h
new file mode 100644
index 0000000000..f9961317da
--- /dev/null
+++ b/3rdParty/ONNX/onnxruntime_training_cxx_inline.h
@@ -0,0 +1,295 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+#pragma once
+#include "onnxruntime_training_c_api.h"
+#include "onnxruntime_cxx_api.h"
+
+namespace Ort {
+
+inline TrainingSession::TrainingSession(const Env& env, const SessionOptions& session_options,
+                                        CheckpointState& checkpoint_state,
+                                        const std::basic_string<ORTCHAR_T>& train_model_path,
+                                        const std::optional<std::basic_string<ORTCHAR_T>>& eval_model_path,
+                                        const std::optional<std::basic_string<ORTCHAR_T>>& optimizer_model_path) {
+  ThrowOnError(GetTrainingApi().CreateTrainingSession(
+      env, session_options, checkpoint_state,
+      train_model_path.c_str(),
+      eval_model_path.has_value() ? eval_model_path.value().c_str() : nullptr,
+      optimizer_model_path.has_value() ? optimizer_model_path.value().c_str() : nullptr,
+      &p_));
+
+  ThrowOnError(GetTrainingApi().TrainingSessionGetTrainingModelOutputCount(p_, &training_model_output_count_));
+
+  ThrowOnError(GetTrainingApi().TrainingSessionGetEvalModelOutputCount(p_, &eval_model_output_count_));
+}
+
+inline TrainingSession::TrainingSession(const Env& env, const SessionOptions& session_options,
+                                        CheckpointState& checkpoint_state,
+                                        const std::vector<uint8_t>& train_model_data,
+                                        const std::vector<uint8_t>& eval_model_data,
+                                        const std::vector<uint8_t>& optim_model_data) {
+  ThrowOnError(GetTrainingApi().CreateTrainingSessionFromBuffer(
+      env, session_options, checkpoint_state,
+      train_model_data.data(), train_model_data.size(),
+      eval_model_data.data(), eval_model_data.size(),
+      optim_model_data.data(), optim_model_data.size(),
+      &p_));
+
+  ThrowOnError(GetTrainingApi().TrainingSessionGetTrainingModelOutputCount(p_, &training_model_output_count_));
+
+  ThrowOnError(GetTrainingApi().TrainingSessionGetEvalModelOutputCount(p_, &eval_model_output_count_));
+}
+
+inline std::vector<Value> TrainingSession::TrainStep(const std::vector<Value>& input_values) {
+  std::vector<Value> output_values;
+  output_values.reserve(training_model_output_count_);
+  for (size_t i = 0; i < training_model_output_count_; i++) output_values.emplace_back(nullptr);
+  auto ort_input_values = reinterpret_cast<const OrtValue* const*>(input_values.data());
+  auto ort_output_values = reinterpret_cast<OrtValue**>(output_values.data());
+  RunOptions run_options;
+  ThrowOnError(GetTrainingApi().TrainStep(
+      p_, run_options, input_values.size(), ort_input_values,
+      training_model_output_count_, ort_output_values));
+
+  return output_values;
+}
+
+inline void TrainingSession::LazyResetGrad() {
+  ThrowOnError(GetTrainingApi().LazyResetGrad(p_));
+}
+
+inline std::vector<Value> TrainingSession::EvalStep(const std::vector<Value>& input_values) {
+  std::vector<Value> output_values;
+  output_values.reserve(eval_model_output_count_);
+  for (size_t i = 0; i < eval_model_output_count_; i++) output_values.emplace_back(nullptr);
+  auto ort_input_values = reinterpret_cast<const OrtValue* const*>(input_values.data());
+  auto ort_output_values = reinterpret_cast<OrtValue**>(output_values.data());
+  RunOptions run_options;
+  ThrowOnError(GetTrainingApi().EvalStep(
+      p_, run_options, input_values.size(), ort_input_values,
+      eval_model_output_count_, ort_output_values));
+
+  return output_values;
+}
+
+inline void TrainingSession::SetLearningRate(float learning_rate) {
+  ThrowOnError(GetTrainingApi().SetLearningRate(p_, learning_rate));
+}
+
+inline float TrainingSession::GetLearningRate() const {
+  float learning_rate = 0;
+  ThrowOnError(GetTrainingApi().GetLearningRate(p_, &learning_rate));
+  return learning_rate;
+}
+
+inline void TrainingSession::RegisterLinearLRScheduler(int64_t warmup_step_count, int64_t total_step_count,
+                                                       float initial_lr) {
+  ThrowOnError(GetTrainingApi().RegisterLinearLRScheduler(p_, warmup_step_count, total_step_count,
+                                                          initial_lr));
+}
+
+inline void TrainingSession::SchedulerStep() {
+  ThrowOnError(GetTrainingApi().SchedulerStep(p_));
+}
+
+inline void TrainingSession::OptimizerStep() {
+  RunOptions run_options;
+  ThrowOnError(GetTrainingApi().OptimizerStep(p_, run_options));
+}
+
+inline std::vector<std::string> TrainingSession::InputNames(const bool training) {
+  auto& input_count_function = training ? GetTrainingApi().TrainingSessionGetTrainingModelInputCount
+                                        : GetTrainingApi().TrainingSessionGetEvalModelInputCount;
+  auto& input_name_function = training ? GetTrainingApi().TrainingSessionGetTrainingModelInputName
+                                       : GetTrainingApi().TrainingSessionGetEvalModelInputName;
+
+  size_t input_count = 0;
+  ThrowOnError(input_count_function(p_, &input_count));
+  std::vector<std::string> input_names(input_count);
+  AllocatorWithDefaultOptions allocator;
+  for (size_t index = 0; index < input_count; ++index) {
+    char* input_name;
+    ThrowOnError(input_name_function(p_, index, allocator, &input_name));
+    input_names[index] = std::string(input_name);
+    allocator.Free(input_name);
+  }
+
+  return input_names;
+}
+
+inline std::vector<std::string> TrainingSession::OutputNames(const bool training) {
+  auto& output_count_function = training ? GetTrainingApi().TrainingSessionGetTrainingModelOutputCount
+                                         : GetTrainingApi().TrainingSessionGetEvalModelOutputCount;
+  auto& output_name_function = training ? GetTrainingApi().TrainingSessionGetTrainingModelOutputName
+                                        : GetTrainingApi().TrainingSessionGetEvalModelOutputName;
+
+  size_t output_count = 0;
+  ThrowOnError(output_count_function(p_, &output_count));
+  std::vector<std::string> output_names(output_count);
+  AllocatorWithDefaultOptions allocator;
+  for (size_t index = 0; index < output_count; ++index) {
+    char* output_name;
+    ThrowOnError(output_name_function(p_, index, allocator, &output_name));
+    output_names[index] = std::string(output_name);
+    allocator.Free(output_name);
+  }
+
+  return output_names;
+}
+
+inline Value TrainingSession::ToBuffer(const bool only_trainable) {
+  size_t buffer_size = 0U;
+  ThrowOnError(GetTrainingApi().GetParametersSize(p_, &buffer_size, only_trainable));
+
+  std::array<int64_t, 1> buffer_shape{static_cast<int64_t>(buffer_size)};
+
+  AllocatorWithDefaultOptions allocator;
+  Value buffer = Value::CreateTensor(allocator, buffer_shape.data(), 1U,
+                                     ONNXTensorElementDataType::ONNX_TENSOR_ELEMENT_DATA_TYPE_FLOAT);
+
+  ThrowOnError(GetTrainingApi().CopyParametersToBuffer(p_, buffer, only_trainable));
+
+  return buffer;
+}
+
+inline void TrainingSession::FromBuffer(Value& buffer) {
+  if (!buffer.IsTensor()) {
+    ThrowStatus(Status("Incorrect buffer received. Expected a tensor buffer.", OrtErrorCode::ORT_INVALID_ARGUMENT));
+  }
+
+  auto tensor_info = buffer.GetTensorTypeAndShapeInfo();
+  auto buffer_shape = tensor_info.GetShape();
+
+  if (buffer_shape.size() != 1U) {
+    ThrowStatus(Status("Incorrect buffer received. Expected a contiguous tensor buffer.",
+                       OrtErrorCode::ORT_INVALID_ARGUMENT));
+  }
+
+  auto buffer_size = buffer_shape.front();
+
+  size_t session_buffer_size = 0U;
+  ThrowOnError(GetTrainingApi().GetParametersSize(p_, &session_buffer_size, false));
+
+  if (buffer_size == static_cast<int64_t>(session_buffer_size)) {
+    ThrowOnError(GetTrainingApi().CopyBufferToParameters(p_, buffer, false));
+    return;
+  }
+
+  size_t session_buffer_size_trainable_only = 0U;
+  ThrowOnError(GetTrainingApi().GetParametersSize(p_, &session_buffer_size_trainable_only, true));
+
+  if (buffer_size == static_cast<int64_t>(session_buffer_size_trainable_only)) {
+    ThrowOnError(GetTrainingApi().CopyBufferToParameters(p_, buffer, true));
+    return;
+  } else {
+    ThrowStatus(Status("Incorrect buffer size received.", OrtErrorCode::ORT_INVALID_ARGUMENT));
+  }
+}
+
+inline CheckpointState CheckpointState::LoadCheckpoint(const std::basic_string<ORTCHAR_T>& path_to_checkpoint) {
+  OrtCheckpointState* checkpoint_state;
+  ThrowOnError(GetTrainingApi().LoadCheckpoint(path_to_checkpoint.c_str(), &checkpoint_state));
+  return CheckpointState(checkpoint_state);
+}
+
+inline CheckpointState CheckpointState::LoadCheckpointFromBuffer(const std::vector<uint8_t>& buffer) {
+  OrtCheckpointState* checkpoint_state;
+  ThrowOnError(GetTrainingApi().LoadCheckpointFromBuffer(buffer.data(), buffer.size(), &checkpoint_state));
+  return CheckpointState(checkpoint_state);
+}
+
+inline void CheckpointState::SaveCheckpoint(const CheckpointState& checkpoint_states,
+                                            const std::basic_string<ORTCHAR_T>& path_to_checkpoint,
+                                            const bool include_optimizer_state) {
+  ThrowOnError(GetTrainingApi().SaveCheckpoint(checkpoint_states, path_to_checkpoint.c_str(),
+                                               include_optimizer_state));
+}
+
+inline void TrainingSession::ExportModelForInferencing(const std::basic_string<ORTCHAR_T>& inference_model_path,
+                                                       const std::vector<std::string>& graph_output_names) {
+  std::vector<const char*> output_names;
+  output_names.reserve(graph_output_names.size());
+  for (const auto& output_name : graph_output_names) {
+    output_names.push_back(output_name.c_str());
+  }
+  ThrowOnError(GetTrainingApi().ExportModelForInferencing(
+      p_, inference_model_path.c_str(), graph_output_names.size(), output_names.data()));
+}
+
+inline void SetSeed(const int64_t seed) {
+  ThrowOnError(GetTrainingApi().SetSeed(seed));
+}
+
+inline void CheckpointState::AddProperty(const std::string& property_name, const Property& property_value) {
+  if (std::holds_alternative<int64_t>(property_value)) {
+    int64_t value = std::get<int64_t>(property_value);
+    void* value_p = &value;
+    ThrowOnError(GetTrainingApi().AddProperty(p_, property_name.c_str(), OrtPropertyType::OrtIntProperty, value_p));
+  } else if (std::holds_alternative<float>(property_value)) {
+    float value = std::get<float>(property_value);
+    void* value_p = &value;
+    ThrowOnError(GetTrainingApi().AddProperty(p_, property_name.c_str(), OrtPropertyType::OrtFloatProperty, value_p));
+  } else if (std::holds_alternative<std::string>(property_value)) {
+    std::string value = std::get<std::string>(property_value);
+    auto buffer = std::make_unique<char[]>(value.length() + 1);
+    memcpy(buffer.get(), value.c_str(), value.length());
+    // AddProperty takes a char* and calls PropertyBag::AddProperty which takes a std::string. The data will be
+    // copied at that point so buffer can free the local allocation once the call is made.
+    ThrowOnError(GetTrainingApi().AddProperty(p_, property_name.c_str(), OrtPropertyType::OrtStringProperty,
+                                              buffer.get()));
+  } else {
+    ThrowStatus(Status("Unknown property type received.", OrtErrorCode::ORT_INVALID_ARGUMENT));
+  }
+}
+
+inline Property CheckpointState::GetProperty(const std::string& property_name) {
+  void* property_value = nullptr;
+  OrtPropertyType property_type;
+
+  AllocatorWithDefaultOptions allocator;
+  ThrowOnError(GetTrainingApi().GetProperty(p_, property_name.c_str(), allocator, &property_type, &property_value));
+
+  Property property;
+
+  switch (property_type) {
+    case OrtPropertyType::OrtIntProperty: {
+      auto value_p = reinterpret_cast<int64_t*>(property_value);
+      property = *value_p;
+      allocator.Free(property_value);
+      break;
+    }
+    case OrtPropertyType::OrtFloatProperty: {
+      auto value_p = reinterpret_cast<float*>(property_value);
+      property = *value_p;
+      allocator.Free(property_value);
+      break;
+    }
+    case OrtPropertyType::OrtStringProperty: {
+      auto value_p = reinterpret_cast<char*>(property_value);
+      property = std::string(value_p);
+      allocator.Free(property_value);
+      break;
+    }
+    default: {
+      ThrowStatus(Status("Unknown property type received.", OrtErrorCode::ORT_INVALID_ARGUMENT));
+      break;
+    }
+  }
+
+  return property;
+}
+
+inline void CheckpointState::UpdateParameter(const std::string& parameter_name, const Value& parameter) {
+  ThrowOnError(GetTrainingApi().UpdateParameter(p_, parameter_name.c_str(), parameter));
+}
+
+inline Value CheckpointState::GetParameter(const std::string& parameter_name) {
+  AllocatorWithDefaultOptions allocator;
+  OrtValue* parameter;
+  ThrowOnError(GetTrainingApi().GetParameter(p_, parameter_name.c_str(), allocator, &parameter));
+
+  return Value{parameter};
+}
+
+}  // namespace Ort
diff --git a/3rdParty/ONNX/provider_options.h b/3rdParty/ONNX/provider_options.h
new file mode 100644
index 0000000000..0e084c009a
--- /dev/null
+++ b/3rdParty/ONNX/provider_options.h
@@ -0,0 +1,18 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+#pragma once
+
+#include <string>
+#include <unordered_map>
+#include <vector>
+
+namespace onnxruntime {
+
+// data types for execution provider options
+
+using ProviderOptions = std::unordered_map<std::string, std::string>;
+using ProviderOptionsVector = std::vector<ProviderOptions>;
+using ProviderOptionsMap = std::unordered_map<std::string, ProviderOptions>;
+
+}  // namespace onnxruntime
diff --git a/3rdParty/QtWavFile/WavFile.cpp b/3rdParty/QtWavFile/WavFile.cpp
index 04ab344d7f..f9a2938a1d 100644
--- a/3rdParty/QtWavFile/WavFile.cpp
+++ b/3rdParty/QtWavFile/WavFile.cpp
@@ -1,13 +1,13 @@
 /*  WAV FILE
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  *  Class to read a .wav file. Edited from Qt multimedia example Spectrum:
  *  https://code.qt.io/cgit/qt/qtmultimedia.git/tree/examples/multimedia/spectrum/app/wavfile.cpp?h=5.15
  *  The git repo for Qt multimedia code and exmamples is https://code.qt.io/qt/qtmultimedia.git 
  *  The version of the code is Qt5.
  *  Since the code is licensed by Qt under BSD, we can safely use it with our code base, provided
- *  that we have the orignal BSD license below and release the source code.
+ *  that we have the original BSD license below and release the source code.
  */
 
 /****************************************************************************
@@ -136,7 +136,8 @@ bool WavFile::readHeader()
             || memcmp(&header.riff.descriptor.id, "RIFX", 4) == 0)
             && memcmp(&header.riff.type, "WAVE", 4) == 0
             && memcmp(&header.wave.descriptor.id, "fmt ", 4) == 0
-            && (header.wave.audioFormat == 1 || header.wave.audioFormat == 0)) {
+            && (header.wave.audioFormat == 1 || header.wave.audioFormat == 0
+                || header.wave.audioFormat == 3)) {  //  3 = IEEE-float
 
             // Read off remaining header information
             DATAHeader dataHeader;
@@ -175,7 +176,11 @@ bool WavFile::readHeader()
 #if QT_VERSION_MAJOR == 5            
             m_fileFormat.setCodec("audio/pcm");
             m_fileFormat.setSampleSize(qFromLittleEndian<quint16>(header.wave.bitsPerSample));
-            m_fileFormat.setSampleType(bps == 8 ? QAudioFormat::UnSignedInt : QAudioFormat::SignedInt);
+            if (header.wave.audioFormat == 3){
+                m_fileFormat.setSampleType(QAudioFormat::Float);
+            }else{
+                m_fileFormat.setSampleType(bps == 8 ? QAudioFormat::UnSignedInt : QAudioFormat::SignedInt);
+            }
 #elif QT_VERSION_MAJOR == 6
             const int bitsPerSample = qFromLittleEndian<quint16>(header.wave.bitsPerSample);
             if (bitsPerSample == 8 && bps == 8){
@@ -183,10 +188,16 @@ bool WavFile::readHeader()
             } else if (bitsPerSample == 16 && bps != 8){
                 m_fileFormat.setSampleFormat(QAudioFormat::SampleFormat::Int16);
             } else if (bitsPerSample == 32 && bps != 8){
-                m_fileFormat.setSampleFormat(QAudioFormat::SampleFormat::Int32);
+                //  Audio format tag 3 is IEEE-float; tag 1 (PCM) is int32.
+                if (header.wave.audioFormat == 3){
+                    m_fileFormat.setSampleFormat(QAudioFormat::SampleFormat::Float);
+                }else{
+                    m_fileFormat.setSampleFormat(QAudioFormat::SampleFormat::Int32);
+                }
             } else {
-                std::cout << "Error: wav file uses sample type that Qt6 audio format does not support: bits per sample: " << 
-                    bitsPerSample << ", " << (bps == 8 ? "unsigned" : "signed") << std::endl;
+                std::cout << "Error: wav file uses an unsupported sample type: "
+                    << bitsPerSample << " bits per sample (PCM 8/16/32-bit and IEEE-float are supported; 24-bit is not)."
+                    << std::endl;
                 result = false;
             }
 #endif
diff --git a/3rdParty/QtWavFile/WavFile.h b/3rdParty/QtWavFile/WavFile.h
index 877a2801b2..83c284eea8 100644
--- a/3rdParty/QtWavFile/WavFile.h
+++ b/3rdParty/QtWavFile/WavFile.h
@@ -1,6 +1,6 @@
 /*  WAV FILE
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  *  Class to read a .wav file. Edited from Qt multimedia example Spectrum:
  *  https://code.qt.io/cgit/qt/qtmultimedia.git/tree/examples/multimedia/spectrum/app/wavfile.cpp?h=5.15
diff --git a/3rdParty/TesseractPA/TesseractPA.cpp b/3rdParty/TesseractPA/TesseractPA.cpp
index a6b812092a..fe266a8aa3 100644
--- a/3rdParty/TesseractPA/TesseractPA.cpp
+++ b/3rdParty/TesseractPA/TesseractPA.cpp
@@ -58,6 +58,9 @@ char* TesseractAPI_read_bitmap(
     api->m_api.SetSourceResolution((int)ppi);
     return api->m_api.GetUTF8Text();
 }
+void TesseractAPI_set_page_seg_mode(TesseractAPI_internal* api, int psm){
+    api->m_api.SetPageSegMode(static_cast<tesseract::PageSegMode>(psm));
+}
 void Tesseract_delete(char* text){
     delete[] text;
 }
diff --git a/3rdParty/TesseractPA/TesseractPA.h b/3rdParty/TesseractPA/TesseractPA.h
index c50507a226..cd356dfc08 100644
--- a/3rdParty/TesseractPA/TesseractPA.h
+++ b/3rdParty/TesseractPA/TesseractPA.h
@@ -64,6 +64,10 @@ TESSERACT_EXPORT char* TesseractAPI_read_bitmap(
     size_t bytes_per_pixel, size_t bytes_per_line,
     size_t ppi
 );
+TESSERACT_EXPORT void TesseractAPI_set_page_seg_mode(
+    TesseractAPI_internal* api,
+    int psm
+);
 TESSERACT_EXPORT void Tesseract_delete(char* text);
 
 
@@ -139,6 +143,12 @@ class TesseractAPI{
 
     bool valid() const{ return m_api != nullptr; }
 
+    void set_page_seg_mode(int psm){
+#ifdef PA_TESSERACT
+        TesseractAPI_set_page_seg_mode(m_api, psm);
+#endif
+    }
+
 //    TesseractString read(const char* filepath){
 //#ifdef PA_TESSERACT
 //        return TesseractAPI_read_file(m_api, filepath);
diff --git a/3rdParty/discord_social_sdk/cdiscord.h b/3rdParty/discord_social_sdk/cdiscord.h
new file mode 100644
index 0000000000..9c027a967e
--- /dev/null
+++ b/3rdParty/discord_social_sdk/cdiscord.h
@@ -0,0 +1,1960 @@
+/* Generated with <3 by Discord.Sdk.Derive */
+#pragma once
+#ifndef DISCORD_HEADER_CDISCORD_H_
+#define DISCORD_HEADER_CDISCORD_H_
+
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+
+#ifndef DISCORD_API
+#if defined(_WIN32)
+#define DISCORD_API __declspec(dllexport)
+#pragma warning(disable : 4251)
+#else
+#define DISCORD_API __attribute__((visibility("default")))
+#endif
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct Discord_String;
+
+typedef struct Discord_Properties {
+    size_t size;
+    struct Discord_String* keys;
+    struct Discord_String* values;
+} Discord_Properties;
+
+typedef void* (*Discord_MallocFn)(size_t size);
+typedef void (*Discord_FreeFn)(void* ptr);
+
+typedef struct Discord_Allocator {
+    Discord_MallocFn fnMalloc;
+    Discord_FreeFn fnFree;
+} Discord_Allocator;
+
+DISCORD_API void* Discord_Alloc(size_t size);
+DISCORD_API void Discord_Free(void* ptr);
+DISCORD_API void Discord_FreeProperties(Discord_Properties props);
+
+DISCORD_API void Discord_SetFreeThreaded();
+DISCORD_API void Discord_ResetCallbacks();
+DISCORD_API void Discord_RunCallbacks();
+
+typedef enum Discord_ActivityActionTypes {
+    Discord_ActivityActionTypes_Invalid = 0,
+    Discord_ActivityActionTypes_Join = 1,
+    Discord_ActivityActionTypes_JoinRequest = 5,
+    Discord_ActivityActionTypes_forceint = 0x7FFFFFFF
+} Discord_ActivityActionTypes;
+
+typedef enum Discord_ActivityPartyPrivacy {
+    Discord_ActivityPartyPrivacy_Private = 0,
+    Discord_ActivityPartyPrivacy_Public = 1,
+    Discord_ActivityPartyPrivacy_forceint = 0x7FFFFFFF
+} Discord_ActivityPartyPrivacy;
+
+typedef enum Discord_ActivityTypes {
+    Discord_ActivityTypes_Playing = 0,
+    Discord_ActivityTypes_Streaming = 1,
+    Discord_ActivityTypes_Listening = 2,
+    Discord_ActivityTypes_Watching = 3,
+    Discord_ActivityTypes_CustomStatus = 4,
+    Discord_ActivityTypes_Competing = 5,
+    Discord_ActivityTypes_HangStatus = 6,
+    Discord_ActivityTypes_forceint = 0x7FFFFFFF
+} Discord_ActivityTypes;
+
+typedef enum Discord_StatusDisplayTypes {
+    Discord_StatusDisplayTypes_Name = 0,
+    Discord_StatusDisplayTypes_State = 1,
+    Discord_StatusDisplayTypes_Details = 2,
+    Discord_StatusDisplayTypes_forceint = 0x7FFFFFFF
+} Discord_StatusDisplayTypes;
+
+typedef enum Discord_ActivityGamePlatforms {
+    Discord_ActivityGamePlatforms_Desktop = 1,
+    Discord_ActivityGamePlatforms_Xbox = 2,
+    Discord_ActivityGamePlatforms_Samsung = 4,
+    Discord_ActivityGamePlatforms_IOS = 8,
+    Discord_ActivityGamePlatforms_Android = 16,
+    Discord_ActivityGamePlatforms_Embedded = 32,
+    Discord_ActivityGamePlatforms_PS4 = 64,
+    Discord_ActivityGamePlatforms_PS5 = 128,
+    Discord_ActivityGamePlatforms_forceint = 0x7FFFFFFF
+} Discord_ActivityGamePlatforms;
+
+typedef enum Discord_ErrorType {
+    Discord_ErrorType_None = 0,
+    Discord_ErrorType_NetworkError = 1,
+    Discord_ErrorType_HTTPError = 2,
+    Discord_ErrorType_ClientNotReady = 3,
+    Discord_ErrorType_Disabled = 4,
+    Discord_ErrorType_ClientDestroyed = 5,
+    Discord_ErrorType_ValidationError = 6,
+    Discord_ErrorType_Aborted = 7,
+    Discord_ErrorType_AuthorizationFailed = 8,
+    Discord_ErrorType_RPCError = 9,
+    Discord_ErrorType_forceint = 0x7FFFFFFF
+} Discord_ErrorType;
+
+typedef enum Discord_HttpStatusCode {
+    Discord_HttpStatusCode_None = 0,
+    Discord_HttpStatusCode_Continue = 100,
+    Discord_HttpStatusCode_SwitchingProtocols = 101,
+    Discord_HttpStatusCode_Processing = 102,
+    Discord_HttpStatusCode_EarlyHints = 103,
+    Discord_HttpStatusCode_Ok = 200,
+    Discord_HttpStatusCode_Created = 201,
+    Discord_HttpStatusCode_Accepted = 202,
+    Discord_HttpStatusCode_NonAuthoritativeInfo = 203,
+    Discord_HttpStatusCode_NoContent = 204,
+    Discord_HttpStatusCode_ResetContent = 205,
+    Discord_HttpStatusCode_PartialContent = 206,
+    Discord_HttpStatusCode_MultiStatus = 207,
+    Discord_HttpStatusCode_AlreadyReported = 208,
+    Discord_HttpStatusCode_ImUsed = 209,
+    Discord_HttpStatusCode_MultipleChoices = 300,
+    Discord_HttpStatusCode_MovedPermanently = 301,
+    Discord_HttpStatusCode_Found = 302,
+    Discord_HttpStatusCode_SeeOther = 303,
+    Discord_HttpStatusCode_NotModified = 304,
+    Discord_HttpStatusCode_TemporaryRedirect = 307,
+    Discord_HttpStatusCode_PermanentRedirect = 308,
+    Discord_HttpStatusCode_BadRequest = 400,
+    Discord_HttpStatusCode_Unauthorized = 401,
+    Discord_HttpStatusCode_PaymentRequired = 402,
+    Discord_HttpStatusCode_Forbidden = 403,
+    Discord_HttpStatusCode_NotFound = 404,
+    Discord_HttpStatusCode_MethodNotAllowed = 405,
+    Discord_HttpStatusCode_NotAcceptable = 406,
+    Discord_HttpStatusCode_ProxyAuthRequired = 407,
+    Discord_HttpStatusCode_RequestTimeout = 408,
+    Discord_HttpStatusCode_Conflict = 409,
+    Discord_HttpStatusCode_Gone = 410,
+    Discord_HttpStatusCode_LengthRequired = 411,
+    Discord_HttpStatusCode_PreconditionFailed = 412,
+    Discord_HttpStatusCode_PayloadTooLarge = 413,
+    Discord_HttpStatusCode_UriTooLong = 414,
+    Discord_HttpStatusCode_UnsupportedMediaType = 415,
+    Discord_HttpStatusCode_RangeNotSatisfiable = 416,
+    Discord_HttpStatusCode_ExpectationFailed = 417,
+    Discord_HttpStatusCode_MisdirectedRequest = 421,
+    Discord_HttpStatusCode_UnprocessableEntity = 422,
+    Discord_HttpStatusCode_Locked = 423,
+    Discord_HttpStatusCode_FailedDependency = 424,
+    Discord_HttpStatusCode_TooEarly = 425,
+    Discord_HttpStatusCode_UpgradeRequired = 426,
+    Discord_HttpStatusCode_PreconditionRequired = 428,
+    Discord_HttpStatusCode_TooManyRequests = 429,
+    Discord_HttpStatusCode_RequestHeaderFieldsTooLarge = 431,
+    Discord_HttpStatusCode_InternalServerError = 500,
+    Discord_HttpStatusCode_NotImplemented = 501,
+    Discord_HttpStatusCode_BadGateway = 502,
+    Discord_HttpStatusCode_ServiceUnavailable = 503,
+    Discord_HttpStatusCode_GatewayTimeout = 504,
+    Discord_HttpStatusCode_HttpVersionNotSupported = 505,
+    Discord_HttpStatusCode_VariantAlsoNegotiates = 506,
+    Discord_HttpStatusCode_InsufficientStorage = 507,
+    Discord_HttpStatusCode_LoopDetected = 508,
+    Discord_HttpStatusCode_NotExtended = 510,
+    Discord_HttpStatusCode_NetworkAuthorizationRequired = 511,
+    Discord_HttpStatusCode_forceint = 0x7FFFFFFF
+} Discord_HttpStatusCode;
+
+typedef enum Discord_AuthenticationCodeChallengeMethod {
+    Discord_AuthenticationCodeChallengeMethod_S256 = 0,
+    Discord_AuthenticationCodeChallengeMethod_forceint = 0x7FFFFFFF
+} Discord_AuthenticationCodeChallengeMethod;
+
+typedef enum Discord_IntegrationType {
+    Discord_IntegrationType_GuildInstall = 0,
+    Discord_IntegrationType_UserInstall = 1,
+    Discord_IntegrationType_forceint = 0x7FFFFFFF
+} Discord_IntegrationType;
+
+typedef enum Discord_ChannelType {
+    Discord_ChannelType_GuildText = 0,
+    Discord_ChannelType_Dm = 1,
+    Discord_ChannelType_GuildVoice = 2,
+    Discord_ChannelType_GroupDm = 3,
+    Discord_ChannelType_GuildCategory = 4,
+    Discord_ChannelType_GuildNews = 5,
+    Discord_ChannelType_GuildStore = 6,
+    Discord_ChannelType_GuildNewsThread = 10,
+    Discord_ChannelType_GuildPublicThread = 11,
+    Discord_ChannelType_GuildPrivateThread = 12,
+    Discord_ChannelType_GuildStageVoice = 13,
+    Discord_ChannelType_GuildDirectory = 14,
+    Discord_ChannelType_GuildForum = 15,
+    Discord_ChannelType_GuildMedia = 16,
+    Discord_ChannelType_Lobby = 17,
+    Discord_ChannelType_EphemeralDm = 18,
+    Discord_ChannelType_forceint = 0x7FFFFFFF
+} Discord_ChannelType;
+
+typedef enum Discord_AdditionalContentType {
+    Discord_AdditionalContentType_Other = 0,
+    Discord_AdditionalContentType_Attachment = 1,
+    Discord_AdditionalContentType_Poll = 2,
+    Discord_AdditionalContentType_VoiceMessage = 3,
+    Discord_AdditionalContentType_Thread = 4,
+    Discord_AdditionalContentType_Embed = 5,
+    Discord_AdditionalContentType_Sticker = 6,
+    Discord_AdditionalContentType_forceint = 0x7FFFFFFF
+} Discord_AdditionalContentType;
+
+typedef enum Discord_VoiceInputModeType {
+    Discord_VoiceInputModeType_VoiceActivity = 0,
+    Discord_VoiceInputModeType_PushToTalk = 1,
+    Discord_VoiceInputModeType_forceint = 0x7FFFFFFF
+} Discord_VoiceInputModeType;
+
+typedef enum Discord_AudioSystem {
+    Discord_AudioSystem_Standard = 0,
+    Discord_AudioSystem_Game = 1,
+    Discord_AudioSystem_forceint = 0x7FFFFFFF
+} Discord_AudioSystem;
+
+typedef enum Discord_Call_Error {
+    Discord_Call_Error_None = 0,
+    Discord_Call_Error_SignalingConnectionFailed = 1,
+    Discord_Call_Error_SignalingUnexpectedClose = 2,
+    Discord_Call_Error_VoiceConnectionFailed = 3,
+    Discord_Call_Error_JoinTimeout = 4,
+    Discord_Call_Error_Forbidden = 5,
+    Discord_Call_Error_forceint = 0x7FFFFFFF
+} Discord_Call_Error;
+
+typedef enum Discord_AudioModeType {
+    Discord_AudioModeType_MODE_UNINIT = 0,
+    Discord_AudioModeType_MODE_VAD = 1,
+    Discord_AudioModeType_MODE_PTT = 2,
+    Discord_AudioModeType_forceint = 0x7FFFFFFF
+} Discord_AudioModeType;
+
+typedef enum Discord_Call_Status {
+    Discord_Call_Status_Disconnected = 0,
+    Discord_Call_Status_Joining = 1,
+    Discord_Call_Status_Connecting = 2,
+    Discord_Call_Status_SignalingConnected = 3,
+    Discord_Call_Status_Connected = 4,
+    Discord_Call_Status_Reconnecting = 5,
+    Discord_Call_Status_Disconnecting = 6,
+    Discord_Call_Status_forceint = 0x7FFFFFFF
+} Discord_Call_Status;
+
+typedef enum Discord_RelationshipType {
+    Discord_RelationshipType_None = 0,
+    Discord_RelationshipType_Friend = 1,
+    Discord_RelationshipType_Blocked = 2,
+    Discord_RelationshipType_PendingIncoming = 3,
+    Discord_RelationshipType_PendingOutgoing = 4,
+    Discord_RelationshipType_Implicit = 5,
+    Discord_RelationshipType_Suggestion = 6,
+    Discord_RelationshipType_forceint = 0x7FFFFFFF
+} Discord_RelationshipType;
+
+typedef enum Discord_ExternalIdentityProviderType {
+    Discord_ExternalIdentityProviderType_OIDC = 0,
+    Discord_ExternalIdentityProviderType_EpicOnlineServices = 1,
+    Discord_ExternalIdentityProviderType_Steam = 2,
+    Discord_ExternalIdentityProviderType_Unity = 3,
+    Discord_ExternalIdentityProviderType_DiscordBot = 4,
+    Discord_ExternalIdentityProviderType_None = 5,
+    Discord_ExternalIdentityProviderType_Unknown = 6,
+    Discord_ExternalIdentityProviderType_forceint = 0x7FFFFFFF
+} Discord_ExternalIdentityProviderType;
+
+typedef enum Discord_UserHandle_AvatarType {
+    Discord_UserHandle_AvatarType_Gif = 0,
+    Discord_UserHandle_AvatarType_Webp = 1,
+    Discord_UserHandle_AvatarType_Png = 2,
+    Discord_UserHandle_AvatarType_Jpeg = 3,
+    Discord_UserHandle_AvatarType_forceint = 0x7FFFFFFF
+} Discord_UserHandle_AvatarType;
+
+typedef enum Discord_StatusType {
+    Discord_StatusType_Online = 0,
+    Discord_StatusType_Offline = 1,
+    Discord_StatusType_Blocked = 2,
+    Discord_StatusType_Idle = 3,
+    Discord_StatusType_Dnd = 4,
+    Discord_StatusType_Invisible = 5,
+    Discord_StatusType_Streaming = 6,
+    Discord_StatusType_Unknown = 7,
+    Discord_StatusType_forceint = 0x7FFFFFFF
+} Discord_StatusType;
+
+typedef enum Discord_DisclosureTypes {
+    Discord_DisclosureTypes_MessageDataVisibleOnDiscord = 3,
+    Discord_DisclosureTypes_forceint = 0x7FFFFFFF
+} Discord_DisclosureTypes;
+
+typedef enum Discord_Client_Error {
+    Discord_Client_Error_None = 0,
+    Discord_Client_Error_ConnectionFailed = 1,
+    Discord_Client_Error_UnexpectedClose = 2,
+    Discord_Client_Error_ConnectionCanceled = 3,
+    Discord_Client_Error_forceint = 0x7FFFFFFF
+} Discord_Client_Error;
+
+typedef enum Discord_Client_Status {
+    Discord_Client_Status_Disconnected = 0,
+    Discord_Client_Status_Connecting = 1,
+    Discord_Client_Status_Connected = 2,
+    Discord_Client_Status_Ready = 3,
+    Discord_Client_Status_Reconnecting = 4,
+    Discord_Client_Status_Disconnecting = 5,
+    Discord_Client_Status_HttpWait = 6,
+    Discord_Client_Status_forceint = 0x7FFFFFFF
+} Discord_Client_Status;
+
+typedef enum Discord_Client_Thread {
+    Discord_Client_Thread_Client = 0,
+    Discord_Client_Thread_Voice = 1,
+    Discord_Client_Thread_Network = 2,
+    Discord_Client_Thread_forceint = 0x7FFFFFFF
+} Discord_Client_Thread;
+
+typedef enum Discord_AuthorizationTokenType {
+    Discord_AuthorizationTokenType_User = 0,
+    Discord_AuthorizationTokenType_Bearer = 1,
+    Discord_AuthorizationTokenType_forceint = 0x7FFFFFFF
+} Discord_AuthorizationTokenType;
+
+typedef enum Discord_AuthenticationExternalAuthType {
+    Discord_AuthenticationExternalAuthType_OIDC = 0,
+    Discord_AuthenticationExternalAuthType_EpicOnlineServicesAccessToken = 1,
+    Discord_AuthenticationExternalAuthType_EpicOnlineServicesIdToken = 2,
+    Discord_AuthenticationExternalAuthType_SteamSessionTicket = 3,
+    Discord_AuthenticationExternalAuthType_UnityServicesIdToken = 4,
+    Discord_AuthenticationExternalAuthType_DiscordBotIssuedAccessToken = 5,
+    Discord_AuthenticationExternalAuthType_AppleIdToken = 6,
+    Discord_AuthenticationExternalAuthType_PlayStationNetworkIdToken = 7,
+    Discord_AuthenticationExternalAuthType_forceint = 0x7FFFFFFF
+} Discord_AuthenticationExternalAuthType;
+
+typedef enum Discord_LoggingSeverity {
+    Discord_LoggingSeverity_Verbose = 1,
+    Discord_LoggingSeverity_Info = 2,
+    Discord_LoggingSeverity_Warning = 3,
+    Discord_LoggingSeverity_Error = 4,
+    Discord_LoggingSeverity_None = 5,
+    Discord_LoggingSeverity_forceint = 0x7FFFFFFF
+} Discord_LoggingSeverity;
+
+typedef enum Discord_RelationshipGroupType {
+    Discord_RelationshipGroupType_OnlinePlayingGame = 0,
+    Discord_RelationshipGroupType_OnlineElsewhere = 1,
+    Discord_RelationshipGroupType_Offline = 2,
+    Discord_RelationshipGroupType_forceint = 0x7FFFFFFF
+} Discord_RelationshipGroupType;
+
+typedef struct Discord_ActivityInvite Discord_ActivityInvite;
+typedef struct Discord_ActivityAssets Discord_ActivityAssets;
+typedef struct Discord_ActivityTimestamps Discord_ActivityTimestamps;
+typedef struct Discord_ActivityParty Discord_ActivityParty;
+typedef struct Discord_ActivitySecrets Discord_ActivitySecrets;
+typedef struct Discord_ActivityButton Discord_ActivityButton;
+typedef struct Discord_Activity Discord_Activity;
+typedef struct Discord_ClientResult Discord_ClientResult;
+typedef struct Discord_AuthorizationCodeChallenge Discord_AuthorizationCodeChallenge;
+typedef struct Discord_AuthorizationCodeVerifier Discord_AuthorizationCodeVerifier;
+typedef struct Discord_AuthorizationArgs Discord_AuthorizationArgs;
+typedef struct Discord_DeviceAuthorizationArgs Discord_DeviceAuthorizationArgs;
+typedef struct Discord_VoiceStateHandle Discord_VoiceStateHandle;
+typedef struct Discord_VADThresholdSettings Discord_VADThresholdSettings;
+typedef struct Discord_Call Discord_Call;
+typedef struct Discord_ChannelHandle Discord_ChannelHandle;
+typedef struct Discord_GuildMinimal Discord_GuildMinimal;
+typedef struct Discord_GuildChannel Discord_GuildChannel;
+typedef struct Discord_LinkedLobby Discord_LinkedLobby;
+typedef struct Discord_LinkedChannel Discord_LinkedChannel;
+typedef struct Discord_RelationshipHandle Discord_RelationshipHandle;
+typedef struct Discord_UserApplicationProfileHandle Discord_UserApplicationProfileHandle;
+typedef struct Discord_UserHandle Discord_UserHandle;
+typedef struct Discord_LobbyMemberHandle Discord_LobbyMemberHandle;
+typedef struct Discord_LobbyHandle Discord_LobbyHandle;
+typedef struct Discord_AdditionalContent Discord_AdditionalContent;
+typedef struct Discord_MessageHandle Discord_MessageHandle;
+typedef struct Discord_AudioDevice Discord_AudioDevice;
+typedef struct Discord_VoiceSettings Discord_VoiceSettings;
+typedef struct Discord_UserMessageSummary Discord_UserMessageSummary;
+typedef struct Discord_ClientCreateOptions Discord_ClientCreateOptions;
+typedef struct Discord_Client Discord_Client;
+typedef struct Discord_CallInfoHandle Discord_CallInfoHandle;
+typedef struct Discord_String {
+    uint8_t* ptr;
+    size_t size;
+} Discord_String;
+typedef struct Discord_ActivityButtonSpan {
+    Discord_ActivityButton* ptr;
+    size_t size;
+} Discord_ActivityButtonSpan;
+typedef struct Discord_UInt64Span {
+    uint64_t* ptr;
+    size_t size;
+} Discord_UInt64Span;
+typedef struct Discord_UserApplicationProfileHandleSpan {
+    Discord_UserApplicationProfileHandle* ptr;
+    size_t size;
+} Discord_UserApplicationProfileHandleSpan;
+typedef struct Discord_LobbyMemberHandleSpan {
+    Discord_LobbyMemberHandle* ptr;
+    size_t size;
+} Discord_LobbyMemberHandleSpan;
+typedef struct Discord_CallSpan {
+    Discord_Call* ptr;
+    size_t size;
+} Discord_CallSpan;
+typedef struct Discord_AudioDeviceSpan {
+    Discord_AudioDevice* ptr;
+    size_t size;
+} Discord_AudioDeviceSpan;
+typedef struct Discord_MessageHandleSpan {
+    Discord_MessageHandle* ptr;
+    size_t size;
+} Discord_MessageHandleSpan;
+typedef struct Discord_UserMessageSummarySpan {
+    Discord_UserMessageSummary* ptr;
+    size_t size;
+} Discord_UserMessageSummarySpan;
+typedef struct Discord_GuildChannelSpan {
+    Discord_GuildChannel* ptr;
+    size_t size;
+} Discord_GuildChannelSpan;
+typedef struct Discord_GuildMinimalSpan {
+    Discord_GuildMinimal* ptr;
+    size_t size;
+} Discord_GuildMinimalSpan;
+typedef struct Discord_RelationshipHandleSpan {
+    Discord_RelationshipHandle* ptr;
+    size_t size;
+} Discord_RelationshipHandleSpan;
+typedef struct Discord_UserHandleSpan {
+    Discord_UserHandle* ptr;
+    size_t size;
+} Discord_UserHandleSpan;
+typedef void (*Discord_Call_OnVoiceStateChanged)(uint64_t userId, void* userData);
+typedef void (*Discord_Call_OnParticipantChanged)(uint64_t userId, bool added, void* userData);
+typedef void (*Discord_Call_OnSpeakingStatusChanged)(uint64_t userId,
+                                                     bool isPlayingSound,
+                                                     void* userData);
+typedef void (*Discord_Call_OnStatusChanged)(Discord_Call_Status status,
+                                             Discord_Call_Error error,
+                                             int32_t errorDetail,
+                                             void* userData);
+typedef void (*Discord_Client_EndCallCallback)(void* userData);
+typedef void (*Discord_Client_EndCallsCallback)(void* userData);
+typedef void (*Discord_Client_GetCurrentInputDeviceCallback)(Discord_AudioDevice const* device,
+                                                             void* userData);
+typedef void (*Discord_Client_GetCurrentOutputDeviceCallback)(Discord_AudioDevice const* device,
+                                                              void* userData);
+typedef void (*Discord_Client_GetInputDevicesCallback)(Discord_AudioDeviceSpan devices,
+                                                       void* userData);
+typedef void (*Discord_Client_GetOutputDevicesCallback)(Discord_AudioDeviceSpan devices,
+                                                        void* userData);
+typedef void (*Discord_Client_GetVoiceSettingsCallback)(Discord_ClientResult* result,
+                                                        Discord_VoiceSettings* settings,
+                                                        void* userData);
+typedef void (*Discord_Client_DeviceChangeCallback)(Discord_AudioDeviceSpan inputDevices,
+                                                    Discord_AudioDeviceSpan outputDevices,
+                                                    void* userData);
+typedef void (*Discord_Client_SetInputDeviceCallback)(Discord_ClientResult* result, void* userData);
+typedef void (*Discord_Client_NoAudioInputCallback)(bool inputDetected, void* userData);
+typedef void (*Discord_Client_SetOutputDeviceCallback)(Discord_ClientResult* result,
+                                                       void* userData);
+typedef void (*Discord_Client_VoiceParticipantChangedCallback)(uint64_t lobbyId,
+                                                               uint64_t memberId,
+                                                               bool added,
+                                                               void* userData);
+typedef void (*Discord_Client_VoiceSettingsUpdatedCallback)(Discord_VoiceSettings* settings,
+                                                            void* userData);
+typedef void (*Discord_Client_UserAudioReceivedCallback)(uint64_t userId,
+                                                         int16_t* data,
+                                                         uint64_t samplesPerChannel,
+                                                         int32_t sampleRate,
+                                                         uint64_t channels,
+                                                         bool* outShouldMute,
+                                                         void* userData);
+typedef void (*Discord_Client_UserAudioCapturedCallback)(int16_t* data,
+                                                         uint64_t samplesPerChannel,
+                                                         int32_t sampleRate,
+                                                         uint64_t channels,
+                                                         void* userData);
+typedef void (*Discord_Client_AuthorizationCallback)(Discord_ClientResult* result,
+                                                     Discord_String code,
+                                                     Discord_String redirectUri,
+                                                     void* userData);
+typedef void (*Discord_Client_ExchangeChildTokenCallback)(Discord_ClientResult* result,
+                                                          Discord_String accessToken,
+                                                          Discord_AuthorizationTokenType tokenType,
+                                                          int32_t expiresIn,
+                                                          Discord_String scopes,
+                                                          void* userData);
+typedef void (*Discord_Client_FetchCurrentUserCallback)(Discord_ClientResult* result,
+                                                        uint64_t id,
+                                                        Discord_String name,
+                                                        void* userData);
+typedef void (*Discord_Client_TokenExchangeCallback)(Discord_ClientResult* result,
+                                                     Discord_String accessToken,
+                                                     Discord_String refreshToken,
+                                                     Discord_AuthorizationTokenType tokenType,
+                                                     int32_t expiresIn,
+                                                     Discord_String scopes,
+                                                     void* userData);
+typedef void (*Discord_Client_AuthorizeRequestCallback)(void* userData);
+typedef void (*Discord_Client_RevokeTokenCallback)(Discord_ClientResult* result, void* userData);
+typedef void (*Discord_Client_AuthorizeDeviceScreenClosedCallback)(void* userData);
+typedef void (*Discord_Client_TokenExpirationCallback)(void* userData);
+typedef void (*Discord_Client_UnmergeIntoProvisionalAccountCallback)(Discord_ClientResult* result,
+                                                                     void* userData);
+typedef void (*Discord_Client_UpdateProvisionalAccountDisplayNameCallback)(
+  Discord_ClientResult* result,
+  void* userData);
+typedef void (*Discord_Client_UpdateTokenCallback)(Discord_ClientResult* result, void* userData);
+typedef void (*Discord_Client_DeleteUserMessageCallback)(Discord_ClientResult* result,
+                                                         void* userData);
+typedef void (*Discord_Client_EditUserMessageCallback)(Discord_ClientResult* result,
+                                                       void* userData);
+typedef void (*Discord_Client_GetLobbyMessagesCallback)(Discord_ClientResult* result,
+                                                        Discord_MessageHandleSpan messages,
+                                                        void* userData);
+typedef void (*Discord_Client_UserMessageSummariesCallback)(
+  Discord_ClientResult* result,
+  Discord_UserMessageSummarySpan summaries,
+  void* userData);
+typedef void (*Discord_Client_UserMessagesWithLimitCallback)(Discord_ClientResult* result,
+                                                             Discord_MessageHandleSpan messages,
+                                                             void* userData);
+typedef void (*Discord_Client_ProvisionalUserMergeRequiredCallback)(void* userData);
+typedef void (*Discord_Client_OpenMessageInDiscordCallback)(Discord_ClientResult* result,
+                                                            void* userData);
+typedef void (*Discord_Client_SendUserMessageCallback)(Discord_ClientResult* result,
+                                                       uint64_t messageId,
+                                                       void* userData);
+typedef void (*Discord_Client_MessageCreatedCallback)(uint64_t messageId, void* userData);
+typedef void (*Discord_Client_MessageDeletedCallback)(uint64_t messageId,
+                                                      uint64_t channelId,
+                                                      void* userData);
+typedef void (*Discord_Client_MessageUpdatedCallback)(uint64_t messageId, void* userData);
+typedef void (*Discord_Client_LogCallback)(Discord_String message,
+                                           Discord_LoggingSeverity severity,
+                                           void* userData);
+typedef void (*Discord_Client_OpenConnectedGamesSettingsInDiscordCallback)(
+  Discord_ClientResult* result,
+  void* userData);
+typedef void (*Discord_Client_OnStatusChanged)(Discord_Client_Status status,
+                                               Discord_Client_Error error,
+                                               int32_t errorDetail,
+                                               void* userData);
+typedef void (*Discord_Client_CreateOrJoinLobbyCallback)(Discord_ClientResult* result,
+                                                         uint64_t lobbyId,
+                                                         void* userData);
+typedef void (*Discord_Client_GetGuildChannelsCallback)(Discord_ClientResult* result,
+                                                        Discord_GuildChannelSpan guildChannels,
+                                                        void* userData);
+typedef void (*Discord_Client_GetUserGuildsCallback)(Discord_ClientResult* result,
+                                                     Discord_GuildMinimalSpan guilds,
+                                                     void* userData);
+typedef void (*Discord_Client_JoinLinkedLobbyGuildCallback)(Discord_ClientResult* result,
+                                                            Discord_String inviteUrl,
+                                                            void* userData);
+typedef void (*Discord_Client_LeaveLobbyCallback)(Discord_ClientResult* result, void* userData);
+typedef void (*Discord_Client_LinkOrUnlinkChannelCallback)(Discord_ClientResult* result,
+                                                           void* userData);
+typedef void (*Discord_Client_LobbyCreatedCallback)(uint64_t lobbyId, void* userData);
+typedef void (*Discord_Client_LobbyDeletedCallback)(uint64_t lobbyId, void* userData);
+typedef void (*Discord_Client_LobbyMemberAddedCallback)(uint64_t lobbyId,
+                                                        uint64_t memberId,
+                                                        void* userData);
+typedef void (*Discord_Client_LobbyMemberRemovedCallback)(uint64_t lobbyId,
+                                                          uint64_t memberId,
+                                                          void* userData);
+typedef void (*Discord_Client_LobbyMemberUpdatedCallback)(uint64_t lobbyId,
+                                                          uint64_t memberId,
+                                                          void* userData);
+typedef void (*Discord_Client_LobbyUpdatedCallback)(uint64_t lobbyId, void* userData);
+typedef void (*Discord_Client_IsDiscordAppInstalledCallback)(bool installed, void* userData);
+typedef void (*Discord_Client_AcceptActivityInviteCallback)(Discord_ClientResult* result,
+                                                            Discord_String joinSecret,
+                                                            void* userData);
+typedef void (*Discord_Client_SendActivityInviteCallback)(Discord_ClientResult* result,
+                                                          void* userData);
+typedef void (*Discord_Client_ActivityInviteCallback)(Discord_ActivityInvite* invite,
+                                                      void* userData);
+typedef void (*Discord_Client_ActivityJoinCallback)(Discord_String joinSecret, void* userData);
+typedef void (*Discord_Client_ActivityJoinWithApplicationCallback)(uint64_t applicationId,
+                                                                   Discord_String joinSecret,
+                                                                   void* userData);
+typedef void (*Discord_Client_UpdateStatusCallback)(Discord_ClientResult* result, void* userData);
+typedef void (*Discord_Client_UpdateRichPresenceCallback)(Discord_ClientResult* result,
+                                                          void* userData);
+typedef void (*Discord_Client_UpdateRelationshipCallback)(Discord_ClientResult* result,
+                                                          void* userData);
+typedef void (*Discord_Client_SendFriendRequestCallback)(Discord_ClientResult* result,
+                                                         void* userData);
+typedef void (*Discord_Client_RelationshipCreatedCallback)(uint64_t userId,
+                                                           bool isDiscordRelationshipUpdate,
+                                                           void* userData);
+typedef void (*Discord_Client_RelationshipDeletedCallback)(uint64_t userId,
+                                                           bool isDiscordRelationshipUpdate,
+                                                           void* userData);
+typedef void (*Discord_Client_GetDiscordClientConnectedUserCallback)(Discord_ClientResult* result,
+                                                                     Discord_UserHandle* user,
+                                                                     void* userData);
+typedef void (*Discord_Client_RelationshipGroupsUpdatedCallback)(uint64_t userId, void* userData);
+typedef void (*Discord_Client_UserUpdatedCallback)(uint64_t userId, void* userData);
+struct Discord_ActivityInvite {
+    void* opaque;
+};
+
+void DISCORD_API Discord_ActivityInvite_Init(Discord_ActivityInvite* self);
+void DISCORD_API Discord_ActivityInvite_Drop(Discord_ActivityInvite* self);
+void DISCORD_API Discord_ActivityInvite_Clone(Discord_ActivityInvite* self,
+                                              Discord_ActivityInvite const* rhs);
+void DISCORD_API Discord_ActivityInvite_SetSenderId(Discord_ActivityInvite* self, uint64_t value);
+uint64_t DISCORD_API Discord_ActivityInvite_SenderId(Discord_ActivityInvite* self);
+void DISCORD_API Discord_ActivityInvite_SetChannelId(Discord_ActivityInvite* self, uint64_t value);
+uint64_t DISCORD_API Discord_ActivityInvite_ChannelId(Discord_ActivityInvite* self);
+void DISCORD_API Discord_ActivityInvite_SetMessageId(Discord_ActivityInvite* self, uint64_t value);
+uint64_t DISCORD_API Discord_ActivityInvite_MessageId(Discord_ActivityInvite* self);
+void DISCORD_API Discord_ActivityInvite_SetType(Discord_ActivityInvite* self,
+                                                Discord_ActivityActionTypes value);
+Discord_ActivityActionTypes DISCORD_API Discord_ActivityInvite_Type(Discord_ActivityInvite* self);
+void DISCORD_API Discord_ActivityInvite_SetApplicationId(Discord_ActivityInvite* self,
+                                                         uint64_t value);
+uint64_t DISCORD_API Discord_ActivityInvite_ApplicationId(Discord_ActivityInvite* self);
+void DISCORD_API Discord_ActivityInvite_SetParentApplicationId(Discord_ActivityInvite* self,
+                                                               uint64_t value);
+uint64_t DISCORD_API Discord_ActivityInvite_ParentApplicationId(Discord_ActivityInvite* self);
+void DISCORD_API Discord_ActivityInvite_SetPartyId(Discord_ActivityInvite* self,
+                                                   Discord_String value);
+void DISCORD_API Discord_ActivityInvite_PartyId(Discord_ActivityInvite* self,
+                                                Discord_String* returnValue);
+void DISCORD_API Discord_ActivityInvite_SetSessionId(Discord_ActivityInvite* self,
+                                                     Discord_String value);
+void DISCORD_API Discord_ActivityInvite_SessionId(Discord_ActivityInvite* self,
+                                                  Discord_String* returnValue);
+void DISCORD_API Discord_ActivityInvite_SetIsValid(Discord_ActivityInvite* self, bool value);
+bool DISCORD_API Discord_ActivityInvite_IsValid(Discord_ActivityInvite* self);
+struct Discord_ActivityAssets {
+    void* opaque;
+};
+
+void DISCORD_API Discord_ActivityAssets_Init(Discord_ActivityAssets* self);
+void DISCORD_API Discord_ActivityAssets_Drop(Discord_ActivityAssets* self);
+void DISCORD_API Discord_ActivityAssets_Clone(Discord_ActivityAssets* self,
+                                              Discord_ActivityAssets const* arg0);
+void DISCORD_API Discord_ActivityAssets_SetLargeImage(Discord_ActivityAssets* self,
+                                                      Discord_String* value);
+bool DISCORD_API Discord_ActivityAssets_LargeImage(Discord_ActivityAssets* self,
+                                                   Discord_String* returnValue);
+void DISCORD_API Discord_ActivityAssets_SetLargeText(Discord_ActivityAssets* self,
+                                                     Discord_String* value);
+bool DISCORD_API Discord_ActivityAssets_LargeText(Discord_ActivityAssets* self,
+                                                  Discord_String* returnValue);
+void DISCORD_API Discord_ActivityAssets_SetLargeUrl(Discord_ActivityAssets* self,
+                                                    Discord_String* value);
+bool DISCORD_API Discord_ActivityAssets_LargeUrl(Discord_ActivityAssets* self,
+                                                 Discord_String* returnValue);
+void DISCORD_API Discord_ActivityAssets_SetSmallImage(Discord_ActivityAssets* self,
+                                                      Discord_String* value);
+bool DISCORD_API Discord_ActivityAssets_SmallImage(Discord_ActivityAssets* self,
+                                                   Discord_String* returnValue);
+void DISCORD_API Discord_ActivityAssets_SetSmallText(Discord_ActivityAssets* self,
+                                                     Discord_String* value);
+bool DISCORD_API Discord_ActivityAssets_SmallText(Discord_ActivityAssets* self,
+                                                  Discord_String* returnValue);
+void DISCORD_API Discord_ActivityAssets_SetSmallUrl(Discord_ActivityAssets* self,
+                                                    Discord_String* value);
+bool DISCORD_API Discord_ActivityAssets_SmallUrl(Discord_ActivityAssets* self,
+                                                 Discord_String* returnValue);
+void DISCORD_API Discord_ActivityAssets_SetInviteCoverImage(Discord_ActivityAssets* self,
+                                                            Discord_String* value);
+bool DISCORD_API Discord_ActivityAssets_InviteCoverImage(Discord_ActivityAssets* self,
+                                                         Discord_String* returnValue);
+struct Discord_ActivityTimestamps {
+    void* opaque;
+};
+
+void DISCORD_API Discord_ActivityTimestamps_Init(Discord_ActivityTimestamps* self);
+void DISCORD_API Discord_ActivityTimestamps_Drop(Discord_ActivityTimestamps* self);
+void DISCORD_API Discord_ActivityTimestamps_Clone(Discord_ActivityTimestamps* self,
+                                                  Discord_ActivityTimestamps const* arg0);
+void DISCORD_API Discord_ActivityTimestamps_SetStart(Discord_ActivityTimestamps* self,
+                                                     uint64_t value);
+uint64_t DISCORD_API Discord_ActivityTimestamps_Start(Discord_ActivityTimestamps* self);
+void DISCORD_API Discord_ActivityTimestamps_SetEnd(Discord_ActivityTimestamps* self,
+                                                   uint64_t value);
+uint64_t DISCORD_API Discord_ActivityTimestamps_End(Discord_ActivityTimestamps* self);
+struct Discord_ActivityParty {
+    void* opaque;
+};
+
+void DISCORD_API Discord_ActivityParty_Init(Discord_ActivityParty* self);
+void DISCORD_API Discord_ActivityParty_Drop(Discord_ActivityParty* self);
+void DISCORD_API Discord_ActivityParty_Clone(Discord_ActivityParty* self,
+                                             Discord_ActivityParty const* arg0);
+void DISCORD_API Discord_ActivityParty_SetId(Discord_ActivityParty* self, Discord_String value);
+void DISCORD_API Discord_ActivityParty_Id(Discord_ActivityParty* self, Discord_String* returnValue);
+void DISCORD_API Discord_ActivityParty_SetCurrentSize(Discord_ActivityParty* self, int32_t value);
+int32_t DISCORD_API Discord_ActivityParty_CurrentSize(Discord_ActivityParty* self);
+void DISCORD_API Discord_ActivityParty_SetMaxSize(Discord_ActivityParty* self, int32_t value);
+int32_t DISCORD_API Discord_ActivityParty_MaxSize(Discord_ActivityParty* self);
+void DISCORD_API Discord_ActivityParty_SetPrivacy(Discord_ActivityParty* self,
+                                                  Discord_ActivityPartyPrivacy value);
+Discord_ActivityPartyPrivacy DISCORD_API Discord_ActivityParty_Privacy(Discord_ActivityParty* self);
+struct Discord_ActivitySecrets {
+    void* opaque;
+};
+
+void DISCORD_API Discord_ActivitySecrets_Init(Discord_ActivitySecrets* self);
+void DISCORD_API Discord_ActivitySecrets_Drop(Discord_ActivitySecrets* self);
+void DISCORD_API Discord_ActivitySecrets_Clone(Discord_ActivitySecrets* self,
+                                               Discord_ActivitySecrets const* arg0);
+void DISCORD_API Discord_ActivitySecrets_SetJoin(Discord_ActivitySecrets* self,
+                                                 Discord_String value);
+void DISCORD_API Discord_ActivitySecrets_Join(Discord_ActivitySecrets* self,
+                                              Discord_String* returnValue);
+struct Discord_ActivityButton {
+    void* opaque;
+};
+
+void DISCORD_API Discord_ActivityButton_Init(Discord_ActivityButton* self);
+void DISCORD_API Discord_ActivityButton_Drop(Discord_ActivityButton* self);
+void DISCORD_API Discord_ActivityButton_Clone(Discord_ActivityButton* self,
+                                              Discord_ActivityButton const* arg0);
+void DISCORD_API Discord_ActivityButton_SetLabel(Discord_ActivityButton* self,
+                                                 Discord_String value);
+void DISCORD_API Discord_ActivityButton_Label(Discord_ActivityButton* self,
+                                              Discord_String* returnValue);
+void DISCORD_API Discord_ActivityButton_SetUrl(Discord_ActivityButton* self, Discord_String value);
+void DISCORD_API Discord_ActivityButton_Url(Discord_ActivityButton* self,
+                                            Discord_String* returnValue);
+struct Discord_Activity {
+    void* opaque;
+};
+
+void DISCORD_API Discord_Activity_Init(Discord_Activity* self);
+void DISCORD_API Discord_Activity_Drop(Discord_Activity* self);
+void DISCORD_API Discord_Activity_Clone(Discord_Activity* self, Discord_Activity const* arg0);
+void DISCORD_API Discord_Activity_AddButton(Discord_Activity* self,
+                                            Discord_ActivityButton const* button);
+bool DISCORD_API Discord_Activity_Equals(Discord_Activity* self, Discord_Activity const* other);
+void DISCORD_API Discord_Activity_GetButtons(Discord_Activity* self,
+                                             Discord_ActivityButtonSpan* returnValue);
+void DISCORD_API Discord_Activity_SetName(Discord_Activity* self, Discord_String value);
+void DISCORD_API Discord_Activity_Name(Discord_Activity* self, Discord_String* returnValue);
+void DISCORD_API Discord_Activity_SetType(Discord_Activity* self, Discord_ActivityTypes value);
+Discord_ActivityTypes DISCORD_API Discord_Activity_Type(Discord_Activity* self);
+void DISCORD_API Discord_Activity_SetStatusDisplayType(Discord_Activity* self,
+                                                       Discord_StatusDisplayTypes* value);
+bool DISCORD_API Discord_Activity_StatusDisplayType(Discord_Activity* self,
+                                                    Discord_StatusDisplayTypes* returnValue);
+void DISCORD_API Discord_Activity_SetState(Discord_Activity* self, Discord_String* value);
+bool DISCORD_API Discord_Activity_State(Discord_Activity* self, Discord_String* returnValue);
+void DISCORD_API Discord_Activity_SetStateUrl(Discord_Activity* self, Discord_String* value);
+bool DISCORD_API Discord_Activity_StateUrl(Discord_Activity* self, Discord_String* returnValue);
+void DISCORD_API Discord_Activity_SetDetails(Discord_Activity* self, Discord_String* value);
+bool DISCORD_API Discord_Activity_Details(Discord_Activity* self, Discord_String* returnValue);
+void DISCORD_API Discord_Activity_SetDetailsUrl(Discord_Activity* self, Discord_String* value);
+bool DISCORD_API Discord_Activity_DetailsUrl(Discord_Activity* self, Discord_String* returnValue);
+void DISCORD_API Discord_Activity_SetApplicationId(Discord_Activity* self, uint64_t* value);
+bool DISCORD_API Discord_Activity_ApplicationId(Discord_Activity* self, uint64_t* returnValue);
+void DISCORD_API Discord_Activity_SetParentApplicationId(Discord_Activity* self, uint64_t* value);
+bool DISCORD_API Discord_Activity_ParentApplicationId(Discord_Activity* self,
+                                                      uint64_t* returnValue);
+void DISCORD_API Discord_Activity_SetAssets(Discord_Activity* self, Discord_ActivityAssets* value);
+bool DISCORD_API Discord_Activity_Assets(Discord_Activity* self,
+                                         Discord_ActivityAssets* returnValue);
+void DISCORD_API Discord_Activity_SetTimestamps(Discord_Activity* self,
+                                                Discord_ActivityTimestamps* value);
+bool DISCORD_API Discord_Activity_Timestamps(Discord_Activity* self,
+                                             Discord_ActivityTimestamps* returnValue);
+void DISCORD_API Discord_Activity_SetParty(Discord_Activity* self, Discord_ActivityParty* value);
+bool DISCORD_API Discord_Activity_Party(Discord_Activity* self, Discord_ActivityParty* returnValue);
+void DISCORD_API Discord_Activity_SetSecrets(Discord_Activity* self,
+                                             Discord_ActivitySecrets* value);
+bool DISCORD_API Discord_Activity_Secrets(Discord_Activity* self,
+                                          Discord_ActivitySecrets* returnValue);
+void DISCORD_API Discord_Activity_SetSupportedPlatforms(Discord_Activity* self,
+                                                        Discord_ActivityGamePlatforms value);
+Discord_ActivityGamePlatforms DISCORD_API
+Discord_Activity_SupportedPlatforms(Discord_Activity* self);
+struct Discord_ClientResult {
+    void* opaque;
+};
+
+void DISCORD_API Discord_ClientResult_Drop(Discord_ClientResult* self);
+void DISCORD_API Discord_ClientResult_Clone(Discord_ClientResult* self,
+                                            Discord_ClientResult const* arg0);
+void DISCORD_API Discord_ClientResult_ToString(Discord_ClientResult* self,
+                                               Discord_String* returnValue);
+void DISCORD_API Discord_ClientResult_SetType(Discord_ClientResult* self, Discord_ErrorType value);
+Discord_ErrorType DISCORD_API Discord_ClientResult_Type(Discord_ClientResult* self);
+void DISCORD_API Discord_ClientResult_SetError(Discord_ClientResult* self, Discord_String value);
+void DISCORD_API Discord_ClientResult_Error(Discord_ClientResult* self,
+                                            Discord_String* returnValue);
+void DISCORD_API Discord_ClientResult_SetErrorCode(Discord_ClientResult* self, int32_t value);
+int32_t DISCORD_API Discord_ClientResult_ErrorCode(Discord_ClientResult* self);
+void DISCORD_API Discord_ClientResult_SetStatus(Discord_ClientResult* self,
+                                                Discord_HttpStatusCode value);
+Discord_HttpStatusCode DISCORD_API Discord_ClientResult_Status(Discord_ClientResult* self);
+void DISCORD_API Discord_ClientResult_SetResponseBody(Discord_ClientResult* self,
+                                                      Discord_String value);
+void DISCORD_API Discord_ClientResult_ResponseBody(Discord_ClientResult* self,
+                                                   Discord_String* returnValue);
+void DISCORD_API Discord_ClientResult_SetSuccessful(Discord_ClientResult* self, bool value);
+bool DISCORD_API Discord_ClientResult_Successful(Discord_ClientResult* self);
+void DISCORD_API Discord_ClientResult_SetRetryable(Discord_ClientResult* self, bool value);
+bool DISCORD_API Discord_ClientResult_Retryable(Discord_ClientResult* self);
+void DISCORD_API Discord_ClientResult_SetRetryAfter(Discord_ClientResult* self, float value);
+float DISCORD_API Discord_ClientResult_RetryAfter(Discord_ClientResult* self);
+struct Discord_AuthorizationCodeChallenge {
+    void* opaque;
+};
+
+void DISCORD_API Discord_AuthorizationCodeChallenge_Init(Discord_AuthorizationCodeChallenge* self);
+void DISCORD_API Discord_AuthorizationCodeChallenge_Drop(Discord_AuthorizationCodeChallenge* self);
+void DISCORD_API
+Discord_AuthorizationCodeChallenge_Clone(Discord_AuthorizationCodeChallenge* self,
+                                         Discord_AuthorizationCodeChallenge const* arg0);
+void DISCORD_API
+Discord_AuthorizationCodeChallenge_SetMethod(Discord_AuthorizationCodeChallenge* self,
+                                             Discord_AuthenticationCodeChallengeMethod value);
+Discord_AuthenticationCodeChallengeMethod DISCORD_API
+Discord_AuthorizationCodeChallenge_Method(Discord_AuthorizationCodeChallenge* self);
+void DISCORD_API
+Discord_AuthorizationCodeChallenge_SetChallenge(Discord_AuthorizationCodeChallenge* self,
+                                                Discord_String value);
+void DISCORD_API
+Discord_AuthorizationCodeChallenge_Challenge(Discord_AuthorizationCodeChallenge* self,
+                                             Discord_String* returnValue);
+struct Discord_AuthorizationCodeVerifier {
+    void* opaque;
+};
+
+void DISCORD_API Discord_AuthorizationCodeVerifier_Drop(Discord_AuthorizationCodeVerifier* self);
+void DISCORD_API
+Discord_AuthorizationCodeVerifier_Clone(Discord_AuthorizationCodeVerifier* self,
+                                        Discord_AuthorizationCodeVerifier const* arg0);
+void DISCORD_API
+Discord_AuthorizationCodeVerifier_SetChallenge(Discord_AuthorizationCodeVerifier* self,
+                                               Discord_AuthorizationCodeChallenge* value);
+void DISCORD_API
+Discord_AuthorizationCodeVerifier_Challenge(Discord_AuthorizationCodeVerifier* self,
+                                            Discord_AuthorizationCodeChallenge* returnValue);
+void DISCORD_API
+Discord_AuthorizationCodeVerifier_SetVerifier(Discord_AuthorizationCodeVerifier* self,
+                                              Discord_String value);
+void DISCORD_API Discord_AuthorizationCodeVerifier_Verifier(Discord_AuthorizationCodeVerifier* self,
+                                                            Discord_String* returnValue);
+struct Discord_AuthorizationArgs {
+    void* opaque;
+};
+
+void DISCORD_API Discord_AuthorizationArgs_Init(Discord_AuthorizationArgs* self);
+void DISCORD_API Discord_AuthorizationArgs_Drop(Discord_AuthorizationArgs* self);
+void DISCORD_API Discord_AuthorizationArgs_Clone(Discord_AuthorizationArgs* self,
+                                                 Discord_AuthorizationArgs const* arg0);
+void DISCORD_API Discord_AuthorizationArgs_SetClientId(Discord_AuthorizationArgs* self,
+                                                       uint64_t value);
+uint64_t DISCORD_API Discord_AuthorizationArgs_ClientId(Discord_AuthorizationArgs* self);
+void DISCORD_API Discord_AuthorizationArgs_SetScopes(Discord_AuthorizationArgs* self,
+                                                     Discord_String value);
+void DISCORD_API Discord_AuthorizationArgs_Scopes(Discord_AuthorizationArgs* self,
+                                                  Discord_String* returnValue);
+void DISCORD_API Discord_AuthorizationArgs_SetState(Discord_AuthorizationArgs* self,
+                                                    Discord_String* value);
+bool DISCORD_API Discord_AuthorizationArgs_State(Discord_AuthorizationArgs* self,
+                                                 Discord_String* returnValue);
+void DISCORD_API Discord_AuthorizationArgs_SetNonce(Discord_AuthorizationArgs* self,
+                                                    Discord_String* value);
+bool DISCORD_API Discord_AuthorizationArgs_Nonce(Discord_AuthorizationArgs* self,
+                                                 Discord_String* returnValue);
+void DISCORD_API
+Discord_AuthorizationArgs_SetCodeChallenge(Discord_AuthorizationArgs* self,
+                                           Discord_AuthorizationCodeChallenge* value);
+bool DISCORD_API
+Discord_AuthorizationArgs_CodeChallenge(Discord_AuthorizationArgs* self,
+                                        Discord_AuthorizationCodeChallenge* returnValue);
+void DISCORD_API Discord_AuthorizationArgs_SetIntegrationType(Discord_AuthorizationArgs* self,
+                                                              Discord_IntegrationType* value);
+bool DISCORD_API Discord_AuthorizationArgs_IntegrationType(Discord_AuthorizationArgs* self,
+                                                           Discord_IntegrationType* returnValue);
+void DISCORD_API Discord_AuthorizationArgs_SetCustomSchemeParam(Discord_AuthorizationArgs* self,
+                                                                Discord_String* value);
+bool DISCORD_API Discord_AuthorizationArgs_CustomSchemeParam(Discord_AuthorizationArgs* self,
+                                                             Discord_String* returnValue);
+struct Discord_DeviceAuthorizationArgs {
+    void* opaque;
+};
+
+void DISCORD_API Discord_DeviceAuthorizationArgs_Init(Discord_DeviceAuthorizationArgs* self);
+void DISCORD_API Discord_DeviceAuthorizationArgs_Drop(Discord_DeviceAuthorizationArgs* self);
+void DISCORD_API Discord_DeviceAuthorizationArgs_Clone(Discord_DeviceAuthorizationArgs* self,
+                                                       Discord_DeviceAuthorizationArgs const* arg0);
+void DISCORD_API Discord_DeviceAuthorizationArgs_SetClientId(Discord_DeviceAuthorizationArgs* self,
+                                                             uint64_t value);
+uint64_t DISCORD_API
+Discord_DeviceAuthorizationArgs_ClientId(Discord_DeviceAuthorizationArgs* self);
+void DISCORD_API Discord_DeviceAuthorizationArgs_SetScopes(Discord_DeviceAuthorizationArgs* self,
+                                                           Discord_String value);
+void DISCORD_API Discord_DeviceAuthorizationArgs_Scopes(Discord_DeviceAuthorizationArgs* self,
+                                                        Discord_String* returnValue);
+struct Discord_VoiceStateHandle {
+    void* opaque;
+};
+
+void DISCORD_API Discord_VoiceStateHandle_Drop(Discord_VoiceStateHandle* self);
+void DISCORD_API Discord_VoiceStateHandle_Clone(Discord_VoiceStateHandle* self,
+                                                Discord_VoiceStateHandle const* other);
+bool DISCORD_API Discord_VoiceStateHandle_SelfDeaf(Discord_VoiceStateHandle* self);
+bool DISCORD_API Discord_VoiceStateHandle_SelfMute(Discord_VoiceStateHandle* self);
+struct Discord_VADThresholdSettings {
+    void* opaque;
+};
+
+void DISCORD_API Discord_VADThresholdSettings_Drop(Discord_VADThresholdSettings* self);
+void DISCORD_API Discord_VADThresholdSettings_SetVadThreshold(Discord_VADThresholdSettings* self,
+                                                              float value);
+float DISCORD_API Discord_VADThresholdSettings_VadThreshold(Discord_VADThresholdSettings* self);
+void DISCORD_API Discord_VADThresholdSettings_SetAutomatic(Discord_VADThresholdSettings* self,
+                                                           bool value);
+bool DISCORD_API Discord_VADThresholdSettings_Automatic(Discord_VADThresholdSettings* self);
+struct Discord_Call {
+    void* opaque[3];
+};
+
+void DISCORD_API Discord_Call_Drop(Discord_Call* self);
+void DISCORD_API Discord_Call_Clone(Discord_Call* self, Discord_Call* other);
+void DISCORD_API Discord_Call_ErrorToString(Discord_Call_Error type, Discord_String* returnValue);
+Discord_AudioModeType DISCORD_API Discord_Call_GetAudioMode(Discord_Call* self);
+uint64_t DISCORD_API Discord_Call_GetChannelId(Discord_Call* self);
+uint64_t DISCORD_API Discord_Call_GetGuildId(Discord_Call* self);
+bool DISCORD_API Discord_Call_GetLocalMute(Discord_Call* self, uint64_t userId);
+void DISCORD_API Discord_Call_GetParticipants(Discord_Call* self, Discord_UInt64Span* returnValue);
+float DISCORD_API Discord_Call_GetParticipantVolume(Discord_Call* self, uint64_t userId);
+bool DISCORD_API Discord_Call_GetPTTActive(Discord_Call* self);
+uint32_t DISCORD_API Discord_Call_GetPTTReleaseDelay(Discord_Call* self);
+bool DISCORD_API Discord_Call_GetSelfDeaf(Discord_Call* self);
+bool DISCORD_API Discord_Call_GetSelfMute(Discord_Call* self);
+Discord_Call_Status DISCORD_API Discord_Call_GetStatus(Discord_Call* self);
+void DISCORD_API Discord_Call_GetVADThreshold(Discord_Call* self,
+                                              Discord_VADThresholdSettings* returnValue);
+bool DISCORD_API Discord_Call_GetVoiceStateHandle(Discord_Call* self,
+                                                  uint64_t userId,
+                                                  Discord_VoiceStateHandle* returnValue);
+void DISCORD_API Discord_Call_SetAudioMode(Discord_Call* self, Discord_AudioModeType audioMode);
+void DISCORD_API Discord_Call_SetLocalMute(Discord_Call* self, uint64_t userId, bool mute);
+void DISCORD_API Discord_Call_SetOnVoiceStateChangedCallback(Discord_Call* self,
+                                                             Discord_Call_OnVoiceStateChanged cb,
+                                                             Discord_FreeFn cb__userDataFree,
+                                                             void* cb__userData);
+void DISCORD_API Discord_Call_SetParticipantChangedCallback(Discord_Call* self,
+                                                            Discord_Call_OnParticipantChanged cb,
+                                                            Discord_FreeFn cb__userDataFree,
+                                                            void* cb__userData);
+void DISCORD_API Discord_Call_SetParticipantVolume(Discord_Call* self,
+                                                   uint64_t userId,
+                                                   float volume);
+void DISCORD_API Discord_Call_SetPTTActive(Discord_Call* self, bool active);
+void DISCORD_API Discord_Call_SetPTTReleaseDelay(Discord_Call* self, uint32_t releaseDelayMs);
+void DISCORD_API Discord_Call_SetSelfDeaf(Discord_Call* self, bool deaf);
+void DISCORD_API Discord_Call_SetSelfMute(Discord_Call* self, bool mute);
+void DISCORD_API
+Discord_Call_SetSpeakingStatusChangedCallback(Discord_Call* self,
+                                              Discord_Call_OnSpeakingStatusChanged cb,
+                                              Discord_FreeFn cb__userDataFree,
+                                              void* cb__userData);
+void DISCORD_API Discord_Call_SetStatusChangedCallback(Discord_Call* self,
+                                                       Discord_Call_OnStatusChanged cb,
+                                                       Discord_FreeFn cb__userDataFree,
+                                                       void* cb__userData);
+void DISCORD_API Discord_Call_SetVADThreshold(Discord_Call* self, bool automatic, float threshold);
+void DISCORD_API Discord_Call_StatusToString(Discord_Call_Status type, Discord_String* returnValue);
+struct Discord_ChannelHandle {
+    void* opaque;
+};
+
+void DISCORD_API Discord_ChannelHandle_Drop(Discord_ChannelHandle* self);
+void DISCORD_API Discord_ChannelHandle_Clone(Discord_ChannelHandle* self,
+                                             Discord_ChannelHandle const* other);
+uint64_t DISCORD_API Discord_ChannelHandle_Id(Discord_ChannelHandle* self);
+void DISCORD_API Discord_ChannelHandle_Name(Discord_ChannelHandle* self,
+                                            Discord_String* returnValue);
+void DISCORD_API Discord_ChannelHandle_Recipients(Discord_ChannelHandle* self,
+                                                  Discord_UInt64Span* returnValue);
+Discord_ChannelType DISCORD_API Discord_ChannelHandle_Type(Discord_ChannelHandle* self);
+struct Discord_GuildMinimal {
+    void* opaque;
+};
+
+void DISCORD_API Discord_GuildMinimal_Drop(Discord_GuildMinimal* self);
+void DISCORD_API Discord_GuildMinimal_Clone(Discord_GuildMinimal* self,
+                                            Discord_GuildMinimal const* arg0);
+void DISCORD_API Discord_GuildMinimal_SetId(Discord_GuildMinimal* self, uint64_t value);
+uint64_t DISCORD_API Discord_GuildMinimal_Id(Discord_GuildMinimal* self);
+void DISCORD_API Discord_GuildMinimal_SetName(Discord_GuildMinimal* self, Discord_String value);
+void DISCORD_API Discord_GuildMinimal_Name(Discord_GuildMinimal* self, Discord_String* returnValue);
+struct Discord_GuildChannel {
+    void* opaque;
+};
+
+void DISCORD_API Discord_GuildChannel_Drop(Discord_GuildChannel* self);
+void DISCORD_API Discord_GuildChannel_Clone(Discord_GuildChannel* self,
+                                            Discord_GuildChannel const* arg0);
+void DISCORD_API Discord_GuildChannel_SetId(Discord_GuildChannel* self, uint64_t value);
+uint64_t DISCORD_API Discord_GuildChannel_Id(Discord_GuildChannel* self);
+void DISCORD_API Discord_GuildChannel_SetName(Discord_GuildChannel* self, Discord_String value);
+void DISCORD_API Discord_GuildChannel_Name(Discord_GuildChannel* self, Discord_String* returnValue);
+void DISCORD_API Discord_GuildChannel_SetType(Discord_GuildChannel* self,
+                                              Discord_ChannelType value);
+Discord_ChannelType DISCORD_API Discord_GuildChannel_Type(Discord_GuildChannel* self);
+void DISCORD_API Discord_GuildChannel_SetPosition(Discord_GuildChannel* self, int32_t value);
+int32_t DISCORD_API Discord_GuildChannel_Position(Discord_GuildChannel* self);
+void DISCORD_API Discord_GuildChannel_SetParentId(Discord_GuildChannel* self, uint64_t* value);
+bool DISCORD_API Discord_GuildChannel_ParentId(Discord_GuildChannel* self, uint64_t* returnValue);
+void DISCORD_API Discord_GuildChannel_SetIsLinkable(Discord_GuildChannel* self, bool value);
+bool DISCORD_API Discord_GuildChannel_IsLinkable(Discord_GuildChannel* self);
+void DISCORD_API
+Discord_GuildChannel_SetIsViewableAndWriteableByAllMembers(Discord_GuildChannel* self, bool value);
+bool DISCORD_API
+Discord_GuildChannel_IsViewableAndWriteableByAllMembers(Discord_GuildChannel* self);
+void DISCORD_API Discord_GuildChannel_SetLinkedLobby(Discord_GuildChannel* self,
+                                                     Discord_LinkedLobby* value);
+bool DISCORD_API Discord_GuildChannel_LinkedLobby(Discord_GuildChannel* self,
+                                                  Discord_LinkedLobby* returnValue);
+struct Discord_LinkedLobby {
+    void* opaque;
+};
+
+void DISCORD_API Discord_LinkedLobby_Init(Discord_LinkedLobby* self);
+void DISCORD_API Discord_LinkedLobby_Drop(Discord_LinkedLobby* self);
+void DISCORD_API Discord_LinkedLobby_Clone(Discord_LinkedLobby* self,
+                                           Discord_LinkedLobby const* arg0);
+void DISCORD_API Discord_LinkedLobby_SetApplicationId(Discord_LinkedLobby* self, uint64_t value);
+uint64_t DISCORD_API Discord_LinkedLobby_ApplicationId(Discord_LinkedLobby* self);
+void DISCORD_API Discord_LinkedLobby_SetLobbyId(Discord_LinkedLobby* self, uint64_t value);
+uint64_t DISCORD_API Discord_LinkedLobby_LobbyId(Discord_LinkedLobby* self);
+struct Discord_LinkedChannel {
+    void* opaque;
+};
+
+void DISCORD_API Discord_LinkedChannel_Drop(Discord_LinkedChannel* self);
+void DISCORD_API Discord_LinkedChannel_Clone(Discord_LinkedChannel* self,
+                                             Discord_LinkedChannel const* arg0);
+void DISCORD_API Discord_LinkedChannel_SetId(Discord_LinkedChannel* self, uint64_t value);
+uint64_t DISCORD_API Discord_LinkedChannel_Id(Discord_LinkedChannel* self);
+void DISCORD_API Discord_LinkedChannel_SetName(Discord_LinkedChannel* self, Discord_String value);
+void DISCORD_API Discord_LinkedChannel_Name(Discord_LinkedChannel* self,
+                                            Discord_String* returnValue);
+void DISCORD_API Discord_LinkedChannel_SetGuildId(Discord_LinkedChannel* self, uint64_t value);
+uint64_t DISCORD_API Discord_LinkedChannel_GuildId(Discord_LinkedChannel* self);
+struct Discord_RelationshipHandle {
+    void* opaque;
+};
+
+void DISCORD_API Discord_RelationshipHandle_Drop(Discord_RelationshipHandle* self);
+void DISCORD_API Discord_RelationshipHandle_Clone(Discord_RelationshipHandle* self,
+                                                  Discord_RelationshipHandle const* other);
+Discord_RelationshipType DISCORD_API
+Discord_RelationshipHandle_DiscordRelationshipType(Discord_RelationshipHandle* self);
+Discord_RelationshipType DISCORD_API
+Discord_RelationshipHandle_GameRelationshipType(Discord_RelationshipHandle* self);
+uint64_t DISCORD_API Discord_RelationshipHandle_Id(Discord_RelationshipHandle* self);
+bool DISCORD_API Discord_RelationshipHandle_IsSpamRequest(Discord_RelationshipHandle* self);
+bool DISCORD_API Discord_RelationshipHandle_User(Discord_RelationshipHandle* self,
+                                                 Discord_UserHandle* returnValue);
+struct Discord_UserApplicationProfileHandle {
+    void* opaque;
+};
+
+void DISCORD_API
+Discord_UserApplicationProfileHandle_Drop(Discord_UserApplicationProfileHandle* self);
+void DISCORD_API
+Discord_UserApplicationProfileHandle_Clone(Discord_UserApplicationProfileHandle* self,
+                                           Discord_UserApplicationProfileHandle const* other);
+void DISCORD_API
+Discord_UserApplicationProfileHandle_AvatarHash(Discord_UserApplicationProfileHandle* self,
+                                                Discord_String* returnValue);
+void DISCORD_API
+Discord_UserApplicationProfileHandle_Metadata(Discord_UserApplicationProfileHandle* self,
+                                              Discord_String* returnValue);
+bool DISCORD_API
+Discord_UserApplicationProfileHandle_ProviderId(Discord_UserApplicationProfileHandle* self,
+                                                Discord_String* returnValue);
+void DISCORD_API Discord_UserApplicationProfileHandle_ProviderIssuedUserId(
+  Discord_UserApplicationProfileHandle* self,
+  Discord_String* returnValue);
+Discord_ExternalIdentityProviderType DISCORD_API
+Discord_UserApplicationProfileHandle_ProviderType(Discord_UserApplicationProfileHandle* self);
+void DISCORD_API
+Discord_UserApplicationProfileHandle_Username(Discord_UserApplicationProfileHandle* self,
+                                              Discord_String* returnValue);
+struct Discord_UserHandle {
+    void* opaque;
+};
+
+void DISCORD_API Discord_UserHandle_Drop(Discord_UserHandle* self);
+void DISCORD_API Discord_UserHandle_Clone(Discord_UserHandle* self, Discord_UserHandle const* arg0);
+bool DISCORD_API Discord_UserHandle_Avatar(Discord_UserHandle* self, Discord_String* returnValue);
+void DISCORD_API Discord_UserHandle_AvatarTypeToString(Discord_UserHandle_AvatarType type,
+                                                       Discord_String* returnValue);
+void DISCORD_API Discord_UserHandle_AvatarUrl(Discord_UserHandle* self,
+                                              Discord_UserHandle_AvatarType animatedType,
+                                              Discord_UserHandle_AvatarType staticType,
+                                              Discord_String* returnValue);
+void DISCORD_API Discord_UserHandle_DisplayName(Discord_UserHandle* self,
+                                                Discord_String* returnValue);
+bool DISCORD_API Discord_UserHandle_GameActivity(Discord_UserHandle* self,
+                                                 Discord_Activity* returnValue);
+bool DISCORD_API Discord_UserHandle_GlobalName(Discord_UserHandle* self,
+                                               Discord_String* returnValue);
+uint64_t DISCORD_API Discord_UserHandle_Id(Discord_UserHandle* self);
+bool DISCORD_API Discord_UserHandle_IsProvisional(Discord_UserHandle* self);
+void DISCORD_API Discord_UserHandle_Relationship(Discord_UserHandle* self,
+                                                 Discord_RelationshipHandle* returnValue);
+Discord_StatusType DISCORD_API Discord_UserHandle_Status(Discord_UserHandle* self);
+void DISCORD_API
+Discord_UserHandle_UserApplicationProfiles(Discord_UserHandle* self,
+                                           Discord_UserApplicationProfileHandleSpan* returnValue);
+void DISCORD_API Discord_UserHandle_Username(Discord_UserHandle* self, Discord_String* returnValue);
+struct Discord_LobbyMemberHandle {
+    void* opaque;
+};
+
+void DISCORD_API Discord_LobbyMemberHandle_Drop(Discord_LobbyMemberHandle* self);
+void DISCORD_API Discord_LobbyMemberHandle_Clone(Discord_LobbyMemberHandle* self,
+                                                 Discord_LobbyMemberHandle const* other);
+bool DISCORD_API Discord_LobbyMemberHandle_CanLinkLobby(Discord_LobbyMemberHandle* self);
+bool DISCORD_API Discord_LobbyMemberHandle_Connected(Discord_LobbyMemberHandle* self);
+uint64_t DISCORD_API Discord_LobbyMemberHandle_Id(Discord_LobbyMemberHandle* self);
+void DISCORD_API Discord_LobbyMemberHandle_Metadata(Discord_LobbyMemberHandle* self,
+                                                    Discord_Properties* returnValue);
+bool DISCORD_API Discord_LobbyMemberHandle_User(Discord_LobbyMemberHandle* self,
+                                                Discord_UserHandle* returnValue);
+struct Discord_LobbyHandle {
+    void* opaque;
+};
+
+void DISCORD_API Discord_LobbyHandle_Drop(Discord_LobbyHandle* self);
+void DISCORD_API Discord_LobbyHandle_Clone(Discord_LobbyHandle* self,
+                                           Discord_LobbyHandle const* other);
+bool DISCORD_API Discord_LobbyHandle_GetCallInfoHandle(Discord_LobbyHandle* self,
+                                                       Discord_CallInfoHandle* returnValue);
+bool DISCORD_API Discord_LobbyHandle_GetLobbyMemberHandle(Discord_LobbyHandle* self,
+                                                          uint64_t memberId,
+                                                          Discord_LobbyMemberHandle* returnValue);
+uint64_t DISCORD_API Discord_LobbyHandle_Id(Discord_LobbyHandle* self);
+bool DISCORD_API Discord_LobbyHandle_LinkedChannel(Discord_LobbyHandle* self,
+                                                   Discord_LinkedChannel* returnValue);
+void DISCORD_API Discord_LobbyHandle_LobbyMemberIds(Discord_LobbyHandle* self,
+                                                    Discord_UInt64Span* returnValue);
+void DISCORD_API Discord_LobbyHandle_LobbyMembers(Discord_LobbyHandle* self,
+                                                  Discord_LobbyMemberHandleSpan* returnValue);
+void DISCORD_API Discord_LobbyHandle_Metadata(Discord_LobbyHandle* self,
+                                              Discord_Properties* returnValue);
+struct Discord_AdditionalContent {
+    void* opaque;
+};
+
+void DISCORD_API Discord_AdditionalContent_Init(Discord_AdditionalContent* self);
+void DISCORD_API Discord_AdditionalContent_Drop(Discord_AdditionalContent* self);
+void DISCORD_API Discord_AdditionalContent_Clone(Discord_AdditionalContent* self,
+                                                 Discord_AdditionalContent const* arg0);
+bool DISCORD_API Discord_AdditionalContent_Equals(Discord_AdditionalContent* self,
+                                                  Discord_AdditionalContent const* rhs);
+void DISCORD_API Discord_AdditionalContent_TypeToString(Discord_AdditionalContentType type,
+                                                        Discord_String* returnValue);
+void DISCORD_API Discord_AdditionalContent_SetType(Discord_AdditionalContent* self,
+                                                   Discord_AdditionalContentType value);
+Discord_AdditionalContentType DISCORD_API
+Discord_AdditionalContent_Type(Discord_AdditionalContent* self);
+void DISCORD_API Discord_AdditionalContent_SetTitle(Discord_AdditionalContent* self,
+                                                    Discord_String* value);
+bool DISCORD_API Discord_AdditionalContent_Title(Discord_AdditionalContent* self,
+                                                 Discord_String* returnValue);
+void DISCORD_API Discord_AdditionalContent_SetCount(Discord_AdditionalContent* self, uint8_t value);
+uint8_t DISCORD_API Discord_AdditionalContent_Count(Discord_AdditionalContent* self);
+struct Discord_MessageHandle {
+    void* opaque;
+};
+
+void DISCORD_API Discord_MessageHandle_Drop(Discord_MessageHandle* self);
+void DISCORD_API Discord_MessageHandle_Clone(Discord_MessageHandle* self,
+                                             Discord_MessageHandle const* other);
+bool DISCORD_API Discord_MessageHandle_AdditionalContent(Discord_MessageHandle* self,
+                                                         Discord_AdditionalContent* returnValue);
+bool DISCORD_API Discord_MessageHandle_AdditionalName(Discord_MessageHandle* self,
+                                                      Discord_String* returnValue);
+bool DISCORD_API Discord_MessageHandle_ApplicationId(Discord_MessageHandle* self,
+                                                     uint64_t* returnValue);
+bool DISCORD_API Discord_MessageHandle_Author(Discord_MessageHandle* self,
+                                              Discord_UserHandle* returnValue);
+uint64_t DISCORD_API Discord_MessageHandle_AuthorId(Discord_MessageHandle* self);
+bool DISCORD_API Discord_MessageHandle_Channel(Discord_MessageHandle* self,
+                                               Discord_ChannelHandle* returnValue);
+uint64_t DISCORD_API Discord_MessageHandle_ChannelId(Discord_MessageHandle* self);
+void DISCORD_API Discord_MessageHandle_Content(Discord_MessageHandle* self,
+                                               Discord_String* returnValue);
+bool DISCORD_API Discord_MessageHandle_DisclosureType(Discord_MessageHandle* self,
+                                                      Discord_DisclosureTypes* returnValue);
+uint64_t DISCORD_API Discord_MessageHandle_EditedTimestamp(Discord_MessageHandle* self);
+uint64_t DISCORD_API Discord_MessageHandle_Id(Discord_MessageHandle* self);
+bool DISCORD_API Discord_MessageHandle_Lobby(Discord_MessageHandle* self,
+                                             Discord_LobbyHandle* returnValue);
+void DISCORD_API Discord_MessageHandle_Metadata(Discord_MessageHandle* self,
+                                                Discord_Properties* returnValue);
+void DISCORD_API Discord_MessageHandle_ModerationMetadata(Discord_MessageHandle* self,
+                                                          Discord_Properties* returnValue);
+void DISCORD_API Discord_MessageHandle_RawContent(Discord_MessageHandle* self,
+                                                  Discord_String* returnValue);
+bool DISCORD_API Discord_MessageHandle_Recipient(Discord_MessageHandle* self,
+                                                 Discord_UserHandle* returnValue);
+uint64_t DISCORD_API Discord_MessageHandle_RecipientId(Discord_MessageHandle* self);
+bool DISCORD_API Discord_MessageHandle_SentFromGame(Discord_MessageHandle* self);
+uint64_t DISCORD_API Discord_MessageHandle_SentTimestamp(Discord_MessageHandle* self);
+struct Discord_AudioDevice {
+    void* opaque;
+};
+
+void DISCORD_API Discord_AudioDevice_Drop(Discord_AudioDevice* self);
+void DISCORD_API Discord_AudioDevice_Clone(Discord_AudioDevice* self,
+                                           Discord_AudioDevice const* arg0);
+bool DISCORD_API Discord_AudioDevice_Equals(Discord_AudioDevice* self,
+                                            Discord_AudioDevice const* rhs);
+void DISCORD_API Discord_AudioDevice_SetId(Discord_AudioDevice* self, Discord_String value);
+void DISCORD_API Discord_AudioDevice_Id(Discord_AudioDevice* self, Discord_String* returnValue);
+void DISCORD_API Discord_AudioDevice_SetName(Discord_AudioDevice* self, Discord_String value);
+void DISCORD_API Discord_AudioDevice_Name(Discord_AudioDevice* self, Discord_String* returnValue);
+void DISCORD_API Discord_AudioDevice_SetIsDefault(Discord_AudioDevice* self, bool value);
+bool DISCORD_API Discord_AudioDevice_IsDefault(Discord_AudioDevice* self);
+struct Discord_VoiceSettings {
+    void* opaque;
+};
+
+void DISCORD_API Discord_VoiceSettings_Drop(Discord_VoiceSettings* self);
+void DISCORD_API Discord_VoiceSettings_Clone(Discord_VoiceSettings* self,
+                                             Discord_VoiceSettings const* arg0);
+void DISCORD_API Discord_VoiceSettings_SetSelfMute(Discord_VoiceSettings* self, bool value);
+bool DISCORD_API Discord_VoiceSettings_SelfMute(Discord_VoiceSettings* self);
+void DISCORD_API Discord_VoiceSettings_SetSelfDeaf(Discord_VoiceSettings* self, bool value);
+bool DISCORD_API Discord_VoiceSettings_SelfDeaf(Discord_VoiceSettings* self);
+void DISCORD_API Discord_VoiceSettings_SetInputMode(Discord_VoiceSettings* self,
+                                                    Discord_VoiceInputModeType value);
+Discord_VoiceInputModeType DISCORD_API Discord_VoiceSettings_InputMode(Discord_VoiceSettings* self);
+void DISCORD_API Discord_VoiceSettings_SetPttKey(Discord_VoiceSettings* self, Discord_String value);
+void DISCORD_API Discord_VoiceSettings_PttKey(Discord_VoiceSettings* self,
+                                              Discord_String* returnValue);
+void DISCORD_API Discord_VoiceSettings_SetInputVolume(Discord_VoiceSettings* self, float value);
+float DISCORD_API Discord_VoiceSettings_InputVolume(Discord_VoiceSettings* self);
+void DISCORD_API Discord_VoiceSettings_SetOutputVolume(Discord_VoiceSettings* self, float value);
+float DISCORD_API Discord_VoiceSettings_OutputVolume(Discord_VoiceSettings* self);
+void DISCORD_API Discord_VoiceSettings_SetAutomaticGainControl(Discord_VoiceSettings* self,
+                                                               bool value);
+bool DISCORD_API Discord_VoiceSettings_AutomaticGainControl(Discord_VoiceSettings* self);
+void DISCORD_API Discord_VoiceSettings_SetEchoCancellation(Discord_VoiceSettings* self, bool value);
+bool DISCORD_API Discord_VoiceSettings_EchoCancellation(Discord_VoiceSettings* self);
+void DISCORD_API Discord_VoiceSettings_SetNoiseSuppression(Discord_VoiceSettings* self, bool value);
+bool DISCORD_API Discord_VoiceSettings_NoiseSuppression(Discord_VoiceSettings* self);
+void DISCORD_API Discord_VoiceSettings_SetNoiseCancellation(Discord_VoiceSettings* self,
+                                                            bool value);
+bool DISCORD_API Discord_VoiceSettings_NoiseCancellation(Discord_VoiceSettings* self);
+struct Discord_UserMessageSummary {
+    void* opaque;
+};
+
+void DISCORD_API Discord_UserMessageSummary_Drop(Discord_UserMessageSummary* self);
+void DISCORD_API Discord_UserMessageSummary_Clone(Discord_UserMessageSummary* self,
+                                                  Discord_UserMessageSummary const* arg0);
+uint64_t DISCORD_API Discord_UserMessageSummary_LastMessageId(Discord_UserMessageSummary* self);
+uint64_t DISCORD_API Discord_UserMessageSummary_UserId(Discord_UserMessageSummary* self);
+struct Discord_ClientCreateOptions {
+    void* opaque;
+};
+
+void DISCORD_API Discord_ClientCreateOptions_Init(Discord_ClientCreateOptions* self);
+void DISCORD_API Discord_ClientCreateOptions_Drop(Discord_ClientCreateOptions* self);
+void DISCORD_API Discord_ClientCreateOptions_Clone(Discord_ClientCreateOptions* self,
+                                                   Discord_ClientCreateOptions const* arg0);
+void DISCORD_API Discord_ClientCreateOptions_SetWebBase(Discord_ClientCreateOptions* self,
+                                                        Discord_String value);
+void DISCORD_API Discord_ClientCreateOptions_WebBase(Discord_ClientCreateOptions* self,
+                                                     Discord_String* returnValue);
+void DISCORD_API Discord_ClientCreateOptions_SetApiBase(Discord_ClientCreateOptions* self,
+                                                        Discord_String value);
+void DISCORD_API Discord_ClientCreateOptions_ApiBase(Discord_ClientCreateOptions* self,
+                                                     Discord_String* returnValue);
+void DISCORD_API
+Discord_ClientCreateOptions_SetExperimentalAudioSystem(Discord_ClientCreateOptions* self,
+                                                       Discord_AudioSystem value);
+Discord_AudioSystem DISCORD_API
+Discord_ClientCreateOptions_ExperimentalAudioSystem(Discord_ClientCreateOptions* self);
+void DISCORD_API Discord_ClientCreateOptions_SetExperimentalAndroidPreventCommsForBluetooth(
+  Discord_ClientCreateOptions* self,
+  bool value);
+bool DISCORD_API Discord_ClientCreateOptions_ExperimentalAndroidPreventCommsForBluetooth(
+  Discord_ClientCreateOptions* self);
+void DISCORD_API Discord_ClientCreateOptions_SetCpuAffinityMask(Discord_ClientCreateOptions* self,
+                                                                uint64_t* value);
+bool DISCORD_API Discord_ClientCreateOptions_CpuAffinityMask(Discord_ClientCreateOptions* self,
+                                                             uint64_t* returnValue);
+struct Discord_Client {
+    void* opaque;
+};
+
+void DISCORD_API Discord_Client_Init(Discord_Client* self);
+void DISCORD_API Discord_Client_InitWithBases(Discord_Client* self,
+                                              Discord_String apiBase,
+                                              Discord_String webBase);
+void DISCORD_API Discord_Client_InitWithOptions(Discord_Client* self,
+                                                Discord_ClientCreateOptions* options);
+void DISCORD_API Discord_Client_Drop(Discord_Client* self);
+void DISCORD_API Discord_Client_ErrorToString(Discord_Client_Error type,
+                                              Discord_String* returnValue);
+uint64_t DISCORD_API Discord_Client_GetApplicationId(Discord_Client* self);
+void DISCORD_API Discord_Client_GetCurrentUser(Discord_Client* self,
+                                               Discord_UserHandle* returnValue);
+void DISCORD_API Discord_Client_GetDefaultAudioDeviceId(Discord_String* returnValue);
+void DISCORD_API Discord_Client_GetDefaultCommunicationScopes(Discord_String* returnValue);
+void DISCORD_API Discord_Client_GetDefaultPresenceScopes(Discord_String* returnValue);
+void DISCORD_API Discord_Client_GetVersionHash(Discord_String* returnValue);
+int32_t DISCORD_API Discord_Client_GetVersionMajor();
+int32_t DISCORD_API Discord_Client_GetVersionMinor();
+int32_t DISCORD_API Discord_Client_GetVersionPatch();
+void DISCORD_API Discord_Client_SetHttpRequestTimeout(Discord_Client* self,
+                                                      int32_t httpTimeoutInMilliseconds);
+void DISCORD_API Discord_Client_StatusToString(Discord_Client_Status type,
+                                               Discord_String* returnValue);
+void DISCORD_API Discord_Client_ThreadToString(Discord_Client_Thread type,
+                                               Discord_String* returnValue);
+void DISCORD_API Discord_Client_EndCall(Discord_Client* self,
+                                        uint64_t channelId,
+                                        Discord_Client_EndCallCallback callback,
+                                        Discord_FreeFn callback__userDataFree,
+                                        void* callback__userData);
+void DISCORD_API Discord_Client_EndCalls(Discord_Client* self,
+                                         Discord_Client_EndCallsCallback callback,
+                                         Discord_FreeFn callback__userDataFree,
+                                         void* callback__userData);
+bool DISCORD_API Discord_Client_GetCall(Discord_Client* self,
+                                        uint64_t channelId,
+                                        Discord_Call* returnValue);
+void DISCORD_API Discord_Client_GetCalls(Discord_Client* self, Discord_CallSpan* returnValue);
+void DISCORD_API
+Discord_Client_GetCurrentInputDevice(Discord_Client* self,
+                                     Discord_Client_GetCurrentInputDeviceCallback cb,
+                                     Discord_FreeFn cb__userDataFree,
+                                     void* cb__userData);
+void DISCORD_API
+Discord_Client_GetCurrentOutputDevice(Discord_Client* self,
+                                      Discord_Client_GetCurrentOutputDeviceCallback cb,
+                                      Discord_FreeFn cb__userDataFree,
+                                      void* cb__userData);
+void DISCORD_API Discord_Client_GetInputDevices(Discord_Client* self,
+                                                Discord_Client_GetInputDevicesCallback cb,
+                                                Discord_FreeFn cb__userDataFree,
+                                                void* cb__userData);
+float DISCORD_API Discord_Client_GetInputVolume(Discord_Client* self);
+void DISCORD_API Discord_Client_GetOutputDevices(Discord_Client* self,
+                                                 Discord_Client_GetOutputDevicesCallback cb,
+                                                 Discord_FreeFn cb__userDataFree,
+                                                 void* cb__userData);
+float DISCORD_API Discord_Client_GetOutputVolume(Discord_Client* self);
+bool DISCORD_API Discord_Client_GetSelfDeafAll(Discord_Client* self);
+bool DISCORD_API Discord_Client_GetSelfMuteAll(Discord_Client* self);
+void DISCORD_API Discord_Client_GetVoiceSettings(Discord_Client* self,
+                                                 Discord_Client_GetVoiceSettingsCallback cb,
+                                                 Discord_FreeFn cb__userDataFree,
+                                                 void* cb__userData);
+void DISCORD_API Discord_Client_SetAecDump(Discord_Client* self, bool on);
+void DISCORD_API Discord_Client_SetAutomaticGainControl(Discord_Client* self, bool on);
+void DISCORD_API
+Discord_Client_SetDeviceChangeCallback(Discord_Client* self,
+                                       Discord_Client_DeviceChangeCallback callback,
+                                       Discord_FreeFn callback__userDataFree,
+                                       void* callback__userData);
+void DISCORD_API Discord_Client_SetEchoCancellation(Discord_Client* self, bool on);
+void DISCORD_API Discord_Client_SetEngineManagedAudioSession(Discord_Client* self,
+                                                             bool isEngineManaged);
+void DISCORD_API Discord_Client_SetInputDevice(Discord_Client* self,
+                                               Discord_String deviceId,
+                                               Discord_Client_SetInputDeviceCallback cb,
+                                               Discord_FreeFn cb__userDataFree,
+                                               void* cb__userData);
+void DISCORD_API Discord_Client_SetInputVolume(Discord_Client* self, float inputVolume);
+void DISCORD_API
+Discord_Client_SetNoAudioInputCallback(Discord_Client* self,
+                                       Discord_Client_NoAudioInputCallback callback,
+                                       Discord_FreeFn callback__userDataFree,
+                                       void* callback__userData);
+void DISCORD_API Discord_Client_SetNoAudioInputThreshold(Discord_Client* self, float dBFSThreshold);
+void DISCORD_API Discord_Client_SetNoiseCancellation(Discord_Client* self, bool on);
+void DISCORD_API Discord_Client_SetNoiseSuppression(Discord_Client* self, bool on);
+void DISCORD_API Discord_Client_SetOpusHardwareCoding(Discord_Client* self,
+                                                      bool encode,
+                                                      bool decode);
+void DISCORD_API Discord_Client_SetOutputDevice(Discord_Client* self,
+                                                Discord_String deviceId,
+                                                Discord_Client_SetOutputDeviceCallback cb,
+                                                Discord_FreeFn cb__userDataFree,
+                                                void* cb__userData);
+void DISCORD_API Discord_Client_SetOutputVolume(Discord_Client* self, float outputVolume);
+void DISCORD_API Discord_Client_SetSelfDeafAll(Discord_Client* self, bool deaf);
+void DISCORD_API Discord_Client_SetSelfMuteAll(Discord_Client* self, bool mute);
+bool DISCORD_API Discord_Client_SetSpeakerMode(Discord_Client* self, bool speakerMode);
+void DISCORD_API Discord_Client_SetThreadPriority(Discord_Client* self,
+                                                  Discord_Client_Thread thread,
+                                                  int32_t priority);
+void DISCORD_API
+Discord_Client_SetVoiceParticipantChangedCallback(Discord_Client* self,
+                                                  Discord_Client_VoiceParticipantChangedCallback cb,
+                                                  Discord_FreeFn cb__userDataFree,
+                                                  void* cb__userData);
+void DISCORD_API
+Discord_Client_SetVoiceSettingsUpdatedCallback(Discord_Client* self,
+                                               Discord_Client_VoiceSettingsUpdatedCallback callback,
+                                               Discord_FreeFn callback__userDataFree,
+                                               void* callback__userData);
+bool DISCORD_API Discord_Client_ShowAudioRoutePicker(Discord_Client* self);
+bool DISCORD_API Discord_Client_StartCall(Discord_Client* self,
+                                          uint64_t channelId,
+                                          Discord_Call* returnValue);
+bool DISCORD_API
+Discord_Client_StartCallWithAudioCallbacks(Discord_Client* self,
+                                           uint64_t lobbyId,
+                                           Discord_Client_UserAudioReceivedCallback receivedCb,
+                                           Discord_FreeFn receivedCb__userDataFree,
+                                           void* receivedCb__userData,
+                                           Discord_Client_UserAudioCapturedCallback capturedCb,
+                                           Discord_FreeFn capturedCb__userDataFree,
+                                           void* capturedCb__userData,
+                                           Discord_Call* returnValue);
+void DISCORD_API Discord_Client_AbortAuthorize(Discord_Client* self);
+void DISCORD_API Discord_Client_AbortGetTokenFromDevice(Discord_Client* self);
+void DISCORD_API Discord_Client_Authorize(Discord_Client* self,
+                                          Discord_AuthorizationArgs* args,
+                                          Discord_Client_AuthorizationCallback callback,
+                                          Discord_FreeFn callback__userDataFree,
+                                          void* callback__userData);
+void DISCORD_API Discord_Client_CloseAuthorizeDeviceScreen(Discord_Client* self);
+void DISCORD_API
+Discord_Client_CreateAuthorizationCodeVerifier(Discord_Client* self,
+                                               Discord_AuthorizationCodeVerifier* returnValue);
+void DISCORD_API
+Discord_Client_ExchangeChildToken(Discord_Client* self,
+                                  Discord_String parentApplicationToken,
+                                  uint64_t childApplicationId,
+                                  Discord_Client_ExchangeChildTokenCallback callback,
+                                  Discord_FreeFn callback__userDataFree,
+                                  void* callback__userData);
+void DISCORD_API Discord_Client_FetchCurrentUser(Discord_Client* self,
+                                                 Discord_AuthorizationTokenType tokenType,
+                                                 Discord_String token,
+                                                 Discord_Client_FetchCurrentUserCallback callback,
+                                                 Discord_FreeFn callback__userDataFree,
+                                                 void* callback__userData);
+void DISCORD_API
+Discord_Client_GetProvisionalToken(Discord_Client* self,
+                                   uint64_t applicationId,
+                                   Discord_AuthenticationExternalAuthType externalAuthType,
+                                   Discord_String externalAuthToken,
+                                   Discord_Client_TokenExchangeCallback callback,
+                                   Discord_FreeFn callback__userDataFree,
+                                   void* callback__userData);
+void DISCORD_API Discord_Client_GetToken(Discord_Client* self,
+                                         uint64_t applicationId,
+                                         Discord_String code,
+                                         Discord_String codeVerifier,
+                                         Discord_String redirectUri,
+                                         Discord_Client_TokenExchangeCallback callback,
+                                         Discord_FreeFn callback__userDataFree,
+                                         void* callback__userData);
+void DISCORD_API Discord_Client_GetTokenFromDevice(Discord_Client* self,
+                                                   Discord_DeviceAuthorizationArgs* args,
+                                                   Discord_Client_TokenExchangeCallback callback,
+                                                   Discord_FreeFn callback__userDataFree,
+                                                   void* callback__userData);
+void DISCORD_API Discord_Client_GetTokenFromDeviceProvisionalMerge(
+  Discord_Client* self,
+  Discord_DeviceAuthorizationArgs* args,
+  Discord_AuthenticationExternalAuthType externalAuthType,
+  Discord_String externalAuthToken,
+  Discord_Client_TokenExchangeCallback callback,
+  Discord_FreeFn callback__userDataFree,
+  void* callback__userData);
+void DISCORD_API
+Discord_Client_GetTokenFromProvisionalMerge(Discord_Client* self,
+                                            uint64_t applicationId,
+                                            Discord_String code,
+                                            Discord_String codeVerifier,
+                                            Discord_String redirectUri,
+                                            Discord_AuthenticationExternalAuthType externalAuthType,
+                                            Discord_String externalAuthToken,
+                                            Discord_Client_TokenExchangeCallback callback,
+                                            Discord_FreeFn callback__userDataFree,
+                                            void* callback__userData);
+bool DISCORD_API Discord_Client_IsAuthenticated(Discord_Client* self);
+void DISCORD_API Discord_Client_OpenAuthorizeDeviceScreen(Discord_Client* self,
+                                                          uint64_t clientId,
+                                                          Discord_String userCode);
+void DISCORD_API Discord_Client_ProvisionalUserMergeCompleted(Discord_Client* self, bool success);
+void DISCORD_API Discord_Client_RefreshToken(Discord_Client* self,
+                                             uint64_t applicationId,
+                                             Discord_String refreshToken,
+                                             Discord_Client_TokenExchangeCallback callback,
+                                             Discord_FreeFn callback__userDataFree,
+                                             void* callback__userData);
+void DISCORD_API
+Discord_Client_RegisterAuthorizeRequestCallback(Discord_Client* self,
+                                                Discord_Client_AuthorizeRequestCallback callback,
+                                                Discord_FreeFn callback__userDataFree,
+                                                void* callback__userData);
+void DISCORD_API Discord_Client_RemoveAuthorizeRequestCallback(Discord_Client* self);
+void DISCORD_API Discord_Client_RevokeToken(Discord_Client* self,
+                                            uint64_t applicationId,
+                                            Discord_String token,
+                                            Discord_Client_RevokeTokenCallback callback,
+                                            Discord_FreeFn callback__userDataFree,
+                                            void* callback__userData);
+void DISCORD_API Discord_Client_SetAuthorizeDeviceScreenClosedCallback(
+  Discord_Client* self,
+  Discord_Client_AuthorizeDeviceScreenClosedCallback cb,
+  Discord_FreeFn cb__userDataFree,
+  void* cb__userData);
+void DISCORD_API Discord_Client_SetGameWindowPid(Discord_Client* self, int32_t pid);
+void DISCORD_API
+Discord_Client_SetTokenExpirationCallback(Discord_Client* self,
+                                          Discord_Client_TokenExpirationCallback callback,
+                                          Discord_FreeFn callback__userDataFree,
+                                          void* callback__userData);
+void DISCORD_API Discord_Client_UnmergeIntoProvisionalAccount(
+  Discord_Client* self,
+  uint64_t applicationId,
+  Discord_AuthenticationExternalAuthType externalAuthType,
+  Discord_String externalAuthToken,
+  Discord_Client_UnmergeIntoProvisionalAccountCallback callback,
+  Discord_FreeFn callback__userDataFree,
+  void* callback__userData);
+void DISCORD_API Discord_Client_UpdateProvisionalAccountDisplayName(
+  Discord_Client* self,
+  Discord_String name,
+  Discord_Client_UpdateProvisionalAccountDisplayNameCallback callback,
+  Discord_FreeFn callback__userDataFree,
+  void* callback__userData);
+void DISCORD_API Discord_Client_UpdateToken(Discord_Client* self,
+                                            Discord_AuthorizationTokenType tokenType,
+                                            Discord_String token,
+                                            Discord_Client_UpdateTokenCallback callback,
+                                            Discord_FreeFn callback__userDataFree,
+                                            void* callback__userData);
+bool DISCORD_API Discord_Client_CanOpenMessageInDiscord(Discord_Client* self, uint64_t messageId);
+void DISCORD_API Discord_Client_DeleteUserMessage(Discord_Client* self,
+                                                  uint64_t recipientId,
+                                                  uint64_t messageId,
+                                                  Discord_Client_DeleteUserMessageCallback cb,
+                                                  Discord_FreeFn cb__userDataFree,
+                                                  void* cb__userData);
+void DISCORD_API Discord_Client_EditUserMessage(Discord_Client* self,
+                                                uint64_t recipientId,
+                                                uint64_t messageId,
+                                                Discord_String content,
+                                                Discord_Client_EditUserMessageCallback cb,
+                                                Discord_FreeFn cb__userDataFree,
+                                                void* cb__userData);
+bool DISCORD_API Discord_Client_GetChannelHandle(Discord_Client* self,
+                                                 uint64_t channelId,
+                                                 Discord_ChannelHandle* returnValue);
+void DISCORD_API
+Discord_Client_GetLobbyMessagesWithLimit(Discord_Client* self,
+                                         uint64_t lobbyId,
+                                         int32_t limit,
+                                         Discord_Client_GetLobbyMessagesCallback cb,
+                                         Discord_FreeFn cb__userDataFree,
+                                         void* cb__userData);
+bool DISCORD_API Discord_Client_GetMessageHandle(Discord_Client* self,
+                                                 uint64_t messageId,
+                                                 Discord_MessageHandle* returnValue);
+void DISCORD_API
+Discord_Client_GetUserMessageSummaries(Discord_Client* self,
+                                       Discord_Client_UserMessageSummariesCallback cb,
+                                       Discord_FreeFn cb__userDataFree,
+                                       void* cb__userData);
+void DISCORD_API
+Discord_Client_GetUserMessagesWithLimit(Discord_Client* self,
+                                        uint64_t recipientId,
+                                        int32_t limit,
+                                        Discord_Client_UserMessagesWithLimitCallback cb,
+                                        Discord_FreeFn cb__userDataFree,
+                                        void* cb__userData);
+void DISCORD_API Discord_Client_OpenMessageInDiscord(
+  Discord_Client* self,
+  uint64_t messageId,
+  Discord_Client_ProvisionalUserMergeRequiredCallback provisionalUserMergeRequiredCallback,
+  Discord_FreeFn provisionalUserMergeRequiredCallback__userDataFree,
+  void* provisionalUserMergeRequiredCallback__userData,
+  Discord_Client_OpenMessageInDiscordCallback callback,
+  Discord_FreeFn callback__userDataFree,
+  void* callback__userData);
+void DISCORD_API Discord_Client_SendLobbyMessage(Discord_Client* self,
+                                                 uint64_t lobbyId,
+                                                 Discord_String content,
+                                                 Discord_Client_SendUserMessageCallback cb,
+                                                 Discord_FreeFn cb__userDataFree,
+                                                 void* cb__userData);
+void DISCORD_API
+Discord_Client_SendLobbyMessageWithMetadata(Discord_Client* self,
+                                            uint64_t lobbyId,
+                                            Discord_String content,
+                                            Discord_Properties metadata,
+                                            Discord_Client_SendUserMessageCallback cb,
+                                            Discord_FreeFn cb__userDataFree,
+                                            void* cb__userData);
+void DISCORD_API Discord_Client_SendUserMessage(Discord_Client* self,
+                                                uint64_t recipientId,
+                                                Discord_String content,
+                                                Discord_Client_SendUserMessageCallback cb,
+                                                Discord_FreeFn cb__userDataFree,
+                                                void* cb__userData);
+void DISCORD_API
+Discord_Client_SendUserMessageWithMetadata(Discord_Client* self,
+                                           uint64_t recipientId,
+                                           Discord_String content,
+                                           Discord_Properties metadata,
+                                           Discord_Client_SendUserMessageCallback cb,
+                                           Discord_FreeFn cb__userDataFree,
+                                           void* cb__userData);
+void DISCORD_API Discord_Client_SetMessageCreatedCallback(Discord_Client* self,
+                                                          Discord_Client_MessageCreatedCallback cb,
+                                                          Discord_FreeFn cb__userDataFree,
+                                                          void* cb__userData);
+void DISCORD_API Discord_Client_SetMessageDeletedCallback(Discord_Client* self,
+                                                          Discord_Client_MessageDeletedCallback cb,
+                                                          Discord_FreeFn cb__userDataFree,
+                                                          void* cb__userData);
+void DISCORD_API Discord_Client_SetMessageUpdatedCallback(Discord_Client* self,
+                                                          Discord_Client_MessageUpdatedCallback cb,
+                                                          Discord_FreeFn cb__userDataFree,
+                                                          void* cb__userData);
+void DISCORD_API Discord_Client_SetShowingChat(Discord_Client* self, bool showingChat);
+void DISCORD_API Discord_Client_AddLogCallback(Discord_Client* self,
+                                               Discord_Client_LogCallback callback,
+                                               Discord_FreeFn callback__userDataFree,
+                                               void* callback__userData,
+                                               Discord_LoggingSeverity minSeverity);
+void DISCORD_API Discord_Client_AddVoiceLogCallback(Discord_Client* self,
+                                                    Discord_Client_LogCallback callback,
+                                                    Discord_FreeFn callback__userDataFree,
+                                                    void* callback__userData,
+                                                    Discord_LoggingSeverity minSeverity);
+void DISCORD_API Discord_Client_Connect(Discord_Client* self);
+void DISCORD_API Discord_Client_Disconnect(Discord_Client* self);
+Discord_Client_Status DISCORD_API Discord_Client_GetStatus(Discord_Client* self);
+void DISCORD_API Discord_Client_OpenConnectedGamesSettingsInDiscord(
+  Discord_Client* self,
+  Discord_Client_OpenConnectedGamesSettingsInDiscordCallback callback,
+  Discord_FreeFn callback__userDataFree,
+  void* callback__userData);
+void DISCORD_API Discord_Client_SetApplicationId(Discord_Client* self, uint64_t applicationId);
+bool DISCORD_API Discord_Client_SetLogDir(Discord_Client* self,
+                                          Discord_String path,
+                                          Discord_LoggingSeverity minSeverity);
+void DISCORD_API Discord_Client_SetStatusChangedCallback(Discord_Client* self,
+                                                         Discord_Client_OnStatusChanged cb,
+                                                         Discord_FreeFn cb__userDataFree,
+                                                         void* cb__userData);
+void DISCORD_API Discord_Client_SetVoiceLogDir(Discord_Client* self,
+                                               Discord_String path,
+                                               Discord_LoggingSeverity minSeverity);
+void DISCORD_API Discord_Client_CreateOrJoinLobby(Discord_Client* self,
+                                                  Discord_String secret,
+                                                  Discord_Client_CreateOrJoinLobbyCallback callback,
+                                                  Discord_FreeFn callback__userDataFree,
+                                                  void* callback__userData);
+void DISCORD_API
+Discord_Client_CreateOrJoinLobbyWithMetadata(Discord_Client* self,
+                                             Discord_String secret,
+                                             Discord_Properties lobbyMetadata,
+                                             Discord_Properties memberMetadata,
+                                             Discord_Client_CreateOrJoinLobbyCallback callback,
+                                             Discord_FreeFn callback__userDataFree,
+                                             void* callback__userData);
+void DISCORD_API Discord_Client_GetGuildChannels(Discord_Client* self,
+                                                 uint64_t guildId,
+                                                 Discord_Client_GetGuildChannelsCallback cb,
+                                                 Discord_FreeFn cb__userDataFree,
+                                                 void* cb__userData);
+bool DISCORD_API Discord_Client_GetLobbyHandle(Discord_Client* self,
+                                               uint64_t lobbyId,
+                                               Discord_LobbyHandle* returnValue);
+void DISCORD_API Discord_Client_GetLobbyIds(Discord_Client* self, Discord_UInt64Span* returnValue);
+void DISCORD_API Discord_Client_GetUserGuilds(Discord_Client* self,
+                                              Discord_Client_GetUserGuildsCallback cb,
+                                              Discord_FreeFn cb__userDataFree,
+                                              void* cb__userData);
+void DISCORD_API Discord_Client_JoinLinkedLobbyGuild(
+  Discord_Client* self,
+  uint64_t lobbyId,
+  Discord_Client_ProvisionalUserMergeRequiredCallback provisionalUserMergeRequiredCallback,
+  Discord_FreeFn provisionalUserMergeRequiredCallback__userDataFree,
+  void* provisionalUserMergeRequiredCallback__userData,
+  Discord_Client_JoinLinkedLobbyGuildCallback callback,
+  Discord_FreeFn callback__userDataFree,
+  void* callback__userData);
+void DISCORD_API Discord_Client_LeaveLobby(Discord_Client* self,
+                                           uint64_t lobbyId,
+                                           Discord_Client_LeaveLobbyCallback callback,
+                                           Discord_FreeFn callback__userDataFree,
+                                           void* callback__userData);
+void DISCORD_API
+Discord_Client_LinkChannelToLobby(Discord_Client* self,
+                                  uint64_t lobbyId,
+                                  uint64_t channelId,
+                                  Discord_Client_LinkOrUnlinkChannelCallback callback,
+                                  Discord_FreeFn callback__userDataFree,
+                                  void* callback__userData);
+void DISCORD_API Discord_Client_SetLobbyCreatedCallback(Discord_Client* self,
+                                                        Discord_Client_LobbyCreatedCallback cb,
+                                                        Discord_FreeFn cb__userDataFree,
+                                                        void* cb__userData);
+void DISCORD_API Discord_Client_SetLobbyDeletedCallback(Discord_Client* self,
+                                                        Discord_Client_LobbyDeletedCallback cb,
+                                                        Discord_FreeFn cb__userDataFree,
+                                                        void* cb__userData);
+void DISCORD_API
+Discord_Client_SetLobbyMemberAddedCallback(Discord_Client* self,
+                                           Discord_Client_LobbyMemberAddedCallback cb,
+                                           Discord_FreeFn cb__userDataFree,
+                                           void* cb__userData);
+void DISCORD_API
+Discord_Client_SetLobbyMemberRemovedCallback(Discord_Client* self,
+                                             Discord_Client_LobbyMemberRemovedCallback cb,
+                                             Discord_FreeFn cb__userDataFree,
+                                             void* cb__userData);
+void DISCORD_API
+Discord_Client_SetLobbyMemberUpdatedCallback(Discord_Client* self,
+                                             Discord_Client_LobbyMemberUpdatedCallback cb,
+                                             Discord_FreeFn cb__userDataFree,
+                                             void* cb__userData);
+void DISCORD_API Discord_Client_SetLobbyUpdatedCallback(Discord_Client* self,
+                                                        Discord_Client_LobbyUpdatedCallback cb,
+                                                        Discord_FreeFn cb__userDataFree,
+                                                        void* cb__userData);
+void DISCORD_API
+Discord_Client_UnlinkChannelFromLobby(Discord_Client* self,
+                                      uint64_t lobbyId,
+                                      Discord_Client_LinkOrUnlinkChannelCallback callback,
+                                      Discord_FreeFn callback__userDataFree,
+                                      void* callback__userData);
+void DISCORD_API
+Discord_Client_IsDiscordAppInstalled(Discord_Client* self,
+                                     Discord_Client_IsDiscordAppInstalledCallback callback,
+                                     Discord_FreeFn callback__userDataFree,
+                                     void* callback__userData);
+void DISCORD_API Discord_Client_AcceptActivityInvite(Discord_Client* self,
+                                                     Discord_ActivityInvite* invite,
+                                                     Discord_Client_AcceptActivityInviteCallback cb,
+                                                     Discord_FreeFn cb__userDataFree,
+                                                     void* cb__userData);
+void DISCORD_API Discord_Client_ClearRichPresence(Discord_Client* self);
+bool DISCORD_API Discord_Client_RegisterLaunchCommand(Discord_Client* self,
+                                                      uint64_t applicationId,
+                                                      Discord_String command);
+bool DISCORD_API Discord_Client_RegisterLaunchSteamApplication(Discord_Client* self,
+                                                               uint64_t applicationId,
+                                                               uint32_t steamAppId);
+void DISCORD_API Discord_Client_SendActivityInvite(Discord_Client* self,
+                                                   uint64_t userId,
+                                                   Discord_String content,
+                                                   Discord_Client_SendActivityInviteCallback cb,
+                                                   Discord_FreeFn cb__userDataFree,
+                                                   void* cb__userData);
+void DISCORD_API
+Discord_Client_SendActivityJoinRequest(Discord_Client* self,
+                                       uint64_t userId,
+                                       Discord_Client_SendActivityInviteCallback cb,
+                                       Discord_FreeFn cb__userDataFree,
+                                       void* cb__userData);
+void DISCORD_API
+Discord_Client_SendActivityJoinRequestReply(Discord_Client* self,
+                                            Discord_ActivityInvite* invite,
+                                            Discord_Client_SendActivityInviteCallback cb,
+                                            Discord_FreeFn cb__userDataFree,
+                                            void* cb__userData);
+void DISCORD_API
+Discord_Client_SetActivityInviteCreatedCallback(Discord_Client* self,
+                                                Discord_Client_ActivityInviteCallback cb,
+                                                Discord_FreeFn cb__userDataFree,
+                                                void* cb__userData);
+void DISCORD_API
+Discord_Client_SetActivityInviteUpdatedCallback(Discord_Client* self,
+                                                Discord_Client_ActivityInviteCallback cb,
+                                                Discord_FreeFn cb__userDataFree,
+                                                void* cb__userData);
+void DISCORD_API Discord_Client_SetActivityJoinCallback(Discord_Client* self,
+                                                        Discord_Client_ActivityJoinCallback cb,
+                                                        Discord_FreeFn cb__userDataFree,
+                                                        void* cb__userData);
+void DISCORD_API Discord_Client_SetActivityJoinWithApplicationCallback(
+  Discord_Client* self,
+  Discord_Client_ActivityJoinWithApplicationCallback cb,
+  Discord_FreeFn cb__userDataFree,
+  void* cb__userData);
+void DISCORD_API Discord_Client_SetOnlineStatus(Discord_Client* self,
+                                                Discord_StatusType status,
+                                                Discord_Client_UpdateStatusCallback callback,
+                                                Discord_FreeFn callback__userDataFree,
+                                                void* callback__userData);
+void DISCORD_API Discord_Client_UpdateRichPresence(Discord_Client* self,
+                                                   Discord_Activity* activity,
+                                                   Discord_Client_UpdateRichPresenceCallback cb,
+                                                   Discord_FreeFn cb__userDataFree,
+                                                   void* cb__userData);
+void DISCORD_API
+Discord_Client_AcceptDiscordFriendRequest(Discord_Client* self,
+                                          uint64_t userId,
+                                          Discord_Client_UpdateRelationshipCallback cb,
+                                          Discord_FreeFn cb__userDataFree,
+                                          void* cb__userData);
+void DISCORD_API
+Discord_Client_AcceptGameFriendRequest(Discord_Client* self,
+                                       uint64_t userId,
+                                       Discord_Client_UpdateRelationshipCallback cb,
+                                       Discord_FreeFn cb__userDataFree,
+                                       void* cb__userData);
+void DISCORD_API Discord_Client_BlockUser(Discord_Client* self,
+                                          uint64_t userId,
+                                          Discord_Client_UpdateRelationshipCallback cb,
+                                          Discord_FreeFn cb__userDataFree,
+                                          void* cb__userData);
+void DISCORD_API
+Discord_Client_CancelDiscordFriendRequest(Discord_Client* self,
+                                          uint64_t userId,
+                                          Discord_Client_UpdateRelationshipCallback cb,
+                                          Discord_FreeFn cb__userDataFree,
+                                          void* cb__userData);
+void DISCORD_API
+Discord_Client_CancelGameFriendRequest(Discord_Client* self,
+                                       uint64_t userId,
+                                       Discord_Client_UpdateRelationshipCallback cb,
+                                       Discord_FreeFn cb__userDataFree,
+                                       void* cb__userData);
+void DISCORD_API Discord_Client_GetRelationshipHandle(Discord_Client* self,
+                                                      uint64_t userId,
+                                                      Discord_RelationshipHandle* returnValue);
+void DISCORD_API Discord_Client_GetRelationships(Discord_Client* self,
+                                                 Discord_RelationshipHandleSpan* returnValue);
+void DISCORD_API
+Discord_Client_GetRelationshipsByGroup(Discord_Client* self,
+                                       Discord_RelationshipGroupType groupType,
+                                       Discord_RelationshipHandleSpan* returnValue);
+void DISCORD_API
+Discord_Client_RejectDiscordFriendRequest(Discord_Client* self,
+                                          uint64_t userId,
+                                          Discord_Client_UpdateRelationshipCallback cb,
+                                          Discord_FreeFn cb__userDataFree,
+                                          void* cb__userData);
+void DISCORD_API
+Discord_Client_RejectGameFriendRequest(Discord_Client* self,
+                                       uint64_t userId,
+                                       Discord_Client_UpdateRelationshipCallback cb,
+                                       Discord_FreeFn cb__userDataFree,
+                                       void* cb__userData);
+void DISCORD_API
+Discord_Client_RemoveDiscordAndGameFriend(Discord_Client* self,
+                                          uint64_t userId,
+                                          Discord_Client_UpdateRelationshipCallback cb,
+                                          Discord_FreeFn cb__userDataFree,
+                                          void* cb__userData);
+void DISCORD_API Discord_Client_RemoveGameFriend(Discord_Client* self,
+                                                 uint64_t userId,
+                                                 Discord_Client_UpdateRelationshipCallback cb,
+                                                 Discord_FreeFn cb__userDataFree,
+                                                 void* cb__userData);
+void DISCORD_API Discord_Client_SearchFriendsByUsername(Discord_Client* self,
+                                                        Discord_String searchStr,
+                                                        Discord_UserHandleSpan* returnValue);
+void DISCORD_API
+Discord_Client_SendDiscordFriendRequest(Discord_Client* self,
+                                        Discord_String username,
+                                        Discord_Client_SendFriendRequestCallback cb,
+                                        Discord_FreeFn cb__userDataFree,
+                                        void* cb__userData);
+void DISCORD_API
+Discord_Client_SendDiscordFriendRequestById(Discord_Client* self,
+                                            uint64_t userId,
+                                            Discord_Client_UpdateRelationshipCallback cb,
+                                            Discord_FreeFn cb__userDataFree,
+                                            void* cb__userData);
+void DISCORD_API Discord_Client_SendGameFriendRequest(Discord_Client* self,
+                                                      Discord_String username,
+                                                      Discord_Client_SendFriendRequestCallback cb,
+                                                      Discord_FreeFn cb__userDataFree,
+                                                      void* cb__userData);
+void DISCORD_API
+Discord_Client_SendGameFriendRequestById(Discord_Client* self,
+                                         uint64_t userId,
+                                         Discord_Client_UpdateRelationshipCallback cb,
+                                         Discord_FreeFn cb__userDataFree,
+                                         void* cb__userData);
+void DISCORD_API
+Discord_Client_SetRelationshipCreatedCallback(Discord_Client* self,
+                                              Discord_Client_RelationshipCreatedCallback cb,
+                                              Discord_FreeFn cb__userDataFree,
+                                              void* cb__userData);
+void DISCORD_API
+Discord_Client_SetRelationshipDeletedCallback(Discord_Client* self,
+                                              Discord_Client_RelationshipDeletedCallback cb,
+                                              Discord_FreeFn cb__userDataFree,
+                                              void* cb__userData);
+void DISCORD_API Discord_Client_UnblockUser(Discord_Client* self,
+                                            uint64_t userId,
+                                            Discord_Client_UpdateRelationshipCallback cb,
+                                            Discord_FreeFn cb__userDataFree,
+                                            void* cb__userData);
+bool DISCORD_API Discord_Client_GetCurrentUserV2(Discord_Client* self,
+                                                 Discord_UserHandle* returnValue);
+void DISCORD_API Discord_Client_GetDiscordClientConnectedUser(
+  Discord_Client* self,
+  uint64_t applicationId,
+  Discord_Client_GetDiscordClientConnectedUserCallback callback,
+  Discord_FreeFn callback__userDataFree,
+  void* callback__userData);
+bool DISCORD_API Discord_Client_GetUser(Discord_Client* self,
+                                        uint64_t userId,
+                                        Discord_UserHandle* returnValue);
+void DISCORD_API Discord_Client_SetRelationshipGroupsUpdatedCallback(
+  Discord_Client* self,
+  Discord_Client_RelationshipGroupsUpdatedCallback cb,
+  Discord_FreeFn cb__userDataFree,
+  void* cb__userData);
+void DISCORD_API Discord_Client_SetUserUpdatedCallback(Discord_Client* self,
+                                                       Discord_Client_UserUpdatedCallback cb,
+                                                       Discord_FreeFn cb__userDataFree,
+                                                       void* cb__userData);
+struct Discord_CallInfoHandle {
+    void* opaque;
+};
+
+void DISCORD_API Discord_CallInfoHandle_Drop(Discord_CallInfoHandle* self);
+void DISCORD_API Discord_CallInfoHandle_Clone(Discord_CallInfoHandle* self,
+                                              Discord_CallInfoHandle const* other);
+uint64_t DISCORD_API Discord_CallInfoHandle_ChannelId(Discord_CallInfoHandle* self);
+void DISCORD_API Discord_CallInfoHandle_GetParticipants(Discord_CallInfoHandle* self,
+                                                        Discord_UInt64Span* returnValue);
+bool DISCORD_API Discord_CallInfoHandle_GetVoiceStateHandle(Discord_CallInfoHandle* self,
+                                                            uint64_t userId,
+                                                            Discord_VoiceStateHandle* returnValue);
+uint64_t DISCORD_API Discord_CallInfoHandle_GuildId(Discord_CallInfoHandle* self);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* DISCORD_HEADER_CDISCORD_H_ */
diff --git a/3rdParty/discord_social_sdk/discordpp.h b/3rdParty/discord_social_sdk/discordpp.h
new file mode 100644
index 0000000000..44b42cf8dc
--- /dev/null
+++ b/3rdParty/discord_social_sdk/discordpp.h
@@ -0,0 +1,12868 @@
+// Generated with <3 by Discord.Sdk.Derive
+#ifndef DISCORD_HEADER_DISCORDPP_H_
+#define DISCORD_HEADER_DISCORDPP_H_
+#include "cdiscord.h"
+#include <atomic>
+#include <cassert>
+#include <cstring>
+#include <functional>
+#include <memory>
+#include <optional>
+#include <string>
+#include <unordered_map>
+#include <vector>
+
+/// The namespace for the generated Discord SDK bindings.
+namespace discordpp {
+
+/// Represents the memory state of a Discord object.
+enum class DiscordObjectState {
+    /// The object has been freed
+    Invalid,
+    /// The object is owned by the C++ wrapper and methods can be called on it
+    Owned,
+};
+
+/// Runs pending callbacks from the Discord SDK.
+///
+/// You should call this function periodically to process callbacks, e.g. once per frame.
+inline void RunCallbacks()
+{
+    Discord_RunCallbacks();
+}
+
+/// \brief ActivityActionTypes represents the type of invite being sent to a user.
+///
+/// There are essentially two types of invites:
+/// 1: A user with an existing activity party can invite another user to join that existing party
+/// 2: A user can request to join the existing activity party of another user
+///
+/// See https://discord.com/developers/docs/rich-presence/overview for more information.
+enum class ActivityActionTypes {
+
+    /// \brief Invalid
+    Invalid = 0,
+
+    /// \brief Join
+    Join = 1,
+
+    /// \brief JoinRequest
+    JoinRequest = 5,
+};
+
+/// \brief Allows your game to control the privacy of the party the user is in.
+enum class ActivityPartyPrivacy {
+
+    /// \brief The party is private (or unknown), which means that the user is in a party but it is
+    /// not
+    /// joinable without sending a request to join the party.
+    ///
+    /// This is the default value. You will also receive this value when receiving other users'
+    /// activities as the party privacy for other users is not exposed.
+    Private = 0,
+
+    /// \brief The party is public, which means that the user is in a party which *could* be
+    /// joinable by
+    /// either friends or mutual voice participants without sending a request to join the party.
+    /// This depends on a user's desired Discord account privacy settings.
+    Public = 1,
+};
+
+/// \brief Discord RichPresence supports multiple types of activities that a user can be doing.
+///
+/// For the SDK, the only activity type that is really relevant is `Playing`.
+/// The others are provided for completeness.
+///
+/// See https://discord.com/developers/docs/rich-presence/overview for more information.
+enum class ActivityTypes {
+
+    /// \brief Playing
+    Playing = 0,
+
+    /// \brief Streaming
+    Streaming = 1,
+
+    /// \brief Listening
+    Listening = 2,
+
+    /// \brief Watching
+    Watching = 3,
+
+    /// \brief CustomStatus
+    CustomStatus = 4,
+
+    /// \brief Competing
+    Competing = 5,
+
+    /// \brief HangStatus
+    HangStatus = 6,
+};
+
+/// \brief Controls which Discord RichPresence field is displayed in the user's status.
+///
+/// See https://discord.com/developers/docs/rich-presence/overview for more information.
+enum class StatusDisplayTypes {
+
+    /// \brief Name
+    Name = 0,
+
+    /// \brief State
+    State = 1,
+
+    /// \brief Details
+    Details = 2,
+};
+
+/// \brief Represents the type of platforms that an activity invite can be accepted on.
+enum class ActivityGamePlatforms {
+
+    /// \brief Desktop
+    Desktop = 1,
+
+    /// \brief Xbox
+    Xbox = 2,
+
+    /// \brief Samsung
+    Samsung = 4,
+
+    /// \brief IOS
+    IOS = 8,
+
+    /// \brief Android
+    Android = 16,
+
+    /// \brief Embedded
+    Embedded = 32,
+
+    /// \brief PS4
+    PS4 = 64,
+
+    /// \brief PS5
+    PS5 = 128,
+};
+
+/// \brief Enum representing various types of errors the SDK returns.
+enum class ErrorType {
+
+    /// \brief No error, the operation was successful.
+    None = 0,
+
+    /// \brief The user is offline or there was some network issue that prevented an underlying
+    /// HTTP call from succeeding.
+    NetworkError = 1,
+
+    /// \brief An HTTP call was made to Discord's servers but a non success HTTP status code was
+    /// returned.
+    /// In some cases this may be retryable, and if so ClientResult::Retryable will be true.
+    /// In most cases though the failure is due to a validation or permissions error, and the
+    /// request is not retryable. ClientResult::Error and ClientResult::ErrorCode will have more
+    /// information.
+    HTTPError = 2,
+
+    /// \brief An operation such as sending a friend request or joining a lobby was attempted but
+    /// the
+    /// Client is not yet ready. Wait for Client::Status to change to Client::Status::Ready before
+    /// trying again.
+    ///
+    /// Also be sure to call Client::Connect to begin the process of connecting to Discord's
+    /// servers, otherwise
+    /// the Client will never become ready.
+    ClientNotReady = 3,
+
+    /// \brief An operation was temporarily disabled for stability reasons.
+    Disabled = 4,
+
+    /// \brief The Client has been destroyed and so this operation cannot complete.
+    ClientDestroyed = 5,
+
+    /// \brief Used when an SDK method is called but the inputs don't pass local validation. For
+    /// example
+    /// if one attempts to accept a friend request when there is no pending friend request for that
+    /// user,
+    /// this ErrorType would be used.
+    ///
+    /// The specific validation error will be included in the `error` field, and no other
+    /// ClientResult fields will be set.
+    ValidationError = 6,
+
+    /// \brief The user or developer aborted an operation, such as an authorization flow.
+    Aborted = 7,
+
+    /// \brief An authorization function failed, but not necessarily as the result of an HTTP call
+    /// that
+    /// returned an error.
+    AuthorizationFailed = 8,
+
+    /// \brief An RPC call was made to Discord's desktop application, but it returned a non-success
+    /// result.
+    /// The error and errorCode fields should both be set with more information.
+    RPCError = 9,
+};
+
+/// \brief Enum that represents the various HTTP status codes that can be returned.
+///
+/// You can read more about these at: https://developer.mozilla.org/en-US/docs/Web/HTTP/Status
+/// For convenience, we have defined a couple of enum values that are non-standard HTTP codes to
+/// represent certain types of errors.
+enum class HttpStatusCode {
+
+    /// \brief None
+    None = 0,
+
+    /// \brief Continue
+    Continue = 100,
+
+    /// \brief SwitchingProtocols
+    SwitchingProtocols = 101,
+
+    /// \brief Processing
+    Processing = 102,
+
+    /// \brief EarlyHints
+    EarlyHints = 103,
+
+    /// \brief Ok
+    Ok = 200,
+
+    /// \brief Created
+    Created = 201,
+
+    /// \brief Accepted
+    Accepted = 202,
+
+    /// \brief NonAuthoritativeInfo
+    NonAuthoritativeInfo = 203,
+
+    /// \brief NoContent
+    NoContent = 204,
+
+    /// \brief ResetContent
+    ResetContent = 205,
+
+    /// \brief PartialContent
+    PartialContent = 206,
+
+    /// \brief MultiStatus
+    MultiStatus = 207,
+
+    /// \brief AlreadyReported
+    AlreadyReported = 208,
+
+    /// \brief ImUsed
+    ImUsed = 209,
+
+    /// \brief MultipleChoices
+    MultipleChoices = 300,
+
+    /// \brief MovedPermanently
+    MovedPermanently = 301,
+
+    /// \brief Found
+    Found = 302,
+
+    /// \brief SeeOther
+    SeeOther = 303,
+
+    /// \brief NotModified
+    NotModified = 304,
+
+    /// \brief TemporaryRedirect
+    TemporaryRedirect = 307,
+
+    /// \brief PermanentRedirect
+    PermanentRedirect = 308,
+
+    /// \brief BadRequest
+    BadRequest = 400,
+
+    /// \brief Unauthorized
+    Unauthorized = 401,
+
+    /// \brief PaymentRequired
+    PaymentRequired = 402,
+
+    /// \brief Forbidden
+    Forbidden = 403,
+
+    /// \brief NotFound
+    NotFound = 404,
+
+    /// \brief MethodNotAllowed
+    MethodNotAllowed = 405,
+
+    /// \brief NotAcceptable
+    NotAcceptable = 406,
+
+    /// \brief ProxyAuthRequired
+    ProxyAuthRequired = 407,
+
+    /// \brief RequestTimeout
+    RequestTimeout = 408,
+
+    /// \brief Conflict
+    Conflict = 409,
+
+    /// \brief Gone
+    Gone = 410,
+
+    /// \brief LengthRequired
+    LengthRequired = 411,
+
+    /// \brief PreconditionFailed
+    PreconditionFailed = 412,
+
+    /// \brief PayloadTooLarge
+    PayloadTooLarge = 413,
+
+    /// \brief UriTooLong
+    UriTooLong = 414,
+
+    /// \brief UnsupportedMediaType
+    UnsupportedMediaType = 415,
+
+    /// \brief RangeNotSatisfiable
+    RangeNotSatisfiable = 416,
+
+    /// \brief ExpectationFailed
+    ExpectationFailed = 417,
+
+    /// \brief MisdirectedRequest
+    MisdirectedRequest = 421,
+
+    /// \brief UnprocessableEntity
+    UnprocessableEntity = 422,
+
+    /// \brief Locked
+    Locked = 423,
+
+    /// \brief FailedDependency
+    FailedDependency = 424,
+
+    /// \brief TooEarly
+    TooEarly = 425,
+
+    /// \brief UpgradeRequired
+    UpgradeRequired = 426,
+
+    /// \brief PreconditionRequired
+    PreconditionRequired = 428,
+
+    /// \brief TooManyRequests
+    TooManyRequests = 429,
+
+    /// \brief RequestHeaderFieldsTooLarge
+    RequestHeaderFieldsTooLarge = 431,
+
+    /// \brief InternalServerError
+    InternalServerError = 500,
+
+    /// \brief NotImplemented
+    NotImplemented = 501,
+
+    /// \brief BadGateway
+    BadGateway = 502,
+
+    /// \brief ServiceUnavailable
+    ServiceUnavailable = 503,
+
+    /// \brief GatewayTimeout
+    GatewayTimeout = 504,
+
+    /// \brief HttpVersionNotSupported
+    HttpVersionNotSupported = 505,
+
+    /// \brief VariantAlsoNegotiates
+    VariantAlsoNegotiates = 506,
+
+    /// \brief InsufficientStorage
+    InsufficientStorage = 507,
+
+    /// \brief LoopDetected
+    LoopDetected = 508,
+
+    /// \brief NotExtended
+    NotExtended = 510,
+
+    /// \brief NetworkAuthorizationRequired
+    NetworkAuthorizationRequired = 511,
+};
+
+/// \brief Represents the crypto method used to generate a code challenge.
+///
+/// The only method used by the SDK is sha256.
+enum class AuthenticationCodeChallengeMethod {
+
+    /// \brief S256
+    S256 = 0,
+};
+
+/// \brief Represents the type of integration the app will be installed as.
+enum class IntegrationType {
+
+    /// \brief GuildInstall
+    GuildInstall = 0,
+
+    /// \brief UserInstall
+    UserInstall = 1,
+};
+
+/// \brief Enum that represents the various channel types on Discord.
+///
+/// For more information see: https://discord.com/developers/docs/resources/channel
+enum class ChannelType {
+
+    /// \brief GuildText
+    GuildText = 0,
+
+    /// \brief Dm
+    Dm = 1,
+
+    /// \brief GuildVoice
+    GuildVoice = 2,
+
+    /// \brief GroupDm
+    GroupDm = 3,
+
+    /// \brief GuildCategory
+    GuildCategory = 4,
+
+    /// \brief GuildNews
+    GuildNews = 5,
+
+    /// \brief GuildStore
+    GuildStore = 6,
+
+    /// \brief GuildNewsThread
+    GuildNewsThread = 10,
+
+    /// \brief GuildPublicThread
+    GuildPublicThread = 11,
+
+    /// \brief GuildPrivateThread
+    GuildPrivateThread = 12,
+
+    /// \brief GuildStageVoice
+    GuildStageVoice = 13,
+
+    /// \brief GuildDirectory
+    GuildDirectory = 14,
+
+    /// \brief GuildForum
+    GuildForum = 15,
+
+    /// \brief GuildMedia
+    GuildMedia = 16,
+
+    /// \brief Lobby
+    Lobby = 17,
+
+    /// \brief EphemeralDm
+    EphemeralDm = 18,
+};
+
+/// \brief Represents the type of additional content contained in a message.
+enum class AdditionalContentType {
+
+    /// \brief Other
+    Other = 0,
+
+    /// \brief Attachment
+    Attachment = 1,
+
+    /// \brief Poll
+    Poll = 2,
+
+    /// \brief VoiceMessage
+    VoiceMessage = 3,
+
+    /// \brief Thread
+    Thread = 4,
+
+    /// \brief Embed
+    Embed = 5,
+
+    /// \brief Sticker
+    Sticker = 6,
+};
+
+/// \brief Describes how the Discord client decides when to transmit the user's microphone audio.
+enum class VoiceInputModeType {
+
+    /// \brief Transmit when voice activity is detected.
+    VoiceActivity = 0,
+
+    /// \brief Transmit while the push-to-talk shortcut is held.
+    PushToTalk = 1,
+};
+
+/// \brief The Discord Voice audio system to use.
+enum class AudioSystem {
+
+    /// \brief Use the standard audio system.
+    Standard = 0,
+
+    /// \brief Use the game audio system.
+    Game = 1,
+};
+
+/// \brief Represents whether a voice call is using push to talk or auto voice detection
+enum class AudioModeType {
+
+    /// \brief MODE_UNINIT
+    MODE_UNINIT = 0,
+
+    /// \brief MODE_VAD
+    MODE_VAD = 1,
+
+    /// \brief MODE_PTT
+    MODE_PTT = 2,
+};
+
+/// \brief Enum that represents the possible types of relationships that can exist between two users
+enum class RelationshipType {
+
+    /// \brief The user has no relationship with the other user.
+    None = 0,
+
+    /// \brief The user is friends with the other user.
+    Friend = 1,
+
+    /// \brief The current user has blocked the target user, and so certain actions such as sending
+    /// messages between these users will not work.
+    Blocked = 2,
+
+    /// \brief The current user has received a friend request from the target user, but it is not
+    /// yet
+    /// accepted.
+    PendingIncoming = 3,
+
+    /// \brief The current user has sent a friend request to the target user, but it is not yet
+    /// accepted.
+    PendingOutgoing = 4,
+
+    /// \brief The Implicit type is documented for visibility, but should be unused in the SDK.
+    Implicit = 5,
+
+    /// \brief The Suggestion type is documented for visibility, but should be unused in the SDK.
+    Suggestion = 6,
+};
+
+/// \brief The type of external identity provider.
+enum class ExternalIdentityProviderType {
+
+    /// \brief OIDC
+    OIDC = 0,
+
+    /// \brief EpicOnlineServices
+    EpicOnlineServices = 1,
+
+    /// \brief Steam
+    Steam = 2,
+
+    /// \brief Unity
+    Unity = 3,
+
+    /// \brief DiscordBot
+    DiscordBot = 4,
+
+    /// \brief None
+    None = 5,
+
+    /// \brief Unknown
+    Unknown = 6,
+};
+
+/// \brief Enum that specifies the various online statuses for a user.
+///
+/// Generally a user is online or offline, but in Discord users are able to further customize their
+/// status such as turning on "Do not Disturb" mode or "Dnd" to silence notifications.
+enum class StatusType {
+
+    /// \brief The user is online and recently active.
+    Online = 0,
+
+    /// \brief The user is offline and not connected to Discord.
+    Offline = 1,
+
+    /// \brief Blocked
+    Blocked = 2,
+
+    /// \brief The user is online, but has not been active for a while and may be away from their
+    /// computer.
+    Idle = 3,
+
+    /// \brief The user is online, but wishes to suppress notifications for the time being.
+    Dnd = 4,
+
+    /// \brief The user is online, but wishes to appear as if they are offline to other users.
+    Invisible = 5,
+
+    /// \brief The user is online and is actively streaming content.
+    Streaming = 6,
+
+    /// \brief Unknown
+    Unknown = 7,
+};
+
+/// \brief Enum that represents various informational disclosures that Discord may make to users, so
+/// that the game can identity them and customize their rendering as desired.
+///
+/// See MessageHandle for more details.
+enum class DisclosureTypes {
+
+    /// \brief This disclosure type happens the first time a user sends a message in game, and that
+    /// message
+    /// will be able to be viewed on Discord, so the user knows their content is being copied out of
+    /// the game.
+    MessageDataVisibleOnDiscord = 3,
+};
+
+/// \brief Represents the type of auth token used by the SDK, either the normal tokens produced by
+/// the Discord desktop app, or an oauth2 bearer token. Only the latter can be used by the SDK.
+enum class AuthorizationTokenType {
+
+    /// \brief User
+    User = 0,
+
+    /// \brief Bearer
+    Bearer = 1,
+};
+
+/// \brief Represents the various identity providers that can be used to authenticate a provisional
+/// account user for public clients.
+enum class AuthenticationExternalAuthType {
+
+    /// \brief OIDC
+    OIDC = 0,
+
+    /// \brief EpicOnlineServicesAccessToken
+    EpicOnlineServicesAccessToken = 1,
+
+    /// \brief EpicOnlineServicesIdToken
+    EpicOnlineServicesIdToken = 2,
+
+    /// \brief SteamSessionTicket
+    SteamSessionTicket = 3,
+
+    /// \brief UnityServicesIdToken
+    UnityServicesIdToken = 4,
+
+    /// \brief DiscordBotIssuedAccessToken
+    DiscordBotIssuedAccessToken = 5,
+
+    /// \brief AppleIdToken
+    AppleIdToken = 6,
+
+    /// \brief PlayStationNetworkIdToken
+    PlayStationNetworkIdToken = 7,
+};
+
+/// \brief Enum that represents the various log levels supported by the SDK.
+enum class LoggingSeverity {
+
+    /// \brief Verbose
+    Verbose = 1,
+
+    /// \brief Info
+    Info = 2,
+
+    /// \brief Warning
+    Warning = 3,
+
+    /// \brief Error
+    Error = 4,
+
+    /// \brief None
+    None = 5,
+};
+
+/// \brief Enum that represents the logical groups of relationships based on online status and game
+/// activity
+enum class RelationshipGroupType {
+
+    /// \brief Users who are online and currently playing the game
+    OnlinePlayingGame = 0,
+
+    /// \brief Users who are online but not playing the game
+    OnlineElsewhere = 1,
+
+    /// \brief Users who are offline
+    Offline = 2,
+};
+class ActivityInvite;
+class ActivityAssets;
+class ActivityTimestamps;
+class ActivityParty;
+class ActivitySecrets;
+class ActivityButton;
+class Activity;
+class ClientResult;
+class AuthorizationCodeChallenge;
+class AuthorizationCodeVerifier;
+class AuthorizationArgs;
+class DeviceAuthorizationArgs;
+class VoiceStateHandle;
+class VADThresholdSettings;
+class Call;
+class ChannelHandle;
+class GuildMinimal;
+class GuildChannel;
+class LinkedLobby;
+class LinkedChannel;
+class RelationshipHandle;
+class UserApplicationProfileHandle;
+class UserHandle;
+class LobbyMemberHandle;
+class LobbyHandle;
+class AdditionalContent;
+class MessageHandle;
+class AudioDevice;
+class VoiceSettings;
+class UserMessageSummary;
+class ClientCreateOptions;
+class Client;
+class CallInfoHandle;
+
+/// \brief When one user invites another to join their game on Discord, it will send a message to
+/// that user. The SDK will parse those messages for you automatically, and this struct contains all
+/// of the relevant invite information which is needed to later accept that invite.
+class ActivityInvite {
+    /// \cond
+    mutable Discord_ActivityInvite instance_{};
+    DiscordObjectState state_ = DiscordObjectState::Invalid;
+    /// \endcond
+
+public:
+    /// \cond
+    Discord_ActivityInvite* instance() const { return &instance_; }
+    /// \endcond
+    /// \cond
+    explicit ActivityInvite(Discord_ActivityInvite instance, DiscordObjectState state);
+    ~ActivityInvite();
+    /// \endcond
+    /// Move constructor for ActivityInvite
+    ActivityInvite(ActivityInvite&& other) noexcept;
+    /// Move assignment operator for ActivityInvite
+    ActivityInvite& operator=(ActivityInvite&& other) noexcept;
+    /// Uninitialized instance of ActivityInvite
+    static const ActivityInvite nullobj;
+    /// Returns true if the instance contains a valid object
+    operator bool() const { return state_ != DiscordObjectState::Invalid; }
+
+    /// Copy constructor for ActivityInvite
+    ActivityInvite(const ActivityInvite& rhs);
+    /// Copy assignment operator for ActivityInvite
+    ActivityInvite& operator=(const ActivityInvite& rhs);
+
+    explicit ActivityInvite();
+
+    /// \cond
+    void Drop();
+    /// \endcond
+
+    /// \brief The user id of the user who sent the invite.
+    uint64_t SenderId() const;
+    /// Setter for ActivityInvite::SenderId.
+    void SetSenderId(uint64_t SenderId);
+
+    /// \brief The id of the Discord channel in which the invite was sent.
+    uint64_t ChannelId() const;
+    /// Setter for ActivityInvite::ChannelId.
+    void SetChannelId(uint64_t ChannelId);
+
+    /// \brief The id of the Discord message that contains the invite.
+    uint64_t MessageId() const;
+    /// Setter for ActivityInvite::MessageId.
+    void SetMessageId(uint64_t MessageId);
+
+    /// \brief The type of invite that was sent.
+    discordpp::ActivityActionTypes Type() const;
+    /// Setter for ActivityInvite::Type.
+    void SetType(discordpp::ActivityActionTypes Type);
+
+    /// \brief The target application of the invite.
+    uint64_t ApplicationId() const;
+    /// Setter for ActivityInvite::ApplicationId.
+    void SetApplicationId(uint64_t ApplicationId);
+
+    /// \brief The application id of the parent - this is only applicable if there is a parent
+    /// for a publisher's suite of applications.
+    uint64_t ParentApplicationId() const;
+    /// Setter for ActivityInvite::ParentApplicationId.
+    void SetParentApplicationId(uint64_t ParentApplicationId);
+
+    /// \brief The id of the party the invite was sent for.
+    std::string PartyId() const;
+    /// Setter for ActivityInvite::PartyId.
+    void SetPartyId(std::string PartyId);
+
+    /// \brief The session id of the user who sent the invite.
+    std::string SessionId() const;
+    /// Setter for ActivityInvite::SessionId.
+    void SetSessionId(std::string SessionId);
+
+    /// \brief Whether or not this invite is currently joinable. An invite becomes invalid if it was
+    /// sent more than 6 hours ago or if the sender is no longer playing the game the invite is for.
+    bool IsValid() const;
+    /// Setter for ActivityInvite::IsValid.
+    void SetIsValid(bool IsValid);
+};
+
+/// \brief Struct which controls what your rich presence looks like in
+/// the Discord client. If you don't specify any values, the icon
+/// and name of your application will be used as defaults.
+///
+/// Image assets can be either the unique identifier for an image
+/// you uploaded to your application via the `Rich Presence` page in
+/// the Developer portal, or they can be an external image URL.
+///
+/// As an example, if I uploaded an asset and name it `goofy-icon`,
+/// I could set either image field to the string `goofy-icon`. Alternatively,
+/// if my icon was hosted at `http://my-site.com/goofy.jpg`, I could
+/// pass that URL into either image field.
+///
+/// See https://discord.com/developers/docs/rich-presence/overview#adding-custom-art-assets
+/// for more information on using custom art assets, as well as for visual
+/// examples of what each field does.
+class ActivityAssets {
+    /// \cond
+    mutable Discord_ActivityAssets instance_{};
+    DiscordObjectState state_ = DiscordObjectState::Invalid;
+    /// \endcond
+
+public:
+    /// \cond
+    Discord_ActivityAssets* instance() const { return &instance_; }
+    /// \endcond
+    /// \cond
+    explicit ActivityAssets(Discord_ActivityAssets instance, DiscordObjectState state);
+    ~ActivityAssets();
+    /// \endcond
+    /// Move constructor for ActivityAssets
+    ActivityAssets(ActivityAssets&& other) noexcept;
+    /// Move assignment operator for ActivityAssets
+    ActivityAssets& operator=(ActivityAssets&& other) noexcept;
+    /// Uninitialized instance of ActivityAssets
+    static const ActivityAssets nullobj;
+    /// Returns true if the instance contains a valid object
+    operator bool() const { return state_ != DiscordObjectState::Invalid; }
+
+    /// Copy constructor for ActivityAssets
+    ActivityAssets(const ActivityAssets& arg0);
+    /// Copy assignment operator for ActivityAssets
+    ActivityAssets& operator=(const ActivityAssets& arg0);
+
+    explicit ActivityAssets();
+
+    /// \cond
+    void Drop();
+    /// \endcond
+
+    /// \brief The primary image identifier or URL, rendered as a large square icon on a user's rich
+    /// presence.
+    ///
+    /// If specified, must be a string between 1 and 300 characters.
+    std::optional<std::string> LargeImage() const;
+    /// Setter for ActivityAssets::LargeImage.
+    void SetLargeImage(std::optional<std::string> LargeImage);
+
+    /// \brief A tooltip string that is shown when the user hovers over the large image.
+    ///
+    /// If specified, must be a string between 2 and 128 characters.
+    std::optional<std::string> LargeText() const;
+    /// Setter for ActivityAssets::LargeText.
+    void SetLargeText(std::optional<std::string> LargeText);
+
+    /// \brief A URL that opens when the user clicks/taps the large image.
+    ///
+    /// If specified, must be a string between 1 and 256 characters.
+    std::optional<std::string> LargeUrl() const;
+    /// Setter for ActivityAssets::LargeUrl.
+    void SetLargeUrl(std::optional<std::string> LargeUrl);
+
+    /// \brief The secondary image, rendered as a small circle over the `largeImage`.
+    ///
+    /// If specified, must be a string between 1 and 300 characters.
+    std::optional<std::string> SmallImage() const;
+    /// Setter for ActivityAssets::SmallImage.
+    void SetSmallImage(std::optional<std::string> SmallImage);
+
+    /// \brief A tooltip string that is shown when the user hovers over the small image.
+    ///
+    /// If specified, must be a string between 2 and 128 characters.
+    std::optional<std::string> SmallText() const;
+    /// Setter for ActivityAssets::SmallText.
+    void SetSmallText(std::optional<std::string> SmallText);
+
+    /// \brief A URL that opens when the user clicks/taps the small image.
+    ///
+    /// If specified, must be a string between 1 and 256 characters.
+    std::optional<std::string> SmallUrl() const;
+    /// Setter for ActivityAssets::SmallUrl.
+    void SetSmallUrl(std::optional<std::string> SmallUrl);
+
+    /// \brief The invite cover image identifier or URL, rendered as a banner image on activity
+    /// invites.
+    ///
+    /// If specified, must be a string between 1 and 300 characters.
+    std::optional<std::string> InviteCoverImage() const;
+    /// Setter for ActivityAssets::InviteCoverImage.
+    void SetInviteCoverImage(std::optional<std::string> InviteCoverImage);
+};
+
+/// \brief \see Activity
+class ActivityTimestamps {
+    /// \cond
+    mutable Discord_ActivityTimestamps instance_{};
+    DiscordObjectState state_ = DiscordObjectState::Invalid;
+    /// \endcond
+
+public:
+    /// \cond
+    Discord_ActivityTimestamps* instance() const { return &instance_; }
+    /// \endcond
+    /// \cond
+    explicit ActivityTimestamps(Discord_ActivityTimestamps instance, DiscordObjectState state);
+    ~ActivityTimestamps();
+    /// \endcond
+    /// Move constructor for ActivityTimestamps
+    ActivityTimestamps(ActivityTimestamps&& other) noexcept;
+    /// Move assignment operator for ActivityTimestamps
+    ActivityTimestamps& operator=(ActivityTimestamps&& other) noexcept;
+    /// Uninitialized instance of ActivityTimestamps
+    static const ActivityTimestamps nullobj;
+    /// Returns true if the instance contains a valid object
+    operator bool() const { return state_ != DiscordObjectState::Invalid; }
+
+    /// Copy constructor for ActivityTimestamps
+    ActivityTimestamps(const ActivityTimestamps& arg0);
+    /// Copy assignment operator for ActivityTimestamps
+    ActivityTimestamps& operator=(const ActivityTimestamps& arg0);
+
+    explicit ActivityTimestamps();
+
+    /// \cond
+    void Drop();
+    /// \endcond
+
+    /// \brief The time the activity started, in milliseconds since Unix epoch.
+    ///
+    /// The SDK will try to convert seconds to milliseconds if a small-ish value is passed in.
+    /// If specified, the Discord client will render a count up timer showing how long the user has
+    /// been playing this activity.
+    uint64_t Start() const;
+    /// Setter for ActivityTimestamps::Start.
+    void SetStart(uint64_t Start);
+
+    /// \brief The time the activity will end at, in milliseconds since Unix epoch.
+    ///
+    /// The SDK will try to convert seconds to milliseconds if a small-ish value is passed in.
+    /// If specified, the Discord client will render a countdown timer showing how long until the
+    /// activity ends.
+    uint64_t End() const;
+    /// Setter for ActivityTimestamps::End.
+    void SetEnd(uint64_t End);
+};
+
+/// \brief \see Activity
+class ActivityParty {
+    /// \cond
+    mutable Discord_ActivityParty instance_{};
+    DiscordObjectState state_ = DiscordObjectState::Invalid;
+    /// \endcond
+
+public:
+    /// \cond
+    Discord_ActivityParty* instance() const { return &instance_; }
+    /// \endcond
+    /// \cond
+    explicit ActivityParty(Discord_ActivityParty instance, DiscordObjectState state);
+    ~ActivityParty();
+    /// \endcond
+    /// Move constructor for ActivityParty
+    ActivityParty(ActivityParty&& other) noexcept;
+    /// Move assignment operator for ActivityParty
+    ActivityParty& operator=(ActivityParty&& other) noexcept;
+    /// Uninitialized instance of ActivityParty
+    static const ActivityParty nullobj;
+    /// Returns true if the instance contains a valid object
+    operator bool() const { return state_ != DiscordObjectState::Invalid; }
+
+    /// Copy constructor for ActivityParty
+    ActivityParty(const ActivityParty& arg0);
+    /// Copy assignment operator for ActivityParty
+    ActivityParty& operator=(const ActivityParty& arg0);
+
+    explicit ActivityParty();
+
+    /// \cond
+    void Drop();
+    /// \endcond
+
+    /// \brief Specifies the id of the party. "Party" is used colloquially to refer to a group of
+    /// players in a shared context. This could be a lobby id, server id, team id, etc.
+    ///
+    /// All party members should specify a RichPresence update using
+    /// the same party id so that the Discord client knows how to group them together. If specified,
+    /// must be a string between 2 and 128 characters.
+    std::string Id() const;
+    /// Setter for ActivityParty::Id.
+    void SetId(std::string Id);
+
+    /// \brief The number of people currently in the party, must be at least 1.
+    int32_t CurrentSize() const;
+    /// Setter for ActivityParty::CurrentSize.
+    void SetCurrentSize(int32_t CurrentSize);
+
+    /// \brief The maximum number of people that can be in the party, must be at least 0. When 0,
+    /// the UI will not display a maximum.
+    int32_t MaxSize() const;
+    /// Setter for ActivityParty::MaxSize.
+    void SetMaxSize(int32_t MaxSize);
+
+    /// \brief The privacy of the party.
+    discordpp::ActivityPartyPrivacy Privacy() const;
+    /// Setter for ActivityParty::Privacy.
+    void SetPrivacy(discordpp::ActivityPartyPrivacy Privacy);
+};
+
+/// \brief \see Activity
+class ActivitySecrets {
+    /// \cond
+    mutable Discord_ActivitySecrets instance_{};
+    DiscordObjectState state_ = DiscordObjectState::Invalid;
+    /// \endcond
+
+public:
+    /// \cond
+    Discord_ActivitySecrets* instance() const { return &instance_; }
+    /// \endcond
+    /// \cond
+    explicit ActivitySecrets(Discord_ActivitySecrets instance, DiscordObjectState state);
+    ~ActivitySecrets();
+    /// \endcond
+    /// Move constructor for ActivitySecrets
+    ActivitySecrets(ActivitySecrets&& other) noexcept;
+    /// Move assignment operator for ActivitySecrets
+    ActivitySecrets& operator=(ActivitySecrets&& other) noexcept;
+    /// Uninitialized instance of ActivitySecrets
+    static const ActivitySecrets nullobj;
+    /// Returns true if the instance contains a valid object
+    operator bool() const { return state_ != DiscordObjectState::Invalid; }
+
+    /// Copy constructor for ActivitySecrets
+    ActivitySecrets(const ActivitySecrets& arg0);
+    /// Copy assignment operator for ActivitySecrets
+    ActivitySecrets& operator=(const ActivitySecrets& arg0);
+
+    explicit ActivitySecrets();
+
+    /// \cond
+    void Drop();
+    /// \endcond
+
+    /// \brief A secret string that is shared with users who are accepted into the party so the game
+    /// knows how to join the user to the party. For example you might specify an internal game
+    /// server ID or a Discord lobby ID or secret. If specified, must be a string between 2 and 128
+    /// characters.
+    std::string Join() const;
+    /// Setter for ActivitySecrets::Join.
+    void SetJoin(std::string Join);
+};
+
+/// \brief \see Activity
+class ActivityButton {
+    /// \cond
+    mutable Discord_ActivityButton instance_{};
+    DiscordObjectState state_ = DiscordObjectState::Invalid;
+    /// \endcond
+
+public:
+    /// \cond
+    Discord_ActivityButton* instance() const { return &instance_; }
+    /// \endcond
+    /// \cond
+    explicit ActivityButton(Discord_ActivityButton instance, DiscordObjectState state);
+    ~ActivityButton();
+    /// \endcond
+    /// Move constructor for ActivityButton
+    ActivityButton(ActivityButton&& other) noexcept;
+    /// Move assignment operator for ActivityButton
+    ActivityButton& operator=(ActivityButton&& other) noexcept;
+    /// Uninitialized instance of ActivityButton
+    static const ActivityButton nullobj;
+    /// Returns true if the instance contains a valid object
+    operator bool() const { return state_ != DiscordObjectState::Invalid; }
+
+    /// Copy constructor for ActivityButton
+    ActivityButton(const ActivityButton& arg0);
+    /// Copy assignment operator for ActivityButton
+    ActivityButton& operator=(const ActivityButton& arg0);
+
+    explicit ActivityButton();
+
+    /// \cond
+    void Drop();
+    /// \endcond
+
+    /// \brief The label of the button.
+    std::string Label() const;
+    /// Setter for ActivityButton::Label.
+    void SetLabel(std::string Label);
+
+    /// \brief The url of the button.
+    std::string Url() const;
+    /// Setter for ActivityButton::Url.
+    void SetUrl(std::string Url);
+};
+
+/// \brief An Activity represents one "thing" a user is doing on Discord and is part of their rich
+/// presence.
+///
+/// Additional information is located on the Discord Developer Portal:
+/// - https://discord.com/developers/docs/rich-presence/overview
+/// - https://discord.com/developers/docs/developer-tools/game-sdk#activities
+/// - https://discord.com/developers/docs/rich-presence/best-practices
+///
+/// While RichPresence supports multiple types of activities, the only activity type that is really
+/// relevant for the SDK is ActivityTypes::Playing. Additionally, the SDK will only expose
+/// Activities that are associated with the current game (or application). So for example, a field
+/// like `name` below, will always be set to the current game's name from the view of the SDK.
+///
+/// ## Customization
+/// When an activity shows up on Discord, it will look something like this:
+/// 1. Playing "game name"
+/// 2. Capture the flag | 2 - 1
+/// 3. In a group (2 of 3)
+///
+/// You can control how lines 2 and 3 are rendered in Discord, here's the breakdown:
+/// - Line 1, `Playing "game name"` is powered by the name of your game (or application) on Discord.
+/// - Line 2, `Capture the flag | 2 - 1` is powered by the `details` field in the activity, and this
+/// should generally try to describe what the _player_ is currently doing. You can even include
+/// dynamic data such as a match score here.
+/// - Line 3, `In a group (2 of 3)` describes the _party_ the player is in. "Party" is used to refer
+/// to a group of players in a shared context, such as a lobby, server, team, etc. The first half,
+/// `In a group` is powered by the `state` field in the activity, and the second half, `(2 of 3)` is
+/// powered by the `party` field in the activity and describes how many people are in the current
+/// party and how big the party can get.
+///
+/// This diagram visually shows the field mapping:
+///
+///
+/// \image html "rich_presence.png" "Rich presence field diagram" width=1070px
+///
+/// You can also specify up to two custom buttons to display on the rich presence.
+/// These buttons will open the URL in the user's default browser.
+///
+/// \code
+///     discordpp::ActivityButton button;
+///     button.SetLabel("Button 1");
+///     button.SetUrl("https://example.com");
+///     activity.AddButton(button);
+/// \endcode
+///
+///
+/// ## Invites / Joinable Activities
+/// Other users can be invited to join the current player's activity (or request to join it too),
+/// but that does require certain fields to be set:
+/// 1. ActivityParty must be set and have a non-empty ActivityParty::Id field. All users in the
+/// party should set the same id field too!
+/// 2. ActivityParty must specify the size of the group, and there must be room in the group for
+/// another person to join.
+/// 3. ActivitySecrets::Join must be set to a non-empty string. The join secret is only shared with
+/// users who are accepted into the party by an existing member, so it is truly a secret. You can
+/// use this so that when the user is accepted your game knows how to join them to the party. For
+/// example it could be an internal game ID, or a Discord lobby ID/secret that the client could
+/// join.
+///
+/// There is additional information about game invites here:
+/// https://support.discord.com/hc/en-us/articles/115001557452-Game-Invites
+///
+/// ### Mobile Invites
+/// Activity invites are handled via a deep link. To enable users to join your game via an invite in
+/// the Discord client, you must do two things:
+/// 1. Set your deep link URL in the Discord developer portal. This will be available on the General
+/// tab of your application once Social Layer integration is enabled for your app.
+/// 2. Set the desired supported platforms when reporting the activity info in your rich presence,
+/// e.g.:
+///
+///
+/// \code
+///     activity.SetSupportedPlatforms(
+///         ActivityGamePlatforms.Desktop |
+///         ActivityGamePlatforms.IOS |
+///         ActivityGamePlatforms.Android);
+/// \endcode
+///
+///
+/// When the user accepts the invite, the Discord client will open:
+/// `[your url]/_discord/join?secret=[the join secret you set]`
+///
+/// ### Example Invites Flow
+/// If you are using Discord lobbies for your game, a neat flow would look like this:
+/// - When a user starts playing the game, they create a lobby with a random secret string, using
+/// Client::CreateOrJoinLobby
+/// - That user publishes their RichPresence with the join secret set to the lobby secret, along
+/// with party size information
+/// - Another use can then see that RichPresence on Discord and join off of it
+/// - Once accepted the new user receives the join secret and their client can call
+/// CreateOrJoinLobby(joinSecret) to join the lobby
+/// - Finally the original user can notice that the lobby membership has changed and so they publish
+/// a new RichPresence update containing the updating party size information.
+///
+/// ### Invites Code Example
+///
+/// \code
+/// // User A
+/// // 1. Create a lobby with secret
+/// std::string lobbySecret = "foo";
+/// client->CreateOrJoinLobby(lobbySecret, [=](discordpp::ClientResult result, uint64_t lobbyId) {
+///     // 2. Update rich presence with join secret
+///     discordpp::Activity activity{};
+///     // set name, state, party size ...
+///     discordpp::ActivitySecrets secrets{};
+///     secrets.SetJoin(lobbySecret);
+///     activity.SetSecrets(secrets);
+///     client->UpdateRichPresence(std::move(activity), [](discordpp::ClientResult result) {});
+/// });
+/// // 3. Some time later, send an invite
+/// client->SendActivityInvite(USER_B_ID, "come play with me", [](auto result) {});
+///
+/// // User B
+/// // 4. Monitor for new invites. Alternatively, you can use
+/// // Client::SetActivityInviteUpdatedCallback to get updates on existing invites.
+/// client->SetActivityInviteCreatedCallback([client](auto invite) {
+///     // 5. When an invite is received, ask the user if they want to accept it.
+///     // If they choose to do so then go ahead and invoke AcceptActivityInvite
+///     client->AcceptActivityInvite(invite,
+///         [client](discordpp::ClientResult result, std::string secret) {
+///         if (result.Successful()) {
+///             // 5. Join the lobby using the joinSecret
+///             client->CreateOrJoinLobby(secret, [](discordpp::ClientResult result, uint64_t
+///             lobbyId) {
+///                 // Successfully joined lobby!
+///             });
+///         }
+///     });
+/// });
+/// \endcode
+///
+///
+/// ### Join Requests Code Example
+/// Users can also request to join each others parties. This code snippet shows how that flow might
+/// look:
+///
+/// \code
+/// // User A
+/// // 1. Create a lobby with secret
+/// std::string lobbySecret = "foo";
+/// client->CreateOrJoinLobby(lobbySecret, [=](discordpp::ClientResult result, uint64_t lobbyId) {
+///     // 2. Update rich presence with join secret
+///     discordpp::Activity activity{};
+///     // set name, state, party size ...
+///     discordpp::ActivitySecrets secrets{};
+///     secrets.SetJoin(lobbySecret);
+///     activity.SetSecrets(secrets);
+///     client->UpdateRichPresence(std::move(activity), [](discordpp::ClientResult result) {});
+/// });
+///
+/// // User B
+/// // 3. Request to join User A's party
+/// client->SendActivityJoinRequest(USER_A_ID, [](auto result) {});
+///
+/// // User A
+/// // Monitor for new invites:
+/// client->SetActivityInviteCreatedCallback([client](auto invite) {
+///     // 5. The game can now show that User A has received a request to join their party
+///     // If User A is ok with that, they can reply back:
+///     // Note: invite.type will be ActivityActionTypes::JoinRequest in this example
+///     client->SendActivityJoinRequestReply(invite, [](auto result) {});
+/// });
+///
+/// // User B
+/// // 6. Same as before, user B can monitor for invites
+/// client->SetActivityInviteCreatedCallback([client](auto invite) {
+///     // 7. When an invite is received, ask the user if they want to accept it.
+///     // If they choose to do so then go ahead and invoke AcceptActivityInvite
+///     client->AcceptActivityInvite(invite,
+///         [client](discordpp::ClientResult result, std::string secret) {
+///         if (result.Successful()) {
+///             // 5. Join the lobby using the joinSecret
+///             client->CreateOrJoinLobby(secret, [](auto result, uint64_t lobbyId) {
+///                 // Successfully joined lobby!
+///             });
+///         }
+///     });
+/// });
+/// \endcode
+///
+class Activity {
+    /// \cond
+    mutable Discord_Activity instance_{};
+    DiscordObjectState state_ = DiscordObjectState::Invalid;
+    /// \endcond
+
+public:
+    /// \cond
+    Discord_Activity* instance() const { return &instance_; }
+    /// \endcond
+    /// \cond
+    explicit Activity(Discord_Activity instance, DiscordObjectState state);
+    ~Activity();
+    /// \endcond
+    /// Move constructor for Activity
+    Activity(Activity&& other) noexcept;
+    /// Move assignment operator for Activity
+    Activity& operator=(Activity&& other) noexcept;
+    /// Uninitialized instance of Activity
+    static const Activity nullobj;
+    /// Returns true if the instance contains a valid object
+    operator bool() const { return state_ != DiscordObjectState::Invalid; }
+
+    /// Copy constructor for Activity
+    Activity(const Activity& arg0);
+    /// Copy assignment operator for Activity
+    Activity& operator=(const Activity& arg0);
+
+    explicit Activity();
+
+    /// \cond
+    void Drop();
+    /// \endcond
+
+    /// \brief Adds a custom button to the rich presence
+    void AddButton(discordpp::ActivityButton button);
+
+    /// \brief Compares each field of the Activity struct for equality.
+    bool Equals(discordpp::Activity other) const;
+
+    /// \brief Returns the custom buttons for the rich presence
+    std::vector<discordpp::ActivityButton> GetButtons() const;
+
+    /// \brief The name of the game or application that the activity is associated with.
+    ///
+    /// This field defaults to the name of the current game.
+    std::string Name() const;
+    /// Setter for Activity::Name.
+    void SetName(std::string Name);
+
+    /// \brief The type of activity this is.
+    ///
+    /// This should almost always be set to `Playing`
+    discordpp::ActivityTypes Type() const;
+    /// Setter for Activity::Type.
+    void SetType(discordpp::ActivityTypes Type);
+
+    /// \brief Controls which field is used for the user's status message
+    ///
+    /// See the docs on the Activity struct for more info.
+    std::optional<discordpp::StatusDisplayTypes> StatusDisplayType() const;
+    /// Setter for Activity::StatusDisplayType.
+    void SetStatusDisplayType(std::optional<discordpp::StatusDisplayTypes> StatusDisplayType);
+
+    /// \brief The state _of the party_ for this activity.
+    ///
+    /// See the docs on the Activity struct for more info.
+    /// If specified, must be a string between 2 and 128 characters.
+    std::optional<std::string> State() const;
+    /// Setter for Activity::State.
+    void SetState(std::optional<std::string> State);
+
+    /// \brief A URL that opens when the user clicks/taps the state text.
+    ///
+    /// See the docs on the Activity struct for more info.
+    /// If specified, must be a string between 2 and 256 characters.
+    std::optional<std::string> StateUrl() const;
+    /// Setter for Activity::StateUrl.
+    void SetStateUrl(std::optional<std::string> StateUrl);
+
+    /// \brief The state _of the what the user is doing_ for this activity.
+    ///
+    /// See the docs on the Activity struct for more info.
+    /// If specified, must be a string between 2 and 128 characters.
+    std::optional<std::string> Details() const;
+    /// Setter for Activity::Details.
+    void SetDetails(std::optional<std::string> Details);
+
+    /// \brief A URL that opens when the user clicks/taps the details text.
+    ///
+    /// See the docs on the Activity struct for more info.
+    /// If specified, must be a string between 2 and 256 characters.
+    std::optional<std::string> DetailsUrl() const;
+    /// Setter for Activity::DetailsUrl.
+    void SetDetailsUrl(std::optional<std::string> DetailsUrl);
+
+    /// \brief The application ID of the game that the activity is associated with.
+    ///
+    /// This field cannot be set by the SDK, and will always be the application ID of the current
+    /// game or a game from the same publisher.
+    std::optional<uint64_t> ApplicationId() const;
+    /// Setter for Activity::ApplicationId.
+    void SetApplicationId(std::optional<uint64_t> ApplicationId);
+
+    /// \brief The application ID of the parent application that the activity is associated with if
+    /// it exists. This is to help identify a collection of games that are from the same publisher.
+    ///
+    /// This field cannot be set by the SDK, and will always be the application ID of the game's
+    /// parent or unset if the game has no parent.
+    std::optional<uint64_t> ParentApplicationId() const;
+    /// Setter for Activity::ParentApplicationId.
+    void SetParentApplicationId(std::optional<uint64_t> ParentApplicationId);
+
+    /// \brief Images used to customize how the Activity is displayed in the Discord client.
+    std::optional<discordpp::ActivityAssets> Assets() const;
+    /// Setter for Activity::Assets.
+    void SetAssets(std::optional<discordpp::ActivityAssets> Assets);
+
+    /// \brief The timestamps struct can be used to render either:
+    /// - a "time remaining" countdown timer (by specifying the `end` value)
+    /// - a "time elapsed" countup timer (by specifying the `start` value)
+    std::optional<discordpp::ActivityTimestamps> Timestamps() const;
+    /// Setter for Activity::Timestamps.
+    void SetTimestamps(std::optional<discordpp::ActivityTimestamps> Timestamps);
+
+    /// \brief The party struct is used to indicate the size and members of the people the current
+    /// user is playing with.
+    std::optional<discordpp::ActivityParty> Party() const;
+    /// Setter for Activity::Party.
+    void SetParty(std::optional<discordpp::ActivityParty> Party);
+
+    /// \brief The secrets struct is used in combination with the party struct to make an Activity
+    /// joinable.
+    std::optional<discordpp::ActivitySecrets> Secrets() const;
+    /// Setter for Activity::Secrets.
+    void SetSecrets(std::optional<discordpp::ActivitySecrets> Secrets);
+
+    /// \brief If an activity is joinable, but only on certain platforms, this field can be used to
+    /// indicate which platforms the activity is joinable on. For example if a game is available on
+    /// both PC and Mobile, but PC users cannot join Mobile users and vice versa, this field can be
+    /// used so that an activity only shows as joinable on Discord if the user is on the appropriate
+    /// platform.
+    discordpp::ActivityGamePlatforms SupportedPlatforms() const;
+    /// Setter for Activity::SupportedPlatforms.
+    void SetSupportedPlatforms(discordpp::ActivityGamePlatforms SupportedPlatforms);
+};
+
+/// \brief Struct that stores information about the result of an SDK function call.
+///
+/// Functions can fail for a few reasons including:
+/// - The Client is not yet ready and able to perform the action.
+/// - The inputs passed to the function are invalid.
+/// - The function makes an API call to Discord's backend which returns an error.
+/// - The user is offline.
+///
+/// The ClientResult::Type field is used to to distinguish between the above types of failures
+class ClientResult {
+    /// \cond
+    mutable Discord_ClientResult instance_{};
+    DiscordObjectState state_ = DiscordObjectState::Invalid;
+    /// \endcond
+
+public:
+    /// \cond
+    Discord_ClientResult* instance() const { return &instance_; }
+    /// \endcond
+    /// \cond
+    explicit ClientResult(Discord_ClientResult instance, DiscordObjectState state);
+    ~ClientResult();
+    /// \endcond
+    /// Move constructor for ClientResult
+    ClientResult(ClientResult&& other) noexcept;
+    /// Move assignment operator for ClientResult
+    ClientResult& operator=(ClientResult&& other) noexcept;
+    /// Uninitialized instance of ClientResult
+    static const ClientResult nullobj;
+    /// Returns true if the instance contains a valid object
+    operator bool() const { return state_ != DiscordObjectState::Invalid; }
+
+    /// Copy constructor for ClientResult
+    ClientResult(const ClientResult& arg0);
+    /// Copy assignment operator for ClientResult
+    ClientResult& operator=(const ClientResult& arg0);
+
+    /// \cond
+    void Drop();
+    /// \endcond
+
+    /// \brief Returns the error message if any of the ClientResult.
+    std::string ToString() const;
+
+    /// \brief The type of error that occurred. See ErrorType for more information.
+    discordpp::ErrorType Type() const;
+    /// Setter for ClientResult::Type.
+    void SetType(discordpp::ErrorType Type);
+
+    /// \brief A description of the error that occurred.
+    std::string Error() const;
+    /// Setter for ClientResult::Error.
+    void SetError(std::string Error);
+
+    /// \brief A more detailed error code for this failure. Currently the only use of this is when
+    /// an API request is made to Discord's backend and that fails with a specific error, that error
+    /// will be included in this field.
+    ///
+    /// Many of these error codes are documented at:
+    /// https://discord.com/developers/docs/topics/opcodes-and-status-codes#json
+    ///
+    /// This will only be set if the type of error is ErrorType::HTTPError
+    int32_t ErrorCode() const;
+    /// Setter for ClientResult::ErrorCode.
+    void SetErrorCode(int32_t ErrorCode);
+
+    /// \brief The HTTP status code of the API call.
+    ///
+    /// This will only be set if the type of error is ErrorType::HTTPError
+    discordpp::HttpStatusCode Status() const;
+    /// Setter for ClientResult::Status.
+    void SetStatus(discordpp::HttpStatusCode Status);
+
+    /// \brief The full HTTP response body, which will usually be a JSON string.
+    ///
+    /// The error format here is a bit more complicated because Discord's API tries to
+    /// make it clear which field from the request is causing the error. Documentation on the format
+    /// of these errors is here: https://discord.com/developers/docs/reference#error-messages
+    ///
+    /// This will only be set if the type of error is ErrorType::HTTPError
+    std::string ResponseBody() const;
+    /// Setter for ClientResult::ResponseBody.
+    void SetResponseBody(std::string ResponseBody);
+
+    /// \brief Equivalent to type == ErrorType::None
+    bool Successful() const;
+    /// Setter for ClientResult::Successful.
+    void SetSuccessful(bool Successful);
+
+    /// \brief Indicates if, although an API request failed, it is safe and recommended to retry it.
+    bool Retryable() const;
+    /// Setter for ClientResult::Retryable.
+    void SetRetryable(bool Retryable);
+
+    /// \brief When a user is being rate limited by Discord (and so status == 429), this field
+    /// should be set and is the number of seconds to wait before trying again.
+    float RetryAfter() const;
+    /// Setter for ClientResult::RetryAfter.
+    void SetRetryAfter(float RetryAfter);
+};
+
+/// \brief Struct that encapsulates the challenge part of the code verification flow.
+class AuthorizationCodeChallenge {
+    /// \cond
+    mutable Discord_AuthorizationCodeChallenge instance_{};
+    DiscordObjectState state_ = DiscordObjectState::Invalid;
+    /// \endcond
+
+public:
+    /// \cond
+    Discord_AuthorizationCodeChallenge* instance() const { return &instance_; }
+    /// \endcond
+    /// \cond
+    explicit AuthorizationCodeChallenge(Discord_AuthorizationCodeChallenge instance,
+                                        DiscordObjectState state);
+    ~AuthorizationCodeChallenge();
+    /// \endcond
+    /// Move constructor for AuthorizationCodeChallenge
+    AuthorizationCodeChallenge(AuthorizationCodeChallenge&& other) noexcept;
+    /// Move assignment operator for AuthorizationCodeChallenge
+    AuthorizationCodeChallenge& operator=(AuthorizationCodeChallenge&& other) noexcept;
+    /// Uninitialized instance of AuthorizationCodeChallenge
+    static const AuthorizationCodeChallenge nullobj;
+    /// Returns true if the instance contains a valid object
+    operator bool() const { return state_ != DiscordObjectState::Invalid; }
+
+    /// Copy constructor for AuthorizationCodeChallenge
+    AuthorizationCodeChallenge(const AuthorizationCodeChallenge& arg0);
+    /// Copy assignment operator for AuthorizationCodeChallenge
+    AuthorizationCodeChallenge& operator=(const AuthorizationCodeChallenge& arg0);
+
+    explicit AuthorizationCodeChallenge();
+
+    /// \cond
+    void Drop();
+    /// \endcond
+
+    /// \brief The method used to generate the challenge. The only method used by the SDK is sha256.
+    discordpp::AuthenticationCodeChallengeMethod Method() const;
+    /// Setter for AuthorizationCodeChallenge::Method.
+    void SetMethod(discordpp::AuthenticationCodeChallengeMethod Method);
+
+    /// \brief The challenge value
+    std::string Challenge() const;
+    /// Setter for AuthorizationCodeChallenge::Challenge.
+    void SetChallenge(std::string Challenge);
+};
+
+/// \brief Struct that encapsulates both parts of the code verification flow.
+class AuthorizationCodeVerifier {
+    /// \cond
+    mutable Discord_AuthorizationCodeVerifier instance_{};
+    DiscordObjectState state_ = DiscordObjectState::Invalid;
+    /// \endcond
+
+public:
+    /// \cond
+    Discord_AuthorizationCodeVerifier* instance() const { return &instance_; }
+    /// \endcond
+    /// \cond
+    explicit AuthorizationCodeVerifier(Discord_AuthorizationCodeVerifier instance,
+                                       DiscordObjectState state);
+    ~AuthorizationCodeVerifier();
+    /// \endcond
+    /// Move constructor for AuthorizationCodeVerifier
+    AuthorizationCodeVerifier(AuthorizationCodeVerifier&& other) noexcept;
+    /// Move assignment operator for AuthorizationCodeVerifier
+    AuthorizationCodeVerifier& operator=(AuthorizationCodeVerifier&& other) noexcept;
+    /// Uninitialized instance of AuthorizationCodeVerifier
+    static const AuthorizationCodeVerifier nullobj;
+    /// Returns true if the instance contains a valid object
+    operator bool() const { return state_ != DiscordObjectState::Invalid; }
+
+    /// Copy constructor for AuthorizationCodeVerifier
+    AuthorizationCodeVerifier(const AuthorizationCodeVerifier& arg0);
+    /// Copy assignment operator for AuthorizationCodeVerifier
+    AuthorizationCodeVerifier& operator=(const AuthorizationCodeVerifier& arg0);
+
+    /// \cond
+    void Drop();
+    /// \endcond
+
+    /// \brief The challenge part of the code verification flow.
+    discordpp::AuthorizationCodeChallenge Challenge() const;
+    /// Setter for AuthorizationCodeVerifier::Challenge.
+    void SetChallenge(discordpp::AuthorizationCodeChallenge Challenge);
+
+    /// \brief The verifier part of the code verification flow.
+    std::string Verifier() const;
+    /// Setter for AuthorizationCodeVerifier::Verifier.
+    void SetVerifier(std::string Verifier);
+};
+
+/// \brief Arguments to the Client::Authorize function.
+class AuthorizationArgs {
+    /// \cond
+    mutable Discord_AuthorizationArgs instance_{};
+    DiscordObjectState state_ = DiscordObjectState::Invalid;
+    /// \endcond
+
+public:
+    /// \cond
+    Discord_AuthorizationArgs* instance() const { return &instance_; }
+    /// \endcond
+    /// \cond
+    explicit AuthorizationArgs(Discord_AuthorizationArgs instance, DiscordObjectState state);
+    ~AuthorizationArgs();
+    /// \endcond
+    /// Move constructor for AuthorizationArgs
+    AuthorizationArgs(AuthorizationArgs&& other) noexcept;
+    /// Move assignment operator for AuthorizationArgs
+    AuthorizationArgs& operator=(AuthorizationArgs&& other) noexcept;
+    /// Uninitialized instance of AuthorizationArgs
+    static const AuthorizationArgs nullobj;
+    /// Returns true if the instance contains a valid object
+    operator bool() const { return state_ != DiscordObjectState::Invalid; }
+
+    /// Copy constructor for AuthorizationArgs
+    AuthorizationArgs(const AuthorizationArgs& arg0);
+    /// Copy assignment operator for AuthorizationArgs
+    AuthorizationArgs& operator=(const AuthorizationArgs& arg0);
+
+    explicit AuthorizationArgs();
+
+    /// \cond
+    void Drop();
+    /// \endcond
+
+    /// \brief Optional. The Discord application ID for your game. Defaults to the value set by
+    /// Client::SetApplicationId.
+    uint64_t ClientId() const;
+    /// Setter for AuthorizationArgs::ClientId.
+    void SetClientId(uint64_t ClientId);
+
+    /// \brief Scopes is a space separated string of the oauth scopes your game is requesting.
+    ///
+    /// Most games should just pass in Client::GetDefaultCommunicationScopes or
+    /// Client::GetDefaultPresenceScopes which will include these scopes, respectively:
+    /// `openid sdk.social_layer` or `openid sdk.social_layer_presence`
+    ///
+    /// `sdk.social_layer` and `sdk.social_layer_presence` automatically expand to include all the
+    /// necessary scopes for the integration.
+    ///
+    /// You can pass in additional scopes if you need to, but as a general rule you should only
+    /// request the scopes you actually need, and the user will need to grant access to those
+    /// additional scopes as well.
+    std::string Scopes() const;
+    /// Setter for AuthorizationArgs::Scopes.
+    void SetScopes(std::string Scopes);
+
+    /// \brief See https://discord.com/developers/docs/topics/oauth2#state-and-security for details
+    /// on this field.
+    ///
+    /// We recommend leaving this unset, and the SDK will automatically generate a secure
+    /// random value for you.
+    std::optional<std::string> State() const;
+    /// Setter for AuthorizationArgs::State.
+    void SetState(std::optional<std::string> State);
+
+    /// \brief The nonce field is generally only useful for backend integrations using ID tokens.
+    ///
+    /// For more information, see:
+    /// https://openid.net/specs/openid-connect-core-1_0.html#rfc.section.2~nonce:~:text=auth_time%20response%20parameter.)-,nonce,-String%20value%20used
+    std::optional<std::string> Nonce() const;
+    /// Setter for AuthorizationArgs::Nonce.
+    void SetNonce(std::optional<std::string> Nonce);
+
+    /// \brief If using the Client::GetToken flow, you will need to generate a code challenge and
+    /// verifier.
+    ///
+    /// Use Client::CreateAuthorizationCodeVerifier to generate these values and pass the challenge
+    /// property here.
+    std::optional<discordpp::AuthorizationCodeChallenge> CodeChallenge() const;
+    /// Setter for AuthorizationArgs::CodeChallenge.
+    void SetCodeChallenge(std::optional<discordpp::AuthorizationCodeChallenge> CodeChallenge);
+
+    /// \brief The type of integration the app will be installed as.
+    ///
+    /// https://discord.com/developers/docs/resources/application#installation-context
+    std::optional<discordpp::IntegrationType> IntegrationType() const;
+    /// Setter for AuthorizationArgs::IntegrationType.
+    void SetIntegrationType(std::optional<discordpp::IntegrationType> IntegrationType);
+
+    /// \brief Custom URI scheme for mobile redirects.
+    ///
+    /// This allows games to specify a completely custom URI scheme for OAuth redirects.
+    /// For example, setting this to "mygame" will result in a URI scheme like:
+    /// mygame:/authorize/callback
+    ///
+    /// If not provided, defaults to the standard Discord format:
+    /// discord-123456789:/authorize/callback
+    ///
+    /// This is particularly useful for distinguishing between multiple games from the same
+    /// developer or for avoiding conflicts with other apps.
+    std::optional<std::string> CustomSchemeParam() const;
+    /// Setter for AuthorizationArgs::CustomSchemeParam.
+    void SetCustomSchemeParam(std::optional<std::string> CustomSchemeParam);
+};
+
+/// \brief Arguments to the Client::GetTokenFromDevice function.
+class DeviceAuthorizationArgs {
+    /// \cond
+    mutable Discord_DeviceAuthorizationArgs instance_{};
+    DiscordObjectState state_ = DiscordObjectState::Invalid;
+    /// \endcond
+
+public:
+    /// \cond
+    Discord_DeviceAuthorizationArgs* instance() const { return &instance_; }
+    /// \endcond
+    /// \cond
+    explicit DeviceAuthorizationArgs(Discord_DeviceAuthorizationArgs instance,
+                                     DiscordObjectState state);
+    ~DeviceAuthorizationArgs();
+    /// \endcond
+    /// Move constructor for DeviceAuthorizationArgs
+    DeviceAuthorizationArgs(DeviceAuthorizationArgs&& other) noexcept;
+    /// Move assignment operator for DeviceAuthorizationArgs
+    DeviceAuthorizationArgs& operator=(DeviceAuthorizationArgs&& other) noexcept;
+    /// Uninitialized instance of DeviceAuthorizationArgs
+    static const DeviceAuthorizationArgs nullobj;
+    /// Returns true if the instance contains a valid object
+    operator bool() const { return state_ != DiscordObjectState::Invalid; }
+
+    /// Copy constructor for DeviceAuthorizationArgs
+    DeviceAuthorizationArgs(const DeviceAuthorizationArgs& arg0);
+    /// Copy assignment operator for DeviceAuthorizationArgs
+    DeviceAuthorizationArgs& operator=(const DeviceAuthorizationArgs& arg0);
+
+    explicit DeviceAuthorizationArgs();
+
+    /// \cond
+    void Drop();
+    /// \endcond
+
+    /// \brief Optional. The Discord application ID for your game. Defaults to the value set by
+    /// Client::SetApplicationId.
+    uint64_t ClientId() const;
+    /// Setter for DeviceAuthorizationArgs::ClientId.
+    void SetClientId(uint64_t ClientId);
+
+    /// \brief Scopes is a space separated string of the oauth scopes your game is requesting.
+    ///
+    /// Most games should just pass in Client::GetDefaultCommunicationScopes or
+    /// Client::GetDefaultPresenceScopes which will include these scopes, respectively:
+    /// `openid sdk.social_layer` or `openid sdk.social_layer_presence`
+    ///
+    /// `sdk.social_layer` and `sdk.social_layer_presence` automatically expand to include all the
+    /// necessary scopes for the integration.
+    ///
+    /// You can pass in additional scopes if you need to, but as a general rule you should only
+    /// request the scopes you actually need, and the user will need to grant access to those
+    /// additional scopes as well.
+    std::string Scopes() const;
+    /// Setter for DeviceAuthorizationArgs::Scopes.
+    void SetScopes(std::string Scopes);
+};
+
+/// \brief A VoiceStateHandle represents the state of a single participant in a Discord voice call.
+///
+/// The main use case for VoiceStateHandle in the SDK is communicate whether a user has muted or
+/// defeaned themselves.
+///
+/// Handle objects in the SDK hold a reference both to the underlying data, and to the SDK instance.
+/// Changes to the underlying data will generally be available on existing handles objects without
+/// having to re-create them. If the SDK instance is destroyed, but you still have a reference to a
+/// handle object, note that it will return the default value for all method calls (ie an empty
+/// string for methods that return a string).
+class VoiceStateHandle {
+    /// \cond
+    mutable Discord_VoiceStateHandle instance_{};
+    DiscordObjectState state_ = DiscordObjectState::Invalid;
+    /// \endcond
+
+public:
+    /// \cond
+    Discord_VoiceStateHandle* instance() const { return &instance_; }
+    /// \endcond
+    /// \cond
+    explicit VoiceStateHandle(Discord_VoiceStateHandle instance, DiscordObjectState state);
+    ~VoiceStateHandle();
+    /// \endcond
+    /// Move constructor for VoiceStateHandle
+    VoiceStateHandle(VoiceStateHandle&& other) noexcept;
+    /// Move assignment operator for VoiceStateHandle
+    VoiceStateHandle& operator=(VoiceStateHandle&& other) noexcept;
+    /// Uninitialized instance of VoiceStateHandle
+    static const VoiceStateHandle nullobj;
+    /// Returns true if the instance contains a valid object
+    operator bool() const { return state_ != DiscordObjectState::Invalid; }
+
+    /// Copy constructor for VoiceStateHandle
+    VoiceStateHandle(const VoiceStateHandle& other);
+    /// Copy assignment operator for VoiceStateHandle
+    VoiceStateHandle& operator=(const VoiceStateHandle& other);
+
+    /// \cond
+    void Drop();
+    /// \endcond
+
+    /// \brief Returns true if the given user has deafened themselves so that no one else in the
+    /// call can hear them and so that they do not hear anyone else in the call either.
+    bool SelfDeaf() const;
+
+    /// \brief Returns true if the given user has muted themselves so that no one else in the call
+    /// can hear them.
+    bool SelfMute() const;
+};
+
+/// \brief Settings for the void auto detection threshold for picking up activity from a user's mic.
+class VADThresholdSettings {
+    /// \cond
+    mutable Discord_VADThresholdSettings instance_{};
+    DiscordObjectState state_ = DiscordObjectState::Invalid;
+    /// \endcond
+
+public:
+    /// \cond
+    Discord_VADThresholdSettings* instance() const { return &instance_; }
+    /// \endcond
+    /// \cond
+    explicit VADThresholdSettings(Discord_VADThresholdSettings instance, DiscordObjectState state);
+    ~VADThresholdSettings();
+    /// \endcond
+    /// Move constructor for VADThresholdSettings
+    VADThresholdSettings(VADThresholdSettings&& other) noexcept;
+    /// Move assignment operator for VADThresholdSettings
+    VADThresholdSettings& operator=(VADThresholdSettings&& other) noexcept;
+    /// Uninitialized instance of VADThresholdSettings
+    static const VADThresholdSettings nullobj;
+    /// Returns true if the instance contains a valid object
+    operator bool() const { return state_ != DiscordObjectState::Invalid; }
+
+    VADThresholdSettings(const VADThresholdSettings&) = delete;
+    VADThresholdSettings& operator=(const VADThresholdSettings&) = delete;
+
+    /// \cond
+    void Drop();
+    /// \endcond
+
+    /// \brief The current void auto detection threshold value, has a range of -100, 0 and defaults
+    /// to -60.
+    float VadThreshold() const;
+    /// Setter for VADThresholdSettings::VadThreshold.
+    void SetVadThreshold(float VadThreshold);
+
+    /// \brief Whether or not Discord is currently automatically setting and detecting the
+    /// appropriate threshold to use.
+    bool Automatic() const;
+    /// Setter for VADThresholdSettings::Automatic.
+    void SetAutomatic(bool Automatic);
+};
+
+/// \brief Class that manages an active voice session in a Lobby.
+class Call {
+    /// \cond
+    mutable Discord_Call instance_{};
+    DiscordObjectState state_ = DiscordObjectState::Invalid;
+    /// \endcond
+
+public:
+    /// \brief Enum that represents any network errors with the Call.
+    enum class Error {
+
+        /// \brief None
+        None = 0,
+
+        /// \brief SignalingConnectionFailed
+        SignalingConnectionFailed = 1,
+
+        /// \brief SignalingUnexpectedClose
+        SignalingUnexpectedClose = 2,
+
+        /// \brief VoiceConnectionFailed
+        VoiceConnectionFailed = 3,
+
+        /// \brief JoinTimeout
+        JoinTimeout = 4,
+
+        /// \brief Forbidden
+        Forbidden = 5,
+    };
+
+    /// \brief Enum that respresents the state of the Call's network connection.
+    enum class Status {
+
+        /// \brief Disconnected
+        Disconnected = 0,
+
+        /// \brief Joining
+        Joining = 1,
+
+        /// \brief Connecting
+        Connecting = 2,
+
+        /// \brief SignalingConnected
+        SignalingConnected = 3,
+
+        /// \brief Connected
+        Connected = 4,
+
+        /// \brief Reconnecting
+        Reconnecting = 5,
+
+        /// \brief Disconnecting
+        Disconnecting = 6,
+    };
+
+    /// \brief Callback function for Call::SetOnVoiceStateChangedCallback.
+    using OnVoiceStateChanged = std::function<void(uint64_t userId)>;
+
+    /// \brief Callback function for Call::SetParticipantChangedCallback.
+    using OnParticipantChanged = std::function<void(uint64_t userId, bool added)>;
+
+    /// \brief Callback function for Call::SetSpeakingStatusChangedCallback.
+    using OnSpeakingStatusChanged = std::function<void(uint64_t userId, bool isPlayingSound)>;
+
+    /// \brief Callback function for Call::SetStatusChangedCallback.
+    using OnStatusChanged = std::function<
+      void(discordpp::Call::Status status, discordpp::Call::Error error, int32_t errorDetail)>;
+    /// \cond
+    Discord_Call* instance() const { return &instance_; }
+    /// \endcond
+    /// \cond
+    explicit Call(Discord_Call instance, DiscordObjectState state);
+    ~Call();
+    /// \endcond
+    /// Move constructor for Call
+    Call(Call&& other) noexcept;
+    /// Move assignment operator for Call
+    Call& operator=(Call&& other) noexcept;
+    /// Uninitialized instance of Call
+    static const Call nullobj;
+    /// Returns true if the instance contains a valid object
+    operator bool() const { return state_ != DiscordObjectState::Invalid; }
+
+    /// Copy constructor for Call
+    Call(const Call& other);
+    /// Copy assignment operator for Call
+    Call& operator=(const Call& other);
+
+    /// \cond
+    void Drop();
+    /// \endcond
+
+    /// \brief Converts the Error enum to a string.
+    static std::string ErrorToString(discordpp::Call::Error type);
+
+    /// \brief Returns whether the call is configured to use voice auto detection or push to talk
+    /// for the current user.
+    discordpp::AudioModeType GetAudioMode();
+
+    /// \brief Returns the ID of the lobby with which this call is associated.
+    uint64_t GetChannelId() const;
+
+    /// \brief Returns the ID of the lobby with which this call is associated.
+    uint64_t GetGuildId() const;
+
+    /// \brief Returns whether the current user has locally muted the given userId for themselves.
+    bool GetLocalMute(uint64_t userId);
+
+    /// \brief Returns a list of all of the user IDs of the participants in the call.
+    std::vector<uint64_t> GetParticipants() const;
+
+    /// \brief Returns the locally set playout volume of the given userId.
+    ///
+    /// Does not affect the volume of this user for any other connected clients. The range of volume
+    /// is [0, 200], where 100 indicate default audio volume of the playback device.
+    float GetParticipantVolume(uint64_t userId);
+
+    /// \brief Returns whether push to talk is currently active, meaning the user is currently
+    /// pressing their configured push to talk key.
+    bool GetPTTActive();
+
+    /// \brief Returns the time that PTT is active after the user releases the PTT key and
+    /// SetPTTActive(false) is called.
+    uint32_t GetPTTReleaseDelay();
+
+    /// \brief Returns whether the current user is deafened.
+    bool GetSelfDeaf();
+
+    /// \brief Returns whether the current user's microphone is muted.
+    bool GetSelfMute();
+
+    /// \brief Returns the current call status.
+    ///
+    /// A call is not ready to be used until the status changes to "Connected".
+    discordpp::Call::Status GetStatus() const;
+
+    /// \brief Returns the current configuration for void auto detection thresholds. See the
+    /// description of the VADThreshold struct for specifics.
+    discordpp::VADThresholdSettings GetVADThreshold() const;
+
+    /// \brief Returns a reference to the VoiceStateHandle for the user ID of the given call
+    /// participant.
+    ///
+    /// The VoiceStateHandle allows other users to know if the target user has muted or deafened
+    /// themselves.
+    std::optional<discordpp::VoiceStateHandle> GetVoiceStateHandle(uint64_t userId) const;
+
+    /// \brief Sets whether to use voice auto detection or push to talk for the current user on this
+    /// call.
+    ///
+    /// If using push to talk you should call SetPTTActive() whenever the user presses their
+    /// configured push to talk key.
+    void SetAudioMode(discordpp::AudioModeType audioMode);
+
+    /// \brief Locally mutes the given userId, so that the current user cannot hear them anymore.
+    ///
+    /// Does not affect whether the given user is muted for any other connected clients.
+    void SetLocalMute(uint64_t userId, bool mute);
+
+    /// \brief Sets a callback function to generally be invoked whenever a field on a
+    /// VoiceStateHandle object for a user would have changed.
+    ///
+    /// For example when a user mutes themselves, all other connected clients will invoke the
+    /// VoiceStateChanged callback, because the "self mute" field will be true now. The callback is
+    /// generally not invoked when users join or leave channels.
+    void SetOnVoiceStateChangedCallback(discordpp::Call::OnVoiceStateChanged cb);
+
+    /// \brief Sets a callback function to be invoked whenever some joins or leaves a voice call.
+    void SetParticipantChangedCallback(discordpp::Call::OnParticipantChanged cb);
+
+    /// \brief Locally changes the playout volume of the given userId.
+    ///
+    /// Does not affect the volume of this user for any other connected clients. The range of volume
+    /// is [0, 200], where 100 indicate default audio volume of the playback device.
+    void SetParticipantVolume(uint64_t userId, float volume);
+
+    /// \brief When push to talk is enabled, this should be called whenever the user pushes or
+    /// releases their configured push to talk key. This key must be configured in the game, the SDK
+    /// does not handle keybinds itself.
+    void SetPTTActive(bool active);
+
+    /// \brief If set, extends the time that PTT is active after the user releases the PTT key and
+    /// SetPTTActive(false) is called.
+    ///
+    /// Defaults to no release delay, but we recommend setting to 20ms, which is what Discord uses.
+    void SetPTTReleaseDelay(uint32_t releaseDelayMs);
+
+    /// \brief Mutes all audio from the currently active call for the current user.
+    /// They will not be able to hear any other participants,
+    /// and no other participants will be able to hear the current user either.
+    void SetSelfDeaf(bool deaf);
+
+    /// \brief Mutes the current user's microphone so that no other participant in their active
+    /// calls can hear them.
+    void SetSelfMute(bool mute);
+
+    /// \brief Sets a callback function to be invoked whenever a user starts or stops speaking and
+    /// is passed in the userId and whether they are currently speaking.
+    ///
+    /// It can be invoked in other cases as well, such as if the priority speaker changes or if the
+    /// user plays a soundboard sound.
+    void SetSpeakingStatusChangedCallback(discordpp::Call::OnSpeakingStatusChanged cb);
+
+    /// \brief Sets a callback function to be invoked when the call status changes, such as when it
+    /// fully connects or starts reconnecting.
+    void SetStatusChangedCallback(discordpp::Call::OnStatusChanged cb);
+
+    /// \brief Customizes the void auto detection thresholds for picking up activity from a user's
+    /// mic.
+    /// - When automatic is set to True, Discord will automatically detect the appropriate threshold
+    /// to use.
+    /// - When automatic is set to False, the given threshold value will be used. Threshold has a
+    /// range of -100, 0, and defaults to -60.
+    void SetVADThreshold(bool automatic, float threshold);
+
+    /// \brief Converts the Status enum to a string.
+    static std::string StatusToString(discordpp::Call::Status type);
+};
+
+/// \brief All messages sent on Discord are done so in a Channel. MessageHandle::ChannelId will
+/// contain the ID of the channel a message was sent in, and Client::GetChannelHandle will return an
+/// instance of this class.
+///
+/// Handle objects in the SDK hold a reference both to the underlying data, and to the SDK instance.
+/// Changes to the underlying data will generally be available on existing handles objects without
+/// having to re-create them. If the SDK instance is destroyed, but you still have a reference to a
+/// handle object, note that it will return the default value for all method calls (ie an empty
+/// string for methods that return a string).
+class ChannelHandle {
+    /// \cond
+    mutable Discord_ChannelHandle instance_{};
+    DiscordObjectState state_ = DiscordObjectState::Invalid;
+    /// \endcond
+
+public:
+    /// \cond
+    Discord_ChannelHandle* instance() const { return &instance_; }
+    /// \endcond
+    /// \cond
+    explicit ChannelHandle(Discord_ChannelHandle instance, DiscordObjectState state);
+    ~ChannelHandle();
+    /// \endcond
+    /// Move constructor for ChannelHandle
+    ChannelHandle(ChannelHandle&& other) noexcept;
+    /// Move assignment operator for ChannelHandle
+    ChannelHandle& operator=(ChannelHandle&& other) noexcept;
+    /// Uninitialized instance of ChannelHandle
+    static const ChannelHandle nullobj;
+    /// Returns true if the instance contains a valid object
+    operator bool() const { return state_ != DiscordObjectState::Invalid; }
+
+    /// Copy constructor for ChannelHandle
+    ChannelHandle(const ChannelHandle& other);
+    /// Copy assignment operator for ChannelHandle
+    ChannelHandle& operator=(const ChannelHandle& other);
+
+    /// \cond
+    void Drop();
+    /// \endcond
+
+    /// \brief Returns the ID of the channel.
+    uint64_t Id() const;
+
+    /// \brief Returns the name of the channel.
+    ///
+    /// Generally only channels in servers have names, although Discord may generate a display name
+    /// for some channels as well.
+    std::string Name() const;
+
+    /// \brief For DMs and GroupDMs, returns the user IDs of the members of the channel.
+    /// For all other channels returns an empty list.
+    std::vector<uint64_t> Recipients() const;
+
+    /// \brief Returns the type of the channel.
+    discordpp::ChannelType Type() const;
+};
+
+/// \brief Represents a guild (also knowns as a Discord server), that the current user is a member
+/// of, that contains channels that can be linked to a lobby.
+class GuildMinimal {
+    /// \cond
+    mutable Discord_GuildMinimal instance_{};
+    DiscordObjectState state_ = DiscordObjectState::Invalid;
+    /// \endcond
+
+public:
+    /// \cond
+    Discord_GuildMinimal* instance() const { return &instance_; }
+    /// \endcond
+    /// \cond
+    explicit GuildMinimal(Discord_GuildMinimal instance, DiscordObjectState state);
+    ~GuildMinimal();
+    /// \endcond
+    /// Move constructor for GuildMinimal
+    GuildMinimal(GuildMinimal&& other) noexcept;
+    /// Move assignment operator for GuildMinimal
+    GuildMinimal& operator=(GuildMinimal&& other) noexcept;
+    /// Uninitialized instance of GuildMinimal
+    static const GuildMinimal nullobj;
+    /// Returns true if the instance contains a valid object
+    operator bool() const { return state_ != DiscordObjectState::Invalid; }
+
+    /// Copy constructor for GuildMinimal
+    GuildMinimal(const GuildMinimal& arg0);
+    /// Copy assignment operator for GuildMinimal
+    GuildMinimal& operator=(const GuildMinimal& arg0);
+
+    /// \cond
+    void Drop();
+    /// \endcond
+
+    /// \brief The id of the guild.
+    uint64_t Id() const;
+    /// Setter for GuildMinimal::Id.
+    void SetId(uint64_t Id);
+
+    /// \brief The name of the guild.
+    std::string Name() const;
+    /// Setter for GuildMinimal::Name.
+    void SetName(std::string Name);
+};
+
+/// \brief Represents a channel in a guild that the current user is a member of and may be able to
+/// be linked to a lobby.
+class GuildChannel {
+    /// \cond
+    mutable Discord_GuildChannel instance_{};
+    DiscordObjectState state_ = DiscordObjectState::Invalid;
+    /// \endcond
+
+public:
+    /// \cond
+    Discord_GuildChannel* instance() const { return &instance_; }
+    /// \endcond
+    /// \cond
+    explicit GuildChannel(Discord_GuildChannel instance, DiscordObjectState state);
+    ~GuildChannel();
+    /// \endcond
+    /// Move constructor for GuildChannel
+    GuildChannel(GuildChannel&& other) noexcept;
+    /// Move assignment operator for GuildChannel
+    GuildChannel& operator=(GuildChannel&& other) noexcept;
+    /// Uninitialized instance of GuildChannel
+    static const GuildChannel nullobj;
+    /// Returns true if the instance contains a valid object
+    operator bool() const { return state_ != DiscordObjectState::Invalid; }
+
+    /// Copy constructor for GuildChannel
+    GuildChannel(const GuildChannel& arg0);
+    /// Copy assignment operator for GuildChannel
+    GuildChannel& operator=(const GuildChannel& arg0);
+
+    /// \cond
+    void Drop();
+    /// \endcond
+
+    /// \brief The id of the channel.
+    uint64_t Id() const;
+    /// Setter for GuildChannel::Id.
+    void SetId(uint64_t Id);
+
+    /// \brief The name of the channel.
+    std::string Name() const;
+    /// Setter for GuildChannel::Name.
+    void SetName(std::string Name);
+
+    /// \brief The type of the channel.
+    discordpp::ChannelType Type() const;
+    /// Setter for GuildChannel::Type.
+    void SetType(discordpp::ChannelType Type);
+
+    /// \brief The position of the channel in the guild's channel list.
+    int32_t Position() const;
+    /// Setter for GuildChannel::Position.
+    void SetPosition(int32_t Position);
+
+    /// \brief The id of the parent category channel, if any.
+    std::optional<uint64_t> ParentId() const;
+    /// Setter for GuildChannel::ParentId.
+    void SetParentId(std::optional<uint64_t> ParentId);
+
+    /// \brief Whether the current user is able to link this channel to a lobby.
+    ///
+    /// For this to be true:
+    /// - The channel must be a guild text channel
+    /// - The channel may not be marked as NSFW
+    /// - The channel must not be currently linked to a different lobby
+    /// - The user must have the following permissions in the channel in order to link it:
+    ///   - Manage Channels
+    ///   - View Channel
+    ///   - Send Messages
+    bool IsLinkable() const;
+    /// Setter for GuildChannel::IsLinkable.
+    void SetIsLinkable(bool IsLinkable);
+
+    /// \brief Whether the channel is "fully public" which means every member of the guild is able
+    /// to view and send messages in that channel.
+    ///
+    /// Discord allows lobbies to be linked to private channels
+    /// in a server, which enables things like a private admin chat.
+    ///
+    /// However there is no permission synchronization between the game and Discord, so it is the
+    /// responsibility of the game to restrict access to the lobby. Every member of the lobby will
+    /// be able to view and send messages in the lobby/channel, regardless of whether that user
+    /// would have permission to do so in Discord.
+    ///
+    /// This may be more complexity than a game wants to take on, so instead you can only allow
+    /// linking of channels that are fully public in the server so there is no confusion.
+    bool IsViewableAndWriteableByAllMembers() const;
+    /// Setter for GuildChannel::IsViewableAndWriteableByAllMembers.
+    void SetIsViewableAndWriteableByAllMembers(bool IsViewableAndWriteableByAllMembers);
+
+    /// \brief Information about the currently linked lobby, if any.
+    /// Currently Discord enforces that a channel can only be linked to a single lobby.
+    std::optional<discordpp::LinkedLobby> LinkedLobby() const;
+    /// Setter for GuildChannel::LinkedLobby.
+    void SetLinkedLobby(std::optional<discordpp::LinkedLobby> LinkedLobby);
+};
+
+/// \brief Struct that stores information about the lobby linked to a channel.
+class LinkedLobby {
+    /// \cond
+    mutable Discord_LinkedLobby instance_{};
+    DiscordObjectState state_ = DiscordObjectState::Invalid;
+    /// \endcond
+
+public:
+    /// \cond
+    Discord_LinkedLobby* instance() const { return &instance_; }
+    /// \endcond
+    /// \cond
+    explicit LinkedLobby(Discord_LinkedLobby instance, DiscordObjectState state);
+    ~LinkedLobby();
+    /// \endcond
+    /// Move constructor for LinkedLobby
+    LinkedLobby(LinkedLobby&& other) noexcept;
+    /// Move assignment operator for LinkedLobby
+    LinkedLobby& operator=(LinkedLobby&& other) noexcept;
+    /// Uninitialized instance of LinkedLobby
+    static const LinkedLobby nullobj;
+    /// Returns true if the instance contains a valid object
+    operator bool() const { return state_ != DiscordObjectState::Invalid; }
+
+    /// Copy constructor for LinkedLobby
+    LinkedLobby(const LinkedLobby& arg0);
+    /// Copy assignment operator for LinkedLobby
+    LinkedLobby& operator=(const LinkedLobby& arg0);
+
+    explicit LinkedLobby();
+
+    /// \cond
+    void Drop();
+    /// \endcond
+
+    /// \brief The ID of the application that owns the lobby.
+    uint64_t ApplicationId() const;
+    /// Setter for LinkedLobby::ApplicationId.
+    void SetApplicationId(uint64_t ApplicationId);
+
+    /// \brief The ID of the lobby.
+    uint64_t LobbyId() const;
+    /// Setter for LinkedLobby::LobbyId.
+    void SetLobbyId(uint64_t LobbyId);
+};
+
+/// \brief Struct that stores information about the channel that a lobby is linked to.
+class LinkedChannel {
+    /// \cond
+    mutable Discord_LinkedChannel instance_{};
+    DiscordObjectState state_ = DiscordObjectState::Invalid;
+    /// \endcond
+
+public:
+    /// \cond
+    Discord_LinkedChannel* instance() const { return &instance_; }
+    /// \endcond
+    /// \cond
+    explicit LinkedChannel(Discord_LinkedChannel instance, DiscordObjectState state);
+    ~LinkedChannel();
+    /// \endcond
+    /// Move constructor for LinkedChannel
+    LinkedChannel(LinkedChannel&& other) noexcept;
+    /// Move assignment operator for LinkedChannel
+    LinkedChannel& operator=(LinkedChannel&& other) noexcept;
+    /// Uninitialized instance of LinkedChannel
+    static const LinkedChannel nullobj;
+    /// Returns true if the instance contains a valid object
+    operator bool() const { return state_ != DiscordObjectState::Invalid; }
+
+    /// Copy constructor for LinkedChannel
+    LinkedChannel(const LinkedChannel& arg0);
+    /// Copy assignment operator for LinkedChannel
+    LinkedChannel& operator=(const LinkedChannel& arg0);
+
+    /// \cond
+    void Drop();
+    /// \endcond
+
+    /// \brief The id of the linked channel.
+    uint64_t Id() const;
+    /// Setter for LinkedChannel::Id.
+    void SetId(uint64_t Id);
+
+    /// \brief The name of the linked channel.
+    std::string Name() const;
+    /// Setter for LinkedChannel::Name.
+    void SetName(std::string Name);
+
+    /// \brief The id of the guild (aka server) that owns the linked channel.
+    uint64_t GuildId() const;
+    /// Setter for LinkedChannel::GuildId.
+    void SetGuildId(uint64_t GuildId);
+};
+
+/// \brief A RelationshipHandle represents the relationship between the current user and a target
+/// user on Discord. Relationships include friends, blocked users, and friend invites.
+///
+/// The SDK supports two types of relationships:
+/// - Discord: These are relationships that persist across games and on the Discord client.
+/// Both users will be able to see whether each other is online regardless of whether they are in
+/// the same game or not.
+/// - Game: These are per-game relationships and do not carry over to other games. The two users
+/// will only be able to see if the other is online if they are playing a game in which they are
+/// friends.
+///
+/// If someone is a game friend they can later choose to "upgrade" to a full Discord friend. In this
+/// case, the user has two relationships at the same time, which is why there are two different type
+/// fields on RelationshipHandle. In this example, their RelationshipHandle::DiscordRelationshipType
+/// would be set to RelationshipType::PendingIncoming or RelationshipType::PendingOutgoing (based on
+/// whether they are receiving or sending the invite respectively), and their
+/// RelationshipHandle::GameRelationshipType would remain as RelationshipType::Friend.
+///
+/// When a user blocks another user, it is always stored on the
+/// RelationshipHandle::DiscordRelationshipType field, and will persist across games. It is not
+/// possible to block a user in only one game.
+///
+/// See the @ref friends documentation for more information.
+///
+/// Note: While the SDK allows you to manage a user's relationships, you should never take an action
+/// without their explicit consent. You should not automatically send or accept friend requests.
+/// Only invoke APIs to manage relationships in response to a user action such as clicking a "Send
+/// Friend Request" button.
+///
+/// Handle objects in the SDK hold a reference both to the underlying data, and to the SDK instance.
+/// Changes to the underlying data will generally be available on existing handles objects without
+/// having to re-create them. If the SDK instance is destroyed, but you still have a reference to a
+/// handle object, note that it will return the default value for all method calls (ie an empty
+/// string for methods that return a string).
+class RelationshipHandle {
+    /// \cond
+    mutable Discord_RelationshipHandle instance_{};
+    DiscordObjectState state_ = DiscordObjectState::Invalid;
+    /// \endcond
+
+public:
+    /// \cond
+    Discord_RelationshipHandle* instance() const { return &instance_; }
+    /// \endcond
+    /// \cond
+    explicit RelationshipHandle(Discord_RelationshipHandle instance, DiscordObjectState state);
+    ~RelationshipHandle();
+    /// \endcond
+    /// Move constructor for RelationshipHandle
+    RelationshipHandle(RelationshipHandle&& other) noexcept;
+    /// Move assignment operator for RelationshipHandle
+    RelationshipHandle& operator=(RelationshipHandle&& other) noexcept;
+    /// Uninitialized instance of RelationshipHandle
+    static const RelationshipHandle nullobj;
+    /// Returns true if the instance contains a valid object
+    operator bool() const { return state_ != DiscordObjectState::Invalid; }
+
+    /// Copy constructor for RelationshipHandle
+    RelationshipHandle(const RelationshipHandle& other);
+    /// Copy assignment operator for RelationshipHandle
+    RelationshipHandle& operator=(const RelationshipHandle& other);
+
+    /// \cond
+    void Drop();
+    /// \endcond
+
+    /// \brief Returns the type of the Discord relationship.
+    discordpp::RelationshipType DiscordRelationshipType() const;
+
+    /// \brief Returns the type of the Game relationship.
+    discordpp::RelationshipType GameRelationshipType() const;
+
+    /// \brief Returns the ID of the target user in this relationship.
+    uint64_t Id() const;
+
+    /// \brief Returns whether this relationship is a spam request.
+    bool IsSpamRequest() const;
+
+    /// \brief Returns a handle to the target user in this relationship, if one is available.
+    /// This would be the user with the same ID as the one returned by the Id() method.
+    std::optional<discordpp::UserHandle> User() const;
+};
+
+/// \brief A UserApplicationProfileHandle represents a profile from an external identity provider,
+/// such as Steam or Epic Online Services.
+///
+/// Handle objects in the SDK hold a reference both to the underlying data, and to the SDK instance.
+/// Changes to the underlying data will generally be available on existing handles objects without
+/// having to re-create them. If the SDK instance is destroyed, but you still have a reference to a
+/// handle object, note that it will return the default value for all method calls (ie an empty
+/// string for methods that return a string).
+class UserApplicationProfileHandle {
+    /// \cond
+    mutable Discord_UserApplicationProfileHandle instance_{};
+    DiscordObjectState state_ = DiscordObjectState::Invalid;
+    /// \endcond
+
+public:
+    /// \cond
+    Discord_UserApplicationProfileHandle* instance() const { return &instance_; }
+    /// \endcond
+    /// \cond
+    explicit UserApplicationProfileHandle(Discord_UserApplicationProfileHandle instance,
+                                          DiscordObjectState state);
+    ~UserApplicationProfileHandle();
+    /// \endcond
+    /// Move constructor for UserApplicationProfileHandle
+    UserApplicationProfileHandle(UserApplicationProfileHandle&& other) noexcept;
+    /// Move assignment operator for UserApplicationProfileHandle
+    UserApplicationProfileHandle& operator=(UserApplicationProfileHandle&& other) noexcept;
+    /// Uninitialized instance of UserApplicationProfileHandle
+    static const UserApplicationProfileHandle nullobj;
+    /// Returns true if the instance contains a valid object
+    operator bool() const { return state_ != DiscordObjectState::Invalid; }
+
+    /// Copy constructor for UserApplicationProfileHandle
+    UserApplicationProfileHandle(const UserApplicationProfileHandle& other);
+    /// Copy assignment operator for UserApplicationProfileHandle
+    UserApplicationProfileHandle& operator=(const UserApplicationProfileHandle& other);
+
+    /// \cond
+    void Drop();
+    /// \endcond
+
+    /// \brief Returns the user's in-game avatar hash.
+    std::string AvatarHash() const;
+
+    /// \brief Returns any metadata set by the developer.
+    std::string Metadata() const;
+
+    /// \brief Returns the user's external identity provider ID if it exists.
+    std::optional<std::string> ProviderId() const;
+
+    /// \brief Returns the user's external identity provider issued user ID.
+    std::string ProviderIssuedUserId() const;
+
+    /// \brief Returns the type of the external identity provider.
+    discordpp::ExternalIdentityProviderType ProviderType() const;
+
+    /// \brief Returns the user's in-game username.
+    std::string Username() const;
+};
+
+/// \brief A UserHandle represents a single user on Discord that the SDK knows about and contains
+/// basic account information for them such as id, name, and avatar, as well as their "status"
+/// information which includes both whether they are online/offline/etc as well as whether they are
+/// playing this game.
+///
+/// Handle objects in the SDK hold a reference both to the underlying data, and to the SDK instance.
+/// Changes to the underlying data will generally be available on existing handles objects without
+/// having to re-create them. If the SDK instance is destroyed, but you still have a reference to a
+/// handle object, note that it will return the default value for all method calls (ie an empty
+/// string for methods that return a string).
+class UserHandle {
+    /// \cond
+    mutable Discord_UserHandle instance_{};
+    DiscordObjectState state_ = DiscordObjectState::Invalid;
+    /// \endcond
+
+public:
+    /// \brief The desired type of avatar url to generate for a User.
+    enum class AvatarType {
+
+        /// \brief Gif
+        Gif = 0,
+
+        /// \brief Webp
+        Webp = 1,
+
+        /// \brief Png
+        Png = 2,
+
+        /// \brief Jpeg
+        Jpeg = 3,
+    };
+    /// \cond
+    Discord_UserHandle* instance() const { return &instance_; }
+    /// \endcond
+    /// \cond
+    explicit UserHandle(Discord_UserHandle instance, DiscordObjectState state);
+    ~UserHandle();
+    /// \endcond
+    /// Move constructor for UserHandle
+    UserHandle(UserHandle&& other) noexcept;
+    /// Move assignment operator for UserHandle
+    UserHandle& operator=(UserHandle&& other) noexcept;
+    /// Uninitialized instance of UserHandle
+    static const UserHandle nullobj;
+    /// Returns true if the instance contains a valid object
+    operator bool() const { return state_ != DiscordObjectState::Invalid; }
+
+    /// Copy constructor for UserHandle
+    UserHandle(const UserHandle& arg0);
+    /// Copy assignment operator for UserHandle
+    UserHandle& operator=(const UserHandle& arg0);
+
+    /// \cond
+    void Drop();
+    /// \endcond
+
+    /// \brief Returns the hash of the user's Discord profile avatar, if one is set.
+    std::optional<std::string> Avatar() const;
+
+    /// \brief Converts the AvatarType enum to a string.
+    static std::string AvatarTypeToString(discordpp::UserHandle::AvatarType type);
+
+    /// \brief Returns a CDN url to the user's Discord profile avatar.
+    ///
+    /// If the user does not have an avatar set, a url to one of Discord's default avatars is
+    /// returned instead.
+    std::string AvatarUrl(discordpp::UserHandle::AvatarType animatedType,
+                          discordpp::UserHandle::AvatarType staticType) const;
+
+    /// \brief Returns the user's preferred name, if one is set, otherwise returns their unique
+    /// username.
+    std::string DisplayName() const;
+
+    /// \brief Returns the user's rich presence activity that is associated with the current game,
+    /// if one is set.
+    ///
+    /// On Discord, users can have multiple rich presence activities at once, but the SDK will only
+    /// expose the activity that is associated with your game. You can use this to know about the
+    /// party the user is in, if any, and what the user is doing in the game.
+    ///
+    /// For more information see the Activity class and check out
+    /// https://discord.com/developers/docs/rich-presence/overview
+    std::optional<discordpp::Activity> GameActivity() const;
+
+    /// \brief Returns the preferred display name of this user, if one is set.
+    ///
+    /// Discord's public API refers to this as a "global name" instead of "display name".
+    ///
+    /// Discord users can set their preferred name to almost any string.
+    ///
+    /// For more information about usernames on Discord, see:
+    /// https://discord.com/developers/docs/resources/user
+    std::optional<std::string> GlobalName() const;
+
+    /// \brief Returns the ID of this user.
+    ///
+    /// If this returns 0 then the UserHandle is no longer valid.
+    uint64_t Id() const;
+
+    /// \brief Returns true if this user is a provisional account.
+    bool IsProvisional() const;
+
+    /// \brief Returns a reference to the RelationshipHandle between the currently authenticated
+    /// user and this user, if any.
+    discordpp::RelationshipHandle Relationship() const;
+
+    /// \brief Returns the user's online/offline/idle status.
+    discordpp::StatusType Status() const;
+
+    /// \brief Returns a list of UserApplicationProfileHandles for this user. Currently, a user can
+    /// only have a single profile per application, so this list will always contain at most one
+    /// UserApplicationProfileHandle.
+    std::vector<discordpp::UserApplicationProfileHandle> UserApplicationProfiles() const;
+
+    /// \brief Returns the globally unique username of this user.
+    ///
+    /// For provisional accounts this is an auto-generated string.
+    ///
+    /// For more information about usernames on Discord, see:
+    /// https://discord.com/developers/docs/resources/user
+    std::string Username() const;
+};
+
+/// \brief A LobbyMemberHandle represents the state of a single user in a Lobby.
+///
+/// The SDK separates lobby membership into two concepts:
+/// 1. Has the user been added to the lobby by the game developer?
+/// If the LobbyMemberHandle exists for a user/lobby pair, then the user has been added to the
+/// lobby.
+/// 2. Does the user have an active game session that is connected to the lobby and will receive any
+/// lobby messages? It is possible for a game developer to add a user to a lobby while they are
+/// offline. Also users may temporarily disconnect and rejoin later. So the `Connected` boolean
+/// tells you whether the user is actively connected to the lobby.
+///
+/// Handle objects in the SDK hold a reference both to the underlying data, and to the SDK instance.
+/// Changes to the underlying data will generally be available on existing handles objects without
+/// having to re-create them. If the SDK instance is destroyed, but you still have a reference to a
+/// handle object, note that it will return the default value for all method calls (ie an empty
+/// string for methods that return a string).
+class LobbyMemberHandle {
+    /// \cond
+    mutable Discord_LobbyMemberHandle instance_{};
+    DiscordObjectState state_ = DiscordObjectState::Invalid;
+    /// \endcond
+
+public:
+    /// \cond
+    Discord_LobbyMemberHandle* instance() const { return &instance_; }
+    /// \endcond
+    /// \cond
+    explicit LobbyMemberHandle(Discord_LobbyMemberHandle instance, DiscordObjectState state);
+    ~LobbyMemberHandle();
+    /// \endcond
+    /// Move constructor for LobbyMemberHandle
+    LobbyMemberHandle(LobbyMemberHandle&& other) noexcept;
+    /// Move assignment operator for LobbyMemberHandle
+    LobbyMemberHandle& operator=(LobbyMemberHandle&& other) noexcept;
+    /// Uninitialized instance of LobbyMemberHandle
+    static const LobbyMemberHandle nullobj;
+    /// Returns true if the instance contains a valid object
+    operator bool() const { return state_ != DiscordObjectState::Invalid; }
+
+    /// Copy constructor for LobbyMemberHandle
+    LobbyMemberHandle(const LobbyMemberHandle& other);
+    /// Copy assignment operator for LobbyMemberHandle
+    LobbyMemberHandle& operator=(const LobbyMemberHandle& other);
+
+    /// \cond
+    void Drop();
+    /// \endcond
+
+    /// \brief Returns true if the user is allowed to link a channel to this lobby.
+    ///
+    /// Under the hood this checks if the LobbyMemberFlags::CanLinkLobby flag is set.
+    /// This flag can only be set via the server API, add_lobby_member
+    /// The use case for this is for games that want to restrict a lobby so that only the
+    /// clan/guild/group leader is allowed to manage the linked channel for the lobby.
+    bool CanLinkLobby() const;
+
+    /// \brief Returns true if the user is currently connected to the lobby.
+    bool Connected() const;
+
+    /// \brief The user id of the lobby member.
+    uint64_t Id() const;
+
+    /// \brief Metadata is a set of string key/value pairs that the game developer can use.
+    ///
+    /// A common use case may be to store the game's internal user ID for this user so that every
+    /// member of a lobby knows the discord user ID and the game's internal user ID mapping for each
+    /// user.
+    std::unordered_map<std::string, std::string> Metadata() const;
+
+    /// \brief The UserHandle of the lobby member.
+    std::optional<discordpp::UserHandle> User() const;
+};
+
+/// \brief A LobbyHandle represents a single lobby in the SDK. A lobby can be thought of as
+/// just an arbitrary, developer-controlled group of users that can communicate with each other.
+///
+/// ## Managing Lobbies
+/// Lobbies can be managed through a set of [Server
+/// APIs](https://docs.discord.com/developers/resources/lobby), which allow you to create lobbies,
+/// add and remove users from lobbies, and delete them.
+///
+/// There is also an API to create lobbies without any server side component using the
+/// Client::CreateOrJoinLobby function, which accepts a game-generated secret and will join the user
+/// to the lobby associated with that secret, creating it if necessary.
+///
+/// NOTE: When using this API the secret will auto-expire in 30 days, at which point the existing
+/// lobby can no longer be joined, but will still exist. We recommend using this for short term
+/// lobbies and not permanent lobbies. Use the Server API for more permanent lobbies.
+///
+/// Members of a lobby are not automatically removed when they close the game or temporarily
+/// disconnect. When the SDK connects, it will attempt to re-connect to any lobbies it is currently
+/// a member of.
+///
+/// # Lobby Auto-Deletion
+/// Lobbies are generally ephemeral and will be auto-deleted if they have been idle (meaning no
+/// users are actively connected to them) for some amount of time. The default is to auto delete
+/// after 5 minutes, but this can be customized when creating the lobby. As long as one user is
+/// connected to the lobby though it will not be auto-deleted (meaning they have the SDK running and
+/// status is set to Ready). Additionally, lobbies that are linked to a channel on Discord will not
+/// be auto deleted.
+///
+/// You can also use the [Server APIs](https://docs.discord.com/developers/resources/lobby) to
+/// customize this timeout, it can be raised to as high as 7 days, meaning the lobby only gets
+/// deleted if no one connects to it for an entire week. This should give a good amount of
+/// permanence to lobbies when needed, but there may be rare cases where a lobby does need to be
+/// "rebuilt" if everyone is offline for an extended period.
+///
+/// # Membership Limits
+/// Lobbies may have a maximum of 1,000 members, and each user may be in a maximum of 200 lobbies
+/// per game.
+///
+/// ## Audio
+/// Lobbies support voice calls. Although a lobby is allowed to have 1,000 members, you should not
+/// try to start voice calls in lobbies that large. We strongly recommend sticking to around 25
+/// members or fewer for voice calls.
+///
+/// See Client::StartCall for more information on how to start a voice call in a lobby.
+///
+/// ## Channel Linking
+/// Lobbies can be linked to a channel on Discord, which allows messages sent in one place to show
+/// up in the other. Any lobby can be linked to a channel, but only lobby members with the
+/// LobbyMemberFlags::CanLinkLobby flag are allowed to a link a lobby. This flag must be set using
+/// the server APIs, which allows you to ensure that only clan/guild/group leaders can link lobbies
+/// to Discord channels.
+///
+/// To setup a link you'll need to use methods in the Client class to fetch the servers (aka guilds)
+/// and channels a user is a member of and setup the link. The Client::GetUserGuilds and
+/// Client::GetGuildChannels methods are used to fetch the servers and channels respectively. You
+/// can use these to show a UI for the user to pick which server and channel they want to link to.
+///
+/// Not all channels are linkable. To be linked:
+/// - The channel must be a guild text channel
+/// - The channel may not be marked as NSFW
+/// - The channel must not be currently linked to a different lobby
+/// - The user must have the following permissions in the channel in order to link it:
+///   - Manage Channels
+///   - View Channel
+///   - Send Messages
+///
+/// ### Linking Private Channels
+/// Discord is allowing all channels the user has access to in a server to be linked in game, even
+/// if that channel is private to other members of the server. This means that a user could choose
+/// to link a private "admins chat" channel (assuming they are an admin) in game if they wanted.
+///
+/// It's not really possible for the game to know which users should have access to that channel or
+/// not though. So in this implementation, every member of a lobby will be able to view all messages
+/// sent in the linked channel and reply to them. If you are going to allow private channels to be
+/// linked in game, you must make sure that users are aware that their private channel will be
+/// viewable by everyone in the lobby!
+///
+/// To help you identify which channels are public or private, we have added a
+/// isViewableAndWriteableByAllMembers boolean which is described more in GuildChannel. You can use
+/// that to just not allow private channels to be linked, or to know when to show a clear warning,
+/// it's up to you!
+///
+/// ## Misc
+/// Handle objects in the SDK hold a reference both to the underlying data, and to the SDK instance.
+/// Changes to the underlying data will generally be available on existing handles objects without
+/// having to re-create them. If the SDK instance is destroyed, but you still have a reference to a
+/// handle object, note that it will return the default value for all method calls (ie an empty
+/// string for methods that return a string).
+class LobbyHandle {
+    /// \cond
+    mutable Discord_LobbyHandle instance_{};
+    DiscordObjectState state_ = DiscordObjectState::Invalid;
+    /// \endcond
+
+public:
+    /// \cond
+    Discord_LobbyHandle* instance() const { return &instance_; }
+    /// \endcond
+    /// \cond
+    explicit LobbyHandle(Discord_LobbyHandle instance, DiscordObjectState state);
+    ~LobbyHandle();
+    /// \endcond
+    /// Move constructor for LobbyHandle
+    LobbyHandle(LobbyHandle&& other) noexcept;
+    /// Move assignment operator for LobbyHandle
+    LobbyHandle& operator=(LobbyHandle&& other) noexcept;
+    /// Uninitialized instance of LobbyHandle
+    static const LobbyHandle nullobj;
+    /// Returns true if the instance contains a valid object
+    operator bool() const { return state_ != DiscordObjectState::Invalid; }
+
+    /// Copy constructor for LobbyHandle
+    LobbyHandle(const LobbyHandle& other);
+    /// Copy assignment operator for LobbyHandle
+    LobbyHandle& operator=(const LobbyHandle& other);
+
+    /// \cond
+    void Drop();
+    /// \endcond
+
+    /// \brief Returns a reference to the CallInfoHandle if there is an active voice call in this
+    /// lobby.
+    ///
+    /// This can allow you to display which lobby members are in voice, even if the current user has
+    /// not yet joined the voice call.
+    std::optional<discordpp::CallInfoHandle> GetCallInfoHandle() const;
+
+    /// \brief Returns a reference to the LobbyMemberHandle for the given user ID, if they are a
+    /// member of this lobby.
+    std::optional<discordpp::LobbyMemberHandle> GetLobbyMemberHandle(uint64_t memberId) const;
+
+    /// \brief Returns the id of the lobby.
+    uint64_t Id() const;
+
+    /// \brief Returns information about the channel linked to this lobby, if any.
+    std::optional<discordpp::LinkedChannel> LinkedChannel() const;
+
+    /// \brief Returns a list of the user IDs that are members of this lobby.
+    std::vector<uint64_t> LobbyMemberIds() const;
+
+    /// \brief Returns a list of the LobbyMemberHandle objects for each member of this lobby.
+    std::vector<discordpp::LobbyMemberHandle> LobbyMembers() const;
+
+    /// \brief Returns any developer supplied metadata for this lobby.
+    ///
+    /// Metadata is simple string key/value pairs and is a way to associate internal game
+    /// information with the lobby so each lobby member can have easy access to.
+    std::unordered_map<std::string, std::string> Metadata() const;
+};
+
+/// \brief Contains information about non-text content in a message that likely cannot be rendered
+/// in game such as images, videos, embeds, polls, and more.
+class AdditionalContent {
+    /// \cond
+    mutable Discord_AdditionalContent instance_{};
+    DiscordObjectState state_ = DiscordObjectState::Invalid;
+    /// \endcond
+
+public:
+    /// \cond
+    Discord_AdditionalContent* instance() const { return &instance_; }
+    /// \endcond
+    /// \cond
+    explicit AdditionalContent(Discord_AdditionalContent instance, DiscordObjectState state);
+    ~AdditionalContent();
+    /// \endcond
+    /// Move constructor for AdditionalContent
+    AdditionalContent(AdditionalContent&& other) noexcept;
+    /// Move assignment operator for AdditionalContent
+    AdditionalContent& operator=(AdditionalContent&& other) noexcept;
+    /// Uninitialized instance of AdditionalContent
+    static const AdditionalContent nullobj;
+    /// Returns true if the instance contains a valid object
+    operator bool() const { return state_ != DiscordObjectState::Invalid; }
+
+    /// Copy constructor for AdditionalContent
+    AdditionalContent(const AdditionalContent& arg0);
+    /// Copy assignment operator for AdditionalContent
+    AdditionalContent& operator=(const AdditionalContent& arg0);
+
+    explicit AdditionalContent();
+
+    /// \cond
+    void Drop();
+    /// \endcond
+
+    /// \brief Compares each field of the AdditionalContent struct for equality.
+    bool Equals(discordpp::AdditionalContent rhs) const;
+
+    /// \brief Converts the AdditionalContentType enum to a string.
+    static std::string TypeToString(discordpp::AdditionalContentType type);
+
+    /// \brief Represents the type of additional content in the message.
+    discordpp::AdditionalContentType Type() const;
+    /// Setter for AdditionalContent::Type.
+    void SetType(discordpp::AdditionalContentType Type);
+
+    /// \brief When the additional content is a poll or thread, this field will contain the name of
+    /// the poll or thread.
+    std::optional<std::string> Title() const;
+    /// Setter for AdditionalContent::Title.
+    void SetTitle(std::optional<std::string> Title);
+
+    /// \brief Represents the number of pieces of additional content so you could for example
+    /// renders "2 additional images".
+    uint8_t Count() const;
+    /// Setter for AdditionalContent::Count.
+    void SetCount(uint8_t Count);
+};
+
+/// \brief A MessageHandle represents a single message received by the SDK.
+///
+/// # Chat types
+/// The SDK supports two types of chat:
+/// 1. 1 on 1 chat between two users
+/// 2. Chat within a lobby
+///
+/// You can determine the context a message was sent in with the MessageHandle::Channel and
+/// ChannelHandle::Type methods. The SDK should only be receiving messages in the following channel
+/// types:
+/// - DM
+/// - Ephemeral DM
+/// - Lobby
+///
+/// # Syncing with Discord
+/// In some situations messages sent from the SDK will also show up in Discord.
+/// In general this will happen for:
+/// - 1 on 1 chat when at least one of the users is a full Discord user
+/// - Lobby chat when the lobby is linked to a Discord channel
+///
+/// Additionally the message must have been sent by a user who is not banned on the Discord side.
+///
+/// # Legal disclosures
+/// As a convenience for game developers, the first time a user sends a message in game, and that
+/// message will show up on the Discord client, the SDK will inject a "fake" message into the chat,
+/// that contains a basic English explanation of what is happening to the user. You can identify
+/// these messages with the MessageHandle::DisclosureType method. We encourage you to customize the
+/// rendering of these messages, possibly changing the wording, translating them, and making them
+/// look more "official". You can choose to avoid rendering these as well.
+///
+/// # History
+/// The SDK keeps the 25 most recent messages in each channel in memory, but it does not have access
+/// to any historical messages sent before the SDK was connected. A MessageHandle will keep working
+/// though even after the SDK has discarded the message for being too old, you just won't be able to
+/// create a new MessageHandle objects for that message.
+///
+/// # Unrenderable Content
+/// Messages sent on Discord can contain content that may not be renderable in game, such as images,
+/// videos, embeds, polls, and more. The game isn't expected to render these, but instead show a
+/// small notice so the user is aware there is more content and a way to view that content on
+/// Discord. The MessageHandle::AdditionalContent method will contain data about the non-text
+/// content in this message.
+///
+/// There is also more information about the struct of messages on Discord here:
+/// https://discord.com/developers/docs/resources/message
+///
+/// Note: While the SDK allows you to send messages on behalf of a user, you must only do so in
+/// response to a user action. You should never automatically send messages.
+///
+/// Handle objects in the SDK hold a reference both to the underlying data, and to the SDK instance.
+/// Changes to the underlying data will generally be available on existing handles objects without
+/// having to re-create them. If the SDK instance is destroyed, but you still have a reference to a
+/// handle object, note that it will return the default value for all method calls (ie an empty
+/// string for methods that return a string).
+class MessageHandle {
+    /// \cond
+    mutable Discord_MessageHandle instance_{};
+    DiscordObjectState state_ = DiscordObjectState::Invalid;
+    /// \endcond
+
+public:
+    /// \cond
+    Discord_MessageHandle* instance() const { return &instance_; }
+    /// \endcond
+    /// \cond
+    explicit MessageHandle(Discord_MessageHandle instance, DiscordObjectState state);
+    ~MessageHandle();
+    /// \endcond
+    /// Move constructor for MessageHandle
+    MessageHandle(MessageHandle&& other) noexcept;
+    /// Move assignment operator for MessageHandle
+    MessageHandle& operator=(MessageHandle&& other) noexcept;
+    /// Uninitialized instance of MessageHandle
+    static const MessageHandle nullobj;
+    /// Returns true if the instance contains a valid object
+    operator bool() const { return state_ != DiscordObjectState::Invalid; }
+
+    /// Copy constructor for MessageHandle
+    MessageHandle(const MessageHandle& other);
+    /// Copy assignment operator for MessageHandle
+    MessageHandle& operator=(const MessageHandle& other);
+
+    /// \cond
+    void Drop();
+    /// \endcond
+
+    /// \brief If the message contains non-text content, such as images, videos, embeds, polls, etc,
+    /// this method will return information about that content.
+    std::optional<discordpp::AdditionalContent> AdditionalContent() const;
+
+    /// \brief Returns an additional display name for this message, if one was set.
+    ///
+    /// This is an optional, game-provided name (such as a character name) that the game or lobby
+    /// integration associated with the author for this lobby.
+    std::optional<std::string> AdditionalName() const;
+
+    /// \brief Returns the application ID associated with this message, if any. You can use
+    /// this to identify if the mesage was sent from another child application in
+    /// your catalog.
+    ///
+    /// Note: Parent / child applications are in limited access and the SentFromGame
+    /// field should be relied on for the common case.
+    std::optional<uint64_t> ApplicationId() const;
+
+    /// \brief Returns the UserHandle for the author of this message.
+    std::optional<discordpp::UserHandle> Author() const;
+
+    /// \brief Returns the user ID of the user who sent this message.
+    uint64_t AuthorId() const;
+
+    /// \brief Returns the ChannelHandle for the channel this message was sent in.
+    std::optional<discordpp::ChannelHandle> Channel() const;
+
+    /// \brief Returns the channel ID this message was sent in.
+    uint64_t ChannelId() const;
+
+    /// \brief Returns the content of this message, if any.
+    ///
+    /// A message can be blank if it was sent from Discord but only contains content such as image
+    /// attachments. Certain types of markup, such as markup for emojis and mentions, will be auto
+    /// replaced with a more human readable form, such as `@username` or `:emoji_name:`.
+    std::string Content() const;
+
+    /// \brief If this is an auto-generated message that is explaining some integration behavior to
+    /// users, this method will return the type of disclosure so you can customize it.
+    std::optional<discordpp::DisclosureTypes> DisclosureType() const;
+
+    /// \brief The timestamp in millis since the epoch when the message was most recently edited.
+    ///
+    /// Returns 0 if the message has not been edited yet.
+    uint64_t EditedTimestamp() const;
+
+    /// \brief Returns the ID of this message.
+    uint64_t Id() const;
+
+    /// \brief Returns the LobbyHandle this message was sent in, if it was sent in a lobby.
+    std::optional<discordpp::LobbyHandle> Lobby() const;
+
+    /// \brief Returns any metadata the developer included with this message.
+    ///
+    /// Metadata is just a set of simple string key/value pairs.
+    /// An example use case might be to include a character name so you can customize how a message
+    /// renders in game.
+    std::unordered_map<std::string, std::string> Metadata() const;
+
+    /// \brief Returns any moderation metadata the developer set on this message.
+    ///
+    /// Moderation metadata is just a set of simple string key/value pairs.
+    /// An example use case might be to include a flag that indicates the moderation status of the
+    /// message. Another example would be to include a re-written message that is more appropriate
+    /// for the game's audience.
+    std::unordered_map<std::string, std::string> ModerationMetadata() const;
+
+    /// \brief Returns the content of this message, if any, but without replacing any markup from
+    /// emojis and mentions.
+    ///
+    /// A message can be blank if it was sent from Discord but only contains content such as image
+    /// attachments.
+    std::string RawContent() const;
+
+    /// \brief Returns the UserHandle for the other participant in a DM, if this message was sent in
+    /// a DM.
+    std::optional<discordpp::UserHandle> Recipient() const;
+
+    /// \brief When this message was sent in a DM or Ephemeral DM, this method will return the ID of
+    /// the other user in that DM.
+    uint64_t RecipientId() const;
+
+    /// \brief Returns true if this message was sent in-game, otherwise false (i.e. from Discord
+    /// itself). If you are using parent / child applications, this will be true if the message was
+    /// sent from any child application.
+    bool SentFromGame() const;
+
+    /// \brief The timestamp in millis since the epoch when the message was sent.
+    uint64_t SentTimestamp() const;
+};
+
+/// \brief Represents a single input or output audio device available to the user.
+///
+/// Discord will initialize the audio engine with the system default input and output devices.
+/// You can change the device through the Client by passing the id of the desired audio device.
+class AudioDevice {
+    /// \cond
+    mutable Discord_AudioDevice instance_{};
+    DiscordObjectState state_ = DiscordObjectState::Invalid;
+    /// \endcond
+
+public:
+    /// \cond
+    Discord_AudioDevice* instance() const { return &instance_; }
+    /// \endcond
+    /// \cond
+    explicit AudioDevice(Discord_AudioDevice instance, DiscordObjectState state);
+    ~AudioDevice();
+    /// \endcond
+    /// Move constructor for AudioDevice
+    AudioDevice(AudioDevice&& other) noexcept;
+    /// Move assignment operator for AudioDevice
+    AudioDevice& operator=(AudioDevice&& other) noexcept;
+    /// Uninitialized instance of AudioDevice
+    static const AudioDevice nullobj;
+    /// Returns true if the instance contains a valid object
+    operator bool() const { return state_ != DiscordObjectState::Invalid; }
+
+    /// Copy constructor for AudioDevice
+    AudioDevice(const AudioDevice& arg0);
+    /// Copy assignment operator for AudioDevice
+    AudioDevice& operator=(const AudioDevice& arg0);
+
+    /// \cond
+    void Drop();
+    /// \endcond
+
+    /// \brief Compares the ID of two AudioDevice objects for equality.
+    bool Equals(discordpp::AudioDevice rhs);
+
+    /// \brief The ID of the audio device.
+    std::string Id() const;
+    /// Setter for AudioDevice::Id.
+    void SetId(std::string Id);
+
+    /// \brief The display name of the audio device.
+    std::string Name() const;
+    /// Setter for AudioDevice::Name.
+    void SetName(std::string Name);
+
+    /// \brief Whether the audio device is the system default device.
+    bool IsDefault() const;
+    /// Setter for AudioDevice::IsDefault.
+    void SetIsDefault(bool IsDefault);
+};
+
+/// \brief A read-only snapshot of the user's voice settings in the connected Discord desktop
+/// client.
+///
+/// These belong to the Discord client, not to any individual Call.
+class VoiceSettings {
+    /// \cond
+    mutable Discord_VoiceSettings instance_{};
+    DiscordObjectState state_ = DiscordObjectState::Invalid;
+    /// \endcond
+
+public:
+    /// \cond
+    Discord_VoiceSettings* instance() const { return &instance_; }
+    /// \endcond
+    /// \cond
+    explicit VoiceSettings(Discord_VoiceSettings instance, DiscordObjectState state);
+    ~VoiceSettings();
+    /// \endcond
+    /// Move constructor for VoiceSettings
+    VoiceSettings(VoiceSettings&& other) noexcept;
+    /// Move assignment operator for VoiceSettings
+    VoiceSettings& operator=(VoiceSettings&& other) noexcept;
+    /// Uninitialized instance of VoiceSettings
+    static const VoiceSettings nullobj;
+    /// Returns true if the instance contains a valid object
+    operator bool() const { return state_ != DiscordObjectState::Invalid; }
+
+    /// Copy constructor for VoiceSettings
+    VoiceSettings(const VoiceSettings& arg0);
+    /// Copy assignment operator for VoiceSettings
+    VoiceSettings& operator=(const VoiceSettings& arg0);
+
+    /// \cond
+    void Drop();
+    /// \endcond
+
+    /// \brief Self-mute state.
+    bool SelfMute() const;
+    /// Setter for VoiceSettings::SelfMute.
+    void SetSelfMute(bool SelfMute);
+
+    /// \brief Self-deafen state.
+    bool SelfDeaf() const;
+    /// Setter for VoiceSettings::SelfDeaf.
+    void SetSelfDeaf(bool SelfDeaf);
+
+    /// \brief When the client transmits microphone audio.
+    discordpp::VoiceInputModeType InputMode() const;
+    /// Setter for VoiceSettings::InputMode.
+    void SetInputMode(discordpp::VoiceInputModeType InputMode);
+
+    /// \brief Display string for the push-to-talk key, such as "SHIFT + F". Empty when nothing is
+    /// bound.
+    std::string PttKey() const;
+    /// Setter for VoiceSettings::PttKey.
+    void SetPttKey(std::string PttKey);
+
+    /// \brief Microphone volume, ranging from 0 to 100.
+    float InputVolume() const;
+    /// Setter for VoiceSettings::InputVolume.
+    void SetInputVolume(float InputVolume);
+
+    /// \brief Speaker volume, ranging from 0 to 200.
+    float OutputVolume() const;
+    /// Setter for VoiceSettings::OutputVolume.
+    void SetOutputVolume(float OutputVolume);
+
+    /// \brief Automatic gain control state.
+    bool AutomaticGainControl() const;
+    /// Setter for VoiceSettings::AutomaticGainControl.
+    void SetAutomaticGainControl(bool AutomaticGainControl);
+
+    /// \brief Echo cancellation state.
+    bool EchoCancellation() const;
+    /// Setter for VoiceSettings::EchoCancellation.
+    void SetEchoCancellation(bool EchoCancellation);
+
+    /// \brief Noise suppression state.
+    bool NoiseSuppression() const;
+    /// Setter for VoiceSettings::NoiseSuppression.
+    void SetNoiseSuppression(bool NoiseSuppression);
+
+    /// \brief Noise cancellation state.
+    bool NoiseCancellation() const;
+    /// Setter for VoiceSettings::NoiseCancellation.
+    void SetNoiseCancellation(bool NoiseCancellation);
+};
+
+/// \brief Represents a summary of a DM conversation with a user.
+class UserMessageSummary {
+    /// \cond
+    mutable Discord_UserMessageSummary instance_{};
+    DiscordObjectState state_ = DiscordObjectState::Invalid;
+    /// \endcond
+
+public:
+    /// \cond
+    Discord_UserMessageSummary* instance() const { return &instance_; }
+    /// \endcond
+    /// \cond
+    explicit UserMessageSummary(Discord_UserMessageSummary instance, DiscordObjectState state);
+    ~UserMessageSummary();
+    /// \endcond
+    /// Move constructor for UserMessageSummary
+    UserMessageSummary(UserMessageSummary&& other) noexcept;
+    /// Move assignment operator for UserMessageSummary
+    UserMessageSummary& operator=(UserMessageSummary&& other) noexcept;
+    /// Uninitialized instance of UserMessageSummary
+    static const UserMessageSummary nullobj;
+    /// Returns true if the instance contains a valid object
+    operator bool() const { return state_ != DiscordObjectState::Invalid; }
+
+    /// Copy constructor for UserMessageSummary
+    UserMessageSummary(const UserMessageSummary& arg0);
+    /// Copy assignment operator for UserMessageSummary
+    UserMessageSummary& operator=(const UserMessageSummary& arg0);
+
+    /// \cond
+    void Drop();
+    /// \endcond
+
+    /// \brief Returns the ID of the last message sent in the DM conversation.
+    uint64_t LastMessageId() const;
+
+    /// \brief Returns the ID of the other user in the DM conversation.
+    uint64_t UserId() const;
+};
+
+/// \brief Options for creating a new Client instance.
+///
+/// This class may be used to set advanced initialization-time options on Client.
+class ClientCreateOptions {
+    /// \cond
+    mutable Discord_ClientCreateOptions instance_{};
+    DiscordObjectState state_ = DiscordObjectState::Invalid;
+    /// \endcond
+
+public:
+    /// \cond
+    Discord_ClientCreateOptions* instance() const { return &instance_; }
+    /// \endcond
+    /// \cond
+    explicit ClientCreateOptions(Discord_ClientCreateOptions instance, DiscordObjectState state);
+    ~ClientCreateOptions();
+    /// \endcond
+    /// Move constructor for ClientCreateOptions
+    ClientCreateOptions(ClientCreateOptions&& other) noexcept;
+    /// Move assignment operator for ClientCreateOptions
+    ClientCreateOptions& operator=(ClientCreateOptions&& other) noexcept;
+    /// Uninitialized instance of ClientCreateOptions
+    static const ClientCreateOptions nullobj;
+    /// Returns true if the instance contains a valid object
+    operator bool() const { return state_ != DiscordObjectState::Invalid; }
+
+    /// Copy constructor for ClientCreateOptions
+    ClientCreateOptions(const ClientCreateOptions& arg0);
+    /// Copy assignment operator for ClientCreateOptions
+    ClientCreateOptions& operator=(const ClientCreateOptions& arg0);
+
+    explicit ClientCreateOptions();
+
+    /// \cond
+    void Drop();
+    /// \endcond
+
+    /// \brief The base URL for the Discord web application.
+    std::string WebBase() const;
+    /// Setter for ClientCreateOptions::WebBase.
+    void SetWebBase(std::string WebBase);
+
+    /// \brief The base URL for the Discord API.
+    std::string ApiBase() const;
+    /// Setter for ClientCreateOptions::ApiBase.
+    void SetApiBase(std::string ApiBase);
+
+    /// \brief The audio system to use. Defaults to AudioSystem::Standard.
+    ///
+    /// This is an experimental API which may be removed or changed in a future release.
+    ///
+    /// The game audio system alters the behavior of Discord Voice on mobile platforms
+    /// to use standard media-type streams instead of voice-specific audio APIs when
+    /// possible. Currently this will be used on iOS 18.2+ on devices which return true
+    /// from `-[AVAudioSession isEchoCancelledInputAvailable]` and on Android devices.
+    discordpp::AudioSystem ExperimentalAudioSystem() const;
+    /// Setter for ClientCreateOptions::ExperimentalAudioSystem.
+    void SetExperimentalAudioSystem(discordpp::AudioSystem ExperimentalAudioSystem);
+
+    /// \brief Whether to prevent communications mode on Android when Bluetooth is connected.
+    ///
+    /// This is an experimental API which may be removed or changed in a future release.
+    ///
+    /// When set to true, the SDK will not enter communications mode when Bluetooth is connected.
+    /// This setting is only meaningful on Android. It allows you to retain full quality stereo
+    /// audio playback when in-call and avoids mixing issues caused by Bluetooth Absolute Volume,
+    /// but will use the device microphone instead of the headset one.
+    bool ExperimentalAndroidPreventCommsForBluetooth() const;
+    /// Setter for ClientCreateOptions::ExperimentalAndroidPreventCommsForBluetooth.
+    void SetExperimentalAndroidPreventCommsForBluetooth(
+      bool ExperimentalAndroidPreventCommsForBluetooth);
+
+    /// \brief CPU affinity mask hint for certain platforms. Depending on platform support, may or
+    /// may not be ignored.
+    std::optional<uint64_t> CpuAffinityMask() const;
+    /// Setter for ClientCreateOptions::CpuAffinityMask.
+    void SetCpuAffinityMask(std::optional<uint64_t> CpuAffinityMask);
+};
+
+/// \brief The Client class is the main entry point for the Discord SDK. All functionality is
+/// exposed through this class.
+///
+/// See @ref getting_started "Getting Started" for more information on how to use the Client class.
+class Client {
+    /// \cond
+    mutable Discord_Client instance_{};
+    DiscordObjectState state_ = DiscordObjectState::Invalid;
+    /// \endcond
+
+public:
+    /// \brief Represents an error state for the socket connection that the Discord SDK maintains
+    /// with the Discord backend.
+    ///
+    /// Generic network failures will use the ConnectionFailed and ConnectionCanceled
+    /// enum values. Other errors such as if the user's auth token is invalid or out of
+    /// date will be UnexpectedClose and you should look at the other Error fields for the specific
+    /// details.
+    enum class Error {
+
+        /// \brief None
+        None = 0,
+
+        /// \brief ConnectionFailed
+        ConnectionFailed = 1,
+
+        /// \brief UnexpectedClose
+        UnexpectedClose = 2,
+
+        /// \brief ConnectionCanceled
+        ConnectionCanceled = 3,
+    };
+
+    /// \brief This enum refers to the status of the internal websocket the SDK uses to communicate
+    /// with Discord There are ~2 phases for "launching" the client:
+    /// 1. The socket has to connect to Discord and exchange an auth token. This is indicated by the
+    /// `Connecting` and `Connected` values.
+    /// 2. The socket has to receive an initial payload of data that describes the current user,
+    /// what lobbies they are in, who their friends are, etc. This is the `Ready` status.
+    /// Many Client functions will not work until the status changes to `Ready`, such as
+    /// GetCurrentUser().
+    ///
+    /// Status::Ready is the one you want to wait for!
+    ///
+    /// Additionally, sometimes the socket will be disconnected, such as through temporary network
+    /// blips. But it will try to automatically reconnect, as indicated by the `Reconnecting`
+    /// status.
+    enum class Status {
+
+        /// \brief Disconnected
+        Disconnected = 0,
+
+        /// \brief Connecting
+        Connecting = 1,
+
+        /// \brief Connected
+        Connected = 2,
+
+        /// \brief Ready
+        Ready = 3,
+
+        /// \brief Reconnecting
+        Reconnecting = 4,
+
+        /// \brief Disconnecting
+        Disconnecting = 5,
+
+        /// \brief HttpWait
+        HttpWait = 6,
+    };
+
+    /// \brief Represents the type of thread to control thread priority on.
+    enum class Thread {
+
+        /// \brief Client
+        Client = 0,
+
+        /// \brief Voice
+        Voice = 1,
+
+        /// \brief Network
+        Network = 2,
+    };
+
+    /// \brief Callback invoked when Client::EndCall completes.
+    using EndCallCallback = std::function<void()>;
+
+    /// \brief Callback invoked when Client::EndCalls completes.
+    using EndCallsCallback = std::function<void()>;
+
+    /// \brief Callback function for Client::GetCurrentInputDevice.
+    using GetCurrentInputDeviceCallback = std::function<void(discordpp::AudioDevice device)>;
+
+    /// \brief Callback function for Client::GetCurrentOutputDevice.
+    using GetCurrentOutputDeviceCallback = std::function<void(discordpp::AudioDevice device)>;
+
+    /// \brief Callback function for Client::GetInputDevices.
+    using GetInputDevicesCallback =
+      std::function<void(std::vector<discordpp::AudioDevice> devices)>;
+
+    /// \brief Callback function for Client::GetOutputDevices.
+    using GetOutputDevicesCallback =
+      std::function<void(std::vector<discordpp::AudioDevice> devices)>;
+
+    /// \brief Callback function for Client::GetVoiceSettings.
+    using GetVoiceSettingsCallback =
+      std::function<void(discordpp::ClientResult result, discordpp::VoiceSettings settings)>;
+
+    /// \brief Callback function for Client::SetDeviceChangeCallback.
+    using DeviceChangeCallback =
+      std::function<void(std::vector<discordpp::AudioDevice> inputDevices,
+                         std::vector<discordpp::AudioDevice> outputDevices)>;
+
+    /// \brief Callback function for Client::SetInputDevice.
+    using SetInputDeviceCallback = std::function<void(discordpp::ClientResult result)>;
+
+    /// \brief Callback function for Client::SetNoAudioInputCallback.
+    using NoAudioInputCallback = std::function<void(bool inputDetected)>;
+
+    /// \brief Callback function for Client::SetOutputDevice.
+    using SetOutputDeviceCallback = std::function<void(discordpp::ClientResult result)>;
+
+    /// \brief Callback function for Client::SetVoiceParticipantChangedCallback.
+    using VoiceParticipantChangedCallback =
+      std::function<void(uint64_t lobbyId, uint64_t memberId, bool added)>;
+
+    /// \brief Callback function for Client::SetVoiceSettingsUpdatedCallback.
+    using VoiceSettingsUpdatedCallback = std::function<void(discordpp::VoiceSettings settings)>;
+
+    /// \brief Callback function for Client::StartCallWithAudioCallbacks.
+    ///
+    /// The audio samples in `data` can be modified in-place to achieve simple DSP effects.
+    using UserAudioReceivedCallback = std::function<void(uint64_t userId,
+                                                         int16_t* data,
+                                                         uint64_t samplesPerChannel,
+                                                         int32_t sampleRate,
+                                                         uint64_t channels,
+                                                         bool& outShouldMute)>;
+
+    /// \brief Callback function for Client::StartCallWithAudioCallbacks.
+    ///
+    /// The audio samples in `data` can be modified in-place to achieve simple DSP effects.
+    using UserAudioCapturedCallback = std::function<
+      void(int16_t* data, uint64_t samplesPerChannel, int32_t sampleRate, uint64_t channels)>;
+
+    /// \brief Callback invoked when the Authorize function completes.
+    ///
+    /// The first arg contains any error message encountered during the authorization flow, such as
+    /// if the user cancelled the authorization. The second arg, code, contains an authorization
+    /// _code_. This alone cannot be used to authorize with Discord, and instead must be exchanged
+    /// for an access token later.
+    using AuthorizationCallback = std::function<
+      void(discordpp::ClientResult result, std::string code, std::string redirectUri)>;
+
+    /// \brief Callback function for Client::ExchangeChildToken.
+    using ExchangeChildTokenCallback =
+      std::function<void(discordpp::ClientResult result,
+                         std::string accessToken,
+                         discordpp::AuthorizationTokenType tokenType,
+                         int32_t expiresIn,
+                         std::string scopes)>;
+
+    /// \brief Callback function for Client::FetchCurrentUser.
+    using FetchCurrentUserCallback =
+      std::function<void(discordpp::ClientResult result, uint64_t id, std::string name)>;
+
+    /// \brief Callback function for the token exchange APIs such as Client::GetToken
+    using TokenExchangeCallback = std::function<void(discordpp::ClientResult result,
+                                                     std::string accessToken,
+                                                     std::string refreshToken,
+                                                     discordpp::AuthorizationTokenType tokenType,
+                                                     int32_t expiresIn,
+                                                     std::string scopes)>;
+
+    /// \brief Callback invoked when a user requests to initiate the authorization flow from the
+    /// discord app
+    ///
+    /// The callback receives no args and must call the functions needed to initiate the auth flow
+    /// as if the user had clicked the account link button in the game
+    using AuthorizeRequestCallback = std::function<void()>;
+
+    /// \brief Callback function for the Client::RevokeToken method.
+    using RevokeTokenCallback = std::function<void(discordpp::ClientResult result)>;
+
+    /// \brief Callback function for Client::SetAuthorizeDeviceScreenClosedCallback.
+    using AuthorizeDeviceScreenClosedCallback = std::function<void()>;
+
+    /// \brief Callback function for Client::SetTokenExpirationCallback
+    using TokenExpirationCallback = std::function<void()>;
+
+    /// \brief Callback function for the Client::UnmergeIntoProvisionalAccount method.
+    using UnmergeIntoProvisionalAccountCallback =
+      std::function<void(discordpp::ClientResult result)>;
+
+    /// \brief Callback function for Client::UpdateProvisionalAccountDisplayName
+    using UpdateProvisionalAccountDisplayNameCallback =
+      std::function<void(discordpp::ClientResult result)>;
+
+    /// \brief Callback invoked when Client::UpdateToken completes. Once this is done it is safe to
+    /// call Client::Connect.
+    using UpdateTokenCallback = std::function<void(discordpp::ClientResult result)>;
+
+    /// \brief Callback function for Client::DeleteUserMessage.
+    using DeleteUserMessageCallback = std::function<void(discordpp::ClientResult result)>;
+
+    /// \brief Callback function for Client::EditUserMessage.
+    using EditUserMessageCallback = std::function<void(discordpp::ClientResult result)>;
+
+    /// \brief Callback function for Client::GetLobbyMessagesWithLimit.
+    using GetLobbyMessagesCallback =
+      std::function<void(discordpp::ClientResult result,
+                         std::vector<discordpp::MessageHandle> messages)>;
+
+    /// \brief Callback function for Client::GetUserMessageSummaries.
+    using UserMessageSummariesCallback =
+      std::function<void(discordpp::ClientResult result,
+                         std::vector<discordpp::UserMessageSummary> summaries)>;
+
+    /// \brief Callback function for Client::GetUserMessagesWithLimit.
+    using UserMessagesWithLimitCallback =
+      std::function<void(discordpp::ClientResult result,
+                         std::vector<discordpp::MessageHandle> messages)>;
+
+    /// \brief Callback function for when Client::ProvisionalUserMergeCompleted completes.
+    using ProvisionalUserMergeRequiredCallback = std::function<void()>;
+
+    /// \brief Callback function for when Client::OpenMessageInDiscord completes.
+    using OpenMessageInDiscordCallback = std::function<void(discordpp::ClientResult result)>;
+
+    /// \brief This is used for all kinds of 'send message' calls despite the name, to make sure
+    /// engine bindings use the same delegate type declaration for all of them, which makes things
+    /// nicer. `SendMessageCallback` was unavailable because it's a macro on Windows.
+    using SendUserMessageCallback =
+      std::function<void(discordpp::ClientResult result, uint64_t messageId)>;
+
+    /// \brief Callback function for Client::SetMessageCreatedCallback.
+    using MessageCreatedCallback = std::function<void(uint64_t messageId)>;
+
+    /// \brief Callback function for Client::SetMessageDeletedCallback.
+    using MessageDeletedCallback = std::function<void(uint64_t messageId, uint64_t channelId)>;
+
+    /// \brief Callback function for Client::SetMessageUpdatedCallback.
+    using MessageUpdatedCallback = std::function<void(uint64_t messageId)>;
+
+    /// \brief Callback function invoked when a new log message is generated.
+    using LogCallback =
+      std::function<void(std::string message, discordpp::LoggingSeverity severity)>;
+
+    /// \brief Callback function for when Client::OpenConnectedGamesSettingsInDiscord completes.
+    using OpenConnectedGamesSettingsInDiscordCallback =
+      std::function<void(discordpp::ClientResult result)>;
+
+    /// \brief Callback function for Client::SetStatusChangedCallback.
+    ///
+    /// errorDetail will usually be one of the error code described here:
+    /// https://discord.com/developers/docs/topics/opcodes-and-status-codes#gateway-gateway-close-event-codes
+    using OnStatusChanged = std::function<
+      void(discordpp::Client::Status status, discordpp::Client::Error error, int32_t errorDetail)>;
+
+    /// \brief Callback function for Client::CreateOrJoinLobby
+    using CreateOrJoinLobbyCallback =
+      std::function<void(discordpp::ClientResult result, uint64_t lobbyId)>;
+
+    /// \brief Callback function for Client::GetGuildChannels.
+    using GetGuildChannelsCallback =
+      std::function<void(discordpp::ClientResult result,
+                         std::vector<discordpp::GuildChannel> guildChannels)>;
+
+    /// \brief Callback function for Client::GetUserGuilds.
+    using GetUserGuildsCallback = std::function<void(discordpp::ClientResult result,
+                                                     std::vector<discordpp::GuildMinimal> guilds)>;
+
+    /// \brief Callback function for Client::JoinLinkedLobbyGuild.
+    using JoinLinkedLobbyGuildCallback =
+      std::function<void(discordpp::ClientResult result, std::string inviteUrl)>;
+
+    /// \brief Callback function for Client::LeaveLobby.
+    using LeaveLobbyCallback = std::function<void(discordpp::ClientResult result)>;
+
+    /// \brief Callback function for Client::LinkChannelToLobby.
+    using LinkOrUnlinkChannelCallback = std::function<void(discordpp::ClientResult result)>;
+
+    /// \brief Callback function for Client::SetLobbyCreatedCallback.
+    using LobbyCreatedCallback = std::function<void(uint64_t lobbyId)>;
+
+    /// \brief Callback function for Client::SetLobbyDeletedCallback.
+    using LobbyDeletedCallback = std::function<void(uint64_t lobbyId)>;
+
+    /// \brief Callback function for Client::SetLobbyMemberAddedCallback.
+    using LobbyMemberAddedCallback = std::function<void(uint64_t lobbyId, uint64_t memberId)>;
+
+    /// \brief Callback function for Client::SetLobbyMemberRemovedCallback.
+    using LobbyMemberRemovedCallback = std::function<void(uint64_t lobbyId, uint64_t memberId)>;
+
+    /// \brief Callback function for Client::SetLobbyMemberUpdatedCallback.
+    using LobbyMemberUpdatedCallback = std::function<void(uint64_t lobbyId, uint64_t memberId)>;
+
+    /// \brief Callback function for Client::SetLobbyUpdatedCallback.
+    using LobbyUpdatedCallback = std::function<void(uint64_t lobbyId)>;
+
+    /// \brief Callback invoked when the IsDiscordAppInstalled function completes.
+    using IsDiscordAppInstalledCallback = std::function<void(bool installed)>;
+
+    /// \brief Callback function for Client::AcceptActivityInvite.
+    using AcceptActivityInviteCallback =
+      std::function<void(discordpp::ClientResult result, std::string joinSecret)>;
+
+    /// \brief Callback function for Client::SendActivityInvite, Client::SendActivityJoinRequest,
+    /// and Client::SendActivityJoinRequestReply.
+    using SendActivityInviteCallback = std::function<void(discordpp::ClientResult result)>;
+
+    /// \brief Callback function for Client::SetActivityInviteCreatedCallback and
+    /// Client::SetActivityInviteUpdatedCallback.
+    using ActivityInviteCallback = std::function<void(discordpp::ActivityInvite invite)>;
+
+    /// \brief Callback function for Client::SetActivityJoinCallback
+    using ActivityJoinCallback = std::function<void(std::string joinSecret)>;
+
+    /// \brief Callback function for Client::SetActivityJoinWithApplicationCallback
+    using ActivityJoinWithApplicationCallback =
+      std::function<void(uint64_t applicationId, std::string joinSecret)>;
+
+    /// \brief Callback function for when Client::SetOnlineStatus completes.
+    using UpdateStatusCallback = std::function<void(discordpp::ClientResult result)>;
+
+    /// \brief Callback function for when Client::UpdateRichPresence completes.
+    using UpdateRichPresenceCallback = std::function<void(discordpp::ClientResult result)>;
+
+    /// \brief Callback function for most other Relationship functions such as
+    /// Client::SendDiscordFriendRequestById.
+    using UpdateRelationshipCallback = std::function<void(discordpp::ClientResult result)>;
+
+    /// \brief Callback function for Client::SendDiscordFriendRequest and
+    /// Client::SendGameFriendRequest.
+    using SendFriendRequestCallback = std::function<void(discordpp::ClientResult result)>;
+
+    /// \brief Callback function for Client::SetRelationshipCreatedCallback.
+    ///
+    /// `isDiscordRelationshipUpdate` will be true if the relationship created with the `userId` is
+    /// a Discord relationship, and false if it's an in-game relationship.
+    using RelationshipCreatedCallback =
+      std::function<void(uint64_t userId, bool isDiscordRelationshipUpdate)>;
+
+    /// \brief Callback function for Client::SetRelationshipDeletedCallback.
+    ///
+    /// `isDiscordRelationshipUpdate` will be true if the relationship deleted with the `userId` is
+    /// a Discord relationship, and false if it's an in-game relationship.
+    using RelationshipDeletedCallback =
+      std::function<void(uint64_t userId, bool isDiscordRelationshipUpdate)>;
+
+    /// \brief Callback function for when Client::GetDiscordClientConnectedUser completes.
+    using GetDiscordClientConnectedUserCallback =
+      std::function<void(discordpp::ClientResult result,
+                         std::optional<discordpp::UserHandle> user)>;
+
+    /// \brief Callback function for Client::SetRelationshipGroupsUpdatedCallback.
+    using RelationshipGroupsUpdatedCallback = std::function<void(uint64_t userId)>;
+
+    /// \brief Callback function for Client::SetUserUpdatedCallback.
+    using UserUpdatedCallback = std::function<void(uint64_t userId)>;
+    /// \cond
+    Discord_Client* instance() const { return &instance_; }
+    /// \endcond
+    /// \cond
+    explicit Client(Discord_Client instance, DiscordObjectState state);
+    ~Client();
+    /// \endcond
+    /// Move constructor for Client
+    Client(Client&& other) noexcept;
+    /// Move assignment operator for Client
+    Client& operator=(Client&& other) noexcept;
+    /// Uninitialized instance of Client
+    static const Client nullobj;
+    /// Returns true if the instance contains a valid object
+    operator bool() const { return state_ != DiscordObjectState::Invalid; }
+
+    Client(const Client&) = delete;
+    Client& operator=(const Client&) = delete;
+
+    /// \brief Creates a new instance of the Client.
+    explicit Client();
+
+    /// \brief Creates a new instance of the Client but allows customizing the Discord URL to use.
+    explicit Client(std::string apiBase, std::string webBase);
+
+    /// \brief Creates a new instance of the Client with custom options.
+    explicit Client(discordpp::ClientCreateOptions options);
+
+    /// \cond
+    void Drop();
+    /// \endcond
+
+    /// \brief Converts the Error enum to a string.
+    static std::string ErrorToString(discordpp::Client::Error type);
+
+    /// \brief This function is used to get the application ID for the client. This is used to
+    /// identify the application to the Discord client. This is used for things like
+    /// authentication, rich presence, and activity invites when *not* connected with
+    /// Client::Connect. When calling Client::Connect, the application ID is set automatically
+    uint64_t GetApplicationId();
+
+    /// \brief (deprecated)
+    ///
+    /// \deprecated Please use GetCurrentUserV2 instead. This will be removed in a future version.
+    [[deprecated("Please use GetCurrentUserV2 instead. This will be removed in a future version.")]]
+    discordpp::UserHandle GetCurrentUser() const;
+
+    /// \brief Returns the ID of the system default audio device if the user has not explicitly
+    /// chosen one.
+    static std::string GetDefaultAudioDeviceId();
+
+    /// \brief Returns the default set of OAuth2 scopes that should be used with the Discord SDK
+    /// when making use of the full SDK capabilities, including communications-related features
+    /// (e.g. user DMs, lobbies, voice chat). If your application does not make use of these
+    /// features, you should use Client::GetDefaultPresenceScopes instead.
+    ///
+    /// Communications-related features are currently in limited access and are not available to
+    /// all applications, however, they can be demoed in limited capacity by all applications. If
+    /// you are interested in using these features in your game, please reach out to the Discord
+    /// team.
+    ///
+    /// It's ok to further customize your requested oauth2 scopes to add additional scopes if you
+    /// have legitimate usages for them. However, we strongly recommend always using
+    /// Client::GetDefaultCommunicationScopes or Client::GetDefaultPresenceScopes as a baseline to
+    /// enable a better authorization experience for users!
+    static std::string GetDefaultCommunicationScopes();
+
+    /// \brief Returns the default set of OAuth2 scopes that should be used with the Discord SDK
+    /// when leveraging baseline presence-related features (e.g. friends list, rich presence,
+    /// provisional accounts, activity invites). If your application is using
+    /// communications-related features, which are currently available in limited access, you should
+    /// use Client::GetDefaultCommunicationScopes instead.
+    ///
+    /// It's ok to further customize your requested oauth2 scopes to add additional scopes if you
+    /// have legitimate usages for them. However, we strongly recommend always using
+    /// Client::GetDefaultCommunicationScopes or Client::GetDefaultPresenceScopes as a baseline to
+    /// enable a better authorization experience for users!
+    static std::string GetDefaultPresenceScopes();
+
+    /// \brief Returns the git commit hash this version was built from.
+    static std::string GetVersionHash();
+
+    /// \brief Returns the major version of the Discord Social SDK.
+    static int32_t GetVersionMajor();
+
+    /// \brief Returns the minor version of the Discord Social SDK.
+    static int32_t GetVersionMinor();
+
+    /// \brief Returns the patch version of the Discord Social SDK.
+    static int32_t GetVersionPatch();
+
+    /// \brief This function is used to override the default HTTP timeout for the websocket client.
+    void SetHttpRequestTimeout(int32_t httpTimeoutInMilliseconds);
+
+    /// \brief Converts the Status enum to a string.
+    static std::string StatusToString(discordpp::Client::Status type);
+
+    /// \brief Converts the Thread enum to a string.
+    static std::string ThreadToString(discordpp::Client::Thread type);
+
+    /// @name Audio
+    /// @{
+
+    /// \brief Ends any active call, if any. Any references you have to Call objects are invalid
+    /// after they are ended, and can be immediately freed.
+    void EndCall(uint64_t channelId, discordpp::Client::EndCallCallback callback);
+
+    /// \brief Ends any active call, if any. Any references you have to Call objects are invalid
+    /// after they are ended, and can be immediately freed.
+    void EndCalls(discordpp::Client::EndCallsCallback callback);
+
+    /// \brief Returns a reference to the currently active call, if any.
+    discordpp::Call GetCall(uint64_t channelId);
+
+    /// \brief Returns a reference to all currently active calls, if any.
+    std::vector<discordpp::Call> GetCalls();
+
+    /// \brief Asynchronously fetches the current audio input device in use by the client.
+    void GetCurrentInputDevice(discordpp::Client::GetCurrentInputDeviceCallback cb);
+
+    /// \brief Asynchronously fetches the current audio output device in use by the client.
+    void GetCurrentOutputDevice(discordpp::Client::GetCurrentOutputDeviceCallback cb);
+
+    /// \brief Asynchronously fetches the list of audio input devices available to the user.
+    void GetInputDevices(discordpp::Client::GetInputDevicesCallback cb);
+
+    /// \brief Returns the input volume for the current user's microphone.
+    ///
+    /// Input volume is specified as a percentage in the range [0, 100] which represents the
+    /// perceptual loudness.
+    float GetInputVolume();
+
+    /// \brief Asynchronously fetches the list of audio output devices available to the user.
+    void GetOutputDevices(discordpp::Client::GetOutputDevicesCallback cb);
+
+    /// \brief Returns the output volume for the current user.
+    ///
+    /// Output volume specified as a percentage in the range [0, 200] which represents the
+    /// perceptual loudness.
+    float GetOutputVolume();
+
+    /// \brief Returns whether the current user is deafened in all calls.
+    bool GetSelfDeafAll() const;
+
+    /// \brief Returns whether the current user's microphone is muted in all calls.
+    bool GetSelfMuteAll() const;
+
+    /// \brief Asynchronously fetches the user's current voice settings from the connected Discord
+    /// client.
+    ///
+    /// Requires a running Discord desktop client and an approved Social SDK integration.
+    void GetVoiceSettings(discordpp::Client::GetVoiceSettingsCallback cb);
+
+    /// \brief Enables or disables AEC diagnostic recording.
+    ///
+    /// Used to diagnose issues with acoustic echo cancellation. The input and output waveform data
+    /// will be written to the log directory.
+    void SetAecDump(bool on);
+
+    /// \brief When enabled, automatically adjusts the microphone volume to keep it clear and
+    /// consistent.
+    ///
+    /// Defaults to on.
+    ///
+    /// Generally this shouldn't need to be used unless you are building a voice settings UI for the
+    /// user to control, similar to Discord's voice settings.
+    void SetAutomaticGainControl(bool on);
+
+    /// \brief Sets a callback function to be invoked when Discord detects a change in the available
+    /// audio devices.
+    void SetDeviceChangeCallback(discordpp::Client::DeviceChangeCallback callback);
+
+    /// \brief Enables or disables the basic echo cancellation provided by the WebRTC library.
+    ///
+    /// Defaults to on.
+    ///
+    /// Generally this shouldn't need to be used unless you are building a voice settings UI for the
+    /// user to control, similar to Discord's voice settings.
+    void SetEchoCancellation(bool on);
+
+    /// \brief On mobile devices, set whether the audio environment is managed by the engine or the
+    /// SDK. On Android, this entails AudioManager state and on iOS, this entails AVAudioSession
+    /// activation.
+    ///
+    /// This method must be called before connecting to any Calls if the
+    /// application manages audio on its own, otherwise audio management
+    /// will be ended by the voice engine when the last Call is ended.
+    ///
+    /// The Unity plugin automatically calls this method if the native Unity
+    /// audio engine is enabled in the project settings.
+    void SetEngineManagedAudioSession(bool isEngineManaged);
+
+    /// \brief Asynchronously changes the audio input device in use by the client to the specified
+    /// device. You can find the list of device IDs that can be passed in with the
+    /// Client::GetInputDevices function.
+    void SetInputDevice(std::string deviceId, discordpp::Client::SetInputDeviceCallback cb);
+
+    /// \brief Sets the microphone volume for the current user.
+    ///
+    /// Input volume is specified as a percentage in the range [0, 100] which represents the
+    /// perceptual loudness.
+    void SetInputVolume(float inputVolume);
+
+    /// \brief Callback function invoked when the above threshold is set and there is a change in
+    /// whether audio is being detected.
+    void SetNoAudioInputCallback(discordpp::Client::NoAudioInputCallback callback);
+
+    /// \brief Threshold that can be set to indicate when no audio is being received by the user's
+    /// mic.
+    ///
+    /// An example of when this may be useful: When push to talk is being used and the user pushes
+    /// their talk key, but something is configured wrong and no audio is being received, this
+    /// threshold and callback can be used to detect that situation and notify the user. The
+    /// threshold is specified in DBFS, or decibels relative to full scale, and the range is
+    /// [-100.0, 100.0] It defaults to -100.0, so is disabled.
+    void SetNoAudioInputThreshold(float dBFSThreshold);
+
+    /// \brief Enables or disables Krisp noise cancellation.
+    ///
+    /// Defaults to off. When enabled, noise suppression is automatically disabled.
+    void SetNoiseCancellation(bool on);
+
+    /// \brief Enables basic background noise suppression.
+    ///
+    /// Defaults to on.
+    ///
+    /// Generally this shouldn't need to be used unless you are building a voice settings UI for the
+    /// user to control, similar to Discord's voice settings.
+    void SetNoiseSuppression(bool on);
+
+    /// \brief Enables or disables hardware encoding and decoding for audio, if it is available.
+    ///
+    /// Defaults to on.
+    ///
+    /// This must be called immediately after constructing the Client. If called too late an error
+    /// will be logged and the setting will not take effect.
+    void SetOpusHardwareCoding(bool encode, bool decode);
+
+    /// \brief Asynchronously changes the audio output device in use by the client to the specified
+    /// device. You can find the list of device IDs that can be passed in with the
+    /// Client::GetOutputDevices function.
+    void SetOutputDevice(std::string deviceId, discordpp::Client::SetOutputDeviceCallback cb);
+
+    /// \brief Sets the speaker volume for the current user.
+    ///
+    /// Output volume specified as a percentage in the range [0, 200] which represents the
+    /// perceptual loudness.
+    void SetOutputVolume(float outputVolume);
+
+    /// \brief Mutes all audio from the currently active call for the current user in all calls.
+    /// They will not be able to hear any other participants,
+    /// and no other participants will be able to hear the current user either.
+    /// Note: This overrides the per-call setting.
+    void SetSelfDeafAll(bool deaf);
+
+    /// \brief Mutes the current user's microphone so that no other participant in their active
+    /// calls can hear them in all calls. Note: This overrides the per-call setting.
+    void SetSelfMuteAll(bool mute);
+
+    /// \brief (deprecated)  On mobile devices, enable speakerphone mode.
+    ///
+    /// \deprecated Calling Client::SetSpeakerMode is DEPRECATED.
+    [[deprecated("Calling Client::SetSpeakerMode is DEPRECATED.")]]
+    bool SetSpeakerMode(bool speakerMode);
+
+    /// \brief Allows setting the priority of various SDK threads.
+    ///
+    /// The threads that can be controlled are:
+    /// - Client: This is the main thread for the SDK where most of the data processing happens
+    /// - Network: This is the thread that receives voice data from lobby calls
+    /// - Voice: This is the thread that the voice engine runs on and processes all audio data
+    void SetThreadPriority(discordpp::Client::Thread thread, int32_t priority);
+
+    /// \brief Callback invoked whenever a user in a lobby joins or leaves a voice call.
+    ///
+    /// The main use case for this is to enable displaying which users are in voice in a lobby
+    /// even if the current user is not in voice yet, and thus does not have a Call object to bind
+    /// to.
+    void SetVoiceParticipantChangedCallback(discordpp::Client::VoiceParticipantChangedCallback cb);
+
+    /// \brief Sets a callback to be invoked whenever the user's voice settings change in the
+    /// connected Discord client. Pass an empty std::function to stop receiving updates.
+    ///
+    /// Requires the same access as Client::GetVoiceSettings. The callback never fires if the
+    /// client refuses the subscription.
+    void SetVoiceSettingsUpdatedCallback(discordpp::Client::VoiceSettingsUpdatedCallback callback);
+
+    /// \brief On iOS devices, show the system audio route picker.
+    bool ShowAudioRoutePicker();
+
+    /// \brief Starts or joins a call in the lobby specified by channelId (For a lobby, simply
+    /// pass in the lobbyId).
+    ///
+    /// On iOS, your application is responsible for enabling the appropriate background audio mode
+    /// in your Info.plist. VoiceBuildPostProcessor in the sample demonstrates how to do this
+    /// automatically in your Unity build process.
+    ///
+    /// On macOS, you should set the NSMicrophoneUsageDescription key in your Info.plist.
+    ///
+    /// Returns null if the user is already in the given voice channel.
+    discordpp::Call StartCall(uint64_t channelId);
+
+    /// \brief Starts or joins a call in the specified lobby.
+    ///
+    /// The audio received callback is invoked whenever incoming audio is received in a call. If
+    /// the developer sets outShouldMute to true during the callback, the audio data will be muted
+    /// after the callback is invoked, which is useful if the developer is utilizing the incoming
+    /// audio and playing it through their own audio engine or playback. The audio samples
+    /// in `data` can be modified in-place for simple DSP effects.
+    ///
+    /// The audio captured callback is invoked whenever local audio is captured before it is
+    /// processed and transmitted which may be useful for voice moderation, etc.
+    ///
+    /// On iOS, your application is responsible for enabling the appropriate background audio mode
+    /// in your Info.plist. VoiceBuildPostProcessor in the sample demonstrates how to do this
+    /// automatically in your Unity build process.
+    ///
+    /// On macOS, you should set the NSMicrophoneUsageDescription key in your Info.plist.
+    ///
+    /// Returns null if the user is already in the given voice channel.
+    discordpp::Call StartCallWithAudioCallbacks(
+      uint64_t lobbyId,
+      discordpp::Client::UserAudioReceivedCallback receivedCb,
+      discordpp::Client::UserAudioCapturedCallback capturedCb);
+    /// @}
+
+    /// @name Auth
+    /// @{
+
+    /// \brief This will abort the authorize flow if it is in progress and tear down any associated
+    /// state.
+    ///
+    /// NOTE: this *will not* close authorization windows presented to the user.
+    void AbortAuthorize();
+
+    /// \brief This function is used to abort/cleanup the device authorization flow.
+    void AbortGetTokenFromDevice();
+
+    /// \brief Initiates an OAuth2 flow for a user to "sign in with Discord". This flow is intended
+    /// for desktop and mobile devices. If you are implementing for the console, leverage the device
+    /// auth flow instead (Client::GetTokenFromDevice or Client::OpenAuthorizeDeviceScreen).
+    ///
+    /// ## Overview
+    /// If you're not familiar with OAuth2, some basic background: At a high level the goal of
+    /// OAuth2 is to allow a user to connect two applications together and share data between them.
+    /// In this case, allowing a game to access some of their Discord data. The high level flow is:
+    /// - This function, Authorize, is invoked to start the OAuth2 process, and the user is sent to
+    /// Discord
+    /// - On Discord, the user sees a prompt to authorize the connection, and that prompt explains
+    /// what data and functionality the game is requesting.
+    /// - Once the user approves the connection, they are redirected back to your application with a
+    /// secret code.
+    /// - You can then exchange that secret code to get back an access token which can be used to
+    /// authenticate with the SDK.
+    ///
+    /// ## Public vs Confidential Clients
+    /// Normal OAuth2 requires a backend server to handle exchanging the "code" for a "token" (the
+    /// last step mentioned above). Not all games have backend servers or their own identity system
+    /// though, and for early testing of the SDK that can take some time to setup.
+    ///
+    /// If desired, you can instead change your Discord application in the developer portal (on the
+    /// OAuth2 tab), to be a "public" client. This will allow you to exchange the code for a token
+    /// without a backend server, by using the GetToken function below. You can also change this
+    /// setting back once you have a backend in place later too.
+    ///
+    /// ## Overlay
+    /// To streamline the authentication process, the SDK will attempt to use the Discord overlay if
+    /// it is enabled. This will allow the user to authenticate without leaving the game, enabling a
+    /// more seamless experience.
+    ///
+    /// You should check to see if the Discord overlay works with your game before shipping. It's
+    /// ok if it doesn't though, the SDK will fall back to using a browser window. Once you're ready
+    /// to ship, you can work with us to have the overlay enabled by default for your game too.
+    ///
+    /// If your game's main window is not the same process that the SDK is running in, then you need
+    /// to tell the SDK the PID of the window that the overlay should attach to. You can do this by
+    /// calling Client::SetGameWindowPid.
+    ///
+    /// ## Redirects
+    /// For the Authorize function to work, you must configure a redirect url in your Discord
+    /// application in the developer portal, (it is located on the OAuth2 tab).
+    /// - For desktop applications, add `http://127.0.0.1/callback`
+    /// - For mobile applications, add `discord-APP_ID:/authorize/callback`
+    ///
+    /// The SDK will then spin up a local webserver to handle the OAuth2 redirects for you as
+    /// well to streamline your integration.
+    ///
+    /// ## Security
+    /// This function accepts an args object, and two of those values are important for security:
+    /// - To prevent CSRF attacks during auth, the SDK automatically attaches a state and checks it
+    /// for you when performing the authorization. You can override state if you want for your own
+    /// flow, but please be mindful to keep it a secure, random value.
+    /// - If you are using the Client::GetToken function you will need to provide a "code challenge"
+    /// or "code verifier". We'll spare you the boring details of how that works (woo... crypto), as
+    /// we've made a simple function to create these for you,
+    /// Client::CreateAuthorizationCodeVerifier. That returns a struct with two items, a `challenge`
+    /// value to pass into this function and a `verifier` value to pass into Client::GetToken.
+    ///
+    /// ## Callbacks & Code Exchange
+    /// When this flow completes, the given callback function will be invoked with a "code". That
+    /// code must be exchanged for an actual authorization token before it can be used. To start,
+    /// you can use the Client::GetToken function to perform this exchange. Longer term private apps
+    /// will want to move to the server side API for this, since that enables provisional accounts
+    /// to "upgrade" to full Discord accounts.
+    ///
+    /// ## Android
+    /// You must add the appropriate intent filter to your `AndroidManifest.xml`.
+    /// `AndroidBuildPostProcessor` in the sample demonstrates how to do this automatically.
+    ///
+    /// If you'd like to manage it yourself, the required entry in your `<application>` looks like
+    /// this:
+    /// ```xml
+    /// <activity android:name="com.discord.socialsdk.AuthenticationActivity"
+    /// android:exported="true">
+    ///   <intent-filter>
+    ///     <action android:name="android.intent.action.VIEW" />
+    ///     <category android:name="android.intent.category.DEFAULT" />
+    ///     <category android:name="android.intent.category.BROWSABLE" />
+    ///     <data android:scheme="discord-1234567890123456789" />
+    ///   </intent-filter>
+    /// </activity>
+    /// ```
+    /// Replace the numbers after `discord-` with your Application ID from the Discord developer
+    /// portal.
+    ///
+    /// Android support (specifically the builtin auth flow) requires the androidx.browser library
+    /// as a dependency of your app. The sample uses Google External Dependency Manager to add this
+    /// to the Gradle build for the project, but you may use any means of your choosing to add this
+    /// dependency. We currently depend on version 1.8.0 of this library.
+    ///
+    /// For more information see: https://discord.com/developers/docs/topics/oauth2
+    void Authorize(discordpp::AuthorizationArgs args,
+                   discordpp::Client::AuthorizationCallback callback);
+
+    /// \brief This function is used to hide the device authorization screen and is used for the
+    /// case where the user is on a limited input device, such as a console or smart TV. This
+    /// function should be used in conjunction with a backend server to handle the device
+    /// authorization flow. For a public client, you can use Client::AbortGetTokenFromDevice
+    /// instead.
+    void CloseAuthorizeDeviceScreen();
+
+    /// \brief Helper function that can create a code challenge and verifier for use in the
+    /// Client::Authorize + Client::GetToken flow. This returns a struct with two items, a
+    /// `challenge` value to pass into Client::Authorize and a `verifier` value to pass into
+    /// GetToken.
+    discordpp::AuthorizationCodeVerifier CreateAuthorizationCodeVerifier();
+
+    /// \brief Exchanges a parent application token for a child application token.
+    ///
+    /// This is used to get a token for a child application that is linked to the parent
+    /// application. This is only relevant if you have an applications set up in a parent/child
+    /// relationship, which is applicable if you are a publisher with multiple games under the
+    /// same account system. Access to this feature is currently limited.
+    ///
+    /// NOTE: This function only works for public clients. Public clients are ones that do not have
+    /// a backend server or their own concept of user accounts and simply rely on a separate system
+    /// for authentication like Steam/Epic.
+    ///
+    /// When first testing the SDK, it can be a lot easier to use a public client to get a proof of
+    /// concept going, and change it to a confidential client later. You can toggle that setting on
+    /// the OAuth2 page for your application in the Discord developer portal,
+    /// https://discord.com/developers/applications
+    void ExchangeChildToken(std::string const& parentApplicationToken,
+                            uint64_t childApplicationId,
+                            discordpp::Client::ExchangeChildTokenCallback callback);
+
+    /// \brief Fetches basic information about the user associated with the given auth token.
+    ///
+    /// This can allow you to check if an auth token is valid or not.
+    /// This does not require the client to be connected or to have it's own authentication token,
+    /// so it can be called immediately after the client connects.
+    void FetchCurrentUser(discordpp::AuthorizationTokenType tokenType,
+                          std::string const& token,
+                          discordpp::Client::FetchCurrentUserCallback callback);
+
+    /// \brief Provisional accounts are a way for users that have not signed up for Discord to still
+    /// access SDK functionality. They are "placeholder" Discord accounts for the user that are
+    /// owned and managed by your game. Provisional accounts exist so that your users can engage
+    /// with Discord APIs and systems without the friction of creating their own Discord account.
+    /// Provisional accounts and their data are unique per Discord application.
+    ///
+    /// This function generates a Discord access token. You pass in the "identity" of the user, and
+    /// it generates a new Discord account that is tied to that identity. There are multiple ways of
+    /// specifying that identity, including using Steam/Epic services, or using your own identity
+    /// system.
+    ///
+    /// The callback function will be invoked with an access token that expires in 1 hour. Refresh
+    /// tokens are not supported for provisional accounts, so that will be an empty string. You
+    /// will need to call this function again to get a new access token when the old one expires.
+    ///
+    /// NOTE: When the token expires the SDK will still continue to receive updates such as new
+    /// messages sent in a lobby, and any voice calls will continue to be active. But any new
+    /// actions taken will fail such as sending a messaging or adding a friend. You can get a new
+    /// token and pass it to UpdateToken without interrupting the user's experience.
+    ///
+    /// It is suggested that these provisional tokens are not stored, and instead to just invoke
+    /// this function each time the game is launched and when these tokens are about to expire.
+    /// However, should you choose to store it, it is recommended to differentiate these provisional
+    /// account tokens from "full" Discord account tokens.
+    ///
+    /// NOTE: This function only works for public clients. Public clients are ones that do not have
+    /// a backend server or their own concept of user accounts and simply rely on a separate system
+    /// for authentication like Steam/Epic.
+    ///
+    /// When first testing the SDK, it can be a lot easier to use a public client to get a proof of
+    /// concept going, and change it to a confidential client later. You can toggle that setting on
+    /// the OAuth2 page for your application in the Discord developer portal,
+    /// https://discord.com/developers/applications
+    void GetProvisionalToken(uint64_t applicationId,
+                             discordpp::AuthenticationExternalAuthType externalAuthType,
+                             std::string const& externalAuthToken,
+                             discordpp::Client::TokenExchangeCallback callback);
+
+    /// \brief Exchanges an authorization code that was returned from the Client::Authorize function
+    /// for an access token which can be used to authenticate with the SDK.
+    ///
+    /// The callback function will be invoked with two tokens:
+    /// - An access token which can be used to authenticate with the SDK, but expires after 7 days.
+    /// - A refresh token, which cannot be used to authenticate, but can be used to get a new access
+    /// token later. Refresh tokens do not currently expire.
+    ///
+    /// It will also include when the access token expires in seconds.
+    /// You will want to store this value as well and refresh the token when it gets close to
+    /// expiring (for example if the user launches the game and the token expires within 24 hours,
+    /// it would be good to refresh it).
+    ///
+    /// For more information see https://discord.com/developers/docs/topics/oauth2
+    ///
+    /// NOTE: This function only works for public clients. Public clients are ones that do not have
+    /// a backend server or their own concept of user accounts and simply rely on a separate system
+    /// for authentication like Steam/Epic.
+    ///
+    /// When first testing the SDK, it can be a lot easier to use a public client to get a proof of
+    /// concept going, and change it to a confidential client later. You can toggle that setting on
+    /// the OAuth2 page for your application in the Discord developer portal,
+    /// https://discord.com/developers/applications
+    void GetToken(uint64_t applicationId,
+                  std::string const& code,
+                  std::string const& codeVerifier,
+                  std::string const& redirectUri,
+                  discordpp::Client::TokenExchangeCallback callback);
+
+    /// \brief This function is a combination of Client::Authorize and Client::GetToken, but is used
+    /// for the case where the user is on a limited input device, such as a console or smart TV.
+    ///
+    /// The callback function will be invoked with two tokens:
+    /// - An access token which can be used to authenticate with the SDK, but expires after 7 days.
+    /// - A refresh token, which cannot be used to authenticate, but can be used to get a new access
+    /// token later. Refresh tokens do not currently expire.
+    ///
+    /// It will also include when the access token expires in seconds.
+    /// You will want to store this value as well and refresh the token when it gets close to
+    /// expiring (for example if the user launches the game and the token expires within 24 hours,
+    /// it would be good to refresh it).
+    ///
+    /// For more information see https://discord.com/developers/docs/topics/oauth2
+    ///
+    /// NOTE: This function only works for public clients. Public clients are ones that do not have
+    /// a backend server or their own concept of user accounts and simply rely on a separate system
+    /// for authentication like Steam/Epic. If you have a backend server for auth, you can use
+    /// Client::OpenAuthorizeDeviceScreen and Client::CloseAuthorizeDeviceScreen to show/hide the UI
+    /// for the device auth flow.
+    ///
+    /// When first testing the SDK, it can be a lot easier to use a public client to get a proof of
+    /// concept going, and change it to a confidential client later. You can toggle that setting on
+    /// the OAuth2 page for your application in the Discord developer portal,
+    /// https://discord.com/developers/applications
+    void GetTokenFromDevice(discordpp::DeviceAuthorizationArgs args,
+                            discordpp::Client::TokenExchangeCallback callback);
+
+    /// \brief This function is a combination of Client::Authorize and
+    /// Client::GetTokenFromProvisionalMerge, but is used for the case where the user is on a
+    /// limited input device, such as a console or smart TV.
+    ///
+    /// This function should be used whenever a user with a provisional account wants to link to an
+    /// existing Discord account or "upgrade" their provisional account into a "full" Discord
+    /// account.
+    ///
+    /// In this case, data from the provisional account should be "migrated" to the Discord
+    /// account, a process we call "account merging". Specifically relationships, DMs, and lobby
+    /// memberships are transferred to the Discord account.
+    ///
+    /// The provisional account will be deleted once this merging process completes. If the user
+    /// later unlinks, then a new provisional account with a new unique ID is created.
+    ///
+    /// The account merging process starts the same as the normal login flow, by invoking the
+    /// GetTokenFromDevice. But instead of calling GetTokenFromDevice, call this function and pass
+    /// in the provisional user's identity as well.
+    ///
+    /// The Discord backend can then find both the provisional account with that identity and the
+    /// new Discord account and merge any data as necessary.
+    ///
+    /// See the documentation for GetTokenFromDevice for more details on the callback. Note that the
+    /// callback will be invoked when the token exchange completes, but the process of merging
+    /// accounts happens asynchronously so will not be complete yet.
+    ///
+    /// NOTE: This function only works for public clients. Public clients are ones that do not have
+    /// a backend server or their own concept of user accounts and simply rely on a separate system
+    /// for authentication like Steam/Epic. If you have a backend server for auth, you can use
+    /// Client::OpenAuthorizeDeviceScreen and Client::CloseAuthorizeDeviceScreen to show/hide the UI
+    /// for the device auth flow.
+    ///
+    /// When first testing the SDK, it can be a lot easier to use a public client to get a proof of
+    /// concept going, and change it to a confidential client later. You can toggle that setting on
+    /// the OAuth2 page for your application in the Discord developer portal,
+    /// https://discord.com/developers/applications
+    void GetTokenFromDeviceProvisionalMerge(
+      discordpp::DeviceAuthorizationArgs args,
+      discordpp::AuthenticationExternalAuthType externalAuthType,
+      std::string const& externalAuthToken,
+      discordpp::Client::TokenExchangeCallback callback);
+
+    /// \brief This function should be used with the Client::Authorize function whenever a user with
+    /// a provisional account wants to link to an existing Discord account or "upgrade" their
+    /// provisional account into a "full" Discord account.
+    ///
+    /// In this case, data from the provisional account should be "migrated" to the Discord
+    /// account, a process we call "account merging". Specifically relationships, DMs, and lobby
+    /// memberships are transferred to the Discord account.
+    ///
+    /// The provisional account will be deleted once this merging process completes. If the user
+    /// later unlinks, then a new provisional account with a new unique ID is created.
+    ///
+    /// The account merging process starts the same as the normal login flow, by invoking the
+    /// Authorize method to get an authorization code back. But instead of calling GetToken, call
+    /// this function and pass in the provisional user's identity as well.
+    ///
+    /// The Discord backend can then find both the provisional account with that identity and the
+    /// new Discord account and merge any data as necessary.
+    ///
+    /// See the documentation for GetToken for more details on the callback. Note that the callback
+    /// will be invoked when the token exchange completes, but the process of merging accounts
+    /// happens asynchronously so will not be complete yet.
+    ///
+    /// NOTE: This function only works for public clients. Public clients are ones that do not have
+    /// a backend server or their own concept of user accounts and simply rely on a separate system
+    /// for authentication like Steam/Epic.
+    ///
+    /// When first testing the SDK, it can be a lot easier to use a public client to get a proof of
+    /// concept going, and change it to a confidential client later. You can toggle that setting on
+    /// the OAuth2 page for your application in the Discord developer portal,
+    /// https://discord.com/developers/applications
+    void GetTokenFromProvisionalMerge(uint64_t applicationId,
+                                      std::string const& code,
+                                      std::string const& codeVerifier,
+                                      std::string const& redirectUri,
+                                      discordpp::AuthenticationExternalAuthType externalAuthType,
+                                      std::string const& externalAuthToken,
+                                      discordpp::Client::TokenExchangeCallback callback);
+
+    /// \brief Returns true if the SDK has a non-empty OAuth2 token set, regardless of whether that
+    /// token is valid or not.
+    bool IsAuthenticated();
+
+    /// \brief This function is used to show the device authorization screen and is used for the
+    /// case where the user is on a limited input device, such as a console or smart TV. This
+    /// function should be used in conjunction with a backend server to handle the device
+    /// authorization flow. For a public client, you can use Client::GetTokenFromDevice instead.
+    void OpenAuthorizeDeviceScreen(uint64_t clientId, std::string const& userCode);
+
+    /// \brief Some functions don't work for provisional accounts, and require the user
+    /// merge their account into a full Discord account before proceeding. This
+    /// callback is invoked when an account merge must take place before
+    /// proceeding. The developer is responsible for initiating the account merge,
+    /// and then calling Client::ProvisionalUserMergeCompleted to signal to the SDK that
+    /// the pending operation can continue with the new account.
+    void ProvisionalUserMergeCompleted(bool success);
+
+    /// \brief Generates a new access token for the current user from a refresh token.
+    ///
+    /// Once this is called, the old access and refresh tokens are both invalidated and cannot be
+    /// used again. The callback function will be invoked with a new access and refresh token. See
+    /// GetToken for more details.
+    ///
+    /// NOTE: This function only works for public clients. Public clients are ones that do not have
+    /// a backend server or their own concept of user accounts and simply rely on a separate system
+    /// for authentication like Steam/Epic.
+    ///
+    /// When first testing the SDK, it can be a lot easier to use a public client to get a proof of
+    /// concept going, and change it to a confidential client later. You can toggle that setting on
+    /// the OAuth2 page for your application in the Discord developer portal,
+    /// https://discord.com/developers/applications
+    void RefreshToken(uint64_t applicationId,
+                      std::string const& refreshToken,
+                      discordpp::Client::TokenExchangeCallback callback);
+
+    /// \brief Registers a callback to be invoked when a user requests to initiate the authorization
+    /// flow.
+    ///
+    /// When you register this callback, the Discord app will show new entry points to allow users
+    /// to initiate the authorization flow.
+    ///
+    /// This function is tied to upcoming Discord client functionality experiments that will be
+    /// rolled out to a percentage of Discord users over time. More documentation and implementation
+    /// details to come as the client experiments run.
+    void RegisterAuthorizeRequestCallback(discordpp::Client::AuthorizeRequestCallback callback);
+
+    /// \brief Stops listening for the AUTHORIZE_REQUEST event and removes the registered callback
+    ///
+    /// This function is tied to upcoming Discord client functionality experiments that will be
+    /// rolled out to a percentage of Discord users over time. More documentation and implementation
+    /// details to come as the client experiments run.
+    void RemoveAuthorizeRequestCallback();
+
+    /// \brief Revoke all application access/refresh tokens associated with a user with any valid
+    /// access/refresh token. This will invalidate all tokens and they cannot be used again. This
+    /// is useful if you want to log the user out of the game and invalidate their session.
+    ///
+    /// NOTE: This function only works for public clients. Public clients are ones that do not have
+    /// a backend server or their own concept of user accounts and simply rely on a separate system
+    /// for authentication like Steam/Epic.
+    ///
+    /// When first testing the SDK, it can be a lot easier to use a public client to get a proof of
+    /// concept going, and change it to a confidential client later. You can toggle that setting on
+    /// the OAuth2 page for your application in the Discord developer portal,
+    /// https://discord.com/developers/applications
+    void RevokeToken(uint64_t applicationId,
+                     std::string const& token,
+                     discordpp::Client::RevokeTokenCallback callback);
+
+    /// \brief Sets a callback function to be invoked when the device authorization screen is
+    /// closed.
+    void SetAuthorizeDeviceScreenClosedCallback(
+      discordpp::Client::AuthorizeDeviceScreenClosedCallback cb);
+
+    /// \brief When users are linking their account with Discord, which involves an OAuth2 flow,
+    /// the SDK can streamline it by using Discord's overlay so the interaction happens entirely
+    /// in-game. If your game's main window is not the same process as the one running the
+    /// integration you may need to set the window PID using this method. It defaults to the current
+    /// pid.
+    void SetGameWindowPid(int32_t pid);
+
+    /// \brief Get a notification when the current token is about to expire or expired.
+    ///
+    /// This callback is invoked when the SDK detects that the last token passed to
+    /// Client::UpdateToken is nearing expiration or has expired. This is a signal to the developer
+    /// to refresh the token. The callback is invoked once per token, and will not be invoked again
+    /// until a new token is passed to Client::UpdateToken.
+    ///
+    /// If the token is refreshed before the expiration callback is invoked, call
+    /// Client::UpdateToken to pass in the new token and reconfigure the token expiration.
+    ///
+    /// If your client is disconnected (the token was expired when connecting or was revoked while
+    /// connected), the expiration callback will not be invoked.
+    void SetTokenExpirationCallback(discordpp::Client::TokenExpirationCallback callback);
+
+    /// \brief This function is used to unlink/unmerge a external identity from a Discord account.
+    /// This is useful if the user wants to unlink their external identity from their Discord
+    /// account and create a new provisional account for that identity. This will invalidate all
+    /// access/refresh tokens for the user and they cannot be used again.
+    ///
+    /// This function should be used with the Client::GetProvisionalToken function to get a
+    /// provisional token for the newly created provisional account.
+    ///
+    /// NOTE: This function only works for public clients. Public clients are ones that do not have
+    /// a backend server or their own concept of user accounts and simply rely on a separate system
+    /// for authentication like Steam/Epic.
+    ///
+    /// When first testing the SDK, it can be a lot easier to use a public client to get a proof of
+    /// concept going, and change it to a confidential client later. You can toggle that setting on
+    /// the OAuth2 page for your application in the Discord developer portal,
+    /// https://discord.com/developers/applications
+    void UnmergeIntoProvisionalAccount(
+      uint64_t applicationId,
+      discordpp::AuthenticationExternalAuthType externalAuthType,
+      std::string const& externalAuthToken,
+      discordpp::Client::UnmergeIntoProvisionalAccountCallback callback);
+
+    /// \brief Updates the display name of a provisional account to the specified name.
+    ///
+    /// This should generally be invoked whenever the SDK starts and whenever a provisional account
+    /// changes their name, since the auto-generated name for provisional accounts is just a random
+    /// string.
+    void UpdateProvisionalAccountDisplayName(
+      std::string const& name,
+      discordpp::Client::UpdateProvisionalAccountDisplayNameCallback callback);
+
+    /// \brief Asynchronously sets a new auth token for this client to use.
+    ///
+    /// If your client is already connected, this function *may* trigger a reconnect.
+    /// If your client is not connected, this function will only update the auth token, and so you
+    /// must invoke Client::Connect as well. You should wait for the given callback function to be
+    /// invoked though so that the next Client::Connect attempt uses the updated token.
+    void UpdateToken(discordpp::AuthorizationTokenType tokenType,
+                     std::string token,
+                     discordpp::Client::UpdateTokenCallback callback);
+    /// @}
+
+    /// @name Chat
+    /// @{
+
+    /// \brief Returns true if the given message is able to be viewed in a Discord client.
+    ///
+    /// Not all chat messages are replicated to Discord. For example lobby chat and some DMs
+    /// are ephemeral and not persisted on Discord so cannot be opened. This function checks those
+    /// conditions and makes sure the message is viewable in Discord.
+    bool CanOpenMessageInDiscord(uint64_t messageId);
+
+    /// \brief Deletes the specified message sent by the current user to the specified recipient.
+    void DeleteUserMessage(uint64_t recipientId,
+                           uint64_t messageId,
+                           discordpp::Client::DeleteUserMessageCallback cb);
+
+    /// \brief Edits the specified message sent by the current user to the specified recipient.
+    ///
+    /// All of the same restrictions apply as for sending a message, see SendUserMessage for more.
+    void EditUserMessage(uint64_t recipientId,
+                         uint64_t messageId,
+                         std::string const& content,
+                         discordpp::Client::EditUserMessageCallback cb);
+
+    /// \brief Returns a reference to the Discord channel object for the given ID.
+    ///
+    /// All messages in Discord are sent in a channel, so the most common use for this will be
+    /// to look up the channel a message was sent in.
+    /// For convience this API will also work with lobbies, so the three possible return values
+    /// for the SDK are a DM, an Ephemeral DM, and a Lobby.
+    std::optional<discordpp::ChannelHandle> GetChannelHandle(uint64_t channelId) const;
+
+    /// \brief Retrieves recent messages from the specified lobby.
+    ///
+    /// Returns a list of MessageHandle representing the recent messages in the lobby,
+    /// with a maximum of 200 messages and up to 72 hours.
+    /// The messages are returned in reverse chronological order (newest first).
+    /// This function requires the current user to be a member of the lobby.
+    ///
+    /// Note: This function makes an HTTP request to Discord's API to retrieve messages, as opposed
+    /// to only returning messages that are cached locally by the SDK.
+    ///
+    /// Retrieves recent messages from the specified lobby with the specified limit.
+    void GetLobbyMessagesWithLimit(uint64_t lobbyId,
+                                   int32_t limit,
+                                   discordpp::Client::GetLobbyMessagesCallback cb);
+
+    /// \brief Returns a reference to the Discord message object for the given ID.
+    ///
+    /// The SDK keeps the 25 most recent messages in each channel in memory.
+    /// Messages sent before the SDK was started cannot be accessed with this.
+    std::optional<discordpp::MessageHandle> GetMessageHandle(uint64_t messageId) const;
+
+    /// \brief Retrieves message conversation summaries for all users the current user has DM
+    /// conversations with.
+    ///
+    /// The callback will be invoked with a list of UserMessageSummary objects containing:
+    /// - userId: The ID of the user this conversation is with
+    /// - lastMessageId: The ID of the most recent message in this conversation
+    void GetUserMessageSummaries(discordpp::Client::UserMessageSummariesCallback cb);
+
+    /// \brief Retrieves messages from the DM conversation with the specified user.
+    ///
+    /// Returns a list of MessageHandle representing the recent messages in the conversation with
+    /// the recipient, with a with a maximum of 200 messages and up to 72 hours. The messages are
+    /// returned in reverse chronological order (newest first). This function checks the local cache
+    /// first and only makes an HTTP request to Discord's API if there are not enough cached
+    /// messages available.
+    ///
+    /// If limit is greater than 0, restricts the number of messages returned. If limit is 0
+    /// or negative, the limit parameter is 200 messages and 72 hours. This is intended for
+    /// games to load message history when users open a DM conversation.
+    ///
+    /// If either user hasn't played the game, there will be no channel between them and
+    /// this function will return a 404 `discordpp::ErrorType::HTTPError` error.
+    void GetUserMessagesWithLimit(uint64_t recipientId,
+                                  int32_t limit,
+                                  discordpp::Client::UserMessagesWithLimitCallback cb);
+
+    /// \brief Opens the given message in the Discord client.
+    ///
+    /// This is useful when a message is sent that contains content that cannot be viewed in
+    /// Discord. You can call this function in the click handler for any CTA you show to view the
+    /// message in Discord.
+    void OpenMessageInDiscord(
+      uint64_t messageId,
+      discordpp::Client::ProvisionalUserMergeRequiredCallback provisionalUserMergeRequiredCallback,
+      discordpp::Client::OpenMessageInDiscordCallback callback);
+
+    /// \brief Sends a message in a lobby chat to all members of the lobby.
+    ///
+    /// The content of the message is restricted to 2,000 characters maximum.
+    /// See https://discord.com/developers/docs/resources/message for more details.
+    ///
+    /// The content of the message can also contain special markup for formatting if desired, see
+    /// https://discord.com/developers/docs/reference#message-formatting for more details.
+    ///
+    /// If the lobby is linked to a channel, the message will also be sent to that channel on
+    /// Discord.
+    void SendLobbyMessage(uint64_t lobbyId,
+                          std::string const& content,
+                          discordpp::Client::SendUserMessageCallback cb);
+
+    /// \brief Variant of Client::SendLobbyMessage that also accepts metadata to be sent with the
+    /// message.
+    ///
+    /// Metadata is just simple string key/value pairs.
+    /// An example use case for this might be to include the name of the character that sent a
+    /// message.
+    void SendLobbyMessageWithMetadata(uint64_t lobbyId,
+                                      std::string const& content,
+                                      std::unordered_map<std::string, std::string> const& metadata,
+                                      discordpp::Client::SendUserMessageCallback cb);
+
+    /// \brief Sends a direct message to the specified user.
+    ///
+    /// The content of the message is restricted to 2,000 characters maximum.
+    /// See https://discord.com/developers/docs/resources/message for more details.
+    ///
+    /// The content of the message can also contain special markup for formatting if desired, see
+    /// https://discord.com/developers/docs/reference#message-formatting for more details.
+    ///
+    /// A message can be sent between two users in the following situations:
+    /// - Both users are online and in the game and have not blocked each other
+    /// - Both users are friends with each other
+    /// - Both users share a mutual Discord server and have previously DM'd each other on Discord
+    void SendUserMessage(uint64_t recipientId,
+                         std::string const& content,
+                         discordpp::Client::SendUserMessageCallback cb);
+
+    /// \brief Variant of Client::SendUserMessage that also accepts metadata to be sent with the
+    /// message.
+    ///
+    /// Metadata is just simple string key/value pairs.
+    /// An example use case for this might be to include the name of the character that sent a
+    /// message.
+    void SendUserMessageWithMetadata(uint64_t recipientId,
+                                     std::string const& content,
+                                     std::unordered_map<std::string, std::string> const& metadata,
+                                     discordpp::Client::SendUserMessageCallback cb);
+
+    /// \brief Sets a callback to be invoked whenever a new message is received in either a lobby or
+    /// a DM.
+    ///
+    /// From the messageId you can fetch the MessageHandle and then the ChannelHandle to determine
+    /// the location the message was sent as well.
+    ///
+    /// If the user has the Discord desktop application open on the same machine as the game, then
+    /// they will hear notifications from the Discord application, even though they are able to see
+    /// those messages in game. So to avoid double-notifying users, you should call
+    /// Client::SetShowingChat whenever the chat is shown or hidden to suppress those duplicate
+    /// notifications.
+    void SetMessageCreatedCallback(discordpp::Client::MessageCreatedCallback cb);
+
+    /// \brief Sets a callback to be invoked whenever a message is deleted.
+    ///
+    /// Some messages sent from in game, as well as all messages sent from a connected user's
+    /// Discord client can be edited and deleted in the Discord client. So it is valuable to
+    /// implement support for this callback so that if a user edits or deletes a message in the
+    /// Discord client, it is reflected in game as well.
+    void SetMessageDeletedCallback(discordpp::Client::MessageDeletedCallback cb);
+
+    /// \brief Sets a callback to be invoked whenever a message is edited.
+    ///
+    /// Some messages sent from in game, as well as all messages sent from a connected user's
+    /// Discord client can be edited and deleted in the Discord client. So it is valuable to
+    /// implement support for this callback so that if a user edits or deletes a message in the
+    /// Discord client, it is reflected in game as well.
+    void SetMessageUpdatedCallback(discordpp::Client::MessageUpdatedCallback cb);
+
+    /// \brief Sets whether chat messages are currently being shown in the game.
+    ///
+    /// If the user has the Discord desktop application open on the same machine as the game, then
+    /// they will hear notifications from the Discord application, even though they are able to see
+    /// those messages in game. So to avoid double-notifying users, you can call this function
+    /// whenever the chat is shown or hidden to suppress those duplicate notifications.
+    ///
+    /// Keep in mind, if the game stops showing chat for a period of time, or the game loses focus
+    /// because the user switches to a different app, it is important to call this function again so
+    /// that the user's notifications get re-enabled in Discord during this time.
+    void SetShowingChat(bool showingChat);
+    /// @}
+
+    /// @name Core
+    /// @{
+
+    /// \brief Adds a callback function to be invoked for each new log message generated by the SDK.
+    ///
+    /// This function explicitly excludes most logs for voice and webrtc activity since those are
+    /// generally much noisier and you may want to pick a different log level for those. So it will
+    /// instead include logs for things such as lobbies, relationships, presence, and
+    /// authentication.
+    ///
+    /// We strongly recommend invoking this function immediately after constructing the Client
+    /// object.
+    void AddLogCallback(discordpp::Client::LogCallback callback,
+                        discordpp::LoggingSeverity minSeverity);
+
+    /// \brief Adds a callback function to be invoked for each new log message generated by the
+    /// voice subsystem of the SDK, including the underlying webrtc infrastructure.
+    ///
+    /// We strongly recommend invoking this function immediately after constructing the Client
+    /// object.
+    void AddVoiceLogCallback(discordpp::Client::LogCallback callback,
+                             discordpp::LoggingSeverity minSeverity);
+
+    /// \brief Asynchronously connects the client to Discord.
+    ///
+    /// If a client is disconnecting, this will wait for the disconnect before reconnecting.
+    /// You should use the Client::SetStatusChangedCallback and Client::GetStatus functions to
+    /// receive updates on the client status. The Client is only safe to use once the status changes
+    /// to Status::Ready.
+    void Connect();
+
+    /// \brief Asynchronously disconnects the client.
+    ///
+    /// You can leverage Client::SetStatusChangedCallback and Client::GetStatus to receive updates
+    /// on the client status. It is fully disconnected when the status changes to
+    /// Client::Status::Disconnected.
+    void Disconnect();
+
+    /// \brief Returns the current status of the client, see the Status enum for an explanation of
+    /// the possible values.
+    discordpp::Client::Status GetStatus() const;
+
+    /// \brief Opens the Connected Games settings in the Discord client, which is where
+    /// users can manage their settings related to games using the Discord Social SDK.
+    ///
+    /// If the client isn't connected or the user is a provisional account, this function does
+    /// nothing.
+    ///
+    /// It is always a no-op for console platforms.
+    void OpenConnectedGamesSettingsInDiscord(
+      discordpp::Client::OpenConnectedGamesSettingsInDiscordCallback callback);
+
+    /// \brief This function is used to set the application ID for the client. This is used to
+    /// identify the application to the Discord client. This is used for things like
+    /// authentication, rich presence, and activity invites when *not* connected with
+    /// Client::Connect. When calling Client::Connect, the application ID is set automatically
+    void SetApplicationId(uint64_t applicationId);
+
+    /// \brief Causes logs generated by the SDK to be written to disk in the specified directory.
+    ///
+    /// This function explicitly excludes most logs for voice and webrtc activity since those are
+    /// generally much noisier and you may want to pick a different log level for those. So it will
+    /// instead include logs for things such as lobbies, relationships, presence, and
+    /// authentication. An empty path defaults to logging alongside the client library. A
+    /// minSeverity = LoggingSeverity::None disables logging to a file (also the current default).
+    /// The logs will be placed into a file called "discord.log" in the specified directory.
+    /// Overwrites any existing discord.log file.
+    ///
+    /// We strongly recommend invoking this function immediately after constructing the Client
+    /// object.
+    ///
+    /// Returns true if the log file was successfully opened, false otherwise.
+    bool SetLogDir(std::string const& path, discordpp::LoggingSeverity minSeverity);
+
+    /// \brief Sets a callback function to be invoked whenever the SDKs status changes.
+    void SetStatusChangedCallback(discordpp::Client::OnStatusChanged cb);
+
+    /// \brief Causes logs generated by the voice subsystem of the SDK to be written to disk in the
+    /// specified directory.
+    ///
+    /// These logs will be in a file like discord-webrtc_0, and if they grow to big will be rotated
+    /// and the number incremented. If the log files already exist the old ones will be renamed to
+    /// discord-last-webrtc_0.
+    ///
+    /// An empty path defaults to logging alongside the client library.
+    /// A minSeverity = LoggingSeverity::None disables logging to a file (also the current default).
+    ///
+    /// WARNING: This function MUST be invoked immediately after constructing the Client object!
+    /// It will print out a warning if invoked too late.
+    void SetVoiceLogDir(std::string const& path, discordpp::LoggingSeverity minSeverity);
+    /// @}
+
+    /// @name Lobbies
+    /// @{
+
+    /// \brief Joins the user to the specified lobby, creating one if it does not exist.
+    ///
+    /// The lobby is specified by the supplied string, which should be a hard to guess secret
+    /// generated by the game. All users who join the lobby with the same secret will be placed in
+    /// the same lobby.
+    ///
+    /// For exchanging the secret, we strongly encourage looking into the activity invite and rich
+    /// presence systems which provide a way to include a secret string that only accepted party
+    /// members are able to see.
+    ///
+    /// As with server created lobbies, client created lobbies auto-delete once they have been idle
+    /// for a few minutes (which currently defaults to 5 minutes). A lobby is idle if no users are
+    /// connected to it.
+    ///
+    /// This function shouldn't be used for long lived lobbies. The "secret" value expires after ~30
+    /// days, at which point the existing lobby cannot be joined and a new one would be created
+    /// instead.
+    void CreateOrJoinLobby(std::string const& secret,
+                           discordpp::Client::CreateOrJoinLobbyCallback callback);
+
+    /// \brief Variant of Client::CreateOrJoinLobby that also accepts developer-supplied metadata.
+    ///
+    /// Metadata is just simple string key/value pairs.
+    /// An example use case for this might be to the internal game ID of the user of each lobby so
+    /// all members of the lobby can have a mapping of discord IDs to game IDs. Subsequent calls to
+    /// CreateOrJoinLobby will overwrite the metadata for the lobby and member.
+    void CreateOrJoinLobbyWithMetadata(
+      std::string const& secret,
+      std::unordered_map<std::string, std::string> const& lobbyMetadata,
+      std::unordered_map<std::string, std::string> const& memberMetadata,
+      discordpp::Client::CreateOrJoinLobbyCallback callback);
+
+    /// \brief Fetches all of the channels that the current user can access in the given guild.
+    /// Channels are sorted by their `position` field, which matches what you see in the Discord
+    /// client.
+    ///
+    /// The purpose of this is to power the channel linking flow for linking a Discord channel to an
+    /// in-game lobby. So this function can be used to power a UI to let the user pick which channel
+    /// to link to once they have picked a guild. See the docs on LobbyHandle for more information.
+    void GetGuildChannels(uint64_t guildId, discordpp::Client::GetGuildChannelsCallback cb);
+
+    /// \brief Returns a reference to the Discord lobby object for the given ID.
+    std::optional<discordpp::LobbyHandle> GetLobbyHandle(uint64_t lobbyId) const;
+
+    /// \brief Returns a list of all the lobbies that the user is a member of and the SDK has
+    /// loaded.
+    ///
+    /// Lobbies are optimistically loaded when the SDK starts but in some cases may not be available
+    /// immediately after the SDK status changes to Status::Ready.
+    std::vector<uint64_t> GetLobbyIds() const;
+
+    /// \brief Fetches all of the guilds (also known as Discord servers) that the current user is a
+    /// member of.
+    ///
+    /// The purpose of this is to power the channel linking flow for linking a Discord channel
+    /// to an in-game lobby. So this function can be used to power a UI to let the user which guild
+    /// to link to. See the docs on LobbyHandle for more information.
+    void GetUserGuilds(discordpp::Client::GetUserGuildsCallback cb);
+
+    /// \brief Invites the current user to the Discord guild of the channel that is linked to the
+    /// specified lobby. The user is forwarded to the Discord client with the resulting invite url,
+    /// upon which the user can decide to accept or decline that invite.
+    ///
+    /// On console platforms, the user is not navigated to any Discord client, so the invite url
+    /// should be presented to the user in some way, so they can use it.
+    void JoinLinkedLobbyGuild(
+      uint64_t lobbyId,
+      discordpp::Client::ProvisionalUserMergeRequiredCallback provisionalUserMergeRequiredCallback,
+      discordpp::Client::JoinLinkedLobbyGuildCallback callback);
+
+    /// \brief Removes the current user from the specified lobby.
+    ///
+    /// Only lobbies that contain a "secret" can be left.
+    /// In other words, only lobbies created with Client::CreateOrJoinLobby can be left.
+    /// Lobbies created using the server API may not be manipulated by clients, so you must
+    /// use the server API to remove them too.
+    void LeaveLobby(uint64_t lobbyId, discordpp::Client::LeaveLobbyCallback callback);
+
+    /// \brief Links the specified channel on Discord to the specified in-game lobby.
+    ///
+    /// Any message sent in one will be copied over to the other!
+    /// See the docs on LobbyHandle for more information.
+    void LinkChannelToLobby(uint64_t lobbyId,
+                            uint64_t channelId,
+                            discordpp::Client::LinkOrUnlinkChannelCallback callback);
+
+    /// \brief Sets a callback to be invoked when a lobby "becomes available" to the client.
+    ///
+    /// A lobby can become available in a few situations:
+    /// - A new lobby is created and the current user is a member of it
+    /// - The current user is added to an existing lobby
+    /// - A lobby recovers after a backend crash and is available once again
+    ///
+    /// This means that the LobbyCreated callback can be invoked more than once in a single session!
+    /// Generally though it should never be invoked twice in a row. For example if a lobby crashes
+    /// or a user is removed from the lobby, you should expect to have the LobbyDeleted callback
+    /// invoked first.
+    void SetLobbyCreatedCallback(discordpp::Client::LobbyCreatedCallback cb);
+
+    /// \brief Sets a callback to be invoked when a lobby is no longer available.
+    ///
+    /// This callback can be invoked in a number of situations:
+    /// - A lobby the user is a member of is deleted
+    /// - The current user is removed from a lobby
+    /// - There is a backend crash that causes the lobby to be unavailable for all users
+    ///
+    /// This means that this callback might be invoked even though the lobby still exists for other
+    /// users!
+    void SetLobbyDeletedCallback(discordpp::Client::LobbyDeletedCallback cb);
+
+    /// \brief Sets a callback function to be invoked whenever a user is added to a lobby.
+    ///
+    /// This callback will not be invoked when the current user is added to a lobby, instead the
+    /// LobbyCreated callback will be invoked. Additionally, the SDK separates membership in a lobby
+    /// from whether a user is connected to a lobby. So a user being added does not necessarily mean
+    /// they are online and in the lobby at that moment, just that they have permission to connect
+    /// to that lobby.
+    void SetLobbyMemberAddedCallback(discordpp::Client::LobbyMemberAddedCallback cb);
+
+    /// \brief Sets a callback function to be invoked whenever a member of a lobby is removed and
+    /// can no longer connect to it.
+    ///
+    /// This callback will not be invoked when the current user is removed from a lobby, instead
+    /// LobbyDeleted callback will be invoked. Additionally this is not invoked when a user simply
+    /// exits the game. That would cause the LobbyMemberUpdatedCallback to be invoked, and the
+    /// LobbyMemberHandle object will indicate they are not connected now.
+    void SetLobbyMemberRemovedCallback(discordpp::Client::LobbyMemberRemovedCallback cb);
+
+    /// \brief Sets a callback function to be invoked whenever a member of a lobby is changed.
+    ///
+    /// This is invoked when:
+    /// - The user connects or disconnects
+    /// - The metadata of the member is changed
+    void SetLobbyMemberUpdatedCallback(discordpp::Client::LobbyMemberUpdatedCallback cb);
+
+    /// \brief Sets a callback to be invoked when a lobby is edited, for example if the lobby's
+    /// metadata is changed.
+    void SetLobbyUpdatedCallback(discordpp::Client::LobbyUpdatedCallback cb);
+
+    /// \brief Removes any existing channel link from the specified lobby.
+    ///
+    /// See the docs on LobbyHandle for more information.
+    /// A lobby can be unlinked by any user with the LobbyMemberFlags::CanLinkLobby flag, they do
+    /// not need to have any permissions on the Discord channel in order to sever the in-game link.
+    void UnlinkChannelFromLobby(uint64_t lobbyId,
+                                discordpp::Client::LinkOrUnlinkChannelCallback callback);
+    /// @}
+
+    /// @name Mobile
+    /// @{
+
+    /// \brief Checks whether the Discord mobile app is installed on this device.
+    /// On desktop platforms, always returns false.
+    ///
+    /// This check does not require a client connection and can be called at any time.
+    ///
+    /// This can be used to provide UI hints to users about whether they can authorize via the
+    /// Discord app, or whether they will need to use a web browser flow.
+    ///
+    /// Platform Requirements:
+    /// - iOS: Your app must include "discord" in the LSApplicationQueriesSchemes array
+    ///   in your Info.plist for this check to work correctly.
+    /// - Android: Your app must include "com.discord" in the `queries` element
+    ///   in your AndroidManifest.xml (required for Android 11+).
+    void IsDiscordAppInstalled(discordpp::Client::IsDiscordAppInstalledCallback callback);
+    /// @}
+
+    /// @name Presence
+    /// @{
+
+    /// \brief Accepts an activity invite that the current user has received.
+    ///
+    /// The given callback will be invoked with the join secret for the activity, which can be used
+    /// to join the user to the game's internal party system for example.
+    /// This join secret comes from the other user's rich presence activity.
+    void AcceptActivityInvite(discordpp::ActivityInvite invite,
+                              discordpp::Client::AcceptActivityInviteCallback cb);
+
+    /// \brief Clears the right presence for the current user.
+    void ClearRichPresence();
+
+    /// \brief When a user accepts an activity invite for your game within the Discord client,
+    /// Discord needs to know how to launch the game for that user. This function allows you to
+    /// register a command that Discord will run to launch your game. You should invoke this when
+    /// the SDK starts up so that if the user in the future tries to join from Discord the game will
+    /// be able to be launched for them. Returns true if the command was successfully registered,
+    /// false otherwise.
+    ///
+    /// On Windows and Linux, this command should be a path to an executable. It also supports any
+    /// launch parameters that may be needed, like
+    /// "C:\path\to my\game.exe" --full-screen --no-hax
+    /// If you pass an empty string in for the command, the SDK will register the current running
+    /// executable. To launch the game from a custom protocol like my-awesome-game://, pass that in
+    /// as an argument of the executable that should be launched by that protocol. For example,
+    /// "C:\path\to my\game.exe" my-awesome-game://
+    ///
+    /// On macOS, due to the way Discord registers executables, your game needs to be bundled for
+    /// this command to work. That means it should be a .app. You can pass a custom protocol like
+    /// my-awesome-game:// as the custom command, but *not* a path to an executable. If you pass an
+    /// empty string in for the command, the SDK will register the current running bundle, if any.
+    bool RegisterLaunchCommand(uint64_t applicationId, std::string command);
+
+    /// \brief When a user accepts an activity invite for your game within the Discord client,
+    /// Discord needs to know how to launch the game for that user. For steam games, this function
+    /// allows you to indicate to Discord what the steam game ID is. You should invoke this when the
+    /// SDK starts up so that if the user in the future tries to join from Discord the game will be
+    /// able to be launched for them. Returns true if the command was successfully registered, false
+    /// otherwise.
+    bool RegisterLaunchSteamApplication(uint64_t applicationId, uint32_t steamAppId);
+
+    /// \brief Sends a Discord activity invite to the specified user.
+    ///
+    /// The invite is sent as a message on Discord, which means it can be sent if any
+    /// of the following are true:
+    /// - Both users are online and in the game and have not blocked each other
+    /// - Both users are friends with each other
+    /// - Both users share a mutual Discord server and have previously DM'd each other on Discord
+    ///
+    /// You can optionally include some message content to include in the message containing the
+    /// invite, but it's ok to pass an empty string too.
+    void SendActivityInvite(uint64_t userId,
+                            std::string const& content,
+                            discordpp::Client::SendActivityInviteCallback cb);
+
+    /// \brief Requests to join the activity of the specified user.
+    ///
+    /// This can be called whenever the target user has a rich presence activity for the current
+    /// game and that activity has space for another user to join them.
+    ///
+    /// That user will basically receive an activity invite which they can accept or reject.
+    void SendActivityJoinRequest(uint64_t userId, discordpp::Client::SendActivityInviteCallback cb);
+
+    /// \brief When another user requests to join the current user's party, this function is called
+    /// to to allow that user to join. Specifically this will send the original user an activity
+    /// invite which they then need to accept again.
+    void SendActivityJoinRequestReply(discordpp::ActivityInvite invite,
+                                      discordpp::Client::SendActivityInviteCallback cb);
+
+    /// \brief Sets a callback function that is invoked when the current user receives an activity
+    /// invite from another user.
+    ///
+    /// These invites are always sent as messages, so the SDK is parsing these
+    /// messages to look for invites and invokes this callback instead. The message create callback
+    /// will not be invoked for these messages. The invite object contains all the necessary
+    /// information to identity the invite, which you can later pass to
+    /// Client::AcceptActivityInvite.
+    void SetActivityInviteCreatedCallback(discordpp::Client::ActivityInviteCallback cb);
+
+    /// \brief Sets a callback function that is invoked when an existing activity invite changes.
+    /// Currently, the only thing that changes on an activity invite is its validity. If the sender
+    /// goes offline or exits the party the receiver was invited to, the invite is no longer
+    /// joinable. It is possible for an invalid invite to go from invalid to valid if the sender
+    /// rejoins the activity.
+    void SetActivityInviteUpdatedCallback(discordpp::Client::ActivityInviteCallback cb);
+
+    /// \brief Sets a callback function that is invoked when the current user also has Discord
+    /// running on their computer and they accept an activity invite in the Discord client.
+    ///
+    /// This callback is invoked with the join secret from the activity rich presence, which you can
+    /// use to join them to the game's internal party system. See Activity for more information on
+    /// invites.
+    void SetActivityJoinCallback(discordpp::Client::ActivityJoinCallback cb);
+
+    /// \brief Sets a callback function that is invoked when the current user also has Discord
+    /// running on their computer and they accept an activity invite in the Discord client.
+    ///
+    /// This callback is invoked with the join secret from the activity rich presence, which you can
+    /// use to join them to the game's internal party system. See Activity for more information on
+    /// invites.
+    void SetActivityJoinWithApplicationCallback(
+      discordpp::Client::ActivityJoinWithApplicationCallback cb);
+
+    /// \brief Sets whether a user is online/invisible/idle/dnd on Discord.
+    void SetOnlineStatus(discordpp::StatusType status,
+                         discordpp::Client::UpdateStatusCallback callback);
+
+    /// \brief Updates the rich presence for the current user.
+    ///
+    /// You should use rich presence so that other users on Discord know this user is playing a game
+    /// and you can include some hints of what they are playing such as a character name or map
+    /// name. Rich presence also enables Discord game invites to work too!
+    ///
+    /// Note: On Desktop, rich presence can be set before calling Client::Connect, but it will be
+    /// cleared if the Client connects. When Client is not connected, this sets the rich presence in
+    /// the current user's Discord client when available.
+    ///
+    /// See the docs on the Activity struct for more details.
+    ///
+    /// Note: The Activity object here is a partial object, fields such as name, and applicationId
+    /// cannot be set and will be overwritten by the SDK. See
+    /// https://discord.com/developers/docs/rich-presence/using-with-the-game-sdk#partial-activity-struct
+    /// for more information.
+    void UpdateRichPresence(discordpp::Activity activity,
+                            discordpp::Client::UpdateRichPresenceCallback cb);
+    /// @}
+
+    /// @name Relationships
+    /// @{
+
+    /// \brief Accepts an incoming Discord friend request from the target user.
+    ///
+    /// Fails if the target user has not sent a Discord friend request to the current user, meaning
+    /// that the Discord relationship type between the users must be
+    /// RelationshipType::PendingIncoming.
+    void AcceptDiscordFriendRequest(uint64_t userId,
+                                    discordpp::Client::UpdateRelationshipCallback cb);
+
+    /// \brief Accepts an incoming game friend request from the target user.
+    ///
+    /// Fails if the target user has not sent a game friend request to the current user, meaning
+    /// that the game relationship type between the users must be RelationshipType::PendingIncoming.
+    void AcceptGameFriendRequest(uint64_t userId, discordpp::Client::UpdateRelationshipCallback cb);
+
+    /// \brief Blocks the target user so that they cannot send the user friend or activity invites
+    /// and cannot message them anymore.
+    ///
+    /// Blocking a user will also remove any existing relationship
+    /// between the two users, and persists across games, so blocking a user in one game or on
+    /// Discord will block them in all other games and on Discord as well.
+    void BlockUser(uint64_t userId, discordpp::Client::UpdateRelationshipCallback cb);
+
+    /// \brief Cancels an outgoing Discord friend request to the target user.
+    ///
+    /// Fails if a Discord friend request has not been sent to the target user, meaning
+    /// that the Discord relationship type between the users must be
+    /// RelationshipType::PendingOutgoing.
+    void CancelDiscordFriendRequest(uint64_t userId,
+                                    discordpp::Client::UpdateRelationshipCallback cb);
+
+    /// \brief Cancels an outgoing game friend request to the target user.
+    ///
+    /// Fails if a game friend request has not been sent to the target user, meaning
+    /// that the game relationship type between the users must be RelationshipType::PendingOutgoing.
+    void CancelGameFriendRequest(uint64_t userId, discordpp::Client::UpdateRelationshipCallback cb);
+
+    /// \brief Returns the RelationshipHandle that corresponds to the relationship between the
+    /// current user and the given user.
+    discordpp::RelationshipHandle GetRelationshipHandle(uint64_t userId) const;
+
+    /// \brief Returns a list of all of the relationships the current user has with others,
+    /// including all Discord relationships and all Game relationships for the current game.
+    std::vector<discordpp::RelationshipHandle> GetRelationships() const;
+
+    /// \brief Returns a list of relationships that belong to the specified relationship group type.
+    /// Relationships are logically partitioned into groups based on online status and game
+    /// activity:
+    /// - OnlinePlayingGame: Users who are online and currently playing the game
+    /// - OnlineElsewhere: Users who are online but not playing the game (users who have played the
+    /// game before are sorted to the top)
+    /// - Offline: Users who are offline
+    std::vector<discordpp::RelationshipHandle> GetRelationshipsByGroup(
+      discordpp::RelationshipGroupType groupType) const;
+
+    /// \brief Declines an incoming Discord friend request from the target user.
+    ///
+    /// Fails if the target user has not sent a Discord friend request to the current user, meaning
+    /// that the Discord relationship type between the users must be
+    /// RelationshipType::PendingIncoming.
+    void RejectDiscordFriendRequest(uint64_t userId,
+                                    discordpp::Client::UpdateRelationshipCallback cb);
+
+    /// \brief Declines an incoming game friend request from the target user.
+    ///
+    /// Fails if the target user has not sent a game friend request to the current user, meaning
+    /// that the game relationship type between the users must be RelationshipType::PendingIncoming.
+    void RejectGameFriendRequest(uint64_t userId, discordpp::Client::UpdateRelationshipCallback cb);
+
+    /// \brief Removes any friendship between the current user and the target user. This function
+    /// will remove BOTH any Discord friendship and any game friendship between the users.
+    ///
+    /// Fails if the target user is not currently a Discord OR game friend with the current user.
+    void RemoveDiscordAndGameFriend(uint64_t userId,
+                                    discordpp::Client::UpdateRelationshipCallback cb);
+
+    /// \brief Removes any game friendship between the current user and the target user.
+    ///
+    /// Fails if the target user is not currently a game friend with the current user.
+    void RemoveGameFriend(uint64_t userId, discordpp::Client::UpdateRelationshipCallback cb);
+
+    /// \brief Searches all of your friends by both username and display name, returning
+    /// a list of all friends that match the search string.
+    ///
+    /// Under the hood uses the Levenshtein distance algorithm.
+    std::vector<discordpp::UserHandle> SearchFriendsByUsername(std::string searchStr) const;
+
+    /// \brief Sends a Discord friend request to the target user.
+    ///
+    /// The target user is identified by their Discord unique username (not their DisplayName).
+    ///
+    /// After the friend request is sent, each user will have a new Discord relationship created.
+    /// For the current user the RelationshipHandle::DiscordRelationshipType will be
+    /// RelationshipType::PendingOutgoing and for the target user it will be
+    /// RelationshipType::PendingIncoming.
+    ///
+    /// If the current user already has received a Discord friend request from the target user
+    /// (meaning RelationshipHandle::DiscordRelationshipType is RelationshipType::PendingIncoming),
+    /// then the two users will become Discord friends.
+    ///
+    /// See RelationshipHandle for more information on the difference between Discord and Game
+    /// relationships.
+    void SendDiscordFriendRequest(std::string const& username,
+                                  discordpp::Client::SendFriendRequestCallback cb);
+
+    /// \brief Sends a Discord friend request to the target user.
+    ///
+    /// The target user is identified by their Discord ID.
+    ///
+    /// After the friend request is sent, each user will have a new Discord relationship created.
+    /// For the current user the RelationshipHandle::DiscordRelationshipType will be
+    /// RelationshipType::PendingOutgoing and for the target user it will be
+    /// RelationshipType::PendingIncoming.
+    ///
+    /// If the current user already has received a Discord friend request from the target user
+    /// (meaning RelationshipHandle::DiscordRelationshipType is RelationshipType::PendingIncoming),
+    /// then the two users will become Discord friends.
+    ///
+    /// See RelationshipHandle for more information on the difference between Discord and Game
+    /// relationships.
+    void SendDiscordFriendRequestById(uint64_t userId,
+                                      discordpp::Client::UpdateRelationshipCallback cb);
+
+    /// \brief Sends (or accepts) a game friend request to the target user.
+    ///
+    /// The target user is identified by their Discord unique username (not their DisplayName).
+    ///
+    /// After the friend request is sent, each user will have a new game relationship created. For
+    /// the current user the RelationshipHandle::GameRelationshipType will be
+    /// RelationshipType::PendingOutgoing and for the target user it will be
+    /// RelationshipType::PendingIncoming.
+    ///
+    /// If the current user already has received a game friend request from the target user
+    /// (meaning RelationshipHandle::GameRelationshipType is RelationshipType::PendingIncoming),
+    /// then the two users will become game friends.
+    ///
+    /// See RelationshipHandle for more information on the difference between Discord and Game
+    /// relationships.
+    void SendGameFriendRequest(std::string const& username,
+                               discordpp::Client::SendFriendRequestCallback cb);
+
+    /// \brief Sends (or accepts) a game friend request to the target user.
+    ///
+    /// The target user is identified by their Discord ID.
+    ///
+    /// After the friend request is sent, each user will have a new game relationship created. For
+    /// the current user the RelationshipHandle::GameRelationshipType will be
+    /// RelationshipType::PendingOutgoing and for the target user it will be
+    /// RelationshipType::PendingIncoming.
+    ///
+    /// If the current user already has received a game friend request from the target user
+    /// (meaning RelationshipHandle::GameRelationshipType is RelationshipType::PendingIncoming),
+    /// then the two users will become game friends.
+    ///
+    /// See RelationshipHandle for more information on the difference between Discord and Game
+    /// relationships.
+    void SendGameFriendRequestById(uint64_t userId,
+                                   discordpp::Client::UpdateRelationshipCallback cb);
+
+    /// \brief Sets a callback to be invoked whenever a relationship for this user is established or
+    /// changes type.
+    ///
+    /// This can be invoked when a user sends or accepts a friend invite or blocks a user for
+    /// example.
+    void SetRelationshipCreatedCallback(discordpp::Client::RelationshipCreatedCallback cb);
+
+    /// \brief Sets a callback to be invoked whenever a relationship for this user is removed,
+    /// such as when the user rejects a friend request or removes a friend.
+    ///
+    /// When a relationship is removed, Client::GetRelationshipHandle will
+    /// return a relationship with the type set to RelationshipType::None.
+    void SetRelationshipDeletedCallback(discordpp::Client::RelationshipDeletedCallback cb);
+
+    /// \brief Unblocks the target user. Does not restore any old relationship between the users
+    /// though.
+    ///
+    /// Fails if the target user is not currently blocked.
+    void UnblockUser(uint64_t userId, discordpp::Client::UpdateRelationshipCallback cb);
+    /// @}
+
+    /// @name Users
+    /// @{
+
+    /// \brief Unlike GetCurrentUser(), this method returns std::nullopt instead of a dummy object
+    /// when no user is authenticated or available. This provides clearer intent about when
+    /// the user data is actually available.
+    std::optional<discordpp::UserHandle> GetCurrentUserV2() const;
+
+    /// \brief If the Discord app is running on the user's computer and the SDK establishes a
+    /// connection to it, this function will return the user that is currently logged in to the
+    /// Discord app.
+    void GetDiscordClientConnectedUser(
+      uint64_t applicationId,
+      discordpp::Client::GetDiscordClientConnectedUserCallback callback) const;
+
+    /// \brief Returns the UserHandle associated with the given user ID.
+    ///
+    /// It will not fetch a user from Discord's API if it is not available. Generally you can trust
+    /// that users will be available for all relationships and for the authors of any messages
+    /// received.
+    std::optional<discordpp::UserHandle> GetUser(uint64_t userId) const;
+
+    /// \brief The RelationshipGroupsUpdatedCallback is invoked whenever any user in the friends
+    /// list changes. This is intended to be the callback used to ensure the friends list is kept
+    /// fresh. This can be used in tandem with Client::GetRelationshipsByGroup to build and update
+    /// the friends list.
+    void SetRelationshipGroupsUpdatedCallback(
+      discordpp::Client::RelationshipGroupsUpdatedCallback cb);
+
+    /// \brief The UserUpdatedCallback is invoked whenever *any* user the current session knows
+    /// about changes, not just if the current user changes. For example if one of your Discord
+    /// friends changes their name or avatar the UserUpdatedCallback will be invoked. It is also
+    /// invoked when users come online, go offline, or start playing your game.
+    void SetUserUpdatedCallback(discordpp::Client::UserUpdatedCallback cb);
+    /// @}
+};
+
+/// \brief Convenience class that represents the state of a single Discord call in a lobby.
+class CallInfoHandle {
+    /// \cond
+    mutable Discord_CallInfoHandle instance_{};
+    DiscordObjectState state_ = DiscordObjectState::Invalid;
+    /// \endcond
+
+public:
+    /// \cond
+    Discord_CallInfoHandle* instance() const { return &instance_; }
+    /// \endcond
+    /// \cond
+    explicit CallInfoHandle(Discord_CallInfoHandle instance, DiscordObjectState state);
+    ~CallInfoHandle();
+    /// \endcond
+    /// Move constructor for CallInfoHandle
+    CallInfoHandle(CallInfoHandle&& other) noexcept;
+    /// Move assignment operator for CallInfoHandle
+    CallInfoHandle& operator=(CallInfoHandle&& other) noexcept;
+    /// Uninitialized instance of CallInfoHandle
+    static const CallInfoHandle nullobj;
+    /// Returns true if the instance contains a valid object
+    operator bool() const { return state_ != DiscordObjectState::Invalid; }
+
+    /// Copy constructor for CallInfoHandle
+    CallInfoHandle(const CallInfoHandle& other);
+    /// Copy assignment operator for CallInfoHandle
+    CallInfoHandle& operator=(const CallInfoHandle& other);
+
+    /// \cond
+    void Drop();
+    /// \endcond
+
+    /// \brief Returns the lobby ID of the call.
+    uint64_t ChannelId() const;
+
+    /// \brief Returns a list of the user IDs of the participants in the call.
+    std::vector<uint64_t> GetParticipants() const;
+
+    /// \brief Accesses the voice state for a single user so you can know if they have muted or
+    /// deafened themselves.
+    std::optional<discordpp::VoiceStateHandle> GetVoiceStateHandle(uint64_t userId) const;
+
+    /// \brief Returns the lobby ID of the call.
+    uint64_t GuildId() const;
+};
+/// Converts a discordpp::ActivityActionTypes to a string.
+inline const char* EnumToString(discordpp::ActivityActionTypes value)
+{
+    switch (value) {
+    case discordpp::ActivityActionTypes::Invalid:
+        return "Invalid";
+    case discordpp::ActivityActionTypes::Join:
+        return "Join";
+    case discordpp::ActivityActionTypes::JoinRequest:
+        return "JoinRequest";
+    default:
+        return "unknown";
+    }
+}
+/// Converts a discordpp::ActivityPartyPrivacy to a string.
+inline const char* EnumToString(discordpp::ActivityPartyPrivacy value)
+{
+    switch (value) {
+    case discordpp::ActivityPartyPrivacy::Private:
+        return "Private";
+    case discordpp::ActivityPartyPrivacy::Public:
+        return "Public";
+    default:
+        return "unknown";
+    }
+}
+/// Converts a discordpp::ActivityTypes to a string.
+inline const char* EnumToString(discordpp::ActivityTypes value)
+{
+    switch (value) {
+    case discordpp::ActivityTypes::Playing:
+        return "Playing";
+    case discordpp::ActivityTypes::Streaming:
+        return "Streaming";
+    case discordpp::ActivityTypes::Listening:
+        return "Listening";
+    case discordpp::ActivityTypes::Watching:
+        return "Watching";
+    case discordpp::ActivityTypes::CustomStatus:
+        return "CustomStatus";
+    case discordpp::ActivityTypes::Competing:
+        return "Competing";
+    case discordpp::ActivityTypes::HangStatus:
+        return "HangStatus";
+    default:
+        return "unknown";
+    }
+}
+/// Converts a discordpp::StatusDisplayTypes to a string.
+inline const char* EnumToString(discordpp::StatusDisplayTypes value)
+{
+    switch (value) {
+    case discordpp::StatusDisplayTypes::Name:
+        return "Name";
+    case discordpp::StatusDisplayTypes::State:
+        return "State";
+    case discordpp::StatusDisplayTypes::Details:
+        return "Details";
+    default:
+        return "unknown";
+    }
+}
+/// Converts a discordpp::ActivityGamePlatforms to a string.
+inline const char* EnumToString(discordpp::ActivityGamePlatforms value)
+{
+    switch (value) {
+    case discordpp::ActivityGamePlatforms::Desktop:
+        return "Desktop";
+    case discordpp::ActivityGamePlatforms::Xbox:
+        return "Xbox";
+    case discordpp::ActivityGamePlatforms::Samsung:
+        return "Samsung";
+    case discordpp::ActivityGamePlatforms::IOS:
+        return "IOS";
+    case discordpp::ActivityGamePlatforms::Android:
+        return "Android";
+    case discordpp::ActivityGamePlatforms::Embedded:
+        return "Embedded";
+    case discordpp::ActivityGamePlatforms::PS4:
+        return "PS4";
+    case discordpp::ActivityGamePlatforms::PS5:
+        return "PS5";
+    default:
+        return "unknown";
+    }
+}
+/// Converts a discordpp::ErrorType to a string.
+inline const char* EnumToString(discordpp::ErrorType value)
+{
+    switch (value) {
+    case discordpp::ErrorType::None:
+        return "None";
+    case discordpp::ErrorType::NetworkError:
+        return "NetworkError";
+    case discordpp::ErrorType::HTTPError:
+        return "HTTPError";
+    case discordpp::ErrorType::ClientNotReady:
+        return "ClientNotReady";
+    case discordpp::ErrorType::Disabled:
+        return "Disabled";
+    case discordpp::ErrorType::ClientDestroyed:
+        return "ClientDestroyed";
+    case discordpp::ErrorType::ValidationError:
+        return "ValidationError";
+    case discordpp::ErrorType::Aborted:
+        return "Aborted";
+    case discordpp::ErrorType::AuthorizationFailed:
+        return "AuthorizationFailed";
+    case discordpp::ErrorType::RPCError:
+        return "RPCError";
+    default:
+        return "unknown";
+    }
+}
+/// Converts a discordpp::HttpStatusCode to a string.
+inline const char* EnumToString(discordpp::HttpStatusCode value)
+{
+    switch (value) {
+    case discordpp::HttpStatusCode::None:
+        return "None";
+    case discordpp::HttpStatusCode::Continue:
+        return "Continue";
+    case discordpp::HttpStatusCode::SwitchingProtocols:
+        return "SwitchingProtocols";
+    case discordpp::HttpStatusCode::Processing:
+        return "Processing";
+    case discordpp::HttpStatusCode::EarlyHints:
+        return "EarlyHints";
+    case discordpp::HttpStatusCode::Ok:
+        return "Ok";
+    case discordpp::HttpStatusCode::Created:
+        return "Created";
+    case discordpp::HttpStatusCode::Accepted:
+        return "Accepted";
+    case discordpp::HttpStatusCode::NonAuthoritativeInfo:
+        return "NonAuthoritativeInfo";
+    case discordpp::HttpStatusCode::NoContent:
+        return "NoContent";
+    case discordpp::HttpStatusCode::ResetContent:
+        return "ResetContent";
+    case discordpp::HttpStatusCode::PartialContent:
+        return "PartialContent";
+    case discordpp::HttpStatusCode::MultiStatus:
+        return "MultiStatus";
+    case discordpp::HttpStatusCode::AlreadyReported:
+        return "AlreadyReported";
+    case discordpp::HttpStatusCode::ImUsed:
+        return "ImUsed";
+    case discordpp::HttpStatusCode::MultipleChoices:
+        return "MultipleChoices";
+    case discordpp::HttpStatusCode::MovedPermanently:
+        return "MovedPermanently";
+    case discordpp::HttpStatusCode::Found:
+        return "Found";
+    case discordpp::HttpStatusCode::SeeOther:
+        return "SeeOther";
+    case discordpp::HttpStatusCode::NotModified:
+        return "NotModified";
+    case discordpp::HttpStatusCode::TemporaryRedirect:
+        return "TemporaryRedirect";
+    case discordpp::HttpStatusCode::PermanentRedirect:
+        return "PermanentRedirect";
+    case discordpp::HttpStatusCode::BadRequest:
+        return "BadRequest";
+    case discordpp::HttpStatusCode::Unauthorized:
+        return "Unauthorized";
+    case discordpp::HttpStatusCode::PaymentRequired:
+        return "PaymentRequired";
+    case discordpp::HttpStatusCode::Forbidden:
+        return "Forbidden";
+    case discordpp::HttpStatusCode::NotFound:
+        return "NotFound";
+    case discordpp::HttpStatusCode::MethodNotAllowed:
+        return "MethodNotAllowed";
+    case discordpp::HttpStatusCode::NotAcceptable:
+        return "NotAcceptable";
+    case discordpp::HttpStatusCode::ProxyAuthRequired:
+        return "ProxyAuthRequired";
+    case discordpp::HttpStatusCode::RequestTimeout:
+        return "RequestTimeout";
+    case discordpp::HttpStatusCode::Conflict:
+        return "Conflict";
+    case discordpp::HttpStatusCode::Gone:
+        return "Gone";
+    case discordpp::HttpStatusCode::LengthRequired:
+        return "LengthRequired";
+    case discordpp::HttpStatusCode::PreconditionFailed:
+        return "PreconditionFailed";
+    case discordpp::HttpStatusCode::PayloadTooLarge:
+        return "PayloadTooLarge";
+    case discordpp::HttpStatusCode::UriTooLong:
+        return "UriTooLong";
+    case discordpp::HttpStatusCode::UnsupportedMediaType:
+        return "UnsupportedMediaType";
+    case discordpp::HttpStatusCode::RangeNotSatisfiable:
+        return "RangeNotSatisfiable";
+    case discordpp::HttpStatusCode::ExpectationFailed:
+        return "ExpectationFailed";
+    case discordpp::HttpStatusCode::MisdirectedRequest:
+        return "MisdirectedRequest";
+    case discordpp::HttpStatusCode::UnprocessableEntity:
+        return "UnprocessableEntity";
+    case discordpp::HttpStatusCode::Locked:
+        return "Locked";
+    case discordpp::HttpStatusCode::FailedDependency:
+        return "FailedDependency";
+    case discordpp::HttpStatusCode::TooEarly:
+        return "TooEarly";
+    case discordpp::HttpStatusCode::UpgradeRequired:
+        return "UpgradeRequired";
+    case discordpp::HttpStatusCode::PreconditionRequired:
+        return "PreconditionRequired";
+    case discordpp::HttpStatusCode::TooManyRequests:
+        return "TooManyRequests";
+    case discordpp::HttpStatusCode::RequestHeaderFieldsTooLarge:
+        return "RequestHeaderFieldsTooLarge";
+    case discordpp::HttpStatusCode::InternalServerError:
+        return "InternalServerError";
+    case discordpp::HttpStatusCode::NotImplemented:
+        return "NotImplemented";
+    case discordpp::HttpStatusCode::BadGateway:
+        return "BadGateway";
+    case discordpp::HttpStatusCode::ServiceUnavailable:
+        return "ServiceUnavailable";
+    case discordpp::HttpStatusCode::GatewayTimeout:
+        return "GatewayTimeout";
+    case discordpp::HttpStatusCode::HttpVersionNotSupported:
+        return "HttpVersionNotSupported";
+    case discordpp::HttpStatusCode::VariantAlsoNegotiates:
+        return "VariantAlsoNegotiates";
+    case discordpp::HttpStatusCode::InsufficientStorage:
+        return "InsufficientStorage";
+    case discordpp::HttpStatusCode::LoopDetected:
+        return "LoopDetected";
+    case discordpp::HttpStatusCode::NotExtended:
+        return "NotExtended";
+    case discordpp::HttpStatusCode::NetworkAuthorizationRequired:
+        return "NetworkAuthorizationRequired";
+    default:
+        return "unknown";
+    }
+}
+/// Converts a discordpp::AuthenticationCodeChallengeMethod to a string.
+inline const char* EnumToString(discordpp::AuthenticationCodeChallengeMethod value)
+{
+    switch (value) {
+    case discordpp::AuthenticationCodeChallengeMethod::S256:
+        return "S256";
+    default:
+        return "unknown";
+    }
+}
+/// Converts a discordpp::IntegrationType to a string.
+inline const char* EnumToString(discordpp::IntegrationType value)
+{
+    switch (value) {
+    case discordpp::IntegrationType::GuildInstall:
+        return "GuildInstall";
+    case discordpp::IntegrationType::UserInstall:
+        return "UserInstall";
+    default:
+        return "unknown";
+    }
+}
+/// Converts a discordpp::ChannelType to a string.
+inline const char* EnumToString(discordpp::ChannelType value)
+{
+    switch (value) {
+    case discordpp::ChannelType::GuildText:
+        return "GuildText";
+    case discordpp::ChannelType::Dm:
+        return "Dm";
+    case discordpp::ChannelType::GuildVoice:
+        return "GuildVoice";
+    case discordpp::ChannelType::GroupDm:
+        return "GroupDm";
+    case discordpp::ChannelType::GuildCategory:
+        return "GuildCategory";
+    case discordpp::ChannelType::GuildNews:
+        return "GuildNews";
+    case discordpp::ChannelType::GuildStore:
+        return "GuildStore";
+    case discordpp::ChannelType::GuildNewsThread:
+        return "GuildNewsThread";
+    case discordpp::ChannelType::GuildPublicThread:
+        return "GuildPublicThread";
+    case discordpp::ChannelType::GuildPrivateThread:
+        return "GuildPrivateThread";
+    case discordpp::ChannelType::GuildStageVoice:
+        return "GuildStageVoice";
+    case discordpp::ChannelType::GuildDirectory:
+        return "GuildDirectory";
+    case discordpp::ChannelType::GuildForum:
+        return "GuildForum";
+    case discordpp::ChannelType::GuildMedia:
+        return "GuildMedia";
+    case discordpp::ChannelType::Lobby:
+        return "Lobby";
+    case discordpp::ChannelType::EphemeralDm:
+        return "EphemeralDm";
+    default:
+        return "unknown";
+    }
+}
+/// Converts a discordpp::AdditionalContentType to a string.
+inline const char* EnumToString(discordpp::AdditionalContentType value)
+{
+    switch (value) {
+    case discordpp::AdditionalContentType::Other:
+        return "Other";
+    case discordpp::AdditionalContentType::Attachment:
+        return "Attachment";
+    case discordpp::AdditionalContentType::Poll:
+        return "Poll";
+    case discordpp::AdditionalContentType::VoiceMessage:
+        return "VoiceMessage";
+    case discordpp::AdditionalContentType::Thread:
+        return "Thread";
+    case discordpp::AdditionalContentType::Embed:
+        return "Embed";
+    case discordpp::AdditionalContentType::Sticker:
+        return "Sticker";
+    default:
+        return "unknown";
+    }
+}
+/// Converts a discordpp::VoiceInputModeType to a string.
+inline const char* EnumToString(discordpp::VoiceInputModeType value)
+{
+    switch (value) {
+    case discordpp::VoiceInputModeType::VoiceActivity:
+        return "VoiceActivity";
+    case discordpp::VoiceInputModeType::PushToTalk:
+        return "PushToTalk";
+    default:
+        return "unknown";
+    }
+}
+/// Converts a discordpp::AudioSystem to a string.
+inline const char* EnumToString(discordpp::AudioSystem value)
+{
+    switch (value) {
+    case discordpp::AudioSystem::Standard:
+        return "Standard";
+    case discordpp::AudioSystem::Game:
+        return "Game";
+    default:
+        return "unknown";
+    }
+}
+/// Converts a discordpp::Call::Error to a string.
+inline const char* EnumToString(discordpp::Call::Error value)
+{
+    switch (value) {
+    case discordpp::Call::Error::None:
+        return "None";
+    case discordpp::Call::Error::SignalingConnectionFailed:
+        return "SignalingConnectionFailed";
+    case discordpp::Call::Error::SignalingUnexpectedClose:
+        return "SignalingUnexpectedClose";
+    case discordpp::Call::Error::VoiceConnectionFailed:
+        return "VoiceConnectionFailed";
+    case discordpp::Call::Error::JoinTimeout:
+        return "JoinTimeout";
+    case discordpp::Call::Error::Forbidden:
+        return "Forbidden";
+    default:
+        return "unknown";
+    }
+}
+/// Converts a discordpp::AudioModeType to a string.
+inline const char* EnumToString(discordpp::AudioModeType value)
+{
+    switch (value) {
+    case discordpp::AudioModeType::MODE_UNINIT:
+        return "MODE_UNINIT";
+    case discordpp::AudioModeType::MODE_VAD:
+        return "MODE_VAD";
+    case discordpp::AudioModeType::MODE_PTT:
+        return "MODE_PTT";
+    default:
+        return "unknown";
+    }
+}
+/// Converts a discordpp::Call::Status to a string.
+inline const char* EnumToString(discordpp::Call::Status value)
+{
+    switch (value) {
+    case discordpp::Call::Status::Disconnected:
+        return "Disconnected";
+    case discordpp::Call::Status::Joining:
+        return "Joining";
+    case discordpp::Call::Status::Connecting:
+        return "Connecting";
+    case discordpp::Call::Status::SignalingConnected:
+        return "SignalingConnected";
+    case discordpp::Call::Status::Connected:
+        return "Connected";
+    case discordpp::Call::Status::Reconnecting:
+        return "Reconnecting";
+    case discordpp::Call::Status::Disconnecting:
+        return "Disconnecting";
+    default:
+        return "unknown";
+    }
+}
+/// Converts a discordpp::RelationshipType to a string.
+inline const char* EnumToString(discordpp::RelationshipType value)
+{
+    switch (value) {
+    case discordpp::RelationshipType::None:
+        return "None";
+    case discordpp::RelationshipType::Friend:
+        return "Friend";
+    case discordpp::RelationshipType::Blocked:
+        return "Blocked";
+    case discordpp::RelationshipType::PendingIncoming:
+        return "PendingIncoming";
+    case discordpp::RelationshipType::PendingOutgoing:
+        return "PendingOutgoing";
+    case discordpp::RelationshipType::Implicit:
+        return "Implicit";
+    case discordpp::RelationshipType::Suggestion:
+        return "Suggestion";
+    default:
+        return "unknown";
+    }
+}
+/// Converts a discordpp::ExternalIdentityProviderType to a string.
+inline const char* EnumToString(discordpp::ExternalIdentityProviderType value)
+{
+    switch (value) {
+    case discordpp::ExternalIdentityProviderType::OIDC:
+        return "OIDC";
+    case discordpp::ExternalIdentityProviderType::EpicOnlineServices:
+        return "EpicOnlineServices";
+    case discordpp::ExternalIdentityProviderType::Steam:
+        return "Steam";
+    case discordpp::ExternalIdentityProviderType::Unity:
+        return "Unity";
+    case discordpp::ExternalIdentityProviderType::DiscordBot:
+        return "DiscordBot";
+    case discordpp::ExternalIdentityProviderType::None:
+        return "None";
+    case discordpp::ExternalIdentityProviderType::Unknown:
+        return "Unknown";
+    default:
+        return "unknown";
+    }
+}
+/// Converts a discordpp::UserHandle::AvatarType to a string.
+inline const char* EnumToString(discordpp::UserHandle::AvatarType value)
+{
+    switch (value) {
+    case discordpp::UserHandle::AvatarType::Gif:
+        return "Gif";
+    case discordpp::UserHandle::AvatarType::Webp:
+        return "Webp";
+    case discordpp::UserHandle::AvatarType::Png:
+        return "Png";
+    case discordpp::UserHandle::AvatarType::Jpeg:
+        return "Jpeg";
+    default:
+        return "unknown";
+    }
+}
+/// Converts a discordpp::StatusType to a string.
+inline const char* EnumToString(discordpp::StatusType value)
+{
+    switch (value) {
+    case discordpp::StatusType::Online:
+        return "Online";
+    case discordpp::StatusType::Offline:
+        return "Offline";
+    case discordpp::StatusType::Blocked:
+        return "Blocked";
+    case discordpp::StatusType::Idle:
+        return "Idle";
+    case discordpp::StatusType::Dnd:
+        return "Dnd";
+    case discordpp::StatusType::Invisible:
+        return "Invisible";
+    case discordpp::StatusType::Streaming:
+        return "Streaming";
+    case discordpp::StatusType::Unknown:
+        return "Unknown";
+    default:
+        return "unknown";
+    }
+}
+/// Converts a discordpp::DisclosureTypes to a string.
+inline const char* EnumToString(discordpp::DisclosureTypes value)
+{
+    switch (value) {
+    case discordpp::DisclosureTypes::MessageDataVisibleOnDiscord:
+        return "MessageDataVisibleOnDiscord";
+    default:
+        return "unknown";
+    }
+}
+/// Converts a discordpp::Client::Error to a string.
+inline const char* EnumToString(discordpp::Client::Error value)
+{
+    switch (value) {
+    case discordpp::Client::Error::None:
+        return "None";
+    case discordpp::Client::Error::ConnectionFailed:
+        return "ConnectionFailed";
+    case discordpp::Client::Error::UnexpectedClose:
+        return "UnexpectedClose";
+    case discordpp::Client::Error::ConnectionCanceled:
+        return "ConnectionCanceled";
+    default:
+        return "unknown";
+    }
+}
+/// Converts a discordpp::Client::Status to a string.
+inline const char* EnumToString(discordpp::Client::Status value)
+{
+    switch (value) {
+    case discordpp::Client::Status::Disconnected:
+        return "Disconnected";
+    case discordpp::Client::Status::Connecting:
+        return "Connecting";
+    case discordpp::Client::Status::Connected:
+        return "Connected";
+    case discordpp::Client::Status::Ready:
+        return "Ready";
+    case discordpp::Client::Status::Reconnecting:
+        return "Reconnecting";
+    case discordpp::Client::Status::Disconnecting:
+        return "Disconnecting";
+    case discordpp::Client::Status::HttpWait:
+        return "HttpWait";
+    default:
+        return "unknown";
+    }
+}
+/// Converts a discordpp::Client::Thread to a string.
+inline const char* EnumToString(discordpp::Client::Thread value)
+{
+    switch (value) {
+    case discordpp::Client::Thread::Client:
+        return "Client";
+    case discordpp::Client::Thread::Voice:
+        return "Voice";
+    case discordpp::Client::Thread::Network:
+        return "Network";
+    default:
+        return "unknown";
+    }
+}
+/// Converts a discordpp::AuthorizationTokenType to a string.
+inline const char* EnumToString(discordpp::AuthorizationTokenType value)
+{
+    switch (value) {
+    case discordpp::AuthorizationTokenType::User:
+        return "User";
+    case discordpp::AuthorizationTokenType::Bearer:
+        return "Bearer";
+    default:
+        return "unknown";
+    }
+}
+/// Converts a discordpp::AuthenticationExternalAuthType to a string.
+inline const char* EnumToString(discordpp::AuthenticationExternalAuthType value)
+{
+    switch (value) {
+    case discordpp::AuthenticationExternalAuthType::OIDC:
+        return "OIDC";
+    case discordpp::AuthenticationExternalAuthType::EpicOnlineServicesAccessToken:
+        return "EpicOnlineServicesAccessToken";
+    case discordpp::AuthenticationExternalAuthType::EpicOnlineServicesIdToken:
+        return "EpicOnlineServicesIdToken";
+    case discordpp::AuthenticationExternalAuthType::SteamSessionTicket:
+        return "SteamSessionTicket";
+    case discordpp::AuthenticationExternalAuthType::UnityServicesIdToken:
+        return "UnityServicesIdToken";
+    case discordpp::AuthenticationExternalAuthType::DiscordBotIssuedAccessToken:
+        return "DiscordBotIssuedAccessToken";
+    case discordpp::AuthenticationExternalAuthType::AppleIdToken:
+        return "AppleIdToken";
+    case discordpp::AuthenticationExternalAuthType::PlayStationNetworkIdToken:
+        return "PlayStationNetworkIdToken";
+    default:
+        return "unknown";
+    }
+}
+/// Converts a discordpp::LoggingSeverity to a string.
+inline const char* EnumToString(discordpp::LoggingSeverity value)
+{
+    switch (value) {
+    case discordpp::LoggingSeverity::Verbose:
+        return "Verbose";
+    case discordpp::LoggingSeverity::Info:
+        return "Info";
+    case discordpp::LoggingSeverity::Warning:
+        return "Warning";
+    case discordpp::LoggingSeverity::Error:
+        return "Error";
+    case discordpp::LoggingSeverity::None:
+        return "None";
+    default:
+        return "unknown";
+    }
+}
+/// Converts a discordpp::RelationshipGroupType to a string.
+inline const char* EnumToString(discordpp::RelationshipGroupType value)
+{
+    switch (value) {
+    case discordpp::RelationshipGroupType::OnlinePlayingGame:
+        return "OnlinePlayingGame";
+    case discordpp::RelationshipGroupType::OnlineElsewhere:
+        return "OnlineElsewhere";
+    case discordpp::RelationshipGroupType::Offline:
+        return "Offline";
+    default:
+        return "unknown";
+    }
+}
+} // namespace discordpp
+#endif // DISCORD_HEADER_DISCORDPP_H_
+#ifdef DISCORDPP_IMPLEMENTATION
+#undef DISCORDPP_IMPLEMENTATION
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunused-parameter"
+#endif
+namespace discordpp {
+std::function<void(std::function<void()>)> s_synchronizationContext;
+
+inline bool HasSynchronizationContext()
+{
+    return !!s_synchronizationContext;
+}
+
+inline void PostTask(std::function<void()> task)
+{
+    assert(s_synchronizationContext);
+    s_synchronizationContext(std::move(task));
+}
+
+void SetSynchronizationContext(std::function<void(std::function<void()>)> executor)
+{
+    s_synchronizationContext = std::move(executor);
+}
+
+template <typename T>
+struct TDelegateUserData {
+    T delegate;
+    TDelegateUserData(T delegate)
+      : delegate{delegate}
+    {
+    }
+
+    static void Free(void* ptr) { delete reinterpret_cast<TDelegateUserData*>(ptr); }
+
+    static T& Get(void* userData)
+    {
+        return reinterpret_cast<TDelegateUserData*>(userData)->delegate;
+    }
+};
+
+struct ConvertedProperties {
+    ConvertedProperties(std::unordered_map<std::string, std::string> const& PropertyMap)
+    {
+        Properties.size = PropertyMap.size();
+        Properties.keys = reinterpret_cast<Discord_String*>(
+          Discord_Alloc(Properties.size * sizeof(Discord_String)));
+        Properties.values = reinterpret_cast<Discord_String*>(
+          Discord_Alloc(Properties.size * sizeof(Discord_String)));
+        size_t i = 0;
+        for (auto& pair : PropertyMap) {
+            Properties.keys[i] = AllocateString(pair.first);
+            Properties.values[i] = AllocateString(pair.second);
+            ++i;
+        }
+    }
+    ~ConvertedProperties() { Discord_FreeProperties(Properties); }
+    Discord_Properties Properties{};
+
+private:
+    Discord_String AllocateString(std::string const& str)
+    {
+        Discord_String result;
+        result.ptr = reinterpret_cast<uint8_t*>(Discord_Alloc(str.size()));
+        result.size = str.size();
+        std::memcpy(result.ptr, str.data(), result.size);
+        return result;
+    }
+};
+
+std::unordered_map<std::string, std::string> ConvertReturnedProperties(
+  Discord_Properties const& Properties)
+{
+    std::unordered_map<std::string, std::string> result;
+    for (size_t i = 0; i < Properties.size; ++i) {
+        std::string key(reinterpret_cast<char*>(Properties.keys[i].ptr), Properties.keys[i].size);
+        std::string value(reinterpret_cast<char*>(Properties.values[i].ptr),
+                          Properties.values[i].size);
+        result.emplace(std::move(key), std::move(value));
+    }
+    return result;
+}
+const ActivityInvite ActivityInvite::nullobj{{}, DiscordObjectState::Invalid};
+ActivityInvite::~ActivityInvite()
+{
+    if (state_ == DiscordObjectState::Owned) {
+        Drop();
+        state_ = DiscordObjectState::Invalid;
+    }
+}
+ActivityInvite::ActivityInvite(ActivityInvite&& other) noexcept
+  : instance_(other.instance_)
+  , state_(other.state_)
+{
+    other.state_ = DiscordObjectState::Invalid;
+}
+ActivityInvite& ActivityInvite::operator=(ActivityInvite&& other) noexcept
+{
+    if (this != &other) {
+        if (state_ == DiscordObjectState::Owned) {
+            Drop();
+        }
+        instance_ = other.instance_;
+        state_ = other.state_;
+        other.state_ = DiscordObjectState::Invalid;
+    }
+    return *this;
+}
+ActivityInvite::ActivityInvite(const ActivityInvite& rhs)
+  : instance_{}
+  , state_(DiscordObjectState::Invalid)
+{
+    if (rhs.state_ == DiscordObjectState::Owned) {
+        Discord_ActivityInvite_Clone(&instance_, rhs.instance());
+
+        state_ = DiscordObjectState::Owned;
+    }
+}
+ActivityInvite& ActivityInvite::operator=(const ActivityInvite& rhs)
+{
+    if (this != &rhs) {
+        if (state_ == DiscordObjectState::Owned) {
+            Drop();
+            state_ = DiscordObjectState::Invalid;
+        }
+        if (rhs.state_ == DiscordObjectState::Owned) {
+            Discord_ActivityInvite_Clone(&instance_, rhs.instance());
+
+            state_ = DiscordObjectState::Owned;
+        }
+    }
+    return *this;
+}
+ActivityInvite::ActivityInvite(Discord_ActivityInvite instance, DiscordObjectState state)
+  : instance_(instance)
+  , state_(state)
+{
+}
+ActivityInvite::ActivityInvite()
+{
+    assert(state_ == DiscordObjectState::Invalid);
+    Discord_ActivityInvite_Init(&instance_);
+    state_ = DiscordObjectState::Owned;
+}
+void ActivityInvite::Drop()
+{
+    if (state_ != DiscordObjectState::Owned) {
+        return;
+    }
+    Discord_ActivityInvite_Drop(&instance_);
+    state_ = DiscordObjectState::Invalid;
+}
+uint64_t ActivityInvite::SenderId() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    uint64_t returnValue__;
+    returnValue__ = Discord_ActivityInvite_SenderId(&instance_);
+    return returnValue__;
+}
+void ActivityInvite::SetSenderId(uint64_t SenderId)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_ActivityInvite_SetSenderId(&instance_, SenderId);
+}
+uint64_t ActivityInvite::ChannelId() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    uint64_t returnValue__;
+    returnValue__ = Discord_ActivityInvite_ChannelId(&instance_);
+    return returnValue__;
+}
+void ActivityInvite::SetChannelId(uint64_t ChannelId)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_ActivityInvite_SetChannelId(&instance_, ChannelId);
+}
+uint64_t ActivityInvite::MessageId() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    uint64_t returnValue__;
+    returnValue__ = Discord_ActivityInvite_MessageId(&instance_);
+    return returnValue__;
+}
+void ActivityInvite::SetMessageId(uint64_t MessageId)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_ActivityInvite_SetMessageId(&instance_, MessageId);
+}
+discordpp::ActivityActionTypes ActivityInvite::Type() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_ActivityActionTypes returnValue__;
+    returnValue__ = Discord_ActivityInvite_Type(&instance_);
+    return static_cast<discordpp::ActivityActionTypes>(returnValue__);
+}
+void ActivityInvite::SetType(discordpp::ActivityActionTypes Type)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_ActivityInvite_SetType(&instance_, static_cast<Discord_ActivityActionTypes>(Type));
+}
+uint64_t ActivityInvite::ApplicationId() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    uint64_t returnValue__;
+    returnValue__ = Discord_ActivityInvite_ApplicationId(&instance_);
+    return returnValue__;
+}
+void ActivityInvite::SetApplicationId(uint64_t ApplicationId)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_ActivityInvite_SetApplicationId(&instance_, ApplicationId);
+}
+uint64_t ActivityInvite::ParentApplicationId() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    uint64_t returnValue__;
+    returnValue__ = Discord_ActivityInvite_ParentApplicationId(&instance_);
+    return returnValue__;
+}
+void ActivityInvite::SetParentApplicationId(uint64_t ParentApplicationId)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_ActivityInvite_SetParentApplicationId(&instance_, ParentApplicationId);
+}
+std::string ActivityInvite::PartyId() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_String returnValueNative__;
+    Discord_ActivityInvite_PartyId(&instance_, &returnValueNative__);
+    std::string returnValue__(reinterpret_cast<char*>(returnValueNative__.ptr),
+                              returnValueNative__.size);
+    Discord_Free(returnValueNative__.ptr);
+    return returnValue__;
+}
+void ActivityInvite::SetPartyId(std::string PartyId)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_String PartyId__str{(uint8_t*)(PartyId.data()), PartyId.size()};
+    Discord_ActivityInvite_SetPartyId(&instance_, PartyId__str);
+}
+std::string ActivityInvite::SessionId() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_String returnValueNative__;
+    Discord_ActivityInvite_SessionId(&instance_, &returnValueNative__);
+    std::string returnValue__(reinterpret_cast<char*>(returnValueNative__.ptr),
+                              returnValueNative__.size);
+    Discord_Free(returnValueNative__.ptr);
+    return returnValue__;
+}
+void ActivityInvite::SetSessionId(std::string SessionId)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_String SessionId__str{(uint8_t*)(SessionId.data()), SessionId.size()};
+    Discord_ActivityInvite_SetSessionId(&instance_, SessionId__str);
+}
+bool ActivityInvite::IsValid() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    bool returnValue__;
+    returnValue__ = Discord_ActivityInvite_IsValid(&instance_);
+    return returnValue__;
+}
+void ActivityInvite::SetIsValid(bool IsValid)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_ActivityInvite_SetIsValid(&instance_, IsValid);
+}
+const ActivityAssets ActivityAssets::nullobj{{}, DiscordObjectState::Invalid};
+ActivityAssets::~ActivityAssets()
+{
+    if (state_ == DiscordObjectState::Owned) {
+        Drop();
+        state_ = DiscordObjectState::Invalid;
+    }
+}
+ActivityAssets::ActivityAssets(ActivityAssets&& other) noexcept
+  : instance_(other.instance_)
+  , state_(other.state_)
+{
+    other.state_ = DiscordObjectState::Invalid;
+}
+ActivityAssets& ActivityAssets::operator=(ActivityAssets&& other) noexcept
+{
+    if (this != &other) {
+        if (state_ == DiscordObjectState::Owned) {
+            Drop();
+        }
+        instance_ = other.instance_;
+        state_ = other.state_;
+        other.state_ = DiscordObjectState::Invalid;
+    }
+    return *this;
+}
+ActivityAssets::ActivityAssets(const ActivityAssets& arg0)
+  : instance_{}
+  , state_(DiscordObjectState::Invalid)
+{
+    if (arg0.state_ == DiscordObjectState::Owned) {
+        Discord_ActivityAssets_Clone(&instance_, arg0.instance());
+
+        state_ = DiscordObjectState::Owned;
+    }
+}
+ActivityAssets& ActivityAssets::operator=(const ActivityAssets& arg0)
+{
+    if (this != &arg0) {
+        if (state_ == DiscordObjectState::Owned) {
+            Drop();
+            state_ = DiscordObjectState::Invalid;
+        }
+        if (arg0.state_ == DiscordObjectState::Owned) {
+            Discord_ActivityAssets_Clone(&instance_, arg0.instance());
+
+            state_ = DiscordObjectState::Owned;
+        }
+    }
+    return *this;
+}
+ActivityAssets::ActivityAssets(Discord_ActivityAssets instance, DiscordObjectState state)
+  : instance_(instance)
+  , state_(state)
+{
+}
+ActivityAssets::ActivityAssets()
+{
+    assert(state_ == DiscordObjectState::Invalid);
+    Discord_ActivityAssets_Init(&instance_);
+    state_ = DiscordObjectState::Owned;
+}
+void ActivityAssets::Drop()
+{
+    if (state_ != DiscordObjectState::Owned) {
+        return;
+    }
+    Discord_ActivityAssets_Drop(&instance_);
+    state_ = DiscordObjectState::Invalid;
+}
+std::optional<std::string> ActivityAssets::LargeImage() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    bool returnIsNonNull__;
+    Discord_String returnValueNative__;
+    returnIsNonNull__ = Discord_ActivityAssets_LargeImage(&instance_, &returnValueNative__);
+    if (!returnIsNonNull__) {
+        return {};
+    }
+    std::string returnValue__(reinterpret_cast<char*>(returnValueNative__.ptr),
+                              returnValueNative__.size);
+    Discord_Free(returnValueNative__.ptr);
+    return returnValue__;
+}
+void ActivityAssets::SetLargeImage(std::optional<std::string> LargeImage)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_String LargeImage__str{};
+    if (LargeImage.has_value()) {
+        LargeImage__str.ptr = reinterpret_cast<uint8_t*>(LargeImage->data());
+        LargeImage__str.size = LargeImage->size();
+    }
+    Discord_ActivityAssets_SetLargeImage(&instance_,
+                                         (LargeImage.has_value() ? &LargeImage__str : nullptr));
+}
+std::optional<std::string> ActivityAssets::LargeText() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    bool returnIsNonNull__;
+    Discord_String returnValueNative__;
+    returnIsNonNull__ = Discord_ActivityAssets_LargeText(&instance_, &returnValueNative__);
+    if (!returnIsNonNull__) {
+        return {};
+    }
+    std::string returnValue__(reinterpret_cast<char*>(returnValueNative__.ptr),
+                              returnValueNative__.size);
+    Discord_Free(returnValueNative__.ptr);
+    return returnValue__;
+}
+void ActivityAssets::SetLargeText(std::optional<std::string> LargeText)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_String LargeText__str{};
+    if (LargeText.has_value()) {
+        LargeText__str.ptr = reinterpret_cast<uint8_t*>(LargeText->data());
+        LargeText__str.size = LargeText->size();
+    }
+    Discord_ActivityAssets_SetLargeText(&instance_,
+                                        (LargeText.has_value() ? &LargeText__str : nullptr));
+}
+std::optional<std::string> ActivityAssets::LargeUrl() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    bool returnIsNonNull__;
+    Discord_String returnValueNative__;
+    returnIsNonNull__ = Discord_ActivityAssets_LargeUrl(&instance_, &returnValueNative__);
+    if (!returnIsNonNull__) {
+        return {};
+    }
+    std::string returnValue__(reinterpret_cast<char*>(returnValueNative__.ptr),
+                              returnValueNative__.size);
+    Discord_Free(returnValueNative__.ptr);
+    return returnValue__;
+}
+void ActivityAssets::SetLargeUrl(std::optional<std::string> LargeUrl)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_String LargeUrl__str{};
+    if (LargeUrl.has_value()) {
+        LargeUrl__str.ptr = reinterpret_cast<uint8_t*>(LargeUrl->data());
+        LargeUrl__str.size = LargeUrl->size();
+    }
+    Discord_ActivityAssets_SetLargeUrl(&instance_,
+                                       (LargeUrl.has_value() ? &LargeUrl__str : nullptr));
+}
+std::optional<std::string> ActivityAssets::SmallImage() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    bool returnIsNonNull__;
+    Discord_String returnValueNative__;
+    returnIsNonNull__ = Discord_ActivityAssets_SmallImage(&instance_, &returnValueNative__);
+    if (!returnIsNonNull__) {
+        return {};
+    }
+    std::string returnValue__(reinterpret_cast<char*>(returnValueNative__.ptr),
+                              returnValueNative__.size);
+    Discord_Free(returnValueNative__.ptr);
+    return returnValue__;
+}
+void ActivityAssets::SetSmallImage(std::optional<std::string> SmallImage)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_String SmallImage__str{};
+    if (SmallImage.has_value()) {
+        SmallImage__str.ptr = reinterpret_cast<uint8_t*>(SmallImage->data());
+        SmallImage__str.size = SmallImage->size();
+    }
+    Discord_ActivityAssets_SetSmallImage(&instance_,
+                                         (SmallImage.has_value() ? &SmallImage__str : nullptr));
+}
+std::optional<std::string> ActivityAssets::SmallText() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    bool returnIsNonNull__;
+    Discord_String returnValueNative__;
+    returnIsNonNull__ = Discord_ActivityAssets_SmallText(&instance_, &returnValueNative__);
+    if (!returnIsNonNull__) {
+        return {};
+    }
+    std::string returnValue__(reinterpret_cast<char*>(returnValueNative__.ptr),
+                              returnValueNative__.size);
+    Discord_Free(returnValueNative__.ptr);
+    return returnValue__;
+}
+void ActivityAssets::SetSmallText(std::optional<std::string> SmallText)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_String SmallText__str{};
+    if (SmallText.has_value()) {
+        SmallText__str.ptr = reinterpret_cast<uint8_t*>(SmallText->data());
+        SmallText__str.size = SmallText->size();
+    }
+    Discord_ActivityAssets_SetSmallText(&instance_,
+                                        (SmallText.has_value() ? &SmallText__str : nullptr));
+}
+std::optional<std::string> ActivityAssets::SmallUrl() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    bool returnIsNonNull__;
+    Discord_String returnValueNative__;
+    returnIsNonNull__ = Discord_ActivityAssets_SmallUrl(&instance_, &returnValueNative__);
+    if (!returnIsNonNull__) {
+        return {};
+    }
+    std::string returnValue__(reinterpret_cast<char*>(returnValueNative__.ptr),
+                              returnValueNative__.size);
+    Discord_Free(returnValueNative__.ptr);
+    return returnValue__;
+}
+void ActivityAssets::SetSmallUrl(std::optional<std::string> SmallUrl)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_String SmallUrl__str{};
+    if (SmallUrl.has_value()) {
+        SmallUrl__str.ptr = reinterpret_cast<uint8_t*>(SmallUrl->data());
+        SmallUrl__str.size = SmallUrl->size();
+    }
+    Discord_ActivityAssets_SetSmallUrl(&instance_,
+                                       (SmallUrl.has_value() ? &SmallUrl__str : nullptr));
+}
+std::optional<std::string> ActivityAssets::InviteCoverImage() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    bool returnIsNonNull__;
+    Discord_String returnValueNative__;
+    returnIsNonNull__ = Discord_ActivityAssets_InviteCoverImage(&instance_, &returnValueNative__);
+    if (!returnIsNonNull__) {
+        return {};
+    }
+    std::string returnValue__(reinterpret_cast<char*>(returnValueNative__.ptr),
+                              returnValueNative__.size);
+    Discord_Free(returnValueNative__.ptr);
+    return returnValue__;
+}
+void ActivityAssets::SetInviteCoverImage(std::optional<std::string> InviteCoverImage)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_String InviteCoverImage__str{};
+    if (InviteCoverImage.has_value()) {
+        InviteCoverImage__str.ptr = reinterpret_cast<uint8_t*>(InviteCoverImage->data());
+        InviteCoverImage__str.size = InviteCoverImage->size();
+    }
+    Discord_ActivityAssets_SetInviteCoverImage(
+      &instance_, (InviteCoverImage.has_value() ? &InviteCoverImage__str : nullptr));
+}
+const ActivityTimestamps ActivityTimestamps::nullobj{{}, DiscordObjectState::Invalid};
+ActivityTimestamps::~ActivityTimestamps()
+{
+    if (state_ == DiscordObjectState::Owned) {
+        Drop();
+        state_ = DiscordObjectState::Invalid;
+    }
+}
+ActivityTimestamps::ActivityTimestamps(ActivityTimestamps&& other) noexcept
+  : instance_(other.instance_)
+  , state_(other.state_)
+{
+    other.state_ = DiscordObjectState::Invalid;
+}
+ActivityTimestamps& ActivityTimestamps::operator=(ActivityTimestamps&& other) noexcept
+{
+    if (this != &other) {
+        if (state_ == DiscordObjectState::Owned) {
+            Drop();
+        }
+        instance_ = other.instance_;
+        state_ = other.state_;
+        other.state_ = DiscordObjectState::Invalid;
+    }
+    return *this;
+}
+ActivityTimestamps::ActivityTimestamps(const ActivityTimestamps& arg0)
+  : instance_{}
+  , state_(DiscordObjectState::Invalid)
+{
+    if (arg0.state_ == DiscordObjectState::Owned) {
+        Discord_ActivityTimestamps_Clone(&instance_, arg0.instance());
+
+        state_ = DiscordObjectState::Owned;
+    }
+}
+ActivityTimestamps& ActivityTimestamps::operator=(const ActivityTimestamps& arg0)
+{
+    if (this != &arg0) {
+        if (state_ == DiscordObjectState::Owned) {
+            Drop();
+            state_ = DiscordObjectState::Invalid;
+        }
+        if (arg0.state_ == DiscordObjectState::Owned) {
+            Discord_ActivityTimestamps_Clone(&instance_, arg0.instance());
+
+            state_ = DiscordObjectState::Owned;
+        }
+    }
+    return *this;
+}
+ActivityTimestamps::ActivityTimestamps(Discord_ActivityTimestamps instance,
+                                       DiscordObjectState state)
+  : instance_(instance)
+  , state_(state)
+{
+}
+ActivityTimestamps::ActivityTimestamps()
+{
+    assert(state_ == DiscordObjectState::Invalid);
+    Discord_ActivityTimestamps_Init(&instance_);
+    state_ = DiscordObjectState::Owned;
+}
+void ActivityTimestamps::Drop()
+{
+    if (state_ != DiscordObjectState::Owned) {
+        return;
+    }
+    Discord_ActivityTimestamps_Drop(&instance_);
+    state_ = DiscordObjectState::Invalid;
+}
+uint64_t ActivityTimestamps::Start() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    uint64_t returnValue__;
+    returnValue__ = Discord_ActivityTimestamps_Start(&instance_);
+    return returnValue__;
+}
+void ActivityTimestamps::SetStart(uint64_t Start)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_ActivityTimestamps_SetStart(&instance_, Start);
+}
+uint64_t ActivityTimestamps::End() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    uint64_t returnValue__;
+    returnValue__ = Discord_ActivityTimestamps_End(&instance_);
+    return returnValue__;
+}
+void ActivityTimestamps::SetEnd(uint64_t End)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_ActivityTimestamps_SetEnd(&instance_, End);
+}
+const ActivityParty ActivityParty::nullobj{{}, DiscordObjectState::Invalid};
+ActivityParty::~ActivityParty()
+{
+    if (state_ == DiscordObjectState::Owned) {
+        Drop();
+        state_ = DiscordObjectState::Invalid;
+    }
+}
+ActivityParty::ActivityParty(ActivityParty&& other) noexcept
+  : instance_(other.instance_)
+  , state_(other.state_)
+{
+    other.state_ = DiscordObjectState::Invalid;
+}
+ActivityParty& ActivityParty::operator=(ActivityParty&& other) noexcept
+{
+    if (this != &other) {
+        if (state_ == DiscordObjectState::Owned) {
+            Drop();
+        }
+        instance_ = other.instance_;
+        state_ = other.state_;
+        other.state_ = DiscordObjectState::Invalid;
+    }
+    return *this;
+}
+ActivityParty::ActivityParty(const ActivityParty& arg0)
+  : instance_{}
+  , state_(DiscordObjectState::Invalid)
+{
+    if (arg0.state_ == DiscordObjectState::Owned) {
+        Discord_ActivityParty_Clone(&instance_, arg0.instance());
+
+        state_ = DiscordObjectState::Owned;
+    }
+}
+ActivityParty& ActivityParty::operator=(const ActivityParty& arg0)
+{
+    if (this != &arg0) {
+        if (state_ == DiscordObjectState::Owned) {
+            Drop();
+            state_ = DiscordObjectState::Invalid;
+        }
+        if (arg0.state_ == DiscordObjectState::Owned) {
+            Discord_ActivityParty_Clone(&instance_, arg0.instance());
+
+            state_ = DiscordObjectState::Owned;
+        }
+    }
+    return *this;
+}
+ActivityParty::ActivityParty(Discord_ActivityParty instance, DiscordObjectState state)
+  : instance_(instance)
+  , state_(state)
+{
+}
+ActivityParty::ActivityParty()
+{
+    assert(state_ == DiscordObjectState::Invalid);
+    Discord_ActivityParty_Init(&instance_);
+    state_ = DiscordObjectState::Owned;
+}
+void ActivityParty::Drop()
+{
+    if (state_ != DiscordObjectState::Owned) {
+        return;
+    }
+    Discord_ActivityParty_Drop(&instance_);
+    state_ = DiscordObjectState::Invalid;
+}
+std::string ActivityParty::Id() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_String returnValueNative__;
+    Discord_ActivityParty_Id(&instance_, &returnValueNative__);
+    std::string returnValue__(reinterpret_cast<char*>(returnValueNative__.ptr),
+                              returnValueNative__.size);
+    Discord_Free(returnValueNative__.ptr);
+    return returnValue__;
+}
+void ActivityParty::SetId(std::string Id)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_String Id__str{(uint8_t*)(Id.data()), Id.size()};
+    Discord_ActivityParty_SetId(&instance_, Id__str);
+}
+int32_t ActivityParty::CurrentSize() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    int32_t returnValue__;
+    returnValue__ = Discord_ActivityParty_CurrentSize(&instance_);
+    return returnValue__;
+}
+void ActivityParty::SetCurrentSize(int32_t CurrentSize)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_ActivityParty_SetCurrentSize(&instance_, CurrentSize);
+}
+int32_t ActivityParty::MaxSize() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    int32_t returnValue__;
+    returnValue__ = Discord_ActivityParty_MaxSize(&instance_);
+    return returnValue__;
+}
+void ActivityParty::SetMaxSize(int32_t MaxSize)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_ActivityParty_SetMaxSize(&instance_, MaxSize);
+}
+discordpp::ActivityPartyPrivacy ActivityParty::Privacy() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_ActivityPartyPrivacy returnValue__;
+    returnValue__ = Discord_ActivityParty_Privacy(&instance_);
+    return static_cast<discordpp::ActivityPartyPrivacy>(returnValue__);
+}
+void ActivityParty::SetPrivacy(discordpp::ActivityPartyPrivacy Privacy)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_ActivityParty_SetPrivacy(&instance_,
+                                     static_cast<Discord_ActivityPartyPrivacy>(Privacy));
+}
+const ActivitySecrets ActivitySecrets::nullobj{{}, DiscordObjectState::Invalid};
+ActivitySecrets::~ActivitySecrets()
+{
+    if (state_ == DiscordObjectState::Owned) {
+        Drop();
+        state_ = DiscordObjectState::Invalid;
+    }
+}
+ActivitySecrets::ActivitySecrets(ActivitySecrets&& other) noexcept
+  : instance_(other.instance_)
+  , state_(other.state_)
+{
+    other.state_ = DiscordObjectState::Invalid;
+}
+ActivitySecrets& ActivitySecrets::operator=(ActivitySecrets&& other) noexcept
+{
+    if (this != &other) {
+        if (state_ == DiscordObjectState::Owned) {
+            Drop();
+        }
+        instance_ = other.instance_;
+        state_ = other.state_;
+        other.state_ = DiscordObjectState::Invalid;
+    }
+    return *this;
+}
+ActivitySecrets::ActivitySecrets(const ActivitySecrets& arg0)
+  : instance_{}
+  , state_(DiscordObjectState::Invalid)
+{
+    if (arg0.state_ == DiscordObjectState::Owned) {
+        Discord_ActivitySecrets_Clone(&instance_, arg0.instance());
+
+        state_ = DiscordObjectState::Owned;
+    }
+}
+ActivitySecrets& ActivitySecrets::operator=(const ActivitySecrets& arg0)
+{
+    if (this != &arg0) {
+        if (state_ == DiscordObjectState::Owned) {
+            Drop();
+            state_ = DiscordObjectState::Invalid;
+        }
+        if (arg0.state_ == DiscordObjectState::Owned) {
+            Discord_ActivitySecrets_Clone(&instance_, arg0.instance());
+
+            state_ = DiscordObjectState::Owned;
+        }
+    }
+    return *this;
+}
+ActivitySecrets::ActivitySecrets(Discord_ActivitySecrets instance, DiscordObjectState state)
+  : instance_(instance)
+  , state_(state)
+{
+}
+ActivitySecrets::ActivitySecrets()
+{
+    assert(state_ == DiscordObjectState::Invalid);
+    Discord_ActivitySecrets_Init(&instance_);
+    state_ = DiscordObjectState::Owned;
+}
+void ActivitySecrets::Drop()
+{
+    if (state_ != DiscordObjectState::Owned) {
+        return;
+    }
+    Discord_ActivitySecrets_Drop(&instance_);
+    state_ = DiscordObjectState::Invalid;
+}
+std::string ActivitySecrets::Join() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_String returnValueNative__;
+    Discord_ActivitySecrets_Join(&instance_, &returnValueNative__);
+    std::string returnValue__(reinterpret_cast<char*>(returnValueNative__.ptr),
+                              returnValueNative__.size);
+    Discord_Free(returnValueNative__.ptr);
+    return returnValue__;
+}
+void ActivitySecrets::SetJoin(std::string Join)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_String Join__str{(uint8_t*)(Join.data()), Join.size()};
+    Discord_ActivitySecrets_SetJoin(&instance_, Join__str);
+}
+const ActivityButton ActivityButton::nullobj{{}, DiscordObjectState::Invalid};
+ActivityButton::~ActivityButton()
+{
+    if (state_ == DiscordObjectState::Owned) {
+        Drop();
+        state_ = DiscordObjectState::Invalid;
+    }
+}
+ActivityButton::ActivityButton(ActivityButton&& other) noexcept
+  : instance_(other.instance_)
+  , state_(other.state_)
+{
+    other.state_ = DiscordObjectState::Invalid;
+}
+ActivityButton& ActivityButton::operator=(ActivityButton&& other) noexcept
+{
+    if (this != &other) {
+        if (state_ == DiscordObjectState::Owned) {
+            Drop();
+        }
+        instance_ = other.instance_;
+        state_ = other.state_;
+        other.state_ = DiscordObjectState::Invalid;
+    }
+    return *this;
+}
+ActivityButton::ActivityButton(const ActivityButton& arg0)
+  : instance_{}
+  , state_(DiscordObjectState::Invalid)
+{
+    if (arg0.state_ == DiscordObjectState::Owned) {
+        Discord_ActivityButton_Clone(&instance_, arg0.instance());
+
+        state_ = DiscordObjectState::Owned;
+    }
+}
+ActivityButton& ActivityButton::operator=(const ActivityButton& arg0)
+{
+    if (this != &arg0) {
+        if (state_ == DiscordObjectState::Owned) {
+            Drop();
+            state_ = DiscordObjectState::Invalid;
+        }
+        if (arg0.state_ == DiscordObjectState::Owned) {
+            Discord_ActivityButton_Clone(&instance_, arg0.instance());
+
+            state_ = DiscordObjectState::Owned;
+        }
+    }
+    return *this;
+}
+ActivityButton::ActivityButton(Discord_ActivityButton instance, DiscordObjectState state)
+  : instance_(instance)
+  , state_(state)
+{
+}
+ActivityButton::ActivityButton()
+{
+    assert(state_ == DiscordObjectState::Invalid);
+    Discord_ActivityButton_Init(&instance_);
+    state_ = DiscordObjectState::Owned;
+}
+void ActivityButton::Drop()
+{
+    if (state_ != DiscordObjectState::Owned) {
+        return;
+    }
+    Discord_ActivityButton_Drop(&instance_);
+    state_ = DiscordObjectState::Invalid;
+}
+std::string ActivityButton::Label() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_String returnValueNative__;
+    Discord_ActivityButton_Label(&instance_, &returnValueNative__);
+    std::string returnValue__(reinterpret_cast<char*>(returnValueNative__.ptr),
+                              returnValueNative__.size);
+    Discord_Free(returnValueNative__.ptr);
+    return returnValue__;
+}
+void ActivityButton::SetLabel(std::string Label)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_String Label__str{(uint8_t*)(Label.data()), Label.size()};
+    Discord_ActivityButton_SetLabel(&instance_, Label__str);
+}
+std::string ActivityButton::Url() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_String returnValueNative__;
+    Discord_ActivityButton_Url(&instance_, &returnValueNative__);
+    std::string returnValue__(reinterpret_cast<char*>(returnValueNative__.ptr),
+                              returnValueNative__.size);
+    Discord_Free(returnValueNative__.ptr);
+    return returnValue__;
+}
+void ActivityButton::SetUrl(std::string Url)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_String Url__str{(uint8_t*)(Url.data()), Url.size()};
+    Discord_ActivityButton_SetUrl(&instance_, Url__str);
+}
+const Activity Activity::nullobj{{}, DiscordObjectState::Invalid};
+Activity::~Activity()
+{
+    if (state_ == DiscordObjectState::Owned) {
+        Drop();
+        state_ = DiscordObjectState::Invalid;
+    }
+}
+Activity::Activity(Activity&& other) noexcept
+  : instance_(other.instance_)
+  , state_(other.state_)
+{
+    other.state_ = DiscordObjectState::Invalid;
+}
+Activity& Activity::operator=(Activity&& other) noexcept
+{
+    if (this != &other) {
+        if (state_ == DiscordObjectState::Owned) {
+            Drop();
+        }
+        instance_ = other.instance_;
+        state_ = other.state_;
+        other.state_ = DiscordObjectState::Invalid;
+    }
+    return *this;
+}
+Activity::Activity(const Activity& arg0)
+  : instance_{}
+  , state_(DiscordObjectState::Invalid)
+{
+    if (arg0.state_ == DiscordObjectState::Owned) {
+        Discord_Activity_Clone(&instance_, arg0.instance());
+
+        state_ = DiscordObjectState::Owned;
+    }
+}
+Activity& Activity::operator=(const Activity& arg0)
+{
+    if (this != &arg0) {
+        if (state_ == DiscordObjectState::Owned) {
+            Drop();
+            state_ = DiscordObjectState::Invalid;
+        }
+        if (arg0.state_ == DiscordObjectState::Owned) {
+            Discord_Activity_Clone(&instance_, arg0.instance());
+
+            state_ = DiscordObjectState::Owned;
+        }
+    }
+    return *this;
+}
+Activity::Activity(Discord_Activity instance, DiscordObjectState state)
+  : instance_(instance)
+  , state_(state)
+{
+}
+Activity::Activity()
+{
+    assert(state_ == DiscordObjectState::Invalid);
+    Discord_Activity_Init(&instance_);
+    state_ = DiscordObjectState::Owned;
+}
+void Activity::Drop()
+{
+    if (state_ != DiscordObjectState::Owned) {
+        return;
+    }
+    Discord_Activity_Drop(&instance_);
+    state_ = DiscordObjectState::Invalid;
+}
+void Activity::AddButton(discordpp::ActivityButton button)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_Activity_AddButton(&instance_, button.instance());
+}
+bool Activity::Equals(discordpp::Activity other) const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    bool returnValue__;
+    returnValue__ = Discord_Activity_Equals(&instance_, other.instance());
+    return returnValue__;
+}
+std::vector<discordpp::ActivityButton> Activity::GetButtons() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_ActivityButtonSpan returnValueNative__;
+    Discord_Activity_GetButtons(&instance_, &returnValueNative__);
+    std::vector<discordpp::ActivityButton> returnValue__;
+    returnValue__.reserve(returnValueNative__.size);
+    for (size_t i__ = 0; i__ < returnValueNative__.size; ++i__) {
+        returnValue__.emplace_back(returnValueNative__.ptr[i__], DiscordObjectState::Owned);
+    }
+    Discord_Free(returnValueNative__.ptr);
+    return returnValue__;
+}
+std::string Activity::Name() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_String returnValueNative__;
+    Discord_Activity_Name(&instance_, &returnValueNative__);
+    std::string returnValue__(reinterpret_cast<char*>(returnValueNative__.ptr),
+                              returnValueNative__.size);
+    Discord_Free(returnValueNative__.ptr);
+    return returnValue__;
+}
+void Activity::SetName(std::string Name)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_String Name__str{(uint8_t*)(Name.data()), Name.size()};
+    Discord_Activity_SetName(&instance_, Name__str);
+}
+discordpp::ActivityTypes Activity::Type() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_ActivityTypes returnValue__;
+    returnValue__ = Discord_Activity_Type(&instance_);
+    return static_cast<discordpp::ActivityTypes>(returnValue__);
+}
+void Activity::SetType(discordpp::ActivityTypes Type)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_Activity_SetType(&instance_, static_cast<Discord_ActivityTypes>(Type));
+}
+std::optional<discordpp::StatusDisplayTypes> Activity::StatusDisplayType() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    bool returnIsNonNull__;
+    Discord_StatusDisplayTypes returnValueNative__;
+    returnIsNonNull__ = Discord_Activity_StatusDisplayType(&instance_, &returnValueNative__);
+    if (!returnIsNonNull__) {
+        return {};
+    }
+    auto returnValue__ = static_cast<discordpp::StatusDisplayTypes>(returnValueNative__);
+    return returnValue__;
+}
+void Activity::SetStatusDisplayType(std::optional<discordpp::StatusDisplayTypes> StatusDisplayType)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_Activity_SetStatusDisplayType(
+      &instance_,
+      (StatusDisplayType.has_value()
+         ? reinterpret_cast<Discord_StatusDisplayTypes*>(&*StatusDisplayType)
+         : nullptr));
+}
+std::optional<std::string> Activity::State() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    bool returnIsNonNull__;
+    Discord_String returnValueNative__;
+    returnIsNonNull__ = Discord_Activity_State(&instance_, &returnValueNative__);
+    if (!returnIsNonNull__) {
+        return {};
+    }
+    std::string returnValue__(reinterpret_cast<char*>(returnValueNative__.ptr),
+                              returnValueNative__.size);
+    Discord_Free(returnValueNative__.ptr);
+    return returnValue__;
+}
+void Activity::SetState(std::optional<std::string> State)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_String State__str{};
+    if (State.has_value()) {
+        State__str.ptr = reinterpret_cast<uint8_t*>(State->data());
+        State__str.size = State->size();
+    }
+    Discord_Activity_SetState(&instance_, (State.has_value() ? &State__str : nullptr));
+}
+std::optional<std::string> Activity::StateUrl() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    bool returnIsNonNull__;
+    Discord_String returnValueNative__;
+    returnIsNonNull__ = Discord_Activity_StateUrl(&instance_, &returnValueNative__);
+    if (!returnIsNonNull__) {
+        return {};
+    }
+    std::string returnValue__(reinterpret_cast<char*>(returnValueNative__.ptr),
+                              returnValueNative__.size);
+    Discord_Free(returnValueNative__.ptr);
+    return returnValue__;
+}
+void Activity::SetStateUrl(std::optional<std::string> StateUrl)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_String StateUrl__str{};
+    if (StateUrl.has_value()) {
+        StateUrl__str.ptr = reinterpret_cast<uint8_t*>(StateUrl->data());
+        StateUrl__str.size = StateUrl->size();
+    }
+    Discord_Activity_SetStateUrl(&instance_, (StateUrl.has_value() ? &StateUrl__str : nullptr));
+}
+std::optional<std::string> Activity::Details() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    bool returnIsNonNull__;
+    Discord_String returnValueNative__;
+    returnIsNonNull__ = Discord_Activity_Details(&instance_, &returnValueNative__);
+    if (!returnIsNonNull__) {
+        return {};
+    }
+    std::string returnValue__(reinterpret_cast<char*>(returnValueNative__.ptr),
+                              returnValueNative__.size);
+    Discord_Free(returnValueNative__.ptr);
+    return returnValue__;
+}
+void Activity::SetDetails(std::optional<std::string> Details)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_String Details__str{};
+    if (Details.has_value()) {
+        Details__str.ptr = reinterpret_cast<uint8_t*>(Details->data());
+        Details__str.size = Details->size();
+    }
+    Discord_Activity_SetDetails(&instance_, (Details.has_value() ? &Details__str : nullptr));
+}
+std::optional<std::string> Activity::DetailsUrl() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    bool returnIsNonNull__;
+    Discord_String returnValueNative__;
+    returnIsNonNull__ = Discord_Activity_DetailsUrl(&instance_, &returnValueNative__);
+    if (!returnIsNonNull__) {
+        return {};
+    }
+    std::string returnValue__(reinterpret_cast<char*>(returnValueNative__.ptr),
+                              returnValueNative__.size);
+    Discord_Free(returnValueNative__.ptr);
+    return returnValue__;
+}
+void Activity::SetDetailsUrl(std::optional<std::string> DetailsUrl)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_String DetailsUrl__str{};
+    if (DetailsUrl.has_value()) {
+        DetailsUrl__str.ptr = reinterpret_cast<uint8_t*>(DetailsUrl->data());
+        DetailsUrl__str.size = DetailsUrl->size();
+    }
+    Discord_Activity_SetDetailsUrl(&instance_,
+                                   (DetailsUrl.has_value() ? &DetailsUrl__str : nullptr));
+}
+std::optional<uint64_t> Activity::ApplicationId() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    bool returnIsNonNull__;
+    uint64_t returnValue__;
+    returnIsNonNull__ = Discord_Activity_ApplicationId(&instance_, &returnValue__);
+    if (!returnIsNonNull__) {
+        return std::nullopt;
+    }
+    return returnValue__;
+}
+void Activity::SetApplicationId(std::optional<uint64_t> ApplicationId)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_Activity_SetApplicationId(&instance_,
+                                      (ApplicationId.has_value() ? &*ApplicationId : nullptr));
+}
+std::optional<uint64_t> Activity::ParentApplicationId() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    bool returnIsNonNull__;
+    uint64_t returnValue__;
+    returnIsNonNull__ = Discord_Activity_ParentApplicationId(&instance_, &returnValue__);
+    if (!returnIsNonNull__) {
+        return std::nullopt;
+    }
+    return returnValue__;
+}
+void Activity::SetParentApplicationId(std::optional<uint64_t> ParentApplicationId)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_Activity_SetParentApplicationId(
+      &instance_, (ParentApplicationId.has_value() ? &*ParentApplicationId : nullptr));
+}
+std::optional<discordpp::ActivityAssets> Activity::Assets() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    bool returnIsNonNull__;
+    Discord_ActivityAssets returnValueNative__;
+    returnIsNonNull__ = Discord_Activity_Assets(&instance_, &returnValueNative__);
+    if (!returnIsNonNull__) {
+        return {};
+    }
+    discordpp::ActivityAssets returnValue__(returnValueNative__, DiscordObjectState::Owned);
+    return returnValue__;
+}
+void Activity::SetAssets(std::optional<discordpp::ActivityAssets> Assets)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_Activity_SetAssets(&instance_, (Assets.has_value() ? Assets->instance() : nullptr));
+}
+std::optional<discordpp::ActivityTimestamps> Activity::Timestamps() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    bool returnIsNonNull__;
+    Discord_ActivityTimestamps returnValueNative__;
+    returnIsNonNull__ = Discord_Activity_Timestamps(&instance_, &returnValueNative__);
+    if (!returnIsNonNull__) {
+        return {};
+    }
+    discordpp::ActivityTimestamps returnValue__(returnValueNative__, DiscordObjectState::Owned);
+    return returnValue__;
+}
+void Activity::SetTimestamps(std::optional<discordpp::ActivityTimestamps> Timestamps)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_Activity_SetTimestamps(&instance_,
+                                   (Timestamps.has_value() ? Timestamps->instance() : nullptr));
+}
+std::optional<discordpp::ActivityParty> Activity::Party() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    bool returnIsNonNull__;
+    Discord_ActivityParty returnValueNative__;
+    returnIsNonNull__ = Discord_Activity_Party(&instance_, &returnValueNative__);
+    if (!returnIsNonNull__) {
+        return {};
+    }
+    discordpp::ActivityParty returnValue__(returnValueNative__, DiscordObjectState::Owned);
+    return returnValue__;
+}
+void Activity::SetParty(std::optional<discordpp::ActivityParty> Party)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_Activity_SetParty(&instance_, (Party.has_value() ? Party->instance() : nullptr));
+}
+std::optional<discordpp::ActivitySecrets> Activity::Secrets() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    bool returnIsNonNull__;
+    Discord_ActivitySecrets returnValueNative__;
+    returnIsNonNull__ = Discord_Activity_Secrets(&instance_, &returnValueNative__);
+    if (!returnIsNonNull__) {
+        return {};
+    }
+    discordpp::ActivitySecrets returnValue__(returnValueNative__, DiscordObjectState::Owned);
+    return returnValue__;
+}
+void Activity::SetSecrets(std::optional<discordpp::ActivitySecrets> Secrets)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_Activity_SetSecrets(&instance_, (Secrets.has_value() ? Secrets->instance() : nullptr));
+}
+discordpp::ActivityGamePlatforms Activity::SupportedPlatforms() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_ActivityGamePlatforms returnValue__;
+    returnValue__ = Discord_Activity_SupportedPlatforms(&instance_);
+    return static_cast<discordpp::ActivityGamePlatforms>(returnValue__);
+}
+void Activity::SetSupportedPlatforms(discordpp::ActivityGamePlatforms SupportedPlatforms)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_Activity_SetSupportedPlatforms(
+      &instance_, static_cast<Discord_ActivityGamePlatforms>(SupportedPlatforms));
+}
+const ClientResult ClientResult::nullobj{{}, DiscordObjectState::Invalid};
+ClientResult::~ClientResult()
+{
+    if (state_ == DiscordObjectState::Owned) {
+        Drop();
+        state_ = DiscordObjectState::Invalid;
+    }
+}
+ClientResult::ClientResult(ClientResult&& other) noexcept
+  : instance_(other.instance_)
+  , state_(other.state_)
+{
+    other.state_ = DiscordObjectState::Invalid;
+}
+ClientResult& ClientResult::operator=(ClientResult&& other) noexcept
+{
+    if (this != &other) {
+        if (state_ == DiscordObjectState::Owned) {
+            Drop();
+        }
+        instance_ = other.instance_;
+        state_ = other.state_;
+        other.state_ = DiscordObjectState::Invalid;
+    }
+    return *this;
+}
+ClientResult::ClientResult(const ClientResult& arg0)
+  : instance_{}
+  , state_(DiscordObjectState::Invalid)
+{
+    if (arg0.state_ == DiscordObjectState::Owned) {
+        Discord_ClientResult_Clone(&instance_, arg0.instance());
+
+        state_ = DiscordObjectState::Owned;
+    }
+}
+ClientResult& ClientResult::operator=(const ClientResult& arg0)
+{
+    if (this != &arg0) {
+        if (state_ == DiscordObjectState::Owned) {
+            Drop();
+            state_ = DiscordObjectState::Invalid;
+        }
+        if (arg0.state_ == DiscordObjectState::Owned) {
+            Discord_ClientResult_Clone(&instance_, arg0.instance());
+
+            state_ = DiscordObjectState::Owned;
+        }
+    }
+    return *this;
+}
+ClientResult::ClientResult(Discord_ClientResult instance, DiscordObjectState state)
+  : instance_(instance)
+  , state_(state)
+{
+}
+void ClientResult::Drop()
+{
+    if (state_ != DiscordObjectState::Owned) {
+        return;
+    }
+    Discord_ClientResult_Drop(&instance_);
+    state_ = DiscordObjectState::Invalid;
+}
+std::string ClientResult::ToString() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_String returnValueNative__;
+    Discord_ClientResult_ToString(&instance_, &returnValueNative__);
+    std::string returnValue__(reinterpret_cast<char*>(returnValueNative__.ptr),
+                              returnValueNative__.size);
+    Discord_Free(returnValueNative__.ptr);
+    return returnValue__;
+}
+discordpp::ErrorType ClientResult::Type() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_ErrorType returnValue__;
+    returnValue__ = Discord_ClientResult_Type(&instance_);
+    return static_cast<discordpp::ErrorType>(returnValue__);
+}
+void ClientResult::SetType(discordpp::ErrorType Type)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_ClientResult_SetType(&instance_, static_cast<Discord_ErrorType>(Type));
+}
+std::string ClientResult::Error() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_String returnValueNative__;
+    Discord_ClientResult_Error(&instance_, &returnValueNative__);
+    std::string returnValue__(reinterpret_cast<char*>(returnValueNative__.ptr),
+                              returnValueNative__.size);
+    Discord_Free(returnValueNative__.ptr);
+    return returnValue__;
+}
+void ClientResult::SetError(std::string Error)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_String Error__str{(uint8_t*)(Error.data()), Error.size()};
+    Discord_ClientResult_SetError(&instance_, Error__str);
+}
+int32_t ClientResult::ErrorCode() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    int32_t returnValue__;
+    returnValue__ = Discord_ClientResult_ErrorCode(&instance_);
+    return returnValue__;
+}
+void ClientResult::SetErrorCode(int32_t ErrorCode)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_ClientResult_SetErrorCode(&instance_, ErrorCode);
+}
+discordpp::HttpStatusCode ClientResult::Status() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_HttpStatusCode returnValue__;
+    returnValue__ = Discord_ClientResult_Status(&instance_);
+    return static_cast<discordpp::HttpStatusCode>(returnValue__);
+}
+void ClientResult::SetStatus(discordpp::HttpStatusCode Status)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_ClientResult_SetStatus(&instance_, static_cast<Discord_HttpStatusCode>(Status));
+}
+std::string ClientResult::ResponseBody() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_String returnValueNative__;
+    Discord_ClientResult_ResponseBody(&instance_, &returnValueNative__);
+    std::string returnValue__(reinterpret_cast<char*>(returnValueNative__.ptr),
+                              returnValueNative__.size);
+    Discord_Free(returnValueNative__.ptr);
+    return returnValue__;
+}
+void ClientResult::SetResponseBody(std::string ResponseBody)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_String ResponseBody__str{(uint8_t*)(ResponseBody.data()), ResponseBody.size()};
+    Discord_ClientResult_SetResponseBody(&instance_, ResponseBody__str);
+}
+bool ClientResult::Successful() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    bool returnValue__;
+    returnValue__ = Discord_ClientResult_Successful(&instance_);
+    return returnValue__;
+}
+void ClientResult::SetSuccessful(bool Successful)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_ClientResult_SetSuccessful(&instance_, Successful);
+}
+bool ClientResult::Retryable() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    bool returnValue__;
+    returnValue__ = Discord_ClientResult_Retryable(&instance_);
+    return returnValue__;
+}
+void ClientResult::SetRetryable(bool Retryable)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_ClientResult_SetRetryable(&instance_, Retryable);
+}
+float ClientResult::RetryAfter() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    float returnValue__;
+    returnValue__ = Discord_ClientResult_RetryAfter(&instance_);
+    return returnValue__;
+}
+void ClientResult::SetRetryAfter(float RetryAfter)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_ClientResult_SetRetryAfter(&instance_, RetryAfter);
+}
+const AuthorizationCodeChallenge AuthorizationCodeChallenge::nullobj{{},
+                                                                     DiscordObjectState::Invalid};
+AuthorizationCodeChallenge::~AuthorizationCodeChallenge()
+{
+    if (state_ == DiscordObjectState::Owned) {
+        Drop();
+        state_ = DiscordObjectState::Invalid;
+    }
+}
+AuthorizationCodeChallenge::AuthorizationCodeChallenge(AuthorizationCodeChallenge&& other) noexcept
+  : instance_(other.instance_)
+  , state_(other.state_)
+{
+    other.state_ = DiscordObjectState::Invalid;
+}
+AuthorizationCodeChallenge& AuthorizationCodeChallenge::operator=(
+  AuthorizationCodeChallenge&& other) noexcept
+{
+    if (this != &other) {
+        if (state_ == DiscordObjectState::Owned) {
+            Drop();
+        }
+        instance_ = other.instance_;
+        state_ = other.state_;
+        other.state_ = DiscordObjectState::Invalid;
+    }
+    return *this;
+}
+AuthorizationCodeChallenge::AuthorizationCodeChallenge(const AuthorizationCodeChallenge& arg0)
+  : instance_{}
+  , state_(DiscordObjectState::Invalid)
+{
+    if (arg0.state_ == DiscordObjectState::Owned) {
+        Discord_AuthorizationCodeChallenge_Clone(&instance_, arg0.instance());
+
+        state_ = DiscordObjectState::Owned;
+    }
+}
+AuthorizationCodeChallenge& AuthorizationCodeChallenge::operator=(
+  const AuthorizationCodeChallenge& arg0)
+{
+    if (this != &arg0) {
+        if (state_ == DiscordObjectState::Owned) {
+            Drop();
+            state_ = DiscordObjectState::Invalid;
+        }
+        if (arg0.state_ == DiscordObjectState::Owned) {
+            Discord_AuthorizationCodeChallenge_Clone(&instance_, arg0.instance());
+
+            state_ = DiscordObjectState::Owned;
+        }
+    }
+    return *this;
+}
+AuthorizationCodeChallenge::AuthorizationCodeChallenge(Discord_AuthorizationCodeChallenge instance,
+                                                       DiscordObjectState state)
+  : instance_(instance)
+  , state_(state)
+{
+}
+AuthorizationCodeChallenge::AuthorizationCodeChallenge()
+{
+    assert(state_ == DiscordObjectState::Invalid);
+    Discord_AuthorizationCodeChallenge_Init(&instance_);
+    state_ = DiscordObjectState::Owned;
+}
+void AuthorizationCodeChallenge::Drop()
+{
+    if (state_ != DiscordObjectState::Owned) {
+        return;
+    }
+    Discord_AuthorizationCodeChallenge_Drop(&instance_);
+    state_ = DiscordObjectState::Invalid;
+}
+discordpp::AuthenticationCodeChallengeMethod AuthorizationCodeChallenge::Method() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_AuthenticationCodeChallengeMethod returnValue__;
+    returnValue__ = Discord_AuthorizationCodeChallenge_Method(&instance_);
+    return static_cast<discordpp::AuthenticationCodeChallengeMethod>(returnValue__);
+}
+void AuthorizationCodeChallenge::SetMethod(discordpp::AuthenticationCodeChallengeMethod Method)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_AuthorizationCodeChallenge_SetMethod(
+      &instance_, static_cast<Discord_AuthenticationCodeChallengeMethod>(Method));
+}
+std::string AuthorizationCodeChallenge::Challenge() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_String returnValueNative__;
+    Discord_AuthorizationCodeChallenge_Challenge(&instance_, &returnValueNative__);
+    std::string returnValue__(reinterpret_cast<char*>(returnValueNative__.ptr),
+                              returnValueNative__.size);
+    Discord_Free(returnValueNative__.ptr);
+    return returnValue__;
+}
+void AuthorizationCodeChallenge::SetChallenge(std::string Challenge)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_String Challenge__str{(uint8_t*)(Challenge.data()), Challenge.size()};
+    Discord_AuthorizationCodeChallenge_SetChallenge(&instance_, Challenge__str);
+}
+const AuthorizationCodeVerifier AuthorizationCodeVerifier::nullobj{{}, DiscordObjectState::Invalid};
+AuthorizationCodeVerifier::~AuthorizationCodeVerifier()
+{
+    if (state_ == DiscordObjectState::Owned) {
+        Drop();
+        state_ = DiscordObjectState::Invalid;
+    }
+}
+AuthorizationCodeVerifier::AuthorizationCodeVerifier(AuthorizationCodeVerifier&& other) noexcept
+  : instance_(other.instance_)
+  , state_(other.state_)
+{
+    other.state_ = DiscordObjectState::Invalid;
+}
+AuthorizationCodeVerifier& AuthorizationCodeVerifier::operator=(
+  AuthorizationCodeVerifier&& other) noexcept
+{
+    if (this != &other) {
+        if (state_ == DiscordObjectState::Owned) {
+            Drop();
+        }
+        instance_ = other.instance_;
+        state_ = other.state_;
+        other.state_ = DiscordObjectState::Invalid;
+    }
+    return *this;
+}
+AuthorizationCodeVerifier::AuthorizationCodeVerifier(const AuthorizationCodeVerifier& arg0)
+  : instance_{}
+  , state_(DiscordObjectState::Invalid)
+{
+    if (arg0.state_ == DiscordObjectState::Owned) {
+        Discord_AuthorizationCodeVerifier_Clone(&instance_, arg0.instance());
+
+        state_ = DiscordObjectState::Owned;
+    }
+}
+AuthorizationCodeVerifier& AuthorizationCodeVerifier::operator=(
+  const AuthorizationCodeVerifier& arg0)
+{
+    if (this != &arg0) {
+        if (state_ == DiscordObjectState::Owned) {
+            Drop();
+            state_ = DiscordObjectState::Invalid;
+        }
+        if (arg0.state_ == DiscordObjectState::Owned) {
+            Discord_AuthorizationCodeVerifier_Clone(&instance_, arg0.instance());
+
+            state_ = DiscordObjectState::Owned;
+        }
+    }
+    return *this;
+}
+AuthorizationCodeVerifier::AuthorizationCodeVerifier(Discord_AuthorizationCodeVerifier instance,
+                                                     DiscordObjectState state)
+  : instance_(instance)
+  , state_(state)
+{
+}
+void AuthorizationCodeVerifier::Drop()
+{
+    if (state_ != DiscordObjectState::Owned) {
+        return;
+    }
+    Discord_AuthorizationCodeVerifier_Drop(&instance_);
+    state_ = DiscordObjectState::Invalid;
+}
+discordpp::AuthorizationCodeChallenge AuthorizationCodeVerifier::Challenge() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_AuthorizationCodeChallenge returnValueNative__{};
+    Discord_AuthorizationCodeVerifier_Challenge(&instance_, &returnValueNative__);
+    discordpp::AuthorizationCodeChallenge returnValue__(returnValueNative__,
+                                                        DiscordObjectState::Owned);
+    return returnValue__;
+}
+void AuthorizationCodeVerifier::SetChallenge(discordpp::AuthorizationCodeChallenge Challenge)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_AuthorizationCodeVerifier_SetChallenge(&instance_, Challenge.instance());
+}
+std::string AuthorizationCodeVerifier::Verifier() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_String returnValueNative__;
+    Discord_AuthorizationCodeVerifier_Verifier(&instance_, &returnValueNative__);
+    std::string returnValue__(reinterpret_cast<char*>(returnValueNative__.ptr),
+                              returnValueNative__.size);
+    Discord_Free(returnValueNative__.ptr);
+    return returnValue__;
+}
+void AuthorizationCodeVerifier::SetVerifier(std::string Verifier)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_String Verifier__str{(uint8_t*)(Verifier.data()), Verifier.size()};
+    Discord_AuthorizationCodeVerifier_SetVerifier(&instance_, Verifier__str);
+}
+const AuthorizationArgs AuthorizationArgs::nullobj{{}, DiscordObjectState::Invalid};
+AuthorizationArgs::~AuthorizationArgs()
+{
+    if (state_ == DiscordObjectState::Owned) {
+        Drop();
+        state_ = DiscordObjectState::Invalid;
+    }
+}
+AuthorizationArgs::AuthorizationArgs(AuthorizationArgs&& other) noexcept
+  : instance_(other.instance_)
+  , state_(other.state_)
+{
+    other.state_ = DiscordObjectState::Invalid;
+}
+AuthorizationArgs& AuthorizationArgs::operator=(AuthorizationArgs&& other) noexcept
+{
+    if (this != &other) {
+        if (state_ == DiscordObjectState::Owned) {
+            Drop();
+        }
+        instance_ = other.instance_;
+        state_ = other.state_;
+        other.state_ = DiscordObjectState::Invalid;
+    }
+    return *this;
+}
+AuthorizationArgs::AuthorizationArgs(const AuthorizationArgs& arg0)
+  : instance_{}
+  , state_(DiscordObjectState::Invalid)
+{
+    if (arg0.state_ == DiscordObjectState::Owned) {
+        Discord_AuthorizationArgs_Clone(&instance_, arg0.instance());
+
+        state_ = DiscordObjectState::Owned;
+    }
+}
+AuthorizationArgs& AuthorizationArgs::operator=(const AuthorizationArgs& arg0)
+{
+    if (this != &arg0) {
+        if (state_ == DiscordObjectState::Owned) {
+            Drop();
+            state_ = DiscordObjectState::Invalid;
+        }
+        if (arg0.state_ == DiscordObjectState::Owned) {
+            Discord_AuthorizationArgs_Clone(&instance_, arg0.instance());
+
+            state_ = DiscordObjectState::Owned;
+        }
+    }
+    return *this;
+}
+AuthorizationArgs::AuthorizationArgs(Discord_AuthorizationArgs instance, DiscordObjectState state)
+  : instance_(instance)
+  , state_(state)
+{
+}
+AuthorizationArgs::AuthorizationArgs()
+{
+    assert(state_ == DiscordObjectState::Invalid);
+    Discord_AuthorizationArgs_Init(&instance_);
+    state_ = DiscordObjectState::Owned;
+}
+void AuthorizationArgs::Drop()
+{
+    if (state_ != DiscordObjectState::Owned) {
+        return;
+    }
+    Discord_AuthorizationArgs_Drop(&instance_);
+    state_ = DiscordObjectState::Invalid;
+}
+uint64_t AuthorizationArgs::ClientId() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    uint64_t returnValue__;
+    returnValue__ = Discord_AuthorizationArgs_ClientId(&instance_);
+    return returnValue__;
+}
+void AuthorizationArgs::SetClientId(uint64_t ClientId)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_AuthorizationArgs_SetClientId(&instance_, ClientId);
+}
+std::string AuthorizationArgs::Scopes() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_String returnValueNative__;
+    Discord_AuthorizationArgs_Scopes(&instance_, &returnValueNative__);
+    std::string returnValue__(reinterpret_cast<char*>(returnValueNative__.ptr),
+                              returnValueNative__.size);
+    Discord_Free(returnValueNative__.ptr);
+    return returnValue__;
+}
+void AuthorizationArgs::SetScopes(std::string Scopes)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_String Scopes__str{(uint8_t*)(Scopes.data()), Scopes.size()};
+    Discord_AuthorizationArgs_SetScopes(&instance_, Scopes__str);
+}
+std::optional<std::string> AuthorizationArgs::State() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    bool returnIsNonNull__;
+    Discord_String returnValueNative__;
+    returnIsNonNull__ = Discord_AuthorizationArgs_State(&instance_, &returnValueNative__);
+    if (!returnIsNonNull__) {
+        return {};
+    }
+    std::string returnValue__(reinterpret_cast<char*>(returnValueNative__.ptr),
+                              returnValueNative__.size);
+    Discord_Free(returnValueNative__.ptr);
+    return returnValue__;
+}
+void AuthorizationArgs::SetState(std::optional<std::string> State)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_String State__str{};
+    if (State.has_value()) {
+        State__str.ptr = reinterpret_cast<uint8_t*>(State->data());
+        State__str.size = State->size();
+    }
+    Discord_AuthorizationArgs_SetState(&instance_, (State.has_value() ? &State__str : nullptr));
+}
+std::optional<std::string> AuthorizationArgs::Nonce() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    bool returnIsNonNull__;
+    Discord_String returnValueNative__;
+    returnIsNonNull__ = Discord_AuthorizationArgs_Nonce(&instance_, &returnValueNative__);
+    if (!returnIsNonNull__) {
+        return {};
+    }
+    std::string returnValue__(reinterpret_cast<char*>(returnValueNative__.ptr),
+                              returnValueNative__.size);
+    Discord_Free(returnValueNative__.ptr);
+    return returnValue__;
+}
+void AuthorizationArgs::SetNonce(std::optional<std::string> Nonce)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_String Nonce__str{};
+    if (Nonce.has_value()) {
+        Nonce__str.ptr = reinterpret_cast<uint8_t*>(Nonce->data());
+        Nonce__str.size = Nonce->size();
+    }
+    Discord_AuthorizationArgs_SetNonce(&instance_, (Nonce.has_value() ? &Nonce__str : nullptr));
+}
+std::optional<discordpp::AuthorizationCodeChallenge> AuthorizationArgs::CodeChallenge() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    bool returnIsNonNull__;
+    Discord_AuthorizationCodeChallenge returnValueNative__;
+    returnIsNonNull__ = Discord_AuthorizationArgs_CodeChallenge(&instance_, &returnValueNative__);
+    if (!returnIsNonNull__) {
+        return {};
+    }
+    discordpp::AuthorizationCodeChallenge returnValue__(returnValueNative__,
+                                                        DiscordObjectState::Owned);
+    return returnValue__;
+}
+void AuthorizationArgs::SetCodeChallenge(
+  std::optional<discordpp::AuthorizationCodeChallenge> CodeChallenge)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_AuthorizationArgs_SetCodeChallenge(
+      &instance_, (CodeChallenge.has_value() ? CodeChallenge->instance() : nullptr));
+}
+std::optional<discordpp::IntegrationType> AuthorizationArgs::IntegrationType() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    bool returnIsNonNull__;
+    Discord_IntegrationType returnValueNative__;
+    returnIsNonNull__ = Discord_AuthorizationArgs_IntegrationType(&instance_, &returnValueNative__);
+    if (!returnIsNonNull__) {
+        return {};
+    }
+    auto returnValue__ = static_cast<discordpp::IntegrationType>(returnValueNative__);
+    return returnValue__;
+}
+void AuthorizationArgs::SetIntegrationType(
+  std::optional<discordpp::IntegrationType> IntegrationType)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_AuthorizationArgs_SetIntegrationType(
+      &instance_,
+      (IntegrationType.has_value() ? reinterpret_cast<Discord_IntegrationType*>(&*IntegrationType)
+                                   : nullptr));
+}
+std::optional<std::string> AuthorizationArgs::CustomSchemeParam() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    bool returnIsNonNull__;
+    Discord_String returnValueNative__;
+    returnIsNonNull__ =
+      Discord_AuthorizationArgs_CustomSchemeParam(&instance_, &returnValueNative__);
+    if (!returnIsNonNull__) {
+        return {};
+    }
+    std::string returnValue__(reinterpret_cast<char*>(returnValueNative__.ptr),
+                              returnValueNative__.size);
+    Discord_Free(returnValueNative__.ptr);
+    return returnValue__;
+}
+void AuthorizationArgs::SetCustomSchemeParam(std::optional<std::string> CustomSchemeParam)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_String CustomSchemeParam__str{};
+    if (CustomSchemeParam.has_value()) {
+        CustomSchemeParam__str.ptr = reinterpret_cast<uint8_t*>(CustomSchemeParam->data());
+        CustomSchemeParam__str.size = CustomSchemeParam->size();
+    }
+    Discord_AuthorizationArgs_SetCustomSchemeParam(
+      &instance_, (CustomSchemeParam.has_value() ? &CustomSchemeParam__str : nullptr));
+}
+const DeviceAuthorizationArgs DeviceAuthorizationArgs::nullobj{{}, DiscordObjectState::Invalid};
+DeviceAuthorizationArgs::~DeviceAuthorizationArgs()
+{
+    if (state_ == DiscordObjectState::Owned) {
+        Drop();
+        state_ = DiscordObjectState::Invalid;
+    }
+}
+DeviceAuthorizationArgs::DeviceAuthorizationArgs(DeviceAuthorizationArgs&& other) noexcept
+  : instance_(other.instance_)
+  , state_(other.state_)
+{
+    other.state_ = DiscordObjectState::Invalid;
+}
+DeviceAuthorizationArgs& DeviceAuthorizationArgs::operator=(
+  DeviceAuthorizationArgs&& other) noexcept
+{
+    if (this != &other) {
+        if (state_ == DiscordObjectState::Owned) {
+            Drop();
+        }
+        instance_ = other.instance_;
+        state_ = other.state_;
+        other.state_ = DiscordObjectState::Invalid;
+    }
+    return *this;
+}
+DeviceAuthorizationArgs::DeviceAuthorizationArgs(const DeviceAuthorizationArgs& arg0)
+  : instance_{}
+  , state_(DiscordObjectState::Invalid)
+{
+    if (arg0.state_ == DiscordObjectState::Owned) {
+        Discord_DeviceAuthorizationArgs_Clone(&instance_, arg0.instance());
+
+        state_ = DiscordObjectState::Owned;
+    }
+}
+DeviceAuthorizationArgs& DeviceAuthorizationArgs::operator=(const DeviceAuthorizationArgs& arg0)
+{
+    if (this != &arg0) {
+        if (state_ == DiscordObjectState::Owned) {
+            Drop();
+            state_ = DiscordObjectState::Invalid;
+        }
+        if (arg0.state_ == DiscordObjectState::Owned) {
+            Discord_DeviceAuthorizationArgs_Clone(&instance_, arg0.instance());
+
+            state_ = DiscordObjectState::Owned;
+        }
+    }
+    return *this;
+}
+DeviceAuthorizationArgs::DeviceAuthorizationArgs(Discord_DeviceAuthorizationArgs instance,
+                                                 DiscordObjectState state)
+  : instance_(instance)
+  , state_(state)
+{
+}
+DeviceAuthorizationArgs::DeviceAuthorizationArgs()
+{
+    assert(state_ == DiscordObjectState::Invalid);
+    Discord_DeviceAuthorizationArgs_Init(&instance_);
+    state_ = DiscordObjectState::Owned;
+}
+void DeviceAuthorizationArgs::Drop()
+{
+    if (state_ != DiscordObjectState::Owned) {
+        return;
+    }
+    Discord_DeviceAuthorizationArgs_Drop(&instance_);
+    state_ = DiscordObjectState::Invalid;
+}
+uint64_t DeviceAuthorizationArgs::ClientId() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    uint64_t returnValue__;
+    returnValue__ = Discord_DeviceAuthorizationArgs_ClientId(&instance_);
+    return returnValue__;
+}
+void DeviceAuthorizationArgs::SetClientId(uint64_t ClientId)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_DeviceAuthorizationArgs_SetClientId(&instance_, ClientId);
+}
+std::string DeviceAuthorizationArgs::Scopes() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_String returnValueNative__;
+    Discord_DeviceAuthorizationArgs_Scopes(&instance_, &returnValueNative__);
+    std::string returnValue__(reinterpret_cast<char*>(returnValueNative__.ptr),
+                              returnValueNative__.size);
+    Discord_Free(returnValueNative__.ptr);
+    return returnValue__;
+}
+void DeviceAuthorizationArgs::SetScopes(std::string Scopes)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_String Scopes__str{(uint8_t*)(Scopes.data()), Scopes.size()};
+    Discord_DeviceAuthorizationArgs_SetScopes(&instance_, Scopes__str);
+}
+const VoiceStateHandle VoiceStateHandle::nullobj{{}, DiscordObjectState::Invalid};
+VoiceStateHandle::~VoiceStateHandle()
+{
+    if (state_ == DiscordObjectState::Owned) {
+        Drop();
+        state_ = DiscordObjectState::Invalid;
+    }
+}
+VoiceStateHandle::VoiceStateHandle(VoiceStateHandle&& other) noexcept
+  : instance_(other.instance_)
+  , state_(other.state_)
+{
+    other.state_ = DiscordObjectState::Invalid;
+}
+VoiceStateHandle& VoiceStateHandle::operator=(VoiceStateHandle&& other) noexcept
+{
+    if (this != &other) {
+        if (state_ == DiscordObjectState::Owned) {
+            Drop();
+        }
+        instance_ = other.instance_;
+        state_ = other.state_;
+        other.state_ = DiscordObjectState::Invalid;
+    }
+    return *this;
+}
+VoiceStateHandle::VoiceStateHandle(const VoiceStateHandle& other)
+  : instance_{}
+  , state_(DiscordObjectState::Invalid)
+{
+    if (other.state_ == DiscordObjectState::Owned) {
+        Discord_VoiceStateHandle_Clone(&instance_, other.instance());
+
+        state_ = DiscordObjectState::Owned;
+    }
+}
+VoiceStateHandle& VoiceStateHandle::operator=(const VoiceStateHandle& other)
+{
+    if (this != &other) {
+        if (state_ == DiscordObjectState::Owned) {
+            Drop();
+            state_ = DiscordObjectState::Invalid;
+        }
+        if (other.state_ == DiscordObjectState::Owned) {
+            Discord_VoiceStateHandle_Clone(&instance_, other.instance());
+
+            state_ = DiscordObjectState::Owned;
+        }
+    }
+    return *this;
+}
+VoiceStateHandle::VoiceStateHandle(Discord_VoiceStateHandle instance, DiscordObjectState state)
+  : instance_(instance)
+  , state_(state)
+{
+}
+void VoiceStateHandle::Drop()
+{
+    if (state_ != DiscordObjectState::Owned) {
+        return;
+    }
+    Discord_VoiceStateHandle_Drop(&instance_);
+    state_ = DiscordObjectState::Invalid;
+}
+bool VoiceStateHandle::SelfDeaf() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    bool returnValue__;
+    returnValue__ = Discord_VoiceStateHandle_SelfDeaf(&instance_);
+    return returnValue__;
+}
+bool VoiceStateHandle::SelfMute() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    bool returnValue__;
+    returnValue__ = Discord_VoiceStateHandle_SelfMute(&instance_);
+    return returnValue__;
+}
+const VADThresholdSettings VADThresholdSettings::nullobj{{}, DiscordObjectState::Invalid};
+VADThresholdSettings::~VADThresholdSettings()
+{
+    if (state_ == DiscordObjectState::Owned) {
+        Drop();
+        state_ = DiscordObjectState::Invalid;
+    }
+}
+VADThresholdSettings::VADThresholdSettings(VADThresholdSettings&& other) noexcept
+  : instance_(other.instance_)
+  , state_(other.state_)
+{
+    other.state_ = DiscordObjectState::Invalid;
+}
+VADThresholdSettings& VADThresholdSettings::operator=(VADThresholdSettings&& other) noexcept
+{
+    if (this != &other) {
+        if (state_ == DiscordObjectState::Owned) {
+            Drop();
+        }
+        instance_ = other.instance_;
+        state_ = other.state_;
+        other.state_ = DiscordObjectState::Invalid;
+    }
+    return *this;
+}
+VADThresholdSettings::VADThresholdSettings(Discord_VADThresholdSettings instance,
+                                           DiscordObjectState state)
+  : instance_(instance)
+  , state_(state)
+{
+}
+void VADThresholdSettings::Drop()
+{
+    if (state_ != DiscordObjectState::Owned) {
+        return;
+    }
+    Discord_VADThresholdSettings_Drop(&instance_);
+    state_ = DiscordObjectState::Invalid;
+}
+float VADThresholdSettings::VadThreshold() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    float returnValue__;
+    returnValue__ = Discord_VADThresholdSettings_VadThreshold(&instance_);
+    return returnValue__;
+}
+void VADThresholdSettings::SetVadThreshold(float VadThreshold)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_VADThresholdSettings_SetVadThreshold(&instance_, VadThreshold);
+}
+bool VADThresholdSettings::Automatic() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    bool returnValue__;
+    returnValue__ = Discord_VADThresholdSettings_Automatic(&instance_);
+    return returnValue__;
+}
+void VADThresholdSettings::SetAutomatic(bool Automatic)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_VADThresholdSettings_SetAutomatic(&instance_, Automatic);
+}
+const Call Call::nullobj{{}, DiscordObjectState::Invalid};
+Call::~Call()
+{
+    if (state_ == DiscordObjectState::Owned) {
+        Drop();
+        state_ = DiscordObjectState::Invalid;
+    }
+}
+Call::Call(Call&& other) noexcept
+  : instance_(other.instance_)
+  , state_(other.state_)
+{
+    other.state_ = DiscordObjectState::Invalid;
+}
+Call& Call::operator=(Call&& other) noexcept
+{
+    if (this != &other) {
+        if (state_ == DiscordObjectState::Owned) {
+            Drop();
+        }
+        instance_ = other.instance_;
+        state_ = other.state_;
+        other.state_ = DiscordObjectState::Invalid;
+    }
+    return *this;
+}
+Call::Call(const Call& other)
+  : instance_{}
+  , state_(DiscordObjectState::Invalid)
+{
+    if (other.state_ == DiscordObjectState::Owned) {
+        Discord_Call_Clone(&instance_, other.instance());
+
+        state_ = DiscordObjectState::Owned;
+    }
+}
+Call& Call::operator=(const Call& other)
+{
+    if (this != &other) {
+        if (state_ == DiscordObjectState::Owned) {
+            Drop();
+            state_ = DiscordObjectState::Invalid;
+        }
+        if (other.state_ == DiscordObjectState::Owned) {
+            Discord_Call_Clone(&instance_, other.instance());
+
+            state_ = DiscordObjectState::Owned;
+        }
+    }
+    return *this;
+}
+Call::Call(Discord_Call instance, DiscordObjectState state)
+  : instance_(instance)
+  , state_(state)
+{
+}
+void Call::Drop()
+{
+    if (state_ != DiscordObjectState::Owned) {
+        return;
+    }
+    Discord_Call_Drop(&instance_);
+    state_ = DiscordObjectState::Invalid;
+}
+std::string Call::ErrorToString(discordpp::Call::Error type)
+{
+    Discord_String returnValueNative__;
+    Discord_Call_ErrorToString(static_cast<Discord_Call_Error>(type), &returnValueNative__);
+    std::string returnValue__(reinterpret_cast<char*>(returnValueNative__.ptr),
+                              returnValueNative__.size);
+    Discord_Free(returnValueNative__.ptr);
+    return returnValue__;
+}
+discordpp::AudioModeType Call::GetAudioMode()
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_AudioModeType returnValue__;
+    returnValue__ = Discord_Call_GetAudioMode(&instance_);
+    return static_cast<discordpp::AudioModeType>(returnValue__);
+}
+uint64_t Call::GetChannelId() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    uint64_t returnValue__;
+    returnValue__ = Discord_Call_GetChannelId(&instance_);
+    return returnValue__;
+}
+uint64_t Call::GetGuildId() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    uint64_t returnValue__;
+    returnValue__ = Discord_Call_GetGuildId(&instance_);
+    return returnValue__;
+}
+bool Call::GetLocalMute(uint64_t userId)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    bool returnValue__;
+    returnValue__ = Discord_Call_GetLocalMute(&instance_, userId);
+    return returnValue__;
+}
+std::vector<uint64_t> Call::GetParticipants() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_UInt64Span returnValueNative__;
+    Discord_Call_GetParticipants(&instance_, &returnValueNative__);
+    std::vector<uint64_t> returnValue__(returnValueNative__.ptr,
+                                        returnValueNative__.ptr + returnValueNative__.size);
+    Discord_Free(returnValueNative__.ptr);
+    return returnValue__;
+}
+float Call::GetParticipantVolume(uint64_t userId)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    float returnValue__;
+    returnValue__ = Discord_Call_GetParticipantVolume(&instance_, userId);
+    return returnValue__;
+}
+bool Call::GetPTTActive()
+{
+    assert(state_ == DiscordObjectState::Owned);
+    bool returnValue__;
+    returnValue__ = Discord_Call_GetPTTActive(&instance_);
+    return returnValue__;
+}
+uint32_t Call::GetPTTReleaseDelay()
+{
+    assert(state_ == DiscordObjectState::Owned);
+    uint32_t returnValue__;
+    returnValue__ = Discord_Call_GetPTTReleaseDelay(&instance_);
+    return returnValue__;
+}
+bool Call::GetSelfDeaf()
+{
+    assert(state_ == DiscordObjectState::Owned);
+    bool returnValue__;
+    returnValue__ = Discord_Call_GetSelfDeaf(&instance_);
+    return returnValue__;
+}
+bool Call::GetSelfMute()
+{
+    assert(state_ == DiscordObjectState::Owned);
+    bool returnValue__;
+    returnValue__ = Discord_Call_GetSelfMute(&instance_);
+    return returnValue__;
+}
+discordpp::Call::Status Call::GetStatus() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_Call_Status returnValue__;
+    returnValue__ = Discord_Call_GetStatus(&instance_);
+    return static_cast<discordpp::Call::Status>(returnValue__);
+}
+discordpp::VADThresholdSettings Call::GetVADThreshold() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_VADThresholdSettings returnValueNative__{};
+    Discord_Call_GetVADThreshold(&instance_, &returnValueNative__);
+    discordpp::VADThresholdSettings returnValue__(returnValueNative__, DiscordObjectState::Owned);
+    return returnValue__;
+}
+std::optional<discordpp::VoiceStateHandle> Call::GetVoiceStateHandle(uint64_t userId) const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    bool returnIsNonNull__;
+    Discord_VoiceStateHandle returnValueNative__;
+    returnIsNonNull__ = Discord_Call_GetVoiceStateHandle(&instance_, userId, &returnValueNative__);
+    if (!returnIsNonNull__) {
+        return {};
+    }
+    discordpp::VoiceStateHandle returnValue__(returnValueNative__, DiscordObjectState::Owned);
+    return returnValue__;
+}
+void Call::SetAudioMode(discordpp::AudioModeType audioMode)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_Call_SetAudioMode(&instance_, static_cast<Discord_AudioModeType>(audioMode));
+}
+void Call::SetLocalMute(uint64_t userId, bool mute)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_Call_SetLocalMute(&instance_, userId, mute);
+}
+void Call::SetOnVoiceStateChangedCallback(discordpp::Call::OnVoiceStateChanged cb)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    using Tcb__UserData = TDelegateUserData<std::remove_reference_t<decltype(cb)>>;
+    auto cb__userData = new Tcb__UserData(cb);
+    Discord_Call_OnVoiceStateChanged cb__native = [](auto userId, void* userData__) {
+        auto userData__typed = static_cast<Tcb__UserData*>(userData__);
+        userData__typed->delegate(userId);
+    };
+    Discord_Call_SetOnVoiceStateChangedCallback(
+      &instance_, cb__native, Tcb__UserData::Free, cb__userData);
+}
+void Call::SetParticipantChangedCallback(discordpp::Call::OnParticipantChanged cb)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    using Tcb__UserData = TDelegateUserData<std::remove_reference_t<decltype(cb)>>;
+    auto cb__userData = new Tcb__UserData(cb);
+    Discord_Call_OnParticipantChanged cb__native = [](auto userId, auto added, void* userData__) {
+        auto userData__typed = static_cast<Tcb__UserData*>(userData__);
+        userData__typed->delegate(userId, added);
+    };
+    Discord_Call_SetParticipantChangedCallback(
+      &instance_, cb__native, Tcb__UserData::Free, cb__userData);
+}
+void Call::SetParticipantVolume(uint64_t userId, float volume)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_Call_SetParticipantVolume(&instance_, userId, volume);
+}
+void Call::SetPTTActive(bool active)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_Call_SetPTTActive(&instance_, active);
+}
+void Call::SetPTTReleaseDelay(uint32_t releaseDelayMs)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_Call_SetPTTReleaseDelay(&instance_, releaseDelayMs);
+}
+void Call::SetSelfDeaf(bool deaf)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_Call_SetSelfDeaf(&instance_, deaf);
+}
+void Call::SetSelfMute(bool mute)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_Call_SetSelfMute(&instance_, mute);
+}
+void Call::SetSpeakingStatusChangedCallback(discordpp::Call::OnSpeakingStatusChanged cb)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    using Tcb__UserData = TDelegateUserData<std::remove_reference_t<decltype(cb)>>;
+    auto cb__userData = new Tcb__UserData(cb);
+    Discord_Call_OnSpeakingStatusChanged cb__native =
+      [](auto userId, auto isPlayingSound, void* userData__) {
+          auto userData__typed = static_cast<Tcb__UserData*>(userData__);
+          userData__typed->delegate(userId, isPlayingSound);
+      };
+    Discord_Call_SetSpeakingStatusChangedCallback(
+      &instance_, cb__native, Tcb__UserData::Free, cb__userData);
+}
+void Call::SetStatusChangedCallback(discordpp::Call::OnStatusChanged cb)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    using Tcb__UserData = TDelegateUserData<std::remove_reference_t<decltype(cb)>>;
+    auto cb__userData = new Tcb__UserData(cb);
+    Discord_Call_OnStatusChanged cb__native =
+      [](auto status, auto error, auto errorDetail, void* userData__) {
+          auto userData__typed = static_cast<Tcb__UserData*>(userData__);
+          userData__typed->delegate(static_cast<discordpp::Call::Status>(status),
+                                    static_cast<discordpp::Call::Error>(error),
+                                    errorDetail);
+      };
+    Discord_Call_SetStatusChangedCallback(
+      &instance_, cb__native, Tcb__UserData::Free, cb__userData);
+}
+void Call::SetVADThreshold(bool automatic, float threshold)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_Call_SetVADThreshold(&instance_, automatic, threshold);
+}
+std::string Call::StatusToString(discordpp::Call::Status type)
+{
+    Discord_String returnValueNative__;
+    Discord_Call_StatusToString(static_cast<Discord_Call_Status>(type), &returnValueNative__);
+    std::string returnValue__(reinterpret_cast<char*>(returnValueNative__.ptr),
+                              returnValueNative__.size);
+    Discord_Free(returnValueNative__.ptr);
+    return returnValue__;
+}
+const ChannelHandle ChannelHandle::nullobj{{}, DiscordObjectState::Invalid};
+ChannelHandle::~ChannelHandle()
+{
+    if (state_ == DiscordObjectState::Owned) {
+        Drop();
+        state_ = DiscordObjectState::Invalid;
+    }
+}
+ChannelHandle::ChannelHandle(ChannelHandle&& other) noexcept
+  : instance_(other.instance_)
+  , state_(other.state_)
+{
+    other.state_ = DiscordObjectState::Invalid;
+}
+ChannelHandle& ChannelHandle::operator=(ChannelHandle&& other) noexcept
+{
+    if (this != &other) {
+        if (state_ == DiscordObjectState::Owned) {
+            Drop();
+        }
+        instance_ = other.instance_;
+        state_ = other.state_;
+        other.state_ = DiscordObjectState::Invalid;
+    }
+    return *this;
+}
+ChannelHandle::ChannelHandle(const ChannelHandle& other)
+  : instance_{}
+  , state_(DiscordObjectState::Invalid)
+{
+    if (other.state_ == DiscordObjectState::Owned) {
+        Discord_ChannelHandle_Clone(&instance_, other.instance());
+
+        state_ = DiscordObjectState::Owned;
+    }
+}
+ChannelHandle& ChannelHandle::operator=(const ChannelHandle& other)
+{
+    if (this != &other) {
+        if (state_ == DiscordObjectState::Owned) {
+            Drop();
+            state_ = DiscordObjectState::Invalid;
+        }
+        if (other.state_ == DiscordObjectState::Owned) {
+            Discord_ChannelHandle_Clone(&instance_, other.instance());
+
+            state_ = DiscordObjectState::Owned;
+        }
+    }
+    return *this;
+}
+ChannelHandle::ChannelHandle(Discord_ChannelHandle instance, DiscordObjectState state)
+  : instance_(instance)
+  , state_(state)
+{
+}
+void ChannelHandle::Drop()
+{
+    if (state_ != DiscordObjectState::Owned) {
+        return;
+    }
+    Discord_ChannelHandle_Drop(&instance_);
+    state_ = DiscordObjectState::Invalid;
+}
+uint64_t ChannelHandle::Id() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    uint64_t returnValue__;
+    returnValue__ = Discord_ChannelHandle_Id(&instance_);
+    return returnValue__;
+}
+std::string ChannelHandle::Name() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_String returnValueNative__;
+    Discord_ChannelHandle_Name(&instance_, &returnValueNative__);
+    std::string returnValue__(reinterpret_cast<char*>(returnValueNative__.ptr),
+                              returnValueNative__.size);
+    Discord_Free(returnValueNative__.ptr);
+    return returnValue__;
+}
+std::vector<uint64_t> ChannelHandle::Recipients() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_UInt64Span returnValueNative__;
+    Discord_ChannelHandle_Recipients(&instance_, &returnValueNative__);
+    std::vector<uint64_t> returnValue__(returnValueNative__.ptr,
+                                        returnValueNative__.ptr + returnValueNative__.size);
+    Discord_Free(returnValueNative__.ptr);
+    return returnValue__;
+}
+discordpp::ChannelType ChannelHandle::Type() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_ChannelType returnValue__;
+    returnValue__ = Discord_ChannelHandle_Type(&instance_);
+    return static_cast<discordpp::ChannelType>(returnValue__);
+}
+const GuildMinimal GuildMinimal::nullobj{{}, DiscordObjectState::Invalid};
+GuildMinimal::~GuildMinimal()
+{
+    if (state_ == DiscordObjectState::Owned) {
+        Drop();
+        state_ = DiscordObjectState::Invalid;
+    }
+}
+GuildMinimal::GuildMinimal(GuildMinimal&& other) noexcept
+  : instance_(other.instance_)
+  , state_(other.state_)
+{
+    other.state_ = DiscordObjectState::Invalid;
+}
+GuildMinimal& GuildMinimal::operator=(GuildMinimal&& other) noexcept
+{
+    if (this != &other) {
+        if (state_ == DiscordObjectState::Owned) {
+            Drop();
+        }
+        instance_ = other.instance_;
+        state_ = other.state_;
+        other.state_ = DiscordObjectState::Invalid;
+    }
+    return *this;
+}
+GuildMinimal::GuildMinimal(const GuildMinimal& arg0)
+  : instance_{}
+  , state_(DiscordObjectState::Invalid)
+{
+    if (arg0.state_ == DiscordObjectState::Owned) {
+        Discord_GuildMinimal_Clone(&instance_, arg0.instance());
+
+        state_ = DiscordObjectState::Owned;
+    }
+}
+GuildMinimal& GuildMinimal::operator=(const GuildMinimal& arg0)
+{
+    if (this != &arg0) {
+        if (state_ == DiscordObjectState::Owned) {
+            Drop();
+            state_ = DiscordObjectState::Invalid;
+        }
+        if (arg0.state_ == DiscordObjectState::Owned) {
+            Discord_GuildMinimal_Clone(&instance_, arg0.instance());
+
+            state_ = DiscordObjectState::Owned;
+        }
+    }
+    return *this;
+}
+GuildMinimal::GuildMinimal(Discord_GuildMinimal instance, DiscordObjectState state)
+  : instance_(instance)
+  , state_(state)
+{
+}
+void GuildMinimal::Drop()
+{
+    if (state_ != DiscordObjectState::Owned) {
+        return;
+    }
+    Discord_GuildMinimal_Drop(&instance_);
+    state_ = DiscordObjectState::Invalid;
+}
+uint64_t GuildMinimal::Id() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    uint64_t returnValue__;
+    returnValue__ = Discord_GuildMinimal_Id(&instance_);
+    return returnValue__;
+}
+void GuildMinimal::SetId(uint64_t Id)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_GuildMinimal_SetId(&instance_, Id);
+}
+std::string GuildMinimal::Name() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_String returnValueNative__;
+    Discord_GuildMinimal_Name(&instance_, &returnValueNative__);
+    std::string returnValue__(reinterpret_cast<char*>(returnValueNative__.ptr),
+                              returnValueNative__.size);
+    Discord_Free(returnValueNative__.ptr);
+    return returnValue__;
+}
+void GuildMinimal::SetName(std::string Name)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_String Name__str{(uint8_t*)(Name.data()), Name.size()};
+    Discord_GuildMinimal_SetName(&instance_, Name__str);
+}
+const GuildChannel GuildChannel::nullobj{{}, DiscordObjectState::Invalid};
+GuildChannel::~GuildChannel()
+{
+    if (state_ == DiscordObjectState::Owned) {
+        Drop();
+        state_ = DiscordObjectState::Invalid;
+    }
+}
+GuildChannel::GuildChannel(GuildChannel&& other) noexcept
+  : instance_(other.instance_)
+  , state_(other.state_)
+{
+    other.state_ = DiscordObjectState::Invalid;
+}
+GuildChannel& GuildChannel::operator=(GuildChannel&& other) noexcept
+{
+    if (this != &other) {
+        if (state_ == DiscordObjectState::Owned) {
+            Drop();
+        }
+        instance_ = other.instance_;
+        state_ = other.state_;
+        other.state_ = DiscordObjectState::Invalid;
+    }
+    return *this;
+}
+GuildChannel::GuildChannel(const GuildChannel& arg0)
+  : instance_{}
+  , state_(DiscordObjectState::Invalid)
+{
+    if (arg0.state_ == DiscordObjectState::Owned) {
+        Discord_GuildChannel_Clone(&instance_, arg0.instance());
+
+        state_ = DiscordObjectState::Owned;
+    }
+}
+GuildChannel& GuildChannel::operator=(const GuildChannel& arg0)
+{
+    if (this != &arg0) {
+        if (state_ == DiscordObjectState::Owned) {
+            Drop();
+            state_ = DiscordObjectState::Invalid;
+        }
+        if (arg0.state_ == DiscordObjectState::Owned) {
+            Discord_GuildChannel_Clone(&instance_, arg0.instance());
+
+            state_ = DiscordObjectState::Owned;
+        }
+    }
+    return *this;
+}
+GuildChannel::GuildChannel(Discord_GuildChannel instance, DiscordObjectState state)
+  : instance_(instance)
+  , state_(state)
+{
+}
+void GuildChannel::Drop()
+{
+    if (state_ != DiscordObjectState::Owned) {
+        return;
+    }
+    Discord_GuildChannel_Drop(&instance_);
+    state_ = DiscordObjectState::Invalid;
+}
+uint64_t GuildChannel::Id() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    uint64_t returnValue__;
+    returnValue__ = Discord_GuildChannel_Id(&instance_);
+    return returnValue__;
+}
+void GuildChannel::SetId(uint64_t Id)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_GuildChannel_SetId(&instance_, Id);
+}
+std::string GuildChannel::Name() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_String returnValueNative__;
+    Discord_GuildChannel_Name(&instance_, &returnValueNative__);
+    std::string returnValue__(reinterpret_cast<char*>(returnValueNative__.ptr),
+                              returnValueNative__.size);
+    Discord_Free(returnValueNative__.ptr);
+    return returnValue__;
+}
+void GuildChannel::SetName(std::string Name)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_String Name__str{(uint8_t*)(Name.data()), Name.size()};
+    Discord_GuildChannel_SetName(&instance_, Name__str);
+}
+discordpp::ChannelType GuildChannel::Type() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_ChannelType returnValue__;
+    returnValue__ = Discord_GuildChannel_Type(&instance_);
+    return static_cast<discordpp::ChannelType>(returnValue__);
+}
+void GuildChannel::SetType(discordpp::ChannelType Type)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_GuildChannel_SetType(&instance_, static_cast<Discord_ChannelType>(Type));
+}
+int32_t GuildChannel::Position() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    int32_t returnValue__;
+    returnValue__ = Discord_GuildChannel_Position(&instance_);
+    return returnValue__;
+}
+void GuildChannel::SetPosition(int32_t Position)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_GuildChannel_SetPosition(&instance_, Position);
+}
+std::optional<uint64_t> GuildChannel::ParentId() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    bool returnIsNonNull__;
+    uint64_t returnValue__;
+    returnIsNonNull__ = Discord_GuildChannel_ParentId(&instance_, &returnValue__);
+    if (!returnIsNonNull__) {
+        return std::nullopt;
+    }
+    return returnValue__;
+}
+void GuildChannel::SetParentId(std::optional<uint64_t> ParentId)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_GuildChannel_SetParentId(&instance_, (ParentId.has_value() ? &*ParentId : nullptr));
+}
+bool GuildChannel::IsLinkable() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    bool returnValue__;
+    returnValue__ = Discord_GuildChannel_IsLinkable(&instance_);
+    return returnValue__;
+}
+void GuildChannel::SetIsLinkable(bool IsLinkable)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_GuildChannel_SetIsLinkable(&instance_, IsLinkable);
+}
+bool GuildChannel::IsViewableAndWriteableByAllMembers() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    bool returnValue__;
+    returnValue__ = Discord_GuildChannel_IsViewableAndWriteableByAllMembers(&instance_);
+    return returnValue__;
+}
+void GuildChannel::SetIsViewableAndWriteableByAllMembers(bool IsViewableAndWriteableByAllMembers)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_GuildChannel_SetIsViewableAndWriteableByAllMembers(&instance_,
+                                                               IsViewableAndWriteableByAllMembers);
+}
+std::optional<discordpp::LinkedLobby> GuildChannel::LinkedLobby() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    bool returnIsNonNull__;
+    Discord_LinkedLobby returnValueNative__;
+    returnIsNonNull__ = Discord_GuildChannel_LinkedLobby(&instance_, &returnValueNative__);
+    if (!returnIsNonNull__) {
+        return {};
+    }
+    discordpp::LinkedLobby returnValue__(returnValueNative__, DiscordObjectState::Owned);
+    return returnValue__;
+}
+void GuildChannel::SetLinkedLobby(std::optional<discordpp::LinkedLobby> LinkedLobby)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_GuildChannel_SetLinkedLobby(
+      &instance_, (LinkedLobby.has_value() ? LinkedLobby->instance() : nullptr));
+}
+const LinkedLobby LinkedLobby::nullobj{{}, DiscordObjectState::Invalid};
+LinkedLobby::~LinkedLobby()
+{
+    if (state_ == DiscordObjectState::Owned) {
+        Drop();
+        state_ = DiscordObjectState::Invalid;
+    }
+}
+LinkedLobby::LinkedLobby(LinkedLobby&& other) noexcept
+  : instance_(other.instance_)
+  , state_(other.state_)
+{
+    other.state_ = DiscordObjectState::Invalid;
+}
+LinkedLobby& LinkedLobby::operator=(LinkedLobby&& other) noexcept
+{
+    if (this != &other) {
+        if (state_ == DiscordObjectState::Owned) {
+            Drop();
+        }
+        instance_ = other.instance_;
+        state_ = other.state_;
+        other.state_ = DiscordObjectState::Invalid;
+    }
+    return *this;
+}
+LinkedLobby::LinkedLobby(const LinkedLobby& arg0)
+  : instance_{}
+  , state_(DiscordObjectState::Invalid)
+{
+    if (arg0.state_ == DiscordObjectState::Owned) {
+        Discord_LinkedLobby_Clone(&instance_, arg0.instance());
+
+        state_ = DiscordObjectState::Owned;
+    }
+}
+LinkedLobby& LinkedLobby::operator=(const LinkedLobby& arg0)
+{
+    if (this != &arg0) {
+        if (state_ == DiscordObjectState::Owned) {
+            Drop();
+            state_ = DiscordObjectState::Invalid;
+        }
+        if (arg0.state_ == DiscordObjectState::Owned) {
+            Discord_LinkedLobby_Clone(&instance_, arg0.instance());
+
+            state_ = DiscordObjectState::Owned;
+        }
+    }
+    return *this;
+}
+LinkedLobby::LinkedLobby(Discord_LinkedLobby instance, DiscordObjectState state)
+  : instance_(instance)
+  , state_(state)
+{
+}
+LinkedLobby::LinkedLobby()
+{
+    assert(state_ == DiscordObjectState::Invalid);
+    Discord_LinkedLobby_Init(&instance_);
+    state_ = DiscordObjectState::Owned;
+}
+void LinkedLobby::Drop()
+{
+    if (state_ != DiscordObjectState::Owned) {
+        return;
+    }
+    Discord_LinkedLobby_Drop(&instance_);
+    state_ = DiscordObjectState::Invalid;
+}
+uint64_t LinkedLobby::ApplicationId() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    uint64_t returnValue__;
+    returnValue__ = Discord_LinkedLobby_ApplicationId(&instance_);
+    return returnValue__;
+}
+void LinkedLobby::SetApplicationId(uint64_t ApplicationId)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_LinkedLobby_SetApplicationId(&instance_, ApplicationId);
+}
+uint64_t LinkedLobby::LobbyId() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    uint64_t returnValue__;
+    returnValue__ = Discord_LinkedLobby_LobbyId(&instance_);
+    return returnValue__;
+}
+void LinkedLobby::SetLobbyId(uint64_t LobbyId)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_LinkedLobby_SetLobbyId(&instance_, LobbyId);
+}
+const LinkedChannel LinkedChannel::nullobj{{}, DiscordObjectState::Invalid};
+LinkedChannel::~LinkedChannel()
+{
+    if (state_ == DiscordObjectState::Owned) {
+        Drop();
+        state_ = DiscordObjectState::Invalid;
+    }
+}
+LinkedChannel::LinkedChannel(LinkedChannel&& other) noexcept
+  : instance_(other.instance_)
+  , state_(other.state_)
+{
+    other.state_ = DiscordObjectState::Invalid;
+}
+LinkedChannel& LinkedChannel::operator=(LinkedChannel&& other) noexcept
+{
+    if (this != &other) {
+        if (state_ == DiscordObjectState::Owned) {
+            Drop();
+        }
+        instance_ = other.instance_;
+        state_ = other.state_;
+        other.state_ = DiscordObjectState::Invalid;
+    }
+    return *this;
+}
+LinkedChannel::LinkedChannel(const LinkedChannel& arg0)
+  : instance_{}
+  , state_(DiscordObjectState::Invalid)
+{
+    if (arg0.state_ == DiscordObjectState::Owned) {
+        Discord_LinkedChannel_Clone(&instance_, arg0.instance());
+
+        state_ = DiscordObjectState::Owned;
+    }
+}
+LinkedChannel& LinkedChannel::operator=(const LinkedChannel& arg0)
+{
+    if (this != &arg0) {
+        if (state_ == DiscordObjectState::Owned) {
+            Drop();
+            state_ = DiscordObjectState::Invalid;
+        }
+        if (arg0.state_ == DiscordObjectState::Owned) {
+            Discord_LinkedChannel_Clone(&instance_, arg0.instance());
+
+            state_ = DiscordObjectState::Owned;
+        }
+    }
+    return *this;
+}
+LinkedChannel::LinkedChannel(Discord_LinkedChannel instance, DiscordObjectState state)
+  : instance_(instance)
+  , state_(state)
+{
+}
+void LinkedChannel::Drop()
+{
+    if (state_ != DiscordObjectState::Owned) {
+        return;
+    }
+    Discord_LinkedChannel_Drop(&instance_);
+    state_ = DiscordObjectState::Invalid;
+}
+uint64_t LinkedChannel::Id() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    uint64_t returnValue__;
+    returnValue__ = Discord_LinkedChannel_Id(&instance_);
+    return returnValue__;
+}
+void LinkedChannel::SetId(uint64_t Id)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_LinkedChannel_SetId(&instance_, Id);
+}
+std::string LinkedChannel::Name() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_String returnValueNative__;
+    Discord_LinkedChannel_Name(&instance_, &returnValueNative__);
+    std::string returnValue__(reinterpret_cast<char*>(returnValueNative__.ptr),
+                              returnValueNative__.size);
+    Discord_Free(returnValueNative__.ptr);
+    return returnValue__;
+}
+void LinkedChannel::SetName(std::string Name)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_String Name__str{(uint8_t*)(Name.data()), Name.size()};
+    Discord_LinkedChannel_SetName(&instance_, Name__str);
+}
+uint64_t LinkedChannel::GuildId() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    uint64_t returnValue__;
+    returnValue__ = Discord_LinkedChannel_GuildId(&instance_);
+    return returnValue__;
+}
+void LinkedChannel::SetGuildId(uint64_t GuildId)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_LinkedChannel_SetGuildId(&instance_, GuildId);
+}
+const RelationshipHandle RelationshipHandle::nullobj{{}, DiscordObjectState::Invalid};
+RelationshipHandle::~RelationshipHandle()
+{
+    if (state_ == DiscordObjectState::Owned) {
+        Drop();
+        state_ = DiscordObjectState::Invalid;
+    }
+}
+RelationshipHandle::RelationshipHandle(RelationshipHandle&& other) noexcept
+  : instance_(other.instance_)
+  , state_(other.state_)
+{
+    other.state_ = DiscordObjectState::Invalid;
+}
+RelationshipHandle& RelationshipHandle::operator=(RelationshipHandle&& other) noexcept
+{
+    if (this != &other) {
+        if (state_ == DiscordObjectState::Owned) {
+            Drop();
+        }
+        instance_ = other.instance_;
+        state_ = other.state_;
+        other.state_ = DiscordObjectState::Invalid;
+    }
+    return *this;
+}
+RelationshipHandle::RelationshipHandle(const RelationshipHandle& other)
+  : instance_{}
+  , state_(DiscordObjectState::Invalid)
+{
+    if (other.state_ == DiscordObjectState::Owned) {
+        Discord_RelationshipHandle_Clone(&instance_, other.instance());
+
+        state_ = DiscordObjectState::Owned;
+    }
+}
+RelationshipHandle& RelationshipHandle::operator=(const RelationshipHandle& other)
+{
+    if (this != &other) {
+        if (state_ == DiscordObjectState::Owned) {
+            Drop();
+            state_ = DiscordObjectState::Invalid;
+        }
+        if (other.state_ == DiscordObjectState::Owned) {
+            Discord_RelationshipHandle_Clone(&instance_, other.instance());
+
+            state_ = DiscordObjectState::Owned;
+        }
+    }
+    return *this;
+}
+RelationshipHandle::RelationshipHandle(Discord_RelationshipHandle instance,
+                                       DiscordObjectState state)
+  : instance_(instance)
+  , state_(state)
+{
+}
+void RelationshipHandle::Drop()
+{
+    if (state_ != DiscordObjectState::Owned) {
+        return;
+    }
+    Discord_RelationshipHandle_Drop(&instance_);
+    state_ = DiscordObjectState::Invalid;
+}
+discordpp::RelationshipType RelationshipHandle::DiscordRelationshipType() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_RelationshipType returnValue__;
+    returnValue__ = Discord_RelationshipHandle_DiscordRelationshipType(&instance_);
+    return static_cast<discordpp::RelationshipType>(returnValue__);
+}
+discordpp::RelationshipType RelationshipHandle::GameRelationshipType() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_RelationshipType returnValue__;
+    returnValue__ = Discord_RelationshipHandle_GameRelationshipType(&instance_);
+    return static_cast<discordpp::RelationshipType>(returnValue__);
+}
+uint64_t RelationshipHandle::Id() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    uint64_t returnValue__;
+    returnValue__ = Discord_RelationshipHandle_Id(&instance_);
+    return returnValue__;
+}
+bool RelationshipHandle::IsSpamRequest() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    bool returnValue__;
+    returnValue__ = Discord_RelationshipHandle_IsSpamRequest(&instance_);
+    return returnValue__;
+}
+std::optional<discordpp::UserHandle> RelationshipHandle::User() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    bool returnIsNonNull__;
+    Discord_UserHandle returnValueNative__;
+    returnIsNonNull__ = Discord_RelationshipHandle_User(&instance_, &returnValueNative__);
+    if (!returnIsNonNull__) {
+        return {};
+    }
+    discordpp::UserHandle returnValue__(returnValueNative__, DiscordObjectState::Owned);
+    return returnValue__;
+}
+const UserApplicationProfileHandle UserApplicationProfileHandle::nullobj{
+  {},
+  DiscordObjectState::Invalid};
+UserApplicationProfileHandle::~UserApplicationProfileHandle()
+{
+    if (state_ == DiscordObjectState::Owned) {
+        Drop();
+        state_ = DiscordObjectState::Invalid;
+    }
+}
+UserApplicationProfileHandle::UserApplicationProfileHandle(
+  UserApplicationProfileHandle&& other) noexcept
+  : instance_(other.instance_)
+  , state_(other.state_)
+{
+    other.state_ = DiscordObjectState::Invalid;
+}
+UserApplicationProfileHandle& UserApplicationProfileHandle::operator=(
+  UserApplicationProfileHandle&& other) noexcept
+{
+    if (this != &other) {
+        if (state_ == DiscordObjectState::Owned) {
+            Drop();
+        }
+        instance_ = other.instance_;
+        state_ = other.state_;
+        other.state_ = DiscordObjectState::Invalid;
+    }
+    return *this;
+}
+UserApplicationProfileHandle::UserApplicationProfileHandle(
+  const UserApplicationProfileHandle& other)
+  : instance_{}
+  , state_(DiscordObjectState::Invalid)
+{
+    if (other.state_ == DiscordObjectState::Owned) {
+        Discord_UserApplicationProfileHandle_Clone(&instance_, other.instance());
+
+        state_ = DiscordObjectState::Owned;
+    }
+}
+UserApplicationProfileHandle& UserApplicationProfileHandle::operator=(
+  const UserApplicationProfileHandle& other)
+{
+    if (this != &other) {
+        if (state_ == DiscordObjectState::Owned) {
+            Drop();
+            state_ = DiscordObjectState::Invalid;
+        }
+        if (other.state_ == DiscordObjectState::Owned) {
+            Discord_UserApplicationProfileHandle_Clone(&instance_, other.instance());
+
+            state_ = DiscordObjectState::Owned;
+        }
+    }
+    return *this;
+}
+UserApplicationProfileHandle::UserApplicationProfileHandle(
+  Discord_UserApplicationProfileHandle instance,
+  DiscordObjectState state)
+  : instance_(instance)
+  , state_(state)
+{
+}
+void UserApplicationProfileHandle::Drop()
+{
+    if (state_ != DiscordObjectState::Owned) {
+        return;
+    }
+    Discord_UserApplicationProfileHandle_Drop(&instance_);
+    state_ = DiscordObjectState::Invalid;
+}
+std::string UserApplicationProfileHandle::AvatarHash() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_String returnValueNative__;
+    Discord_UserApplicationProfileHandle_AvatarHash(&instance_, &returnValueNative__);
+    std::string returnValue__(reinterpret_cast<char*>(returnValueNative__.ptr),
+                              returnValueNative__.size);
+    Discord_Free(returnValueNative__.ptr);
+    return returnValue__;
+}
+std::string UserApplicationProfileHandle::Metadata() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_String returnValueNative__;
+    Discord_UserApplicationProfileHandle_Metadata(&instance_, &returnValueNative__);
+    std::string returnValue__(reinterpret_cast<char*>(returnValueNative__.ptr),
+                              returnValueNative__.size);
+    Discord_Free(returnValueNative__.ptr);
+    return returnValue__;
+}
+std::optional<std::string> UserApplicationProfileHandle::ProviderId() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    bool returnIsNonNull__;
+    Discord_String returnValueNative__;
+    returnIsNonNull__ =
+      Discord_UserApplicationProfileHandle_ProviderId(&instance_, &returnValueNative__);
+    if (!returnIsNonNull__) {
+        return {};
+    }
+    std::string returnValue__(reinterpret_cast<char*>(returnValueNative__.ptr),
+                              returnValueNative__.size);
+    Discord_Free(returnValueNative__.ptr);
+    return returnValue__;
+}
+std::string UserApplicationProfileHandle::ProviderIssuedUserId() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_String returnValueNative__;
+    Discord_UserApplicationProfileHandle_ProviderIssuedUserId(&instance_, &returnValueNative__);
+    std::string returnValue__(reinterpret_cast<char*>(returnValueNative__.ptr),
+                              returnValueNative__.size);
+    Discord_Free(returnValueNative__.ptr);
+    return returnValue__;
+}
+discordpp::ExternalIdentityProviderType UserApplicationProfileHandle::ProviderType() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_ExternalIdentityProviderType returnValue__;
+    returnValue__ = Discord_UserApplicationProfileHandle_ProviderType(&instance_);
+    return static_cast<discordpp::ExternalIdentityProviderType>(returnValue__);
+}
+std::string UserApplicationProfileHandle::Username() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_String returnValueNative__;
+    Discord_UserApplicationProfileHandle_Username(&instance_, &returnValueNative__);
+    std::string returnValue__(reinterpret_cast<char*>(returnValueNative__.ptr),
+                              returnValueNative__.size);
+    Discord_Free(returnValueNative__.ptr);
+    return returnValue__;
+}
+const UserHandle UserHandle::nullobj{{}, DiscordObjectState::Invalid};
+UserHandle::~UserHandle()
+{
+    if (state_ == DiscordObjectState::Owned) {
+        Drop();
+        state_ = DiscordObjectState::Invalid;
+    }
+}
+UserHandle::UserHandle(UserHandle&& other) noexcept
+  : instance_(other.instance_)
+  , state_(other.state_)
+{
+    other.state_ = DiscordObjectState::Invalid;
+}
+UserHandle& UserHandle::operator=(UserHandle&& other) noexcept
+{
+    if (this != &other) {
+        if (state_ == DiscordObjectState::Owned) {
+            Drop();
+        }
+        instance_ = other.instance_;
+        state_ = other.state_;
+        other.state_ = DiscordObjectState::Invalid;
+    }
+    return *this;
+}
+UserHandle::UserHandle(const UserHandle& arg0)
+  : instance_{}
+  , state_(DiscordObjectState::Invalid)
+{
+    if (arg0.state_ == DiscordObjectState::Owned) {
+        Discord_UserHandle_Clone(&instance_, arg0.instance());
+
+        state_ = DiscordObjectState::Owned;
+    }
+}
+UserHandle& UserHandle::operator=(const UserHandle& arg0)
+{
+    if (this != &arg0) {
+        if (state_ == DiscordObjectState::Owned) {
+            Drop();
+            state_ = DiscordObjectState::Invalid;
+        }
+        if (arg0.state_ == DiscordObjectState::Owned) {
+            Discord_UserHandle_Clone(&instance_, arg0.instance());
+
+            state_ = DiscordObjectState::Owned;
+        }
+    }
+    return *this;
+}
+UserHandle::UserHandle(Discord_UserHandle instance, DiscordObjectState state)
+  : instance_(instance)
+  , state_(state)
+{
+}
+void UserHandle::Drop()
+{
+    if (state_ != DiscordObjectState::Owned) {
+        return;
+    }
+    Discord_UserHandle_Drop(&instance_);
+    state_ = DiscordObjectState::Invalid;
+}
+std::optional<std::string> UserHandle::Avatar() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    bool returnIsNonNull__;
+    Discord_String returnValueNative__;
+    returnIsNonNull__ = Discord_UserHandle_Avatar(&instance_, &returnValueNative__);
+    if (!returnIsNonNull__) {
+        return {};
+    }
+    std::string returnValue__(reinterpret_cast<char*>(returnValueNative__.ptr),
+                              returnValueNative__.size);
+    Discord_Free(returnValueNative__.ptr);
+    return returnValue__;
+}
+std::string UserHandle::AvatarTypeToString(discordpp::UserHandle::AvatarType type)
+{
+    Discord_String returnValueNative__;
+    Discord_UserHandle_AvatarTypeToString(static_cast<Discord_UserHandle_AvatarType>(type),
+                                          &returnValueNative__);
+    std::string returnValue__(reinterpret_cast<char*>(returnValueNative__.ptr),
+                              returnValueNative__.size);
+    Discord_Free(returnValueNative__.ptr);
+    return returnValue__;
+}
+std::string UserHandle::AvatarUrl(discordpp::UserHandle::AvatarType animatedType,
+                                  discordpp::UserHandle::AvatarType staticType) const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_String returnValueNative__;
+    Discord_UserHandle_AvatarUrl(&instance_,
+                                 static_cast<Discord_UserHandle_AvatarType>(animatedType),
+                                 static_cast<Discord_UserHandle_AvatarType>(staticType),
+                                 &returnValueNative__);
+    std::string returnValue__(reinterpret_cast<char*>(returnValueNative__.ptr),
+                              returnValueNative__.size);
+    Discord_Free(returnValueNative__.ptr);
+    return returnValue__;
+}
+std::string UserHandle::DisplayName() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_String returnValueNative__;
+    Discord_UserHandle_DisplayName(&instance_, &returnValueNative__);
+    std::string returnValue__(reinterpret_cast<char*>(returnValueNative__.ptr),
+                              returnValueNative__.size);
+    Discord_Free(returnValueNative__.ptr);
+    return returnValue__;
+}
+std::optional<discordpp::Activity> UserHandle::GameActivity() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    bool returnIsNonNull__;
+    Discord_Activity returnValueNative__;
+    returnIsNonNull__ = Discord_UserHandle_GameActivity(&instance_, &returnValueNative__);
+    if (!returnIsNonNull__) {
+        return {};
+    }
+    discordpp::Activity returnValue__(returnValueNative__, DiscordObjectState::Owned);
+    return returnValue__;
+}
+std::optional<std::string> UserHandle::GlobalName() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    bool returnIsNonNull__;
+    Discord_String returnValueNative__;
+    returnIsNonNull__ = Discord_UserHandle_GlobalName(&instance_, &returnValueNative__);
+    if (!returnIsNonNull__) {
+        return {};
+    }
+    std::string returnValue__(reinterpret_cast<char*>(returnValueNative__.ptr),
+                              returnValueNative__.size);
+    Discord_Free(returnValueNative__.ptr);
+    return returnValue__;
+}
+uint64_t UserHandle::Id() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    uint64_t returnValue__;
+    returnValue__ = Discord_UserHandle_Id(&instance_);
+    return returnValue__;
+}
+bool UserHandle::IsProvisional() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    bool returnValue__;
+    returnValue__ = Discord_UserHandle_IsProvisional(&instance_);
+    return returnValue__;
+}
+discordpp::RelationshipHandle UserHandle::Relationship() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_RelationshipHandle returnValueNative__{};
+    Discord_UserHandle_Relationship(&instance_, &returnValueNative__);
+    discordpp::RelationshipHandle returnValue__(returnValueNative__, DiscordObjectState::Owned);
+    return returnValue__;
+}
+discordpp::StatusType UserHandle::Status() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_StatusType returnValue__;
+    returnValue__ = Discord_UserHandle_Status(&instance_);
+    return static_cast<discordpp::StatusType>(returnValue__);
+}
+std::vector<discordpp::UserApplicationProfileHandle> UserHandle::UserApplicationProfiles() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_UserApplicationProfileHandleSpan returnValueNative__;
+    Discord_UserHandle_UserApplicationProfiles(&instance_, &returnValueNative__);
+    std::vector<discordpp::UserApplicationProfileHandle> returnValue__;
+    returnValue__.reserve(returnValueNative__.size);
+    for (size_t i__ = 0; i__ < returnValueNative__.size; ++i__) {
+        returnValue__.emplace_back(returnValueNative__.ptr[i__], DiscordObjectState::Owned);
+    }
+    Discord_Free(returnValueNative__.ptr);
+    return returnValue__;
+}
+std::string UserHandle::Username() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_String returnValueNative__;
+    Discord_UserHandle_Username(&instance_, &returnValueNative__);
+    std::string returnValue__(reinterpret_cast<char*>(returnValueNative__.ptr),
+                              returnValueNative__.size);
+    Discord_Free(returnValueNative__.ptr);
+    return returnValue__;
+}
+const LobbyMemberHandle LobbyMemberHandle::nullobj{{}, DiscordObjectState::Invalid};
+LobbyMemberHandle::~LobbyMemberHandle()
+{
+    if (state_ == DiscordObjectState::Owned) {
+        Drop();
+        state_ = DiscordObjectState::Invalid;
+    }
+}
+LobbyMemberHandle::LobbyMemberHandle(LobbyMemberHandle&& other) noexcept
+  : instance_(other.instance_)
+  , state_(other.state_)
+{
+    other.state_ = DiscordObjectState::Invalid;
+}
+LobbyMemberHandle& LobbyMemberHandle::operator=(LobbyMemberHandle&& other) noexcept
+{
+    if (this != &other) {
+        if (state_ == DiscordObjectState::Owned) {
+            Drop();
+        }
+        instance_ = other.instance_;
+        state_ = other.state_;
+        other.state_ = DiscordObjectState::Invalid;
+    }
+    return *this;
+}
+LobbyMemberHandle::LobbyMemberHandle(const LobbyMemberHandle& other)
+  : instance_{}
+  , state_(DiscordObjectState::Invalid)
+{
+    if (other.state_ == DiscordObjectState::Owned) {
+        Discord_LobbyMemberHandle_Clone(&instance_, other.instance());
+
+        state_ = DiscordObjectState::Owned;
+    }
+}
+LobbyMemberHandle& LobbyMemberHandle::operator=(const LobbyMemberHandle& other)
+{
+    if (this != &other) {
+        if (state_ == DiscordObjectState::Owned) {
+            Drop();
+            state_ = DiscordObjectState::Invalid;
+        }
+        if (other.state_ == DiscordObjectState::Owned) {
+            Discord_LobbyMemberHandle_Clone(&instance_, other.instance());
+
+            state_ = DiscordObjectState::Owned;
+        }
+    }
+    return *this;
+}
+LobbyMemberHandle::LobbyMemberHandle(Discord_LobbyMemberHandle instance, DiscordObjectState state)
+  : instance_(instance)
+  , state_(state)
+{
+}
+void LobbyMemberHandle::Drop()
+{
+    if (state_ != DiscordObjectState::Owned) {
+        return;
+    }
+    Discord_LobbyMemberHandle_Drop(&instance_);
+    state_ = DiscordObjectState::Invalid;
+}
+bool LobbyMemberHandle::CanLinkLobby() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    bool returnValue__;
+    returnValue__ = Discord_LobbyMemberHandle_CanLinkLobby(&instance_);
+    return returnValue__;
+}
+bool LobbyMemberHandle::Connected() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    bool returnValue__;
+    returnValue__ = Discord_LobbyMemberHandle_Connected(&instance_);
+    return returnValue__;
+}
+uint64_t LobbyMemberHandle::Id() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    uint64_t returnValue__;
+    returnValue__ = Discord_LobbyMemberHandle_Id(&instance_);
+    return returnValue__;
+}
+std::unordered_map<std::string, std::string> LobbyMemberHandle::Metadata() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_Properties returnValueNative__;
+    Discord_LobbyMemberHandle_Metadata(&instance_, &returnValueNative__);
+    std::unordered_map<std::string, std::string> returnValue__ =
+      ConvertReturnedProperties(returnValueNative__);
+    Discord_FreeProperties(returnValueNative__);
+    return returnValue__;
+}
+std::optional<discordpp::UserHandle> LobbyMemberHandle::User() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    bool returnIsNonNull__;
+    Discord_UserHandle returnValueNative__;
+    returnIsNonNull__ = Discord_LobbyMemberHandle_User(&instance_, &returnValueNative__);
+    if (!returnIsNonNull__) {
+        return {};
+    }
+    discordpp::UserHandle returnValue__(returnValueNative__, DiscordObjectState::Owned);
+    return returnValue__;
+}
+const LobbyHandle LobbyHandle::nullobj{{}, DiscordObjectState::Invalid};
+LobbyHandle::~LobbyHandle()
+{
+    if (state_ == DiscordObjectState::Owned) {
+        Drop();
+        state_ = DiscordObjectState::Invalid;
+    }
+}
+LobbyHandle::LobbyHandle(LobbyHandle&& other) noexcept
+  : instance_(other.instance_)
+  , state_(other.state_)
+{
+    other.state_ = DiscordObjectState::Invalid;
+}
+LobbyHandle& LobbyHandle::operator=(LobbyHandle&& other) noexcept
+{
+    if (this != &other) {
+        if (state_ == DiscordObjectState::Owned) {
+            Drop();
+        }
+        instance_ = other.instance_;
+        state_ = other.state_;
+        other.state_ = DiscordObjectState::Invalid;
+    }
+    return *this;
+}
+LobbyHandle::LobbyHandle(const LobbyHandle& other)
+  : instance_{}
+  , state_(DiscordObjectState::Invalid)
+{
+    if (other.state_ == DiscordObjectState::Owned) {
+        Discord_LobbyHandle_Clone(&instance_, other.instance());
+
+        state_ = DiscordObjectState::Owned;
+    }
+}
+LobbyHandle& LobbyHandle::operator=(const LobbyHandle& other)
+{
+    if (this != &other) {
+        if (state_ == DiscordObjectState::Owned) {
+            Drop();
+            state_ = DiscordObjectState::Invalid;
+        }
+        if (other.state_ == DiscordObjectState::Owned) {
+            Discord_LobbyHandle_Clone(&instance_, other.instance());
+
+            state_ = DiscordObjectState::Owned;
+        }
+    }
+    return *this;
+}
+LobbyHandle::LobbyHandle(Discord_LobbyHandle instance, DiscordObjectState state)
+  : instance_(instance)
+  , state_(state)
+{
+}
+void LobbyHandle::Drop()
+{
+    if (state_ != DiscordObjectState::Owned) {
+        return;
+    }
+    Discord_LobbyHandle_Drop(&instance_);
+    state_ = DiscordObjectState::Invalid;
+}
+std::optional<discordpp::CallInfoHandle> LobbyHandle::GetCallInfoHandle() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    bool returnIsNonNull__;
+    Discord_CallInfoHandle returnValueNative__;
+    returnIsNonNull__ = Discord_LobbyHandle_GetCallInfoHandle(&instance_, &returnValueNative__);
+    if (!returnIsNonNull__) {
+        return {};
+    }
+    discordpp::CallInfoHandle returnValue__(returnValueNative__, DiscordObjectState::Owned);
+    return returnValue__;
+}
+std::optional<discordpp::LobbyMemberHandle> LobbyHandle::GetLobbyMemberHandle(
+  uint64_t memberId) const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    bool returnIsNonNull__;
+    Discord_LobbyMemberHandle returnValueNative__;
+    returnIsNonNull__ =
+      Discord_LobbyHandle_GetLobbyMemberHandle(&instance_, memberId, &returnValueNative__);
+    if (!returnIsNonNull__) {
+        return {};
+    }
+    discordpp::LobbyMemberHandle returnValue__(returnValueNative__, DiscordObjectState::Owned);
+    return returnValue__;
+}
+uint64_t LobbyHandle::Id() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    uint64_t returnValue__;
+    returnValue__ = Discord_LobbyHandle_Id(&instance_);
+    return returnValue__;
+}
+std::optional<discordpp::LinkedChannel> LobbyHandle::LinkedChannel() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    bool returnIsNonNull__;
+    Discord_LinkedChannel returnValueNative__;
+    returnIsNonNull__ = Discord_LobbyHandle_LinkedChannel(&instance_, &returnValueNative__);
+    if (!returnIsNonNull__) {
+        return {};
+    }
+    discordpp::LinkedChannel returnValue__(returnValueNative__, DiscordObjectState::Owned);
+    return returnValue__;
+}
+std::vector<uint64_t> LobbyHandle::LobbyMemberIds() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_UInt64Span returnValueNative__;
+    Discord_LobbyHandle_LobbyMemberIds(&instance_, &returnValueNative__);
+    std::vector<uint64_t> returnValue__(returnValueNative__.ptr,
+                                        returnValueNative__.ptr + returnValueNative__.size);
+    Discord_Free(returnValueNative__.ptr);
+    return returnValue__;
+}
+std::vector<discordpp::LobbyMemberHandle> LobbyHandle::LobbyMembers() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_LobbyMemberHandleSpan returnValueNative__;
+    Discord_LobbyHandle_LobbyMembers(&instance_, &returnValueNative__);
+    std::vector<discordpp::LobbyMemberHandle> returnValue__;
+    returnValue__.reserve(returnValueNative__.size);
+    for (size_t i__ = 0; i__ < returnValueNative__.size; ++i__) {
+        returnValue__.emplace_back(returnValueNative__.ptr[i__], DiscordObjectState::Owned);
+    }
+    Discord_Free(returnValueNative__.ptr);
+    return returnValue__;
+}
+std::unordered_map<std::string, std::string> LobbyHandle::Metadata() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_Properties returnValueNative__;
+    Discord_LobbyHandle_Metadata(&instance_, &returnValueNative__);
+    std::unordered_map<std::string, std::string> returnValue__ =
+      ConvertReturnedProperties(returnValueNative__);
+    Discord_FreeProperties(returnValueNative__);
+    return returnValue__;
+}
+const AdditionalContent AdditionalContent::nullobj{{}, DiscordObjectState::Invalid};
+AdditionalContent::~AdditionalContent()
+{
+    if (state_ == DiscordObjectState::Owned) {
+        Drop();
+        state_ = DiscordObjectState::Invalid;
+    }
+}
+AdditionalContent::AdditionalContent(AdditionalContent&& other) noexcept
+  : instance_(other.instance_)
+  , state_(other.state_)
+{
+    other.state_ = DiscordObjectState::Invalid;
+}
+AdditionalContent& AdditionalContent::operator=(AdditionalContent&& other) noexcept
+{
+    if (this != &other) {
+        if (state_ == DiscordObjectState::Owned) {
+            Drop();
+        }
+        instance_ = other.instance_;
+        state_ = other.state_;
+        other.state_ = DiscordObjectState::Invalid;
+    }
+    return *this;
+}
+AdditionalContent::AdditionalContent(const AdditionalContent& arg0)
+  : instance_{}
+  , state_(DiscordObjectState::Invalid)
+{
+    if (arg0.state_ == DiscordObjectState::Owned) {
+        Discord_AdditionalContent_Clone(&instance_, arg0.instance());
+
+        state_ = DiscordObjectState::Owned;
+    }
+}
+AdditionalContent& AdditionalContent::operator=(const AdditionalContent& arg0)
+{
+    if (this != &arg0) {
+        if (state_ == DiscordObjectState::Owned) {
+            Drop();
+            state_ = DiscordObjectState::Invalid;
+        }
+        if (arg0.state_ == DiscordObjectState::Owned) {
+            Discord_AdditionalContent_Clone(&instance_, arg0.instance());
+
+            state_ = DiscordObjectState::Owned;
+        }
+    }
+    return *this;
+}
+AdditionalContent::AdditionalContent(Discord_AdditionalContent instance, DiscordObjectState state)
+  : instance_(instance)
+  , state_(state)
+{
+}
+AdditionalContent::AdditionalContent()
+{
+    assert(state_ == DiscordObjectState::Invalid);
+    Discord_AdditionalContent_Init(&instance_);
+    state_ = DiscordObjectState::Owned;
+}
+void AdditionalContent::Drop()
+{
+    if (state_ != DiscordObjectState::Owned) {
+        return;
+    }
+    Discord_AdditionalContent_Drop(&instance_);
+    state_ = DiscordObjectState::Invalid;
+}
+bool AdditionalContent::Equals(discordpp::AdditionalContent rhs) const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    bool returnValue__;
+    returnValue__ = Discord_AdditionalContent_Equals(&instance_, rhs.instance());
+    return returnValue__;
+}
+std::string AdditionalContent::TypeToString(discordpp::AdditionalContentType type)
+{
+    Discord_String returnValueNative__;
+    Discord_AdditionalContent_TypeToString(static_cast<Discord_AdditionalContentType>(type),
+                                           &returnValueNative__);
+    std::string returnValue__(reinterpret_cast<char*>(returnValueNative__.ptr),
+                              returnValueNative__.size);
+    Discord_Free(returnValueNative__.ptr);
+    return returnValue__;
+}
+discordpp::AdditionalContentType AdditionalContent::Type() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_AdditionalContentType returnValue__;
+    returnValue__ = Discord_AdditionalContent_Type(&instance_);
+    return static_cast<discordpp::AdditionalContentType>(returnValue__);
+}
+void AdditionalContent::SetType(discordpp::AdditionalContentType Type)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_AdditionalContent_SetType(&instance_, static_cast<Discord_AdditionalContentType>(Type));
+}
+std::optional<std::string> AdditionalContent::Title() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    bool returnIsNonNull__;
+    Discord_String returnValueNative__;
+    returnIsNonNull__ = Discord_AdditionalContent_Title(&instance_, &returnValueNative__);
+    if (!returnIsNonNull__) {
+        return {};
+    }
+    std::string returnValue__(reinterpret_cast<char*>(returnValueNative__.ptr),
+                              returnValueNative__.size);
+    Discord_Free(returnValueNative__.ptr);
+    return returnValue__;
+}
+void AdditionalContent::SetTitle(std::optional<std::string> Title)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_String Title__str{};
+    if (Title.has_value()) {
+        Title__str.ptr = reinterpret_cast<uint8_t*>(Title->data());
+        Title__str.size = Title->size();
+    }
+    Discord_AdditionalContent_SetTitle(&instance_, (Title.has_value() ? &Title__str : nullptr));
+}
+uint8_t AdditionalContent::Count() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    uint8_t returnValue__;
+    returnValue__ = Discord_AdditionalContent_Count(&instance_);
+    return returnValue__;
+}
+void AdditionalContent::SetCount(uint8_t Count)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_AdditionalContent_SetCount(&instance_, Count);
+}
+const MessageHandle MessageHandle::nullobj{{}, DiscordObjectState::Invalid};
+MessageHandle::~MessageHandle()
+{
+    if (state_ == DiscordObjectState::Owned) {
+        Drop();
+        state_ = DiscordObjectState::Invalid;
+    }
+}
+MessageHandle::MessageHandle(MessageHandle&& other) noexcept
+  : instance_(other.instance_)
+  , state_(other.state_)
+{
+    other.state_ = DiscordObjectState::Invalid;
+}
+MessageHandle& MessageHandle::operator=(MessageHandle&& other) noexcept
+{
+    if (this != &other) {
+        if (state_ == DiscordObjectState::Owned) {
+            Drop();
+        }
+        instance_ = other.instance_;
+        state_ = other.state_;
+        other.state_ = DiscordObjectState::Invalid;
+    }
+    return *this;
+}
+MessageHandle::MessageHandle(const MessageHandle& other)
+  : instance_{}
+  , state_(DiscordObjectState::Invalid)
+{
+    if (other.state_ == DiscordObjectState::Owned) {
+        Discord_MessageHandle_Clone(&instance_, other.instance());
+
+        state_ = DiscordObjectState::Owned;
+    }
+}
+MessageHandle& MessageHandle::operator=(const MessageHandle& other)
+{
+    if (this != &other) {
+        if (state_ == DiscordObjectState::Owned) {
+            Drop();
+            state_ = DiscordObjectState::Invalid;
+        }
+        if (other.state_ == DiscordObjectState::Owned) {
+            Discord_MessageHandle_Clone(&instance_, other.instance());
+
+            state_ = DiscordObjectState::Owned;
+        }
+    }
+    return *this;
+}
+MessageHandle::MessageHandle(Discord_MessageHandle instance, DiscordObjectState state)
+  : instance_(instance)
+  , state_(state)
+{
+}
+void MessageHandle::Drop()
+{
+    if (state_ != DiscordObjectState::Owned) {
+        return;
+    }
+    Discord_MessageHandle_Drop(&instance_);
+    state_ = DiscordObjectState::Invalid;
+}
+std::optional<discordpp::AdditionalContent> MessageHandle::AdditionalContent() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    bool returnIsNonNull__;
+    Discord_AdditionalContent returnValueNative__;
+    returnIsNonNull__ = Discord_MessageHandle_AdditionalContent(&instance_, &returnValueNative__);
+    if (!returnIsNonNull__) {
+        return {};
+    }
+    discordpp::AdditionalContent returnValue__(returnValueNative__, DiscordObjectState::Owned);
+    return returnValue__;
+}
+std::optional<std::string> MessageHandle::AdditionalName() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    bool returnIsNonNull__;
+    Discord_String returnValueNative__;
+    returnIsNonNull__ = Discord_MessageHandle_AdditionalName(&instance_, &returnValueNative__);
+    if (!returnIsNonNull__) {
+        return {};
+    }
+    std::string returnValue__(reinterpret_cast<char*>(returnValueNative__.ptr),
+                              returnValueNative__.size);
+    Discord_Free(returnValueNative__.ptr);
+    return returnValue__;
+}
+std::optional<uint64_t> MessageHandle::ApplicationId() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    bool returnIsNonNull__;
+    uint64_t returnValue__;
+    returnIsNonNull__ = Discord_MessageHandle_ApplicationId(&instance_, &returnValue__);
+    if (!returnIsNonNull__) {
+        return std::nullopt;
+    }
+    return returnValue__;
+}
+std::optional<discordpp::UserHandle> MessageHandle::Author() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    bool returnIsNonNull__;
+    Discord_UserHandle returnValueNative__;
+    returnIsNonNull__ = Discord_MessageHandle_Author(&instance_, &returnValueNative__);
+    if (!returnIsNonNull__) {
+        return {};
+    }
+    discordpp::UserHandle returnValue__(returnValueNative__, DiscordObjectState::Owned);
+    return returnValue__;
+}
+uint64_t MessageHandle::AuthorId() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    uint64_t returnValue__;
+    returnValue__ = Discord_MessageHandle_AuthorId(&instance_);
+    return returnValue__;
+}
+std::optional<discordpp::ChannelHandle> MessageHandle::Channel() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    bool returnIsNonNull__;
+    Discord_ChannelHandle returnValueNative__;
+    returnIsNonNull__ = Discord_MessageHandle_Channel(&instance_, &returnValueNative__);
+    if (!returnIsNonNull__) {
+        return {};
+    }
+    discordpp::ChannelHandle returnValue__(returnValueNative__, DiscordObjectState::Owned);
+    return returnValue__;
+}
+uint64_t MessageHandle::ChannelId() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    uint64_t returnValue__;
+    returnValue__ = Discord_MessageHandle_ChannelId(&instance_);
+    return returnValue__;
+}
+std::string MessageHandle::Content() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_String returnValueNative__;
+    Discord_MessageHandle_Content(&instance_, &returnValueNative__);
+    std::string returnValue__(reinterpret_cast<char*>(returnValueNative__.ptr),
+                              returnValueNative__.size);
+    Discord_Free(returnValueNative__.ptr);
+    return returnValue__;
+}
+std::optional<discordpp::DisclosureTypes> MessageHandle::DisclosureType() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    bool returnIsNonNull__;
+    Discord_DisclosureTypes returnValueNative__;
+    returnIsNonNull__ = Discord_MessageHandle_DisclosureType(&instance_, &returnValueNative__);
+    if (!returnIsNonNull__) {
+        return {};
+    }
+    auto returnValue__ = static_cast<discordpp::DisclosureTypes>(returnValueNative__);
+    return returnValue__;
+}
+uint64_t MessageHandle::EditedTimestamp() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    uint64_t returnValue__;
+    returnValue__ = Discord_MessageHandle_EditedTimestamp(&instance_);
+    return returnValue__;
+}
+uint64_t MessageHandle::Id() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    uint64_t returnValue__;
+    returnValue__ = Discord_MessageHandle_Id(&instance_);
+    return returnValue__;
+}
+std::optional<discordpp::LobbyHandle> MessageHandle::Lobby() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    bool returnIsNonNull__;
+    Discord_LobbyHandle returnValueNative__;
+    returnIsNonNull__ = Discord_MessageHandle_Lobby(&instance_, &returnValueNative__);
+    if (!returnIsNonNull__) {
+        return {};
+    }
+    discordpp::LobbyHandle returnValue__(returnValueNative__, DiscordObjectState::Owned);
+    return returnValue__;
+}
+std::unordered_map<std::string, std::string> MessageHandle::Metadata() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_Properties returnValueNative__;
+    Discord_MessageHandle_Metadata(&instance_, &returnValueNative__);
+    std::unordered_map<std::string, std::string> returnValue__ =
+      ConvertReturnedProperties(returnValueNative__);
+    Discord_FreeProperties(returnValueNative__);
+    return returnValue__;
+}
+std::unordered_map<std::string, std::string> MessageHandle::ModerationMetadata() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_Properties returnValueNative__;
+    Discord_MessageHandle_ModerationMetadata(&instance_, &returnValueNative__);
+    std::unordered_map<std::string, std::string> returnValue__ =
+      ConvertReturnedProperties(returnValueNative__);
+    Discord_FreeProperties(returnValueNative__);
+    return returnValue__;
+}
+std::string MessageHandle::RawContent() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_String returnValueNative__;
+    Discord_MessageHandle_RawContent(&instance_, &returnValueNative__);
+    std::string returnValue__(reinterpret_cast<char*>(returnValueNative__.ptr),
+                              returnValueNative__.size);
+    Discord_Free(returnValueNative__.ptr);
+    return returnValue__;
+}
+std::optional<discordpp::UserHandle> MessageHandle::Recipient() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    bool returnIsNonNull__;
+    Discord_UserHandle returnValueNative__;
+    returnIsNonNull__ = Discord_MessageHandle_Recipient(&instance_, &returnValueNative__);
+    if (!returnIsNonNull__) {
+        return {};
+    }
+    discordpp::UserHandle returnValue__(returnValueNative__, DiscordObjectState::Owned);
+    return returnValue__;
+}
+uint64_t MessageHandle::RecipientId() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    uint64_t returnValue__;
+    returnValue__ = Discord_MessageHandle_RecipientId(&instance_);
+    return returnValue__;
+}
+bool MessageHandle::SentFromGame() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    bool returnValue__;
+    returnValue__ = Discord_MessageHandle_SentFromGame(&instance_);
+    return returnValue__;
+}
+uint64_t MessageHandle::SentTimestamp() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    uint64_t returnValue__;
+    returnValue__ = Discord_MessageHandle_SentTimestamp(&instance_);
+    return returnValue__;
+}
+const AudioDevice AudioDevice::nullobj{{}, DiscordObjectState::Invalid};
+AudioDevice::~AudioDevice()
+{
+    if (state_ == DiscordObjectState::Owned) {
+        Drop();
+        state_ = DiscordObjectState::Invalid;
+    }
+}
+AudioDevice::AudioDevice(AudioDevice&& other) noexcept
+  : instance_(other.instance_)
+  , state_(other.state_)
+{
+    other.state_ = DiscordObjectState::Invalid;
+}
+AudioDevice& AudioDevice::operator=(AudioDevice&& other) noexcept
+{
+    if (this != &other) {
+        if (state_ == DiscordObjectState::Owned) {
+            Drop();
+        }
+        instance_ = other.instance_;
+        state_ = other.state_;
+        other.state_ = DiscordObjectState::Invalid;
+    }
+    return *this;
+}
+AudioDevice::AudioDevice(const AudioDevice& arg0)
+  : instance_{}
+  , state_(DiscordObjectState::Invalid)
+{
+    if (arg0.state_ == DiscordObjectState::Owned) {
+        Discord_AudioDevice_Clone(&instance_, arg0.instance());
+
+        state_ = DiscordObjectState::Owned;
+    }
+}
+AudioDevice& AudioDevice::operator=(const AudioDevice& arg0)
+{
+    if (this != &arg0) {
+        if (state_ == DiscordObjectState::Owned) {
+            Drop();
+            state_ = DiscordObjectState::Invalid;
+        }
+        if (arg0.state_ == DiscordObjectState::Owned) {
+            Discord_AudioDevice_Clone(&instance_, arg0.instance());
+
+            state_ = DiscordObjectState::Owned;
+        }
+    }
+    return *this;
+}
+AudioDevice::AudioDevice(Discord_AudioDevice instance, DiscordObjectState state)
+  : instance_(instance)
+  , state_(state)
+{
+}
+void AudioDevice::Drop()
+{
+    if (state_ != DiscordObjectState::Owned) {
+        return;
+    }
+    Discord_AudioDevice_Drop(&instance_);
+    state_ = DiscordObjectState::Invalid;
+}
+bool AudioDevice::Equals(discordpp::AudioDevice rhs)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    bool returnValue__;
+    returnValue__ = Discord_AudioDevice_Equals(&instance_, rhs.instance());
+    return returnValue__;
+}
+std::string AudioDevice::Id() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_String returnValueNative__;
+    Discord_AudioDevice_Id(&instance_, &returnValueNative__);
+    std::string returnValue__(reinterpret_cast<char*>(returnValueNative__.ptr),
+                              returnValueNative__.size);
+    Discord_Free(returnValueNative__.ptr);
+    return returnValue__;
+}
+void AudioDevice::SetId(std::string Id)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_String Id__str{(uint8_t*)(Id.data()), Id.size()};
+    Discord_AudioDevice_SetId(&instance_, Id__str);
+}
+std::string AudioDevice::Name() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_String returnValueNative__;
+    Discord_AudioDevice_Name(&instance_, &returnValueNative__);
+    std::string returnValue__(reinterpret_cast<char*>(returnValueNative__.ptr),
+                              returnValueNative__.size);
+    Discord_Free(returnValueNative__.ptr);
+    return returnValue__;
+}
+void AudioDevice::SetName(std::string Name)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_String Name__str{(uint8_t*)(Name.data()), Name.size()};
+    Discord_AudioDevice_SetName(&instance_, Name__str);
+}
+bool AudioDevice::IsDefault() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    bool returnValue__;
+    returnValue__ = Discord_AudioDevice_IsDefault(&instance_);
+    return returnValue__;
+}
+void AudioDevice::SetIsDefault(bool IsDefault)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_AudioDevice_SetIsDefault(&instance_, IsDefault);
+}
+const VoiceSettings VoiceSettings::nullobj{{}, DiscordObjectState::Invalid};
+VoiceSettings::~VoiceSettings()
+{
+    if (state_ == DiscordObjectState::Owned) {
+        Drop();
+        state_ = DiscordObjectState::Invalid;
+    }
+}
+VoiceSettings::VoiceSettings(VoiceSettings&& other) noexcept
+  : instance_(other.instance_)
+  , state_(other.state_)
+{
+    other.state_ = DiscordObjectState::Invalid;
+}
+VoiceSettings& VoiceSettings::operator=(VoiceSettings&& other) noexcept
+{
+    if (this != &other) {
+        if (state_ == DiscordObjectState::Owned) {
+            Drop();
+        }
+        instance_ = other.instance_;
+        state_ = other.state_;
+        other.state_ = DiscordObjectState::Invalid;
+    }
+    return *this;
+}
+VoiceSettings::VoiceSettings(const VoiceSettings& arg0)
+  : instance_{}
+  , state_(DiscordObjectState::Invalid)
+{
+    if (arg0.state_ == DiscordObjectState::Owned) {
+        Discord_VoiceSettings_Clone(&instance_, arg0.instance());
+
+        state_ = DiscordObjectState::Owned;
+    }
+}
+VoiceSettings& VoiceSettings::operator=(const VoiceSettings& arg0)
+{
+    if (this != &arg0) {
+        if (state_ == DiscordObjectState::Owned) {
+            Drop();
+            state_ = DiscordObjectState::Invalid;
+        }
+        if (arg0.state_ == DiscordObjectState::Owned) {
+            Discord_VoiceSettings_Clone(&instance_, arg0.instance());
+
+            state_ = DiscordObjectState::Owned;
+        }
+    }
+    return *this;
+}
+VoiceSettings::VoiceSettings(Discord_VoiceSettings instance, DiscordObjectState state)
+  : instance_(instance)
+  , state_(state)
+{
+}
+void VoiceSettings::Drop()
+{
+    if (state_ != DiscordObjectState::Owned) {
+        return;
+    }
+    Discord_VoiceSettings_Drop(&instance_);
+    state_ = DiscordObjectState::Invalid;
+}
+bool VoiceSettings::SelfMute() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    bool returnValue__;
+    returnValue__ = Discord_VoiceSettings_SelfMute(&instance_);
+    return returnValue__;
+}
+void VoiceSettings::SetSelfMute(bool SelfMute)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_VoiceSettings_SetSelfMute(&instance_, SelfMute);
+}
+bool VoiceSettings::SelfDeaf() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    bool returnValue__;
+    returnValue__ = Discord_VoiceSettings_SelfDeaf(&instance_);
+    return returnValue__;
+}
+void VoiceSettings::SetSelfDeaf(bool SelfDeaf)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_VoiceSettings_SetSelfDeaf(&instance_, SelfDeaf);
+}
+discordpp::VoiceInputModeType VoiceSettings::InputMode() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_VoiceInputModeType returnValue__;
+    returnValue__ = Discord_VoiceSettings_InputMode(&instance_);
+    return static_cast<discordpp::VoiceInputModeType>(returnValue__);
+}
+void VoiceSettings::SetInputMode(discordpp::VoiceInputModeType InputMode)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_VoiceSettings_SetInputMode(&instance_,
+                                       static_cast<Discord_VoiceInputModeType>(InputMode));
+}
+std::string VoiceSettings::PttKey() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_String returnValueNative__;
+    Discord_VoiceSettings_PttKey(&instance_, &returnValueNative__);
+    std::string returnValue__(reinterpret_cast<char*>(returnValueNative__.ptr),
+                              returnValueNative__.size);
+    Discord_Free(returnValueNative__.ptr);
+    return returnValue__;
+}
+void VoiceSettings::SetPttKey(std::string PttKey)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_String PttKey__str{(uint8_t*)(PttKey.data()), PttKey.size()};
+    Discord_VoiceSettings_SetPttKey(&instance_, PttKey__str);
+}
+float VoiceSettings::InputVolume() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    float returnValue__;
+    returnValue__ = Discord_VoiceSettings_InputVolume(&instance_);
+    return returnValue__;
+}
+void VoiceSettings::SetInputVolume(float InputVolume)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_VoiceSettings_SetInputVolume(&instance_, InputVolume);
+}
+float VoiceSettings::OutputVolume() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    float returnValue__;
+    returnValue__ = Discord_VoiceSettings_OutputVolume(&instance_);
+    return returnValue__;
+}
+void VoiceSettings::SetOutputVolume(float OutputVolume)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_VoiceSettings_SetOutputVolume(&instance_, OutputVolume);
+}
+bool VoiceSettings::AutomaticGainControl() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    bool returnValue__;
+    returnValue__ = Discord_VoiceSettings_AutomaticGainControl(&instance_);
+    return returnValue__;
+}
+void VoiceSettings::SetAutomaticGainControl(bool AutomaticGainControl)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_VoiceSettings_SetAutomaticGainControl(&instance_, AutomaticGainControl);
+}
+bool VoiceSettings::EchoCancellation() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    bool returnValue__;
+    returnValue__ = Discord_VoiceSettings_EchoCancellation(&instance_);
+    return returnValue__;
+}
+void VoiceSettings::SetEchoCancellation(bool EchoCancellation)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_VoiceSettings_SetEchoCancellation(&instance_, EchoCancellation);
+}
+bool VoiceSettings::NoiseSuppression() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    bool returnValue__;
+    returnValue__ = Discord_VoiceSettings_NoiseSuppression(&instance_);
+    return returnValue__;
+}
+void VoiceSettings::SetNoiseSuppression(bool NoiseSuppression)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_VoiceSettings_SetNoiseSuppression(&instance_, NoiseSuppression);
+}
+bool VoiceSettings::NoiseCancellation() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    bool returnValue__;
+    returnValue__ = Discord_VoiceSettings_NoiseCancellation(&instance_);
+    return returnValue__;
+}
+void VoiceSettings::SetNoiseCancellation(bool NoiseCancellation)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_VoiceSettings_SetNoiseCancellation(&instance_, NoiseCancellation);
+}
+const UserMessageSummary UserMessageSummary::nullobj{{}, DiscordObjectState::Invalid};
+UserMessageSummary::~UserMessageSummary()
+{
+    if (state_ == DiscordObjectState::Owned) {
+        Drop();
+        state_ = DiscordObjectState::Invalid;
+    }
+}
+UserMessageSummary::UserMessageSummary(UserMessageSummary&& other) noexcept
+  : instance_(other.instance_)
+  , state_(other.state_)
+{
+    other.state_ = DiscordObjectState::Invalid;
+}
+UserMessageSummary& UserMessageSummary::operator=(UserMessageSummary&& other) noexcept
+{
+    if (this != &other) {
+        if (state_ == DiscordObjectState::Owned) {
+            Drop();
+        }
+        instance_ = other.instance_;
+        state_ = other.state_;
+        other.state_ = DiscordObjectState::Invalid;
+    }
+    return *this;
+}
+UserMessageSummary::UserMessageSummary(const UserMessageSummary& arg0)
+  : instance_{}
+  , state_(DiscordObjectState::Invalid)
+{
+    if (arg0.state_ == DiscordObjectState::Owned) {
+        Discord_UserMessageSummary_Clone(&instance_, arg0.instance());
+
+        state_ = DiscordObjectState::Owned;
+    }
+}
+UserMessageSummary& UserMessageSummary::operator=(const UserMessageSummary& arg0)
+{
+    if (this != &arg0) {
+        if (state_ == DiscordObjectState::Owned) {
+            Drop();
+            state_ = DiscordObjectState::Invalid;
+        }
+        if (arg0.state_ == DiscordObjectState::Owned) {
+            Discord_UserMessageSummary_Clone(&instance_, arg0.instance());
+
+            state_ = DiscordObjectState::Owned;
+        }
+    }
+    return *this;
+}
+UserMessageSummary::UserMessageSummary(Discord_UserMessageSummary instance,
+                                       DiscordObjectState state)
+  : instance_(instance)
+  , state_(state)
+{
+}
+void UserMessageSummary::Drop()
+{
+    if (state_ != DiscordObjectState::Owned) {
+        return;
+    }
+    Discord_UserMessageSummary_Drop(&instance_);
+    state_ = DiscordObjectState::Invalid;
+}
+uint64_t UserMessageSummary::LastMessageId() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    uint64_t returnValue__;
+    returnValue__ = Discord_UserMessageSummary_LastMessageId(&instance_);
+    return returnValue__;
+}
+uint64_t UserMessageSummary::UserId() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    uint64_t returnValue__;
+    returnValue__ = Discord_UserMessageSummary_UserId(&instance_);
+    return returnValue__;
+}
+const ClientCreateOptions ClientCreateOptions::nullobj{{}, DiscordObjectState::Invalid};
+ClientCreateOptions::~ClientCreateOptions()
+{
+    if (state_ == DiscordObjectState::Owned) {
+        Drop();
+        state_ = DiscordObjectState::Invalid;
+    }
+}
+ClientCreateOptions::ClientCreateOptions(ClientCreateOptions&& other) noexcept
+  : instance_(other.instance_)
+  , state_(other.state_)
+{
+    other.state_ = DiscordObjectState::Invalid;
+}
+ClientCreateOptions& ClientCreateOptions::operator=(ClientCreateOptions&& other) noexcept
+{
+    if (this != &other) {
+        if (state_ == DiscordObjectState::Owned) {
+            Drop();
+        }
+        instance_ = other.instance_;
+        state_ = other.state_;
+        other.state_ = DiscordObjectState::Invalid;
+    }
+    return *this;
+}
+ClientCreateOptions::ClientCreateOptions(const ClientCreateOptions& arg0)
+  : instance_{}
+  , state_(DiscordObjectState::Invalid)
+{
+    if (arg0.state_ == DiscordObjectState::Owned) {
+        Discord_ClientCreateOptions_Clone(&instance_, arg0.instance());
+
+        state_ = DiscordObjectState::Owned;
+    }
+}
+ClientCreateOptions& ClientCreateOptions::operator=(const ClientCreateOptions& arg0)
+{
+    if (this != &arg0) {
+        if (state_ == DiscordObjectState::Owned) {
+            Drop();
+            state_ = DiscordObjectState::Invalid;
+        }
+        if (arg0.state_ == DiscordObjectState::Owned) {
+            Discord_ClientCreateOptions_Clone(&instance_, arg0.instance());
+
+            state_ = DiscordObjectState::Owned;
+        }
+    }
+    return *this;
+}
+ClientCreateOptions::ClientCreateOptions(Discord_ClientCreateOptions instance,
+                                         DiscordObjectState state)
+  : instance_(instance)
+  , state_(state)
+{
+}
+ClientCreateOptions::ClientCreateOptions()
+{
+    assert(state_ == DiscordObjectState::Invalid);
+    Discord_ClientCreateOptions_Init(&instance_);
+    state_ = DiscordObjectState::Owned;
+}
+void ClientCreateOptions::Drop()
+{
+    if (state_ != DiscordObjectState::Owned) {
+        return;
+    }
+    Discord_ClientCreateOptions_Drop(&instance_);
+    state_ = DiscordObjectState::Invalid;
+}
+std::string ClientCreateOptions::WebBase() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_String returnValueNative__;
+    Discord_ClientCreateOptions_WebBase(&instance_, &returnValueNative__);
+    std::string returnValue__(reinterpret_cast<char*>(returnValueNative__.ptr),
+                              returnValueNative__.size);
+    Discord_Free(returnValueNative__.ptr);
+    return returnValue__;
+}
+void ClientCreateOptions::SetWebBase(std::string WebBase)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_String WebBase__str{(uint8_t*)(WebBase.data()), WebBase.size()};
+    Discord_ClientCreateOptions_SetWebBase(&instance_, WebBase__str);
+}
+std::string ClientCreateOptions::ApiBase() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_String returnValueNative__;
+    Discord_ClientCreateOptions_ApiBase(&instance_, &returnValueNative__);
+    std::string returnValue__(reinterpret_cast<char*>(returnValueNative__.ptr),
+                              returnValueNative__.size);
+    Discord_Free(returnValueNative__.ptr);
+    return returnValue__;
+}
+void ClientCreateOptions::SetApiBase(std::string ApiBase)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_String ApiBase__str{(uint8_t*)(ApiBase.data()), ApiBase.size()};
+    Discord_ClientCreateOptions_SetApiBase(&instance_, ApiBase__str);
+}
+discordpp::AudioSystem ClientCreateOptions::ExperimentalAudioSystem() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_AudioSystem returnValue__;
+    returnValue__ = Discord_ClientCreateOptions_ExperimentalAudioSystem(&instance_);
+    return static_cast<discordpp::AudioSystem>(returnValue__);
+}
+void ClientCreateOptions::SetExperimentalAudioSystem(discordpp::AudioSystem ExperimentalAudioSystem)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_ClientCreateOptions_SetExperimentalAudioSystem(
+      &instance_, static_cast<Discord_AudioSystem>(ExperimentalAudioSystem));
+}
+bool ClientCreateOptions::ExperimentalAndroidPreventCommsForBluetooth() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    bool returnValue__;
+    returnValue__ =
+      Discord_ClientCreateOptions_ExperimentalAndroidPreventCommsForBluetooth(&instance_);
+    return returnValue__;
+}
+void ClientCreateOptions::SetExperimentalAndroidPreventCommsForBluetooth(
+  bool ExperimentalAndroidPreventCommsForBluetooth)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_ClientCreateOptions_SetExperimentalAndroidPreventCommsForBluetooth(
+      &instance_, ExperimentalAndroidPreventCommsForBluetooth);
+}
+std::optional<uint64_t> ClientCreateOptions::CpuAffinityMask() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    bool returnIsNonNull__;
+    uint64_t returnValue__;
+    returnIsNonNull__ = Discord_ClientCreateOptions_CpuAffinityMask(&instance_, &returnValue__);
+    if (!returnIsNonNull__) {
+        return std::nullopt;
+    }
+    return returnValue__;
+}
+void ClientCreateOptions::SetCpuAffinityMask(std::optional<uint64_t> CpuAffinityMask)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_ClientCreateOptions_SetCpuAffinityMask(
+      &instance_, (CpuAffinityMask.has_value() ? &*CpuAffinityMask : nullptr));
+}
+const Client Client::nullobj{{}, DiscordObjectState::Invalid};
+Client::~Client()
+{
+    if (state_ == DiscordObjectState::Owned) {
+        Drop();
+        state_ = DiscordObjectState::Invalid;
+    }
+}
+Client::Client(Client&& other) noexcept
+  : instance_(other.instance_)
+  , state_(other.state_)
+{
+    other.state_ = DiscordObjectState::Invalid;
+}
+Client& Client::operator=(Client&& other) noexcept
+{
+    if (this != &other) {
+        if (state_ == DiscordObjectState::Owned) {
+            Drop();
+        }
+        instance_ = other.instance_;
+        state_ = other.state_;
+        other.state_ = DiscordObjectState::Invalid;
+    }
+    return *this;
+}
+Client::Client(Discord_Client instance, DiscordObjectState state)
+  : instance_(instance)
+  , state_(state)
+{
+}
+Client::Client()
+{
+    assert(state_ == DiscordObjectState::Invalid);
+    Discord_Client_Init(&instance_);
+    state_ = DiscordObjectState::Owned;
+}
+Client::Client(std::string apiBase, std::string webBase)
+{
+    assert(state_ == DiscordObjectState::Invalid);
+    Discord_String apiBase__str{(uint8_t*)(apiBase.data()), apiBase.size()};
+    Discord_String webBase__str{(uint8_t*)(webBase.data()), webBase.size()};
+    Discord_Client_InitWithBases(&instance_, apiBase__str, webBase__str);
+    state_ = DiscordObjectState::Owned;
+}
+Client::Client(discordpp::ClientCreateOptions options)
+{
+    assert(state_ == DiscordObjectState::Invalid);
+    Discord_Client_InitWithOptions(&instance_, options.instance());
+    state_ = DiscordObjectState::Owned;
+}
+void Client::Drop()
+{
+    if (state_ != DiscordObjectState::Owned) {
+        return;
+    }
+    Discord_Client_Drop(&instance_);
+    state_ = DiscordObjectState::Invalid;
+}
+std::string Client::ErrorToString(discordpp::Client::Error type)
+{
+    Discord_String returnValueNative__;
+    Discord_Client_ErrorToString(static_cast<Discord_Client_Error>(type), &returnValueNative__);
+    std::string returnValue__(reinterpret_cast<char*>(returnValueNative__.ptr),
+                              returnValueNative__.size);
+    Discord_Free(returnValueNative__.ptr);
+    return returnValue__;
+}
+uint64_t Client::GetApplicationId()
+{
+    assert(state_ == DiscordObjectState::Owned);
+    uint64_t returnValue__;
+    returnValue__ = Discord_Client_GetApplicationId(&instance_);
+    return returnValue__;
+}
+discordpp::UserHandle Client::GetCurrentUser() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_UserHandle returnValueNative__{};
+    Discord_Client_GetCurrentUser(&instance_, &returnValueNative__);
+    discordpp::UserHandle returnValue__(returnValueNative__, DiscordObjectState::Owned);
+    return returnValue__;
+}
+std::string Client::GetDefaultAudioDeviceId()
+{
+    Discord_String returnValueNative__;
+    Discord_Client_GetDefaultAudioDeviceId(&returnValueNative__);
+    std::string returnValue__(reinterpret_cast<char*>(returnValueNative__.ptr),
+                              returnValueNative__.size);
+    Discord_Free(returnValueNative__.ptr);
+    return returnValue__;
+}
+std::string Client::GetDefaultCommunicationScopes()
+{
+    Discord_String returnValueNative__;
+    Discord_Client_GetDefaultCommunicationScopes(&returnValueNative__);
+    std::string returnValue__(reinterpret_cast<char*>(returnValueNative__.ptr),
+                              returnValueNative__.size);
+    Discord_Free(returnValueNative__.ptr);
+    return returnValue__;
+}
+std::string Client::GetDefaultPresenceScopes()
+{
+    Discord_String returnValueNative__;
+    Discord_Client_GetDefaultPresenceScopes(&returnValueNative__);
+    std::string returnValue__(reinterpret_cast<char*>(returnValueNative__.ptr),
+                              returnValueNative__.size);
+    Discord_Free(returnValueNative__.ptr);
+    return returnValue__;
+}
+std::string Client::GetVersionHash()
+{
+    Discord_String returnValueNative__;
+    Discord_Client_GetVersionHash(&returnValueNative__);
+    std::string returnValue__(reinterpret_cast<char*>(returnValueNative__.ptr),
+                              returnValueNative__.size);
+    Discord_Free(returnValueNative__.ptr);
+    return returnValue__;
+}
+int32_t Client::GetVersionMajor()
+{
+    int32_t returnValue__;
+    returnValue__ = Discord_Client_GetVersionMajor();
+    return returnValue__;
+}
+int32_t Client::GetVersionMinor()
+{
+    int32_t returnValue__;
+    returnValue__ = Discord_Client_GetVersionMinor();
+    return returnValue__;
+}
+int32_t Client::GetVersionPatch()
+{
+    int32_t returnValue__;
+    returnValue__ = Discord_Client_GetVersionPatch();
+    return returnValue__;
+}
+void Client::SetHttpRequestTimeout(int32_t httpTimeoutInMilliseconds)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_Client_SetHttpRequestTimeout(&instance_, httpTimeoutInMilliseconds);
+}
+std::string Client::StatusToString(discordpp::Client::Status type)
+{
+    Discord_String returnValueNative__;
+    Discord_Client_StatusToString(static_cast<Discord_Client_Status>(type), &returnValueNative__);
+    std::string returnValue__(reinterpret_cast<char*>(returnValueNative__.ptr),
+                              returnValueNative__.size);
+    Discord_Free(returnValueNative__.ptr);
+    return returnValue__;
+}
+std::string Client::ThreadToString(discordpp::Client::Thread type)
+{
+    Discord_String returnValueNative__;
+    Discord_Client_ThreadToString(static_cast<Discord_Client_Thread>(type), &returnValueNative__);
+    std::string returnValue__(reinterpret_cast<char*>(returnValueNative__.ptr),
+                              returnValueNative__.size);
+    Discord_Free(returnValueNative__.ptr);
+    return returnValue__;
+}
+void Client::EndCall(uint64_t channelId, discordpp::Client::EndCallCallback callback)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    using Tcallback__UserData = TDelegateUserData<std::remove_reference_t<decltype(callback)>>;
+    auto callback__userData = new Tcallback__UserData(callback);
+    Discord_Client_EndCallCallback callback__native = [](void* userData__) {
+        auto userData__typed = static_cast<Tcallback__UserData*>(userData__);
+        userData__typed->delegate();
+    };
+    Discord_Client_EndCall(
+      &instance_, channelId, callback__native, Tcallback__UserData::Free, callback__userData);
+}
+void Client::EndCalls(discordpp::Client::EndCallsCallback callback)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    using Tcallback__UserData = TDelegateUserData<std::remove_reference_t<decltype(callback)>>;
+    auto callback__userData = new Tcallback__UserData(callback);
+    Discord_Client_EndCallsCallback callback__native = [](void* userData__) {
+        auto userData__typed = static_cast<Tcallback__UserData*>(userData__);
+        userData__typed->delegate();
+    };
+    Discord_Client_EndCalls(
+      &instance_, callback__native, Tcallback__UserData::Free, callback__userData);
+}
+discordpp::Call Client::GetCall(uint64_t channelId)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    bool returnIsNonNull__;
+    Discord_Call returnValueNative__{};
+    returnIsNonNull__ = Discord_Client_GetCall(&instance_, channelId, &returnValueNative__);
+    discordpp::Call returnValue__(
+      returnValueNative__,
+      returnIsNonNull__ ? DiscordObjectState::Owned : DiscordObjectState::Invalid);
+    return returnValue__;
+}
+std::vector<discordpp::Call> Client::GetCalls()
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_CallSpan returnValueNative__;
+    Discord_Client_GetCalls(&instance_, &returnValueNative__);
+    std::vector<discordpp::Call> returnValue__;
+    returnValue__.reserve(returnValueNative__.size);
+    for (size_t i__ = 0; i__ < returnValueNative__.size; ++i__) {
+        returnValue__.emplace_back(returnValueNative__.ptr[i__], DiscordObjectState::Owned);
+    }
+    Discord_Free(returnValueNative__.ptr);
+    return returnValue__;
+}
+void Client::GetCurrentInputDevice(discordpp::Client::GetCurrentInputDeviceCallback cb)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    using Tcb__UserData = TDelegateUserData<std::remove_reference_t<decltype(cb)>>;
+    auto cb__userData = new Tcb__UserData(cb);
+    Discord_Client_GetCurrentInputDeviceCallback cb__native = [](auto device, void* userData__) {
+        auto userData__typed = static_cast<Tcb__UserData*>(userData__);
+        discordpp::AudioDevice device__obj(*device, DiscordObjectState::Owned);
+        userData__typed->delegate(std::move(device__obj));
+    };
+    Discord_Client_GetCurrentInputDevice(&instance_, cb__native, Tcb__UserData::Free, cb__userData);
+}
+void Client::GetCurrentOutputDevice(discordpp::Client::GetCurrentOutputDeviceCallback cb)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    using Tcb__UserData = TDelegateUserData<std::remove_reference_t<decltype(cb)>>;
+    auto cb__userData = new Tcb__UserData(cb);
+    Discord_Client_GetCurrentOutputDeviceCallback cb__native = [](auto device, void* userData__) {
+        auto userData__typed = static_cast<Tcb__UserData*>(userData__);
+        discordpp::AudioDevice device__obj(*device, DiscordObjectState::Owned);
+        userData__typed->delegate(std::move(device__obj));
+    };
+    Discord_Client_GetCurrentOutputDevice(
+      &instance_, cb__native, Tcb__UserData::Free, cb__userData);
+}
+void Client::GetInputDevices(discordpp::Client::GetInputDevicesCallback cb)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    using Tcb__UserData = TDelegateUserData<std::remove_reference_t<decltype(cb)>>;
+    auto cb__userData = new Tcb__UserData(cb);
+    Discord_Client_GetInputDevicesCallback cb__native = [](auto devices, void* userData__) {
+        auto userData__typed = static_cast<Tcb__UserData*>(userData__);
+        std::vector<discordpp::AudioDevice> devices__vec;
+        devices__vec.reserve(devices.size);
+        for (size_t i__ = 0; i__ < devices.size; ++i__) {
+            devices__vec.emplace_back(devices.ptr[i__], DiscordObjectState::Owned);
+        }
+        Discord_Free(devices.ptr);
+        userData__typed->delegate(std::move(devices__vec));
+    };
+    Discord_Client_GetInputDevices(&instance_, cb__native, Tcb__UserData::Free, cb__userData);
+}
+float Client::GetInputVolume()
+{
+    assert(state_ == DiscordObjectState::Owned);
+    float returnValue__;
+    returnValue__ = Discord_Client_GetInputVolume(&instance_);
+    return returnValue__;
+}
+void Client::GetOutputDevices(discordpp::Client::GetOutputDevicesCallback cb)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    using Tcb__UserData = TDelegateUserData<std::remove_reference_t<decltype(cb)>>;
+    auto cb__userData = new Tcb__UserData(cb);
+    Discord_Client_GetOutputDevicesCallback cb__native = [](auto devices, void* userData__) {
+        auto userData__typed = static_cast<Tcb__UserData*>(userData__);
+        std::vector<discordpp::AudioDevice> devices__vec;
+        devices__vec.reserve(devices.size);
+        for (size_t i__ = 0; i__ < devices.size; ++i__) {
+            devices__vec.emplace_back(devices.ptr[i__], DiscordObjectState::Owned);
+        }
+        Discord_Free(devices.ptr);
+        userData__typed->delegate(std::move(devices__vec));
+    };
+    Discord_Client_GetOutputDevices(&instance_, cb__native, Tcb__UserData::Free, cb__userData);
+}
+float Client::GetOutputVolume()
+{
+    assert(state_ == DiscordObjectState::Owned);
+    float returnValue__;
+    returnValue__ = Discord_Client_GetOutputVolume(&instance_);
+    return returnValue__;
+}
+bool Client::GetSelfDeafAll() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    bool returnValue__;
+    returnValue__ = Discord_Client_GetSelfDeafAll(&instance_);
+    return returnValue__;
+}
+bool Client::GetSelfMuteAll() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    bool returnValue__;
+    returnValue__ = Discord_Client_GetSelfMuteAll(&instance_);
+    return returnValue__;
+}
+void Client::GetVoiceSettings(discordpp::Client::GetVoiceSettingsCallback cb)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    using Tcb__UserData = TDelegateUserData<std::remove_reference_t<decltype(cb)>>;
+    auto cb__userData = new Tcb__UserData(cb);
+    Discord_Client_GetVoiceSettingsCallback cb__native =
+      [](auto result, auto settings, void* userData__) {
+          auto userData__typed = static_cast<Tcb__UserData*>(userData__);
+          discordpp::ClientResult result__obj(*result, DiscordObjectState::Owned);
+          discordpp::VoiceSettings settings__obj(*settings, DiscordObjectState::Owned);
+          userData__typed->delegate(std::move(result__obj), std::move(settings__obj));
+      };
+    Discord_Client_GetVoiceSettings(&instance_, cb__native, Tcb__UserData::Free, cb__userData);
+}
+void Client::SetAecDump(bool on)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_Client_SetAecDump(&instance_, on);
+}
+void Client::SetAutomaticGainControl(bool on)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_Client_SetAutomaticGainControl(&instance_, on);
+}
+void Client::SetDeviceChangeCallback(discordpp::Client::DeviceChangeCallback callback)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    using Tcallback__UserData = TDelegateUserData<std::remove_reference_t<decltype(callback)>>;
+    auto callback__userData = new Tcallback__UserData(callback);
+    Discord_Client_DeviceChangeCallback callback__native =
+      [](auto inputDevices, auto outputDevices, void* userData__) {
+          auto userData__typed = static_cast<Tcallback__UserData*>(userData__);
+          std::vector<discordpp::AudioDevice> inputDevices__vec;
+          inputDevices__vec.reserve(inputDevices.size);
+          for (size_t i__ = 0; i__ < inputDevices.size; ++i__) {
+              inputDevices__vec.emplace_back(inputDevices.ptr[i__], DiscordObjectState::Owned);
+          }
+          Discord_Free(inputDevices.ptr);
+          std::vector<discordpp::AudioDevice> outputDevices__vec;
+          outputDevices__vec.reserve(outputDevices.size);
+          for (size_t i__ = 0; i__ < outputDevices.size; ++i__) {
+              outputDevices__vec.emplace_back(outputDevices.ptr[i__], DiscordObjectState::Owned);
+          }
+          Discord_Free(outputDevices.ptr);
+          userData__typed->delegate(std::move(inputDevices__vec), std::move(outputDevices__vec));
+      };
+    Discord_Client_SetDeviceChangeCallback(
+      &instance_, callback__native, Tcallback__UserData::Free, callback__userData);
+}
+void Client::SetEchoCancellation(bool on)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_Client_SetEchoCancellation(&instance_, on);
+}
+void Client::SetEngineManagedAudioSession(bool isEngineManaged)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_Client_SetEngineManagedAudioSession(&instance_, isEngineManaged);
+}
+void Client::SetInputDevice(std::string deviceId, discordpp::Client::SetInputDeviceCallback cb)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_String deviceId__str{(uint8_t*)(deviceId.data()), deviceId.size()};
+    using Tcb__UserData = TDelegateUserData<std::remove_reference_t<decltype(cb)>>;
+    auto cb__userData = new Tcb__UserData(cb);
+    Discord_Client_SetInputDeviceCallback cb__native = [](auto result, void* userData__) {
+        auto userData__typed = static_cast<Tcb__UserData*>(userData__);
+        discordpp::ClientResult result__obj(*result, DiscordObjectState::Owned);
+        userData__typed->delegate(std::move(result__obj));
+    };
+    Discord_Client_SetInputDevice(
+      &instance_, deviceId__str, cb__native, Tcb__UserData::Free, cb__userData);
+}
+void Client::SetInputVolume(float inputVolume)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_Client_SetInputVolume(&instance_, inputVolume);
+}
+void Client::SetNoAudioInputCallback(discordpp::Client::NoAudioInputCallback callback)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    using Tcallback__UserData = TDelegateUserData<std::remove_reference_t<decltype(callback)>>;
+    auto callback__userData = new Tcallback__UserData(callback);
+    Discord_Client_NoAudioInputCallback callback__native = [](auto inputDetected,
+                                                              void* userData__) {
+        auto userData__typed = static_cast<Tcallback__UserData*>(userData__);
+        userData__typed->delegate(inputDetected);
+    };
+    Discord_Client_SetNoAudioInputCallback(
+      &instance_, callback__native, Tcallback__UserData::Free, callback__userData);
+}
+void Client::SetNoAudioInputThreshold(float dBFSThreshold)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_Client_SetNoAudioInputThreshold(&instance_, dBFSThreshold);
+}
+void Client::SetNoiseCancellation(bool on)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_Client_SetNoiseCancellation(&instance_, on);
+}
+void Client::SetNoiseSuppression(bool on)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_Client_SetNoiseSuppression(&instance_, on);
+}
+void Client::SetOpusHardwareCoding(bool encode, bool decode)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_Client_SetOpusHardwareCoding(&instance_, encode, decode);
+}
+void Client::SetOutputDevice(std::string deviceId, discordpp::Client::SetOutputDeviceCallback cb)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_String deviceId__str{(uint8_t*)(deviceId.data()), deviceId.size()};
+    using Tcb__UserData = TDelegateUserData<std::remove_reference_t<decltype(cb)>>;
+    auto cb__userData = new Tcb__UserData(cb);
+    Discord_Client_SetOutputDeviceCallback cb__native = [](auto result, void* userData__) {
+        auto userData__typed = static_cast<Tcb__UserData*>(userData__);
+        discordpp::ClientResult result__obj(*result, DiscordObjectState::Owned);
+        userData__typed->delegate(std::move(result__obj));
+    };
+    Discord_Client_SetOutputDevice(
+      &instance_, deviceId__str, cb__native, Tcb__UserData::Free, cb__userData);
+}
+void Client::SetOutputVolume(float outputVolume)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_Client_SetOutputVolume(&instance_, outputVolume);
+}
+void Client::SetSelfDeafAll(bool deaf)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_Client_SetSelfDeafAll(&instance_, deaf);
+}
+void Client::SetSelfMuteAll(bool mute)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_Client_SetSelfMuteAll(&instance_, mute);
+}
+bool Client::SetSpeakerMode(bool speakerMode)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    bool returnValue__;
+    returnValue__ = Discord_Client_SetSpeakerMode(&instance_, speakerMode);
+    return returnValue__;
+}
+void Client::SetThreadPriority(discordpp::Client::Thread thread, int32_t priority)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_Client_SetThreadPriority(
+      &instance_, static_cast<Discord_Client_Thread>(thread), priority);
+}
+void Client::SetVoiceParticipantChangedCallback(
+  discordpp::Client::VoiceParticipantChangedCallback cb)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    using Tcb__UserData = TDelegateUserData<std::remove_reference_t<decltype(cb)>>;
+    auto cb__userData = new Tcb__UserData(cb);
+    Discord_Client_VoiceParticipantChangedCallback cb__native =
+      [](auto lobbyId, auto memberId, auto added, void* userData__) {
+          auto userData__typed = static_cast<Tcb__UserData*>(userData__);
+          userData__typed->delegate(lobbyId, memberId, added);
+      };
+    Discord_Client_SetVoiceParticipantChangedCallback(
+      &instance_, cb__native, Tcb__UserData::Free, cb__userData);
+}
+void Client::SetVoiceSettingsUpdatedCallback(
+  discordpp::Client::VoiceSettingsUpdatedCallback callback)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    using Tcallback__UserData = TDelegateUserData<std::remove_reference_t<decltype(callback)>>;
+    auto callback__userData = new Tcallback__UserData(callback);
+    Discord_Client_VoiceSettingsUpdatedCallback callback__native = [](auto settings,
+                                                                      void* userData__) {
+        auto userData__typed = static_cast<Tcallback__UserData*>(userData__);
+        discordpp::VoiceSettings settings__obj(*settings, DiscordObjectState::Owned);
+        userData__typed->delegate(std::move(settings__obj));
+    };
+    Discord_Client_SetVoiceSettingsUpdatedCallback(
+      &instance_, callback__native, Tcallback__UserData::Free, callback__userData);
+}
+bool Client::ShowAudioRoutePicker()
+{
+    assert(state_ == DiscordObjectState::Owned);
+    bool returnValue__;
+    returnValue__ = Discord_Client_ShowAudioRoutePicker(&instance_);
+    return returnValue__;
+}
+discordpp::Call Client::StartCall(uint64_t channelId)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    bool returnIsNonNull__;
+    Discord_Call returnValueNative__{};
+    returnIsNonNull__ = Discord_Client_StartCall(&instance_, channelId, &returnValueNative__);
+    discordpp::Call returnValue__(
+      returnValueNative__,
+      returnIsNonNull__ ? DiscordObjectState::Owned : DiscordObjectState::Invalid);
+    return returnValue__;
+}
+discordpp::Call Client::StartCallWithAudioCallbacks(
+  uint64_t lobbyId,
+  discordpp::Client::UserAudioReceivedCallback receivedCb,
+  discordpp::Client::UserAudioCapturedCallback capturedCb)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    bool returnIsNonNull__;
+    Discord_Call returnValueNative__{};
+    using TreceivedCb__UserData = TDelegateUserData<std::remove_reference_t<decltype(receivedCb)>>;
+    auto receivedCb__userData = new TreceivedCb__UserData(receivedCb);
+    Discord_Client_UserAudioReceivedCallback receivedCb__native = [](auto userId,
+                                                                     auto data,
+                                                                     auto samplesPerChannel,
+                                                                     auto sampleRate,
+                                                                     auto channels,
+                                                                     auto outShouldMute,
+                                                                     void* userData__) {
+        auto userData__typed = static_cast<TreceivedCb__UserData*>(userData__);
+        userData__typed->delegate(
+          userId, data, samplesPerChannel, sampleRate, channels, *outShouldMute);
+    };
+    using TcapturedCb__UserData = TDelegateUserData<std::remove_reference_t<decltype(capturedCb)>>;
+    auto capturedCb__userData = new TcapturedCb__UserData(capturedCb);
+    Discord_Client_UserAudioCapturedCallback capturedCb__native =
+      [](auto data, auto samplesPerChannel, auto sampleRate, auto channels, void* userData__) {
+          auto userData__typed = static_cast<TcapturedCb__UserData*>(userData__);
+          userData__typed->delegate(data, samplesPerChannel, sampleRate, channels);
+      };
+    returnIsNonNull__ = Discord_Client_StartCallWithAudioCallbacks(&instance_,
+                                                                   lobbyId,
+                                                                   receivedCb__native,
+                                                                   TreceivedCb__UserData::Free,
+                                                                   receivedCb__userData,
+                                                                   capturedCb__native,
+                                                                   TcapturedCb__UserData::Free,
+                                                                   capturedCb__userData,
+                                                                   &returnValueNative__);
+    discordpp::Call returnValue__(
+      returnValueNative__,
+      returnIsNonNull__ ? DiscordObjectState::Owned : DiscordObjectState::Invalid);
+    return returnValue__;
+}
+void Client::AbortAuthorize()
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_Client_AbortAuthorize(&instance_);
+}
+void Client::AbortGetTokenFromDevice()
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_Client_AbortGetTokenFromDevice(&instance_);
+}
+void Client::Authorize(discordpp::AuthorizationArgs args,
+                       discordpp::Client::AuthorizationCallback callback)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    using Tcallback__UserData = TDelegateUserData<std::remove_reference_t<decltype(callback)>>;
+    auto callback__userData = new Tcallback__UserData(callback);
+    Discord_Client_AuthorizationCallback callback__native =
+      [](auto result, auto code, auto redirectUri, void* userData__) {
+          auto userData__typed = static_cast<Tcallback__UserData*>(userData__);
+          discordpp::ClientResult result__obj(*result, DiscordObjectState::Owned);
+          std::string code__str(reinterpret_cast<char*>(code.ptr), code.size);
+          std::string redirectUri__str(reinterpret_cast<char*>(redirectUri.ptr), redirectUri.size);
+          userData__typed->delegate(
+            std::move(result__obj), std::move(code__str), std::move(redirectUri__str));
+          Discord_Free(redirectUri.ptr);
+          Discord_Free(code.ptr);
+      };
+    Discord_Client_Authorize(
+      &instance_, args.instance(), callback__native, Tcallback__UserData::Free, callback__userData);
+}
+void Client::CloseAuthorizeDeviceScreen()
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_Client_CloseAuthorizeDeviceScreen(&instance_);
+}
+discordpp::AuthorizationCodeVerifier Client::CreateAuthorizationCodeVerifier()
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_AuthorizationCodeVerifier returnValueNative__{};
+    Discord_Client_CreateAuthorizationCodeVerifier(&instance_, &returnValueNative__);
+    discordpp::AuthorizationCodeVerifier returnValue__(returnValueNative__,
+                                                       DiscordObjectState::Owned);
+    return returnValue__;
+}
+void Client::ExchangeChildToken(std::string const& parentApplicationToken,
+                                uint64_t childApplicationId,
+                                discordpp::Client::ExchangeChildTokenCallback callback)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_String parentApplicationToken__str{(uint8_t*)(parentApplicationToken.data()),
+                                               parentApplicationToken.size()};
+    using Tcallback__UserData = TDelegateUserData<std::remove_reference_t<decltype(callback)>>;
+    auto callback__userData = new Tcallback__UserData(callback);
+    Discord_Client_ExchangeChildTokenCallback callback__native = [](auto result,
+                                                                    auto accessToken,
+                                                                    auto tokenType,
+                                                                    auto expiresIn,
+                                                                    auto scopes,
+                                                                    void* userData__) {
+        auto userData__typed = static_cast<Tcallback__UserData*>(userData__);
+        discordpp::ClientResult result__obj(*result, DiscordObjectState::Owned);
+        std::string accessToken__str(reinterpret_cast<char*>(accessToken.ptr), accessToken.size);
+        std::string scopes__str(reinterpret_cast<char*>(scopes.ptr), scopes.size);
+        userData__typed->delegate(std::move(result__obj),
+                                  std::move(accessToken__str),
+                                  static_cast<discordpp::AuthorizationTokenType>(tokenType),
+                                  expiresIn,
+                                  std::move(scopes__str));
+        Discord_Free(scopes.ptr);
+        Discord_Free(accessToken.ptr);
+    };
+    Discord_Client_ExchangeChildToken(&instance_,
+                                      parentApplicationToken__str,
+                                      childApplicationId,
+                                      callback__native,
+                                      Tcallback__UserData::Free,
+                                      callback__userData);
+}
+void Client::FetchCurrentUser(discordpp::AuthorizationTokenType tokenType,
+                              std::string const& token,
+                              discordpp::Client::FetchCurrentUserCallback callback)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_String token__str{(uint8_t*)(token.data()), token.size()};
+    using Tcallback__UserData = TDelegateUserData<std::remove_reference_t<decltype(callback)>>;
+    auto callback__userData = new Tcallback__UserData(callback);
+    Discord_Client_FetchCurrentUserCallback callback__native =
+      [](auto result, auto id, auto name, void* userData__) {
+          auto userData__typed = static_cast<Tcallback__UserData*>(userData__);
+          discordpp::ClientResult result__obj(*result, DiscordObjectState::Owned);
+          std::string name__str(reinterpret_cast<char*>(name.ptr), name.size);
+          userData__typed->delegate(std::move(result__obj), id, std::move(name__str));
+          Discord_Free(name.ptr);
+      };
+    Discord_Client_FetchCurrentUser(&instance_,
+                                    static_cast<Discord_AuthorizationTokenType>(tokenType),
+                                    token__str,
+                                    callback__native,
+                                    Tcallback__UserData::Free,
+                                    callback__userData);
+}
+void Client::GetProvisionalToken(uint64_t applicationId,
+                                 discordpp::AuthenticationExternalAuthType externalAuthType,
+                                 std::string const& externalAuthToken,
+                                 discordpp::Client::TokenExchangeCallback callback)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_String externalAuthToken__str{(uint8_t*)(externalAuthToken.data()),
+                                          externalAuthToken.size()};
+    using Tcallback__UserData = TDelegateUserData<std::remove_reference_t<decltype(callback)>>;
+    auto callback__userData = new Tcallback__UserData(callback);
+    Discord_Client_TokenExchangeCallback callback__native = [](auto result,
+                                                               auto accessToken,
+                                                               auto refreshToken,
+                                                               auto tokenType,
+                                                               auto expiresIn,
+                                                               auto scopes,
+                                                               void* userData__) {
+        auto userData__typed = static_cast<Tcallback__UserData*>(userData__);
+        discordpp::ClientResult result__obj(*result, DiscordObjectState::Owned);
+        std::string accessToken__str(reinterpret_cast<char*>(accessToken.ptr), accessToken.size);
+        std::string refreshToken__str(reinterpret_cast<char*>(refreshToken.ptr), refreshToken.size);
+        std::string scopes__str(reinterpret_cast<char*>(scopes.ptr), scopes.size);
+        userData__typed->delegate(std::move(result__obj),
+                                  std::move(accessToken__str),
+                                  std::move(refreshToken__str),
+                                  static_cast<discordpp::AuthorizationTokenType>(tokenType),
+                                  expiresIn,
+                                  std::move(scopes__str));
+        Discord_Free(scopes.ptr);
+        Discord_Free(refreshToken.ptr);
+        Discord_Free(accessToken.ptr);
+    };
+    Discord_Client_GetProvisionalToken(
+      &instance_,
+      applicationId,
+      static_cast<Discord_AuthenticationExternalAuthType>(externalAuthType),
+      externalAuthToken__str,
+      callback__native,
+      Tcallback__UserData::Free,
+      callback__userData);
+}
+void Client::GetToken(uint64_t applicationId,
+                      std::string const& code,
+                      std::string const& codeVerifier,
+                      std::string const& redirectUri,
+                      discordpp::Client::TokenExchangeCallback callback)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_String code__str{(uint8_t*)(code.data()), code.size()};
+    Discord_String codeVerifier__str{(uint8_t*)(codeVerifier.data()), codeVerifier.size()};
+    Discord_String redirectUri__str{(uint8_t*)(redirectUri.data()), redirectUri.size()};
+    using Tcallback__UserData = TDelegateUserData<std::remove_reference_t<decltype(callback)>>;
+    auto callback__userData = new Tcallback__UserData(callback);
+    Discord_Client_TokenExchangeCallback callback__native = [](auto result,
+                                                               auto accessToken,
+                                                               auto refreshToken,
+                                                               auto tokenType,
+                                                               auto expiresIn,
+                                                               auto scopes,
+                                                               void* userData__) {
+        auto userData__typed = static_cast<Tcallback__UserData*>(userData__);
+        discordpp::ClientResult result__obj(*result, DiscordObjectState::Owned);
+        std::string accessToken__str(reinterpret_cast<char*>(accessToken.ptr), accessToken.size);
+        std::string refreshToken__str(reinterpret_cast<char*>(refreshToken.ptr), refreshToken.size);
+        std::string scopes__str(reinterpret_cast<char*>(scopes.ptr), scopes.size);
+        userData__typed->delegate(std::move(result__obj),
+                                  std::move(accessToken__str),
+                                  std::move(refreshToken__str),
+                                  static_cast<discordpp::AuthorizationTokenType>(tokenType),
+                                  expiresIn,
+                                  std::move(scopes__str));
+        Discord_Free(scopes.ptr);
+        Discord_Free(refreshToken.ptr);
+        Discord_Free(accessToken.ptr);
+    };
+    Discord_Client_GetToken(&instance_,
+                            applicationId,
+                            code__str,
+                            codeVerifier__str,
+                            redirectUri__str,
+                            callback__native,
+                            Tcallback__UserData::Free,
+                            callback__userData);
+}
+void Client::GetTokenFromDevice(discordpp::DeviceAuthorizationArgs args,
+                                discordpp::Client::TokenExchangeCallback callback)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    using Tcallback__UserData = TDelegateUserData<std::remove_reference_t<decltype(callback)>>;
+    auto callback__userData = new Tcallback__UserData(callback);
+    Discord_Client_TokenExchangeCallback callback__native = [](auto result,
+                                                               auto accessToken,
+                                                               auto refreshToken,
+                                                               auto tokenType,
+                                                               auto expiresIn,
+                                                               auto scopes,
+                                                               void* userData__) {
+        auto userData__typed = static_cast<Tcallback__UserData*>(userData__);
+        discordpp::ClientResult result__obj(*result, DiscordObjectState::Owned);
+        std::string accessToken__str(reinterpret_cast<char*>(accessToken.ptr), accessToken.size);
+        std::string refreshToken__str(reinterpret_cast<char*>(refreshToken.ptr), refreshToken.size);
+        std::string scopes__str(reinterpret_cast<char*>(scopes.ptr), scopes.size);
+        userData__typed->delegate(std::move(result__obj),
+                                  std::move(accessToken__str),
+                                  std::move(refreshToken__str),
+                                  static_cast<discordpp::AuthorizationTokenType>(tokenType),
+                                  expiresIn,
+                                  std::move(scopes__str));
+        Discord_Free(scopes.ptr);
+        Discord_Free(refreshToken.ptr);
+        Discord_Free(accessToken.ptr);
+    };
+    Discord_Client_GetTokenFromDevice(
+      &instance_, args.instance(), callback__native, Tcallback__UserData::Free, callback__userData);
+}
+void Client::GetTokenFromDeviceProvisionalMerge(
+  discordpp::DeviceAuthorizationArgs args,
+  discordpp::AuthenticationExternalAuthType externalAuthType,
+  std::string const& externalAuthToken,
+  discordpp::Client::TokenExchangeCallback callback)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_String externalAuthToken__str{(uint8_t*)(externalAuthToken.data()),
+                                          externalAuthToken.size()};
+    using Tcallback__UserData = TDelegateUserData<std::remove_reference_t<decltype(callback)>>;
+    auto callback__userData = new Tcallback__UserData(callback);
+    Discord_Client_TokenExchangeCallback callback__native = [](auto result,
+                                                               auto accessToken,
+                                                               auto refreshToken,
+                                                               auto tokenType,
+                                                               auto expiresIn,
+                                                               auto scopes,
+                                                               void* userData__) {
+        auto userData__typed = static_cast<Tcallback__UserData*>(userData__);
+        discordpp::ClientResult result__obj(*result, DiscordObjectState::Owned);
+        std::string accessToken__str(reinterpret_cast<char*>(accessToken.ptr), accessToken.size);
+        std::string refreshToken__str(reinterpret_cast<char*>(refreshToken.ptr), refreshToken.size);
+        std::string scopes__str(reinterpret_cast<char*>(scopes.ptr), scopes.size);
+        userData__typed->delegate(std::move(result__obj),
+                                  std::move(accessToken__str),
+                                  std::move(refreshToken__str),
+                                  static_cast<discordpp::AuthorizationTokenType>(tokenType),
+                                  expiresIn,
+                                  std::move(scopes__str));
+        Discord_Free(scopes.ptr);
+        Discord_Free(refreshToken.ptr);
+        Discord_Free(accessToken.ptr);
+    };
+    Discord_Client_GetTokenFromDeviceProvisionalMerge(
+      &instance_,
+      args.instance(),
+      static_cast<Discord_AuthenticationExternalAuthType>(externalAuthType),
+      externalAuthToken__str,
+      callback__native,
+      Tcallback__UserData::Free,
+      callback__userData);
+}
+void Client::GetTokenFromProvisionalMerge(
+  uint64_t applicationId,
+  std::string const& code,
+  std::string const& codeVerifier,
+  std::string const& redirectUri,
+  discordpp::AuthenticationExternalAuthType externalAuthType,
+  std::string const& externalAuthToken,
+  discordpp::Client::TokenExchangeCallback callback)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_String code__str{(uint8_t*)(code.data()), code.size()};
+    Discord_String codeVerifier__str{(uint8_t*)(codeVerifier.data()), codeVerifier.size()};
+    Discord_String redirectUri__str{(uint8_t*)(redirectUri.data()), redirectUri.size()};
+    Discord_String externalAuthToken__str{(uint8_t*)(externalAuthToken.data()),
+                                          externalAuthToken.size()};
+    using Tcallback__UserData = TDelegateUserData<std::remove_reference_t<decltype(callback)>>;
+    auto callback__userData = new Tcallback__UserData(callback);
+    Discord_Client_TokenExchangeCallback callback__native = [](auto result,
+                                                               auto accessToken,
+                                                               auto refreshToken,
+                                                               auto tokenType,
+                                                               auto expiresIn,
+                                                               auto scopes,
+                                                               void* userData__) {
+        auto userData__typed = static_cast<Tcallback__UserData*>(userData__);
+        discordpp::ClientResult result__obj(*result, DiscordObjectState::Owned);
+        std::string accessToken__str(reinterpret_cast<char*>(accessToken.ptr), accessToken.size);
+        std::string refreshToken__str(reinterpret_cast<char*>(refreshToken.ptr), refreshToken.size);
+        std::string scopes__str(reinterpret_cast<char*>(scopes.ptr), scopes.size);
+        userData__typed->delegate(std::move(result__obj),
+                                  std::move(accessToken__str),
+                                  std::move(refreshToken__str),
+                                  static_cast<discordpp::AuthorizationTokenType>(tokenType),
+                                  expiresIn,
+                                  std::move(scopes__str));
+        Discord_Free(scopes.ptr);
+        Discord_Free(refreshToken.ptr);
+        Discord_Free(accessToken.ptr);
+    };
+    Discord_Client_GetTokenFromProvisionalMerge(
+      &instance_,
+      applicationId,
+      code__str,
+      codeVerifier__str,
+      redirectUri__str,
+      static_cast<Discord_AuthenticationExternalAuthType>(externalAuthType),
+      externalAuthToken__str,
+      callback__native,
+      Tcallback__UserData::Free,
+      callback__userData);
+}
+bool Client::IsAuthenticated()
+{
+    assert(state_ == DiscordObjectState::Owned);
+    bool returnValue__;
+    returnValue__ = Discord_Client_IsAuthenticated(&instance_);
+    return returnValue__;
+}
+void Client::OpenAuthorizeDeviceScreen(uint64_t clientId, std::string const& userCode)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_String userCode__str{(uint8_t*)(userCode.data()), userCode.size()};
+    Discord_Client_OpenAuthorizeDeviceScreen(&instance_, clientId, userCode__str);
+}
+void Client::ProvisionalUserMergeCompleted(bool success)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_Client_ProvisionalUserMergeCompleted(&instance_, success);
+}
+void Client::RefreshToken(uint64_t applicationId,
+                          std::string const& refreshToken,
+                          discordpp::Client::TokenExchangeCallback callback)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_String refreshToken__str{(uint8_t*)(refreshToken.data()), refreshToken.size()};
+    using Tcallback__UserData = TDelegateUserData<std::remove_reference_t<decltype(callback)>>;
+    auto callback__userData = new Tcallback__UserData(callback);
+    Discord_Client_TokenExchangeCallback callback__native = [](auto result,
+                                                               auto accessToken,
+                                                               auto refreshToken,
+                                                               auto tokenType,
+                                                               auto expiresIn,
+                                                               auto scopes,
+                                                               void* userData__) {
+        auto userData__typed = static_cast<Tcallback__UserData*>(userData__);
+        discordpp::ClientResult result__obj(*result, DiscordObjectState::Owned);
+        std::string accessToken__str(reinterpret_cast<char*>(accessToken.ptr), accessToken.size);
+        std::string refreshToken__str(reinterpret_cast<char*>(refreshToken.ptr), refreshToken.size);
+        std::string scopes__str(reinterpret_cast<char*>(scopes.ptr), scopes.size);
+        userData__typed->delegate(std::move(result__obj),
+                                  std::move(accessToken__str),
+                                  std::move(refreshToken__str),
+                                  static_cast<discordpp::AuthorizationTokenType>(tokenType),
+                                  expiresIn,
+                                  std::move(scopes__str));
+        Discord_Free(scopes.ptr);
+        Discord_Free(refreshToken.ptr);
+        Discord_Free(accessToken.ptr);
+    };
+    Discord_Client_RefreshToken(&instance_,
+                                applicationId,
+                                refreshToken__str,
+                                callback__native,
+                                Tcallback__UserData::Free,
+                                callback__userData);
+}
+void Client::RegisterAuthorizeRequestCallback(discordpp::Client::AuthorizeRequestCallback callback)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    using Tcallback__UserData = TDelegateUserData<std::remove_reference_t<decltype(callback)>>;
+    auto callback__userData = new Tcallback__UserData(callback);
+    Discord_Client_AuthorizeRequestCallback callback__native = [](void* userData__) {
+        auto userData__typed = static_cast<Tcallback__UserData*>(userData__);
+        userData__typed->delegate();
+    };
+    Discord_Client_RegisterAuthorizeRequestCallback(
+      &instance_, callback__native, Tcallback__UserData::Free, callback__userData);
+}
+void Client::RemoveAuthorizeRequestCallback()
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_Client_RemoveAuthorizeRequestCallback(&instance_);
+}
+void Client::RevokeToken(uint64_t applicationId,
+                         std::string const& token,
+                         discordpp::Client::RevokeTokenCallback callback)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_String token__str{(uint8_t*)(token.data()), token.size()};
+    using Tcallback__UserData = TDelegateUserData<std::remove_reference_t<decltype(callback)>>;
+    auto callback__userData = new Tcallback__UserData(callback);
+    Discord_Client_RevokeTokenCallback callback__native = [](auto result, void* userData__) {
+        auto userData__typed = static_cast<Tcallback__UserData*>(userData__);
+        discordpp::ClientResult result__obj(*result, DiscordObjectState::Owned);
+        userData__typed->delegate(std::move(result__obj));
+    };
+    Discord_Client_RevokeToken(&instance_,
+                               applicationId,
+                               token__str,
+                               callback__native,
+                               Tcallback__UserData::Free,
+                               callback__userData);
+}
+void Client::SetAuthorizeDeviceScreenClosedCallback(
+  discordpp::Client::AuthorizeDeviceScreenClosedCallback cb)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    using Tcb__UserData = TDelegateUserData<std::remove_reference_t<decltype(cb)>>;
+    auto cb__userData = new Tcb__UserData(cb);
+    Discord_Client_AuthorizeDeviceScreenClosedCallback cb__native = [](void* userData__) {
+        auto userData__typed = static_cast<Tcb__UserData*>(userData__);
+        userData__typed->delegate();
+    };
+    Discord_Client_SetAuthorizeDeviceScreenClosedCallback(
+      &instance_, cb__native, Tcb__UserData::Free, cb__userData);
+}
+void Client::SetGameWindowPid(int32_t pid)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_Client_SetGameWindowPid(&instance_, pid);
+}
+void Client::SetTokenExpirationCallback(discordpp::Client::TokenExpirationCallback callback)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    using Tcallback__UserData = TDelegateUserData<std::remove_reference_t<decltype(callback)>>;
+    auto callback__userData = new Tcallback__UserData(callback);
+    Discord_Client_TokenExpirationCallback callback__native = [](void* userData__) {
+        auto userData__typed = static_cast<Tcallback__UserData*>(userData__);
+        userData__typed->delegate();
+    };
+    Discord_Client_SetTokenExpirationCallback(
+      &instance_, callback__native, Tcallback__UserData::Free, callback__userData);
+}
+void Client::UnmergeIntoProvisionalAccount(
+  uint64_t applicationId,
+  discordpp::AuthenticationExternalAuthType externalAuthType,
+  std::string const& externalAuthToken,
+  discordpp::Client::UnmergeIntoProvisionalAccountCallback callback)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_String externalAuthToken__str{(uint8_t*)(externalAuthToken.data()),
+                                          externalAuthToken.size()};
+    using Tcallback__UserData = TDelegateUserData<std::remove_reference_t<decltype(callback)>>;
+    auto callback__userData = new Tcallback__UserData(callback);
+    Discord_Client_UnmergeIntoProvisionalAccountCallback callback__native = [](auto result,
+                                                                               void* userData__) {
+        auto userData__typed = static_cast<Tcallback__UserData*>(userData__);
+        discordpp::ClientResult result__obj(*result, DiscordObjectState::Owned);
+        userData__typed->delegate(std::move(result__obj));
+    };
+    Discord_Client_UnmergeIntoProvisionalAccount(
+      &instance_,
+      applicationId,
+      static_cast<Discord_AuthenticationExternalAuthType>(externalAuthType),
+      externalAuthToken__str,
+      callback__native,
+      Tcallback__UserData::Free,
+      callback__userData);
+}
+void Client::UpdateProvisionalAccountDisplayName(
+  std::string const& name,
+  discordpp::Client::UpdateProvisionalAccountDisplayNameCallback callback)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_String name__str{(uint8_t*)(name.data()), name.size()};
+    using Tcallback__UserData = TDelegateUserData<std::remove_reference_t<decltype(callback)>>;
+    auto callback__userData = new Tcallback__UserData(callback);
+    Discord_Client_UpdateProvisionalAccountDisplayNameCallback callback__native =
+      [](auto result, void* userData__) {
+          auto userData__typed = static_cast<Tcallback__UserData*>(userData__);
+          discordpp::ClientResult result__obj(*result, DiscordObjectState::Owned);
+          userData__typed->delegate(std::move(result__obj));
+      };
+    Discord_Client_UpdateProvisionalAccountDisplayName(
+      &instance_, name__str, callback__native, Tcallback__UserData::Free, callback__userData);
+}
+void Client::UpdateToken(discordpp::AuthorizationTokenType tokenType,
+                         std::string token,
+                         discordpp::Client::UpdateTokenCallback callback)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_String token__str{(uint8_t*)(token.data()), token.size()};
+    using Tcallback__UserData = TDelegateUserData<std::remove_reference_t<decltype(callback)>>;
+    auto callback__userData = new Tcallback__UserData(callback);
+    Discord_Client_UpdateTokenCallback callback__native = [](auto result, void* userData__) {
+        auto userData__typed = static_cast<Tcallback__UserData*>(userData__);
+        discordpp::ClientResult result__obj(*result, DiscordObjectState::Owned);
+        userData__typed->delegate(std::move(result__obj));
+    };
+    Discord_Client_UpdateToken(&instance_,
+                               static_cast<Discord_AuthorizationTokenType>(tokenType),
+                               token__str,
+                               callback__native,
+                               Tcallback__UserData::Free,
+                               callback__userData);
+}
+bool Client::CanOpenMessageInDiscord(uint64_t messageId)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    bool returnValue__;
+    returnValue__ = Discord_Client_CanOpenMessageInDiscord(&instance_, messageId);
+    return returnValue__;
+}
+void Client::DeleteUserMessage(uint64_t recipientId,
+                               uint64_t messageId,
+                               discordpp::Client::DeleteUserMessageCallback cb)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    using Tcb__UserData = TDelegateUserData<std::remove_reference_t<decltype(cb)>>;
+    auto cb__userData = new Tcb__UserData(cb);
+    Discord_Client_DeleteUserMessageCallback cb__native = [](auto result, void* userData__) {
+        auto userData__typed = static_cast<Tcb__UserData*>(userData__);
+        discordpp::ClientResult result__obj(*result, DiscordObjectState::Owned);
+        userData__typed->delegate(std::move(result__obj));
+    };
+    Discord_Client_DeleteUserMessage(
+      &instance_, recipientId, messageId, cb__native, Tcb__UserData::Free, cb__userData);
+}
+void Client::EditUserMessage(uint64_t recipientId,
+                             uint64_t messageId,
+                             std::string const& content,
+                             discordpp::Client::EditUserMessageCallback cb)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_String content__str{(uint8_t*)(content.data()), content.size()};
+    using Tcb__UserData = TDelegateUserData<std::remove_reference_t<decltype(cb)>>;
+    auto cb__userData = new Tcb__UserData(cb);
+    Discord_Client_EditUserMessageCallback cb__native = [](auto result, void* userData__) {
+        auto userData__typed = static_cast<Tcb__UserData*>(userData__);
+        discordpp::ClientResult result__obj(*result, DiscordObjectState::Owned);
+        userData__typed->delegate(std::move(result__obj));
+    };
+    Discord_Client_EditUserMessage(&instance_,
+                                   recipientId,
+                                   messageId,
+                                   content__str,
+                                   cb__native,
+                                   Tcb__UserData::Free,
+                                   cb__userData);
+}
+std::optional<discordpp::ChannelHandle> Client::GetChannelHandle(uint64_t channelId) const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    bool returnIsNonNull__;
+    Discord_ChannelHandle returnValueNative__;
+    returnIsNonNull__ =
+      Discord_Client_GetChannelHandle(&instance_, channelId, &returnValueNative__);
+    if (!returnIsNonNull__) {
+        return {};
+    }
+    discordpp::ChannelHandle returnValue__(returnValueNative__, DiscordObjectState::Owned);
+    return returnValue__;
+}
+void Client::GetLobbyMessagesWithLimit(uint64_t lobbyId,
+                                       int32_t limit,
+                                       discordpp::Client::GetLobbyMessagesCallback cb)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    using Tcb__UserData = TDelegateUserData<std::remove_reference_t<decltype(cb)>>;
+    auto cb__userData = new Tcb__UserData(cb);
+    Discord_Client_GetLobbyMessagesCallback cb__native =
+      [](auto result, auto messages, void* userData__) {
+          auto userData__typed = static_cast<Tcb__UserData*>(userData__);
+          discordpp::ClientResult result__obj(*result, DiscordObjectState::Owned);
+          std::vector<discordpp::MessageHandle> messages__vec;
+          messages__vec.reserve(messages.size);
+          for (size_t i__ = 0; i__ < messages.size; ++i__) {
+              messages__vec.emplace_back(messages.ptr[i__], DiscordObjectState::Owned);
+          }
+          Discord_Free(messages.ptr);
+          userData__typed->delegate(std::move(result__obj), std::move(messages__vec));
+      };
+    Discord_Client_GetLobbyMessagesWithLimit(
+      &instance_, lobbyId, limit, cb__native, Tcb__UserData::Free, cb__userData);
+}
+std::optional<discordpp::MessageHandle> Client::GetMessageHandle(uint64_t messageId) const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    bool returnIsNonNull__;
+    Discord_MessageHandle returnValueNative__;
+    returnIsNonNull__ =
+      Discord_Client_GetMessageHandle(&instance_, messageId, &returnValueNative__);
+    if (!returnIsNonNull__) {
+        return {};
+    }
+    discordpp::MessageHandle returnValue__(returnValueNative__, DiscordObjectState::Owned);
+    return returnValue__;
+}
+void Client::GetUserMessageSummaries(discordpp::Client::UserMessageSummariesCallback cb)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    using Tcb__UserData = TDelegateUserData<std::remove_reference_t<decltype(cb)>>;
+    auto cb__userData = new Tcb__UserData(cb);
+    Discord_Client_UserMessageSummariesCallback cb__native =
+      [](auto result, auto summaries, void* userData__) {
+          auto userData__typed = static_cast<Tcb__UserData*>(userData__);
+          discordpp::ClientResult result__obj(*result, DiscordObjectState::Owned);
+          std::vector<discordpp::UserMessageSummary> summaries__vec;
+          summaries__vec.reserve(summaries.size);
+          for (size_t i__ = 0; i__ < summaries.size; ++i__) {
+              summaries__vec.emplace_back(summaries.ptr[i__], DiscordObjectState::Owned);
+          }
+          Discord_Free(summaries.ptr);
+          userData__typed->delegate(std::move(result__obj), std::move(summaries__vec));
+      };
+    Discord_Client_GetUserMessageSummaries(
+      &instance_, cb__native, Tcb__UserData::Free, cb__userData);
+}
+void Client::GetUserMessagesWithLimit(uint64_t recipientId,
+                                      int32_t limit,
+                                      discordpp::Client::UserMessagesWithLimitCallback cb)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    using Tcb__UserData = TDelegateUserData<std::remove_reference_t<decltype(cb)>>;
+    auto cb__userData = new Tcb__UserData(cb);
+    Discord_Client_UserMessagesWithLimitCallback cb__native =
+      [](auto result, auto messages, void* userData__) {
+          auto userData__typed = static_cast<Tcb__UserData*>(userData__);
+          discordpp::ClientResult result__obj(*result, DiscordObjectState::Owned);
+          std::vector<discordpp::MessageHandle> messages__vec;
+          messages__vec.reserve(messages.size);
+          for (size_t i__ = 0; i__ < messages.size; ++i__) {
+              messages__vec.emplace_back(messages.ptr[i__], DiscordObjectState::Owned);
+          }
+          Discord_Free(messages.ptr);
+          userData__typed->delegate(std::move(result__obj), std::move(messages__vec));
+      };
+    Discord_Client_GetUserMessagesWithLimit(
+      &instance_, recipientId, limit, cb__native, Tcb__UserData::Free, cb__userData);
+}
+void Client::OpenMessageInDiscord(
+  uint64_t messageId,
+  discordpp::Client::ProvisionalUserMergeRequiredCallback provisionalUserMergeRequiredCallback,
+  discordpp::Client::OpenMessageInDiscordCallback callback)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    using TprovisionalUserMergeRequiredCallback__UserData =
+      TDelegateUserData<std::remove_reference_t<decltype(provisionalUserMergeRequiredCallback)>>;
+    auto provisionalUserMergeRequiredCallback__userData =
+      new TprovisionalUserMergeRequiredCallback__UserData(provisionalUserMergeRequiredCallback);
+    Discord_Client_ProvisionalUserMergeRequiredCallback
+      provisionalUserMergeRequiredCallback__native = [](void* userData__) {
+          auto userData__typed =
+            static_cast<TprovisionalUserMergeRequiredCallback__UserData*>(userData__);
+          userData__typed->delegate();
+      };
+    using Tcallback__UserData = TDelegateUserData<std::remove_reference_t<decltype(callback)>>;
+    auto callback__userData = new Tcallback__UserData(callback);
+    Discord_Client_OpenMessageInDiscordCallback callback__native = [](auto result,
+                                                                      void* userData__) {
+        auto userData__typed = static_cast<Tcallback__UserData*>(userData__);
+        discordpp::ClientResult result__obj(*result, DiscordObjectState::Owned);
+        userData__typed->delegate(std::move(result__obj));
+    };
+    Discord_Client_OpenMessageInDiscord(&instance_,
+                                        messageId,
+                                        provisionalUserMergeRequiredCallback__native,
+                                        TprovisionalUserMergeRequiredCallback__UserData::Free,
+                                        provisionalUserMergeRequiredCallback__userData,
+                                        callback__native,
+                                        Tcallback__UserData::Free,
+                                        callback__userData);
+}
+void Client::SendLobbyMessage(uint64_t lobbyId,
+                              std::string const& content,
+                              discordpp::Client::SendUserMessageCallback cb)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_String content__str{(uint8_t*)(content.data()), content.size()};
+    using Tcb__UserData = TDelegateUserData<std::remove_reference_t<decltype(cb)>>;
+    auto cb__userData = new Tcb__UserData(cb);
+    Discord_Client_SendUserMessageCallback cb__native =
+      [](auto result, auto messageId, void* userData__) {
+          auto userData__typed = static_cast<Tcb__UserData*>(userData__);
+          discordpp::ClientResult result__obj(*result, DiscordObjectState::Owned);
+          userData__typed->delegate(std::move(result__obj), messageId);
+      };
+    Discord_Client_SendLobbyMessage(
+      &instance_, lobbyId, content__str, cb__native, Tcb__UserData::Free, cb__userData);
+}
+void Client::SendLobbyMessageWithMetadata(
+  uint64_t lobbyId,
+  std::string const& content,
+  std::unordered_map<std::string, std::string> const& metadata,
+  discordpp::Client::SendUserMessageCallback cb)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_String content__str{(uint8_t*)(content.data()), content.size()};
+    ConvertedProperties metadata__convert(metadata);
+    using Tcb__UserData = TDelegateUserData<std::remove_reference_t<decltype(cb)>>;
+    auto cb__userData = new Tcb__UserData(cb);
+    Discord_Client_SendUserMessageCallback cb__native =
+      [](auto result, auto messageId, void* userData__) {
+          auto userData__typed = static_cast<Tcb__UserData*>(userData__);
+          discordpp::ClientResult result__obj(*result, DiscordObjectState::Owned);
+          userData__typed->delegate(std::move(result__obj), messageId);
+      };
+    Discord_Client_SendLobbyMessageWithMetadata(&instance_,
+                                                lobbyId,
+                                                content__str,
+                                                metadata__convert.Properties,
+                                                cb__native,
+                                                Tcb__UserData::Free,
+                                                cb__userData);
+}
+void Client::SendUserMessage(uint64_t recipientId,
+                             std::string const& content,
+                             discordpp::Client::SendUserMessageCallback cb)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_String content__str{(uint8_t*)(content.data()), content.size()};
+    using Tcb__UserData = TDelegateUserData<std::remove_reference_t<decltype(cb)>>;
+    auto cb__userData = new Tcb__UserData(cb);
+    Discord_Client_SendUserMessageCallback cb__native =
+      [](auto result, auto messageId, void* userData__) {
+          auto userData__typed = static_cast<Tcb__UserData*>(userData__);
+          discordpp::ClientResult result__obj(*result, DiscordObjectState::Owned);
+          userData__typed->delegate(std::move(result__obj), messageId);
+      };
+    Discord_Client_SendUserMessage(
+      &instance_, recipientId, content__str, cb__native, Tcb__UserData::Free, cb__userData);
+}
+void Client::SendUserMessageWithMetadata(
+  uint64_t recipientId,
+  std::string const& content,
+  std::unordered_map<std::string, std::string> const& metadata,
+  discordpp::Client::SendUserMessageCallback cb)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_String content__str{(uint8_t*)(content.data()), content.size()};
+    ConvertedProperties metadata__convert(metadata);
+    using Tcb__UserData = TDelegateUserData<std::remove_reference_t<decltype(cb)>>;
+    auto cb__userData = new Tcb__UserData(cb);
+    Discord_Client_SendUserMessageCallback cb__native =
+      [](auto result, auto messageId, void* userData__) {
+          auto userData__typed = static_cast<Tcb__UserData*>(userData__);
+          discordpp::ClientResult result__obj(*result, DiscordObjectState::Owned);
+          userData__typed->delegate(std::move(result__obj), messageId);
+      };
+    Discord_Client_SendUserMessageWithMetadata(&instance_,
+                                               recipientId,
+                                               content__str,
+                                               metadata__convert.Properties,
+                                               cb__native,
+                                               Tcb__UserData::Free,
+                                               cb__userData);
+}
+void Client::SetMessageCreatedCallback(discordpp::Client::MessageCreatedCallback cb)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    using Tcb__UserData = TDelegateUserData<std::remove_reference_t<decltype(cb)>>;
+    auto cb__userData = new Tcb__UserData(cb);
+    Discord_Client_MessageCreatedCallback cb__native = [](auto messageId, void* userData__) {
+        auto userData__typed = static_cast<Tcb__UserData*>(userData__);
+        userData__typed->delegate(messageId);
+    };
+    Discord_Client_SetMessageCreatedCallback(
+      &instance_, cb__native, Tcb__UserData::Free, cb__userData);
+}
+void Client::SetMessageDeletedCallback(discordpp::Client::MessageDeletedCallback cb)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    using Tcb__UserData = TDelegateUserData<std::remove_reference_t<decltype(cb)>>;
+    auto cb__userData = new Tcb__UserData(cb);
+    Discord_Client_MessageDeletedCallback cb__native =
+      [](auto messageId, auto channelId, void* userData__) {
+          auto userData__typed = static_cast<Tcb__UserData*>(userData__);
+          userData__typed->delegate(messageId, channelId);
+      };
+    Discord_Client_SetMessageDeletedCallback(
+      &instance_, cb__native, Tcb__UserData::Free, cb__userData);
+}
+void Client::SetMessageUpdatedCallback(discordpp::Client::MessageUpdatedCallback cb)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    using Tcb__UserData = TDelegateUserData<std::remove_reference_t<decltype(cb)>>;
+    auto cb__userData = new Tcb__UserData(cb);
+    Discord_Client_MessageUpdatedCallback cb__native = [](auto messageId, void* userData__) {
+        auto userData__typed = static_cast<Tcb__UserData*>(userData__);
+        userData__typed->delegate(messageId);
+    };
+    Discord_Client_SetMessageUpdatedCallback(
+      &instance_, cb__native, Tcb__UserData::Free, cb__userData);
+}
+void Client::SetShowingChat(bool showingChat)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_Client_SetShowingChat(&instance_, showingChat);
+}
+void Client::AddLogCallback(discordpp::Client::LogCallback callback,
+                            discordpp::LoggingSeverity minSeverity)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    using Tcallback__UserData = TDelegateUserData<std::remove_reference_t<decltype(callback)>>;
+    auto callback__userData = new Tcallback__UserData(callback);
+    Discord_Client_LogCallback callback__native = [](
+                                                    auto message, auto severity, void* userData__) {
+        auto userData__typed = static_cast<Tcallback__UserData*>(userData__);
+        std::string message__str(reinterpret_cast<char*>(message.ptr), message.size);
+        userData__typed->delegate(std::move(message__str),
+                                  static_cast<discordpp::LoggingSeverity>(severity));
+        Discord_Free(message.ptr);
+    };
+    Discord_Client_AddLogCallback(&instance_,
+                                  callback__native,
+                                  Tcallback__UserData::Free,
+                                  callback__userData,
+                                  static_cast<Discord_LoggingSeverity>(minSeverity));
+}
+void Client::AddVoiceLogCallback(discordpp::Client::LogCallback callback,
+                                 discordpp::LoggingSeverity minSeverity)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    using Tcallback__UserData = TDelegateUserData<std::remove_reference_t<decltype(callback)>>;
+    auto callback__userData = new Tcallback__UserData(callback);
+    Discord_Client_LogCallback callback__native = [](
+                                                    auto message, auto severity, void* userData__) {
+        auto userData__typed = static_cast<Tcallback__UserData*>(userData__);
+        std::string message__str(reinterpret_cast<char*>(message.ptr), message.size);
+        userData__typed->delegate(std::move(message__str),
+                                  static_cast<discordpp::LoggingSeverity>(severity));
+        Discord_Free(message.ptr);
+    };
+    Discord_Client_AddVoiceLogCallback(&instance_,
+                                       callback__native,
+                                       Tcallback__UserData::Free,
+                                       callback__userData,
+                                       static_cast<Discord_LoggingSeverity>(minSeverity));
+}
+void Client::Connect()
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_Client_Connect(&instance_);
+}
+void Client::Disconnect()
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_Client_Disconnect(&instance_);
+}
+discordpp::Client::Status Client::GetStatus() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_Client_Status returnValue__;
+    returnValue__ = Discord_Client_GetStatus(&instance_);
+    return static_cast<discordpp::Client::Status>(returnValue__);
+}
+void Client::OpenConnectedGamesSettingsInDiscord(
+  discordpp::Client::OpenConnectedGamesSettingsInDiscordCallback callback)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    using Tcallback__UserData = TDelegateUserData<std::remove_reference_t<decltype(callback)>>;
+    auto callback__userData = new Tcallback__UserData(callback);
+    Discord_Client_OpenConnectedGamesSettingsInDiscordCallback callback__native =
+      [](auto result, void* userData__) {
+          auto userData__typed = static_cast<Tcallback__UserData*>(userData__);
+          discordpp::ClientResult result__obj(*result, DiscordObjectState::Owned);
+          userData__typed->delegate(std::move(result__obj));
+      };
+    Discord_Client_OpenConnectedGamesSettingsInDiscord(
+      &instance_, callback__native, Tcallback__UserData::Free, callback__userData);
+}
+void Client::SetApplicationId(uint64_t applicationId)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_Client_SetApplicationId(&instance_, applicationId);
+}
+bool Client::SetLogDir(std::string const& path, discordpp::LoggingSeverity minSeverity)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    bool returnValue__;
+    Discord_String path__str{(uint8_t*)(path.data()), path.size()};
+    returnValue__ = Discord_Client_SetLogDir(
+      &instance_, path__str, static_cast<Discord_LoggingSeverity>(minSeverity));
+    return returnValue__;
+}
+void Client::SetStatusChangedCallback(discordpp::Client::OnStatusChanged cb)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    using Tcb__UserData = TDelegateUserData<std::remove_reference_t<decltype(cb)>>;
+    auto cb__userData = new Tcb__UserData(cb);
+    Discord_Client_OnStatusChanged cb__native =
+      [](auto status, auto error, auto errorDetail, void* userData__) {
+          auto userData__typed = static_cast<Tcb__UserData*>(userData__);
+          userData__typed->delegate(static_cast<discordpp::Client::Status>(status),
+                                    static_cast<discordpp::Client::Error>(error),
+                                    errorDetail);
+      };
+    Discord_Client_SetStatusChangedCallback(
+      &instance_, cb__native, Tcb__UserData::Free, cb__userData);
+}
+void Client::SetVoiceLogDir(std::string const& path, discordpp::LoggingSeverity minSeverity)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_String path__str{(uint8_t*)(path.data()), path.size()};
+    Discord_Client_SetVoiceLogDir(
+      &instance_, path__str, static_cast<Discord_LoggingSeverity>(minSeverity));
+}
+void Client::CreateOrJoinLobby(std::string const& secret,
+                               discordpp::Client::CreateOrJoinLobbyCallback callback)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_String secret__str{(uint8_t*)(secret.data()), secret.size()};
+    using Tcallback__UserData = TDelegateUserData<std::remove_reference_t<decltype(callback)>>;
+    auto callback__userData = new Tcallback__UserData(callback);
+    Discord_Client_CreateOrJoinLobbyCallback callback__native =
+      [](auto result, auto lobbyId, void* userData__) {
+          auto userData__typed = static_cast<Tcallback__UserData*>(userData__);
+          discordpp::ClientResult result__obj(*result, DiscordObjectState::Owned);
+          userData__typed->delegate(std::move(result__obj), lobbyId);
+      };
+    Discord_Client_CreateOrJoinLobby(
+      &instance_, secret__str, callback__native, Tcallback__UserData::Free, callback__userData);
+}
+void Client::CreateOrJoinLobbyWithMetadata(
+  std::string const& secret,
+  std::unordered_map<std::string, std::string> const& lobbyMetadata,
+  std::unordered_map<std::string, std::string> const& memberMetadata,
+  discordpp::Client::CreateOrJoinLobbyCallback callback)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_String secret__str{(uint8_t*)(secret.data()), secret.size()};
+    ConvertedProperties lobbyMetadata__convert(lobbyMetadata);
+    ConvertedProperties memberMetadata__convert(memberMetadata);
+    using Tcallback__UserData = TDelegateUserData<std::remove_reference_t<decltype(callback)>>;
+    auto callback__userData = new Tcallback__UserData(callback);
+    Discord_Client_CreateOrJoinLobbyCallback callback__native =
+      [](auto result, auto lobbyId, void* userData__) {
+          auto userData__typed = static_cast<Tcallback__UserData*>(userData__);
+          discordpp::ClientResult result__obj(*result, DiscordObjectState::Owned);
+          userData__typed->delegate(std::move(result__obj), lobbyId);
+      };
+    Discord_Client_CreateOrJoinLobbyWithMetadata(&instance_,
+                                                 secret__str,
+                                                 lobbyMetadata__convert.Properties,
+                                                 memberMetadata__convert.Properties,
+                                                 callback__native,
+                                                 Tcallback__UserData::Free,
+                                                 callback__userData);
+}
+void Client::GetGuildChannels(uint64_t guildId, discordpp::Client::GetGuildChannelsCallback cb)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    using Tcb__UserData = TDelegateUserData<std::remove_reference_t<decltype(cb)>>;
+    auto cb__userData = new Tcb__UserData(cb);
+    Discord_Client_GetGuildChannelsCallback cb__native =
+      [](auto result, auto guildChannels, void* userData__) {
+          auto userData__typed = static_cast<Tcb__UserData*>(userData__);
+          discordpp::ClientResult result__obj(*result, DiscordObjectState::Owned);
+          std::vector<discordpp::GuildChannel> guildChannels__vec;
+          guildChannels__vec.reserve(guildChannels.size);
+          for (size_t i__ = 0; i__ < guildChannels.size; ++i__) {
+              guildChannels__vec.emplace_back(guildChannels.ptr[i__], DiscordObjectState::Owned);
+          }
+          Discord_Free(guildChannels.ptr);
+          userData__typed->delegate(std::move(result__obj), std::move(guildChannels__vec));
+      };
+    Discord_Client_GetGuildChannels(
+      &instance_, guildId, cb__native, Tcb__UserData::Free, cb__userData);
+}
+std::optional<discordpp::LobbyHandle> Client::GetLobbyHandle(uint64_t lobbyId) const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    bool returnIsNonNull__;
+    Discord_LobbyHandle returnValueNative__;
+    returnIsNonNull__ = Discord_Client_GetLobbyHandle(&instance_, lobbyId, &returnValueNative__);
+    if (!returnIsNonNull__) {
+        return {};
+    }
+    discordpp::LobbyHandle returnValue__(returnValueNative__, DiscordObjectState::Owned);
+    return returnValue__;
+}
+std::vector<uint64_t> Client::GetLobbyIds() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_UInt64Span returnValueNative__;
+    Discord_Client_GetLobbyIds(&instance_, &returnValueNative__);
+    std::vector<uint64_t> returnValue__(returnValueNative__.ptr,
+                                        returnValueNative__.ptr + returnValueNative__.size);
+    Discord_Free(returnValueNative__.ptr);
+    return returnValue__;
+}
+void Client::GetUserGuilds(discordpp::Client::GetUserGuildsCallback cb)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    using Tcb__UserData = TDelegateUserData<std::remove_reference_t<decltype(cb)>>;
+    auto cb__userData = new Tcb__UserData(cb);
+    Discord_Client_GetUserGuildsCallback cb__native =
+      [](auto result, auto guilds, void* userData__) {
+          auto userData__typed = static_cast<Tcb__UserData*>(userData__);
+          discordpp::ClientResult result__obj(*result, DiscordObjectState::Owned);
+          std::vector<discordpp::GuildMinimal> guilds__vec;
+          guilds__vec.reserve(guilds.size);
+          for (size_t i__ = 0; i__ < guilds.size; ++i__) {
+              guilds__vec.emplace_back(guilds.ptr[i__], DiscordObjectState::Owned);
+          }
+          Discord_Free(guilds.ptr);
+          userData__typed->delegate(std::move(result__obj), std::move(guilds__vec));
+      };
+    Discord_Client_GetUserGuilds(&instance_, cb__native, Tcb__UserData::Free, cb__userData);
+}
+void Client::JoinLinkedLobbyGuild(
+  uint64_t lobbyId,
+  discordpp::Client::ProvisionalUserMergeRequiredCallback provisionalUserMergeRequiredCallback,
+  discordpp::Client::JoinLinkedLobbyGuildCallback callback)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    using TprovisionalUserMergeRequiredCallback__UserData =
+      TDelegateUserData<std::remove_reference_t<decltype(provisionalUserMergeRequiredCallback)>>;
+    auto provisionalUserMergeRequiredCallback__userData =
+      new TprovisionalUserMergeRequiredCallback__UserData(provisionalUserMergeRequiredCallback);
+    Discord_Client_ProvisionalUserMergeRequiredCallback
+      provisionalUserMergeRequiredCallback__native = [](void* userData__) {
+          auto userData__typed =
+            static_cast<TprovisionalUserMergeRequiredCallback__UserData*>(userData__);
+          userData__typed->delegate();
+      };
+    using Tcallback__UserData = TDelegateUserData<std::remove_reference_t<decltype(callback)>>;
+    auto callback__userData = new Tcallback__UserData(callback);
+    Discord_Client_JoinLinkedLobbyGuildCallback callback__native =
+      [](auto result, auto inviteUrl, void* userData__) {
+          auto userData__typed = static_cast<Tcallback__UserData*>(userData__);
+          discordpp::ClientResult result__obj(*result, DiscordObjectState::Owned);
+          std::string inviteUrl__str(reinterpret_cast<char*>(inviteUrl.ptr), inviteUrl.size);
+          userData__typed->delegate(std::move(result__obj), std::move(inviteUrl__str));
+          Discord_Free(inviteUrl.ptr);
+      };
+    Discord_Client_JoinLinkedLobbyGuild(&instance_,
+                                        lobbyId,
+                                        provisionalUserMergeRequiredCallback__native,
+                                        TprovisionalUserMergeRequiredCallback__UserData::Free,
+                                        provisionalUserMergeRequiredCallback__userData,
+                                        callback__native,
+                                        Tcallback__UserData::Free,
+                                        callback__userData);
+}
+void Client::LeaveLobby(uint64_t lobbyId, discordpp::Client::LeaveLobbyCallback callback)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    using Tcallback__UserData = TDelegateUserData<std::remove_reference_t<decltype(callback)>>;
+    auto callback__userData = new Tcallback__UserData(callback);
+    Discord_Client_LeaveLobbyCallback callback__native = [](auto result, void* userData__) {
+        auto userData__typed = static_cast<Tcallback__UserData*>(userData__);
+        discordpp::ClientResult result__obj(*result, DiscordObjectState::Owned);
+        userData__typed->delegate(std::move(result__obj));
+    };
+    Discord_Client_LeaveLobby(
+      &instance_, lobbyId, callback__native, Tcallback__UserData::Free, callback__userData);
+}
+void Client::LinkChannelToLobby(uint64_t lobbyId,
+                                uint64_t channelId,
+                                discordpp::Client::LinkOrUnlinkChannelCallback callback)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    using Tcallback__UserData = TDelegateUserData<std::remove_reference_t<decltype(callback)>>;
+    auto callback__userData = new Tcallback__UserData(callback);
+    Discord_Client_LinkOrUnlinkChannelCallback callback__native = [](auto result,
+                                                                     void* userData__) {
+        auto userData__typed = static_cast<Tcallback__UserData*>(userData__);
+        discordpp::ClientResult result__obj(*result, DiscordObjectState::Owned);
+        userData__typed->delegate(std::move(result__obj));
+    };
+    Discord_Client_LinkChannelToLobby(&instance_,
+                                      lobbyId,
+                                      channelId,
+                                      callback__native,
+                                      Tcallback__UserData::Free,
+                                      callback__userData);
+}
+void Client::SetLobbyCreatedCallback(discordpp::Client::LobbyCreatedCallback cb)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    using Tcb__UserData = TDelegateUserData<std::remove_reference_t<decltype(cb)>>;
+    auto cb__userData = new Tcb__UserData(cb);
+    Discord_Client_LobbyCreatedCallback cb__native = [](auto lobbyId, void* userData__) {
+        auto userData__typed = static_cast<Tcb__UserData*>(userData__);
+        userData__typed->delegate(lobbyId);
+    };
+    Discord_Client_SetLobbyCreatedCallback(
+      &instance_, cb__native, Tcb__UserData::Free, cb__userData);
+}
+void Client::SetLobbyDeletedCallback(discordpp::Client::LobbyDeletedCallback cb)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    using Tcb__UserData = TDelegateUserData<std::remove_reference_t<decltype(cb)>>;
+    auto cb__userData = new Tcb__UserData(cb);
+    Discord_Client_LobbyDeletedCallback cb__native = [](auto lobbyId, void* userData__) {
+        auto userData__typed = static_cast<Tcb__UserData*>(userData__);
+        userData__typed->delegate(lobbyId);
+    };
+    Discord_Client_SetLobbyDeletedCallback(
+      &instance_, cb__native, Tcb__UserData::Free, cb__userData);
+}
+void Client::SetLobbyMemberAddedCallback(discordpp::Client::LobbyMemberAddedCallback cb)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    using Tcb__UserData = TDelegateUserData<std::remove_reference_t<decltype(cb)>>;
+    auto cb__userData = new Tcb__UserData(cb);
+    Discord_Client_LobbyMemberAddedCallback cb__native =
+      [](auto lobbyId, auto memberId, void* userData__) {
+          auto userData__typed = static_cast<Tcb__UserData*>(userData__);
+          userData__typed->delegate(lobbyId, memberId);
+      };
+    Discord_Client_SetLobbyMemberAddedCallback(
+      &instance_, cb__native, Tcb__UserData::Free, cb__userData);
+}
+void Client::SetLobbyMemberRemovedCallback(discordpp::Client::LobbyMemberRemovedCallback cb)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    using Tcb__UserData = TDelegateUserData<std::remove_reference_t<decltype(cb)>>;
+    auto cb__userData = new Tcb__UserData(cb);
+    Discord_Client_LobbyMemberRemovedCallback cb__native =
+      [](auto lobbyId, auto memberId, void* userData__) {
+          auto userData__typed = static_cast<Tcb__UserData*>(userData__);
+          userData__typed->delegate(lobbyId, memberId);
+      };
+    Discord_Client_SetLobbyMemberRemovedCallback(
+      &instance_, cb__native, Tcb__UserData::Free, cb__userData);
+}
+void Client::SetLobbyMemberUpdatedCallback(discordpp::Client::LobbyMemberUpdatedCallback cb)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    using Tcb__UserData = TDelegateUserData<std::remove_reference_t<decltype(cb)>>;
+    auto cb__userData = new Tcb__UserData(cb);
+    Discord_Client_LobbyMemberUpdatedCallback cb__native =
+      [](auto lobbyId, auto memberId, void* userData__) {
+          auto userData__typed = static_cast<Tcb__UserData*>(userData__);
+          userData__typed->delegate(lobbyId, memberId);
+      };
+    Discord_Client_SetLobbyMemberUpdatedCallback(
+      &instance_, cb__native, Tcb__UserData::Free, cb__userData);
+}
+void Client::SetLobbyUpdatedCallback(discordpp::Client::LobbyUpdatedCallback cb)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    using Tcb__UserData = TDelegateUserData<std::remove_reference_t<decltype(cb)>>;
+    auto cb__userData = new Tcb__UserData(cb);
+    Discord_Client_LobbyUpdatedCallback cb__native = [](auto lobbyId, void* userData__) {
+        auto userData__typed = static_cast<Tcb__UserData*>(userData__);
+        userData__typed->delegate(lobbyId);
+    };
+    Discord_Client_SetLobbyUpdatedCallback(
+      &instance_, cb__native, Tcb__UserData::Free, cb__userData);
+}
+void Client::UnlinkChannelFromLobby(uint64_t lobbyId,
+                                    discordpp::Client::LinkOrUnlinkChannelCallback callback)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    using Tcallback__UserData = TDelegateUserData<std::remove_reference_t<decltype(callback)>>;
+    auto callback__userData = new Tcallback__UserData(callback);
+    Discord_Client_LinkOrUnlinkChannelCallback callback__native = [](auto result,
+                                                                     void* userData__) {
+        auto userData__typed = static_cast<Tcallback__UserData*>(userData__);
+        discordpp::ClientResult result__obj(*result, DiscordObjectState::Owned);
+        userData__typed->delegate(std::move(result__obj));
+    };
+    Discord_Client_UnlinkChannelFromLobby(
+      &instance_, lobbyId, callback__native, Tcallback__UserData::Free, callback__userData);
+}
+void Client::IsDiscordAppInstalled(discordpp::Client::IsDiscordAppInstalledCallback callback)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    using Tcallback__UserData = TDelegateUserData<std::remove_reference_t<decltype(callback)>>;
+    auto callback__userData = new Tcallback__UserData(callback);
+    Discord_Client_IsDiscordAppInstalledCallback callback__native = [](auto installed,
+                                                                       void* userData__) {
+        auto userData__typed = static_cast<Tcallback__UserData*>(userData__);
+        userData__typed->delegate(installed);
+    };
+    Discord_Client_IsDiscordAppInstalled(
+      &instance_, callback__native, Tcallback__UserData::Free, callback__userData);
+}
+void Client::AcceptActivityInvite(discordpp::ActivityInvite invite,
+                                  discordpp::Client::AcceptActivityInviteCallback cb)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    using Tcb__UserData = TDelegateUserData<std::remove_reference_t<decltype(cb)>>;
+    auto cb__userData = new Tcb__UserData(cb);
+    Discord_Client_AcceptActivityInviteCallback cb__native =
+      [](auto result, auto joinSecret, void* userData__) {
+          auto userData__typed = static_cast<Tcb__UserData*>(userData__);
+          discordpp::ClientResult result__obj(*result, DiscordObjectState::Owned);
+          std::string joinSecret__str(reinterpret_cast<char*>(joinSecret.ptr), joinSecret.size);
+          userData__typed->delegate(std::move(result__obj), std::move(joinSecret__str));
+          Discord_Free(joinSecret.ptr);
+      };
+    Discord_Client_AcceptActivityInvite(
+      &instance_, invite.instance(), cb__native, Tcb__UserData::Free, cb__userData);
+}
+void Client::ClearRichPresence()
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_Client_ClearRichPresence(&instance_);
+}
+bool Client::RegisterLaunchCommand(uint64_t applicationId, std::string command)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    bool returnValue__;
+    Discord_String command__str{(uint8_t*)(command.data()), command.size()};
+    returnValue__ = Discord_Client_RegisterLaunchCommand(&instance_, applicationId, command__str);
+    return returnValue__;
+}
+bool Client::RegisterLaunchSteamApplication(uint64_t applicationId, uint32_t steamAppId)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    bool returnValue__;
+    returnValue__ =
+      Discord_Client_RegisterLaunchSteamApplication(&instance_, applicationId, steamAppId);
+    return returnValue__;
+}
+void Client::SendActivityInvite(uint64_t userId,
+                                std::string const& content,
+                                discordpp::Client::SendActivityInviteCallback cb)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_String content__str{(uint8_t*)(content.data()), content.size()};
+    using Tcb__UserData = TDelegateUserData<std::remove_reference_t<decltype(cb)>>;
+    auto cb__userData = new Tcb__UserData(cb);
+    Discord_Client_SendActivityInviteCallback cb__native = [](auto result, void* userData__) {
+        auto userData__typed = static_cast<Tcb__UserData*>(userData__);
+        discordpp::ClientResult result__obj(*result, DiscordObjectState::Owned);
+        userData__typed->delegate(std::move(result__obj));
+    };
+    Discord_Client_SendActivityInvite(
+      &instance_, userId, content__str, cb__native, Tcb__UserData::Free, cb__userData);
+}
+void Client::SendActivityJoinRequest(uint64_t userId,
+                                     discordpp::Client::SendActivityInviteCallback cb)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    using Tcb__UserData = TDelegateUserData<std::remove_reference_t<decltype(cb)>>;
+    auto cb__userData = new Tcb__UserData(cb);
+    Discord_Client_SendActivityInviteCallback cb__native = [](auto result, void* userData__) {
+        auto userData__typed = static_cast<Tcb__UserData*>(userData__);
+        discordpp::ClientResult result__obj(*result, DiscordObjectState::Owned);
+        userData__typed->delegate(std::move(result__obj));
+    };
+    Discord_Client_SendActivityJoinRequest(
+      &instance_, userId, cb__native, Tcb__UserData::Free, cb__userData);
+}
+void Client::SendActivityJoinRequestReply(discordpp::ActivityInvite invite,
+                                          discordpp::Client::SendActivityInviteCallback cb)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    using Tcb__UserData = TDelegateUserData<std::remove_reference_t<decltype(cb)>>;
+    auto cb__userData = new Tcb__UserData(cb);
+    Discord_Client_SendActivityInviteCallback cb__native = [](auto result, void* userData__) {
+        auto userData__typed = static_cast<Tcb__UserData*>(userData__);
+        discordpp::ClientResult result__obj(*result, DiscordObjectState::Owned);
+        userData__typed->delegate(std::move(result__obj));
+    };
+    Discord_Client_SendActivityJoinRequestReply(
+      &instance_, invite.instance(), cb__native, Tcb__UserData::Free, cb__userData);
+}
+void Client::SetActivityInviteCreatedCallback(discordpp::Client::ActivityInviteCallback cb)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    using Tcb__UserData = TDelegateUserData<std::remove_reference_t<decltype(cb)>>;
+    auto cb__userData = new Tcb__UserData(cb);
+    Discord_Client_ActivityInviteCallback cb__native = [](auto invite, void* userData__) {
+        auto userData__typed = static_cast<Tcb__UserData*>(userData__);
+        discordpp::ActivityInvite invite__obj(*invite, DiscordObjectState::Owned);
+        userData__typed->delegate(std::move(invite__obj));
+    };
+    Discord_Client_SetActivityInviteCreatedCallback(
+      &instance_, cb__native, Tcb__UserData::Free, cb__userData);
+}
+void Client::SetActivityInviteUpdatedCallback(discordpp::Client::ActivityInviteCallback cb)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    using Tcb__UserData = TDelegateUserData<std::remove_reference_t<decltype(cb)>>;
+    auto cb__userData = new Tcb__UserData(cb);
+    Discord_Client_ActivityInviteCallback cb__native = [](auto invite, void* userData__) {
+        auto userData__typed = static_cast<Tcb__UserData*>(userData__);
+        discordpp::ActivityInvite invite__obj(*invite, DiscordObjectState::Owned);
+        userData__typed->delegate(std::move(invite__obj));
+    };
+    Discord_Client_SetActivityInviteUpdatedCallback(
+      &instance_, cb__native, Tcb__UserData::Free, cb__userData);
+}
+void Client::SetActivityJoinCallback(discordpp::Client::ActivityJoinCallback cb)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    using Tcb__UserData = TDelegateUserData<std::remove_reference_t<decltype(cb)>>;
+    auto cb__userData = new Tcb__UserData(cb);
+    Discord_Client_ActivityJoinCallback cb__native = [](auto joinSecret, void* userData__) {
+        auto userData__typed = static_cast<Tcb__UserData*>(userData__);
+        std::string joinSecret__str(reinterpret_cast<char*>(joinSecret.ptr), joinSecret.size);
+        userData__typed->delegate(std::move(joinSecret__str));
+        Discord_Free(joinSecret.ptr);
+    };
+    Discord_Client_SetActivityJoinCallback(
+      &instance_, cb__native, Tcb__UserData::Free, cb__userData);
+}
+void Client::SetActivityJoinWithApplicationCallback(
+  discordpp::Client::ActivityJoinWithApplicationCallback cb)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    using Tcb__UserData = TDelegateUserData<std::remove_reference_t<decltype(cb)>>;
+    auto cb__userData = new Tcb__UserData(cb);
+    Discord_Client_ActivityJoinWithApplicationCallback cb__native =
+      [](auto applicationId, auto joinSecret, void* userData__) {
+          auto userData__typed = static_cast<Tcb__UserData*>(userData__);
+          std::string joinSecret__str(reinterpret_cast<char*>(joinSecret.ptr), joinSecret.size);
+          userData__typed->delegate(applicationId, std::move(joinSecret__str));
+          Discord_Free(joinSecret.ptr);
+      };
+    Discord_Client_SetActivityJoinWithApplicationCallback(
+      &instance_, cb__native, Tcb__UserData::Free, cb__userData);
+}
+void Client::SetOnlineStatus(discordpp::StatusType status,
+                             discordpp::Client::UpdateStatusCallback callback)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    using Tcallback__UserData = TDelegateUserData<std::remove_reference_t<decltype(callback)>>;
+    auto callback__userData = new Tcallback__UserData(callback);
+    Discord_Client_UpdateStatusCallback callback__native = [](auto result, void* userData__) {
+        auto userData__typed = static_cast<Tcallback__UserData*>(userData__);
+        discordpp::ClientResult result__obj(*result, DiscordObjectState::Owned);
+        userData__typed->delegate(std::move(result__obj));
+    };
+    Discord_Client_SetOnlineStatus(&instance_,
+                                   static_cast<Discord_StatusType>(status),
+                                   callback__native,
+                                   Tcallback__UserData::Free,
+                                   callback__userData);
+}
+void Client::UpdateRichPresence(discordpp::Activity activity,
+                                discordpp::Client::UpdateRichPresenceCallback cb)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    using Tcb__UserData = TDelegateUserData<std::remove_reference_t<decltype(cb)>>;
+    auto cb__userData = new Tcb__UserData(cb);
+    Discord_Client_UpdateRichPresenceCallback cb__native = [](auto result, void* userData__) {
+        auto userData__typed = static_cast<Tcb__UserData*>(userData__);
+        discordpp::ClientResult result__obj(*result, DiscordObjectState::Owned);
+        userData__typed->delegate(std::move(result__obj));
+    };
+    Discord_Client_UpdateRichPresence(
+      &instance_, activity.instance(), cb__native, Tcb__UserData::Free, cb__userData);
+}
+void Client::AcceptDiscordFriendRequest(uint64_t userId,
+                                        discordpp::Client::UpdateRelationshipCallback cb)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    using Tcb__UserData = TDelegateUserData<std::remove_reference_t<decltype(cb)>>;
+    auto cb__userData = new Tcb__UserData(cb);
+    Discord_Client_UpdateRelationshipCallback cb__native = [](auto result, void* userData__) {
+        auto userData__typed = static_cast<Tcb__UserData*>(userData__);
+        discordpp::ClientResult result__obj(*result, DiscordObjectState::Owned);
+        userData__typed->delegate(std::move(result__obj));
+    };
+    Discord_Client_AcceptDiscordFriendRequest(
+      &instance_, userId, cb__native, Tcb__UserData::Free, cb__userData);
+}
+void Client::AcceptGameFriendRequest(uint64_t userId,
+                                     discordpp::Client::UpdateRelationshipCallback cb)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    using Tcb__UserData = TDelegateUserData<std::remove_reference_t<decltype(cb)>>;
+    auto cb__userData = new Tcb__UserData(cb);
+    Discord_Client_UpdateRelationshipCallback cb__native = [](auto result, void* userData__) {
+        auto userData__typed = static_cast<Tcb__UserData*>(userData__);
+        discordpp::ClientResult result__obj(*result, DiscordObjectState::Owned);
+        userData__typed->delegate(std::move(result__obj));
+    };
+    Discord_Client_AcceptGameFriendRequest(
+      &instance_, userId, cb__native, Tcb__UserData::Free, cb__userData);
+}
+void Client::BlockUser(uint64_t userId, discordpp::Client::UpdateRelationshipCallback cb)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    using Tcb__UserData = TDelegateUserData<std::remove_reference_t<decltype(cb)>>;
+    auto cb__userData = new Tcb__UserData(cb);
+    Discord_Client_UpdateRelationshipCallback cb__native = [](auto result, void* userData__) {
+        auto userData__typed = static_cast<Tcb__UserData*>(userData__);
+        discordpp::ClientResult result__obj(*result, DiscordObjectState::Owned);
+        userData__typed->delegate(std::move(result__obj));
+    };
+    Discord_Client_BlockUser(&instance_, userId, cb__native, Tcb__UserData::Free, cb__userData);
+}
+void Client::CancelDiscordFriendRequest(uint64_t userId,
+                                        discordpp::Client::UpdateRelationshipCallback cb)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    using Tcb__UserData = TDelegateUserData<std::remove_reference_t<decltype(cb)>>;
+    auto cb__userData = new Tcb__UserData(cb);
+    Discord_Client_UpdateRelationshipCallback cb__native = [](auto result, void* userData__) {
+        auto userData__typed = static_cast<Tcb__UserData*>(userData__);
+        discordpp::ClientResult result__obj(*result, DiscordObjectState::Owned);
+        userData__typed->delegate(std::move(result__obj));
+    };
+    Discord_Client_CancelDiscordFriendRequest(
+      &instance_, userId, cb__native, Tcb__UserData::Free, cb__userData);
+}
+void Client::CancelGameFriendRequest(uint64_t userId,
+                                     discordpp::Client::UpdateRelationshipCallback cb)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    using Tcb__UserData = TDelegateUserData<std::remove_reference_t<decltype(cb)>>;
+    auto cb__userData = new Tcb__UserData(cb);
+    Discord_Client_UpdateRelationshipCallback cb__native = [](auto result, void* userData__) {
+        auto userData__typed = static_cast<Tcb__UserData*>(userData__);
+        discordpp::ClientResult result__obj(*result, DiscordObjectState::Owned);
+        userData__typed->delegate(std::move(result__obj));
+    };
+    Discord_Client_CancelGameFriendRequest(
+      &instance_, userId, cb__native, Tcb__UserData::Free, cb__userData);
+}
+discordpp::RelationshipHandle Client::GetRelationshipHandle(uint64_t userId) const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_RelationshipHandle returnValueNative__{};
+    Discord_Client_GetRelationshipHandle(&instance_, userId, &returnValueNative__);
+    discordpp::RelationshipHandle returnValue__(returnValueNative__, DiscordObjectState::Owned);
+    return returnValue__;
+}
+std::vector<discordpp::RelationshipHandle> Client::GetRelationships() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_RelationshipHandleSpan returnValueNative__;
+    Discord_Client_GetRelationships(&instance_, &returnValueNative__);
+    std::vector<discordpp::RelationshipHandle> returnValue__;
+    returnValue__.reserve(returnValueNative__.size);
+    for (size_t i__ = 0; i__ < returnValueNative__.size; ++i__) {
+        returnValue__.emplace_back(returnValueNative__.ptr[i__], DiscordObjectState::Owned);
+    }
+    Discord_Free(returnValueNative__.ptr);
+    return returnValue__;
+}
+std::vector<discordpp::RelationshipHandle> Client::GetRelationshipsByGroup(
+  discordpp::RelationshipGroupType groupType) const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_RelationshipHandleSpan returnValueNative__;
+    Discord_Client_GetRelationshipsByGroup(
+      &instance_, static_cast<Discord_RelationshipGroupType>(groupType), &returnValueNative__);
+    std::vector<discordpp::RelationshipHandle> returnValue__;
+    returnValue__.reserve(returnValueNative__.size);
+    for (size_t i__ = 0; i__ < returnValueNative__.size; ++i__) {
+        returnValue__.emplace_back(returnValueNative__.ptr[i__], DiscordObjectState::Owned);
+    }
+    Discord_Free(returnValueNative__.ptr);
+    return returnValue__;
+}
+void Client::RejectDiscordFriendRequest(uint64_t userId,
+                                        discordpp::Client::UpdateRelationshipCallback cb)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    using Tcb__UserData = TDelegateUserData<std::remove_reference_t<decltype(cb)>>;
+    auto cb__userData = new Tcb__UserData(cb);
+    Discord_Client_UpdateRelationshipCallback cb__native = [](auto result, void* userData__) {
+        auto userData__typed = static_cast<Tcb__UserData*>(userData__);
+        discordpp::ClientResult result__obj(*result, DiscordObjectState::Owned);
+        userData__typed->delegate(std::move(result__obj));
+    };
+    Discord_Client_RejectDiscordFriendRequest(
+      &instance_, userId, cb__native, Tcb__UserData::Free, cb__userData);
+}
+void Client::RejectGameFriendRequest(uint64_t userId,
+                                     discordpp::Client::UpdateRelationshipCallback cb)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    using Tcb__UserData = TDelegateUserData<std::remove_reference_t<decltype(cb)>>;
+    auto cb__userData = new Tcb__UserData(cb);
+    Discord_Client_UpdateRelationshipCallback cb__native = [](auto result, void* userData__) {
+        auto userData__typed = static_cast<Tcb__UserData*>(userData__);
+        discordpp::ClientResult result__obj(*result, DiscordObjectState::Owned);
+        userData__typed->delegate(std::move(result__obj));
+    };
+    Discord_Client_RejectGameFriendRequest(
+      &instance_, userId, cb__native, Tcb__UserData::Free, cb__userData);
+}
+void Client::RemoveDiscordAndGameFriend(uint64_t userId,
+                                        discordpp::Client::UpdateRelationshipCallback cb)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    using Tcb__UserData = TDelegateUserData<std::remove_reference_t<decltype(cb)>>;
+    auto cb__userData = new Tcb__UserData(cb);
+    Discord_Client_UpdateRelationshipCallback cb__native = [](auto result, void* userData__) {
+        auto userData__typed = static_cast<Tcb__UserData*>(userData__);
+        discordpp::ClientResult result__obj(*result, DiscordObjectState::Owned);
+        userData__typed->delegate(std::move(result__obj));
+    };
+    Discord_Client_RemoveDiscordAndGameFriend(
+      &instance_, userId, cb__native, Tcb__UserData::Free, cb__userData);
+}
+void Client::RemoveGameFriend(uint64_t userId, discordpp::Client::UpdateRelationshipCallback cb)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    using Tcb__UserData = TDelegateUserData<std::remove_reference_t<decltype(cb)>>;
+    auto cb__userData = new Tcb__UserData(cb);
+    Discord_Client_UpdateRelationshipCallback cb__native = [](auto result, void* userData__) {
+        auto userData__typed = static_cast<Tcb__UserData*>(userData__);
+        discordpp::ClientResult result__obj(*result, DiscordObjectState::Owned);
+        userData__typed->delegate(std::move(result__obj));
+    };
+    Discord_Client_RemoveGameFriend(
+      &instance_, userId, cb__native, Tcb__UserData::Free, cb__userData);
+}
+std::vector<discordpp::UserHandle> Client::SearchFriendsByUsername(std::string searchStr) const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_UserHandleSpan returnValueNative__;
+    Discord_String searchStr__str{(uint8_t*)(searchStr.data()), searchStr.size()};
+    Discord_Client_SearchFriendsByUsername(&instance_, searchStr__str, &returnValueNative__);
+    std::vector<discordpp::UserHandle> returnValue__;
+    returnValue__.reserve(returnValueNative__.size);
+    for (size_t i__ = 0; i__ < returnValueNative__.size; ++i__) {
+        returnValue__.emplace_back(returnValueNative__.ptr[i__], DiscordObjectState::Owned);
+    }
+    Discord_Free(returnValueNative__.ptr);
+    return returnValue__;
+}
+void Client::SendDiscordFriendRequest(std::string const& username,
+                                      discordpp::Client::SendFriendRequestCallback cb)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_String username__str{(uint8_t*)(username.data()), username.size()};
+    using Tcb__UserData = TDelegateUserData<std::remove_reference_t<decltype(cb)>>;
+    auto cb__userData = new Tcb__UserData(cb);
+    Discord_Client_SendFriendRequestCallback cb__native = [](auto result, void* userData__) {
+        auto userData__typed = static_cast<Tcb__UserData*>(userData__);
+        discordpp::ClientResult result__obj(*result, DiscordObjectState::Owned);
+        userData__typed->delegate(std::move(result__obj));
+    };
+    Discord_Client_SendDiscordFriendRequest(
+      &instance_, username__str, cb__native, Tcb__UserData::Free, cb__userData);
+}
+void Client::SendDiscordFriendRequestById(uint64_t userId,
+                                          discordpp::Client::UpdateRelationshipCallback cb)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    using Tcb__UserData = TDelegateUserData<std::remove_reference_t<decltype(cb)>>;
+    auto cb__userData = new Tcb__UserData(cb);
+    Discord_Client_UpdateRelationshipCallback cb__native = [](auto result, void* userData__) {
+        auto userData__typed = static_cast<Tcb__UserData*>(userData__);
+        discordpp::ClientResult result__obj(*result, DiscordObjectState::Owned);
+        userData__typed->delegate(std::move(result__obj));
+    };
+    Discord_Client_SendDiscordFriendRequestById(
+      &instance_, userId, cb__native, Tcb__UserData::Free, cb__userData);
+}
+void Client::SendGameFriendRequest(std::string const& username,
+                                   discordpp::Client::SendFriendRequestCallback cb)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_String username__str{(uint8_t*)(username.data()), username.size()};
+    using Tcb__UserData = TDelegateUserData<std::remove_reference_t<decltype(cb)>>;
+    auto cb__userData = new Tcb__UserData(cb);
+    Discord_Client_SendFriendRequestCallback cb__native = [](auto result, void* userData__) {
+        auto userData__typed = static_cast<Tcb__UserData*>(userData__);
+        discordpp::ClientResult result__obj(*result, DiscordObjectState::Owned);
+        userData__typed->delegate(std::move(result__obj));
+    };
+    Discord_Client_SendGameFriendRequest(
+      &instance_, username__str, cb__native, Tcb__UserData::Free, cb__userData);
+}
+void Client::SendGameFriendRequestById(uint64_t userId,
+                                       discordpp::Client::UpdateRelationshipCallback cb)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    using Tcb__UserData = TDelegateUserData<std::remove_reference_t<decltype(cb)>>;
+    auto cb__userData = new Tcb__UserData(cb);
+    Discord_Client_UpdateRelationshipCallback cb__native = [](auto result, void* userData__) {
+        auto userData__typed = static_cast<Tcb__UserData*>(userData__);
+        discordpp::ClientResult result__obj(*result, DiscordObjectState::Owned);
+        userData__typed->delegate(std::move(result__obj));
+    };
+    Discord_Client_SendGameFriendRequestById(
+      &instance_, userId, cb__native, Tcb__UserData::Free, cb__userData);
+}
+void Client::SetRelationshipCreatedCallback(discordpp::Client::RelationshipCreatedCallback cb)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    using Tcb__UserData = TDelegateUserData<std::remove_reference_t<decltype(cb)>>;
+    auto cb__userData = new Tcb__UserData(cb);
+    Discord_Client_RelationshipCreatedCallback cb__native =
+      [](auto userId, auto isDiscordRelationshipUpdate, void* userData__) {
+          auto userData__typed = static_cast<Tcb__UserData*>(userData__);
+          userData__typed->delegate(userId, isDiscordRelationshipUpdate);
+      };
+    Discord_Client_SetRelationshipCreatedCallback(
+      &instance_, cb__native, Tcb__UserData::Free, cb__userData);
+}
+void Client::SetRelationshipDeletedCallback(discordpp::Client::RelationshipDeletedCallback cb)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    using Tcb__UserData = TDelegateUserData<std::remove_reference_t<decltype(cb)>>;
+    auto cb__userData = new Tcb__UserData(cb);
+    Discord_Client_RelationshipDeletedCallback cb__native =
+      [](auto userId, auto isDiscordRelationshipUpdate, void* userData__) {
+          auto userData__typed = static_cast<Tcb__UserData*>(userData__);
+          userData__typed->delegate(userId, isDiscordRelationshipUpdate);
+      };
+    Discord_Client_SetRelationshipDeletedCallback(
+      &instance_, cb__native, Tcb__UserData::Free, cb__userData);
+}
+void Client::UnblockUser(uint64_t userId, discordpp::Client::UpdateRelationshipCallback cb)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    using Tcb__UserData = TDelegateUserData<std::remove_reference_t<decltype(cb)>>;
+    auto cb__userData = new Tcb__UserData(cb);
+    Discord_Client_UpdateRelationshipCallback cb__native = [](auto result, void* userData__) {
+        auto userData__typed = static_cast<Tcb__UserData*>(userData__);
+        discordpp::ClientResult result__obj(*result, DiscordObjectState::Owned);
+        userData__typed->delegate(std::move(result__obj));
+    };
+    Discord_Client_UnblockUser(&instance_, userId, cb__native, Tcb__UserData::Free, cb__userData);
+}
+std::optional<discordpp::UserHandle> Client::GetCurrentUserV2() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    bool returnIsNonNull__;
+    Discord_UserHandle returnValueNative__;
+    returnIsNonNull__ = Discord_Client_GetCurrentUserV2(&instance_, &returnValueNative__);
+    if (!returnIsNonNull__) {
+        return {};
+    }
+    discordpp::UserHandle returnValue__(returnValueNative__, DiscordObjectState::Owned);
+    return returnValue__;
+}
+void Client::GetDiscordClientConnectedUser(
+  uint64_t applicationId,
+  discordpp::Client::GetDiscordClientConnectedUserCallback callback) const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    using Tcallback__UserData = TDelegateUserData<std::remove_reference_t<decltype(callback)>>;
+    auto callback__userData = new Tcallback__UserData(callback);
+    Discord_Client_GetDiscordClientConnectedUserCallback callback__native =
+      [](auto result, auto user, void* userData__) {
+          auto userData__typed = static_cast<Tcallback__UserData*>(userData__);
+          discordpp::ClientResult result__obj(*result, DiscordObjectState::Owned);
+          std::optional<discordpp::UserHandle> user__opt{};
+          if (user) {
+              user__opt = discordpp::UserHandle(*user, DiscordObjectState::Owned);
+          }
+          userData__typed->delegate(std::move(result__obj), std::move(user__opt));
+      };
+    Discord_Client_GetDiscordClientConnectedUser(
+      &instance_, applicationId, callback__native, Tcallback__UserData::Free, callback__userData);
+}
+std::optional<discordpp::UserHandle> Client::GetUser(uint64_t userId) const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    bool returnIsNonNull__;
+    Discord_UserHandle returnValueNative__;
+    returnIsNonNull__ = Discord_Client_GetUser(&instance_, userId, &returnValueNative__);
+    if (!returnIsNonNull__) {
+        return {};
+    }
+    discordpp::UserHandle returnValue__(returnValueNative__, DiscordObjectState::Owned);
+    return returnValue__;
+}
+void Client::SetRelationshipGroupsUpdatedCallback(
+  discordpp::Client::RelationshipGroupsUpdatedCallback cb)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    using Tcb__UserData = TDelegateUserData<std::remove_reference_t<decltype(cb)>>;
+    auto cb__userData = new Tcb__UserData(cb);
+    Discord_Client_RelationshipGroupsUpdatedCallback cb__native = [](auto userId,
+                                                                     void* userData__) {
+        auto userData__typed = static_cast<Tcb__UserData*>(userData__);
+        userData__typed->delegate(userId);
+    };
+    Discord_Client_SetRelationshipGroupsUpdatedCallback(
+      &instance_, cb__native, Tcb__UserData::Free, cb__userData);
+}
+void Client::SetUserUpdatedCallback(discordpp::Client::UserUpdatedCallback cb)
+{
+    assert(state_ == DiscordObjectState::Owned);
+    using Tcb__UserData = TDelegateUserData<std::remove_reference_t<decltype(cb)>>;
+    auto cb__userData = new Tcb__UserData(cb);
+    Discord_Client_UserUpdatedCallback cb__native = [](auto userId, void* userData__) {
+        auto userData__typed = static_cast<Tcb__UserData*>(userData__);
+        userData__typed->delegate(userId);
+    };
+    Discord_Client_SetUserUpdatedCallback(
+      &instance_, cb__native, Tcb__UserData::Free, cb__userData);
+}
+const CallInfoHandle CallInfoHandle::nullobj{{}, DiscordObjectState::Invalid};
+CallInfoHandle::~CallInfoHandle()
+{
+    if (state_ == DiscordObjectState::Owned) {
+        Drop();
+        state_ = DiscordObjectState::Invalid;
+    }
+}
+CallInfoHandle::CallInfoHandle(CallInfoHandle&& other) noexcept
+  : instance_(other.instance_)
+  , state_(other.state_)
+{
+    other.state_ = DiscordObjectState::Invalid;
+}
+CallInfoHandle& CallInfoHandle::operator=(CallInfoHandle&& other) noexcept
+{
+    if (this != &other) {
+        if (state_ == DiscordObjectState::Owned) {
+            Drop();
+        }
+        instance_ = other.instance_;
+        state_ = other.state_;
+        other.state_ = DiscordObjectState::Invalid;
+    }
+    return *this;
+}
+CallInfoHandle::CallInfoHandle(const CallInfoHandle& other)
+  : instance_{}
+  , state_(DiscordObjectState::Invalid)
+{
+    if (other.state_ == DiscordObjectState::Owned) {
+        Discord_CallInfoHandle_Clone(&instance_, other.instance());
+
+        state_ = DiscordObjectState::Owned;
+    }
+}
+CallInfoHandle& CallInfoHandle::operator=(const CallInfoHandle& other)
+{
+    if (this != &other) {
+        if (state_ == DiscordObjectState::Owned) {
+            Drop();
+            state_ = DiscordObjectState::Invalid;
+        }
+        if (other.state_ == DiscordObjectState::Owned) {
+            Discord_CallInfoHandle_Clone(&instance_, other.instance());
+
+            state_ = DiscordObjectState::Owned;
+        }
+    }
+    return *this;
+}
+CallInfoHandle::CallInfoHandle(Discord_CallInfoHandle instance, DiscordObjectState state)
+  : instance_(instance)
+  , state_(state)
+{
+}
+void CallInfoHandle::Drop()
+{
+    if (state_ != DiscordObjectState::Owned) {
+        return;
+    }
+    Discord_CallInfoHandle_Drop(&instance_);
+    state_ = DiscordObjectState::Invalid;
+}
+uint64_t CallInfoHandle::ChannelId() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    uint64_t returnValue__;
+    returnValue__ = Discord_CallInfoHandle_ChannelId(&instance_);
+    return returnValue__;
+}
+std::vector<uint64_t> CallInfoHandle::GetParticipants() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    Discord_UInt64Span returnValueNative__;
+    Discord_CallInfoHandle_GetParticipants(&instance_, &returnValueNative__);
+    std::vector<uint64_t> returnValue__(returnValueNative__.ptr,
+                                        returnValueNative__.ptr + returnValueNative__.size);
+    Discord_Free(returnValueNative__.ptr);
+    return returnValue__;
+}
+std::optional<discordpp::VoiceStateHandle> CallInfoHandle::GetVoiceStateHandle(
+  uint64_t userId) const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    bool returnIsNonNull__;
+    Discord_VoiceStateHandle returnValueNative__;
+    returnIsNonNull__ =
+      Discord_CallInfoHandle_GetVoiceStateHandle(&instance_, userId, &returnValueNative__);
+    if (!returnIsNonNull__) {
+        return {};
+    }
+    discordpp::VoiceStateHandle returnValue__(returnValueNative__, DiscordObjectState::Owned);
+    return returnValue__;
+}
+uint64_t CallInfoHandle::GuildId() const
+{
+    assert(state_ == DiscordObjectState::Owned);
+    uint64_t returnValue__;
+    returnValue__ = Discord_CallInfoHandle_GuildId(&instance_);
+    return returnValue__;
+}
+} // namespace discordpp
+
+#endif // DISCORDPP_IMPLEMENTATION
diff --git a/3rdParty/dpp/DPP_SilenceWarnings.h b/3rdParty/dpp/DPP_SilenceWarnings.h
deleted file mode 100644
index 43479fce20..0000000000
--- a/3rdParty/dpp/DPP_SilenceWarnings.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*  Silence Warnings for DPP Headers
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- *  Include this before every DPP header to silence warnings in those headers.
- *
- */
-
-#ifndef PokemonAutomation_3rdParty_DPP_SilenceWarnings_H
-#define PokemonAutomation_3rdParty_DPP_SilenceWarnings_H
-
-
-#if 0
-#elif _MSC_VER
-
-#pragma warning(disable:4100)   //  Unreferenced Formal Parameter
-#pragma warning(disable:4251)   //  dll-interface
-
-#elif __GNUC__
-
-#pragma GCC diagnostic ignored "-Wunused-parameter"
-
-#endif
-
-
-#endif
diff --git a/3rdParty/dpp/appcommand.h b/3rdParty/dpp/appcommand.h
index efe11c196c..e9e0567349 100644
--- a/3rdParty/dpp/appcommand.h
+++ b/3rdParty/dpp/appcommand.h
@@ -1,1222 +1,1721 @@
-/************************************************************************************
- *
- * D++, A Lightweight C++ library for Discord
- *
- * Copyright 2021 Craig Edwards and D++ contributors
- * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- ************************************************************************************/
-#pragma once
-#include <dpp/export.h>
-#include <dpp/snowflake.h>
-#include <dpp/managed.h>
-#include <dpp/message.h>
-#include <dpp/channel.h>
-#include <dpp/role.h>
-#include <dpp/user.h>
-#include <variant>
-#include <map>
-#include <dpp/nlohmann/json_fwd.hpp>
-#include <dpp/json_interface.h>
-
-namespace dpp {
-
-/**
- * @brief Discord limits the maximum number of replies to an autocomplete interaction to 25.
- * This value represents that maximum. interaction_response::add_autocomplete_choice does not allow
- * adding more than this number of elements to the vector.
- */
-#ifndef AUTOCOMPLETE_MAX_CHOICES
-	#define AUTOCOMPLETE_MAX_CHOICES 25
-#endif
-
-/**
- * @brief Represents command option types.
- * These are the possible parameter value types.
- */
-enum command_option_type : uint8_t {
-	/** A sub-command */
-	co_sub_command = 1,
-	/** A sub-command group */
-	co_sub_command_group = 2,
-	/** A string value */
-	co_string = 3,
-	/** An integer value */
-	co_integer = 4,
-	/** A boolean value */
-	co_boolean = 5,
-	/** A user snowflake id */
-	co_user = 6,
-	/** A channel snowflake id. Includes all channel types and categories */
-	co_channel = 7,
-	/** A role snowflake id */
-	co_role = 8,
-	/** A mentionable. Includes users and roles */
-	co_mentionable = 9,
-	/** Any double between -2^53 and 2^53 */
-	co_number = 10,
-	/** File attachment type */
-	co_attachment = 11,
-};
-
-/**
- * @brief This type is a variant that can hold any of the potential
- * native data types represented by the enum dpp::command_option_type.
- * It is used in interactions.
- * 
- * std::monostate indicates an invalid parameter value, e.g. an unfilled optional parameter.
- * std::int64_t will be for all integer options, double for decimal numbers and dpp::snowflake for anything ID related.
- *
- * You can retrieve them with std::get().
- */
-typedef std::variant<std::monostate, std::string, int64_t, bool, snowflake, double> command_value;
-
-/**
- * @brief This struct represents choices in a multiple choice option
- * for a command parameter.
- * It has both a string name, and a value parameter which is a variant,
- * meaning it can hold different potential types (see dpp::command_value)
- * that you can retrieve with std::get().
- */
-struct DPP_EXPORT command_option_choice : public json_interface<command_option_choice>  {
-	std::string name;	//!< Option name (1-32 chars)
-	command_value value;	//!< Option value
-	std::map<std::string, std::string> name_localizations; //!< Localisations of command option name
-
-	/**
-	 * @brief Construct a new command option choice object
-	 */
-	command_option_choice() = default;
-
-	virtual ~command_option_choice() = default;
-
-	/**
-	 * @brief Add a localisation for this command option choice
-	 * @see https://discord.com/developers/docs/reference#locales
-	 * @param language Name of language, see the list of locales linked to above.
-	 * @param _name name of command option choice in the specified language
-	 * @return command_option_choice& reference to self for fluent chaining
-	 */
-	command_option_choice& add_localization(const std::string& language, const std::string& _name);
-
-	/**
-	 * @brief Construct a new command option choice object
-	 *
-	 * @param n name to initialise with
-	 * @param v value to initialise with
-	 */
-	command_option_choice(const std::string &n, command_value v);
-
-	/**
-	 * @brief Fill object properties from JSON
-	 *
-	 * @param j JSON to fill from
-	 * @return command_option_choice& Reference to self
-	 */
-	command_option_choice& fill_from_json(nlohmann::json* j);
-};
-
-/**
- * @brief helper function to serialize a command_option_choice to json
- *
- * @see https://github.com/nlohmann/json#arbitrary-types-conversions
- *
- * @param j output json object
- * @param choice command_option_choice to be serialized
- */
-void to_json(nlohmann::json& j, const command_option_choice& choice);
-
-/**
- * @brief A minimum or maximum value for co_number and co_integer dpp::command_option types
- */
-typedef std::variant<std::monostate, int64_t, double> command_option_range;
-
-/**
- * @brief Each command option is a command line parameter.
- * It can have a type (see dpp::command_option_type), a name,
- * a description, can be required or optional, and can have
- * zero or more choices (for multiple choice), plus options.
- * Adding options acts like sub-commands and can contain more
- * options.
- */
-struct DPP_EXPORT command_option : public json_interface<command_option>  {
-	command_option_type type;                    //!< Option type (what type of value is accepted)
-	std::string name;                            //!< Option name (1-32 chars)
-	std::string description;                     //!< Option description (1-100 chars)
-	bool required;                               //!< True if this is a mandatory parameter
-	bool focused;                                //!< True if the user is typing in this field, when sent via autocomplete
-	command_value value;                         //!< Set only by autocomplete went sent as part of an interaction
-	std::vector<command_option_choice> choices;  //!< List of choices for multiple choice command
-	bool autocomplete;                           //!< True if this option supports auto completion
-	std::vector<command_option> options;         //!< Sub-commands
-	std::vector<channel_type> channel_types;     //!< Allowed channel types for channel snowflake id options
-	command_option_range min_value;              //!< Minimum value allowed, for co_number and co_integer types only
-	command_option_range max_value;              //!< Maximum value allowed, for co_number and co_integer types only
-	std::map<std::string, std::string> name_localizations; //!< Localisations of command name
-	std::map<std::string, std::string> description_localizations; //!< Localisations of command description
-
-
-	/**
-	 * @brief Construct a new command option object
-	 */
-	command_option() = default;
-
-	/**
-	 * @brief Destroy the command option object
-	 */
-	virtual ~command_option() = default;
-
-	/**
-	 * @brief Add a localisation for this slash command option
-	 * @see https://discord.com/developers/docs/reference#locales
-	 * @param language Name of language, see the list of locales linked to above.
-	 * @param _name name of slash command option in the specified language
-	 * @param _description description of slash command option in the specified language
-	 * @return command_option& reference to self for fluent chaining
-	 */
-	command_option& add_localization(const std::string& language, const std::string& _name, const std::string& _description);
-
-	/**
-	 * @brief Construct a new command option object
-	 *
-	 * @param t Option type
-	 * @param name Option name
-	 * @param description Option description
-	 * @param required True if this is a mandatory parameter
-	 */
-	command_option(command_option_type t, const std::string &name, const std::string &description, bool required = false);
-
-	/**
-	 * @brief Add a multiple choice option
-	 *
-	 * @param o choice to add
-	 * @return command_option& returns a reference to self for chaining of calls
-	 * @throw dpp::exception command_option is an autocomplete, so choices cannot be added
-	 */
-	command_option& add_choice(const command_option_choice &o);
-
-	/**
-	 * @brief Set the minimum numeric value of the option. 
-	 * Only valid if the type is co_number or co_integer.
-	 * @param min_v Minimum value
-	 * @return command_option& return a reference to sef for chaining of calls
-	 */
-	command_option& set_min_value(command_option_range min_v);
-
-	/**
-	 * @brief Set the maximum numeric value of the option. 
-	 * Only valid if the type is co_number or co_integer.
-	 * @param max_v Maximum value
-	 * @return command_option& return a reference to sef for chaining of calls
-	 */
-	command_option& set_max_value(command_option_range max_v);
-
-	/**
-	 * @brief Set the minimum string length of the option. 
-	 * Only valid if the type is co_string
-	 * @param min_v Minimum value
-	 * @return command_option& return a reference to sef for chaining of calls
-	 */
-	command_option& set_min_length(command_option_range min_v);
-
-	/**
-	 * @brief Set the maximum string length of the option. 
-	 * Only valid if the type is co_string
-	 * @param max_v Maximum value
-	 * @return command_option& return a reference to sef for chaining of calls
-	 */
-	command_option& set_max_length(command_option_range max_v);
-
-	/**
-	 * @brief Add a sub-command option
-	 *
-	 * @param o Sub-command option to add
-	 * @return command_option& return a reference to self for chaining of calls
-	 */
-	command_option& add_option(const command_option &o);
-
-	/**
-	 * @brief Add channel type for option (only for co_channel type options)
-	 *
-	 * @param ch type to set
-	 * @return command_option& return a reference to self for chaining of calls
-	 */
-	command_option& add_channel_type(const channel_type ch);
-
-	/**
-	 * @brief Set the auto complete state
-	 * 
-	 * @param autocomp True to enable auto completion for this option
-	 * @return command_option& return a reference to self for chaining of calls
-	 * @throw dpp::exception You attempted to enable auto complete on a command_option that has choices added to it
-	 */
-	command_option& set_auto_complete(bool autocomp);
-
-	/**
-	 * @brief Fill object properties from JSON. Fills options recursively.
-	 *
-	 * @param j JSON to fill from
-	 * @return command_option& Reference to self
-	 */
-	 command_option& fill_from_json(nlohmann::json* j);
-};
-
-/**
- * @brief helper function to serialize a command_option to json
- *
- * @see https://github.com/nlohmann/json#arbitrary-types-conversions
- *
- * @param j output json object
- * @param opt command_option to be serialized
- */
-void to_json(nlohmann::json& j, const command_option& opt);
-
-/**
- * @brief Response types when responding to an interaction within on_interaction_create.
- */
-enum interaction_response_type {
-	ir_pong = 1,					//!< Acknowledge a Ping
-	ir_channel_message_with_source = 4,		//!< respond to an interaction with a message
-	ir_deferred_channel_message_with_source = 5,	//!< Acknowledge an interaction and edit a response later, the user sees a loading state
-	ir_deferred_update_message = 6,			//!< for components, acknowledge an interaction and edit the original message later; the user does not see a loading state
-	ir_update_message = 7,				//!< for components, edit the message the component was attached to
-	ir_autocomplete_reply = 8,			//!< Reply to autocomplete interaction. Be sure to do this within 500ms of the interaction!
-	ir_modal_dialog = 9,				//!< A modal dialog box
-};
-
-/**
- * @brief A response to an interaction, used to reply to a command and initiate
- * a message, which can be hidden from others (ephemeral) or visible to all.
- *
- * The dpp::interaction_response object wraps a dpp::message object. To set the
- * message as 'ephemeral' (e.g. only the command issuer can see it) you should
- * add the dpp::m_ephemeral flag to the dpp::message::flags field. e.g.:
- *
- * `mymessage.flags |= dpp::m_ephemeral;`
- */
-struct DPP_EXPORT interaction_response : public json_interface<interaction_response>   {
-
-	/**
-	 * @brief Response type from dpp::interaction_response_type.
-	 * Should be one of ir_pong, ir_channel_message_with_source,
-	 * or ir_deferred_channel_message_with_source.
-	 */
-	interaction_response_type type;
-
-	/**
-	 * @brief A message object. This pointer is always valid
-	 * while the containing interaction_response exists.
-	 */
-	struct message* msg;
-
-	/**
-	 * @brief Array of up to 25 autocomplete choices
-	 */
-	std::vector<command_option_choice> autocomplete_choices;
-
-	/**
-	 * @brief Construct a new interaction response object
-	 */
-	interaction_response();
-
-	/**
-	 * @brief Construct a new interaction response object
-	 *
-	 * @param t Type of reply
-	 * @param m Message to reply with
-	 */
-	interaction_response(interaction_response_type t, const struct message& m);
-
-	/**
-	 * @brief Construct a new interaction response object
-	 *
-	 * @param t Type of reply
-	 */
-	interaction_response(interaction_response_type t);
-
-	/**
-	 * @brief Fill object properties from JSON
-	 *
-	 * @param j JSON to fill from
-	 * @return interaction_response& Reference to self
-	 */
-	interaction_response& fill_from_json(nlohmann::json* j);
-
-	/**
-	 * @brief Build a json string for this object
-	 *
-	 * @return std::string JSON string
-	 */
-	virtual std::string build_json(bool with_id = false) const;
-
-	/**
-	 * @brief Add a command option choice
-	 * 
-	 * @param achoice command option choice to add
-	 * @return interaction_response& Reference to self
-	 */
-	interaction_response& add_autocomplete_choice(const command_option_choice& achoice);
-
-	/**
-	 * @brief Destroy the interaction response object
-	 */
-	virtual ~interaction_response();
-
-};
-
-/**
- * @brief Represents a modal dialog box response to an interaction.
- * 
- * A dialog box is a modal popup which appears to the user instead of a message. One or more
- * components are displayed on a form (the same component structure as within a dpp::message).
- * When the user submits the form an on_form_submit event is dispatched to any listeners.
- */
-struct DPP_EXPORT interaction_modal_response : public interaction_response, public json_interface<interaction_modal_response> {
-private:
-	size_t current_row;
-public:
-	/**
-	 * @brief Custom ID for the modal form
-	 */
-	std::string custom_id;
-
-	/**
-	 * @brief Title of the modal form box
-	 */
-	std::string title;
-
-	/**
-	 * @brief List of components. All components must be placed within
-	 * an action row, each outer vector is the action row.
-	 */
-	std::vector<std::vector<component>> components;
-
-	/**
-	 * @brief Construct a new interaction modal response object
-	 */
-	interaction_modal_response();
-
-	/**
-	 * @brief Construct a new interaction modal response object
-	 * 
-	 * @param _custom_id Custom ID of the modal form
-	 * @param _title Title of the modal form. It will be truncated to the maximum length of 45 UTF-8 characters.
-	 * @param _components Components to add to the modal form
-	 */
-	interaction_modal_response(const std::string& _custom_id, const std::string& _title, const std::vector<component> _components = {});
-
-	/**
-	 * @brief Set the custom id
-	 * 
-	 * @param _custom_id custom id to set
-	 * @return interaction_modal_response& Reference to self
-	 */
-	interaction_modal_response& set_custom_id(const std::string& _custom_id);
-
-	/**
-	 * @brief Set the title 
-	 * 
-	 * @param _title title to set
-	 * @return interaction_modal_response& Reference to self
-	 */
-	interaction_modal_response& set_title(const std::string& _title);
-
-	/**
-	 * @brief Add a component to an interaction modal response
-	 * 
-	 * @param c component to add
-	 * @return interaction_modal_response& Reference to self
-	 */
-	interaction_modal_response& add_component(const component& c);
-
-	/**
-	 * @brief Add a new row to the interaction modal response.
-	 * @note A modal response can have a maximum of five rows.
-	 * @throw dpp::logic_exception if more than five rows are attempted to be added
-	 * @return interaction_modal_response& Reference to self
-	 */
-	interaction_modal_response& add_row();
-
-	/**
-	 * @brief Fill object properties from JSON
-	 *
-	 * @param j JSON to fill from
-	 * @return interaction_response& Reference to self
-	 */
-	 interaction_modal_response& fill_from_json(nlohmann::json* j);
-
-	/**
-	 * @brief Build a json string for this object
-	 * @param with_id include id in json output
-	 *
-	 * @return std::string JSON string
-	 */
-	std::string build_json(bool with_id = false) const;
-
-	/**
-	 * @brief Destroy the interaction modal response object
-	 */
-	virtual ~interaction_modal_response() = default;
-};
-
-/**
- * @brief Resolved snowflake ids to users, guild members, roles and channels.
- */
-struct DPP_EXPORT command_resolved {
-	/**
-	 * @brief Resolved users
-	 */
-	std::map<dpp::snowflake, dpp::user> users;
-	/**
-	 * @brief Resolved guild members
-	 */
-	std::map<dpp::snowflake, dpp::guild_member> members;
-	/**
-	 * @brief Resolved total guild member permissions in the channel, including overwrites
-	 */
-	std::map<dpp::snowflake, permission> member_permissions;
-	/**
-	 * @brief Resolved roles
-	 */
-	std::map<dpp::snowflake, dpp::role> roles;
-	/**
-	 * @brief Resolved channels
-	 */
-	std::map<dpp::snowflake, dpp::channel> channels;
-	/**
-	 * @brief Resolved messages
-	 */
-	std::map<dpp::snowflake, dpp::message> messages;
-	/**
-	 * @brief Resolved attachments
-	 */
-	std::map<dpp::snowflake, dpp::attachment> attachments;
-};
-
-/**
- * @brief Values in the command interaction.
- * These are the values specified by the user when actually issuing
- * the command on a channel or in DM.
- */
-struct DPP_EXPORT command_data_option {
-	std::string name;                          //!< the name of the parameter
-	command_option_type type;                  //!< value of ApplicationCommandOptionType
-	command_value value;                       //!< Optional: the value of the pair
-	std::vector<command_data_option> options;  //!< Optional: present if this option is a group or subcommand
-	bool focused;                              //!< Optional: true if this option is the currently focused option for autocomplete
-
-	/**
-	 * @brief Check if the value variant holds std::monostate and options vector is empty (i.e. the option wasn't supplied) 
-	 * @return bool true, if value variant holds std::monostate and options vector is empty
-	 */
-	bool empty() {
-	    return std::holds_alternative<std::monostate>(value) && options.empty();
-	}
-
-	/**
-	 * @brief Get an option value by index
-	 * 
-	 * @tparam Type to get from the parameter
-	 * @param index index number of parameter
-	 * @return T returned type
-	 */
-	template <typename T> T& get_value(size_t index) {
-		return std::get<T>(options.at(index).value);
-	}
-};
-
-/**
- * @brief helper function to deserialize a command_data_option from json
- *
- * @see https://github.com/nlohmann/json#arbitrary-types-conversions
- *
- * @param j output json object
- * @param cdo command_data_option to be deserialized
- */
-void from_json(const nlohmann::json& j, command_data_option& cdo);
-
-/** Types of interaction in the dpp::interaction class
- */
-enum interaction_type {
-	it_ping = 1,			//!< ping
-	it_application_command = 2,	//!< application command (slash command)
-	it_component_button = 3,	//!< button click or select menu chosen (component interaction)
-	it_autocomplete = 4,		//!< Autocomplete interaction
-	it_modal_submit = 5,		//!< Modal form submission
-};
-
-/**
- * @brief Right-click context menu types
- */
-enum slashcommand_contextmenu_type {
-    ctxm_none = 0,        //!< Undefined context menu type
-    ctxm_chat_input = 1,    //!< DEFAULT, these are the slash commands you're used to
-    ctxm_user = 2,        //!< Add command to user context menu
-    ctxm_message = 3    //!< Add command to message context menu
-};
-
-/**
- * @brief Details of a command within an interaction.
- * This subobject represents the application command associated
- * with the interaction.
- */
-struct DPP_EXPORT command_interaction {
-	snowflake id;                              //!< the ID of the invoked command
-	std::string name;                          //!< the name of the invoked command
-	std::vector<command_data_option> options;  //!< Optional: the params + values from the user
-	slashcommand_contextmenu_type type;        //!< type of the command interaction
-	dpp::snowflake target_id;                  //!< Non-zero target ID for context menu actions. e.g. user id or message id whom clicked or tapped with the context menu https://discord.com/developers/docs/interactions/application-commands#user-commands
-
-	/**
-	 * @brief Get an option value by index
-	 * 
-	 * @tparam Type to get from the parameter
-	 * @param index index number of parameter
-	 * @return T returned type
-	 */
-	template <typename T> T& get_value(size_t index) {
-		return std::get<T>(options.at(index).value);
-	}
-
-	/**
-	 * @brief Return a ping/mention for the slash command
-	 *
-	 * @return std::string mention. e.g. `</airhorn:816437322781949972>`
-	 * @note If you want a mention for a subcommand or subcommand group, you can use dpp::utility::slashcommand_mention
-	 */
-	std::string get_mention() const;
-};
-
-/**
- * @brief helper function to deserialize a command_interaction from json
- *
- * @see https://github.com/nlohmann/json#arbitrary-types-conversions
- *
- * @param j output json object
- * @param ci command_interaction to be deserialized
- */
-void from_json(const nlohmann::json& j, command_interaction& ci);
-
-/**
- * @brief A button click for a button component
- */
-struct DPP_EXPORT component_interaction {
-	/**
-	 * @brief Component type (dpp::component_type)
-	 */
-	uint8_t component_type;
-	/**
-	 * @brief Custom ID set when created
-	 */
-	std::string custom_id;
-	/**
-	 * @brief Possible values for a drop down list
-	 */
-	std::vector<std::string> values;
-};
-
-/**
- * @brief An auto complete interaction
- */
-struct DPP_EXPORT autocomplete_interaction : public command_interaction {
-};
-
-/**
- * @brief helper function to deserialize a component_interaction from json
- *
- * @see https://github.com/nlohmann/json#arbitrary-types-conversions
- *
- * @param j output json object
- * @param bi button_interaction to be deserialized
- */
-void from_json(const nlohmann::json& j, component_interaction& bi);
-
-/**
- * @brief helper function to deserialize an autocomplete_interaction from json
- *
- * @see https://github.com/nlohmann/json#arbitrary-types-conversions
- *
- * @param j output json object
- * @param ai autocomplete_interaction to be deserialized
- */
-void from_json(const nlohmann::json& j, autocomplete_interaction& ai);
-
-/**
- * @brief An interaction represents a user running a command and arrives
- * via the dpp::cluster::on_interaction_create event. This is further split
- * into the events on_form_submit, on_slashcommand, on_user_context_menu,
- * on_button_click, on_select_menu, etc.
- */
-class DPP_EXPORT interaction : public managed, public json_interface<interaction>  {
-
-	/**
-	 * @brief Get a resolved object from the resolved set
-	 * 
-	 * @tparam T type of object to retrieve
-	 * @tparam C container defintion for resolved container
-	 * @param id Snowflake ID
-	 * @param resolved_set container for the type
-	 * @return const T& retrieved type
-	 * @throws dpp::logic_exception on object not found in resolved set
-	 */
-	template<typename T, typename C> const T& get_resolved(snowflake id, const C& resolved_set) const {
-		auto i = resolved_set.find(id);
-		if (i == resolved_set.end()) {
-			throw dpp::logic_exception("ID not found in resolved properties of application command");
-		}
-		return i->second;
-	}
-
-public:
-	snowflake application_id;                                   //!< id of the application this interaction is for
-	uint8_t	type;                                               //!< the type of interaction (dpp::interaction_type)
-	std::variant<command_interaction, component_interaction, autocomplete_interaction> data; //!< Optional: the command data payload
-	snowflake guild_id;                                         //!< Optional: the guild it was sent from
-	snowflake channel_id;                                       //!< Optional: the channel it was sent from
-	snowflake message_id;					    //!< Originating message id for context menu actions
-	permission app_permissions;				    //!< Permissions of the bot in the channel/guild where this command was issued
-	message msg;						    //!< Originating message for context menu actions
-	guild_member member;                                        //!< Optional: guild member data for the invoking user, including permissions
-	user usr;                                                   //!< User object for the invoking user
-	std::string token;                                          //!< a continuation token for responding to the interaction
-	uint8_t version;                                            //!< read-only property, always 1
-	command_resolved resolved;				    //!< Resolved user/role etc
-	std::string locale;                                         //!< User's locale (language)
-	std::string guild_locale;                                   //!< Guild's locale (language) - for guild interactions only
-	cache_policy_t cache_policy;                                //!< Cache policy from cluster
-
-	/**
-	 * @brief Construct a new interaction object
-	 */
-	interaction();
-
-	/**
-	 * @brief Destroy the interaction object
-	 */
-	virtual ~interaction() = default;
-
-	/**
-	 * @brief Get a user associated with the slash command from the resolved list.
-	 * The resolved list contains associated structures for this command and does not
-	 * use the cache or require any extra API calls.
-	 * 
-	 * @param id User snowflake ID to find
-	 * @return const dpp::user& user
-	 * @throws dpp::logic_exception on object not found in resolved set
-	 */
-	const dpp::user& get_resolved_user(snowflake id) const;
-
-	/**
-	 * @brief Get the channel this command originated on
-	 * 
-	 * @return const dpp::channel& channel
-	 * @throws dpp::logic_exception Command originated from a DM or channel not in cache
-	 */
-	const dpp::channel& get_channel() const;
-
-	/**
-	 * @brief Get the guild this command originated on
-	 * 
-	 * @return const dpp::guild& guild 
-	 * @throws dpp::logic_exception Command originated from a DM or guild not in cache
-	 */
-	const dpp::guild& get_guild() const;
-
-	/**
-	 * @brief Get the user who issued this command
-	 * 
-	 * @return const dpp::user& user
-	 */
-	const dpp::user& get_issuing_user() const;
-
-	/**
-	 * @brief Get the message this action refers to if it is a context menu command
-	 * 
-	 * @return const dpp::message& context menu message
-	 */
-	const dpp::message& get_context_message() const;
-
-	/**
-	 * @brief Get a role associated with the slash command from the resolved list.
-	 * The resolved list contains associated structures for this command and does not
-	 * use the cache or require any extra API calls.
-	 * 
-	 * @param id Role snowflake ID to find
-	 * @return const dpp::role& role
-	 * @throws dpp::logic_exception on object not found in resolved set
-	 */
-	const dpp::role& get_resolved_role(snowflake id) const;
-
-	/**
-	 * @brief Get a channel associated with the slash command from the resolved list.
-	 * The resolved list contains associated structures for this command and does not
-	 * use the cache or require any extra API calls.
-	 * 
-	 * @param id Channel snowflake ID to find
-	 * @return const dpp::channel& channel
-	 * @throws dpp::logic_exception on object not found in resolved set
-	 */
-	const dpp::channel& get_resolved_channel(snowflake id) const;
-
-	/**
-	 * @brief Get a guild member associated with the slash command from the resolved list.
-	 * The resolved list contains associated structures for this command and does not
-	 * use the cache or require any extra API calls.
-	 * 
-	 * @param id User snowflake ID to find
-	 * @return const dpp::guild_member& guild member
-	 * @throws dpp::logic_exception on object not found in resolved set
-	 */
-	const dpp::guild_member& get_resolved_member(snowflake id) const;
-
-	/**
-	 * @brief Get a permission associated with the slash command from the resolved list.
-	 * The resolved list contains associated structures for this command and does not
-	 * use the cache or require any extra API calls.
-	 * 
-	 * @param id User snowflake ID to find
-	 * @return const dpp::permission& permissions for the user including overrides on
-	 * the channel where the command was issued.
-	 * @throws dpp::logic_exception on object not found in resolved set
-	 */
-	const dpp::permission& get_resolved_permission(snowflake id) const;
-
-	/**
-	 * @brief Get a message associated with the slash command from the resolved list.
-	 * The resolved list contains associated structures for this command and does not
-	 * use the cache or require any extra API calls.
-	 * 
-	 * @param id Message snowflake ID to find
-	 * @return const dpp::message& message
-	 * @throws dpp::logic_exception on object not found in resolved set
-	 */
-	const dpp::message& get_resolved_message(snowflake id) const;
-
-	/**
-	 * @brief Get an uploaded attachment associated with the slash command from the resolved list.
-	 * The resolved list contains associated structures for this command and does not
-	 * use the cache or require any extra API calls.
-	 * 
-	 * @param id Attachment snowflake ID to find
-	 * @return const dpp::attachment& file attachment
-	 * @throws dpp::logic_exception on object not found in resolved set
-	 */
-	const dpp::attachment& get_resolved_attachment(snowflake id) const;
-
-	/**
-	 * @brief Get the command interaction object
-	 * 
-	 * @throw dpp::logic_exception if the interaction is not for a command
-	 * 
-	 * @return command_interaction object
-	 */
-	command_interaction get_command_interaction() const;
-
-	/**
-	 * @brief Get the component interaction object
-	 * 
-	 * @throw dpp::logic_exception if the interaction is not for a component
-	 * 
-	 * @return component_interaction object
-	 */
-	component_interaction get_component_interaction() const;
-
-	/**
-	 * @brief Get the autocomplete interaction object
-	 * 
-	 * @throw dpp::logic_exception if the interaction is not for an autocomplete
-	 * 
-	 * @return autocomplete_interaction object
-	 */
-	autocomplete_interaction get_autocomplete_interaction() const;
-
-	/**
-	 * @brief Get the command name for a command interaction
-	 * 
-	 * @return std::string command interaction, or empty string if the interaction
-	 * is not for a command.
-	 */
-	std::string get_command_name() const;
-
-	/**
-	 * @brief Fill object properties from JSON
-	 *
-	 * @param j JSON to fill from
-	 * @return interaction& Reference to self
-	 */
-	interaction& fill_from_json(nlohmann::json* j);
-
-	/**
-	 * @brief Build a json string for this object
-	 *
-	 * @param with_id True if to include the ID in the JSON
-	 * @return std::string JSON string
-	 */
-	std::string build_json(bool with_id = false) const;
-};
-
-/**
- * @brief helper function to deserialize an interaction from json
- *
- * @see https://github.com/nlohmann/json#arbitrary-types-conversions
- *
- * @param j output json object
- * @param i interaction to be deserialized
- */
-void from_json(const nlohmann::json& j, interaction& i);
-
-/**
- * @brief type of permission in the dpp::command_permission class
- */
-enum command_permission_type {
-	/**
-	 * @brief Role permission
-	 * 
-	 */
-	cpt_role = 1,
-	/**
-	 * @brief User permission
-	 * 
-	 */
-	cpt_user = 2,
-};
-
-/**
- * @brief Application command permissions allow you to enable or
- * disable commands for specific users or roles within a guild
- */
-class DPP_EXPORT command_permission : public json_interface<command_permission>   {
-public:
-	snowflake id;                  //!< the ID of the role or user
-	command_permission_type type;  //!< the type of permission
-	bool permission;               //!< true to allow, false, to disallow
-
-	/**
-	 * @brief Construct a new command permission object
-	 */
-	command_permission() = default;
-
-	virtual ~command_permission() = default;
-
-	/**
-	 * @brief Construct a new command permission object
-	 *
-	 * @param id The ID of the role or user
-	 * @param t The permission type
-	 * @param permission True to allow, false, to disallow
-	 */
-	command_permission(snowflake id, const command_permission_type t, bool permission);
-
-	/**
-	 * @brief Fill object properties from JSON
-	 *
-	 * @param j JSON to fill from
-	 * @return command_permission& Reference to self
-	 */
-	command_permission &fill_from_json(nlohmann::json *j);
-};
-
-/**
- * @brief helper function to serialize a command_permission to json
- *
- * @see https://github.com/nlohmann/json#arbitrary-types-conversions
- *
- * @param j output json object
- * @param cp command_permission to be serialized
- */
-void to_json(nlohmann::json& j, const command_permission& cp);
-
-/**
- * @brief Returned when fetching the permissions for a command in a guild.
- */
-class DPP_EXPORT guild_command_permissions : public json_interface<guild_command_permissions>  {
-public:
-	snowflake id;                                 //!< the id of the command
-	snowflake application_id;                     //!< the id of the application the command belongs to
-	snowflake guild_id;                           //!< the id of the guild
-	std::vector<command_permission> permissions;  //!< the permissions for the command in the guild
-
-	/**
-	 * @brief Construct a new guild command permissions object
-	 */
-	guild_command_permissions();
-
-	virtual ~guild_command_permissions() = default;
-
-	/**
-	 * @brief Fill object properties from JSON
-	 *
-	 * @param j JSON to fill from
-	 * @return guild_command_permissions& Reference to self
-	 */
-	guild_command_permissions &fill_from_json(nlohmann::json *j);
-
-};
-
-/**
- * @brief helper function to serialize a guild_command_permissions to json
- *
- * @see https://github.com/nlohmann/json#arbitrary-types-conversions
- *
- * @param j output json object
- * @param gcp guild_command_permissions to be serialized
- */
-void to_json(nlohmann::json& j, const guild_command_permissions& gcp);
-
-/**
- * @brief Represents an application command, created by your bot
- * either globally, or on a guild.
- */
-class DPP_EXPORT slashcommand : public managed, public json_interface<slashcommand>  {
-public:
-	/**
-	 * @brief Application id (usually matches your bots id)
-	 */
-	snowflake application_id;
-
-	/**
-	 * @brief Context menu type, defaults to dpp::ctxm_chat_input
-	 */
-	slashcommand_contextmenu_type type;
-
-	/**
-	 * @brief Command name (1-32 chars)
-	 */
-	std::string name;
-
-	/**
-	 * @brief Command description (1-100 chars)
-	 */
-	std::string description;
-
-	/**
-	 * @brief Command options (parameters)
-	 */
-	std::vector<command_option> options;
-
-	/**
-	 * @brief Whether the command is enabled by default when the app is added to a guild.
-	 * This has no effect as the default_member_permissions value is used instead.
-	 * @deprecated Discord discourage use of this value and instead you should use slashcommand::default_member_permissions.
-	 */
-	bool default_permission;
-
-	/**
-	 * @brief command permissions
-	 * @deprecated Discord discourage use of this value and instead you should use default_member_permissions.
-	 */
-	std::vector<command_permission> permissions;
-
-	/**
-	 * @brief autoincrementing version identifier updated during substantial record changes
-	 */
-	snowflake version;
-
-	/**
-	 * @brief Localisations of command name
-	 */
-	std::map<std::string, std::string> name_localizations;
-
-	/**
-	 * @brief Localisations of command description
-	 */
-	std::map<std::string, std::string> description_localizations;
-
-	/**
-	 * @brief The default permissions of this command on a guild.
-	 * D++ defaults this to dpp::p_use_application_commands.
-	 * @note You can set it to 0 to disable the command for everyone except admins by default
-	 */
-	permission default_member_permissions;
-
-	/**
-	 * @brief True if this command should be allowed in a DM
-	 * D++ defaults this to false. Cannot be set to true in a guild
-	 * command, only a global command.
-	 */
-	bool dm_permission;
-
-	/**
-	 * @brief Indicates whether the command is [age-restricted](https://discord.com/developers/docs/interactions/application-commands#agerestricted-commands).
-	 * Defaults to false
-	 */
-	bool nsfw;
-
-	/**
-	 * @brief Construct a new slashcommand object
-	 */
-	slashcommand();
-
-	/**
-	 * @brief Construct a new slashcommand object
-	 * 
-	 * @param _name Command name
-	 * @param _description Command description
-	 * @param _application_id Application id (usually the bot's user id)
-	 */
-	slashcommand(const std::string &_name, const std::string &_description, const dpp::snowflake _application_id);
-
-	/**
-	 * @brief Destroy the slashcommand object
-	 */
-	virtual ~slashcommand();
-
-	/**
-	 * @brief Add a localisation for this slash command
-	 * @see https://discord.com/developers/docs/reference#locales
-	 * @param language Name of language, see the list of locales linked to above.
-	 * @param _name name of slash command in the specified language
-	 * @param _description description of slash command in the specified language
-	 * @return slashcommand& reference to self for fluent chaining
-	 */
-	slashcommand& add_localization(const std::string& language, const std::string& _name, const std::string& _description);
-
-	/**
-	 * @brief Set the dm permission for the command
-	 * 
-	 * @param dm true to allow this command in dms
-	 * @return slashcommand& reference to self for chaining of calls
-	 */
-	slashcommand& set_dm_permission(bool dm);
-
-	/**
-	 * @brief Set whether the command should be age-restricted or not
-	 *
-	 * @param is_nsfw true if the command should be age-restricted
-	 * @return slashcommand& reference to self for chaining of calls
-	 */
-	slashcommand& set_nsfw(bool is_nsfw);
-
-	/**
-	 * @brief Set the default permissions of the slash command
-	 * 
-	 * @param defaults default permissions to set. This is a permission bitmask of bits from dpp::permissions
-	 * @note You can set it to 0 to disable the command for everyone except admins by default
-	 *
-	 * @return slashcommand& reference to self for chaining of calls
-	 */
-	slashcommand& set_default_permissions(uint64_t defaults);
-
-	/**
-	 * @brief Add an option (parameter)
-	 *
-	 * @param o option (parameter) to add
-	 * @return slashcommand& reference to self for chaining of calls
-	 */
-	slashcommand& add_option(const command_option &o);
-
-	/**
-	 * @brief Set the type of the slash command (only for context menu entries)
-	 * 
-	 * @param _type Type of context menu entry this command represents
-	 * @note If the type is dpp::ctxm_chat_input, the command name will be set to lowercase.
-	 * @return slashcommand& reference to self for chaining of calls
-	 */
-	slashcommand& set_type(slashcommand_contextmenu_type _type);
-
-	/**
-	 * @brief Set the name of the command
-	 *
-	 * @param n name of command
-	 * @note The maximum length of a command name is 32 UTF-8 codepoints.
-	 * If your command name is longer than this, it will be truncated.
-	 * The command name will be set to lowercase when the type is the default dpp::ctxm_chat_input.
-	 * @return slashcommand& reference to self for chaining of calls
-	 */
-	slashcommand& set_name(const std::string &n);
-
-	/**
-	 * @brief Set the description of the command
-	 *
-	 * @param d description
-	 * @note The maximum length of a command description is 100 UTF-8 codepoints.
-	 * If your command description is longer than this, it will be truncated.
-	 * @return slashcommand& reference to self for chaining of calls
-	 */
-	slashcommand& set_description(const std::string &d);
-
-	/**
-	 * @brief Set the application id of the command
-	 *
-	 * @param i application id
-	 * @return slashcommand& reference to self for chaining of calls
-	 */
-	slashcommand& set_application_id(snowflake i);
-
-	/**
-	 * @brief Adds a permission to the command
-	 *
-	 * @param p permission to add
-	 * @return slashcommand& reference to self for chaining of calls
-	 * @deprecated Discord discourage use of this value and instead you should use default_member_permissions.
-	 */
-	slashcommand& add_permission(const command_permission& p);
-
-	/**
-	 * @brief Disable default permissions, command will be unusable unless
-	 *        permissions are overridden with add_permission and
-	 *        dpp::guild_command_edit_permissions
-	 *
-	 * @return slashcommand& reference to self for chaining of calls
-	 * @deprecated Discord discourage use of this value and instead you should use default_member_permissions.
-	 */
-	slashcommand& disable_default_permissions();
-
-	/**
-	 * @brief Return a ping/mention for the slash command
-	 *
-	 * @return std::string mention. e.g. `</airhorn:816437322781949972>`
-	 * @note If you want a mention for a subcommand or subcommand group, you can use dpp::utility::slashcommand_mention
-	 */
-	std::string get_mention() const;
-
-	/**
-	 * @brief Fill object properties from JSON
-	 *
-	 * @param j JSON to fill from
-	 * @return slashcommand& Reference to self
-	 */
-	 slashcommand& fill_from_json(nlohmann::json* j);
-
-	/**
-	 * @brief Build a json string for this object
-	 *
-	 * @param with_id True if to include the ID in the JSON
-	 * @return std::string JSON string
-	 */
-	std::string build_json(bool with_id = false) const;
-};
-
-/**
- * @brief helper function to serialize a slashcommand to json
- *
- * @see https://github.com/nlohmann/json#arbitrary-types-conversions
- *
- * @param j output json object
- * @param cmd slashcommand to be serialized
- */
-void to_json(nlohmann::json& j, const slashcommand& cmd);
-
-/**
- * @brief A group of application slash commands
- */
-typedef std::unordered_map<snowflake, slashcommand> slashcommand_map;
-
-/**
- * @brief A group of guild command permissions
- */
-typedef std::unordered_map<snowflake, guild_command_permissions> guild_command_permissions_map;
-
-};
+/************************************************************************************
+ *
+ * D++, A Lightweight C++ library for Discord
+ *
+ * Copyright 2021 Craig Edwards and D++ contributors
+ * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ************************************************************************************/
+#pragma once
+#include <dpp/integration.h>
+#include <dpp/export.h>
+#include <dpp/snowflake.h>
+#include <dpp/managed.h>
+#include <dpp/message.h>
+#include <dpp/channel.h>
+#include <dpp/role.h>
+#include <dpp/user.h>
+#include <dpp/entitlement.h>
+#include <variant>
+#include <map>
+#include <dpp/json_fwd.h>
+#include <dpp/json_interface.h>
+
+namespace dpp {
+
+/**
+ * @brief Discord limits the maximum number of replies to an autocomplete interaction to 25.
+ * This value represents that maximum. interaction_response::add_autocomplete_choice does not allow
+ * adding more than this number of elements to the vector.
+ */
+inline constexpr size_t AUTOCOMPLETE_MAX_CHOICES = 25;
+
+/**
+ * @brief Discords default attachment size limit is 10MiB, and will be used in case
+ * an interaction does not contain its attachment size limit.
+ */
+inline constexpr uint32_t DEFAULT_ATTACHMENT_SIZE_LIMIT = 10 * 1024 * 1024;
+
+/**
+ * @brief Represents command option types.
+ * These are the possible parameter value types.
+ */
+enum command_option_type : uint8_t {
+	/**
+	 * @brief A sub-command.
+	 */
+	co_sub_command = 1,
+
+	/**
+	 * @brief A sub-command group.
+	 */
+	co_sub_command_group = 2,
+
+	/**
+	 * @brief A string value.
+	 */
+	co_string = 3,
+
+	/**
+	 * @brief An integer value.
+	 */
+	co_integer = 4,
+
+	/**
+	 * @brief A boolean value.
+	 */
+	co_boolean = 5,
+
+	/**
+	 * @brief A user snowflake id.
+	 */
+	co_user = 6,
+
+	/**
+	 * @brief A channel snowflake id. Includes all channel types and categories.
+	 */
+	co_channel = 7,
+
+	/**
+	 * @brief A role id (snowflake).
+	 */
+	co_role = 8,
+
+	/**
+	 * @brief A mentionable (users and roles).
+	 */
+	co_mentionable = 9,
+
+	/**
+	 * @brief Any double between -2^53 and 2^53.
+	 */
+	co_number = 10,
+
+	/**
+	 * @brief File attachment type.
+	 */
+	co_attachment = 11,
+};
+
+/**
+ * @brief This type is a variant that can hold any of the potential
+ * native data types represented by the enum dpp::command_option_type.
+ * It is used in interactions.
+ * 
+ * std::monostate indicates an invalid parameter value, e.g. an unfilled optional parameter.
+ * std::int64_t will be for all integer options, double for decimal numbers and dpp::snowflake for anything ID related.
+ *
+ * You can retrieve them with std::get().
+ */
+typedef std::variant<std::monostate, std::string, int64_t, bool, snowflake, double> command_value;
+
+/**
+ * @brief This struct represents choices in a multiple choice option
+ * for a command parameter.
+ * It has both a string name, and a value parameter which is a variant,
+ * meaning it can hold different potential types (see dpp::command_value)
+ * that you can retrieve with std::get().
+ */
+struct DPP_EXPORT command_option_choice : public json_interface<command_option_choice> {
+protected:
+	friend struct json_interface<command_option_choice>;
+
+	/**
+	 * @brief Fill object properties from JSON
+	 *
+	 * @param j JSON to fill from
+	 * @return command_option_choice& Reference to self
+	 */
+	command_option_choice& fill_from_json_impl(nlohmann::json* j);
+
+public:
+	/**
+	 * @brief Option name (1-32 chars).
+	 */
+	std::string name;
+
+	/**
+	 * @brief Option value.
+	 */
+	command_value value;
+
+	/**
+	 * @brief Localisations of command option name.
+	 */
+	std::map<std::string, std::string> name_localizations;
+
+	/**
+	 * @brief Construct a new command option choice object
+	 */
+	command_option_choice() = default;
+
+	virtual ~command_option_choice() = default;
+
+	/**
+	 * @brief Add a localisation for this command option choice
+	 * @see https://discord.com/developers/docs/reference#locales
+	 * @param language Name of language, see the list of locales linked to above
+	 * @param _name name of command option choice in the specified language
+	 * @return command_option_choice& reference to self for fluent chaining
+	 */
+	command_option_choice& add_localization(const std::string& language, const std::string& _name);
+
+	/**
+	 * @brief Construct a new command option choice object
+	 *
+	 * @param n name to initialise with
+	 * @param v value to initialise with
+	 */
+	command_option_choice(const std::string &n, command_value v);
+};
+
+/**
+ * @brief helper function to serialize a command_option_choice to json
+ *
+ * @see https://github.com/nlohmann/json#arbitrary-types-conversions
+ *
+ * @param j output json object
+ * @param choice command_option_choice to be serialized
+ */
+void to_json(nlohmann::json& j, const command_option_choice& choice);
+
+/**
+ * @brief A minimum or maximum value/length for dpp::co_number, dpp::co_integer and dpp::co_string types of a dpp::command_option.
+ * The `int64_t` is for the integer range or string length that can be entered. The `double` is for the decimal range that can be entered
+ */
+typedef std::variant<std::monostate, int64_t, double> command_option_range;
+
+/**
+ * @brief Each command option is a command line parameter.
+ * It can have a type (see dpp::command_option_type), a name,
+ * a description, can be required or optional, and can have
+ * zero or more choices (for multiple choice), plus options.
+ * Adding options acts like sub-commands and can contain more
+ * options.
+ */
+struct DPP_EXPORT command_option : public json_interface<command_option> {
+protected:
+	friend struct json_interface<command_option>;
+
+	/**
+	 * @brief Fill object properties from JSON. Fills options recursively.
+	 *
+	 * @param j JSON to fill from
+	 * @return command_option& Reference to self
+	 */
+	command_option& fill_from_json_impl(nlohmann::json* j);
+
+public:
+	/**
+	 * @brief Option type (what type of value is accepted).
+	 */
+	command_option_type type;
+
+	/**
+	 * @brief Option name (1-32 chars).
+	 */
+	std::string name;
+
+	/**
+	 * @brief Option description (1-100 chars).
+	 */
+	std::string description;
+
+	/**
+	 * @brief Is this a mandatory parameter?
+	 */
+	bool required;
+
+	/**
+	 * @brief Is the user is typing in this field?
+	 *
+	 * @note This is sent via autocomplete.
+	 */
+	bool focused;
+
+	/**
+	 * @brief Set only by autocomplete when sent as part of an interaction.
+	 */
+	command_value value;
+
+	/**
+	 * @brief List of choices for multiple choice command.
+	 */
+	std::vector<command_option_choice> choices;
+
+	/**
+	 * @brief Does this option supports auto completion?
+	 */
+	bool autocomplete;
+
+	/**
+	 * @brief An array of sub-commands (options).
+	 */
+	std::vector<command_option> options;
+
+	/**
+	 * @brief Allowed channel types for channel snowflake id options.
+	 */
+	std::vector<channel_type> channel_types;
+
+	// Combines the `min_length` and `max_length` field by storing its value in the int64_t of the command_option_range
+
+	/**
+	 * @brief Minimum value/length that can be entered, for dpp::co_number, dpp::co_integer and dpp::co_string types only.
+	 */
+	command_option_range min_value;
+
+	/**
+	 * @brief Maximum value/length that can be entered, for dpp::co_number, dpp::co_integer and dpp::co_string types only.
+	 */
+	command_option_range max_value;
+
+	/**
+	 * @brief Localisations of command name.
+	 */
+	std::map<std::string, std::string> name_localizations;
+
+	/**
+	 * @brief Localisations of command description.
+	 */
+	std::map<std::string, std::string> description_localizations;
+
+	/**
+	 * @brief File types (dpp::co_attachment) to filter for; can be "image", "video", "audio", or any dot-prefixed extension such as ".pdf" (0-10).
+	 */
+	std::vector<std::string> file_types;
+
+	/**
+	 * @brief Construct a new command option object
+	 */
+	command_option() = default;
+
+	/**
+	 * @brief Destroy the command option object
+	 */
+	virtual ~command_option() = default;
+
+	/**
+	 * @brief Add a file type (dpp::co_attachment) to filter for.
+	 *
+	 * @param file_type The type to filter for ("image"/"video"/"audio" or the file extension (begins with ".")).
+	 * @return command_option& Reference to self
+	 */
+	command_option& add_file_type(std::string_view file_type);
+
+	/**
+	 * @brief Add a localisation for this slash command option
+	 * @see https://discord.com/developers/docs/reference#locales
+	 * @param language Name of language, see the list of locales linked to above
+	 * @param _name name of slash command option in the specified language
+	 * @param _description description of slash command option in the specified language (optional)
+	 * @return command_option& reference to self for fluent chaining
+	 */
+	command_option& add_localization(const std::string& language, const std::string& _name, const std::string& _description = "");
+
+	/**
+	 * @brief Construct a new command option object
+	 *
+	 * @param t Option type
+	 * @param name Option name
+	 * @param description Option description
+	 * @param required True if this is a mandatory parameter
+	 */
+	command_option(command_option_type t, const std::string &name, const std::string &description, bool required = false);
+
+	/**
+	 * @brief Add a multiple choice option
+	 *
+	 * @param o choice to add
+	 * @return command_option& returns a reference to self for chaining of calls
+	 * @throw dpp::logic_exception command_option is an autocomplete, so choices cannot be added
+	 */
+	command_option& add_choice(const command_option_choice &o);
+
+	/**
+	 * @brief Set the minimum numeric value of the option. 
+	 * Only valid if the type is dpp::co_number or dpp::co_integer.
+	 * @param min_v Minimum value
+	 * @return command_option& returns a reference to self for chaining of calls
+	 */
+	command_option& set_min_value(command_option_range min_v);
+
+	/**
+	 * @brief Set the maximum numeric value of the option. 
+	 * Only valid if the type is dpp::co_number or dpp::co_integer.
+	 * @param max_v Maximum value
+	 * @return command_option& returns a reference to self for chaining of calls
+	 */
+	command_option& set_max_value(command_option_range max_v);
+
+	/**
+	 * @brief Set the minimum string length of the option. Must be between 0 and 6000 (inclusive).
+	 * Only valid if the type is dpp::co_string
+	 * @param min_v Minimum value
+	 * @return command_option& returns a reference to self for chaining of calls
+	 */
+	command_option& set_min_length(command_option_range min_v);
+
+	/**
+	 * @brief Set the maximum string length of the option. Must be between 1 and 6000 (inclusive).
+	 * Only valid if the type is dpp::co_string
+	 * @param max_v Maximum value
+	 * @return command_option& returns a reference to self for chaining of calls
+	 */
+	command_option& set_max_length(command_option_range max_v);
+
+	/**
+	 * @brief Add a sub-command option
+	 *
+	 * @param o Sub-command option to add
+	 * @return command_option& return a reference to self for chaining of calls
+	 */
+	command_option& add_option(const command_option &o);
+
+	/**
+	 * @brief Add channel type for option (only for co_channel type options)
+	 *
+	 * @param ch type to set
+	 * @return command_option& return a reference to self for chaining of calls
+	 */
+	command_option& add_channel_type(const channel_type ch);
+
+	/**
+	 * @brief Set the auto complete state
+	 * 
+	 * @param autocomp True to enable auto completion for this option
+	 * @return command_option& return a reference to self for chaining of calls
+	 * @throw dpp::logic_exception You attempted to enable auto complete on a command_option that has choices added to it
+	 */
+	command_option& set_auto_complete(bool autocomp);
+};
+
+/**
+ * @brief helper function to serialize a command_option to json
+ *
+ * @see https://github.com/nlohmann/json#arbitrary-types-conversions
+ *
+ * @param j output json object
+ * @param opt command_option to be serialized
+ */
+void to_json(nlohmann::json& j, const command_option& opt);
+
+/**
+ * @brief Response types when responding to an interaction within on_interaction_create.
+ */
+enum interaction_response_type {
+	/**
+	 * @brief Acknowledge a Ping
+	 */
+	ir_pong = 1,
+
+	/**
+	 * @brief Respond to an interaction with a message.
+	 */
+	ir_channel_message_with_source = 4,
+
+	/**
+	 * @brief Acknowledge an interaction and edit a response later, the user sees a loading state
+	 */
+	ir_deferred_channel_message_with_source = 5,
+
+	/**
+	 * @brief For components, acknowledge an interaction and edit the original message later; the user does not see a loading state.
+	 */
+	ir_deferred_update_message = 6,
+
+	/**
+	 * @brief For components, edit the message the component was attached to.
+	 */
+	ir_update_message = 7,
+
+	/**
+	 * @brief Reply to autocomplete interaction.
+	 *
+	 * @note Be sure to do this within 500ms of the interaction!
+	 */
+	ir_autocomplete_reply = 8,
+
+	/**
+	 * @brief A modal dialog box
+	 *
+	 * @note Not available for modal submit and ping interactions.
+	 */
+	ir_modal_dialog = 9,
+
+	/**
+	 * @brief Acknowledge a interaction with an upgrade button, only available for apps with monetization enabled.
+	 *
+	 * @see https://discord.com/developers/docs/monetization/entitlements#premiumrequired-interaction-response
+	 * @note Not available for autocomplete and ping interactions.
+	 * @warning This response does not support using `content`, `embeds`, or `attachments`, so reply with no data when using this!
+	 *
+	 * @depreciated Replaced with buttons with a style of cos_premium
+	 * This interaction type may stop working at any point
+	 */
+	ir_premium_required = 10,
+};
+
+/**
+ * @brief A response to an interaction, used to reply to a command and initiate
+ * a message, which can be hidden from others (ephemeral) or visible to all.
+ *
+ * The dpp::interaction_response object wraps a dpp::message object. To set the
+ * message as 'ephemeral' (e.g. only the command issuer can see it) you should
+ * add the dpp::m_ephemeral flag to the dpp::message::flags field. e.g.:
+ *
+ * `mymessage.flags |= dpp::m_ephemeral;`
+ */
+struct DPP_EXPORT interaction_response : public json_interface<interaction_response> {
+protected:
+	friend struct json_interface<interaction_response>;
+
+	/**
+	 * @brief Fill object properties from JSON
+	 *
+	 * @param j JSON to fill from
+	 * @return interaction_response& Reference to self
+	 */
+	virtual interaction_response& fill_from_json_impl(nlohmann::json* j);
+
+	/**
+	 * @brief Build json for this object
+	 *
+	 * @return json JSON object
+	 */
+	virtual json to_json_impl(bool with_id = false) const;
+
+public:
+	/**
+	 * @brief Response type from dpp::interaction_response_type.
+	 * Should be one of ir_pong, ir_channel_message_with_source,
+	 * or ir_deferred_channel_message_with_source.
+	 */
+	interaction_response_type type{};
+
+	/**
+	 * @brief Message tied to this response.
+	 */
+	message msg{};
+
+	/**
+	 * @brief Array of up to 25 autocomplete choices
+	 */
+	std::vector<command_option_choice> autocomplete_choices{};
+
+	/**
+	 * @brief Construct a new interaction response object
+	 */
+	interaction_response() = default;
+
+	/**
+	 * @brief Construct a new interaction response object
+	 *
+	 * @param t Type of reply
+	 */
+	interaction_response(interaction_response_type t);
+
+	/**
+	 * @brief Construct a new interaction response object
+	 *
+	 * @param t Type of reply
+	 * @param m Message to reply with
+	 */
+	interaction_response(interaction_response_type t, const message& m);
+
+	/**
+	 * @brief Construct a new interaction response object
+	 *
+	 * @param t Type of reply
+	 * @param m Message to reply with
+	 */
+	interaction_response(interaction_response_type t, message&& m);
+
+	/**
+	 * @brief Add a command option choice
+	 * 
+	 * @param achoice command option choice to add
+	 * @return interaction_response& Reference to self
+	 */
+	interaction_response& add_autocomplete_choice(const command_option_choice& achoice);
+
+	/**
+	 * @brief Destroy the interaction response object
+	 */
+	virtual ~interaction_response() = default;
+
+};
+
+/**
+ * @brief Represents a modal dialog box response to an interaction.
+ * 
+ * A dialog box is a modal popup which appears to the user instead of a message. One or more
+ * components are displayed on a form (the same component structure as within a dpp::message).
+ * When the user submits the form an on_form_submit event is dispatched to any listeners.
+ */
+struct DPP_EXPORT interaction_modal_response : public interaction_response, public json_interface<interaction_modal_response> {
+protected:
+	friend struct json_interface<interaction_modal_response>;
+
+	size_t current_row;
+
+	/**
+	 * @brief Fill object properties from JSON
+	 *
+	 * @param j JSON to fill from
+	 * @return interaction_response& Reference to self
+	 */
+	virtual interaction_modal_response& fill_from_json_impl(nlohmann::json* j);
+
+	/**
+	 * @brief Build a json for this object
+	 * @param with_id include id in json output
+	 *
+	 * @return json JSON object
+	 */
+	virtual json to_json_impl(bool with_id = false) const;
+
+public:
+	using json_interface<interaction_modal_response>::fill_from_json;
+	using json_interface<interaction_modal_response>::to_json;
+	using json_interface<interaction_modal_response>::build_json;
+
+	/**
+	 * @brief Custom ID for the modal form
+	 */
+	std::string custom_id;
+
+	/**
+	 * @brief Title of the modal form box (max 25 characters)
+	 */
+	std::string title;
+
+	/**
+	 * @brief List of components. All components must be placed within
+	 * an action row, each outer vector is the action row.
+	 */
+	std::vector<std::vector<component>> components;
+
+	/**
+	 * @brief Construct a new interaction modal response object
+	 */
+	interaction_modal_response();
+
+	/**
+	 * @brief Construct a new interaction modal response object
+	 * 
+	 * @param _custom_id Custom ID of the modal form
+	 * @param _title Title of the modal form. It will be truncated to the maximum length of 45 UTF-8 characters.
+	 * @param _components Components to add to the modal form
+	 */
+	interaction_modal_response(const std::string& _custom_id, const std::string& _title, const std::vector<component> _components = {});
+
+	/**
+	 * @brief Copy constructor
+	 *
+	 * @param other The object to copy from
+	 */
+	interaction_modal_response(const interaction_modal_response& other) = default;
+
+	/**
+	 * @brief Copy assignment operator
+	 *
+	 * @param other The object to copy from
+	 * @return interaction_modal_response& reference to self
+	 */
+	interaction_modal_response& operator=(const interaction_modal_response& other) = default;
+
+	/**
+	 * @brief Move constructor
+	 *
+	 * @param other The object to move from
+	 */
+	interaction_modal_response(interaction_modal_response&& other) noexcept = default;
+
+	/**
+	 * @brief Move assignment operator
+	 *
+	 * @param other The object to move from
+	 * @return interaction_modal_response& reference to self
+	 */
+	interaction_modal_response& operator=(interaction_modal_response&& other) noexcept = default;
+
+	/**
+	 * @brief Set the custom id
+	 * 
+	 * @param _custom_id custom id to set
+	 * @return interaction_modal_response& Reference to self
+	 */
+	interaction_modal_response& set_custom_id(const std::string& _custom_id);
+
+	/**
+	 * @brief Set the title 
+	 * 
+	 * @param _title title to set
+	 * @return interaction_modal_response& Reference to self
+	 */
+	interaction_modal_response& set_title(const std::string& _title);
+
+	/**
+	 * @brief Add a component to an interaction modal response
+	 * 
+	 * @param c component to add
+	 * @return interaction_modal_response& Reference to self
+	 */
+	interaction_modal_response& add_component(const component& c);
+
+	/**
+	 * @brief Add a new row to the interaction modal response.
+	 * @note A modal response can have a maximum of five rows.
+	 * @throw dpp::logic_exception if more than five rows are attempted to be added
+	 * @return interaction_modal_response& Reference to self
+	 */
+	interaction_modal_response& add_row();
+
+	/**
+	 * @brief Destroy the interaction modal response object
+	 */
+	virtual ~interaction_modal_response() = default;
+};
+
+/**
+ * @brief Resolved snowflake ids to users, guild members, roles and channels. You can use the `interaction::get_resolved_*` methods to easily get a resolved set
+ */
+struct DPP_EXPORT command_resolved {
+	/**
+	 * @brief Resolved users
+	 * @see interaction::get_resolved_user
+	 */
+	std::map<dpp::snowflake, dpp::user> users;
+	/**
+	 * @brief Resolved guild members
+	 * @see interaction::get_resolved_member
+	 */
+	std::map<dpp::snowflake, dpp::guild_member> members;
+	/**
+	 * @brief Resolved total guild member permissions including channel overwrites, permissions from roles and administrator privileges
+	 * @see interaction::get_resolved_permission
+	 */
+	std::map<dpp::snowflake, permission> member_permissions;
+	/**
+	 * @brief Resolved roles
+	 * @see interaction::get_resolved_role
+	 */
+	std::map<dpp::snowflake, dpp::role> roles;
+	/**
+	 * @brief Resolved channels
+	 * @see interaction::get_resolved_channel
+	 */
+	std::map<dpp::snowflake, dpp::channel> channels;
+	/**
+	 * @brief Resolved messages
+	 * @see interaction::get_resolved_message
+	 */
+	std::map<dpp::snowflake, dpp::message> messages;
+	/**
+	 * @brief Resolved attachments
+	 * @see interaction::get_resolved_attachment
+	 */
+	std::map<dpp::snowflake, dpp::attachment> attachments;
+};
+
+/**
+ * @brief Values in the command interaction.
+ * These are the values specified by the user when actually issuing
+ * the command on a channel or in DM.
+ */
+struct DPP_EXPORT command_data_option {
+	/**
+	 * @brief The name of the parameter.
+	 */
+	std::string name;
+
+	/**
+	 * @brief The type of option (value of ApplicationCommandOptionType).
+	 */
+	command_option_type type;
+
+	/**
+	 * @brief Optional: the value of the pair
+	 */
+	command_value value;
+
+	/**
+	 * @brief Optional: present if this option is a group or subcommand
+	 */
+	std::vector<command_data_option> options;
+
+	/**
+	 * @brief Optional: true if this option is the currently focused option for autocomplete
+	 */
+	bool focused;
+
+	/**
+	 * @brief Check if the value variant holds std::monostate and options vector is empty (i.e. the option wasn't supplied) 
+	 * @return bool true, if value variant holds std::monostate and options vector is empty
+	 */
+	bool empty() {
+		return std::holds_alternative<std::monostate>(value) && options.empty();
+	}
+
+	/**
+	 * @brief Get an option value by index
+	 * 
+	 * @tparam T Type to get from the parameter
+	 * @param index index of the option
+	 * @return T returned type
+	 */
+	template <typename T> T& get_value(size_t index) {
+		return std::get<T>(options.at(index).value);
+	}
+};
+
+/**
+ * @brief helper function to deserialize a command_data_option from json
+ *
+ * @see https://github.com/nlohmann/json#arbitrary-types-conversions
+ *
+ * @param j output json object
+ * @param cdo command_data_option to be deserialized
+ */
+void from_json(const nlohmann::json& j, command_data_option& cdo);
+
+/** Types of interaction in the dpp::interaction class
+ */
+enum interaction_type {
+	/**
+	 * @brief A ping interaction.
+	 */
+	it_ping = 1,
+
+	/**
+	 * @brief Application command (slash command) interaction.
+	 */
+	it_application_command = 2,
+
+	/**
+	 * @brief Button click or select menu chosen (component interaction)
+	 */
+	it_component_button = 3,
+
+	/**
+	 * @brief Autocomplete interaction.
+	 */
+	it_autocomplete = 4,
+
+	/**
+	 * @brief Modal form submission.
+	 */
+	it_modal_submit = 5,
+};
+
+/*
+* @brief Context type where the interaction can be used or triggered from, e.g. guild, user etc
+*/
+enum interaction_context_type {
+	/**
+	 * @brief Interaction can be used within servers
+	 */
+	itc_guild = 0,
+
+	/**
+	 * @brief Interaction can be used within DMs with the app's bot user
+	 */
+	itc_bot_dm = 1,
+
+	/**
+	 * @brief Interaction can be used within Group DMs and DMs other than the app's bot user
+	 */
+	itc_private_channel = 2,
+};
+
+/**
+ * @brief Right-click context menu types
+ */
+enum slashcommand_contextmenu_type {
+	/**
+	 * @brief Undefined context menu type
+	 */
+	ctxm_none = 0,
+
+	/**
+	 * @brief DEFAULT: these are the generic slash commands (e.g. /ping, /pong, etc)
+	 */
+	ctxm_chat_input = 1,
+
+	/**
+	 * @brief A slashcommand that goes in the user context menu.
+	 */
+	ctxm_user = 2,
+
+	/**
+	 * @brief A slashcommand that goes in the message context menu.
+	 */
+	ctxm_message = 3
+};
+
+/**
+ * @brief Details of a command within an interaction.
+ * This subobject represents the application command associated
+ * with the interaction.
+ */
+struct DPP_EXPORT command_interaction {
+	/**
+	 * @brief The ID of the invoked command.
+	 */
+	snowflake id;
+
+	/**
+	 * @brief The name of the invoked command.
+	 */
+	std::string name;
+
+	/**
+	 * @brief Optional: the params + values from the user.
+	 */
+	std::vector<command_data_option> options;
+
+	/**
+	 * @brief The type of command interaction.
+	 */
+	slashcommand_contextmenu_type type;
+
+	/**
+	 * @brief Non-zero target ID for context menu actions (e.g. user id or message id whom clicked or tapped with the context menu).
+	 *
+	 * @see https://discord.com/developers/docs/interactions/application-commands#user-commands
+	 */
+	dpp::snowflake target_id;
+
+	/**
+	 * @brief Get an option value by index
+	 * 
+	 * @tparam T Type to get from the parameter
+	 * @param index index of the option
+	 * @return T returned type
+	 */
+	template <typename T> T& get_value(size_t index) {
+		return std::get<T>(options.at(index).value);
+	}
+
+	/**
+	 * @brief Return a ping/mention for the slash command
+	 *
+	 * @return std::string mention. e.g. `</airhorn:816437322781949972>`
+	 * @note If you want a mention for a subcommand or subcommand group, you can use dpp::utility::slashcommand_mention
+	 */
+	std::string get_mention() const;
+};
+
+/**
+ * @brief helper function to deserialize a command_interaction from json
+ *
+ * @see https://github.com/nlohmann/json#arbitrary-types-conversions
+ *
+ * @param j output json object
+ * @param ci command_interaction to be deserialized
+ */
+void from_json(const nlohmann::json& j, command_interaction& ci);
+
+/**
+ * @brief A button click for a button component
+ */
+struct DPP_EXPORT component_interaction {
+	/**
+	 * @brief Component type (dpp::component_type)
+	 */
+	uint8_t component_type;
+
+	/**
+	 * @brief Custom ID set when created
+	 */
+	std::string custom_id;
+
+	/**
+	 * @brief Possible values for a drop down list
+	 */
+	std::vector<std::string> values;
+};
+
+/**
+ * @brief An auto complete interaction
+ */
+struct DPP_EXPORT autocomplete_interaction : public command_interaction {
+};
+
+/**
+ * @brief helper function to deserialize a component_interaction from json
+ *
+ * @see https://github.com/nlohmann/json#arbitrary-types-conversions
+ *
+ * @param j output json object
+ * @param bi button_interaction to be deserialized
+ */
+void from_json(const nlohmann::json& j, component_interaction& bi);
+
+/**
+ * @brief helper function to deserialize an autocomplete_interaction from json
+ *
+ * @see https://github.com/nlohmann/json#arbitrary-types-conversions
+ *
+ * @param j output json object
+ * @param ai autocomplete_interaction to be deserialized
+ */
+void from_json(const nlohmann::json& j, autocomplete_interaction& ai);
+
+/**
+ * @brief An interaction represents a user running a command and arrives
+ * via the dpp::cluster::on_interaction_create event. This is further split
+ * into the events on_form_submit, on_slashcommand, on_user_context_menu,
+ * on_button_click, on_select_menu, etc.
+ */
+class DPP_EXPORT interaction : public managed, public json_interface<interaction> {
+protected:
+	friend struct json_interface<interaction>;
+
+	/**
+	 * @brief Get a resolved object from the resolved set
+	 * 
+	 * @tparam T type of object to retrieve
+	 * @tparam C container definition for resolved container
+	 * @param id Snowflake ID
+	 * @param resolved_set container for the type
+	 * @return const T& retrieved type
+	 * @throws dpp::logic_exception on object not found in resolved set
+	 */
+	template<typename T, typename C> const T& get_resolved(snowflake id, const C& resolved_set) const {
+		auto i = resolved_set.find(id);
+		if (i == resolved_set.end()) {
+			throw dpp::logic_exception("ID not found in resolved properties of application command");
+		}
+		return i->second;
+	}
+
+	/**
+	 * @brief Fill object properties from JSON
+	 *
+	 * @param j JSON to fill from
+	 * @return interaction& Reference to self
+	 */
+	interaction& fill_from_json_impl(nlohmann::json* j);
+
+	/**
+	 * @brief Build a json for this object
+	 *
+	 * @param with_id True if to include the ID in the JSON
+	 * @return json JSON object
+	 */
+	virtual json to_json_impl(bool with_id = false) const;
+
+public:
+	/**
+	 * @brief Context where the interaction was triggered from
+	 */
+	std::map<application_integration_types, snowflake> authorizing_integration_owners;
+
+	/**
+	 * @brief Context where the interaction was triggered from
+	 */
+	std::optional<interaction_context_type> context;
+
+	/**
+	 * @brief ID of the application this interaction is for.
+	 */
+	snowflake application_id;
+
+	/**
+	 * @brief The type of interaction from dpp::interaction_type.
+	 */
+	uint8_t	type;
+
+	/**
+	 * @brief Optional: the command data payload.
+	 */
+	std::variant<command_interaction, component_interaction, autocomplete_interaction> data;
+
+	/**
+	 * @brief Optional: the guild it was sent from.
+	 */
+	snowflake guild_id;
+
+	/**
+	 * @brief Optional: the channel it was sent from
+	 */
+	snowflake channel_id;
+
+	/**
+	 * @brief Optional: The partial channel object where it was sent from.
+	 */
+	dpp::channel channel;
+
+	/**
+	 * @brief Originating message id for context menu actions.
+	 */
+	snowflake message_id;
+
+	/**
+	 * @brief Permissions of the bot in the channel/guild where this command was issued.
+	 */
+	permission app_permissions;
+
+	/**
+	 * @brief Originating message for context menu actions.
+	 */
+	message msg;
+
+	/**
+	 * @brief Optional: guild member data for the invoking user, including permissions. Filled when the interaction is invoked in a guild
+	 */
+	guild_member member;
+
+	/**
+	 * @brief User object for the invoking user.
+	 */
+	user usr;
+
+	/**
+	 * @brief A continuation token for responding to the interaction.
+	 */
+	std::string token;
+
+	/**
+	 * @brief Read-only property, always 1.
+	 */
+	uint8_t version;
+
+	/**
+	 * @brief Resolved data e.g. users, members, roles, channels, permissions, etc.
+	 */
+	command_resolved resolved;
+
+	/**
+	 * @brief User's [locale](https://discord.com/developers/docs/reference#locales) (language).
+	 */
+	std::string locale;
+
+	/**
+	 * @brief Guild's locale (language) - for guild interactions only.
+	 */
+	std::string guild_locale;
+
+	/**
+	 * @brief Attachment size limit in bytes for this interaction. Will be the discord default if not provided by the interaction.
+	 */
+	uint32_t attachment_size_limit;
+
+	/**
+	 * @brief Cache policy from cluster.
+	 */
+	cache_policy_t cache_policy;
+
+	/**
+	 * @brief For monetized apps, any entitlements for the invoking user, representing access to premium SKUs.
+	 */
+	std::vector<entitlement> entitlements;
+
+	/**
+	 * @brief Construct a new interaction object.
+	 */
+	interaction();
+
+	/**
+	 * @brief Destroy the interaction object
+	 */
+	virtual ~interaction() = default;
+
+	/**
+	 * @brief Get a user associated with the slash command from the resolved list.
+	 * The resolved list contains associated structures for this command and does not
+	 * use the cache or require any extra API calls.
+	 * 
+	 * @param id User snowflake ID to find
+	 * @return const dpp::user& user
+	 * @throws dpp::logic_exception on object not found in resolved set
+	 */
+	const dpp::user& get_resolved_user(snowflake id) const;
+
+	/**
+	 * @brief Get the channel this command originated on
+	 * 
+	 * @return const dpp::channel& channel
+	 * @throws dpp::logic_exception Command originated from a DM or channel not in cache
+	 */
+	const dpp::channel& get_channel() const;
+
+	/**
+	 * @brief Get the guild this command originated on
+	 * 
+	 * @return const dpp::guild& guild 
+	 * @throws dpp::logic_exception Command originated from a DM or guild not in cache
+	 */
+	const dpp::guild& get_guild() const;
+
+	/**
+	 * @brief Get the user who issued this command
+	 * 
+	 * @return const dpp::user& user
+	 */
+	const dpp::user& get_issuing_user() const;
+
+	/**
+	 * @brief Get the message this action refers to if it is a context menu command
+	 * 
+	 * @return const dpp::message& context menu message
+	 */
+	const dpp::message& get_context_message() const;
+
+	/**
+	 * @brief Get a role associated with the slash command from the resolved list.
+	 * The resolved list contains associated structures for this command and does not
+	 * use the cache or require any extra API calls.
+	 * 
+	 * @param id Role snowflake ID to find
+	 * @return const dpp::role& role
+	 * @throws dpp::logic_exception on object not found in resolved set
+	 */
+	const dpp::role& get_resolved_role(snowflake id) const;
+
+	/**
+	 * @brief Get a channel associated with the slash command from the resolved list.
+	 * The resolved list contains associated structures for this command and does not
+	 * use the cache or require any extra API calls.
+	 * 
+	 * @param id Channel snowflake ID to find
+	 * @return const dpp::channel& channel
+	 * @throws dpp::logic_exception on object not found in resolved set
+	 */
+	const dpp::channel& get_resolved_channel(snowflake id) const;
+
+	/**
+	 * @brief Get a guild member associated with the slash command from the resolved list.
+	 * The resolved list contains associated structures for this command and does not
+	 * use the cache or require any extra API calls.
+	 * 
+	 * @param id User snowflake ID to find
+	 * @return const dpp::guild_member& guild member
+	 * @throws dpp::logic_exception on object not found in resolved set
+	 */
+	const dpp::guild_member& get_resolved_member(snowflake id) const;
+
+	/**
+	 * @brief Get a permission associated with the slash command from the resolved list.
+	 * The resolved list contains associated structures for this command and does not
+	 * use the cache or require any extra API calls.
+	 * 
+	 * @param id User snowflake ID to find
+	 * @return const dpp::permission& total permissions for the user including overrides on
+	 * the channel where the command was issued.
+	 * @throws dpp::logic_exception on object not found in resolved set
+	 */
+	const dpp::permission& get_resolved_permission(snowflake id) const;
+
+	/**
+	 * @brief Get a message associated with the slash command from the resolved list.
+	 * The resolved list contains associated structures for this command and does not
+	 * use the cache or require any extra API calls.
+	 * 
+	 * @param id Message snowflake ID to find
+	 * @return const dpp::message& message
+	 * @throws dpp::logic_exception on object not found in resolved set
+	 */
+	const dpp::message& get_resolved_message(snowflake id) const;
+
+	/**
+	 * @brief Get an uploaded attachment associated with the slash command from the resolved list.
+	 * The resolved list contains associated structures for this command and does not
+	 * use the cache or require any extra API calls.
+	 * 
+	 * @param id Attachment snowflake ID to find
+	 * @return const dpp::attachment& file attachment
+	 * @throws dpp::logic_exception on object not found in resolved set
+	 */
+	const dpp::attachment& get_resolved_attachment(snowflake id) const;
+
+	/**
+	 * @brief Get the command interaction object
+	 * 
+	 * @throw dpp::logic_exception if the interaction is not for a command
+	 * 
+	 * @return command_interaction object
+	 */
+	command_interaction get_command_interaction() const;
+
+	/**
+	 * @brief Get the component interaction object
+	 * 
+	 * @throw dpp::logic_exception if the interaction is not for a component
+	 * 
+	 * @return component_interaction object
+	 */
+	component_interaction get_component_interaction() const;
+
+	/**
+	 * @brief Get the autocomplete interaction object
+	 * 
+	 * @throw dpp::logic_exception if the interaction is not for an autocomplete
+	 * 
+	 * @return autocomplete_interaction object
+	 */
+	autocomplete_interaction get_autocomplete_interaction() const;
+
+	/**
+	 * @brief Get the command name for a command interaction
+	 * 
+	 * @return std::string command interaction, or empty string if the interaction
+	 * is not for a command.
+	 */
+	std::string get_command_name() const;
+
+	/**
+	 * @brief Get the user who installed the application for a given type.
+	 * @param type Type of installation for the command, e.g. dpp::ait_guild_install or
+	 * dpp::ait_user_install.
+	 * @return The snowflake of the user. In the event this type is not allowed for the
+	 * given command, this will return a default-initialised snowflake with value 0.
+	 */
+	dpp::snowflake get_authorizing_integration_owner(application_integration_types type) const;
+
+	/**
+	 * @brief Returns true if this interaction occurred as a user-app interaction, e.g.
+	 * within a DM or group DM, added to the user not a guild.
+	 * @return true if a user-app interaction
+	 */
+	bool is_user_app_interaction() const;
+
+	/**
+	 * @brief Returns true if this interaction occurred as a guild-invited interaction, e.g.
+	 * within a guild's channel, or a DM of a user in that guild.
+	 * @return true if a guild interaction
+	 */
+	bool is_guild_interaction() const;
+
+};
+
+/**
+ * @brief helper function to deserialize an interaction from json
+ *
+ * @see https://github.com/nlohmann/json#arbitrary-types-conversions
+ *
+ * @param j output json object
+ * @param i interaction to be deserialized
+ */
+void from_json(const nlohmann::json& j, interaction& i);
+
+/**
+ * @brief type of permission in the dpp::command_permission class
+ */
+enum command_permission_type {
+	/**
+	 * @brief Role permission
+	 */
+	cpt_role = 1,
+
+	/**
+	 * @brief User permission
+	 */
+	cpt_user = 2,
+};
+
+/**
+ * @brief Application command permissions allow you to enable or
+ * disable commands for specific users or roles within a guild
+ */
+class DPP_EXPORT command_permission : public json_interface<command_permission> {
+protected:
+	friend struct json_interface<command_permission>;
+
+	/**
+	 * @brief Fill object properties from JSON
+	 *
+	 * @param j JSON to fill from
+	 * @return command_permission& Reference to self
+	 */
+	command_permission &fill_from_json_impl(nlohmann::json *j);
+
+public:
+	/**
+	 * @brief The ID of the role/user.
+	 */
+	snowflake id;
+
+	/**
+	 * @brief The type of permission.
+	 */
+	command_permission_type type;
+
+	/**
+	 * @brief True to allow, false to disallow.
+	 */
+	bool permission;
+
+	/**
+	 * @brief Construct a new command permission object.
+	 */
+	command_permission() = default;
+
+	virtual ~command_permission() = default;
+
+	/**
+	 * @brief Construct a new command permission object
+	 *
+	 * @param id The ID of the role or user
+	 * @param t The permission type
+	 * @param permission True to allow, false, to disallow
+	 */
+	command_permission(snowflake id, const command_permission_type t, bool permission);
+};
+
+/**
+ * @brief helper function to serialize a command_permission to json
+ *
+ * @see https://github.com/nlohmann/json#arbitrary-types-conversions
+ *
+ * @param j output json object
+ * @param cp command_permission to be serialized
+ */
+void to_json(nlohmann::json& j, const command_permission& cp);
+
+/**
+ * @brief Returned when fetching the permissions for a command in a guild.
+ */
+class DPP_EXPORT guild_command_permissions : public json_interface<guild_command_permissions> {
+protected:
+	friend struct json_interface<guild_command_permissions>;
+
+	/**
+	 * @brief Fill object properties from JSON
+	 *
+	 * @param j JSON to fill from
+	 * @return guild_command_permissions& Reference to self
+	 */
+	guild_command_permissions &fill_from_json_impl(nlohmann::json *j);
+
+public:
+	/**
+	 * @brief The id of the command.
+	 */
+	snowflake id;
+
+	/**
+	 * @brief The id of the application the command belongs to.
+	 */
+	snowflake application_id;
+
+	/**
+	 * @brief The id of the guild.
+	 */
+	snowflake guild_id;
+
+	/**
+	 * @brief The permissions for the command, in the guild.
+	 */
+	std::vector<command_permission> permissions;
+
+	/**
+	 * @brief Construct a new guild command permissions object
+	 */
+	guild_command_permissions();
+
+	virtual ~guild_command_permissions() = default;
+
+};
+
+/**
+ * @brief helper function to serialize a guild_command_permissions to json
+ *
+ * @see https://github.com/nlohmann/json#arbitrary-types-conversions
+ *
+ * @param j output json object
+ * @param gcp guild_command_permissions to be serialized
+ */
+void to_json(nlohmann::json& j, const guild_command_permissions& gcp);
+
+/**
+ * @brief Represents an application command, created by your bot
+ * either globally, or on a guild.
+ */
+class DPP_EXPORT slashcommand : public managed, public json_interface<slashcommand> {
+protected:
+	friend struct json_interface<slashcommand>;
+
+	/**
+	 * @brief Fill object properties from JSON
+	 *
+	 * @param j JSON to fill from
+	 * @return slashcommand& Reference to self
+	 */
+	slashcommand& fill_from_json_impl(nlohmann::json* j);
+
+	/**
+	 * @brief Build a json for this object
+	 *
+	 * @param with_id True if to include the ID in the JSON
+	 * @return json JSON object
+	 */
+	json to_json_impl(bool with_id = false) const;
+
+public:
+	/**
+	 * @brief Application id (usually matches your bots id)
+	 */
+	snowflake application_id;
+
+	/**
+	 * @brief Context menu type, defaults to dpp::ctxm_chat_input
+	 */
+	slashcommand_contextmenu_type type;
+
+	/**
+	 * @brief Command name (1-32 chars)
+	 */
+	std::string name;
+
+	/**
+	 * @brief Command description (1-100 chars)
+	 */
+	std::string description;
+
+	/**
+	 * @brief Command options (parameters)
+	 */
+	std::vector<command_option> options;
+
+	/**
+	 * @brief Whether the command is enabled by default when the app is added to a guild.
+	 * This has no effect as the default_member_permissions value is used instead.
+	 * @deprecated Discord discourage use of this value and instead you should use slashcommand::default_member_permissions.
+	 */
+	bool default_permission;
+
+	/**
+	 * @brief command permissions
+	 * @deprecated Discord discourage use of this value and instead you should use default_member_permissions.
+	 */
+	std::vector<command_permission> permissions;
+
+	/**
+	 * @brief autoincrementing version identifier updated during substantial record changes
+	 */
+	snowflake version;
+
+	/**
+	 * @brief Localisations of command name
+	 */
+	std::map<std::string, std::string> name_localizations;
+
+	/**
+	 * @brief Localisations of command description
+	 */
+	std::map<std::string, std::string> description_localizations;
+
+	/**
+	 * @brief The default permissions of this command on a guild.
+	 * D++ defaults this to dpp::p_use_application_commands.
+	 * @note You can set it to 0 to disable the command for everyone except admins by default
+	 */
+	permission default_member_permissions;
+
+	/**
+	 * @brief Installation contexts where the command is available, only for globally-scoped commands. Defaults to your app's configured contexts
+	 */
+	std::vector<application_integration_types> integration_types;
+
+	/**
+	 * @brief Interaction context(s) where the command can be used, only for globally-scoped commands. By default, all interaction context types included for new commands.
+	 */
+	std::vector<interaction_context_type> contexts;
+
+	/**
+	 * @brief True if this command should be allowed in a DM
+	 * D++ defaults this to false. Cannot be set to true in a guild
+	 * command, only a global command.
+	 * @deprecated Use dpp::slashcommand_t::set_interaction_contexts instead
+	 */
+	bool dm_permission;
+
+	/**
+	 * @brief Indicates whether the command is [age-restricted](https://discord.com/developers/docs/interactions/application-commands#agerestricted-commands).
+	 * Defaults to false
+	 */
+	bool nsfw;
+
+	/**
+	 * @brief Construct a new slashcommand object
+	 */
+	slashcommand();
+
+	/**
+	 * @brief Construct a new slashcommand object
+	 * 
+	 * @param _name Command name
+	 * @param _description Command description
+	 * @param _application_id Application id (usually the bot's user id)
+	 */
+	slashcommand(const std::string &_name, const std::string &_description, const dpp::snowflake _application_id);
+
+	/**
+	 * @brief Construct a new slashcommand object
+	 *
+	 * @param _name Command name
+	 * @param _type Context menu type
+	 * @param _application_id Application id (usually the bot's user id)
+	 */
+	slashcommand(const std::string &_name, const slashcommand_contextmenu_type _type, const dpp::snowflake _application_id);
+
+	/**
+	 * @brief Destroy the slashcommand object
+	 */
+	virtual ~slashcommand() = default;
+
+	/**
+	 * @brief Add a localisation for this slash command
+	 * @see https://discord.com/developers/docs/reference#locales
+	 * @param language Name of language, see the list of locales linked to above
+	 * @param _name name of slash command in the specified language
+	 * @param _description description of slash command in the specified language (optional)
+	 * @return slashcommand& reference to self for chaining of calls
+	 */
+	slashcommand& add_localization(const std::string& language, const std::string& _name, const std::string& _description = "");
+
+	/**
+	 * @brief Set the dm permission for the command
+	 * 
+	 * @param dm true to allow this command in dms
+	 * @return slashcommand& reference to self for chaining of calls
+	 */
+	slashcommand& set_dm_permission(bool dm);
+
+	/**
+	 * @brief Set whether the command should be age-restricted or not
+	 *
+	 * @param is_nsfw true if the command should be age-restricted
+	 * @return slashcommand& reference to self for chaining of calls
+	 */
+	slashcommand& set_nsfw(bool is_nsfw);
+
+	/**
+	 * @brief Set the default permissions of the slash command
+	 * 
+	 * @param defaults default permissions to set. This is a permission bitmask of bits from dpp::permissions.
+	 * This is also an AND list, which means the user must have **all** specified permissions to use the command.
+	 * @note You can set it to 0 to disable the command for everyone except admins by default
+	 *
+	 * @return slashcommand& reference to self for chaining of calls
+	 */
+	slashcommand& set_default_permissions(uint64_t defaults);
+
+	/**
+	 * @brief Add an option (parameter)
+	 *
+	 * @param o option (parameter) to add
+	 * @return slashcommand& reference to self for chaining of calls
+	 */
+	slashcommand& add_option(const command_option &o);
+
+	/**
+	 * @brief Set the type of the slash command (only for context menu entries)
+	 * 
+	 * @param _type Type of context menu entry this command represents
+	 * @note If the type is dpp::ctxm_chat_input, the command name will be set to lowercase.
+	 * @return slashcommand& reference to self for chaining of calls
+	 */
+	slashcommand& set_type(slashcommand_contextmenu_type _type);
+
+	/**
+	 * @brief Set the name of the command
+	 *
+	 * @param n name of command
+	 * @note The maximum length of a command name is 32 UTF-8 codepoints.
+	 * If your command name is longer than this, it will be truncated.
+	 * The command name will be set to lowercase when the type is the default dpp::ctxm_chat_input.
+	 * @return slashcommand& reference to self for chaining of calls
+	 */
+	slashcommand& set_name(const std::string &n);
+
+	/**
+	 * @brief Set the description of the command
+	 *
+	 * @param d description
+	 * @note The maximum length of a command description is 100 UTF-8 codepoints.
+	 * If your command description is longer than this, it will be truncated.
+	 * @return slashcommand& reference to self for chaining of calls
+	 */
+	slashcommand& set_description(const std::string &d);
+
+	/**
+	 * @brief Set the application id of the command
+	 *
+	 * @param i application id
+	 * @return slashcommand& reference to self for chaining of calls
+	 */
+	slashcommand& set_application_id(snowflake i);
+
+	/**
+	 * @brief Set the interaction contexts for the command
+	 *
+	 * @param contexts the contexts to set
+	 * @return slashcommand& reference to self for chaining of calls
+	 */
+	slashcommand& set_interaction_contexts(std::vector<interaction_context_type> contexts);
+
+	/**
+	 * @brief Adds a permission to the command
+	 *
+	 * @param p permission to add
+	 * @return slashcommand& reference to self for chaining of calls
+	 * @deprecated Discord discourage use of this value and instead you should use default_member_permissions.
+	 */
+	slashcommand& add_permission(const command_permission& p);
+
+	/**
+	 * @brief Disable default permissions, command will be unusable unless
+	 *        permissions are overridden with add_permission and
+	 *        dpp::guild_command_edit_permissions
+	 *
+	 * @return slashcommand& reference to self for chaining of calls
+	 * @deprecated Discord discourage use of this value and instead you should use default_member_permissions.
+	 */
+	slashcommand& disable_default_permissions();
+
+	/**
+	 * @brief Return a ping/mention for the slash command
+	 *
+	 * @return std::string mention. e.g. `</airhorn:816437322781949972>`
+	 * @note If you want a mention for a subcommand or subcommand group, you can use dpp::utility::slashcommand_mention
+	 */
+	std::string get_mention() const;
+};
+
+/**
+ * @brief helper function to serialize a slashcommand to json
+ *
+ * @see https://github.com/nlohmann/json#arbitrary-types-conversions
+ *
+ * @param j output json object
+ * @param cmd slashcommand to be serialized
+ */
+void to_json(nlohmann::json& j, const slashcommand& cmd);
+
+/**
+ * @brief A group of application slash commands
+ */
+typedef std::unordered_map<snowflake, slashcommand> slashcommand_map;
+
+/**
+ * @brief A group of guild command permissions
+ */
+typedef std::unordered_map<snowflake, guild_command_permissions> guild_command_permissions_map;
+
+}
diff --git a/3rdParty/dpp/application.h b/3rdParty/dpp/application.h
index 3d23c8a8d2..5029dca4ea 100644
--- a/3rdParty/dpp/application.h
+++ b/3rdParty/dpp/application.h
@@ -1,162 +1,523 @@
-/************************************************************************************
- *
- * D++, A Lightweight C++ library for Discord
- *
- * Copyright 2021 Craig Edwards and D++ contributors 
- * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- ************************************************************************************/
-
-#pragma once
-#include <dpp/export.h>
-#include <dpp/snowflake.h>
-#include <dpp/managed.h>
-#include <dpp/utility.h>
-#include <dpp/user.h>
-#include <dpp/permissions.h>
-#include <dpp/nlohmann/json_fwd.hpp>
-#include <dpp/json_interface.h>
-
-namespace dpp {
-
-/**
- * @brief status of a member of a team who maintain a bot/application
- */
-enum team_member_status : uint8_t {
-	/// User was invited to the team
-	tms_invited = 1,
-	/// User has accepted membership onto the team
-	tms_accepted = 2
-};
-
-/**
- * @brief Flags for a bot or application
- */
-enum application_flags : uint32_t {
-	/// Has gateway presence intent
-	apf_gateway_presence = (1 << 12),
-	/// Has gateway presence intent for <100 guilds
-	apf_gateway_presence_limited = (1 << 13),
-	/// Has guild members intent 
-	apf_gateway_guild_members = (1 << 14),
-	/// Has guild members intent for <100 guilds
-	apf_gateway_guild_members_limited = (1 << 15),
-	/// Verification is pending
-	apf_verification_pending_guild_limit = (1 << 16),
-	/// Embedded
-	apf_embedded = (1 << 17),
-	/// Has approval for message content
-	apf_gateway_message_content = (1 << 18),
-	/// Has message content, but <100 guilds
-	apf_gateway_message_content_limited = (1 << 19),
-	/// Indicates if the app has registered global application commands
-	apf_application_command_badge = (1 << 23)
-};
-
-/**
- * @brief Represents the settings for the bot/application's in-app authorization link
- */
-struct DPP_EXPORT application_install_params {
-	permission permissions;	//!< A bitmask of dpp::permissions to request for the bot role
-	std::vector<std::string> scopes;	//!< The [scopes](https://discord.com/developers/docs/topics/oauth2#shared-resources-oauth2-scopes) as strings to add the application to the server with
-};
-
-/**
- * @brief Represents a team member on a team who maintain a bot/application
- */
-class DPP_EXPORT team_member {
-public:
-	team_member_status	membership_state;	//!< the user's membership state on the team
-	std::string		permissions;		//!< will always be [""]
-	snowflake		team_id;		//!< the id of the parent team of which they are a member
-	user			member_user;		//!< the avatar, discriminator, id, and username of the user
-};
-
-/**
- * @brief Represents a team of users who maintain a bot/application
- */
-class DPP_EXPORT app_team {
-public:
-	utility::iconhash		icon;		//!< a hash of the image of the team's icon (may be empty)
-	snowflake			id;		//!< the unique id of the team
-	std::vector<team_member>	members;	//!< the members of the team
-	std::string			name;		//!< the name of the team
-	snowflake			owner_user_id;	//!< the user id of the current team owner
-};
-
-/**
- * @brief The application class represents details of a bot application
- */
-class DPP_EXPORT application : public managed, public json_interface<application>  {
-public:
-	std::string		name;			//!< the name of the app
-	utility::iconhash	icon;			//!< the icon hash of the app (may be empty)
-	std::string		description;		//!< the description of the app
-	std::string		rpc_origins;		//!< Optional: an array of rpc origin urls, if rpc is enabled
-	bool			bot_public;		//!< when false only app owner can join the app's bot to guilds
-	bool			bot_require_code_grant;	//!< when true the app's bot will only join upon completion of the full oauth2 code grant flow
-	std::string		terms_of_service_url;	//!< Optional: the url of the app's terms of service
-	std::string		privacy_policy_url;	//!< Optional: the url of the app's privacy policy
-	user			owner;			//!< Optional: partial user object containing info on the owner of the application
-	std::string		summary;		//!< if this application is a game sold on Discord, this field will be the summary field for the store page of its primary sku @deprecated Will be removed in v11
-	std::string		verify_key;		//!< the hex encoded key for verification in interactions and the GameSDK's GetTicket
-	app_team		team;			//!< if the application belongs to a team, this will be a list of the members of that team (may be empty)
-	snowflake		guild_id;		//!< Optional: if this application is a game sold on Discord, this field will be the guild to which it has been linked
-	snowflake		primary_sku_id;		//!< Optional: if this application is a game sold on Discord, this field will be the id of the "Game SKU" that is created, if exists
-	std::string		slug;			//!< Optional: if this application is a game sold on Discord, this field will be the URL slug that links to the store page
-	utility::iconhash	cover_image;		//!< Optional: the application's default rich presence invite cover image hash
-	uint32_t		flags;			//!< Optional: the application's public flags
-	std::vector<std::string> tags;	//!< Up to 5 tags describing the content and functionality of the application
-	application_install_params install_params;	//!< Settings for the application's default in-app authorization link, if enabled
-	std::string custom_install_url;	//!< The application's default custom authorization link, if enabled
-	std::string role_connections_verification_url; //!< The application's role connection verification entry point, which when configured will render the app as a verification method in the guild role verification configuration
-
-	/** Constructor */
-	application();
-
-	/** Destructor */
-	~application();
-
-	/** Read class values from json object
-	 * @param j A json object to read from
-	 * @return A reference to self
-	 */
-	application& fill_from_json(nlohmann::json* j);
-
-	/**
-	 * @brief Get the applications cover image url if they have one, otherwise returns an empty string
-	 *
-	 * @param size The size of the cover image in pixels. It can be any power of two between 16 and 4096. if not specified, the default sized cover image is returned.
-	 * @return std::string cover image url or empty string
-	 */
-	std::string get_cover_image_url(uint16_t size = 0) const;
-
-	/**
-	 * @brief Get the applications icon url if they have one, otherwise returns an empty string
-	 *
-	 * @param size The size of the icon in pixels. It can be any power of two between 16 and 4096. if not specified, the default sized icon is returned.
-	 * @return std::string icon url or empty string
-	 */
-	std::string get_icon_url(uint16_t size = 0) const;
-};
-
-/** A group of applications.
- * This is not currently ever sent by Discord API but the DPP standard setup for
- * objects that can be received by REST has the possibility for this, so this exists.
- * Don't ever expect to see one at present.
- */
-typedef std::unordered_map<snowflake, application> application_map;
-
-};
+/************************************************************************************
+ *
+ * D++, A Lightweight C++ library for Discord
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright 2021 Craig Edwards and D++ contributors 
+ * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ************************************************************************************/
+
+#pragma once
+#include <dpp/integration.h>
+#include <dpp/export.h>
+#include <dpp/snowflake.h>
+#include <dpp/managed.h>
+#include <dpp/utility.h>
+#include <dpp/user.h>
+#include <dpp/guild.h>
+#include <dpp/permissions.h>
+#include <dpp/json_fwd.h>
+#include <dpp/json_interface.h>
+#include <map>
+#include <optional>
+
+namespace dpp {
+
+/**
+ * @brief status of a member of a team who maintain a bot/application
+ */
+enum team_member_status : uint8_t {
+	/**
+	 * @brief User was invited to the team.
+	 */
+	tms_invited = 1,
+	/**
+	 * @brief User has accepted membership onto the team.
+	 */
+	tms_accepted = 2
+};
+
+/**
+ * @brief Flags for a bot or application
+ */
+enum application_flags : uint32_t {
+	/**
+	 * @brief Indicates if an app uses the Auto Moderation API
+	 */
+	apf_application_automod_rule_create_badge = (1 << 6),
+
+	/**
+	 * @brief Has gateway presence intent
+	 */
+	apf_gateway_presence = (1 << 12),
+
+	/**
+	 * @brief Has gateway presence intent for <100 guilds
+	 */
+	apf_gateway_presence_limited = (1 << 13),
+
+	/**
+	 * @brief Has guild members intent
+	 */
+	apf_gateway_guild_members = (1 << 14),
+
+	/**
+	 * @brief Has guild members intent for <100 guilds
+	 */
+	apf_gateway_guild_members_limited = (1 << 15),
+
+	/**
+	 * @brief Verification is pending
+	 */
+	apf_verification_pending_guild_limit = (1 << 16),
+
+	/**
+	 * @brief Embedded
+	 */
+	apf_embedded = (1 << 17),
+
+	/**
+	 * @brief Has approval for message content
+	 */
+	apf_gateway_message_content = (1 << 18),
+
+	/**
+	 * @brief Has message content, but <100 guilds
+	 */
+	apf_gateway_message_content_limited = (1 << 19),
+
+	/**
+	 * @brief Indicates if the app has registered global application commands
+	 */
+	apf_application_command_badge = (1 << 23)
+};
+
+/**
+ * @brief Represents the settings for the bot/application's in-app authorization link
+ */
+struct DPP_EXPORT application_install_params {
+	/**
+	 * @brief A bitmask of dpp::permissions to request for the bot role.
+	 */
+	permission permissions;
+
+	/**
+	 * @brief The scopes as strings to add the application to the server with.
+	 *
+	 * @see https://discord.com/developers/docs/topics/oauth2#shared-resources-oauth2-scopes
+	 */
+	std::vector<std::string> scopes;
+};
+
+/**
+ * @brief Team member role types for application team members.
+ * 
+ * These are hard coded to string forms by discord. If further types are added,
+ * this enum will be extended to support them.
+ */
+enum team_member_role_t : uint8_t {
+	/**
+	 * @brief Team owner.
+	 */
+	tmr_owner,
+
+	/**
+	 * @brief Team admin.
+	 */
+	tmr_admin,
+
+	/**
+	 * @brief Developer
+	 */
+	tmr_developer,
+
+	/**
+	 * @brief Read-Only
+	 */
+	tmr_readonly,
+};
+
+/**
+ * @brief Represents a team member on a team who maintain a bot/application
+ */
+class DPP_EXPORT team_member {
+public:
+	/**
+	 * @brief The user's membership state on the team.
+	 */
+	team_member_status membership_state;
+
+	/**
+	 * @brief Will always be "".
+	 */
+	std::string permissions;
+
+	/**
+	 * @brief The id of the parent team of which they are a member.
+	 */
+	snowflake team_id;
+
+	/**
+	 * @brief The avatar, discriminator, id, and username, of the user.
+	 */
+	user member_user;
+
+	/**
+	 * @brief The role of the user in the team.
+	 */
+	team_member_role_t member_role;
+};
+
+/**
+ * @brief Represents a team of users who maintain a bot/application
+ */
+class DPP_EXPORT app_team {
+public:
+	/**
+	 * @brief A hash of the image of the team's icon (may be empty).
+	 */
+	utility::iconhash icon;
+
+	/**
+	 * @brief The id of the team.
+	 */
+	snowflake id;
+
+	/**
+	 * @brief The members of the team.
+	 */
+	std::vector<team_member> members;
+
+	/**
+	 * @brief The name of the team.
+	 */
+	std::string name;
+
+	/**
+	 * @brief The user id of the current team owner.
+	 */
+	snowflake owner_user_id;
+};
+
+/**
+ * @brief Status indicating whether event webhooks are enabled or disabled for an application.
+ */
+enum application_event_webhook_status: uint8_t {
+	/**
+	 * @brief Webhook events are disabled by developer
+	 */
+	ews_disabled = 1,
+	/**
+	 * @brief Webhook events are enabled by developer
+	 */
+	ews_enabled = 2,
+	/**
+	 * @brief Webhook events are disabled by Discord, usually due to inactivity
+	 */
+	ews_disabled_by_discord = 3,
+};
+
+/**
+ * @brief Configuration object for an app installation
+ */
+struct DPP_EXPORT integration_configuration {
+		application_install_params oauth2_install_params;
+};
+
+/**
+ * @brief The application class represents details of a bot application
+ */
+class DPP_EXPORT application : public managed, public json_interface<application> {
+protected:
+	friend struct json_interface<application>;
+
+	/** Read class values from json object
+	 * @param j A json object to read from
+	 * @return A reference to self
+	 */
+	application& fill_from_json_impl(nlohmann::json* j);
+
+public:
+	/**
+	 * @brief The name of the app.
+	 */
+	std::string name;
+
+	/**
+	 * @brief The icon hash of the app (may be empty).
+	 */
+	utility::iconhash icon;
+
+	/**
+	 * @brief The description of the app.
+	 */
+	std::string description;
+
+	/**
+	 * @brief Optional: an array of rpc origin urls, if rpc is enabled.
+	 */
+	std::vector<std::string> rpc_origins;
+
+	/**
+	 * @brief When false, only app owner add the bot to guilds.
+	 */
+	bool bot_public;
+
+	/**
+	 * @brief When true, the app's bot will only join upon completion of the full oauth2 code grant flow
+	 */
+	bool bot_require_code_grant;
+
+	/**
+	 * @brief Optional: Partial user object for the bot user associated with the app.
+	 */
+	user bot;
+
+	/**
+	 * @brief Optional: the url of the app's terms of service.
+	 */
+	std::string terms_of_service_url;
+
+	/**
+	 * @brief Optional: the url of the app's privacy policy.
+	 */
+	std::string privacy_policy_url;
+
+	/**
+	 * @brief Optional: partial user object containing info on the owner of the application.
+	 */
+	user owner;
+
+	/**
+	 * @brief If this application is a game sold on Discord, this field will be the summary field for the store page of its primary SKU.
+	 *
+	 * @deprecated Will be removed in v11
+	 */
+	std::string summary;
+
+	/**
+	 * @brief The hex encoded key for verification in interactions and the GameSDK's GetTicket.
+	 */
+	std::string verify_key;
+
+	/**
+	 * @brief If the application belongs to a team, this will be a list of the members of that team (may be empty).
+	 */
+	app_team team;
+
+	/**
+	 * @brief Optional: if this application is a game sold on Discord, this field will be the guild to which it has been linked.
+	 */
+	snowflake guild_id;
+
+	/**
+	 * @brief Partial object of the associated guild.
+	 */
+	guild guild_obj;
+
+	/**
+	 * @brief Optional: if this application is a game sold on Discord, this field will be the id of the "Game SKU" that is created, if exists.
+	 */
+	snowflake primary_sku_id;
+
+	/**
+	 * @brief Optional: if this application is a game sold on Discord, this field will be the URL slug that links to the store page.
+	 */
+	std::string slug;
+
+	/**
+	 * @brief Optional: the application's default rich presence invite cover image hash
+	 */
+	utility::iconhash cover_image;
+
+	/**
+	 * @brief Optional: the application's public flags.
+	 */
+	uint32_t flags;
+
+	/**
+	 * @brief Optional: Approximate count of guilds the app has been added to.
+	 */
+	uint64_t approximate_guild_count;
+
+	/**
+	 * @brief Optional: Approximate count of users that have installed the app
+	 */
+	uint64_t approximate_user_install_count;
+
+	/**
+	 * @brief Optional: Array of redirect URIs for the app.
+	 */
+	std::vector<std::string> redirect_uris;
+
+	/**
+	 * @brief Optional: Interactions endpoint URL for the app.
+	 */
+	std::string interactions_endpoint_url;
+
+	/**
+	 * @brief The application's role connection verification entry point
+	 * which, when configured, will render the app as a verification method
+	 * in the guild role verification configuration.
+	 */
+	std::string role_connections_verification_url;
+
+	/**
+	 * @brief Event webhooks URL for the app to receive webhook events
+	 */
+	std::string event_webhooks_url;
+
+	/**
+	 * @brief List of Webhook event types the app subscribes to.
+	 */
+	std::vector<std::string> event_webhooks_types;
+
+	/**
+	 * If webhook events are enabled for the app.
+	 */
+	application_event_webhook_status event_webhooks_status;
+
+	/**
+	 * @brief Up to 5 tags describing the content and functionality of the application.
+	 */
+	std::vector<std::string> tags;
+
+	/**
+	 * @brief Settings for the application's default in-app authorization link, if enabled.
+	 */
+	application_install_params install_params;
+
+	/**
+	 * @brief Default scopes and permissions for each supported installation context
+	 */
+	std::map<application_integration_types, integration_configuration> integration_types_config;
+
+	/**
+	 * @brief The application's default custom authorization link, if enabled.
+	 */
+	std::string custom_install_url;
+
+	/**
+	 * @warning This variable is not documented by discord, we have no idea what it means and how it works. Use at your own risk.
+	 */
+	uint8_t	discoverability_state;
+
+	/**
+	 * @warning This variable is not documented by discord, we have no idea what it means and how it works. Use at your own risk.
+	 */
+	uint32_t discovery_eligibility_flags;
+	/**
+	 * @warning This variable is not documented by discord, we have no idea what it means and how it works. Use at your own risk.
+	 */
+	uint8_t	explicit_content_filter;
+
+	/**
+	 * @warning This variable is not documented by discord, we have no idea what it means and how it works. Use at your own risk.
+	 */
+	uint8_t	creator_monetization_state;
+
+	/**
+	 * @warning This variable is not documented by discord, we have no idea what it means and how it works. Use at your own risk.
+	 */
+	bool integration_public;
+
+	/**
+	 * @warning This variable is not documented by discord, we have no idea what it means and how it works. Use at your own risk.
+	 */
+	bool integration_require_code_grant;
+
+	/**
+	 * @warning This variable is not documented by discord, we have no idea what it means and how it works. Use at your own risk.
+	 */
+	std::vector<std::string> interactions_event_types;
+
+	/**
+	 * @warning This variable is not documented by discord, we have no idea what it means and how it works. Use at your own risk.
+	 */
+	uint8_t	interactions_version;
+
+	/**
+	 * @warning This variable is not documented by discord, we have no idea what it means and how it works. Use at your own risk.
+	 */
+	bool is_monetized;
+
+	/**
+	 * @warning This variable is not documented by discord, we have no idea what it means and how it works. Use at your own risk.
+	 */
+	uint32_t monetization_eligibility_flags;
+
+	/**
+	 * @warning This variable is not documented by discord, we have no idea what it means and how it works. Use at your own risk.
+	 */
+	uint8_t	monetization_state;
+
+	/**
+	 * @warning This variable is not documented by discord, we have no idea what it means and how it works. Use at your own risk.
+	 */
+	bool hook;
+
+	/**
+	 * @warning This variable is not documented by discord, we have no idea what it means and how it works. Use at your own risk.
+	 */
+	uint8_t	rpc_application_state;
+
+	/**
+	 * @warning This variable is not documented by discord, we have no idea what it means and how it works. Use at your own risk.
+	 */
+	uint8_t	store_application_state;
+
+	/**
+	 * @warning This variable is not documented by discord, we have no idea what it means and how it works. Use at your own risk.
+	 */
+	uint8_t	verification_state;
+
+	/** Constructor */
+	application();
+
+	/** Destructor */
+	~application();
+
+	/**
+	 * @brief Get the application's cover image url if they have one, otherwise returns an empty string
+	 *
+	 * @param size The size of the cover image in pixels. It can be any power of two between 16 and 4096,
+	 * otherwise the default sized cover image is returned.
+	 * @param format The format to use for the avatar. It can be one of `i_webp`, `i_jpg` or `i_png`.
+	 * @return std::string cover image url or an empty string, if required attributes are missing or an invalid format was passed
+	 */
+	std::string get_cover_image_url(uint16_t size = 0, const image_type format = i_png) const;
+
+	/**
+	 * @brief Get the application's icon url if they have one, otherwise returns an empty string
+	 *
+	 * @param size The size of the icon in pixels. It can be any power of two between 16 and 4096,
+	 * otherwise the default sized icon is returned.
+	 * @param format The format to use for the avatar. It can be one of `i_webp`, `i_jpg` or `i_png`.
+	 * @return std::string icon url or an empty string, if required attributes are missing or an invalid format was passed
+	 */
+	std::string get_icon_url(uint16_t size = 0, const image_type format = i_png) const;
+};
+
+/**
+ * @brief A group of applications.
+ *
+ * This is not currently ever sent by Discord API but the DPP standard setup for
+ * objects that can be received by REST has the possibility for this, so this exists.
+ * Don't ever expect to see one at present.
+ */
+typedef std::unordered_map<snowflake, application> application_map;
+
+}
diff --git a/3rdParty/dpp/auditlog.h b/3rdParty/dpp/auditlog.h
index abcde0a54f..2b2c517906 100644
--- a/3rdParty/dpp/auditlog.h
+++ b/3rdParty/dpp/auditlog.h
@@ -1,214 +1,481 @@
-/************************************************************************************
- *
- * D++, A Lightweight C++ library for Discord
- *
- * Copyright 2021 Craig Edwards and D++ contributors 
- * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- ************************************************************************************/
-
-#pragma once
-#include <dpp/export.h>
-#include <dpp/snowflake.h>
-#include <dpp/nlohmann/json_fwd.hpp>
-#include <optional>
-#include <dpp/json_interface.h>
-
-namespace dpp {
-
-/**
- * @brief Defines types of audit log entry
- */
-enum audit_type {
-	/// Guild update
-	aut_guild_update			=	1,
-	/// Channel create
-	aut_channel_create		=	10,
-	/// Channel update
-	aut_channel_update		=	11,
-	/// Channel delete
-	aut_channel_delete		=	12,
-	/// Channel overwrite create
-	aut_channel_overwrite_create	=	13,
-	/// Channel overwrite update
-	aut_channel_overwrite_update	=	14,
-	/// Channel overwrite delete
-	aut_channel_overwrite_delete	=	15,
-	/// Channel member kick
-	aut_member_kick			=	20,
-	/// Channel member prune
-	aut_member_prune			=	21,
-	/// Channel member ban add
-	aut_member_ban_add		=	22,
-	/// Channel member ban remove
-	aut_member_ban_remove		=	23,
-	/// Guild member update
-	aut_member_update		=	24,
-	/// Guild member role update
-	aut_member_role_update		=	25,
-	/// Guild member move
-	aut_member_move			=	26,
-	/// Guild member voice disconnect
-	aut_member_disconnect		=	27,
-	/// Guild bot add
-	aut_bot_add			=	28,
-	/// Guild role create
-	aut_role_create			=	30,
-	/// Guild role update
-	aut_role_update			=	31,
-	/// Guild role delete
-	aut_role_delete			=	32,
-	/// Guild invite create
-	aut_invite_create		=	40,
-	/// Guild invite update
-	aut_invite_update		=	41,
-	/// Guild invite delete
-	aut_invite_delete		=	42,
-	/// Guild webhook create
-	aut_webhook_create		=	50,
-	/// Guild webhook update
-	aut_webhook_update		=	51,
-	/// Guild webhook delete
-	aut_webhook_delete		=	52,
-	/// Guild emoji create
-	aut_emoji_create			=	60,
-	/// Guild emoji update
-	aut_emoji_update			=	61,
-	/// Guild emoji delete
-	aut_emoji_delete			=	62,
-	/// Guild message delete
-	aut_message_delete		=	72,
-	/// Guild message bulk delete
-	aut_message_bulk_delete		=	73,
-	/// Guild message pin
-	aut_message_pin			=	74,
-	/// Guild message unpin
-	aut_message_unpin		=	75,
-	/// Guild integration create
-	aut_integration_create		=	80,
-	/// Guild integration update
-	aut_integration_update		=	81,
-	/// Guild integration delete
-	aut_integration_delete		=	82,
-	/// Stage instance create
-	aut_stage_instance_create	=	83,
-	/// Stage instance update
-	aut_stage_instance_update	=	84,
-	/// stage instance delete
-	aut_stage_instance_delete	=	85,
-	/// Sticker create
-	aut_sticker_create		=	90,
-	/// Sticker update
-	aut_sticker_update		=	91,
-	/// Sticker delete
-	aut_sticker_delete		=	92,
-	/// Scheduled event creation
-	aut_guild_scheduled_event_create	=	100,
-	/// Scheduled event update
-	aut_guild_scheduled_event_update	=	101,
-	/// Scheduled event deletion
-	aut_guild_scheduled_event_delete	=	102,
-	/// Thread create
-	aut_thread_create		=	110,
-	/// Thread update
-	aut_thread_update		=	111,
-	/// Thread delete
-	aut_thread_delete		=	112,
-	/// Application command permissions update
-	aut_appcommand_permission_update	=	121,
-	/// Auto moderation rule creation
-	aut_automod_rule_create		=	140,
-	/// Auto moderation rule update
-	aut_automod_rule_update		=	141,
-	/// Auto moderation rule deletion
-	aut_automod_rule_delete		=	142,
-	/// Message was blocked by Auto Moderation
-	aut_automod_block_message	=	143,
-	/// Message was flagged by Auto Moderation
-	aut_automod_flag_to_channel =	144,
-	/// Member was timed out by Auto Moderation
-	aut_automod_user_communication_disabled =	145,
-};
-
-/**
- * @brief Defines audit log changes
- */
-struct DPP_EXPORT audit_change {
-	/// Optional: Serialised new value of the change, e.g. for nicknames, the new nickname
-	std::string	new_value;
-	/// Optional: Serialised old value of the change, e.g. for nicknames, the old nickname
-	std::string	old_value;
-	/**
-	 * The property name that was changed, e.g. `nick` for nickname changes
-	 * @note For dpp::aut_appcommand_permission_update updates the key is the id of the user, channel, role, or a permission constant that was updated instead of an actual property name
-	 */
-	std::string	key;
-};
-
-/**
- * @brief Extra information for an audit log entry
- */
-struct DPP_EXPORT audit_extra {
-	std::string automod_rule_name; //!< Name of the Auto Moderation rule that was triggered
-	std::string automod_rule_trigger_type; //!< Trigger type of the Auto Moderation rule that was triggered
-	std::string delete_member_days;	//!< number of days after which inactive members were kicked
-	std::string	members_removed;	//!< number of members removed by the prune
-	snowflake	channel_id;		//!< channel in which the entities were targeted
-	snowflake	message_id;		//!< id of the message that was targeted
-	std::string	count;			//!< number of entities that were targeted
-	snowflake	id;			//!< id of the overwritten entity
-	std::string	type;			//!< type of overwritten entity - "0" for "role" or "1" for "member"
-	std::string role_name;		//!< name of the role if type is "0" (not present if type is "1")
-	snowflake	application_id;	//!< ID of the app whose permissions were targeted
-};
-
-/**
- * @brief An individual audit log entry
- */
-struct DPP_EXPORT audit_entry {
-	snowflake			id;		//!< id of the entry
-	/**
-	 * ID of the affected entity (webhook, user, role, etc.) (may be empty)
-	 * @note For dpp::audit_type::aut_appcommand_permission_update updates, it's the command ID or the app ID
-	 */
-	snowflake			target_id;
-	std::vector<audit_change>	changes;	//!< Optional: changes made to the target_id
-	snowflake			user_id;	//!< the user or app that made the changes (may be empty)
-	audit_type			type;		//!< type of action that occurred
-	std::optional<audit_extra>	extra;	//!< Optional: additional info for certain action types
-	std::string			reason;		//!< Optional: the reason for the change (1-512 characters)
-};
-
-/**
- * @brief The auditlog class represents the audit log entries of a guild.
- */
-class DPP_EXPORT auditlog : public json_interface<auditlog>  {
-public:
-	std::vector<audit_entry> entries;	//!< Audit log entries
-	
-	/** Constructor */
-	auditlog() = default;
-
-	/** Destructor */
-	virtual ~auditlog() = default;
-
-	/** Read class values from json object
-	 * @param j A json object to read from
-	 * @return A reference to self
-	 */
-	 auditlog& fill_from_json(nlohmann::json* j);
-};
-
-};
+/************************************************************************************
+ *
+ * D++, A Lightweight C++ library for Discord
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright 2021 Craig Edwards and D++ contributors 
+ * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ************************************************************************************/
+
+#pragma once
+#include <dpp/export.h>
+#include <dpp/snowflake.h>
+#include <dpp/json_fwd.h>
+#include <optional>
+#include <dpp/json_interface.h>
+
+namespace dpp {
+
+/**
+ * @brief Defines types of audit log entry
+ */
+enum audit_type {
+	/**
+	 * @brief Guild update
+	 */
+	aut_guild_update = 1,
+
+	/**
+	 * @brief Channel create
+	 */
+	aut_channel_create = 10,
+
+	/**
+	 * @brief Channel update
+	 */
+	aut_channel_update = 11,
+
+	/**
+	 * @brief Channel delete
+	 */
+	aut_channel_delete = 12,
+
+	/**
+	 * @brief Channel overwrite create
+	 */
+	aut_channel_overwrite_create = 13,
+
+	/**
+	 * @brief Channel overwrite update
+	 */
+	aut_channel_overwrite_update = 14,
+
+	/**
+	 * @brief Channel overwrite delete
+	 */
+	aut_channel_overwrite_delete = 15,
+
+	/**
+	 * @brief Channel member kick
+	 */
+	aut_member_kick	= 20,
+
+	/**
+	 * @brief Channel member prune
+	 */
+	aut_member_prune = 21,
+
+	/**
+	 * @brief Channel member ban add
+	 */
+	aut_member_ban_add = 22,
+
+	/**
+	 * @brief Channel member ban remove
+	 */
+	aut_member_ban_remove = 23,
+
+	/**
+	 * @brief Guild member update
+	 */
+	aut_member_update = 24,
+
+	/**
+	 * @brief Guild member role update
+	 */
+	aut_member_role_update = 25,
+
+	/**
+	 * @brief Guild member move
+	 */
+	aut_member_move	= 26,
+
+	/**
+	 * @brief Guild member voice disconnect
+	 */
+	aut_member_disconnect = 27,
+
+	/**
+	 * @brief Guild bot add
+	 */
+	aut_bot_add = 28,
+
+	/**
+	 * @brief Guild role create
+	 */
+	aut_role_create = 30,
+
+	/**
+	 * @brief Guild role update
+	 */
+	aut_role_update	= 31,
+
+	/**
+	 * @brief Guild role delete
+	 */
+	aut_role_delete	= 32,
+
+	/**
+	 * @brief Guild invite create
+	 */
+	aut_invite_create = 40,
+
+	/**
+	 * @brief Guild invite update
+	 */
+	aut_invite_update = 41,
+
+	/**
+	 * @brief Guild invite delete
+	 */
+	aut_invite_delete = 42,
+
+	/**
+	 * @brief Guild webhook create
+	 */
+	aut_webhook_create = 50,
+
+	/**
+	 * @brief Guild webhook update
+	 */
+	aut_webhook_update = 51,
+
+	/**
+	 * @brief Guild webhook delete
+	 */
+	aut_webhook_delete = 52,
+
+	/**
+	 * @brief Guild emoji create
+	 */
+	aut_emoji_create = 60,
+
+	/**
+	 * @brief Guild emoji update
+	 */
+	aut_emoji_update = 61,
+
+	/**
+	 * @brief Guild emoji delete
+	 */
+	aut_emoji_delete = 62,
+
+	/**
+	 * @brief Guild message delete
+	 */
+	aut_message_delete = 72,
+
+	/**
+	 * @brief Guild message bulk delete
+	 */
+	aut_message_bulk_delete	= 73,
+
+	/**
+	 * @brief Guild message pin
+	 */
+	aut_message_pin	= 74,
+
+	/**
+	 * @brief Guild message unpin
+	 */
+	aut_message_unpin = 75,
+
+	/**
+	 * @brief Guild integration create
+	 */
+	aut_integration_create = 80,
+
+	/**
+	 * @brief Guild integration update
+	 */
+	aut_integration_update = 81,
+
+	/**
+	 * @brief Guild integration delete
+	 */
+	aut_integration_delete = 82,
+
+	/**
+	 * @brief Stage instance create
+	 */
+	aut_stage_instance_create = 83,
+
+	/**
+	 * @brief Stage instance update
+	 */
+	aut_stage_instance_update = 84,
+
+	/**
+	 * @brief stage instance delete
+	 */
+	aut_stage_instance_delete = 85,
+
+	/**
+	 * @brief Sticker create
+	 */
+	aut_sticker_create = 90,
+
+	/**
+	 * @brief Sticker update
+	 */
+	aut_sticker_update = 91,
+
+	/**
+	 * @brief Sticker delete
+	 */
+	aut_sticker_delete = 92,
+
+	/**
+	 * @brief Scheduled event creation
+	 */
+	aut_guild_scheduled_event_create = 100,
+
+	/**
+	 * @brief Scheduled event update
+	 */
+	aut_guild_scheduled_event_update = 101,
+
+	/**
+	 * @brief Scheduled event deletion
+	 */
+	aut_guild_scheduled_event_delete = 102,
+
+	/**
+	 * @brief Thread create
+	 */
+	aut_thread_create = 110,
+
+	/**
+	 * @brief Thread update
+	 */
+	aut_thread_update = 111,
+
+	/**
+	 * @brief Thread delete
+	 */
+	aut_thread_delete = 112,
+
+	/**
+	 * @brief Application command permissions update
+	 */
+	aut_appcommand_permission_update = 121,
+
+	/**
+	 * @brief Auto moderation rule creation
+	 */
+	aut_automod_rule_create	= 140,
+
+	/**
+	 * @brief Auto moderation rule update
+	 */
+	aut_automod_rule_update	= 141,
+
+	/**
+	 * @brief Auto moderation rule deletion
+	 */
+	aut_automod_rule_delete	= 142,
+
+	/**
+	 * @brief Message was blocked by Auto Moderation
+	 */
+	aut_automod_block_message = 143,
+
+	/**
+	 * @brief Message was flagged by Auto Moderation
+	 */
+	aut_automod_flag_to_channel = 144,
+
+	/**
+	 * @brief Member was timed out by Auto Moderation
+	 */
+	aut_automod_user_communication_disabled = 145,
+
+	/**
+	 * @brief Creator monetization request was created
+	 */
+	aut_creator_monetization_request_created = 150,
+
+	/**
+	 * @brief Creator monetization terms were accepted
+	 */
+	aut_creator_monetization_terms_accepted = 151,
+};
+
+/**
+ * @brief Defines audit log changes
+ */
+struct DPP_EXPORT audit_change {
+	/**
+	 * @brief Optional: Serialised new value of the change, e.g. for nicknames, the new nickname.
+	 */
+	std::string new_value;
+
+	/**
+	 * @brief Optional: Serialised old value of the change, e.g. for nicknames, the old nickname.
+	 */
+	std::string old_value;
+
+	/**
+	 * @brief The property name that was changed (e.g. `nick` for nickname changes).
+	 * @note For dpp::aut_appcommand_permission_update updates the key is the id of the user, channel, role, or a permission constant that was updated instead of an actual property name.
+	 */
+	std::string key;
+};
+
+/**
+ * @brief Extra information for an audit log entry
+ */
+struct DPP_EXPORT audit_extra {
+	/**
+	 * @brief Name of the Auto Moderation rule that was triggered.
+	 */
+	std::string automod_rule_name;
+
+	/**
+	 * @brief Trigger type of the Auto Moderation rule that was triggered.
+	 */
+	std::string automod_rule_trigger_type;
+
+	/**
+	 * @brief Number of days after which inactive members were kicked.
+	 */
+	std::string delete_member_days;
+
+	/**
+	 * @brief Number of members removed by the prune.
+	 */
+	std::string members_removed;
+
+	/**
+	 * @brief Channel in which the entities were targeted.
+	 */
+	snowflake channel_id;
+
+	/**
+	 * @brief ID of the message that was targeted.
+	 */
+	snowflake message_id;
+
+	/**
+	 * @brief Number of entities that were targeted.
+	 */
+	std::string count;
+
+	/**
+	 * @brief ID of the overwritten entity.
+	 */
+	snowflake id;
+
+	/**
+	 * @brief Type of overwritten entity - "0" for "role" or "1" for "member"
+	 */
+	std::string type;
+
+	/**
+	 * @brief Name of the role if type is "0" (not present if type is "1").
+	 */
+	std::string role_name;
+
+	/**
+	 * @brief ID of the app whose permissions were targeted
+	 */
+	snowflake application_id;
+};
+
+/**
+ * @brief An individual audit log entry
+ */
+struct DPP_EXPORT audit_entry : public json_interface<audit_entry> {
+protected:
+	friend struct json_interface<audit_entry>;
+
+	/** Read class values from json object
+	 * @param j A json object to read from
+	 * @return A reference to self
+	 */
+	audit_entry& fill_from_json_impl(nlohmann::json* j);
+
+public:
+	/**
+	 * @brief ID of the entry.
+	 */
+	snowflake id;
+
+	/**
+	 * ID of the affected entity (webhook, user, role, etc.) (may be empty)
+	 * @note For dpp::audit_type::aut_appcommand_permission_update updates, it's the command ID or the app ID
+	 */
+	snowflake target_id;
+
+	/**
+	 * @brief Optional: changes made to the target_id.
+	 */
+	std::vector<audit_change> changes;
+
+	/**
+	 * @brief The user or app that made the changes (may be empty).
+	 */
+	snowflake user_id;
+
+	/**
+	 * @brief Type of action that occurred.
+	 */
+	audit_type type;
+
+	/**
+	 * @brief Optional: additional info for certain action types.
+	 */
+	std::optional<audit_extra> extra;
+
+	/**
+	 * @brief Optional: the reason for the change (1-512 characters).
+	 */
+	std::string reason;
+
+	/** Constructor */
+	audit_entry();
+
+	/** Destructor */
+	virtual ~audit_entry() = default;
+};
+
+/**
+ * @brief The auditlog class represents the audit log entries of a guild.
+ */
+class DPP_EXPORT auditlog : public json_interface<auditlog> {
+protected:
+	friend struct json_interface<auditlog>;
+
+	/** Read class values from json object
+	 * @param j A json object to read from
+	 * @return A reference to self
+	 */
+	auditlog& fill_from_json_impl(nlohmann::json* j);
+
+public:
+	/**
+	 * @brief Audit log entries.
+	 */
+	std::vector<audit_entry> entries;
+
+	/** Constructor */
+	auditlog() = default;
+
+	/** Destructor */
+	virtual ~auditlog() = default;
+};
+
+}
diff --git a/3rdParty/dpp/automod.h b/3rdParty/dpp/automod.h
index 12a4afcdc3..a16c92a5fa 100644
--- a/3rdParty/dpp/automod.h
+++ b/3rdParty/dpp/automod.h
@@ -1,363 +1,403 @@
-/************************************************************************************
- *
- * D++, A Lightweight C++ library for Discord
- *
- * Copyright 2021 Craig Edwards and D++ contributors 
- * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- ************************************************************************************/
-
-#pragma once
-#include <dpp/export.h>
-#include <dpp/snowflake.h>
-#include <dpp/managed.h>
-#include <dpp/utility.h>
-#include <dpp/nlohmann/json_fwd.hpp>
-#include <dpp/json_interface.h>
-
-namespace dpp {
-
-/**
- * @brief Possible types of preset filter lists
- */
-enum automod_preset_type : uint8_t {
-	/**
-	 * @brief Strong swearing
-	 */
-	amod_preset_profanity = 1,
-	/**
-	 * @brief Sexual phrases and words
-	 */
-	amod_preset_sexual_content = 2,
-	/**
-	 * @brief Racial and other slurs, hate speech
-	 */
-	amod_preset_slurs = 3,
-};
-
-/**
- * @brief Action types to perform on filtering
- */
-enum automod_action_type : uint8_t {
-	/**
-	 * @brief Block the message
-	 */
-	amod_action_block_message = 1,
-	/**
-	 * @brief Send an alert to a given channel
-	 */
-	amod_action_send_alert = 2,
-	/**
-	 * @brief time out the user
-	 */
-	amod_action_timeout = 3,
-};
-
-/**
- * @brief Event types, only message send is currently supported
- */
-enum automod_event_type : uint8_t {
-	/**
-	 * @brief Trigger on message send or edit
-	 */
-	amod_message_send = 1,
-};
-
-/**
- * @brief Types of moderation to trigger
- */
-enum automod_trigger_type : uint8_t {
-	/**
-	 * @brief Check if content contains words from a user defined list of keywords
-	 */
-	amod_type_keyword = 1,
-	/**
-	 * @brief Harmful/malware links
-	 * @deprecated Removed by Discord
-	 */
-	amod_type_harmful_link = 2,
-	/**
-	 * @brief Check if content represents generic spam
-	 */
-	amod_type_spam = 3,
-	/**
-	 * @brief Check if content contains words from discord pre-defined wordsets
-	 */
-	amod_type_keyword_preset = 4,
-	/**
-	 * @brief Check if content contains more mentions than allowed
-	 */
-	amod_type_mention_spam = 5,
-};
-
-/**
- * @brief Metadata associated with an automod action
- */
-struct DPP_EXPORT automod_metadata : public json_interface<automod_metadata> {
-	/**
-	 * @brief @brief Substrings which will be searched for in content (Maximum of 1000).
-	 *
-	 * Each keyword can be a phrase which contains multiple words.
-	 * All keywords are case insensitive and can be up to 30 characters.
-	 *
-	 * Wildcard symbols (`*`) can be used to customize how each keyword will be matched.
-	 *
-	 * **Examples for the `*` wildcard symbol:**
-	 *
-	 * Prefix - word must start with the keyword
-	 *
-	 * | keyword  | matches                             |
-     * |----------|-------------------------------------|
-     * | cat*     | <u><b>cat</b></u>ch, <u><b>Cat</b></u>apult, <u><b>CAt</b></u>tLE |
-     * | the mat* | <u><b>the mat</b></u>rix                      |
-     *
-     * Suffix - word must end with the keyword
-     *
-     * | keyword  | matches                  |
-     * |----------|--------------------------|
-     * | *cat     | wild<u><b>cat</b></u>, copy<u><b>Cat</b></u> |
-     * | *the mat | brea<u><b>the mat</b></u>          |
-     *
-     * Anywhere - keyword can appear anywhere in the content
-     *
-     * | keyword   | matches                     |
-     * |-----------|-----------------------------|
-     * | \*cat*     | lo<u><b>cat</b></u>ion, edu<u><b>Cat</b></u>ion |
-     * | \*the mat* | brea<u><b>the mat</b></u>ter          |
-     *
-     * Whole Word - keyword is a full word or phrase and must be surrounded by whitespace at the beginning and end
-     *
-     * | keyword | matches     |
-     * |---------|-------------|
-     * | cat     | <u><b>Cat</b></u>     |
-     * | the mat | <u><b>the mat</b></u> |
-     *
-	 */
-	std::vector<std::string> keywords;
-
-	/**
-	 * @brief Regular expression patterns which will be matched against content (Maximum of 10).
-	 *
-	 * Only Rust flavored regex is currently supported, which can be tested in online editors such as [Rustexp](https://rustexp.lpil.uk/).
-	 * Each regex pattern can be up to 260 characters.
-	 */
-	std::vector<std::string> regex_patterns;
-
-	/**
-	 * @brief Preset keyword list types to moderate
-	 * @see automod_preset_type
-	 */
-	std::vector<automod_preset_type> presets;
-
-	/**
-	 * @brief Substrings which should not trigger the rule.
-	 *
-	 * Each keyword can be a phrase which contains multiple words.
-	 * All keywords are case insensitive and can be up to 30 characters.
-	 *
-	 * Wildcard symbols (`*`) can be used to customize how each keyword will be matched.
-	 *
-	 * **Examples for the `*` wildcard symbol:**
-	 *
-	 * Prefix - word must start with the keyword
-	 *
-	 * | keyword  | matches                             |
-     * |----------|-------------------------------------|
-     * | cat*     | <u><b>cat</b></u>ch, <u><b>Cat</b></u>apult, <u><b>CAt</b></u>tLE |
-     * | the mat* | <u><b>the mat</b></u>rix                      |
-     *
-     * Suffix - word must end with the keyword
-     *
-     * | keyword  | matches                  |
-     * |----------|--------------------------|
-     * | *cat     | wild<u><b>cat</b></u>, copy<u><b>Cat</b></u> |
-     * | *the mat | brea<u><b>the mat</b></u>          |
-     *
-     * Anywhere - keyword can appear anywhere in the content
-     *
-     * | keyword   | matches                     |
-     * |-----------|-----------------------------|
-     * | \*cat*     | lo<u><b>cat</b></u>ion, edu<u><b>Cat</b></u>ion |
-     * | \*the mat* | brea<u><b>the mat</b></u>ter          |
-     *
-     * Whole Word - keyword is a full word or phrase and must be surrounded by whitespace at the beginning and end
-     *
-     * | keyword | matches     |
-     * |---------|-------------|
-     * | cat     | <u><b>Cat</b></u>     |
-     * | the mat | <u><b>the mat</b></u> |
-     *
-	 */
-	std::vector<std::string> allow_list;
-
-	/**
-	 * @brief Total number of unique role and user mentions allowed per message (Maximum of 50)
-	 */
-	uint8_t mention_total_limit;
-
-	/**
-	 * @brief Construct a new automod metadata object
-	 */
-	automod_metadata();
-
-	/**
-	 * @brief Destroy the automod metadata object
-	 */
-	virtual ~automod_metadata();
-
-	/**
-	 * @brief Fill object properties from JSON
-	 *
-	 * @param j JSON to fill from
-	 * @return automod_metadata& Reference to self
-	 */
-	automod_metadata& fill_from_json(nlohmann::json* j);
-
-	/**
-	 * @brief Build a json string for this object
-	 *
-	 * @return std::string JSON string
-	 */
-	virtual std::string build_json(bool with_id = false) const;
-
-};
-
-/**
- * @brief Represents an automod action
- */
-struct DPP_EXPORT automod_action : public json_interface<automod_action> {
-	/**
-	 * @brief Type of action to take
-	 */
-	automod_action_type type;
-
-	/**
-	 * @brief Channel ID, for type dpp::amod_action_send_alert
-	 */
-	snowflake channel_id;
-
-	/**
-	 * @brief Timeout duration in seconds (Maximum of 2419200), for dpp::amod_action_timeout
-	 * 
-	 */
-	int32_t duration_seconds;
-
-	/**
-	 * @brief Construct a new automod action object
-	 */
-	automod_action();
-
-	/**
-	 * @brief Destroy the automod action object
-	 */
-	virtual ~automod_action();
-
-	/**
-	 * @brief Fill object properties from JSON
-	 *
-	 * @param j JSON to fill from
-	 * @return automod_action& Reference to self
-	 */
-	automod_action& fill_from_json(nlohmann::json* j);
-
-	/**
-	 * @brief Build a json string for this object
-	 *
-	 * @return std::string JSON string
-	 */
-	virtual std::string build_json(bool with_id = false) const;
-};
-
-/**
- * @brief Represents an automod rule
- */
-class DPP_EXPORT automod_rule : public managed, public json_interface<automod_rule> {
-public:
-	/**
-	 * @brief the id of this rule
-	 */
-	snowflake       	id;
-	/**
-	 * @brief the guild which this rule belongs to
-	 */
-	snowflake       	guild_id;
-	/**
-	 * @brief the rule name
-	 */
-	std::string     	name;
-	/**
-	 * @brief The user which first created this rule
-	 */
-	snowflake       	creator_id;
-	/**
-	 * @brief The rule event type
-	 */
-	automod_event_type	event_type;
-	/**
-	 * @brief The rule trigger type
-	 */
-	automod_trigger_type	trigger_type;
-	/**
-	 * @brief The rule trigger metadata
-	 */
-	automod_metadata	trigger_metadata;
-	/**
-	 * @brief the actions which will execute when the rule is triggered
-	 */
-	std::vector<automod_action> actions;
-	/**
-	 * @brief Whether the rule is enabled
-	 */
-	bool			enabled;
-	/**
-	 * @brief the role ids that should not be affected by the rule (Maximum of 20)
-	 */
-	std::vector<snowflake>	exempt_roles;
-	/**
-	 * @brief the channel ids that should not be affected by the rule (Maximum of 50)
-	 */
-	std::vector<snowflake>	exempt_channels;
-
-	/**
-	 * @brief Construct a new automod rule object
-	 */
-	automod_rule();
-
-	/**
-	 * @brief Destroy the automod rule object
-	 */
-	virtual ~automod_rule();
-
-	/**
-	 * @brief Fill object properties from JSON
-	 *
-	 * @param j JSON to fill from
-	 * @return automod_rule& Reference to self
-	 */
-	automod_rule& fill_from_json(nlohmann::json* j);
-
-	/**
-	 * @brief Build a json string for this object
-	 *
-	 * @return std::string JSON string
-	 */
-	virtual std::string build_json(bool with_id = false) const;
-};
-
-/** A group of automod rules.
- */
-typedef std::unordered_map<snowflake, automod_rule> automod_rule_map;
-
-};
+/************************************************************************************
+ *
+ * D++, A Lightweight C++ library for Discord
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright 2021 Craig Edwards and D++ contributors 
+ * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ************************************************************************************/
+
+#pragma once
+#include <dpp/export.h>
+#include <dpp/snowflake.h>
+#include <dpp/managed.h>
+#include <dpp/utility.h>
+#include <dpp/json_fwd.h>
+#include <dpp/json_interface.h>
+
+namespace dpp {
+
+/**
+ * @brief Possible types of preset filter lists
+ */
+enum automod_preset_type : uint8_t {
+	/**
+	 * @brief Strong swearing
+	 */
+	amod_preset_profanity = 1,
+
+	/**
+	 * @brief Sexual phrases and words
+	 */
+	amod_preset_sexual_content = 2,
+
+	/**
+	 * @brief Racial and other slurs, hate speech
+	 */
+	amod_preset_slurs = 3,
+};
+
+/**
+ * @brief Action types to perform on filtering
+ */
+enum automod_action_type : uint8_t {
+	/**
+	 * @brief Blocks the message and prevents it from being posted.
+	 * A custom explanation can be specified and shown to members whenever their message is blocked
+	 */
+	amod_action_block_message = 1,
+
+	/**
+	 * @brief Send an alert to a given channel
+	 */
+	amod_action_send_alert = 2,
+
+	/**
+	 * @brief timeout the user
+	 * @note Can only be set up for rules with trigger types of dpp::amod_type_keyword and dpp::amod_type_mention_spam
+	 */
+	amod_action_timeout = 3,
+};
+
+/**
+ * @brief Event types, only message send is currently supported
+ */
+enum automod_event_type : uint8_t {
+	/**
+	 * @brief Trigger on message send or edit
+	 */
+	amod_message_send = 1,
+};
+
+/**
+ * @brief Types of moderation to trigger
+ */
+enum automod_trigger_type : uint8_t {
+	/**
+	 * @brief Check if content contains words from a user defined list of keywords (max 6 of this type per guild)
+	 */
+	amod_type_keyword = 1,
+
+	/**
+	 * @brief Harmful/malware links
+	 * @deprecated Removed by Discord
+	 */
+	amod_type_harmful_link = 2,
+
+	/**
+	 * @brief Check if content represents generic spam (max 1 of this type per guild)
+	 */
+	amod_type_spam = 3,
+
+	/**
+	 * @brief Check if content contains words from discord pre-defined wordsets (max 1 of this type per guild)
+	 */
+	amod_type_keyword_preset = 4,
+
+	/**
+	 * @brief Check if content contains more mentions than allowed (max 1 of this type per guild)
+	 */
+	amod_type_mention_spam = 5,
+};
+
+/**
+ * @brief Metadata associated with an automod action. Different fields are relevant based on the value of dpp::automod_rule::trigger_type.
+ */
+struct DPP_EXPORT automod_metadata : public json_interface<automod_metadata> {
+protected:
+	friend struct json_interface<automod_metadata>;
+
+	/**
+	 * @brief Fill object properties from JSON
+	 *
+	 * @param j JSON to fill from
+	 * @return automod_metadata& Reference to self
+	 */
+	automod_metadata& fill_from_json_impl(nlohmann::json* j);
+
+	/**
+	 * @brief Build a json for this object
+	 *
+	 * @return json JSON object
+	 */
+	virtual json to_json_impl(bool with_id = false) const;
+
+public:
+	/**
+	 * @brief @brief Substrings which will be searched for in content (Maximum of 1000).
+	 *
+	 * Each keyword can be a phrase which contains multiple words.
+	 * All keywords are case insensitive and can be up to 60 characters.
+	 *
+	 * Wildcard symbols (`*`) can be used to customize how each keyword will be matched.
+	 *
+	 * **Examples for the `*` wildcard symbol:**
+	 *
+	 * Prefix - word must start with the keyword
+	 *
+	 * | keyword  | matches                             |
+     	 * |----------|-------------------------------------|
+     	 * | cat*     | <u><b>cat</b></u>ch, <u><b>Cat</b></u>apult, <u><b>CAt</b></u>tLE |
+     	 * | the mat* | <u><b>the mat</b></u>rix                      |
+     	 *
+     	 * Suffix - word must end with the keyword
+     	 *
+     	 * | keyword  | matches                  |
+     	 * |----------|--------------------------|
+     	 * | *cat     | wild<u><b>cat</b></u>, copy<u><b>Cat</b></u> |
+     	 * | *the mat | brea<u><b>the mat</b></u>          |
+     	 *
+     	 * Anywhere - keyword can appear anywhere in the content
+    	 *
+    	 * | keyword   | matches                     |
+    	 * |-----------|-----------------------------|
+    	 * | \*cat*     | lo<u><b>cat</b></u>ion, edu<u><b>Cat</b></u>ion |
+     	 * | \*the mat* | brea<u><b>the mat</b></u>ter          |
+     	 *
+    	 * Whole Word - keyword is a full word or phrase and must be surrounded by whitespace at the beginning and end
+    	 *
+    	 * | keyword | matches     |
+    	 * |---------|-------------|
+    	 * | cat     | <u><b>Cat</b></u>     |
+    	 * | the mat | <u><b>the mat</b></u> |
+    	 *
+	 */
+	std::vector<std::string> keywords;
+
+	/**
+	 * @brief Regular expression patterns which will be matched against content (Maximum of 10).
+	 *
+	 * Only Rust flavored regex is currently supported, which can be tested in online editors such as [Rustexp](https://rustexp.lpil.uk/).
+	 * Each regex pattern can be up to 260 characters.
+	 */
+	std::vector<std::string> regex_patterns;
+
+	/**
+	 * @brief Preset keyword list types to moderate
+	 * @see automod_preset_type
+	 */
+	std::vector<automod_preset_type> presets;
+
+	/**
+	 * @brief Substrings which should not trigger the rule (Maximum of 100 for the trigger type dpp::amod_type_keyword, Maximum of 1000 for the trigger type dpp::amod_type_keyword_preset).
+	 *
+	 * Each keyword can be a phrase which contains multiple words.
+	 * All keywords are case insensitive and can be up to 60 characters.
+	 *
+	 * Wildcard symbols (`*`) can be used to customize how each keyword will be matched.
+	 *
+	 * **Examples for the `*` wildcard symbol:**
+	 *
+	 * Prefix - word must start with the keyword
+	 *
+	 * | keyword  | matches                             |
+     	 * |----------|-------------------------------------|
+     	 * | cat*     | <u><b>cat</b></u>ch, <u><b>Cat</b></u>apult, <u><b>CAt</b></u>tLE |
+     	 * | the mat* | <u><b>the mat</b></u>rix                      |
+     	 *
+     	 * Suffix - word must end with the keyword
+     	 *
+     	 * | keyword  | matches                  |
+     	 * |----------|--------------------------|
+     	 * | *cat     | wild<u><b>cat</b></u>, copy<u><b>Cat</b></u> |
+     	 * | *the mat | brea<u><b>the mat</b></u>          |
+     	 *
+     	 * Anywhere - keyword can appear anywhere in the content
+     	 *
+     	 * | keyword   | matches                     |
+     	 * |-----------|-----------------------------|
+     	 * | \*cat*     | lo<u><b>cat</b></u>ion, edu<u><b>Cat</b></u>ion |
+     	 * | \*the mat* | brea<u><b>the mat</b></u>ter          |
+     	 *
+     	 * Whole Word - keyword is a full word or phrase and must be surrounded by whitespace at the beginning and end
+     	 *
+     	 * | keyword | matches     |
+     	 * |---------|-------------|
+     	 * | cat     | <u><b>Cat</b></u>     |
+     	 * | the mat | <u><b>the mat</b></u> |
+     	 *
+	 */
+	std::vector<std::string> allow_list;
+
+	/**
+	 * @brief Total number of unique role and user mentions allowed per message (Maximum of 50)
+	 */
+	uint8_t mention_total_limit;
+
+	/**
+	 * @brief Whether to automatically detect mention raids
+	 */
+	bool mention_raid_protection_enabled;
+
+	/**
+	 * @brief Construct a new automod metadata object
+	 */
+	automod_metadata();
+
+	/**
+	 * @brief Destroy the automod metadata object
+	 */
+	virtual ~automod_metadata();
+};
+
+/**
+ * @brief Represents an automod action
+ */
+struct DPP_EXPORT automod_action : public json_interface<automod_action> {
+protected:
+	friend struct json_interface<automod_action>;
+
+	/**
+	 * @brief Fill object properties from JSON
+	 *
+	 * @param j JSON to fill from
+	 * @return automod_action& Reference to self
+	 */
+	automod_action& fill_from_json_impl(nlohmann::json* j);
+
+	/**
+	 * @brief Build a json for this object
+	 *
+	 * @return json JSON object
+	 */
+	virtual json to_json_impl(bool with_id = false) const;
+
+public:
+	/**
+	 * @brief Type of action to take
+	 */
+	automod_action_type type;
+
+	/**
+	 * @brief Channel ID to which user content should be logged, for type dpp::amod_action_send_alert
+	 */
+	snowflake channel_id;
+
+	/**
+	 * @brief Additional explanation that will be shown to members whenever their message is blocked. For type dpp::amod_action_block_message
+	 */
+	std::string custom_message;
+
+	/**
+	 * @brief Timeout duration in seconds (Maximum of 2419200), for dpp::amod_action_timeout
+	 */
+	uint32_t duration_seconds;
+
+	/**
+	 * @brief Construct a new automod action object
+	 */
+	automod_action();
+
+	/**
+	 * @brief Destroy the automod action object
+	 */
+	virtual ~automod_action();
+};
+
+/**
+ * @brief Represents an automod rule
+ */
+class DPP_EXPORT automod_rule : public managed, public json_interface<automod_rule> {
+protected:
+	friend struct json_interface<automod_rule>;
+
+	/**
+	 * @brief Fill object properties from JSON
+	 *
+	 * @param j JSON to fill from
+	 * @return automod_rule& Reference to self
+	 */
+	automod_rule& fill_from_json_impl(nlohmann::json* j);
+
+	/**
+	 * @brief Build a json string for this object
+	 *
+	 * @return json JSON object
+	 */
+	virtual json to_json_impl(bool with_id = false) const;
+
+public:
+	/**
+	 * @brief the id of this rule
+	 */
+	snowflake       	id;
+
+	/**
+	 * @brief the guild which this rule belongs to
+	 */
+	snowflake       	guild_id;
+
+	/**
+	 * @brief the rule name
+	 */
+	std::string     	name;
+
+	/**
+	 * @brief The user which first created this rule
+	 */
+	snowflake       	creator_id;
+
+	/**
+	 * @brief The rule event type
+	 */
+	automod_event_type	event_type;
+
+	/**
+	 * @brief The rule trigger type
+	 */
+	automod_trigger_type	trigger_type;
+
+	/**
+	 * @brief The rule trigger metadata
+	 */
+	automod_metadata	trigger_metadata;
+
+	/**
+	 * @brief the actions which will execute when the rule is triggered
+	 */
+	std::vector<automod_action> actions;
+
+	/**
+	 * @brief Whether the rule is enabled
+	 */
+	bool			enabled;
+
+	/**
+	 * @brief the role ids that should not be affected by the rule (Maximum of 20)
+	 */
+	std::vector<snowflake>	exempt_roles;
+
+	/**
+	 * @brief the channel ids that should not be affected by the rule (Maximum of 50)
+	 */
+	std::vector<snowflake>	exempt_channels;
+
+	/**
+	 * @brief Construct a new automod rule object
+	 */
+	automod_rule();
+
+	/**
+	 * @brief Destroy the automod rule object
+	 */
+	virtual ~automod_rule();
+};
+
+/** A group of automod rules.
+ */
+typedef std::unordered_map<snowflake, automod_rule> automod_rule_map;
+
+}
diff --git a/3rdParty/dpp/ban.h b/3rdParty/dpp/ban.h
index ea35ca4782..e8c6cc4f5d 100644
--- a/3rdParty/dpp/ban.h
+++ b/3rdParty/dpp/ban.h
@@ -1,67 +1,69 @@
-/************************************************************************************
- *
- * D++, A Lightweight C++ library for Discord
- *
- * Copyright 2021 Craig Edwards and D++ contributors 
- * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- ************************************************************************************/
-
-#pragma once
-#include <dpp/export.h>
-#include <dpp/snowflake.h>
-#include <dpp/nlohmann/json_fwd.hpp>
-#include <dpp/json_interface.h>
-#include <unordered_map>
-
-namespace dpp {
-
-/**
- * @brief The ban class represents a ban on a guild.
- * 
- */
-class DPP_EXPORT ban : public json_interface<ban> {
-public:
-	/** The ban reason */
-	std::string reason;
-	/** User ID the ban applies to */
-	snowflake user_id;
-	
-	/** Constructor */
-	ban();
-
-	/** Destructor */
-	virtual ~ban() = default;
-
-	/** Read class values from json object
-	 * @param j A json object to read from
-	 * @return A reference to self
-	 */
-	 ban& fill_from_json(nlohmann::json* j);
-
-	/**
-	 * @brief Build json representation of a ban
-	 * @param with_id Include ID in json
-	 * 
-	 * @return std::string stringified json
-	 */
-	std::string build_json(bool with_id = false) const;
-};
-
-/** A group of bans
- */
-typedef std::unordered_map<snowflake, ban> ban_map;
-
-};
+/************************************************************************************
+ *
+ * D++, A Lightweight C++ library for Discord
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright 2021 Craig Edwards and D++ contributors 
+ * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ************************************************************************************/
+
+#pragma once
+#include <dpp/export.h>
+#include <dpp/snowflake.h>
+#include <dpp/json_fwd.h>
+#include <dpp/json_interface.h>
+#include <unordered_map>
+
+namespace dpp {
+
+/**
+ * @brief The ban class represents a ban on a guild.
+ * 
+ */
+class DPP_EXPORT ban : public json_interface<ban> {
+protected:
+	friend struct json_interface<ban>;
+
+	/** Read class values from json object
+	 * @param j A json object to read from
+	 * @return A reference to self
+	 */
+	ban& fill_from_json_impl(nlohmann::json* j);
+
+public:
+	/**
+	 * @brief The ban reason.
+	 */
+	std::string reason;
+
+	/**
+	 * @brief User ID the ban applies to.
+	 */
+	snowflake user_id;
+
+	/** Constructor */
+	ban();
+
+	/** Destructor */
+	virtual ~ban() = default;
+};
+
+/**
+ * @brief A group of bans. The key is the user ID.
+ */
+typedef std::unordered_map<snowflake, ban> ban_map;
+
+}
diff --git a/3rdParty/dpp/bignum.h b/3rdParty/dpp/bignum.h
new file mode 100644
index 0000000000..dda2975d32
--- /dev/null
+++ b/3rdParty/dpp/bignum.h
@@ -0,0 +1,119 @@
+/************************************************************************************
+ *
+ * D++, A Lightweight C++ library for Discord
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright 2021 Craig Edwards and D++ contributors
+ * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ************************************************************************************/
+
+#pragma once
+#include <dpp/export.h>
+#include <dpp/snowflake.h>
+#include <memory>
+
+namespace dpp {
+
+/**
+ * @brief This contains the OpenSSL structs. It is not public,
+ * so that the public interface doesn't depend on OpenSSL directly.
+ */
+struct openssl_bignum;
+
+/**
+* @brief An arbitrary length integer number.
+ * Officially, the Discord documentation says that permission values can be any arbitrary
+ * number of digits. At time of writing there are only 50 bits of permissions, but this is
+ * set to grow larger and potentially past 64 bits. They will continue to send this data
+ * as a huge single integer at that point, because this is obviously sensible. /s
+ *
+ * @note dpp::bignumber uses OpenSSL BN_* under the hood, as we include openssl anyway
+ * for HTTPS.
+*/
+class DPP_EXPORT bignumber {
+	/**
+	 * @brief Forward declaration of structure which implements proper destructor for unique_ptr<openssl_bignum> as type is incomplete in header
+	 * custom deleter defined where openssl_bignum is complete
+	 */
+	struct DPP_EXPORT bn_deleter {
+
+		/**
+		 * @brief Deletes an `openssl_bignum` instance.
+		 *
+		 * This operator is invoked automatically by `std::unique_ptr` when the
+		 * managed object needs to be destroyed.
+		 *
+		 * @param p Pointer to the `openssl_bignum` instance to delete.
+		 */
+		void operator()(openssl_bignum* p) const noexcept;
+	};
+
+	/**
+	 * @brief Internal opaque struct to contain OpenSSL things
+	 */
+	std::unique_ptr<openssl_bignum, bn_deleter> ssl_bn;
+
+public:
+	/**
+	 * @brief Construct a new bignumber object
+	 */
+	bignumber() = default;
+
+	/**
+	 * @brief Parse a std::string of an arbitrary length number into
+	 * a bignumber.
+	 * @param number_string string representation of a number. The
+	 * number must be an integer, and can be positive or negative.
+	 * @note Prefixing number_string with 0x will parse it as hexadecimal.
+	 * This is not case sensitive.
+	 */
+	bignumber(const std::string& number_string);
+
+	/**
+	 * @brief Build a bignumber from a vector of 64 bit values.
+	 * The values are accepted in "reverse order", so the first vector
+	 * entry at index 0 is the leftmost 64 bits of the bignum.
+	 * The vector can be any arbitrary length.
+	 * @param bits Vector of 64 bit values which represent the number
+	 */
+	bignumber(std::vector<uint64_t> bits);
+
+	/**
+	 * @brief Default destructor
+	 */
+	~bignumber() = default;
+
+	/**
+	 * @brief Get the string representation of the bignumber.
+	 * @param hex If false (the default) the number is returned in
+	 * decimal, else if this parameter is true, it will be returned
+	 * as hex (without leading '0x')
+	 * @return String representation of bignumber
+	 */
+	[[nodiscard]] std::string get_number(bool hex = false) const;
+
+	/**
+	 * @brief Get the array of 64 bit values that represents the
+	 * bignumber. This is what we should use to store bignumbers
+	 * in memory, not this bignumber class itself, as the bignumber
+	 * class instantiates OpenSSL structs and takes significantly
+	 * more ram than just a vector.
+	 * @return Vector of 64 bit values representing the bignumber
+	 */
+	[[nodiscard]] std::vector<uint64_t> get_binary() const;
+};
+
+}
diff --git a/3rdParty/dpp/cache.h b/3rdParty/dpp/cache.h
index 7997e8d75a..f1d519c107 100644
--- a/3rdParty/dpp/cache.h
+++ b/3rdParty/dpp/cache.h
@@ -1,272 +1,274 @@
-/************************************************************************************
- *
- * D++, A Lightweight C++ library for Discord
- *
- * Copyright 2021 Craig Edwards and D++ contributors 
- * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- ************************************************************************************/
-
-#pragma once
-#include <dpp/export.h>
-#include <dpp/snowflake.h>
-#include <dpp/managed.h>
-#include <unordered_map>
-#include <mutex>
-#include <shared_mutex>
-
-namespace dpp {
-
-extern DPP_EXPORT std::unordered_map<managed*, time_t> deletion_queue;
-extern DPP_EXPORT std::mutex deletion_mutex;
-
-/** forward declaration */
-class guild_member;
-
-/**
- * @brief A cache object maintains a cache of dpp::managed objects.
- * 
- * This is for example users, channels or guilds. You may instantiate
- * your own caches, to contain any type derived from dpp::managed including
- * your own types.
- * 
- * @note This class is critical to the operation of the library and therefore
- * designed with thread safety in mind.
- * @tparam T class type to store, which should be derived from dpp::managed.
- */
-template<class T> class cache {
-private:
-	/**
-	 * @brief Mutex to protect the cache
-	 * 
-	 * This is a shared mutex so reading is cheap.
-	 */
-	std::shared_mutex cache_mutex;
-
-	/**
-	 * @brief Container of pointers to cached items
-	 */
-	std::unordered_map<snowflake, T*>* cache_map;
-public:
-
-	/**
-	 * @brief Construct a new cache object.
-	 * 
-	 * Caches must contain classes derived from dpp::managed.
-	 */
-	cache() {
-		cache_map = new std::unordered_map<snowflake, T*>;
-	}
-
-	/**
-	 * @brief Destroy the cache object
-	 * 
-	 * @note This does not delete objects stored in the cache.
-	 */
-	~cache() {
-		std::unique_lock l(cache_mutex);
-		delete cache_map;			
-	}
-
-	/**
-	 * @brief Store an object in the cache. Passing a nullptr will have no effect.
-	 * 
-	 * The object must be derived from dpp::managed and should be allocated on the heap.
-	 * Generally this is done via `new`. Once stored in the cache the lifetime of the stored
-	 * object is managed by the cache class unless the cache is deleted (at which point responsibility
-	 * for deleting the object returns to its allocator). Objects stored are removed when the
-	 * cache::remove() method is called by placing them into a garbage collection queue for deletion
-	 * within the next 60 seconds, which are then deleted in bulk for efficiency and to aid thread
-	 * safety.
-	 * 
-	 * @note Adding an object to the cache with an ID which already exists replaces that entry.
-	 * The previously entered cache item is inserted into the garbage collection queue for deletion
-	 * similarly to if cache::remove() was called first.
-	 * 
-	 * @param object object to store. Storing a pointer to the cache relinquishes ownership to the cache object.
-	 */
-	void store(T* object) {
-		if (!object) {
-			return;
-		}
-		std::unique_lock l(cache_mutex);
-		auto existing = cache_map->find(object->id);
-		if (existing == cache_map->end()) {
-			(*cache_map)[object->id] = object;
-		} else if (object != existing->second) {
-			/* Flag old pointer for deletion and replace */
-			std::lock_guard<std::mutex> delete_lock(deletion_mutex);
-			deletion_queue[existing->second] = time(NULL);
-			(*cache_map)[object->id] = object;
-		}
-	}
-
-	/**
-	 * @brief Remove an object from the cache.
-	 * 
-	 * @note The cache class takes ownership of the pointer, and calling this method will
-	 * cause deletion of the object within the next 60 seconds by means of a garbage
-	 * collection queue. This queue aids in efficiency by freeing memory in bulk, and
-	 * assists in thread safety by ensuring that all deletions can be locked and freed
-	 * at the same time.
-	 * 
-	 * @param object object to remove. Passing a nullptr will have no effect.
-	 */
-	void remove(T* object) {
-		if (!object) {
-			return;
-		}
-		std::unique_lock l(cache_mutex);
-		std::lock_guard<std::mutex> delete_lock(deletion_mutex);
-		auto existing = cache_map->find(object->id);
-		if (existing != cache_map->end()) {
-			cache_map->erase(existing);
-			deletion_queue[object] = time(NULL);
-		}
-	}
-
-	/**
-	 * @brief Find an object in the cache by id.
-	 * 
-	 * The cache is searched for the object. All dpp::managed objects have a snowflake id
-	 * (this is the only field dpp::managed actually has).
-	 * 
-	 * @warning Do not hang onto objects returned by cache::find() indefinitely. They may be
-	 * deleted at a later date if cache::remove() is called. If persistence is required,
-	 * take a copy of the object after checking its pointer is non-null.
-	 * 
-	 * @param id Object snowflake id to find
-	 * @return Found object or nullptr if the object with this id does not exist.
-	 */
-	T* find(snowflake id) {
-		std::shared_lock l(cache_mutex);
-		auto r = cache_map->find(id);
-		if (r != cache_map->end()) {
-			return r->second;
-		}
-		return nullptr;
-	}
-
-	/**
-	 * @brief Return a count of the number of items in the cache.
-	 * 
-	 * This is used by the library e.g. to count guilds, users, and roles
-	 * stored within caches.
-	 * get
-	 * @return uint64_t count of items in the cache
-	 */
-	uint64_t count() {
-		std::shared_lock l(cache_mutex);
-		return cache_map->size();
-	}
-
-	/** 
-	 * @brief Return the cache's locking mutex.
-	 * 
-	 * Use this whenever you manipulate or iterate raw elements in the cache!
-	 * 
-	 * @note If you are only reading from the cache's container, wrap this
-	 * mutex in `std::shared_lock`, else wrap it in a `std::unique_lock`.
-	 * Shared locks will allow for multiple readers whilst blocking writers,
-	 * and unique locks will allow only one writer whilst blocking readers
-	 * and writers.
-	 * 
-	 * **Example:**
-	 * 
-	 * ```cpp
-	 * dpp::cache<guild>* c = dpp::get_guild_cache();
-	 * std::unordered_map<snowflake, guild*>& gc = c->get_container();
-	 * std::shared_lock l(c->get_mutex()); // MUST LOCK HERE
-	 * for (auto g = gc.begin(); g != gc.end(); ++g) {
-	 *     dpp::guild* gp = (dpp::guild*)g->second;
-	 *     // Do something here with the guild* in 'gp'
-	 * }
-	 * ``` 
-	 * 
-	 * @return The mutex used to protect the container
-	 */
-	std::shared_mutex& get_mutex() {
-		return this->cache_mutex;			
-	}
-
-	/**
-	 * @brief Get the container unordered map
-	 * 
-	 * @warning Be sure to use cache::get_mutex() correctly if you
-	 * manipulate or iterate the map returned by this method! If you do
-	 * not, this is not thread safe and will cause crashes!
-	 * 
-	 * @see cache::get_mutex
-	 * 
-	 * @return A reference to the cache's container map
-	 */
-	auto & get_container() {
-		return *(this->cache_map);		
-	}
-
-	/**
-	 * @brief "Rehash" a cache by reallocating the map and copying
-	 * all elements into the new one.
-	 * 
-	 * Over a long running timeframe, unordered maps can grow in size
-	 * due to bucket allocation, this function frees that unused memory
-	 * to keep the maps in control over time. If this is an issue which
-	 * is apparent with your use of dpp::cache objects, you should periodically
-	 * call this method.
-	 * 
-	 * @warning May be time consuming! This function is O(n) in relation to the
-	 * number of cached entries.
-	 */
-	void rehash() {
-		std::unique_lock l(cache_mutex);
-		std::unordered_map<snowflake, T*>* n = new std::unordered_map<snowflake, T*>;
-		n->reserve(cache_map->size());
-		for (auto t = cache_map->begin(); t != cache_map->end(); ++t) {
-			n->insert(*t);
-		}
-		delete cache_map;
-		cache_map = n;
-	}
-
-	/**
-	 * @brief Get "real" size in RAM of the cached objects
-	 * 
-	 * This does not include metadata used to maintain the unordered map itself.
-	 * 
-	 * @return size_t size of cache in bytes
-	 */
-	size_t bytes() {
-		std::shared_lock l(cache_mutex);
-		return sizeof(this) + (cache_map->bucket_count() * sizeof(size_t));
-	}
-
-};
-
-/** Run garbage collection across all caches removing deleted items
- * that have been deleted over 60 seconds ago.
- */
-void DPP_EXPORT garbage_collection();
-
-#define cache_decl(type, setter, getter, counter) DPP_EXPORT class type * setter (snowflake id); DPP_EXPORT cache<class type> * getter ();  DPP_EXPORT uint64_t counter ();
-
-/* Declare major caches */
-cache_decl(user, find_user, get_user_cache, get_user_count);
-cache_decl(guild, find_guild, get_guild_cache, get_guild_count);
-cache_decl(role, find_role, get_role_cache, get_role_count);
-cache_decl(channel, find_channel, get_channel_cache, get_channel_count);
-cache_decl(emoji, find_emoji, get_emoji_cache, get_emoji_count);
-
-};
-
+/************************************************************************************
+ *
+ * D++, A Lightweight C++ library for Discord
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright 2021 Craig Edwards and D++ contributors 
+ * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ************************************************************************************/
+
+#pragma once
+#include <dpp/export.h>
+#include <dpp/snowflake.h>
+#include <dpp/managed.h>
+#include <unordered_map>
+#include <mutex>
+#include <shared_mutex>
+
+namespace dpp {
+
+extern DPP_EXPORT std::unordered_map<managed*, time_t> deletion_queue;
+extern DPP_EXPORT std::mutex deletion_mutex;
+
+/** forward declaration */
+class guild_member;
+
+/**
+ * @brief A cache object maintains a cache of dpp::managed objects.
+ * 
+ * This is for example users, channels or guilds. You may instantiate
+ * your own caches, to contain any type derived from dpp::managed including
+ * your own types.
+ * 
+ * @note This class is critical to the operation of the library and therefore
+ * designed with thread safety in mind.
+ * @tparam T class type to store, which should be derived from dpp::managed.
+ */
+template<class T> class cache {
+private:
+	/**
+	 * @brief Mutex to protect the cache
+	 * 
+	 * This is a shared mutex so reading is cheap.
+	 */
+	std::shared_mutex cache_mutex;
+
+	/**
+	 * @brief Container of pointers to cached items
+	 */
+	std::unordered_map<snowflake, T*>* cache_map;
+public:
+
+	/**
+	 * @brief Construct a new cache object.
+	 * 
+	 * @note Caches must contain classes derived from dpp::managed.
+	 */
+	cache() {
+		cache_map = new std::unordered_map<snowflake, T*>;
+	}
+
+	/**
+	 * @brief Destroy the cache object
+	 * 
+	 * @note This does not delete objects stored in the cache.
+	 */
+	~cache() {
+		std::unique_lock l(cache_mutex);
+		delete cache_map;			
+	}
+
+	/**
+	 * @brief Store an object in the cache. Passing a nullptr will have no effect.
+	 * 
+	 * The object must be derived from dpp::managed and should be allocated on the heap.
+	 * Generally this is done via `new`. Once stored in the cache the lifetime of the stored
+	 * object is managed by the cache class unless the cache is deleted (at which point responsibility
+	 * for deleting the object returns to its allocator). Objects stored are removed when the
+	 * cache::remove() method is called by placing them into a garbage collection queue for deletion
+	 * within the next 60 seconds, which are then deleted in bulk for efficiency and to aid thread
+	 * safety.
+	 * 
+	 * @note Adding an object to the cache with an ID which already exists replaces that entry.
+	 * The previously entered cache item is inserted into the garbage collection queue for deletion
+	 * similarly to if cache::remove() was called first.
+	 * 
+	 * @param object object to store. Storing a pointer to the cache relinquishes ownership to the cache object.
+	 */
+	void store(T* object) {
+		if (!object) {
+			return;
+		}
+		std::unique_lock l(cache_mutex);
+		auto existing = cache_map->find(object->id);
+		if (existing == cache_map->end()) {
+			(*cache_map)[object->id] = object;
+		} else if (object != existing->second) {
+			/* Flag old pointer for deletion and replace */
+			std::lock_guard<std::mutex> delete_lock(deletion_mutex);
+			deletion_queue[existing->second] = time(nullptr);
+			(*cache_map)[object->id] = object;
+		}
+	}
+
+	/**
+	 * @brief Remove an object from the cache.
+	 * 
+	 * @note The cache class takes ownership of the pointer, and calling this method will
+	 * cause deletion of the object within the next 60 seconds by means of a garbage
+	 * collection queue. This queue aids in efficiency by freeing memory in bulk, and
+	 * assists in thread safety by ensuring that all deletions can be locked and freed
+	 * at the same time.
+	 * 
+	 * @param object object to remove. Passing a nullptr will have no effect.
+	 */
+	void remove(T* object) {
+		if (!object) {
+			return;
+		}
+		std::unique_lock l(cache_mutex);
+		std::lock_guard<std::mutex> delete_lock(deletion_mutex);
+		auto existing = cache_map->find(object->id);
+		if (existing != cache_map->end()) {
+			cache_map->erase(existing);
+			deletion_queue[object] = time(nullptr);
+		}
+	}
+
+	/**
+	 * @brief Find an object in the cache by id.
+	 * 
+	 * The cache is searched for the object. All dpp::managed objects have a snowflake id
+	 * (this is the only field dpp::managed actually has).
+	 * 
+	 * @warning Do not hang onto objects returned by cache::find() indefinitely. They may be
+	 * deleted at a later date if cache::remove() is called. If persistence is required,
+	 * take a copy of the object after checking its pointer is non-null.
+	 * 
+	 * @param id Object snowflake id to find
+	 * @return Found object or nullptr if the object with this id does not exist.
+	 */
+	T* find(snowflake id) {
+		std::shared_lock l(cache_mutex);
+		auto r = cache_map->find(id);
+		if (r != cache_map->end()) {
+			return r->second;
+		}
+		return nullptr;
+	}
+
+	/**
+	 * @brief Return a count of the number of items in the cache.
+	 * 
+	 * This is used by the library e.g. to count guilds, users, and roles
+	 * stored within caches.
+	 * get
+	 * @return uint64_t count of items in the cache
+	 */
+	uint64_t count() {
+		std::shared_lock l(cache_mutex);
+		return cache_map->size();
+	}
+
+	/** 
+	 * @brief Return the cache's locking mutex.
+	 * 
+	 * Use this whenever you manipulate or iterate raw elements in the cache!
+	 * 
+	 * @note If you are only reading from the cache's container, wrap this
+	 * mutex in `std::shared_lock`, else wrap it in a `std::unique_lock`.
+	 * Shared locks will allow for multiple readers whilst blocking writers,
+	 * and unique locks will allow only one writer whilst blocking readers
+	 * and writers.
+	 * 
+	 * **Example:**
+	 * 
+	 * ```cpp
+	 * dpp::cache<guild>* c = dpp::get_guild_cache();
+	 * std::unordered_map<snowflake, guild*>& gc = c->get_container();
+	 * std::shared_lock l(c->get_mutex()); // MUST LOCK HERE
+	 * for (auto g = gc.begin(); g != gc.end(); ++g) {
+	 *     dpp::guild* gp = (dpp::guild*)g->second;
+	 *     // Do something here with the guild* in 'gp'
+	 * }
+	 * ``` 
+	 * 
+	 * @return The mutex used to protect the container
+	 */
+	std::shared_mutex& get_mutex() {
+		return this->cache_mutex;			
+	}
+
+	/**
+	 * @brief Get the container unordered map
+	 * 
+	 * @warning Be sure to use cache::get_mutex() correctly if you
+	 * manipulate or iterate the map returned by this method! If you do
+	 * not, this is not thread safe and will cause crashes!
+	 * 
+	 * @see cache::get_mutex
+	 * 
+	 * @return A reference to the cache's container map
+	 */
+	auto & get_container() {
+		return *(this->cache_map);		
+	}
+
+	/**
+	 * @brief "Rehash" a cache by reallocating the map and copying
+	 * all elements into the new one.
+	 * 
+	 * Over a long running timeframe, unordered maps can grow in size
+	 * due to bucket allocation, this function frees that unused memory
+	 * to keep the maps in control over time. If this is an issue which
+	 * is apparent with your use of dpp::cache objects, you should periodically
+	 * call this method.
+	 * 
+	 * @warning May be time consuming! This function is O(n) in relation to the
+	 * number of cached entries.
+	 */
+	void rehash() {
+		std::unique_lock l(cache_mutex);
+		std::unordered_map<snowflake, T*>* n = new std::unordered_map<snowflake, T*>;
+		n->reserve(cache_map->size());
+		for (auto t = cache_map->begin(); t != cache_map->end(); ++t) {
+			n->insert(*t);
+		}
+		delete cache_map;
+		cache_map = n;
+	}
+
+	/**
+	 * @brief Get "real" size in RAM of the cached objects
+	 * 
+	 * This does not include metadata used to maintain the unordered map itself.
+	 * 
+	 * @return size_t size of cache in bytes
+	 */
+	size_t bytes() {
+		std::shared_lock l(cache_mutex);
+		return sizeof(*this) + (cache_map->bucket_count() * sizeof(size_t));
+	}
+
+};
+
+/**
+ * Run garbage collection across all caches removing deleted items
+ * that have been deleted over 60 seconds ago.
+ */
+void DPP_EXPORT garbage_collection();
+
+#define cache_decl(type, setter, getter, counter) /** Find an object in the cache by id. @return type* Pointer to the object or nullptr when it's not found */ DPP_EXPORT class type * setter (snowflake id); DPP_EXPORT cache<class type> * getter (); /** Get the amount of cached type objects. */ DPP_EXPORT uint64_t counter ();
+
+/* Declare major caches */
+cache_decl(user, find_user, get_user_cache, get_user_count);
+cache_decl(guild, find_guild, get_guild_cache, get_guild_count);
+cache_decl(role, find_role, get_role_cache, get_role_count);
+cache_decl(channel, find_channel, get_channel_cache, get_channel_count);
+cache_decl(emoji, find_emoji, get_emoji_cache, get_emoji_count);
+
+}
+
diff --git a/3rdParty/dpp/channel.h b/3rdParty/dpp/channel.h
index 4ce396261e..b2ee201786 100644
--- a/3rdParty/dpp/channel.h
+++ b/3rdParty/dpp/channel.h
@@ -1,803 +1,896 @@
-/************************************************************************************
- *
- * D++, A Lightweight C++ library for Discord
- *
- * Copyright 2021 Craig Edwards and D++ contributors 
- * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- ************************************************************************************/
-
-#pragma once
-#include <dpp/export.h>
-#include <dpp/snowflake.h>
-#include <dpp/managed.h>
-#include <dpp/utility.h>
-#include <dpp/voicestate.h>
-#include <dpp/message.h>
-#include <dpp/nlohmann/json_fwd.hpp>
-#include <dpp/permissions.h>
-#include <dpp/json_interface.h>
-#include <unordered_map>
-#include <variant>
-
-namespace dpp {
-
-/** @brief Flag integers as received from and sent to discord */
-enum channel_type : uint8_t {
-	CHANNEL_TEXT		= 0,	//!< a text channel within a server
-	DM			= 1,	//!< a direct message between users
-	CHANNEL_VOICE		= 2,	//!< a voice channel within a server
-	/**
-	 * @brief a direct message between multiple users
-	 * @deprecated this channel type was intended to be used with the now deprecated GameBridge SDK. Existing group dms with bots will continue to function, but newly created channels will be unusable
-	 */
-	GROUP_DM		= 3,
-	CHANNEL_CATEGORY	= 4,	//!< an organizational category that contains up to 50 channels
-	CHANNEL_ANNOUNCEMENT	= 5,	//!< a channel that users can follow and crosspost into their own server
-	/**
-	 * @brief a channel in which game developers can sell their game on Discord
-	 * @deprecated store channels are deprecated by Discord
-	 */
-	CHANNEL_STORE		= 6,
-	CHANNEL_ANNOUNCEMENT_THREAD	= 10,	//!< a temporary sub-channel within a GUILD_ANNOUNCEMENT channel
-	CHANNEL_PUBLIC_THREAD	= 11,	//!< a temporary sub-channel within a GUILD_TEXT or GUILD_FORUM channel
-	CHANNEL_PRIVATE_THREAD	= 12,	//!< a temporary sub-channel within a GUILD_TEXT channel that is only viewable by those invited and those with the MANAGE_THREADS permission
-	CHANNEL_STAGE		= 13,	//!< a "stage" channel, like a voice channel with one authorised speaker
-	CHANNEL_DIRECTORY	= 14,   //!< the channel in a [hub](https://support.discord.com/hc/en-us/articles/4406046651927-Discord-Student-Hubs-FAQ) containing the listed servers
-	CHANNEL_FORUM		= 15	//!< forum channel that can only contain threads
-};
-
-/** @brief Our flags as stored in the object
- * @note The bottom four bits of this flag are reserved to contain the channel_type values
- * listed above as provided by Discord. If discord add another value > 15, we will have to
- * shuffle these values upwards by one bit.
- */
-enum channel_flags : uint16_t {
-	/// NSFW Gated Channel
-	c_nsfw =		0b0000000000010000,
-	/// Video quality forced to 720p
-	c_video_quality_720p =	0b0000000000100000,
-	/// Lock permissions (only used when updating channel positions)
-	c_lock_permissions =	0b0000000001000000,
-	/// Thread is pinned to the top of its parent forum channel
-	c_pinned_thread =	0b0000000010000000,
-	/// Whether a tag is required to be specified when creating a thread in a forum channel. Tags are specified in the thread::applied_tags field.
-	c_require_tag =		0b0000000100000000,
-	/* Note that the 9th and 10th bit are used for the forum layout type */
-};
-
-/**
- * @brief The flags in discord channel's raw "flags" field. We use these for serialisation only, right now. Might be better to create a new field than to make the existing channel::flags from uint8_t to uint16_t, if discord adds more flags in future.
- */
-enum discord_channel_flags : uint8_t {
-	/// Thread is pinned to the top of its parent forum channel
-	dc_pinned_thread = 1 << 1,
-	/// Whether a tag is required to be specified when creating a thread in a forum channel. Tags are specified in the thread::applied_tags field.
-	dc_require_tag =   1 << 4,
-};
-
-/**
- * @brief Types for sort posts in a forum channel
- */
-enum default_forum_sort_order_t : uint8_t {
-	/// Sort forum posts by activity (default)
-	so_latest_activity = 0,
-	/// Sort forum posts by creation time (from most recent to oldest)
-	so_creation_date = 1,
-};
-
-/**
- * @brief Types of forum layout views that indicates how the threads in a forum channel will be displayed for users by default
- */
-enum forum_layout_type : uint8_t {
-	fl_not_set = 0, //!< No default has been set for the forum channel
-	fl_list_view = 1, //!< Display posts as a list
-	fl_gallery_view = 2, //!< Display posts as a collection of tiles
-};
-
-/**
- * @brief channel permission overwrite types
- */
-enum overwrite_type : uint8_t {
-	/// Role
-	ot_role = 0,
-	/// Member
-	ot_member = 1
-};
-
-/**
- * @brief Channel permission overwrites
- */
-struct DPP_EXPORT permission_overwrite {
-	/// ID of the role or the member
-	snowflake id;
-	/// Bitmask of allowed permissions
-	permission allow;
-	/// Bitmask of denied permissions
-	permission deny;
-	/// Type of overwrite. See dpp::overwrite_type
-	uint8_t type;
-
-	/**
-	 * @brief Construct a new permission_overwrite object
-	 */
-	permission_overwrite();
-
-	/**
-	 * @brief Construct a new permission_overwrite object
-	 * @param id ID of the role or the member to create the overwrite for
-	 * @param allow Bitmask of allowed permissions (refer to enum dpp::permissions) for this user/role in this channel
-	 * @param deny Bitmask of denied permissions (refer to enum dpp::permissions) for this user/role in this channel
-	 * @param type Type of overwrite
-	 */
-	permission_overwrite(snowflake id, uint64_t allow, uint64_t deny, overwrite_type type);
-};
-
-
-/**
- * @brief metadata for threads
- */
-struct DPP_EXPORT thread_metadata {
-	/// Timestamp when the thread's archive status was last changed, used for calculating recent activity
-	time_t archive_timestamp;
-	/// The duration in minutes to automatically archive the thread after recent activity, can be set to: 60, 1440, 4320, 10080
-	uint16_t auto_archive_duration;
-	/// Whether a thread is archived
-	bool archived;
-	/// Whether a thread is locked. When a thread is locked, only users with `MANAGE_THREADS` can unarchive it
-	bool locked;
-	/// Whether non-moderators can add other non-moderators. Only for private threads
-	bool invitable;
-};
-
-/**
- * @brief Auto archive duration of threads which will stop showing in the channel list after the specified period of inactivity.
- * Defined as an enum to fit into 1 byte. Internally it'll be translated to minutes to match the API
- */
-enum auto_archive_duration_t : uint8_t {
-	/// Auto archive duration of 1 hour. (60 minutes)
-	arc_1_hour = 1,
-	/// Auto archive duration of 1 day. (1440 minutes)
-	arc_1_day = 2,
-	/// Auto archive duration of 3 days. (4320 minutes)
-	arc_3_days = 3,
-	/// Auto archive duration of 1 week. (10080 minutes)
-	arc_1_week = 4,
-};
-
-/**
- * @brief represents membership of a user with a thread
- */
-struct DPP_EXPORT thread_member  
-{
-	/// ID of the thread member is part of
-	snowflake thread_id;
-	/// ID of the member
-	snowflake user_id;
-	/// The time when user last joined the thread
-	time_t joined;
-	/// Any user-thread settings, currently only used for notifications
-	uint32_t flags;
-
-	/**
-	 * @brief Read struct values from a json object 
-	 * @param j json to read values from
-	 * @return A reference to self	
-	 */
-	 thread_member& fill_from_json(nlohmann::json* j);
-};
-
-/**
- * @brief Represents a tag that is able to be applied to a thread in a forum channel
- */
-struct DPP_EXPORT forum_tag : public managed {
-	/** The name of the tag (0-20 characters) */
-	std::string name;
-	/** The emoji of the tag. Contains either nothing, the id of a guild's custom emoji or the unicode character of the emoji */
-	std::variant<std::monostate, snowflake, std::string> emoji;
-	/** Whether this tag can only be added to or removed from threads by a member with the `MANAGE_THREADS` permission */
-	bool moderated;
-
-	/** Constructor */
-	forum_tag();
-
-	/**
-	 * @brief Constructor
-	 *
-	 * @param name The name of the tag. It will be truncated to the maximum length of 20 UTF-8 characters.
-	 */
-	forum_tag(const std::string& name);
-
-	/** Destructor */
-	virtual ~forum_tag();
-
-	/**
-	 * @brief Read struct values from a json object
-	 * @param j json to read values from
-	 * @return A reference to self
-	 */
-	forum_tag& fill_from_json(nlohmann::json* j);
-
-	/**
-	 * @brief Build json for this forum_tag object
-	 *
-	 * @param with_id include the ID in the json
-	 * @return std::string JSON string
-	 */
-	std::string build_json(bool with_id = false) const;
-
-	/**
-	 * @brief Set name of this forum_tag object
-	 *
-	 * @param name Name to set
-	 * @return Reference to self, so these method calls may be chained
-	 *
-	 * @note name will be truncated to 20 chars, if longer
-	 */
-	forum_tag& set_name(const std::string& name);
-};
-
-/** @brief A group of thread member objects*/
-typedef std::unordered_map<snowflake, thread_member> thread_member_map;
-
-/**
- * @brief A definition of a discord channel.
- * There are one of these for every channel type except threads. Threads are
- * special snowflakes. Get it? A Discord pun. Hahaha. .... I'll get my coat.
- */ 
-class DPP_EXPORT channel : public managed, public json_interface<channel>  {
-public:
-	/** Channel name (1-100 characters) */
-	std::string name;
-
-	/** Channel topic (0-4096 characters for forum channels, 0-1024 characters for all others) */
-	std::string topic;
-
-	/**
-	 * @brief Voice region if set for voice channel, otherwise empty string
-	 */
-	std::string rtc_region;
-
-	/** DM recipients */
-	std::vector<snowflake> recipients;
-
-	/** Permission overwrites to apply to base permissions */
-	std::vector<permission_overwrite> permission_overwrites;
-
-	/** A set of tags that can be used in a forum channel */
-	std::vector<forum_tag> available_tags;
-
-	/**
-	 * @brief The emoji to show as the default reaction button on a forum post.
-	 * Contains either nothing, the id of a guild's custom emoji or the unicode character of the emoji
-	 */
-	std::variant<std::monostate, snowflake, std::string> default_reaction;
-
-	/**
-	 * @brief Channel icon (for group DMs)
-	 */
-	utility::iconhash icon;
-
-	/** User ID of the creator for group DMs or threads */
-	snowflake owner_id;
-
-	/** Parent ID (for guild channels: id of the parent category, for threads: id of the text channel this thread was created) */
-	snowflake parent_id;
-
-	/** Guild id of the guild that owns the channel */
-	snowflake guild_id;
-
-	/** ID of last message to be sent to the channel (may not point to an existing or valid message or thread) */
-	snowflake last_message_id;
-
-	/** Timestamp of last pinned message */
-	time_t last_pin_timestamp;
-
-	/**
-	 * @brief This is only filled when the channel is part of the `resolved` set
-	 * sent within an interaction. Any other time it contains zero. When filled,
-	 * it contains the calculated permission bitmask of the user issuing the command
-	 * within this channel.
-	 */
-	permission permissions;
-
-	/** Sorting position, lower number means higher up the list */
-	uint16_t position;
-
-	/** the bitrate (in kilobits) of the voice channel */
-	uint16_t bitrate;
-
-	/** amount of seconds a user has to wait before sending another message (0-21600); bots, as well as users with the permission manage_messages or manage_channel, are unaffected*/
-	uint16_t rate_limit_per_user;
-
-	/** The initial `rate_limit_per_user` to set on newly created threads in a channel. This field is copied to the thread at creation time and does not live update */
-	uint16_t default_thread_rate_limit_per_user;
-
-	/**
-	 * @brief Default duration, copied onto newly created threads. Used by the clients, not the API.
-	 * Threads will stop showing in the channel list after the specified period of inactivity. Defaults to dpp::arc_1_day
-	 */
-	auto_archive_duration_t default_auto_archive_duration;
-
-	/** the default sort order type used to order posts in forum channels */
-	default_forum_sort_order_t default_sort_order;
-
-	/** Flags bitmap (dpp::channel_flags) */
-	uint16_t flags;
-	
-	/** Maximum user limit for voice channels (0-99) */
-	uint8_t user_limit;
-
-	/** Constructor */
-	channel();
-
-	/** Destructor */
-	virtual ~channel();
-
-	/**
-	* @brief Create a mentionable channel.
-	* @param id The ID of the channel.
-	* @return std::string The formatted mention of the channel.
-	*/
-	static std::string get_mention(const snowflake& id);
-
-	/** Read class values from json object
-	 * @param j A json object to read from
-	 * @return A reference to self
-	 */
-	 channel& fill_from_json(nlohmann::json* j);
-
-	/**
-	 * @brief Build json for this channel object
-	 * 
-	 * @param with_id include the ID in the json
-	 * @return std::string JSON string
-	 */
-	virtual std::string build_json(bool with_id = false) const;
-
-	/**
-	 * @brief Set name of this channel object
-	 *
-	 * @param name Name to set
-	 * @return Reference to self, so these method calls may be chained 
-	 *
-	 * @note name will be truncated to 100 chars, if longer
-	 * @throw dpp::length_exception if length < 1
-	 */
-	channel& set_name(const std::string& name);
-
-	/**
-	 * @brief Set topic of this channel object
-	 *
-	 * @param topic Topic to set
-	 * @return Reference to self, so these method calls may be chained 
-	 *
-	 * @note topic will be truncated to 1024 chars, if longer
-	 */
-	channel& set_topic(const std::string& topic);
-
-	/**
-	 * @brief Set type of this channel object
-	 *
-	 * @param type Channel type to set
-	 * @return Reference to self, so these method calls may be chained
-	 */
-	channel& set_type(channel_type type);
-
-	/**
-	 * @brief Set the default forum layout type for the forum channel
-	 *
-	 * @param layout_type The layout type
-	 * @return Reference to self, so these method calls may be chained
-	 */
-	channel& set_default_forum_layout(forum_layout_type layout_type);
-
-	/**
-	 * @brief Set flags for this channel object
-	 *
-	 * @param flags Flag bitmask to set from dpp::channel_flags
-	 * @return Reference to self, so these method calls may be chained 
-	 */
-	channel& set_flags(const uint16_t flags);
-
-	/**
-	 * @brief Add (bitwise OR) a flag to this channel object
-	 * 	
-	 * @param flag Flag bit to add from dpp::channel_flags
-	 * @return Reference to self, so these method calls may be chained 
-	 */
-	channel& add_flag(const channel_flags flag);
-
-	/**
-	 * @brief Remove (bitwise NOT AND) a flag from this channel object
-	 * 	
-	 * @param flag Flag bit to remove from dpp::channel_flags
-	 * @return Reference to self, so these method calls may be chained 
-	 */
-	channel& remove_flag(const channel_flags flag);
-
-	/**
-	 * @brief Set position of this channel object
-	 *
-	 * @param position Position to set
-	 * @return Reference to self, so these method calls may be chained 
-	 */
-	channel& set_position(const uint16_t position);
-
-	/**
-	 * @brief Set guild_id of this channel object
-	 *
-	 * @param guild_id Guild ID to set
-	 * @return Reference to self, so these method calls may be chained 
-	 */
-	channel& set_guild_id(const snowflake guild_id);
-
-	/**
-	 * @brief Set parent_id of this channel object
-	 *
-	 * @param parent_id Parent ID to set
-	 * @return Reference to self, so these method calls may be chained 
-	 */
-	channel& set_parent_id(const snowflake parent_id);
-
-	/**
-	 * @brief Set user_limit of this channel object
-	 *
-	 * @param user_limit Limit to set
-	 * @return Reference to self, so these method calls may be chained 
-	 */
-	channel& set_user_limit(const uint8_t user_limit);
-
-	/**
-	 * @brief Set bitrate of this channel object
-	 *
-	 * @param bitrate Bitrate to set (in kilobits)
-	 * @return Reference to self, so these method calls may be chained 
-	 */
-	channel& set_bitrate(const uint16_t bitrate);
-
-	/**
-	 * @brief Set nsfw property of this channel object
-	 *
-	 * @param is_nsfw true, if channel is nsfw
-	 * @return Reference to self, so these method calls may be chained 
-	 */
-	channel& set_nsfw(const bool is_nsfw);
-
-	/**
-	 * @brief Set lock permissions property of this channel object
-	 * Used only with the reorder channels method
-	 *
-	 * @param is_lock_permissions true, if we are to inherit permissions from the category
-	 * @return Reference to self, so these method calls may be chained 
-	 */
-	channel& set_lock_permissions(const bool is_lock_permissions);
-
-	/**
-	 * @brief Set rate_limit_per_user of this channel object
-	 *
-	 * @param rate_limit_per_user rate_limit_per_user (slowmode in sec) to set
-	 * @return Reference to self, so these method calls may be chained 
-	 */
-	channel& set_rate_limit_per_user(const uint16_t rate_limit_per_user);
-
-	/**
-	 * @brief Add a permission_overwrite to this channel object
-	 * 
-	 * @param id ID of the role or the member you want to add overwrite for
-	 * @param type type of overwrite
-	 * @param allowed_permissions bitmask of allowed permissions (refer to enum dpp::permissions) for this user/role in this channel
-	 * @param denied_permissions bitmask of denied permissions (refer to enum dpp::permissions) for this user/role in this channel
-	 *
-	 * @return Reference to self, so these method calls may be chained 
-	 */
-	channel& add_permission_overwrite(const snowflake id, const overwrite_type type, const uint64_t allowed_permissions, const uint64_t denied_permissions);
-
-	/**
-	 * @brief Get the channel type
-	 *
-	 * @return channel_type Channel type
-	 */
-	channel_type get_type() const;
-
-	/**
-	 * @brief Get the default forum layout type used to display posts in forum channels
-	 *
-	 * @return forum_layout_types Forum layout type
-	 */
-	forum_layout_type get_default_forum_layout() const;
-
-	/**
-	 * @brief Get the mention ping for the channel
-	 * 
-	 * @return std::string mention
-	 */
-	std::string get_mention() const;
-
-	/**
-	 * @brief Get the overall permissions for a member in this channel, including channel overwrites, role permissions and admin privileges.
-	 * 
-	 * @param user The user to resolve the permissions for
-	 * @return permission Permission overwrites for the member. Made of bits in dpp::permissions.
-	 * @note Requires role cache to be enabled (it's enabled by default).
-	 *
-	 * @note This is an alias for guild::permission_overwrites and searches for the guild in the cache,
-	 * so consider using guild::permission_overwrites if you already have the guild object.
-	 *
-	 * @warning The method will search for the guild member in the cache by the users id.
-	 * If the guild member is not in cache, the method will always return 0.
-	 */
-	permission get_user_permissions(const class user* user) const;
-
-	/**
-	 * @brief Get the overall permissions for a member in this channel, including channel overwrites, role permissions and admin privileges.
-	 *
-	 * @param member The member to resolve the permissions for
-	 * @return permission Permission overwrites for the member. Made of bits in dpp::permissions.
-	 * @note Requires role cache to be enabled (it's enabled by default).
-	 *
-	 * @note This is an alias for guild::permission_overwrites and searches for the guild in the cache,
-	 * so consider using guild::permission_overwrites if you already have the guild object.
-	 */
-	permission get_user_permissions(const class guild_member &member) const;
-
-	/**
-	 * @brief Return a map of members on the channel, built from the guild's
-	 * member list based on which members have the VIEW_CHANNEL permission.
-	 * Does not return reliable information for voice channels, use
-	 * dpp::channel::get_voice_members() instead for this.
-	 * @return A map of guild members keyed by user id.
-	 * @note If the guild this channel belongs to is not in the cache, the function will always return 0.
-	 */
-	std::map<snowflake, class guild_member*> get_members();
-
-	/**
-	 * @brief Get a map of members in this channel, if it is a voice channel.
-	 * The map is keyed by snowflake id of the user.
-	 * 
-	 * @return std::map<snowflake, voicestate> The voice members of the channel
-	 */
-	std::map<snowflake, voicestate> get_voice_members();
-
-	/**
-	 * @brief Get the channel's icon url (if its a group DM), otherwise returns an empty string
-	 *
-	 * @param size The size of the icon in pixels. It can be any power of two between 16 and 4096. if not specified, the default sized icon is returned.
-	 * @return std::string icon url or empty string
-	 */
-	std::string get_icon_url(uint16_t size = 0) const;
-
-	/**
-	 * @brief Returns true if the channel is NSFW gated
-	 * 
-	 * @return true if NSFW
-	 */
-	bool is_nsfw() const;
-
-	/**
-	 * @brief Returns true if the permissions are to be synced with the category it is in.
-	 * Used only and set manually when using the reorder channels method.
-	 * 
-	 * @return true if keeping permissions
-	 */
-	bool is_locked_permissions() const;
-
-	/**
-	 * @brief Returns true if the channel is a text channel
-	 * 
-	 * @return true if text channel
-	 */
-	bool is_text_channel() const;
-
-	/**
-	 * @brief Returns true if the channel is a DM
-	 * 
-	 * @return true if is a DM
-	 */
-	bool is_dm() const;
-
-	/**
-	 * @brief Returns true if the channel is a voice channel
-	 * 
-	 * @return true if voice channel
-	 */
-	bool is_voice_channel() const;
-
-	/**
-	 * @brief Returns true if the channel is a group DM channel
-	 * 
-	 * @return true if group DM
-	 */
-	bool is_group_dm() const;
-
-	/**
-	 * @brief Returns true if the channel is a category
-	 * 
-	 * @return true if a category
-	 */
-	bool is_category() const;
-
-	/**
-	 * @brief Returns true if the channel is a forum
-	 * 
-	 * @return true if a forum
-	 */
-	bool is_forum() const;
-
-	/**
-	 * @brief Returns true if the channel is an announcement channel
-	 * 
-	 * @return true if announcement channel
-	 */
-	bool is_news_channel() const;
-
-	/**
-	 * @brief Returns true if the channel is a store channel
-	 * @deprecated store channels are deprecated by Discord
-	 * 
-	 * @return true if store channel
-	 */
-	bool is_store_channel() const;
-
-	/**
-	 * @brief Returns true if the channel is a stage channel
-	 * 
-	 * @return true if stage channel
-	 */
-	bool is_stage_channel() const;
-
-	/**
-	 * @brief Returns true if video quality is auto
-	 * 
-	 * @return true if video quality is auto
-	 */
-	bool is_video_auto() const;
-
-	/**
-	 * @brief Returns true if video quality is 720p
-	 * 
-	 * @return true if video quality is 720p
-	 */
-	bool is_video_720p() const;
-
-	/**
-	 * @brief Returns true if channel is a pinned thread in forum
-	 *
-	 * @return true, if channel is a pinned thread in forum
-	 */
-	bool is_pinned_thread() const;
-
-	/**
-	 * @brief Returns true if a tag is required to be specified when creating a thread in a forum channel
-	 *
-	 * @return true, if a tag is required to be specified when creating a thread in a forum channel
-	 */
-	bool is_tag_required() const;
-
-};
-
-/** @brief A definition of a discord thread.
- * A thread is a superset of a channel. Not to be confused with `std::thread`!
- */
-class DPP_EXPORT thread : public channel {
-public:
-	/**
-	 * @brief Thread member of current user if joined to the thread.
-	 * Note this is only set by certain api calls otherwise contains default data
-	 */
-	thread_member member;
-
-	/** Thread metadata (threads) */
-	thread_metadata metadata;
-
-	/** Created message. Only filled within the cluster::thread_create_in_forum() method */
-	message msg;
-
-	/**
-	 * A list of dpp::forum_tag IDs that have been applied to a thread in a forum channel
-	 */
-	std::vector<snowflake> applied_tags;
-
-	/**
-	 * @brief Number of messages ever sent in the thread.
-	 * It's similar to thread::message_count on message creation, but will not decrement the number when a message is deleted
-	 */
-	uint32_t total_messages_sent;
-
-	/**
-	 * @brief Number of messages (not including the initial message or deleted messages) of the thread.
-	 * For threads created before July 1, 2022, the message count is inaccurate when it's greater than 50.
-	 */
-	uint8_t message_count;
-
-	/** Approximate count of members in a thread (threads) */
-	uint8_t member_count;
-
-	/**
-	 * @brief Construct a new thread object
-	 */
-	thread();
-
-	/**
-	 * @brief Returns true if the thread is within an announcement channel
-	 *
-	 * @return true if announcement thread
-	 */
-	bool is_news_thread() const;
-
-	/**
-	 * @brief Returns true if the channel is a public thread
-	 *
-	 * @return true if public thread
-	 */
-	bool is_public_thread() const;
-
-	/**
-	 * @brief Returns true if the channel is a private thread
-	 *
-	 * @return true if private thread
-	 */
-	bool is_private_thread() const;
-
-	/** Read class values from json object
-	 * @param j A json object to read from
-	 * @return A reference to self
-	 */
-	thread& fill_from_json(nlohmann::json* j);
-
-	/**
-	 * @brief Destroy the thread object
-	 */
-	virtual ~thread();
-
-	/**
-	 * @brief Build json for this thread object
-	 * 
-	 * @param with_id include the ID in the json
-	 * @return std::string JSON string
-	 */
-	std::string build_json(bool with_id = false) const;
-
-};
-
-
-/**
- * @brief Serialize a thread_metadata object to json
- *
- * @param j JSON object to serialize to
- * @param tmdata object to serialize
- */
-void to_json(nlohmann::json& j, const thread_metadata& tmdata);
-
-/**
- * @brief Serialize a permission_overwrite object to json
- *
- * @param j JSON object to serialize to
- * @param po object to serialize
- */
-void to_json(nlohmann::json& j, const permission_overwrite& po);
-
-/**
- * @brief A group of channels
- */
-typedef std::unordered_map<snowflake, channel> channel_map;
-
-/**
- * @brief A group of threads
- */
-typedef std::unordered_map<snowflake, thread> thread_map;
-
-};
-
+/************************************************************************************
+ *
+ * D++, A Lightweight C++ library for Discord
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright 2021 Craig Edwards and D++ contributors 
+ * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ************************************************************************************/
+
+#pragma once
+#include <dpp/export.h>
+#include <dpp/snowflake.h>
+#include <dpp/managed.h>
+#include <dpp/utility.h>
+#include <dpp/voicestate.h>
+#include <dpp/json_fwd.h>
+#include <dpp/permissions.h>
+#include <dpp/json_interface.h>
+#include <unordered_map>
+#include <variant>
+
+namespace dpp {
+
+/** @brief Flag integers as received from and sent to discord */
+enum channel_type : uint8_t {
+	/**
+	 * @brief A text channel within a server.
+	 */
+	CHANNEL_TEXT = 0,
+
+	/**
+	 * @brief A direct message between users.
+	 */
+	DM = 1,
+
+	/**
+	 * @brief A voice channel within a server.
+	 */
+	CHANNEL_VOICE = 2,
+
+	/**
+	 * @brief a direct message between multiple users
+	 * @deprecated this channel type was intended to be used with the now deprecated GameBridge SDK.
+	 * Existing group dms with bots will continue to function, but newly created channels will be unusable.
+	 */
+	GROUP_DM = 3,
+
+	/**
+	 * @brief An organizational category that contains up to 50 channels.
+	 */
+	CHANNEL_CATEGORY = 4,
+
+	/**
+	 * @brief A channel that users can follow and cross-post into their own server.
+	 */
+	CHANNEL_ANNOUNCEMENT = 5,
+
+	/**
+	 * @brief A channel in which game developers can sell their game on Discord.
+	 * @deprecated Store channels are deprecated by Discord.
+	 */
+	CHANNEL_STORE = 6,
+
+	/**
+	 * @brief A temporary sub-channel within a `GUILD_ANNOUNCEMENT` channel.
+	 */
+	CHANNEL_ANNOUNCEMENT_THREAD = 10,
+
+	/**
+	 * @brief A temporary sub-channel within a `GUILD_TEXT` or `GUILD_FORUM` channel.
+	 */
+	CHANNEL_PUBLIC_THREAD = 11,
+
+	/**
+	 * @brief A temporary sub-channel within a `GUILD_TEXT` channel
+	 * that is only viewable by those invited and those with the `MANAGE_THREADS` permission.
+	 */
+	CHANNEL_PRIVATE_THREAD = 12,
+
+	/**
+	 * @brief A "stage" channel, like a voice channel with one authorised speaker.
+	 */
+	CHANNEL_STAGE = 13,
+
+	/**
+	 * @brief The channel in a hub containing the listed servers.
+	 *
+	 * @see https://support.discord.com/hc/en-us/articles/4406046651927-Discord-Student-Hubs-FAQ
+	 */
+	CHANNEL_DIRECTORY = 14,
+
+	/**
+	 * @brief Forum channel that can only contain threads.
+	 */
+	CHANNEL_FORUM = 15,
+
+	/**
+	 * @brief Media channel that can only contain threads, similar to forum channels.
+	 */
+	CHANNEL_MEDIA = 16,
+};
+
+/** @brief Our flags as stored in the object
+ * @note The bottom four bits of this flag are reserved to contain the channel_type values
+ * listed above as provided by Discord. If discord add another value > 15, we will have to
+ * shuffle these values upwards by one bit.
+ */
+enum channel_flags : uint16_t {
+	/* Note that bits 1 to 4 are used for the channel type mask */
+	/**
+	 * @brief NSFW Gated Channel
+	 */
+	c_nsfw =		0b0000000000010000,
+
+	/**
+	 * @brief Video quality forced to 720p
+	 */
+	c_video_quality_720p =	0b0000000000100000,
+
+	/**
+	 * @brief Lock permissions (only used when updating channel positions)
+	 */
+	c_lock_permissions =	0b0000000001000000,
+
+	/**
+	 * @brief Thread is pinned to the top of its parent forum or media channel
+	 */
+	c_pinned_thread =	0b0000000010000000,
+
+	/**
+	 * @brief Whether a tag is required to be specified when creating a thread in a forum or media channel.
+	 * Tags are specified in the thread::applied_tags field.
+	 */
+	c_require_tag =		0b0000000100000000,
+
+	/* Note that the 9th and 10th bit are used for the forum layout type. */
+	/**
+	 * @brief When set hides the embedded media download options. Available only for media channels
+	 */
+	c_hide_media_download_options = 0b0001000000000000,
+};
+
+/**
+ * @brief Types for sort posts in a forum channel
+ */
+enum default_forum_sort_order_t : uint8_t {
+	/**
+	 * @brief Sort forum posts by activity (default)
+	 */
+	so_latest_activity = 0,
+
+	/**
+	 * @brief Sort forum posts by creation time (from most recent to oldest)
+	 */
+	so_creation_date = 1,
+};
+
+/**
+ * @brief Types of forum layout views that indicates how the threads in a forum channel will be displayed for users by default
+ */
+enum forum_layout_type : uint8_t {
+	/**
+	 * @brief No default has been set for the forum channel
+	 */
+	fl_not_set = 0,
+
+	/**
+	 * @brief Display posts as a list
+	 */
+	fl_list_view = 1,
+
+	/**
+	 * @brief Display posts as a collection of tiles
+	 */
+	fl_gallery_view = 2,
+};
+
+/**
+ * @brief channel permission overwrite types
+ */
+enum overwrite_type : uint8_t {
+	/**
+	 * @brief Role
+	 */
+	ot_role = 0,
+
+	/**
+	 * @brief Member
+	 */
+	ot_member = 1
+};
+
+/**
+ * @brief Channel permission overwrites
+ */
+struct DPP_EXPORT permission_overwrite {
+	/**
+	 * @brief ID of the role or the member
+	 */
+	snowflake id;
+
+	/**
+	 * @brief Bitmask of allowed permissions
+	 */
+	permission allow;
+
+	/**
+	 * @brief Bitmask of denied permissions
+	 */
+	permission deny;
+
+	/**
+	 * @brief Type of overwrite. See dpp::overwrite_type
+	 */
+	uint8_t type;
+
+	/**
+	 * @brief Construct a new permission_overwrite object
+	 */
+	permission_overwrite();
+
+	/**
+	 * @brief Construct a new permission_overwrite object
+	 * @param id ID of the role or the member to create the overwrite for
+	 * @param allow Bitmask of allowed permissions (refer to enum dpp::permissions) for this user/role in this channel
+	 * @param deny Bitmask of denied permissions (refer to enum dpp::permissions) for this user/role in this channel
+	 * @param type Type of overwrite
+	 */
+	permission_overwrite(snowflake id, uint64_t allow, uint64_t deny, overwrite_type type);
+};
+
+/**
+ * @brief Auto archive duration of threads which will stop showing in the channel list after the specified period of inactivity.
+ * Defined as an enum to fit into 1 byte. Internally it'll be translated to minutes to match the API
+ */
+enum auto_archive_duration_t : uint8_t {
+	/**
+	 * @brief Auto archive duration of 1 hour (60 minutes).
+	 */
+	arc_1_hour = 1,
+
+	/**
+	 * @brief Auto archive duration of 1 day (1440 minutes).
+	 */
+	arc_1_day = 2,
+
+	/**
+	 * @brief Auto archive duration of 3 days (4320 minutes).
+	 */
+	arc_3_days = 3,
+
+	/**
+	 * @brief Auto archive duration of 1 week (10080 minutes).
+	 */
+	arc_1_week = 4,
+};
+
+/**
+ * @brief Represents a tag that is able to be applied to a thread in a forum or media channel
+ */
+struct DPP_EXPORT forum_tag : public managed, public json_interface<forum_tag> {
+protected:
+	friend struct json_interface<forum_tag>;
+
+	/**
+	 * @brief Read struct values from a json object
+	 * @param j json to read values from
+	 * @return A reference to self
+	 */
+	forum_tag& fill_from_json_impl(nlohmann::json* j);
+
+	/**
+	 * @brief Build json for this forum_tag object
+	 *
+	 * @param with_id include the ID in the json
+	 * @return json JSON object
+	 */
+	json to_json_impl(bool with_id = false) const;
+
+public:
+	/**
+	 * @brief The name of the tag (0-20 characters).
+	 */
+	std::string name;
+
+	/**
+	 * @brief The emoji of the tag.
+	 * Contains either nothing, the id of a guild's custom emoji or the unicode character of the emoji.
+	 */
+	std::variant<std::monostate, snowflake, std::string> emoji;
+
+	/**
+	 * @brief Whether this tag can only be added to or removed from threads
+	 * by a member with the `MANAGE_THREADS` permission.
+	 */
+	bool moderated;
+
+	/** Constructor */
+	forum_tag();
+
+	/**
+	 * @brief Constructor
+	 *
+	 * @param name The name of the tag. It will be truncated to the maximum length of 20 UTF-8 characters.
+	 */
+	forum_tag(const std::string& name);
+
+	/** Destructor */
+	virtual ~forum_tag() = default;
+
+	/**
+	 * @brief Set name of this forum_tag object
+	 *
+	 * @param name Name to set
+	 * @return Reference to self, so these method calls may be chained
+	 *
+	 * @note name will be truncated to 20 chars, if longer
+	 */
+	forum_tag& set_name(const std::string& name);
+};
+
+/**
+ * @brief A definition of a discord channel.
+ * There are one of these for every channel type except threads. Threads are
+ * special snowflakes. Get it? A Discord pun. Hahaha. .... I'll get my coat.
+ */ 
+class DPP_EXPORT channel : public managed, public json_interface<channel> {
+protected:
+	friend struct json_interface<channel>;
+
+	/** Read class values from json object
+	 * @param j A json object to read from
+	 * @return A reference to self
+	 */
+	channel& fill_from_json_impl(nlohmann::json* j);
+
+	/**
+	 * @brief Build json for this channel object
+	 *
+	 * @param with_id include the ID in the json
+	 * @return json JSON object
+	 */
+	virtual json to_json_impl(bool with_id = false) const;
+
+	static constexpr uint16_t CHANNEL_TYPE_MASK = 0b0000000000001111;
+
+public:
+	/**
+	 * @brief Channel name (1-100 characters).
+	 */
+	std::string name;
+
+	/**
+	 * @brief Channel topic (0-4096 characters for forum and media channels, 0-1024 characters for all others).
+	 */
+	std::string topic;
+
+	/**
+	 * @brief Voice region if set for voice channel, otherwise empty string.
+	 */
+	std::string rtc_region;
+
+	/**
+	 * @brief DM recipients.
+	 */
+	std::vector<snowflake> recipients;
+
+	/**
+	 * @brief Permission overwrites to apply to base permissions.
+	 */
+	std::vector<permission_overwrite> permission_overwrites;
+
+	/**
+	 * @brief A set of tags that can be used in a forum or media channel.
+	 */
+	std::vector<forum_tag> available_tags;
+
+	/**
+	 * @brief The emoji to show as the default reaction button on a thread in a forum or media channel.
+	 * Contains either nothing, the id of a guild's custom emoji or the unicode character of the emoji.
+	 */
+	std::variant<std::monostate, snowflake, std::string> default_reaction;
+
+	/**
+	 * @brief Channel icon (for group DMs).
+	 */
+	utility::iconhash icon;
+
+	/**
+	 * @brief User ID of the creator for group DMs or threads.
+	 */
+	snowflake owner_id;
+
+	/**
+	 * @brief Parent ID (for guild channels: id of the parent category, for threads: id of the text channel this thread was created).
+	 */
+	snowflake parent_id;
+
+	/**
+	 * @brief Guild id of the guild that owns the channel.
+	 */
+	snowflake guild_id;
+
+	/**
+	 * @brief ID of last message to be sent to the channel.
+	 *
+	 * @warning may not point to an existing or valid message/thread.
+	 */
+	snowflake last_message_id;
+
+	/**
+	 * @brief Timestamp of last pinned message.
+	 */
+	time_t last_pin_timestamp;
+
+	/**
+	 * @brief This is only filled when the channel is part of the `resolved` set
+	 * sent within an interaction. Any other time it contains zero. When filled,
+	 * it contains the calculated permission bitmask of the user issuing the command
+	 * within this channel.
+	 */
+	permission permissions;
+
+	/**
+	 * @brief Sorting position, lower number means higher up the list
+	 */
+	uint16_t position;
+
+	/**
+	 * @brief The bitrate (in kilobits) of the voice channel.
+	 */
+	uint16_t bitrate;
+
+	/**
+	 * @brief Amount of seconds a user has to wait before sending another message (0-21600).
+	 * Bots, as well as users with the permission manage_messages or manage_channel, are unaffected
+	 */
+	uint16_t rate_limit_per_user;
+
+	/**
+	 * @brief The initial `rate_limit_per_user` to set on newly created threads in a channel.
+	 * This field is copied to the thread at creation time and does not live update.
+	 */
+	uint16_t default_thread_rate_limit_per_user;
+
+	/**
+	 * @brief Default duration, copied onto newly created threads. Used by the clients, not the API.
+	 * Threads will stop showing in the channel list after the specified period of inactivity. Defaults to dpp::arc_1_day.
+	 */
+	auto_archive_duration_t default_auto_archive_duration;
+
+	/**
+	 * @brief The default sort order type used to order posts in forum and media channels.
+	 */
+	default_forum_sort_order_t default_sort_order;
+
+	/**
+	 * @brief Flags bitmap (dpp::channel_flags)
+	 */
+	uint16_t flags;
+
+	/**
+	 * @brief Maximum user limit for voice channels (0-99)
+	 */
+	uint8_t user_limit;
+
+	/** Constructor */
+	channel();
+
+	/** Destructor */
+	virtual ~channel();
+
+	/**
+	* @brief Create a mentionable channel.
+	* @param id The ID of the channel.
+	* @return std::string The formatted mention of the channel.
+	*/
+	static std::string get_mention(const snowflake& id);
+
+	/**
+	 * @brief Set name of this channel object
+	 *
+	 * @param name Name to set
+	 * @return Reference to self, so these method calls may be chained 
+	 *
+	 * @note name will be truncated to 100 chars, if longer
+	 * @throw dpp::length_exception if length < 1
+	 */
+	channel& set_name(const std::string& name);
+
+	/**
+	 * @brief Set topic of this channel object
+	 *
+	 * @param topic Topic to set
+	 * @return Reference to self, so these method calls may be chained 
+	 *
+	 * @note topic will be truncated to 1024 chars, if longer
+	 */
+	channel& set_topic(const std::string& topic);
+
+	/**
+	 * @brief Set type of this channel object
+	 *
+	 * @param type Channel type to set
+	 * @return Reference to self, so these method calls may be chained
+	 */
+	channel& set_type(channel_type type);
+
+	/**
+	 * @brief Set the default forum layout type for the forum channel
+	 *
+	 * @param layout_type The layout type
+	 * @return Reference to self, so these method calls may be chained
+	 */
+	channel& set_default_forum_layout(forum_layout_type layout_type);
+
+	/**
+	 * @brief Set the default forum sort order for the forum channel
+	 *
+	 * @param sort_order The sort order
+	 * @return Reference to self, so these method calls may be chained
+	 */
+	channel& set_default_sort_order(default_forum_sort_order_t sort_order);
+
+	/**
+	 * @brief Set flags for this channel object
+	 *
+	 * @param flags Flag bitmask to set from dpp::channel_flags
+	 * @return Reference to self, so these method calls may be chained 
+	 */
+	channel& set_flags(const uint16_t flags);
+
+	/**
+	 * @brief Add (bitwise OR) a flag to this channel object
+	 * 	
+	 * @param flag Flag bit to add from dpp::channel_flags
+	 * @return Reference to self, so these method calls may be chained 
+	 */
+	channel& add_flag(const channel_flags flag);
+
+	/**
+	 * @brief Remove (bitwise NOT AND) a flag from this channel object
+	 * 	
+	 * @param flag Flag bit to remove from dpp::channel_flags
+	 * @return Reference to self, so these method calls may be chained 
+	 */
+	channel& remove_flag(const channel_flags flag);
+
+	/**
+	 * @brief Set position of this channel object
+	 *
+	 * @param position Position to set
+	 * @return Reference to self, so these method calls may be chained 
+	 */
+	channel& set_position(const uint16_t position);
+
+	/**
+	 * @brief Set guild_id of this channel object
+	 *
+	 * @param guild_id Guild ID to set
+	 * @return Reference to self, so these method calls may be chained 
+	 */
+	channel& set_guild_id(const snowflake guild_id);
+
+	/**
+	 * @brief Set parent_id of this channel object
+	 *
+	 * @param parent_id Parent ID to set
+	 * @return Reference to self, so these method calls may be chained 
+	 */
+	channel& set_parent_id(const snowflake parent_id);
+
+	/**
+	 * @brief Set user_limit of this channel object
+	 *
+	 * @param user_limit Limit to set
+	 * @return Reference to self, so these method calls may be chained 
+	 */
+	channel& set_user_limit(const uint8_t user_limit);
+
+	/**
+	 * @brief Set bitrate of this channel object
+	 *
+	 * @param bitrate Bitrate to set (in kilobits)
+	 * @return Reference to self, so these method calls may be chained 
+	 */
+	channel& set_bitrate(const uint16_t bitrate);
+
+	/**
+	 * @brief Set nsfw property of this channel object
+	 *
+	 * @param is_nsfw true, if channel is nsfw
+	 * @return Reference to self, so these method calls may be chained 
+	 */
+	channel& set_nsfw(const bool is_nsfw);
+
+	/**
+	 * @brief Set lock permissions property of this channel object
+	 * Used only with the reorder channels method
+	 *
+	 * @param is_lock_permissions true, if we are to inherit permissions from the category
+	 * @return Reference to self, so these method calls may be chained 
+	 */
+	channel& set_lock_permissions(const bool is_lock_permissions);
+
+	/**
+	 * @brief Set rate_limit_per_user of this channel object
+	 *
+	 * @param rate_limit_per_user rate_limit_per_user (slowmode in sec) to set
+	 * @return Reference to self, so these method calls may be chained 
+	 */
+	channel& set_rate_limit_per_user(const uint16_t rate_limit_per_user);
+
+	/**
+	 * @brief Add permission overwrites for a user or role.
+	 * If the channel already has permission overwrites for the passed target, the existing ones will be adjusted by the passed permissions
+	 *
+	 * @param target ID of the role or the member you want to adjust overwrites for
+	 * @param type type of overwrite
+	 * @param allowed_permissions bitmask of dpp::permissions you want to allow for this user/role in this channel. Note: You can use the dpp::permission class
+	 * @param denied_permissions bitmask of dpp::permissions you want to deny for this user/role in this channel. Note: You can use the dpp::permission class
+	 *
+	 * **Example:**
+	 *
+	 * ```cpp
+	 * channel.add_permission_overwrite(388499352297406481, dpp::ot_role, dpp::p_manage_channels | dpp::p_manage_messages, 0);
+	 * // Allows p_manage_channels and p_manage_messages permissions for the provided role.
+	 * ```
+	 *
+	 * @return Reference to self, so these method calls may be chained
+	 */
+	channel& add_permission_overwrite(const snowflake target, const overwrite_type type, const uint64_t allowed_permissions, const uint64_t denied_permissions);
+	/**
+	 * @brief Set permission overwrites for a user or role on this channel object. Old permission overwrites for the target will be overwritten
+	 *
+	 * @param target ID of the role or the member you want to set overwrites for
+	 * @param type type of overwrite
+	 * @param allowed_permissions bitmask of allowed dpp::permissions for this user/role in this channel. Note: You can use the dpp::permission class
+	 * @param denied_permissions bitmask of denied dpp::permissions for this user/role in this channel. Note: You can use the dpp::permission class
+	 *
+	 * **Example:**
+	 *
+	 * ```cpp
+	 * channel.set_permission_overwrite(388499352297406481, dpp::ot_role, dpp::p_manage_channels | dpp::p_manage_messages, 0);
+	 * // Sets the allowed permissions to p_manage_channels and p_manage_messages and removes all denied permission flags for the provided role.
+	 * ```
+	 *
+	 * @return Reference to self, so these method calls may be chained
+	 *
+	 * @note If both `allowed_permissions` and `denied_permissions` parameters are 0, the permission overwrite for the target will be removed
+	 */
+	channel& set_permission_overwrite(const snowflake target, const overwrite_type type, const uint64_t allowed_permissions, const uint64_t denied_permissions);
+	/**
+	 * @brief Remove channel specific permission overwrites of a user or role
+	 *
+	 * @param target ID of the role or the member you want to remove permission overwrites of
+	 * @param type type of overwrite
+	 *
+	 * @return Reference to self, so these method calls may be chained
+	 */
+	channel& remove_permission_overwrite(const snowflake target, const overwrite_type type);
+
+	/**
+	 * @brief Get the channel type
+	 *
+	 * @return channel_type Channel type
+	 */
+	channel_type get_type() const;
+
+	/**
+	 * @brief Get the default forum layout type used to display posts in forum channels
+	 *
+	 * @return forum_layout_types Forum layout type
+	 */
+	forum_layout_type get_default_forum_layout() const;
+
+	/**
+	 * @brief Get the mention ping for the channel
+	 * 
+	 * @return std::string mention
+	 */
+	std::string get_mention() const;
+
+	/**
+	 * @brief Get the overall permissions for a member in this channel, including channel overwrites, role permissions and admin privileges.
+	 * 
+	 * @param user The user to resolve the permissions for
+	 * @return permission Permission overwrites for the member. Made of bits in dpp::permissions.
+	 * @note Requires role cache to be enabled (it's enabled by default).
+	 *
+	 * @note This is an alias for guild::permission_overwrites and searches for the guild in the cache,
+	 * so consider using guild::permission_overwrites if you already have the guild object.
+	 *
+	 * @warning The method will search for the guild member in the cache by the users id.
+	 * If the guild member is not in cache, the method will always return 0.
+	 */
+	permission get_user_permissions(const class user* user) const;
+
+	/**
+	 * @brief Get the overall permissions for a member in this channel, including channel overwrites, role permissions and admin privileges.
+	 *
+	 * @param member The member to resolve the permissions for
+	 * @return permission Permission overwrites for the member. Made of bits in dpp::permissions.
+	 * @note Requires role cache to be enabled (it's enabled by default).
+	 *
+	 * @note This is an alias for guild::permission_overwrites and searches for the guild in the cache,
+	 * so consider using guild::permission_overwrites if you already have the guild object.
+	 */
+	permission get_user_permissions(const class guild_member &member) const;
+
+	/**
+	 * @brief Return a map of members on the channel, built from the guild's
+	 * member list based on which members have the VIEW_CHANNEL permission.
+	 * Does not return reliable information for voice channels, use
+	 * dpp::channel::get_voice_members() instead for this.
+	 * @return A map of guild members keyed by user id.
+	 * @note If the guild this channel belongs to is not in the cache, the function will always return 0.
+	 */
+	std::map<snowflake, class guild_member*> get_members();
+
+	/**
+	 * @brief Get a map of members in this channel, if it is a voice channel.
+	 * The map is keyed by snowflake id of the user.
+	 * 
+	 * @return std::map<snowflake, voicestate> The voice members of the channel
+	 */
+	std::map<snowflake, voicestate> get_voice_members();
+
+	/**
+	 * @brief Get the channel's icon url (if its a group DM), otherwise returns an empty string
+	 *
+	 * @param size The size of the icon in pixels. It can be any power of two between 16 and 4096,
+	 * otherwise the default sized icon is returned.
+	 * @param format The format to use for the avatar. It can be one of `i_webp`, `i_jpg` or `i_png`.
+	 * @return std::string icon url or an empty string, if required attributes are missing or an invalid format was passed
+	 */
+	std::string get_icon_url(uint16_t size = 0, const image_type format = i_png) const;
+
+	/**
+	 * @brief Returns string of URL to channel
+	 * 
+	 * @return string of URL to channel
+	 */
+	std::string get_url() const;
+
+	/**
+	 * @brief Returns true if the channel is NSFW gated
+	 * 
+	 * @return true if NSFW
+	 */
+	bool is_nsfw() const;
+
+	/**
+	 * @brief Returns true if the permissions are to be synced with the category it is in.
+	 * Used only and set manually when using the reorder channels method.
+	 * 
+	 * @return true if keeping permissions
+	 */
+	bool is_locked_permissions() const;
+
+	/**
+	 * @brief Returns true if the channel is a text channel
+	 * 
+	 * @return true if text channel
+	 */
+	bool is_text_channel() const;
+
+	/**
+	 * @brief Returns true if the channel is a DM
+	 * 
+	 * @return true if is a DM
+	 */
+	bool is_dm() const;
+
+	/**
+	 * @brief Returns true if the channel is a voice channel
+	 * 
+	 * @return true if voice channel
+	 */
+	bool is_voice_channel() const;
+
+	/**
+	 * @brief Returns true if the channel is a group DM channel
+	 * 
+	 * @return true if group DM
+	 */
+	bool is_group_dm() const;
+
+	/**
+	 * @brief Returns true if the channel is a category
+	 * 
+	 * @return true if a category
+	 */
+	bool is_category() const;
+
+	/**
+	 * @brief Returns true if the channel is a forum
+	 * 
+	 * @return true if a forum
+	 */
+	bool is_forum() const;
+
+	/**
+	 * @brief Returns true if the channel is a media channel
+	 *
+	 * @return true if media channel
+	 */
+	bool is_media_channel() const;
+
+	/**
+	 * @brief Returns true if the channel is an announcement channel
+	 * 
+	 * @return true if announcement channel
+	 */
+	bool is_news_channel() const;
+
+	/**
+	 * @brief Returns true if the channel is a store channel
+	 * @deprecated store channels are deprecated by Discord
+	 * 
+	 * @return true if store channel
+	 */
+	bool is_store_channel() const;
+
+	/**
+	 * @brief Returns true if the channel is a stage channel
+	 * 
+	 * @return true if stage channel
+	 */
+	bool is_stage_channel() const;
+
+	/**
+	 * @brief Returns true if video quality is auto
+	 * 
+	 * @return true if video quality is auto
+	 */
+	bool is_video_auto() const;
+
+	/**
+	 * @brief Returns true if video quality is 720p
+	 * 
+	 * @return true if video quality is 720p
+	 */
+	bool is_video_720p() const;
+
+	/**
+	 * @brief Returns true if channel is a pinned thread in forum
+	 *
+	 * @return true, if channel is a pinned thread in forum
+	 */
+	bool is_pinned_thread() const;
+
+	/**
+	 * @brief Returns true if a tag is required to be specified when creating a thread in a forum channel
+	 *
+	 * @return true, if a tag is required to be specified when creating a thread in a forum channel
+	 */
+	bool is_tag_required() const;
+
+	/**
+	 * @brief Returns true if embedded media download options are hidden in a media channel
+	 *
+	 * @return true, if embedded media download options are hidden in a media channel
+	 */
+	bool is_download_options_hidden() const;
+
+};
+
+/**
+ * @brief Serialize a permission_overwrite object to json
+ *
+ * @param j JSON object to serialize to
+ * @param po object to serialize
+ */
+void to_json(nlohmann::json& j, const permission_overwrite& po);
+
+/**
+ * @brief A group of channels
+ */
+typedef std::unordered_map<snowflake, channel> channel_map;
+
+}
+
diff --git a/3rdParty/dpp/cluster.h b/3rdParty/dpp/cluster.h
index bb1a8cbab0..5df86f7957 100644
--- a/3rdParty/dpp/cluster.h
+++ b/3rdParty/dpp/cluster.h
@@ -1,3341 +1,4163 @@
-/************************************************************************************
- *
- * D++, A Lightweight C++ library for Discord
- *
- * Copyright 2021 Craig Edwards and D++ contributors
- * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- ************************************************************************************/
-
-#pragma once
-
-#include <dpp/export.h>
-#include <string>
-#include <map>
-#include <variant>
-#include <dpp/snowflake.h>
-#include <dpp/dispatcher.h>
-#include <dpp/misc-enum.h>
-#include <dpp/timer.h>
-#include <dpp/nlohmann/json_fwd.hpp>
-#include <dpp/discordclient.h>
-#include <dpp/discordvoiceclient.h>
-#include <dpp/voiceregion.h>
-#include <dpp/dtemplate.h>
-#include <dpp/prune.h>
-#include <dpp/auditlog.h>
-#include <dpp/queues.h>
-#include <dpp/cache.h>
-#include <dpp/intents.h>
-#include <dpp/discordevents.h> 
-#include <dpp/sync.h>
-#include <algorithm>
-#include <iostream>
-#include <shared_mutex>
-#include <cstring>
-#include <dpp/restresults.h>
-#include <dpp/coro.h>
-#include <dpp/event_router.h>
-
-using  json = nlohmann::json;
-
-namespace dpp {
-
-/**
- * @brief Types of startup for cluster::start()
- */
-enum start_type : bool {
-	/**
-	 * @brief Wait forever on a condition variable.
-	 * The cluster will spawn threads for each shard
-	 * and start() will not return in normal operation.
-	 */
-	st_wait = false,
-
-	/**
-	 * @brief Return immediately after starting shard threads.
-	 * If you set the parameter of cluster::start() to
-	 * this value, you will have to manage the lifetime
-	 * and scope of your cluster object yourself. Taking it
-	 * out of scope or deleting its pointer will terminate
-	 * the bot.
-	 */
-	st_return = true,
-};
-
-/** @brief The cluster class represents a group of shards and a command queue for sending and
- * receiving commands from discord via HTTP. You should usually instantiate a cluster object
- * at the very least to make use of the library.
- */
-class DPP_EXPORT cluster {
-
-	friend class discord_client;
-	friend class discord_voice_client;
-
-	/**
-	 * @brief default gateway for connecting the websocket.
-	 */
-	std::string default_gateway;
-
-	/**
-	 * @brief queue system for commands sent to Discord, and any replies
-	 */
-	request_queue* rest;
-
-	/**
-	 * @brief queue system for arbitrary HTTP requests sent by the user to sites other than Discord
-	 */
-	request_queue* raw_rest;
-
-	/**
-	 * @brief True if to use compression on shards
-	 */
-	bool compressed;
-
-	/**
-	 * @brief Lock to prevent concurrent access to dm_channels
-	 */
-	std::mutex dm_list_lock;
-
-	/**
-	 * @brief Start time of cluster
-	 */
-	time_t start_time;
-
-	/**
-	 * @brief Active DM channels for the bot
-	 */
-	std::unordered_map<snowflake, snowflake> dm_channels;
-
-	/**
-	 * @brief Active shards on this cluster. Shard IDs may have gaps between if there
-	 * are multiple clusters.
-	 */
-	shard_list shards;
-
-	/**
-	 * @brief List of all active registered timers
-	 */
-	timer_reg_t timer_list;
-
-	/**
-	 * @brief List of timers by time
-	 */
-	timer_next_t next_timer;
-
-	/**
-	 * @brief Tick active timers
-	 */
-	void tick_timers();
-
-	/**
-	 * @brief Reschedule a timer for its next tick
-	 * 
-	 * @param t Timer to reschedule
-	 */
-	void timer_reschedule(timer_t* t);
-public:
-	/**
-	 * @brief Current bot token for all shards on this cluster and all commands sent via HTTP
-	 */
-	std::string token;
-
-	/**
-	 * @brief Last time the bot sent an IDENTIFY
-	 */
-	time_t last_identify;
-
-	/**
-	 * @brief Current bitmask of gateway intents
-	 */
-	uint32_t intents;
-
-	/**
-	 * @brief Total number of shards across all clusters
-	 */
-	uint32_t numshards;
-
-	/**
-	 * @brief ID of this cluster, between 0 and MAXCLUSTERS-1 inclusive
-	 */
-	uint32_t cluster_id;
-
-	/**
-	 * @brief Total number of clusters that are active
-	 */
-	uint32_t maxclusters;
-
-	/**
-	 * @brief REST latency (HTTPS ping) in seconds
-	 */
-	double rest_ping;
-
-	/**
-	 * @brief The details of the bot user. This is assumed to be identical across all shards
-	 * in the cluster. Each connecting shard updates this information.
-	 */
-	dpp::user me;
-
-	/**
-	 * @brief Current cache policy for the cluster
-	 */
-	cache_policy_t cache_policy;
-
-	/**
-	 * @brief Websocket mode for all shards in the cluster, either ws_json or ws_etf.
-	 * Production bots should use ETF, while development bots should use JSON.
-	 */
-	websocket_protocol_t ws_mode;
-
-	/**
-	 * @brief Condition variable notified when the cluster is terminating.
-	 */
-	std::condition_variable terminating;
-
-	/**
-	 * @brief Constructor for creating a cluster. All but the token are optional.
-	 * @param token The bot token to use for all HTTP commands and websocket connections
-	 * @param intents A bitmask of dpd::intents values for all shards on this cluster. This is required to be sent for all bots with over 100 servers.
-	 * @param shards The total number of shards on this bot. If there are multiple clusters, then (shards / clusters) actual shards will run on this cluster.
-	 * If you omit this value, the library will attempt to query the Discord API for the correct number of shards to start.
-	 * @param cluster_id The ID of this cluster, should be between 0 and MAXCLUSTERS-1
-	 * @param maxclusters The total number of clusters that are active, which may be on separate processes or even separate machines.
-	 * @param compressed Whether or not to use compression for shards on this cluster. Saves a ton of bandwidth at the cost of some CPU
-	 * @param policy Set the user caching policy for the cluster, either lazy (only cache users/members when they message the bot) or aggressive (request whole member lists on seeing new guilds too)
-	 * @param request_threads The number of threads to allocate for making HTTP requests to Discord. This defaults to 12. You can increase this at runtime via the object returned from get_rest().
-	 * @param request_threads_raw The number of threads to allocate for making HTTP requests to sites outside of Discord. This defaults to 1. You can increase this at runtime via the object returned from get_raw_rest().
-	 * @throw dpp::exception Thrown on windows, if WinSock fails to initialise, or on any other system if a dpp::request_queue fails to construct
-	 */
-	cluster(const std::string& token, uint32_t intents = i_default_intents, uint32_t shards = 0, uint32_t cluster_id = 0, uint32_t maxclusters = 1, bool compressed = true, cache_policy_t policy = { cp_aggressive, cp_aggressive, cp_aggressive }, uint32_t request_threads = 12, uint32_t request_threads_raw = 1);
-
-	/**
-	 * @brief dpp::cluster is non-copyable
-	 */
-	cluster(const cluster&) = delete;
-
-	/**
-	 * @brief dpp::cluster is non-moveable
-	 */
-	cluster(const cluster&&) = delete;
-
-	/**
-	 * @brief Destroy the cluster object
-	 */
-	virtual ~cluster();
-
-	/**
-	 * @brief End cluster execution without destructing it.
-	 * To restart the cluster, call cluster::start() again.
-	 */
-	void shutdown();
-
-	/**
-	 * @brief Get the rest_queue object which handles HTTPS requests to Discord
-	 * @return request_queue* pointer to request_queue object
-	 */
-	request_queue* get_rest();
-
-	/**
-	 * @brief Get the raw rest_queue object which handles all HTTP(S) requests that are not directed at Discord
-	 * @return request_queue* pointer to request_queue object
-	 */
-	request_queue* get_raw_rest();
-
-	/**
-	 * @brief Set the websocket protocol for all shards on this cluster.
-	 * You should call this method before cluster::start.
-	 * Generally ws_etf is faster, but provides less facilities for debugging should something
-	 * go wrong. It is recommended to use ETF in production and JSON in development.
-	 * 
-	 * @param mode websocket protocol to use, either ws_json or ws_etf.
-	 * @return cluster& Reference to self for chaining.
-	 */
-	cluster& set_websocket_protocol(websocket_protocol_t mode);
-
-	/**
-	 * @brief Set the audit log reason for the next REST call to be made.
-	 * This is set per-thread, so you must ensure that if you call this method, your request that
-	 * is associated with the reason happens on the same thread where you set the reason.
-	 * Once the next call is made, the audit log reason is cleared for this thread automatically.
-	 * 
-	 * Example:
-	 * ```
-	 * bot.set_audit_reason("Too much abusive content")
-	 *	.channel_delete(my_channel_id);
-	 * ```
-	 * 
-	 * @param reason The reason to set for the next REST call on this thread
-	 * @return cluster& Reference to self for chaining.
-	 */
-	cluster& set_audit_reason(const std::string &reason);
-
-	/**
-	 * @brief Clear the audit log reason for the next REST call to be made.
-	 * This is set per-thread, so you must ensure that if you call this method, your request that
-	 * is associated with the reason happens on the same thread where you set the reason.
-	 * Once the next call is made, the audit log reason is cleared for this thread automatically.
-	 * 
-	 * Example:
-	 * ```
-	 * bot.set_audit_reason("Won't be sent")
-	 *	.clear_audit_reason()
-	 *	.channel_delete(my_channel_id);
-	 * ```
-	 * 
-	 * @return cluster& Reference to self for chaining.
-	 */
-	cluster& clear_audit_reason();
-
-	/**
-	 * @brief Get the audit reason set for the next REST call to be made on this thread.
-	 * This is set per-thread, so you must ensure that if you call this method, your request that
-	 * is associated with the reason happens on the same thread where you set the reason.
-	 * Once the next call is made, the audit log reason is cleared for this thread automatically.
-	 * 
-	 * @note This method call clears the audit reason when it returns it.
-	 * 
-	 * @return std::string The audit reason to be used.
-	 *
-	 */
-	std::string get_audit_reason();
-
-	/**
-	 * @brief Sets the address of the default gateway, for connecting the websockets.
-	 *
-	 * @return cluster& Reference to self for chaining.
-	 */
-	cluster& set_default_gateway(std::string& default_gateway);
-
-	/**
-	 * @brief Log a message to whatever log the user is using.
-	 * The logged message is passed up the chain to the on_log event in user code which can then do whatever
-	 * it wants to do with it.
-	 * @param severity The log level from dpp::loglevel
-	 * @param msg The log message to output
-	 */
-	void log(dpp::loglevel severity, const std::string &msg) const;
-
-	/**
-	 * @brief Start a timer. Every `frequency` seconds, the callback is called.
-	 * 
-	 * @param on_tick The callback lambda to call for this timer when ticked
-	 * @param on_stop The callback lambda to call for this timer when it is stopped
-	 * @param frequency How often to tick the timer in seconds
-	 * @return timer A handle to the timer, used to remove that timer later
-	 */
-	timer start_timer(timer_callback_t on_tick, uint64_t frequency, timer_callback_t on_stop = {});
-
-	/**
-	 * @brief Stop a ticking timer
-	 * 
-	 * @param t Timer handle received from cluster::start_timer
-	 * @return bool True if the timer was stopped, false if it did not exist
-	 * @note If the timer has an on_stop lambda, the on_stop lambda will be called.
-	 */
-	bool stop_timer(timer t);
-
-	/**
-	 * @brief Get the dm channel for a user id
-	 *
-	 * @param user_id the user id to get the dm channel for
-	 * @return Returns 0 on failure
-	 */
-	snowflake get_dm_channel(snowflake user_id);
-
-	/**
-	 * @brief Set the dm channel id for a user id
-	 *
-	 * @param user_id user id to set the dm channel for
-	 * @param channel_id dm channel to set
-	 */
-	void set_dm_channel(snowflake user_id, snowflake channel_id);
-
-	/**
-	 * @brief Returns the uptime of the cluster
-	 *
-	 * @return dpp::utility::uptime The uptime of the cluster
-	 */
-	dpp::utility::uptime uptime();
-
-	/**
-	 * @brief Start the cluster, connecting all its shards.
-	 * 
-	 * Returns once all shards are connected if return_after is true,
-	 * otherwise enters an infinite loop while the shards run.
-	 *
-	 * @param return_after If true the bot will return to your program after starting shards, if false this function will never return.
-	 */
-	void start(bool return_after = true);
-
-	/**
-	 * @brief Set the presence for all shards on the cluster
-	 *
-	 * @param p The presence to set. Only the online status and the first activity are sent.
-	 */
-	void set_presence(const class dpp::presence &p);
-
-	/**
-	 * @brief Get a shard by id, returning the discord_client
-	 *
-	 * @param id Shard ID
-	 * @return discord_client* shard, or null
-	 */
-	discord_client* get_shard(uint32_t id);
-
-	/**
-	 * @brief Get the list of shards
-	 *
-	 * @return shard_list& Reference to map of shards for this cluster
-	 */
-	const shard_list& get_shards();
-
-	/* Functions for attaching to event handlers */
-
-	/**
-	 * @brief on voice state update event
-	 *
-	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
-	 * The function signature for this event takes a single `const` reference of type voice_state_update_t&, and returns void.
-	 */
-	event_router_t<voice_state_update_t> on_voice_state_update;
-
-	
-	/**
-	 * @brief on voice client disconnect event
-	 *
-	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
-	 * The function signature for this event takes a single `const` reference of type voice_client_disconnect_t&, and returns void.
-	 */
-	event_router_t<voice_client_disconnect_t> on_voice_client_disconnect;
-
-	
-	/**
-	 * @brief on voice client speaking event
-	 *
-	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
-	 * The function signature for this event takes a single `const` reference of type voice_client_speaking_t&, and returns void.
-	 */
-	event_router_t<voice_client_speaking_t> on_voice_client_speaking;
-
-	
-	/**
-	 * @brief Called when a log message is to be written to the log.
-	 * You can attach any logging system here you wish, e.g. spdlog, or even just a simple
-	 * use of std::cout or printf. If nothing attaches this log event, then the
-	 * library will be silent.
-	 *
-	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
-	 * The function signature for this event takes a single `const` reference of type log_t&, and returns void.
-	 */
-	event_router_t<log_t> on_log;
-
-	/**
-	 * @brief on guild join request delete.
-	 * Triggered when a user declines the membership screening questionnaire for a guild.
-	 *
-	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
-	 * The function signature for this event takes a single `const` reference of type guild_join_request_delete_t&, and returns void.
-	 */
-	event_router_t<guild_join_request_delete_t> on_guild_join_request_delete;
-
-	
-	/**
-	 * @brief Called when a new interaction is created.
-	 * Interactions are created by discord when commands you have registered are issued
-	 * by a user. For an example of this in action please see \ref slashcommands
-	 *
-	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
-	 * The function signature for this event takes a single `const` reference of type interaction_create_t&, and returns void.
-	 *
-	 * @note There are dedicated events to handle slashcommands (See dpp::cluster::on_slashcommand),
-	 * user context menus (See dpp::cluster::on_user_context_menu) and message context menus (See dpp::cluster::on_message_context_menu)
-	 */
-	event_router_t<interaction_create_t> on_interaction_create;
-
-	/**
-	 * @brief Called when a slash command is issued.
-	 * Only dpp::ctxm_chat_input types of interaction are routed to this event.
-	 * For an example of this in action please see \ref slashcommands
-	 *
-	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
-	 * The function signature for this event takes a single `const` reference of type slashcommand_t&, and returns void.
-	 */
-	event_router_t<slashcommand_t> on_slashcommand;
-	
-	/**
-	 * @brief Called when a button is clicked attached to a message.
-	 * Button clicks are triggered by discord when buttons are clicked which you have
-	 * associated with a message using dpp::component.
-	 *
-	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
-	 * The function signature for this event takes a single `const` reference of type button_click_t&, and returns void.
-	 */
-	event_router_t<button_click_t> on_button_click;
-	
-	/**
-	 * @brief Called when an auto completed field needs suggestions to present to the user
-	 * This is triggered by discord when option choices have auto completion enabled which you have
-	 * associated with a dpp::slashcommand.
-	 *
-	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
-	 * The function signature for this event takes a single `const` reference of type autocomplete_t&, and returns void.
-	 */
-	event_router_t<autocomplete_t> on_autocomplete;
-
-	
-	/**
-	 * @brief Called when a select menu is clicked attached to a message.
-	 * Select menu clicks are triggered by discord when select menus are clicked which you have
-	 * associated with a message using dpp::component.
-	 *
-	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
-	 * The function signature for this event takes a single `const` reference of type select_click_t&, and returns void.
-	 */
-	event_router_t<select_click_t> on_select_click;
-
-	/**
-	 * @brief Called when a user right-clicks or long-presses on a message,
-	 * where a slash command is bound to the dpp::ctxm_message command type.
-	 *
-	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
-	 * The function signature for this event takes a single `const` reference of type message_context_menu_t&, and returns void.
-	 */
-	event_router_t<message_context_menu_t> on_message_context_menu;
-
-	/**
-	 * @brief Called when a user right-clicks or long-presses on a user,
-	 * where a slash command is bound to the dpp::ctxm_user command type.
-	 *
-	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
-	 * The function signature for this event takes a single `const` reference of type user_context_menu_t&, and returns void.
-	 */
-	event_router_t<user_context_menu_t> on_user_context_menu;
-
-	/**
-	 * @brief Called when a modal dialog is submitted.
-	 * Form submits are triggered by discord when modal dialogs are submitted which you have
-	 * associated with a slash command using dpp::interaction_modal_response.
-	 *
-	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
-	 * The function signature for this event takes a single `const` reference of type form_submit_t&, and returns void.
-	 */
-	event_router_t<form_submit_t> on_form_submit;
-
-	
-	/**
-	 * @brief Called when a guild is deleted.
-	 * A guild can be deleted via the bot being kicked, the bot leaving the guild
-	 * explicitly with dpp::cluster::guild_delete, or via the guild being unavailable due to
-	 * an outage.
-	 *
-	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
-	 * The function signature for this event takes a single `const` reference of type guild_delete_t&, and returns void.
-	 */
-	event_router_t<guild_delete_t> on_guild_delete;
-
-	
-	/**
-	 * @brief Called when a channel is deleted from a guild.
-	 * The channel will still be temporarily available in the cache. Pointers to the
-	 * channel should not be retained long-term as they will be deleted by the garbage
-	 * collector.
-	 *
-	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
-	 * The function signature for this event takes a single `const` reference of type channel_delete_t&, and returns void.
-	 */
-	event_router_t<channel_delete_t> on_channel_delete;
-
-	
-	/**
-	 * @brief Called when a channel is edited on a guild.
-	 * The new channel details have already been applied to the guild when you
-	 * receive this event.
-	 *
-	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
-	 * The function signature for this event takes a single `const` reference of type channel_update_t&, and returns void.
-	 */
-	event_router_t<channel_update_t> on_channel_update;
-
-	
-	/**
-	 * @brief Called when a shard is connected and ready.
-	 * A set of cluster::on_guild_create events will follow this event.
-	 *
-	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
-	 * The function signature for this event takes a single `const` reference of type ready_t&, and returns void.
-	 */
-	event_router_t<ready_t> on_ready;
-
-	
-	/**
-	 * @brief Called when a message is deleted.
-	 * The message has already been deleted from Discord when you
-	 * receive this event.
-	 *
-	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
-	 * The function signature for this event takes a single `const` reference of type message_delete_t&, and returns void.
-	 */
-	event_router_t<message_delete_t> on_message_delete;
-
-	
-	/**
-	 * @brief Called when a user leaves a guild (either through being kicked, or choosing to leave)
-	 *
-	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
-	 * The function signature for this event takes a single `const` reference of type guild_member_remove_t&, and returns void.
-	 */
-	event_router_t<guild_member_remove_t> on_guild_member_remove;
-
-	
-	/**
-	 * @brief Called when a connection to a shard successfully resumes.
-	 * A resumed session does not need to re-synchronise guilds, members, etc.
-	 * This is generally non-fatal and informational only.
-	 *
-	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
-	 * The function signature for this event takes a single `const` reference of type resumed_t&, and returns void.
-	 */
-	event_router_t<resumed_t> on_resumed;
-
-	
-	/**
-	 * @brief Called when a new role is created on a guild.
-	 *
-	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
-	 * The function signature for this event takes a single `const` reference of type guild_role_create_t&, and returns void.
-	 */
-	event_router_t<guild_role_create_t> on_guild_role_create;
-
-	
-	/**
-	 * @brief Called when a user is typing on a channel.
-	 *
-	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
-	 * The function signature for this event takes a single `const` reference of type typing_start_t&, and returns void.
-	 */
-	event_router_t<typing_start_t> on_typing_start;
-
-	
-	/**
-	 * @brief Called when a new reaction is added to a message.
-	 *
-	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
-	 * The function signature for this event takes a single `const` reference of type message_reaction_add_t&, and returns void.
-	 */
-	event_router_t<message_reaction_add_t> on_message_reaction_add;
-
-	
-	/**
-	 * @brief Called when a set of members is received for a guild.
-	 * D++ will request these for all new guilds if needed, after the cluster::on_guild_create
-	 * events.
-	 *
-	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
-	 * The function signature for this event takes a single `const` reference of type guild_members_chunk_t&, and returns void.
-	 */
-	event_router_t<guild_members_chunk_t> on_guild_members_chunk;
-
-	
-	/**
-	 * @brief Called when a single reaction is removed from a message.
-	 *
-	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
-	 * The function signature for this event takes a single `const` reference of type message_reaction_remove_t&, and returns void.
-	 */
-	event_router_t<message_reaction_remove_t> on_message_reaction_remove;
-
-	
-	/**
-	 * @brief Called when a new guild is created.
-	 * D++ will request members for the guild for its cache using guild_members_chunk.
-	 *
-	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
-	 * The function signature for this event takes a single `const` reference of type guild_create_t&, and returns void.
-	 */
-	event_router_t<guild_create_t> on_guild_create;
-
-	
-	/**
-	 * @brief Called when a new channel is created on a guild.
-	 *
-	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
-	 * The function signature for this event takes a single `const` reference of type channel_create_t&, and returns void.
-	 */
-	event_router_t<channel_create_t> on_channel_create;
-
-	
-	/**
-	 * @brief Called when all reactions for a particular emoji are removed from a message.
-	 *
-	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
-	 * The function signature for this event takes a single `const` reference of type message_reaction_remove_emoji_t&, and returns void.
-	 */
-	event_router_t<message_reaction_remove_emoji_t> on_message_reaction_remove_emoji;
-
-	
-	/**
-	 * @brief Called when multiple messages are deleted from a channel or DM.
-	 *
-	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
-	 * The function signature for this event takes a single `const` reference of type message_delete_bulk_t&, and returns void.
-	 */
-	event_router_t<message_delete_bulk_t> on_message_delete_bulk;
-
-	
-	/**
-	 * @brief Called when an existing role is updated on a guild.
-	 *
-	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
-	 * The function signature for this event takes a single `const` reference of type guild_role_update_t&, and returns void.
-	 */
-	event_router_t<guild_role_update_t> on_guild_role_update;
-
-	
-	/**
-	 * @brief Called when a role is deleted in a guild.
-	 *
-	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
-	 * The function signature for this event takes a single `const` reference of type guild_role_delete_t&, and returns void.
-	 */
-	event_router_t<guild_role_delete_t> on_guild_role_delete;
-
-	
-	/**
-	 * @brief Called when a message is pinned.
-	 * Note that the pinned message is not returned to this event, just the timestamp
-	 * of the last pinned message.
-	 *
-	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
-	 * The function signature for this event takes a single `const` reference of type channel_pins_update_t&, and returns void.
-	 */
-	event_router_t<channel_pins_update_t> on_channel_pins_update;
-
-	
-	/**
-	 * @brief Called when all reactions are removed from a message.
-	 *
-	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
-	 * The function signature for this event takes a single `const` reference of type message_reaction_remove_all_t&, and returns void.
-	 */
-	event_router_t<message_reaction_remove_all_t> on_message_reaction_remove_all;
-
-	
-	/**
-	 * @brief Called when we are told which voice server we can use.
-	 * This will be sent either when we establish a new voice channel connection,
-	 * or as discord rearrange their infrastructure.
-	 *
-	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
-	 * The function signature for this event takes a single `const` reference of type voice_server_update_t&, and returns void.
-	 */
-	event_router_t<voice_server_update_t> on_voice_server_update;
-
-	
-	/**
-	 * @brief Called when new emojis are added to a guild.
-	 * The complete set of emojis is sent every time.
-	 *
-	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
-	 * The function signature for this event takes a single `const` reference of type guild_emojis_update_t&, and returns void.
-	 */
-	event_router_t<guild_emojis_update_t> on_guild_emojis_update;
-
-	
-	/**
-	 * @brief Called when new stickers are added to a guild.
-	 * The complete set of stickers is sent every time.
-	 *
-	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
-	 * The function signature for this event takes a single `const` reference of type guild_stickers_update_t&, and returns void.
-	 */
-	event_router_t<guild_stickers_update_t> on_guild_stickers_update;
-
-	
-	/**
-	 * @brief Called when a user's presence is updated.
-	 * To receive these you will need the GUILD_PRESENCES privileged intent.
-	 * You will receive many of these, very often, and receiving them will significantly
-	 * increase your bot's CPU usage. If you don't need them it is recommended to not ask
-	 * for them.
-	 *
-	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
-	 * The function signature for this event takes a single `const` reference of type presence_update_t&, and returns void.
-	 */
-	event_router_t<presence_update_t> on_presence_update;
-
-	
-	/**
-	 * @brief Called when the webhooks for a guild are updated.
-	 *
-	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
-	 * The function signature for this event takes a single `const` reference of type webhooks_update_t&, and returns void.
-	 */
-	event_router_t<webhooks_update_t> on_webhooks_update;
-
-	/**
-	 * @brief Called when a new automod rule is created.
-	 *
-	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
-	 * The function signature for this event takes a single `const` reference of type automod_rule_create_t&, and returns void.
-	 */
-	event_router_t<automod_rule_create_t> on_automod_rule_create;
-
-
-	/**
-	 * @brief Called when an automod rule is updated.
-	 *
-	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
-	 * The function signature for this event takes a single `const` reference of type automod_rule_update_t&, and returns void.
-	 */
-	event_router_t<automod_rule_update_t> on_automod_rule_update;
-	
-	/**
-	 * @brief Called when an automod rule is deleted.
-	 *
-	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
-	 * The function signature for this event takes a single `const` reference of type automod_rule_delete_t&, and returns void.
-	 */
-	event_router_t<automod_rule_delete_t> on_automod_rule_delete;
-
-	/**
-	 * @brief Called when an automod rule is triggered/executed.
-	 *
-	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
-	 * The function signature for this event takes a single `const` reference of type automod_rule_execute_t&, and returns void.
-	 */
-	event_router_t<automod_rule_execute_t> on_automod_rule_execute;
-
-	/**
-	 * @brief Called when a new member joins a guild.
-	 *
-	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
-	 * The function signature for this event takes a single `const` reference of type guild_member_add_t&, and returns void.
-	 */
-	event_router_t<guild_member_add_t> on_guild_member_add;
-
-	
-	/**
-	 * @brief Called when an invite is deleted from a guild.
-	 *
-	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
-	 * The function signature for this event takes a single `const` reference of type invite_delete_t&, and returns void.
-	 */
-	event_router_t<invite_delete_t> on_invite_delete;
-
-	
-	/**
-	 * @brief Called when details of a guild are updated.
-	 *
-	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
-	 * The function signature for this event takes a single `const` reference of type guild_update_t&, and returns void.
-	 */
-	event_router_t<guild_update_t> on_guild_update;
-
-	
-	/**
-	 * @brief Called when an integration is updated for a guild.
-	 * This returns the complete list.
-	 * An integration is a connection to a guild of a user's associated accounts,
-	 * e.g. youtube or twitch, for automatic assignment of roles etc.
-	 *
-	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
-	 * The function signature for this event takes a single `const` reference of type guild_integrations_update_t&, and returns void.
-	 */
-	event_router_t<guild_integrations_update_t> on_guild_integrations_update;
-
-	
-	/**
-	 * @brief Called when details of a guild member (e.g. their roles or nickname) are updated.
-	 *
-	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
-	 * The function signature for this event takes a single `const` reference of type guild_member_update_t&, and returns void.
-	 */
-	event_router_t<guild_member_update_t> on_guild_member_update;
-
-	
-	/**
-	 * @brief Called when a new invite is created for a guild.
-	 *
-	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
-	 * The function signature for this event takes a single `const` reference of type invite_create_t&, and returns void.
-	 */
-	event_router_t<invite_create_t> on_invite_create;
-
-	
-	/**
-	 * @brief Called when a message is updated (edited).
-	 *
-	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
-	 * The function signature for this event takes a single `const` reference of type message_update_t&, and returns void.
-	 */
-	event_router_t<message_update_t> on_message_update;
-
-	
-	/**
-	 * @brief Called when a user is updated.
-	 * This is separate to cluster::on_guild_member_update and includes things such as an avatar change,
-	 * username change, discriminator change or change in subscription status for nitro.
-	 *
-	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
-	 * The function signature for this event takes a single `const` reference of type user_update_t&, and returns void.
-	 */
-	event_router_t<user_update_t> on_user_update;
-
-	
-	/**
-	 * @brief Called when a new message arrives from discord.
-	 * Note that D++ does not cache messages. If you want to cache these objects you
-	 * should create something yourself within your bot. Caching of messages is not on
-	 * the roadmap to be supported as it consumes excessive amounts of RAM.
-	 * For an example for caching of messages, please see \ref caching-messages
-	 *
-	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
-	 * The function signature for this event takes a single `const` reference of type message_create_t&, and returns void.
-	 */
-	event_router_t<message_create_t> on_message_create;
-
-	
-	/**
-	 * @brief Called when a ban is added to a guild.
-	 *
-	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
-	 * The function signature for this event takes a single `const` reference of type guild_ban_add_t&, and returns void.
-	 */
-	event_router_t<guild_ban_add_t> on_guild_ban_add;
-
-	
-	/**
-	 * @brief Called when a ban is removed from a guild.
-	 *
-	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
-	 * The function signature for this event takes a single `const` reference of type guild_ban_remove_t&, and returns void.
-	 */
-	event_router_t<guild_ban_remove_t> on_guild_ban_remove;
-
-	
-	/**
-	 * @brief Called when a new integration is attached to a guild by a user.
-	 * An integration is a connection to a guild of a user's associated accounts,
-	 * e.g. youtube or twitch, for automatic assignment of roles etc.
-	 *
-	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
-	 * The function signature for this event takes a single `const` reference of type integration_create_t&, and returns void.
-	 */
-	event_router_t<integration_create_t> on_integration_create;
-
-	
-	/**
-	 * @brief Called when an integration is updated by a user.
-	 * This returns details of just the single integration that has changed.
-	 * An integration is a connection to a guild of a user's associated accounts,
-	 * e.g. youtube or twitch, for automatic assignment of roles etc.
-	 *
-	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
-	 * The function signature for this event takes a single `const` reference of type integration_update_t&, and returns void.
-	 */
-	event_router_t<integration_update_t> on_integration_update;
-
-	
-	/**
-	 * @brief Called when an integration is removed by a user.
-	 * An integration is a connection to a guild of a user's associated accounts,
-	 * e.g. youtube or twitch, for automatic assignment of roles etc.
-	 *
-	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
-	 * The function signature for this event takes a single `const` reference of type integration_delete_t&, and returns void.
-	 */
-	event_router_t<integration_delete_t> on_integration_delete;
-
-	
-	/**
-	 * @brief Called when a thread is created.
-	 * Note that threads are not cached by D++, but a list of thread IDs is accessible in a guild object
-	 *
-	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
-	 * The function signature for this event takes a single `const` reference of type thread_create_t&, and returns void.
-	 */
-	event_router_t<thread_create_t> on_thread_create;
-
-	
-	/**
-	 * @brief Called when a thread is updated
-	 *
-	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
-	 * The function signature for this event takes a single `const` reference of type thread_update_t&, and returns void.
-	 */
-	event_router_t<thread_update_t> on_thread_update;
-
-	
-	/**
-	 * @brief Called when a thread is deleted
-	 *
-	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
-	 * The function signature for this event takes a single `const` reference of type thread_delete_t&, and returns void.
-	 */
-	event_router_t<thread_delete_t> on_thread_delete;
-
-	
-	/**
-	 * @brief Called when thread list is synced (upon gaining access to a channel).
-	 * Note that threads are not cached by D++, but a list of thread IDs is accessible in a guild object
-	 *
-	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
-	 * The function signature for this event takes a single `const` reference of type thread_list_sync_t&, and returns void.
-	 */
-	event_router_t<thread_list_sync_t> on_thread_list_sync;
-
-	
-	/**
-	 * @brief Called when current user's thread member object is updated
-	 *
-	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
-	 * The function signature for this event takes a single `const` reference of type thread_member_update_t&, and returns void.
-	 */
-	event_router_t<thread_member_update_t> on_thread_member_update;
-
-	
-	/**
-	 * @brief Called when a thread's member list is updated (without GUILD_MEMBERS intent, is only called for current user)
-	 *
-	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
-	 * The function signature for this event takes a single `const` reference of type thread_members_update_t&, and returns void.
-	 */
-	event_router_t<thread_members_update_t> on_thread_members_update;
-
-	
-	/**
-	 * @brief Called when a new scheduled event is created
-	 *
-	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
-	 * The function signature for this event takes a single `const` reference of type guild_scheduled_event_create_t&, and returns void.
-	 */
-	event_router_t<guild_scheduled_event_create_t> on_guild_scheduled_event_create;
-
-	
-	/**
-	 * @brief Called when a new scheduled event is updated
-	 *
-	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
-	 * The function signature for this event takes a single `const` reference of type guild_scheduled_event_update_t&, and returns void.
-	 */
-	event_router_t<guild_scheduled_event_update_t> on_guild_scheduled_event_update;
-
-	
-	/**
-	 * @brief Called when a new scheduled event is deleted
-	 *
-	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
-	 * The function signature for this event takes a single `const` reference of type guild_scheduled_event_delete_t&, and returns void.
-	 */
-	event_router_t<guild_scheduled_event_delete_t> on_guild_scheduled_event_delete;
-
-	
-	/**
-	 * @brief Called when a user is added to a scheduled event
-	 *
-	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
-	 * The function signature for this event takes a single `const` reference of type guild_scheduled_event_user_add_t&, and returns void.
-	 */
-	event_router_t<guild_scheduled_event_user_add_t> on_guild_scheduled_event_user_add;
-
-	
-	/**
-	 * @brief Called when a user is removed to a scheduled event
-	 *
-	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
-	 * The function signature for this event takes a single `const` reference of type guild_scheduled_event_user_remove_t&, and returns void.
-	 */
-	event_router_t<guild_scheduled_event_user_remove_t> on_guild_scheduled_event_user_remove;
-
-	
-	/**
-	 * @brief Called when packets are sent from the voice buffer.
-	 * The voice buffer contains packets that are already encoded with Opus and encrypted
-	 * with Sodium, and merged into packets by the repacketizer, which is done in the
-	 * dpp::discord_voice_client::send_audio method. You should use the buffer size properties
-	 * of dpp::voice_buffer_send_t to determine if you should fill the buffer with more
-	 * content.
-	 *
-	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
-	 * The function signature for this event takes a single `const` reference of type voice_buffer_send_t&, and returns void.
-	 */
-	event_router_t<voice_buffer_send_t> on_voice_buffer_send;
-
-	
-	/**
-	 * @brief Called when a user is talking on a voice channel.
-	 *
-	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
-	 * The function signature for this event takes a single `const` reference of type voice_user_talking_t&, and returns void.
-	 */
-	event_router_t<voice_user_talking_t> on_voice_user_talking;
-
-	
-	/**
-	 * @brief Called when a voice channel is connected and ready to send audio.
-	 * Note that this is not directly attached to the READY event of the websocket,
-	 * as there is further connection that needs to be done before audio is ready to send.
-	 *
-	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
-	 * The function signature for this event takes a single `const` reference of type voice_ready_t&, and returns void.
-	 */
-	event_router_t<voice_ready_t> on_voice_ready;
-
-	
-	/**
-	 * @brief Called when new audio data is received.
-	 * Each separate user's audio from the voice channel will arrive tagged with
-	 * their user id in the event, if a user can be attributed to the received audio.
-	 * 
-	 * @note Receiving audio for bots is not officially supported by discord.
-	 * 
-	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
-	 * The function signature for this event takes a single `const` reference of type voice_receive_t&, and returns void.
-	 */
-	event_router_t<voice_receive_t> on_voice_receive;
-
-	/**
-	 * @brief Called when new audio data is received, combined and mixed for all speaking users.
-	 * 
-	 * @note Receiving audio for bots is not officially supported by discord.
-	 * 
-	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
-	 * The function signature for this event takes a single `const` reference of type voice_receive_t&, and returns void.
-	 */
-	event_router_t<voice_receive_t> on_voice_receive_combined;
-	
-	/**
-	 * @brief Called when sending of audio passes over a track marker.
-	 * Track markers are arbitrarily placed "bookmarks" in the audio buffer, placed
-	 * by the bot developer. Each track marker can have a string value associated with it
-	 * which is specified in dpp::discord_voice_client::insert_marker and returned to this
-	 * event.
-	 *
-	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
-	 * The function signature for this event takes a single `const` reference of type voice_track_marker_t&, and returns void.
-	 */
-	event_router_t<voice_track_marker_t> on_voice_track_marker;
-
-	
-	/**
-	 * @brief Called when a new stage instance is created on a stage channel.
-	 *
-	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
-	 * 
-	 */
-	event_router_t<stage_instance_create_t> on_stage_instance_create;
-
-	
-	/**
-	 * @brief Called when a stage instance is updated.
-	 *
-	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
-	 * The function signature for this event takes a single `const` reference of type stage_instance_update_t&, and returns void.
-	 */
-	event_router_t<stage_instance_update_t> on_stage_instance_update;
-
-	
-	/**
-	 * @brief Called when an existing stage instance is deleted from a stage channel.
-	 *
-	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
-	 * The function signature for this event takes a single `const` reference of type stage_instance_delete_t&, and returns void.
-	 */
-	event_router_t<stage_instance_delete_t> on_stage_instance_delete;
-
-	
-	/**
-	 * @brief Post a REST request. Where possible use a helper method instead like message_create
-	 *
-	 * @param endpoint Endpoint to post to, e.g. /api/guilds
-	 * @param major_parameters Major parameters for the endpoint e.g. a guild id
-	 * @param parameters Minor parameters for the API request
-	 * @param method Method, e.g. GET, POST
-	 * @param postdata Post data (usually JSON encoded)
-	 * @param callback Function to call when the HTTP call completes. The callback parameter will contain amongst other things, the decoded json.
-	 * @param filename Filename to post for POST requests (for uploading files)
-	 * @param filecontent File content to post for POST requests (for uploading files)
-	 */
-	void post_rest(const std::string &endpoint, const std::string &major_parameters, const std::string &parameters, http_method method, const std::string &postdata, json_encode_t callback, const std::string &filename = "", const std::string &filecontent = "");
-
-	/**
-	 * @brief Post a multipart REST request. Where possible use a helper method instead like message_create
-	 *
-	 * @param endpoint Endpoint to post to, e.g. /api/guilds
-	 * @param major_parameters Major parameters for the endpoint e.g. a guild id
-	 * @param parameters Minor parameters for the API request
-	 * @param method Method, e.g. GET, POST
-	 * @param postdata Post data (usually JSON encoded)
-	 * @param callback Function to call when the HTTP call completes. The callback parameter will contain amongst other things, the decoded json.
-	 * @param filename List of filenames to post for POST requests (for uploading files)
-	 * @param filecontent List of file content to post for POST requests (for uploading files)
-	 */
-	void post_rest_multipart(const std::string &endpoint, const std::string &major_parameters, const std::string &parameters, http_method method, const std::string &postdata, json_encode_t callback, const std::vector<std::string> &filename = {}, const std::vector<std::string> &filecontent = {});
-
-	/**
-	 * @brief Make a HTTP(S) request. For use when wanting asynchronous access to HTTP APIs outside of Discord.
-	 *
-	 * @param url Full URL to post to, e.g. https://api.somewhere.com/v1/foo/
-	 * @param method Method, e.g. GET, POST
-	 * @param callback Function to call when the HTTP call completes. No processing is done on the returned data.
-	 * @param postdata POST data
-	 * @param mimetype MIME type of POST data
-	 * @param headers Headers to send with the request
-	 */
-	void request(const std::string &url, http_method method, http_completion_event callback, const std::string &postdata = "", const std::string &mimetype = "text/plain", const std::multimap<std::string, std::string> &headers = {});
-
-	/**
-	 * @brief Respond to a slash command
-	 *
-	 * @see https://discord.com/developers/docs/interactions/receiving-and-responding#create-interaction-response
-	 * @param interaction_id Interaction id to respond to
-	 * @param token Token for the interaction webhook
-	 * @param r Response to send
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void interaction_response_create(snowflake interaction_id, const std::string &token, const interaction_response &r, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Edit response to a slash command
-	 *
-	 * @see https://discord.com/developers/docs/interactions/receiving-and-responding#edit-original-interaction-response
-	 * @param token Token for the interaction webhook
-	 * @param m Message to send
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void interaction_response_edit(const std::string &token, const message &m, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Create a followup message to a slash command
-	 * 
-	 * @param token Token for the interaction webhook
-	 * @param m followup message to create
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void interaction_followup_create(const std::string &token, const message &m, command_completion_event_t callback);
-
-	/**
-	 * @brief Edit original followup message to a slash command
-	 * This is an alias for cluster::interaction_response_edit
-	 * @see cluster::interaction_response_edit
-	 * 
-	 * @param token Token for the interaction webhook
-	 * @param m message to edit, the ID should be set
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void interaction_followup_edit_original(const std::string &token, const message &m, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief 
-	 * 
-	 * @param token Token for the interaction webhook
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void interaction_followup_delete(const std::string &token, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Edit followup message to a slash command
-	 * The message ID in the message you pass should be correctly set to that of a followup message you previously sent
-	 * @param token Token for the interaction webhook
-	 * @param m message to edit, the ID should be set
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void interaction_followup_edit(const std::string &token, const message &m, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Get the followup message to a slash command
-	 * @param token Token for the interaction webhook
-	 * @param message_id message to retrieve
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::message object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void interaction_followup_get(const std::string &token, snowflake message_id, command_completion_event_t callback);
-
-	/**
-	 * @brief Create a global slash command (a bot can have a maximum of 100 of these).
-	 * 
-	 * @see https://discord.com/developers/docs/interactions/application-commands#create-global-application-command
-	 * @param s Slash command to create
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::slashcommand object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void global_command_create(const slashcommand &s, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Get a global slash command
-	 *
-	 * @see https://discord.com/developers/docs/interactions/application-commands#get-global-application-command
-	 * @param id The ID of the slash command
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::slashcommand object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void global_command_get(snowflake id, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Get the audit log for a guild
-	 *
-	 * @see https://discord.com/developers/docs/resources/audit-log#get-guild-audit-log
-	 * @param guild_id Guild to get the audit log of
-	 * @param user_id Entries from a specific user ID. Set this to `0` will fetch any user
-	 * @param action_type Entries for a specific dpp::audit_type. Set this to `0` will fetch any type
-	 * @param before Entries that preceded a specific audit log entry ID. Used for paginating
-	 * @param limit Maximum number of entries (between 1-100) to return
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::auditlog object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void guild_auditlog_get(snowflake guild_id, snowflake user_id, uint32_t action_type, snowflake before, uint32_t limit, command_completion_event_t callback);
-
-	/**
-	 * @brief Create a slash command local to a guild
-	 *
-	 * @see https://discord.com/developers/docs/interactions/application-commands#create-guild-application-command
-	 * @note Creating a command with the same name as an existing command for your application will overwrite the old command.
-	 * @param s Slash command to create
-	 * @param guild_id Guild ID to create the slash command in
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::slashcommand object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void guild_command_create(const slashcommand &s, snowflake guild_id, command_completion_event_t callback = utility::log_error());
-
-
-	/**
-	 * @brief Create/overwrite guild slash commands.
-	 * Any existing guild slash commands on this guild will be deleted and replaced with these.
-	 *
-	 * @see https://discord.com/developers/docs/interactions/application-commands#bulk-overwrite-guild-application-commands
-	 * @param commands Vector of slash commands to create/update.
-	 * New guild commands will be available in the guild immediately. If the command did not already exist, it will count toward daily application command create limits.
-	 * @param guild_id Guild ID to create/update the slash commands in
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::slashcommand_map object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void guild_bulk_command_create(const std::vector<slashcommand> &commands, snowflake guild_id, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Create/overwrite global slash commands.
-	 * Any existing global slash commands will be deleted and replaced with these.
-	 *
-	 * @see https://discord.com/developers/docs/interactions/application-commands#bulk-overwrite-global-application-commands
-	 * @param commands Vector of slash commands to create/update.
-	 * overwriting existing commands that are registered globally for this application. Updates will be available in all guilds after 1 hour.
-	 * Commands that do not already exist will count toward daily application command create limits.
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::slashcommand_map object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void global_bulk_command_create(const std::vector<slashcommand> &commands, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Edit a global slash command (a bot can have a maximum of 100 of these)
-	 *
-	 * @see https://discord.com/developers/docs/interactions/application-commands#edit-global-application-command
-	 * @param s Slash command to change
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void global_command_edit(const slashcommand &s, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Get a slash command of a guild
-	 *
-	 * @see https://discord.com/developers/docs/interactions/application-commands#get-guild-application-command
-	 * @note The returned slash commands will not have permissions set, you need to use a permissions getter e.g. dpp::guild_commands_get_permissions to get the guild command permissions
-	 * @param id The ID of the slash command
-	 * @param guild_id Guild ID to get the slash command from
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::slashcommand object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void guild_command_get(snowflake id, snowflake guild_id, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Edit a slash command local to a guild
-	 *
-	 * @see https://discord.com/developers/docs/interactions/application-commands#edit-guild-application-command
-	 * @param s Slash command to edit
-	 * @param guild_id Guild ID to edit the slash command in
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void guild_command_edit(const slashcommand &s, snowflake guild_id, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Edit slash command permissions of a guild
-	 *
-	 * @see https://discord.com/developers/docs/interactions/application-commands#edit-application-command-permissions
-	 * @note You can only add up to 10 permission overwrites for a command
-	 * @param s Slash command to edit the permissions for
-	 * @param guild_id Guild ID to edit the slash command in
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void guild_command_edit_permissions(const slashcommand &s, snowflake guild_id, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Get the permissions for a slash command of a guild
-	 *
-	 * @see https://discord.com/developers/docs/interactions/application-commands#get-application-command-permissions
-	 * @param id The ID of the slash command to get the permissions for
-	 * @param guild_id Guild ID to get the permissions of
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::guild_command_permissions object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void guild_command_get_permissions(snowflake id, snowflake guild_id, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Edit/Overwrite the permissions of all existing slash commands in a guild
-	 *
-	 * @note You can only add up to 10 permission overwrites for a command
-	 *
-	 * @see https://discord.com/developers/docs/interactions/application-commands#batch-edit-application-command-permissions
-	 * @warning The endpoint will overwrite all existing permissions for all commands of the application in a guild, including slash commands, user commands, and message commands. Meaning that if you forgot to pass a slash command, the permissions of it might be removed.
-	 * @param commands A vector of slash commands to edit/overwrite the permissions for
-	 * @param guild_id Guild ID to edit permissions of the slash commands in
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::guild_command_permissions_map object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 * @deprecated This has been disabled with updates to Permissions v2. You can use guild_command_edit_permissions instead
-	 */
-	void guild_bulk_command_edit_permissions(const std::vector<slashcommand> &commands, snowflake guild_id, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Delete a global slash command (a bot can have a maximum of 100 of these)
-	 *
-	 * @see https://discord.com/developers/docs/interactions/application-commands#delete-global-application-command
-	 * @param id Slash command to delete
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void global_command_delete(snowflake id, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Delete a slash command local to a guild
-	 *
-	 * @see https://discord.com/developers/docs/interactions/application-commands#delete-guild-application-command
-	 * @param id Slash command to delete
-	 * @param guild_id Guild ID to delete the slash command in
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void guild_command_delete(snowflake id, snowflake guild_id, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Get the application's slash commands for a guild
-	 *
-	 * @see https://discord.com/developers/docs/interactions/application-commands#get-guild-application-commands
-	 * @note The returned slash commands will not have permissions set, you need to use a permissions getter e.g. dpp::guild_commands_get_permissions to get the guild command permissions
-	 * @param guild_id Guild ID to get the slash commands for
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::slashcommand_map object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void guild_commands_get(snowflake guild_id, command_completion_event_t callback);
-
-	/**
-	 * @brief Get all slash command permissions of a guild
-	 *
-	 * @see https://discord.com/developers/docs/interactions/application-commands#get-application-command-permissions
-	 * @param guild_id Guild ID to get the slash commands permissions for
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::guild_command_permissions_map object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void guild_commands_get_permissions(snowflake guild_id, command_completion_event_t callback);
-
-	/**
-	 * @brief Get the application's global slash commands
-	 *
-	 * @see https://discord.com/developers/docs/interactions/application-commands#get-global-application-commands
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::slashcommand_map object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void global_commands_get(command_completion_event_t callback);
-
-	/**
-	 * @brief Create a direct message, also create the channel for the direct message if needed
-	 *
-	 * @see https://discord.com/developers/docs/resources/user#create-dm
-	 * @see https://discord.com/developers/docs/resources/channel#create-message
-	 * @param user_id User ID of user to send message to
-	 * @param m Message object
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::message object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void direct_message_create(snowflake user_id, const message &m, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Get a message
-	 *
-	 * @see https://discord.com/developers/docs/resources/channel#get-channel-message
-	 * @param message_id Message ID
-	 * @param channel_id Channel ID
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::message object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void message_get(snowflake message_id, snowflake channel_id, command_completion_event_t callback);
-
-	/**
-	 * @brief Get multiple messages.
-	 * 
-	 * This function will attempt to fetch as many messages as possible using multiple API calls if needed.
-	 *
-	 * @see https://discord.com/developers/docs/resources/channel#get-channel-messages
-	 * @param channel_id Channel ID to retrieve messages for
-	 * @param around Messages should be retrieved around this ID if this is set to non-zero
-	 * @param before Messages before this ID should be retrieved if this is set to non-zero
-	 * @param after Messages after this ID should be retrieved if this is set to non-zero
-	 * @param limit This number of messages maximum should be returned, up to a maximum of 100.
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::message_map object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void messages_get(snowflake channel_id, snowflake around, snowflake before, snowflake after, uint64_t limit, command_completion_event_t callback);
-
-	/**
-	 * @brief Send a message to a channel. The callback function is called when the message has been sent
-	 *
-	 * @see https://discord.com/developers/docs/resources/channel#create-message
-	 * @param m Message to send
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::message object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void message_create(const struct message &m, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Crosspost a message. The callback function is called when the message has been sent
-	 *
-	 * @see https://discord.com/developers/docs/resources/channel#crosspost-message
-	 * @param message_id Message to crosspost
-	 * @param channel_id Channel ID to crosspost from
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::message object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void message_crosspost(snowflake message_id, snowflake channel_id, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Edit a message on a channel. The callback function is called when the message has been edited
-	 *
-	 * @see https://discord.com/developers/docs/resources/channel#edit-message
-	 * @param m Message to edit
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::message object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void message_edit(const struct message &m, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Add a reaction to a message. The reaction string must be either an `emojiname:id` or a unicode character.
-	 *
-	 * @see https://discord.com/developers/docs/resources/channel#create-reaction
-	 * @param m Message to add a reaction to
-	 * @param reaction Reaction to add. Emojis should be in the form emojiname:id
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void message_add_reaction(const struct message &m, const std::string &reaction, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Delete own reaction from a message. The reaction string must be either an `emojiname:id` or a unicode character.
-	 *
-	 * @see https://discord.com/developers/docs/resources/channel#delete-own-reaction
-	 * @param m Message to delete own reaction from
-	 * @param reaction Reaction to delete. The reaction should be in the form emojiname:id
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void message_delete_own_reaction(const struct message &m, const std::string &reaction, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Delete a user's reaction from a message. The reaction string must be either an `emojiname:id` or a unicode character
-	 *
-	 * @see https://discord.com/developers/docs/resources/channel#delete-user-reaction
-	 * @param m Message to delete a user's reaction from
-	 * @param user_id User ID who's reaction you want to remove
-	 * @param reaction Reaction to remove. Reactions should be in the form emojiname:id
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void message_delete_reaction(const struct message &m, snowflake user_id, const std::string &reaction, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Get reactions on a message for a particular emoji. The reaction string must be either an `emojiname:id` or a unicode character
-	 *
-	 * @see https://discord.com/developers/docs/resources/channel#get-reactions
-	 * @param m Message to get reactions for
-	 * @param reaction Reaction should be in the form emojiname:id or a unicode character
-	 * @param before Reactions before this ID should be retrieved if this is set to non-zero
-	 * @param after Reactions before this ID should be retrieved if this is set to non-zero
-	 * @param limit This number of reactions maximum should be returned
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::user_map object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void message_get_reactions(const struct message &m, const std::string &reaction, snowflake before, snowflake after, snowflake limit, command_completion_event_t callback);
-
-	/**
-	 * @brief Delete all reactions on a message
-	 *
-	 * @see https://discord.com/developers/docs/resources/channel#delete-all-reactions
-	 * @param m Message to delete reactions from
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void message_delete_all_reactions(const struct message &m, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Delete all reactions on a message using a particular emoji. The reaction string must be either an `emojiname:id` or a unicode character
-	 *
-	 * @see https://discord.com/developers/docs/resources/channel#delete-all-reactions-for-emoji
-	 * @param m Message to delete reactions from
-	 * @param reaction Reaction to delete, in the form emojiname:id or a unicode character
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void message_delete_reaction_emoji(const struct message &m, const std::string &reaction, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Add a reaction to a message by id. The reaction string must be either an `emojiname:id` or a unicode character.
-	 *
-	 * @see https://discord.com/developers/docs/topics/gateway#message-reaction-add
-	 * @param message_id Message to add reactions to
-	 * @param channel_id Channel to add reactions to
-	 * @param reaction Reaction to add. Emojis should be in the form emojiname:id
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void message_add_reaction(snowflake message_id, snowflake channel_id, const std::string &reaction, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Delete own reaction from a message by id. The reaction string must be either an `emojiname:id` or a unicode character.
-	 *
-	 * @see https://discord.com/developers/docs/resources/channel#delete-own-reaction
-	 * @param message_id Message to delete reactions from
-	 * @param channel_id Channel to delete reactions from
-	 * @param reaction Reaction to delete. The reaction should be in the form emojiname:id
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void message_delete_own_reaction(snowflake message_id, snowflake channel_id, const std::string &reaction, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Delete a user's reaction from a message by id. The reaction string must be either an `emojiname:id` or a unicode character
-	 *
-	 * @see https://discord.com/developers/docs/resources/channel#delete-user-reaction
-	 * @param message_id Message to delete reactions from
-	 * @param channel_id Channel to delete reactions from
-	 * @param user_id User ID who's reaction you want to remove
-	 * @param reaction Reaction to remove. Reactions should be in the form emojiname:id
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void message_delete_reaction(snowflake message_id, snowflake channel_id, snowflake user_id, const std::string &reaction, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Get reactions on a message for a particular emoji by id. The reaction string must be either an `emojiname:id` or a unicode character
-	 *
-	 * @see https://discord.com/developers/docs/resources/channel#get-reactions
-	 * @param message_id Message to get reactions for
-	 * @param channel_id Channel to get reactions for
-	 * @param reaction Reaction should be in the form emojiname:id or a unicode character
-	 * @param before Reactions before this ID should be retrieved if this is set to non-zero
-	 * @param after Reactions before this ID should be retrieved if this is set to non-zero
-	 * @param limit This number of reactions maximum should be returned
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::user_map object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void message_get_reactions(snowflake message_id, snowflake channel_id, const std::string &reaction, snowflake before, snowflake after, snowflake limit, command_completion_event_t callback);
-
-	/**
-	 * @brief Delete all reactions on a message by id
-	 *
-	 * @see https://discord.com/developers/docs/resources/channel#delete-all-reactions
-	 * @param message_id Message to delete reactions from
-	 * @param channel_id Channel to delete reactions from
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void message_delete_all_reactions(snowflake message_id, snowflake channel_id, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Delete all reactions on a message using a particular emoji by id. The reaction string must be either an `emojiname:id` or a unicode character
-	 *
-	 * @see https://discord.com/developers/docs/resources/channel#delete-all-reactions-for-emoji
-	 * @param message_id Message to delete reactions from
-	 * @param channel_id Channel to delete reactions from
-	 * @param reaction Reaction to delete, in the form emojiname:id or a unicode character
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void message_delete_reaction_emoji(snowflake message_id, snowflake channel_id, const std::string &reaction, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Delete a message from a channel. The callback function is called when the message has been edited
-	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
-	 *
-	 * @see https://discord.com/developers/docs/resources/channel#delete-message
-	 * @param message_id Message ID to delete
-	 * @param channel_id Channel to delete from
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void message_delete(snowflake message_id, snowflake channel_id, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Bulk delete messages from a channel. The callback function is called when the message has been edited
-	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
-	 *
-	 * @note If any message provided older than 2 weeks or any duplicate message ID, it will fail.
-	 *
-	 * @see https://discord.com/developers/docs/resources/channel#bulk-delete-messages
-	 * @param message_ids List of message IDs to delete (at least 2 and at most 100 message IDs)
-	 * @param channel_id Channel to delete from
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void message_delete_bulk(const std::vector<snowflake> &message_ids, snowflake channel_id, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Get a channel
-	 *
-	 * @see https://discord.com/developers/docs/resources/channel#get-channel
-	 * @param c Channel ID to retrieve
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::channel object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void channel_get(snowflake c, command_completion_event_t callback);
-
-	/**
-	 * @brief Get all channels for a guild
-	 *
-	 * @see https://discord.com/developers/docs/resources/channel#get-channels
-	 * @param guild_id Guild ID to retrieve channels for
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::channel_map object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void channels_get(snowflake guild_id, command_completion_event_t callback);
-
-	/**
-	 * @brief Create a channel
-	 * 
-	 * Create a new channel object for the guild. Requires the `MANAGE_CHANNELS` permission. If setting permission overwrites,
-	 * only permissions your bot has in the guild can be allowed/denied. Setting `MANAGE_ROLES` permission in channels is only possible
-	 * for guild administrators. Returns the new channel object on success. Fires a `Channel Create Gateway` event.
-	 * 
-	 * All parameters to this endpoint are optional excluding `name`
-	 * 
-	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
-	 * @see https://discord.com/developers/docs/resources/channel#create-channel
-	 * @param c Channel to create
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::channel object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void channel_create(const class channel &c, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Edit a channel
-	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
-	 * @see https://discord.com/developers/docs/resources/channel#modify-channel
-	 * @param c Channel to edit/update
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::channel object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void channel_edit(const class channel &c, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Edit multiple channels positions
-	 * 
-	 * Modify the positions of a set of channel objects for the guild.
-	 * Requires `MANAGE_CHANNELS` permission. Fires multiple `Channel Update Gateway` events.
-	 * Only channels to be modified are required.
-	 *
-	 * @see https://discord.com/developers/docs/resources/guild#modify-guild-channel-positions
-	 * @param c Channel to change the position for
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void channel_edit_positions(const std::vector<channel> &c, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Edit a channel's permissions
-	 *
-	 * @see https://discord.com/developers/docs/resources/channel#edit-channel-permissions
-	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
-	 * @param c Channel to set permissions for
-	 * @param overwrite_id Overwrite to change (a user or role ID)
-	 * @param allow allow permissions bitmask
-	 * @param deny deny permissions bitmask
-	 * @param member true if the overwrite_id is a user id, false if it is a channel id
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void channel_edit_permissions(const class channel &c, const snowflake overwrite_id, const uint64_t allow, const uint64_t deny, const bool member, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Edit a channel's permissions
-	 *
-	 * @see https://discord.com/developers/docs/resources/channel#edit-channel-permissions
-	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
-	 * @param channel_id ID of the channel to set permissions for
-	 * @param overwrite_id Overwrite to change (a user or role ID)
-	 * @param allow allow permissions bitmask
-	 * @param deny deny permissions bitmask
-	 * @param member true if the overwrite_id is a user id, false if it is a channel id
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void channel_edit_permissions(const snowflake channel_id, const snowflake overwrite_id, const uint64_t allow, const uint64_t deny, const bool member, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Delete a channel
-	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
-	 * @see https://discord.com/developers/docs/resources/channel#deleteclose-channel
-	 * @param channel_id Channel id to delete
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void channel_delete(snowflake channel_id, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Get details about an invite
-	 *
-	 * @see https://discord.com/developers/docs/resources/invite#get-invite
-	 * @param invite Invite code to get information on
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::invite object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void invite_get(const std::string &invite, command_completion_event_t callback);
-
-	/**
-	 * @brief Delete an invite
-	 *
-	 * @see https://discord.com/developers/docs/resources/invite#delete-invite
-	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
-	 * @param invite Invite code to delete
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::invite object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void invite_delete(const std::string &invite, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Get invites for a channel
-	 *
-	 * @see https://discord.com/developers/docs/resources/invite#get-invites
-	 * @param c Channel to get invites for
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::invite_map object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void channel_invites_get(const class channel &c, command_completion_event_t callback);
-
-	/**
-	 * @brief Create invite for a channel
-	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
-	 * @see https://discord.com/developers/docs/resources/channel#create-channel-invite
-	 * @param c Channel to create an invite on
-	 * @param i Invite to create
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::invite object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void channel_invite_create(const class channel &c, const class invite &i, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Get a channel's pins
-	 * @see https://discord.com/developers/docs/resources/channel#get-pinned-messages
-	 * @param channel_id Channel ID to get pins for
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::message_map object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void channel_pins_get(snowflake channel_id, command_completion_event_t callback);
-
-	/**
-	 * @brief Adds a recipient to a Group DM using their access token
-	 * @see https://discord.com/developers/docs/resources/channel#group-dm-add-recipient
-	 * @param channel_id Channel id to add group DM recipients to
-	 * @param user_id User ID to add
-	 * @param access_token Access token from OAuth2
-	 * @param nick Nickname of user to apply to the chat
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void gdm_add(snowflake channel_id, snowflake user_id, const std::string &access_token, const std::string &nick, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Removes a recipient from a Group DM
-	 * @see https://discord.com/developers/docs/resources/channel#group-dm-remove-recipient
-	 * @param channel_id Channel ID of group DM
-	 * @param user_id User ID to remove from group DM
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void gdm_remove(snowflake channel_id, snowflake user_id, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Remove a permission from a channel
-	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
-	 * @see https://discord.com/developers/docs/resources/channel#delete-channel-permission
-	 * @param c Channel to remove permission from
-	 * @param overwrite_id Overwrite to remove, user or channel ID
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void channel_delete_permission(const class channel &c, snowflake overwrite_id, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Follow an announcement (news) channel
-	 * @see https://discord.com/developers/docs/resources/channel#follow-news-channel
-	 * @param c Channel id to follow
-	 * @param target_channel_id Channel to subscribe the channel to
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void channel_follow_news(const class channel &c, snowflake target_channel_id, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Trigger channel typing indicator
-	 * @see https://discord.com/developers/docs/resources/channel#trigger-typing-indicator
-	 * @param c Channel to set as typing on
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void channel_typing(const class channel &c, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Trigger channel typing indicator
-	 * @see https://discord.com/developers/docs/resources/channel#trigger-typing-indicator
-	 * @param cid Channel ID to set as typing on
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void channel_typing(snowflake cid, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Pin a message
-	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
-	 * @see https://discord.com/developers/docs/resources/channel#pin-message
-	 * @param channel_id Channel id to pin message on
-	 * @param message_id Message id to pin message on
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void message_pin(snowflake channel_id, snowflake message_id, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Unpin a message
-	 * @see https://discord.com/developers/docs/resources/channel#unpin-message
-	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
-	 * @param channel_id Channel id to unpin message on
-	 * @param message_id Message id to unpin message on
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void message_unpin(snowflake channel_id, snowflake message_id, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Get a guild
-	 * 
-	 * Returns the guild object for the given id. This endpoint will also return approximate_member_count and approximate_presence_count
-	 * for the guild.
-	 * @see https://discord.com/developers/docs/resources/guild#get-guild
-	 * @param g Guild ID to retrieve
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::guild object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void guild_get(snowflake g, command_completion_event_t callback);
-
-	/**
-	 * @brief Get a guild preview. Returns a guild object but only a subset of the fields will be populated.
-	 * 
-	 * Returns the guild preview object for the given id `g`. If the user is not in the guild, then the guild
-	 * must be lurkable (it must be Discoverable or have a live public stage).
-	 * @see https://discord.com/developers/docs/resources/guild#get-guild-preview
-	 * @param g Guild ID to retrieve
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::guild object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void guild_get_preview(snowflake g, command_completion_event_t callback);
-
-	/**
-	 * @brief Get a guild member
-	 * @see https://discord.com/developers/docs/resources/guild#get-guild-member
-	 * @param guild_id Guild ID to get member for
-	 * @param user_id User ID of member to get
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::guild_member object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void guild_get_member(snowflake guild_id, snowflake user_id, command_completion_event_t callback);
-
-	/**
-	 * @brief Search for guild members based on whether their username or nickname starts with the given string.
-	 *
-	 * @note This endpoint is restricted according to whether the `GUILD_MEMBERS` Privileged Intent is enabled for your application.
-	 * @see https://discord.com/developers/docs/resources/guild#search-guild-members
-	 * @param guild_id Guild ID to search in
-	 * @param query Query string to match username(s) and nickname(s) against
-	 * @param limit max number of members to return (1-1000)
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::guild_member_map object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void guild_search_members(snowflake guild_id, const std::string& query, uint16_t limit, command_completion_event_t callback);
-
-	/**
-	 * @brief Get all guild members
-	 * 
-	 * @note This endpoint is restricted according to whether the `GUILD_MEMBERS` Privileged Intent is enabled for your application.
-	 * @see https://discord.com/developers/docs/resources/guild#get-guild-members
-	 * @param guild_id Guild ID to get all members for
-	 * @param limit max number of members to return (1-1000)
-	 * @param after the highest user id in the previous page
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::guild_member_map object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void guild_get_members(snowflake guild_id, uint16_t limit, snowflake after, command_completion_event_t callback);
-
-	/**
-	 * @brief Add guild member. Needs a specific oauth2 scope, from which you get the access_token.
-	 * 
-	 * Adds a user to the guild, provided you have a valid oauth2 access token for the user with the guilds.join scope.
-	 * Returns the guild_member, which is defaulted if the user is already a member of the guild. Fires a `Guild Member Add` Gateway event.
-	 * 
-	 * For guilds with Membership Screening enabled, this endpoint will default to adding new members as pending in the guild member object.
-	 * Members that are pending will have to complete membership screening before they become full members that can talk.
-	 * 
-	 * @note All parameters to this endpoint except for access_token are optional.
-	 * The bot must be a member of the guild with `CREATE_INSTANT_INVITE` permission.
-	 * @see https://discord.com/developers/docs/resources/guild#add-guild-member
-	 * @param gm Guild member to add
-	 * @param access_token Access token from Oauth2 scope
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::guild_member object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void guild_add_member(const guild_member& gm, const std::string &access_token, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Edit the properties of an existing guild member
-	 * 
-	 * Modify attributes of a guild member. Returns the guild_member. Fires a `Guild Member Update` Gateway event.
-	 * To remove a timeout, set the `communication_disabled_until` to a non-zero time in the past, e.g. 1.
-	 * When moving members to channels, the API user must have permissions to both connect to the channel and have the `MOVE_MEMBERS` permission.
-	 * For moving and disconnecting users from voice, use dpp::cluster::guild_member_move.
-	 * @see https://discord.com/developers/docs/resources/guild#modify-guild-member
-	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
-	 * @param gm Guild member to edit
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::guild_member object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void guild_edit_member(const guild_member& gm, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Moves the guild member to a other voice channel, if member is connected to one.
-	 * Set the `channel_id` to `0` to disconnect the user.
-	 *
-	 * Fires a `Guild Member Update` Gateway event.
-	 * @note When moving members to channels, the API user __must__ have permissions to both connect to the channel and have the `MOVE_MEMBERS` permission.
-	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
-	 * @see https://discord.com/developers/docs/resources/guild#modify-guild-member
-	 * @param channel_id Id of the channel to which the user is used. Set to `0` to disconnect the user
-	 * @param guild_id Guild id to which the user is connected
-	 * @param user_id User id, who should be moved
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::guild_member object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void guild_member_move(const snowflake channel_id, const snowflake guild_id, const snowflake user_id, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Change current user nickname
-	 * 
-	 * Modifies the nickname of the current user in a guild.
-	 * Fires a `Guild Member Update` Gateway event.
-	 * 
-	 * @deprecated Deprecated in favor of Modify Current Member. Will be replaced by dpp::cluster::guild_current_member_edit
-	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
-	 * @see https://discord.com/developers/docs/resources/guild#modify-current-user-nick
-	 * @param guild_id Guild ID to change nickname on
-	 * @param nickname New nickname, or empty string to clear nickname
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void guild_set_nickname(snowflake guild_id, const std::string &nickname, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Add role to guild member
-	 * 
-	 * Adds a role to a guild member. Requires the `MANAGE_ROLES` permission.
-	 * Fires a `Guild Member Update` Gateway event.
-	 * @see https://discord.com/developers/docs/resources/guild#add-guild-member-role
-	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
-	 * @param guild_id Guild ID to add a role to
-	 * @param user_id User ID to add role to
-	 * @param role_id Role ID to add to the user
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void guild_member_add_role(snowflake guild_id, snowflake user_id, snowflake role_id, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Remove role from guild member
-	 * 
-	 * Removes a role from a guild member. Requires the `MANAGE_ROLES` permission.
-	 * Fires a `Guild Member Update` Gateway event.
-	 * @see https://discord.com/developers/docs/resources/guild#remove-guild-member-role
-	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
-	 * @param guild_id Guild ID to remove role from user on
-	 * @param user_id User ID to remove role from
-	 * @param role_id Role to remove
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 * @deprecated Use dpp::cluster::guild_member_remove_role instead
-	 */
-	void guild_member_delete_role(snowflake guild_id, snowflake user_id, snowflake role_id, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Remove role from guild member
-	 *
-	 * Removes a role from a guild member. Requires the `MANAGE_ROLES` permission.
-	 * Fires a `Guild Member Update` Gateway event.
-	 * @see https://discord.com/developers/docs/resources/guild#remove-guild-member-role
-	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
-	 * @param guild_id Guild ID to remove role from user on
-	 * @param user_id User ID to remove role from
-	 * @param role_id Role to remove
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void guild_member_remove_role(snowflake guild_id, snowflake user_id, snowflake role_id, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Remove (kick) a guild member
-	 * 
-	 * Remove a member from a guild. Requires `KICK_MEMBERS` permission.
-	 * Fires a `Guild Member Remove` Gateway event.
-	 * @see https://discord.com/developers/docs/resources/guild#remove-guild-member
-	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
-	 * @deprecated Replaced by dpp::cluster::guild_member_kick
-	 * @param guild_id Guild ID to kick member from
-	 * @param user_id User ID to kick
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void guild_member_delete(snowflake guild_id, snowflake user_id, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Remove (kick) a guild member
-	 *  
-	 * Remove a member from a guild. Requires `KICK_MEMBERS` permission.
-	 * Fires a `Guild Member Remove` Gateway event.
-	 * @see https://discord.com/developers/docs/resources/guild#remove-guild-member
-	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
-	 * @param guild_id Guild ID to kick member from
-	 * @param user_id User ID to kick
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void guild_member_kick(snowflake guild_id, snowflake user_id, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Set the timeout of a guild member
-	 *
-	 * Fires a `Guild Member Update` Gateway event.
-	 * @see https://discord.com/developers/docs/resources/guild#modify-guild-member
-	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
-	 * @param guild_id Guild ID to timeout the member in
-	 * @param user_id User ID to set the timeout for
-	 * @param communication_disabled_until The timestamp when the user's timeout will expire (up to 28 days in the future). Set to 0 to remove the timeout
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void guild_member_timeout(snowflake guild_id, snowflake user_id, time_t communication_disabled_until, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Add guild ban
-	 *
-	 * Create a guild ban, and optionally delete previous messages sent by the banned user.
-	 * Requires the `BAN_MEMBERS` permission. Fires a `Guild Ban Add` Gateway event.
-	 * @see https://discord.com/developers/docs/resources/guild#create-guild-ban
-	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
-	 * @param guild_id Guild ID to add ban to
-	 * @param user_id User ID to ban
-	 * @param delete_message_seconds How many seconds to delete messages for, between 0 and 604800 (7 days). Defaults to 0
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void guild_ban_add(snowflake guild_id, snowflake user_id, uint32_t delete_message_seconds = 0, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Delete guild ban
-	 * 
-	 * Remove the ban for a user. Requires the `BAN_MEMBERS` permissions.
-	 * Fires a Guild Ban Remove Gateway event.
-	 * @see https://discord.com/developers/docs/resources/guild#remove-guild-ban
-	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
-	 * @param guild_id Guild to delete ban from
-	 * @param user_id User ID to delete ban for
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void guild_ban_delete(snowflake guild_id, snowflake user_id, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Get guild ban list
-	 * 
-	 * Requires the `BAN_MEMBERS` permission.
-	 * @see https://discord.com/developers/docs/resources/guild#get-guild-bans
-	 * @note Provide a user ID to `before` and `after` for pagination. Users will always be returned in ascending order by the user ID. If both before and after are provided, only before is respected.
-	 * @param guild_id Guild ID to get bans for
-	 * @param before If non-zero, all bans for user ids before this user id will be returned up to the limit
-	 * @param after if non-zero, all bans for user ids after this user id will be returned up to the limit
-	 * @param limit the maximum number of bans to retrieve in this call up to a maximum of 1000
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::ban_map object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void guild_get_bans(snowflake guild_id, snowflake before, snowflake after, snowflake limit, command_completion_event_t callback);
-
-	/**
-	 * @brief Get single guild ban
-	 * 
-	 * Requires the `BAN_MEMBERS` permission.
-	 * @see https://discord.com/developers/docs/resources/guild#get-guild-ban
-	 * @param guild_id Guild ID to get ban for
-	 * @param user_id User ID of ban to retrieve
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::ban object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void guild_get_ban(snowflake guild_id, snowflake user_id, command_completion_event_t callback);
-
-	/**
-	 * @brief Get a template
-	 * @see https://discord.com/developers/docs/resources/guild-template#get-guild-template
-	 * @param code Template code
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::dtemplate object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void template_get(const std::string &code, command_completion_event_t callback);
-
-	/**
-	 * @brief Create a new guild based on a template.
-	 * @note This endpoint can be used only by bots in less than 10 guilds.
-	 * @see https://discord.com/developers/docs/resources/guild-template#create-guild-from-guild-template
-	 * @param code Template code to create guild from
-	 * @param name Guild name to create
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::guild object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void guild_create_from_template(const std::string &code, const std::string &name, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Get guild templates
-	 *
-	 * @see https://discord.com/developers/docs/resources/guild-template#get-guild-templates
-	 * @param guild_id Guild ID to get templates for
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::dtemplate_map object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void guild_templates_get(snowflake guild_id, command_completion_event_t callback);
-
-	/**
-	 * @brief Creates a template for the guild
-	 *
-	 * @see https://discord.com/developers/docs/resources/guild-template#create-guild-template
-	 * @param guild_id Guild to create template from
-	 * @param name Template name to create
-	 * @param description Description of template to create
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::dtemplate object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void guild_template_create(snowflake guild_id, const std::string &name, const std::string &description, command_completion_event_t callback);
-
-	/**
-	 * @brief Syncs the template to the guild's current state.
-	 *
-	 * @see https://discord.com/developers/docs/resources/guild-template#sync-guild-template
-	 * @param guild_id Guild to synchronise template for
-	 * @param code Code of template to synchronise
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::dtemplate object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void guild_template_sync(snowflake guild_id, const std::string &code, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Modifies the template's metadata.
-	 *
-	 * @see https://discord.com/developers/docs/resources/guild-template#modify-guild-template
-	 * @param guild_id Guild ID of template to modify
-	 * @param code Template code to modify
-	 * @param name New name of template
-	 * @param description New description of template
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::dtemplate object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void guild_template_modify(snowflake guild_id, const std::string &code, const std::string &name, const std::string &description, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Deletes the template
-	 *
-	 * @see https://discord.com/developers/docs/resources/guild-template#delete-guild-template
-	 * @param guild_id Guild ID of template to delete
-	 * @param code Template code to delete
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void guild_template_delete(snowflake guild_id, const std::string &code, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Create a guild
-	 * 
-	 * Create a new guild. Returns a guild object on success. `Fires a Guild Create Gateway` event.
-	 * 
-	 * When using the roles parameter, the first member of the array is used to change properties of the guild's everyone role.
-	 * If you are trying to bootstrap a guild with additional roles, keep this in mind. The required id field within each role object is an
-	 * integer placeholder, and will be replaced by the API upon consumption. Its purpose is to allow you to overwrite a role's permissions
-	 * in a channel when also passing in channels with the channels array.
-	 * When using the channels parameter, the position field is ignored, and none of the default channels are created. The id field within
-	 * each channel object may be set to an integer placeholder, and will be replaced by the API upon consumption. Its purpose is to
-	 * allow you to create `GUILD_CATEGORY` channels by setting the `parent_id` field on any children to the category's id field.
-	 * Category channels must be listed before any children.
-	 *
-	 * @see https://discord.com/developers/docs/resources/guild#create-guild
-	 * @note The region field is deprecated and is replaced by channel.rtc_region. This endpoint can be used only by bots in less than 10 guilds.
-	 * @param g Guild to create
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::guild object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void guild_create(const class guild &g, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Edit a guild
-	 * 
-	 * Modify a guild's settings. Requires the `MANAGE_GUILD` permission. Returns the updated guild object on success.
-	 * Fires a `Guild Update Gateway` event.
-	 * 
-	 * @see https://discord.com/developers/docs/resources/guild#modify-guild
-	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
-	 * @param g Guild to edit
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::guild object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void guild_edit(const class guild &g, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Delete a guild
-	 * 
-	 * Delete a guild permanently. User must be owner. Fires a `Guild Delete Gateway` event.
-	 *
-	 * @see https://discord.com/developers/docs/resources/guild#delete-guild
-	 * @param guild_id Guild ID to delete
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void guild_delete(snowflake guild_id, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Get all emojis for a guild
-	 *
-	 * @see https://discord.com/developers/docs/resources/emoji#get-guild-emojis
-	 * @param guild_id Guild ID to get emojis for
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::emoji_map object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void guild_emojis_get(snowflake guild_id, command_completion_event_t callback);
-
-	/**
-	 * @brief Get a single emoji
-	 *
-	 * @see https://discord.com/developers/docs/resources/emoji#get-guild-emoji
-	 * @param guild_id Guild ID to get emoji for
-	 * @param emoji_id Emoji ID to get
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::emoji object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void guild_emoji_get(snowflake guild_id, snowflake emoji_id, command_completion_event_t callback);
-
-	/**
-	 * @brief Create single emoji.
-	 * You must ensure that the emoji passed contained image data using the emoji::load_image() method.
-	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
-	 *
-	 * @see https://discord.com/developers/docs/resources/emoji#create-guild-emoji
-	 * @param guild_id Guild ID to create emoji om
-	 * @param newemoji Emoji to create
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::emoji object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void guild_emoji_create(snowflake guild_id, const class emoji& newemoji, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Edit a single emoji.
-	 * 
-	 * You must ensure that the emoji passed contained image data using the emoji::load_image() method.
-	 * @see https://discord.com/developers/docs/resources/emoji#get-guild-emoji
-	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
-	 * @param guild_id Guild ID to edit emoji on
-	 * @param newemoji Emoji to edit
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::emoji object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void guild_emoji_edit(snowflake guild_id, const class emoji& newemoji, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Delete a guild emoji
-	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
-	 *
-	 * @see https://discord.com/developers/docs/resources/emoji#delete-guild-emoji
-	 * @param guild_id Guild ID to delete emoji on
-	 * @param emoji_id Emoji ID to delete
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void guild_emoji_delete(snowflake guild_id, snowflake emoji_id, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Get prune counts
-	 * 
-	 * Returns a prune object indicating the number of members that would be removed in a prune operation. Requires the `KICK_MEMBERS`
-	 * permission. By default, prune will not remove users with roles. You can optionally include specific roles in your prune by providing the
-	 * include_roles parameter. Any inactive user that has a subset of the provided role(s) will be counted in the prune and users with additional
-	 * roles will not.
-	 *
-	 * @see https://discord.com/developers/docs/resources/guild#get-guild-prune-count
-	 * @param guild_id Guild ID to count for pruning
-	 * @param pruneinfo Pruning info
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::prune object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void guild_get_prune_counts(snowflake guild_id, const struct prune& pruneinfo, command_completion_event_t callback);
-
-	/**
-	 * @brief Begin guild prune
-	 * 
-	 * Begin a prune operation. Requires the `KICK_MEMBERS` permission. Returns a prune object indicating the number of members
-	 * that were removed in the prune operation. For large guilds it's recommended to set the `compute_prune_count` option to false, forcing
-	 * 'pruned' to 0. Fires multiple `Guild Member Remove` Gateway events.
-	 * By default, prune will not remove users with roles. You can optionally include specific roles in your prune by providing the `include_roles`
-	 * parameter. Any inactive user that has a subset of the provided role(s) will be included in the prune and users with additional roles will not.
-	 * 
-	 * @see https://discord.com/developers/docs/resources/guild#begin-guild-prune
-	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
-	 * @param guild_id Guild ID to prune
-	 * @param pruneinfo Pruning info
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::prune object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void guild_begin_prune(snowflake guild_id, const struct prune& pruneinfo, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Get guild voice regions.
-	 * 
-	 * Voice regions per guild are somewhat deprecated in preference of per-channel voice regions.
-	 * Returns a list of voice region objects for the guild. Unlike the similar /voice route, this returns VIP servers when
-	 * the guild is VIP-enabled.
-	 *
-	 * @see https://discord.com/developers/docs/resources/guild#get-guild-voice-regions
-	 * @param guild_id Guild ID to get voice regions for
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::voiceregion_map object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void guild_get_voice_regions(snowflake guild_id, command_completion_event_t callback);
-
-	/**
-	 * @brief Get guild invites
-	 * 
-	 * Returns a list of invite objects (with invite metadata) for the guild. Requires the `MANAGE_GUILD` permission.
-	 *
-	 * @see https://discord.com/developers/docs/resources/guild#get-guild-invites
-	 * @param guild_id Guild ID to get invites for
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::invite_map object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void guild_get_invites(snowflake guild_id, command_completion_event_t callback);
-
-	/**
-	 * @brief Get guild integrations
-	 * 
-	 * Requires the `MANAGE_GUILD` permission.
-	 *
-	 * @see https://discord.com/developers/docs/resources/guild#get-guild-integrations
-	 * @param guild_id Guild ID to get integrations for
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::integration_map object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void guild_get_integrations(snowflake guild_id, command_completion_event_t callback);
-
-	/**
-	 * @brief Modify guild integration
-	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
-	 *
-	 * @see https://discord.com/developers/docs/resources/guild#modify-guild-integration
-	 * @param guild_id Guild ID to modify integration for
-	 * @param i Integration to modify
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::integration object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void guild_modify_integration(snowflake guild_id, const class integration &i, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Delete guild integration
-	 * 
-	 * Delete the attached integration object for the guild. Deletes any associated webhooks and kicks the associated bot if there is one.
-	 * Requires the `MANAGE_GUILD` permission. Fires a Guild Integrations Update Gateway event.
-	 * 
-	 * @see https://discord.com/developers/docs/resources/guild#delete-guild-integration
-	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
-	 * @param guild_id Guild ID to delete integration for
-	 * @param integration_id Integration ID to delete
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void guild_delete_integration(snowflake guild_id, snowflake integration_id, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Sync guild integration
-	 *
-	 * @see https://discord.com/developers/docs/resources/guild#sync-guild-integration
-	 * @param guild_id Guild ID to sync integration on
-	 * @param integration_id Integration ID to synchronise
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void guild_sync_integration(snowflake guild_id, snowflake integration_id, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Get guild widget
-	 * 
-	 * Requires the `MANAGE_GUILD` permission.
-	 *
-	 * @see https://discord.com/developers/docs/resources/guild#get-guild-widget
-	 * @param guild_id Guild ID to get widget for
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::guild_widget object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void guild_get_widget(snowflake guild_id, command_completion_event_t callback);
-
-	/**
-	 * @brief Edit guild widget
-	 * 
-	 * Requires the `MANAGE_GUILD` permission.
-	 *
-	 * @see https://discord.com/developers/docs/resources/guild#modify-guild-widget
-	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
-	 * @param guild_id Guild ID to edit widget for
-	 * @param gw New guild widget information
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::guild_widget object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void guild_edit_widget(snowflake guild_id, const class guild_widget &gw, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Get guild vanity url, if enabled
-	 * 
-	 * Returns a partial dpp::invite object for guilds with that feature enabled. Requires the `MANAGE_GUILD` permission. code will be null if a vanity url for the guild is not set.
-	 * @see https://discord.com/developers/docs/resources/guild#get-guild-vanity-url
-	 * @param guild_id Guild to get vanity URL for
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::invite object in confirmation_callback_t::value filled to match the vanity url. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void guild_get_vanity(snowflake guild_id, command_completion_event_t callback);
-
-	/**
-	 * @brief Create a webhook
-	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
-	 * @see https://discord.com/developers/docs/resources/webhook#create-webhook
-	 * @param w Webhook to create
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::webhook object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void create_webhook(const class webhook &w, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Get guild webhooks
-	 * @see https://discord.com/developers/docs/resources/webhook#get-guild-webhooks
-	 * @param guild_id Guild ID to get webhooks for
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::webhook_map object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void get_guild_webhooks(snowflake guild_id, command_completion_event_t callback);
-
-	/**
-	 * @brief Get channel webhooks
-	 * @see https://discord.com/developers/docs/resources/webhook#get-guild-webhooks
-	 * @param channel_id Channel ID to get webhooks for
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::webhook_map object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void get_channel_webhooks(snowflake channel_id, command_completion_event_t callback);
-
-	/**
-	 * @brief Get webhook
-	 * @see https://discord.com/developers/docs/resources/webhook#get-webhook
-	 * @param webhook_id Webhook ID to get
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::webhook object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void get_webhook(snowflake webhook_id, command_completion_event_t callback);
-
-	/**
-	 * @brief Get webhook using token
-	 * @see https://discord.com/developers/docs/resources/webhook#get-webhook-with-token
-	 * @param webhook_id Webhook ID to retrieve
-	 * @param token Token of webhook
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::webhook object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void get_webhook_with_token(snowflake webhook_id, const std::string &token, command_completion_event_t callback);
-
-	/**
-	 * @brief Edit webhook
-	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
-	 * @see https://discord.com/developers/docs/resources/webhook#modify-webhook
-	 * @param wh Webhook to edit
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::webhook object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void edit_webhook(const class webhook& wh, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Edit webhook with token (token is encapsulated in the webhook object)
-	 * @see https://discord.com/developers/docs/resources/webhook#modify-webhook-with-token
-	 * @param wh Webhook to edit (should include token)
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::webhook object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void edit_webhook_with_token(const class webhook& wh, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Delete a webhook
-	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
-	 * @see https://discord.com/developers/docs/resources/webhook#delete-webhook
-	 * @param webhook_id Webhook ID to delete
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void delete_webhook(snowflake webhook_id, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Delete webhook with token
-	 * @see https://discord.com/developers/docs/resources/webhook#delete-webhook-with-token
-	 * @param webhook_id Webhook ID to delete
-	 * @param token Token of webhook to delete
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void delete_webhook_with_token(snowflake webhook_id, const std::string &token, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Execute webhook
-	 *
-	 * @see https://discord.com/developers/docs/resources/webhook#execute-webhook
-	 * @param wh Webhook to execute
-	 * @param m Message to send
-	 * @param wait waits for server confirmation of message send before response, and returns the created message body
-	 * @param thread_id Send a message to the specified thread within a webhook's channel. The thread will automatically be unarchived
-	 * @param thread_name Name of thread to create (requires the webhook channel to be a forum channel)
-	 * @param callback Function to call when the API call completes.
-	 * @note If the webhook channel is a forum channel, you must provide either `thread_id` or `thread_name`. If `thread_id` is provided, the message will send in that thread. If `thread_name` is provided, a thread with that name will be created in the forum channel.
-	 * On success the callback will contain a dpp::message object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void execute_webhook(const class webhook &wh, const struct message &m, bool wait = false, snowflake thread_id = 0, const std::string& thread_name = "", command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Get webhook message
-	 *
-	 * @see https://discord.com/developers/docs/resources/webhook#get-webhook-message
-	 * @param wh Webhook to get the original message for
-	 * @param message_id The message ID
-	 * @param thread_id ID of the thread the message is in
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::message object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void get_webhook_message(const class webhook &wh, snowflake message_id, snowflake thread_id = 0, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Edit webhook message
-	 *
-	 * When the content field is edited, the mentions array in the message object will be reconstructed from scratch based on
-	 * the new content. The allowed_mentions field of the edit request controls how this happens. If there is no explicit
-	 * allowed_mentions in the edit request, the content will be parsed with default allowances, that is, without regard to
-	 * whether or not an allowed_mentions was present in the request that originally created the message.
-	 * 
-	 * @see https://discord.com/developers/docs/resources/webhook#edit-webhook-message
-	 * @note the attachments array must contain all attachments that should be present after edit, including retained and new attachments provided in the request body.
-	 * @param wh Webhook to edit message for
-	 * @param m New message
-	 * @param thread_id ID of the thread the message is in
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::message object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void edit_webhook_message(const class webhook &wh, const struct message &m, snowflake thread_id = 0, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Delete webhook message
-	 *
-	 * @see https://discord.com/developers/docs/resources/webhook#delete-webhook-message
-	 * @param wh Webhook to delete message for
-	 * @param message_id Message ID to delete
-	 * @param thread_id ID of the thread the message is in
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void delete_webhook_message(const class webhook &wh, snowflake message_id, snowflake thread_id = 0, command_completion_event_t callback = utility::log_error());
-
-
-	/**
-	 * @brief Get a role for a guild
-	 *
-	 * @see https://discord.com/developers/docs/resources/guild#get-guild-roles
-	 * @param guild_id Guild ID to get role for
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::role_map object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void roles_get(snowflake guild_id, command_completion_event_t callback);
-
-	/**
-	 * @brief Create a role on a guild
-	 * 
-	 * Create a new role for the guild. Requires the `MANAGE_ROLES` permission. Returns the new role object on success.
-	 * Fires a `Guild Role Create` Gateway event.
-	 * 
-	 * @see https://discord.com/developers/docs/resources/guild#create-guild-role
-	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
-	 * @param r Role to create (guild ID is encapsulated in the role object)
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::role object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void role_create(const class role &r, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Edit a role on a guild
-	 * 
-	 * Requires the `MANAGE_ROLES` permission. Returns the updated role on success. Fires a `Guild Role Update` Gateway event.
-	 * 
-	 * @see https://discord.com/developers/docs/resources/guild#modify-guild-role
-	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
-	 * @param r Role to edit
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::role object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void role_edit(const class role &r, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Edit multiple role's position in a guild. Returns a list of all roles of the guild on success.
-	 *
-	 * Modify the positions of a set of role objects for the guild. Requires the `MANAGE_ROLES` permission.
-	 * Fires multiple `Guild Role Update` Gateway events.
-	 *
-	 * @see https://discord.com/developers/docs/resources/guild#modify-guild-role-positions
-	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
-	 * @param guild_id Guild ID to change the roles position on
-	 * @param roles Vector of roles to change the positions of
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::role_map object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void roles_edit_position(snowflake guild_id, const std::vector<role> &roles, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Delete a role
-	 * 
-	 * Requires the `MANAGE_ROLES` permission. Fires a `Guild Role Delete` Gateway event.
-	 * 
-	 * @see https://discord.com/developers/docs/resources/guild#delete-guild-role
-	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
-	 * @param guild_id Guild ID to delete the role on
-	 * @param role_id Role ID to delete
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void role_delete(snowflake guild_id, snowflake role_id, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Get the application's role connection metadata records
-	 *
-	 * @see https://discord.com/developers/docs/resources/application-role-connection-metadata#get-application-role-connection-metadata-records
-	 * @param application_id The application ID
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::application_role_connection_metadata_list object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void application_role_connection_get(snowflake application_id, command_completion_event_t callback);
-
-	/**
-	 * @brief Update the application's role connection metadata records
-	 *
-	 * @see https://discord.com/developers/docs/resources/application-role-connection-metadata#update-application-role-connection-metadata-records
-	 * @param application_id The application ID
-	 * @param connection_metadata The application role connection metadata to update
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::application_role_connection_metadata_list object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 * @note An application can have a maximum of 5 metadata records.
-	 */
-	void application_role_connection_update(snowflake application_id, const std::vector<application_role_connection_metadata> &connection_metadata, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Get user application role connection
-	 *
-	 * @see https://discord.com/developers/docs/resources/user#get-user-application-role-connection
-	 * @param application_id The application ID
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::application_role_connection object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void user_application_role_connection_get(snowflake application_id, command_completion_event_t callback);
-
-	/**
-	 * @brief Update user application role connection
-	 *
-	 * @see https://discord.com/developers/docs/resources/user#update-user-application-role-connection
-	 * @param application_id The application ID
-	 * @param connection The application role connection to update
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::application_role_connection object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void user_application_role_connection_update(snowflake application_id, const application_role_connection &connection, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Get a user by id
-	 *
-	 * @see https://discord.com/developers/docs/resources/user#get-user
-	 * @param user_id User ID to retrieve
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::user_identified object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 * @note The user_identified object is a subclass of dpp::user which contains further details if you have the oauth2 identify or email scopes.
-	 * If you do not have these scopes, these fields are empty. You can safely convert a user_identified to user with `dynamic_cast`.
-	 * @note unless you want something special from `dpp::user_identified` or you've turned off caching, you have no need to call this.
-	 * Call `dpp::find_user` instead that looks up the user in the cache rather than a REST call.
-	 */
-	void user_get(snowflake user_id, command_completion_event_t callback);
-
-	/**
-	 * @brief Get current (bot) user
-	 *
-	 * @see https://discord.com/developers/docs/resources/user#get-current-user
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::user_identified object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 * @note The user_identified object is a subclass of dpp::user which contains further details if you have the oauth2 identify or email scopes.
-	 * If you do not have these scopes, these fields are empty. You can safely convert a user_identified to user with `dynamic_cast`.
-	 */
-	void current_user_get(command_completion_event_t callback);
-
-	/**
-	 * @brief Get current (bot) application
-	 *
-	 * @see https://discord.com/developers/docs/topics/oauth2#get-current-bot-application-information
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::application object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void current_application_get(command_completion_event_t callback);
-
-	/**
-	 * @brief Modify current member
-	 *
-	 * Modifies the current member in a guild.
-	 * Fires a `Guild Member Update` Gateway event.
-	 *
-	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
-	 * @see https://discord.com/developers/docs/resources/guild#modify-current-member
-	 * @param guild_id Guild ID to change on
-	 * @param nickname New nickname, or empty string to clear nickname
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void guild_current_member_edit(snowflake guild_id, const std::string &nickname, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Get current user's connections (linked accounts, e.g. steam, xbox).
-	 * This call requires the oauth2 `connections` scope and cannot be executed
-	 * against a bot token.
-	 * @see https://discord.com/developers/docs/resources/user#get-user-connections
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::connection_map object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void current_user_connections_get(command_completion_event_t callback);
-
-	/**
-	 * @brief Get current (bot) user guilds
-	 * @see https://discord.com/developers/docs/resources/user#get-current-user-guilds
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::guild_map object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void current_user_get_guilds(command_completion_event_t callback);
-
-	/**
-	 * @brief Edit current (bot) user
-	 *
-	 * Modifies the current member in a guild. Returns the updated guild_member object on success.
-	 * Fires a `Guild Member Update` Gateway event.
-	 * @see https://discord.com/developers/docs/resources/user#modify-current-user
-	 * @param nickname Nickname to set
-	 * @param image_blob Avatar data to upload (NOTE: Very heavily rate limited!)
-	 * @param type Type of image for avatar
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::user object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
- 	 * @throw dpp::exception Image data is larger than the maximum size of 256 kilobytes
-	 */
-	void current_user_edit(const std::string &nickname, const std::string& image_blob = "", const image_type type = i_png, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Get current user DM channels
-	 * 
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::channel_map object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void current_user_get_dms(command_completion_event_t callback);
-
-	/**
-	 * @brief Create a dm channel
-	 * @see https://discord.com/developers/docs/resources/user#create-dm
-	 * @param user_id User ID to create DM channel with
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::channel object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void create_dm_channel(snowflake user_id, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Leave a guild
-	 * @see https://discord.com/developers/docs/resources/user#leave-guild
-	 * @param guild_id Guild ID to leave
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void current_user_leave_guild(snowflake guild_id, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Create a thread in forum channel
-	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
-	 *
-	 * @see https://discord.com/developers/docs/resources/channel#start-thread-in-forum-channel
-	 * @param thread_name Name of the forum thread
-	 * @param channel_id Forum channel in which thread to create
-	 * @param msg The message to start the thread with
-	 * @param auto_archive_duration Duration to automatically archive the thread after recent activity
-	 * @param rate_limit_per_user amount of seconds a user has to wait before sending another message (0-21600); bots, as well as users with the permission manage_messages, manage_thread, or manage_channel, are unaffected
-	 * @param applied_tags List of IDs of forum tags (dpp::forum_tag) to apply to this thread
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::thread object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void thread_create_in_forum(const std::string& thread_name, snowflake channel_id, const message& msg, auto_archive_duration_t auto_archive_duration, uint16_t rate_limit_per_user, std::vector<snowflake> applied_tags = {}, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Create a thread
-	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
-	 *
-	 * @see https://discord.com/developers/docs/resources/guild#create-guild-channel
-	 * @param thread_name Name of the thread
-	 * @param channel_id Channel in which thread to create
-	 * @param auto_archive_duration Duration after which thread auto-archives. Can be set to - 60, 1440 (for boosted guilds can also be: 4320, 10080)
-	 * @param thread_type Type of thread - CHANNEL_PUBLIC_THREAD, CHANNEL_ANNOUNCEMENT_THREAD, CHANNEL_PRIVATE_THREAD
-	 * @param invitable whether non-moderators can add other non-moderators to a thread; only available when creating a private thread
-	 * @param rate_limit_per_user amount of seconds a user has to wait before sending another message (0-21600); bots, as well as users with the permission manage_messages, manage_thread, or manage_channel, are unaffected
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::thread object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void thread_create(const std::string& thread_name, snowflake channel_id, uint16_t auto_archive_duration, channel_type thread_type, bool invitable, uint16_t rate_limit_per_user, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Create a thread with a message (Discord: ID of a thread is same as message ID)
-	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
-	 * @see https://discord.com/developers/docs/topics/threads
-	 * @param thread_name Name of the thread
-	 * @param channel_id Channel in which thread to create
-	 * @param message_id message to start thread with
-	 * @param auto_archive_duration Duration after which thread auto-archives. Can be set to - 60, 1440 (for boosted guilds can also be: 4320, 10080)
-	 * @param rate_limit_per_user amount of seconds a user has to wait before sending another message (0-21600); bots, as well as users with the permission manage_messages, manage_thread, or manage_channel, are unaffected
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::thread object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void thread_create_with_message(const std::string& thread_name, snowflake channel_id, snowflake message_id, uint16_t auto_archive_duration, uint16_t rate_limit_per_user, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Join a thread
-	 * @see https://discord.com/developers/docs/topics/threads
-	 * @param thread_id Thread ID to join
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void current_user_join_thread(snowflake thread_id, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Leave a thread
-	 * @see https://discord.com/developers/docs/topics/threads
-	 * @param thread_id Thread ID to leave
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void current_user_leave_thread(snowflake thread_id, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Add a member to a thread
-	 * @see https://discord.com/developers/docs/topics/threads
-	 * @param thread_id Thread ID to add to
-	 * @param user_id Member ID to add
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void thread_member_add(snowflake thread_id, snowflake user_id, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Remove a member from a thread
-	 * @see https://discord.com/developers/docs/topics/threads
-	 * @param thread_id Thread ID to remove from
-	 * @param user_id Member ID to remove
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void thread_member_remove(snowflake thread_id, snowflake user_id, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Get a thread member
-	 * @see https://discord.com/developers/docs/topics/threads
-	 * @param thread_id Thread to get member for
-	 * @param user_id ID of the user to get
-	 * @param callback Function to call when the API call completes
-	 * On success the callback will contain a dpp::thread_member object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void thread_member_get(const snowflake thread_id, const snowflake user_id, command_completion_event_t callback);
-
-	/**
-	 * @brief Get members of a thread
-	 * @see https://discord.com/developers/docs/topics/threads
-	 * @param thread_id Thread to get members for
-	 * @param callback Function to call when the API call completes
-	 * On success the callback will contain a dpp::thread_member_map object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void thread_members_get(snowflake thread_id, command_completion_event_t callback);
-
-	/**
-	 * @brief Get active threads in a guild (Sorted by ID in descending order)
-	 * @see https://discord.com/developers/docs/topics/threads
-	 * @param guild_id Guild to get active threads for
-	 * @param callback Function to call when the API call completes
-	 * On success the callback will contain a dpp::thread_map object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void threads_get_active(snowflake guild_id, command_completion_event_t callback);
-
-	/**
-	 * @brief Get public archived threads in a channel (Sorted by archive_timestamp in descending order)
-	 * @see https://discord.com/developers/docs/topics/threads
-	 * @param channel_id Channel to get public archived threads for
-	 * @param before_timestamp Get threads before this timestamp
-	 * @param limit Number of threads to get
-	 * @param callback Function to call when the API call completes
-	 * On success the callback will contain a dpp::thread_map object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void threads_get_public_archived(snowflake channel_id, time_t before_timestamp, uint16_t limit, command_completion_event_t callback);
-
-	/**
-	 * @brief Get private archived threads in a channel (Sorted by archive_timestamp in descending order)
-	 * @see https://discord.com/developers/docs/topics/threads
-	 * @param channel_id Channel to get public archived threads for
-	 * @param before_timestamp Get threads before this timestamp
-	 * @param limit Number of threads to get
-	 * @param callback Function to call when the API call completes
-	 * On success the callback will contain a dpp::thread_map object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void threads_get_private_archived(snowflake channel_id,  time_t before_timestamp, uint16_t limit, command_completion_event_t callback);
-
-	/**
-	 * @brief Get private archived threads in a channel which current user has joined (Sorted by ID in descending order)
-
-	 * @see https://discord.com/developers/docs/topics/threads
-	 * @param channel_id Channel to get public archived threads for
-	 * @param before_id Get threads before this id
-	 * @param limit Number of threads to get
-	 * @param callback Function to call when the API call completes
-	 * On success the callback will contain a dpp::thread_map object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void threads_get_joined_private_archived(snowflake channel_id, snowflake before_id, uint16_t limit, command_completion_event_t callback);
-
-	/**
-	 * @brief Create a sticker in a guild
-	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
-	 * @see https://discord.com/developers/docs/resources/sticker#create-guild-sticker
-	 * @param s Sticker to create. Must have its guild ID set.
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::sticker object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void guild_sticker_create(sticker &s, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Modify a sticker in a guild
-	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
-	 * @see https://discord.com/developers/docs/resources/sticker#modify-guild-sticker
-	 * @param s Sticker to modify. Must have its guild ID and sticker ID set.
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::sticker object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void guild_sticker_modify(sticker &s, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Delete a sticker from a guild
-	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
-	 * @see https://discord.com/developers/docs/resources/sticker#delete-guild-sticker
-	 * @param sticker_id sticker ID to delete
-	 * @param guild_id guild ID to delete from
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::sticker object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void guild_sticker_delete(snowflake sticker_id, snowflake guild_id, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Get a nitro sticker
-	 * @see https://discord.com/developers/docs/resources/sticker#get-sticker
-	 * @param id Id of sticker to get.
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::sticker object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void nitro_sticker_get(snowflake id, command_completion_event_t callback);
-
-	/**
-	 * @brief Get a guild sticker
-	 * @see https://discord.com/developers/docs/resources/sticker#get-guild-sticker
-	 * @param id Id of sticker to get.
-	 * @param guild_id Guild ID of the guild where the sticker is
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::sticker object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void guild_sticker_get(snowflake id, snowflake guild_id, command_completion_event_t callback);
-
-	/**
-	 * @brief Get all guild stickers
-	 * @see https://discord.com/developers/docs/resources/sticker#get-guild-stickers
-	 * @param guild_id Guild ID of the guild where the sticker is
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::sticker_map object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void guild_stickers_get(snowflake guild_id, command_completion_event_t callback);
-
-	/**
-	 * @brief Get sticker packs
-	 * @see https://discord.com/developers/docs/resources/sticker#list-nitro-sticker-packs
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::sticker_pack_map object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void sticker_packs_get(command_completion_event_t callback);
-
-	/**
-	 * @brief Create a stage instance on a stage channel.
-	 * @see https://discord.com/developers/docs/resources/stage-instance#create-stage-instance
-	 * @param instance Stage instance to create
-	 * @param callback User function to execute when the api call completes
-	 * On success the callback will contain a dpp::stage_instance object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
-	 */
-	void stage_instance_create(const stage_instance& instance, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Get the stage instance associated with the channel id, if it exists.
-	 * @see https://discord.com/developers/docs/resources/stage-instance#get-stage-instance
-	 * @param channel_id ID of the associated channel
-	 * @param callback User function to execute when the api call completes
-	 * On success the callback will contain a dpp::stage_instance object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void stage_instance_get(const snowflake channel_id, command_completion_event_t callback);
-
-	/**
-	 * @brief Edit a stage instance.
-	 * @see https://discord.com/developers/docs/resources/stage-instance#modify-stage-instance
-	 * @param instance Stage instance to edit
-	 * @param callback User function to execute when the api call completes
-	 * On success the callback will contain a dpp::stage_instance object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
-	 */
-	void stage_instance_edit(const stage_instance& instance, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Delete a stage instance.
-	 * @see https://discord.com/developers/docs/resources/stage-instance#delete-stage-instance
-	 * @param channel_id ID of the associated channel
-	 * @param callback User function to execute when the api call completes
-	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
-	 */
-	void stage_instance_delete(const snowflake channel_id, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Get all voice regions
-	 * @see https://discord.com/developers/docs/resources/voice#list-voice-regions
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::voiceregion_map object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void get_voice_regions(command_completion_event_t callback);
-
-	/**
-	 * @brief Get the gateway information for the bot using the token
-	 * @see https://discord.com/developers/docs/topics/gateway#get-gateway-bot
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::gateway object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void get_gateway_bot(command_completion_event_t callback);
-
-	/**
-	 * @brief Get all scheduled events for a guild
-	 * @see https://discord.com/developers/docs/resources/guild-scheduled-event#list-scheduled-events-for-guild
-	 * @param guild_id Guild to get events for
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::scheduled_event_map object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void guild_events_get(snowflake guild_id, command_completion_event_t callback);
-
-	/**
-	 * @brief Get users RSVP'd to an event
-	 *
-	 * @see https://discord.com/developers/docs/resources/guild-scheduled-event#get-guild-scheduled-event-users
-	 * @param guild_id Guild to get user list for
-	 * @param event_id Guild to get user list for
-	 * @param limit Maximum number of results to return
-	 * @param before Return user IDs that fall before this ID, if provided
-	 * @param after Return user IDs that fall after this ID, if provided
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::event_member_map object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void guild_event_users_get(snowflake guild_id, snowflake event_id, command_completion_event_t callback, uint8_t limit = 100, snowflake before = 0, snowflake after = 0);
-
-	/**
-	 * @brief Create a scheduled event on a guild
-	 *
-	 * @see https://discord.com/developers/docs/resources/guild-scheduled-event#create-guild-scheduled-event
-	 * @param event Event to create (guild ID must be populated)
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::scheduled_event_map object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void guild_event_create(const scheduled_event& event, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Delete a scheduled event from a guild
-	 *
-	 * @see https://discord.com/developers/docs/resources/guild-scheduled-event#delete-guild-scheduled-event
-	 * @param event_id Event ID to delete
-	 * @param guild_id Guild ID of event to delete
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void guild_event_delete(snowflake event_id, snowflake guild_id, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Edit/modify a scheduled event on a guild
-	 *
-	 * @see https://discord.com/developers/docs/resources/guild-scheduled-event#modify-guild-scheduled-event
-	 * @param event Event to create (event ID and guild ID must be populated)
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::scheduled_event_map object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void guild_event_edit(const scheduled_event& event, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Get a scheduled event for a guild
-	 *
-	 * @see https://discord.com/developers/docs/resources/guild-scheduled-event#get-guild-scheduled-event
-	 * @param guild_id Guild to get event for
-	 * @param event_id Event ID to get
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::scheduled_event object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void guild_event_get(snowflake guild_id, snowflake event_id, command_completion_event_t callback);
-
-	/**
-	 * @brief Set the bot's voice state on a stage channel
-	 * 
-	 * **Caveats**
-	 * 
-	 * There are currently several caveats for this endpoint:
-	 * 
-	 * - `channel_id` must currently point to a stage channel.
-	 * - current user must already have joined `channel_id`.
-	 * - You must have the `MUTE_MEMBERS` permission to unsuppress yourself. You can always suppress yourself.
-	 * - You must have the `REQUEST_TO_SPEAK` permission to request to speak. You can always clear your own request to speak.
-	 * - You are able to set `request_to_speak_timestamp` to any present or future time.
-	 *
-	 * @see https://discord.com/developers/docs/resources/guild#modify-current-user-voice-state 
-	 * @param guild_id Guild to set voice state on
-	 * @param channel_id Stage channel to set voice state on
-	 * @param callback Function to call when the API call completes.
-	 * @param suppress True if the user's audio should be suppressed, false if it should not
-	 * @param request_to_speak_timestamp The time at which we requested to speak, or 0 to clear the request. The time set here must be the current time or in the future.
-	 * On success the callback will contain a dpp::scheduled_event object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 * @throw std::logic_exception You attempted to set a request_to_speak_timestamp in the past which is not the value of 0.
-	 */
-	void current_user_set_voice_state(snowflake guild_id, snowflake channel_id, bool suppress = false, time_t request_to_speak_timestamp = 0, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Set a user's voice state on a stage channel
-	 *
-	 * **Caveats**
-	 * 
-	 * There are currently several caveats for this endpoint:
-	 * 
-	 * - `channel_id` must currently point to a stage channel.
-	 * - User must already have joined `channel_id`.
-	 * - You must have the `MUTE_MEMBERS` permission. (Since suppression is the only thing that is available currently)
-	 * - When unsuppressed, non-bot users will have their `request_to_speak_timestamp` set to the current time. Bot users will not.
-	 * - When suppressed, the user will have their `request_to_speak_timestamp` removed.
-	 * 
-	 * @see https://discord.com/developers/docs/resources/guild#modify-user-voice-state
-	 * @param user_id The user to set the voice state of
-	 * @param guild_id Guild to set voice state on
-	 * @param channel_id Stage channel to set voice state on
-	 * @param callback Function to call when the API call completes.
-	 * @param suppress True if the user's audio should be suppressed, false if it should not
-	 * On success the callback will contain a dpp::scheduled_event object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void user_set_voice_state(snowflake user_id, snowflake guild_id, snowflake channel_id, bool suppress = false, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Get all auto moderation rules for a guild
-	 * 
-	 * @param guild_id Guild id of the auto moderation rule
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::automod_rule_map object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void automod_rules_get(snowflake guild_id, command_completion_event_t callback);
-
-	/**
-	 * @brief Get a single auto moderation rule
-	 * 
-	 * @param guild_id Guild id of the auto moderation rule
-	 * @param rule_id  Rule id to retrieve
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::automod_rule object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void automod_rule_get(snowflake guild_id, snowflake rule_id, command_completion_event_t callback);
-
-	/**
-	 * @brief Create an auto moderation rule
-	 * 
-	 * @param guild_id Guild id of the auto moderation rule
-	 * @param r Auto moderation rule to create
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::automod_rule object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void automod_rule_create(snowflake guild_id, const automod_rule& r, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Edit an auto moderation rule
-	 * 
-	 * @param guild_id Guild id of the auto moderation rule
-	 * @param r Auto moderation rule to edit. The rule's id must be set.
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::automod_rule object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void automod_rule_edit(snowflake guild_id, const automod_rule& r, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Delete an auto moderation rule
-	 * 
-	 * @param guild_id Guild id of the auto moderation rule
-	 * @param rule_id Auto moderation rule id to delete
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void automod_rule_delete(snowflake guild_id, snowflake rule_id, command_completion_event_t callback = utility::log_error());
-
-#include <dpp/cluster_sync_calls.h>
-#ifdef DPP_CORO
-#include <dpp/cluster_coro_calls.h>
-#endif
-
-};
-
-};
+/************************************************************************************
+ *
+ * D++, A Lightweight C++ library for Discord
+ *
+ * Copyright 2021 Craig Edwards and D++ contributors
+ * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ************************************************************************************/
+
+#pragma once
+
+#include <dpp/export.h>
+#include <string>
+#include <map>
+#include <variant>
+#include <thread>
+#include <dpp/snowflake.h>
+#include <dpp/dispatcher.h>
+#include <dpp/misc-enum.h>
+#include <dpp/timer.h>
+#include <dpp/json_fwd.h>
+#include <dpp/discordclient.h>
+#include <dpp/discordvoiceclient.h>
+#include <dpp/voiceregion.h>
+#include <dpp/dtemplate.h>
+#include <dpp/prune.h>
+#include <dpp/auditlog.h>
+#include <dpp/queues.h>
+#include <dpp/cache.h>
+#include <dpp/intents.h>
+#include <dpp/discordevents.h>
+#include <algorithm>
+#include <iostream>
+#include <shared_mutex>
+#include <cstring>
+#include <dpp/restresults.h>
+#include <dpp/event_router.h>
+#include <dpp/coro/async.h>
+#include <dpp/socketengine.h>
+
+namespace dpp {
+
+/**
+ * @brief Pass this value into the constructor of dpp::cluster for the shard count to create a cluster with no shards.
+ * A cluster with no shards does not connect to a websocket, but can still use the event loop to dispatch HTTPS API
+ * requests to Discord. This is useful for bots that do not need to receive websocket events as it will save a lot of
+ * resources.
+ */
+constexpr uint32_t NO_SHARDS = ~0U;
+
+/**
+ * @brief Types of startup for cluster::start()
+ */
+enum start_type : bool {
+	/**
+	 * @brief Wait forever on a condition variable.
+	 * The cluster will spawn threads for each shard
+	 * and start() will not return in normal operation.
+	 */
+	st_wait = false,
+
+	/**
+	 * @brief Return immediately after starting shard threads.
+	 * If you set the parameter of cluster::start() to
+	 * this value, you will have to manage the lifetime
+	 * and scope of your cluster object yourself. Taking it
+	 * out of scope or deleting its pointer will terminate
+	 * the bot.
+	 */
+	st_return = true,
+};
+
+/** @brief The cluster class represents a group of shards and a command queue for sending and
+ * receiving commands from discord via HTTP. You should usually instantiate a cluster object
+ * at the very least to make use of the library.
+ */
+class DPP_EXPORT cluster {
+
+	friend class discord_client;
+	friend class discord_voice_client;
+
+	/**
+	 * @brief default gateway for connecting the websocket.
+	 */
+	std::string default_gateway;
+
+	/**
+	 * @brief queue system for commands sent to Discord, and any replies
+	 */
+	request_queue* rest;
+
+	/**
+	 * @brief queue system for arbitrary HTTP requests sent by the user to sites other than Discord
+	 */
+	request_queue* raw_rest;
+
+	/**
+	 * @brief True if to use compression on shards
+	 */
+	bool compressed;
+
+	/**
+	 * @brief Lock to prevent concurrent access to dm_channels
+	 */
+	std::mutex dm_list_lock;
+
+	/**
+	 * @brief Start time of cluster
+	 */
+	time_t start_time;
+
+	/**
+	 * @brief Active DM channels for the bot
+	 */
+	std::unordered_map<snowflake, snowflake> dm_channels;
+
+	/**
+	 * @brief Active shards on this cluster. Shard IDs may have gaps between if there
+	 * are multiple clusters.
+	 */
+	shard_list shards;
+
+	/**
+	 * @brief List of shards waiting for reconnection
+	 */
+	reconnect_list reconnections;
+
+	/**
+	 * @brief Ephemeral list of deleted timer ids
+	 */
+	timers_deleted_t deleted_timers;
+
+	/**
+	 * @brief Priority queue of of timers by time
+	 */
+	timer_next_t next_timer;
+
+	/**
+	 * @brief Mutex to work with named_commands and synchronize read write access
+	 */
+	std::shared_mutex named_commands_mutex;
+
+	/**
+	 * @brief Mutex for protection of shards list
+	 */
+	mutable std::shared_mutex shards_mutex;
+
+	/**
+	 * @brief Typedef for slashcommand handler type
+	 */
+	using slashcommand_handler_t = std::function<void(const slashcommand_t &)>;
+
+#ifndef DPP_NO_CORO
+	/**
+	 * @brief Typedef for coroutines based slashcommand handler type
+	 */
+	using co_slashcommand_handler_t = std::function<dpp::task<void>(const slashcommand_t&)>;
+
+	/**
+	 * @brief Typedef for variant of coroutines based slashcommand handler type and regular version of it
+	 */
+	using slashcommand_handler_variant = std::variant<slashcommand_handler_t,co_slashcommand_handler_t>;
+
+	/**
+	 * @brief Container to store relation between command name and it's handler
+	 */
+	std::map<std::string,slashcommand_handler_variant> named_commands;
+#else
+	/**
+	 * @brief Container to store relation between command name and it's handler
+	 */
+	std::map<std::string,slashcommand_handler_t> named_commands;
+#endif
+	/**
+	 * @brief Thread pool
+	 */
+	std::unique_ptr<thread_pool> pool{nullptr};
+
+	/**
+	 * @brief Used to spawn the socket engine into its own thread if
+	 * the cluster is started with dpp::st_return. It is unused otherwise.
+	 */
+	std::thread engine_thread;
+
+	/**
+	 * @brief Protection mutex for timers
+	 */
+	std::mutex timer_guard;
+
+	/**
+	 * @brief Webhook server if enabled
+	 */
+	struct discord_webhook_server* webhook_server{nullptr};
+
+	/**
+	 * @brief Mark a shard as requiring reconnection.
+	 * Destructs the old shard in 5 seconds and creates a new one attempting to resume.
+	 *
+	 * @param shard_id Shard ID
+	 */
+	void add_reconnect(uint32_t shard_id);
+
+public:
+	/**
+	 * @brief Current bot token for all shards on this cluster and all commands sent via HTTP
+	 */
+	std::string token;
+
+	/**
+	 * @brief Last time the bot sent an IDENTIFY
+	 */
+	time_t last_identify;
+
+	/**
+	 * @brief Current bitmask of gateway intents
+	 */
+	uint32_t intents;
+
+	/**
+	 * @brief Total number of shards across all clusters
+	 */
+	uint32_t numshards;
+
+	/**
+	 * @brief ID of this cluster, between 0 and MAXCLUSTERS-1 inclusive
+	 */
+	uint32_t cluster_id;
+
+	/**
+	 * @brief Total number of clusters that are active
+	 */
+	uint32_t maxclusters;
+
+	/**
+	 * @brief REST latency (HTTPS ping) in seconds
+	 */
+	double rest_ping;
+
+	/**
+	 * @brief The details of the bot user. This is assumed to be identical across all shards
+	 * in the cluster. Each connecting shard updates this information.
+	 */
+	dpp::user me;
+
+	/**
+	 * @brief Current cache policy for the cluster
+	 */
+	cache_policy_t cache_policy;
+
+	/**
+	 * @brief Websocket mode for all shards in the cluster, either ws_json or ws_etf.
+	 * Production bots should use ETF, while development bots should use JSON.
+	 */
+	websocket_protocol_t ws_mode;
+
+	/**
+	 * @brief Atomic bool to set to true when the cluster is terminating.
+	 *
+	 * D++ itself does not set this value, it is for library users to set if they want
+	 * the cluster to terminate outside of a flow where they may have simple access to
+	 * destruct the cluster object.
+	 */
+	std::atomic_bool terminating{false};
+
+	/**
+	 * @brief The time (in seconds) that a request is allowed to take.
+	 */
+	uint16_t request_timeout = 60;
+
+	/**
+	 * @brief Socket engine instance
+	 */
+	std::unique_ptr<socket_engine_base> socketengine;
+
+	/**
+	 * @brief Constructor for creating a cluster without a token.
+	 * A cluster created without a token has no shards, and just runs the event loop. You can use this to make asynchronous
+	 * HTTP requests via e.g. dpp::cluster::request without having to connect to a websocket to receive shard events.
+	 * @param pool_threads The number of threads to allocate for the thread pool. This defaults to half your system concurrency and if set to a number less than 4, will default to 4.
+	 * All callbacks and events are placed into the thread pool. The bigger you make this pool (but generally no bigger than your number of cores), the more your bot will scale.
+	 * @throw dpp::exception Thrown on windows, if WinSock fails to initialise, or on any other system if a dpp::request_queue fails to construct
+	 */
+	explicit cluster(uint32_t pool_threads = std::thread::hardware_concurrency() / 2);
+
+	/**
+	 * @brief Constructor for creating a cluster. All but the token are optional.
+	 * @param token The bot token to use for all HTTP commands and websocket connections
+	 * @param intents A bitmask of dpd::intents values for all shards on this cluster. This is required to be sent for all bots with over 100 servers.
+	 * @param shards The total number of shards on this bot. If there are multiple clusters, then (shards / clusters) actual shards will run on this cluster.
+	 * If you omit this value, the library will attempt to query the Discord API for the correct number of shards to start.
+	 * @param cluster_id The ID of this cluster, should be between 0 and MAXCLUSTERS-1
+	 * @param maxclusters The total number of clusters that are active, which may be on separate processes or even separate machines.
+	 * @param compressed Whether or not to use compression for shards on this cluster. Saves a ton of bandwidth at the cost of some CPU
+	 * @param policy Set the caching policy for the cluster, either lazy (only cache users/members when they message the bot) or aggressive (request whole member lists on seeing new guilds too)
+	 * @param pool_threads The number of threads to allocate for the thread pool. This defaults to half your system concurrency and if set to a number less than 4, will default to 4.
+	 * All callbacks and events are placed into the thread pool. The bigger you make this pool (but generally no bigger than your number of cores), the more your bot will scale.
+	 * @throw dpp::exception Thrown on windows, if WinSock fails to initialise, or on any other system if a dpp::request_queue fails to construct
+	 */
+	cluster(const std::string& token, uint32_t intents = i_default_intents, uint32_t shards = 0, uint32_t cluster_id = 0, uint32_t maxclusters = 1, bool compressed = true, cache_policy_t policy = cache_policy::cpol_default, uint32_t pool_threads = std::thread::hardware_concurrency() / 2);
+
+	/**
+	 * @brief Create a webhook server for receiving interactions
+	 * @note This should be considered mutually exclusive with delivery of interaction events via shards.
+	 * @param discord_public_key Public key for the application from the application dashboard page
+	 * @param address address to bind to, use "0.0.0.0" to bind to all local addresses
+	 * @param port port to bind to. You should generally use a port > 1024.
+	 * @param ssl_private_key Private key PEM file for HTTPS/SSL. If empty, a plaintext server is created
+	 * @param ssl_public_key Public key PEM file for HTTPS/SSL. If empty, a plaintext server is created
+	 */
+	cluster& enable_webhook_server(const std::string& discord_public_key, const std::string_view address, uint16_t port,  const std::string& ssl_private_key = "", const std::string& ssl_public_key = "");
+
+	/**
+	 * @brief Place some arbitrary work into the thread pool for execution when time permits.
+	 *
+	 * Work units are fetched into threads on the thread pool from the queue in order of priority,
+	 * lowest numeric values first. Low numeric values should be reserved for API replies from Discord,
+	 * guild creation events, etc.
+	 *
+	 * @param priority Priority of the work unit
+	 * @param task Task to queue
+	 */
+	void queue_work(int priority, work_unit task);
+
+	/**
+	 * @brief dpp::cluster is non-copyable
+	 */
+	cluster(const cluster&) = delete;
+
+	/**
+	 * @brief dpp::cluster is non-moveable
+	 */
+	cluster(const cluster&&) = delete;
+
+	/**
+	 * @brief dpp::cluster is non-copyable
+	 */
+	cluster& operator=(const cluster&) = delete;
+
+	/**
+	 * @brief dpp::cluster is non-moveable
+	 */
+	cluster& operator=(const cluster&&) = delete;
+
+	/**
+	 * @brief Destroy the cluster object
+	 */
+	virtual ~cluster();
+
+	/**
+	 * @brief End cluster execution without destructing it.
+	 * To restart the cluster, call cluster::start() again.
+	 */
+	void shutdown();
+
+	/**
+	 * @brief Get the rest_queue object which handles HTTPS requests to Discord
+	 * @return request_queue* pointer to request_queue object
+	 */
+	request_queue* get_rest();
+
+	/**
+	 * @brief Get the raw rest_queue object which handles all HTTP(S) requests that are not directed at Discord
+	 * @return request_queue* pointer to request_queue object
+	 */
+	request_queue* get_raw_rest();
+
+	/**
+	 * @brief Set the websocket protocol for all shards on this cluster.
+	 * You should call this method before cluster::start.
+	 * Generally ws_etf is faster, but provides less facilities for debugging should something
+	 * go wrong. It is recommended to use ETF in production and JSON in development.
+	 * 
+	 * @param mode websocket protocol to use, either ws_json or ws_etf.
+	 * @return cluster& Reference to self for chaining.
+	 * @throw dpp::logic_exception If called after the cluster is started (this is not supported)
+	 */
+	cluster& set_websocket_protocol(websocket_protocol_t mode);
+
+	/**
+	 * @brief Tick active timers
+	 */
+	void tick_timers();
+
+	/**
+	 * @brief Set the audit log reason for the next REST call to be made.
+	 * This is set per-thread, so you must ensure that if you call this method, your request that
+	 * is associated with the reason happens on the same thread where you set the reason.
+	 * Once the next call is made, the audit log reason is cleared for this thread automatically.
+	 * 
+	 * Example:
+	 * ```
+	 * bot.set_audit_reason("Too much abusive content")
+	 *	.channel_delete(my_channel_id);
+	 * ```
+	 * 
+	 * @param reason The reason to set for the next REST call on this thread
+	 * @return cluster& Reference to self for chaining.
+	 */
+	cluster& set_audit_reason(const std::string &reason);
+
+	/**
+	 * @brief Clear the audit log reason for the next REST call to be made.
+	 * This is set per-thread, so you must ensure that if you call this method, your request that
+	 * is associated with the reason happens on the same thread where you set the reason.
+	 * Once the next call is made, the audit log reason is cleared for this thread automatically.
+	 * 
+	 * Example:
+	 * ```
+	 * bot.set_audit_reason("Won't be sent")
+	 *	.clear_audit_reason()
+	 *	.channel_delete(my_channel_id);
+	 * ```
+	 * 
+	 * @return cluster& Reference to self for chaining.
+	 */
+	cluster& clear_audit_reason();
+
+	/**
+	 * @brief Get the audit reason set for the next REST call to be made on this thread.
+	 * This is set per-thread, so you must ensure that if you call this method, your request that
+	 * is associated with the reason happens on the same thread where you set the reason.
+	 * Once the next call is made, the audit log reason is cleared for this thread automatically.
+	 * 
+	 * @note This method call clears the audit reason when it returns it.
+	 * 
+	 * @return std::string The audit reason to be used.
+	 *
+	 */
+	std::string get_audit_reason();
+
+	/**
+	 * @brief Sets the address of the default gateway, for connecting the websockets.
+	 *
+	 * @return cluster& Reference to self for chaining.
+	 */
+	cluster& set_default_gateway(const std::string& default_gateway);
+
+	/**
+	 * @brief Log a message to whatever log the user is using.
+	 * The logged message is passed up the chain to the on_log event in user code which can then do whatever
+	 * it wants to do with it.
+	 * @param severity The log level from dpp::loglevel
+	 * @param msg The log message to output
+	 */
+	void log(dpp::loglevel severity, const std::string &msg) const;
+
+	/**
+	 * @brief Start a timer. Every `frequency` seconds, the callback is called.
+	 * 
+	 * @param on_tick The callback lambda to call for this timer when ticked
+	 * @param on_stop The callback lambda to call for this timer when it is stopped
+	 * @param frequency How often to tick the timer in seconds
+	 * @return timer A handle to the timer, used to remove that timer later
+	 */
+	timer start_timer(timer_callback_t on_tick, uint64_t frequency, timer_callback_t on_stop = {});
+
+#ifndef DPP_NO_CORO
+	/**
+	 * @brief Start a coroutine timer. Every `frequency` seconds, the callback is called.
+	 * 
+	 * @param on_tick The callback lambda to call for this timer when ticked
+	 * @param on_stop The callback lambda to call for this timer when it is stopped
+	 * @param frequency How often to tick the timer in seconds
+	 * @return timer A handle to the timer, used to remove that timer later
+	 */
+	template <std::invocable<timer> T, std::invocable<timer> U = std::function<void(timer)>>
+	requires (
+		dpp::awaitable_type<typename std::invoke_result<T, timer>::type> &&
+		std::copy_constructible<std::decay_t<T>> && // N4988 [func.wrap.func.con]/10.1 - std::function requires a copy constructible argument
+		std::copy_constructible<std::decay_t<U>>
+	)
+	timer start_timer(T&& on_tick, uint64_t frequency, U&& on_stop = {}) {
+		using tick_fun = std::decay_t<T>;
+		using stop_fun = std::decay_t<U>;
+
+		// We want to ship the function object on the coroutine frame to allow for lambda captures
+		// See https://discord.com/channels/825407338755653642/825411707521728512/1495801839827030067
+		// and https://discord.com/channels/825407338755653642/825411707521728512/1492502683444052109
+		// Now we can only realistically do that by copying the lambda on each invocation, I think...
+		// People should be avoiding lambda captures to begin with (see https://dpp.dev/coro-introduction.html),
+		// so while this isn't super efficient, it's practically zero-cost with no capture anyways
+		std::function<void(timer)> ticker = std::bind_front([](tick_fun fun, timer t) -> dpp::job {
+			co_await std::invoke(fun, t);
+		}, static_cast<tick_fun>(std::forward<T>(on_tick)));
+		std::function<void(timer)> stopper;
+		if constexpr (dpp::awaitable_type<typename std::invoke_result<U, timer>::type>) {
+			stopper = std::bind_front([](stop_fun fun, timer t) -> dpp::job {
+				co_await std::invoke(fun, t);
+			}, static_cast<stop_fun>(std::forward<U>(on_stop)));
+		} else {
+			stopper = std::forward<U>(on_stop);
+		}
+		return start_timer(std::move(ticker), frequency, std::move(stopper));
+	}
+#endif
+
+	/**
+	 * @brief Stop a ticking timer
+	 * 
+	 * @param t Timer handle received from cluster::start_timer
+	 * @return bool True if the timer was stopped, false if it did not exist
+	 * @note If the timer has an on_stop lambda, the on_stop lambda will be called.
+	 */
+	bool stop_timer(timer t);
+
+#ifndef DPP_NO_CORO
+	/**
+	 * @brief Get an awaitable to wait a certain amount of seconds. Use the co_await keyword on its return value to suspend the coroutine until the timer ends
+	 *
+	 * @param seconds How long to wait for
+	 * @return async<timer> Object that can be co_await-ed to suspend the function for a certain time
+	 */
+	[[nodiscard]] async<timer> co_sleep(uint64_t seconds);
+#endif
+
+	/**
+	 * @brief Get the dm channel for a user id
+	 *
+	 * @param user_id the user id to get the dm channel for
+	 * @return Returns 0 on failure
+	 */
+	snowflake get_dm_channel(snowflake user_id);
+
+	/**
+	 * @brief Set the dm channel id for a user id
+	 *
+	 * @param user_id user id to set the dm channel for
+	 * @param channel_id dm channel to set
+	 */
+	void set_dm_channel(snowflake user_id, snowflake channel_id);
+
+	/**
+	 * @brief Returns the uptime of the cluster
+	 *
+	 * @return dpp::utility::uptime The uptime of the cluster
+	 */
+	dpp::utility::uptime uptime();
+
+	/**
+	 * @brief Start the cluster, connecting all its shards.
+	 * 
+	 * Returns once all shards are connected if return_after is true,
+	 * otherwise enters an infinite loop while the shards run.
+	 *
+	 * @param return_after If true the bot will return to your program after starting shards, if false this function will never return.
+	 */
+	void start(start_type return_after = st_wait);
+
+	/**
+	 * @brief Set the presence for all shards on the cluster
+	 *
+	 * @param p The presence to set. Only the online status and the first activity are sent.
+	 */
+	void set_presence(const class dpp::presence &p);
+
+	/**
+	 * @brief Get a shard by id, returning the discord_client
+	 *
+	 * @param id Shard ID
+	 * @return discord_client* shard, or null
+	 */
+	discord_client* get_shard(uint32_t id) const;
+
+	/**
+	 * @brief Get the list of shards
+	 *
+	 * @return const shard_list& map of shards for this cluster
+	 */
+	const shard_list& get_shards() const;
+
+	/**
+	 * @brief Sets the request timeout.
+	 *
+	 * @param timeout The length of time (in seconds) that requests are allowed to take. Default: 20.
+	 *
+	 * @return cluster& Reference to self for chaining.
+	 */
+	cluster& set_request_timeout(uint16_t timeout);
+
+	/* Functions for attaching to event handlers */
+
+	/**
+	 * @brief Register a slash command handler.
+	 *
+	 * @param name The name of the slash command to register
+	 * @param handler A handler function of type `slashcommand_handler_t`
+	 *
+	 * @return bool Returns `true` if the command was registered successfully, or `false` if
+	 * the command with the same name already exists
+	 */
+	template <typename F>
+	std::enable_if_t<utility::callable_returns_v<F, void, const slashcommand_t&>, bool> register_command(const std::string& name, F&& handler) {
+		std::unique_lock lk(named_commands_mutex);
+		auto [_, inserted] = named_commands.try_emplace(name, std::forward<F>(handler));
+		return inserted;
+	}
+
+	/**
+	 * @brief Get the number of currently active HTTP(S) requests active in the cluster.
+	 * This total includes all in-flight API requests and calls to dpp::cluster::request().
+	 * Note that once a request is passed to the thread pool it is no longer counted here.
+	 * @return Total active request count
+	 */
+	size_t active_requests();
+
+#ifndef DPP_NO_CORO
+	/**
+	 * @brief Register a coroutine-based slash command handler.
+	 *
+	 * @param name The name of the slash command to register.
+	 * @param handler A coroutine handler function of type `co_slashcommand_handler_t`.
+	 *
+	 * @return bool Returns `true` if the command was registered successfully, or `false` if
+	 * the command with the same name already exists.
+	 */
+	template <typename F>
+	requires (utility::callable_returns<F, dpp::task<void>, const slashcommand_t&>)
+	bool register_command(const std::string& name, F&& handler) {
+		std::unique_lock lk(named_commands_mutex);
+		auto [_, inserted] = named_commands.try_emplace(name, std::in_place_type<co_slashcommand_handler_t>, std::forward<F>(handler));
+		return inserted;
+	}
+#endif
+
+	/**
+	 * @brief Unregister a slash command.
+	 *
+	 * This function unregisters (removes) a previously registered slash command by name.
+	 * If the command is successfully removed, it returns `true`.
+	 *
+	 * @param name The name of the slash command to unregister.
+	 *
+	 * @return bool Returns `true` if the command was successfully unregistered, or `false`
+	 * if the command was not found.
+	 */
+	bool unregister_command(const std::string& name);
+
+	/**
+	 * @brief on voice channel effect send event
+	 *
+	 * @see https://discord.com/developers/docs/events/gateway-events#voice-channel-effect-send
+	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
+	 * The function signature for this event takes a single `const` reference of type voice_channel_effect_send_t&, and returns void.
+	 */
+	event_router_t<voice_channel_effect_send_t> on_voice_channel_effect_send;
+
+	/**
+	 * @brief on voice state update event
+	 *
+	 * @see https://discord.com/developers/docs/topics/gateway-events#voice-state-update
+	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
+	 * The function signature for this event takes a single `const` reference of type voice_state_update_t&, and returns void.
+	 */
+	event_router_t<voice_state_update_t> on_voice_state_update;
+
+	/**
+	 * @brief on voice client platform event
+	 * After a client connects, or on joining a vc, you will receive the platform type of each client. This is either desktop
+	 * or mobile.
+	 *
+	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
+	 * The function signature for this event takes a single `const` reference of type voice_client_disconnect_t&, and returns void.
+	 */
+	event_router_t<voice_client_platform_t> on_voice_client_platform;
+
+	/**
+	 * @brief on voice client disconnect event
+	 *
+	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
+	 * The function signature for this event takes a single `const` reference of type voice_client_disconnect_t&, and returns void.
+	 */
+	event_router_t<voice_client_disconnect_t> on_voice_client_disconnect;
+
+	
+	/**
+	 * @brief on voice client speaking event
+	 *
+	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
+	 * The function signature for this event takes a single `const` reference of type voice_client_speaking_t&, and returns void.
+	 */
+	event_router_t<voice_client_speaking_t> on_voice_client_speaking;
+
+	
+	/**
+	 * @brief Called when a log message is to be written to the log.
+	 * You can attach any logging system here you wish, e.g. spdlog, or even just a simple
+	 * use of std::cout or printf. If nothing attaches this log event, then the
+	 * library will be silent.
+	 *
+	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
+	 * The function signature for this event takes a single `const` reference of type log_t&, and returns void.
+	 */
+	event_router_t<log_t> on_log;
+
+	/**
+	 * @brief Called when a file descriptor is removed from the socket engine
+	 *
+	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
+	 * The function signature for this event takes a single `const` reference of type socket_close_t&, and returns void.
+	 */
+	event_router_t<socket_close_t> on_socket_close;
+
+	/**
+	 * @brief on guild join request delete.
+	 * Triggered when a user declines the membership screening questionnaire for a guild.
+	 *
+	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
+	 * The function signature for this event takes a single `const` reference of type guild_join_request_delete_t&, and returns void.
+	 */
+	event_router_t<guild_join_request_delete_t> on_guild_join_request_delete;
+
+	
+	/**
+	 * @brief Called when a new interaction is created.
+	 * Interactions are created by discord when commands you have registered are issued
+	 * by a user. For an example of this in action please see \ref slashcommands
+	 *
+	 * @see https://discord.com/developers/docs/topics/gateway-events#interaction-create
+	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
+	 * The function signature for this event takes a single `const` reference of type interaction_create_t&, and returns void.
+	 *
+	 * @note There are dedicated events to handle slashcommands (See dpp::cluster::on_slashcommand),
+	 * user context menus (See dpp::cluster::on_user_context_menu) and message context menus (See dpp::cluster::on_message_context_menu)
+	 */
+	event_router_t<interaction_create_t> on_interaction_create;
+
+	/**
+	 * @brief Called when a slash command is issued.
+	 * Only dpp::ctxm_chat_input types of interaction are routed to this event.
+	 * For an example of this in action please see \ref slashcommands
+	 *
+	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
+	 * The function signature for this event takes a single `const` reference of type slashcommand_t&, and returns void.
+	 */
+	event_router_t<slashcommand_t> on_slashcommand;
+	
+	/**
+	 * @brief Called when a button is clicked attached to a message.
+	 * Button clicks are triggered by discord when buttons are clicked which you have
+	 * associated with a message using dpp::component.
+	 *
+	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
+	 * The function signature for this event takes a single `const` reference of type button_click_t&, and returns void.
+	 */
+	event_router_t<button_click_t> on_button_click;
+	
+	/**
+	 * @brief Called when an auto completed field needs suggestions to present to the user
+	 * This is triggered by discord when option choices have auto completion enabled which you have
+	 * associated with a dpp::slashcommand.
+	 *
+	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
+	 * The function signature for this event takes a single `const` reference of type autocomplete_t&, and returns void.
+	 */
+	event_router_t<autocomplete_t> on_autocomplete;
+
+	
+	/**
+	 * @brief Called when a select menu is clicked attached to a message.
+	 * Select menu clicks are triggered by discord when select menus are clicked which you have
+	 * associated with a message using dpp::component.
+	 *
+	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
+	 * The function signature for this event takes a single `const` reference of type select_click_t&, and returns void.
+	 */
+	event_router_t<select_click_t> on_select_click;
+
+	/**
+	 * @brief Called when a user right-clicks or long-presses on a message,
+	 * where a slash command is bound to the dpp::ctxm_message command type.
+	 *
+	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
+	 * The function signature for this event takes a single `const` reference of type message_context_menu_t&, and returns void.
+	 */
+	event_router_t<message_context_menu_t> on_message_context_menu;
+
+	/**
+	 * @brief Called when a user right-clicks or long-presses on a user,
+	 * where a slash command is bound to the dpp::ctxm_user command type.
+	 *
+	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
+	 * The function signature for this event takes a single `const` reference of type user_context_menu_t&, and returns void.
+	 */
+	event_router_t<user_context_menu_t> on_user_context_menu;
+
+	/**
+	 * @brief Called when a modal dialog is submitted.
+	 * Form submits are triggered by discord when modal dialogs are submitted which you have
+	 * associated with a slash command using dpp::interaction_modal_response.
+	 *
+	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
+	 * The function signature for this event takes a single `const` reference of type form_submit_t&, and returns void.
+	 */
+	event_router_t<form_submit_t> on_form_submit;
+
+	
+	/**
+	 * @brief Called when a guild is deleted.
+	 * A guild can be deleted via the bot being kicked, the bot leaving the guild
+	 * explicitly with dpp::cluster::guild_delete, or via the guild being unavailable due to
+	 * an outage.
+	 *
+	 * @see https://discord.com/developers/docs/topics/gateway-events#guild-delete
+	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
+	 * The function signature for this event takes a single `const` reference of type guild_delete_t&, and returns void.
+	 */
+	event_router_t<guild_delete_t> on_guild_delete;
+
+	
+	/**
+	 * @brief Called when a channel is deleted from a guild.
+	 * The channel will still be temporarily available in the cache. Pointers to the
+	 * channel should not be retained long-term as they will be deleted by the garbage
+	 * collector.
+	 *
+	 * @see https://discord.com/developers/docs/topics/gateway-events#channel-delete
+	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
+	 * The function signature for this event takes a single `const` reference of type channel_delete_t&, and returns void.
+	 */
+	event_router_t<channel_delete_t> on_channel_delete;
+
+	
+	/**
+	 * @brief Called when a channel is edited on a guild.
+	 * The new channel details have already been applied to the guild when you
+	 * receive this event.
+	 *
+	 * @see https://discord.com/developers/docs/topics/gateway-events#channel-update
+	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
+	 * The function signature for this event takes a single `const` reference of type channel_update_t&, and returns void.
+	 */
+	event_router_t<channel_update_t> on_channel_update;
+
+	
+	/**
+	 * @brief Called when a shard is connected and ready.
+	 * A set of cluster::on_guild_create events will follow this event.
+	 *
+	 * @see https://discord.com/developers/docs/topics/gateway-events#ready
+	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
+	 * The function signature for this event takes a single `const` reference of type ready_t&, and returns void.
+	 */
+	event_router_t<ready_t> on_ready;
+
+	
+	/**
+	 * @brief Called when a message is deleted.
+	 * The message has already been deleted from Discord when you
+	 * receive this event.
+	 *
+	 * @see https://discord.com/developers/docs/topics/gateway-events#message-delete
+	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
+	 * The function signature for this event takes a single `const` reference of type message_delete_t&, and returns void.
+	 */
+	event_router_t<message_delete_t> on_message_delete;
+
+	
+	/**
+	 * @brief Called when a user leaves a guild (either through being kicked, or choosing to leave)
+	 *
+	 * @see https://discord.com/developers/docs/topics/gateway-events#guild-member-remove
+	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
+	 * The function signature for this event takes a single `const` reference of type guild_member_remove_t&, and returns void.
+	 */
+	event_router_t<guild_member_remove_t> on_guild_member_remove;
+
+	
+	/**
+	 * @brief Called when a connection to a shard successfully resumes.
+	 * A resumed session does not need to re-synchronise guilds, members, etc.
+	 * This is generally non-fatal and informational only.
+	 *
+	 * @see https://discord.com/developers/docs/topics/gateway-events#resumed
+	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
+	 * The function signature for this event takes a single `const` reference of type resumed_t&, and returns void.
+	 */
+	event_router_t<resumed_t> on_resumed;
+
+	
+	/**
+	 * @brief Called when a new role is created on a guild.
+	 *
+	 * @see https://discord.com/developers/docs/topics/gateway-events#guild-role-create
+	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
+	 * The function signature for this event takes a single `const` reference of type guild_role_create_t&, and returns void.
+	 */
+	event_router_t<guild_role_create_t> on_guild_role_create;
+
+	
+	/**
+	 * @brief Called when a user is typing on a channel.
+	 *
+	 * @see https://discord.com/developers/docs/topics/gateway-events#typing-start
+	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
+	 * The function signature for this event takes a single `const` reference of type typing_start_t&, and returns void.
+	 */
+	event_router_t<typing_start_t> on_typing_start;
+
+	
+	/**
+	 * @brief Called when a new reaction is added to a message.
+	 *
+	 * @see https://discord.com/developers/docs/topics/gateway-events#message-reaction-add
+	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
+	 * The function signature for this event takes a single `const` reference of type message_reaction_add_t&, and returns void.
+	 */
+	event_router_t<message_reaction_add_t> on_message_reaction_add;
+
+	
+	/**
+	 * @brief Called when a set of members is received for a guild.
+	 * D++ will request these for all new guilds if needed, after the cluster::on_guild_create
+	 * events.
+	 *
+	 * @see https://discord.com/developers/docs/topics/gateway-events#guild-members-chunk
+	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
+	 * The function signature for this event takes a single `const` reference of type guild_members_chunk_t&, and returns void.
+	 */
+	event_router_t<guild_members_chunk_t> on_guild_members_chunk;
+
+	
+	/**
+	 * @brief Called when a single reaction is removed from a message.
+	 *
+	 * @see https://discord.com/developers/docs/topics/gateway-events#message-reaction-remove
+	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
+	 * The function signature for this event takes a single `const` reference of type message_reaction_remove_t&, and returns void.
+	 */
+	event_router_t<message_reaction_remove_t> on_message_reaction_remove;
+
+	
+	/**
+	 * @brief Called when a new guild is created.
+	 * D++ will request members for the guild for its cache using guild_members_chunk.
+	 * 
+	 * @warning If the cache policy has disabled guild caching, the pointer in this event will become invalid after the
+	 * event ends. You should make a copy of any data you wish to preserve beyond this.
+	 *
+	 * @see https://discord.com/developers/docs/topics/gateway-events#guild-create
+	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
+	 * The function signature for this event takes a single `const` reference of type guild_create_t&, and returns void.
+	 */
+	event_router_t<guild_create_t> on_guild_create;
+
+	
+	/**
+	 * @brief Called when a new channel is created on a guild.
+	 *
+	 * @warning If the cache policy has disabled channel caching, the pointer in this event will become invalid after the
+	 * event ends. You should make a copy of any data you wish to preserve beyond this.
+	 * 
+	 * @see https://discord.com/developers/docs/topics/gateway-events#channel-create
+	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
+	 * The function signature for this event takes a single `const` reference of type channel_create_t&, and returns void.
+	 */
+	event_router_t<channel_create_t> on_channel_create;
+
+	
+	/**
+	 * @brief Called when all reactions for a particular emoji are removed from a message.
+	 *
+	 * @see https://discord.com/developers/docs/topics/gateway-events#message-reaction-remove-emoji
+	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
+	 * The function signature for this event takes a single `const` reference of type message_reaction_remove_emoji_t&, and returns void.
+	 */
+	event_router_t<message_reaction_remove_emoji_t> on_message_reaction_remove_emoji;
+
+	
+	/**
+	 * @brief Called when multiple messages are deleted from a channel or DM.
+	 *
+	 * @see https://discord.com/developers/docs/topics/gateway-events#message-delete-bulk
+	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
+	 * The function signature for this event takes a single `const` reference of type message_delete_bulk_t&, and returns void.
+	 */
+	event_router_t<message_delete_bulk_t> on_message_delete_bulk;
+
+	
+	/**
+	 * @brief Called when an existing role is updated on a guild.
+	 *
+	 * @warning If the cache policy has disabled guild caching, the pointer to the guild in this event may be nullptr.
+	 *
+	 * @see https://discord.com/developers/docs/topics/gateway-events#guild-role-update
+	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
+	 * The function signature for this event takes a single `const` reference of type guild_role_update_t&, and returns void.
+	 */
+	event_router_t<guild_role_update_t> on_guild_role_update;
+
+	
+	/**
+	 * @brief Called when a role is deleted in a guild.
+	 *
+	 * @warning If the cache policy has disabled guild caching, the pointer to the guild in this event may be nullptr.
+	 *
+	 * @see https://discord.com/developers/docs/topics/gateway-events#guild-role-delete
+	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
+	 * The function signature for this event takes a single `const` reference of type guild_role_delete_t&, and returns void.
+	 */
+	event_router_t<guild_role_delete_t> on_guild_role_delete;
+
+	
+	/**
+	 * @brief Called when a message is pinned.
+	 * Note that the pinned message is not returned to this event, just the timestamp
+	 * of the last pinned message.
+	 *
+	 * @see https://discord.com/developers/docs/topics/gateway-events#channel-pins-update
+	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
+	 * The function signature for this event takes a single `const` reference of type channel_pins_update_t&, and returns void.
+	 */
+	event_router_t<channel_pins_update_t> on_channel_pins_update;
+
+	
+	/**
+	 * @brief Called when all reactions are removed from a message.
+	 *
+	 * @see https://discord.com/developers/docs/topics/gateway-events#message-reaction-remove-all
+	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
+	 * The function signature for this event takes a single `const` reference of type message_reaction_remove_all_t&, and returns void.
+	 */
+	event_router_t<message_reaction_remove_all_t> on_message_reaction_remove_all;
+
+	
+	/**
+	 * @brief Called when we are told which voice server we can use.
+	 * This will be sent either when we establish a new voice channel connection,
+	 * or as discord rearrange their infrastructure.
+	 *
+	 * @warning If the cache policy has disabled guild caching, the pointer to the guild in this event may be nullptr.
+	 *
+	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
+	 * The function signature for this event takes a single `const` reference of type voice_server_update_t&, and returns void.
+	 */
+	event_router_t<voice_server_update_t> on_voice_server_update;
+
+	
+	/**
+	 * @brief Called when new emojis are added to a guild.
+	 * The complete set of emojis is sent every time.
+	 *
+	 * @warning If the cache policy has disabled guild caching, the pointer to the guild in this event may be nullptr.
+	 *
+	 * @see https://discord.com/developers/docs/topics/gateway-events#guild-emojis-update
+	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
+	 * The function signature for this event takes a single `const` reference of type guild_emojis_update_t&, and returns void.
+	 */
+	event_router_t<guild_emojis_update_t> on_guild_emojis_update;
+
+	
+	/**
+	 * @brief Called when new stickers are added to a guild.
+	 * The complete set of stickers is sent every time.
+	 *
+	 * @warning If the cache policy has disabled guild caching, the pointer to the guild in this event may be nullptr.
+	 *
+	 * @see https://discord.com/developers/docs/topics/gateway-events#guild-stickers-update
+	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
+	 * The function signature for this event takes a single `const` reference of type guild_stickers_update_t&, and returns void.
+	 */
+	event_router_t<guild_stickers_update_t> on_guild_stickers_update;
+
+	
+	/**
+	 * @brief Called when a user's presence is updated.
+	 * To receive these you will need the GUILD_PRESENCES privileged intent.
+	 * You will receive many of these, very often, and receiving them will significantly
+	 * increase your bot's CPU usage. If you don't need them it is recommended to not ask
+	 * for them.
+	 *
+	 * @see https://discord.com/developers/docs/topics/gateway-events#presence-update
+	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
+	 * The function signature for this event takes a single `const` reference of type presence_update_t&, and returns void.
+	 */
+	event_router_t<presence_update_t> on_presence_update;
+
+	
+	/**
+	 * @brief Called when the webhooks for a guild are updated.
+	 *
+	 * @see https://discord.com/developers/docs/topics/gateway-events#webhooks-update
+	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
+	 * The function signature for this event takes a single `const` reference of type webhooks_update_t&, and returns void.
+	 */
+	event_router_t<webhooks_update_t> on_webhooks_update;
+
+	/**
+	 * @brief Called when a new automod rule is created.
+	 *
+	 * @see https://discord.com/developers/docs/topics/gateway-events#auto-moderation-rule-create
+	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
+	 * The function signature for this event takes a single `const` reference of type automod_rule_create_t&, and returns void.
+	 */
+	event_router_t<automod_rule_create_t> on_automod_rule_create;
+
+
+	/**
+	 * @brief Called when an automod rule is updated.
+	 *
+	 * @see https://discord.com/developers/docs/topics/gateway-events#auto-moderation-rule-update
+	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
+	 * The function signature for this event takes a single `const` reference of type automod_rule_update_t&, and returns void.
+	 */
+	event_router_t<automod_rule_update_t> on_automod_rule_update;
+	
+	/**
+	 * @brief Called when an automod rule is deleted.
+	 *
+	 * @see https://discord.com/developers/docs/topics/gateway-events#auto-moderation-rule-delete
+	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
+	 * The function signature for this event takes a single `const` reference of type automod_rule_delete_t&, and returns void.
+	 */
+	event_router_t<automod_rule_delete_t> on_automod_rule_delete;
+
+	/**
+	 * @brief Called when an automod rule is triggered/executed.
+	 *
+	 * @see https://discord.com/developers/docs/topics/gateway-events#auto-moderation-action-execution
+	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
+	 * The function signature for this event takes a single `const` reference of type automod_rule_execute_t&, and returns void.
+	 */
+	event_router_t<automod_rule_execute_t> on_automod_rule_execute;
+
+	/**
+	 * @brief Called when a new member joins a guild.
+	 *
+	 * @warning If the cache policy has disabled guild caching, the pointer to the guild in this event may be nullptr.
+	 *
+	 * @see https://discord.com/developers/docs/topics/gateway-events#guild-member-add
+	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
+	 * The function signature for this event takes a single `const` reference of type guild_member_add_t&, and returns void.
+	 */
+	event_router_t<guild_member_add_t> on_guild_member_add;
+
+	
+	/**
+	 * @brief Called when an invite is deleted from a guild.
+	 *
+	 * @see https://discord.com/developers/docs/topics/gateway-events#invite-delete
+	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
+	 * The function signature for this event takes a single `const` reference of type invite_delete_t&, and returns void.
+	 */
+	event_router_t<invite_delete_t> on_invite_delete;
+
+	
+	/**
+	 * @brief Called when details of a guild are updated.
+	 *
+	 * @warning If the cache policy has disabled guild caching, the pointer in this event will become invalid after the
+	 * event ends. You should make a copy of any data you wish to preserve beyond this. If the guild cache is disabled,
+	 * only changed elements in the updated guild object will be set. all other values will be empty or defaults.
+	 * 
+	 * @see https://discord.com/developers/docs/topics/gateway-events#guild-update
+	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
+	 * The function signature for this event takes a single `const` reference of type guild_update_t&, and returns void.
+	 */
+	event_router_t<guild_update_t> on_guild_update;
+
+	
+	/**
+	 * @brief Called when an integration is updated for a guild.
+	 * This returns the complete list.
+	 * An integration is a connection to a guild of a user's associated accounts,
+	 * e.g. youtube or twitch, for automatic assignment of roles etc.
+	 *
+	 * @warning If the cache policy has disabled guild caching, the pointer to the guild in this event may be nullptr.
+	 *
+	 * @see https://discord.com/developers/docs/topics/gateway-events#guild-integrations-update
+	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
+	 * The function signature for this event takes a single `const` reference of type guild_integrations_update_t&, and returns void.
+	 */
+	event_router_t<guild_integrations_update_t> on_guild_integrations_update;
+
+	
+	/**
+	 * @brief Called when details of a guild member (e.g. their roles or nickname) are updated.
+	 *
+	 * @warning If the cache policy has disabled guild caching, the pointer to the guild in this event may be nullptr.
+	 *
+	 * @see https://discord.com/developers/docs/topics/gateway-events#guild-member-update
+	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
+	 * The function signature for this event takes a single `const` reference of type guild_member_update_t&, and returns void.
+	 */
+	event_router_t<guild_member_update_t> on_guild_member_update;
+
+	
+	/**
+	 * @brief Called when a new invite is created for a guild.
+	 *
+	 * @warning If the cache policy has disabled guild caching, the pointer to the guild in this event may be nullptr.
+	 *
+	 * @see https://discord.com/developers/docs/topics/gateway-events#invite-create
+	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
+	 * The function signature for this event takes a single `const` reference of type invite_create_t&, and returns void.
+	 */
+	event_router_t<invite_create_t> on_invite_create;
+
+	
+	/**
+	 * @brief Called when a message is updated (edited).
+	 *
+	 * @see https://discord.com/developers/docs/topics/gateway-events#message-update
+	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
+	 * The function signature for this event takes a single `const` reference of type message_update_t&, and returns void.
+	 */
+	event_router_t<message_update_t> on_message_update;
+
+	
+	/**
+	 * @brief Called when a user is updated.
+	 * This is separate to cluster::on_guild_member_update and includes things such as an avatar change,
+	 * username change, discriminator change or change in subscription status for nitro.
+	 *
+	 * @see https://discord.com/developers/docs/topics/gateway-events#user-update
+	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
+	 * The function signature for this event takes a single `const` reference of type user_update_t&, and returns void.
+	 */
+	event_router_t<user_update_t> on_user_update;
+
+	
+	/**
+	 * @brief Called when a new message arrives from discord.
+	 * Note that D++ does not cache messages. If you want to cache these objects you
+	 * should create something yourself within your bot. Caching of messages is not on
+	 * the roadmap to be supported as it consumes excessive amounts of RAM.
+	 * For an example for caching of messages, please see \ref caching-messages
+	 *
+	 * @see https://discord.com/developers/docs/topics/gateway-events#message-create
+	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
+	 * The function signature for this event takes a single `const` reference of type message_create_t&, and returns void.
+	 */
+	event_router_t<message_create_t> on_message_create;
+
+	/**
+	 * @brief Called when a vote is added to a message poll.
+	 *
+	 * @see https://discord.com/developers/docs/topics/gateway-events#message-poll-vote-add
+	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
+	 * The function signature for this event takes a single `const` reference of type message_poll_vote_add_t&, and returns void.
+	 */
+	event_router_t<message_poll_vote_add_t> on_message_poll_vote_add;
+
+	/**
+	 * @brief Called when a vote is removed from a message poll.
+	 *
+	 * @see https://discord.com/developers/docs/topics/gateway-events#message-poll-vote-remove
+	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
+	 * The function signature for this event takes a single `const` reference of type message_poll_vote_remove_t&, and returns void.
+	 */
+	event_router_t<message_poll_vote_remove_t> on_message_poll_vote_remove;
+
+	/**
+	 * @brief Called when a guild audit log entry is created.
+	 *
+	 * @see https://discord.com/developers/docs/topics/gateway-events#guild-audit-log-entry-create
+	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
+	 * The function signature for this event takes a single `const` reference of type guild_audit_log_entry_create_t&, and returns void.
+	 */
+	event_router_t<guild_audit_log_entry_create_t> on_guild_audit_log_entry_create;
+	
+	/**
+	 * @brief Called when a ban is added to a guild.
+	 *
+	 * @warning If the cache policy has disabled guild caching, the pointer to the guild in this event may be nullptr.
+	 *
+	 * @see https://discord.com/developers/docs/topics/gateway-events#guild-ban-add
+	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
+	 * The function signature for this event takes a single `const` reference of type guild_ban_add_t&, and returns void.
+	 */
+	event_router_t<guild_ban_add_t> on_guild_ban_add;
+
+	
+	/**
+	 * @brief Called when a ban is removed from a guild.
+	 *
+	 * @warning If the cache policy has disabled guild caching, the pointer to the guild in this event may be nullptr.
+	 *
+	 * @see https://discord.com/developers/docs/topics/gateway-events#guild-ban-remove
+	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
+	 * The function signature for this event takes a single `const` reference of type guild_ban_remove_t&, and returns void.
+	 */
+	event_router_t<guild_ban_remove_t> on_guild_ban_remove;
+
+	
+	/**
+	 * @brief Called when a new integration is attached to a guild by a user.
+	 * An integration is a connection to a guild of a user's associated accounts,
+	 * e.g. youtube or twitch, for automatic assignment of roles etc.
+	 *
+	 * @warning If the cache policy has disabled guild caching, the pointer to the guild in this event may be nullptr.
+	 *
+	 * @see https://discord.com/developers/docs/topics/gateway-events#integration-create
+	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
+	 * The function signature for this event takes a single `const` reference of type integration_create_t&, and returns void.
+	 */
+	event_router_t<integration_create_t> on_integration_create;
+
+	
+	/**
+	 * @brief Called when an integration is updated by a user.
+	 * This returns details of just the single integration that has changed.
+	 * An integration is a connection to a guild of a user's associated accounts,
+	 * e.g. youtube or twitch, for automatic assignment of roles etc.
+	 *
+	 * @warning If the cache policy has disabled guild caching, the pointer to the guild in this event may be nullptr.
+	 *
+	 * @see https://discord.com/developers/docs/topics/gateway-events#integration-update
+	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
+	 * The function signature for this event takes a single `const` reference of type integration_update_t&, and returns void.
+	 */
+	event_router_t<integration_update_t> on_integration_update;
+
+	
+	/**
+	 * @brief Called when an integration is removed by a user.
+	 * An integration is a connection to a guild of a user's associated accounts,
+	 * e.g. youtube or twitch, for automatic assignment of roles etc.
+	 *
+	 * @warning If the cache policy has disabled guild caching, the pointer to the guild in this event may be nullptr.
+	 *
+	 * @see https://discord.com/developers/docs/topics/gateway-events#integration-delete
+	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
+	 * The function signature for this event takes a single `const` reference of type integration_delete_t&, and returns void.
+	 */
+	event_router_t<integration_delete_t> on_integration_delete;
+
+	
+	/**
+	 * @brief Called when a thread is created.
+	 * Note that threads are not cached by D++, but a list of thread IDs is accessible in a guild object
+	 *
+	 * @warning If the cache policy has disabled guild caching, the pointer to the guild in this event may be nullptr.
+	 *
+	 * @see https://discord.com/developers/docs/topics/gateway-events#thread-create
+	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
+	 * The function signature for this event takes a single `const` reference of type thread_create_t&, and returns void.
+	 */
+	event_router_t<thread_create_t> on_thread_create;
+
+	
+	/**
+	 * @brief Called when a thread is updated
+	 *
+	 * @warning If the cache policy has disabled guild caching, the pointer to the guild in this event may be nullptr.
+	 *
+	 * @see https://discord.com/developers/docs/topics/gateway-events#thread-update
+	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
+	 * The function signature for this event takes a single `const` reference of type thread_update_t&, and returns void.
+	 */
+	event_router_t<thread_update_t> on_thread_update;
+
+	
+	/**
+	 * @brief Called when a thread is deleted
+	 *
+	 * @warning If the cache policy has disabled guild caching, the pointer to the guild in this event may be nullptr.
+	 *
+	 * @see https://discord.com/developers/docs/topics/gateway-events#thread-delete
+	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
+	 * The function signature for this event takes a single `const` reference of type thread_delete_t&, and returns void.
+	 */
+	event_router_t<thread_delete_t> on_thread_delete;
+
+	
+	/**
+	 * @brief Called when thread list is synced (upon gaining access to a channel).
+	 * Note that threads are not cached by D++, but a list of thread IDs is accessible in a guild object
+	 *
+	 * @warning If the cache policy has disabled guild caching, the pointer to the guild in this event may be nullptr.
+	 *
+	 * @see https://discord.com/developers/docs/topics/gateway-events#thread-list-sync
+	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
+	 * The function signature for this event takes a single `const` reference of type thread_list_sync_t&, and returns void.
+	 */
+	event_router_t<thread_list_sync_t> on_thread_list_sync;
+
+	
+	/**
+	 * @brief Called when current user's thread member object is updated
+	 *
+	 * @warning If the cache policy has disabled guild caching, the pointer to the guild in this event may be nullptr.
+	 *
+	 * @see https://discord.com/developers/docs/topics/gateway-events#thread-member-update
+	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
+	 * The function signature for this event takes a single `const` reference of type thread_member_update_t&, and returns void.
+	 */
+	event_router_t<thread_member_update_t> on_thread_member_update;
+
+	
+	/**
+	 * @brief Called when a thread's member list is updated (without GUILD_MEMBERS intent, is only called for current user)
+	 *
+	 * @warning If the cache policy has disabled guild caching, the pointer to the guild in this event may be nullptr.
+	 *
+	 * @see https://discord.com/developers/docs/topics/gateway-events#thread-members-update
+	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
+	 * The function signature for this event takes a single `const` reference of type thread_members_update_t&, and returns void.
+	 */
+	event_router_t<thread_members_update_t> on_thread_members_update;
+
+	
+	/**
+	 * @brief Called when a new scheduled event is created
+	 *
+	 * @warning If the cache policy has disabled guild caching, the pointer to the guild in this event may be nullptr.
+	 *
+	 * @see https://discord.com/developers/docs/topics/gateway-events#guild-scheduled-event-create
+	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
+	 * The function signature for this event takes a single `const` reference of type guild_scheduled_event_create_t&, and returns void.
+	 */
+	event_router_t<guild_scheduled_event_create_t> on_guild_scheduled_event_create;
+
+	
+	/**
+	 * @brief Called when a new scheduled event is updated
+	 *
+	 * @warning If the cache policy has disabled guild caching, the pointer to the guild in this event may be nullptr.
+	 *
+	 * @see https://discord.com/developers/docs/topics/gateway-events#guild-scheduled-event-update
+	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
+	 * The function signature for this event takes a single `const` reference of type guild_scheduled_event_update_t&, and returns void.
+	 */
+	event_router_t<guild_scheduled_event_update_t> on_guild_scheduled_event_update;
+
+	
+	/**
+	 * @brief Called when a new scheduled event is deleted
+	 *
+	 * @warning If the cache policy has disabled guild caching, the pointer to the guild in this event may be nullptr.
+	 *
+	 * @see https://discord.com/developers/docs/topics/gateway-events#guild-scheduled-event-delete
+	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
+	 * The function signature for this event takes a single `const` reference of type guild_scheduled_event_delete_t&, and returns void.
+	 */
+	event_router_t<guild_scheduled_event_delete_t> on_guild_scheduled_event_delete;
+
+	
+	/**
+	 * @brief Called when a user is added to a scheduled event
+	 *
+	 * @warning If the cache policy has disabled guild caching, the pointer to the guild in this event may be nullptr.
+	 *
+	 * @see https://discord.com/developers/docs/topics/gateway-events#guild-scheduled-event-user-add
+	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
+	 * The function signature for this event takes a single `const` reference of type guild_scheduled_event_user_add_t&, and returns void.
+	 */
+	event_router_t<guild_scheduled_event_user_add_t> on_guild_scheduled_event_user_add;
+
+	
+	/**
+	 * @brief Called when a user is removed from a scheduled event
+	 *
+	 * @warning If the cache policy has disabled guild caching, the pointer to the guild in this event may be nullptr.
+	 *
+	 * @see https://discord.com/developers/docs/topics/gateway-events#guild-scheduled-event-user-remove
+	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
+	 * The function signature for this event takes a single `const` reference of type guild_scheduled_event_user_remove_t&, and returns void.
+	 */
+	event_router_t<guild_scheduled_event_user_remove_t> on_guild_scheduled_event_user_remove;
+
+	
+	/**
+	 * @brief Called when packets are sent from the voice buffer.
+	 * The voice buffer contains packets that are already encoded with Opus and encrypted
+	 * with XChaCha20-Poly1305, and merged into packets by the repacketizer, which is done in the
+	 * dpp::discord_voice_client::send_audio method. You should use the buffer size properties
+	 * of dpp::voice_buffer_send_t to determine if you should fill the buffer with more
+	 * content.
+	 *
+	 * @warning If the cache policy has disabled guild caching, the pointer to the guild in this event may be nullptr.
+	 *
+	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
+	 * The function signature for this event takes a single `const` reference of type voice_buffer_send_t&, and returns void.
+	 */
+	event_router_t<voice_buffer_send_t> on_voice_buffer_send;
+
+	
+	/**
+	 * @brief Called when a voice channel is connected and ready to send audio.
+	 * Note that this is not directly attached to the READY event of the websocket,
+	 * as there is further connection that needs to be done before audio is ready to send.
+	 *
+	 * @warning If the cache policy has disabled guild caching, the pointer to the guild in this event may be nullptr.
+	 *
+	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
+	 * The function signature for this event takes a single `const` reference of type voice_ready_t&, and returns void.
+	 */
+	event_router_t<voice_ready_t> on_voice_ready;
+
+	
+	/**
+	 * @brief Called when new audio data is received.
+	 * Each separate user's audio from the voice channel will arrive tagged with
+	 * their user id in the event, if a user can be attributed to the received audio.
+	 * 
+	 * @note Receiving audio for bots is not officially supported by discord.
+	 * 
+	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
+	 * The function signature for this event takes a single `const` reference of type voice_receive_t&, and returns void.
+	 */
+	event_router_t<voice_receive_t> on_voice_receive;
+
+	/**
+	 * @brief Called when new audio data is received, combined and mixed for all speaking users.
+	 * 
+	 * @note Receiving audio for bots is not officially supported by discord.
+	 * 
+	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
+	 * The function signature for this event takes a single `const` reference of type voice_receive_t&, and returns void.
+	 */
+	event_router_t<voice_receive_t> on_voice_receive_combined;
+	
+	/**
+	 * @brief Called when sending of audio passes over a track marker.
+	 * Track markers are arbitrarily placed "bookmarks" in the audio buffer, placed
+	 * by the bot developer. Each track marker can have a string value associated with it
+	 * which is specified in dpp::discord_voice_client::insert_marker and returned to this
+	 * event.
+	 *
+	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
+	 * The function signature for this event takes a single `const` reference of type voice_track_marker_t&, and returns void.
+	 */
+	event_router_t<voice_track_marker_t> on_voice_track_marker;
+
+	
+	/**
+	 * @brief Called when a new stage instance is created on a stage channel.
+	 *
+	 * @warning If the cache policy has disabled guild caching, the pointer to the guild in this event may be nullptr.
+	 *
+	 * @see https://discord.com/developers/docs/topics/gateway-events#stage-instance-create
+	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
+	 * The function signature for this event takes a single `const` reference of type stage_instance_create_t&, and returns void.
+	 */
+	event_router_t<stage_instance_create_t> on_stage_instance_create;
+
+	
+	/**
+	 * @brief Called when a stage instance is updated.
+	 *
+	 * @warning If the cache policy has disabled guild caching, the pointer to the guild in this event may be nullptr.
+	 *
+	 * @see https://discord.com/developers/docs/topics/gateway-events#stage-instance-update
+	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
+	 * The function signature for this event takes a single `const` reference of type stage_instance_update_t&, and returns void.
+	 */
+	event_router_t<stage_instance_update_t> on_stage_instance_update;
+
+	
+	/**
+	 * @brief Called when an existing stage instance is deleted from a stage channel.
+	 *
+	 * @warning If the cache policy has disabled guild caching, the pointer to the guild in this event may be nullptr.
+	 *
+	 * @see https://discord.com/developers/docs/topics/gateway-events#stage-instance-delete
+	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
+	 * The function signature for this event takes a single `const` reference of type stage_instance_delete_t&, and returns void.
+	 */
+	event_router_t<stage_instance_delete_t> on_stage_instance_delete;
+
+	/**
+	 * @brief Called when a user subscribes to an SKU.
+	 *
+	 * @see https://discord.com/developers/docs/monetization/entitlements#new-entitlement
+	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
+	 * The function signature for this event takes a single `const` reference of type channel_delete_t&, and returns void.
+	 */
+	event_router_t<entitlement_create_t> on_entitlement_create;
+
+
+	/**
+	 * @brief Called when a user's subscription renews for the next billing period.
+	 * The `ends_at` field will have an updated value with the new expiration date.
+	 *
+	 * @see https://discord.com/developers/docs/monetization/entitlements#updated-entitlement
+	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
+	 * The function signature for this event takes a single `const` reference of type channel_update_t&, and returns void.
+	 */
+	event_router_t<entitlement_update_t> on_entitlement_update;
+
+	/**
+	 * @brief Called when a user's entitlement is deleted.
+	 * These events are infrequent and only occur if Discord issues a refund, or Discord removes an entitlement via "internal tooling".
+	 * Entitlements **are not deleted** when they expire.
+	 *
+	 * @see https://discord.com/developers/docs/monetization/entitlements#deleted-entitlement
+	 * @note Use operator() to attach a lambda to this event, and the detach method to detach the listener using the returned ID.
+	 * The function signature for this event takes a single `const` reference of type channel_update_t&, and returns void.
+	 */
+	event_router_t<entitlement_delete_t> on_entitlement_delete;
+	
+	/**
+	 * @brief Post a REST request. Where possible use a helper method instead like message_create
+	 *
+	 * @param endpoint Endpoint to post to, e.g. /api/guilds
+	 * @param major_parameters Major parameters for the endpoint e.g. a guild id
+	 * @param parameters Minor parameters for the API request
+	 * @param method Method, e.g. GET, POST
+	 * @param postdata Post data (usually JSON encoded)
+	 * @param callback Function to call when the HTTP call completes. The callback parameter will contain amongst other things, the decoded json.
+	 * @param filename Filename to post for POST requests (for uploading files)
+	 * @param filecontent File content to post for POST requests (for uploading files)
+	 * @param filemimetype File content to post for POST requests (for uploading files)
+	 * @param protocol HTTP protocol to use (1.0 and 1.1 are supported)
+	 */
+	void post_rest(const std::string &endpoint, const std::string &major_parameters, const std::string &parameters, http_method method, const std::string &postdata, json_encode_t callback, const std::string &filename = "", const std::string &filecontent = "", const std::string &filemimetype = "", const std::string& protocol = "1.1");
+
+	/**
+	 * @brief Post a multipart REST request. Where possible use a helper method instead like message_create
+	 *
+	 * @param endpoint Endpoint to post to, e.g. /api/guilds
+	 * @param major_parameters Major parameters for the endpoint e.g. a guild id
+	 * @param parameters Minor parameters for the API request
+	 * @param method Method, e.g. GET, POST
+	 * @param postdata Post data (usually JSON encoded)
+	 * @param callback Function to call when the HTTP call completes. The callback parameter will contain amongst other things, the decoded json.
+	 * @param file_data List of files to post for POST requests (for uploading files)
+	 */
+	void post_rest_multipart(const std::string &endpoint, const std::string &major_parameters, const std::string &parameters, http_method method, const std::string &postdata, json_encode_t callback, const std::vector<message_file_data> &file_data = {});
+
+	/**
+	 * @brief Make a HTTP(S) request. For use when wanting asynchronous access to HTTP APIs outside of Discord.
+	 *
+	 * @param url Full URL to post to, e.g. https://api.somewhere.com/v1/foo/
+	 * @param method Method, e.g. GET, POST
+	 * @param callback Function to call when the HTTP call completes. No processing is done on the returned data.
+	 * @param postdata POST data
+	 * @param mimetype MIME type of POST data
+	 * @param headers Headers to send with the request
+	 * @param protocol HTTP protocol to use (1.1 and 1.0 are supported)
+	 */
+	void request(const std::string &url, http_method method, http_completion_event callback, const std::string &postdata = "", const std::string &mimetype = "text/plain", const std::multimap<std::string, std::string> &headers = {}, const std::string &protocol = "1.1");
+
+	/**
+	 * @brief Respond to a slash command
+	 *
+	 * @see https://discord.com/developers/docs/interactions/receiving-and-responding#create-interaction-response
+	 * @param interaction_id Interaction id to respond to
+	 * @param token Token for the interaction webhook
+	 * @param r Response to send
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void interaction_response_create(snowflake interaction_id, const std::string &token, const interaction_response &r, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Edit response to a slash command
+	 *
+	 * @see https://discord.com/developers/docs/interactions/receiving-and-responding#edit-original-interaction-response
+	 * @param token Token for the interaction webhook
+	 * @param m Message to send
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void interaction_response_edit(const std::string &token, const message &m, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Get the original response to a slash command
+	 *
+	 * @see https://discord.com/developers/docs/interactions/receiving-and-responding#get-original-interaction-response
+	 * @param token Token for the interaction webhook
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::message object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void interaction_response_get_original(const std::string &token, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Create a followup message for an interaction
+	 *
+	 * @see https://discord.com/developers/docs/interactions/receiving-and-responding#create-interaction-response
+	 * @param token Token for the interaction webhook
+	 * @param m followup message to create
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void interaction_followup_create(const std::string &token, const message &m, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Edit original followup message for an interaction
+	 * This is an alias for cluster::interaction_response_edit
+	 * @see cluster::interaction_response_edit
+	 * 
+	 * @param token Token for the interaction webhook
+	 * @param m message to edit, the ID should be set
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void interaction_followup_edit_original(const std::string &token, const message &m, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Delete the initial interaction response
+	 *
+	 * @see https://discord.com/developers/docs/interactions/receiving-and-responding#delete-original-interaction-response
+	 * @param token Token for the interaction webhook
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void interaction_followup_delete(const std::string &token, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Edit followup message for an interaction
+	 * The message ID in the message you pass should be correctly set to that of a followup message you previously sent
+	 *
+	 * @see https://discord.com/developers/docs/interactions/receiving-and-responding#edit-followup-message
+	 * @param token Token for the interaction webhook
+	 * @param m message to edit, the ID should be set
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void interaction_followup_edit(const std::string &token, const message &m, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Get the followup message for an interaction
+	 *
+	 * @see https://discord.com/developers/docs/interactions/receiving-and-responding#get-followup-message
+	 * @param token Token for the interaction webhook
+	 * @param message_id message to retrieve
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::message object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void interaction_followup_get(const std::string &token, snowflake message_id, command_completion_event_t callback);
+	
+	/**
+	 * @brief Get the original followup message for an interaction
+	 * This is an alias for cluster::interaction_response_get_original
+	 * @see cluster::interaction_response_get_original
+	 * 
+	 * @param token Token for the interaction webhook
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::message object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void interaction_followup_get_original(const std::string &token, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Create a global slash command (a bot can have a maximum of 100 of these).
+	 * 
+	 * @see https://discord.com/developers/docs/interactions/application-commands#create-global-application-command
+	 * @param s Slash command to create
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::slashcommand object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void global_command_create(const slashcommand &s, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Get a global slash command
+	 *
+	 * @see https://discord.com/developers/docs/interactions/application-commands#get-global-application-command
+	 * @param id The ID of the slash command
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::slashcommand object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void global_command_get(snowflake id, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Get the audit log for a guild
+	 *
+	 * @see https://discord.com/developers/docs/resources/audit-log#get-guild-audit-log
+	 * @param guild_id Guild to get the audit log of
+	 * @param user_id Entries from a specific user ID. Set this to `0` will fetch any user
+	 * @param action_type Entries for a specific dpp::audit_type. Set this to `0` will fetch any type
+	 * @param before Entries with ID less than a specific audit log entry ID. Used for paginating
+	 * @param after Entries with ID greater than a specific audit log entry ID. Used for paginating
+	 * @param limit Maximum number of entries (between 1-100) to return
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::auditlog object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void guild_auditlog_get(snowflake guild_id, snowflake user_id, uint32_t action_type, snowflake before, snowflake after, uint32_t limit, command_completion_event_t callback);
+
+	/**
+	 * @brief Create a slash command local to a guild
+	 *
+	 * @see https://discord.com/developers/docs/interactions/application-commands#create-guild-application-command
+	 * @note Creating a command with the same name as an existing command for your application will overwrite the old command.
+	 * @param s Slash command to create
+	 * @param guild_id Guild ID to create the slash command in
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::slashcommand object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void guild_command_create(const slashcommand &s, snowflake guild_id, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Create/overwrite guild slash commands.
+	 * Any existing guild slash commands on this guild will be deleted and replaced with these.
+	 *
+	 * @see https://discord.com/developers/docs/interactions/application-commands#bulk-overwrite-guild-application-commands
+	 * @param commands Vector of slash commands to create/update.
+	 * New guild commands will be available in the guild immediately. If the command did not already exist, it will count toward daily application command create limits.
+	 * @param guild_id Guild ID to create/update the slash commands in
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::slashcommand_map object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void guild_bulk_command_create(const std::vector<slashcommand> &commands, snowflake guild_id, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Delete all existing guild slash commands.
+	 * 
+	 * @see https://discord.com/developers/docs/interactions/application-commands#bulk-overwrite-global-application-commands
+	 * @param guild_id Guild ID to delete the slash commands in.
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::slashcommand_map object in confirmation_callback_t::value **which will be empty, meaning there are no commands**. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void guild_bulk_command_delete(snowflake guild_id, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Create/overwrite global slash commands.
+	 * Any existing global slash commands will be deleted and replaced with these.
+	 *
+	 * @see https://discord.com/developers/docs/interactions/application-commands#bulk-overwrite-global-application-commands
+	 * @param commands Vector of slash commands to create/update.
+	 * overwriting existing commands that are registered globally for this application.
+	 * Commands that do not already exist will count toward daily application command create limits.
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::slashcommand_map object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void global_bulk_command_create(const std::vector<slashcommand> &commands, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Delete all existing global slash commands.
+	 * 
+	 * @see https://discord.com/developers/docs/interactions/application-commands#bulk-overwrite-global-application-commands
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::slashcommand_map object in confirmation_callback_t::value **which will be empty, meaning there are no commands**. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void global_bulk_command_delete(command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Edit a global slash command (a bot can have a maximum of 100 of these)
+	 *
+	 * @see https://discord.com/developers/docs/interactions/application-commands#edit-global-application-command
+	 * @param s Slash command to change
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void global_command_edit(const slashcommand &s, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Get a slash command of a guild
+	 *
+	 * @see https://discord.com/developers/docs/interactions/application-commands#get-guild-application-command
+	 * @note The returned slash commands will not have permissions set, you need to use a permissions getter e.g. dpp::guild_commands_get_permissions to get the guild command permissions
+	 * @param id The ID of the slash command
+	 * @param guild_id Guild ID to get the slash command from
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::slashcommand object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void guild_command_get(snowflake id, snowflake guild_id, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Edit a slash command local to a guild
+	 *
+	 * @see https://discord.com/developers/docs/interactions/application-commands#edit-guild-application-command
+	 * @param s Slash command to edit
+	 * @param guild_id Guild ID to edit the slash command in
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void guild_command_edit(const slashcommand &s, snowflake guild_id, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Edit slash command permissions of a guild
+	 *
+	 * @see https://discord.com/developers/docs/interactions/application-commands#edit-application-command-permissions
+	 * @note You can only add up to 10 permission overwrites for a command
+	 * @param s Slash command to edit the permissions for
+	 * @param guild_id Guild ID to edit the slash command in
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void guild_command_edit_permissions(const slashcommand &s, snowflake guild_id, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Get the permissions for a slash command of a guild
+	 *
+	 * @see https://discord.com/developers/docs/interactions/application-commands#get-application-command-permissions
+	 * @param id The ID of the slash command to get the permissions for
+	 * @param guild_id Guild ID to get the permissions of
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::guild_command_permissions object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void guild_command_get_permissions(snowflake id, snowflake guild_id, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Edit/Overwrite the permissions of all existing slash commands in a guild
+	 *
+	 * @note You can only add up to 10 permission overwrites for a command
+	 *
+	 * @see https://discord.com/developers/docs/interactions/application-commands#batch-edit-application-command-permissions
+	 * @warning The endpoint will overwrite all existing permissions for all commands of the application in a guild, including slash commands, user commands, and message commands. Meaning that if you forgot to pass a slash command, the permissions of it might be removed.
+	 * @param commands A vector of slash commands to edit/overwrite the permissions for
+	 * @param guild_id Guild ID to edit permissions of the slash commands in
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::guild_command_permissions_map object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 * @deprecated This has been disabled with updates to Permissions v2. You can use guild_command_edit_permissions instead
+	 */
+	void guild_bulk_command_edit_permissions(const std::vector<slashcommand> &commands, snowflake guild_id, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Delete a global slash command (a bot can have a maximum of 100 of these)
+	 *
+	 * @see https://discord.com/developers/docs/interactions/application-commands#delete-global-application-command
+	 * @param id Slash command to delete
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void global_command_delete(snowflake id, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Delete a slash command local to a guild
+	 *
+	 * @see https://discord.com/developers/docs/interactions/application-commands#delete-guild-application-command
+	 * @param id Slash command to delete
+	 * @param guild_id Guild ID to delete the slash command in
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void guild_command_delete(snowflake id, snowflake guild_id, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Get the application's slash commands for a guild
+	 *
+	 * @see https://discord.com/developers/docs/interactions/application-commands#get-guild-application-commands
+	 * @note The returned slash commands will not have permissions set, you need to use a permissions getter e.g. dpp::guild_commands_get_permissions to get the guild command permissions
+	 * @param guild_id Guild ID to get the slash commands for
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::slashcommand_map object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void guild_commands_get(snowflake guild_id, command_completion_event_t callback);
+
+	/**
+	 * @brief Get all slash command permissions of a guild
+	 *
+	 * @see https://discord.com/developers/docs/interactions/application-commands#get-application-command-permissions
+	 * @param guild_id Guild ID to get the slash commands permissions for
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::guild_command_permissions_map object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void guild_commands_get_permissions(snowflake guild_id, command_completion_event_t callback);
+
+	/**
+	 * @brief Get the application's global slash commands
+	 *
+	 * @see https://discord.com/developers/docs/interactions/application-commands#get-global-application-commands
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::slashcommand_map object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void global_commands_get(command_completion_event_t callback);
+
+	/**
+	 * @brief Create a direct message, also create the channel for the direct message if needed
+	 *
+	 * @see https://discord.com/developers/docs/resources/user#create-dm
+	 * @see https://discord.com/developers/docs/resources/channel#create-message
+	 * @param user_id User ID of user to send message to
+	 * @param m Message object
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::message object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void direct_message_create(snowflake user_id, const message &m, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Get a message
+	 *
+	 * @see https://discord.com/developers/docs/resources/channel#get-channel-message
+	 * @param message_id Message ID
+	 * @param channel_id Channel ID
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::message object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void message_get(snowflake message_id, snowflake channel_id, command_completion_event_t callback);
+
+	/**
+	 * @brief Get multiple messages.
+	 * 
+	 * This function will attempt to fetch as many messages as possible using multiple API calls if needed.
+	 *
+	 * @see https://discord.com/developers/docs/resources/channel#get-channel-messages
+	 * @param channel_id Channel ID to retrieve messages for
+	 * @param around Messages should be retrieved around this ID if this is set to non-zero
+	 * @param before Messages before this ID should be retrieved if this is set to non-zero
+	 * @param after Messages after this ID should be retrieved if this is set to non-zero
+	 * @param limit This number of messages maximum should be returned, up to a maximum of 100.
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::message_map object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void messages_get(snowflake channel_id, snowflake around, snowflake before, snowflake after, uint64_t limit, command_completion_event_t callback);
+
+	/**
+	 * @brief Search for messages in a guild
+	 *
+	 * @see https://discord.com/developers/docs/resources/message#search-guild-messages
+	 * @param guild_id Guild ID to search in
+	 * @param params Search parameters
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::message_search_result object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void guild_messages_search(snowflake guild_id, const message_search_params& params, command_completion_event_t callback);
+
+	/**
+	 * @brief Send a message to a channel. The callback function is called when the message has been sent
+	 *
+	 * @see https://discord.com/developers/docs/resources/channel#create-message
+	 * @param m Message to send
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::message object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void message_create(const struct message &m, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Crosspost a message. The callback function is called when the message has been sent
+	 *
+	 * @see https://discord.com/developers/docs/resources/channel#crosspost-message
+	 * @param message_id Message to crosspost
+	 * @param channel_id Channel ID to crosspost from
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::message object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void message_crosspost(snowflake message_id, snowflake channel_id, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Edit a message on a channel. The callback function is called when the message has been edited
+	 *
+	 * @see https://discord.com/developers/docs/resources/channel#edit-message
+	 * @param m Message to edit
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::message object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void message_edit(const struct message &m, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Edit the flags of a message on a channel. The callback function is called when the message has been edited
+	 *
+	 * @param m Message to edit the flags of
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::message object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void message_edit_flags(const struct message &m, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Add a reaction to a message. The reaction string must be either an `emojiname:id` or a unicode character.
+	 *
+	 * @see https://discord.com/developers/docs/resources/channel#create-reaction
+	 * @param m Message to add a reaction to
+	 * @param reaction Reaction to add. Emojis should be in the form emojiname:id
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void message_add_reaction(const struct message &m, const std::string &reaction, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Delete own reaction from a message. The reaction string must be either an `emojiname:id` or a unicode character.
+	 *
+	 * @see https://discord.com/developers/docs/resources/channel#delete-own-reaction
+	 * @param m Message to delete own reaction from
+	 * @param reaction Reaction to delete. The reaction should be in the form emojiname:id
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void message_delete_own_reaction(const struct message &m, const std::string &reaction, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Delete a user's reaction from a message. The reaction string must be either an `emojiname:id` or a unicode character
+	 *
+	 * @see https://discord.com/developers/docs/resources/channel#delete-user-reaction
+	 * @param m Message to delete a user's reaction from
+	 * @param user_id User ID who's reaction you want to remove
+	 * @param reaction Reaction to remove. Reactions should be in the form emojiname:id
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void message_delete_reaction(const struct message &m, snowflake user_id, const std::string &reaction, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Get reactions on a message for a particular emoji. The reaction string must be either an `emojiname:id` or a unicode character
+	 *
+	 * @see https://discord.com/developers/docs/resources/channel#get-reactions
+	 * @param m Message to get reactions for
+	 * @param reaction Reaction should be in the form emojiname:id or a unicode character
+	 * @param before Reactions before this ID should be retrieved if this is set to non-zero
+	 * @param after Reactions before this ID should be retrieved if this is set to non-zero
+	 * @param limit This number of reactions maximum should be returned
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::user_map object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void message_get_reactions(const struct message &m, const std::string &reaction, snowflake before, snowflake after, snowflake limit, command_completion_event_t callback);
+
+	/**
+	 * @brief Delete all reactions on a message
+	 *
+	 * @see https://discord.com/developers/docs/resources/channel#delete-all-reactions
+	 * @param m Message to delete reactions from
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void message_delete_all_reactions(const struct message &m, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Delete all reactions on a message using a particular emoji. The reaction string must be either an `emojiname:id` or a unicode character
+	 *
+	 * @see https://discord.com/developers/docs/resources/channel#delete-all-reactions-for-emoji
+	 * @param m Message to delete reactions from
+	 * @param reaction Reaction to delete, in the form emojiname:id or a unicode character
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void message_delete_reaction_emoji(const struct message &m, const std::string &reaction, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Add a reaction to a message by id. The reaction string must be either an `emojiname:id` or a unicode character.
+	 *
+	 * @see https://discord.com/developers/docs/topics/gateway#message-reaction-add
+	 * @param message_id Message to add reactions to
+	 * @param channel_id Channel to add reactions to
+	 * @param reaction Reaction to add. Emojis should be in the form emojiname:id
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void message_add_reaction(snowflake message_id, snowflake channel_id, const std::string &reaction, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Delete own reaction from a message by id. The reaction string must be either an `emojiname:id` or a unicode character.
+	 *
+	 * @see https://discord.com/developers/docs/resources/channel#delete-own-reaction
+	 * @param message_id Message to delete reactions from
+	 * @param channel_id Channel to delete reactions from
+	 * @param reaction Reaction to delete. The reaction should be in the form emojiname:id
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void message_delete_own_reaction(snowflake message_id, snowflake channel_id, const std::string &reaction, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Delete a user's reaction from a message by id. The reaction string must be either an `emojiname:id` or a unicode character
+	 *
+	 * @see https://discord.com/developers/docs/resources/channel#delete-user-reaction
+	 * @param message_id Message to delete reactions from
+	 * @param channel_id Channel to delete reactions from
+	 * @param user_id User ID who's reaction you want to remove
+	 * @param reaction Reaction to remove. Reactions should be in the form emojiname:id
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void message_delete_reaction(snowflake message_id, snowflake channel_id, snowflake user_id, const std::string &reaction, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Get reactions on a message for a particular emoji by id. The reaction string must be either an `emojiname:id` or a unicode character
+	 *
+	 * @see https://discord.com/developers/docs/resources/channel#get-reactions
+	 * @param message_id Message to get reactions for
+	 * @param channel_id Channel to get reactions for
+	 * @param reaction Reaction should be in the form emojiname:id or a unicode character
+	 * @param before Reactions before this ID should be retrieved if this is set to non-zero
+	 * @param after Reactions before this ID should be retrieved if this is set to non-zero
+	 * @param limit This number of reactions maximum should be returned
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::user_map object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void message_get_reactions(snowflake message_id, snowflake channel_id, const std::string &reaction, snowflake before, snowflake after, snowflake limit, command_completion_event_t callback);
+
+	/**
+	 * @brief Delete all reactions on a message by id
+	 *
+	 * @see https://discord.com/developers/docs/resources/channel#delete-all-reactions
+	 * @param message_id Message to delete reactions from
+	 * @param channel_id Channel to delete reactions from
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void message_delete_all_reactions(snowflake message_id, snowflake channel_id, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Delete all reactions on a message using a particular emoji by id. The reaction string must be either an `emojiname:id` or a unicode character
+	 *
+	 * @see https://discord.com/developers/docs/resources/channel#delete-all-reactions-for-emoji
+	 * @param message_id Message to delete reactions from
+	 * @param channel_id Channel to delete reactions from
+	 * @param reaction Reaction to delete, in the form emojiname:id or a unicode character
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void message_delete_reaction_emoji(snowflake message_id, snowflake channel_id, const std::string &reaction, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Delete a message from a channel. The callback function is called when the message has been edited
+	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
+	 *
+	 * @see https://discord.com/developers/docs/resources/channel#delete-message
+	 * @param message_id Message ID to delete
+	 * @param channel_id Channel to delete from
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void message_delete(snowflake message_id, snowflake channel_id, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Bulk delete messages from a channel. The callback function is called when the message has been edited
+	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
+	 *
+	 * @note If any message provided older than 2 weeks or any duplicate message ID, it will fail.
+	 *
+	 * @see https://discord.com/developers/docs/resources/channel#bulk-delete-messages
+	 * @param message_ids List of message IDs to delete (at least 2 and at most 100 message IDs)
+	 * @param channel_id Channel to delete from
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void message_delete_bulk(const std::vector<snowflake> &message_ids, snowflake channel_id, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Get a list of users that voted for this specific answer.
+	 *
+	 * @param m Message that contains the poll to retrieve the answers from
+	 * @param answer_id ID of the answer to retrieve votes from (see poll_answer::answer_id)
+	 * @param after Users after this ID should be retrieved if this is set to non-zero
+	 * @param limit This number of users maximum should be returned, up to 100
+	 * @param callback Function to call when the API call completes.
+	 * @see https://discord.com/developers/docs/resources/poll#get-answer-voters
+	 * On success the callback will contain a dpp::user_map object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void poll_get_answer_voters(const message& m, uint32_t answer_id, snowflake after, uint64_t limit, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Get a list of users that voted for this specific answer.
+	 *
+	 * @param message_id ID of the message with the poll to retrieve the answers from
+	 * @param channel_id ID of the channel with the poll to retrieve the answers from
+	 * @param answer_id ID of the answer to retrieve votes from (see poll_answer::answer_id)
+	 * @param after Users after this ID should be retrieved if this is set to non-zero
+	 * @param limit This number of users maximum should be returned, up to 100
+	 * @param callback Function to call when the API call completes.
+	 * @see https://discord.com/developers/docs/resources/poll#get-answer-voters
+	 * On success the callback will contain a dpp::user_map object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void poll_get_answer_voters(snowflake message_id, snowflake channel_id, uint32_t answer_id, snowflake after, uint64_t limit, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Immediately end a poll.
+	 *
+	 * @param m Message that contains the poll
+	 * @param callback Function to call when the API call completes.
+	 * @see https://discord.com/developers/docs/resources/poll#end-poll
+	 * On success the callback will contain a dpp::message object representing the message containing the poll in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void poll_end(const message &m, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Immediately end a poll.
+	 *
+	 * @param message_id ID of the message with the poll to end
+	 * @param channel_id ID of the channel with the poll to end
+	 * @param callback Function to call when the API call completes.
+	 * @see https://discord.com/developers/docs/resources/poll#end-poll
+	 * On success the callback will contain a dpp::message object representing the message containing the poll in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void poll_end(snowflake message_id, snowflake channel_id, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Get a channel
+	 *
+	 * @see https://discord.com/developers/docs/resources/channel#get-channel
+	 * @param c Channel ID to retrieve
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::channel object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void channel_get(snowflake c, command_completion_event_t callback);
+
+	/**
+	 * @brief Get all channels for a guild
+	 *
+	 * @see https://discord.com/developers/docs/resources/channel#get-channels
+	 * @param guild_id Guild ID to retrieve channels for
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::channel_map object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void channels_get(snowflake guild_id, command_completion_event_t callback);
+
+	/**
+	 * @brief Create a channel
+	 * 
+	 * Create a new channel object for the guild. Requires the `MANAGE_CHANNELS` permission. If setting permission overwrites,
+	 * only permissions your bot has in the guild can be allowed/denied. Setting `MANAGE_ROLES` permission in channels is only possible
+	 * for guild administrators. Returns the new channel object on success. Fires a `Channel Create Gateway` event.
+	 * 
+	 * All parameters to this endpoint are optional excluding `name`
+	 * 
+	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
+	 * @see https://discord.com/developers/docs/resources/channel#create-channel
+	 * @param c Channel to create
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::channel object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void channel_create(const class channel &c, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Edit a channel
+	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
+	 * @see https://discord.com/developers/docs/resources/channel#modify-channel
+	 * @param c Channel to edit/update
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::channel object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void channel_edit(const class channel &c, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Edit multiple channels positions
+	 * 
+	 * Modify the positions of a set of channel objects for the guild.
+	 * Requires `MANAGE_CHANNELS` permission. Fires multiple `Channel Update Gateway` events.
+	 * Only channels to be modified are required.
+	 *
+	 * @see https://discord.com/developers/docs/resources/guild#modify-guild-channel-positions
+	 * @param c Channel to change the position for
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void channel_edit_positions(const std::vector<channel> &c, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Edit a channel's permissions
+	 *
+	 * @see https://discord.com/developers/docs/resources/channel#edit-channel-permissions
+	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
+	 * @param c Channel to set permissions for
+	 * @param overwrite_id Overwrite to change (a user or role ID)
+	 * @param allow Bitmask of allowed permissions (refer to enum dpp::permissions)
+	 * @param deny Bitmask of denied permissions (refer to enum dpp::permissions)
+	 * @param member true if the overwrite_id is a user id, false if it is a channel id
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void channel_edit_permissions(const class channel &c, const snowflake overwrite_id, const uint64_t allow, const uint64_t deny, const bool member, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Edit a channel's permissions
+	 *
+	 * @see https://discord.com/developers/docs/resources/channel#edit-channel-permissions
+	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
+	 * @param channel_id ID of the channel to set permissions for
+	 * @param overwrite_id Overwrite to change (a user or role ID)
+	 * @param allow Bitmask of allowed permissions (refer to enum dpp::permissions)
+	 * @param deny Bitmask of denied permissions (refer to enum dpp::permissions)
+	 * @param member true if the overwrite_id is a user id, false if it is a channel id
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void channel_edit_permissions(const snowflake channel_id, const snowflake overwrite_id, const uint64_t allow, const uint64_t deny, const bool member, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Delete a channel
+	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
+	 * @see https://discord.com/developers/docs/resources/channel#deleteclose-channel
+	 * @param channel_id Channel id to delete
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void channel_delete(snowflake channel_id, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Get details about an invite
+	 *
+	 * @see https://discord.com/developers/docs/resources/invite#get-invite
+	 * @param invite_code Invite code to get information on
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::invite object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void invite_get(const std::string &invite_code, command_completion_event_t callback);
+
+	/**
+	 * @brief Delete an invite
+	 *
+	 * @see https://discord.com/developers/docs/resources/invite#delete-invite
+	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
+	 * @param invite Invite code to delete
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::invite object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void invite_delete(const std::string &invite, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Get invites for a channel
+	 *
+	 * @see https://discord.com/developers/docs/resources/invite#get-invites
+	 * @param c Channel to get invites for
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::invite_map object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void channel_invites_get(const class channel &c, command_completion_event_t callback);
+
+	/**
+	 * @brief Create invite for a channel
+	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
+	 * @see https://discord.com/developers/docs/resources/channel#create-channel-invite
+	 * @param c Channel to create an invite on
+	 * @param i Invite to create
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::invite object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void channel_invite_create(const class channel &c, const class invite &i, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Get a channel's pins
+	 * @see https://discord.com/developers/docs/resources/channel#get-pinned-messages
+	 * @param channel_id Channel ID to get pins for
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::message_pin_map object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void channel_pins_get(snowflake channel_id, command_completion_event_t callback);
+
+	/**
+	 * @brief Get a channel's pins
+	 * @see https://discord.com/developers/docs/resources/channel#get-pinned-messages
+	 * @param channel_id Channel ID to get pins for
+	 * @param before Get messages pinned before this timestamp.
+	 * @param limit Max number of pins to return (1-50). Defaults to 50 if not set.
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::message_pin_map object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void channel_pins_get(snowflake channel_id, std::optional<time_t> before, std::optional<uint64_t> limit, command_completion_event_t callback);
+
+	/**
+	 * @brief Adds a recipient to a Group DM using their access token
+	 * @see https://discord.com/developers/docs/resources/channel#group-dm-add-recipient
+	 * @param channel_id Channel id to add group DM recipients to
+	 * @param user_id User ID to add
+	 * @param access_token Access token from OAuth2
+	 * @param nick Nickname of user to apply to the chat
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void gdm_add(snowflake channel_id, snowflake user_id, const std::string &access_token, const std::string &nick, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Removes a recipient from a Group DM
+	 * @see https://discord.com/developers/docs/resources/channel#group-dm-remove-recipient
+	 * @param channel_id Channel ID of group DM
+	 * @param user_id User ID to remove from group DM
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void gdm_remove(snowflake channel_id, snowflake user_id, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Remove a permission from a channel
+	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
+	 * @see https://discord.com/developers/docs/resources/channel#delete-channel-permission
+	 * @param c Channel to remove permission from
+	 * @param overwrite_id Overwrite to remove, user or channel ID
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void channel_delete_permission(const class channel &c, snowflake overwrite_id, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Follow an announcement (news) channel
+	 * @see https://discord.com/developers/docs/resources/channel#follow-news-channel
+	 * @param c Channel id to follow
+	 * @param target_channel_id Channel to subscribe the channel to
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void channel_follow_news(const class channel &c, snowflake target_channel_id, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Trigger channel typing indicator
+	 * @see https://discord.com/developers/docs/resources/channel#trigger-typing-indicator
+	 * @param c Channel to set as typing on
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void channel_typing(const class channel &c, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Trigger channel typing indicator
+	 * @see https://discord.com/developers/docs/resources/channel#trigger-typing-indicator
+	 * @param cid Channel ID to set as typing on
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void channel_typing(snowflake cid, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Pin a message
+	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
+	 * @see https://discord.com/developers/docs/resources/channel#pin-message
+	 * @param channel_id Channel id to pin message on
+	 * @param message_id Message id to pin message on
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void message_pin(snowflake channel_id, snowflake message_id, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Unpin a message
+	 * @see https://discord.com/developers/docs/resources/channel#unpin-message
+	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
+	 * @param channel_id Channel id to unpin message on
+	 * @param message_id Message id to unpin message on
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void message_unpin(snowflake channel_id, snowflake message_id, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Get a guild
+	 * 
+	 * Returns the guild object for the given id. This endpoint will also return approximate_member_count and approximate_presence_count
+	 * for the guild.
+	 * @see https://discord.com/developers/docs/resources/guild#get-guild
+	 * @param g Guild ID to retrieve
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::guild object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void guild_get(snowflake g, command_completion_event_t callback);
+
+	/**
+	 * @brief Get a guild preview. Returns a guild object but only a subset of the fields will be populated.
+	 * 
+	 * Returns the guild preview object for the given id `g`. If the user is not in the guild, then the guild
+	 * must be lurkable (it must be Discoverable or have a live public stage).
+	 * @see https://discord.com/developers/docs/resources/guild#get-guild-preview
+	 * @param g Guild ID to retrieve
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::guild object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void guild_get_preview(snowflake g, command_completion_event_t callback);
+
+	/**
+	 * @brief Get a guild member
+	 * @see https://discord.com/developers/docs/resources/guild#get-guild-member
+	 * @param guild_id Guild ID to get member for
+	 * @param user_id User ID of member to get
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::guild_member object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void guild_get_member(snowflake guild_id, snowflake user_id, command_completion_event_t callback);
+
+	/**
+	 * @brief Search for guild members based on whether their username or nickname starts with the given string.
+	 *
+	 * @note This endpoint is restricted according to whether the `GUILD_MEMBERS` Privileged Intent is enabled for your application.
+	 * @see https://discord.com/developers/docs/resources/guild#search-guild-members
+	 * @param guild_id Guild ID to search in
+	 * @param query Query string to match username(s) and nickname(s) against
+	 * @param limit max number of members to return (1-1000)
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::guild_member_map object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void guild_search_members(snowflake guild_id, const std::string& query, uint16_t limit, command_completion_event_t callback);
+
+	/**
+	 * @brief Get all guild members
+	 * 
+	 * @note This endpoint is restricted according to whether the `GUILD_MEMBERS` Privileged Intent is enabled for your application.
+	 * @see https://discord.com/developers/docs/resources/guild#get-guild-members
+	 * @param guild_id Guild ID to get all members for
+	 * @param limit max number of members to return (1-1000)
+	 * @param after the highest user id in the previous page
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::guild_member_map object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void guild_get_members(snowflake guild_id, uint16_t limit, snowflake after, command_completion_event_t callback);
+
+	/**
+	 * @brief Add guild member. Needs a specific oauth2 scope, from which you get the access_token.
+	 * 
+	 * Adds a user to the guild, provided you have a valid oauth2 access token for the user with the guilds.join scope.
+	 * Returns the guild_member, which is defaulted if the user is already a member of the guild. Fires a `Guild Member Add` Gateway event.
+	 * 
+	 * For guilds with Membership Screening enabled, this endpoint will default to adding new members as pending in the guild member object.
+	 * Members that are pending will have to complete membership screening before they become full members that can talk.
+	 * 
+	 * @note All parameters to this endpoint except for access_token are optional.
+	 * The bot must be a member of the guild with `CREATE_INSTANT_INVITE` permission.
+	 * @see https://discord.com/developers/docs/resources/guild#add-guild-member
+	 * @param gm Guild member to add
+	 * @param access_token Access token from Oauth2 scope
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::guild_member object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void guild_add_member(const guild_member& gm, const std::string &access_token, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Edit the properties of an existing guild member
+	 * 
+	 * Modify attributes of a guild member. Returns the guild_member. Fires a `Guild Member Update` Gateway event.
+	 * To remove a timeout, set the `communication_disabled_until` to a non-zero time in the past, e.g. 1.
+	 * When moving members to channels, the API user must have permissions to both connect to the channel and have the `MOVE_MEMBERS` permission.
+	 * For moving and disconnecting users from voice, use dpp::cluster::guild_member_move.
+	 * @see https://discord.com/developers/docs/resources/guild#modify-guild-member
+	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
+	 * @param gm Guild member to edit
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::guild_member object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void guild_edit_member(const guild_member& gm, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Moves the guild member to a other voice channel, if member is connected to one.
+	 * Set the `channel_id` to `0` to disconnect the user.
+	 *
+	 * Fires a `Guild Member Update` Gateway event.
+	 * @note When moving members to channels, the API user __must__ have permissions to both connect to the channel and have the `MOVE_MEMBERS` permission.
+	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
+	 * @see https://discord.com/developers/docs/resources/guild#modify-guild-member
+	 * @param channel_id Id of the channel to which the user is used. Set to `0` to disconnect the user
+	 * @param guild_id Guild id to which the user is connected
+	 * @param user_id User id, who should be moved
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::guild_member object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void guild_member_move(const snowflake channel_id, const snowflake guild_id, const snowflake user_id, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Change current user nickname
+	 * 
+	 * Modifies the nickname of the current user in a guild.
+	 * Fires a `Guild Member Update` Gateway event.
+	 * 
+	 * @deprecated Deprecated in favor of Modify Current Member. Will be replaced by dpp::cluster::guild_current_member_edit
+	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
+	 * @see https://discord.com/developers/docs/resources/guild#modify-current-user-nick
+	 * @param guild_id Guild ID to change nickname on
+	 * @param nickname New nickname, or empty string to clear nickname
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void guild_set_nickname(snowflake guild_id, const std::string &nickname, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Add role to guild member
+	 * 
+	 * Adds a role to a guild member. Requires the `MANAGE_ROLES` permission.
+	 * Fires a `Guild Member Update` Gateway event.
+	 * @see https://discord.com/developers/docs/resources/guild#add-guild-member-role
+	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
+	 * @param guild_id Guild ID to add a role to
+	 * @param user_id User ID to add role to
+	 * @param role_id Role ID to add to the user
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void guild_member_add_role(snowflake guild_id, snowflake user_id, snowflake role_id, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Remove role from guild member
+	 * 
+	 * Removes a role from a guild member. Requires the `MANAGE_ROLES` permission.
+	 * Fires a `Guild Member Update` Gateway event.
+	 * @see https://discord.com/developers/docs/resources/guild#remove-guild-member-role
+	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
+	 * @param guild_id Guild ID to remove role from user on
+	 * @param user_id User ID to remove role from
+	 * @param role_id Role to remove
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 * @deprecated Use dpp::cluster::guild_member_remove_role instead
+	 */
+	void guild_member_delete_role(snowflake guild_id, snowflake user_id, snowflake role_id, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Remove role from guild member
+	 *
+	 * Removes a role from a guild member. Requires the `MANAGE_ROLES` permission.
+	 * Fires a `Guild Member Update` Gateway event.
+	 * @see https://discord.com/developers/docs/resources/guild#remove-guild-member-role
+	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
+	 * @param guild_id Guild ID to remove role from user on
+	 * @param user_id User ID to remove role from
+	 * @param role_id Role to remove
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void guild_member_remove_role(snowflake guild_id, snowflake user_id, snowflake role_id, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Remove (kick) a guild member
+	 * 
+	 * Remove a member from a guild. Requires `KICK_MEMBERS` permission.
+	 * Fires a `Guild Member Remove` Gateway event.
+	 * @see https://discord.com/developers/docs/resources/guild#remove-guild-member
+	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
+	 * @deprecated Replaced by dpp::cluster::guild_member_kick
+	 * @param guild_id Guild ID to kick member from
+	 * @param user_id User ID to kick
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void guild_member_delete(snowflake guild_id, snowflake user_id, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Remove (kick) a guild member
+	 *  
+	 * Remove a member from a guild. Requires `KICK_MEMBERS` permission.
+	 * Fires a `Guild Member Remove` Gateway event.
+	 * @see https://discord.com/developers/docs/resources/guild#remove-guild-member
+	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
+	 * @param guild_id Guild ID to kick member from
+	 * @param user_id User ID to kick
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void guild_member_kick(snowflake guild_id, snowflake user_id, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Set the timeout of a guild member
+	 *
+	 * Fires a `Guild Member Update` Gateway event.
+	 * @see https://discord.com/developers/docs/resources/guild#modify-guild-member
+	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
+	 * @param guild_id Guild ID to timeout the member in
+	 * @param user_id User ID to set the timeout for
+	 * @param communication_disabled_until The timestamp when the user's timeout will expire (up to 28 days in the future). Set to 0 to remove the timeout
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void guild_member_timeout(snowflake guild_id, snowflake user_id, time_t communication_disabled_until, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Remove the timeout of a guild member.
+	 * A shortcut for guild_member_timeout(guild_id, user_id, 0, callback)
+	 * Fires a `Guild Member Update` Gateway event.
+	 * @see https://discord.com/developers/docs/resources/guild#modify-guild-member
+	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
+	 * @param guild_id Guild ID to remove the member timeout from
+	 * @param user_id User ID to remove the timeout for
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void guild_member_timeout_remove(snowflake guild_id, snowflake user_id, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Add guild ban
+	 *
+	 * Create a guild ban, and optionally delete previous messages sent by the banned user.
+	 * Requires the `BAN_MEMBERS` permission. Fires a `Guild Ban Add` Gateway event.
+	 * @see https://discord.com/developers/docs/resources/guild#create-guild-ban
+	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
+	 * @param guild_id Guild ID to add ban to
+	 * @param user_id User ID to ban
+	 * @param delete_message_seconds How many seconds to delete messages for, between 0 and 604800 (7 days). Defaults to 0
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void guild_ban_add(snowflake guild_id, snowflake user_id, uint32_t delete_message_seconds = 0, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Delete guild ban
+	 * 
+	 * Remove the ban for a user. Requires the `BAN_MEMBERS` permissions.
+	 * Fires a Guild Ban Remove Gateway event.
+	 * @see https://discord.com/developers/docs/resources/guild#remove-guild-ban
+	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
+	 * @param guild_id Guild to delete ban from
+	 * @param user_id User ID to delete ban for
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void guild_ban_delete(snowflake guild_id, snowflake user_id, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Get guild ban list
+	 * 
+	 * Requires the `BAN_MEMBERS` permission.
+	 * @see https://discord.com/developers/docs/resources/guild#get-guild-bans
+	 * @note Provide a user ID to `before` and `after` for pagination. Users will always be returned in ascending order by the user ID. If both before and after are provided, only before is respected.
+	 * @param guild_id Guild ID to get bans for
+	 * @param before If non-zero, all bans for user ids before this user id will be returned up to the limit
+	 * @param after if non-zero, all bans for user ids after this user id will be returned up to the limit
+	 * @param limit the maximum number of bans to retrieve in this call up to a maximum of 1000
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::ban_map object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void guild_get_bans(snowflake guild_id, snowflake before, snowflake after, snowflake limit, command_completion_event_t callback);
+
+	/**
+	 * @brief Get single guild ban
+	 * 
+	 * Requires the `BAN_MEMBERS` permission.
+	 * @see https://discord.com/developers/docs/resources/guild#get-guild-ban
+	 * @param guild_id Guild ID to get ban for
+	 * @param user_id User ID of ban to retrieve
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::ban object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void guild_get_ban(snowflake guild_id, snowflake user_id, command_completion_event_t callback);
+
+	/**
+	 * @brief Get a template
+	 * @see https://discord.com/developers/docs/resources/guild-template#get-guild-template
+	 * @param code Template code
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::dtemplate object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void template_get(const std::string &code, command_completion_event_t callback);
+
+	/**
+	 * @brief Create a new guild based on a template.
+	 * @note This endpoint can be used only by bots in less than 10 guilds.
+	 * @see https://discord.com/developers/docs/resources/guild-template#create-guild-from-guild-template
+	 * @param code Template code to create guild from
+	 * @param name Guild name to create
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::guild object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void guild_create_from_template(const std::string &code, const std::string &name, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Get guild templates
+	 *
+	 * @see https://discord.com/developers/docs/resources/guild-template#get-guild-templates
+	 * @param guild_id Guild ID to get templates for
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::dtemplate_map object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void guild_templates_get(snowflake guild_id, command_completion_event_t callback);
+
+	/**
+	 * @brief Creates a template for the guild
+	 *
+	 * @see https://discord.com/developers/docs/resources/guild-template#create-guild-template
+	 * @param guild_id Guild to create template from
+	 * @param name Template name to create
+	 * @param description Description of template to create
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::dtemplate object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void guild_template_create(snowflake guild_id, const std::string &name, const std::string &description, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Syncs the template to the guild's current state.
+	 *
+	 * @see https://discord.com/developers/docs/resources/guild-template#sync-guild-template
+	 * @param guild_id Guild to synchronise template for
+	 * @param code Code of template to synchronise
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::dtemplate object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void guild_template_sync(snowflake guild_id, const std::string &code, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Modifies the template's metadata.
+	 *
+	 * @see https://discord.com/developers/docs/resources/guild-template#modify-guild-template
+	 * @param guild_id Guild ID of template to modify
+	 * @param code Template code to modify
+	 * @param name New name of template
+	 * @param description New description of template
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::dtemplate object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void guild_template_modify(snowflake guild_id, const std::string &code, const std::string &name, const std::string &description, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Deletes the template
+	 *
+	 * @see https://discord.com/developers/docs/resources/guild-template#delete-guild-template
+	 * @param guild_id Guild ID of template to delete
+	 * @param code Template code to delete
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void guild_template_delete(snowflake guild_id, const std::string &code, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Create a guild
+	 * 
+	 * Create a new guild. Returns a guild object on success. `Fires a Guild Create Gateway` event.
+	 * 
+	 * When using the roles parameter, the first member of the array is used to change properties of the guild's everyone role.
+	 * If you are trying to bootstrap a guild with additional roles, keep this in mind. The required id field within each role object is an
+	 * integer placeholder, and will be replaced by the API upon consumption. Its purpose is to allow you to overwrite a role's permissions
+	 * in a channel when also passing in channels with the channels array.
+	 * When using the channels parameter, the position field is ignored, and none of the default channels are created. The id field within
+	 * each channel object may be set to an integer placeholder, and will be replaced by the API upon consumption. Its purpose is to
+	 * allow you to create `GUILD_CATEGORY` channels by setting the `parent_id` field on any children to the category's id field.
+	 * Category channels must be listed before any children.
+	 *
+	 * @see https://discord.com/developers/docs/resources/guild#create-guild
+	 * @note The region field is deprecated and is replaced by channel.rtc_region. This endpoint can be used only by bots in less than 10 guilds.
+	 * @param g Guild to create
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::guild object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void guild_create(const class guild &g, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Edit a guild
+	 * 
+	 * Modify a guild's settings. Requires the `MANAGE_GUILD` permission. Returns the updated guild object on success.
+	 * Fires a `Guild Update Gateway` event.
+	 * 
+	 * @see https://discord.com/developers/docs/resources/guild#modify-guild
+	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
+	 * @param g Guild to edit
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::guild object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void guild_edit(const class guild &g, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Delete a guild
+	 * 
+	 * Delete a guild permanently. User must be owner. Fires a `Guild Delete Gateway` event.
+	 *
+	 * @see https://discord.com/developers/docs/resources/guild#delete-guild
+	 * @param guild_id Guild ID to delete
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void guild_delete(snowflake guild_id, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Get all emojis for a guild
+	 *
+	 * @see https://discord.com/developers/docs/resources/emoji#list-guild-emojis
+	 * @param guild_id Guild ID to get emojis for
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::emoji_map object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void guild_emojis_get(snowflake guild_id, command_completion_event_t callback);
+
+	/**
+	 * @brief Get a single emoji
+	 *
+	 * @see https://discord.com/developers/docs/resources/emoji#get-guild-emoji
+	 * @param guild_id Guild ID to get emoji for
+	 * @param emoji_id Emoji ID to get
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::emoji object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void guild_emoji_get(snowflake guild_id, snowflake emoji_id, command_completion_event_t callback);
+
+	/**
+	 * @brief Create single emoji.
+	 * You must ensure that the emoji passed contained image data using the emoji::load_image() method.
+	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
+	 *
+	 * @see https://discord.com/developers/docs/resources/emoji#create-guild-emoji
+	 * @param guild_id Guild ID to create emoji om
+	 * @param newemoji Emoji to create
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::emoji object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void guild_emoji_create(snowflake guild_id, const class emoji& newemoji, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Edit a single emoji.
+	 * 
+	 * You must ensure that the emoji passed contained image data using the emoji::load_image() method.
+	 * @see https://discord.com/developers/docs/resources/emoji#modify-guild-emoji
+	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
+	 * @param guild_id Guild ID to edit emoji on
+	 * @param newemoji Emoji to edit
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::emoji object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void guild_emoji_edit(snowflake guild_id, const class emoji& newemoji, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Delete a guild emoji
+	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
+	 *
+	 * @see https://discord.com/developers/docs/resources/emoji#delete-guild-emoji
+	 * @param guild_id Guild ID to delete emoji on
+	 * @param emoji_id Emoji ID to delete
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void guild_emoji_delete(snowflake guild_id, snowflake emoji_id, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief List all Application Emojis
+	 *
+	 * @see https://discord.com/developers/docs/resources/emoji#list-application-emojis
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::emoji_map object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void application_emojis_get(command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Get an Application Emoji
+	 *
+	 * @see https://discord.com/developers/docs/resources/emoji#get-application-emoji
+	 * @param emoji_id The ID of the Emoji to get.
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::emoji object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void application_emoji_get(snowflake emoji_id, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Create an Application Emoji
+	 *
+	 * @see https://discord.com/developers/docs/resources/emoji#create-application-emoji
+	 * @param newemoji The emoji to create
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::emoji object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void application_emoji_create(const class emoji& newemoji, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Edit an Application Emoji
+	 *
+	 * @see https://discord.com/developers/docs/resources/emoji#modify-application-emoji
+	 * @param newemoji The emoji to edit
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::emoji object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void application_emoji_edit(const class emoji& newemoji, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Delete an Application Emoji
+	 *
+	 * @see https://discord.com/developers/docs/resources/emoji#delete-application-emoji
+	 * @param emoji_id The emoji's ID to delete.
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void application_emoji_delete(snowflake emoji_id, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Get prune counts
+	 * 
+	 * Returns a prune object indicating the number of members that would be removed in a prune operation. Requires the `KICK_MEMBERS`
+	 * permission. By default, prune will not remove users with roles. You can optionally include specific roles in your prune by providing the
+	 * include_roles parameter. Any inactive user that has a subset of the provided role(s) will be counted in the prune and users with additional
+	 * roles will not.
+	 *
+	 * @see https://discord.com/developers/docs/resources/guild#get-guild-prune-count
+	 * @param guild_id Guild ID to count for pruning
+	 * @param pruneinfo Pruning info
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::prune object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void guild_get_prune_counts(snowflake guild_id, const struct prune& pruneinfo, command_completion_event_t callback);
+
+	/**
+	 * @brief Begin guild prune
+	 * 
+	 * Begin a prune operation. Requires the `KICK_MEMBERS` permission. Returns a prune object indicating the number of members
+	 * that were removed in the prune operation. For large guilds it's recommended to set the `compute_prune_count` option to false, forcing
+	 * 'pruned' to 0. Fires multiple `Guild Member Remove` Gateway events.
+	 * By default, prune will not remove users with roles. You can optionally include specific roles in your prune by providing the `include_roles`
+	 * parameter. Any inactive user that has a subset of the provided role(s) will be included in the prune and users with additional roles will not.
+	 * 
+	 * @see https://discord.com/developers/docs/resources/guild#begin-guild-prune
+	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
+	 * @param guild_id Guild ID to prune
+	 * @param pruneinfo Pruning info
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::prune object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void guild_begin_prune(snowflake guild_id, const struct prune& pruneinfo, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Get guild voice regions.
+	 * 
+	 * Voice regions per guild are somewhat deprecated in preference of per-channel voice regions.
+	 * Returns a list of voice region objects for the guild. Unlike the similar /voice route, this returns VIP servers when
+	 * the guild is VIP-enabled.
+	 *
+	 * @see https://discord.com/developers/docs/resources/guild#get-guild-voice-regions
+	 * @param guild_id Guild ID to get voice regions for
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::voiceregion_map object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void guild_get_voice_regions(snowflake guild_id, command_completion_event_t callback);
+
+	/**
+	 * @brief Get guild invites
+	 * 
+	 * Returns a list of invite objects (with invite metadata) for the guild. Requires the `MANAGE_GUILD` permission.
+	 *
+	 * @see https://discord.com/developers/docs/resources/guild#get-guild-invites
+	 * @param guild_id Guild ID to get invites for
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::invite_map object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void guild_get_invites(snowflake guild_id, command_completion_event_t callback);
+
+	/**
+	 * @brief Get guild integrations
+	 * 
+	 * Requires the `MANAGE_GUILD` permission.
+	 *
+	 * @see https://discord.com/developers/docs/resources/guild#get-guild-integrations
+	 * @param guild_id Guild ID to get integrations for
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::integration_map object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 *
+	 * @note This endpoint returns a maximum of 50 integrations. If a guild has more integrations, they cannot be accessed.
+	 */
+	void guild_get_integrations(snowflake guild_id, command_completion_event_t callback);
+
+	/**
+	 * @brief Modify guild integration
+	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
+	 *
+	 * @see https://discord.com/developers/docs/resources/guild#modify-guild-integration
+	 * @param guild_id Guild ID to modify integration for
+	 * @param i Integration to modify
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::integration object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void guild_modify_integration(snowflake guild_id, const class integration &i, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Delete guild integration
+	 * 
+	 * Delete the attached integration object for the guild. Deletes any associated webhooks and kicks the associated bot if there is one.
+	 * Requires the `MANAGE_GUILD` permission. Fires a Guild Integrations Update Gateway event.
+	 * 
+	 * @see https://discord.com/developers/docs/resources/guild#delete-guild-integration
+	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
+	 * @param guild_id Guild ID to delete integration for
+	 * @param integration_id Integration ID to delete
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void guild_delete_integration(snowflake guild_id, snowflake integration_id, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Sync guild integration
+	 *
+	 * @see https://discord.com/developers/docs/resources/guild#sync-guild-integration
+	 * @param guild_id Guild ID to sync integration on
+	 * @param integration_id Integration ID to synchronise
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void guild_sync_integration(snowflake guild_id, snowflake integration_id, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Get guild widget
+	 * 
+	 * Requires the `MANAGE_GUILD` permission.
+	 *
+	 * @see https://discord.com/developers/docs/resources/guild#get-guild-widget
+	 * @param guild_id Guild ID to get widget for
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::guild_widget object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void guild_get_widget(snowflake guild_id, command_completion_event_t callback);
+
+	/**
+	 * @brief Edit guild widget
+	 * 
+	 * Requires the `MANAGE_GUILD` permission.
+	 *
+	 * @see https://discord.com/developers/docs/resources/guild#modify-guild-widget
+	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
+	 * @param guild_id Guild ID to edit widget for
+	 * @param gw New guild widget information
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::guild_widget object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void guild_edit_widget(snowflake guild_id, const class guild_widget &gw, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Get guild vanity url, if enabled
+	 * 
+	 * Returns a partial dpp::invite object for guilds with that feature enabled. Requires the `MANAGE_GUILD` permission. code will be null if a vanity url for the guild is not set.
+	 * @see https://discord.com/developers/docs/resources/guild#get-guild-vanity-url
+	 * @param guild_id Guild to get vanity URL for
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::invite object in confirmation_callback_t::value filled to match the vanity url. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void guild_get_vanity(snowflake guild_id, command_completion_event_t callback);
+
+	/**
+	 * @brief Get the guild's onboarding configuration
+	 *
+	 * @see https://discord.com/developers/docs/resources/guild#get-guild-onboarding
+	 * @param guild_id The guild to pull the onboarding configuration from.
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::onboarding object in confirmation_callback_t::value filled to match the vanity url. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void guild_get_onboarding(snowflake guild_id, command_completion_event_t callback);
+
+	/**
+	 * @brief Edit the guild's onboarding configuration
+	 *
+	 * Requires the `MANAGE_GUILD` and `MANAGE_ROLES` permissions.
+	 *
+	 * @note Onboarding enforces constraints when enabled. These constraints are that there must be at least 7 Default Channels and at least 5 of them must allow sending messages to the \@everyone role. The `onboarding::mode` field modifies what is considered when enforcing these constraints.
+	 *
+	 * @see https://discord.com/developers/docs/resources/guild#modify-guild-onboarding
+	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
+	 * @param o The onboarding object
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::onboarding object in confirmation_callback_t::value filled to match the vanity url. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void guild_edit_onboarding(const struct onboarding& o, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Get the guild's welcome screen
+	 *
+	 * If the welcome screen is not enabled, the `MANAGE_GUILD` permission is required.
+	 *
+	 * @see https://discord.com/developers/docs/resources/guild#get-guild-welcome-screen
+	 * @param guild_id The guild ID to get the welcome screen from
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::welcome_screen object in confirmation_callback_t::value filled to match the vanity url. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void guild_get_welcome_screen(snowflake guild_id, command_completion_event_t callback);
+
+	/**
+	 * @brief Edit the guild's welcome screen
+	 *
+	 * Requires the `MANAGE_GUILD` permission. May fire a `Guild Update` Gateway event.
+	 *
+	 * @see https://discord.com/developers/docs/resources/guild#modify-guild-welcome-screen
+	 * @param guild_id The guild ID to edit the welcome screen for
+	 * @param welcome_screen The welcome screen
+	 * @param enabled Whether the welcome screen should be enabled or disabled
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::welcome_screen object in confirmation_callback_t::value filled to match the vanity url. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void guild_edit_welcome_screen(snowflake guild_id, const struct welcome_screen& welcome_screen, bool enabled, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Create a webhook
+	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
+	 * @see https://discord.com/developers/docs/resources/webhook#create-webhook
+	 * @param w Webhook to create
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::webhook object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void create_webhook(const class webhook &w, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Get guild webhooks
+	 * @see https://discord.com/developers/docs/resources/webhook#get-guild-webhooks
+	 * @param guild_id Guild ID to get webhooks for
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::webhook_map object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void get_guild_webhooks(snowflake guild_id, command_completion_event_t callback);
+
+	/**
+	 * @brief Get channel webhooks
+	 * @see https://discord.com/developers/docs/resources/webhook#get-guild-webhooks
+	 * @param channel_id Channel ID to get webhooks for
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::webhook_map object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void get_channel_webhooks(snowflake channel_id, command_completion_event_t callback);
+
+	/**
+	 * @brief Get webhook
+	 * @see https://discord.com/developers/docs/resources/webhook#get-webhook
+	 * @param webhook_id Webhook ID to get
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::webhook object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void get_webhook(snowflake webhook_id, command_completion_event_t callback);
+
+	/**
+	 * @brief Get webhook using token
+	 * @see https://discord.com/developers/docs/resources/webhook#get-webhook-with-token
+	 * @param webhook_id Webhook ID to retrieve
+	 * @param token Token of webhook
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::webhook object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void get_webhook_with_token(snowflake webhook_id, const std::string &token, command_completion_event_t callback);
+
+	/**
+	 * @brief Edit webhook
+	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
+	 * @see https://discord.com/developers/docs/resources/webhook#modify-webhook
+	 * @param wh Webhook to edit
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::webhook object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void edit_webhook(const class webhook& wh, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Edit webhook with token (token is encapsulated in the webhook object)
+	 * @see https://discord.com/developers/docs/resources/webhook#modify-webhook-with-token
+	 * @param wh Webhook to edit (should include token)
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::webhook object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void edit_webhook_with_token(const class webhook& wh, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Delete a webhook
+	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
+	 * @see https://discord.com/developers/docs/resources/webhook#delete-webhook
+	 * @param webhook_id Webhook ID to delete
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void delete_webhook(snowflake webhook_id, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Delete webhook with token
+	 * @see https://discord.com/developers/docs/resources/webhook#delete-webhook-with-token
+	 * @param webhook_id Webhook ID to delete
+	 * @param token Token of webhook to delete
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void delete_webhook_with_token(snowflake webhook_id, const std::string &token, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Execute webhook
+	 *
+	 * @see https://discord.com/developers/docs/resources/webhook#execute-webhook
+	 * @param wh Webhook to execute
+	 * @param m Message to send
+	 * @param wait waits for server confirmation of message send before response, and returns the created message body
+	 * @param thread_id Send a message to the specified thread within a webhook's channel. The thread will automatically be unarchived
+	 * @param thread_name Name of thread to create (requires the webhook channel to be a forum channel)
+	 * @param callback Function to call when the API call completes.
+	 * @note If the webhook channel is a forum channel, you must provide either `thread_id` or `thread_name`. If `thread_id` is provided, the message will send in that thread. If `thread_name` is provided, a thread with that name will be created in the forum channel.
+	 * On success the callback will contain a dpp::message object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void execute_webhook(const class webhook &wh, const struct message &m, bool wait = false, snowflake thread_id = 0, const std::string& thread_name = "", command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Get webhook message
+	 *
+	 * @see https://discord.com/developers/docs/resources/webhook#get-webhook-message
+	 * @param wh Webhook to get the original message for
+	 * @param message_id The message ID
+	 * @param thread_id ID of the thread the message is in
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::message object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void get_webhook_message(const class webhook &wh, snowflake message_id, snowflake thread_id = 0, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Edit webhook message
+	 *
+	 * When the content field is edited, the mentions array in the message object will be reconstructed from scratch based on
+	 * the new content. The allowed_mentions field of the edit request controls how this happens. If there is no explicit
+	 * allowed_mentions in the edit request, the content will be parsed with default allowances, that is, without regard to
+	 * whether or not an allowed_mentions was present in the request that originally created the message.
+	 * 
+	 * @see https://discord.com/developers/docs/resources/webhook#edit-webhook-message
+	 * @note the attachments array must contain all attachments that should be present after edit, including retained and new attachments provided in the request body.
+	 * @param wh Webhook to edit message for
+	 * @param m New message
+	 * @param thread_id ID of the thread the message is in
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::message object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void edit_webhook_message(const class webhook &wh, const struct message &m, snowflake thread_id = 0, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Delete webhook message
+	 *
+	 * @see https://discord.com/developers/docs/resources/webhook#delete-webhook-message
+	 * @param wh Webhook to delete message for
+	 * @param message_id Message ID to delete
+	 * @param thread_id ID of the thread the message is in
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void delete_webhook_message(const class webhook &wh, snowflake message_id, snowflake thread_id = 0, command_completion_event_t callback = utility::log_error());
+
+
+	/**
+	 * @brief Get a role for a guild
+	 *
+	 * @see https://discord.com/developers/docs/resources/guild#get-guild-roles
+	 * @param guild_id Guild ID to get role for
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::role_map object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void roles_get(snowflake guild_id, command_completion_event_t callback);
+
+	/**
+	 * @brief Create a role on a guild
+	 * 
+	 * Create a new role for the guild. Requires the `MANAGE_ROLES` permission. Returns the new role object on success.
+	 * Fires a `Guild Role Create` Gateway event.
+	 * 
+	 * @see https://discord.com/developers/docs/resources/guild#create-guild-role
+	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
+	 * @param r Role to create (guild ID is encapsulated in the role object)
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::role object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void role_create(const class role &r, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Edit a role on a guild
+	 * 
+	 * Requires the `MANAGE_ROLES` permission. Returns the updated role on success. Fires a `Guild Role Update` Gateway event.
+	 * 
+	 * @see https://discord.com/developers/docs/resources/guild#modify-guild-role
+	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
+	 * @param r Role to edit
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::role object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void role_edit(const class role &r, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Edit multiple role's position in a guild. Returns a list of all roles of the guild on success.
+	 *
+	 * Modify the positions of a set of role objects for the guild. Requires the `MANAGE_ROLES` permission.
+	 * Fires multiple `Guild Role Update` Gateway events.
+	 *
+	 * @see https://discord.com/developers/docs/resources/guild#modify-guild-role-positions
+	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
+	 * @param guild_id Guild ID to change the roles position on
+	 * @param roles Vector of roles to change the positions of
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::role_map object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void roles_edit_position(snowflake guild_id, const std::vector<role> &roles, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Delete a role
+	 * 
+	 * Requires the `MANAGE_ROLES` permission. Fires a `Guild Role Delete` Gateway event.
+	 * 
+	 * @see https://discord.com/developers/docs/resources/guild#delete-guild-role
+	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
+	 * @param guild_id Guild ID to delete the role on
+	 * @param role_id Role ID to delete
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void role_delete(snowflake guild_id, snowflake role_id, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Get the application's role connection metadata records
+	 *
+	 * @see https://discord.com/developers/docs/resources/application-role-connection-metadata#get-application-role-connection-metadata-records
+	 * @param application_id The application ID
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::application_role_connection_metadata_list object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void application_role_connection_get(snowflake application_id, command_completion_event_t callback);
+
+	/**
+	 * @brief Update the application's role connection metadata records
+	 *
+	 * @see https://discord.com/developers/docs/resources/application-role-connection-metadata#update-application-role-connection-metadata-records
+	 * @param application_id The application ID
+	 * @param connection_metadata The application role connection metadata to update
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::application_role_connection_metadata_list object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 * @note An application can have a maximum of 5 metadata records.
+	 */
+	void application_role_connection_update(snowflake application_id, const std::vector<application_role_connection_metadata> &connection_metadata, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Get user application role connection
+	 *
+	 * @see https://discord.com/developers/docs/resources/user#get-user-application-role-connection
+	 * @param application_id The application ID
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::application_role_connection object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void user_application_role_connection_get(snowflake application_id, command_completion_event_t callback);
+
+	/**
+	 * @brief Update user application role connection
+	 *
+	 * @see https://discord.com/developers/docs/resources/user#update-user-application-role-connection
+	 * @param application_id The application ID
+	 * @param connection The application role connection to update
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::application_role_connection object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void user_application_role_connection_update(snowflake application_id, const application_role_connection &connection, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Get a user by id, without using the cache
+	 *
+	 * @see https://discord.com/developers/docs/resources/user#get-user
+	 * @param user_id User ID to retrieve
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::user_identified object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 * @note The user_identified object is a subclass of dpp::user which contains further details if you have the oauth2 identify or email scopes.
+	 * If you do not have these scopes, these fields are empty. You can safely convert a user_identified to user with `dynamic_cast`.
+	 * @note unless you want something special from `dpp::user_identified` or you've turned off caching, you have no need to call this.
+	 * Call `dpp::find_user` instead that looks up the user in the cache rather than a REST call.
+	 */
+	void user_get(snowflake user_id, command_completion_event_t callback);
+
+	/**
+	 * @brief Get a user by id, checking in the cache first
+	 *
+	 * @see https://discord.com/developers/docs/resources/user#get-user
+	 * @param user_id User ID to retrieve
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::user_identified object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 * @note The user_identified object is a subclass of dpp::user which contains further details if you have the oauth2 identify or email scopes.
+	 * If you do not have these scopes, these fields are empty. You can safely convert a user_identified to user with `dynamic_cast`.
+	 * @note If the user is found in the cache, special values set in `dpp::user_identified` will be undefined. This call should be used
+	 * where you want to for example resolve a user who may no longer be in the bot's guilds, for something like a ban log message.
+	 */
+	void user_get_cached(snowflake user_id, command_completion_event_t callback);
+
+	/**
+	 * @brief Get current (bot) user
+	 *
+	 * @see https://discord.com/developers/docs/resources/user#get-current-user
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::user_identified object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 * @note The user_identified object is a subclass of dpp::user which contains further details if you have the oauth2 identify or email scopes.
+	 * If you do not have these scopes, these fields are empty. You can safely convert a user_identified to user with `dynamic_cast`.
+	 */
+	void current_user_get(command_completion_event_t callback);
+
+	/**
+	 * @brief Get current (bot) application
+	 *
+	 * @see https://discord.com/developers/docs/topics/oauth2#get-current-bot-application-information
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::application object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void current_application_get(command_completion_event_t callback);
+
+	/**
+	 * @brief Modify current member
+	 *
+	 * Modifies the current member in a guild.
+	 * Fires a `Guild Member Update` Gateway event.
+	 *
+	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
+	 * @see https://discord.com/developers/docs/resources/guild#modify-current-member
+	 * @param guild_id Guild ID to change on
+	 * @param nickname New nickname, or empty string to clear nickname.
+	 * @param banner_blob New banner, or empty string to clear banner.
+	 * @param banner_type Type of image for new banner.
+	 * @param avatar_blob New avatar, or empty string to clear avatar.
+	 * @param avatar_type Type of image for new avatar.
+	 * @param bio New bio, or empty string to clear bio
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void guild_current_member_edit(snowflake guild_id, const std::string& nickname, const std::string& banner_blob, const image_type banner_type, const std::string& avatar_blob, const image_type avatar_type, const std::string& bio, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Get current user's connections (linked accounts, e.g. steam, xbox).
+	 * This call requires the oauth2 `connections` scope and cannot be executed
+	 * against a bot token.
+	 * @see https://discord.com/developers/docs/resources/user#get-user-connections
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::connection_map object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void current_user_connections_get(command_completion_event_t callback);
+
+	/**
+	 * @brief Get current (bot) user guilds
+	 * @see https://discord.com/developers/docs/resources/user#get-current-user-guilds
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::guild_map object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void current_user_get_guilds(command_completion_event_t callback);
+
+	/**
+	 * @brief Edit current (bot) user.
+	 *
+	 * Modify the requester's user account settings. Returns a dpp::user object on success.
+	 * Fires a User Update Gateway event.
+	 *
+	 * @note There appears to be no limit to the image size, however, if your image cannot be processed/uploaded in time, you will receive a malformed http request.
+	 *
+	 * @see https://discord.com/developers/docs/resources/user#modify-current-user
+	 * @param nickname Nickname to set
+	 * @param avatar_blob Avatar data to upload
+	 * @param avatar_type Type of image for avatar. It can be one of `i_gif`, `i_jpg` or `i_png`.
+	 * @param banner_blob Banner data to upload
+	 * @param banner_type Type of image for Banner. It can be one of `i_gif`, `i_jpg` or `i_png`.
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::user object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+ 	 * @throw dpp::length_exception Image data is larger than the maximum size of 256 kilobytes
+	 */
+	void current_user_edit(const std::string &nickname, const std::string& avatar_blob = "", const image_type avatar_type = i_png, const std::string& banner_blob = "", const image_type banner_type = i_png, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Get current user DM channels
+	 * 
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::channel_map object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void current_user_get_dms(command_completion_event_t callback);
+
+	/**
+	 * @brief Create a dm channel
+	 * @see https://discord.com/developers/docs/resources/user#create-dm
+	 * @param user_id User ID to create DM channel with
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::channel object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void create_dm_channel(snowflake user_id, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Leave a guild
+	 * @see https://discord.com/developers/docs/resources/user#leave-guild
+	 * @param guild_id Guild ID to leave
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void current_user_leave_guild(snowflake guild_id, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Create a thread in a forum or media channel
+	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
+	 *
+	 * @see https://discord.com/developers/docs/resources/channel#start-thread-in-forum-channel
+	 * @param thread_name Name of the forum thread
+	 * @param channel_id Forum channel in which thread to create
+	 * @param msg The message to start the thread with
+	 * @param auto_archive_duration Duration to automatically archive the thread after recent activity
+	 * @param rate_limit_per_user amount of seconds a user has to wait before sending another message (0-21600); bots, as well as users with the permission manage_messages, manage_thread, or manage_channel, are unaffected
+	 * @param applied_tags List of IDs of forum tags (dpp::forum_tag) to apply to this thread
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::thread object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void thread_create_in_forum(const std::string& thread_name, snowflake channel_id, const message& msg, auto_archive_duration_t auto_archive_duration, uint16_t rate_limit_per_user, std::vector<snowflake> applied_tags = {}, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Create a thread
+	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
+	 *
+	 * @see https://discord.com/developers/docs/resources/channel#start-thread-without-message
+	 * @param thread_name Name of the thread
+	 * @param channel_id Channel in which thread to create
+	 * @param auto_archive_duration Duration after which thread auto-archives. Can be set to - 60, 1440 (for boosted guilds can also be: 4320, 10080)
+	 * @param thread_type Type of thread - CHANNEL_PUBLIC_THREAD, CHANNEL_ANNOUNCEMENT_THREAD, CHANNEL_PRIVATE_THREAD
+	 * @param invitable whether non-moderators can add other non-moderators to a thread; only available when creating a private thread
+	 * @param rate_limit_per_user amount of seconds a user has to wait before sending another message (0-21600); bots, as well as users with the permission manage_messages, manage_thread, or manage_channel, are unaffected
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::thread object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void thread_create(const std::string& thread_name, snowflake channel_id, uint16_t auto_archive_duration, channel_type thread_type, bool invitable, uint16_t rate_limit_per_user, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Edit a thread
+	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
+	 *
+	 * @see https://discord.com/developers/docs/topics/threads#editing-deleting-threads
+	 * @param t Thread to edit
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::thread object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void thread_edit(const thread &t, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Create a thread with a message (Discord: ID of a thread is same as message ID)
+	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
+	 * @see https://discord.com/developers/docs/resources/channel#start-thread-from-message
+	 * @param thread_name Name of the thread
+	 * @param channel_id Channel in which thread to create
+	 * @param message_id message to start thread with
+	 * @param auto_archive_duration Duration after which thread auto-archives. Can be set to - 60, 1440 (for boosted guilds can also be: 4320, 10080)
+	 * @param rate_limit_per_user amount of seconds a user has to wait before sending another message (0-21600); bots, as well as users with the permission manage_messages, manage_thread, or manage_channel, are unaffected
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::thread object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void thread_create_with_message(const std::string& thread_name, snowflake channel_id, snowflake message_id, uint16_t auto_archive_duration, uint16_t rate_limit_per_user, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Join a thread
+	 * @see https://discord.com/developers/docs/resources/channel#join-thread
+	 * @param thread_id Thread ID to join
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void current_user_join_thread(snowflake thread_id, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Leave a thread
+	 * @see https://discord.com/developers/docs/resources/channel#leave-thread
+	 * @param thread_id Thread ID to leave
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void current_user_leave_thread(snowflake thread_id, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Add a member to a thread
+	 * @see https://discord.com/developers/docs/resources/channel#add-thread-member
+	 * @param thread_id Thread ID to add to
+	 * @param user_id Member ID to add
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void thread_member_add(snowflake thread_id, snowflake user_id, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Remove a member from a thread
+	 * @see https://discord.com/developers/docs/resources/channel#remove-thread-member
+	 * @param thread_id Thread ID to remove from
+	 * @param user_id Member ID to remove
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void thread_member_remove(snowflake thread_id, snowflake user_id, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Get a thread member
+	 * @see https://discord.com/developers/docs/resources/channel#get-thread-member
+	 * @param thread_id Thread to get member for
+	 * @param user_id ID of the user to get
+	 * @param callback Function to call when the API call completes
+	 * On success the callback will contain a dpp::thread_member object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void thread_member_get(const snowflake thread_id, const snowflake user_id, command_completion_event_t callback);
+
+	/**
+	 * @brief Get members of a thread
+	 * @see https://discord.com/developers/docs/resources/channel#list-thread-members
+	 * @param thread_id Thread to get members for
+	 * @param callback Function to call when the API call completes
+	 * On success the callback will contain a dpp::thread_member_map object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void thread_members_get(snowflake thread_id, command_completion_event_t callback);
+
+	/**
+	 * @brief Get all active threads in the guild, including public and private threads. Threads are ordered by their id, in descending order.
+	 * @see https://discord.com/developers/docs/resources/guild#list-active-guild-threads
+	 * @param guild_id Guild to get active threads for
+	 * @param callback Function to call when the API call completes
+	 * On success the callback will contain a dpp::active_threads object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void threads_get_active(snowflake guild_id, command_completion_event_t callback);
+
+	/**
+	 * @brief Get public archived threads in a channel (Sorted by archive_timestamp in descending order)
+	 * @see https://discord.com/developers/docs/resources/channel#list-public-archived-threads
+	 * @param channel_id Channel to get public archived threads for
+	 * @param before_timestamp Get threads archived before this timestamp
+	 * @param limit Number of threads to get
+	 * @param callback Function to call when the API call completes
+	 * On success the callback will contain a dpp::thread_map object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void threads_get_public_archived(snowflake channel_id, time_t before_timestamp, uint16_t limit, command_completion_event_t callback);
+
+	/**
+	 * @brief Get private archived threads in a channel (Sorted by archive_timestamp in descending order)
+	 * @see https://discord.com/developers/docs/resources/channel#list-private-archived-threads
+	 * @param channel_id Channel to get public archived threads for
+	 * @param before_timestamp Get threads archived before this timestamp
+	 * @param limit Number of threads to get
+	 * @param callback Function to call when the API call completes
+	 * On success the callback will contain a dpp::thread_map object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void threads_get_private_archived(snowflake channel_id,  time_t before_timestamp, uint16_t limit, command_completion_event_t callback);
+
+	/**
+	 * @brief Get private archived threads in a channel which current user has joined (Sorted by ID in descending order)
+	 * @see https://discord.com/developers/docs/resources/channel#list-joined-private-archived-threads
+	 * @param channel_id Channel to get public archived threads for
+	 * @param before_id Get threads before this id
+	 * @param limit Number of threads to get
+	 * @param callback Function to call when the API call completes
+	 * On success the callback will contain a dpp::thread_map object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void threads_get_joined_private_archived(snowflake channel_id, snowflake before_id, uint16_t limit, command_completion_event_t callback);
+
+	/**
+	 * @brief Get the thread specified by thread_id. This uses the same call as dpp::cluster::channel_get but returns a thread object.
+	 * @see https://discord.com/developers/docs/resources/channel#get-channel
+	 * @param thread_id The id of the thread to obtain.
+	 * @param callback Function to call when the API call completes
+	 * On success the callback will contain a dpp::thread object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void thread_get(snowflake thread_id, command_completion_event_t callback);
+
+	/**
+	 * @brief Create a sticker in a guild
+	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
+	 * @see https://discord.com/developers/docs/resources/sticker#create-guild-sticker
+	 * @param s Sticker to create. Must have its guild ID set.
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::sticker object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void guild_sticker_create(const sticker &s, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Modify a sticker in a guild
+	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
+	 * @see https://discord.com/developers/docs/resources/sticker#modify-guild-sticker
+	 * @param s Sticker to modify. Must have its guild ID and sticker ID set.
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::sticker object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void guild_sticker_modify(const sticker &s, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Delete a sticker from a guild
+	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
+	 * @see https://discord.com/developers/docs/resources/sticker#delete-guild-sticker
+	 * @param sticker_id sticker ID to delete
+	 * @param guild_id guild ID to delete from
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::sticker object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void guild_sticker_delete(snowflake sticker_id, snowflake guild_id, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Get a nitro sticker
+	 * @see https://discord.com/developers/docs/resources/sticker#get-sticker
+	 * @param id Id of sticker to get.
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::sticker object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void nitro_sticker_get(snowflake id, command_completion_event_t callback);
+
+	/**
+	 * @brief Get a guild sticker
+	 * @see https://discord.com/developers/docs/resources/sticker#get-guild-sticker
+	 * @param id Id of sticker to get.
+	 * @param guild_id Guild ID of the guild where the sticker is
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::sticker object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void guild_sticker_get(snowflake id, snowflake guild_id, command_completion_event_t callback);
+
+	/**
+	 * @brief Get all guild stickers
+	 * @see https://discord.com/developers/docs/resources/sticker#list-guild-stickers
+	 * @param guild_id Guild ID of the guild where the sticker is
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::sticker_map object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void guild_stickers_get(snowflake guild_id, command_completion_event_t callback);
+
+	/**
+	 * @brief Get a list of available sticker packs
+	 * @see https://discord.com/developers/docs/resources/sticker#list-sticker-packs
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::sticker_pack_map object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void sticker_packs_get(command_completion_event_t callback);
+
+	/**
+	 * @brief Create a stage instance on a stage channel.
+	 * @see https://discord.com/developers/docs/resources/stage-instance#create-stage-instance
+	 * @param instance Stage instance to create
+	 * @param callback User function to execute when the api call completes
+	 * On success the callback will contain a dpp::stage_instance object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
+	 */
+	void stage_instance_create(const stage_instance& instance, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Get the stage instance associated with the channel id, if it exists.
+	 * @see https://discord.com/developers/docs/resources/stage-instance#get-stage-instance
+	 * @param channel_id ID of the associated channel
+	 * @param callback User function to execute when the api call completes
+	 * On success the callback will contain a dpp::stage_instance object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void stage_instance_get(const snowflake channel_id, command_completion_event_t callback);
+
+	/**
+	 * @brief Edit a stage instance.
+	 * @see https://discord.com/developers/docs/resources/stage-instance#modify-stage-instance
+	 * @param instance Stage instance to edit
+	 * @param callback User function to execute when the api call completes
+	 * On success the callback will contain a dpp::stage_instance object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
+	 */
+	void stage_instance_edit(const stage_instance& instance, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Delete a stage instance.
+	 * @see https://discord.com/developers/docs/resources/stage-instance#delete-stage-instance
+	 * @param channel_id ID of the associated channel
+	 * @param callback User function to execute when the api call completes
+	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
+	 */
+	void stage_instance_delete(const snowflake channel_id, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Get all voice regions
+	 * @see https://discord.com/developers/docs/resources/voice#list-voice-regions
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::voiceregion_map object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void get_voice_regions(command_completion_event_t callback);
+
+	/**
+	 * @brief Get the gateway information for the bot using the token
+	 * @see https://discord.com/developers/docs/topics/gateway#get-gateway-bot
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::gateway object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void get_gateway_bot(command_completion_event_t callback);
+
+	/**
+	 * @brief Get all scheduled events for a guild
+	 * @see https://discord.com/developers/docs/resources/guild-scheduled-event#list-scheduled-events-for-guild
+	 * @param guild_id Guild to get events for
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::scheduled_event_map object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void guild_events_get(snowflake guild_id, command_completion_event_t callback);
+
+	/**
+	 * @brief Get users RSVP'd to an event
+	 *
+	 * @see https://discord.com/developers/docs/resources/guild-scheduled-event#get-guild-scheduled-event-users
+	 * @param guild_id Guild to get user list for
+	 * @param event_id Guild to get user list for
+	 * @param limit Maximum number of results to return
+	 * @param before Return user IDs that fall before this ID, if provided
+	 * @param after Return user IDs that fall after this ID, if provided
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::event_member_map object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void guild_event_users_get(snowflake guild_id, snowflake event_id, command_completion_event_t callback, uint8_t limit = 100, snowflake before = 0, snowflake after = 0);
+
+	/**
+	 * @brief Create a scheduled event on a guild
+	 *
+	 * @see https://discord.com/developers/docs/resources/guild-scheduled-event#create-guild-scheduled-event
+	 * @param event Event to create (guild ID must be populated)
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::scheduled_event_map object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void guild_event_create(const scheduled_event& event, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Delete a scheduled event from a guild
+	 *
+	 * @see https://discord.com/developers/docs/resources/guild-scheduled-event#delete-guild-scheduled-event
+	 * @param event_id Event ID to delete
+	 * @param guild_id Guild ID of event to delete
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void guild_event_delete(snowflake event_id, snowflake guild_id, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Edit/modify a scheduled event on a guild
+	 *
+	 * @see https://discord.com/developers/docs/resources/guild-scheduled-event#modify-guild-scheduled-event
+	 * @param event Event to create (event ID and guild ID must be populated)
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::scheduled_event_map object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void guild_event_edit(const scheduled_event& event, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Get a scheduled event for a guild
+	 *
+	 * @see https://discord.com/developers/docs/resources/guild-scheduled-event#get-guild-scheduled-event
+	 * @param guild_id Guild to get event for
+	 * @param event_id Event ID to get
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::scheduled_event object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void guild_event_get(snowflake guild_id, snowflake event_id, command_completion_event_t callback);
+
+	/**
+	 * @brief Set the bot's voice state on a stage channel
+	 * 
+	 * **Caveats**
+	 * 
+	 * There are currently several caveats for this endpoint:
+	 * 
+	 * - `channel_id` must currently point to a stage channel.
+	 * - current user must already have joined `channel_id`.
+	 * - You must have the `MUTE_MEMBERS` permission to unsuppress yourself. You can always suppress yourself.
+	 * - You must have the `REQUEST_TO_SPEAK` permission to request to speak. You can always clear your own request to speak.
+	 * - You are able to set `request_to_speak_timestamp` to any present or future time.
+	 *
+	 * @see https://discord.com/developers/docs/resources/guild#modify-current-user-voice-state 
+	 * @param guild_id Guild to set voice state on
+	 * @param channel_id Stage channel to set voice state on
+	 * @param callback Function to call when the API call completes.
+	 * @param suppress True if the user's audio should be suppressed, false if it should not
+	 * @param request_to_speak_timestamp The time at which we requested to speak, or 0 to clear the request. The time set here must be the current time or in the future.
+	 * On success the callback will contain a dpp::scheduled_event object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 * @throw std::logic_exception You attempted to set a request_to_speak_timestamp in the past which is not the value of 0.
+	 */
+	void current_user_set_voice_state(snowflake guild_id, snowflake channel_id, bool suppress = false, time_t request_to_speak_timestamp = 0, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Get the bot's voice state in a guild without a Gateway connection
+	 *
+	 * @see https://discord.com/developers/docs/resources/voice#get-current-user-voice-state
+	 * @param guild_id Guild to get the voice state for
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::voicestate object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void current_user_get_voice_state(snowflake guild_id, command_completion_event_t callback);
+
+	/**
+	 * @brief Set a user's voice state on a stage channel
+	 *
+	 * **Caveats**
+	 * 
+	 * There are currently several caveats for this endpoint:
+	 * 
+	 * - `channel_id` must currently point to a stage channel.
+	 * - User must already have joined `channel_id`.
+	 * - You must have the `MUTE_MEMBERS` permission. (Since suppression is the only thing that is available currently)
+	 * - When unsuppressed, non-bot users will have their `request_to_speak_timestamp` set to the current time. Bot users will not.
+	 * - When suppressed, the user will have their `request_to_speak_timestamp` removed.
+	 * 
+	 * @see https://discord.com/developers/docs/resources/guild#modify-user-voice-state
+	 * @param user_id The user to set the voice state of
+	 * @param guild_id Guild to set voice state on
+	 * @param channel_id Stage channel to set voice state on
+	 * @param callback Function to call when the API call completes.
+	 * @param suppress True if the user's audio should be suppressed, false if it should not
+	 * On success the callback will contain a dpp::scheduled_event object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void user_set_voice_state(snowflake user_id, snowflake guild_id, snowflake channel_id, bool suppress = false, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Get a user's voice state in a guild without a Gateway connection
+	 *
+	 * @see https://discord.com/developers/docs/resources/voice#get-user-voice-state
+	 * @param guild_id Guild to get the voice state for
+	 * @param user_id The user to get the voice state of
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::voicestate object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void user_get_voice_state(snowflake guild_id, snowflake user_id, command_completion_event_t callback);
+
+	/**
+	 * @brief Get all auto moderation rules for a guild
+	 * 
+	 * @param guild_id Guild id of the auto moderation rule
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::automod_rule_map object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void automod_rules_get(snowflake guild_id, command_completion_event_t callback);
+
+	/**
+	 * @brief Get a single auto moderation rule
+	 * 
+	 * @param guild_id Guild id of the auto moderation rule
+	 * @param rule_id  Rule id to retrieve
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::automod_rule object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void automod_rule_get(snowflake guild_id, snowflake rule_id, command_completion_event_t callback);
+
+	/**
+	 * @brief Create an auto moderation rule
+	 * 
+	 * @param guild_id Guild id of the auto moderation rule
+	 * @param r Auto moderation rule to create
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::automod_rule object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void automod_rule_create(snowflake guild_id, const automod_rule& r, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Edit an auto moderation rule
+	 * 
+	 * @param guild_id Guild id of the auto moderation rule
+	 * @param r Auto moderation rule to edit. The rule's id must be set.
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::automod_rule object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void automod_rule_edit(snowflake guild_id, const automod_rule& r, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Delete an auto moderation rule
+	 * 
+	 * @param guild_id Guild id of the auto moderation rule
+	 * @param rule_id Auto moderation rule id to delete
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void automod_rule_delete(snowflake guild_id, snowflake rule_id, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Returns all entitlements for a given app, active and expired.
+	 *
+	 * @see https://discord.com/developers/docs/monetization/entitlements#list-entitlements
+	 * @param user_id User ID to look up entitlements for.
+	 * @param sku_ids List of SKU IDs to check entitlements for.
+	 * @param before_id Retrieve entitlements before this entitlement ID.
+	 * @param after_id Retrieve entitlements after this entitlement ID.
+	 * @param limit Number of entitlements to return, 1-100 (default 100).
+	 * @param guild_id Guild ID to look up entitlements for.
+	 * @param exclude_ended Whether ended entitlements should be excluded from the search.
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::emoji_map object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void entitlements_get(snowflake user_id = 0, const std::vector<snowflake>& sku_ids = {}, snowflake before_id = 0, snowflake after_id = 0, uint8_t limit = 100, snowflake guild_id = 0, bool exclude_ended = false, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Creates a test entitlement to a given SKU for a given guild or user.
+	 * Discord will act as though that user or guild has entitlement to your premium offering.
+	 *
+	 * @see https://discord.com/developers/docs/monetization/entitlements#create-test-entitlement
+	 * @param new_entitlement The entitlement to create.
+	 * Make sure your dpp::entitlement_type (inside your dpp::entitlement object) matches the type of the owner_id
+	 * (if type is guild, owner_id is a guild id), otherwise it won't work!
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::entitlement object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void entitlement_test_create(const class entitlement& new_entitlement, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Deletes a currently-active test entitlement.
+	 * Discord will act as though that user or guild no longer has entitlement to your premium offering.
+	 *
+	 * @see https://discord.com/developers/docs/monetization/entitlements#delete-test-entitlement
+	 * @param entitlement_id The test entitlement to delete.
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void entitlement_test_delete(snowflake entitlement_id, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief For One-Time Purchase consumable SKUs, marks a given entitlement for the user as consumed.
+	 *
+	 * @see https://discord.com/developers/docs/monetization/entitlements#consume-an-entitlement
+	 * @param entitlement_id The entitlement to mark as consumed.
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void entitlement_consume(snowflake entitlement_id, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Returns all SKUs for a given application.
+	 * @note Because of how Discord's SKU and subscription systems work, you will see two SKUs for your premium offering.
+	 * For integration and testing entitlements, you should use the SKU with type: 5.
+	 *
+	 * @see https://discord.com/developers/docs/monetization/skus#list-skus
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void skus_get(command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Set the status of a voice channel.
+	 *
+	 * @see https://github.com/discord/discord-api-docs/pull/6400 (please replace soon).
+	 * @param channel_id The channel to update.
+	 * @param status The new status for the channel.
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void channel_set_voice_status(snowflake channel_id, const std::string& status, command_completion_event_t callback = utility::log_error());
+
+#ifndef DPP_NO_CORO
+	#include <dpp/cluster_coro_calls.h>
+#endif
+
+};
+
+}
diff --git a/3rdParty/dpp/cluster_coro_calls.h b/3rdParty/dpp/cluster_coro_calls.h
index aaf4afa6f7..17ffe702e2 100644
--- a/3rdParty/dpp/cluster_coro_calls.h
+++ b/3rdParty/dpp/cluster_coro_calls.h
@@ -1,2316 +1,2681 @@
-/************************************************************************************
- *
- * D++, A Lightweight C++ library for Discord
- *
- * Copyright 2022 Craig Edwards and D++ contributors
- * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- ************************************************************************************/
-
-
-/* Auto @generated by buildtools/make_coro_struct.php.
- *
- * DO NOT EDIT BY HAND!
- *
- * To re-generate this header file re-run the script!
- */
-/**
- * @brief Create/overwrite global slash commands.
- * Any existing global slash commands will be deleted and replaced with these.
- *
- * @see dpp::cluster::global_bulk_command_create
- * @see https://discord.com/developers/docs/interactions/application-commands#bulk-overwrite-global-application-commands
- * @param commands Vector of slash commands to create/update.
- * overwriting existing commands that are registered globally for this application. Updates will be available in all guilds after 1 hour.
- * Commands that do not already exist will count toward daily application command create limits.
- * @return slashcommand_map returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_global_bulk_command_create(const std::vector<slashcommand> &commands) {
-	return dpp::awaitable(this, [&] (auto cc) { this->global_bulk_command_create(commands, cc); }); 
-}
-
-/**
- * @brief Create a global slash command (a bot can have a maximum of 100 of these).
- * 
- * @see dpp::cluster::global_command_create
- * @see https://discord.com/developers/docs/interactions/application-commands#create-global-application-command
- * @param s Slash command to create
- * @return slashcommand returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_global_command_create(const slashcommand &s) {
-	return dpp::awaitable(this, [&] (auto cc) { this->global_command_create(s, cc); }); 
-}
-
-/**
- * @brief Get a global slash command
- *
- * @see dpp::cluster::global_command_get
- * @see https://discord.com/developers/docs/interactions/application-commands#get-global-application-command
- * @param id The ID of the slash command
- * @return slashcommand returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_global_command_get(snowflake id) {
-	return dpp::awaitable(this, [&] (auto cc) { this->global_command_get(id, cc); }); 
-}
-
-/**
- * @brief Delete a global slash command (a bot can have a maximum of 100 of these)
- *
- * @see dpp::cluster::global_command_delete
- * @see https://discord.com/developers/docs/interactions/application-commands#delete-global-application-command
- * @param id Slash command to delete
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_global_command_delete(snowflake id) {
-	return dpp::awaitable(this, [&] (auto cc) { this->global_command_delete(id, cc); }); 
-}
-
-/**
- * @brief Edit a global slash command (a bot can have a maximum of 100 of these)
- *
- * @see dpp::cluster::global_command_edit
- * @see https://discord.com/developers/docs/interactions/application-commands#edit-global-application-command
- * @param s Slash command to change
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_global_command_edit(const slashcommand &s) {
-	return dpp::awaitable(this, [&] (auto cc) { this->global_command_edit(s, cc); }); 
-}
-
-/**
- * @brief Get the application's global slash commands
- *
- * @see dpp::cluster::global_commands_get
- * @see https://discord.com/developers/docs/interactions/application-commands#get-global-application-commands
- * @return slashcommand_map returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_global_commands_get() {
-	return dpp::awaitable(this, [&] (auto cc) { this->global_commands_get(cc); }); 
-}
-
-/**
- * @brief Create/overwrite guild slash commands.
- * Any existing guild slash commands on this guild will be deleted and replaced with these.
- *
- * @see dpp::cluster::guild_bulk_command_create
- * @see https://discord.com/developers/docs/interactions/application-commands#bulk-overwrite-guild-application-commands
- * @param commands Vector of slash commands to create/update.
- * New guild commands will be available in the guild immediately. If the command did not already exist, it will count toward daily application command create limits.
- * @param guild_id Guild ID to create/update the slash commands in
- * @return slashcommand_map returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_guild_bulk_command_create(const std::vector<slashcommand> &commands, snowflake guild_id) {
-	return dpp::awaitable(this, [&] (auto cc) { this->guild_bulk_command_create(commands, guild_id, cc); }); 
-}
-
-/**
- * @brief Get all slash command permissions of a guild
- *
- * @see dpp::cluster::guild_commands_get_permissions
- * @see https://discord.com/developers/docs/interactions/application-commands#get-application-command-permissions
- * @param guild_id Guild ID to get the slash commands permissions for
- * @return guild_command_permissions_map returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_guild_commands_get_permissions(snowflake guild_id) {
-	return dpp::awaitable(this, [&] (auto cc) { this->guild_commands_get_permissions(guild_id, cc); }); 
-}
-
-/**
- * @brief Edit/Overwrite the permissions of all existing slash commands in a guild
- *
- * @note You can only add up to 10 permission overwrites for a command
- *
- * @see dpp::cluster::guild_bulk_command_edit_permissions
- * @see https://discord.com/developers/docs/interactions/application-commands#batch-edit-application-command-permissions
- * @warning The endpoint will overwrite all existing permissions for all commands of the application in a guild, including slash commands, user commands, and message commands. Meaning that if you forgot to pass a slash command, the permissions of it might be removed.
- * @param commands A vector of slash commands to edit/overwrite the permissions for
- * @param guild_id Guild ID to edit permissions of the slash commands in
- * @return guild_command_permissions_map returned object on completion
- * @deprecated This has been disabled with updates to Permissions v2. You can use guild_command_edit_permissions instead
- * \memberof dpp::cluster
- */
-auto inline co_guild_bulk_command_edit_permissions(const std::vector<slashcommand> &commands, snowflake guild_id) {
-	return dpp::awaitable(this, [&] (auto cc) { this->guild_bulk_command_edit_permissions(commands, guild_id, cc); }); 
-}
-
-/**
- * @brief Create a slash command local to a guild
- *
- * @see dpp::cluster::guild_command_create
- * @see https://discord.com/developers/docs/interactions/application-commands#create-guild-application-command
- * @note Creating a command with the same name as an existing command for your application will overwrite the old command.
- * @param s Slash command to create
- * @param guild_id Guild ID to create the slash command in
- * @return slashcommand returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_guild_command_create(const slashcommand &s, snowflake guild_id) {
-	return dpp::awaitable(this, [&] (auto cc) { this->guild_command_create(s, guild_id, cc); }); 
-}
-
-/**
- * @brief Delete a slash command local to a guild
- *
- * @see dpp::cluster::guild_command_delete
- * @see https://discord.com/developers/docs/interactions/application-commands#delete-guild-application-command
- * @param id Slash command to delete
- * @param guild_id Guild ID to delete the slash command in
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_guild_command_delete(snowflake id, snowflake guild_id) {
-	return dpp::awaitable(this, [&] (auto cc) { this->guild_command_delete(id, guild_id, cc); }); 
-}
-
-/**
- * @brief Edit slash command permissions of a guild
- *
- * @see dpp::cluster::guild_command_edit_permissions
- * @see https://discord.com/developers/docs/interactions/application-commands#edit-application-command-permissions
- * @note You can only add up to 10 permission overwrites for a command
- * @param s Slash command to edit the permissions for
- * @param guild_id Guild ID to edit the slash command in
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_guild_command_edit_permissions(const slashcommand &s, snowflake guild_id) {
-	return dpp::awaitable(this, [&] (auto cc) { this->guild_command_edit_permissions(s, guild_id, cc); }); 
-}
-
-/**
- * @brief Get a slash command of a guild
- *
- * @see dpp::cluster::guild_command_get
- * @see https://discord.com/developers/docs/interactions/application-commands#get-guild-application-command
- * @note The returned slash commands will not have permissions set, you need to use a permissions getter e.g. dpp::guild_commands_get_permissions to get the guild command permissions
- * @param id The ID of the slash command
- * @param guild_id Guild ID to get the slash command from
- * @return slashcommand returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_guild_command_get(snowflake id, snowflake guild_id) {
-	return dpp::awaitable(this, [&] (auto cc) { this->guild_command_get(id, guild_id, cc); }); 
-}
-
-/**
- * @brief Get the permissions for a slash command of a guild
- *
- * @see dpp::cluster::guild_command_get_permissions
- * @see https://discord.com/developers/docs/interactions/application-commands#get-application-command-permissions
- * @param id The ID of the slash command to get the permissions for
- * @param guild_id Guild ID to get the permissions of
- * @return guild_command_permissions returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_guild_command_get_permissions(snowflake id, snowflake guild_id) {
-	return dpp::awaitable(this, [&] (auto cc) { this->guild_command_get_permissions(id, guild_id, cc); }); 
-}
-
-/**
- * @brief Edit a slash command local to a guild
- *
- * @see dpp::cluster::guild_command_edit
- * @see https://discord.com/developers/docs/interactions/application-commands#edit-guild-application-command
- * @param s Slash command to edit
- * @param guild_id Guild ID to edit the slash command in
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_guild_command_edit(const slashcommand &s, snowflake guild_id) {
-	return dpp::awaitable(this, [&] (auto cc) { this->guild_command_edit(s, guild_id, cc); }); 
-}
-
-/**
- * @brief Get the application's slash commands for a guild
- *
- * @see dpp::cluster::guild_commands_get
- * @see https://discord.com/developers/docs/interactions/application-commands#get-guild-application-commands
- * @note The returned slash commands will not have permissions set, you need to use a permissions getter e.g. dpp::guild_commands_get_permissions to get the guild command permissions
- * @param guild_id Guild ID to get the slash commands for
- * @return slashcommand_map returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_guild_commands_get(snowflake guild_id) {
-	return dpp::awaitable(this, [&] (auto cc) { this->guild_commands_get(guild_id, cc); }); 
-}
-
-/**
- * @brief Respond to a slash command
- *
- * @see dpp::cluster::interaction_response_create
- * @see https://discord.com/developers/docs/interactions/receiving-and-responding#create-interaction-response
- * @param interaction_id Interaction id to respond to
- * @param token Token for the interaction webhook
- * @param r Response to send
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_interaction_response_create(snowflake interaction_id, const std::string &token, const interaction_response &r) {
-	return dpp::awaitable(this, [&] (auto cc) { this->interaction_response_create(interaction_id, token, r, cc); }); 
-}
-
-/**
- * @brief Edit response to a slash command
- *
- * @see dpp::cluster::interaction_response_edit
- * @see https://discord.com/developers/docs/interactions/receiving-and-responding#edit-original-interaction-response
- * @param token Token for the interaction webhook
- * @param m Message to send
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_interaction_response_edit(const std::string &token, const message &m) {
-	return dpp::awaitable(this, [&] (auto cc) { this->interaction_response_edit(token, m, cc); }); 
-}
-
-/**
- * @brief Create a followup message to a slash command
- * 
- * @param token Token for the interaction webhook
- * @param m followup message to create
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_interaction_followup_create(const std::string &token, const message &m) {
-	return dpp::awaitable(this, [&] (auto cc) { this->interaction_followup_create(token, m, cc); }); 
-}
-
-/**
- * @brief Edit original followup message to a slash command
- * This is an alias for cluster::interaction_response_edit
- * @see dpp::cluster::interaction_followup_edit_original
- * @see cluster::interaction_response_edit
- * 
- * @param token Token for the interaction webhook
- * @param m message to edit, the ID should be set
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_interaction_followup_edit_original(const std::string &token, const message &m) {
-	return dpp::awaitable(this, [&] (auto cc) { this->interaction_followup_edit_original(token, m, cc); }); 
-}
-
-/**
- * @brief 
- * 
- * @param token Token for the interaction webhook
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_interaction_followup_delete(const std::string &token) {
-	return dpp::awaitable(this, [&] (auto cc) { this->interaction_followup_delete(token, cc); }); 
-}
-
-/**
- * @brief Edit followup message to a slash command
- * The message ID in the message you pass should be correctly set to that of a followup message you previously sent
- * @param token Token for the interaction webhook
- * @param m message to edit, the ID should be set
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_interaction_followup_edit(const std::string &token, const message &m) {
-	return dpp::awaitable(this, [&] (auto cc) { this->interaction_followup_edit(token, m, cc); }); 
-}
-
-/**
- * @brief Get the followup message to a slash command
- * @param token Token for the interaction webhook
- * @param message_id message to retrieve
- * @return message returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_interaction_followup_get(const std::string &token, snowflake message_id) {
-	return dpp::awaitable(this, [&] (auto cc) { this->interaction_followup_get(token, message_id, cc); }); 
-}
-
-/**
- * @brief Get all auto moderation rules for a guild
- * 
- * @param guild_id Guild id of the auto moderation rule
- * @return automod_rule_map returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_automod_rules_get(snowflake guild_id) {
-	return dpp::awaitable(this, [&] (auto cc) { this->automod_rules_get(guild_id, cc); }); 
-}
-
-/**
- * @brief Get a single auto moderation rule
- * 
- * @param guild_id Guild id of the auto moderation rule
- * @param rule_id  Rule id to retrieve
- * @return automod_rule returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_automod_rule_get(snowflake guild_id, snowflake rule_id) {
-	return dpp::awaitable(this, [&] (auto cc) { this->automod_rule_get(guild_id, rule_id, cc); }); 
-}
-
-/**
- * @brief Create an auto moderation rule
- * 
- * @param guild_id Guild id of the auto moderation rule
- * @param r Auto moderation rule to create
- * @return automod_rule returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_automod_rule_create(snowflake guild_id, const automod_rule& r) {
-	return dpp::awaitable(this, [&] (auto cc) { this->automod_rule_create(guild_id, r, cc); }); 
-}
-
-/**
- * @brief Edit an auto moderation rule
- * 
- * @param guild_id Guild id of the auto moderation rule
- * @param r Auto moderation rule to edit. The rule's id must be set.
- * @return automod_rule returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_automod_rule_edit(snowflake guild_id, const automod_rule& r) {
-	return dpp::awaitable(this, [&] (auto cc) { this->automod_rule_edit(guild_id, r, cc); }); 
-}
-
-/**
- * @brief Delete an auto moderation rule
- * 
- * @param guild_id Guild id of the auto moderation rule
- * @param rule_id Auto moderation rule id to delete
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_automod_rule_delete(snowflake guild_id, snowflake rule_id) {
-	return dpp::awaitable(this, [&] (auto cc) { this->automod_rule_delete(guild_id, rule_id, cc); }); 
-}
-
-/**
- * @brief Create a channel
- * 
- * Create a new channel object for the guild. Requires the `MANAGE_CHANNELS` permission. If setting permission overwrites,
- * only permissions your bot has in the guild can be allowed/denied. Setting `MANAGE_ROLES` permission in channels is only possible
- * for guild administrators. Returns the new channel object on success. Fires a `Channel Create Gateway` event.
- * 
- * All parameters to this endpoint are optional excluding `name`
- * 
- * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
- * @see dpp::cluster::channel_create
- * @see https://discord.com/developers/docs/resources/channel#create-channel
- * @param c Channel to create
- * @return channel returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_channel_create(const class channel &c) {
-	return dpp::awaitable(this, [&] (auto cc) { this->channel_create(c, cc); }); 
-}
-
-/**
- * @brief Remove a permission from a channel
- * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
- * @see dpp::cluster::channel_delete_permission
- * @see https://discord.com/developers/docs/resources/channel#delete-channel-permission
- * @param c Channel to remove permission from
- * @param overwrite_id Overwrite to remove, user or channel ID
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_channel_delete_permission(const class channel &c, snowflake overwrite_id) {
-	return dpp::awaitable(this, [&] (auto cc) { this->channel_delete_permission(c, overwrite_id, cc); }); 
-}
-
-/**
- * @brief Delete a channel
- * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
- * @see dpp::cluster::channel_delete
- * @see https://discord.com/developers/docs/resources/channel#deleteclose-channel
- * @param channel_id Channel id to delete
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_channel_delete(snowflake channel_id) {
-	return dpp::awaitable(this, [&] (auto cc) { this->channel_delete(channel_id, cc); }); 
-}
-
-/**
- * @brief Edit multiple channels positions
- * 
- * Modify the positions of a set of channel objects for the guild.
- * Requires `MANAGE_CHANNELS` permission. Fires multiple `Channel Update Gateway` events.
- * Only channels to be modified are required.
- *
- * @see dpp::cluster::channel_edit_positions
- * @see https://discord.com/developers/docs/resources/guild#modify-guild-channel-positions
- * @param c Channel to change the position for
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_channel_edit_positions(const std::vector<channel> &c) {
-	return dpp::awaitable(this, [&] (auto cc) { this->channel_edit_positions(c, cc); }); 
-}
-
-/**
- * @brief Edit a channel
- * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
- * @see dpp::cluster::channel_edit
- * @see https://discord.com/developers/docs/resources/channel#modify-channel
- * @param c Channel to edit/update
- * @return channel returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_channel_edit(const class channel &c) {
-	return dpp::awaitable(this, [&] (auto cc) { this->channel_edit(c, cc); }); 
-}
-
-/**
- * @brief Follow an announcement (news) channel
- * @see dpp::cluster::channel_follow_news
- * @see https://discord.com/developers/docs/resources/channel#follow-news-channel
- * @param c Channel id to follow
- * @param target_channel_id Channel to subscribe the channel to
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_channel_follow_news(const class channel &c, snowflake target_channel_id) {
-	return dpp::awaitable(this, [&] (auto cc) { this->channel_follow_news(c, target_channel_id, cc); }); 
-}
-
-/**
- * @brief Get a channel
- *
- * @see dpp::cluster::channel_get
- * @see https://discord.com/developers/docs/resources/channel#get-channel
- * @param c Channel ID to retrieve
- * @return channel returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_channel_get(snowflake c) {
-	return dpp::awaitable(this, [&] (auto cc) { this->channel_get(c, cc); }); 
-}
-
-/**
- * @brief Create invite for a channel
- * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
- * @see dpp::cluster::channel_invite_create
- * @see https://discord.com/developers/docs/resources/channel#create-channel-invite
- * @param c Channel to create an invite on
- * @param i Invite to create
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_channel_invite_create(const class channel &c, const class invite &i) {
-	return dpp::awaitable(this, [&] (auto cc) { this->channel_invite_create(c, i, cc); }); 
-}
-
-/**
- * @brief Get invites for a channel
- *
- * @see dpp::cluster::channel_invites_get
- * @see https://discord.com/developers/docs/resources/invite#get-invites
- * @param c Channel to get invites for
- * @return invite_map returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_channel_invites_get(const class channel &c) {
-	return dpp::awaitable(this, [&] (auto cc) { this->channel_invites_get(c, cc); }); 
-}
-
-/**
- * @brief Get all channels for a guild
- *
- * @see dpp::cluster::channels_get
- * @see https://discord.com/developers/docs/resources/channel#get-channels
- * @param guild_id Guild ID to retrieve channels for
- * @return channel_map returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_channels_get(snowflake guild_id) {
-	return dpp::awaitable(this, [&] (auto cc) { this->channels_get(guild_id, cc); }); 
-}
-
-/**
- * @brief Create a dm channel
- * @see dpp::cluster::create_dm_channel
- * @see https://discord.com/developers/docs/resources/user#create-dm
- * @param user_id User ID to create DM channel with
- * @return channel returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_create_dm_channel(snowflake user_id) {
-	return dpp::awaitable(this, [&] (auto cc) { this->create_dm_channel(user_id, cc); }); 
-}
-
-/**
- * @brief Get current user DM channels
- * 
- * @return channel_map returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_current_user_get_dms() {
-	return dpp::awaitable(this, [&] (auto cc) { this->current_user_get_dms(cc); }); 
-}
-
-/**
- * @brief Create a direct message, also create the channel for the direct message if needed
- *
- * @see dpp::cluster::direct_message_create
- * @see https://discord.com/developers/docs/resources/user#create-dm
- * @see dpp::cluster::direct_message_create
- * @see https://discord.com/developers/docs/resources/channel#create-message
- * @param user_id User ID of user to send message to
- * @param m Message object
- * @return message returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_direct_message_create(snowflake user_id, const message &m) {
-	return dpp::awaitable(this, [&] (auto cc) { this->direct_message_create(user_id, m, cc); }); 
-}
-
-/**
- * @brief Adds a recipient to a Group DM using their access token
- * @see dpp::cluster::gdm_add
- * @see https://discord.com/developers/docs/resources/channel#group-dm-add-recipient
- * @param channel_id Channel id to add group DM recipients to
- * @param user_id User ID to add
- * @param access_token Access token from OAuth2
- * @param nick Nickname of user to apply to the chat
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_gdm_add(snowflake channel_id, snowflake user_id, const std::string &access_token, const std::string &nick) {
-	return dpp::awaitable(this, [&] (auto cc) { this->gdm_add(channel_id, user_id, access_token, nick, cc); }); 
-}
-
-/**
- * @brief Removes a recipient from a Group DM
- * @see dpp::cluster::gdm_remove
- * @see https://discord.com/developers/docs/resources/channel#group-dm-remove-recipient
- * @param channel_id Channel ID of group DM
- * @param user_id User ID to remove from group DM
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_gdm_remove(snowflake channel_id, snowflake user_id) {
-	return dpp::awaitable(this, [&] (auto cc) { this->gdm_remove(channel_id, user_id, cc); }); 
-}
-
-/**
- * @brief Create single emoji.
- * You must ensure that the emoji passed contained image data using the emoji::load_image() method.
- * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
- *
- * @see dpp::cluster::guild_emoji_create
- * @see https://discord.com/developers/docs/resources/emoji#create-guild-emoji
- * @param guild_id Guild ID to create emoji om
- * @param newemoji Emoji to create
- * @return emoji returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_guild_emoji_create(snowflake guild_id, const class emoji& newemoji) {
-	return dpp::awaitable(this, [&] (auto cc) { this->guild_emoji_create(guild_id, newemoji, cc); }); 
-}
-
-/**
- * @brief Delete a guild emoji
- * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
- *
- * @see dpp::cluster::guild_emoji_delete
- * @see https://discord.com/developers/docs/resources/emoji#delete-guild-emoji
- * @param guild_id Guild ID to delete emoji on
- * @param emoji_id Emoji ID to delete
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_guild_emoji_delete(snowflake guild_id, snowflake emoji_id) {
-	return dpp::awaitable(this, [&] (auto cc) { this->guild_emoji_delete(guild_id, emoji_id, cc); }); 
-}
-
-/**
- * @brief Edit a single emoji.
- * 
- * You must ensure that the emoji passed contained image data using the emoji::load_image() method.
- * @see dpp::cluster::guild_emoji_edit
- * @see https://discord.com/developers/docs/resources/emoji#get-guild-emoji
- * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
- * @param guild_id Guild ID to edit emoji on
- * @param newemoji Emoji to edit
- * @return emoji returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_guild_emoji_edit(snowflake guild_id, const class emoji& newemoji) {
-	return dpp::awaitable(this, [&] (auto cc) { this->guild_emoji_edit(guild_id, newemoji, cc); }); 
-}
-
-/**
- * @brief Get a single emoji
- *
- * @see dpp::cluster::guild_emoji_get
- * @see https://discord.com/developers/docs/resources/emoji#get-guild-emoji
- * @param guild_id Guild ID to get emoji for
- * @param emoji_id Emoji ID to get
- * @return emoji returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_guild_emoji_get(snowflake guild_id, snowflake emoji_id) {
-	return dpp::awaitable(this, [&] (auto cc) { this->guild_emoji_get(guild_id, emoji_id, cc); }); 
-}
-
-/**
- * @brief Get all emojis for a guild
- *
- * @see dpp::cluster::guild_emojis_get
- * @see https://discord.com/developers/docs/resources/emoji#get-guild-emojis
- * @param guild_id Guild ID to get emojis for
- * @return emoji_map returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_guild_emojis_get(snowflake guild_id) {
-	return dpp::awaitable(this, [&] (auto cc) { this->guild_emojis_get(guild_id, cc); }); 
-}
-
-/**
- * @brief Get the gateway information for the bot using the token
- * @see dpp::cluster::get_gateway_bot
- * @see https://discord.com/developers/docs/topics/gateway#get-gateway-bot
- * @return gateway returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_get_gateway_bot() {
-	return dpp::awaitable(this, [&] (auto cc) { this->get_gateway_bot(cc); }); 
-}
-
-/**
- * @brief Modify current member
- *
- * Modifies the current member in a guild.
- * Fires a `Guild Member Update` Gateway event.
- *
- * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
- * @see dpp::cluster::guild_current_member_edit
- * @see https://discord.com/developers/docs/resources/guild#modify-current-member
- * @param guild_id Guild ID to change on
- * @param nickname New nickname, or empty string to clear nickname
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_guild_current_member_edit(snowflake guild_id, const std::string &nickname) {
-	return dpp::awaitable(this, [&] (auto cc) { this->guild_current_member_edit(guild_id, nickname, cc); }); 
-}
-
-/**
- * @brief Get the audit log for a guild
- *
- * @see dpp::cluster::guild_auditlog_get
- * @see https://discord.com/developers/docs/resources/audit-log#get-guild-audit-log
- * @param guild_id Guild to get the audit log of
- * @param user_id Entries from a specific user ID. Set this to `0` will fetch any user
- * @param action_type Entries for a specific dpp::audit_type. Set this to `0` will fetch any type
- * @param before Entries that preceded a specific audit log entry ID. Used for paginating
- * @param limit Maximum number of entries (between 1-100) to return
- * @return auditlog returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_guild_auditlog_get(snowflake guild_id, snowflake user_id, uint32_t action_type, snowflake before, uint32_t limit) {
-	return dpp::awaitable(this, [&] (auto cc) { this->guild_auditlog_get(guild_id, user_id, action_type, before, limit, cc); }); 
-}
-
-/**
- * @brief Add guild ban
- *
- * Create a guild ban, and optionally delete previous messages sent by the banned user.
- * Requires the `BAN_MEMBERS` permission. Fires a `Guild Ban Add` Gateway event.
- * @see dpp::cluster::guild_ban_add
- * @see https://discord.com/developers/docs/resources/guild#create-guild-ban
- * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
- * @param guild_id Guild ID to add ban to
- * @param user_id User ID to ban
- * @param delete_message_seconds How many seconds to delete messages for, between 0 and 604800 (7 days). Defaults to 0
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_guild_ban_add(snowflake guild_id, snowflake user_id, uint32_t delete_message_seconds) {
-	return dpp::awaitable(this, [&] (auto cc) { this->guild_ban_add(guild_id, user_id, delete_message_seconds, cc); }); 
-}
-
-/**
- * @brief Delete guild ban
- * 
- * Remove the ban for a user. Requires the `BAN_MEMBERS` permissions.
- * Fires a Guild Ban Remove Gateway event.
- * @see dpp::cluster::guild_ban_delete
- * @see https://discord.com/developers/docs/resources/guild#remove-guild-ban
- * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
- * @param guild_id Guild to delete ban from
- * @param user_id User ID to delete ban for
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_guild_ban_delete(snowflake guild_id, snowflake user_id) {
-	return dpp::awaitable(this, [&] (auto cc) { this->guild_ban_delete(guild_id, user_id, cc); }); 
-}
-
-/**
- * @brief Create a guild
- * 
- * Create a new guild. Returns a guild object on success. `Fires a Guild Create Gateway` event.
- * 
- * When using the roles parameter, the first member of the array is used to change properties of the guild's everyone role.
- * If you are trying to bootstrap a guild with additional roles, keep this in mind. The required id field within each role object is an
- * integer placeholder, and will be replaced by the API upon consumption. Its purpose is to allow you to overwrite a role's permissions
- * in a channel when also passing in channels with the channels array.
- * When using the channels parameter, the position field is ignored, and none of the default channels are created. The id field within
- * each channel object may be set to an integer placeholder, and will be replaced by the API upon consumption. Its purpose is to
- * allow you to create `GUILD_CATEGORY` channels by setting the `parent_id` field on any children to the category's id field.
- * Category channels must be listed before any children.
- *
- * @see dpp::cluster::guild_create
- * @see https://discord.com/developers/docs/resources/guild#create-guild
- * @note The region field is deprecated and is replaced by channel.rtc_region. This endpoint can be used only by bots in less than 10 guilds.
- * @param g Guild to create
- * @return guild returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_guild_create(const class guild &g) {
-	return dpp::awaitable(this, [&] (auto cc) { this->guild_create(g, cc); }); 
-}
-
-/**
- * @brief Delete a guild
- * 
- * Delete a guild permanently. User must be owner. Fires a `Guild Delete Gateway` event.
- *
- * @see dpp::cluster::guild_delete
- * @see https://discord.com/developers/docs/resources/guild#delete-guild
- * @param guild_id Guild ID to delete
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_guild_delete(snowflake guild_id) {
-	return dpp::awaitable(this, [&] (auto cc) { this->guild_delete(guild_id, cc); }); 
-}
-
-/**
- * @brief Delete guild integration
- * 
- * Delete the attached integration object for the guild. Deletes any associated webhooks and kicks the associated bot if there is one.
- * Requires the `MANAGE_GUILD` permission. Fires a Guild Integrations Update Gateway event.
- * 
- * @see dpp::cluster::guild_delete_integration
- * @see https://discord.com/developers/docs/resources/guild#delete-guild-integration
- * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
- * @param guild_id Guild ID to delete integration for
- * @param integration_id Integration ID to delete
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_guild_delete_integration(snowflake guild_id, snowflake integration_id) {
-	return dpp::awaitable(this, [&] (auto cc) { this->guild_delete_integration(guild_id, integration_id, cc); }); 
-}
-
-/**
- * @brief Edit a guild
- * 
- * Modify a guild's settings. Requires the `MANAGE_GUILD` permission. Returns the updated guild object on success.
- * Fires a `Guild Update Gateway` event.
- * 
- * @see dpp::cluster::guild_edit
- * @see https://discord.com/developers/docs/resources/guild#modify-guild
- * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
- * @param g Guild to edit
- * @return guild returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_guild_edit(const class guild &g) {
-	return dpp::awaitable(this, [&] (auto cc) { this->guild_edit(g, cc); }); 
-}
-
-/**
- * @brief Edit guild widget
- * 
- * Requires the `MANAGE_GUILD` permission.
- *
- * @see dpp::cluster::guild_edit_widget
- * @see https://discord.com/developers/docs/resources/guild#modify-guild-widget
- * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
- * @param guild_id Guild ID to edit widget for
- * @param gw New guild widget information
- * @return guild_widget returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_guild_edit_widget(snowflake guild_id, const class guild_widget &gw) {
-	return dpp::awaitable(this, [&] (auto cc) { this->guild_edit_widget(guild_id, gw, cc); }); 
-}
-
-/**
- * @brief Get single guild ban
- * 
- * Requires the `BAN_MEMBERS` permission.
- * @see dpp::cluster::guild_get_ban
- * @see https://discord.com/developers/docs/resources/guild#get-guild-ban
- * @param guild_id Guild ID to get ban for
- * @param user_id User ID of ban to retrieve
- * @return ban returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_guild_get_ban(snowflake guild_id, snowflake user_id) {
-	return dpp::awaitable(this, [&] (auto cc) { this->guild_get_ban(guild_id, user_id, cc); }); 
-}
-
-/**
- * @brief Get guild ban list
- * 
- * Requires the `BAN_MEMBERS` permission.
- * @see dpp::cluster::guild_get_bans
- * @see https://discord.com/developers/docs/resources/guild#get-guild-bans
- * @note Provide a user ID to `before` and `after` for pagination. Users will always be returned in ascending order by the user ID. If both before and after are provided, only before is respected.
- * @param guild_id Guild ID to get bans for
- * @param before If non-zero, all bans for user ids before this user id will be returned up to the limit
- * @param after if non-zero, all bans for user ids after this user id will be returned up to the limit
- * @param limit the maximum number of bans to retrieve in this call up to a maximum of 1000
- * @return ban_map returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_guild_get_bans(snowflake guild_id, snowflake before, snowflake after, snowflake limit) {
-	return dpp::awaitable(this, [&] (auto cc) { this->guild_get_bans(guild_id, before, after, limit, cc); }); 
-}
-
-
-auto inline co_guild_get(snowflake guild_id) {
-	return dpp::awaitable(this, [&] (auto cc) { this->guild_get(guild_id, cc); }); 
-}
-
-/**
- * @brief Get guild integrations
- * 
- * Requires the `MANAGE_GUILD` permission.
- *
- * @see dpp::cluster::guild_get_integrations
- * @see https://discord.com/developers/docs/resources/guild#get-guild-integrations
- * @param guild_id Guild ID to get integrations for
- * @return integration_map returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_guild_get_integrations(snowflake guild_id) {
-	return dpp::awaitable(this, [&] (auto cc) { this->guild_get_integrations(guild_id, cc); }); 
-}
-
-
-auto inline co_guild_get_preview(snowflake guild_id) {
-	return dpp::awaitable(this, [&] (auto cc) { this->guild_get_preview(guild_id, cc); }); 
-}
-
-/**
- * @brief Get guild vanity url, if enabled
- * 
- * Returns a partial dpp::invite object for guilds with that feature enabled. Requires the `MANAGE_GUILD` permission. code will be null if a vanity url for the guild is not set.
- * @see dpp::cluster::guild_get_vanity
- * @see https://discord.com/developers/docs/resources/guild#get-guild-vanity-url
- * @param guild_id Guild to get vanity URL for
- * @return invite returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_guild_get_vanity(snowflake guild_id) {
-	return dpp::awaitable(this, [&] (auto cc) { this->guild_get_vanity(guild_id, cc); }); 
-}
-
-/**
- * @brief Get guild widget
- * 
- * Requires the `MANAGE_GUILD` permission.
- *
- * @see dpp::cluster::guild_get_widget
- * @see https://discord.com/developers/docs/resources/guild#get-guild-widget
- * @param guild_id Guild ID to get widget for
- * @return guild_widget returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_guild_get_widget(snowflake guild_id) {
-	return dpp::awaitable(this, [&] (auto cc) { this->guild_get_widget(guild_id, cc); }); 
-}
-
-/**
- * @brief Modify guild integration
- * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
- *
- * @see dpp::cluster::guild_modify_integration
- * @see https://discord.com/developers/docs/resources/guild#modify-guild-integration
- * @param guild_id Guild ID to modify integration for
- * @param i Integration to modify
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_guild_modify_integration(snowflake guild_id, const class integration &i) {
-	return dpp::awaitable(this, [&] (auto cc) { this->guild_modify_integration(guild_id, i, cc); }); 
-}
-
-/**
- * @brief Get prune counts
- * 
- * Returns a prune object indicating the number of members that would be removed in a prune operation. Requires the `KICK_MEMBERS`
- * permission. By default, prune will not remove users with roles. You can optionally include specific roles in your prune by providing the
- * include_roles parameter. Any inactive user that has a subset of the provided role(s) will be counted in the prune and users with additional
- * roles will not.
- *
- * @see dpp::cluster::guild_get_prune_counts
- * @see https://discord.com/developers/docs/resources/guild#get-guild-prune-count
- * @param guild_id Guild ID to count for pruning
- * @param pruneinfo Pruning info
- * @return prune returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_guild_get_prune_counts(snowflake guild_id, const struct prune& pruneinfo) {
-	return dpp::awaitable(this, [&] (auto cc) { this->guild_get_prune_counts(guild_id, pruneinfo, cc); }); 
-}
-
-/**
- * @brief Begin guild prune
- * 
- * Begin a prune operation. Requires the `KICK_MEMBERS` permission. Returns a prune object indicating the number of members
- * that were removed in the prune operation. For large guilds it's recommended to set the `compute_prune_count` option to false, forcing
- * 'pruned' to 0. Fires multiple `Guild Member Remove` Gateway events.
- * By default, prune will not remove users with roles. You can optionally include specific roles in your prune by providing the `include_roles`
- * parameter. Any inactive user that has a subset of the provided role(s) will be included in the prune and users with additional roles will not.
- * 
- * @see dpp::cluster::guild_begin_prune
- * @see https://discord.com/developers/docs/resources/guild#begin-guild-prune
- * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
- * @param guild_id Guild ID to prune
- * @param pruneinfo Pruning info
- * @return prune returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_guild_begin_prune(snowflake guild_id, const struct prune& pruneinfo) {
-	return dpp::awaitable(this, [&] (auto cc) { this->guild_begin_prune(guild_id, pruneinfo, cc); }); 
-}
-
-/**
- * @brief Change current user nickname
- * 
- * Modifies the nickname of the current user in a guild.
- * Fires a `Guild Member Update` Gateway event.
- * 
- * @deprecated Deprecated in favor of Modify Current Member. Will be replaced by dpp::cluster::guild_current_member_edit
- * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
- * @see dpp::cluster::guild_set_nickname
- * @see https://discord.com/developers/docs/resources/guild#modify-current-user-nick
- * @param guild_id Guild ID to change nickname on
- * @param nickname New nickname, or empty string to clear nickname
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_guild_set_nickname(snowflake guild_id, const std::string &nickname) {
-	return dpp::awaitable(this, [&] (auto cc) { this->guild_set_nickname(guild_id, nickname, cc); }); 
-}
-
-/**
- * @brief Sync guild integration
- *
- * @see dpp::cluster::guild_sync_integration
- * @see https://discord.com/developers/docs/resources/guild#sync-guild-integration
- * @param guild_id Guild ID to sync integration on
- * @param integration_id Integration ID to synchronise
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_guild_sync_integration(snowflake guild_id, snowflake integration_id) {
-	return dpp::awaitable(this, [&] (auto cc) { this->guild_sync_integration(guild_id, integration_id, cc); }); 
-}
-
-/**
- * @brief Add guild member. Needs a specific oauth2 scope, from which you get the access_token.
- * 
- * Adds a user to the guild, provided you have a valid oauth2 access token for the user with the guilds.join scope.
- * Returns the guild_member, which is defaulted if the user is already a member of the guild. Fires a `Guild Member Add` Gateway event.
- * 
- * For guilds with Membership Screening enabled, this endpoint will default to adding new members as pending in the guild member object.
- * Members that are pending will have to complete membership screening before they become full members that can talk.
- * 
- * @note All parameters to this endpoint except for access_token are optional.
- * The bot must be a member of the guild with `CREATE_INSTANT_INVITE` permission.
- * @see dpp::cluster::guild_add_member
- * @see https://discord.com/developers/docs/resources/guild#add-guild-member
- * @param gm Guild member to add
- * @param access_token Access token from Oauth2 scope
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_guild_add_member(const guild_member& gm, const std::string &access_token) {
-	return dpp::awaitable(this, [&] (auto cc) { this->guild_add_member(gm, access_token, cc); }); 
-}
-
-/**
- * @brief Edit the properties of an existing guild member
- * 
- * Modify attributes of a guild member. Returns the guild_member. Fires a `Guild Member Update` Gateway event.
- * To remove a timeout, set the `communication_disabled_until` to a non-zero time in the past, e.g. 1.
- * When moving members to channels, the API user must have permissions to both connect to the channel and have the `MOVE_MEMBERS` permission.
- * For moving and disconnecting users from voice, use dpp::cluster::guild_member_move.
- * @see dpp::cluster::guild_edit_member
- * @see https://discord.com/developers/docs/resources/guild#modify-guild-member
- * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
- * @param gm Guild member to edit
- * @return guild_member returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_guild_edit_member(const guild_member& gm) {
-	return dpp::awaitable(this, [&] (auto cc) { this->guild_edit_member(gm, cc); }); 
-}
-
-/**
- * @brief Get a guild member
- * @see dpp::cluster::guild_get_member
- * @see https://discord.com/developers/docs/resources/guild#get-guild-member
- * @param guild_id Guild ID to get member for
- * @param user_id User ID of member to get
- * @return guild_member returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_guild_get_member(snowflake guild_id, snowflake user_id) {
-	return dpp::awaitable(this, [&] (auto cc) { this->guild_get_member(guild_id, user_id, cc); }); 
-}
-
-/**
- * @brief Get all guild members
- * 
- * @note This endpoint is restricted according to whether the `GUILD_MEMBERS` Privileged Intent is enabled for your application.
- * @see dpp::cluster::guild_get_members
- * @see https://discord.com/developers/docs/resources/guild#get-guild-members
- * @param guild_id Guild ID to get all members for
- * @param limit max number of members to return (1-1000)
- * @param after the highest user id in the previous page
- * @return guild_member_map returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_guild_get_members(snowflake guild_id, uint16_t limit, snowflake after) {
-	return dpp::awaitable(this, [&] (auto cc) { this->guild_get_members(guild_id, limit, after, cc); }); 
-}
-
-/**
- * @brief Add role to guild member
- * 
- * Adds a role to a guild member. Requires the `MANAGE_ROLES` permission.
- * Fires a `Guild Member Update` Gateway event.
- * @see dpp::cluster::guild_member_add_role
- * @see https://discord.com/developers/docs/resources/guild#add-guild-member-role
- * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
- * @param guild_id Guild ID to add a role to
- * @param user_id User ID to add role to
- * @param role_id Role ID to add to the user
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_guild_member_add_role(snowflake guild_id, snowflake user_id, snowflake role_id) {
-	return dpp::awaitable(this, [&] (auto cc) { this->guild_member_add_role(guild_id, user_id, role_id, cc); }); 
-}
-
-/**
- * @brief Remove (kick) a guild member
- * 
- * Remove a member from a guild. Requires `KICK_MEMBERS` permission.
- * Fires a `Guild Member Remove` Gateway event.
- * @see dpp::cluster::guild_member_delete
- * @see https://discord.com/developers/docs/resources/guild#remove-guild-member
- * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
- * @deprecated Replaced by dpp::cluster::guild_member_kick
- * @param guild_id Guild ID to kick member from
- * @param user_id User ID to kick
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_guild_member_delete(snowflake guild_id, snowflake user_id) {
-	return dpp::awaitable(this, [&] (auto cc) { this->guild_member_delete(guild_id, user_id, cc); }); 
-}
-
-/**
- * @brief Remove (kick) a guild member
- *  
- * Remove a member from a guild. Requires `KICK_MEMBERS` permission.
- * Fires a `Guild Member Remove` Gateway event.
- * @see dpp::cluster::guild_member_kick
- * @see https://discord.com/developers/docs/resources/guild#remove-guild-member
- * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
- * @param guild_id Guild ID to kick member from
- * @param user_id User ID to kick
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_guild_member_kick(snowflake guild_id, snowflake user_id) {
-	return dpp::awaitable(this, [&] (auto cc) { this->guild_member_kick(guild_id, user_id, cc); }); 
-}
-
-/**
- * @brief Set the timeout of a guild member
- *
- * Fires a `Guild Member Update` Gateway event.
- * @see dpp::cluster::guild_member_timeout
- * @see https://discord.com/developers/docs/resources/guild#modify-guild-member
- * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
- * @param guild_id Guild ID to timeout the member in
- * @param user_id User ID to set the timeout for
- * @param communication_disabled_until The timestamp when the user's timeout will expire (up to 28 days in the future). Set to 0 to remove the timeout
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_guild_member_timeout(snowflake guild_id, snowflake user_id, time_t communication_disabled_until) {
-	return dpp::awaitable(this, [&] (auto cc) { this->guild_member_timeout(guild_id, user_id, communication_disabled_until, cc); }); 
-}
-
-/**
- * @brief Remove role from guild member
- * 
- * Removes a role from a guild member. Requires the `MANAGE_ROLES` permission.
- * Fires a `Guild Member Update` Gateway event.
- * @see dpp::cluster::guild_member_delete_role
- * @see https://discord.com/developers/docs/resources/guild#remove-guild-member-role
- * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
- * @param guild_id Guild ID to remove role from user on
- * @param user_id User ID to remove role from
- * @param role_id Role to remove
- * @return confirmation returned object on completion
- * @deprecated Use dpp::cluster::guild_member_remove_role instead
- * \memberof dpp::cluster
- */
-auto inline co_guild_member_delete_role(snowflake guild_id, snowflake user_id, snowflake role_id) {
-	return dpp::awaitable(this, [&] (auto cc) { this->guild_member_delete_role(guild_id, user_id, role_id, cc); }); 
-}
-
-/**
- * @brief Remove role from guild member
- *
- * Removes a role from a guild member. Requires the `MANAGE_ROLES` permission.
- * Fires a `Guild Member Update` Gateway event.
- * @see dpp::cluster::guild_member_remove_role
- * @see https://discord.com/developers/docs/resources/guild#remove-guild-member-role
- * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
- * @param guild_id Guild ID to remove role from user on
- * @param user_id User ID to remove role from
- * @param role_id Role to remove
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_guild_member_remove_role(snowflake guild_id, snowflake user_id, snowflake role_id) {
-	return dpp::awaitable(this, [&] (auto cc) { this->guild_member_remove_role(guild_id, user_id, role_id, cc); }); 
-}
-
-/**
- * @brief Moves the guild member to a other voice channel, if member is connected to one.
- * Set the `channel_id` to `0` to disconnect the user.
- *
- * Fires a `Guild Member Update` Gateway event.
- * @note When moving members to channels, the API user __must__ have permissions to both connect to the channel and have the `MOVE_MEMBERS` permission.
- * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
- * @see dpp::cluster::guild_member_move
- * @see https://discord.com/developers/docs/resources/guild#modify-guild-member
- * @param channel_id Id of the channel to which the user is used. Set to `0` to disconnect the user
- * @param guild_id Guild id to which the user is connected
- * @param user_id User id, who should be moved
- * @return guild_member returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_guild_member_move(const snowflake channel_id, const snowflake guild_id, const snowflake user_id) {
-	return dpp::awaitable(this, [&] (auto cc) { this->guild_member_move(channel_id, guild_id, user_id, cc); }); 
-}
-
-/**
- * @brief Search for guild members based on whether their username or nickname starts with the given string.
- *
- * @note This endpoint is restricted according to whether the `GUILD_MEMBERS` Privileged Intent is enabled for your application.
- * @see dpp::cluster::guild_search_members
- * @see https://discord.com/developers/docs/resources/guild#search-guild-members
- * @param guild_id Guild ID to search in
- * @param query Query string to match username(s) and nickname(s) against
- * @param limit max number of members to return (1-1000)
- * @return guild_member_map returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_guild_search_members(snowflake guild_id, const std::string& query, uint16_t limit) {
-	return dpp::awaitable(this, [&] (auto cc) { this->guild_search_members(guild_id, query, limit, cc); }); 
-}
-
-/**
- * @brief Get guild invites
- * 
- * Returns a list of invite objects (with invite metadata) for the guild. Requires the `MANAGE_GUILD` permission.
- *
- * @see dpp::cluster::guild_get_invites
- * @see https://discord.com/developers/docs/resources/guild#get-guild-invites
- * @param guild_id Guild ID to get invites for
- * @return invite_map returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_guild_get_invites(snowflake guild_id) {
-	return dpp::awaitable(this, [&] (auto cc) { this->guild_get_invites(guild_id, cc); }); 
-}
-
-
-auto inline co_invite_delete(const std::string &invitecode) {
-	return dpp::awaitable(this, [&] (auto cc) { this->invite_delete(invitecode, cc); }); 
-}
-
-
-auto inline co_invite_get(const std::string &invitecode) {
-	return dpp::awaitable(this, [&] (auto cc) { this->invite_get(invitecode, cc); }); 
-}
-
-/**
- * @brief Send a message to a channel. The callback function is called when the message has been sent
- *
- * @see dpp::cluster::message_create
- * @see https://discord.com/developers/docs/resources/channel#create-message
- * @param m Message to send
- * @return message returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_message_create(const message &m) {
-	return dpp::awaitable(this, [&] (auto cc) { this->message_create(m, cc); }); 
-}
-
-/**
- * @brief Crosspost a message. The callback function is called when the message has been sent
- *
- * @see dpp::cluster::message_crosspost
- * @see https://discord.com/developers/docs/resources/channel#crosspost-message
- * @param message_id Message to crosspost
- * @param channel_id Channel ID to crosspost from
- * @return message returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_message_crosspost(snowflake message_id, snowflake channel_id) {
-	return dpp::awaitable(this, [&] (auto cc) { this->message_crosspost(message_id, channel_id, cc); }); 
-}
-
-/**
- * @brief Bulk delete messages from a channel. The callback function is called when the message has been edited
- * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
- *
- * @note If any message provided older than 2 weeks or any duplicate message ID, it will fail.
- *
- * @see dpp::cluster::message_delete_bulk
- * @see https://discord.com/developers/docs/resources/channel#bulk-delete-messages
- * @param message_ids List of message IDs to delete (at least 2 and at most 100 message IDs)
- * @param channel_id Channel to delete from
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_message_delete_bulk(const std::vector<snowflake>& message_ids, snowflake channel_id) {
-	return dpp::awaitable(this, [&] (auto cc) { this->message_delete_bulk(message_ids, channel_id, cc); }); 
-}
-
-/**
- * @brief Delete a message from a channel. The callback function is called when the message has been edited
- * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
- *
- * @see dpp::cluster::message_delete
- * @see https://discord.com/developers/docs/resources/channel#delete-message
- * @param message_id Message ID to delete
- * @param channel_id Channel to delete from
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_message_delete(snowflake message_id, snowflake channel_id) {
-	return dpp::awaitable(this, [&] (auto cc) { this->message_delete(message_id, channel_id, cc); }); 
-}
-
-/**
- * @brief Edit a message on a channel. The callback function is called when the message has been edited
- *
- * @see dpp::cluster::message_edit
- * @see https://discord.com/developers/docs/resources/channel#edit-message
- * @param m Message to edit
- * @return message returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_message_edit(const message &m) {
-	return dpp::awaitable(this, [&] (auto cc) { this->message_edit(m, cc); }); 
-}
-
-/**
- * @brief Get a message
- *
- * @see dpp::cluster::message_get
- * @see https://discord.com/developers/docs/resources/channel#get-channel-message
- * @param message_id Message ID
- * @param channel_id Channel ID
- * @return message returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_message_get(snowflake message_id, snowflake channel_id) {
-	return dpp::awaitable(this, [&] (auto cc) { this->message_get(message_id, channel_id, cc); }); 
-}
-
-/**
- * @brief Pin a message
- * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
- * @see dpp::cluster::message_pin
- * @see https://discord.com/developers/docs/resources/channel#pin-message
- * @param channel_id Channel id to pin message on
- * @param message_id Message id to pin message on
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_message_pin(snowflake channel_id, snowflake message_id) {
-	return dpp::awaitable(this, [&] (auto cc) { this->message_pin(channel_id, message_id, cc); }); 
-}
-
-/**
- * @brief Get multiple messages.
- * 
- * This function will attempt to fetch as many messages as possible using multiple API calls if needed.
- *
- * @see dpp::cluster::messages_get
- * @see https://discord.com/developers/docs/resources/channel#get-channel-messages
- * @param channel_id Channel ID to retrieve messages for
- * @param around Messages should be retrieved around this ID if this is set to non-zero
- * @param before Messages before this ID should be retrieved if this is set to non-zero
- * @param after Messages after this ID should be retrieved if this is set to non-zero
- * @param limit This number of messages maximum should be returned, up to a maximum of 100.
- * @return message_map returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_messages_get(snowflake channel_id, snowflake around, snowflake before, snowflake after, uint64_t limit) {
-	return dpp::awaitable(this, [&] (auto cc) { this->messages_get(channel_id, around, before, after, limit, cc); }); 
-}
-
-/**
- * @brief Unpin a message
- * @see dpp::cluster::message_unpin
- * @see https://discord.com/developers/docs/resources/channel#unpin-message
- * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
- * @param channel_id Channel id to unpin message on
- * @param message_id Message id to unpin message on
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_message_unpin(snowflake channel_id, snowflake message_id) {
-	return dpp::awaitable(this, [&] (auto cc) { this->message_unpin(channel_id, message_id, cc); }); 
-}
-
-/**
- * @brief Get a channel's pins
- * @see dpp::cluster::channel_pins_get
- * @see https://discord.com/developers/docs/resources/channel#get-pinned-messages
- * @param channel_id Channel ID to get pins for
- * @return message_map returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_channel_pins_get(snowflake channel_id) {
-	return dpp::awaitable(this, [&] (auto cc) { this->channel_pins_get(channel_id, cc); }); 
-}
-
-/**
- * @brief Create a role on a guild
- * 
- * Create a new role for the guild. Requires the `MANAGE_ROLES` permission. Returns the new role object on success.
- * Fires a `Guild Role Create` Gateway event.
- * 
- * @see dpp::cluster::role_create
- * @see https://discord.com/developers/docs/resources/guild#create-guild-role
- * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
- * @param r Role to create (guild ID is encapsulated in the role object)
- * @return role returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_role_create(const class role &r) {
-	return dpp::awaitable(this, [&] (auto cc) { this->role_create(r, cc); }); 
-}
-
-/**
- * @brief Delete a role
- * 
- * Requires the `MANAGE_ROLES` permission. Fires a `Guild Role Delete` Gateway event.
- * 
- * @see dpp::cluster::role_delete
- * @see https://discord.com/developers/docs/resources/guild#delete-guild-role
- * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
- * @param guild_id Guild ID to delete the role on
- * @param role_id Role ID to delete
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_role_delete(snowflake guild_id, snowflake role_id) {
-	return dpp::awaitable(this, [&] (auto cc) { this->role_delete(guild_id, role_id, cc); }); 
-}
-
-/**
- * @brief Edit a role on a guild
- * 
- * Requires the `MANAGE_ROLES` permission. Returns the updated role on success. Fires a `Guild Role Update` Gateway event.
- * 
- * @see dpp::cluster::role_edit
- * @see https://discord.com/developers/docs/resources/guild#modify-guild-role
- * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
- * @param r Role to edit
- * @return role returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_role_edit(const class role &r) {
-	return dpp::awaitable(this, [&] (auto cc) { this->role_edit(r, cc); }); 
-}
-
-/**
- * @brief Edit multiple role's position in a guild. Returns a list of all roles of the guild on success.
- *
- * Modify the positions of a set of role objects for the guild. Requires the `MANAGE_ROLES` permission.
- * Fires multiple `Guild Role Update` Gateway events.
- *
- * @see dpp::cluster::roles_edit_position
- * @see https://discord.com/developers/docs/resources/guild#modify-guild-role-positions
- * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
- * @param guild_id Guild ID to change the roles position on
- * @param roles Vector of roles to change the positions of
- * @return role_map returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_roles_edit_position(snowflake guild_id, const std::vector<role> &roles) {
-	return dpp::awaitable(this, [&] (auto cc) { this->roles_edit_position(guild_id, roles, cc); }); 
-}
-
-/**
- * @brief Get a role for a guild
- *
- * @see dpp::cluster::roles_get
- * @see https://discord.com/developers/docs/resources/guild#get-guild-roles
- * @param guild_id Guild ID to get role for
- * @return role_map returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_roles_get(snowflake guild_id) {
-	return dpp::awaitable(this, [&] (auto cc) { this->roles_get(guild_id, cc); }); 
-}
-
-/**
- * @brief Get all scheduled events for a guild
- * @see dpp::cluster::guild_events_get
- * @see https://discord.com/developers/docs/resources/guild-scheduled-event#list-scheduled-events-for-guild
- * @param guild_id Guild to get events for
- * @return scheduled_event_map returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_guild_events_get(snowflake guild_id) {
-	return dpp::awaitable(this, [&] (auto cc) { this->guild_events_get(guild_id, cc); }); 
-}
-
-/**
- * @brief Create a scheduled event on a guild
- *
- * @see dpp::cluster::guild_event_create
- * @see https://discord.com/developers/docs/resources/guild-scheduled-event#create-guild-scheduled-event
- * @param event Event to create (guild ID must be populated)
- * @return scheduled_event returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_guild_event_create(const scheduled_event& event) {
-	return dpp::awaitable(this, [&] (auto cc) { this->guild_event_create(event, cc); }); 
-}
-
-/**
- * @brief Delete a scheduled event from a guild
- *
- * @see dpp::cluster::guild_event_delete
- * @see https://discord.com/developers/docs/resources/guild-scheduled-event#delete-guild-scheduled-event
- * @param event_id Event ID to delete
- * @param guild_id Guild ID of event to delete
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_guild_event_delete(snowflake event_id, snowflake guild_id) {
-	return dpp::awaitable(this, [&] (auto cc) { this->guild_event_delete(event_id, guild_id, cc); }); 
-}
-
-/**
- * @brief Edit/modify a scheduled event on a guild
- *
- * @see dpp::cluster::guild_event_edit
- * @see https://discord.com/developers/docs/resources/guild-scheduled-event#modify-guild-scheduled-event
- * @param event Event to create (event ID and guild ID must be populated)
- * @return scheduled_event returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_guild_event_edit(const scheduled_event& event) {
-	return dpp::awaitable(this, [&] (auto cc) { this->guild_event_edit(event, cc); }); 
-}
-
-/**
- * @brief Get a scheduled event for a guild
- *
- * @see dpp::cluster::guild_event_get
- * @see https://discord.com/developers/docs/resources/guild-scheduled-event#get-guild-scheduled-event
- * @param guild_id Guild to get event for
- * @param event_id Event ID to get
- * @return scheduled_event returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_guild_event_get(snowflake guild_id, snowflake event_id) {
-	return dpp::awaitable(this, [&] (auto cc) { this->guild_event_get(guild_id, event_id, cc); }); 
-}
-
-
-auto inline co_stage_instance_create(const stage_instance& si) {
-	return dpp::awaitable(this, [&] (auto cc) { this->stage_instance_create(si, cc); }); 
-}
-
-/**
- * @brief Get the stage instance associated with the channel id, if it exists.
- * @see dpp::cluster::stage_instance_get
- * @see https://discord.com/developers/docs/resources/stage-instance#get-stage-instance
- * @param channel_id ID of the associated channel
- * @return stage_instance returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_stage_instance_get(const snowflake channel_id) {
-	return dpp::awaitable(this, [&] (auto cc) { this->stage_instance_get(channel_id, cc); }); 
-}
-
-
-auto inline co_stage_instance_edit(const stage_instance& si) {
-	return dpp::awaitable(this, [&] (auto cc) { this->stage_instance_edit(si, cc); }); 
-}
-
-/**
- * @brief Delete a stage instance.
- * @see dpp::cluster::stage_instance_delete
- * @see https://discord.com/developers/docs/resources/stage-instance#delete-stage-instance
- * @param channel_id ID of the associated channel
- * @return confirmation returned object on completion
- * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
- * \memberof dpp::cluster
- */
-auto inline co_stage_instance_delete(const snowflake channel_id) {
-	return dpp::awaitable(this, [&] (auto cc) { this->stage_instance_delete(channel_id, cc); }); 
-}
-
-/**
- * @brief Create a sticker in a guild
- * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
- * @see dpp::cluster::guild_sticker_create
- * @see https://discord.com/developers/docs/resources/sticker#create-guild-sticker
- * @param s Sticker to create. Must have its guild ID set.
- * @return sticker returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_guild_sticker_create(sticker &s) {
-	return dpp::awaitable(this, [&] (auto cc) { this->guild_sticker_create(s, cc); }); 
-}
-
-/**
- * @brief Delete a sticker from a guild
- * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
- * @see dpp::cluster::guild_sticker_delete
- * @see https://discord.com/developers/docs/resources/sticker#delete-guild-sticker
- * @param sticker_id sticker ID to delete
- * @param guild_id guild ID to delete from
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_guild_sticker_delete(snowflake sticker_id, snowflake guild_id) {
-	return dpp::awaitable(this, [&] (auto cc) { this->guild_sticker_delete(sticker_id, guild_id, cc); }); 
-}
-
-/**
- * @brief Get a guild sticker
- * @see dpp::cluster::guild_sticker_get
- * @see https://discord.com/developers/docs/resources/sticker#get-guild-sticker
- * @param id Id of sticker to get.
- * @param guild_id Guild ID of the guild where the sticker is
- * @return sticker returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_guild_sticker_get(snowflake id, snowflake guild_id) {
-	return dpp::awaitable(this, [&] (auto cc) { this->guild_sticker_get(id, guild_id, cc); }); 
-}
-
-/**
- * @brief Modify a sticker in a guild
- * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
- * @see dpp::cluster::guild_sticker_modify
- * @see https://discord.com/developers/docs/resources/sticker#modify-guild-sticker
- * @param s Sticker to modify. Must have its guild ID and sticker ID set.
- * @return sticker returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_guild_sticker_modify(sticker &s) {
-	return dpp::awaitable(this, [&] (auto cc) { this->guild_sticker_modify(s, cc); }); 
-}
-
-/**
- * @brief Get all guild stickers
- * @see dpp::cluster::guild_stickers_get
- * @see https://discord.com/developers/docs/resources/sticker#get-guild-stickers
- * @param guild_id Guild ID of the guild where the sticker is
- * @return sticker_map returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_guild_stickers_get(snowflake guild_id) {
-	return dpp::awaitable(this, [&] (auto cc) { this->guild_stickers_get(guild_id, cc); }); 
-}
-
-/**
- * @brief Get a nitro sticker
- * @see dpp::cluster::nitro_sticker_get
- * @see https://discord.com/developers/docs/resources/sticker#get-sticker
- * @param id Id of sticker to get.
- * @return sticker returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_nitro_sticker_get(snowflake id) {
-	return dpp::awaitable(this, [&] (auto cc) { this->nitro_sticker_get(id, cc); }); 
-}
-
-/**
- * @brief Get sticker packs
- * @see dpp::cluster::sticker_packs_get
- * @see https://discord.com/developers/docs/resources/sticker#list-nitro-sticker-packs
- * @return sticker_pack_map returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_sticker_packs_get() {
-	return dpp::awaitable(this, [&] (auto cc) { this->sticker_packs_get(cc); }); 
-}
-
-/**
- * @brief Create a new guild based on a template.
- * @note This endpoint can be used only by bots in less than 10 guilds.
- * @see dpp::cluster::guild_create_from_template
- * @see https://discord.com/developers/docs/resources/guild-template#create-guild-from-guild-template
- * @param code Template code to create guild from
- * @param name Guild name to create
- * @return guild returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_guild_create_from_template(const std::string &code, const std::string &name) {
-	return dpp::awaitable(this, [&] (auto cc) { this->guild_create_from_template(code, name, cc); }); 
-}
-
-/**
- * @brief Creates a template for the guild
- *
- * @see dpp::cluster::guild_template_create
- * @see https://discord.com/developers/docs/resources/guild-template#create-guild-template
- * @param guild_id Guild to create template from
- * @param name Template name to create
- * @param description Description of template to create
- * @return dtemplate returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_guild_template_create(snowflake guild_id, const std::string &name, const std::string &description) {
-	return dpp::awaitable(this, [&] (auto cc) { this->guild_template_create(guild_id, name, description, cc); }); 
-}
-
-/**
- * @brief Deletes the template
- *
- * @see dpp::cluster::guild_template_delete
- * @see https://discord.com/developers/docs/resources/guild-template#delete-guild-template
- * @param guild_id Guild ID of template to delete
- * @param code Template code to delete
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_guild_template_delete(snowflake guild_id, const std::string &code) {
-	return dpp::awaitable(this, [&] (auto cc) { this->guild_template_delete(guild_id, code, cc); }); 
-}
-
-/**
- * @brief Modifies the template's metadata.
- *
- * @see dpp::cluster::guild_template_modify
- * @see https://discord.com/developers/docs/resources/guild-template#modify-guild-template
- * @param guild_id Guild ID of template to modify
- * @param code Template code to modify
- * @param name New name of template
- * @param description New description of template
- * @return dtemplate returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_guild_template_modify(snowflake guild_id, const std::string &code, const std::string &name, const std::string &description) {
-	return dpp::awaitable(this, [&] (auto cc) { this->guild_template_modify(guild_id, code, name, description, cc); }); 
-}
-
-/**
- * @brief Get guild templates
- *
- * @see dpp::cluster::guild_templates_get
- * @see https://discord.com/developers/docs/resources/guild-template#get-guild-templates
- * @param guild_id Guild ID to get templates for
- * @return dtemplate_map returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_guild_templates_get(snowflake guild_id) {
-	return dpp::awaitable(this, [&] (auto cc) { this->guild_templates_get(guild_id, cc); }); 
-}
-
-/**
- * @brief Syncs the template to the guild's current state.
- *
- * @see dpp::cluster::guild_template_sync
- * @see https://discord.com/developers/docs/resources/guild-template#sync-guild-template
- * @param guild_id Guild to synchronise template for
- * @param code Code of template to synchronise
- * @return dtemplate returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_guild_template_sync(snowflake guild_id, const std::string &code) {
-	return dpp::awaitable(this, [&] (auto cc) { this->guild_template_sync(guild_id, code, cc); }); 
-}
-
-/**
- * @brief Get a template
- * @see dpp::cluster::template_get
- * @see https://discord.com/developers/docs/resources/guild-template#get-guild-template
- * @param code Template code
- * @return dtemplate returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_template_get(const std::string &code) {
-	return dpp::awaitable(this, [&] (auto cc) { this->template_get(code, cc); }); 
-}
-
-/**
- * @brief Join a thread
- * @see dpp::cluster::current_user_join_thread
- * @see https://discord.com/developers/docs/topics/threads
- * @param thread_id Thread ID to join
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_current_user_join_thread(snowflake thread_id) {
-	return dpp::awaitable(this, [&] (auto cc) { this->current_user_join_thread(thread_id, cc); }); 
-}
-
-/**
- * @brief Leave a thread
- * @see dpp::cluster::current_user_leave_thread
- * @see https://discord.com/developers/docs/topics/threads
- * @param thread_id Thread ID to leave
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_current_user_leave_thread(snowflake thread_id) {
-	return dpp::awaitable(this, [&] (auto cc) { this->current_user_leave_thread(thread_id, cc); }); 
-}
-
-/**
- * @brief Get active threads in a channel (Sorted by ID in descending order)
- * @see dpp::cluster::threads_get_active
- * @see https://discord.com/developers/docs/topics/threads
- * @param channel_id Channel to get active threads for
- * @return thread_map returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_threads_get_active(snowflake channel_id) {
-	return dpp::awaitable(this, [&] (auto cc) { this->threads_get_active(channel_id, cc); }); 
-}
-
-/**
- * @brief Get private archived threads in a channel which current user has joined (Sorted by ID in descending order)
- * @see dpp::cluster::threads_get_joined_private_archived
- * @see https://discord.com/developers/docs/topics/threads
- * @param channel_id Channel to get public archived threads for
- * @param before_id Get threads before this id
- * @param limit Number of threads to get
- * @return thread_map returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_threads_get_joined_private_archived(snowflake channel_id, snowflake before_id, uint16_t limit) {
-	return dpp::awaitable(this, [&] (auto cc) { this->threads_get_joined_private_archived(channel_id, before_id, limit, cc); }); 
-}
-
-/**
- * @brief Get private archived threads in a channel (Sorted by archive_timestamp in descending order)
- * @see dpp::cluster::threads_get_private_archived
- * @see https://discord.com/developers/docs/topics/threads
- * @param channel_id Channel to get public archived threads for
- * @param before_timestamp Get threads before this timestamp
- * @param limit Number of threads to get
- * @return thread_map returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_threads_get_private_archived(snowflake channel_id, time_t before_timestamp, uint16_t limit) {
-	return dpp::awaitable(this, [&] (auto cc) { this->threads_get_private_archived(channel_id, before_timestamp, limit, cc); }); 
-}
-
-/**
- * @brief Get public archived threads in a channel (Sorted by archive_timestamp in descending order)
- * @see dpp::cluster::threads_get_public_archived
- * @see https://discord.com/developers/docs/topics/threads
- * @param channel_id Channel to get public archived threads for
- * @param before_timestamp Get threads before this timestamp
- * @param limit Number of threads to get
- * @return thread_map returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_threads_get_public_archived(snowflake channel_id, time_t before_timestamp, uint16_t limit) {
-	return dpp::awaitable(this, [&] (auto cc) { this->threads_get_public_archived(channel_id, before_timestamp, limit, cc); }); 
-}
-
-/**
- * @brief Get a thread member
- * @see dpp::cluster::thread_member_get
- * @see https://discord.com/developers/docs/topics/threads
- * @param thread_id Thread to get member for
- * @param user_id ID of the user to get
- * @return thread_member returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_thread_member_get(const snowflake thread_id, const snowflake user_id) {
-	return dpp::awaitable(this, [&] (auto cc) { this->thread_member_get(thread_id, user_id, cc); }); 
-}
-
-/**
- * @brief Get members of a thread
- * @see dpp::cluster::thread_members_get
- * @see https://discord.com/developers/docs/topics/threads
- * @param thread_id Thread to get members for
- * @return thread_member_map returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_thread_members_get(snowflake thread_id) {
-	return dpp::awaitable(this, [&] (auto cc) { this->thread_members_get(thread_id, cc); }); 
-}
-
-/**
- * @brief Create a thread
- * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
- *
- * @see dpp::cluster::thread_create
- * @see https://discord.com/developers/docs/resources/guild#create-guild-channel
- * @param thread_name Name of the thread
- * @param channel_id Channel in which thread to create
- * @param auto_archive_duration Duration after which thread auto-archives. Can be set to - 60, 1440 (for boosted guilds can also be: 4320, 10080)
- * @param thread_type Type of thread - CHANNEL_PUBLIC_THREAD, CHANNEL_ANNOUNCEMENT_THREAD, CHANNEL_PRIVATE_THREAD
- * @param invitable whether non-moderators can add other non-moderators to a thread; only available when creating a private thread
- * @param rate_limit_per_user amount of seconds a user has to wait before sending another message (0-21600); bots, as well as users with the permission manage_messages, manage_thread, or manage_channel, are unaffected
- * @return thread returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_thread_create(const std::string& thread_name, snowflake channel_id, uint16_t auto_archive_duration, channel_type thread_type, bool invitable, uint16_t rate_limit_per_user) {
-	return dpp::awaitable(this, [&] (auto cc) { this->thread_create(thread_name, channel_id, auto_archive_duration, thread_type, invitable, rate_limit_per_user, cc); }); 
-}
-
-/**
- * @brief Create a thread with a message (Discord: ID of a thread is same as message ID)
- * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
- * @see dpp::cluster::thread_create_with_message
- * @see https://discord.com/developers/docs/topics/threads
- * @param thread_name Name of the thread
- * @param channel_id Channel in which thread to create
- * @param message_id message to start thread with
- * @param auto_archive_duration Duration after which thread auto-archives. Can be set to - 60, 1440 (for boosted guilds can also be: 4320, 10080)
- * @param rate_limit_per_user amount of seconds a user has to wait before sending another message (0-21600); bots, as well as users with the permission manage_messages, manage_thread, or manage_channel, are unaffected
- * @return thread returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_thread_create_with_message(const std::string& thread_name, snowflake channel_id, snowflake message_id, uint16_t auto_archive_duration, uint16_t rate_limit_per_user) {
-	return dpp::awaitable(this, [&] (auto cc) { this->thread_create_with_message(thread_name, channel_id, message_id, auto_archive_duration, rate_limit_per_user, cc); }); 
-}
-
-/**
- * @brief Add a member to a thread
- * @see dpp::cluster::thread_member_add
- * @see https://discord.com/developers/docs/topics/threads
- * @param thread_id Thread ID to add to
- * @param user_id Member ID to add
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_thread_member_add(snowflake thread_id, snowflake user_id) {
-	return dpp::awaitable(this, [&] (auto cc) { this->thread_member_add(thread_id, user_id, cc); }); 
-}
-
-/**
- * @brief Remove a member from a thread
- * @see dpp::cluster::thread_member_remove
- * @see https://discord.com/developers/docs/topics/threads
- * @param thread_id Thread ID to remove from
- * @param user_id Member ID to remove
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_thread_member_remove(snowflake thread_id, snowflake user_id) {
-	return dpp::awaitable(this, [&] (auto cc) { this->thread_member_remove(thread_id, user_id, cc); }); 
-}
-
-/**
- * @brief Edit current (bot) user
- *
- * Modifies the current member in a guild. Returns the updated guild_member object on success.
- * Fires a `Guild Member Update` Gateway event.
- * @see dpp::cluster::current_user_edit
- * @see https://discord.com/developers/docs/resources/user#modify-current-user
- * @param nickname Nickname to set
- * @param image_blob Avatar data to upload (NOTE: Very heavily rate limited!)
- * @param type Type of image for avatar
- * @return user returned object on completion
- 	 * @throw dpp::exception Image data is larger than the maximum size of 256 kilobytes
- * \memberof dpp::cluster
- */
-auto inline co_current_user_edit(const std::string &nickname, const std::string& image_blob, const image_type type) {
-	return dpp::awaitable(this, [&] (auto cc) { this->current_user_edit(nickname, image_blob, type, cc); }); 
-}
-
-/**
- * @brief Get current (bot) application
- *
- * @see dpp::cluster::current_application_get
- * @see https://discord.com/developers/docs/topics/oauth2#get-current-bot-application-information
- * @return application returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_current_application_get() {
-	return dpp::awaitable(this, [&] (auto cc) { this->current_application_get(cc); }); 
-}
-
-/**
- * @brief Get current (bot) user
- *
- * @see dpp::cluster::current_user_get
- * @see https://discord.com/developers/docs/resources/user#get-current-user
- * @return user_identified returned object on completion
- * @note The user_identified object is a subclass of dpp::user which contains further details if you have the oauth2 identify or email scopes.
- * If you do not have these scopes, these fields are empty. You can safely convert a user_identified to user with `dynamic_cast`.
- * \memberof dpp::cluster
- */
-auto inline co_current_user_get() {
-	return dpp::awaitable(this, [&] (auto cc) { this->current_user_get(cc); }); 
-}
-
-/**
- * @brief Set the bot's voice state on a stage channel
- * 
- * **Caveats**
- * 
- * There are currently several caveats for this endpoint:
- * 
- * - `channel_id` must currently point to a stage channel.
- * - current user must already have joined `channel_id`.
- * - You must have the `MUTE_MEMBERS` permission to unsuppress yourself. You can always suppress yourself.
- * - You must have the `REQUEST_TO_SPEAK` permission to request to speak. You can always clear your own request to speak.
- * - You are able to set `request_to_speak_timestamp` to any present or future time.
- *
- * @see dpp::cluster::current_user_set_voice_state
- * @see https://discord.com/developers/docs/resources/guild#modify-current-user-voice-state 
- * @param guild_id Guild to set voice state on
- * @param channel_id Stage channel to set voice state on
- * @return confirmation returned object on completion
- * @param suppress True if the user's audio should be suppressed, false if it should not
- * @param request_to_speak_timestamp The time at which we requested to speak, or 0 to clear the request. The time set here must be the current time or in the future.
- * @throw std::logic_exception You attempted to set a request_to_speak_timestamp in the past which is not the value of 0.
- * \memberof dpp::cluster
- */
-auto inline co_current_user_set_voice_state(snowflake guild_id, snowflake channel_id, bool suppress, time_t request_to_speak_timestamp) {
-	return dpp::awaitable(this, [&] (auto cc) { this->current_user_set_voice_state(guild_id, channel_id, suppress, request_to_speak_timestamp, cc); }); 
-}
-
-/**
- * @brief Set a user's voice state on a stage channel
- *
- * **Caveats**
- * 
- * There are currently several caveats for this endpoint:
- * 
- * - `channel_id` must currently point to a stage channel.
- * - User must already have joined `channel_id`.
- * - You must have the `MUTE_MEMBERS` permission. (Since suppression is the only thing that is available currently)
- * - When unsuppressed, non-bot users will have their `request_to_speak_timestamp` set to the current time. Bot users will not.
- * - When suppressed, the user will have their `request_to_speak_timestamp` removed.
- * 
- * @see dpp::cluster::user_set_voice_state
- * @see https://discord.com/developers/docs/resources/guild#modify-user-voice-state
- * @param user_id The user to set the voice state of
- * @param guild_id Guild to set voice state on
- * @param channel_id Stage channel to set voice state on
- * @return confirmation returned object on completion
- * @param suppress True if the user's audio should be suppressed, false if it should not
- * \memberof dpp::cluster
- */
-auto inline co_user_set_voice_state(snowflake user_id, snowflake guild_id, snowflake channel_id, bool suppress) {
-	return dpp::awaitable(this, [&] (auto cc) { this->user_set_voice_state(user_id, guild_id, channel_id, suppress, cc); }); 
-}
-
-/**
- * @brief Get current user's connections (linked accounts, e.g. steam, xbox).
- * This call requires the oauth2 `connections` scope and cannot be executed
- * against a bot token.
- * @see dpp::cluster::current_user_connections_get
- * @see https://discord.com/developers/docs/resources/user#get-user-connections
- * @return connection_map returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_current_user_connections_get() {
-	return dpp::awaitable(this, [&] (auto cc) { this->current_user_connections_get(cc); }); 
-}
-
-/**
- * @brief Get current (bot) user guilds
- * @see dpp::cluster::current_user_get_guilds
- * @see https://discord.com/developers/docs/resources/user#get-current-user-guilds
- * @return guild_map returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_current_user_get_guilds() {
-	return dpp::awaitable(this, [&] (auto cc) { this->current_user_get_guilds(cc); }); 
-}
-
-/**
- * @brief Leave a guild
- * @see dpp::cluster::current_user_leave_guild
- * @see https://discord.com/developers/docs/resources/user#leave-guild
- * @param guild_id Guild ID to leave
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_current_user_leave_guild(snowflake guild_id) {
-	return dpp::awaitable(this, [&] (auto cc) { this->current_user_leave_guild(guild_id, cc); }); 
-}
-
-/**
- * @brief Get a user by id
- *
- * @see dpp::cluster::user_get
- * @see https://discord.com/developers/docs/resources/user#get-user
- * @param user_id User ID to retrieve
- * @return user_identified returned object on completion
- * @note The user_identified object is a subclass of dpp::user which contains further details if you have the oauth2 identify or email scopes.
- * If you do not have these scopes, these fields are empty. You can safely convert a user_identified to user with `dynamic_cast`.
- * @note unless you want something special from `dpp::user_identified` or you've turned off caching, you have no need to call this.
- * Call `dpp::find_user` instead that looks up the user in the cache rather than a REST call.
- * \memberof dpp::cluster
- */
-auto inline co_user_get(snowflake user_id) {
-	return dpp::awaitable(this, [&] (auto cc) { this->user_get(user_id, cc); }); 
-}
-
-/**
- * @brief Get all voice regions
- * @see dpp::cluster::get_voice_regions
- * @see https://discord.com/developers/docs/resources/voice#list-voice-regions
- * @return voiceregion_map returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_get_voice_regions() {
-	return dpp::awaitable(this, [&] (auto cc) { this->get_voice_regions(cc); }); 
-}
-
-/**
- * @brief Get guild voice regions.
- * 
- * Voice regions per guild are somewhat deprecated in preference of per-channel voice regions.
- * Returns a list of voice region objects for the guild. Unlike the similar /voice route, this returns VIP servers when
- * the guild is VIP-enabled.
- *
- * @see dpp::cluster::guild_get_voice_regions
- * @see https://discord.com/developers/docs/resources/guild#get-guild-voice-regions
- * @param guild_id Guild ID to get voice regions for
- * @return voiceregion_map returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_guild_get_voice_regions(snowflake guild_id) {
-	return dpp::awaitable(this, [&] (auto cc) { this->guild_get_voice_regions(guild_id, cc); }); 
-}
-
-/**
- * @brief Create a webhook
- * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
- * @see dpp::cluster::create_webhook
- * @see https://discord.com/developers/docs/resources/webhook#create-webhook
- * @param w Webhook to create
- * @return webhook returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_create_webhook(const class webhook &w) {
-	return dpp::awaitable(this, [&] (auto cc) { this->create_webhook(w, cc); }); 
-}
-
-/**
- * @brief Delete a webhook
- * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
- * @see dpp::cluster::delete_webhook
- * @see https://discord.com/developers/docs/resources/webhook#delete-webhook
- * @param webhook_id Webhook ID to delete
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_delete_webhook(snowflake webhook_id) {
-	return dpp::awaitable(this, [&] (auto cc) { this->delete_webhook(webhook_id, cc); }); 
-}
-
-/**
- * @brief Delete webhook message
- *
- * @see dpp::cluster::delete_webhook_message
- * @see https://discord.com/developers/docs/resources/webhook#delete-webhook-message
- * @param wh Webhook to delete message for
- * @param message_id Message ID to delete
- * @param thread_id ID of the thread the message is in
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_delete_webhook_message(const class webhook &wh, snowflake message_id, snowflake thread_id) {
-	return dpp::awaitable(this, [&] (auto cc) { this->delete_webhook_message(wh, message_id, thread_id, cc); }); 
-}
-
-/**
- * @brief Delete webhook with token
- * @see dpp::cluster::delete_webhook_with_token
- * @see https://discord.com/developers/docs/resources/webhook#delete-webhook-with-token
- * @param webhook_id Webhook ID to delete
- * @param token Token of webhook to delete
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_delete_webhook_with_token(snowflake webhook_id, const std::string &token) {
-	return dpp::awaitable(this, [&] (auto cc) { this->delete_webhook_with_token(webhook_id, token, cc); }); 
-}
-
-/**
- * @brief Edit webhook
- * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
- * @see dpp::cluster::edit_webhook
- * @see https://discord.com/developers/docs/resources/webhook#modify-webhook
- * @param wh Webhook to edit
- * @return webhook returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_edit_webhook(const class webhook& wh) {
-	return dpp::awaitable(this, [&] (auto cc) { this->edit_webhook(wh, cc); }); 
-}
-
-/**
- * @brief Edit webhook message
- *
- * When the content field is edited, the mentions array in the message object will be reconstructed from scratch based on
- * the new content. The allowed_mentions field of the edit request controls how this happens. If there is no explicit
- * allowed_mentions in the edit request, the content will be parsed with default allowances, that is, without regard to
- * whether or not an allowed_mentions was present in the request that originally created the message.
- * 
- * @see dpp::cluster::edit_webhook_message
- * @see https://discord.com/developers/docs/resources/webhook#edit-webhook-message
- * @note the attachments array must contain all attachments that should be present after edit, including retained and new attachments provided in the request body.
- * @param wh Webhook to edit message for
- * @param m New message
- * @param thread_id ID of the thread the message is in
- * @return message returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_edit_webhook_message(const class webhook &wh, const struct message& m, snowflake thread_id) {
-	return dpp::awaitable(this, [&] (auto cc) { this->edit_webhook_message(wh, m, thread_id, cc); }); 
-}
-
-/**
- * @brief Edit webhook with token (token is encapsulated in the webhook object)
- * @see dpp::cluster::edit_webhook_with_token
- * @see https://discord.com/developers/docs/resources/webhook#modify-webhook-with-token
- * @param wh Webhook to edit (should include token)
- * @return webhook returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_edit_webhook_with_token(const class webhook& wh) {
-	return dpp::awaitable(this, [&] (auto cc) { this->edit_webhook_with_token(wh, cc); }); 
-}
-
-/**
- * @brief Execute webhook
- *
- * @see dpp::cluster::execute_webhook
- * @see https://discord.com/developers/docs/resources/webhook#execute-webhook
- * @param wh Webhook to execute
- * @param m Message to send
- * @param wait waits for server confirmation of message send before response, and returns the created message body
- * @param thread_id Send a message to the specified thread within a webhook's channel. The thread will automatically be unarchived
- * @param thread_name Name of thread to create (requires the webhook channel to be a forum channel)
- * @return message returned object on completion
- * @note If the webhook channel is a forum channel, you must provide either `thread_id` or `thread_name`. If `thread_id` is provided, the message will send in that thread. If `thread_name` is provided, a thread with that name will be created in the forum channel.
- * \memberof dpp::cluster
- */
-auto inline co_execute_webhook(const class webhook &wh, const struct message& m, bool wait, snowflake thread_id, const std::string& thread_name) {
-	return dpp::awaitable(this, [&] (auto cc) { this->execute_webhook(wh, m, wait, thread_id, thread_name, cc); }); 
-}
-
-/**
- * @brief Get channel webhooks
- * @see dpp::cluster::get_channel_webhooks
- * @see https://discord.com/developers/docs/resources/webhook#get-guild-webhooks
- * @param channel_id Channel ID to get webhooks for
- * @return webhook_map returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_get_channel_webhooks(snowflake channel_id) {
-	return dpp::awaitable(this, [&] (auto cc) { this->get_channel_webhooks(channel_id, cc); }); 
-}
-
-/**
- * @brief Get guild webhooks
- * @see dpp::cluster::get_guild_webhooks
- * @see https://discord.com/developers/docs/resources/webhook#get-guild-webhooks
- * @param guild_id Guild ID to get webhooks for
- * @return webhook_map returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_get_guild_webhooks(snowflake guild_id) {
-	return dpp::awaitable(this, [&] (auto cc) { this->get_guild_webhooks(guild_id, cc); }); 
-}
-
-/**
- * @brief Get webhook
- * @see dpp::cluster::get_webhook
- * @see https://discord.com/developers/docs/resources/webhook#get-webhook
- * @param webhook_id Webhook ID to get
- * @return webhook returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_get_webhook(snowflake webhook_id) {
-	return dpp::awaitable(this, [&] (auto cc) { this->get_webhook(webhook_id, cc); }); 
-}
-
-/**
- * @brief Get webhook message
- *
- * @see dpp::cluster::get_webhook_message
- * @see https://discord.com/developers/docs/resources/webhook#get-webhook-message
- * @param wh Webhook to get the original message for
- * @param message_id The message ID
- * @param thread_id ID of the thread the message is in
- * @return message returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_get_webhook_message(const class webhook &wh, snowflake message_id, snowflake thread_id) {
-	return dpp::awaitable(this, [&] (auto cc) { this->get_webhook_message(wh, message_id, thread_id, cc); }); 
-}
-
-/**
- * @brief Get webhook using token
- * @see dpp::cluster::get_webhook_with_token
- * @see https://discord.com/developers/docs/resources/webhook#get-webhook-with-token
- * @param webhook_id Webhook ID to retrieve
- * @param token Token of webhook
- * @return webhook returned object on completion
- * \memberof dpp::cluster
- */
-auto inline co_get_webhook_with_token(snowflake webhook_id, const std::string &token) {
-	return dpp::awaitable(this, [&] (auto cc) { this->get_webhook_with_token(webhook_id, token, cc); }); 
-}
-
-
-/* End of auto-generated definitions */
-auto inline co_request(const std::string &url, http_method method, const std::string &postdata = "", const std::string &mimetype = "text/plain", const std::multimap<std::string, std::string> &headers = {}) {
-	return dpp::awaitable(this, [&] (auto cc) { this->request(url, method, cc, mimetype, headers); }); 
-}
-
+/************************************************************************************
+ *
+ * D++, A Lightweight C++ library for Discord
+ *
+ * Copyright 2022 Craig Edwards and D++ contributors
+ * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ************************************************************************************/
+
+
+/* Auto @generated by buildtools/make_coro_struct.php.
+ *
+ * DO NOT EDIT BY HAND!
+ *
+ * To re-generate this header file re-run the script!
+ */
+/**
+ * @brief Create/overwrite global slash commands.
+ * Any existing global slash commands will be deleted and replaced with these.
+ *
+ * @see dpp::cluster::global_bulk_command_create
+ * @see https://discord.com/developers/docs/interactions/application-commands#bulk-overwrite-global-application-commands
+ * @param commands Vector of slash commands to create/update.
+ * overwriting existing commands that are registered globally for this application.
+ * Commands that do not already exist will count toward daily application command create limits.
+ * @return slashcommand_map returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_global_bulk_command_create(const std::vector<slashcommand> &commands);
+
+/**
+ * @brief Delete all existing global slash commands.
+ * 
+ * @see dpp::cluster::global_bulk_command_delete
+ * @see https://discord.com/developers/docs/interactions/application-commands#bulk-overwrite-global-application-commands
+ * @return slashcommand_map returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_global_bulk_command_delete();
+
+/**
+ * @brief Create a global slash command (a bot can have a maximum of 100 of these).
+ * 
+ * @see dpp::cluster::global_command_create
+ * @see https://discord.com/developers/docs/interactions/application-commands#create-global-application-command
+ * @param s Slash command to create
+ * @return slashcommand returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_global_command_create(const slashcommand &s);
+
+/**
+ * @brief Get a global slash command
+ *
+ * @see dpp::cluster::global_command_get
+ * @see https://discord.com/developers/docs/interactions/application-commands#get-global-application-command
+ * @param id The ID of the slash command
+ * @return slashcommand returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_global_command_get(snowflake id);
+
+/**
+ * @brief Delete a global slash command (a bot can have a maximum of 100 of these)
+ *
+ * @see dpp::cluster::global_command_delete
+ * @see https://discord.com/developers/docs/interactions/application-commands#delete-global-application-command
+ * @param id Slash command to delete
+ * @return confirmation returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_global_command_delete(snowflake id);
+
+/**
+ * @brief Edit a global slash command (a bot can have a maximum of 100 of these)
+ *
+ * @see dpp::cluster::global_command_edit
+ * @see https://discord.com/developers/docs/interactions/application-commands#edit-global-application-command
+ * @param s Slash command to change
+ * @return confirmation returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_global_command_edit(const slashcommand &s);
+
+/**
+ * @brief Get the application's global slash commands
+ *
+ * @see dpp::cluster::global_commands_get
+ * @see https://discord.com/developers/docs/interactions/application-commands#get-global-application-commands
+ * @return slashcommand_map returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_global_commands_get();
+
+/**
+ * @brief Create/overwrite guild slash commands.
+ * Any existing guild slash commands on this guild will be deleted and replaced with these.
+ *
+ * @see dpp::cluster::guild_bulk_command_create
+ * @see https://discord.com/developers/docs/interactions/application-commands#bulk-overwrite-guild-application-commands
+ * @param commands Vector of slash commands to create/update.
+ * New guild commands will be available in the guild immediately. If the command did not already exist, it will count toward daily application command create limits.
+ * @param guild_id Guild ID to create/update the slash commands in
+ * @return slashcommand_map returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_guild_bulk_command_create(const std::vector<slashcommand> &commands, snowflake guild_id);
+
+/**
+ * @brief Delete all existing guild slash commands.
+ * 
+ * @see dpp::cluster::guild_bulk_command_delete
+ * @see https://discord.com/developers/docs/interactions/application-commands#bulk-overwrite-global-application-commands
+ * @param guild_id Guild ID to delete the slash commands in.
+ * @return slashcommand_map returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_guild_bulk_command_delete(snowflake guild_id);
+
+/**
+ * @brief Get all slash command permissions of a guild
+ *
+ * @see dpp::cluster::guild_commands_get_permissions
+ * @see https://discord.com/developers/docs/interactions/application-commands#get-application-command-permissions
+ * @param guild_id Guild ID to get the slash commands permissions for
+ * @return guild_command_permissions_map returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_guild_commands_get_permissions(snowflake guild_id);
+
+/**
+ * @brief Edit/Overwrite the permissions of all existing slash commands in a guild
+ *
+ * @note You can only add up to 10 permission overwrites for a command
+ *
+ * @see dpp::cluster::guild_bulk_command_edit_permissions
+ * @see https://discord.com/developers/docs/interactions/application-commands#batch-edit-application-command-permissions
+ * @warning The endpoint will overwrite all existing permissions for all commands of the application in a guild, including slash commands, user commands, and message commands. Meaning that if you forgot to pass a slash command, the permissions of it might be removed.
+ * @param commands A vector of slash commands to edit/overwrite the permissions for
+ * @param guild_id Guild ID to edit permissions of the slash commands in
+ * @return guild_command_permissions_map returned object on completion
+ * @deprecated This has been disabled with updates to Permissions v2. You can use guild_command_edit_permissions instead
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_guild_bulk_command_edit_permissions(const std::vector<slashcommand> &commands, snowflake guild_id);
+
+/**
+ * @brief Create a slash command local to a guild
+ *
+ * @see dpp::cluster::guild_command_create
+ * @see https://discord.com/developers/docs/interactions/application-commands#create-guild-application-command
+ * @note Creating a command with the same name as an existing command for your application will overwrite the old command.
+ * @param s Slash command to create
+ * @param guild_id Guild ID to create the slash command in
+ * @return slashcommand returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_guild_command_create(const slashcommand &s, snowflake guild_id);
+
+/**
+ * @brief Delete a slash command local to a guild
+ *
+ * @see dpp::cluster::guild_command_delete
+ * @see https://discord.com/developers/docs/interactions/application-commands#delete-guild-application-command
+ * @param id Slash command to delete
+ * @param guild_id Guild ID to delete the slash command in
+ * @return confirmation returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_guild_command_delete(snowflake id, snowflake guild_id);
+
+/**
+ * @brief Edit slash command permissions of a guild
+ *
+ * @see dpp::cluster::guild_command_edit_permissions
+ * @see https://discord.com/developers/docs/interactions/application-commands#edit-application-command-permissions
+ * @note You can only add up to 10 permission overwrites for a command
+ * @param s Slash command to edit the permissions for
+ * @param guild_id Guild ID to edit the slash command in
+ * @return confirmation returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_guild_command_edit_permissions(const slashcommand &s, snowflake guild_id);
+
+/**
+ * @brief Get a slash command of a guild
+ *
+ * @see dpp::cluster::guild_command_get
+ * @see https://discord.com/developers/docs/interactions/application-commands#get-guild-application-command
+ * @note The returned slash commands will not have permissions set, you need to use a permissions getter e.g. dpp::guild_commands_get_permissions to get the guild command permissions
+ * @param id The ID of the slash command
+ * @param guild_id Guild ID to get the slash command from
+ * @return slashcommand returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_guild_command_get(snowflake id, snowflake guild_id);
+
+/**
+ * @brief Get the permissions for a slash command of a guild
+ *
+ * @see dpp::cluster::guild_command_get_permissions
+ * @see https://discord.com/developers/docs/interactions/application-commands#get-application-command-permissions
+ * @param id The ID of the slash command to get the permissions for
+ * @param guild_id Guild ID to get the permissions of
+ * @return guild_command_permissions returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_guild_command_get_permissions(snowflake id, snowflake guild_id);
+
+/**
+ * @brief Edit a slash command local to a guild
+ *
+ * @see dpp::cluster::guild_command_edit
+ * @see https://discord.com/developers/docs/interactions/application-commands#edit-guild-application-command
+ * @param s Slash command to edit
+ * @param guild_id Guild ID to edit the slash command in
+ * @return confirmation returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_guild_command_edit(const slashcommand &s, snowflake guild_id);
+
+/**
+ * @brief Get the application's slash commands for a guild
+ *
+ * @see dpp::cluster::guild_commands_get
+ * @see https://discord.com/developers/docs/interactions/application-commands#get-guild-application-commands
+ * @note The returned slash commands will not have permissions set, you need to use a permissions getter e.g. dpp::guild_commands_get_permissions to get the guild command permissions
+ * @param guild_id Guild ID to get the slash commands for
+ * @return slashcommand_map returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_guild_commands_get(snowflake guild_id);
+
+/**
+ * @brief Respond to a slash command
+ *
+ * @see dpp::cluster::interaction_response_create
+ * @see https://discord.com/developers/docs/interactions/receiving-and-responding#create-interaction-response
+ * @param interaction_id Interaction id to respond to
+ * @param token Token for the interaction webhook
+ * @param r Response to send
+ * @return confirmation returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_interaction_response_create(snowflake interaction_id, const std::string &token, const interaction_response &r);
+
+/**
+ * @brief Edit response to a slash command
+ *
+ * @see dpp::cluster::interaction_response_edit
+ * @see https://discord.com/developers/docs/interactions/receiving-and-responding#edit-original-interaction-response
+ * @param token Token for the interaction webhook
+ * @param m Message to send
+ * @return confirmation returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_interaction_response_edit(const std::string &token, const message &m);
+
+/**
+ * @brief Get the original response to a slash command
+ *
+ * @see dpp::cluster::interaction_response_get_original
+ * @see https://discord.com/developers/docs/interactions/receiving-and-responding#get-original-interaction-response
+ * @param token Token for the interaction webhook
+ * @return message returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_interaction_response_get_original(const std::string &token);
+
+/**
+ * @brief Create a followup message for an interaction
+ *
+ * @see dpp::cluster::interaction_followup_create
+ * @see https://discord.com/developers/docs/interactions/receiving-and-responding#create-interaction-response
+ * @param token Token for the interaction webhook
+ * @param m followup message to create
+ * @return confirmation returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_interaction_followup_create(const std::string &token, const message &m);
+
+/**
+ * @brief Edit original followup message for an interaction
+ * This is an alias for cluster::interaction_response_edit
+ * @see dpp::cluster::interaction_followup_edit_original
+ * @see cluster::interaction_response_edit
+ * 
+ * @param token Token for the interaction webhook
+ * @param m message to edit, the ID should be set
+ * @return confirmation returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_interaction_followup_edit_original(const std::string &token, const message &m);
+
+/**
+ * @brief Delete the initial interaction response
+ *
+ * @see dpp::cluster::interaction_followup_delete
+ * @see https://discord.com/developers/docs/interactions/receiving-and-responding#delete-original-interaction-response
+ * @param token Token for the interaction webhook
+ * @return confirmation returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_interaction_followup_delete(const std::string &token);
+
+/**
+ * @brief Edit followup message for an interaction
+ * The message ID in the message you pass should be correctly set to that of a followup message you previously sent
+ *
+ * @see dpp::cluster::interaction_followup_edit
+ * @see https://discord.com/developers/docs/interactions/receiving-and-responding#edit-followup-message
+ * @param token Token for the interaction webhook
+ * @param m message to edit, the ID should be set
+ * @return confirmation returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_interaction_followup_edit(const std::string &token, const message &m);
+
+/**
+ * @brief Get the followup message for an interaction
+ *
+ * @see dpp::cluster::interaction_followup_get
+ * @see https://discord.com/developers/docs/interactions/receiving-and-responding#get-followup-message
+ * @param token Token for the interaction webhook
+ * @param message_id message to retrieve
+ * @return message returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_interaction_followup_get(const std::string &token, snowflake message_id);
+
+/**
+ * @brief Get the original followup message for an interaction
+ * This is an alias for cluster::interaction_response_get_original
+ * @see dpp::cluster::interaction_followup_get_original
+ * @see cluster::interaction_response_get_original
+ * 
+ * @param token Token for the interaction webhook
+ * @return message returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_interaction_followup_get_original(const std::string &token);
+
+/**
+ * @brief Get all auto moderation rules for a guild
+ * 
+ * @param guild_id Guild id of the auto moderation rule
+ * @return automod_rule_map returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_automod_rules_get(snowflake guild_id);
+
+/**
+ * @brief Get a single auto moderation rule
+ * 
+ * @param guild_id Guild id of the auto moderation rule
+ * @param rule_id  Rule id to retrieve
+ * @return automod_rule returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_automod_rule_get(snowflake guild_id, snowflake rule_id);
+
+/**
+ * @brief Create an auto moderation rule
+ * 
+ * @param guild_id Guild id of the auto moderation rule
+ * @param r Auto moderation rule to create
+ * @return automod_rule returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_automod_rule_create(snowflake guild_id, const automod_rule& r);
+
+/**
+ * @brief Edit an auto moderation rule
+ * 
+ * @param guild_id Guild id of the auto moderation rule
+ * @param r Auto moderation rule to edit. The rule's id must be set.
+ * @return automod_rule returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_automod_rule_edit(snowflake guild_id, const automod_rule& r);
+
+/**
+ * @brief Delete an auto moderation rule
+ * 
+ * @param guild_id Guild id of the auto moderation rule
+ * @param rule_id Auto moderation rule id to delete
+ * @return confirmation returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_automod_rule_delete(snowflake guild_id, snowflake rule_id);
+
+/**
+ * @brief Create a channel
+ * 
+ * Create a new channel object for the guild. Requires the `MANAGE_CHANNELS` permission. If setting permission overwrites,
+ * only permissions your bot has in the guild can be allowed/denied. Setting `MANAGE_ROLES` permission in channels is only possible
+ * for guild administrators. Returns the new channel object on success. Fires a `Channel Create Gateway` event.
+ * 
+ * All parameters to this endpoint are optional excluding `name`
+ * 
+ * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
+ * @see dpp::cluster::channel_create
+ * @see https://discord.com/developers/docs/resources/channel#create-channel
+ * @param c Channel to create
+ * @return channel returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_channel_create(const class channel &c);
+
+/**
+ * @brief Remove a permission from a channel
+ * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
+ * @see dpp::cluster::channel_delete_permission
+ * @see https://discord.com/developers/docs/resources/channel#delete-channel-permission
+ * @param c Channel to remove permission from
+ * @param overwrite_id Overwrite to remove, user or channel ID
+ * @return confirmation returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_channel_delete_permission(const class channel &c, snowflake overwrite_id);
+
+/**
+ * @brief Delete a channel
+ * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
+ * @see dpp::cluster::channel_delete
+ * @see https://discord.com/developers/docs/resources/channel#deleteclose-channel
+ * @param channel_id Channel id to delete
+ * @return confirmation returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_channel_delete(snowflake channel_id);
+
+/**
+ * @brief Edit a channel's permissions
+ *
+ * @see dpp::cluster::channel_edit_permissions
+ * @see https://discord.com/developers/docs/resources/channel#edit-channel-permissions
+ * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
+ * @param c Channel to set permissions for
+ * @param overwrite_id Overwrite to change (a user or role ID)
+ * @param allow Bitmask of allowed permissions (refer to enum dpp::permissions)
+ * @param deny Bitmask of denied permissions (refer to enum dpp::permissions)
+ * @param member true if the overwrite_id is a user id, false if it is a channel id
+ * @return confirmation returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_channel_edit_permissions(const class channel &c, const snowflake overwrite_id, const uint64_t allow, const uint64_t deny, const bool member);
+
+/**
+ * @brief Edit a channel's permissions
+ *
+ * @see dpp::cluster::channel_edit_permissions
+ * @see https://discord.com/developers/docs/resources/channel#edit-channel-permissions
+ * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
+ * @param channel_id ID of the channel to set permissions for
+ * @param overwrite_id Overwrite to change (a user or role ID)
+ * @param allow Bitmask of allowed permissions (refer to enum dpp::permissions)
+ * @param deny Bitmask of denied permissions (refer to enum dpp::permissions)
+ * @param member true if the overwrite_id is a user id, false if it is a channel id
+ * @return confirmation returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_channel_edit_permissions(const snowflake channel_id, const snowflake overwrite_id, const uint64_t allow, const uint64_t deny, const bool member);
+
+/**
+ * @brief Edit multiple channels positions
+ * 
+ * Modify the positions of a set of channel objects for the guild.
+ * Requires `MANAGE_CHANNELS` permission. Fires multiple `Channel Update Gateway` events.
+ * Only channels to be modified are required.
+ *
+ * @see dpp::cluster::channel_edit_positions
+ * @see https://discord.com/developers/docs/resources/guild#modify-guild-channel-positions
+ * @param c Channel to change the position for
+ * @return confirmation returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_channel_edit_positions(const std::vector<channel> &c);
+
+/**
+ * @brief Edit a channel
+ * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
+ * @see dpp::cluster::channel_edit
+ * @see https://discord.com/developers/docs/resources/channel#modify-channel
+ * @param c Channel to edit/update
+ * @return channel returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_channel_edit(const class channel &c);
+
+/**
+ * @brief Follow an announcement (news) channel
+ * @see dpp::cluster::channel_follow_news
+ * @see https://discord.com/developers/docs/resources/channel#follow-news-channel
+ * @param c Channel id to follow
+ * @param target_channel_id Channel to subscribe the channel to
+ * @return confirmation returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_channel_follow_news(const class channel &c, snowflake target_channel_id);
+
+/**
+ * @brief Get a channel
+ *
+ * @see dpp::cluster::channel_get
+ * @see https://discord.com/developers/docs/resources/channel#get-channel
+ * @param c Channel ID to retrieve
+ * @return channel returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_channel_get(snowflake c);
+
+/**
+ * @brief Create invite for a channel
+ * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
+ * @see dpp::cluster::channel_invite_create
+ * @see https://discord.com/developers/docs/resources/channel#create-channel-invite
+ * @param c Channel to create an invite on
+ * @param i Invite to create
+ * @return invite returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_channel_invite_create(const class channel &c, const class invite &i);
+
+/**
+ * @brief Get invites for a channel
+ *
+ * @see dpp::cluster::channel_invites_get
+ * @see https://discord.com/developers/docs/resources/invite#get-invites
+ * @param c Channel to get invites for
+ * @return invite_map returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_channel_invites_get(const class channel &c);
+
+/**
+ * @brief Trigger channel typing indicator
+ * @see dpp::cluster::channel_typing
+ * @see https://discord.com/developers/docs/resources/channel#trigger-typing-indicator
+ * @param c Channel to set as typing on
+ * @return confirmation returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_channel_typing(const class channel &c);
+
+/**
+ * @brief Trigger channel typing indicator
+ * @see dpp::cluster::channel_typing
+ * @see https://discord.com/developers/docs/resources/channel#trigger-typing-indicator
+ * @param cid Channel ID to set as typing on
+ * @return confirmation returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_channel_typing(snowflake cid);
+
+/**
+ * @brief Get all channels for a guild
+ *
+ * @see dpp::cluster::channels_get
+ * @see https://discord.com/developers/docs/resources/channel#get-channels
+ * @param guild_id Guild ID to retrieve channels for
+ * @return channel_map returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_channels_get(snowflake guild_id);
+
+/**
+ * @brief Set the status of a voice channel.
+ *
+ * @see dpp::cluster::channel_set_voice_status
+ * @see https://github.com/discord/discord-api-docs/pull/6400 (please replace soon).
+ * @param channel_id The channel to update.
+ * @param status The new status for the channel.
+ * @return confirmation returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_channel_set_voice_status(snowflake channel_id, const std::string& status);
+
+/**
+ * @brief Create a dm channel
+ * @see dpp::cluster::create_dm_channel
+ * @see https://discord.com/developers/docs/resources/user#create-dm
+ * @param user_id User ID to create DM channel with
+ * @return channel returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_create_dm_channel(snowflake user_id);
+
+/**
+ * @brief Get current user DM channels
+ * 
+ * @return channel_map returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_current_user_get_dms();
+
+/**
+ * @brief Create a direct message, also create the channel for the direct message if needed
+ *
+ * @see dpp::cluster::direct_message_create
+ * @see https://discord.com/developers/docs/resources/user#create-dm
+ * @see dpp::cluster::direct_message_create
+ * @see https://discord.com/developers/docs/resources/channel#create-message
+ * @param user_id User ID of user to send message to
+ * @param m Message object
+ * @return message returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_direct_message_create(snowflake user_id, const message &m);
+
+/**
+ * @brief Adds a recipient to a Group DM using their access token
+ * @see dpp::cluster::gdm_add
+ * @see https://discord.com/developers/docs/resources/channel#group-dm-add-recipient
+ * @param channel_id Channel id to add group DM recipients to
+ * @param user_id User ID to add
+ * @param access_token Access token from OAuth2
+ * @param nick Nickname of user to apply to the chat
+ * @return confirmation returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_gdm_add(snowflake channel_id, snowflake user_id, const std::string &access_token, const std::string &nick);
+
+/**
+ * @brief Removes a recipient from a Group DM
+ * @see dpp::cluster::gdm_remove
+ * @see https://discord.com/developers/docs/resources/channel#group-dm-remove-recipient
+ * @param channel_id Channel ID of group DM
+ * @param user_id User ID to remove from group DM
+ * @return confirmation returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_gdm_remove(snowflake channel_id, snowflake user_id);
+
+/**
+ * @brief Create single emoji.
+ * You must ensure that the emoji passed contained image data using the emoji::load_image() method.
+ * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
+ *
+ * @see dpp::cluster::guild_emoji_create
+ * @see https://discord.com/developers/docs/resources/emoji#create-guild-emoji
+ * @param guild_id Guild ID to create emoji om
+ * @param newemoji Emoji to create
+ * @return emoji returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_guild_emoji_create(snowflake guild_id, const class emoji& newemoji);
+
+/**
+ * @brief Delete a guild emoji
+ * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
+ *
+ * @see dpp::cluster::guild_emoji_delete
+ * @see https://discord.com/developers/docs/resources/emoji#delete-guild-emoji
+ * @param guild_id Guild ID to delete emoji on
+ * @param emoji_id Emoji ID to delete
+ * @return confirmation returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_guild_emoji_delete(snowflake guild_id, snowflake emoji_id);
+
+/**
+ * @brief Edit a single emoji.
+ * 
+ * You must ensure that the emoji passed contained image data using the emoji::load_image() method.
+ * @see dpp::cluster::guild_emoji_edit
+ * @see https://discord.com/developers/docs/resources/emoji#modify-guild-emoji
+ * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
+ * @param guild_id Guild ID to edit emoji on
+ * @param newemoji Emoji to edit
+ * @return emoji returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_guild_emoji_edit(snowflake guild_id, const class emoji& newemoji);
+
+/**
+ * @brief Get a single emoji
+ *
+ * @see dpp::cluster::guild_emoji_get
+ * @see https://discord.com/developers/docs/resources/emoji#get-guild-emoji
+ * @param guild_id Guild ID to get emoji for
+ * @param emoji_id Emoji ID to get
+ * @return emoji returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_guild_emoji_get(snowflake guild_id, snowflake emoji_id);
+
+/**
+ * @brief Get all emojis for a guild
+ *
+ * @see dpp::cluster::guild_emojis_get
+ * @see https://discord.com/developers/docs/resources/emoji#list-guild-emojis
+ * @param guild_id Guild ID to get emojis for
+ * @return emoji_map returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_guild_emojis_get(snowflake guild_id);
+
+/**
+ * @brief List all Application Emojis
+ *
+ * @see dpp::cluster::application_emojis_get
+ * @see https://discord.com/developers/docs/resources/emoji#list-application-emojis
+ * @return emoji_map returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_application_emojis_get();
+
+/**
+ * @brief Get an Application Emoji
+ *
+ * @see dpp::cluster::application_emoji_get
+ * @see https://discord.com/developers/docs/resources/emoji#get-application-emoji
+ * @param emoji_id The ID of the Emoji to get.
+ * @return emoji returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_application_emoji_get(snowflake emoji_id);
+
+/**
+ * @brief Create an Application Emoji
+ *
+ * @see dpp::cluster::application_emoji_create
+ * @see https://discord.com/developers/docs/resources/emoji#create-application-emoji
+ * @param newemoji The emoji to create
+ * @return emoji returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_application_emoji_create(const class emoji& newemoji);
+
+/**
+ * @brief Edit an Application Emoji
+ *
+ * @see dpp::cluster::application_emoji_edit
+ * @see https://discord.com/developers/docs/resources/emoji#modify-application-emoji
+ * @param newemoji The emoji to edit
+ * @return emoji returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_application_emoji_edit(const class emoji& newemoji);
+
+/**
+ * @brief Delete an Application Emoji
+ *
+ * @see dpp::cluster::application_emoji_delete
+ * @see https://discord.com/developers/docs/resources/emoji#delete-application-emoji
+ * @param emoji_id The emoji's ID to delete.
+ * @return confirmation returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_application_emoji_delete(snowflake emoji_id);
+
+/**
+ * @brief Returns all entitlements for a given app, active and expired.
+ *
+ * @see dpp::cluster::entitlements_get
+ * @see https://discord.com/developers/docs/monetization/entitlements#list-entitlements
+ * @param user_id User ID to look up entitlements for.
+ * @param sku_ids List of SKU IDs to check entitlements for.
+ * @param before_id Retrieve entitlements before this entitlement ID.
+ * @param after_id Retrieve entitlements after this entitlement ID.
+ * @param limit Number of entitlements to return, 1-100 (default 100).
+ * @param guild_id Guild ID to look up entitlements for.
+ * @param exclude_ended Whether ended entitlements should be excluded from the search.
+ * @return entitlement_map returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_entitlements_get(snowflake user_id = 0, const std::vector<snowflake>& sku_ids = {}, snowflake before_id = 0, snowflake after_id = 0, uint8_t limit = 100, snowflake guild_id = 0, bool exclude_ended = false);
+
+/**
+ * @brief Creates a test entitlement to a given SKU for a given guild or user.
+ * Discord will act as though that user or guild has entitlement to your premium offering.
+ *
+ * @see dpp::cluster::entitlement_test_create
+ * @see https://discord.com/developers/docs/monetization/entitlements#create-test-entitlement
+ * @param new_entitlement The entitlement to create.
+ * Make sure your dpp::entitlement_type (inside your dpp::entitlement object) matches the type of the owner_id
+ * (if type is guild, owner_id is a guild id), otherwise it won't work!
+ * @return entitlement returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_entitlement_test_create(const class entitlement& new_entitlement);
+
+/**
+ * @brief Deletes a currently-active test entitlement.
+ * Discord will act as though that user or guild no longer has entitlement to your premium offering.
+ *
+ * @see dpp::cluster::entitlement_test_delete
+ * @see https://discord.com/developers/docs/monetization/entitlements#delete-test-entitlement
+ * @param entitlement_id The test entitlement to delete.
+ * @return confirmation returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_entitlement_test_delete(snowflake entitlement_id);
+
+/**
+ * @brief For One-Time Purchase consumable SKUs, marks a given entitlement for the user as consumed.
+ *
+ * @see dpp::cluster::entitlement_consume
+ * @see https://discord.com/developers/docs/monetization/entitlements#consume-an-entitlement
+ * @param entitlement_id The entitlement to mark as consumed.
+ * @return confirmation returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_entitlement_consume(snowflake entitlement_id);
+
+/**
+ * @brief Get the gateway information for the bot using the token
+ * @see dpp::cluster::get_gateway_bot
+ * @see https://discord.com/developers/docs/topics/gateway#get-gateway-bot
+ * @return gateway returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_get_gateway_bot();
+
+/**
+ * @brief Modify current member
+ *
+ * Modifies the current member in a guild.
+ * Fires a `Guild Member Update` Gateway event.
+ *
+ * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
+ * @see dpp::cluster::guild_current_member_edit
+ * @see https://discord.com/developers/docs/resources/guild#modify-current-member
+ * @param guild_id Guild ID to change on
+ * @param nickname New nickname, or empty string to clear nickname.
+ * @param banner_blob New banner, or empty string to clear banner.
+ * @param banner_type Type of image for new banner.
+ * @param avatar_blob New avatar, or empty string to clear avatar.
+ * @param avatar_type Type of image for new avatar.
+ * @param bio New bio, or empty string to clear bio
+ * @return confirmation returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_guild_current_member_edit(snowflake guild_id, const std::string& nickname, const std::string& banner_blob, const image_type banner_type, const std::string& avatar_blob, const image_type avatar_type, const std::string& bio);
+
+/**
+ * @brief Get the audit log for a guild
+ *
+ * @see dpp::cluster::guild_auditlog_get
+ * @see https://discord.com/developers/docs/resources/audit-log#get-guild-audit-log
+ * @param guild_id Guild to get the audit log of
+ * @param user_id Entries from a specific user ID. Set this to `0` will fetch any user
+ * @param action_type Entries for a specific dpp::audit_type. Set this to `0` will fetch any type
+ * @param before Entries with ID less than a specific audit log entry ID. Used for paginating
+ * @param after Entries with ID greater than a specific audit log entry ID. Used for paginating
+ * @param limit Maximum number of entries (between 1-100) to return
+ * @return auditlog returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_guild_auditlog_get(snowflake guild_id, snowflake user_id, uint32_t action_type, snowflake before, snowflake after, uint32_t limit);
+
+/**
+ * @brief Add guild ban
+ *
+ * Create a guild ban, and optionally delete previous messages sent by the banned user.
+ * Requires the `BAN_MEMBERS` permission. Fires a `Guild Ban Add` Gateway event.
+ * @see dpp::cluster::guild_ban_add
+ * @see https://discord.com/developers/docs/resources/guild#create-guild-ban
+ * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
+ * @param guild_id Guild ID to add ban to
+ * @param user_id User ID to ban
+ * @param delete_message_seconds How many seconds to delete messages for, between 0 and 604800 (7 days). Defaults to 0
+ * @return confirmation returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_guild_ban_add(snowflake guild_id, snowflake user_id, uint32_t delete_message_seconds = 0);
+
+/**
+ * @brief Delete guild ban
+ * 
+ * Remove the ban for a user. Requires the `BAN_MEMBERS` permissions.
+ * Fires a Guild Ban Remove Gateway event.
+ * @see dpp::cluster::guild_ban_delete
+ * @see https://discord.com/developers/docs/resources/guild#remove-guild-ban
+ * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
+ * @param guild_id Guild to delete ban from
+ * @param user_id User ID to delete ban for
+ * @return confirmation returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_guild_ban_delete(snowflake guild_id, snowflake user_id);
+
+/**
+ * @brief Create a guild
+ * 
+ * Create a new guild. Returns a guild object on success. `Fires a Guild Create Gateway` event.
+ * 
+ * When using the roles parameter, the first member of the array is used to change properties of the guild's everyone role.
+ * If you are trying to bootstrap a guild with additional roles, keep this in mind. The required id field within each role object is an
+ * integer placeholder, and will be replaced by the API upon consumption. Its purpose is to allow you to overwrite a role's permissions
+ * in a channel when also passing in channels with the channels array.
+ * When using the channels parameter, the position field is ignored, and none of the default channels are created. The id field within
+ * each channel object may be set to an integer placeholder, and will be replaced by the API upon consumption. Its purpose is to
+ * allow you to create `GUILD_CATEGORY` channels by setting the `parent_id` field on any children to the category's id field.
+ * Category channels must be listed before any children.
+ *
+ * @see dpp::cluster::guild_create
+ * @see https://discord.com/developers/docs/resources/guild#create-guild
+ * @note The region field is deprecated and is replaced by channel.rtc_region. This endpoint can be used only by bots in less than 10 guilds.
+ * @param g Guild to create
+ * @return guild returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_guild_create(const class guild &g);
+
+/**
+ * @brief Delete a guild
+ * 
+ * Delete a guild permanently. User must be owner. Fires a `Guild Delete Gateway` event.
+ *
+ * @see dpp::cluster::guild_delete
+ * @see https://discord.com/developers/docs/resources/guild#delete-guild
+ * @param guild_id Guild ID to delete
+ * @return confirmation returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_guild_delete(snowflake guild_id);
+
+/**
+ * @brief Delete guild integration
+ * 
+ * Delete the attached integration object for the guild. Deletes any associated webhooks and kicks the associated bot if there is one.
+ * Requires the `MANAGE_GUILD` permission. Fires a Guild Integrations Update Gateway event.
+ * 
+ * @see dpp::cluster::guild_delete_integration
+ * @see https://discord.com/developers/docs/resources/guild#delete-guild-integration
+ * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
+ * @param guild_id Guild ID to delete integration for
+ * @param integration_id Integration ID to delete
+ * @return confirmation returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_guild_delete_integration(snowflake guild_id, snowflake integration_id);
+
+/**
+ * @brief Edit a guild
+ * 
+ * Modify a guild's settings. Requires the `MANAGE_GUILD` permission. Returns the updated guild object on success.
+ * Fires a `Guild Update Gateway` event.
+ * 
+ * @see dpp::cluster::guild_edit
+ * @see https://discord.com/developers/docs/resources/guild#modify-guild
+ * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
+ * @param g Guild to edit
+ * @return guild returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_guild_edit(const class guild &g);
+
+/**
+ * @brief Edit guild widget
+ * 
+ * Requires the `MANAGE_GUILD` permission.
+ *
+ * @see dpp::cluster::guild_edit_widget
+ * @see https://discord.com/developers/docs/resources/guild#modify-guild-widget
+ * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
+ * @param guild_id Guild ID to edit widget for
+ * @param gw New guild widget information
+ * @return guild_widget returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_guild_edit_widget(snowflake guild_id, const class guild_widget &gw);
+
+/**
+ * @brief Get single guild ban
+ * 
+ * Requires the `BAN_MEMBERS` permission.
+ * @see dpp::cluster::guild_get_ban
+ * @see https://discord.com/developers/docs/resources/guild#get-guild-ban
+ * @param guild_id Guild ID to get ban for
+ * @param user_id User ID of ban to retrieve
+ * @return ban returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_guild_get_ban(snowflake guild_id, snowflake user_id);
+
+/**
+ * @brief Get guild ban list
+ * 
+ * Requires the `BAN_MEMBERS` permission.
+ * @see dpp::cluster::guild_get_bans
+ * @see https://discord.com/developers/docs/resources/guild#get-guild-bans
+ * @note Provide a user ID to `before` and `after` for pagination. Users will always be returned in ascending order by the user ID. If both before and after are provided, only before is respected.
+ * @param guild_id Guild ID to get bans for
+ * @param before If non-zero, all bans for user ids before this user id will be returned up to the limit
+ * @param after if non-zero, all bans for user ids after this user id will be returned up to the limit
+ * @param limit the maximum number of bans to retrieve in this call up to a maximum of 1000
+ * @return ban_map returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_guild_get_bans(snowflake guild_id, snowflake before, snowflake after, snowflake limit);
+
+
+[[nodiscard]] async<confirmation_callback_t> co_guild_get(snowflake guild_id);
+
+/**
+ * @brief Get guild integrations
+ * 
+ * Requires the `MANAGE_GUILD` permission.
+ *
+ * @see dpp::cluster::guild_get_integrations
+ * @see https://discord.com/developers/docs/resources/guild#get-guild-integrations
+ * @param guild_id Guild ID to get integrations for
+ * @return integration_map returned object on completion
+ *
+ * @note This endpoint returns a maximum of 50 integrations. If a guild has more integrations, they cannot be accessed.
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_guild_get_integrations(snowflake guild_id);
+
+
+[[nodiscard]] async<confirmation_callback_t> co_guild_get_preview(snowflake guild_id);
+
+/**
+ * @brief Get guild vanity url, if enabled
+ * 
+ * Returns a partial dpp::invite object for guilds with that feature enabled. Requires the `MANAGE_GUILD` permission. code will be null if a vanity url for the guild is not set.
+ * @see dpp::cluster::guild_get_vanity
+ * @see https://discord.com/developers/docs/resources/guild#get-guild-vanity-url
+ * @param guild_id Guild to get vanity URL for
+ * @return invite returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_guild_get_vanity(snowflake guild_id);
+
+/**
+ * @brief Get guild widget
+ * 
+ * Requires the `MANAGE_GUILD` permission.
+ *
+ * @see dpp::cluster::guild_get_widget
+ * @see https://discord.com/developers/docs/resources/guild#get-guild-widget
+ * @param guild_id Guild ID to get widget for
+ * @return guild_widget returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_guild_get_widget(snowflake guild_id);
+
+/**
+ * @brief Modify guild integration
+ * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
+ *
+ * @see dpp::cluster::guild_modify_integration
+ * @see https://discord.com/developers/docs/resources/guild#modify-guild-integration
+ * @param guild_id Guild ID to modify integration for
+ * @param i Integration to modify
+ * @return confirmation returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_guild_modify_integration(snowflake guild_id, const class integration &i);
+
+/**
+ * @brief Get prune counts
+ * 
+ * Returns a prune object indicating the number of members that would be removed in a prune operation. Requires the `KICK_MEMBERS`
+ * permission. By default, prune will not remove users with roles. You can optionally include specific roles in your prune by providing the
+ * include_roles parameter. Any inactive user that has a subset of the provided role(s) will be counted in the prune and users with additional
+ * roles will not.
+ *
+ * @see dpp::cluster::guild_get_prune_counts
+ * @see https://discord.com/developers/docs/resources/guild#get-guild-prune-count
+ * @param guild_id Guild ID to count for pruning
+ * @param pruneinfo Pruning info
+ * @return prune returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_guild_get_prune_counts(snowflake guild_id, const struct prune& pruneinfo);
+
+/**
+ * @brief Begin guild prune
+ * 
+ * Begin a prune operation. Requires the `KICK_MEMBERS` permission. Returns a prune object indicating the number of members
+ * that were removed in the prune operation. For large guilds it's recommended to set the `compute_prune_count` option to false, forcing
+ * 'pruned' to 0. Fires multiple `Guild Member Remove` Gateway events.
+ * By default, prune will not remove users with roles. You can optionally include specific roles in your prune by providing the `include_roles`
+ * parameter. Any inactive user that has a subset of the provided role(s) will be included in the prune and users with additional roles will not.
+ * 
+ * @see dpp::cluster::guild_begin_prune
+ * @see https://discord.com/developers/docs/resources/guild#begin-guild-prune
+ * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
+ * @param guild_id Guild ID to prune
+ * @param pruneinfo Pruning info
+ * @return prune returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_guild_begin_prune(snowflake guild_id, const struct prune& pruneinfo);
+
+/**
+ * @brief Change current user nickname
+ * 
+ * Modifies the nickname of the current user in a guild.
+ * Fires a `Guild Member Update` Gateway event.
+ * 
+ * @deprecated Deprecated in favor of Modify Current Member. Will be replaced by dpp::cluster::guild_current_member_edit
+ * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
+ * @see dpp::cluster::guild_set_nickname
+ * @see https://discord.com/developers/docs/resources/guild#modify-current-user-nick
+ * @param guild_id Guild ID to change nickname on
+ * @param nickname New nickname, or empty string to clear nickname
+ * @return confirmation returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_guild_set_nickname(snowflake guild_id, const std::string &nickname);
+
+/**
+ * @brief Sync guild integration
+ *
+ * @see dpp::cluster::guild_sync_integration
+ * @see https://discord.com/developers/docs/resources/guild#sync-guild-integration
+ * @param guild_id Guild ID to sync integration on
+ * @param integration_id Integration ID to synchronise
+ * @return confirmation returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_guild_sync_integration(snowflake guild_id, snowflake integration_id);
+
+/**
+ * @brief Get the guild's onboarding configuration
+ *
+ * @see dpp::cluster::guild_get_onboarding
+ * @see https://discord.com/developers/docs/resources/guild#get-guild-onboarding
+ * @param guild_id The guild to pull the onboarding configuration from.
+ * @return onboarding returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_guild_get_onboarding(snowflake guild_id);
+
+/**
+ * @brief Edit the guild's onboarding configuration
+ *
+ * Requires the `MANAGE_GUILD` and `MANAGE_ROLES` permissions.
+ *
+ * @note Onboarding enforces constraints when enabled. These constraints are that there must be at least 7 Default Channels and at least 5 of them must allow sending messages to the \@everyone role. The `onboarding::mode` field modifies what is considered when enforcing these constraints.
+ *
+ * @see dpp::cluster::guild_edit_onboarding
+ * @see https://discord.com/developers/docs/resources/guild#modify-guild-onboarding
+ * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
+ * @param o The onboarding object
+ * @return onboarding returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_guild_edit_onboarding(const struct onboarding& o);
+
+/**
+ * @brief Get the guild's welcome screen
+ *
+ * If the welcome screen is not enabled, the `MANAGE_GUILD` permission is required.
+ *
+ * @see dpp::cluster::guild_get_welcome_screen
+ * @see https://discord.com/developers/docs/resources/guild#get-guild-welcome-screen
+ * @param guild_id The guild ID to get the welcome screen from
+ * @return dpp::welcome_screen returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_guild_get_welcome_screen(snowflake guild_id);
+
+/**
+ * @brief Edit the guild's welcome screen
+ *
+ * Requires the `MANAGE_GUILD` permission. May fire a `Guild Update` Gateway event.
+ *
+ * @see dpp::cluster::guild_edit_welcome_screen
+ * @see https://discord.com/developers/docs/resources/guild#modify-guild-welcome-screen
+ * @param guild_id The guild ID to edit the welcome screen for
+ * @param welcome_screen The welcome screen
+ * @param enabled Whether the welcome screen should be enabled or disabled
+ * @return dpp::welcome_screen returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_guild_edit_welcome_screen(snowflake guild_id, const struct welcome_screen& welcome_screen, bool enabled);
+
+/**
+ * @brief Add guild member. Needs a specific oauth2 scope, from which you get the access_token.
+ * 
+ * Adds a user to the guild, provided you have a valid oauth2 access token for the user with the guilds.join scope.
+ * Returns the guild_member, which is defaulted if the user is already a member of the guild. Fires a `Guild Member Add` Gateway event.
+ * 
+ * For guilds with Membership Screening enabled, this endpoint will default to adding new members as pending in the guild member object.
+ * Members that are pending will have to complete membership screening before they become full members that can talk.
+ * 
+ * @note All parameters to this endpoint except for access_token are optional.
+ * The bot must be a member of the guild with `CREATE_INSTANT_INVITE` permission.
+ * @see dpp::cluster::guild_add_member
+ * @see https://discord.com/developers/docs/resources/guild#add-guild-member
+ * @param gm Guild member to add
+ * @param access_token Access token from Oauth2 scope
+ * @return confirmation returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_guild_add_member(const guild_member& gm, const std::string &access_token);
+
+/**
+ * @brief Edit the properties of an existing guild member
+ * 
+ * Modify attributes of a guild member. Returns the guild_member. Fires a `Guild Member Update` Gateway event.
+ * To remove a timeout, set the `communication_disabled_until` to a non-zero time in the past, e.g. 1.
+ * When moving members to channels, the API user must have permissions to both connect to the channel and have the `MOVE_MEMBERS` permission.
+ * For moving and disconnecting users from voice, use dpp::cluster::guild_member_move.
+ * @see dpp::cluster::guild_edit_member
+ * @see https://discord.com/developers/docs/resources/guild#modify-guild-member
+ * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
+ * @param gm Guild member to edit
+ * @return guild_member returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_guild_edit_member(const guild_member& gm);
+
+/**
+ * @brief Get a guild member
+ * @see dpp::cluster::guild_get_member
+ * @see https://discord.com/developers/docs/resources/guild#get-guild-member
+ * @param guild_id Guild ID to get member for
+ * @param user_id User ID of member to get
+ * @return guild_member returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_guild_get_member(snowflake guild_id, snowflake user_id);
+
+/**
+ * @brief Get all guild members
+ * 
+ * @note This endpoint is restricted according to whether the `GUILD_MEMBERS` Privileged Intent is enabled for your application.
+ * @see dpp::cluster::guild_get_members
+ * @see https://discord.com/developers/docs/resources/guild#get-guild-members
+ * @param guild_id Guild ID to get all members for
+ * @param limit max number of members to return (1-1000)
+ * @param after the highest user id in the previous page
+ * @return guild_member_map returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_guild_get_members(snowflake guild_id, uint16_t limit, snowflake after);
+
+/**
+ * @brief Add role to guild member
+ * 
+ * Adds a role to a guild member. Requires the `MANAGE_ROLES` permission.
+ * Fires a `Guild Member Update` Gateway event.
+ * @see dpp::cluster::guild_member_add_role
+ * @see https://discord.com/developers/docs/resources/guild#add-guild-member-role
+ * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
+ * @param guild_id Guild ID to add a role to
+ * @param user_id User ID to add role to
+ * @param role_id Role ID to add to the user
+ * @return confirmation returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_guild_member_add_role(snowflake guild_id, snowflake user_id, snowflake role_id);
+
+/**
+ * @brief Remove (kick) a guild member
+ * 
+ * Remove a member from a guild. Requires `KICK_MEMBERS` permission.
+ * Fires a `Guild Member Remove` Gateway event.
+ * @see dpp::cluster::guild_member_delete
+ * @see https://discord.com/developers/docs/resources/guild#remove-guild-member
+ * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
+ * @deprecated Replaced by dpp::cluster::guild_member_kick
+ * @param guild_id Guild ID to kick member from
+ * @param user_id User ID to kick
+ * @return confirmation returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_guild_member_delete(snowflake guild_id, snowflake user_id);
+
+/**
+ * @brief Remove (kick) a guild member
+ *  
+ * Remove a member from a guild. Requires `KICK_MEMBERS` permission.
+ * Fires a `Guild Member Remove` Gateway event.
+ * @see dpp::cluster::guild_member_kick
+ * @see https://discord.com/developers/docs/resources/guild#remove-guild-member
+ * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
+ * @param guild_id Guild ID to kick member from
+ * @param user_id User ID to kick
+ * @return confirmation returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_guild_member_kick(snowflake guild_id, snowflake user_id);
+
+/**
+ * @brief Set the timeout of a guild member
+ *
+ * Fires a `Guild Member Update` Gateway event.
+ * @see dpp::cluster::guild_member_timeout
+ * @see https://discord.com/developers/docs/resources/guild#modify-guild-member
+ * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
+ * @param guild_id Guild ID to timeout the member in
+ * @param user_id User ID to set the timeout for
+ * @param communication_disabled_until The timestamp when the user's timeout will expire (up to 28 days in the future). Set to 0 to remove the timeout
+ * @return confirmation returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_guild_member_timeout(snowflake guild_id, snowflake user_id, time_t communication_disabled_until);
+
+/**
+ * @brief Remove the timeout of a guild member.
+ * A shortcut for guild_member_timeout(guild_id, user_id, 0, callback)
+ * Fires a `Guild Member Update` Gateway event.
+ * @see dpp::cluster::guild_member_timeout_remove
+ * @see https://discord.com/developers/docs/resources/guild#modify-guild-member
+ * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
+ * @param guild_id Guild ID to remove the member timeout from
+ * @param user_id User ID to remove the timeout for
+ * @return confirmation returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_guild_member_timeout_remove(snowflake guild_id, snowflake user_id);
+
+/**
+ * @brief Remove role from guild member
+ * 
+ * Removes a role from a guild member. Requires the `MANAGE_ROLES` permission.
+ * Fires a `Guild Member Update` Gateway event.
+ * @see dpp::cluster::guild_member_delete_role
+ * @see https://discord.com/developers/docs/resources/guild#remove-guild-member-role
+ * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
+ * @param guild_id Guild ID to remove role from user on
+ * @param user_id User ID to remove role from
+ * @param role_id Role to remove
+ * @return confirmation returned object on completion
+ * @deprecated Use dpp::cluster::guild_member_remove_role instead
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_guild_member_delete_role(snowflake guild_id, snowflake user_id, snowflake role_id);
+
+/**
+ * @brief Remove role from guild member
+ *
+ * Removes a role from a guild member. Requires the `MANAGE_ROLES` permission.
+ * Fires a `Guild Member Update` Gateway event.
+ * @see dpp::cluster::guild_member_remove_role
+ * @see https://discord.com/developers/docs/resources/guild#remove-guild-member-role
+ * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
+ * @param guild_id Guild ID to remove role from user on
+ * @param user_id User ID to remove role from
+ * @param role_id Role to remove
+ * @return confirmation returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_guild_member_remove_role(snowflake guild_id, snowflake user_id, snowflake role_id);
+
+/**
+ * @brief Moves the guild member to a other voice channel, if member is connected to one.
+ * Set the `channel_id` to `0` to disconnect the user.
+ *
+ * Fires a `Guild Member Update` Gateway event.
+ * @note When moving members to channels, the API user __must__ have permissions to both connect to the channel and have the `MOVE_MEMBERS` permission.
+ * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
+ * @see dpp::cluster::guild_member_move
+ * @see https://discord.com/developers/docs/resources/guild#modify-guild-member
+ * @param channel_id Id of the channel to which the user is used. Set to `0` to disconnect the user
+ * @param guild_id Guild id to which the user is connected
+ * @param user_id User id, who should be moved
+ * @return guild_member returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_guild_member_move(const snowflake channel_id, const snowflake guild_id, const snowflake user_id);
+
+/**
+ * @brief Search for guild members based on whether their username or nickname starts with the given string.
+ *
+ * @note This endpoint is restricted according to whether the `GUILD_MEMBERS` Privileged Intent is enabled for your application.
+ * @see dpp::cluster::guild_search_members
+ * @see https://discord.com/developers/docs/resources/guild#search-guild-members
+ * @param guild_id Guild ID to search in
+ * @param query Query string to match username(s) and nickname(s) against
+ * @param limit max number of members to return (1-1000)
+ * @return guild_member_map returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_guild_search_members(snowflake guild_id, const std::string& query, uint16_t limit);
+
+/**
+ * @brief Get guild invites
+ * 
+ * Returns a list of invite objects (with invite metadata) for the guild. Requires the `MANAGE_GUILD` permission.
+ *
+ * @see dpp::cluster::guild_get_invites
+ * @see https://discord.com/developers/docs/resources/guild#get-guild-invites
+ * @param guild_id Guild ID to get invites for
+ * @return invite_map returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_guild_get_invites(snowflake guild_id);
+
+
+[[nodiscard]] async<confirmation_callback_t> co_invite_delete(const std::string &invitecode);
+
+/**
+ * @brief Get details about an invite
+ *
+ * @see dpp::cluster::invite_get
+ * @see https://discord.com/developers/docs/resources/invite#get-invite
+ * @param invite_code Invite code to get information on
+ * @return invite returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_invite_get(const std::string &invite_code);
+
+/**
+ * @brief Add a reaction to a message. The reaction string must be either an `emojiname:id` or a unicode character.
+ *
+ * @see dpp::cluster::message_add_reaction
+ * @see https://discord.com/developers/docs/resources/channel#create-reaction
+ * @param m Message to add a reaction to
+ * @param reaction Reaction to add. Emojis should be in the form emojiname:id
+ * @return confirmation returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_message_add_reaction(const struct message &m, const std::string &reaction);
+
+/**
+ * @brief Add a reaction to a message by id. The reaction string must be either an `emojiname:id` or a unicode character.
+ *
+ * @see dpp::cluster::message_add_reaction
+ * @see https://discord.com/developers/docs/topics/gateway#message-reaction-add
+ * @param message_id Message to add reactions to
+ * @param channel_id Channel to add reactions to
+ * @param reaction Reaction to add. Emojis should be in the form emojiname:id
+ * @return confirmation returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_message_add_reaction(snowflake message_id, snowflake channel_id, const std::string &reaction);
+
+/**
+ * @brief Send a message to a channel. The callback function is called when the message has been sent
+ *
+ * @see dpp::cluster::message_create
+ * @see https://discord.com/developers/docs/resources/channel#create-message
+ * @param m Message to send
+ * @return message returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_message_create(const struct message &m);
+
+/**
+ * @brief Crosspost a message. The callback function is called when the message has been sent
+ *
+ * @see dpp::cluster::message_crosspost
+ * @see https://discord.com/developers/docs/resources/channel#crosspost-message
+ * @param message_id Message to crosspost
+ * @param channel_id Channel ID to crosspost from
+ * @return message returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_message_crosspost(snowflake message_id, snowflake channel_id);
+
+/**
+ * @brief Delete all reactions on a message
+ *
+ * @see dpp::cluster::message_delete_all_reactions
+ * @see https://discord.com/developers/docs/resources/channel#delete-all-reactions
+ * @param m Message to delete reactions from
+ * @return confirmation returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_message_delete_all_reactions(const struct message &m);
+
+/**
+ * @brief Delete all reactions on a message by id
+ *
+ * @see dpp::cluster::message_delete_all_reactions
+ * @see https://discord.com/developers/docs/resources/channel#delete-all-reactions
+ * @param message_id Message to delete reactions from
+ * @param channel_id Channel to delete reactions from
+ * @return confirmation returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_message_delete_all_reactions(snowflake message_id, snowflake channel_id);
+
+/**
+ * @brief Bulk delete messages from a channel. The callback function is called when the message has been edited
+ * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
+ *
+ * @note If any message provided older than 2 weeks or any duplicate message ID, it will fail.
+ *
+ * @see dpp::cluster::message_delete_bulk
+ * @see https://discord.com/developers/docs/resources/channel#bulk-delete-messages
+ * @param message_ids List of message IDs to delete (at least 2 and at most 100 message IDs)
+ * @param channel_id Channel to delete from
+ * @return confirmation returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_message_delete_bulk(const std::vector<snowflake> &message_ids, snowflake channel_id);
+
+/**
+ * @brief Delete a message from a channel. The callback function is called when the message has been edited
+ * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
+ *
+ * @see dpp::cluster::message_delete
+ * @see https://discord.com/developers/docs/resources/channel#delete-message
+ * @param message_id Message ID to delete
+ * @param channel_id Channel to delete from
+ * @return confirmation returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_message_delete(snowflake message_id, snowflake channel_id);
+
+/**
+ * @brief Delete own reaction from a message. The reaction string must be either an `emojiname:id` or a unicode character.
+ *
+ * @see dpp::cluster::message_delete_own_reaction
+ * @see https://discord.com/developers/docs/resources/channel#delete-own-reaction
+ * @param m Message to delete own reaction from
+ * @param reaction Reaction to delete. The reaction should be in the form emojiname:id
+ * @return confirmation returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_message_delete_own_reaction(const struct message &m, const std::string &reaction);
+
+/**
+ * @brief Delete own reaction from a message by id. The reaction string must be either an `emojiname:id` or a unicode character.
+ *
+ * @see dpp::cluster::message_delete_own_reaction
+ * @see https://discord.com/developers/docs/resources/channel#delete-own-reaction
+ * @param message_id Message to delete reactions from
+ * @param channel_id Channel to delete reactions from
+ * @param reaction Reaction to delete. The reaction should be in the form emojiname:id
+ * @return confirmation returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_message_delete_own_reaction(snowflake message_id, snowflake channel_id, const std::string &reaction);
+
+/**
+ * @brief Delete a user's reaction from a message. The reaction string must be either an `emojiname:id` or a unicode character
+ *
+ * @see dpp::cluster::message_delete_reaction
+ * @see https://discord.com/developers/docs/resources/channel#delete-user-reaction
+ * @param m Message to delete a user's reaction from
+ * @param user_id User ID who's reaction you want to remove
+ * @param reaction Reaction to remove. Reactions should be in the form emojiname:id
+ * @return confirmation returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_message_delete_reaction(const struct message &m, snowflake user_id, const std::string &reaction);
+
+/**
+ * @brief Delete a user's reaction from a message by id. The reaction string must be either an `emojiname:id` or a unicode character
+ *
+ * @see dpp::cluster::message_delete_reaction
+ * @see https://discord.com/developers/docs/resources/channel#delete-user-reaction
+ * @param message_id Message to delete reactions from
+ * @param channel_id Channel to delete reactions from
+ * @param user_id User ID who's reaction you want to remove
+ * @param reaction Reaction to remove. Reactions should be in the form emojiname:id
+ * @return confirmation returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_message_delete_reaction(snowflake message_id, snowflake channel_id, snowflake user_id, const std::string &reaction);
+
+/**
+ * @brief Delete all reactions on a message using a particular emoji. The reaction string must be either an `emojiname:id` or a unicode character
+ *
+ * @see dpp::cluster::message_delete_reaction_emoji
+ * @see https://discord.com/developers/docs/resources/channel#delete-all-reactions-for-emoji
+ * @param m Message to delete reactions from
+ * @param reaction Reaction to delete, in the form emojiname:id or a unicode character
+ * @return confirmation returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_message_delete_reaction_emoji(const struct message &m, const std::string &reaction);
+
+/**
+ * @brief Delete all reactions on a message using a particular emoji by id. The reaction string must be either an `emojiname:id` or a unicode character
+ *
+ * @see dpp::cluster::message_delete_reaction_emoji
+ * @see https://discord.com/developers/docs/resources/channel#delete-all-reactions-for-emoji
+ * @param message_id Message to delete reactions from
+ * @param channel_id Channel to delete reactions from
+ * @param reaction Reaction to delete, in the form emojiname:id or a unicode character
+ * @return confirmation returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_message_delete_reaction_emoji(snowflake message_id, snowflake channel_id, const std::string &reaction);
+
+/**
+ * @brief Edit a message on a channel. The callback function is called when the message has been edited
+ *
+ * @see dpp::cluster::message_edit
+ * @see https://discord.com/developers/docs/resources/channel#edit-message
+ * @param m Message to edit
+ * @return message returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_message_edit(const struct message &m);
+
+/**
+ * @brief Edit the flags of a message on a channel. The callback function is called when the message has been edited
+ *
+ * @param m Message to edit the flags of
+ * @return message returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_message_edit_flags(const struct message &m);
+
+/**
+ * @brief Get a message
+ *
+ * @see dpp::cluster::message_get
+ * @see https://discord.com/developers/docs/resources/channel#get-channel-message
+ * @param message_id Message ID
+ * @param channel_id Channel ID
+ * @return message returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_message_get(snowflake message_id, snowflake channel_id);
+
+/**
+ * @brief Get reactions on a message for a particular emoji. The reaction string must be either an `emojiname:id` or a unicode character
+ *
+ * @see dpp::cluster::message_get_reactions
+ * @see https://discord.com/developers/docs/resources/channel#get-reactions
+ * @param m Message to get reactions for
+ * @param reaction Reaction should be in the form emojiname:id or a unicode character
+ * @param before Reactions before this ID should be retrieved if this is set to non-zero
+ * @param after Reactions before this ID should be retrieved if this is set to non-zero
+ * @param limit This number of reactions maximum should be returned
+ * @return user_map returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_message_get_reactions(const struct message &m, const std::string &reaction, snowflake before, snowflake after, snowflake limit);
+
+/**
+ * @brief Get reactions on a message for a particular emoji by id. The reaction string must be either an `emojiname:id` or a unicode character
+ *
+ * @see dpp::cluster::message_get_reactions
+ * @see https://discord.com/developers/docs/resources/channel#get-reactions
+ * @param message_id Message to get reactions for
+ * @param channel_id Channel to get reactions for
+ * @param reaction Reaction should be in the form emojiname:id or a unicode character
+ * @param before Reactions before this ID should be retrieved if this is set to non-zero
+ * @param after Reactions before this ID should be retrieved if this is set to non-zero
+ * @param limit This number of reactions maximum should be returned
+ * @return emoji_map returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_message_get_reactions(snowflake message_id, snowflake channel_id, const std::string &reaction, snowflake before, snowflake after, snowflake limit);
+
+/**
+ * @brief Pin a message
+ * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
+ * @see dpp::cluster::message_pin
+ * @see https://discord.com/developers/docs/resources/channel#pin-message
+ * @param channel_id Channel id to pin message on
+ * @param message_id Message id to pin message on
+ * @return confirmation returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_message_pin(snowflake channel_id, snowflake message_id);
+
+/**
+ * @brief Get multiple messages.
+ * 
+ * This function will attempt to fetch as many messages as possible using multiple API calls if needed.
+ *
+ * @see dpp::cluster::messages_get
+ * @see https://discord.com/developers/docs/resources/channel#get-channel-messages
+ * @param channel_id Channel ID to retrieve messages for
+ * @param around Messages should be retrieved around this ID if this is set to non-zero
+ * @param before Messages before this ID should be retrieved if this is set to non-zero
+ * @param after Messages after this ID should be retrieved if this is set to non-zero
+ * @param limit This number of messages maximum should be returned, up to a maximum of 100.
+ * @return message_map returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_messages_get(snowflake channel_id, snowflake around, snowflake before, snowflake after, uint64_t limit);
+
+/**
+ * @brief Unpin a message
+ * @see dpp::cluster::message_unpin
+ * @see https://discord.com/developers/docs/resources/channel#unpin-message
+ * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
+ * @param channel_id Channel id to unpin message on
+ * @param message_id Message id to unpin message on
+ * @return confirmation returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_message_unpin(snowflake channel_id, snowflake message_id);
+
+/**
+ * @brief Get a list of users that voted for this specific answer.
+ *
+ * @param m Message that contains the poll to retrieve the answers from
+ * @param answer_id ID of the answer to retrieve votes from (see poll_answer::answer_id)
+ * @param after Users after this ID should be retrieved if this is set to non-zero
+ * @param limit This number of users maximum should be returned, up to 100
+ * @return user_map returned object on completion
+ * @see dpp::cluster::poll_get_answer_voters
+ * @see https://discord.com/developers/docs/resources/poll#get-answer-voters
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_poll_get_answer_voters(const message& m, uint32_t answer_id, snowflake after, uint64_t limit);
+
+/**
+ * @brief Get a list of users that voted for this specific answer.
+ *
+ * @param message_id ID of the message with the poll to retrieve the answers from
+ * @param channel_id ID of the channel with the poll to retrieve the answers from
+ * @param answer_id ID of the answer to retrieve votes from (see poll_answer::answer_id)
+ * @param after Users after this ID should be retrieved if this is set to non-zero
+ * @param limit This number of users maximum should be returned, up to 100
+ * @return user_map returned object on completion
+ * @see dpp::cluster::poll_get_answer_voters
+ * @see https://discord.com/developers/docs/resources/poll#get-answer-voters
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_poll_get_answer_voters(snowflake message_id, snowflake channel_id, uint32_t answer_id, snowflake after, uint64_t limit);
+
+/**
+ * @brief Immediately end a poll.
+ *
+ * @param m Message that contains the poll
+ * @return message returned object on completion
+ * @see dpp::cluster::poll_end
+ * @see https://discord.com/developers/docs/resources/poll#end-poll
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_poll_end(const message &m);
+
+/**
+ * @brief Immediately end a poll.
+ *
+ * @param message_id ID of the message with the poll to end
+ * @param channel_id ID of the channel with the poll to end
+ * @return message returned object on completion
+ * @see dpp::cluster::poll_end
+ * @see https://discord.com/developers/docs/resources/poll#end-poll
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_poll_end(snowflake message_id, snowflake channel_id);
+
+/**
+ * @brief Search for messages in a guild
+ *
+ * @see dpp::cluster::guild_messages_search
+ * @see https://discord.com/developers/docs/resources/message#search-guild-messages
+ * @param guild_id Guild ID to search in
+ * @param params Search parameters
+ * @return message_search_result returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_guild_messages_search(snowflake guild_id, const message_search_params& params);
+
+/**
+ * @brief Get a channel's pins
+ * @see dpp::cluster::channel_pins_get
+ * @see https://discord.com/developers/docs/resources/channel#get-pinned-messages
+ * @param channel_id Channel ID to get pins for
+ * @return message_pin_map returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_channel_pins_get(snowflake channel_id);
+
+/**
+ * @brief Get a channel's pins
+ * @see dpp::cluster::channel_pins_get
+ * @see https://discord.com/developers/docs/resources/channel#get-pinned-messages
+ * @param channel_id Channel ID to get pins for
+ * @param before Get messages pinned before this timestamp.
+ * @param limit Max number of pins to return (1-50). Defaults to 50 if not set.
+ * @return message_pin_map returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_channel_pins_get(snowflake channel_id, std::optional<time_t> before, std::optional<uint64_t> limit);
+
+/**
+ * @brief Create a role on a guild
+ * 
+ * Create a new role for the guild. Requires the `MANAGE_ROLES` permission. Returns the new role object on success.
+ * Fires a `Guild Role Create` Gateway event.
+ * 
+ * @see dpp::cluster::role_create
+ * @see https://discord.com/developers/docs/resources/guild#create-guild-role
+ * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
+ * @param r Role to create (guild ID is encapsulated in the role object)
+ * @return role returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_role_create(const class role &r);
+
+/**
+ * @brief Delete a role
+ * 
+ * Requires the `MANAGE_ROLES` permission. Fires a `Guild Role Delete` Gateway event.
+ * 
+ * @see dpp::cluster::role_delete
+ * @see https://discord.com/developers/docs/resources/guild#delete-guild-role
+ * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
+ * @param guild_id Guild ID to delete the role on
+ * @param role_id Role ID to delete
+ * @return confirmation returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_role_delete(snowflake guild_id, snowflake role_id);
+
+/**
+ * @brief Edit a role on a guild
+ * 
+ * Requires the `MANAGE_ROLES` permission. Returns the updated role on success. Fires a `Guild Role Update` Gateway event.
+ * 
+ * @see dpp::cluster::role_edit
+ * @see https://discord.com/developers/docs/resources/guild#modify-guild-role
+ * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
+ * @param r Role to edit
+ * @return role returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_role_edit(const class role &r);
+
+/**
+ * @brief Edit multiple role's position in a guild. Returns a list of all roles of the guild on success.
+ *
+ * Modify the positions of a set of role objects for the guild. Requires the `MANAGE_ROLES` permission.
+ * Fires multiple `Guild Role Update` Gateway events.
+ *
+ * @see dpp::cluster::roles_edit_position
+ * @see https://discord.com/developers/docs/resources/guild#modify-guild-role-positions
+ * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
+ * @param guild_id Guild ID to change the roles position on
+ * @param roles Vector of roles to change the positions of
+ * @return role_map returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_roles_edit_position(snowflake guild_id, const std::vector<role> &roles);
+
+/**
+ * @brief Get a role for a guild
+ *
+ * @see dpp::cluster::roles_get
+ * @see https://discord.com/developers/docs/resources/guild#get-guild-roles
+ * @param guild_id Guild ID to get role for
+ * @return role_map returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_roles_get(snowflake guild_id);
+
+/**
+ * @brief Get the application's role connection metadata records
+ *
+ * @see dpp::cluster::application_role_connection_get
+ * @see https://discord.com/developers/docs/resources/application-role-connection-metadata#get-application-role-connection-metadata-records
+ * @param application_id The application ID
+ * @return application_role_connection_metadata_list returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_application_role_connection_get(snowflake application_id);
+
+/**
+ * @brief Update the application's role connection metadata records
+ *
+ * @see dpp::cluster::application_role_connection_update
+ * @see https://discord.com/developers/docs/resources/application-role-connection-metadata#update-application-role-connection-metadata-records
+ * @param application_id The application ID
+ * @param connection_metadata The application role connection metadata to update
+ * @return application_role_connection_metadata_list returned object on completion
+ * @note An application can have a maximum of 5 metadata records.
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_application_role_connection_update(snowflake application_id, const std::vector<application_role_connection_metadata> &connection_metadata);
+
+/**
+ * @brief Get user application role connection
+ *
+ * @see dpp::cluster::user_application_role_connection_get
+ * @see https://discord.com/developers/docs/resources/user#get-user-application-role-connection
+ * @param application_id The application ID
+ * @return application_role_connection returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_user_application_role_connection_get(snowflake application_id);
+
+/**
+ * @brief Update user application role connection
+ *
+ * @see dpp::cluster::user_application_role_connection_update
+ * @see https://discord.com/developers/docs/resources/user#update-user-application-role-connection
+ * @param application_id The application ID
+ * @param connection The application role connection to update
+ * @return application_role_connection returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_user_application_role_connection_update(snowflake application_id, const application_role_connection &connection);
+
+/**
+ * @brief Get all scheduled events for a guild
+ * @see dpp::cluster::guild_events_get
+ * @see https://discord.com/developers/docs/resources/guild-scheduled-event#list-scheduled-events-for-guild
+ * @param guild_id Guild to get events for
+ * @return scheduled_event_map returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_guild_events_get(snowflake guild_id);
+
+/**
+ * @brief Create a scheduled event on a guild
+ *
+ * @see dpp::cluster::guild_event_create
+ * @see https://discord.com/developers/docs/resources/guild-scheduled-event#create-guild-scheduled-event
+ * @param event Event to create (guild ID must be populated)
+ * @return scheduled_event returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_guild_event_create(const scheduled_event& event);
+
+/**
+ * @brief Delete a scheduled event from a guild
+ *
+ * @see dpp::cluster::guild_event_delete
+ * @see https://discord.com/developers/docs/resources/guild-scheduled-event#delete-guild-scheduled-event
+ * @param event_id Event ID to delete
+ * @param guild_id Guild ID of event to delete
+ * @return confirmation returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_guild_event_delete(snowflake event_id, snowflake guild_id);
+
+/**
+ * @brief Edit/modify a scheduled event on a guild
+ *
+ * @see dpp::cluster::guild_event_edit
+ * @see https://discord.com/developers/docs/resources/guild-scheduled-event#modify-guild-scheduled-event
+ * @param event Event to create (event ID and guild ID must be populated)
+ * @return scheduled_event returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_guild_event_edit(const scheduled_event& event);
+
+/**
+ * @brief Get a scheduled event for a guild
+ *
+ * @see dpp::cluster::guild_event_get
+ * @see https://discord.com/developers/docs/resources/guild-scheduled-event#get-guild-scheduled-event
+ * @param guild_id Guild to get event for
+ * @param event_id Event ID to get
+ * @return scheduled_event returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_guild_event_get(snowflake guild_id, snowflake event_id);
+
+/**
+ * @brief Returns all SKUs for a given application.
+ * @note Because of how Discord's SKU and subscription systems work, you will see two SKUs for your premium offering.
+ * For integration and testing entitlements, you should use the SKU with type: 5.
+ *
+ * @see dpp::cluster::skus_get
+ * @see https://discord.com/developers/docs/monetization/skus#list-skus
+ * @return sku_map returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_skus_get();
+
+
+[[nodiscard]] async<confirmation_callback_t> co_stage_instance_create(const stage_instance& si);
+
+/**
+ * @brief Get the stage instance associated with the channel id, if it exists.
+ * @see dpp::cluster::stage_instance_get
+ * @see https://discord.com/developers/docs/resources/stage-instance#get-stage-instance
+ * @param channel_id ID of the associated channel
+ * @return stage_instance returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_stage_instance_get(const snowflake channel_id);
+
+
+[[nodiscard]] async<confirmation_callback_t> co_stage_instance_edit(const stage_instance& si);
+
+/**
+ * @brief Delete a stage instance.
+ * @see dpp::cluster::stage_instance_delete
+ * @see https://discord.com/developers/docs/resources/stage-instance#delete-stage-instance
+ * @param channel_id ID of the associated channel
+ * @return confirmation returned object on completion
+ * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_stage_instance_delete(const snowflake channel_id);
+
+/**
+ * @brief Create a sticker in a guild
+ * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
+ * @see dpp::cluster::guild_sticker_create
+ * @see https://discord.com/developers/docs/resources/sticker#create-guild-sticker
+ * @param s Sticker to create. Must have its guild ID set.
+ * @return sticker returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_guild_sticker_create(const sticker &s);
+
+/**
+ * @brief Delete a sticker from a guild
+ * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
+ * @see dpp::cluster::guild_sticker_delete
+ * @see https://discord.com/developers/docs/resources/sticker#delete-guild-sticker
+ * @param sticker_id sticker ID to delete
+ * @param guild_id guild ID to delete from
+ * @return confirmation returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_guild_sticker_delete(snowflake sticker_id, snowflake guild_id);
+
+/**
+ * @brief Get a guild sticker
+ * @see dpp::cluster::guild_sticker_get
+ * @see https://discord.com/developers/docs/resources/sticker#get-guild-sticker
+ * @param id Id of sticker to get.
+ * @param guild_id Guild ID of the guild where the sticker is
+ * @return sticker returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_guild_sticker_get(snowflake id, snowflake guild_id);
+
+/**
+ * @brief Modify a sticker in a guild
+ * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
+ * @see dpp::cluster::guild_sticker_modify
+ * @see https://discord.com/developers/docs/resources/sticker#modify-guild-sticker
+ * @param s Sticker to modify. Must have its guild ID and sticker ID set.
+ * @return sticker returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_guild_sticker_modify(const sticker &s);
+
+/**
+ * @brief Get all guild stickers
+ * @see dpp::cluster::guild_stickers_get
+ * @see https://discord.com/developers/docs/resources/sticker#list-guild-stickers
+ * @param guild_id Guild ID of the guild where the sticker is
+ * @return sticker_map returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_guild_stickers_get(snowflake guild_id);
+
+/**
+ * @brief Get a nitro sticker
+ * @see dpp::cluster::nitro_sticker_get
+ * @see https://discord.com/developers/docs/resources/sticker#get-sticker
+ * @param id Id of sticker to get.
+ * @return sticker returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_nitro_sticker_get(snowflake id);
+
+/**
+ * @brief Get a list of available sticker packs
+ * @see dpp::cluster::sticker_packs_get
+ * @see https://discord.com/developers/docs/resources/sticker#list-sticker-packs
+ * @return sticker_pack_map returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_sticker_packs_get();
+
+/**
+ * @brief Create a new guild based on a template.
+ * @note This endpoint can be used only by bots in less than 10 guilds.
+ * @see dpp::cluster::guild_create_from_template
+ * @see https://discord.com/developers/docs/resources/guild-template#create-guild-from-guild-template
+ * @param code Template code to create guild from
+ * @param name Guild name to create
+ * @return guild returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_guild_create_from_template(const std::string &code, const std::string &name);
+
+/**
+ * @brief Creates a template for the guild
+ *
+ * @see dpp::cluster::guild_template_create
+ * @see https://discord.com/developers/docs/resources/guild-template#create-guild-template
+ * @param guild_id Guild to create template from
+ * @param name Template name to create
+ * @param description Description of template to create
+ * @return dtemplate returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_guild_template_create(snowflake guild_id, const std::string &name, const std::string &description);
+
+/**
+ * @brief Deletes the template
+ *
+ * @see dpp::cluster::guild_template_delete
+ * @see https://discord.com/developers/docs/resources/guild-template#delete-guild-template
+ * @param guild_id Guild ID of template to delete
+ * @param code Template code to delete
+ * @return confirmation returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_guild_template_delete(snowflake guild_id, const std::string &code);
+
+/**
+ * @brief Modifies the template's metadata.
+ *
+ * @see dpp::cluster::guild_template_modify
+ * @see https://discord.com/developers/docs/resources/guild-template#modify-guild-template
+ * @param guild_id Guild ID of template to modify
+ * @param code Template code to modify
+ * @param name New name of template
+ * @param description New description of template
+ * @return dtemplate returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_guild_template_modify(snowflake guild_id, const std::string &code, const std::string &name, const std::string &description);
+
+/**
+ * @brief Get guild templates
+ *
+ * @see dpp::cluster::guild_templates_get
+ * @see https://discord.com/developers/docs/resources/guild-template#get-guild-templates
+ * @param guild_id Guild ID to get templates for
+ * @return dtemplate_map returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_guild_templates_get(snowflake guild_id);
+
+/**
+ * @brief Syncs the template to the guild's current state.
+ *
+ * @see dpp::cluster::guild_template_sync
+ * @see https://discord.com/developers/docs/resources/guild-template#sync-guild-template
+ * @param guild_id Guild to synchronise template for
+ * @param code Code of template to synchronise
+ * @return dtemplate returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_guild_template_sync(snowflake guild_id, const std::string &code);
+
+/**
+ * @brief Get a template
+ * @see dpp::cluster::template_get
+ * @see https://discord.com/developers/docs/resources/guild-template#get-guild-template
+ * @param code Template code
+ * @return dtemplate returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_template_get(const std::string &code);
+
+/**
+ * @brief Join a thread
+ * @see dpp::cluster::current_user_join_thread
+ * @see https://discord.com/developers/docs/resources/channel#join-thread
+ * @param thread_id Thread ID to join
+ * @return confirmation returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_current_user_join_thread(snowflake thread_id);
+
+/**
+ * @brief Leave a thread
+ * @see dpp::cluster::current_user_leave_thread
+ * @see https://discord.com/developers/docs/resources/channel#leave-thread
+ * @param thread_id Thread ID to leave
+ * @return confirmation returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_current_user_leave_thread(snowflake thread_id);
+
+/**
+ * @brief Get all active threads in the guild, including public and private threads. Threads are ordered by their id, in descending order.
+ * @see dpp::cluster::threads_get_active
+ * @see https://discord.com/developers/docs/resources/guild#list-active-guild-threads
+ * @param guild_id Guild to get active threads for
+ * @return active_threads returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_threads_get_active(snowflake guild_id);
+
+/**
+ * @brief Get private archived threads in a channel which current user has joined (Sorted by ID in descending order)
+ * @see dpp::cluster::threads_get_joined_private_archived
+ * @see https://discord.com/developers/docs/resources/channel#list-joined-private-archived-threads
+ * @param channel_id Channel to get public archived threads for
+ * @param before_id Get threads before this id
+ * @param limit Number of threads to get
+ * @return thread_map returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_threads_get_joined_private_archived(snowflake channel_id, snowflake before_id, uint16_t limit);
+
+/**
+ * @brief Get private archived threads in a channel (Sorted by archive_timestamp in descending order)
+ * @see dpp::cluster::threads_get_private_archived
+ * @see https://discord.com/developers/docs/resources/channel#list-private-archived-threads
+ * @param channel_id Channel to get public archived threads for
+ * @param before_timestamp Get threads archived before this timestamp
+ * @param limit Number of threads to get
+ * @return thread_map returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_threads_get_private_archived(snowflake channel_id,  time_t before_timestamp, uint16_t limit);
+
+/**
+ * @brief Get public archived threads in a channel (Sorted by archive_timestamp in descending order)
+ * @see dpp::cluster::threads_get_public_archived
+ * @see https://discord.com/developers/docs/resources/channel#list-public-archived-threads
+ * @param channel_id Channel to get public archived threads for
+ * @param before_timestamp Get threads archived before this timestamp
+ * @param limit Number of threads to get
+ * @return thread_map returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_threads_get_public_archived(snowflake channel_id, time_t before_timestamp, uint16_t limit);
+
+/**
+ * @brief Get a thread member
+ * @see dpp::cluster::thread_member_get
+ * @see https://discord.com/developers/docs/resources/channel#get-thread-member
+ * @param thread_id Thread to get member for
+ * @param user_id ID of the user to get
+ * @return thread_member returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_thread_member_get(const snowflake thread_id, const snowflake user_id);
+
+/**
+ * @brief Get members of a thread
+ * @see dpp::cluster::thread_members_get
+ * @see https://discord.com/developers/docs/resources/channel#list-thread-members
+ * @param thread_id Thread to get members for
+ * @return thread_member_map returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_thread_members_get(snowflake thread_id);
+
+/**
+ * @brief Create a thread in a forum or media channel
+ * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
+ *
+ * @see dpp::cluster::thread_create_in_forum
+ * @see https://discord.com/developers/docs/resources/channel#start-thread-in-forum-channel
+ * @param thread_name Name of the forum thread
+ * @param channel_id Forum channel in which thread to create
+ * @param msg The message to start the thread with
+ * @param auto_archive_duration Duration to automatically archive the thread after recent activity
+ * @param rate_limit_per_user amount of seconds a user has to wait before sending another message (0-21600); bots, as well as users with the permission manage_messages, manage_thread, or manage_channel, are unaffected
+ * @param applied_tags List of IDs of forum tags (dpp::forum_tag) to apply to this thread
+ * @return thread returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_thread_create_in_forum(const std::string& thread_name, snowflake channel_id, const message& msg, auto_archive_duration_t auto_archive_duration, uint16_t rate_limit_per_user, std::vector<snowflake> applied_tags = {});
+
+/**
+ * @brief Create a thread
+ * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
+ *
+ * @see dpp::cluster::thread_create
+ * @see https://discord.com/developers/docs/resources/channel#start-thread-without-message
+ * @param thread_name Name of the thread
+ * @param channel_id Channel in which thread to create
+ * @param auto_archive_duration Duration after which thread auto-archives. Can be set to - 60, 1440 (for boosted guilds can also be: 4320, 10080)
+ * @param thread_type Type of thread - CHANNEL_PUBLIC_THREAD, CHANNEL_ANNOUNCEMENT_THREAD, CHANNEL_PRIVATE_THREAD
+ * @param invitable whether non-moderators can add other non-moderators to a thread; only available when creating a private thread
+ * @param rate_limit_per_user amount of seconds a user has to wait before sending another message (0-21600); bots, as well as users with the permission manage_messages, manage_thread, or manage_channel, are unaffected
+ * @return thread returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_thread_create(const std::string& thread_name, snowflake channel_id, uint16_t auto_archive_duration, channel_type thread_type, bool invitable, uint16_t rate_limit_per_user);
+
+/**
+ * @brief Edit a thread
+ * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
+ *
+ * @see dpp::cluster::thread_edit
+ * @see https://discord.com/developers/docs/topics/threads#editing-deleting-threads
+ * @param t Thread to edit
+ * @return thread returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_thread_edit(const thread &t);
+
+/**
+ * @brief Create a thread with a message (Discord: ID of a thread is same as message ID)
+ * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
+ * @see dpp::cluster::thread_create_with_message
+ * @see https://discord.com/developers/docs/resources/channel#start-thread-from-message
+ * @param thread_name Name of the thread
+ * @param channel_id Channel in which thread to create
+ * @param message_id message to start thread with
+ * @param auto_archive_duration Duration after which thread auto-archives. Can be set to - 60, 1440 (for boosted guilds can also be: 4320, 10080)
+ * @param rate_limit_per_user amount of seconds a user has to wait before sending another message (0-21600); bots, as well as users with the permission manage_messages, manage_thread, or manage_channel, are unaffected
+ * @return thread returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_thread_create_with_message(const std::string& thread_name, snowflake channel_id, snowflake message_id, uint16_t auto_archive_duration, uint16_t rate_limit_per_user);
+
+/**
+ * @brief Add a member to a thread
+ * @see dpp::cluster::thread_member_add
+ * @see https://discord.com/developers/docs/resources/channel#add-thread-member
+ * @param thread_id Thread ID to add to
+ * @param user_id Member ID to add
+ * @return confirmation returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_thread_member_add(snowflake thread_id, snowflake user_id);
+
+/**
+ * @brief Remove a member from a thread
+ * @see dpp::cluster::thread_member_remove
+ * @see https://discord.com/developers/docs/resources/channel#remove-thread-member
+ * @param thread_id Thread ID to remove from
+ * @param user_id Member ID to remove
+ * @return confirmation returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_thread_member_remove(snowflake thread_id, snowflake user_id);
+
+/**
+ * @brief Get the thread specified by thread_id. This uses the same call as dpp::cluster::channel_get but returns a thread object.
+ * @see dpp::cluster::thread_get
+ * @see https://discord.com/developers/docs/resources/channel#get-channel
+ * @param thread_id The id of the thread to obtain.
+ * @return thread returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_thread_get(snowflake thread_id);
+
+/**
+ * @brief Edit current (bot) user.
+ *
+ * Modify the requester's user account settings. Returns a dpp::user object on success.
+ * Fires a User Update Gateway event.
+ *
+ * @note There appears to be no limit to the image size, however, if your image cannot be processed/uploaded in time, you will receive a malformed http request.
+ *
+ * @see dpp::cluster::current_user_edit
+ * @see https://discord.com/developers/docs/resources/user#modify-current-user
+ * @param nickname Nickname to set
+ * @param avatar_blob Avatar data to upload
+ * @param avatar_type Type of image for avatar. It can be one of `i_gif`, `i_jpg` or `i_png`.
+ * @param banner_blob Banner data to upload
+ * @param banner_type Type of image for Banner. It can be one of `i_gif`, `i_jpg` or `i_png`.
+ * @return user returned object on completion
+ 	 * @throw dpp::length_exception Image data is larger than the maximum size of 256 kilobytes
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_current_user_edit(const std::string &nickname, const std::string& avatar_blob = "", const image_type avatar_type = i_png, const std::string& banner_blob = "", const image_type banner_type = i_png);
+
+/**
+ * @brief Get current (bot) application
+ *
+ * @see dpp::cluster::current_application_get
+ * @see https://discord.com/developers/docs/topics/oauth2#get-current-bot-application-information
+ * @return application returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_current_application_get();
+
+/**
+ * @brief Get current (bot) user
+ *
+ * @see dpp::cluster::current_user_get
+ * @see https://discord.com/developers/docs/resources/user#get-current-user
+ * @return user_identified returned object on completion
+ * @note The user_identified object is a subclass of dpp::user which contains further details if you have the oauth2 identify or email scopes.
+ * If you do not have these scopes, these fields are empty. You can safely convert a user_identified to user with `dynamic_cast`.
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_current_user_get();
+
+/**
+ * @brief Set the bot's voice state on a stage channel
+ * 
+ * **Caveats**
+ * 
+ * There are currently several caveats for this endpoint:
+ * 
+ * - `channel_id` must currently point to a stage channel.
+ * - current user must already have joined `channel_id`.
+ * - You must have the `MUTE_MEMBERS` permission to unsuppress yourself. You can always suppress yourself.
+ * - You must have the `REQUEST_TO_SPEAK` permission to request to speak. You can always clear your own request to speak.
+ * - You are able to set `request_to_speak_timestamp` to any present or future time.
+ *
+ * @see dpp::cluster::current_user_set_voice_state
+ * @see https://discord.com/developers/docs/resources/guild#modify-current-user-voice-state 
+ * @param guild_id Guild to set voice state on
+ * @param channel_id Stage channel to set voice state on
+ * @return confirmation returned object on completion
+ * @param suppress True if the user's audio should be suppressed, false if it should not
+ * @param request_to_speak_timestamp The time at which we requested to speak, or 0 to clear the request. The time set here must be the current time or in the future.
+ * @throw std::logic_exception You attempted to set a request_to_speak_timestamp in the past which is not the value of 0.
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_current_user_set_voice_state(snowflake guild_id, snowflake channel_id, bool suppress = false, time_t request_to_speak_timestamp = 0);
+
+/**
+ * @brief Get the bot's voice state in a guild without a Gateway connection
+ *
+ * @see dpp::cluster::current_user_get_voice_state
+ * @see https://discord.com/developers/docs/resources/voice#get-current-user-voice-state
+ * @param guild_id Guild to get the voice state for
+ * @return voicestate returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_current_user_get_voice_state(snowflake guild_id);
+
+/**
+ * @brief Set a user's voice state on a stage channel
+ *
+ * **Caveats**
+ * 
+ * There are currently several caveats for this endpoint:
+ * 
+ * - `channel_id` must currently point to a stage channel.
+ * - User must already have joined `channel_id`.
+ * - You must have the `MUTE_MEMBERS` permission. (Since suppression is the only thing that is available currently)
+ * - When unsuppressed, non-bot users will have their `request_to_speak_timestamp` set to the current time. Bot users will not.
+ * - When suppressed, the user will have their `request_to_speak_timestamp` removed.
+ * 
+ * @see dpp::cluster::user_set_voice_state
+ * @see https://discord.com/developers/docs/resources/guild#modify-user-voice-state
+ * @param user_id The user to set the voice state of
+ * @param guild_id Guild to set voice state on
+ * @param channel_id Stage channel to set voice state on
+ * @return confirmation returned object on completion
+ * @param suppress True if the user's audio should be suppressed, false if it should not
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_user_set_voice_state(snowflake user_id, snowflake guild_id, snowflake channel_id, bool suppress = false);
+
+/**
+ * @brief Get a user's voice state in a guild without a Gateway connection
+ *
+ * @see dpp::cluster::user_get_voice_state
+ * @see https://discord.com/developers/docs/resources/voice#get-user-voice-state
+ * @param guild_id Guild to get the voice state for
+ * @param user_id The user to get the voice state of
+ * @return voicestate returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_user_get_voice_state(snowflake guild_id, snowflake user_id);
+
+/**
+ * @brief Get current user's connections (linked accounts, e.g. steam, xbox).
+ * This call requires the oauth2 `connections` scope and cannot be executed
+ * against a bot token.
+ * @see dpp::cluster::current_user_connections_get
+ * @see https://discord.com/developers/docs/resources/user#get-user-connections
+ * @return connection_map returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_current_user_connections_get();
+
+/**
+ * @brief Get current (bot) user guilds
+ * @see dpp::cluster::current_user_get_guilds
+ * @see https://discord.com/developers/docs/resources/user#get-current-user-guilds
+ * @return guild_map returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_current_user_get_guilds();
+
+/**
+ * @brief Leave a guild
+ * @see dpp::cluster::current_user_leave_guild
+ * @see https://discord.com/developers/docs/resources/user#leave-guild
+ * @param guild_id Guild ID to leave
+ * @return confirmation returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_current_user_leave_guild(snowflake guild_id);
+
+/**
+ * @brief Get a user by id, without using the cache
+ *
+ * @see dpp::cluster::user_get
+ * @see https://discord.com/developers/docs/resources/user#get-user
+ * @param user_id User ID to retrieve
+ * @return user_identified returned object on completion
+ * @note The user_identified object is a subclass of dpp::user which contains further details if you have the oauth2 identify or email scopes.
+ * If you do not have these scopes, these fields are empty. You can safely convert a user_identified to user with `dynamic_cast`.
+ * @note unless you want something special from `dpp::user_identified` or you've turned off caching, you have no need to call this.
+ * Call `dpp::find_user` instead that looks up the user in the cache rather than a REST call.
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_user_get(snowflake user_id);
+
+/**
+ * @brief Get a user by id, checking in the cache first
+ *
+ * @see dpp::cluster::user_get_cached
+ * @see https://discord.com/developers/docs/resources/user#get-user
+ * @param user_id User ID to retrieve
+ * @return user_identified returned object on completion
+ * @note The user_identified object is a subclass of dpp::user which contains further details if you have the oauth2 identify or email scopes.
+ * If you do not have these scopes, these fields are empty. You can safely convert a user_identified to user with `dynamic_cast`.
+ * @note If the user is found in the cache, special values set in `dpp::user_identified` will be undefined. This call should be used
+ * where you want to for example resolve a user who may no longer be in the bot's guilds, for something like a ban log message.
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_user_get_cached(snowflake user_id);
+
+/**
+ * @brief Get all voice regions
+ * @see dpp::cluster::get_voice_regions
+ * @see https://discord.com/developers/docs/resources/voice#list-voice-regions
+ * @return voiceregion_map returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_get_voice_regions();
+
+/**
+ * @brief Get guild voice regions.
+ * 
+ * Voice regions per guild are somewhat deprecated in preference of per-channel voice regions.
+ * Returns a list of voice region objects for the guild. Unlike the similar /voice route, this returns VIP servers when
+ * the guild is VIP-enabled.
+ *
+ * @see dpp::cluster::guild_get_voice_regions
+ * @see https://discord.com/developers/docs/resources/guild#get-guild-voice-regions
+ * @param guild_id Guild ID to get voice regions for
+ * @return voiceregion_map returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_guild_get_voice_regions(snowflake guild_id);
+
+
+[[nodiscard]] async<confirmation_callback_t> co_create_webhook(const class webhook &wh);
+
+/**
+ * @brief Delete a webhook
+ * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
+ * @see dpp::cluster::delete_webhook
+ * @see https://discord.com/developers/docs/resources/webhook#delete-webhook
+ * @param webhook_id Webhook ID to delete
+ * @return confirmation returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_delete_webhook(snowflake webhook_id);
+
+/**
+ * @brief Delete webhook message
+ *
+ * @see dpp::cluster::delete_webhook_message
+ * @see https://discord.com/developers/docs/resources/webhook#delete-webhook-message
+ * @param wh Webhook to delete message for
+ * @param message_id Message ID to delete
+ * @param thread_id ID of the thread the message is in
+ * @return confirmation returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_delete_webhook_message(const class webhook &wh, snowflake message_id, snowflake thread_id = 0);
+
+/**
+ * @brief Delete webhook with token
+ * @see dpp::cluster::delete_webhook_with_token
+ * @see https://discord.com/developers/docs/resources/webhook#delete-webhook-with-token
+ * @param webhook_id Webhook ID to delete
+ * @param token Token of webhook to delete
+ * @return confirmation returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_delete_webhook_with_token(snowflake webhook_id, const std::string &token);
+
+/**
+ * @brief Edit webhook
+ * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
+ * @see dpp::cluster::edit_webhook
+ * @see https://discord.com/developers/docs/resources/webhook#modify-webhook
+ * @param wh Webhook to edit
+ * @return webhook returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_edit_webhook(const class webhook& wh);
+
+/**
+ * @brief Edit webhook message
+ *
+ * When the content field is edited, the mentions array in the message object will be reconstructed from scratch based on
+ * the new content. The allowed_mentions field of the edit request controls how this happens. If there is no explicit
+ * allowed_mentions in the edit request, the content will be parsed with default allowances, that is, without regard to
+ * whether or not an allowed_mentions was present in the request that originally created the message.
+ * 
+ * @see dpp::cluster::edit_webhook_message
+ * @see https://discord.com/developers/docs/resources/webhook#edit-webhook-message
+ * @note the attachments array must contain all attachments that should be present after edit, including retained and new attachments provided in the request body.
+ * @param wh Webhook to edit message for
+ * @param m New message
+ * @param thread_id ID of the thread the message is in
+ * @return message returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_edit_webhook_message(const class webhook &wh, const struct message &m, snowflake thread_id = 0);
+
+/**
+ * @brief Edit webhook with token (token is encapsulated in the webhook object)
+ * @see dpp::cluster::edit_webhook_with_token
+ * @see https://discord.com/developers/docs/resources/webhook#modify-webhook-with-token
+ * @param wh Webhook to edit (should include token)
+ * @return webhook returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_edit_webhook_with_token(const class webhook& wh);
+
+/**
+ * @brief Execute webhook
+ *
+ * @see dpp::cluster::execute_webhook
+ * @see https://discord.com/developers/docs/resources/webhook#execute-webhook
+ * @param wh Webhook to execute
+ * @param m Message to send
+ * @param wait waits for server confirmation of message send before response, and returns the created message body
+ * @param thread_id Send a message to the specified thread within a webhook's channel. The thread will automatically be unarchived
+ * @param thread_name Name of thread to create (requires the webhook channel to be a forum channel)
+ * @return message returned object on completion
+ * @note If the webhook channel is a forum channel, you must provide either `thread_id` or `thread_name`. If `thread_id` is provided, the message will send in that thread. If `thread_name` is provided, a thread with that name will be created in the forum channel.
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_execute_webhook(const class webhook &wh, const struct message &m, bool wait = false, snowflake thread_id = 0, const std::string& thread_name = "");
+
+/**
+ * @brief Get channel webhooks
+ * @see dpp::cluster::get_channel_webhooks
+ * @see https://discord.com/developers/docs/resources/webhook#get-guild-webhooks
+ * @param channel_id Channel ID to get webhooks for
+ * @return webhook_map returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_get_channel_webhooks(snowflake channel_id);
+
+/**
+ * @brief Get guild webhooks
+ * @see dpp::cluster::get_guild_webhooks
+ * @see https://discord.com/developers/docs/resources/webhook#get-guild-webhooks
+ * @param guild_id Guild ID to get webhooks for
+ * @return webhook_map returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_get_guild_webhooks(snowflake guild_id);
+
+/**
+ * @brief Get webhook
+ * @see dpp::cluster::get_webhook
+ * @see https://discord.com/developers/docs/resources/webhook#get-webhook
+ * @param webhook_id Webhook ID to get
+ * @return webhook returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_get_webhook(snowflake webhook_id);
+
+/**
+ * @brief Get webhook message
+ *
+ * @see dpp::cluster::get_webhook_message
+ * @see https://discord.com/developers/docs/resources/webhook#get-webhook-message
+ * @param wh Webhook to get the original message for
+ * @param message_id The message ID
+ * @param thread_id ID of the thread the message is in
+ * @return message returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_get_webhook_message(const class webhook &wh, snowflake message_id, snowflake thread_id = 0);
+
+/**
+ * @brief Get webhook using token
+ * @see dpp::cluster::get_webhook_with_token
+ * @see https://discord.com/developers/docs/resources/webhook#get-webhook-with-token
+ * @param webhook_id Webhook ID to retrieve
+ * @param token Token of webhook
+ * @return webhook returned object on completion
+ * \memberof dpp::cluster
+ */
+[[nodiscard]] async<confirmation_callback_t> co_get_webhook_with_token(snowflake webhook_id, const std::string &token);
+
+
+/* End of auto-generated definitions */
+[[nodiscard]] async<http_request_completion_t> co_request(const std::string &url, http_method method, const std::string &postdata = "", const std::string &mimetype = "text/plain", const std::multimap<std::string, std::string> &headers = {}, const std::string &protocol = "1.1");
+
diff --git a/3rdParty/dpp/cluster_sync_calls.h b/3rdParty/dpp/cluster_sync_calls.h
deleted file mode 100644
index 44dd073ecb..0000000000
--- a/3rdParty/dpp/cluster_sync_calls.h
+++ /dev/null
@@ -1,2502 +0,0 @@
-/************************************************************************************
- *
- * D++, A Lightweight C++ library for Discord
- *
- * Copyright 2022 Craig Edwards and D++ contributors
- * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- ************************************************************************************/
-
-
-/* Auto @generated by buildtools/make_sync_struct.php.
- *
- * DO NOT EDIT BY HAND!
- *
- * To re-generate this header file re-run the script!
- */
-/**
- * @brief Create/overwrite global slash commands.
- * Any existing global slash commands will be deleted and replaced with these.
- *
- * @see dpp::cluster::global_bulk_command_create
- * @see https://discord.com/developers/docs/interactions/application-commands#bulk-overwrite-global-application-commands
- * @param commands Vector of slash commands to create/update.
- * overwriting existing commands that are registered globally for this application. Updates will be available in all guilds after 1 hour.
- * Commands that do not already exist will count toward daily application command create limits.
- * @return slashcommand_map returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-slashcommand_map global_bulk_command_create_sync(const std::vector<slashcommand> &commands);
-
-/**
- * @brief Create a global slash command (a bot can have a maximum of 100 of these).
- * 
- * @see dpp::cluster::global_command_create
- * @see https://discord.com/developers/docs/interactions/application-commands#create-global-application-command
- * @param s Slash command to create
- * @return slashcommand returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-slashcommand global_command_create_sync(const slashcommand &s);
-
-/**
- * @brief Get a global slash command
- *
- * @see dpp::cluster::global_command_get
- * @see https://discord.com/developers/docs/interactions/application-commands#get-global-application-command
- * @param id The ID of the slash command
- * @return slashcommand returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-slashcommand global_command_get_sync(snowflake id);
-
-/**
- * @brief Delete a global slash command (a bot can have a maximum of 100 of these)
- *
- * @see dpp::cluster::global_command_delete
- * @see https://discord.com/developers/docs/interactions/application-commands#delete-global-application-command
- * @param id Slash command to delete
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-confirmation global_command_delete_sync(snowflake id);
-
-/**
- * @brief Edit a global slash command (a bot can have a maximum of 100 of these)
- *
- * @see dpp::cluster::global_command_edit
- * @see https://discord.com/developers/docs/interactions/application-commands#edit-global-application-command
- * @param s Slash command to change
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-confirmation global_command_edit_sync(const slashcommand &s);
-
-/**
- * @brief Get the application's global slash commands
- *
- * @see dpp::cluster::global_commands_get
- * @see https://discord.com/developers/docs/interactions/application-commands#get-global-application-commands
- * @return slashcommand_map returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-slashcommand_map global_commands_get_sync();
-
-/**
- * @brief Create/overwrite guild slash commands.
- * Any existing guild slash commands on this guild will be deleted and replaced with these.
- *
- * @see dpp::cluster::guild_bulk_command_create
- * @see https://discord.com/developers/docs/interactions/application-commands#bulk-overwrite-guild-application-commands
- * @param commands Vector of slash commands to create/update.
- * New guild commands will be available in the guild immediately. If the command did not already exist, it will count toward daily application command create limits.
- * @param guild_id Guild ID to create/update the slash commands in
- * @return slashcommand_map returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-slashcommand_map guild_bulk_command_create_sync(const std::vector<slashcommand> &commands, snowflake guild_id);
-
-/**
- * @brief Get all slash command permissions of a guild
- *
- * @see dpp::cluster::guild_commands_get_permissions
- * @see https://discord.com/developers/docs/interactions/application-commands#get-application-command-permissions
- * @param guild_id Guild ID to get the slash commands permissions for
- * @return guild_command_permissions_map returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-guild_command_permissions_map guild_commands_get_permissions_sync(snowflake guild_id);
-
-/**
- * @brief Edit/Overwrite the permissions of all existing slash commands in a guild
- *
- * @note You can only add up to 10 permission overwrites for a command
- *
- * @see dpp::cluster::guild_bulk_command_edit_permissions
- * @see https://discord.com/developers/docs/interactions/application-commands#batch-edit-application-command-permissions
- * @warning The endpoint will overwrite all existing permissions for all commands of the application in a guild, including slash commands, user commands, and message commands. Meaning that if you forgot to pass a slash command, the permissions of it might be removed.
- * @param commands A vector of slash commands to edit/overwrite the permissions for
- * @param guild_id Guild ID to edit permissions of the slash commands in
- * @return guild_command_permissions_map returned object on completion
- * @deprecated This has been disabled with updates to Permissions v2. You can use guild_command_edit_permissions instead
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-guild_command_permissions_map guild_bulk_command_edit_permissions_sync(const std::vector<slashcommand> &commands, snowflake guild_id);
-
-/**
- * @brief Create a slash command local to a guild
- *
- * @see dpp::cluster::guild_command_create
- * @see https://discord.com/developers/docs/interactions/application-commands#create-guild-application-command
- * @note Creating a command with the same name as an existing command for your application will overwrite the old command.
- * @param s Slash command to create
- * @param guild_id Guild ID to create the slash command in
- * @return slashcommand returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-slashcommand guild_command_create_sync(const slashcommand &s, snowflake guild_id);
-
-/**
- * @brief Delete a slash command local to a guild
- *
- * @see dpp::cluster::guild_command_delete
- * @see https://discord.com/developers/docs/interactions/application-commands#delete-guild-application-command
- * @param id Slash command to delete
- * @param guild_id Guild ID to delete the slash command in
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-confirmation guild_command_delete_sync(snowflake id, snowflake guild_id);
-
-/**
- * @brief Edit slash command permissions of a guild
- *
- * @see dpp::cluster::guild_command_edit_permissions
- * @see https://discord.com/developers/docs/interactions/application-commands#edit-application-command-permissions
- * @note You can only add up to 10 permission overwrites for a command
- * @param s Slash command to edit the permissions for
- * @param guild_id Guild ID to edit the slash command in
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-confirmation guild_command_edit_permissions_sync(const slashcommand &s, snowflake guild_id);
-
-/**
- * @brief Get a slash command of a guild
- *
- * @see dpp::cluster::guild_command_get
- * @see https://discord.com/developers/docs/interactions/application-commands#get-guild-application-command
- * @note The returned slash commands will not have permissions set, you need to use a permissions getter e.g. dpp::guild_commands_get_permissions to get the guild command permissions
- * @param id The ID of the slash command
- * @param guild_id Guild ID to get the slash command from
- * @return slashcommand returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-slashcommand guild_command_get_sync(snowflake id, snowflake guild_id);
-
-/**
- * @brief Get the permissions for a slash command of a guild
- *
- * @see dpp::cluster::guild_command_get_permissions
- * @see https://discord.com/developers/docs/interactions/application-commands#get-application-command-permissions
- * @param id The ID of the slash command to get the permissions for
- * @param guild_id Guild ID to get the permissions of
- * @return guild_command_permissions returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-guild_command_permissions guild_command_get_permissions_sync(snowflake id, snowflake guild_id);
-
-/**
- * @brief Edit a slash command local to a guild
- *
- * @see dpp::cluster::guild_command_edit
- * @see https://discord.com/developers/docs/interactions/application-commands#edit-guild-application-command
- * @param s Slash command to edit
- * @param guild_id Guild ID to edit the slash command in
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-confirmation guild_command_edit_sync(const slashcommand &s, snowflake guild_id);
-
-/**
- * @brief Get the application's slash commands for a guild
- *
- * @see dpp::cluster::guild_commands_get
- * @see https://discord.com/developers/docs/interactions/application-commands#get-guild-application-commands
- * @note The returned slash commands will not have permissions set, you need to use a permissions getter e.g. dpp::guild_commands_get_permissions to get the guild command permissions
- * @param guild_id Guild ID to get the slash commands for
- * @return slashcommand_map returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-slashcommand_map guild_commands_get_sync(snowflake guild_id);
-
-/**
- * @brief Respond to a slash command
- *
- * @see dpp::cluster::interaction_response_create
- * @see https://discord.com/developers/docs/interactions/receiving-and-responding#create-interaction-response
- * @param interaction_id Interaction id to respond to
- * @param token Token for the interaction webhook
- * @param r Response to send
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-confirmation interaction_response_create_sync(snowflake interaction_id, const std::string &token, const interaction_response &r);
-
-/**
- * @brief Edit response to a slash command
- *
- * @see dpp::cluster::interaction_response_edit
- * @see https://discord.com/developers/docs/interactions/receiving-and-responding#edit-original-interaction-response
- * @param token Token for the interaction webhook
- * @param m Message to send
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-confirmation interaction_response_edit_sync(const std::string &token, const message &m);
-
-/**
- * @brief Create a followup message to a slash command
- * 
- * @param token Token for the interaction webhook
- * @param m followup message to create
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-confirmation interaction_followup_create_sync(const std::string &token, const message &m);
-
-/**
- * @brief Edit original followup message to a slash command
- * This is an alias for cluster::interaction_response_edit
- * @see dpp::cluster::interaction_followup_edit_original
- * @see cluster::interaction_response_edit
- * 
- * @param token Token for the interaction webhook
- * @param m message to edit, the ID should be set
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-confirmation interaction_followup_edit_original_sync(const std::string &token, const message &m);
-
-/**
- * @brief 
- * 
- * @param token Token for the interaction webhook
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-confirmation interaction_followup_delete_sync(const std::string &token);
-
-/**
- * @brief Edit followup message to a slash command
- * The message ID in the message you pass should be correctly set to that of a followup message you previously sent
- * @param token Token for the interaction webhook
- * @param m message to edit, the ID should be set
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-confirmation interaction_followup_edit_sync(const std::string &token, const message &m);
-
-/**
- * @brief Get the followup message to a slash command
- * @param token Token for the interaction webhook
- * @param message_id message to retrieve
- * @return message returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-message interaction_followup_get_sync(const std::string &token, snowflake message_id);
-
-/**
- * @brief Get all auto moderation rules for a guild
- * 
- * @param guild_id Guild id of the auto moderation rule
- * @return automod_rule_map returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-automod_rule_map automod_rules_get_sync(snowflake guild_id);
-
-/**
- * @brief Get a single auto moderation rule
- * 
- * @param guild_id Guild id of the auto moderation rule
- * @param rule_id  Rule id to retrieve
- * @return automod_rule returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-automod_rule automod_rule_get_sync(snowflake guild_id, snowflake rule_id);
-
-/**
- * @brief Create an auto moderation rule
- * 
- * @param guild_id Guild id of the auto moderation rule
- * @param r Auto moderation rule to create
- * @return automod_rule returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-automod_rule automod_rule_create_sync(snowflake guild_id, const automod_rule& r);
-
-/**
- * @brief Edit an auto moderation rule
- * 
- * @param guild_id Guild id of the auto moderation rule
- * @param r Auto moderation rule to edit. The rule's id must be set.
- * @return automod_rule returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-automod_rule automod_rule_edit_sync(snowflake guild_id, const automod_rule& r);
-
-/**
- * @brief Delete an auto moderation rule
- * 
- * @param guild_id Guild id of the auto moderation rule
- * @param rule_id Auto moderation rule id to delete
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-confirmation automod_rule_delete_sync(snowflake guild_id, snowflake rule_id);
-
-/**
- * @brief Create a channel
- * 
- * Create a new channel object for the guild. Requires the `MANAGE_CHANNELS` permission. If setting permission overwrites,
- * only permissions your bot has in the guild can be allowed/denied. Setting `MANAGE_ROLES` permission in channels is only possible
- * for guild administrators. Returns the new channel object on success. Fires a `Channel Create Gateway` event.
- * 
- * All parameters to this endpoint are optional excluding `name`
- * 
- * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
- * @see dpp::cluster::channel_create
- * @see https://discord.com/developers/docs/resources/channel#create-channel
- * @param c Channel to create
- * @return channel returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-channel channel_create_sync(const class channel &c);
-
-/**
- * @brief Remove a permission from a channel
- * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
- * @see dpp::cluster::channel_delete_permission
- * @see https://discord.com/developers/docs/resources/channel#delete-channel-permission
- * @param c Channel to remove permission from
- * @param overwrite_id Overwrite to remove, user or channel ID
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-confirmation channel_delete_permission_sync(const class channel &c, snowflake overwrite_id);
-
-/**
- * @brief Delete a channel
- * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
- * @see dpp::cluster::channel_delete
- * @see https://discord.com/developers/docs/resources/channel#deleteclose-channel
- * @param channel_id Channel id to delete
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-confirmation channel_delete_sync(snowflake channel_id);
-
-/**
- * @brief Edit multiple channels positions
- * 
- * Modify the positions of a set of channel objects for the guild.
- * Requires `MANAGE_CHANNELS` permission. Fires multiple `Channel Update Gateway` events.
- * Only channels to be modified are required.
- *
- * @see dpp::cluster::channel_edit_positions
- * @see https://discord.com/developers/docs/resources/guild#modify-guild-channel-positions
- * @param c Channel to change the position for
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-confirmation channel_edit_positions_sync(const std::vector<channel> &c);
-
-/**
- * @brief Edit a channel
- * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
- * @see dpp::cluster::channel_edit
- * @see https://discord.com/developers/docs/resources/channel#modify-channel
- * @param c Channel to edit/update
- * @return channel returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-channel channel_edit_sync(const class channel &c);
-
-/**
- * @brief Follow an announcement (news) channel
- * @see dpp::cluster::channel_follow_news
- * @see https://discord.com/developers/docs/resources/channel#follow-news-channel
- * @param c Channel id to follow
- * @param target_channel_id Channel to subscribe the channel to
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-confirmation channel_follow_news_sync(const class channel &c, snowflake target_channel_id);
-
-/**
- * @brief Get a channel
- *
- * @see dpp::cluster::channel_get
- * @see https://discord.com/developers/docs/resources/channel#get-channel
- * @param c Channel ID to retrieve
- * @return channel returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-channel channel_get_sync(snowflake c);
-
-/**
- * @brief Create invite for a channel
- * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
- * @see dpp::cluster::channel_invite_create
- * @see https://discord.com/developers/docs/resources/channel#create-channel-invite
- * @param c Channel to create an invite on
- * @param i Invite to create
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-confirmation channel_invite_create_sync(const class channel &c, const class invite &i);
-
-/**
- * @brief Get invites for a channel
- *
- * @see dpp::cluster::channel_invites_get
- * @see https://discord.com/developers/docs/resources/invite#get-invites
- * @param c Channel to get invites for
- * @return invite_map returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-invite_map channel_invites_get_sync(const class channel &c);
-
-/**
- * @brief Get all channels for a guild
- *
- * @see dpp::cluster::channels_get
- * @see https://discord.com/developers/docs/resources/channel#get-channels
- * @param guild_id Guild ID to retrieve channels for
- * @return channel_map returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-channel_map channels_get_sync(snowflake guild_id);
-
-/**
- * @brief Create a dm channel
- * @see dpp::cluster::create_dm_channel
- * @see https://discord.com/developers/docs/resources/user#create-dm
- * @param user_id User ID to create DM channel with
- * @return channel returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-channel create_dm_channel_sync(snowflake user_id);
-
-/**
- * @brief Get current user DM channels
- * 
- * @return channel_map returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-channel_map current_user_get_dms_sync();
-
-/**
- * @brief Create a direct message, also create the channel for the direct message if needed
- *
- * @see dpp::cluster::direct_message_create
- * @see https://discord.com/developers/docs/resources/user#create-dm
- * @see dpp::cluster::direct_message_create
- * @see https://discord.com/developers/docs/resources/channel#create-message
- * @param user_id User ID of user to send message to
- * @param m Message object
- * @return message returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-message direct_message_create_sync(snowflake user_id, const message &m);
-
-/**
- * @brief Adds a recipient to a Group DM using their access token
- * @see dpp::cluster::gdm_add
- * @see https://discord.com/developers/docs/resources/channel#group-dm-add-recipient
- * @param channel_id Channel id to add group DM recipients to
- * @param user_id User ID to add
- * @param access_token Access token from OAuth2
- * @param nick Nickname of user to apply to the chat
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-confirmation gdm_add_sync(snowflake channel_id, snowflake user_id, const std::string &access_token, const std::string &nick);
-
-/**
- * @brief Removes a recipient from a Group DM
- * @see dpp::cluster::gdm_remove
- * @see https://discord.com/developers/docs/resources/channel#group-dm-remove-recipient
- * @param channel_id Channel ID of group DM
- * @param user_id User ID to remove from group DM
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-confirmation gdm_remove_sync(snowflake channel_id, snowflake user_id);
-
-/**
- * @brief Create single emoji.
- * You must ensure that the emoji passed contained image data using the emoji::load_image() method.
- * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
- *
- * @see dpp::cluster::guild_emoji_create
- * @see https://discord.com/developers/docs/resources/emoji#create-guild-emoji
- * @param guild_id Guild ID to create emoji om
- * @param newemoji Emoji to create
- * @return emoji returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-emoji guild_emoji_create_sync(snowflake guild_id, const class emoji& newemoji);
-
-/**
- * @brief Delete a guild emoji
- * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
- *
- * @see dpp::cluster::guild_emoji_delete
- * @see https://discord.com/developers/docs/resources/emoji#delete-guild-emoji
- * @param guild_id Guild ID to delete emoji on
- * @param emoji_id Emoji ID to delete
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-confirmation guild_emoji_delete_sync(snowflake guild_id, snowflake emoji_id);
-
-/**
- * @brief Edit a single emoji.
- * 
- * You must ensure that the emoji passed contained image data using the emoji::load_image() method.
- * @see dpp::cluster::guild_emoji_edit
- * @see https://discord.com/developers/docs/resources/emoji#get-guild-emoji
- * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
- * @param guild_id Guild ID to edit emoji on
- * @param newemoji Emoji to edit
- * @return emoji returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-emoji guild_emoji_edit_sync(snowflake guild_id, const class emoji& newemoji);
-
-/**
- * @brief Get a single emoji
- *
- * @see dpp::cluster::guild_emoji_get
- * @see https://discord.com/developers/docs/resources/emoji#get-guild-emoji
- * @param guild_id Guild ID to get emoji for
- * @param emoji_id Emoji ID to get
- * @return emoji returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-emoji guild_emoji_get_sync(snowflake guild_id, snowflake emoji_id);
-
-/**
- * @brief Get all emojis for a guild
- *
- * @see dpp::cluster::guild_emojis_get
- * @see https://discord.com/developers/docs/resources/emoji#get-guild-emojis
- * @param guild_id Guild ID to get emojis for
- * @return emoji_map returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-emoji_map guild_emojis_get_sync(snowflake guild_id);
-
-/**
- * @brief Get the gateway information for the bot using the token
- * @see dpp::cluster::get_gateway_bot
- * @see https://discord.com/developers/docs/topics/gateway#get-gateway-bot
- * @return gateway returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-gateway get_gateway_bot_sync();
-
-/**
- * @brief Modify current member
- *
- * Modifies the current member in a guild.
- * Fires a `Guild Member Update` Gateway event.
- *
- * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
- * @see dpp::cluster::guild_current_member_edit
- * @see https://discord.com/developers/docs/resources/guild#modify-current-member
- * @param guild_id Guild ID to change on
- * @param nickname New nickname, or empty string to clear nickname
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-confirmation guild_current_member_edit_sync(snowflake guild_id, const std::string &nickname);
-
-/**
- * @brief Get the audit log for a guild
- *
- * @see dpp::cluster::guild_auditlog_get
- * @see https://discord.com/developers/docs/resources/audit-log#get-guild-audit-log
- * @param guild_id Guild to get the audit log of
- * @param user_id Entries from a specific user ID. Set this to `0` will fetch any user
- * @param action_type Entries for a specific dpp::audit_type. Set this to `0` will fetch any type
- * @param before Entries that preceded a specific audit log entry ID. Used for paginating
- * @param limit Maximum number of entries (between 1-100) to return
- * @return auditlog returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-auditlog guild_auditlog_get_sync(snowflake guild_id, snowflake user_id, uint32_t action_type, snowflake before, uint32_t limit);
-
-/**
- * @brief Add guild ban
- *
- * Create a guild ban, and optionally delete previous messages sent by the banned user.
- * Requires the `BAN_MEMBERS` permission. Fires a `Guild Ban Add` Gateway event.
- * @see dpp::cluster::guild_ban_add
- * @see https://discord.com/developers/docs/resources/guild#create-guild-ban
- * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
- * @param guild_id Guild ID to add ban to
- * @param user_id User ID to ban
- * @param delete_message_seconds How many seconds to delete messages for, between 0 and 604800 (7 days). Defaults to 0
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-confirmation guild_ban_add_sync(snowflake guild_id, snowflake user_id, uint32_t delete_message_seconds = 0);
-
-/**
- * @brief Delete guild ban
- * 
- * Remove the ban for a user. Requires the `BAN_MEMBERS` permissions.
- * Fires a Guild Ban Remove Gateway event.
- * @see dpp::cluster::guild_ban_delete
- * @see https://discord.com/developers/docs/resources/guild#remove-guild-ban
- * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
- * @param guild_id Guild to delete ban from
- * @param user_id User ID to delete ban for
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-confirmation guild_ban_delete_sync(snowflake guild_id, snowflake user_id);
-
-/**
- * @brief Create a guild
- * 
- * Create a new guild. Returns a guild object on success. `Fires a Guild Create Gateway` event.
- * 
- * When using the roles parameter, the first member of the array is used to change properties of the guild's everyone role.
- * If you are trying to bootstrap a guild with additional roles, keep this in mind. The required id field within each role object is an
- * integer placeholder, and will be replaced by the API upon consumption. Its purpose is to allow you to overwrite a role's permissions
- * in a channel when also passing in channels with the channels array.
- * When using the channels parameter, the position field is ignored, and none of the default channels are created. The id field within
- * each channel object may be set to an integer placeholder, and will be replaced by the API upon consumption. Its purpose is to
- * allow you to create `GUILD_CATEGORY` channels by setting the `parent_id` field on any children to the category's id field.
- * Category channels must be listed before any children.
- *
- * @see dpp::cluster::guild_create
- * @see https://discord.com/developers/docs/resources/guild#create-guild
- * @note The region field is deprecated and is replaced by channel.rtc_region. This endpoint can be used only by bots in less than 10 guilds.
- * @param g Guild to create
- * @return guild returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-guild guild_create_sync(const class guild &g);
-
-/**
- * @brief Delete a guild
- * 
- * Delete a guild permanently. User must be owner. Fires a `Guild Delete Gateway` event.
- *
- * @see dpp::cluster::guild_delete
- * @see https://discord.com/developers/docs/resources/guild#delete-guild
- * @param guild_id Guild ID to delete
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-confirmation guild_delete_sync(snowflake guild_id);
-
-/**
- * @brief Delete guild integration
- * 
- * Delete the attached integration object for the guild. Deletes any associated webhooks and kicks the associated bot if there is one.
- * Requires the `MANAGE_GUILD` permission. Fires a Guild Integrations Update Gateway event.
- * 
- * @see dpp::cluster::guild_delete_integration
- * @see https://discord.com/developers/docs/resources/guild#delete-guild-integration
- * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
- * @param guild_id Guild ID to delete integration for
- * @param integration_id Integration ID to delete
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-confirmation guild_delete_integration_sync(snowflake guild_id, snowflake integration_id);
-
-/**
- * @brief Edit a guild
- * 
- * Modify a guild's settings. Requires the `MANAGE_GUILD` permission. Returns the updated guild object on success.
- * Fires a `Guild Update Gateway` event.
- * 
- * @see dpp::cluster::guild_edit
- * @see https://discord.com/developers/docs/resources/guild#modify-guild
- * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
- * @param g Guild to edit
- * @return guild returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-guild guild_edit_sync(const class guild &g);
-
-/**
- * @brief Edit guild widget
- * 
- * Requires the `MANAGE_GUILD` permission.
- *
- * @see dpp::cluster::guild_edit_widget
- * @see https://discord.com/developers/docs/resources/guild#modify-guild-widget
- * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
- * @param guild_id Guild ID to edit widget for
- * @param gw New guild widget information
- * @return guild_widget returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-guild_widget guild_edit_widget_sync(snowflake guild_id, const class guild_widget &gw);
-
-/**
- * @brief Get single guild ban
- * 
- * Requires the `BAN_MEMBERS` permission.
- * @see dpp::cluster::guild_get_ban
- * @see https://discord.com/developers/docs/resources/guild#get-guild-ban
- * @param guild_id Guild ID to get ban for
- * @param user_id User ID of ban to retrieve
- * @return ban returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-ban guild_get_ban_sync(snowflake guild_id, snowflake user_id);
-
-/**
- * @brief Get guild ban list
- * 
- * Requires the `BAN_MEMBERS` permission.
- * @see dpp::cluster::guild_get_bans
- * @see https://discord.com/developers/docs/resources/guild#get-guild-bans
- * @note Provide a user ID to `before` and `after` for pagination. Users will always be returned in ascending order by the user ID. If both before and after are provided, only before is respected.
- * @param guild_id Guild ID to get bans for
- * @param before If non-zero, all bans for user ids before this user id will be returned up to the limit
- * @param after if non-zero, all bans for user ids after this user id will be returned up to the limit
- * @param limit the maximum number of bans to retrieve in this call up to a maximum of 1000
- * @return ban_map returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-ban_map guild_get_bans_sync(snowflake guild_id, snowflake before, snowflake after, snowflake limit);
-
-
-guild guild_get_sync(snowflake guild_id);
-
-/**
- * @brief Get guild integrations
- * 
- * Requires the `MANAGE_GUILD` permission.
- *
- * @see dpp::cluster::guild_get_integrations
- * @see https://discord.com/developers/docs/resources/guild#get-guild-integrations
- * @param guild_id Guild ID to get integrations for
- * @return integration_map returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-integration_map guild_get_integrations_sync(snowflake guild_id);
-
-
-guild guild_get_preview_sync(snowflake guild_id);
-
-/**
- * @brief Get guild vanity url, if enabled
- * 
- * Returns a partial dpp::invite object for guilds with that feature enabled. Requires the `MANAGE_GUILD` permission. code will be null if a vanity url for the guild is not set.
- * @see dpp::cluster::guild_get_vanity
- * @see https://discord.com/developers/docs/resources/guild#get-guild-vanity-url
- * @param guild_id Guild to get vanity URL for
- * @return invite returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-invite guild_get_vanity_sync(snowflake guild_id);
-
-/**
- * @brief Get guild widget
- * 
- * Requires the `MANAGE_GUILD` permission.
- *
- * @see dpp::cluster::guild_get_widget
- * @see https://discord.com/developers/docs/resources/guild#get-guild-widget
- * @param guild_id Guild ID to get widget for
- * @return guild_widget returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-guild_widget guild_get_widget_sync(snowflake guild_id);
-
-/**
- * @brief Modify guild integration
- * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
- *
- * @see dpp::cluster::guild_modify_integration
- * @see https://discord.com/developers/docs/resources/guild#modify-guild-integration
- * @param guild_id Guild ID to modify integration for
- * @param i Integration to modify
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-confirmation guild_modify_integration_sync(snowflake guild_id, const class integration &i);
-
-/**
- * @brief Get prune counts
- * 
- * Returns a prune object indicating the number of members that would be removed in a prune operation. Requires the `KICK_MEMBERS`
- * permission. By default, prune will not remove users with roles. You can optionally include specific roles in your prune by providing the
- * include_roles parameter. Any inactive user that has a subset of the provided role(s) will be counted in the prune and users with additional
- * roles will not.
- *
- * @see dpp::cluster::guild_get_prune_counts
- * @see https://discord.com/developers/docs/resources/guild#get-guild-prune-count
- * @param guild_id Guild ID to count for pruning
- * @param pruneinfo Pruning info
- * @return prune returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-prune guild_get_prune_counts_sync(snowflake guild_id, const struct prune& pruneinfo);
-
-/**
- * @brief Begin guild prune
- * 
- * Begin a prune operation. Requires the `KICK_MEMBERS` permission. Returns a prune object indicating the number of members
- * that were removed in the prune operation. For large guilds it's recommended to set the `compute_prune_count` option to false, forcing
- * 'pruned' to 0. Fires multiple `Guild Member Remove` Gateway events.
- * By default, prune will not remove users with roles. You can optionally include specific roles in your prune by providing the `include_roles`
- * parameter. Any inactive user that has a subset of the provided role(s) will be included in the prune and users with additional roles will not.
- * 
- * @see dpp::cluster::guild_begin_prune
- * @see https://discord.com/developers/docs/resources/guild#begin-guild-prune
- * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
- * @param guild_id Guild ID to prune
- * @param pruneinfo Pruning info
- * @return prune returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-prune guild_begin_prune_sync(snowflake guild_id, const struct prune& pruneinfo);
-
-/**
- * @brief Change current user nickname
- * 
- * Modifies the nickname of the current user in a guild.
- * Fires a `Guild Member Update` Gateway event.
- * 
- * @deprecated Deprecated in favor of Modify Current Member. Will be replaced by dpp::cluster::guild_current_member_edit
- * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
- * @see dpp::cluster::guild_set_nickname
- * @see https://discord.com/developers/docs/resources/guild#modify-current-user-nick
- * @param guild_id Guild ID to change nickname on
- * @param nickname New nickname, or empty string to clear nickname
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-confirmation guild_set_nickname_sync(snowflake guild_id, const std::string &nickname);
-
-/**
- * @brief Sync guild integration
- *
- * @see dpp::cluster::guild_sync_integration
- * @see https://discord.com/developers/docs/resources/guild#sync-guild-integration
- * @param guild_id Guild ID to sync integration on
- * @param integration_id Integration ID to synchronise
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-confirmation guild_sync_integration_sync(snowflake guild_id, snowflake integration_id);
-
-/**
- * @brief Add guild member. Needs a specific oauth2 scope, from which you get the access_token.
- * 
- * Adds a user to the guild, provided you have a valid oauth2 access token for the user with the guilds.join scope.
- * Returns the guild_member, which is defaulted if the user is already a member of the guild. Fires a `Guild Member Add` Gateway event.
- * 
- * For guilds with Membership Screening enabled, this endpoint will default to adding new members as pending in the guild member object.
- * Members that are pending will have to complete membership screening before they become full members that can talk.
- * 
- * @note All parameters to this endpoint except for access_token are optional.
- * The bot must be a member of the guild with `CREATE_INSTANT_INVITE` permission.
- * @see dpp::cluster::guild_add_member
- * @see https://discord.com/developers/docs/resources/guild#add-guild-member
- * @param gm Guild member to add
- * @param access_token Access token from Oauth2 scope
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-confirmation guild_add_member_sync(const guild_member& gm, const std::string &access_token);
-
-/**
- * @brief Edit the properties of an existing guild member
- * 
- * Modify attributes of a guild member. Returns the guild_member. Fires a `Guild Member Update` Gateway event.
- * To remove a timeout, set the `communication_disabled_until` to a non-zero time in the past, e.g. 1.
- * When moving members to channels, the API user must have permissions to both connect to the channel and have the `MOVE_MEMBERS` permission.
- * For moving and disconnecting users from voice, use dpp::cluster::guild_member_move.
- * @see dpp::cluster::guild_edit_member
- * @see https://discord.com/developers/docs/resources/guild#modify-guild-member
- * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
- * @param gm Guild member to edit
- * @return guild_member returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-guild_member guild_edit_member_sync(const guild_member& gm);
-
-/**
- * @brief Get a guild member
- * @see dpp::cluster::guild_get_member
- * @see https://discord.com/developers/docs/resources/guild#get-guild-member
- * @param guild_id Guild ID to get member for
- * @param user_id User ID of member to get
- * @return guild_member returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-guild_member guild_get_member_sync(snowflake guild_id, snowflake user_id);
-
-/**
- * @brief Get all guild members
- * 
- * @note This endpoint is restricted according to whether the `GUILD_MEMBERS` Privileged Intent is enabled for your application.
- * @see dpp::cluster::guild_get_members
- * @see https://discord.com/developers/docs/resources/guild#get-guild-members
- * @param guild_id Guild ID to get all members for
- * @param limit max number of members to return (1-1000)
- * @param after the highest user id in the previous page
- * @return guild_member_map returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-guild_member_map guild_get_members_sync(snowflake guild_id, uint16_t limit, snowflake after);
-
-/**
- * @brief Add role to guild member
- * 
- * Adds a role to a guild member. Requires the `MANAGE_ROLES` permission.
- * Fires a `Guild Member Update` Gateway event.
- * @see dpp::cluster::guild_member_add_role
- * @see https://discord.com/developers/docs/resources/guild#add-guild-member-role
- * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
- * @param guild_id Guild ID to add a role to
- * @param user_id User ID to add role to
- * @param role_id Role ID to add to the user
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-confirmation guild_member_add_role_sync(snowflake guild_id, snowflake user_id, snowflake role_id);
-
-/**
- * @brief Remove (kick) a guild member
- * 
- * Remove a member from a guild. Requires `KICK_MEMBERS` permission.
- * Fires a `Guild Member Remove` Gateway event.
- * @see dpp::cluster::guild_member_delete
- * @see https://discord.com/developers/docs/resources/guild#remove-guild-member
- * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
- * @deprecated Replaced by dpp::cluster::guild_member_kick
- * @param guild_id Guild ID to kick member from
- * @param user_id User ID to kick
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-confirmation guild_member_delete_sync(snowflake guild_id, snowflake user_id);
-
-/**
- * @brief Remove (kick) a guild member
- *  
- * Remove a member from a guild. Requires `KICK_MEMBERS` permission.
- * Fires a `Guild Member Remove` Gateway event.
- * @see dpp::cluster::guild_member_kick
- * @see https://discord.com/developers/docs/resources/guild#remove-guild-member
- * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
- * @param guild_id Guild ID to kick member from
- * @param user_id User ID to kick
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-confirmation guild_member_kick_sync(snowflake guild_id, snowflake user_id);
-
-/**
- * @brief Set the timeout of a guild member
- *
- * Fires a `Guild Member Update` Gateway event.
- * @see dpp::cluster::guild_member_timeout
- * @see https://discord.com/developers/docs/resources/guild#modify-guild-member
- * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
- * @param guild_id Guild ID to timeout the member in
- * @param user_id User ID to set the timeout for
- * @param communication_disabled_until The timestamp when the user's timeout will expire (up to 28 days in the future). Set to 0 to remove the timeout
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-confirmation guild_member_timeout_sync(snowflake guild_id, snowflake user_id, time_t communication_disabled_until);
-
-/**
- * @brief Remove role from guild member
- * 
- * Removes a role from a guild member. Requires the `MANAGE_ROLES` permission.
- * Fires a `Guild Member Update` Gateway event.
- * @see dpp::cluster::guild_member_delete_role
- * @see https://discord.com/developers/docs/resources/guild#remove-guild-member-role
- * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
- * @param guild_id Guild ID to remove role from user on
- * @param user_id User ID to remove role from
- * @param role_id Role to remove
- * @return confirmation returned object on completion
- * @deprecated Use dpp::cluster::guild_member_remove_role instead
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-confirmation guild_member_delete_role_sync(snowflake guild_id, snowflake user_id, snowflake role_id);
-
-/**
- * @brief Remove role from guild member
- *
- * Removes a role from a guild member. Requires the `MANAGE_ROLES` permission.
- * Fires a `Guild Member Update` Gateway event.
- * @see dpp::cluster::guild_member_remove_role
- * @see https://discord.com/developers/docs/resources/guild#remove-guild-member-role
- * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
- * @param guild_id Guild ID to remove role from user on
- * @param user_id User ID to remove role from
- * @param role_id Role to remove
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-confirmation guild_member_remove_role_sync(snowflake guild_id, snowflake user_id, snowflake role_id);
-
-/**
- * @brief Moves the guild member to a other voice channel, if member is connected to one.
- * Set the `channel_id` to `0` to disconnect the user.
- *
- * Fires a `Guild Member Update` Gateway event.
- * @note When moving members to channels, the API user __must__ have permissions to both connect to the channel and have the `MOVE_MEMBERS` permission.
- * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
- * @see dpp::cluster::guild_member_move
- * @see https://discord.com/developers/docs/resources/guild#modify-guild-member
- * @param channel_id Id of the channel to which the user is used. Set to `0` to disconnect the user
- * @param guild_id Guild id to which the user is connected
- * @param user_id User id, who should be moved
- * @return guild_member returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-guild_member guild_member_move_sync(const snowflake channel_id, const snowflake guild_id, const snowflake user_id);
-
-/**
- * @brief Search for guild members based on whether their username or nickname starts with the given string.
- *
- * @note This endpoint is restricted according to whether the `GUILD_MEMBERS` Privileged Intent is enabled for your application.
- * @see dpp::cluster::guild_search_members
- * @see https://discord.com/developers/docs/resources/guild#search-guild-members
- * @param guild_id Guild ID to search in
- * @param query Query string to match username(s) and nickname(s) against
- * @param limit max number of members to return (1-1000)
- * @return guild_member_map returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-guild_member_map guild_search_members_sync(snowflake guild_id, const std::string& query, uint16_t limit);
-
-/**
- * @brief Get guild invites
- * 
- * Returns a list of invite objects (with invite metadata) for the guild. Requires the `MANAGE_GUILD` permission.
- *
- * @see dpp::cluster::guild_get_invites
- * @see https://discord.com/developers/docs/resources/guild#get-guild-invites
- * @param guild_id Guild ID to get invites for
- * @return invite_map returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-invite_map guild_get_invites_sync(snowflake guild_id);
-
-
-invite invite_delete_sync(const std::string &invitecode);
-
-
-invite invite_get_sync(const std::string &invitecode);
-
-/**
- * @brief Send a message to a channel. The callback function is called when the message has been sent
- *
- * @see dpp::cluster::message_create
- * @see https://discord.com/developers/docs/resources/channel#create-message
- * @param m Message to send
- * @return message returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-message message_create_sync(const struct message &m);
-
-/**
- * @brief Crosspost a message. The callback function is called when the message has been sent
- *
- * @see dpp::cluster::message_crosspost
- * @see https://discord.com/developers/docs/resources/channel#crosspost-message
- * @param message_id Message to crosspost
- * @param channel_id Channel ID to crosspost from
- * @return message returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-message message_crosspost_sync(snowflake message_id, snowflake channel_id);
-
-/**
- * @brief Bulk delete messages from a channel. The callback function is called when the message has been edited
- * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
- *
- * @note If any message provided older than 2 weeks or any duplicate message ID, it will fail.
- *
- * @see dpp::cluster::message_delete_bulk
- * @see https://discord.com/developers/docs/resources/channel#bulk-delete-messages
- * @param message_ids List of message IDs to delete (at least 2 and at most 100 message IDs)
- * @param channel_id Channel to delete from
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-confirmation message_delete_bulk_sync(const std::vector<snowflake> &message_ids, snowflake channel_id);
-
-/**
- * @brief Delete a message from a channel. The callback function is called when the message has been edited
- * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
- *
- * @see dpp::cluster::message_delete
- * @see https://discord.com/developers/docs/resources/channel#delete-message
- * @param message_id Message ID to delete
- * @param channel_id Channel to delete from
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-confirmation message_delete_sync(snowflake message_id, snowflake channel_id);
-
-/**
- * @brief Edit a message on a channel. The callback function is called when the message has been edited
- *
- * @see dpp::cluster::message_edit
- * @see https://discord.com/developers/docs/resources/channel#edit-message
- * @param m Message to edit
- * @return message returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-message message_edit_sync(const struct message &m);
-
-/**
- * @brief Get a message
- *
- * @see dpp::cluster::message_get
- * @see https://discord.com/developers/docs/resources/channel#get-channel-message
- * @param message_id Message ID
- * @param channel_id Channel ID
- * @return message returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-message message_get_sync(snowflake message_id, snowflake channel_id);
-
-/**
- * @brief Pin a message
- * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
- * @see dpp::cluster::message_pin
- * @see https://discord.com/developers/docs/resources/channel#pin-message
- * @param channel_id Channel id to pin message on
- * @param message_id Message id to pin message on
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-confirmation message_pin_sync(snowflake channel_id, snowflake message_id);
-
-/**
- * @brief Get multiple messages.
- * 
- * This function will attempt to fetch as many messages as possible using multiple API calls if needed.
- *
- * @see dpp::cluster::messages_get
- * @see https://discord.com/developers/docs/resources/channel#get-channel-messages
- * @param channel_id Channel ID to retrieve messages for
- * @param around Messages should be retrieved around this ID if this is set to non-zero
- * @param before Messages before this ID should be retrieved if this is set to non-zero
- * @param after Messages after this ID should be retrieved if this is set to non-zero
- * @param limit This number of messages maximum should be returned, up to a maximum of 100.
- * @return message_map returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-message_map messages_get_sync(snowflake channel_id, snowflake around, snowflake before, snowflake after, uint64_t limit);
-
-/**
- * @brief Unpin a message
- * @see dpp::cluster::message_unpin
- * @see https://discord.com/developers/docs/resources/channel#unpin-message
- * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
- * @param channel_id Channel id to unpin message on
- * @param message_id Message id to unpin message on
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-confirmation message_unpin_sync(snowflake channel_id, snowflake message_id);
-
-/**
- * @brief Get a channel's pins
- * @see dpp::cluster::channel_pins_get
- * @see https://discord.com/developers/docs/resources/channel#get-pinned-messages
- * @param channel_id Channel ID to get pins for
- * @return message_map returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-message_map channel_pins_get_sync(snowflake channel_id);
-
-/**
- * @brief Create a role on a guild
- * 
- * Create a new role for the guild. Requires the `MANAGE_ROLES` permission. Returns the new role object on success.
- * Fires a `Guild Role Create` Gateway event.
- * 
- * @see dpp::cluster::role_create
- * @see https://discord.com/developers/docs/resources/guild#create-guild-role
- * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
- * @param r Role to create (guild ID is encapsulated in the role object)
- * @return role returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-role role_create_sync(const class role &r);
-
-/**
- * @brief Delete a role
- * 
- * Requires the `MANAGE_ROLES` permission. Fires a `Guild Role Delete` Gateway event.
- * 
- * @see dpp::cluster::role_delete
- * @see https://discord.com/developers/docs/resources/guild#delete-guild-role
- * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
- * @param guild_id Guild ID to delete the role on
- * @param role_id Role ID to delete
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-confirmation role_delete_sync(snowflake guild_id, snowflake role_id);
-
-/**
- * @brief Edit a role on a guild
- * 
- * Requires the `MANAGE_ROLES` permission. Returns the updated role on success. Fires a `Guild Role Update` Gateway event.
- * 
- * @see dpp::cluster::role_edit
- * @see https://discord.com/developers/docs/resources/guild#modify-guild-role
- * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
- * @param r Role to edit
- * @return role returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-role role_edit_sync(const class role &r);
-
-/**
- * @brief Edit multiple role's position in a guild. Returns a list of all roles of the guild on success.
- *
- * Modify the positions of a set of role objects for the guild. Requires the `MANAGE_ROLES` permission.
- * Fires multiple `Guild Role Update` Gateway events.
- *
- * @see dpp::cluster::roles_edit_position
- * @see https://discord.com/developers/docs/resources/guild#modify-guild-role-positions
- * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
- * @param guild_id Guild ID to change the roles position on
- * @param roles Vector of roles to change the positions of
- * @return role_map returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-role_map roles_edit_position_sync(snowflake guild_id, const std::vector<role> &roles);
-
-/**
- * @brief Get a role for a guild
- *
- * @see dpp::cluster::roles_get
- * @see https://discord.com/developers/docs/resources/guild#get-guild-roles
- * @param guild_id Guild ID to get role for
- * @return role_map returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-role_map roles_get_sync(snowflake guild_id);
-
-/**
- * @brief Get user application role connection
- *
- * @see dpp::cluster::user_application_role_connection_get
- * @see https://discord.com/developers/docs/resources/user#get-user-application-role-connection
- * @param application_id The application ID
- * @return application_role_connection returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-application_role_connection user_application_role_connection_get_sync(snowflake application_id);
-
-/**
- * @brief Update user application role connection
- *
- * @see dpp::cluster::user_application_role_connection_update
- * @see https://discord.com/developers/docs/resources/user#update-user-application-role-connection
- * @param application_id The application ID
- * @param connection The application role connection to update
- * @return application_role_connection returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-application_role_connection user_application_role_connection_update_sync(snowflake application_id, const application_role_connection &connection);
-
-/**
- * @brief Get all scheduled events for a guild
- * @see dpp::cluster::guild_events_get
- * @see https://discord.com/developers/docs/resources/guild-scheduled-event#list-scheduled-events-for-guild
- * @param guild_id Guild to get events for
- * @return scheduled_event_map returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-scheduled_event_map guild_events_get_sync(snowflake guild_id);
-
-/**
- * @brief Create a scheduled event on a guild
- *
- * @see dpp::cluster::guild_event_create
- * @see https://discord.com/developers/docs/resources/guild-scheduled-event#create-guild-scheduled-event
- * @param event Event to create (guild ID must be populated)
- * @return scheduled_event returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-scheduled_event guild_event_create_sync(const scheduled_event& event);
-
-/**
- * @brief Delete a scheduled event from a guild
- *
- * @see dpp::cluster::guild_event_delete
- * @see https://discord.com/developers/docs/resources/guild-scheduled-event#delete-guild-scheduled-event
- * @param event_id Event ID to delete
- * @param guild_id Guild ID of event to delete
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-confirmation guild_event_delete_sync(snowflake event_id, snowflake guild_id);
-
-/**
- * @brief Edit/modify a scheduled event on a guild
- *
- * @see dpp::cluster::guild_event_edit
- * @see https://discord.com/developers/docs/resources/guild-scheduled-event#modify-guild-scheduled-event
- * @param event Event to create (event ID and guild ID must be populated)
- * @return scheduled_event returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-scheduled_event guild_event_edit_sync(const scheduled_event& event);
-
-/**
- * @brief Get a scheduled event for a guild
- *
- * @see dpp::cluster::guild_event_get
- * @see https://discord.com/developers/docs/resources/guild-scheduled-event#get-guild-scheduled-event
- * @param guild_id Guild to get event for
- * @param event_id Event ID to get
- * @return scheduled_event returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-scheduled_event guild_event_get_sync(snowflake guild_id, snowflake event_id);
-
-
-stage_instance stage_instance_create_sync(const stage_instance& si);
-
-/**
- * @brief Get the stage instance associated with the channel id, if it exists.
- * @see dpp::cluster::stage_instance_get
- * @see https://discord.com/developers/docs/resources/stage-instance#get-stage-instance
- * @param channel_id ID of the associated channel
- * @return stage_instance returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-stage_instance stage_instance_get_sync(const snowflake channel_id);
-
-
-stage_instance stage_instance_edit_sync(const stage_instance& si);
-
-/**
- * @brief Delete a stage instance.
- * @see dpp::cluster::stage_instance_delete
- * @see https://discord.com/developers/docs/resources/stage-instance#delete-stage-instance
- * @param channel_id ID of the associated channel
- * @return confirmation returned object on completion
- * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-confirmation stage_instance_delete_sync(const snowflake channel_id);
-
-/**
- * @brief Create a sticker in a guild
- * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
- * @see dpp::cluster::guild_sticker_create
- * @see https://discord.com/developers/docs/resources/sticker#create-guild-sticker
- * @param s Sticker to create. Must have its guild ID set.
- * @return sticker returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-sticker guild_sticker_create_sync(sticker &s);
-
-/**
- * @brief Delete a sticker from a guild
- * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
- * @see dpp::cluster::guild_sticker_delete
- * @see https://discord.com/developers/docs/resources/sticker#delete-guild-sticker
- * @param sticker_id sticker ID to delete
- * @param guild_id guild ID to delete from
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-confirmation guild_sticker_delete_sync(snowflake sticker_id, snowflake guild_id);
-
-/**
- * @brief Get a guild sticker
- * @see dpp::cluster::guild_sticker_get
- * @see https://discord.com/developers/docs/resources/sticker#get-guild-sticker
- * @param id Id of sticker to get.
- * @param guild_id Guild ID of the guild where the sticker is
- * @return sticker returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-sticker guild_sticker_get_sync(snowflake id, snowflake guild_id);
-
-/**
- * @brief Modify a sticker in a guild
- * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
- * @see dpp::cluster::guild_sticker_modify
- * @see https://discord.com/developers/docs/resources/sticker#modify-guild-sticker
- * @param s Sticker to modify. Must have its guild ID and sticker ID set.
- * @return sticker returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-sticker guild_sticker_modify_sync(sticker &s);
-
-/**
- * @brief Get all guild stickers
- * @see dpp::cluster::guild_stickers_get
- * @see https://discord.com/developers/docs/resources/sticker#get-guild-stickers
- * @param guild_id Guild ID of the guild where the sticker is
- * @return sticker_map returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-sticker_map guild_stickers_get_sync(snowflake guild_id);
-
-/**
- * @brief Get a nitro sticker
- * @see dpp::cluster::nitro_sticker_get
- * @see https://discord.com/developers/docs/resources/sticker#get-sticker
- * @param id Id of sticker to get.
- * @return sticker returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-sticker nitro_sticker_get_sync(snowflake id);
-
-/**
- * @brief Get sticker packs
- * @see dpp::cluster::sticker_packs_get
- * @see https://discord.com/developers/docs/resources/sticker#list-nitro-sticker-packs
- * @return sticker_pack_map returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-sticker_pack_map sticker_packs_get_sync();
-
-/**
- * @brief Create a new guild based on a template.
- * @note This endpoint can be used only by bots in less than 10 guilds.
- * @see dpp::cluster::guild_create_from_template
- * @see https://discord.com/developers/docs/resources/guild-template#create-guild-from-guild-template
- * @param code Template code to create guild from
- * @param name Guild name to create
- * @return guild returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-guild guild_create_from_template_sync(const std::string &code, const std::string &name);
-
-/**
- * @brief Creates a template for the guild
- *
- * @see dpp::cluster::guild_template_create
- * @see https://discord.com/developers/docs/resources/guild-template#create-guild-template
- * @param guild_id Guild to create template from
- * @param name Template name to create
- * @param description Description of template to create
- * @return dtemplate returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-dtemplate guild_template_create_sync(snowflake guild_id, const std::string &name, const std::string &description);
-
-/**
- * @brief Deletes the template
- *
- * @see dpp::cluster::guild_template_delete
- * @see https://discord.com/developers/docs/resources/guild-template#delete-guild-template
- * @param guild_id Guild ID of template to delete
- * @param code Template code to delete
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-confirmation guild_template_delete_sync(snowflake guild_id, const std::string &code);
-
-/**
- * @brief Modifies the template's metadata.
- *
- * @see dpp::cluster::guild_template_modify
- * @see https://discord.com/developers/docs/resources/guild-template#modify-guild-template
- * @param guild_id Guild ID of template to modify
- * @param code Template code to modify
- * @param name New name of template
- * @param description New description of template
- * @return dtemplate returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-dtemplate guild_template_modify_sync(snowflake guild_id, const std::string &code, const std::string &name, const std::string &description);
-
-/**
- * @brief Get guild templates
- *
- * @see dpp::cluster::guild_templates_get
- * @see https://discord.com/developers/docs/resources/guild-template#get-guild-templates
- * @param guild_id Guild ID to get templates for
- * @return dtemplate_map returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-dtemplate_map guild_templates_get_sync(snowflake guild_id);
-
-/**
- * @brief Syncs the template to the guild's current state.
- *
- * @see dpp::cluster::guild_template_sync
- * @see https://discord.com/developers/docs/resources/guild-template#sync-guild-template
- * @param guild_id Guild to synchronise template for
- * @param code Code of template to synchronise
- * @return dtemplate returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-dtemplate guild_template_sync_sync(snowflake guild_id, const std::string &code);
-
-/**
- * @brief Get a template
- * @see dpp::cluster::template_get
- * @see https://discord.com/developers/docs/resources/guild-template#get-guild-template
- * @param code Template code
- * @return dtemplate returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-dtemplate template_get_sync(const std::string &code);
-
-/**
- * @brief Join a thread
- * @see dpp::cluster::current_user_join_thread
- * @see https://discord.com/developers/docs/topics/threads
- * @param thread_id Thread ID to join
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-confirmation current_user_join_thread_sync(snowflake thread_id);
-
-/**
- * @brief Leave a thread
- * @see dpp::cluster::current_user_leave_thread
- * @see https://discord.com/developers/docs/topics/threads
- * @param thread_id Thread ID to leave
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-confirmation current_user_leave_thread_sync(snowflake thread_id);
-
-/**
- * @brief Get active threads in a guild (Sorted by ID in descending order)
- * @see dpp::cluster::threads_get_active
- * @see https://discord.com/developers/docs/topics/threads
- * @param guild_id Guild to get active threads for
- * @return thread_map returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-thread_map threads_get_active_sync(snowflake guild_id);
-
-/**
- * @brief Get private archived threads in a channel which current user has joined (Sorted by ID in descending order)
- * @see dpp::cluster::threads_get_joined_private_archived
- * @see https://discord.com/developers/docs/topics/threads
- * @param channel_id Channel to get public archived threads for
- * @param before_id Get threads before this id
- * @param limit Number of threads to get
- * @return thread_map returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-thread_map threads_get_joined_private_archived_sync(snowflake channel_id, snowflake before_id, uint16_t limit);
-
-/**
- * @brief Get private archived threads in a channel (Sorted by archive_timestamp in descending order)
- * @see dpp::cluster::threads_get_private_archived
- * @see https://discord.com/developers/docs/topics/threads
- * @param channel_id Channel to get public archived threads for
- * @param before_timestamp Get threads before this timestamp
- * @param limit Number of threads to get
- * @return thread_map returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-thread_map threads_get_private_archived_sync(snowflake channel_id,  time_t before_timestamp, uint16_t limit);
-
-/**
- * @brief Get public archived threads in a channel (Sorted by archive_timestamp in descending order)
- * @see dpp::cluster::threads_get_public_archived
- * @see https://discord.com/developers/docs/topics/threads
- * @param channel_id Channel to get public archived threads for
- * @param before_timestamp Get threads before this timestamp
- * @param limit Number of threads to get
- * @return thread_map returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-thread_map threads_get_public_archived_sync(snowflake channel_id, time_t before_timestamp, uint16_t limit);
-
-/**
- * @brief Get a thread member
- * @see dpp::cluster::thread_member_get
- * @see https://discord.com/developers/docs/topics/threads
- * @param thread_id Thread to get member for
- * @param user_id ID of the user to get
- * @return thread_member returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-thread_member thread_member_get_sync(const snowflake thread_id, const snowflake user_id);
-
-/**
- * @brief Get members of a thread
- * @see dpp::cluster::thread_members_get
- * @see https://discord.com/developers/docs/topics/threads
- * @param thread_id Thread to get members for
- * @return thread_member_map returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-thread_member_map thread_members_get_sync(snowflake thread_id);
-
-/**
- * @brief Create a thread in forum channel
- * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
- *
- * @see dpp::cluster::thread_create_in_forum
- * @see https://discord.com/developers/docs/resources/channel#start-thread-in-forum-channel
- * @param thread_name Name of the forum thread
- * @param channel_id Forum channel in which thread to create
- * @param msg The message to start the thread with
- * @param auto_archive_duration Duration to automatically archive the thread after recent activity
- * @param rate_limit_per_user amount of seconds a user has to wait before sending another message (0-21600); bots, as well as users with the permission manage_messages, manage_thread, or manage_channel, are unaffected
- * @param applied_tags List of IDs of forum tags (dpp::forum_tag) to apply to this thread
- * @return thread returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-thread thread_create_in_forum_sync(const std::string& thread_name, snowflake channel_id, const message& msg, auto_archive_duration_t auto_archive_duration, uint16_t rate_limit_per_user, std::vector<snowflake> applied_tags = {});
-
-/**
- * @brief Create a thread
- * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
- *
- * @see dpp::cluster::thread_create
- * @see https://discord.com/developers/docs/resources/guild#create-guild-channel
- * @param thread_name Name of the thread
- * @param channel_id Channel in which thread to create
- * @param auto_archive_duration Duration after which thread auto-archives. Can be set to - 60, 1440 (for boosted guilds can also be: 4320, 10080)
- * @param thread_type Type of thread - CHANNEL_PUBLIC_THREAD, CHANNEL_ANNOUNCEMENT_THREAD, CHANNEL_PRIVATE_THREAD
- * @param invitable whether non-moderators can add other non-moderators to a thread; only available when creating a private thread
- * @param rate_limit_per_user amount of seconds a user has to wait before sending another message (0-21600); bots, as well as users with the permission manage_messages, manage_thread, or manage_channel, are unaffected
- * @return thread returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-thread thread_create_sync(const std::string& thread_name, snowflake channel_id, uint16_t auto_archive_duration, channel_type thread_type, bool invitable, uint16_t rate_limit_per_user);
-
-/**
- * @brief Create a thread with a message (Discord: ID of a thread is same as message ID)
- * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
- * @see dpp::cluster::thread_create_with_message
- * @see https://discord.com/developers/docs/topics/threads
- * @param thread_name Name of the thread
- * @param channel_id Channel in which thread to create
- * @param message_id message to start thread with
- * @param auto_archive_duration Duration after which thread auto-archives. Can be set to - 60, 1440 (for boosted guilds can also be: 4320, 10080)
- * @param rate_limit_per_user amount of seconds a user has to wait before sending another message (0-21600); bots, as well as users with the permission manage_messages, manage_thread, or manage_channel, are unaffected
- * @return thread returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-thread thread_create_with_message_sync(const std::string& thread_name, snowflake channel_id, snowflake message_id, uint16_t auto_archive_duration, uint16_t rate_limit_per_user);
-
-/**
- * @brief Add a member to a thread
- * @see dpp::cluster::thread_member_add
- * @see https://discord.com/developers/docs/topics/threads
- * @param thread_id Thread ID to add to
- * @param user_id Member ID to add
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-confirmation thread_member_add_sync(snowflake thread_id, snowflake user_id);
-
-/**
- * @brief Remove a member from a thread
- * @see dpp::cluster::thread_member_remove
- * @see https://discord.com/developers/docs/topics/threads
- * @param thread_id Thread ID to remove from
- * @param user_id Member ID to remove
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-confirmation thread_member_remove_sync(snowflake thread_id, snowflake user_id);
-
-/**
- * @brief Edit current (bot) user
- *
- * Modifies the current member in a guild. Returns the updated guild_member object on success.
- * Fires a `Guild Member Update` Gateway event.
- * @see dpp::cluster::current_user_edit
- * @see https://discord.com/developers/docs/resources/user#modify-current-user
- * @param nickname Nickname to set
- * @param image_blob Avatar data to upload (NOTE: Very heavily rate limited!)
- * @param type Type of image for avatar
- * @return user returned object on completion
- 	 * @throw dpp::exception Image data is larger than the maximum size of 256 kilobytes
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-user current_user_edit_sync(const std::string &nickname, const std::string& image_blob = "", const image_type type = i_png);
-
-/**
- * @brief Get current (bot) application
- *
- * @see dpp::cluster::current_application_get
- * @see https://discord.com/developers/docs/topics/oauth2#get-current-bot-application-information
- * @return application returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-application current_application_get_sync();
-
-/**
- * @brief Get current (bot) user
- *
- * @see dpp::cluster::current_user_get
- * @see https://discord.com/developers/docs/resources/user#get-current-user
- * @return user_identified returned object on completion
- * @note The user_identified object is a subclass of dpp::user which contains further details if you have the oauth2 identify or email scopes.
- * If you do not have these scopes, these fields are empty. You can safely convert a user_identified to user with `dynamic_cast`.
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-user_identified current_user_get_sync();
-
-/**
- * @brief Set the bot's voice state on a stage channel
- * 
- * **Caveats**
- * 
- * There are currently several caveats for this endpoint:
- * 
- * - `channel_id` must currently point to a stage channel.
- * - current user must already have joined `channel_id`.
- * - You must have the `MUTE_MEMBERS` permission to unsuppress yourself. You can always suppress yourself.
- * - You must have the `REQUEST_TO_SPEAK` permission to request to speak. You can always clear your own request to speak.
- * - You are able to set `request_to_speak_timestamp` to any present or future time.
- *
- * @see dpp::cluster::current_user_set_voice_state
- * @see https://discord.com/developers/docs/resources/guild#modify-current-user-voice-state 
- * @param guild_id Guild to set voice state on
- * @param channel_id Stage channel to set voice state on
- * @return confirmation returned object on completion
- * @param suppress True if the user's audio should be suppressed, false if it should not
- * @param request_to_speak_timestamp The time at which we requested to speak, or 0 to clear the request. The time set here must be the current time or in the future.
- * @throw std::logic_exception You attempted to set a request_to_speak_timestamp in the past which is not the value of 0.
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-confirmation current_user_set_voice_state_sync(snowflake guild_id, snowflake channel_id, bool suppress = false, time_t request_to_speak_timestamp = 0);
-
-/**
- * @brief Set a user's voice state on a stage channel
- *
- * **Caveats**
- * 
- * There are currently several caveats for this endpoint:
- * 
- * - `channel_id` must currently point to a stage channel.
- * - User must already have joined `channel_id`.
- * - You must have the `MUTE_MEMBERS` permission. (Since suppression is the only thing that is available currently)
- * - When unsuppressed, non-bot users will have their `request_to_speak_timestamp` set to the current time. Bot users will not.
- * - When suppressed, the user will have their `request_to_speak_timestamp` removed.
- * 
- * @see dpp::cluster::user_set_voice_state
- * @see https://discord.com/developers/docs/resources/guild#modify-user-voice-state
- * @param user_id The user to set the voice state of
- * @param guild_id Guild to set voice state on
- * @param channel_id Stage channel to set voice state on
- * @return confirmation returned object on completion
- * @param suppress True if the user's audio should be suppressed, false if it should not
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-confirmation user_set_voice_state_sync(snowflake user_id, snowflake guild_id, snowflake channel_id, bool suppress = false);
-
-/**
- * @brief Get current user's connections (linked accounts, e.g. steam, xbox).
- * This call requires the oauth2 `connections` scope and cannot be executed
- * against a bot token.
- * @see dpp::cluster::current_user_connections_get
- * @see https://discord.com/developers/docs/resources/user#get-user-connections
- * @return connection_map returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-connection_map current_user_connections_get_sync();
-
-/**
- * @brief Get current (bot) user guilds
- * @see dpp::cluster::current_user_get_guilds
- * @see https://discord.com/developers/docs/resources/user#get-current-user-guilds
- * @return guild_map returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-guild_map current_user_get_guilds_sync();
-
-/**
- * @brief Leave a guild
- * @see dpp::cluster::current_user_leave_guild
- * @see https://discord.com/developers/docs/resources/user#leave-guild
- * @param guild_id Guild ID to leave
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-confirmation current_user_leave_guild_sync(snowflake guild_id);
-
-/**
- * @brief Get a user by id
- *
- * @see dpp::cluster::user_get
- * @see https://discord.com/developers/docs/resources/user#get-user
- * @param user_id User ID to retrieve
- * @return user_identified returned object on completion
- * @note The user_identified object is a subclass of dpp::user which contains further details if you have the oauth2 identify or email scopes.
- * If you do not have these scopes, these fields are empty. You can safely convert a user_identified to user with `dynamic_cast`.
- * @note unless you want something special from `dpp::user_identified` or you've turned off caching, you have no need to call this.
- * Call `dpp::find_user` instead that looks up the user in the cache rather than a REST call.
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-user_identified user_get_sync(snowflake user_id);
-
-/**
- * @brief Get all voice regions
- * @see dpp::cluster::get_voice_regions
- * @see https://discord.com/developers/docs/resources/voice#list-voice-regions
- * @return voiceregion_map returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-voiceregion_map get_voice_regions_sync();
-
-/**
- * @brief Get guild voice regions.
- * 
- * Voice regions per guild are somewhat deprecated in preference of per-channel voice regions.
- * Returns a list of voice region objects for the guild. Unlike the similar /voice route, this returns VIP servers when
- * the guild is VIP-enabled.
- *
- * @see dpp::cluster::guild_get_voice_regions
- * @see https://discord.com/developers/docs/resources/guild#get-guild-voice-regions
- * @param guild_id Guild ID to get voice regions for
- * @return voiceregion_map returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-voiceregion_map guild_get_voice_regions_sync(snowflake guild_id);
-
-/**
- * @brief Create a webhook
- * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
- * @see dpp::cluster::create_webhook
- * @see https://discord.com/developers/docs/resources/webhook#create-webhook
- * @param w Webhook to create
- * @return webhook returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-webhook create_webhook_sync(const class webhook &w);
-
-/**
- * @brief Delete a webhook
- * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
- * @see dpp::cluster::delete_webhook
- * @see https://discord.com/developers/docs/resources/webhook#delete-webhook
- * @param webhook_id Webhook ID to delete
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-confirmation delete_webhook_sync(snowflake webhook_id);
-
-/**
- * @brief Delete webhook message
- *
- * @see dpp::cluster::delete_webhook_message
- * @see https://discord.com/developers/docs/resources/webhook#delete-webhook-message
- * @param wh Webhook to delete message for
- * @param message_id Message ID to delete
- * @param thread_id ID of the thread the message is in
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-confirmation delete_webhook_message_sync(const class webhook &wh, snowflake message_id, snowflake thread_id = 0);
-
-/**
- * @brief Delete webhook with token
- * @see dpp::cluster::delete_webhook_with_token
- * @see https://discord.com/developers/docs/resources/webhook#delete-webhook-with-token
- * @param webhook_id Webhook ID to delete
- * @param token Token of webhook to delete
- * @return confirmation returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-confirmation delete_webhook_with_token_sync(snowflake webhook_id, const std::string &token);
-
-/**
- * @brief Edit webhook
- * @note This method supports audit log reasons set by the cluster::set_audit_reason() method.
- * @see dpp::cluster::edit_webhook
- * @see https://discord.com/developers/docs/resources/webhook#modify-webhook
- * @param wh Webhook to edit
- * @return webhook returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-webhook edit_webhook_sync(const class webhook& wh);
-
-/**
- * @brief Edit webhook message
- *
- * When the content field is edited, the mentions array in the message object will be reconstructed from scratch based on
- * the new content. The allowed_mentions field of the edit request controls how this happens. If there is no explicit
- * allowed_mentions in the edit request, the content will be parsed with default allowances, that is, without regard to
- * whether or not an allowed_mentions was present in the request that originally created the message.
- * 
- * @see dpp::cluster::edit_webhook_message
- * @see https://discord.com/developers/docs/resources/webhook#edit-webhook-message
- * @note the attachments array must contain all attachments that should be present after edit, including retained and new attachments provided in the request body.
- * @param wh Webhook to edit message for
- * @param m New message
- * @param thread_id ID of the thread the message is in
- * @return message returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-message edit_webhook_message_sync(const class webhook &wh, const struct message &m, snowflake thread_id = 0);
-
-/**
- * @brief Edit webhook with token (token is encapsulated in the webhook object)
- * @see dpp::cluster::edit_webhook_with_token
- * @see https://discord.com/developers/docs/resources/webhook#modify-webhook-with-token
- * @param wh Webhook to edit (should include token)
- * @return webhook returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-webhook edit_webhook_with_token_sync(const class webhook& wh);
-
-/**
- * @brief Execute webhook
- *
- * @see dpp::cluster::execute_webhook
- * @see https://discord.com/developers/docs/resources/webhook#execute-webhook
- * @param wh Webhook to execute
- * @param m Message to send
- * @param wait waits for server confirmation of message send before response, and returns the created message body
- * @param thread_id Send a message to the specified thread within a webhook's channel. The thread will automatically be unarchived
- * @param thread_name Name of thread to create (requires the webhook channel to be a forum channel)
- * @return message returned object on completion
- * @note If the webhook channel is a forum channel, you must provide either `thread_id` or `thread_name`. If `thread_id` is provided, the message will send in that thread. If `thread_name` is provided, a thread with that name will be created in the forum channel.
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-message execute_webhook_sync(const class webhook &wh, const struct message &m, bool wait = false, snowflake thread_id = 0, const std::string& thread_name = "");
-
-/**
- * @brief Get channel webhooks
- * @see dpp::cluster::get_channel_webhooks
- * @see https://discord.com/developers/docs/resources/webhook#get-guild-webhooks
- * @param channel_id Channel ID to get webhooks for
- * @return webhook_map returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-webhook_map get_channel_webhooks_sync(snowflake channel_id);
-
-/**
- * @brief Get guild webhooks
- * @see dpp::cluster::get_guild_webhooks
- * @see https://discord.com/developers/docs/resources/webhook#get-guild-webhooks
- * @param guild_id Guild ID to get webhooks for
- * @return webhook_map returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-webhook_map get_guild_webhooks_sync(snowflake guild_id);
-
-/**
- * @brief Get webhook
- * @see dpp::cluster::get_webhook
- * @see https://discord.com/developers/docs/resources/webhook#get-webhook
- * @param webhook_id Webhook ID to get
- * @return webhook returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-webhook get_webhook_sync(snowflake webhook_id);
-
-/**
- * @brief Get webhook message
- *
- * @see dpp::cluster::get_webhook_message
- * @see https://discord.com/developers/docs/resources/webhook#get-webhook-message
- * @param wh Webhook to get the original message for
- * @param message_id The message ID
- * @param thread_id ID of the thread the message is in
- * @return message returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-message get_webhook_message_sync(const class webhook &wh, snowflake message_id, snowflake thread_id = 0);
-
-/**
- * @brief Get webhook using token
- * @see dpp::cluster::get_webhook_with_token
- * @see https://discord.com/developers/docs/resources/webhook#get-webhook-with-token
- * @param webhook_id Webhook ID to retrieve
- * @param token Token of webhook
- * @return webhook returned object on completion
- * \memberof dpp::cluster
- * @throw dpp::rest_exception upon failure to execute REST function
- * @warning This function is a blocking (synchronous) call and should only be used from within a separate thread.
- * Avoid direct use of this function inside an event handler.
- */
-webhook get_webhook_with_token_sync(snowflake webhook_id, const std::string &token);
-
-
-/* End of auto-generated definitions */
diff --git a/3rdParty/dpp/collector.h b/3rdParty/dpp/collector.h
index a27d0a2d7a..48aa5982fb 100644
--- a/3rdParty/dpp/collector.h
+++ b/3rdParty/dpp/collector.h
@@ -1,435 +1,473 @@
-/*
- * Discord erlpack - tidied up for D++, Craig Edwards 2021.
- * 
- * MessagePack system dependencies modified for erlpack.
- * 
- * Copyright (C) 2008-2010 FURUHASHI Sadayuki
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-#pragma once
-
-#include <dpp/export.h>
-#include <dpp/cluster.h>
-#include <dpp/timed_listener.h>
-#include <time.h>
-#include <vector>
-#include <functional>
-#include <string>
-
-namespace dpp {
-
-/**
- * @brief Collects objects from events during a specified time period.
- * 
- * This template must be specialised. There are premade specialisations which you can use
- * such as dpp::reaction_collector and dpp::message_collector. For these specialised instances
- * all you need to do is derive a simple class from them which implements collector::completed().
- * 
- * A collector will run for the specified number of seconds, attaching itself to the
- * given event. During this time any events pass through the collector and collector::filter().
- * This function can return a pointer to an object to allow a copy of that object to be stored
- * to a vector, or it can return nullptr to do nothing with that object. For example a collector
- * attached to on_message_create would receive an event with the type message_create_t, and from
- * this may decide to extract the message_create_t::msg structure, returning a pointer to it, or
- * instead may choose to return a nullptr.
- * 
- * When either the predetermined timeout is reached, or the collector::cancel() method is called,
- * or the collector is destroyed, the collector::completed() method is called, which will be
- * passed a list of collected objects in the order they were collected.
- * 
- * @tparam T parameter type of the event this collector will monitor
- * @tparam C object type this collector will store
- */
-template<class T, class C> class collector
-{
-protected:
-	/// Owning cluster
-	class cluster* owner;
-private:
-	/// Timed listener
-	timed_listener<event_router_t<T>, std::function<void(const T&)>>* tl;
-	/// stored list
-	std::vector<C> stored;
-	/// Trigger flag
-	bool triggered;
-public:
-	/**
-	 * @brief Construct a new collector object.
-	 * 
-	 * The timer for the collector begins immediately on construction of the object.
-	 * 
-	 * @param cl Pointer to cluster which manages this collector
-	 * @param duration Duration in seconds to run the collector for
-	 * @param event Event to attach to, e.g. cluster::on_message_create
-	 */
-	collector(class cluster* cl, uint64_t duration, event_router_t<T> & event) : owner(cl), triggered(false) {
-		std::function<void(const T&)> f = [this](const T& event) {
-			const C* v = filter(event);
-			if (v) {
-				stored.push_back(*v);
-			}
-		};
-		tl = new dpp::timed_listener<event_router_t<T>, std::function<void(const T&)>>(cl, duration, event, f, [this](dpp::timer timer_handle) {
-			if (!triggered) {
-				triggered = true;
-				completed(stored);
-			}
-		});
-	}
-
-	/**
-	 * @brief You must implement this function to receive the completed list of
-	 * captured objects.
-	 * @param list The list of captured objects in captured order
-	 */
-	virtual void completed(const std::vector<C>& list) = 0;
-
-	/**
-	 * @brief Filter the list of elements.
-	 * 
-	 * Every time an event is fired on the collector, this method wil be called
-	 * to determine if we should add an object to the list or not. This function
-	 * can then process the `element` value, extract the parts which are to be
-	 * saved to a list (e.g. a dpp::message out of a dpp::message_create_t) and
-	 * return it as the return value. Returning a value of nullptr causes no
-	 * object to be stored.
-	 * 
-	 * Here is an example of how to filter messages which have specific text in them.
-	 * This should be used with the specialised type dpp::message_collector
-	 * 
-	 * ```cpp
-	 * virtual const dpp::message* filter(const dpp::message_create_t& m) {
-		 *	 if (m.msg.content.find("something i want") != std::string::npos) {
-	 *		 return &m.msg;
-	 *	 } else {
-	 *		 return nullptr;
-	 *	 }
-	 * }
-	 * ```
-	 * 
-	 * @param element The event data to filter
-	 * @return const C* Returned object or nullptr
-	 */
-	virtual const C* filter(const T& element) = 0;
-
-	/**
-	 * @brief Immediately cancels the collector.
-	 * 
-	 * Use this if you have met the conditions for which you are collecting objects
-	 * early, e.g. you were watching for a message containing 'yes' or 'no' and have
-	 * received it before the time is up.
-	 * 
-	 * @note Causes calling of the completed() method if it has not yet been called.
-	 */
-	virtual void cancel() {
-		delete tl;
-		tl = nullptr;
-	}
-
-	/**
-	 * @brief Destroy the collector object.
-	 * @note Causes calling of the completed() method if it has not yet been called.
-	 */
-	virtual ~collector() {
-		delete tl;
-	}
-};
-
-/**
- * @brief Represents a reaction.
- * Can be filled for use in a collector
- */
-class collected_reaction : public managed {
-public:
-	/// Reacting user
-	user react_user;
-	/// Reacting guild
-	guild* react_guild{};
-	/// Reacting guild member
-	guild_member react_member;
-	/// Reacting channel
-	channel* react_channel{};
-	/// Reacted emoji
-	emoji react_emoji;
-};
-
-/**
- * @brief Template type for base class of channel collector
- */
-typedef dpp::collector<dpp::channel_create_t, dpp::channel> channel_collector_t;
-
-/**
- * @brief Template type for base class of thread collector
- */
-typedef dpp::collector<dpp::thread_create_t, dpp::thread> thread_collector_t;
-
-/**
- * @brief Template type for base class of role collector
- */
-typedef dpp::collector<dpp::guild_role_create_t, dpp::role> role_collector_t;
-
-/**
- * @brief Template type for base class of scheduled event collector
- */
-typedef dpp::collector<dpp::guild_scheduled_event_create_t, dpp::scheduled_event> scheduled_event_collector_t;
-
-/**
- * @brief Template type for base class of message collector
- */
-typedef dpp::collector<dpp::message_create_t, dpp::message> message_collector_t;
-
-/**
- * @brief Template type for base class of message reaction collector
- */
-typedef dpp::collector<dpp::message_reaction_add_t, dpp::collected_reaction> reaction_collector_t;
-
-/**
- * @brief Message collector.
- * Collects messages during a set timeframe and returns them in a list via the completed() method.
- */
-class message_collector : public message_collector_t {
-public:
-	/**
-	 * @brief Construct a new message collector object
-	 * 
-	 * @param cl cluster to associate the collector with
-	 * @param duration Duration of time to run the collector for in seconds
-	 */
-	message_collector(cluster* cl, uint64_t duration) : message_collector_t::collector(cl, duration, cl->on_message_create) { }
-
-	/**
-	 * @brief Return the completed collection
-	 * 
-	 * @param list items collected during the timeframe specified
-	 */
-	virtual void completed(const std::vector<dpp::message>& list) = 0;
-
-	/**
-	 * @brief Select and filter the items which are to appear in the list
-	 * This is called every time a new event is fired, to filter the event and determine which
-	 * of the items is sent to the list. Returning nullptr excludes the item from the list.
-	 * 
-	 * @param element element to filter
-	 * @return Returned item to add to the list, or nullptr to skip adding this element
-	 */
-	virtual const dpp::message* filter(const dpp::message_create_t& element) { return &element.msg; }
-
-	/**
-	 * @brief Destroy the message collector object
-	 */
-	virtual ~message_collector() = default;
-};
-
-/**
- * @brief Reaction collector.
- * Collects message reactions during a set timeframe and returns them in a list via the completed() method.
- */
-class reaction_collector : public reaction_collector_t {
-	snowflake message_id;
-	collected_reaction react;
-public:
-	/**
-	 * @brief Construct a new reaction collector object
-	 * 
-	 * @param cl cluster to associate the collector with
-	 * @param duration Duration of time to run the collector for in seconds
-	 * @param msg_id Optional message ID. If specified, only collects reactions for the given message
-	 */
-	reaction_collector(cluster* cl, uint64_t duration, snowflake msg_id = 0) : reaction_collector_t::collector(cl, duration, cl->on_message_reaction_add), message_id(msg_id) { }
-
-	/**
-	 * @brief Return the completed collection
-	 * 
-	 * @param list items collected during the timeframe specified
-	 */
-	virtual void completed(const std::vector<dpp::collected_reaction>& list) = 0;
-
-	/**
-	 * @brief Select and filter the items which are to appear in the list
-	 * This is called every time a new event is fired, to filter the event and determine which
-	 * of the items is sent to the list. Returning nullptr excludes the item from the list.
-	 * 
-	 * @param element element to filter
-	 * @return Returned item to add to the list, or nullptr to skip adding this element
-	 */
-	virtual const dpp::collected_reaction* filter(const dpp::message_reaction_add_t& element) {
-		/* Capture reactions for given message ID only */
-		if (message_id.empty() || element.message_id == message_id) {
-			react.id = element.message_id;
-			react.react_user = element.reacting_user;
-			react.react_guild = element.reacting_guild;
-			react.react_member = element.reacting_member;
-			react.react_channel = element.reacting_channel;
-			react.react_emoji = element.reacting_emoji;
-			return &react;
-		} else {
-			return nullptr;
-		}
-	}
-
-	/**
-	 * @brief Destroy the reaction collector object
-	 */
-	virtual ~reaction_collector() = default;
-};
-
-/**
- * @brief Channel collector.
- * Collects channels during a set timeframe and returns them in a list via the completed() method.
- */
-class channel_collector : public channel_collector_t {
-public:
-	/**
-	 * @brief Construct a new channel collector object
-	 * 
-	 * @param cl cluster to associate the collector with
-	 * @param duration Duration of time to run the collector for in seconds
-	 */
-	channel_collector(cluster* cl, uint64_t duration) : channel_collector_t::collector(cl, duration, cl->on_channel_create) { }
-
-	/**
-	 * @brief Return the completed collection
-	 * 
-	 * @param list items collected during the timeframe specified
-	 */
-	virtual void completed(const std::vector<dpp::channel>& list) = 0;
-
-	/**
-	 * @brief Select and filter the items which are to appear in the list
-	 * This is called every time a new event is fired, to filter the event and determine which
-	 * of the items is sent to the list. Returning nullptr excludes the item from the list.
-	 * 
-	 * @param element element to filter
-	 * @return Returned item to add to the list, or nullptr to skip adding this element
-	 */
-	virtual const dpp::channel* filter(const dpp::channel_create_t& element) { return element.created; }
-
-	/**
-	 * @brief Destroy the channel collector object
-	 */
-	virtual ~channel_collector() = default;
-};
-
-/**
- * @brief Thread collector.
- * Collects threads during a set timeframe and returns them in a list via the completed() method.
- */
-class thread_collector : public thread_collector_t {
-public:
-	/**
-	 * @brief Construct a new thread collector object
-	 * 
-	 * @param cl cluster to associate the collector with
-	 * @param duration Duration of time to run the collector for in seconds
-	 */
-	thread_collector(cluster* cl, uint64_t duration) : thread_collector_t::collector(cl, duration, cl->on_thread_create) { }
-
-	/**
-	 * @brief Return the completed collection
-	 * 
-	 * @param list items collected during the timeframe specified
-	 */
-	virtual void completed(const std::vector<dpp::thread>& list) = 0;
-
-	/**
-	 * @brief Select and filter the items which are to appear in the list
-	 * This is called every time a new event is fired, to filter the event and determine which
-	 * of the items is sent to the list. Returning nullptr excludes the item from the list.
-	 * 
-	 * @param element element to filter
-	 * @return Returned item to add to the list, or nullptr to skip adding this element
-	 */
-	virtual const dpp::thread* filter(const dpp::thread_create_t& element) { return &element.created; }
-
-	/**
-	 * @brief Destroy the thread collector object
-	 */
-	virtual ~thread_collector() = default;
-};
-
-/**
- * @brief Role collector.
- * Collects guild roles during a set timeframe and returns them in a list via the completed() method.
- */
-class role_collector : public role_collector_t {
-public:
-	/**
-	 * @brief Construct a new role collector object
-	 * 
-	 * @param cl cluster to associate the collector with
-	 * @param duration Duration of time to run the collector for in seconds
-	 */
-	role_collector(cluster* cl, uint64_t duration) : role_collector_t::collector(cl, duration, cl->on_guild_role_create) { }
-
-	/**
-	 * @brief Return the completed collection
-	 * 
-	 * @param list items collected during the timeframe specified
-	 */
-	virtual void completed(const std::vector<dpp::role>& list) = 0;
-
-	/**
-	 * @brief Select and filter the items which are to appear in the list
-	 * This is called every time a new event is fired, to filter the event and determine which
-	 * of the items is sent to the list. Returning nullptr excludes the item from the list.
-	 * 
-	 * @param element element to filter
-	 * @return Returned item to add to the list, or nullptr to skip adding this element
-	 */
-	virtual const dpp::role* filter(const dpp::guild_role_create_t& element) { return element.created; }
-
-	/**
-	 * @brief Destroy the role collector object
-	 */
-	virtual ~role_collector() = default;
-};
-
-/**
- * @brief Scheduled event collector.
- * Collects messages during a set timeframe and returns them in a list via the completed() method.
- */
-class scheduled_event_collector : public scheduled_event_collector_t {
-public:
-	/**
-	 * @brief Construct a new scheduled event collector object
-	 * 
-	 * @param cl cluster to associate the collector with
-	 * @param duration Duration of time to run the collector for in seconds
-	 */
-	scheduled_event_collector(cluster* cl, uint64_t duration) : scheduled_event_collector_t::collector(cl, duration, cl->on_guild_scheduled_event_create) { }
-
-	/**
-	 * @brief Return the completed collection
-	 * 
-	 * @param list items collected during the timeframe specified
-	 */
-	virtual void completed(const std::vector<dpp::scheduled_event>& list) = 0;
-
-	/**
-	 * @brief Select and filter the items which are to appear in the list
-	 * This is called every time a new event is fired, to filter the event and determine which
-	 * of the items is sent to the list. Returning nullptr excludes the item from the list.
-	 * 
-	 * @param element element to filter
-	 * @return Returned item to add to the list, or nullptr to skip adding this element
-	 */
-	virtual const dpp::scheduled_event* filter(const dpp::guild_scheduled_event_create_t& element) { return &element.created; }
-
-	/**
-	 * @brief Destroy the scheduled event collector object
-	 */
-	virtual ~scheduled_event_collector() = default;
-};
-
-};
\ No newline at end of file
+/************************************************************************************
+ *
+ * D++, A Lightweight C++ library for Discord
+ *
+ * Copyright 2021 Craig Edwards and D++ contributors
+ * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ************************************************************************************/
+#pragma once
+
+#include <dpp/export.h>
+#include <dpp/cluster.h>
+#include <dpp/timed_listener.h>
+#include <time.h>
+#include <vector>
+#include <functional>
+#include <string>
+
+namespace dpp {
+
+/**
+ * @brief Collects objects from events during a specified time period.
+ * 
+ * This template must be specialised. There are premade specialisations which you can use
+ * such as dpp::reaction_collector and dpp::message_collector. For these specialised instances
+ * all you need to do is derive a simple class from them which implements collector::completed().
+ * 
+ * A collector will run for the specified number of seconds, attaching itself to the
+ * given event. During this time any events pass through the collector and collector::filter().
+ * This function can return a pointer to an object to allow a copy of that object to be stored
+ * to a vector, or it can return nullptr to do nothing with that object. For example a collector
+ * attached to on_message_create would receive an event with the type message_create_t, and from
+ * this may decide to extract the message_create_t::msg structure, returning a pointer to it, or
+ * instead may choose to return a nullptr.
+ * 
+ * When either the predetermined timeout is reached, or the collector::cancel() method is called,
+ * or the collector is destroyed, the collector::completed() method is called, which will be
+ * passed a list of collected objects in the order they were collected.
+ * 
+ * @tparam T parameter type of the event this collector will monitor
+ * @tparam C object type this collector will store
+ */
+template<class T, class C> class collector
+{
+protected:
+	/**
+	 * @brief Owning cluster.
+	 */
+	class cluster* owner;
+private:
+	/**
+	 * @brief Timed listener.
+	 */
+	timed_listener<event_router_t<T>, std::function<void(const T&)>>* tl;
+
+	/**
+	 * @brief Stored list.
+	 */
+	std::vector<C> stored;
+
+	/**
+	 * @brief Trigger flag.
+	 */
+	bool triggered;
+public:
+	/**
+	 * @brief Construct a new collector object.
+	 * 
+	 * The timer for the collector begins immediately on construction of the object.
+	 * 
+	 * @param cl Pointer to cluster which manages this collector
+	 * @param duration Duration in seconds to run the collector for
+	 * @param event Event to attach to, e.g. cluster::on_message_create
+	 */
+	collector(class cluster* cl, uint64_t duration, event_router_t<T> & event) : owner(cl), triggered(false) {
+		std::function<void(const T&)> f = [this](const T& event) {
+			const C* v = filter(event);
+			if (v) {
+				stored.push_back(*v);
+			}
+		};
+		tl = new dpp::timed_listener<event_router_t<T>, std::function<void(const T&)>>(cl, duration, event, f, [this]([[maybe_unused]] dpp::timer timer_handle) {
+			if (!triggered) {
+				triggered = true;
+				completed(stored);
+			}
+		});
+	}
+
+	/**
+	 * @brief You must implement this function to receive the completed list of
+	 * captured objects.
+	 * @param list The list of captured objects in captured order
+	 */
+	virtual void completed(const std::vector<C>& list) = 0;
+
+	/**
+	 * @brief Filter the list of elements.
+	 * 
+	 * Every time an event is fired on the collector, this method wil be called
+	 * to determine if we should add an object to the list or not. This function
+	 * can then process the `element` value, extract the parts which are to be
+	 * saved to a list (e.g. a dpp::message out of a dpp::message_create_t) and
+	 * return it as the return value. Returning a value of nullptr causes no
+	 * object to be stored.
+	 * 
+	 * Here is an example of how to filter messages which have specific text in them.
+	 * This should be used with the specialised type dpp::message_collector
+	 * 
+	 * ```cpp
+	 * virtual const dpp::message* filter(const dpp::message_create_t& m) {
+		 *	 if (m.msg.content.find("something i want") != std::string::npos) {
+	 *		 return &m.msg;
+	 *	 } else {
+	 *		 return nullptr;
+	 *	 }
+	 * }
+	 * ```
+	 * 
+	 * @param element The event data to filter
+	 * @return const C* Returned object or nullptr
+	 */
+	virtual const C* filter(const T& element) = 0;
+
+	/**
+	 * @brief Immediately cancels the collector.
+	 * 
+	 * Use this if you have met the conditions for which you are collecting objects
+	 * early, e.g. you were watching for a message containing 'yes' or 'no' and have
+	 * received it before the time is up.
+	 * 
+	 * @note Causes calling of the completed() method if it has not yet been called.
+	 */
+	virtual void cancel() {
+		delete tl;
+		tl = nullptr;
+	}
+
+	/**
+	 * @brief Destroy the collector object.
+	 * @note Causes calling of the completed() method if it has not yet been called.
+	 */
+	virtual ~collector() {
+		delete tl;
+	}
+};
+
+/**
+ * @brief Represents a reaction.
+ * Can be filled for use in a collector
+ */
+class collected_reaction : public managed {
+public:
+	/**
+	 * @brief Reacting user.
+	 */
+	user react_user{};
+
+	/**
+	 * @brief Reacting guild.
+	 */
+	guild react_guild{};
+
+	/**
+	 * @brief Reacting guild member.
+	 */
+	guild_member react_member{};
+
+	/**
+	 * @brief Reacting channel.
+	 */
+	channel react_channel{};
+
+	/**
+	 * @brief Reacted emoji.
+	 */
+	emoji react_emoji{};
+
+	/**
+	 * @brief Optional: ID of the user who authored the message which was reacted to.
+	 */
+	snowflake message_author_id{};
+};
+
+/**
+ * @brief Template type for base class of channel collector
+ */
+typedef dpp::collector<dpp::channel_create_t, dpp::channel> channel_collector_t;
+
+/**
+ * @brief Template type for base class of thread collector
+ */
+typedef dpp::collector<dpp::thread_create_t, dpp::thread> thread_collector_t;
+
+/**
+ * @brief Template type for base class of role collector
+ */
+typedef dpp::collector<dpp::guild_role_create_t, dpp::role> role_collector_t;
+
+/**
+ * @brief Template type for base class of scheduled event collector
+ */
+typedef dpp::collector<dpp::guild_scheduled_event_create_t, dpp::scheduled_event> scheduled_event_collector_t;
+
+/**
+ * @brief Template type for base class of message collector
+ */
+typedef dpp::collector<dpp::message_create_t, dpp::message> message_collector_t;
+
+/**
+ * @brief Template type for base class of message reaction collector
+ */
+typedef dpp::collector<dpp::message_reaction_add_t, dpp::collected_reaction> reaction_collector_t;
+
+/**
+ * @brief Message collector.
+ * Collects messages during a set timeframe and returns them in a list via the completed() method.
+ */
+class message_collector : public message_collector_t {
+public:
+	/**
+	 * @brief Construct a new message collector object
+	 * 
+	 * @param cl cluster to associate the collector with
+	 * @param duration Duration of time to run the collector for in seconds
+	 */
+	message_collector(cluster* cl, uint64_t duration) : message_collector_t::collector(cl, duration, cl->on_message_create) { }
+
+	/**
+	 * @brief Return the completed collection
+	 * 
+	 * @param list items collected during the timeframe specified
+	 */
+	virtual void completed(const std::vector<dpp::message>& list) = 0;
+
+	/**
+	 * @brief Select and filter the items which are to appear in the list
+	 * This is called every time a new event is fired, to filter the event and determine which
+	 * of the items is sent to the list. Returning nullptr excludes the item from the list.
+	 * 
+	 * @param element element to filter
+	 * @return Returned item to add to the list, or nullptr to skip adding this element
+	 */
+	virtual const dpp::message* filter(const dpp::message_create_t& element) { return &element.msg; }
+
+	/**
+	 * @brief Destroy the message collector object
+	 */
+	virtual ~message_collector() = default;
+};
+
+/**
+ * @brief Reaction collector.
+ * Collects message reactions during a set timeframe and returns them in a list via the completed() method.
+ */
+class reaction_collector : public reaction_collector_t {
+	/**
+	 * @brief The ID of the message.
+	 */
+	snowflake message_id;
+
+	/**
+	 * @brief The reaction.
+	 */
+	collected_reaction react;
+public:
+	/**
+	 * @brief Construct a new reaction collector object
+	 * 
+	 * @param cl cluster to associate the collector with
+	 * @param duration Duration of time to run the collector for in seconds
+	 * @param msg_id Optional message ID. If specified, only collects reactions for the given message
+	 */
+	reaction_collector(cluster* cl, uint64_t duration, snowflake msg_id = 0) : reaction_collector_t::collector(cl, duration, cl->on_message_reaction_add), message_id(msg_id) { }
+
+	/**
+	 * @brief Return the completed collection
+	 * 
+	 * @param list items collected during the timeframe specified
+	 */
+	virtual void completed(const std::vector<dpp::collected_reaction>& list) = 0;
+
+	/**
+	 * @brief Select and filter the items which are to appear in the list
+	 * This is called every time a new event is fired, to filter the event and determine which
+	 * of the items is sent to the list. Returning nullptr excludes the item from the list.
+	 * 
+	 * @param element element to filter
+	 * @return Returned item to add to the list, or nullptr to skip adding this element
+	 */
+	virtual const dpp::collected_reaction* filter(const dpp::message_reaction_add_t& element) {
+		/* Capture reactions for given message ID only */
+		if (message_id.empty() || element.message_id == message_id) {
+			react.id = element.message_id;
+			react.react_user = element.reacting_user;
+			react.react_guild = element.reacting_guild;
+			react.react_member = element.reacting_member;
+			react.react_channel = element.reacting_channel;
+			react.react_emoji = element.reacting_emoji;
+			react.message_author_id = element.message_author_id;
+			return &react;
+		} else {
+			return nullptr;
+		}
+	}
+
+	/**
+	 * @brief Destroy the reaction collector object
+	 */
+	virtual ~reaction_collector() = default;
+};
+
+/**
+ * @brief Channel collector.
+ * Collects channels during a set timeframe and returns them in a list via the completed() method.
+ */
+class channel_collector : public channel_collector_t {
+public:
+	/**
+	 * @brief Construct a new channel collector object
+	 * 
+	 * @param cl cluster to associate the collector with
+	 * @param duration Duration of time to run the collector for in seconds
+	 */
+	channel_collector(cluster* cl, uint64_t duration) : channel_collector_t::collector(cl, duration, cl->on_channel_create) { }
+
+	/**
+	 * @brief Return the completed collection
+	 * 
+	 * @param list items collected during the timeframe specified
+	 */
+	virtual void completed(const std::vector<dpp::channel>& list) = 0;
+
+	/**
+	 * @brief Select and filter the items which are to appear in the list
+	 * This is called every time a new event is fired, to filter the event and determine which
+	 * of the items is sent to the list. Returning nullptr excludes the item from the list.
+	 * 
+	 * @param element element to filter
+	 * @return Returned item to add to the list, or nullptr to skip adding this element
+	 */
+	virtual const dpp::channel* filter(const dpp::channel_create_t& element) { return &element.created; }
+
+	/**
+	 * @brief Destroy the channel collector object
+	 */
+	virtual ~channel_collector() = default;
+};
+
+/**
+ * @brief Thread collector.
+ * Collects threads during a set timeframe and returns them in a list via the completed() method.
+ */
+class thread_collector : public thread_collector_t {
+public:
+	/**
+	 * @brief Construct a new thread collector object
+	 * 
+	 * @param cl cluster to associate the collector with
+	 * @param duration Duration of time to run the collector for in seconds
+	 */
+	thread_collector(cluster* cl, uint64_t duration) : thread_collector_t::collector(cl, duration, cl->on_thread_create) { }
+
+	/**
+	 * @brief Return the completed collection
+	 * 
+	 * @param list items collected during the timeframe specified
+	 */
+	virtual void completed(const std::vector<dpp::thread>& list) = 0;
+
+	/**
+	 * @brief Select and filter the items which are to appear in the list
+	 * This is called every time a new event is fired, to filter the event and determine which
+	 * of the items is sent to the list. Returning nullptr excludes the item from the list.
+	 * 
+	 * @param element element to filter
+	 * @return Returned item to add to the list, or nullptr to skip adding this element
+	 */
+	virtual const dpp::thread* filter(const dpp::thread_create_t& element) { return &element.created; }
+
+	/**
+	 * @brief Destroy the thread collector object
+	 */
+	virtual ~thread_collector() = default;
+};
+
+/**
+ * @brief Role collector.
+ * Collects guild roles during a set timeframe and returns them in a list via the completed() method.
+ */
+class role_collector : public role_collector_t {
+public:
+	/**
+	 * @brief Construct a new role collector object
+	 * 
+	 * @param cl cluster to associate the collector with
+	 * @param duration Duration of time to run the collector for in seconds
+	 */
+	role_collector(cluster* cl, uint64_t duration) : role_collector_t::collector(cl, duration, cl->on_guild_role_create) { }
+
+	/**
+	 * @brief Return the completed collection
+	 * 
+	 * @param list items collected during the timeframe specified
+	 */
+	virtual void completed(const std::vector<dpp::role>& list) = 0;
+
+	/**
+	 * @brief Select and filter the items which are to appear in the list
+	 * This is called every time a new event is fired, to filter the event and determine which
+	 * of the items is sent to the list. Returning nullptr excludes the item from the list.
+	 * 
+	 * @param element element to filter
+	 * @return Returned item to add to the list, or nullptr to skip adding this element
+	 */
+	virtual const dpp::role* filter(const dpp::guild_role_create_t& element) { return &element.created; }
+
+	/**
+	 * @brief Destroy the role collector object
+	 */
+	virtual ~role_collector() = default;
+};
+
+/**
+ * @brief Scheduled event collector.
+ * Collects messages during a set timeframe and returns them in a list via the completed() method.
+ */
+class scheduled_event_collector : public scheduled_event_collector_t {
+public:
+	/**
+	 * @brief Construct a new scheduled event collector object
+	 * 
+	 * @param cl cluster to associate the collector with
+	 * @param duration Duration of time to run the collector for in seconds
+	 */
+	scheduled_event_collector(cluster* cl, uint64_t duration) : scheduled_event_collector_t::collector(cl, duration, cl->on_guild_scheduled_event_create) { }
+
+	/**
+	 * @brief Return the completed collection
+	 * 
+	 * @param list items collected during the timeframe specified
+	 */
+	virtual void completed(const std::vector<dpp::scheduled_event>& list) = 0;
+
+	/**
+	 * @brief Select and filter the items which are to appear in the list
+	 * This is called every time a new event is fired, to filter the event and determine which
+	 * of the items is sent to the list. Returning nullptr excludes the item from the list.
+	 * 
+	 * @param element element to filter
+	 * @return Returned item to add to the list, or nullptr to skip adding this element
+	 */
+	virtual const dpp::scheduled_event* filter(const dpp::guild_scheduled_event_create_t& element) { return &element.created; }
+
+	/**
+	 * @brief Destroy the scheduled event collector object
+	 */
+	virtual ~scheduled_event_collector() = default;
+};
+
+}
diff --git a/3rdParty/dpp/colors.h b/3rdParty/dpp/colors.h
index 664a11cd33..2f2112438f 100644
--- a/3rdParty/dpp/colors.h
+++ b/3rdParty/dpp/colors.h
@@ -1,80 +1,745 @@
-/************************************************************************************
- *
- * D++, A Lightweight C++ library for Discord
- *
- * Copyright 2021 Craig Edwards and D++ contributors
- * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- ************************************************************************************/
-#pragma once
-
-#include <cstdint>
-
- /**
-  * @brief The main namespace for D++ functions. classes and types
- */
-namespace dpp {
-	/**
-     * @brief predefined color constants
-    */
-	namespace colors {
-		const uint32_t
-			white = 0xFFFFFF,
-			discord_white = 0xFFFFFE,
-			light_gray = 0xC0C0C0,
-			gray = 0x808080,
-			dark_gray = 0x404040,
-			black = 0x000000,
-			discord_black = 0x000001,
-			red = 0xFF0000,
-			pink = 0xFFAFAF,
-			orange = 0xFFC800,
-			yellow = 0xFFFF00,
-			green = 0x00FF00,
-			magenta = 0xFF00FF,
-			cyan = 0x00FFFF,
-			blue = 0x0000FF,
-			light_sea_green = 0x1ABC9C,
-			medium_sea_green = 0x2ECC71,
-			summer_sky = 0x3498DB,
-			deep_lilac = 0x9B59B6,
-			ruby = 0xE91E63,
-			moon_yellow = 0xF1C40F,
-			tahiti_gold = 0xE67E22,
-			cinnabar = 0xE74C3C,
-			submarine = 0x95A5A6,
-			blue_aquamarine = 0x607D8B,
-			deep_sea = 0x11806A,
-			sea_green = 0x1F8B4C,
-			endeavour = 0x206694,
-			vivid_violet = 0x71368A,
-			jazzberry_jam = 0xAD1457,
-			dark_goldenrod = 0xC27C0E,
-			rust = 0xA84300,
-			brown = 0x992D22,
-			gray_chateau = 0x979C9F,
-			bismark = 0x546E7A,
-			sti_blue = 0x0E4BEF,
-			wrx_blue = 0x00247D,
-			rallyart_crimson = 0xE60012,
-			lime = 0x00FF00,
-			forest_green = 0x228B22,
-			cadmium_green = 0x097969,
-			aquamarine = 0x7FFFD4,
-			blue_green = 0x088F8F,
-			raspberry = 0xE30B5C,
-			scarlet_red = 0xFF2400;
-	};
-};
+/************************************************************************************
+ *
+ * D++, A Lightweight C++ library for Discord
+ *
+ * Copyright 2021 Craig Edwards and D++ contributors
+ * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ************************************************************************************/
+#pragma once
+
+#include <cstdint>
+
+/**
+ * @brief The main namespace for D++ functions. classes and types
+ */
+namespace dpp {
+
+/**
+ * @brief predefined color constants.
+ */
+namespace colors {
+	static constexpr uint32_t
+		white = 0xFFFFFF,
+		discord_white = 0xFFFFFE,
+		light_gray = 0xC0C0C0,
+		gray = 0x808080,
+		dark_gray = 0x404040,
+		black = 0x000000,
+		discord_black = 0x000001,
+		red = 0xFF0000,
+		pink = 0xFFAFAF,
+		orange = 0xFFC800,
+		yellow = 0xFFFF00,
+		green = 0x00FF00,
+		magenta = 0xFF00FF,
+		cyan = 0x00FFFF,
+		blue = 0x0000FF,
+		light_sea_green = 0x1ABC9C,
+		medium_sea_green = 0x2ECC71,
+		summer_sky = 0x3498DB,
+		deep_lilac = 0x9B59B6,
+		ruby = 0xE91E63,
+		moon_yellow = 0xF1C40F,
+		tahiti_gold = 0xE67E22,
+		cinnabar = 0xE74C3C,
+		submarine = 0x95A5A6,
+		blue_aquamarine = 0x607D8B,
+		deep_sea = 0x11806A,
+		sea_green = 0x1F8B4C,
+		endeavour = 0x206694,
+		vivid_violet = 0x71368A,
+		jazzberry_jam = 0xAD1457,
+		dark_goldenrod = 0xC27C0E,
+		rust = 0xA84300,
+		brown = 0x992D22,
+		gray_chateau = 0x979C9F,
+		bismark = 0x546E7A,
+		sti_blue = 0x0E4BEF,
+		wrx_blue = 0x00247D,
+		rallyart_crimson = 0xE60012,
+		lime = 0x00FF00,
+		forest_green = 0x228B22,
+		cadmium_green = 0x097969,
+		aquamarine = 0x7FFFD4,
+		blue_green = 0x088F8F,
+		raspberry = 0xE30B5C,
+		scarlet_red = 0xFF2400,
+		night = 0x0C090A,
+		charcoal = 0x34282C,
+		oil = 0x3B3131,
+		light_black = 0x454545,
+		black_cat = 0x413839,
+		iridium = 0x3D3C3A,
+		black_eel = 0x463E3F,
+		black_cow = 0x4C4646,
+		gray_wolf = 0x504A4B,
+		grey_wolf = 0x504A4B,
+		vampire_gray = 0x565051,
+		vampire_grey = 0x565051,
+		iron_gray = 0x52595D,
+		iron_grey = 0x52595D,
+		gray_dolphin = 0x5C5858,
+		grey_dolphin = 0x5C5858,
+		carbon_gray = 0x625D5D,
+		carbon_grey = 0x625D5D,
+		ash_gray = 0x666362,
+		ash_grey = 0x666362,
+		dim_gray = 0x696969,
+		dim_grey = 0x696969,
+		nardo_gray = 0x686A6C,
+		nardo_grey = 0x686A6C,
+		cloudy_gray = 0x6D6968,
+		cloudy_grey = 0x6D6968,
+		smokey_gray = 0x726E6D,
+		smokey_grey = 0x726E6D,
+		alien_gray = 0x736F6E,
+		alien_grey = 0x736F6E,
+		sonic_silver = 0x757575,
+		platinum_gray = 0x797979,
+		platinum_grey = 0x797979,
+		granite = 0x837E7C,
+		battleship_gray = 0x848482,
+		battleship_grey = 0x848482,
+		gunmetal_gray = 0x8D918D,
+		gunmetal_grey = 0x8D918D,
+		gray_cloud = 0xB6B6B4,
+		grey_cloud = 0xB6B6B4,
+		silver = 0xC0C0C0,
+		pale_silver = 0xC9C0BB,
+		gray_goose = 0xD1D0CE,
+		grey_goose = 0xD1D0CE,
+		platinum_silver = 0xCECECE,
+		silver_white = 0xDADBDD,
+		gainsboro = 0xDCDCDC,
+		platinum = 0xE5E4E2,
+		metallic_silver = 0xBCC6CC,
+		blue_gray = 0x98AFC7,
+		blue_grey = 0x98AFC7,
+		roman_silver = 0x838996,
+		light_slate_gray = 0x778899,
+		light_slate_grey = 0x778899,
+		slate_gray =  0x708090,
+		slate_grey = 0x708090,
+		rat_gray = 0x6D7B8D,
+		slate_granite_gray = 0x657383,
+		slate_granite_grey = 0x657383,
+		jet_gray = 0x616D7E,
+		jet_grey = 0x616D7E,
+		mist_blue = 0x646D7E,
+		marble_blue = 0x566D7E,
+		slate_blue_grey = 0x737CA1,
+		slate_blue_gray = 0x737CA1,
+		light_purple_blue = 0x728FCE,
+		azure_blue = 0x4863A0,
+		blue_jay = 0x2B547E,
+		charcoal_blue = 0x36454F,
+		dark_blue_grey = 0x29465B,
+		dark_slate = 0x2B3856,
+		deep_sea_blue = 0x123456,
+		night_blue = 0x151B54,
+		midnight_blue = 0x191970,
+		navy = 0x000080,
+		denim_dark_blue = 0x151B8D,
+		dark_blue = 0x00008B,
+		lapis_blue = 0x15317E,
+		new_midnight_blue = 0x0000A0,
+		earth_blue = 0x0000A5,
+		cobalt_blue = 0x0020C2,
+		medium_blue = 0x0000CD,
+		blueberry_blue = 0x0041C2,
+		canary_blue = 0x2916F5,
+		samco_blue = 0x0002FF,
+		bright_blue = 0x0909FF,
+		blue_orchid = 0x1F45FC,
+		sapphire_blue = 0x2554C7,
+		blue_eyes = 0x1569C7,
+		bright_navy_blue = 0x1974D2,
+		balloon_blue = 0x2B60DE,
+		royal_blue = 0x4169E1,
+		ocean_blue = 0x2B65EC,
+		blue_ribbon = 0x306EFF,
+		blue_dress = 0x157DEC,
+		neon_blue = 0x1589FF,
+		dodger_blue = 0x1E90FF,
+		glacial_blue_ice = 0x368BC1,
+		steel_blue = 0x4682B4,
+		silk_blue = 0x488AC7,
+		windows_blue = 0x357EC7,
+		blue_ivy = 0x3090C7,
+		blue_koi = 0x659EC7,
+		columbia_blue = 0x87AFC7,
+		baby_blue = 0x95B9C7,
+		cornflower_blue = 0x6495ED,
+		sky_blue_dress = 0x6698FF,
+		iceberg = 0x56A5EC,
+		butterfly_blue = 0x38ACEC,
+		deep_sky_blue = 0x00BFFF,
+		midday_blue = 0x3BB9FF,
+		crystal_blue = 0x5CB3FF,
+		denim_blue = 0x79BAEC,
+		day_sky_blue = 0x82CAFF,
+		light_sky_blue = 0x87CEFA,
+		sky_blue = 0x87CEEB,
+		jeans_blue = 0xA0CFEC,
+		blue_angel = 0xB7CEEC,
+		pastel_blue = 0xB4CFEC,
+		light_day_blue = 0xADDFFF,
+		sea_blue = 0xC2DFFF,
+		heavenly_blue = 0xC6DEFF,
+		robin_egg_blue = 0xBDEDFF,
+		powder_blue = 0xB0E0E6,
+		coral_blue = 0xAFDCEC,
+		light_blue = 0xADD8E6,
+		light_steel_blue = 0xB0CFDE,
+		gulf_blue = 0xC9DFEC,
+		pastel_light_blue = 0xD5D6EA,
+		lavender_blue = 0xE3E4FA,
+		white_blue = 0xDBE9FA,
+		lavender = 0xE6E6FA,
+		water = 0xEBF4FA,
+		alice_blue = 0xF0F8FF,
+		ghost_white = 0xF8F8FF,
+		azure = 0xF0FFFF,
+		light_cyan = 0xE0FFFF,
+		light_slate = 0xCCFFFF,
+		electric_blue = 0x9AFEFF,
+		tron_blue = 0x7DFDFE,
+		blue_zircon = 0x57FEFF,
+		aqua = 0x00FFFF,
+		bright_cyan = 0x0AFFFF,
+		celeste = 0x50EBEC,
+		blue_diamond = 0x4EE2EC,
+		bright_turquoise = 0x16E2F5,
+		blue_lagoon = 0x8EEBEC,
+		pale_turquoise = 0xAFEEEE,
+		pale_blue_lily = 0xCFECEC,
+		light_teal = 0xB3D9D9,
+		tiffany_blue = 0x81D8D0,
+		blue_hosta = 0x77BFC7,
+		cyan_opaque = 0x92C7C7,
+		northern_lights_blue = 0x78C7C7,
+		medium_aquamarine = 0x66CDAA,
+		magic_mint = 0xAAF0D1,
+		light_aquamarine = 0x93FFE8,
+		bright_teal = 0x01F9C6,
+		turquoise = 0x40E0D0,
+		medium_turquoise = 0x48D1CC,
+		deep_turquoise = 0x48CCCD,
+		jellyfish = 0x46C7C7,
+		blue_turquoise = 0x43C6DB,
+		dark_turquoise = 0x00CED1,
+		macaw_blue_green = 0x43BFC7,
+		seafoam_green = 0x3EA99F,
+		cadet_blue = 0x5F9EA0,
+		blue_chill = 0x3B9C9C,
+		dark_cyan = 0x008B8B,
+		teal_green = 0x00827F,
+		teal = 0x008080,
+		teal_blue = 0x007C80,
+		medium_teal = 0x045F5F,
+		dark_teal = 0x045D5D,
+		deep_teal = 0x033E3E,
+		dark_slate_gray = 0x25383C,
+		dark_slate_grey = 0x25383C,
+		gunmetal = 0x2C3539,
+		blue_moss_green = 0x3C565B,
+		beetle_green = 0x4C787E,
+		grayish_turquoise = 0x5E7D7E,
+		greenish_blue = 0x307D7E,
+		aquamarine_stone = 0x348781,
+		sea_turtle_green = 0x438D80,
+		dull_sea_green = 0x4E8975,
+		dark_green_blue = 0x1F6357,
+		deep_sea_green = 0x306754,
+		bottle_green = 0x006A4E,
+		elf_green = 0x1B8A6B,
+		dark_mint = 0x31906E,
+		jade = 0x00A36C,
+		earth_green = 0x34A56F,
+		chrome_green = 0x1AA260,
+		emerald = 0x50C878,
+		mint = 0x3EB489,
+		metallic_green = 0x7C9D8E,
+		camouflage_green = 0x78866B,
+		sage_green = 0x848B79,
+		hazel_green = 0x617C58,
+		venom_green = 0x728C00,
+		olive_drab = 0x6B8E23,
+		olive = 0x808000,
+		dark_olive_green = 0x556B2F,
+		military_green = 0x4E5B31,
+		green_leaves = 0x3A5F0B,
+		army_green = 0x4B5320,
+		fern_green = 0x667C26,
+		fall_forest_green = 0x4E9258,
+		irish_green = 0x08A04B,
+		pine_green = 0x387C44,
+		medium_forest_green = 0x347235,
+		jungle_green = 0x347C2C,
+		cactus_green = 0x227442,
+		dark_green = 0x006400,
+		deep_green = 0x056608,
+		deep_emerald_green = 0x046307,
+		hunter_green = 0x355E3B,
+		dark_forest_green = 0x254117,
+		lotus_green = 0x004225,
+		seaweed_green = 0x437C17,
+		shamrock_green = 0x347C17,
+		green_onion = 0x6AA121,
+		moss_green = 0x8A9A5B,
+		grass_green = 0x3F9B0B,
+		green_pepper = 0x4AA02C,
+		dark_lime_green = 0x41A317,
+		parrot_green = 0x12AD2B,
+		clover_green = 0x3EA055,
+		dinosaur_green = 0x73A16C,
+		green_snake = 0x6CBB3C,
+		alien_green = 0x6CC417,
+		green_apple = 0x4CC417,
+		lime_green = 0x32CD32,
+		pea_green = 0x52D017,
+		kelly_green = 0x4CC552,
+		zombie_green = 0x54C571,
+		green_peas = 0x89C35C,
+		dollar_bill_green = 0x85BB65,
+		frog_green = 0x99C68E,
+		turquoise_green = 0xA0D6B4,
+		dark_sea_green = 0x8FBC8F,
+		basil_green = 0x829F82,
+		gray_green = 0xA2AD9C,
+		iguana_green = 0x9CB071,
+		citron_green = 0x8FB31D,
+		acid_green = 0xB0BF1A,
+		avocado_green = 0xB2C248,
+		pistachio_green = 0x9DC209,
+		salad_green = 0xA1C935,
+		yellow_green = 0x9ACD32,
+		pastel_green = 0x77DD77,
+		hummingbird_green = 0x7FE817,
+		nebula_green = 0x59E817,
+		stoplight_go_green = 0x57E964,
+		neon_green = 0x16F529,
+		jade_green = 0x5EFB6E,
+		lime_mint_green = 0x36F57F,
+		spring_green = 0x00FF7F,
+		medium_spring_green = 0x00FA9A,
+		emerald_green = 0x5FFB17,
+		lawn_green = 0x7CFC00,
+		bright_green = 0x66FF00,
+		chartreuse = 0x7FFF00,
+		yellow_lawn_green = 0x87F717,
+		aloe_vera_green = 0x98F516,
+		dull_green_yellow = 0xB1FB17,
+		lemon_green = 0xADF802,
+		green_yellow = 0xADFF2F,
+		chameleon_green = 0xBDF516,
+		neon_yellow_green = 0xDAEE01,
+		yellow_green_grosbeak = 0xE2F516,
+		tea_green = 0xCCFB5D,
+		slime_green = 0xBCE954,
+		algae_green = 0x64E986,
+		light_green = 0x90EE90,
+		dragon_green = 0x6AFB92,
+		pale_green = 0x98FB98,
+		mint_green = 0x98FF98,
+		green_thumb = 0xB5EAAA,
+		organic_brown = 0xE3F9A6,
+		light_jade = 0xC3FDB8,
+		light_mint_green = 0xC2E5D3,
+		light_rose_green = 0xDBF9DB,
+		chrome_white = 0xE8F1D4,
+		honeydew = 0xF0FFF0,
+		mint_cream = 0xF5FFFA,
+		lemon_chiffon = 0xFFFACD,
+		parchment = 0xFFFFC2,
+		cream = 0xFFFFCC,
+		cream_white = 0xFFFDD0,
+		light_goldenrod_yellow = 0xFAFAD2,
+		light_yellow = 0xFFFFE0,
+		beige = 0xF5F5DC,
+		cornsilk = 0xFFF8DC,
+		blonde = 0xFBF6D9,
+		champagne = 0xF7E7CE,
+		antique_white = 0xFAEBD7,
+		papaya_whip = 0xFFEFD5,
+		blanched_almond = 0xFFEBCD,
+		bisque = 0xFFE4C4,
+		wheat = 0xF5DEB3,
+		moccasin = 0xFFE4B5,
+		peach = 0xFFE5B4,
+		light_orange = 0xFED8B1,
+		peach_puff = 0xFFDAB9,
+		coral_peach = 0xFBD5AB,
+		navajo_white = 0xFFDEAD,
+		golden_blonde = 0xFBE7A1,
+		golden_silk = 0xF3E3C3,
+		dark_blonde = 0xF0E2B6,
+		light_gold = 0xF1E5AC,
+		vanilla = 0xF3E5AB,
+		tan_brown = 0xECE5B6,
+		dirty_white = 0xE8E4C9,
+		pale_goldenrod = 0xEEE8AA,
+		khaki = 0xF0E68C,
+		cardboard_brown = 0xEDDA74,
+		harvest_gold = 0xEDE275,
+		sun_yellow = 0xFFE87C,
+		corn_yellow = 0xFFF380,
+		pastel_yellow = 0xFAF884,
+		neon_yellow = 0xFFFF33,
+		canary_yellow = 0xFFEF00,
+		banana_yellow = 0xF5E216,
+		mustard_yellow = 0xFFDB58,
+		golden_yellow = 0xFFDF00,
+		bold_yellow = 0xF9DB24,
+		rubber_ducky_yellow = 0xFFD801,
+		gold = 0xFFD700,
+		bright_gold = 0xFDD017,
+		chrome_gold = 0xFFCE44,
+		golden_brown = 0xEAC117,
+		deep_yellow = 0xF6BE00,
+		macaroni_and_cheese = 0xF2BB66,
+		saffron = 0xFBB917,
+		neon_gold = 0xFDBD01,
+		beer = 0xFBB117,
+		yellow_orange =  0xFFAE42,
+		orange_yellow = 0xFFAE42,
+		cantaloupe = 0xFFA62F,
+		cheese_orange = 0xFFA600,
+		brown_sand = 0xEE9A4D,
+		sandy_brown = 0xF4A460,
+		brown_sugar = 0xE2A76F,
+		camel_brown = 0xC19A6B,
+		deer_brown = 0xE6BF83,
+		burly_wood = 0xDEB887,
+		tan = 0xD2B48C,
+		light_french_beige = 0xC8AD7F,
+		sand = 0xC2B280,
+		sage = 0xBCB88A,
+		fall_leaf_brown = 0xC8B560,
+		ginger_brown = 0xC9BE62,
+		bronze_gold = 0xC9AE5D,
+		dark_khaki = 0xBDB76B,
+		olive_green = 0xBAB86C,
+		brass = 0xB5A642,
+		cookie_brown = 0xC7A317,
+		metallic_gold = 0xD4AF37,
+		bee_yellow = 0xE9AB17,
+		school_bus_yellow = 0xE8A317,
+		goldenrod = 0xDAA520,
+		orange_gold = 0xD4A017,
+		caramel = 0xC68E17,
+		cinnamon = 0xC58917,
+		peru = 0xCD853F,
+		bronze = 0xCD7F32,
+		tiger_orange = 0xC88141,
+		copper = 0xB87333,
+		dark_gold = 0xAA6C39,
+		metallic_bronze = 0xA97142,
+		dark_almond = 0xAB784E,
+		wood = 0x966F33,
+		oak_brown = 0x806517,
+		antique_bronze = 0x665D1E,
+		hazel = 0x8E7618,
+		dark_yellow = 0x8B8000,
+		dark_moccasin = 0x827839,
+		khaki_green = 0x8A865D,
+		millennium_jade = 0x93917C,
+		dark_beige = 0x9F8C76,
+		bullet_shell = 0xAF9B60,
+		army_brown = 0x827B60,
+		sandstone = 0x786D5F,
+		taupe = 0x483C32,
+		mocha = 0x493D26,
+		milk_chocolate = 0x513B1C,
+		gray_brown = 0x3D3635,
+		dark_coffee = 0x3B2F2F,
+		old_burgundy = 0x43302E,
+		western_charcoal = 0x49413F,
+		bakers_brown = 0x5C3317,
+		dark_brown = 0x654321,
+		sepia_brown = 0x704214,
+		dark_bronze = 0x804A00,
+		coffee = 0x6F4E37,
+		brown_bear = 0x835C3B,
+		red_dirt = 0x7F5217,
+		sepia = 0x7F462C,
+		sienna = 0xA0522D,
+		saddle_brown = 0x8B4513,
+		dark_sienna = 0x8A4117,
+		sangria = 0x7E3817,
+		blood_red = 0x7E3517,
+		chestnut = 0x954535,
+		coral_brown = 0x9E4638,
+		chestnut_red = 0xC34A2C,
+		mahogany = 0xC04000,
+		red_gold = 0xEB5406,
+		red_fox = 0xC35817,
+		dark_bisque = 0xB86500,
+		light_brown = 0xB5651D,
+		petra_gold = 0xB76734,
+		copper_red = 0xCB6D51,
+		orange_salmon = 0xC47451,
+		chocolate = 0xD2691E,
+		sedona = 0xCC6600,
+		papaya_orange = 0xE56717,
+		halloween_orange = 0xE66C2C,
+		neon_orange = 0xFF6700,
+		bright_orange = 0xFF5F1F,
+		pumpkin_orange = 0xF87217,
+		carrot_orange = 0xF88017,
+		dark_orange = 0xFF8C00,
+		construction_cone_orange = 0xF87431,
+		indian_saffron = 0xFF7722,
+		sunrise_orange = 0xE67451,
+		mango_orange = 0xFF8040,
+		coral = 0xFF7F50,
+		basket_ball_orange = 0xF88158,
+		light_salmon_rose = 0xF9966B,
+		light_salmon = 0xFFA07A,
+		dark_salmon = 0xE9967A,
+		tangerine = 0xE78A61,
+		light_copper = 0xDA8A67,
+		salmon_pink = 0xFF8674,
+		salmon = 0xFA8072,
+		peach_pink = 0xF98B88,
+		light_coral = 0xF08080,
+		pastel_red = 0xF67280,
+		pink_coral = 0xE77471,
+		bean_red = 0xF75D59,
+		valentine_red = 0xE55451,
+		indian_red = 0xCD5C5C,
+		tomato = 0xFF6347,
+		shocking_orange = 0xE55B3C,
+		orange_red = 0xFF4500,
+		neon_red = 0xFD1C03,
+		ruby_red = 0xF62217,
+		ferrari_red = 0xF70D1A,
+		fire_engine_red = 0xF62817,
+		lava_red = 0xE42217,
+		love_red = 0xE41B17,
+		grapefruit = 0xDC381F,
+		cherry_red = 0xC24641,
+		chilli_pepper = 0xC11B17,
+		fire_brick = 0xB22222,
+		tomato_sauce_red = 0xB21807,
+		carbon_red = 0xA70D2A,
+		cranberry = 0x9F000F,
+		saffron_red = 0x931314,
+		crimson_red = 0x990000,
+		red_wine = 0x990012,
+		wine_red = 0x990012,
+		dark_red = 0x8B0000,
+		maroon = 0x800000,
+		burgundy = 0x8C001A,
+		vermilion = 0x7E191B,
+		deep_red = 0x800517,
+		red_blood = 0x660000,
+		blood_night = 0x551606,
+		dark_scarlet = 0x560319,
+		black_bean = 0x3D0C02,
+		chocolate_brown = 0x3F000F,
+		midnight = 0x2B1B17,
+		purple_lily = 0x550A35,
+		purple_maroon = 0x810541,
+		plum_pie = 0x7D0541,
+		plum_velvet = 0x7D0552,
+		dark_raspberry = 0x872657,
+		velvet_maroon = 0x7E354D,
+		rosy_finch = 0x7F4E52,
+		dull_purple = 0x7F525D,
+		puce = 0x7F5A58,
+		rose_dust = 0x997070,
+		pastel_brown = 0xB1907F,
+		rosy_pink = 0xB38481,
+		rosy_brown = 0xBC8F8F,
+		khaki_rose = 0xC5908E,
+		lipstick_pink = 0xC48793,
+		pink_brown = 0xC48189,
+		old_rose = 0xC08081,
+		dusty_pink = 0xD58A94,
+		pink_daisy = 0xE799A3,
+		rose = 0xE8ADAA,
+		dusty_rose = 0xC9A9A6,
+		silver_pink = 0xC4AEAD,
+		gold_pink = 0xE6C7C2,
+		rose_gold = 0xECC5C0,
+		deep_peach = 0xFFCBA4,
+		pastel_orange = 0xF8B88B,
+		desert_sand = 0xEDC9AF,
+		unbleached_silk = 0xFFDDCA,
+		pig_pink = 0xFDD7E4,
+		pale_pink = 0xF2D4D7,
+		blush = 0xFFE6E8,
+		misty_rose = 0xFFE4E1,
+		pink_bubble_gum = 0xFFDFDD,
+		light_rose = 0xFBCFCD,
+		light_red = 0xFFCCCB,
+		warm_pink = 0xF6C6BD,
+		deep_rose = 0xFBBBB9,
+		light_pink = 0xFFB6C1,
+		soft_pink = 0xFFB8BF,
+		donut_pink = 0xFAAFBE,
+		baby_pink = 0xFAAFBA,
+		flamingo_pink = 0xF9A7B0,
+		pastel_pink = 0xFEA3AA,
+		rose_pink = 0xE7A1B0,
+		pink_rose = 0xE7A1B0,
+		cadillac_pink = 0xE38AAE,
+		carnation_pink = 0xF778A1,
+		pastel_rose = 0xE5788F,
+		blush_red = 0xE56E94,
+		pale_violet_red = 0xDB7093,
+		purple_pink = 0xD16587,
+		tulip_pink = 0xC25A7C,
+		bashful_pink = 0xC25283,
+		dark_pink = 0xE75480,
+		dark_hot_pink = 0xF660AB,
+		hot_pink = 0xFF69B4,
+		watermelon_pink = 0xFC6C85,
+		violet_red = 0xF6358A,
+		hot_deep_pink = 0xF52887,
+		bright_pink = 0xFF007F,
+		deep_pink = 0xFF1493,
+		neon_pink = 0xF535AA,
+		chrome_pink = 0xFF33AA,
+		neon_hot_pink = 0xFD349C,
+		pink_cupcake = 0xE45E9D,
+		royal_pink = 0xE759AC,
+		dimorphotheca_magenta = 0xE3319D,
+		pink_lemonade = 0xE4287C,
+		red_pink = 0xFA2A55,
+		crimson = 0xDC143C,
+		bright_maroon = 0xC32148,
+		rose_red = 0xC21E56,
+		rogue_pink = 0xC12869,
+		burnt_pink = 0xC12267,
+		pink_violet = 0xCA226B,
+		magenta_pink = 0xCC338B,
+		medium_violet_red = 0xC71585,
+		dark_carnation_pink = 0xC12283,
+		raspberry_purple = 0xB3446C,
+		pink_plum = 0xB93B8F,
+		orchid = 0xDA70D6,
+		deep_mauve = 0xDF73D4,
+		violet = 0xEE82EE,
+		fuchsia_pink = 0xFF77FF,
+		bright_neon_pink = 0xF433FF,
+		fuchsia = 0xFF00FF,
+		crimson_purple = 0xE238EC,
+		heliotrope_purple = 0xD462FF,
+		tyrian_purple = 0xC45AEC,
+		medium_orchid = 0xBA55D3,
+		purple_flower = 0xA74AC7,
+		orchid_purple = 0xB048B5,
+		rich_lilac = 0xB666D2,
+		pastel_violet = 0xD291BC,
+		mauve_taupe = 0x915F6D,
+		viola_purple = 0x7E587E,
+		eggplant = 0x614051,
+		plum_purple = 0x583759,
+		grape = 0x5E5A80,
+		purple_navy = 0x4E5180,
+		slate_blue = 0x6A5ACD,
+		blue_lotus = 0x6960EC,
+		blurple = 0x5865F2,
+		light_slate_blue = 0x736AFF,
+		medium_slate_blue = 0x7B68EE,
+		periwinkle_purple = 0x7575CF,
+		very_peri = 0x6667AB,
+		bright_grape = 0x6F2DA8,
+		purple_amethyst = 0x6C2DC7,
+		bright_purple = 0x6A0DAD,
+		deep_periwinkle = 0x5453A6,
+		dark_slate_blue = 0x483D8B,
+		purple_haze = 0x4E387E,
+		purple_iris = 0x571B7E,
+		dark_purple = 0x4B0150,
+		deep_purple = 0x36013F,
+		midnight_purple = 0x2E1A47,
+		purple_monster = 0x461B7E,
+		indigo = 0x4B0082,
+		blue_whale = 0x342D7E,
+		rebecca_purple = 0x663399,
+		purple_jam = 0x6A287E,
+		dark_magenta = 0x8B008B,
+		purple = 0x800080,
+		french_lilac = 0x86608E,
+		dark_orchid = 0x9932CC,
+		dark_violet = 0x9400D3,
+		purple_violet = 0x8D38C9,
+		jasmine_purple = 0xA23BEC,
+		purple_daffodil = 0xB041FF,
+		clematis_violet = 0x842DCE,
+		blue_violet = 0x8A2BE2,
+		purple_sage_bush = 0x7A5DC7,
+		lovely_purple = 0x7F38EC,
+		neon_purple = 0x9D00FF,
+		purple_plum = 0x8E35EF,
+		aztech_purple = 0x893BFF,
+		medium_purple = 0x9370DB,
+		light_purple = 0x8467D7,
+		crocus_purple = 0x9172EC,
+		purple_mimosa = 0x9E7BFF,
+		periwinkle = 0xCCCCFF,
+		pale_lilac = 0xDCD0FF,
+		lavender_purple = 0x967BB6,
+		rose_purple = 0xB09FCA,
+		lilac = 0xC8A2C8,
+		mauve = 0xE0B0FF,
+		bright_lilac = 0xD891EF,
+		purple_dragon = 0xC38EC7,
+		plum = 0xDDA0DD,
+		blush_pink = 0xE6A9EC,
+		pastel_purple = 0xF2A2E8,
+		blossom_pink = 0xF9B7FF,
+		wisteria_purple = 0xC6AEC7,
+		purple_thistle = 0xD2B9D3,
+		thistle = 0xD8BFD8,
+		purple_white = 0xDFD3E3,
+		periwinkle_pink = 0xE9CFEC,
+		cotton_candy = 0xFCDFFF,
+		lavender_pinocchio = 0xEBDDE2,
+		dark_white = 0xE1D9D1,
+		ash_white = 0xE9E4D4,
+		white_chocolate = 0xEDE6D6,
+		soft_ivory = 0xFAF0DD,
+		off_white = 0xF8F0E3,
+		pearl_white = 0xF8F6F0,
+		red_white = 0xF3E8EA,
+		lavender_blush = 0xFFF0F5,
+		pearl = 0xFDEEF4,
+		egg_shell = 0xFFF9E3,
+		old_lace = 0xFEF0E3,
+		linen = 0xFAF0E6,
+		sea_shell = 0xFFF5EE,
+		bone_white = 0xF9F6EE,
+		rice = 0xFAF5EF,
+		floral_white = 0xFFFAF0,
+		ivory = 0xFFFFF0,
+		white_gold = 0xFFFFF4,
+		light_white = 0xFFFFF7,
+		white_smoke = 0xF5F5F5,
+		cotton = 0xFBFBF9,
+		snow = 0xFFFAFA,
+		milk_white = 0xFEFCFF,
+		half_white = 0xFFFEFA;
+} // namespace colors
+
+/**
+ * @brief Predefined colour constants, same as colors but for the british.
+ */
+namespace colours = colors;
+} // namespace dpp
diff --git a/3rdParty/dpp/commandhandler.h b/3rdParty/dpp/commandhandler.h
index 1e4b12fa96..a244c18c25 100644
--- a/3rdParty/dpp/commandhandler.h
+++ b/3rdParty/dpp/commandhandler.h
@@ -1,392 +1,428 @@
-/************************************************************************************
- *
- * D++, A Lightweight C++ library for Discord
- *
- * Copyright 2021 Craig Edwards and D++ contributors
- * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- ************************************************************************************/
-
-#pragma once
-#include <dpp/export.h>
-#include <dpp/snowflake.h>
-#include <dpp/misc-enum.h>
-#include <dpp/user.h>
-#include <dpp/guild.h>
-#include <dpp/role.h>
-#include <dpp/appcommand.h>
-#include <dpp/dispatcher.h>
-#include <dpp/utility.h>
-#include <dpp/nlohmann/json_fwd.hpp>
-#include <dpp/event_router.h>
-#include <unordered_map>
-#include <vector>
-#include <functional>
-#include <variant>
-
-namespace dpp {
-
-/**
- * @brief dpp::resolved_user contains both a dpp::guild_member and a dpp::user.
- * The user can be used to obtain in-depth user details such as if they are nitro,
- * and the guild member information to check their roles on a guild etc.
- * The Discord API provides both if a parameter is a user ping,
- * so we offer both in a combined structure.
- */
-struct DPP_EXPORT resolved_user {
-	/**
-	 * @brief Holds user information
-	 */
-	dpp::user user;
-	/**
-	 * @brief Holds member information
-	 */
-	dpp::guild_member member;
-};
-
-/**
- * @brief Represents a received parameter.
- * We use variant so that multiple non-related types can be contained within.
- */
-typedef std::variant<std::monostate, std::string, dpp::role, dpp::channel, dpp::resolved_user, int64_t, bool, double> command_parameter;
-
-/**
- * @brief Parameter types when registering a command.
- * We don't pass these in when triggering the command in the handler, because it is
- * expected the developer added the command so they know what types to expect for each named
- * parameter.
- */
-enum parameter_type {
-	pt_string,	//!< String value
-	pt_role,	//!< Role object
-	pt_channel,	//!< Channel object
-	pt_user,	//!< User object
-	pt_integer,	//!< 64 bit signed integer
-	pt_double,	//!< double floating point
-	pt_boolean	//!< boolean
-};
-
-/**
- * @brief Details of a command parameter used in registration.
- * Note that for non-slash commands optional parameters can only be at the end of
- * the list of parameters.
- */
-struct DPP_EXPORT param_info {
-
-	/**
-	 * @brief Type of parameter
-	 */
-	parameter_type type;
-
-	/**
-	 * @brief True if the parameter is optional.
-	 * For non-slash commands optional parameters may only be on the end of the list.
-	 */
-	bool optional;
-
-	/**
-	 * @brief Description of command. Displayed only for slash commands
-	 */
-	std::string description;
-
-	/**
-	 * @brief Allowed multiple choice options.
-	 * The key name is the string passed to the command handler
-	 * and the key value is its description displayed to the user.
-	 */
-	std::map<command_value, std::string> choices;
-
-	/**
-	 * @brief Construct a new param_info object
-	 * 
-	 * @param t Type of parameter
-	 * @param o True if parameter is optional
-	 * @param description The parameter description
-	 * @param opts The options for a multiple choice parameter
-	 */
-	param_info(parameter_type t, bool o, const std::string &description, const std::map<command_value, std::string> &opts = {});
-};
-
-/**
- * @brief Parameter list used during registration.
- * Note that use of vector/pair is important here to preserve parameter order,
- * as opposed to unordered_map (which doesn't guarantee any order at all) and 
- * std::map, which reorders keys alphabetically.
- */
-typedef std::vector<std::pair<std::string, param_info>> parameter_registration_t;
-
-/**
- * @brief Parameter list for a called command.
- * See dpp::parameter_registration_t for an explanation as to why vector is used.
- */
-typedef std::vector<std::pair<std::string, command_parameter>> parameter_list_t;
-
-/**
- * @brief Represents the sending source of a command.
- * This is passed to any command handler and should be passed back to
- * commandhandler::reply(), allowing the reply method to route any replies back
- * to the origin, which may be a slash command or a message. Both require different
- * response facilities but we want this to be transparent if you use the command
- * handler class.
- * @deprecated commandhandler and message commands are deprecated and dpp::slashcommand is encouraged as a replacement.
- */
-struct DPP_EXPORT command_source {
-	/**
-	 * @brief Sending guild id
-	 */
-	snowflake guild_id;
-	/**
-	 * @brief Source channel id
-	 */
-	snowflake channel_id;
-	/**
-	 * @brief Command ID of a slash command
-	 */
-	snowflake command_id;
-	/**
-	 * @brief Token for sending a slash command reply
-	 */
-	std::string command_token;
-	/**
-	 * @brief The user who issued the command
-	 */
-	user issuer;
-
-	/**
-	 * @brief Copy of the underlying message_create_t event, if it was a message create event
-	 */
-	std::optional<message_create_t> message_event;
-
-	/**
-	 * @brief Copy of the underlying interaction_create_t event, if it was an interaction create event
-	 */
-	std::optional<interaction_create_t> interaction_event;
-
-	/**
-	 * @brief Construct a command_source object from a message_create_t event
-	 */
-	command_source(const struct message_create_t& event);
-
-	/**
-	 * @brief Construct a command_source object from an interaction_create_t event
-	 */
-	command_source(const struct interaction_create_t& event);
-};
-
-/**
- * @brief The function definition for a command handler. Expects a command name string,
- * and a list of command parameters.
- * @deprecated commandhandler and message commands are deprecated and dpp::slashcommand is encouraged as a replacement.
- */
-typedef std::function<void(const std::string&, const parameter_list_t&, command_source)> command_handler;
-
-/**
- * @brief Represents the details of a command added to the command handler class.
- * @deprecated commandhandler and message commands are deprecated and dpp::slashcommand is encouraged as a replacement.
- */
-struct DPP_EXPORT command_info_t {
-	/**
-	 * @brief Function reference for the handler. This is std::function so it can represent
-	 * a class member, a lambda or a raw C function pointer.
-	 */
-	command_handler func;
-	/**
-	 * @brief Parameters requested for the command, with their types
-	 */
-	parameter_registration_t parameters;
-	/**
-	 * @brief Guild ID the command exists on, or 0 to be present on all guilds
-	 */
-	snowflake guild_id;
-};
-
-
-/**
- * @brief The commandhandler class represents a group of commands, prefixed or slash commands with handling functions.
- * 
- * It can automatically register slash commands, and handle routing of messages and interactions to separated command handler
- * functions.
- * @deprecated commandhandler and message commands are deprecated and dpp::slashcommand is encouraged as a replacement.
- */
-class DPP_EXPORT commandhandler {
-private:
-	/**
-	 * @brief List of guild commands to bulk register
-	 */
-	std::map<dpp::snowflake, std::vector<dpp::slashcommand>> bulk_registration_list_guild;
-	/**
-	 * @brief List of global commands to bulk register
-	 */
-	std::vector<dpp::slashcommand> bulk_registration_list_global;
-public:
-	/**
-	 * @brief Commands in the handler
-	 */
-	std::unordered_map<std::string, command_info_t> commands;
-
-	/**
-	 * @brief Valid prefixes
-	 */
-	std::vector<std::string> prefixes;
-
-	/**
-	 * @brief Set to true automatically if one of the prefixes added is "/"
-	 */
-	bool slash_commands_enabled;
-
-	/**
-	 * @brief Cluster we are attached to for issuing REST calls
-	 */
-	class cluster* owner;
-
-	/**
-	 * @brief Application ID
-	 */
-	snowflake app_id;
-
-	/**
-	 * @brief Interaction event handle
-	 */
-	event_handle interactions;
-
-	/**
-	 * @brief Message event handle
-	 */
-	event_handle messages;
-
-	/**
-	 * @brief Returns true if the string has a known prefix on the start.
-	 * Modifies string to remove prefix if it returns true.
-	 * 
-	 * @param str String to check and modify
-	 * @return true string contained a prefix, prefix removed from string
-	 * @return false string did not contain a prefix
-	 */
-	bool string_has_prefix(std::string &str);
-
-public:
-
-	/**
-	 * @brief Construct a new commandhandler object
-	 * 
-	 * @param o Owning cluster to attach to
-	 * @param auto_hook_events Set to true to automatically hook the on_slashcommand
-	 * and on_message events. You should not need to set this to false unless you have a specific
-	 * use case, as D++ supports multiple listeners to an event, so will allow the commandhandler
-	 * to hook to your command events without disrupting other uses for the events you may have.
-	 * @param application_id The application id of the bot. If not specified, the class will
-	 * look within the cluster object and use cluster::me::id instead.
-	 */
-	commandhandler(class cluster* o, bool auto_hook_events = true, snowflake application_id = 0);
-
-	/**
-	 * @brief Destroy the commandhandler object
-	 */
-	~commandhandler();
-
-	/**
-	 * @brief Set the application id after construction
-	 * 
-	 * @param o Owning cluster to attach to
-	 */
-	commandhandler& set_owner(class cluster* o);
-
-	/**
-	 * @brief Add a prefix to the command handler
-	 * 
-	 * @param prefix Prefix to be handled by the command handler
-	 * @return commandhandler& reference to self
-	 */
-	commandhandler& add_prefix(const std::string &prefix);
-
-	/**
-	 * @brief Add a command to the command handler
-	 * 
-	 * @param command Command to be handled.
-	 * Note that if any one of your prefixes is "/" this will attempt to register
-	 * a global command using the API and you will receive notification of this command
-	 * via an interaction event.
-	 * @param handler Handler function
-	 * @param parameters Parameters to use for the command
-	 * @param description The description of the command, shown for slash commands
-	 * @param guild_id The guild ID to restrict the command to. For slash commands causes registration of a guild command as opposed to a global command.
-	 * @return commandhandler& reference to self
-	 * @throw dpp::logic_exception if application ID cannot be determined
-	 */
-	commandhandler& add_command(const std::string &command, const parameter_registration_t &parameters, command_handler handler, const std::string &description = "", snowflake guild_id = 0);
-
-	/**
-	 * @brief Register all slash commands with Discord
-	 * This method must be called at least once  if you are using the "/" prefix to mark the
-	 * end of commands being added to the handler. Note that this uses bulk registration and will replace any
-	 * existing slash commands.
-	 * 
-	 * Note that if you have previously registered your commands and they have not changed, you do
-	 * not need to call this again. Discord retains a cache of previously added commands.
-	 * 
-	 * @return commandhandler& Reference to self for chaining method calls
-	 */
-	commandhandler& register_commands();
-
-	/**
-	 * @brief Route a command from the on_message_create function.
-	 * Call this method from within your on_message_create with the received
-	 * dpp::message object if you have disabled automatic registration of events.
-	 * 
-	 * @param event message create event to parse
-	 */
-	void route(const struct dpp::message_create_t& event);
-
-	/**
-	 * @brief Route a command from the on_slashcommand function.
-	 * Call this method from your on_slashcommand with the received
-	 * dpp::interaction_create_t object if you have disabled automatic registration of events.
-	 * 
-	 * @param event command interaction event to parse
-	 */
-	void route(const struct slashcommand_t & event);
-
-	/**
-	 * @brief Reply to a command.
-	 * You should use this method rather than cluster::message_create as
-	 * the way you reply varies between slash commands and message commands.
-	 * Note you should ALWAYS reply. Slash commands will emit an ugly error
-	 * to the user if you do not emit some form of reply within 3 seconds.
-	 * 
-	 * @param m message to reply with.
-	 * @param source source of the command
-	 * @param callback User function to execute when the api call completes.
-	 */
-	void reply(const dpp::message &m, command_source source, command_completion_event_t callback = utility::log_error());
-
-	/**
-	 * @brief Reply to a command without a message, causing the discord client
-	 * to display "Bot name is thinking...".
-	 * The "thinking" message will persist for a maximum of 15 minutes.
-	 * This counts as a reply for a slash command. Slash commands will emit an
-	 * ugly error to the user if you do not emit some form of reply within 3
-	 * seconds.
-	 * 
-	 * @param source source of the command
-	 * @param callback User function to execute when the api call completes.
-	 */
-	void thinking(command_source source, command_completion_event_t callback = utility::log_error());
-
-	/* Easter egg */
-	void thonk(command_source source, command_completion_event_t callback = utility::log_error());
-
-};
-
-};
+/************************************************************************************
+ *
+ * D++, A Lightweight C++ library for Discord
+ *
+ * Copyright 2021 Craig Edwards and D++ contributors
+ * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ************************************************************************************/
+
+#pragma once
+#include <dpp/export.h>
+#include <dpp/snowflake.h>
+#include <dpp/misc-enum.h>
+#include <dpp/user.h>
+#include <dpp/guild.h>
+#include <dpp/role.h>
+#include <dpp/appcommand.h>
+#include <dpp/dispatcher.h>
+#include <dpp/utility.h>
+#include <dpp/json_fwd.h>
+#include <dpp/event_router.h>
+#include <unordered_map>
+#include <vector>
+#include <functional>
+#include <variant>
+
+namespace dpp {
+
+/**
+ * @brief dpp::resolved_user contains both a dpp::guild_member and a dpp::user.
+ * The user can be used to obtain in-depth user details such as if they are nitro,
+ * and the guild member information to check their roles on a guild etc.
+ * The Discord API provides both if a parameter is a user ping,
+ * so we offer both in a combined structure.
+ */
+struct DPP_EXPORT resolved_user {
+	/**
+	 * @brief Holds user information
+	 */
+	dpp::user user;
+
+	/**
+	 * @brief Holds member information
+	 */
+	dpp::guild_member member;
+};
+
+/**
+ * @brief Represents a received parameter.
+ * We use variant so that multiple non-related types can be contained within.
+ */
+typedef std::variant<std::monostate, std::string, dpp::role, dpp::channel, dpp::resolved_user, int64_t, bool, double> command_parameter;
+
+/**
+ * @brief Parameter types when registering a command.
+ * We don't pass these in when triggering the command in the handler, because it is
+ * expected the developer added the command so they know what types to expect for each named
+ * parameter.
+ */
+enum parameter_type {
+	/**
+	 * @brief String parameter.
+	 */
+	pt_string,
+
+	/**
+	 * @brief Role object parameter.
+	 */
+	pt_role,
+
+	/**
+	 * @brief Channel object parameter.
+	 */
+	pt_channel,
+
+	/**
+	 * @brief User object parameter.
+	 */
+	pt_user,
+
+	/**
+	 * @brief 64 bit signed integer parameter.
+	 */
+	pt_integer,
+
+	/**
+	 * @brief double floating point parameter.
+	 */
+	pt_double,
+
+	/**
+	 * @brief Boolean parameter.
+	 */
+	pt_boolean
+};
+
+/**
+ * @brief Details of a command parameter used in registration.
+ * Note that for non-slash commands optional parameters can only be at the end of
+ * the list of parameters.
+ */
+struct DPP_EXPORT param_info {
+	/**
+	 * @brief Type of parameter
+	 */
+	parameter_type type;
+
+	/**
+	 * @brief True if the parameter is optional.
+	 * For non-slash commands optional parameters may only be on the end of the list.
+	 */
+	bool optional;
+
+	/**
+	 * @brief Description of command. Displayed only for slash commands
+	 */
+	std::string description;
+
+	/**
+	 * @brief Allowed multiple choice options.
+	 * The key name is the string passed to the command handler
+	 * and the key value is its description displayed to the user.
+	 */
+	std::map<command_value, std::string> choices;
+
+	/**
+	 * @brief Construct a new param_info object
+	 * 
+	 * @param t Type of parameter
+	 * @param o True if parameter is optional
+	 * @param description The parameter description
+	 * @param opts The options for a multiple choice parameter
+	 */
+	param_info(parameter_type t, bool o, const std::string &description, const std::map<command_value, std::string> &opts = {});
+};
+
+/**
+ * @brief Parameter list used during registration.
+ * Note that use of vector/pair is important here to preserve parameter order,
+ * as opposed to unordered_map (which doesn't guarantee any order at all) and 
+ * std::map, which reorders keys alphabetically.
+ */
+typedef std::vector<std::pair<std::string, param_info>> parameter_registration_t;
+
+/**
+ * @brief Parameter list for a called command.
+ * See dpp::parameter_registration_t for an explanation as to why vector is used.
+ */
+typedef std::vector<std::pair<std::string, command_parameter>> parameter_list_t;
+
+/**
+ * @brief Represents the sending source of a command.
+ * This is passed to any command handler and should be passed back to
+ * commandhandler::reply(), allowing the reply method to route any replies back
+ * to the origin, which may be a slash command or a message. Both require different
+ * response facilities but we want this to be transparent if you use the command
+ * handler class.
+ * @deprecated commandhandler and message commands are deprecated and dpp::slashcommand is encouraged as a replacement.
+ */
+struct DPP_EXPORT command_source {
+	/**
+	 * @brief Sending guild id
+	 */
+	snowflake guild_id;
+
+	/**
+	 * @brief Source channel id
+	 */
+	snowflake channel_id;
+
+	/**
+	 * @brief Command ID of a slash command
+	 */
+	snowflake command_id;
+
+	/**
+	 * @brief Token for sending a slash command reply
+	 */
+	std::string command_token;
+
+	/**
+	 * @brief The user who issued the command
+	 */
+	user issuer;
+
+	/**
+	 * @brief Copy of the underlying message_create_t event, if it was a message create event
+	 */
+	std::optional<message_create_t> message_event;
+
+	/**
+	 * @brief Copy of the underlying interaction_create_t event, if it was an interaction create event
+	 */
+	std::optional<interaction_create_t> interaction_event;
+
+	/**
+	 * @brief Construct a command_source object from a message_create_t event
+	 */
+	command_source(const struct message_create_t& event);
+
+	/**
+	 * @brief Construct a command_source object from an interaction_create_t event
+	 */
+	command_source(const struct interaction_create_t& event);
+};
+
+/**
+ * @brief The function definition for a command handler. Expects a command name string,
+ * and a list of command parameters.
+ * @deprecated commandhandler and message commands are deprecated and dpp::slashcommand is encouraged as a replacement.
+ */
+typedef std::function<void(const std::string&, const parameter_list_t&, command_source)> command_handler;
+
+/**
+ * @brief Represents the details of a command added to the command handler class.
+ * @deprecated commandhandler and message commands are deprecated and dpp::slashcommand is encouraged as a replacement.
+ */
+struct DPP_EXPORT command_info_t {
+	/**
+	 * @brief Function reference for the handler. This is std::function so it can represent
+	 * a class member, a lambda or a raw C function pointer.
+	 */
+	command_handler func;
+
+	/**
+	 * @brief Parameters requested for the command, with their types
+	 */
+	parameter_registration_t parameters;
+
+	/**
+	 * @brief Guild ID the command exists on, or 0 to be present on all guilds
+	 */
+	snowflake guild_id;
+};
+
+
+/**
+ * @brief The commandhandler class represents a group of commands, prefixed or slash commands with handling functions.
+ * 
+ * It can automatically register slash commands, and handle routing of messages and interactions to separated command handler
+ * functions.
+ * @deprecated commandhandler and message commands are deprecated and dpp::slashcommand is encouraged as a replacement.
+ */
+class DPP_EXPORT DPP_DEPRECATED("commandhandler should not be used. Please consider using dpp::cluster::register_command instead.") commandhandler {
+private:
+	/**
+	 * @brief List of guild commands to bulk register
+	 */
+	std::map<dpp::snowflake, std::vector<dpp::slashcommand>> bulk_registration_list_guild;
+
+	/**
+	 * @brief List of global commands to bulk register
+	 */
+	std::vector<dpp::slashcommand> bulk_registration_list_global;
+public:
+	/**
+	 * @brief Commands in the handler
+	 */
+	std::unordered_map<std::string, command_info_t> commands;
+
+	/**
+	 * @brief Valid prefixes
+	 */
+	std::vector<std::string> prefixes;
+
+	/**
+	 * @brief Set to true automatically if one of the prefixes added is "/"
+	 */
+	bool slash_commands_enabled;
+
+	/**
+	 * @brief Cluster we are attached to for issuing REST calls
+	 */
+	class cluster* owner;
+
+	/**
+	 * @brief Application ID
+	 */
+	snowflake app_id;
+
+	/**
+	 * @brief Interaction event handle
+	 */
+	event_handle interactions;
+
+	/**
+	 * @brief Message event handle
+	 */
+	event_handle messages;
+
+	/**
+	 * @brief Returns true if the string has a known prefix on the start.
+	 * Modifies string to remove prefix if it returns true.
+	 * 
+	 * @param str String to check and modify
+	 * @return true string contained a prefix, prefix removed from string
+	 * @return false string did not contain a prefix
+	 */
+	bool string_has_prefix(std::string &str);
+
+public:
+
+	/**
+	 * @brief Construct a new commandhandler object
+	 * 
+	 * @param o Owning cluster to attach to
+	 * @param auto_hook_events Set to true to automatically hook the on_slashcommand
+	 * and on_message events. You should not need to set this to false unless you have a specific
+	 * use case, as D++ supports multiple listeners to an event, so will allow the commandhandler
+	 * to hook to your command events without disrupting other uses for the events you may have.
+	 * @param application_id The application id of the bot. If not specified, the class will
+	 * look within the cluster object and use cluster::me::id instead.
+	 */
+	commandhandler(class cluster* o, bool auto_hook_events = true, snowflake application_id = 0);
+
+	/**
+	 * @brief Destroy the commandhandler object
+	 */
+	~commandhandler();
+
+	/**
+	 * @brief Set the application id after construction
+	 * 
+	 * @param o Owning cluster to attach to
+	 */
+	commandhandler& set_owner(class cluster* o);
+
+	/**
+	 * @brief Add a prefix to the command handler
+	 * 
+	 * @param prefix Prefix to be handled by the command handler
+	 * @return commandhandler& reference to self
+	 */
+	commandhandler& add_prefix(const std::string &prefix);
+
+	/**
+	 * @brief Add a command to the command handler
+	 * 
+	 * @param command Command to be handled.
+	 * Note that if any one of your prefixes is "/" this will attempt to register
+	 * a global command using the API and you will receive notification of this command
+	 * via an interaction event.
+	 * @param handler Handler function
+	 * @param parameters Parameters to use for the command
+	 * @param description The description of the command, shown for slash commands
+	 * @param guild_id The guild ID to restrict the command to. For slash commands causes registration of a guild command as opposed to a global command.
+	 * @return commandhandler& reference to self
+	 * @throw dpp::logic_exception if application ID cannot be determined
+	 */
+	commandhandler& add_command(const std::string &command, const parameter_registration_t &parameters, command_handler handler, const std::string &description = "", snowflake guild_id = 0);
+
+	/**
+	 * @brief Register all slash commands with Discord
+	 * This method must be called at least once  if you are using the "/" prefix to mark the
+	 * end of commands being added to the handler. Note that this uses bulk registration and will replace any
+	 * existing slash commands.
+	 * 
+	 * Note that if you have previously registered your commands and they have not changed, you do
+	 * not need to call this again. Discord retains a cache of previously added commands.
+	 * 
+	 * @return commandhandler& Reference to self for chaining method calls
+	 */
+	commandhandler& register_commands();
+
+	/**
+	 * @brief Route a command from the on_message_create function.
+	 * Call this method from within your on_message_create with the received
+	 * dpp::message object if you have disabled automatic registration of events.
+	 * 
+	 * @param event message create event to parse
+	 */
+	void route(const struct dpp::message_create_t& event);
+
+	/**
+	 * @brief Route a command from the on_slashcommand function.
+	 * Call this method from your on_slashcommand with the received
+	 * dpp::interaction_create_t object if you have disabled automatic registration of events.
+	 * 
+	 * @param event command interaction event to parse
+	 */
+	void route(const struct slashcommand_t & event);
+
+	/**
+	 * @brief Reply to a command.
+	 * You should use this method rather than cluster::message_create as
+	 * the way you reply varies between slash commands and message commands.
+	 * Note you should ALWAYS reply. Slash commands will emit an ugly error
+	 * to the user if you do not emit some form of reply within 3 seconds.
+	 * 
+	 * @param m message to reply with.
+	 * @param source source of the command
+	 * @param callback User function to execute when the api call completes.
+	 */
+	void reply(const dpp::message &m, command_source source, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Reply to a command without a message, causing the discord client
+	 * to display "Bot name is thinking...".
+	 * The "thinking" message will persist for a maximum of 15 minutes.
+	 * This counts as a reply for a slash command. Slash commands will emit an
+	 * ugly error to the user if you do not emit some form of reply within 3
+	 * seconds.
+	 * 
+	 * @param source source of the command
+	 * @param callback User function to execute when the api call completes.
+	 */
+	void thinking(command_source source, command_completion_event_t callback = utility::log_error());
+
+	/**
+	 * @brief Easter egg (redefinition of dpp::commandhandler::thinking).
+	 */
+	void thonk(command_source source, command_completion_event_t callback = utility::log_error());
+
+};
+
+}
diff --git a/3rdParty/dpp/compat.h b/3rdParty/dpp/compat.h
new file mode 100644
index 0000000000..8416ce28fe
--- /dev/null
+++ b/3rdParty/dpp/compat.h
@@ -0,0 +1,43 @@
+/************************************************************************************
+*
+* D++, A Lightweight C++ library for Discord
+*
+* Copyright 2021 Craig Edwards and D++ contributors
+* (https://github.com/brainboxdotcc/DPP/graphs/contributors)
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*
+************************************************************************************/
+#pragma once
+
+#ifdef _WIN32
+	#include <WinSock2.h>
+	#include <WS2tcpip.h>
+	#include <io.h>
+	namespace dpp::compat {
+		using pollfd = WSAPOLLFD;
+		inline int poll(pollfd* fds, ULONG nfds, int timeout) {
+			return WSAPoll(fds, nfds, timeout);
+		}
+	} // namespace dpp::compat
+	#pragma comment(lib, "ws2_32")
+#else
+	#include <poll.h>
+	#include <netinet/in.h>
+	#include <sys/socket.h>
+	#include <arpa/inet.h>
+	namespace dpp::compat {
+		using ::pollfd;
+		using ::poll;
+	} // namespace dpp::compat
+#endif
diff --git a/3rdParty/dpp/coro.h b/3rdParty/dpp/coro.h
index 900a67e43b..bc9c140d2b 100644
--- a/3rdParty/dpp/coro.h
+++ b/3rdParty/dpp/coro.h
@@ -1,158 +1,29 @@
-#ifdef DPP_CORO
-#pragma once
-#include <coroutine>
-#include <dpp/restresults.h>
-
-namespace dpp {
-	
-	/**
-	 * @brief Shorthand for the coroutine handle's type
-	 */
-	using handle_type = std::coroutine_handle<struct promise>;
-
-	class cluster;
-
-	/**
-	 * @brief Return type for coroutines
-	 */
-	struct task {
-		/**
-		 * @brief Required nested promise_type for coroutines
-		 */
-		using promise_type = dpp::promise;
-	};
-
-	/**
-	 * @brief Implementation of promise_type for dpp's coroutines
-	 */
-	struct promise {
-		/**
-		 * @brief A pointer to the cluster making the requests in the coroutine
-		 */
-		cluster* bot = nullptr;
-
-		/**
-		 * @brief The result of the last co_await-ed function
-		 */
-		confirmation_callback_t callback;
-
-		/**
-		 * @brief Construct a new promise object
-		 */
-		promise() = default;
-
-		/**
-		 * @brief Construct a new promise object
-		 * 
-		 * @param ev Base type of all events, only used to get the dpp::cluster pointer
-		 */
-		promise(const dpp::event_dispatch_t& ev) : bot(ev.from->creator) { }
-
-		/**
-		 * @brief Get the return  object
-		 * 
-		 * @return task dpp::task type 
-		 */
-		task get_return_object() {
-			return {};
-		}
-
-		/**
-		 * @brief Function called when the coroutine is first suspended, never suspends
-		 * 
-		 * @return std::suspend_never Never suspend this coroutine at the first suspend point
-		 */
-		std::suspend_never initial_suspend() noexcept {
-			return {};
-		}
-
-		/**
-		 * @brief Function called when the coroutine reaches its last suspension point
-		 * 
-		 * @return std::suspend_never Never suspend this coroutine at the final suspend point
-		 */
-		std::suspend_never final_suspend() noexcept {
-			return {};
-		}
-
-		/**
-		 * @brief Function called when the coroutine returns nothing
-		 */
-		void return_void() noexcept {}
-
-		/**
-		 * @brief Function called when coroutine throws a un-catch-ed exception. Does nothing
-		 */
-		void unhandled_exception() { 
-			/* try { std::rethrow_exception(std::current_exception()); } */ 
-			/* catch (const std::exception& e) { std::cout << e.what() << '\n'; } */ 
-		}
-	};
-
-	/**
-	 * @brief A co_await-able struct which returns the result of stored api call when co_await-ed. Meant to be opaque to the user
-	 * 
-	 * @tparam T The type of the function (lambda if auto-generated by the php script) handling the making of api call
-	 */
-	template <typename T> 
-	struct awaitable {
-		/**
-		 * @brief Pointer to the nested promise object of the coroutine, used for storing and retrieving the result of an api call
-		 */
-		promise* p;
-		
-		/**
-		 * @brief Pointer to the cluster making the api request
-		 */
-		cluster* bot;
-
-		/**
-		 * @brief The function handling the making of request, using the cluster pointer
-		 */
-		T api_req;
-
-		/**
-		 * @brief Construct a new awaitable object
-		 * 
-		 * @param cl pointer to the cluster making the api request 
-		 * @param api_call a function to invoke with the cluster pointer, handles the making of request
-		 */
-		awaitable(cluster* cl, T api_call) : bot{cl}, api_req{api_call} {} 
-
-		/**
-		 * @brief First function called when this object is co_await-ed, its return type tells if the coroutine should be immediately suspended
-		 * 
-		 * @return bool false, signifying immediate suspension  
-		 */
-		bool await_ready() noexcept {
-			return false;
-		}
-
-		/**
-		 * @brief Function called when the coroutine is suspended, makes the api request and queues the resumption of the suspended coroutine, storing the result in promise object
-		 * 
-		 * @param handle the handle to the suspended coroutine
-		 */
-		void await_suspend(handle_type handle) { 
-			/* p = &handle.promise(); */
-			/* if (!p->bot) p->bot = bot; */
-			api_req([handle](const confirmation_callback_t& cback) { handle.promise().callback = cback; handle.resume(); });
-		}
-
-		/**
-		 * @brief Function called when the coroutine is resumed by its handle, handles the retrieval and return of result from promise object
-		 * 
-		 * @return confirmation_callback_t the result of the api call
-		 */
-		confirmation_callback_t await_resume() {
-			return p->callback;
-		}
-	};
-
-};
-
-/* template<> */
-/* struct std::coroutine_traits<void, const dpp::interaction_create_t&> { */
-/* 	using promise_type = dpp::promise; */
-/* }; */
-#endif
+/************************************************************************************
+ *
+ * D++, A Lightweight C++ library for Discord
+ *
+ * Copyright 2022 Craig Edwards and D++ contributors
+ * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ************************************************************************************/
+
+#pragma once
+
+#include "coro/awaitable.h"
+#include "coro/async.h"
+#include "coro/coroutine.h"
+#include "coro/job.h"
+#include "coro/task.h"
+#include "coro/when_any.h"
diff --git a/3rdParty/dpp/coro/async.h b/3rdParty/dpp/coro/async.h
new file mode 100644
index 0000000000..5e2a09a127
--- /dev/null
+++ b/3rdParty/dpp/coro/async.h
@@ -0,0 +1,189 @@
+/************************************************************************************
+ *
+ * D++, A Lightweight C++ library for Discord
+ *
+ * Copyright 2022 Craig Edwards and D++ contributors
+ * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ************************************************************************************/
+#pragma once
+
+#include <dpp/utility.h>
+
+#include <dpp/coro/awaitable.h>
+
+namespace dpp {
+
+struct async_dummy : awaitable_dummy {
+	std::shared_ptr<int> dummy_shared_state = nullptr;
+};
+
+}
+
+#ifndef DPP_NO_CORO
+
+#include "coro.h"
+
+#include <utility>
+#include <type_traits>
+#include <functional>
+#include <atomic>
+#include <cstddef>
+
+namespace dpp {
+
+namespace detail {
+
+namespace async {
+
+/**
+ * @brief Shared state of the async and its callback, to be used across threads.
+ */
+template <typename R>
+struct callback {
+	/**
+	 * @brief Promise object to set the result into
+	 */
+	std::shared_ptr<basic_promise<R>> promise{nullptr};
+
+	/**
+	 * @brief Call operator, sets the value in the promise and notifies any awaiter
+	 * 
+	 * @param v Callback value
+	 */
+	template <typename U = R>
+	void operator()(const U& v) const requires (std::convertible_to<const U&, R>) {
+		promise->set_value(v);
+	}
+	
+	/**
+	 * @brief Call operator, sets the value in the promise and notifies any awaiter
+	 *
+	 * @param v Callback value
+	 */
+	template <typename U = R>
+	void operator()(U&& v) const requires (std::convertible_to<U&&, R>) {
+		promise->set_value(std::move(v));
+	}
+	
+	/**
+	 * @brief Call operator, sets the value in the promise and notifies any awaiter
+	 */
+	void operator()() const requires (std::is_void_v<R>)
+	{
+		promise->set_value();
+	}
+};
+
+} // namespace async
+
+} // namespace detail
+
+struct confirmation_callback_t;
+
+/**
+ * @class async async.h coro/async.h
+ * @brief A co_await-able object handling an API call in parallel with the caller.
+ *
+ * This class is the return type of the dpp::cluster::co_* methods, but it can also be created manually to wrap any async call.
+ *
+ * @remark - The coroutine may be resumed in another thread, do not rely on thread_local variables.
+ * @warning - This feature is EXPERIMENTAL. The API may change at any time and there may be bugs. Please report any to <a href="https://github.com/brainboxdotcc/DPP/issues">GitHub issues</a> or to the <a href="https://discord.gg/dpp">D++ Discord server</a>.
+ * @tparam R The return type of the API call. Defaults to confirmation_callback_t
+ */
+template <typename R>
+class async : public awaitable<R> {
+	/**
+	 * @brief Callable object to pass to API calls
+	 */
+	detail::async::callback<R> api_callback{};
+
+	/**
+	 * @brief Internal promise constructor, grabs a promise object for the callback to use
+	 */
+	explicit async(std::shared_ptr<basic_promise<R>> &&promise) : awaitable<R>{promise.get()}, api_callback{std::move(promise)} {}
+
+public:
+	using awaitable<R>::awaitable; // use awaitable's constructors
+	using awaitable<R>::operator=; // use async_base's assignment operator
+	using awaitable<R>::await_ready; // expose await_ready as public
+
+	/**
+	 * @brief The return type of the API call. Defaults to confirmation_callback_t
+	 */
+	using result_type = R;
+
+	/**
+	 * @brief Construct an async object wrapping an object method, the call is made immediately by forwarding to <a href="https://en.cppreference.com/w/cpp/utility/functional/invoke">std::invoke</a> and can be awaited later to retrieve the result.
+	 *
+	 * @param obj The object to call the method on
+	 * @param fun The method of the object to call. Its last parameter must be a callback taking a parameter of type R
+	 * @param args Parameters to pass to the method, excluding the callback
+	 */
+	template <typename Obj, typename Fun, typename... Args>
+#ifndef _DOXYGEN_
+	requires std::invocable<Fun, Obj, Args..., std::function<void(R)>>
+#endif
+	explicit async(Obj &&obj, Fun &&fun, Args&&... args) : async{std::make_shared<basic_promise<R>>()} {
+		std::invoke(std::forward<Fun>(fun), std::forward<Obj>(obj), std::forward<Args>(args)..., api_callback);
+	}
+
+	/**
+	 * @brief Construct an async object wrapping an invokeable object, the call is made immediately by forwarding to <a href="https://en.cppreference.com/w/cpp/utility/functional/invoke">std::invoke</a> and can be awaited later to retrieve the result.
+	 *
+	 * @param fun The object to call using <a href="https://en.cppreference.com/w/cpp/utility/functional/invoke">std::invoke</a>. Its last parameter must be a callable taking a parameter of type R
+	 * @param args Parameters to pass to the object, excluding the callback
+	 */
+	template <typename Fun, typename... Args>
+#ifndef _DOXYGEN_
+	requires std::invocable<Fun, Args..., std::function<void(R)>>
+#endif
+	explicit async(Fun &&fun, Args&&... args) : async{std::make_shared<basic_promise<R>>()} {
+		std::invoke(std::forward<Fun>(fun), std::forward<Args>(args)..., api_callback);
+	}
+
+	/**
+	 * @brief Copy constructor is disabled.
+	 */
+	async(const async&) = delete;
+
+	/**
+	 * @brief Move constructor, moves the awaitable async object
+	 */
+	async(async&&) = default;
+	
+	/**
+	 * @brief Copy assignment operator is disabled.
+	 */
+	async& operator=(const async&) = delete;
+	
+	/**
+	 * @brief Move assignment operator, moves the awaitable async object
+	 */
+	async& operator=(async&&) = default;
+
+	/**
+	 * @brief Destructor, signals to the callback that the async object is gone and shouldn't be notified of the result 
+	 */
+	~async() {
+		this->abandon();
+	}
+};
+
+DPP_CHECK_ABI_COMPAT(async<>, async_dummy);
+
+}
+
+#endif /* DPP_NO_CORO */
diff --git a/3rdParty/dpp/coro/awaitable.h b/3rdParty/dpp/coro/awaitable.h
new file mode 100644
index 0000000000..99c21bab62
--- /dev/null
+++ b/3rdParty/dpp/coro/awaitable.h
@@ -0,0 +1,735 @@
+/************************************************************************************
+ *
+ * D++, A Lightweight C++ library for Discord
+ *
+ * Copyright 2022 Craig Edwards and D++ contributors
+ * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ************************************************************************************/
+
+#pragma once
+
+#include <iostream>
+
+#include <dpp/utility.h>
+
+namespace dpp {
+
+struct awaitable_dummy {
+	int *promise_dummy = nullptr;
+};
+
+}
+
+#ifndef DPP_NO_CORO
+
+#include <dpp/coro/coro.h>
+
+// Do not include <coroutine> as coro.h includes <experimental/coroutine> or <coroutine> depending on clang version
+#include <mutex>
+#include <optional>
+#include <utility>
+#include <type_traits>
+#include <exception>
+#include <atomic>
+#include <condition_variable>
+#include <cstdint>
+
+namespace dpp {
+
+namespace detail::promise {
+
+/**
+ * @brief State of a promise
+ */
+enum state_flags {
+	/**
+	 * @brief Promise is empty
+	 */
+	sf_none = 0b0000000,
+
+	/**
+	 * @brief Promise has spawned an awaitable
+	 */
+	sf_has_awaitable = 0b00000001,
+
+	/**
+	 * @brief Promise is being awaited
+	 */
+	sf_awaited = 0b00000010,
+
+	/**
+	 * @brief Promise has a result
+	 */
+	sf_ready = 0b00000100,
+
+	/**
+	 * @brief Promise has completed, no more results are expected
+	 */
+	sf_done = 0b00001000,
+
+	/**
+	 * @brief Promise was broken - future or promise is gone
+	 */
+	sf_broken = 0b0010000
+};
+
+template <typename T>
+class promise_base;
+
+/**
+ * @brief Empty result from void-returning awaitable
+ */
+struct empty{};
+
+/**
+ * @brief Variant for the 3 conceptual values of a coroutine:
+ */
+template <typename T>
+using result_t = std::variant<std::monostate, std::conditional_t<std::is_void_v<T>, empty, T>, std::exception_ptr>;
+
+template <typename T>
+void spawn_sync_wait_job(auto* awaitable, std::condition_variable &cv, auto&& result);
+
+} /* namespace detail::promise */
+
+template <typename Derived>
+class basic_awaitable {
+protected:
+	/**
+	 * @brief Implementation for sync_wait. This is code used by sync_wait, sync_wait_for, sync_wait_until.
+	 *
+	 * @tparam Timed Whether the wait function times out or not
+	 * @param do_wait Function to do the actual wait on the cv
+	 * @return If T is void, returns a boolean for which true means the awaitable completed, false means it timed out.
+	 * @return If T is non-void, returns a std::optional<T> for which an absence of value means timed out.
+	 */
+	template <bool Timed>
+	auto sync_wait_impl(auto&& do_wait) {
+		using result_type = decltype(detail::co_await_resolve(std::declval<Derived>()).await_resume());
+		using variant_type = detail::promise::result_t<result_type>;
+		variant_type result;
+		std::condition_variable cv;
+
+		detail::promise::spawn_sync_wait_job<result_type>(static_cast<Derived*>(this), cv, result);
+		do_wait(cv, result);
+		/*
+		 * Note: we use .index() here to support dpp::promise<std::exception_ptr> & dpp::promise<std::monostate> :D
+		 */
+		if (result.index() == 2) {
+			std::rethrow_exception(std::get<2>(result));
+		}
+		if constexpr (!Timed) { // no timeout
+			if constexpr (!std::is_void_v<result_type>) {
+				return std::get<1>(result);
+			}
+		} else { // timeout
+			if constexpr (std::is_void_v<result_type>) {
+				return result.index() == 1 ? true : false;
+			} else {
+				return result.index() == 1 ? std::optional<result_type>{std::get<1>(result)} : std::nullopt;
+			}
+		}
+	}
+
+public:
+	/**
+	 * @brief Blocks this thread and waits for the awaitable to finish.
+	 *
+	 * @attention This will BLOCK THE THREAD. It is likely you want to use co_await instead.
+	 * @return If T is void, returns a boolean for which true means the awaitable completed, false means it timed out.
+	 * @return If T is non-void, returns a std::optional<T> for which an absence of value means timed out.
+	 */
+	auto sync_wait() {
+		return sync_wait_impl<false>([](std::condition_variable &cv, auto&& result) {
+			std::mutex m{};
+			std::unique_lock lock{m};
+			cv.wait(lock, [&result] { return result.index() != 0; });
+		});
+	}
+
+	/**
+	 * @brief Blocks this thread and waits for the awaitable to finish.
+	 *
+	 * @attention This will BLOCK THE THREAD. It is likely you want to use co_await instead.
+	 * @param duration Maximum duration to wait for
+	 * @return If T is void, returns a boolean for which true means the awaitable completed, false means it timed out.
+	 * @return If T is non-void, returns a std::optional<T> for which an absence of value means timed out.
+	 */
+	template <class Rep, class Period>
+	auto sync_wait_for(const std::chrono::duration<Rep, Period>& duration) {
+		return sync_wait_impl<true>([duration](std::condition_variable &cv, auto&& result) {
+			std::mutex m{};
+			std::unique_lock lock{m};
+			cv.wait_for(lock, duration, [&result] { return result.index() != 0; });
+		});
+	}
+
+	/**
+	 * @brief Blocks this thread and waits for the awaitable to finish.
+	 *
+	 * @attention This will BLOCK THE THREAD. It is likely you want to use co_await instead.
+	 * @param time Maximum time point to wait for
+	 * @return If T is void, returns a boolean for which true means the awaitable completed, false means it timed out.
+	 * @return If T is non-void, returns a std::optional<T> for which an absence of value means timed out.
+	 */
+	template <class Clock, class Duration>
+	auto sync_wait_until(const std::chrono::time_point<Clock, Duration> &time) {
+		return sync_wait_impl<true>([time](std::condition_variable &cv, auto&& result) {
+			std::mutex m{};
+			std::unique_lock lock{m};
+			cv.wait_until(lock, time, [&result] { return result.index() != 0; });
+		});
+	}
+};
+
+/**
+ * @brief Generic awaitable class, represents a future value that can be co_await-ed on.
+ *
+ * Roughly equivalent of std::future for coroutines, with the crucial distinction that the future does not own a reference to a "shared state".
+ * It holds a non-owning reference to the promise, which must be kept alive for the entire lifetime of the awaitable.
+ *
+ * @tparam T Type of the asynchronous value
+ * @see promise
+ */
+template <typename T>
+class awaitable : public basic_awaitable<awaitable<T>> {
+protected:
+	friend class detail::promise::promise_base<T>;
+
+	using shared_state = detail::promise::promise_base<T>;
+	using state_flags = detail::promise::state_flags;
+
+	/**
+	 * @brief The type of the result produced by this task.
+	 */
+	using result_type = T;
+
+	/**
+	 * @brief Non-owning pointer to the promise, which must be kept alive for the entire lifetime of the awaitable.
+	 */
+	shared_state *state_ptr = nullptr;
+
+	/**
+	 * @brief Construct from a promise.
+	 *
+	 * @param promise The promise to refer to.
+	 */
+	awaitable(shared_state *promise) noexcept : state_ptr{promise} {}
+
+	/**
+	 * @brief Abandons the promise.
+	 *
+	 * Set the promise's state to broken and unlinks this awaitable.
+	 *
+	 * @return uint8_t Flags previously held before setting them to broken
+	 */
+	uint8_t abandon();
+	/**
+	 * @brief Awaiter returned by co_await.
+	 *
+	 * Contains the await_ready, await_suspend and await_resume functions required by the C++ standard.
+	 * This class is CRTP-like, in that it will refer to an object derived from awaitable.
+	 *
+	 * @tparam Derived Type of reference to refer to the awaitable.
+	 */
+	template <typename Derived>
+	struct awaiter {
+		Derived awaitable_obj;
+
+		/**
+		 * @brief First function called by the standard library when co_await-ing this object.
+		 *
+		 * @throws dpp::logic_exception If the awaitable's valid() would return false.
+		 * @return bool Whether the result is ready, in which case we don't need to suspend
+		 */
+		bool await_ready() const;
+
+		/**
+		 * @brief Second function called by the standard library when co_await-ing this object.
+		 *
+		 * @throws dpp::logic_exception If the awaitable's valid() would return false.
+		 * At this point the coroutine frame was allocated and suspended.
+		 *
+		 * @return bool Whether we do need to suspend or not
+		 */
+		bool await_suspend(detail::std_coroutine::coroutine_handle<> handle);
+
+		/**
+		 * @brief Third and final function called by the standard library when co_await-ing this object, after resuming.
+		 *
+		 * @throw ? Any exception that occured during the retrieval of the value will be thrown
+		 * @return T The result.
+		 */
+		T await_resume();
+	};
+
+public:
+	/**
+	 * @brief Construct an empty awaitable.
+	 *
+	 * Such an awaitable must be assigned a promise before it can be awaited.
+	 */
+	awaitable() = default;
+
+	/**
+	 * @brief Copy construction is disabled.
+	 */
+	awaitable(const awaitable&) = delete;
+
+	/**
+	 * @brief Move from another awaitable.
+	 *
+	 * @param rhs The awaitable to move from, left in an unspecified state after this.
+	 */
+	awaitable(awaitable&& rhs) noexcept : state_ptr(std::exchange(rhs.state_ptr, nullptr)) {
+	}
+
+	/**
+	 * @brief Title :)
+	 *
+	 * We use this in the destructor
+	 */
+	void if_this_causes_an_invalid_read_your_promise_was_destroyed_before_your_awaitable____check_your_promise_lifetime() {
+		abandon();
+	}
+
+	/**
+	 * @brief Destructor.
+	 *
+	 * May signal to the promise that it was destroyed.
+	 */
+	~awaitable();
+
+	/**
+	 * @brief Copy assignment is disabled.
+	 */
+	awaitable& operator=(const awaitable&) = delete;
+
+	/**
+	 * @brief Move from another awaitable.
+	 *
+	 * @param rhs The awaitable to move from, left in an unspecified state after this.
+	 * @return *this
+	 */
+	awaitable& operator=(awaitable&& rhs) noexcept {
+		abandon();
+		state_ptr = std::exchange(rhs.state_ptr, nullptr);
+		return *this;
+	}
+
+	/**
+	 * @brief Check whether this awaitable refers to a valid promise.
+	 *
+	 * @return bool Whether this awaitable refers to a valid promise or not
+	 */
+	bool valid() const noexcept;
+
+	/**
+	 * @brief Check whether or not co_await-ing this would suspend the caller, i.e. if we have the result or not
+	 *
+	 * @return bool Whether we already have the result or not
+	 */
+	bool await_ready() const;
+
+	/**
+	 * @brief Overload of the co_await operator.
+	 *
+	 * @return Returns an @ref awaiter referencing this awaitable.
+	 */
+	template <typename Derived>
+	requires (std::is_base_of_v<awaitable, std::remove_cv_t<Derived>>)
+	friend awaiter<Derived&> operator co_await(Derived& obj) noexcept {
+		return {obj};
+	}
+
+	/**
+	 * @brief Overload of the co_await operator. Returns an @ref awaiter referencing this awaitable.
+	 *
+	 * @return Returns an @ref awaiter referencing this awaitable.
+	 */
+	template <typename Derived>
+	requires (std::is_base_of_v<awaitable, std::remove_cv_t<Derived>>)
+	friend awaiter<Derived&&> operator co_await(Derived&& obj) noexcept {
+		return {std::move(obj)};
+	}
+};
+
+namespace detail::promise {
+
+/**
+ * @brief Base class defining logic common to all promise types, aka the "write" end of an awaitable.
+ */
+template <typename T>
+class promise_base {
+protected:
+	friend class awaitable<T>;
+
+	/**
+	 * @brief Variant representing one of either 3 states of the result value : empty, result, exception.
+	 */
+	using storage_type = result_t<T>;
+
+	/**
+	 * @brief State of the result value.
+	 *
+	 * @see storage_type
+	 *
+	 * @note use .index() instead of std::holds_alternative to support promise_base<std::exception_ptr> and promise_base<std::monostate> :)
+	 */
+	storage_type value = std::monostate{};
+
+	/**
+	 * @brief State of the awaitable tied to this promise.
+	 */
+	std::atomic<uint8_t> state = sf_none;
+
+	/**
+	 * @brief Coroutine handle currently awaiting the completion of this promise.
+	 */
+	std_coroutine::coroutine_handle<> awaiter = nullptr;
+
+	/**
+	 * @brief Check if the result is empty, throws otherwise.
+	 *
+	 * @throw dpp::logic_exception if the result isn't empty.
+	 */
+	void throw_if_not_empty() {
+		if (value.index() != 0) [[unlikely]] {
+			throw dpp::logic_exception("cannot set a value on a promise that already has one");
+		}
+	}
+
+	/**
+	 * @brief Unlinks this promise from its currently linked awaiter and returns it.
+	 *
+	 * At the time of writing this is only used in the case of a serious internal error in dpp::task.
+	 * Avoid using this as this will crash if the promise is used after this.
+	 */
+	std_coroutine::coroutine_handle<> release_awaiter() {
+		return std::exchange(awaiter, nullptr);
+	}
+
+	/**
+	 * @brief Construct a new promise, with empty result.
+	 */
+	promise_base() = default;
+
+	/**
+	 * @brief Copy construction is disabled.
+	 */
+	promise_base(const promise_base&) = delete;
+
+	/**
+	 * @brief Move construction is disabled.
+	 *
+	 * awaitable hold a pointer to this object so moving is not possible.
+	 */
+	promise_base(promise_base&& rhs) = delete;
+
+public:
+	/**
+	 * @brief Copy assignment is disabled.
+	 */
+	promise_base &operator=(const promise_base&) = delete;
+
+	/**
+	 * @brief Move assignment is disabled.
+	 */
+	promise_base &operator=(promise_base&& rhs) = delete;
+
+	/**
+	 * @brief Set this promise to an exception and resume any awaiter.
+	 *
+	 * @tparam Notify Whether to resume any awaiter or not.
+	 * @throws dpp::logic_exception if the promise is not empty.
+	 * @throws ? Any exception thrown by the coroutine if resumed will propagate
+	 */
+	template <bool Notify = true>
+	void set_exception(std::exception_ptr ptr) {
+		throw_if_not_empty();
+		value.template emplace<2>(std::move(ptr));
+		[[maybe_unused]] auto previous_value = this->state.fetch_or(sf_ready, std::memory_order_acq_rel);
+		if constexpr (Notify) {
+			if ((previous_value & sf_awaited) != 0) {
+				this->awaiter.resume();
+			}
+		}
+	}
+
+	/**
+	 * @brief Notify a currently awaiting coroutine that the result is ready.
+	 *
+	 * @note This may resume the coroutine on the current thread.
+	 * @throws ? Any exception thrown by the coroutine if resumed will propagate
+	 */
+	void notify_awaiter() {
+		if ((state.load(std::memory_order_acquire) & sf_awaited) != 0) {
+			awaiter.resume();
+		}
+	}
+
+	/**
+	 * @brief Get an awaitable object for this promise.
+	 *
+	 * @throws dpp::logic_exception if get_awaitable has already been called on this object.
+	 * @return awaitable<T> An object that can be co_await-ed to retrieve the value of this promise.
+	 */
+	awaitable<T> get_awaitable() {
+		uint8_t previous_flags = state.fetch_or(sf_has_awaitable, std::memory_order_relaxed);
+		if (previous_flags & sf_has_awaitable) [[unlikely]] {
+			throw dpp::logic_exception{"an awaitable was already created from this promise"};
+		}
+		return { this };
+	}
+};
+
+}
+
+/**
+ * @brief Generic promise class, represents the owning potion of an asynchronous value.
+ *
+ * This class is roughly equivalent to std::promise, with the crucial distinction that the promise *IS* the shared state.
+ * As such, the promise needs to be kept alive for the entire time a value can be retrieved.
+ *
+ * @tparam T Type of the asynchronous value
+ * @see awaitable
+ */
+template <typename T>
+class basic_promise : public detail::promise::promise_base<T> {
+public:
+	using detail::promise::promise_base<T>::promise_base;
+	using detail::promise::promise_base<T>::operator=;
+
+	/**
+	 * @brief Construct the result in place by forwarding the arguments, and by default resume any awaiter.
+	 *
+	 * @tparam Notify Whether to resume any awaiter or not.
+	 * @throws dpp::logic_exception if the promise is not empty.
+	 */
+	template <bool Notify = true, typename... Args>
+	requires (std::constructible_from<T, Args...>)
+	void emplace_value(Args&&... args) {
+		this->throw_if_not_empty();
+		try {
+			this->value.template emplace<1>(std::forward<Args>(args)...);
+		} catch (...) {
+			this->value.template emplace<2>(std::current_exception());
+		}
+		[[maybe_unused]] auto previous_value = this->state.fetch_or(detail::promise::sf_ready, std::memory_order_acq_rel);
+		if constexpr (Notify) {
+			if (previous_value & detail::promise::sf_awaited) {
+				this->awaiter.resume();
+			}
+		}
+	}
+
+	/**
+	 * @brief Construct the result by forwarding reference, and resume any awaiter.
+	 *
+	 * @tparam Notify Whether to resume any awaiter or not.
+	 * @throws dpp::logic_exception if the promise is not empty.
+	 */
+	template <bool Notify = true, typename U = T>
+	requires (std::convertible_to<U&&, T>)
+	void set_value(U&& v) {
+		emplace_value<Notify>(std::forward<U>(v));
+	}
+
+	/**
+	 * @brief Construct a void result, and resume any awaiter.
+	 *
+	 * @tparam Notify Whether to resume any awaiter or not.
+	 * @throws dpp::logic_exception if the promise is not empty.
+	 */
+	template <bool Notify = true>
+	requires (std::is_void_v<T>)
+	void set_value() {
+		this->throw_if_not_empty();
+		this->value.template emplace<1>();
+		[[maybe_unused]] auto previous_value = this->state.fetch_or(detail::promise::sf_ready, std::memory_order_acq_rel);
+		if constexpr (Notify) {
+			if (previous_value & detail::promise::sf_awaited) {
+				this->awaiter.resume();
+			}
+		}
+	}
+};
+
+/**
+ * @brief Generic promise class, represents the owning potion of an asynchronous value.
+ *
+ * This class is roughly equivalent to std::promise, with the crucial distinction that the promise *IS* the shared state.
+ * As such, the promise needs to be kept alive for the entire time a value can be retrieved.
+ *
+ * The difference between basic_promise and this object is that this one is moveable as it wraps an underlying basic_promise in a std::unique_ptr.
+ *
+ * @see awaitable
+ */
+template <typename T>
+class moveable_promise {
+	/**
+	 * @brief Shared state, wrapped in a unique_ptr to allow move without disturbing an awaitable's promise pointer.
+	 */
+	std::unique_ptr<basic_promise<T>> shared_state = std::make_unique<basic_promise<T>>();
+
+public:
+	/**
+	 * @copydoc basic_promise<T>::emplace_value
+	 */
+	template <bool Notify = true, typename... Args>
+	requires (std::constructible_from<T, Args...>)
+	void emplace_value(Args&&... args) {
+		shared_state->template emplace_value<Notify>(std::forward<Args>(args)...);
+	}
+
+	/**
+	 * @copydoc basic_promise<T>::set_value(U&&)
+	 */
+	template <bool Notify = true, typename U = T>
+	void set_value(U&& v) requires (std::convertible_to<U&&, T>) {
+		shared_state->template set_value<Notify>(std::forward<U>(v));
+	}
+
+	/**
+	 * @copydoc basic_promise<T>::set_value()
+	 */
+	template <bool Notify = true>
+	void set_value() requires (std::is_void_v<T>) {
+		shared_state->template set_value<Notify>();
+	}
+
+	/**
+	 * @copydoc basic_promise<T>::set_value(T&&)
+	 */
+	template <bool Notify = true>
+	void set_exception(std::exception_ptr ptr) {
+		shared_state->template set_exception<Notify>(std::move(ptr));
+	}
+
+	/**
+	 * @copydoc basic_promise<T>::notify_awaiter
+	 */
+	void notify_awaiter() {
+		shared_state->notify_awaiter();
+	}
+
+	/**
+	 * @copydoc basic_promise<T>::get_awaitable
+	 */
+	awaitable<T> get_awaitable() {
+		return shared_state->get_awaitable();
+	}
+};
+
+template <typename T>
+using promise = moveable_promise<T>;
+
+template <typename T>
+auto awaitable<T>::abandon() -> uint8_t {
+	uint8_t previous_state = state_flags::sf_broken;
+	if (state_ptr) {
+		previous_state = state_ptr->state.fetch_or(state_flags::sf_broken, std::memory_order_acq_rel);
+		state_ptr = nullptr;
+	}
+	return previous_state;
+}
+
+template <typename T>
+awaitable<T>::~awaitable() {
+	if_this_causes_an_invalid_read_your_promise_was_destroyed_before_your_awaitable____check_your_promise_lifetime();
+}
+
+template <typename T>
+bool awaitable<T>::valid() const noexcept {
+	return state_ptr != nullptr;
+}
+
+template <typename T>
+bool awaitable<T>::await_ready() const {
+	if (!this->valid()) {
+		throw dpp::logic_exception("cannot co_await an empty awaitable");
+	}
+	uint8_t state = this->state_ptr->state.load(std::memory_order_relaxed);
+	return state & detail::promise::sf_ready;
+}
+
+template <typename T>
+template <typename Derived>
+bool awaitable<T>::awaiter<Derived>::await_suspend(detail::std_coroutine::coroutine_handle<> handle) {
+	auto &promise = *awaitable_obj.state_ptr;
+
+	promise.awaiter = handle;
+	auto previous_flags = promise.state.fetch_or(detail::promise::sf_awaited, std::memory_order_relaxed);
+	if (previous_flags & detail::promise::sf_awaited) {
+		throw dpp::logic_exception("awaitable is already being awaited");
+	}
+	return !(previous_flags & detail::promise::sf_ready);
+}
+
+template <typename T>
+template <typename Derived>
+T awaitable<T>::awaiter<Derived>::await_resume() {
+	auto &promise = *awaitable_obj.state_ptr;
+
+	promise.state.fetch_and(static_cast<uint8_t>(~detail::promise::sf_awaited), std::memory_order_acq_rel);
+	if (std::holds_alternative<std::exception_ptr>(promise.value)) {
+		std::rethrow_exception(std::get<2>(promise.value));
+	}
+	if constexpr (!std::is_void_v<T>) {
+		return std::get<1>(std::move(promise.value));
+	} else {
+		return;
+	}
+}
+
+
+
+template <typename T>
+template <typename Derived>
+bool awaitable<T>::awaiter<Derived>::await_ready() const {
+	return static_cast<Derived>(awaitable_obj).await_ready();
+}
+
+}
+
+#include <dpp/coro/job.h>
+
+namespace dpp {
+
+namespace detail::promise {
+
+template <typename T>
+void spawn_sync_wait_job(auto* awaitable, std::condition_variable &cv, auto&& result) {
+	[](auto* awaitable_, std::condition_variable &cv_, auto&& result_) -> dpp::job {
+		try {
+			if constexpr (std::is_void_v<T>) {
+				co_await *awaitable_;
+				result_.template emplace<1>();
+			} else {
+				result_.template emplace<1>(co_await *awaitable_);
+			}
+		} catch (...) {
+			result_.template emplace<2>(std::current_exception());
+		}
+		cv_.notify_all();
+	}(awaitable, cv, std::forward<decltype(result)>(result));
+}
+
+}
+
+}
+
+#endif /* DPP_NO_CORO */
diff --git a/3rdParty/dpp/coro/coro.h b/3rdParty/dpp/coro/coro.h
new file mode 100644
index 0000000000..a6e0f881fa
--- /dev/null
+++ b/3rdParty/dpp/coro/coro.h
@@ -0,0 +1,205 @@
+/************************************************************************************
+ *
+ * D++, A Lightweight C++ library for Discord
+ *
+ * Copyright 2022 Craig Edwards and D++ contributors
+ * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ************************************************************************************/
+
+#pragma once
+
+#include <dpp/export.h>
+
+#ifndef DPP_NO_CORO
+
+#if (defined(_LIBCPP_VERSION) and !defined(__cpp_impl_coroutine)) // if libc++ experimental implementation (LLVM < 14)
+#  define STDCORO_EXPERIMENTAL_HEADER
+#  define STDCORO_EXPERIMENTAL_NAMESPACE
+#endif
+
+#ifdef STDCORO_GLIBCXX_COMPAT
+#  define __cpp_impl_coroutine 1
+namespace std {
+	namespace experimental {
+		using namespace std;
+	}
+}
+#endif
+
+#ifdef STDCORO_EXPERIMENTAL_HEADER
+#  include <experimental/coroutine>
+#else
+#  include <coroutine>
+#endif
+
+namespace dpp {
+
+/**
+ * @brief Implementation details for internal use only.
+ *
+ * @attention This is only meant to be used by D++ internally. Support will not be given regarding the facilities in this namespace.
+ */
+namespace detail {
+#ifdef _DOXYGEN_
+/**
+ * @brief Alias for either std or std::experimental depending on compiler and library. Used by coroutine implementation.
+ *
+ * @todo Remove and use std when all supported libraries have coroutines in it
+ */
+namespace std_coroutine {}
+#else
+#  ifdef STDCORO_EXPERIMENTAL_NAMESPACE
+namespace std_coroutine = std::experimental;
+#  else
+namespace std_coroutine = std;
+#  endif
+#endif
+
+#ifndef _DOXYGEN_
+/**
+ * @brief Concept to check if a type has a useable `operator co_await()` member
+ */
+template <typename T>
+concept has_co_await_member = requires (T expr) { expr.operator co_await(); };
+
+/**
+ * @brief Concept to check if a type has a useable overload of the free function `operator co_await(expr)`
+ */
+template <typename T>
+concept has_free_co_await = requires (T expr) { operator co_await(expr); };
+
+/**
+ * @brief Concept to check if a type has useable `await_ready()`, `await_suspend()` and `await_resume()` member functions.
+ */
+template <typename T>
+concept has_await_members = requires (T expr) { expr.await_ready(); expr.await_suspend(); expr.await_resume(); };
+
+/**
+ * @brief Mimics the compiler's behavior of using co_await. That is, it returns whichever works first, in order : `expr.operator co_await();` > `operator co_await(expr)` > `expr`
+ */
+template <typename T>
+requires (has_co_await_member<T>)
+decltype(auto) co_await_resolve(T&& expr) noexcept(noexcept(expr.operator co_await())) {
+	decltype(auto) awaiter = expr.operator co_await();
+	return awaiter;
+}
+
+/**
+ * @brief Mimics the compiler's behavior of using co_await. That is, it returns whichever works first, in order : `expr.operator co_await();` > `operator co_await(expr)` > `expr`
+ */
+template <typename T>
+requires (!has_co_await_member<T> && has_free_co_await<T>)
+decltype(auto) co_await_resolve(T&& expr) noexcept(noexcept(operator co_await(expr))) {
+	decltype(auto) awaiter = operator co_await(static_cast<T&&>(expr));
+	return awaiter;
+}
+
+/**
+ * @brief Mimics the compiler's behavior of using co_await. That is, it returns whichever works first, in order : `expr.operator co_await();` > `operator co_await(expr)` > `expr`
+ */
+template <typename T>
+requires (!has_co_await_member<T> && !has_free_co_await<T>)
+decltype(auto) co_await_resolve(T&& expr) noexcept {
+	return static_cast<T&&>(expr);
+}
+
+#else
+
+/**
+ * @brief Concept to check if a type has a useable `operator co_await()` member
+ *
+ * @note This is actually a C++20 concept but Doxygen doesn't do well with them
+ */
+template <typename T>
+inline constexpr bool has_co_await_member;
+
+/**
+ * @brief Concept to check if a type has a useable overload of the free function `operator co_await(expr)`
+ *
+ * @note This is actually a C++20 concept but Doxygen doesn't do well with them
+ */
+template <typename T>
+inline constexpr bool has_free_co_await;
+
+/**
+ * @brief Concept to check if a type has useable `await_ready()`, `await_suspend()` and `await_resume()` member functions.
+ *
+ * @note This is actually a C++20 concept but Doxygen doesn't do well with them
+ */
+template <typename T>
+inline constexpr bool has_await_members;
+
+/**
+ * @brief Concept to check if a type can be used with co_await
+ * 
+ * @note This is actually a C++20 concept but Doxygen doesn't do well with them
+ */
+template <typename T>
+inline constexpr bool awaitable_type;
+
+/**
+ * @brief Mimics the compiler's behavior of using co_await. That is, it returns whichever works first, in order : `expr.operator co_await();` > `operator co_await(expr)` > `expr`
+ *
+ * This function is conditionally noexcept, if the returned expression also is.
+ */
+decltype(auto) co_await_resolve(auto&& expr) {}
+
+#endif
+
+/**
+ * @brief Convenience alias for the result of a certain awaitable's await_resume.
+ */
+template <typename T>
+using awaitable_result = decltype(co_await_resolve(std::declval<T>()).await_resume());
+
+} // namespace detail
+
+/**
+ * @brief Concept to check if a type can be used with co_await
+ */
+template <typename T>
+concept awaitable_type = requires (T expr) { detail::co_await_resolve(expr).await_ready(); };
+
+struct confirmation_callback_t;
+
+template <typename R = confirmation_callback_t>
+class async;
+
+template <typename R = void>
+#ifndef _DOXYGEN_
+requires (!std::is_reference_v<R>)
+#endif
+class task;
+
+template <typename R = void>
+class coroutine;
+
+struct job;
+
+#ifdef DPP_CORO_TEST
+/**
+ * @brief Allocation count of a certain type, for testing purposes.
+ *
+ * @todo Remove when coro is stable
+ */
+template <typename T>
+inline int coro_alloc_count = 0;
+#endif
+
+} // namespace dpp
+
+#endif /* DPP_NO_CORO */
+
diff --git a/3rdParty/dpp/coro/coroutine.h b/3rdParty/dpp/coro/coroutine.h
new file mode 100644
index 0000000000..d92ad09eaf
--- /dev/null
+++ b/3rdParty/dpp/coro/coroutine.h
@@ -0,0 +1,406 @@
+/************************************************************************************
+ *
+ * D++, A Lightweight C++ library for Discord
+ *
+ * Copyright 2022 Craig Edwards and D++ contributors
+ * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ************************************************************************************/
+#pragma once
+
+#include <dpp/utility.h>
+
+namespace dpp {
+
+struct coroutine_dummy {
+	int *handle_dummy = nullptr;
+};
+
+}
+
+#ifndef DPP_NO_CORO
+
+#include <dpp/coro/coro.h>
+#include <dpp/coro/awaitable.h>
+
+#include <optional>
+#include <type_traits>
+#include <exception>
+#include <utility>
+#include <type_traits>
+
+namespace dpp {
+
+namespace detail {
+
+namespace coroutine {
+
+template <typename R>
+struct promise_t;
+
+template <typename R>
+/**
+ * @brief Alias for the handle_t of a coroutine.
+ */
+using handle_t = std_coroutine::coroutine_handle<promise_t<R>>;
+
+} // namespace coroutine
+
+} // namespace detail
+
+/**
+ * @class coroutine coroutine.h coro/coroutine.h
+ * @brief Base type for a coroutine, starts on co_await.
+ *
+ * @warning - This feature is EXPERIMENTAL. The API may change at any time and there may be bugs.
+ * Please report any to <a href="https://github.com/brainboxdotcc/DPP/issues">GitHub Issues</a> or to our <a href="https://discord.gg/dpp">Discord Server</a>.
+ * @warning - Using co_await on this object more than once is undefined behavior.
+ * @tparam R Return type of the coroutine. Can be void, or a complete object that supports move construction and move assignment.
+ */
+template <typename R>
+class [[nodiscard("dpp::coroutine only starts when it is awaited, it will do nothing if discarded")]] coroutine : public basic_awaitable<coroutine<R>> {
+	/**
+	 * @brief Promise has friend access for the constructor
+	 */
+	friend struct detail::coroutine::promise_t<R>;
+
+	/**
+	 * @brief Coroutine handle.
+	 */
+	detail::coroutine::handle_t<R> handle{nullptr};
+
+	/**
+	 * @brief Construct from a handle. Internal use only.
+	 */
+	coroutine(detail::coroutine::handle_t<R> h) : handle{h} {}
+
+	struct awaiter {
+		/**
+		 * @brief Reference to the coroutine object being awaited.
+		 */
+		coroutine &coro;
+
+		/**
+		 * @brief First function called by the standard library when the coroutine is co_await-ed.
+		 *
+		 * @remark Do not call this manually, use the co_await keyword instead.
+		 * @throws invalid_operation_exception if the coroutine is empty or finished.
+		 * @return bool Whether the coroutine is done
+		 */
+		[[nodiscard]] bool await_ready() const {
+			if (!coro.handle) {
+				throw dpp::logic_exception("cannot co_await an empty coroutine");
+			}
+			return coro.handle.done();
+		}
+
+		/**
+		 * @brief Second function called by the standard library when the coroutine is co_await-ed.
+		 *
+		 * Stores the calling coroutine in the promise to resume when this coroutine suspends.
+		 *
+		 * @remark Do not call this manually, use the co_await keyword instead.
+		 * @param caller The calling coroutine, now suspended
+		 */
+		template <typename T>
+		[[nodiscard]] detail::coroutine::handle_t<R> await_suspend(detail::std_coroutine::coroutine_handle<T> caller) noexcept {
+			coro.handle.promise().parent = caller;
+			return coro.handle;
+		}
+
+		/**
+		 * @brief Final function called by the standard library when the coroutine is co_await-ed.
+		 *
+		 * Pops the coroutine's result and returns it.
+		 * @remark Do not call this manually, use the co_await keyword instead.
+		 */
+		R await_resume() {
+			detail::coroutine::promise_t<R> &promise = coro.handle.promise();
+			if (promise.exception) {
+				std::rethrow_exception(promise.exception);
+			}
+			if constexpr (!std::is_void_v<R>) {
+				return *std::exchange(promise.result, std::nullopt);
+			} else {
+				return; // unnecessary but makes lsp happy
+			}
+		}
+	};
+
+public:
+	/**
+	 * @brief The type of the result produced by this coroutine.
+	 */
+	using result_type = R;
+
+	/**
+	 * @brief Default constructor, creates an empty coroutine.
+	 */
+	coroutine() = default;
+
+	/**
+	 * @brief Copy constructor is disabled
+	 */
+	coroutine(const coroutine &) = delete;
+
+	/**
+	 * @brief Move constructor, grabs another coroutine's handle
+	 *
+	 * @param other Coroutine to move the handle from
+	 */
+	coroutine(coroutine &&other) noexcept : handle(std::exchange(other.handle, nullptr)) {}
+
+	/**
+	 * @brief Destructor, destroys the handle.
+	 */
+	~coroutine() {
+		if (handle) {
+			handle.destroy();
+		}
+	}
+
+	/**
+	 * @brief Copy assignment is disabled
+	 */
+	coroutine &operator=(const coroutine &) = delete;
+
+	/**
+	 * @brief Move assignment, grabs another coroutine's handle
+	 *
+	 * @param other Coroutine to move the handle from
+	 */
+	coroutine &operator=(coroutine &&other) noexcept {
+		handle = std::exchange(other.handle, nullptr);
+		return *this;
+	}
+	
+	[[nodiscard]] auto operator co_await() {
+		return awaiter{*this};
+	}
+};
+
+namespace detail::coroutine {
+	template <typename R>
+	struct final_awaiter;
+
+#ifdef DPP_CORO_TEST
+	struct promise_t_base{};
+#endif
+
+	/**
+	 * @brief Promise type for coroutine.
+	 */
+	template <typename R>
+	struct promise_t {
+		/**
+		 * @brief Handle of the coroutine co_await-ing this coroutine.
+		 */
+		std_coroutine::coroutine_handle<> parent{nullptr};
+
+		/**
+		 * @brief Return value of the coroutine
+		 */
+		std::optional<R> result{};
+
+		/**
+		 * @brief Pointer to an uncaught exception thrown by the coroutine
+		 */
+		std::exception_ptr exception{nullptr};
+
+#ifdef DPP_CORO_TEST
+		promise_t() {
+			++coro_alloc_count<promise_t_base>;
+		}
+
+		~promise_t() {
+			--coro_alloc_count<promise_t_base>;
+		}
+#endif
+
+		/**
+		 * @brief Function called by the standard library when reaching the end of a coroutine
+		 *
+		 * @return final_awaiter<R> Resumes any coroutine co_await-ing on this
+		 */
+		[[nodiscard]] final_awaiter<R> final_suspend() const noexcept;
+
+		/**
+		 * @brief Function called by the standard library when the coroutine start
+		 *
+		 * @return @return <a href="https://en.cppreference.com/w/cpp/coroutine/suspend_always">std::suspend_always</a> Always suspend at the start, for a lazy start
+		 */
+		[[nodiscard]] std_coroutine::suspend_always initial_suspend() const noexcept {
+			return {};
+		}
+
+		/**
+		 * @brief Function called when an exception escapes the coroutine
+		 *
+		 * Stores the exception to throw to the co_await-er
+		 */
+		void unhandled_exception() noexcept {
+			exception = std::current_exception();
+		}
+
+		/**
+		 * @brief Function called by the standard library when the coroutine co_returns a value.
+		 *
+		 * Stores the value internally to hand to the caller when it resumes.
+		 *
+		 * @param expr The value given to co_return
+		 */
+		void return_value(R&& expr) noexcept(std::is_nothrow_move_constructible_v<R>) requires std::move_constructible<R> {
+			result = static_cast<R&&>(expr);
+		}
+
+		/**
+		 * @brief Function called by the standard library when the coroutine co_returns a value.
+		 *
+		 * Stores the value internally to hand to the caller when it resumes.
+		 *
+		 * @param expr The value given to co_return
+		 */
+		void return_value(const R &expr) noexcept(std::is_nothrow_copy_constructible_v<R>) requires std::copy_constructible<R> {
+			result = expr;
+		}
+
+		/**
+		 * @brief Function called by the standard library when the coroutine co_returns a value.
+		 *
+		 * Stores the value internally to hand to the caller when it resumes.
+		 *
+		 * @param expr The value given to co_return
+		 */
+		template <typename T>
+		requires (!std::is_same_v<R, std::remove_cvref_t<T>> && std::convertible_to<T, R>)
+		void return_value(T&& expr) noexcept (std::is_nothrow_convertible_v<T, R>) {
+			result = std::forward<T>(expr);
+		}
+
+		/**
+		 * @brief Function called to get the coroutine object
+		 */
+		dpp::coroutine<R> get_return_object() {
+			return dpp::coroutine<R>{handle_t<R>::from_promise(*this)};
+		}
+	};
+
+	/**
+	 * @brief Struct returned by a coroutine's final_suspend, resumes the continuation
+	 */
+	template <typename R>
+	struct final_awaiter {
+		/**
+		 * @brief First function called by the standard library when reaching the end of a coroutine
+		 *
+		 * @return false Always return false, we need to suspend to resume the parent
+		 */
+		[[nodiscard]] bool await_ready() const noexcept {
+			return false;
+		}
+
+		/**
+		 * @brief Second function called by the standard library when reaching the end of a coroutine.
+		 *
+		 * @return std::handle_t<> Coroutine handle to resume, this is either the parent if present or std::noop_coroutine()
+		 */
+		[[nodiscard]] std_coroutine::coroutine_handle<> await_suspend(std_coroutine::coroutine_handle<promise_t<R>> handle) const noexcept {
+			auto parent = handle.promise().parent;
+
+			return parent ? parent : std_coroutine::noop_coroutine();
+		}
+
+		/**
+		 * @brief Function called by the standard library when this object is resumed
+		 */
+		void await_resume() const noexcept {}
+	};
+
+	template <typename R>
+	final_awaiter<R> promise_t<R>::final_suspend() const noexcept {
+		return {};
+	}
+
+	/**
+	 * @brief Struct returned by a coroutine's final_suspend, resumes the continuation
+	 */
+	template <>
+	struct promise_t<void> {
+		/**
+		 * @brief Handle of the coroutine co_await-ing this coroutine.
+		 */
+		std_coroutine::coroutine_handle<> parent{nullptr};
+
+		/**
+		 * @brief Pointer to an uncaught exception thrown by the coroutine
+		 */
+		std::exception_ptr exception{nullptr};
+
+		/**
+		 * @brief Function called by the standard library when reaching the end of a coroutine
+		 *
+		 * @return final_awaiter<R> Resumes any coroutine co_await-ing on this
+		 */
+		[[nodiscard]] final_awaiter<void> final_suspend() const noexcept {
+			return {};
+		}
+
+		/**
+		 * @brief Function called by the standard library when the coroutine start
+		 *
+		 * @return @return <a href="https://en.cppreference.com/w/cpp/coroutine/suspend_always">std::suspend_always</a> Always suspend at the start, for a lazy start
+		 */
+		[[nodiscard]] std_coroutine::suspend_always initial_suspend() const noexcept {
+			return {};
+		}
+
+		/**
+		 * @brief Function called when an exception escapes the coroutine
+		 *
+		 * Stores the exception to throw to the co_await-er
+		 */
+		void unhandled_exception() noexcept {
+			exception = std::current_exception();
+		}
+
+		/**
+		 * @brief Function called when co_return is used
+		 */
+		void return_void() const noexcept {}
+
+		/**
+		 * @brief Function called to get the coroutine object
+		 */
+		[[nodiscard]] dpp::coroutine<void> get_return_object() {
+			return dpp::coroutine<void>{handle_t<void>::from_promise(*this)};
+		}
+	};
+
+} // namespace detail
+
+DPP_CHECK_ABI_COMPAT(coroutine<void>, coroutine_dummy)
+DPP_CHECK_ABI_COMPAT(coroutine<uint64_t>, coroutine_dummy)
+
+}
+
+/**
+ * @brief Specialization of std::coroutine_traits, helps the standard library figure out a promise type from a coroutine function.
+ */
+template<typename R, typename... Args>
+struct dpp::detail::std_coroutine::coroutine_traits<dpp::coroutine<R>, Args...> {
+	using promise_type = dpp::detail::coroutine::promise_t<R>;
+};
+
+#endif /* DPP_NO_CORO */
diff --git a/3rdParty/dpp/coro/job.h b/3rdParty/dpp/coro/job.h
new file mode 100644
index 0000000000..eb9290cc90
--- /dev/null
+++ b/3rdParty/dpp/coro/job.h
@@ -0,0 +1,145 @@
+/************************************************************************************
+ *
+ * D++, A Lightweight C++ library for Discord
+ *
+ * Copyright 2022 Craig Edwards and D++ contributors
+ * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ************************************************************************************/
+#pragma once
+
+#include <dpp/utility.h>
+
+namespace dpp {
+
+struct job_dummy {
+};
+
+}
+
+#ifndef DPP_NO_CORO
+
+#include "coro.h"
+
+#include <type_traits>
+#include <utility>
+
+namespace dpp {
+
+/**
+ * @class job job.h coro/job.h
+ * @brief Extremely light coroutine object designed to send off a coroutine to execute on its own.
+ * Can be used in conjunction with coroutine events via @ref dpp::event_router_t::operator()(F&&) "event routers", or on its own.
+ *
+ * This object stores no state and is the recommended way to use coroutines if you do not need to co_await the result.
+ *
+ * @warning - This feature is EXPERIMENTAL. The API may change at any time and there may be bugs.
+ * Please report any to <a href="https://github.com/brainboxdotcc/DPP/issues">GitHub Issues</a> or to our <a href="https://discord.gg/dpp">Discord Server</a>.
+ * @warning - It cannot be co_awaited, which means the second it co_awaits something, the program jumps back to the calling function, which continues executing.
+ * At this point, if the function returns, every object declared in the function including its parameters are destroyed, which causes @ref lambdas-and-locals "dangling references".
+ * For this reason, `co_await` will error if any parameters are passed by reference.
+ * If you must pass a reference, pass it as a pointer or with std::ref, but you must fully understand the reason behind this warning, and what to avoid.
+ * If you prefer a safer type, use `coroutine` for synchronous execution, or `task` for parallel tasks, and co_await them.
+ */
+struct job {};
+
+namespace detail {
+
+namespace job {
+
+#ifdef DPP_CORO_TEST
+	struct promise{};
+#endif
+
+/**
+ * @brief Coroutine promise type for a job
+ */
+template <typename... Args>
+struct promise {
+
+#ifdef DPP_CORO_TEST
+	promise() {
+		++coro_alloc_count<job_promise_base>;
+	}
+
+	~promise() {
+		--coro_alloc_count<job_promise_base>;
+	}
+#endif
+
+	/**
+	 * @brief Function called when the job is done.
+	 *
+	 * @return <a href="https://en.cppreference.com/w/cpp/coroutine/suspend_never">std::suspend_never</a> Do not suspend at the end, destroying the handle immediately
+	 */
+	std_coroutine::suspend_never final_suspend() const noexcept {
+		return {};
+	}
+
+	/**
+	 * @brief Function called when the job is started.
+	 *
+	 * @return <a href="https://en.cppreference.com/w/cpp/coroutine/suspend_never">std::suspend_never</a> Do not suspend at the start, starting the job immediately
+	 */
+	std_coroutine::suspend_never initial_suspend() const noexcept {
+		return {};
+	}
+
+	/**
+	 * @brief Function called to get the job object
+	 *
+	 * @return job
+	 */
+	dpp::job get_return_object() const noexcept {
+		return {};
+	}
+
+	/**
+	 * @brief Function called when an exception is thrown and not caught.
+	 *
+	 * @throw Immediately rethrows the exception to the caller / resumer
+	 */
+	void unhandled_exception() const {
+		throw;
+	}
+
+	/**
+	 * @brief Function called when the job returns. Does nothing.
+	 */
+	void return_void() const noexcept {}
+};
+
+} // namespace job
+
+} // namespace detail
+
+DPP_CHECK_ABI_COMPAT(job, job_dummy)
+} // namespace dpp
+
+/**
+ * @brief Specialization of std::coroutine_traits, helps the standard library figure out a promise type from a coroutine function.
+ */
+template<typename... Args>
+struct dpp::detail::std_coroutine::coroutine_traits<dpp::job, Args...> {
+	/**
+	 * @brief Promise type for this coroutine signature.
+	 *
+	 * When the coroutine is created from a lambda, that lambda is passed as a first parameter.
+	 * Not ideal but we'll allow any callable that takes the rest of the arguments passed
+	 */
+	using promise_type = dpp::detail::job::promise<Args...>;
+};
+
+#endif /* DPP_NO_CORO */
diff --git a/3rdParty/dpp/coro/task.h b/3rdParty/dpp/coro/task.h
new file mode 100644
index 0000000000..2a4ad35155
--- /dev/null
+++ b/3rdParty/dpp/coro/task.h
@@ -0,0 +1,446 @@
+/************************************************************************************
+ *
+ * D++, A Lightweight C++ library for Discord
+ *
+ * Copyright 2022 Craig Edwards and D++ contributors
+ * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ************************************************************************************/
+#pragma once
+
+#include <dpp/utility.h>
+#include <dpp/coro/awaitable.h>
+
+namespace dpp {
+
+struct task_dummy : awaitable_dummy {
+	int* handle_dummy = nullptr;
+};
+
+}
+
+#ifndef DPP_NO_CORO
+
+#include <dpp/coro/coro.h>
+
+#include <utility>
+#include <type_traits>
+#include <optional>
+#include <functional>
+#include <mutex>
+#include <exception>
+#include <atomic>
+
+#include <iostream> // std::cerr in final_suspend
+
+namespace dpp {
+
+namespace detail {
+
+/* Internal cogwheels for dpp::task */
+namespace task {
+
+/**
+ * @brief A @ref dpp::task "task"'s promise_t type, with special logic for handling nested tasks.
+ *
+ * @tparam R Return type of the task
+ */
+template <typename R>
+struct promise_t;
+
+/**
+ * @brief The object automatically co_await-ed at the end of a @ref dpp::task "task". Ensures nested coroutine chains are resolved, and the promise_t cleans up if it needs to.
+ *
+ * @tparam R Return type of the task
+ */
+template <typename R>
+struct final_awaiter;
+
+/**
+ * @brief Alias for <a href="https://en.cppreference.com/w/cpp/coroutine/coroutine_handle"std::coroutine_handle</a> for a @ref dpp::task "task"'s @ref promise_t.
+ *
+ * @tparam R Return type of the task
+ */
+template <typename R>
+using handle_t = std_coroutine::coroutine_handle<promise_t<R>>;
+
+} // namespace task
+
+} // namespace detail
+
+/**
+ * @class task task.h coro/task.h
+ * @brief A coroutine task. It starts immediately on construction and can be co_await-ed, making it perfect for parallel coroutines returning a value.
+ *
+ * @warning - This feature is EXPERIMENTAL. The API may change at any time and there may be bugs.
+ * Please report any to <a href="https://github.com/brainboxdotcc/DPP/issues">GitHub Issues</a> or to our <a href="https://discord.gg/dpp">Discord Server</a>.
+ * @tparam R Return type of the task. Cannot be a reference but can be void.
+ */
+template <typename R>
+#ifndef _DOXYGEN_
+requires (!std::is_reference_v<R>)
+#endif
+class [[nodiscard("dpp::task cancels itself on destruction. use co_await on it, or its sync_wait method")]] task : public awaitable<R> {
+	friend struct detail::task::promise_t<R>;
+
+	using handle_t = detail::task::handle_t<R>;
+	using state_flags = detail::promise::state_flags;
+
+	handle_t handle{};
+
+protected:
+	/**
+	 * @brief Construct from a coroutine handle. Internal use only
+	 */
+	explicit task(handle_t handle_) : awaitable<R>(&handle_.promise()), handle(handle_) {}
+
+	/**
+	 * @brief Clean up our handle, cancelling any running task
+	 */
+	void cleanup() {
+		if (handle && this->valid()) {
+			if (this->abandon() & state_flags::sf_done) {
+				handle.destroy();
+			} else {
+				cancel();
+			}
+			handle = nullptr;
+		}
+	}
+
+public:
+	/**
+	 * @brief Default constructor, creates a task not bound to a coroutine.
+	 */
+	task() = default;
+
+	/**
+	 * @brief Copy constructor is disabled
+	 */
+	task(const task &) = delete;
+
+	/**
+	 * @brief Move constructor, grabs another task's coroutine handle
+	 *
+	 * @param other Task to move the handle from
+	 */
+	task(task &&other) noexcept : awaitable<R>(std::move(other)), handle(std::exchange(other.handle, nullptr)) {}
+
+	/**
+	 * @brief Copy assignment is disabled
+	 */
+	task &operator=(const task &) = delete;
+
+	/**
+	 * @brief Move assignment, grabs another task's coroutine handle
+	 *
+	 * @param other Task to move the handle from
+	 */
+	task &operator=(task &&other) noexcept {
+		cleanup();
+		handle = std::exchange(other.handle, nullptr);
+		awaitable<R>::operator=(std::move(other));
+		return *this;
+	}
+
+	/**
+	 * @brief Destructor.
+	 *
+	 * Destroys the handle. If the task is still running, it will be cancelled.
+	 */
+	~task() {
+		cleanup();
+	}
+
+	/**
+	 * @brief Function to check if the task has finished its execution entirely
+	 *
+	 * @return bool Whether the task is finished.
+	 */
+	[[nodiscard]] bool done() const noexcept {
+		return handle && (!this->valid() || handle.promise().state.load(std::memory_order_acq_rel) == state_flags::sf_done);
+	}
+
+	/**
+	 * @brief Cancel the task, it will stop the next time it uses co_await. On co_await-ing this task, throws dpp::task_cancelled_exception.
+	 *
+	 * @return *this
+	 */
+	task& cancel() & noexcept {
+		handle.promise().cancelled.exchange(true, std::memory_order_relaxed);
+		return *this;
+	}
+
+	/**
+	 * @brief Cancel the task, it will stop the next time it uses co_await. On co_await-ing this task, throws dpp::task_cancelled_exception.
+	 *
+	 * @return *this
+	 */
+	task&& cancel() && noexcept {
+		handle.promise().cancelled.exchange(true, std::memory_order_relaxed);
+		return *this;
+	}
+};
+
+namespace detail::task {
+/**
+ * @brief Awaitable returned from task::promise_t's final_suspend. Resumes the parent and cleans up its handle if needed
+ */
+template <typename R>
+struct final_awaiter {
+	/**
+	 * @brief Always suspend at the end of the task. This allows us to clean up and resume the parent
+	 */
+	[[nodiscard]] bool await_ready() const noexcept {
+		return (false);
+	}
+
+	/**
+	 * @brief The suspension logic of the coroutine when it finishes. Always suspend the caller, meaning cleaning up the handle is on us
+	 *
+	 * @param handle The handle of this coroutine
+	 * @return std::coroutine_handle<> Handle to resume, which is either the parent if present or std::noop_coroutine() otherwise
+	 */
+	[[nodiscard]] std_coroutine::coroutine_handle<> await_suspend(handle_t<R> handle) const noexcept;
+
+	/**
+	 * @brief Function called when this object is co_awaited by the standard library at the end of final_suspend. Do nothing, return nothing
+	 */
+	void await_resume() const noexcept {}
+};
+
+/**
+ * @brief Base implementation of task::promise_t, without the logic that would depend on the return type. Meant to be inherited from
+ */
+template <typename R>
+struct promise_base : basic_promise<R> {
+	/**
+	 * @brief Whether the task is cancelled or not.
+	 */
+	std::atomic<bool> cancelled = false;
+
+#ifdef DPP_CORO_TEST
+	promise_base() {
+		++coro_alloc_count<promise_base>;
+	}
+
+	~promise_base() {
+		--coro_alloc_count<promise_base>;
+	}
+#endif
+
+	/**
+	 * @brief Function called by the standard library when the coroutine is created.
+	 *
+	 * @return <a href="https://en.cppreference.com/w/cpp/coroutine/suspend_never">std::suspend_never</a> Don't suspend, the coroutine starts immediately.
+	 */
+	std_coroutine::suspend_never initial_suspend() const noexcept {
+		return {};
+	}
+
+	/**
+	 * @brief Function called by the standard library when an exception is thrown and not caught in the coroutine.
+	 *
+	 * Stores the exception pointer to rethrow on co_await. If the task object is destroyed and was not cancelled, throw instead
+	 */
+	void unhandled_exception() {
+		if ((this->state.load() & promise::state_flags::sf_broken) && !cancelled) {
+			throw;
+		}
+		this->template set_exception<false>(std::current_exception());
+	}
+
+	/**
+	 * @brief Proxy awaitable that wraps any co_await inside the task and checks for cancellation on resumption
+	 *
+	 * @see await_transform
+	 */
+	template <typename A>
+	struct proxy_awaiter {
+		/** @brief The promise_t object bound to this proxy */
+		const promise_base &promise;
+
+		/** @brief The inner awaitable being awaited */
+		A awaitable;
+
+		/** @brief Wrapper for the awaitable's await_ready */
+		[[nodiscard]] bool await_ready() noexcept(noexcept(awaitable.await_ready())) {
+			return awaitable.await_ready();
+		}
+
+		/** @brief Wrapper for the awaitable's await_suspend */
+		template <typename T>
+		[[nodiscard]] decltype(auto) await_suspend(T handle) noexcept(noexcept(awaitable.await_suspend(std::move(handle)))) {
+			return awaitable.await_suspend(std::move(handle));
+		}
+
+		/**
+		 * @brief Wrapper for the awaitable's await_resume, throws if the task is cancelled
+		 *
+		 * @throw dpp::task_cancelled_exception If the task was cancelled
+		 */
+		decltype(auto) await_resume() {
+			if (promise.cancelled.load()) {
+				throw dpp::task_cancelled_exception{"task was cancelled"};
+			}
+			return awaitable.await_resume();
+		}
+	};
+
+	/**
+	 * @brief Function called whenever co_await is used inside of the task
+	 *
+	 * @throw dpp::task_cancelled_exception On resumption if the task was cancelled
+	 *
+	 * @return @ref proxy_awaiter Returns a proxy awaiter that will check for cancellation on resumption
+	 */
+	template <awaitable_type T>
+	[[nodiscard]] auto await_transform(T&& expr) const noexcept(noexcept(co_await_resolve(std::forward<T>(expr)))) {
+		using awaitable_t = decltype(co_await_resolve(std::forward<T>(expr)));
+		return proxy_awaiter<awaitable_t>{*this, co_await_resolve(std::forward<T>(expr))};
+	}
+};
+
+/**
+ * @brief Implementation of task::promise_t for non-void return type
+ */
+template <typename R>
+struct promise_t : promise_base<R> {
+	friend struct final_awaiter<R>;
+
+	/**
+	 * @brief Function called by the standard library when the coroutine co_returns a value.
+	 *
+	 * Stores the value internally to hand to the caller when it resumes.
+	 *
+	 * @param expr The value given to co_return
+	 */
+	void return_value(R&& expr) noexcept(std::is_nothrow_move_constructible_v<R>) requires std::move_constructible<R> {
+		this->template set_value<false>(std::move(expr));
+	}
+
+	/**
+	 * @brief Function called by the standard library when the coroutine co_returns a value.
+	 *
+	 * Stores the value internally to hand to the caller when it resumes.
+	 *
+	 * @param expr The value given to co_return
+	 */
+	void return_value(const R &expr) noexcept(std::is_nothrow_copy_constructible_v<R>) requires std::copy_constructible<R> {
+		this->template set_value<false>(expr);
+	}
+
+	/**
+	 * @brief Function called by the standard library when the coroutine co_returns a value.
+	 *
+	 * Stores the value internally to hand to the caller when it resumes.
+	 *
+	 * @param expr The value given to co_return
+	 */
+	template <typename T>
+	requires (!std::is_same_v<R, std::remove_cvref_t<T>> && std::convertible_to<T, R>)
+	void return_value(T&& expr) noexcept (std::is_nothrow_convertible_v<T, R>) {
+		this->template emplace_value<false>(std::forward<T>(expr));
+	}
+
+	/**
+	 * @brief Function called by the standard library when the coroutine is created.
+	 *
+	 * @return dpp::task The coroutine object
+	 */
+	[[nodiscard]] dpp::task<R> get_return_object() noexcept {
+		return dpp::task<R>{handle_t<R>::from_promise(*this)};
+	}
+
+	/**
+	 * @brief Function called by the standard library when the coroutine reaches its last suspension point
+	 *
+	 * @return final_awaiter Special object containing the chain resolution and clean-up logic.
+	 */
+	[[nodiscard]] final_awaiter<R> final_suspend() const noexcept {
+		return {};
+	}
+};
+
+/**
+ * @brief Implementation of task::promise_t for void return type
+ */
+template <>
+struct promise_t<void> : promise_base<void> {
+	friend struct final_awaiter<void>;
+
+	/**
+	 * @brief Function called by the standard library when the coroutine co_returns
+	 *
+	 * Sets the promise state to finished.
+	 */
+	void return_void() noexcept {
+		set_value<false>();
+	}
+
+	/**
+	 * @brief Function called by the standard library when the coroutine is created.
+	 *
+	 * @return task The coroutine object
+	 */
+	[[nodiscard]] dpp::task<void> get_return_object() noexcept {
+		return dpp::task<void>{handle_t<void>::from_promise(*this)};
+	}
+
+	/**
+	 * @brief Function called by the standard library when the coroutine reaches its last suspension point
+	 *
+	 * @return final_awaiter Special object containing the chain resolution and clean-up logic.
+	 */
+	[[nodiscard]] final_awaiter<void> final_suspend() const noexcept {
+		return {};
+	}
+};
+
+template <typename R>
+std_coroutine::coroutine_handle<> final_awaiter<R>::await_suspend(handle_t<R> handle) const noexcept {
+	using state_flags = promise::state_flags;
+	promise_t<R> &promise = handle.promise();
+	uint8_t previous_state = promise.state.fetch_or(state_flags::sf_done);
+
+	if ((previous_state & state_flags::sf_awaited) != 0) { // co_await-ed, resume parent
+		if ((previous_state & state_flags::sf_broken) != 0) { // major bug, these should never be set together
+			// we don't have a cluster so just log it on cerr
+			std::cerr << "dpp: task promise ended in both an awaited and dangling state. this is a bug and a memory leak, please report it to us!" << std::endl;
+		}
+		return promise.release_awaiter();
+	}
+	if ((previous_state & state_flags::sf_broken) != 0) { // task object is gone, free the handle
+		handle.destroy();
+	}
+	return std_coroutine::noop_coroutine();
+}
+
+} // namespace detail::task
+
+DPP_CHECK_ABI_COMPAT(task<void>, task_dummy)
+DPP_CHECK_ABI_COMPAT(task<uint64_t>, task_dummy)
+
+}
+
+/**
+ * @brief Specialization of std::coroutine_traits, helps the standard library figure out a promise_t type from a coroutine function.
+ */
+template<typename T, typename... Args>
+struct dpp::detail::std_coroutine::coroutine_traits<dpp::task<T>, Args...> {
+	using promise_type = dpp::detail::task::promise_t<T>;
+};
+
+#endif /* DPP_NO_CORO */
diff --git a/3rdParty/dpp/coro/when_any.h b/3rdParty/dpp/coro/when_any.h
new file mode 100644
index 0000000000..fe29cc50f8
--- /dev/null
+++ b/3rdParty/dpp/coro/when_any.h
@@ -0,0 +1,536 @@
+/************************************************************************************
+ *
+ * D++, A Lightweight C++ library for Discord
+ *
+ * Copyright 2022 Craig Edwards and D++ contributors
+ * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ************************************************************************************/
+
+#ifndef DPP_NO_CORO
+#pragma once
+
+#include "coro.h"
+#include "job.h"
+
+#include <atomic>
+#include <array>
+#include <memory>
+#include <limits>
+#include <optional>
+
+namespace dpp {
+
+template <typename T>
+class event_router_t;
+
+namespace detail {
+
+namespace event_router {
+
+template <typename T>
+class awaitable;
+
+}
+
+/**
+ * @brief Internal cogwheels for dpp::when_any
+ */
+namespace when_any {
+
+/**
+ * @brief Current state of a when_any object
+ */
+enum await_state : uint8_t {
+	/**
+	 * @brief Object is being awaited
+	 */
+	waiting = 1 << 0,
+	/**
+	 * @brief Object was resumed
+	 */
+	done = 1 << 1,
+	/**
+	 * @brief Result is ready to retrieve
+	 */
+	ready = 1 << 2,
+	/**
+	 * @brief Object was destroyed
+	 */
+	dangling = 1 << 3
+};
+
+/**
+ * @brief Type trait helper to obtain the actual type that will be used by a when_any when a type is passed as a parameter.
+ * May specialize for certain types for specific behavior, e.g. for an event_router, store the awaitable directly
+ */
+template <typename T>
+struct arg_helper_s {
+	/** Raw type of the awaitable */
+	using type = T;
+
+	/** Helper static method to get the awaitable from a variable */
+	static decltype(auto) get(auto&& v) {
+		return static_cast<decltype(v)>(v);
+	}
+};
+
+template <typename T>
+struct arg_helper_s<dpp::event_router_t<T>> {
+	using type = event_router::awaitable<T>;
+
+	template <typename U>
+#ifndef _DOXYGEN
+	requires (std::same_as<std::remove_cvref_t<U>, dpp::event_router_t<T>>)
+#endif
+	static event_router::awaitable<T> get(U&& v) {
+		return static_cast<U>(v).operator co_await();
+	}
+};
+
+/**
+ * @brief Alias for the actual type that an awaitable will be stored as in a when_any.
+ * For example if given an event_router, store the awaitable, not the event_router.
+ */
+template <typename T>
+using awaitable_type = typename arg_helper_s<T>::type;
+
+/**
+ * @brief Helper struct with a method to convert an awaitable parameter to the actual value it will be stored as.
+ * For example if given an event_router, store the awaitable, not the event_router.
+ */
+template <typename T>
+using arg_helper = arg_helper_s<std::remove_cvref_t<T>>;
+
+/**
+ * @brief Empty result from void-returning awaitable
+ */
+struct empty{};
+
+/**
+ * @brief Actual type a result will be stores as in when_any
+ */
+template <typename T>
+using storage_type = std::conditional_t<std::is_void_v<T>, empty, T>;
+
+/**
+ * @brief Concept satisfied if a stored result is void
+ */
+template <typename T>
+concept void_result = std::same_as<T, empty>;
+
+}
+
+} // namespace detail
+
+/**
+ * @class when_any when_any.h coro/when_any.h
+ * @brief Experimental class to co_await on a bunch of awaitable objects, resuming when the first one completes.
+ * On completion, returns a @ref result object that contains the index of the awaitable that finished first.
+ * A user can call @ref result::index() and @ref result::get<N>() on the result object to get the result, similar to std::variant.
+ *
+ * @see when_any::result
+ * @tparam Args... Type of each awaitable to await on
+ */
+template <typename... Args>
+#ifndef _DOXYGEN_
+requires (sizeof...(Args) >= 1)
+#endif
+class when_any {
+	/**
+	 * @brief Alias for the type of the result variant
+	 */
+	using variant_type = std::variant<std::exception_ptr, std::remove_cvref_t<detail::when_any::storage_type<detail::awaitable_result<Args>>>...>;
+
+	/**
+	 * @brief Alias for the result type of the Nth arg.
+	 *
+	 * @tparam N index of the argument to fetch
+	 */
+	template <size_t N>
+	using result_t = std::variant_alternative_t<N + 1, variant_type>;
+
+	/**
+	 * @brief State shared between all the jobs to spawn
+	 */
+	struct state_t {
+		/**
+		 * @brief Constructor for the internal state. Its arguments are used to construct each awaitable
+		 */
+		template <typename... Args_>
+		state_t(Args_&&... args) : awaitables{std::forward<Args_>(args)...} {}
+
+		/**
+		 * @brief Awaitable objects to handle.
+		 */
+		std::tuple<Args...> awaitables;
+
+		/**
+		 * @brief Result or exception, as a variant. This will contain the result of the first awaitable to finish
+		 */
+		variant_type result{};
+
+		/**
+		 * @brief Coroutine handle to resume after finishing an awaitable
+		 */
+		detail::std_coroutine::coroutine_handle<> handle{};
+
+		/**
+		 * @brief Index of the awaitable that finished. Initialized to the maximum value of std::size_t.
+		 */
+		size_t index_finished = std::numeric_limits<std::size_t>::max();
+
+		/**
+		 * @brief State of the when_any object.
+		 *
+		 * @see detail::when_any::await_state
+		 */
+		std::atomic<uint8_t> owner_state{};
+	};
+
+	/**
+	 * @brief Shared pointer to the state shared between the jobs spawned. Contains the awaitable objects and the result.
+	 */
+	std::shared_ptr<state_t> my_state{nullptr};
+
+	/**
+	 * @brief Spawn a dpp::job handling the Nth argument.
+	 *
+	 * @tparam N Index of the argument to handle
+	 * @return dpp::job Job handling the Nth argument
+	 */
+	template <size_t N>
+	static job make_job(std::shared_ptr<state_t> shared_state) {
+		using namespace detail::when_any;
+		
+		/**
+		 * Any exceptions from the awaitable's await_suspend should be thrown to the caller (the coroutine creating the when_any object)
+		 * If the co_await passes, and it is the first one to complete, try construct the result, catch any exceptions to rethrow at resumption, and resume.
+		 */
+		if constexpr (!std::same_as<result_t<N>, empty>) {
+			decltype(auto) result = co_await std::get<N>(shared_state->awaitables);
+
+			if (auto s = shared_state->owner_state.fetch_or(await_state::done, std::memory_order_relaxed); (s & (await_state::done | await_state::dangling)) != 0) {
+				co_return;
+			}
+
+			using result_t = decltype(result);
+
+			/* Try construct, prefer move if possible, store any exception to rethrow */
+			try	{
+				if constexpr (std::is_lvalue_reference_v<result_t> && !std::is_const_v<result_t> && std::is_move_constructible_v<std::remove_cvref_t<result_t>>) {
+					shared_state->result.template emplace<N + 1>(std::move(result));
+				} else {
+					shared_state->result.template emplace<N + 1>(result);
+				}
+			} catch (...) {
+				shared_state->result.template emplace<0>(std::current_exception());
+			}
+		} else {
+			co_await std::get<N>(shared_state->awaitables);
+			
+			if (auto s = shared_state->owner_state.fetch_or(await_state::done, std::memory_order_relaxed); (s & (await_state::done | await_state::dangling)) != 0) {
+				co_return;
+			}
+
+			shared_state->result.template emplace<N + 1>();
+		}
+
+		shared_state->index_finished = N;
+		if (auto s = shared_state->owner_state.fetch_or(await_state::ready, std::memory_order_acq_rel); (s & (await_state::waiting)) != 0) {
+			assert(shared_state->handle);
+			shared_state->handle.resume();
+		}
+	}
+
+	/**
+	 * @brief Spawn a dpp::job to handle each awaitable.
+	 * Each of them will co_await the awaitable and set the result if they are the first to finish
+	 */
+	void make_jobs() {
+		constexpr auto impl = []<size_t... Ns>(when_any *self, std::index_sequence<Ns...>) {
+			// We create an array to guarantee evaluation order here
+			// https://eel.is/c++draft/dcl.init.aggr#7
+			[[maybe_unused]] dpp::job jobs[] = { make_job<Ns>(self->my_state)... };
+		};
+		impl(this, std::index_sequence_for<Args...>{});
+	}
+
+public:
+	/**
+	 * @brief Object returned by \ref operator co_await() on resumption. Can be moved but not copied.
+	 */
+	class result {
+		friend class when_any<Args...>;
+
+		/**
+		 * @brief Reference to the shared state to pull the data from
+		 */
+		std::shared_ptr<state_t> shared_state;
+
+		/**
+		 * @brief Default construction is deleted
+		 */
+		result() = delete;
+
+		/**
+		 * @brief Internal constructor taking the shared state
+		 */
+		result(std::shared_ptr<state_t> state) : shared_state{state} {}
+
+	public:
+		/**
+		 * @brief Move constructor
+		 */
+		result(result&&) = default;
+
+		/**
+		 * @brief This object is not copyable.
+		 */
+		result(const result &) = delete;
+
+		/**
+		 * @brief Move assignment operator
+		 */
+		result &operator=(result&&) = default;
+
+		/**
+		 * @brief This object is not copyable.
+		 */
+		result &operator=(const result&) = delete;
+
+		/**
+		 * @brief Retrieve the index of the awaitable that finished first.
+		 *
+		 * @return size_t Index of the awaitable that finished first, relative to the template arguments of when_any
+		 */
+		size_t index() const noexcept {
+			return shared_state->index_finished;
+		}
+
+		/**
+		 * @brief Retrieve the non-void result of an awaitable.
+		 *
+		 * @tparam N Index of the result to retrieve. Must correspond to index().
+		 * @throw ??? Throws any exception triggered at construction, or std::bad_variant_access if N does not correspond to index()
+		 * @return Result of the awaitable as a reference.
+		 */
+		template <size_t N>
+#ifndef _DOXYGEN_
+		requires (!detail::when_any::void_result<result_t<N>>)
+#endif
+		result_t<N>& get() & {
+			if (is_exception()) {
+				std::rethrow_exception(std::get<0>(shared_state->result));
+			}
+			return std::get<N + 1>(shared_state->result);
+		}
+
+		/**
+		 * @brief Retrieve the non-void result of an awaitable.
+		 *
+		 * @tparam N Index of the result to retrieve. Must correspond to index().
+		 * @throw ??? Throws any exception triggered at construction, or std::bad_variant_access if N does not correspond to index()
+		 * @return Result of the awaitable as a cpnst reference.
+		 */
+		template <size_t N>
+#ifndef _DOXYGEN_
+		requires (!detail::when_any::void_result<result_t<N>>)
+#endif
+		const result_t<N>& get() const& {
+			if (is_exception()) {
+				std::rethrow_exception(std::get<0>(shared_state->result));
+			}
+			return std::get<N + 1>(shared_state->result);
+		}
+
+		/**
+		 * @brief Retrieve the non-void result of an awaitable.
+		 *
+		 * @tparam N Index of the result to retrieve. Must correspond to index().
+		 * @throw ??? Throws any exception triggered at construction, or std::bad_variant_access if N does not correspond to index()
+		 * @return Result of the awaitable as an rvalue reference.
+		 */
+		template <size_t N>
+#ifndef _DOXYGEN_
+		requires (!detail::when_any::void_result<result_t<N>>)
+#endif
+		result_t<N>&& get() && {
+			if (is_exception()) {
+				std::rethrow_exception(std::get<0>(shared_state->result));
+			}
+			return std::get<N + 1>(shared_state->result);
+		}
+
+		/**
+		 * @brief Cannot retrieve a void result.
+		 */
+		template <size_t N>
+#ifndef _DOXYGEN
+		requires (detail::when_any::void_result<result_t<N>>)
+#endif
+		[[deprecated("cannot retrieve a void result")]] void get() = delete;
+
+		/**
+		 * @brief Checks whether the return of the first awaitable triggered an exception, that is, a call to get() will rethrow.
+		 *
+		 * @return Whether or not the result is an exception
+		 */
+		[[nodiscard]] bool is_exception() const noexcept {
+			return shared_state->result.index() == 0;
+		}
+	};
+
+	/**
+	 * @brief Object returned by \ref operator co_await(). Meant to be used by the standard library, not by a user.
+	 *
+	 * @see result
+	 */
+	struct awaiter {
+		/**
+		 * @brief Pointer to the when_any object
+		 */
+		when_any *self;
+
+		/**
+		 * @brief First function called by the standard library when using co_await.
+		 *
+		 * @return bool Whether the result is ready
+		 */
+		[[nodiscard]] bool await_ready() const noexcept {
+			return self->await_ready();
+		}
+
+		/**
+		 * @brief Second function called by the standard library when using co_await.
+		 *
+		 * @return bool Returns false if we want to resume immediately.
+		 */
+		bool await_suspend(detail::std_coroutine::coroutine_handle<> caller) noexcept {
+			using namespace detail::when_any;
+	
+			self->my_state->handle = caller;
+			auto prev = self->my_state->owner_state.fetch_or(await_state::waiting, std::memory_order_acq_rel);
+			return (prev & await_state::ready) == 0; // true (suspend) if the state was not `ready` -- false (resume) if it was
+		}
+
+		/**
+		 * @brief Third and final function called by the standard library when using co_await. Returns the result object.
+		 *
+		 * @see result
+		 */
+		result await_resume() const noexcept {
+			return { self->my_state };
+		}
+	};
+
+	/**
+	 * @brief Default constructor.
+	 * A when_any object created this way holds no state
+	 */
+	when_any() = default;
+
+	/**
+	 * @brief Constructor from awaitable objects. Each awaitable is executed immediately and the when_any object can then be co_await-ed later.
+	 *
+	 * @throw ??? Any exception thrown by the start of each awaitable will propagate to the caller.
+	 * @param args Arguments to construct each awaitable from. The when_any object will construct an awaitable for each, it is recommended to pass rvalues or std::move.
+	 */
+	template <typename... Args_>
+#ifndef _DOXYGEN_
+	requires (sizeof...(Args_) == sizeof...(Args))
+#endif /* _DOXYGEN_ */
+	when_any(Args_&&... args) : my_state{ std::make_shared<state_t>(detail::when_any::arg_helper<Args_>::get(std::forward<Args_>(args))...) } {
+		make_jobs();
+	}
+
+	/**
+	 * @brief This object is not copyable.
+	 */
+	when_any(const when_any &) = delete;
+
+	/**
+	 * @brief Move constructor.
+	 */
+	when_any(when_any &&) noexcept = default;
+
+	/**
+	 * @brief On destruction the when_any will try to call @ref dpp::task::cancel() cancel() on each of its awaitable if they have such a method.
+	 *
+	 * @note If you are looking to use a custom type with when_any and want it to cancel on its destruction,
+	 * make sure it has a cancel() method, which will trigger an await_resume() throwing a dpp::task_cancelled_exception.
+	 * This object will swallow the exception and return cleanly. Any other exception will be thrown back to the resumer.
+	 */
+	~when_any() {
+		if (!my_state)
+			return;
+
+		my_state->owner_state = detail::when_any::await_state::dangling;
+
+		[]<size_t... Ns>(when_any *self, std::index_sequence<Ns...>) constexpr {
+			constexpr auto cancel = []<size_t N>(when_any *self) constexpr {
+				if constexpr (requires { std::get<N>(self->my_state->awaitables).cancel(); }) {
+					try {
+						std::get<N>(self->my_state->awaitables).cancel();
+					} catch (...) {
+						// swallow any exception. no choice here, we're in a destructor
+					}
+				}
+			};
+			(cancel.template operator()<Ns>(self), ...);
+		}(this, std::index_sequence_for<Args...>());
+	}
+
+	/**
+	 * @brief This object is not copyable.
+	 */
+	when_any &operator=(const when_any &) = delete;
+
+	/**
+	 * @brief Move assignment operator.
+	 */
+	when_any &operator=(when_any &&) noexcept = default;
+
+	/**
+	 * @brief Check whether a call to co_await would suspend.
+	 *
+	 * @note This can change from false to true at any point, but not the other way around.
+	 * @return bool Whether co_await would suspend
+	 */
+	[[nodiscard]] bool await_ready() const noexcept {
+		return (my_state->owner_state.load(std::memory_order_acquire) & detail::when_any::await_state::ready) != 0;
+	}
+
+	/**
+	 * @brief Suspend the caller until any of the awaitables completes.
+	 *
+	 * @see result
+	 * @throw ??? On resumption, throws any exception caused by the construction of the result.
+	 * @return result On resumption, this object returns an object that allows to retrieve the index and result of the awaitable.
+	 */
+	[[nodiscard]] awaiter operator co_await() noexcept {
+		return { this };
+	}
+};
+
+template <typename... Args>
+#ifndef _DOXYGEN_
+requires (sizeof...(Args) >= 1)
+#endif /* _DOXYGEN_ */
+when_any(Args...) -> when_any<detail::when_any::awaitable_type<Args>...>;
+
+} /* namespace dpp */
+
+#endif
\ No newline at end of file
diff --git a/3rdParty/dpp/discord_webhook_server.h b/3rdParty/dpp/discord_webhook_server.h
new file mode 100644
index 0000000000..7e420613dd
--- /dev/null
+++ b/3rdParty/dpp/discord_webhook_server.h
@@ -0,0 +1,74 @@
+/************************************************************************************
+ *
+ * D++, A Lightweight C++ library for Discord
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright 2021 Craig Edwards and D++ contributors
+ * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ************************************************************************************/
+#pragma once
+
+#include <dpp/export.h>
+#include <dpp/http_server.h>
+#include <dpp/signature_verifier.h>
+
+namespace dpp {
+
+/**
+ * @brief Creates a HTTP server which listens for incoming
+ * Discord interactions, and if verified as valid, raises them
+ * as cluster events, returning the response back.
+ * Note that Discord requires all interaction endpoints to
+ * have a valid SSL certificate (not self signed) so in most
+ * cases you should put this port behind a reverse proxy, e.g.
+ * nginx, apache, etc.
+ */
+struct discord_webhook_server : public http_server {
+
+	/**
+	 * @brief Verifier for signed requests
+	 */
+	signature_verifier verifier;
+
+	/**
+	 * @brief Public key from application dashboard
+	 */
+	std::string public_key_hex;
+
+	/**
+	 * @brief Constructor for creation of a HTTP(S) server
+	 * @param creator Cluster creator
+	 * @param discord_public_key Public key for the application from the application dashboard page
+	 * @param address address to bind to, use "0.0.0.0" to bind to all local addresses
+	 * @param port port to bind to. You should generally use a port > 1024.
+	 * @param ssl_private_key Private key PEM file for HTTPS/SSL. If empty, a plaintext server is created
+	 * @param ssl_public_key Public key PEM file for HTTPS/SSL. If empty, a plaintext server is created
+	 */
+	discord_webhook_server(cluster* creator, const std::string& discord_public_key, const std::string_view address, uint16_t port,  const std::string& ssl_private_key = "", const std::string& ssl_public_key = "");
+
+	/**
+	 * @brief Handle Discord outbound webhook
+	 * @param request Request from discord
+	 */
+	void handle_request(http_server_request* request);
+
+	/**
+	 * @brief Virtual dtor
+	 */
+	virtual ~discord_webhook_server() = default;
+};
+
+}
diff --git a/3rdParty/dpp/discordclient.h b/3rdParty/dpp/discordclient.h
index 50c080c52e..4b2fbb03d9 100644
--- a/3rdParty/dpp/discordclient.h
+++ b/3rdParty/dpp/discordclient.h
@@ -1,519 +1,636 @@
-/************************************************************************************
- *
- * D++, A Lightweight C++ library for Discord
- *
- * Copyright 2021 Craig Edwards and D++ contributors 
- * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- ************************************************************************************/
-
-#pragma once
-#include <dpp/export.h>
-#include <string>
-#include <map>
-#include <vector>
-#include <dpp/nlohmann/json_fwd.hpp>
-#include <dpp/wsclient.h>
-#include <dpp/dispatcher.h>
-#include <dpp/event.h>
-#include <queue>
-#include <thread>
-#include <deque>
-#include <mutex>
-#include <shared_mutex>
-
-using json = nlohmann::json;
-
-#define DISCORD_API_VERSION	"10"
-#define API_PATH	        "/api/v" DISCORD_API_VERSION
-namespace dpp {
-
-// Forward declarations
-class cluster;
-
-/**
- * @brief This is an opaque class containing zlib library specific structures.
- * We define it this way so that the public facing D++ library doesn't require
- * the zlib headers be available to build against it.
- */
-class zlibcontext;
-
-/**
- * @brief Represents a connection to a voice channel.
- * A client can only connect to one voice channel per guild at a time, so these are stored in a map
- * in the dpp::discord_client keyed by guild_id.
- */
-class DPP_EXPORT voiceconn {
-	/**
-	 * @brief Owning dpp::discord_client instance
-	 */
-	class discord_client* creator;
-public:
-	/**
-	 * @brief Voice Channel ID
-	 */
-	snowflake channel_id;
-
-	/**
-	 * @brief Websocket hostname for status
-	 */
-	std::string websocket_hostname;
-
-	/**
-	 * @brief Voice Voice session ID
-	 */
-	std::string session_id;
-
-	/**
-	 * @brief Voice websocket token
-	 */
-	std::string token;
-
-	/**
-	 * @brief voice websocket client
-	 */
-	class discord_voice_client* voiceclient;
-
-	/**
-	 * @brief Construct a new voiceconn object
-	 */
-	voiceconn() = default;
-
-	/**
-	 * @brief Construct a new voiceconn object
-	 * 
-	 * @param o owner
-	 * @param _channel_id voice channel id
-	 */
-	voiceconn(class discord_client* o, snowflake _channel_id);
-
-	/**
-	 * @brief Destroy the voiceconn object
-	 */
-	~voiceconn();
-
-	/**
-	 * @brief return true if the connection is ready to connect
-	 * (has hostname, token and session id)
-	 * 
-	 * @return true if ready to connect
-	 */
-	bool is_ready();
-	
-	/**
-	 * @brief return true if the connection is active (websocket exists)
-	 * 
-	 * @return true if has an active websocket
-	 */
-	bool is_active();
-
-	/**
-	 * @brief Create websocket object and connect it.
-	 * Needs hostname, token and session_id to be set or does nothing.
-	 * 
-	 * @param guild_id Guild to connect to the voice channel on
-	 * @return reference to self
-	 * @note It can spawn a thread to establish the connection, so this is NOT a synchronous blocking call!
-	 * You shouldn't call this directly. Use a wrapper function instead. e.g. dpp::guild::connect_member_voice
-	 */
-	voiceconn& connect(snowflake guild_id);
-
-	/**
-	 * @brief Disconnect from the currently connected voice channel
-	 * @return reference to self
-	 */
-	voiceconn& disconnect();
-};
-
-/** @brief Implements a discord client. Each discord_client connects to one shard and derives from a websocket client. */
-class DPP_EXPORT discord_client : public websocket_client
-{
-protected:
-	/**
-	 * @brief Needed so that voice_state_update can call dpp::discord_client::disconnect_voice_internal
-	 */
-	friend class dpp::events::voice_state_update;
-
-	/**
-	 * @brief Needed so that guild_create can request member chunks if you have the correct intents
-	 */
-	friend class dpp::events::guild_create;
-
-	/**
-	 * @brief Needed to allow cluster::set_presence to use the ETF functions
-	 */
-	friend class dpp::cluster;
-
-	/**
-	 * @brief True if the shard is terminating
-	 */
-	bool terminating;
-
-	/**
-	 * @brief Disconnect from the connected voice channel on a guild
-	 * 
-	 * @param guild_id The guild who's voice channel you wish to disconnect from
-	 * @param send_json True if we should send a json message confirming we are leaving the VC
-	 * Should be set to false if we already receive this message in an event.
-	 */
-	void disconnect_voice_internal(snowflake guild_id, bool send_json = true);
-
-private:
-
-	/**
-	 * @brief Mutex for message queue
-	 */
-	std::shared_mutex queue_mutex;
-
-	/**
-	 * @brief Queue of outbound messages
-	 */
-	std::deque<std::string> message_queue;
-
-	/**
-	 * @brief Thread this shard is executing on
-	 */
-	std::thread* runner;
-
-	/**
-	 * @brief Run shard loop under a thread.
-	 * Calls discord_client::run() from within a std::thread.
-	 */
-	void thread_run();
-
-	/**
-	 * @brief If true, stream compression is enabled
-	 */
-	bool compressed;
-
-	/**
-	 * @brief ZLib decompression buffer
-	 */
-	unsigned char* decomp_buffer;
-
-	/**
-	 * @brief Decompressed string
-	 */
-	std::string decompressed;
-
-	/**
-	 * @brief This object contains the various zlib structs which
-	 * are not usable by the user of the library directly. They
-	 * are wrapped within this opaque object so that this header
-	 * file does not bring in a dependency on zlib.h.
-	 */
-	zlibcontext* zlib;
-
-	/**
-	 * @brief Total decompressed received bytes
-	 */
-	uint64_t decompressed_total;
-
-	/**
-	 * @brief Last connect time of cluster
-	 */
-	time_t connect_time;
-
-	/**
-	 * @brief Time last ping sent to websocket, in fractional seconds
-	 */
-	double ping_start;
-
-	/**
-	 * @brief ETF parser for when in ws_etf mode
-	 */
-	class etf_parser* etf;
-
-	/**
-	 * @brief Convert a JSON object to string.
-	 * In JSON protocol mode, call json.dump(), and in ETF mode,
-	 * call etf::build().
-	 * 
-	 * @param json nlohmann::json object to convert
-	 * @return std::string string output in the correct format
-	 */
-	std::string jsonobj_to_string(const nlohmann::json& json);
-
-	/**
-	 * @brief Initialise ZLib (websocket compression)
-	 * @throw dpp::exception if ZLib cannot be initialised
-	 */
-	void setup_zlib();
-
-	/**
-	 * @brief Shut down ZLib (websocket compression)
-	 */
-	void end_zlib();
-
-	/**
-	 * @brief Update the websocket hostname with the resume url
-	 * from the last READY event
-	 */
-	void set_resume_hostname();
-
-public:
-	/**
-	 * @brief Owning cluster
-	 */
-	class dpp::cluster* creator;
-
-	/**
-	 * @brief Heartbeat interval for sending heartbeat keepalive
-	 * @note value in milliseconds
-	 */
-	uint32_t heartbeat_interval;
-
-	/**
-	 * @brief Last heartbeat
-	 */
-	time_t last_heartbeat;
-
-	/**
-	 * @brief Shard ID of this client
-	 */
-	uint32_t shard_id;
-
-	/**
-	 * @brief Total number of shards
-	 */
-	uint32_t max_shards;
-
-	/**
-	 * @brief Thread ID
-	 */
-	std::thread::native_handle_type thread_id;
-
-	/**
-	 * @brief Last sequence number received, for resumes and pings
-	 */
-	uint64_t last_seq;
-
-	/**
-	 * @brief Discord bot token
-	 */
-	std::string token;
-
-	/**
-	 * @brief Privileged gateway intents
-	 * @see dpp::intents
-	 */
-	uint32_t intents;
-
-	/**
-	 * @brief Discord session id
-	 */
-	std::string sessionid;
-
-	/**
-	 * @brief Mutex for voice connections map
-	 */
-	std::shared_mutex voice_mutex;
-
-	/**
-	 * @brief Resume count
-	 */
-	uint32_t resumes;
-
-	/**
-	 * @brief Reconnection count
-	 */
-	uint32_t reconnects;
-
-	/**
-	 * @brief Websocket latency in fractional seconds
-	 */
-	double websocket_ping;
-
-	/**
-	 * @brief True if READY or RESUMED has been received
-	 */
-	bool ready;
-
-	/**
-	 * @brief Last heartbeat ACK (opcode 11)
-	 */
-	time_t last_heartbeat_ack;
-
-	/** 
-	 * @brief Current websocket protocol, currently either ETF or JSON
-	 */
-	websocket_protocol_t protocol;
-
-	/**
-	 * @brief List of voice channels we are connecting to keyed by guild id
-	 */
-	std::unordered_map<snowflake, voiceconn*> connecting_voice_channels;
-
-	/**
-	 * @brief The gateway address we reconnect to when we resume a session
-	 */
-	std::string resume_gateway_url;
-
-	/**
-	 * @brief Log a message to whatever log the user is using.
-	 * The logged message is passed up the chain to the on_log event in user code which can then do whatever
-	 * it wants to do with it.
-	 * @param severity The log level from dpp::loglevel
-	 * @param msg The log message to output
-	 */
-	virtual void log(dpp::loglevel severity, const std::string &msg) const;
-
-	/**
-	 * @brief Handle an event (opcode 0)
-	 * @param event Event name, e.g. MESSAGE_CREATE
-	 * @param j JSON object for the event content
-	 * @param raw Raw JSON event string
-	 */
-	virtual void handle_event(const std::string &event, json &j, const std::string &raw);
-
-	/**
-	 * @brief Get the Guild Count for this shard
-	 * 
-	 * @return uint64_t guild count
-	 */
-	uint64_t get_guild_count();
-
-	/**
-	 * @brief Get the Member Count for this shard
-	 * 
-	 * @return uint64_t member count
-	 */
-	uint64_t get_member_count();
-
-	/**
-	 * @brief Get the Channel Count for this shard
-	 * 
-	 * @return uint64_t channel count
-	 */
-	uint64_t get_channel_count();
-
-	/** Fires every second from the underlying socket I/O loop, used for sending heartbeats */
-	virtual void one_second_timer();
-
-	/**
-	 * @brief Queue a message to be sent via the websocket
-	 * 
-	 * @param j The JSON data of the message to be sent
-	 * @param to_front If set to true, will place the message at the front of the queue not the back
-	 * (this is for urgent messages such as heartbeat, presence, so they can take precedence over
-	 * chunk requests etc)
-	 */
-	void queue_message(const std::string &j, bool to_front = false);
-
-	/**
-	 * @brief Clear the outbound message queue
-	 * @return reference to self
-	 */
-	discord_client& clear_queue();
-
-	/**
-	 * @brief Get the size of the outbound message queue
-	 * 
-	 * @return The size of the queue
-	 */
-	size_t get_queue_size();
-
-	/**
-	 * @brief Returns true if the shard is connected
-	 * 
-	 * @return True if connected
-	 */
-	bool is_connected();
-
-	/**
-	 * @brief Returns the connection time of the shard
-	 * 
-	 * @return dpp::utility::uptime Detail of how long the shard has been connected for
-	 */
-	dpp::utility::uptime get_uptime();
-
-	/**
-	 * @brief Construct a new discord_client object
-	 * 
-	 * @param _cluster The owning cluster for this shard
-	 * @param _shard_id The ID of the shard to start
-	 * @param _max_shards The total number of shards across all clusters
-	 * @param _token The bot token to use for identifying to the websocket
-	 * @param intents Privileged intents to use, a bitmask of values from dpp::intents
-	 * @param compressed True if the received data will be gzip compressed
-	 * @param ws_protocol Websocket protocol to use for the connection, JSON or ETF
-	 */
-	discord_client(dpp::cluster* _cluster, uint32_t _shard_id, uint32_t _max_shards, const std::string &_token, uint32_t intents = 0, bool compressed = true, websocket_protocol_t ws_protocol = ws_json);
-
-	/**
-	 * @brief Destroy the discord client object
-	 */
-	virtual ~discord_client();
-
-	/**
-	 * @brief Get the decompressed bytes in objectGet decompressed total bytes received
-	 * @return uint64_t bytes received
-	 */
-	uint64_t get_decompressed_bytes_in();
-
-	/**
-	 * @brief Handle JSON from the websocket.
-	 * @param buffer The entire buffer content from the websocket client
-	 * @returns True if a frame has been handled
-	 */
-	virtual bool handle_frame(const std::string &buffer);
-
-	/**
-	 * @brief Handle a websocket error.
-	 * @param errorcode The error returned from the websocket
-	 */
-	virtual void error(uint32_t errorcode);
-
-	/**
-	 * @brief Start and monitor I/O loop.
-	 * @note this is a blocking call and is usually executed within a
-	 * thread by whatever creates the object.
-	 */
-	void run();
-
-	/**
-	 * @brief Connect to a voice channel
-	 * 
-	 * @param guild_id Guild where the voice channel is
-	 * @param channel_id Channel ID of the voice channel
-	 * @param self_mute True if the bot should mute itself
-	 * @param self_deaf True if the bot should deafen itself
-	 * @return reference to self
-	 * @note This is NOT a synchronous blocking call! The bot isn't instantly ready to send or listen for audio,
-	 * as we have to wait for the connection to the voice server to be established!
-	 * e.g. wait for dpp::cluster::on_voice_ready event, and then send the audio within that event.
-	 */
-	discord_client& connect_voice(snowflake guild_id, snowflake channel_id, bool self_mute = false, bool self_deaf = false);
-
-	/**
-	 * @brief Disconnect from the connected voice channel on a guild
-	 * 
-	 * @param guild_id The guild who's voice channel you wish to disconnect from
-	 * @return reference to self
-	 * @note This is NOT a synchronous blocking call! The bot isn't instantly disconnected.
-	 */
-	discord_client& disconnect_voice(snowflake guild_id);
-
-	/**
-	 * @brief Get the dpp::voiceconn object for a specific guild on this shard.
-	 * 
-	 * @param guild_id The guild ID to retrieve the voice connection for
-	 * @return voiceconn* The voice connection for the guild, or nullptr if there is no
-	 * voice connection to this guild.
-	 */
-	voiceconn* get_voice(snowflake guild_id);
-};
-
-};
+/************************************************************************************
+ *
+ * D++, A Lightweight C++ library for Discord
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright 2021 Craig Edwards and D++ contributors 
+ * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ************************************************************************************/
+
+#pragma once
+#include <dpp/export.h>
+#include <string>
+#include <map>
+#include <vector>
+#include <dpp/json_fwd.h>
+#include <dpp/wsclient.h>
+#include <dpp/dispatcher.h>
+#include <dpp/event.h>
+#include <queue>
+#include <thread>
+#include <memory>
+#include <deque>
+#include <dpp/etf.h>
+#include <mutex>
+#include <shared_mutex>
+#include <dpp/zlibcontext.h>
+
+namespace dpp {
+
+/**
+ * @brief Discord API version for shard websockets and HTTPS API requests
+ */
+#define DISCORD_API_VERSION "10"
+
+/**
+ * @brief HTTPS Request base path for API calls
+ */
+#define API_PATH "/api/v" DISCORD_API_VERSION
+
+/* Forward declarations */
+class cluster;
+
+/**
+ * @brief How many seconds to wait between (re)connections. DO NOT change this.
+ * It is mandated by the Discord API spec!
+ */
+constexpr time_t RECONNECT_INTERVAL = 5;
+
+/**
+ * @brief Represents different event opcodes sent and received on a shard websocket
+ *
+ * These are used internally to route frames.
+ */
+enum shard_frame_type : int {
+
+	/**
+	 * @brief An event was dispatched.
+	 * @note Receive only
+	 */
+	ft_dispatch = 0,
+
+	/**
+	 * @brief Fired periodically by the client to keep the connection alive.
+	 * @note Send/Receive
+	 */
+	ft_heartbeat = 1,
+
+	/**
+	 * @brief Starts a new session during the initial handshake.
+	 * @note Send only
+	 */
+	ft_identify = 2,
+
+	/**
+	 * @brief Update the client's presence.
+	 * @note Send only
+	 */
+	ft_presence = 3,
+
+	/**
+	 * @brief Used to join/leave or move between voice channels.
+	 * @note Send only
+	 */
+	ft_voice_state_update = 4,
+
+	/**
+	 * @brief Resume a previous session that was disconnected.
+	 * @note Send only
+	 */
+	ft_resume = 6,
+
+	/**
+	 * @brief You should attempt to reconnect and resume immediately.
+	 * @note Receive only
+	 */
+	ft_reconnect = 7,
+
+	/**
+	 * @brief Request information about offline guild members in a large guild.
+	 * @note Send only
+	 */
+	ft_request_guild_members = 8,
+
+	/**
+	 * @brief The session has been invalidated. You should reconnect and identify/resume accordingly.
+	 * @note Receive only
+	 */
+	ft_invalid_session = 9,
+
+	/**
+	 * @brief Sent immediately after connecting, contains the heartbeat interval to use.
+	 * @note Receive only
+	 */
+	ft_hello = 10,
+
+	/**
+	 * @brief Sent in response to receiving a heartbeat to acknowledge that it has been received.
+	 * @note Receive only
+	 */
+	ft_heartbeat_ack = 11,
+
+	/**
+	 * @brief Request information about soundboard sounds in a set of guilds.
+	 * @note Send only
+	 */
+	ft_request_soundboard_sounds = 31,
+};
+
+/**
+ * @brief Callback to send a Gateway request to start a new voice connection.
+ */
+using voice_connection_gateway_request_callback_t = std::function<void(discord_client*)>;
+
+/**
+ * @brief Represents a connection to a voice channel.
+ * A client can only connect to one voice channel per guild at a time, so these are stored in a map
+ * in the dpp::discord_client keyed by guild_id.
+ */
+class DPP_EXPORT voiceconn : public std::enable_shared_from_this<voiceconn> {
+	/**
+	 * @brief Owning dpp::discord_client instance
+	 */
+	class discord_client* creator;
+
+	/**
+	 * @brief Function to ask a discord_client instance to make a request to Gateway to connect to a voice channel
+	 */
+	voice_connection_gateway_request_callback_t request_callback;
+
+public:
+	/**
+	 * @brief Guild to connect to the voice channel on
+	 */
+	snowflake guild_id;
+
+	/**
+	 * @brief Voice Channel ID
+	 */
+	snowflake channel_id;
+
+	/**
+	 * @brief Websocket hostname for status
+	 */
+	std::string websocket_hostname;
+
+	/**
+	 * @brief Voice Voice session ID
+	 */
+	std::string session_id;
+
+	/**
+	 * @brief Voice websocket token
+	 */
+	std::string token;
+
+	/**
+	 * @brief voice websocket client
+	 */
+	std::unique_ptr<class discord_voice_client> voiceclient;
+
+	/**
+	 * @brief True to enable DAVE E2EE
+	 * @warning This is an EXPERIMENTAL feature!
+	 */
+	bool dave;
+
+	/**
+	 * @brief Construct a new voiceconn object
+	 * 
+	 * @param o owner
+	 * @param request_callback Function to ask a discord_client instance to make a request to Gateway to connect to a voice channel
+	 * @param guild_id Guild to connect to the voice channel on
+	 * @param channel_id voice channel id
+	 * @param enable_dave True to enable DAVE E2EE
+	 */
+	voiceconn(class discord_client* o, voice_connection_gateway_request_callback_t request_callback, snowflake guild_id, snowflake channel_id, bool enable_dave);
+
+	/**
+	 * @brief Destroy the voiceconn object
+	 */
+	~voiceconn();
+
+	/**
+	 * @brief return true if the connection is ready to connect
+	 * (has hostname, token and session id)
+	 * 
+	 * @return true if ready to connect
+	 */
+	bool is_ready() const;
+	
+	/**
+	 * @brief return true if the connection is active (websocket exists)
+	 * 
+	 * @return true if has an active websocket
+	 */
+	bool is_active() const;
+
+	voiceconn& request(bool session_invalid = true);
+
+	/**
+	 * @brief Create websocket object and connect it.
+	 * Needs hostname, token and session_id to be set or does nothing.
+	 *
+	 * @return reference to self
+	 * @note It can spawn a thread to establish the connection, so this is NOT a synchronous blocking call!
+	 * You shouldn't call this directly. Use a wrapper function instead. e.g. dpp::guild::connect_member_voice
+	 */
+	voiceconn& connect();
+
+	/**
+	 * @brief Disconnect from the currently connected voice channel
+	 * @param close Whether to close connection
+	 * @return reference to self
+	 */
+	voiceconn& disconnect(bool close = true);
+
+	/**
+	 * @brief Reassigns the owner to the given discord_client.
+	 */
+	void reassign_owner(class discord_client* o);
+};
+
+/** @brief Implements a discord client. Each discord_client connects to one shard and derives from a websocket client. */
+class DPP_EXPORT discord_client : public websocket_client
+{
+protected:
+	/**
+	 * @brief Needed so that voice_state_update can call dpp::discord_client::disconnect_voice_internal
+	 */
+	friend class dpp::events::voice_state_update;
+
+	/**
+	 * @brief Needed so that guild_create can request member chunks if you have the correct intents
+	 */
+	friend class dpp::events::guild_create;
+
+	/**
+	 * @brief Needed to allow cluster::set_presence to use the ETF functions
+	 */
+	friend class dpp::cluster;
+
+	/**
+	 * @brief Disconnect from the connected voice channel on a guild
+	 * 
+	 * @param guild_id The guild who's voice channel you wish to disconnect from
+	 * @param send_json True if we should send a json message confirming we are leaving the VC
+	 * Should be set to false if we already receive this message in an event.
+	 */
+	void disconnect_voice_internal(snowflake guild_id, bool send_json = true);
+
+	/**
+	 * @brief Start connecting the websocket
+	 *
+	 * Called from the constructor, or during reconnection
+	 */
+	void start_connecting();
+
+	/**
+	 * @brief Stores the most recent ping message on this shard, which we check
+	 * for to monitor latency
+	 */
+	std::string last_ping_message;
+
+private:
+
+	/**
+	 * @brief Mutex for message queue
+	 */
+	std::shared_mutex queue_mutex;
+
+	/**
+	 * @brief Mutex for zlib pointer
+	 */
+	std::mutex zlib_mutex;
+
+	/**
+	 * @brief Queue of outbound messages
+	 */
+	std::deque<std::string> message_queue;
+
+	/**
+	 * @brief If true, stream compression is enabled
+	 */
+	bool compressed;
+
+	/**
+	 * @brief Decompressed string
+	 */
+	std::string decompressed;
+
+	/**
+	 * @brief This object contains the various zlib structs which
+	 * are not usable by the user of the library directly. They
+	 * are wrapped within this opaque object so that this header
+	 * file does not bring in a dependency on zlib.h.
+	 */
+	std::unique_ptr<zlibcontext> zlib{};
+
+	/**
+	 * @brief Last connect time of cluster
+	 */
+	time_t connect_time;
+
+	/**
+	 * @brief Time last ping sent to websocket, in fractional seconds
+	 */
+	double ping_start;
+
+	/**
+	 * @brief ETF parser for when in ws_etf mode
+	 */
+	std::unique_ptr<etf_parser> etf;
+
+	/**
+	 * @brief Convert a JSON object to string.
+	 * In JSON protocol mode, call json.dump(), and in ETF mode,
+	 * call etf::build().
+	 * 
+	 * @param json nlohmann::json object to convert
+	 * @return std::string string output in the correct format
+	 */
+	std::string jsonobj_to_string(const nlohmann::json& json);
+
+	/**
+	 * @brief Update the websocket hostname with the resume url
+	 * from the last READY event
+	 */
+	void set_resume_hostname();
+
+	/**
+	 * @brief Clean up resources
+	 */
+	void cleanup();
+public:
+	/**
+	 * @brief Owning cluster
+	 */
+	class dpp::cluster* creator;
+
+	/**
+	 * @brief Heartbeat interval for sending heartbeat keepalive
+	 * @note value in milliseconds
+	 */
+	uint32_t heartbeat_interval;
+
+	/**
+	 * @brief Last heartbeat
+	 */
+	time_t last_heartbeat;
+
+	/**
+	 * @brief Shard ID of this client
+	 */
+	uint32_t shard_id;
+
+	/**
+	 * @brief Total number of shards
+	 */
+	uint32_t max_shards;
+
+	/**
+	 * @brief Last sequence number received, for resumes and pings
+	 */
+	uint64_t last_seq;
+
+	/**
+	 * @brief Discord bot token
+	 */
+	std::string token;
+
+	/**
+	 * @brief Privileged gateway intents
+	 * @see dpp::intents
+	 */
+	uint32_t intents;
+
+	/**
+	 * @brief Discord session id
+	 */
+	std::string sessionid;
+
+	/**
+	 * @brief Mutex for voice connections map
+	 */
+	std::shared_mutex voice_mutex;
+
+	/**
+	 * @brief Resume count
+	 */
+	uint32_t resumes;
+
+	/**
+	 * @brief Reconnection count
+	 */
+	uint32_t reconnects;
+
+	/**
+	 * @brief Websocket latency in fractional seconds
+	 */
+	double websocket_ping;
+
+	/**
+	 * @brief True if READY or RESUMED has been received
+	 */
+	bool ready;
+
+	/**
+	 * @brief Last heartbeat ACK (opcode 11)
+	 */
+	time_t last_heartbeat_ack;
+
+	/** 
+	 * @brief Current websocket protocol, currently either ETF or JSON
+	 */
+	websocket_protocol_t protocol;
+
+	/**
+	 * @brief List of voice channels we are connecting to keyed by guild id
+	 */
+	std::unordered_map<snowflake, std::shared_ptr<voiceconn>> connecting_voice_channels;
+
+	/**
+	 * @brief The gateway address we reconnect to when we resume a session
+	 */
+	std::string resume_gateway_url;
+
+	/**
+	 * @brief Log a message to whatever log the user is using.
+	 * The logged message is passed up the chain to the on_log event in user code which can then do whatever
+	 * it wants to do with it.
+	 * @param severity The log level from dpp::loglevel
+	 * @param msg The log message to output
+	 */
+	virtual void log(dpp::loglevel severity, const std::string &msg) const override;
+
+	/**
+	 * @brief Handle an event (opcode 0)
+	 * @param event Event name, e.g. MESSAGE_CREATE
+	 * @param j JSON object for the event content
+	 * @param raw Raw JSON event string
+	 */
+	virtual void handle_event(const std::string &event, json &j, const std::string &raw);
+
+	/**
+	 * @brief Get the Guild Count for this shard
+	 * 
+	 * @return uint64_t guild count
+	 */
+	uint64_t get_guild_count();
+
+	/**
+	 * @brief Get the Member Count for this shard
+	 * 
+	 * @return uint64_t member count
+	 */
+	uint64_t get_member_count();
+
+	/**
+	 * @brief Get the Channel Count for this shard
+	 * 
+	 * @return uint64_t channel count
+	 */
+	uint64_t get_channel_count();
+
+	/**
+	 * @brief Fires every second from the underlying socket I/O loop, used for sending heartbeats
+	 * and any queued outbound websocket frames.
+	 */
+	virtual void one_second_timer() override;
+
+	/**
+	 * @brief Queue a message to be sent via the websocket
+	 * 
+	 * @param j The JSON data of the message to be sent
+	 * @param to_front If set to true, will place the message at the front of the queue not the back
+	 * (this is for urgent messages such as heartbeat, presence, so they can take precedence over
+	 * chunk requests etc)
+	 */
+	void queue_message(const std::string &j, bool to_front = false);
+
+	/**
+	 * @brief Clear the outbound message queue
+	 * @return reference to self
+	 */
+	discord_client& clear_queue();
+
+	/**
+	 * @brief Get the size of the outbound message queue
+	 * 
+	 * @return The size of the queue
+	 */
+	size_t get_queue_size();
+
+	/**
+	 * @brief Returns true if the shard is connected
+	 * 
+	 * @return True if connected
+	 */
+	bool is_connected();
+
+	/**
+	 * @brief Returns the connection time of the shard
+	 * 
+	 * @return dpp::utility::uptime Detail of how long the shard has been connected for
+	 */
+	dpp::utility::uptime get_uptime();
+
+	/**
+	 * @brief Construct a new discord_client object
+	 * 
+	 * @param _cluster The owning cluster for this shard
+	 * @param _shard_id The ID of the shard to start
+	 * @param _max_shards The total number of shards across all clusters
+	 * @param _token The bot token to use for identifying to the websocket
+	 * @param intents Privileged intents to use, a bitmask of values from dpp::intents
+	 * @param compressed True if the received data will be gzip compressed
+	 * @param ws_protocol Websocket protocol to use for the connection, JSON or ETF
+	 * 
+	 * @throws std::bad_alloc Passed up to the caller if any internal objects fail to allocate, after cleanup has completed
+	 */
+	discord_client(dpp::cluster* _cluster, uint32_t _shard_id, uint32_t _max_shards, const std::string &_token, uint32_t intents = 0, bool compressed = true, websocket_protocol_t ws_protocol = ws_json);
+
+	/**
+	 * @brief Construct a discord_client object from another discord_client object
+	 * Used when resuming, the url to connect to will be taken from the resume url of the
+	 * other object, along with the seq number.
+	 *
+	 * @param old Previous connection to resume from
+	 */
+	explicit discord_client(discord_client& old);
+
+	/**
+	 * @brief Destroy the discord client object
+	 */
+	virtual ~discord_client() = default;
+
+	/**
+	 * @brief Get decompressed total bytes received
+	 *
+	 * This will always return 0 if the connection is not compressed
+	 * @return uint64_t compressed bytes received
+	 */
+	uint64_t get_decompressed_bytes_in();
+
+	/**
+	 * @brief Handle JSON from the websocket.
+	 * @param buffer The entire buffer content from the websocket client
+	 * @param opcode The type of frame, e.g. text or binary
+	 * @returns True if a frame has been handled
+	 */
+	virtual bool handle_frame(const std::string &buffer, ws_opcode opcode) override;
+
+	/**
+	 * @brief Handle a websocket error.
+	 * @param errorcode The error returned from the websocket
+	 */
+	virtual void error(uint32_t errorcode) override;
+
+	/**
+	 * @brief Start and monitor I/O loop.
+	 */
+	void run();
+
+	/**
+	 * @brief Called when the HTTP socket is closed
+	 */
+	virtual void on_disconnect() override;
+
+	/**
+	 * @brief Connect to a voice channel
+	 * 
+	 * @param guild_id Guild where the voice channel is
+	 * @param channel_id Channel ID of the voice channel
+	 * @param self_mute True if the bot should mute itself
+	 * @param self_deaf True if the bot should deafen itself
+	 * @param enable_dave True to enable DAVE E2EE
+	 * @return reference to self
+	 * @note This is NOT a synchronous blocking call! The bot isn't instantly ready to send or listen for audio,
+	 * as we have to wait for the connection to the voice server to be established!
+	 * e.g. wait for dpp::cluster::on_voice_ready event, and then send the audio within that event.
+	 */
+	discord_client& connect_voice(snowflake guild_id, snowflake channel_id, bool self_mute = false, bool self_deaf = false, bool enable_dave = true);
+
+	/**
+	 * @brief Disconnect from the connected voice channel on a guild
+	 * 
+	 * @param guild_id The guild who's voice channel you wish to disconnect from
+	 * @return reference to self
+	 * @note This is NOT a synchronous blocking call! The bot isn't instantly disconnected.
+	 */
+	discord_client& disconnect_voice(snowflake guild_id);
+
+	/**
+	 * @brief Get the dpp::voiceconn object for a specific guild on this shard.
+	 * 
+	 * @param guild_id The guild ID to retrieve the voice connection for
+	 * @return voiceconn* The voice connection for the guild, or nullptr if there is no
+	 * voice connection to this guild.
+	 */
+	voiceconn* get_voice(snowflake guild_id);
+};
+
+}
diff --git a/3rdParty/dpp/discordevents.h b/3rdParty/dpp/discordevents.h
index c6474a45c0..8b05d1001b 100644
--- a/3rdParty/dpp/discordevents.h
+++ b/3rdParty/dpp/discordevents.h
@@ -1,171 +1,232 @@
-/************************************************************************************
- *
- * D++, A Lightweight C++ library for Discord
- *
- * Copyright 2021 Craig Edwards and D++ contributors
- * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- ************************************************************************************/
-#pragma once
-
-#include <dpp/export.h>
-#include <dpp/nlohmann/json_fwd.hpp>
-
-namespace dpp {
-
-/** @brief Returns a snowflake id from a json field value, if defined, else returns 0
- * @param j nlohmann::json instance to retrieve value from
- * @param keyname key name to check for a value
- * @return found value
- */
-uint64_t DPP_EXPORT snowflake_not_null(const nlohmann::json* j, const char *keyname);
-
-/** @brief Sets a snowflake id from a json field value, if defined, else does nothing
- * @param j nlohmann::json instance to retrieve value from
- * @param keyname key name to check for a value
- * @param v Value to change
- */
-void DPP_EXPORT set_snowflake_not_null(const nlohmann::json* j, const char *keyname, uint64_t &v);
-
-/** @brief Returns a string from a json field value, if defined, else returns an empty string.
- * @param j nlohmann::json instance to retrieve value from
- * @param keyname key name to check for a value
- * @return found value
- */
-std::string DPP_EXPORT string_not_null(const nlohmann::json* j, const char *keyname);
-
-/** @brief Sets a string from a json field value, if defined, else does nothing
- * @param j nlohmann::json instance to retrieve value from
- * @param keyname key name to check for a value
- * @param v Value to change
- */
-void DPP_EXPORT set_string_not_null(const nlohmann::json* j, const char *keyname, std::string &v);
-
-/** @brief Returns a double from a json field value, if defined, else returns 0.
- * @param j nlohmann::json instance to retrieve value from
- * @param keyname key name to check for a value
- * @return found value
- */
-double DPP_EXPORT double_not_null(const nlohmann::json* j, const char *keyname);
-
-/** @brief Sets a double from a json field value, if defined, else does nothing
- * @param j nlohmann::json instance to retrieve value from
- * @param keyname key name to check for a value
- * @param v Value to change
- */
-void DPP_EXPORT set_double_not_null(const nlohmann::json* j, const char *keyname, double &v);
-
-/** @brief Returns a 64 bit unsigned integer from a json field value, if defined, else returns 0.
- * DO NOT use this for snowflakes, as usually snowflakes are wrapped in a string!
- * @param j nlohmann::json instance to retrieve value from
- * @param keyname key name to check for a value
- * @return found value
- */
-uint64_t DPP_EXPORT int64_not_null(const nlohmann::json* j, const char *keyname);
-
-/** @brief Sets an unsigned 64 bit integer from a json field value, if defined, else does nothing
- * @param j nlohmann::json instance to retrieve value from
- * @param keyname key name to check for a value
- * @param v Value to change
- */
-void DPP_EXPORT set_int64_not_null(const nlohmann::json* j, const char *keyname, uint64_t &v);
-
-/** @brief Returns a 32 bit unsigned integer from a json field value, if defined, else returns 0
- * @param j nlohmann::json instance to retrieve value from
- * @param keyname key name to check for a value
- * @return found value
- */
-uint32_t DPP_EXPORT int32_not_null(const nlohmann::json* j, const char *keyname);
-
-/** @brief Sets an unsigned 32 bit integer from a json field value, if defined, else does nothing
- * @param j nlohmann::json instance to retrieve value from
- * @param keyname key name to check for a value
- * @param v Value to change
- */
-void DPP_EXPORT set_int32_not_null(const nlohmann::json* j, const char *keyname, uint32_t &v);
-
-/** @brief Returns a 16 bit unsigned integer from a json field value, if defined, else returns 0
- * @param j nlohmann::json instance to retrieve value from
- * @param keyname key name to check for a value
- * @return found value
- */
-uint16_t DPP_EXPORT int16_not_null(const nlohmann::json* j, const char *keyname);
-
-/** @brief Sets an unsigned 16 bit integer from a json field value, if defined, else does nothing
- * @param j nlohmann::json instance to retrieve value from
- * @param keyname key name to check for a value
- * @param v Value to change
- */
-void DPP_EXPORT set_int16_not_null(const nlohmann::json* j, const char *keyname, uint16_t &v);
-
-/** @brief Returns an 8 bit unsigned integer from a json field value, if defined, else returns 0
- * @param j nlohmann::json instance to retrieve value from
- * @param keyname key name to check for a value
- * @return found value
- */
-uint8_t DPP_EXPORT int8_not_null(const nlohmann::json* j, const char *keyname);
-
-/** @brief Sets an unsigned 8 bit integer from a json field value, if defined, else does nothing
- * @param j nlohmann::json instance to retrieve value from
- * @param keyname key name to check for a value
- * @param v Value to change
- */
-void DPP_EXPORT set_int8_not_null(const nlohmann::json* j, const char *keyname, uint8_t &v);
-
-/** @brief Returns a boolean value from a json field value, if defined, else returns false
- * @param j nlohmann::json instance to retrieve value from
- * @param keyname key name to check for a value
- * @return found value
- */
-bool DPP_EXPORT bool_not_null(const nlohmann::json* j, const char *keyname);
-
-/** @brief Sets a boolean from a json field value, if defined, else does nothing
- * @param j nlohmann::json instance to retrieve value from
- * @param keyname key name to check for a value
- * @param v Value to change
- */
-void DPP_EXPORT set_bool_not_null(const nlohmann::json* j, const char *keyname, bool &v);
-
-/** @brief Returns a time_t from an ISO8601 timestamp field in a json value, if defined, else returns
- * epoch value of 0.
- * @param j nlohmann::json instance to retrieve value from
- * @param keyname key name to check for a value
- * @return found value
- */
-time_t DPP_EXPORT ts_not_null(const nlohmann::json* j, const char *keyname);
-
-/** @brief Sets an timestamp from a json field value containing an ISO8601 string, if defined, else does nothing
- * @param j nlohmann::json instance to retrieve value from
- * @param keyname key name to check for a value
- * @param v Value to change
- */
-void DPP_EXPORT set_ts_not_null(const nlohmann::json* j, const char *keyname, time_t &v);
-
-/** @brief Base64 encode data into a string.
- * @param buf Raw binary buffer
- * @param buffer_length Buffer length to encode
- * @return The base64 encoded string
- */
-std::string DPP_EXPORT base64_encode(unsigned char const* buf, unsigned int buffer_length);
-
-/**
- * @brief Convert time_t unix epoch to std::string ISO date/time
- * 
- * @param ts Timestamp to convert
- * @return std::string Converted time/date string
- */
-std::string DPP_EXPORT ts_to_string(time_t ts);
-
-};
+/************************************************************************************
+ *
+ * D++, A Lightweight C++ library for Discord
+ *
+ * Copyright 2021 Craig Edwards and D++ contributors
+ * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ************************************************************************************/
+#pragma once
+
+#include <dpp/export.h>
+#include <dpp/json_fwd.h>
+#include <dpp/json_interface.h>
+#include <dpp/utility.h>
+#include <string_view>
+#include <functional>
+
+namespace dpp {
+
+/**
+ * @brief Returns a snowflake id from a json field value, if defined, else returns 0
+ * @param j nlohmann::json instance to retrieve value from
+ * @param keyname key name to check for a value
+ * @return found value
+ */
+uint64_t DPP_EXPORT snowflake_not_null(const nlohmann::json* j, const char *keyname);
+
+/**
+ * @brief Sets a snowflake id from a json field value, if defined, else does nothing
+ * @param j nlohmann::json instance to retrieve value from
+ * @param keyname key name to check for a value
+ * @param v Value to change
+ */
+void DPP_EXPORT set_snowflake_not_null(const nlohmann::json* j, const char *keyname, uint64_t &v);
+
+/**
+ * @brief Sets an array of snowflakes from a json field value, if defined, else does nothing
+ * @param j nlohmann::json instance to retrieve value from
+ * @param keyname key name to check for the values
+ * @param v Value to change
+ */
+void DPP_EXPORT set_snowflake_array_not_null(const nlohmann::json* j, const char *keyname, std::vector<class snowflake> &v);
+
+/**
+ * @brief Applies a function to each element of a json array.
+ * @param parent nlohmann::json instance to retrieve value from
+ * @param key key name to check for the values
+ * @param fn function to apply to each element
+ */
+void DPP_EXPORT for_each_json(nlohmann::json* parent, std::string_view key, const std::function<void(nlohmann::json*)> &fn);
+
+/**
+ * @brief Sets an array of objects from a json field value, if defined, else does nothing
+ * @tparam T The class of which the array consists of. Must be derived from dpp::json_interface
+ * @param j nlohmann::json instance to retrieve value from
+ * @param key key name to check for the values
+ * @param v Value to change
+ */
+template<class T> void set_object_array_not_null(nlohmann::json* j, std::string_view key, std::vector<T>& v) {
+	v.clear();
+	for_each_json(j, key, [&v](nlohmann::json* elem) {
+		v.push_back(T{}.fill_from_json(elem));
+	});
+}
+
+/**
+ * @brief Returns a string from a json field value, if defined, else returns an empty string.
+ * @param j nlohmann::json instance to retrieve value from
+ * @param keyname key name to check for a value
+ * @return found value
+ */
+std::string DPP_EXPORT string_not_null(const nlohmann::json* j, const char *keyname);
+
+/**
+ * @brief Sets a string from a json field value, if defined, else does nothing
+ * @param j nlohmann::json instance to retrieve value from
+ * @param keyname key name to check for a value
+ * @param v Value to change
+ */
+void DPP_EXPORT set_string_not_null(const nlohmann::json* j, const char *keyname, std::string &v);
+
+/**
+ * @brief This is a repeat of set_string_not_null, but takes in a iconhash.
+ * @param j nlohmann::json instance to retrieve value from
+ * @param keyname key name to check for a value
+ * @param v Value to change
+ */
+void DPP_EXPORT set_iconhash_not_null(const nlohmann::json* j, const char *keyname, utility::iconhash &v);
+
+/**
+ * @brief Returns a double from a json field value, if defined, else returns 0.
+ * @param j nlohmann::json instance to retrieve value from
+ * @param keyname key name to check for a value
+ * @return found value
+ */
+double DPP_EXPORT double_not_null(const nlohmann::json* j, const char *keyname);
+
+/**
+ * @brief Sets a double from a json field value, if defined, else does nothing
+ * @param j nlohmann::json instance to retrieve value from
+ * @param keyname key name to check for a value
+ * @param v Value to change
+ */
+void DPP_EXPORT set_double_not_null(const nlohmann::json* j, const char *keyname, double &v);
+
+/**
+ * @brief Returns a 64 bit unsigned integer from a json field value, if defined, else returns 0.
+ * DO NOT use this for snowflakes, as usually snowflakes are wrapped in a string!
+ * @param j nlohmann::json instance to retrieve value from
+ * @param keyname key name to check for a value
+ * @return found value
+ */
+uint64_t DPP_EXPORT int64_not_null(const nlohmann::json* j, const char *keyname);
+
+/**
+ * @brief Sets an unsigned 64 bit integer from a json field value, if defined, else does nothing
+ * @param j nlohmann::json instance to retrieve value from
+ * @param keyname key name to check for a value
+ * @param v Value to change
+ */
+void DPP_EXPORT set_int64_not_null(const nlohmann::json* j, const char *keyname, uint64_t &v);
+
+/**
+ * @brief Returns a 32 bit unsigned integer from a json field value, if defined, else returns 0
+ * @param j nlohmann::json instance to retrieve value from
+ * @param keyname key name to check for a value
+ * @return found value
+ */
+uint32_t DPP_EXPORT int32_not_null(const nlohmann::json* j, const char *keyname);
+
+/**
+ * @brief Sets an unsigned 32 bit integer from a json field value, if defined, else does nothing
+ * @param j nlohmann::json instance to retrieve value from
+ * @param keyname key name to check for a value
+ * @param v Value to change
+ */
+void DPP_EXPORT set_int32_not_null(const nlohmann::json* j, const char *keyname, uint32_t &v);
+
+/**
+ * @brief Returns a 16 bit unsigned integer from a json field value, if defined, else returns 0
+ * @param j nlohmann::json instance to retrieve value from
+ * @param keyname key name to check for a value
+ * @return found value
+ */
+uint16_t DPP_EXPORT int16_not_null(const nlohmann::json* j, const char *keyname);
+
+/**
+ * @brief Sets an unsigned 16 bit integer from a json field value, if defined, else does nothing
+ * @param j nlohmann::json instance to retrieve value from
+ * @param keyname key name to check for a value
+ * @param v Value to change
+ */
+void DPP_EXPORT set_int16_not_null(const nlohmann::json* j, const char *keyname, uint16_t &v);
+
+/**
+ * @brief Returns an 8 bit unsigned integer from a json field value, if defined, else returns 0
+ * @param j nlohmann::json instance to retrieve value from
+ * @param keyname key name to check for a value
+ * @return found value
+ */
+uint8_t DPP_EXPORT int8_not_null(const nlohmann::json* j, const char *keyname);
+
+/**
+ * @brief Sets an unsigned 8 bit integer from a json field value, if defined, else does nothing
+ * @param j nlohmann::json instance to retrieve value from
+ * @param keyname key name to check for a value
+ * @param v Value to change
+ */
+void DPP_EXPORT set_int8_not_null(const nlohmann::json* j, const char *keyname, uint8_t &v);
+
+/**
+ * @brief Returns a boolean value from a json field value, if defined, else returns false
+ * @param j nlohmann::json instance to retrieve value from
+ * @param keyname key name to check for a value
+ * @return found value
+ */
+bool DPP_EXPORT bool_not_null(const nlohmann::json* j, const char *keyname);
+
+/**
+ * @brief Sets a boolean from a json field value, if defined, else does nothing
+ * @param j nlohmann::json instance to retrieve value from
+ * @param keyname key name to check for a value
+ * @param v Value to change
+ */
+void DPP_EXPORT set_bool_not_null(const nlohmann::json* j, const char *keyname, bool &v);
+
+/**
+ * @brief Returns a time_t from an ISO8601 timestamp field in a json value, if defined, else returns
+ * epoch value of 0.
+ * @param j nlohmann::json instance to retrieve value from
+ * @param keyname key name to check for a value
+ * @return found value
+ */
+time_t DPP_EXPORT ts_not_null(const nlohmann::json* j, const char *keyname);
+
+/**
+ * @brief Sets an timestamp from a json field value containing an ISO8601 string, if defined, else does nothing
+ * @param j nlohmann::json instance to retrieve value from
+ * @param keyname key name to check for a value
+ * @param v Value to change
+ */
+void DPP_EXPORT set_ts_not_null(const nlohmann::json* j, const char *keyname, time_t &v);
+
+/**
+ * @brief Base64 encode data into a string.
+ * @param buf Raw binary buffer
+ * @param buffer_length Buffer length to encode
+ * @return The base64 encoded string
+ */
+std::string DPP_EXPORT base64_encode(unsigned char const* buf, unsigned int buffer_length);
+
+/**
+ * @brief Convert time_t unix epoch to std::string ISO date/time
+ * 
+ * @param ts Timestamp to convert
+ * @return std::string Converted time/date string
+ */
+std::string DPP_EXPORT ts_to_string(time_t ts);
+
+}
diff --git a/3rdParty/dpp/discordvoiceclient.h b/3rdParty/dpp/discordvoiceclient.h
index a98fd84f8d..a990430671 100644
--- a/3rdParty/dpp/discordvoiceclient.h
+++ b/3rdParty/dpp/discordvoiceclient.h
@@ -1,868 +1,1280 @@
-/************************************************************************************
- *
- * D++, A Lightweight C++ library for Discord
- *
- * Copyright 2021 Craig Edwards and D++ contributors 
- * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- ************************************************************************************/
-#pragma once
-
-#include <dpp/export.h>
-
-#include <cerrno>
-#include <cstdio>
-#include <cstdlib>
-#include <sys/types.h>
-#include <fcntl.h>
-#include <csignal>
-#include <cstring>
-#include <string>
-#include <map>
-#include <vector>
-#include <dpp/nlohmann/json_fwd.hpp>
-#include <dpp/wsclient.h>
-#include <dpp/dispatcher.h>
-#include <dpp/cluster.h>
-#include <dpp/discordevents.h>
-#include <dpp/socket.h>
-#include <queue>
-#include <thread>
-#include <deque>
-#include <mutex>
-#include <shared_mutex>
-#include <memory>
-#include <future>
-#include <functional>
-#include <chrono>
-
-using json = nlohmann::json;
-
-struct OpusDecoder;
-struct OpusEncoder;
-struct OpusRepacketizer;
-
-namespace dpp {
-
-// Forward declaration
-class cluster;
-
-/**
- * @brief An opus-encoded RTP packet to be sent out to a voice channel
- */
-struct DPP_EXPORT voice_out_packet {
-	/** 
-	 * @brief Each string is a UDP packet.
-	 * Generally these will be RTP.
-	 */
-	std::string packet;
-	/**
-	 * @brief Duration of packet
-	 */
-	uint64_t duration;
-};
-
-#define AUDIO_TRACK_MARKER (uint16_t)0xFFFF
-
-#define AUDIO_OVERLAP_SLEEP_SAMPLES 30
-
-/** @brief Implements a discord voice connection.
- * Each discord_voice_client connects to one voice channel and derives from a websocket client.
- */
-class DPP_EXPORT discord_voice_client : public websocket_client
-{
-	/**
-	 * @brief Mutex for outbound packet stream
-	 */
-	std::mutex stream_mutex;
-
-	/**
-	 * @brief Mutex for message queue
-	 */
-	std::shared_mutex queue_mutex;
-
-	/**
-	 * @brief Queue of outbound messages
-	 */
-	std::deque<std::string> message_queue;
-
-	/**
-	 * @brief Thread this connection is executing on
-	 */
-	std::thread* runner;
-
-	/**
-	 * @brief Run shard loop under a thread
-	 */
-	void thread_run();
-
-	/**
-	 * @brief Last connect time of voice session
-	 */
-	time_t connect_time;
-
-	/**
-	 * @brief IP of UDP/RTP endpoint
-	 */
-	std::string ip;
-
-	/**
-	 * @brief Port number of UDP/RTP endpoint
-	 */
-	uint16_t port;
-
-	/**
-	 * @brief SSRC value 
-	 */
-	uint64_t ssrc;
-
-	/**
-	 * @brief List of supported audio encoding modes
-	 */
-	std::vector<std::string> modes;
-
-	/**
-	 * @brief Timescale in nanoseconds
-	 */
-	uint64_t timescale;
-
-	/**
-	 * @brief Output buffer
-	 */
-	std::vector<voice_out_packet> outbuf;
-
-	/**
-	 * @brief Data type of RTP packet sequence number field.
-	 */
-	using rtp_seq_t = uint16_t;
-	using rtp_timestamp_t = uint32_t;
-
-	/**
-	 * @brief Keeps track of the voice payload to deliver to voice handlers.
-	 */
-	struct voice_payload {
-		/**
-		 * @brief The sequence number of the RTP packet that generated this
-		 * voice payload.
-		 */
-		rtp_seq_t seq;
-		/**
-		 * @brief The timestamp of the RTP packet that generated this voice
-		 * payload.
-		 *
-		 * The timestamp is used to detect the order around where sequence
-		 * number wraps around.
-		 */
-		rtp_timestamp_t timestamp;
-		/**
-		 * @brief The event payload that voice handlers receive.
-		 */
-		std::unique_ptr<voice_receive_t> vr;
-		
-		/**
-		 * @brief For priority_queue sorting.
-		 * @return true if "this" has lower priority that "other",
-		 *         i.e. appears later in the queue; false otherwise.
-		 */
-		bool operator<(const voice_payload& other) const;
-	};
-
-	struct voice_payload_parking_lot {
-		/**
-		 * @brief The range of RTP packet sequence number and timestamp in the lot.
-		 *
-		 * The minimum is used to drop packets that arrive too late. Packets
-		 * less than the minimum have been delivered to voice handlers and
-		 * there is no going back. Unfortunately we just have to drop them.
-		 *
-		 * The maximum is used, at flush time, to calculate the minimum for
-		 * the next batch. The maximum is also updated every time we receive an
-		 * RTP packet with a larger value.
-		 */
-		struct seq_range_t {
-			rtp_seq_t min_seq, max_seq;
-			rtp_timestamp_t min_timestamp, max_timestamp;
-		} range;
-		/**
-		 * @brief The queue of parked voice payloads.
-		 * 
-		 * We group payloads and deliver them to handlers periodically as the
-		 * handling of out-of-order RTP packets. Payloads in between flushes
-		 * are parked and sorted in this queue.
-		 */
-		std::priority_queue<voice_payload> parked_payloads;
-		/**
-		 * @brief The decoder ctls to be set on the decoder.
-		 */
-		std::vector<std::function<void(OpusDecoder&)>> pending_decoder_ctls;
-		/**
-		 * @brief libopus decoder
-		 *
-		 * Shared with the voice courier thread that does the decoding.
-		 * This is not protected by a mutex because only the courier thread
-		 * uses the decoder.
-		 */
-		std::shared_ptr<OpusDecoder> decoder;
-	};
-	/**
-	 * @brief Thread used to deliver incoming voice data to handlers.
-	 */
-	std::thread voice_courier;
-	/**
-	 * @brief Shared state between this voice client and the courier thread.
-	 */
-	struct courier_shared_state_t {
-		/**
-		 * @brief Protects all following members.
-		 */
-		std::mutex mtx;
-		/**
-		 * @brief Signaled when there is a new payload to deliver or terminating state has changed.
-		 */
-		std::condition_variable signal_iteration;
-		/**
-		 * @brief Voice buffers to be reported to handler, grouped by speaker.
-		 *
-		 * Buffers are parked here and flushed every 500ms.
-		 */
-		std::map<snowflake, voice_payload_parking_lot> parked_voice_payloads;
-		/**
-		 * @brief Used to signal termination.
-		 *
-		 * @note Pending payloads are delivered first before termination.
-		 */
-		bool terminating = false;
-	} voice_courier_shared_state;
-	/**
-	 * @brief The run loop of the voice courier thread.
-	 */
-	static void voice_courier_loop(discord_voice_client&, courier_shared_state_t&);
-
-	/**
-	 * @brief If true, audio packet sending is paused
-	 */
-	bool paused;
-
-#ifdef HAVE_VOICE
-	/**
-	 * @brief libopus encoder
-	 */
-	OpusEncoder* encoder;
-
-	/**
-	 * @brief libopus repacketizer
-	 * (merges frames into one packet)
-	 */
-	OpusRepacketizer* repacketizer;
-#else
-	/**
-	 * @brief libopus encoder
-	 */
-	void* encoder;
-
-	/**
-	 * @brief libopus repacketizer
-	 * (merges frames into one packet)
-	 */
-	void* repacketizer;
-#endif
-
-	/**
-	 * @brief File descriptor for UDP connection
-	 */
-	dpp::socket fd;
-
-	/**
-	 * @brief Secret key for encrypting voice.
-	 * If it has been sent, this is non-null and points to a 
-	 * sequence of exactly 32 bytes.
-	 */
-	uint8_t* secret_key;
-
-	/**
-	 * @brief Sequence number of outbound audio. This is incremented
-	 * once per frame sent.
-	 */
-	uint16_t sequence;
-
-	/**
-	 * @brief Timestamp value used in outbound audio. Each packet
-	 * has the timestamp value which is incremented to match
-	 * how many frames are sent.
-	 */
-	uint32_t timestamp;
-
-	/**
-	 * @brief Last sent packet high-resolution timestamp
-	 */
-	std::chrono::high_resolution_clock::time_point last_timestamp;
-
-	/**
-	 * @brief Fraction of the sleep that was not executed after the last audio packet was sent
-	 */
-	std::chrono::nanoseconds last_sleep_remainder;
-
-	/**
-	 * @brief Maps receiving ssrc to user id
-	 */
-	std::unordered_map<uint32_t, snowflake> ssrc_map;
-
-	/**
-	 * @brief This is set to true if we have started sending audio.
-	 * When this moves from false to true, this causes the
-	 * client to send the 'talking' notification to the websocket.
-	 */
-	bool sending;
-
-	/**
-	 * @brief Number of track markers in the buffer. For example if there
-	 * are two track markers in the buffer there are 3 tracks.
-	 * 
-	 * **Special case:**
-	 * 
-	 * If the buffer is empty, there are zero tracks in the
-	 * buffer.
-	 */
-	uint32_t tracks;
-
-	/**
-	 * @brief Meta data associated with each track.
-	 * Arbitrary string that the user can set via
-	 * dpp::discord_voice_client::add_marker
-	 */
-	std::vector<std::string> track_meta;
-
-	/** 
-	 * @brief Encoding buffer for opus repacketizer and encode
-	 */
-	uint8_t encode_buffer[65536];
-
-	/**
-	 * @brief Send data to UDP socket immediately.
-	 * 
-	 * @param data data to send
-	 * @param length length of data to send
-	 * @return int bytes sent. Will return -1 if we cannot send
-	 */
-	int udp_send(const char* data, size_t length);
-
-	/**
-	 * @brief Receive data from UDP socket immediately.
-	 * 
-	 * @param data data to receive
-	 * @param max_length size of data receiving buffer
-	 * @return int bytes received. -1 if there is an error
-	 * (e.g. EAGAIN)
-	 */
-	int udp_recv(char* data, size_t max_length);
-
-	/**
-	 * @brief This hooks the ssl_client, returning the file
-	 * descriptor if we want to send buffered data, or
-	 * -1 if there is nothing to send
-	 * 
-	 * @return int file descriptor or -1
-	 */
-	dpp::socket want_write();
-
-	/**
-	 * @brief This hooks the ssl_client, returning the file
-	 * descriptor if we want to receive buffered data, or
-	 * -1 if we are not wanting to receive
-	 * 
-	 * @return int file descriptor or -1
-	 */
-	dpp::socket want_read();
-
-	/**
-	 * @brief Called by ssl_client when the socket is ready
-	 * for writing, at this point we pick the head item off
-	 * the buffer and send it. So long as it doesn't error
-	 * completely, we pop it off the head of the queue.
-	 */
-	void write_ready();
-
-	/**
-	 * @brief Called by ssl_client when there is data to be
-	 * read. At this point we insert that data into the
-	 * input queue.
-	 */
-	void read_ready();
-
-	/**
-	 * @brief Send data to the UDP socket, using the buffer.
-	 * 
-	 * @param packet packet data
-	 * @param len length of packet
-	 * @param duration duration of opus packet
-	 */
-	void send(const char* packet, size_t len, uint64_t duration);
-
-	/**
-	 * @brief Queue a message to be sent via the websocket
-	 * 
-	 * @param j The JSON data of the message to be sent
-	 * @param to_front If set to true, will place the message at the front of the queue not the back
-	 * (this is for urgent messages such as heartbeat, presence, so they can take precedence over
-	 * chunk requests etc)
-	 */
-	void queue_message(const std::string &j, bool to_front = false);
-
-	/**
-	 * @brief Clear the outbound message queue
-	 * 
-	 */
-	void clear_queue();
-
-	/**
-	 * @brief Get the size of the outbound message queue
-	 * 
-	 * @return The size of the queue
-	 */
-	size_t get_queue_size();
-
-	/**
-	 * @brief Encode a byte buffer using opus codec.
-	 * Multiple opus frames (2880 bytes each) will be encoded into one packet for sending.
-	 * 
-	 * @param input Input data as raw bytes of PCM data
-	 * @param inDataSize Input data length
-	 * @param output Output data as an opus encoded packet
-	 * @param outDataSize Output data length, should be at least equal to the input size.
-	 * Will be adjusted on return to the actual compressed data size.
-	 * @return size_t The compressed data size that was encoded.
-	 * @throw dpp::voice_exception If data length to encode is invalid or voice support not compiled into D++
-	 */
-	size_t encode(uint8_t *input, size_t inDataSize, uint8_t *output, size_t &outDataSize);
-
-public:
-
-	/**
-	 * @brief Owning cluster
-	 */
-	class dpp::cluster* creator;
-
-	/**
-	 * @brief This needs to be static, we only initialise libsodium once per program start,
-	 * so initialising it on first use in a voice connection is best.
-	 */
-	static bool sodium_initialised;
-
-	/**
-	 * @brief True when the thread is shutting down
-	 */
-	bool terminating;
-
-	/**
-	 * @brief Heartbeat interval for sending heartbeat keepalive
-	 */
-	uint32_t heartbeat_interval;
-
-	/**
-	 * @brief Last voice channel websocket heartbeat
-	 */
-	time_t last_heartbeat;
-
-	/**
-	 * @brief Thread ID
-	 */
-	std::thread::native_handle_type thread_id;
-
-	/**
-	 * @brief Discord voice session token
-	 */
-	std::string token;
-
-	/**
-	 * @brief Discord voice session id
-	 */
-	std::string sessionid;
-
-	/**
-	 * @brief Server ID
-	 */
-	snowflake server_id;
-
-	/**
-	 * @brief Channel ID
-	 */
-	snowflake channel_id;
-
-	/**
-	 * @brief The audio type to be sent. The default type is recorded audio.
-	 *
-	 * If the audio is recorded, the sending of audio packets is throttled.
-	 * Otherwise, if the audio is live, the sending is not throttled.
-	 *
-	 * Discord voice engine is expecting audio data as if they were from
-	 * some audio device, e.g. microphone, where the data become available
-	 * as they get captured from the audio device.
-	 *
-	 * In case of recorded audio, unlike from a device, the audio data are
-	 * usually instantly available in large chunks. Throttling is needed to
-	 * simulate audio data coming from an audio device. In case of live audio,
-	 * the throttling is by nature, so no extra throttling is needed.
-	 *
-	 * Using live audio mode for recorded audio can cause Discord to skip
-	 * audio data because Discord does not expect to receive, say, 3 minutes'
-	 * worth of audio data in 1 second.
-	 *
-	 * There are some inaccuracies in the throttling method used by the recorded
-	 * audio mode on some systems (mainly Windows) which causes gaps and stutters
-	 * in the resulting audio stream. The overlap audio mode provides a different 
-	 * implementation that fixes the issue. This method is slightly more CPU 
-	 * intensive, and should only be used if you encounter issues with recorded audio 
-	 * on your system.
-	 * 
-	 * Use discord_voice_client::set_send_audio_type to change this value as
-	 * it ensures thread safety.
-	 */
-	enum send_audio_type_t
-	{
-	    satype_recorded_audio,
-	    satype_live_audio,
-		satype_overlap_audio
-	} send_audio_type = satype_recorded_audio;
-
-	/**
-	 * @brief Sets the gain for the specified user.
-	 *
-	 * Similar to the User Volume slider, controls the listening volume per user.
-	 * Uses native Opus gain control, so clients don't have to perform extra
-	 * audio processing.
-	 *
-	 * The gain setting will affect the both individual and combined voice audio.
-	 *
-	 * The gain value can also be set even before the user connects to the voice
-	 * channel.
-	 *
-	 * @param user_id The ID of the user where the gain is to be controlled.
-	 * @param factor Nonnegative factor to scale the amplitude by, where 1.f reverts
-	 *               to the default volume.
-	 */
-	void set_user_gain(snowflake user_id, float factor);
-
-	/**
-	 * @brief Log a message to whatever log the user is using.
-	 * The logged message is passed up the chain to the on_log event in user code which can then do whatever
-	 * it wants to do with it.
-	 * @param severity The log level from dpp::loglevel
-	 * @param msg The log message to output
-	 */
-	virtual void log(dpp::loglevel severity, const std::string &msg) const;
-
-	/**
-	 * @brief Fires every second from the underlying socket I/O loop, used for sending heartbeats
-	 * @throw dpp::exception if the socket needs to disconnect
-	 */
-	virtual void one_second_timer();
-
-	/**
-	 * @brief voice client is ready to stream audio.
-	 * The voice client is considered ready if it has a secret key.
-	 * 
-	 * @return true if ready to stream audio
-	 */
-	bool is_ready();
-
-	/**
-	 * @brief Returns true if the voice client is connected to the websocket
-	 * 
-	 * @return True if connected
-	 */
-	bool is_connected();
-
-	/**
-	 * @brief Returns the connection time of the voice client
-	 * 
-	 * @return dpp::utility::uptime Detail of how long the voice client has been connected for
-	 */
-	dpp::utility::uptime get_uptime();
-
-	/** Constructor takes shard id, max shards and token.
-	 * @param _cluster The cluster which owns this voice connection, for related logging, REST requests etc
-	 * @param _channel_id The channel id to identify the voice connection as
-	 * @param _server_id The server id (guild id) to identify the voice connection as
-	 * @param _token The voice session token to use for identifying to the websocket
-	 * @param _session_id The voice session id to identify with
-	 * @param _host The voice server hostname to connect to (hostname:port format)
-	 * @throw dpp::voice_exception Sodium or Opus failed to initialise, or D++ is not compiled with voice support
-	 */
-	discord_voice_client(dpp::cluster* _cluster, snowflake _channel_id, snowflake _server_id, const std::string &_token, const std::string &_session_id, const std::string &_host);
-
-	/**
-	 * @brief Destroy the discord voice client object
-	 */
-	virtual ~discord_voice_client();
-
-	/**
-	 * @brief Handle JSON from the websocket.
-	 * @param buffer The entire buffer content from the websocket client
-	 * @return bool True if a frame has been handled
-	 * @throw dpp::exception If there was an error processing the frame, or connection to UDP socket failed
-	 */
-	virtual bool handle_frame(const std::string &buffer);
-
-	/**
-	 * @brief Handle a websocket error.
-	 * @param errorcode The error returned from the websocket
-	 */
-	virtual void error(uint32_t errorcode);
-
-	/**
-	 * @brief Start and monitor I/O loop
-	 */
-	void run();
-
-	/**
-	 * @brief Send raw audio to the voice channel.
-	 * 
-	 * You should send an audio packet of 11520 bytes.
-	 * Note that this function can be costly as it has to opus encode
-	 * the PCM audio on the fly, and also encrypt it with libsodium.
-	 * 
-	 * @note Because this function encrypts and encodes packets before
-	 * pushing them onto the output queue, if you have a complete stream
-	 * ready to send and know its length it is advisable to call this
-	 * method multiple times to enqueue the entire stream audio so that
-	 * it is all encoded at once (unless you have set use_opus to false).
-	 * Constantly calling this from the dpp::on_voice_buffer_send callback
-	 * can and will eat a TON of cpu!
-	 * 
-	 * @param audio_data Raw PCM audio data. Channels are interleaved,
-	 * with each channel's amplitude being a 16 bit value.
-	 * 
-	 * The audio data should be 48000Hz signed 16 bit audio.
-	 * 
-	 * @param length The length of the audio data. The length should
-	 * be a multiple of 4 (2x 16 bit stereo channels) with a maximum
-	 * length of 11520, which is a complete opus frame at highest
-	 * quality.
-	 * 
-	 * @return discord_voice_client& Reference to self
-	 * 
-	 * @throw dpp::voice_exception If data length is invalid or voice support not compiled into D++
-	 */
-	discord_voice_client& send_audio_raw(uint16_t* audio_data, const size_t length);
-
-	/**
-	 * @brief Send opus packets to the voice channel
-	 * 
-	 * Some containers such as .ogg may contain OPUS
-	 * encoded data already. In this case, we don't need to encode the
-	 * frames using opus here. We can bypass the codec, only applying 
-	 * libsodium to the stream.
-	 * 
-	 * @param opus_packet Opus packets. Discord expects opus frames 
-	 * to be encoded at 48000Hz
-	 * 
-	 * @param length The length of the audio data. 
-	 * 
-	 * @param duration Generally duration is 2.5, 5, 10, 20, 40 or 60
-	 * if the timescale is 1000000 (1ms) 
-	 * 
-	 * @return discord_voice_client& Reference to self
-	 * 
-	 * @note It is your responsibility to ensure that packets of data 
-	 * sent to send_audio are correctly repacketized for streaming, 
-	 * e.g. that audio frames are not too large or contain
-	 * an incorrect format. Discord will still expect the same frequency
-	 * and bit width of audio and the same signedness.
-	 * 
-	 * @throw dpp::voice_exception If data length is invalid or voice support not compiled into D++
-	 */
-	discord_voice_client& send_audio_opus(uint8_t* opus_packet, const size_t length, uint64_t duration);
-
-	/**
-	 * @brief Send opus packets to the voice channel
-	 * 
-	 * Some containers such as .ogg may contain OPUS
-	 * encoded data already. In this case, we don't need to encode the
-	 * frames using opus here. We can bypass the codec, only applying 
-	 * libsodium to the stream.
-	 * 
-	 * Duration is calculated internally
-	 * 
-	 * @param opus_packet Opus packets. Discord expects opus frames 
-	 * to be encoded at 48000Hz
-	 * 
-	 * @param length The length of the audio data. 
-	 * 
-	 * @return discord_voice_client& Reference to self
-	 * 
-	 * @note It is your responsibility to ensure that packets of data 
-	 * sent to send_audio are correctly repacketized for streaming, 
-	 * e.g. that audio frames are not too large or contain
-	 * an incorrect format. Discord will still expect the same frequency
-	 * and bit width of audio and the same signedness.
-	 * 
-	 * @throw dpp::voice_exception If data length is invalid or voice support not compiled into D++
-	 */
-	discord_voice_client& send_audio_opus(uint8_t* opus_packet, const size_t length);
-
-	/**
-	 * @brief Send silence to the voice channel
-	 * 
-	 * @param duration How long to send silence for. With the standard
-	 * timescale this is in milliseconds. Allowed values are 2.5,
-	 * 5, 10, 20, 40 or 60 milliseconds.
-	 * @return discord_voice_client& Reference to self
-	 * @throw dpp::voice_exception if voice support is not compiled into D++
-	 */
-	discord_voice_client& send_silence(const uint64_t duration);
-
-	/**
-	 * @brief Sets the audio type that will be sent with send_audio_* methods.
-	 *
-	 * @see send_audio_type_t
-	 */
-	discord_voice_client& set_send_audio_type(send_audio_type_t type);
-
-	/**
-	 * @brief Set the timescale in nanoseconds.
-	 * 
-	 * @param new_timescale Timescale to set. This defaults to 1000000,
-	 * which means 1 millisecond.
-	 * @return discord_voice_client& Reference to self
-	 * @throw dpp::voice_exception If data length is invalid or voice support not compiled into D++
-	 */
-	discord_voice_client& set_timescale(uint64_t new_timescale);
-
-	/**
-	 * @brief Get the current timescale, this will default to 1000000
-	 * which means 1 millisecond.
-	 * 
-	 * @return uint64_t timescale in nanoseconds
-	 */
-	uint64_t get_timescale();
-
-	/**
-	 * @brief Mark the voice connection as 'speaking'.
-	 * This sends a JSON message to the voice websocket which tells discord
-	 * that the user is speaking. The library automatically calls this for you
-	 * whenever you send audio.
-	 * 
-	 * @return discord_voice_client& Reference to self
-	 */
-	discord_voice_client& speak();
-
-	/**
-	 * @brief Pause sending of audio
-	 * 
-	 * @param pause True to pause, false to resume
-	 * @return reference to self
-	 */
-	discord_voice_client& pause_audio(bool pause);
-
-	/**
-	 * @brief Immediately stop all audio.
-	 * Clears the packet queue.
-	 * @return reference to self
-	 */
-	discord_voice_client& stop_audio();
-
-	/**
-	 * @brief Returns true if we are playing audio
-	 * 
-	 * @return true if audio is playing
-	 */
-	bool is_playing();
-
-	/**
-	 * @brief Get the number of seconds remaining
-	 * of the audio output buffer
-	 * 
-	 * @return float number of seconds remaining 
-	 */
-	float get_secs_remaining();
-
-	/**
-	 * @brief Get the number of tracks remaining
-	 * in the output buffer.
-	 * This is calculated by the number of track
-	 * markers plus one.
-	 * @return uint32_t Number of tracks in the
-	 * buffer
-	 */
-	uint32_t get_tracks_remaining();
-
-	/**
-	 * @brief Get the time remaining to send the
-	 * audio output buffer in hours:minutes:seconds
-	 * 
-	 * @return dpp::utility::uptime length of buffer
-	 */
-	dpp::utility::uptime get_remaining();
-
-	/**
-	 * @brief Insert a track marker into the audio
-	 * output buffer.
-	 * A track marker is an arbitrary flag in the
-	 * buffer contents that indicates the end of some
-	 * block of audio of significance to the sender.
-	 * This may be a song from a streaming site, or
-	 * some voice audio/speech, a sound effect, or
-	 * whatever you choose. You can later skip
-	 * to the next marker using the
-	 * dpp::discord_voice_client::skip_to_next_marker
-	 * function.
-	 * @param metadata Arbitrary information related to this
-	 * track
-	 * @return reference to self
-	 */
-	discord_voice_client& insert_marker(const std::string& metadata = "");
-
-	/**
-	 * @brief Skip tp the next track marker,
-	 * previously inserted by using the
-	 * dpp::discord_voice_client::insert_marker
-	 * function. If there are no markers in the
-	 * output buffer, then this skips to the end
-	 * of the buffer and is equivalent to the
-	 * dpp::discord_voice_client::stop_audio
-	 * function.
-	 * @note It is possible to use this function
-	 * while the output stream is paused.
-	 * @return reference to self
-	 */
-	discord_voice_client& skip_to_next_marker();
-
-	/**
-	 * @brief Get the metadata string associated with each inserted marker.
-	 * 
-	 * @return const std::vector<std::string>& list of metadata strings
-	 */
-	const std::vector<std::string> get_marker_metadata();
-
-	/**
-	 * @brief Returns true if the audio is paused.
-	 * You can unpause with
-	 * dpp::discord_voice_client::pause_audio.
-	 * 
-	 * @return true if paused
-	 */
-	bool is_paused();
-
-	/**
-	 * @brief Discord external IP detection.
-	 * @return std::string Your external IP address
-	 * @note This is a blocking operation that waits
-	 * for a single packet from Discord's voice servers.
-	 */
-	std::string discover_ip();
-};
-
-};
-
+/************************************************************************************
+ *
+ * D++, A Lightweight C++ library for Discord
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright 2021 Craig Edwards and D++ contributors 
+ * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ************************************************************************************/
+#pragma once
+
+#include <dpp/export.h>
+
+#include <cerrno>
+#include <cstdio>
+#include <cstdlib>
+#include <sys/types.h>
+#include <fcntl.h>
+#include <csignal>
+#include <cstring>
+#include <string>
+#include <map>
+#include <vector>
+#include <dpp/json_fwd.h>
+#include <dpp/wsclient.h>
+#include <dpp/dispatcher.h>
+#include <dpp/cluster.h>
+#include <dpp/discordevents.h>
+#include <dpp/socket.h>
+#include <dpp/socketengine.h>
+#include <queue>
+#include <thread>
+#include <deque>
+#include <mutex>
+#include <shared_mutex>
+#include <memory>
+#include <future>
+#include <functional>
+#include <chrono>
+#include <set>
+
+struct OpusDecoder;
+struct OpusEncoder;
+struct OpusRepacketizer;
+
+namespace dpp {
+
+/**
+ * @brief Sample rate for OPUS (48khz)
+ */
+[[maybe_unused]] inline constexpr int32_t opus_sample_rate_hz = 48000;
+
+/**
+ * @brief Channel count for OPUS (stereo)
+ */
+[[maybe_unused]] inline constexpr int32_t opus_channel_count = 2;
+
+/**
+ * @brief Discord voice protocol version
+ */
+[[maybe_unused]] inline constexpr uint8_t voice_protocol_version = 8;
+
+
+class audio_mixer;
+
+namespace dave::mls {
+	class session;
+}
+
+// !TODO: change these to constexpr and rename every occurrence across the codebase
+#define AUDIO_TRACK_MARKER (uint16_t)0xFFFF
+
+#define AUDIO_OVERLAP_SLEEP_SAMPLES 30
+
+inline constexpr size_t send_audio_raw_max_length = 11520;
+
+inline constexpr size_t secret_key_size = 32;
+
+struct dave_state;
+
+/*
+* @brief For holding a moving average of the number of current voice users, for applying a smooth gain ramp.
+*/
+struct DPP_EXPORT moving_averager {
+	moving_averager() = default;
+
+	moving_averager(uint64_t collection_count_new);
+
+	moving_averager operator+=(int64_t value);
+
+	operator float();
+
+protected:
+	std::deque<int64_t> values{};
+	uint64_t collectionCount{};
+};
+
+// Forward declaration
+class cluster;
+
+/**
+ * @brief An opus-encoded RTP packet to be sent out to a voice channel
+ */
+struct DPP_EXPORT voice_out_packet {
+	/** 
+	 * @brief Each string is a UDP packet.
+	 * Generally these will be RTP.
+	 */
+	std::string packet;
+
+	/**
+	 * @brief Duration of packet
+	 */
+	uint64_t duration;
+};
+
+/**
+ * @brief Supported DAVE (Discord Audio Visual Encryption) protocol versions
+ */
+enum dave_version_t : uint8_t {
+	/**
+	 * @brief DAVE disabled (default for now)
+	 */
+	dave_version_none = 0,
+	/**
+	 * @brief DAVE enabled, version 1 (E2EE encryption on top of openssl)
+	 */
+	dave_version_1 = 1,
+};
+
+/**
+ * @brief Discord voice websocket opcode types
+ */
+enum voice_websocket_opcode_t : uint8_t {
+	voice_opcode_connection_identify = 0,
+	voice_opcode_connection_select_protocol = 1,
+	voice_opcode_connection_ready = 2,
+	voice_opcode_connection_heartbeat = 3,
+	voice_opcode_connection_description = 4,
+	voice_opcode_client_speaking = 5,
+	voice_opcode_connection_heartbeat_ack = 6,
+	voice_opcode_connection_resume = 7,
+	voice_opcode_connection_hello = 8,
+	voice_opcode_connection_resumed = 9,
+	voice_opcode_multiple_clients_connect = 11,
+	voice_opcode_client_disconnect = 13,
+	voice_opcode_media_sink = 15,
+	voice_client_flags = 18,
+	voice_client_platform = 20,
+	voice_client_dave_prepare_transition = 21,
+	voice_client_dave_execute_transition = 22,
+	voice_client_dave_transition_ready = 23,
+	voice_client_dave_prepare_epoch = 24,
+	voice_client_dave_mls_external_sender = 25,
+	voice_client_dave_mls_key_package = 26,
+	voice_client_dave_mls_proposals = 27,
+	voice_client_dave_mls_commit_message = 28,
+	voice_client_dave_announce_commit_transition = 29,
+	voice_client_dave_mls_welcome = 30,
+	voice_client_dave_mls_invalid_commit_welcome = 31,
+};
+
+/**
+ * @brief DAVE E2EE Binary frame header
+ */
+struct dave_binary_header_t {
+	/**
+	 * @brief Sequence number
+	 */
+	uint16_t seq;
+
+	/**
+	 * @brief Opcode type
+	 */
+	uint8_t opcode;
+
+	/**
+	 * @brief Data package, an opaque structure passed to the
+	 * Discord libdave functions.
+	 */
+	std::vector<uint8_t> package;
+
+	/**
+	 * @brief Fill binary header from inbound buffer
+	 * @param buffer inbound websocket buffer
+	 */
+	dave_binary_header_t(const std::string& buffer);
+
+	/**
+	 * Get the data package from the packed binary frame, as a vector of uint8_t
+	 * for use in the libdave functions
+	 * @return data blob
+	 */
+	[[nodiscard]] std::vector<uint8_t> get_data() const;
+
+	/**
+	 * Get transition ID for process_commit and process_welcome
+	 *
+	 * @return Transition ID
+	 */
+	[[nodiscard]] uint16_t get_transition_id() const;
+
+private:
+	/**
+	 * @brief Transition id, only valid when the opcode is
+	 * commit and welcome state. Use get_transition_id() to obtain value.
+	 */
+	uint16_t transition_id;
+};
+
+/**
+ * @brief A callback for obtaining a user's privacy code.
+ * The privacy code is returned as the parameter to the function.
+ *
+ * This is a callback function because DAVE requires use of a very resource
+ * intensive SCRYPT call, which uses lots of ram and cpu and take significant
+ * time.
+ */
+using privacy_code_callback_t = std::function<void(const std::string&)>;
+
+/**
+ * @brief A callback for a full reconnection after the voice client disconnects due to error.
+ */
+using full_reconnection_callback_t = std::function<void(bool)>;
+
+/** @brief Implements a discord voice connection.
+ * Each discord_voice_client connects to one voice channel and derives from a websocket client.
+ */
+class DPP_EXPORT discord_voice_client : public websocket_client
+{
+	/**
+	 * @brief Clean up resources
+	 */
+	void cleanup();
+
+	/**
+	 * @brief A frame of silence packet
+	 */
+	static constexpr uint8_t silence_packet[3] = { 0xf8, 0xff, 0xfe };
+
+	/**
+	 * @brief Mutex for outbound packet stream
+	 */
+	std::mutex stream_mutex;
+
+	/**
+	 * @brief Mutex for message queue
+	 */
+	std::shared_mutex queue_mutex;
+
+	/**
+	 * @brief Our public IP address
+	 *
+	 * Use discord_voice_client::discover_ip() to access this value
+	 */
+	std::string external_ip;
+
+	/**
+	 * @brief Queue of outbound messages
+	 */
+	std::deque<std::string> message_queue;
+
+	/**
+	 * @brief Last connect time of voice session
+	 */
+	time_t connect_time{};
+
+	/*
+	* @brief For mixing outgoing voice data.
+	*/
+	std::unique_ptr<audio_mixer> mixer;
+
+	/**
+	 * @brief IP of UDP/RTP endpoint
+	 */
+	std::string ip;
+
+	/**
+	 * @brief Port number of UDP/RTP endpoint
+	 */
+	uint16_t port{};
+
+	/**
+	 * @brief SSRC value 
+	 */
+	uint64_t ssrc{};
+
+	/**
+	 * @brief List of supported audio encoding modes
+	 */
+	std::vector<std::string> modes;
+
+	/**
+	 * @brief Timescale in nanoseconds
+	 */
+	uint64_t timescale{};
+
+	/**
+	 * @brief Output buffer
+	 */
+	std::vector<voice_out_packet> outbuf;
+
+	/**
+	 * @brief Data type of RTP packet sequence number field.
+	 */
+	using rtp_seq_t = uint16_t;
+	using rtp_timestamp_t = uint32_t;
+
+	/**
+	 * @brief Keeps track of the voice payload to deliver to voice handlers.
+	 */
+	struct voice_payload {
+		/**
+		 * @brief The sequence number of the RTP packet that generated this
+		 * voice payload.
+		 */
+		rtp_seq_t seq;
+
+		/**
+		 * @brief The timestamp of the RTP packet that generated this voice
+		 * payload.
+		 *
+		 * The timestamp is used to detect the order around where sequence
+		 * number wraps around.
+		 */
+		rtp_timestamp_t timestamp;
+
+		/**
+		 * @brief The event payload that voice handlers receive.
+		 */
+		std::unique_ptr<voice_receive_t> vr;
+		
+		/**
+		 * @brief For priority_queue sorting.
+		 * @return true if "this" has lower priority that "other",
+		 *         i.e. appears later in the queue; false otherwise.
+		 */
+		bool operator<(const voice_payload& other) const;
+	};
+
+	struct voice_payload_parking_lot {
+		/**
+		 * @brief The range of RTP packet sequence number and timestamp in the lot.
+		 *
+		 * The minimum is used to drop packets that arrive too late. Packets
+		 * less than the minimum have been delivered to voice handlers and
+		 * there is no going back. Unfortunately we just have to drop them.
+		 *
+		 * The maximum is used, at flush time, to calculate the minimum for
+		 * the next batch. The maximum is also updated every time we receive an
+		 * RTP packet with a larger value.
+		 */
+		struct seq_range_t {
+			rtp_seq_t min_seq, max_seq;
+			rtp_timestamp_t min_timestamp, max_timestamp;
+		} range;
+
+		/**
+		 * @brief The queue of parked voice payloads.
+		 * 
+		 * We group payloads and deliver them to handlers periodically as the
+		 * handling of out-of-order RTP packets. Payloads in between flushes
+		 * are parked and sorted in this queue.
+		 */
+		std::priority_queue<voice_payload> parked_payloads;
+
+		/**
+		 * @brief The decoder ctls to be set on the decoder.
+		 */
+		std::vector<std::function<void(OpusDecoder&)>> pending_decoder_ctls;
+
+		/**
+		 * @brief libopus decoder
+		 *
+		 * Shared with the voice courier thread that does the decoding.
+		 * This is not protected by a mutex because only the courier thread
+		 * uses the decoder.
+		 */
+		std::shared_ptr<OpusDecoder> decoder;
+	};
+	/**
+	 * @brief Thread used to deliver incoming voice data to handlers.
+	 */
+	std::thread voice_courier;
+
+	/**
+	 * @brief Shared state between this voice client and the courier thread.
+	 */
+	struct courier_shared_state_t {
+		/**
+		 * @brief Protects all following members.
+		 */
+		std::mutex mtx;
+
+		/**
+		 * @brief Signaled when there is a new payload to deliver or terminating state has changed.
+		 */
+		std::condition_variable signal_iteration;
+
+		/**
+		 * @brief Voice buffers to be reported to handler, grouped by speaker.
+		 *
+		 * Buffers are parked here and flushed every 500ms.
+		 */
+		std::map<snowflake, voice_payload_parking_lot> parked_voice_payloads;
+
+		/**
+		 * @brief Used to signal termination.
+		 *
+		 * @note Pending payloads are delivered first before termination.
+		 */
+		bool terminating = false;
+	} voice_courier_shared_state;
+
+	/**
+	 * @brief The run loop of the voice courier thread.
+	 */
+	static void voice_courier_loop(discord_voice_client&, courier_shared_state_t&);
+
+	/**
+	 * @brief If true, audio packet sending is paused
+	 */
+	bool paused{};
+
+	/**
+	 * @brief Whether has sent 5 frame of silence before stopping on pause.
+	 *
+	 * This is to avoid unintended Opus interpolation with subsequent transmissions.
+	 */
+	bool sent_stop_frames{};
+
+	/**
+	 * @brief Whether we got 4006 session invalid error code
+	 *
+	 * This is to tell reconnect callback to clear session data for the next reconnect attempt
+	 */
+	bool session_invalid{};
+
+	/**
+	 * @brief Number of times we have tried to reconnect in the last few seconds
+	 */
+	size_t times_looped{0};
+
+	/**
+	 * @brief Last time we reconnected
+	 */
+	time_t last_loop_time{0};
+
+#ifdef HAVE_VOICE
+	/**
+	 * @brief libopus encoder
+	 */
+	OpusEncoder* encoder{};
+
+	/**
+	 * @brief libopus repacketizer
+	 * (merges frames into one packet)
+	 */
+	OpusRepacketizer* repacketizer{};
+
+	/**
+	 * @brief This holds the state information for DAVE E2EE.
+	 * it is only allocated if E2EE is active on the voice channel.
+	 */
+	std::unique_ptr<dave_state> mls_state;
+
+#else
+	/**
+	 * @brief libopus encoder
+	 */
+	void* encoder;
+
+	/**
+	 * @brief libopus repacketizer
+	 * (merges frames into one packet)
+	 */
+	void* repacketizer;
+
+	/**
+	 * @brief This holds the state information for DAVE E2EE.
+	 * it is only allocated if E2EE is active on the voice channel.
+	 */
+	std::unique_ptr<int> mls_state{};
+#endif
+
+	/**
+	 * @brief The list of users that have E2EE potentially enabled for
+	 * DAVE protocol.
+	 */
+	std::set<dpp::snowflake> dave_mls_user_list;
+
+	/**
+	 * @brief The list of users that have left the voice channel but
+	 * not yet removed from MLS group.
+	 */
+	std::set<dpp::snowflake> dave_mls_pending_remove_list;
+
+	/**
+	 * @brief File descriptor for UDP connection
+	 */
+	dpp::socket fd{};
+
+	/**
+	 * @brief Secret key for encrypting voice.
+	 * If it has been sent, this contains a sequence of exactly 32 bytes
+	 * (secret_key_size) and has_secret_key is set to true.
+	 */
+	std::array<uint8_t, secret_key_size> secret_key{};
+
+	/**
+	 * @brief True if the voice client has a secret key
+	 */
+	bool has_secret_key{false};
+
+	/**
+	 * @brief Sequence number of outbound audio. This is incremented
+	 * once per frame sent.
+	 */
+	uint16_t sequence{};
+
+	/**
+	 * @brief Last received sequence from gateway.
+	 *
+	 * Needed for heartbeat and resume payload.
+	 */
+	int32_t receive_sequence{};
+
+	/**
+	 * @brief Timestamp value used in outbound audio. Each packet
+	 * has the timestamp value which is incremented to match
+	 * how many frames are sent.
+	 */
+	uint32_t timestamp{};
+
+	/**
+	 * @brief Each packet should have a nonce, a 32-bit incremental
+	 * integer value appended to payload.
+	 *
+	 * We should keep track of this value and increment it for each
+	 * packet sent.
+	 *
+	 * Current initial value is hardcoded to 1.
+	 */
+	uint32_t packet_nonce{};
+
+	/**
+	 * @brief Last sent packet high-resolution timestamp
+	 */
+	std::chrono::high_resolution_clock::time_point last_timestamp;
+
+	/**
+	 * @brief Fraction of the sleep that was not executed after the last audio packet was sent
+	 */
+	std::chrono::nanoseconds last_sleep_remainder{};
+
+	/**
+	 * @brief Maps receiving ssrc to user id
+	 */
+	std::unordered_map<uint32_t, snowflake> ssrc_map;
+
+	/**
+	 * @brief This is set to true if we have started sending audio.
+	 * When this moves from false to true, this causes the
+	 * client to send the 'talking' notification to the websocket.
+	 */
+	bool sending{};
+
+	/**
+	 * @brief Number of track markers in the buffer. For example if there
+	 * are two track markers in the buffer there are 3 tracks.
+	 * 
+	 * **Special case:**
+	 * 
+	 * If the buffer is empty, there are zero tracks in the
+	 * buffer.
+	 */
+	uint32_t tracks{};
+
+	/**
+	 * @brief Meta data associated with each track.
+	 * Arbitrary string that the user can set via
+	 * dpp::discord_voice_client::add_marker
+	 */
+	std::vector<std::string> track_meta;
+
+	/** 
+	 * @brief Encoding buffer for opus repacketizer and encode
+	 */
+	uint8_t encode_buffer[65536]{};
+
+	/**
+	 * @brief DAVE - Discord Audio Visual Encryption
+	 * Used for E2EE encryption. dave_protocol_none is
+	 * the default right now.
+	 */
+	dave_version_t dave_version;
+
+	/**
+	 * @brief Destination address for where packets go
+	 * on the UDP socket
+	 */
+	address_t destination{};
+
+
+	/**
+	 * @brief Send data to UDP socket immediately.
+	 * 
+	 * @param data data to send
+	 * @param length length of data to send
+	 * @return int bytes sent. Will return -1 if we cannot send
+	 */
+	int udp_send(const char* data, size_t length);
+
+	/**
+	 * @brief Receive data from UDP socket immediately.
+	 * 
+	 * @param data data to receive
+	 * @param max_length size of data receiving buffer
+	 * @return int bytes received. -1 if there is an error
+	 * (e.g. EAGAIN)
+	 */
+	int udp_recv(char* data, size_t max_length);
+
+	/**
+	 * @brief Called by socketengine when the socket is ready
+	 * for writing, at this point we pick the head item off
+	 * the buffer and send it. So long as it doesn't error
+	 * completely, we pop it off the head of the queue.
+	 */
+	void write_ready();
+
+	/**
+	 * @brief Called by socketengine when there is data to be
+	 * read. At this point we insert that data into the
+	 * input queue.
+	 * @throw dpp::voice_exception if voice support is not compiled into D++
+	 */
+	void read_ready();
+
+	/**
+	 * @brief Send data to the UDP socket, using the buffer.
+	 * 
+	 * @param packet packet data
+	 * @param len length of packet
+	 * @param duration duration of opus packet
+	 * @param send_now send this packet right away without buffering.
+	 * Do NOT set send_now to true outside write_ready.
+	 */
+	void send(const char* packet, size_t len, uint64_t duration, bool send_now = false);
+
+	/**
+	 * @brief Queue a message to be sent via the websocket
+	 * 
+	 * @param j The JSON data of the message to be sent
+	 * @param to_front If set to true, will place the message at the front of the queue not the back
+	 * (this is for urgent messages such as heartbeat, presence, so they can take precedence over
+	 * chunk requests etc)
+	 */
+	void queue_message(const std::string &j, bool to_front = false);
+
+	/**
+	 * @brief Clear the outbound message queue
+	 * 
+	 */
+	void clear_queue();
+
+	/**
+	 * @brief Get the size of the outbound message queue
+	 * 
+	 * @return The size of the queue
+	 */
+	size_t get_queue_size();
+
+	/**
+	 * @brief Encode a byte buffer using opus codec.
+	 * Multiple opus frames (2880 bytes each) will be encoded into one packet for sending.
+	 * 
+	 * @param input Input data as raw bytes of PCM data
+	 * @param inDataSize Input data length
+	 * @param output Output data as an opus encoded packet
+	 * @param outDataSize Output data length, should be at least equal to the input size.
+	 * Will be adjusted on return to the actual compressed data size.
+	 * @return size_t The compressed data size that was encoded.
+	 * @throw dpp::voice_exception If data length to encode is invalid or voice support not compiled into D++
+	 */
+	size_t encode(uint8_t *input, size_t inDataSize, uint8_t *output, size_t &outDataSize);
+
+	/**
+	 * Updates DAVE MLS ratchets for users in the VC
+	 * @param force True to force updating of ratchets regardless of state
+	 */
+	void update_ratchets(bool force = false);
+
+	/**
+	 * @brief Called in constructor and on reconnection of websocket
+	 */
+	void setup();
+
+	/**
+	 * @brief Events for UDP Socket IO
+	 */
+	dpp::socket_events udp_events;
+
+public:
+
+	/**
+	 * @brief Owning cluster
+	 */
+	class dpp::cluster* creator{};
+
+	full_reconnection_callback_t reconnection_callback;
+
+	/**
+	 * @brief True when the thread is shutting down
+	 */
+	bool terminating{};
+
+	/**
+	 * @brief The gain value for the end of the current voice iteration.
+	 */
+	float end_gain{};
+
+	/**
+	 * @brief The gain value for the current voice iteration.
+	 */
+	float current_gain{};
+
+	/**
+	 * @brief The amount to increment each successive sample for, for the current voice iteration.
+	 */
+	float increment{};
+
+	/**
+	 * @brief Heartbeat interval for sending heartbeat keepalive
+	 */
+	uint32_t heartbeat_interval{};
+
+	/**
+	 * @brief Last voice channel websocket heartbeat
+	 */
+	time_t last_heartbeat{};
+
+	/**
+	 * @brief Discord voice session token
+	 */
+	std::string token;
+
+	/**
+	 * @brief Discord voice session id
+	 */
+	std::string sessionid;
+
+	/**
+	 * @brief Server ID
+	 */
+	snowflake server_id;
+
+	/**
+	 * @brief Moving averager.
+	 */
+	moving_averager moving_average;
+
+	/**
+	 * @brief Channel ID
+	 */
+	snowflake channel_id;
+
+	/**
+	 * @brief The audio type to be sent.
+	 *
+	 * @note On Windows, the default type is overlap audio.
+	 * On all other platforms, it is recorded audio.
+	 *
+	 * If the audio is recorded, the sending of audio packets is throttled.
+	 * Otherwise, if the audio is live, the sending is not throttled.
+	 *
+	 * Discord voice engine is expecting audio data as if they were from
+	 * some audio device, e.g. microphone, where the data become available
+	 * as they get captured from the audio device.
+	 *
+	 * In case of recorded audio, unlike from a device, the audio data are
+	 * usually instantly available in large chunks. Throttling is needed to
+	 * simulate audio data coming from an audio device. In case of live audio,
+	 * the throttling is by nature, so no extra throttling is needed.
+	 *
+	 * Using live audio mode for recorded audio can cause Discord to skip
+	 * audio data because Discord does not expect to receive, say, 3 minutes'
+	 * worth of audio data in 1 second.
+	 *
+	 * There are some inaccuracies in the throttling method used by the recorded
+	 * audio mode on some systems (mainly Windows) which causes gaps and stutters
+	 * in the resulting audio stream. The overlap audio mode provides a different 
+	 * implementation that fixes the issue. This method is slightly more CPU 
+	 * intensive, and should only be used if you encounter issues with recorded audio 
+	 * on your system.
+	 * 
+	 * Use discord_voice_client::set_send_audio_type to change this value as
+	 * it ensures thread safety.
+	 */
+	enum send_audio_type_t
+	{
+		satype_recorded_audio,
+		satype_live_audio,
+		satype_overlap_audio
+	} send_audio_type =
+#ifdef _WIN32
+	satype_overlap_audio;
+#else
+	satype_recorded_audio;
+#endif
+
+	/**
+	 * @brief Sets the gain for the specified user.
+	 *
+	 * Similar to the User Volume slider, controls the listening volume per user.
+	 * Uses native Opus gain control, so clients don't have to perform extra
+	 * audio processing.
+	 *
+	 * The gain setting will affect the both individual and combined voice audio.
+	 *
+	 * The gain value can also be set even before the user connects to the voice
+	 * channel.
+	 *
+	 * @param user_id The ID of the user where the gain is to be controlled.
+	 * @param factor Nonnegative factor to scale the amplitude by, where 1.f reverts
+	 *               to the default volume.
+	 */
+	void set_user_gain(snowflake user_id, float factor);
+
+	/**
+	 * @brief Log a message to whatever log the user is using.
+	 * The logged message is passed up the chain to the on_log event in user code which can then do whatever
+	 * it wants to do with it.
+	 * @param severity The log level from dpp::loglevel
+	 * @param msg The log message to output
+	 */
+	virtual void log(dpp::loglevel severity, const std::string &msg) const override;
+
+	/**
+	 * @brief Fires every second from the underlying socket I/O loop, used for sending heartbeats
+	 * @throw dpp::exception if the socket needs to disconnect
+	 */
+	virtual void one_second_timer() override;
+
+	/**
+	 * @brief voice client is ready to stream audio.
+	 * The voice client is considered ready if it has a secret key.
+	 * 
+	 * @return true if ready to stream audio
+	 */
+	bool is_ready();
+
+	/**
+	 * @brief Returns true if the voice client is connected to the websocket
+	 * 
+	 * @return True if connected
+	 */
+	bool is_connected();
+
+	/**
+	 * @brief Returns the connection time of the voice client
+	 * 
+	 * @return dpp::utility::uptime Detail of how long the voice client has been connected for
+	 */
+	dpp::utility::uptime get_uptime();
+
+	/**
+	 * @brief The time (in milliseconds) between each interval when parsing audio.
+	 *
+	 * @warning You should only change this if you know what you're doing. It is set to 500ms by default.
+	 */
+	uint16_t iteration_interval{500};
+
+	/** Constructor takes shard id, max shards and token.
+	 * @param _cluster The cluster which owns this voice connection, for related logging, REST requests etc
+	 * @param _reconnection_callback The callback this voice client calls if the voice connection was closed due to error
+	 * @param _channel_id The channel id to identify the voice connection as
+	 * @param _server_id The server id (guild id) to identify the voice connection as
+	 * @param _token The voice session token to use for identifying to the websocket
+	 * @param _session_id The voice session id to identify with
+	 * @param _host The voice server hostname to connect to (hostname:port format)
+	 * @param enable_dave Enable DAVE E2EE
+	 * @throw dpp::voice_exception Opus failed to initialise, or D++ is not compiled with voice support
+	 */
+	discord_voice_client(dpp::cluster* _cluster, full_reconnection_callback_t _reconnection_callback, snowflake _channel_id, snowflake _server_id, const std::string &_token, const std::string &_session_id, const std::string &_host, bool enable_dave = true);
+
+	/**
+	 * @brief Destroy the discord voice client object
+	 */
+	virtual ~discord_voice_client() override;
+
+	/**
+	 * @brief Handle JSON from the websocket.
+	 * @param buffer The entire buffer content from the websocket client
+	 * @param opcode Frame type, e.g. OP_TEXT, OP_BINARY
+	 * @return bool True if a frame has been handled
+	 * @throw dpp::exception If there was an error processing the frame, or connection to UDP socket failed
+	 */
+	virtual bool handle_frame(const std::string &buffer, ws_opcode opcode) override;
+
+	/**
+	 * @brief Handle a websocket error.
+	 * @param errorcode The error returned from the websocket
+	 */
+	virtual void error(uint32_t errorcode) override;
+
+	/**
+	 * @brief Start and monitor websocket I/O
+	 */
+	void run();
+
+	/**
+	 * @brief Send raw audio to the voice channel.
+	 * 
+	 * You should send an audio packet of `send_audio_raw_max_length` (11520) bytes.
+	 * Note that this function can be costly as it has to opus encode
+	 * the PCM audio on the fly, and also encrypt it with openssl.
+	 * 
+	 * @note Because this function encrypts and encodes packets before
+	 * pushing them onto the output queue, if you have a complete stream
+	 * ready to send and know its length it is advisable to call this
+	 * method multiple times to enqueue the entire stream audio so that
+	 * it is all encoded at once (unless you have set use_opus to false).
+	 * **Constantly calling this from dpp::cluster::on_voice_buffer_send
+	 * can, and will, eat a TON of cpu!**
+	 * 
+	 * @param audio_data Raw PCM audio data. Channels are interleaved,
+	 * with each channel's amplitude being a 16 bit value.
+	 * 
+	 * @warning **The audio data needs to be 48000Hz signed 16 bit audio, otherwise, the audio will come through incorrectly!**
+	 * 
+	 * @param length The length of the audio data. The length should
+	 * be a multiple of 4 (2x 16 bit stereo channels) with a maximum
+	 * length of `send_audio_raw_max_length`, which is a complete opus
+	 * frame at highest quality.
+	 *
+	 * Generally when you're streaming and you know there will be
+	 * more packet to come you should always provide packet data with
+	 * length of `send_audio_raw_max_length`.
+	 * Silence packet will be appended if length is less than
+	 * `send_audio_raw_max_length` as discord expects to receive such
+	 * specific packet size. This can cause gaps in your stream resulting
+	 * in distorted audio if you have more packet to send later on.
+	 * 
+	 * @return discord_voice_client& Reference to self
+	 * 
+	 * @throw dpp::voice_exception If data length is invalid or voice support not compiled into D++
+	 */
+	discord_voice_client& send_audio_raw(uint16_t* audio_data, const size_t length);
+
+	/**
+	 * @brief Send opus packets to the voice channel
+	 * 
+	 * Some containers such as .ogg may contain OPUS
+	 * encoded data already. In this case, we don't need to encode the
+	 * frames using opus here. We can bypass the codec, only applying 
+	 * openssl to the stream.
+	 * 
+	 * @param opus_packet Opus packets. Discord expects opus frames 
+	 * to be encoded at 48000Hz
+	 * 
+	 * @param length The length of the audio data. 
+	 * 
+	 * @param duration Generally duration is 2.5, 5, 10, 20, 40 or 60
+	 * if the timescale is 1000000 (1ms) 
+	 * 
+	 * @param send_now Send this packet right away without buffering,
+	 * this will skip duration calculation for the packet being sent
+	 * and only safe to be set to true in write_ready.
+	 *
+	 * @return discord_voice_client& Reference to self
+	 * 
+	 * @note It is your responsibility to ensure that packets of data 
+	 * sent to send_audio are correctly repacketized for streaming, 
+	 * e.g. that audio frames are not too large or contain
+	 * an incorrect format. Discord will still expect the same frequency
+	 * and bit width of audio and the same signedness.
+	 * 
+	 * @throw dpp::voice_exception If data length is invalid or voice support not compiled into D++
+	 */
+	discord_voice_client& send_audio_opus(const uint8_t* opus_packet, const size_t length, uint64_t duration, bool send_now = false);
+
+	/**
+	 * @brief Send opus packets to the voice channel
+	 * 
+	 * Some containers such as .ogg may contain OPUS
+	 * encoded data already. In this case, we don't need to encode the
+	 * frames using opus here. We can bypass the codec, only applying 
+	 * opens to the stream.
+	 * 
+	 * Duration is calculated internally
+	 * 
+	 * @param opus_packet Opus packets. Discord expects opus frames 
+	 * to be encoded at 48000Hz
+	 * 
+	 * @param length The length of the audio data. 
+	 * 
+	 * @return discord_voice_client& Reference to self
+	 * 
+	 * @note It is your responsibility to ensure that packets of data 
+	 * sent to send_audio are correctly repacketized for streaming, 
+	 * e.g. that audio frames are not too large or contain
+	 * an incorrect format. Discord will still expect the same frequency
+	 * and bit width of audio and the same signedness.
+	 * 
+	 * @throw dpp::voice_exception If data length is invalid or voice support not compiled into D++
+	 */
+	discord_voice_client& send_audio_opus(const uint8_t* opus_packet, const size_t length);
+
+	/**
+	 * @brief Send silence to the voice channel
+	 * 
+	 * @param duration How long to send silence for. With the standard
+	 * timescale this is in milliseconds. Allowed values are 2.5,
+	 * 5, 10, 20, 40 or 60 milliseconds.
+	 * @return discord_voice_client& Reference to self
+	 * @throw dpp::voice_exception if voice support is not compiled into D++
+	 */
+	discord_voice_client& send_silence(const uint64_t duration);
+
+	/**
+	 * @brief Send stop frames to the voice channel.
+	 *
+	 * @param send_now send this packet right away without buffering.
+	 * Do NOT set send_now to true outside write_ready.
+	 * Also make sure you're not locking stream_mutex if you
+	 * don't set send_now to true.
+	 * 
+	 * @return discord_voice_client& Reference to self
+	 * @throw dpp::voice_exception if voice support is not compiled into D++
+	 */
+	discord_voice_client& send_stop_frames(bool send_now = false);
+
+	/**
+	 * @brief Sets the audio type that will be sent with send_audio_* methods.
+	 *
+	 * @see send_audio_type_t
+	 */
+	discord_voice_client& set_send_audio_type(send_audio_type_t type);
+
+	/**
+	 * @brief Set the timescale in nanoseconds.
+	 * 
+	 * @param new_timescale Timescale to set. This defaults to 1000000,
+	 * which means 1 millisecond.
+	 * @return discord_voice_client& Reference to self
+	 * @throw dpp::voice_exception If data length is invalid or voice support not compiled into D++
+	 */
+	discord_voice_client& set_timescale(uint64_t new_timescale);
+
+	/**
+	 * @brief Get the current timescale, this will default to 1000000
+	 * which means 1 millisecond.
+	 * 
+	 * @return uint64_t timescale in nanoseconds
+	 */
+	uint64_t get_timescale();
+
+	/**
+	 * @brief Mark the voice connection as 'speaking'.
+	 * This sends a JSON message to the voice websocket which tells discord
+	 * that the user is speaking. The library automatically calls this for you
+	 * whenever you send audio.
+	 * 
+	 * @return discord_voice_client& Reference to self
+	 */
+	discord_voice_client& speak();
+
+	/**
+	 * @brief Pause sending of audio
+	 * 
+	 * @param pause True to pause, false to resume
+	 * @return reference to self
+	 */
+	discord_voice_client& pause_audio(bool pause);
+
+	/**
+	 * @brief Immediately stop all audio.
+	 * Clears the packet queue.
+	 * @return reference to self
+	 */
+	discord_voice_client& stop_audio();
+
+	/**
+	 * @brief Change the iteration interval time.
+	 *
+	 * @param interval The time (in milliseconds) between each interval when parsing audio.
+	 *
+	 * @return Reference to self.
+	 */
+	discord_voice_client& set_iteration_interval(uint16_t interval);
+
+	/**
+	 * @brief Get the iteration interval time (in milliseconds).
+	 *
+	 * @return iteration_interval
+	 */
+	uint16_t get_iteration_interval();
+
+	/**
+	 * @brief Returns true if we are playing audio
+	 * 
+	 * @return true if audio is playing
+	 */
+	bool is_playing();
+
+	/**
+	 * @brief Get the number of seconds remaining
+	 * of the audio output buffer
+	 * 
+	 * @return float number of seconds remaining 
+	 */
+	float get_secs_remaining();
+
+	/**
+	 * @brief Get the number of tracks remaining
+	 * in the output buffer.
+	 * This is calculated by the number of track
+	 * markers plus one.
+	 * @return uint32_t Number of tracks in the
+	 * buffer
+	 */
+	uint32_t get_tracks_remaining();
+
+	/**
+	 * @brief Get the time remaining to send the
+	 * audio output buffer in hours:minutes:seconds
+	 * 
+	 * @return dpp::utility::uptime length of buffer
+	 */
+	dpp::utility::uptime get_remaining();
+
+	/**
+	 * @brief Insert a track marker into the audio
+	 * output buffer.
+	 * A track marker is an arbitrary flag in the
+	 * buffer contents that indicates the end of some
+	 * block of audio of significance to the sender.
+	 * This may be a song from a streaming site, or
+	 * some voice audio/speech, a sound effect, or
+	 * whatever you choose. You can later skip
+	 * to the next marker using the
+	 * dpp::discord_voice_client::skip_to_next_marker
+	 * function.
+	 * @param metadata Arbitrary information related to this
+	 * track
+	 * @return reference to self
+	 */
+	discord_voice_client& insert_marker(const std::string& metadata = "");
+
+	/**
+	 * @brief Skip tp the next track marker,
+	 * previously inserted by using the
+	 * dpp::discord_voice_client::insert_marker
+	 * function. If there are no markers in the
+	 * output buffer, then this skips to the end
+	 * of the buffer and is equivalent to the
+	 * dpp::discord_voice_client::stop_audio
+	 * function.
+	 * @note It is possible to use this function
+	 * while the output stream is paused.
+	 * @return reference to self
+	 */
+	discord_voice_client& skip_to_next_marker();
+
+	/**
+	 * @brief Get the metadata string associated with each inserted marker.
+	 * 
+	 * @return const std::vector<std::string>& list of metadata strings
+	 */
+	const std::vector<std::string> get_marker_metadata();
+
+	/**
+	 * @brief Returns true if the audio is paused.
+	 * You can unpause with
+	 * dpp::discord_voice_client::pause_audio.
+	 * 
+	 * @return true if paused
+	 */
+	bool is_paused();
+
+	/**
+	 * @brief Discord external IP detection.
+	 * @return std::string Your external IP address
+	 * @note This is a blocking operation that waits
+	 * for a single packet from Discord's voice servers.
+	 */
+	std::string discover_ip();
+
+	/**
+	 * @brief Returns true if end-to-end encryption is enabled
+	 * for the active voice call (Discord Audio Visual
+	 * Encryption, a.k.a. DAVE).
+	 *
+	 * @return True if end-to-end encrypted
+	 */
+	bool is_end_to_end_encrypted() const;
+
+	/**
+	 * @brief Returns the privacy code for the end to end encryption
+	 * scheme ("DAVE"). if end-to-end encryption is not active,
+	 * or is not yet established, this will return an empty
+	 * string.
+	 *
+	 * @return A sequence of six five-digit integers which
+	 * can be matched against the Discord client, in the
+	 * privacy tab for the properties of the voice call.
+	 */
+	std::string get_privacy_code() const;
+
+	/**
+	 * @brief Returns the privacy code for a given user by id,
+	 * if they are in the voice call, and enc-to-end encryption
+	 * is enabled.
+	 *
+	 * @param user User ID to fetch the privacy code for
+	 * @param callback Callback to call with the privacy code when
+	 * the creation of the code is complete.
+	 * @warning This call spawns a thread, as getting a user's
+	 * privacy code is a CPU-intensive and memory-intensive operation
+	 * which internally uses scrypt.
+	 */
+	void get_user_privacy_code(const dpp::snowflake user, privacy_code_callback_t callback) const;
+
+	/**
+	 * @brief Notify gateway ready for a DAVE transition.
+	 *
+	 * Fires Voice Ready event when appropriate.
+	 *
+	 * https://daveprotocol.com/#commit-handling
+	 *
+	 * @param data Websocket frame data
+	 */
+	void ready_for_transition(const std::string &data);
+
+	/**
+	 * @brief Reset dave session, send voice_client_dave_mls_invalid_commit_welcome
+	 * payload with current transition Id and our new key package to gateway.
+	 *
+	 * https://daveprotocol.com/#recovery-from-invalid-commit-or-welcome
+	 */
+	void recover_from_invalid_commit_welcome();
+
+	/**
+	 * @brief Execute pending protocol upgrade/downgrade to/from dave.
+	 * @return true if did an upgrade/downgrade
+	 */
+	bool execute_pending_upgrade_downgrade();
+
+	/**
+	 * @brief Reset dave session and prepare initial session group.
+	 */
+	void reinit_dave_mls_group();
+
+	/**
+	 * @brief Process roster map from commit/welcome.
+	 * @param rmap Roster map
+	 */
+	void process_mls_group_rosters(const std::map<uint64_t, std::vector<uint8_t>>& rmap);
+
+	/**
+	 * @brief Called on websocket disconnection
+	 */
+	void on_disconnect() override;
+};
+
+}
+
diff --git a/3rdParty/dpp/dispatcher.h b/3rdParty/dpp/dispatcher.h
index ed3a135ee7..3fc337d8a1 100644
--- a/3rdParty/dpp/dispatcher.h
+++ b/3rdParty/dpp/dispatcher.h
@@ -1,1779 +1,2349 @@
-/************************************************************************************
- *
- * D++, A Lightweight C++ library for Discord
- *
- * Copyright 2021 Craig Edwards and D++ contributors 
- * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- ************************************************************************************/
-#pragma once
-#include <dpp/export.h>
-#include <dpp/snowflake.h>
-#include <dpp/misc-enum.h>
-#include <dpp/managed.h>
-#include <dpp/utility.h>
-#include <dpp/role.h>
-#include <dpp/user.h>
-#include <dpp/channel.h>
-#include <dpp/guild.h>
-#include <dpp/invite.h>
-#include <dpp/emoji.h>
-#include <dpp/ban.h>
-#include <dpp/automod.h>
-#include <dpp/webhook.h>
-#include <dpp/presence.h>
-#include <dpp/message.h>
-#include <dpp/appcommand.h>
-#include <dpp/application.h>
-#include <dpp/scheduled_event.h>
-#include <dpp/stage_instance.h>
-#include <dpp/integration.h>
-#include <functional>
-#include <variant>
-#include <exception>
-#include <algorithm>
-#include <string>
-
-namespace dpp {
-
-/* Forward declaration */
-struct confirmation_callback_t;
-
-/**
- * @brief A function used as a callback for any REST based command
- */
-typedef std::function<void(const confirmation_callback_t&)> command_completion_event_t;
-
-/** @brief Base event parameter struct.
- * Each event you receive from the library will have its parameter derived from this class.
- * The class contains the raw event data, and a pointer to the current shard's dpp::discord_client object.
- * You can also use this object to cancel the current event, meaning that any listeners after yours do
- * not get notified of the current event if you call it.
- */
-struct DPP_EXPORT event_dispatch_t {
-	/**
-	 * @brief Raw event data.
-	 * If you are using json on your websocket, this will contain json, and if you are using
-	 * ETF as your websocket protocol, it will contain raw ETF data.
-	 */
-	const std::string raw_event;
-
-	/**
-	 * @brief Shard the event came from.
-	 * Note that for some events, notably voice events, this may be nullptr.
-	 */
-	class discord_client* from; 
-
-	/**
-	 * @brief Construct a new event_dispatch_t object
-	 * 
- 	 * @param client The shard the event originated on. May be a nullptr, e.g. for voice events
-	 * @param raw Raw event data as JSON or ETF
-	 */
-	event_dispatch_t(class discord_client* client, const std::string& raw);
-
-	/**
-	 * @brief Cancels the event in progress. Any other attached lambdas for this event after this one are not called.
-	 * Note that event cancellation is a thread local state, and not stored in the object (because object which can
-	 * be cancelled is `const` during the event, and cannot itself contain the changeable state).
-	 * @return const event_dispatch_t& reference to self for chaining
-	 */
-	const event_dispatch_t& cancel_event() const;
-
-	/**
-	 * @brief Returns true if the event is cancelled.
-	 * Note that event cancellation is a thread local state, and not stored in the object (because object which can
-	 * be cancelled is `const` during the event, and cannot itself contain the changeable state).
-	 * @return true if the event is cancelled
-	 */
-	bool is_cancelled() const;
-};
-
-/** @brief Log messages */
-struct DPP_EXPORT log_t : public event_dispatch_t {
-	/** Constructor
-	 * @param client The shard the event originated on. CAN BE NULL
-	 * for log events originating from the cluster object
-	 * @param raw Raw event text as JSON
-	 */
-	log_t(class discord_client* client, const std::string& raw);
-	/** Severity */
-	loglevel severity;
-	/** Log Message */
-	std::string message;
-
-	log_t(const log_t&) = default; 	
-};
-
-namespace utility {
-	/**
-	 * @brief Get a default logger that outputs to std::cout.
-	 * e.g.
-	 * ```
-	 *     bot.on_log(dpp::utility::cout_logger());
-	 * ```
-	 * 
-	 * @return A logger for attaching to on_log
-	 */
-	std::function<void(const dpp::log_t&)> DPP_EXPORT cout_logger();
-
-	/**
-	 * @brief The default callback handler for API calls.
-	 * on error, sends the error to the logger.
-	 * 
-	 * @return A lambda for attaching to an API callback
-	 */
-	std::function<void(const dpp::confirmation_callback_t& detail)> DPP_EXPORT log_error();
-};
-
-/** @brief Add user to scheduled event */
-struct DPP_EXPORT guild_scheduled_event_user_add_t : public event_dispatch_t {
-	/** Constructor
-	 * @param client The shard the event originated on. CAN BE NULL
-	 * for log events originating from the cluster object
-	 * @param raw Raw event text as JSON
-	 */
-	guild_scheduled_event_user_add_t(class discord_client* client, const std::string& raw);
-	/**
-	 * @brief event user added to
-	 */
-	snowflake event_id;
-
-	/**
-	 * @brief User being added
-	 * 
-	 */
-	snowflake user_id;
-
-	/**
-	 * @brief Guild being added to
-	 * 
-	 */
-	snowflake guild_id;
-};
-
-/** @brief Delete user from scheduled event */
-struct DPP_EXPORT guild_scheduled_event_user_remove_t : public event_dispatch_t {
-	/** Constructor
-	 * @param client The shard the event originated on. CAN BE NULL
-	 * for log events originating from the cluster object
-	 * @param raw Raw event text as JSON
-	 */
-	guild_scheduled_event_user_remove_t(class discord_client* client, const std::string& raw);
-	/**
-	 * @brief event user removed from
-	 */
-	snowflake event_id;
-
-	/**
-	 * @brief User being removed
-	 * 
-	 */
-	snowflake user_id;
-
-	/**
-	 * @brief Guild being removed from
-	 * 
-	 */
-	snowflake guild_id;
-};
-
-/** @brief Create scheduled event */
-struct DPP_EXPORT guild_scheduled_event_create_t : public event_dispatch_t {
-	/** Constructor
-	 * @param client The shard the event originated on. CAN BE NULL
-	 * for log events originating from the cluster object
-	 * @param raw Raw event text as JSON
-	 */
-	guild_scheduled_event_create_t(class discord_client* client, const std::string& raw);
-	/**
-	 * @brief created event
-	 */
-	scheduled_event created;
-};
-
-/** @brief Create scheduled event */
-struct DPP_EXPORT guild_scheduled_event_update_t : public event_dispatch_t {
-	/** Constructor
-	 * @param client The shard the event originated on. CAN BE NULL
-	 * for log events originating from the cluster object
-	 * @param raw Raw event text as JSON
-	 */
-	guild_scheduled_event_update_t(class discord_client* client, const std::string& raw);
-	/**
-	 * @brief updated event
-	 */
-	scheduled_event updated;
-};
-
-/** @brief Delete scheduled event */
-struct DPP_EXPORT guild_scheduled_event_delete_t : public event_dispatch_t {
-	/** Constructor
-	 * @param client The shard the event originated on. CAN BE NULL
-	 * for log events originating from the cluster object
-	 * @param raw Raw event text as JSON
-	 */
-	guild_scheduled_event_delete_t(class discord_client* client, const std::string& raw);
-	/**
-	 * @brief deleted event
-	 */
-	scheduled_event deleted;
-};
-
-/** @brief Create automod rule */
-struct DPP_EXPORT automod_rule_create_t : public event_dispatch_t {
-	/** Constructor
-	 * @param client The shard the event originated on. CAN BE NULL
-	 * for log events originating from the cluster object
-	 * @param raw Raw event text as JSON
-	 */
-	automod_rule_create_t(class discord_client* client, const std::string& raw);
-	/**
-	 * @brief updated event
-	 */
-	automod_rule created;
-};
-
-/** @brief Update automod rule */
-struct DPP_EXPORT automod_rule_update_t : public event_dispatch_t {
-	/** Constructor
-	 * @param client The shard the event originated on. CAN BE NULL
-	 * for log events originating from the cluster object
-	 * @param raw Raw event text as JSON
-	 */
-	automod_rule_update_t(class discord_client* client, const std::string& raw);
-	/**
-	 * @brief updated event
-	 */
-	automod_rule updated;
-};
-
-/** @brief Delete automod rule */
-struct DPP_EXPORT automod_rule_delete_t : public event_dispatch_t {
-	/** Constructor
-	 * @param client The shard the event originated on. CAN BE NULL
-	 * for log events originating from the cluster object
-	 * @param raw Raw event text as JSON
-	 */
-	automod_rule_delete_t(class discord_client* client, const std::string& raw);
-	/**
-	 * @brief updated event
-	 */
-	automod_rule deleted;
-};
-
-/** @brief Execute/trigger automod rule */
-struct DPP_EXPORT automod_rule_execute_t : public event_dispatch_t {
-	/** Constructor
-	 * @param client The shard the event originated on. CAN BE NULL
-	 * for log events originating from the cluster object
-	 * @param raw Raw event text as JSON
-	 */
-	automod_rule_execute_t(class discord_client* client, const std::string& raw);
-
-	snowflake		guild_id;			//!< the id of the guild in which action was executed
-	automod_action		action;				//!< the action which was executed
-	snowflake		rule_id;			//!< the id of the rule which action belongs to
-	automod_trigger_type	rule_trigger_type;		//!< the trigger type of rule which was triggered
-	snowflake		user_id;			//!< the id of the user which generated the content which triggered the rule
-	snowflake		channel_id;			//!< Optional: the id of the channel in which user content was posted
-	snowflake		message_id;			//!< Optional: the id of any user message which content belongs to
-	snowflake		alert_system_message_id;	//!< Optional: the id of any system auto moderation messages posted as a result of this action
-	std::string		content;			//!< the user generated text content
-	std::string		matched_keyword;		//!< the word or phrase configured in the rule that triggered the rule (may be empty)
-	std::string		matched_content;		//!< the substring in content that triggered the rule (may be empty)
-};
-
-
-
-/** @brief Create stage instance */
-struct DPP_EXPORT stage_instance_create_t : public event_dispatch_t {
-	/** Constructor
-	 * @param client The shard the event originated on. CAN BE NULL
-	 * for log events originating from the cluster object
-	 * @param raw Raw event text as JSON
-	 */
-	stage_instance_create_t(class discord_client* client, const std::string& raw);
-	/**
-	 * @brief created stage instance
-	 */
-	stage_instance created;
-};
-
-/** @brief Update stage instance */
-struct DPP_EXPORT stage_instance_update_t : public event_dispatch_t {
-	/** Constructor
-	 * @param client The shard the event originated on. CAN BE NULL
-	 * for log events originating from the cluster object
-	 * @param raw Raw event text as JSON
-	 */
-	stage_instance_update_t(class discord_client* client, const std::string& raw);
-	/**
-	 * @brief updated stage instance
-	 */
-	stage_instance updated;
-};
-
-/** @brief Delete stage instance */
-struct DPP_EXPORT stage_instance_delete_t : public event_dispatch_t {
-	/** Constructor
-	 * @param client The shard the event originated on. CAN BE NULL
-	 * for log events originating from the cluster object
-	 * @param raw Raw event text as JSON
-	 */
-	stage_instance_delete_t(class discord_client* client, const std::string& raw);
-	/**
-	 * @brief deleted stage instance
-	 */
-	stage_instance deleted;
-};
-
-/** @brief Voice state update */
-struct DPP_EXPORT voice_state_update_t : public event_dispatch_t {
-	/** Constructor
-	 * @param client The shard the event originated on
-	 * @param raw Raw event text as JSON
-	 */
-	voice_state_update_t(class discord_client* client, const std::string& raw);
-	/** Voice state */
-	voicestate state;
-};
-
-/**
- * @brief Create interaction
- */
-struct DPP_EXPORT interaction_create_t : public event_dispatch_t {
-
-	/** Constructor
-	 * @param client The shard the event originated on
-	 * @param raw Raw event text as JSON
-	 */
-	interaction_create_t(class discord_client* client, const std::string& raw);
-
-
-	/**
-	 * @brief Acknowledge interaction without displaying a message to the user,
-	 * for use with button and select menu components.
-	 * 
-	 * @param callback User function to execute when the api call completes.
-	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void reply(command_completion_event_t callback = utility::log_error()) const;
-
-	/**
-	 * @brief Send a reply for this interaction
-	 * 
-	 * @param t Type of reply to send
-	 * @param m Message object to send. Not all fields are supported by Discord.
-	 * @param callback User function to execute when the api call completes.
-	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void reply(interaction_response_type t, const message & m, command_completion_event_t callback = utility::log_error()) const;
-
-	/**
-	 * @brief Send a reply for this interaction
-	 * 
-	 * @param t Type of reply to send
-	 * @param mt The string value to send, for simple text only messages
-	 * @param callback User function to execute when the api call completes.
-	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void reply(interaction_response_type t, const std::string & mt, command_completion_event_t callback = utility::log_error()) const;
-
-	/**
-	 * @brief Send a reply for this interaction.
-	 * Uses the default type of dpp::ir_channel_message_with_source, a simple message reply.
-	 * 
-	 * @param m Message object to send. Not all fields are supported by Discord.
-	 * @param callback User function to execute when the api call completes.
-	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void reply(const message & m, command_completion_event_t callback = utility::log_error()) const;
-
-	/**
-	 * @brief Send a reply for this interaction.
-	 * Uses the default type of dpp::ir_channel_message_with_source, a simple message reply.
-	 * 
-	 * @param mt The string value to send, for simple text only messages
-	 * @param callback User function to execute when the api call completes.
-	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void reply(const std::string & mt, command_completion_event_t callback = utility::log_error()) const;
-
-	/**
-	 * @brief Reply to interaction with a dialog box
-	 * 
-	 * @param mr Dialog box response to send
-	 * @param callback User function to execute when the api call completes.
-	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void dialog(const interaction_modal_response& mr, command_completion_event_t callback = utility::log_error()) const;
-
-	/**
-	 * @brief Edit the response for this interaction
-	 *
-	 * @param m Message object to send. Not all fields are supported by Discord.
-	 * @param callback User function to execute when the api call completes.
-	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void edit_response(const message & m, command_completion_event_t callback = utility::log_error()) const;
-
-	/**
-	 * @brief Edit the response for this interaction
-	 *
-	 * @param mt The string value to send, for simple text only messages
-	 * @param callback User function to execute when the api call completes.
-	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void edit_response(const std::string & mt, command_completion_event_t callback = utility::log_error()) const;
-
-	/**
-	 * @brief Set the bot to 'thinking' state
-	 *
-	 * @param ephemeral True if the thinking state should be ephemeral
-	 * @param callback User function to execute when the api call completes.
-	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void thinking(bool ephemeral = false, command_completion_event_t callback = utility::log_error()) const;
-
-	/**
-	 * @brief Get original response message for this interaction
-	 *
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::message object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void get_original_response(command_completion_event_t callback) const;
-
-	/**
-	 * @brief Edit original response message for this interaction
-	 *
-	 * @param m Message object to send. Not all fields are supported by Discord.
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::message object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void edit_original_response(const message & m, command_completion_event_t callback = utility::log_error()) const;
-
-	/**
-	 * @brief Delete original response message for this interaction. This cannot be used on an ephemeral interaction response.
-	 *
-	 * @param callback Function to call when the API call completes.
-	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
-	 */
-	void delete_original_response(command_completion_event_t callback = utility::log_error()) const;
-
-	/**
-	 * @brief Get a command line parameter
-	 * 
-	 * @param name The command line parameter to retrieve
-	 * @return const command_value& If the command line parameter does not 
-	 * exist, an empty variant is returned.
-	 */
-	const virtual command_value& get_parameter(const std::string& name) const;
-
-	/**
-	 * @brief command interaction
-	 */
-	interaction command;
-
-	/**
-	 * @brief Destroy this object
-	 */
-	virtual ~interaction_create_t() = default;
-};
-
-/**
- * @brief User has issued a slash command
- */
-struct DPP_EXPORT slashcommand_t : public interaction_create_t {
-public:
-	/** Constructor
-	 * @param client The shard the event originated on
-	 * @param raw Raw event text as JSON
-	 */
-	slashcommand_t(class discord_client* client, const std::string& raw);
-};
-
-/**
- * @brief Click on button
- */
-struct DPP_EXPORT button_click_t : public interaction_create_t {
-
-	/** Constructor
-	 * @param client The shard the event originated on
-	 * @param raw Raw event text as JSON
-	 */
-	button_click_t(class discord_client* client, const std::string& raw);
-
-	/**
-	 * @brief Get a command line parameter
-	 * 
-	 * @param name The command line parameter to retrieve
-	 * @return Always returns an empty parameter as buttons dont have parameters!
-	 */
-	const virtual command_value& get_parameter(const std::string& name) const;
-	/**
-	 * @brief button custom id
-	 */
-	std::string custom_id;
-	/**
-	 * @brief component type
-	 */
-	uint8_t component_type;
-};
-
-struct DPP_EXPORT form_submit_t : public interaction_create_t {
-	/** Constructor
-	 * @param client The shard the event originated on
-	 * @param raw Raw event text as JSON
-	 */
-	form_submit_t(class discord_client* client, const std::string& raw);
-
-	/**
-	 * @brief Get a command line parameter
-	 * 
-	 * @param name The command line parameter to retrieve
-	 * @return Always returns an empty parameter as buttons dont have parameters!
-	 */
-	const virtual command_value& get_parameter(const std::string& name) const;
-	/**
-	 * @brief button custom id
-	 */
-	std::string custom_id;
-	/**
-	 * @brief Message components for form reply
-	 */
-	std::vector<component> components;
-};
-
-/**
- * @brief Discord requests that we fill a list of auto completion choices for a command option
- */
-struct DPP_EXPORT autocomplete_t : public interaction_create_t {
-
-	/** Constructor
-	 * @param client The shard the event originated on
-	 * @param raw Raw event text as JSON
-	 */
-	autocomplete_t(class discord_client* client, const std::string& raw);
-
-	/**
-	 * @brief Get a command line parameter
-	 * 
-	 * @param name The command line parameter to retrieve
-	 * @return Always returns an empty parameter as auto complete requests dont have parameters!
-	 */
-	const virtual command_value& get_parameter(const std::string& name) const;
-
-	/**
-	 * @brief Command ID
-	 */
-	dpp::snowflake id;
-
-	/**
-	 * @brief Command name
-	 */
-	std::string name;
-
-	/**
-	 * @brief auto completion options
-	 */
-	std::vector<dpp::command_option> options;
-};
-
-/**
- * @brief Base class for context menu interactions, e.g. right click on
- * user or message.
- */
-struct DPP_EXPORT context_menu_t : public interaction_create_t {
-public:
-	/** Constructor
-	 * @param client The shard the event originated on
-	 * @param raw Raw event text as JSON
-	 */
-	context_menu_t(class discord_client* client, const std::string& raw);
-};
-
-/**
- * @brief Event parameter for context menu interactions for messages
- */
-struct DPP_EXPORT message_context_menu_t : public context_menu_t {
-
-	/**
-	 * @brief Related message
-	 */
-	message ctx_message;
-public:
-	/** Constructor
-	 * @param client The shard the event originated on
-	 * @param raw Raw event text as JSON
-	 */
-	message_context_menu_t(class discord_client* client, const std::string& raw);
-
-	/**
-	 * @brief Get the message which was right-clicked on
-	 * 
-	 * @return message right-clicked on
-	 */
-	message get_message() const;
-
-	/**
-	 * @brief Set the message object for this event
-	 * 
-	 * @param m message to set
-	 * @return message_context_menu_t& reference to self for fluent chaining
-	 */
-	message_context_menu_t& set_message(const message& m);
-};
-
-/**
- * @brief Event parameter for context menu interactions for users
- */
-struct DPP_EXPORT user_context_menu_t : public context_menu_t {
-
-	/**
-	 * @brief Related user
-	 */
-	user ctx_user;
-public:
-	/** Constructor
-	 * @param client The shard the event originated on
-	 * @param raw Raw event text as JSON
-	 */
-	user_context_menu_t(class discord_client* client, const std::string& raw);
-
-	/**
-	 * @brief Get the user which was right-clicked on
-	 * 
-	 * @return user right clicked on
-	 */
-	user get_user() const;
-
-	/**
-	 * @brief Set the user object for this event
-	 * 
-	 * @param u user to set
-	 * @return user_context_menu_t& reference to self for fluent chaining
-	 */
-	user_context_menu_t& set_user(const user& u);
-
-};
-
-/**
- * @brief Click on select
- */
-struct DPP_EXPORT select_click_t : public interaction_create_t {
-
-	/** Constructor
-	 * @param client The shard the event originated on
-	 * @param raw Raw event text as JSON
-	 */
-	select_click_t(class discord_client* client, const std::string& raw);
-
-	/**
-	 * @brief Get a command line parameter
-	 * 
-	 * @param name The command line parameter to retrieve
-	 * @return Always returns an empty parameter as buttons dont have parameters!
-	 */
-	const virtual command_value& get_parameter(const std::string& name) const;
-
-	/**
-	 * @brief select menu custom id
-	 */
-	std::string custom_id;
-	/**
-	 * @brief select menu values
-	 */
-	std::vector<std::string> values;
-	/**
-	 * @brief select menu component type (dpp::component_type)
-	 */
-	uint8_t component_type;
-};
-
-
-/** @brief Delete guild */
-struct DPP_EXPORT guild_delete_t : public event_dispatch_t {
-	/** Constructor
-	 * @param client The shard the event originated on
-	 * @param raw Raw event text as JSON
-	 */
-	guild_delete_t(class discord_client* client, const std::string& raw);
-	/** Deleted guild */
-	guild* deleted;
-};
-
-/** @brief Update guild stickers */
-struct DPP_EXPORT guild_stickers_update_t : public event_dispatch_t {
-	/** Constructor
-	 * @param client The shard the event originated on
-	 * @param raw Raw event text as JSON
-	 */
-	guild_stickers_update_t(class discord_client* client, const std::string& raw);
-	/** Updating guild */
-	guild* updating_guild;
-	/**
-	 * @brief stickers being updated
-	 */
-	std::vector<sticker> stickers;
-};
-
-/** @brief Guild join request delete (user declined membership screening) */
-struct DPP_EXPORT guild_join_request_delete_t : public event_dispatch_t {
-	/** Constructor
-	 * @param client The shard the event originated on
-	 * @param raw Raw event text as JSON
-	 */
-	guild_join_request_delete_t(class discord_client* client, const std::string& raw);
-	/** Deleted guild */
-	snowflake guild_id;
-	/**
-	 * @brief user id
-	 */
-	snowflake user_id;
-};
-
-/** @brief Delete channel */
-struct DPP_EXPORT channel_delete_t : public event_dispatch_t {
-	/** Constructor
-	 * @param client The shard the event originated on
-	 * @param raw Raw event text as JSON
-	 */
-	channel_delete_t(class discord_client* client, const std::string& raw);
-	/**
-	 * @brief guild channel is being deleted from
-	 */
-	guild* deleting_guild;
-	/**
-	 * @brief channel being deleted
-	 */
-	channel* deleted;
-};
-
-/** @brief Update channel */
-struct DPP_EXPORT channel_update_t : public event_dispatch_t {
-	/** Constructor
-	 * @param client The shard the event originated on
-	 * @param raw Raw event text as JSON
-	 */
-	channel_update_t(class discord_client* client, const std::string& raw);
-	/**
-	 * @brief guild channel is being updated on
-	 */
-	guild* updating_guild;
-	/**
-	 * @brief channel being updated
-	 */
-	channel* updated;
-};
-
-/** @brief Session ready */
-struct DPP_EXPORT ready_t : public event_dispatch_t {
-	/** Constructor
-	 * @param client The shard the event originated on
-	 * @param raw Raw event text as JSON
-	 */
-	ready_t(class discord_client* client, const std::string& raw);
-	/**
-	 * @brief websocket session id
-	 */
-	std::string session_id;
-	/**
-	 * @brief shard id
-	 */
-	uint32_t shard_id;
-};
-
-/** @brief Message Deleted */
-struct DPP_EXPORT message_delete_t : public event_dispatch_t {
-	/** Constructor
-	 * @param client The shard the event originated on
-	 * @param raw Raw event text as JSON
-	 */
-	message_delete_t(class discord_client* client, const std::string& raw);
-	/**
-	 * @brief message being deleted
-	 */
-	message* deleted;
-};
-
-/** @brief Guild member remove */
-struct DPP_EXPORT guild_member_remove_t : public event_dispatch_t {
-	/** Constructor
-	 * @param client The shard the event originated on
-	 * @param raw Raw event text as JSON
-	 */
-	guild_member_remove_t(class discord_client* client, const std::string& raw);
-	/**
-	 * @brief guild user is being removed from
-	 */
-	guild* removing_guild;
-	/**
-	 * @brief user being removed
-	 */
-	user* removed;
-};
-
-/** @brief Session resumed */
-struct DPP_EXPORT resumed_t : public event_dispatch_t {
-	/** Constructor
-	 * @param client The shard the event originated on
-	 * @param raw Raw event text as JSON
-	 */
-	resumed_t(class discord_client* client, const std::string& raw);
-	/**
-	 * @brief websocket session id
-	 */
-	std::string session_id;
-	/**
-	 * @brief shard id
-	 */
-	uint32_t shard_id;
-};
-
-/** @brief Guild role create */
-struct DPP_EXPORT guild_role_create_t : public event_dispatch_t {
-	/** Constructor
-	 * @param client The shard the event originated on
-	 * @param raw Raw event text as JSON
-	 */
-	guild_role_create_t(class discord_client* client, const std::string& raw);
-	/**
-	 * @brief guild role is being created on
-	 */
-	guild* creating_guild;
-	/**
-	 * @brief role being created
-	 */
-	role* created;
-};
-
-/** @brief Typing start */
-struct DPP_EXPORT typing_start_t : public event_dispatch_t {
-	/** Constructor
-	 * @param client The shard the event originated on
-	 * @param raw Raw event text as JSON
-	 */
-	typing_start_t(class discord_client* client, const std::string& raw);
-	/**
-	 * @brief guild user is typing on
-	 */
-	guild* typing_guild;
-	/**
-	 * @brief channel user is typing on
-	 */
-	channel* typing_channel;
-	/**
-	 * @brief user who is typing.
-	 * Can be nullptr if user is not cached
-	 */
-	user* typing_user;
-	/**
-	 * @brief User id of user typing.
-	 * Always set regardless of caching
-	 */
-	snowflake user_id;
-	/**
-	 * @brief Time of typing event
-	 */
-	time_t timestamp;
-};
-
-/** @brief Voice state update */
-struct DPP_EXPORT voice_track_marker_t : public event_dispatch_t {
-	/** Constructor
-	 * @param client The shard the event originated on.
-	 * Will always be null.
-	 * @param raw Raw event text as JSON.
-	 * Will always be empty.
-	 */
-	voice_track_marker_t(class discord_client* client, const std::string& raw);
-	/** Voice client */
-	class discord_voice_client* voice_client;
-	/** Track metadata */
-	std::string track_meta;
-};
-
-
-/** @brief Message reaction add */
-struct DPP_EXPORT message_reaction_add_t : public event_dispatch_t {
-	/** Constructor
-	 * @param client The shard the event originated on
-	 * @param raw Raw event text as JSON
-	 */
-	message_reaction_add_t(class discord_client* client, const std::string& raw);
-	/**
-	 * @brief Guild reaction occurred on
-	 */
-	guild* reacting_guild;
-	/**
-	 * @brief User who reacted
-	 */
-	user reacting_user;
-	/**
-	 * @brief member data of user who reacted
-	 */
-	guild_member reacting_member;
-	/**
-	 * @brief channel the reaction happened on
-	 */
-	channel* reacting_channel;
-	/**
-	 * @brief emoji of reaction
-	 */
-	emoji reacting_emoji;
-	/**
-	 * @brief message id of the message reacted upon
-	 */
-	snowflake message_id;
-};
-
-/** @brief Guild members chunk */
-struct DPP_EXPORT guild_members_chunk_t : public event_dispatch_t {
-	/** Constructor
-	 * @param client The shard the event originated on
-	 * @param raw Raw event text as JSON
-	 */
-	guild_members_chunk_t(class discord_client* client, const std::string& raw);
-	/**
-	 * @brief guild the members chunk is for
-	 */
-	guild* adding;
-	/**
-	 * @brief list of members in the chunk
-	 */
-	guild_member_map* members;
-};
-
-/** @brief Message reaction remove */
-struct DPP_EXPORT message_reaction_remove_t : public event_dispatch_t {
-	/** Constructor
-	 * @param client The shard the event originated on
-	 * @param raw Raw event text as JSON
-	 */
-	message_reaction_remove_t(class discord_client* client, const std::string& raw);
-	/**
-	 * @brief Guild reaction occurred on
-	 */
-	guild* reacting_guild;
-	/**
-	 * @brief User who reacted
-	 */
-	dpp::snowflake reacting_user_id;
-	/**
-	 * @brief channel the reaction happened on
-	 */
-	channel* reacting_channel;
-	/**
-	 * @brief emoji of reaction
-	 */
-	emoji reacting_emoji;
-	/**
-	 * @brief message id of the message reacted upon
-	 */
-	snowflake message_id;	
-};
-
-/** @brief Create guild */
-struct DPP_EXPORT guild_create_t : public event_dispatch_t {
-	/** Constructor
-	 * @param client The shard the event originated on
-	 * @param raw Raw event text as JSON
-	 */
-	guild_create_t(class discord_client* client, const std::string& raw);
-	/**
-	 * @brief guild that was created
-	 */
-	guild* created;
-	/**
-	 * @brief List of presences of all users on the guild.
-	 * 
-	 * This is only filled if you have the GUILD_PRESENCES
-	 * privileged intent.
-	 */
-	presence_map presences;
-	/**
-	 * @brief List of scheduled events in the guild
-	 */
-	scheduled_event_map scheduled_events;
-	/**
-	 * @brief List of stage instances in the guild
-	 */
-	stage_instance_map stage_instances;
-	/**
-	 * @brief List of threads in the guild
-	 */
-	thread_map threads;
-	/**
-	 * @brief List of stickers in the guild
-	 */
-	sticker_map stickers;
-};
-
-/** @brief Create channel */
-struct DPP_EXPORT channel_create_t : public event_dispatch_t {
-	/** Constructor
-	 * @param client The shard the event originated on
-	 * @param raw Raw event text as JSON
-	 */
-	channel_create_t(class discord_client* client, const std::string& raw);
-	/**
-	 * @brief guild channel was created on
-	 */
-	guild* creating_guild;
-	/**
-	 * @brief channel that was created
-	 */
-	channel* created;
-};
-
-/** @brief Message remove emoji */
-struct DPP_EXPORT message_reaction_remove_emoji_t : public event_dispatch_t {
-	/** Constructor
-	 * @param client The shard the event originated on
-	 * @param raw Raw event text as JSON
-	 */
-	message_reaction_remove_emoji_t(class discord_client* client, const std::string& raw);
-	/**
-	 * @brief Guild reaction occurred on
-	 */
-	guild* reacting_guild;
-	/**
-	 * @brief channel the reaction happened on
-	 */
-	channel* reacting_channel;
-	/**
-	 * @brief emoji of reaction
-	 */
-	emoji reacting_emoji;
-	/**
-	 * @brief message id of the message reacted upon
-	 */
-	snowflake message_id;	
-};
-
-/** @brief Message delete bulk */
-struct DPP_EXPORT message_delete_bulk_t : public event_dispatch_t {
-	/** Constructor
-	 * @param client The shard the event originated on
-	 * @param raw Raw event text as JSON
-	 */
-	message_delete_bulk_t(class discord_client* client, const std::string& raw);
-	/**
-	 * @brief guild messages are being deleted upon
-	 */
-	guild* deleting_guild;
-	/**
-	 * @brief user who is deleting the messages
-	 */
-	user* deleting_user;
-	/**
-	 * @brief channel messages are being deleted from
-	 */
-	channel* deleting_channel;
-	/**
-	 * @brief list of message ids of deleted messages
-	 */
-	std::vector<snowflake> deleted;
-};
-
-/** @brief Guild role update */
-struct DPP_EXPORT guild_role_update_t : public event_dispatch_t {
-	/** Constructor
-	 * @param client The shard the event originated on
-	 * @param raw Raw event text as JSON
-	 */
-	guild_role_update_t(class discord_client* client, const std::string& raw);
-	/**
-	 * @brief guild where roles are being updated
-	 */
-	guild* updating_guild;
-	/**
-	 * @brief the role being updated
-	 */
-	role* updated;
-};
-
-/** @brief Guild role delete */
-struct DPP_EXPORT guild_role_delete_t : public event_dispatch_t {
-	/** Constructor
-	 * @param client The shard the event originated on
-	 * @param raw Raw event text as JSON
-	 */
-	guild_role_delete_t(class discord_client* client, const std::string& raw);
-	/**
-	 * @brief guild where role is being deleted
-	 */
-	guild* deleting_guild;
-	/**
-	 * @brief role being deleted
-	 */
-	role* deleted;
-	/**
-	 * @brief ID of the deleted role
-	 */
-	snowflake role_id;
-};
-
-/** @brief Channel pins update */
-struct DPP_EXPORT channel_pins_update_t : public event_dispatch_t {
-	/** Constructor
-	 * @param client The shard the event originated on
-	 * @param raw Raw event text as JSON
-	 */
-	channel_pins_update_t(class discord_client* client, const std::string& raw);
-	/**
-	 * @brief guild where message is being pinned
-	 */
-	guild* pin_guild;
-	/**
-	 * @brief channel where message is being pinned
-	 */
-	channel* pin_channel;
-	/**
-	 * @brief timestamp of pin
-	 */
-	time_t timestamp;
-};
-
-/** @brief Message remove all reactions */
-struct DPP_EXPORT message_reaction_remove_all_t : public event_dispatch_t {
-	/** Constructor
-	 * @param client The shard the event originated on
-	 * @param raw Raw event text as JSON
-	 */
-	message_reaction_remove_all_t(class discord_client* client, const std::string& raw);
-	/**
-	 * @brief Guild reaction occurred on
-	 */
-	guild* reacting_guild;
-	/**
-	 * @brief channel the reaction happened on
-	 */
-	channel* reacting_channel;
-	/**
-	 * @brief message id of the message reacted upon
-	 */
-	snowflake message_id;	
-
-};
-
-/** @brief Voice server update */
-struct DPP_EXPORT voice_server_update_t : public event_dispatch_t {
-	/** Constructor
-	 * @param client The shard the event originated on
-	 * @param raw Raw event text as JSON
-	 */
-	voice_server_update_t(class discord_client* client, const std::string& raw);
-	/**
-	 * @brief guild id where voice server updated
-	 */
-	snowflake guild_id;
-	/**
-	 * @brief voice server token, used to connect to vc
-	 */
-	std::string token;
-	/**
-	 * @brief voice server endpoint wss:// address
-	 * 
-	 */
-	std::string endpoint;
-};
-
-/** @brief Guild emojis update */
-struct DPP_EXPORT guild_emojis_update_t : public event_dispatch_t {
-	/** Constructor
-	 * @param client The shard the event originated on
-	 * @param raw Raw event text as JSON
-	 */
-	guild_emojis_update_t(class discord_client* client, const std::string& raw);
-	/**
-	 * @brief snowflake ids of list of emojis
-	 */
-	std::vector<snowflake> emojis;
-	/**
-	 * @brief guild where emojis are being updated
-	 */
-	guild* updating_guild;
-};
-
-/**
- * @brief Presence update
- * 
- */
-struct DPP_EXPORT presence_update_t : public event_dispatch_t {
-	/** Constructor
-	 * @param client The shard the event originated on
-	 * @param raw Raw event text as JSON
-	 */
-	presence_update_t(class discord_client* client, const std::string& raw);
-	/**
-	 * @brief rich presence being updated
-	 */
-	presence rich_presence;
-};
-
-/** @brief Webhooks update */
-struct DPP_EXPORT webhooks_update_t : public event_dispatch_t {
-	/** Constructor
-	 * @param client The shard the event originated on
-	 * @param raw Raw event text as JSON
-	 */
-	webhooks_update_t(class discord_client* client, const std::string& raw);
-	/**
-	 * @brief guild where webhooks are being updated
-	 */
-	guild* webhook_guild;
-	/**
-	 * @brief channel where webhooks are being updated
-	 */
-	channel* webhook_channel;
-};
-
-/** @brief Guild member add */
-struct DPP_EXPORT guild_member_add_t : public event_dispatch_t {
-	/** Constructor
-	 * @param client The shard the event originated on
-	 * @param raw Raw event text as JSON
-	 */
-	guild_member_add_t(class discord_client* client, const std::string& raw);
-	/**
-	 * @brief guild which gained new member
-	 */
-	guild* adding_guild;
-	/**
-	 * @brief member which was added
-	 */
-	guild_member added;
-};
-
-/** @brief Invite delete */
-struct DPP_EXPORT invite_delete_t : public event_dispatch_t {
-	/** Constructor
-	 * @param client The shard the event originated on
-	 * @param raw Raw event text as JSON
-	 */
-	invite_delete_t(class discord_client* client, const std::string& raw);
-	/**
-	 * @brief the deleted invite
-	 */
-	invite deleted_invite;
-};
-
-/** @brief Guild update */
-struct DPP_EXPORT guild_update_t : public event_dispatch_t {
-	/** Constructor
-	 * @param client The shard the event originated on
-	 * @param raw Raw event text as JSON
-	 */
-	guild_update_t(class discord_client* client, const std::string& raw);
-	/**
-	 * @brief guild being updated
-	 */
-	guild* updated;
-};
-
-/** @brief Guild integrations update */
-struct DPP_EXPORT guild_integrations_update_t : public event_dispatch_t {
-	/** Constructor
-	 * @param client The shard the event originated on
-	 * @param raw Raw event text as JSON
-	 */
-	guild_integrations_update_t(class discord_client* client, const std::string& raw);
-	/**
-	 * @brief guild where integrations are being updated
-	 */
-	guild* updating_guild;
-};
-
-/** @brief Guild member update */
-struct DPP_EXPORT guild_member_update_t : public event_dispatch_t {
-	/** Constructor
-	 * @param client The shard the event originated on
-	 * @param raw Raw event text as JSON
-	 */
-	guild_member_update_t(class discord_client* client, const std::string& raw);
-	/**
-	 * @brief guild where member is being updated
-	 */
-	guild* updating_guild;
-	/**
-	 * @brief member being updated
-	 */
-	guild_member updated;
-};
-
-/** @brief Invite create */
-struct DPP_EXPORT invite_create_t : public event_dispatch_t {
-	/** Constructor
-	 * @param client The shard the event originated on
-	 * @param raw Raw event text as JSON
-	 */
-	invite_create_t(class discord_client* client, const std::string& raw);
-	/**
-	 * @brief created invite
-	 */
-	invite created_invite;
-};
-
-/** @brief Message update */
-struct DPP_EXPORT message_update_t : public event_dispatch_t {
-	/** Constructor
-	 * @param client The shard the event originated on
-	 * @param raw Raw event text as JSON
-	 */
-	message_update_t(class discord_client* client, const std::string& raw);
-	/**
-	 * @brief message being updated
-	 */
-	message msg;
-};
-
-/** @brief User update */
-struct DPP_EXPORT user_update_t : public event_dispatch_t {
-	/** Constructor
-	 * @param client The shard the event originated on
-	 * @param raw Raw event text as JSON
-	 */
-	user_update_t(class discord_client* client, const std::string& raw);
-	/**
-	 * @brief user being updated
-	 */
-	user updated;
-};
-
-/** @brief Create message */
-struct DPP_EXPORT message_create_t : public event_dispatch_t {
-	/** Constructor
-	 * @param client The shard the event originated on
-	 * @param raw Raw event text as JSON
-	 */
-	message_create_t(class discord_client* client, const std::string& raw);
-	/**
-	 * @brief message that was created (sent).
-	 */
-	message msg;
-	/**
-	 * @brief Send a text to the same channel as the channel_id in received event.
-	 * @param m Text to send
-	 * @param callback User function to execute once the API call completes.
-	 * @note confirmation_callback_t::value contains a message object on success. On failure, value is undefined and confirmation_callback_t::is_error() is true.
-	 */
-	void send(const std::string& m, command_completion_event_t callback = utility::log_error()) const;
-	/**
-	 * @brief Send a message to the same channel as the channel_id in received event.
-	 * @param msg Message to send
-	 * @param callback User function to execute once the API call completes.
-	 * @note confirmation_callback_t::value contains a message object on success. On failure, value is undefined and confirmation_callback_t::is_error() is true.
-	 */
-	void send(message& msg, command_completion_event_t callback = utility::log_error()) const;
-	/**
-	 * @brief Send a message to the same channel as the channel_id in received event.
-	 * @param msg Message to send
-	 * @param callback User function to execute once the API call completes.
-	 * @note confirmation_callback_t::value contains a message object on success. On failure, value is undefined and confirmation_callback_t::is_error() is true.
-	 */
-	void send(message&& msg, command_completion_event_t callback = utility::log_error()) const;
-	/**
-	 * @brief Reply to the message received in the event.
-	 * @param m Text to send
-	 * @param mention_replied_user mentions (pings) the author of message replied to, if true
-	 * @param callback User function to execute once the API call completes.
-	 * @note confirmation_callback_t::value contains a message object on success. On failure, value is undefined and confirmation_callback_t::is_error() is true.
-	 */
-	void reply(const std::string& m, bool mention_replied_user = false, command_completion_event_t callback = utility::log_error()) const;
-	/**
-	 * @brief Reply to the message received in the event.
-	 * @param msg Message to send as a reply.
-	 * @param mention_replied_user mentions (pings) the author of message replied to, if true
-	 * @param callback User function to execute once the API call completes.
-	 * @note confirmation_callback_t::value contains a message object on success. On failure, value is undefined and confirmation_callback_t::is_error() is true.
-	 */
-	void reply(message& msg, bool mention_replied_user = false, command_completion_event_t callback = utility::log_error()) const;
-	/**
-	 * @brief Reply to the message received in the event.
-	 * @param msg Message to send as a reply.
-	 * @param mention_replied_user mentions (pings) the author of message replied to, if true
-	 * @param callback User function to execute once the API call completes.
-	 * @note confirmation_callback_t::value contains a message object on success. On failure, value is undefined and confirmation_callback_t::is_error() is true.
-	 */
-	void reply(message&& msg, bool mention_replied_user = false, command_completion_event_t callback = utility::log_error()) const;
-};
-
-/** @brief Guild ban add */
-struct DPP_EXPORT guild_ban_add_t : public event_dispatch_t {
-	/** Constructor
-	 * @param client The shard the event originated on
-	 * @param raw Raw event text as JSON
-	 */
-	guild_ban_add_t(class discord_client* client, const std::string& raw);
-	/**
-	 * @brief guild where ban was added
-	 */
-	guild* banning_guild;
-	/**
-	 * @brief user being banned
-	 */
-	user banned;
-};
-
-/** @brief Guild ban remove */
-struct DPP_EXPORT guild_ban_remove_t : public event_dispatch_t {
-	/** Constructor
-	 * @param client The shard the event originated on
-	 * @param raw Raw event text as JSON
-	 */
-	guild_ban_remove_t(class discord_client* client, const std::string& raw);
-	/**
-	 * @brief guild where ban is being removed
-	 */
-	guild* unbanning_guild;
-	/**
-	 * @brief user being unbanned
-	 */
-	user unbanned;
-};
-
-/** @brief Integration create */
-struct DPP_EXPORT integration_create_t : public event_dispatch_t {
-	/** Constructor
-	 * @param client The shard the event originated on
-	 * @param raw Raw event text as JSON
-	 */
-	integration_create_t(class discord_client* client, const std::string& raw);
-	/**
-	 * @brief created integration
-	 */
-	integration created_integration;
-};
-
-/** @brief Integration update */
-struct DPP_EXPORT integration_update_t : public event_dispatch_t {
-	/** 
-	 * @brief Constructor
-	 * @param client The shard the event originated on
-	 * @param raw Raw event text as JSON
-	 */
-	integration_update_t(class discord_client* client, const std::string& raw);
-	/**
-	 * @brief updated integration
-	 */
-	integration updated_integration;
-};
-
-/** @brief Integration delete */
-struct DPP_EXPORT integration_delete_t : public event_dispatch_t {
-	/** 
-	 * @brief Constructor
-	 * @param client The shard the event originated on
-	 * @param raw Raw event text as JSON
-	 */
-	integration_delete_t(class discord_client* client, const std::string& raw);
-	/**
-	 * @brief deleted integration
-	 */
-	integration deleted_integration;
-};
-
-/** @brief Thread Create*/
-struct DPP_EXPORT thread_create_t : public event_dispatch_t {
-	/** 
-	 * @brief Constructor
-	 * @param client The shard the event originated on
-	 * @param raw Raw event text as JSON
-	 */
-	thread_create_t(class discord_client* client, const std::string& raw);
-	/**
-	 * @brief guild where thread was created
-	 */
-	guild* creating_guild;
-	/**
-	 * @brief thread created
-	 */
-	thread created;
-};
-
-/** @brief Thread Update
-*/
-struct DPP_EXPORT thread_update_t : public event_dispatch_t {
-	/** 
-	 * @brief Constructor
-	 * @param client The shard the event originated on
-	 * @param raw Raw event text as JSON
-	 */
-	thread_update_t(class discord_client* client, const std::string& raw);
-	/**
-	 * @brief guild where thread was updated
-	 */
-	guild* updating_guild;
-	/**
-	 * @brief thread updated
-	 */
-	thread updated;
-};
-
-/** @brief Thread Delete
- */
-struct DPP_EXPORT thread_delete_t : public event_dispatch_t {
-	/** 
-	 * @brief Constructor
-	 * @param client The shard the event originated on
-	 * @param raw Raw event text as JSON
-	 */
-	thread_delete_t(class discord_client* client, const std::string& raw);
-	/**
-	 * @brief guild where thread was deleted
-	 */
-	guild* deleting_guild;
-	/**
-	 * @brief thread deleted
-	 */
-	thread deleted;
-};
-
-/** @brief Thread List Sync
- */
-struct DPP_EXPORT thread_list_sync_t : public event_dispatch_t {
-	/** 
-	 * @brief Constructor
-	 * @param client The shard the event originated on
-	 * @param raw Raw event text as JSON
-	 */
-	thread_list_sync_t(class discord_client* client, const std::string& raw);
-	/**
-	 * @brief guild where thread list was synchronised
-	 */
-	guild* updating_guild;
-	/**
-	 * @brief list of threads (channels) synchronised
-	 */
-	std::vector<thread> threads;
-	/**
-	 * @brief list of thread members for the channels (threads)
-	 */
-	std::vector<thread_member> members;
-};
-
-/** @brief Thread Member Update
- */
-struct DPP_EXPORT thread_member_update_t : public event_dispatch_t {
-	/** 
-	 * @brief Constructor
-	 * @param client The shard the event originated on
-	 * @param raw Raw event text as JSON
-	 */
-	thread_member_update_t(class discord_client* client, const std::string& raw);
-	/**
-	 * @brief updated thread member
-	 */
-	thread_member updated;
-};
-
-/** @brief Thread Members Update
- */
-struct DPP_EXPORT thread_members_update_t : public event_dispatch_t {
-	/** 
-	 * @brief Constructor
-	 * @param client The shard the event originated on
-	 * @param raw Raw event text as JSON
-	 */
-	thread_members_update_t(class discord_client* client, const std::string& raw);
-	/**
-	 * @brief thread (channel) id
-	 */
-	snowflake thread_id;
-	/**
-	 * @brief guild thread members updated on
-	 */
-	guild* updating_guild;
-	/**
-	 * @brief new approximate member count
-	 */
-	uint8_t member_count;
-	/**
-	 * @brief added members
-	 */
-	std::vector<thread_member> added;
-	/**
-	 * @brief ids only of removed members
-	 */
-	std::vector<snowflake> removed_ids;
-};
-
-/** @brief voice buffer send
- */
-struct DPP_EXPORT voice_buffer_send_t : public event_dispatch_t {
-	/** 
-	 * @brief Constructor
-	 * @param client The shard the event originated on
-	 * WILL ALWAYS be NULL.
-	 * @param raw Raw event text as JSON
-	 */
-	voice_buffer_send_t(class discord_client* client, const std::string &raw);
-	/**
-	 * @brief voice client where buffer was sent
-	 */
-	class discord_voice_client* voice_client;
-	/**
-	 * @brief encoded size of sent buffer
-	 */
-	int buffer_size;
-};
-
-/** @brief voice user talking */
-struct DPP_EXPORT voice_user_talking_t : public event_dispatch_t {
-	/** 
-	 * @brief Constructor
-	 * @param client The shard the event originated on
-	 * WILL ALWAYS be NULL.
-	 * @param raw Raw event text as JSON
-	 */
-	voice_user_talking_t(class discord_client* client, const std::string &raw);
-	/**
-	 * @brief voice client where user is talking
-	 */
-	class discord_voice_client* voice_client;
-	/**
-	 * @brief talking user id
-	 */
-	snowflake user_id;
-	/**
-	 * @brief flags for talking user
-	 */
-	uint8_t talking_flags;
-};
-
-/** @brief voice user talking */
-struct DPP_EXPORT voice_ready_t : public event_dispatch_t {
-	/** 
-	 * @brief Constructor
-	 * @param client The shard the event originated on
-	 * WILL ALWAYS be NULL.
-	 * @param raw Raw event text as JSON
-	 */
-	voice_ready_t(class discord_client* client, const std::string &raw);
-	/**
-	 * @brief voice client which is ready
-	 */
-	class discord_voice_client* voice_client;
-	/**
-	 * @brief id of voice channel
-	 */
-	snowflake voice_channel_id;
-};
-
-/** @brief voice receive packet */
-struct DPP_EXPORT voice_receive_t : public event_dispatch_t {
-
-friend class discord_voice_client;
-
-	/** 
-	 * @brief Constructor
-	 * @param client The shard the event originated on.
-	 * WILL ALWAYS be NULL.
-	 * @param raw Raw event text as UDP packet.
-	 */
-	voice_receive_t(class discord_client* client, const std::string &raw);
-	/**
-	 * @brief Construct a new voice receive t object
-	 * 
-	 * @param client The shard the event originated on.
-	 * WILL ALWAYS be NULL.
-	 * @param raw Raw event text as UDP packet.
-	 * @param vc owning voice client pointer
-	 * @param _user_id user id who is speaking, 0 for a mix of all user audio
-	 * @param pcm user audio to set
-	 * @param length length of user audio in bytes
-	 */
-	voice_receive_t(class discord_client* client, const std::string &raw, class discord_voice_client* vc, snowflake _user_id, uint8_t* pcm, size_t length);
-	/**
-	 * @brief Voice client
-	 */
-	class discord_voice_client* voice_client;
-	/**
-	 * @brief Audio data, encoded as 48kHz stereo PCM or Opus,
-	 * @deprecated Please switch to using audio_data.
-	 */
-	uint8_t* audio = nullptr;
-	/**
-	 * @brief Size of audio buffer
-	 * @deprecated Please switch to using audio_data.
-	 */
-	size_t audio_size = 0;
-	/**
-	 * @brief Audio data, encoded as 48kHz stereo PCM or Opus,
-	 */
-	std::basic_string<uint8_t> audio_data;
-	/**
-	 * @brief User ID of speaker (zero if unknown)
-	 */
-	snowflake user_id;
-protected:
-	/**
-	 * @brief Reassign values outside of the constructor for use within discord_voice_client
-	 * 
-	 * @param vc owning voice client pointer
-	 * @param _user_id user id who is speaking, 0 for a mix of all user audio
-	 * @param pcm user audio to set
-	 * @param length length of user audio in bytes
-	 */
-	void reassign(class discord_voice_client* vc, snowflake _user_id, uint8_t* pcm, size_t length);
-};
-
-/** @brief voice client speaking event */
-struct DPP_EXPORT voice_client_speaking_t : public event_dispatch_t {
-	/** 
-	 * @brief Constructor
-	 * @param client The shard the event originated on.
-	 * WILL ALWAYS be NULL.
-	 * @param raw Raw event text as JSON
-	 */
-	voice_client_speaking_t(class discord_client* client, const std::string &raw);
-	/**
-	 * @brief voice client where user is speaking
-	 */
-	class discord_voice_client* voice_client;
-	/**
-	 * @brief speaking user id
-	 * 
-	 */
-	snowflake user_id;
-	/**
-	 * @brief ssrc value of speaking user
-	 */
-	uint32_t ssrc;
-};
-
-/** @brief voice client disconnect event */
-struct DPP_EXPORT voice_client_disconnect_t : public event_dispatch_t {
-	/** 
-	 * @brief Constructor
-	 * @param client The shard the event originated on.
-	 * WILL ALWAYS be NULL.
-	 * @param raw Raw event text as JSON
-	 */
-	voice_client_disconnect_t(class discord_client* client, const std::string &raw);
-	/**
-	 * @brief voice client where user disconnected
-	 */
-	class discord_voice_client* voice_client;
-	/**
-	 * @brief user id of user who left vc
-	 */
-	snowflake user_id;
-};
-
-};
-
+/************************************************************************************
+ *
+ * D++, A Lightweight C++ library for Discord
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright 2021 Craig Edwards and D++ contributors 
+ * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ************************************************************************************/
+#pragma once
+#include <dpp/channel.h>
+#include <dpp/thread.h>
+#include <dpp/guild.h>
+#include <dpp/invite.h>
+#include <dpp/emoji.h>
+#include <dpp/ban.h>
+#include <dpp/automod.h>
+#include <dpp/webhook.h>
+#include <dpp/presence.h>
+#include <dpp/message.h>
+#include <dpp/appcommand.h>
+#include <dpp/application.h>
+#include <dpp/scheduled_event.h>
+#include <dpp/stage_instance.h>
+#include <dpp/integration.h>
+#include <dpp/auditlog.h>
+#include <dpp/entitlement.h>
+#include <functional>
+#include <variant>
+#include <dpp/voice_channel_effect.h>
+#include <exception>
+#include <algorithm>
+#include <string>
+
+#ifndef DPP_NO_CORO
+#include <dpp/coro.h>
+#endif /* DPP_NO_CORO */
+
+namespace dpp {
+
+/* Forward declaration */
+struct confirmation_callback_t;
+class discord_client;
+class discord_voice_client;
+
+/**
+ * @brief A function used as a callback for any REST based command
+ */
+using command_completion_event_t = std::function<void(const confirmation_callback_t&)>;
+
+/**
+ * @brief Route interaction event
+ *
+ * @param creator Creating cluster
+ * @param shard_id Shard ID or 0
+ * @param d JSON data for the event
+ * @param raw Raw JSON string
+ * @param from_webhook True if the interaction comes from a webhook
+ * @return JSON interaction response, only valid when from_webhook is true
+ */
+namespace events {
+	std::string DPP_EXPORT internal_handle_interaction(cluster* creator, uint16_t shard_id, json &d, const std::string &raw, bool from_webhook);
+}
+
+/** @brief Base event parameter struct.
+ * Each event you receive from the library will have its parameter derived from this class.
+ * The class contains the raw event data, and a pointer to the current shard's dpp::discord_client object.
+ * You can also use this object to cancel the current event, meaning that any listeners after yours do
+ * not get notified of the current event if you call it.
+ */
+struct DPP_EXPORT event_dispatch_t {
+protected:
+
+public:
+	/**
+	 * @brief Raw event data.
+	 * If you are using json on your websocket, this will contain json, and if you are using
+	 * ETF as your websocket protocol, it will contain raw ETF data.
+	 */
+	std::string raw_event = {};
+
+	/**
+	 * @brief Shard the event came from.
+	 */
+	uint32_t shard = 0;
+
+	/**
+	 * @brief Cluster owning the event dispatch
+	 */
+	 dpp::cluster* owner = nullptr;
+
+	/**
+	 * @brief Whether the event was cancelled using cancel_event().
+	 */
+	mutable bool cancelled = false;
+
+	/**
+	 * @brief Construct a new event_dispatch_t object
+	 */
+	event_dispatch_t() = default;
+
+	/**
+	 * @brief Construct a new event_dispatch_t object
+	 *
+	 * @param rhs event_dispatch_t object to copy from
+	 */
+	event_dispatch_t(const event_dispatch_t& rhs) = default;
+
+	/**
+	 * @brief Construct a new event_dispatch_t object
+	 *
+	 * @param rhs event_dispatch_t object to move from
+	 */
+	event_dispatch_t(event_dispatch_t&& rhs) = default;
+
+	/**
+	 * @brief Construct a new event_dispatch_t object
+	 *
+	 * @param shard_id The shard the event originated on.
+	 * @param raw Raw event data as JSON or ETF
+	 */
+	event_dispatch_t(dpp::cluster* creator, uint32_t shard_id, const std::string& raw);
+
+	/**
+	 * @brief Returns the shard object for the events shard id
+	 * @return discord client object
+	 */
+	discord_client* from() const;
+
+	/**
+	 * @brief Construct a new event_dispatch_t object
+	 *
+	 * @param shard_id The shard the event originated on.
+	 * @param raw Raw event data as JSON or ETF
+	 */
+	event_dispatch_t(dpp::cluster* creator, uint32_t shard_id, std::string&& raw);
+
+	/**
+	 * @brief Copy another event_dispatch_t object
+	 *
+	 * @param rhs The event to copy from
+	 */
+	event_dispatch_t &operator=(const event_dispatch_t& rhs) = default;
+
+	/**
+	 * @brief Move from another event_dispatch_t object
+	 *
+	 * @param rhs The event to move from
+	 */
+	event_dispatch_t &operator=(event_dispatch_t&& rhs) = default;
+
+	/**
+	 * @brief Destroy an event_dispatch_t object
+	 * Protected because this object is to be derived from
+	 */
+	virtual ~event_dispatch_t() = default;
+	// ^^^^ THIS MUST BE VIRTUAL. It used to be interaction_create_t's destructor was virtual,
+	// however before gcc 8.4 a bug prevents inheriting constructors with a user-declared destructors.
+	// since we need to support gcc 8.3... this is the fix. see https://godbolt.org/z/4xrsPhjzv foo is event_dispatch_t, bar is interaction_create_t
+
+	/**
+	 * @brief Cancels the event in progress. Any other attached lambdas for this event after this one are not called.
+	 *
+	 * @warning This will modify the event object in a non-thread-safe manner.
+	 * @return const event_dispatch_t& reference to self for chaining
+	 */
+	const event_dispatch_t& cancel_event() const;
+
+	/**
+	 * @brief Cancels the event in progress. Any other attached lambdas for this event after this one are not called.
+	 *
+	 * @warning This will modify the event object in a non-thread-safe manner.
+	 * @return const event_dispatch_t& reference to self for chaining
+	 */
+	event_dispatch_t &cancel_event();
+
+	/**
+	 * @brief Returns true if the event is cancelled.
+	 * Note that event cancellation is a thread local state, and not stored in the object (because object which can
+	 * be cancelled is `const` during the event, and cannot itself contain the changeable state).
+	 * @return true if the event is cancelled
+	 */
+	bool is_cancelled() const;
+};
+
+/**
+ * @brief Log messages
+ */
+struct DPP_EXPORT log_t : public event_dispatch_t {
+	using event_dispatch_t::event_dispatch_t;
+	using event_dispatch_t::operator=;
+
+	/**
+	 * @brief Severity.
+	 */
+	loglevel severity = ll_info;
+
+	/**
+	 * @brief Log Message
+	 */
+	std::string message = {};
+};
+
+/**
+ * @brief Closure of socket (removal from socket engine)
+ */
+struct DPP_EXPORT socket_close_t : public event_dispatch_t {
+        using event_dispatch_t::event_dispatch_t;
+        using event_dispatch_t::operator=;
+
+	/**
+	 * @brief Socket file descriptor
+	 */
+	socket fd{INVALID_SOCKET};
+};
+
+namespace utility {
+	/**
+	 * @brief Get a default logger that outputs to std::cout.
+	 * e.g.
+	 * ```
+	 *     bot.on_log(dpp::utility::cout_logger());
+	 * ```
+	 * 
+	 * @return A logger for attaching to on_log
+	 */
+	std::function<void(const dpp::log_t&)> DPP_EXPORT cout_logger();
+
+	/**
+	 * @brief The default callback handler for API calls.
+	 * on error, sends the error to the logger.
+	 * 
+	 * @return A lambda for attaching to an API callback
+	 */
+	command_completion_event_t DPP_EXPORT log_error();
+} // namespace utility
+
+/**
+ * @brief Add user to scheduled event
+ */
+struct DPP_EXPORT guild_scheduled_event_user_add_t : public event_dispatch_t {
+	using event_dispatch_t::event_dispatch_t;
+	using event_dispatch_t::operator=;
+
+	/**
+	 * @brief event user added to
+	 */
+	snowflake event_id = {};
+
+	/**
+	 * @brief User being added
+	 */
+	snowflake user_id = {};
+
+	/**
+	 * @brief Guild being added to
+	 */
+	snowflake guild_id = {};
+};
+
+/**
+ * @brief Delete user from scheduled event
+ */
+struct DPP_EXPORT guild_scheduled_event_user_remove_t : public event_dispatch_t {
+	using event_dispatch_t::event_dispatch_t;
+	using event_dispatch_t::operator=;
+
+	/**
+	 * @brief event user removed from
+	 */
+	snowflake event_id = {};
+
+	/**
+	 * @brief User being removed
+	 */
+	snowflake user_id = {};
+
+	/**
+	 * @brief Guild being removed from
+	 */
+	snowflake guild_id = {};
+};
+
+/**
+ * @brief Create scheduled event
+ */
+struct DPP_EXPORT guild_scheduled_event_create_t : public event_dispatch_t {
+	using event_dispatch_t::event_dispatch_t;
+	using event_dispatch_t::operator=;
+
+	/**
+	 * @brief created event
+	 */
+	scheduled_event created = {};
+};
+
+/**
+ * @brief Create scheduled event
+ */
+struct DPP_EXPORT guild_scheduled_event_update_t : public event_dispatch_t {
+	using event_dispatch_t::event_dispatch_t;
+	using event_dispatch_t::operator=;
+
+	/**
+	 * @brief updated event
+	 */
+	scheduled_event updated = {};
+};
+
+/**
+ * @brief Delete scheduled event
+ */
+struct DPP_EXPORT guild_scheduled_event_delete_t : public event_dispatch_t {
+	using event_dispatch_t::event_dispatch_t;
+	using event_dispatch_t::operator=;
+
+	/**
+	 * @brief deleted event
+	 */
+	scheduled_event deleted = {};
+};
+
+/**
+ * @brief Create automod rule
+ */
+struct DPP_EXPORT automod_rule_create_t : public event_dispatch_t {
+	using event_dispatch_t::event_dispatch_t;
+	using event_dispatch_t::operator=;
+
+	/**
+	 * @brief updated event
+	 */
+	automod_rule created = {};
+};
+
+/**
+ * @brief Update automod rule
+ */
+struct DPP_EXPORT automod_rule_update_t : public event_dispatch_t {
+	using event_dispatch_t::event_dispatch_t;
+	using event_dispatch_t::operator=;
+
+	/**
+	 * @brief updated event
+	 */
+	automod_rule updated = {};
+};
+
+/**
+ * @brief Delete automod rule
+ */
+struct DPP_EXPORT automod_rule_delete_t : public event_dispatch_t {
+	using event_dispatch_t::event_dispatch_t;
+	using event_dispatch_t::operator=;
+
+	/**
+	 * @brief updated event
+	 */
+	automod_rule deleted = {};
+};
+
+/**
+ * @brief Execute/trigger automod rule
+ */
+struct DPP_EXPORT automod_rule_execute_t : public event_dispatch_t {
+	using event_dispatch_t::event_dispatch_t;
+	using event_dispatch_t::operator=;
+
+	/**
+	 * @brief The id of the guild in which action was executed.
+	 */
+	snowflake guild_id = {};
+
+	/**
+	 * @brief The action which was executed.
+	 */
+	automod_action action = {};
+
+	/**
+	 * @brief The id of the rule which action belongs to.
+	 */
+	snowflake rule_id = {};
+
+	/**
+	 * @brief The trigger type of rule which was triggered.
+	 */
+	automod_trigger_type rule_trigger_type = {};
+
+	/**
+	 * @brief The id of the user which generated the content which triggered the rule.
+	 */
+	snowflake user_id = {};
+
+	/**
+	 * @brief Optional: the id of the channel in which user content was posted.
+	 */
+	snowflake channel_id = {};
+
+	/**
+	 * @brief Optional: the id of any user message which content belongs to.
+	 */
+	snowflake message_id = {};
+
+	/**
+	 * @brief Optional: the id of any system auto moderation messages posted as a result of this action.
+	 */
+	snowflake alert_system_message_id = {};
+
+	/**
+	 * @brief The user generated text content.
+	 */
+	std::string content = {};
+
+	/**
+	 * @brief The word or phrase configured in the rule that triggered the rule (may be empty).
+	 */
+	std::string matched_keyword = {};
+
+	/**
+	 * @brief The substring in content that triggered the rule (may be empty).
+	 */
+	std::string matched_content = {};
+};
+
+/**
+ * @brief Create stage instance
+ */
+struct DPP_EXPORT stage_instance_create_t : public event_dispatch_t {
+	using event_dispatch_t::event_dispatch_t;
+	using event_dispatch_t::operator=;
+
+	/**
+	 * @brief created stage instance
+	 */
+	stage_instance created = {};
+};
+
+/**
+ * @brief Update stage instance
+ */
+struct DPP_EXPORT stage_instance_update_t : public event_dispatch_t {
+	using event_dispatch_t::event_dispatch_t;
+	using event_dispatch_t::operator=;
+
+	/**
+	 * @brief updated stage instance
+	 */
+	stage_instance updated = {};
+};
+
+/**
+ * @brief Delete stage instance
+ */
+struct DPP_EXPORT stage_instance_delete_t : public event_dispatch_t {
+	using event_dispatch_t::event_dispatch_t;
+	using event_dispatch_t::operator=;
+
+	/**
+	 * @brief deleted stage instance
+	 */
+	stage_instance deleted = {};
+};
+
+/**
+ * @brief Voice channel effect send
+ */
+struct DPP_EXPORT voice_channel_effect_send_t : public event_dispatch_t {
+	using event_dispatch_t::event_dispatch_t;
+	using event_dispatch_t::operator=;
+
+	/**
+	 * @brief Voice channel effect
+	 */
+	voice_channel_effect effect = {};
+};
+
+/**
+ * @brief Voice state update
+ */
+struct DPP_EXPORT voice_state_update_t : public event_dispatch_t {
+	using event_dispatch_t::event_dispatch_t;
+	using event_dispatch_t::operator=;
+
+	/**
+	 * @brief Voice state
+	 */
+	voicestate state = {};
+};
+
+/**
+ * @brief Create interaction
+ */
+struct DPP_EXPORT interaction_create_t : public event_dispatch_t {
+	using event_dispatch_t::event_dispatch_t;
+	using event_dispatch_t::operator=;
+
+	/**
+	 * @brief Returns a generic http success confirmation
+	 * @return success
+	 */
+	confirmation_callback_t success() const;
+
+	/**
+	 * @brief True if from a HTTP interaction webhook, false if from websocket
+	 */
+	bool from_webhook{false};
+
+	/**
+	 * @brief If this interaction is created from a webhook server,
+	 * it fills this value with a JSON string which is sent as the HTTP response.
+	 * This is thread local so that it is preserved when the event is copied, we
+	 * guarantee that the request/response is in the same thread so this will always
+	 * be valid.
+	 * @param response response to set
+	 */
+	void set_queued_response(const std::string& response) const;
+
+	/**
+	 * @brief Acknowledge interaction without displaying a message to the user,
+	 * for use with button and select menu components.
+	 * 
+	 * @param callback User function to execute when the api call completes.
+	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void reply(command_completion_event_t callback = utility::log_error()) const;
+
+	/**
+	 * @brief Send a reply for this interaction
+	 *
+	 * @param t Type of reply to send
+	 * @param m Message object to send. Not all fields are supported by Discord.
+	 * @param callback User function to execute when the api call completes.
+	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void reply(interaction_response_type t, const message& m, command_completion_event_t callback = utility::log_error()) const;
+
+	/**
+	 * @brief Send a reply for this interaction
+	 *
+	 * @param t Type of reply to send
+	 * @param mt The string value to send, for simple text only messages
+	 * @param callback User function to execute when the api call completes.
+	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void reply(interaction_response_type t, const std::string& mt, command_completion_event_t callback = utility::log_error()) const;
+
+	/**
+	 * @brief Send a reply for this interaction.
+	 * Uses the default type of dpp::ir_channel_message_with_source, a simple message reply.
+	 *
+	 * @param m Message object to send. Not all fields are supported by Discord.
+	 * @param callback User function to execute when the api call completes.
+	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void reply(const message& m, command_completion_event_t callback = utility::log_error()) const;
+
+	/**
+	 * @brief Send a reply for this interaction.
+	 * Uses the default type of dpp::ir_channel_message_with_source, a simple message reply.
+	 *
+	 * @param mt The string value to send, for simple text only messages
+	 * @param callback User function to execute when the api call completes.
+	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void reply(const std::string& mt, command_completion_event_t callback = utility::log_error()) const;
+
+	/**
+	 * @brief Create a follow-up message for this interaction.
+	 * @param m Message object to send. Not all fields are supported by Discord.
+	 * @param callback User function to execute when the api call completes.
+	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void follow_up(const message& m, command_completion_event_t callback = utility::log_error()) const;
+	
+	/**
+	 * @brief Create a follow-up message for this interaction.
+	 * @param mt The string value to send, for simple text only messages
+	 * @param callback User function to execute when the api call completes.
+	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void follow_up(const std::string& mt, command_completion_event_t callback = utility::log_error()) const;
+
+	/**
+	 * @brief Reply to interaction with a dialog box
+	 *
+	 * @param mr Dialog box response to send
+	 * @param callback User function to execute when the api call completes.
+	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void dialog(const interaction_modal_response& mr, command_completion_event_t callback = utility::log_error()) const;
+
+	/**
+	 * @brief Edit the response for this interaction
+	 *
+	 * @param m Message object to send. Not all fields are supported by Discord.
+	 * @param callback User function to execute when the api call completes.
+	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void edit_response(const message& m, command_completion_event_t callback = utility::log_error()) const;
+
+	/**
+	 * @brief Edit the response for this interaction
+	 *
+	 * @param mt The string value to send, for simple text only messages
+	 * @param callback User function to execute when the api call completes.
+	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void edit_response(const std::string& mt, command_completion_event_t callback = utility::log_error()) const;
+
+	/**
+	 * @brief Set the bot to 'thinking' state where you have up to 15 minutes to respond
+	 *
+	 * @param ephemeral True if the thinking state should be ephemeral
+	 * @param callback User function to execute when the api call completes.
+	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void thinking(bool ephemeral = false, command_completion_event_t callback = utility::log_error()) const;
+
+	/**
+	 * @brief Get original response message for this interaction
+	 *
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::message object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void get_original_response(command_completion_event_t callback) const;
+
+	/**
+	 * @brief Edit original response message for this interaction
+	 *
+	 * @param m Message object to send. Not all fields are supported by Discord.
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::message object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void edit_original_response(const message& m, command_completion_event_t callback = utility::log_error()) const;
+
+	/**
+	 * @brief Delete original response message for this interaction. This cannot be used on an ephemeral interaction response.
+	 *
+	 * @param callback Function to call when the API call completes.
+	 * On success the callback will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	void delete_original_response(command_completion_event_t callback = utility::log_error()) const;
+
+	/**
+	 * @brief Get queued response when responding to a HTTP request
+	 * @return response JSON
+	 */
+	std::string get_queued_response() const;
+
+#ifndef DPP_NO_CORO
+	/**
+	 * @brief Acknowledge interaction without displaying a message to the user,
+	 * for use with button and select menu components.
+	 *
+	 * On success the result will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	dpp::async<dpp::confirmation_callback_t> co_reply() const;
+
+	/**
+	 * @brief Send a reply for this interaction
+	 *
+	 * @param t Type of reply to send
+	 * @param m Message object to send. Not all fields are supported by Discord.
+	 * On success the result will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	dpp::async<dpp::confirmation_callback_t> co_reply(interaction_response_type t, message m) const;
+
+	/**
+	 * @brief Send a reply for this interaction
+	 *
+	 * @param t Type of reply to send
+	 * @param mt The string value to send, for simple text only messages
+	 * On success the result will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	dpp::async<dpp::confirmation_callback_t> co_reply(interaction_response_type t, std::string mt) const;
+
+	/**
+	 * @brief Send a reply for this interaction.
+	 * Uses the default type of dpp::ir_channel_message_with_source, a simple message reply.
+	 *
+	 * @param m Message object to send. Not all fields are supported by Discord.
+	 * On success the result will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	dpp::async<dpp::confirmation_callback_t> co_reply(message m) const;
+
+	/**
+	 * @brief Send a reply for this interaction.
+	 * Uses the default type of dpp::ir_channel_message_with_source, a simple message reply.
+	 *
+	 * @param mt The string value to send, for simple text only messages
+	 * On success the result will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	dpp::async<dpp::confirmation_callback_t> co_reply(std::string mt) const;
+
+	/**
+	 * @brief Create a follow-up message for this interaction.
+	 *
+	 * @param m Message object to send. Not all fields are supported by Discord.
+	 * On success the result will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	dpp::async<dpp::confirmation_callback_t> co_follow_up(message m) const;
+
+	/**
+	 * @brief Create a follow-up message for this interaction.
+	 *
+	 * @param mt The string value to send, for simple text only messages
+	 * On success the result will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	dpp::async<dpp::confirmation_callback_t> co_follow_up(std::string mt) const;
+
+	/**
+	 * @brief Reply to interaction with a dialog box
+	 *
+	 * @param mr Dialog box response to send
+	 * On success the result will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	dpp::async<dpp::confirmation_callback_t> co_dialog(interaction_modal_response mr) const;
+
+	/**
+	 * @brief Edit the response for this interaction
+	 *
+	 * @param m Message object to send. Not all fields are supported by Discord.
+	 * On success the result will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	dpp::async<dpp::confirmation_callback_t> co_edit_response(message m) const;
+
+	/**
+	 * @brief Edit the response for this interaction
+	 *
+	 * @param mt The string value to send, for simple text only messages
+	 * On success the result will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	dpp::async<dpp::confirmation_callback_t> co_edit_response(std::string mt) const;
+
+	/**
+	 * @brief Set the bot to 'thinking' state where you have up to 15 minutes to respond
+	 *
+	 * @param ephemeral True if the thinking state should be ephemeral
+	 * On success the result will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	dpp::async<dpp::confirmation_callback_t> co_thinking(bool ephemeral = false) const;
+
+	/**
+	 * @brief Get original response message for this interaction
+	 *
+	 * On success the result will contain a dpp::message object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	dpp::async<dpp::confirmation_callback_t> co_get_original_response() const;
+
+	/**
+	 * @brief Edit original response message for this interaction
+	 *
+	 * @param m Message object to send. Not all fields are supported by Discord.
+	 * On success the result will contain a dpp::message object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	dpp::async<dpp::confirmation_callback_t> co_edit_original_response(message m) const;
+
+	/**
+	 * @brief Edit original response message for this interaction
+	 *
+	 * @param mt The string value to send, for simple text only messages
+	 * On success the result will contain a dpp::message object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	dpp::async<dpp::confirmation_callback_t> co_edit_original_response(std::string mt) const;
+
+	/**
+	 * @brief Delete original response message for this interaction. This cannot be used on an ephemeral interaction response.
+	 *
+	 * On success the result will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	dpp::async<dpp::confirmation_callback_t> co_delete_original_response() const;
+#endif /* DPP_NO_CORO */
+
+	/**
+	 * @brief command interaction
+	 */
+	interaction command = {};
+
+	/**
+	 * @brief Get a slashcommand parameter
+	 *
+	 * @param name The name of the command line parameter to retrieve the value for
+	 * @return command_value Returns the value of the first option that matches the given name.
+	 * If no matches are found, an empty variant is returned.
+	 *
+	 * @throw dpp::logic_exception if the interaction is not for a command
+	 */
+	virtual command_value get_parameter(const std::string& name) const;
+};
+
+/**
+ * @brief User has issued a slash command
+ */
+struct DPP_EXPORT slashcommand_t : public interaction_create_t {
+	using interaction_create_t::interaction_create_t;
+	using interaction_create_t::operator=;
+};
+
+/**
+ * @brief Click on button
+ */
+struct DPP_EXPORT button_click_t : public interaction_create_t {
+private:
+	using interaction_create_t::get_parameter;
+public:
+	using interaction_create_t::interaction_create_t;
+	using interaction_create_t::operator=;
+
+	/**
+	 * @brief button custom id
+	 */
+	std::string custom_id = {};
+
+	/**
+	 * @brief component type
+	 */
+	uint8_t component_type = {};
+};
+
+/**
+ * @brief On form submitted.
+ */
+struct DPP_EXPORT form_submit_t : public interaction_create_t {
+private:
+	using interaction_create_t::get_parameter;
+public:
+	using interaction_create_t::interaction_create_t;
+	using interaction_create_t::operator=;
+
+	/**
+	 * @brief button custom id
+	 */
+	std::string custom_id = {};
+
+	/**
+	 * @brief Message components for form reply
+	 */
+	std::vector<component> components = {};
+};
+
+/**
+ * @brief Discord requests that we fill a list of auto completion choices for a command option
+ */
+struct DPP_EXPORT autocomplete_t : public interaction_create_t {
+private:
+	using interaction_create_t::get_parameter;
+public:
+	using interaction_create_t::interaction_create_t;
+	using interaction_create_t::operator=;
+
+	/**
+	 * @brief Command ID
+	 */
+	dpp::snowflake id = {};
+
+	/**
+	 * @brief Command name
+	 */
+	std::string name = {};
+
+	/**
+	 * @brief auto completion options
+	 */
+	std::vector<dpp::command_option> options = {};
+};
+
+/**
+ * @brief Base class for context menu interactions, e.g. right click on
+ * user or message.
+ */
+struct DPP_EXPORT context_menu_t : public interaction_create_t {
+private:
+	using interaction_create_t::get_parameter;
+public:
+	using interaction_create_t::interaction_create_t;
+	using interaction_create_t::operator=;
+};
+
+/**
+ * @brief Event parameter for context menu interactions for messages
+ */
+struct DPP_EXPORT message_context_menu_t : public context_menu_t {
+public:
+	using context_menu_t::context_menu_t;
+	using context_menu_t::operator=;
+
+	/**
+	 * @brief Related message
+	 */
+	message ctx_message = {};
+
+	/**
+	 * @brief Get the message which was right-clicked on
+	 *
+	 * @return message right-clicked on
+	 */
+	const message& get_message() const;
+
+	/**
+	 * @brief Set the message object for this event
+	 *
+	 * @param m message to set
+	 * @return message_context_menu_t& reference to self for fluent chaining
+	 */
+	message_context_menu_t& set_message(const message& m);
+};
+
+/**
+ * @brief Event parameter for context menu interactions for users
+ */
+struct DPP_EXPORT user_context_menu_t : public context_menu_t {
+public:
+	using context_menu_t::context_menu_t;
+	using context_menu_t::operator=;
+
+	/**
+	 * @brief Related user
+	 */
+	user ctx_user = {};
+
+	/**
+	 * @brief Get the user which was right-clicked on
+	 *
+	 * @return user right clicked on
+	 */
+	const user& get_user() const;
+
+	/**
+	 * @brief Set the user object for this event
+	 *
+	 * @param u user to set
+	 * @return user_context_menu_t& reference to self for fluent chaining
+	 */
+	user_context_menu_t& set_user(const user& u);
+
+};
+
+/**
+ * @brief Click on select
+ */
+struct DPP_EXPORT select_click_t : public interaction_create_t {
+private:
+	using interaction_create_t::get_parameter;
+public:
+	using interaction_create_t::interaction_create_t;
+	using interaction_create_t::operator=;
+
+	/**
+	 * @brief select menu custom id
+	 */
+	std::string custom_id = {};
+
+	/**
+	 * @brief select menu values
+	 */
+	std::vector<std::string> values = {};
+
+	/**
+	 * @brief select menu component type (dpp::component_type)
+	 */
+	uint8_t component_type = {};
+};
+
+
+/**
+ * @brief Delete guild
+ */
+struct DPP_EXPORT guild_delete_t : public event_dispatch_t {
+	using event_dispatch_t::event_dispatch_t;
+	using event_dispatch_t::operator=;
+
+	/**
+	 * @brief Deleted guild
+	 * 
+	 */
+	guild deleted;
+
+	/**
+	 * @brief Guild ID deleted
+	 * 
+	 */
+	snowflake guild_id{0};
+};
+
+/**
+ * @brief Update guild stickers
+ */
+struct DPP_EXPORT guild_stickers_update_t : public event_dispatch_t {
+	using event_dispatch_t::event_dispatch_t;
+	using event_dispatch_t::operator=;
+
+	/**
+	 * @brief Updating guild
+	 */
+	guild updating_guild;
+
+	/**
+	 * @brief stickers being updated
+	 */
+	std::vector<sticker> stickers = {};
+};
+
+/**
+ * @brief Guild join request delete (user declined membership screening)
+ */
+struct DPP_EXPORT guild_join_request_delete_t : public event_dispatch_t {
+	using event_dispatch_t::event_dispatch_t;
+	using event_dispatch_t::operator=;
+
+	/**
+	 * @brief Deleted guild
+	 */
+	snowflake guild_id = {};
+
+	/**
+	 * @brief user id
+	 */
+	snowflake user_id = {};
+};
+
+/**
+ * @brief Delete channel
+ */
+struct DPP_EXPORT channel_delete_t : public event_dispatch_t {
+	using event_dispatch_t::event_dispatch_t;
+	using event_dispatch_t::operator=;
+
+	/**
+	 * @brief guild channel is being deleted from
+	 */
+	guild deleting_guild;
+
+	/**
+	 * @brief channel being deleted
+	 */
+	channel deleted;
+};
+
+/**
+ * @brief Update channel
+ */
+struct DPP_EXPORT channel_update_t : public event_dispatch_t {
+	using event_dispatch_t::event_dispatch_t;
+	using event_dispatch_t::operator=;
+
+	/**
+	 * @brief guild channel is being updated on
+	 */
+	guild updating_guild;
+
+	/**
+	 * @brief channel being updated
+	 */
+	channel updated;
+};
+
+/**
+ * @brief Session ready
+ */
+struct DPP_EXPORT ready_t : public event_dispatch_t {
+	using event_dispatch_t::event_dispatch_t;
+	using event_dispatch_t::operator=;
+
+	/**
+	 * @brief websocket session id
+	 */
+	std::string session_id = {};
+
+	/**
+	 * @brief shard id
+	 */
+	uint32_t shard_id = {};
+
+	/**
+	 * @brief Array of guild IDs the bot is in, at the time of this event.
+	 */
+	std::vector<snowflake> guilds{};
+
+	/**
+	 * @brief The number of guilds the bot is in, at the time of this event.
+	 */
+	uint32_t guild_count{0};
+};
+
+/**
+ * @brief Message Deleted
+ */
+struct DPP_EXPORT message_delete_t : public event_dispatch_t {
+	using event_dispatch_t::event_dispatch_t;
+	using event_dispatch_t::operator=;
+
+	/**
+	 * @brief message being deleted
+	 */
+	snowflake id{0};
+
+	/**
+	 * @brief Channel the message was deleted on
+	 * 
+	 */
+	snowflake channel_id{0};
+
+	/**
+	 * @brief Guild the message was deleted on
+	 */
+	snowflake guild_id{0};
+
+};
+
+/**
+ * @brief Guild member remove
+ */
+struct DPP_EXPORT guild_member_remove_t : public event_dispatch_t {
+	using event_dispatch_t::event_dispatch_t;
+	using event_dispatch_t::operator=;
+
+	/**
+	 * @brief guild user is being removed from
+	 */
+	guild removing_guild;
+
+	/**
+	 * @brief Guild ID removed from
+	 */
+	snowflake guild_id{0};
+
+	/**
+	 * @brief user being removed
+	 */
+	user removed;
+};
+
+/**
+ * @brief Session resumed
+ */
+struct DPP_EXPORT resumed_t : public event_dispatch_t {
+	using event_dispatch_t::event_dispatch_t;
+	using event_dispatch_t::operator=;
+
+	/**
+	 * @brief websocket session id
+	 */
+	std::string session_id = {};
+
+	/**
+	 * @brief shard id
+	 */
+	uint32_t shard_id = 0;
+};
+
+/**
+ * @brief Guild role create
+ */
+struct DPP_EXPORT guild_role_create_t : public event_dispatch_t {
+	using event_dispatch_t::event_dispatch_t;
+	using event_dispatch_t::operator=;
+
+	/**
+	 * @brief guild role is being created on
+	 */
+	guild creating_guild;
+
+	/**
+	 * @brief role being created
+	 */
+	role created;
+};
+
+/**
+ * @brief Typing start
+ */
+struct DPP_EXPORT typing_start_t : public event_dispatch_t {
+	using event_dispatch_t::event_dispatch_t;
+	using event_dispatch_t::operator=;
+
+	/**
+	 * @brief guild user is typing on
+	 */
+	guild typing_guild;
+
+	/**
+	 * @brief channel user is typing on
+	 */
+	channel typing_channel;
+
+	/**
+	 * @brief user who is typing.
+	 * Can be nullptr if user is not cached
+	 */
+	user typing_user;
+
+	/**
+	 * @brief User id of user typing.
+	 * Always set regardless of caching
+	 */
+	snowflake user_id = {};
+
+	/**
+	 * @brief Time of typing event
+	 */
+	time_t timestamp = 0;
+};
+
+/**
+ * @brief Voice state update
+ */
+struct DPP_EXPORT voice_track_marker_t : public event_dispatch_t {
+	using event_dispatch_t::event_dispatch_t;
+	using event_dispatch_t::operator=;
+
+	/**
+	 * @brief Voice client
+	 */
+	discord_voice_client* voice_client = nullptr;
+
+	/**
+	 * @brief Track metadata
+	 */
+	std::string track_meta = {};
+};
+
+
+/**
+ * @brief Message reaction add
+ */
+struct DPP_EXPORT message_reaction_add_t : public event_dispatch_t {
+	using event_dispatch_t::event_dispatch_t;
+	using event_dispatch_t::operator=;
+
+	/**
+	 * @brief Guild reaction occurred on
+	 */
+	guild reacting_guild;
+
+	/**
+	 * @brief User who reacted
+	 */
+	user reacting_user = {};
+
+	/**
+	 * @brief member data of user who reacted
+	 */
+	guild_member reacting_member = {};
+
+	/**
+	 * @brief Channel ID the reaction happened on
+	 */
+	snowflake channel_id = {};
+
+	/**
+	 * @brief channel the reaction happened on (Optional)
+	 * @note only filled when the channel is cached
+	 */
+	channel reacting_channel;
+
+	/**
+	 * @brief emoji of reaction
+	 */
+	emoji reacting_emoji = {};
+
+	/**
+	 * @brief message id of the message reacted upon
+	 */
+	snowflake message_id = {};
+
+	/**
+	 * @brief ID of the user who authored the message which was reacted to (Optional)
+	 */
+	snowflake message_author_id = {};
+};
+
+/**
+ * @brief Guild members chunk
+ */
+struct DPP_EXPORT guild_members_chunk_t : public event_dispatch_t {
+	using event_dispatch_t::event_dispatch_t;
+	using event_dispatch_t::operator=;
+
+	/**
+	 * @brief guild the members chunk is for
+	 */
+	guild adding;
+
+	/**
+	 * @brief list of members in the chunk
+	 */
+	guild_member_map members;
+};
+
+/**
+ * @brief Message reaction remove
+ */
+struct DPP_EXPORT message_reaction_remove_t : public event_dispatch_t {
+	using event_dispatch_t::event_dispatch_t;
+	using event_dispatch_t::operator=;
+
+	/**
+	 * @brief Guild reaction occurred on
+	 */
+	guild reacting_guild;
+
+	/**
+	 * @brief User who reacted
+	 */
+	dpp::snowflake reacting_user_id = {};
+
+	/**
+	 * @brief Channel ID the reaction was removed in
+	 */
+	snowflake channel_id = {};
+
+	/**
+	 * @brief channel the reaction happened on (optional)
+	 * @note only filled when the channel is cached
+	 */
+	channel reacting_channel;
+
+	/**
+	 * @brief emoji of reaction
+	 */
+	emoji reacting_emoji = {};
+
+	/**
+	 * @brief message id of the message reacted upon
+	 */
+	snowflake message_id = {};
+};
+
+/**
+ * @brief Create guild
+ */
+struct DPP_EXPORT guild_create_t : public event_dispatch_t {
+	using event_dispatch_t::event_dispatch_t;
+	using event_dispatch_t::operator=;
+
+	/**
+	 * @brief guild that was created
+	 */
+	guild created;
+
+	/**
+	 * @brief List of presences of all users on the guild.
+	 *
+	 * This is only filled if you have the GUILD_PRESENCES
+	 * privileged intent.
+	 */
+	presence_map presences = {};
+
+	/**
+	 * @brief List of scheduled events in the guild
+	 */
+	scheduled_event_map scheduled_events = {};
+
+	/**
+	 * @brief List of stage instances in the guild
+	 */
+	stage_instance_map stage_instances = {};
+
+	/**
+	 * @brief List of threads in the guild
+	 */
+	thread_map threads = {};
+
+	/**
+	 * @brief List of stickers in the guild
+	 */
+	sticker_map stickers = {};
+};
+
+/**
+ * @brief Create channel
+ */
+struct DPP_EXPORT channel_create_t : public event_dispatch_t {
+	using event_dispatch_t::event_dispatch_t;
+	using event_dispatch_t::operator=;
+
+	/**
+	 * @brief guild channel was created on
+	 */
+	guild creating_guild;
+
+	/**
+	 * @brief channel that was created
+	 */
+	channel created;
+};
+
+/**
+ * @brief Message remove emoji
+ */
+struct DPP_EXPORT message_reaction_remove_emoji_t : public event_dispatch_t {
+	using event_dispatch_t::event_dispatch_t;
+	using event_dispatch_t::operator=;
+
+	/**
+	 * @brief Guild reaction occurred on
+	 */
+	guild reacting_guild;
+
+	/**
+	 * @brief Channel ID the reactions was removed in
+	 */
+	snowflake channel_id = {};
+
+	/**
+	 * @brief channel the reaction happened on (optional)
+	 * @note only filled when the channel is cached
+	 */
+	channel reacting_channel;
+
+	/**
+	 * @brief emoji of reaction
+	 */
+	emoji reacting_emoji = {};
+
+	/**
+	 * @brief message id of the message reacted upon
+	 */
+	snowflake message_id = {};
+};
+
+/**
+ * @brief Message delete bulk
+ */
+struct DPP_EXPORT message_delete_bulk_t : public event_dispatch_t {
+	using event_dispatch_t::event_dispatch_t;
+	using event_dispatch_t::operator=;
+
+	/**
+	 * @brief guild messages are being deleted upon
+	 */
+	guild deleting_guild;
+
+	/**
+	 * @brief user who is deleting the messages
+	 */
+	user deleting_user;
+
+	/**
+	 * @brief channel messages are being deleted from
+	 */
+	channel deleting_channel;
+
+	/**
+	 * @brief list of message ids of deleted messages
+	 */
+	std::vector<snowflake> deleted = {};
+};
+
+/**
+ * @brief Guild role update
+ */
+struct DPP_EXPORT guild_role_update_t : public event_dispatch_t {
+	using event_dispatch_t::event_dispatch_t;
+	using event_dispatch_t::operator=;
+
+	/**
+	 * @brief guild where roles are being updated
+	 */
+	guild updating_guild;
+
+	/**
+	 * @brief the role being updated
+	 */
+	role updated;
+};
+
+/**
+ * @brief Guild role delete
+ */
+struct DPP_EXPORT guild_role_delete_t : public event_dispatch_t {
+	using event_dispatch_t::event_dispatch_t;
+	using event_dispatch_t::operator=;
+
+	/**
+	 * @brief guild where role is being deleted
+	 */
+	guild deleting_guild;
+
+	/**
+	 * @brief role being deleted
+	 */
+	role deleted;
+
+	/**
+	 * @brief ID of the deleted role
+	 */
+	snowflake role_id = {};
+};
+
+/**
+ * @brief Channel pins update
+ */
+struct DPP_EXPORT channel_pins_update_t : public event_dispatch_t {
+	using event_dispatch_t::event_dispatch_t;
+	using event_dispatch_t::operator=;
+
+	/**
+	 * @brief guild where message is being pinned
+	 */
+	guild pin_guild;
+
+	/**
+	 * @brief channel where message is being pinned
+	 */
+	channel pin_channel;
+
+	/**
+	 * @brief timestamp of pin
+	 */
+	time_t timestamp = 0;
+};
+
+/**
+ * @brief Message remove all reactions
+ */
+struct DPP_EXPORT message_reaction_remove_all_t : public event_dispatch_t {
+	using event_dispatch_t::event_dispatch_t;
+	using event_dispatch_t::operator=;
+
+	/**
+	 * @brief Guild reaction occurred on
+	 */
+	guild reacting_guild;
+
+	/**
+	 * @brief Channel ID the reactions was removed in
+	 */
+	snowflake channel_id = {};
+
+	/**
+	 * @brief channel the reaction happened on (optional)
+	 * @note only filled when the channel is cached
+	 */
+	channel reacting_channel;
+
+	/**
+	 * @brief message id of the message reacted upon
+	 */
+	snowflake message_id = {};
+
+};
+
+/**
+ * @brief Voice server update
+ */
+struct DPP_EXPORT voice_server_update_t : public event_dispatch_t {
+	using event_dispatch_t::event_dispatch_t;
+	using event_dispatch_t::operator=;
+
+	/**
+	 * @brief guild id where voice server updated
+	 */
+	snowflake guild_id = {};
+
+	/**
+	 * @brief voice server token, used to connect to vc
+	 */
+	std::string token = {};
+
+	/**
+	 * @brief voice server endpoint wss:// address
+	 */
+	std::string endpoint = {};
+};
+
+/**
+ * @brief Guild emojis update
+ */
+struct DPP_EXPORT guild_emojis_update_t : public event_dispatch_t {
+	using event_dispatch_t::event_dispatch_t;
+	using event_dispatch_t::operator=;
+
+	/**
+	 * @brief snowflake ids of list of emojis
+	 */
+	std::vector<snowflake> emojis = {};
+
+	/**
+	 * @brief guild where emojis are being updated
+	 */
+	guild updating_guild;
+};
+
+/**
+ * @brief Presence update
+ * 
+ */
+struct DPP_EXPORT presence_update_t : public event_dispatch_t {
+	using event_dispatch_t::event_dispatch_t;
+	using event_dispatch_t::operator=;
+
+	/**
+	 * @brief rich presence being updated
+	 */
+	presence rich_presence = {};
+};
+
+/**
+ * @brief Webhooks update
+ */
+struct DPP_EXPORT webhooks_update_t : public event_dispatch_t {
+	using event_dispatch_t::event_dispatch_t;
+	using event_dispatch_t::operator=;
+
+	/**
+	 * @brief guild where webhooks are being updated
+	 */
+	guild webhook_guild;
+
+	/**
+	 * @brief channel where webhooks are being updated
+	 */
+	channel webhook_channel;
+};
+
+/**
+ * @brief Guild member add
+ */
+struct DPP_EXPORT guild_member_add_t : public event_dispatch_t {
+	using event_dispatch_t::event_dispatch_t;
+	using event_dispatch_t::operator=;
+
+	/**
+	 * @brief guild which gained new member
+	 */
+	guild adding_guild;
+
+	/**
+	 * @brief member which was added
+	 */
+	guild_member added = {};
+};
+
+/**
+ * @brief Invite delete
+ */
+struct DPP_EXPORT invite_delete_t : public event_dispatch_t {
+	using event_dispatch_t::event_dispatch_t;
+	using event_dispatch_t::operator=;
+
+	/**
+	 * @brief the deleted invite
+	 */
+	invite deleted_invite = {};
+};
+
+/**
+ * @brief Guild update
+ */
+struct DPP_EXPORT guild_update_t : public event_dispatch_t {
+	using event_dispatch_t::event_dispatch_t;
+	using event_dispatch_t::operator=;
+
+	/**
+	 * @brief guild being updated
+	 */
+	guild updated;
+};
+
+/**
+ * @brief Guild integrations update
+ */
+struct DPP_EXPORT guild_integrations_update_t : public event_dispatch_t {
+	using event_dispatch_t::event_dispatch_t;
+	using event_dispatch_t::operator=;
+
+	/**
+	 * @brief guild where integrations are being updated
+	 */
+	guild updating_guild;
+};
+
+/**
+ * @brief Guild member update
+ */
+struct DPP_EXPORT guild_member_update_t : public event_dispatch_t {
+	using event_dispatch_t::event_dispatch_t;
+	using event_dispatch_t::operator=;
+
+	/**
+	 * @brief guild where member is being updated
+	 */
+	guild updating_guild;
+
+	/**
+	 * @brief member being updated
+	 */
+	guild_member updated = {};
+};
+
+/**
+ * @brief Invite create
+ */
+struct DPP_EXPORT invite_create_t : public event_dispatch_t {
+	using event_dispatch_t::event_dispatch_t;
+	using event_dispatch_t::operator=;
+
+	/**
+	 * @brief created invite
+	 */
+	invite created_invite = {};
+};
+
+/**
+ * @brief Message update
+ */
+struct DPP_EXPORT message_update_t : public event_dispatch_t {
+	using event_dispatch_t::event_dispatch_t;
+	using event_dispatch_t::operator=;
+
+	/**
+	 * @brief message being updated
+	 */
+	message msg = {};
+};
+
+/**
+ * @brief User update
+ */
+struct DPP_EXPORT user_update_t : public event_dispatch_t {
+	using event_dispatch_t::event_dispatch_t;
+	using event_dispatch_t::operator=;
+
+	/**
+	 * @brief user being updated
+	 */
+	user updated = {};
+};
+
+/**
+ * @brief Create message
+ */
+struct DPP_EXPORT message_create_t : public event_dispatch_t {
+	using event_dispatch_t::event_dispatch_t;
+	using event_dispatch_t::operator=;
+
+	/**
+	 * @brief message that was created (sent).
+	 */
+	message msg = {};
+	/**
+	 * @brief Send a text to the same channel as the channel_id in received event.
+	 * @param m Text to send
+	 * @param callback User function to execute once the API call completes.
+	 * @note confirmation_callback_t::value contains a message object on success. On failure, value is undefined and confirmation_callback_t::is_error() is true.
+	 */
+	void send(const std::string& m, command_completion_event_t callback = utility::log_error()) const;
+	/**
+	 * @brief Send a message to the same channel as the channel_id in received event.
+	 * @param msg Message to send
+	 * @param callback User function to execute once the API call completes.
+	 * @note confirmation_callback_t::value contains a message object on success. On failure, value is undefined and confirmation_callback_t::is_error() is true.
+	 */
+	void send(const message& msg, command_completion_event_t callback = utility::log_error()) const;
+	/**
+	 * @brief Send a message to the same channel as the channel_id in received event.
+	 * @param msg Message to send
+	 * @param callback User function to execute once the API call completes.
+	 * @note confirmation_callback_t::value contains a message object on success. On failure, value is undefined and confirmation_callback_t::is_error() is true.
+	 */
+	void send(message&& msg, command_completion_event_t callback = utility::log_error()) const;
+	/**
+	 * @brief Reply to the message received in the event.
+	 * @param m Text to send
+	 * @param mention_replied_user mentions (pings) the author of message replied to, if true
+	 * @param callback User function to execute once the API call completes.
+	 * @note confirmation_callback_t::value contains a message object on success. On failure, value is undefined and confirmation_callback_t::is_error() is true.
+	 */
+	void reply(const std::string& m, bool mention_replied_user = false, command_completion_event_t callback = utility::log_error()) const;
+	/**
+	 * @brief Reply to the message received in the event.
+	 * @param msg Message to send as a reply.
+	 * @param mention_replied_user mentions (pings) the author of message replied to, if true
+	 * @param callback User function to execute once the API call completes.
+	 * @note confirmation_callback_t::value contains a message object on success. On failure, value is undefined and confirmation_callback_t::is_error() is true.
+	 */
+	void reply(const message& msg, bool mention_replied_user = false, command_completion_event_t callback = utility::log_error()) const;
+	/**
+	 * @brief Reply to the message received in the event.
+	 * @param msg Message to send as a reply.
+	 * @param mention_replied_user mentions (pings) the author of message replied to, if true
+	 * @param callback User function to execute once the API call completes.
+	 * @note confirmation_callback_t::value contains a message object on success. On failure, value is undefined and confirmation_callback_t::is_error() is true.
+	 */
+	void reply(message&& msg, bool mention_replied_user = false, command_completion_event_t callback = utility::log_error()) const;
+
+#ifndef DPP_NO_CORO
+	/**
+	 * @brief Send a text to the same channel as the channel_id in received event.
+	 * 
+	 * @param m Text to send
+	 * On success the result will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	dpp::async<dpp::confirmation_callback_t> co_send(std::string m) const;
+
+	/**
+	 * @brief Send a message to the same channel as the channel_id in received event.
+	 * 
+	 * @param msg Message to send
+	 * On success the result will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	dpp::async<dpp::confirmation_callback_t> co_send(message msg) const;
+
+	/**
+	 * @brief Reply to the message received in the event.
+	 *
+	 * @param m Text to send as a reply.
+	 * @param mention_replied_user mentions (pings) the author of message replied to, if true
+	 * On success the result will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	dpp::async<dpp::confirmation_callback_t> co_reply(std::string m, bool mention_replied_user = false) const;
+
+	/**
+	 * @brief Reply to the message received in the event.
+	 *
+	 * @param msg Message to send as a reply.
+	 * @param mention_replied_user mentions (pings) the author of message replied to, if true
+	 * On success the result will contain a dpp::confirmation object in confirmation_callback_t::value. On failure, the value is undefined and confirmation_callback_t::is_error() method will return true. You can obtain full error details with confirmation_callback_t::get_error().
+	 */
+	dpp::async<dpp::confirmation_callback_t> co_reply(message msg, bool mention_replied_user = false) const;
+#endif /* DPP_NO_CORO */
+};
+
+/**
+ * @brief Message poll vote add
+ */
+struct DPP_EXPORT message_poll_vote_add_t : public event_dispatch_t {
+	using event_dispatch_t::event_dispatch_t;
+	using event_dispatch_t::operator=;
+
+	/**
+	 * @brief ID of the user who added the vote
+	 */
+	snowflake user_id;
+
+	/**
+	 * @brief ID of the channel containing the vote
+	 */
+	snowflake channel_id;
+
+	/**
+	 * @brief ID of the message containing the vote
+	 */
+	snowflake message_id;
+
+	/**
+	 * @brief ID of the guild containing the vote or 0 for DMs
+	 */
+	snowflake guild_id;
+
+	/**
+	 * @brief ID of the answer in the message poll object
+	 */
+	uint32_t answer_id;
+};
+
+/**
+ * @brief Message poll vote remove
+ */
+struct DPP_EXPORT message_poll_vote_remove_t : public event_dispatch_t {
+	using event_dispatch_t::event_dispatch_t;
+	using event_dispatch_t::operator=;
+
+	/**
+	 * @brief ID of the user who added the vote
+	 */
+	snowflake user_id;
+
+	/**
+	 * @brief ID of the channel containing the vote
+	 */
+	snowflake channel_id;
+
+	/**
+	 * @brief ID of the message containing the vote
+	 */
+	snowflake message_id;
+
+	/**
+	 * @brief ID of the guild containing the vote or 0 for DMs
+	 */
+	snowflake guild_id;
+
+	/**
+	 * @brief ID of the answer in the message poll object
+	 */
+	uint32_t answer_id;
+};
+
+/**
+ * @brief Guild audit log entry create
+ */
+struct DPP_EXPORT guild_audit_log_entry_create_t : public event_dispatch_t {
+	using event_dispatch_t::event_dispatch_t;
+	using event_dispatch_t::operator=;
+
+	/**
+	 * @brief created audit log entry
+	 */
+	audit_entry entry = {};
+};
+
+/**
+ * @brief Guild ban add
+ */
+struct DPP_EXPORT guild_ban_add_t : public event_dispatch_t {
+	using event_dispatch_t::event_dispatch_t;
+	using event_dispatch_t::operator=;
+
+	/**
+	 * @brief guild where ban was added
+	 */
+	guild banning_guild;
+
+	/**
+	 * @brief user being banned
+	 */
+	user banned = {};
+};
+
+/**
+ * @brief Guild ban remove
+ */
+struct DPP_EXPORT guild_ban_remove_t : public event_dispatch_t {
+	using event_dispatch_t::event_dispatch_t;
+	using event_dispatch_t::operator=;
+
+	/**
+	 * @brief guild where ban is being removed
+	 */
+	guild unbanning_guild;
+
+	/**
+	 * @brief user being unbanned
+	 */
+	user unbanned = {};
+};
+
+/**
+ * @brief Integration create
+ */
+struct DPP_EXPORT integration_create_t : public event_dispatch_t {
+	using event_dispatch_t::event_dispatch_t;
+	using event_dispatch_t::operator=;
+
+	/**
+	 * @brief created integration
+	 */
+	integration created_integration = {};
+};
+
+/**
+ * @brief Integration update
+ */
+struct DPP_EXPORT integration_update_t : public event_dispatch_t {
+	using event_dispatch_t::event_dispatch_t;
+	using event_dispatch_t::operator=;
+
+	/**
+	 * @brief updated integration
+	 */
+	integration updated_integration = {};
+};
+
+/**
+ * @brief Integration delete
+ */
+struct DPP_EXPORT integration_delete_t : public event_dispatch_t {
+	using event_dispatch_t::event_dispatch_t;
+	using event_dispatch_t::operator=;
+
+	/**
+	 * @brief deleted integration
+	 */
+	integration deleted_integration = {};
+};
+
+/**
+ * @brief Thread Create
+ */
+struct DPP_EXPORT thread_create_t : public event_dispatch_t {
+	using event_dispatch_t::event_dispatch_t;
+	using event_dispatch_t::operator=;
+
+	/**
+	 * @brief guild where thread was created
+	 */
+	guild creating_guild;
+
+	/**
+	 * @brief thread created
+	 */
+	thread created = {};
+};
+
+/**
+ * @brief Thread Update
+ */
+struct DPP_EXPORT thread_update_t : public event_dispatch_t {
+	using event_dispatch_t::event_dispatch_t;
+	using event_dispatch_t::operator=;
+
+	/**
+	 * @brief guild where thread was updated
+	 */
+	guild updating_guild;
+
+	/**
+	 * @brief thread updated
+	 */
+	thread updated = {};
+};
+
+/**
+ * @brief Thread Delete
+ */
+struct DPP_EXPORT thread_delete_t : public event_dispatch_t {
+	using event_dispatch_t::event_dispatch_t;
+	using event_dispatch_t::operator=;
+
+	/**
+	 * @brief guild where thread was deleted
+	 */
+	guild deleting_guild;
+
+	/**
+	 * @brief thread deleted
+	 */
+	thread deleted = {};
+};
+
+/**
+ * @brief Thread List Sync
+ */
+struct DPP_EXPORT thread_list_sync_t : public event_dispatch_t {
+	using event_dispatch_t::event_dispatch_t;
+	using event_dispatch_t::operator=;
+
+	/**
+	 * @brief guild where thread list was synchronised
+	 */
+	guild updating_guild;
+
+	/**
+	 * @brief list of threads (channels) synchronised
+	 */
+	std::vector<thread> threads = {};
+
+	/**
+	 * @brief list of thread members for the channels (threads)
+	 */
+	std::vector<thread_member> members = {};
+};
+
+/**
+ * @brief Thread Member Update
+ */
+struct DPP_EXPORT thread_member_update_t : public event_dispatch_t {
+	using event_dispatch_t::event_dispatch_t;
+	using event_dispatch_t::operator=;
+
+	/**
+	 * @brief updated thread member
+	 */
+	thread_member updated = {};
+};
+
+/**
+ * @brief Thread Members Update
+ */
+struct DPP_EXPORT thread_members_update_t : public event_dispatch_t {
+	using event_dispatch_t::event_dispatch_t;
+	using event_dispatch_t::operator=;
+
+	/**
+	 * @brief thread (channel) id
+	 */
+	snowflake thread_id = {};
+
+	/**
+	 * @brief guild thread members updated on
+	 */
+	guild* updating_guild = nullptr;
+
+	/**
+	 * @brief new approximate member count
+	 */
+	uint8_t member_count = 0;
+
+	/**
+	 * @brief added members
+	 */
+	std::vector<thread_member> added = {};
+
+	/**
+	 * @brief ids only of removed members
+	 */
+	std::vector<snowflake> removed_ids = {};
+};
+
+/**
+ * @brief voice buffer send
+ * @warning The shard in `from` will ALWAYS be null.
+ */
+struct DPP_EXPORT voice_buffer_send_t : public event_dispatch_t {
+	using event_dispatch_t::event_dispatch_t;
+	using event_dispatch_t::operator=;
+
+	/**
+	 * @brief voice client where buffer was sent
+	 */
+	class discord_voice_client* voice_client = nullptr;
+
+	/**
+	 * @brief encoded size of sent buffer
+	 */
+	uint64_t buffer_size = 0;
+
+	/**
+	 * @brief number of packet waiting to be sent in the queue
+	 */
+	size_t packets_left = 0;
+};
+
+/**
+ * @brief voice ready
+ */
+struct DPP_EXPORT voice_ready_t : public event_dispatch_t {
+	using event_dispatch_t::event_dispatch_t;
+	using event_dispatch_t::operator=;
+
+	/**
+	 * @brief voice client which is ready
+	 */
+	discord_voice_client* voice_client = nullptr;
+
+	/**
+	 * @brief id of voice channel
+	 */
+	snowflake voice_channel_id = {};
+};
+
+/**
+ * @brief voice receive packet
+ */
+struct DPP_EXPORT voice_receive_t : public event_dispatch_t {
+	friend class discord_voice_client;
+
+	using event_dispatch_t::event_dispatch_t;
+	using event_dispatch_t::operator=;
+
+	/**
+	 * @brief Construct a new voice receive t object
+	 *
+	 * @param creator The creating cluster
+	 * @param shard_id Shard the voice channel exists on
+	 * @param raw Raw event text as UDP packet.
+	 * @param vc owning voice client pointer
+	 * @param _user_id user id who is speaking, 0 for a mix of all user audio
+	 * @param pcm user audio to set
+	 * @param length length of user audio in bytes
+	 */
+	voice_receive_t(dpp::cluster* creator, uint32_t shard_id, const std::string& raw, class discord_voice_client* vc, snowflake _user_id, const uint8_t* pcm, size_t length);
+
+	/**
+	 * @brief Construct a new voice receive t object
+	 *
+	 * @param creator The creating cluster
+	 * @param shard_id Shard the voice channel exists on
+	 * @param raw Raw event text as UDP packet.
+	 * @param vc owning voice client pointer
+	 * @param _user_id user id who is speaking, 0 for a mix of all user audio
+	 * @param pcm user audio to set
+	 * @param length length of user audio in bytes
+	 */
+	voice_receive_t(dpp::cluster* creator, uint32_t shard_id, std::string&& raw, class discord_voice_client* vc, snowflake _user_id, const uint8_t* pcm, size_t length);
+
+	/**
+	 * @brief Voice client
+	 */
+	discord_voice_client* voice_client = nullptr;
+
+	/**
+	 * @brief Audio data, encoded as 48kHz stereo PCM or Opus,
+	 * @deprecated Please switch to using audio_data.
+	 */
+	uint8_t* audio = nullptr;
+
+	/**
+	 * @brief Size of audio buffer
+	 * @deprecated Please switch to using audio_data.
+	 */
+	size_t audio_size = 0;
+
+	/**
+	 * @brief Audio data, encoded as 48kHz stereo PCM or Opus,
+	 */
+	std::vector<uint8_t> audio_data = {};
+
+	/**
+	 * @brief User ID of speaker (zero if unknown)
+	 */
+	snowflake user_id = {};
+
+protected:
+	/**
+	 * @brief Reassign values outside of the constructor for use within discord_voice_client
+	 *
+	 * @param vc owning voice client pointer
+	 * @param _user_id user id who is speaking, 0 for a mix of all user audio
+	 * @param pcm user audio to set
+	 * @param length length of user audio in bytes
+	 */
+	void reassign(discord_voice_client* vc, snowflake _user_id, const uint8_t* pcm, size_t length);
+};
+
+/**
+ * @brief voice client speaking event
+ */
+struct DPP_EXPORT voice_client_speaking_t : public event_dispatch_t {
+	using event_dispatch_t::event_dispatch_t;
+	using event_dispatch_t::operator=;
+
+	/**
+	 * @brief voice client where user is speaking
+	 */
+	discord_voice_client* voice_client = nullptr;
+
+	/**
+	 * @brief speaking user id
+	 */
+	snowflake user_id = {};
+
+	/**
+	 * @brief ssrc value of speaking user
+	 */
+	uint32_t ssrc = 0;
+};
+
+/**
+ * @brief voice client disconnect event
+ */
+struct DPP_EXPORT voice_client_disconnect_t : public event_dispatch_t {
+	using event_dispatch_t::event_dispatch_t;
+	using event_dispatch_t::operator=;
+
+	/**
+	 * @brief voice client where user disconnected
+	 */
+	discord_voice_client* voice_client = nullptr;
+
+	/**
+	 * @brief user id of user who left vc
+	 */
+	snowflake user_id = {};
+};
+
+/**
+ * @brief Discord voice platform types
+ */
+enum client_platform_t : uint8_t {
+	/**
+	 * @brief Web, Desktop
+	 */
+	client_platform_desktop = 0,
+	/**
+	 * @brief Mobile device
+	 */
+	client_platform_mobile = 1,
+};
+
+/**
+ * @brief voice client platform type notification event
+ */
+struct DPP_EXPORT voice_client_platform_t : public event_dispatch_t {
+	using event_dispatch_t::event_dispatch_t;
+	using event_dispatch_t::operator=;
+
+	/**
+	 * @brief voice client where user is
+	 */
+	discord_voice_client* voice_client = nullptr;
+
+	/**
+	 * @brief user id of user who left vc
+	 */
+	snowflake user_id = {};
+
+	/**
+	 * @brief Client platform for the voice user
+	 * Either desktop, or mobile
+	 */
+	client_platform_t platform = client_platform_desktop;
+};
+
+/**
+ * @brief Delete stage instance
+ */
+struct DPP_EXPORT entitlement_create_t : public event_dispatch_t {
+	using event_dispatch_t::event_dispatch_t;
+	using event_dispatch_t::operator=;
+
+	/**
+	 * @brief The created entitlement.
+	 */
+	entitlement created = {};
+};
+
+/**
+ * @brief Delete stage instance
+ */
+struct DPP_EXPORT entitlement_update_t : public event_dispatch_t {
+	using event_dispatch_t::event_dispatch_t;
+	using event_dispatch_t::operator=;
+
+	/**
+	 * @brief The entitlement that was updated.
+	 */
+	entitlement updating_entitlement = {};
+};
+
+/**
+ * @brief Delete stage instance
+ */
+struct DPP_EXPORT entitlement_delete_t : public event_dispatch_t {
+	using event_dispatch_t::event_dispatch_t;
+	using event_dispatch_t::operator=;
+
+	/**
+	 * @brief The deleted entitlement.
+	 */
+	entitlement deleted = {};
+};
+
+}
+
diff --git a/3rdParty/dpp/dns.h b/3rdParty/dpp/dns.h
index 23d5b1ba99..95983bd759 100644
--- a/3rdParty/dpp/dns.h
+++ b/3rdParty/dpp/dns.h
@@ -1,76 +1,98 @@
-/************************************************************************************
- *
- * D++, A Lightweight C++ library for Discord
- *
- * Copyright 2021 Craig Edwards and D++ contributors
- * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- ************************************************************************************/
-#pragma once
-#include <dpp/export.h>
-#ifdef _WIN32
-#include <WinSock2.h>
-#include <WS2tcpip.h>
-#else
-#include <netinet/in.h>
-#include <netdb.h>
-#include <sys/socket.h>
-#endif
-#include <sys/types.h>
-#include <string>
-#include <unordered_map>
-
-namespace dpp {
-
-	/**
-	 * @brief Represents a cached DNS result.
-	 * Used by the ssl_client class to store cached copies of dns lookups.
-	 */
-	struct dns_cache_entry {
-		/**
-		 * @brief Resolved address information
-		 */
-		addrinfo addr;
-
-		/**
-		 * @brief Socket address.
-		 * Discord only supports ipv4, but sockaddr_in6 is larger
-		 * than sockaddr_in, sockaddr_storage will hold either. This
-		 * means that if discord ever do support ipv6 we just flip
-		 * one value in dns.cpp and that should be all that is needed.
-		 */
-		sockaddr_storage ai_addr;
-
-		/**
-		 * @brief Time at which this cache entry is invalidated
-		 */
-		time_t expire_timestamp;
-	};
-
-	/**
-	 * @brief Cache container type
-	 */
-	using dns_cache_t = std::unordered_map<std::string, dns_cache_entry*>;
-
-	/**
-	 * @brief Resolve a hostname to an addrinfo
-	 * 
-	 * @param hostname Hostname to resolve
-	 * @param port A port number or named service, e.g. "80"
-	 * @return dns_cache_entry* First IP address associated with the hostname DNS record
-	 * @throw dpp::connection_exception On failure to resolve hostname
-	 */
-	const dns_cache_entry* resolve_hostname(const std::string& hostname, const std::string& port);
-};
+/************************************************************************************
+ *
+ * D++, A Lightweight C++ library for Discord
+ *
+ * Copyright 2021 Craig Edwards and D++ contributors
+ * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ************************************************************************************/
+#pragma once
+#include <dpp/export.h>
+#ifdef _WIN32
+#include <WinSock2.h>
+#include <WS2tcpip.h>
+#else
+#include <netinet/in.h>
+#include <netdb.h>
+#include <sys/socket.h>
+#endif
+#include <sys/types.h>
+#include <string>
+#include <unordered_map>
+#include <cstring>
+#include <memory>
+#include <dpp/socket.h>
+
+namespace dpp {
+
+	/**
+	 * @brief Represents a cached DNS result.
+	 * Used by the ssl_connection class to store cached copies of dns lookups.
+	 */
+	struct DPP_EXPORT dns_cache_entry {
+		/**
+		 * @brief Resolved address metadata
+		 */
+		addrinfo addr;
+
+		/**
+		 * @brief Resolved address as string.
+		 * The metadata is needed to know what type of address it is.
+		 * Do not do silly stuff like just looking to see if '.' is in it!
+		 */
+		std::string resolved_addr;
+
+		/**
+		 * @brief Time at which this cache entry is invalidated
+		 */
+		time_t expire_timestamp;
+
+		/**
+		 * @brief Get address length
+		 * @return address length
+		 */
+		[[nodiscard]] int size() const;
+
+		/**
+		 * @brief Get the address_t that corresponds to this cache entry
+		 * for use when connecting with ::connect()
+		 * @param port Port number to connect to
+		 * @return address_t prefilled with the IP and port number
+		 */
+		[[nodiscard]] const address_t get_connecting_address(uint16_t port) const;
+
+		/**
+		 * @brief Allocate a socket file descriptor for the given dns address
+		 * @return File descriptor ready for calling connect(), or INVALID_SOCKET
+		 * on failure.
+		 */
+		[[nodiscard]] socket make_connecting_socket() const;
+	};
+
+	/**
+	 * @brief Cache container type
+	 */
+	using dns_cache_t = std::unordered_map<std::string, std::unique_ptr<dns_cache_entry>>;
+
+	/**
+	 * @brief Resolve a hostname to an addrinfo
+	 * 
+	 * @param hostname Hostname to resolve
+	 * @param port A port number or named service, e.g. "80"
+	 * @return dns_cache_entry* First IP address associated with the hostname DNS record
+	 * @throw dpp::connection_exception On failure to resolve hostname
+	 */
+	DPP_EXPORT const dns_cache_entry *resolve_hostname(const std::string &hostname, const std::string &port);
+	}
diff --git a/3rdParty/dpp/dpp.h b/3rdParty/dpp/dpp.h
index 3e3d0b52fb..f5834c7195 100644
--- a/3rdParty/dpp/dpp.h
+++ b/3rdParty/dpp/dpp.h
@@ -1,74 +1,83 @@
-/************************************************************************************
- *
- * D++, A Lightweight C++ library for Discord
- *
- * Copyright 2021 Craig Edwards and D++ contributors 
- * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- ************************************************************************************/
-#pragma once
-#include <dpp/export.h>
-#include <dpp/version.h>
-#include <string>
-#include <map>
-#include <vector>
-#include <fstream>
-#include <iostream>
-#include <ctime>
-#include <string>
-#include <vector>
-#include <map>
-#include <functional>
-#include <dpp/exception.h>
-#include <dpp/snowflake.h>
-#include <dpp/misc-enum.h>
-#include <dpp/stringops.h>
-#include <dpp/managed.h>
-#include <dpp/utility.h>
-#include <dpp/voicestate.h>
-#include <dpp/permissions.h>
-#include <dpp/role.h>
-#include <dpp/user.h>
-#include <dpp/channel.h>
-#include <dpp/guild.h>
-#include <dpp/invite.h>
-#include <dpp/dtemplate.h>
-#include <dpp/emoji.h>
-#include <dpp/ban.h>
-#include <dpp/prune.h>
-#include <dpp/voiceregion.h>
-#include <dpp/integration.h>
-#include <dpp/webhook.h>
-#include <dpp/presence.h>
-#include <dpp/intents.h>
-#include <dpp/message.h>
-#include <dpp/appcommand.h>
-#include <dpp/stage_instance.h>
-#include <dpp/auditlog.h>
-#include <dpp/application.h>
-#include <dpp/scheduled_event.h>
-#include <dpp/discordclient.h>
-#include <dpp/dispatcher.h>
-#include <dpp/cluster.h>
-#include <dpp/cache.h>
-#include <dpp/httpsclient.h>
-#include <dpp/queues.h>
-#include <dpp/commandhandler.h>
-#include <dpp/once.h>
-#include <dpp/sync.h>
-#include <dpp/colors.h>
-#include <dpp/discordevents.h>
-#include <dpp/timed_listener.h>
-#include <dpp/collector.h>
+/************************************************************************************
+ *
+ * D++, A Lightweight C++ library for Discord
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright 2021 Craig Edwards and D++ contributors 
+ * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ************************************************************************************/
+#pragma once
+#include <dpp/export.h>
+#include <dpp/version.h>
+#include <string>
+#include <map>
+#include <vector>
+#include <fstream>
+#include <iostream>
+#include <ctime>
+#include <string>
+#include <vector>
+#include <map>
+#include <functional>
+#include <dpp/exception.h>
+#include <dpp/snowflake.h>
+#include <dpp/misc-enum.h>
+#include <dpp/stringops.h>
+#include <dpp/managed.h>
+#include <dpp/socketengine.h>
+#include <dpp/utility.h>
+#include <dpp/voice_channel_effect.h>
+#include <dpp/voicestate.h>
+#include <dpp/permissions.h>
+#include <dpp/role.h>
+#include <dpp/user.h>
+#include <dpp/channel.h>
+#include <dpp/thread.h>
+#include <dpp/guild.h>
+#include <dpp/invite.h>
+#include <dpp/dtemplate.h>
+#include <dpp/emoji.h>
+#include <dpp/ban.h>
+#include <dpp/prune.h>
+#include <dpp/voiceregion.h>
+#include <dpp/integration.h>
+#include <dpp/webhook.h>
+#include <dpp/presence.h>
+#include <dpp/intents.h>
+#include <dpp/message.h>
+#include <dpp/appcommand.h>
+#include <dpp/stage_instance.h>
+#include <dpp/auditlog.h>
+#include <dpp/application.h>
+#include <dpp/scheduled_event.h>
+#include <dpp/discordclient.h>
+#include <dpp/dispatcher.h>
+#include <dpp/cluster.h>
+#include <dpp/cache.h>
+#include <dpp/httpsclient.h>
+#include <dpp/queues.h>
+#include <dpp/commandhandler.h>
+#include <dpp/once.h>
+#include <dpp/colors.h>
+#include <dpp/discordevents.h>
+#include <dpp/timed_listener.h>
+#include <dpp/collector.h>
+#include <dpp/bignum.h>
+#include <dpp/thread_pool.h>
+#include <dpp/signature_verifier.h>
+#include <dpp/socket_listener.h>
+#include <dpp/http_server.h>
+#include <dpp/discord_webhook_server.h>
diff --git a/3rdParty/dpp/dtemplate.h b/3rdParty/dpp/dtemplate.h
index f9ecb3a406..3de77a8f1c 100644
--- a/3rdParty/dpp/dtemplate.h
+++ b/3rdParty/dpp/dtemplate.h
@@ -1,103 +1,115 @@
-/************************************************************************************
- *
- * D++, A Lightweight C++ library for Discord
- *
- * Copyright 2021 Craig Edwards and D++ contributors 
- * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- ************************************************************************************/
-#pragma once
-#include <dpp/export.h>
-#include <dpp/snowflake.h>
-#include <dpp/nlohmann/json_fwd.hpp>
-#include <unordered_map>
-#include <dpp/json_interface.h>
-
-namespace dpp {
-
-/**
- * @brief Represents a guild template
- */
-class DPP_EXPORT dtemplate : public json_interface<dtemplate>  {
-public:	
-	/**
-	 * @brief Template code
-	 */
-	std::string code;
-	/**
-	 * @brief Template name
-	 */
-	std::string name;
-	/**
-	 * @brief Template description
-	 */
-	std::string description;
-	/**
-	 * @brief Usage counter
-	 */
-	uint32_t usage_count;
-	/**
-	 * @brief User ID of creator
-	 */
-	snowflake creator_id;
-	/**
-	 * @brief Creation date/time
-	 * 
-	 */
-	time_t created_at;
-	/**
-	 * @brief Last update date/time
-	 */
-	time_t updated_at;
-	/**
-	 * @brief Guild id the template is created from
-	 */
-	snowflake source_guild_id;
-	/**
-	 * @brief True if needs synchronising
-	 */
-	bool is_dirty;
-
-	/**
-	 * @brief Construct a new dtemplate object
-	 */
-	dtemplate();
-
-	/**
-	 * @brief Destroy the dtemplate object
-	 */
-	virtual ~dtemplate() = default;
-	
-	/** Read class values from json object
-	 * @param j A json object to read from
-	 * @return A reference to self
-	 */
-	 dtemplate& fill_from_json(nlohmann::json* j);
-
-	/**
-	 * @brief Build the JSON for this object
-	 * 
-	 * @param with_id Add ID to output
-	 * @return std::string JSON content 
-	 */
-	std::string build_json(bool with_id = false) const;
-
-};
-
-/** A container of invites */
-typedef std::unordered_map<snowflake, dtemplate> dtemplate_map;
-
-
-};
+/************************************************************************************
+ *
+ * D++, A Lightweight C++ library for Discord
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright 2021 Craig Edwards and D++ contributors 
+ * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ************************************************************************************/
+#pragma once
+#include <dpp/export.h>
+#include <dpp/snowflake.h>
+#include <dpp/json_fwd.h>
+#include <unordered_map>
+#include <dpp/json_interface.h>
+
+namespace dpp {
+
+/**
+ * @brief Represents a guild template
+ */
+class DPP_EXPORT dtemplate : public json_interface<dtemplate> {
+protected:
+	friend struct json_interface<dtemplate>;
+
+	/** Read class values from json object
+	 * @param j A json object to read from
+	 * @return A reference to self
+	 */
+	dtemplate& fill_from_json_impl(nlohmann::json* j);
+
+	/**
+	 * @brief Build the JSON for this object
+	 *
+	 * @param with_id Add ID to output
+	 * @return json JSON content
+	 */
+	json to_json_impl(bool with_id = false) const;
+
+public:
+	/**
+	 * @brief Template code
+	 */
+	std::string code;
+
+	/**
+	 * @brief Template name
+	 */
+	std::string name;
+
+	/**
+	 * @brief Template description
+	 */
+	std::string description;
+
+	/**
+	 * @brief Usage counter
+	 */
+	uint32_t usage_count;
+
+	/**
+	 * @brief User ID of creator
+	 */
+	snowflake creator_id;
+
+	/**
+	 * @brief Creation date/time
+	 * 
+	 */
+	time_t created_at;
+
+	/**
+	 * @brief Last update date/time
+	 */
+	time_t updated_at;
+
+	/**
+	 * @brief Guild id the template is created from
+	 */
+	snowflake source_guild_id;
+
+	/**
+	 * @brief True if needs synchronising
+	 */
+	bool is_dirty;
+
+	/**
+	 * @brief Construct a new dtemplate object
+	 */
+	dtemplate();
+
+	/**
+	 * @brief Destroy the dtemplate object
+	 */
+	virtual ~dtemplate() = default;
+};
+
+/**
+ * @brief A container of invites
+ */
+typedef std::unordered_map<snowflake, dtemplate> dtemplate_map;
+
+}
diff --git a/3rdParty/dpp/emoji.h b/3rdParty/dpp/emoji.h
index 05e841317f..b45f8e6d2a 100644
--- a/3rdParty/dpp/emoji.h
+++ b/3rdParty/dpp/emoji.h
@@ -1,177 +1,252 @@
-/************************************************************************************
- *
- * D++, A Lightweight C++ library for Discord
- *
- * Copyright 2021 Craig Edwards and D++ contributors 
- * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- ************************************************************************************/
-#pragma once
-#include <dpp/export.h>
-#include <dpp/snowflake.h>
-#include <dpp/misc-enum.h>
-#include <dpp/managed.h>
-#include <dpp/utility.h>
-#include <dpp/nlohmann/json_fwd.hpp>
-#include <unordered_map>
-#include <dpp/json_interface.h>
-
-namespace dpp {
-
-#define MAX_EMOJI_SIZE 256 * 1024
-
-/**
- * @brief Flags for dpp::emoji
- */
-enum emoji_flags : uint8_t {
-	/// Emoji requires colons
-	e_require_colons = 0b00000001,
-	/// Managed (introduced by application)
-	e_managed =        0b00000010,
-	/// Animated
-	e_animated =       0b00000100,
-	/// Available (false if the guild doesn't meet boosting criteria, etc)
-	e_available =      0b00001000,
-};
-
-/**
- * @brief Represents an emoji for a dpp::guild
- */
-class DPP_EXPORT emoji : public managed, public json_interface<emoji>  {
-public:
-	/**
-	 * @brief Emoji name
-	 */
-	std::string name;
-	/**
-	 * @brief User id who uploaded the emoji
-	 */
-	snowflake user_id;
-	/**
-	 * @brief Flags for the emoji from dpp::emoji_flags
-	 */
-	uint8_t flags;
-	/**
-	 * @brief Image data for the emoji if uploading
-	 */
-	std::string* image_data;
-	
-	/**
-	 * @brief Construct a new emoji object
-	 */
-	emoji();
-
-	/**
-	 * @brief Construct a new emoji object with name, ID and flags
-	 * 
-	 * @param n The emoji's name
-	 * @param i ID, if it has one (unicode does not)
-	 * @param f Emoji flags (emoji_flags)
-	 */
-	emoji(const std::string n, const snowflake i = 0, const uint8_t f = 0);
-
-	/**
-	 * @brief Destroy the emoji object
-	 */
-	virtual ~emoji();
-
-	/**
-	* @brief Create a mentionable emoji
-	* @param name The name of the emoji.
-	* @param id The ID of the emoji.
-	* @param is_animated is emoji animated.
-	* @return std::string The formatted mention of the emoji.
-	*/
-	static std::string get_mention(const std::string& name, const snowflake& id, bool is_animated = false);
-
-	/**
-	 * @brief Read class values from json object
-	 * 
-	 * @param j A json object to read from
-	 * @return A reference to self
-	 */
-	emoji& fill_from_json(nlohmann::json* j);
-
-	/**
-	 * @brief Build the json for this object
-	 * 
-	 * @param with_id include the id in the JSON
-	 * @return std::string json data
-	 */
-	std::string build_json(bool with_id = false) const;
-
-	/**
-	 * @brief Emoji requires colons
-	 * 
-	 * @return true Requires colons
-	 * @return false Does not require colons
-	 */
-	bool requires_colons() const;
-
-	/**
-	 * @brief Emoji is managed
-	 * 
-	 * @return true Is managed
-	 * @return false Is not managed
-	 */
-	bool is_managed() const;
-
-	/**
-	 * @brief Emoji is animated
-	 * 
-	 * @return true Is animated
-	 * @return false Is noy animated
-	 */
-	bool is_animated() const;
-
-	/**
-	 * @brief Is available
-	 * 
-	 * @return true Is available
-	 * @return false Is unavailable
-	 */
-	bool is_available() const;
-
-	/**
-	 * @brief Load an image into the object as base64
-	 * 
-	 * @param image_blob Image binary data
-	 * @param type Type of image
-	 * @return emoji& Reference to self
-	 * @throw dpp::exception Image content exceeds discord maximum of 256 kilobytes
-	 */
-	emoji& load_image(const std::string &image_blob, const image_type type);
-
-	/**
-	 * @brief Format to name if unicode, name:id if has id or a:name:id if animated
-	 * 
-	 * @return Formatted name for reactions
-	 */
-	std::string format() const;
-
-	/**
-	 * @brief Get the mention/ping for the emoji
-	 * 
-	 * @return std::string mention
-	 */
-	std::string get_mention() const;
-};
-
-/**
- * @brief Group of emojis
- */
-typedef std::unordered_map<snowflake, emoji> emoji_map;
-
-};
+/************************************************************************************
+ *
+ * D++, A Lightweight C++ library for Discord
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright 2021 Craig Edwards and D++ contributors 
+ * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ************************************************************************************/
+#pragma once
+#include <dpp/export.h>
+#include <dpp/snowflake.h>
+#include <dpp/misc-enum.h>
+#include <dpp/managed.h>
+#include <dpp/utility.h>
+#include <dpp/json_fwd.h>
+#include <unordered_map>
+#include <dpp/json_interface.h>
+
+namespace dpp {
+
+#define MAX_EMOJI_SIZE 256 * 1024
+
+/**
+ * @brief Flags for dpp::emoji
+ */
+enum emoji_flags : uint8_t {
+	/**
+	 * @brief Emoji requires colons.
+	 */
+	e_require_colons = 0b00000001,
+
+	/**
+	 * @brief Managed (introduced by application)
+	 */
+	e_managed = 0b00000010,
+
+	/**
+	 * @brief Animated emoji.
+	 */
+	e_animated = 0b00000100,
+
+	/**
+	 * @brief Available (false if the guild doesn't meet boosting criteria, etc)
+	 */
+	e_available = 0b00001000,
+};
+
+/**
+ * @brief Represents an emoji for a dpp::guild
+ */
+class DPP_EXPORT emoji : public managed, public json_interface<emoji> {
+protected:
+	friend struct json_interface<emoji>;
+
+	/**
+	 * @brief Read class values from json object
+	 *
+	 * @param j A json object to read from
+	 * @return A reference to self
+	 */
+	emoji& fill_from_json_impl(nlohmann::json* j);
+
+	/**
+	 * @brief Build the json for this object
+	 *
+	 * @param with_id include the id in the JSON
+	 * @return std::string json data
+	 */
+	json to_json_impl(bool with_id = false) const;
+
+public:
+	/**
+	 * @brief Emoji name.
+	 */
+	std::string name{};
+
+	/**
+	 * @brief Roles allowed to use this emoji.
+	 */
+	std::vector<snowflake> roles;
+
+	/**
+	 * @brief The id of the user that created this emoji.
+	 */
+	snowflake user_id;
+
+	/**
+	 * @brief Image data for the emoji, if uploading.
+	 */
+	utility::image_data image_data;
+
+	/**
+	 * @brief Flags for the emoji from dpp::emoji_flags.
+	 */
+	uint8_t flags{0};
+
+	/**
+	 * @brief Construct a new emoji object
+	 */
+	emoji() = default;
+
+	/**
+	 * @brief Construct a new emoji object with name, ID and flags
+	 *
+	 * @param name The emoji's name
+	 * @param id ID, if it has one (unicode does not)
+	 * @param flags Emoji flags (emoji_flags)
+	 */
+	emoji(const std::string_view name, const snowflake id = 0, const uint8_t flags = 0);
+
+	/**
+	 * @brief Copy constructor, copies another emoji's data
+	 *
+	 * @param rhs Emoji to copy
+	 */
+	emoji(const emoji &rhs) = default;
+
+	/**
+	 * @brief Move constructor, moves another emoji's data to this
+	 *
+	 * @param rhs Emoji to move from
+	 */
+	emoji(emoji &&rhs) noexcept = default;
+
+	/**
+	 * @brief Destroy the emoji object
+	 */
+	~emoji() override = default;
+
+	/**
+	 * @brief Copy assignment operator, copies another emoji's data
+	 *
+	 * @param rhs Emoji to copy
+	 */
+	emoji &operator=(const emoji &rhs) = default;
+
+	/**
+	 * @brief Move constructor, moves another emoji's data to this
+	 *
+	 * @param rhs Emoji to move from
+	 */
+	emoji &operator=(emoji &&rhs) noexcept = default;
+
+	/**
+	* @brief Create a mentionable emoji
+	* @param name The name of the emoji.
+	* @param id The ID of the emoji.
+	* @param is_animated is emoji animated.
+	* @return std::string The formatted mention of the emoji.
+	*/
+	static std::string get_mention(std::string_view name, snowflake id, bool is_animated = false);
+
+	/**
+	 * @brief Emoji requires colons
+	 *
+	 * @return true Requires colons
+	 * @return false Does not require colons
+	 */
+	bool requires_colons() const;
+
+	/**
+	 * @brief Emoji is managed
+	 *
+	 * @return true Is managed
+	 * @return false Is not managed
+	 */
+	bool is_managed() const;
+
+	/**
+	 * @brief Emoji is animated
+	 * 
+	 * @return true Is animated
+	 * @return false Is noy animated
+	 */
+	bool is_animated() const;
+
+	/**
+	 * @brief Is available
+	 *
+	 * @return true Is available
+	 * @return false Is unavailable
+	 */
+	bool is_available() const;
+
+	/**
+	 * @brief Load an image into the object
+	 *
+	 * @param image_blob Image binary data
+	 * @param type Type of image. It can be one of `i_gif`, `i_jpg` or `i_png`.
+	 * @return emoji& Reference to self
+	 * @throw dpp::length_exception Image content exceeds discord maximum of 256 kilobytes
+	 */
+	emoji& load_image(std::string_view image_blob, const image_type type);
+
+	/**
+	 * @brief Load an image into the object
+	 *
+	 * @param data Image binary data
+	 * @param size Size of the image.
+	 * @param type Type of image. It can be one of `i_gif`, `i_jpg` or `i_png`.
+	 * @return emoji& Reference to self
+	 * @throw dpp::length_exception Image content exceeds discord maximum of 256 kilobytes
+	 */
+	emoji& load_image(const std::byte* data, uint32_t size, const image_type type);
+
+	/**
+	 * @brief Format to name if unicode, name:id if has id or a:name:id if animated
+	 *
+	 * @return Formatted name for reactions
+	 */
+	std::string format() const;
+
+	/**
+	 * @brief Get the mention/ping for the emoji
+	 * 
+	 * @return std::string mention
+	 */
+	std::string get_mention() const;
+
+	/**
+	 * @brief Get the custom emoji url
+	 *
+	 * @param size The size of the emoji in pixels. It can be any power of two between 16 and 4096,
+	 * otherwise the default sized emoji is returned.
+	 * @param format The format to use for the emoji. It can be one of `i_webp`, `i_jpg`, `i_png` or `i_gif`.
+	 * When passing `i_gif`, it returns an empty string for non-animated emojis. Consider using the `prefer_animated` parameter instead.
+	 * @param prefer_animated Whether you prefer gif format.
+	 * If true, it'll return gif format whenever the emoji is available as animated.
+	 * @return std::string emoji url or an empty string, if the id is not set
+	 */
+	std::string get_url(uint16_t size = 0, const image_type format = i_png, bool prefer_animated = true) const;
+};
+
+/**
+ * @brief Group of emojis
+ */
+typedef std::unordered_map<snowflake, emoji> emoji_map;
+
+}
diff --git a/3rdParty/dpp/entitlement.h b/3rdParty/dpp/entitlement.h
new file mode 100644
index 0000000000..099b314b41
--- /dev/null
+++ b/3rdParty/dpp/entitlement.h
@@ -0,0 +1,246 @@
+/************************************************************************************
+ *
+ * D++, A Lightweight C++ library for Discord
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright 2021 Craig Edwards and D++ contributors
+ * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ************************************************************************************/
+
+#pragma once
+#include <dpp/export.h>
+#include <dpp/snowflake.h>
+#include <dpp/managed.h>
+#include <dpp/json_fwd.h>
+#include <dpp/json_interface.h>
+#include <unordered_map>
+
+namespace dpp {
+
+/**
+ * @brief The type of entitlement.
+ * */
+enum entitlement_type : uint8_t {
+	/**
+	 * @brief Entitlement was purchased by user
+	 */
+	PURCHASE = 1,
+
+	/**
+	 * @brief Entitlement for Discord Nitro subscription
+	 */
+	PREMIUM_SUBSCRIPTION = 2,
+
+	/**
+	 * @brief Entitlement was gifted by developer
+	 */
+	DEVELOPER_GIFT = 3,
+
+	/**
+	 * @brief Entitlement was purchased by a dev in application test mode
+	 */
+	TEST_MODE_PURCHASE = 4,
+
+	/**
+	 * @brief Entitlement was granted when the SKU was free
+	 */
+	FREE_PURCHASE = 5,
+
+	/**
+	 * @brief Entitlement was gifted by another user
+	 */
+	USER_GIFT = 6,
+
+	/**
+	 * @brief Entitlement was claimed by user for free as a Nitro Subscriber
+	 */
+	PREMIUM_PURCHASE = 7,
+
+	/**
+	 * @brief Entitlement was purchased as an app subscription
+	 */
+	APPLICATION_SUBSCRIPTION = 8,
+};
+
+/**
+ * @brief Entitlement flags.
+ */
+enum entitlement_flags : uint8_t {
+	/**
+	 * @brief Entitlement was deleted
+	 *
+	 * @note Only discord staff can delete an entitlement via
+	 * their internal tooling. It should rarely happen except in cases
+	 * of fraud or chargeback.
+	 */
+	ent_deleted =		0b0000001,
+
+	/**
+	 * @brief Entitlement was consumed.
+	 *
+	 * @note A consumed entitlement is a used-up one-off purchase.
+	 */
+	ent_consumed = 		0b0000010,
+};
+
+/**
+ * @brief A definition of a discord entitlement.
+ *
+ * An entitlement is a user's connection to an SKU, basically a subscription
+ * or a one-off purchase.
+ */
+class DPP_EXPORT entitlement : public managed, public json_interface<entitlement> {
+protected:
+	friend struct json_interface<entitlement>;
+
+	/** Read class values from json object
+	 * @param j A json object to read from
+	 * @return A reference to self
+	 */
+	entitlement& fill_from_json_impl(nlohmann::json* j);
+
+	/**
+	 * @brief Build json for this entitlement object
+	 *
+	 * @param with_id include the ID in the json
+	 * @return json JSON object
+	 */
+	json to_json_impl(bool with_id = false) const;
+
+public:
+	/**
+	 * @brief ID of the entitlement event
+	 *
+	 * Not sure if this remains constant, it does not relate to the SKU,
+	 * user, guild or subscription. Do not use it for anything except state
+	 * tracking.
+	 */
+	snowflake sku_id{0};
+
+	/**
+	 * @brief ID of the parent application
+	 */
+	snowflake application_id{0};
+
+	/**
+	 * @brief Subscription ID
+	 *
+	 * This is a unique identifier of the user or guilds subscription to the SKU.
+	 * It won't ever change.
+	 */
+	snowflake subscription_id{0};
+
+	/**
+ 	 * @brief Promotion id
+ 	 *
+ 	 * These are undocumented but given in examples in the docs.
+ 	 */
+	snowflake promotion_id{0};
+
+	/**
+ 	 * @brief Gift Code Flags (undocumented)
+ 	 *
+ 	 * Undocumented, but given in examples in the docs.
+ 	 */
+	uint8_t gift_code_flags{0};
+
+	/**
+	 * @brief Optional: ID of the user that is granted access to the entitlement's SKU
+	 */
+	snowflake user_id{0};
+
+	/**
+	 * @brief Optional: ID of the user that is granted access to the entitlement's SKU
+	 *
+	 * If a guild is provided, according to the examples the user who triggered the
+	 * purchase will also be passed in the user ID. The presence of a non-zero guild
+	 * id snowflake is indication it is a guild subscription.
+	 */
+	snowflake guild_id{0};
+
+	/**
+	 * @brief The type of entitlement.
+	 */
+	entitlement_type type = entitlement_type::APPLICATION_SUBSCRIPTION;
+
+	/**
+	 * @brief Optional: Start date at which the entitlement is valid.
+	 *
+	 * @note Not present when using test entitlements.
+	 */
+	time_t starts_at{0};
+
+	/**
+	 * @brief Optional: Date at which the entitlement is no longer valid.
+	 *
+	 * @note Not present when using test entitlements.
+	 */
+	time_t ends_at{0};
+
+	/**
+	 * @brief Flags bitmap from dpp::entitlement_flags
+	 */
+	uint16_t flags{0};
+
+	/**
+	 * @brief Construct a new entitlement object
+	 */
+	entitlement() = default;
+
+	/**
+	 * @brief Construct a new entitlement object with sku_id, ID, application_id, type, and flags.
+	 *
+	 * @param sku_id The ID of the SKU.
+	 * @param id The ID of the entitlement.
+	 * @param application_id The ID of the parent application.
+	 * @param type The type of entitlement (Should only ever be APPLICATION_SUBSCRIPTION unless you going to use this object as a parameter for dpp::cluster::entitlement_test_create).
+	 * @param flags The flags for the SKU from dpp::entitlement_flags.
+	 */
+	entitlement(const snowflake sku_id, const snowflake id = 0, const snowflake application_id = 0, const entitlement_type type = dpp::entitlement_type::APPLICATION_SUBSCRIPTION, const uint8_t flags = 0);
+
+	/**
+	 * @brief Get the type of entitlement.
+	 *
+	 * @return entitlement_type Entitlement type
+	 */
+	[[nodiscard]] entitlement_type get_type() const;
+
+	/**
+	 * @brief Was the entitlement consumed?
+	 *
+	 * A consumed entitlement is a one off purchase which
+	 * has been claimed as used by the application. for example
+	 * in-app purchases.
+	 *
+	 * @return true if the entitlement was consumed.
+	 */
+	[[nodiscard]] bool is_consumed() const;
+
+	/**
+	 * @brief Was the entitlement deleted?
+	 *
+	 * @return true if the entitlement was deleted.
+	 */
+	[[nodiscard]] bool is_deleted() const;
+
+};
+
+/**
+ * @brief Group of entitlements.
+ */
+typedef std::unordered_map<snowflake, entitlement> entitlement_map;
+
+}
diff --git a/3rdParty/dpp/etf.h b/3rdParty/dpp/etf.h
index 79b18d9338..b0bfb24ef4 100644
--- a/3rdParty/dpp/etf.h
+++ b/3rdParty/dpp/etf.h
@@ -1,642 +1,711 @@
-/************************************************************************************
- *
- * D++, A Lightweight C++ library for Discord
- *
- * Copyright 2021 Craig Edwards and D++ contributors 
- * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * Parts of this file inspired by, or outright copied from erlpack:
- * https://github.com/discord/erlpack/
- * 
- * Acknowledgements:
- *
- *   sysdep.h:
- *       Based on work by FURUHASHI Sadayuki in msgpack-python
- *       (https://github.com/msgpack/msgpack-python)
- *
- *       Copyright (C) 2008-2010 FURUHASHI Sadayuki
- *       Licensed under the Apache License, Version 2.0 (the "License").
- *
- ************************************************************************************/
-
-#pragma once
-#include <dpp/export.h>
-#include <dpp/snowflake.h>
-#include <dpp/nlohmann/json_fwd.hpp>
-
-namespace dpp {
-
-/** Current ETF format version in use */
-const uint8_t FORMAT_VERSION = 131;
-
-/**
- * @brief Represents a token which identifies the type of value which follows it
- * in the ETF binary structure.
- */
-enum etf_token_type : uint8_t {
-	/// 68  [Distribution header]
-	ett_distribution =	'D',
-	/// 70  [Float64:IEEE float]
-	ett_new_float =		'F',
-	/// 77  [UInt32:Len, UInt8:Bits, Len:Data]
-	ett_bit_binary =	'M',
-	/// 80  [UInt4:UncompressedSize, N:ZlibCompressedData]
-	ett_compressed =	'P',
-	/// 97  [UInt8:Int]
-	ett_smallint =		'a',
-	/// 98  [Int32:Int]
-	ett_integer =		'b',
-	/// 99  [31:Float String] Float in string format (formatted "%.20e", sscanf "%lf"). Superseded by ett_new_float
-	ett_float =		'c',
-	/// 100 [UInt16:Len, Len:AtomName] max Len is 255
-	ett_atom =		'd',
-	/// 101 [atom:Node, UInt32:ID, UInt8:Creation]
-	ett_reference =		'e',
-	/// 102 [atom:Node, UInt32:ID, UInt8:Creation]
-	ett_port =		'f',
-	/// 103 [atom:Node, UInt32:ID, UInt32:Serial, UInt8:Creation]
-	ett_pid =		'g',
-	/// 104 [UInt8:Arity, N:Elements]
-	ett_small_tuple =	'h',
-	/// 105 [UInt32:Arity, N:Elements]
-	ett_large_tuple =	'i',
-	/// 106 empty list
-	ett_nil =		'j',
-	/// 107 [UInt16:Len, Len:Characters]
-	ett_string =		'k',
-	/// 108 [UInt32:Len, Elements, Tail]
-	ett_list =		'l',
-	/// 109 [UInt32:Len, Len:Data]
-	ett_binary =		'm',
-	/// 110 [UInt8:n, UInt8:Sign, n:nums]
-	ett_bigint_small =	'n',
-	/// 111 [UInt32:n, UInt8:Sign, n:nums]
-	ett_bigint_large =	'o',
-	/// 112 [UInt32:Size, UInt8:Arity, 16*Uint6-MD5:Uniq, UInt32:Index, UInt32:NumFree, atom:Module, int:OldIndex, int:OldUniq, pid:Pid, NunFree*ext:FreeVars]
-	ett_new_function =	'p',
-	/// 113 [atom:Module, atom:Function, smallint:Arity]
-	ett_export =		'q',
-	/// 114 [UInt16:Len, atom:Node, UInt8:Creation, Len*UInt32:ID]
-	ett_new_reference =	'r',
-	/// 115 [UInt8:Len, Len:AtomName]
-	ett_atom_small =	's',
-	/// 116 [UInt32:Airty, N:Pairs]
-	ett_map =	 	't',
-	/// 117 [UInt4:NumFree, pid:Pid, atom:Module, int:Index, int:Uniq, NumFree*ext:FreeVars]
-	ett_function =		'u',
-	/// 118 [UInt16:Len, Len:AtomName] max Len is 255 characters (up to 4 bytes per)
-	ett_atom_utf8 =		'v',
-	/// 119 [UInt8:Len, Len:AtomName]
-	ett_atom_utf8_small =	'w'
-};
-
-/**
- * @brief A horrible structure used within the ETF parser to convert uint64_t to double and back.
- * This is horrible, but it is the official way erlang term format does this, so we can't really
- * mess with it much.
- */
-union type_punner {
-	/**
-	 * @brief binary integer value
-	 */
-	uint64_t ui64;
-	/**
-	 * @brief double floating point value
-	 */
-	double df;
-};
-
-/**
- * @brief Represents a buffer of bytes being encoded into ETF
- */
-struct DPP_EXPORT etf_buffer {
-	/**
-	 * @brief Raw buffer
-	 */
-	std::vector<char> buf;
-	/**
-	 * @brief Current used length of buffer
-	 * (this is different from buf.size() as it is pre-allocated
-	 * using resize and may not all be in use)
-	 */
-	size_t length;
-
-	/**
-	 * @brief Construct a new etf buffer object
-	 * 
-	 * @param initial initial buffer size to allocate
-	 */
-	etf_buffer(size_t initial);
-
-	/**
-	 * @brief Destroy the etf buffer object
-	 */
-	~etf_buffer();
-};
-
-/**
- * @brief The etf_parser class can serialise and deserialise ETF (Erlang Term Format)
- * into and out of an nlohmann::json object, so that layers above the websocket don't
- * have to be any different for handling ETF.
- */
-class DPP_EXPORT etf_parser {
-
-	/**
-	 * @brief Current size of binary data
-	 */
-	size_t size;
-
-	/**
-	 * @brief Current offset into binary data
-	 */
-	size_t offset;
-
-	/**
-	 * @brief Pointer to binary ETF data to be decoded
-	 */
-	uint8_t* data;
-
-	/**
-	 * @brief Parse a single value, and if that value contains other
-	 * values (e.g. an array or map) then call itself recursively.
-	 * 
-	 * @return nlohmann::json JSON value from the ETF
-	 */
-	nlohmann::json inner_parse();
-
-	/**
-	 * @brief Read 8 bits of data from the buffer
-	 * 
-	 * @return uint8_t data retrieved
-	 * @throw dpp::exception Data stream isn't long enough to fetch requested bits
-	 */
-	uint8_t read_8_bits();
-
-	/**
-	 * @brief Read 16 bits of data from the buffer
-	 * 
-	 * @return uint16_t data retrieved
-	 * @throw dpp::exception Data stream isn't long enough to fetch requested bits
-	 */
-	uint16_t read_16_bits();
-
-	/**
-	 * @brief Read 32 bits of data from the buffer
-	 * 
-	 * @return uint32_t data retrieved
-	 * @throw dpp::exception Data stream isn't long enough to fetch requested bits
-	 */
-	uint32_t read_32_bits();
-
-	/**
-	 * @brief Read 64 bits of data from the buffer
-	 * 
-	 * @return uint64_t data retrieved
-	 * @throw dpp::exception Data stream isn't long enough to fetch requested bits
-	 */
-	uint64_t read_64_bits();
-
-	/**
-	 * @brief Read string data from the buffer
-	 *
-	 * @param length Length of string to retrieve 
-	 * @return const char* data retrieved
-	 * @throw dpp::exception Data stream isn't long enough to fetch requested bits
-	 */
-	const char* read_string(uint32_t length);
-
-	/**
-	 * @brief Process an 'atom' value.
-	 * An atom is a "label" or constant value within the data,
-	 * such as a key name, nullptr, or false.
-	 * 
-	 * @return nlohmann::json value converted to JSON
-	 * @throw dpp::exception Data stream isn't long enough to fetch requested bits
-	 */
-	nlohmann::json process_atom(const char* atom, uint16_t length);
-
-	/**
-	 * @brief Decode an 'atom' value.
-	 * 
-	 * @return nlohmann::json value converted to JSON
-	 * @throw dpp::exception Data stream isn't long enough to fetch requested bits
-	 */
-	nlohmann::json decode_atom();
-
-	/**
-	 * @brief Decode a small 'atom' value.
-	 * 
-	 * @return nlohmann::json value converted to JSON
-	 * @throw dpp::exception Data stream isn't long enough to fetch requested bits
-	 */
-	nlohmann::json decode_small_atom();
-
-	/**
-	 * @brief Decode a small integer value (0-255).
-	 * 
-	 * @return nlohmann::json value converted to JSON
-	 * @throw dpp::exception Data stream isn't long enough to fetch requested bits
-	 */
-	nlohmann::json decode_small_integer();
-
-	/**
-	 * @brief Decode an integer value (-MAXINT -> MAXINT-1).
-	 * 
-	 * @return nlohmann::json value converted to JSON
-	 * @throw dpp::exception Data stream isn't long enough to fetch requested bits
-	 */
-	nlohmann::json decode_integer();
-
-	/**
-	 * @brief Decode an array of values.
-	 * 
-	 * @return nlohmann::json values converted to JSON
-	 * @throw dpp::exception Data stream isn't long enough to fetch requested bits
-	 */
-	nlohmann::json decode_array(uint32_t length);
-
-	/**
-	 * @brief Decode a list of values.
-	 * 
-	 * @return nlohmann::json values converted to JSON
-	 * @throw dpp::exception Data stream isn't long enough to fetch requested bits
-	 */
-	nlohmann::json decode_list();
-
-	/**
-	 * @brief Decode a 'tuple' value.
-	 * 
-	 * @return nlohmann::json value converted to JSON
-	 * @throw dpp::exception Data stream isn't long enough to fetch requested bits
-	 */
-	nlohmann::json decode_tuple(uint32_t length);
-
-	/**
-	 * @brief Decode a nil 'atom' value.
-	 * 
-	 * @return nlohmann::json value converted to JSON
-	 * @throw dpp::exception Data stream isn't long enough to fetch requested bits
-	 */
-	nlohmann::json decode_nil();
-
-	/**
-	 * @brief Decode a map (object) value.
-	 * Will recurse to evaluate each member variable.
-	 * 
-	 * @return nlohmann::json values converted to JSON
-	 * @throw dpp::exception Data stream isn't long enough to fetch requested bits
-	 */
-	nlohmann::json decode_map();
-
-	/**
-	 * @brief Decode a floating point numeric value.
-	 * (depreciated in erlang but still expected to be supported)
-	 * 
-	 * @return nlohmann::json value converted to JSON
-	 * @throw dpp::exception Data stream isn't long enough to fetch requested bits
-	 */
-	nlohmann::json decode_float();
-
-	/**
-	 * @brief Decode a floating type numeric value.
-	 * 
-	 * @return nlohmann::json value converted to JSON
-	 * @throw dpp::exception Data stream isn't long enough to fetch requested bits
-	 */
-	nlohmann::json decode_new_float();
-
-	/**
-	 * @brief Decode a 'bigint' value.
-	 * 
-	 * @return nlohmann::json value converted to JSON
-	 * @throw dpp::exception Data stream isn't long enough to fetch requested bits
-	 */
-	nlohmann::json decode_bigint(uint32_t digits);
-
-	/**
-	 * @brief Decode a small 'bigint' value.
-	 * 
-	 * @return nlohmann::json value converted to JSON
-	 * @throw dpp::exception Data stream isn't long enough to fetch requested bits
-	 */
-	nlohmann::json decode_bigint_small();
-
-	/**
-	 * @brief Decode a large 'bigint' value.
-	 * 
-	 * @return nlohmann::json value converted to JSON
-	 * @throw dpp::exception Data stream isn't long enough to fetch requested bits
-	 */
-	nlohmann::json decode_bigint_large();
-
-	/**
-	 * @brief Decode a binary value.
-	 * 
-	 * @return nlohmann::json value converted to JSON
-	 * @throw dpp::exception Data stream isn't long enough to fetch requested bits
-	 */
-	nlohmann::json decode_binary();
-
-	/**
-	 * @brief Decode a string value.
-	 * 
-	 * @return nlohmann::json value converted to JSON
-	 * @throw dpp::exception Data stream isn't long enough to fetch requested bits
-	 */
-	nlohmann::json decode_string();
-
-	/**
-	 * @brief Decode a string list value.
-	 * 
-	 * @return nlohmann::json value converted to JSON
-	 * @throw dpp::exception Data stream isn't long enough to fetch requested bits
-	 */
-	nlohmann::json decode_string_as_list();
-
-	/**
-	 * @brief Decode a 'small tuple' value.
-	 * 
-	 * @return nlohmann::json value converted to JSON
-	 * @throw dpp::exception Data stream isn't long enough to fetch requested bits
-	 */
-	nlohmann::json decode_tuple_small();
-
-	/**
-	 * @brief Decode a 'large tuple' value.
-	 * 
-	 * @return nlohmann::json value converted to JSON
-	 * @throw dpp::exception Data stream isn't long enough to fetch requested bits
-	 */
-	nlohmann::json decode_tuple_large();
-
-	/**
-	 * @brief Decode a compressed value.
-	 * This is a zlib-compressed binary blob which contains another
-	 * ETF object.
-	 * 
-	 * @return nlohmann::json value converted to JSON
-	 * @throw dpp::exception Data stream isn't long enough to fetch requested bits
-	 */
-	nlohmann::json decode_compressed();
-
-	/**
-	 * @brief Decode a 'reference' value.
-	 * Erlang expects this to be supported, in practice Discord doesn't send these right now.
-	 * 
-	 * @return nlohmann::json value converted to JSON
-	 * @throw dpp::exception Data stream isn't long enough to fetch requested bits
-	 */
-	nlohmann::json decode_reference();
-
-	/**
-	 * @brief Decode a 'new reference' value.
-	 * Erlang expects this to be supported, in practice Discord doesn't send these right now.
-	 * 
-	 * @return nlohmann::json value converted to JSON
-	 * @throw dpp::exception Data stream isn't long enough to fetch requested bits
-	 */
-	nlohmann::json decode_new_reference();
-
-	/**
-	 * @brief Decode a 'port' value.
-	 * Erlang expects this to be supported, in practice Discord doesn't send these right now.
-	 * 
-	 * @return nlohmann::json value converted to JSON
-	 * @throw dpp::exception Data stream isn't long enough to fetch requested bits
-	 */
-	nlohmann::json decode_port();
-
-	/**
-	 * @brief Decode a 'PID' value.
-	 * Erlang expects this to be supported, in practice Discord doesn't send these right now.
-	 * 
-	 * @return nlohmann::json value converted to JSON
-	 * @throw dpp::exception Data stream isn't long enough to fetch requested bits
-	 */
-	nlohmann::json decode_pid();
-
-	/**
-	 * @brief Decode an 'export' value.
-	 * Erlang expects this to be supported, in practice Discord doesn't send these right now.
-	 * 
-	 * @return nlohmann::json value converted to JSON
-	 * @throw dpp::exception Data stream isn't long enough to fetch requested bits
-	 */
-	nlohmann::json decode_export();
-
-	/**
-	 * @brief Write to output buffer for creation of ETF from JSON
-	 * 
-	 * @param pk buffer struct
-	 * @param bytes byte buffer to write
-	 * @param l number of bytes to write
-	 * @throw std::exception Buffer cannot be extended
-	 */
-	void buffer_write(etf_buffer *pk, const char *bytes, size_t l);
-
-	/**
-	 * @brief Append version number to ETF buffer
-	 * 
-	 * @param b buffer to append to
-	 * @throw std::exception Buffer cannot be extended
-	 */
-	void append_version(etf_buffer *b);
-
-	/**
-	 * @brief Append nil value to ETF buffer
-	 * 
-	 * @param b  buffer to append to
-	 * @throw std::exception Buffer cannot be extended
-	 */
-	void append_nil(etf_buffer *b);
-
-	/**
-	 * @brief Append false value to ETF buffer
-	 * 
-	 * @param b  buffer to append to
-	 * @throw std::exception Buffer cannot be extended
-	 */
-	void append_false(etf_buffer *b);
-
-	/**
-	 * @brief Append true value to ETF buffer
-	 * 
-	 * @param b  buffer to append to
-	 * @throw std::exception Buffer cannot be extended
-	 */
-	void append_true(etf_buffer *b);
-
-	/**
-	 * @brief Append small integer value to ETF buffer
-	 * 
-	 * @param b  buffer to append to
-	 * @param d double to append
-	 * @throw std::exception Buffer cannot be extended
-	 */
-	void append_small_integer(etf_buffer *b, unsigned char d);
-
-	/**
-	 * @brief Append integer value to ETF buffer
-	 * 
-	 * @param b  buffer to append to
-	 * @param d integer to append
-	 * @throw std::exception Buffer cannot be extended
-	 */
-	void append_integer(etf_buffer *b, int32_t d);
-
-	/**
-	 * @brief Append 64 bit integer value to ETF buffer
-	 * 
-	 * @param b  buffer to append to
-	 * @param d integer to append
-	 * @throw std::exception Buffer cannot be extended
-	 */
-	void append_unsigned_long_long(etf_buffer *b, unsigned long long d);
-
-	/**
-	 * @brief Append 64 bit integer value to ETF buffer
-	 * 
-	 * @param b  buffer to append to
-	 * @param d integer to append
-	 * @throw std::exception Buffer cannot be extended
-	 */
-	void append_long_long(etf_buffer *b, long long d);
-
-	/**
-	 * @brief Append double value to ETF buffer
-	 * 
-	 * @param b  buffer to append to
-	 * @param f double to append
-	 * @throw std::exception Buffer cannot be extended
-	 */
-	void append_double(etf_buffer *b, double f);
-
-	/**
-	 * @brief Append atom value to ETF buffer
-	 * 
-	 * @param b  buffer to append to
-	 * @param bytes pointer to string to append
-	 * @param size size of string to append
-	 * @throw std::exception Buffer cannot be extended
-	 */
-	void append_atom(etf_buffer *b, const char *bytes, size_t size);
-
-	/**
-	 * @brief Append utf8 atom value to ETF buffer
-	 * 
-	 * @param b  buffer to append to
-	 * @param bytes pointer to string to append
-	 * @param size size of string to append
-	 * @throw std::exception Buffer cannot be extended
-	 */
-	void append_atom_utf8(etf_buffer *b, const char *bytes, size_t size);
-
-	/**
-	 * @brief Append binary value to ETF buffer
-	 * 
-	 * @param b  buffer to append to
-	 * @param bytes pointer to string to append
-	 * @param size size of string to append
-	 * @throw std::exception Buffer cannot be extended
-	 */
-	void append_binary(etf_buffer *b, const char *bytes, size_t size);
-
-	/**
-	 * @brief Append string value to ETF buffer
-	 * 
-	 * @param b  buffer to append to
-	 * @param bytes pointer to string to append
-	 * @param size size of string to append
-	 * @throw std::exception Buffer cannot be extended
-	 */
-	void append_string(etf_buffer *b, const char *bytes, size_t size);
-
-	/**
-	 * @brief Append tuple value to ETF buffer
-	 * 
-	 * @param b  buffer to append to
-	 * @param size size of value to append
-	 * @throw std::exception Buffer cannot be extended
-	 */
-	void append_tuple_header(etf_buffer *b, size_t size);
-
-	/**
-	 * @brief Append list terminator to ETF buffer
-	 * 
-	 * @param b  buffer to append to
-	 * @throw std::exception Buffer cannot be extended
-	 */
-	void append_nil_ext(etf_buffer *b);
-
-	/**
-	 * @brief Append a list header value to ETF buffer
-	 * 
-	 * @param b  buffer to append to
-	 * @param size size of values to append
-	 * @throw std::exception Buffer cannot be extended
-	 */
-	void append_list_header(etf_buffer *b, size_t size);
-
-	/**
-	 * @brief Append a map header value to ETF buffer
-	 * 
-	 * @param b  buffer to append to
-	 * @param size size of values to append
-	 * @throw std::exception Buffer cannot be extended
-	 */
-	void append_map_header(etf_buffer *b, size_t size);
-
-	/**
-	 * @brief Build ETF buffer
-	 * 
-	 * @param j JSON object to build from
-	 * @param b Buffer to append to
-	 * @throw std::exception Buffer cannot be extended
-	 */
-	void inner_build(const nlohmann::json* j, etf_buffer* b);
-
-public:
-	/**
-	 * @brief Construct a new etf parser object
-	 */
-	etf_parser();
-
-	/**
-	 * @brief Destroy the etf parser object
-	 */
-	~etf_parser();
-
-	/**
-	 * @brief Convert ETF binary content to nlohmann::json
-	 * 
-	 * @param in Raw binary ETF data (generally from a websocket)
-	 * @return nlohmann::json JSON data for use in the library
-	 * @throw dpp::exception Malformed or otherwise invalid ETF content
-	 */
-	nlohmann::json parse(const std::string& in);
-
-	/**
-	 * @brief Create ETF binary data from nlohmann::json
-	 * 
-	 * @param j JSON value to encode to ETF
-	 * @return std::string raw ETF data. Note that this can
-	 * and probably will contain null values, use std::string::data()
-	 * and std::string::size() to manipulate or send it.
-	 * @throw std::exception Not enough memory, or invalid data types/values
-	 */
-	std::string build(const nlohmann::json& j);
-};
-
-};
+/************************************************************************************
+ *
+ * D++, A Lightweight C++ library for Discord
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright 2021 Craig Edwards and D++ contributors 
+ * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * 
+ * Parts of this file inspired by, or outright copied from erlpack:
+ * https://github.com/discord/erlpack/
+ * 
+ * Acknowledgements:
+ *
+ *   sysdep.h:
+ *       Based on work by FURUHASHI Sadayuki in msgpack-python
+ *       (https://github.com/msgpack/msgpack-python)
+ *
+ *       Copyright (C) 2008-2010 FURUHASHI Sadayuki
+ *       Licensed under the Apache License, Version 2.0 (the "License").
+ *
+ ************************************************************************************/
+
+#pragma once
+#include <dpp/export.h>
+#include <dpp/snowflake.h>
+#include <dpp/json_fwd.h>
+
+namespace dpp {
+
+/**
+ * @brief Current ETF format version in use
+ */
+const uint8_t FORMAT_VERSION = 131;
+
+/**
+ * @brief Represents a token which identifies the type of value which follows it
+ * in the ETF binary structure.
+ */
+enum etf_token_type : uint8_t {
+	/**
+	 * @brief 68 [Distribution header]
+	 */
+	ett_distribution = 'D',
+
+	/**
+	 * @brief 70 [Float64:IEEE float]
+	 */
+	ett_new_float =	'F',
+
+	/**
+	 * @brief 77 [UInt32:Len, UInt8:Bits, Len:Data]
+	 */
+	ett_bit_binary = 'M',
+
+	/**
+	 * @brief 80 [UInt4:UncompressedSize, N:ZlibCompressedData]
+	 */
+	ett_compressed = 'P',
+
+	/**
+	 * @brief 97 [UInt8:Int]
+	 */
+	ett_smallint = 'a',
+
+	/**
+	 * @brief 98 [Int32:Int]
+	 */
+	ett_integer = 'b',
+
+	/**
+	 * @brief 99 [31:Float String] Float in string format (formatted "%.20e", sscanf "%lf").
+	 *
+	 * @note Superseded by ett_new_float.
+	 */
+	ett_float = 'c',
+
+	/**
+	 * @brief 100 [UInt16:Len, Len:AtomName] max Len is 255
+	 */
+	ett_atom = 'd',
+
+	/**
+	 * @brief 101 [atom:Node, UInt32:ID, UInt8:Creation]
+	 */
+	ett_reference = 'e',
+
+	/**
+	 * @brief 102 [atom:Node, UInt32:ID, UInt8:Creation]
+	 */
+	ett_port = 'f',
+
+	/**
+	 * @brief 103 [atom:Node, UInt32:ID, UInt32:Serial, UInt8:Creation]
+	 */
+	ett_pid = 'g',
+
+	/**
+	 * @brief 104 [UInt8:Arity, N:Elements]
+	 */
+	ett_small_tuple = 'h',
+
+	/**
+	 * @brief 105 [UInt32:Arity, N:Elements]
+	 */
+	ett_large_tuple = 'i',
+
+	/**
+	 * @brief 106 empty list
+	 */
+	ett_nil = 'j',
+
+	/**
+	 * @brief 107 [UInt16:Len, Len:Characters]
+	 */
+	ett_string = 'k',
+
+	/**
+	 * @brief 108 [UInt32:Len, Elements, Tail]
+	 */
+	ett_list = 'l',
+
+	/**
+	 * @brief 109 [UInt32:Len, Len:Data]
+	 */
+	ett_binary = 'm',
+
+	/**
+	 * @brief 110 [UInt8:n, UInt8:Sign, n:nums]
+	 */
+	ett_bigint_small = 'n',
+
+	/**
+	 * @brief 111 [UInt32:n, UInt8:Sign, n:nums]
+	 */
+	ett_bigint_large = 'o',
+
+	/**
+	 * @brief 112 [UInt32:Size, UInt8:Arity, 16*Uint6-MD5:Uniq, UInt32:Index, UInt32:NumFree, atom:Module, int:OldIndex, int:OldUniq, pid:Pid, NunFree*ext:FreeVars]
+	 */
+	ett_new_function = 'p',
+
+	/**
+	 * @brief 113 [atom:Module, atom:Function, smallint:Arity]
+	 */
+	ett_export = 'q',
+
+	/**
+	 * @brief 114 [UInt16:Len, atom:Node, UInt8:Creation, Len*UInt32:ID]
+	 */
+	ett_new_reference = 'r',
+
+	/**
+	 * @brief 115 [UInt8:Len, Len:AtomName]
+	 */
+	ett_atom_small = 's',
+
+	/**
+	 * @brief 116 [UInt32:Airty, N:Pairs]
+	 */
+	ett_map = 't',
+
+	/**
+	 * @brief 117 [UInt4:NumFree, pid:Pid, atom:Module, int:Index, int:Uniq, NumFree*ext:FreeVars]
+	 */
+	ett_function = 'u',
+
+	/**
+	 * @brief 118 [UInt16:Len, Len:AtomName] max Len is 255 characters (up to 4 bytes per)
+	 */
+	ett_atom_utf8 =	 'v',
+
+	/**
+	 * @brief 119 [UInt8:Len, Len:AtomName]
+	 */
+	ett_atom_utf8_small = 'w'
+};
+
+/**
+ * @brief Represents a buffer of bytes being encoded into ETF
+ */
+struct DPP_EXPORT etf_buffer {
+	/**
+	 * @brief Raw buffer
+	 */
+	std::vector<char> buf;
+
+	/**
+	 * @brief Current used length of buffer
+	 * (this is different from buf.size() as it is pre-allocated
+	 * using resize and may not all be in use)
+	 */
+	size_t length;
+
+	/**
+	 * @brief Construct a new etf buffer object
+	 * 
+	 * @param initial initial buffer size to allocate
+	 */
+	etf_buffer(size_t initial);
+
+	/**
+	 * @brief Destroy the etf buffer object
+	 */
+	~etf_buffer();
+};
+
+/**
+ * @brief The etf_parser class can serialise and deserialise ETF (Erlang Term Format)
+ * into and out of an nlohmann::json object, so that layers above the websocket don't
+ * have to be any different for handling ETF.
+ */
+class DPP_EXPORT etf_parser {
+	/**
+	 * @brief Current size of binary data
+	 */
+	size_t size;
+
+	/**
+	 * @brief Current offset into binary data
+	 */
+	size_t offset;
+
+	/**
+	 * @brief Pointer to binary ETF data to be decoded
+	 */
+	uint8_t* data;
+
+	/**
+	 * @brief Parse a single value, and if that value contains other
+	 * values (e.g. an array or map) then call itself recursively.
+	 * 
+	 * @return nlohmann::json JSON value from the ETF
+	 */
+	nlohmann::json inner_parse();
+
+	/**
+	 * @brief Read 8 bits of data from the buffer
+	 * 
+	 * @return uint8_t data retrieved
+	 * @throw dpp::exception Data stream isn't long enough to fetch requested bits
+	 */
+	uint8_t read_8_bits();
+
+	/**
+	 * @brief Read 16 bits of data from the buffer
+	 * 
+	 * @return uint16_t data retrieved
+	 * @throw dpp::exception Data stream isn't long enough to fetch requested bits
+	 */
+	uint16_t read_16_bits();
+
+	/**
+	 * @brief Read 32 bits of data from the buffer
+	 * 
+	 * @return uint32_t data retrieved
+	 * @throw dpp::exception Data stream isn't long enough to fetch requested bits
+	 */
+	uint32_t read_32_bits();
+
+	/**
+	 * @brief Read 64 bits of data from the buffer
+	 * 
+	 * @return uint64_t data retrieved
+	 * @throw dpp::exception Data stream isn't long enough to fetch requested bits
+	 */
+	uint64_t read_64_bits();
+
+	/**
+	 * @brief Read string data from the buffer
+	 *
+	 * @param length Length of string to retrieve 
+	 * @return const char* data retrieved
+	 * @throw dpp::exception Data stream isn't long enough to fetch requested bits
+	 */
+	const char* read_string(uint32_t length);
+
+	/**
+	 * @brief Process an 'atom' value.
+	 * An atom is a "label" or constant value within the data,
+	 * such as a key name, nullptr, or false.
+	 * 
+	 * @return nlohmann::json value converted to JSON
+	 * @throw dpp::exception Data stream isn't long enough to fetch requested bits
+	 */
+	nlohmann::json process_atom(const char* atom, uint16_t length);
+
+	/**
+	 * @brief Decode an 'atom' value.
+	 * 
+	 * @return nlohmann::json value converted to JSON
+	 * @throw dpp::exception Data stream isn't long enough to fetch requested bits
+	 */
+	nlohmann::json decode_atom();
+
+	/**
+	 * @brief Decode a small 'atom' value.
+	 * 
+	 * @return nlohmann::json value converted to JSON
+	 * @throw dpp::exception Data stream isn't long enough to fetch requested bits
+	 */
+	nlohmann::json decode_small_atom();
+
+	/**
+	 * @brief Decode a small integer value (0-255).
+	 * 
+	 * @return nlohmann::json value converted to JSON
+	 * @throw dpp::exception Data stream isn't long enough to fetch requested bits
+	 */
+	nlohmann::json decode_small_integer();
+
+	/**
+	 * @brief Decode an integer value (-MAXINT -> MAXINT-1).
+	 * 
+	 * @return nlohmann::json value converted to JSON
+	 * @throw dpp::exception Data stream isn't long enough to fetch requested bits
+	 */
+	nlohmann::json decode_integer();
+
+	/**
+	 * @brief Decode an array of values.
+	 * 
+	 * @return nlohmann::json values converted to JSON
+	 * @throw dpp::exception Data stream isn't long enough to fetch requested bits
+	 */
+	nlohmann::json decode_array(uint32_t length);
+
+	/**
+	 * @brief Decode a list of values.
+	 * 
+	 * @return nlohmann::json values converted to JSON
+	 * @throw dpp::exception Data stream isn't long enough to fetch requested bits
+	 */
+	nlohmann::json decode_list();
+
+	/**
+	 * @brief Decode a 'tuple' value.
+	 * 
+	 * @return nlohmann::json value converted to JSON
+	 * @throw dpp::exception Data stream isn't long enough to fetch requested bits
+	 */
+	nlohmann::json decode_tuple(uint32_t length);
+
+	/**
+	 * @brief Decode a nil 'atom' value.
+	 * 
+	 * @return nlohmann::json value converted to JSON
+	 * @throw dpp::exception Data stream isn't long enough to fetch requested bits
+	 */
+	nlohmann::json decode_nil();
+
+	/**
+	 * @brief Decode a map (object) value.
+	 * Will recurse to evaluate each member variable.
+	 * 
+	 * @return nlohmann::json values converted to JSON
+	 * @throw dpp::exception Data stream isn't long enough to fetch requested bits
+	 */
+	nlohmann::json decode_map();
+
+	/**
+	 * @brief Decode a floating point numeric value.
+	 * (depreciated in erlang but still expected to be supported)
+	 * 
+	 * @return nlohmann::json value converted to JSON
+	 * @throw dpp::exception Data stream isn't long enough to fetch requested bits
+	 */
+	nlohmann::json decode_float();
+
+	/**
+	 * @brief Decode a floating type numeric value.
+	 * 
+	 * @return nlohmann::json value converted to JSON
+	 * @throw dpp::exception Data stream isn't long enough to fetch requested bits
+	 */
+	nlohmann::json decode_new_float();
+
+	/**
+	 * @brief Decode a 'bigint' value.
+	 * 
+	 * @return nlohmann::json value converted to JSON
+	 * @throw dpp::exception Data stream isn't long enough to fetch requested bits
+	 */
+	nlohmann::json decode_bigint(uint32_t digits);
+
+	/**
+	 * @brief Decode a small 'bigint' value.
+	 * 
+	 * @return nlohmann::json value converted to JSON
+	 * @throw dpp::exception Data stream isn't long enough to fetch requested bits
+	 */
+	nlohmann::json decode_bigint_small();
+
+	/**
+	 * @brief Decode a large 'bigint' value.
+	 * 
+	 * @return nlohmann::json value converted to JSON
+	 * @throw dpp::exception Data stream isn't long enough to fetch requested bits
+	 */
+	nlohmann::json decode_bigint_large();
+
+	/**
+	 * @brief Decode a binary value.
+	 * 
+	 * @return nlohmann::json value converted to JSON
+	 * @throw dpp::exception Data stream isn't long enough to fetch requested bits
+	 */
+	nlohmann::json decode_binary();
+
+	/**
+	 * @brief Decode a string value.
+	 * 
+	 * @return nlohmann::json value converted to JSON
+	 * @throw dpp::exception Data stream isn't long enough to fetch requested bits
+	 */
+	nlohmann::json decode_string();
+
+	/**
+	 * @brief Decode a string list value.
+	 * 
+	 * @return nlohmann::json value converted to JSON
+	 * @throw dpp::exception Data stream isn't long enough to fetch requested bits
+	 */
+	nlohmann::json decode_string_as_list();
+
+	/**
+	 * @brief Decode a 'small tuple' value.
+	 * 
+	 * @return nlohmann::json value converted to JSON
+	 * @throw dpp::exception Data stream isn't long enough to fetch requested bits
+	 */
+	nlohmann::json decode_tuple_small();
+
+	/**
+	 * @brief Decode a 'large tuple' value.
+	 * 
+	 * @return nlohmann::json value converted to JSON
+	 * @throw dpp::exception Data stream isn't long enough to fetch requested bits
+	 */
+	nlohmann::json decode_tuple_large();
+
+	/**
+	 * @brief Decode a compressed value.
+	 * This is a zlib-compressed binary blob which contains another
+	 * ETF object.
+	 * 
+	 * @return nlohmann::json value converted to JSON
+	 * @throw dpp::exception Data stream isn't long enough to fetch requested bits
+	 */
+	nlohmann::json decode_compressed();
+
+	/**
+	 * @brief Decode a 'reference' value.
+	 * Erlang expects this to be supported, in practice Discord doesn't send these right now.
+	 * 
+	 * @return nlohmann::json value converted to JSON
+	 * @throw dpp::exception Data stream isn't long enough to fetch requested bits
+	 */
+	nlohmann::json decode_reference();
+
+	/**
+	 * @brief Decode a 'new reference' value.
+	 * Erlang expects this to be supported, in practice Discord doesn't send these right now.
+	 * 
+	 * @return nlohmann::json value converted to JSON
+	 * @throw dpp::exception Data stream isn't long enough to fetch requested bits
+	 */
+	nlohmann::json decode_new_reference();
+
+	/**
+	 * @brief Decode a 'port' value.
+	 * Erlang expects this to be supported, in practice Discord doesn't send these right now.
+	 * 
+	 * @return nlohmann::json value converted to JSON
+	 * @throw dpp::exception Data stream isn't long enough to fetch requested bits
+	 */
+	nlohmann::json decode_port();
+
+	/**
+	 * @brief Decode a 'PID' value.
+	 * Erlang expects this to be supported, in practice Discord doesn't send these right now.
+	 * 
+	 * @return nlohmann::json value converted to JSON
+	 * @throw dpp::exception Data stream isn't long enough to fetch requested bits
+	 */
+	nlohmann::json decode_pid();
+
+	/**
+	 * @brief Decode an 'export' value.
+	 * Erlang expects this to be supported, in practice Discord doesn't send these right now.
+	 * 
+	 * @return nlohmann::json value converted to JSON
+	 * @throw dpp::exception Data stream isn't long enough to fetch requested bits
+	 */
+	nlohmann::json decode_export();
+
+	/**
+	 * @brief Write to output buffer for creation of ETF from JSON
+	 * 
+	 * @param pk buffer struct
+	 * @param bytes byte buffer to write
+	 * @param l number of bytes to write
+	 * @throw std::exception Buffer cannot be extended
+	 */
+	void buffer_write(etf_buffer *pk, const char *bytes, size_t l);
+
+	/**
+	 * @brief Append version number to ETF buffer
+	 * 
+	 * @param b buffer to append to
+	 * @throw std::exception Buffer cannot be extended
+	 */
+	void append_version(etf_buffer *b);
+
+	/**
+	 * @brief Append nil value to ETF buffer
+	 * 
+	 * @param b  buffer to append to
+	 * @throw std::exception Buffer cannot be extended
+	 */
+	void append_nil(etf_buffer *b);
+
+	/**
+	 * @brief Append false value to ETF buffer
+	 * 
+	 * @param b  buffer to append to
+	 * @throw std::exception Buffer cannot be extended
+	 */
+	void append_false(etf_buffer *b);
+
+	/**
+	 * @brief Append true value to ETF buffer
+	 * 
+	 * @param b  buffer to append to
+	 * @throw std::exception Buffer cannot be extended
+	 */
+	void append_true(etf_buffer *b);
+
+	/**
+	 * @brief Append small integer value to ETF buffer
+	 * 
+	 * @param b  buffer to append to
+	 * @param d double to append
+	 * @throw std::exception Buffer cannot be extended
+	 */
+	void append_small_integer(etf_buffer *b, unsigned char d);
+
+	/**
+	 * @brief Append integer value to ETF buffer
+	 * 
+	 * @param b  buffer to append to
+	 * @param d integer to append
+	 * @throw std::exception Buffer cannot be extended
+	 */
+	void append_integer(etf_buffer *b, int32_t d);
+
+	/**
+	 * @brief Append 64 bit integer value to ETF buffer
+	 * 
+	 * @param b  buffer to append to
+	 * @param d integer to append
+	 * @throw std::exception Buffer cannot be extended
+	 */
+	void append_unsigned_long_long(etf_buffer *b, unsigned long long d);
+
+	/**
+	 * @brief Append 64 bit integer value to ETF buffer
+	 * 
+	 * @param b  buffer to append to
+	 * @param d integer to append
+	 * @throw std::exception Buffer cannot be extended
+	 */
+	void append_long_long(etf_buffer *b, long long d);
+
+	/**
+	 * @brief Append double value to ETF buffer
+	 * 
+	 * @param b  buffer to append to
+	 * @param f double to append
+	 * @throw std::exception Buffer cannot be extended
+	 */
+	void append_double(etf_buffer *b, double f);
+
+	/**
+	 * @brief Append atom value to ETF buffer
+	 * 
+	 * @param b  buffer to append to
+	 * @param bytes pointer to string to append
+	 * @param size size of string to append
+	 * @throw std::exception Buffer cannot be extended
+	 */
+	void append_atom(etf_buffer *b, const char *bytes, size_t size);
+
+	/**
+	 * @brief Append utf8 atom value to ETF buffer
+	 * 
+	 * @param b  buffer to append to
+	 * @param bytes pointer to string to append
+	 * @param size size of string to append
+	 * @throw std::exception Buffer cannot be extended
+	 */
+	void append_atom_utf8(etf_buffer *b, const char *bytes, size_t size);
+
+	/**
+	 * @brief Append binary value to ETF buffer
+	 * 
+	 * @param b  buffer to append to
+	 * @param bytes pointer to string to append
+	 * @param size size of string to append
+	 * @throw std::exception Buffer cannot be extended
+	 */
+	void append_binary(etf_buffer *b, const char *bytes, size_t size);
+
+	/**
+	 * @brief Append string value to ETF buffer
+	 * 
+	 * @param b  buffer to append to
+	 * @param bytes pointer to string to append
+	 * @param size size of string to append
+	 * @throw std::exception Buffer cannot be extended
+	 */
+	void append_string(etf_buffer *b, const char *bytes, size_t size);
+
+	/**
+	 * @brief Append tuple value to ETF buffer
+	 * 
+	 * @param b  buffer to append to
+	 * @param size size of value to append
+	 * @throw std::exception Buffer cannot be extended
+	 */
+	void append_tuple_header(etf_buffer *b, size_t size);
+
+	/**
+	 * @brief Append list terminator to ETF buffer
+	 * 
+	 * @param b  buffer to append to
+	 * @throw std::exception Buffer cannot be extended
+	 */
+	void append_nil_ext(etf_buffer *b);
+
+	/**
+	 * @brief Append a list header value to ETF buffer
+	 * 
+	 * @param b  buffer to append to
+	 * @param size size of values to append
+	 * @throw std::exception Buffer cannot be extended
+	 */
+	void append_list_header(etf_buffer *b, size_t size);
+
+	/**
+	 * @brief Append a map header value to ETF buffer
+	 * 
+	 * @param b  buffer to append to
+	 * @param size size of values to append
+	 * @throw std::exception Buffer cannot be extended
+	 */
+	void append_map_header(etf_buffer *b, size_t size);
+
+	/**
+	 * @brief Build ETF buffer
+	 * 
+	 * @param j JSON object to build from
+	 * @param b Buffer to append to
+	 * @throw std::exception Buffer cannot be extended
+	 */
+	void inner_build(const nlohmann::json* j, etf_buffer* b);
+
+public:
+	/**
+	 * @brief Construct a new etf parser object
+	 */
+	etf_parser();
+
+	/**
+	 * @brief Destroy the etf parser object
+	 */
+	~etf_parser();
+
+	/**
+	 * @brief Convert ETF binary content to nlohmann::json
+	 * 
+	 * @param in Raw binary ETF data (generally from a websocket)
+	 * @return nlohmann::json JSON data for use in the library
+	 * @throw dpp::exception Malformed or otherwise invalid ETF content
+	 */
+	nlohmann::json parse(const std::string& in);
+
+	/**
+	 * @brief Create ETF binary data from nlohmann::json
+	 * 
+	 * @param j JSON value to encode to ETF
+	 * @return std::string raw ETF data. Note that this can
+	 * and probably will contain null values, use std::string::data()
+	 * and std::string::size() to manipulate or send it.
+	 * @throw std::exception Not enough memory, or invalid data types/values
+	 */
+	std::string build(const nlohmann::json& j);
+};
+
+}
diff --git a/3rdParty/dpp/event.h b/3rdParty/dpp/event.h
index b82f982eae..79bcf534e1 100644
--- a/3rdParty/dpp/event.h
+++ b/3rdParty/dpp/event.h
@@ -1,151 +1,160 @@
-/************************************************************************************
- *
- * D++, A Lightweight C++ library for Discord
- *
- * Copyright 2021 Craig Edwards and D++ contributors 
- * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- ************************************************************************************/
-#pragma once
-#include <dpp/export.h>
-#include <dpp/snowflake.h>
-#include <dpp/nlohmann/json_fwd.hpp>
-
-#define event_decl(x,wstype) /** @brief Internal event handler for wstype websocket events. Called for each websocket message of this type. @internal */ \
-	class x : public event { public: virtual void handle(dpp::discord_client* client, nlohmann::json &j, const std::string &raw); };
-
-namespace dpp { 
-
-class discord_client;
-
-/**
- * @brief The events namespace holds the internal event handlers for each websocket event.
- * These are handled internally and also dispatched to the user code if the event is hooked.
- */
-namespace events {
-
-/**
- * @brief An event object represents an event handled internally, passed from the websocket e.g. MESSAGE_CREATE.
- */
-class DPP_EXPORT event {
-public:
-	/** Pure virtual method for event handler code
-	 * @param client The creating shard
-	 * @param j The json data of the event
-	 * @param raw The raw event json
-	 */
-	virtual void handle(class discord_client* client, nlohmann::json &j, const std::string &raw) = 0;
-};
-
-/* Internal logger */
-event_decl(logger,LOG);
-
-/* Guilds */
-event_decl(guild_create,GUILD_CREATE);
-event_decl(guild_update,GUILD_UPDATE);
-event_decl(guild_delete,GUILD_DELETE);
-event_decl(guild_ban_add,GUILD_BAN_ADD);
-event_decl(guild_ban_remove,GUILD_BAN_REMOVE);
-event_decl(guild_emojis_update,GUILD_EMOJIS_UPDATE);
-event_decl(guild_integrations_update,GUILD_INTEGRATIONS_UPDATE);
-event_decl(guild_join_request_delete,GUILD_JOIN_REQUEST_DELETE);
-event_decl(guild_stickers_update,GUILD_STICKERS_UPDATE);
-
-/* Stage channels */
-event_decl(stage_instance_create,STAGE_INSTANCE_CREATE);
-event_decl(stage_instance_update,STAGE_INSTANCE_UPDATE);
-event_decl(stage_instance_delete,STAGE_INSTANCE_DELETE);
-
-/* Guild members */
-event_decl(guild_member_add,GUILD_MEMBER_ADD);
-event_decl(guild_member_remove,GUILD_MEMBER_REMOVE);
-event_decl(guild_members_chunk,GUILD_MEMBERS_CHUNK);
-event_decl(guild_member_update,GUILD_MEMBERS_UPDATE);
-
-/* Guild roles */
-event_decl(guild_role_create,GUILD_ROLE_CREATE);
-event_decl(guild_role_update,GUILD_ROLE_UPDATE);
-event_decl(guild_role_delete,GUILD_ROLE_DELETE);
-
-/* Session state */
-event_decl(resumed,RESUMED);
-event_decl(ready,READY);
-
-/* Channels */
-event_decl(channel_create,CHANNEL_CREATE);
-event_decl(channel_update,CHANNEL_UPDATE);
-event_decl(channel_delete,CHANNEL_DELETE);
-event_decl(channel_pins_update,CHANNEL_PINS_UPDATE);
-
-/* Threads */
-event_decl(thread_create,THREAD_CREATE);
-event_decl(thread_update,THREAD_UPDATE);
-event_decl(thread_delete,THREAD_DELETE);
-event_decl(thread_list_sync,THREAD_LIST_SYNC);
-event_decl(thread_member_update,THREAD_MEMBER_UPDATE);
-event_decl(thread_members_update,THREAD_MEMBERS_UPDATE);
-
-/* Messages */
-event_decl(message_create,MESSAGE_CREATE);
-event_decl(message_update,MESSAGE_UPDATE);
-event_decl(message_delete,MESSAGE_DELETE);
-event_decl(message_delete_bulk,MESSAGE_DELETE_BULK);
-
-/* Presence/typing */
-event_decl(presence_update,PRESENCE_UPDATE);
-event_decl(typing_start,TYPING_START);
-
-/* Users (outside of guild) */
-event_decl(user_update,USER_UPDATE);
-
-/* Message reactions */
-event_decl(message_reaction_add,MESSAGE_REACTION_ADD);
-event_decl(message_reaction_remove,MESSAGE_REACTION_REMOVE);
-event_decl(message_reaction_remove_all,MESSAGE_REACTION_REMOVE_ALL);
-event_decl(message_reaction_remove_emoji,MESSAGE_REACTION_REMOVE_EMOJI);
-
-/* Invites */
-event_decl(invite_create,INVITE_CREATE);
-event_decl(invite_delete,INVITE_DELETE);
-
-/* Voice */
-event_decl(voice_state_update,VOICE_STATE_UPDATE);
-event_decl(voice_server_update,VOICE_SERVER_UPDATE);
-
-/* Webhooks */
-event_decl(webhooks_update,WEBHOOKS_UPDATE);
-
-/* Application commands */
-event_decl(interaction_create,INTERACTION_CREATE);
-
-/* Integrations */
-event_decl(integration_create,INTEGRATION_CREATE);
-event_decl(integration_update,INTEGRATION_UPDATE);
-event_decl(integration_delete,INTEGRATION_DELETE);
-
-/* Scheduled events */
-event_decl(guild_scheduled_event_create,GUILD_SCHEDULED_EVENT_CREATE);
-event_decl(guild_scheduled_event_update,GUILD_SCHEDULED_EVENT_UPDATE);
-event_decl(guild_scheduled_event_delete,GUILD_SCHEDULED_EVENT_DELETE);
-event_decl(guild_scheduled_event_user_add,GUILD_SCHEDULED_EVENT_USER_ADD);
-event_decl(guild_scheduled_event_user_remove,GUILD_SCHEDULED_EVENT_USER_REMOVE);
-
-/* Auto moderation */
-event_decl(automod_rule_create, AUTO_MODERATION_RULE_CREATE);
-event_decl(automod_rule_update, AUTO_MODERATION_RULE_UPDATE);
-event_decl(automod_rule_delete, AUTO_MODERATION_RULE_DELETE);
-event_decl(automod_rule_execute, AUTO_MODERATION_ACTION_EXECUTION);
-
-}};
+/************************************************************************************
+ *
+ * D++, A Lightweight C++ library for Discord
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright 2021 Craig Edwards and D++ contributors 
+ * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ************************************************************************************/
+#pragma once
+#include <dpp/export.h>
+#include <dpp/snowflake.h>
+#include <dpp/json_fwd.h>
+
+#define event_decl(x,wstype) /** @brief Internal event handler for wstype websocket events. Called for each websocket message of this type. @internal */ \
+	class x : public event { public: virtual void handle(class dpp::discord_client* client, nlohmann::json &j, const std::string &raw); };
+
+/**
+ * @brief The events namespace holds the internal event handlers for each websocket event.
+ * These are handled internally and also dispatched to the user code if the event is hooked.
+ */
+namespace dpp::events { 
+
+/**
+ * @brief An event object represents an event handled internally, passed from the websocket e.g. MESSAGE_CREATE.
+ */
+class DPP_EXPORT event {
+public:
+	/**
+	 * @brief Pure virtual method for event handler code
+	 * @param client The creating shard
+	 * @param j The json data of the event
+	 * @param raw The raw event json
+	 */
+	virtual void handle(class discord_client* client, nlohmann::json &j, const std::string &raw) = 0;
+};
+
+/* Internal logger */
+event_decl(logger,LOG);
+
+/* Guilds */
+event_decl(guild_create,GUILD_CREATE);
+event_decl(guild_update,GUILD_UPDATE);
+event_decl(guild_delete,GUILD_DELETE);
+event_decl(guild_ban_add,GUILD_BAN_ADD);
+event_decl(guild_ban_remove,GUILD_BAN_REMOVE);
+event_decl(guild_emojis_update,GUILD_EMOJIS_UPDATE);
+event_decl(guild_integrations_update,GUILD_INTEGRATIONS_UPDATE);
+event_decl(guild_join_request_delete,GUILD_JOIN_REQUEST_DELETE);
+event_decl(guild_stickers_update,GUILD_STICKERS_UPDATE);
+
+/* Stage channels */
+event_decl(stage_instance_create,STAGE_INSTANCE_CREATE);
+event_decl(stage_instance_update,STAGE_INSTANCE_UPDATE);
+event_decl(stage_instance_delete,STAGE_INSTANCE_DELETE);
+
+/* Guild members */
+event_decl(guild_member_add,GUILD_MEMBER_ADD);
+event_decl(guild_member_remove,GUILD_MEMBER_REMOVE);
+event_decl(guild_members_chunk,GUILD_MEMBERS_CHUNK);
+event_decl(guild_member_update,GUILD_MEMBERS_UPDATE);
+
+/* Guild roles */
+event_decl(guild_role_create,GUILD_ROLE_CREATE);
+event_decl(guild_role_update,GUILD_ROLE_UPDATE);
+event_decl(guild_role_delete,GUILD_ROLE_DELETE);
+
+/* Session state */
+event_decl(resumed,RESUMED);
+event_decl(ready,READY);
+
+/* Channels */
+event_decl(channel_create,CHANNEL_CREATE);
+event_decl(channel_update,CHANNEL_UPDATE);
+event_decl(channel_delete,CHANNEL_DELETE);
+event_decl(channel_pins_update,CHANNEL_PINS_UPDATE);
+
+/* Threads */
+event_decl(thread_create,THREAD_CREATE);
+event_decl(thread_update,THREAD_UPDATE);
+event_decl(thread_delete,THREAD_DELETE);
+event_decl(thread_list_sync,THREAD_LIST_SYNC);
+event_decl(thread_member_update,THREAD_MEMBER_UPDATE);
+event_decl(thread_members_update,THREAD_MEMBERS_UPDATE);
+
+/* Messages */
+event_decl(message_create,MESSAGE_CREATE);
+event_decl(message_update,MESSAGE_UPDATE);
+event_decl(message_delete,MESSAGE_DELETE);
+event_decl(message_delete_bulk,MESSAGE_DELETE_BULK);
+event_decl(message_poll_vote_add,MESSAGE_POLL_VOTE_ADD);
+event_decl(message_poll_vote_remove,MESSAGE_POLL_VOTE_REMOVE);
+
+/* Presence/typing */
+event_decl(presence_update,PRESENCE_UPDATE);
+event_decl(typing_start,TYPING_START);
+
+/* Users (outside of guild) */
+event_decl(user_update,USER_UPDATE);
+
+/* Message reactions */
+event_decl(message_reaction_add,MESSAGE_REACTION_ADD);
+event_decl(message_reaction_remove,MESSAGE_REACTION_REMOVE);
+event_decl(message_reaction_remove_all,MESSAGE_REACTION_REMOVE_ALL);
+event_decl(message_reaction_remove_emoji,MESSAGE_REACTION_REMOVE_EMOJI);
+
+/* Invites */
+event_decl(invite_create,INVITE_CREATE);
+event_decl(invite_delete,INVITE_DELETE);
+
+/* Voice */
+event_decl(voice_state_update,VOICE_STATE_UPDATE);
+event_decl(voice_channel_effect_send,VOICE_CHANNEL_EFFECT_SEND);
+event_decl(voice_server_update,VOICE_SERVER_UPDATE);
+
+/* Webhooks */
+event_decl(webhooks_update,WEBHOOKS_UPDATE);
+
+/* Application commands */
+event_decl(interaction_create,INTERACTION_CREATE);
+
+/* Integrations */
+event_decl(integration_create,INTEGRATION_CREATE);
+event_decl(integration_update,INTEGRATION_UPDATE);
+event_decl(integration_delete,INTEGRATION_DELETE);
+
+/* Scheduled events */
+event_decl(guild_scheduled_event_create,GUILD_SCHEDULED_EVENT_CREATE);
+event_decl(guild_scheduled_event_update,GUILD_SCHEDULED_EVENT_UPDATE);
+event_decl(guild_scheduled_event_delete,GUILD_SCHEDULED_EVENT_DELETE);
+event_decl(guild_scheduled_event_user_add,GUILD_SCHEDULED_EVENT_USER_ADD);
+event_decl(guild_scheduled_event_user_remove,GUILD_SCHEDULED_EVENT_USER_REMOVE);
+
+/* Auto moderation */
+event_decl(automod_rule_create, AUTO_MODERATION_RULE_CREATE);
+event_decl(automod_rule_update, AUTO_MODERATION_RULE_UPDATE);
+event_decl(automod_rule_delete, AUTO_MODERATION_RULE_DELETE);
+event_decl(automod_rule_execute, AUTO_MODERATION_ACTION_EXECUTION);
+
+/* Audit log */
+event_decl(guild_audit_log_entry_create, GUILD_AUDIT_LOG_ENTRY_CREATE);
+
+/* Entitlements */
+event_decl(entitlement_create, ENTITLEMENT_CREATE);
+event_decl(entitlement_update, ENTITLEMENT_UPDATE);
+event_decl(entitlement_delete, ENTITLEMENT_DELETE);
+
+}
diff --git a/3rdParty/dpp/event_router.h b/3rdParty/dpp/event_router.h
index fa8bef7816..fc604d0e1b 100644
--- a/3rdParty/dpp/event_router.h
+++ b/3rdParty/dpp/event_router.h
@@ -1,246 +1,744 @@
-/************************************************************************************
- *
- * D++, A Lightweight C++ library for Discord
- *
- * Copyright 2021 Craig Edwards and D++ contributors
- * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- ************************************************************************************/
-
-#pragma once
-
-#include <dpp/export.h>
-#include <string>
-#include <map>
-#include <variant>
-#include <dpp/snowflake.h>
-#include <dpp/misc-enum.h>
-#include <dpp/nlohmann/json_fwd.hpp>
-#include <algorithm>
-#include <mutex>
-#include <shared_mutex>
-#include <cstring>
-#include <dpp/coro.h>
-
-using  json = nlohmann::json;
-
-namespace dpp {
-
-/**
- * @brief A returned event handle for an event which was attached
- */
-typedef size_t event_handle;
-
-/**
- * @brief Handles routing of an event to multiple listeners.
- * 
- * Multiple listeners may attach to the event_router_t by means of operator(). Passing a
- * lambda into operator() attaches to the event.
- * 
- * Dispatchers of the event may call the event_router_t::call() method to cause all listeners
- * to receive the event.
- * 
- * The event_router_t::empty() method will return true if there are no listeners attached
- * to the event_router_t (this can be used to save time by not constructing objects that
- * nobody will ever see).
- * 
- * The event_router_t::detach() method removes an existing listener from the event,
- * using the event_handle ID returned by operator().
- * 
- * This class is used by the library to route all websocket events to listening code.
- * 
- * Example:
- * 
- * ```cpp
- * // Declare an event that takes log_t as its parameter
- * event_router_t<log_t> my_event;
- * 
- * // Attach a listener to the event
- * event_handle id = my_event([&](const log_t& cc) {
- *	 std::cout << cc.message << "\n";
- * });
- * 
- * // Construct a log_t and call the event (listeners will receive the log_t object)
- * log_t lt;
- * lt.message = "foo";
- * my_event.call(lt);
- * 
- * // Detach from an event using the handle returned by operator()
- * my_event.detach(id);
- * ```
- * 
- * @tparam T type of single parameter passed to event lambda derived from event_dispatch_t
- */
-template<class T> class event_router_t {
-private:
-	friend class cluster;
-
-	event_handle next_handle = 1;
-
-	/**
-	 * @brief Thread safety mutex
-	 */
-	mutable std::shared_mutex lock;
-	/**
-	 * @brief Container of event listeners keyed by handle,
-	 * as handles are handed out sequentially they will always
-	 * be called in they order they are bound to the event
-	 * as std::map is an ordered container.
-	 */
-	std::map<event_handle, std::function<void(const T&)>> dispatch_container;
-
-
-#ifdef DPP_CORO
-	/**
-	 * @brief Container for event listeners (coroutines only)
-	 */
-	std::map<event_handle, std::function<dpp::task(T)>> coroutine_container;
-#else
-       /**
-        * @brief Dummy container to keep the struct size same
-        */
-       std::map<event_handle, std::function<void(T)>> dummy_container;
-#endif
-
-
-	/**
-	 * @brief A function to be called whenever the method is called, to check
-	 * some condition that is required for this event to trigger correctly.
-	 */
-	std::function<void(const T&)> warning;
-
-	/**
-	 * @brief Next handle to be given out by the event router
-	 */
-
-protected:
-
-	/**
-	 * @brief Set the warning callback object used to check that this
-	 * event is capable of running properly
-	 * 
-	 * @param warning_function A checking function to call
-	 */
-	void set_warning_callback(std::function<void(const T&)> warning_function) {
-		warning = warning_function;
-	}
-
-public:
-	/**
-	 * @brief Construct a new event_router_t object.
-	 */
-	event_router_t() = default;
-
-	/**
-	 * @brief Call all attached listeners.
-	 * Listeners may cancel, by calling the event.cancel method.
-	 * 
-	 * @param event Class to pass as parameter to all listeners.
-	 */
-	void call(const T& event) const {
-		if (warning) {
-			warning(event);
-		}
-		std::shared_lock l(lock);
-		std::for_each(dispatch_container.begin(), dispatch_container.end(), [&](auto &ev) {
-			if (!event.is_cancelled()) {
-				ev.second(event);
-			}
-		});
-#ifdef DPP_CORO
-		std::for_each(coroutine_container.begin(), coroutine_container.end(), [&](auto &ev) {
-			if (!event.is_cancelled()) {
-				ev.second(event);
-			}
-		});
-#endif
-	};
-
-	/**
-	 * @brief Returns true if the container of listeners is empty,
-	 * i.e. there is nothing listening for this event right now.
-	 * 
-	 * @return true if there are no listeners
-	 * @return false if there are some listeners
-	 */
-	bool empty() const {
-		std::shared_lock l(lock);
-		return dispatch_container.empty();
-	}
-
-	/**
-	 * @brief Returns true if any listeners are attached.
-	 * 
-	 * This is the boolean opposite of event_router_t::empty().
-	 * @return true if listeners are attached
-	 * @return false if no listeners are attached
-	 */
-	operator bool() const {
-		return !empty();
-	}
-
-	/**
-	 * @brief Attach a lambda to the event, adding a listener.
-	 * The lambda should follow the signature specified when declaring
-	 * the event object and should take exactly one parameter derived
-	 * from event_dispatch_t.
-	 * 
-	 * @param func Function lambda to attach to event
-	 * @return event_handle An event handle unique to this event, used to
-	 * detach the listener from the event later if necessary.
-	 */
-	event_handle operator()(std::function<void(const T&)> func) {
-		return this->attach(func);
-	}
-
-	/**
-	 * @brief Attach a lambda to the event, adding a listener.
-	 * The lambda should follow the signature specified when declaring
-	 * the event object and should take exactly one parameter derived
-	 * from event_dispatch_t.
-	 * 
-	 * @param func Function lambda to attach to event
-	 * @return event_handle An event handle unique to this event, used to
-	 * detach the listener from the event later if necessary.
-	 */
-	event_handle attach(std::function<void(const T&)> func) {
-		std::unique_lock l(lock);
-		event_handle h = next_handle++;
-		dispatch_container.emplace(h, func);
-		return h;		
-	}
-
-#ifdef DPP_CORO
-	event_handle co_attach(std::function<dpp::task(T)> func) {
-		std::unique_lock l(lock);
-		event_handle h = next_handle++;
-		coroutine_container.emplace(h, func);
-		return h;		
-	}
-#endif
-	/**
-	 * @brief Detach a listener from the event using a previously obtained ID.
-	 * 
-	 * @param handle An ID obtained from event_router_t::operator()
-	 * @return true The event was successfully detached
-	 * @return false The ID is invalid (possibly already detached, or does not exist)
-	 */
-	bool detach(const event_handle& handle) {
-		std::unique_lock l(lock);
-		return this->dispatch_container.erase(handle);
-	}
-};
-
-};
+/************************************************************************************
+ *
+ * D++, A Lightweight C++ library for Discord
+ *
+ * Copyright 2021 Craig Edwards and D++ contributors
+ * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ************************************************************************************/
+
+#pragma once
+
+#include <dpp/export.h>
+#include <string>
+#include <map>
+#include <variant>
+#include <dpp/snowflake.h>
+#include <dpp/misc-enum.h>
+#include <dpp/json_fwd.h>
+#include <algorithm>
+#include <mutex>
+#include <shared_mutex>
+#include <cstring>
+#include <atomic>
+#include <dpp/exception.h>
+#include <dpp/coro/job.h>
+#include <dpp/coro/task.h>
+
+namespace dpp {
+
+#ifndef DPP_NO_CORO
+
+template <typename T>
+class event_router_t;
+
+namespace detail {
+
+/** @brief Internal cogwheels for dpp::event_router_t */
+namespace event_router {
+
+/** @brief State of an owner of an event_router::awaitable */
+enum class awaiter_state {
+	/** @brief Awaitable is not being awaited */
+	none,
+	/** @brief Awaitable is being awaited */
+	waiting,
+	/** @brief Awaitable will be resumed imminently */
+	resuming,
+	/** @brief Awaitable will be cancelled imminently */
+	cancelling
+};
+
+/**
+ * @brief Awaitable object representing an event.
+ * A user can co_await on this object to resume the next time the event is fired,
+ * optionally with a condition.
+ */
+template <typename T>
+class awaitable {
+	friend class event_router_t<T>;
+
+	/** @brief Resume the coroutine waiting on this object */
+	void resume() {
+		std_coroutine::coroutine_handle<>::from_address(handle).resume();
+	}
+
+	/** @brief Event router that will manage this object */
+	event_router_t<T> *self;
+
+	/** @brief Predicate on the event, or nullptr for always match */
+	std::function<bool (const T &)> predicate = nullptr;
+
+	/** @brief Event that triggered a resumption, to give to the resumer */
+	const T *event = nullptr;
+
+	/** @brief Coroutine handle, type-erased */
+	void* handle = nullptr;
+
+	/** @brief The state of the awaiting coroutine */
+	std::atomic<awaiter_state> state = awaiter_state::none;
+
+	/** Default constructor is accessible only to event_router_t */
+	awaitable() = default;
+
+	/** Normal constructor is accessible only to event_router_t */
+	template <typename F>
+	awaitable(event_router_t<T> *router, F&& fun) : self{router}, predicate{std::forward<F>(fun)} {}
+
+public:
+	/** This object is not copyable. */
+	awaitable(const awaitable &) = delete;
+
+	/** Move constructor. */
+	awaitable(awaitable &&rhs) noexcept : self{rhs.self}, predicate{std::move(rhs.predicate)}, event{rhs.event}, handle{std::exchange(rhs.handle, nullptr)}, state{rhs.state.load(std::memory_order_relaxed)} {}
+
+	/** This object is not copyable. */
+	awaitable& operator=(const awaitable &) = delete;
+
+	/** Move assignment operator. */
+	awaitable& operator=(awaitable&& rhs) noexcept {
+		self = rhs.self;
+		predicate = std::move(rhs.predicate);
+		event = rhs.event;
+		handle = std::exchange(rhs.handle, nullptr);
+		state = rhs.state.load(std::memory_order_relaxed);
+		return *this;
+	}
+
+	/**
+	 * @brief Request cancellation. This will detach this object from the event router and resume the awaiter, which will be thrown dpp::task_cancelled::exception.
+	 *
+	 * @throw ??? As this resumes the coroutine, it may throw any exceptions at the caller.
+	 */
+	void cancel();
+
+	/**
+	 * @brief First function called by the standard library when awaiting this object. Returns true if we need to suspend.
+	 *
+	 * @retval false always.
+	 */
+	[[nodiscard]] constexpr bool await_ready() const noexcept;
+
+	/**
+	 * @brief Second function called by the standard library when awaiting this object, after suspension.
+	 * This will attach the object to its event router, to be resumed on the next event that satisfies the predicate.
+	 *
+	 * @return void never resume on call.
+	 */
+	void await_suspend(detail::std_coroutine::coroutine_handle<> caller);
+
+	/**
+	 * @brief Third and final function called by the standard library, called when resuming the coroutine.
+	 *
+	 * @throw @ref task_cancelled_exception if cancel() has been called
+	 * @return const T& __Reference__ to the event that matched
+	 */
+	[[maybe_unused]] const T& await_resume();
+};
+
+}
+
+}
+#endif
+
+/**
+ * @brief A returned event handle for an event which was attached
+ */
+typedef size_t event_handle;
+
+/**
+ * @brief Handles routing of an event to multiple listeners.
+ * Multiple listeners may attach to the event_router_t by means of @ref operator()(F&&) "operator()". Passing a
+ * lambda into @ref operator()(F&&) "operator()" attaches to the event.
+ * 
+ * @details Dispatchers of the event may call the @ref call() method to cause all listeners
+ * to receive the event.
+ * 
+ * The @ref empty() method will return true if there are no listeners attached
+ * to the event_router_t (this can be used to save time by not constructing objects that
+ * nobody will ever see).
+ * 
+ * The @ref detach() method removes an existing listener from the event,
+ * using the event_handle ID returned by @ref operator()(F&&) "operator()".
+ * 
+ * This class is used by the library to route all websocket events to listening code.
+ * 
+ * Example:
+ * 
+ * @code{cpp}
+ * // Declare an event that takes log_t as its parameter
+ * event_router_t<log_t> my_event;
+ * 
+ * // Attach a listener to the event
+ * event_handle id = my_event([&](const log_t& cc) {
+ *	 std::cout << cc.message << "\n";
+ * });
+ * 
+ * // Construct a log_t and call the event (listeners will receive the log_t object)
+ * log_t lt;
+ * lt.message = "foo";
+ * my_event.call(lt);
+ * 
+ * // Detach from an event using the handle returned by operator()
+ * my_event.detach(id);
+ * @endcode
+ * 
+ * @tparam T type of single parameter passed to event lambda derived from event_dispatch_t
+ */
+template<class T> class event_router_t {
+private:
+	friend class cluster;
+
+	/**
+	 * @brief Non-coro event handler type
+	 */
+	using regular_handler_t = std::function<void(const T&)>;
+
+	/**
+	 * @brief Type that event handlers will be stored as with DPP_CORO off.
+	 * This is the ABI DPP_CORO has to match.
+	 */
+	using event_handler_abi_t = std::variant<regular_handler_t, std::function<task_dummy(T)>>;
+
+#ifndef DPP_NO_CORO
+	friend class detail::event_router::awaitable<T>;
+
+	/** @brief dpp::task coro event handler */
+	using task_handler_t = std::function<dpp::task<void>(const T&)>;
+
+	/** @brief Type that event handlers are stored as */
+	using event_handler_t = std::variant<regular_handler_t, task_handler_t>;
+
+	DPP_CHECK_ABI_COMPAT(event_handler_t, event_handler_abi_t)
+#else
+	/**
+	 * @brief Type that event handlers are stored as
+	 */
+	using event_handler_t = event_handler_abi_t;
+#endif
+
+	/**
+	 * @brief Identifier for the next event handler, will be given to the user on attaching a handler
+	 */
+	event_handle next_handle = 1;
+
+	/**
+	 * @brief Thread safety mutex
+	 */
+	mutable std::shared_mutex mutex;
+
+	/**
+	 * @brief Container of event listeners keyed by handle,
+	 * as handles are handed out sequentially they will always
+	 * be called in they order they are bound to the event
+	 * as std::map is an ordered container.
+	 */
+	std::map<event_handle, event_handler_t> dispatch_container;
+
+#ifndef DPP_NO_CORO
+	/**
+	 * @brief Mutex for messing with coro_awaiters.
+	 */
+	mutable std::shared_mutex coro_mutex;
+
+	/**
+	 * @brief Vector containing the awaitables currently being awaited on for this event router.
+	 */
+	mutable std::vector<detail::event_router::awaitable<T> *> coro_awaiters;
+#else
+	/**
+	 * @brief Dummy for ABI compatibility between DPP_CORO and not
+	 */
+	utility::dummy<std::shared_mutex> definitely_not_a_mutex;
+
+	/**
+	 * @brief Dummy for ABI compatibility between DPP_CORO and not
+	 */
+	utility::dummy<std::vector<void*>> definitely_not_a_vector;
+#endif
+
+	/**
+	 * @brief A function to be called whenever the method is called, to check
+	 * some condition that is required for this event to trigger correctly.
+	 */
+	std::function<void(const T&)> warning;
+
+	/**
+	 * @brief Next handle to be given out by the event router
+	 */
+
+protected:
+
+	/**
+	 * @brief Set the warning callback object used to check that this
+	 * event is capable of running properly
+	 * 
+	 * @param warning_function A checking function to call
+	 */
+	void set_warning_callback(std::function<void(const T&)> warning_function) {
+		warning = warning_function;
+	}
+
+	/**
+	 * @brief Handle an event. This function should only be used without coro enabled, otherwise use handle_coro.
+	 */
+	void handle(const T& event) const {
+		if (warning) {
+			warning(event);
+		}
+
+		std::shared_lock l(mutex);
+		for (const auto& [_, listener] : dispatch_container) {
+			if (!event.is_cancelled()) {
+				if (std::holds_alternative<regular_handler_t>(listener)) {
+					std::get<regular_handler_t>(listener)(event);
+				} else {
+					throw dpp::logic_exception("cannot handle a coroutine event handler with a library built without DPP_CORO");
+				}
+			}
+		};
+	}
+
+#ifndef DPP_NO_CORO
+	/**
+	 * @brief Handle an event as a coroutine, ensuring the lifetime of the event object.
+	 */
+	dpp::job handle_coro(T event) const {
+		if (warning) {
+			warning(event);
+		}
+
+		resume_awaiters(event);
+
+		std::vector<dpp::task<void>> tasks;
+		{
+			std::shared_lock l(mutex);
+
+			for (const auto& [_, listener] : dispatch_container) {
+				if (!event.is_cancelled()) {
+					if (std::holds_alternative<task_handler_t>(listener)) {
+						tasks.push_back(std::get<task_handler_t>(listener)(event));
+					} else if (std::holds_alternative<regular_handler_t>(listener)) {
+						std::get<regular_handler_t>(listener)(event);
+					}
+				}
+			};
+		}
+
+		for (dpp::task<void>& t : tasks) {
+			co_await t; // keep the event object alive until all tasks finished
+		}
+	}
+
+	/**
+	 * @brief Attach a suspended coroutine to this event router via detail::event_router::awaitable.
+	 * It will be resumed and detached when an event satisfying its condition completes, or it is cancelled.
+	 *
+	 * This is for internal usage only, the user way to do this is to co_await it (which will call this when suspending)
+	 * This guarantees that the coroutine is indeed suspended and thus can be resumed at any time
+	 *
+	 * @param awaiter Awaiter to attach
+	 */
+	void attach_awaiter(detail::event_router::awaitable<T> *awaiter) {
+		std::unique_lock lock{coro_mutex};
+
+		coro_awaiters.emplace_back(awaiter);
+	}
+
+	/**
+	 * @brief Detach an awaiting coroutine handle from this event router.
+	 * This is mostly called when a detail::event_router::awaitable is cancelled.
+	 *
+	 * @param handle Coroutine handle to find in the attached coroutines
+	 */
+	void detach_coro(void *handle) {
+		std::unique_lock lock{coro_mutex};
+
+		coro_awaiters.erase(std::remove_if(coro_awaiters.begin(), coro_awaiters.end(), [handle](detail::event_router::awaitable<T> const *awaiter) { return awaiter->handle == handle; }), coro_awaiters.end());
+	}
+
+	/**
+	 * @brief Resume any awaiter whose predicate matches this event, or is null.
+	 *
+	 * @param event Event to compare and pass to accepting awaiters
+	 */
+	void resume_awaiters(const T& event) const {
+		std::vector<detail::event_router::awaitable<T>*> to_resume;
+		std::unique_lock lock{coro_mutex};
+
+		for (auto it = coro_awaiters.begin(); it != coro_awaiters.end();) {
+			detail::event_router::awaitable<T>* awaiter = *it;
+
+			if (awaiter->predicate && !awaiter->predicate(event)) {
+				++it;
+			} else {
+				using state_t = detail::event_router::awaiter_state;
+
+				/**
+				 * If state == none (was never awaited), do nothing
+				 * If state == waiting, prevent resumption, resume on our end
+				 * If state == resuming || cancelling, ignore
+				 *
+				 * Technically only cancelling || waiting should be possible here
+				 * We do this by trying to exchange "waiting" with "resuming". If that returns false, this is presumed to be "cancelling"
+				 */
+
+				state_t s = state_t::waiting;
+				if (awaiter->state.compare_exchange_strong(s, state_t::resuming)) {
+					to_resume.emplace_back(awaiter);
+					awaiter->event = &event;
+
+					it = coro_awaiters.erase(it);
+				} else {
+					++it;
+				}
+			}
+		}
+		lock.unlock();
+		for (detail::event_router::awaitable<T>* awaiter : to_resume)
+			awaiter->resume();
+	}
+#endif
+
+public:
+	/**
+	 * @brief Construct a new event_router_t object.
+	 */
+	event_router_t() = default;
+
+	/**
+	 * @brief Destructor. Will cancel any coroutine awaiting on events.
+	 *
+	 * @throw ! Cancelling a coroutine will throw a dpp::task_cancelled_exception to it.
+	 * This will be caught in this destructor, however, make sure no other exceptions are thrown in the coroutine after that or it will terminate.
+	 */
+	~event_router_t() {
+#ifndef DPP_NO_CORO
+		while (!coro_awaiters.empty()) {
+			// cancel all awaiters. here we cannot do the usual loop as we'd need to lock coro_mutex, and cancel() locks and modifies coro_awaiters
+			try {
+				coro_awaiters.back()->cancel();
+				 /*
+					* will resume coroutines and may throw ANY exception, including dpp::task_cancelled_exception cancel() throws at them.
+					* we catch that one. for the rest, good luck :)
+					* realistically the only way any other exception would pop up here is if someone catches dpp::task_cancelled_exception THEN throws another exception.
+				  */
+			} catch (const dpp::task_cancelled_exception &) {
+				// ok. likely we threw this one
+			}
+		}
+#endif
+	}
+
+	/**
+	 * @brief Call all attached listeners.
+	 * Listeners may cancel, by calling the event.cancel method.
+	 *
+	 * @param event Class to pass as parameter to all listeners.
+	 */
+	void call(const T& event) const {
+#ifndef DPP_NO_CORO
+		handle_coro(event);
+#else
+		handle(event);
+#endif
+	};
+
+	/**
+	 * @brief Call all attached listeners.
+	 * Listeners may cancel, by calling the event.cancel method.
+	 *
+	 * @param event Class to pass as parameter to all listeners.
+	 */
+	void call(T&& event) const {
+#ifndef DPP_NO_CORO
+		handle_coro(std::move(event));
+#else
+		handle(std::move(event));
+#endif
+	};
+
+#ifndef DPP_NO_CORO
+	/**
+	 * @brief Obtain an awaitable object that refers to an event with a certain condition.
+	 * It can be co_await-ed to wait for the next event that satisfies this condition.
+	 * On resumption the awaiter will be given __a reference__ to the event,
+	 * saving it in a variable is recommended to avoid variable lifetime issues.
+	 *
+	 * @details Example: @code{cpp}
+	 * dpp::task<> my_handler(const dpp::slashcommand_t& event) {
+	 *	co_await event.co_reply(dpp::message().add_component(dpp::component().add_component().set_label("click me!").set_id("test")));
+	 *
+	 *	dpp::button_click_t b = co_await c->on_button_click.with([](const dpp::button_click_t &event){ return event.custom_id == "test"; });
+	 *
+	 *	// do something on button click
+	 * }
+	 * @endcode
+	 *
+	 * This can be combined with dpp::when_any and other awaitables, for example dpp::cluster::co_sleep to create @ref expiring-buttons "expiring buttons".
+	 *
+	 * @warning On resumption the awaiter will be given <b>a reference</b> to the event.
+	 * This means that variable may become dangling at the next co_await, be careful and save it in a variable
+	 * if you need to.
+	 * @param pred Predicate to check the event against. This should be a callable of the form `bool(const T&)`
+	 * where T is the event type, returning true if the event is to match.
+	 * @return awaitable An awaitable object that can be co_await-ed to await an event matching the condition.
+	 */
+	template <typename Predicate>
+#ifndef _DOXYGEN_
+	requires utility::callable_returns<Predicate, bool, const T&>
+#endif
+	auto when(Predicate&& pred)
+#ifndef _DOXYGEN_
+		noexcept(noexcept(std::function<bool(const T&)>{std::declval<Predicate>()}))
+#endif
+	{
+		return detail::event_router::awaitable<T>{this, std::forward<Predicate>(pred)};
+	}
+
+	/**
+	 * @brief Obtain an awaitable object that refers to any event.
+	 * It can be co_await-ed to wait for the next event.
+	 *
+	 * @details Example: @code{cpp}
+	 * dpp::task<> my_handler(const dpp::slashcommand_t& event) {
+	 *	co_await event.co_reply(dpp::message().add_component(dpp::component().add_component().set_label("click me!").set_id("test")));
+	 *
+	 *	dpp::button_click_t b = co_await c->on_message_create;
+	 *
+	 *	// do something on button click
+	 * }
+	 * @endcode
+	 *
+	 * This can be combined with dpp::when_any and other awaitables, for example dpp::cluster::co_sleep to create expiring buttons.
+	 *
+	 * @warning On resumption the awaiter will be given <b>a reference</b> to the event.
+	 * This means that variable may become dangling at the next co_await, be careful and save it in a variable
+	 * if you need to.
+	 * @return awaitable An awaitable object that can be co_await-ed to await an event matching the condition.
+	 */
+	[[nodiscard]] auto operator co_await() noexcept {
+		return detail::event_router::awaitable<T>{this, nullptr};
+	}
+#endif
+
+	/**
+	 * @brief Returns true if the container of listeners is empty,
+	 * i.e. there is nothing listening for this event right now.
+	 * 
+	 * @retval true  if there are no listeners
+	 * @retval false if there are some listeners
+	 */
+	[[nodiscard]] bool empty() const {
+#ifndef DPP_NO_CORO
+		std::shared_lock lock{mutex};
+		std::shared_lock coro_lock{coro_mutex};
+
+		return dispatch_container.empty() && coro_awaiters.empty();
+#else
+		std::shared_lock lock{mutex};
+
+		return dispatch_container.empty();
+#endif
+	}
+
+	/**
+	 * @brief Returns true if any listeners are attached.
+	 * 
+	 * This is the boolean opposite of event_router_t::empty().
+	 * @retval true  if listeners are attached
+	 * @retval false if no listeners are attached
+	 */
+	operator bool() const {
+		return !empty();
+	}
+
+#ifdef _DOXYGEN_
+	/**
+	 * @brief Attach a callable to the event, adding a listener.
+	 * The callable should either be of the form `void(const T&)` or
+	 * `dpp::task<void>(const T&)`,
+	 * where T is the event type for this event router.
+	 *
+	 * This has the exact same behavior as using \ref attach(F&&) "attach".
+	 *
+	 * @see attach
+	 * @param fun Callable to attach to event
+	 * @return event_handle An event handle unique to this event, used to
+	 * detach the listener from the event later if necessary.
+	 */
+	template <typename F>
+	[[maybe_unused]] event_handle operator()(F&& fun);
+
+	/**
+	 * @brief Attach a callable to the event, adding a listener.
+	 * The callable should either be of the form `void(const T&)` or
+	 * `dpp::task<void>(const T&)`,
+	 * where T is the event type for this event router.
+	 *
+	 * @param fun Callable to attach to event
+	 * @return event_handle An event handle unique to this event, used to
+	 * detach the listener from the event later if necessary.
+	 */
+	template <typename F>
+	[[maybe_unused]] event_handle attach(F&& fun);
+#else /* not _DOXYGEN_ */
+#  ifndef DPP_NO_CORO
+	/**
+	 * @brief Attach a callable to the event, adding a listener.
+	 * The callable should either be of the form `void(const T&)` or
+	 * `dpp::task<void>(const T&)`, where T is the event type for this event router.
+	 *
+	 * @param fun Callable to attach to event
+	 * @return event_handle An event handle unique to this event, used to
+	 * detach the listener from the event later if necessary.
+	 */
+	template <typename F>
+	requires (utility::callable_returns<F, dpp::task<void>, const T&> || utility::callable_returns<F, void, const T&>)
+	[[maybe_unused]] event_handle operator()(F&& fun) {
+		return this->attach(std::forward<F>(fun));
+	}
+
+	/**
+	 * @brief Attach a callable to the event, adding a listener.
+	 * The callable should either be of the form `void(const T&)` or
+	 * `dpp::task<void>(const T&)`, where T is the event type for this event router.
+	 *
+	 * @param fun Callable to attach to event
+	 * @return event_handle An event handle unique to this event, used to
+	 * detach the listener from the event later if necessary.
+	 */
+	template <typename F>
+	requires (utility::callable_returns<F, void, const T&>)
+	[[maybe_unused]] event_handle attach(F&& fun) {
+		std::unique_lock l(mutex);
+		event_handle h = next_handle++;
+		dispatch_container.emplace(std::piecewise_construct, std::forward_as_tuple(h), std::forward_as_tuple(std::in_place_type_t<regular_handler_t>{}, std::forward<F>(fun)));
+		return h;
+	}
+
+	/**
+	 * @brief Attach a callable to the event, adding a listener.
+	 * The callable should either be of the form `void(const T&)` or
+	 * `dpp::task<void>(const T&)`, where T is the event type for this event router.
+	 *
+	 * @param fun Callable to attach to event
+	 * @return event_handle An event handle unique to this event, used to
+	 * detach the listener from the event later if necessary.
+	 */
+	template <typename F>
+	requires (utility::callable_returns<F, task<void>, const T&>)
+	[[maybe_unused]] event_handle attach(F&& fun) {
+		assert(dpp::utility::is_coro_enabled());
+
+		std::unique_lock l(mutex);
+		event_handle h = next_handle++;
+		dispatch_container.emplace(std::piecewise_construct, std::forward_as_tuple(h), std::forward_as_tuple(std::in_place_type_t<task_handler_t>{}, std::forward<F>(fun)));
+		return h;
+	}
+#  else
+	/**
+	 * @brief Attach a callable to the event, adding a listener.
+	 * The callable should be of the form `void(const T&)`
+	 * where T is the event type for this event router.
+	 *
+	 * @param fun Callable to attach to event
+	 * @return event_handle An event handle unique to this event, used to
+	 * detach the listener from the event later if necessary.
+	 */
+	template <typename F>
+	[[maybe_unused]] std::enable_if_t<utility::callable_returns_v<F, void, const T&>, event_handle> operator()(F&& fun) {
+		return this->attach(std::forward<F>(fun));
+	}
+
+	/**
+	 * @brief Attach a callable to the event, adding a listener.
+	 * The callable should be of the form `void(const T&)`
+	 * where T is the event type for this event router.
+	 *f
+	 * @warning You cannot call this within an event handler.
+	 *
+	 * @param fun Callable to attach to event
+	 * @return event_handle An event handle unique to this event, used to
+	 * detach the listener from the event later if necessary.
+	 */
+	template <typename F>
+	[[maybe_unused]] std::enable_if_t<utility::callable_returns_v<F, void, const T&>, event_handle> attach(F&& fun) {
+		std::unique_lock l(mutex);
+		event_handle h = next_handle++;
+		dispatch_container.emplace(h, std::forward<F>(fun));
+		return h;
+	}
+#  endif /* DPP_NO_CORO */
+#endif /* _DOXYGEN_ */
+	/**
+	 * @brief Detach a listener from the event using a previously obtained ID.
+	 *
+	 * @warning You cannot call this within an event handler.
+	 *
+	 * @param handle An ID obtained from @ref operator(F&&) "operator()"
+	 * @retval true  The event was successfully detached
+	 * @retval false The ID is invalid (possibly already detached, or does not exist)
+	 */
+	[[maybe_unused]] bool detach(const event_handle& handle) {
+		std::unique_lock l(mutex);
+		return this->dispatch_container.erase(handle);
+	}
+};
+
+#ifndef DPP_NO_CORO
+
+namespace detail::event_router {
+
+template <typename T>
+void awaitable<T>::cancel() {
+	awaiter_state s = awaiter_state::waiting;
+	/**
+		* If state == none (was never awaited), do nothing
+		* If state == waiting, prevent resumption, resume on our end
+		* If state == resuming || cancelling, ignore
+		*/
+	if (state.compare_exchange_strong(s, awaiter_state::cancelling)) {
+		self->detach_coro(handle);
+		resume();
+	}
+}
+
+template <typename T>
+constexpr bool awaitable<T>::await_ready() const noexcept {
+	return false;
+}
+
+template <typename T>
+void awaitable<T>::await_suspend(detail::std_coroutine::coroutine_handle<> caller) {
+	state.store(awaiter_state::waiting);
+	handle = caller.address();
+	self->attach_awaiter(this);
+}
+
+template <typename T>
+const T &awaitable<T>::await_resume() {
+	handle = nullptr;
+	predicate = nullptr;
+	if (state.exchange(awaiter_state::none, std::memory_order_relaxed) == awaiter_state::cancelling) {
+		throw dpp::task_cancelled_exception{"event_router::awaitable was cancelled"};
+	}
+	return *std::exchange(event, nullptr);
+}
+
+}
+#endif
+
+}
diff --git a/3rdParty/dpp/exception.h b/3rdParty/dpp/exception.h
index 576e67a812..005d9fd86f 100644
--- a/3rdParty/dpp/exception.h
+++ b/3rdParty/dpp/exception.h
@@ -1,201 +1,607 @@
-/************************************************************************************
- *
- * D++, A Lightweight C++ library for Discord
- *
- * Copyright 2021 Craig Edwards and D++ contributors 
- * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- ************************************************************************************/
-#pragma once
-#include <dpp/export.h>
-#include <string>
-#include <exception>
-#include <algorithm>
-
-namespace dpp {
-
-/**
- * @brief The dpp::exception class derives from std::exception and supports some other
- * ways of passing in error details such as via std::string.
- */
-class exception : public std::exception
-{
-protected:
-	/**
-	 * @brief Exception message
-	 */
-	std::string msg;
-
-public:
-
-	using std::exception::exception;
-
-	/**
-	 * @brief Construct a new exception object
-	 */
-	exception() = default;
-
-	/**
-	 * @brief Construct a new exception object
-	 * 
-	 * @param what reason message
-	 */
-	explicit exception(const char* what) : msg(what) { }
-
-	/**
-	 * @brief Construct a new exception object
-	 * 
-	 * @param what reason message
-	 * @param len length of reason message
-	 */
-	exception(const char* what, size_t len) : msg(what, len) { }
-
-	/**
-	 * @brief Construct a new exception object
-	 * 
-	 * @param what reason message
-	 */
-	explicit exception(const std::string& what) : msg(what) { }
-	
-	/**
-	 * @brief Construct a new exception object
-	 * 
-	 * @param what reason message
-	 */
-	explicit exception(std::string&& what) : msg(std::move(what)) { }
-
-	/**
-	 * @brief Construct a new exception object (copy constructor)
-	 */
-	exception(const exception&) = default;
-
-	/**
-	 * @brief Construct a new exception object (move constructor)
-	 */
-	exception(exception&&) = default;
-
-	/**
-	 * @brief Destroy the exception object
-	 */
-	~exception() override = default;
-
-	/**
-	 * @brief Copy assignment operator
-	 * 
-	 * @return exception& reference to self
-	 */
-	exception & operator = (const exception &) = default;
-
-	/**
-	 * @brief Move assignment operator
-	 * 
-	 * @return exception& reference to self
-	 */
-	exception & operator = (exception&&) = default;
-
-	/**
-	 * @brief Get exception message
-	 * 
-	 * @return const char* error message
-	 */
-	[[nodiscard]] const char* what() const noexcept override { return msg.c_str(); };
-
-};
-
-#ifndef _DOXYGEN_
-	#define derived_exception(name, ancestor) class name : public dpp::ancestor { \
-	public: \
-		using dpp::ancestor::ancestor; \
-		name() = default; \
-		explicit name(const char* what) : ancestor(what) { } \
-		name(const char* what, size_t len) : ancestor(what, len) { } \
-		explicit name(const std::string& what) : ancestor(what) { } \
-		explicit name(std::string&& what) : ancestor(what) { } \
-		name(const name&) = default; \
-		name(name&&) = default; \
-		~name() override = default; \
-		name & operator = (const name &) = default; \
-		name & operator = (name&&) = default; \
-		[[nodiscard]] const char* what() const noexcept override { return msg.c_str(); }; \
-	};
-#endif
-
-#ifdef _DOXYGEN_
-	/*
-	 * THESE DEFINITIONS ARE NOT THE REAL DEFINITIONS USED BY PROGRAM CODE.
-	 *
-	 * They exist only to cause Doxygen to emit proper documentation for the derived exception types.
-	 * Proper definitions are emitted by the `derived_exception` macro in the "else" section.
-	 */
-
-	/**
-	 * @brief Represents an error in logic, e.g. you asked the library to do something the Discord API does not support
-	 * @note This is a stub for documentation purposes. For full information on supported methods please see dpp::exception.
-	 */
-	class logic_exception : public dpp::exception { };
-	/**
-	 * @brief Represents an error reading or writing to a file
-	 * @note This is a stub for documentation purposes. For full information on supported methods please see dpp::exception.
-	 */
-	class file_exception : public dpp::exception { };
-	/**
-	 * @brief Represents an error establishing or maintaining a connection
-	 * @note This is a stub for documentation purposes. For full information on supported methods please see dpp::exception.
-	 */
-	class connection_exception : public dpp::exception { };
-	/**
-	 * @brief Represents an error with voice processing
-	 * @note This is a stub for documentation purposes. For full information on supported methods please see dpp::exception.
-	 */
-	class voice_exception : public dpp::exception { };
-	/**
-	 * @brief Represents an error on a REST API call, e.g. a HTTPS request
-	 * @note This is a stub for documentation purposes. For full information on supported methods please see dpp::exception.
-	 */
-	class rest_exception : public dpp::exception { };
-	/**
-	 * @brief Represents invalid length of argument being passed to a function
-	 * @note This is a stub for documentation purposes. For full information on supported methods please see dpp::exception.
-	 */
-	class length_exception : public dpp::exception { };
-	/**
-	 * @brief Represents inability to parse data, usually caused by malformed JSON or ETF
-	 * @note This is a stub for documentation purposes. For full information on supported methods please see dpp::exception.
-	 */
-	class parse_exception : public dpp::exception { };
-	/**
-	 * @brief Represents invalid access to dpp's cache or its members, which may or may not exist. 
-	 * @note This is a stub for documentation purposes. For full information on supported methods please see dpp::exception.
-	 */
-	class cache_exception : public dpp::exception { };
-	/**
-	 * @brief Represents an attempt to construct a cluster with an invalid bot token. 
-	 * @note This is a stub for documentation purposes. For full information on supported methods please see dpp::exception.
-	 */
-	class invalid_token_exception : public dpp::rest_exception { };
-#else
-	derived_exception(logic_exception, exception);
-	derived_exception(file_exception, exception);
-	derived_exception(connection_exception, exception);
-	derived_exception(voice_exception, exception);
-	derived_exception(rest_exception, exception);
-	derived_exception(invalid_token_exception, rest_exception);
-	derived_exception(length_exception, exception);
-	derived_exception(parse_exception, exception);
-	derived_exception(cache_exception, exception);
-#endif
-
-};
-
+/************************************************************************************
+ *
+ * D++, A Lightweight C++ library for Discord
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright 2021 Craig Edwards and D++ contributors 
+ * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ************************************************************************************/
+#pragma once
+#include <dpp/export.h>
+#include <string>
+#include <exception>
+#include <algorithm>
+
+namespace dpp {
+
+/**
+ * @brief Exception error codes possible for dpp::exception::code()
+ * 
+ * This list is a combined list of Discord's error codes, HTTP error codes, 
+ * zlib, opus and C library codes (e.g. DNS, socket etc). You may
+ * use these to easily identify a type of exception without having to resort
+ * to string comparison against dpp::exception::what()
+ * 
+ * For detailed descriptions of each error code, see the text description
+ * returned in `what()`.
+ * 
+ * @note Some exceptions MAY have error codes which are NOT in this list
+ * in the event a C library is updated and adds new codes we did not document
+ * here. In this case, or where the code is not specific, refer to `what()`.
+ */
+enum exception_error_code {
+	err_no_code_specified = 0,
+	err_zlib_see_errno = -1,
+	err_zlib_init_stream = -2,
+	err_zlib_init_data = -3,
+	err_zlib_init_mem = -4,
+	err_zlib_init_buffer = -5,
+	err_zlib_init_version = -6,
+	err_opus_bad_arg = -11,
+	err_opus_buffer_too_small = -12,
+	err_opus_internal_error = -13,
+	err_opus_invalid_packet = -14,
+	err_opus_unimplemented = -15,
+	err_opus_invalid_state = -16, 
+	err_opus_alloc_fail = -17,
+	err_dns_bad_flags = -21,
+	err_name_or_service_unknown = -22,
+	err_dns_again = -23,
+	err_dns_fail = -24,
+	err_dns_family = -26,
+	err_dns_socket_type = -27,
+	err_dns_service = -28,
+	err_dns_memory = -30,
+	err_dns_system_error = -31,
+	err_dns_overflow = -32,
+	err_ssl_new = 1,
+	err_ssl_connect = 2,
+	err_write = 3,
+	err_ssl_write = 4,
+	err_no_sessions_left = 5,
+	err_auto_shard = 6,
+	err_reconnection = 7,
+	err_bind_failure = 8,
+	err_nonblocking_failure = 9,
+	err_voice_terminating = 10,
+	err_connect_failure = 11,
+	err_ssl_context = 12,
+	err_ssl_version = 13,
+	err_invalid_socket = 14,
+	err_socket_error = 15,
+	err_websocket_proto_already_set = 16,
+	err_command_handler_not_ready = 17,
+	err_no_owning_message = 18,
+	err_cancelled_event = 19,
+	err_event_status = 20,
+	err_event_start_time = 21,
+	err_event_end_time = 22,
+	err_command_has_caps = 23,
+	err_choice_autocomplete = 24,
+	err_interaction = 25,
+	err_too_many_component_rows = 26,
+	err_invalid_webhook = 27,
+	err_voice_state_timestamp = 28,
+	err_no_voice_support = 29,
+	err_invalid_voice_packet_length = 30,
+	err_opus = 31,
+	err_cant_start_shard = 32,
+	err_etf = 33,
+	err_cache = 34,
+	err_icon_size = 35,
+	err_massive_audio = 36,
+	err_unknown = 37,
+	err_bad_request = 400,
+	err_unauthorized = 401,
+	err_payment_required = 402,
+	err_forbidden = 403,
+	err_not_found = 404,
+	err_method_not_allowed = 405,
+	err_not_acceptable = 406,
+	err_proxy_auth_required = 407,
+	err_request_timeout = 408,
+	err_conflict = 409,
+	err_gone = 410,
+	err_length_required = 411,
+	err_precondition_failed = 412,
+	err_payload_too_large = 413,
+	err_uri_too_long = 414,
+	err_unsupported_media_type = 415,
+	err_range_not_satisfiable = 416,
+	err_expectation_failed = 417,
+	err_im_a_teapot = 418,
+	err_page_expired = 419,
+	err_twitter_rate_limited = 420,
+	err_misdirected_request = 421,
+	err_unprocessable_content = 422,
+	err_webdav_locked = 423,
+	err_webdav_failed_dependency = 424,
+	err_too_early = 425,
+	err_upgrade_required = 426,
+	err_precondition_required = 428,
+	err_rate_limited = 429,
+	err_request_headers_too_large = 431,
+	err_page_blocked = 450,
+	err_unavailable_for_legal_reasons = 451,
+	err_http_request_on_https_port = 497,
+	err_internal_server_error = 500,
+	err_not_implemented = 501,
+	err_bad_gateway = 502,
+	err_service_unavailable = 503,
+	err_gateway_timeout = 504,
+	err_http_version_not_supported = 505,
+	err_variant_also_negotiates = 506,
+	err_webdav_insufficient_storage = 507,
+	err_webdav_loop_detected = 508,
+	err_bandwidth_limit_exceeded = 509,
+	err_not_extended = 510,
+	err_network_auth_required = 511,
+	err_web_server_down = 521,
+	err_connection_timed_out = 522,
+	err_origin_unreachable = 523,
+	err_timeout = 524,
+	err_ssl_handshake_failed = 525,
+	err_invalid_ssl_certificate = 526,
+	err_railgun = 527,
+	err_cloudflare = 530,	
+	err_websocket_unknown = 4000,
+	err_websocket_bad_opcode= 4001,
+	err_websocket_decode = 4002,
+	err_websocket_not_authenticated = 4003,
+	err_websocket_authentication_failed = 4004,
+	err_websocket_already_authenticated = 4005,
+	err_websocket_invalid_seq_number = 4007,
+	err_websocket_rate_limited = 4008,
+	err_websocket_session_timeout = 4009,
+	err_websocket_invalid_shard = 4010,
+	err_websocket_sharding_required = 4011,
+	err_websocket_invalid_api_version = 4012,
+	err_websocket_invalid_intents = 4013,
+	err_websocket_disallowed_intents = 4014,
+	err_websocket_voice_disconnected = 4014,
+	err_websocket_voice_server_crashed = 4015,
+	err_websocket_voice_unknown_encryption = 4016,
+	err_compression_stream = 6000,
+	err_compression_data = 6001,
+	err_compression_memory = 6002,
+	err_unknown_account = 10001,
+	err_unknown_application = 10002,
+	err_unknown_channel = 10003,
+	err_unknown_guild = 10004,
+	err_unknown_integration = 10005,
+	err_unknown_invite = 10006,
+	err_unknown_member = 10007,
+	err_unknown_message = 10008,
+	err_unknown_permission_overwrite = 10009,
+	err_unknown_provider = 10010,
+	err_unknown_role = 10011,
+	err_unknown_token = 10012,
+	err_unknown_user = 10013,
+	err_unknown_emoji = 10014,
+	err_unknown_webhook = 10015,
+	err_unknown_webhook_service = 10016,
+	err_unknown_session = 10020,
+	err_unknown_ban = 10026,
+	err_unknown_sku = 10027,
+	err_unknown_store_listing = 10028,
+	err_unknown_entitlement = 10029,
+	err_unknown_build = 10030,
+	err_unknown_lobby = 10031,
+	err_unknown_branch = 10032,
+	err_unknown_store_directory_layout = 10033,
+	err_unknown_redistributable = 10036,
+	err_unknown_gift_code = 10038,
+	err_unknown_stream = 10049,
+	err_unknown_premium_server_subscribe_cooldown = 10050,
+	err_unknown_guild_template = 10057,
+	err_unknown_discoverable_server_category = 10059,
+	err_unknown_sticker = 10060,
+	err_unknown_interaction = 10062,
+	err_unknown_application_command = 10063,
+	err_unknown_voice_state = 10065,
+	err_unknown_application_command_permissions = 10066,
+	err_unknown_stage_instance = 10067,
+	err_unknown_guild_member_verification_form = 10068,
+	err_unknown_guild_welcome_screen = 10069,
+	err_unknown_guild_scheduled_event = 10070,
+	err_unknown_guild_scheduled_event_user = 10071,
+	err_unknown_tag = 10087,
+	err_bots_cannot_use_this_endpoint = 20001,
+	err_only_bots_can_use_this_endpoint = 20002,
+	err_explicit_content = 20009,
+	err_unauthorized_for_application = 20012,
+	err_slowmode_rate_limit = 20016,
+	err_owner_only = 20018,
+	err_announcement_rate_limit = 20022,
+	err_under_minimum_age = 20024,
+	err_write_rate_limit = 20029,
+	err_stage_banned_words = 20031,
+	err_guild_premium_subscription_level_too_low = 20035,
+	err_guilds = 30001,
+	err_friends = 30002,
+	err_pins_for_the_channel = 30003,
+	err_recipients = 30004,
+	err_guild_roles = 30005,
+	err_webhooks = 30007,
+	err_emojis = 30008,
+	err_reactions = 30010,
+	err_group_dms = 30011,
+	err_guild_channels = 30013,
+	err_attachments_in_a_message = 30015,
+	err_invites = 30016,
+	err_animated_emojis = 30018,
+	err_server_members = 30019,
+	err_server_categories = 30030,
+	err_guild_already_has_a_template = 30031,
+	err_application_commands = 30032,
+	err_thread_participants = 30033,
+	err_daily_application_command_creates = 30034,
+	err_bans_for_non_guild_members_have_been_exceeded = 30035,
+	err_bans_fetches = 30037,
+	err_uncompleted_guild_scheduled_events = 30038,
+	err_stickers = 30039,
+	err_prune_requests = 30040,
+	err_guild_widget_settings_updates = 30042,
+	err_edits_to_messages_older_than_1_hour = 30046,
+	err_pinned_threads_in_a_forum_channel = 30047,
+	err_tags_in_a_forum_channel = 30048,
+	err_bitrate_is_too_high_for_channel_of_this_type = 30052,
+	err_premium_emojis = 30056,
+	err_webhooks_per_guild = 30058,
+	err_channel_permission_overwrites = 30060,
+	err_the_channels_for_this_guild_are_too_large = 30061,
+	err_unauthorized_invalid_token = 40001,
+	err_verify_your_account = 40002,
+	err_you_are_opening_direct_messages_too_fast = 40003,
+	err_send_messages_has_been_temporarily_disabled = 40004,
+	err_request_entity_too_large = 40005,
+	err_this_feature_has_been_temporarily_disabled_server_side = 40006,
+	err_the_user_is_banned_from_this_guild = 40007,
+	err_connection_has_been_revoked = 40012,
+	err_target_user_is_not_connected_to_voice = 40032,
+	err_this_message_has_already_been_crossposted = 40033,
+	err_an_application_command_with_that_name_already_exists = 40041,
+	err_application_interaction_failed_to_send = 40043,
+	err_cannot_send_a_message_in_a_forum_channel = 40058,
+	err_interaction_has_already_been_acknowledged = 40060,
+	err_tag_names_must_be_unique = 40061,
+	err_service_resource_is_being_rate_limited = 40062,
+	err_no_tags_available = 40066,
+	err_tag_required = 40067,
+	err_entitlement_already_granted = 40074,
+	err_missing_access = 50001,
+	err_invalid_account_type = 50002,
+	err_cannot_execute_action_on_a_dm_channel = 50003,
+	err_guild_widget_disabled = 50004,
+	err_cannot_edit_a_message_by_other_user = 50005,
+	err_cannot_send_empty_message = 50006,
+	err_cannot_send_messages_to_this_user = 50007,
+	err_cannot_send_messages_in_a_non_text_channel = 50008,
+	err_channel_verification_level_too_high = 50009,
+	err_oauth2_application_does_not_have_a_bot = 50010,
+	err_oauth2_application_limit = 50011,
+	err_invalid_oauth2_state = 50012,
+	err_permissions = 50013,
+	err_invalid_authentication_token = 50014,
+	err_note_was_too_long = 50015,
+	err_too_few_or_too_many_messages = 50016,
+	err_invalid_mfa_level = 50017,
+	err_invalid_pin = 50019,
+	err_invite_code_invalid = 50020,
+	err_system_message = 50021,
+	err_channel_type = 50024,
+	err_invalid_oauth2_access_token = 50025,
+	err_missing_required_oauth2_scope = 50026,
+	err_invalid_webhook_token = 50027,
+	err_invalid_role = 50028,
+	err_invalid_recipients = 50033,
+	err_too_old_to_bulk_delete = 50034,
+	err_invalid_form_body = 50035,
+	err_invite_error = 50036,
+	err_invalid_activity_action = 50039,
+	err_invalid_api_version_provided = 50041,
+	err_file_uploaded_exceeds_the_maximum_size = 50045,
+	err_invalid_file_uploaded = 50046,
+	err_cannot_self_redeem_this_gift = 50054,
+	err_invalid_guild = 50055,
+	err_invalid_sku = 50057,
+	err_invalid_request_origin = 50067,
+	err_invalid_message_type = 50068,
+	err_payment_source_required = 50070,
+	err_cannot_modify_a_system_webhook = 50073,
+	err_cannot_delete_a_channel_required_for_community_guilds = 50074,
+	err_cannot_edit_stickers_within_a_message = 50080,
+	err_invalid_sticker_sent = 50081,
+	err_tried_to_perform_an_operation_on_an_archived_thread = 50083,
+	err_invalid_thread_notification_settings = 50084,
+	err_before_value_is_earlier_than_the_thread_creation_date = 50085,
+	err_community_server_channels_must_be_text_channels = 50086,
+	err_bad_event_entity_type = 50091,
+	err_this_server_is_not_available_in_your_location = 50095,
+	err_monetization_enabled_in_order_to_perform_this_action = 50097,
+	err_more_boosts_to_perform_this_action = 50101,
+	err_the_request_body_contains_invalid_json = 50109,
+	err_owner_cannot_be_pending_member = 50131,
+	err_ownership_cannot_be_transferred_to_a_bot_user = 50132,
+	err_failed_to_resize_asset_below_the_maximum_size = 50138,
+	err_cannot_mix_subscription_and_non_subscription_roles_for_an_emoji = 50144,
+	err_cannot_convert_between_premium_emoji_and_normal_emoji = 50145,
+	err_uploaded_file_not_found = 50146,
+	err_voice_messages_do_not_support_additional_content = 50159,
+	err_voice_messages_must_have_a_single_audio_attachment = 50160,
+	err_voice_messages_must_have_supporting_metadata = 50161,
+	err_voice_messages_cannot_be_edited = 50162,
+	err_cannot_delete_guild_subscription_integration = 50163,
+	err_you_cannot_send_voice_messages_in_this_channel = 50173,
+	err_the_user_account_must_first_be_verified = 50178,
+	err_you_do_not_have_permission_to_send_this_sticker = 50600,
+	err_two_factor_is_required_for_this_operation = 60003,
+	err_no_users_with_discordtag_exist = 80004,
+	err_reaction_was_blocked = 90001,
+	err_user_cannot_use_burst_reactions = 90002,
+	err_application_not_yet_available = 110001,
+	err_api_resource_is_currently_overloaded = 130000,
+	err_the_stage_is_already_open = 150006,
+	err_cannot_reply_without_permission_to_read_message_history = 160002,
+	err_a_thread_has_already_been_created_for_this_message = 160004,
+	err_thread_is_locked = 160005,
+	err_active_threads = 160006,
+	err_active_announcement_threads = 160007,
+	err_invalid_json_for_uploaded_lottie_file = 170001,
+	err_uploaded_lotties_cannot_contain_rasterized_images = 170002,
+	err_sticker_maximum_framerate = 170003,
+	err_sticker_frame_count = 170004,
+	err_lottie_animation_dimensions = 170005,
+	err_sticker_frame_rate = 170006,
+	err_sticker_animation_duration = 170007,
+	err_cannot_update_a_finished_event = 180000,
+	err_failed_to_create_stage_needed_for_stage_event = 180002,
+	err_message_was_blocked_by_automatic_moderation = 200000,
+	err_title_was_blocked_by_automatic_moderation = 200001,
+	err_webhooks_posted_to_forum_channels_must_have_a_thread_name_or_thread_id = 220001,
+	err_webhooks_posted_to_forum_channels_cannot_have_both_a_thread_name_and_thread_id = 220002,
+	err_webhooks_can_only_create_threads_in_forum_channels = 220003,
+	err_webhook_services_cannot_be_used_in_forum_channels = 220004,
+	err_message_blocked_links = 240000,
+	err_cannot_enable_onboarding_requirements_are_not_met = 350000,
+	err_cannot_update_onboarding_below_requirements = 350001,
+};
+
+/**
+ * @brief The dpp::exception class derives from std::exception and supports some other
+ * ways of passing in error details such as via std::string.
+ */
+class exception : public std::exception
+{
+protected:
+	/**
+	 * @brief Exception message
+	 */
+	std::string msg;
+
+	/**
+	 * @brief Exception error code
+	 */
+	exception_error_code error_code;
+
+public:
+
+	using std::exception::exception;
+
+	/**
+	 * @brief Construct a new exception object
+	 */
+	exception() = default;
+
+	/**
+	 * @brief Construct a new exception object
+	 * 
+	 * @param what reason message
+	 */
+	explicit exception(const char* what) : msg(what), error_code(err_no_code_specified) { }
+
+	/**
+	 * @brief Construct a new exception object
+	 * 
+	 * @param what reason message
+	 * @param code Exception code
+	 */
+	explicit exception(exception_error_code code, const char* what) : msg(what), error_code(code) { }
+
+	/**
+	 * @brief Construct a new exception object
+	 * 
+	 * @param what reason message
+	 * @param len length of reason message
+	 */
+	exception(const char* what, size_t len) : msg(what, len), error_code(err_no_code_specified) { }
+
+	/**
+	 * @brief Construct a new exception object
+	 * 
+	 * @param what reason message
+	 */
+	explicit exception(const std::string& what) : msg(what), error_code(err_no_code_specified) { }
+	
+	/**
+	 * @brief Construct a new exception object
+	 * 
+	 * @param what reason message
+	 * @param code Exception code
+	 */
+	explicit exception(exception_error_code code, const std::string& what) : msg(what), error_code(code) { }
+	
+	/**
+	 * @brief Construct a new exception object
+	 * 
+	 * @param what reason message
+	 */
+	explicit exception(std::string&& what) : msg(std::move(what)) { }
+
+	/**
+	 * @brief Construct a new exception object
+	 * 
+	 * @param what reason message
+	 * @param code Exception code
+	 */
+	explicit exception(exception_error_code code, std::string&& what) : msg(std::move(what)), error_code(code) { }
+
+	/**
+	 * @brief Construct a new exception object (copy constructor)
+	 */
+	exception(const exception&) = default;
+
+	/**
+	 * @brief Construct a new exception object (move constructor)
+	 */
+	exception(exception&&) = default;
+
+	/**
+	 * @brief Destroy the exception object
+	 */
+	~exception() override = default;
+
+	/**
+	 * @brief Copy assignment operator
+	 * 
+	 * @return exception& reference to self
+	 */
+	exception & operator = (const exception &) = default;
+
+	/**
+	 * @brief Move assignment operator
+	 * 
+	 * @return exception& reference to self
+	 */
+	exception & operator = (exception&&) = default;
+
+	/**
+	 * @brief Get exception message
+	 * 
+	 * @return const char* error message
+	 */
+	[[nodiscard]] const char* what() const noexcept override { return msg.c_str(); };
+
+	/**
+	 * @brief Get exception code
+	 * 
+	 * @return exception_error_code error code
+	 */
+	[[nodiscard]] exception_error_code code() const noexcept { return error_code; };
+
+};
+
+#ifndef _DOXYGEN_
+	#define derived_exception(name, ancestor) class name : public dpp::ancestor { \
+	public: \
+		using dpp::ancestor::ancestor; \
+		name() = default; \
+		explicit name(const char* what) : ancestor(what) { } \
+		explicit name(exception_error_code code, const char* what) : ancestor(code, what) { } \
+		name(const char* what, size_t len) : ancestor(what, len) { } \
+		explicit name(const std::string& what) : ancestor(what) { } \
+		explicit name(exception_error_code code, const std::string& what) : ancestor(code, what) { } \
+		explicit name(std::string&& what) : ancestor(what) { } \
+		explicit name(exception_error_code code, std::string&& what) : ancestor(code, what) { } \
+		name(const name&) = default; \
+		name(name&&) = default; \
+		~name() override = default; \
+		name & operator = (const name &) = default; \
+		name & operator = (name&&) = default; \
+		[[nodiscard]] const char* what() const noexcept override { return msg.c_str(); }; \
+		[[nodiscard]] exception_error_code code() const noexcept { return error_code; }; \
+	};
+#endif
+
+#ifdef _DOXYGEN_
+	/*
+	 * THESE DEFINITIONS ARE NOT THE REAL DEFINITIONS USED BY PROGRAM CODE.
+	 *
+	 * They exist only to cause Doxygen to emit proper documentation for the derived exception types.
+	 * Proper definitions are emitted by the `derived_exception` macro in the "else" section.
+	 */
+
+	/**
+	 * @brief Represents an error in logic, e.g. you asked the library to do something the Discord API does not support
+	 * @note This is a stub for documentation purposes. For full information on supported methods please see dpp::exception.
+	 */
+	class logic_exception : public dpp::exception { };
+	/**
+	 * @brief Represents an error reading or writing to a file
+	 * @note This is a stub for documentation purposes. For full information on supported methods please see dpp::exception.
+	 */
+	class file_exception : public dpp::exception { };
+	/**
+	 * @brief Represents an error establishing or maintaining a connection
+	 * @note This is a stub for documentation purposes. For full information on supported methods please see dpp::exception.
+	 */
+	class connection_exception : public dpp::exception { };
+	/**
+	 * @brief Represents an error with voice processing
+	 * @note This is a stub for documentation purposes. For full information on supported methods please see dpp::exception.
+	 */
+	class voice_exception : public dpp::exception { };
+	/**
+	 * @brief Represents an error on a REST API call, e.g. a HTTPS request
+	 * @note This is a stub for documentation purposes. For full information on supported methods please see dpp::exception.
+	 */
+	class rest_exception : public dpp::exception { };
+	/**
+	 * @brief Represents invalid length of argument being passed to a function
+	 * @note This is a stub for documentation purposes. For full information on supported methods please see dpp::exception.
+	 */
+	class length_exception : public dpp::exception { };
+	/**
+	 * @brief Represents inability to parse data, usually caused by malformed JSON or ETF
+	 * @note This is a stub for documentation purposes. For full information on supported methods please see dpp::exception.
+	 */
+	class parse_exception : public dpp::exception { };
+	/**
+	 * @brief Represents invalid access to dpp's cache or its members, which may or may not exist. 
+	 * @note This is a stub for documentation purposes. For full information on supported methods please see dpp::exception.
+	 */
+	class cache_exception : public dpp::exception { };
+	/**
+	 * @brief Represents an attempt to construct a cluster with an invalid bot token.
+	 * @note This is a stub for documentation purposes. For full information on supported methods please see dpp::exception.
+	 */
+	class invalid_token_exception : public dpp::rest_exception { };
+#ifndef DPP_NO_CORO
+	/**
+	 * @brief Represents the cancellation of a task. Will be thrown to the awaiter of a cancelled task.
+	 * @note This is a stub for documentation purposes. For full information on supported methods please see dpp::exception.
+	 */
+	class task_cancelled_exception : public dpp::exception { };
+#endif /* DPP_NO_CORO */
+#else
+	derived_exception(logic_exception, exception);
+	derived_exception(file_exception, exception);
+	derived_exception(connection_exception, exception);
+	derived_exception(voice_exception, exception);
+	derived_exception(encryption_exception, voice_exception);
+	derived_exception(decryption_exception, voice_exception);
+	derived_exception(rest_exception, exception);
+	derived_exception(invalid_token_exception, rest_exception);
+	derived_exception(length_exception, exception);
+	derived_exception(parse_exception, exception);
+	derived_exception(cache_exception, exception);
+#  ifndef DPP_NO_CORO
+	derived_exception(task_cancelled_exception, exception);
+#  endif /* DPP_NO_CORO */
+#endif
+
+}
+
diff --git a/3rdParty/dpp/export.h b/3rdParty/dpp/export.h
index 423729c98d..e0e560a4ca 100644
--- a/3rdParty/dpp/export.h
+++ b/3rdParty/dpp/export.h
@@ -1,66 +1,148 @@
-/************************************************************************************
- *
- * D++, A Lightweight C++ library for Discord
- *
- * Copyright 2021 Craig Edwards and D++ contributors
- * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- ************************************************************************************/
-#pragma once
-
-/* Compile-time check for C++17.
- * Either one of the following causes a compile time error:
- * __cplusplus not defined at all (this means we are being compiled on a C compiler)
- * MSVC defined and _MSVC_LANG < 201703L (Visual Studio, but not C++17 or newer)
- * MSVC not defined and __cplusplus < 201703L (Non-visual studio, but not C++17 or newer)
- * The additional checks are required because MSVC doesn't correctly set __cplusplus to 201703L,
- * which is hugely non-standard, but apparently "it broke stuff" so they dont ever change it
- * from C++98. Ugh.
- */
-#if (!defined(__cplusplus) || (defined(_MSC_VER) && (!defined(_MSVC_LANG) || _MSVC_LANG < 201703L)) || (!defined(_MSC_VER) && __cplusplus < 201703L))
-	#error "D++ Requires a C++17 compatible C++ compiler. Please ensure that you have enabled C++17 in your compiler flags."
-#endif
-
-#ifndef DPP_STATIC
-	/* Dynamic linked build as shared object or dll */
-	#ifdef DPP_BUILD
-		/* Building the library */
-		#ifdef _WIN32
-			#include <dpp/win32_safe_warnings.h>
-			#define DPP_EXPORT __declspec(dllexport)
-		#else
-			#define DPP_EXPORT
-		#endif
-	#else
-		/* Including the library */
-		#ifdef _WIN32
-			#define DPP_EXPORT __declspec(dllimport)
-		#else
-			#define DPP_EXPORT
-		#endif
-	#endif
-#else
-	/* Static linked build */
-	#if defined(_WIN32) && defined(DPP_BUILD)
-		#include <dpp/win32_safe_warnings.h>
-	#endif
-	#define DPP_EXPORT
-#endif
-
-#ifndef _WIN32
-	#define SOCKET int
-#else
-	#include <WinSock2.h>
-#endif
\ No newline at end of file
+/************************************************************************************
+ *
+ * D++, A Lightweight C++ library for Discord
+ *
+ * Copyright 2021 Craig Edwards and D++ contributors
+ * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ************************************************************************************/
+#pragma once
+
+/* Compile-time check for C++17.
+ * Either one of the following causes a compile time error:
+ * __cplusplus not defined at all (this means we are being compiled on a C compiler)
+ * MSVC defined and _MSVC_LANG < 201703L (Visual Studio, but not C++17 or newer)
+ * MSVC not defined and __cplusplus < 201703L (Non-visual studio, but not C++17 or newer)
+ * The additional checks are required because MSVC doesn't correctly set __cplusplus to 201703L,
+ * which is hugely non-standard, but apparently "it broke stuff" so they dont ever change it
+ * from C++98. Ugh.
+ */
+#if (!defined(__cplusplus) || (defined(_MSC_VER) && (!defined(_MSVC_LANG) || _MSVC_LANG < 201703L)) || (!defined(_MSC_VER) && __cplusplus < 201703L))
+	#error "D++ Requires a C++17 compatible C++ compiler. Please ensure that you have enabled C++17 in your compiler flags."
+#endif
+
+/* If not using c++20, define DPP_CPP17_COMPAT and DPP_NO_CORO if DPP_NO_CORO is not already defined.
+ */
+#if !(defined(__cplusplus) && __cplusplus >= 202002L) && !(defined(_MSVC_LANG) && _MSVC_LANG >= 202002L)
+	#define DPP_CPP17_COMPAT
+	#if !defined(DPP_CORO) || !DPP_CORO // Allow overriding this because why not
+		#ifndef DPP_NO_CORO
+			#define DPP_NO_CORO
+		#endif
+	#endif
+#endif
+
+#ifndef DPP_STATIC
+	/* Dynamic linked build as shared object or dll */
+	#ifdef DPP_BUILD
+		/* Building the library */
+		#ifdef _WIN32
+			#include <dpp/win32_safe_warnings.h>
+			#define DPP_EXPORT __declspec(dllexport)
+		#else
+			#define DPP_EXPORT
+		#endif
+	#else
+		/* Including the library */
+		#ifdef _WIN32
+			#define DPP_EXPORT __declspec(dllimport)
+		#else
+			#define DPP_EXPORT
+		#endif
+	#endif
+#else
+	/* Static linked build */
+	#if defined(_WIN32) && defined(DPP_BUILD)
+		#include <dpp/win32_safe_warnings.h>
+	#endif
+	#define DPP_EXPORT
+#endif
+
+namespace dpp {
+
+/**
+ * @brief Represents a build configuration. On some platforms (e.g. Windows) release isn't compatible with debug, so we use this enum to detect it.
+ */
+enum class build_type {
+	/**
+	 * @brief Universal build, works with both debug and release
+	 */
+	universal,
+
+	/**
+	 * @brief Debug build
+	 */
+	debug,
+
+	/**
+	 * @brief Release build
+	 */
+	release
+};
+
+template <build_type>
+extern bool DPP_EXPORT validate_configuration();
+
+#if defined(UE_BUILD_DEBUG) || defined(UE_BUILD_DEVELOPMENT) || defined(UE_BUILD_TEST) || defined(UE_BUILD_SHIPPING) || defined(UE_GAME) || defined(UE_EDITOR) || defined(UE_BUILD_SHIPPING_WITH_EDITOR) || defined(UE_BUILD_DOCS)
+	/*
+	 * We need to tell DPP to NOT do the version checker if something from Unreal Engine is defined.
+	 * We have to do this because UE is causing some weirdness where the version checker is broken and always errors.
+	 * This is really only for DPP-UE. There is no reason to not do the version checker unless you are in Unreal Engine.
+	 */
+	#define DPP_BYPASS_VERSION_CHECKING
+#endif /* UE */
+
+#ifndef DPP_BUILD /* when including dpp */
+	/**
+	 * Version checking, making sure the program is in a configuration compatible with DPP's.
+	 *
+	 * Do NOT make these variables constexpr.
+	 * We want them to initialize at runtime so the function can be pulled from the shared library object.
+	 */
+	#ifndef DPP_BYPASS_VERSION_CHECKING
+		#if defined(_WIN32)
+			#ifdef _DEBUG
+				inline const bool is_valid_config = validate_configuration<build_type::debug>();
+			#else
+				inline const bool is_valid_config = validate_configuration<build_type::release>();
+			#endif /* _DEBUG */
+		#else
+			inline const bool is_valid_config = validate_configuration<build_type::universal>();
+		#endif /* _WIN32 */
+	#endif /* !DPP_BYPASS_VERSION_CHECKING */
+#endif /* !DPP_BUILD */
+
+}
+
+#ifdef _WIN32
+	#ifndef NOMINMAX
+		#define NOMINMAX
+	#endif
+
+	#include <WinSock2.h>
+#endif
+
+#ifdef _DOXYGEN_
+	/** @brief Macro that expands to [[deprecated(reason)]] when including the library, nothing when building the library */
+	#define DPP_DEPRECATED(reason)
+#else /* !_DOXYGEN_ */
+	#if defined(DPP_BUILD) || defined(DPP_NO_DEPRECATED)
+		/** @brief Macro that expands to [[deprecated(reason)]] when including the library, nothing when building the library */
+		#define DPP_DEPRECATED(reason)
+	#else
+		/** @brief Macro that expands to [[deprecated(reason)]] when including the library, nothing when building the library */
+		#define DPP_DEPRECATED(reason) [[deprecated(reason)]]
+	#endif
+#endif /* _DOXYGEN_ */
diff --git a/3rdParty/dpp/guild.h b/3rdParty/dpp/guild.h
index 0684705c65..b5f17e10f7 100644
--- a/3rdParty/dpp/guild.h
+++ b/3rdParty/dpp/guild.h
@@ -1,980 +1,2052 @@
-/************************************************************************************
- *
- * D++, A Lightweight C++ library for Discord
- *
- * Copyright 2021 Craig Edwards and D++ contributors
- * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- ************************************************************************************/
-#pragma once
-#include <dpp/export.h>
-#include <dpp/user.h>
-#include <dpp/snowflake.h>
-#include <dpp/managed.h>
-#include <dpp/utility.h>
-#include <dpp/voicestate.h>
-#include <dpp/permissions.h>
-#include <string>
-#include <unordered_map>
-#include <dpp/json_interface.h>
-
-namespace dpp {
-
-class channel;
-
-/**
- * @brief Represents voice regions for guilds and channels.
- * @deprecated Deprecated in favour of per-channel regions.
- * Please use channel::rtc_region instead.
- */
-enum region : uint8_t {
-	r_brazil,		//!< Brazil
-	r_central_europe,	//!< Central Europe
-	r_hong_kong,		//!< Hong Kong
-	r_india,		//!< India
-	r_japan,		//!< Japan
-	r_russia,		//!< Russia
-	r_singapore,		//!< Singapore
-	r_south_africa,		//!< South Africa
-	r_sydney,		//!< Sydney
-	r_us_central,		//!< US Central
-	r_us_east,		//!< US East Coast
-	r_us_south,		//!< US South
-	r_us_west,		//!< US West Coast
-	r_western_europe	//!< Western Europe
-};
-
-/**
- * @brief The various flags that represent the status of a dpp::guild object
- */
-enum guild_flags : uint32_t {
-	/** Large guild */
-	g_large =				0b00000000000000000000000000000001,
-	/** Unavailable guild (inaccessible due to an outage) */
-	g_unavailable = 			0b00000000000000000000000000000010,
-	/** Guild has widget enabled */
-	g_widget_enabled =			0b00000000000000000000000000000100,
-	/** Guild can  have an invite splash image */
-	g_invite_splash =			0b00000000000000000000000000001000,
-	/** Guild can have VIP regions */
-	g_vip_regions =				0b00000000000000000000000000010000,
-	/** Guild can have a vanity url */
-	g_vanity_url =				0b00000000000000000000000000100000,
-	/** Guild is verified */
-	g_verified =				0b00000000000000000000000001000000,
-	/** Guild is partnered */
-	g_partnered =				0b00000000000000000000000010000000,
-	/** Community features enabled */
-	g_community =				0b00000000000000000000000100000000,
-	/** Guild has commerce features enabled
-	 * @deprecated Removed by Discord
-	 */
-	g_commerce =				0b00000000000000000000001000000000,
-	/** Guild has access to create announcement channels */
-	g_news =				0b00000000000000000000010000000000,
-	/** Guild is discoverable in discovery */
-	g_discoverable =			0b00000000000000000000100000000000,
-	/** Guild is featureable */
-	g_featureable =				0b00000000000000000001000000000000,
-	/** Guild can have an animated icon (doesn't mean it actually has one though) */
-	g_animated_icon =			0b00000000000000000010000000000000,
-	/** Guild can have a banner image */
-	g_banner =				0b00000000000000000100000000000000,
-	/** Guild has a welcome screen */
-	g_welcome_screen_enabled =		0b00000000000000001000000000000000,
-	/** Guild has a member verification gate */
-	g_member_verification_gate =		0b00000000000000010000000000000000,
-	/** Guild has a preview */
-	g_preview_enabled =			0b00000000000000100000000000000000,
-	/** Guild join notifications are off */
-	g_no_join_notifications =		0b00000000000001000000000000000000,
-	/** Guild boost notifications are off */
-	g_no_boost_notifications =		0b00000000000010000000000000000000,
-	/** Guild has an actual animated icon (set by the icon hash starting with 'a_') */
-	g_has_animated_icon =			0b00000000000100000000000000000000,
-	/** Guild has an actual animated banner (set by the icon hash starting with 'a_') */
-	g_has_animated_banner =			0b00000000001000000000000000000000,
-	/** Guild setup tips are off */
-	g_no_setup_tips =			0b00000000010000000000000000000000,
-	/** "Wave to say hi" sticker prompt buttons are off */
-	g_no_sticker_greeting =			0b00000000100000000000000000000000,
-	/** guild has enabled monetization */
-	g_monetization_enabled =		0b00000001000000000000000000000000,
-	/** guild has increased custom sticker slots */
-	g_more_stickers =			0b00000010000000000000000000000000,
-	/** guild has access to create private threads
-	 * @deprecated Removed by Discord
-	 * */
-	g_private_threads =			0b00000100000000000000000000000000,
-	/** guild is able to set role icons */
-	g_role_icons =				0b00001000000000000000000000000000,
-	/** guild has access to the seven day archive time for threads */
-	g_seven_day_thread_archive =		0b00010000000000000000000000000000,
-	/** guild has access to the three day archive time for threads */
-	g_three_day_thread_archive =		0b00100000000000000000000000000000,
-	/** guild has enabled ticketed events */
-	g_ticketed_events =			0b01000000000000000000000000000000,
-	/** guild can have channel banners */
-	g_channel_banners =			0b10000000000000000000000000000000,
-};
-
-/**
- * @brief Additional boolean flag values for guild, as guild_flags is full
- */
-enum guild_flags_extra : uint8_t {
-	/** Guild has premium progress bar enabled */
-	g_premium_progress_bar_enabled =	0b00000001,
-	/** Guild can have an animated banner (doesn't mean it actually has one though) */
-	g_animated_banner =			0b00000010,
-	/** Guild has auto moderation */
-	g_auto_moderation =			0b00000100,
-	/** Guild has paused invites, preventing new users from joining */
-	g_invites_disabled =		0b00001000,
-	/** Guild has been set as support server of an app in the App Directory */
-	g_developer_support_server =	0b00010000,
-};
-
-/**
- * @brief Various flags that can be used to indicate the status of a guild member.
- * @note Use set_mute and set_deaf member functions and do not toggle the bits yourself.
- */
-enum guild_member_flags : uint8_t {
-	/** Member deafened in voice channels */
-	gm_deaf =		0b00000001,
-	/** Member muted in voice channels */
-	gm_mute =		0b00000010,
-	/** Member pending verification by membership screening */
-	gm_pending =		0b00000100,
-	/** Member has animated guild-specific avatar */
-	gm_animated_avatar = 	0b00001000,
-	/** gm_deaf or gm_mute has been toggled */
-	gm_voice_action = 		0b00010000,
-};
-
-/**
- * @brief Represents dpp::user membership upon a dpp::guild.
- * This contains the user's nickname, guild roles, and any other guild-specific flags.
- */
-class DPP_EXPORT guild_member {
-public:
-	/** Nickname, or empty string if they don't have a nickname on this guild */
-	std::string nickname;
-	/** List of roles this user has on this guild */
-	std::vector<snowflake> roles;
-	/** Guild id */
-	snowflake guild_id;
-	/** User id */
-	snowflake user_id;
-	/** User avatar (per-server avatar is a nitro only feature) */
-	utility::iconhash avatar;
-	/** timestamp of when the time out will be removed; until then, they cannot interact with the guild */
-	time_t communication_disabled_until;
-	/** Date and time the user joined the guild */
-	time_t joined_at;
-	/** Boosting since */
-	time_t premium_since;
-	/** A set of flags built from the bitmask defined by dpp::guild_member_flags */
-	uint8_t flags;
-
-	/** Default constructor */
-	guild_member();
-
-	/** Fill this object from a json object.
-	 * @param j The json object to get data from
-	 * @param g_id The guild id to associate the member with
-	 * @param u_id The user id to associate the member with
-	 * @return Reference to self for call chaining
-	 */
-	guild_member& fill_from_json(nlohmann::json* j, snowflake g_id, snowflake u_id);
-
-	/**
-	 * @brief Build json string for the member object
-	 * 
-	 * @param with_id Add ID to output
-	 * @return std::string json string
-	 */
-	std::string build_json(bool with_id = false) const;
-
-	/**
-	 * @brief Returns true if the user is in time-out (communication disabled)
-	 * 
-	 * @return true user is in time-out
-	 * @return false user is not in time-out
-	 */
-	bool is_communication_disabled() const;
-
-	/**
-	 * @brief Returns true if the user is deafened
-	 * 
-	 * @return true user is deafened
-	 * @return false user is not deafened
-	 */
-	bool is_deaf() const;
-
-	/**
-	 * @brief Returns true if the user is muted
-	 * 
-	 * @return true user muted
-	 * @return false user not muted
-	 */
-	bool is_muted() const;
-
-	/**
-	 * @brief Returns true if pending verification by membership screening
-	 * 
-	 * @return true user has completed membership screening
-	 * @return false user has not completed membership screening
-	 */
-	bool is_pending() const;
-
-	/**
-	 * @brief Returns true if the user's per-guild custom avatar is animated
-	 * 
-	 * @return true user's custom avatar is animated
-	 * @return false user's custom avatar is not animated
-	 */
-	bool has_animated_guild_avatar() const;
-
-	/**
-	 * @brief Returns the members per guild avatar if they have one, otherwise returns an empty string
-	 *
-	 * @note per-server avatar is a nitro only feature so it might be not set. If you need the real user avatar, use user::get_avatar_url.
-	 * 
-	 * @param size The size of the avatar in pixels. It can be any power of two between 16 and 4096. If not specified, the default sized avatar is returned.
-	 * @return std::string avatar url or empty string
-	 */
-	std::string get_avatar_url(uint16_t size = 0) const;
-
-	/**
-	 * @brief Set the nickname 
-	 * 
-	 * @param nick Nickname to set
-	 * 
-	 * @return guild_member& reference to self
-	 */
-	guild_member& set_nickname(const std::string& nick);
-
-	/**
-	 * @brief Get the dpp::user object for this member
-	 * @return dpp::user user object. If not in cache, it returns nullptr
-	 *
-	 * 
-	 */
-	dpp::user* get_user() const;
-
-	/**
-	 * @brief Set whether the user is muted in voice channels
-	 *
-	 * @param is_muted value to set, true if mute in voice channels
-	 * 
-	 * @return guild_member& reference to self 
-	 */
-	guild_member& set_mute(const bool is_muted);
-
-	/**
-	 * @brief Set whether the user is deafened in voice channels
-	 *
-	 * @param is_deafened value to set, true if deaf in voice channels
-	 * 
-	 * @return guild_member& reference to self 
-	 */
-	guild_member& set_deaf(const bool is_deafened);
-
-	/**
-	 * @brief Set communication_disabled_until
-	 *
-	 * @param timestamp timestamp until communication is disabled
-	 *
-	 * @return guild_member& reference to self
-	 */
-	guild_member& set_communication_disabled_until(const time_t timestamp);
-
-	/**
-	 * @brief Return a ping/mention for the user by nickname
-	 * 
-	 * @return std::string mention
-	 */
-	std::string get_mention() const;
-};
-
-/**
- * @brief Defines a channel on a server's welcome screen
- */
-struct welcome_channel_t {
-	/// the description shown for the channel
-	std::string description;
-	/// the emoji name if custom, the unicode character if standard, or null if no emoji is set
-	std::string emoji_name;
-	/// the channel's id
-	snowflake channel_id = 0;
-	/// the emoji id, if the emoji is custom
-	snowflake emoji_id = 0;
-};
-
-
-/**
- * @brief Defines a server's welcome screen
- */
-struct welcome_screen_t {
-	/// the server description shown in the welcome screen
-	std::string description;
-	/// the channels shown in the welcome screen, up to 5
-	std::vector<welcome_channel_t> welcome_channels;
-};
-
-/**
- * @brief Guild NSFW level.
- * Used to represent just how naughty this guild is. Naughty  guild, go sit in the corner.
- * @note This is set by Discord, and cannot be set by any bot or user on the guild.
- */
-enum guild_nsfw_level_t : uint8_t {
-	/// Default setting, not configured
-	nsfw_default		=	0,
-	/// Explicit content may be in this guild
-	nsfw_explicit		=	1,
-	/// Safe for work content only
-	nsfw_safe		=	2,
-	/// Age restricted, 18+
-	nsfw_age_restricted	=	3
-};
-
-/**
- * @brief explicit content filter level.
- * This is set by a guild admin, but can be forced to a setting if the server is verified,
- * partnered, official etc.
- */
-enum guild_explicit_content_t : uint8_t {
-	/// media content will not be scanned
-	expl_disabled =			0,
-	/// media content sent by members without roles will be scanned
-	expl_members_without_roles =	1,
-	/// media content sent by all members will be scanned
-	expl_all_members =		2
-};
-
-/**
- * @brief MFA level for server. If set to elevated all moderators need MFA to perform specific
- * actions such as kick or ban.
- */
-enum mfa_level_t : uint8_t {
-	/// MFA not elevated
-	mfa_none = 0,
-	/// MFA elevated
-	mfa_elevated = 1
-};
-
-/**
- * @brief Guild verification level
- */
-enum verification_level_t : uint8_t {
-	/// unrestricted
-	ver_none =	0,
-	/// must have verified email on account
-	ver_low	= 	1,
-	/// must be registered on Discord for longer than 5 minutes
-	ver_medium =	2,
-	/// must be a member of the server for longer than 10 minutes
-	ver_high =	3,
-	/// must have a verified phone number
-	ver_very_high =	4,
-};
-
-/**
- * @brief Default message notification level
- */
-enum default_message_notification_t: uint8_t {
-	/// members will receive notifications for all messages by default
-	dmn_all = 0,
-	///	members will receive notifications only for messages that \@mention them by default
-	dmn_only_mentions = 1,
-};
-
-/**
- * @brief Premium tier
- */
-enum guild_premium_tier_t: uint8_t {
-	/// guild has not unlocked any Server Boost perks
-	tier_none = 0,
-	/// guild has unlocked Server Boost level 1 perks
-	tier_1 = 1,
-	/// guild has unlocked Server Boost level 2 perks
-	tier_2 = 2,
-	/// guild has unlocked Server Boost level 3 perks
-	tier_3 = 3,
-};
-
-/**
- * @brief Voice AFK timeout values for guild::afk_timeout
- */
-enum guild_afk_timeout_t: uint8_t {
-	/// AFK timeout disabled
-	afk_off,
-	/// AFK timeout of 1 Minute
-	afk_60,
-	/// AFK timeout of 5 Minutes
-	afk_300,
-	/// AFK timeout of 15 Minutes
-	afk_900,
-	/// AFK timeout of 30 Minutes
-	afk_1800,
-	/// AFK timeout of 1 Hour
-	afk_3600,
-};
-
-/** @brief Guild members container
- */
-typedef std::unordered_map<snowflake, guild_member> members_container;
-
-/**
- * @brief Represents a guild on Discord (AKA a server)
- */
-class DPP_EXPORT guild : public managed, public json_interface<guild>  {
-public:
-	/** Guild name */
-	std::string name;
-
-	/** Server description */
-	std::string description;
-
-	/**
-	 * @brief Vanity url code for verified or partnered servers and boost level 3
-	 * @note This field cannot be set from the API. Attempts to change this value will be
-	 * silently ignored even if the correct number of boosts or verified/partnered status exist.
-	 * See: https://github.com/discord/discord-api-docs/issues/519
-	 */
-	std::string vanity_url_code;
-
-	/** Roles defined on this server */
-	std::vector<snowflake> roles;
-
-	/** List of channels on this server */
-	std::vector<snowflake> channels;
-
-	/** List of threads on this server */
-	std::vector<snowflake> threads;
-
-	/** List of emojis
-	*/
-	std::vector<snowflake> emojis;
-
-	/** List of members in voice channels in the guild.
-	 */
-	std::map<snowflake, voicestate> voice_members;
-
-	/** List of guild members. Note that when you first receive the
-	 * guild create event, this may be empty or near empty.
-	 * This depends upon your dpp::intents and the size of your bot.
-	 * It will be filled by guild member chunk requests.
-	 */
-	members_container members;
-
-	/** Welcome screen
-	 */
-	welcome_screen_t welcome_screen;
-
-	/** Guild icon hash */
-	utility::iconhash icon;
-
-	/** Guild splash hash */
-	utility::iconhash splash;
-
-	/** Guild discovery splash hash */
-	utility::iconhash discovery_splash;
-
-	/** Server banner hash */
-	utility::iconhash banner;
-
-	/** Snowflake id of guild owner */
-	snowflake owner_id;
-
-	/** Snowflake ID of AFK voice channel or 0 */
-	snowflake afk_channel_id;
-
-	/** ID of creating application, if any, or 0 */
-	snowflake application_id;
-
-	/** ID of system channel where discord update messages are sent */
-	snowflake system_channel_id;
-
-	/** ID of rules channel for communities */
-	snowflake rules_channel_id;
-
-	/** Public updates channel id or 0 */
-	snowflake public_updates_channel_id;
-
-	/** Snowflake ID of widget channel, or 0 */
-	snowflake widget_channel_id;
-
-	/** Approximate member count. May be sent as zero */
-	uint32_t member_count;
-
-	/** Flags bitmask as defined by values within dpp::guild_flags */
-	uint32_t flags;
-
-	/**
-	 * @brief the maximum number of presences for the guild.
-	 * @note Generally Discord always fills this with 0, apart from for the largest of guilds
-	 */
-	uint32_t max_presences;
-
-	/**
-	 * @brief the maximum number of members for the guild
-	 */
-	uint32_t max_members;
-
-	/** Shard ID of the guild */
-	uint16_t shard_id;
-
-	/** Number of boosters */
-	uint16_t premium_subscription_count;
-
-	/** Voice AFK timeout before moving users to AFK channel */
-	guild_afk_timeout_t afk_timeout;
-
-	/** Maximum users in a video channel, or 0 */
-	uint8_t max_video_channel_users;
-
-	/** Setting for how notifications are to be delivered to users */
-	default_message_notification_t default_message_notifications;
-
-	/** Boost level */
-	guild_premium_tier_t premium_tier;
-
-	/** Verification level of server */
-	verification_level_t verification_level;
-
-	/** Whether or not explicit content filtering is enable and what setting it is */
-	guild_explicit_content_t explicit_content_filter;
-
-	/** If multi factor authentication is required for moderators or not */
-	mfa_level_t mfa_level;
-
-	/**
-	 * @brief Guild NSFW level
-	 */
-	guild_nsfw_level_t nsfw_level;
-
-	/**
-	 * @brief Additional flags
-	 */
-	uint8_t flags_extra;
-
-	/** Default constructor, zeroes all values */
-	guild();
-
-	/**
-	 * @brief Destroy the guild object
-	 */
-	virtual ~guild() = default;
-
-	/** Read class values from json object
-	 * @param j A json object to read from
-	 * @return A reference to self
-	 */
-	 guild& fill_from_json(nlohmann::json* j);
-
-	/** Read class values from json object
-	 * @param shard originating shard
-	 * @param j A json object to read from
-	 * @return A reference to self
-	 */
-	guild& fill_from_json(class discord_client* shard, nlohmann::json* j);
-
-	/** Build a JSON string from this object.
-	 * @param with_id True if an ID is to be included in the JSON
-	 * @return JSON string
-	 */
-	std::string build_json(bool with_id = false) const;
-
-	/**
-	 * @brief Compute the base permissions for a member on this guild,
-	 * before channel overwrites are applied.
-	 * This method takes into consideration the following cases:
-	 *   - Guild owner
-	 *   - Guild roles including \@everyone
-	 *
-	 * @param user User to get permissions for
-	 * @return permission permissions bitmask
-	 * @note Requires role cache to be enabled (it's enabled by default).
-	 *
-	 * @warning The method will search for the guild member in the cache by the users id.
-	 * If the guild member is not in cache, the method will always return 0.
-	 */
-	permission base_permissions(const class user* user) const;
-
-	/**
-	 * @brief Compute the base permissions for a member on this guild,
-	 * before channel overwrites are applied.
-	 * This method takes into consideration the following cases:
-	 *   - Guild owner
-	 *   - Guild roles including \@everyone
-	 *
-	 * @param member member to get permissions for
-	 * @return permission permissions bitmask
-	 * @note Requires role cache to be enabled (it's enabled by default).
-	 */
-	permission base_permissions(const guild_member &member) const;
-
-	/**
-	 * @brief Get the overall permissions for a member in this channel, including channel overwrites, role permissions and admin privileges.
-	 *
-	 * @param base_permissions base permissions before overwrites,
-	 * from guild::base_permissions
-	 * @param user The user to resolve the permissions for
-	 * @param channel Channel to compute permission overwrites for
-	 * @return permission Permission overwrites for the member. Made of bits in dpp::permissions.
-	 * @note Requires role cache to be enabled (it's enabled by default).
-	 *
-	 * @warning The method will search for the guild member in the cache by the users id.
-	 * If the guild member is not in cache, the method will always return 0.
-	 */
-	permission permission_overwrites(const uint64_t base_permissions, const user* user, const channel* channel) const;
-
-	/**
-	 * @brief Get the overall permissions for a member in this channel, including channel overwrites, role permissions and admin privileges.
-	 *
-	 * @param member The member to resolve the permissions for
-	 * @param channel Channel to compute permission overwrites for
-	 * @return permission Permission overwrites for the member. Made of bits in dpp::permissions.
-	 * @note Requires role cache to be enabled (it's enabled by default).
-	 */
-	permission permission_overwrites(const guild_member &member, const channel &channel) const;
-
-	/**
-	 * @brief Rehash members map
-	 */
-	void rehash_members();
-
-	/**
-	 * @brief Connect to a voice channel another guild member is in
-	 *
-	 * @param user_id User id to join
-	 * @param self_mute True if the bot should mute itself
-	 * @param self_deaf True if the bot should deafen itself
-	 * @return True if the user specified is in a vc, false if they aren't
-	 * @note This is NOT a synchronous blocking call! The bot isn't instantly ready to send or listen for audio,
-	 * as we have to wait for the connection to the voice server to be established!
-	 * e.g. wait for dpp::cluster::on_voice_ready event, and then send the audio within that event.
-	 */
-	bool connect_member_voice(snowflake user_id, bool self_mute = false, bool self_deaf = false);
-
-	/**
-	 * @brief Get the banner url of the guild if it have one, otherwise returns an empty string
-	 *
-	 * @param size The size of the banner in pixels. It can be any power of two between 16 and 4096. if not specified, the default sized banner is returned.
-	 * @return std::string banner url or empty string
-	 */
-	std::string get_banner_url(uint16_t size = 0) const;
-
-	/**
-	 * @brief Get the discovery splash url of the guild if it have one, otherwise returns an empty string
-	 *
-	 * @param size The size of the discovery splash in pixels. It can be any power of two between 16 and 4096. if not specified, the default sized discovery splash is returned.
-	 * @return std::string discovery splash url or empty string
-	 */
-	std::string get_discovery_splash_url(uint16_t size = 0) const;
-
-	/**
-	 * @brief Get the icon url of the guild if it have one, otherwise returns an empty string
-	 *
-	 * @param size The size of the icon in pixels. It can be any power of two between 16 and 4096. if not specified, the default sized icon is returned.
-	 * @return std::string icon url or empty string
-	 */
-	std::string get_icon_url(uint16_t size = 0) const;
-
-	/**
-	 * @brief Get the splash url of the guild if it have one, otherwise returns an empty string
-	 *
-	 * @param size The size of the splash in pixels. It can be any power of two between 16 and 4096. if not specified, the default sized splash is returned.
-	 * @return std::string splash url or empty string
-	 */
-	std::string get_splash_url(uint16_t size = 0) const;
-
-	/**
-	 * @brief Set the name of the guild in the object
-	 * Min length: 2, Max length: 100 (not including leading/trailing spaces)
-	 * @param n Guild name
-	 * @return guild& reference to self
-	 * @throw dpp::length_exception if guild name is too short
-	 */
-	guild& set_name(const std::string& n);
-
-	/**
-	 * @brief Is a large server (>250 users)
-	 * @return bool is a large guild
-	 */
-	bool is_large() const;
-
-	/**
-	 * @brief Is unavailable due to outage (most other fields will be blank or outdated
-	 * @return bool is unavailable
-	 */
-	bool is_unavailable() const;
-
-	/**
-	 * @brief Widget is enabled for this server
-	 * @return bool widget enabled
-	 */
-	bool widget_enabled() const;
-
-	/**
-	 * @brief Guild has access to set an invite splash background
-	 * @return bool can have an invite splash
-	 */
-	bool has_invite_splash() const;
-
-	/**
-	 * @brief Guild has access to set 384kbps bitrate in voice
-	 * @return bool can have VIP voice regions
-	 */
-	bool has_vip_regions() const;
-
-	/**
-	 * @brief Guild has access to set a vanity URL
-	 * @return bool can have vanity url
-	 */
-	bool has_vanity_url() const;
-
-	/**
-	 * @brief Guild is a verified server
-	 * @return bool is verified
-	 */
-	bool is_verified() const;
-
-	/**
-	 * @brief Guild is a discord partnered server
-	 * @return bool is discord partnered
-	 */
-	bool is_partnered() const;
-
-	/**
-	 * @brief Has enabled community
-	 * @return bool has enabled community
-	 */
-	bool is_community() const;
-
-	/**
-	 * @brief Guild has access to use commerce features
-	 * @return bool has commerce features enabled
-	 * @deprecated Removed by Discord
-	 */
-	bool has_commerce() const;
-
-	/**
-	 * @brief Guild has access to create announcement channels
-	 * @return bool has announcement channels features enabled
-	 */
-	bool has_news() const;
-
-	/**
-	 * @brief Guild is discoverable
-	 * @return bool is discoverable
-	 */
-	bool is_discoverable() const;
-
-	/**
-	 * @brief Guild is featurable
-	 * @return bool is featurable
-	 */
-	bool is_featureable() const;
-
-	/**
-	 * @brief Guild has access to set an animated guild banner image
-	 * @return bool can have animated banner image
-	 */
-	bool has_animated_banner() const;
-
-	/**
-	 * @brief Guild has auto moderation features
-	 * @return bool has auto moderation features
-	 */
-	bool has_auto_moderation() const;
-
-	/**
-	 * @brief Guild has been set as a support server on the App Directory
-	 * @return bool has been set as a support server of an app in the app directory
-	 */
-	bool has_support_server() const;
-
-	/**
-	 * @brief Guild has access to set an animated guild icon
-	 * @return bool can have animated icon
-	 */
-	bool has_animated_icon() const;
-
-	/**
-	 * @brief Guild has access to set a guild banner image
-	 * @return bool can have banner image
-	 */
-	bool has_banner() const;
-
-	/**
-	 * @brief Guild has enabled the welcome screen
-	 * @return bool enabled welcome screen
-	 */
-	bool is_welcome_screen_enabled() const;
-
-	/**
-	 * @brief Guild has enabled membership screening
-	 * @return bool has membership screening
-	 */
-	bool has_member_verification_gate() const;
-
-	/**
-	 * @brief Guild has preview enabled
-	 * @return bool has preview
-	 */
-	bool is_preview_enabled() const;
-
-	/**
-	 * @brief Guild icon is actually an animated gif
-	 * @return bool is animated gif
-	 */
-	bool has_animated_icon_hash() const;
-
-	/**
-	 * @brief Guild banner is actually an animated gif
-	 * @return bool is animated gif
-	 */
-	bool has_animated_banner_hash() const;
-
-
-	/**
-	 * @brief guild has access to monetization features
-	 * @return bool 
-	 */
-	bool has_monetization_enabled() const;
-
-	/**
-	 * @brief guild has increased custom sticker slots
-	 * @return bool has more stickers
-	 */
-	bool has_more_stickers() const;
-
-	/**
-	 * @brief guild has access to create private threads
-	 * @return bool has private threads
-	 * @deprecated Removed by Discord
-	 */
-	bool has_private_threads() const;
-
-	/**
-	 * @brief guild is able to set role icons
-	 * @return bool has role icons
-	 */
-	bool has_role_icons() const;
-
-	/**
-	 * @brief guild has access to the seven day archive time for threads 
-	 * @return bool has seven day thread archive
-	 */
-	bool has_seven_day_thread_archive() const;
-
-	/**
-	 * @brief guild has access to the three day archive time for threads
-	 * @return bool has three day thread archive
-	 */
-	bool has_three_day_thread_archive() const;
-
-	/**
-	 * @brief guild has enabled ticketed events
-	 * @return bool has ticketed events
-	 */
-	bool has_ticketed_events() const;
-
-	/**
-	 * @brief guild has access to channel banners feature
-	 * @return bool has channel banners
-	 */
-	bool has_channel_banners() const;
-
-	/**
-	 * @brief True if the premium progress bar is enabled
-	 * @return bool has progress bar enabled
-	 */
-	bool has_premium_progress_bar_enabled() const;
-
-	/**
-	 * @brief True if has paused invites, preventing new users from joining
-	 * @return bool has paused invites
-	 */
-	bool has_invites_disabled() const;
-};
-
-/** A container of guilds */
-typedef std::unordered_map<snowflake, guild> guild_map;
-
-/**
- * @brief Represents a guild widget, simple web widget of member list
- */
-class DPP_EXPORT guild_widget {
-public:
-	/**
-	 * @brief Channel widget points to
-	 */
-	snowflake channel_id;
-
-	/**
-	 * @brief True if enabled
-	 */
-	bool enabled;
-
-	/**
-	 * @brief Construct a new guild widget object
-	 */
-	guild_widget();
-
-	/**
-	 * @brief Build a guild widget from json
-	 *
-	 * @param j json to build from
-	 * @return guild_widget& reference to self
-	 */
-	guild_widget& fill_from_json(nlohmann::json* j);
-
-	/**
-	 * @brief Build json for a guild widget
-	 *
-	 * @param with_id Add ID to output
-	 * @return std::string guild widget stringified json
-	 */
-	std::string build_json(bool with_id = false) const;
-};
-
-/**
- * @brief helper function to deserialize a guild_member from json
- *
- * @see https://github.com/nlohmann/json#arbitrary-types-conversions
- *
- * @param j output json object
- * @param gm guild_member to be deserialized
- */
-void from_json(const nlohmann::json& j, guild_member& gm);
-
-/** A container of guild members */
-typedef std::unordered_map<snowflake, guild_member> guild_member_map;
-
-/**
- * @brief Get the guild_member from cache of given IDs
- *
- * @param guild_id ID of the guild to find guild_member for
- * @param user_id ID of the user to find guild_member for
- *
- * @throw dpp::cache_exception if the guild or guild_member is not found in the cache
- * @return guild_member the cached object, if found
- */
-guild_member DPP_EXPORT find_guild_member(const snowflake guild_id, const snowflake user_id);
-
-};
+/************************************************************************************
+ *
+ * D++, A Lightweight C++ library for Discord
+ *
+ * Copyright 2021 Craig Edwards and D++ contributors
+ * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ************************************************************************************/
+#pragma once
+#include <dpp/export.h>
+#include <dpp/user.h>
+#include <dpp/emoji.h>
+#include <dpp/snowflake.h>
+#include <dpp/managed.h>
+#include <dpp/utility.h>
+#include <dpp/voicestate.h>
+#include <dpp/permissions.h>
+#include <string>
+#include <unordered_map>
+#include <dpp/json_interface.h>
+
+namespace dpp {
+
+class channel;
+class cluster;
+
+/* Note from Archie: I'd like to move this soon (dpp::guild::region) and allow users to use a region enum.
+ * This would make it easier for people to be able to alter a channel region without having to get the text right.
+ */
+
+/**
+ * @brief Represents voice regions for guilds and channels.
+ * @deprecated Deprecated in favour of per-channel regions.
+ * Please use dpp::channel::rtc_region instead.
+ */
+enum region : uint8_t {
+	/**
+	 * @brief Brazil
+	 */
+	r_brazil,
+
+	/**
+	 * @brief Central Europe
+	 */
+	r_central_europe,
+
+	/**
+	 * @brief Hong Kong
+	 */
+	r_hong_kong,
+
+	/**
+	 * @brief India
+	 */
+	r_india,
+
+	/**
+	 * @brief Japan
+	 */
+	r_japan,
+
+	/**
+	 * @brief Russia
+	 */
+	r_russia,
+
+	/**
+	 * @brief Singapore
+	 */
+	r_singapore,
+
+	/**
+	 * @brief South Africa
+	 */
+	r_south_africa,
+
+	/**
+	 * @brief Sydney
+	 */
+	r_sydney,
+
+	/**
+	 * @brief US Central
+	 */
+	r_us_central,
+
+	/**
+	 * @brief US East Coast
+	 */
+	r_us_east,
+
+	/**
+	 * @brief US South
+	 */
+	r_us_south,
+
+	/**
+	 * @brief US West Coast
+	 */
+	r_us_west,
+
+	/**
+	 * @brief Western Europe
+	 */
+	r_western_europe
+};
+
+/**
+ * @brief The various flags that represent the status of a dpp::guild object
+ */
+enum guild_flags : uint32_t {
+	/**
+	 * @brief Large guild
+	 */
+	g_large = 0b00000000000000000000000000000001,
+
+	/**
+	 * @brief Unavailable guild (inaccessible due to an outage)
+	 */
+	g_unavailable = 0b00000000000000000000000000000010,
+
+	/**
+	 * @brief Guild has widget enabled
+	 */
+	g_widget_enabled = 0b00000000000000000000000000000100,
+
+	/**
+	 * @brief Guild can have an invite splash image
+	 */
+	g_invite_splash = 0b00000000000000000000000000001000,
+
+	/**
+	 * @brief Guild can have VIP regions
+	 */
+	g_vip_regions =	0b00000000000000000000000000010000,
+
+	/**
+	 * @brief Guild can have a vanity url
+	 */
+	g_vanity_url = 0b00000000000000000000000000100000,
+
+	/**
+	 * @brief Guild is verified
+	 */
+	g_verified = 0b00000000000000000000000001000000,
+
+	/**
+	 * @brief Guild is partnered
+	 */
+	g_partnered = 0b00000000000000000000000010000000,
+
+	/**
+	 * @brief Community features enabled
+	 */
+	g_community = 0b00000000000000000000000100000000,
+
+	/**
+	 * @brief Guild has enabled role subscriptions
+	 */
+	g_role_subscription_enabled = 0b00000000000000000000001000000000,
+
+	/**
+	 * @brief Guild has access to create announcement channels
+	 */
+	g_news = 0b00000000000000000000010000000000,
+
+	/**
+	 * @brief Guild is discoverable in discovery
+	 */
+	g_discoverable = 0b00000000000000000000100000000000,
+
+	/**
+	 * @brief Guild is featureable
+	 */
+	g_featureable = 0b00000000000000000001000000000000,
+
+	/**
+	 * @brief Guild can have an animated icon (doesn't mean it actually has one though)
+	 */
+	g_animated_icon = 0b00000000000000000010000000000000,
+
+	/**
+	 * @brief Guild can have a banner image
+	 */
+	g_banner = 0b00000000000000000100000000000000,
+
+	/**
+	 * @brief Guild has a welcome screen
+	 */
+	g_welcome_screen_enabled = 0b00000000000000001000000000000000,
+
+	/**
+	 * @brief Guild has a member verification gate
+	 */
+	g_member_verification_gate = 0b00000000000000010000000000000000,
+
+	/**
+	 * @brief Guild has a preview
+	 */
+	g_preview_enabled = 0b00000000000000100000000000000000,
+
+	/**
+	 * @brief Guild join notifications are off
+	 */
+	g_no_join_notifications = 0b00000000000001000000000000000000,
+
+	/**
+	 * @brief Guild boost notifications are off
+	 */
+	g_no_boost_notifications = 0b00000000000010000000000000000000,
+
+	/**
+	 * @brief Guild has an actual animated icon (set by the icon hash starting with 'a_')
+	 */
+	g_has_animated_icon = 0b00000000000100000000000000000000,
+
+	/**
+	 * @brief Guild has an actual animated banner (set by the icon hash starting with 'a_')
+	 */
+	g_has_animated_banner =	0b00000000001000000000000000000000,
+
+	/**
+	 * @brief Guild setup tips are off
+	 */
+	g_no_setup_tips = 0b00000000010000000000000000000000,
+
+	/**
+	 * @brief "Wave to say hi" sticker prompt buttons are off
+	 */
+	g_no_sticker_greeting =	0b00000000100000000000000000000000,
+
+	/**
+	 * @brief Guild has enabled monetization
+	 */
+	g_monetization_enabled = 0b00000001000000000000000000000000,
+
+	/**
+	 * @brief Guild has increased custom sticker slots
+	 */
+	g_more_stickers = 0b00000010000000000000000000000000,
+
+	/**
+	 * @brief Guild has enabled the role subscription promo page
+	 */
+	g_creator_store_page_enabled = 0b00000100000000000000000000000000,
+
+	/**
+	 * @brief Guild is able to set role icons
+	 */
+	g_role_icons = 0b00001000000000000000000000000000,
+
+	/**
+	 * @brief Guild has access to the seven day archive time for threads
+	 * @deprecated Removed by Discord
+	 */
+	g_seven_day_thread_archive = 0b00010000000000000000000000000000,
+
+	/**
+	 * @brief Guild has access to the three day archive time for threads
+	 * @deprecated Removed by Discord
+	 */
+	g_three_day_thread_archive = 0b00100000000000000000000000000000,
+
+	/**
+	 * @brief Guild has enabled ticketed events
+	 */
+	g_ticketed_events = 0b01000000000000000000000000000000,
+
+	/**
+	 * @brief Guild can have channel banners
+	 * @deprecated Removed by Discord
+	 */
+	g_channel_banners = 0b10000000000000000000000000000000,
+};
+
+/**
+ * @brief Additional boolean flag values for guild, as guild_flags is full
+ */
+enum guild_flags_extra : uint16_t {
+	/**
+	 * @brief Guild has premium progress bar enabled
+	 */
+	g_premium_progress_bar_enabled = 0b0000000000000001,
+
+	/**
+	 * @brief Guild can have an animated banner (doesn't mean it actually has one though)
+	 */
+	g_animated_banner = 0b0000000000000010,
+
+	/**
+	 * @brief Guild has auto moderation
+	 */
+	g_auto_moderation = 0b0000000000000100,
+
+	/**
+	 * @brief Guild has paused invites, preventing new users from joining
+	 */
+	g_invites_disabled = 0b0000000000001000,
+
+	/**
+	 * @brief Guild has been set as support server of an app in the App Directory
+	 */
+	g_developer_support_server = 0b0000000000010000,
+
+	/**
+	 * @brief Guild role subscription purchase and renewal notifications are off
+	 */
+	g_no_role_subscription_notifications = 0b0000000000100000,
+
+	/**
+	 * @brief Guild role subscription sticker reply buttons are off
+	 */
+	g_no_role_subscription_notification_replies = 0b0000000001000000,
+
+	/**
+	 * @brief Guild has role subscriptions that can be purchased
+	 */
+	g_role_subscriptions_available_for_purchase = 0b0000000010000000,
+
+	/**
+	 * @brief Guild has disabled alerts for join raids in the configured safety alerts channel
+	 */
+	g_raid_alerts_disabled = 0b0000000100000000,
+};
+
+/**
+ * @brief Various flags that can be used to indicate the status of a guild member.
+ * @note Use the setter functions in dpp::guild_member and do not toggle the bits yourself.
+ */
+enum guild_member_flags : uint16_t {
+	/**
+	 * @brief Member deafened in voice channel
+	 */
+	gm_deaf = 0b0000000000000001,
+
+	/**
+	 * @brief Member muted in voice channels
+	 */
+	gm_mute = 0b0000000000000010,
+
+	/**
+	 * @brief Member pending verification by membership screening
+	 */
+	gm_pending = 0b0000000000000100,
+
+	/**
+	 * @brief Member has animated guild-specific avatar
+	 */
+	gm_animated_avatar = 0b0000000000001000,
+
+	/**
+	 * @brief gm_deaf or gm_mute has been toggled
+	 */
+	gm_voice_action = 0b0000000000010000,
+
+	/**
+	 * @brief Member has left and rejoined the guild
+	 */
+	gm_did_rejoin = 0b0000000000100000,
+
+	/**
+	 * @brief Member has completed onboarding
+	 */
+	gm_completed_onboarding = 0b0000000001000000,
+
+	/**
+	 * @brief Member is exempt from guild verification requirements
+	 */
+	gm_bypasses_verification = 0b0000000010000000,
+
+	/**
+	 * @brief Member has started onboarding
+	 */
+	gm_started_onboarding = 0b0000000100000000,
+
+	/**
+	 * @brief Should change roles on next call to edit guild_member?
+	 * @warning This is set by dpp::guild_member::add_role, dpp::guild_member::remove_role, and dpp::guild_member::set_roles.
+	 * You should only ever use this value if you know what you're doing, otherwise stick to the three functions listed.
+	 */
+	gm_roles_action = 0b0000001000000000,
+
+	/**
+	 * @brief Should nicknames on next call to edit guild_member?
+	 * @warning This is set by dpp::guild_member::set_nickname.
+	 * You should only ever use this value if you know what you're doing, otherwise stick to the function listed.
+	 */
+	gm_nickname_action = 0b0000010000000000,
+};
+
+/**
+ * @brief Represents dpp::user membership upon a dpp::guild.
+ * This contains the user's nickname, guild roles, and any other guild-specific flags.
+ */
+class DPP_EXPORT guild_member : public json_interface<guild_member> {
+protected:
+	friend struct json_interface<guild_member>;
+
+	/**
+	 * @brief Build json for the member object
+	 *
+	 * @param with_id Add ID to output
+	 * @return json JSON object
+	 */
+	json to_json_impl(bool with_id = false) const;
+
+protected:
+	/**
+	 * @brief Nickname.
+	 *
+	 * @note Empty string if they don't have a nickname on this guild
+	 */
+	std::string nickname;
+
+	/**
+	 * @brief List of roles this user has on this guild
+	 */
+	std::vector<snowflake> roles;
+
+	/**
+	 * @brief A set of flags built from the bitmask defined by dpp::guild_member_flags
+	 */
+	uint16_t flags;
+
+	friend void from_json(const nlohmann::json& j, guild_member& gm);
+
+public:
+	/**
+	 * @brief Guild id
+	 */
+	snowflake guild_id;
+
+	/**
+	 * @brief User id
+	 */
+	snowflake user_id;
+
+	/**
+	 * @brief User avatar.
+	 *
+	 * @note Per-server avatar is a nitro only feature.
+	 */
+	utility::iconhash avatar;
+
+	/**
+	 * @brief Timestamp of when the time out will be removed; until then, they cannot interact with the guild
+	 */
+	time_t communication_disabled_until;
+
+	/**
+	 * @brief Date and time the user joined the guild.
+	 */
+	time_t joined_at;
+
+	/**
+	 * @brief The Date and time the user started boosting.
+	 */
+	time_t premium_since;
+
+	/** Default constructor */
+	guild_member();
+
+	/**
+	 * @brief Fill this object from a json object.
+	 * @param j The json object to get data from
+	 * @param g_id The guild id to associate the member with
+	 * @param u_id The user id to associate the member with
+	 * @return Reference to self for call chaining
+	 */
+	guild_member& fill_from_json(nlohmann::json* j, snowflake g_id, snowflake u_id);
+
+	/**
+	 * @brief Returns true if the user is in time-out (communication disabled)
+	 * 
+	 * @return true user is in time-out
+	 * @return false user is not in time-out
+	 */
+	bool is_communication_disabled() const;
+
+	/**
+	 * @brief Returns true if the user is deafened
+	 * 
+	 * @return true user is deafened
+	 * @return false user is not deafened
+	 */
+	bool is_deaf() const;
+
+	/**
+	 * @brief Returns true if the user is muted
+	 * 
+	 * @return true user muted
+	 * @return false user not muted
+	 */
+	bool is_muted() const;
+
+	/**
+	 * @brief Returns true if pending verification by membership screening
+	 * 
+	 * @return true user has completed membership screening
+	 * @return false user has not completed membership screening
+	 */
+	bool is_pending() const;
+
+	/**
+	 * @brief Returns true if the user has left and rejoined the guild
+	 *
+	 * @return true user has left and rejoined the guild
+	 * @return false user has not rejoined
+	 */
+	bool has_rejoined() const;
+
+	/**
+	 * @brief Is this user also the guild member?
+	 * @return true if the user is the guild owner.
+	 * @return false if the user is not the guild owner or the guild is not in the cache.
+	 * @note If the guild cache is disabled, this function will always return false.
+	 */
+	bool is_guild_owner() const;
+
+	/**
+	 * @brief Returns true if the user has completed onboarding
+	 *
+	 * @return true user has completed onboarding
+	 * @return false user has not completed onboarding
+	 */
+	bool has_completed_onboarding() const;
+
+	/**
+	 * @brief Returns true if the user has started onboarding
+	 *
+	 * @return true user has started onboarding
+	 * @return false user has not started onboarding yet
+	 */
+	bool has_started_onboarding() const;
+
+	/**
+	 * @brief Returns true if the user is exempt from guild verification requirements
+	 *
+	 * @return true user bypasses verification
+	 * @return false user doesn't bypass verification
+	 */
+	bool has_bypasses_verification() const;
+
+	/**
+	 * @brief Returns true if the user's per-guild custom avatar is animated
+	 * 
+	 * @return true user's custom avatar is animated
+	 * @return false user's custom avatar is not animated
+	 */
+	bool has_animated_guild_avatar() const;
+
+	/**
+	 * @brief Returns the member's per guild avatar url if they have one, otherwise returns an empty string.
+	 *
+	 * @note per-server avatar is a nitro only feature so it might be not set. If you need the user avatar, use user::get_avatar_url.
+	 * 
+	 * @param size The size of the avatar in pixels. It can be any power of two between 16 and 4096,
+	 * otherwise the default sized avatar is returned.
+	 * @param format The format to use for the avatar. It can be one of `i_webp`, `i_jpg`, `i_png` or `i_gif`.
+	 * When passing `i_gif`, it returns an empty string for non-animated images. Consider using the `prefer_animated` parameter instead.
+	 * @param prefer_animated Whether you prefer gif format.
+	 * If true, it'll return gif format whenever the image is available as animated.
+	 * @return std::string avatar url or an empty string, if required attributes are missing or an invalid format was passed
+	 */
+	std::string get_avatar_url(uint16_t size = 0, const image_type format = i_png, bool prefer_animated = true) const;
+
+	/**
+	 * @brief Set the nickname 
+	 * 
+	 * @param nick Nickname to set
+	 * 
+	 * @return guild_member& reference to self
+	 */
+	guild_member& set_nickname(const std::string& nick);
+
+	/**
+	 * @brief Get the nickname 
+	 * 
+	 * @return std::string nickname
+	 */
+	std::string get_nickname() const;
+
+	/**
+	 * @brief Get the roles
+	 * 
+	 * @return std::vector<dpp::snowflake> roles
+	 */
+	const std::vector<dpp::snowflake>& get_roles() const;
+
+	/**
+	 * @brief Find the dpp::user object for this member. This is an alias for dpp::find_user
+	 * @return dpp::user* Pointer to the user object. If not in cache, it returns nullptr
+	 */
+	user* get_user() const;
+	
+	/**
+	 * @brief Check if this member is equal to another member object.
+	 * @param other_member other member object to compare
+	 * @return true if their user ids are equal, false otherwise.
+	 */
+	
+	bool operator == (guild_member const& other_member) const;
+
+	/**
+	 * @brief Set whether the user is exempt from guild verification requirements
+	 *
+	 * @param is_bypassing_verification value to set
+	 *
+	 * @return guild_member& reference to self
+	 */
+	guild_member& set_bypasses_verification(const bool is_bypassing_verification);
+
+	/**
+	 * @brief Set whether the user is muted in voice channels
+	 *
+	 * @param is_muted value to set, true if mute in voice channels
+	 * 
+	 * @return guild_member& reference to self 
+	 */
+	guild_member& set_mute(const bool is_muted);
+
+	/**
+	 * @brief Set whether the user is deafened in voice channels
+	 *
+	 * @param is_deafened value to set, true if deaf in voice channels
+	 * 
+	 * @return guild_member& reference to self 
+	 */
+	guild_member& set_deaf(const bool is_deafened);
+
+	/**
+	 * @brief Set communication_disabled_until
+	 *
+	 * @param timestamp timestamp until communication is disabled
+	 *
+	 * @return guild_member& reference to self
+	 */
+	guild_member& set_communication_disabled_until(const time_t timestamp);
+
+	/**
+	 * @brief Return a ping/mention for the user by nickname
+	 * 
+	 * @return std::string mention
+	 */
+	std::string get_mention() const;
+
+	/**
+	 * @brief Add a role to this member
+	 * @note This call sets the role change bit, which causes the new role
+	 * list to be sent if this is passed to dpp::cluster::guild_edit_member
+	 * or dpp::cluster::guild_add_member
+	 * 
+	 * @param role_id Role ID to add
+	 * @return guild_member& Reference to self
+	 */
+	guild_member& add_role(dpp::snowflake role_id);
+
+	/**
+	 * @brief Remove a role from this member
+	 * @note This call sets the role change bit, which causes the new role
+	 * list to be sent if this is passed to dpp::cluster::guild_edit_member
+	 * or dpp::cluster::guild_add_member
+	 * 
+	 * @param role_id Role ID to remove
+	 * @return guild_member& Reference to self
+	 */
+	guild_member& remove_role(dpp::snowflake role_id);
+
+	/**
+	 * @brief Set a new role list for this member
+	 * @note This call sets the role change bit, which causes the new role
+	 * list to be sent if this is passed to dpp::cluster::guild_edit_member
+	 * or dpp::cluster::guild_add_member
+	 * 
+	 * @param role_ids Roles to set
+	 * @return guild_member& Reference to self
+	 */
+	guild_member& set_roles(const std::vector<dpp::snowflake> &role_ids);
+
+};
+
+/**
+ * @brief Defines a channel on a server's welcome screen
+ */
+struct DPP_EXPORT welcome_channel : public json_interface<welcome_channel> {
+protected:
+	friend struct json_interface<welcome_channel>;
+
+	/**
+	 * @brief Read class values from json object
+	 *
+	 * @param j A json object to read from
+	 * @return A reference to self
+	 */
+	welcome_channel& fill_from_json_impl(nlohmann::json* j);
+
+	/**
+	 * @brief Build the json for this object
+	 *
+	 * @param with_id include the id in the JSON
+	 * @return json JSON data
+	 */
+	json to_json_impl(bool with_id = false) const;
+
+public:
+	/**
+	 * @brief The description shown for the channel.
+	 */
+	std::string description;
+
+	/**
+	 * @brief The emoji name.
+	 *
+	 * @note name if custom, the unicode character if standard, or null if no emoji is set.
+	 */
+	std::string emoji_name;
+
+	/**
+	 * @brief The channel's id.
+	 */
+	snowflake channel_id;
+
+	/**
+	 * @brief The emoji id, if the emoji is custom.
+	 */
+	snowflake emoji_id;
+
+	/**
+	 * @brief Construct a new welcome channel object
+	 */
+	welcome_channel();
+
+	/**
+	 * @brief Destroy the welcome channel object
+	 */
+	virtual ~welcome_channel() = default;
+
+	/**
+	 * @brief Set the channel ID of this welcome channel object
+	 *
+	 * @param _channel_id The channel ID to set
+	 * @return Reference to self, so these method calls may be chained
+	 */
+	welcome_channel& set_channel_id(const snowflake _channel_id);
+
+	/**
+	 * @brief Set the description of this welcome channel object
+	 *
+	 * @param _description The description to set
+	 * @return Reference to self, so these method calls may be chained
+	 */
+	welcome_channel& set_description(const std::string& _description);
+};
+
+
+/**
+ * @brief Defines a server's welcome screen
+ */
+struct DPP_EXPORT welcome_screen : public json_interface<welcome_screen> {
+protected:
+	friend struct json_interface<welcome_screen>;
+
+	/**
+	 * @brief Read class values from json object
+	 *
+	 * @param j A json object to read from
+	 * @return A reference to self
+	 */
+	welcome_screen& fill_from_json_impl(nlohmann::json* j);
+
+	/**
+	 * @brief Build the json for this object
+	 *
+	 * @param with_id include the id in the JSON
+	 * @return std::string json data
+	 */
+	json to_json_impl(bool with_id = false) const;
+
+public:
+	/**
+	 * @brief The server description shown in the welcome screen
+	 */
+	std::string description;
+
+	/**
+	 * @brief The channels shown in the welcome screen (max 5)
+	 */
+	std::vector<welcome_channel> welcome_channels;
+
+	/**
+	 * @brief Construct a new welcome screen object
+	 */
+	welcome_screen() = default;
+
+	/**
+	 * @brief Destroy the welcome screen object
+	 */
+	virtual ~welcome_screen() = default;
+
+	/**
+	 * @brief Set the server description for this welcome screen object shown in the welcome screen
+	 *
+	 * @param s string The server description
+	 * @return Reference to self, so these method calls may be chained
+	 */
+	welcome_screen& set_description(const std::string& s);
+};
+
+/**
+ * @brief Guild NSFW level.
+ * Used to represent just how naughty this guild is. Naughty  guild, go sit in the corner.
+ * @note This is set by Discord, and cannot be set by any bot or user on the guild.
+ */
+enum guild_nsfw_level_t : uint8_t {
+	/**
+	 * @brief Default setting, not configured
+	 */
+	nsfw_default = 0,
+
+	/**
+	 * @brief Explicit content may be in this guild
+	 */
+	nsfw_explicit =	1,
+
+	/**
+	 * @brief Safe for work content only
+	 */
+	nsfw_safe = 2,
+
+	/**
+	 * @brief Age restricted, 18+
+	 */
+	nsfw_age_restricted = 3
+};
+
+/**
+ * @brief explicit content filter level.
+ * This is set by a guild admin, but can be forced to a setting if the server is verified,
+ * partnered, official etc.
+ */
+enum guild_explicit_content_t : uint8_t {
+	/**
+	 * @brief Media content will not be scanned.
+	 */
+	expl_disabled =	0,
+
+	/**
+	 * @brief Media content sent by members without roles will be scanned.
+	 */
+	expl_members_without_roles = 1,
+
+	/**
+	 * @brief Media content sent by all members will be scanned.
+	 */
+	expl_all_members = 2
+};
+
+/**
+ * @brief MFA level for server.
+ * If set to elevated all moderators need MFA to perform specific actions such as kick or ban.
+ */
+enum mfa_level_t : uint8_t {
+	/**
+	 * @brief MFA not elevated
+	 */
+	mfa_none = 0,
+
+	/**
+	 * @brief MFA elevated.
+	 */
+	mfa_elevated = 1
+};
+
+/**
+ * @brief Guild verification level
+ */
+enum verification_level_t : uint8_t {
+	/**
+	 * @brief Unrestricted.
+	 */
+	ver_none = 0,
+
+	/**
+	 * @brief Must have verified email on account.
+	 */
+	ver_low	= 1,
+
+	/**
+	 * @brief Must be registered on Discord for longer than 5 minutes.
+	 */
+	ver_medium = 2,
+
+	/**
+	 * @brief Must be a member of the server for longer than 10 minutes.
+	 */
+	ver_high = 3,
+
+	/**
+	 * @brief Must have a verified phone number.
+	 */
+	ver_very_high =	4,
+};
+
+/**
+ * @brief Default message notification level
+ */
+enum default_message_notification_t : uint8_t {
+	/**
+	 * @brief Members will receive notifications for all messages by default.
+	 */
+	dmn_all = 0,
+
+	/**
+	 * @brief Members will receive notifications only for messages that \@mention them by default.
+	 */
+	dmn_only_mentions = 1,
+};
+
+/**
+ * @brief The guild's premium tier.
+ */
+enum guild_premium_tier_t : uint8_t {
+	/**
+	 * @brief Guild has not unlocked any Server Boost perks.
+	 */
+	tier_none = 0,
+
+	/**
+	 * @brief Guild has unlocked Server Boost level 1 perks.
+	 */
+	tier_1 = 1,
+
+	/**
+	 * @brief Guild has unlocked Server Boost level 2 perks.
+	 */
+	tier_2 = 2,
+
+	/**
+	 * @brief Guild has unlocked Server Boost level 3 perks.
+	 */
+	tier_3 = 3,
+};
+
+/**
+ * @brief Voice AFK timeout values for guild::afk_timeout
+ */
+enum guild_afk_timeout_t : uint8_t {
+	/**
+	 * @brief AFK timeout disabled
+	 */
+	afk_off,
+
+	/**
+	 * @brief AFK timeout of 1 Minute
+	 */
+	afk_60,
+
+	/**
+	 * @brief AFK timeout of 5 Minutes
+	 */
+	afk_300,
+
+	/**
+	 * @brief AFK timeout of 15 Minutes
+	 */
+	afk_900,
+
+	/**
+	 * @brief AFK timeout of 30 Minutes
+	 */
+	afk_1800,
+
+	/**
+	 * @brief AFK timeout of 1 Hour
+	 */
+	afk_3600,
+};
+
+/**
+ * @brief Guild members container
+ */
+typedef std::unordered_map<snowflake, guild_member> members_container;
+
+/**
+ * @brief Represents a guild on Discord (AKA a server)
+ */
+class DPP_EXPORT guild : public managed, public json_interface<guild> {
+protected:
+	friend struct json_interface<guild>;
+
+	/** Read class values from json object
+	 * @param j A json object to read from
+	 * @return A reference to self
+	 */
+	guild& fill_from_json_impl(nlohmann::json* j);
+
+	/** Build a JSON from this object.
+	 * @param with_id True if an ID is to be included in the JSON
+	 * @return JSON
+	 */
+	json to_json_impl(bool with_id = false) const;
+
+public:
+	using json_interface<guild>::fill_from_json;
+
+	/**
+	 * @brief Guild name
+	 */
+	std::string name;
+
+	/**
+	 * @brief Server description
+	 */
+	std::string description;
+
+	/**
+	 * @brief Vanity url code for verified or partnered servers and boost level 3
+	 * @note This field cannot be set from the API. Attempts to change this value will be
+	 * silently ignored even if the correct number of boosts or verified/partnered status exist.
+	 * See: https://github.com/discord/discord-api-docs/issues/519
+	 */
+	std::string vanity_url_code;
+
+	/**
+	 * @brief Roles defined on this server
+	 */
+	std::vector<snowflake> roles;
+
+	/**
+	 * @brief List of channels on this server
+	 */
+	std::vector<snowflake> channels;
+
+	/**
+	 * @brief List of threads on this server
+	 */
+	std::vector<snowflake> threads;
+
+	/**
+	 * @brief List of emojis
+	 */
+	std::vector<snowflake> emojis;
+
+	/**
+	 * @brief List of members in voice channels in the guild.
+	 */
+	std::map<snowflake, voicestate> voice_members;
+
+	/**
+	 * @brief List of guild members.
+	 *
+	 * @note When you first receive the guild create event,
+	 * this may be empty or near empty. This depends upon your
+	 * dpp::intents and the size of your bot.
+	 * It will be filled by guild member chunk requests.
+	 */
+	members_container members;
+
+	/**
+	 * @brief Welcome screen
+	 */
+	dpp::welcome_screen welcome_screen;
+
+	/**
+	 * @brief Guild icon
+	 */
+	utility::icon icon;
+
+	/**
+	 * @brief Guild splash
+	 */
+	utility::icon splash;
+
+	/**
+	 * @brief Guild discovery splash
+	 */
+	utility::icon discovery_splash;
+
+	/**
+	 * @brief Server banner
+	 */
+	utility::icon banner;
+
+	/**
+	 * @brief Snowflake id of guild owner
+	 */
+	snowflake owner_id;
+
+	/**
+	 * @brief Snowflake ID of AFK voice channel or 0
+	 */
+	snowflake afk_channel_id;
+
+	/**
+	 * @brief ID of creating application, if any, or 0
+	 */
+	snowflake application_id;
+
+	/**
+	 * @brief ID of system channel where discord update messages are sent
+	 */
+	snowflake system_channel_id;
+
+	/**
+	 * @brief ID of rules channel for communities
+	 */
+	snowflake rules_channel_id;
+
+	/**
+	 * @brief Public updates channel id or 0
+	 */
+	snowflake public_updates_channel_id;
+
+	/**
+	 * @brief Snowflake ID of widget channel, or 0
+	 */
+	snowflake widget_channel_id;
+
+	/**
+	 * @brief The id of the channel where admins and moderators of Community guilds receive safety alerts from Discord
+	 */
+	snowflake safety_alerts_channel_id;
+
+	/**
+	 * @brief Approximate member count. May be sent as zero
+	 */
+	uint32_t member_count;
+
+	/**
+	 * @brief Flags bitmask as defined by values within dpp::guild_flags
+	 */
+	uint32_t flags;
+
+	/**
+	 * @brief the maximum number of presences for the guild.
+	 * @note Generally Discord always fills this with 0, apart from for the largest of guilds
+	 */
+	uint32_t max_presences;
+
+	/**
+	 * @brief the maximum number of members for the guild
+	 */
+	uint32_t max_members;
+
+	/**
+	 * @brief Additional flags (values from dpp::guild_flags_extra)
+	 */
+	uint16_t flags_extra;
+
+	/**
+	 * @brief Shard ID of the guild
+	 */
+	uint16_t shard_id;
+
+	/**
+	 * @brief Number of boosters
+	 */
+	uint16_t premium_subscription_count;
+
+	/**
+	 * @brief Voice AFK timeout before moving users to AFK channel
+	 */
+	guild_afk_timeout_t afk_timeout;
+
+	/**
+	 * @brief Maximum users in a video channel, or 0
+	 */
+	uint8_t max_video_channel_users;
+
+	/**
+	 * @brief Setting for how notifications are to be delivered to users
+	 */
+	default_message_notification_t default_message_notifications;
+
+	/**
+	 * @brief Boost level
+	 */
+	guild_premium_tier_t premium_tier;
+
+	/**
+	 * @brief Verification level of server
+	 */
+	verification_level_t verification_level;
+
+	/**
+	 * @brief Whether or not explicit content filtering is enable and what setting it is
+	 */
+	guild_explicit_content_t explicit_content_filter;
+
+	/**
+	 * @brief If multi factor authentication is required for moderators or not
+	 */
+	mfa_level_t mfa_level;
+
+	/**
+	 * @brief Guild NSFW level
+	 */
+	guild_nsfw_level_t nsfw_level;
+
+	/** Default constructor, zeroes all values */
+	guild();
+
+	/**
+	 * @brief Destroy the guild object
+	 */
+	virtual ~guild() = default;
+
+	/** Read class values from json object
+	 * @param shard originating shard
+	 * @param j A json object to read from
+	 * @return A reference to self
+	 */
+	guild& fill_from_json(class discord_client* shard, nlohmann::json* j);
+
+	/**
+	 * @brief Compute the base permissions for a member on this guild,
+	 * before channel overwrites are applied.
+	 * This method takes into consideration the following cases:
+	 *   - Guild owner
+	 *   - Guild roles including \@everyone
+	 *
+	 * @param user User to get permissions for
+	 * @return permission permissions bitmask. If the member has administrator privileges, the bitmask returns with all flags set
+	 * @note Requires role cache to be enabled (it's enabled by default).
+	 *
+	 * @warning The method will search for the guild member in the cache by the users id.
+	 * If the guild member is not in cache, the method will always return 0.
+	 */
+	permission base_permissions(const class user* user) const;
+
+	/**
+	 * @brief Compute the base permissions for a member on this guild,
+	 * before channel overwrites are applied.
+	 * This method takes into consideration the following cases:
+	 *   - Guild owner
+	 *   - Guild roles including \@everyone
+	 *
+	 * @param member member to get permissions for
+	 * @return permission permissions bitmask. If the member has administrator privileges, the bitmask returns with all flags set
+	 * @note Requires role cache to be enabled (it's enabled by default).
+	 */
+	permission base_permissions(const guild_member &member) const;
+
+	/**
+	 * @brief Get the overall permissions for a member in this channel, including channel overwrites, role permissions and admin privileges.
+	 *
+	 * @param base_permissions base permissions before overwrites,
+	 * from guild::base_permissions
+	 * @param user The user to resolve the permissions for
+	 * @param channel Channel to compute permission overwrites for
+	 * @return permission Permission overwrites for the member. Made of bits in dpp::permissions.
+	 * @note Requires role cache to be enabled (it's enabled by default).
+	 *
+	 * @warning The method will search for the guild member in the cache by the users id.
+	 * If the guild member is not in cache, the method will always return 0.
+	 */
+	permission permission_overwrites(const uint64_t base_permissions, const user* user, const channel* channel) const;
+
+	/**
+	 * @brief Get the overall permissions for a member in this channel, including channel overwrites, role permissions and admin privileges.
+	 *
+	 * @param member The member to resolve the permissions for
+	 * @param channel Channel to compute permission overwrites for
+	 * @return permission Permission overwrites for the member. Made of bits in dpp::permissions.
+	 * @note Requires role cache to be enabled (it's enabled by default).
+	 */
+	permission permission_overwrites(const guild_member &member, const channel &channel) const;
+
+	/**
+	 * @brief Rehash members map
+	 */
+	void rehash_members();
+
+	/**
+	 * @brief Connect to a voice channel another guild member is in
+	 *
+	 * @param owner Cluster the user's shard is on
+	 * @param user_id User id to join
+	 * @param self_mute True if the bot should mute itself
+	 * @param self_deaf True if the bot should deafen itself
+	 * @param dave True to enable DAVE E2EE
+	 * @return True if the user specified is in a vc, false if they aren't
+	 * @note This is NOT a synchronous blocking call! The bot isn't instantly ready to send or listen for audio,
+	 * as we have to wait for the connection to the voice server to be established!
+	 * e.g. wait for dpp::cluster::on_voice_ready event, and then send the audio within that event.
+	 */
+	bool connect_member_voice(const cluster& owner, snowflake user_id, bool self_mute = false, bool self_deaf = false, bool dave = true);
+
+	/**
+	 * @brief Get the banner url of the guild if it have one, otherwise returns an empty string
+	 *
+	 * @param size The size of the banner in pixels. It can be any power of two between 16 and 4096,
+	 * otherwise the default sized banner is returned.
+	 * @param format The format to use for the avatar. It can be one of `i_webp`, `i_jpg`, `i_png` or `i_gif`.
+	 * Passing `i_gif` might result in an invalid url for non-animated images. Consider using the `prefer_animated` parameter instead.
+	 * @param prefer_animated Whether you prefer gif format.
+	 * If true, it'll return gif format whenever the image is available as animated.
+	 * @return std::string banner url or an empty string, if required attributes are missing or an invalid format was passed
+	 */
+	std::string get_banner_url(uint16_t size = 0, const image_type format = i_png, bool prefer_animated = true) const;
+
+	/**
+	 * @brief Get the discovery splash url of the guild if it have one, otherwise returns an empty string
+	 *
+	 * @param size The size of the discovery splash in pixels. It can be any power of two between 16 and 4096,
+	 * otherwise the default sized discovery splash is returned.
+	 * @param format The format to use for the avatar. It can be one of `i_webp`, `i_jpg` or `i_png`.
+	 * @return std::string discovery splash url or an empty string, if required attributes are missing or an invalid format was passed
+	 */
+	std::string get_discovery_splash_url(uint16_t size = 0, const image_type format = i_png) const;
+
+	/**
+	 * @brief Get the icon url of the guild if it have one, otherwise returns an empty string
+	 *
+	 * @param size The size of the icon in pixels. It can be any power of two between 16 and 4096,
+	 * otherwise the default sized icon is returned.
+	 * @param format The format to use for the avatar. It can be one of `i_webp`, `i_jpg`, `i_png` or `i_gif`.
+	 * When passing `i_gif`, it returns an empty string for non-animated images. Consider using the `prefer_animated` parameter instead.
+	 * @param prefer_animated Whether you prefer gif format.
+	 * If true, it'll return gif format whenever the image is available as animated.
+	 * @return std::string icon url or an empty string, if required attributes are missing or an invalid format was passed
+	 */
+	std::string get_icon_url(uint16_t size = 0, const image_type format = i_png, bool prefer_animated = true) const;
+
+	/**
+	 * @brief Get the splash url of the guild if it have one, otherwise returns an empty string
+	 *
+	 * @param size The size of the splash in pixels. It can be any power of two between 16 and 4096,
+	 * otherwise the default sized splash is returned.
+	 * @param format The format to use for the avatar. It can be one of `i_webp`, `i_jpg` or `i_png`.
+	 * @return std::string splash url or an empty string, if required attributes are missing or an invalid format was passed
+	 */
+	std::string get_splash_url(uint16_t size = 0, const image_type format = i_png) const;
+
+	/**
+	 * @brief Set the name of the guild in the object
+	 * Min length: 2, Max length: 100 (not including leading/trailing spaces)
+	 * @param n Guild name
+	 * @return guild& reference to self
+	 * @throw dpp::length_exception if guild name is too short
+	 */
+	guild& set_name(const std::string& n);
+
+	/**
+	 * @brief Remove the guild banner.
+	 * @return guild& Reference to self for chaining
+	 */
+	guild& remove_banner();
+
+	/**
+	 * @brief Set the guild banner image. Server needs banner feature.
+	 * Must be 16:9, and depending on nitro level, must be png or jpeg.
+	 * Animated gif needs the animated banner server feature.
+	 * @param format Image format.
+	 * @param data Image data in bytes
+	 * @return guild& Reference to self for chaining
+	 */
+	guild& set_banner(image_type format, std::string_view data);
+
+	/**
+	 * @brief Set the guild banner image. Server needs banner feature.
+	 * Must be 16:9, and depending on nitro level, must be png or jpeg.
+	 * Animated gif needs the animated banner server feature.
+	 * @param format Image format.
+	 * @param data Image data in bytes
+	 * @param size Size of the data in bytes
+	 * @return guild& Reference to self for chaining
+	 */
+	guild& set_banner(image_type format, const std::byte* data, uint32_t size);
+
+	/**
+	 * @brief Remove the guild discovery splash.
+	 * @return guild& Reference to self for chaining
+	 */
+	guild& remove_discovery_splash();
+
+	/**
+	 * @brief Set the guild discovery splash image. Server needs discoverable feature.
+	 * Must be 16:9 and png or jpeg.
+	 * @param format Image format.
+	 * @param data Image data in bytes
+	 * @return guild& Reference to self for chaining
+	 */
+	guild& set_discovery_splash(image_type format, std::string_view data);
+
+	/**
+	 * @brief Set the guild discovery splash image. Server needs discoverable feature.
+	 * Must be 16:9 and png or jpeg.
+	 * @param format Image format.
+	 * @param data Image data in bytes
+	 * @param size Size of the data in bytes
+	 * @return guild& Reference to self for chaining
+	 */
+	guild& set_discovery_splash(image_type format, const std::byte* data, uint32_t size);
+
+	/**
+	 * @brief Remove the guild invite splash.
+	 * @return guild& Reference to self for chaining
+	 */
+	guild& remove_splash();
+
+	/**
+	 * @brief Set the guild invite splash image. Server needs invite splash feature.
+	 * Must be 16:9 and png or jpeg.
+	 * @param format Image format.
+	 * @param data Image data in bytes
+	 * @return guild& Reference to self for chaining
+	 */
+	guild& set_splash(image_type format, std::string_view data);
+
+	/**
+	 * @brief Set the guild invite splash image. Server needs invite splash feature.
+	 * Must be 16:9 and png or jpeg.
+	 * @param format Image format.
+	 * @param data Image data in bytes
+	 * @param size Size of the data in bytes
+	 * @return guild& Reference to self for chaining
+	 */
+	guild& set_splash(image_type format, const std::byte* data, uint32_t size);
+
+	/**
+	 * @brief Remove the guild icon.
+	 * @return guild& Reference to self for chaining
+	 */
+	guild& remove_icon();
+
+	/**
+	 * @brief Set the guild icon image.
+	 * Must be 1024x1024 and png or jpeg. Gif allowed only if the server has animated icon.
+	 * @param format Image format.
+	 * @param data Image data in bytes
+	 * @return guild& Reference to self for chaining
+	 */
+	guild& set_icon(image_type format, std::string_view data);
+
+	/**
+	 * @brief Set the 1024x1024 guild icon image.
+	 * Must be png or jpeg. Gif allowed only if the server has animated icon.
+	 * @param format Image format.
+	 * @param data Image data in bytes
+	 * @param size Size of the data in bytes
+	 * @return guild& Reference to self for chaining
+	 */
+	guild& set_icon(image_type format, const std::byte* data, uint32_t size);
+
+	/**
+	 * @brief Is a large server (>250 users)
+	 * @return bool is a large guild
+	 */
+	bool is_large() const;
+
+	/**
+	 * @brief Is unavailable due to outage (most other fields will be blank or outdated
+	 * @return bool is unavailable
+	 */
+	bool is_unavailable() const;
+
+	/**
+	 * @brief Widget is enabled for this server
+	 * @return bool widget enabled
+	 */
+	bool widget_enabled() const;
+
+	/**
+	 * @brief Guild has access to set an invite splash background
+	 * @return bool can have an invite splash
+	 */
+	bool has_invite_splash() const;
+
+	/**
+	 * @brief Guild has access to set 384kbps bitrate in voice
+	 * @return bool can have VIP voice regions
+	 */
+	bool has_vip_regions() const;
+
+	/**
+	 * @brief Guild has access to set a vanity URL
+	 * @return bool can have vanity url
+	 */
+	bool has_vanity_url() const;
+
+	/**
+	 * @brief Guild is a verified server
+	 * @return bool is verified
+	 */
+	bool is_verified() const;
+
+	/**
+	 * @brief Guild is a discord partnered server
+	 * @return bool is discord partnered
+	 */
+	bool is_partnered() const;
+
+	/**
+	 * @brief Has enabled community
+	 * @return bool has enabled community
+	 */
+	bool is_community() const;
+
+	/**
+	 * @brief Has enabled role subscriptions
+	 * @return bool has enabled role subscriptions
+	 */
+	bool has_role_subscriptions() const;
+
+	/**
+	 * @brief Guild has access to create announcement channels
+	 * @return bool has announcement channels features enabled
+	 */
+	bool has_news() const;
+
+	/**
+	 * @brief Guild is discoverable
+	 * @return bool is discoverable
+	 */
+	bool is_discoverable() const;
+
+	/**
+	 * @brief Guild is featurable
+	 * @return bool is featurable
+	 */
+	bool is_featureable() const;
+
+	/**
+	 * @brief Guild has access to set an animated guild banner image
+	 * @return bool can have animated banner image
+	 */
+	bool has_animated_banner() const;
+
+	/**
+	 * @brief Guild has auto moderation features
+	 * @return bool has auto moderation features
+	 */
+	bool has_auto_moderation() const;
+
+	/**
+	 * @brief Guild has been set as a support server on the App Directory
+	 * @return bool has been set as a support server of an app in the app directory
+	 */
+	bool has_support_server() const;
+
+	/**
+	 * @brief Guild has role subscriptions that can be purchased
+	 * @return bool has role subscriptions that can be purchased
+	 */
+	bool has_role_subscriptions_available_for_purchase() const;
+
+	/**
+	 * @brief Guild has disabled alerts for join raids in the configured safety alerts channel
+	 * @return bool dpp::g_raid_alerts_disabled flag is set
+	 */
+	bool has_raid_alerts_disabled() const;
+
+	/**
+	 * @brief Guild has access to set an animated guild icon
+	 * @return bool can have animated icon
+	 */
+	bool has_animated_icon() const;
+
+	/**
+	 * @brief Guild has access to set a guild banner image
+	 * @return bool can have banner image
+	 */
+	bool has_banner() const;
+
+	/**
+	 * @brief Guild has enabled the welcome screen
+	 * @return bool enabled welcome screen
+	 */
+	bool is_welcome_screen_enabled() const;
+
+	/**
+	 * @brief Guild has enabled membership screening
+	 * @return bool has membership screening
+	 */
+	bool has_member_verification_gate() const;
+
+	/**
+	 * @brief Guild has preview enabled
+	 * @return bool has preview
+	 */
+	bool is_preview_enabled() const;
+
+	/**
+	 * @brief Guild icon is actually an animated gif
+	 * @return bool is animated gif
+	 */
+	bool has_animated_icon_hash() const;
+
+	/**
+	 * @brief Guild banner is actually an animated gif
+	 * @return bool is animated gif
+	 */
+	bool has_animated_banner_hash() const;
+
+
+	/**
+	 * @brief guild has access to monetization features
+	 * @return bool 
+	 */
+	bool has_monetization_enabled() const;
+
+	/**
+	 * @brief guild has increased custom sticker slots
+	 * @return bool has more stickers
+	 */
+	bool has_more_stickers() const;
+
+	/**
+	 * @brief guild has enabled the role subscription promo page
+	 * @return bool has role subscription promo page enabled
+	 */
+	bool has_creator_store_page() const;
+
+	/**
+	 * @brief guild is able to set role icons
+	 * @return bool has role icons
+	 */
+	bool has_role_icons() const;
+
+	/**
+	 * @brief guild has access to the seven day archive time for threads 
+	 * @return bool has seven day thread archive
+	 * @deprecated Removed by Discord
+	 */
+	bool has_seven_day_thread_archive() const;
+
+	/**
+	 * @brief guild has access to the three day archive time for threads
+	 * @return bool has three day thread archive
+	 * @deprecated Removed by Discord
+	 */
+	bool has_three_day_thread_archive() const;
+
+	/**
+	 * @brief guild has enabled ticketed events
+	 * @return bool has ticketed events
+	 */
+	bool has_ticketed_events() const;
+
+	/**
+	 * @brief guild has access to channel banners feature
+	 * @return bool has channel banners
+	 * @deprecated Removed by Discord
+	 */
+	bool has_channel_banners() const;
+
+	/**
+	 * @brief True if the premium progress bar is enabled
+	 * @return bool has progress bar enabled
+	 */
+	bool has_premium_progress_bar_enabled() const;
+
+	/**
+	 * @brief True if has paused invites, preventing new users from joining
+	 * @return bool has paused invites
+	 */
+	bool has_invites_disabled() const;
+};
+
+/**
+ * @brief A container of guilds
+ */
+typedef std::unordered_map<snowflake, guild> guild_map;
+
+/**
+ * @brief Represents a guild widget, simple web widget of member list
+ */
+class DPP_EXPORT guild_widget : public json_interface<guild_widget> {
+protected:
+	friend struct json_interface<guild_widget>;
+
+	/**
+	 * @brief Build a guild widget from json
+	 *
+	 * @param j json to build from
+	 * @return guild_widget& reference to self
+	 */
+	guild_widget& fill_from_json_impl(nlohmann::json* j);
+
+	/**
+	 * @brief Build json for a guild widget
+	 *
+	 * @param with_id Add ID to output
+	 * @return std::string guild widget stringified json
+	 */
+	json to_json_impl(bool with_id = false) const;
+
+public:
+	/**
+	 * @brief Channel widget points to
+	 */
+	snowflake channel_id;
+
+	/**
+	 * @brief True if enabled
+	 */
+	bool enabled;
+
+	/**
+	 * @brief Construct a new guild widget object
+	 */
+	guild_widget();
+};
+
+/**
+ * @brief The onboarding mode for the dpp::onboarding object. Defines the criteria used to satisfy Onboarding constraints that are required for enabling.
+ */
+enum onboarding_mode : uint8_t {
+	/**
+	 * @brief Counts only Default Channels towards constraints.
+	 */
+	gom_default = 0,
+
+	/**
+	 * @brief Counts Default Channels and Questions towards constraints.
+	 */
+	gom_advanced = 1,
+};
+
+/**
+ * @brief The various types of dpp::onboarding_prompt
+ */
+enum onboarding_prompt_type : uint8_t {
+	/**
+	 * @brief Multiple choice.
+	 */
+	opt_multiple_choice = 0,
+
+	/**
+	 * @brief Dropdown.
+	 */
+	opt_dropdown = 1,
+};
+
+/**
+ * @brief Various flags for dpp::onboarding_prompt
+ */
+enum onboarding_prompt_flags : uint8_t {
+	/**
+	 * @brief Indicates whether users are limited to selecting one option for the prompt.
+	 */
+	opf_single_select = 1 << 0,
+
+	/**
+	 * @brief Indicates whether the prompt is required before a user completes the onboarding flow.
+	 */
+	opf_required = 1 << 1,
+
+	/**
+	 * @brief Indicates whether the prompt is present in the onboarding flow.
+	 * If set, the prompt will only appear in the Channels & Roles tab
+	 */
+	opf_in_onboarding = 1 << 2,
+};
+
+/**
+ * @brief Represents an onboarding prompt option
+ */
+struct DPP_EXPORT onboarding_prompt_option : public managed, public json_interface<onboarding_prompt_option> {
+protected:
+	friend struct json_interface<onboarding_prompt_option>;
+
+	/**
+	 * @brief Read class values from json object
+	 *
+	 * @param j A json object to read from
+	 * @return A reference to self
+	 */
+	onboarding_prompt_option& fill_from_json_impl(nlohmann::json* j);
+
+	/**
+	 * @brief Build the json for this object
+	 *
+	 * @param with_id include the id in the JSON
+	 * @return json data
+	 */
+	json to_json_impl(bool with_id = false) const;
+
+public:
+	/**
+	 * @brief IDs for channels a member is added to when the option is selected.
+	 */
+	std::vector<snowflake> channel_ids;
+
+	/**
+	 * @brief IDs for roles assigned to a member when the option is selected
+	 */
+	std::vector<snowflake> role_ids;
+
+	/**
+	 * @brief Emoji of the option
+	 */
+	dpp::emoji emoji;
+
+	/**
+	 * @brief Title of the option
+	 */
+	std::string title;
+
+	/**
+	 * @brief Description of the option
+	 */
+	std::string description;
+
+	/**
+	 * @brief Construct a new onboarding prompt option object
+	 */
+	onboarding_prompt_option();
+
+	/**
+	 * @brief Destroy the onboarding prompt option object
+	 */
+	virtual ~onboarding_prompt_option() = default;
+
+	/**
+	 * @brief Set the emoji of this onboarding prompt option object
+	 *
+	 * @param _emoji The emoji to set
+	 * @return Reference to self, so these method calls may be chained
+	 */
+	onboarding_prompt_option& set_emoji(const dpp::emoji& _emoji);
+
+	/**
+	 * @brief Set the title of this onboarding prompt option object
+	 *
+	 * @param _title The title to set
+	 * @return Reference to self, so these method calls may be chained
+	 */
+	onboarding_prompt_option& set_title(const std::string& _title);
+
+	/**
+	 * @brief Set the description of this onboarding prompt option object
+	 *
+	 * @param _description The description to set
+	 * @return Reference to self, so these method calls may be chained
+	 */
+	onboarding_prompt_option& set_description(const std::string& _description);
+};
+
+/**
+ * @brief Represents an onboarding prompt
+ */
+struct DPP_EXPORT onboarding_prompt : public managed, public json_interface<onboarding_prompt> {
+protected:
+	friend struct json_interface<onboarding_prompt>;
+
+	/**
+	 * @brief Read class values from json object
+	 *
+	 * @param j A json object to read from
+	 * @return A reference to self
+	 */
+	onboarding_prompt& fill_from_json_impl(nlohmann::json* j);
+
+	/**
+	 * @brief Build the json for this object
+	 *
+	 * @param with_id include the id in the JSON
+	 * @return json data
+	 */
+	json to_json_impl(bool with_id = false) const;
+
+public:
+	/**
+	 * @brief Type of prompt (defaults to dpp::opt_multiple_choice).
+	 */
+	onboarding_prompt_type type;
+
+	/**
+	 * @brief Options available within the prompt
+	 */
+	std::vector<onboarding_prompt_option> options;
+
+	/**
+	 * @brief Title of the prompt.
+	 */
+	std::string title;
+
+	/**
+	 * @brief A set of flags built from the bitmask defined by dpp::onboarding_prompt_flags
+	 */
+	uint8_t flags;
+
+	/**
+	 * @brief Construct a new onboarding prompt object
+	 */
+	onboarding_prompt();
+
+	/**
+	 * @brief Destroy the onboarding prompt object
+	 */
+	virtual ~onboarding_prompt() = default;
+
+	/**
+	 * @brief Set the type of this onboarding prompt object
+	 *
+	 * @param _type The prompt type to set
+	 * @return Reference to self, so these method calls may be chained
+	 */
+	onboarding_prompt& set_type(const onboarding_prompt_type _type);
+
+	/**
+	 * @brief Set the title of this onboarding prompt object
+	 *
+	 * @param _title The title to set
+	 * @return Reference to self, so these method calls may be chained
+	 */
+	onboarding_prompt& set_title(const std::string& _title);
+
+	/**
+	 * @brief Indicates whether users are limited to selecting one option for the prompt
+	 * @return bool True if the users are limited to selecting one option for the prompt
+	 */
+	bool is_single_select() const;
+
+	/**
+	 * @brief Indicates whether the prompt is required before a user completes the onboarding flow
+	 * @return bool True if the prompt is required before a user completes the onboarding flow
+	 */
+	bool is_required() const;
+
+	/**
+	 * @brief Indicates whether the prompt is present in the onboarding flow
+	 * @return bool True if the prompt is present in the onboarding flow. False if the prompt will only appear in the Channels & Roles tab
+	 */
+	bool is_in_onboarding() const;
+};
+
+/**
+ * @brief Represents a guild's onboarding flow
+ */
+struct DPP_EXPORT onboarding : public json_interface<onboarding> {
+protected:
+	friend struct json_interface<onboarding>;
+
+	/**
+	 * @brief Read class values from json object
+	 *
+	 * @param j A json object to read from
+	 * @return A reference to self
+	 */
+	onboarding& fill_from_json_impl(nlohmann::json* j);
+
+	/**
+	 * @brief Build the json for this object
+	 *
+	 * @param with_id include the id in the JSON
+	 * @return json data
+	 */
+	json to_json_impl(bool with_id = false) const;
+
+public:
+	/**
+	 * @brief ID of the guild this onboarding is part of.
+	 */
+	snowflake guild_id;
+
+	/**
+	 * @brief Prompts shown during onboarding and in customize community.
+	 */
+	std::vector<onboarding_prompt> prompts;
+
+	/**
+	 * @brief Channel IDs that members get opted into automatically
+	 */
+	std::vector<snowflake> default_channel_ids;
+
+	/**
+	 * @brief Current mode of onboarding (defaults to dpp::gom_default)
+	 */
+	onboarding_mode mode;
+
+	/**
+	 * @brief Whether onboarding is enabled in the guild
+	 */
+	bool enabled;
+
+	/**
+	 * @brief Construct a new onboarding object
+	 */
+	onboarding();
+
+	/**
+	 * @brief Destroy the onboarding object
+	 */
+	virtual ~onboarding() = default;
+
+	/**
+	 * @brief Set guild_id of this onboarding object
+	 *
+	 * @param id Guild ID to set
+	 * @return Reference to self, so these method calls may be chained
+	 */
+	onboarding& set_guild_id(const snowflake id);
+
+	/**
+	 * @brief Set the mode of this onboarding object
+	 *
+	 * @param m onboarding_mode Mode to set
+	 * @return Reference to self, so these method calls may be chained
+	 */
+	onboarding& set_mode(const onboarding_mode m);
+
+	/**
+	 * @brief Set the enabling of this onboarding object
+	 *
+	 * @param is_enabled bool Whether onboarding is enabled in the guild
+	 * @return Reference to self, so these method calls may be chained
+	 */
+	onboarding& set_enabled(const bool is_enabled);
+};
+
+/**
+ * @brief helper function to deserialize a guild_member from json
+ *
+ * @see https://github.com/nlohmann/json#arbitrary-types-conversions
+ *
+ * @param j output json object
+ * @param gm guild_member to be deserialized
+ */
+void from_json(const nlohmann::json& j, guild_member& gm);
+
+/**
+ * @brief A container of guild members
+ */
+typedef std::unordered_map<snowflake, guild_member> guild_member_map;
+
+/**
+ * @brief Get the guild_member from cache of given IDs
+ *
+ * @param guild_id ID of the guild to find guild_member for
+ * @param user_id ID of the user to find guild_member for
+ *
+ * @throw dpp::cache_exception if the guild or guild_member is not found in the cache
+ * @return guild_member the cached object, if found
+ */
+guild_member DPP_EXPORT find_guild_member(const snowflake guild_id, const snowflake user_id);
+
+}
diff --git a/3rdParty/dpp/http_server.h b/3rdParty/dpp/http_server.h
new file mode 100644
index 0000000000..87fb1a4f9c
--- /dev/null
+++ b/3rdParty/dpp/http_server.h
@@ -0,0 +1,74 @@
+/************************************************************************************
+ *
+ * D++, A Lightweight C++ library for Discord
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright 2021 Craig Edwards and D++ contributors
+ * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ************************************************************************************/
+#pragma once
+
+#include <dpp/export.h>
+#include <dpp/cluster.h>
+#include <dpp/socket_listener.h>
+#include <dpp/http_server_request.h>
+#include <dpp/ssl_context.h>
+
+namespace dpp {
+
+/**
+ * @brief Creates a simple HTTP server which listens on a TCP port for a
+ * plaintext or SSL incoming request, and passes that request to a callback
+ * to generate the response.
+ */
+struct DPP_EXPORT http_server : public socket_listener<http_server_request> {
+
+	/**
+	 * @brief Request handler callback to use for all incoming HTTP(S) requests
+	 */
+	http_server_request_event request_handler;
+
+	/**
+	 * @brief Port we are listening on
+	 */
+	uint16_t bound_port;
+
+	/**
+	 * @brief Constructor for creation of a HTTP(S) server
+	 * @param creator Cluster creator
+	 * @param address address to bind to, use "0.0.0.0" to bind to all local addresses
+	 * @param port port to bind to. You should generally use a port > 1024.
+	 * @param handle_request Callback to call for each pending request
+	 * @param private_key Private key PEM file for HTTPS/SSL. If empty, a plaintext server is created
+	 * @param public_key Public key PEM file for HTTPS/SSL. If empty, a plaintext server is created
+	 */
+	http_server(cluster* creator, const std::string_view address, uint16_t port, http_server_request_event handle_request, const std::string& private_key = "", const std::string& public_key = "");
+
+	/**
+	 * @brief Emplace a new request into the connection pool
+	 * @param newfd file descriptor of new request
+	 */
+	void emplace(socket newfd) override;
+
+	/**
+	 * @brief Destructor
+	 */
+	virtual ~http_server() {
+		detail::release_ssl_context(bound_port);
+	}
+};
+
+}
diff --git a/3rdParty/dpp/http_server_request.h b/3rdParty/dpp/http_server_request.h
new file mode 100644
index 0000000000..38e0dae264
--- /dev/null
+++ b/3rdParty/dpp/http_server_request.h
@@ -0,0 +1,266 @@
+/************************************************************************************
+ *
+ * D++, A Lightweight C++ library for Discord
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright 2021 Craig Edwards and D++ contributors 
+ * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ************************************************************************************/
+#pragma once
+#include <dpp/export.h>
+#include <string>
+#include <map>
+#include <list>
+#include <vector>
+#include <variant>
+#include <dpp/sslconnection.h>
+#include <dpp/version.h>
+#include <dpp/stringops.h>
+#include <dpp/httpsclient.h>
+#include <climits>
+
+namespace dpp {
+
+/**
+ * @brief Callback type for HTTP server request callbacks
+ */
+using http_server_request_event = std::function<void(class http_server_request*)>;
+
+/*
+ * @brief Implements a HTTPS socket client based on the SSL client.
+ * @note plaintext HTTP without SSL is also supported via a "downgrade" setting
+ */
+class DPP_EXPORT http_server_request : public ssl_connection {
+	/**
+	 * @brief The request body, e.g. form data
+	 */
+	std::string request_body;
+
+	/**
+	 * @brief Headers from the client
+	 */
+	http_headers request_headers;
+
+	/**
+	 * @brief Time at which the request should be abandoned
+	 */
+	time_t timeout;
+
+	/**
+	 * @brief Headers for our response
+	 */
+	http_headers response_headers;
+
+	/**
+	 * @brief Handler to handle the inbound request
+	 */
+	http_server_request_event handler{};
+
+	/**
+	 * @brief Response body
+	 */
+	std::string response_body;
+
+protected:
+
+	/**
+	 * @brief The type of the request, e.g. GET, POST
+	 */
+	std::string request_type;
+
+	/**
+	 * @brief Path part of URL for HTTPS connection
+	 */
+	std::string path;
+
+	/**
+	 * @brief Current connection state
+	 */
+	http_state state;
+
+	/**
+	 * @brief HTTP status code for response
+	 */
+	uint16_t status{0};
+
+	/**
+	 * @brief Start the connection
+	 */
+	virtual void connect() override;
+
+	/**
+	 * @brief Called when the output buffer is drained to empty
+	 */
+	void on_buffer_drained() override;
+
+	/**
+	 * @brief Maximum size of POST body
+	 */
+	[[nodiscard]] uint64_t get_max_post_size() const;
+
+	/**
+	 * @brief Maximum size of headers
+	 */
+	[[nodiscard]] uint64_t get_max_header_size() const;
+
+	/**
+	 * @brief Reply with an error message
+	 * @param error_code error code
+	 * @param message message
+	 */
+	void generate_error(uint16_t error_code, const std::string& message);
+
+public:
+	/**
+	 * @brief If true the response timed out while waiting
+	 */
+	bool timed_out;
+
+	/**
+	 * Get request path
+	 * @return request path
+	 */
+	std::string get_path() const;
+
+	/**
+	 * @brief Get request state
+	 * @return request state
+	 */
+	http_state get_state() const;
+
+	/**
+	 * @brief Get current response body
+	 * @return response body
+	 */
+	std::string get_response_body() const;
+
+	/**
+	 * @brief Get current request body
+	 * @return request body
+	 */
+	std::string get_request_body() const;
+
+	/**
+	 * @brief Get current status code
+	 * @return status code
+	 */
+	uint16_t get_status() const;
+
+	/**
+	 * @brief Content length sent by client
+	 */
+	uint64_t content_length{ULLONG_MAX};
+
+	/**
+	 * @brief Construct a new server request object.
+	 * Server request objects are instantiated for an incoming server connection, as such they already
+	 * have a file descriptor.
+	 * @param creator creating owner
+	 * @param fd file descriptor
+	 * @param port Port the connection came in on
+	 * @param plaintext_downgrade true if plaintext, false if SSL
+	 * @param private_key if SSL, the path to the private key PEM
+	 * @param public_key if SSL, the path to the public key PEM
+	 * @param handle_request request handler callback
+	 */
+        http_server_request(cluster* creator, socket fd, uint16_t port, bool plaintext_downgrade, const std::string& private_key, const std::string& public_key, http_server_request_event handle_request);
+
+	/**
+	 * @brief Destroy the https client object
+	 */
+        virtual ~http_server_request() override;
+
+	/**
+	 * @brief Processes incoming data from the SSL socket input buffer.
+	 * 
+	 * @param buffer The buffer contents. Can modify this value removing the head elements when processed.
+	 */
+        virtual bool handle_buffer(std::string &buffer) override;
+
+	/**
+	 * @brief Close HTTPS socket
+	 */
+        virtual void close() override;
+
+	/**
+	 * @brief Fires every second from the underlying socket I/O loop, used for timeouts
+	 */
+	virtual void one_second_timer() override;
+
+	/**
+	 * @brief Get a HTTP request header
+	 * 
+	 * @param header_name Header name to find, case insensitive
+	 * @return Header content or empty string if not found.
+	 * If multiple values have the same header_name, this will return one of them.
+	 * @see get_header_count to determine if multiple are present
+	 * @see get_header_list to retrieve all entries of the same header_name
+	 */
+	[[nodiscard]] const std::string get_header(const std::string& header_name) const;
+
+	/**
+	 * @brief Get the number of headers with the same header name
+	 *
+	 * @param header_name
+	 * @return the number of headers with this count
+	 */
+	[[nodiscard]] size_t get_header_count(const std::string& header_name) const;
+
+	/**
+	 * @brief Get a set of HTTP request headers with a common name
+	 *
+	 * @param header_name
+	 * @return A list of headers with the same name, or an empty list if not found
+	 */
+	[[nodiscard]] std::list<std::string> get_header_list(const std::string& header_name) const;
+
+	/**
+	 * @brief Get all HTTP request headers
+	 * 
+	 * @return headers as a map
+	 */
+	[[nodiscard]] std::multimap<std::string, std::string> get_headers() const;
+
+	/**
+	 * @brief Set a response header
+	 * @param header header name
+	 * @param value header value
+	 * @return ref to self
+	 */
+	http_server_request& set_response_header(const std::string& header, const std::string& value);
+ 
+	/**
+	 * @brief Set the response content
+	 * 
+	 * @param new_content response content
+	 */
+	http_server_request& set_response_body(const std::string& new_content);
+
+	/**
+	 * @brief Set the response HTTP status, e.g.
+	 * 200 for OK, 404 for not found, 429 for rate limited etc.
+	 *
+	 * @param new_status HTTP status
+	 */
+	http_server_request& set_status(uint16_t new_status);
+
+	/**
+	 * @brief Get whole response as a string
+	 */
+	[[nodiscard]] std::string get_response();
+};
+
+}
diff --git a/3rdParty/dpp/httpsclient.h b/3rdParty/dpp/httpsclient.h
index 20e766afd4..49b9f8ddf0 100644
--- a/3rdParty/dpp/httpsclient.h
+++ b/3rdParty/dpp/httpsclient.h
@@ -1,316 +1,357 @@
-/************************************************************************************
- *
- * D++, A Lightweight C++ library for Discord
- *
- * Copyright 2021 Craig Edwards and D++ contributors 
- * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- ************************************************************************************/
-#pragma once
-#include <dpp/export.h>
-#include <string>
-#include <map>
-#include <vector>
-#include <variant>
-#include <dpp/sslclient.h>
-
-namespace dpp {
-
-
-/**
- * @brief HTTP connection status
- */
-enum http_state : uint8_t {
-	/**
-	 * @brief Sending/receiving HTTP headers and request body
-	 */
-	HTTPS_HEADERS,
-
-	/**
-	 * @brief Receiving body content.
-	 */
-	HTTPS_CONTENT,
-
-	/**
-	 * @brief Completed connection, as it was closed or the body is >= Content-Length
-	 * 
-	 */
-	HTTPS_DONE,
-
-	/**
-	 * @brief Received chunk length
-	 * 
-	 */
-	HTTPS_CHUNK_LEN,
-
-	/**
-	 * @brief Received chunk trailing CRLF
-	 */
-	HTTPS_CHUNK_TRAILER,
-
-	/**
-	 * @brief The last received chunk is the final chunk
-	 */
-	HTTPS_CHUNK_LAST,
-
-	/**
-	 * @brief Receiving contents of a chunk
-	 */
-	HTTPS_CHUNK_CONTENT
-};
-
-/**
- * @brief Request headers
- */
-typedef std::multimap<std::string, std::string> http_headers;
-
-/**
- * @brief Represents a multipart mime body and the correct top-level mime type
- * If a non-multipart request is passed in, this is represented as a plain body
- * and the application/json mime type.
- */
-struct multipart_content {
-	/**
-	 * @brief Multipart body
-	 */
-	std::string body;
-	/**
-	 * @brief MIME type
-	 */
-	std::string mimetype;
-};
-
-/**
- * @brief Represents a HTTP scheme, hostname and port
- * split into parts for easy use in https_client.
- */
-struct http_connect_info {
-	/**
-	 * @brief True if the connection should be SSL
-	 */
-	bool is_ssl;
-	/**
-	 * @brief The request scheme, e.g. 'https' or 'http'
-	 */
-	std::string scheme;
-	/**
-	 * @brief The request hostname part, e.g. 'discord.com'
-	 */
-	std::string hostname;
-	/**
-	 * @brief The port number, either determined from the scheme,
-	 * or from the part of the hostname after a colon ":" character
-	 */
-	uint16_t port;
-};
-
-/**
- * @brief Implements a HTTPS socket client based on the SSL client.
- * @note plaintext HTTP without SSL is also supported via a "downgrade" setting
- */
-class DPP_EXPORT https_client : public ssl_client
-{
-	/**
-	 * @brief Current connection state
-	 */
-	http_state state;
-
-	/**
-	 * @brief The type of the request, e.g. GET, POST
-	 */
-	std::string request_type;
-
-	/**
-	 * @brief Path part of URL for HTTPS connection
-	 */
-	std::string path;
-
-	/**
-	 * @brief The request body, e.g. form data
-	 */
-	std::string request_body;
-
-	/**
-	 * @brief The response body, e.g. file content or JSON
-	 */
-	std::string body;
-
-	/**
-	 * @brief The reported length of the content. If this is
-	 * UULONG_MAX, then no length was reported by the server.
-	 */
-	uint64_t content_length;
-
-	/**
-	 * @brief Headers for the request, e.g. Authorization, etc.
-	 */
-	http_headers request_headers;
-
-	/**
-	 * @brief The status of the HTTP request from the server,
-	 * e.g. 200 for OK, 404 for not found. A value of 0 means
-	 * no request has been completed.
-	 */
-	uint16_t status;
-
-	/**
-	 * @brief Time at which the request should be abandoned
-	 */
-	time_t timeout;
-
-	/**
-	 * @brief If true the content is chunked encoding
-	 */
-	bool chunked;
-
-	/**
-	 * @brief Size of current chunk
-	 */
-	size_t chunk_size;
-
-	/**
-	 * @brief Number of bytes received in current chunk
-	 */
-	size_t chunk_receive;
-
-	/**
-	 * @brief Headers from the server's response, e.g. RateLimit
-	 * headers, cookies, etc.
-	 */
-	std::map<std::string, std::string> response_headers;
-
-	/**
-	 * @brief Handle input buffer
-	 * 
-	 * @param buffer Buffer to read
-	 * @return returns true if the connection should remain open
-	 */
-	bool do_buffer(std::string& buffer);
-
-protected:
-
-	/**
-	 * @brief Start the connection
-	 */
-	virtual void connect();
-
-	/**
-	 * @brief Get request state
-	 * @return request state
-	 */
-	http_state get_state();
-
-public:
-
-	/**
-	 * @brief Connect to a specific HTTP(S) server and complete a request.
-	 * 
-	 * The constructor will attempt the connection, and return the content.
-	 * By the time the constructor completes, the HTTP request will be stored
-	 * in the object.
-	 * 
-	 * @note This is a blocking call. It starts a loop which runs non-blocking
-	 * functions within it, but does not return until the request completes.
-	 * See queues.cpp for how to make this asynchronous.
-	 * 
-	 * @param hostname Hostname to connect to
-	 * @param port Port number to connect to, usually 443 for SSL and 80 for plaintext
-	 * @param urlpath path part of URL, e.g. "/api"
-	 * @param verb Request verb, e.g. GET or POST
-	 * @param req_body Request body, use dpp::https_client::build_multipart() to build a multipart MIME body (e.g. for multiple file upload)
-	 * @param extra_headers Additional request headers, e.g. user-agent, authorization, etc
-	 * @param plaintext_connection Set to true to make the connection plaintext (turns off SSL)
-	 * @param request_timeout How many seconds before the connection is considered failed if not finished
-	 */
-        https_client(const std::string &hostname, uint16_t port = 443, const std::string &urlpath = "/", const std::string &verb = "GET", const std::string &req_body = "", const http_headers& extra_headers = {}, bool plaintext_connection = false, uint16_t request_timeout = 5);
-
-	/**
-	 * @brief Destroy the https client object
-	 */
-        virtual ~https_client();
-
-	/**
-	 * @brief Build a multipart content from a set of files and some json
-	 * 
-	 * @param json The json content
-	 * @param filenames File names of files to send
-	 * @param contents Contents of each of the files to send
-	 * @return multipart mime content and headers
-	 */
-	static multipart_content build_multipart(const std::string &json, const std::vector<std::string>& filenames = {}, const std::vector<std::string>& contents = {});
-
-	/**
-	 * @brief Processes incoming data from the SSL socket input buffer.
-	 * 
-	 * @param buffer The buffer contents. Can modify this value removing the head elements when processed.
-	 */
-        virtual bool handle_buffer(std::string &buffer);
-
-	/**
-	 * @brief Close HTTPS socket
-	 */
-        virtual void close();
-
-	/**
-	 * @brief Fires every second from the underlying socket I/O loop, used for timeouts
-	 */
-	virtual void one_second_timer();
-
-	/**
-	 * @brief Get a HTTP response header
-	 * 
-	 * @param header_name Header name to find, case insensitive
-	 * @return Header content or empty string if not found
-	 */
-	const std::string get_header(std::string header_name) const;
-
-	/**
-	 * @brief Get all HTTP response headers
-	 * 
-	 * @return headers as a map
-	 */
-	const std::map<std::string, std::string> get_headers() const;
- 
-	/**
-	 * @brief Get the response content
-	 * 
-	 * @return response content
-	 */
-	const std::string get_content() const;
-
-	/**
-	 * @brief Get the response HTTP status, e.g.
-	 * 200 for OK, 404 for not found, 429 for rate limited.
-	 * A value of 0 indicates the request was not completed.
-	 * 
-	 * @return uint16_t HTTP status
-	 */
-	uint16_t get_status() const;
-
-	/**
-	 * @brief Break down a scheme, hostname and port into
-	 * a http_connect_info.
-	 * 
-	 * All but the hostname portion are optional. The path component
-	 * should not be passed to this function.
-	 * 
-	 * @param url URL to break down
-	 * @return Split URL
-	 */
-	static http_connect_info get_host_info(std::string url);
-
-};
-
-};
\ No newline at end of file
+/************************************************************************************
+ *
+ * D++, A Lightweight C++ library for Discord
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright 2021 Craig Edwards and D++ contributors 
+ * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ************************************************************************************/
+#pragma once
+#include <dpp/export.h>
+#include <string>
+#include <map>
+#include <list>
+#include <vector>
+#include <variant>
+#include <dpp/sslconnection.h>
+#include <dpp/version.h>
+#include <dpp/stringops.h>
+
+namespace dpp {
+
+static inline const std::string http_version = "DiscordBot (https://github.com/brainboxdotcc/DPP, "
+	+ to_hex(DPP_VERSION_MAJOR, false) + "." + to_hex(DPP_VERSION_MINOR, false) + "." + to_hex(DPP_VERSION_PATCH, false) + ")";
+
+static inline constexpr const char* DISCORD_HOST = "https://discord.com";
+
+/**
+ * @brief HTTP connection status
+ */
+enum http_state : uint8_t {
+	/**
+	 * @brief Sending/receiving HTTP headers and request body
+	 */
+	HTTPS_HEADERS,
+
+	/**
+	 * @brief Receiving body content.
+	 */
+	HTTPS_CONTENT,
+
+	/**
+	 * @brief Completed connection, as it was closed or the body is >= Content-Length
+	 * 
+	 */
+	HTTPS_DONE,
+
+	/**
+	 * @brief Received chunk length
+	 * 
+	 */
+	HTTPS_CHUNK_LEN,
+
+	/**
+	 * @brief Received chunk trailing CRLF
+	 */
+	HTTPS_CHUNK_TRAILER,
+
+	/**
+	 * @brief The last received chunk is the final chunk
+	 */
+	HTTPS_CHUNK_LAST,
+
+	/**
+	 * @brief Receiving contents of a chunk
+	 */
+	HTTPS_CHUNK_CONTENT
+};
+
+/**
+ * @brief Request headers
+ */
+typedef std::multimap<std::string, std::string> http_headers;
+
+/**
+ * @brief Represents a multipart mime body and the correct top-level mime type
+ * If a non-multipart request is passed in, this is represented as a plain body
+ * and the application/json mime type.
+ */
+struct multipart_content {
+	/**
+	 * @brief Multipart body
+	 */
+	std::string body;
+
+	/**
+	 * @brief MIME type
+	 */
+	std::string mimetype;
+};
+
+/**
+ * @brief Represents a HTTP scheme, hostname and port
+ * split into parts for easy use in https_client.
+ */
+struct http_connect_info {
+	/**
+	 * @brief True if the connection should be SSL
+	 */
+	bool is_ssl{};
+
+	/**
+	 * @brief The request scheme, e.g. 'https' or 'http'
+	 */
+	std::string scheme;
+
+	/**
+	 * @brief The request hostname part, e.g. 'discord.com'
+	 */
+	std::string hostname;
+
+	/**
+	 * @brief The port number, either determined from the scheme,
+	 * or from the part of the hostname after a colon ":" character
+	 */
+	uint16_t port{};
+};
+
+using https_client_completion_event = std::function<void(class https_client*)>;
+
+/**
+ * @brief Implements a HTTPS socket client based on the SSL client.
+ * @note plaintext HTTP without SSL is also supported via a "downgrade" setting
+ */
+class DPP_EXPORT https_client : public ssl_connection {
+
+	/**
+	 * @brief The type of the request, e.g. GET, POST
+	 */
+	std::string request_type;
+
+	/**
+	 * @brief Path part of URL for HTTPS connection
+	 */
+	std::string path;
+
+	/**
+	 * @brief The request body, e.g. form data
+	 */
+	std::string request_body;
+
+	/**
+	 * @brief The response body, e.g. file content or JSON
+	 */
+	std::string body;
+
+	/**
+	 * @brief The reported length of the content. If this is
+	 * UULONG_MAX, then no length was reported by the server.
+	 */
+	uint64_t content_length;
+
+	/**
+	 * @brief Headers for the request, e.g. Authorization, etc.
+	 */
+	http_headers request_headers;
+
+	/**
+	 * @brief The status of the HTTP request from the server,
+	 * e.g. 200 for OK, 404 for not found. A value of 0 means
+	 * no request has been completed.
+	 */
+	uint16_t status;
+
+	/**
+	 * @brief The HTTP protocol to use
+	 */
+	std::string http_protocol;
+
+	/**
+	 * @brief Time at which the request should be abandoned
+	 */
+	time_t timeout;
+
+	/**
+	 * @brief If true the content is chunked encoding
+	 */
+	bool chunked;
+
+	/**
+	 * @brief Size of current chunk
+	 */
+	size_t chunk_size;
+
+	/**
+	 * @brief Number of bytes received in current chunk
+	 */
+	size_t chunk_receive;
+
+	/**
+	 * @brief Headers from the server's response, e.g. RateLimit
+	 * headers, cookies, etc.
+	 */
+	std::multimap<std::string, std::string> response_headers;
+
+protected:
+	/**
+	 * @brief Start the connection
+	 */
+	virtual void connect() override;
+
+	/**
+	 * @brief Get request state
+	 * @return request state
+	 */
+	http_state get_state();
+
+public:
+	/**
+	 * @brief If true the response timed out while waiting
+	 */
+	bool timed_out;
+
+	/**
+	 * @brief Function to call when HTTP request is completed
+	 */
+	https_client_completion_event completed;
+
+	/**
+	 * @brief Current connection state
+	 */
+	http_state state;
+
+	/**
+	 * @brief Connect to a specific HTTP(S) server and complete a request.
+	 * 
+	 * The constructor will attempt the connection, and return the content.
+	 * By the time the constructor completes, the HTTP request will be stored
+	 * in the object.
+	 * 
+	 * @note This is a blocking call. It starts a loop which runs non-blocking
+	 * functions within it, but does not return until the request completes.
+	 * See queues.cpp for how to make this asynchronous.
+	 * 
+	 * @param hostname Hostname to connect to
+	 * @param port Port number to connect to, usually 443 for SSL and 80 for plaintext
+	 * @param urlpath path part of URL, e.g. "/api"
+	 * @param verb Request verb, e.g. GET or POST
+	 * @param req_body Request body, use dpp::https_client::build_multipart() to build a multipart MIME body (e.g. for multiple file upload)
+	 * @param extra_headers Additional request headers, e.g. user-agent, authorization, etc
+	 * @param plaintext_connection Set to true to make the connection plaintext (turns off SSL)
+	 * @param request_timeout How many seconds before the connection is considered failed if not finished
+	 * @param protocol Request HTTP protocol (default: 1.1)
+	 * @param done Function to call when https_client request is completed
+	 */
+        https_client(cluster* creator, const std::string &hostname, uint16_t port = 443, const std::string &urlpath = "/", const std::string &verb = "GET", const std::string &req_body = "", const http_headers& extra_headers = {}, bool plaintext_connection = false, uint16_t request_timeout = 5, const std::string &protocol = "1.1", https_client_completion_event done = {});
+
+	/**
+	 * @brief Destroy the https client object
+	 */
+        virtual ~https_client() override;
+
+	/**
+	 * @brief Build a multipart content from a set of files and some json
+	 * 
+	 * @param json The json content
+	 * @param filenames File names of files to send
+	 * @param contents Contents of each of the files to send
+	 * @param mimetypes MIME types of each of the files to send
+	 * @return multipart mime content and headers
+	 */
+	static multipart_content build_multipart(const std::string &json, const std::vector<std::string>& filenames = {}, const std::vector<std::string>& contents = {}, const std::vector<std::string>& mimetypes = {});
+
+	/**
+	 * @brief Processes incoming data from the SSL socket input buffer.
+	 * 
+	 * @param buffer The buffer contents. Can modify this value removing the head elements when processed.
+	 */
+        virtual bool handle_buffer(std::string &buffer) override;
+
+	/**
+	 * @brief Close HTTPS socket
+	 */
+        virtual void close() override;
+
+	/**
+	 * @brief Fires every second from the underlying socket I/O loop, used for timeouts
+	 */
+	virtual void one_second_timer() override;
+
+	/**
+	 * @brief Get a HTTP response header
+	 * 
+	 * @param header_name Header name to find, case insensitive
+	 * @return Header content or empty string if not found.
+	 * If multiple values have the same header_name, this will return one of them.
+	 * @see get_header_count to determine if multiple are present
+	 * @see get_header_list to retrieve all entries of the same header_name
+	 */
+	const std::string get_header(std::string header_name) const;
+
+	/**
+	 * @brief Get the number of headers with the same header name
+	 *
+	 * @param header_name
+	 * @return the number of headers with this count
+	 */
+	size_t get_header_count(std::string header_name) const;
+
+
+	/**
+	 * @brief Get a set of HTTP response headers with a common name
+	 *
+	 * @param header_name
+	 * @return A list of headers with the same name, or an empty list if not found
+	 */
+	const std::list<std::string> get_header_list(std::string header_name) const;
+
+	/**
+	 * @brief Get all HTTP response headers
+	 * 
+	 * @return headers as a map
+	 */
+	const std::multimap<std::string, std::string> get_headers() const;
+ 
+	/**
+	 * @brief Get the response content
+	 * 
+	 * @return response content
+	 */
+	const std::string get_content() const;
+
+	/**
+	 * @brief Get the response HTTP status, e.g.
+	 * 200 for OK, 404 for not found, 429 for rate limited.
+	 * A value of 0 indicates the request was not completed.
+	 * 
+	 * @return uint16_t HTTP status
+	 */
+	uint16_t get_status() const;
+
+	/**
+	 * @brief Break down a scheme, hostname and port into
+	 * a http_connect_info.
+	 * 
+	 * All but the hostname portion are optional. The path component
+	 * should not be passed to this function.
+	 * 
+	 * @param url URL to break down
+	 * @return Split URL
+	 */
+	static http_connect_info get_host_info(std::string url);
+};
+
+}
diff --git a/3rdParty/dpp/integration.h b/3rdParty/dpp/integration.h
index a1de296193..02adee6891 100644
--- a/3rdParty/dpp/integration.h
+++ b/3rdParty/dpp/integration.h
@@ -1,171 +1,353 @@
-/************************************************************************************
- *
- * D++, A Lightweight C++ library for Discord
- *
- * Copyright 2021 Craig Edwards and D++ contributors 
- * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- ************************************************************************************/
-#pragma once
-#include <dpp/export.h>
-#include <dpp/snowflake.h>
-#include <dpp/managed.h>
-#include <dpp/nlohmann/json_fwd.hpp>
-#include <unordered_map>
-#include <dpp/json_interface.h>
-
-namespace dpp {
-
-/**
- * @brief Integration types
- */
-enum integration_type {
-	/// Twitch integration
-	i_twitch,
-	/// YouTube integration
-	i_youtube,
-	/// Discord integration
-	i_discord
-};
-
-/**
- * @brief Integration flags
- */
-enum integration_flags {
-	/// Integration enabled
-	if_enabled =     0b00000001,
-	/// Integration syncing
-	if_syncing =     0b00000010,
-	/// Emoji integration
-	if_emoticons =   0b00000100,
-	/// Integration revoked
-	if_revoked =     0b00001000,
-	/// Kick users when their subscription expires
-	if_expire_kick = 0b00010000,
-};
-
-/**
- * @brief An application that has been integrated
- */
-struct DPP_EXPORT integration_app {
-	/// Integration id
-	snowflake id;
-	/// Name
-	std::string name;
-	/// Icon
-	std::string icon;
-	/// Description
-	std::string description;
-	/// Integration summary @deprecated Removed by Discord
-	std::string summary;
-	/// Pointer to bot user
-	class user* bot;
-};
-
-/**
- * @brief Represents an integration on a guild, e.g. a connection to twitch.
- */
-class DPP_EXPORT integration : public managed, public json_interface<integration> {
-public:
-	/** Integration name */
-	std::string name;
-	/** Integration type */
-	integration_type type;
-	/** Integration flags from dpp::integration_flags */
-	uint8_t flags;
-	/** Role id */
-	snowflake role_id;
-	/** User id */
-	snowflake user_id;
-	/** The grace period (in days) before expiring subscribers */
-	uint32_t expire_grace_period;
-	/** Sync time */
-	time_t synced_at;
-	/** Subscriber count */
-	uint32_t subscriber_count;
-	/** Account id */
-	std::string account_id;
-	/** Account name */
-	std::string account_name;
-	/** The bot/OAuth2 application for discord integrations */
-	integration_app app;
-
-	/** Default constructor */
-	integration();
-
-	/** Default destructor */
-	~integration();
-
-	/** Read class values from json object
-	 * @param j A json object to read from
-	 * @return A reference to self
-	 */
-	integration& fill_from_json(nlohmann::json* j);
-
-	/** Build a json string from this object.
-	 * @param with_id Add ID to output
-	 * @return JSON string of the object
-	 */
-	virtual std::string build_json(bool with_id = false) const;
-
-	/** True if emoticons are enabled */
-	bool emoticons_enabled() const;
-	/** True if integration is enabled */
-	bool is_enabled() const;
-	/** True if is syncing */
-	bool is_syncing() const;
-	/** True if has been revoked */
-	bool is_revoked() const;
-	/** True if expiring kicks the user */
-	bool expiry_kicks_user() const;
-};
-
-/**
- * @brief The connection object that the user has attached.
- */
-class DPP_EXPORT connection {
-public:
-	std::string			id;		//!< id of the connection account
-	std::string			name;		//!< the username of the connection account
-	std::string			type;		//!< the service of the connection (twitch, youtube)
-	bool				revoked;	//!< Optional: whether the connection is revoked
-	std::vector<integration>	integrations;	//!< Optional: an array of partial server integrations
-	bool				verified;	//!< whether the connection is verified
-	bool				friend_sync;	//!< whether friend sync is enabled for this connection
-	bool				show_activity;	//!< whether activities related to this connection will be shown in presence updates
-	bool				two_way_link;	//!< Whether this connection has a corresponding third party OAuth2 token
-	bool				visible;	//!< visibility of this connection
-
-	/**
-	 * @brief Construct a new connection object
-	 */
-	connection();
-
-	/** Read class values from json object
-	 * @param j A json object to read from
-	 * @return A reference to self
-	 */
-	connection& fill_from_json(nlohmann::json* j);
-
-};
-
-/** A group of integrations */
-typedef std::unordered_map<snowflake, integration> integration_map;
-
-/** A group of connections */
-typedef std::unordered_map<snowflake, connection> connection_map;
-
-};
-
+/************************************************************************************
+ *
+ * D++, A Lightweight C++ library for Discord
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright 2021 Craig Edwards and D++ contributors 
+ * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ************************************************************************************/
+#pragma once
+#include <dpp/export.h>
+#include <dpp/snowflake.h>
+#include <dpp/managed.h>
+#include <dpp/json_fwd.h>
+#include <unordered_map>
+#include <dpp/json_interface.h>
+#include <dpp/user.h>
+
+namespace dpp {
+
+/**
+ * @brief Where an app can be installed, also called its supported installation contexts.
+ */
+enum application_integration_types : uint8_t {
+	/**
+	* @brief Installable to servers
+	*/
+	ait_guild_install = 0,
+	/**
+	* @brief Installable to users
+	*/
+	ait_user_install = 1,
+};
+
+/**
+ * @brief Integration types
+ */
+enum integration_type : uint8_t {
+	/**
+	 * @brief Twitch integration
+	 */
+	i_twitch,
+
+	/**
+	 * @brief YouTube integration
+	 */
+	i_youtube,
+
+	/**
+	 * @brief Discord integration
+	 */
+	i_discord,
+
+	/**
+	 * @brief Subscription
+	 */
+	i_guild_subscription,
+};
+
+/**
+ * @brief Integration flags
+ */
+enum integration_flags : uint8_t {
+	/**
+	 * @brief Is this integration enabled?
+	 */
+	if_enabled = 0b00000001,
+
+	/**
+	 * @brief Is this integration syncing?
+	 * @warning This is not provided for discord bot integrations.
+	 */
+	if_syncing = 0b00000010,
+
+	/**
+	 * @brief Whether emoticons should be synced for this integration (twitch only currently).
+	 * @warning This is not provided for discord bot integrations.
+	 */
+	if_emoticons = 0b00000100,
+
+	/**
+	 * @brief Has this integration been revoked?
+	 * @warning This is not provided for discord bot integrations.
+	 */
+	if_revoked = 0b00001000,
+
+	/**
+	 * @brief Kick user when their subscription expires, otherwise only remove the role that is specified by `role_id`.
+	 * @warning This is not provided for discord bot integrations.
+	 */
+	if_expire_kick = 0b00010000,
+};
+
+/**
+ * @brief An application that has been integrated
+ */
+struct DPP_EXPORT integration_app {
+	/**
+	 * @brief The id of the app.
+	 */
+	snowflake id;
+
+	/**
+	 * @brief The name of the app.
+	 */
+	std::string name;
+
+	/**
+	 * @brief The icon hash of the app.
+	 */
+	utility::iconhash icon;
+
+	/**
+	 * @brief The description of the app
+	 */
+	std::string description;
+
+	/**
+	 * @brief The bot associated with this application.
+	 */
+	class user* bot;
+};
+
+/**
+ * @brief The account information for an integration.
+ */
+struct DPP_EXPORT integration_account {
+	/**
+	 * @brief ID of the account
+	 */
+	snowflake id;
+
+	/**
+	 * @brief Name of the account.
+	 */
+	std::string name;
+};
+
+/**
+ * @brief Represents an integration on a guild, e.g. a connection to twitch.
+ */
+class DPP_EXPORT integration : public managed, public json_interface<integration> {
+protected:
+	friend struct json_interface<integration>;
+
+	/** Read class values from json object
+	 * @param j A json object to read from
+	 * @return A reference to self
+	 */
+	integration& fill_from_json_impl(nlohmann::json* j);
+
+	/** Build a json from this object.
+	 * @param with_id Add ID to output
+	 * @return JSON of the object
+	 */
+	virtual json to_json_impl(bool with_id = false) const;
+
+public:
+	/**
+	 * @brief Integration name.
+	 */
+	std::string name;
+
+	/**
+	 * @brief Integration type (twitch, youtube, discord, or guild_subscription).
+	 */
+	integration_type type;
+
+	/**
+	 * @brief Integration flags from dpp::integration_flags
+	 */
+	uint8_t flags;
+
+	/**
+	 * @brief ID that this integration uses for "subscribers".
+	 *
+	 * @warning This is not provided for discord bot integrations.
+	 */
+	snowflake role_id;
+
+	/**
+	 * @brief The grace period (in days) before expiring subscribers.
+	 *
+	 * @warning This is not provided for discord bot integrations.
+	 */
+	uint32_t expire_grace_period;
+
+	/**
+	 * @brief User for this integration
+	 */
+	user user_obj;
+
+	/**
+	 * @brief Integration account information
+	 */
+	integration_account account;
+
+	/**
+	 * @brief When this integration was last synced.
+	 *
+	 * @warning This is not provided for discord bot integrations.
+	 */
+	time_t synced_at;
+
+	/**
+	 * @brief How many subscribers this integration has.
+	 *
+	 * @warning This is not provided for discord bot integrations.
+	 */
+	uint32_t subscriber_count;
+
+	/**
+	 * @brief The bot/OAuth2 application for discord integrations.
+	 */
+	integration_app app;
+
+	/**
+	 * @brief The scopes the application has been authorized for.
+	 */
+	std::vector<std::string> scopes;
+
+	/** Default constructor */
+	integration();
+
+	/** Default destructor */
+	~integration() = default;
+
+	/**
+	 * Are emoticons enabled for this integration?
+	 * @warning This is not provided for discord bot integrations.
+	 */
+	bool emoticons_enabled() const;
+
+	/**
+	 * Is the integration enabled?
+	 * @warning This is not provided for discord bot integrations.
+	 */
+	bool is_enabled() const;
+
+	/**
+	 * Is the integration syncing?
+	 * @warning This is not provided for discord bot integrations.
+	 */
+	bool is_syncing() const;
+
+	/**
+	 * Has this integration been revoked?
+	 * @warning This is not provided for discord bot integrations.
+	 */
+	bool is_revoked() const;
+
+	/**
+	 * Will the user be kicked if their subscription runs out to the integration?
+	 * If false, the integration will simply remove the role that is specified by `role_id`.
+	 * @warning This is not provided for discord bot integrations.
+	 */
+	bool expiry_kicks_user() const;
+};
+
+/**
+ * @brief The connection object that the user has attached.
+ */
+class DPP_EXPORT connection : public json_interface<connection> {
+protected:
+	friend struct json_interface<connection>;
+
+	/** Read class values from json object
+	 * @param j A json object to read from
+	 * @return A reference to self
+	 */
+	connection& fill_from_json_impl(nlohmann::json* j);
+
+public:
+	/**
+	 * @brief ID of the connection account.
+	 */
+	std::string id;
+
+	/**
+	 * @brief the username of the connection account.
+	 */
+	std::string name;
+
+	/**
+	 * @brief the service of the connection (twitch, youtube, discord, or guild_subscription).
+	 */
+	std::string type;
+
+	/**
+	 * @brief Optional: whether the connection is revoked.
+	 */
+	bool revoked;
+
+	/**
+	 * @brief Optional: an array of partial server integrations.
+	 */
+	std::vector<integration> integrations;
+
+	/**
+	 * @brief Whether the connection is verified.
+	 */
+	bool verified;
+
+	/**
+	 * @brief Whether friend sync is enabled for this connection.
+	 */
+	bool friend_sync;
+
+	/**
+	 * @brief Whether activities related to this connection will be shown in presence updates.
+	 */
+	bool show_activity;
+
+	/**
+	 * @brief Whether this connection has a corresponding third party OAuth2 token.
+	 */
+	bool two_way_link;
+
+	/**
+	 * @brief Visibility of this connection.
+	 */
+	bool visible;
+
+	/**
+	 * @brief Construct a new connection object
+	 */
+	connection();
+};
+
+/**
+ * @brief A group of integrations
+ */
+typedef std::unordered_map<snowflake, integration> integration_map;
+
+/**
+ * @brief A group of connections
+ */
+typedef std::unordered_map<snowflake, connection> connection_map;
+
+}
+
diff --git a/3rdParty/dpp/intents.h b/3rdParty/dpp/intents.h
index 1e5932198d..2af071a932 100644
--- a/3rdParty/dpp/intents.h
+++ b/3rdParty/dpp/intents.h
@@ -1,86 +1,165 @@
-/************************************************************************************
- *
- * D++, A Lightweight C++ library for Discord
- *
- * Copyright 2021 Craig Edwards and D++ contributors 
- * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- ************************************************************************************/
-#pragma once
-
-namespace dpp {
-
-/**
- * @brief intents are a bitmask of allowed events on your websocket.
- * 
- * Some of these are known as Privileged intents (GUILD_MEMBERS and GUILD_PRESENCES)
- * and require verification of a bot over 100 servers by discord via submission of
- * your real life ID.
- */
-enum intents {
-	/// Intent for receipt of guild information 
-	i_guilds			= (1 << 0),
-	/// Intent for receipt of guild members
-	i_guild_members			= (1 << 1),
-	/// Intent for receipt of guild bans
-	i_guild_bans			= (1 << 2),
-	/// Intent for receipt of guild emojis
-	i_guild_emojis			= (1 << 3),
-	/// Intent for receipt of guild integrations
-	i_guild_integrations		= (1 << 4),
-	/// Intent for receipt of guild webhooks
-	i_guild_webhooks		= (1 << 5),
-	/// Intent for receipt of guild invites
-	i_guild_invites			= (1 << 6),
-	/// Intent for receipt of guild voice states
-	i_guild_voice_states		= (1 << 7),
-	/// Intent for receipt of guild presences
-	i_guild_presences		= (1 << 8),
-	/// Intent for receipt of guild messages
-	i_guild_messages		= (1 << 9),
-	/// Intent for receipt of guild message reactions
-	i_guild_message_reactions	= (1 << 10),
-	/// Intent for receipt of guild message typing notifications
-	i_guild_message_typing		= (1 << 11),
-	/// Intent for receipt of direct messages (DMs)
-	i_direct_messages		= (1 << 12),
-	/// Intent for receipt of direct message reactions
-	i_direct_message_reactions	= (1 << 13),
-	/// Intent for receipt of direct message typing notifications
-	i_direct_message_typing		= (1 << 14),
-	/// Intent for receipt of message content
-	i_message_content		= (1 << 15),
-	/// Scheduled events
-	i_guild_scheduled_events	= (1 << 16),
-	/// Auto moderation configuration
-	i_auto_moderation_configuration	= (1 << 20),
-	/// Auto moderation configuration
-	i_auto_moderation_execution	= (1 << 21),
-	/// Default D++ intents (all non-privileged intents)
-	i_default_intents		= dpp::i_guilds | dpp::i_guild_bans | dpp::i_guild_emojis | dpp::i_guild_integrations |
-					dpp::i_guild_webhooks | dpp::i_guild_invites | dpp::i_guild_voice_states |
-					dpp::i_guild_messages | dpp::i_guild_message_reactions | dpp::i_guild_message_typing |
-					dpp::i_direct_messages | dpp::i_direct_message_typing | dpp::i_direct_message_reactions |
-					dpp::i_guild_scheduled_events | dpp::i_auto_moderation_configuration |
-					dpp::i_auto_moderation_execution, 
-	/// Privileged intents requiring ID
-	i_privileged_intents		= dpp::i_guild_members | dpp::i_guild_presences | dpp::i_message_content,
-	/// Every single intent
-	i_all_intents			= dpp::i_default_intents | dpp::i_privileged_intents,
-        /// Unverified bots default intents
-        i_unverified_default_intents    = dpp::i_default_intents | dpp::i_message_content
-};
-
-};
+/************************************************************************************
+ *
+ * D++, A Lightweight C++ library for Discord
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright 2021 Craig Edwards and D++ contributors 
+ * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ************************************************************************************/
+#pragma once
+
+namespace dpp {
+
+/**
+ * @brief intents are a bitmask of allowed events on your websocket.
+ * 
+ * Some of these are known as Privileged intents (GUILD_MEMBERS and GUILD_PRESENCES)
+ * and require verification of a bot over 100 servers by discord via submission of
+ * your real life ID.
+ */
+enum intents {
+	/**
+	 * @brief Intent for receipt of guild information.
+	 */
+	i_guilds			= (1 << 0),
+
+	/**
+	 * @brief Intent for receipt of guild members.
+	 */
+	i_guild_members			= (1 << 1),
+
+	/**
+	 * @brief Intent for receipt of guild bans.
+	 */
+	i_guild_bans			= (1 << 2),
+
+	/**
+	 * @brief Intent for receipt of guild emojis.
+	 */
+	i_guild_emojis			= (1 << 3),
+
+	/**
+	 * @brief Intent for receipt of guild integrations.
+	 */
+	i_guild_integrations		= (1 << 4),
+
+	/**
+	 * @brief Intent for receipt of guild webhooks.
+	 */
+	i_guild_webhooks		= (1 << 5),
+
+	/**
+	 * @brief Intent for receipt of guild invites.
+	 */
+	i_guild_invites			= (1 << 6),
+
+	/**
+	 * @brief Intent for receipt of guild voice states.
+	 */
+	i_guild_voice_states		= (1 << 7),
+
+	/**
+	 * @brief Intent for receipt of guild presences.
+	 */
+	i_guild_presences		= (1 << 8),
+
+	/**
+	 * @brief Intent for receipt of guild messages.
+	 */
+	i_guild_messages		= (1 << 9),
+
+	/**
+	 * @brief Intent for receipt of guild message reactions.
+	 */
+	i_guild_message_reactions	= (1 << 10),
+
+	/**
+	 * @brief Intent for receipt of guild message typing notifications.
+	 */
+	i_guild_message_typing		= (1 << 11),
+
+	/**
+	 * @brief Intent for receipt of direct messages (DMs).
+	 */
+	i_direct_messages		= (1 << 12),
+
+	/**
+	 * @brief Intent for receipt of direct message reactions.
+	 */
+	i_direct_message_reactions	= (1 << 13),
+
+	/**
+	 * @brief Intent for receipt of direct message typing notifications.
+	 */
+	i_direct_message_typing		= (1 << 14),
+
+	/**
+	 * @brief Intent for receipt of message content.
+	 */
+	i_message_content		= (1 << 15),
+
+	/**
+	 * @brief Scheduled events.
+	 */
+	i_guild_scheduled_events	= (1 << 16),
+
+	/**
+	 * @brief Auto moderation configuration.
+	 */
+	i_auto_moderation_configuration	= (1 << 20),
+
+	/**
+	 * @brief Auto moderation configuration.
+	 */
+	i_auto_moderation_execution	= (1 << 21),
+
+	/**
+	 * @brief Intent for receipt of guild message poll votes.
+	 */
+	i_guild_message_polls		= (1 << 24),
+
+	/**
+	 * @brief Intent for receipt of direct message poll votes.
+	 */
+	i_direct_message_polls		= (1 << 25),
+
+	/**
+	 * @brief Default D++ intents (all non-privileged intents).
+	 */
+	i_default_intents		= dpp::i_guilds | dpp::i_guild_bans | dpp::i_guild_emojis | dpp::i_guild_integrations |
+					dpp::i_guild_webhooks | dpp::i_guild_invites | dpp::i_guild_voice_states |
+					dpp::i_guild_messages | dpp::i_guild_message_reactions | dpp::i_guild_message_typing |
+					dpp::i_direct_messages | dpp::i_direct_message_typing | dpp::i_direct_message_reactions |
+					dpp::i_guild_scheduled_events | dpp::i_auto_moderation_configuration |
+					dpp::i_auto_moderation_execution | dpp::i_guild_message_polls | dpp::i_direct_message_polls,
+
+	/**
+	 * @brief Privileged intents requiring ID.
+	 */
+	i_privileged_intents		= dpp::i_guild_members | dpp::i_guild_presences | dpp::i_message_content,
+
+	/**
+	 * @brief Every single intent (dpp::i_default_intents and dpp::i_privileged_intents).
+	 */
+	i_all_intents			= dpp::i_default_intents | dpp::i_privileged_intents,
+
+	/**
+	 * @brief Unverified bots default intents.
+	 */
+        i_unverified_default_intents    = dpp::i_default_intents | dpp::i_message_content
+};
+
+}
diff --git a/3rdParty/dpp/invite.h b/3rdParty/dpp/invite.h
index fe61b67e14..ec275a6301 100644
--- a/3rdParty/dpp/invite.h
+++ b/3rdParty/dpp/invite.h
@@ -1,110 +1,245 @@
-/************************************************************************************
- *
- * D++, A Lightweight C++ library for Discord
- *
- * Copyright 2021 Craig Edwards and D++ contributors 
- * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- ************************************************************************************/
-#pragma once
-#include <dpp/export.h>
-#include <dpp/snowflake.h>
-#include <dpp/nlohmann/json_fwd.hpp>
-#include <dpp/stage_instance.h>
-#include <unordered_map>
-#include <dpp/json_interface.h>
-
-namespace dpp {
-
-/**
- * @brief Represents an invite to a discord guild or channel
- */
-class DPP_EXPORT invite : public json_interface<invite> {
-public:
-	/** Invite code
-	 */
-	std::string code;
-	/** Readonly expiration timestamp of this invite or 0 if the invite doesn't expire
-	 */
-	time_t expires_at;
-	/** Guild for the invite
-	 */
-	snowflake guild_id;
-	/** Channel id for invite 
-	 */
-	snowflake channel_id;
-	/** User ID of invite creator
-	 */
-	snowflake inviter_id;
-	/** Target user ID of invite, for invites sent via DM
-	 */
-	snowflake target_user_id;
-	/** Target user type (generally this is always 1, "stream")
-	 */
-	uint8_t target_user_type;
-	/** Approximate number of online users
-	 */
-	uint32_t approximate_presence_count;
-	/** Approximate total users online and offline
-	 */
-	uint32_t approximate_member_count;
-	/** Maximum age (in seconds) of invite
-	 */
-	uint32_t max_age;
-	/** Maximum number of uses
-	 */
-	uint32_t max_uses;
-	/** True if a temporary invite which grants access for a limited time
-	 */
-	bool temporary;
-	/** True if this invite should not replace or "attach to" similar invites
-	 */
-	bool unique;
-	/** How many times this invite has been used
-	 *
-	 * @note Only set when using cluster::channel_invites_get
-	 */
-	uint32_t uses;
-	/** The stage instance data if there is a public stage instance in the stage channel this invite is for
-	 * @deprecated Deprecated
-	 */
-	stage_instance stage;
-
-	/** Constructor
-	 */
-	invite();
-
-	/** Destructor
-	 */
-	virtual ~invite() = default;
-
-	/** Read class values from json object
-	 * @param j A json object to read from
-	 * @return A reference to self
-	 */
-	invite& fill_from_json(nlohmann::json* j);
-
-	/** Build JSON from this object.
-	 * @param with_id Include ID in JSON
-	 * @return The JSON text of the invite
-	 */
-	virtual std::string build_json(bool with_id = false) const;
-
-};
-
-/** A container of invites */
-typedef std::unordered_map<std::string, invite> invite_map;
-
-};
+/************************************************************************************
+ *
+ * D++, A Lightweight C++ library for Discord
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright 2021 Craig Edwards and D++ contributors 
+ * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ************************************************************************************/
+#pragma once
+#include <dpp/export.h>
+#include <dpp/snowflake.h>
+#include <dpp/json_fwd.h>
+#include <dpp/stage_instance.h>
+#include <unordered_map>
+#include <dpp/json_interface.h>
+#include <dpp/channel.h>
+#include <dpp/user.h>
+#include <dpp/guild.h>
+
+namespace dpp {
+
+/**
+ * @brief Invite target types for dpp::invite
+ */
+enum invite_target_t : uint8_t {
+	/**
+	 * @brief Undefined invite target type.
+	 */
+	itt_none = 0,
+
+	/**
+	 * @brief Stream target type.
+	 */
+	itt_stream = 1,
+
+	/**
+	 * @brief Embedded Application target type.
+	 */
+	itt_embedded_application = 2,
+};
+
+/**
+ * @brief Represents an invite to a discord guild or channel
+ */
+class DPP_EXPORT invite : public json_interface<invite> {
+protected:
+	friend struct json_interface<invite>;
+
+	/** Read class values from json object
+	 * @param j A json object to read from
+	 * @return A reference to self
+	 */
+	invite& fill_from_json_impl(nlohmann::json* j);
+
+	/** Build JSON from this object.
+	 * @param with_id Include ID in JSON
+	 * @return The JSON of the invite
+	 */
+	virtual json to_json_impl(bool with_id = false) const;
+
+public:
+	/**
+	 * @brief Invite code.
+	 */
+	std::string code;
+
+	/**
+	 * @brief Readonly expiration timestamp of this invite or 0 if the invite doesn't expire.
+	 * @note Only returned from cluster::invite_get
+	 */
+	time_t expires_at;
+
+	/**
+	 * @brief Guild ID this invite is for.
+	 */
+	snowflake guild_id;
+
+	/**
+	 * @brief The partial guild this invite is for.
+	 * @note Only filled in retrieved invites.
+	 */
+	guild destination_guild;
+
+	/**
+	 * @brief Channel ID this invite is for.
+	 */
+	snowflake channel_id;
+
+	/**
+	 * @brief The partial channel this invite is for.
+	 * @note Only filled in retrieved invites.
+	 */
+	channel destination_channel;
+
+	/**
+	 * @brief User ID who created this invite.
+	 * @deprecated Use the `inviter` field instead
+	 */
+	snowflake inviter_id;
+
+	/**
+	 * @brief User who created this invite.
+	 */
+	user inviter;
+
+	/**
+	 * @brief The user ID whose stream to display for this voice channel stream invite.
+	 */
+	snowflake target_user_id;
+
+	/**
+	 * @brief Target type for this voice channel invite.
+	 */
+	invite_target_t target_type;
+
+	/**
+	 * @brief Approximate number of online users.
+	 * @note Only returned from cluster::invite_get
+	 */
+	uint32_t approximate_presence_count;
+
+	/**
+	 * @brief Approximate number of total users online and offline.
+	 * @note Only returned from cluster::invite_get.
+	 */
+	uint32_t approximate_member_count;
+
+	/**
+	 * @brief Duration (in seconds) after which the invite expires, or 0 for no expiration. Defaults to 86400 (1 day).
+	 *
+	 * @note Must be between 0 and 604800 (7 days).
+	 */
+	uint32_t max_age;
+
+	/**
+	 * @brief Maximum number of uses, or 0 for unlimited. Defaults to 0.
+	 *
+	 * @note Must be between 0 and 100.
+	 */
+	uint8_t max_uses;
+
+	/**
+	 * @brief Whether this invite only grants temporary membership.
+	 */
+	bool temporary;
+
+	/**
+	 * @brief True if this invite should not replace or "attach to" similar invites.
+	 */
+	bool unique;
+
+	/**
+	 * @brief How many times this invite has been used.
+	 */
+	uint32_t uses;
+
+	/**
+	 * @note The stage instance data if there is a public stage instance in the stage channel this invite is for.
+	 * @deprecated Deprecated
+	 */
+	stage_instance stage;
+
+	/**
+	 * @brief Timestamp at which the invite was created.
+	 */
+	time_t created_at;
+
+	/**
+	 * @brief Constructor.
+	 */
+	invite();
+
+	/**
+	 * @brief Destructor.
+	 */
+	virtual ~invite() = default;
+
+	/**
+	 * @brief Set the max age after which the invite expires
+	 *
+	 * @param max_age_ The duration in seconds, or 0 for no expiration. Must be between 0 and 604800 (7 days)
+	 * @return invite& reference to self for chaining of calls
+	 */
+	invite& set_max_age(const uint32_t max_age_);
+
+	/**
+	 * @brief Set the maximum number of uses for this invite
+	 *
+	 * @param max_uses_ Maximum number of uses, or 0 for unlimited. Must be between 0 and 100
+	 * @return invite& reference to self for chaining of calls
+	 */
+	invite& set_max_uses(const uint8_t max_uses_);
+
+	/**
+	 * @brief Set the target user id
+	 *
+	 * @param user_id The user ID whose stream to display for this voice channel stream invite
+	 * @return invite& reference to self for chaining of calls
+	 */
+	invite& set_target_user_id(const snowflake user_id);
+
+	/**
+	 * @brief Set the target type for this voice channel invite
+	 *
+	 * @param type invite_target_t Target type
+	 * @return invite& reference to self for chaining of calls
+	 */
+	invite& set_target_type(const invite_target_t type);
+
+	/**
+	 * @brief Set temporary property of this invite object
+	 *
+	 * @param is_temporary Whether this invite only grants temporary membership
+	 * @return invite& reference to self for chaining of calls
+	 */
+	invite& set_temporary(const bool is_temporary);
+
+	/**
+	 * @brief Set unique property of this invite object
+	 *
+	 * @param is_unique True if this invite should not replace or "attach to" similar invites
+	 * @return invite& reference to self for chaining of calls
+	 */
+	invite& set_unique(const bool is_unique);
+};
+
+/**
+ * @brief A container of invites
+ */
+typedef std::unordered_map<std::string, invite> invite_map;
+
+}
diff --git a/3rdParty/dpp/isa/avx.h b/3rdParty/dpp/isa/avx.h
new file mode 100644
index 0000000000..d771ed7a36
--- /dev/null
+++ b/3rdParty/dpp/isa/avx.h
@@ -0,0 +1,112 @@
+/************************************************************************************
+ *
+ * D++, A Lightweight C++ library for Discord
+ *
+ * Copyright 2021 Craig Edwards and D++ contributors
+ * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ************************************************************************************/
+#pragma once
+
+#if defined _MSC_VER || defined __GNUC__ || defined __clang__
+
+#include <immintrin.h>
+#include <numeric>
+#include <cstdint>
+#include <limits>
+
+namespace dpp {
+
+	using avx_float = __m128;
+
+	/**
+	 * @brief A class for audio mixing operations using AVX instructions.
+	 */
+	class audio_mixer {
+	public:
+
+		/**
+		 * @brief The number of 32-bit values per CPU register.
+		 */
+		inline static constexpr int32_t byte_blocks_per_register{ 4 };
+
+		/**
+		 * @brief Collect a single register worth of data from data_in, apply gain and increment, and store the result in data_out.
+		 *        This version uses AVX instructions.
+		 *
+		 * @param data_in Pointer to the input array of int32_t values.
+		 * @param data_out Pointer to the output array of int16_t values.
+		 * @param current_gain The gain to be applied to the elements.
+		 * @param increment The increment value to be added to each element.
+		 */
+		inline void collect_single_register(int32_t* data_in, int16_t* data_out, float current_gain, float increment) {
+			avx_float current_samples_new{ _mm_mul_ps(gather_values(data_in),
+				_mm_add_ps(_mm_set1_ps(current_gain), _mm_mul_ps(_mm_set1_ps(increment), _mm_set_ps(0.0f, 1.0f, 2.0f, 3.0f)))) };
+
+			current_samples_new = _mm_blendv_ps(_mm_max_ps(current_samples_new, _mm_set1_ps(static_cast<float>(std::numeric_limits<int16_t>::min()))),
+				_mm_min_ps(current_samples_new, _mm_set1_ps(static_cast<float>(std::numeric_limits<int16_t>::max()))),
+				_mm_cmp_ps(current_samples_new, _mm_set1_ps(0.0f), _CMP_GE_OQ));
+
+			store_values(current_samples_new, data_out);
+		}
+
+		/**
+		 * @brief Combine a register worth of elements from decoded_data and store the result in up_sampled_vector.
+		 *        This version uses AVX instructions.
+		 *
+		 * @param up_sampled_vector Pointer to the array of int32_t values.
+		 * @param decoded_data Pointer to the array of int16_t values.
+		 */
+		inline void combine_samples(int32_t* up_sampled_vector, const int16_t* decoded_data) {
+			auto newValues{ _mm_add_ps(gather_values(up_sampled_vector), gather_values(decoded_data)) };
+			store_values(newValues, up_sampled_vector);
+		}
+
+	protected:
+		/**
+		 * @brief Array for storing the values to be loaded/stored.
+		 */
+		alignas(16) float values[byte_blocks_per_register]{};
+
+		/**
+		 * @brief Stores values from a 128-bit AVX vector to a storage location.
+		 * @tparam value_type The target value type for storage.
+		 * @param values_to_store The 128-bit AVX vector containing values to store.
+		 * @param storage_location Pointer to the storage location.
+		 */
+		template<typename value_type> inline void store_values(const avx_float& values_to_store, value_type* storage_location) {
+			_mm_store_ps(values, values_to_store);
+			for (int64_t x = 0; x < byte_blocks_per_register; ++x) {
+				storage_location[x] = static_cast<value_type>(values[x]);
+			}
+		}
+
+		/**
+		 * @brief Specialization for gathering non-float values into an AVX register.
+		 * @tparam value_type The type of values being gathered.
+		 * @tparam Indices Parameter pack of indices for gathering values.
+		 * @return An AVX register containing gathered values.
+		 */
+		template<typename value_type> inline avx_float gather_values(value_type* values_new) {
+			for (uint64_t x = 0; x < byte_blocks_per_register; ++x) {
+				values[x] = static_cast<float>(values_new[x]);
+			}
+			return _mm_load_ps(values);
+		}
+	};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/3rdParty/dpp/isa/avx2.h b/3rdParty/dpp/isa/avx2.h
new file mode 100644
index 0000000000..23fe51bb9c
--- /dev/null
+++ b/3rdParty/dpp/isa/avx2.h
@@ -0,0 +1,115 @@
+/************************************************************************************
+ *
+ * D++, A Lightweight C++ library for Discord
+ *
+ * Copyright 2021 Craig Edwards and D++ contributors
+ * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ************************************************************************************/
+#pragma once
+
+#if defined _MSC_VER || defined __GNUC__ || defined __clang__
+
+#include <immintrin.h>
+#include <numeric>
+#include <cstdint>
+#include <limits>
+
+namespace dpp {
+
+	using avx_2_float = __m256;
+
+	/**
+	 * @brief A class for audio mixing operations using AVX2 instructions.
+	 */
+	class audio_mixer {
+	public:
+
+		/**
+		 * @brief The number of 32-bit values per CPU register.
+		 */
+		inline static constexpr int32_t byte_blocks_per_register{ 8 };
+
+		/**
+		 * @brief Collect a single register worth of data from data_in, apply gain and increment, and store the result in data_out.
+		 *        This version uses AVX2 instructions.
+		 *
+		 * @param data_in Pointer to the input array of int32_t values.
+		 * @param data_out Pointer to the output array of int16_t values.
+		 * @param current_gain The gain to be applied to the elements.
+		 * @param increment The increment value to be added to each element.
+		 */
+		inline void collect_single_register(int32_t* data_in, int16_t* data_out, float current_gain, float increment) {
+			avx_2_float current_samples_new{ _mm256_mul_ps(gather_values(data_in),
+				_mm256_add_ps(_mm256_set1_ps(current_gain),
+					_mm256_mul_ps(_mm256_set1_ps(increment), _mm256_set_ps(0.0f, 1.0f, 2.0f, 3.0f, 4.0f, 5.0f, 6.0f, 7.0f)))) };
+
+			current_samples_new =
+				_mm256_blendv_ps(_mm256_max_ps(current_samples_new, _mm256_set1_ps(static_cast<float>(std::numeric_limits<int16_t>::min()))),
+					_mm256_min_ps(current_samples_new, _mm256_set1_ps(static_cast<float>(std::numeric_limits<int16_t>::max()))),
+					_mm256_cmp_ps(current_samples_new, _mm256_set1_ps(0.0f), _CMP_GE_OQ));
+
+			store_values(current_samples_new, data_out);
+		}
+
+		/**
+		 * @brief Combine a register worth of elements from decoded_data and store the result in up_sampled_vector.
+		 *        This version uses AVX2 instructions.
+		 *
+		 * @param up_sampled_vector Pointer to the array of int32_t values.
+		 * @param decoded_data Pointer to the array of int16_t values.
+		 * @param x Index to select a specific set of elements to combine.
+		 */
+		inline void combine_samples(int32_t* up_sampled_vector, const int16_t* decoded_data) {
+			auto newValues{ _mm256_add_ps(gather_values(up_sampled_vector), gather_values(decoded_data)) };
+			store_values(newValues, up_sampled_vector);
+		}
+
+	protected:
+		/**
+		 * @brief Array for storing the values to be loaded/stored.
+		 */
+		alignas(32) float values[byte_blocks_per_register]{};
+
+		/**
+		 * @brief Stores values from a 256-bit AVX2 vector to a storage location.
+		 * @tparam value_type The target value type for storage.
+		 * @param values_to_store The 256-bit AVX2 vector containing values to store.
+		 * @param storage_location Pointer to the storage location.
+		 */
+		template<typename value_type> inline void store_values(const avx_2_float& values_to_store, value_type* storage_location) {
+			_mm256_store_ps(values, values_to_store);
+			for (int64_t x = 0; x < byte_blocks_per_register; ++x) {
+				storage_location[x] = static_cast<value_type>(values[x]);
+			}
+		}
+
+		/**
+		 * @brief Specialization for gathering non-float values into an AVX2 register.
+		 * @tparam value_type The type of values being gathered.
+		 * @tparam Indices Parameter pack of indices for gathering values.
+		 * @return An AVX2 register containing gathered values.
+		 */
+		template<typename value_type> inline avx_2_float gather_values(value_type* values_new) {
+			for (uint64_t x = 0; x < byte_blocks_per_register; ++x) {
+				values[x] = static_cast<float>(values_new[x]);
+			}
+			return _mm256_load_ps(values);
+		}
+	};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/3rdParty/dpp/isa/avx512.h b/3rdParty/dpp/isa/avx512.h
new file mode 100644
index 0000000000..2d1ea1dcd6
--- /dev/null
+++ b/3rdParty/dpp/isa/avx512.h
@@ -0,0 +1,118 @@
+/************************************************************************************
+ *
+ * D++, A Lightweight C++ library for Discord
+ *
+ * Copyright 2021 Craig Edwards and D++ contributors
+ * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ************************************************************************************/
+#pragma once
+
+#if defined _MSC_VER || defined __GNUC__ || defined __clang__
+
+#include <immintrin.h>
+#include <numeric>
+#include <cstdint>
+#include <limits>
+
+namespace dpp {
+
+	using avx_512_float = __m512;
+
+	/**
+	 * @brief A class for audio mixing operations using AVX512 instructions.
+	 */
+	class audio_mixer {
+	public:
+
+		/**
+		 * @brief The number of 32-bit values per CPU register.
+		 */
+		inline static constexpr int32_t byte_blocks_per_register{ 16 };
+
+		/**
+		 * @brief Collect a single register worth of data from data_in, apply gain and increment, and store the result in data_out.
+		 *        This version uses AVX512 instructions.
+		 *
+		 * @param data_in Pointer to the input array of int32_t values.
+		 * @param data_out Pointer to the output array of int16_t values.
+		 * @param current_gain The gain to be applied to the elements.
+		 * @param increment The increment value to be added to each element.
+		 */
+		inline void collect_single_register(int32_t* data_in, int16_t* data_out, float current_gain, float increment) {
+			avx_512_float current_samples_new{ _mm512_mul_ps(gather_values(data_in),
+				_mm512_add_ps(_mm512_set1_ps(current_gain),
+					_mm512_mul_ps(_mm512_set1_ps(increment),
+						_mm512_set_ps(0.0f, 1.0f, 2.0f, 3.0f, 4.0f, 5.0f, 6.0f, 7.0f, 8.0f, 9.0f, 10.0f, 11.0f, 12.0f, 13.0f, 14.0f, 15.0f)))) };
+
+			__m512 lower_limit = _mm512_set1_ps(static_cast<float>(std::numeric_limits<int16_t>::min()));
+			__m512 upper_limit = _mm512_set1_ps(static_cast<float>(std::numeric_limits<int16_t>::max()));
+
+			__mmask16 mask_ge = _mm512_cmp_ps_mask(current_samples_new, _mm512_set1_ps(0.0f), _CMP_GE_OQ);
+
+			current_samples_new = _mm512_mask_max_ps(current_samples_new, mask_ge, current_samples_new, lower_limit);
+			current_samples_new = _mm512_mask_min_ps(current_samples_new, ~mask_ge, current_samples_new, upper_limit);
+
+			store_values(current_samples_new, data_out);
+		}
+
+		/**
+		 * @brief Combine a register worth of elements from decoded_data and store the result in up_sampled_vector.
+		 *        This version uses AVX512 instructions.
+		 *
+		 * @param up_sampled_vector Pointer to the array of int32_t values.
+		 * @param decoded_data Pointer to the array of int16_t values.
+		 */
+		inline void combine_samples(int32_t* up_sampled_vector, const int16_t* decoded_data) {
+			auto newValues{ _mm512_add_ps(gather_values(up_sampled_vector), gather_values(decoded_data)) };
+			store_values(newValues, up_sampled_vector);
+		}
+
+	protected:
+		/**
+		 * @brief Array for storing the values to be loaded/stored.
+		 */
+		alignas(64) float values[byte_blocks_per_register]{};
+
+		/**
+		 * @brief Stores values from a 512-bit AVX512 vector to a storage location.
+		 * @tparam value_type The target value type for storage.
+		 * @param values_to_store The 512-bit AVX512 vector containing values to store.
+		 * @param storage_location Pointer to the storage location.
+		 */
+		template<typename value_type> inline static void store_values(const avx_512_float& values_to_store, value_type* storage_location) {
+			_mm256_store_ps(values, values_to_store);
+			for (int64_t x = 0; x < byte_blocks_per_register; ++x) {
+				storage_location[x] = static_cast<value_type>(values[x]);
+			}
+		}
+
+		/**
+		 * @brief Specialization for gathering non-float values into an AVX512 register.
+		 * @tparam value_type The type of values being gathered.
+		 * @tparam Indices Parameter pack of indices for gathering values.
+		 * @return An AVX512 register containing gathered values.
+		 */
+		template<typename value_type> inline avx_512_float gather_values(value_type* values_new) {
+			for (uint64_t x = 0; x < byte_blocks_per_register; ++x) {
+				values[x] = static_cast<float>(values_new[x]);
+			}
+			return _mm512_load_ps(values);
+		}
+	};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/3rdParty/dpp/isa/fallback.h b/3rdParty/dpp/isa/fallback.h
new file mode 100644
index 0000000000..9ac63140f1
--- /dev/null
+++ b/3rdParty/dpp/isa/fallback.h
@@ -0,0 +1,79 @@
+/************************************************************************************
+ *
+ * D++, A Lightweight C++ library for Discord
+ *
+ * Copyright 2021 Craig Edwards and D++ contributors
+ * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ************************************************************************************/
+#pragma once
+
+#include <dpp/export.h>
+#include <numeric>
+#include <cstdint>
+#include <limits>
+
+namespace dpp {
+
+	/**
+	 * @brief A class for audio mixing operations using x64 instructions.
+	 */
+	class audio_mixer {
+	public:
+		/*
+		* @brief The number of 32-bit values per CPU register.
+		*/
+		inline static constexpr int32_t byte_blocks_per_register{ 2 };
+
+		/**
+		 * @brief Collect a single register worth of data from data_in, apply gain and increment, and store the result in data_out.
+		 *        This version uses x64 instructions.
+		 *
+		 * @param data_in Pointer to the input array of int32_t values.
+		 * @param data_out Pointer to the output array of int16_t values.
+		 * @param current_gain The gain to be applied to the elements.
+		 * @param increment The increment value to be added to each element.
+		 */
+		inline static void collect_single_register(int32_t* data_in, int16_t* data_out, float current_gain, float increment) {
+			for (uint64_t x = 0; x < byte_blocks_per_register; ++x) {
+				auto increment_new = increment * x;
+				auto current_gain_new = current_gain + increment_new;
+				auto current_sample_new = data_in[x] * current_gain_new;
+				if (current_sample_new >= std::numeric_limits<int16_t>::max()) {
+					current_sample_new = std::numeric_limits<int16_t>::max();
+				}
+				else if (current_sample_new <= std::numeric_limits<int16_t>::min()) {
+					current_sample_new = std::numeric_limits<int16_t>::min();
+				}
+				data_out[x] = static_cast<int16_t>(current_sample_new);
+			}
+		}
+
+		/**
+		 * @brief Combine a register worth of elements from decoded_data and store the result in up_sampled_vector.
+		 *        This version uses x64 instructions.
+		 *
+		 * @param up_sampled_vector Pointer to the array of int32_t values.
+		 * @param decoded_data Pointer to the array of int16_t values.
+		 */
+		inline static void combine_samples(int32_t* up_sampled_vector, const int16_t* decoded_data) {
+			for (uint64_t x = 0; x < byte_blocks_per_register; ++x) {
+				up_sampled_vector[x] += static_cast<int32_t>(decoded_data[x]);
+			}
+
+		}
+	};
+
+}
diff --git a/3rdParty/dpp/isa/neon.h b/3rdParty/dpp/isa/neon.h
new file mode 100644
index 0000000000..655b388a88
--- /dev/null
+++ b/3rdParty/dpp/isa/neon.h
@@ -0,0 +1,120 @@
+/************************************************************************************
+ *
+ * D++, A Lightweight C++ library for Discord
+ *
+ * Copyright 2021 Craig Edwards and D++ contributors
+ * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ************************************************************************************/
+#pragma once
+
+#if defined _MSC_VER || defined __GNUC__ || defined __clang__
+
+#include <arm_neon.h>
+#include <numeric>
+#include <cstdint>
+#include <limits>
+
+namespace dpp {
+
+	using neon_float = float32x4_t;
+
+	/**
+	 * @brief A class for audio mixing operations using ARM NEON instructions.
+	 */
+	class audio_mixer {
+	public:
+
+		/**
+		 * @brief The number of 32-bit values per CPU register.
+		 */
+		inline static constexpr int32_t byte_blocks_per_register{ 4 };
+
+		/**
+		 * @brief Collect a single register worth of data from data_in, apply gain and increment, and store the result in data_out.
+		 *        This version uses ARM NEON instructions.
+		 *
+		 * @param data_in Pointer to the input array of int32_t values.
+		 * @param data_out Pointer to the output array of int16_t values.
+		 * @param current_gain The gain to be applied to the elements.
+		 * @param increment The increment value to be added to each element.
+		 */
+		inline void collect_single_register(int32_t* data_in, int16_t* data_out, float current_gain, float increment) {
+			neon_float gathered_values = gather_values(data_in);
+			neon_float gain_vector = vdupq_n_f32(current_gain);
+			static constexpr float data[4] = { 0.0f, 1.0f, 2.0f, 3.0f };
+			neon_float floats = vld1q_f32(data);
+			neon_float increment_vector = vmulq_f32(vdupq_n_f32(increment), floats);
+			neon_float current_samples_new = vmulq_f32(gathered_values, vaddq_f32(gain_vector, increment_vector));
+
+			// Clamping the values between int16_t min and max
+			neon_float min_val = vdupq_n_f32(static_cast<float>(std::numeric_limits<int16_t>::min()));
+			neon_float max_val = vdupq_n_f32(static_cast<float>(std::numeric_limits<int16_t>::max()));
+
+			current_samples_new = vmaxq_f32(current_samples_new, min_val);
+			current_samples_new = vminq_f32(current_samples_new, max_val);
+
+			store_values(current_samples_new, data_out);
+		}
+
+		/**
+		 * @brief Combine a register worth of elements from decoded_data and store the result in up_sampled_vector.
+		 *        This version uses ARM NEON instructions.
+		 *
+		 * @param up_sampled_vector Pointer to the array of int32_t values.
+		 * @param decoded_data Pointer to the array of int16_t values.
+		 */
+		inline void combine_samples(int32_t* up_sampled_vector, const int16_t* decoded_data) {
+			neon_float up_sampled = gather_values(up_sampled_vector);
+			neon_float decoded = gather_values(decoded_data);
+			neon_float newValues = vaddq_f32(up_sampled, decoded);
+			store_values(newValues, up_sampled_vector);
+		}
+
+	protected:
+		/**
+		 * @brief Array for storing the values to be loaded/stored.
+		 */
+		alignas(16) float values[byte_blocks_per_register]{};
+
+		/**
+		 * @brief Stores values from a 128-bit NEON vector to a storage location.
+		 * @tparam value_type The target value type for storage.
+		 * @param values_to_store The 128-bit NEON vector containing values to store.
+		 * @param storage_location Pointer to the storage location.
+		 */
+		template<typename value_type> inline void store_values(const neon_float& values_to_store, value_type* storage_location) {
+			vst1q_f32(values, values_to_store);
+			for (int64_t x = 0; x < byte_blocks_per_register; ++x) {
+				storage_location[x] = static_cast<value_type>(values[x]);
+			}
+		}
+
+		/**
+		 * @brief Specialization for gathering non-float values into a NEON register.
+		 * @tparam value_type The type of values being gathered.
+		 * @return A NEON register containing gathered values.
+		 */
+		template<typename value_type> inline neon_float gather_values(value_type* values_new) {
+			for (uint64_t x = 0; x < byte_blocks_per_register; ++x) {
+				values[x] = static_cast<float>(values_new[x]);
+			}
+			return vld1q_f32(values);
+		}
+	};
+
+} // namespace dpp
+
+#endif
\ No newline at end of file
diff --git a/3rdParty/dpp/isa_detection.h b/3rdParty/dpp/isa_detection.h
new file mode 100644
index 0000000000..a3cecf365c
--- /dev/null
+++ b/3rdParty/dpp/isa_detection.h
@@ -0,0 +1,33 @@
+/************************************************************************************
+ *
+ * D++, A Lightweight C++ library for Discord
+ *
+ * Copyright 2021 Craig Edwards and D++ contributors
+ * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ************************************************************************************/
+#pragma once
+
+#if AVX_TYPE == 1024
+	#include "isa/neon.h"
+#elif AVX_TYPE == 512
+	#include "isa/avx512.h"
+#elif AVX_TYPE == 2
+	#include "isa/avx2.h"
+#elif AVX_TYPE == 1
+	#include "isa/avx.h"
+#else
+	#include "isa/fallback.h"
+#endif
diff --git a/3rdParty/dpp/json.h b/3rdParty/dpp/json.h
new file mode 100644
index 0000000000..3fa22d95e2
--- /dev/null
+++ b/3rdParty/dpp/json.h
@@ -0,0 +1,32 @@
+/************************************************************************************
+ *
+ * D++, A Lightweight C++ library for Discord
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright 2021 Craig Edwards and D++ contributors 
+ * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ************************************************************************************/
+#ifdef DPP_USE_EXTERNAL_JSON
+	#include <nlohmann/json.hpp>
+#else
+	#include <dpp/nlohmann/json.hpp>
+#endif
+
+namespace dpp {
+
+using json = nlohmann::json;
+
+}
diff --git a/3rdParty/dpp/json_fwd.h b/3rdParty/dpp/json_fwd.h
new file mode 100644
index 0000000000..9c1c89f8e9
--- /dev/null
+++ b/3rdParty/dpp/json_fwd.h
@@ -0,0 +1,32 @@
+/************************************************************************************
+ *
+ * D++, A Lightweight C++ library for Discord
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright 2021 Craig Edwards and D++ contributors 
+ * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ************************************************************************************/
+#ifdef DPP_USE_EXTERNAL_JSON
+	#include <nlohmann/json_fwd.hpp>
+#else
+	#include <dpp/nlohmann/json_fwd.hpp>
+#endif
+
+namespace dpp {
+
+using json = nlohmann::json;
+
+}
diff --git a/3rdParty/dpp/json_interface.h b/3rdParty/dpp/json_interface.h
index 302642db12..fa97b01806 100644
--- a/3rdParty/dpp/json_interface.h
+++ b/3rdParty/dpp/json_interface.h
@@ -1,61 +1,73 @@
-/************************************************************************************
- *
- * D++, A Lightweight C++ library for Discord
- *
- * Copyright 2022 Craig Edwards and D++ contributors 
- * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- ************************************************************************************/
-
-#pragma once
-#include <dpp/export.h>
-#include <dpp/exception.h>
-#include <dpp/nlohmann/json_fwd.hpp>
-
-namespace dpp {
-	/**
-	 * @brief Represents an interface for an object that can optionally implement functions
-	 * for converting to and from nlohmann::json. In the event either parse_from_json() or
-	 * build_json() are not implemented and are called, they will throw at runtime.
-	 * 
-	 * @tparam T Type of class that implements the interface
-	 */
-	template<typename T> struct DPP_EXPORT json_interface {
-	protected:
-		/* Must not destruct through pointer to json_interface. */
-		~json_interface() = default;
-
-	public:
-		/**
-		 * @brief Convert object from nlohmann::json
-		 * 
-		 * @param j nlohmann::json object
-		 * @return T& Reference to self for fluent calling
-		 */
-		T& fill_from_json(nlohmann::json* j) {
-			throw dpp::logic_exception("JSON interface doesn't implement parse_from_json");
-		}
-
-		/**
-		 * @brief Build JSON string from the object
-		 * 
-		 * @param with_id Include the ID in the JSON
-		 * @return std::string JSON string version of object
-		 */
-		virtual std::string build_json(bool with_id = false) const {
-			throw dpp::logic_exception("JSON interface doesn't implement build_json");
-		}
-	};
-};
+/************************************************************************************
+ *
+ * D++, A Lightweight C++ library for Discord
+ *
+ * Copyright 2022 Craig Edwards and D++ contributors 
+ * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ************************************************************************************/
+
+#pragma once
+#include <dpp/export.h>
+#include <dpp/json.h>
+
+namespace dpp {
+
+/**
+ * @brief Represents an interface for an object that can optionally implement functions
+ * for converting to and from nlohmann::json. The methods are only present if the actual object
+ * also has those methods.
+ *
+ * @tparam T Type of class that implements the interface
+ */
+template<typename T>
+struct json_interface {
+	/**
+	 * @brief Convert object from nlohmann::json
+	 *
+	 * @param j nlohmann::json object
+	 * @return T& Reference to self for fluent calling
+	 */
+	template <typename U = T, typename = decltype(std::declval<U&>().fill_from_json_impl(std::declval<nlohmann::json*>()))>
+	T& fill_from_json(nlohmann::json* j) {
+		return static_cast<T*>(this)->fill_from_json_impl(j);
+	}
+
+	/**
+	 * @brief Convert object to nlohmann::json
+	 *
+	 * @param with_id Whether to include the ID or not
+	 * @note Some fields are conditionally filled, do not rely on all fields being present
+	 * @return json Json built from the structure
+	 */
+	template <typename U = T, typename = decltype(std::declval<U&>().to_json_impl(bool{}))>
+	auto to_json(bool with_id = false) const {
+		return static_cast<const T*>(this)->to_json_impl(with_id);
+	}
+
+	/**
+	 * @brief Convert object to json string
+	 *
+	 * @param with_id Whether to include the ID or not
+	 * @note Some fields are conditionally filled, do not rely on all fields being present
+	 * @return std::string Json built from the structure
+	 */
+	template <typename U = T, typename = decltype(std::declval<U&>().to_json_impl(bool{}))>
+	std::string build_json(bool with_id = false) const {
+		return to_json(with_id).dump(-1, ' ', false, nlohmann::detail::error_handler_t::replace);
+	}
+};
+
+}
diff --git a/3rdParty/dpp/managed.h b/3rdParty/dpp/managed.h
index 3939b8994d..1e829ad39e 100644
--- a/3rdParty/dpp/managed.h
+++ b/3rdParty/dpp/managed.h
@@ -1,76 +1,116 @@
-/************************************************************************************
- *
- * D++, A Lightweight C++ library for Discord
- *
- * Copyright 2021 Craig Edwards and D++ contributors 
- * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- ************************************************************************************/
-#pragma once
-#include <dpp/export.h>
-#include <dpp/snowflake.h>
-#include <string>
-
-namespace dpp {
-
-	/** @brief The managed class is the base class for various types that can
-	 * be stored in a cache that are identified by a dpp::snowflake id.
-	 */
-	class DPP_EXPORT managed {
-	public:
-		/**
-		 * @brief Unique ID of object set by Discord.
-		 * This value contains a timestamp, worker ID, internal server ID, and an incrementing value.
-		 * Only the timestamp is relevant to us as useful metadata.
-		 */
-		snowflake id;
-		/**
-		 * @brief Constructor, initialises ID
-		 * @param nid ID to set
-		 */
-		managed(const snowflake nid = 0);
-		/**
-		 * @brief Destroy the managed object
-		 */
-		virtual ~managed() = default;
-
-		/**
-		 * @brief Get the creation time of this object according to Discord.
-		 * 
-		 * @return double creation time inferred from the snowflake ID.
-		 * The minimum possible value is the first second of 2015.
-		 */
-		double get_creation_time() const;
-
-		/**
-		 * @brief Comparison operator for comparing two managed objects by id
-		 * 
-		 * @param other Other object to compare against
-		 * @return true objects are the same id
-		 * @return false objects are not the same id
-		 */
-		bool operator==(const managed& other) const noexcept;
-
-		/**
-		 * @brief Comparison operator for comparing two managed objects by id
-		 * 
-		 * @param other Other object to compare against
-		 * @return true objects are not the same id
-		 * @return false objects are the same id
-		 */
-		bool operator!=(const managed& other) const noexcept;
-	};
-
-};
+/************************************************************************************
+ *
+ * D++, A Lightweight C++ library for Discord
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright 2021 Craig Edwards and D++ contributors 
+ * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ************************************************************************************/
+#pragma once
+#include <dpp/export.h>
+#include <dpp/snowflake.h>
+#include <string>
+
+namespace dpp {
+
+/** @brief The managed class is the base class for various types that can
+ * be stored in a cache that are identified by a dpp::snowflake id.
+ */
+class DPP_EXPORT managed {
+public:
+	/**
+	 * @brief Unique ID of object set by Discord.
+	 * This value contains a timestamp, worker ID, internal server ID, and an incrementing value.
+	 * Only the timestamp is relevant to us as useful metadata.
+	 */
+	snowflake id = {};
+
+	/**
+	 * @brief Constructor, initialises id to 0.
+	 */
+	managed() = default;
+
+	/**
+	 * @brief Constructor, initialises ID
+	 * @param nid ID to set
+	 */
+	managed(const snowflake nid) : id{nid} {}
+
+	/**
+	 * @brief Copy constructor
+	 * @param rhs Object to copy
+	 */
+	managed(const managed &rhs) = default;
+
+	/**
+	 * @brief Move constructor
+	 *
+	 * Effectively equivalent to copy constructor
+	 * @param rhs Object to move from
+	 */
+	managed(managed &&rhs) = default;
+
+	/**
+	 * @brief Destroy the managed object
+	 */
+	virtual ~managed() = default;
+
+	/**
+	 * @brief Copy assignment operator
+	 * @param rhs Object to copy
+	 */
+	managed &operator=(const managed& rhs) = default;
+
+	/**
+	 * @brief Move assignment operator
+	 * @param rhs Object to move from
+	 */
+	managed &operator=(managed&& rhs) = default;
+
+	/**
+	 * @brief Get the creation time of this object according to Discord.
+	 *
+	 * @return double creation time inferred from the snowflake ID.
+	 * The minimum possible value is the first second of 2015.
+	 */
+	constexpr double get_creation_time() const noexcept {
+		return id.get_creation_time();
+	};
+
+	/**
+	 * @brief Comparison operator for comparing two managed objects by id
+	 *
+	 * @param other Other object to compare against
+	 * @return true objects are the same id
+	 * @return false objects are not the same id
+	 */
+	constexpr bool operator==(const managed& other) const noexcept {
+		return id == other.id;
+	}
+
+	/**
+	 * @brief Comparison operator for comparing two managed objects by id
+	 *
+	 * @param other Other object to compare against
+	 * @return true objects are not the same id
+	 * @return false objects are the same id
+	 */
+	constexpr bool operator!=(const managed& other) const noexcept {
+		return id != other.id;
+	}
+};
+
+}
diff --git a/3rdParty/dpp/message.h b/3rdParty/dpp/message.h
index fb65d8824e..b1a205eae1 100644
--- a/3rdParty/dpp/message.h
+++ b/3rdParty/dpp/message.h
@@ -1,1491 +1,3319 @@
-/************************************************************************************
- *
- * D++, A Lightweight C++ library for Discord
- *
- * Copyright 2021 Craig Edwards and D++ contributors
- * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- ************************************************************************************/
-#pragma once
-#include <dpp/export.h>
-#include <dpp/queues.h>
-#include <dpp/snowflake.h>
-#include <dpp/managed.h>
-#include <dpp/user.h>
-#include <dpp/guild.h>
-#include <optional>
-#include <variant>
-#include <dpp/nlohmann/json_fwd.hpp>
-#include <dpp/json_interface.h>
-
-namespace dpp {
-
-/**
- * @brief Represents the type of a component
- */
-enum component_type : uint8_t {
-	/// Action row, a container for other components
-	cot_action_row = 1,
-	/// Clickable button
-	cot_button = 2,
-	/// Select menu for picking from defined text options
-	cot_selectmenu = 3,
-	/// Text input
-	cot_text = 4,
-	/// Select menu for users
-	cot_user_selectmenu = 5,
-	/// Select menu for roles
-	cot_role_selectmenu = 6,
-	/// Select menu for mentionables (users and roles)
-	cot_mentionable_selectmenu = 7,
-	/// Select menu for channels
-	cot_channel_selectmenu = 8,
-};
-
-/**
- * @brief Types of text input
- */
-enum text_style_type : uint8_t {
-	/// Intended for short single-line text.
-	text_short = 1,
-	/// Intended for much longer inputs.
-	text_paragraph = 2,
-};
-
-/**
- * @brief Represents the style of a button
- */
-enum component_style : uint8_t {
-	/// Blurple
-	cos_primary = 1,
-	/// Grey
-	cos_secondary,
-	/// Green
-	cos_success,
-	/// Red
-	cos_danger,
-	/// An external hyperlink to a website
-	cos_link
-};
-
-/**
- * @brief An option for a select component
- */
-struct DPP_EXPORT select_option : public json_interface<select_option> {
-	/**
-	 * @brief Label for option
-	 */
-	std::string label;
-	/**
-	 * @brief Value for option
-	 */
-	std::string value;
-	/**
-	 * @brief Description of option
-	 */
-	std::string description;
-	/**
-	 * @brief True if option is the default option
-	 */
-	bool is_default;
-	/**
-	 * @brief Emoji definition. To set an emoji on your button
-	 * you must set one of either the name or id fields.
-	 * The easiest way is to use the component::set_emoji
-	 * method.
-	 */
-	struct inner_select_emoji {
-		/**
-		 * @brief Set the name field to the name of the emoji.
-		 * For built in unicode emojis, set this to the
-		 * actual unicode value of the emoji e.g. "😄"
-		 * and not for example ":smile:"
-		 */
-		std::string name;
-		/**
-		 * @brief The emoji ID value for emojis that are custom
-		 * ones belonging to a guild. The same rules apply
-		 * as with other emojis, that the bot must be on
-		 * the guild where the emoji resides and it must
-		 * be available for use (e.g. not disabled due to
-		 * lack of boosts etc)
-		 */
-		dpp::snowflake id = 0;
-		/**
-		 * @brief True if the emoji is animated. Only applies to
-		 * custom emojis.
-		 */
-		bool animated = false;
-	} emoji;
-
-	/**
-	 * @brief Construct a new select option object
-	 */
-	select_option();
-
-	/**
-	 * @brief Destructs the select option object.
-	 */
-	virtual ~select_option() = default;
-
-	/**
-	 * @brief Construct a new select option object
-	 * 
-	 * @param label Label of option
-	 * @param value Value of option
-	 * @param description Description of option
-	 */
-	select_option(const std::string &label, const std::string &value, const std::string &description = "");
-
-	/**
-	 * @brief Set the label
-	 * 
-	 * @param l the user-facing name of the option. It will be truncated to the maximum length of 100 UTF-8 characters.
-	 * @return select_option& reference to self for chaining
-	 */
-	select_option& set_label(const std::string &l);
-
-	/**
-	 * @brief Set the value
-	 * 
-	 * @param v value to set. It will be truncated to the maximum length of 100 UTF-8 characters.
-	 * @return select_option& reference to self for chaining
-	 */
-	select_option& set_value(const std::string &v);
-
-	/**
-	 * @brief Set the description
-	 * 
-	 * @param d description to set. It will be truncated to the maximum length of 100 UTF-8 characters.
-	 * @return select_option& reference to self for chaining
-	 */
-	select_option& set_description(const std::string &d);
-
-	/**
-	 * @brief Set the emoji
-	 * 
-	 * @param n emoji name
-	 * @param id emoji id for custom emojis
-	 * @param animated true if animated emoji
-	 * @return select_option& reference to self for chaining
-	 */
-	select_option& set_emoji(const std::string &n, dpp::snowflake id = 0, bool animated = false);
-
-	/**
-	 * @brief Set the option as default
-	 * 
-	 * @param def true to set the option as default
-	 * @return select_option& reference to self for chaining
-	 */
-	select_option& set_default(bool def);
-
-	/**
-	 * @brief Set the emoji as animated
-	 * 
-	 * @param anim true if animated
-	 * @return select_option& reference to self for chaining
-	 */
-	select_option& set_animated(bool anim);
-
-	/** Read class values from json object
-	 * @param j A json object to read from
-	 * @return A reference to self
-	 */
-	select_option& fill_from_json(nlohmann::json* j);
-};
-
-/**
- * @brief Represents the component object.
- * A component is a clickable button or drop down list
- * within a discord message, where the buttons emit
- * on_button_click events when the user interacts with
- * them.
- *
- * You should generally define one component object and
- * then insert one or more additional components into it
- * using component::add_component(), so that the parent
- * object is an action row and the child objects are buttons.
- */
-class DPP_EXPORT component : public json_interface<component> {
-public:
-	/** Component type, either a button or action row
-	 */
-	component_type type;
-
-	/** Sub components, buttons on an action row
-	 */
-	std::vector<component> components;
-
-	/** Component label (for buttons, text inputs).
-	 * Maximum of 80 characters.
-	 */
-	std::string label;
-
-	/** Component style (for buttons)
-	 */
-	component_style style;
-
-	/**
-	 * @brief Text style (for text inputs)
-	 */
-	text_style_type text_style;
-
-	/** Component id (for buttons, menus, text inputs).
-	 * Maximum of 100 characters.
-	 */
-	std::string custom_id;
-
-	/** URL for link types (dpp::cos_link).
-	 * Maximum of 512 characters.
-	 */
-	std::string url;
-
-	/** Placeholder text for select menus and text inputs (max 150 characters)
-	 */
-	std::string placeholder;
-
-	/** Minimum number of items that must be chosen for a select menu.
-	 * Default is -1 to not set this
-	 */
-	int32_t min_values;
-
-	/** Maximum number of items that can be chosen for a select menu.
-	 * Default is -1 to not set this
-	 */
-	int32_t max_values;
-
-	/** Minimum length for text input (0-4000)
-	 */
-	int32_t min_length;
-
-	/** Maximum length for text input (1-4000)
-	 */
-	int32_t max_length;
-
-	/** Select options for select menus. Only required and available for select menus of type dpp::cot_selectmenu
-	 */
-	std::vector<select_option> options;
-
-	/** List of channel types (dpp::channel_type) to include in the channel select component (dpp::cot_channel_selectmenu)
-	 */
-	std::vector<uint8_t> channel_types;
-
-	/** Disabled flag (for buttons)
-	 */
-	bool disabled;
-
-	/** Whether the text input is required to be filled
-	 */
-	bool required;
-
-	/** Value of the modal (filled or valid when populated from an
-	 * on_form_submit event, or from the set_value function)
-	 */
-	std::variant<std::monostate, std::string, int64_t, double> value;
-
-	/** Emoji definition. To set an emoji on your button
-	 * you must set one of either the name or id fields.
-	 * The easiest way is to use the component::set_emoji
-	 * method.
-	 */
-	struct inner_emoji {
-		/** Set the name field to the name of the emoji.
-		 * For built in unicode emojis, set this to the
-		 * actual unicode value of the emoji e.g. "😄"
-		 * and not for example ":smile:"
-		 */
-		std::string name;
-		/** The emoji ID value for emojis that are custom
-		 * ones belonging to a guild. The same rules apply
-		 * as with other emojis, that the bot must be on
-		 * the guild where the emoji resides and it must
-		 * be available for use (e.g. not disabled due to
-		 * lack of boosts etc)
-		 */
-		dpp::snowflake id;
-		/** True if the emoji is animated. Only applies to
-		 * custom emojis.
-		 */
-		bool animated;
-	} emoji;
-
-	/** Constructor
-	 */
-	component();
-
-	/** Destructor
-	 */
-	virtual ~component() = default;
-
-	/**
-	 * @brief Add a channel type to include in the channel select component (dpp::cot_channel_selectmenu)
-	 *
-	 * @param ct The dpp::channel_type
-	 * @return component& reference to self
-	 */
-	component& add_channel_type(uint8_t ct);
-
-	/**
-	 * @brief Set the type of the component. Button components
-	 * (type dpp::cot_button) should always be contained within
-	 * an action row (type dpp::cot_action_row). As described
-	 * below, many of the other methods automatically set this
-	 * to the correct type so usually you should not need to
-	 * manually  call component::set_type().
-	 *
-	 * @param ct The component type
-	 * @return component& reference to self
-	 */
-	component& set_type(component_type ct);
-
-	/**
-	 * @brief Set the text style of a text component
-	 * @note Sets type to `cot_text`
-	 * 
-	 * @param ts Text style type to set
-	 * @return component& reference to self
-	 */
-	component& set_text_style(text_style_type ts);
-
-	/**
-	 * @brief Set the label of the component, e.g. button text.
-	 * For action rows, this field is ignored. Setting the
-	 * label will auto-set the type to dpp::cot_button.
-	 *
-	 * @param label Label text to set. It will be truncated to the maximum length of 80 UTF-8 characters.
-	 * @return component& Reference to self
-	 */
-	component& set_label(const std::string &label);
-
-	/**
-	 * @brief Set the default value of the text input component.
-	 * For action rows, this field is ignored. Setting the
-	 * value will auto-set the type to dpp::cot_text.
-	 *
-	 * @param val Value text to set. It will be truncated to the maximum length of 4000 UTF-8 characters.
-	 * @return component& Reference to self
-	 */
-	component& set_default_value(const std::string &val);
-
-	/**
-	 * @brief Set the url for dpp::cos_link types.
-	 * Calling this function sets the style to dpp::cos_link
-	 * and the type to dpp::cot_button.
-	 *
-	 * @param url URL to set. It will be truncated to the maximum length of 512 UTF-8 characters.
-	 * @return component& reference to self.
-	 */
-	component& set_url(const std::string &url);
-
-	/**
-	 * @brief Set the style of the component, e.g. button colour.
-	 * For action rows, this field is ignored. Setting the
-	 * style will auto-set the type to dpp::cot_button.
-	 *
-	 * @param cs Component style to set
-	 * @return component& reference to self
-	 */
-	component& set_style(component_style cs);
-
-	/**
-	 * @brief Set the id of the component.
-	 * For action rows, this field is ignored. Setting the
-	 * id will auto-set the type to dpp::cot_button.
-	 *
-	 * @param id Custom ID string to set. This ID will be sent
-	 * for any on_button_click events related to the button.
-	 * @note The maximum length of the Custom ID is 100 UTF-8 codepoints.
-	 * If your Custom ID is longer than this, it will be truncated.
-	 * @return component& Reference to self
-	 */
-	component& set_id(const std::string &id);
-
-	/**
-	 * @brief Set the component to disabled.
-	 * Defaults to false on all created components.
-	 *
-	 * @param disable True to disable, false to disable.
-	 * @return component& Reference to self
-	 */
-	component& set_disabled(bool disable);
-
-	/**
-	 * @brief Set if this component is required.
-	 * Defaults to false on all created components.
-	 *
-	 * @param require True to require this, false to make it optional.
-	 * @return component& Reference to self
-	 */
-	component& set_required(bool require);
-
-	/**
-	 * @brief Set the placeholder
-	 * 
-	 * @param placeholder placeholder string. It will be truncated to the
-	 * maximum length of 150 UTF-8 characters for select menus, and 100 UTF-8
-	 * characters for modals.
-	 * @return component& Reference to self
-	 */
-	component& set_placeholder(const std::string &placeholder);
-
-	/**
-	 * @brief Set the min value
-	 * 
-	 * @param min_values min value to set
-	 * @return component& Reference to self
-	 */
-	component& set_min_values(uint32_t min_values);
-
-	/**
-	 * @brief Set the max value
-	 * 
-	 * @param max_values max value to set (0 - 25)
-	 * @return component& Reference to self
-	 */
-	component& set_max_values(uint32_t max_values);
-
-	/**
-	 * @brief Set the min length of text input
-	 * 
-	 * @param min_l min value to set (0 - 25)
-	 * @return component& Reference to self
-	 */
-	component& set_min_length(uint32_t min_l);
-
-	/**
-	 * @brief Set the max length of text input
-	 * 
-	 * @param max_l max value to set
-	 * @return component& Reference to self
-	 */
-	component& set_max_length(uint32_t max_l);
-
-	/**
-	 * @brief Add a select option
-	 * 
-	 * @param option option to add
-	 * @return component& Reference to self
-	 */
-	component& add_select_option(const select_option &option);
-
-	/**
-	 * @brief Add a sub-component, only valid for action rows.
-	 * Adding subcomponents to a component will automatically
-	 * set this component's type to dpp::cot_action_row.
-	 *
-	 * @param c The sub-component to add
-	 * @return component& reference to self
-	 */
-	component& add_component(const component& c);
-
-	/**
-	 * @brief Set the emoji of the current sub-component.
-	 * Only valid for buttons. Adding an emoji to a component
-	 * will automatically set this components type to
-	 * dpp::cot_button. One or both of name and id must be set.
-	 * For a built in unicode emoji, you only need set name,
-	 * and should set it to a unicode character e.g. "😄".
-	 * For custom emojis, set the name to the name of the emoji
-	 * on the guild, and the id to the emoji's ID.
-	 * Setting the animated boolean is only valid for custom
-	 * emojis.
-	 *
-	 * @param name Emoji name, or unicode character to use
-	 * @param id Emoji id, for custom emojis only.
-	 * @param animated True if the custom emoji is animated.
-	 * @return component& Reference to self
-	 */
-	component& set_emoji(const std::string& name, dpp::snowflake id = 0, bool animated = false);
-
-	/** Read class values from json object
-	 * @param j A json object to read from
-	 * @return A reference to self
-	 */
-	component& fill_from_json(nlohmann::json* j);
-
-};
-
-/**
- * @brief A footer in a dpp::embed
- */
-struct DPP_EXPORT embed_footer {
-	/** Footer text */
-	std::string text;
-	/** Footer icon url */
-	std::string icon_url;
-	/** Proxied icon url */
-	std::string proxy_url;
-
-	/** Set footer's text. Returns footer itself so these methods may be "chained"
-	 * @param t string to set as footer text. It will be truncated to the maximum length of 2048 UTF-8 characters.
-	 * @return A reference to self
-	 */
-	embed_footer& set_text(const std::string& t);
-
-	/** Set footer's icon url. Returns footer itself so these methods may be "chained"
-	 * @param i url to set as footer icon url
-	 * @return A reference to self
-	 */
-	embed_footer& set_icon(const std::string& i);
-
-	/** Set footer's proxied icon url. Returns footer itself so these methods may be "chained"
-	 * @param p url to set as footer proxied icon url
-	 * @return A reference to self
-	 */
-	embed_footer& set_proxy(const std::string& p);
-};
-
-/**
- * @brief An video, image or thumbnail in a dpp::embed
- */
-struct DPP_EXPORT embed_image {
-	/** URL to image or video */
-	std::string url;
-	/** Proxied image url */
-	std::string proxy_url;
-	/** Height (calculated by discord) */
-	std::string height;
-	/** Width (calculated by discord) */
-	std::string width;
-};
-
-/**
- * @brief Embed provider in a dpp::embed. Received from discord but cannot be sent
- */
-struct DPP_EXPORT embed_provider {
-	/** Provider name */
-	std::string name;
-	/** Provider URL */
-	std::string url;
-};
-
-/**
- * @brief Author within a dpp::embed object
- */
-struct DPP_EXPORT embed_author {
-	/** Author name */
-	std::string name;
-	/** Author url */
-	std::string url;
-	/** Author icon url */
-	std::string icon_url;
-	/** Proxied icon url */
-	std::string proxy_icon_url;
-};
-
-/**
- * @brief A dpp::embed may contain zero or more fields
- */
-struct DPP_EXPORT embed_field {
-	/** Name of field */
-	std::string name;
-	/** Value of field (max length 1000) */
-	std::string value;
-	/** True if the field is to be displayed inline */
-	bool is_inline;
-};
-
-/**
- * @brief A rich embed for display within a dpp::message
- */
-struct DPP_EXPORT embed {
-	/** Optional: title of embed */
-	std::string			title;
-	/** Optional: type of embed (always "rich" for webhook embeds) */
-	std::string			type;
-	/** Optional: description of embed */
-	std::string			description;
-	/** Optional: url of embed */
-	std::string			url;
-	/** Optional: timestamp of embed content */
-	time_t				timestamp;
-	/** Optional: color code of the embed */
-	uint32_t			color;
-	/** Optional: footer information */
-	std::optional<embed_footer>	footer;
-	/** Optional: image information */
-	std::optional<embed_image>	image;
-	/** Optional: thumbnail information */
-	std::optional<embed_image>	thumbnail;
-	/** Optional: video information (can't send these) */
-	std::optional<embed_image>	video;
-	/** Optional: provider information (can't send these) */
-	std::optional<embed_provider>	provider;
-	/** Optional: author information */
-	std::optional<embed_author>	author;
-	/** Optional: fields information */
-	std::vector<embed_field>	fields;
-
-	/** Constructor */
-	embed();
-
-	/** Constructor to build embed from json object
-	 * @param j JSON to read content from
-	 */
-	embed(nlohmann::json* j);
-
-	/** Destructor */
-	~embed();
-
-	/** Set embed title. Returns the embed itself so these method calls may be "chained"
-	 * @param text The text of the title. It will be truncated to the maximum length of 256 UTF-8 characters.
-	 * @return A reference to self
-	 */
-	embed& set_title(const std::string &text);
-
-	/** Set embed description. Returns the embed itself so these method calls may be "chained"
-	 * @param text The text of the title. It will be truncated to the maximum length of 4096 UTF-8 characters.
-	 * @return A reference to self
-	 */
-	embed& set_description(const std::string &text);
-
-	/** Set the footer of the embed. Returns the embed itself so these method calls may be "chained"
-	 * @param f the footer to set
-	 * @return A reference to self
-	 */
-	embed& set_footer(const embed_footer& f);
-
-	 /** Set the footer of the embed. Returns the embed itself so these method calls may be "chained"
-	  * @param text string to set as footer text. It will be truncated to the maximum length of 2048 UTF-8 characters.
-	  * @param icon_url an url to set as footer icon url
-	  * @return A reference to self
-	  */
-	embed& set_footer(const std::string& text, const std::string& icon_url);
-
-	/** Set embed colour. Returns the embed itself so these method calls may be "chained"
-	 * @param col The colour of the embed
-	 * @return A reference to self
-	 */
-	embed& set_color(uint32_t col);
-
-	/** Set embed timestamp. Returns the embed itself so these method calls may be "chained"
-	 * @param tstamp The timestamp to show in the footer, should be in UTC
-	 * @return A reference to self
-	 */
-	embed& set_timestamp(time_t tstamp);
-
-	/** Set embed url. Returns the embed itself so these method calls may be "chained"
-	 * @param url the url of the embed
-	 * @return A reference to self
-	 */
-	embed& set_url(const std::string &url);
-
-	/** Add an embed field. Returns the embed itself so these method calls may be "chained"
-	 * @param name The name of the field. It will be truncated to the maximum length of 256 UTF-8 characters.
-	 * @param value The value of the field. It will be truncated to the maximum length of 1024 UTF-8 characters.
-	 * @param is_inline Whether or not to display the field 'inline' or on its own line
-	 * @return A reference to self
-	 */
-	embed& add_field(const std::string& name, const std::string &value, bool is_inline = false);
-
-	/** Set embed author. Returns the embed itself so these method calls may be "chained" 
-	 * @param a The author to set
-	 * @return A reference to self
-	 */ 
-	embed& set_author(const dpp::embed_author& a);
-
-	/** Set embed author. Returns the embed itself so these method calls may be "chained"
-	 * @param name The name of the author. It will be truncated to the maximum length of 256 UTF-8 characters.
-	 * @param url The url of the author
-	 * @param icon_url The icon URL of the author
-	 * @return A reference to self
-	 */
-	embed& set_author(const std::string& name, const std::string& url, const std::string& icon_url);
-
-	/** Set embed provider. Returns the embed itself so these method calls may be "chained"
-	 * @param name The provider name. It will be truncated to the maximum length of 256 UTF-8 characters.
-	 * @param url The provider url
-	 * @return A reference to self
-	 */
-	embed& set_provider(const std::string& name, const std::string& url);
-
-	/** Set embed image. Returns the embed itself so these method calls may be "chained"
-	 * @param url The embed image URL
-	 * @return A reference to self
-	 */
-	embed& set_image(const std::string& url);
-
-	/** Set embed video. Returns the embed itself so these method calls may be "chained"
-	 * @param url The embed video url
-	 * @return A reference to self
-	 */
-	embed& set_video(const std::string& url);
-
-	/** Set embed thumbnail. Returns the embed itself so these method calls may be "chained"
-	 * @param url The embed thumbnail url
-	 * @return A reference to self
-	 */
-	embed& set_thumbnail(const std::string& url);
-};
-
-/**
- * @brief Represents a reaction to a dpp::message
- */
-struct DPP_EXPORT reaction {
-	/** Number of times this reaction has been added */
-	uint32_t count;
-	/** Reaction was from the bot's id */
-	bool me;
-	/** ID of emoji for reaction */
-	snowflake emoji_id;
-	/** Name of emoji, if applicable */
-	std::string emoji_name;
-
-	/**
-	 * @brief Constructs a new reaction object.
-	 */
-	reaction();
-
-	/**
-	 * @brief Constructs a new reaction object from a JSON object.
-	 * @param j The JSON to read data from
-	 */
-	reaction(nlohmann::json* j);
-
-	/**
-	 * @brief Destructs the reaction object.
-	 */
-	~reaction() = default;
-};
-
-/**
- * @brief Represents an attachment in a dpp::message
- */
-struct DPP_EXPORT attachment {
-	/** ID of attachment */
-	snowflake id;
-	/** Size of the attachment in bytes */
-	uint32_t size;
-	/** File name of the attachment */
-	std::string filename;
-	/** Optional: Description of the attachment (max 1024 characters) */
-	std::string description;
-	/** URL which points to the attachment */
-	std::string url;
-	/** Proxied URL which points to the attachment */
-	std::string proxy_url;
-	/** Width of the attachment, if applicable */
-	uint32_t width;
-	/** Height of the attachment, if applicable */
-	uint32_t height;
-	/** MIME type of the attachment, if applicable */
-	std::string content_type;
-	/** Whether this attachment is ephemeral, if applicable */
-	bool ephemeral;
-	/** Owning message */
-	struct message* owner;
-
-	/**
-	 * @brief Constructs a new attachment object.
-	 * @param o Owning dpp::message object
-	 */
-	attachment(struct message* o);
-
-	/**
-	 * @brief Constructs a new attachment object from a JSON object.
-	 * @param o Owning dpp::message object
-	 * @param j JSON to read information from
-	 */
-	attachment(struct message* o, nlohmann::json* j);
-
-	/**
-	 * @brief Destructs the attachment object.
-	 */
-	~attachment() = default;
-
-	/**
-	 * @brief Download this attachment
-	 * @param callback A callback which is called when the download completes.
-	 * @note The content of the file will be in the http_info.body parameter of the
-	 * callback parameter.
-	 * @throw dpp::logic_exception If there is no owner associated with this attachment that
-	 * itself has an owning cluster, this method will throw a dpp::logic_exception when called.
-	 */
-	void download(http_completion_event callback) const;
-};
-
-/**
- * @brief Represents the type of a sticker
- */
-enum sticker_type : uint8_t {
-	/// Nitro pack sticker
-	st_standard = 1,
-	/// Guild sticker
-	st_guild = 2
-};
-
-/**
- * @brief The file format (png, apng, lottie) of a sticker
- */
-enum sticker_format : uint8_t {
-	sf_png = 1,
-	sf_apng = 2,
-	sf_lottie = 3
-};
-
-/**
- * @brief Represents stickers received in messages
- */
-struct DPP_EXPORT sticker : public managed, public json_interface<sticker> {
-	/** Optional: for standard stickers, id of the pack the sticker is from
-	 */
-	snowflake	pack_id;
-	/** The name of the sticker */
-	std::string	name;
-	/// description of the sticker (may be empty)
-	std::string	 description;	
-	/** for guild stickers, the Discord name of a unicode emoji representing the sticker's expression.
-	 * for standard stickers, a comma-separated list of related expressions.
-	 */
-	std::string	 tags;
-	/**
-	 * @brief Asset ID
-	 * @deprecated now an empty string but still sent by discord.
-	 * While discord still send this empty string value we will still have a field
-	 * here in the library.
-	 */
-	std::string	 asset;
-	/** The type of sticker */
-	sticker_type	type;
-	/// type of sticker format
-	sticker_format	format_type;
-	/// Optional: whether this guild sticker can be used, may be false due to loss of Server Boosts
-	bool		available;
-	/// Optional: id of the guild that owns this sticker
-	snowflake	guild_id;
-	/// Optional: the user that uploaded the guild sticker
-	user		sticker_user;
-	/// Optional: the standard sticker's sort order within its pack
-	uint8_t		sort_value;
-	/** Name of file to upload (when adding or editing a sticker) */
-	std::string	filename;
-	/** File content to upload (raw binary) */
-	std::string	filecontent;
-
-	/**
-	 * @brief Construct a new sticker object
-	 */
-	sticker();
-
-	virtual ~sticker() = default;
-
-	/** Read class values from json object
-	 * @param j A json object to read from
-	 * @return A reference to self
-	 */
-	sticker& fill_from_json(nlohmann::json* j);
-
-	/** Build JSON from this object.
-	 * @param with_id True if the ID is to be set in the JSON structure
-	 * @return The JSON text of the invite
-	 */
-	virtual std::string build_json(bool with_id = true) const;
-
-	/**
-	 * @brief Get the sticker url
-	 *
-	 * @param accept_lottie Whether to allow that [lottie](https://airbnb.io/lottie/#/) (json format) can be returned or not
-	 * @return std::string The sticker url or an empty string when its a lottie and accept_lottie is false
-	 */
-	std::string get_url(bool accept_lottie = true) const;
-
-	/**
-	 * @brief Set the filename
-	 * 
-	 * @param fn filename
-	 * @return message& reference to self
-	 */
-	sticker& set_filename(const std::string &fn);
-
-	/**
-	 * @brief Set the file content
-	 * 
-	 * @param fc raw file content contained in std::string
-	 * @return message& reference to self
-	 */
-	sticker& set_file_content(const std::string &fc);
-
-};
-
-/**
- * @brief Represents a sticker pack (the built in groups of stickers that all nitro users get to use)
- */
-struct DPP_EXPORT sticker_pack : public managed, public json_interface<sticker_pack> {
-	/// the stickers in the pack
-	std::map<snowflake, sticker> stickers;
-	/// name of the sticker pack
-	std::string	 name;
-	/// id of the pack's SKU
-	snowflake	   sku_id;
-	/// Optional: id of a sticker in the pack which is shown as the pack's icon
-	snowflake	   cover_sticker_id;
-	/// description of the sticker pack
-	std::string	 description;
-	/// id of the sticker pack's banner image
-	snowflake	   banner_asset_id;
-
-	/**
-	 * @brief Construct a new sticker pack object
-	 */
-	sticker_pack();
-
-	virtual ~sticker_pack() = default;
-
-	/** Read class values from json object
-	 * @param j A json object to read from
-	 * @return A reference to self
-	 */
-	sticker_pack& fill_from_json(nlohmann::json* j);
-
-	/** Build JSON from this object.
-	 * @param with_id True if the ID is to be set in the JSON structure
-	 * @return The JSON text of the invite
-	 */
-	virtual std::string build_json(bool with_id = true) const;
-
-};
-
-/**
- * @brief Bitmask flags for a dpp::message
- */
-enum message_flags : uint16_t {
-	/// this message has been published to subscribed channels (via Channel Following)
-	m_crossposted = 1 << 0,
-	/// this message originated from a message in another channel (via Channel Following)
-	m_is_crosspost =  1 << 1,
-	/// do not include any embeds when serializing this message
-	m_suppress_embeds = 1 << 2,
-	/// the source message for this crosspost has been deleted (via Channel Following)
-	m_source_message_deleted = 1 << 3,
-	/// this message came from the urgent message system
-	m_urgent = 1 << 4,
-	/// this message has an associated thread, with the same id as the message
-	m_has_thread = 1 << 5,
-	/// this message is only visible to the user who invoked the Interaction
-	m_ephemeral = 1 << 6,
-	/// this message is an Interaction Response and the bot is "thinking"
-	m_loading = 1 << 7,
-	/// this message failed to mention some roles and add their members to the thread
-	m_thread_mention_failed = 1 << 8,
-};
-
-/**
- * @brief Represents possible values for the dpp::embed type field.
- * These are loosely defined by the API docs and do not influence how the client renders embeds.
- * The only type a bot can send is dpp::embed_type::emt_rich.
- */
-namespace embed_type {
-	/**
-	 * @brief Rich text
-	 */
-	const std::string emt_rich = "rich";
-	/**
-	 * @brief Image
-	 */
-	const std::string emt_image = "image";
-	/**
-	 * @brief Video link
-	 */
-	const std::string emt_video = "video";
-	/**
-	 * @brief Animated gif
-	 */
-	const std::string emt_gifv = "gifv";
-	/**
-	 * @brief Article
-	 */
-	const std::string emt_article = "article";
-	/**
-	 * @brief Link URL
-	 */
-	const std::string emt_link = "link";
-	/**
-	 * @brief Auto moderation filter
-	 */
-	const std::string emt_automod = "auto_moderation_message";
-};
-
-/**
- * @brief Message types for dpp::message::type
- */
-enum message_type {
-	/// Default
-	mt_default					= 0,
-	/// Add recipient
-	mt_recipient_add				= 1,
-	/// Remove recipient
-	mt_recipient_remove				= 2,
-	/// Call
-	mt_call						= 3,
-	/// Channel name change
-	mt_channel_name_change				= 4,
-	/// Channel icon change
-	mt_channel_icon_change				= 5,
-	/// Message pinned
-	mt_channel_pinned_message			= 6,
-	/// Member joined
-	mt_guild_member_join				= 7,
-	/// Boost
-	mt_user_premium_guild_subscription		= 8,
-	/// Boost level 1
-	mt_user_premium_guild_subscription_tier_1	= 9,
-	/// Boost level 2
-	mt_user_premium_guild_subscription_tier_2	= 10,
-	/// Boost level 3
-	mt_user_premium_guild_subscription_tier_3	= 11,
-	/// Follow channel
-	mt_channel_follow_add				= 12,
-	/// Disqualified from discovery
-	mt_guild_discovery_disqualified			= 14,
-	/// Re-qualified for discovery
-	mt_guild_discovery_requalified			= 15,
-	/// Discovery grace period warning 1
-	mt_guild_discovery_grace_period_initial_warning	= 16,
-	/// Discovery grace period warning 2
-	mt_guild_discovery_grace_period_final_warning	= 17,
-	/// Thread Created 
-	mt_thread_created				= 18,
-	/// Reply
-	mt_reply					= 19,
-	/// Application command
-	mt_application_command				= 20,
-	/// Thread starter message
-	mt_thread_starter_message			= 21,
-	/// Invite reminder
-	mt_guild_invite_reminder			= 22,
-	/// Context Menu Command
-	mt_context_menu_command 			= 23,
-	/// Auto moderation action
-	mt_auto_moderation_action			= 24,
-};
-
-/**
- * @brief Represents the caching policy of a cache in the library.
- */
-enum cache_policy_setting_t {
-	/**
-	 * @brief request aggressively on seeing new guilds, and also store missing data from messages.
-	 * This is the default behaviour and the least memory-efficient option. Memory usage will increase
-	 * over time, initially quite rapidly, and then linearly over time. It is the least cpu-intensive
-	 * setting.
-	 */
-	cp_aggressive = 0,
-	/**
-	 * @brief only cache when there is relevant activity, e.g. a message to the bot.
-	 * This is a good middle-ground, memory usage will increase linearly over time.
-	 */
-	cp_lazy = 1,
-	/**
-	 * @brief Don't cache anything. Fill details when we see them.
-	 * This is the most memory-efficient option but consumes more CPU time
-	 */
-	cp_none = 2
-};
-
-/**
- * @brief Represents the caching policy of the cluster.
- * 
- * Channels and guilds are always cached as these caches are used
- * internally by the library. The memory usage of these is minimal.
- * 
- * All default to 'aggressive' which means to actively attempt to cache,
- * going out of the way to fill the caches completely. On large bots this
- * can take a LOT of RAM.
- */
-struct DPP_EXPORT cache_policy_t {
-	/**
-	 * @brief Caching policy for users and guild members
-	 */
-	cache_policy_setting_t user_policy = cp_aggressive;
-
-	/**
-	 * @brief Caching policy for emojis
-	 */
-	cache_policy_setting_t emoji_policy = cp_aggressive;
-
-	/**
-	 * @brief Caching policy for roles
-	 */
-	cache_policy_setting_t role_policy = cp_aggressive;
-};
-
-/**
- * @brief Represents messages sent and received on Discord
- */
-struct DPP_EXPORT message : public managed {
-	/** id of the channel the message was sent in */
-	snowflake	   channel_id;
-	/** Optional: id of the guild the message was sent in */
-	snowflake	   guild_id;
-	/** the author of this message (not guaranteed to be a valid user) */
-	user		author;
-	/** Optional: member properties for this message's author */
-	guild_member	member;
-	/** contents of the message */
-	std::string	content;
-	/** message components */
-	std::vector<dpp::component> components;
-	/** when this message was sent */
-	time_t		sent;
-	/** when this message was edited (may be 0 if never edited) */
-	time_t		edited;
-	/** users specifically mentioned in the message */
-	std::vector<std::pair<user, guild_member>>	mentions;
-	/** roles specifically mentioned in this message (only IDs currently)*/
-	std::vector<snowflake> mention_roles;
-	/** Channels mentioned in the message. (Discord: not all types supported)
-	 * Discord: Only textual channels that are visible to everyone in a lurkable guild will ever be included. Only crossposted messages (via Channel Following) currently include mention_channels at all. (includes ID, Guild ID, Type, Name)*/
-	std::vector<channel> mention_channels;
-	/** any attached files */
-	std::vector<attachment> attachments;
-	/** zero or more dpp::embed objects */
-	std::vector<embed> embeds;
-	/** Optional: reactions to the message */
-	std::vector<reaction> reactions;
-	/** Optional: used for validating a message was sent */
-	std::string	nonce;
-	/** Optional: if the message is generated by a webhook, its id will be here otherwise the field will be 0 */
-	snowflake	webhook_id;
-	/** Stickers */
-	std::vector<sticker> stickers;
-
-	/** Name of file to upload (for use server-side in discord's url) */
-	std::vector<std::string>	filename;
-
-	/** File content to upload (raw binary) */
-	std::vector<std::string>	filecontent;
-
-	/**
-	 * @brief Reference to another message, e.g. a reply
-	 */
-	struct message_ref {
-		/// id of the originating message
-		snowflake message_id;
-		/// id of the originating message's channel
-		snowflake channel_id;
-		/// id of the originating message's guild
-		snowflake guild_id;
-		/// when sending, whether to error if the referenced message doesn't exist instead of sending as a normal (non-reply) message, default true
-		bool fail_if_not_exists;
-	} message_reference;
-
-	/**
-	 * @brief Reference to an interaction
-	 */
-	struct message_interaction_struct{
-		/// id of the interaction
-		snowflake id;
-		/// type of interaction
-		uint8_t type;
-		/// name of the application command
-		std::string name;
-		/// the user who invoked the interaction
-		user usr;
-	} interaction;
-
-	/**
-	 * @brief Allowed mentions details
-	 */
-	struct allowed_ref {
-		/**
-		 * @brief Set to true to parse user mentions in the text. Default is false
-		 */
-		bool parse_users;
-		/**
-		 * @brief Set to true to at-everyone and at-here mentions in the text. Default is false
-		 */
-		bool parse_everyone;
-		/**
-		 * @brief Set to true to parse role mentions in the text. Default is false
-		 */
-		bool parse_roles;
-		/**
-		 * @brief Set to true to mention the user who sent the message this one is replying to. Default is false
-		 */
-		bool replied_user;
-		/**
-		 * @brief List of users to allow pings for 
-		 */
-		std::vector<snowflake> users;
-		/**
-		 * @brief List of roles to allow pings for 
-		 */
-		std::vector<snowflake> roles;
-	} allowed_mentions;
-
-	/**
-	 * @brief The cluster which created this message object
-	 */
-	class cluster* owner;
-
-	/** Message type */
-	message_type type;
-
-	/** Flags. Made of bits in dpp::message_flags */
-	uint16_t		flags;
-
-	/** whether this message is pinned */
-	bool		pinned;
-	/** whether this was a TTS message */
-	bool		tts;
-	/** whether this message mentions everyone */
-	bool   		mention_everyone;
-
-	/**
-	 * @brief Construct a new message object
-	 */
-	message();
-
-	/**
-	 * @brief Construct a new message object
-	 * @param o Owning cluster, passed down to various things such as dpp::attachment.
-	 * Owning cluster is optional (can be nullptr) and if nulled, will prevent some functions
-	 * such as attachment::download from functioning (they will throw, if used)
-	 */
-	message(class cluster* o);
-
-	/**
-	 * @brief Destroy the message object
-	 */
-	virtual ~message();
-
-	/**
-	 * @brief Construct a new message object with a channel and content
-	 *
-	 * @param channel_id The channel to send the message to
-	 * @param content The content of the message. It will be truncated to the maximum length of 4000 UTF-8 characters.
-	 * @param type The message type to create
-	 */
-	message(snowflake channel_id, const std::string &content, message_type type = mt_default);
-
-	/**
-	 * @brief Construct a new message object with a channel and content
-	 *
-	 * @param channel_id The channel to send the message to
-	 * @param _embed An embed to send
-	 */
-	message(snowflake channel_id, const embed & _embed);
-
-	/**
-	 * @brief Construct a new message object with content
-	 *
-	 * @param content The content of the message. It will be truncated to the maximum length of 4000 UTF-8 characters.
-	 * @param type The message type to create
-	 */
-	message(const std::string &content, message_type type = mt_default);
-
-	/**
-	 * @brief Set the original message reference for replies/crossposts
-	 * 
-	 * @param _message_id message id to reply to
-	 * @param _guild_id guild id to reply to (optional)
-	 * @param _channel_id channel id to reply to (optional)
-	 * @param fail_if_not_exists true if the message send should fail if these values are invalid (optional)
-	 * @return message& reference to self
-	 */
-	message& set_reference(snowflake _message_id, snowflake _guild_id = 0, snowflake _channel_id = 0, bool fail_if_not_exists = false);
-
-	/**
-	 * @brief Set the allowed mentions object for pings on the message
-	 * 
-	 * @param _parse_users whether or not to parse users in the message content or embeds
-	 * @param _parse_roles whether or not to parse roles in the message content or embeds
-	 * @param _parse_everyone whether or not to parse everyone/here in the message content or embeds 
-	 * @param _replied_user if set to true and this is a reply, then ping the user we reply to
-	 * @param users list of user ids to allow pings for
-	 * @param roles list of role ids to allow pings for
-	 * @return message& reference to self
-	 */
-	message& set_allowed_mentions(bool _parse_users, bool _parse_roles, bool _parse_everyone, bool _replied_user, const std::vector<snowflake> &users, const std::vector<snowflake> &roles);
-
-	/** Fill this object from json.
-	 * @param j JSON object to fill from
-	 * @param cp Cache policy for user records, whether or not we cache users when a message is received
-	 * @return A reference to self
-	 */
-	message& fill_from_json(nlohmann::json* j, cache_policy_t cp = {cp_aggressive, cp_aggressive, cp_aggressive});
-
-	/** Build JSON from this object.
-	 * @param with_id True if the ID is to be included in the built JSON
-	 * @param is_interaction_response Set to true if this message is intended to be included in an interaction response.
-	 * This will exclude some fields that are not valid in interactions at this time.
-	 * @return The JSON text of the message
-	 */
-	virtual std::string build_json(bool with_id = false, bool is_interaction_response = false) const;
-
-	/**
-	 * @brief Returns true if the message was crossposted to other servers
-	 * 
-	 * @return true if crossposted
-	 */
-	bool is_crossposted() const;
-
-	/**
-	 * @brief Returns true if posted from other servers announcement channel via webhook
-	 * 
-	 * @return true if posted from other server
-	 */
-	bool is_crosspost() const;
-
-	/**
-	 * @brief True if embeds have been removed
-	 * 
-	 * @return true if embeds removed
-	 */
-	bool suppress_embeds() const;
-
-	/**
-	 * @brief True if source message was deleted
-	 * 
-	 * @return true if source message deleted
-	 */
-	bool is_source_message_deleted() const;
-
-	/**
-	 * @brief True if urgent
-	 * 
-	 * @return true if urgent
-	 */
-	bool is_urgent() const;
-
-	/**
-	 * @brief True if has thread attached
-	 *
-	 * @return true if has thread attached
-	 */
-	bool has_thread() const;
-
-	/**
-	 * @brief True if ephemeral (visible only to issuer of a slash command)
-	 * 
-	 * @return true if ephemeral
-	 */
-	bool is_ephemeral() const;
-
-	/**
-	 * @brief True if loading
-	 * 
-	 * @return true if loading
-	 */
-	bool is_loading() const;
-
-	/**
-	 * @brief Returns true if this message failed to mention some roles and add their members to the thread
-	 *
-	 * @return true if this message failed to mention some roles and add their members to the thread
-	 */
-	bool is_thread_mention_failed() const;
-
-	/**
-	 * @brief Add a component (button) to message
-	 * 
-	 * @param c component to add
-	 * @return message& reference to self
-	 */
-	message& add_component(const component& c);
-
-	/**
-	 * @brief Add an embed to message
-	 * 
-	 * @param e embed to add
-	 * @return message& reference to self
-	 */
-	message& add_embed(const embed& e);
-
-	/**
-	 * @brief Set the flags
-	 * 
-	 * @param f flags to set from dpp::message_flags
-	 * @return message& reference to self
-	 */
-	message& set_flags(uint16_t f);
-
-	/**
-	 * @brief Set the message type
-	 * 
-	 * @param t type to set
-	 * @return message& reference to self
-	 */
-	message& set_type(message_type t);
-
-	/**
-	 * @brief Set the filename of the last file in list
-	 * 
-	 * @param fn filename
-	 * @return message& reference to self
-	 * @deprecated Use message::add_file instead
-	 */
-	message& set_filename(const std::string &fn);
-
-	/**
-	 * @brief Set the file content of the last file in list
-	 * 
-	 * @param fc raw file content contained in std::string
-	 * @return message& reference to self
-	 * @deprecated Use message::add_file instead
-	 */
-	message& set_file_content(const std::string &fc);
-
-	/**
-	 * @brief Add a file to the message
-	 *
-	 * @param filename filename
-	 * @param filecontent raw file content contained in std::string
-	 * @return message& reference to self
-	 */
-	message& add_file(const std::string &filename, const std::string &filecontent);
-
-	/**
-	 * @brief Set the message content
-	 * 
-	 * @param c message content. It will be truncated to the maximum length of 4000 UTF-8 characters.
-	 * @return message& reference to self
-	 */
-	message& set_content(const std::string &c);
-	
-	/**
-	 * @brief Set the channel id
-	 * 
-	 * @param _channel_id channel id
-	 * @return message& reference to self
-	 */
-	message& set_channel_id(snowflake _channel_id);
-
-	/**
-	 * @brief Set the channel id
-	 * 
-	 * @param _guild_id channel id
-	 * @return message& reference to self
-	 */
-	message& set_guild_id(snowflake _guild_id);
-
-	/**
-	 * @brief Returns true if the message is from a DM
-	 * 
-	 * @return true if message is a DM
-	 */
-	bool is_dm() const;
-};
-
-/** A group of messages */
-typedef std::unordered_map<snowflake, message> message_map;
-
-/** A group of stickers */
-typedef std::unordered_map<snowflake, sticker> sticker_map;
-
-/** A group of sticker packs */
-typedef std::unordered_map<snowflake, sticker_pack> sticker_pack_map;
-
-};
+/************************************************************************************
+ *
+ * D++, A Lightweight C++ library for Discord
+ *
+ * Copyright 2021 Craig Edwards and D++ contributors
+ * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ************************************************************************************/
+#pragma once
+#include <dpp/export.h>
+#include <dpp/queues.h>
+#include <dpp/snowflake.h>
+#include <dpp/managed.h>
+#include <dpp/user.h>
+#include <dpp/channel.h>
+#include <dpp/guild.h>
+#include <optional>
+#include <variant>
+#include <dpp/json_fwd.h>
+#include <dpp/json_interface.h>
+
+namespace dpp {
+
+/**
+ * @brief Represents the type of a component
+ */
+enum component_type : uint8_t {
+	/**
+	 * @brief Action row, a container for other components.
+	 */
+	cot_action_row = 1,
+
+	/**
+	 * @brief Clickable button.
+	 */
+	cot_button = 2,
+
+	/**
+	 * @brief Select menu for picking from defined text options.
+	 */
+	cot_selectmenu = 3,
+
+	/**
+	 * @brief Text input.
+	 */
+	cot_text = 4,
+
+	/**
+	 * @brief Select menu for users.
+	 */
+	cot_user_selectmenu = 5,
+
+	/**
+	 * @brief Select menu for roles.
+	 */
+	cot_role_selectmenu = 6,
+
+	/**
+	 * @brief Select menu for mentionables (users and roles).
+	 */
+	cot_mentionable_selectmenu = 7,
+
+	/**
+	 * @brief Select menu for channels.
+	 */
+	cot_channel_selectmenu = 8,
+
+	/**
+	 * @brief Section
+	 * @note Available in components v2 only
+	 */
+	cot_section = 9,
+
+	/**
+	 * @brief Simple text
+	 * @note Available in components v2 only
+	 */
+	cot_text_display = 10,
+
+	/**
+	 * @brief Image thumbnail, clickable to expand
+	 * @note Available in components v2 only
+	 */
+	cot_thumbnail = 11,
+
+	/**
+	 * @brief Collection of media (images, videos)
+	 * @note Available in components v2 only
+	 */
+	cot_media_gallery = 12,
+
+	/**
+	 * @brief File attachment from the uploads of the message
+	 * @note Available in components v2 only
+	 */
+	cot_file = 13,
+
+	/**
+	 * @brief Separator between sections or other components
+	 * @note Available in components v2 only
+	 */
+	cot_separator = 14,
+
+	/**
+	 * @brief Content inventory entry
+	 */
+	cot_content_inventory_entry = 16,
+
+	/**
+	 * @brief Container for other components
+	 * @note Available in components v2 only
+	 */
+	cot_container = 17,
+
+	/**
+	 * @brief Container associating a label and description with a component
+	 */
+	cot_label = 18,
+
+	/**
+	 * @brief Component for uploading files
+	 */
+	cot_file_upload = 19
+};
+
+/**
+ * @brief An emoji reference for a component (select menus included) or a poll.
+ *
+ * To set an emoji on your button or poll answer, you must set one of either the name or id fields.
+ * The easiest way for buttons is to use the dpp::component::set_emoji method.
+ *
+ * @note This is a **very** scaled down version of dpp::emoji, we advise that you refrain from using this.
+ */
+struct partial_emoji {
+	/**
+	 * @brief The name of the emoji.
+	 *
+	 * For built in unicode emojis, set this to the
+	 * actual unicode value of the emoji e.g. "😄"
+	 * and not for example ":smile:"
+	 */
+	std::string name{};
+
+	/**
+	 * @brief The emoji ID value for emojis that are custom
+	 * ones belonging to a guild.
+	 *
+	 * The same rules apply as with other emojis,
+	 * that the bot must be on the guild where the emoji resides
+	 * and it must be available for use
+	 * (e.g. not disabled due to lack of boosts, etc)
+	 */
+	dpp::snowflake id{0};
+
+	/**
+	 * @brief Is the emoji animated?
+	 *
+	 * @note Only applies to custom emojis.
+	 */
+	bool animated{false};
+};
+
+/**
+ * @brief An emoji for a component. Alias to partial_emoji, for backwards compatibility.
+ *
+ * @see partial_emoji
+ */
+using component_emoji = partial_emoji;
+
+/**
+ * @brief The data for a file attached to a message.
+ *
+ * @todo Change the naming of this and make stickers (and potentially anything else that has data like this) use this.
+ */
+struct message_file_data {
+	/**
+	 * @brief Name of file to upload (for use server-side in discord's url).
+	 */
+	std::string name{};
+
+	/**
+	 * @brief File content to upload (raw binary)
+	 */
+	std::string content{};
+
+	/**
+	 * @brief Mime type of files to upload.
+	 *
+	 * @todo Look at turning this into an enum? This would allow people to easily compare mimetypes if they happen to change.
+	 */
+	std::string mimetype{};
+};
+
+/**
+ * @brief Types of text input
+ */
+enum text_style_type : uint8_t {
+	/**
+	 * @brief Intended for short single-line text.
+	 */
+	text_short = 1,
+
+	/**
+	 * @brief Intended for much longer inputs.
+	 */
+	text_paragraph = 2,
+};
+
+/**
+ * @brief Represents the style of a button
+ */
+enum component_style : uint8_t {
+	/**
+	 * @brief Blurple; Primary
+	 */
+	cos_primary = 1,
+
+	/**
+	 * @brief Grey; Secondary
+	 */
+	cos_secondary,
+
+	/**
+	 * @brief Green; Success
+	 */
+	cos_success,
+
+	/**
+	 * @brief Red; danger
+	 */
+	cos_danger,
+
+	/**
+	 * @brief An external hyperlink to a website, requires url to be set
+	 * @note Will not work unless url is set
+	 */
+	cos_link,
+
+	/**
+	 * @brief Premium upsell button, requires sku_id to be set
+	 * @note Will not work unless sku is set
+	 */
+	cos_premium,
+};
+
+/**
+ * Represents the type of a dpp::component_default_value
+ *
+ * @note They're different to discord's value types
+ */
+enum component_default_value_type: uint8_t {
+	cdt_user = 0,
+	cdt_role = 1,
+	cdt_channel = 2,
+};
+
+/**
+ * @brief A Default value structure for components
+ */
+struct DPP_EXPORT component_default_value {
+	/**
+	 * @brief The type this default value represents
+	 */
+	component_default_value_type type;
+
+	/**
+	 * @brief Default value. ID of a user, role, or channel
+	 */
+	dpp::snowflake id;
+};
+
+/**
+ * @brief An option for a select component
+ */
+struct DPP_EXPORT select_option : public json_interface<select_option> {
+protected:
+	friend struct json_interface<select_option>;
+
+	/** Read class values from json object
+	 * @param j A json object to read from
+	 * @return A reference to self
+	 */
+	select_option& fill_from_json_impl(nlohmann::json* j);
+
+public:
+	/**
+	 * @brief User-facing name of the option
+	 */
+	std::string label;
+
+	/**
+	 * @brief Dev-defined value of the option
+	 */
+	std::string value;
+
+	/**
+	 * @brief Additional description of the option
+	 */
+	std::string description;
+
+	/**
+	 * @brief True if option is the default option
+	 */
+	bool is_default;
+
+	/**
+	 * @brief The emoji for the select option.
+	 */
+	partial_emoji emoji;
+
+	/**
+	 * @brief Construct a new select option object
+	 */
+	select_option();
+
+	/**
+	 * @brief Destructs the select option object.
+	 */
+	virtual ~select_option() = default;
+
+	/**
+	 * @brief Construct a new select option object
+	 * 
+	 * @param label Label of option
+	 * @param value Value of option
+	 * @param description Description of option
+	 */
+	select_option(std::string_view label, std::string_view value, std::string_view description = "");
+
+	/**
+	 * @brief Set the label
+	 * 
+	 * @param l the user-facing name of the option. It will be truncated to the maximum length of 100 UTF-8 characters.
+	 * @return select_option& reference to self for chaining
+	 */
+	select_option& set_label(std::string_view l);
+
+	/**
+	 * @brief Set the value
+	 * 
+	 * @param v value to set. It will be truncated to the maximum length of 100 UTF-8 characters.
+	 * @return select_option& reference to self for chaining
+	 */
+	select_option& set_value(std::string_view v);
+
+	/**
+	 * @brief Set the description
+	 * 
+	 * @param d description to set. It will be truncated to the maximum length of 100 UTF-8 characters.
+	 * @return select_option& reference to self for chaining
+	 */
+	select_option& set_description(std::string_view d);
+
+	/**
+	 * @brief Set the emoji
+	 * 
+	 * @param n emoji name
+	 * @param id emoji id for custom emojis
+	 * @param animated true if animated emoji
+	 * @return select_option& reference to self for chaining
+	 */
+	select_option& set_emoji(std::string_view n, dpp::snowflake id = 0, bool animated = false);
+
+	/**
+	 * @brief Set the option as default
+	 * 
+	 * @param def true to set the option as default
+	 * @return select_option& reference to self for chaining
+	 */
+	select_option& set_default(bool def);
+
+	/**
+	 * @brief Set the emoji as animated
+	 * 
+	 * @param anim true if animated
+	 * @return select_option& reference to self for chaining
+	 */
+	select_option& set_animated(bool anim);
+};
+
+/**
+ * @brief Loading state for "unfurled" media, e.g. thumbnails and images in a message or component
+ */
+enum media_loading_state : uint8_t {
+
+	/**
+	 * @brief Loading state is unknown
+	 */
+	ls_unknown = 0,
+
+	/**
+	 * @brief Discord is loading the media
+	 */
+	ls_loading = 1,
+
+	/**
+	 * @brief The image was processed and loaded successfully
+	 */
+	ls_loaded_success = 2,
+
+	/**
+	 * @brief The media was not found
+	 */
+	ls_not_found = 3,
+};
+
+/**
+ * @brief An video, image or thumbnail in a dpp::embed or dpp::component (v2)
+ */
+struct DPP_EXPORT embed_image {
+	/**
+	 * @brief URL to image or video.
+	 */
+	std::string url;
+
+	/**
+	 * @brief Proxied image url.
+	 */
+	std::string proxy_url;
+
+	/**
+	 * @brief Height (calculated by discord).
+	 */
+	uint32_t height{0};
+
+	/**
+	 * @brief Width (calculated by discord).
+	 */
+	uint32_t width{0};
+
+	/**
+	 * @brief Media loading state
+	 */
+	media_loading_state loading_state{ls_unknown};
+
+	/**
+	 * @brief placeholder
+	 */
+	std::string placeholder;
+
+	/**
+	 * @brief Placeholder version
+	 */
+	uint8_t placeholder_version{1};
+
+	/**
+	 * @brief Content type
+	 */
+	std::string content_type;
+
+	/**
+	 * @brief Flags (documented as present, but contents not documented)
+	 */
+	uint32_t flags{0};
+};
+
+/**
+ * @brief Spacing types for components v2 separator
+ */
+enum separator_spacing : uint8_t {
+
+	/**
+	 * @brief Small separator
+	 */
+	sep_small = 1,
+
+	/**
+	 * @brief Large separator
+	 */
+	sep_large = 2,
+};
+
+/**
+ * @brief Represents the component object.
+ * A component is a clickable button or drop down list
+ * within a discord message, where the buttons emit
+ * on_button_click events when the user interacts with
+ * them.
+ *
+ * You should generally define one component object and
+ * then insert one or more additional components into it
+ * using component::add_component(), so that the parent
+ * object is an action row and the child objects are buttons.
+ */
+class DPP_EXPORT component : public json_interface<component> {
+protected:
+	friend struct json_interface<component>;
+
+	/** Read class values from json object
+	 * @param j A json object to read from
+	 * @return A reference to self
+	 */
+	component& fill_from_json_impl(nlohmann::json* j);
+
+public:
+	/**
+	 * @brief Component type, either a button or action row
+	 */
+	component_type type;
+
+	/**
+	 * @brief Sub components, buttons on an action row
+	 */
+	std::vector<component> components;
+
+	/**
+	 * @brief Component label (for buttons, text inputs).
+	 * Maximum of 80 characters.
+	 */
+	std::string label;
+
+	/**
+	 * @brief Component style (for buttons).
+	 */
+	component_style style;
+
+	/**
+	 * @brief Text style (for text inputs).
+	 */
+	text_style_type text_style;
+
+	/**
+	 * @brief Component id (for buttons, menus, text inputs).
+	 * Maximum of 100 characters.
+	 */
+	std::string custom_id;
+
+	/**
+	 * @brief URL for link types (dpp::cos_link).
+	 * Maximum of 512 characters.
+	 */
+	std::string url;
+
+	/**
+	 * @brief The SKU ID for premium upsell buttons
+	 */
+	dpp::snowflake sku_id;
+
+	/**
+	 * @brief Placeholder text for select menus and text inputs (max 150 characters)
+	 */
+	std::string placeholder;
+
+	/**
+	 * @brief Minimum number of items that must be chosen for a select menu (0-25).
+	 *
+	 * @note Use -1 to not set this. This is done by default.
+	 */
+	int32_t min_values;
+
+	/**
+	 * @brief Maximum number of items that can be chosen for a select menu (0-25).
+	 *
+	 * @note Use -1 to not set this. This is done by default.
+	 */
+	int32_t max_values;
+
+	/**
+	 * @brief File types (dpp::cot_file_upload) to filter for; can be "image", "video", "audio", or any dot-prefixed extension such as ".pdf" (0-10).
+	 */
+	std::vector<std::string> file_types;
+
+	/**
+	 * @brief Minimum length for text input (0-4000)
+	 */
+	int32_t min_length;
+
+	/**
+	 * @brief Maximum length for text input (1-4000)
+	 */
+	int32_t max_length;
+
+	/**
+	 * @brief Select options for select menus.
+	 *
+	 * @warning Only required and available for select menus of type dpp::cot_selectmenu
+	 */
+	std::vector<select_option> options;
+
+	/**
+	 * @brief List of channel types (dpp::channel_type) to include in the channel select component (dpp::cot_channel_selectmenu)
+	 */
+	std::vector<uint8_t> channel_types;
+
+	/**
+	 * @brief List of default values for auto-populated select menu components.
+	 *
+	 * @note The amount of default values must be in the range defined by dpp::component::min_values and dpp::component::max_values.
+	 *
+	 * @warning Only available for auto-populated select menu components, which include dpp::cot_user_selectmenu, dpp::cot_role_selectmenu,
+	 * * dpp::cot_mentionable_selectmenu, and dpp::cot_channel_selectmenu components.
+	 */
+	std::vector<component_default_value> default_values;
+
+	/**
+	 * @brief Disabled flag (for buttons)
+	 */
+	bool disabled;
+
+	/**
+	 * @brief Whether the text input is required to be filled
+	 */
+	bool required;
+
+	/**
+	 * @brief Value of the modal.
+	 * Filled or valid when populated from an on_form_submit event, or from the set_value function.
+	 */
+	std::variant<std::monostate, std::string, int64_t, double> value;
+
+	/**
+	 * @brief The emoji for this component.
+	 */
+	partial_emoji emoji;
+
+	/**
+	 * @brief Text content for section and text display types (v2)
+	 */
+	std::string content;
+
+	/**
+	 * @brief accessory component for components which support it (v2)
+	 * Can be a button or a thumbnail.
+	 */
+	std::shared_ptr<component> accessory;
+
+	/**
+	 * @brief Description for media items (v2)
+	 */
+	std::string description;
+
+	/**
+	 * @brief Spoiler state for media and file items
+	 */
+	bool spoiler;
+
+	/**
+	 * @brief can be set for separator types (v2)
+	 */
+	bool is_divider;
+
+	/**
+	 * @brief Valid for separator types (v2)
+	 */
+	separator_spacing spacing;
+
+	/**
+	 * @brief Unfurled media for thumbnail objects (v2)
+	 */
+	std::optional<embed_image> thumbnail;
+
+	/**
+	 * @brief Unfurled file URL for file objects (v2)
+	 * Should be in the format "attachment://..."
+	 */
+	std::optional<embed_image> file;
+
+	/**
+	 * @brief Media gallery items for media galleries (v2)
+	 */
+	std::vector<std::shared_ptr<component>> media_gallery_items;
+
+	/**
+	 * @brief Accent colour for container types (v2)
+	 */
+	std::optional<uint32_t> accent;
+
+	/**
+	 * @brief Constructor
+	 */
+	component();
+
+	/**
+	 * @brief Destructor
+	 */
+	virtual ~component() = default;
+
+	/**
+	 * @brief Add a channel type to include in the channel select component (dpp::cot_channel_selectmenu)
+	 *
+	 * @param ct The dpp::channel_type
+	 * @return component& reference to self
+	 */
+	component& add_channel_type(uint8_t ct);
+
+	/**
+	 * @brief For text content types, set content
+	 * @note Ignored for other types
+	 * @param text text to set
+	 * @return
+	 */
+	component& set_content(const std::string& text);
+
+	/**
+	 * @brief Set divider visibility for separator type (v2)
+	 * @param divider true to show a visible divider
+	 * @return self
+	 */
+	component& set_divider(bool divider);
+
+	/**
+	 * @brief Set accent colour for container type (v2)
+	 * @param accent_colour Accent colour for container
+	 * @return self
+	 */
+	component& set_accent(uint32_t accent_colour);
+
+	/**
+	 * @brief Set separator spacing for separator type (v2)
+	 * @param sep_spacing separator spacing, small or large
+	 * @return self
+	 */
+	component& set_spacing(separator_spacing sep_spacing);
+
+	/**
+	 * @brief Set the attachment url for file type components.
+	 * The format of the attachment url should be of the type
+	 * "attachment://...".
+	 * @param attachment_url url to attachment. Should have been
+	 * attached via add_file().
+	 * @return self
+	 */
+	component& set_file(std::string_view attachment_url);
+
+	/**
+	 * @brief Add a media gallery item to a media gallery type (v2)
+	 * @param media_gallery_item item to add
+	 * @return
+	 */
+	component& add_media_gallery_item(const component& media_gallery_item);
+
+	/**
+	 * @brief For media types, set description
+	 * @note Ignored for other types
+	 * @param text text to set
+	 * @return
+	 */
+	component& set_description(const std::string& text);
+
+	/**
+	 * @brief For media and file component types, set spoiler status
+	 * @note Ignored for other types
+	 * @param spoiler_enable True to enable spoiler masking
+	 * @return
+	 */
+	component& set_spoiler(bool spoiler_enable);
+
+	/**
+	 * @brief Set component thumbnail for thumbnail type (v2.
+	 * @param url The embed thumbnail url (only supports http(s) and attachments)
+	 * @return A reference to self so this method may be "chained".
+	 */
+	component& set_thumbnail(std::string_view url);
+
+	/**
+	 * @brief Set accessory component for components which support it.
+	 * Can be a button or a thumbnail image.
+	 * @param accessory_component accessory component
+	 * @return
+	 */
+	component& set_accessory(const component& accessory_component);
+
+	/**
+	 * @brief Set the type of the component. Button components
+	 * (type dpp::cot_button) should always be contained within
+	 * an action row (type dpp::cot_action_row). As described
+	 * below, many of the other methods automatically set this
+	 * to the correct type so usually you should not need to
+	 * manually  call component::set_type().
+	 *
+	 * @param ct The component type
+	 * @return component& reference to self
+	 */
+	component& set_type(component_type ct);
+
+	/**
+	 * @brief Set the SKU ID for a premium upsell button
+	 * This is only valid for premium upsell buttons of type
+	 * cos_premium. It indicates which premium package to
+	 * link to when the button is clicked.
+	 *
+	 * @param sku The SKU ID
+	 * @return component& reference to self
+	 */
+	component& set_sku_id(dpp::snowflake sku);
+
+	/**
+	 * @brief Set the text style of a text component
+	 * @note Sets type to `cot_text`
+	 * 
+	 * @param ts Text style type to set
+	 * @return component& reference to self
+	 */
+	component& set_text_style(text_style_type ts);
+
+	/**
+	 * @brief Set the label of the component, e.g. button text.
+	 * For action rows, this field is ignored. Setting the
+	 * label will auto-set the type to dpp::cot_button.
+	 *
+	 * @param label Label text to set. It will be truncated to the maximum length of 80 UTF-8 characters.
+	 * @return component& Reference to self
+	 */
+	component& set_label(std::string_view label);
+
+	/**
+	 * @brief Set the default value of the text input component.
+	 * For action rows, this field is ignored. Setting the
+	 * value will auto-set the type to dpp::cot_text.
+	 *
+	 * @param val Value text to set. It will be truncated to the maximum length of 4000 UTF-8 characters.
+	 * @return component& Reference to self
+	 */
+	component& set_default_value(std::string_view val);
+
+	/**
+	 * @brief Set the url for dpp::cos_link types.
+	 * Calling this function sets the style to dpp::cos_link
+	 * and the type to dpp::cot_button.
+	 *
+	 * @param url URL to set. It will be truncated to the maximum length of 512 UTF-8 characters.
+	 * @return component& reference to self.
+	 */
+	component& set_url(std::string_view url);
+
+	/**
+	 * @brief Set the style of the component, e.g. button colour.
+	 * For action rows, this field is ignored. Setting the
+	 * style will auto-set the type to dpp::cot_button.
+	 *
+	 * @param cs Component style to set
+	 * @return component& reference to self
+	 */
+	component& set_style(component_style cs);
+
+	/**
+	 * @brief Set the id of the component.
+	 * For action rows, this field is ignored. Setting the
+	 * id will auto-set the type to dpp::cot_button.
+	 *
+	 * @param id Custom ID string to set. This ID will be sent
+	 * for any on_button_click events related to the button.
+	 * @note The maximum length of the Custom ID is 100 UTF-8 codepoints.
+	 * If your Custom ID is longer than this, it will be truncated.
+	 * @return component& Reference to self
+	 */
+	component& set_id(std::string_view id);
+
+	/**
+	 * @brief Set the component to disabled.
+	 * Defaults to false on all created components.
+	 *
+	 * @param disable True to disable the component, False to enable the component.
+	 * @return component& Reference to self
+	 */
+	component& set_disabled(bool disable);
+
+	/**
+	 * @brief Set if this component is required.
+	 * Defaults to false on all created components.
+	 *
+	 * @param require True to require this, false to make it optional.
+	 * @return component& Reference to self
+	 */
+	component& set_required(bool require);
+
+	/**
+	 * @brief Set the placeholder
+	 * 
+	 * @param placeholder placeholder string. It will be truncated to the
+	 * maximum length of 150 UTF-8 characters for select menus, and 100 UTF-8
+	 * characters for modals.
+	 * @return component& Reference to self
+	 */
+	component& set_placeholder(std::string_view placeholder);
+
+	/**
+	 * @brief Set the minimum number of items that must be chosen for a select menu
+	 * 
+	 * @param min_values min value to set (0-25)
+	 * @return component& Reference to self
+	 */
+	component& set_min_values(uint32_t min_values);
+
+	/**
+	 * @brief Set the maximum number of items that can be chosen for a select menu
+	 * 
+	 * @param max_values max value to set (0-25)
+	 * @return component& Reference to self
+	 */
+	component& set_max_values(uint32_t max_values);
+
+	/**
+	 * @brief Add a file type (dpp::cot_file_upload) to filter for.
+	 *
+	 * @param file_type The type to filter for ("image"/"video"/"audio" or the file extension (begins with ".")).
+	 * @return component& Reference to self
+	 */
+	component& add_file_type(std::string_view file_type);
+
+	/**
+	 * @brief Set the minimum input length for a text input
+	 * 
+	 * @param min_l min length to set (0-4000)
+	 * @return component& Reference to self
+	 */
+	component& set_min_length(uint32_t min_l);
+
+	/**
+	 * @brief Set the maximum input length for a text input
+	 * 
+	 * @param max_l max length to set (1-4000)
+	 * @return component& Reference to self
+	 */
+	component& set_max_length(uint32_t max_l);
+
+	/**
+	 * @brief Add a select option
+	 * 
+	 * @param option option to add
+	 * @return component& Reference to self
+	 */
+	component& add_select_option(const select_option &option);
+
+	/**
+	 * @brief Add a sub-component, only valid for action rows.
+	 * Adding subcomponents to a component will automatically
+	 * set this component's type to dpp::cot_action_row.
+	 *
+	 * @note Automatic creation of action rows is retained for backwards
+	 * compatibility with components v1. If you want to add components v2,
+	 * and do not want automatic creation of action rows, use
+	 * dpp::component::add_component_v2() instead.
+	 *
+	 * @param c The sub-component to add
+	 * @return component& reference to self
+	 */
+	component& add_component(const component& c);
+
+	/**
+	 * @brief Add a sub-component, does not automatically create
+	 * action rows. This should be used for components v2 where
+	 * you do not want to add action rows automatically.
+	 *
+	 * @param c The sub-component to add
+	 * @return component& reference to self
+	 */
+	component& add_component_v2(const component& c);
+
+	/**
+	 * @brief Add a default value.
+	 *
+	 * @param id Default value. ID of a user, role, or channel
+	 * @param type The type this default value represents
+	 */
+	component& add_default_value(const snowflake id, const component_default_value_type type);
+
+	/**
+	 * @brief Set the emoji of the current sub-component.
+	 * 
+	 * @warning Only valid for buttons.
+	 * 
+	 * @note Adding an emoji to a component will 
+	 * automatically set this components type to
+	 * dpp::cot_button. **One or both of name and id must be set**.
+	 * For a built in unicode emoji, you only need set name,
+	 * and should set it to a unicode character e.g. "😄".
+	 * For custom emojis, set the name to the name of the emoji
+	 * on the guild, and the id to the emoji's ID.
+	 * Setting the animated boolean is only valid for custom
+	 * emojis.
+	 *
+	 * @param name Emoji name, or unicode character to use
+	 * @param id Emoji id, for custom emojis only.
+	 * @param animated True if the custom emoji is animated.
+	 * @return component& Reference to self
+	 */
+	component& set_emoji(std::string_view name, dpp::snowflake id = 0, bool animated = false);
+};
+
+/**
+ * @brief A footer in a dpp::embed
+ */
+struct DPP_EXPORT embed_footer {
+	/**
+	 * @brief Footer text
+	 */
+	std::string text;
+
+	/**
+	 * @brief Footer icon url.
+	 *
+	 * @warning Only supports http(s) and attachments.
+	 */
+	std::string icon_url;
+
+	/**
+	 * @brief Proxied icon url.
+	 */
+	std::string proxy_url;
+
+	/**
+	 * @brief Set footer's text.
+	 * @param t string to set as footer text. It will be truncated to the maximum length of 2048 UTF-8 characters.
+	 * @return A reference to self so this method may be "chained".
+	 */
+	embed_footer& set_text(std::string_view t);
+
+	/**
+	 * @brief Set footer's icon url.
+	 * @param i url to set as footer icon url
+	 * @return A reference to self so this method may be "chained".
+	 */
+	embed_footer& set_icon(std::string_view i);
+
+	/**
+	 * @brief Set footer's proxied icon url.
+	 * @param p url to set as footer proxied icon url
+	 * @return A reference to self so this method may be "chained".
+	 */
+	embed_footer& set_proxy(std::string_view p);
+};
+
+/**
+ * @brief Embed provider in a dpp::embed. Received from discord but cannot be sent
+ */
+struct DPP_EXPORT embed_provider {
+	/**
+	 * @brief Provider name.
+	 */
+	std::string name;
+
+	/**
+	 * @brief Provider URL.
+	 */
+	std::string url;
+};
+
+/**
+ * @brief Author within a dpp::embed object
+ */
+struct DPP_EXPORT embed_author {
+	/**
+	 * @brief Author name.
+	 */
+	std::string name;
+
+	/**
+	 * @brief Author url.
+	 *
+	 * @warning Only supports http(s).
+	 */
+	std::string url;
+
+	/**
+	 * @brief Author icon url.
+	 *
+	 * @warning Only supports http(s) and attachments.
+	 */
+	std::string icon_url;
+
+	/**
+	 * @brief Proxied icon url.
+	 */
+	std::string proxy_icon_url;
+};
+
+/**
+ * @brief A dpp::embed may contain zero or more fields.
+ */
+struct DPP_EXPORT embed_field {
+	/**
+	 * @brief Name of field (max length 256).
+	 */
+	std::string name;
+
+	/**
+	 * @brief Value of field (max length 1024).
+	 */
+	std::string value;
+
+	/**
+	 * @brief True if the field is to be displayed inline.
+	 */
+	bool is_inline;
+};
+
+/**
+ * @brief A rich embed for display within a dpp::message.
+ */
+struct DPP_EXPORT embed {
+	/**
+	 * @brief Optional: Title of embed.
+	 */
+	std::string title;
+
+	/**
+	 * @brief Optional: Type of embed.
+	 *
+	 * @note Always "rich" for webhook embeds.
+	 */
+	std::string type;
+
+	/**
+	 * @brief Optional: Description of embed.
+	 */
+	std::string description;
+
+	/**
+	 * @brief Optional: URL of embed.
+	 */
+	std::string url;
+
+	/**
+	 * @brief Optional: Timestamp of embed content.
+	 */
+	time_t timestamp;
+
+	/**
+	 * @brief Optional: Color code of the embed.
+	 */
+	std::optional<uint32_t>	color;
+
+	/**
+	 * @brief Optional: Footer information.
+	 */
+	std::optional<embed_footer> footer;
+
+	/**
+	 * @brief Optional: Image information.
+	 */
+	std::optional<embed_image> image;
+
+	/**
+	 * @brief Optional: Thumbnail information.
+	 */
+	std::optional<embed_image> thumbnail;
+
+	/**
+	 * @brief Optional: Video information
+	 *
+	 * @warning Can't send this.
+	 */
+	std::optional<embed_image> video;
+
+	/**
+	 * @brief Optional: Provider information.
+	 *
+	 * @warning Can't send this.
+	 */
+	std::optional<embed_provider> provider;
+
+	/**
+	 * @brief Optional: Author information.
+	 */
+	std::optional<embed_author> author;
+
+	/**
+	 * @brief Optional: Fields information.
+	 */
+	std::vector<embed_field> fields;
+
+	/**
+	 * @brief Constructor
+	 */
+	embed();
+
+	/**
+	 * @brief Constructor to build embed from json object
+	 * @param j JSON to read content from
+	 */
+	embed(nlohmann::json* j);
+
+	/**
+	 * @brief Destructor
+	 */
+	~embed();
+
+	/**
+	 * @brief Set embed title.
+	 * @param text The text of the title. It will be truncated to the maximum length of 256 UTF-8 characters.
+	 * @return A reference to self so this method may be "chained".
+	 */
+	embed& set_title(std::string_view text);
+
+	/**
+	 * @brief Set embed description.
+	 * @param text The text of the title. It will be truncated to the maximum length of 4096 UTF-8 characters.
+	 * @return A reference to self so this method may be "chained".
+	 */
+	embed& set_description(std::string_view text);
+
+	/**
+	 * @brief Set the footer of the embed.
+	 * @param f the footer to set
+	 * @return A reference to self so this method may be "chained".
+	 */
+	embed& set_footer(const embed_footer& f);
+
+	/**
+	 * @brief Set the footer of the embed.
+	 * @param text string to set as footer text. It will be truncated to the maximum length of 2048 UTF-8 characters.
+	 * @param icon_url an url to set as footer icon url (only supports http(s) and attachments)
+	 * @return A reference to self so this method may be "chained".
+	 */
+	embed& set_footer(std::string_view text, std::string_view icon_url);
+
+	/**
+	 * @brief Set embed colour.
+	 * @param col The colour of the embed
+	 * @return A reference to self so this method may be "chained".
+	 */
+	embed& set_color(uint32_t col);
+
+	/**
+	 * @brief Set embed colour.
+	 * @param col The colour of the embed
+	 * @return A reference to self so this method may be "chained".
+	 */
+	embed& set_colour(uint32_t col);
+
+	/**
+	 * @brief Set embed timestamp.
+	 * @param tstamp The timestamp to show in the footer, should be in UTC
+	 * @return A reference to self so this method may be "chained".
+	 */
+	embed& set_timestamp(time_t tstamp);
+
+	/**
+	 * @brief Set embed url.
+	 * @param url the url of the embed
+	 * @return A reference to self so this method may be "chained".
+	 */
+	embed& set_url(std::string_view url);
+
+	/**
+	 * @brief Add an embed field.
+	 * @param name The name of the field. It will be truncated to the maximum length of 256 UTF-8 characters.
+	 * @param value The value of the field. It will be truncated to the maximum length of 1024 UTF-8 characters.
+	 * @param is_inline Whether or not to display the field 'inline' or on its own line
+	 * @return A reference to self so this method may be "chained".
+	 */
+	embed& add_field(std::string_view name, std::string_view value, bool is_inline = false);
+
+	/**
+	 * @brief Set embed author.
+	 * @param a The author to set
+	 * @return A reference to self so this method may be "chained".
+	 */ 
+	embed& set_author(const dpp::embed_author& a);
+
+	/**
+	 * @brief Set embed author.
+	 * @param name The name of the author. It will be truncated to the maximum length of 256 UTF-8 characters.
+	 * @param url The url of the author (only supports http(s))
+	 * @param icon_url The icon URL of the author (only supports http(s) and attachments)
+	 * @return A reference to self so this method may be "chained".
+	 */
+	embed& set_author(std::string_view name, std::string_view url, std::string_view icon_url);
+
+	/**
+	 * @brief Set embed provider.
+	 * @param name The provider name. It will be truncated to the maximum length of 256 UTF-8 characters.
+	 * @param url The provider url
+	 * @return A reference to self so this method may be "chained".
+	 */
+	embed& set_provider(std::string_view name, std::string_view url);
+
+	/**
+	 * @brief Set embed image.
+	 * @param url The embed image URL (only supports http(s) and attachments)
+	 * @return A reference to self so this method may be "chained".
+	 */
+	embed& set_image(std::string_view url);
+
+	/**
+	 * @brief Set embed video.
+	 * @param url The embed video url
+	 * @return A reference to self so this method may be "chained".
+	 */
+	embed& set_video(std::string_view url);
+
+	/**
+	 * @brief Set embed thumbnail.
+	 * @param url The embed thumbnail url (only supports http(s) and attachments)
+	 * @return A reference to self so this method may be "chained".
+	 */
+	embed& set_thumbnail(std::string_view url);
+};
+
+/**
+ * @brief Represents a reaction to a dpp::message.
+ */
+struct DPP_EXPORT reaction {
+	/**
+	 * @brief Total number of times this emoji has been used to react (including super reacts)
+	 */
+	uint32_t count;
+
+	/**
+	 * @brief Count of super reactions
+	 */
+	uint32_t count_burst;
+
+	/**
+	 * @brief Count of normal reactions
+	 */
+	uint32_t count_normal;
+
+	/**
+	 * @brief ID of emoji for reaction
+	 */
+	snowflake emoji_id;
+
+	/**
+	 * @brief Name of emoji, if applicable
+	 */
+	std::string emoji_name;
+
+	/**
+	 * @brief Whether your bot reacted using this emoji
+	 */
+	bool me;
+
+	/**
+	 * @brief Whether your bot super-reacted using this emoji
+	 */
+	bool me_burst;
+
+	/**
+	 * @brief HEX colors used for super reaction.
+	 *
+	 * @note Stored as integers.
+	 */
+	std::vector<uint32_t> burst_colors;
+
+	/**
+	 * @brief Constructs a new reaction object.
+	 */
+	reaction();
+
+	/**
+	 * @brief Constructs a new reaction object from a JSON object.
+	 * @param j The JSON to read data from
+	 */
+	reaction(nlohmann::json* j);
+
+	/**
+	 * @brief Destructs the reaction object.
+	 */
+	~reaction() = default;
+};
+
+/**
+ * @brief Bitmask flags for a dpp::attachment
+ */
+enum attachment_flags : uint8_t {
+	/**
+	 * @brief This attachment has been edited using the remix feature on mobile.
+	 */
+	a_is_remix = 1 << 2,
+};
+
+/**
+ * @brief Represents an attachment in a dpp::message
+ */
+struct DPP_EXPORT attachment {
+	/**
+	 * @brief ID of attachment.
+	 */
+	snowflake id;
+
+	/**
+	 * @brief Size of the attachment in bytes.
+	 */
+	uint32_t size;
+
+	/**
+	 * @brief File name of the attachment.
+	 */
+	std::string filename;
+
+	/**
+	 * @brief Optional: Description of the attachment.
+	 * Max 1024 characters.
+	 */
+	std::string description;
+
+	/**
+	 * @brief URL which points to the attachment.
+	 */
+	std::string url;
+
+	/**
+	 * @brief Proxied URL which points to the attachment.
+	 */
+	std::string proxy_url;
+
+	/**
+	 * @brief Width of the attachment, if applicable.
+	 */
+	uint32_t width;
+
+	/**
+	 * @brief Height of the attachment, if applicable.
+	 */
+	uint32_t height;
+
+	/**
+	 * @brief MIME type of the attachment, if applicable.
+	 */
+	std::string content_type;
+
+	/**
+	 * @brief Whether this attachment is ephemeral, if applicable.
+	 */
+	bool ephemeral;
+
+	/**
+	 * @brief The duration of the audio file.
+	 *
+	 * @note Currently for voice messages.
+	 */
+	double duration_secs;
+
+	/**
+	 * @brief Base64 encoded bytearray representing a sampled waveform.
+	 *
+	 * @note Currently for voice messages.
+	 */
+	std::string waveform;
+
+	/**
+	 * @brief Flags made from dpp::attachment_flags.
+	 */
+	uint8_t	flags;
+
+	/**
+	 * @brief Owning message
+	 */
+	struct message* owner;
+
+	/**
+	 * @brief Constructs a new attachment object.
+	 * @param o Owning dpp::message object
+	 */
+	attachment(struct message* o);
+
+	/**
+	 * @brief Constructs a new attachment object from a JSON object.
+	 * @param o Owning dpp::message object
+	 * @param j JSON to read information from
+	 */
+	attachment(struct message* o, nlohmann::json* j);
+
+	/**
+	 * @brief Destructs the attachment object.
+	 */
+	~attachment() = default;
+
+	/**
+	 * @brief Download this attachment
+	 *
+	 * @param callback A callback which is called when the download completes.
+	 * @note The content of the file will be in the http_info.body parameter of the
+	 * callback parameter.
+	 * @throw dpp::logic_exception If there is no owner associated with this attachment that
+	 * itself has an owning cluster, this method will throw a dpp::logic_exception when called.
+	 */
+	void download(http_completion_event callback) const;
+	
+	/**
+	 * @brief Returns true if remixed
+	 * 
+	 * @return true if remixed
+	 */
+	bool is_remix() const;
+	
+	/**
+	 * @brief Returns expiration timestamp for attachment's URL
+	 * 
+	 * @return timestamp of URL expiration
+	 */
+	time_t get_expire_time() const;
+	
+	/**
+	 * @brief Returns creation timestamp for attachment's URL
+	 * 
+	 * @return timestamp of URL creation
+	 */
+	time_t get_issued_time() const;
+};
+
+/**
+ * @brief Represents the type of a sticker
+ */
+enum sticker_type : uint8_t {
+	/**
+	 * @brief An official sticker in a pack.
+	 */
+	st_standard = 1,
+
+	/**
+	 * @brief Guild sticker.
+	 */
+	st_guild = 2
+};
+
+/**
+ * @brief The file format (png, apng, lottie) of a sticker
+ */
+enum sticker_format : uint8_t {
+	sf_png = 1,
+	sf_apng = 2,
+	sf_lottie = 3,
+	sf_gif = 4,
+};
+
+/**
+ * @brief Represents stickers received in messages
+ */
+struct DPP_EXPORT sticker : public managed, public json_interface<sticker> {
+protected:
+	friend struct json_interface<sticker>;
+
+	/** Read class values from json object
+	 * @param j A json object to read from
+	 * @return A reference to self
+	 */
+	sticker& fill_from_json_impl(nlohmann::json* j);
+
+	/** Build JSON from this object.
+	 * @param with_id True if the ID is to be set in the JSON structure
+	 * @return The JSON of the invite
+	 */
+	virtual json to_json_impl(bool with_id = true) const;
+
+public:
+	/**
+	 * @brief Optional: for standard stickers, id of the pack the sticker is from
+	 */
+	snowflake pack_id;
+
+	/**
+	 * @brief The name of the sticker.
+	 */
+	std::string name;
+
+	/**
+	 * @brief Description of the sticker
+	 *
+	 * @note This may be empty.
+	 */
+	std::string description;
+
+	/**
+	 * @brief The sticker's (or related) expressions.
+	 *
+	 * @note If it's a guild sticker, this will be the Discord name of
+	 * a unicode emoji representing the sticker's expression.
+	 * Otherwise, this will be a comma-separated list of related expressions.
+	 */
+	std::string tags;
+
+	/**
+	 * @brief Asset ID
+	 *
+	 * @deprecated now an empty string but still sent by discord.
+	 * While discord still send this empty string value,
+	 * we will still have this field here in the library.
+	 */
+	std::string asset;
+
+	/**
+	 * @brief The type of sticker.
+	 */
+	sticker_type type;
+
+	/**
+	 * @brief type of sticker format.
+	 */
+	sticker_format format_type;
+
+	/**
+	 * @brief Optional: Whether this guild sticker can be used.
+	 *
+	 * @note May be false due to loss of Server Boosts.
+	 */
+	bool available;
+
+	/**
+	 * @brief Optional: ID of the guild that owns this sticker.
+	 */
+	snowflake guild_id;
+
+	/**
+	 * @brief Optional: The user that uploaded the guild sticker.
+	 */
+	user sticker_user;
+
+	/**
+	 * @brief Optional: The standard sticker's sort order within its pack.
+	 */
+	uint8_t	sort_value;
+
+	/**
+	 * @brief Name of file to upload (when adding or editing a sticker).
+	 */
+	std::string filename;
+
+	/**
+	 * @brief File content to upload (raw binary).
+	 */
+	std::string filecontent;
+
+	/**
+	 * @brief Construct a new sticker object
+	 */
+	sticker();
+
+	virtual ~sticker() = default;
+
+	/**
+	 * @brief Get the sticker url.
+	 *
+	 * @return std::string The sticker url or an empty string, if the id is empty
+	 */
+	std::string get_url() const;
+
+	/**
+	 * @brief Set the filename
+	 * 
+	 * @param fn filename
+	 * @return message& reference to self
+	 */
+	sticker& set_filename(std::string_view fn);
+
+	/**
+	 * @brief Set the file content
+	 *
+	 * @param fc raw file content
+	 * @return message& reference to self
+	 */
+	sticker& set_file_content(std::string_view fc);
+
+};
+
+/**
+ * @brief Represents a sticker pack (the built in groups of stickers that all nitro users get to use)
+ */
+struct DPP_EXPORT sticker_pack : public managed, public json_interface<sticker_pack> {
+protected:
+	friend struct json_interface<sticker_pack>;
+
+	/** Read class values from json object
+	 * @param j A json object to read from
+	 * @return A reference to self
+	 */
+	sticker_pack& fill_from_json_impl(nlohmann::json* j);
+
+	/** Build JSON from this object.
+	 * @param with_id True if the ID is to be set in the JSON structure
+	 * @return The JSON of the invite
+	 */
+	virtual json to_json_impl(bool with_id = true) const;
+
+public:
+	/**
+	 * @brief The stickers in the pack.
+	 */
+	std::map<snowflake, sticker> stickers{};
+
+	/**
+	 * @brief Name of the sticker pack.
+	 */
+	std::string name{};
+
+	/**
+	 * @brief ID of the pack's SKU.
+	 */
+	snowflake sku_id{0};
+
+	/**
+	 * @brief Optional: ID of a sticker in the pack which is shown as the pack's icon.
+	 */
+	snowflake cover_sticker_id{0};
+
+	/**
+	 * @brief Description of the sticker pack.
+	 */
+	std::string description{};
+
+	/**
+	 * @brief ID of the sticker pack's banner image.
+	 */
+	snowflake banner_asset_id{};
+};
+
+/**
+ * @brief Poll layout types
+ *
+ * @note At the time of writing Discord only has 1, "The, uhm, default layout type."
+ * @see https://discord.com/developers/docs/resources/poll#layout-type
+ */
+enum poll_layout_type {
+	/**
+	 * @brief According to Discord, quote, "The, uhm, default layout type."
+	 */
+	pl_default = 1
+};
+
+/**
+ * @brief Structure representing a poll media, for example the poll question or a possible poll answer.
+ *
+ * @see https://discord.com/developers/docs/resources/poll#poll-media-object-poll-media-object-structure
+ */
+struct poll_media {
+	/**
+	 * @brief Text of the media
+	 */
+	std::string text{};
+
+	/**
+	 * @brief Emoji of the media.
+	 */
+	partial_emoji emoji{};
+};
+
+/**
+ * @brief Represents an answer in a poll.
+ *
+ * @see https://discord.com/developers/docs/resources/poll#poll-answer-object-poll-answer-object-structure
+ */
+struct poll_answer {
+	/**
+	 * @brief ID of the answer. Only sent by the Discord API, this is a dead field when creating a poll.
+	 *
+	 * @warn At the time of writing the Discord API warns users not to rely on anything regarding sequence or "first value" of this field.
+	 */
+	uint32_t id{0};
+
+	/**
+	 * @brief Data of the answer.
+	 *
+	 * @see poll_media
+	 */
+	poll_media media{};
+};
+
+/**
+ * @brief Represents the results of a poll
+ *
+ * @see https://discord.com/developers/docs/resources/poll#poll-results-object-poll-results-object-structure
+ */
+struct poll_results {
+	/**
+	 * @brief Represents a reference to an answer and its count of votes
+	 *
+	 * @see https://discord.com/developers/docs/resources/poll#poll-results-object-poll-answer-count-object-structure
+	 */
+	struct answer_count {
+		/**
+		 * @brief ID of the answer. Relates to an answer in the answers field
+		 *
+		 * @see poll_answer::answer_id
+		 */
+		uint32_t answer_id{0};
+
+		/**
+		 * @brief Number of votes for this answer
+		 */
+		uint32_t count{0};
+
+		/**
+		 * @brief Whether the current user voted
+		 */
+		bool me_voted{false};
+	};
+
+	/**
+	 * @brief Whether the poll has finalized, and the answers are precisely counted
+	 *
+	 * @note Discord states that due to the way they count and cache answers,
+	 * while a poll is running the count of answers might not be accurate.
+	 */
+	bool is_finalized{false};
+
+	/**
+	 * @brief Count of votes for each answer. If an answer is not present in this list,
+	 * then its vote count is 0
+	 */
+	std::map<uint32_t, answer_count> answer_counts;
+};
+
+/**
+ * @brief Represents a poll.
+ *
+ * @see https://discord.com/developers/docs/resources/poll
+ */
+struct DPP_EXPORT poll {
+	/**
+	 * @brief Poll question. At the time of writing only the text field is supported by Discord
+	 *
+	 * @see media
+	 */
+	poll_media question{};
+
+	/**
+	 * @brief List of answers of the poll.
+	 *
+	 * @note At the time of writing this can contain up to 10 answers
+	 * @see answer
+	 */
+	std::map<uint32_t, poll_answer> answers{};
+
+	/**
+	 * @brief When retriving a poll from the API, this is the timestamp at which the poll will expire.
+	 * When creating a poll, this is the number of hours the poll should be up for, up to 7 days (168 hours), and this field will be rounded.
+	 */
+	double expiry{24.0};
+
+	/**
+	 * @brief Whether a user can select multiple answers
+	 */
+	bool allow_multiselect{false};
+
+	/**
+	 * @brief Layout type of the poll. Defaults to, well, pl_default
+	 *
+	 * @see poll_layout_type
+	 */
+	poll_layout_type layout_type{pl_default};
+
+	/**
+	 * @brief The (optional) results of the poll. This field may or may not be present, and its absence means "unknown results", not "no results".
+	 *
+	 * @note Quote from Discord: "The results field may be not present in certain responses where, as an implementation detail,
+	 * we do not fetch the poll results in our backend. This should be treated as "unknown results",
+	 * as opposed to "no results". You can keep using the results if you have previously received them through other means."
+	 *
+	 * @see https://discord.com/developers/docs/resources/poll#poll-results-object
+	 */
+	std::optional<poll_results> results{std::nullopt};
+
+	/**
+	 * @brief Set the question for this poll
+	 *
+	 * @param text Text for the question
+	 * @return self for method chaining
+	 */
+	poll& set_question(std::string_view text);
+
+	/**
+	 * @brief Set the duration of the poll in hours
+	 *
+	 * @param hours Duration of the poll in hours, max 7 days (168 hours) at the time of writing
+	 * @return self for method chaining
+	 */
+	poll& set_duration(uint32_t hours) noexcept;
+
+	/**
+	 * @brief Set if the poll should allow multi-selecting
+	 *
+	 * @param allow Should allow multi-select?
+	 * @return self for method chaining
+	 */
+	poll& set_allow_multiselect(bool allow) noexcept;
+
+	/**
+	 * @brief Add an answer to this poll
+	 *
+	 * @note At the time of writing this, a poll can have up to 10 answers
+	 * @param media Data of the answer
+	 * @return self for method chaining
+	 */
+	poll& add_answer(const poll_media& media);
+
+	/**
+	 * @brief Add an answer to this poll
+	 *
+	 * @note At the time of writing this, a poll can have up to 10 answers
+	 * @param text Text for the answer
+	 * @param emoji_id Optional emoji
+	 * @param is_animated Whether the emoji is animated
+	 * @return self for method chaining
+	 */
+	poll& add_answer(std::string_view text, snowflake emoji_id = 0, bool is_animated = false);
+
+	/**
+	 * @brief Add an answer to this poll
+	 *
+	 * @note At the time of writing this, a poll can have up to 10 answers
+	 * @param text Text for the answer
+	 * @param emoji Optional emoji
+	 * @return self for method chaining
+	 */
+	poll& add_answer(std::string_view text, std::string_view emoji);
+
+	/**
+	 * @brief Add an answer to this poll
+	 *
+	 * @note At the time of writing this, a poll can have up to 10 answers
+	 * @param text Text for the answer
+	 * @param e Optional emoji
+	 * @return self for method chaining
+	 */
+	poll& add_answer(std::string_view text, const emoji& e);
+
+	/**
+	 * @brief Helper to get the question text
+	 *
+	 * @return question.text
+	 */
+	[[nodiscard]] const std::string& get_question_text() const noexcept;
+
+	/**
+	 * @brief Helper to find an answer by ID
+	 *
+	 * @param id ID to find
+	 * @return Pointer to the answer with the matching ID, or nullptr if not found
+	 */
+	[[nodiscard]] const poll_media* find_answer(uint32_t id) const noexcept;
+
+	/**
+	 * @brief Helper to find the vote count in the results
+	 *
+	 * @param answer_id ID of the answer to find
+	 * @return std::optional<uint32_t> Optional count of votes. An empty optional means Discord did not send the results, it does not mean 0. It can also mean the poll does not have an answer with this ID
+	 * @see https://discord.com/developers/docs/resources/poll#poll-results-object
+	 */
+	[[nodiscard]] std::optional<uint32_t> get_vote_count(uint32_t answer_id) const noexcept;
+};
+
+/**
+ * @brief Bitmask flags for a dpp::message
+ */
+enum message_flags : uint16_t {
+	/**
+	 * @brief This message has been published to subscribed channels (via Channel Following).
+	 */
+	m_crossposted = 1 << 0,
+
+	/**
+	 * @brief This message originated from a message in another channel (via Channel Following).
+	 */
+	m_is_crosspost =  1 << 1,
+
+	/**
+	 * @brief Do not include any embeds when serializing this message.
+	 */
+	m_suppress_embeds = 1 << 2,
+
+	/**
+	 * @brief The source message for this crosspost has been deleted (via Channel Following).
+	 */
+	m_source_message_deleted = 1 << 3,
+
+	/**
+	 * @brief This message came from the urgent message system.
+	 */
+	m_urgent = 1 << 4,
+
+	/**
+	 * @brief This message has an associated thread, with the same id as the message.
+	 */
+	m_has_thread = 1 << 5,
+
+	/**
+	 * @brief This message is only visible to the user who invoked the Interaction.
+	 */
+	m_ephemeral = 1 << 6,
+
+	/**
+	 * @brief This message is an Interaction Response and the bot is "thinking".
+	 */
+	m_loading = 1 << 7,
+
+	/**
+	 * @brief This message failed to mention some roles and add their members to the thread.
+	 */
+	m_thread_mention_failed = 1 << 8,
+
+	/**
+	 * @brief This message will not trigger push and desktop notifications.
+	 */
+	m_suppress_notifications = 1 << 12,
+
+	/**
+	 * @brief This message is a voice message.
+	 */
+	m_is_voice_message = 1 << 13,
+
+	/**
+	 * @brief Contains forwarded snapshot
+	 */
+	m_has_snapshot = 1 << 14,
+
+	/**
+	 * @brief Message components vector contains v2 components
+	 */
+	m_using_components_v2 = 1 << 15,
+};
+
+/**
+ * @brief Represents possible values for the dpp::embed type field.
+ * These are loosely defined by the API docs and do not influence how the client renders embeds.
+ *
+ * @note The only type a bot can send is dpp::embed_type::emt_rich.
+ */
+namespace embed_type {
+	/**
+	 * @brief Rich text
+	 */
+	const std::string emt_rich = "rich";
+
+	/**
+	 * @brief Image
+	 */
+	const std::string emt_image = "image";
+
+	/**
+	 * @brief Video link
+	 */
+	const std::string emt_video = "video";
+
+	/**
+	 * @brief Animated gif
+	 */
+	const std::string emt_gifv = "gifv";
+
+	/**
+	 * @brief Article
+	 */
+	const std::string emt_article = "article";
+
+	/**
+	 * @brief Link URL
+	 */
+	const std::string emt_link = "link";
+
+	/**
+	 * @brief Auto moderation filter
+	 */
+	const std::string emt_automod = "auto_moderation_message";
+} // namespace embed_type
+
+/**
+ * @brief Message types for dpp::message::type
+ */
+enum message_type : uint8_t {
+	/**
+	 * @brief Default
+	 */
+	mt_default = 0,
+
+	/**
+	 * @brief Add recipient
+	 */
+	mt_recipient_add = 1,
+
+	/**
+	 * @brief Remove recipient
+	 */
+	mt_recipient_remove = 2,
+
+	/**
+	 * @brief Call
+	 */
+	mt_call	= 3,
+
+	/**
+	 * @brief Channel name change
+	 */
+	mt_channel_name_change = 4,
+
+	/**
+	 * @brief Channel icon change
+	 */
+	mt_channel_icon_change = 5,
+
+	/**
+	 * @brief Message pinned
+	 */
+	mt_channel_pinned_message = 6,
+
+	/**
+	 * @brief Member joined
+	 */
+	mt_guild_member_join = 7,
+
+	/**
+	 * @brief Boost
+	 */
+	mt_user_premium_guild_subscription = 8,
+
+	/**
+	 * @brief Boost level 1
+	 */
+	mt_user_premium_guild_subscription_tier_1 = 9,
+
+	/**
+	 * @brief Boost level 2
+	 */
+	mt_user_premium_guild_subscription_tier_2 = 10,
+
+	/**
+	 * @brief Boost level 3
+	 */
+	mt_user_premium_guild_subscription_tier_3 = 11,
+
+	/**
+	 * @brief Follow channel
+	 */
+	mt_channel_follow_add = 12,
+
+	/**
+	 * @brief Disqualified from discovery
+	 */
+	mt_guild_discovery_disqualified	= 14,
+
+	/**
+	 * @brief Re-qualified for discovery
+	 */
+	mt_guild_discovery_requalified = 15,
+
+	/**
+	 * @brief Discovery grace period warning 1
+	 */
+	mt_guild_discovery_grace_period_initial_warning	= 16,
+
+	/**
+	 * @brief Discovery grace period warning 2
+	 */
+	mt_guild_discovery_grace_period_final_warning = 17,
+
+	/**
+	 * @brief Thread Created
+	 */
+	mt_thread_created = 18,
+
+	/**
+	 * @brief Reply
+	 */
+	mt_reply = 19,
+
+	/**
+	 * @brief Application command
+	 */
+	mt_application_command = 20,
+
+	/**
+	 * @brief Thread starter message
+	 */
+	mt_thread_starter_message = 21,
+
+	/**
+	 * @brief Invite reminder
+	 */
+	mt_guild_invite_reminder = 22,
+
+	/**
+	 * @brief Context Menu Command
+	 */
+	mt_context_menu_command = 23,
+
+	/**
+	 * @brief Auto moderation action
+	 */
+	mt_auto_moderation_action = 24,
+
+	/**
+	 * @brief Role subscription purchase
+	 */
+	mt_role_subscription_purchase = 25,
+
+	/**
+	 * @brief Interaction premium upsell
+	 * @depreciated Replaced with buttons with a style of cos_premium
+	 * This message type may stop working at any point
+	 */
+	mt_interaction_premium_upsell = 26,
+
+	/**
+	 * @brief Stage start
+	 */
+	mt_stage_start = 27,
+
+	/**
+	 * @brief Stage end
+	 */
+	mt_stage_end = 28,
+
+	/**
+	 * @brief Stage speaker
+	 */
+	mt_stage_speaker = 29,
+
+	/**
+	 * @brief Stage topic
+	 */
+	mt_stage_topic = 31,
+
+	/**
+	 * @brief Guild application premium subscription
+	 */
+	mt_application_premium_subscription = 32,
+};
+
+/**
+ * @brief Represents the caching policy of a cache in the library.
+ */
+enum cache_policy_setting_t {
+	/**
+	 * @brief request aggressively on seeing new guilds, and also store missing data from messages.
+	 * This is the default behaviour and the least memory-efficient option. Memory usage will increase
+	 * over time, initially quite rapidly, and then linearly over time. It is the least cpu-intensive
+	 * setting.
+	 */
+	cp_aggressive = 0,
+
+	/**
+	 * @brief only cache when there is relevant activity, e.g. a message to the bot.
+	 * This is a good middle-ground, memory usage will increase linearly over time.
+	 */
+	cp_lazy = 1,
+
+	/**
+	 * @brief Don't cache anything. Fill details when we see them.
+	 * This is the most memory-efficient option but consumes more CPU time
+	 */
+	cp_none = 2
+};
+
+/**
+ * @brief Represents the caching policy of the cluster.
+ * 
+ * Channels and guilds are always cached as these caches are used
+ * internally by the library. The memory usage of these is minimal.
+ * 
+ * All default to 'aggressive' which means to actively attempt to cache,
+ * going out of the way to fill the caches completely. On large bots this
+ * can take a LOT of RAM.
+ */
+struct DPP_EXPORT cache_policy_t {
+	/**
+	 * @brief Caching policy for users and guild members
+	 */
+	cache_policy_setting_t user_policy = cp_aggressive;
+
+	/**
+	 * @brief Caching policy for emojis
+	 */
+	cache_policy_setting_t emoji_policy = cp_aggressive;
+
+	/**
+	 * @brief Caching policy for roles
+	 */
+	cache_policy_setting_t role_policy = cp_aggressive;
+
+	/**
+	 * @brief Caching policy for roles
+	 */
+	cache_policy_setting_t channel_policy = cp_aggressive;
+
+	/**
+	 * @brief Caching policy for roles
+	 */
+	cache_policy_setting_t guild_policy = cp_aggressive;
+};
+
+/**
+ * @brief Contains a set of predefined cache policies for use when constructing a dpp::cluster
+ */
+namespace cache_policy {
+
+	/**
+	 * @brief A shortcut constant for all caching enabled for use in dpp::cluster constructor
+	 */
+	inline constexpr cache_policy_t cpol_default = { cp_aggressive, cp_aggressive, cp_aggressive, cp_aggressive, cp_aggressive };
+
+	/**
+	 * @brief A shortcut constant for a more balanced caching policy for use in dpp::cluster constructor
+	 */
+	inline constexpr cache_policy_t cpol_balanced = { cp_lazy, cp_lazy, cp_lazy, cp_aggressive, cp_aggressive };
+
+	/**
+	 * @brief A shortcut constant for all caching disabled for use in dpp::cluster constructor
+	 */
+	inline constexpr cache_policy_t cpol_none = { cp_none, cp_none, cp_none, cp_none, cp_none };
+
+};
+
+/**
+ * @brief Metadata about the interaction, including the source of the interaction and relevant server and user IDs.
+ */
+struct DPP_EXPORT interaction_metadata_type {
+
+	/**
+	 * @brief ID of the interaction
+	 */
+	snowflake id;
+
+	/**
+	 * @brief User who triggered the interaction
+	 */
+	uint8_t type;
+
+	/**
+	 * @brief User who triggered the interaction
+	 */
+	user usr;
+
+	/**
+	 * @brief ID of the original response message, present only on follow-up messages
+	 */
+	snowflake original_response_message_id;
+
+	/**
+	 * @brief ID of the message that contained interactive component, present only on messages created from component interactions
+	 */
+	snowflake interacted_message_id;
+
+	// FIXME: Add this field sometime 
+	/**
+	 * @brief Metadata for the interaction that was used to open the modal, present only on modal submit interactions
+	 */
+	// interaction_metadata_type triggering_interaction_metadata;
+};
+
+/**
+ * @brief Message Reference type
+ */
+enum DPP_EXPORT message_ref_type : uint8_t {
+	/**
+	 * A reply or crosspost
+	 */
+	mrt_default = 0,
+	/**
+	 * A forwarded message
+	 */
+	mrt_forward = 1,
+};
+
+template <typename T> struct message_snapshot {
+	std::vector<T> messages;
+};
+
+/**
+ * @brief Represents messages sent and received on Discord
+ */
+struct DPP_EXPORT message : public managed, json_interface<message> {
+protected:
+	friend struct json_interface<message>;
+
+	/** Read class values from json object
+	 * @param j A json object to read from
+	 * @return A reference to self
+	 */
+	inline message& fill_from_json_impl(nlohmann::json *j) {
+		return fill_from_json(j, {cp_aggressive, cp_aggressive, cp_aggressive});
+	}
+
+	/** Build a JSON from this object.
+	 * @param with_id True if an ID is to be included in the JSON
+	 * @return JSON
+	 */
+	inline json to_json_impl(bool with_id = false) const {
+		return to_json(with_id, false);
+	}
+public:
+	/**
+	 * @brief ID of the channel the message was sent in.
+	 */
+	snowflake channel_id;
+
+	/**
+	 * @brief Optional: ID of the guild the message was sent in.
+	 */
+	snowflake guild_id;
+
+	/**
+	 * @brief The author of this message.
+	 *
+	 * @warning This is not guaranteed to be a valid user.
+	 */
+	user author;
+
+	/**
+	 * @brief Optional: member properties for this message's author
+	 */
+	guild_member member;
+
+	/**
+	 * @brief Contents of the message.
+	 */
+	std::string content;
+
+	/**
+	 * @brief Message components.
+	 */
+	std::vector<dpp::component> components;
+
+	/**
+	 * @brief Pre-generated components as JSON. This overrides the components
+	 * array if it is set.
+	 */
+	json components_json;
+
+	/**
+	 * @brief When this message was sent.
+	 */
+	time_t sent;
+
+	/**
+	 * @brief When this message was edited.
+	 *
+	 * @note This may be 0 if never edited.
+	 */
+	time_t edited;
+
+	/**
+	 * @brief Users specifically mentioned in the message.
+	 */
+	std::vector<std::pair<user, guild_member>> mentions;
+
+	/**
+	 * @brief Roles specifically mentioned in this message (only IDs currently).
+	 */
+	std::vector<snowflake> mention_roles;
+
+	/**
+	 * @brief Channels mentioned in the message.
+	 *
+	 * @warning Not all types supported.
+	 *
+	 * @note Discord: Only textual channels that are visible to everyone in a lurkable guild will ever be included.
+	 * Only crossposted messages (via Channel Following) currently include mention_channels at all. (includes ID, Guild ID, Type, Name).
+	 */
+	std::vector<channel> mention_channels;
+
+	/**
+	 * @brief Any attached files.
+	 */
+	std::vector<attachment> attachments;
+
+	/**
+	 * @brief Up to 10 dpp::embed objects.
+	 */
+	std::vector<embed> embeds;
+
+	/**
+	 * @brief Optional: reactions to the message.
+	 */
+	std::vector<reaction> reactions;
+
+	/**
+	 * @brief Optional: Used for validating a message was sent.
+	 */
+	std::string nonce;
+
+	/**
+	 * @brief Optional: Webhook ID.
+	 *
+	 * @note If the message is generated by a webhook, its ID will be here. Otherwise, the field will be 0.
+	 */
+	snowflake webhook_id;
+
+	/**
+	 * @brief Partial stickers. Only id, name and format_type are filled
+	 */
+	std::vector<sticker> stickers;
+
+	/**
+	 * @brief An array of file data to use for uploading files.
+	 *
+	 * @note You should use dpp::message::add_file to add data to this!
+	 */
+	std::vector<message_file_data> file_data;
+
+	/**
+	 * @brief Reference to another message, e.g. a reply
+	 */
+	struct message_ref {
+		/**
+		 * @brief Message reference type, set to 1 to forward a message
+		 */
+		message_ref_type type{mrt_default};
+		/**
+		 * @brief ID of the originating message.
+		 */
+		snowflake message_id;
+
+		/**
+		 * @brief ID of the originating message's channel.
+		 */
+		snowflake channel_id;
+
+		/**
+		 * @brief ID of the originating message's guild.
+		 */
+		snowflake guild_id;
+
+		/**
+		 * @brief when sending, whether to error if the referenced message doesn't exist instead of sending as a normal (non-reply) message.
+		 * Default true.
+		 */
+		bool fail_if_not_exists;
+	} message_reference;
+
+	/**
+	 * @brief Message snapshots for a forwarded message
+	 */
+	message_snapshot<message> message_snapshots;
+
+	/**
+	 * @brief Reference to an interaction
+	 */
+	struct message_interaction_struct {
+		/**
+		 * @brief ID of the interaction.
+		 */
+		snowflake id;
+
+		/**
+		 * @brief Type of interaction.
+		 */
+		uint8_t type;
+
+		/**
+		 * @brief Name of the application command.
+		 */
+		std::string name;
+
+		/**
+		 * @brief The user who invoked the interaction.
+		 */
+		user usr;
+	} interaction;
+
+	/**
+	 * @brief Sent if the message is sent as a result of an interaction
+	 */
+	interaction_metadata_type interaction_metadata;
+
+	/**
+	 * @brief Allowed mentions details
+	 */
+	struct allowed_ref {
+		/**
+		 * @brief Set to true to parse user mentions in the text. Default is false
+		 */
+		bool parse_users;
+
+		/**
+		 * @brief Set to true to at-everyone and at-here mentions in the text. Default is false
+		 */
+		bool parse_everyone;
+
+		/**
+		 * @brief Set to true to parse role mentions in the text. Default is false
+		 */
+		bool parse_roles;
+
+		/**
+		 * @brief Set to true to mention the user who sent the message this one is replying to. Default is false
+		 */
+		bool replied_user;
+
+		/**
+		 * @brief List of users to allow pings for 
+		 */
+		std::vector<snowflake> users;
+
+		/**
+		 * @brief List of roles to allow pings for 
+		 */
+		std::vector<snowflake> roles;
+	} allowed_mentions;
+
+	/**
+	 * @brief The cluster which created this message object.
+	 */
+	class cluster* owner;
+
+	/**
+	 * @brief Message type.
+	 */
+	message_type type;
+
+	/**
+	 * @brief Flags made from dpp::message_flags
+	 */
+	uint16_t flags;
+
+	/**
+	 * @brief Whether this message is pinned.
+	 */
+	bool pinned;
+
+	/**
+	 * @brief Whether this was a TTS message.
+	 */
+	bool tts;
+
+	/**
+	 * @brief Whether this message mentions everyone.
+	 */
+	bool mention_everyone;
+
+	/**
+	 * @brief Optional poll attached to this message
+	 */
+	std::optional<poll> attached_poll;
+
+	/**
+	 * @brief Construct a new message object
+	 */
+	message();
+
+	/*
+	 * @brief Construct a new message object
+	 * @param m Message to copy
+	 */
+	message(const message& m) = default;
+
+	/*
+	 * @brief Construct a new message object
+	 * @param m Message to move
+	 */
+	message(message&& m) = default;
+
+	/**
+	 * @brief Construct a new message object
+	 * @param o Owning cluster, passed down to various things such as dpp::attachment.
+	 * Owning cluster is optional (can be nullptr) and if nulled, will prevent some functions
+	 * such as attachment::download from functioning (they will throw, if used)
+	 */
+	message(class cluster* o);
+
+	/**
+	 * @brief Construct a new message object with a channel and content
+	 *
+	 * @param channel_id The channel to send the message to
+	 * @param content The content of the message. It will be truncated to the maximum length of 4000 UTF-8 characters.
+	 * @param type The message type to create
+	 */
+	message(snowflake channel_id, std::string_view content, message_type type = mt_default);
+
+	/**
+	 * @brief Construct a new message object with content
+	 *
+	 * @param _embed An embed to send
+	 */
+	message(const embed& _embed);
+
+	/**
+	 * @brief Construct a new message object with a channel and content
+	 *
+	 * @param channel_id The channel to send the message to
+	 * @param _embed An embed to send
+	 */
+	message(snowflake channel_id, const embed& _embed);
+
+	/**
+	 * @brief Construct a new message object with content
+	 *
+	 * @param content The content of the message. It will be truncated to the maximum length of 4000 UTF-8 characters.
+	 * @param type The message type to create
+	 */
+	message(std::string_view content, message_type type = mt_default);
+
+	/**
+	 * @brief Destroy the message object
+	 */
+	~message() override = default;
+
+	/**
+	 * @brief Copy a message object
+	 *
+	 * @param m Message to copy
+	 * @return message& Reference to self
+	 */
+	message &operator=(const message& m) = default;
+
+	/**
+	 * @brief Move a message object
+	 *
+	 * @param m Message to move
+	 * @return message& Reference to self
+	 */
+	message &operator=(message&& m) = default;
+
+	/**
+	 * @brief Set the original message reference for replies/crossposts
+	 * 
+	 * @param _message_id message id to reply to
+	 * @param _guild_id guild id to reply to (optional)
+	 * @param _channel_id channel id to reply to (optional)
+	 * @param fail_if_not_exists true if the message send should fail if these values are invalid (optional)
+	 * @param type Type of reference
+	 * @return message& reference to self
+	 */
+	message& set_reference(snowflake _message_id, snowflake _guild_id = 0, snowflake _channel_id = 0, bool fail_if_not_exists = false, message_ref_type type = mrt_default);
+
+	/**
+	 * @brief Set the allowed mentions object for pings on the message
+	 * 
+	 * @param _parse_users whether or not to parse users in the message content or embeds, default false
+	 * @param _parse_roles whether or not to parse roles in the message content or embeds, default false
+	 * @param _parse_everyone whether or not to parse everyone/here in the message content or embeds, default false
+	 * @param _replied_user if set to true and this is a reply, then ping the user we reply to, default false
+	 * @param users list of user ids to allow pings for, default an empty vector
+	 * @param roles list of role ids to allow pings for, default an empty vector
+	 * @return message& reference to self
+	 */
+	message& set_allowed_mentions(bool _parse_users = false, bool _parse_roles = false, bool _parse_everyone = false, bool _replied_user = false, const std::vector<snowflake> &users = {}, const std::vector<snowflake> &roles = {});
+
+	using json_interface<message>::fill_from_json;
+	using json_interface<message>::to_json;
+
+	/** Fill this object from json.
+	 * @param j JSON object to fill from
+	 * @param cp Cache policy for user records, whether or not we cache users when a message is received
+	 * @return A reference to self
+	 */
+	message& fill_from_json(nlohmann::json* j, cache_policy_t cp);
+
+	/** Build JSON from this object.
+	 * @param with_id True if the ID is to be included in the built JSON
+	 * @param is_interaction_response Set to true if this message is intended to be included in an interaction response.
+	 * This will exclude some fields that are not valid in interactions at this time.
+	 * @return The JSON text of the message
+	 */
+	virtual json to_json(bool with_id, bool is_interaction_response) const;
+
+	/**
+	 * @brief Returns true if the message was crossposted to other servers
+	 * 
+	 * @return true if crossposted
+	 */
+	bool is_crossposted() const;
+
+	/**
+	 * @brief Returns true if posted from other servers announcement channel via webhook
+	 * 
+	 * @return true if posted from other server
+	 */
+	bool is_crosspost() const;
+
+	/**
+	 * @brief True if embeds have been removed
+	 * 
+	 * @return true if embeds removed
+	 */
+	bool suppress_embeds() const;
+
+	/**
+	 * @brief Set whether embeds should be suppressed
+	 *
+	 * @param suppress whether embeds should be suppressed
+	 * @return message& reference to self
+	 */
+	message& suppress_embeds(bool suppress);
+
+	/**
+	 * @brief True if source message was deleted
+	 * 
+	 * @return true if source message deleted
+	 */
+	bool is_source_message_deleted() const;
+
+	/**
+	 * @brief True if urgent
+	 * 
+	 * @return true if urgent
+	 */
+	bool is_urgent() const;
+
+	/**
+	 * @brief True if has thread attached
+	 *
+	 * @return true if has thread attached
+	 */
+	bool has_thread() const;
+
+	/**
+	 * @brief True if ephemeral (visible only to issuer of a slash command)
+	 * 
+	 * @return true if ephemeral
+	 */
+	bool is_ephemeral() const;
+
+	/**
+	 * @brief True if loading
+	 * 
+	 * @return true if loading
+	 */
+	bool is_loading() const;
+
+	/**
+	 * @brief Returns true if this message failed to mention some roles and add their members to the thread
+	 *
+	 * @return true if this message failed to mention some roles and add their members to the thread
+	 */
+	bool is_thread_mention_failed() const;
+
+	/**
+	 * @brief True if the message will not trigger push and desktop notifications
+	 *
+	 * @return True if notifications suppressed
+	 */
+	bool suppress_notifications() const;
+
+	/**
+	 * @brief True if the message is a voice message
+	 *
+	 * @return True if voice message
+	 */
+	bool is_voice_message() const;
+
+	/**
+	 * @brief True if the message has a snapshot
+	 *
+	 * @return True if voice message
+	 */
+	bool has_snapshot() const;
+
+	/**
+	 * @brief True if the message is using components v2
+	 *
+	 * @return True if voice message
+	 */
+	bool is_using_components_v2() const;
+
+	/**
+	 * @brief Add a component to a message
+	 *
+	 * @note If the component type you add is only available in
+	 * components v2, this method will automatically add the
+	 * m_using_components_v2 flag to your message.
+	 * 
+	 * @param c component to add
+	 * @return message& reference to self
+	 */
+	message& add_component(const component& c);
+
+	/**
+	 * @brief Add pre-generated components to a message
+	 *
+	 * @note This is intended to accept pre-generated component
+	 * json from external tools such as https://discord.builders
+	 *
+	 * @param json components json to add. The JSON will be validated
+	 * @return message& reference to self
+	 */
+	message& add_json_components(const std::string& json);
+
+	/**
+	 * @brief Add a component to a message
+	 *
+	 * @note If the component type you add is only available in
+	 * components v2, this method will automatically add the
+	 * m_using_components_v2 flag to your message.
+	 *
+	 * This is an alias of add_component() for readability when
+	 * using components v2, so you can use add_component_v2()
+	 * everywhere. It does exactly the same as add_component().
+	 *
+	 * @param c component to add
+	 * @return message& reference to self
+	 */
+	message& add_component_v2(const component& c);
+
+	/**
+	 * @brief Add an embed to message
+	 * 
+	 * @param e embed to add
+	 * @return message& reference to self
+	 */
+	message& add_embed(const embed& e);
+
+	/**
+	 * @brief Add a sticker to this message
+	 *
+	 * As of writing this, a message can only contain up to 3 stickers
+	 * @param s sticker to add
+	 * @return message& reference to self
+	 */
+	message& add_sticker(const sticker& s);
+
+	/**
+	 * @brief Add a sticker to this message
+	 *
+	 * As of writing this, a message can only contain up to 3 stickers
+	 * @param id id of the sticker to add
+	 * @return message& reference to self
+	 */
+	message& add_sticker(const snowflake& id);
+
+	/**
+	 * @brief Set the flags
+	 * 
+	 * @param f flags to set from dpp::message_flags
+	 * @return message& reference to self
+	 */
+	message& set_flags(uint16_t f);
+
+	/**
+	 * @brief Set the message type
+	 * 
+	 * @param t type to set
+	 * @return message& reference to self
+	 */
+	message& set_type(message_type t);
+
+	/**
+	 * @brief Set the filename of the last file in list
+	 * 
+	 * @param fn filename
+	 * @return message& reference to self
+	 * @deprecated Use message::add_file instead
+	 */
+	message& set_filename(std::string_view fn);
+
+	/**
+	 * @brief Set the file content of the last file in list
+	 * 
+	 * @param fc raw file content
+	 * @return message& reference to self
+	 * @deprecated Use message::add_file instead
+	 */
+	message& set_file_content(std::string_view fc);
+
+	/**
+	 * @brief Add a file to the message
+	 *
+	 * @param filename filename
+	 * @param filecontent raw file content
+	 * @param filemimetype optional mime type of the file
+	 * @return message& reference to self
+	 */
+	message& add_file(std::string_view filename, std::string_view filecontent, std::string_view filemimetype = "");
+
+	/**
+	 * @brief Set the message content
+	 * 
+	 * @param c message content. It will be truncated to the maximum length of 4000 UTF-8 characters.
+	 * @return message& reference to self
+	 */
+	message& set_content(std::string_view c);
+	
+	/**
+	 * @brief Set the channel id
+	 * 
+	 * @param _channel_id channel id
+	 * @return message& reference to self
+	 */
+	message& set_channel_id(snowflake _channel_id);
+
+	/**
+	 * @brief Set the channel id
+	 * 
+	 * @param _guild_id channel id
+	 * @return message& reference to self
+	 */
+	message& set_guild_id(snowflake _guild_id);
+
+	/**
+	 * @brief Returns true if the message is from a DM
+	 * 
+	 * @return true if message is a DM
+	 */
+	bool is_dm() const;
+
+	/**
+	 * @brief Returns true if message has remixed attachment
+	 * 
+	 * @return true if message has remixed attachment
+	 */
+	bool has_remix_attachment() const;
+
+	/**
+	 * @brief Returns URL to message 
+	 * 
+	 * @return string of URL to message
+	 */
+	std::string get_url() const;
+
+	/**
+	 * @brief Convenience method to set the poll
+	 *
+	 * @return message& Self reference for method chaining
+	 */
+	message& set_poll(const poll& p);
+
+	/**
+	 * @brief Convenience method to get the poll attached to this message
+	 *
+	 * @throw std::bad_optional_access if has_poll() == false
+	 * @return const poll& Poll attached to this object
+	 */
+	[[nodiscard]] const poll& get_poll() const;
+
+	/**
+	 * @brief Method to check if the message has a poll
+	 *
+	 * @return bool Whether the message has a poll
+	 */
+	[[nodiscard]] bool has_poll() const noexcept;
+};
+
+/**
+ * @brief Represents a pinned message.
+ */
+class DPP_EXPORT message_pin : public json_interface<message_pin> {
+protected:
+	friend struct json_interface<message_pin>;
+
+	/**
+	 * @brief Fill in object from json data
+	 *
+	 * @param j JSON data
+	 * @return message_pin& Reference to self
+	 */
+	message_pin& fill_from_json_impl(nlohmann::json* j);
+
+	/** Build JSON from this object.
+	 * @return The JSON text of the message_pin
+	 */
+	virtual json to_json() const;
+
+public:
+
+	message_pin();
+
+	message_pin(time_t _pinned_at, const message& _pinned_message);
+
+	/*
+	 * @brief Construct a new message_pin object
+	 * @param msg_pin message_pin to copy
+	 */
+	message_pin(const message_pin& msg_pin) = default;
+
+	/*
+	 * @brief Construct a new message_pin object
+	 * @param msg_pin message_pin to move
+	 */
+	message_pin(message_pin&& msg_pin) = default;
+
+	/**
+	 * @brief Destroy the message_pin object
+	 */
+	~message_pin() = default;
+
+	/**
+	 * @brief Copy a message_pin object
+	 *
+	 * @param msg_pin message_pin to copy
+	 * @return message_pin& Reference to self
+	 */
+	message_pin &operator=(const message_pin& msg_pin) = default;
+
+	/**
+	 * @brief Move a message_pin object
+	 *
+	 * @param msg_pin message_pin to move
+	 * @return message_pin& Reference to self
+	 */
+	message_pin &operator=(message_pin&& msg_pin) = default;
+
+public:
+
+	/**
+	 * @brief The time the message was pinned.
+	 */
+	time_t pinned_at;
+
+	/**
+	 * @brief The pinned message.
+	 */
+	message pinned_message;
+};
+
+/**
+ * @brief A group of messages
+ */
+typedef std::unordered_map<snowflake, message> message_map;
+
+/**
+ * @brief A group of pinned messages
+ */
+typedef std::unordered_map<snowflake, message_pin> message_pin_map;
+
+/**
+ * @brief Possible values for the "has" filter in message search
+ */
+enum message_search_has : uint8_t {
+	has_image,
+	has_sound,
+	has_video,
+	has_file,
+	has_sticker,
+	has_embed,
+	has_link,
+	has_poll,
+	has_snapshot,
+};
+
+/**
+ * @brief Sort mode for message search results
+ */
+enum message_search_sort : uint8_t {
+	sort_timestamp,
+	sort_relevance,
+};
+
+/**
+ * @brief Sort order for message search results
+ */
+enum message_search_order : uint8_t {
+	sort_desc,
+	sort_asc,
+};
+
+/**
+ * @brief Parameters for searching messages within a guild
+ * @see https://discord.com/developers/docs/resources/message#search-guild-messages
+ */
+struct DPP_EXPORT message_search_params {
+	/**
+	 * @brief Filter messages by content (max 1024 characters)
+	 */
+	std::string content;
+
+	/**
+	 * @brief Filter by author IDs (max 100)
+	 */
+	std::vector<snowflake> author_id;
+
+	/**
+	 * @brief Filter messages that mention these users (max 100)
+	 */
+	std::vector<snowflake> mentions;
+
+	/**
+	 * @brief Filter by channel IDs (max 500)
+	 */
+	std::vector<snowflake> channel_id;
+
+	/**
+	 * @brief Filter messages that mention these roles (max 100)
+	 */
+	std::vector<snowflake> mentions_role_id;
+
+	/**
+	 * @brief Filter messages that reply to these users (max 100)
+	 */
+	std::vector<snowflake> replied_to_user_id;
+
+	/**
+	 * @brief Filter messages that reply to these messages (max 100)
+	 */
+	std::vector<snowflake> replied_to_message_id;
+
+	/**
+	 * @brief Filter by author type (user, bot, webhook; prefix with - to negate)
+	 */
+	std::vector<std::string> author_type;
+
+	/**
+	 * @brief Filter by presence of element types
+	 */
+	std::vector<message_search_has> has;
+
+	/**
+	 * @brief Filter messages by embed type
+	 */
+	std::vector<std::string> embed_type;
+
+	/**
+	 * @brief Filter messages by embed provider (case-sensitive, max 100)
+	 */
+	std::vector<std::string> embed_provider;
+
+	/**
+	 * @brief Filter messages by link hostname (max 100)
+	 */
+	std::vector<std::string> link_hostname;
+
+	/**
+	 * @brief Filter messages by attachment filename (max 100)
+	 */
+	std::vector<std::string> attachment_filename;
+
+	/**
+	 * @brief Filter messages by attachment extension (max 100)
+	 */
+	std::vector<std::string> attachment_extension;
+
+	/**
+	 * @brief Get messages before this message ID
+	 */
+	snowflake max_id;
+
+	/**
+	 * @brief Get messages after this message ID
+	 */
+	snowflake min_id;
+
+	/**
+	 * @brief Filter messages by whether they are pinned
+	 */
+	std::optional<bool> pinned;
+
+	/**
+	 * @brief Filter by @everyone mention presence
+	 */
+	std::optional<bool> mention_everyone;
+
+	/**
+	 * @brief Whether to include results from age-restricted channels (default false)
+	 */
+	std::optional<bool> include_nsfw;
+
+	/**
+	 * @brief Max number of messages to return (1-25, default 25)
+	 */
+	std::optional<uint32_t> limit;
+
+	/**
+	 * @brief Pagination offset (max 9975)
+	 */
+	std::optional<uint32_t> offset;
+
+	/**
+	 * @brief Max number of words to skip between matching tokens (max 100, default 2)
+	 */
+	std::optional<uint32_t> slop;
+
+	/**
+	 * @brief Sorting algorithm to use (default: sort_timestamp)
+	 */
+	std::optional<message_search_sort> sort_by;
+
+	/**
+	 * @brief Direction to sort (default: sort_desc)
+	 */
+	std::optional<message_search_order> sort_order;
+
+	/**
+	 * @brief Build the query string for the REST request
+	 * @return URL query string starting with '?'
+	 */
+	std::string build_url_params() const;
+};
+
+/**
+ * @brief Represents the result of a guild message search
+ * @see https://discord.com/developers/docs/resources/message#search-guild-messages
+ */
+struct DPP_EXPORT message_search_result : public json_interface<message_search_result> {
+protected:
+	friend struct json_interface<message_search_result>;
+
+	/**
+	 * @brief Fill from JSON
+	 * @param j JSON data
+	 * @return Reference to self
+	 */
+	message_search_result& fill_from_json_impl(nlohmann::json* j);
+
+public:
+	message_search_result() = default;
+
+	/**
+	 * @brief Total number of results matching the query
+	 */
+	uint32_t total_results{0};
+
+	/**
+	 * @brief Whether a deep historical index is being performed
+	 */
+	bool doing_deep_historical_index{false};
+
+	/**
+	 * @brief Number of documents indexed so far (only present during deep indexing)
+	 */
+	std::optional<uint32_t> documents_indexed;
+
+	/**
+	 * @brief Matched messages grouped by context.
+	 * Each inner vector contains the matched message followed by context messages.
+	 */
+	std::vector<std::vector<message>> messages;
+};
+
+/**
+ * @brief A group of stickers
+ */
+typedef std::unordered_map<snowflake, sticker> sticker_map;
+
+/**
+ * @brief A group of sticker packs
+ */
+typedef std::unordered_map<snowflake, sticker_pack> sticker_pack_map;
+
+}
diff --git a/3rdParty/dpp/misc-enum.h b/3rdParty/dpp/misc-enum.h
index 0e488470bb..e9fbbf67b4 100644
--- a/3rdParty/dpp/misc-enum.h
+++ b/3rdParty/dpp/misc-enum.h
@@ -1,53 +1,89 @@
-/************************************************************************************
- *
- * D++, A Lightweight C++ library for Discord
- *
- * Copyright 2021 Craig Edwards and D++ contributors 
- * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- ************************************************************************************/
-#pragma once
-#include <dpp/export.h>
-#include <stddef.h>
-
-namespace dpp {
-
-	/** @brief Supported image types for profile pictures */
-	enum image_type {
-		/// image/png
-		i_png,
-		/// image/jpeg
-		i_jpg,
-		/// image/gif
-		i_gif
-	};
-
-	/** @brief Log levels */
-	enum loglevel {
-		/// Trace
-		ll_trace = 0,
-		/// Debug
-		ll_debug,
-		/// Information
-		ll_info,
-		/// Warning
-		ll_warning,
-		/// Error
-		ll_error,
-		/// Critical
-		ll_critical
-	};
-
-};
+/************************************************************************************
+ *
+ * D++, A Lightweight C++ library for Discord
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright 2021 Craig Edwards and D++ contributors 
+ * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ************************************************************************************/
+#pragma once
+#include <dpp/export.h>
+#include <cstddef>
+#include <cstdint>
+
+namespace dpp {
+
+/**
+ * @brief Supported image types for profile pictures and CDN endpoints
+ */
+enum image_type : uint8_t {
+	/**
+	 * @brief image/png
+	 */
+	i_png,
+
+	/**
+	 * @brief image/jpeg.
+	 */
+	i_jpg,
+
+	/**
+	 * @brief image/gif.
+	 */
+	i_gif,
+
+	/**
+	 * @brief Webp.
+	 */
+	i_webp,
+};
+
+/**
+ * @brief Log levels
+ */
+enum loglevel {
+	/**
+	 * @brief Trace
+	 */
+	ll_trace = 0,
+
+	/**
+	 * @brief Debug
+	 */
+	ll_debug,
+
+	/**
+	 * @brief Information
+	 */
+	ll_info,
+
+	/**
+	 * @brief Warning
+	 */
+	ll_warning,
+
+	/**
+	 * @brief Error
+	 */
+	ll_error,
+
+	/**
+	 * @brief Critical
+	 */
+	ll_critical
+};
+
+}
diff --git a/3rdParty/dpp/nlohmann/json.hpp b/3rdParty/dpp/nlohmann/json.hpp
index 6f74deae67..d28bfa6d16 100644
--- a/3rdParty/dpp/nlohmann/json.hpp
+++ b/3rdParty/dpp/nlohmann/json.hpp
@@ -1 +1,25526 @@
-#include "3rdParty/nlohmann/json.hpp"
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013 - 2025 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+/****************************************************************************\
+ * Note on documentation: The source files contain links to the online      *
+ * documentation of the public API at https://json.nlohmann.me. This URL    *
+ * contains the most recent documentation and should also be applicable to  *
+ * previous versions; documentation for deprecated functions is not         *
+ * removed, but marked deprecated. See "Generate documentation" section in  *
+ * file docs/README.md.                                                     *
+\****************************************************************************/
+
+#ifndef INCLUDE_NLOHMANN_JSON_HPP_
+#define INCLUDE_NLOHMANN_JSON_HPP_
+
+#include <algorithm> // all_of, find, for_each
+#include <cstddef> // nullptr_t, ptrdiff_t, size_t
+#include <functional> // hash, less
+#include <initializer_list> // initializer_list
+#ifndef JSON_NO_IO
+    #include <iosfwd> // istream, ostream
+#endif  // JSON_NO_IO
+#include <iterator> // random_access_iterator_tag
+#include <memory> // unique_ptr
+#include <string> // string, stoi, to_string
+#include <utility> // declval, forward, move, pair, swap
+#include <vector> // vector
+
+// #include <nlohmann/adl_serializer.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013 - 2025 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <utility>
+
+// #include <nlohmann/detail/abi_macros.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013 - 2025 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+// This file contains all macro definitions affecting or depending on the ABI
+
+#ifndef JSON_SKIP_LIBRARY_VERSION_CHECK
+    #if defined(NLOHMANN_JSON_VERSION_MAJOR) && defined(NLOHMANN_JSON_VERSION_MINOR) && defined(NLOHMANN_JSON_VERSION_PATCH)
+        #if NLOHMANN_JSON_VERSION_MAJOR != 3 || NLOHMANN_JSON_VERSION_MINOR != 12 || NLOHMANN_JSON_VERSION_PATCH != 0
+            #warning "Already included a different version of the library!"
+        #endif
+    #endif
+#endif
+
+#define NLOHMANN_JSON_VERSION_MAJOR 3   // NOLINT(modernize-macro-to-enum)
+#define NLOHMANN_JSON_VERSION_MINOR 12  // NOLINT(modernize-macro-to-enum)
+#define NLOHMANN_JSON_VERSION_PATCH 0   // NOLINT(modernize-macro-to-enum)
+
+#ifndef JSON_DIAGNOSTICS
+    #define JSON_DIAGNOSTICS 0
+#endif
+
+#ifndef JSON_DIAGNOSTIC_POSITIONS
+    #define JSON_DIAGNOSTIC_POSITIONS 0
+#endif
+
+#ifndef JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON
+    #define JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON 0
+#endif
+
+#if JSON_DIAGNOSTICS
+    #define NLOHMANN_JSON_ABI_TAG_DIAGNOSTICS _diag
+#else
+    #define NLOHMANN_JSON_ABI_TAG_DIAGNOSTICS
+#endif
+
+#if JSON_DIAGNOSTIC_POSITIONS
+    #define NLOHMANN_JSON_ABI_TAG_DIAGNOSTIC_POSITIONS _dp
+#else
+    #define NLOHMANN_JSON_ABI_TAG_DIAGNOSTIC_POSITIONS
+#endif
+
+#if JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON
+    #define NLOHMANN_JSON_ABI_TAG_LEGACY_DISCARDED_VALUE_COMPARISON _ldvcmp
+#else
+    #define NLOHMANN_JSON_ABI_TAG_LEGACY_DISCARDED_VALUE_COMPARISON
+#endif
+
+#ifndef NLOHMANN_JSON_NAMESPACE_NO_VERSION
+    #define NLOHMANN_JSON_NAMESPACE_NO_VERSION 0
+#endif
+
+// Construct the namespace ABI tags component
+#define NLOHMANN_JSON_ABI_TAGS_CONCAT_EX(a, b, c) json_abi ## a ## b ## c
+#define NLOHMANN_JSON_ABI_TAGS_CONCAT(a, b, c) \
+    NLOHMANN_JSON_ABI_TAGS_CONCAT_EX(a, b, c)
+
+#define NLOHMANN_JSON_ABI_TAGS                                       \
+    NLOHMANN_JSON_ABI_TAGS_CONCAT(                                   \
+            NLOHMANN_JSON_ABI_TAG_DIAGNOSTICS,                       \
+            NLOHMANN_JSON_ABI_TAG_LEGACY_DISCARDED_VALUE_COMPARISON, \
+            NLOHMANN_JSON_ABI_TAG_DIAGNOSTIC_POSITIONS)
+
+// Construct the namespace version component
+#define NLOHMANN_JSON_NAMESPACE_VERSION_CONCAT_EX(major, minor, patch) \
+    _v ## major ## _ ## minor ## _ ## patch
+#define NLOHMANN_JSON_NAMESPACE_VERSION_CONCAT(major, minor, patch) \
+    NLOHMANN_JSON_NAMESPACE_VERSION_CONCAT_EX(major, minor, patch)
+
+#if NLOHMANN_JSON_NAMESPACE_NO_VERSION
+#define NLOHMANN_JSON_NAMESPACE_VERSION
+#else
+#define NLOHMANN_JSON_NAMESPACE_VERSION                                 \
+    NLOHMANN_JSON_NAMESPACE_VERSION_CONCAT(NLOHMANN_JSON_VERSION_MAJOR, \
+                                           NLOHMANN_JSON_VERSION_MINOR, \
+                                           NLOHMANN_JSON_VERSION_PATCH)
+#endif
+
+// Combine namespace components
+#define NLOHMANN_JSON_NAMESPACE_CONCAT_EX(a, b) a ## b
+#define NLOHMANN_JSON_NAMESPACE_CONCAT(a, b) \
+    NLOHMANN_JSON_NAMESPACE_CONCAT_EX(a, b)
+
+#ifndef NLOHMANN_JSON_NAMESPACE
+#define NLOHMANN_JSON_NAMESPACE               \
+    nlohmann::NLOHMANN_JSON_NAMESPACE_CONCAT( \
+            NLOHMANN_JSON_ABI_TAGS,           \
+            NLOHMANN_JSON_NAMESPACE_VERSION)
+#endif
+
+#ifndef NLOHMANN_JSON_NAMESPACE_BEGIN
+#define NLOHMANN_JSON_NAMESPACE_BEGIN                \
+    namespace nlohmann                               \
+    {                                                \
+    inline namespace NLOHMANN_JSON_NAMESPACE_CONCAT( \
+                NLOHMANN_JSON_ABI_TAGS,              \
+                NLOHMANN_JSON_NAMESPACE_VERSION)     \
+    {
+#endif
+
+#ifndef NLOHMANN_JSON_NAMESPACE_END
+#define NLOHMANN_JSON_NAMESPACE_END                                     \
+    }  /* namespace (inline namespace) NOLINT(readability/namespace) */ \
+    }  // namespace nlohmann
+#endif
+
+// #include <nlohmann/detail/conversions/from_json.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013 - 2025 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <algorithm> // transform
+#include <array> // array
+#include <forward_list> // forward_list
+#include <iterator> // inserter, front_inserter, end
+#include <map> // map
+#ifdef JSON_HAS_CPP_17
+    #include <optional> // optional
+#endif
+#include <string> // string
+#include <tuple> // tuple, make_tuple
+#include <type_traits> // is_arithmetic, is_same, is_enum, underlying_type, is_convertible
+#include <unordered_map> // unordered_map
+#include <utility> // pair, declval
+#include <valarray> // valarray
+
+// #include <nlohmann/detail/exceptions.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013 - 2025 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <cstddef> // nullptr_t
+#include <exception> // exception
+#if JSON_DIAGNOSTICS
+    #include <numeric> // accumulate
+#endif
+#include <stdexcept> // runtime_error
+#include <string> // to_string
+#include <vector> // vector
+
+// #include <nlohmann/detail/value_t.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013 - 2025 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <array> // array
+#include <cstddef> // size_t
+#include <cstdint> // uint8_t
+#include <string> // string
+
+// #include <nlohmann/detail/macro_scope.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013 - 2025 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <utility> // declval, pair
+// #include <nlohmann/detail/meta/detected.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013 - 2025 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <type_traits>
+
+// #include <nlohmann/detail/meta/void_t.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013 - 2025 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+// #include <nlohmann/detail/abi_macros.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+template<typename ...Ts> struct make_void
+{
+    using type = void;
+};
+template<typename ...Ts> using void_t = typename make_void<Ts...>::type;
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+// https://en.cppreference.com/w/cpp/experimental/is_detected
+struct nonesuch
+{
+    nonesuch() = delete;
+    ~nonesuch() = delete;
+    nonesuch(nonesuch const&) = delete;
+    nonesuch(nonesuch const&&) = delete;
+    void operator=(nonesuch const&) = delete;
+    void operator=(nonesuch&&) = delete;
+};
+
+template<class Default,
+         class AlwaysVoid,
+         template<class...> class Op,
+         class... Args>
+struct detector
+{
+    using value_t = std::false_type;
+    using type = Default;
+};
+
+template<class Default, template<class...> class Op, class... Args>
+struct detector<Default, void_t<Op<Args...>>, Op, Args...>
+{
+    using value_t = std::true_type;
+    using type = Op<Args...>;
+};
+
+template<template<class...> class Op, class... Args>
+using is_detected = typename detector<nonesuch, void, Op, Args...>::value_t;
+
+template<template<class...> class Op, class... Args>
+struct is_detected_lazy : is_detected<Op, Args...> { };
+
+template<template<class...> class Op, class... Args>
+using detected_t = typename detector<nonesuch, void, Op, Args...>::type;
+
+template<class Default, template<class...> class Op, class... Args>
+using detected_or = detector<Default, void, Op, Args...>;
+
+template<class Default, template<class...> class Op, class... Args>
+using detected_or_t = typename detected_or<Default, Op, Args...>::type;
+
+template<class Expected, template<class...> class Op, class... Args>
+using is_detected_exact = std::is_same<Expected, detected_t<Op, Args...>>;
+
+template<class To, template<class...> class Op, class... Args>
+using is_detected_convertible =
+    std::is_convertible<detected_t<Op, Args...>, To>;
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/thirdparty/hedley/hedley.hpp>
+
+
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013 - 2025 Niels Lohmann <https://nlohmann.me>
+// SPDX-FileCopyrightText: 2016 - 2021 Evan Nemerson <evan@nemerson.com>
+// SPDX-License-Identifier: MIT
+
+/* Hedley - https://nemequ.github.io/hedley
+ * Created by Evan Nemerson <evan@nemerson.com>
+ */
+
+#if !defined(JSON_HEDLEY_VERSION) || (JSON_HEDLEY_VERSION < 15)
+#if defined(JSON_HEDLEY_VERSION)
+    #undef JSON_HEDLEY_VERSION
+#endif
+#define JSON_HEDLEY_VERSION 15
+
+#if defined(JSON_HEDLEY_STRINGIFY_EX)
+    #undef JSON_HEDLEY_STRINGIFY_EX
+#endif
+#define JSON_HEDLEY_STRINGIFY_EX(x) #x
+
+#if defined(JSON_HEDLEY_STRINGIFY)
+    #undef JSON_HEDLEY_STRINGIFY
+#endif
+#define JSON_HEDLEY_STRINGIFY(x) JSON_HEDLEY_STRINGIFY_EX(x)
+
+#if defined(JSON_HEDLEY_CONCAT_EX)
+    #undef JSON_HEDLEY_CONCAT_EX
+#endif
+#define JSON_HEDLEY_CONCAT_EX(a,b) a##b
+
+#if defined(JSON_HEDLEY_CONCAT)
+    #undef JSON_HEDLEY_CONCAT
+#endif
+#define JSON_HEDLEY_CONCAT(a,b) JSON_HEDLEY_CONCAT_EX(a,b)
+
+#if defined(JSON_HEDLEY_CONCAT3_EX)
+    #undef JSON_HEDLEY_CONCAT3_EX
+#endif
+#define JSON_HEDLEY_CONCAT3_EX(a,b,c) a##b##c
+
+#if defined(JSON_HEDLEY_CONCAT3)
+    #undef JSON_HEDLEY_CONCAT3
+#endif
+#define JSON_HEDLEY_CONCAT3(a,b,c) JSON_HEDLEY_CONCAT3_EX(a,b,c)
+
+#if defined(JSON_HEDLEY_VERSION_ENCODE)
+    #undef JSON_HEDLEY_VERSION_ENCODE
+#endif
+#define JSON_HEDLEY_VERSION_ENCODE(major,minor,revision) (((major) * 1000000) + ((minor) * 1000) + (revision))
+
+#if defined(JSON_HEDLEY_VERSION_DECODE_MAJOR)
+    #undef JSON_HEDLEY_VERSION_DECODE_MAJOR
+#endif
+#define JSON_HEDLEY_VERSION_DECODE_MAJOR(version) ((version) / 1000000)
+
+#if defined(JSON_HEDLEY_VERSION_DECODE_MINOR)
+    #undef JSON_HEDLEY_VERSION_DECODE_MINOR
+#endif
+#define JSON_HEDLEY_VERSION_DECODE_MINOR(version) (((version) % 1000000) / 1000)
+
+#if defined(JSON_HEDLEY_VERSION_DECODE_REVISION)
+    #undef JSON_HEDLEY_VERSION_DECODE_REVISION
+#endif
+#define JSON_HEDLEY_VERSION_DECODE_REVISION(version) ((version) % 1000)
+
+#if defined(JSON_HEDLEY_GNUC_VERSION)
+    #undef JSON_HEDLEY_GNUC_VERSION
+#endif
+#if defined(__GNUC__) && defined(__GNUC_PATCHLEVEL__)
+    #define JSON_HEDLEY_GNUC_VERSION JSON_HEDLEY_VERSION_ENCODE(__GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__)
+#elif defined(__GNUC__)
+    #define JSON_HEDLEY_GNUC_VERSION JSON_HEDLEY_VERSION_ENCODE(__GNUC__, __GNUC_MINOR__, 0)
+#endif
+
+#if defined(JSON_HEDLEY_GNUC_VERSION_CHECK)
+    #undef JSON_HEDLEY_GNUC_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_GNUC_VERSION)
+    #define JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_GNUC_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_MSVC_VERSION)
+    #undef JSON_HEDLEY_MSVC_VERSION
+#endif
+#if defined(_MSC_FULL_VER) && (_MSC_FULL_VER >= 140000000) && !defined(__ICL)
+    #define JSON_HEDLEY_MSVC_VERSION JSON_HEDLEY_VERSION_ENCODE(_MSC_FULL_VER / 10000000, (_MSC_FULL_VER % 10000000) / 100000, (_MSC_FULL_VER % 100000) / 100)
+#elif defined(_MSC_FULL_VER) && !defined(__ICL)
+    #define JSON_HEDLEY_MSVC_VERSION JSON_HEDLEY_VERSION_ENCODE(_MSC_FULL_VER / 1000000, (_MSC_FULL_VER % 1000000) / 10000, (_MSC_FULL_VER % 10000) / 10)
+#elif defined(_MSC_VER) && !defined(__ICL)
+    #define JSON_HEDLEY_MSVC_VERSION JSON_HEDLEY_VERSION_ENCODE(_MSC_VER / 100, _MSC_VER % 100, 0)
+#endif
+
+#if defined(JSON_HEDLEY_MSVC_VERSION_CHECK)
+    #undef JSON_HEDLEY_MSVC_VERSION_CHECK
+#endif
+#if !defined(JSON_HEDLEY_MSVC_VERSION)
+    #define JSON_HEDLEY_MSVC_VERSION_CHECK(major,minor,patch) (0)
+#elif defined(_MSC_VER) && (_MSC_VER >= 1400)
+    #define JSON_HEDLEY_MSVC_VERSION_CHECK(major,minor,patch) (_MSC_FULL_VER >= ((major * 10000000) + (minor * 100000) + (patch)))
+#elif defined(_MSC_VER) && (_MSC_VER >= 1200)
+    #define JSON_HEDLEY_MSVC_VERSION_CHECK(major,minor,patch) (_MSC_FULL_VER >= ((major * 1000000) + (minor * 10000) + (patch)))
+#else
+    #define JSON_HEDLEY_MSVC_VERSION_CHECK(major,minor,patch) (_MSC_VER >= ((major * 100) + (minor)))
+#endif
+
+#if defined(JSON_HEDLEY_INTEL_VERSION)
+    #undef JSON_HEDLEY_INTEL_VERSION
+#endif
+#if defined(__INTEL_COMPILER) && defined(__INTEL_COMPILER_UPDATE) && !defined(__ICL)
+    #define JSON_HEDLEY_INTEL_VERSION JSON_HEDLEY_VERSION_ENCODE(__INTEL_COMPILER / 100, __INTEL_COMPILER % 100, __INTEL_COMPILER_UPDATE)
+#elif defined(__INTEL_COMPILER) && !defined(__ICL)
+    #define JSON_HEDLEY_INTEL_VERSION JSON_HEDLEY_VERSION_ENCODE(__INTEL_COMPILER / 100, __INTEL_COMPILER % 100, 0)
+#endif
+
+#if defined(JSON_HEDLEY_INTEL_VERSION_CHECK)
+    #undef JSON_HEDLEY_INTEL_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_INTEL_VERSION)
+    #define JSON_HEDLEY_INTEL_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_INTEL_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_INTEL_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_INTEL_CL_VERSION)
+    #undef JSON_HEDLEY_INTEL_CL_VERSION
+#endif
+#if defined(__INTEL_COMPILER) && defined(__INTEL_COMPILER_UPDATE) && defined(__ICL)
+    #define JSON_HEDLEY_INTEL_CL_VERSION JSON_HEDLEY_VERSION_ENCODE(__INTEL_COMPILER, __INTEL_COMPILER_UPDATE, 0)
+#endif
+
+#if defined(JSON_HEDLEY_INTEL_CL_VERSION_CHECK)
+    #undef JSON_HEDLEY_INTEL_CL_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_INTEL_CL_VERSION)
+    #define JSON_HEDLEY_INTEL_CL_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_INTEL_CL_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_INTEL_CL_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_PGI_VERSION)
+    #undef JSON_HEDLEY_PGI_VERSION
+#endif
+#if defined(__PGI) && defined(__PGIC__) && defined(__PGIC_MINOR__) && defined(__PGIC_PATCHLEVEL__)
+    #define JSON_HEDLEY_PGI_VERSION JSON_HEDLEY_VERSION_ENCODE(__PGIC__, __PGIC_MINOR__, __PGIC_PATCHLEVEL__)
+#endif
+
+#if defined(JSON_HEDLEY_PGI_VERSION_CHECK)
+    #undef JSON_HEDLEY_PGI_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_PGI_VERSION)
+    #define JSON_HEDLEY_PGI_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_PGI_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_PGI_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_SUNPRO_VERSION)
+    #undef JSON_HEDLEY_SUNPRO_VERSION
+#endif
+#if defined(__SUNPRO_C) && (__SUNPRO_C > 0x1000)
+    #define JSON_HEDLEY_SUNPRO_VERSION JSON_HEDLEY_VERSION_ENCODE((((__SUNPRO_C >> 16) & 0xf) * 10) + ((__SUNPRO_C >> 12) & 0xf), (((__SUNPRO_C >> 8) & 0xf) * 10) + ((__SUNPRO_C >> 4) & 0xf), (__SUNPRO_C & 0xf) * 10)
+#elif defined(__SUNPRO_C)
+    #define JSON_HEDLEY_SUNPRO_VERSION JSON_HEDLEY_VERSION_ENCODE((__SUNPRO_C >> 8) & 0xf, (__SUNPRO_C >> 4) & 0xf, (__SUNPRO_C) & 0xf)
+#elif defined(__SUNPRO_CC) && (__SUNPRO_CC > 0x1000)
+    #define JSON_HEDLEY_SUNPRO_VERSION JSON_HEDLEY_VERSION_ENCODE((((__SUNPRO_CC >> 16) & 0xf) * 10) + ((__SUNPRO_CC >> 12) & 0xf), (((__SUNPRO_CC >> 8) & 0xf) * 10) + ((__SUNPRO_CC >> 4) & 0xf), (__SUNPRO_CC & 0xf) * 10)
+#elif defined(__SUNPRO_CC)
+    #define JSON_HEDLEY_SUNPRO_VERSION JSON_HEDLEY_VERSION_ENCODE((__SUNPRO_CC >> 8) & 0xf, (__SUNPRO_CC >> 4) & 0xf, (__SUNPRO_CC) & 0xf)
+#endif
+
+#if defined(JSON_HEDLEY_SUNPRO_VERSION_CHECK)
+    #undef JSON_HEDLEY_SUNPRO_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_SUNPRO_VERSION)
+    #define JSON_HEDLEY_SUNPRO_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_SUNPRO_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_SUNPRO_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_EMSCRIPTEN_VERSION)
+    #undef JSON_HEDLEY_EMSCRIPTEN_VERSION
+#endif
+#if defined(__EMSCRIPTEN__)
+    #define JSON_HEDLEY_EMSCRIPTEN_VERSION JSON_HEDLEY_VERSION_ENCODE(__EMSCRIPTEN_major__, __EMSCRIPTEN_minor__, __EMSCRIPTEN_tiny__)
+#endif
+
+#if defined(JSON_HEDLEY_EMSCRIPTEN_VERSION_CHECK)
+    #undef JSON_HEDLEY_EMSCRIPTEN_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_EMSCRIPTEN_VERSION)
+    #define JSON_HEDLEY_EMSCRIPTEN_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_EMSCRIPTEN_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_EMSCRIPTEN_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_ARM_VERSION)
+    #undef JSON_HEDLEY_ARM_VERSION
+#endif
+#if defined(__CC_ARM) && defined(__ARMCOMPILER_VERSION)
+    #define JSON_HEDLEY_ARM_VERSION JSON_HEDLEY_VERSION_ENCODE(__ARMCOMPILER_VERSION / 1000000, (__ARMCOMPILER_VERSION % 1000000) / 10000, (__ARMCOMPILER_VERSION % 10000) / 100)
+#elif defined(__CC_ARM) && defined(__ARMCC_VERSION)
+    #define JSON_HEDLEY_ARM_VERSION JSON_HEDLEY_VERSION_ENCODE(__ARMCC_VERSION / 1000000, (__ARMCC_VERSION % 1000000) / 10000, (__ARMCC_VERSION % 10000) / 100)
+#endif
+
+#if defined(JSON_HEDLEY_ARM_VERSION_CHECK)
+    #undef JSON_HEDLEY_ARM_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_ARM_VERSION)
+    #define JSON_HEDLEY_ARM_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_ARM_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_ARM_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_IBM_VERSION)
+    #undef JSON_HEDLEY_IBM_VERSION
+#endif
+#if defined(__ibmxl__)
+    #define JSON_HEDLEY_IBM_VERSION JSON_HEDLEY_VERSION_ENCODE(__ibmxl_version__, __ibmxl_release__, __ibmxl_modification__)
+#elif defined(__xlC__) && defined(__xlC_ver__)
+    #define JSON_HEDLEY_IBM_VERSION JSON_HEDLEY_VERSION_ENCODE(__xlC__ >> 8, __xlC__ & 0xff, (__xlC_ver__ >> 8) & 0xff)
+#elif defined(__xlC__)
+    #define JSON_HEDLEY_IBM_VERSION JSON_HEDLEY_VERSION_ENCODE(__xlC__ >> 8, __xlC__ & 0xff, 0)
+#endif
+
+#if defined(JSON_HEDLEY_IBM_VERSION_CHECK)
+    #undef JSON_HEDLEY_IBM_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_IBM_VERSION)
+    #define JSON_HEDLEY_IBM_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_IBM_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_IBM_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_TI_VERSION)
+    #undef JSON_HEDLEY_TI_VERSION
+#endif
+#if \
+    defined(__TI_COMPILER_VERSION__) && \
+    ( \
+      defined(__TMS470__) || defined(__TI_ARM__) || \
+      defined(__MSP430__) || \
+      defined(__TMS320C2000__) \
+    )
+#if (__TI_COMPILER_VERSION__ >= 16000000)
+    #define JSON_HEDLEY_TI_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000))
+#endif
+#endif
+
+#if defined(JSON_HEDLEY_TI_VERSION_CHECK)
+    #undef JSON_HEDLEY_TI_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_TI_VERSION)
+    #define JSON_HEDLEY_TI_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_TI_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_TI_CL2000_VERSION)
+    #undef JSON_HEDLEY_TI_CL2000_VERSION
+#endif
+#if defined(__TI_COMPILER_VERSION__) && defined(__TMS320C2000__)
+    #define JSON_HEDLEY_TI_CL2000_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000))
+#endif
+
+#if defined(JSON_HEDLEY_TI_CL2000_VERSION_CHECK)
+    #undef JSON_HEDLEY_TI_CL2000_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_TI_CL2000_VERSION)
+    #define JSON_HEDLEY_TI_CL2000_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_CL2000_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_TI_CL2000_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_TI_CL430_VERSION)
+    #undef JSON_HEDLEY_TI_CL430_VERSION
+#endif
+#if defined(__TI_COMPILER_VERSION__) && defined(__MSP430__)
+    #define JSON_HEDLEY_TI_CL430_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000))
+#endif
+
+#if defined(JSON_HEDLEY_TI_CL430_VERSION_CHECK)
+    #undef JSON_HEDLEY_TI_CL430_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_TI_CL430_VERSION)
+    #define JSON_HEDLEY_TI_CL430_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_CL430_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_TI_CL430_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_TI_ARMCL_VERSION)
+    #undef JSON_HEDLEY_TI_ARMCL_VERSION
+#endif
+#if defined(__TI_COMPILER_VERSION__) && (defined(__TMS470__) || defined(__TI_ARM__))
+    #define JSON_HEDLEY_TI_ARMCL_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000))
+#endif
+
+#if defined(JSON_HEDLEY_TI_ARMCL_VERSION_CHECK)
+    #undef JSON_HEDLEY_TI_ARMCL_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_TI_ARMCL_VERSION)
+    #define JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_ARMCL_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_TI_CL6X_VERSION)
+    #undef JSON_HEDLEY_TI_CL6X_VERSION
+#endif
+#if defined(__TI_COMPILER_VERSION__) && defined(__TMS320C6X__)
+    #define JSON_HEDLEY_TI_CL6X_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000))
+#endif
+
+#if defined(JSON_HEDLEY_TI_CL6X_VERSION_CHECK)
+    #undef JSON_HEDLEY_TI_CL6X_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_TI_CL6X_VERSION)
+    #define JSON_HEDLEY_TI_CL6X_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_CL6X_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_TI_CL6X_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_TI_CL7X_VERSION)
+    #undef JSON_HEDLEY_TI_CL7X_VERSION
+#endif
+#if defined(__TI_COMPILER_VERSION__) && defined(__C7000__)
+    #define JSON_HEDLEY_TI_CL7X_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000))
+#endif
+
+#if defined(JSON_HEDLEY_TI_CL7X_VERSION_CHECK)
+    #undef JSON_HEDLEY_TI_CL7X_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_TI_CL7X_VERSION)
+    #define JSON_HEDLEY_TI_CL7X_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_CL7X_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_TI_CL7X_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_TI_CLPRU_VERSION)
+    #undef JSON_HEDLEY_TI_CLPRU_VERSION
+#endif
+#if defined(__TI_COMPILER_VERSION__) && defined(__PRU__)
+    #define JSON_HEDLEY_TI_CLPRU_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000))
+#endif
+
+#if defined(JSON_HEDLEY_TI_CLPRU_VERSION_CHECK)
+    #undef JSON_HEDLEY_TI_CLPRU_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_TI_CLPRU_VERSION)
+    #define JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_CLPRU_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_CRAY_VERSION)
+    #undef JSON_HEDLEY_CRAY_VERSION
+#endif
+#if defined(_CRAYC)
+    #if defined(_RELEASE_PATCHLEVEL)
+        #define JSON_HEDLEY_CRAY_VERSION JSON_HEDLEY_VERSION_ENCODE(_RELEASE_MAJOR, _RELEASE_MINOR, _RELEASE_PATCHLEVEL)
+    #else
+        #define JSON_HEDLEY_CRAY_VERSION JSON_HEDLEY_VERSION_ENCODE(_RELEASE_MAJOR, _RELEASE_MINOR, 0)
+    #endif
+#endif
+
+#if defined(JSON_HEDLEY_CRAY_VERSION_CHECK)
+    #undef JSON_HEDLEY_CRAY_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_CRAY_VERSION)
+    #define JSON_HEDLEY_CRAY_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_CRAY_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_CRAY_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_IAR_VERSION)
+    #undef JSON_HEDLEY_IAR_VERSION
+#endif
+#if defined(__IAR_SYSTEMS_ICC__)
+    #if __VER__ > 1000
+        #define JSON_HEDLEY_IAR_VERSION JSON_HEDLEY_VERSION_ENCODE((__VER__ / 1000000), ((__VER__ / 1000) % 1000), (__VER__ % 1000))
+    #else
+        #define JSON_HEDLEY_IAR_VERSION JSON_HEDLEY_VERSION_ENCODE(__VER__ / 100, __VER__ % 100, 0)
+    #endif
+#endif
+
+#if defined(JSON_HEDLEY_IAR_VERSION_CHECK)
+    #undef JSON_HEDLEY_IAR_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_IAR_VERSION)
+    #define JSON_HEDLEY_IAR_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_IAR_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_IAR_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_TINYC_VERSION)
+    #undef JSON_HEDLEY_TINYC_VERSION
+#endif
+#if defined(__TINYC__)
+    #define JSON_HEDLEY_TINYC_VERSION JSON_HEDLEY_VERSION_ENCODE(__TINYC__ / 1000, (__TINYC__ / 100) % 10, __TINYC__ % 100)
+#endif
+
+#if defined(JSON_HEDLEY_TINYC_VERSION_CHECK)
+    #undef JSON_HEDLEY_TINYC_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_TINYC_VERSION)
+    #define JSON_HEDLEY_TINYC_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TINYC_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_TINYC_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_DMC_VERSION)
+    #undef JSON_HEDLEY_DMC_VERSION
+#endif
+#if defined(__DMC__)
+    #define JSON_HEDLEY_DMC_VERSION JSON_HEDLEY_VERSION_ENCODE(__DMC__ >> 8, (__DMC__ >> 4) & 0xf, __DMC__ & 0xf)
+#endif
+
+#if defined(JSON_HEDLEY_DMC_VERSION_CHECK)
+    #undef JSON_HEDLEY_DMC_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_DMC_VERSION)
+    #define JSON_HEDLEY_DMC_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_DMC_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_DMC_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_COMPCERT_VERSION)
+    #undef JSON_HEDLEY_COMPCERT_VERSION
+#endif
+#if defined(__COMPCERT_VERSION__)
+    #define JSON_HEDLEY_COMPCERT_VERSION JSON_HEDLEY_VERSION_ENCODE(__COMPCERT_VERSION__ / 10000, (__COMPCERT_VERSION__ / 100) % 100, __COMPCERT_VERSION__ % 100)
+#endif
+
+#if defined(JSON_HEDLEY_COMPCERT_VERSION_CHECK)
+    #undef JSON_HEDLEY_COMPCERT_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_COMPCERT_VERSION)
+    #define JSON_HEDLEY_COMPCERT_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_COMPCERT_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_COMPCERT_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_PELLES_VERSION)
+    #undef JSON_HEDLEY_PELLES_VERSION
+#endif
+#if defined(__POCC__)
+    #define JSON_HEDLEY_PELLES_VERSION JSON_HEDLEY_VERSION_ENCODE(__POCC__ / 100, __POCC__ % 100, 0)
+#endif
+
+#if defined(JSON_HEDLEY_PELLES_VERSION_CHECK)
+    #undef JSON_HEDLEY_PELLES_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_PELLES_VERSION)
+    #define JSON_HEDLEY_PELLES_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_PELLES_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_PELLES_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_MCST_LCC_VERSION)
+    #undef JSON_HEDLEY_MCST_LCC_VERSION
+#endif
+#if defined(__LCC__) && defined(__LCC_MINOR__)
+    #define JSON_HEDLEY_MCST_LCC_VERSION JSON_HEDLEY_VERSION_ENCODE(__LCC__ / 100, __LCC__ % 100, __LCC_MINOR__)
+#endif
+
+#if defined(JSON_HEDLEY_MCST_LCC_VERSION_CHECK)
+    #undef JSON_HEDLEY_MCST_LCC_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_MCST_LCC_VERSION)
+    #define JSON_HEDLEY_MCST_LCC_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_MCST_LCC_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_MCST_LCC_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_GCC_VERSION)
+    #undef JSON_HEDLEY_GCC_VERSION
+#endif
+#if \
+    defined(JSON_HEDLEY_GNUC_VERSION) && \
+    !defined(__clang__) && \
+    !defined(JSON_HEDLEY_INTEL_VERSION) && \
+    !defined(JSON_HEDLEY_PGI_VERSION) && \
+    !defined(JSON_HEDLEY_ARM_VERSION) && \
+    !defined(JSON_HEDLEY_CRAY_VERSION) && \
+    !defined(JSON_HEDLEY_TI_VERSION) && \
+    !defined(JSON_HEDLEY_TI_ARMCL_VERSION) && \
+    !defined(JSON_HEDLEY_TI_CL430_VERSION) && \
+    !defined(JSON_HEDLEY_TI_CL2000_VERSION) && \
+    !defined(JSON_HEDLEY_TI_CL6X_VERSION) && \
+    !defined(JSON_HEDLEY_TI_CL7X_VERSION) && \
+    !defined(JSON_HEDLEY_TI_CLPRU_VERSION) && \
+    !defined(__COMPCERT__) && \
+    !defined(JSON_HEDLEY_MCST_LCC_VERSION)
+    #define JSON_HEDLEY_GCC_VERSION JSON_HEDLEY_GNUC_VERSION
+#endif
+
+#if defined(JSON_HEDLEY_GCC_VERSION_CHECK)
+    #undef JSON_HEDLEY_GCC_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_GCC_VERSION)
+    #define JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_GCC_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_HAS_ATTRIBUTE)
+    #undef JSON_HEDLEY_HAS_ATTRIBUTE
+#endif
+#if \
+  defined(__has_attribute) && \
+  ( \
+    (!defined(JSON_HEDLEY_IAR_VERSION) || JSON_HEDLEY_IAR_VERSION_CHECK(8,5,9)) \
+  )
+#  define JSON_HEDLEY_HAS_ATTRIBUTE(attribute) __has_attribute(attribute)
+#else
+#  define JSON_HEDLEY_HAS_ATTRIBUTE(attribute) (0)
+#endif
+
+#if defined(JSON_HEDLEY_GNUC_HAS_ATTRIBUTE)
+    #undef JSON_HEDLEY_GNUC_HAS_ATTRIBUTE
+#endif
+#if defined(__has_attribute)
+    #define JSON_HEDLEY_GNUC_HAS_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_HAS_ATTRIBUTE(attribute)
+#else
+    #define JSON_HEDLEY_GNUC_HAS_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_GCC_HAS_ATTRIBUTE)
+    #undef JSON_HEDLEY_GCC_HAS_ATTRIBUTE
+#endif
+#if defined(__has_attribute)
+    #define JSON_HEDLEY_GCC_HAS_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_HAS_ATTRIBUTE(attribute)
+#else
+    #define JSON_HEDLEY_GCC_HAS_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_HAS_CPP_ATTRIBUTE)
+    #undef JSON_HEDLEY_HAS_CPP_ATTRIBUTE
+#endif
+#if \
+    defined(__has_cpp_attribute) && \
+    defined(__cplusplus) && \
+    (!defined(JSON_HEDLEY_SUNPRO_VERSION) || JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,15,0))
+    #define JSON_HEDLEY_HAS_CPP_ATTRIBUTE(attribute) __has_cpp_attribute(attribute)
+#else
+    #define JSON_HEDLEY_HAS_CPP_ATTRIBUTE(attribute) (0)
+#endif
+
+#if defined(JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS)
+    #undef JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS
+#endif
+#if !defined(__cplusplus) || !defined(__has_cpp_attribute)
+    #define JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS(ns,attribute) (0)
+#elif \
+    !defined(JSON_HEDLEY_PGI_VERSION) && \
+    !defined(JSON_HEDLEY_IAR_VERSION) && \
+    (!defined(JSON_HEDLEY_SUNPRO_VERSION) || JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,15,0)) && \
+    (!defined(JSON_HEDLEY_MSVC_VERSION) || JSON_HEDLEY_MSVC_VERSION_CHECK(19,20,0))
+    #define JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS(ns,attribute) JSON_HEDLEY_HAS_CPP_ATTRIBUTE(ns::attribute)
+#else
+    #define JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS(ns,attribute) (0)
+#endif
+
+#if defined(JSON_HEDLEY_GNUC_HAS_CPP_ATTRIBUTE)
+    #undef JSON_HEDLEY_GNUC_HAS_CPP_ATTRIBUTE
+#endif
+#if defined(__has_cpp_attribute) && defined(__cplusplus)
+    #define JSON_HEDLEY_GNUC_HAS_CPP_ATTRIBUTE(attribute,major,minor,patch) __has_cpp_attribute(attribute)
+#else
+    #define JSON_HEDLEY_GNUC_HAS_CPP_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_GCC_HAS_CPP_ATTRIBUTE)
+    #undef JSON_HEDLEY_GCC_HAS_CPP_ATTRIBUTE
+#endif
+#if defined(__has_cpp_attribute) && defined(__cplusplus)
+    #define JSON_HEDLEY_GCC_HAS_CPP_ATTRIBUTE(attribute,major,minor,patch) __has_cpp_attribute(attribute)
+#else
+    #define JSON_HEDLEY_GCC_HAS_CPP_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_HAS_BUILTIN)
+    #undef JSON_HEDLEY_HAS_BUILTIN
+#endif
+#if defined(__has_builtin)
+    #define JSON_HEDLEY_HAS_BUILTIN(builtin) __has_builtin(builtin)
+#else
+    #define JSON_HEDLEY_HAS_BUILTIN(builtin) (0)
+#endif
+
+#if defined(JSON_HEDLEY_GNUC_HAS_BUILTIN)
+    #undef JSON_HEDLEY_GNUC_HAS_BUILTIN
+#endif
+#if defined(__has_builtin)
+    #define JSON_HEDLEY_GNUC_HAS_BUILTIN(builtin,major,minor,patch) __has_builtin(builtin)
+#else
+    #define JSON_HEDLEY_GNUC_HAS_BUILTIN(builtin,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_GCC_HAS_BUILTIN)
+    #undef JSON_HEDLEY_GCC_HAS_BUILTIN
+#endif
+#if defined(__has_builtin)
+    #define JSON_HEDLEY_GCC_HAS_BUILTIN(builtin,major,minor,patch) __has_builtin(builtin)
+#else
+    #define JSON_HEDLEY_GCC_HAS_BUILTIN(builtin,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_HAS_FEATURE)
+    #undef JSON_HEDLEY_HAS_FEATURE
+#endif
+#if defined(__has_feature)
+    #define JSON_HEDLEY_HAS_FEATURE(feature) __has_feature(feature)
+#else
+    #define JSON_HEDLEY_HAS_FEATURE(feature) (0)
+#endif
+
+#if defined(JSON_HEDLEY_GNUC_HAS_FEATURE)
+    #undef JSON_HEDLEY_GNUC_HAS_FEATURE
+#endif
+#if defined(__has_feature)
+    #define JSON_HEDLEY_GNUC_HAS_FEATURE(feature,major,minor,patch) __has_feature(feature)
+#else
+    #define JSON_HEDLEY_GNUC_HAS_FEATURE(feature,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_GCC_HAS_FEATURE)
+    #undef JSON_HEDLEY_GCC_HAS_FEATURE
+#endif
+#if defined(__has_feature)
+    #define JSON_HEDLEY_GCC_HAS_FEATURE(feature,major,minor,patch) __has_feature(feature)
+#else
+    #define JSON_HEDLEY_GCC_HAS_FEATURE(feature,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_HAS_EXTENSION)
+    #undef JSON_HEDLEY_HAS_EXTENSION
+#endif
+#if defined(__has_extension)
+    #define JSON_HEDLEY_HAS_EXTENSION(extension) __has_extension(extension)
+#else
+    #define JSON_HEDLEY_HAS_EXTENSION(extension) (0)
+#endif
+
+#if defined(JSON_HEDLEY_GNUC_HAS_EXTENSION)
+    #undef JSON_HEDLEY_GNUC_HAS_EXTENSION
+#endif
+#if defined(__has_extension)
+    #define JSON_HEDLEY_GNUC_HAS_EXTENSION(extension,major,minor,patch) __has_extension(extension)
+#else
+    #define JSON_HEDLEY_GNUC_HAS_EXTENSION(extension,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_GCC_HAS_EXTENSION)
+    #undef JSON_HEDLEY_GCC_HAS_EXTENSION
+#endif
+#if defined(__has_extension)
+    #define JSON_HEDLEY_GCC_HAS_EXTENSION(extension,major,minor,patch) __has_extension(extension)
+#else
+    #define JSON_HEDLEY_GCC_HAS_EXTENSION(extension,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE)
+    #undef JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE
+#endif
+#if defined(__has_declspec_attribute)
+    #define JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE(attribute) __has_declspec_attribute(attribute)
+#else
+    #define JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE(attribute) (0)
+#endif
+
+#if defined(JSON_HEDLEY_GNUC_HAS_DECLSPEC_ATTRIBUTE)
+    #undef JSON_HEDLEY_GNUC_HAS_DECLSPEC_ATTRIBUTE
+#endif
+#if defined(__has_declspec_attribute)
+    #define JSON_HEDLEY_GNUC_HAS_DECLSPEC_ATTRIBUTE(attribute,major,minor,patch) __has_declspec_attribute(attribute)
+#else
+    #define JSON_HEDLEY_GNUC_HAS_DECLSPEC_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_GCC_HAS_DECLSPEC_ATTRIBUTE)
+    #undef JSON_HEDLEY_GCC_HAS_DECLSPEC_ATTRIBUTE
+#endif
+#if defined(__has_declspec_attribute)
+    #define JSON_HEDLEY_GCC_HAS_DECLSPEC_ATTRIBUTE(attribute,major,minor,patch) __has_declspec_attribute(attribute)
+#else
+    #define JSON_HEDLEY_GCC_HAS_DECLSPEC_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_HAS_WARNING)
+    #undef JSON_HEDLEY_HAS_WARNING
+#endif
+#if defined(__has_warning)
+    #define JSON_HEDLEY_HAS_WARNING(warning) __has_warning(warning)
+#else
+    #define JSON_HEDLEY_HAS_WARNING(warning) (0)
+#endif
+
+#if defined(JSON_HEDLEY_GNUC_HAS_WARNING)
+    #undef JSON_HEDLEY_GNUC_HAS_WARNING
+#endif
+#if defined(__has_warning)
+    #define JSON_HEDLEY_GNUC_HAS_WARNING(warning,major,minor,patch) __has_warning(warning)
+#else
+    #define JSON_HEDLEY_GNUC_HAS_WARNING(warning,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_GCC_HAS_WARNING)
+    #undef JSON_HEDLEY_GCC_HAS_WARNING
+#endif
+#if defined(__has_warning)
+    #define JSON_HEDLEY_GCC_HAS_WARNING(warning,major,minor,patch) __has_warning(warning)
+#else
+    #define JSON_HEDLEY_GCC_HAS_WARNING(warning,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if \
+    (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)) || \
+    defined(__clang__) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(3,0,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0) || \
+    JSON_HEDLEY_PGI_VERSION_CHECK(18,4,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
+    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,7,0) || \
+    JSON_HEDLEY_TI_CL430_VERSION_CHECK(2,0,1) || \
+    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,1,0) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,0,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
+    JSON_HEDLEY_CRAY_VERSION_CHECK(5,0,0) || \
+    JSON_HEDLEY_TINYC_VERSION_CHECK(0,9,17) || \
+    JSON_HEDLEY_SUNPRO_VERSION_CHECK(8,0,0) || \
+    (JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) && defined(__C99_PRAGMA_OPERATOR))
+    #define JSON_HEDLEY_PRAGMA(value) _Pragma(#value)
+#elif JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0)
+    #define JSON_HEDLEY_PRAGMA(value) __pragma(value)
+#else
+    #define JSON_HEDLEY_PRAGMA(value)
+#endif
+
+#if defined(JSON_HEDLEY_DIAGNOSTIC_PUSH)
+    #undef JSON_HEDLEY_DIAGNOSTIC_PUSH
+#endif
+#if defined(JSON_HEDLEY_DIAGNOSTIC_POP)
+    #undef JSON_HEDLEY_DIAGNOSTIC_POP
+#endif
+#if defined(__clang__)
+    #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("clang diagnostic push")
+    #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("clang diagnostic pop")
+#elif JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("warning(push)")
+    #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("warning(pop)")
+#elif JSON_HEDLEY_GCC_VERSION_CHECK(4,6,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("GCC diagnostic push")
+    #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("GCC diagnostic pop")
+#elif \
+    JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0) || \
+    JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_PUSH __pragma(warning(push))
+    #define JSON_HEDLEY_DIAGNOSTIC_POP __pragma(warning(pop))
+#elif JSON_HEDLEY_ARM_VERSION_CHECK(5,6,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("push")
+    #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("pop")
+#elif \
+    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
+    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
+    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,4,0) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,1,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("diag_push")
+    #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("diag_pop")
+#elif JSON_HEDLEY_PELLES_VERSION_CHECK(2,90,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("warning(push)")
+    #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("warning(pop)")
+#else
+    #define JSON_HEDLEY_DIAGNOSTIC_PUSH
+    #define JSON_HEDLEY_DIAGNOSTIC_POP
+#endif
+
+/* JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_ is for
+   HEDLEY INTERNAL USE ONLY.  API subject to change without notice. */
+#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_)
+    #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_
+#endif
+#if defined(__cplusplus)
+#  if JSON_HEDLEY_HAS_WARNING("-Wc++98-compat")
+#    if JSON_HEDLEY_HAS_WARNING("-Wc++17-extensions")
+#      if JSON_HEDLEY_HAS_WARNING("-Wc++1z-extensions")
+#        define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(xpr) \
+    JSON_HEDLEY_DIAGNOSTIC_PUSH \
+    _Pragma("clang diagnostic ignored \"-Wc++98-compat\"") \
+    _Pragma("clang diagnostic ignored \"-Wc++17-extensions\"") \
+    _Pragma("clang diagnostic ignored \"-Wc++1z-extensions\"") \
+    xpr \
+    JSON_HEDLEY_DIAGNOSTIC_POP
+#      else
+#        define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(xpr) \
+    JSON_HEDLEY_DIAGNOSTIC_PUSH \
+    _Pragma("clang diagnostic ignored \"-Wc++98-compat\"") \
+    _Pragma("clang diagnostic ignored \"-Wc++17-extensions\"") \
+    xpr \
+    JSON_HEDLEY_DIAGNOSTIC_POP
+#      endif
+#    else
+#      define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(xpr) \
+    JSON_HEDLEY_DIAGNOSTIC_PUSH \
+    _Pragma("clang diagnostic ignored \"-Wc++98-compat\"") \
+    xpr \
+    JSON_HEDLEY_DIAGNOSTIC_POP
+#    endif
+#  endif
+#endif
+#if !defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(x) x
+#endif
+
+#if defined(JSON_HEDLEY_CONST_CAST)
+    #undef JSON_HEDLEY_CONST_CAST
+#endif
+#if defined(__cplusplus)
+#  define JSON_HEDLEY_CONST_CAST(T, expr) (const_cast<T>(expr))
+#elif \
+  JSON_HEDLEY_HAS_WARNING("-Wcast-qual") || \
+  JSON_HEDLEY_GCC_VERSION_CHECK(4,6,0) || \
+  JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
+#  define JSON_HEDLEY_CONST_CAST(T, expr) (__extension__ ({ \
+        JSON_HEDLEY_DIAGNOSTIC_PUSH \
+        JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL \
+        ((T) (expr)); \
+        JSON_HEDLEY_DIAGNOSTIC_POP \
+    }))
+#else
+#  define JSON_HEDLEY_CONST_CAST(T, expr) ((T) (expr))
+#endif
+
+#if defined(JSON_HEDLEY_REINTERPRET_CAST)
+    #undef JSON_HEDLEY_REINTERPRET_CAST
+#endif
+#if defined(__cplusplus)
+    #define JSON_HEDLEY_REINTERPRET_CAST(T, expr) (reinterpret_cast<T>(expr))
+#else
+    #define JSON_HEDLEY_REINTERPRET_CAST(T, expr) ((T) (expr))
+#endif
+
+#if defined(JSON_HEDLEY_STATIC_CAST)
+    #undef JSON_HEDLEY_STATIC_CAST
+#endif
+#if defined(__cplusplus)
+    #define JSON_HEDLEY_STATIC_CAST(T, expr) (static_cast<T>(expr))
+#else
+    #define JSON_HEDLEY_STATIC_CAST(T, expr) ((T) (expr))
+#endif
+
+#if defined(JSON_HEDLEY_CPP_CAST)
+    #undef JSON_HEDLEY_CPP_CAST
+#endif
+#if defined(__cplusplus)
+#  if JSON_HEDLEY_HAS_WARNING("-Wold-style-cast")
+#    define JSON_HEDLEY_CPP_CAST(T, expr) \
+    JSON_HEDLEY_DIAGNOSTIC_PUSH \
+    _Pragma("clang diagnostic ignored \"-Wold-style-cast\"") \
+    ((T) (expr)) \
+    JSON_HEDLEY_DIAGNOSTIC_POP
+#  elif JSON_HEDLEY_IAR_VERSION_CHECK(8,3,0)
+#    define JSON_HEDLEY_CPP_CAST(T, expr) \
+    JSON_HEDLEY_DIAGNOSTIC_PUSH \
+    _Pragma("diag_suppress=Pe137") \
+    JSON_HEDLEY_DIAGNOSTIC_POP
+#  else
+#    define JSON_HEDLEY_CPP_CAST(T, expr) ((T) (expr))
+#  endif
+#else
+#  define JSON_HEDLEY_CPP_CAST(T, expr) (expr)
+#endif
+
+#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED)
+    #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED
+#endif
+#if JSON_HEDLEY_HAS_WARNING("-Wdeprecated-declarations")
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("clang diagnostic ignored \"-Wdeprecated-declarations\"")
+#elif JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("warning(disable:1478 1786)")
+#elif JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED __pragma(warning(disable:1478 1786))
+#elif JSON_HEDLEY_PGI_VERSION_CHECK(20,7,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("diag_suppress 1215,1216,1444,1445")
+#elif JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("diag_suppress 1215,1444")
+#elif JSON_HEDLEY_GCC_VERSION_CHECK(4,3,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"")
+#elif JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED __pragma(warning(disable:4996))
+#elif JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("diag_suppress 1215,1444")
+#elif \
+    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
+    (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
+    (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
+    (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
+    (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("diag_suppress 1291,1718")
+#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,13,0) && !defined(__cplusplus)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("error_messages(off,E_DEPRECATED_ATT,E_DEPRECATED_ATT_MESS)")
+#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,13,0) && defined(__cplusplus)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("error_messages(off,symdeprecated,symdeprecated2)")
+#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("diag_suppress=Pe1444,Pe1215")
+#elif JSON_HEDLEY_PELLES_VERSION_CHECK(2,90,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("warn(disable:2241)")
+#else
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED
+#endif
+
+#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS)
+    #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS
+#endif
+#if JSON_HEDLEY_HAS_WARNING("-Wunknown-pragmas")
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("clang diagnostic ignored \"-Wunknown-pragmas\"")
+#elif JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("warning(disable:161)")
+#elif JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS __pragma(warning(disable:161))
+#elif JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("diag_suppress 1675")
+#elif JSON_HEDLEY_GCC_VERSION_CHECK(4,3,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("GCC diagnostic ignored \"-Wunknown-pragmas\"")
+#elif JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS __pragma(warning(disable:4068))
+#elif \
+    JSON_HEDLEY_TI_VERSION_CHECK(16,9,0) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,0,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,3,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("diag_suppress 163")
+#elif JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("diag_suppress 163")
+#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("diag_suppress=Pe161")
+#elif JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("diag_suppress 161")
+#else
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS
+#endif
+
+#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES)
+    #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES
+#endif
+#if JSON_HEDLEY_HAS_WARNING("-Wunknown-attributes")
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("clang diagnostic ignored \"-Wunknown-attributes\"")
+#elif JSON_HEDLEY_GCC_VERSION_CHECK(4,6,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"")
+#elif JSON_HEDLEY_INTEL_VERSION_CHECK(17,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("warning(disable:1292)")
+#elif JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES __pragma(warning(disable:1292))
+#elif JSON_HEDLEY_MSVC_VERSION_CHECK(19,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES __pragma(warning(disable:5030))
+#elif JSON_HEDLEY_PGI_VERSION_CHECK(20,7,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("diag_suppress 1097,1098")
+#elif JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("diag_suppress 1097")
+#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,14,0) && defined(__cplusplus)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("error_messages(off,attrskipunsup)")
+#elif \
+    JSON_HEDLEY_TI_VERSION_CHECK(18,1,0) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,3,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("diag_suppress 1173")
+#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("diag_suppress=Pe1097")
+#elif JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("diag_suppress 1097")
+#else
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES
+#endif
+
+#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL)
+    #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL
+#endif
+#if JSON_HEDLEY_HAS_WARNING("-Wcast-qual")
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL _Pragma("clang diagnostic ignored \"-Wcast-qual\"")
+#elif JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL _Pragma("warning(disable:2203 2331)")
+#elif JSON_HEDLEY_GCC_VERSION_CHECK(3,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL _Pragma("GCC diagnostic ignored \"-Wcast-qual\"")
+#else
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL
+#endif
+
+#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION)
+    #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION
+#endif
+#if JSON_HEDLEY_HAS_WARNING("-Wunused-function")
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION _Pragma("clang diagnostic ignored \"-Wunused-function\"")
+#elif JSON_HEDLEY_GCC_VERSION_CHECK(3,4,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION _Pragma("GCC diagnostic ignored \"-Wunused-function\"")
+#elif JSON_HEDLEY_MSVC_VERSION_CHECK(1,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION __pragma(warning(disable:4505))
+#elif JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION _Pragma("diag_suppress 3142")
+#else
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION
+#endif
+
+#if defined(JSON_HEDLEY_DEPRECATED)
+    #undef JSON_HEDLEY_DEPRECATED
+#endif
+#if defined(JSON_HEDLEY_DEPRECATED_FOR)
+    #undef JSON_HEDLEY_DEPRECATED_FOR
+#endif
+#if \
+    JSON_HEDLEY_MSVC_VERSION_CHECK(14,0,0) || \
+    JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
+    #define JSON_HEDLEY_DEPRECATED(since) __declspec(deprecated("Since " # since))
+    #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) __declspec(deprecated("Since " #since "; use " #replacement))
+#elif \
+    (JSON_HEDLEY_HAS_EXTENSION(attribute_deprecated_with_message) && !defined(JSON_HEDLEY_IAR_VERSION)) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(4,5,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(5,6,0) || \
+    JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,13,0) || \
+    JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) || \
+    JSON_HEDLEY_TI_VERSION_CHECK(18,1,0) || \
+    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(18,1,0) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,3,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,3,0) || \
+    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+    #define JSON_HEDLEY_DEPRECATED(since) __attribute__((__deprecated__("Since " #since)))
+    #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) __attribute__((__deprecated__("Since " #since "; use " #replacement)))
+#elif defined(__cplusplus) && (__cplusplus >= 201402L)
+    #define JSON_HEDLEY_DEPRECATED(since) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[deprecated("Since " #since)]])
+    #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[deprecated("Since " #since "; use " #replacement)]])
+#elif \
+    JSON_HEDLEY_HAS_ATTRIBUTE(deprecated) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(3,1,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
+    (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
+    (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
+    (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
+    (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
+    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) || \
+    JSON_HEDLEY_IAR_VERSION_CHECK(8,10,0)
+    #define JSON_HEDLEY_DEPRECATED(since) __attribute__((__deprecated__))
+    #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) __attribute__((__deprecated__))
+#elif \
+    JSON_HEDLEY_MSVC_VERSION_CHECK(13,10,0) || \
+    JSON_HEDLEY_PELLES_VERSION_CHECK(6,50,0) || \
+    JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
+    #define JSON_HEDLEY_DEPRECATED(since) __declspec(deprecated)
+    #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) __declspec(deprecated)
+#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
+    #define JSON_HEDLEY_DEPRECATED(since) _Pragma("deprecated")
+    #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) _Pragma("deprecated")
+#else
+    #define JSON_HEDLEY_DEPRECATED(since)
+    #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement)
+#endif
+
+#if defined(JSON_HEDLEY_UNAVAILABLE)
+    #undef JSON_HEDLEY_UNAVAILABLE
+#endif
+#if \
+    JSON_HEDLEY_HAS_ATTRIBUTE(warning) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(4,3,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+    #define JSON_HEDLEY_UNAVAILABLE(available_since) __attribute__((__warning__("Not available until " #available_since)))
+#else
+    #define JSON_HEDLEY_UNAVAILABLE(available_since)
+#endif
+
+#if defined(JSON_HEDLEY_WARN_UNUSED_RESULT)
+    #undef JSON_HEDLEY_WARN_UNUSED_RESULT
+#endif
+#if defined(JSON_HEDLEY_WARN_UNUSED_RESULT_MSG)
+    #undef JSON_HEDLEY_WARN_UNUSED_RESULT_MSG
+#endif
+#if \
+    JSON_HEDLEY_HAS_ATTRIBUTE(warn_unused_result) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(3,4,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
+    (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
+    (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
+    (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
+    (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
+    (JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,15,0) && defined(__cplusplus)) || \
+    JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) || \
+    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+    #define JSON_HEDLEY_WARN_UNUSED_RESULT __attribute__((__warn_unused_result__))
+    #define JSON_HEDLEY_WARN_UNUSED_RESULT_MSG(msg) __attribute__((__warn_unused_result__))
+#elif (JSON_HEDLEY_HAS_CPP_ATTRIBUTE(nodiscard) >= 201907L)
+    #define JSON_HEDLEY_WARN_UNUSED_RESULT JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[nodiscard]])
+    #define JSON_HEDLEY_WARN_UNUSED_RESULT_MSG(msg) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[nodiscard(msg)]])
+#elif JSON_HEDLEY_HAS_CPP_ATTRIBUTE(nodiscard)
+    #define JSON_HEDLEY_WARN_UNUSED_RESULT JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[nodiscard]])
+    #define JSON_HEDLEY_WARN_UNUSED_RESULT_MSG(msg) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[nodiscard]])
+#elif defined(_Check_return_) /* SAL */
+    #define JSON_HEDLEY_WARN_UNUSED_RESULT _Check_return_
+    #define JSON_HEDLEY_WARN_UNUSED_RESULT_MSG(msg) _Check_return_
+#else
+    #define JSON_HEDLEY_WARN_UNUSED_RESULT
+    #define JSON_HEDLEY_WARN_UNUSED_RESULT_MSG(msg)
+#endif
+
+#if defined(JSON_HEDLEY_SENTINEL)
+    #undef JSON_HEDLEY_SENTINEL
+#endif
+#if \
+    JSON_HEDLEY_HAS_ATTRIBUTE(sentinel) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(4,0,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(5,4,0) || \
+    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+    #define JSON_HEDLEY_SENTINEL(position) __attribute__((__sentinel__(position)))
+#else
+    #define JSON_HEDLEY_SENTINEL(position)
+#endif
+
+#if defined(JSON_HEDLEY_NO_RETURN)
+    #undef JSON_HEDLEY_NO_RETURN
+#endif
+#if JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
+    #define JSON_HEDLEY_NO_RETURN __noreturn
+#elif \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+    #define JSON_HEDLEY_NO_RETURN __attribute__((__noreturn__))
+#elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L
+    #define JSON_HEDLEY_NO_RETURN _Noreturn
+#elif defined(__cplusplus) && (__cplusplus >= 201103L)
+    #define JSON_HEDLEY_NO_RETURN JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[noreturn]])
+#elif \
+    JSON_HEDLEY_HAS_ATTRIBUTE(noreturn) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(3,2,0) || \
+    JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+    JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
+    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
+    (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
+    (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
+    (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
+    (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
+    JSON_HEDLEY_IAR_VERSION_CHECK(8,10,0)
+    #define JSON_HEDLEY_NO_RETURN __attribute__((__noreturn__))
+#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0)
+    #define JSON_HEDLEY_NO_RETURN _Pragma("does_not_return")
+#elif \
+    JSON_HEDLEY_MSVC_VERSION_CHECK(13,10,0) || \
+    JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
+    #define JSON_HEDLEY_NO_RETURN __declspec(noreturn)
+#elif JSON_HEDLEY_TI_CL6X_VERSION_CHECK(6,0,0) && defined(__cplusplus)
+    #define JSON_HEDLEY_NO_RETURN _Pragma("FUNC_NEVER_RETURNS;")
+#elif JSON_HEDLEY_COMPCERT_VERSION_CHECK(3,2,0)
+    #define JSON_HEDLEY_NO_RETURN __attribute((noreturn))
+#elif JSON_HEDLEY_PELLES_VERSION_CHECK(9,0,0)
+    #define JSON_HEDLEY_NO_RETURN __declspec(noreturn)
+#else
+    #define JSON_HEDLEY_NO_RETURN
+#endif
+
+#if defined(JSON_HEDLEY_NO_ESCAPE)
+    #undef JSON_HEDLEY_NO_ESCAPE
+#endif
+#if JSON_HEDLEY_HAS_ATTRIBUTE(noescape)
+    #define JSON_HEDLEY_NO_ESCAPE __attribute__((__noescape__))
+#else
+    #define JSON_HEDLEY_NO_ESCAPE
+#endif
+
+#if defined(JSON_HEDLEY_UNREACHABLE)
+    #undef JSON_HEDLEY_UNREACHABLE
+#endif
+#if defined(JSON_HEDLEY_UNREACHABLE_RETURN)
+    #undef JSON_HEDLEY_UNREACHABLE_RETURN
+#endif
+#if defined(JSON_HEDLEY_ASSUME)
+    #undef JSON_HEDLEY_ASSUME
+#endif
+#if \
+    JSON_HEDLEY_MSVC_VERSION_CHECK(13,10,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
+    #define JSON_HEDLEY_ASSUME(expr) __assume(expr)
+#elif JSON_HEDLEY_HAS_BUILTIN(__builtin_assume)
+    #define JSON_HEDLEY_ASSUME(expr) __builtin_assume(expr)
+#elif \
+    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,2,0) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(4,0,0)
+    #if defined(__cplusplus)
+        #define JSON_HEDLEY_ASSUME(expr) std::_nassert(expr)
+    #else
+        #define JSON_HEDLEY_ASSUME(expr) _nassert(expr)
+    #endif
+#endif
+#if \
+    (JSON_HEDLEY_HAS_BUILTIN(__builtin_unreachable) && (!defined(JSON_HEDLEY_ARM_VERSION))) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(4,5,0) || \
+    JSON_HEDLEY_PGI_VERSION_CHECK(18,10,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_IBM_VERSION_CHECK(13,1,5) || \
+    JSON_HEDLEY_CRAY_VERSION_CHECK(10,0,0) || \
+    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+    #define JSON_HEDLEY_UNREACHABLE() __builtin_unreachable()
+#elif defined(JSON_HEDLEY_ASSUME)
+    #define JSON_HEDLEY_UNREACHABLE() JSON_HEDLEY_ASSUME(0)
+#endif
+#if !defined(JSON_HEDLEY_ASSUME)
+    #if defined(JSON_HEDLEY_UNREACHABLE)
+        #define JSON_HEDLEY_ASSUME(expr) JSON_HEDLEY_STATIC_CAST(void, ((expr) ? 1 : (JSON_HEDLEY_UNREACHABLE(), 1)))
+    #else
+        #define JSON_HEDLEY_ASSUME(expr) JSON_HEDLEY_STATIC_CAST(void, expr)
+    #endif
+#endif
+#if defined(JSON_HEDLEY_UNREACHABLE)
+    #if  \
+        JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,2,0) || \
+        JSON_HEDLEY_TI_CL6X_VERSION_CHECK(4,0,0)
+        #define JSON_HEDLEY_UNREACHABLE_RETURN(value) return (JSON_HEDLEY_STATIC_CAST(void, JSON_HEDLEY_ASSUME(0)), (value))
+    #else
+        #define JSON_HEDLEY_UNREACHABLE_RETURN(value) JSON_HEDLEY_UNREACHABLE()
+    #endif
+#else
+    #define JSON_HEDLEY_UNREACHABLE_RETURN(value) return (value)
+#endif
+#if !defined(JSON_HEDLEY_UNREACHABLE)
+    #define JSON_HEDLEY_UNREACHABLE() JSON_HEDLEY_ASSUME(0)
+#endif
+
+JSON_HEDLEY_DIAGNOSTIC_PUSH
+#if JSON_HEDLEY_HAS_WARNING("-Wpedantic")
+    #pragma clang diagnostic ignored "-Wpedantic"
+#endif
+#if JSON_HEDLEY_HAS_WARNING("-Wc++98-compat-pedantic") && defined(__cplusplus)
+    #pragma clang diagnostic ignored "-Wc++98-compat-pedantic"
+#endif
+#if JSON_HEDLEY_GCC_HAS_WARNING("-Wvariadic-macros",4,0,0)
+    #if defined(__clang__)
+        #pragma clang diagnostic ignored "-Wvariadic-macros"
+    #elif defined(JSON_HEDLEY_GCC_VERSION)
+        #pragma GCC diagnostic ignored "-Wvariadic-macros"
+    #endif
+#endif
+#if defined(JSON_HEDLEY_NON_NULL)
+    #undef JSON_HEDLEY_NON_NULL
+#endif
+#if \
+    JSON_HEDLEY_HAS_ATTRIBUTE(nonnull) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(3,3,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0)
+    #define JSON_HEDLEY_NON_NULL(...) __attribute__((__nonnull__(__VA_ARGS__)))
+#else
+    #define JSON_HEDLEY_NON_NULL(...)
+#endif
+JSON_HEDLEY_DIAGNOSTIC_POP
+
+#if defined(JSON_HEDLEY_PRINTF_FORMAT)
+    #undef JSON_HEDLEY_PRINTF_FORMAT
+#endif
+#if defined(__MINGW32__) && JSON_HEDLEY_GCC_HAS_ATTRIBUTE(format,4,4,0) && !defined(__USE_MINGW_ANSI_STDIO)
+    #define JSON_HEDLEY_PRINTF_FORMAT(string_idx,first_to_check) __attribute__((__format__(ms_printf, string_idx, first_to_check)))
+#elif defined(__MINGW32__) && JSON_HEDLEY_GCC_HAS_ATTRIBUTE(format,4,4,0) && defined(__USE_MINGW_ANSI_STDIO)
+    #define JSON_HEDLEY_PRINTF_FORMAT(string_idx,first_to_check) __attribute__((__format__(gnu_printf, string_idx, first_to_check)))
+#elif \
+    JSON_HEDLEY_HAS_ATTRIBUTE(format) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(3,1,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(5,6,0) || \
+    JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
+    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
+    (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
+    (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
+    (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
+    (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
+    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+    #define JSON_HEDLEY_PRINTF_FORMAT(string_idx,first_to_check) __attribute__((__format__(__printf__, string_idx, first_to_check)))
+#elif JSON_HEDLEY_PELLES_VERSION_CHECK(6,0,0)
+    #define JSON_HEDLEY_PRINTF_FORMAT(string_idx,first_to_check) __declspec(vaformat(printf,string_idx,first_to_check))
+#else
+    #define JSON_HEDLEY_PRINTF_FORMAT(string_idx,first_to_check)
+#endif
+
+#if defined(JSON_HEDLEY_CONSTEXPR)
+    #undef JSON_HEDLEY_CONSTEXPR
+#endif
+#if defined(__cplusplus)
+    #if __cplusplus >= 201103L
+        #define JSON_HEDLEY_CONSTEXPR JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(constexpr)
+    #endif
+#endif
+#if !defined(JSON_HEDLEY_CONSTEXPR)
+    #define JSON_HEDLEY_CONSTEXPR
+#endif
+
+#if defined(JSON_HEDLEY_PREDICT)
+    #undef JSON_HEDLEY_PREDICT
+#endif
+#if defined(JSON_HEDLEY_LIKELY)
+    #undef JSON_HEDLEY_LIKELY
+#endif
+#if defined(JSON_HEDLEY_UNLIKELY)
+    #undef JSON_HEDLEY_UNLIKELY
+#endif
+#if defined(JSON_HEDLEY_UNPREDICTABLE)
+    #undef JSON_HEDLEY_UNPREDICTABLE
+#endif
+#if JSON_HEDLEY_HAS_BUILTIN(__builtin_unpredictable)
+    #define JSON_HEDLEY_UNPREDICTABLE(expr) __builtin_unpredictable((expr))
+#endif
+#if \
+  (JSON_HEDLEY_HAS_BUILTIN(__builtin_expect_with_probability) && !defined(JSON_HEDLEY_PGI_VERSION)) || \
+  JSON_HEDLEY_GCC_VERSION_CHECK(9,0,0) || \
+  JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+#  define JSON_HEDLEY_PREDICT(expr, value, probability) __builtin_expect_with_probability(  (expr), (value), (probability))
+#  define JSON_HEDLEY_PREDICT_TRUE(expr, probability)   __builtin_expect_with_probability(!!(expr),    1   , (probability))
+#  define JSON_HEDLEY_PREDICT_FALSE(expr, probability)  __builtin_expect_with_probability(!!(expr),    0   , (probability))
+#  define JSON_HEDLEY_LIKELY(expr)                      __builtin_expect                 (!!(expr),    1                  )
+#  define JSON_HEDLEY_UNLIKELY(expr)                    __builtin_expect                 (!!(expr),    0                  )
+#elif \
+  (JSON_HEDLEY_HAS_BUILTIN(__builtin_expect) && !defined(JSON_HEDLEY_INTEL_CL_VERSION)) || \
+  JSON_HEDLEY_GCC_VERSION_CHECK(3,0,0) || \
+  JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+  (JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,15,0) && defined(__cplusplus)) || \
+  JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+  JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
+  JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
+  JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,7,0) || \
+  JSON_HEDLEY_TI_CL430_VERSION_CHECK(3,1,0) || \
+  JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,1,0) || \
+  JSON_HEDLEY_TI_CL6X_VERSION_CHECK(6,1,0) || \
+  JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+  JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
+  JSON_HEDLEY_TINYC_VERSION_CHECK(0,9,27) || \
+  JSON_HEDLEY_CRAY_VERSION_CHECK(8,1,0) || \
+  JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+#  define JSON_HEDLEY_PREDICT(expr, expected, probability) \
+    (((probability) >= 0.9) ? __builtin_expect((expr), (expected)) : (JSON_HEDLEY_STATIC_CAST(void, expected), (expr)))
+#  define JSON_HEDLEY_PREDICT_TRUE(expr, probability) \
+    (__extension__ ({ \
+        double hedley_probability_ = (probability); \
+        ((hedley_probability_ >= 0.9) ? __builtin_expect(!!(expr), 1) : ((hedley_probability_ <= 0.1) ? __builtin_expect(!!(expr), 0) : !!(expr))); \
+    }))
+#  define JSON_HEDLEY_PREDICT_FALSE(expr, probability) \
+    (__extension__ ({ \
+        double hedley_probability_ = (probability); \
+        ((hedley_probability_ >= 0.9) ? __builtin_expect(!!(expr), 0) : ((hedley_probability_ <= 0.1) ? __builtin_expect(!!(expr), 1) : !!(expr))); \
+    }))
+#  define JSON_HEDLEY_LIKELY(expr)   __builtin_expect(!!(expr), 1)
+#  define JSON_HEDLEY_UNLIKELY(expr) __builtin_expect(!!(expr), 0)
+#else
+#  define JSON_HEDLEY_PREDICT(expr, expected, probability) (JSON_HEDLEY_STATIC_CAST(void, expected), (expr))
+#  define JSON_HEDLEY_PREDICT_TRUE(expr, probability) (!!(expr))
+#  define JSON_HEDLEY_PREDICT_FALSE(expr, probability) (!!(expr))
+#  define JSON_HEDLEY_LIKELY(expr) (!!(expr))
+#  define JSON_HEDLEY_UNLIKELY(expr) (!!(expr))
+#endif
+#if !defined(JSON_HEDLEY_UNPREDICTABLE)
+    #define JSON_HEDLEY_UNPREDICTABLE(expr) JSON_HEDLEY_PREDICT(expr, 1, 0.5)
+#endif
+
+#if defined(JSON_HEDLEY_MALLOC)
+    #undef JSON_HEDLEY_MALLOC
+#endif
+#if \
+    JSON_HEDLEY_HAS_ATTRIBUTE(malloc) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(3,1,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+    JSON_HEDLEY_IBM_VERSION_CHECK(12,1,0) || \
+    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
+    (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
+    (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
+    (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
+    (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
+    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+    #define JSON_HEDLEY_MALLOC __attribute__((__malloc__))
+#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0)
+    #define JSON_HEDLEY_MALLOC _Pragma("returns_new_memory")
+#elif \
+    JSON_HEDLEY_MSVC_VERSION_CHECK(14,0,0) || \
+    JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
+    #define JSON_HEDLEY_MALLOC __declspec(restrict)
+#else
+    #define JSON_HEDLEY_MALLOC
+#endif
+
+#if defined(JSON_HEDLEY_PURE)
+    #undef JSON_HEDLEY_PURE
+#endif
+#if \
+  JSON_HEDLEY_HAS_ATTRIBUTE(pure) || \
+  JSON_HEDLEY_GCC_VERSION_CHECK(2,96,0) || \
+  JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+  JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \
+  JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+  JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
+  JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
+  (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+  JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
+  (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+  JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
+  (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+  JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
+  (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+  JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
+  JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+  JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
+  JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) || \
+  JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+#  define JSON_HEDLEY_PURE __attribute__((__pure__))
+#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0)
+#  define JSON_HEDLEY_PURE _Pragma("does_not_write_global_data")
+#elif defined(__cplusplus) && \
+    ( \
+      JSON_HEDLEY_TI_CL430_VERSION_CHECK(2,0,1) || \
+      JSON_HEDLEY_TI_CL6X_VERSION_CHECK(4,0,0) || \
+      JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) \
+    )
+#  define JSON_HEDLEY_PURE _Pragma("FUNC_IS_PURE;")
+#else
+#  define JSON_HEDLEY_PURE
+#endif
+
+#if defined(JSON_HEDLEY_CONST)
+    #undef JSON_HEDLEY_CONST
+#endif
+#if \
+    JSON_HEDLEY_HAS_ATTRIBUTE(const) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(2,5,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+    JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
+    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
+    (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
+    (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
+    (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
+    (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
+    JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) || \
+    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+    #define JSON_HEDLEY_CONST __attribute__((__const__))
+#elif \
+    JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0)
+    #define JSON_HEDLEY_CONST _Pragma("no_side_effect")
+#else
+    #define JSON_HEDLEY_CONST JSON_HEDLEY_PURE
+#endif
+
+#if defined(JSON_HEDLEY_RESTRICT)
+    #undef JSON_HEDLEY_RESTRICT
+#endif
+#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) && !defined(__cplusplus)
+    #define JSON_HEDLEY_RESTRICT restrict
+#elif \
+    JSON_HEDLEY_GCC_VERSION_CHECK(3,1,0) || \
+    JSON_HEDLEY_MSVC_VERSION_CHECK(14,0,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+    JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
+    JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) || \
+    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
+    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,2,4) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,1,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+    (JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,14,0) && defined(__cplusplus)) || \
+    JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0) || \
+    defined(__clang__) || \
+    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+    #define JSON_HEDLEY_RESTRICT __restrict
+#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,3,0) && !defined(__cplusplus)
+    #define JSON_HEDLEY_RESTRICT _Restrict
+#else
+    #define JSON_HEDLEY_RESTRICT
+#endif
+
+#if defined(JSON_HEDLEY_INLINE)
+    #undef JSON_HEDLEY_INLINE
+#endif
+#if \
+    (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)) || \
+    (defined(__cplusplus) && (__cplusplus >= 199711L))
+    #define JSON_HEDLEY_INLINE inline
+#elif \
+    defined(JSON_HEDLEY_GCC_VERSION) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(6,2,0)
+    #define JSON_HEDLEY_INLINE __inline__
+#elif \
+    JSON_HEDLEY_MSVC_VERSION_CHECK(12,0,0) || \
+    JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,1,0) || \
+    JSON_HEDLEY_TI_CL430_VERSION_CHECK(3,1,0) || \
+    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,2,0) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,0,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
+    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+    #define JSON_HEDLEY_INLINE __inline
+#else
+    #define JSON_HEDLEY_INLINE
+#endif
+
+#if defined(JSON_HEDLEY_ALWAYS_INLINE)
+    #undef JSON_HEDLEY_ALWAYS_INLINE
+#endif
+#if \
+  JSON_HEDLEY_HAS_ATTRIBUTE(always_inline) || \
+  JSON_HEDLEY_GCC_VERSION_CHECK(4,0,0) || \
+  JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+  JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \
+  JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+  JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
+  JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
+  (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+  JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
+  (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+  JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
+  (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+  JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
+  (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+  JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
+  JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+  JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
+  JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) || \
+  JSON_HEDLEY_IAR_VERSION_CHECK(8,10,0)
+#  define JSON_HEDLEY_ALWAYS_INLINE __attribute__((__always_inline__)) JSON_HEDLEY_INLINE
+#elif \
+  JSON_HEDLEY_MSVC_VERSION_CHECK(12,0,0) || \
+  JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
+#  define JSON_HEDLEY_ALWAYS_INLINE __forceinline
+#elif defined(__cplusplus) && \
+    ( \
+      JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
+      JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
+      JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
+      JSON_HEDLEY_TI_CL6X_VERSION_CHECK(6,1,0) || \
+      JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+      JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) \
+    )
+#  define JSON_HEDLEY_ALWAYS_INLINE _Pragma("FUNC_ALWAYS_INLINE;")
+#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
+#  define JSON_HEDLEY_ALWAYS_INLINE _Pragma("inline=forced")
+#else
+#  define JSON_HEDLEY_ALWAYS_INLINE JSON_HEDLEY_INLINE
+#endif
+
+#if defined(JSON_HEDLEY_NEVER_INLINE)
+    #undef JSON_HEDLEY_NEVER_INLINE
+#endif
+#if \
+    JSON_HEDLEY_HAS_ATTRIBUTE(noinline) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(4,0,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+    JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
+    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
+    (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
+    (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
+    (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
+    (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
+    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) || \
+    JSON_HEDLEY_IAR_VERSION_CHECK(8,10,0)
+    #define JSON_HEDLEY_NEVER_INLINE __attribute__((__noinline__))
+#elif \
+    JSON_HEDLEY_MSVC_VERSION_CHECK(13,10,0) || \
+    JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
+    #define JSON_HEDLEY_NEVER_INLINE __declspec(noinline)
+#elif JSON_HEDLEY_PGI_VERSION_CHECK(10,2,0)
+    #define JSON_HEDLEY_NEVER_INLINE _Pragma("noinline")
+#elif JSON_HEDLEY_TI_CL6X_VERSION_CHECK(6,0,0) && defined(__cplusplus)
+    #define JSON_HEDLEY_NEVER_INLINE _Pragma("FUNC_CANNOT_INLINE;")
+#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
+    #define JSON_HEDLEY_NEVER_INLINE _Pragma("inline=never")
+#elif JSON_HEDLEY_COMPCERT_VERSION_CHECK(3,2,0)
+    #define JSON_HEDLEY_NEVER_INLINE __attribute((noinline))
+#elif JSON_HEDLEY_PELLES_VERSION_CHECK(9,0,0)
+    #define JSON_HEDLEY_NEVER_INLINE __declspec(noinline)
+#else
+    #define JSON_HEDLEY_NEVER_INLINE
+#endif
+
+#if defined(JSON_HEDLEY_PRIVATE)
+    #undef JSON_HEDLEY_PRIVATE
+#endif
+#if defined(JSON_HEDLEY_PUBLIC)
+    #undef JSON_HEDLEY_PUBLIC
+#endif
+#if defined(JSON_HEDLEY_IMPORT)
+    #undef JSON_HEDLEY_IMPORT
+#endif
+#if defined(_WIN32) || defined(__CYGWIN__)
+#  define JSON_HEDLEY_PRIVATE
+#  define JSON_HEDLEY_PUBLIC   __declspec(dllexport)
+#  define JSON_HEDLEY_IMPORT   __declspec(dllimport)
+#else
+#  if \
+    JSON_HEDLEY_HAS_ATTRIBUTE(visibility) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(3,3,0) || \
+    JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+    JSON_HEDLEY_IBM_VERSION_CHECK(13,1,0) || \
+    ( \
+      defined(__TI_EABI__) && \
+      ( \
+        (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+        JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) \
+      ) \
+    ) || \
+    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+#    define JSON_HEDLEY_PRIVATE __attribute__((__visibility__("hidden")))
+#    define JSON_HEDLEY_PUBLIC  __attribute__((__visibility__("default")))
+#  else
+#    define JSON_HEDLEY_PRIVATE
+#    define JSON_HEDLEY_PUBLIC
+#  endif
+#  define JSON_HEDLEY_IMPORT    extern
+#endif
+
+#if defined(JSON_HEDLEY_NO_THROW)
+    #undef JSON_HEDLEY_NO_THROW
+#endif
+#if \
+    JSON_HEDLEY_HAS_ATTRIBUTE(nothrow) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(3,3,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+    #define JSON_HEDLEY_NO_THROW __attribute__((__nothrow__))
+#elif \
+    JSON_HEDLEY_MSVC_VERSION_CHECK(13,1,0) || \
+    JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0)
+    #define JSON_HEDLEY_NO_THROW __declspec(nothrow)
+#else
+    #define JSON_HEDLEY_NO_THROW
+#endif
+
+#if defined(JSON_HEDLEY_FALL_THROUGH)
+    #undef JSON_HEDLEY_FALL_THROUGH
+#endif
+#if \
+    JSON_HEDLEY_HAS_ATTRIBUTE(fallthrough) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(7,0,0) || \
+    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+    #define JSON_HEDLEY_FALL_THROUGH __attribute__((__fallthrough__))
+#elif JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS(clang,fallthrough)
+    #define JSON_HEDLEY_FALL_THROUGH JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[clang::fallthrough]])
+#elif JSON_HEDLEY_HAS_CPP_ATTRIBUTE(fallthrough)
+    #define JSON_HEDLEY_FALL_THROUGH JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[fallthrough]])
+#elif defined(__fallthrough) /* SAL */
+    #define JSON_HEDLEY_FALL_THROUGH __fallthrough
+#else
+    #define JSON_HEDLEY_FALL_THROUGH
+#endif
+
+#if defined(JSON_HEDLEY_RETURNS_NON_NULL)
+    #undef JSON_HEDLEY_RETURNS_NON_NULL
+#endif
+#if \
+    JSON_HEDLEY_HAS_ATTRIBUTE(returns_nonnull) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(4,9,0) || \
+    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+    #define JSON_HEDLEY_RETURNS_NON_NULL __attribute__((__returns_nonnull__))
+#elif defined(_Ret_notnull_) /* SAL */
+    #define JSON_HEDLEY_RETURNS_NON_NULL _Ret_notnull_
+#else
+    #define JSON_HEDLEY_RETURNS_NON_NULL
+#endif
+
+#if defined(JSON_HEDLEY_ARRAY_PARAM)
+    #undef JSON_HEDLEY_ARRAY_PARAM
+#endif
+#if \
+    defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) && \
+    !defined(__STDC_NO_VLA__) && \
+    !defined(__cplusplus) && \
+    !defined(JSON_HEDLEY_PGI_VERSION) && \
+    !defined(JSON_HEDLEY_TINYC_VERSION)
+    #define JSON_HEDLEY_ARRAY_PARAM(name) (name)
+#else
+    #define JSON_HEDLEY_ARRAY_PARAM(name)
+#endif
+
+#if defined(JSON_HEDLEY_IS_CONSTANT)
+    #undef JSON_HEDLEY_IS_CONSTANT
+#endif
+#if defined(JSON_HEDLEY_REQUIRE_CONSTEXPR)
+    #undef JSON_HEDLEY_REQUIRE_CONSTEXPR
+#endif
+/* JSON_HEDLEY_IS_CONSTEXPR_ is for
+   HEDLEY INTERNAL USE ONLY.  API subject to change without notice. */
+#if defined(JSON_HEDLEY_IS_CONSTEXPR_)
+    #undef JSON_HEDLEY_IS_CONSTEXPR_
+#endif
+#if \
+    JSON_HEDLEY_HAS_BUILTIN(__builtin_constant_p) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(3,4,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_TINYC_VERSION_CHECK(0,9,19) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+    JSON_HEDLEY_IBM_VERSION_CHECK(13,1,0) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(6,1,0) || \
+    (JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0) && !defined(__cplusplus)) || \
+    JSON_HEDLEY_CRAY_VERSION_CHECK(8,1,0) || \
+    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
+    #define JSON_HEDLEY_IS_CONSTANT(expr) __builtin_constant_p(expr)
+#endif
+#if !defined(__cplusplus)
+#  if \
+       JSON_HEDLEY_HAS_BUILTIN(__builtin_types_compatible_p) || \
+       JSON_HEDLEY_GCC_VERSION_CHECK(3,4,0) || \
+       JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+       JSON_HEDLEY_IBM_VERSION_CHECK(13,1,0) || \
+       JSON_HEDLEY_CRAY_VERSION_CHECK(8,1,0) || \
+       JSON_HEDLEY_ARM_VERSION_CHECK(5,4,0) || \
+       JSON_HEDLEY_TINYC_VERSION_CHECK(0,9,24)
+#if defined(__INTPTR_TYPE__)
+    #define JSON_HEDLEY_IS_CONSTEXPR_(expr) __builtin_types_compatible_p(__typeof__((1 ? (void*) ((__INTPTR_TYPE__) ((expr) * 0)) : (int*) 0)), int*)
+#else
+    #include <stdint.h>
+    #define JSON_HEDLEY_IS_CONSTEXPR_(expr) __builtin_types_compatible_p(__typeof__((1 ? (void*) ((intptr_t) ((expr) * 0)) : (int*) 0)), int*)
+#endif
+#  elif \
+       ( \
+          defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L) && \
+          !defined(JSON_HEDLEY_SUNPRO_VERSION) && \
+          !defined(JSON_HEDLEY_PGI_VERSION) && \
+          !defined(JSON_HEDLEY_IAR_VERSION)) || \
+       (JSON_HEDLEY_HAS_EXTENSION(c_generic_selections) && !defined(JSON_HEDLEY_IAR_VERSION)) || \
+       JSON_HEDLEY_GCC_VERSION_CHECK(4,9,0) || \
+       JSON_HEDLEY_INTEL_VERSION_CHECK(17,0,0) || \
+       JSON_HEDLEY_IBM_VERSION_CHECK(12,1,0) || \
+       JSON_HEDLEY_ARM_VERSION_CHECK(5,3,0)
+#if defined(__INTPTR_TYPE__)
+    #define JSON_HEDLEY_IS_CONSTEXPR_(expr) _Generic((1 ? (void*) ((__INTPTR_TYPE__) ((expr) * 0)) : (int*) 0), int*: 1, void*: 0)
+#else
+    #include <stdint.h>
+    #define JSON_HEDLEY_IS_CONSTEXPR_(expr) _Generic((1 ? (void*) ((intptr_t) * 0) : (int*) 0), int*: 1, void*: 0)
+#endif
+#  elif \
+       defined(JSON_HEDLEY_GCC_VERSION) || \
+       defined(JSON_HEDLEY_INTEL_VERSION) || \
+       defined(JSON_HEDLEY_TINYC_VERSION) || \
+       defined(JSON_HEDLEY_TI_ARMCL_VERSION) || \
+       JSON_HEDLEY_TI_CL430_VERSION_CHECK(18,12,0) || \
+       defined(JSON_HEDLEY_TI_CL2000_VERSION) || \
+       defined(JSON_HEDLEY_TI_CL6X_VERSION) || \
+       defined(JSON_HEDLEY_TI_CL7X_VERSION) || \
+       defined(JSON_HEDLEY_TI_CLPRU_VERSION) || \
+       defined(__clang__)
+#    define JSON_HEDLEY_IS_CONSTEXPR_(expr) ( \
+        sizeof(void) != \
+        sizeof(*( \
+                  1 ? \
+                  ((void*) ((expr) * 0L) ) : \
+((struct { char v[sizeof(void) * 2]; } *) 1) \
+                ) \
+              ) \
+                                            )
+#  endif
+#endif
+#if defined(JSON_HEDLEY_IS_CONSTEXPR_)
+    #if !defined(JSON_HEDLEY_IS_CONSTANT)
+        #define JSON_HEDLEY_IS_CONSTANT(expr) JSON_HEDLEY_IS_CONSTEXPR_(expr)
+    #endif
+    #define JSON_HEDLEY_REQUIRE_CONSTEXPR(expr) (JSON_HEDLEY_IS_CONSTEXPR_(expr) ? (expr) : (-1))
+#else
+    #if !defined(JSON_HEDLEY_IS_CONSTANT)
+        #define JSON_HEDLEY_IS_CONSTANT(expr) (0)
+    #endif
+    #define JSON_HEDLEY_REQUIRE_CONSTEXPR(expr) (expr)
+#endif
+
+#if defined(JSON_HEDLEY_BEGIN_C_DECLS)
+    #undef JSON_HEDLEY_BEGIN_C_DECLS
+#endif
+#if defined(JSON_HEDLEY_END_C_DECLS)
+    #undef JSON_HEDLEY_END_C_DECLS
+#endif
+#if defined(JSON_HEDLEY_C_DECL)
+    #undef JSON_HEDLEY_C_DECL
+#endif
+#if defined(__cplusplus)
+    #define JSON_HEDLEY_BEGIN_C_DECLS extern "C" {
+    #define JSON_HEDLEY_END_C_DECLS }
+    #define JSON_HEDLEY_C_DECL extern "C"
+#else
+    #define JSON_HEDLEY_BEGIN_C_DECLS
+    #define JSON_HEDLEY_END_C_DECLS
+    #define JSON_HEDLEY_C_DECL
+#endif
+
+#if defined(JSON_HEDLEY_STATIC_ASSERT)
+    #undef JSON_HEDLEY_STATIC_ASSERT
+#endif
+#if \
+  !defined(__cplusplus) && ( \
+      (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L)) || \
+      (JSON_HEDLEY_HAS_FEATURE(c_static_assert) && !defined(JSON_HEDLEY_INTEL_CL_VERSION)) || \
+      JSON_HEDLEY_GCC_VERSION_CHECK(6,0,0) || \
+      JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+      defined(_Static_assert) \
+    )
+#  define JSON_HEDLEY_STATIC_ASSERT(expr, message) _Static_assert(expr, message)
+#elif \
+  (defined(__cplusplus) && (__cplusplus >= 201103L)) || \
+  JSON_HEDLEY_MSVC_VERSION_CHECK(16,0,0) || \
+  JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
+#  define JSON_HEDLEY_STATIC_ASSERT(expr, message) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(static_assert(expr, message))
+#else
+#  define JSON_HEDLEY_STATIC_ASSERT(expr, message)
+#endif
+
+#if defined(JSON_HEDLEY_NULL)
+    #undef JSON_HEDLEY_NULL
+#endif
+#if defined(__cplusplus)
+    #if __cplusplus >= 201103L
+        #define JSON_HEDLEY_NULL JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(nullptr)
+    #elif defined(NULL)
+        #define JSON_HEDLEY_NULL NULL
+    #else
+        #define JSON_HEDLEY_NULL JSON_HEDLEY_STATIC_CAST(void*, 0)
+    #endif
+#elif defined(NULL)
+    #define JSON_HEDLEY_NULL NULL
+#else
+    #define JSON_HEDLEY_NULL ((void*) 0)
+#endif
+
+#if defined(JSON_HEDLEY_MESSAGE)
+    #undef JSON_HEDLEY_MESSAGE
+#endif
+#if JSON_HEDLEY_HAS_WARNING("-Wunknown-pragmas")
+#  define JSON_HEDLEY_MESSAGE(msg) \
+    JSON_HEDLEY_DIAGNOSTIC_PUSH \
+    JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS \
+    JSON_HEDLEY_PRAGMA(message msg) \
+    JSON_HEDLEY_DIAGNOSTIC_POP
+#elif \
+  JSON_HEDLEY_GCC_VERSION_CHECK(4,4,0) || \
+  JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
+#  define JSON_HEDLEY_MESSAGE(msg) JSON_HEDLEY_PRAGMA(message msg)
+#elif JSON_HEDLEY_CRAY_VERSION_CHECK(5,0,0)
+#  define JSON_HEDLEY_MESSAGE(msg) JSON_HEDLEY_PRAGMA(_CRI message msg)
+#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
+#  define JSON_HEDLEY_MESSAGE(msg) JSON_HEDLEY_PRAGMA(message(msg))
+#elif JSON_HEDLEY_PELLES_VERSION_CHECK(2,0,0)
+#  define JSON_HEDLEY_MESSAGE(msg) JSON_HEDLEY_PRAGMA(message(msg))
+#else
+#  define JSON_HEDLEY_MESSAGE(msg)
+#endif
+
+#if defined(JSON_HEDLEY_WARNING)
+    #undef JSON_HEDLEY_WARNING
+#endif
+#if JSON_HEDLEY_HAS_WARNING("-Wunknown-pragmas")
+#  define JSON_HEDLEY_WARNING(msg) \
+    JSON_HEDLEY_DIAGNOSTIC_PUSH \
+    JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS \
+    JSON_HEDLEY_PRAGMA(clang warning msg) \
+    JSON_HEDLEY_DIAGNOSTIC_POP
+#elif \
+  JSON_HEDLEY_GCC_VERSION_CHECK(4,8,0) || \
+  JSON_HEDLEY_PGI_VERSION_CHECK(18,4,0) || \
+  JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
+#  define JSON_HEDLEY_WARNING(msg) JSON_HEDLEY_PRAGMA(GCC warning msg)
+#elif \
+  JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0) || \
+  JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
+#  define JSON_HEDLEY_WARNING(msg) JSON_HEDLEY_PRAGMA(message(msg))
+#else
+#  define JSON_HEDLEY_WARNING(msg) JSON_HEDLEY_MESSAGE(msg)
+#endif
+
+#if defined(JSON_HEDLEY_REQUIRE)
+    #undef JSON_HEDLEY_REQUIRE
+#endif
+#if defined(JSON_HEDLEY_REQUIRE_MSG)
+    #undef JSON_HEDLEY_REQUIRE_MSG
+#endif
+#if JSON_HEDLEY_HAS_ATTRIBUTE(diagnose_if)
+#  if JSON_HEDLEY_HAS_WARNING("-Wgcc-compat")
+#    define JSON_HEDLEY_REQUIRE(expr) \
+    JSON_HEDLEY_DIAGNOSTIC_PUSH \
+    _Pragma("clang diagnostic ignored \"-Wgcc-compat\"") \
+    __attribute__((diagnose_if(!(expr), #expr, "error"))) \
+    JSON_HEDLEY_DIAGNOSTIC_POP
+#    define JSON_HEDLEY_REQUIRE_MSG(expr,msg) \
+    JSON_HEDLEY_DIAGNOSTIC_PUSH \
+    _Pragma("clang diagnostic ignored \"-Wgcc-compat\"") \
+    __attribute__((diagnose_if(!(expr), msg, "error"))) \
+    JSON_HEDLEY_DIAGNOSTIC_POP
+#  else
+#    define JSON_HEDLEY_REQUIRE(expr) __attribute__((diagnose_if(!(expr), #expr, "error")))
+#    define JSON_HEDLEY_REQUIRE_MSG(expr,msg) __attribute__((diagnose_if(!(expr), msg, "error")))
+#  endif
+#else
+#  define JSON_HEDLEY_REQUIRE(expr)
+#  define JSON_HEDLEY_REQUIRE_MSG(expr,msg)
+#endif
+
+#if defined(JSON_HEDLEY_FLAGS)
+    #undef JSON_HEDLEY_FLAGS
+#endif
+#if JSON_HEDLEY_HAS_ATTRIBUTE(flag_enum) && (!defined(__cplusplus) || JSON_HEDLEY_HAS_WARNING("-Wbitfield-enum-conversion"))
+    #define JSON_HEDLEY_FLAGS __attribute__((__flag_enum__))
+#else
+    #define JSON_HEDLEY_FLAGS
+#endif
+
+#if defined(JSON_HEDLEY_FLAGS_CAST)
+    #undef JSON_HEDLEY_FLAGS_CAST
+#endif
+#if JSON_HEDLEY_INTEL_VERSION_CHECK(19,0,0)
+#  define JSON_HEDLEY_FLAGS_CAST(T, expr) (__extension__ ({ \
+        JSON_HEDLEY_DIAGNOSTIC_PUSH \
+        _Pragma("warning(disable:188)") \
+        ((T) (expr)); \
+        JSON_HEDLEY_DIAGNOSTIC_POP \
+    }))
+#else
+#  define JSON_HEDLEY_FLAGS_CAST(T, expr) JSON_HEDLEY_STATIC_CAST(T, expr)
+#endif
+
+#if defined(JSON_HEDLEY_EMPTY_BASES)
+    #undef JSON_HEDLEY_EMPTY_BASES
+#endif
+#if \
+    (JSON_HEDLEY_MSVC_VERSION_CHECK(19,0,23918) && !JSON_HEDLEY_MSVC_VERSION_CHECK(20,0,0)) || \
+    JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
+    #define JSON_HEDLEY_EMPTY_BASES __declspec(empty_bases)
+#else
+    #define JSON_HEDLEY_EMPTY_BASES
+#endif
+
+/* Remaining macros are deprecated. */
+
+#if defined(JSON_HEDLEY_GCC_NOT_CLANG_VERSION_CHECK)
+    #undef JSON_HEDLEY_GCC_NOT_CLANG_VERSION_CHECK
+#endif
+#if defined(__clang__)
+    #define JSON_HEDLEY_GCC_NOT_CLANG_VERSION_CHECK(major,minor,patch) (0)
+#else
+    #define JSON_HEDLEY_GCC_NOT_CLANG_VERSION_CHECK(major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_CLANG_HAS_ATTRIBUTE)
+    #undef JSON_HEDLEY_CLANG_HAS_ATTRIBUTE
+#endif
+#define JSON_HEDLEY_CLANG_HAS_ATTRIBUTE(attribute) JSON_HEDLEY_HAS_ATTRIBUTE(attribute)
+
+#if defined(JSON_HEDLEY_CLANG_HAS_CPP_ATTRIBUTE)
+    #undef JSON_HEDLEY_CLANG_HAS_CPP_ATTRIBUTE
+#endif
+#define JSON_HEDLEY_CLANG_HAS_CPP_ATTRIBUTE(attribute) JSON_HEDLEY_HAS_CPP_ATTRIBUTE(attribute)
+
+#if defined(JSON_HEDLEY_CLANG_HAS_BUILTIN)
+    #undef JSON_HEDLEY_CLANG_HAS_BUILTIN
+#endif
+#define JSON_HEDLEY_CLANG_HAS_BUILTIN(builtin) JSON_HEDLEY_HAS_BUILTIN(builtin)
+
+#if defined(JSON_HEDLEY_CLANG_HAS_FEATURE)
+    #undef JSON_HEDLEY_CLANG_HAS_FEATURE
+#endif
+#define JSON_HEDLEY_CLANG_HAS_FEATURE(feature) JSON_HEDLEY_HAS_FEATURE(feature)
+
+#if defined(JSON_HEDLEY_CLANG_HAS_EXTENSION)
+    #undef JSON_HEDLEY_CLANG_HAS_EXTENSION
+#endif
+#define JSON_HEDLEY_CLANG_HAS_EXTENSION(extension) JSON_HEDLEY_HAS_EXTENSION(extension)
+
+#if defined(JSON_HEDLEY_CLANG_HAS_DECLSPEC_DECLSPEC_ATTRIBUTE)
+    #undef JSON_HEDLEY_CLANG_HAS_DECLSPEC_DECLSPEC_ATTRIBUTE
+#endif
+#define JSON_HEDLEY_CLANG_HAS_DECLSPEC_ATTRIBUTE(attribute) JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE(attribute)
+
+#if defined(JSON_HEDLEY_CLANG_HAS_WARNING)
+    #undef JSON_HEDLEY_CLANG_HAS_WARNING
+#endif
+#define JSON_HEDLEY_CLANG_HAS_WARNING(warning) JSON_HEDLEY_HAS_WARNING(warning)
+
+#endif /* !defined(JSON_HEDLEY_VERSION) || (JSON_HEDLEY_VERSION < X) */
+
+
+// This file contains all internal macro definitions (except those affecting ABI)
+// You MUST include macro_unscope.hpp at the end of json.hpp to undef all of them
+
+// #include <nlohmann/detail/abi_macros.hpp>
+
+
+// exclude unsupported compilers
+#if !defined(JSON_SKIP_UNSUPPORTED_COMPILER_CHECK)
+    #if defined(__clang__)
+        #if (__clang_major__ * 10000 + __clang_minor__ * 100 + __clang_patchlevel__) < 30400
+            #error "unsupported Clang version - see https://github.com/nlohmann/json#supported-compilers"
+        #endif
+    #elif defined(__GNUC__) && !(defined(__ICC) || defined(__INTEL_COMPILER))
+        #if (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) < 40800
+            #error "unsupported GCC version - see https://github.com/nlohmann/json#supported-compilers"
+        #endif
+    #endif
+#endif
+
+// C++ language standard detection
+// if the user manually specified the used c++ version this is skipped
+#if !defined(JSON_HAS_CPP_23) && !defined(JSON_HAS_CPP_20) && !defined(JSON_HAS_CPP_17) && !defined(JSON_HAS_CPP_14) && !defined(JSON_HAS_CPP_11)
+    #if (defined(__cplusplus) && __cplusplus > 202002L) || (defined(_MSVC_LANG) && _MSVC_LANG > 202002L)
+        #define JSON_HAS_CPP_23
+        #define JSON_HAS_CPP_20
+        #define JSON_HAS_CPP_17
+        #define JSON_HAS_CPP_14
+    #elif (defined(__cplusplus) && __cplusplus > 201703L) || (defined(_MSVC_LANG) && _MSVC_LANG > 201703L)
+        #define JSON_HAS_CPP_20
+        #define JSON_HAS_CPP_17
+        #define JSON_HAS_CPP_14
+    #elif (defined(__cplusplus) && __cplusplus > 201402L) || (defined(_HAS_CXX17) && _HAS_CXX17 == 1) // fix for issue #464
+        #define JSON_HAS_CPP_17
+        #define JSON_HAS_CPP_14
+    #elif (defined(__cplusplus) && __cplusplus > 201103L) || (defined(_HAS_CXX14) && _HAS_CXX14 == 1)
+        #define JSON_HAS_CPP_14
+    #endif
+    // the cpp 11 flag is always specified because it is the minimal required version
+    #define JSON_HAS_CPP_11
+#endif
+
+#ifdef __has_include
+    #if __has_include(<version>)
+        #include <version>
+    #endif
+#endif
+
+#if !defined(JSON_HAS_FILESYSTEM) && !defined(JSON_HAS_EXPERIMENTAL_FILESYSTEM)
+    #ifdef JSON_HAS_CPP_17
+        #if defined(__cpp_lib_filesystem)
+            #define JSON_HAS_FILESYSTEM 1
+        #elif defined(__cpp_lib_experimental_filesystem)
+            #define JSON_HAS_EXPERIMENTAL_FILESYSTEM 1
+        #elif !defined(__has_include)
+            #define JSON_HAS_EXPERIMENTAL_FILESYSTEM 1
+        #elif __has_include(<filesystem>)
+            #define JSON_HAS_FILESYSTEM 1
+        #elif __has_include(<experimental/filesystem>)
+            #define JSON_HAS_EXPERIMENTAL_FILESYSTEM 1
+        #endif
+
+        // std::filesystem does not work on MinGW GCC 8: https://sourceforge.net/p/mingw-w64/bugs/737/
+        #if defined(__MINGW32__) && defined(__GNUC__) && __GNUC__ == 8
+            #undef JSON_HAS_FILESYSTEM
+            #undef JSON_HAS_EXPERIMENTAL_FILESYSTEM
+        #endif
+
+        // no filesystem support before GCC 8: https://en.cppreference.com/w/cpp/compiler_support
+        #if defined(__GNUC__) && !defined(__clang__) && __GNUC__ < 8
+            #undef JSON_HAS_FILESYSTEM
+            #undef JSON_HAS_EXPERIMENTAL_FILESYSTEM
+        #endif
+
+        // no filesystem support before Clang 7: https://en.cppreference.com/w/cpp/compiler_support
+        #if defined(__clang_major__) && __clang_major__ < 7
+            #undef JSON_HAS_FILESYSTEM
+            #undef JSON_HAS_EXPERIMENTAL_FILESYSTEM
+        #endif
+
+        // no filesystem support before MSVC 19.14: https://en.cppreference.com/w/cpp/compiler_support
+        #if defined(_MSC_VER) && _MSC_VER < 1914
+            #undef JSON_HAS_FILESYSTEM
+            #undef JSON_HAS_EXPERIMENTAL_FILESYSTEM
+        #endif
+
+        // no filesystem support before iOS 13
+        #if defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && __IPHONE_OS_VERSION_MIN_REQUIRED < 130000
+            #undef JSON_HAS_FILESYSTEM
+            #undef JSON_HAS_EXPERIMENTAL_FILESYSTEM
+        #endif
+
+        // no filesystem support before macOS Catalina
+        #if defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101500
+            #undef JSON_HAS_FILESYSTEM
+            #undef JSON_HAS_EXPERIMENTAL_FILESYSTEM
+        #endif
+    #endif
+#endif
+
+#ifndef JSON_HAS_EXPERIMENTAL_FILESYSTEM
+    #define JSON_HAS_EXPERIMENTAL_FILESYSTEM 0
+#endif
+
+#ifndef JSON_HAS_FILESYSTEM
+    #define JSON_HAS_FILESYSTEM 0
+#endif
+
+#ifndef JSON_HAS_THREE_WAY_COMPARISON
+    #if defined(__cpp_impl_three_way_comparison) && __cpp_impl_three_way_comparison >= 201907L \
+        && defined(__cpp_lib_three_way_comparison) && __cpp_lib_three_way_comparison >= 201907L
+        #define JSON_HAS_THREE_WAY_COMPARISON 1
+    #else
+        #define JSON_HAS_THREE_WAY_COMPARISON 0
+    #endif
+#endif
+
+#ifndef JSON_HAS_RANGES
+    // ranges header shipping in GCC 11.1.0 (released 2021-04-27) has syntax error
+    #if defined(__GLIBCXX__) && __GLIBCXX__ == 20210427
+        #define JSON_HAS_RANGES 0
+    #elif defined(__cpp_lib_ranges)
+        #define JSON_HAS_RANGES 1
+    #else
+        #define JSON_HAS_RANGES 0
+    #endif
+#endif
+
+#ifndef JSON_HAS_STATIC_RTTI
+    #if !defined(_HAS_STATIC_RTTI) || _HAS_STATIC_RTTI != 0
+        #define JSON_HAS_STATIC_RTTI 1
+    #else
+        #define JSON_HAS_STATIC_RTTI 0
+    #endif
+#endif
+
+#ifdef JSON_HAS_CPP_17
+    #define JSON_INLINE_VARIABLE inline
+#else
+    #define JSON_INLINE_VARIABLE
+#endif
+
+#if JSON_HEDLEY_HAS_ATTRIBUTE(no_unique_address)
+    #define JSON_NO_UNIQUE_ADDRESS [[no_unique_address]]
+#else
+    #define JSON_NO_UNIQUE_ADDRESS
+#endif
+
+// disable documentation warnings on clang
+#if defined(__clang__)
+    #pragma clang diagnostic push
+    #pragma clang diagnostic ignored "-Wdocumentation"
+    #pragma clang diagnostic ignored "-Wdocumentation-unknown-command"
+#endif
+
+// allow disabling exceptions
+#if (defined(__cpp_exceptions) || defined(__EXCEPTIONS) || defined(_CPPUNWIND)) && !defined(JSON_NOEXCEPTION)
+    #define JSON_THROW(exception) throw exception
+    #define JSON_TRY try
+    #define JSON_CATCH(exception) catch(exception)
+    #define JSON_INTERNAL_CATCH(exception) catch(exception)
+#else
+    #include <cstdlib>
+    #define JSON_THROW(exception) std::abort()
+    #define JSON_TRY if(true)
+    #define JSON_CATCH(exception) if(false)
+    #define JSON_INTERNAL_CATCH(exception) if(false)
+#endif
+
+// override exception macros
+#if defined(JSON_THROW_USER)
+    #undef JSON_THROW
+    #define JSON_THROW JSON_THROW_USER
+#endif
+#if defined(JSON_TRY_USER)
+    #undef JSON_TRY
+    #define JSON_TRY JSON_TRY_USER
+#endif
+#if defined(JSON_CATCH_USER)
+    #undef JSON_CATCH
+    #define JSON_CATCH JSON_CATCH_USER
+    #undef JSON_INTERNAL_CATCH
+    #define JSON_INTERNAL_CATCH JSON_CATCH_USER
+#endif
+#if defined(JSON_INTERNAL_CATCH_USER)
+    #undef JSON_INTERNAL_CATCH
+    #define JSON_INTERNAL_CATCH JSON_INTERNAL_CATCH_USER
+#endif
+
+// allow overriding assert
+#if !defined(JSON_ASSERT)
+    #include <cassert> // assert
+    #define JSON_ASSERT(x) assert(x)
+#endif
+
+// allow to access some private functions (needed by the test suite)
+#if defined(JSON_TESTS_PRIVATE)
+    #define JSON_PRIVATE_UNLESS_TESTED public
+#else
+    #define JSON_PRIVATE_UNLESS_TESTED private
+#endif
+
+/*!
+@brief macro to briefly define a mapping between an enum and JSON
+@def NLOHMANN_JSON_SERIALIZE_ENUM
+@since version 3.4.0
+*/
+#define NLOHMANN_JSON_SERIALIZE_ENUM(ENUM_TYPE, ...)                                            \
+    template<typename BasicJsonType>                                                            \
+    inline void to_json(BasicJsonType& j, const ENUM_TYPE& e)                                   \
+    {                                                                                           \
+        /* NOLINTNEXTLINE(modernize-type-traits) we use C++11 */                                \
+        static_assert(std::is_enum<ENUM_TYPE>::value, #ENUM_TYPE " must be an enum!");          \
+        /* NOLINTNEXTLINE(modernize-avoid-c-arrays) we don't want to depend on <array> */       \
+        static const std::pair<ENUM_TYPE, BasicJsonType> m[] = __VA_ARGS__;                     \
+        auto it = std::find_if(std::begin(m), std::end(m),                                      \
+                               [e](const std::pair<ENUM_TYPE, BasicJsonType>& ej_pair) -> bool  \
+        {                                                                                       \
+            return ej_pair.first == e;                                                          \
+        });                                                                                     \
+        j = ((it != std::end(m)) ? it : std::begin(m))->second;                                 \
+    }                                                                                           \
+    template<typename BasicJsonType>                                                            \
+    inline void from_json(const BasicJsonType& j, ENUM_TYPE& e)                                 \
+    {                                                                                           \
+        /* NOLINTNEXTLINE(modernize-type-traits) we use C++11 */                                \
+        static_assert(std::is_enum<ENUM_TYPE>::value, #ENUM_TYPE " must be an enum!");          \
+        /* NOLINTNEXTLINE(modernize-avoid-c-arrays) we don't want to depend on <array> */       \
+        static const std::pair<ENUM_TYPE, BasicJsonType> m[] = __VA_ARGS__;                     \
+        auto it = std::find_if(std::begin(m), std::end(m),                                      \
+                               [&j](const std::pair<ENUM_TYPE, BasicJsonType>& ej_pair) -> bool \
+        {                                                                                       \
+            return ej_pair.second == j;                                                         \
+        });                                                                                     \
+        e = ((it != std::end(m)) ? it : std::begin(m))->first;                                  \
+    }
+
+// Ugly macros to avoid uglier copy-paste when specializing basic_json. They
+// may be removed in the future once the class is split.
+
+#define NLOHMANN_BASIC_JSON_TPL_DECLARATION                                \
+    template<template<typename, typename, typename...> class ObjectType,   \
+             template<typename, typename...> class ArrayType,              \
+             class StringType, class BooleanType, class NumberIntegerType, \
+             class NumberUnsignedType, class NumberFloatType,              \
+             template<typename> class AllocatorType,                       \
+             template<typename, typename = void> class JSONSerializer,     \
+             class BinaryType,                                             \
+             class CustomBaseClass>
+
+#define NLOHMANN_BASIC_JSON_TPL                                            \
+    basic_json<ObjectType, ArrayType, StringType, BooleanType,             \
+    NumberIntegerType, NumberUnsignedType, NumberFloatType,                \
+    AllocatorType, JSONSerializer, BinaryType, CustomBaseClass>
+
+// Macros to simplify conversion from/to types
+
+#define NLOHMANN_JSON_EXPAND( x ) x
+#define NLOHMANN_JSON_GET_MACRO(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50, _51, _52, _53, _54, _55, _56, _57, _58, _59, _60, _61, _62, _63, _64, NAME,...) NAME
+#define NLOHMANN_JSON_PASTE(...) NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_GET_MACRO(__VA_ARGS__, \
+        NLOHMANN_JSON_PASTE64, \
+        NLOHMANN_JSON_PASTE63, \
+        NLOHMANN_JSON_PASTE62, \
+        NLOHMANN_JSON_PASTE61, \
+        NLOHMANN_JSON_PASTE60, \
+        NLOHMANN_JSON_PASTE59, \
+        NLOHMANN_JSON_PASTE58, \
+        NLOHMANN_JSON_PASTE57, \
+        NLOHMANN_JSON_PASTE56, \
+        NLOHMANN_JSON_PASTE55, \
+        NLOHMANN_JSON_PASTE54, \
+        NLOHMANN_JSON_PASTE53, \
+        NLOHMANN_JSON_PASTE52, \
+        NLOHMANN_JSON_PASTE51, \
+        NLOHMANN_JSON_PASTE50, \
+        NLOHMANN_JSON_PASTE49, \
+        NLOHMANN_JSON_PASTE48, \
+        NLOHMANN_JSON_PASTE47, \
+        NLOHMANN_JSON_PASTE46, \
+        NLOHMANN_JSON_PASTE45, \
+        NLOHMANN_JSON_PASTE44, \
+        NLOHMANN_JSON_PASTE43, \
+        NLOHMANN_JSON_PASTE42, \
+        NLOHMANN_JSON_PASTE41, \
+        NLOHMANN_JSON_PASTE40, \
+        NLOHMANN_JSON_PASTE39, \
+        NLOHMANN_JSON_PASTE38, \
+        NLOHMANN_JSON_PASTE37, \
+        NLOHMANN_JSON_PASTE36, \
+        NLOHMANN_JSON_PASTE35, \
+        NLOHMANN_JSON_PASTE34, \
+        NLOHMANN_JSON_PASTE33, \
+        NLOHMANN_JSON_PASTE32, \
+        NLOHMANN_JSON_PASTE31, \
+        NLOHMANN_JSON_PASTE30, \
+        NLOHMANN_JSON_PASTE29, \
+        NLOHMANN_JSON_PASTE28, \
+        NLOHMANN_JSON_PASTE27, \
+        NLOHMANN_JSON_PASTE26, \
+        NLOHMANN_JSON_PASTE25, \
+        NLOHMANN_JSON_PASTE24, \
+        NLOHMANN_JSON_PASTE23, \
+        NLOHMANN_JSON_PASTE22, \
+        NLOHMANN_JSON_PASTE21, \
+        NLOHMANN_JSON_PASTE20, \
+        NLOHMANN_JSON_PASTE19, \
+        NLOHMANN_JSON_PASTE18, \
+        NLOHMANN_JSON_PASTE17, \
+        NLOHMANN_JSON_PASTE16, \
+        NLOHMANN_JSON_PASTE15, \
+        NLOHMANN_JSON_PASTE14, \
+        NLOHMANN_JSON_PASTE13, \
+        NLOHMANN_JSON_PASTE12, \
+        NLOHMANN_JSON_PASTE11, \
+        NLOHMANN_JSON_PASTE10, \
+        NLOHMANN_JSON_PASTE9, \
+        NLOHMANN_JSON_PASTE8, \
+        NLOHMANN_JSON_PASTE7, \
+        NLOHMANN_JSON_PASTE6, \
+        NLOHMANN_JSON_PASTE5, \
+        NLOHMANN_JSON_PASTE4, \
+        NLOHMANN_JSON_PASTE3, \
+        NLOHMANN_JSON_PASTE2, \
+        NLOHMANN_JSON_PASTE1)(__VA_ARGS__))
+#define NLOHMANN_JSON_PASTE2(func, v1) func(v1)
+#define NLOHMANN_JSON_PASTE3(func, v1, v2) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE2(func, v2)
+#define NLOHMANN_JSON_PASTE4(func, v1, v2, v3) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE3(func, v2, v3)
+#define NLOHMANN_JSON_PASTE5(func, v1, v2, v3, v4) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE4(func, v2, v3, v4)
+#define NLOHMANN_JSON_PASTE6(func, v1, v2, v3, v4, v5) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE5(func, v2, v3, v4, v5)
+#define NLOHMANN_JSON_PASTE7(func, v1, v2, v3, v4, v5, v6) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE6(func, v2, v3, v4, v5, v6)
+#define NLOHMANN_JSON_PASTE8(func, v1, v2, v3, v4, v5, v6, v7) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE7(func, v2, v3, v4, v5, v6, v7)
+#define NLOHMANN_JSON_PASTE9(func, v1, v2, v3, v4, v5, v6, v7, v8) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE8(func, v2, v3, v4, v5, v6, v7, v8)
+#define NLOHMANN_JSON_PASTE10(func, v1, v2, v3, v4, v5, v6, v7, v8, v9) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE9(func, v2, v3, v4, v5, v6, v7, v8, v9)
+#define NLOHMANN_JSON_PASTE11(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE10(func, v2, v3, v4, v5, v6, v7, v8, v9, v10)
+#define NLOHMANN_JSON_PASTE12(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE11(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11)
+#define NLOHMANN_JSON_PASTE13(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE12(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12)
+#define NLOHMANN_JSON_PASTE14(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE13(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13)
+#define NLOHMANN_JSON_PASTE15(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE14(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14)
+#define NLOHMANN_JSON_PASTE16(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE15(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15)
+#define NLOHMANN_JSON_PASTE17(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE16(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16)
+#define NLOHMANN_JSON_PASTE18(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE17(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17)
+#define NLOHMANN_JSON_PASTE19(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE18(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18)
+#define NLOHMANN_JSON_PASTE20(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE19(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19)
+#define NLOHMANN_JSON_PASTE21(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE20(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20)
+#define NLOHMANN_JSON_PASTE22(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE21(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21)
+#define NLOHMANN_JSON_PASTE23(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE22(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22)
+#define NLOHMANN_JSON_PASTE24(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE23(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23)
+#define NLOHMANN_JSON_PASTE25(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE24(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24)
+#define NLOHMANN_JSON_PASTE26(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE25(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25)
+#define NLOHMANN_JSON_PASTE27(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE26(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26)
+#define NLOHMANN_JSON_PASTE28(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE27(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27)
+#define NLOHMANN_JSON_PASTE29(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE28(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28)
+#define NLOHMANN_JSON_PASTE30(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE29(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29)
+#define NLOHMANN_JSON_PASTE31(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE30(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30)
+#define NLOHMANN_JSON_PASTE32(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE31(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31)
+#define NLOHMANN_JSON_PASTE33(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE32(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32)
+#define NLOHMANN_JSON_PASTE34(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE33(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33)
+#define NLOHMANN_JSON_PASTE35(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE34(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34)
+#define NLOHMANN_JSON_PASTE36(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE35(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35)
+#define NLOHMANN_JSON_PASTE37(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE36(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36)
+#define NLOHMANN_JSON_PASTE38(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE37(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37)
+#define NLOHMANN_JSON_PASTE39(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE38(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38)
+#define NLOHMANN_JSON_PASTE40(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE39(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39)
+#define NLOHMANN_JSON_PASTE41(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE40(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40)
+#define NLOHMANN_JSON_PASTE42(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE41(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41)
+#define NLOHMANN_JSON_PASTE43(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE42(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42)
+#define NLOHMANN_JSON_PASTE44(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE43(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43)
+#define NLOHMANN_JSON_PASTE45(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE44(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44)
+#define NLOHMANN_JSON_PASTE46(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE45(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45)
+#define NLOHMANN_JSON_PASTE47(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE46(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46)
+#define NLOHMANN_JSON_PASTE48(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE47(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47)
+#define NLOHMANN_JSON_PASTE49(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE48(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48)
+#define NLOHMANN_JSON_PASTE50(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE49(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49)
+#define NLOHMANN_JSON_PASTE51(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE50(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50)
+#define NLOHMANN_JSON_PASTE52(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE51(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51)
+#define NLOHMANN_JSON_PASTE53(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE52(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52)
+#define NLOHMANN_JSON_PASTE54(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE53(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53)
+#define NLOHMANN_JSON_PASTE55(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE54(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54)
+#define NLOHMANN_JSON_PASTE56(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE55(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55)
+#define NLOHMANN_JSON_PASTE57(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE56(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56)
+#define NLOHMANN_JSON_PASTE58(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE57(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57)
+#define NLOHMANN_JSON_PASTE59(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE58(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58)
+#define NLOHMANN_JSON_PASTE60(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE59(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59)
+#define NLOHMANN_JSON_PASTE61(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE60(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60)
+#define NLOHMANN_JSON_PASTE62(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE61(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61)
+#define NLOHMANN_JSON_PASTE63(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61, v62) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE62(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61, v62)
+#define NLOHMANN_JSON_PASTE64(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61, v62, v63) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE63(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61, v62, v63)
+
+#define NLOHMANN_JSON_TO(v1) nlohmann_json_j[#v1] = nlohmann_json_t.v1;
+#define NLOHMANN_JSON_FROM(v1) nlohmann_json_j.at(#v1).get_to(nlohmann_json_t.v1);
+#define NLOHMANN_JSON_FROM_WITH_DEFAULT(v1) nlohmann_json_t.v1 = !nlohmann_json_j.is_null() ? nlohmann_json_j.value(#v1, nlohmann_json_default_obj.v1) : nlohmann_json_default_obj.v1;
+
+/*!
+@brief macro
+@def NLOHMANN_DEFINE_TYPE_INTRUSIVE
+@since version 3.9.0
+@sa https://json.nlohmann.me/api/macros/nlohmann_define_type_intrusive/
+*/
+#define NLOHMANN_DEFINE_TYPE_INTRUSIVE(Type, ...)  \
+    template<typename BasicJsonType, nlohmann::detail::enable_if_t<nlohmann::detail::is_basic_json<BasicJsonType>::value, int> = 0> \
+    friend void to_json(BasicJsonType& nlohmann_json_j, const Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) } \
+    template<typename BasicJsonType, nlohmann::detail::enable_if_t<nlohmann::detail::is_basic_json<BasicJsonType>::value, int> = 0> \
+    friend void from_json(const BasicJsonType& nlohmann_json_j, Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_FROM, __VA_ARGS__)) }
+
+/*!
+@brief macro
+@def NLOHMANN_DEFINE_TYPE_INTRUSIVE_WITH_DEFAULT
+@since version 3.11.0
+@sa https://json.nlohmann.me/api/macros/nlohmann_define_type_intrusive/
+*/
+#define NLOHMANN_DEFINE_TYPE_INTRUSIVE_WITH_DEFAULT(Type, ...)  \
+    template<typename BasicJsonType, nlohmann::detail::enable_if_t<nlohmann::detail::is_basic_json<BasicJsonType>::value, int> = 0> \
+    friend void to_json(BasicJsonType& nlohmann_json_j, const Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) } \
+    template<typename BasicJsonType, nlohmann::detail::enable_if_t<nlohmann::detail::is_basic_json<BasicJsonType>::value, int> = 0> \
+    friend void from_json(const BasicJsonType& nlohmann_json_j, Type& nlohmann_json_t) { const Type nlohmann_json_default_obj{}; NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_FROM_WITH_DEFAULT, __VA_ARGS__)) }
+
+/*!
+@brief macro
+@def NLOHMANN_DEFINE_TYPE_INTRUSIVE_ONLY_SERIALIZE
+@since version 3.11.3
+@sa https://json.nlohmann.me/api/macros/nlohmann_define_type_intrusive/
+*/
+#define NLOHMANN_DEFINE_TYPE_INTRUSIVE_ONLY_SERIALIZE(Type, ...)  \
+    template<typename BasicJsonType, nlohmann::detail::enable_if_t<nlohmann::detail::is_basic_json<BasicJsonType>::value, int> = 0> \
+    friend void to_json(BasicJsonType& nlohmann_json_j, const Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) }
+
+/*!
+@brief macro
+@def NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE
+@since version 3.9.0
+@sa https://json.nlohmann.me/api/macros/nlohmann_define_type_non_intrusive/
+*/
+#define NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(Type, ...)  \
+    template<typename BasicJsonType, nlohmann::detail::enable_if_t<nlohmann::detail::is_basic_json<BasicJsonType>::value, int> = 0> \
+    void to_json(BasicJsonType& nlohmann_json_j, const Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) } \
+    template<typename BasicJsonType, nlohmann::detail::enable_if_t<nlohmann::detail::is_basic_json<BasicJsonType>::value, int> = 0> \
+    void from_json(const BasicJsonType& nlohmann_json_j, Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_FROM, __VA_ARGS__)) }
+
+/*!
+@brief macro
+@def NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_WITH_DEFAULT
+@since version 3.11.0
+@sa https://json.nlohmann.me/api/macros/nlohmann_define_type_non_intrusive/
+*/
+#define NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_WITH_DEFAULT(Type, ...)  \
+    template<typename BasicJsonType, nlohmann::detail::enable_if_t<nlohmann::detail::is_basic_json<BasicJsonType>::value, int> = 0> \
+    void to_json(BasicJsonType& nlohmann_json_j, const Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) } \
+    template<typename BasicJsonType, nlohmann::detail::enable_if_t<nlohmann::detail::is_basic_json<BasicJsonType>::value, int> = 0> \
+    void from_json(const BasicJsonType& nlohmann_json_j, Type& nlohmann_json_t) { const Type nlohmann_json_default_obj{}; NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_FROM_WITH_DEFAULT, __VA_ARGS__)) }
+
+/*!
+@brief macro
+@def NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_ONLY_SERIALIZE
+@since version 3.11.3
+@sa https://json.nlohmann.me/api/macros/nlohmann_define_type_non_intrusive/
+*/
+#define NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_ONLY_SERIALIZE(Type, ...)  \
+    template<typename BasicJsonType, nlohmann::detail::enable_if_t<nlohmann::detail::is_basic_json<BasicJsonType>::value, int> = 0> \
+    void to_json(BasicJsonType& nlohmann_json_j, const Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) }
+
+/*!
+@brief macro
+@def NLOHMANN_DEFINE_DERIVED_TYPE_INTRUSIVE
+@since version 3.12.0
+@sa https://json.nlohmann.me/api/macros/nlohmann_define_derived_type/
+*/
+#define NLOHMANN_DEFINE_DERIVED_TYPE_INTRUSIVE(Type, BaseType, ...)  \
+    template<typename BasicJsonType, nlohmann::detail::enable_if_t<nlohmann::detail::is_basic_json<BasicJsonType>::value, int> = 0> \
+    friend void to_json(BasicJsonType& nlohmann_json_j, const Type& nlohmann_json_t) { nlohmann::to_json(nlohmann_json_j, static_cast<const BaseType &>(nlohmann_json_t)); NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) } \
+    template<typename BasicJsonType, nlohmann::detail::enable_if_t<nlohmann::detail::is_basic_json<BasicJsonType>::value, int> = 0> \
+    friend void from_json(const BasicJsonType& nlohmann_json_j, Type& nlohmann_json_t) { nlohmann::from_json(nlohmann_json_j, static_cast<BaseType&>(nlohmann_json_t)); NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_FROM, __VA_ARGS__)) }
+
+/*!
+@brief macro
+@def NLOHMANN_DEFINE_DERIVED_TYPE_INTRUSIVE_WITH_DEFAULT
+@since version 3.12.0
+@sa https://json.nlohmann.me/api/macros/nlohmann_define_derived_type/
+*/
+#define NLOHMANN_DEFINE_DERIVED_TYPE_INTRUSIVE_WITH_DEFAULT(Type, BaseType, ...)  \
+    template<typename BasicJsonType, nlohmann::detail::enable_if_t<nlohmann::detail::is_basic_json<BasicJsonType>::value, int> = 0> \
+    friend void to_json(BasicJsonType& nlohmann_json_j, const Type& nlohmann_json_t) { nlohmann::to_json(nlohmann_json_j, static_cast<const BaseType&>(nlohmann_json_t)); NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) } \
+    template<typename BasicJsonType, nlohmann::detail::enable_if_t<nlohmann::detail::is_basic_json<BasicJsonType>::value, int> = 0> \
+    friend void from_json(const BasicJsonType& nlohmann_json_j, Type& nlohmann_json_t) { nlohmann::from_json(nlohmann_json_j, static_cast<BaseType&>(nlohmann_json_t)); const Type nlohmann_json_default_obj{}; NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_FROM_WITH_DEFAULT, __VA_ARGS__)) }
+
+/*!
+@brief macro
+@def NLOHMANN_DEFINE_DERIVED_TYPE_INTRUSIVE_ONLY_SERIALIZE
+@since version 3.12.0
+@sa https://json.nlohmann.me/api/macros/nlohmann_define_derived_type/
+*/
+#define NLOHMANN_DEFINE_DERIVED_TYPE_INTRUSIVE_ONLY_SERIALIZE(Type, BaseType, ...)  \
+    template<typename BasicJsonType, nlohmann::detail::enable_if_t<nlohmann::detail::is_basic_json<BasicJsonType>::value, int> = 0> \
+    friend void to_json(BasicJsonType& nlohmann_json_j, const Type& nlohmann_json_t) { nlohmann::to_json(nlohmann_json_j, static_cast<const BaseType &>(nlohmann_json_t)); NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) }
+
+/*!
+@brief macro
+@def NLOHMANN_DEFINE_DERIVED_TYPE_NON_INTRUSIVE
+@since version 3.12.0
+@sa https://json.nlohmann.me/api/macros/nlohmann_define_derived_type/
+*/
+#define NLOHMANN_DEFINE_DERIVED_TYPE_NON_INTRUSIVE(Type, BaseType, ...)  \
+    template<typename BasicJsonType, nlohmann::detail::enable_if_t<nlohmann::detail::is_basic_json<BasicJsonType>::value, int> = 0> \
+    void to_json(BasicJsonType& nlohmann_json_j, const Type& nlohmann_json_t) { nlohmann::to_json(nlohmann_json_j, static_cast<const BaseType &>(nlohmann_json_t)); NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) } \
+    template<typename BasicJsonType, nlohmann::detail::enable_if_t<nlohmann::detail::is_basic_json<BasicJsonType>::value, int> = 0> \
+    void from_json(const BasicJsonType& nlohmann_json_j, Type& nlohmann_json_t) { nlohmann::from_json(nlohmann_json_j, static_cast<BaseType&>(nlohmann_json_t)); NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_FROM, __VA_ARGS__)) }
+
+/*!
+@brief macro
+@def NLOHMANN_DEFINE_DERIVED_TYPE_NON_INTRUSIVE_WITH_DEFAULT
+@since version 3.12.0
+@sa https://json.nlohmann.me/api/macros/nlohmann_define_derived_type/
+*/
+#define NLOHMANN_DEFINE_DERIVED_TYPE_NON_INTRUSIVE_WITH_DEFAULT(Type, BaseType, ...)  \
+    template<typename BasicJsonType, nlohmann::detail::enable_if_t<nlohmann::detail::is_basic_json<BasicJsonType>::value, int> = 0> \
+    void to_json(BasicJsonType& nlohmann_json_j, const Type& nlohmann_json_t) { nlohmann::to_json(nlohmann_json_j, static_cast<const BaseType &>(nlohmann_json_t)); NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) } \
+    template<typename BasicJsonType, nlohmann::detail::enable_if_t<nlohmann::detail::is_basic_json<BasicJsonType>::value, int> = 0> \
+    void from_json(const BasicJsonType& nlohmann_json_j, Type& nlohmann_json_t) { nlohmann::from_json(nlohmann_json_j, static_cast<BaseType&>(nlohmann_json_t)); const Type nlohmann_json_default_obj{}; NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_FROM_WITH_DEFAULT, __VA_ARGS__)) }
+
+/*!
+@brief macro
+@def NLOHMANN_DEFINE_DERIVED_TYPE_NON_INTRUSIVE_ONLY_SERIALIZE
+@since version 3.12.0
+@sa https://json.nlohmann.me/api/macros/nlohmann_define_derived_type/
+*/
+#define NLOHMANN_DEFINE_DERIVED_TYPE_NON_INTRUSIVE_ONLY_SERIALIZE(Type, BaseType, ...)  \
+    template<typename BasicJsonType, nlohmann::detail::enable_if_t<nlohmann::detail::is_basic_json<BasicJsonType>::value, int> = 0> \
+    void to_json(BasicJsonType& nlohmann_json_j, const Type& nlohmann_json_t) { nlohmann::to_json(nlohmann_json_j, static_cast<const BaseType &>(nlohmann_json_t)); NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) }
+
+// inspired from https://stackoverflow.com/a/26745591
+// allows calling any std function as if (e.g., with begin):
+// using std::begin; begin(x);
+//
+// it allows using the detected idiom to retrieve the return type
+// of such an expression
+#define NLOHMANN_CAN_CALL_STD_FUNC_IMPL(std_name)                                 \
+    namespace detail {                                                            \
+    using std::std_name;                                                          \
+    \
+    template<typename... T>                                                       \
+    using result_of_##std_name = decltype(std_name(std::declval<T>()...));        \
+    }                                                                             \
+    \
+    namespace detail2 {                                                           \
+    struct std_name##_tag                                                         \
+    {                                                                             \
+    };                                                                            \
+    \
+    template<typename... T>                                                       \
+    std_name##_tag std_name(T&&...);                                              \
+    \
+    template<typename... T>                                                       \
+    using result_of_##std_name = decltype(std_name(std::declval<T>()...));        \
+    \
+    template<typename... T>                                                       \
+    struct would_call_std_##std_name                                              \
+    {                                                                             \
+        static constexpr auto const value = ::nlohmann::detail::                  \
+                                            is_detected_exact<std_name##_tag, result_of_##std_name, T...>::value; \
+    };                                                                            \
+    } /* namespace detail2 */ \
+    \
+    template<typename... T>                                                       \
+    struct would_call_std_##std_name : detail2::would_call_std_##std_name<T...>   \
+    {                                                                             \
+    }
+
+#ifndef JSON_USE_IMPLICIT_CONVERSIONS
+    #define JSON_USE_IMPLICIT_CONVERSIONS 1
+#endif
+
+#if JSON_USE_IMPLICIT_CONVERSIONS
+    #define JSON_EXPLICIT
+#else
+    #define JSON_EXPLICIT explicit
+#endif
+
+#ifndef JSON_DISABLE_ENUM_SERIALIZATION
+    #define JSON_DISABLE_ENUM_SERIALIZATION 0
+#endif
+
+#ifndef JSON_USE_GLOBAL_UDLS
+    #define JSON_USE_GLOBAL_UDLS 1
+#endif
+
+#if JSON_HAS_THREE_WAY_COMPARISON
+    #include <compare> // partial_ordering
+#endif
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+///////////////////////////
+// JSON type enumeration //
+///////////////////////////
+
+/*!
+@brief the JSON type enumeration
+
+This enumeration collects the different JSON types. It is internally used to
+distinguish the stored values, and the functions @ref basic_json::is_null(),
+@ref basic_json::is_object(), @ref basic_json::is_array(),
+@ref basic_json::is_string(), @ref basic_json::is_boolean(),
+@ref basic_json::is_number() (with @ref basic_json::is_number_integer(),
+@ref basic_json::is_number_unsigned(), and @ref basic_json::is_number_float()),
+@ref basic_json::is_discarded(), @ref basic_json::is_primitive(), and
+@ref basic_json::is_structured() rely on it.
+
+@note There are three enumeration entries (number_integer, number_unsigned, and
+number_float), because the library distinguishes these three types for numbers:
+@ref basic_json::number_unsigned_t is used for unsigned integers,
+@ref basic_json::number_integer_t is used for signed integers, and
+@ref basic_json::number_float_t is used for floating-point numbers or to
+approximate integers which do not fit in the limits of their respective type.
+
+@sa see @ref basic_json::basic_json(const value_t value_type) -- create a JSON
+value with the default value for a given type
+
+@since version 1.0.0
+*/
+enum class value_t : std::uint8_t
+{
+    null,             ///< null value
+    object,           ///< object (unordered set of name/value pairs)
+    array,            ///< array (ordered collection of values)
+    string,           ///< string value
+    boolean,          ///< boolean value
+    number_integer,   ///< number value (signed integer)
+    number_unsigned,  ///< number value (unsigned integer)
+    number_float,     ///< number value (floating-point)
+    binary,           ///< binary array (ordered collection of bytes)
+    discarded         ///< discarded by the parser callback function
+};
+
+/*!
+@brief comparison operator for JSON types
+
+Returns an ordering that is similar to Python:
+- order: null < boolean < number < object < array < string < binary
+- furthermore, each type is not smaller than itself
+- discarded values are not comparable
+- binary is represented as a b"" string in python and directly comparable to a
+  string; however, making a binary array directly comparable with a string would
+  be surprising behavior in a JSON file.
+
+@since version 1.0.0
+*/
+#if JSON_HAS_THREE_WAY_COMPARISON
+    inline std::partial_ordering operator<=>(const value_t lhs, const value_t rhs) noexcept // *NOPAD*
+#else
+    inline bool operator<(const value_t lhs, const value_t rhs) noexcept
+#endif
+{
+    static constexpr std::array<std::uint8_t, 9> order = {{
+            0 /* null */, 3 /* object */, 4 /* array */, 5 /* string */,
+            1 /* boolean */, 2 /* integer */, 2 /* unsigned */, 2 /* float */,
+            6 /* binary */
+        }
+    };
+
+    const auto l_index = static_cast<std::size_t>(lhs);
+    const auto r_index = static_cast<std::size_t>(rhs);
+#if JSON_HAS_THREE_WAY_COMPARISON
+    if (l_index < order.size() && r_index < order.size())
+    {
+        return order[l_index] <=> order[r_index]; // *NOPAD*
+    }
+    return std::partial_ordering::unordered;
+#else
+    return l_index < order.size() && r_index < order.size() && order[l_index] < order[r_index];
+#endif
+}
+
+// GCC selects the built-in operator< over an operator rewritten from
+// a user-defined spaceship operator
+// Clang, MSVC, and ICC select the rewritten candidate
+// (see GCC bug https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105200)
+#if JSON_HAS_THREE_WAY_COMPARISON && defined(__GNUC__)
+inline bool operator<(const value_t lhs, const value_t rhs) noexcept
+{
+    return std::is_lt(lhs <=> rhs); // *NOPAD*
+}
+#endif
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/string_escape.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013 - 2025 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+// #include <nlohmann/detail/abi_macros.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+/*!
+@brief replace all occurrences of a substring by another string
+
+@param[in,out] s  the string to manipulate; changed so that all
+               occurrences of @a f are replaced with @a t
+@param[in]     f  the substring to replace with @a t
+@param[in]     t  the string to replace @a f
+
+@pre The search string @a f must not be empty. **This precondition is
+enforced with an assertion.**
+
+@since version 2.0.0
+*/
+template<typename StringType>
+inline void replace_substring(StringType& s, const StringType& f,
+                              const StringType& t)
+{
+    JSON_ASSERT(!f.empty());
+    for (auto pos = s.find(f);                // find first occurrence of f
+            pos != StringType::npos;          // make sure f was found
+            s.replace(pos, f.size(), t),      // replace with t, and
+            pos = s.find(f, pos + t.size()))  // find next occurrence of f
+    {}
+}
+
+/*!
+ * @brief string escaping as described in RFC 6901 (Sect. 4)
+ * @param[in] s string to escape
+ * @return    escaped string
+ *
+ * Note the order of escaping "~" to "~0" and "/" to "~1" is important.
+ */
+template<typename StringType>
+inline StringType escape(StringType s)
+{
+    replace_substring(s, StringType{"~"}, StringType{"~0"});
+    replace_substring(s, StringType{"/"}, StringType{"~1"});
+    return s;
+}
+
+/*!
+ * @brief string unescaping as described in RFC 6901 (Sect. 4)
+ * @param[in] s string to unescape
+ * @return    unescaped string
+ *
+ * Note the order of escaping "~1" to "/" and "~0" to "~" is important.
+ */
+template<typename StringType>
+static void unescape(StringType& s)
+{
+    replace_substring(s, StringType{"~1"}, StringType{"/"});
+    replace_substring(s, StringType{"~0"}, StringType{"~"});
+}
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/input/position_t.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013 - 2025 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <cstddef> // size_t
+
+// #include <nlohmann/detail/abi_macros.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+/// struct to capture the start position of the current token
+struct position_t
+{
+    /// the total number of characters read
+    std::size_t chars_read_total = 0;
+    /// the number of characters read in the current line
+    std::size_t chars_read_current_line = 0;
+    /// the number of lines read
+    std::size_t lines_read = 0;
+
+    /// conversion to size_t to preserve SAX interface
+    constexpr operator size_t() const
+    {
+        return chars_read_total;
+    }
+};
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/meta/cpp_future.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013 - 2025 Niels Lohmann <https://nlohmann.me>
+// SPDX-FileCopyrightText: 2018 The Abseil Authors
+// SPDX-License-Identifier: MIT
+
+
+
+#include <array> // array
+#include <cstddef> // size_t
+#include <type_traits> // conditional, enable_if, false_type, integral_constant, is_constructible, is_integral, is_same, remove_cv, remove_reference, true_type
+#include <utility> // index_sequence, make_index_sequence, index_sequence_for
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+template<typename T>
+using uncvref_t = typename std::remove_cv<typename std::remove_reference<T>::type>::type;
+
+#ifdef JSON_HAS_CPP_14
+
+// the following utilities are natively available in C++14
+using std::enable_if_t;
+using std::index_sequence;
+using std::make_index_sequence;
+using std::index_sequence_for;
+
+#else
+
+// alias templates to reduce boilerplate
+template<bool B, typename T = void>
+using enable_if_t = typename std::enable_if<B, T>::type;
+
+// The following code is taken from https://github.com/abseil/abseil-cpp/blob/10cb35e459f5ecca5b2ff107635da0bfa41011b4/absl/utility/utility.h
+// which is part of Google Abseil (https://github.com/abseil/abseil-cpp), licensed under the Apache License 2.0.
+
+//// START OF CODE FROM GOOGLE ABSEIL
+
+// integer_sequence
+//
+// Class template representing a compile-time integer sequence. An instantiation
+// of `integer_sequence<T, Ints...>` has a sequence of integers encoded in its
+// type through its template arguments (which is a common need when
+// working with C++11 variadic templates). `absl::integer_sequence` is designed
+// to be a drop-in replacement for C++14's `std::integer_sequence`.
+//
+// Example:
+//
+//   template< class T, T... Ints >
+//   void user_function(integer_sequence<T, Ints...>);
+//
+//   int main()
+//   {
+//     // user_function's `T` will be deduced to `int` and `Ints...`
+//     // will be deduced to `0, 1, 2, 3, 4`.
+//     user_function(make_integer_sequence<int, 5>());
+//   }
+template <typename T, T... Ints>
+struct integer_sequence
+{
+    using value_type = T;
+    static constexpr std::size_t size() noexcept
+    {
+        return sizeof...(Ints);
+    }
+};
+
+// index_sequence
+//
+// A helper template for an `integer_sequence` of `size_t`,
+// `absl::index_sequence` is designed to be a drop-in replacement for C++14's
+// `std::index_sequence`.
+template <size_t... Ints>
+using index_sequence = integer_sequence<size_t, Ints...>;
+
+namespace utility_internal
+{
+
+template <typename Seq, size_t SeqSize, size_t Rem>
+struct Extend;
+
+// Note that SeqSize == sizeof...(Ints). It's passed explicitly for efficiency.
+template <typename T, T... Ints, size_t SeqSize>
+struct Extend<integer_sequence<T, Ints...>, SeqSize, 0>
+{
+    using type = integer_sequence < T, Ints..., (Ints + SeqSize)... >;
+};
+
+template <typename T, T... Ints, size_t SeqSize>
+struct Extend<integer_sequence<T, Ints...>, SeqSize, 1>
+{
+    using type = integer_sequence < T, Ints..., (Ints + SeqSize)..., 2 * SeqSize >;
+};
+
+// Recursion helper for 'make_integer_sequence<T, N>'.
+// 'Gen<T, N>::type' is an alias for 'integer_sequence<T, 0, 1, ... N-1>'.
+template <typename T, size_t N>
+struct Gen
+{
+    using type =
+        typename Extend < typename Gen < T, N / 2 >::type, N / 2, N % 2 >::type;
+};
+
+template <typename T>
+struct Gen<T, 0>
+{
+    using type = integer_sequence<T>;
+};
+
+}  // namespace utility_internal
+
+// Compile-time sequences of integers
+
+// make_integer_sequence
+//
+// This template alias is equivalent to
+// `integer_sequence<int, 0, 1, ..., N-1>`, and is designed to be a drop-in
+// replacement for C++14's `std::make_integer_sequence`.
+template <typename T, T N>
+using make_integer_sequence = typename utility_internal::Gen<T, N>::type;
+
+// make_index_sequence
+//
+// This template alias is equivalent to `index_sequence<0, 1, ..., N-1>`,
+// and is designed to be a drop-in replacement for C++14's
+// `std::make_index_sequence`.
+template <size_t N>
+using make_index_sequence = make_integer_sequence<size_t, N>;
+
+// index_sequence_for
+//
+// Converts a typename pack into an index sequence of the same length, and
+// is designed to be a drop-in replacement for C++14's
+// `std::index_sequence_for()`
+template <typename... Ts>
+using index_sequence_for = make_index_sequence<sizeof...(Ts)>;
+
+//// END OF CODE FROM GOOGLE ABSEIL
+
+#endif
+
+// dispatch utility (taken from ranges-v3)
+template<unsigned N> struct priority_tag : priority_tag < N - 1 > {};
+template<> struct priority_tag<0> {};
+
+// taken from ranges-v3
+template<typename T>
+struct static_const
+{
+    static JSON_INLINE_VARIABLE constexpr T value{};
+};
+
+#ifndef JSON_HAS_CPP_17
+    template<typename T>
+    constexpr T static_const<T>::value;
+#endif
+
+template<typename T, typename... Args>
+constexpr std::array<T, sizeof...(Args)> make_array(Args&& ... args)
+{
+    return std::array<T, sizeof...(Args)> {{static_cast<T>(std::forward<Args>(args))...}};
+}
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/meta/type_traits.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013 - 2025 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <limits> // numeric_limits
+#include <string> // char_traits
+#include <tuple> // tuple
+#include <type_traits> // false_type, is_constructible, is_integral, is_same, true_type
+#include <utility> // declval
+
+// #include <nlohmann/detail/iterators/iterator_traits.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013 - 2025 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <iterator> // random_access_iterator_tag
+
+// #include <nlohmann/detail/abi_macros.hpp>
+
+// #include <nlohmann/detail/meta/void_t.hpp>
+
+// #include <nlohmann/detail/meta/cpp_future.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+template<typename It, typename = void>
+struct iterator_types {};
+
+template<typename It>
+struct iterator_types <
+    It,
+    void_t<typename It::difference_type, typename It::value_type, typename It::pointer,
+    typename It::reference, typename It::iterator_category >>
+{
+    using difference_type = typename It::difference_type;
+    using value_type = typename It::value_type;
+    using pointer = typename It::pointer;
+    using reference = typename It::reference;
+    using iterator_category = typename It::iterator_category;
+};
+
+// This is required as some compilers implement std::iterator_traits in a way that
+// doesn't work with SFINAE. See https://github.com/nlohmann/json/issues/1341.
+template<typename T, typename = void>
+struct iterator_traits
+{
+};
+
+template<typename T>
+struct iterator_traits < T, enable_if_t < !std::is_pointer<T>::value >>
+    : iterator_types<T>
+{
+};
+
+template<typename T>
+struct iterator_traits<T*, enable_if_t<std::is_object<T>::value>>
+{
+    using iterator_category = std::random_access_iterator_tag;
+    using value_type = T;
+    using difference_type = ptrdiff_t;
+    using pointer = T*;
+    using reference = T&;
+};
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/meta/call_std/begin.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013 - 2025 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+
+NLOHMANN_CAN_CALL_STD_FUNC_IMPL(begin);
+
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/meta/call_std/end.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013 - 2025 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+
+NLOHMANN_CAN_CALL_STD_FUNC_IMPL(end);
+
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/meta/cpp_future.hpp>
+
+// #include <nlohmann/detail/meta/detected.hpp>
+
+// #include <nlohmann/json_fwd.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013 - 2025 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+#ifndef INCLUDE_NLOHMANN_JSON_FWD_HPP_
+    #define INCLUDE_NLOHMANN_JSON_FWD_HPP_
+
+    #include <cstdint> // int64_t, uint64_t
+    #include <map> // map
+    #include <memory> // allocator
+    #include <string> // string
+    #include <vector> // vector
+
+    // #include <nlohmann/detail/abi_macros.hpp>
+
+
+    /*!
+    @brief namespace for Niels Lohmann
+    @see https://github.com/nlohmann
+    @since version 1.0.0
+    */
+    NLOHMANN_JSON_NAMESPACE_BEGIN
+
+    /*!
+    @brief default JSONSerializer template argument
+
+    This serializer ignores the template arguments and uses ADL
+    ([argument-dependent lookup](https://en.cppreference.com/w/cpp/language/adl))
+    for serialization.
+    */
+    template<typename T = void, typename SFINAE = void>
+    struct adl_serializer;
+
+    /// a class to store JSON values
+    /// @sa https://json.nlohmann.me/api/basic_json/
+    template<template<typename U, typename V, typename... Args> class ObjectType =
+    std::map,
+    template<typename U, typename... Args> class ArrayType = std::vector,
+    class StringType = std::string, class BooleanType = bool,
+    class NumberIntegerType = std::int64_t,
+    class NumberUnsignedType = std::uint64_t,
+    class NumberFloatType = double,
+    template<typename U> class AllocatorType = std::allocator,
+    template<typename T, typename SFINAE = void> class JSONSerializer =
+    adl_serializer,
+    class BinaryType = std::vector<std::uint8_t>, // cppcheck-suppress syntaxError
+    class CustomBaseClass = void>
+    class basic_json;
+
+    /// @brief JSON Pointer defines a string syntax for identifying a specific value within a JSON document
+    /// @sa https://json.nlohmann.me/api/json_pointer/
+    template<typename RefStringType>
+    class json_pointer;
+
+    /*!
+    @brief default specialization
+    @sa https://json.nlohmann.me/api/json/
+    */
+    using json = basic_json<>;
+
+    /// @brief a minimal map-like container that preserves insertion order
+    /// @sa https://json.nlohmann.me/api/ordered_map/
+    template<class Key, class T, class IgnoredLess, class Allocator>
+    struct ordered_map;
+
+    /// @brief specialization that maintains the insertion order of object keys
+    /// @sa https://json.nlohmann.me/api/ordered_json/
+    using ordered_json = basic_json<nlohmann::ordered_map>;
+
+    NLOHMANN_JSON_NAMESPACE_END
+
+#endif  // INCLUDE_NLOHMANN_JSON_FWD_HPP_
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+/*!
+@brief detail namespace with internal helper functions
+
+This namespace collects functions that should not be exposed,
+implementations of some @ref basic_json methods, and meta-programming helpers.
+
+@since version 2.1.0
+*/
+namespace detail
+{
+
+/////////////
+// helpers //
+/////////////
+
+// Note to maintainers:
+//
+// Every trait in this file expects a non CV-qualified type.
+// The only exceptions are in the 'aliases for detected' section
+// (i.e. those of the form: decltype(T::member_function(std::declval<T>())))
+//
+// In this case, T has to be properly CV-qualified to constraint the function arguments
+// (e.g. to_json(BasicJsonType&, const T&))
+
+template<typename> struct is_basic_json : std::false_type {};
+
+NLOHMANN_BASIC_JSON_TPL_DECLARATION
+struct is_basic_json<NLOHMANN_BASIC_JSON_TPL> : std::true_type {};
+
+// used by exceptions create() member functions
+// true_type for pointer to possibly cv-qualified basic_json or std::nullptr_t
+// false_type otherwise
+template<typename BasicJsonContext>
+struct is_basic_json_context :
+    std::integral_constant < bool,
+    is_basic_json<typename std::remove_cv<typename std::remove_pointer<BasicJsonContext>::type>::type>::value
+    || std::is_same<BasicJsonContext, std::nullptr_t>::value >
+{};
+
+//////////////////////
+// json_ref helpers //
+//////////////////////
+
+template<typename>
+class json_ref;
+
+template<typename>
+struct is_json_ref : std::false_type {};
+
+template<typename T>
+struct is_json_ref<json_ref<T>> : std::true_type {};
+
+//////////////////////////
+// aliases for detected //
+//////////////////////////
+
+template<typename T>
+using mapped_type_t = typename T::mapped_type;
+
+template<typename T>
+using key_type_t = typename T::key_type;
+
+template<typename T>
+using value_type_t = typename T::value_type;
+
+template<typename T>
+using difference_type_t = typename T::difference_type;
+
+template<typename T>
+using pointer_t = typename T::pointer;
+
+template<typename T>
+using reference_t = typename T::reference;
+
+template<typename T>
+using iterator_category_t = typename T::iterator_category;
+
+template<typename T, typename... Args>
+using to_json_function = decltype(T::to_json(std::declval<Args>()...));
+
+template<typename T, typename... Args>
+using from_json_function = decltype(T::from_json(std::declval<Args>()...));
+
+template<typename T, typename U>
+using get_template_function = decltype(std::declval<T>().template get<U>());
+
+// trait checking if JSONSerializer<T>::from_json(json const&, udt&) exists
+template<typename BasicJsonType, typename T, typename = void>
+struct has_from_json : std::false_type {};
+
+// trait checking if j.get<T> is valid
+// use this trait instead of std::is_constructible or std::is_convertible,
+// both rely on, or make use of implicit conversions, and thus fail when T
+// has several constructors/operator= (see https://github.com/nlohmann/json/issues/958)
+template <typename BasicJsonType, typename T>
+struct is_getable
+{
+    static constexpr bool value = is_detected<get_template_function, const BasicJsonType&, T>::value;
+};
+
+template<typename BasicJsonType, typename T>
+struct has_from_json < BasicJsonType, T, enable_if_t < !is_basic_json<T>::value >>
+{
+    using serializer = typename BasicJsonType::template json_serializer<T, void>;
+
+    static constexpr bool value =
+        is_detected_exact<void, from_json_function, serializer,
+        const BasicJsonType&, T&>::value;
+};
+
+// This trait checks if JSONSerializer<T>::from_json(json const&) exists
+// this overload is used for non-default-constructible user-defined-types
+template<typename BasicJsonType, typename T, typename = void>
+struct has_non_default_from_json : std::false_type {};
+
+template<typename BasicJsonType, typename T>
+struct has_non_default_from_json < BasicJsonType, T, enable_if_t < !is_basic_json<T>::value >>
+{
+    using serializer = typename BasicJsonType::template json_serializer<T, void>;
+
+    static constexpr bool value =
+        is_detected_exact<T, from_json_function, serializer,
+        const BasicJsonType&>::value;
+};
+
+// This trait checks if BasicJsonType::json_serializer<T>::to_json exists
+// Do not evaluate the trait when T is a basic_json type, to avoid template instantiation infinite recursion.
+template<typename BasicJsonType, typename T, typename = void>
+struct has_to_json : std::false_type {};
+
+template<typename BasicJsonType, typename T>
+struct has_to_json < BasicJsonType, T, enable_if_t < !is_basic_json<T>::value >>
+{
+    using serializer = typename BasicJsonType::template json_serializer<T, void>;
+
+    static constexpr bool value =
+        is_detected_exact<void, to_json_function, serializer, BasicJsonType&,
+        T>::value;
+};
+
+template<typename T>
+using detect_key_compare = typename T::key_compare;
+
+template<typename T>
+struct has_key_compare : std::integral_constant<bool, is_detected<detect_key_compare, T>::value> {};
+
+// obtains the actual object key comparator
+template<typename BasicJsonType>
+struct actual_object_comparator
+{
+    using object_t = typename BasicJsonType::object_t;
+    using object_comparator_t = typename BasicJsonType::default_object_comparator_t;
+    using type = typename std::conditional < has_key_compare<object_t>::value,
+          typename object_t::key_compare, object_comparator_t>::type;
+};
+
+template<typename BasicJsonType>
+using actual_object_comparator_t = typename actual_object_comparator<BasicJsonType>::type;
+
+/////////////////
+// char_traits //
+/////////////////
+
+// Primary template of char_traits calls std char_traits
+template<typename T>
+struct char_traits : std::char_traits<T>
+{};
+
+// Explicitly define char traits for unsigned char since it is not standard
+template<>
+struct char_traits<unsigned char> : std::char_traits<char>
+{
+    using char_type = unsigned char;
+    using int_type = uint64_t;
+
+    // Redefine to_int_type function
+    static int_type to_int_type(char_type c) noexcept
+    {
+        return static_cast<int_type>(c);
+    }
+
+    static char_type to_char_type(int_type i) noexcept
+    {
+        return static_cast<char_type>(i);
+    }
+
+    static constexpr int_type eof() noexcept
+    {
+        return static_cast<int_type>(std::char_traits<char>::eof());
+    }
+};
+
+// Explicitly define char traits for signed char since it is not standard
+template<>
+struct char_traits<signed char> : std::char_traits<char>
+{
+    using char_type = signed char;
+    using int_type = uint64_t;
+
+    // Redefine to_int_type function
+    static int_type to_int_type(char_type c) noexcept
+    {
+        return static_cast<int_type>(c);
+    }
+
+    static char_type to_char_type(int_type i) noexcept
+    {
+        return static_cast<char_type>(i);
+    }
+
+    static constexpr int_type eof() noexcept
+    {
+        return static_cast<int_type>(std::char_traits<char>::eof());
+    }
+};
+
+///////////////////
+// is_ functions //
+///////////////////
+
+// https://en.cppreference.com/w/cpp/types/conjunction
+template<class...> struct conjunction : std::true_type { };
+template<class B> struct conjunction<B> : B { };
+template<class B, class... Bn>
+struct conjunction<B, Bn...>
+: std::conditional<static_cast<bool>(B::value), conjunction<Bn...>, B>::type {};
+
+// https://en.cppreference.com/w/cpp/types/negation
+template<class B> struct negation : std::integral_constant < bool, !B::value > { };
+
+// Reimplementation of is_constructible and is_default_constructible, due to them being broken for
+// std::pair and std::tuple until LWG 2367 fix (see https://cplusplus.github.io/LWG/lwg-defects.html#2367).
+// This causes compile errors in e.g. clang 3.5 or gcc 4.9.
+template <typename T>
+struct is_default_constructible : std::is_default_constructible<T> {};
+
+template <typename T1, typename T2>
+struct is_default_constructible<std::pair<T1, T2>>
+    : conjunction<is_default_constructible<T1>, is_default_constructible<T2>> {};
+
+template <typename T1, typename T2>
+struct is_default_constructible<const std::pair<T1, T2>>
+    : conjunction<is_default_constructible<T1>, is_default_constructible<T2>> {};
+
+template <typename... Ts>
+struct is_default_constructible<std::tuple<Ts...>>
+    : conjunction<is_default_constructible<Ts>...> {};
+
+template <typename... Ts>
+struct is_default_constructible<const std::tuple<Ts...>>
+    : conjunction<is_default_constructible<Ts>...> {};
+
+template <typename T, typename... Args>
+struct is_constructible : std::is_constructible<T, Args...> {};
+
+template <typename T1, typename T2>
+struct is_constructible<std::pair<T1, T2>> : is_default_constructible<std::pair<T1, T2>> {};
+
+template <typename T1, typename T2>
+struct is_constructible<const std::pair<T1, T2>> : is_default_constructible<const std::pair<T1, T2>> {};
+
+template <typename... Ts>
+struct is_constructible<std::tuple<Ts...>> : is_default_constructible<std::tuple<Ts...>> {};
+
+template <typename... Ts>
+struct is_constructible<const std::tuple<Ts...>> : is_default_constructible<const std::tuple<Ts...>> {};
+
+template<typename T, typename = void>
+struct is_iterator_traits : std::false_type {};
+
+template<typename T>
+struct is_iterator_traits<iterator_traits<T>>
+{
+  private:
+    using traits = iterator_traits<T>;
+
+  public:
+    static constexpr auto value =
+        is_detected<value_type_t, traits>::value &&
+        is_detected<difference_type_t, traits>::value &&
+        is_detected<pointer_t, traits>::value &&
+        is_detected<iterator_category_t, traits>::value &&
+        is_detected<reference_t, traits>::value;
+};
+
+template<typename T>
+struct is_range
+{
+  private:
+    using t_ref = typename std::add_lvalue_reference<T>::type;
+
+    using iterator = detected_t<result_of_begin, t_ref>;
+    using sentinel = detected_t<result_of_end, t_ref>;
+
+    // to be 100% correct, it should use https://en.cppreference.com/w/cpp/iterator/input_or_output_iterator
+    // and https://en.cppreference.com/w/cpp/iterator/sentinel_for
+    // but reimplementing these would be too much work, as a lot of other concepts are used underneath
+    static constexpr auto is_iterator_begin =
+        is_iterator_traits<iterator_traits<iterator>>::value;
+
+  public:
+    static constexpr bool value = !std::is_same<iterator, nonesuch>::value && !std::is_same<sentinel, nonesuch>::value && is_iterator_begin;
+};
+
+template<typename R>
+using iterator_t = enable_if_t<is_range<R>::value, result_of_begin<decltype(std::declval<R&>())>>;
+
+template<typename T>
+using range_value_t = value_type_t<iterator_traits<iterator_t<T>>>;
+
+// The following implementation of is_complete_type is taken from
+// https://blogs.msdn.microsoft.com/vcblog/2015/12/02/partial-support-for-expression-sfinae-in-vs-2015-update-1/
+// and is written by Xiang Fan who agreed to using it in this library.
+
+template<typename T, typename = void>
+struct is_complete_type : std::false_type {};
+
+template<typename T>
+struct is_complete_type<T, decltype(void(sizeof(T)))> : std::true_type {};
+
+template<typename BasicJsonType, typename CompatibleObjectType,
+         typename = void>
+struct is_compatible_object_type_impl : std::false_type {};
+
+template<typename BasicJsonType, typename CompatibleObjectType>
+struct is_compatible_object_type_impl <
+    BasicJsonType, CompatibleObjectType,
+    enable_if_t < is_detected<mapped_type_t, CompatibleObjectType>::value&&
+    is_detected<key_type_t, CompatibleObjectType>::value >>
+{
+    using object_t = typename BasicJsonType::object_t;
+
+    // macOS's is_constructible does not play well with nonesuch...
+    static constexpr bool value =
+        is_constructible<typename object_t::key_type,
+        typename CompatibleObjectType::key_type>::value &&
+        is_constructible<typename object_t::mapped_type,
+        typename CompatibleObjectType::mapped_type>::value;
+};
+
+template<typename BasicJsonType, typename CompatibleObjectType>
+struct is_compatible_object_type
+    : is_compatible_object_type_impl<BasicJsonType, CompatibleObjectType> {};
+
+template<typename BasicJsonType, typename ConstructibleObjectType,
+         typename = void>
+struct is_constructible_object_type_impl : std::false_type {};
+
+template<typename BasicJsonType, typename ConstructibleObjectType>
+struct is_constructible_object_type_impl <
+    BasicJsonType, ConstructibleObjectType,
+    enable_if_t < is_detected<mapped_type_t, ConstructibleObjectType>::value&&
+    is_detected<key_type_t, ConstructibleObjectType>::value >>
+{
+    using object_t = typename BasicJsonType::object_t;
+
+    static constexpr bool value =
+        (is_default_constructible<ConstructibleObjectType>::value &&
+         (std::is_move_assignable<ConstructibleObjectType>::value ||
+          std::is_copy_assignable<ConstructibleObjectType>::value) &&
+         (is_constructible<typename ConstructibleObjectType::key_type,
+          typename object_t::key_type>::value &&
+          std::is_same <
+          typename object_t::mapped_type,
+          typename ConstructibleObjectType::mapped_type >::value)) ||
+        (has_from_json<BasicJsonType,
+         typename ConstructibleObjectType::mapped_type>::value ||
+         has_non_default_from_json <
+         BasicJsonType,
+         typename ConstructibleObjectType::mapped_type >::value);
+};
+
+template<typename BasicJsonType, typename ConstructibleObjectType>
+struct is_constructible_object_type
+    : is_constructible_object_type_impl<BasicJsonType,
+      ConstructibleObjectType> {};
+
+template<typename BasicJsonType, typename CompatibleStringType>
+struct is_compatible_string_type
+{
+    static constexpr auto value =
+        is_constructible<typename BasicJsonType::string_t, CompatibleStringType>::value;
+};
+
+template<typename BasicJsonType, typename ConstructibleStringType>
+struct is_constructible_string_type
+{
+    // launder type through decltype() to fix compilation failure on ICPC
+#ifdef __INTEL_COMPILER
+    using laundered_type = decltype(std::declval<ConstructibleStringType>());
+#else
+    using laundered_type = ConstructibleStringType;
+#endif
+
+    static constexpr auto value =
+        conjunction <
+        is_constructible<laundered_type, typename BasicJsonType::string_t>,
+        is_detected_exact<typename BasicJsonType::string_t::value_type,
+        value_type_t, laundered_type >>::value;
+};
+
+template<typename BasicJsonType, typename CompatibleArrayType, typename = void>
+struct is_compatible_array_type_impl : std::false_type {};
+
+template<typename BasicJsonType, typename CompatibleArrayType>
+struct is_compatible_array_type_impl <
+    BasicJsonType, CompatibleArrayType,
+    enable_if_t <
+    is_detected<iterator_t, CompatibleArrayType>::value&&
+    is_iterator_traits<iterator_traits<detected_t<iterator_t, CompatibleArrayType>>>::value&&
+// special case for types like std::filesystem::path whose iterator's value_type are themselves
+// c.f. https://github.com/nlohmann/json/pull/3073
+    !std::is_same<CompatibleArrayType, detected_t<range_value_t, CompatibleArrayType>>::value >>
+{
+    static constexpr bool value =
+        is_constructible<BasicJsonType,
+        range_value_t<CompatibleArrayType>>::value;
+};
+
+template<typename BasicJsonType, typename CompatibleArrayType>
+struct is_compatible_array_type
+    : is_compatible_array_type_impl<BasicJsonType, CompatibleArrayType> {};
+
+template<typename BasicJsonType, typename ConstructibleArrayType, typename = void>
+struct is_constructible_array_type_impl : std::false_type {};
+
+template<typename BasicJsonType, typename ConstructibleArrayType>
+struct is_constructible_array_type_impl <
+    BasicJsonType, ConstructibleArrayType,
+    enable_if_t<std::is_same<ConstructibleArrayType,
+    typename BasicJsonType::value_type>::value >>
+            : std::true_type {};
+
+template<typename BasicJsonType, typename ConstructibleArrayType>
+struct is_constructible_array_type_impl <
+    BasicJsonType, ConstructibleArrayType,
+    enable_if_t < !std::is_same<ConstructibleArrayType,
+    typename BasicJsonType::value_type>::value&&
+    !is_compatible_string_type<BasicJsonType, ConstructibleArrayType>::value&&
+    is_default_constructible<ConstructibleArrayType>::value&&
+(std::is_move_assignable<ConstructibleArrayType>::value ||
+ std::is_copy_assignable<ConstructibleArrayType>::value)&&
+is_detected<iterator_t, ConstructibleArrayType>::value&&
+is_iterator_traits<iterator_traits<detected_t<iterator_t, ConstructibleArrayType>>>::value&&
+is_detected<range_value_t, ConstructibleArrayType>::value&&
+// special case for types like std::filesystem::path whose iterator's value_type are themselves
+// c.f. https://github.com/nlohmann/json/pull/3073
+!std::is_same<ConstructibleArrayType, detected_t<range_value_t, ConstructibleArrayType>>::value&&
+is_complete_type <
+detected_t<range_value_t, ConstructibleArrayType >>::value >>
+{
+    using value_type = range_value_t<ConstructibleArrayType>;
+
+    static constexpr bool value =
+        std::is_same<value_type,
+        typename BasicJsonType::array_t::value_type>::value ||
+        has_from_json<BasicJsonType,
+        value_type>::value ||
+        has_non_default_from_json <
+        BasicJsonType,
+        value_type >::value;
+};
+
+template<typename BasicJsonType, typename ConstructibleArrayType>
+struct is_constructible_array_type
+    : is_constructible_array_type_impl<BasicJsonType, ConstructibleArrayType> {};
+
+template<typename RealIntegerType, typename CompatibleNumberIntegerType,
+         typename = void>
+struct is_compatible_integer_type_impl : std::false_type {};
+
+template<typename RealIntegerType, typename CompatibleNumberIntegerType>
+struct is_compatible_integer_type_impl <
+    RealIntegerType, CompatibleNumberIntegerType,
+    enable_if_t < std::is_integral<RealIntegerType>::value&&
+    std::is_integral<CompatibleNumberIntegerType>::value&&
+    !std::is_same<bool, CompatibleNumberIntegerType>::value >>
+{
+    // is there an assert somewhere on overflows?
+    using RealLimits = std::numeric_limits<RealIntegerType>;
+    using CompatibleLimits = std::numeric_limits<CompatibleNumberIntegerType>;
+
+    static constexpr auto value =
+        is_constructible<RealIntegerType,
+        CompatibleNumberIntegerType>::value &&
+        CompatibleLimits::is_integer &&
+        RealLimits::is_signed == CompatibleLimits::is_signed;
+};
+
+template<typename RealIntegerType, typename CompatibleNumberIntegerType>
+struct is_compatible_integer_type
+    : is_compatible_integer_type_impl<RealIntegerType,
+      CompatibleNumberIntegerType> {};
+
+template<typename BasicJsonType, typename CompatibleType, typename = void>
+struct is_compatible_type_impl: std::false_type {};
+
+template<typename BasicJsonType, typename CompatibleType>
+struct is_compatible_type_impl <
+    BasicJsonType, CompatibleType,
+    enable_if_t<is_complete_type<CompatibleType>::value >>
+{
+    static constexpr bool value =
+        has_to_json<BasicJsonType, CompatibleType>::value;
+};
+
+template<typename BasicJsonType, typename CompatibleType>
+struct is_compatible_type
+    : is_compatible_type_impl<BasicJsonType, CompatibleType> {};
+
+template<typename T1, typename T2>
+struct is_constructible_tuple : std::false_type {};
+
+template<typename T1, typename... Args>
+struct is_constructible_tuple<T1, std::tuple<Args...>> : conjunction<is_constructible<T1, Args>...> {};
+
+template<typename BasicJsonType, typename T>
+struct is_json_iterator_of : std::false_type {};
+
+template<typename BasicJsonType>
+struct is_json_iterator_of<BasicJsonType, typename BasicJsonType::iterator> : std::true_type {};
+
+template<typename BasicJsonType>
+struct is_json_iterator_of<BasicJsonType, typename BasicJsonType::const_iterator> : std::true_type
+{};
+
+// checks if a given type T is a template specialization of Primary
+template<template <typename...> class Primary, typename T>
+struct is_specialization_of : std::false_type {};
+
+template<template <typename...> class Primary, typename... Args>
+struct is_specialization_of<Primary, Primary<Args...>> : std::true_type {};
+
+template<typename T>
+using is_json_pointer = is_specialization_of<::nlohmann::json_pointer, uncvref_t<T>>;
+
+// checks if A and B are comparable using Compare functor
+template<typename Compare, typename A, typename B, typename = void>
+struct is_comparable : std::false_type {};
+
+template<typename Compare, typename A, typename B>
+struct is_comparable<Compare, A, B, void_t<
+decltype(std::declval<Compare>()(std::declval<A>(), std::declval<B>())),
+decltype(std::declval<Compare>()(std::declval<B>(), std::declval<A>()))
+>> : std::true_type {};
+
+template<typename T>
+using detect_is_transparent = typename T::is_transparent;
+
+// type trait to check if KeyType can be used as object key (without a BasicJsonType)
+// see is_usable_as_basic_json_key_type below
+template<typename Comparator, typename ObjectKeyType, typename KeyTypeCVRef, bool RequireTransparentComparator = true,
+         bool ExcludeObjectKeyType = RequireTransparentComparator, typename KeyType = uncvref_t<KeyTypeCVRef>>
+using is_usable_as_key_type = typename std::conditional <
+                              is_comparable<Comparator, ObjectKeyType, KeyTypeCVRef>::value
+                              && !(ExcludeObjectKeyType && std::is_same<KeyType,
+                                   ObjectKeyType>::value)
+                              && (!RequireTransparentComparator
+                                  || is_detected <detect_is_transparent, Comparator>::value)
+                              && !is_json_pointer<KeyType>::value,
+                              std::true_type,
+                              std::false_type >::type;
+
+// type trait to check if KeyType can be used as object key
+// true if:
+//   - KeyType is comparable with BasicJsonType::object_t::key_type
+//   - if ExcludeObjectKeyType is true, KeyType is not BasicJsonType::object_t::key_type
+//   - the comparator is transparent or RequireTransparentComparator is false
+//   - KeyType is not a JSON iterator or json_pointer
+template<typename BasicJsonType, typename KeyTypeCVRef, bool RequireTransparentComparator = true,
+         bool ExcludeObjectKeyType = RequireTransparentComparator, typename KeyType = uncvref_t<KeyTypeCVRef>>
+using is_usable_as_basic_json_key_type = typename std::conditional <
+    is_usable_as_key_type<typename BasicJsonType::object_comparator_t,
+    typename BasicJsonType::object_t::key_type, KeyTypeCVRef,
+    RequireTransparentComparator, ExcludeObjectKeyType>::value
+    && !is_json_iterator_of<BasicJsonType, KeyType>::value,
+    std::true_type,
+    std::false_type >::type;
+
+template<typename ObjectType, typename KeyType>
+using detect_erase_with_key_type = decltype(std::declval<ObjectType&>().erase(std::declval<KeyType>()));
+
+// type trait to check if object_t has an erase() member functions accepting KeyType
+template<typename BasicJsonType, typename KeyType>
+using has_erase_with_key_type = typename std::conditional <
+                                is_detected <
+                                detect_erase_with_key_type,
+                                typename BasicJsonType::object_t, KeyType >::value,
+                                std::true_type,
+                                std::false_type >::type;
+
+// a naive helper to check if a type is an ordered_map (exploits the fact that
+// ordered_map inherits capacity() from std::vector)
+template <typename T>
+struct is_ordered_map
+{
+    using one = char;
+
+    struct two
+    {
+        char x[2]; // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
+    };
+
+    template <typename C> static one test( decltype(&C::capacity) ) ;
+    template <typename C> static two test(...);
+
+    enum { value = sizeof(test<T>(nullptr)) == sizeof(char) }; // NOLINT(cppcoreguidelines-pro-type-vararg,hicpp-vararg)
+};
+
+// to avoid useless casts (see https://github.com/nlohmann/json/issues/2893#issuecomment-889152324)
+template < typename T, typename U, enable_if_t < !std::is_same<T, U>::value, int > = 0 >
+T conditional_static_cast(U value)
+{
+    return static_cast<T>(value);
+}
+
+template<typename T, typename U, enable_if_t<std::is_same<T, U>::value, int> = 0>
+T conditional_static_cast(U value)
+{
+    return value;
+}
+
+template<typename... Types>
+using all_integral = conjunction<std::is_integral<Types>...>;
+
+template<typename... Types>
+using all_signed = conjunction<std::is_signed<Types>...>;
+
+template<typename... Types>
+using all_unsigned = conjunction<std::is_unsigned<Types>...>;
+
+// there's a disjunction trait in another PR; replace when merged
+template<typename... Types>
+using same_sign = std::integral_constant < bool,
+      all_signed<Types...>::value || all_unsigned<Types...>::value >;
+
+template<typename OfType, typename T>
+using never_out_of_range = std::integral_constant < bool,
+      (std::is_signed<OfType>::value && (sizeof(T) < sizeof(OfType)))
+      || (same_sign<OfType, T>::value && sizeof(OfType) == sizeof(T)) >;
+
+template<typename OfType, typename T,
+         bool OfTypeSigned = std::is_signed<OfType>::value,
+         bool TSigned = std::is_signed<T>::value>
+struct value_in_range_of_impl2;
+
+template<typename OfType, typename T>
+struct value_in_range_of_impl2<OfType, T, false, false>
+{
+    static constexpr bool test(T val)
+    {
+        using CommonType = typename std::common_type<OfType, T>::type;
+        return static_cast<CommonType>(val) <= static_cast<CommonType>((std::numeric_limits<OfType>::max)());
+    }
+};
+
+template<typename OfType, typename T>
+struct value_in_range_of_impl2<OfType, T, true, false>
+{
+    static constexpr bool test(T val)
+    {
+        using CommonType = typename std::common_type<OfType, T>::type;
+        return static_cast<CommonType>(val) <= static_cast<CommonType>((std::numeric_limits<OfType>::max)());
+    }
+};
+
+template<typename OfType, typename T>
+struct value_in_range_of_impl2<OfType, T, false, true>
+{
+    static constexpr bool test(T val)
+    {
+        using CommonType = typename std::common_type<OfType, T>::type;
+        return val >= 0 && static_cast<CommonType>(val) <= static_cast<CommonType>((std::numeric_limits<OfType>::max)());
+    }
+};
+
+template<typename OfType, typename T>
+struct value_in_range_of_impl2<OfType, T, true, true>
+{
+    static constexpr bool test(T val)
+    {
+        using CommonType = typename std::common_type<OfType, T>::type;
+        return static_cast<CommonType>(val) >= static_cast<CommonType>((std::numeric_limits<OfType>::min)())
+               && static_cast<CommonType>(val) <= static_cast<CommonType>((std::numeric_limits<OfType>::max)());
+    }
+};
+
+template<typename OfType, typename T,
+         bool NeverOutOfRange = never_out_of_range<OfType, T>::value,
+         typename = detail::enable_if_t<all_integral<OfType, T>::value>>
+struct value_in_range_of_impl1;
+
+template<typename OfType, typename T>
+struct value_in_range_of_impl1<OfType, T, false>
+{
+    static constexpr bool test(T val)
+    {
+        return value_in_range_of_impl2<OfType, T>::test(val);
+    }
+};
+
+template<typename OfType, typename T>
+struct value_in_range_of_impl1<OfType, T, true>
+{
+    static constexpr bool test(T /*val*/)
+    {
+        return true;
+    }
+};
+
+template<typename OfType, typename T>
+constexpr bool value_in_range_of(T val)
+{
+    return value_in_range_of_impl1<OfType, T>::test(val);
+}
+
+template<bool Value>
+using bool_constant = std::integral_constant<bool, Value>;
+
+///////////////////////////////////////////////////////////////////////////////
+// is_c_string
+///////////////////////////////////////////////////////////////////////////////
+
+namespace impl
+{
+
+template<typename T>
+constexpr bool is_c_string()
+{
+    using TUnExt = typename std::remove_extent<T>::type;
+    using TUnCVExt = typename std::remove_cv<TUnExt>::type;
+    using TUnPtr = typename std::remove_pointer<T>::type;
+    using TUnCVPtr = typename std::remove_cv<TUnPtr>::type;
+    return
+        (std::is_array<T>::value && std::is_same<TUnCVExt, char>::value)
+        || (std::is_pointer<T>::value && std::is_same<TUnCVPtr, char>::value);
+}
+
+}  // namespace impl
+
+// checks whether T is a [cv] char */[cv] char[] C string
+template<typename T>
+struct is_c_string : bool_constant<impl::is_c_string<T>()> {};
+
+template<typename T>
+using is_c_string_uncvref = is_c_string<uncvref_t<T>>;
+
+///////////////////////////////////////////////////////////////////////////////
+// is_transparent
+///////////////////////////////////////////////////////////////////////////////
+
+namespace impl
+{
+
+template<typename T>
+constexpr bool is_transparent()
+{
+    return is_detected<detect_is_transparent, T>::value;
+}
+
+}  // namespace impl
+
+// checks whether T has a member named is_transparent
+template<typename T>
+struct is_transparent : bool_constant<impl::is_transparent<T>()> {};
+
+///////////////////////////////////////////////////////////////////////////////
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/string_concat.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013 - 2025 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <cstring> // strlen
+#include <string> // string
+#include <utility> // forward
+
+// #include <nlohmann/detail/meta/cpp_future.hpp>
+
+// #include <nlohmann/detail/meta/detected.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+inline std::size_t concat_length()
+{
+    return 0;
+}
+
+template<typename... Args>
+inline std::size_t concat_length(const char* cstr, const Args& ... rest);
+
+template<typename StringType, typename... Args>
+inline std::size_t concat_length(const StringType& str, const Args& ... rest);
+
+template<typename... Args>
+inline std::size_t concat_length(const char /*c*/, const Args& ... rest)
+{
+    return 1 + concat_length(rest...);
+}
+
+template<typename... Args>
+inline std::size_t concat_length(const char* cstr, const Args& ... rest)
+{
+    // cppcheck-suppress ignoredReturnValue
+    return ::strlen(cstr) + concat_length(rest...);
+}
+
+template<typename StringType, typename... Args>
+inline std::size_t concat_length(const StringType& str, const Args& ... rest)
+{
+    return str.size() + concat_length(rest...);
+}
+
+template<typename OutStringType>
+inline void concat_into(OutStringType& /*out*/)
+{}
+
+template<typename StringType, typename Arg>
+using string_can_append = decltype(std::declval<StringType&>().append(std::declval < Arg && > ()));
+
+template<typename StringType, typename Arg>
+using detect_string_can_append = is_detected<string_can_append, StringType, Arg>;
+
+template<typename StringType, typename Arg>
+using string_can_append_op = decltype(std::declval<StringType&>() += std::declval < Arg && > ());
+
+template<typename StringType, typename Arg>
+using detect_string_can_append_op = is_detected<string_can_append_op, StringType, Arg>;
+
+template<typename StringType, typename Arg>
+using string_can_append_iter = decltype(std::declval<StringType&>().append(std::declval<const Arg&>().begin(), std::declval<const Arg&>().end()));
+
+template<typename StringType, typename Arg>
+using detect_string_can_append_iter = is_detected<string_can_append_iter, StringType, Arg>;
+
+template<typename StringType, typename Arg>
+using string_can_append_data = decltype(std::declval<StringType&>().append(std::declval<const Arg&>().data(), std::declval<const Arg&>().size()));
+
+template<typename StringType, typename Arg>
+using detect_string_can_append_data = is_detected<string_can_append_data, StringType, Arg>;
+
+template < typename OutStringType, typename Arg, typename... Args,
+           enable_if_t < !detect_string_can_append<OutStringType, Arg>::value
+                         && detect_string_can_append_op<OutStringType, Arg>::value, int > = 0 >
+inline void concat_into(OutStringType& out, Arg && arg, Args && ... rest);
+
+template < typename OutStringType, typename Arg, typename... Args,
+           enable_if_t < !detect_string_can_append<OutStringType, Arg>::value
+                         && !detect_string_can_append_op<OutStringType, Arg>::value
+                         && detect_string_can_append_iter<OutStringType, Arg>::value, int > = 0 >
+inline void concat_into(OutStringType& out, const Arg& arg, Args && ... rest);
+
+template < typename OutStringType, typename Arg, typename... Args,
+           enable_if_t < !detect_string_can_append<OutStringType, Arg>::value
+                         && !detect_string_can_append_op<OutStringType, Arg>::value
+                         && !detect_string_can_append_iter<OutStringType, Arg>::value
+                         && detect_string_can_append_data<OutStringType, Arg>::value, int > = 0 >
+inline void concat_into(OutStringType& out, const Arg& arg, Args && ... rest);
+
+template<typename OutStringType, typename Arg, typename... Args,
+         enable_if_t<detect_string_can_append<OutStringType, Arg>::value, int> = 0>
+inline void concat_into(OutStringType& out, Arg && arg, Args && ... rest)
+{
+    out.append(std::forward<Arg>(arg));
+    concat_into(out, std::forward<Args>(rest)...);
+}
+
+template < typename OutStringType, typename Arg, typename... Args,
+           enable_if_t < !detect_string_can_append<OutStringType, Arg>::value
+                         && detect_string_can_append_op<OutStringType, Arg>::value, int > >
+inline void concat_into(OutStringType& out, Arg&& arg, Args&& ... rest)
+{
+    out += std::forward<Arg>(arg);
+    concat_into(out, std::forward<Args>(rest)...);
+}
+
+template < typename OutStringType, typename Arg, typename... Args,
+           enable_if_t < !detect_string_can_append<OutStringType, Arg>::value
+                         && !detect_string_can_append_op<OutStringType, Arg>::value
+                         && detect_string_can_append_iter<OutStringType, Arg>::value, int > >
+inline void concat_into(OutStringType& out, const Arg& arg, Args&& ... rest)
+{
+    out.append(arg.begin(), arg.end());
+    concat_into(out, std::forward<Args>(rest)...);
+}
+
+template < typename OutStringType, typename Arg, typename... Args,
+           enable_if_t < !detect_string_can_append<OutStringType, Arg>::value
+                         && !detect_string_can_append_op<OutStringType, Arg>::value
+                         && !detect_string_can_append_iter<OutStringType, Arg>::value
+                         && detect_string_can_append_data<OutStringType, Arg>::value, int > >
+inline void concat_into(OutStringType& out, const Arg& arg, Args&& ... rest)
+{
+    out.append(arg.data(), arg.size());
+    concat_into(out, std::forward<Args>(rest)...);
+}
+
+template<typename OutStringType = std::string, typename... Args>
+inline OutStringType concat(Args && ... args)
+{
+    OutStringType str;
+    str.reserve(concat_length(args...));
+    concat_into(str, std::forward<Args>(args)...);
+    return str;
+}
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+
+// With -Wweak-vtables, Clang will complain about the exception classes as they
+// have no out-of-line virtual method definitions and their vtable will be
+// emitted in every translation unit. This issue cannot be fixed with a
+// header-only library as there is no implementation file to move these
+// functions to. As a result, we suppress this warning here to avoid client
+// code to stumble over this. See https://github.com/nlohmann/json/issues/4087
+// for a discussion.
+#if defined(__clang__)
+    #pragma clang diagnostic push
+    #pragma clang diagnostic ignored "-Wweak-vtables"
+#endif
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+////////////////
+// exceptions //
+////////////////
+
+/// @brief general exception of the @ref basic_json class
+/// @sa https://json.nlohmann.me/api/basic_json/exception/
+class exception : public std::exception
+{
+  public:
+    /// returns the explanatory string
+    const char* what() const noexcept override
+    {
+        return m.what();
+    }
+
+    /// the id of the exception
+    const int id; // NOLINT(cppcoreguidelines-non-private-member-variables-in-classes)
+
+  protected:
+    JSON_HEDLEY_NON_NULL(3)
+    exception(int id_, const char* what_arg) : id(id_), m(what_arg) {} // NOLINT(bugprone-throw-keyword-missing)
+
+    static std::string name(const std::string& ename, int id_)
+    {
+        return concat("[json.exception.", ename, '.', std::to_string(id_), "] ");
+    }
+
+    static std::string diagnostics(std::nullptr_t /*leaf_element*/)
+    {
+        return "";
+    }
+
+    template<typename BasicJsonType>
+    static std::string diagnostics(const BasicJsonType* leaf_element)
+    {
+#if JSON_DIAGNOSTICS
+        std::vector<std::string> tokens;
+        for (const auto* current = leaf_element; current != nullptr && current->m_parent != nullptr; current = current->m_parent)
+        {
+            switch (current->m_parent->type())
+            {
+                case value_t::array:
+                {
+                    for (std::size_t i = 0; i < current->m_parent->m_data.m_value.array->size(); ++i)
+                    {
+                        if (&current->m_parent->m_data.m_value.array->operator[](i) == current)
+                        {
+                            tokens.emplace_back(std::to_string(i));
+                            break;
+                        }
+                    }
+                    break;
+                }
+
+                case value_t::object:
+                {
+                    for (const auto& element : *current->m_parent->m_data.m_value.object)
+                    {
+                        if (&element.second == current)
+                        {
+                            tokens.emplace_back(element.first.c_str());
+                            break;
+                        }
+                    }
+                    break;
+                }
+
+                case value_t::null: // LCOV_EXCL_LINE
+                case value_t::string: // LCOV_EXCL_LINE
+                case value_t::boolean: // LCOV_EXCL_LINE
+                case value_t::number_integer: // LCOV_EXCL_LINE
+                case value_t::number_unsigned: // LCOV_EXCL_LINE
+                case value_t::number_float: // LCOV_EXCL_LINE
+                case value_t::binary: // LCOV_EXCL_LINE
+                case value_t::discarded: // LCOV_EXCL_LINE
+                default:   // LCOV_EXCL_LINE
+                    break; // LCOV_EXCL_LINE
+            }
+        }
+
+        if (tokens.empty())
+        {
+            return "";
+        }
+
+        auto str = std::accumulate(tokens.rbegin(), tokens.rend(), std::string{},
+                                   [](const std::string & a, const std::string & b)
+        {
+            return concat(a, '/', detail::escape(b));
+        });
+
+        return concat('(', str, ") ", get_byte_positions(leaf_element));
+#else
+        return get_byte_positions(leaf_element);
+#endif
+    }
+
+  private:
+    /// an exception object as storage for error messages
+    std::runtime_error m;
+#if JSON_DIAGNOSTIC_POSITIONS
+    template<typename BasicJsonType>
+    static std::string get_byte_positions(const BasicJsonType* leaf_element)
+    {
+        if ((leaf_element->start_pos() != std::string::npos) && (leaf_element->end_pos() != std::string::npos))
+        {
+            return concat("(bytes ", std::to_string(leaf_element->start_pos()), "-", std::to_string(leaf_element->end_pos()), ") ");
+        }
+        return "";
+    }
+#else
+    template<typename BasicJsonType>
+    static std::string get_byte_positions(const BasicJsonType* leaf_element)
+    {
+        static_cast<void>(leaf_element);
+        return "";
+    }
+#endif
+};
+
+/// @brief exception indicating a parse error
+/// @sa https://json.nlohmann.me/api/basic_json/parse_error/
+class parse_error : public exception
+{
+  public:
+    /*!
+    @brief create a parse error exception
+    @param[in] id_       the id of the exception
+    @param[in] pos       the position where the error occurred (or with
+                         chars_read_total=0 if the position cannot be
+                         determined)
+    @param[in] what_arg  the explanatory string
+    @return parse_error object
+    */
+    template<typename BasicJsonContext, enable_if_t<is_basic_json_context<BasicJsonContext>::value, int> = 0>
+    static parse_error create(int id_, const position_t& pos, const std::string& what_arg, BasicJsonContext context)
+    {
+        const std::string w = concat(exception::name("parse_error", id_), "parse error",
+                                     position_string(pos), ": ", exception::diagnostics(context), what_arg);
+        return {id_, pos.chars_read_total, w.c_str()};
+    }
+
+    template<typename BasicJsonContext, enable_if_t<is_basic_json_context<BasicJsonContext>::value, int> = 0>
+    static parse_error create(int id_, std::size_t byte_, const std::string& what_arg, BasicJsonContext context)
+    {
+        const std::string w = concat(exception::name("parse_error", id_), "parse error",
+                                     (byte_ != 0 ? (concat(" at byte ", std::to_string(byte_))) : ""),
+                                     ": ", exception::diagnostics(context), what_arg);
+        return {id_, byte_, w.c_str()};
+    }
+
+    /*!
+    @brief byte index of the parse error
+
+    The byte index of the last read character in the input file.
+
+    @note For an input with n bytes, 1 is the index of the first character and
+          n+1 is the index of the terminating null byte or the end of file.
+          This also holds true when reading a byte vector (CBOR or MessagePack).
+    */
+    const std::size_t byte;
+
+  private:
+    parse_error(int id_, std::size_t byte_, const char* what_arg)
+        : exception(id_, what_arg), byte(byte_) {}
+
+    static std::string position_string(const position_t& pos)
+    {
+        return concat(" at line ", std::to_string(pos.lines_read + 1),
+                      ", column ", std::to_string(pos.chars_read_current_line));
+    }
+};
+
+/// @brief exception indicating errors with iterators
+/// @sa https://json.nlohmann.me/api/basic_json/invalid_iterator/
+class invalid_iterator : public exception
+{
+  public:
+    template<typename BasicJsonContext, enable_if_t<is_basic_json_context<BasicJsonContext>::value, int> = 0>
+    static invalid_iterator create(int id_, const std::string& what_arg, BasicJsonContext context)
+    {
+        const std::string w = concat(exception::name("invalid_iterator", id_), exception::diagnostics(context), what_arg);
+        return {id_, w.c_str()};
+    }
+
+  private:
+    JSON_HEDLEY_NON_NULL(3)
+    invalid_iterator(int id_, const char* what_arg)
+        : exception(id_, what_arg) {}
+};
+
+/// @brief exception indicating executing a member function with a wrong type
+/// @sa https://json.nlohmann.me/api/basic_json/type_error/
+class type_error : public exception
+{
+  public:
+    template<typename BasicJsonContext, enable_if_t<is_basic_json_context<BasicJsonContext>::value, int> = 0>
+    static type_error create(int id_, const std::string& what_arg, BasicJsonContext context)
+    {
+        const std::string w = concat(exception::name("type_error", id_), exception::diagnostics(context), what_arg);
+        return {id_, w.c_str()};
+    }
+
+  private:
+    JSON_HEDLEY_NON_NULL(3)
+    type_error(int id_, const char* what_arg) : exception(id_, what_arg) {}
+};
+
+/// @brief exception indicating access out of the defined range
+/// @sa https://json.nlohmann.me/api/basic_json/out_of_range/
+class out_of_range : public exception
+{
+  public:
+    template<typename BasicJsonContext, enable_if_t<is_basic_json_context<BasicJsonContext>::value, int> = 0>
+    static out_of_range create(int id_, const std::string& what_arg, BasicJsonContext context)
+    {
+        const std::string w = concat(exception::name("out_of_range", id_), exception::diagnostics(context), what_arg);
+        return {id_, w.c_str()};
+    }
+
+  private:
+    JSON_HEDLEY_NON_NULL(3)
+    out_of_range(int id_, const char* what_arg) : exception(id_, what_arg) {}
+};
+
+/// @brief exception indicating other library errors
+/// @sa https://json.nlohmann.me/api/basic_json/other_error/
+class other_error : public exception
+{
+  public:
+    template<typename BasicJsonContext, enable_if_t<is_basic_json_context<BasicJsonContext>::value, int> = 0>
+    static other_error create(int id_, const std::string& what_arg, BasicJsonContext context)
+    {
+        const std::string w = concat(exception::name("other_error", id_), exception::diagnostics(context), what_arg);
+        return {id_, w.c_str()};
+    }
+
+  private:
+    JSON_HEDLEY_NON_NULL(3)
+    other_error(int id_, const char* what_arg) : exception(id_, what_arg) {}
+};
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+#if defined(__clang__)
+    #pragma clang diagnostic pop
+#endif
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/meta/cpp_future.hpp>
+
+// #include <nlohmann/detail/meta/identity_tag.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013 - 2025 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+// #include <nlohmann/detail/abi_macros.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+// dispatching helper struct
+template <class T> struct identity_tag {};
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/meta/std_fs.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013 - 2025 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+
+#if JSON_HAS_EXPERIMENTAL_FILESYSTEM
+#include <experimental/filesystem>
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+namespace std_fs = std::experimental::filesystem;
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+#elif JSON_HAS_FILESYSTEM
+#include <filesystem> // NOLINT(build/c++17)
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+namespace std_fs = std::filesystem;
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+#endif
+
+// #include <nlohmann/detail/meta/type_traits.hpp>
+
+// #include <nlohmann/detail/string_concat.hpp>
+
+// #include <nlohmann/detail/value_t.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+template<typename BasicJsonType>
+inline void from_json(const BasicJsonType& j, typename std::nullptr_t& n)
+{
+    if (JSON_HEDLEY_UNLIKELY(!j.is_null()))
+    {
+        JSON_THROW(type_error::create(302, concat("type must be null, but is ", j.type_name()), &j));
+    }
+    n = nullptr;
+}
+
+#ifdef JSON_HAS_CPP_17
+#ifndef JSON_USE_IMPLICIT_CONVERSIONS
+template<typename BasicJsonType, typename T>
+void from_json(const BasicJsonType& j, std::optional<T>& opt)
+{
+    if (j.is_null())
+    {
+        opt = std::nullopt;
+    }
+    else
+    {
+        opt.emplace(j.template get<T>());
+    }
+}
+
+#endif // JSON_USE_IMPLICIT_CONVERSIONS
+#endif // JSON_HAS_CPP_17
+
+// overloads for basic_json template parameters
+template < typename BasicJsonType, typename ArithmeticType,
+           enable_if_t < std::is_arithmetic<ArithmeticType>::value&&
+                         !std::is_same<ArithmeticType, typename BasicJsonType::boolean_t>::value,
+                         int > = 0 >
+void get_arithmetic_value(const BasicJsonType& j, ArithmeticType& val)
+{
+    switch (static_cast<value_t>(j))
+    {
+        case value_t::number_unsigned:
+        {
+            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::number_unsigned_t*>());
+            break;
+        }
+        case value_t::number_integer:
+        {
+            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::number_integer_t*>());
+            break;
+        }
+        case value_t::number_float:
+        {
+            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::number_float_t*>());
+            break;
+        }
+
+        case value_t::null:
+        case value_t::object:
+        case value_t::array:
+        case value_t::string:
+        case value_t::boolean:
+        case value_t::binary:
+        case value_t::discarded:
+        default:
+            JSON_THROW(type_error::create(302, concat("type must be number, but is ", j.type_name()), &j));
+    }
+}
+
+template<typename BasicJsonType>
+inline void from_json(const BasicJsonType& j, typename BasicJsonType::boolean_t& b)
+{
+    if (JSON_HEDLEY_UNLIKELY(!j.is_boolean()))
+    {
+        JSON_THROW(type_error::create(302, concat("type must be boolean, but is ", j.type_name()), &j));
+    }
+    b = *j.template get_ptr<const typename BasicJsonType::boolean_t*>();
+}
+
+template<typename BasicJsonType>
+inline void from_json(const BasicJsonType& j, typename BasicJsonType::string_t& s)
+{
+    if (JSON_HEDLEY_UNLIKELY(!j.is_string()))
+    {
+        JSON_THROW(type_error::create(302, concat("type must be string, but is ", j.type_name()), &j));
+    }
+    s = *j.template get_ptr<const typename BasicJsonType::string_t*>();
+}
+
+template <
+    typename BasicJsonType, typename StringType,
+    enable_if_t <
+        std::is_assignable<StringType&, const typename BasicJsonType::string_t>::value
+        && is_detected_exact<typename BasicJsonType::string_t::value_type, value_type_t, StringType>::value
+        && !std::is_same<typename BasicJsonType::string_t, StringType>::value
+        && !is_json_ref<StringType>::value, int > = 0 >
+inline void from_json(const BasicJsonType& j, StringType& s)
+{
+    if (JSON_HEDLEY_UNLIKELY(!j.is_string()))
+    {
+        JSON_THROW(type_error::create(302, concat("type must be string, but is ", j.type_name()), &j));
+    }
+
+    s = *j.template get_ptr<const typename BasicJsonType::string_t*>();
+}
+
+template<typename BasicJsonType>
+inline void from_json(const BasicJsonType& j, typename BasicJsonType::number_float_t& val)
+{
+    get_arithmetic_value(j, val);
+}
+
+template<typename BasicJsonType>
+inline void from_json(const BasicJsonType& j, typename BasicJsonType::number_unsigned_t& val)
+{
+    get_arithmetic_value(j, val);
+}
+
+template<typename BasicJsonType>
+inline void from_json(const BasicJsonType& j, typename BasicJsonType::number_integer_t& val)
+{
+    get_arithmetic_value(j, val);
+}
+
+#if !JSON_DISABLE_ENUM_SERIALIZATION
+template<typename BasicJsonType, typename EnumType,
+         enable_if_t<std::is_enum<EnumType>::value, int> = 0>
+inline void from_json(const BasicJsonType& j, EnumType& e)
+{
+    typename std::underlying_type<EnumType>::type val;
+    get_arithmetic_value(j, val);
+    e = static_cast<EnumType>(val);
+}
+#endif  // JSON_DISABLE_ENUM_SERIALIZATION
+
+// forward_list doesn't have an insert method
+template<typename BasicJsonType, typename T, typename Allocator,
+         enable_if_t<is_getable<BasicJsonType, T>::value, int> = 0>
+inline void from_json(const BasicJsonType& j, std::forward_list<T, Allocator>& l)
+{
+    if (JSON_HEDLEY_UNLIKELY(!j.is_array()))
+    {
+        JSON_THROW(type_error::create(302, concat("type must be array, but is ", j.type_name()), &j));
+    }
+    l.clear();
+    std::transform(j.rbegin(), j.rend(),
+                   std::front_inserter(l), [](const BasicJsonType & i)
+    {
+        return i.template get<T>();
+    });
+}
+
+// valarray doesn't have an insert method
+template<typename BasicJsonType, typename T,
+         enable_if_t<is_getable<BasicJsonType, T>::value, int> = 0>
+inline void from_json(const BasicJsonType& j, std::valarray<T>& l)
+{
+    if (JSON_HEDLEY_UNLIKELY(!j.is_array()))
+    {
+        JSON_THROW(type_error::create(302, concat("type must be array, but is ", j.type_name()), &j));
+    }
+    l.resize(j.size());
+    std::transform(j.begin(), j.end(), std::begin(l),
+                   [](const BasicJsonType & elem)
+    {
+        return elem.template get<T>();
+    });
+}
+
+template<typename BasicJsonType, typename T, std::size_t N>
+auto from_json(const BasicJsonType& j, T (&arr)[N])  // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
+-> decltype(j.template get<T>(), void())
+{
+    for (std::size_t i = 0; i < N; ++i)
+    {
+        arr[i] = j.at(i).template get<T>();
+    }
+}
+
+template<typename BasicJsonType, typename T, std::size_t N1, std::size_t N2>
+auto from_json(const BasicJsonType& j, T (&arr)[N1][N2])  // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
+-> decltype(j.template get<T>(), void())
+{
+    for (std::size_t i1 = 0; i1 < N1; ++i1)
+    {
+        for (std::size_t i2 = 0; i2 < N2; ++i2)
+        {
+            arr[i1][i2] = j.at(i1).at(i2).template get<T>();
+        }
+    }
+}
+
+template<typename BasicJsonType, typename T, std::size_t N1, std::size_t N2, std::size_t N3>
+auto from_json(const BasicJsonType& j, T (&arr)[N1][N2][N3])  // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
+-> decltype(j.template get<T>(), void())
+{
+    for (std::size_t i1 = 0; i1 < N1; ++i1)
+    {
+        for (std::size_t i2 = 0; i2 < N2; ++i2)
+        {
+            for (std::size_t i3 = 0; i3 < N3; ++i3)
+            {
+                arr[i1][i2][i3] = j.at(i1).at(i2).at(i3).template get<T>();
+            }
+        }
+    }
+}
+
+template<typename BasicJsonType, typename T, std::size_t N1, std::size_t N2, std::size_t N3, std::size_t N4>
+auto from_json(const BasicJsonType& j, T (&arr)[N1][N2][N3][N4])  // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
+-> decltype(j.template get<T>(), void())
+{
+    for (std::size_t i1 = 0; i1 < N1; ++i1)
+    {
+        for (std::size_t i2 = 0; i2 < N2; ++i2)
+        {
+            for (std::size_t i3 = 0; i3 < N3; ++i3)
+            {
+                for (std::size_t i4 = 0; i4 < N4; ++i4)
+                {
+                    arr[i1][i2][i3][i4] = j.at(i1).at(i2).at(i3).at(i4).template get<T>();
+                }
+            }
+        }
+    }
+}
+
+template<typename BasicJsonType>
+inline void from_json_array_impl(const BasicJsonType& j, typename BasicJsonType::array_t& arr, priority_tag<3> /*unused*/)
+{
+    arr = *j.template get_ptr<const typename BasicJsonType::array_t*>();
+}
+
+template<typename BasicJsonType, typename T, std::size_t N>
+auto from_json_array_impl(const BasicJsonType& j, std::array<T, N>& arr,
+                          priority_tag<2> /*unused*/)
+-> decltype(j.template get<T>(), void())
+{
+    for (std::size_t i = 0; i < N; ++i)
+    {
+        arr[i] = j.at(i).template get<T>();
+    }
+}
+
+template<typename BasicJsonType, typename ConstructibleArrayType,
+         enable_if_t<
+             std::is_assignable<ConstructibleArrayType&, ConstructibleArrayType>::value,
+             int> = 0>
+auto from_json_array_impl(const BasicJsonType& j, ConstructibleArrayType& arr, priority_tag<1> /*unused*/)
+-> decltype(
+    arr.reserve(std::declval<typename ConstructibleArrayType::size_type>()),
+    j.template get<typename ConstructibleArrayType::value_type>(),
+    void())
+{
+    using std::end;
+
+    ConstructibleArrayType ret;
+    ret.reserve(j.size());
+    std::transform(j.begin(), j.end(),
+                   std::inserter(ret, end(ret)), [](const BasicJsonType & i)
+    {
+        // get<BasicJsonType>() returns *this, this won't call a from_json
+        // method when value_type is BasicJsonType
+        return i.template get<typename ConstructibleArrayType::value_type>();
+    });
+    arr = std::move(ret);
+}
+
+template<typename BasicJsonType, typename ConstructibleArrayType,
+         enable_if_t<
+             std::is_assignable<ConstructibleArrayType&, ConstructibleArrayType>::value,
+             int> = 0>
+inline void from_json_array_impl(const BasicJsonType& j, ConstructibleArrayType& arr,
+                                 priority_tag<0> /*unused*/)
+{
+    using std::end;
+
+    ConstructibleArrayType ret;
+    std::transform(
+        j.begin(), j.end(), std::inserter(ret, end(ret)),
+        [](const BasicJsonType & i)
+    {
+        // get<BasicJsonType>() returns *this, this won't call a from_json
+        // method when value_type is BasicJsonType
+        return i.template get<typename ConstructibleArrayType::value_type>();
+    });
+    arr = std::move(ret);
+}
+
+template < typename BasicJsonType, typename ConstructibleArrayType,
+           enable_if_t <
+               is_constructible_array_type<BasicJsonType, ConstructibleArrayType>::value&&
+               !is_constructible_object_type<BasicJsonType, ConstructibleArrayType>::value&&
+               !is_constructible_string_type<BasicJsonType, ConstructibleArrayType>::value&&
+               !std::is_same<ConstructibleArrayType, typename BasicJsonType::binary_t>::value&&
+               !is_basic_json<ConstructibleArrayType>::value,
+               int > = 0 >
+auto from_json(const BasicJsonType& j, ConstructibleArrayType& arr)
+-> decltype(from_json_array_impl(j, arr, priority_tag<3> {}),
+j.template get<typename ConstructibleArrayType::value_type>(),
+void())
+{
+    if (JSON_HEDLEY_UNLIKELY(!j.is_array()))
+    {
+        JSON_THROW(type_error::create(302, concat("type must be array, but is ", j.type_name()), &j));
+    }
+
+    from_json_array_impl(j, arr, priority_tag<3> {});
+}
+
+template < typename BasicJsonType, typename T, std::size_t... Idx >
+std::array<T, sizeof...(Idx)> from_json_inplace_array_impl(BasicJsonType&& j,
+                     identity_tag<std::array<T, sizeof...(Idx)>> /*unused*/, index_sequence<Idx...> /*unused*/)
+{
+    return { { std::forward<BasicJsonType>(j).at(Idx).template get<T>()... } };
+}
+
+template < typename BasicJsonType, typename T, std::size_t N >
+auto from_json(BasicJsonType&& j, identity_tag<std::array<T, N>> tag)
+-> decltype(from_json_inplace_array_impl(std::forward<BasicJsonType>(j), tag, make_index_sequence<N> {}))
+{
+    if (JSON_HEDLEY_UNLIKELY(!j.is_array()))
+    {
+        JSON_THROW(type_error::create(302, concat("type must be array, but is ", j.type_name()), &j));
+    }
+
+    return from_json_inplace_array_impl(std::forward<BasicJsonType>(j), tag, make_index_sequence<N> {});
+}
+
+template<typename BasicJsonType>
+inline void from_json(const BasicJsonType& j, typename BasicJsonType::binary_t& bin)
+{
+    if (JSON_HEDLEY_UNLIKELY(!j.is_binary()))
+    {
+        JSON_THROW(type_error::create(302, concat("type must be binary, but is ", j.type_name()), &j));
+    }
+
+    bin = *j.template get_ptr<const typename BasicJsonType::binary_t*>();
+}
+
+template<typename BasicJsonType, typename ConstructibleObjectType,
+         enable_if_t<is_constructible_object_type<BasicJsonType, ConstructibleObjectType>::value, int> = 0>
+inline void from_json(const BasicJsonType& j, ConstructibleObjectType& obj)
+{
+    if (JSON_HEDLEY_UNLIKELY(!j.is_object()))
+    {
+        JSON_THROW(type_error::create(302, concat("type must be object, but is ", j.type_name()), &j));
+    }
+
+    ConstructibleObjectType ret;
+    const auto* inner_object = j.template get_ptr<const typename BasicJsonType::object_t*>();
+    using value_type = typename ConstructibleObjectType::value_type;
+    std::transform(
+        inner_object->begin(), inner_object->end(),
+        std::inserter(ret, ret.begin()),
+        [](typename BasicJsonType::object_t::value_type const & p)
+    {
+        return value_type(p.first, p.second.template get<typename ConstructibleObjectType::mapped_type>());
+    });
+    obj = std::move(ret);
+}
+
+// overload for arithmetic types, not chosen for basic_json template arguments
+// (BooleanType, etc..); note: Is it really necessary to provide explicit
+// overloads for boolean_t etc. in case of a custom BooleanType which is not
+// an arithmetic type?
+template < typename BasicJsonType, typename ArithmeticType,
+           enable_if_t <
+               std::is_arithmetic<ArithmeticType>::value&&
+               !std::is_same<ArithmeticType, typename BasicJsonType::number_unsigned_t>::value&&
+               !std::is_same<ArithmeticType, typename BasicJsonType::number_integer_t>::value&&
+               !std::is_same<ArithmeticType, typename BasicJsonType::number_float_t>::value&&
+               !std::is_same<ArithmeticType, typename BasicJsonType::boolean_t>::value,
+               int > = 0 >
+inline void from_json(const BasicJsonType& j, ArithmeticType& val)
+{
+    switch (static_cast<value_t>(j))
+    {
+        case value_t::number_unsigned:
+        {
+            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::number_unsigned_t*>());
+            break;
+        }
+        case value_t::number_integer:
+        {
+            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::number_integer_t*>());
+            break;
+        }
+        case value_t::number_float:
+        {
+            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::number_float_t*>());
+            break;
+        }
+        case value_t::boolean:
+        {
+            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::boolean_t*>());
+            break;
+        }
+
+        case value_t::null:
+        case value_t::object:
+        case value_t::array:
+        case value_t::string:
+        case value_t::binary:
+        case value_t::discarded:
+        default:
+            JSON_THROW(type_error::create(302, concat("type must be number, but is ", j.type_name()), &j));
+    }
+}
+
+template<typename BasicJsonType, typename... Args, std::size_t... Idx>
+std::tuple<Args...> from_json_tuple_impl_base(BasicJsonType&& j, index_sequence<Idx...> /*unused*/)
+{
+    return std::make_tuple(std::forward<BasicJsonType>(j).at(Idx).template get<Args>()...);
+}
+
+template<typename BasicJsonType>
+std::tuple<> from_json_tuple_impl_base(BasicJsonType& /*unused*/, index_sequence<> /*unused*/)
+{
+    return {};
+}
+
+template < typename BasicJsonType, class A1, class A2 >
+std::pair<A1, A2> from_json_tuple_impl(BasicJsonType&& j, identity_tag<std::pair<A1, A2>> /*unused*/, priority_tag<0> /*unused*/)
+{
+    return {std::forward<BasicJsonType>(j).at(0).template get<A1>(),
+            std::forward<BasicJsonType>(j).at(1).template get<A2>()};
+}
+
+template<typename BasicJsonType, typename A1, typename A2>
+inline void from_json_tuple_impl(BasicJsonType&& j, std::pair<A1, A2>& p, priority_tag<1> /*unused*/)
+{
+    p = from_json_tuple_impl(std::forward<BasicJsonType>(j), identity_tag<std::pair<A1, A2>> {}, priority_tag<0> {});
+}
+
+template<typename BasicJsonType, typename... Args>
+std::tuple<Args...> from_json_tuple_impl(BasicJsonType&& j, identity_tag<std::tuple<Args...>> /*unused*/, priority_tag<2> /*unused*/)
+{
+    return from_json_tuple_impl_base<BasicJsonType, Args...>(std::forward<BasicJsonType>(j), index_sequence_for<Args...> {});
+}
+
+template<typename BasicJsonType, typename... Args>
+inline void from_json_tuple_impl(BasicJsonType&& j, std::tuple<Args...>& t, priority_tag<3> /*unused*/)
+{
+    t = from_json_tuple_impl_base<BasicJsonType, Args...>(std::forward<BasicJsonType>(j), index_sequence_for<Args...> {});
+}
+
+template<typename BasicJsonType, typename TupleRelated>
+auto from_json(BasicJsonType&& j, TupleRelated&& t)
+-> decltype(from_json_tuple_impl(std::forward<BasicJsonType>(j), std::forward<TupleRelated>(t), priority_tag<3> {}))
+{
+    if (JSON_HEDLEY_UNLIKELY(!j.is_array()))
+    {
+        JSON_THROW(type_error::create(302, concat("type must be array, but is ", j.type_name()), &j));
+    }
+
+    return from_json_tuple_impl(std::forward<BasicJsonType>(j), std::forward<TupleRelated>(t), priority_tag<3> {});
+}
+
+template < typename BasicJsonType, typename Key, typename Value, typename Compare, typename Allocator,
+           typename = enable_if_t < !std::is_constructible <
+                                        typename BasicJsonType::string_t, Key >::value >>
+inline void from_json(const BasicJsonType& j, std::map<Key, Value, Compare, Allocator>& m)
+{
+    if (JSON_HEDLEY_UNLIKELY(!j.is_array()))
+    {
+        JSON_THROW(type_error::create(302, concat("type must be array, but is ", j.type_name()), &j));
+    }
+    m.clear();
+    for (const auto& p : j)
+    {
+        if (JSON_HEDLEY_UNLIKELY(!p.is_array()))
+        {
+            JSON_THROW(type_error::create(302, concat("type must be array, but is ", p.type_name()), &j));
+        }
+        m.emplace(p.at(0).template get<Key>(), p.at(1).template get<Value>());
+    }
+}
+
+template < typename BasicJsonType, typename Key, typename Value, typename Hash, typename KeyEqual, typename Allocator,
+           typename = enable_if_t < !std::is_constructible <
+                                        typename BasicJsonType::string_t, Key >::value >>
+inline void from_json(const BasicJsonType& j, std::unordered_map<Key, Value, Hash, KeyEqual, Allocator>& m)
+{
+    if (JSON_HEDLEY_UNLIKELY(!j.is_array()))
+    {
+        JSON_THROW(type_error::create(302, concat("type must be array, but is ", j.type_name()), &j));
+    }
+    m.clear();
+    for (const auto& p : j)
+    {
+        if (JSON_HEDLEY_UNLIKELY(!p.is_array()))
+        {
+            JSON_THROW(type_error::create(302, concat("type must be array, but is ", p.type_name()), &j));
+        }
+        m.emplace(p.at(0).template get<Key>(), p.at(1).template get<Value>());
+    }
+}
+
+#if JSON_HAS_FILESYSTEM || JSON_HAS_EXPERIMENTAL_FILESYSTEM
+template<typename BasicJsonType>
+inline void from_json(const BasicJsonType& j, std_fs::path& p)
+{
+    if (JSON_HEDLEY_UNLIKELY(!j.is_string()))
+    {
+        JSON_THROW(type_error::create(302, concat("type must be string, but is ", j.type_name()), &j));
+    }
+    const auto& s = *j.template get_ptr<const typename BasicJsonType::string_t*>();
+#ifdef JSON_HAS_CPP_20
+    p = std_fs::path(std::u8string_view(reinterpret_cast<const char8_t*>(s.data()), s.size()));
+#else
+    p = std_fs::u8path(s); // accepts UTF-8 encoded std::string in C++17, deprecated in C++20
+#endif
+}
+#endif
+
+struct from_json_fn
+{
+    template<typename BasicJsonType, typename T>
+    auto operator()(const BasicJsonType& j, T&& val) const
+    noexcept(noexcept(from_json(j, std::forward<T>(val))))
+    -> decltype(from_json(j, std::forward<T>(val)))
+    {
+        return from_json(j, std::forward<T>(val));
+    }
+};
+
+}  // namespace detail
+
+#ifndef JSON_HAS_CPP_17
+/// namespace to hold default `from_json` function
+/// to see why this is required:
+/// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2015/n4381.html
+namespace // NOLINT(cert-dcl59-cpp,fuchsia-header-anon-namespaces,google-build-namespaces)
+{
+#endif
+JSON_INLINE_VARIABLE constexpr const auto& from_json = // NOLINT(misc-definitions-in-headers)
+    detail::static_const<detail::from_json_fn>::value;
+#ifndef JSON_HAS_CPP_17
+}  // namespace
+#endif
+
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/conversions/to_json.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013 - 2025 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+// #include <nlohmann/detail/macro_scope.hpp>
+// JSON_HAS_CPP_17
+#ifdef JSON_HAS_CPP_17
+    #include <optional> // optional
+#endif
+
+#include <algorithm> // copy
+#include <iterator> // begin, end
+#include <string> // string
+#include <tuple> // tuple, get
+#include <type_traits> // is_same, is_constructible, is_floating_point, is_enum, underlying_type
+#include <utility> // move, forward, declval, pair
+#include <valarray> // valarray
+#include <vector> // vector
+
+// #include <nlohmann/detail/iterators/iteration_proxy.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013 - 2025 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <cstddef> // size_t
+#include <iterator> // forward_iterator_tag
+#include <tuple> // tuple_size, get, tuple_element
+#include <utility> // move
+
+#if JSON_HAS_RANGES
+    #include <ranges> // enable_borrowed_range
+#endif
+
+// #include <nlohmann/detail/abi_macros.hpp>
+
+// #include <nlohmann/detail/meta/type_traits.hpp>
+
+// #include <nlohmann/detail/string_utils.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013 - 2025 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <cstddef> // size_t
+#include <string> // string, to_string
+
+// #include <nlohmann/detail/abi_macros.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+template<typename StringType>
+void int_to_string(StringType& target, std::size_t value)
+{
+    // For ADL
+    using std::to_string;
+    target = to_string(value);
+}
+
+template<typename StringType>
+StringType to_string(std::size_t value)
+{
+    StringType result;
+    int_to_string(result, value);
+    return result;
+}
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/value_t.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+template<typename IteratorType> class iteration_proxy_value
+{
+  public:
+    using difference_type = std::ptrdiff_t;
+    using value_type = iteration_proxy_value;
+    using pointer = value_type *;
+    using reference = value_type &;
+    using iterator_category = std::forward_iterator_tag;
+    using string_type = typename std::remove_cv< typename std::remove_reference<decltype( std::declval<IteratorType>().key() ) >::type >::type;
+
+  private:
+    /// the iterator
+    IteratorType anchor{};
+    /// an index for arrays (used to create key names)
+    std::size_t array_index = 0;
+    /// last stringified array index
+    mutable std::size_t array_index_last = 0;
+    /// a string representation of the array index
+    mutable string_type array_index_str = "0";
+    /// an empty string (to return a reference for primitive values)
+    string_type empty_str{};
+
+  public:
+    explicit iteration_proxy_value() = default;
+    explicit iteration_proxy_value(IteratorType it, std::size_t array_index_ = 0)
+    noexcept(std::is_nothrow_move_constructible<IteratorType>::value
+             && std::is_nothrow_default_constructible<string_type>::value)
+        : anchor(std::move(it))
+        , array_index(array_index_)
+    {}
+
+    iteration_proxy_value(iteration_proxy_value const&) = default;
+    iteration_proxy_value& operator=(iteration_proxy_value const&) = default;
+    // older GCCs are a bit fussy and require explicit noexcept specifiers on defaulted functions
+    iteration_proxy_value(iteration_proxy_value&&)
+    noexcept(std::is_nothrow_move_constructible<IteratorType>::value
+             && std::is_nothrow_move_constructible<string_type>::value) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor,cppcoreguidelines-noexcept-move-operations)
+    iteration_proxy_value& operator=(iteration_proxy_value&&)
+    noexcept(std::is_nothrow_move_assignable<IteratorType>::value
+             && std::is_nothrow_move_assignable<string_type>::value) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor,cppcoreguidelines-noexcept-move-operations)
+    ~iteration_proxy_value() = default;
+
+    /// dereference operator (needed for range-based for)
+    const iteration_proxy_value& operator*() const
+    {
+        return *this;
+    }
+
+    /// increment operator (needed for range-based for)
+    iteration_proxy_value& operator++()
+    {
+        ++anchor;
+        ++array_index;
+
+        return *this;
+    }
+
+    iteration_proxy_value operator++(int)& // NOLINT(cert-dcl21-cpp)
+    {
+        auto tmp = iteration_proxy_value(anchor, array_index);
+        ++anchor;
+        ++array_index;
+        return tmp;
+    }
+
+    /// equality operator (needed for InputIterator)
+    bool operator==(const iteration_proxy_value& o) const
+    {
+        return anchor == o.anchor;
+    }
+
+    /// inequality operator (needed for range-based for)
+    bool operator!=(const iteration_proxy_value& o) const
+    {
+        return anchor != o.anchor;
+    }
+
+    /// return key of the iterator
+    const string_type& key() const
+    {
+        JSON_ASSERT(anchor.m_object != nullptr);
+
+        switch (anchor.m_object->type())
+        {
+            // use integer array index as key
+            case value_t::array:
+            {
+                if (array_index != array_index_last)
+                {
+                    int_to_string( array_index_str, array_index );
+                    array_index_last = array_index;
+                }
+                return array_index_str;
+            }
+
+            // use key from the object
+            case value_t::object:
+                return anchor.key();
+
+            // use an empty key for all primitive types
+            case value_t::null:
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+                return empty_str;
+        }
+    }
+
+    /// return value of the iterator
+    typename IteratorType::reference value() const
+    {
+        return anchor.value();
+    }
+};
+
+/// proxy class for the items() function
+template<typename IteratorType> class iteration_proxy
+{
+  private:
+    /// the container to iterate
+    typename IteratorType::pointer container = nullptr;
+
+  public:
+    explicit iteration_proxy() = default;
+
+    /// construct iteration proxy from a container
+    explicit iteration_proxy(typename IteratorType::reference cont) noexcept
+        : container(&cont) {}
+
+    iteration_proxy(iteration_proxy const&) = default;
+    iteration_proxy& operator=(iteration_proxy const&) = default;
+    iteration_proxy(iteration_proxy&&) noexcept = default;
+    iteration_proxy& operator=(iteration_proxy&&) noexcept = default;
+    ~iteration_proxy() = default;
+
+    /// return iterator begin (needed for range-based for)
+    iteration_proxy_value<IteratorType> begin() const noexcept
+    {
+        return iteration_proxy_value<IteratorType>(container->begin());
+    }
+
+    /// return iterator end (needed for range-based for)
+    iteration_proxy_value<IteratorType> end() const noexcept
+    {
+        return iteration_proxy_value<IteratorType>(container->end());
+    }
+};
+
+// Structured Bindings Support
+// For further reference see https://blog.tartanllama.xyz/structured-bindings/
+// And see https://github.com/nlohmann/json/pull/1391
+template<std::size_t N, typename IteratorType, enable_if_t<N == 0, int> = 0>
+auto get(const nlohmann::detail::iteration_proxy_value<IteratorType>& i) -> decltype(i.key())
+{
+    return i.key();
+}
+// Structured Bindings Support
+// For further reference see https://blog.tartanllama.xyz/structured-bindings/
+// And see https://github.com/nlohmann/json/pull/1391
+template<std::size_t N, typename IteratorType, enable_if_t<N == 1, int> = 0>
+auto get(const nlohmann::detail::iteration_proxy_value<IteratorType>& i) -> decltype(i.value())
+{
+    return i.value();
+}
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// The Addition to the STD Namespace is required to add
+// Structured Bindings Support to the iteration_proxy_value class
+// For further reference see https://blog.tartanllama.xyz/structured-bindings/
+// And see https://github.com/nlohmann/json/pull/1391
+namespace std
+{
+
+#if defined(__clang__)
+    // Fix: https://github.com/nlohmann/json/issues/1401
+    #pragma clang diagnostic push
+    #pragma clang diagnostic ignored "-Wmismatched-tags"
+#endif
+template<typename IteratorType>
+class tuple_size<::nlohmann::detail::iteration_proxy_value<IteratorType>> // NOLINT(cert-dcl58-cpp)
+    : public std::integral_constant<std::size_t, 2> {};
+
+template<std::size_t N, typename IteratorType>
+class tuple_element<N, ::nlohmann::detail::iteration_proxy_value<IteratorType >> // NOLINT(cert-dcl58-cpp)
+{
+  public:
+    using type = decltype(
+                     get<N>(std::declval <
+                            ::nlohmann::detail::iteration_proxy_value<IteratorType >> ()));
+};
+#if defined(__clang__)
+    #pragma clang diagnostic pop
+#endif
+
+}  // namespace std
+
+#if JSON_HAS_RANGES
+    template <typename IteratorType>
+    inline constexpr bool ::std::ranges::enable_borrowed_range<::nlohmann::detail::iteration_proxy<IteratorType>> = true;
+#endif
+
+// #include <nlohmann/detail/meta/cpp_future.hpp>
+
+// #include <nlohmann/detail/meta/std_fs.hpp>
+
+// #include <nlohmann/detail/meta/type_traits.hpp>
+
+// #include <nlohmann/detail/value_t.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+//////////////////
+// constructors //
+//////////////////
+
+/*
+ * Note all external_constructor<>::construct functions need to call
+ * j.m_data.m_value.destroy(j.m_data.m_type) to avoid a memory leak in case j contains an
+ * allocated value (e.g., a string). See bug issue
+ * https://github.com/nlohmann/json/issues/2865 for more information.
+ */
+
+template<value_t> struct external_constructor;
+
+template<>
+struct external_constructor<value_t::boolean>
+{
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, typename BasicJsonType::boolean_t b) noexcept
+    {
+        j.m_data.m_value.destroy(j.m_data.m_type);
+        j.m_data.m_type = value_t::boolean;
+        j.m_data.m_value = b;
+        j.assert_invariant();
+    }
+};
+
+template<>
+struct external_constructor<value_t::string>
+{
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, const typename BasicJsonType::string_t& s)
+    {
+        j.m_data.m_value.destroy(j.m_data.m_type);
+        j.m_data.m_type = value_t::string;
+        j.m_data.m_value = s;
+        j.assert_invariant();
+    }
+
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, typename BasicJsonType::string_t&& s)
+    {
+        j.m_data.m_value.destroy(j.m_data.m_type);
+        j.m_data.m_type = value_t::string;
+        j.m_data.m_value = std::move(s);
+        j.assert_invariant();
+    }
+
+    template < typename BasicJsonType, typename CompatibleStringType,
+               enable_if_t < !std::is_same<CompatibleStringType, typename BasicJsonType::string_t>::value,
+                             int > = 0 >
+    static void construct(BasicJsonType& j, const CompatibleStringType& str)
+    {
+        j.m_data.m_value.destroy(j.m_data.m_type);
+        j.m_data.m_type = value_t::string;
+        j.m_data.m_value.string = j.template create<typename BasicJsonType::string_t>(str);
+        j.assert_invariant();
+    }
+};
+
+template<>
+struct external_constructor<value_t::binary>
+{
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, const typename BasicJsonType::binary_t& b)
+    {
+        j.m_data.m_value.destroy(j.m_data.m_type);
+        j.m_data.m_type = value_t::binary;
+        j.m_data.m_value = typename BasicJsonType::binary_t(b);
+        j.assert_invariant();
+    }
+
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, typename BasicJsonType::binary_t&& b)
+    {
+        j.m_data.m_value.destroy(j.m_data.m_type);
+        j.m_data.m_type = value_t::binary;
+        j.m_data.m_value = typename BasicJsonType::binary_t(std::move(b));
+        j.assert_invariant();
+    }
+};
+
+template<>
+struct external_constructor<value_t::number_float>
+{
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, typename BasicJsonType::number_float_t val) noexcept
+    {
+        j.m_data.m_value.destroy(j.m_data.m_type);
+        j.m_data.m_type = value_t::number_float;
+        j.m_data.m_value = val;
+        j.assert_invariant();
+    }
+};
+
+template<>
+struct external_constructor<value_t::number_unsigned>
+{
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, typename BasicJsonType::number_unsigned_t val) noexcept
+    {
+        j.m_data.m_value.destroy(j.m_data.m_type);
+        j.m_data.m_type = value_t::number_unsigned;
+        j.m_data.m_value = val;
+        j.assert_invariant();
+    }
+};
+
+template<>
+struct external_constructor<value_t::number_integer>
+{
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, typename BasicJsonType::number_integer_t val) noexcept
+    {
+        j.m_data.m_value.destroy(j.m_data.m_type);
+        j.m_data.m_type = value_t::number_integer;
+        j.m_data.m_value = val;
+        j.assert_invariant();
+    }
+};
+
+template<>
+struct external_constructor<value_t::array>
+{
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, const typename BasicJsonType::array_t& arr)
+    {
+        j.m_data.m_value.destroy(j.m_data.m_type);
+        j.m_data.m_type = value_t::array;
+        j.m_data.m_value = arr;
+        j.set_parents();
+        j.assert_invariant();
+    }
+
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, typename BasicJsonType::array_t&& arr)
+    {
+        j.m_data.m_value.destroy(j.m_data.m_type);
+        j.m_data.m_type = value_t::array;
+        j.m_data.m_value = std::move(arr);
+        j.set_parents();
+        j.assert_invariant();
+    }
+
+    template < typename BasicJsonType, typename CompatibleArrayType,
+               enable_if_t < !std::is_same<CompatibleArrayType, typename BasicJsonType::array_t>::value,
+                             int > = 0 >
+    static void construct(BasicJsonType& j, const CompatibleArrayType& arr)
+    {
+        using std::begin;
+        using std::end;
+
+        j.m_data.m_value.destroy(j.m_data.m_type);
+        j.m_data.m_type = value_t::array;
+        j.m_data.m_value.array = j.template create<typename BasicJsonType::array_t>(begin(arr), end(arr));
+        j.set_parents();
+        j.assert_invariant();
+    }
+
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, const std::vector<bool>& arr)
+    {
+        j.m_data.m_value.destroy(j.m_data.m_type);
+        j.m_data.m_type = value_t::array;
+        j.m_data.m_value = value_t::array;
+        j.m_data.m_value.array->reserve(arr.size());
+        for (const bool x : arr)
+        {
+            j.m_data.m_value.array->push_back(x);
+            j.set_parent(j.m_data.m_value.array->back());
+        }
+        j.assert_invariant();
+    }
+
+    template<typename BasicJsonType, typename T,
+             enable_if_t<std::is_convertible<T, BasicJsonType>::value, int> = 0>
+    static void construct(BasicJsonType& j, const std::valarray<T>& arr)
+    {
+        j.m_data.m_value.destroy(j.m_data.m_type);
+        j.m_data.m_type = value_t::array;
+        j.m_data.m_value = value_t::array;
+        j.m_data.m_value.array->resize(arr.size());
+        if (arr.size() > 0)
+        {
+            std::copy(std::begin(arr), std::end(arr), j.m_data.m_value.array->begin());
+        }
+        j.set_parents();
+        j.assert_invariant();
+    }
+};
+
+template<>
+struct external_constructor<value_t::object>
+{
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, const typename BasicJsonType::object_t& obj)
+    {
+        j.m_data.m_value.destroy(j.m_data.m_type);
+        j.m_data.m_type = value_t::object;
+        j.m_data.m_value = obj;
+        j.set_parents();
+        j.assert_invariant();
+    }
+
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, typename BasicJsonType::object_t&& obj)
+    {
+        j.m_data.m_value.destroy(j.m_data.m_type);
+        j.m_data.m_type = value_t::object;
+        j.m_data.m_value = std::move(obj);
+        j.set_parents();
+        j.assert_invariant();
+    }
+
+    template < typename BasicJsonType, typename CompatibleObjectType,
+               enable_if_t < !std::is_same<CompatibleObjectType, typename BasicJsonType::object_t>::value, int > = 0 >
+    static void construct(BasicJsonType& j, const CompatibleObjectType& obj)
+    {
+        using std::begin;
+        using std::end;
+
+        j.m_data.m_value.destroy(j.m_data.m_type);
+        j.m_data.m_type = value_t::object;
+        j.m_data.m_value.object = j.template create<typename BasicJsonType::object_t>(begin(obj), end(obj));
+        j.set_parents();
+        j.assert_invariant();
+    }
+};
+
+/////////////
+// to_json //
+/////////////
+
+#ifdef JSON_HAS_CPP_17
+template<typename BasicJsonType, typename T,
+         enable_if_t<std::is_constructible<BasicJsonType, T>::value, int> = 0>
+void to_json(BasicJsonType& j, const std::optional<T>& opt)
+{
+    if (opt.has_value())
+    {
+        j = *opt;
+    }
+    else
+    {
+        j = nullptr;
+    }
+}
+#endif
+
+template<typename BasicJsonType, typename T,
+         enable_if_t<std::is_same<T, typename BasicJsonType::boolean_t>::value, int> = 0>
+inline void to_json(BasicJsonType& j, T b) noexcept
+{
+    external_constructor<value_t::boolean>::construct(j, b);
+}
+
+template < typename BasicJsonType, typename BoolRef,
+           enable_if_t <
+               ((std::is_same<std::vector<bool>::reference, BoolRef>::value
+                 && !std::is_same <std::vector<bool>::reference, typename BasicJsonType::boolean_t&>::value)
+                || (std::is_same<std::vector<bool>::const_reference, BoolRef>::value
+                    && !std::is_same <detail::uncvref_t<std::vector<bool>::const_reference>,
+                                      typename BasicJsonType::boolean_t >::value))
+               && std::is_convertible<const BoolRef&, typename BasicJsonType::boolean_t>::value, int > = 0 >
+inline void to_json(BasicJsonType& j, const BoolRef& b) noexcept
+{
+    external_constructor<value_t::boolean>::construct(j, static_cast<typename BasicJsonType::boolean_t>(b));
+}
+
+template<typename BasicJsonType, typename CompatibleString,
+         enable_if_t<std::is_constructible<typename BasicJsonType::string_t, CompatibleString>::value, int> = 0>
+inline void to_json(BasicJsonType& j, const CompatibleString& s)
+{
+    external_constructor<value_t::string>::construct(j, s);
+}
+
+template<typename BasicJsonType>
+inline void to_json(BasicJsonType& j, typename BasicJsonType::string_t&& s)
+{
+    external_constructor<value_t::string>::construct(j, std::move(s));
+}
+
+template<typename BasicJsonType, typename FloatType,
+         enable_if_t<std::is_floating_point<FloatType>::value, int> = 0>
+inline void to_json(BasicJsonType& j, FloatType val) noexcept
+{
+    external_constructor<value_t::number_float>::construct(j, static_cast<typename BasicJsonType::number_float_t>(val));
+}
+
+template<typename BasicJsonType, typename CompatibleNumberUnsignedType,
+         enable_if_t<is_compatible_integer_type<typename BasicJsonType::number_unsigned_t, CompatibleNumberUnsignedType>::value, int> = 0>
+inline void to_json(BasicJsonType& j, CompatibleNumberUnsignedType val) noexcept
+{
+    external_constructor<value_t::number_unsigned>::construct(j, static_cast<typename BasicJsonType::number_unsigned_t>(val));
+}
+
+template<typename BasicJsonType, typename CompatibleNumberIntegerType,
+         enable_if_t<is_compatible_integer_type<typename BasicJsonType::number_integer_t, CompatibleNumberIntegerType>::value, int> = 0>
+inline void to_json(BasicJsonType& j, CompatibleNumberIntegerType val) noexcept
+{
+    external_constructor<value_t::number_integer>::construct(j, static_cast<typename BasicJsonType::number_integer_t>(val));
+}
+
+#if !JSON_DISABLE_ENUM_SERIALIZATION
+template<typename BasicJsonType, typename EnumType,
+         enable_if_t<std::is_enum<EnumType>::value, int> = 0>
+inline void to_json(BasicJsonType& j, EnumType e) noexcept
+{
+    using underlying_type = typename std::underlying_type<EnumType>::type;
+    static constexpr value_t integral_value_t = std::is_unsigned<underlying_type>::value ? value_t::number_unsigned : value_t::number_integer;
+    external_constructor<integral_value_t>::construct(j, static_cast<underlying_type>(e));
+}
+#endif  // JSON_DISABLE_ENUM_SERIALIZATION
+
+template<typename BasicJsonType>
+inline void to_json(BasicJsonType& j, const std::vector<bool>& e)
+{
+    external_constructor<value_t::array>::construct(j, e);
+}
+
+template < typename BasicJsonType, typename CompatibleArrayType,
+           enable_if_t < is_compatible_array_type<BasicJsonType,
+                         CompatibleArrayType>::value&&
+                         !is_compatible_object_type<BasicJsonType, CompatibleArrayType>::value&&
+                         !is_compatible_string_type<BasicJsonType, CompatibleArrayType>::value&&
+                         !std::is_same<typename BasicJsonType::binary_t, CompatibleArrayType>::value&&
+                         !is_basic_json<CompatibleArrayType>::value,
+                         int > = 0 >
+inline void to_json(BasicJsonType& j, const CompatibleArrayType& arr)
+{
+    external_constructor<value_t::array>::construct(j, arr);
+}
+
+template<typename BasicJsonType>
+inline void to_json(BasicJsonType& j, const typename BasicJsonType::binary_t& bin)
+{
+    external_constructor<value_t::binary>::construct(j, bin);
+}
+
+template<typename BasicJsonType, typename T,
+         enable_if_t<std::is_convertible<T, BasicJsonType>::value, int> = 0>
+inline void to_json(BasicJsonType& j, const std::valarray<T>& arr)
+{
+    external_constructor<value_t::array>::construct(j, std::move(arr));
+}
+
+template<typename BasicJsonType>
+inline void to_json(BasicJsonType& j, typename BasicJsonType::array_t&& arr)
+{
+    external_constructor<value_t::array>::construct(j, std::move(arr));
+}
+
+template < typename BasicJsonType, typename CompatibleObjectType,
+           enable_if_t < is_compatible_object_type<BasicJsonType, CompatibleObjectType>::value&& !is_basic_json<CompatibleObjectType>::value, int > = 0 >
+inline void to_json(BasicJsonType& j, const CompatibleObjectType& obj)
+{
+    external_constructor<value_t::object>::construct(j, obj);
+}
+
+template<typename BasicJsonType>
+inline void to_json(BasicJsonType& j, typename BasicJsonType::object_t&& obj)
+{
+    external_constructor<value_t::object>::construct(j, std::move(obj));
+}
+
+template <
+    typename BasicJsonType, typename T, std::size_t N,
+    enable_if_t < !std::is_constructible<typename BasicJsonType::string_t,
+                  const T(&)[N]>::value, // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
+                  int > = 0 >
+inline void to_json(BasicJsonType& j, const T(&arr)[N]) // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
+{
+    external_constructor<value_t::array>::construct(j, arr);
+}
+
+template < typename BasicJsonType, typename T1, typename T2, enable_if_t < std::is_constructible<BasicJsonType, T1>::value&& std::is_constructible<BasicJsonType, T2>::value, int > = 0 >
+inline void to_json(BasicJsonType& j, const std::pair<T1, T2>& p)
+{
+    j = { p.first, p.second };
+}
+
+// for https://github.com/nlohmann/json/pull/1134
+template<typename BasicJsonType, typename T,
+         enable_if_t<std::is_same<T, iteration_proxy_value<typename BasicJsonType::iterator>>::value, int> = 0>
+inline void to_json(BasicJsonType& j, const T& b)
+{
+    j = { {b.key(), b.value()} };
+}
+
+template<typename BasicJsonType, typename Tuple, std::size_t... Idx>
+inline void to_json_tuple_impl(BasicJsonType& j, const Tuple& t, index_sequence<Idx...> /*unused*/)
+{
+    j = { std::get<Idx>(t)... };
+}
+
+template<typename BasicJsonType, typename Tuple>
+inline void to_json_tuple_impl(BasicJsonType& j, const Tuple& /*unused*/, index_sequence<> /*unused*/)
+{
+    using array_t = typename BasicJsonType::array_t;
+    j = array_t();
+}
+
+template<typename BasicJsonType, typename T, enable_if_t<is_constructible_tuple<BasicJsonType, T>::value, int > = 0>
+inline void to_json(BasicJsonType& j, const T& t)
+{
+    to_json_tuple_impl(j, t, make_index_sequence<std::tuple_size<T>::value> {});
+}
+
+#if JSON_HAS_FILESYSTEM || JSON_HAS_EXPERIMENTAL_FILESYSTEM
+template<typename BasicJsonType>
+inline void to_json(BasicJsonType& j, const std_fs::path& p)
+{
+#ifdef JSON_HAS_CPP_20
+    const std::u8string s = p.u8string();
+    j = std::string(s.begin(), s.end());
+#else
+    j = p.u8string(); // returns std::string in C++17
+#endif
+}
+#endif
+
+struct to_json_fn
+{
+    template<typename BasicJsonType, typename T>
+    auto operator()(BasicJsonType& j, T&& val) const noexcept(noexcept(to_json(j, std::forward<T>(val))))
+    -> decltype(to_json(j, std::forward<T>(val)), void())
+    {
+        return to_json(j, std::forward<T>(val));
+    }
+};
+}  // namespace detail
+
+#ifndef JSON_HAS_CPP_17
+/// namespace to hold default `to_json` function
+/// to see why this is required:
+/// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2015/n4381.html
+namespace // NOLINT(cert-dcl59-cpp,fuchsia-header-anon-namespaces,google-build-namespaces)
+{
+#endif
+JSON_INLINE_VARIABLE constexpr const auto& to_json = // NOLINT(misc-definitions-in-headers)
+    detail::static_const<detail::to_json_fn>::value;
+#ifndef JSON_HAS_CPP_17
+}  // namespace
+#endif
+
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/meta/identity_tag.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+
+/// @sa https://json.nlohmann.me/api/adl_serializer/
+template<typename ValueType, typename>
+struct adl_serializer
+{
+    /// @brief convert a JSON value to any value type
+    /// @sa https://json.nlohmann.me/api/adl_serializer/from_json/
+    template<typename BasicJsonType, typename TargetType = ValueType>
+    static auto from_json(BasicJsonType && j, TargetType& val) noexcept(
+        noexcept(::nlohmann::from_json(std::forward<BasicJsonType>(j), val)))
+    -> decltype(::nlohmann::from_json(std::forward<BasicJsonType>(j), val), void())
+    {
+        ::nlohmann::from_json(std::forward<BasicJsonType>(j), val);
+    }
+
+    /// @brief convert a JSON value to any value type
+    /// @sa https://json.nlohmann.me/api/adl_serializer/from_json/
+    template<typename BasicJsonType, typename TargetType = ValueType>
+    static auto from_json(BasicJsonType && j) noexcept(
+    noexcept(::nlohmann::from_json(std::forward<BasicJsonType>(j), detail::identity_tag<TargetType> {})))
+    -> decltype(::nlohmann::from_json(std::forward<BasicJsonType>(j), detail::identity_tag<TargetType> {}))
+    {
+        return ::nlohmann::from_json(std::forward<BasicJsonType>(j), detail::identity_tag<TargetType> {});
+    }
+
+    /// @brief convert any value type to a JSON value
+    /// @sa https://json.nlohmann.me/api/adl_serializer/to_json/
+    template<typename BasicJsonType, typename TargetType = ValueType>
+    static auto to_json(BasicJsonType& j, TargetType && val) noexcept(
+        noexcept(::nlohmann::to_json(j, std::forward<TargetType>(val))))
+    -> decltype(::nlohmann::to_json(j, std::forward<TargetType>(val)), void())
+    {
+        ::nlohmann::to_json(j, std::forward<TargetType>(val));
+    }
+};
+
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/byte_container_with_subtype.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013 - 2025 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <cstdint> // uint8_t, uint64_t
+#include <tuple> // tie
+#include <utility> // move
+
+// #include <nlohmann/detail/abi_macros.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+
+/// @brief an internal type for a backed binary type
+/// @sa https://json.nlohmann.me/api/byte_container_with_subtype/
+template<typename BinaryType>
+class byte_container_with_subtype : public BinaryType
+{
+  public:
+    using container_type = BinaryType;
+    using subtype_type = std::uint64_t;
+
+    /// @sa https://json.nlohmann.me/api/byte_container_with_subtype/byte_container_with_subtype/
+    byte_container_with_subtype() noexcept(noexcept(container_type()))
+        : container_type()
+    {}
+
+    /// @sa https://json.nlohmann.me/api/byte_container_with_subtype/byte_container_with_subtype/
+    byte_container_with_subtype(const container_type& b) noexcept(noexcept(container_type(b)))
+        : container_type(b)
+    {}
+
+    /// @sa https://json.nlohmann.me/api/byte_container_with_subtype/byte_container_with_subtype/
+    byte_container_with_subtype(container_type&& b) noexcept(noexcept(container_type(std::move(b))))
+        : container_type(std::move(b))
+    {}
+
+    /// @sa https://json.nlohmann.me/api/byte_container_with_subtype/byte_container_with_subtype/
+    byte_container_with_subtype(const container_type& b, subtype_type subtype_) noexcept(noexcept(container_type(b)))
+        : container_type(b)
+        , m_subtype(subtype_)
+        , m_has_subtype(true)
+    {}
+
+    /// @sa https://json.nlohmann.me/api/byte_container_with_subtype/byte_container_with_subtype/
+    byte_container_with_subtype(container_type&& b, subtype_type subtype_) noexcept(noexcept(container_type(std::move(b))))
+        : container_type(std::move(b))
+        , m_subtype(subtype_)
+        , m_has_subtype(true)
+    {}
+
+    bool operator==(const byte_container_with_subtype& rhs) const
+    {
+        return std::tie(static_cast<const BinaryType&>(*this), m_subtype, m_has_subtype) ==
+               std::tie(static_cast<const BinaryType&>(rhs), rhs.m_subtype, rhs.m_has_subtype);
+    }
+
+    bool operator!=(const byte_container_with_subtype& rhs) const
+    {
+        return !(rhs == *this);
+    }
+
+    /// @brief sets the binary subtype
+    /// @sa https://json.nlohmann.me/api/byte_container_with_subtype/set_subtype/
+    void set_subtype(subtype_type subtype_) noexcept
+    {
+        m_subtype = subtype_;
+        m_has_subtype = true;
+    }
+
+    /// @brief return the binary subtype
+    /// @sa https://json.nlohmann.me/api/byte_container_with_subtype/subtype/
+    constexpr subtype_type subtype() const noexcept
+    {
+        return m_has_subtype ? m_subtype : static_cast<subtype_type>(-1);
+    }
+
+    /// @brief return whether the value has a subtype
+    /// @sa https://json.nlohmann.me/api/byte_container_with_subtype/has_subtype/
+    constexpr bool has_subtype() const noexcept
+    {
+        return m_has_subtype;
+    }
+
+    /// @brief clears the binary subtype
+    /// @sa https://json.nlohmann.me/api/byte_container_with_subtype/clear_subtype/
+    void clear_subtype() noexcept
+    {
+        m_subtype = 0;
+        m_has_subtype = false;
+    }
+
+  private:
+    subtype_type m_subtype = 0;
+    bool m_has_subtype = false;
+};
+
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/conversions/from_json.hpp>
+
+// #include <nlohmann/detail/conversions/to_json.hpp>
+
+// #include <nlohmann/detail/exceptions.hpp>
+
+// #include <nlohmann/detail/hash.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013 - 2025 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <cstdint> // uint8_t
+#include <cstddef> // size_t
+#include <functional> // hash
+
+// #include <nlohmann/detail/abi_macros.hpp>
+
+// #include <nlohmann/detail/value_t.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+// boost::hash_combine
+inline std::size_t combine(std::size_t seed, std::size_t h) noexcept
+{
+    seed ^= h + 0x9e3779b9 + (seed << 6U) + (seed >> 2U);
+    return seed;
+}
+
+/*!
+@brief hash a JSON value
+
+The hash function tries to rely on std::hash where possible. Furthermore, the
+type of the JSON value is taken into account to have different hash values for
+null, 0, 0U, and false, etc.
+
+@tparam BasicJsonType basic_json specialization
+@param j JSON value to hash
+@return hash value of j
+*/
+template<typename BasicJsonType>
+std::size_t hash(const BasicJsonType& j)
+{
+    using string_t = typename BasicJsonType::string_t;
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+
+    const auto type = static_cast<std::size_t>(j.type());
+    switch (j.type())
+    {
+        case BasicJsonType::value_t::null:
+        case BasicJsonType::value_t::discarded:
+        {
+            return combine(type, 0);
+        }
+
+        case BasicJsonType::value_t::object:
+        {
+            auto seed = combine(type, j.size());
+            for (const auto& element : j.items())
+            {
+                const auto h = std::hash<string_t> {}(element.key());
+                seed = combine(seed, h);
+                seed = combine(seed, hash(element.value()));
+            }
+            return seed;
+        }
+
+        case BasicJsonType::value_t::array:
+        {
+            auto seed = combine(type, j.size());
+            for (const auto& element : j)
+            {
+                seed = combine(seed, hash(element));
+            }
+            return seed;
+        }
+
+        case BasicJsonType::value_t::string:
+        {
+            const auto h = std::hash<string_t> {}(j.template get_ref<const string_t&>());
+            return combine(type, h);
+        }
+
+        case BasicJsonType::value_t::boolean:
+        {
+            const auto h = std::hash<bool> {}(j.template get<bool>());
+            return combine(type, h);
+        }
+
+        case BasicJsonType::value_t::number_integer:
+        {
+            const auto h = std::hash<number_integer_t> {}(j.template get<number_integer_t>());
+            return combine(type, h);
+        }
+
+        case BasicJsonType::value_t::number_unsigned:
+        {
+            const auto h = std::hash<number_unsigned_t> {}(j.template get<number_unsigned_t>());
+            return combine(type, h);
+        }
+
+        case BasicJsonType::value_t::number_float:
+        {
+            const auto h = std::hash<number_float_t> {}(j.template get<number_float_t>());
+            return combine(type, h);
+        }
+
+        case BasicJsonType::value_t::binary:
+        {
+            auto seed = combine(type, j.get_binary().size());
+            const auto h = std::hash<bool> {}(j.get_binary().has_subtype());
+            seed = combine(seed, h);
+            seed = combine(seed, static_cast<std::size_t>(j.get_binary().subtype()));
+            for (const auto byte : j.get_binary())
+            {
+                seed = combine(seed, std::hash<std::uint8_t> {}(byte));
+            }
+            return seed;
+        }
+
+        default:                   // LCOV_EXCL_LINE
+            JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
+            return 0;              // LCOV_EXCL_LINE
+    }
+}
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/input/binary_reader.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013 - 2025 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <algorithm> // generate_n
+#include <array> // array
+#include <cmath> // ldexp
+#include <cstddef> // size_t
+#include <cstdint> // uint8_t, uint16_t, uint32_t, uint64_t
+#include <cstdio> // snprintf
+#include <cstring> // memcpy
+#include <iterator> // back_inserter
+#include <limits> // numeric_limits
+#include <string> // char_traits, string
+#include <utility> // make_pair, move
+#include <vector> // vector
+#ifdef __cpp_lib_byteswap
+    #include <bit>  //byteswap
+#endif
+
+// #include <nlohmann/detail/exceptions.hpp>
+
+// #include <nlohmann/detail/input/input_adapters.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013 - 2025 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <array> // array
+#include <cstddef> // size_t
+#include <cstring> // strlen
+#include <iterator> // begin, end, iterator_traits, random_access_iterator_tag, distance, next
+#include <memory> // shared_ptr, make_shared, addressof
+#include <numeric> // accumulate
+#include <string> // string, char_traits
+#include <type_traits> // enable_if, is_base_of, is_pointer, is_integral, remove_pointer
+#include <utility> // pair, declval
+
+#ifndef JSON_NO_IO
+    #include <cstdio>   // FILE *
+    #include <istream>  // istream
+#endif                  // JSON_NO_IO
+
+// #include <nlohmann/detail/exceptions.hpp>
+
+// #include <nlohmann/detail/iterators/iterator_traits.hpp>
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/meta/type_traits.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+/// the supported input formats
+enum class input_format_t { json, cbor, msgpack, ubjson, bson, bjdata };
+
+////////////////////
+// input adapters //
+////////////////////
+
+#ifndef JSON_NO_IO
+/*!
+Input adapter for stdio file access. This adapter read only 1 byte and do not use any
+ buffer. This adapter is a very low level adapter.
+*/
+class file_input_adapter
+{
+  public:
+    using char_type = char;
+
+    JSON_HEDLEY_NON_NULL(2)
+    explicit file_input_adapter(std::FILE* f) noexcept
+        : m_file(f)
+    {
+        JSON_ASSERT(m_file != nullptr);
+    }
+
+    // make class move-only
+    file_input_adapter(const file_input_adapter&) = delete;
+    file_input_adapter(file_input_adapter&&) noexcept = default;
+    file_input_adapter& operator=(const file_input_adapter&) = delete;
+    file_input_adapter& operator=(file_input_adapter&&) = delete;
+    ~file_input_adapter() = default;
+
+    std::char_traits<char>::int_type get_character() noexcept
+    {
+        return std::fgetc(m_file);
+    }
+
+    // returns the number of characters successfully read
+    template<class T>
+    std::size_t get_elements(T* dest, std::size_t count = 1)
+    {
+        return fread(dest, 1, sizeof(T) * count, m_file);
+    }
+
+  private:
+    /// the file pointer to read from
+    std::FILE* m_file;
+};
+
+/*!
+Input adapter for a (caching) istream. Ignores a UFT Byte Order Mark at
+beginning of input. Does not support changing the underlying std::streambuf
+in mid-input. Maintains underlying std::istream and std::streambuf to support
+subsequent use of standard std::istream operations to process any input
+characters following those used in parsing the JSON input.  Clears the
+std::istream flags; any input errors (e.g., EOF) will be detected by the first
+subsequent call for input from the std::istream.
+*/
+class input_stream_adapter
+{
+  public:
+    using char_type = char;
+
+    ~input_stream_adapter()
+    {
+        // clear stream flags; we use underlying streambuf I/O, do not
+        // maintain ifstream flags, except eof
+        if (is != nullptr)
+        {
+            is->clear(is->rdstate() & std::ios::eofbit);
+        }
+    }
+
+    explicit input_stream_adapter(std::istream& i)
+        : is(&i), sb(i.rdbuf())
+    {}
+
+    // delete because of pointer members
+    input_stream_adapter(const input_stream_adapter&) = delete;
+    input_stream_adapter& operator=(input_stream_adapter&) = delete;
+    input_stream_adapter& operator=(input_stream_adapter&&) = delete;
+
+    input_stream_adapter(input_stream_adapter&& rhs) noexcept
+        : is(rhs.is), sb(rhs.sb)
+    {
+        rhs.is = nullptr;
+        rhs.sb = nullptr;
+    }
+
+    // std::istream/std::streambuf use std::char_traits<char>::to_int_type, to
+    // ensure that std::char_traits<char>::eof() and the character 0xFF do not
+    // end up as the same value, e.g. 0xFFFFFFFF.
+    std::char_traits<char>::int_type get_character()
+    {
+        auto res = sb->sbumpc();
+        // set eof manually, as we don't use the istream interface.
+        if (JSON_HEDLEY_UNLIKELY(res == std::char_traits<char>::eof()))
+        {
+            is->clear(is->rdstate() | std::ios::eofbit);
+        }
+        return res;
+    }
+
+    template<class T>
+    std::size_t get_elements(T* dest, std::size_t count = 1)
+    {
+        auto res = static_cast<std::size_t>(sb->sgetn(reinterpret_cast<char*>(dest), static_cast<std::streamsize>(count * sizeof(T))));
+        if (JSON_HEDLEY_UNLIKELY(res < count * sizeof(T)))
+        {
+            is->clear(is->rdstate() | std::ios::eofbit);
+        }
+        return res;
+    }
+
+  private:
+    /// the associated input stream
+    std::istream* is = nullptr;
+    std::streambuf* sb = nullptr;
+};
+#endif  // JSON_NO_IO
+
+// General-purpose iterator-based adapter. It might not be as fast as
+// theoretically possible for some containers, but it is extremely versatile.
+template<typename IteratorType>
+class iterator_input_adapter
+{
+  public:
+    using char_type = typename std::iterator_traits<IteratorType>::value_type;
+
+    iterator_input_adapter(IteratorType first, IteratorType last)
+        : current(std::move(first)), end(std::move(last))
+    {}
+
+    typename char_traits<char_type>::int_type get_character()
+    {
+        if (JSON_HEDLEY_LIKELY(current != end))
+        {
+            auto result = char_traits<char_type>::to_int_type(*current);
+            std::advance(current, 1);
+            return result;
+        }
+
+        return char_traits<char_type>::eof();
+    }
+
+    // for general iterators, we cannot really do something better than falling back to processing the range one-by-one
+    template<class T>
+    std::size_t get_elements(T* dest, std::size_t count = 1)
+    {
+        auto* ptr = reinterpret_cast<char*>(dest);
+        for (std::size_t read_index = 0; read_index < count * sizeof(T); ++read_index)
+        {
+            if (JSON_HEDLEY_LIKELY(current != end))
+            {
+                ptr[read_index] = static_cast<char>(*current);
+                std::advance(current, 1);
+            }
+            else
+            {
+                return read_index;
+            }
+        }
+        return count * sizeof(T);
+    }
+
+  private:
+    IteratorType current;
+    IteratorType end;
+
+    template<typename BaseInputAdapter, size_t T>
+    friend struct wide_string_input_helper;
+
+    bool empty() const
+    {
+        return current == end;
+    }
+};
+
+template<typename BaseInputAdapter, size_t T>
+struct wide_string_input_helper;
+
+template<typename BaseInputAdapter>
+struct wide_string_input_helper<BaseInputAdapter, 4>
+{
+    // UTF-32
+    static void fill_buffer(BaseInputAdapter& input,
+                            std::array<std::char_traits<char>::int_type, 4>& utf8_bytes,
+                            size_t& utf8_bytes_index,
+                            size_t& utf8_bytes_filled)
+    {
+        utf8_bytes_index = 0;
+
+        if (JSON_HEDLEY_UNLIKELY(input.empty()))
+        {
+            utf8_bytes[0] = std::char_traits<char>::eof();
+            utf8_bytes_filled = 1;
+        }
+        else
+        {
+            // get the current character
+            const auto wc = input.get_character();
+
+            // UTF-32 to UTF-8 encoding
+            if (wc < 0x80)
+            {
+                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(wc);
+                utf8_bytes_filled = 1;
+            }
+            else if (wc <= 0x7FF)
+            {
+                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(0xC0u | ((static_cast<unsigned int>(wc) >> 6u) & 0x1Fu));
+                utf8_bytes[1] = static_cast<std::char_traits<char>::int_type>(0x80u | (static_cast<unsigned int>(wc) & 0x3Fu));
+                utf8_bytes_filled = 2;
+            }
+            else if (wc <= 0xFFFF)
+            {
+                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(0xE0u | ((static_cast<unsigned int>(wc) >> 12u) & 0x0Fu));
+                utf8_bytes[1] = static_cast<std::char_traits<char>::int_type>(0x80u | ((static_cast<unsigned int>(wc) >> 6u) & 0x3Fu));
+                utf8_bytes[2] = static_cast<std::char_traits<char>::int_type>(0x80u | (static_cast<unsigned int>(wc) & 0x3Fu));
+                utf8_bytes_filled = 3;
+            }
+            else if (wc <= 0x10FFFF)
+            {
+                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(0xF0u | ((static_cast<unsigned int>(wc) >> 18u) & 0x07u));
+                utf8_bytes[1] = static_cast<std::char_traits<char>::int_type>(0x80u | ((static_cast<unsigned int>(wc) >> 12u) & 0x3Fu));
+                utf8_bytes[2] = static_cast<std::char_traits<char>::int_type>(0x80u | ((static_cast<unsigned int>(wc) >> 6u) & 0x3Fu));
+                utf8_bytes[3] = static_cast<std::char_traits<char>::int_type>(0x80u | (static_cast<unsigned int>(wc) & 0x3Fu));
+                utf8_bytes_filled = 4;
+            }
+            else
+            {
+                // unknown character
+                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(wc);
+                utf8_bytes_filled = 1;
+            }
+        }
+    }
+};
+
+template<typename BaseInputAdapter>
+struct wide_string_input_helper<BaseInputAdapter, 2>
+{
+    // UTF-16
+    static void fill_buffer(BaseInputAdapter& input,
+                            std::array<std::char_traits<char>::int_type, 4>& utf8_bytes,
+                            size_t& utf8_bytes_index,
+                            size_t& utf8_bytes_filled)
+    {
+        utf8_bytes_index = 0;
+
+        if (JSON_HEDLEY_UNLIKELY(input.empty()))
+        {
+            utf8_bytes[0] = std::char_traits<char>::eof();
+            utf8_bytes_filled = 1;
+        }
+        else
+        {
+            // get the current character
+            const auto wc = input.get_character();
+
+            // UTF-16 to UTF-8 encoding
+            if (wc < 0x80)
+            {
+                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(wc);
+                utf8_bytes_filled = 1;
+            }
+            else if (wc <= 0x7FF)
+            {
+                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(0xC0u | ((static_cast<unsigned int>(wc) >> 6u)));
+                utf8_bytes[1] = static_cast<std::char_traits<char>::int_type>(0x80u | (static_cast<unsigned int>(wc) & 0x3Fu));
+                utf8_bytes_filled = 2;
+            }
+            else if (0xD800 > wc || wc >= 0xE000)
+            {
+                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(0xE0u | ((static_cast<unsigned int>(wc) >> 12u)));
+                utf8_bytes[1] = static_cast<std::char_traits<char>::int_type>(0x80u | ((static_cast<unsigned int>(wc) >> 6u) & 0x3Fu));
+                utf8_bytes[2] = static_cast<std::char_traits<char>::int_type>(0x80u | (static_cast<unsigned int>(wc) & 0x3Fu));
+                utf8_bytes_filled = 3;
+            }
+            else
+            {
+                if (JSON_HEDLEY_UNLIKELY(!input.empty()))
+                {
+                    const auto wc2 = static_cast<unsigned int>(input.get_character());
+                    const auto charcode = 0x10000u + (((static_cast<unsigned int>(wc) & 0x3FFu) << 10u) | (wc2 & 0x3FFu));
+                    utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(0xF0u | (charcode >> 18u));
+                    utf8_bytes[1] = static_cast<std::char_traits<char>::int_type>(0x80u | ((charcode >> 12u) & 0x3Fu));
+                    utf8_bytes[2] = static_cast<std::char_traits<char>::int_type>(0x80u | ((charcode >> 6u) & 0x3Fu));
+                    utf8_bytes[3] = static_cast<std::char_traits<char>::int_type>(0x80u | (charcode & 0x3Fu));
+                    utf8_bytes_filled = 4;
+                }
+                else
+                {
+                    utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(wc);
+                    utf8_bytes_filled = 1;
+                }
+            }
+        }
+    }
+};
+
+// Wraps another input adapter to convert wide character types into individual bytes.
+template<typename BaseInputAdapter, typename WideCharType>
+class wide_string_input_adapter
+{
+  public:
+    using char_type = char;
+
+    wide_string_input_adapter(BaseInputAdapter base)
+        : base_adapter(base) {}
+
+    typename std::char_traits<char>::int_type get_character() noexcept
+    {
+        // check if buffer needs to be filled
+        if (utf8_bytes_index == utf8_bytes_filled)
+        {
+            fill_buffer<sizeof(WideCharType)>();
+
+            JSON_ASSERT(utf8_bytes_filled > 0);
+            JSON_ASSERT(utf8_bytes_index == 0);
+        }
+
+        // use buffer
+        JSON_ASSERT(utf8_bytes_filled > 0);
+        JSON_ASSERT(utf8_bytes_index < utf8_bytes_filled);
+        return utf8_bytes[utf8_bytes_index++];
+    }
+
+    // parsing binary with wchar doesn't make sense, but since the parsing mode can be runtime, we need something here
+    template<class T>
+    std::size_t get_elements(T* /*dest*/, std::size_t /*count*/ = 1)
+    {
+        JSON_THROW(parse_error::create(112, 1, "wide string type cannot be interpreted as binary data", nullptr));
+    }
+
+  private:
+    BaseInputAdapter base_adapter;
+
+    template<size_t T>
+    void fill_buffer()
+    {
+        wide_string_input_helper<BaseInputAdapter, T>::fill_buffer(base_adapter, utf8_bytes, utf8_bytes_index, utf8_bytes_filled);
+    }
+
+    /// a buffer for UTF-8 bytes
+    std::array<std::char_traits<char>::int_type, 4> utf8_bytes = {{0, 0, 0, 0}};
+
+    /// index to the utf8_codes array for the next valid byte
+    std::size_t utf8_bytes_index = 0;
+    /// number of valid bytes in the utf8_codes array
+    std::size_t utf8_bytes_filled = 0;
+};
+
+template<typename IteratorType, typename Enable = void>
+struct iterator_input_adapter_factory
+{
+    using iterator_type = IteratorType;
+    using char_type = typename std::iterator_traits<iterator_type>::value_type;
+    using adapter_type = iterator_input_adapter<iterator_type>;
+
+    static adapter_type create(IteratorType first, IteratorType last)
+    {
+        return adapter_type(std::move(first), std::move(last));
+    }
+};
+
+template<typename T>
+struct is_iterator_of_multibyte
+{
+    using value_type = typename std::iterator_traits<T>::value_type;
+    enum
+    {
+        value = sizeof(value_type) > 1
+    };
+};
+
+template<typename IteratorType>
+struct iterator_input_adapter_factory<IteratorType, enable_if_t<is_iterator_of_multibyte<IteratorType>::value>>
+{
+    using iterator_type = IteratorType;
+    using char_type = typename std::iterator_traits<iterator_type>::value_type;
+    using base_adapter_type = iterator_input_adapter<iterator_type>;
+    using adapter_type = wide_string_input_adapter<base_adapter_type, char_type>;
+
+    static adapter_type create(IteratorType first, IteratorType last)
+    {
+        return adapter_type(base_adapter_type(std::move(first), std::move(last)));
+    }
+};
+
+// General purpose iterator-based input
+template<typename IteratorType>
+typename iterator_input_adapter_factory<IteratorType>::adapter_type input_adapter(IteratorType first, IteratorType last)
+{
+    using factory_type = iterator_input_adapter_factory<IteratorType>;
+    return factory_type::create(first, last);
+}
+
+// Convenience shorthand from container to iterator
+// Enables ADL on begin(container) and end(container)
+// Encloses the using declarations in namespace for not to leak them to outside scope
+
+namespace container_input_adapter_factory_impl
+{
+
+using std::begin;
+using std::end;
+
+template<typename ContainerType, typename Enable = void>
+struct container_input_adapter_factory {};
+
+template<typename ContainerType>
+struct container_input_adapter_factory< ContainerType,
+       void_t<decltype(begin(std::declval<ContainerType>()), end(std::declval<ContainerType>()))>>
+       {
+           using adapter_type = decltype(input_adapter(begin(std::declval<ContainerType>()), end(std::declval<ContainerType>())));
+
+           static adapter_type create(const ContainerType& container)
+{
+    return input_adapter(begin(container), end(container));
+}
+       };
+
+}  // namespace container_input_adapter_factory_impl
+
+template<typename ContainerType>
+typename container_input_adapter_factory_impl::container_input_adapter_factory<ContainerType>::adapter_type input_adapter(const ContainerType& container)
+{
+    return container_input_adapter_factory_impl::container_input_adapter_factory<ContainerType>::create(container);
+}
+
+// specialization for std::string
+using string_input_adapter_type = decltype(input_adapter(std::declval<std::string>()));
+
+#ifndef JSON_NO_IO
+// Special cases with fast paths
+inline file_input_adapter input_adapter(std::FILE* file)
+{
+    if (file == nullptr)
+    {
+        JSON_THROW(parse_error::create(101, 0, "attempting to parse an empty input; check that your input string or stream contains the expected JSON", nullptr));
+    }
+    return file_input_adapter(file);
+}
+
+inline input_stream_adapter input_adapter(std::istream& stream)
+{
+    return input_stream_adapter(stream);
+}
+
+inline input_stream_adapter input_adapter(std::istream&& stream)
+{
+    return input_stream_adapter(stream);
+}
+#endif  // JSON_NO_IO
+
+using contiguous_bytes_input_adapter = decltype(input_adapter(std::declval<const char*>(), std::declval<const char*>()));
+
+// Null-delimited strings, and the like.
+template < typename CharT,
+           typename std::enable_if <
+               std::is_pointer<CharT>::value&&
+               !std::is_array<CharT>::value&&
+               std::is_integral<typename std::remove_pointer<CharT>::type>::value&&
+               sizeof(typename std::remove_pointer<CharT>::type) == 1,
+               int >::type = 0 >
+contiguous_bytes_input_adapter input_adapter(CharT b)
+{
+    if (b == nullptr)
+    {
+        JSON_THROW(parse_error::create(101, 0, "attempting to parse an empty input; check that your input string or stream contains the expected JSON", nullptr));
+    }
+    auto length = std::strlen(reinterpret_cast<const char*>(b));
+    const auto* ptr = reinterpret_cast<const char*>(b);
+    return input_adapter(ptr, ptr + length); // cppcheck-suppress[nullPointerArithmeticRedundantCheck]
+}
+
+template<typename T, std::size_t N>
+auto input_adapter(T (&array)[N]) -> decltype(input_adapter(array, array + N)) // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
+{
+    return input_adapter(array, array + N);
+}
+
+// This class only handles inputs of input_buffer_adapter type.
+// It's required so that expressions like {ptr, len} can be implicitly cast
+// to the correct adapter.
+class span_input_adapter
+{
+  public:
+    template < typename CharT,
+               typename std::enable_if <
+                   std::is_pointer<CharT>::value&&
+                   std::is_integral<typename std::remove_pointer<CharT>::type>::value&&
+                   sizeof(typename std::remove_pointer<CharT>::type) == 1,
+                   int >::type = 0 >
+    span_input_adapter(CharT b, std::size_t l)
+        : ia(reinterpret_cast<const char*>(b), reinterpret_cast<const char*>(b) + l) {}
+
+    template<class IteratorType,
+             typename std::enable_if<
+                 std::is_same<typename iterator_traits<IteratorType>::iterator_category, std::random_access_iterator_tag>::value,
+                 int>::type = 0>
+    span_input_adapter(IteratorType first, IteratorType last)
+        : ia(input_adapter(first, last)) {}
+
+    contiguous_bytes_input_adapter&& get()
+    {
+        return std::move(ia); // NOLINT(hicpp-move-const-arg,performance-move-const-arg)
+    }
+
+  private:
+    contiguous_bytes_input_adapter ia;
+};
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/input/json_sax.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013 - 2025 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <cstddef>
+#include <string> // string
+#include <type_traits> // enable_if_t
+#include <utility> // move
+#include <vector> // vector
+
+// #include <nlohmann/detail/exceptions.hpp>
+
+// #include <nlohmann/detail/input/lexer.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013 - 2025 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <array> // array
+#include <clocale> // localeconv
+#include <cstddef> // size_t
+#include <cstdio> // snprintf
+#include <cstdlib> // strtof, strtod, strtold, strtoll, strtoull
+#include <initializer_list> // initializer_list
+#include <string> // char_traits, string
+#include <utility> // move
+#include <vector> // vector
+
+// #include <nlohmann/detail/input/input_adapters.hpp>
+
+// #include <nlohmann/detail/input/position_t.hpp>
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/meta/type_traits.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+///////////
+// lexer //
+///////////
+
+template<typename BasicJsonType>
+class lexer_base
+{
+  public:
+    /// token types for the parser
+    enum class token_type
+    {
+        uninitialized,    ///< indicating the scanner is uninitialized
+        literal_true,     ///< the `true` literal
+        literal_false,    ///< the `false` literal
+        literal_null,     ///< the `null` literal
+        value_string,     ///< a string -- use get_string() for actual value
+        value_unsigned,   ///< an unsigned integer -- use get_number_unsigned() for actual value
+        value_integer,    ///< a signed integer -- use get_number_integer() for actual value
+        value_float,      ///< an floating point number -- use get_number_float() for actual value
+        begin_array,      ///< the character for array begin `[`
+        begin_object,     ///< the character for object begin `{`
+        end_array,        ///< the character for array end `]`
+        end_object,       ///< the character for object end `}`
+        name_separator,   ///< the name separator `:`
+        value_separator,  ///< the value separator `,`
+        parse_error,      ///< indicating a parse error
+        end_of_input,     ///< indicating the end of the input buffer
+        literal_or_value  ///< a literal or the begin of a value (only for diagnostics)
+    };
+
+    /// return name of values of type token_type (only used for errors)
+    JSON_HEDLEY_RETURNS_NON_NULL
+    JSON_HEDLEY_CONST
+    static const char* token_type_name(const token_type t) noexcept
+    {
+        switch (t)
+        {
+            case token_type::uninitialized:
+                return "<uninitialized>";
+            case token_type::literal_true:
+                return "true literal";
+            case token_type::literal_false:
+                return "false literal";
+            case token_type::literal_null:
+                return "null literal";
+            case token_type::value_string:
+                return "string literal";
+            case token_type::value_unsigned:
+            case token_type::value_integer:
+            case token_type::value_float:
+                return "number literal";
+            case token_type::begin_array:
+                return "'['";
+            case token_type::begin_object:
+                return "'{'";
+            case token_type::end_array:
+                return "']'";
+            case token_type::end_object:
+                return "'}'";
+            case token_type::name_separator:
+                return "':'";
+            case token_type::value_separator:
+                return "','";
+            case token_type::parse_error:
+                return "<parse error>";
+            case token_type::end_of_input:
+                return "end of input";
+            case token_type::literal_or_value:
+                return "'[', '{', or a literal";
+            // LCOV_EXCL_START
+            default: // catch non-enum values
+                return "unknown token";
+                // LCOV_EXCL_STOP
+        }
+    }
+};
+/*!
+@brief lexical analysis
+
+This class organizes the lexical analysis during JSON deserialization.
+*/
+template<typename BasicJsonType, typename InputAdapterType>
+class lexer : public lexer_base<BasicJsonType>
+{
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+    using string_t = typename BasicJsonType::string_t;
+    using char_type = typename InputAdapterType::char_type;
+    using char_int_type = typename char_traits<char_type>::int_type;
+
+  public:
+    using token_type = typename lexer_base<BasicJsonType>::token_type;
+
+    explicit lexer(InputAdapterType&& adapter, bool ignore_comments_ = false) noexcept
+        : ia(std::move(adapter))
+        , ignore_comments(ignore_comments_)
+        , decimal_point_char(static_cast<char_int_type>(get_decimal_point()))
+    {}
+
+    // delete because of pointer members
+    lexer(const lexer&) = delete;
+    lexer(lexer&&) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor)
+    lexer& operator=(lexer&) = delete;
+    lexer& operator=(lexer&&) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor)
+    ~lexer() = default;
+
+  private:
+    /////////////////////
+    // locales
+    /////////////////////
+
+    /// return the locale-dependent decimal point
+    JSON_HEDLEY_PURE
+    static char get_decimal_point() noexcept
+    {
+        const auto* loc = localeconv();
+        JSON_ASSERT(loc != nullptr);
+        return (loc->decimal_point == nullptr) ? '.' : *(loc->decimal_point);
+    }
+
+    /////////////////////
+    // scan functions
+    /////////////////////
+
+    /*!
+    @brief get codepoint from 4 hex characters following `\u`
+
+    For input "\u c1 c2 c3 c4" the codepoint is:
+      (c1 * 0x1000) + (c2 * 0x0100) + (c3 * 0x0010) + c4
+    = (c1 << 12) + (c2 << 8) + (c3 << 4) + (c4 << 0)
+
+    Furthermore, the possible characters '0'..'9', 'A'..'F', and 'a'..'f'
+    must be converted to the integers 0x0..0x9, 0xA..0xF, 0xA..0xF, resp. The
+    conversion is done by subtracting the offset (0x30, 0x37, and 0x57)
+    between the ASCII value of the character and the desired integer value.
+
+    @return codepoint (0x0000..0xFFFF) or -1 in case of an error (e.g. EOF or
+            non-hex character)
+    */
+    int get_codepoint()
+    {
+        // this function only makes sense after reading `\u`
+        JSON_ASSERT(current == 'u');
+        int codepoint = 0;
+
+        const auto factors = { 12u, 8u, 4u, 0u };
+        for (const auto factor : factors)
+        {
+            get();
+
+            if (current >= '0' && current <= '9')
+            {
+                codepoint += static_cast<int>((static_cast<unsigned int>(current) - 0x30u) << factor);
+            }
+            else if (current >= 'A' && current <= 'F')
+            {
+                codepoint += static_cast<int>((static_cast<unsigned int>(current) - 0x37u) << factor);
+            }
+            else if (current >= 'a' && current <= 'f')
+            {
+                codepoint += static_cast<int>((static_cast<unsigned int>(current) - 0x57u) << factor);
+            }
+            else
+            {
+                return -1;
+            }
+        }
+
+        JSON_ASSERT(0x0000 <= codepoint && codepoint <= 0xFFFF);
+        return codepoint;
+    }
+
+    /*!
+    @brief check if the next byte(s) are inside a given range
+
+    Adds the current byte and, for each passed range, reads a new byte and
+    checks if it is inside the range. If a violation was detected, set up an
+    error message and return false. Otherwise, return true.
+
+    @param[in] ranges  list of integers; interpreted as list of pairs of
+                       inclusive lower and upper bound, respectively
+
+    @pre The passed list @a ranges must have 2, 4, or 6 elements; that is,
+         1, 2, or 3 pairs. This precondition is enforced by an assertion.
+
+    @return true if and only if no range violation was detected
+    */
+    bool next_byte_in_range(std::initializer_list<char_int_type> ranges)
+    {
+        JSON_ASSERT(ranges.size() == 2 || ranges.size() == 4 || ranges.size() == 6);
+        add(current);
+
+        for (auto range = ranges.begin(); range != ranges.end(); ++range)
+        {
+            get();
+            if (JSON_HEDLEY_LIKELY(*range <= current && current <= *(++range))) // NOLINT(bugprone-inc-dec-in-conditions)
+            {
+                add(current);
+            }
+            else
+            {
+                error_message = "invalid string: ill-formed UTF-8 byte";
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /*!
+    @brief scan a string literal
+
+    This function scans a string according to Sect. 7 of RFC 8259. While
+    scanning, bytes are escaped and copied into buffer token_buffer. Then the
+    function returns successfully, token_buffer is *not* null-terminated (as it
+    may contain \0 bytes), and token_buffer.size() is the number of bytes in the
+    string.
+
+    @return token_type::value_string if string could be successfully scanned,
+            token_type::parse_error otherwise
+
+    @note In case of errors, variable error_message contains a textual
+          description.
+    */
+    token_type scan_string()
+    {
+        // reset token_buffer (ignore opening quote)
+        reset();
+
+        // we entered the function by reading an open quote
+        JSON_ASSERT(current == '\"');
+
+        while (true)
+        {
+            // get next character
+            switch (get())
+            {
+                // end of file while parsing string
+                case char_traits<char_type>::eof():
+                {
+                    error_message = "invalid string: missing closing quote";
+                    return token_type::parse_error;
+                }
+
+                // closing quote
+                case '\"':
+                {
+                    return token_type::value_string;
+                }
+
+                // escapes
+                case '\\':
+                {
+                    switch (get())
+                    {
+                        // quotation mark
+                        case '\"':
+                            add('\"');
+                            break;
+                        // reverse solidus
+                        case '\\':
+                            add('\\');
+                            break;
+                        // solidus
+                        case '/':
+                            add('/');
+                            break;
+                        // backspace
+                        case 'b':
+                            add('\b');
+                            break;
+                        // form feed
+                        case 'f':
+                            add('\f');
+                            break;
+                        // line feed
+                        case 'n':
+                            add('\n');
+                            break;
+                        // carriage return
+                        case 'r':
+                            add('\r');
+                            break;
+                        // tab
+                        case 't':
+                            add('\t');
+                            break;
+
+                        // unicode escapes
+                        case 'u':
+                        {
+                            const int codepoint1 = get_codepoint();
+                            int codepoint = codepoint1; // start with codepoint1
+
+                            if (JSON_HEDLEY_UNLIKELY(codepoint1 == -1))
+                            {
+                                error_message = "invalid string: '\\u' must be followed by 4 hex digits";
+                                return token_type::parse_error;
+                            }
+
+                            // check if code point is a high surrogate
+                            if (0xD800 <= codepoint1 && codepoint1 <= 0xDBFF)
+                            {
+                                // expect next \uxxxx entry
+                                if (JSON_HEDLEY_LIKELY(get() == '\\' && get() == 'u'))
+                                {
+                                    const int codepoint2 = get_codepoint();
+
+                                    if (JSON_HEDLEY_UNLIKELY(codepoint2 == -1))
+                                    {
+                                        error_message = "invalid string: '\\u' must be followed by 4 hex digits";
+                                        return token_type::parse_error;
+                                    }
+
+                                    // check if codepoint2 is a low surrogate
+                                    if (JSON_HEDLEY_LIKELY(0xDC00 <= codepoint2 && codepoint2 <= 0xDFFF))
+                                    {
+                                        // overwrite codepoint
+                                        codepoint = static_cast<int>(
+                                                        // high surrogate occupies the most significant 22 bits
+                                                        (static_cast<unsigned int>(codepoint1) << 10u)
+                                                        // low surrogate occupies the least significant 15 bits
+                                                        + static_cast<unsigned int>(codepoint2)
+                                                        // there is still the 0xD800, 0xDC00 and 0x10000 noise
+                                                        // in the result, so we have to subtract with:
+                                                        // (0xD800 << 10) + DC00 - 0x10000 = 0x35FDC00
+                                                        - 0x35FDC00u);
+                                    }
+                                    else
+                                    {
+                                        error_message = "invalid string: surrogate U+D800..U+DBFF must be followed by U+DC00..U+DFFF";
+                                        return token_type::parse_error;
+                                    }
+                                }
+                                else
+                                {
+                                    error_message = "invalid string: surrogate U+D800..U+DBFF must be followed by U+DC00..U+DFFF";
+                                    return token_type::parse_error;
+                                }
+                            }
+                            else
+                            {
+                                if (JSON_HEDLEY_UNLIKELY(0xDC00 <= codepoint1 && codepoint1 <= 0xDFFF))
+                                {
+                                    error_message = "invalid string: surrogate U+DC00..U+DFFF must follow U+D800..U+DBFF";
+                                    return token_type::parse_error;
+                                }
+                            }
+
+                            // result of the above calculation yields a proper codepoint
+                            JSON_ASSERT(0x00 <= codepoint && codepoint <= 0x10FFFF);
+
+                            // translate codepoint into bytes
+                            if (codepoint < 0x80)
+                            {
+                                // 1-byte characters: 0xxxxxxx (ASCII)
+                                add(static_cast<char_int_type>(codepoint));
+                            }
+                            else if (codepoint <= 0x7FF)
+                            {
+                                // 2-byte characters: 110xxxxx 10xxxxxx
+                                add(static_cast<char_int_type>(0xC0u | (static_cast<unsigned int>(codepoint) >> 6u)));
+                                add(static_cast<char_int_type>(0x80u | (static_cast<unsigned int>(codepoint) & 0x3Fu)));
+                            }
+                            else if (codepoint <= 0xFFFF)
+                            {
+                                // 3-byte characters: 1110xxxx 10xxxxxx 10xxxxxx
+                                add(static_cast<char_int_type>(0xE0u | (static_cast<unsigned int>(codepoint) >> 12u)));
+                                add(static_cast<char_int_type>(0x80u | ((static_cast<unsigned int>(codepoint) >> 6u) & 0x3Fu)));
+                                add(static_cast<char_int_type>(0x80u | (static_cast<unsigned int>(codepoint) & 0x3Fu)));
+                            }
+                            else
+                            {
+                                // 4-byte characters: 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
+                                add(static_cast<char_int_type>(0xF0u | (static_cast<unsigned int>(codepoint) >> 18u)));
+                                add(static_cast<char_int_type>(0x80u | ((static_cast<unsigned int>(codepoint) >> 12u) & 0x3Fu)));
+                                add(static_cast<char_int_type>(0x80u | ((static_cast<unsigned int>(codepoint) >> 6u) & 0x3Fu)));
+                                add(static_cast<char_int_type>(0x80u | (static_cast<unsigned int>(codepoint) & 0x3Fu)));
+                            }
+
+                            break;
+                        }
+
+                        // other characters after escape
+                        default:
+                            error_message = "invalid string: forbidden character after backslash";
+                            return token_type::parse_error;
+                    }
+
+                    break;
+                }
+
+                // invalid control characters
+                case 0x00:
+                {
+                    error_message = "invalid string: control character U+0000 (NUL) must be escaped to \\u0000";
+                    return token_type::parse_error;
+                }
+
+                case 0x01:
+                {
+                    error_message = "invalid string: control character U+0001 (SOH) must be escaped to \\u0001";
+                    return token_type::parse_error;
+                }
+
+                case 0x02:
+                {
+                    error_message = "invalid string: control character U+0002 (STX) must be escaped to \\u0002";
+                    return token_type::parse_error;
+                }
+
+                case 0x03:
+                {
+                    error_message = "invalid string: control character U+0003 (ETX) must be escaped to \\u0003";
+                    return token_type::parse_error;
+                }
+
+                case 0x04:
+                {
+                    error_message = "invalid string: control character U+0004 (EOT) must be escaped to \\u0004";
+                    return token_type::parse_error;
+                }
+
+                case 0x05:
+                {
+                    error_message = "invalid string: control character U+0005 (ENQ) must be escaped to \\u0005";
+                    return token_type::parse_error;
+                }
+
+                case 0x06:
+                {
+                    error_message = "invalid string: control character U+0006 (ACK) must be escaped to \\u0006";
+                    return token_type::parse_error;
+                }
+
+                case 0x07:
+                {
+                    error_message = "invalid string: control character U+0007 (BEL) must be escaped to \\u0007";
+                    return token_type::parse_error;
+                }
+
+                case 0x08:
+                {
+                    error_message = "invalid string: control character U+0008 (BS) must be escaped to \\u0008 or \\b";
+                    return token_type::parse_error;
+                }
+
+                case 0x09:
+                {
+                    error_message = "invalid string: control character U+0009 (HT) must be escaped to \\u0009 or \\t";
+                    return token_type::parse_error;
+                }
+
+                case 0x0A:
+                {
+                    error_message = "invalid string: control character U+000A (LF) must be escaped to \\u000A or \\n";
+                    return token_type::parse_error;
+                }
+
+                case 0x0B:
+                {
+                    error_message = "invalid string: control character U+000B (VT) must be escaped to \\u000B";
+                    return token_type::parse_error;
+                }
+
+                case 0x0C:
+                {
+                    error_message = "invalid string: control character U+000C (FF) must be escaped to \\u000C or \\f";
+                    return token_type::parse_error;
+                }
+
+                case 0x0D:
+                {
+                    error_message = "invalid string: control character U+000D (CR) must be escaped to \\u000D or \\r";
+                    return token_type::parse_error;
+                }
+
+                case 0x0E:
+                {
+                    error_message = "invalid string: control character U+000E (SO) must be escaped to \\u000E";
+                    return token_type::parse_error;
+                }
+
+                case 0x0F:
+                {
+                    error_message = "invalid string: control character U+000F (SI) must be escaped to \\u000F";
+                    return token_type::parse_error;
+                }
+
+                case 0x10:
+                {
+                    error_message = "invalid string: control character U+0010 (DLE) must be escaped to \\u0010";
+                    return token_type::parse_error;
+                }
+
+                case 0x11:
+                {
+                    error_message = "invalid string: control character U+0011 (DC1) must be escaped to \\u0011";
+                    return token_type::parse_error;
+                }
+
+                case 0x12:
+                {
+                    error_message = "invalid string: control character U+0012 (DC2) must be escaped to \\u0012";
+                    return token_type::parse_error;
+                }
+
+                case 0x13:
+                {
+                    error_message = "invalid string: control character U+0013 (DC3) must be escaped to \\u0013";
+                    return token_type::parse_error;
+                }
+
+                case 0x14:
+                {
+                    error_message = "invalid string: control character U+0014 (DC4) must be escaped to \\u0014";
+                    return token_type::parse_error;
+                }
+
+                case 0x15:
+                {
+                    error_message = "invalid string: control character U+0015 (NAK) must be escaped to \\u0015";
+                    return token_type::parse_error;
+                }
+
+                case 0x16:
+                {
+                    error_message = "invalid string: control character U+0016 (SYN) must be escaped to \\u0016";
+                    return token_type::parse_error;
+                }
+
+                case 0x17:
+                {
+                    error_message = "invalid string: control character U+0017 (ETB) must be escaped to \\u0017";
+                    return token_type::parse_error;
+                }
+
+                case 0x18:
+                {
+                    error_message = "invalid string: control character U+0018 (CAN) must be escaped to \\u0018";
+                    return token_type::parse_error;
+                }
+
+                case 0x19:
+                {
+                    error_message = "invalid string: control character U+0019 (EM) must be escaped to \\u0019";
+                    return token_type::parse_error;
+                }
+
+                case 0x1A:
+                {
+                    error_message = "invalid string: control character U+001A (SUB) must be escaped to \\u001A";
+                    return token_type::parse_error;
+                }
+
+                case 0x1B:
+                {
+                    error_message = "invalid string: control character U+001B (ESC) must be escaped to \\u001B";
+                    return token_type::parse_error;
+                }
+
+                case 0x1C:
+                {
+                    error_message = "invalid string: control character U+001C (FS) must be escaped to \\u001C";
+                    return token_type::parse_error;
+                }
+
+                case 0x1D:
+                {
+                    error_message = "invalid string: control character U+001D (GS) must be escaped to \\u001D";
+                    return token_type::parse_error;
+                }
+
+                case 0x1E:
+                {
+                    error_message = "invalid string: control character U+001E (RS) must be escaped to \\u001E";
+                    return token_type::parse_error;
+                }
+
+                case 0x1F:
+                {
+                    error_message = "invalid string: control character U+001F (US) must be escaped to \\u001F";
+                    return token_type::parse_error;
+                }
+
+                // U+0020..U+007F (except U+0022 (quote) and U+005C (backspace))
+                case 0x20:
+                case 0x21:
+                case 0x23:
+                case 0x24:
+                case 0x25:
+                case 0x26:
+                case 0x27:
+                case 0x28:
+                case 0x29:
+                case 0x2A:
+                case 0x2B:
+                case 0x2C:
+                case 0x2D:
+                case 0x2E:
+                case 0x2F:
+                case 0x30:
+                case 0x31:
+                case 0x32:
+                case 0x33:
+                case 0x34:
+                case 0x35:
+                case 0x36:
+                case 0x37:
+                case 0x38:
+                case 0x39:
+                case 0x3A:
+                case 0x3B:
+                case 0x3C:
+                case 0x3D:
+                case 0x3E:
+                case 0x3F:
+                case 0x40:
+                case 0x41:
+                case 0x42:
+                case 0x43:
+                case 0x44:
+                case 0x45:
+                case 0x46:
+                case 0x47:
+                case 0x48:
+                case 0x49:
+                case 0x4A:
+                case 0x4B:
+                case 0x4C:
+                case 0x4D:
+                case 0x4E:
+                case 0x4F:
+                case 0x50:
+                case 0x51:
+                case 0x52:
+                case 0x53:
+                case 0x54:
+                case 0x55:
+                case 0x56:
+                case 0x57:
+                case 0x58:
+                case 0x59:
+                case 0x5A:
+                case 0x5B:
+                case 0x5D:
+                case 0x5E:
+                case 0x5F:
+                case 0x60:
+                case 0x61:
+                case 0x62:
+                case 0x63:
+                case 0x64:
+                case 0x65:
+                case 0x66:
+                case 0x67:
+                case 0x68:
+                case 0x69:
+                case 0x6A:
+                case 0x6B:
+                case 0x6C:
+                case 0x6D:
+                case 0x6E:
+                case 0x6F:
+                case 0x70:
+                case 0x71:
+                case 0x72:
+                case 0x73:
+                case 0x74:
+                case 0x75:
+                case 0x76:
+                case 0x77:
+                case 0x78:
+                case 0x79:
+                case 0x7A:
+                case 0x7B:
+                case 0x7C:
+                case 0x7D:
+                case 0x7E:
+                case 0x7F:
+                {
+                    add(current);
+                    break;
+                }
+
+                // U+0080..U+07FF: bytes C2..DF 80..BF
+                case 0xC2:
+                case 0xC3:
+                case 0xC4:
+                case 0xC5:
+                case 0xC6:
+                case 0xC7:
+                case 0xC8:
+                case 0xC9:
+                case 0xCA:
+                case 0xCB:
+                case 0xCC:
+                case 0xCD:
+                case 0xCE:
+                case 0xCF:
+                case 0xD0:
+                case 0xD1:
+                case 0xD2:
+                case 0xD3:
+                case 0xD4:
+                case 0xD5:
+                case 0xD6:
+                case 0xD7:
+                case 0xD8:
+                case 0xD9:
+                case 0xDA:
+                case 0xDB:
+                case 0xDC:
+                case 0xDD:
+                case 0xDE:
+                case 0xDF:
+                {
+                    if (JSON_HEDLEY_UNLIKELY(!next_byte_in_range({0x80, 0xBF})))
+                    {
+                        return token_type::parse_error;
+                    }
+                    break;
+                }
+
+                // U+0800..U+0FFF: bytes E0 A0..BF 80..BF
+                case 0xE0:
+                {
+                    if (JSON_HEDLEY_UNLIKELY(!(next_byte_in_range({0xA0, 0xBF, 0x80, 0xBF}))))
+                    {
+                        return token_type::parse_error;
+                    }
+                    break;
+                }
+
+                // U+1000..U+CFFF: bytes E1..EC 80..BF 80..BF
+                // U+E000..U+FFFF: bytes EE..EF 80..BF 80..BF
+                case 0xE1:
+                case 0xE2:
+                case 0xE3:
+                case 0xE4:
+                case 0xE5:
+                case 0xE6:
+                case 0xE7:
+                case 0xE8:
+                case 0xE9:
+                case 0xEA:
+                case 0xEB:
+                case 0xEC:
+                case 0xEE:
+                case 0xEF:
+                {
+                    if (JSON_HEDLEY_UNLIKELY(!(next_byte_in_range({0x80, 0xBF, 0x80, 0xBF}))))
+                    {
+                        return token_type::parse_error;
+                    }
+                    break;
+                }
+
+                // U+D000..U+D7FF: bytes ED 80..9F 80..BF
+                case 0xED:
+                {
+                    if (JSON_HEDLEY_UNLIKELY(!(next_byte_in_range({0x80, 0x9F, 0x80, 0xBF}))))
+                    {
+                        return token_type::parse_error;
+                    }
+                    break;
+                }
+
+                // U+10000..U+3FFFF F0 90..BF 80..BF 80..BF
+                case 0xF0:
+                {
+                    if (JSON_HEDLEY_UNLIKELY(!(next_byte_in_range({0x90, 0xBF, 0x80, 0xBF, 0x80, 0xBF}))))
+                    {
+                        return token_type::parse_error;
+                    }
+                    break;
+                }
+
+                // U+40000..U+FFFFF F1..F3 80..BF 80..BF 80..BF
+                case 0xF1:
+                case 0xF2:
+                case 0xF3:
+                {
+                    if (JSON_HEDLEY_UNLIKELY(!(next_byte_in_range({0x80, 0xBF, 0x80, 0xBF, 0x80, 0xBF}))))
+                    {
+                        return token_type::parse_error;
+                    }
+                    break;
+                }
+
+                // U+100000..U+10FFFF F4 80..8F 80..BF 80..BF
+                case 0xF4:
+                {
+                    if (JSON_HEDLEY_UNLIKELY(!(next_byte_in_range({0x80, 0x8F, 0x80, 0xBF, 0x80, 0xBF}))))
+                    {
+                        return token_type::parse_error;
+                    }
+                    break;
+                }
+
+                // remaining bytes (80..C1 and F5..FF) are ill-formed
+                default:
+                {
+                    error_message = "invalid string: ill-formed UTF-8 byte";
+                    return token_type::parse_error;
+                }
+            }
+        }
+    }
+
+    /*!
+     * @brief scan a comment
+     * @return whether comment could be scanned successfully
+     */
+    bool scan_comment()
+    {
+        switch (get())
+        {
+            // single-line comments skip input until a newline or EOF is read
+            case '/':
+            {
+                while (true)
+                {
+                    switch (get())
+                    {
+                        case '\n':
+                        case '\r':
+                        case char_traits<char_type>::eof():
+                        case '\0':
+                            return true;
+
+                        default:
+                            break;
+                    }
+                }
+            }
+
+            // multi-line comments skip input until */ is read
+            case '*':
+            {
+                while (true)
+                {
+                    switch (get())
+                    {
+                        case char_traits<char_type>::eof():
+                        case '\0':
+                        {
+                            error_message = "invalid comment; missing closing '*/'";
+                            return false;
+                        }
+
+                        case '*':
+                        {
+                            switch (get())
+                            {
+                                case '/':
+                                    return true;
+
+                                default:
+                                {
+                                    unget();
+                                    continue;
+                                }
+                            }
+                        }
+
+                        default:
+                            continue;
+                    }
+                }
+            }
+
+            // unexpected character after reading '/'
+            default:
+            {
+                error_message = "invalid comment; expecting '/' or '*' after '/'";
+                return false;
+            }
+        }
+    }
+
+    JSON_HEDLEY_NON_NULL(2)
+    static void strtof(float& f, const char* str, char** endptr) noexcept
+    {
+        f = std::strtof(str, endptr);
+    }
+
+    JSON_HEDLEY_NON_NULL(2)
+    static void strtof(double& f, const char* str, char** endptr) noexcept
+    {
+        f = std::strtod(str, endptr);
+    }
+
+    JSON_HEDLEY_NON_NULL(2)
+    static void strtof(long double& f, const char* str, char** endptr) noexcept
+    {
+        f = std::strtold(str, endptr);
+    }
+
+    /*!
+    @brief scan a number literal
+
+    This function scans a string according to Sect. 6 of RFC 8259.
+
+    The function is realized with a deterministic finite state machine derived
+    from the grammar described in RFC 8259. Starting in state "init", the
+    input is read and used to determined the next state. Only state "done"
+    accepts the number. State "error" is a trap state to model errors. In the
+    table below, "anything" means any character but the ones listed before.
+
+    state    | 0        | 1-9      | e E      | +       | -       | .        | anything
+    ---------|----------|----------|----------|---------|---------|----------|-----------
+    init     | zero     | any1     | [error]  | [error] | minus   | [error]  | [error]
+    minus    | zero     | any1     | [error]  | [error] | [error] | [error]  | [error]
+    zero     | done     | done     | exponent | done    | done    | decimal1 | done
+    any1     | any1     | any1     | exponent | done    | done    | decimal1 | done
+    decimal1 | decimal2 | decimal2 | [error]  | [error] | [error] | [error]  | [error]
+    decimal2 | decimal2 | decimal2 | exponent | done    | done    | done     | done
+    exponent | any2     | any2     | [error]  | sign    | sign    | [error]  | [error]
+    sign     | any2     | any2     | [error]  | [error] | [error] | [error]  | [error]
+    any2     | any2     | any2     | done     | done    | done    | done     | done
+
+    The state machine is realized with one label per state (prefixed with
+    "scan_number_") and `goto` statements between them. The state machine
+    contains cycles, but any cycle can be left when EOF is read. Therefore,
+    the function is guaranteed to terminate.
+
+    During scanning, the read bytes are stored in token_buffer. This string is
+    then converted to a signed integer, an unsigned integer, or a
+    floating-point number.
+
+    @return token_type::value_unsigned, token_type::value_integer, or
+            token_type::value_float if number could be successfully scanned,
+            token_type::parse_error otherwise
+
+    @note The scanner is independent of the current locale. Internally, the
+          locale's decimal point is used instead of `.` to work with the
+          locale-dependent converters.
+    */
+    token_type scan_number()  // lgtm [cpp/use-of-goto] `goto` is used in this function to implement the number-parsing state machine described above. By design, any finite input will eventually reach the "done" state or return token_type::parse_error. In each intermediate state, 1 byte of the input is appended to the token_buffer vector, and only the already initialized variables token_buffer, number_type, and error_message are manipulated.
+    {
+        // reset token_buffer to store the number's bytes
+        reset();
+
+        // the type of the parsed number; initially set to unsigned; will be
+        // changed if minus sign, decimal point or exponent is read
+        token_type number_type = token_type::value_unsigned;
+
+        // state (init): we just found out we need to scan a number
+        switch (current)
+        {
+            case '-':
+            {
+                add(current);
+                goto scan_number_minus;
+            }
+
+            case '0':
+            {
+                add(current);
+                goto scan_number_zero;
+            }
+
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+            {
+                add(current);
+                goto scan_number_any1;
+            }
+
+            // all other characters are rejected outside scan_number()
+            default:            // LCOV_EXCL_LINE
+                JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
+        }
+
+scan_number_minus:
+        // state: we just parsed a leading minus sign
+        number_type = token_type::value_integer;
+        switch (get())
+        {
+            case '0':
+            {
+                add(current);
+                goto scan_number_zero;
+            }
+
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+            {
+                add(current);
+                goto scan_number_any1;
+            }
+
+            default:
+            {
+                error_message = "invalid number; expected digit after '-'";
+                return token_type::parse_error;
+            }
+        }
+
+scan_number_zero:
+        // state: we just parse a zero (maybe with a leading minus sign)
+        switch (get())
+        {
+            case '.':
+            {
+                add(decimal_point_char);
+                decimal_point_position = token_buffer.size() - 1;
+                goto scan_number_decimal1;
+            }
+
+            case 'e':
+            case 'E':
+            {
+                add(current);
+                goto scan_number_exponent;
+            }
+
+            default:
+                goto scan_number_done;
+        }
+
+scan_number_any1:
+        // state: we just parsed a number 0-9 (maybe with a leading minus sign)
+        switch (get())
+        {
+            case '0':
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+            {
+                add(current);
+                goto scan_number_any1;
+            }
+
+            case '.':
+            {
+                add(decimal_point_char);
+                decimal_point_position = token_buffer.size() - 1;
+                goto scan_number_decimal1;
+            }
+
+            case 'e':
+            case 'E':
+            {
+                add(current);
+                goto scan_number_exponent;
+            }
+
+            default:
+                goto scan_number_done;
+        }
+
+scan_number_decimal1:
+        // state: we just parsed a decimal point
+        number_type = token_type::value_float;
+        switch (get())
+        {
+            case '0':
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+            {
+                add(current);
+                goto scan_number_decimal2;
+            }
+
+            default:
+            {
+                error_message = "invalid number; expected digit after '.'";
+                return token_type::parse_error;
+            }
+        }
+
+scan_number_decimal2:
+        // we just parsed at least one number after a decimal point
+        switch (get())
+        {
+            case '0':
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+            {
+                add(current);
+                goto scan_number_decimal2;
+            }
+
+            case 'e':
+            case 'E':
+            {
+                add(current);
+                goto scan_number_exponent;
+            }
+
+            default:
+                goto scan_number_done;
+        }
+
+scan_number_exponent:
+        // we just parsed an exponent
+        number_type = token_type::value_float;
+        switch (get())
+        {
+            case '+':
+            case '-':
+            {
+                add(current);
+                goto scan_number_sign;
+            }
+
+            case '0':
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+            {
+                add(current);
+                goto scan_number_any2;
+            }
+
+            default:
+            {
+                error_message =
+                    "invalid number; expected '+', '-', or digit after exponent";
+                return token_type::parse_error;
+            }
+        }
+
+scan_number_sign:
+        // we just parsed an exponent sign
+        switch (get())
+        {
+            case '0':
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+            {
+                add(current);
+                goto scan_number_any2;
+            }
+
+            default:
+            {
+                error_message = "invalid number; expected digit after exponent sign";
+                return token_type::parse_error;
+            }
+        }
+
+scan_number_any2:
+        // we just parsed a number after the exponent or exponent sign
+        switch (get())
+        {
+            case '0':
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+            {
+                add(current);
+                goto scan_number_any2;
+            }
+
+            default:
+                goto scan_number_done;
+        }
+
+scan_number_done:
+        // unget the character after the number (we only read it to know that
+        // we are done scanning a number)
+        unget();
+
+        char* endptr = nullptr; // NOLINT(misc-const-correctness,cppcoreguidelines-pro-type-vararg,hicpp-vararg)
+        errno = 0;
+
+        // try to parse integers first and fall back to floats
+        if (number_type == token_type::value_unsigned)
+        {
+            const auto x = std::strtoull(token_buffer.data(), &endptr, 10);
+
+            // we checked the number format before
+            JSON_ASSERT(endptr == token_buffer.data() + token_buffer.size());
+
+            if (errno != ERANGE)
+            {
+                value_unsigned = static_cast<number_unsigned_t>(x);
+                if (value_unsigned == x)
+                {
+                    return token_type::value_unsigned;
+                }
+            }
+        }
+        else if (number_type == token_type::value_integer)
+        {
+            const auto x = std::strtoll(token_buffer.data(), &endptr, 10);
+
+            // we checked the number format before
+            JSON_ASSERT(endptr == token_buffer.data() + token_buffer.size());
+
+            if (errno != ERANGE)
+            {
+                value_integer = static_cast<number_integer_t>(x);
+                if (value_integer == x)
+                {
+                    return token_type::value_integer;
+                }
+            }
+        }
+
+        // this code is reached if we parse a floating-point number or if an
+        // integer conversion above failed
+        strtof(value_float, token_buffer.data(), &endptr);
+
+        // we checked the number format before
+        JSON_ASSERT(endptr == token_buffer.data() + token_buffer.size());
+
+        return token_type::value_float;
+    }
+
+    /*!
+    @param[in] literal_text  the literal text to expect
+    @param[in] length        the length of the passed literal text
+    @param[in] return_type   the token type to return on success
+    */
+    JSON_HEDLEY_NON_NULL(2)
+    token_type scan_literal(const char_type* literal_text, const std::size_t length,
+                            token_type return_type)
+    {
+        JSON_ASSERT(char_traits<char_type>::to_char_type(current) == literal_text[0]);
+        for (std::size_t i = 1; i < length; ++i)
+        {
+            if (JSON_HEDLEY_UNLIKELY(char_traits<char_type>::to_char_type(get()) != literal_text[i]))
+            {
+                error_message = "invalid literal";
+                return token_type::parse_error;
+            }
+        }
+        return return_type;
+    }
+
+    /////////////////////
+    // input management
+    /////////////////////
+
+    /// reset token_buffer; current character is beginning of token
+    void reset() noexcept
+    {
+        token_buffer.clear();
+        token_string.clear();
+        decimal_point_position = std::string::npos;
+        token_string.push_back(char_traits<char_type>::to_char_type(current));
+    }
+
+    /*
+    @brief get next character from the input
+
+    This function provides the interface to the used input adapter. It does
+    not throw in case the input reached EOF, but returns a
+    `char_traits<char>::eof()` in that case.  Stores the scanned characters
+    for use in error messages.
+
+    @return character read from the input
+    */
+    char_int_type get()
+    {
+        ++position.chars_read_total;
+        ++position.chars_read_current_line;
+
+        if (next_unget)
+        {
+            // just reset the next_unget variable and work with current
+            next_unget = false;
+        }
+        else
+        {
+            current = ia.get_character();
+        }
+
+        if (JSON_HEDLEY_LIKELY(current != char_traits<char_type>::eof()))
+        {
+            token_string.push_back(char_traits<char_type>::to_char_type(current));
+        }
+
+        if (current == '\n')
+        {
+            ++position.lines_read;
+            position.chars_read_current_line = 0;
+        }
+
+        return current;
+    }
+
+    /*!
+    @brief unget current character (read it again on next get)
+
+    We implement unget by setting variable next_unget to true. The input is not
+    changed - we just simulate ungetting by modifying chars_read_total,
+    chars_read_current_line, and token_string. The next call to get() will
+    behave as if the unget character is read again.
+    */
+    void unget()
+    {
+        next_unget = true;
+
+        --position.chars_read_total;
+
+        // in case we "unget" a newline, we have to also decrement the lines_read
+        if (position.chars_read_current_line == 0)
+        {
+            if (position.lines_read > 0)
+            {
+                --position.lines_read;
+            }
+        }
+        else
+        {
+            --position.chars_read_current_line;
+        }
+
+        if (JSON_HEDLEY_LIKELY(current != char_traits<char_type>::eof()))
+        {
+            JSON_ASSERT(!token_string.empty());
+            token_string.pop_back();
+        }
+    }
+
+    /// add a character to token_buffer
+    void add(char_int_type c)
+    {
+        token_buffer.push_back(static_cast<typename string_t::value_type>(c));
+    }
+
+  public:
+    /////////////////////
+    // value getters
+    /////////////////////
+
+    /// return integer value
+    constexpr number_integer_t get_number_integer() const noexcept
+    {
+        return value_integer;
+    }
+
+    /// return unsigned integer value
+    constexpr number_unsigned_t get_number_unsigned() const noexcept
+    {
+        return value_unsigned;
+    }
+
+    /// return floating-point value
+    constexpr number_float_t get_number_float() const noexcept
+    {
+        return value_float;
+    }
+
+    /// return current string value (implicitly resets the token; useful only once)
+    string_t& get_string()
+    {
+        // translate decimal points from locale back to '.' (#4084)
+        if (decimal_point_char != '.' && decimal_point_position != std::string::npos)
+        {
+            token_buffer[decimal_point_position] = '.';
+        }
+        return token_buffer;
+    }
+
+    /////////////////////
+    // diagnostics
+    /////////////////////
+
+    /// return position of last read token
+    constexpr position_t get_position() const noexcept
+    {
+        return position;
+    }
+
+    /// return the last read token (for errors only).  Will never contain EOF
+    /// (an arbitrary value that is not a valid char value, often -1), because
+    /// 255 may legitimately occur.  May contain NUL, which should be escaped.
+    std::string get_token_string() const
+    {
+        // escape control characters
+        std::string result;
+        for (const auto c : token_string)
+        {
+            if (static_cast<unsigned char>(c) <= '\x1F')
+            {
+                // escape control characters
+                std::array<char, 9> cs{{}};
+                static_cast<void>((std::snprintf)(cs.data(), cs.size(), "<U+%.4X>", static_cast<unsigned char>(c))); // NOLINT(cppcoreguidelines-pro-type-vararg,hicpp-vararg)
+                result += cs.data();
+            }
+            else
+            {
+                // add character as is
+                result.push_back(static_cast<std::string::value_type>(c));
+            }
+        }
+
+        return result;
+    }
+
+    /// return syntax error message
+    JSON_HEDLEY_RETURNS_NON_NULL
+    constexpr const char* get_error_message() const noexcept
+    {
+        return error_message;
+    }
+
+    /////////////////////
+    // actual scanner
+    /////////////////////
+
+    /*!
+    @brief skip the UTF-8 byte order mark
+    @return true iff there is no BOM or the correct BOM has been skipped
+    */
+    bool skip_bom()
+    {
+        if (get() == 0xEF)
+        {
+            // check if we completely parse the BOM
+            return get() == 0xBB && get() == 0xBF;
+        }
+
+        // the first character is not the beginning of the BOM; unget it to
+        // process is later
+        unget();
+        return true;
+    }
+
+    void skip_whitespace()
+    {
+        do
+        {
+            get();
+        }
+        while (current == ' ' || current == '\t' || current == '\n' || current == '\r');
+    }
+
+    token_type scan()
+    {
+        // initially, skip the BOM
+        if (position.chars_read_total == 0 && !skip_bom())
+        {
+            error_message = "invalid BOM; must be 0xEF 0xBB 0xBF if given";
+            return token_type::parse_error;
+        }
+
+        // read next character and ignore whitespace
+        skip_whitespace();
+
+        // ignore comments
+        while (ignore_comments && current == '/')
+        {
+            if (!scan_comment())
+            {
+                return token_type::parse_error;
+            }
+
+            // skip following whitespace
+            skip_whitespace();
+        }
+
+        switch (current)
+        {
+            // structural characters
+            case '[':
+                return token_type::begin_array;
+            case ']':
+                return token_type::end_array;
+            case '{':
+                return token_type::begin_object;
+            case '}':
+                return token_type::end_object;
+            case ':':
+                return token_type::name_separator;
+            case ',':
+                return token_type::value_separator;
+
+            // literals
+            case 't':
+            {
+                std::array<char_type, 4> true_literal = {{static_cast<char_type>('t'), static_cast<char_type>('r'), static_cast<char_type>('u'), static_cast<char_type>('e')}};
+                return scan_literal(true_literal.data(), true_literal.size(), token_type::literal_true);
+            }
+            case 'f':
+            {
+                std::array<char_type, 5> false_literal = {{static_cast<char_type>('f'), static_cast<char_type>('a'), static_cast<char_type>('l'), static_cast<char_type>('s'), static_cast<char_type>('e')}};
+                return scan_literal(false_literal.data(), false_literal.size(), token_type::literal_false);
+            }
+            case 'n':
+            {
+                std::array<char_type, 4> null_literal = {{static_cast<char_type>('n'), static_cast<char_type>('u'), static_cast<char_type>('l'), static_cast<char_type>('l')}};
+                return scan_literal(null_literal.data(), null_literal.size(), token_type::literal_null);
+            }
+
+            // string
+            case '\"':
+                return scan_string();
+
+            // number
+            case '-':
+            case '0':
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+                return scan_number();
+
+            // end of input (the null byte is needed when parsing from
+            // string literals)
+            case '\0':
+            case char_traits<char_type>::eof():
+                return token_type::end_of_input;
+
+            // error
+            default:
+                error_message = "invalid literal";
+                return token_type::parse_error;
+        }
+    }
+
+  private:
+    /// input adapter
+    InputAdapterType ia;
+
+    /// whether comments should be ignored (true) or signaled as errors (false)
+    const bool ignore_comments = false;
+
+    /// the current character
+    char_int_type current = char_traits<char_type>::eof();
+
+    /// whether the next get() call should just return current
+    bool next_unget = false;
+
+    /// the start position of the current token
+    position_t position {};
+
+    /// raw input token string (for error messages)
+    std::vector<char_type> token_string {};
+
+    /// buffer for variable-length tokens (numbers, strings)
+    string_t token_buffer {};
+
+    /// a description of occurred lexer errors
+    const char* error_message = "";
+
+    // number values
+    number_integer_t value_integer = 0;
+    number_unsigned_t value_unsigned = 0;
+    number_float_t value_float = 0;
+
+    /// the decimal point
+    const char_int_type decimal_point_char = '.';
+    /// the position of the decimal point in the input
+    std::size_t decimal_point_position = std::string::npos;
+};
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/string_concat.hpp>
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+
+/*!
+@brief SAX interface
+
+This class describes the SAX interface used by @ref nlohmann::json::sax_parse.
+Each function is called in different situations while the input is parsed. The
+boolean return value informs the parser whether to continue processing the
+input.
+*/
+template<typename BasicJsonType>
+struct json_sax
+{
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+    using string_t = typename BasicJsonType::string_t;
+    using binary_t = typename BasicJsonType::binary_t;
+
+    /*!
+    @brief a null value was read
+    @return whether parsing should proceed
+    */
+    virtual bool null() = 0;
+
+    /*!
+    @brief a boolean value was read
+    @param[in] val  boolean value
+    @return whether parsing should proceed
+    */
+    virtual bool boolean(bool val) = 0;
+
+    /*!
+    @brief an integer number was read
+    @param[in] val  integer value
+    @return whether parsing should proceed
+    */
+    virtual bool number_integer(number_integer_t val) = 0;
+
+    /*!
+    @brief an unsigned integer number was read
+    @param[in] val  unsigned integer value
+    @return whether parsing should proceed
+    */
+    virtual bool number_unsigned(number_unsigned_t val) = 0;
+
+    /*!
+    @brief a floating-point number was read
+    @param[in] val  floating-point value
+    @param[in] s    raw token value
+    @return whether parsing should proceed
+    */
+    virtual bool number_float(number_float_t val, const string_t& s) = 0;
+
+    /*!
+    @brief a string value was read
+    @param[in] val  string value
+    @return whether parsing should proceed
+    @note It is safe to move the passed string value.
+    */
+    virtual bool string(string_t& val) = 0;
+
+    /*!
+    @brief a binary value was read
+    @param[in] val  binary value
+    @return whether parsing should proceed
+    @note It is safe to move the passed binary value.
+    */
+    virtual bool binary(binary_t& val) = 0;
+
+    /*!
+    @brief the beginning of an object was read
+    @param[in] elements  number of object elements or -1 if unknown
+    @return whether parsing should proceed
+    @note binary formats may report the number of elements
+    */
+    virtual bool start_object(std::size_t elements) = 0;
+
+    /*!
+    @brief an object key was read
+    @param[in] val  object key
+    @return whether parsing should proceed
+    @note It is safe to move the passed string.
+    */
+    virtual bool key(string_t& val) = 0;
+
+    /*!
+    @brief the end of an object was read
+    @return whether parsing should proceed
+    */
+    virtual bool end_object() = 0;
+
+    /*!
+    @brief the beginning of an array was read
+    @param[in] elements  number of array elements or -1 if unknown
+    @return whether parsing should proceed
+    @note binary formats may report the number of elements
+    */
+    virtual bool start_array(std::size_t elements) = 0;
+
+    /*!
+    @brief the end of an array was read
+    @return whether parsing should proceed
+    */
+    virtual bool end_array() = 0;
+
+    /*!
+    @brief a parse error occurred
+    @param[in] position    the position in the input where the error occurs
+    @param[in] last_token  the last read token
+    @param[in] ex          an exception object describing the error
+    @return whether parsing should proceed (must return false)
+    */
+    virtual bool parse_error(std::size_t position,
+                             const std::string& last_token,
+                             const detail::exception& ex) = 0;
+
+    json_sax() = default;
+    json_sax(const json_sax&) = default;
+    json_sax(json_sax&&) noexcept = default;
+    json_sax& operator=(const json_sax&) = default;
+    json_sax& operator=(json_sax&&) noexcept = default;
+    virtual ~json_sax() = default;
+};
+
+namespace detail
+{
+constexpr std::size_t unknown_size()
+{
+    return (std::numeric_limits<std::size_t>::max)();
+}
+
+/*!
+@brief SAX implementation to create a JSON value from SAX events
+
+This class implements the @ref json_sax interface and processes the SAX events
+to create a JSON value which makes it basically a DOM parser. The structure or
+hierarchy of the JSON value is managed by the stack `ref_stack` which contains
+a pointer to the respective array or object for each recursion depth.
+
+After successful parsing, the value that is passed by reference to the
+constructor contains the parsed value.
+
+@tparam BasicJsonType  the JSON type
+*/
+template<typename BasicJsonType, typename InputAdapterType>
+class json_sax_dom_parser
+{
+  public:
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+    using string_t = typename BasicJsonType::string_t;
+    using binary_t = typename BasicJsonType::binary_t;
+    using lexer_t = lexer<BasicJsonType, InputAdapterType>;
+
+    /*!
+    @param[in,out] r  reference to a JSON value that is manipulated while
+                       parsing
+    @param[in] allow_exceptions_  whether parse errors yield exceptions
+    */
+    explicit json_sax_dom_parser(BasicJsonType& r, const bool allow_exceptions_ = true, lexer_t* lexer_ = nullptr)
+        : root(r), allow_exceptions(allow_exceptions_), m_lexer_ref(lexer_)
+    {}
+
+    // make class move-only
+    json_sax_dom_parser(const json_sax_dom_parser&) = delete;
+    json_sax_dom_parser(json_sax_dom_parser&&) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor)
+    json_sax_dom_parser& operator=(const json_sax_dom_parser&) = delete;
+    json_sax_dom_parser& operator=(json_sax_dom_parser&&) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor)
+    ~json_sax_dom_parser() = default;
+
+    bool null()
+    {
+        handle_value(nullptr);
+        return true;
+    }
+
+    bool boolean(bool val)
+    {
+        handle_value(val);
+        return true;
+    }
+
+    bool number_integer(number_integer_t val)
+    {
+        handle_value(val);
+        return true;
+    }
+
+    bool number_unsigned(number_unsigned_t val)
+    {
+        handle_value(val);
+        return true;
+    }
+
+    bool number_float(number_float_t val, const string_t& /*unused*/)
+    {
+        handle_value(val);
+        return true;
+    }
+
+    bool string(string_t& val)
+    {
+        handle_value(val);
+        return true;
+    }
+
+    bool binary(binary_t& val)
+    {
+        handle_value(std::move(val));
+        return true;
+    }
+
+    bool start_object(std::size_t len)
+    {
+        ref_stack.push_back(handle_value(BasicJsonType::value_t::object));
+
+#if JSON_DIAGNOSTIC_POSITIONS
+        // Manually set the start position of the object here.
+        // Ensure this is after the call to handle_value to ensure correct start position.
+        if (m_lexer_ref)
+        {
+            // Lexer has read the first character of the object, so
+            // subtract 1 from the position to get the correct start position.
+            ref_stack.back()->start_position = m_lexer_ref->get_position() - 1;
+        }
+#endif
+
+        if (JSON_HEDLEY_UNLIKELY(len != detail::unknown_size() && len > ref_stack.back()->max_size()))
+        {
+            JSON_THROW(out_of_range::create(408, concat("excessive object size: ", std::to_string(len)), ref_stack.back()));
+        }
+
+        return true;
+    }
+
+    bool key(string_t& val)
+    {
+        JSON_ASSERT(!ref_stack.empty());
+        JSON_ASSERT(ref_stack.back()->is_object());
+
+        // add null at given key and store the reference for later
+        object_element = &(ref_stack.back()->m_data.m_value.object->operator[](val));
+        return true;
+    }
+
+    bool end_object()
+    {
+        JSON_ASSERT(!ref_stack.empty());
+        JSON_ASSERT(ref_stack.back()->is_object());
+
+#if JSON_DIAGNOSTIC_POSITIONS
+        if (m_lexer_ref)
+        {
+            // Lexer's position is past the closing brace, so set that as the end position.
+            ref_stack.back()->end_position = m_lexer_ref->get_position();
+        }
+#endif
+
+        ref_stack.back()->set_parents();
+        ref_stack.pop_back();
+        return true;
+    }
+
+    bool start_array(std::size_t len)
+    {
+        ref_stack.push_back(handle_value(BasicJsonType::value_t::array));
+
+#if JSON_DIAGNOSTIC_POSITIONS
+        // Manually set the start position of the array here.
+        // Ensure this is after the call to handle_value to ensure correct start position.
+        if (m_lexer_ref)
+        {
+            ref_stack.back()->start_position = m_lexer_ref->get_position() - 1;
+        }
+#endif
+
+        if (JSON_HEDLEY_UNLIKELY(len != detail::unknown_size() && len > ref_stack.back()->max_size()))
+        {
+            JSON_THROW(out_of_range::create(408, concat("excessive array size: ", std::to_string(len)), ref_stack.back()));
+        }
+
+        return true;
+    }
+
+    bool end_array()
+    {
+        JSON_ASSERT(!ref_stack.empty());
+        JSON_ASSERT(ref_stack.back()->is_array());
+
+#if JSON_DIAGNOSTIC_POSITIONS
+        if (m_lexer_ref)
+        {
+            // Lexer's position is past the closing bracket, so set that as the end position.
+            ref_stack.back()->end_position = m_lexer_ref->get_position();
+        }
+#endif
+
+        ref_stack.back()->set_parents();
+        ref_stack.pop_back();
+        return true;
+    }
+
+    template<class Exception>
+    bool parse_error(std::size_t /*unused*/, const std::string& /*unused*/,
+                     const Exception& ex)
+    {
+        errored = true;
+        static_cast<void>(ex);
+        if (allow_exceptions)
+        {
+            JSON_THROW(ex);
+        }
+        return false;
+    }
+
+    constexpr bool is_errored() const
+    {
+        return errored;
+    }
+
+  private:
+
+#if JSON_DIAGNOSTIC_POSITIONS
+    void handle_diagnostic_positions_for_json_value(BasicJsonType& v)
+    {
+        if (m_lexer_ref)
+        {
+            // Lexer has read past the current field value, so set the end position to the current position.
+            // The start position will be set below based on the length of the string representation
+            // of the value.
+            v.end_position = m_lexer_ref->get_position();
+
+            switch (v.type())
+            {
+                case value_t::boolean:
+                {
+                    // 4 and 5 are the string length of "true" and "false"
+                    v.start_position = v.end_position - (v.m_data.m_value.boolean ? 4 : 5);
+                    break;
+                }
+
+                case value_t::null:
+                {
+                    // 4 is the string length of "null"
+                    v.start_position = v.end_position - 4;
+                    break;
+                }
+
+                case value_t::string:
+                {
+                    // include the length of the quotes, which is 2
+                    v.start_position = v.end_position - v.m_data.m_value.string->size() - 2;
+                    break;
+                }
+
+                // As we handle the start and end positions for values created during parsing,
+                // we do not expect the following value type to be called. Regardless, set the positions
+                // in case this is created manually or through a different constructor. Exclude from lcov
+                // since the exact condition of this switch is esoteric.
+                // LCOV_EXCL_START
+                case value_t::discarded:
+                {
+                    v.end_position = std::string::npos;
+                    v.start_position = v.end_position;
+                    break;
+                }
+                // LCOV_EXCL_STOP
+                case value_t::binary:
+                case value_t::number_integer:
+                case value_t::number_unsigned:
+                case value_t::number_float:
+                {
+                    v.start_position = v.end_position - m_lexer_ref->get_string().size();
+                    break;
+                }
+                case value_t::object:
+                case value_t::array:
+                {
+                    // object and array are handled in start_object() and start_array() handlers
+                    // skip setting the values here.
+                    break;
+                }
+                default: // LCOV_EXCL_LINE
+                    // Handle all possible types discretely, default handler should never be reached.
+                    JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert,-warnings-as-errors) LCOV_EXCL_LINE
+            }
+        }
+    }
+#endif
+
+    /*!
+    @invariant If the ref stack is empty, then the passed value will be the new
+               root.
+    @invariant If the ref stack contains a value, then it is an array or an
+               object to which we can add elements
+    */
+    template<typename Value>
+    JSON_HEDLEY_RETURNS_NON_NULL
+    BasicJsonType* handle_value(Value&& v)
+    {
+        if (ref_stack.empty())
+        {
+            root = BasicJsonType(std::forward<Value>(v));
+
+#if JSON_DIAGNOSTIC_POSITIONS
+            handle_diagnostic_positions_for_json_value(root);
+#endif
+
+            return &root;
+        }
+
+        JSON_ASSERT(ref_stack.back()->is_array() || ref_stack.back()->is_object());
+
+        if (ref_stack.back()->is_array())
+        {
+            ref_stack.back()->m_data.m_value.array->emplace_back(std::forward<Value>(v));
+
+#if JSON_DIAGNOSTIC_POSITIONS
+            handle_diagnostic_positions_for_json_value(ref_stack.back()->m_data.m_value.array->back());
+#endif
+
+            return &(ref_stack.back()->m_data.m_value.array->back());
+        }
+
+        JSON_ASSERT(ref_stack.back()->is_object());
+        JSON_ASSERT(object_element);
+        *object_element = BasicJsonType(std::forward<Value>(v));
+
+#if JSON_DIAGNOSTIC_POSITIONS
+        handle_diagnostic_positions_for_json_value(*object_element);
+#endif
+
+        return object_element;
+    }
+
+    /// the parsed JSON value
+    BasicJsonType& root;
+    /// stack to model hierarchy of values
+    std::vector<BasicJsonType*> ref_stack {};
+    /// helper to hold the reference for the next object element
+    BasicJsonType* object_element = nullptr;
+    /// whether a syntax error occurred
+    bool errored = false;
+    /// whether to throw exceptions in case of errors
+    const bool allow_exceptions = true;
+    /// the lexer reference to obtain the current position
+    lexer_t* m_lexer_ref = nullptr;
+};
+
+template<typename BasicJsonType, typename InputAdapterType>
+class json_sax_dom_callback_parser
+{
+  public:
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+    using string_t = typename BasicJsonType::string_t;
+    using binary_t = typename BasicJsonType::binary_t;
+    using parser_callback_t = typename BasicJsonType::parser_callback_t;
+    using parse_event_t = typename BasicJsonType::parse_event_t;
+    using lexer_t = lexer<BasicJsonType, InputAdapterType>;
+
+    json_sax_dom_callback_parser(BasicJsonType& r,
+                                 parser_callback_t cb,
+                                 const bool allow_exceptions_ = true,
+                                 lexer_t* lexer_ = nullptr)
+        : root(r), callback(std::move(cb)), allow_exceptions(allow_exceptions_), m_lexer_ref(lexer_)
+    {
+        keep_stack.push_back(true);
+    }
+
+    // make class move-only
+    json_sax_dom_callback_parser(const json_sax_dom_callback_parser&) = delete;
+    json_sax_dom_callback_parser(json_sax_dom_callback_parser&&) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor)
+    json_sax_dom_callback_parser& operator=(const json_sax_dom_callback_parser&) = delete;
+    json_sax_dom_callback_parser& operator=(json_sax_dom_callback_parser&&) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor)
+    ~json_sax_dom_callback_parser() = default;
+
+    bool null()
+    {
+        handle_value(nullptr);
+        return true;
+    }
+
+    bool boolean(bool val)
+    {
+        handle_value(val);
+        return true;
+    }
+
+    bool number_integer(number_integer_t val)
+    {
+        handle_value(val);
+        return true;
+    }
+
+    bool number_unsigned(number_unsigned_t val)
+    {
+        handle_value(val);
+        return true;
+    }
+
+    bool number_float(number_float_t val, const string_t& /*unused*/)
+    {
+        handle_value(val);
+        return true;
+    }
+
+    bool string(string_t& val)
+    {
+        handle_value(val);
+        return true;
+    }
+
+    bool binary(binary_t& val)
+    {
+        handle_value(std::move(val));
+        return true;
+    }
+
+    bool start_object(std::size_t len)
+    {
+        // check callback for object start
+        const bool keep = callback(static_cast<int>(ref_stack.size()), parse_event_t::object_start, discarded);
+        keep_stack.push_back(keep);
+
+        auto val = handle_value(BasicJsonType::value_t::object, true);
+        ref_stack.push_back(val.second);
+
+        if (ref_stack.back())
+        {
+
+#if JSON_DIAGNOSTIC_POSITIONS
+            // Manually set the start position of the object here.
+            // Ensure this is after the call to handle_value to ensure correct start position.
+            if (m_lexer_ref)
+            {
+                // Lexer has read the first character of the object, so
+                // subtract 1 from the position to get the correct start position.
+                ref_stack.back()->start_position = m_lexer_ref->get_position() - 1;
+            }
+#endif
+
+            // check object limit
+            if (JSON_HEDLEY_UNLIKELY(len != detail::unknown_size() && len > ref_stack.back()->max_size()))
+            {
+                JSON_THROW(out_of_range::create(408, concat("excessive object size: ", std::to_string(len)), ref_stack.back()));
+            }
+        }
+        return true;
+    }
+
+    bool key(string_t& val)
+    {
+        BasicJsonType k = BasicJsonType(val);
+
+        // check callback for key
+        const bool keep = callback(static_cast<int>(ref_stack.size()), parse_event_t::key, k);
+        key_keep_stack.push_back(keep);
+
+        // add discarded value at given key and store the reference for later
+        if (keep && ref_stack.back())
+        {
+            object_element = &(ref_stack.back()->m_data.m_value.object->operator[](val) = discarded);
+        }
+
+        return true;
+    }
+
+    bool end_object()
+    {
+        if (ref_stack.back())
+        {
+            if (!callback(static_cast<int>(ref_stack.size()) - 1, parse_event_t::object_end, *ref_stack.back()))
+            {
+                // discard object
+                *ref_stack.back() = discarded;
+
+#if JSON_DIAGNOSTIC_POSITIONS
+                // Set start/end positions for discarded object.
+                handle_diagnostic_positions_for_json_value(*ref_stack.back());
+#endif
+            }
+            else
+            {
+
+#if JSON_DIAGNOSTIC_POSITIONS
+                if (m_lexer_ref)
+                {
+                    // Lexer's position is past the closing brace, so set that as the end position.
+                    ref_stack.back()->end_position = m_lexer_ref->get_position();
+                }
+#endif
+
+                ref_stack.back()->set_parents();
+            }
+        }
+
+        JSON_ASSERT(!ref_stack.empty());
+        JSON_ASSERT(!keep_stack.empty());
+        ref_stack.pop_back();
+        keep_stack.pop_back();
+
+        if (!ref_stack.empty() && ref_stack.back() && ref_stack.back()->is_structured())
+        {
+            // remove discarded value
+            for (auto it = ref_stack.back()->begin(); it != ref_stack.back()->end(); ++it)
+            {
+                if (it->is_discarded())
+                {
+                    ref_stack.back()->erase(it);
+                    break;
+                }
+            }
+        }
+
+        return true;
+    }
+
+    bool start_array(std::size_t len)
+    {
+        const bool keep = callback(static_cast<int>(ref_stack.size()), parse_event_t::array_start, discarded);
+        keep_stack.push_back(keep);
+
+        auto val = handle_value(BasicJsonType::value_t::array, true);
+        ref_stack.push_back(val.second);
+
+        if (ref_stack.back())
+        {
+
+#if JSON_DIAGNOSTIC_POSITIONS
+            // Manually set the start position of the array here.
+            // Ensure this is after the call to handle_value to ensure correct start position.
+            if (m_lexer_ref)
+            {
+                // Lexer has read the first character of the array, so
+                // subtract 1 from the position to get the correct start position.
+                ref_stack.back()->start_position = m_lexer_ref->get_position() - 1;
+            }
+#endif
+
+            // check array limit
+            if (JSON_HEDLEY_UNLIKELY(len != detail::unknown_size() && len > ref_stack.back()->max_size()))
+            {
+                JSON_THROW(out_of_range::create(408, concat("excessive array size: ", std::to_string(len)), ref_stack.back()));
+            }
+        }
+
+        return true;
+    }
+
+    bool end_array()
+    {
+        bool keep = true;
+
+        if (ref_stack.back())
+        {
+            keep = callback(static_cast<int>(ref_stack.size()) - 1, parse_event_t::array_end, *ref_stack.back());
+            if (keep)
+            {
+
+#if JSON_DIAGNOSTIC_POSITIONS
+                if (m_lexer_ref)
+                {
+                    // Lexer's position is past the closing bracket, so set that as the end position.
+                    ref_stack.back()->end_position = m_lexer_ref->get_position();
+                }
+#endif
+
+                ref_stack.back()->set_parents();
+            }
+            else
+            {
+                // discard array
+                *ref_stack.back() = discarded;
+
+#if JSON_DIAGNOSTIC_POSITIONS
+                // Set start/end positions for discarded array.
+                handle_diagnostic_positions_for_json_value(*ref_stack.back());
+#endif
+            }
+        }
+
+        JSON_ASSERT(!ref_stack.empty());
+        JSON_ASSERT(!keep_stack.empty());
+        ref_stack.pop_back();
+        keep_stack.pop_back();
+
+        // remove discarded value
+        if (!keep && !ref_stack.empty() && ref_stack.back()->is_array())
+        {
+            ref_stack.back()->m_data.m_value.array->pop_back();
+        }
+
+        return true;
+    }
+
+    template<class Exception>
+    bool parse_error(std::size_t /*unused*/, const std::string& /*unused*/,
+                     const Exception& ex)
+    {
+        errored = true;
+        static_cast<void>(ex);
+        if (allow_exceptions)
+        {
+            JSON_THROW(ex);
+        }
+        return false;
+    }
+
+    constexpr bool is_errored() const
+    {
+        return errored;
+    }
+
+  private:
+
+#if JSON_DIAGNOSTIC_POSITIONS
+    void handle_diagnostic_positions_for_json_value(BasicJsonType& v)
+    {
+        if (m_lexer_ref)
+        {
+            // Lexer has read past the current field value, so set the end position to the current position.
+            // The start position will be set below based on the length of the string representation
+            // of the value.
+            v.end_position = m_lexer_ref->get_position();
+
+            switch (v.type())
+            {
+                case value_t::boolean:
+                {
+                    // 4 and 5 are the string length of "true" and "false"
+                    v.start_position = v.end_position - (v.m_data.m_value.boolean ? 4 : 5);
+                    break;
+                }
+
+                case value_t::null:
+                {
+                    // 4 is the string length of "null"
+                    v.start_position = v.end_position - 4;
+                    break;
+                }
+
+                case value_t::string:
+                {
+                    // include the length of the quotes, which is 2
+                    v.start_position = v.end_position - v.m_data.m_value.string->size() - 2;
+                    break;
+                }
+
+                case value_t::discarded:
+                {
+                    v.end_position = std::string::npos;
+                    v.start_position = v.end_position;
+                    break;
+                }
+
+                case value_t::binary:
+                case value_t::number_integer:
+                case value_t::number_unsigned:
+                case value_t::number_float:
+                {
+                    v.start_position = v.end_position - m_lexer_ref->get_string().size();
+                    break;
+                }
+
+                case value_t::object:
+                case value_t::array:
+                {
+                    // object and array are handled in start_object() and start_array() handlers
+                    // skip setting the values here.
+                    break;
+                }
+                default: // LCOV_EXCL_LINE
+                    // Handle all possible types discretely, default handler should never be reached.
+                    JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert,-warnings-as-errors) LCOV_EXCL_LINE
+            }
+        }
+    }
+#endif
+
+    /*!
+    @param[in] v  value to add to the JSON value we build during parsing
+    @param[in] skip_callback  whether we should skip calling the callback
+               function; this is required after start_array() and
+               start_object() SAX events, because otherwise we would call the
+               callback function with an empty array or object, respectively.
+
+    @invariant If the ref stack is empty, then the passed value will be the new
+               root.
+    @invariant If the ref stack contains a value, then it is an array or an
+               object to which we can add elements
+
+    @return pair of boolean (whether value should be kept) and pointer (to the
+            passed value in the ref_stack hierarchy; nullptr if not kept)
+    */
+    template<typename Value>
+    std::pair<bool, BasicJsonType*> handle_value(Value&& v, const bool skip_callback = false)
+    {
+        JSON_ASSERT(!keep_stack.empty());
+
+        // do not handle this value if we know it would be added to a discarded
+        // container
+        if (!keep_stack.back())
+        {
+            return {false, nullptr};
+        }
+
+        // create value
+        auto value = BasicJsonType(std::forward<Value>(v));
+
+#if JSON_DIAGNOSTIC_POSITIONS
+        handle_diagnostic_positions_for_json_value(value);
+#endif
+
+        // check callback
+        const bool keep = skip_callback || callback(static_cast<int>(ref_stack.size()), parse_event_t::value, value);
+
+        // do not handle this value if we just learnt it shall be discarded
+        if (!keep)
+        {
+            return {false, nullptr};
+        }
+
+        if (ref_stack.empty())
+        {
+            root = std::move(value);
+            return {true, & root};
+        }
+
+        // skip this value if we already decided to skip the parent
+        // (https://github.com/nlohmann/json/issues/971#issuecomment-413678360)
+        if (!ref_stack.back())
+        {
+            return {false, nullptr};
+        }
+
+        // we now only expect arrays and objects
+        JSON_ASSERT(ref_stack.back()->is_array() || ref_stack.back()->is_object());
+
+        // array
+        if (ref_stack.back()->is_array())
+        {
+            ref_stack.back()->m_data.m_value.array->emplace_back(std::move(value));
+            return {true, & (ref_stack.back()->m_data.m_value.array->back())};
+        }
+
+        // object
+        JSON_ASSERT(ref_stack.back()->is_object());
+        // check if we should store an element for the current key
+        JSON_ASSERT(!key_keep_stack.empty());
+        const bool store_element = key_keep_stack.back();
+        key_keep_stack.pop_back();
+
+        if (!store_element)
+        {
+            return {false, nullptr};
+        }
+
+        JSON_ASSERT(object_element);
+        *object_element = std::move(value);
+        return {true, object_element};
+    }
+
+    /// the parsed JSON value
+    BasicJsonType& root;
+    /// stack to model hierarchy of values
+    std::vector<BasicJsonType*> ref_stack {};
+    /// stack to manage which values to keep
+    std::vector<bool> keep_stack {}; // NOLINT(readability-redundant-member-init)
+    /// stack to manage which object keys to keep
+    std::vector<bool> key_keep_stack {}; // NOLINT(readability-redundant-member-init)
+    /// helper to hold the reference for the next object element
+    BasicJsonType* object_element = nullptr;
+    /// whether a syntax error occurred
+    bool errored = false;
+    /// callback function
+    const parser_callback_t callback = nullptr;
+    /// whether to throw exceptions in case of errors
+    const bool allow_exceptions = true;
+    /// a discarded value for the callback
+    BasicJsonType discarded = BasicJsonType::value_t::discarded;
+    /// the lexer reference to obtain the current position
+    lexer_t* m_lexer_ref = nullptr;
+};
+
+template<typename BasicJsonType>
+class json_sax_acceptor
+{
+  public:
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+    using string_t = typename BasicJsonType::string_t;
+    using binary_t = typename BasicJsonType::binary_t;
+
+    bool null()
+    {
+        return true;
+    }
+
+    bool boolean(bool /*unused*/)
+    {
+        return true;
+    }
+
+    bool number_integer(number_integer_t /*unused*/)
+    {
+        return true;
+    }
+
+    bool number_unsigned(number_unsigned_t /*unused*/)
+    {
+        return true;
+    }
+
+    bool number_float(number_float_t /*unused*/, const string_t& /*unused*/)
+    {
+        return true;
+    }
+
+    bool string(string_t& /*unused*/)
+    {
+        return true;
+    }
+
+    bool binary(binary_t& /*unused*/)
+    {
+        return true;
+    }
+
+    bool start_object(std::size_t /*unused*/ = detail::unknown_size())
+    {
+        return true;
+    }
+
+    bool key(string_t& /*unused*/)
+    {
+        return true;
+    }
+
+    bool end_object()
+    {
+        return true;
+    }
+
+    bool start_array(std::size_t /*unused*/ = detail::unknown_size())
+    {
+        return true;
+    }
+
+    bool end_array()
+    {
+        return true;
+    }
+
+    bool parse_error(std::size_t /*unused*/, const std::string& /*unused*/, const detail::exception& /*unused*/)
+    {
+        return false;
+    }
+};
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/input/lexer.hpp>
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/meta/is_sax.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013 - 2025 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <cstdint> // size_t
+#include <utility> // declval
+#include <string> // string
+
+// #include <nlohmann/detail/abi_macros.hpp>
+
+// #include <nlohmann/detail/meta/detected.hpp>
+
+// #include <nlohmann/detail/meta/type_traits.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+template<typename T>
+using null_function_t = decltype(std::declval<T&>().null());
+
+template<typename T>
+using boolean_function_t =
+    decltype(std::declval<T&>().boolean(std::declval<bool>()));
+
+template<typename T, typename Integer>
+using number_integer_function_t =
+    decltype(std::declval<T&>().number_integer(std::declval<Integer>()));
+
+template<typename T, typename Unsigned>
+using number_unsigned_function_t =
+    decltype(std::declval<T&>().number_unsigned(std::declval<Unsigned>()));
+
+template<typename T, typename Float, typename String>
+using number_float_function_t = decltype(std::declval<T&>().number_float(
+                                    std::declval<Float>(), std::declval<const String&>()));
+
+template<typename T, typename String>
+using string_function_t =
+    decltype(std::declval<T&>().string(std::declval<String&>()));
+
+template<typename T, typename Binary>
+using binary_function_t =
+    decltype(std::declval<T&>().binary(std::declval<Binary&>()));
+
+template<typename T>
+using start_object_function_t =
+    decltype(std::declval<T&>().start_object(std::declval<std::size_t>()));
+
+template<typename T, typename String>
+using key_function_t =
+    decltype(std::declval<T&>().key(std::declval<String&>()));
+
+template<typename T>
+using end_object_function_t = decltype(std::declval<T&>().end_object());
+
+template<typename T>
+using start_array_function_t =
+    decltype(std::declval<T&>().start_array(std::declval<std::size_t>()));
+
+template<typename T>
+using end_array_function_t = decltype(std::declval<T&>().end_array());
+
+template<typename T, typename Exception>
+using parse_error_function_t = decltype(std::declval<T&>().parse_error(
+        std::declval<std::size_t>(), std::declval<const std::string&>(),
+        std::declval<const Exception&>()));
+
+template<typename SAX, typename BasicJsonType>
+struct is_sax
+{
+  private:
+    static_assert(is_basic_json<BasicJsonType>::value,
+                  "BasicJsonType must be of type basic_json<...>");
+
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+    using string_t = typename BasicJsonType::string_t;
+    using binary_t = typename BasicJsonType::binary_t;
+    using exception_t = typename BasicJsonType::exception;
+
+  public:
+    static constexpr bool value =
+        is_detected_exact<bool, null_function_t, SAX>::value &&
+        is_detected_exact<bool, boolean_function_t, SAX>::value &&
+        is_detected_exact<bool, number_integer_function_t, SAX, number_integer_t>::value &&
+        is_detected_exact<bool, number_unsigned_function_t, SAX, number_unsigned_t>::value &&
+        is_detected_exact<bool, number_float_function_t, SAX, number_float_t, string_t>::value &&
+        is_detected_exact<bool, string_function_t, SAX, string_t>::value &&
+        is_detected_exact<bool, binary_function_t, SAX, binary_t>::value &&
+        is_detected_exact<bool, start_object_function_t, SAX>::value &&
+        is_detected_exact<bool, key_function_t, SAX, string_t>::value &&
+        is_detected_exact<bool, end_object_function_t, SAX>::value &&
+        is_detected_exact<bool, start_array_function_t, SAX>::value &&
+        is_detected_exact<bool, end_array_function_t, SAX>::value &&
+        is_detected_exact<bool, parse_error_function_t, SAX, exception_t>::value;
+};
+
+template<typename SAX, typename BasicJsonType>
+struct is_sax_static_asserts
+{
+  private:
+    static_assert(is_basic_json<BasicJsonType>::value,
+                  "BasicJsonType must be of type basic_json<...>");
+
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+    using string_t = typename BasicJsonType::string_t;
+    using binary_t = typename BasicJsonType::binary_t;
+    using exception_t = typename BasicJsonType::exception;
+
+  public:
+    static_assert(is_detected_exact<bool, null_function_t, SAX>::value,
+                  "Missing/invalid function: bool null()");
+    static_assert(is_detected_exact<bool, boolean_function_t, SAX>::value,
+                  "Missing/invalid function: bool boolean(bool)");
+    static_assert(is_detected_exact<bool, boolean_function_t, SAX>::value,
+                  "Missing/invalid function: bool boolean(bool)");
+    static_assert(
+        is_detected_exact<bool, number_integer_function_t, SAX,
+        number_integer_t>::value,
+        "Missing/invalid function: bool number_integer(number_integer_t)");
+    static_assert(
+        is_detected_exact<bool, number_unsigned_function_t, SAX,
+        number_unsigned_t>::value,
+        "Missing/invalid function: bool number_unsigned(number_unsigned_t)");
+    static_assert(is_detected_exact<bool, number_float_function_t, SAX,
+                  number_float_t, string_t>::value,
+                  "Missing/invalid function: bool number_float(number_float_t, const string_t&)");
+    static_assert(
+        is_detected_exact<bool, string_function_t, SAX, string_t>::value,
+        "Missing/invalid function: bool string(string_t&)");
+    static_assert(
+        is_detected_exact<bool, binary_function_t, SAX, binary_t>::value,
+        "Missing/invalid function: bool binary(binary_t&)");
+    static_assert(is_detected_exact<bool, start_object_function_t, SAX>::value,
+                  "Missing/invalid function: bool start_object(std::size_t)");
+    static_assert(is_detected_exact<bool, key_function_t, SAX, string_t>::value,
+                  "Missing/invalid function: bool key(string_t&)");
+    static_assert(is_detected_exact<bool, end_object_function_t, SAX>::value,
+                  "Missing/invalid function: bool end_object()");
+    static_assert(is_detected_exact<bool, start_array_function_t, SAX>::value,
+                  "Missing/invalid function: bool start_array(std::size_t)");
+    static_assert(is_detected_exact<bool, end_array_function_t, SAX>::value,
+                  "Missing/invalid function: bool end_array()");
+    static_assert(
+        is_detected_exact<bool, parse_error_function_t, SAX, exception_t>::value,
+        "Missing/invalid function: bool parse_error(std::size_t, const "
+        "std::string&, const exception&)");
+};
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/meta/type_traits.hpp>
+
+// #include <nlohmann/detail/string_concat.hpp>
+
+// #include <nlohmann/detail/value_t.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+/// how to treat CBOR tags
+enum class cbor_tag_handler_t
+{
+    error,   ///< throw a parse_error exception in case of a tag
+    ignore,  ///< ignore tags
+    store    ///< store tags as binary type
+};
+
+/*!
+@brief determine system byte order
+
+@return true if and only if system's byte order is little endian
+
+@note from https://stackoverflow.com/a/1001328/266378
+*/
+static inline bool little_endianness(int num = 1) noexcept
+{
+    return *reinterpret_cast<char*>(&num) == 1;
+}
+
+///////////////////
+// binary reader //
+///////////////////
+
+/*!
+@brief deserialization of CBOR, MessagePack, and UBJSON values
+*/
+template<typename BasicJsonType, typename InputAdapterType, typename SAX = json_sax_dom_parser<BasicJsonType, InputAdapterType>>
+class binary_reader
+{
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+    using string_t = typename BasicJsonType::string_t;
+    using binary_t = typename BasicJsonType::binary_t;
+    using json_sax_t = SAX;
+    using char_type = typename InputAdapterType::char_type;
+    using char_int_type = typename char_traits<char_type>::int_type;
+
+  public:
+    /*!
+    @brief create a binary reader
+
+    @param[in] adapter  input adapter to read from
+    */
+    explicit binary_reader(InputAdapterType&& adapter, const input_format_t format = input_format_t::json) noexcept : ia(std::move(adapter)), input_format(format)
+    {
+        (void)detail::is_sax_static_asserts<SAX, BasicJsonType> {};
+    }
+
+    // make class move-only
+    binary_reader(const binary_reader&) = delete;
+    binary_reader(binary_reader&&) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor)
+    binary_reader& operator=(const binary_reader&) = delete;
+    binary_reader& operator=(binary_reader&&) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor)
+    ~binary_reader() = default;
+
+    /*!
+    @param[in] format  the binary format to parse
+    @param[in] sax_    a SAX event processor
+    @param[in] strict  whether to expect the input to be consumed completed
+    @param[in] tag_handler  how to treat CBOR tags
+
+    @return whether parsing was successful
+    */
+    JSON_HEDLEY_NON_NULL(3)
+    bool sax_parse(const input_format_t format,
+                   json_sax_t* sax_,
+                   const bool strict = true,
+                   const cbor_tag_handler_t tag_handler = cbor_tag_handler_t::error)
+    {
+        sax = sax_;
+        bool result = false;
+
+        switch (format)
+        {
+            case input_format_t::bson:
+                result = parse_bson_internal();
+                break;
+
+            case input_format_t::cbor:
+                result = parse_cbor_internal(true, tag_handler);
+                break;
+
+            case input_format_t::msgpack:
+                result = parse_msgpack_internal();
+                break;
+
+            case input_format_t::ubjson:
+            case input_format_t::bjdata:
+                result = parse_ubjson_internal();
+                break;
+
+            case input_format_t::json: // LCOV_EXCL_LINE
+            default:            // LCOV_EXCL_LINE
+                JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
+        }
+
+        // strict mode: next byte must be EOF
+        if (result && strict)
+        {
+            if (input_format == input_format_t::ubjson || input_format == input_format_t::bjdata)
+            {
+                get_ignore_noop();
+            }
+            else
+            {
+                get();
+            }
+
+            if (JSON_HEDLEY_UNLIKELY(current != char_traits<char_type>::eof()))
+            {
+                return sax->parse_error(chars_read, get_token_string(), parse_error::create(110, chars_read,
+                                        exception_message(input_format, concat("expected end of input; last byte: 0x", get_token_string()), "value"), nullptr));
+            }
+        }
+
+        return result;
+    }
+
+  private:
+    //////////
+    // BSON //
+    //////////
+
+    /*!
+    @brief Reads in a BSON-object and passes it to the SAX-parser.
+    @return whether a valid BSON-value was passed to the SAX parser
+    */
+    bool parse_bson_internal()
+    {
+        std::int32_t document_size{};
+        get_number<std::int32_t, true>(input_format_t::bson, document_size);
+
+        if (JSON_HEDLEY_UNLIKELY(!sax->start_object(detail::unknown_size())))
+        {
+            return false;
+        }
+
+        if (JSON_HEDLEY_UNLIKELY(!parse_bson_element_list(/*is_array*/false)))
+        {
+            return false;
+        }
+
+        return sax->end_object();
+    }
+
+    /*!
+    @brief Parses a C-style string from the BSON input.
+    @param[in,out] result  A reference to the string variable where the read
+                            string is to be stored.
+    @return `true` if the \x00-byte indicating the end of the string was
+             encountered before the EOF; false` indicates an unexpected EOF.
+    */
+    bool get_bson_cstr(string_t& result)
+    {
+        auto out = std::back_inserter(result);
+        while (true)
+        {
+            get();
+            if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::bson, "cstring")))
+            {
+                return false;
+            }
+            if (current == 0x00)
+            {
+                return true;
+            }
+            *out++ = static_cast<typename string_t::value_type>(current);
+        }
+    }
+
+    /*!
+    @brief Parses a zero-terminated string of length @a len from the BSON
+           input.
+    @param[in] len  The length (including the zero-byte at the end) of the
+                    string to be read.
+    @param[in,out] result  A reference to the string variable where the read
+                            string is to be stored.
+    @tparam NumberType The type of the length @a len
+    @pre len >= 1
+    @return `true` if the string was successfully parsed
+    */
+    template<typename NumberType>
+    bool get_bson_string(const NumberType len, string_t& result)
+    {
+        if (JSON_HEDLEY_UNLIKELY(len < 1))
+        {
+            auto last_token = get_token_string();
+            return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read,
+                                    exception_message(input_format_t::bson, concat("string length must be at least 1, is ", std::to_string(len)), "string"), nullptr));
+        }
+
+        return get_string(input_format_t::bson, len - static_cast<NumberType>(1), result) && get() != char_traits<char_type>::eof();
+    }
+
+    /*!
+    @brief Parses a byte array input of length @a len from the BSON input.
+    @param[in] len  The length of the byte array to be read.
+    @param[in,out] result  A reference to the binary variable where the read
+                            array is to be stored.
+    @tparam NumberType The type of the length @a len
+    @pre len >= 0
+    @return `true` if the byte array was successfully parsed
+    */
+    template<typename NumberType>
+    bool get_bson_binary(const NumberType len, binary_t& result)
+    {
+        if (JSON_HEDLEY_UNLIKELY(len < 0))
+        {
+            auto last_token = get_token_string();
+            return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read,
+                                    exception_message(input_format_t::bson, concat("byte array length cannot be negative, is ", std::to_string(len)), "binary"), nullptr));
+        }
+
+        // All BSON binary values have a subtype
+        std::uint8_t subtype{};
+        get_number<std::uint8_t>(input_format_t::bson, subtype);
+        result.set_subtype(subtype);
+
+        return get_binary(input_format_t::bson, len, result);
+    }
+
+    /*!
+    @brief Read a BSON document element of the given @a element_type.
+    @param[in] element_type The BSON element type, c.f. http://bsonspec.org/spec.html
+    @param[in] element_type_parse_position The position in the input stream,
+               where the `element_type` was read.
+    @warning Not all BSON element types are supported yet. An unsupported
+             @a element_type will give rise to a parse_error.114:
+             Unsupported BSON record type 0x...
+    @return whether a valid BSON-object/array was passed to the SAX parser
+    */
+    bool parse_bson_element_internal(const char_int_type element_type,
+                                     const std::size_t element_type_parse_position)
+    {
+        switch (element_type)
+        {
+            case 0x01: // double
+            {
+                double number{};
+                return get_number<double, true>(input_format_t::bson, number) && sax->number_float(static_cast<number_float_t>(number), "");
+            }
+
+            case 0x02: // string
+            {
+                std::int32_t len{};
+                string_t value;
+                return get_number<std::int32_t, true>(input_format_t::bson, len) && get_bson_string(len, value) && sax->string(value);
+            }
+
+            case 0x03: // object
+            {
+                return parse_bson_internal();
+            }
+
+            case 0x04: // array
+            {
+                return parse_bson_array();
+            }
+
+            case 0x05: // binary
+            {
+                std::int32_t len{};
+                binary_t value;
+                return get_number<std::int32_t, true>(input_format_t::bson, len) && get_bson_binary(len, value) && sax->binary(value);
+            }
+
+            case 0x08: // boolean
+            {
+                return sax->boolean(get() != 0);
+            }
+
+            case 0x0A: // null
+            {
+                return sax->null();
+            }
+
+            case 0x10: // int32
+            {
+                std::int32_t value{};
+                return get_number<std::int32_t, true>(input_format_t::bson, value) && sax->number_integer(value);
+            }
+
+            case 0x12: // int64
+            {
+                std::int64_t value{};
+                return get_number<std::int64_t, true>(input_format_t::bson, value) && sax->number_integer(value);
+            }
+
+            case 0x11: // uint64
+            {
+                std::uint64_t value{};
+                return get_number<std::uint64_t, true>(input_format_t::bson, value) && sax->number_unsigned(value);
+            }
+
+            default: // anything else not supported (yet)
+            {
+                std::array<char, 3> cr{{}};
+                static_cast<void>((std::snprintf)(cr.data(), cr.size(), "%.2hhX", static_cast<unsigned char>(element_type))); // NOLINT(cppcoreguidelines-pro-type-vararg,hicpp-vararg)
+                const std::string cr_str{cr.data()};
+                return sax->parse_error(element_type_parse_position, cr_str,
+                                        parse_error::create(114, element_type_parse_position, concat("Unsupported BSON record type 0x", cr_str), nullptr));
+            }
+        }
+    }
+
+    /*!
+    @brief Read a BSON element list (as specified in the BSON-spec)
+
+    The same binary layout is used for objects and arrays, hence it must be
+    indicated with the argument @a is_array which one is expected
+    (true --> array, false --> object).
+
+    @param[in] is_array Determines if the element list being read is to be
+                        treated as an object (@a is_array == false), or as an
+                        array (@a is_array == true).
+    @return whether a valid BSON-object/array was passed to the SAX parser
+    */
+    bool parse_bson_element_list(const bool is_array)
+    {
+        string_t key;
+
+        while (auto element_type = get())
+        {
+            if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::bson, "element list")))
+            {
+                return false;
+            }
+
+            const std::size_t element_type_parse_position = chars_read;
+            if (JSON_HEDLEY_UNLIKELY(!get_bson_cstr(key)))
+            {
+                return false;
+            }
+
+            if (!is_array && !sax->key(key))
+            {
+                return false;
+            }
+
+            if (JSON_HEDLEY_UNLIKELY(!parse_bson_element_internal(element_type, element_type_parse_position)))
+            {
+                return false;
+            }
+
+            // get_bson_cstr only appends
+            key.clear();
+        }
+
+        return true;
+    }
+
+    /*!
+    @brief Reads an array from the BSON input and passes it to the SAX-parser.
+    @return whether a valid BSON-array was passed to the SAX parser
+    */
+    bool parse_bson_array()
+    {
+        std::int32_t document_size{};
+        get_number<std::int32_t, true>(input_format_t::bson, document_size);
+
+        if (JSON_HEDLEY_UNLIKELY(!sax->start_array(detail::unknown_size())))
+        {
+            return false;
+        }
+
+        if (JSON_HEDLEY_UNLIKELY(!parse_bson_element_list(/*is_array*/true)))
+        {
+            return false;
+        }
+
+        return sax->end_array();
+    }
+
+    //////////
+    // CBOR //
+    //////////
+
+    /*!
+    @param[in] get_char  whether a new character should be retrieved from the
+                         input (true) or whether the last read character should
+                         be considered instead (false)
+    @param[in] tag_handler how CBOR tags should be treated
+
+    @return whether a valid CBOR value was passed to the SAX parser
+    */
+    bool parse_cbor_internal(const bool get_char,
+                             const cbor_tag_handler_t tag_handler)
+    {
+        switch (get_char ? get() : current)
+        {
+            // EOF
+            case char_traits<char_type>::eof():
+                return unexpect_eof(input_format_t::cbor, "value");
+
+            // Integer 0x00..0x17 (0..23)
+            case 0x00:
+            case 0x01:
+            case 0x02:
+            case 0x03:
+            case 0x04:
+            case 0x05:
+            case 0x06:
+            case 0x07:
+            case 0x08:
+            case 0x09:
+            case 0x0A:
+            case 0x0B:
+            case 0x0C:
+            case 0x0D:
+            case 0x0E:
+            case 0x0F:
+            case 0x10:
+            case 0x11:
+            case 0x12:
+            case 0x13:
+            case 0x14:
+            case 0x15:
+            case 0x16:
+            case 0x17:
+                return sax->number_unsigned(static_cast<number_unsigned_t>(current));
+
+            case 0x18: // Unsigned integer (one-byte uint8_t follows)
+            {
+                std::uint8_t number{};
+                return get_number(input_format_t::cbor, number) && sax->number_unsigned(number);
+            }
+
+            case 0x19: // Unsigned integer (two-byte uint16_t follows)
+            {
+                std::uint16_t number{};
+                return get_number(input_format_t::cbor, number) && sax->number_unsigned(number);
+            }
+
+            case 0x1A: // Unsigned integer (four-byte uint32_t follows)
+            {
+                std::uint32_t number{};
+                return get_number(input_format_t::cbor, number) && sax->number_unsigned(number);
+            }
+
+            case 0x1B: // Unsigned integer (eight-byte uint64_t follows)
+            {
+                std::uint64_t number{};
+                return get_number(input_format_t::cbor, number) && sax->number_unsigned(number);
+            }
+
+            // Negative integer -1-0x00..-1-0x17 (-1..-24)
+            case 0x20:
+            case 0x21:
+            case 0x22:
+            case 0x23:
+            case 0x24:
+            case 0x25:
+            case 0x26:
+            case 0x27:
+            case 0x28:
+            case 0x29:
+            case 0x2A:
+            case 0x2B:
+            case 0x2C:
+            case 0x2D:
+            case 0x2E:
+            case 0x2F:
+            case 0x30:
+            case 0x31:
+            case 0x32:
+            case 0x33:
+            case 0x34:
+            case 0x35:
+            case 0x36:
+            case 0x37:
+                return sax->number_integer(static_cast<std::int8_t>(0x20 - 1 - current));
+
+            case 0x38: // Negative integer (one-byte uint8_t follows)
+            {
+                std::uint8_t number{};
+                return get_number(input_format_t::cbor, number) && sax->number_integer(static_cast<number_integer_t>(-1) - number);
+            }
+
+            case 0x39: // Negative integer -1-n (two-byte uint16_t follows)
+            {
+                std::uint16_t number{};
+                return get_number(input_format_t::cbor, number) && sax->number_integer(static_cast<number_integer_t>(-1) - number);
+            }
+
+            case 0x3A: // Negative integer -1-n (four-byte uint32_t follows)
+            {
+                std::uint32_t number{};
+                return get_number(input_format_t::cbor, number) && sax->number_integer(static_cast<number_integer_t>(-1) - number);
+            }
+
+            case 0x3B: // Negative integer -1-n (eight-byte uint64_t follows)
+            {
+                std::uint64_t number{};
+                return get_number(input_format_t::cbor, number) && sax->number_integer(static_cast<number_integer_t>(-1)
+                        - static_cast<number_integer_t>(number));
+            }
+
+            // Binary data (0x00..0x17 bytes follow)
+            case 0x40:
+            case 0x41:
+            case 0x42:
+            case 0x43:
+            case 0x44:
+            case 0x45:
+            case 0x46:
+            case 0x47:
+            case 0x48:
+            case 0x49:
+            case 0x4A:
+            case 0x4B:
+            case 0x4C:
+            case 0x4D:
+            case 0x4E:
+            case 0x4F:
+            case 0x50:
+            case 0x51:
+            case 0x52:
+            case 0x53:
+            case 0x54:
+            case 0x55:
+            case 0x56:
+            case 0x57:
+            case 0x58: // Binary data (one-byte uint8_t for n follows)
+            case 0x59: // Binary data (two-byte uint16_t for n follow)
+            case 0x5A: // Binary data (four-byte uint32_t for n follow)
+            case 0x5B: // Binary data (eight-byte uint64_t for n follow)
+            case 0x5F: // Binary data (indefinite length)
+            {
+                binary_t b;
+                return get_cbor_binary(b) && sax->binary(b);
+            }
+
+            // UTF-8 string (0x00..0x17 bytes follow)
+            case 0x60:
+            case 0x61:
+            case 0x62:
+            case 0x63:
+            case 0x64:
+            case 0x65:
+            case 0x66:
+            case 0x67:
+            case 0x68:
+            case 0x69:
+            case 0x6A:
+            case 0x6B:
+            case 0x6C:
+            case 0x6D:
+            case 0x6E:
+            case 0x6F:
+            case 0x70:
+            case 0x71:
+            case 0x72:
+            case 0x73:
+            case 0x74:
+            case 0x75:
+            case 0x76:
+            case 0x77:
+            case 0x78: // UTF-8 string (one-byte uint8_t for n follows)
+            case 0x79: // UTF-8 string (two-byte uint16_t for n follow)
+            case 0x7A: // UTF-8 string (four-byte uint32_t for n follow)
+            case 0x7B: // UTF-8 string (eight-byte uint64_t for n follow)
+            case 0x7F: // UTF-8 string (indefinite length)
+            {
+                string_t s;
+                return get_cbor_string(s) && sax->string(s);
+            }
+
+            // array (0x00..0x17 data items follow)
+            case 0x80:
+            case 0x81:
+            case 0x82:
+            case 0x83:
+            case 0x84:
+            case 0x85:
+            case 0x86:
+            case 0x87:
+            case 0x88:
+            case 0x89:
+            case 0x8A:
+            case 0x8B:
+            case 0x8C:
+            case 0x8D:
+            case 0x8E:
+            case 0x8F:
+            case 0x90:
+            case 0x91:
+            case 0x92:
+            case 0x93:
+            case 0x94:
+            case 0x95:
+            case 0x96:
+            case 0x97:
+                return get_cbor_array(
+                           conditional_static_cast<std::size_t>(static_cast<unsigned int>(current) & 0x1Fu), tag_handler);
+
+            case 0x98: // array (one-byte uint8_t for n follows)
+            {
+                std::uint8_t len{};
+                return get_number(input_format_t::cbor, len) && get_cbor_array(static_cast<std::size_t>(len), tag_handler);
+            }
+
+            case 0x99: // array (two-byte uint16_t for n follow)
+            {
+                std::uint16_t len{};
+                return get_number(input_format_t::cbor, len) && get_cbor_array(static_cast<std::size_t>(len), tag_handler);
+            }
+
+            case 0x9A: // array (four-byte uint32_t for n follow)
+            {
+                std::uint32_t len{};
+                return get_number(input_format_t::cbor, len) && get_cbor_array(conditional_static_cast<std::size_t>(len), tag_handler);
+            }
+
+            case 0x9B: // array (eight-byte uint64_t for n follow)
+            {
+                std::uint64_t len{};
+                return get_number(input_format_t::cbor, len) && get_cbor_array(conditional_static_cast<std::size_t>(len), tag_handler);
+            }
+
+            case 0x9F: // array (indefinite length)
+                return get_cbor_array(detail::unknown_size(), tag_handler);
+
+            // map (0x00..0x17 pairs of data items follow)
+            case 0xA0:
+            case 0xA1:
+            case 0xA2:
+            case 0xA3:
+            case 0xA4:
+            case 0xA5:
+            case 0xA6:
+            case 0xA7:
+            case 0xA8:
+            case 0xA9:
+            case 0xAA:
+            case 0xAB:
+            case 0xAC:
+            case 0xAD:
+            case 0xAE:
+            case 0xAF:
+            case 0xB0:
+            case 0xB1:
+            case 0xB2:
+            case 0xB3:
+            case 0xB4:
+            case 0xB5:
+            case 0xB6:
+            case 0xB7:
+                return get_cbor_object(conditional_static_cast<std::size_t>(static_cast<unsigned int>(current) & 0x1Fu), tag_handler);
+
+            case 0xB8: // map (one-byte uint8_t for n follows)
+            {
+                std::uint8_t len{};
+                return get_number(input_format_t::cbor, len) && get_cbor_object(static_cast<std::size_t>(len), tag_handler);
+            }
+
+            case 0xB9: // map (two-byte uint16_t for n follow)
+            {
+                std::uint16_t len{};
+                return get_number(input_format_t::cbor, len) && get_cbor_object(static_cast<std::size_t>(len), tag_handler);
+            }
+
+            case 0xBA: // map (four-byte uint32_t for n follow)
+            {
+                std::uint32_t len{};
+                return get_number(input_format_t::cbor, len) && get_cbor_object(conditional_static_cast<std::size_t>(len), tag_handler);
+            }
+
+            case 0xBB: // map (eight-byte uint64_t for n follow)
+            {
+                std::uint64_t len{};
+                return get_number(input_format_t::cbor, len) && get_cbor_object(conditional_static_cast<std::size_t>(len), tag_handler);
+            }
+
+            case 0xBF: // map (indefinite length)
+                return get_cbor_object(detail::unknown_size(), tag_handler);
+
+            case 0xC6: // tagged item
+            case 0xC7:
+            case 0xC8:
+            case 0xC9:
+            case 0xCA:
+            case 0xCB:
+            case 0xCC:
+            case 0xCD:
+            case 0xCE:
+            case 0xCF:
+            case 0xD0:
+            case 0xD1:
+            case 0xD2:
+            case 0xD3:
+            case 0xD4:
+            case 0xD8: // tagged item (1 bytes follow)
+            case 0xD9: // tagged item (2 bytes follow)
+            case 0xDA: // tagged item (4 bytes follow)
+            case 0xDB: // tagged item (8 bytes follow)
+            {
+                switch (tag_handler)
+                {
+                    case cbor_tag_handler_t::error:
+                    {
+                        auto last_token = get_token_string();
+                        return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read,
+                                                exception_message(input_format_t::cbor, concat("invalid byte: 0x", last_token), "value"), nullptr));
+                    }
+
+                    case cbor_tag_handler_t::ignore:
+                    {
+                        // ignore binary subtype
+                        switch (current)
+                        {
+                            case 0xD8:
+                            {
+                                std::uint8_t subtype_to_ignore{};
+                                get_number(input_format_t::cbor, subtype_to_ignore);
+                                break;
+                            }
+                            case 0xD9:
+                            {
+                                std::uint16_t subtype_to_ignore{};
+                                get_number(input_format_t::cbor, subtype_to_ignore);
+                                break;
+                            }
+                            case 0xDA:
+                            {
+                                std::uint32_t subtype_to_ignore{};
+                                get_number(input_format_t::cbor, subtype_to_ignore);
+                                break;
+                            }
+                            case 0xDB:
+                            {
+                                std::uint64_t subtype_to_ignore{};
+                                get_number(input_format_t::cbor, subtype_to_ignore);
+                                break;
+                            }
+                            default:
+                                break;
+                        }
+                        return parse_cbor_internal(true, tag_handler);
+                    }
+
+                    case cbor_tag_handler_t::store:
+                    {
+                        binary_t b;
+                        // use binary subtype and store in binary container
+                        switch (current)
+                        {
+                            case 0xD8:
+                            {
+                                std::uint8_t subtype{};
+                                get_number(input_format_t::cbor, subtype);
+                                b.set_subtype(detail::conditional_static_cast<typename binary_t::subtype_type>(subtype));
+                                break;
+                            }
+                            case 0xD9:
+                            {
+                                std::uint16_t subtype{};
+                                get_number(input_format_t::cbor, subtype);
+                                b.set_subtype(detail::conditional_static_cast<typename binary_t::subtype_type>(subtype));
+                                break;
+                            }
+                            case 0xDA:
+                            {
+                                std::uint32_t subtype{};
+                                get_number(input_format_t::cbor, subtype);
+                                b.set_subtype(detail::conditional_static_cast<typename binary_t::subtype_type>(subtype));
+                                break;
+                            }
+                            case 0xDB:
+                            {
+                                std::uint64_t subtype{};
+                                get_number(input_format_t::cbor, subtype);
+                                b.set_subtype(detail::conditional_static_cast<typename binary_t::subtype_type>(subtype));
+                                break;
+                            }
+                            default:
+                                return parse_cbor_internal(true, tag_handler);
+                        }
+                        get();
+                        return get_cbor_binary(b) && sax->binary(b);
+                    }
+
+                    default:                 // LCOV_EXCL_LINE
+                        JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
+                        return false;        // LCOV_EXCL_LINE
+                }
+            }
+
+            case 0xF4: // false
+                return sax->boolean(false);
+
+            case 0xF5: // true
+                return sax->boolean(true);
+
+            case 0xF6: // null
+                return sax->null();
+
+            case 0xF9: // Half-Precision Float (two-byte IEEE 754)
+            {
+                const auto byte1_raw = get();
+                if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::cbor, "number")))
+                {
+                    return false;
+                }
+                const auto byte2_raw = get();
+                if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::cbor, "number")))
+                {
+                    return false;
+                }
+
+                const auto byte1 = static_cast<unsigned char>(byte1_raw);
+                const auto byte2 = static_cast<unsigned char>(byte2_raw);
+
+                // code from RFC 7049, Appendix D, Figure 3:
+                // As half-precision floating-point numbers were only added
+                // to IEEE 754 in 2008, today's programming platforms often
+                // still only have limited support for them. It is very
+                // easy to include at least decoding support for them even
+                // without such support. An example of a small decoder for
+                // half-precision floating-point numbers in the C language
+                // is shown in Fig. 3.
+                const auto half = static_cast<unsigned int>((byte1 << 8u) + byte2);
+                const double val = [&half]
+                {
+                    const int exp = (half >> 10u) & 0x1Fu;
+                    const unsigned int mant = half & 0x3FFu;
+                    JSON_ASSERT(0 <= exp&& exp <= 32);
+                    JSON_ASSERT(mant <= 1024);
+                    switch (exp)
+                    {
+                        case 0:
+                            return std::ldexp(mant, -24);
+                        case 31:
+                            return (mant == 0)
+                            ? std::numeric_limits<double>::infinity()
+                            : std::numeric_limits<double>::quiet_NaN();
+                        default:
+                            return std::ldexp(mant + 1024, exp - 25);
+                    }
+                }();
+                return sax->number_float((half & 0x8000u) != 0
+                                         ? static_cast<number_float_t>(-val)
+                                         : static_cast<number_float_t>(val), "");
+            }
+
+            case 0xFA: // Single-Precision Float (four-byte IEEE 754)
+            {
+                float number{};
+                return get_number(input_format_t::cbor, number) && sax->number_float(static_cast<number_float_t>(number), "");
+            }
+
+            case 0xFB: // Double-Precision Float (eight-byte IEEE 754)
+            {
+                double number{};
+                return get_number(input_format_t::cbor, number) && sax->number_float(static_cast<number_float_t>(number), "");
+            }
+
+            default: // anything else (0xFF is handled inside the other types)
+            {
+                auto last_token = get_token_string();
+                return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read,
+                                        exception_message(input_format_t::cbor, concat("invalid byte: 0x", last_token), "value"), nullptr));
+            }
+        }
+    }
+
+    /*!
+    @brief reads a CBOR string
+
+    This function first reads starting bytes to determine the expected
+    string length and then copies this number of bytes into a string.
+    Additionally, CBOR's strings with indefinite lengths are supported.
+
+    @param[out] result  created string
+
+    @return whether string creation completed
+    */
+    bool get_cbor_string(string_t& result)
+    {
+        if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::cbor, "string")))
+        {
+            return false;
+        }
+
+        switch (current)
+        {
+            // UTF-8 string (0x00..0x17 bytes follow)
+            case 0x60:
+            case 0x61:
+            case 0x62:
+            case 0x63:
+            case 0x64:
+            case 0x65:
+            case 0x66:
+            case 0x67:
+            case 0x68:
+            case 0x69:
+            case 0x6A:
+            case 0x6B:
+            case 0x6C:
+            case 0x6D:
+            case 0x6E:
+            case 0x6F:
+            case 0x70:
+            case 0x71:
+            case 0x72:
+            case 0x73:
+            case 0x74:
+            case 0x75:
+            case 0x76:
+            case 0x77:
+            {
+                return get_string(input_format_t::cbor, static_cast<unsigned int>(current) & 0x1Fu, result);
+            }
+
+            case 0x78: // UTF-8 string (one-byte uint8_t for n follows)
+            {
+                std::uint8_t len{};
+                return get_number(input_format_t::cbor, len) && get_string(input_format_t::cbor, len, result);
+            }
+
+            case 0x79: // UTF-8 string (two-byte uint16_t for n follow)
+            {
+                std::uint16_t len{};
+                return get_number(input_format_t::cbor, len) && get_string(input_format_t::cbor, len, result);
+            }
+
+            case 0x7A: // UTF-8 string (four-byte uint32_t for n follow)
+            {
+                std::uint32_t len{};
+                return get_number(input_format_t::cbor, len) && get_string(input_format_t::cbor, len, result);
+            }
+
+            case 0x7B: // UTF-8 string (eight-byte uint64_t for n follow)
+            {
+                std::uint64_t len{};
+                return get_number(input_format_t::cbor, len) && get_string(input_format_t::cbor, len, result);
+            }
+
+            case 0x7F: // UTF-8 string (indefinite length)
+            {
+                while (get() != 0xFF)
+                {
+                    string_t chunk;
+                    if (!get_cbor_string(chunk))
+                    {
+                        return false;
+                    }
+                    result.append(chunk);
+                }
+                return true;
+            }
+
+            default:
+            {
+                auto last_token = get_token_string();
+                return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read,
+                                        exception_message(input_format_t::cbor, concat("expected length specification (0x60-0x7B) or indefinite string type (0x7F); last byte: 0x", last_token), "string"), nullptr));
+            }
+        }
+    }
+
+    /*!
+    @brief reads a CBOR byte array
+
+    This function first reads starting bytes to determine the expected
+    byte array length and then copies this number of bytes into the byte array.
+    Additionally, CBOR's byte arrays with indefinite lengths are supported.
+
+    @param[out] result  created byte array
+
+    @return whether byte array creation completed
+    */
+    bool get_cbor_binary(binary_t& result)
+    {
+        if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::cbor, "binary")))
+        {
+            return false;
+        }
+
+        switch (current)
+        {
+            // Binary data (0x00..0x17 bytes follow)
+            case 0x40:
+            case 0x41:
+            case 0x42:
+            case 0x43:
+            case 0x44:
+            case 0x45:
+            case 0x46:
+            case 0x47:
+            case 0x48:
+            case 0x49:
+            case 0x4A:
+            case 0x4B:
+            case 0x4C:
+            case 0x4D:
+            case 0x4E:
+            case 0x4F:
+            case 0x50:
+            case 0x51:
+            case 0x52:
+            case 0x53:
+            case 0x54:
+            case 0x55:
+            case 0x56:
+            case 0x57:
+            {
+                return get_binary(input_format_t::cbor, static_cast<unsigned int>(current) & 0x1Fu, result);
+            }
+
+            case 0x58: // Binary data (one-byte uint8_t for n follows)
+            {
+                std::uint8_t len{};
+                return get_number(input_format_t::cbor, len) &&
+                       get_binary(input_format_t::cbor, len, result);
+            }
+
+            case 0x59: // Binary data (two-byte uint16_t for n follow)
+            {
+                std::uint16_t len{};
+                return get_number(input_format_t::cbor, len) &&
+                       get_binary(input_format_t::cbor, len, result);
+            }
+
+            case 0x5A: // Binary data (four-byte uint32_t for n follow)
+            {
+                std::uint32_t len{};
+                return get_number(input_format_t::cbor, len) &&
+                       get_binary(input_format_t::cbor, len, result);
+            }
+
+            case 0x5B: // Binary data (eight-byte uint64_t for n follow)
+            {
+                std::uint64_t len{};
+                return get_number(input_format_t::cbor, len) &&
+                       get_binary(input_format_t::cbor, len, result);
+            }
+
+            case 0x5F: // Binary data (indefinite length)
+            {
+                while (get() != 0xFF)
+                {
+                    binary_t chunk;
+                    if (!get_cbor_binary(chunk))
+                    {
+                        return false;
+                    }
+                    result.insert(result.end(), chunk.begin(), chunk.end());
+                }
+                return true;
+            }
+
+            default:
+            {
+                auto last_token = get_token_string();
+                return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read,
+                                        exception_message(input_format_t::cbor, concat("expected length specification (0x40-0x5B) or indefinite binary array type (0x5F); last byte: 0x", last_token), "binary"), nullptr));
+            }
+        }
+    }
+
+    /*!
+    @param[in] len  the length of the array or detail::unknown_size() for an
+                    array of indefinite size
+    @param[in] tag_handler how CBOR tags should be treated
+    @return whether array creation completed
+    */
+    bool get_cbor_array(const std::size_t len,
+                        const cbor_tag_handler_t tag_handler)
+    {
+        if (JSON_HEDLEY_UNLIKELY(!sax->start_array(len)))
+        {
+            return false;
+        }
+
+        if (len != detail::unknown_size())
+        {
+            for (std::size_t i = 0; i < len; ++i)
+            {
+                if (JSON_HEDLEY_UNLIKELY(!parse_cbor_internal(true, tag_handler)))
+                {
+                    return false;
+                }
+            }
+        }
+        else
+        {
+            while (get() != 0xFF)
+            {
+                if (JSON_HEDLEY_UNLIKELY(!parse_cbor_internal(false, tag_handler)))
+                {
+                    return false;
+                }
+            }
+        }
+
+        return sax->end_array();
+    }
+
+    /*!
+    @param[in] len  the length of the object or detail::unknown_size() for an
+                    object of indefinite size
+    @param[in] tag_handler how CBOR tags should be treated
+    @return whether object creation completed
+    */
+    bool get_cbor_object(const std::size_t len,
+                         const cbor_tag_handler_t tag_handler)
+    {
+        if (JSON_HEDLEY_UNLIKELY(!sax->start_object(len)))
+        {
+            return false;
+        }
+
+        if (len != 0)
+        {
+            string_t key;
+            if (len != detail::unknown_size())
+            {
+                for (std::size_t i = 0; i < len; ++i)
+                {
+                    get();
+                    if (JSON_HEDLEY_UNLIKELY(!get_cbor_string(key) || !sax->key(key)))
+                    {
+                        return false;
+                    }
+
+                    if (JSON_HEDLEY_UNLIKELY(!parse_cbor_internal(true, tag_handler)))
+                    {
+                        return false;
+                    }
+                    key.clear();
+                }
+            }
+            else
+            {
+                while (get() != 0xFF)
+                {
+                    if (JSON_HEDLEY_UNLIKELY(!get_cbor_string(key) || !sax->key(key)))
+                    {
+                        return false;
+                    }
+
+                    if (JSON_HEDLEY_UNLIKELY(!parse_cbor_internal(true, tag_handler)))
+                    {
+                        return false;
+                    }
+                    key.clear();
+                }
+            }
+        }
+
+        return sax->end_object();
+    }
+
+    /////////////
+    // MsgPack //
+    /////////////
+
+    /*!
+    @return whether a valid MessagePack value was passed to the SAX parser
+    */
+    bool parse_msgpack_internal()
+    {
+        switch (get())
+        {
+            // EOF
+            case char_traits<char_type>::eof():
+                return unexpect_eof(input_format_t::msgpack, "value");
+
+            // positive fixint
+            case 0x00:
+            case 0x01:
+            case 0x02:
+            case 0x03:
+            case 0x04:
+            case 0x05:
+            case 0x06:
+            case 0x07:
+            case 0x08:
+            case 0x09:
+            case 0x0A:
+            case 0x0B:
+            case 0x0C:
+            case 0x0D:
+            case 0x0E:
+            case 0x0F:
+            case 0x10:
+            case 0x11:
+            case 0x12:
+            case 0x13:
+            case 0x14:
+            case 0x15:
+            case 0x16:
+            case 0x17:
+            case 0x18:
+            case 0x19:
+            case 0x1A:
+            case 0x1B:
+            case 0x1C:
+            case 0x1D:
+            case 0x1E:
+            case 0x1F:
+            case 0x20:
+            case 0x21:
+            case 0x22:
+            case 0x23:
+            case 0x24:
+            case 0x25:
+            case 0x26:
+            case 0x27:
+            case 0x28:
+            case 0x29:
+            case 0x2A:
+            case 0x2B:
+            case 0x2C:
+            case 0x2D:
+            case 0x2E:
+            case 0x2F:
+            case 0x30:
+            case 0x31:
+            case 0x32:
+            case 0x33:
+            case 0x34:
+            case 0x35:
+            case 0x36:
+            case 0x37:
+            case 0x38:
+            case 0x39:
+            case 0x3A:
+            case 0x3B:
+            case 0x3C:
+            case 0x3D:
+            case 0x3E:
+            case 0x3F:
+            case 0x40:
+            case 0x41:
+            case 0x42:
+            case 0x43:
+            case 0x44:
+            case 0x45:
+            case 0x46:
+            case 0x47:
+            case 0x48:
+            case 0x49:
+            case 0x4A:
+            case 0x4B:
+            case 0x4C:
+            case 0x4D:
+            case 0x4E:
+            case 0x4F:
+            case 0x50:
+            case 0x51:
+            case 0x52:
+            case 0x53:
+            case 0x54:
+            case 0x55:
+            case 0x56:
+            case 0x57:
+            case 0x58:
+            case 0x59:
+            case 0x5A:
+            case 0x5B:
+            case 0x5C:
+            case 0x5D:
+            case 0x5E:
+            case 0x5F:
+            case 0x60:
+            case 0x61:
+            case 0x62:
+            case 0x63:
+            case 0x64:
+            case 0x65:
+            case 0x66:
+            case 0x67:
+            case 0x68:
+            case 0x69:
+            case 0x6A:
+            case 0x6B:
+            case 0x6C:
+            case 0x6D:
+            case 0x6E:
+            case 0x6F:
+            case 0x70:
+            case 0x71:
+            case 0x72:
+            case 0x73:
+            case 0x74:
+            case 0x75:
+            case 0x76:
+            case 0x77:
+            case 0x78:
+            case 0x79:
+            case 0x7A:
+            case 0x7B:
+            case 0x7C:
+            case 0x7D:
+            case 0x7E:
+            case 0x7F:
+                return sax->number_unsigned(static_cast<number_unsigned_t>(current));
+
+            // fixmap
+            case 0x80:
+            case 0x81:
+            case 0x82:
+            case 0x83:
+            case 0x84:
+            case 0x85:
+            case 0x86:
+            case 0x87:
+            case 0x88:
+            case 0x89:
+            case 0x8A:
+            case 0x8B:
+            case 0x8C:
+            case 0x8D:
+            case 0x8E:
+            case 0x8F:
+                return get_msgpack_object(conditional_static_cast<std::size_t>(static_cast<unsigned int>(current) & 0x0Fu));
+
+            // fixarray
+            case 0x90:
+            case 0x91:
+            case 0x92:
+            case 0x93:
+            case 0x94:
+            case 0x95:
+            case 0x96:
+            case 0x97:
+            case 0x98:
+            case 0x99:
+            case 0x9A:
+            case 0x9B:
+            case 0x9C:
+            case 0x9D:
+            case 0x9E:
+            case 0x9F:
+                return get_msgpack_array(conditional_static_cast<std::size_t>(static_cast<unsigned int>(current) & 0x0Fu));
+
+            // fixstr
+            case 0xA0:
+            case 0xA1:
+            case 0xA2:
+            case 0xA3:
+            case 0xA4:
+            case 0xA5:
+            case 0xA6:
+            case 0xA7:
+            case 0xA8:
+            case 0xA9:
+            case 0xAA:
+            case 0xAB:
+            case 0xAC:
+            case 0xAD:
+            case 0xAE:
+            case 0xAF:
+            case 0xB0:
+            case 0xB1:
+            case 0xB2:
+            case 0xB3:
+            case 0xB4:
+            case 0xB5:
+            case 0xB6:
+            case 0xB7:
+            case 0xB8:
+            case 0xB9:
+            case 0xBA:
+            case 0xBB:
+            case 0xBC:
+            case 0xBD:
+            case 0xBE:
+            case 0xBF:
+            case 0xD9: // str 8
+            case 0xDA: // str 16
+            case 0xDB: // str 32
+            {
+                string_t s;
+                return get_msgpack_string(s) && sax->string(s);
+            }
+
+            case 0xC0: // nil
+                return sax->null();
+
+            case 0xC2: // false
+                return sax->boolean(false);
+
+            case 0xC3: // true
+                return sax->boolean(true);
+
+            case 0xC4: // bin 8
+            case 0xC5: // bin 16
+            case 0xC6: // bin 32
+            case 0xC7: // ext 8
+            case 0xC8: // ext 16
+            case 0xC9: // ext 32
+            case 0xD4: // fixext 1
+            case 0xD5: // fixext 2
+            case 0xD6: // fixext 4
+            case 0xD7: // fixext 8
+            case 0xD8: // fixext 16
+            {
+                binary_t b;
+                return get_msgpack_binary(b) && sax->binary(b);
+            }
+
+            case 0xCA: // float 32
+            {
+                float number{};
+                return get_number(input_format_t::msgpack, number) && sax->number_float(static_cast<number_float_t>(number), "");
+            }
+
+            case 0xCB: // float 64
+            {
+                double number{};
+                return get_number(input_format_t::msgpack, number) && sax->number_float(static_cast<number_float_t>(number), "");
+            }
+
+            case 0xCC: // uint 8
+            {
+                std::uint8_t number{};
+                return get_number(input_format_t::msgpack, number) && sax->number_unsigned(number);
+            }
+
+            case 0xCD: // uint 16
+            {
+                std::uint16_t number{};
+                return get_number(input_format_t::msgpack, number) && sax->number_unsigned(number);
+            }
+
+            case 0xCE: // uint 32
+            {
+                std::uint32_t number{};
+                return get_number(input_format_t::msgpack, number) && sax->number_unsigned(number);
+            }
+
+            case 0xCF: // uint 64
+            {
+                std::uint64_t number{};
+                return get_number(input_format_t::msgpack, number) && sax->number_unsigned(number);
+            }
+
+            case 0xD0: // int 8
+            {
+                std::int8_t number{};
+                return get_number(input_format_t::msgpack, number) && sax->number_integer(number);
+            }
+
+            case 0xD1: // int 16
+            {
+                std::int16_t number{};
+                return get_number(input_format_t::msgpack, number) && sax->number_integer(number);
+            }
+
+            case 0xD2: // int 32
+            {
+                std::int32_t number{};
+                return get_number(input_format_t::msgpack, number) && sax->number_integer(number);
+            }
+
+            case 0xD3: // int 64
+            {
+                std::int64_t number{};
+                return get_number(input_format_t::msgpack, number) && sax->number_integer(number);
+            }
+
+            case 0xDC: // array 16
+            {
+                std::uint16_t len{};
+                return get_number(input_format_t::msgpack, len) && get_msgpack_array(static_cast<std::size_t>(len));
+            }
+
+            case 0xDD: // array 32
+            {
+                std::uint32_t len{};
+                return get_number(input_format_t::msgpack, len) && get_msgpack_array(conditional_static_cast<std::size_t>(len));
+            }
+
+            case 0xDE: // map 16
+            {
+                std::uint16_t len{};
+                return get_number(input_format_t::msgpack, len) && get_msgpack_object(static_cast<std::size_t>(len));
+            }
+
+            case 0xDF: // map 32
+            {
+                std::uint32_t len{};
+                return get_number(input_format_t::msgpack, len) && get_msgpack_object(conditional_static_cast<std::size_t>(len));
+            }
+
+            // negative fixint
+            case 0xE0:
+            case 0xE1:
+            case 0xE2:
+            case 0xE3:
+            case 0xE4:
+            case 0xE5:
+            case 0xE6:
+            case 0xE7:
+            case 0xE8:
+            case 0xE9:
+            case 0xEA:
+            case 0xEB:
+            case 0xEC:
+            case 0xED:
+            case 0xEE:
+            case 0xEF:
+            case 0xF0:
+            case 0xF1:
+            case 0xF2:
+            case 0xF3:
+            case 0xF4:
+            case 0xF5:
+            case 0xF6:
+            case 0xF7:
+            case 0xF8:
+            case 0xF9:
+            case 0xFA:
+            case 0xFB:
+            case 0xFC:
+            case 0xFD:
+            case 0xFE:
+            case 0xFF:
+                return sax->number_integer(static_cast<std::int8_t>(current));
+
+            default: // anything else
+            {
+                auto last_token = get_token_string();
+                return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read,
+                                        exception_message(input_format_t::msgpack, concat("invalid byte: 0x", last_token), "value"), nullptr));
+            }
+        }
+    }
+
+    /*!
+    @brief reads a MessagePack string
+
+    This function first reads starting bytes to determine the expected
+    string length and then copies this number of bytes into a string.
+
+    @param[out] result  created string
+
+    @return whether string creation completed
+    */
+    bool get_msgpack_string(string_t& result)
+    {
+        if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::msgpack, "string")))
+        {
+            return false;
+        }
+
+        switch (current)
+        {
+            // fixstr
+            case 0xA0:
+            case 0xA1:
+            case 0xA2:
+            case 0xA3:
+            case 0xA4:
+            case 0xA5:
+            case 0xA6:
+            case 0xA7:
+            case 0xA8:
+            case 0xA9:
+            case 0xAA:
+            case 0xAB:
+            case 0xAC:
+            case 0xAD:
+            case 0xAE:
+            case 0xAF:
+            case 0xB0:
+            case 0xB1:
+            case 0xB2:
+            case 0xB3:
+            case 0xB4:
+            case 0xB5:
+            case 0xB6:
+            case 0xB7:
+            case 0xB8:
+            case 0xB9:
+            case 0xBA:
+            case 0xBB:
+            case 0xBC:
+            case 0xBD:
+            case 0xBE:
+            case 0xBF:
+            {
+                return get_string(input_format_t::msgpack, static_cast<unsigned int>(current) & 0x1Fu, result);
+            }
+
+            case 0xD9: // str 8
+            {
+                std::uint8_t len{};
+                return get_number(input_format_t::msgpack, len) && get_string(input_format_t::msgpack, len, result);
+            }
+
+            case 0xDA: // str 16
+            {
+                std::uint16_t len{};
+                return get_number(input_format_t::msgpack, len) && get_string(input_format_t::msgpack, len, result);
+            }
+
+            case 0xDB: // str 32
+            {
+                std::uint32_t len{};
+                return get_number(input_format_t::msgpack, len) && get_string(input_format_t::msgpack, len, result);
+            }
+
+            default:
+            {
+                auto last_token = get_token_string();
+                return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read,
+                                        exception_message(input_format_t::msgpack, concat("expected length specification (0xA0-0xBF, 0xD9-0xDB); last byte: 0x", last_token), "string"), nullptr));
+            }
+        }
+    }
+
+    /*!
+    @brief reads a MessagePack byte array
+
+    This function first reads starting bytes to determine the expected
+    byte array length and then copies this number of bytes into a byte array.
+
+    @param[out] result  created byte array
+
+    @return whether byte array creation completed
+    */
+    bool get_msgpack_binary(binary_t& result)
+    {
+        // helper function to set the subtype
+        auto assign_and_return_true = [&result](std::int8_t subtype)
+        {
+            result.set_subtype(static_cast<std::uint8_t>(subtype));
+            return true;
+        };
+
+        switch (current)
+        {
+            case 0xC4: // bin 8
+            {
+                std::uint8_t len{};
+                return get_number(input_format_t::msgpack, len) &&
+                       get_binary(input_format_t::msgpack, len, result);
+            }
+
+            case 0xC5: // bin 16
+            {
+                std::uint16_t len{};
+                return get_number(input_format_t::msgpack, len) &&
+                       get_binary(input_format_t::msgpack, len, result);
+            }
+
+            case 0xC6: // bin 32
+            {
+                std::uint32_t len{};
+                return get_number(input_format_t::msgpack, len) &&
+                       get_binary(input_format_t::msgpack, len, result);
+            }
+
+            case 0xC7: // ext 8
+            {
+                std::uint8_t len{};
+                std::int8_t subtype{};
+                return get_number(input_format_t::msgpack, len) &&
+                       get_number(input_format_t::msgpack, subtype) &&
+                       get_binary(input_format_t::msgpack, len, result) &&
+                       assign_and_return_true(subtype);
+            }
+
+            case 0xC8: // ext 16
+            {
+                std::uint16_t len{};
+                std::int8_t subtype{};
+                return get_number(input_format_t::msgpack, len) &&
+                       get_number(input_format_t::msgpack, subtype) &&
+                       get_binary(input_format_t::msgpack, len, result) &&
+                       assign_and_return_true(subtype);
+            }
+
+            case 0xC9: // ext 32
+            {
+                std::uint32_t len{};
+                std::int8_t subtype{};
+                return get_number(input_format_t::msgpack, len) &&
+                       get_number(input_format_t::msgpack, subtype) &&
+                       get_binary(input_format_t::msgpack, len, result) &&
+                       assign_and_return_true(subtype);
+            }
+
+            case 0xD4: // fixext 1
+            {
+                std::int8_t subtype{};
+                return get_number(input_format_t::msgpack, subtype) &&
+                       get_binary(input_format_t::msgpack, 1, result) &&
+                       assign_and_return_true(subtype);
+            }
+
+            case 0xD5: // fixext 2
+            {
+                std::int8_t subtype{};
+                return get_number(input_format_t::msgpack, subtype) &&
+                       get_binary(input_format_t::msgpack, 2, result) &&
+                       assign_and_return_true(subtype);
+            }
+
+            case 0xD6: // fixext 4
+            {
+                std::int8_t subtype{};
+                return get_number(input_format_t::msgpack, subtype) &&
+                       get_binary(input_format_t::msgpack, 4, result) &&
+                       assign_and_return_true(subtype);
+            }
+
+            case 0xD7: // fixext 8
+            {
+                std::int8_t subtype{};
+                return get_number(input_format_t::msgpack, subtype) &&
+                       get_binary(input_format_t::msgpack, 8, result) &&
+                       assign_and_return_true(subtype);
+            }
+
+            case 0xD8: // fixext 16
+            {
+                std::int8_t subtype{};
+                return get_number(input_format_t::msgpack, subtype) &&
+                       get_binary(input_format_t::msgpack, 16, result) &&
+                       assign_and_return_true(subtype);
+            }
+
+            default:           // LCOV_EXCL_LINE
+                return false;  // LCOV_EXCL_LINE
+        }
+    }
+
+    /*!
+    @param[in] len  the length of the array
+    @return whether array creation completed
+    */
+    bool get_msgpack_array(const std::size_t len)
+    {
+        if (JSON_HEDLEY_UNLIKELY(!sax->start_array(len)))
+        {
+            return false;
+        }
+
+        for (std::size_t i = 0; i < len; ++i)
+        {
+            if (JSON_HEDLEY_UNLIKELY(!parse_msgpack_internal()))
+            {
+                return false;
+            }
+        }
+
+        return sax->end_array();
+    }
+
+    /*!
+    @param[in] len  the length of the object
+    @return whether object creation completed
+    */
+    bool get_msgpack_object(const std::size_t len)
+    {
+        if (JSON_HEDLEY_UNLIKELY(!sax->start_object(len)))
+        {
+            return false;
+        }
+
+        string_t key;
+        for (std::size_t i = 0; i < len; ++i)
+        {
+            get();
+            if (JSON_HEDLEY_UNLIKELY(!get_msgpack_string(key) || !sax->key(key)))
+            {
+                return false;
+            }
+
+            if (JSON_HEDLEY_UNLIKELY(!parse_msgpack_internal()))
+            {
+                return false;
+            }
+            key.clear();
+        }
+
+        return sax->end_object();
+    }
+
+    ////////////
+    // UBJSON //
+    ////////////
+
+    /*!
+    @param[in] get_char  whether a new character should be retrieved from the
+                         input (true, default) or whether the last read
+                         character should be considered instead
+
+    @return whether a valid UBJSON value was passed to the SAX parser
+    */
+    bool parse_ubjson_internal(const bool get_char = true)
+    {
+        return get_ubjson_value(get_char ? get_ignore_noop() : current);
+    }
+
+    /*!
+    @brief reads a UBJSON string
+
+    This function is either called after reading the 'S' byte explicitly
+    indicating a string, or in case of an object key where the 'S' byte can be
+    left out.
+
+    @param[out] result   created string
+    @param[in] get_char  whether a new character should be retrieved from the
+                         input (true, default) or whether the last read
+                         character should be considered instead
+
+    @return whether string creation completed
+    */
+    bool get_ubjson_string(string_t& result, const bool get_char = true)
+    {
+        if (get_char)
+        {
+            get();  // TODO(niels): may we ignore N here?
+        }
+
+        if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format, "value")))
+        {
+            return false;
+        }
+
+        switch (current)
+        {
+            case 'U':
+            {
+                std::uint8_t len{};
+                return get_number(input_format, len) && get_string(input_format, len, result);
+            }
+
+            case 'i':
+            {
+                std::int8_t len{};
+                return get_number(input_format, len) && get_string(input_format, len, result);
+            }
+
+            case 'I':
+            {
+                std::int16_t len{};
+                return get_number(input_format, len) && get_string(input_format, len, result);
+            }
+
+            case 'l':
+            {
+                std::int32_t len{};
+                return get_number(input_format, len) && get_string(input_format, len, result);
+            }
+
+            case 'L':
+            {
+                std::int64_t len{};
+                return get_number(input_format, len) && get_string(input_format, len, result);
+            }
+
+            case 'u':
+            {
+                if (input_format != input_format_t::bjdata)
+                {
+                    break;
+                }
+                std::uint16_t len{};
+                return get_number(input_format, len) && get_string(input_format, len, result);
+            }
+
+            case 'm':
+            {
+                if (input_format != input_format_t::bjdata)
+                {
+                    break;
+                }
+                std::uint32_t len{};
+                return get_number(input_format, len) && get_string(input_format, len, result);
+            }
+
+            case 'M':
+            {
+                if (input_format != input_format_t::bjdata)
+                {
+                    break;
+                }
+                std::uint64_t len{};
+                return get_number(input_format, len) && get_string(input_format, len, result);
+            }
+
+            default:
+                break;
+        }
+        auto last_token = get_token_string();
+        std::string message;
+
+        if (input_format != input_format_t::bjdata)
+        {
+            message = "expected length type specification (U, i, I, l, L); last byte: 0x" + last_token;
+        }
+        else
+        {
+            message = "expected length type specification (U, i, u, I, m, l, M, L); last byte: 0x" + last_token;
+        }
+        return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format, message, "string"), nullptr));
+    }
+
+    /*!
+    @param[out] dim  an integer vector storing the ND array dimensions
+    @return whether reading ND array size vector is successful
+    */
+    bool get_ubjson_ndarray_size(std::vector<size_t>& dim)
+    {
+        std::pair<std::size_t, char_int_type> size_and_type;
+        size_t dimlen = 0;
+        bool no_ndarray = true;
+
+        if (JSON_HEDLEY_UNLIKELY(!get_ubjson_size_type(size_and_type, no_ndarray)))
+        {
+            return false;
+        }
+
+        if (size_and_type.first != npos)
+        {
+            if (size_and_type.second != 0)
+            {
+                if (size_and_type.second != 'N')
+                {
+                    for (std::size_t i = 0; i < size_and_type.first; ++i)
+                    {
+                        if (JSON_HEDLEY_UNLIKELY(!get_ubjson_size_value(dimlen, no_ndarray, size_and_type.second)))
+                        {
+                            return false;
+                        }
+                        dim.push_back(dimlen);
+                    }
+                }
+            }
+            else
+            {
+                for (std::size_t i = 0; i < size_and_type.first; ++i)
+                {
+                    if (JSON_HEDLEY_UNLIKELY(!get_ubjson_size_value(dimlen, no_ndarray)))
+                    {
+                        return false;
+                    }
+                    dim.push_back(dimlen);
+                }
+            }
+        }
+        else
+        {
+            while (current != ']')
+            {
+                if (JSON_HEDLEY_UNLIKELY(!get_ubjson_size_value(dimlen, no_ndarray, current)))
+                {
+                    return false;
+                }
+                dim.push_back(dimlen);
+                get_ignore_noop();
+            }
+        }
+        return true;
+    }
+
+    /*!
+    @param[out] result  determined size
+    @param[in,out] is_ndarray  for input, `true` means already inside an ndarray vector
+                               or ndarray dimension is not allowed; `false` means ndarray
+                               is allowed; for output, `true` means an ndarray is found;
+                               is_ndarray can only return `true` when its initial value
+                               is `false`
+    @param[in] prefix  type marker if already read, otherwise set to 0
+
+    @return whether size determination completed
+    */
+    bool get_ubjson_size_value(std::size_t& result, bool& is_ndarray, char_int_type prefix = 0)
+    {
+        if (prefix == 0)
+        {
+            prefix = get_ignore_noop();
+        }
+
+        switch (prefix)
+        {
+            case 'U':
+            {
+                std::uint8_t number{};
+                if (JSON_HEDLEY_UNLIKELY(!get_number(input_format, number)))
+                {
+                    return false;
+                }
+                result = static_cast<std::size_t>(number);
+                return true;
+            }
+
+            case 'i':
+            {
+                std::int8_t number{};
+                if (JSON_HEDLEY_UNLIKELY(!get_number(input_format, number)))
+                {
+                    return false;
+                }
+                if (number < 0)
+                {
+                    return sax->parse_error(chars_read, get_token_string(), parse_error::create(113, chars_read,
+                                            exception_message(input_format, "count in an optimized container must be positive", "size"), nullptr));
+                }
+                result = static_cast<std::size_t>(number); // NOLINT(bugprone-signed-char-misuse,cert-str34-c): number is not a char
+                return true;
+            }
+
+            case 'I':
+            {
+                std::int16_t number{};
+                if (JSON_HEDLEY_UNLIKELY(!get_number(input_format, number)))
+                {
+                    return false;
+                }
+                if (number < 0)
+                {
+                    return sax->parse_error(chars_read, get_token_string(), parse_error::create(113, chars_read,
+                                            exception_message(input_format, "count in an optimized container must be positive", "size"), nullptr));
+                }
+                result = static_cast<std::size_t>(number);
+                return true;
+            }
+
+            case 'l':
+            {
+                std::int32_t number{};
+                if (JSON_HEDLEY_UNLIKELY(!get_number(input_format, number)))
+                {
+                    return false;
+                }
+                if (number < 0)
+                {
+                    return sax->parse_error(chars_read, get_token_string(), parse_error::create(113, chars_read,
+                                            exception_message(input_format, "count in an optimized container must be positive", "size"), nullptr));
+                }
+                result = static_cast<std::size_t>(number);
+                return true;
+            }
+
+            case 'L':
+            {
+                std::int64_t number{};
+                if (JSON_HEDLEY_UNLIKELY(!get_number(input_format, number)))
+                {
+                    return false;
+                }
+                if (number < 0)
+                {
+                    return sax->parse_error(chars_read, get_token_string(), parse_error::create(113, chars_read,
+                                            exception_message(input_format, "count in an optimized container must be positive", "size"), nullptr));
+                }
+                if (!value_in_range_of<std::size_t>(number))
+                {
+                    return sax->parse_error(chars_read, get_token_string(), out_of_range::create(408,
+                                            exception_message(input_format, "integer value overflow", "size"), nullptr));
+                }
+                result = static_cast<std::size_t>(number);
+                return true;
+            }
+
+            case 'u':
+            {
+                if (input_format != input_format_t::bjdata)
+                {
+                    break;
+                }
+                std::uint16_t number{};
+                if (JSON_HEDLEY_UNLIKELY(!get_number(input_format, number)))
+                {
+                    return false;
+                }
+                result = static_cast<std::size_t>(number);
+                return true;
+            }
+
+            case 'm':
+            {
+                if (input_format != input_format_t::bjdata)
+                {
+                    break;
+                }
+                std::uint32_t number{};
+                if (JSON_HEDLEY_UNLIKELY(!get_number(input_format, number)))
+                {
+                    return false;
+                }
+                result = conditional_static_cast<std::size_t>(number);
+                return true;
+            }
+
+            case 'M':
+            {
+                if (input_format != input_format_t::bjdata)
+                {
+                    break;
+                }
+                std::uint64_t number{};
+                if (JSON_HEDLEY_UNLIKELY(!get_number(input_format, number)))
+                {
+                    return false;
+                }
+                if (!value_in_range_of<std::size_t>(number))
+                {
+                    return sax->parse_error(chars_read, get_token_string(), out_of_range::create(408,
+                                            exception_message(input_format, "integer value overflow", "size"), nullptr));
+                }
+                result = detail::conditional_static_cast<std::size_t>(number);
+                return true;
+            }
+
+            case '[':
+            {
+                if (input_format != input_format_t::bjdata)
+                {
+                    break;
+                }
+                if (is_ndarray) // ndarray dimensional vector can only contain integers, and can not embed another array
+                {
+                    return sax->parse_error(chars_read, get_token_string(), parse_error::create(113, chars_read, exception_message(input_format, "ndarray dimensional vector is not allowed", "size"), nullptr));
+                }
+                std::vector<size_t> dim;
+                if (JSON_HEDLEY_UNLIKELY(!get_ubjson_ndarray_size(dim)))
+                {
+                    return false;
+                }
+                if (dim.size() == 1 || (dim.size() == 2 && dim.at(0) == 1)) // return normal array size if 1D row vector
+                {
+                    result = dim.at(dim.size() - 1);
+                    return true;
+                }
+                if (!dim.empty())  // if ndarray, convert to an object in JData annotated array format
+                {
+                    for (auto i : dim) // test if any dimension in an ndarray is 0, if so, return a 1D empty container
+                    {
+                        if ( i == 0 )
+                        {
+                            result = 0;
+                            return true;
+                        }
+                    }
+
+                    string_t key = "_ArraySize_";
+                    if (JSON_HEDLEY_UNLIKELY(!sax->start_object(3) || !sax->key(key) || !sax->start_array(dim.size())))
+                    {
+                        return false;
+                    }
+                    result = 1;
+                    for (auto i : dim)
+                    {
+                        result *= i;
+                        if (result == 0 || result == npos) // because dim elements shall not have zeros, result = 0 means overflow happened; it also can't be npos as it is used to initialize size in get_ubjson_size_type()
+                        {
+                            return sax->parse_error(chars_read, get_token_string(), out_of_range::create(408, exception_message(input_format, "excessive ndarray size caused overflow", "size"), nullptr));
+                        }
+                        if (JSON_HEDLEY_UNLIKELY(!sax->number_unsigned(static_cast<number_unsigned_t>(i))))
+                        {
+                            return false;
+                        }
+                    }
+                    is_ndarray = true;
+                    return sax->end_array();
+                }
+                result = 0;
+                return true;
+            }
+
+            default:
+                break;
+        }
+        auto last_token = get_token_string();
+        std::string message;
+
+        if (input_format != input_format_t::bjdata)
+        {
+            message = "expected length type specification (U, i, I, l, L) after '#'; last byte: 0x" + last_token;
+        }
+        else
+        {
+            message = "expected length type specification (U, i, u, I, m, l, M, L) after '#'; last byte: 0x" + last_token;
+        }
+        return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format, message, "size"), nullptr));
+    }
+
+    /*!
+    @brief determine the type and size for a container
+
+    In the optimized UBJSON format, a type and a size can be provided to allow
+    for a more compact representation.
+
+    @param[out] result  pair of the size and the type
+    @param[in] inside_ndarray  whether the parser is parsing an ND array dimensional vector
+
+    @return whether pair creation completed
+    */
+    bool get_ubjson_size_type(std::pair<std::size_t, char_int_type>& result, bool inside_ndarray = false)
+    {
+        result.first = npos; // size
+        result.second = 0; // type
+        bool is_ndarray = false;
+
+        get_ignore_noop();
+
+        if (current == '$')
+        {
+            result.second = get();  // must not ignore 'N', because 'N' maybe the type
+            if (input_format == input_format_t::bjdata
+                    && JSON_HEDLEY_UNLIKELY(std::binary_search(bjd_optimized_type_markers.begin(), bjd_optimized_type_markers.end(), result.second)))
+            {
+                auto last_token = get_token_string();
+                return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read,
+                                        exception_message(input_format, concat("marker 0x", last_token, " is not a permitted optimized array type"), "type"), nullptr));
+            }
+
+            if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format, "type")))
+            {
+                return false;
+            }
+
+            get_ignore_noop();
+            if (JSON_HEDLEY_UNLIKELY(current != '#'))
+            {
+                if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format, "value")))
+                {
+                    return false;
+                }
+                auto last_token = get_token_string();
+                return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read,
+                                        exception_message(input_format, concat("expected '#' after type information; last byte: 0x", last_token), "size"), nullptr));
+            }
+
+            const bool is_error = get_ubjson_size_value(result.first, is_ndarray);
+            if (input_format == input_format_t::bjdata && is_ndarray)
+            {
+                if (inside_ndarray)
+                {
+                    return sax->parse_error(chars_read, get_token_string(), parse_error::create(112, chars_read,
+                                            exception_message(input_format, "ndarray can not be recursive", "size"), nullptr));
+                }
+                result.second |= (1 << 8); // use bit 8 to indicate ndarray, all UBJSON and BJData markers should be ASCII letters
+            }
+            return is_error;
+        }
+
+        if (current == '#')
+        {
+            const bool is_error = get_ubjson_size_value(result.first, is_ndarray);
+            if (input_format == input_format_t::bjdata && is_ndarray)
+            {
+                return sax->parse_error(chars_read, get_token_string(), parse_error::create(112, chars_read,
+                                        exception_message(input_format, "ndarray requires both type and size", "size"), nullptr));
+            }
+            return is_error;
+        }
+
+        return true;
+    }
+
+    /*!
+    @param prefix  the previously read or set type prefix
+    @return whether value creation completed
+    */
+    bool get_ubjson_value(const char_int_type prefix)
+    {
+        switch (prefix)
+        {
+            case char_traits<char_type>::eof():  // EOF
+                return unexpect_eof(input_format, "value");
+
+            case 'T':  // true
+                return sax->boolean(true);
+            case 'F':  // false
+                return sax->boolean(false);
+
+            case 'Z':  // null
+                return sax->null();
+
+            case 'B':  // byte
+            {
+                if (input_format != input_format_t::bjdata)
+                {
+                    break;
+                }
+                std::uint8_t number{};
+                return get_number(input_format, number) && sax->number_unsigned(number);
+            }
+
+            case 'U':
+            {
+                std::uint8_t number{};
+                return get_number(input_format, number) && sax->number_unsigned(number);
+            }
+
+            case 'i':
+            {
+                std::int8_t number{};
+                return get_number(input_format, number) && sax->number_integer(number);
+            }
+
+            case 'I':
+            {
+                std::int16_t number{};
+                return get_number(input_format, number) && sax->number_integer(number);
+            }
+
+            case 'l':
+            {
+                std::int32_t number{};
+                return get_number(input_format, number) && sax->number_integer(number);
+            }
+
+            case 'L':
+            {
+                std::int64_t number{};
+                return get_number(input_format, number) && sax->number_integer(number);
+            }
+
+            case 'u':
+            {
+                if (input_format != input_format_t::bjdata)
+                {
+                    break;
+                }
+                std::uint16_t number{};
+                return get_number(input_format, number) && sax->number_unsigned(number);
+            }
+
+            case 'm':
+            {
+                if (input_format != input_format_t::bjdata)
+                {
+                    break;
+                }
+                std::uint32_t number{};
+                return get_number(input_format, number) && sax->number_unsigned(number);
+            }
+
+            case 'M':
+            {
+                if (input_format != input_format_t::bjdata)
+                {
+                    break;
+                }
+                std::uint64_t number{};
+                return get_number(input_format, number) && sax->number_unsigned(number);
+            }
+
+            case 'h':
+            {
+                if (input_format != input_format_t::bjdata)
+                {
+                    break;
+                }
+                const auto byte1_raw = get();
+                if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format, "number")))
+                {
+                    return false;
+                }
+                const auto byte2_raw = get();
+                if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format, "number")))
+                {
+                    return false;
+                }
+
+                const auto byte1 = static_cast<unsigned char>(byte1_raw);
+                const auto byte2 = static_cast<unsigned char>(byte2_raw);
+
+                // code from RFC 7049, Appendix D, Figure 3:
+                // As half-precision floating-point numbers were only added
+                // to IEEE 754 in 2008, today's programming platforms often
+                // still only have limited support for them. It is very
+                // easy to include at least decoding support for them even
+                // without such support. An example of a small decoder for
+                // half-precision floating-point numbers in the C language
+                // is shown in Fig. 3.
+                const auto half = static_cast<unsigned int>((byte2 << 8u) + byte1);
+                const double val = [&half]
+                {
+                    const int exp = (half >> 10u) & 0x1Fu;
+                    const unsigned int mant = half & 0x3FFu;
+                    JSON_ASSERT(0 <= exp&& exp <= 32);
+                    JSON_ASSERT(mant <= 1024);
+                    switch (exp)
+                    {
+                        case 0:
+                            return std::ldexp(mant, -24);
+                        case 31:
+                            return (mant == 0)
+                            ? std::numeric_limits<double>::infinity()
+                            : std::numeric_limits<double>::quiet_NaN();
+                        default:
+                            return std::ldexp(mant + 1024, exp - 25);
+                    }
+                }();
+                return sax->number_float((half & 0x8000u) != 0
+                                         ? static_cast<number_float_t>(-val)
+                                         : static_cast<number_float_t>(val), "");
+            }
+
+            case 'd':
+            {
+                float number{};
+                return get_number(input_format, number) && sax->number_float(static_cast<number_float_t>(number), "");
+            }
+
+            case 'D':
+            {
+                double number{};
+                return get_number(input_format, number) && sax->number_float(static_cast<number_float_t>(number), "");
+            }
+
+            case 'H':
+            {
+                return get_ubjson_high_precision_number();
+            }
+
+            case 'C':  // char
+            {
+                get();
+                if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format, "char")))
+                {
+                    return false;
+                }
+                if (JSON_HEDLEY_UNLIKELY(current > 127))
+                {
+                    auto last_token = get_token_string();
+                    return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read,
+                                            exception_message(input_format, concat("byte after 'C' must be in range 0x00..0x7F; last byte: 0x", last_token), "char"), nullptr));
+                }
+                string_t s(1, static_cast<typename string_t::value_type>(current));
+                return sax->string(s);
+            }
+
+            case 'S':  // string
+            {
+                string_t s;
+                return get_ubjson_string(s) && sax->string(s);
+            }
+
+            case '[':  // array
+                return get_ubjson_array();
+
+            case '{':  // object
+                return get_ubjson_object();
+
+            default: // anything else
+                break;
+        }
+        auto last_token = get_token_string();
+        return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format, "invalid byte: 0x" + last_token, "value"), nullptr));
+    }
+
+    /*!
+    @return whether array creation completed
+    */
+    bool get_ubjson_array()
+    {
+        std::pair<std::size_t, char_int_type> size_and_type;
+        if (JSON_HEDLEY_UNLIKELY(!get_ubjson_size_type(size_and_type)))
+        {
+            return false;
+        }
+
+        // if bit-8 of size_and_type.second is set to 1, encode bjdata ndarray as an object in JData annotated array format (https://github.com/NeuroJSON/jdata):
+        // {"_ArrayType_" : "typeid", "_ArraySize_" : [n1, n2, ...], "_ArrayData_" : [v1, v2, ...]}
+
+        if (input_format == input_format_t::bjdata && size_and_type.first != npos && (size_and_type.second & (1 << 8)) != 0)
+        {
+            size_and_type.second &= ~(static_cast<char_int_type>(1) << 8);  // use bit 8 to indicate ndarray, here we remove the bit to restore the type marker
+            auto it = std::lower_bound(bjd_types_map.begin(), bjd_types_map.end(), size_and_type.second, [](const bjd_type & p, char_int_type t)
+            {
+                return p.first < t;
+            });
+            string_t key = "_ArrayType_";
+            if (JSON_HEDLEY_UNLIKELY(it == bjd_types_map.end() || it->first != size_and_type.second))
+            {
+                auto last_token = get_token_string();
+                return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read,
+                                        exception_message(input_format, "invalid byte: 0x" + last_token, "type"), nullptr));
+            }
+
+            string_t type = it->second; // sax->string() takes a reference
+            if (JSON_HEDLEY_UNLIKELY(!sax->key(key) || !sax->string(type)))
+            {
+                return false;
+            }
+
+            if (size_and_type.second == 'C' || size_and_type.second == 'B')
+            {
+                size_and_type.second = 'U';
+            }
+
+            key = "_ArrayData_";
+            if (JSON_HEDLEY_UNLIKELY(!sax->key(key) || !sax->start_array(size_and_type.first) ))
+            {
+                return false;
+            }
+
+            for (std::size_t i = 0; i < size_and_type.first; ++i)
+            {
+                if (JSON_HEDLEY_UNLIKELY(!get_ubjson_value(size_and_type.second)))
+                {
+                    return false;
+                }
+            }
+
+            return (sax->end_array() && sax->end_object());
+        }
+
+        // If BJData type marker is 'B' decode as binary
+        if (input_format == input_format_t::bjdata && size_and_type.first != npos && size_and_type.second == 'B')
+        {
+            binary_t result;
+            return get_binary(input_format, size_and_type.first, result) && sax->binary(result);
+        }
+
+        if (size_and_type.first != npos)
+        {
+            if (JSON_HEDLEY_UNLIKELY(!sax->start_array(size_and_type.first)))
+            {
+                return false;
+            }
+
+            if (size_and_type.second != 0)
+            {
+                if (size_and_type.second != 'N')
+                {
+                    for (std::size_t i = 0; i < size_and_type.first; ++i)
+                    {
+                        if (JSON_HEDLEY_UNLIKELY(!get_ubjson_value(size_and_type.second)))
+                        {
+                            return false;
+                        }
+                    }
+                }
+            }
+            else
+            {
+                for (std::size_t i = 0; i < size_and_type.first; ++i)
+                {
+                    if (JSON_HEDLEY_UNLIKELY(!parse_ubjson_internal()))
+                    {
+                        return false;
+                    }
+                }
+            }
+        }
+        else
+        {
+            if (JSON_HEDLEY_UNLIKELY(!sax->start_array(detail::unknown_size())))
+            {
+                return false;
+            }
+
+            while (current != ']')
+            {
+                if (JSON_HEDLEY_UNLIKELY(!parse_ubjson_internal(false)))
+                {
+                    return false;
+                }
+                get_ignore_noop();
+            }
+        }
+
+        return sax->end_array();
+    }
+
+    /*!
+    @return whether object creation completed
+    */
+    bool get_ubjson_object()
+    {
+        std::pair<std::size_t, char_int_type> size_and_type;
+        if (JSON_HEDLEY_UNLIKELY(!get_ubjson_size_type(size_and_type)))
+        {
+            return false;
+        }
+
+        // do not accept ND-array size in objects in BJData
+        if (input_format == input_format_t::bjdata && size_and_type.first != npos && (size_and_type.second & (1 << 8)) != 0)
+        {
+            auto last_token = get_token_string();
+            return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read,
+                                    exception_message(input_format, "BJData object does not support ND-array size in optimized format", "object"), nullptr));
+        }
+
+        string_t key;
+        if (size_and_type.first != npos)
+        {
+            if (JSON_HEDLEY_UNLIKELY(!sax->start_object(size_and_type.first)))
+            {
+                return false;
+            }
+
+            if (size_and_type.second != 0)
+            {
+                for (std::size_t i = 0; i < size_and_type.first; ++i)
+                {
+                    if (JSON_HEDLEY_UNLIKELY(!get_ubjson_string(key) || !sax->key(key)))
+                    {
+                        return false;
+                    }
+                    if (JSON_HEDLEY_UNLIKELY(!get_ubjson_value(size_and_type.second)))
+                    {
+                        return false;
+                    }
+                    key.clear();
+                }
+            }
+            else
+            {
+                for (std::size_t i = 0; i < size_and_type.first; ++i)
+                {
+                    if (JSON_HEDLEY_UNLIKELY(!get_ubjson_string(key) || !sax->key(key)))
+                    {
+                        return false;
+                    }
+                    if (JSON_HEDLEY_UNLIKELY(!parse_ubjson_internal()))
+                    {
+                        return false;
+                    }
+                    key.clear();
+                }
+            }
+        }
+        else
+        {
+            if (JSON_HEDLEY_UNLIKELY(!sax->start_object(detail::unknown_size())))
+            {
+                return false;
+            }
+
+            while (current != '}')
+            {
+                if (JSON_HEDLEY_UNLIKELY(!get_ubjson_string(key, false) || !sax->key(key)))
+                {
+                    return false;
+                }
+                if (JSON_HEDLEY_UNLIKELY(!parse_ubjson_internal()))
+                {
+                    return false;
+                }
+                get_ignore_noop();
+                key.clear();
+            }
+        }
+
+        return sax->end_object();
+    }
+
+    // Note, no reader for UBJSON binary types is implemented because they do
+    // not exist
+
+    bool get_ubjson_high_precision_number()
+    {
+        // get size of following number string
+        std::size_t size{};
+        bool no_ndarray = true;
+        auto res = get_ubjson_size_value(size, no_ndarray);
+        if (JSON_HEDLEY_UNLIKELY(!res))
+        {
+            return res;
+        }
+
+        // get number string
+        std::vector<char> number_vector;
+        for (std::size_t i = 0; i < size; ++i)
+        {
+            get();
+            if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format, "number")))
+            {
+                return false;
+            }
+            number_vector.push_back(static_cast<char>(current));
+        }
+
+        // parse number string
+        using ia_type = decltype(detail::input_adapter(number_vector));
+        auto number_lexer = detail::lexer<BasicJsonType, ia_type>(detail::input_adapter(number_vector), false);
+        const auto result_number = number_lexer.scan();
+        const auto number_string = number_lexer.get_token_string();
+        const auto result_remainder = number_lexer.scan();
+
+        using token_type = typename detail::lexer_base<BasicJsonType>::token_type;
+
+        if (JSON_HEDLEY_UNLIKELY(result_remainder != token_type::end_of_input))
+        {
+            return sax->parse_error(chars_read, number_string, parse_error::create(115, chars_read,
+                                    exception_message(input_format, concat("invalid number text: ", number_lexer.get_token_string()), "high-precision number"), nullptr));
+        }
+
+        switch (result_number)
+        {
+            case token_type::value_integer:
+                return sax->number_integer(number_lexer.get_number_integer());
+            case token_type::value_unsigned:
+                return sax->number_unsigned(number_lexer.get_number_unsigned());
+            case token_type::value_float:
+                return sax->number_float(number_lexer.get_number_float(), std::move(number_string));
+            case token_type::uninitialized:
+            case token_type::literal_true:
+            case token_type::literal_false:
+            case token_type::literal_null:
+            case token_type::value_string:
+            case token_type::begin_array:
+            case token_type::begin_object:
+            case token_type::end_array:
+            case token_type::end_object:
+            case token_type::name_separator:
+            case token_type::value_separator:
+            case token_type::parse_error:
+            case token_type::end_of_input:
+            case token_type::literal_or_value:
+            default:
+                return sax->parse_error(chars_read, number_string, parse_error::create(115, chars_read,
+                                        exception_message(input_format, concat("invalid number text: ", number_lexer.get_token_string()), "high-precision number"), nullptr));
+        }
+    }
+
+    ///////////////////////
+    // Utility functions //
+    ///////////////////////
+
+    /*!
+    @brief get next character from the input
+
+    This function provides the interface to the used input adapter. It does
+    not throw in case the input reached EOF, but returns a -'ve valued
+    `char_traits<char_type>::eof()` in that case.
+
+    @return character read from the input
+    */
+    char_int_type get()
+    {
+        ++chars_read;
+        return current = ia.get_character();
+    }
+
+    /*!
+    @brief get_to read into a primitive type
+
+    This function provides the interface to the used input adapter. It does
+    not throw in case the input reached EOF, but returns false instead
+
+    @return bool, whether the read was successful
+    */
+    template<class T>
+    bool get_to(T& dest, const input_format_t format, const char* context)
+    {
+        auto new_chars_read = ia.get_elements(&dest);
+        chars_read += new_chars_read;
+        if (JSON_HEDLEY_UNLIKELY(new_chars_read < sizeof(T)))
+        {
+            // in case of failure, advance position by 1 to report failing location
+            ++chars_read;
+            sax->parse_error(chars_read, "<end of file>", parse_error::create(110, chars_read, exception_message(format, "unexpected end of input", context), nullptr));
+            return false;
+        }
+        return true;
+    }
+
+    /*!
+    @return character read from the input after ignoring all 'N' entries
+    */
+    char_int_type get_ignore_noop()
+    {
+        do
+        {
+            get();
+        }
+        while (current == 'N');
+
+        return current;
+    }
+
+    template<class NumberType>
+    static void byte_swap(NumberType& number)
+    {
+        constexpr std::size_t sz = sizeof(number);
+#ifdef __cpp_lib_byteswap
+        if constexpr (sz == 1)
+        {
+            return;
+        }
+        if constexpr(std::is_integral_v<NumberType>)
+        {
+            number = std::byteswap(number);
+            return;
+        }
+#endif
+        auto* ptr = reinterpret_cast<std::uint8_t*>(&number);
+        for (std::size_t i = 0; i < sz / 2; ++i)
+        {
+            std::swap(ptr[i], ptr[sz - i - 1]);
+        }
+    }
+
+    /*
+    @brief read a number from the input
+
+    @tparam NumberType the type of the number
+    @param[in] format   the current format (for diagnostics)
+    @param[out] result  number of type @a NumberType
+
+    @return whether conversion completed
+
+    @note This function needs to respect the system's endianness, because
+          bytes in CBOR, MessagePack, and UBJSON are stored in network order
+          (big endian) and therefore need reordering on little endian systems.
+          On the other hand, BSON and BJData use little endian and should reorder
+          on big endian systems.
+    */
+    template<typename NumberType, bool InputIsLittleEndian = false>
+    bool get_number(const input_format_t format, NumberType& result)
+    {
+        // read in the original format
+
+        if (JSON_HEDLEY_UNLIKELY(!get_to(result, format, "number")))
+        {
+            return false;
+        }
+        if (is_little_endian != (InputIsLittleEndian || format == input_format_t::bjdata))
+        {
+            byte_swap(result);
+        }
+        return true;
+    }
+
+    /*!
+    @brief create a string by reading characters from the input
+
+    @tparam NumberType the type of the number
+    @param[in] format the current format (for diagnostics)
+    @param[in] len number of characters to read
+    @param[out] result string created by reading @a len bytes
+
+    @return whether string creation completed
+
+    @note We can not reserve @a len bytes for the result, because @a len
+          may be too large. Usually, @ref unexpect_eof() detects the end of
+          the input before we run out of string memory.
+    */
+    template<typename NumberType>
+    bool get_string(const input_format_t format,
+                    const NumberType len,
+                    string_t& result)
+    {
+        bool success = true;
+        for (NumberType i = 0; i < len; i++)
+        {
+            get();
+            if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(format, "string")))
+            {
+                success = false;
+                break;
+            }
+            result.push_back(static_cast<typename string_t::value_type>(current));
+        }
+        return success;
+    }
+
+    /*!
+    @brief create a byte array by reading bytes from the input
+
+    @tparam NumberType the type of the number
+    @param[in] format the current format (for diagnostics)
+    @param[in] len number of bytes to read
+    @param[out] result byte array created by reading @a len bytes
+
+    @return whether byte array creation completed
+
+    @note We can not reserve @a len bytes for the result, because @a len
+          may be too large. Usually, @ref unexpect_eof() detects the end of
+          the input before we run out of memory.
+    */
+    template<typename NumberType>
+    bool get_binary(const input_format_t format,
+                    const NumberType len,
+                    binary_t& result)
+    {
+        bool success = true;
+        for (NumberType i = 0; i < len; i++)
+        {
+            get();
+            if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(format, "binary")))
+            {
+                success = false;
+                break;
+            }
+            result.push_back(static_cast<std::uint8_t>(current));
+        }
+        return success;
+    }
+
+    /*!
+    @param[in] format   the current format (for diagnostics)
+    @param[in] context  further context information (for diagnostics)
+    @return whether the last read character is not EOF
+    */
+    JSON_HEDLEY_NON_NULL(3)
+    bool unexpect_eof(const input_format_t format, const char* context) const
+    {
+        if (JSON_HEDLEY_UNLIKELY(current == char_traits<char_type>::eof()))
+        {
+            return sax->parse_error(chars_read, "<end of file>",
+                                    parse_error::create(110, chars_read, exception_message(format, "unexpected end of input", context), nullptr));
+        }
+        return true;
+    }
+
+    /*!
+    @return a string representation of the last read byte
+    */
+    std::string get_token_string() const
+    {
+        std::array<char, 3> cr{{}};
+        static_cast<void>((std::snprintf)(cr.data(), cr.size(), "%.2hhX", static_cast<unsigned char>(current))); // NOLINT(cppcoreguidelines-pro-type-vararg,hicpp-vararg)
+        return std::string{cr.data()};
+    }
+
+    /*!
+    @param[in] format   the current format
+    @param[in] detail   a detailed error message
+    @param[in] context  further context information
+    @return a message string to use in the parse_error exceptions
+    */
+    std::string exception_message(const input_format_t format,
+                                  const std::string& detail,
+                                  const std::string& context) const
+    {
+        std::string error_msg = "syntax error while parsing ";
+
+        switch (format)
+        {
+            case input_format_t::cbor:
+                error_msg += "CBOR";
+                break;
+
+            case input_format_t::msgpack:
+                error_msg += "MessagePack";
+                break;
+
+            case input_format_t::ubjson:
+                error_msg += "UBJSON";
+                break;
+
+            case input_format_t::bson:
+                error_msg += "BSON";
+                break;
+
+            case input_format_t::bjdata:
+                error_msg += "BJData";
+                break;
+
+            case input_format_t::json: // LCOV_EXCL_LINE
+            default:            // LCOV_EXCL_LINE
+                JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
+        }
+
+        return concat(error_msg, ' ', context, ": ", detail);
+    }
+
+  private:
+    static JSON_INLINE_VARIABLE constexpr std::size_t npos = detail::unknown_size();
+
+    /// input adapter
+    InputAdapterType ia;
+
+    /// the current character
+    char_int_type current = char_traits<char_type>::eof();
+
+    /// the number of characters read
+    std::size_t chars_read = 0;
+
+    /// whether we can assume little endianness
+    const bool is_little_endian = little_endianness();
+
+    /// input format
+    const input_format_t input_format = input_format_t::json;
+
+    /// the SAX parser
+    json_sax_t* sax = nullptr;
+
+    // excluded markers in bjdata optimized type
+#define JSON_BINARY_READER_MAKE_BJD_OPTIMIZED_TYPE_MARKERS_ \
+    make_array<char_int_type>('F', 'H', 'N', 'S', 'T', 'Z', '[', '{')
+
+#define JSON_BINARY_READER_MAKE_BJD_TYPES_MAP_ \
+    make_array<bjd_type>(                      \
+    bjd_type{'B', "byte"},                     \
+    bjd_type{'C', "char"},                     \
+    bjd_type{'D', "double"},                   \
+    bjd_type{'I', "int16"},                    \
+    bjd_type{'L', "int64"},                    \
+    bjd_type{'M', "uint64"},                   \
+    bjd_type{'U', "uint8"},                    \
+    bjd_type{'d', "single"},                   \
+    bjd_type{'i', "int8"},                     \
+    bjd_type{'l', "int32"},                    \
+    bjd_type{'m', "uint32"},                   \
+    bjd_type{'u', "uint16"})
+
+  JSON_PRIVATE_UNLESS_TESTED:
+    // lookup tables
+    // NOLINTNEXTLINE(cppcoreguidelines-non-private-member-variables-in-classes)
+    const decltype(JSON_BINARY_READER_MAKE_BJD_OPTIMIZED_TYPE_MARKERS_) bjd_optimized_type_markers =
+        JSON_BINARY_READER_MAKE_BJD_OPTIMIZED_TYPE_MARKERS_;
+
+    using bjd_type = std::pair<char_int_type, string_t>;
+    // NOLINTNEXTLINE(cppcoreguidelines-non-private-member-variables-in-classes)
+    const decltype(JSON_BINARY_READER_MAKE_BJD_TYPES_MAP_) bjd_types_map =
+        JSON_BINARY_READER_MAKE_BJD_TYPES_MAP_;
+
+#undef JSON_BINARY_READER_MAKE_BJD_OPTIMIZED_TYPE_MARKERS_
+#undef JSON_BINARY_READER_MAKE_BJD_TYPES_MAP_
+};
+
+#ifndef JSON_HAS_CPP_17
+    template<typename BasicJsonType, typename InputAdapterType, typename SAX>
+    constexpr std::size_t binary_reader<BasicJsonType, InputAdapterType, SAX>::npos;
+#endif
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/input/input_adapters.hpp>
+
+// #include <nlohmann/detail/input/lexer.hpp>
+
+// #include <nlohmann/detail/input/parser.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013 - 2025 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <cmath> // isfinite
+#include <cstdint> // uint8_t
+#include <functional> // function
+#include <string> // string
+#include <utility> // move
+#include <vector> // vector
+
+// #include <nlohmann/detail/exceptions.hpp>
+
+// #include <nlohmann/detail/input/input_adapters.hpp>
+
+// #include <nlohmann/detail/input/json_sax.hpp>
+
+// #include <nlohmann/detail/input/lexer.hpp>
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/meta/is_sax.hpp>
+
+// #include <nlohmann/detail/string_concat.hpp>
+
+// #include <nlohmann/detail/value_t.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+////////////
+// parser //
+////////////
+
+enum class parse_event_t : std::uint8_t
+{
+    /// the parser read `{` and started to process a JSON object
+    object_start,
+    /// the parser read `}` and finished processing a JSON object
+    object_end,
+    /// the parser read `[` and started to process a JSON array
+    array_start,
+    /// the parser read `]` and finished processing a JSON array
+    array_end,
+    /// the parser read a key of a value in an object
+    key,
+    /// the parser finished reading a JSON value
+    value
+};
+
+template<typename BasicJsonType>
+using parser_callback_t =
+    std::function<bool(int /*depth*/, parse_event_t /*event*/, BasicJsonType& /*parsed*/)>;
+
+/*!
+@brief syntax analysis
+
+This class implements a recursive descent parser.
+*/
+template<typename BasicJsonType, typename InputAdapterType>
+class parser
+{
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+    using string_t = typename BasicJsonType::string_t;
+    using lexer_t = lexer<BasicJsonType, InputAdapterType>;
+    using token_type = typename lexer_t::token_type;
+
+  public:
+    /// a parser reading from an input adapter
+    explicit parser(InputAdapterType&& adapter,
+                    parser_callback_t<BasicJsonType> cb = nullptr,
+                    const bool allow_exceptions_ = true,
+                    const bool skip_comments = false)
+        : callback(std::move(cb))
+        , m_lexer(std::move(adapter), skip_comments)
+        , allow_exceptions(allow_exceptions_)
+    {
+        // read first token
+        get_token();
+    }
+
+    /*!
+    @brief public parser interface
+
+    @param[in] strict      whether to expect the last token to be EOF
+    @param[in,out] result  parsed JSON value
+
+    @throw parse_error.101 in case of an unexpected token
+    @throw parse_error.102 if to_unicode fails or surrogate error
+    @throw parse_error.103 if to_unicode fails
+    */
+    void parse(const bool strict, BasicJsonType& result)
+    {
+        if (callback)
+        {
+            json_sax_dom_callback_parser<BasicJsonType, InputAdapterType> sdp(result, callback, allow_exceptions, &m_lexer);
+            sax_parse_internal(&sdp);
+
+            // in strict mode, input must be completely read
+            if (strict && (get_token() != token_type::end_of_input))
+            {
+                sdp.parse_error(m_lexer.get_position(),
+                                m_lexer.get_token_string(),
+                                parse_error::create(101, m_lexer.get_position(),
+                                                    exception_message(token_type::end_of_input, "value"), nullptr));
+            }
+
+            // in case of an error, return discarded value
+            if (sdp.is_errored())
+            {
+                result = value_t::discarded;
+                return;
+            }
+
+            // set top-level value to null if it was discarded by the callback
+            // function
+            if (result.is_discarded())
+            {
+                result = nullptr;
+            }
+        }
+        else
+        {
+            json_sax_dom_parser<BasicJsonType, InputAdapterType> sdp(result, allow_exceptions, &m_lexer);
+            sax_parse_internal(&sdp);
+
+            // in strict mode, input must be completely read
+            if (strict && (get_token() != token_type::end_of_input))
+            {
+                sdp.parse_error(m_lexer.get_position(),
+                                m_lexer.get_token_string(),
+                                parse_error::create(101, m_lexer.get_position(), exception_message(token_type::end_of_input, "value"), nullptr));
+            }
+
+            // in case of an error, return discarded value
+            if (sdp.is_errored())
+            {
+                result = value_t::discarded;
+                return;
+            }
+        }
+
+        result.assert_invariant();
+    }
+
+    /*!
+    @brief public accept interface
+
+    @param[in] strict  whether to expect the last token to be EOF
+    @return whether the input is a proper JSON text
+    */
+    bool accept(const bool strict = true)
+    {
+        json_sax_acceptor<BasicJsonType> sax_acceptor;
+        return sax_parse(&sax_acceptor, strict);
+    }
+
+    template<typename SAX>
+    JSON_HEDLEY_NON_NULL(2)
+    bool sax_parse(SAX* sax, const bool strict = true)
+    {
+        (void)detail::is_sax_static_asserts<SAX, BasicJsonType> {};
+        const bool result = sax_parse_internal(sax);
+
+        // strict mode: next byte must be EOF
+        if (result && strict && (get_token() != token_type::end_of_input))
+        {
+            return sax->parse_error(m_lexer.get_position(),
+                                    m_lexer.get_token_string(),
+                                    parse_error::create(101, m_lexer.get_position(), exception_message(token_type::end_of_input, "value"), nullptr));
+        }
+
+        return result;
+    }
+
+  private:
+    template<typename SAX>
+    JSON_HEDLEY_NON_NULL(2)
+    bool sax_parse_internal(SAX* sax)
+    {
+        // stack to remember the hierarchy of structured values we are parsing
+        // true = array; false = object
+        std::vector<bool> states;
+        // value to avoid a goto (see comment where set to true)
+        bool skip_to_state_evaluation = false;
+
+        while (true)
+        {
+            if (!skip_to_state_evaluation)
+            {
+                // invariant: get_token() was called before each iteration
+                switch (last_token)
+                {
+                    case token_type::begin_object:
+                    {
+                        if (JSON_HEDLEY_UNLIKELY(!sax->start_object(detail::unknown_size())))
+                        {
+                            return false;
+                        }
+
+                        // closing } -> we are done
+                        if (get_token() == token_type::end_object)
+                        {
+                            if (JSON_HEDLEY_UNLIKELY(!sax->end_object()))
+                            {
+                                return false;
+                            }
+                            break;
+                        }
+
+                        // parse key
+                        if (JSON_HEDLEY_UNLIKELY(last_token != token_type::value_string))
+                        {
+                            return sax->parse_error(m_lexer.get_position(),
+                                                    m_lexer.get_token_string(),
+                                                    parse_error::create(101, m_lexer.get_position(), exception_message(token_type::value_string, "object key"), nullptr));
+                        }
+                        if (JSON_HEDLEY_UNLIKELY(!sax->key(m_lexer.get_string())))
+                        {
+                            return false;
+                        }
+
+                        // parse separator (:)
+                        if (JSON_HEDLEY_UNLIKELY(get_token() != token_type::name_separator))
+                        {
+                            return sax->parse_error(m_lexer.get_position(),
+                                                    m_lexer.get_token_string(),
+                                                    parse_error::create(101, m_lexer.get_position(), exception_message(token_type::name_separator, "object separator"), nullptr));
+                        }
+
+                        // remember we are now inside an object
+                        states.push_back(false);
+
+                        // parse values
+                        get_token();
+                        continue;
+                    }
+
+                    case token_type::begin_array:
+                    {
+                        if (JSON_HEDLEY_UNLIKELY(!sax->start_array(detail::unknown_size())))
+                        {
+                            return false;
+                        }
+
+                        // closing ] -> we are done
+                        if (get_token() == token_type::end_array)
+                        {
+                            if (JSON_HEDLEY_UNLIKELY(!sax->end_array()))
+                            {
+                                return false;
+                            }
+                            break;
+                        }
+
+                        // remember we are now inside an array
+                        states.push_back(true);
+
+                        // parse values (no need to call get_token)
+                        continue;
+                    }
+
+                    case token_type::value_float:
+                    {
+                        const auto res = m_lexer.get_number_float();
+
+                        if (JSON_HEDLEY_UNLIKELY(!std::isfinite(res)))
+                        {
+                            return sax->parse_error(m_lexer.get_position(),
+                                                    m_lexer.get_token_string(),
+                                                    out_of_range::create(406, concat("number overflow parsing '", m_lexer.get_token_string(), '\''), nullptr));
+                        }
+
+                        if (JSON_HEDLEY_UNLIKELY(!sax->number_float(res, m_lexer.get_string())))
+                        {
+                            return false;
+                        }
+
+                        break;
+                    }
+
+                    case token_type::literal_false:
+                    {
+                        if (JSON_HEDLEY_UNLIKELY(!sax->boolean(false)))
+                        {
+                            return false;
+                        }
+                        break;
+                    }
+
+                    case token_type::literal_null:
+                    {
+                        if (JSON_HEDLEY_UNLIKELY(!sax->null()))
+                        {
+                            return false;
+                        }
+                        break;
+                    }
+
+                    case token_type::literal_true:
+                    {
+                        if (JSON_HEDLEY_UNLIKELY(!sax->boolean(true)))
+                        {
+                            return false;
+                        }
+                        break;
+                    }
+
+                    case token_type::value_integer:
+                    {
+                        if (JSON_HEDLEY_UNLIKELY(!sax->number_integer(m_lexer.get_number_integer())))
+                        {
+                            return false;
+                        }
+                        break;
+                    }
+
+                    case token_type::value_string:
+                    {
+                        if (JSON_HEDLEY_UNLIKELY(!sax->string(m_lexer.get_string())))
+                        {
+                            return false;
+                        }
+                        break;
+                    }
+
+                    case token_type::value_unsigned:
+                    {
+                        if (JSON_HEDLEY_UNLIKELY(!sax->number_unsigned(m_lexer.get_number_unsigned())))
+                        {
+                            return false;
+                        }
+                        break;
+                    }
+
+                    case token_type::parse_error:
+                    {
+                        // using "uninitialized" to avoid "expected" message
+                        return sax->parse_error(m_lexer.get_position(),
+                                                m_lexer.get_token_string(),
+                                                parse_error::create(101, m_lexer.get_position(), exception_message(token_type::uninitialized, "value"), nullptr));
+                    }
+                    case token_type::end_of_input:
+                    {
+                        if (JSON_HEDLEY_UNLIKELY(m_lexer.get_position().chars_read_total == 1))
+                        {
+                            return sax->parse_error(m_lexer.get_position(),
+                                                    m_lexer.get_token_string(),
+                                                    parse_error::create(101, m_lexer.get_position(),
+                                                            "attempting to parse an empty input; check that your input string or stream contains the expected JSON", nullptr));
+                        }
+
+                        return sax->parse_error(m_lexer.get_position(),
+                                                m_lexer.get_token_string(),
+                                                parse_error::create(101, m_lexer.get_position(), exception_message(token_type::literal_or_value, "value"), nullptr));
+                    }
+                    case token_type::uninitialized:
+                    case token_type::end_array:
+                    case token_type::end_object:
+                    case token_type::name_separator:
+                    case token_type::value_separator:
+                    case token_type::literal_or_value:
+                    default: // the last token was unexpected
+                    {
+                        return sax->parse_error(m_lexer.get_position(),
+                                                m_lexer.get_token_string(),
+                                                parse_error::create(101, m_lexer.get_position(), exception_message(token_type::literal_or_value, "value"), nullptr));
+                    }
+                }
+            }
+            else
+            {
+                skip_to_state_evaluation = false;
+            }
+
+            // we reached this line after we successfully parsed a value
+            if (states.empty())
+            {
+                // empty stack: we reached the end of the hierarchy: done
+                return true;
+            }
+
+            if (states.back())  // array
+            {
+                // comma -> next value
+                if (get_token() == token_type::value_separator)
+                {
+                    // parse a new value
+                    get_token();
+                    continue;
+                }
+
+                // closing ]
+                if (JSON_HEDLEY_LIKELY(last_token == token_type::end_array))
+                {
+                    if (JSON_HEDLEY_UNLIKELY(!sax->end_array()))
+                    {
+                        return false;
+                    }
+
+                    // We are done with this array. Before we can parse a
+                    // new value, we need to evaluate the new state first.
+                    // By setting skip_to_state_evaluation to false, we
+                    // are effectively jumping to the beginning of this if.
+                    JSON_ASSERT(!states.empty());
+                    states.pop_back();
+                    skip_to_state_evaluation = true;
+                    continue;
+                }
+
+                return sax->parse_error(m_lexer.get_position(),
+                                        m_lexer.get_token_string(),
+                                        parse_error::create(101, m_lexer.get_position(), exception_message(token_type::end_array, "array"), nullptr));
+            }
+
+            // states.back() is false -> object
+
+            // comma -> next value
+            if (get_token() == token_type::value_separator)
+            {
+                // parse key
+                if (JSON_HEDLEY_UNLIKELY(get_token() != token_type::value_string))
+                {
+                    return sax->parse_error(m_lexer.get_position(),
+                                            m_lexer.get_token_string(),
+                                            parse_error::create(101, m_lexer.get_position(), exception_message(token_type::value_string, "object key"), nullptr));
+                }
+
+                if (JSON_HEDLEY_UNLIKELY(!sax->key(m_lexer.get_string())))
+                {
+                    return false;
+                }
+
+                // parse separator (:)
+                if (JSON_HEDLEY_UNLIKELY(get_token() != token_type::name_separator))
+                {
+                    return sax->parse_error(m_lexer.get_position(),
+                                            m_lexer.get_token_string(),
+                                            parse_error::create(101, m_lexer.get_position(), exception_message(token_type::name_separator, "object separator"), nullptr));
+                }
+
+                // parse values
+                get_token();
+                continue;
+            }
+
+            // closing }
+            if (JSON_HEDLEY_LIKELY(last_token == token_type::end_object))
+            {
+                if (JSON_HEDLEY_UNLIKELY(!sax->end_object()))
+                {
+                    return false;
+                }
+
+                // We are done with this object. Before we can parse a
+                // new value, we need to evaluate the new state first.
+                // By setting skip_to_state_evaluation to false, we
+                // are effectively jumping to the beginning of this if.
+                JSON_ASSERT(!states.empty());
+                states.pop_back();
+                skip_to_state_evaluation = true;
+                continue;
+            }
+
+            return sax->parse_error(m_lexer.get_position(),
+                                    m_lexer.get_token_string(),
+                                    parse_error::create(101, m_lexer.get_position(), exception_message(token_type::end_object, "object"), nullptr));
+        }
+    }
+
+    /// get next token from lexer
+    token_type get_token()
+    {
+        return last_token = m_lexer.scan();
+    }
+
+    std::string exception_message(const token_type expected, const std::string& context)
+    {
+        std::string error_msg = "syntax error ";
+
+        if (!context.empty())
+        {
+            error_msg += concat("while parsing ", context, ' ');
+        }
+
+        error_msg += "- ";
+
+        if (last_token == token_type::parse_error)
+        {
+            error_msg += concat(m_lexer.get_error_message(), "; last read: '",
+                                m_lexer.get_token_string(), '\'');
+        }
+        else
+        {
+            error_msg += concat("unexpected ", lexer_t::token_type_name(last_token));
+        }
+
+        if (expected != token_type::uninitialized)
+        {
+            error_msg += concat("; expected ", lexer_t::token_type_name(expected));
+        }
+
+        return error_msg;
+    }
+
+  private:
+    /// callback function
+    const parser_callback_t<BasicJsonType> callback = nullptr;
+    /// the type of the last read token
+    token_type last_token = token_type::uninitialized;
+    /// the lexer
+    lexer_t m_lexer;
+    /// whether to throw exceptions in case of errors
+    const bool allow_exceptions = true;
+};
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/iterators/internal_iterator.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013 - 2025 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+// #include <nlohmann/detail/abi_macros.hpp>
+
+// #include <nlohmann/detail/iterators/primitive_iterator.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013 - 2025 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <cstddef> // ptrdiff_t
+#include <limits>  // numeric_limits
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+/*
+@brief an iterator for primitive JSON types
+
+This class models an iterator for primitive JSON types (boolean, number,
+string). It's only purpose is to allow the iterator/const_iterator classes
+to "iterate" over primitive values. Internally, the iterator is modeled by
+a `difference_type` variable. Value begin_value (`0`) models the begin,
+end_value (`1`) models past the end.
+*/
+class primitive_iterator_t
+{
+  private:
+    using difference_type = std::ptrdiff_t;
+    static constexpr difference_type begin_value = 0;
+    static constexpr difference_type end_value = begin_value + 1;
+
+  JSON_PRIVATE_UNLESS_TESTED:
+    /// iterator as signed integer type
+    difference_type m_it = (std::numeric_limits<std::ptrdiff_t>::min)();
+
+  public:
+    constexpr difference_type get_value() const noexcept
+    {
+        return m_it;
+    }
+
+    /// set iterator to a defined beginning
+    void set_begin() noexcept
+    {
+        m_it = begin_value;
+    }
+
+    /// set iterator to a defined past the end
+    void set_end() noexcept
+    {
+        m_it = end_value;
+    }
+
+    /// return whether the iterator can be dereferenced
+    constexpr bool is_begin() const noexcept
+    {
+        return m_it == begin_value;
+    }
+
+    /// return whether the iterator is at end
+    constexpr bool is_end() const noexcept
+    {
+        return m_it == end_value;
+    }
+
+    friend constexpr bool operator==(primitive_iterator_t lhs, primitive_iterator_t rhs) noexcept
+    {
+        return lhs.m_it == rhs.m_it;
+    }
+
+    friend constexpr bool operator<(primitive_iterator_t lhs, primitive_iterator_t rhs) noexcept
+    {
+        return lhs.m_it < rhs.m_it;
+    }
+
+    primitive_iterator_t operator+(difference_type n) noexcept
+    {
+        auto result = *this;
+        result += n;
+        return result;
+    }
+
+    friend constexpr difference_type operator-(primitive_iterator_t lhs, primitive_iterator_t rhs) noexcept
+    {
+        return lhs.m_it - rhs.m_it;
+    }
+
+    primitive_iterator_t& operator++() noexcept
+    {
+        ++m_it;
+        return *this;
+    }
+
+    primitive_iterator_t operator++(int)& noexcept // NOLINT(cert-dcl21-cpp)
+    {
+        auto result = *this;
+        ++m_it;
+        return result;
+    }
+
+    primitive_iterator_t& operator--() noexcept
+    {
+        --m_it;
+        return *this;
+    }
+
+    primitive_iterator_t operator--(int)& noexcept // NOLINT(cert-dcl21-cpp)
+    {
+        auto result = *this;
+        --m_it;
+        return result;
+    }
+
+    primitive_iterator_t& operator+=(difference_type n) noexcept
+    {
+        m_it += n;
+        return *this;
+    }
+
+    primitive_iterator_t& operator-=(difference_type n) noexcept
+    {
+        m_it -= n;
+        return *this;
+    }
+};
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+/*!
+@brief an iterator value
+
+@note This structure could easily be a union, but MSVC currently does not allow
+unions members with complex constructors, see https://github.com/nlohmann/json/pull/105.
+*/
+template<typename BasicJsonType> struct internal_iterator
+{
+    /// iterator for JSON objects
+    typename BasicJsonType::object_t::iterator object_iterator {};
+    /// iterator for JSON arrays
+    typename BasicJsonType::array_t::iterator array_iterator {};
+    /// generic iterator for all other types
+    primitive_iterator_t primitive_iterator {};
+};
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/iterators/iter_impl.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013 - 2025 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <iterator> // iterator, random_access_iterator_tag, bidirectional_iterator_tag, advance, next
+#include <type_traits> // conditional, is_const, remove_const
+
+// #include <nlohmann/detail/exceptions.hpp>
+
+// #include <nlohmann/detail/iterators/internal_iterator.hpp>
+
+// #include <nlohmann/detail/iterators/primitive_iterator.hpp>
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/meta/cpp_future.hpp>
+
+// #include <nlohmann/detail/meta/type_traits.hpp>
+
+// #include <nlohmann/detail/value_t.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+// forward declare, to be able to friend it later on
+template<typename IteratorType> class iteration_proxy;
+template<typename IteratorType> class iteration_proxy_value;
+
+/*!
+@brief a template for a bidirectional iterator for the @ref basic_json class
+This class implements a both iterators (iterator and const_iterator) for the
+@ref basic_json class.
+@note An iterator is called *initialized* when a pointer to a JSON value has
+      been set (e.g., by a constructor or a copy assignment). If the iterator is
+      default-constructed, it is *uninitialized* and most methods are undefined.
+      **The library uses assertions to detect calls on uninitialized iterators.**
+@requirement The class satisfies the following concept requirements:
+-
+[BidirectionalIterator](https://en.cppreference.com/w/cpp/named_req/BidirectionalIterator):
+  The iterator that can be moved can be moved in both directions (i.e.
+  incremented and decremented).
+@since version 1.0.0, simplified in version 2.0.9, change to bidirectional
+       iterators in version 3.0.0 (see https://github.com/nlohmann/json/issues/593)
+*/
+template<typename BasicJsonType>
+class iter_impl // NOLINT(cppcoreguidelines-special-member-functions,hicpp-special-member-functions)
+{
+    /// the iterator with BasicJsonType of different const-ness
+    using other_iter_impl = iter_impl<typename std::conditional<std::is_const<BasicJsonType>::value, typename std::remove_const<BasicJsonType>::type, const BasicJsonType>::type>;
+    /// allow basic_json to access private members
+    friend other_iter_impl;
+    friend BasicJsonType;
+    friend iteration_proxy<iter_impl>;
+    friend iteration_proxy_value<iter_impl>;
+
+    using object_t = typename BasicJsonType::object_t;
+    using array_t = typename BasicJsonType::array_t;
+    // make sure BasicJsonType is basic_json or const basic_json
+    static_assert(is_basic_json<typename std::remove_const<BasicJsonType>::type>::value,
+                  "iter_impl only accepts (const) basic_json");
+    // superficial check for the LegacyBidirectionalIterator named requirement
+    static_assert(std::is_base_of<std::bidirectional_iterator_tag, std::bidirectional_iterator_tag>::value
+                  &&  std::is_base_of<std::bidirectional_iterator_tag, typename std::iterator_traits<typename array_t::iterator>::iterator_category>::value,
+                  "basic_json iterator assumes array and object type iterators satisfy the LegacyBidirectionalIterator named requirement.");
+
+  public:
+    /// The std::iterator class template (used as a base class to provide typedefs) is deprecated in C++17.
+    /// The C++ Standard has never required user-defined iterators to derive from std::iterator.
+    /// A user-defined iterator should provide publicly accessible typedefs named
+    /// iterator_category, value_type, difference_type, pointer, and reference.
+    /// Note that value_type is required to be non-const, even for constant iterators.
+    using iterator_category = std::bidirectional_iterator_tag;
+
+    /// the type of the values when the iterator is dereferenced
+    using value_type = typename BasicJsonType::value_type;
+    /// a type to represent differences between iterators
+    using difference_type = typename BasicJsonType::difference_type;
+    /// defines a pointer to the type iterated over (value_type)
+    using pointer = typename std::conditional<std::is_const<BasicJsonType>::value,
+          typename BasicJsonType::const_pointer,
+          typename BasicJsonType::pointer>::type;
+    /// defines a reference to the type iterated over (value_type)
+    using reference =
+        typename std::conditional<std::is_const<BasicJsonType>::value,
+        typename BasicJsonType::const_reference,
+        typename BasicJsonType::reference>::type;
+
+    iter_impl() = default;
+    ~iter_impl() = default;
+    iter_impl(iter_impl&&) noexcept = default;
+    iter_impl& operator=(iter_impl&&) noexcept = default;
+
+    /*!
+    @brief constructor for a given JSON instance
+    @param[in] object  pointer to a JSON object for this iterator
+    @pre object != nullptr
+    @post The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    explicit iter_impl(pointer object) noexcept : m_object(object)
+    {
+        JSON_ASSERT(m_object != nullptr);
+
+        switch (m_object->m_data.m_type)
+        {
+            case value_t::object:
+            {
+                m_it.object_iterator = typename object_t::iterator();
+                break;
+            }
+
+            case value_t::array:
+            {
+                m_it.array_iterator = typename array_t::iterator();
+                break;
+            }
+
+            case value_t::null:
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+            {
+                m_it.primitive_iterator = primitive_iterator_t();
+                break;
+            }
+        }
+    }
+
+    /*!
+    @note The conventional copy constructor and copy assignment are implicitly
+          defined. Combined with the following converting constructor and
+          assignment, they support: (1) copy from iterator to iterator, (2)
+          copy from const iterator to const iterator, and (3) conversion from
+          iterator to const iterator. However conversion from const iterator
+          to iterator is not defined.
+    */
+
+    /*!
+    @brief const copy constructor
+    @param[in] other const iterator to copy from
+    @note This copy constructor had to be defined explicitly to circumvent a bug
+          occurring on msvc v19.0 compiler (VS 2015) debug build. For more
+          information refer to: https://github.com/nlohmann/json/issues/1608
+    */
+    iter_impl(const iter_impl<const BasicJsonType>& other) noexcept
+        : m_object(other.m_object), m_it(other.m_it)
+    {}
+
+    /*!
+    @brief converting assignment
+    @param[in] other const iterator to copy from
+    @return const/non-const iterator
+    @note It is not checked whether @a other is initialized.
+    */
+    iter_impl& operator=(const iter_impl<const BasicJsonType>& other) noexcept
+    {
+        if (&other != this)
+        {
+            m_object = other.m_object;
+            m_it = other.m_it;
+        }
+        return *this;
+    }
+
+    /*!
+    @brief converting constructor
+    @param[in] other  non-const iterator to copy from
+    @note It is not checked whether @a other is initialized.
+    */
+    iter_impl(const iter_impl<typename std::remove_const<BasicJsonType>::type>& other) noexcept
+        : m_object(other.m_object), m_it(other.m_it)
+    {}
+
+    /*!
+    @brief converting assignment
+    @param[in] other  non-const iterator to copy from
+    @return const/non-const iterator
+    @note It is not checked whether @a other is initialized.
+    */
+    iter_impl& operator=(const iter_impl<typename std::remove_const<BasicJsonType>::type>& other) noexcept // NOLINT(cert-oop54-cpp)
+    {
+        m_object = other.m_object;
+        m_it = other.m_it;
+        return *this;
+    }
+
+  JSON_PRIVATE_UNLESS_TESTED:
+    /*!
+    @brief set the iterator to the first value
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    void set_begin() noexcept
+    {
+        JSON_ASSERT(m_object != nullptr);
+
+        switch (m_object->m_data.m_type)
+        {
+            case value_t::object:
+            {
+                m_it.object_iterator = m_object->m_data.m_value.object->begin();
+                break;
+            }
+
+            case value_t::array:
+            {
+                m_it.array_iterator = m_object->m_data.m_value.array->begin();
+                break;
+            }
+
+            case value_t::null:
+            {
+                // set to end so begin()==end() is true: null is empty
+                m_it.primitive_iterator.set_end();
+                break;
+            }
+
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+            {
+                m_it.primitive_iterator.set_begin();
+                break;
+            }
+        }
+    }
+
+    /*!
+    @brief set the iterator past the last value
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    void set_end() noexcept
+    {
+        JSON_ASSERT(m_object != nullptr);
+
+        switch (m_object->m_data.m_type)
+        {
+            case value_t::object:
+            {
+                m_it.object_iterator = m_object->m_data.m_value.object->end();
+                break;
+            }
+
+            case value_t::array:
+            {
+                m_it.array_iterator = m_object->m_data.m_value.array->end();
+                break;
+            }
+
+            case value_t::null:
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+            {
+                m_it.primitive_iterator.set_end();
+                break;
+            }
+        }
+    }
+
+  public:
+    /*!
+    @brief return a reference to the value pointed to by the iterator
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    reference operator*() const
+    {
+        JSON_ASSERT(m_object != nullptr);
+
+        switch (m_object->m_data.m_type)
+        {
+            case value_t::object:
+            {
+                JSON_ASSERT(m_it.object_iterator != m_object->m_data.m_value.object->end());
+                return m_it.object_iterator->second;
+            }
+
+            case value_t::array:
+            {
+                JSON_ASSERT(m_it.array_iterator != m_object->m_data.m_value.array->end());
+                return *m_it.array_iterator;
+            }
+
+            case value_t::null:
+                JSON_THROW(invalid_iterator::create(214, "cannot get value", m_object));
+
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+            {
+                if (JSON_HEDLEY_LIKELY(m_it.primitive_iterator.is_begin()))
+                {
+                    return *m_object;
+                }
+
+                JSON_THROW(invalid_iterator::create(214, "cannot get value", m_object));
+            }
+        }
+    }
+
+    /*!
+    @brief dereference the iterator
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    pointer operator->() const
+    {
+        JSON_ASSERT(m_object != nullptr);
+
+        switch (m_object->m_data.m_type)
+        {
+            case value_t::object:
+            {
+                JSON_ASSERT(m_it.object_iterator != m_object->m_data.m_value.object->end());
+                return &(m_it.object_iterator->second);
+            }
+
+            case value_t::array:
+            {
+                JSON_ASSERT(m_it.array_iterator != m_object->m_data.m_value.array->end());
+                return &*m_it.array_iterator;
+            }
+
+            case value_t::null:
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+            {
+                if (JSON_HEDLEY_LIKELY(m_it.primitive_iterator.is_begin()))
+                {
+                    return m_object;
+                }
+
+                JSON_THROW(invalid_iterator::create(214, "cannot get value", m_object));
+            }
+        }
+    }
+
+    /*!
+    @brief post-increment (it++)
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    iter_impl operator++(int)& // NOLINT(cert-dcl21-cpp)
+    {
+        auto result = *this;
+        ++(*this);
+        return result;
+    }
+
+    /*!
+    @brief pre-increment (++it)
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    iter_impl& operator++()
+    {
+        JSON_ASSERT(m_object != nullptr);
+
+        switch (m_object->m_data.m_type)
+        {
+            case value_t::object:
+            {
+                std::advance(m_it.object_iterator, 1);
+                break;
+            }
+
+            case value_t::array:
+            {
+                std::advance(m_it.array_iterator, 1);
+                break;
+            }
+
+            case value_t::null:
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+            {
+                ++m_it.primitive_iterator;
+                break;
+            }
+        }
+
+        return *this;
+    }
+
+    /*!
+    @brief post-decrement (it--)
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    iter_impl operator--(int)& // NOLINT(cert-dcl21-cpp)
+    {
+        auto result = *this;
+        --(*this);
+        return result;
+    }
+
+    /*!
+    @brief pre-decrement (--it)
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    iter_impl& operator--()
+    {
+        JSON_ASSERT(m_object != nullptr);
+
+        switch (m_object->m_data.m_type)
+        {
+            case value_t::object:
+            {
+                std::advance(m_it.object_iterator, -1);
+                break;
+            }
+
+            case value_t::array:
+            {
+                std::advance(m_it.array_iterator, -1);
+                break;
+            }
+
+            case value_t::null:
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+            {
+                --m_it.primitive_iterator;
+                break;
+            }
+        }
+
+        return *this;
+    }
+
+    /*!
+    @brief comparison: equal
+    @pre (1) Both iterators are initialized to point to the same object, or (2) both iterators are value-initialized.
+    */
+    template < typename IterImpl, detail::enable_if_t < (std::is_same<IterImpl, iter_impl>::value || std::is_same<IterImpl, other_iter_impl>::value), std::nullptr_t > = nullptr >
+    bool operator==(const IterImpl& other) const
+    {
+        // if objects are not the same, the comparison is undefined
+        if (JSON_HEDLEY_UNLIKELY(m_object != other.m_object))
+        {
+            JSON_THROW(invalid_iterator::create(212, "cannot compare iterators of different containers", m_object));
+        }
+
+        // value-initialized forward iterators can be compared, and must compare equal to other value-initialized iterators of the same type #4493
+        if (m_object == nullptr)
+        {
+            return true;
+        }
+
+        switch (m_object->m_data.m_type)
+        {
+            case value_t::object:
+                return (m_it.object_iterator == other.m_it.object_iterator);
+
+            case value_t::array:
+                return (m_it.array_iterator == other.m_it.array_iterator);
+
+            case value_t::null:
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+                return (m_it.primitive_iterator == other.m_it.primitive_iterator);
+        }
+    }
+
+    /*!
+    @brief comparison: not equal
+    @pre (1) Both iterators are initialized to point to the same object, or (2) both iterators are value-initialized.
+    */
+    template < typename IterImpl, detail::enable_if_t < (std::is_same<IterImpl, iter_impl>::value || std::is_same<IterImpl, other_iter_impl>::value), std::nullptr_t > = nullptr >
+    bool operator!=(const IterImpl& other) const
+    {
+        return !operator==(other);
+    }
+
+    /*!
+    @brief comparison: smaller
+    @pre (1) Both iterators are initialized to point to the same object, or (2) both iterators are value-initialized.
+    */
+    bool operator<(const iter_impl& other) const
+    {
+        // if objects are not the same, the comparison is undefined
+        if (JSON_HEDLEY_UNLIKELY(m_object != other.m_object))
+        {
+            JSON_THROW(invalid_iterator::create(212, "cannot compare iterators of different containers", m_object));
+        }
+
+        // value-initialized forward iterators can be compared, and must compare equal to other value-initialized iterators of the same type #4493
+        if (m_object == nullptr)
+        {
+            // the iterators are both value-initialized and are to be considered equal, but this function checks for smaller, so we return false
+            return false;
+        }
+
+        switch (m_object->m_data.m_type)
+        {
+            case value_t::object:
+                JSON_THROW(invalid_iterator::create(213, "cannot compare order of object iterators", m_object));
+
+            case value_t::array:
+                return (m_it.array_iterator < other.m_it.array_iterator);
+
+            case value_t::null:
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+                return (m_it.primitive_iterator < other.m_it.primitive_iterator);
+        }
+    }
+
+    /*!
+    @brief comparison: less than or equal
+    @pre (1) Both iterators are initialized to point to the same object, or (2) both iterators are value-initialized.
+    */
+    bool operator<=(const iter_impl& other) const
+    {
+        return !other.operator < (*this);
+    }
+
+    /*!
+    @brief comparison: greater than
+    @pre (1) Both iterators are initialized to point to the same object, or (2) both iterators are value-initialized.
+    */
+    bool operator>(const iter_impl& other) const
+    {
+        return !operator<=(other);
+    }
+
+    /*!
+    @brief comparison: greater than or equal
+    @pre (1) The iterator is initialized; i.e. `m_object != nullptr`, or (2) both iterators are value-initialized.
+    */
+    bool operator>=(const iter_impl& other) const
+    {
+        return !operator<(other);
+    }
+
+    /*!
+    @brief add to iterator
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    iter_impl& operator+=(difference_type i)
+    {
+        JSON_ASSERT(m_object != nullptr);
+
+        switch (m_object->m_data.m_type)
+        {
+            case value_t::object:
+                JSON_THROW(invalid_iterator::create(209, "cannot use offsets with object iterators", m_object));
+
+            case value_t::array:
+            {
+                std::advance(m_it.array_iterator, i);
+                break;
+            }
+
+            case value_t::null:
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+            {
+                m_it.primitive_iterator += i;
+                break;
+            }
+        }
+
+        return *this;
+    }
+
+    /*!
+    @brief subtract from iterator
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    iter_impl& operator-=(difference_type i)
+    {
+        return operator+=(-i);
+    }
+
+    /*!
+    @brief add to iterator
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    iter_impl operator+(difference_type i) const
+    {
+        auto result = *this;
+        result += i;
+        return result;
+    }
+
+    /*!
+    @brief addition of distance and iterator
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    friend iter_impl operator+(difference_type i, const iter_impl& it)
+    {
+        auto result = it;
+        result += i;
+        return result;
+    }
+
+    /*!
+    @brief subtract from iterator
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    iter_impl operator-(difference_type i) const
+    {
+        auto result = *this;
+        result -= i;
+        return result;
+    }
+
+    /*!
+    @brief return difference
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    difference_type operator-(const iter_impl& other) const
+    {
+        JSON_ASSERT(m_object != nullptr);
+
+        switch (m_object->m_data.m_type)
+        {
+            case value_t::object:
+                JSON_THROW(invalid_iterator::create(209, "cannot use offsets with object iterators", m_object));
+
+            case value_t::array:
+                return m_it.array_iterator - other.m_it.array_iterator;
+
+            case value_t::null:
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+                return m_it.primitive_iterator - other.m_it.primitive_iterator;
+        }
+    }
+
+    /*!
+    @brief access to successor
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    reference operator[](difference_type n) const
+    {
+        JSON_ASSERT(m_object != nullptr);
+
+        switch (m_object->m_data.m_type)
+        {
+            case value_t::object:
+                JSON_THROW(invalid_iterator::create(208, "cannot use operator[] for object iterators", m_object));
+
+            case value_t::array:
+                return *std::next(m_it.array_iterator, n);
+
+            case value_t::null:
+                JSON_THROW(invalid_iterator::create(214, "cannot get value", m_object));
+
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+            {
+                if (JSON_HEDLEY_LIKELY(m_it.primitive_iterator.get_value() == -n))
+                {
+                    return *m_object;
+                }
+
+                JSON_THROW(invalid_iterator::create(214, "cannot get value", m_object));
+            }
+        }
+    }
+
+    /*!
+    @brief return the key of an object iterator
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    const typename object_t::key_type& key() const
+    {
+        JSON_ASSERT(m_object != nullptr);
+
+        if (JSON_HEDLEY_LIKELY(m_object->is_object()))
+        {
+            return m_it.object_iterator->first;
+        }
+
+        JSON_THROW(invalid_iterator::create(207, "cannot use key() for non-object iterators", m_object));
+    }
+
+    /*!
+    @brief return the value of an iterator
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    reference value() const
+    {
+        return operator*();
+    }
+
+  JSON_PRIVATE_UNLESS_TESTED:
+    /// associated JSON instance
+    pointer m_object = nullptr;
+    /// the actual iterator of the associated instance
+    internal_iterator<typename std::remove_const<BasicJsonType>::type> m_it {};
+};
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/iterators/iteration_proxy.hpp>
+
+// #include <nlohmann/detail/iterators/json_reverse_iterator.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013 - 2025 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <cstddef> // ptrdiff_t
+#include <iterator> // reverse_iterator
+#include <utility> // declval
+
+// #include <nlohmann/detail/abi_macros.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+//////////////////////
+// reverse_iterator //
+//////////////////////
+
+/*!
+@brief a template for a reverse iterator class
+
+@tparam Base the base iterator type to reverse. Valid types are @ref
+iterator (to create @ref reverse_iterator) and @ref const_iterator (to
+create @ref const_reverse_iterator).
+
+@requirement The class satisfies the following concept requirements:
+-
+[BidirectionalIterator](https://en.cppreference.com/w/cpp/named_req/BidirectionalIterator):
+  The iterator that can be moved can be moved in both directions (i.e.
+  incremented and decremented).
+- [OutputIterator](https://en.cppreference.com/w/cpp/named_req/OutputIterator):
+  It is possible to write to the pointed-to element (only if @a Base is
+  @ref iterator).
+
+@since version 1.0.0
+*/
+template<typename Base>
+class json_reverse_iterator : public std::reverse_iterator<Base>
+{
+  public:
+    using difference_type = std::ptrdiff_t;
+    /// shortcut to the reverse iterator adapter
+    using base_iterator = std::reverse_iterator<Base>;
+    /// the reference type for the pointed-to element
+    using reference = typename Base::reference;
+
+    /// create reverse iterator from iterator
+    explicit json_reverse_iterator(const typename base_iterator::iterator_type& it) noexcept
+        : base_iterator(it) {}
+
+    /// create reverse iterator from base class
+    explicit json_reverse_iterator(const base_iterator& it) noexcept : base_iterator(it) {}
+
+    /// post-increment (it++)
+    json_reverse_iterator operator++(int)& // NOLINT(cert-dcl21-cpp)
+    {
+        return static_cast<json_reverse_iterator>(base_iterator::operator++(1));
+    }
+
+    /// pre-increment (++it)
+    json_reverse_iterator& operator++()
+    {
+        return static_cast<json_reverse_iterator&>(base_iterator::operator++());
+    }
+
+    /// post-decrement (it--)
+    json_reverse_iterator operator--(int)& // NOLINT(cert-dcl21-cpp)
+    {
+        return static_cast<json_reverse_iterator>(base_iterator::operator--(1));
+    }
+
+    /// pre-decrement (--it)
+    json_reverse_iterator& operator--()
+    {
+        return static_cast<json_reverse_iterator&>(base_iterator::operator--());
+    }
+
+    /// add to iterator
+    json_reverse_iterator& operator+=(difference_type i)
+    {
+        return static_cast<json_reverse_iterator&>(base_iterator::operator+=(i));
+    }
+
+    /// add to iterator
+    json_reverse_iterator operator+(difference_type i) const
+    {
+        return static_cast<json_reverse_iterator>(base_iterator::operator+(i));
+    }
+
+    /// subtract from iterator
+    json_reverse_iterator operator-(difference_type i) const
+    {
+        return static_cast<json_reverse_iterator>(base_iterator::operator-(i));
+    }
+
+    /// return difference
+    difference_type operator-(const json_reverse_iterator& other) const
+    {
+        return base_iterator(*this) - base_iterator(other);
+    }
+
+    /// access to successor
+    reference operator[](difference_type n) const
+    {
+        return *(this->operator+(n));
+    }
+
+    /// return the key of an object iterator
+    auto key() const -> decltype(std::declval<Base>().key())
+    {
+        auto it = --this->base();
+        return it.key();
+    }
+
+    /// return the value of an iterator
+    reference value() const
+    {
+        auto it = --this->base();
+        return it.operator * ();
+    }
+};
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/iterators/primitive_iterator.hpp>
+
+// #include <nlohmann/detail/json_custom_base_class.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013 - 2025 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <type_traits> // conditional, is_same
+
+// #include <nlohmann/detail/abi_macros.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+/*!
+@brief Default base class of the @ref basic_json class.
+
+So that the correct implementations of the copy / move ctors / assign operators
+of @ref basic_json do not require complex case distinctions
+(no base class / custom base class used as customization point),
+@ref basic_json always has a base class.
+By default, this class is used because it is empty and thus has no effect
+on the behavior of @ref basic_json.
+*/
+struct json_default_base {};
+
+template<class T>
+using json_base_class = typename std::conditional <
+                        std::is_same<T, void>::value,
+                        json_default_base,
+                        T
+                        >::type;
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/json_pointer.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013 - 2025 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <algorithm> // all_of
+#include <cctype> // isdigit
+#include <cerrno> // errno, ERANGE
+#include <cstdlib> // strtoull
+#ifndef JSON_NO_IO
+    #include <iosfwd> // ostream
+#endif  // JSON_NO_IO
+#include <limits> // max
+#include <numeric> // accumulate
+#include <string> // string
+#include <utility> // move
+#include <vector> // vector
+
+// #include <nlohmann/detail/exceptions.hpp>
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/string_concat.hpp>
+
+// #include <nlohmann/detail/string_escape.hpp>
+
+// #include <nlohmann/detail/value_t.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+
+/// @brief JSON Pointer defines a string syntax for identifying a specific value within a JSON document
+/// @sa https://json.nlohmann.me/api/json_pointer/
+template<typename RefStringType>
+class json_pointer
+{
+    // allow basic_json to access private members
+    NLOHMANN_BASIC_JSON_TPL_DECLARATION
+    friend class basic_json;
+
+    template<typename>
+    friend class json_pointer;
+
+    template<typename T>
+    struct string_t_helper
+    {
+        using type = T;
+    };
+
+    NLOHMANN_BASIC_JSON_TPL_DECLARATION
+    struct string_t_helper<NLOHMANN_BASIC_JSON_TPL>
+    {
+        using type = StringType;
+    };
+
+  public:
+    // for backwards compatibility accept BasicJsonType
+    using string_t = typename string_t_helper<RefStringType>::type;
+
+    /// @brief create JSON pointer
+    /// @sa https://json.nlohmann.me/api/json_pointer/json_pointer/
+    explicit json_pointer(const string_t& s = "")
+        : reference_tokens(split(s))
+    {}
+
+    /// @brief return a string representation of the JSON pointer
+    /// @sa https://json.nlohmann.me/api/json_pointer/to_string/
+    string_t to_string() const
+    {
+        return std::accumulate(reference_tokens.begin(), reference_tokens.end(),
+                               string_t{},
+                               [](const string_t& a, const string_t& b)
+        {
+            return detail::concat(a, '/', detail::escape(b));
+        });
+    }
+
+    /// @brief return a string representation of the JSON pointer
+    /// @sa https://json.nlohmann.me/api/json_pointer/operator_string/
+    JSON_HEDLEY_DEPRECATED_FOR(3.11.0, to_string())
+    operator string_t() const
+    {
+        return to_string();
+    }
+
+#ifndef JSON_NO_IO
+    /// @brief write string representation of the JSON pointer to stream
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_ltlt/
+    friend std::ostream& operator<<(std::ostream& o, const json_pointer& ptr)
+    {
+        o << ptr.to_string();
+        return o;
+    }
+#endif
+
+    /// @brief append another JSON pointer at the end of this JSON pointer
+    /// @sa https://json.nlohmann.me/api/json_pointer/operator_slasheq/
+    json_pointer& operator/=(const json_pointer& ptr)
+    {
+        reference_tokens.insert(reference_tokens.end(),
+                                ptr.reference_tokens.begin(),
+                                ptr.reference_tokens.end());
+        return *this;
+    }
+
+    /// @brief append an unescaped reference token at the end of this JSON pointer
+    /// @sa https://json.nlohmann.me/api/json_pointer/operator_slasheq/
+    json_pointer& operator/=(string_t token)
+    {
+        push_back(std::move(token));
+        return *this;
+    }
+
+    /// @brief append an array index at the end of this JSON pointer
+    /// @sa https://json.nlohmann.me/api/json_pointer/operator_slasheq/
+    json_pointer& operator/=(std::size_t array_idx)
+    {
+        return *this /= std::to_string(array_idx);
+    }
+
+    /// @brief create a new JSON pointer by appending the right JSON pointer at the end of the left JSON pointer
+    /// @sa https://json.nlohmann.me/api/json_pointer/operator_slash/
+    friend json_pointer operator/(const json_pointer& lhs,
+                                  const json_pointer& rhs)
+    {
+        return json_pointer(lhs) /= rhs;
+    }
+
+    /// @brief create a new JSON pointer by appending the unescaped token at the end of the JSON pointer
+    /// @sa https://json.nlohmann.me/api/json_pointer/operator_slash/
+    friend json_pointer operator/(const json_pointer& lhs, string_t token) // NOLINT(performance-unnecessary-value-param)
+    {
+        return json_pointer(lhs) /= std::move(token);
+    }
+
+    /// @brief create a new JSON pointer by appending the array-index-token at the end of the JSON pointer
+    /// @sa https://json.nlohmann.me/api/json_pointer/operator_slash/
+    friend json_pointer operator/(const json_pointer& lhs, std::size_t array_idx)
+    {
+        return json_pointer(lhs) /= array_idx;
+    }
+
+    /// @brief returns the parent of this JSON pointer
+    /// @sa https://json.nlohmann.me/api/json_pointer/parent_pointer/
+    json_pointer parent_pointer() const
+    {
+        if (empty())
+        {
+            return *this;
+        }
+
+        json_pointer res = *this;
+        res.pop_back();
+        return res;
+    }
+
+    /// @brief remove last reference token
+    /// @sa https://json.nlohmann.me/api/json_pointer/pop_back/
+    void pop_back()
+    {
+        if (JSON_HEDLEY_UNLIKELY(empty()))
+        {
+            JSON_THROW(detail::out_of_range::create(405, "JSON pointer has no parent", nullptr));
+        }
+
+        reference_tokens.pop_back();
+    }
+
+    /// @brief return last reference token
+    /// @sa https://json.nlohmann.me/api/json_pointer/back/
+    const string_t& back() const
+    {
+        if (JSON_HEDLEY_UNLIKELY(empty()))
+        {
+            JSON_THROW(detail::out_of_range::create(405, "JSON pointer has no parent", nullptr));
+        }
+
+        return reference_tokens.back();
+    }
+
+    /// @brief append an unescaped token at the end of the reference pointer
+    /// @sa https://json.nlohmann.me/api/json_pointer/push_back/
+    void push_back(const string_t& token)
+    {
+        reference_tokens.push_back(token);
+    }
+
+    /// @brief append an unescaped token at the end of the reference pointer
+    /// @sa https://json.nlohmann.me/api/json_pointer/push_back/
+    void push_back(string_t&& token)
+    {
+        reference_tokens.push_back(std::move(token));
+    }
+
+    /// @brief return whether pointer points to the root document
+    /// @sa https://json.nlohmann.me/api/json_pointer/empty/
+    bool empty() const noexcept
+    {
+        return reference_tokens.empty();
+    }
+
+  private:
+    /*!
+    @param[in] s  reference token to be converted into an array index
+
+    @return integer representation of @a s
+
+    @throw parse_error.106  if an array index begins with '0'
+    @throw parse_error.109  if an array index begins not with a digit
+    @throw out_of_range.404 if string @a s could not be converted to an integer
+    @throw out_of_range.410 if an array index exceeds size_type
+    */
+    template<typename BasicJsonType>
+    static typename BasicJsonType::size_type array_index(const string_t& s)
+    {
+        using size_type = typename BasicJsonType::size_type;
+
+        // error condition (cf. RFC 6901, Sect. 4)
+        if (JSON_HEDLEY_UNLIKELY(s.size() > 1 && s[0] == '0'))
+        {
+            JSON_THROW(detail::parse_error::create(106, 0, detail::concat("array index '", s, "' must not begin with '0'"), nullptr));
+        }
+
+        // error condition (cf. RFC 6901, Sect. 4)
+        if (JSON_HEDLEY_UNLIKELY(s.size() > 1 && !(s[0] >= '1' && s[0] <= '9')))
+        {
+            JSON_THROW(detail::parse_error::create(109, 0, detail::concat("array index '", s, "' is not a number"), nullptr));
+        }
+
+        const char* p = s.c_str();
+        char* p_end = nullptr; // NOLINT(misc-const-correctness)
+        errno = 0; // strtoull doesn't reset errno
+        const unsigned long long res = std::strtoull(p, &p_end, 10); // NOLINT(runtime/int)
+        if (p == p_end // invalid input or empty string
+                || errno == ERANGE // out of range
+                || JSON_HEDLEY_UNLIKELY(static_cast<std::size_t>(p_end - p) != s.size())) // incomplete read
+        {
+            JSON_THROW(detail::out_of_range::create(404, detail::concat("unresolved reference token '", s, "'"), nullptr));
+        }
+
+        // only triggered on special platforms (like 32bit), see also
+        // https://github.com/nlohmann/json/pull/2203
+        if (res >= static_cast<unsigned long long>((std::numeric_limits<size_type>::max)()))  // NOLINT(runtime/int)
+        {
+            JSON_THROW(detail::out_of_range::create(410, detail::concat("array index ", s, " exceeds size_type"), nullptr));   // LCOV_EXCL_LINE
+        }
+
+        return static_cast<size_type>(res);
+    }
+
+  JSON_PRIVATE_UNLESS_TESTED:
+    json_pointer top() const
+    {
+        if (JSON_HEDLEY_UNLIKELY(empty()))
+        {
+            JSON_THROW(detail::out_of_range::create(405, "JSON pointer has no parent", nullptr));
+        }
+
+        json_pointer result = *this;
+        result.reference_tokens = {reference_tokens[0]};
+        return result;
+    }
+
+  private:
+    /*!
+    @brief create and return a reference to the pointed to value
+
+    @complexity Linear in the number of reference tokens.
+
+    @throw parse_error.109 if array index is not a number
+    @throw type_error.313 if value cannot be unflattened
+    */
+    template<typename BasicJsonType>
+    BasicJsonType& get_and_create(BasicJsonType& j) const
+    {
+        auto* result = &j;
+
+        // in case no reference tokens exist, return a reference to the JSON value
+        // j which will be overwritten by a primitive value
+        for (const auto& reference_token : reference_tokens)
+        {
+            switch (result->type())
+            {
+                case detail::value_t::null:
+                {
+                    if (reference_token == "0")
+                    {
+                        // start a new array if reference token is 0
+                        result = &result->operator[](0);
+                    }
+                    else
+                    {
+                        // start a new object otherwise
+                        result = &result->operator[](reference_token);
+                    }
+                    break;
+                }
+
+                case detail::value_t::object:
+                {
+                    // create an entry in the object
+                    result = &result->operator[](reference_token);
+                    break;
+                }
+
+                case detail::value_t::array:
+                {
+                    // create an entry in the array
+                    result = &result->operator[](array_index<BasicJsonType>(reference_token));
+                    break;
+                }
+
+                /*
+                The following code is only reached if there exists a reference
+                token _and_ the current value is primitive. In this case, we have
+                an error situation, because primitive values may only occur as
+                single value; that is, with an empty list of reference tokens.
+                */
+                case detail::value_t::string:
+                case detail::value_t::boolean:
+                case detail::value_t::number_integer:
+                case detail::value_t::number_unsigned:
+                case detail::value_t::number_float:
+                case detail::value_t::binary:
+                case detail::value_t::discarded:
+                default:
+                    JSON_THROW(detail::type_error::create(313, "invalid value to unflatten", &j));
+            }
+        }
+
+        return *result;
+    }
+
+    /*!
+    @brief return a reference to the pointed to value
+
+    @note This version does not throw if a value is not present, but tries to
+          create nested values instead. For instance, calling this function
+          with pointer `"/this/that"` on a null value is equivalent to calling
+          `operator[]("this").operator[]("that")` on that value, effectively
+          changing the null value to an object.
+
+    @param[in] ptr  a JSON value
+
+    @return reference to the JSON value pointed to by the JSON pointer
+
+    @complexity Linear in the length of the JSON pointer.
+
+    @throw parse_error.106   if an array index begins with '0'
+    @throw parse_error.109   if an array index was not a number
+    @throw out_of_range.404  if the JSON pointer can not be resolved
+    */
+    template<typename BasicJsonType>
+    BasicJsonType& get_unchecked(BasicJsonType* ptr) const
+    {
+        for (const auto& reference_token : reference_tokens)
+        {
+            // convert null values to arrays or objects before continuing
+            if (ptr->is_null())
+            {
+                // check if reference token is a number
+                const bool nums =
+                    std::all_of(reference_token.begin(), reference_token.end(),
+                                [](const unsigned char x)
+                {
+                    return std::isdigit(x);
+                });
+
+                // change value to array for numbers or "-" or to object otherwise
+                *ptr = (nums || reference_token == "-")
+                       ? detail::value_t::array
+                       : detail::value_t::object;
+            }
+
+            switch (ptr->type())
+            {
+                case detail::value_t::object:
+                {
+                    // use unchecked object access
+                    ptr = &ptr->operator[](reference_token);
+                    break;
+                }
+
+                case detail::value_t::array:
+                {
+                    if (reference_token == "-")
+                    {
+                        // explicitly treat "-" as index beyond the end
+                        ptr = &ptr->operator[](ptr->m_data.m_value.array->size());
+                    }
+                    else
+                    {
+                        // convert array index to number; unchecked access
+                        ptr = &ptr->operator[](array_index<BasicJsonType>(reference_token));
+                    }
+                    break;
+                }
+
+                case detail::value_t::null:
+                case detail::value_t::string:
+                case detail::value_t::boolean:
+                case detail::value_t::number_integer:
+                case detail::value_t::number_unsigned:
+                case detail::value_t::number_float:
+                case detail::value_t::binary:
+                case detail::value_t::discarded:
+                default:
+                    JSON_THROW(detail::out_of_range::create(404, detail::concat("unresolved reference token '", reference_token, "'"), ptr));
+            }
+        }
+
+        return *ptr;
+    }
+
+    /*!
+    @throw parse_error.106   if an array index begins with '0'
+    @throw parse_error.109   if an array index was not a number
+    @throw out_of_range.402  if the array index '-' is used
+    @throw out_of_range.404  if the JSON pointer can not be resolved
+    */
+    template<typename BasicJsonType>
+    BasicJsonType& get_checked(BasicJsonType* ptr) const
+    {
+        for (const auto& reference_token : reference_tokens)
+        {
+            switch (ptr->type())
+            {
+                case detail::value_t::object:
+                {
+                    // note: at performs range check
+                    ptr = &ptr->at(reference_token);
+                    break;
+                }
+
+                case detail::value_t::array:
+                {
+                    if (JSON_HEDLEY_UNLIKELY(reference_token == "-"))
+                    {
+                        // "-" always fails the range check
+                        JSON_THROW(detail::out_of_range::create(402, detail::concat(
+                                "array index '-' (", std::to_string(ptr->m_data.m_value.array->size()),
+                                ") is out of range"), ptr));
+                    }
+
+                    // note: at performs range check
+                    ptr = &ptr->at(array_index<BasicJsonType>(reference_token));
+                    break;
+                }
+
+                case detail::value_t::null:
+                case detail::value_t::string:
+                case detail::value_t::boolean:
+                case detail::value_t::number_integer:
+                case detail::value_t::number_unsigned:
+                case detail::value_t::number_float:
+                case detail::value_t::binary:
+                case detail::value_t::discarded:
+                default:
+                    JSON_THROW(detail::out_of_range::create(404, detail::concat("unresolved reference token '", reference_token, "'"), ptr));
+            }
+        }
+
+        return *ptr;
+    }
+
+    /*!
+    @brief return a const reference to the pointed to value
+
+    @param[in] ptr  a JSON value
+
+    @return const reference to the JSON value pointed to by the JSON
+    pointer
+
+    @throw parse_error.106   if an array index begins with '0'
+    @throw parse_error.109   if an array index was not a number
+    @throw out_of_range.402  if the array index '-' is used
+    @throw out_of_range.404  if the JSON pointer can not be resolved
+    */
+    template<typename BasicJsonType>
+    const BasicJsonType& get_unchecked(const BasicJsonType* ptr) const
+    {
+        for (const auto& reference_token : reference_tokens)
+        {
+            switch (ptr->type())
+            {
+                case detail::value_t::object:
+                {
+                    // use unchecked object access
+                    ptr = &ptr->operator[](reference_token);
+                    break;
+                }
+
+                case detail::value_t::array:
+                {
+                    if (JSON_HEDLEY_UNLIKELY(reference_token == "-"))
+                    {
+                        // "-" cannot be used for const access
+                        JSON_THROW(detail::out_of_range::create(402, detail::concat("array index '-' (", std::to_string(ptr->m_data.m_value.array->size()), ") is out of range"), ptr));
+                    }
+
+                    // use unchecked array access
+                    ptr = &ptr->operator[](array_index<BasicJsonType>(reference_token));
+                    break;
+                }
+
+                case detail::value_t::null:
+                case detail::value_t::string:
+                case detail::value_t::boolean:
+                case detail::value_t::number_integer:
+                case detail::value_t::number_unsigned:
+                case detail::value_t::number_float:
+                case detail::value_t::binary:
+                case detail::value_t::discarded:
+                default:
+                    JSON_THROW(detail::out_of_range::create(404, detail::concat("unresolved reference token '", reference_token, "'"), ptr));
+            }
+        }
+
+        return *ptr;
+    }
+
+    /*!
+    @throw parse_error.106   if an array index begins with '0'
+    @throw parse_error.109   if an array index was not a number
+    @throw out_of_range.402  if the array index '-' is used
+    @throw out_of_range.404  if the JSON pointer can not be resolved
+    */
+    template<typename BasicJsonType>
+    const BasicJsonType& get_checked(const BasicJsonType* ptr) const
+    {
+        for (const auto& reference_token : reference_tokens)
+        {
+            switch (ptr->type())
+            {
+                case detail::value_t::object:
+                {
+                    // note: at performs range check
+                    ptr = &ptr->at(reference_token);
+                    break;
+                }
+
+                case detail::value_t::array:
+                {
+                    if (JSON_HEDLEY_UNLIKELY(reference_token == "-"))
+                    {
+                        // "-" always fails the range check
+                        JSON_THROW(detail::out_of_range::create(402, detail::concat(
+                                "array index '-' (", std::to_string(ptr->m_data.m_value.array->size()),
+                                ") is out of range"), ptr));
+                    }
+
+                    // note: at performs range check
+                    ptr = &ptr->at(array_index<BasicJsonType>(reference_token));
+                    break;
+                }
+
+                case detail::value_t::null:
+                case detail::value_t::string:
+                case detail::value_t::boolean:
+                case detail::value_t::number_integer:
+                case detail::value_t::number_unsigned:
+                case detail::value_t::number_float:
+                case detail::value_t::binary:
+                case detail::value_t::discarded:
+                default:
+                    JSON_THROW(detail::out_of_range::create(404, detail::concat("unresolved reference token '", reference_token, "'"), ptr));
+            }
+        }
+
+        return *ptr;
+    }
+
+    /*!
+    @throw parse_error.106   if an array index begins with '0'
+    @throw parse_error.109   if an array index was not a number
+    */
+    template<typename BasicJsonType>
+    bool contains(const BasicJsonType* ptr) const
+    {
+        for (const auto& reference_token : reference_tokens)
+        {
+            switch (ptr->type())
+            {
+                case detail::value_t::object:
+                {
+                    if (!ptr->contains(reference_token))
+                    {
+                        // we did not find the key in the object
+                        return false;
+                    }
+
+                    ptr = &ptr->operator[](reference_token);
+                    break;
+                }
+
+                case detail::value_t::array:
+                {
+                    if (JSON_HEDLEY_UNLIKELY(reference_token == "-"))
+                    {
+                        // "-" always fails the range check
+                        return false;
+                    }
+                    if (JSON_HEDLEY_UNLIKELY(reference_token.size() == 1 && !("0" <= reference_token && reference_token <= "9")))
+                    {
+                        // invalid char
+                        return false;
+                    }
+                    if (JSON_HEDLEY_UNLIKELY(reference_token.size() > 1))
+                    {
+                        if (JSON_HEDLEY_UNLIKELY(!('1' <= reference_token[0] && reference_token[0] <= '9')))
+                        {
+                            // first char should be between '1' and '9'
+                            return false;
+                        }
+                        for (std::size_t i = 1; i < reference_token.size(); i++)
+                        {
+                            if (JSON_HEDLEY_UNLIKELY(!('0' <= reference_token[i] && reference_token[i] <= '9')))
+                            {
+                                // other char should be between '0' and '9'
+                                return false;
+                            }
+                        }
+                    }
+
+                    const auto idx = array_index<BasicJsonType>(reference_token);
+                    if (idx >= ptr->size())
+                    {
+                        // index out of range
+                        return false;
+                    }
+
+                    ptr = &ptr->operator[](idx);
+                    break;
+                }
+
+                case detail::value_t::null:
+                case detail::value_t::string:
+                case detail::value_t::boolean:
+                case detail::value_t::number_integer:
+                case detail::value_t::number_unsigned:
+                case detail::value_t::number_float:
+                case detail::value_t::binary:
+                case detail::value_t::discarded:
+                default:
+                {
+                    // we do not expect primitive values if there is still a
+                    // reference token to process
+                    return false;
+                }
+            }
+        }
+
+        // no reference token left means we found a primitive value
+        return true;
+    }
+
+    /*!
+    @brief split the string input to reference tokens
+
+    @note This function is only called by the json_pointer constructor.
+          All exceptions below are documented there.
+
+    @throw parse_error.107  if the pointer is not empty or begins with '/'
+    @throw parse_error.108  if character '~' is not followed by '0' or '1'
+    */
+    static std::vector<string_t> split(const string_t& reference_string)
+    {
+        std::vector<string_t> result;
+
+        // special case: empty reference string -> no reference tokens
+        if (reference_string.empty())
+        {
+            return result;
+        }
+
+        // check if nonempty reference string begins with slash
+        if (JSON_HEDLEY_UNLIKELY(reference_string[0] != '/'))
+        {
+            JSON_THROW(detail::parse_error::create(107, 1, detail::concat("JSON pointer must be empty or begin with '/' - was: '", reference_string, "'"), nullptr));
+        }
+
+        // extract the reference tokens:
+        // - slash: position of the last read slash (or end of string)
+        // - start: position after the previous slash
+        for (
+            // search for the first slash after the first character
+            std::size_t slash = reference_string.find_first_of('/', 1),
+            // set the beginning of the first reference token
+            start = 1;
+            // we can stop if start == 0 (if slash == string_t::npos)
+            start != 0;
+            // set the beginning of the next reference token
+            // (will eventually be 0 if slash == string_t::npos)
+            start = (slash == string_t::npos) ? 0 : slash + 1,
+            // find next slash
+            slash = reference_string.find_first_of('/', start))
+        {
+            // use the text between the beginning of the reference token
+            // (start) and the last slash (slash).
+            auto reference_token = reference_string.substr(start, slash - start);
+
+            // check reference tokens are properly escaped
+            for (std::size_t pos = reference_token.find_first_of('~');
+                    pos != string_t::npos;
+                    pos = reference_token.find_first_of('~', pos + 1))
+            {
+                JSON_ASSERT(reference_token[pos] == '~');
+
+                // ~ must be followed by 0 or 1
+                if (JSON_HEDLEY_UNLIKELY(pos == reference_token.size() - 1 ||
+                                         (reference_token[pos + 1] != '0' &&
+                                          reference_token[pos + 1] != '1')))
+                {
+                    JSON_THROW(detail::parse_error::create(108, 0, "escape character '~' must be followed with '0' or '1'", nullptr));
+                }
+            }
+
+            // finally, store the reference token
+            detail::unescape(reference_token);
+            result.push_back(reference_token);
+        }
+
+        return result;
+    }
+
+  private:
+    /*!
+    @param[in] reference_string  the reference string to the current value
+    @param[in] value             the value to consider
+    @param[in,out] result        the result object to insert values to
+
+    @note Empty objects or arrays are flattened to `null`.
+    */
+    template<typename BasicJsonType>
+    static void flatten(const string_t& reference_string,
+                        const BasicJsonType& value,
+                        BasicJsonType& result)
+    {
+        switch (value.type())
+        {
+            case detail::value_t::array:
+            {
+                if (value.m_data.m_value.array->empty())
+                {
+                    // flatten empty array as null
+                    result[reference_string] = nullptr;
+                }
+                else
+                {
+                    // iterate array and use index as reference string
+                    for (std::size_t i = 0; i < value.m_data.m_value.array->size(); ++i)
+                    {
+                        flatten(detail::concat<string_t>(reference_string, '/', std::to_string(i)),
+                                value.m_data.m_value.array->operator[](i), result);
+                    }
+                }
+                break;
+            }
+
+            case detail::value_t::object:
+            {
+                if (value.m_data.m_value.object->empty())
+                {
+                    // flatten empty object as null
+                    result[reference_string] = nullptr;
+                }
+                else
+                {
+                    // iterate object and use keys as reference string
+                    for (const auto& element : *value.m_data.m_value.object)
+                    {
+                        flatten(detail::concat<string_t>(reference_string, '/', detail::escape(element.first)), element.second, result);
+                    }
+                }
+                break;
+            }
+
+            case detail::value_t::null:
+            case detail::value_t::string:
+            case detail::value_t::boolean:
+            case detail::value_t::number_integer:
+            case detail::value_t::number_unsigned:
+            case detail::value_t::number_float:
+            case detail::value_t::binary:
+            case detail::value_t::discarded:
+            default:
+            {
+                // add primitive value with its reference string
+                result[reference_string] = value;
+                break;
+            }
+        }
+    }
+
+    /*!
+    @param[in] value  flattened JSON
+
+    @return unflattened JSON
+
+    @throw parse_error.109 if array index is not a number
+    @throw type_error.314  if value is not an object
+    @throw type_error.315  if object values are not primitive
+    @throw type_error.313  if value cannot be unflattened
+    */
+    template<typename BasicJsonType>
+    static BasicJsonType
+    unflatten(const BasicJsonType& value)
+    {
+        if (JSON_HEDLEY_UNLIKELY(!value.is_object()))
+        {
+            JSON_THROW(detail::type_error::create(314, "only objects can be unflattened", &value));
+        }
+
+        BasicJsonType result;
+
+        // iterate the JSON object values
+        for (const auto& element : *value.m_data.m_value.object)
+        {
+            if (JSON_HEDLEY_UNLIKELY(!element.second.is_primitive()))
+            {
+                JSON_THROW(detail::type_error::create(315, "values in object must be primitive", &element.second));
+            }
+
+            // assign value to reference pointed to by JSON pointer; Note that if
+            // the JSON pointer is "" (i.e., points to the whole value), function
+            // get_and_create returns a reference to result itself. An assignment
+            // will then create a primitive value.
+            json_pointer(element.first).get_and_create(result) = element.second;
+        }
+
+        return result;
+    }
+
+    // can't use conversion operator because of ambiguity
+    json_pointer<string_t> convert() const&
+    {
+        json_pointer<string_t> result;
+        result.reference_tokens = reference_tokens;
+        return result;
+    }
+
+    json_pointer<string_t> convert()&&
+    {
+        json_pointer<string_t> result;
+        result.reference_tokens = std::move(reference_tokens);
+        return result;
+    }
+
+  public:
+#if JSON_HAS_THREE_WAY_COMPARISON
+    /// @brief compares two JSON pointers for equality
+    /// @sa https://json.nlohmann.me/api/json_pointer/operator_eq/
+    template<typename RefStringTypeRhs>
+    bool operator==(const json_pointer<RefStringTypeRhs>& rhs) const noexcept
+    {
+        return reference_tokens == rhs.reference_tokens;
+    }
+
+    /// @brief compares JSON pointer and string for equality
+    /// @sa https://json.nlohmann.me/api/json_pointer/operator_eq/
+    JSON_HEDLEY_DEPRECATED_FOR(3.11.2, operator==(json_pointer))
+    bool operator==(const string_t& rhs) const
+    {
+        return *this == json_pointer(rhs);
+    }
+
+    /// @brief 3-way compares two JSON pointers
+    template<typename RefStringTypeRhs>
+    std::strong_ordering operator<=>(const json_pointer<RefStringTypeRhs>& rhs) const noexcept // *NOPAD*
+    {
+        return  reference_tokens <=> rhs.reference_tokens; // *NOPAD*
+    }
+#else
+    /// @brief compares two JSON pointers for equality
+    /// @sa https://json.nlohmann.me/api/json_pointer/operator_eq/
+    template<typename RefStringTypeLhs, typename RefStringTypeRhs>
+    // NOLINTNEXTLINE(readability-redundant-declaration)
+    friend bool operator==(const json_pointer<RefStringTypeLhs>& lhs,
+                           const json_pointer<RefStringTypeRhs>& rhs) noexcept;
+
+    /// @brief compares JSON pointer and string for equality
+    /// @sa https://json.nlohmann.me/api/json_pointer/operator_eq/
+    template<typename RefStringTypeLhs, typename StringType>
+    // NOLINTNEXTLINE(readability-redundant-declaration)
+    friend bool operator==(const json_pointer<RefStringTypeLhs>& lhs,
+                           const StringType& rhs);
+
+    /// @brief compares string and JSON pointer for equality
+    /// @sa https://json.nlohmann.me/api/json_pointer/operator_eq/
+    template<typename RefStringTypeRhs, typename StringType>
+    // NOLINTNEXTLINE(readability-redundant-declaration)
+    friend bool operator==(const StringType& lhs,
+                           const json_pointer<RefStringTypeRhs>& rhs);
+
+    /// @brief compares two JSON pointers for inequality
+    /// @sa https://json.nlohmann.me/api/json_pointer/operator_ne/
+    template<typename RefStringTypeLhs, typename RefStringTypeRhs>
+    // NOLINTNEXTLINE(readability-redundant-declaration)
+    friend bool operator!=(const json_pointer<RefStringTypeLhs>& lhs,
+                           const json_pointer<RefStringTypeRhs>& rhs) noexcept;
+
+    /// @brief compares JSON pointer and string for inequality
+    /// @sa https://json.nlohmann.me/api/json_pointer/operator_ne/
+    template<typename RefStringTypeLhs, typename StringType>
+    // NOLINTNEXTLINE(readability-redundant-declaration)
+    friend bool operator!=(const json_pointer<RefStringTypeLhs>& lhs,
+                           const StringType& rhs);
+
+    /// @brief compares string and JSON pointer for inequality
+    /// @sa https://json.nlohmann.me/api/json_pointer/operator_ne/
+    template<typename RefStringTypeRhs, typename StringType>
+    // NOLINTNEXTLINE(readability-redundant-declaration)
+    friend bool operator!=(const StringType& lhs,
+                           const json_pointer<RefStringTypeRhs>& rhs);
+
+    /// @brief compares two JSON pointer for less-than
+    template<typename RefStringTypeLhs, typename RefStringTypeRhs>
+    // NOLINTNEXTLINE(readability-redundant-declaration)
+    friend bool operator<(const json_pointer<RefStringTypeLhs>& lhs,
+                          const json_pointer<RefStringTypeRhs>& rhs) noexcept;
+#endif
+
+  private:
+    /// the reference tokens
+    std::vector<string_t> reference_tokens;
+};
+
+#if !JSON_HAS_THREE_WAY_COMPARISON
+// functions cannot be defined inside class due to ODR violations
+template<typename RefStringTypeLhs, typename RefStringTypeRhs>
+inline bool operator==(const json_pointer<RefStringTypeLhs>& lhs,
+                       const json_pointer<RefStringTypeRhs>& rhs) noexcept
+{
+    return lhs.reference_tokens == rhs.reference_tokens;
+}
+
+template<typename RefStringTypeLhs,
+         typename StringType = typename json_pointer<RefStringTypeLhs>::string_t>
+JSON_HEDLEY_DEPRECATED_FOR(3.11.2, operator==(json_pointer, json_pointer))
+inline bool operator==(const json_pointer<RefStringTypeLhs>& lhs,
+                       const StringType& rhs)
+{
+    return lhs == json_pointer<RefStringTypeLhs>(rhs);
+}
+
+template<typename RefStringTypeRhs,
+         typename StringType = typename json_pointer<RefStringTypeRhs>::string_t>
+JSON_HEDLEY_DEPRECATED_FOR(3.11.2, operator==(json_pointer, json_pointer))
+inline bool operator==(const StringType& lhs,
+                       const json_pointer<RefStringTypeRhs>& rhs)
+{
+    return json_pointer<RefStringTypeRhs>(lhs) == rhs;
+}
+
+template<typename RefStringTypeLhs, typename RefStringTypeRhs>
+inline bool operator!=(const json_pointer<RefStringTypeLhs>& lhs,
+                       const json_pointer<RefStringTypeRhs>& rhs) noexcept
+{
+    return !(lhs == rhs);
+}
+
+template<typename RefStringTypeLhs,
+         typename StringType = typename json_pointer<RefStringTypeLhs>::string_t>
+JSON_HEDLEY_DEPRECATED_FOR(3.11.2, operator!=(json_pointer, json_pointer))
+inline bool operator!=(const json_pointer<RefStringTypeLhs>& lhs,
+                       const StringType& rhs)
+{
+    return !(lhs == rhs);
+}
+
+template<typename RefStringTypeRhs,
+         typename StringType = typename json_pointer<RefStringTypeRhs>::string_t>
+JSON_HEDLEY_DEPRECATED_FOR(3.11.2, operator!=(json_pointer, json_pointer))
+inline bool operator!=(const StringType& lhs,
+                       const json_pointer<RefStringTypeRhs>& rhs)
+{
+    return !(lhs == rhs);
+}
+
+template<typename RefStringTypeLhs, typename RefStringTypeRhs>
+inline bool operator<(const json_pointer<RefStringTypeLhs>& lhs,
+                      const json_pointer<RefStringTypeRhs>& rhs) noexcept
+{
+    return lhs.reference_tokens < rhs.reference_tokens;
+}
+#endif
+
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/json_ref.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013 - 2025 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <initializer_list>
+#include <utility>
+
+// #include <nlohmann/detail/abi_macros.hpp>
+
+// #include <nlohmann/detail/meta/type_traits.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+template<typename BasicJsonType>
+class json_ref
+{
+  public:
+    using value_type = BasicJsonType;
+
+    json_ref(value_type&& value)
+        : owned_value(std::move(value))
+    {}
+
+    json_ref(const value_type& value)
+        : value_ref(&value)
+    {}
+
+    json_ref(std::initializer_list<json_ref> init)
+        : owned_value(init)
+    {}
+
+    template <
+        class... Args,
+        enable_if_t<std::is_constructible<value_type, Args...>::value, int> = 0 >
+    json_ref(Args && ... args)
+        : owned_value(std::forward<Args>(args)...)
+    {}
+
+    // class should be movable only
+    json_ref(json_ref&&) noexcept = default;
+    json_ref(const json_ref&) = delete;
+    json_ref& operator=(const json_ref&) = delete;
+    json_ref& operator=(json_ref&&) = delete;
+    ~json_ref() = default;
+
+    value_type moved_or_copied() const
+    {
+        if (value_ref == nullptr)
+        {
+            return std::move(owned_value);
+        }
+        return *value_ref;
+    }
+
+    value_type const& operator*() const
+    {
+        return value_ref ? *value_ref : owned_value;
+    }
+
+    value_type const* operator->() const
+    {
+        return &** this;
+    }
+
+  private:
+    mutable value_type owned_value = nullptr;
+    value_type const* value_ref = nullptr;
+};
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/string_concat.hpp>
+
+// #include <nlohmann/detail/string_escape.hpp>
+
+// #include <nlohmann/detail/string_utils.hpp>
+
+// #include <nlohmann/detail/meta/cpp_future.hpp>
+
+// #include <nlohmann/detail/meta/type_traits.hpp>
+
+// #include <nlohmann/detail/output/binary_writer.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013 - 2025 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <algorithm> // reverse
+#include <array> // array
+#include <map> // map
+#include <cmath> // isnan, isinf
+#include <cstdint> // uint8_t, uint16_t, uint32_t, uint64_t
+#include <cstring> // memcpy
+#include <limits> // numeric_limits
+#include <string> // string
+#include <utility> // move
+#include <vector> // vector
+
+// #include <nlohmann/detail/input/binary_reader.hpp>
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/output/output_adapters.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013 - 2025 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <algorithm> // copy
+#include <cstddef> // size_t
+#include <iterator> // back_inserter
+#include <memory> // shared_ptr, make_shared
+#include <string> // basic_string
+#include <vector> // vector
+
+#ifndef JSON_NO_IO
+    #include <ios>      // streamsize
+    #include <ostream>  // basic_ostream
+#endif  // JSON_NO_IO
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+/// abstract output adapter interface
+template<typename CharType> struct output_adapter_protocol
+{
+    virtual void write_character(CharType c) = 0;
+    virtual void write_characters(const CharType* s, std::size_t length) = 0;
+    virtual ~output_adapter_protocol() = default;
+
+    output_adapter_protocol() = default;
+    output_adapter_protocol(const output_adapter_protocol&) = default;
+    output_adapter_protocol(output_adapter_protocol&&) noexcept = default;
+    output_adapter_protocol& operator=(const output_adapter_protocol&) = default;
+    output_adapter_protocol& operator=(output_adapter_protocol&&) noexcept = default;
+};
+
+/// a type to simplify interfaces
+template<typename CharType>
+using output_adapter_t = std::shared_ptr<output_adapter_protocol<CharType>>;
+
+/// output adapter for byte vectors
+template<typename CharType, typename AllocatorType = std::allocator<CharType>>
+class output_vector_adapter : public output_adapter_protocol<CharType>
+{
+  public:
+    explicit output_vector_adapter(std::vector<CharType, AllocatorType>& vec) noexcept
+        : v(vec)
+    {}
+
+    void write_character(CharType c) override
+    {
+        v.push_back(c);
+    }
+
+    JSON_HEDLEY_NON_NULL(2)
+    void write_characters(const CharType* s, std::size_t length) override
+    {
+        v.insert(v.end(), s, s + length);
+    }
+
+  private:
+    std::vector<CharType, AllocatorType>& v;
+};
+
+#ifndef JSON_NO_IO
+/// output adapter for output streams
+template<typename CharType>
+class output_stream_adapter : public output_adapter_protocol<CharType>
+{
+  public:
+    explicit output_stream_adapter(std::basic_ostream<CharType>& s) noexcept
+        : stream(s)
+    {}
+
+    void write_character(CharType c) override
+    {
+        stream.put(c);
+    }
+
+    JSON_HEDLEY_NON_NULL(2)
+    void write_characters(const CharType* s, std::size_t length) override
+    {
+        stream.write(s, static_cast<std::streamsize>(length));
+    }
+
+  private:
+    std::basic_ostream<CharType>& stream;
+};
+#endif  // JSON_NO_IO
+
+/// output adapter for basic_string
+template<typename CharType, typename StringType = std::basic_string<CharType>>
+class output_string_adapter : public output_adapter_protocol<CharType>
+{
+  public:
+    explicit output_string_adapter(StringType& s) noexcept
+        : str(s)
+    {}
+
+    void write_character(CharType c) override
+    {
+        str.push_back(c);
+    }
+
+    JSON_HEDLEY_NON_NULL(2)
+    void write_characters(const CharType* s, std::size_t length) override
+    {
+        str.append(s, length);
+    }
+
+  private:
+    StringType& str;
+};
+
+template<typename CharType, typename StringType = std::basic_string<CharType>>
+class output_adapter
+{
+  public:
+    template<typename AllocatorType = std::allocator<CharType>>
+    output_adapter(std::vector<CharType, AllocatorType>& vec)
+        : oa(std::make_shared<output_vector_adapter<CharType, AllocatorType>>(vec)) {}
+
+#ifndef JSON_NO_IO
+    output_adapter(std::basic_ostream<CharType>& s)
+        : oa(std::make_shared<output_stream_adapter<CharType>>(s)) {}
+#endif  // JSON_NO_IO
+
+    output_adapter(StringType& s)
+        : oa(std::make_shared<output_string_adapter<CharType, StringType>>(s)) {}
+
+    operator output_adapter_t<CharType>()
+    {
+        return oa;
+    }
+
+  private:
+    output_adapter_t<CharType> oa = nullptr;
+};
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/string_concat.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+/// how to encode BJData
+enum class bjdata_version_t
+{
+    draft2,
+    draft3,
+};
+
+///////////////////
+// binary writer //
+///////////////////
+
+/*!
+@brief serialization to CBOR and MessagePack values
+*/
+template<typename BasicJsonType, typename CharType>
+class binary_writer
+{
+    using string_t = typename BasicJsonType::string_t;
+    using binary_t = typename BasicJsonType::binary_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+
+  public:
+    /*!
+    @brief create a binary writer
+
+    @param[in] adapter  output adapter to write to
+    */
+    explicit binary_writer(output_adapter_t<CharType> adapter) : oa(std::move(adapter))
+    {
+        JSON_ASSERT(oa);
+    }
+
+    /*!
+    @param[in] j  JSON value to serialize
+    @pre       j.type() == value_t::object
+    */
+    void write_bson(const BasicJsonType& j)
+    {
+        switch (j.type())
+        {
+            case value_t::object:
+            {
+                write_bson_object(*j.m_data.m_value.object);
+                break;
+            }
+
+            case value_t::null:
+            case value_t::array:
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+            {
+                JSON_THROW(type_error::create(317, concat("to serialize to BSON, top-level type must be object, but is ", j.type_name()), &j));
+            }
+        }
+    }
+
+    /*!
+    @param[in] j  JSON value to serialize
+    */
+    void write_cbor(const BasicJsonType& j)
+    {
+        switch (j.type())
+        {
+            case value_t::null:
+            {
+                oa->write_character(to_char_type(0xF6));
+                break;
+            }
+
+            case value_t::boolean:
+            {
+                oa->write_character(j.m_data.m_value.boolean
+                                    ? to_char_type(0xF5)
+                                    : to_char_type(0xF4));
+                break;
+            }
+
+            case value_t::number_integer:
+            {
+                if (j.m_data.m_value.number_integer >= 0)
+                {
+                    // CBOR does not differentiate between positive signed
+                    // integers and unsigned integers. Therefore, we used the
+                    // code from the value_t::number_unsigned case here.
+                    if (j.m_data.m_value.number_integer <= 0x17)
+                    {
+                        write_number(static_cast<std::uint8_t>(j.m_data.m_value.number_integer));
+                    }
+                    else if (j.m_data.m_value.number_integer <= (std::numeric_limits<std::uint8_t>::max)())
+                    {
+                        oa->write_character(to_char_type(0x18));
+                        write_number(static_cast<std::uint8_t>(j.m_data.m_value.number_integer));
+                    }
+                    else if (j.m_data.m_value.number_integer <= (std::numeric_limits<std::uint16_t>::max)())
+                    {
+                        oa->write_character(to_char_type(0x19));
+                        write_number(static_cast<std::uint16_t>(j.m_data.m_value.number_integer));
+                    }
+                    else if (j.m_data.m_value.number_integer <= (std::numeric_limits<std::uint32_t>::max)())
+                    {
+                        oa->write_character(to_char_type(0x1A));
+                        write_number(static_cast<std::uint32_t>(j.m_data.m_value.number_integer));
+                    }
+                    else
+                    {
+                        oa->write_character(to_char_type(0x1B));
+                        write_number(static_cast<std::uint64_t>(j.m_data.m_value.number_integer));
+                    }
+                }
+                else
+                {
+                    // The conversions below encode the sign in the first
+                    // byte, and the value is converted to a positive number.
+                    const auto positive_number = -1 - j.m_data.m_value.number_integer;
+                    if (j.m_data.m_value.number_integer >= -24)
+                    {
+                        write_number(static_cast<std::uint8_t>(0x20 + positive_number));
+                    }
+                    else if (positive_number <= (std::numeric_limits<std::uint8_t>::max)())
+                    {
+                        oa->write_character(to_char_type(0x38));
+                        write_number(static_cast<std::uint8_t>(positive_number));
+                    }
+                    else if (positive_number <= (std::numeric_limits<std::uint16_t>::max)())
+                    {
+                        oa->write_character(to_char_type(0x39));
+                        write_number(static_cast<std::uint16_t>(positive_number));
+                    }
+                    else if (positive_number <= (std::numeric_limits<std::uint32_t>::max)())
+                    {
+                        oa->write_character(to_char_type(0x3A));
+                        write_number(static_cast<std::uint32_t>(positive_number));
+                    }
+                    else
+                    {
+                        oa->write_character(to_char_type(0x3B));
+                        write_number(static_cast<std::uint64_t>(positive_number));
+                    }
+                }
+                break;
+            }
+
+            case value_t::number_unsigned:
+            {
+                if (j.m_data.m_value.number_unsigned <= 0x17)
+                {
+                    write_number(static_cast<std::uint8_t>(j.m_data.m_value.number_unsigned));
+                }
+                else if (j.m_data.m_value.number_unsigned <= (std::numeric_limits<std::uint8_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x18));
+                    write_number(static_cast<std::uint8_t>(j.m_data.m_value.number_unsigned));
+                }
+                else if (j.m_data.m_value.number_unsigned <= (std::numeric_limits<std::uint16_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x19));
+                    write_number(static_cast<std::uint16_t>(j.m_data.m_value.number_unsigned));
+                }
+                else if (j.m_data.m_value.number_unsigned <= (std::numeric_limits<std::uint32_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x1A));
+                    write_number(static_cast<std::uint32_t>(j.m_data.m_value.number_unsigned));
+                }
+                else
+                {
+                    oa->write_character(to_char_type(0x1B));
+                    write_number(static_cast<std::uint64_t>(j.m_data.m_value.number_unsigned));
+                }
+                break;
+            }
+
+            case value_t::number_float:
+            {
+                if (std::isnan(j.m_data.m_value.number_float))
+                {
+                    // NaN is 0xf97e00 in CBOR
+                    oa->write_character(to_char_type(0xF9));
+                    oa->write_character(to_char_type(0x7E));
+                    oa->write_character(to_char_type(0x00));
+                }
+                else if (std::isinf(j.m_data.m_value.number_float))
+                {
+                    // Infinity is 0xf97c00, -Infinity is 0xf9fc00
+                    oa->write_character(to_char_type(0xf9));
+                    oa->write_character(j.m_data.m_value.number_float > 0 ? to_char_type(0x7C) : to_char_type(0xFC));
+                    oa->write_character(to_char_type(0x00));
+                }
+                else
+                {
+                    write_compact_float(j.m_data.m_value.number_float, detail::input_format_t::cbor);
+                }
+                break;
+            }
+
+            case value_t::string:
+            {
+                // step 1: write control byte and the string length
+                const auto N = j.m_data.m_value.string->size();
+                if (N <= 0x17)
+                {
+                    write_number(static_cast<std::uint8_t>(0x60 + N));
+                }
+                else if (N <= (std::numeric_limits<std::uint8_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x78));
+                    write_number(static_cast<std::uint8_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint16_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x79));
+                    write_number(static_cast<std::uint16_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint32_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x7A));
+                    write_number(static_cast<std::uint32_t>(N));
+                }
+                // LCOV_EXCL_START
+                else if (N <= (std::numeric_limits<std::uint64_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x7B));
+                    write_number(static_cast<std::uint64_t>(N));
+                }
+                // LCOV_EXCL_STOP
+
+                // step 2: write the string
+                oa->write_characters(
+                    reinterpret_cast<const CharType*>(j.m_data.m_value.string->c_str()),
+                    j.m_data.m_value.string->size());
+                break;
+            }
+
+            case value_t::array:
+            {
+                // step 1: write control byte and the array size
+                const auto N = j.m_data.m_value.array->size();
+                if (N <= 0x17)
+                {
+                    write_number(static_cast<std::uint8_t>(0x80 + N));
+                }
+                else if (N <= (std::numeric_limits<std::uint8_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x98));
+                    write_number(static_cast<std::uint8_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint16_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x99));
+                    write_number(static_cast<std::uint16_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint32_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x9A));
+                    write_number(static_cast<std::uint32_t>(N));
+                }
+                // LCOV_EXCL_START
+                else if (N <= (std::numeric_limits<std::uint64_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x9B));
+                    write_number(static_cast<std::uint64_t>(N));
+                }
+                // LCOV_EXCL_STOP
+
+                // step 2: write each element
+                for (const auto& el : *j.m_data.m_value.array)
+                {
+                    write_cbor(el);
+                }
+                break;
+            }
+
+            case value_t::binary:
+            {
+                if (j.m_data.m_value.binary->has_subtype())
+                {
+                    if (j.m_data.m_value.binary->subtype() <= (std::numeric_limits<std::uint8_t>::max)())
+                    {
+                        write_number(static_cast<std::uint8_t>(0xd8));
+                        write_number(static_cast<std::uint8_t>(j.m_data.m_value.binary->subtype()));
+                    }
+                    else if (j.m_data.m_value.binary->subtype() <= (std::numeric_limits<std::uint16_t>::max)())
+                    {
+                        write_number(static_cast<std::uint8_t>(0xd9));
+                        write_number(static_cast<std::uint16_t>(j.m_data.m_value.binary->subtype()));
+                    }
+                    else if (j.m_data.m_value.binary->subtype() <= (std::numeric_limits<std::uint32_t>::max)())
+                    {
+                        write_number(static_cast<std::uint8_t>(0xda));
+                        write_number(static_cast<std::uint32_t>(j.m_data.m_value.binary->subtype()));
+                    }
+                    else if (j.m_data.m_value.binary->subtype() <= (std::numeric_limits<std::uint64_t>::max)())
+                    {
+                        write_number(static_cast<std::uint8_t>(0xdb));
+                        write_number(static_cast<std::uint64_t>(j.m_data.m_value.binary->subtype()));
+                    }
+                }
+
+                // step 1: write control byte and the binary array size
+                const auto N = j.m_data.m_value.binary->size();
+                if (N <= 0x17)
+                {
+                    write_number(static_cast<std::uint8_t>(0x40 + N));
+                }
+                else if (N <= (std::numeric_limits<std::uint8_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x58));
+                    write_number(static_cast<std::uint8_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint16_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x59));
+                    write_number(static_cast<std::uint16_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint32_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x5A));
+                    write_number(static_cast<std::uint32_t>(N));
+                }
+                // LCOV_EXCL_START
+                else if (N <= (std::numeric_limits<std::uint64_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x5B));
+                    write_number(static_cast<std::uint64_t>(N));
+                }
+                // LCOV_EXCL_STOP
+
+                // step 2: write each element
+                oa->write_characters(
+                    reinterpret_cast<const CharType*>(j.m_data.m_value.binary->data()),
+                    N);
+
+                break;
+            }
+
+            case value_t::object:
+            {
+                // step 1: write control byte and the object size
+                const auto N = j.m_data.m_value.object->size();
+                if (N <= 0x17)
+                {
+                    write_number(static_cast<std::uint8_t>(0xA0 + N));
+                }
+                else if (N <= (std::numeric_limits<std::uint8_t>::max)())
+                {
+                    oa->write_character(to_char_type(0xB8));
+                    write_number(static_cast<std::uint8_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint16_t>::max)())
+                {
+                    oa->write_character(to_char_type(0xB9));
+                    write_number(static_cast<std::uint16_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint32_t>::max)())
+                {
+                    oa->write_character(to_char_type(0xBA));
+                    write_number(static_cast<std::uint32_t>(N));
+                }
+                // LCOV_EXCL_START
+                else if (N <= (std::numeric_limits<std::uint64_t>::max)())
+                {
+                    oa->write_character(to_char_type(0xBB));
+                    write_number(static_cast<std::uint64_t>(N));
+                }
+                // LCOV_EXCL_STOP
+
+                // step 2: write each element
+                for (const auto& el : *j.m_data.m_value.object)
+                {
+                    write_cbor(el.first);
+                    write_cbor(el.second);
+                }
+                break;
+            }
+
+            case value_t::discarded:
+            default:
+                break;
+        }
+    }
+
+    /*!
+    @param[in] j  JSON value to serialize
+    */
+    void write_msgpack(const BasicJsonType& j)
+    {
+        switch (j.type())
+        {
+            case value_t::null: // nil
+            {
+                oa->write_character(to_char_type(0xC0));
+                break;
+            }
+
+            case value_t::boolean: // true and false
+            {
+                oa->write_character(j.m_data.m_value.boolean
+                                    ? to_char_type(0xC3)
+                                    : to_char_type(0xC2));
+                break;
+            }
+
+            case value_t::number_integer:
+            {
+                if (j.m_data.m_value.number_integer >= 0)
+                {
+                    // MessagePack does not differentiate between positive
+                    // signed integers and unsigned integers. Therefore, we used
+                    // the code from the value_t::number_unsigned case here.
+                    if (j.m_data.m_value.number_unsigned < 128)
+                    {
+                        // positive fixnum
+                        write_number(static_cast<std::uint8_t>(j.m_data.m_value.number_integer));
+                    }
+                    else if (j.m_data.m_value.number_unsigned <= (std::numeric_limits<std::uint8_t>::max)())
+                    {
+                        // uint 8
+                        oa->write_character(to_char_type(0xCC));
+                        write_number(static_cast<std::uint8_t>(j.m_data.m_value.number_integer));
+                    }
+                    else if (j.m_data.m_value.number_unsigned <= (std::numeric_limits<std::uint16_t>::max)())
+                    {
+                        // uint 16
+                        oa->write_character(to_char_type(0xCD));
+                        write_number(static_cast<std::uint16_t>(j.m_data.m_value.number_integer));
+                    }
+                    else if (j.m_data.m_value.number_unsigned <= (std::numeric_limits<std::uint32_t>::max)())
+                    {
+                        // uint 32
+                        oa->write_character(to_char_type(0xCE));
+                        write_number(static_cast<std::uint32_t>(j.m_data.m_value.number_integer));
+                    }
+                    else if (j.m_data.m_value.number_unsigned <= (std::numeric_limits<std::uint64_t>::max)())
+                    {
+                        // uint 64
+                        oa->write_character(to_char_type(0xCF));
+                        write_number(static_cast<std::uint64_t>(j.m_data.m_value.number_integer));
+                    }
+                }
+                else
+                {
+                    if (j.m_data.m_value.number_integer >= -32)
+                    {
+                        // negative fixnum
+                        write_number(static_cast<std::int8_t>(j.m_data.m_value.number_integer));
+                    }
+                    else if (j.m_data.m_value.number_integer >= (std::numeric_limits<std::int8_t>::min)() &&
+                             j.m_data.m_value.number_integer <= (std::numeric_limits<std::int8_t>::max)())
+                    {
+                        // int 8
+                        oa->write_character(to_char_type(0xD0));
+                        write_number(static_cast<std::int8_t>(j.m_data.m_value.number_integer));
+                    }
+                    else if (j.m_data.m_value.number_integer >= (std::numeric_limits<std::int16_t>::min)() &&
+                             j.m_data.m_value.number_integer <= (std::numeric_limits<std::int16_t>::max)())
+                    {
+                        // int 16
+                        oa->write_character(to_char_type(0xD1));
+                        write_number(static_cast<std::int16_t>(j.m_data.m_value.number_integer));
+                    }
+                    else if (j.m_data.m_value.number_integer >= (std::numeric_limits<std::int32_t>::min)() &&
+                             j.m_data.m_value.number_integer <= (std::numeric_limits<std::int32_t>::max)())
+                    {
+                        // int 32
+                        oa->write_character(to_char_type(0xD2));
+                        write_number(static_cast<std::int32_t>(j.m_data.m_value.number_integer));
+                    }
+                    else if (j.m_data.m_value.number_integer >= (std::numeric_limits<std::int64_t>::min)() &&
+                             j.m_data.m_value.number_integer <= (std::numeric_limits<std::int64_t>::max)())
+                    {
+                        // int 64
+                        oa->write_character(to_char_type(0xD3));
+                        write_number(static_cast<std::int64_t>(j.m_data.m_value.number_integer));
+                    }
+                }
+                break;
+            }
+
+            case value_t::number_unsigned:
+            {
+                if (j.m_data.m_value.number_unsigned < 128)
+                {
+                    // positive fixnum
+                    write_number(static_cast<std::uint8_t>(j.m_data.m_value.number_integer));
+                }
+                else if (j.m_data.m_value.number_unsigned <= (std::numeric_limits<std::uint8_t>::max)())
+                {
+                    // uint 8
+                    oa->write_character(to_char_type(0xCC));
+                    write_number(static_cast<std::uint8_t>(j.m_data.m_value.number_integer));
+                }
+                else if (j.m_data.m_value.number_unsigned <= (std::numeric_limits<std::uint16_t>::max)())
+                {
+                    // uint 16
+                    oa->write_character(to_char_type(0xCD));
+                    write_number(static_cast<std::uint16_t>(j.m_data.m_value.number_integer));
+                }
+                else if (j.m_data.m_value.number_unsigned <= (std::numeric_limits<std::uint32_t>::max)())
+                {
+                    // uint 32
+                    oa->write_character(to_char_type(0xCE));
+                    write_number(static_cast<std::uint32_t>(j.m_data.m_value.number_integer));
+                }
+                else if (j.m_data.m_value.number_unsigned <= (std::numeric_limits<std::uint64_t>::max)())
+                {
+                    // uint 64
+                    oa->write_character(to_char_type(0xCF));
+                    write_number(static_cast<std::uint64_t>(j.m_data.m_value.number_integer));
+                }
+                break;
+            }
+
+            case value_t::number_float:
+            {
+                write_compact_float(j.m_data.m_value.number_float, detail::input_format_t::msgpack);
+                break;
+            }
+
+            case value_t::string:
+            {
+                // step 1: write control byte and the string length
+                const auto N = j.m_data.m_value.string->size();
+                if (N <= 31)
+                {
+                    // fixstr
+                    write_number(static_cast<std::uint8_t>(0xA0 | N));
+                }
+                else if (N <= (std::numeric_limits<std::uint8_t>::max)())
+                {
+                    // str 8
+                    oa->write_character(to_char_type(0xD9));
+                    write_number(static_cast<std::uint8_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint16_t>::max)())
+                {
+                    // str 16
+                    oa->write_character(to_char_type(0xDA));
+                    write_number(static_cast<std::uint16_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint32_t>::max)())
+                {
+                    // str 32
+                    oa->write_character(to_char_type(0xDB));
+                    write_number(static_cast<std::uint32_t>(N));
+                }
+
+                // step 2: write the string
+                oa->write_characters(
+                    reinterpret_cast<const CharType*>(j.m_data.m_value.string->c_str()),
+                    j.m_data.m_value.string->size());
+                break;
+            }
+
+            case value_t::array:
+            {
+                // step 1: write control byte and the array size
+                const auto N = j.m_data.m_value.array->size();
+                if (N <= 15)
+                {
+                    // fixarray
+                    write_number(static_cast<std::uint8_t>(0x90 | N));
+                }
+                else if (N <= (std::numeric_limits<std::uint16_t>::max)())
+                {
+                    // array 16
+                    oa->write_character(to_char_type(0xDC));
+                    write_number(static_cast<std::uint16_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint32_t>::max)())
+                {
+                    // array 32
+                    oa->write_character(to_char_type(0xDD));
+                    write_number(static_cast<std::uint32_t>(N));
+                }
+
+                // step 2: write each element
+                for (const auto& el : *j.m_data.m_value.array)
+                {
+                    write_msgpack(el);
+                }
+                break;
+            }
+
+            case value_t::binary:
+            {
+                // step 0: determine if the binary type has a set subtype to
+                // determine whether to use the ext or fixext types
+                const bool use_ext = j.m_data.m_value.binary->has_subtype();
+
+                // step 1: write control byte and the byte string length
+                const auto N = j.m_data.m_value.binary->size();
+                if (N <= (std::numeric_limits<std::uint8_t>::max)())
+                {
+                    std::uint8_t output_type{};
+                    bool fixed = true;
+                    if (use_ext)
+                    {
+                        switch (N)
+                        {
+                            case 1:
+                                output_type = 0xD4; // fixext 1
+                                break;
+                            case 2:
+                                output_type = 0xD5; // fixext 2
+                                break;
+                            case 4:
+                                output_type = 0xD6; // fixext 4
+                                break;
+                            case 8:
+                                output_type = 0xD7; // fixext 8
+                                break;
+                            case 16:
+                                output_type = 0xD8; // fixext 16
+                                break;
+                            default:
+                                output_type = 0xC7; // ext 8
+                                fixed = false;
+                                break;
+                        }
+
+                    }
+                    else
+                    {
+                        output_type = 0xC4; // bin 8
+                        fixed = false;
+                    }
+
+                    oa->write_character(to_char_type(output_type));
+                    if (!fixed)
+                    {
+                        write_number(static_cast<std::uint8_t>(N));
+                    }
+                }
+                else if (N <= (std::numeric_limits<std::uint16_t>::max)())
+                {
+                    const std::uint8_t output_type = use_ext
+                                                     ? 0xC8 // ext 16
+                                                     : 0xC5; // bin 16
+
+                    oa->write_character(to_char_type(output_type));
+                    write_number(static_cast<std::uint16_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint32_t>::max)())
+                {
+                    const std::uint8_t output_type = use_ext
+                                                     ? 0xC9 // ext 32
+                                                     : 0xC6; // bin 32
+
+                    oa->write_character(to_char_type(output_type));
+                    write_number(static_cast<std::uint32_t>(N));
+                }
+
+                // step 1.5: if this is an ext type, write the subtype
+                if (use_ext)
+                {
+                    write_number(static_cast<std::int8_t>(j.m_data.m_value.binary->subtype()));
+                }
+
+                // step 2: write the byte string
+                oa->write_characters(
+                    reinterpret_cast<const CharType*>(j.m_data.m_value.binary->data()),
+                    N);
+
+                break;
+            }
+
+            case value_t::object:
+            {
+                // step 1: write control byte and the object size
+                const auto N = j.m_data.m_value.object->size();
+                if (N <= 15)
+                {
+                    // fixmap
+                    write_number(static_cast<std::uint8_t>(0x80 | (N & 0xF)));
+                }
+                else if (N <= (std::numeric_limits<std::uint16_t>::max)())
+                {
+                    // map 16
+                    oa->write_character(to_char_type(0xDE));
+                    write_number(static_cast<std::uint16_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint32_t>::max)())
+                {
+                    // map 32
+                    oa->write_character(to_char_type(0xDF));
+                    write_number(static_cast<std::uint32_t>(N));
+                }
+
+                // step 2: write each element
+                for (const auto& el : *j.m_data.m_value.object)
+                {
+                    write_msgpack(el.first);
+                    write_msgpack(el.second);
+                }
+                break;
+            }
+
+            case value_t::discarded:
+            default:
+                break;
+        }
+    }
+
+    /*!
+    @param[in] j  JSON value to serialize
+    @param[in] use_count   whether to use '#' prefixes (optimized format)
+    @param[in] use_type    whether to use '$' prefixes (optimized format)
+    @param[in] add_prefix  whether prefixes need to be used for this value
+    @param[in] use_bjdata  whether write in BJData format, default is false
+    @param[in] bjdata_version  which BJData version to use, default is draft2
+    */
+    void write_ubjson(const BasicJsonType& j, const bool use_count,
+                      const bool use_type, const bool add_prefix = true,
+                      const bool use_bjdata = false, const bjdata_version_t bjdata_version = bjdata_version_t::draft2)
+    {
+        const bool bjdata_draft3 = use_bjdata && bjdata_version == bjdata_version_t::draft3;
+
+        switch (j.type())
+        {
+            case value_t::null:
+            {
+                if (add_prefix)
+                {
+                    oa->write_character(to_char_type('Z'));
+                }
+                break;
+            }
+
+            case value_t::boolean:
+            {
+                if (add_prefix)
+                {
+                    oa->write_character(j.m_data.m_value.boolean
+                                        ? to_char_type('T')
+                                        : to_char_type('F'));
+                }
+                break;
+            }
+
+            case value_t::number_integer:
+            {
+                write_number_with_ubjson_prefix(j.m_data.m_value.number_integer, add_prefix, use_bjdata);
+                break;
+            }
+
+            case value_t::number_unsigned:
+            {
+                write_number_with_ubjson_prefix(j.m_data.m_value.number_unsigned, add_prefix, use_bjdata);
+                break;
+            }
+
+            case value_t::number_float:
+            {
+                write_number_with_ubjson_prefix(j.m_data.m_value.number_float, add_prefix, use_bjdata);
+                break;
+            }
+
+            case value_t::string:
+            {
+                if (add_prefix)
+                {
+                    oa->write_character(to_char_type('S'));
+                }
+                write_number_with_ubjson_prefix(j.m_data.m_value.string->size(), true, use_bjdata);
+                oa->write_characters(
+                    reinterpret_cast<const CharType*>(j.m_data.m_value.string->c_str()),
+                    j.m_data.m_value.string->size());
+                break;
+            }
+
+            case value_t::array:
+            {
+                if (add_prefix)
+                {
+                    oa->write_character(to_char_type('['));
+                }
+
+                bool prefix_required = true;
+                if (use_type && !j.m_data.m_value.array->empty())
+                {
+                    JSON_ASSERT(use_count);
+                    const CharType first_prefix = ubjson_prefix(j.front(), use_bjdata);
+                    const bool same_prefix = std::all_of(j.begin() + 1, j.end(),
+                                                         [this, first_prefix, use_bjdata](const BasicJsonType & v)
+                    {
+                        return ubjson_prefix(v, use_bjdata) == first_prefix;
+                    });
+
+                    std::vector<CharType> bjdx = {'[', '{', 'S', 'H', 'T', 'F', 'N', 'Z'}; // excluded markers in bjdata optimized type
+
+                    if (same_prefix && !(use_bjdata && std::find(bjdx.begin(), bjdx.end(), first_prefix) != bjdx.end()))
+                    {
+                        prefix_required = false;
+                        oa->write_character(to_char_type('$'));
+                        oa->write_character(first_prefix);
+                    }
+                }
+
+                if (use_count)
+                {
+                    oa->write_character(to_char_type('#'));
+                    write_number_with_ubjson_prefix(j.m_data.m_value.array->size(), true, use_bjdata);
+                }
+
+                for (const auto& el : *j.m_data.m_value.array)
+                {
+                    write_ubjson(el, use_count, use_type, prefix_required, use_bjdata, bjdata_version);
+                }
+
+                if (!use_count)
+                {
+                    oa->write_character(to_char_type(']'));
+                }
+
+                break;
+            }
+
+            case value_t::binary:
+            {
+                if (add_prefix)
+                {
+                    oa->write_character(to_char_type('['));
+                }
+
+                if (use_type && (bjdata_draft3 || !j.m_data.m_value.binary->empty()))
+                {
+                    JSON_ASSERT(use_count);
+                    oa->write_character(to_char_type('$'));
+                    oa->write_character(bjdata_draft3 ? 'B' : 'U');
+                }
+
+                if (use_count)
+                {
+                    oa->write_character(to_char_type('#'));
+                    write_number_with_ubjson_prefix(j.m_data.m_value.binary->size(), true, use_bjdata);
+                }
+
+                if (use_type)
+                {
+                    oa->write_characters(
+                        reinterpret_cast<const CharType*>(j.m_data.m_value.binary->data()),
+                        j.m_data.m_value.binary->size());
+                }
+                else
+                {
+                    for (size_t i = 0; i < j.m_data.m_value.binary->size(); ++i)
+                    {
+                        oa->write_character(to_char_type(bjdata_draft3 ? 'B' : 'U'));
+                        oa->write_character(j.m_data.m_value.binary->data()[i]);
+                    }
+                }
+
+                if (!use_count)
+                {
+                    oa->write_character(to_char_type(']'));
+                }
+
+                break;
+            }
+
+            case value_t::object:
+            {
+                if (use_bjdata && j.m_data.m_value.object->size() == 3 && j.m_data.m_value.object->find("_ArrayType_") != j.m_data.m_value.object->end() && j.m_data.m_value.object->find("_ArraySize_") != j.m_data.m_value.object->end() && j.m_data.m_value.object->find("_ArrayData_") != j.m_data.m_value.object->end())
+                {
+                    if (!write_bjdata_ndarray(*j.m_data.m_value.object, use_count, use_type, bjdata_version))  // decode bjdata ndarray in the JData format (https://github.com/NeuroJSON/jdata)
+                    {
+                        break;
+                    }
+                }
+
+                if (add_prefix)
+                {
+                    oa->write_character(to_char_type('{'));
+                }
+
+                bool prefix_required = true;
+                if (use_type && !j.m_data.m_value.object->empty())
+                {
+                    JSON_ASSERT(use_count);
+                    const CharType first_prefix = ubjson_prefix(j.front(), use_bjdata);
+                    const bool same_prefix = std::all_of(j.begin(), j.end(),
+                                                         [this, first_prefix, use_bjdata](const BasicJsonType & v)
+                    {
+                        return ubjson_prefix(v, use_bjdata) == first_prefix;
+                    });
+
+                    std::vector<CharType> bjdx = {'[', '{', 'S', 'H', 'T', 'F', 'N', 'Z'}; // excluded markers in bjdata optimized type
+
+                    if (same_prefix && !(use_bjdata && std::find(bjdx.begin(), bjdx.end(), first_prefix) != bjdx.end()))
+                    {
+                        prefix_required = false;
+                        oa->write_character(to_char_type('$'));
+                        oa->write_character(first_prefix);
+                    }
+                }
+
+                if (use_count)
+                {
+                    oa->write_character(to_char_type('#'));
+                    write_number_with_ubjson_prefix(j.m_data.m_value.object->size(), true, use_bjdata);
+                }
+
+                for (const auto& el : *j.m_data.m_value.object)
+                {
+                    write_number_with_ubjson_prefix(el.first.size(), true, use_bjdata);
+                    oa->write_characters(
+                        reinterpret_cast<const CharType*>(el.first.c_str()),
+                        el.first.size());
+                    write_ubjson(el.second, use_count, use_type, prefix_required, use_bjdata, bjdata_version);
+                }
+
+                if (!use_count)
+                {
+                    oa->write_character(to_char_type('}'));
+                }
+
+                break;
+            }
+
+            case value_t::discarded:
+            default:
+                break;
+        }
+    }
+
+  private:
+    //////////
+    // BSON //
+    //////////
+
+    /*!
+    @return The size of a BSON document entry header, including the id marker
+            and the entry name size (and its null-terminator).
+    */
+    static std::size_t calc_bson_entry_header_size(const string_t& name, const BasicJsonType& j)
+    {
+        const auto it = name.find(static_cast<typename string_t::value_type>(0));
+        if (JSON_HEDLEY_UNLIKELY(it != BasicJsonType::string_t::npos))
+        {
+            JSON_THROW(out_of_range::create(409, concat("BSON key cannot contain code point U+0000 (at byte ", std::to_string(it), ")"), &j));
+            static_cast<void>(j);
+        }
+
+        return /*id*/ 1ul + name.size() + /*zero-terminator*/1u;
+    }
+
+    /*!
+    @brief Writes the given @a element_type and @a name to the output adapter
+    */
+    void write_bson_entry_header(const string_t& name,
+                                 const std::uint8_t element_type)
+    {
+        oa->write_character(to_char_type(element_type)); // boolean
+        oa->write_characters(
+            reinterpret_cast<const CharType*>(name.c_str()),
+            name.size() + 1u);
+    }
+
+    /*!
+    @brief Writes a BSON element with key @a name and boolean value @a value
+    */
+    void write_bson_boolean(const string_t& name,
+                            const bool value)
+    {
+        write_bson_entry_header(name, 0x08);
+        oa->write_character(value ? to_char_type(0x01) : to_char_type(0x00));
+    }
+
+    /*!
+    @brief Writes a BSON element with key @a name and double value @a value
+    */
+    void write_bson_double(const string_t& name,
+                           const double value)
+    {
+        write_bson_entry_header(name, 0x01);
+        write_number<double>(value, true);
+    }
+
+    /*!
+    @return The size of the BSON-encoded string in @a value
+    */
+    static std::size_t calc_bson_string_size(const string_t& value)
+    {
+        return sizeof(std::int32_t) + value.size() + 1ul;
+    }
+
+    /*!
+    @brief Writes a BSON element with key @a name and string value @a value
+    */
+    void write_bson_string(const string_t& name,
+                           const string_t& value)
+    {
+        write_bson_entry_header(name, 0x02);
+
+        write_number<std::int32_t>(static_cast<std::int32_t>(value.size() + 1ul), true);
+        oa->write_characters(
+            reinterpret_cast<const CharType*>(value.c_str()),
+            value.size() + 1);
+    }
+
+    /*!
+    @brief Writes a BSON element with key @a name and null value
+    */
+    void write_bson_null(const string_t& name)
+    {
+        write_bson_entry_header(name, 0x0A);
+    }
+
+    /*!
+    @return The size of the BSON-encoded integer @a value
+    */
+    static std::size_t calc_bson_integer_size(const std::int64_t value)
+    {
+        return (std::numeric_limits<std::int32_t>::min)() <= value && value <= (std::numeric_limits<std::int32_t>::max)()
+               ? sizeof(std::int32_t)
+               : sizeof(std::int64_t);
+    }
+
+    /*!
+    @brief Writes a BSON element with key @a name and integer @a value
+    */
+    void write_bson_integer(const string_t& name,
+                            const std::int64_t value)
+    {
+        if ((std::numeric_limits<std::int32_t>::min)() <= value && value <= (std::numeric_limits<std::int32_t>::max)())
+        {
+            write_bson_entry_header(name, 0x10); // int32
+            write_number<std::int32_t>(static_cast<std::int32_t>(value), true);
+        }
+        else
+        {
+            write_bson_entry_header(name, 0x12); // int64
+            write_number<std::int64_t>(static_cast<std::int64_t>(value), true);
+        }
+    }
+
+    /*!
+    @return The size of the BSON-encoded unsigned integer in @a j
+    */
+    static constexpr std::size_t calc_bson_unsigned_size(const std::uint64_t value) noexcept
+    {
+        return (value <= static_cast<std::uint64_t>((std::numeric_limits<std::int32_t>::max)()))
+               ? sizeof(std::int32_t)
+               : sizeof(std::int64_t);
+    }
+
+    /*!
+    @brief Writes a BSON element with key @a name and unsigned @a value
+    */
+    void write_bson_unsigned(const string_t& name,
+                             const BasicJsonType& j)
+    {
+        if (j.m_data.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::int32_t>::max)()))
+        {
+            write_bson_entry_header(name, 0x10 /* int32 */);
+            write_number<std::int32_t>(static_cast<std::int32_t>(j.m_data.m_value.number_unsigned), true);
+        }
+        else if (j.m_data.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::int64_t>::max)()))
+        {
+            write_bson_entry_header(name, 0x12 /* int64 */);
+            write_number<std::int64_t>(static_cast<std::int64_t>(j.m_data.m_value.number_unsigned), true);
+        }
+        else
+        {
+            write_bson_entry_header(name, 0x11 /* uint64 */);
+            write_number<std::uint64_t>(static_cast<std::uint64_t>(j.m_data.m_value.number_unsigned), true);
+        }
+    }
+
+    /*!
+    @brief Writes a BSON element with key @a name and object @a value
+    */
+    void write_bson_object_entry(const string_t& name,
+                                 const typename BasicJsonType::object_t& value)
+    {
+        write_bson_entry_header(name, 0x03); // object
+        write_bson_object(value);
+    }
+
+    /*!
+    @return The size of the BSON-encoded array @a value
+    */
+    static std::size_t calc_bson_array_size(const typename BasicJsonType::array_t& value)
+    {
+        std::size_t array_index = 0ul;
+
+        const std::size_t embedded_document_size = std::accumulate(std::begin(value), std::end(value), static_cast<std::size_t>(0), [&array_index](std::size_t result, const typename BasicJsonType::array_t::value_type & el)
+        {
+            return result + calc_bson_element_size(std::to_string(array_index++), el);
+        });
+
+        return sizeof(std::int32_t) + embedded_document_size + 1ul;
+    }
+
+    /*!
+    @return The size of the BSON-encoded binary array @a value
+    */
+    static std::size_t calc_bson_binary_size(const typename BasicJsonType::binary_t& value)
+    {
+        return sizeof(std::int32_t) + value.size() + 1ul;
+    }
+
+    /*!
+    @brief Writes a BSON element with key @a name and array @a value
+    */
+    void write_bson_array(const string_t& name,
+                          const typename BasicJsonType::array_t& value)
+    {
+        write_bson_entry_header(name, 0x04); // array
+        write_number<std::int32_t>(static_cast<std::int32_t>(calc_bson_array_size(value)), true);
+
+        std::size_t array_index = 0ul;
+
+        for (const auto& el : value)
+        {
+            write_bson_element(std::to_string(array_index++), el);
+        }
+
+        oa->write_character(to_char_type(0x00));
+    }
+
+    /*!
+    @brief Writes a BSON element with key @a name and binary value @a value
+    */
+    void write_bson_binary(const string_t& name,
+                           const binary_t& value)
+    {
+        write_bson_entry_header(name, 0x05);
+
+        write_number<std::int32_t>(static_cast<std::int32_t>(value.size()), true);
+        write_number(value.has_subtype() ? static_cast<std::uint8_t>(value.subtype()) : static_cast<std::uint8_t>(0x00));
+
+        oa->write_characters(reinterpret_cast<const CharType*>(value.data()), value.size());
+    }
+
+    /*!
+    @brief Calculates the size necessary to serialize the JSON value @a j with its @a name
+    @return The calculated size for the BSON document entry for @a j with the given @a name.
+    */
+    static std::size_t calc_bson_element_size(const string_t& name,
+            const BasicJsonType& j)
+    {
+        const auto header_size = calc_bson_entry_header_size(name, j);
+        switch (j.type())
+        {
+            case value_t::object:
+                return header_size + calc_bson_object_size(*j.m_data.m_value.object);
+
+            case value_t::array:
+                return header_size + calc_bson_array_size(*j.m_data.m_value.array);
+
+            case value_t::binary:
+                return header_size + calc_bson_binary_size(*j.m_data.m_value.binary);
+
+            case value_t::boolean:
+                return header_size + 1ul;
+
+            case value_t::number_float:
+                return header_size + 8ul;
+
+            case value_t::number_integer:
+                return header_size + calc_bson_integer_size(j.m_data.m_value.number_integer);
+
+            case value_t::number_unsigned:
+                return header_size + calc_bson_unsigned_size(j.m_data.m_value.number_unsigned);
+
+            case value_t::string:
+                return header_size + calc_bson_string_size(*j.m_data.m_value.string);
+
+            case value_t::null:
+                return header_size + 0ul;
+
+            // LCOV_EXCL_START
+            case value_t::discarded:
+            default:
+                JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert)
+                return 0ul;
+                // LCOV_EXCL_STOP
+        }
+    }
+
+    /*!
+    @brief Serializes the JSON value @a j to BSON and associates it with the
+           key @a name.
+    @param name The name to associate with the JSON entity @a j within the
+                current BSON document
+    */
+    void write_bson_element(const string_t& name,
+                            const BasicJsonType& j)
+    {
+        switch (j.type())
+        {
+            case value_t::object:
+                return write_bson_object_entry(name, *j.m_data.m_value.object);
+
+            case value_t::array:
+                return write_bson_array(name, *j.m_data.m_value.array);
+
+            case value_t::binary:
+                return write_bson_binary(name, *j.m_data.m_value.binary);
+
+            case value_t::boolean:
+                return write_bson_boolean(name, j.m_data.m_value.boolean);
+
+            case value_t::number_float:
+                return write_bson_double(name, j.m_data.m_value.number_float);
+
+            case value_t::number_integer:
+                return write_bson_integer(name, j.m_data.m_value.number_integer);
+
+            case value_t::number_unsigned:
+                return write_bson_unsigned(name, j);
+
+            case value_t::string:
+                return write_bson_string(name, *j.m_data.m_value.string);
+
+            case value_t::null:
+                return write_bson_null(name);
+
+            // LCOV_EXCL_START
+            case value_t::discarded:
+            default:
+                JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert)
+                return;
+                // LCOV_EXCL_STOP
+        }
+    }
+
+    /*!
+    @brief Calculates the size of the BSON serialization of the given
+           JSON-object @a j.
+    @param[in] value  JSON value to serialize
+    @pre       value.type() == value_t::object
+    */
+    static std::size_t calc_bson_object_size(const typename BasicJsonType::object_t& value)
+    {
+        const std::size_t document_size = std::accumulate(value.begin(), value.end(), static_cast<std::size_t>(0),
+                                          [](size_t result, const typename BasicJsonType::object_t::value_type & el)
+        {
+            return result += calc_bson_element_size(el.first, el.second);
+        });
+
+        return sizeof(std::int32_t) + document_size + 1ul;
+    }
+
+    /*!
+    @param[in] value  JSON value to serialize
+    @pre       value.type() == value_t::object
+    */
+    void write_bson_object(const typename BasicJsonType::object_t& value)
+    {
+        write_number<std::int32_t>(static_cast<std::int32_t>(calc_bson_object_size(value)), true);
+
+        for (const auto& el : value)
+        {
+            write_bson_element(el.first, el.second);
+        }
+
+        oa->write_character(to_char_type(0x00));
+    }
+
+    //////////
+    // CBOR //
+    //////////
+
+    static constexpr CharType get_cbor_float_prefix(float /*unused*/)
+    {
+        return to_char_type(0xFA);  // Single-Precision Float
+    }
+
+    static constexpr CharType get_cbor_float_prefix(double /*unused*/)
+    {
+        return to_char_type(0xFB);  // Double-Precision Float
+    }
+
+    /////////////
+    // MsgPack //
+    /////////////
+
+    static constexpr CharType get_msgpack_float_prefix(float /*unused*/)
+    {
+        return to_char_type(0xCA);  // float 32
+    }
+
+    static constexpr CharType get_msgpack_float_prefix(double /*unused*/)
+    {
+        return to_char_type(0xCB);  // float 64
+    }
+
+    ////////////
+    // UBJSON //
+    ////////////
+
+    // UBJSON: write number (floating point)
+    template<typename NumberType, typename std::enable_if<
+                 std::is_floating_point<NumberType>::value, int>::type = 0>
+    void write_number_with_ubjson_prefix(const NumberType n,
+                                         const bool add_prefix,
+                                         const bool use_bjdata)
+    {
+        if (add_prefix)
+        {
+            oa->write_character(get_ubjson_float_prefix(n));
+        }
+        write_number(n, use_bjdata);
+    }
+
+    // UBJSON: write number (unsigned integer)
+    template<typename NumberType, typename std::enable_if<
+                 std::is_unsigned<NumberType>::value, int>::type = 0>
+    void write_number_with_ubjson_prefix(const NumberType n,
+                                         const bool add_prefix,
+                                         const bool use_bjdata)
+    {
+        if (n <= static_cast<std::uint64_t>((std::numeric_limits<std::int8_t>::max)()))
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('i'));  // int8
+            }
+            write_number(static_cast<std::uint8_t>(n), use_bjdata);
+        }
+        else if (n <= (std::numeric_limits<std::uint8_t>::max)())
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('U'));  // uint8
+            }
+            write_number(static_cast<std::uint8_t>(n), use_bjdata);
+        }
+        else if (n <= static_cast<std::uint64_t>((std::numeric_limits<std::int16_t>::max)()))
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('I'));  // int16
+            }
+            write_number(static_cast<std::int16_t>(n), use_bjdata);
+        }
+        else if (use_bjdata && n <= static_cast<uint64_t>((std::numeric_limits<uint16_t>::max)()))
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('u'));  // uint16 - bjdata only
+            }
+            write_number(static_cast<std::uint16_t>(n), use_bjdata);
+        }
+        else if (n <= static_cast<std::uint64_t>((std::numeric_limits<std::int32_t>::max)()))
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('l'));  // int32
+            }
+            write_number(static_cast<std::int32_t>(n), use_bjdata);
+        }
+        else if (use_bjdata && n <= static_cast<uint64_t>((std::numeric_limits<uint32_t>::max)()))
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('m'));  // uint32 - bjdata only
+            }
+            write_number(static_cast<std::uint32_t>(n), use_bjdata);
+        }
+        else if (n <= static_cast<std::uint64_t>((std::numeric_limits<std::int64_t>::max)()))
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('L'));  // int64
+            }
+            write_number(static_cast<std::int64_t>(n), use_bjdata);
+        }
+        else if (use_bjdata && n <= (std::numeric_limits<uint64_t>::max)())
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('M'));  // uint64 - bjdata only
+            }
+            write_number(static_cast<std::uint64_t>(n), use_bjdata);
+        }
+        else
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('H'));  // high-precision number
+            }
+
+            const auto number = BasicJsonType(n).dump();
+            write_number_with_ubjson_prefix(number.size(), true, use_bjdata);
+            for (std::size_t i = 0; i < number.size(); ++i)
+            {
+                oa->write_character(to_char_type(static_cast<std::uint8_t>(number[i])));
+            }
+        }
+    }
+
+    // UBJSON: write number (signed integer)
+    template < typename NumberType, typename std::enable_if <
+                   std::is_signed<NumberType>::value&&
+                   !std::is_floating_point<NumberType>::value, int >::type = 0 >
+    void write_number_with_ubjson_prefix(const NumberType n,
+                                         const bool add_prefix,
+                                         const bool use_bjdata)
+    {
+        if ((std::numeric_limits<std::int8_t>::min)() <= n && n <= (std::numeric_limits<std::int8_t>::max)())
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('i'));  // int8
+            }
+            write_number(static_cast<std::int8_t>(n), use_bjdata);
+        }
+        else if (static_cast<std::int64_t>((std::numeric_limits<std::uint8_t>::min)()) <= n && n <= static_cast<std::int64_t>((std::numeric_limits<std::uint8_t>::max)()))
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('U'));  // uint8
+            }
+            write_number(static_cast<std::uint8_t>(n), use_bjdata);
+        }
+        else if ((std::numeric_limits<std::int16_t>::min)() <= n && n <= (std::numeric_limits<std::int16_t>::max)())
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('I'));  // int16
+            }
+            write_number(static_cast<std::int16_t>(n), use_bjdata);
+        }
+        else if (use_bjdata && (static_cast<std::int64_t>((std::numeric_limits<std::uint16_t>::min)()) <= n && n <= static_cast<std::int64_t>((std::numeric_limits<std::uint16_t>::max)())))
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('u'));  // uint16 - bjdata only
+            }
+            write_number(static_cast<uint16_t>(n), use_bjdata);
+        }
+        else if ((std::numeric_limits<std::int32_t>::min)() <= n && n <= (std::numeric_limits<std::int32_t>::max)())
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('l'));  // int32
+            }
+            write_number(static_cast<std::int32_t>(n), use_bjdata);
+        }
+        else if (use_bjdata && (static_cast<std::int64_t>((std::numeric_limits<std::uint32_t>::min)()) <= n && n <= static_cast<std::int64_t>((std::numeric_limits<std::uint32_t>::max)())))
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('m'));  // uint32 - bjdata only
+            }
+            write_number(static_cast<uint32_t>(n), use_bjdata);
+        }
+        else if ((std::numeric_limits<std::int64_t>::min)() <= n && n <= (std::numeric_limits<std::int64_t>::max)())
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('L'));  // int64
+            }
+            write_number(static_cast<std::int64_t>(n), use_bjdata);
+        }
+        // LCOV_EXCL_START
+        else
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('H'));  // high-precision number
+            }
+
+            const auto number = BasicJsonType(n).dump();
+            write_number_with_ubjson_prefix(number.size(), true, use_bjdata);
+            for (std::size_t i = 0; i < number.size(); ++i)
+            {
+                oa->write_character(to_char_type(static_cast<std::uint8_t>(number[i])));
+            }
+        }
+        // LCOV_EXCL_STOP
+    }
+
+    /*!
+    @brief determine the type prefix of container values
+    */
+    CharType ubjson_prefix(const BasicJsonType& j, const bool use_bjdata) const noexcept
+    {
+        switch (j.type())
+        {
+            case value_t::null:
+                return 'Z';
+
+            case value_t::boolean:
+                return j.m_data.m_value.boolean ? 'T' : 'F';
+
+            case value_t::number_integer:
+            {
+                if ((std::numeric_limits<std::int8_t>::min)() <= j.m_data.m_value.number_integer && j.m_data.m_value.number_integer <= (std::numeric_limits<std::int8_t>::max)())
+                {
+                    return 'i';
+                }
+                if ((std::numeric_limits<std::uint8_t>::min)() <= j.m_data.m_value.number_integer && j.m_data.m_value.number_integer <= (std::numeric_limits<std::uint8_t>::max)())
+                {
+                    return 'U';
+                }
+                if ((std::numeric_limits<std::int16_t>::min)() <= j.m_data.m_value.number_integer && j.m_data.m_value.number_integer <= (std::numeric_limits<std::int16_t>::max)())
+                {
+                    return 'I';
+                }
+                if (use_bjdata && ((std::numeric_limits<std::uint16_t>::min)() <= j.m_data.m_value.number_integer && j.m_data.m_value.number_integer <= (std::numeric_limits<std::uint16_t>::max)()))
+                {
+                    return 'u';
+                }
+                if ((std::numeric_limits<std::int32_t>::min)() <= j.m_data.m_value.number_integer && j.m_data.m_value.number_integer <= (std::numeric_limits<std::int32_t>::max)())
+                {
+                    return 'l';
+                }
+                if (use_bjdata && ((std::numeric_limits<std::uint32_t>::min)() <= j.m_data.m_value.number_integer && j.m_data.m_value.number_integer <= (std::numeric_limits<std::uint32_t>::max)()))
+                {
+                    return 'm';
+                }
+                if ((std::numeric_limits<std::int64_t>::min)() <= j.m_data.m_value.number_integer && j.m_data.m_value.number_integer <= (std::numeric_limits<std::int64_t>::max)())
+                {
+                    return 'L';
+                }
+                // anything else is treated as high-precision number
+                return 'H'; // LCOV_EXCL_LINE
+            }
+
+            case value_t::number_unsigned:
+            {
+                if (j.m_data.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::int8_t>::max)()))
+                {
+                    return 'i';
+                }
+                if (j.m_data.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::uint8_t>::max)()))
+                {
+                    return 'U';
+                }
+                if (j.m_data.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::int16_t>::max)()))
+                {
+                    return 'I';
+                }
+                if (use_bjdata && j.m_data.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::uint16_t>::max)()))
+                {
+                    return 'u';
+                }
+                if (j.m_data.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::int32_t>::max)()))
+                {
+                    return 'l';
+                }
+                if (use_bjdata && j.m_data.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::uint32_t>::max)()))
+                {
+                    return 'm';
+                }
+                if (j.m_data.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::int64_t>::max)()))
+                {
+                    return 'L';
+                }
+                if (use_bjdata && j.m_data.m_value.number_unsigned <= (std::numeric_limits<std::uint64_t>::max)())
+                {
+                    return 'M';
+                }
+                // anything else is treated as high-precision number
+                return 'H'; // LCOV_EXCL_LINE
+            }
+
+            case value_t::number_float:
+                return get_ubjson_float_prefix(j.m_data.m_value.number_float);
+
+            case value_t::string:
+                return 'S';
+
+            case value_t::array: // fallthrough
+            case value_t::binary:
+                return '[';
+
+            case value_t::object:
+                return '{';
+
+            case value_t::discarded:
+            default:  // discarded values
+                return 'N';
+        }
+    }
+
+    static constexpr CharType get_ubjson_float_prefix(float /*unused*/)
+    {
+        return 'd';  // float 32
+    }
+
+    static constexpr CharType get_ubjson_float_prefix(double /*unused*/)
+    {
+        return 'D';  // float 64
+    }
+
+    /*!
+    @return false if the object is successfully converted to a bjdata ndarray, true if the type or size is invalid
+    */
+    bool write_bjdata_ndarray(const typename BasicJsonType::object_t& value, const bool use_count, const bool use_type, const bjdata_version_t bjdata_version)
+    {
+        std::map<string_t, CharType> bjdtype = {{"uint8", 'U'},  {"int8", 'i'},  {"uint16", 'u'}, {"int16", 'I'},
+            {"uint32", 'm'}, {"int32", 'l'}, {"uint64", 'M'}, {"int64", 'L'}, {"single", 'd'}, {"double", 'D'},
+            {"char", 'C'}, {"byte", 'B'}
+        };
+
+        string_t key = "_ArrayType_";
+        auto it = bjdtype.find(static_cast<string_t>(value.at(key)));
+        if (it == bjdtype.end())
+        {
+            return true;
+        }
+        CharType dtype = it->second;
+
+        key = "_ArraySize_";
+        std::size_t len = (value.at(key).empty() ? 0 : 1);
+        for (const auto& el : value.at(key))
+        {
+            len *= static_cast<std::size_t>(el.m_data.m_value.number_unsigned);
+        }
+
+        key = "_ArrayData_";
+        if (value.at(key).size() != len)
+        {
+            return true;
+        }
+
+        oa->write_character('[');
+        oa->write_character('$');
+        oa->write_character(dtype);
+        oa->write_character('#');
+
+        key = "_ArraySize_";
+        write_ubjson(value.at(key), use_count, use_type, true,  true, bjdata_version);
+
+        key = "_ArrayData_";
+        if (dtype == 'U' || dtype == 'C' || dtype == 'B')
+        {
+            for (const auto& el : value.at(key))
+            {
+                write_number(static_cast<std::uint8_t>(el.m_data.m_value.number_unsigned), true);
+            }
+        }
+        else if (dtype == 'i')
+        {
+            for (const auto& el : value.at(key))
+            {
+                write_number(static_cast<std::int8_t>(el.m_data.m_value.number_integer), true);
+            }
+        }
+        else if (dtype == 'u')
+        {
+            for (const auto& el : value.at(key))
+            {
+                write_number(static_cast<std::uint16_t>(el.m_data.m_value.number_unsigned), true);
+            }
+        }
+        else if (dtype == 'I')
+        {
+            for (const auto& el : value.at(key))
+            {
+                write_number(static_cast<std::int16_t>(el.m_data.m_value.number_integer), true);
+            }
+        }
+        else if (dtype == 'm')
+        {
+            for (const auto& el : value.at(key))
+            {
+                write_number(static_cast<std::uint32_t>(el.m_data.m_value.number_unsigned), true);
+            }
+        }
+        else if (dtype == 'l')
+        {
+            for (const auto& el : value.at(key))
+            {
+                write_number(static_cast<std::int32_t>(el.m_data.m_value.number_integer), true);
+            }
+        }
+        else if (dtype == 'M')
+        {
+            for (const auto& el : value.at(key))
+            {
+                write_number(static_cast<std::uint64_t>(el.m_data.m_value.number_unsigned), true);
+            }
+        }
+        else if (dtype == 'L')
+        {
+            for (const auto& el : value.at(key))
+            {
+                write_number(static_cast<std::int64_t>(el.m_data.m_value.number_integer), true);
+            }
+        }
+        else if (dtype == 'd')
+        {
+            for (const auto& el : value.at(key))
+            {
+                write_number(static_cast<float>(el.m_data.m_value.number_float), true);
+            }
+        }
+        else if (dtype == 'D')
+        {
+            for (const auto& el : value.at(key))
+            {
+                write_number(static_cast<double>(el.m_data.m_value.number_float), true);
+            }
+        }
+        return false;
+    }
+
+    ///////////////////////
+    // Utility functions //
+    ///////////////////////
+
+    /*
+    @brief write a number to output input
+    @param[in] n number of type @a NumberType
+    @param[in] OutputIsLittleEndian Set to true if output data is
+                                 required to be little endian
+    @tparam NumberType the type of the number
+
+    @note This function needs to respect the system's endianness, because bytes
+          in CBOR, MessagePack, and UBJSON are stored in network order (big
+          endian) and therefore need reordering on little endian systems.
+          On the other hand, BSON and BJData use little endian and should reorder
+          on big endian systems.
+    */
+    template<typename NumberType>
+    void write_number(const NumberType n, const bool OutputIsLittleEndian = false)
+    {
+        // step 1: write number to array of length NumberType
+        std::array<CharType, sizeof(NumberType)> vec{};
+        std::memcpy(vec.data(), &n, sizeof(NumberType));
+
+        // step 2: write array to output (with possible reordering)
+        if (is_little_endian != OutputIsLittleEndian)
+        {
+            // reverse byte order prior to conversion if necessary
+            std::reverse(vec.begin(), vec.end());
+        }
+
+        oa->write_characters(vec.data(), sizeof(NumberType));
+    }
+
+    void write_compact_float(const number_float_t n, detail::input_format_t format)
+    {
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wfloat-equal"
+#endif
+        if (static_cast<double>(n) >= static_cast<double>(std::numeric_limits<float>::lowest()) &&
+                static_cast<double>(n) <= static_cast<double>((std::numeric_limits<float>::max)()) &&
+                static_cast<double>(static_cast<float>(n)) == static_cast<double>(n))
+        {
+            oa->write_character(format == detail::input_format_t::cbor
+                                ? get_cbor_float_prefix(static_cast<float>(n))
+                                : get_msgpack_float_prefix(static_cast<float>(n)));
+            write_number(static_cast<float>(n));
+        }
+        else
+        {
+            oa->write_character(format == detail::input_format_t::cbor
+                                ? get_cbor_float_prefix(n)
+                                : get_msgpack_float_prefix(n));
+            write_number(n);
+        }
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
+    }
+
+  public:
+    // The following to_char_type functions are implement the conversion
+    // between uint8_t and CharType. In case CharType is not unsigned,
+    // such a conversion is required to allow values greater than 128.
+    // See <https://github.com/nlohmann/json/issues/1286> for a discussion.
+    template < typename C = CharType,
+               enable_if_t < std::is_signed<C>::value && std::is_signed<char>::value > * = nullptr >
+    static constexpr CharType to_char_type(std::uint8_t x) noexcept
+    {
+        return *reinterpret_cast<char*>(&x);
+    }
+
+    template < typename C = CharType,
+               enable_if_t < std::is_signed<C>::value && std::is_unsigned<char>::value > * = nullptr >
+    static CharType to_char_type(std::uint8_t x) noexcept
+    {
+        static_assert(sizeof(std::uint8_t) == sizeof(CharType), "size of CharType must be equal to std::uint8_t");
+        static_assert(std::is_trivial<CharType>::value, "CharType must be trivial");
+        CharType result;
+        std::memcpy(&result, &x, sizeof(x));
+        return result;
+    }
+
+    template<typename C = CharType,
+             enable_if_t<std::is_unsigned<C>::value>* = nullptr>
+    static constexpr CharType to_char_type(std::uint8_t x) noexcept
+    {
+        return x;
+    }
+
+    template < typename InputCharType, typename C = CharType,
+               enable_if_t <
+                   std::is_signed<C>::value &&
+                   std::is_signed<char>::value &&
+                   std::is_same<char, typename std::remove_cv<InputCharType>::type>::value
+                   > * = nullptr >
+    static constexpr CharType to_char_type(InputCharType x) noexcept
+    {
+        return x;
+    }
+
+  private:
+    /// whether we can assume little endianness
+    const bool is_little_endian = little_endianness();
+
+    /// the output
+    output_adapter_t<CharType> oa = nullptr;
+};
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/output/output_adapters.hpp>
+
+// #include <nlohmann/detail/output/serializer.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2008 - 2009 Björn Hoehrmann <bjoern@hoehrmann.de>
+// SPDX-FileCopyrightText: 2013 - 2025 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <algorithm> // reverse, remove, fill, find, none_of
+#include <array> // array
+#include <clocale> // localeconv, lconv
+#include <cmath> // labs, isfinite, isnan, signbit
+#include <cstddef> // size_t, ptrdiff_t
+#include <cstdint> // uint8_t
+#include <cstdio> // snprintf
+#include <limits> // numeric_limits
+#include <string> // string, char_traits
+#include <iomanip> // setfill, setw
+#include <type_traits> // is_same
+#include <utility> // move
+
+// #include <nlohmann/detail/conversions/to_chars.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2009 Florian Loitsch <https://florian.loitsch.com/>
+// SPDX-FileCopyrightText: 2013 - 2025 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <array> // array
+#include <cmath>   // signbit, isfinite
+#include <cstdint> // intN_t, uintN_t
+#include <cstring> // memcpy, memmove
+#include <limits> // numeric_limits
+#include <type_traits> // conditional
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+/*!
+@brief implements the Grisu2 algorithm for binary to decimal floating-point
+conversion.
+
+This implementation is a slightly modified version of the reference
+implementation which may be obtained from
+http://florian.loitsch.com/publications (bench.tar.gz).
+
+The code is distributed under the MIT license, Copyright (c) 2009 Florian Loitsch.
+
+For a detailed description of the algorithm see:
+
+[1] Loitsch, "Printing Floating-Point Numbers Quickly and Accurately with
+    Integers", Proceedings of the ACM SIGPLAN 2010 Conference on Programming
+    Language Design and Implementation, PLDI 2010
+[2] Burger, Dybvig, "Printing Floating-Point Numbers Quickly and Accurately",
+    Proceedings of the ACM SIGPLAN 1996 Conference on Programming Language
+    Design and Implementation, PLDI 1996
+*/
+namespace dtoa_impl
+{
+
+template<typename Target, typename Source>
+Target reinterpret_bits(const Source source)
+{
+    static_assert(sizeof(Target) == sizeof(Source), "size mismatch");
+
+    Target target;
+    std::memcpy(&target, &source, sizeof(Source));
+    return target;
+}
+
+struct diyfp // f * 2^e
+{
+    static constexpr int kPrecision = 64; // = q
+
+    std::uint64_t f = 0;
+    int e = 0;
+
+    constexpr diyfp(std::uint64_t f_, int e_) noexcept : f(f_), e(e_) {}
+
+    /*!
+    @brief returns x - y
+    @pre x.e == y.e and x.f >= y.f
+    */
+    static diyfp sub(const diyfp& x, const diyfp& y) noexcept
+    {
+        JSON_ASSERT(x.e == y.e);
+        JSON_ASSERT(x.f >= y.f);
+
+        return {x.f - y.f, x.e};
+    }
+
+    /*!
+    @brief returns x * y
+    @note The result is rounded. (Only the upper q bits are returned.)
+    */
+    static diyfp mul(const diyfp& x, const diyfp& y) noexcept
+    {
+        static_assert(kPrecision == 64, "internal error");
+
+        // Computes:
+        //  f = round((x.f * y.f) / 2^q)
+        //  e = x.e + y.e + q
+
+        // Emulate the 64-bit * 64-bit multiplication:
+        //
+        // p = u * v
+        //   = (u_lo + 2^32 u_hi) (v_lo + 2^32 v_hi)
+        //   = (u_lo v_lo         ) + 2^32 ((u_lo v_hi         ) + (u_hi v_lo         )) + 2^64 (u_hi v_hi         )
+        //   = (p0                ) + 2^32 ((p1                ) + (p2                )) + 2^64 (p3                )
+        //   = (p0_lo + 2^32 p0_hi) + 2^32 ((p1_lo + 2^32 p1_hi) + (p2_lo + 2^32 p2_hi)) + 2^64 (p3                )
+        //   = (p0_lo             ) + 2^32 (p0_hi + p1_lo + p2_lo                      ) + 2^64 (p1_hi + p2_hi + p3)
+        //   = (p0_lo             ) + 2^32 (Q                                          ) + 2^64 (H                 )
+        //   = (p0_lo             ) + 2^32 (Q_lo + 2^32 Q_hi                           ) + 2^64 (H                 )
+        //
+        // (Since Q might be larger than 2^32 - 1)
+        //
+        //   = (p0_lo + 2^32 Q_lo) + 2^64 (Q_hi + H)
+        //
+        // (Q_hi + H does not overflow a 64-bit int)
+        //
+        //   = p_lo + 2^64 p_hi
+
+        const std::uint64_t u_lo = x.f & 0xFFFFFFFFu;
+        const std::uint64_t u_hi = x.f >> 32u;
+        const std::uint64_t v_lo = y.f & 0xFFFFFFFFu;
+        const std::uint64_t v_hi = y.f >> 32u;
+
+        const std::uint64_t p0 = u_lo * v_lo;
+        const std::uint64_t p1 = u_lo * v_hi;
+        const std::uint64_t p2 = u_hi * v_lo;
+        const std::uint64_t p3 = u_hi * v_hi;
+
+        const std::uint64_t p0_hi = p0 >> 32u;
+        const std::uint64_t p1_lo = p1 & 0xFFFFFFFFu;
+        const std::uint64_t p1_hi = p1 >> 32u;
+        const std::uint64_t p2_lo = p2 & 0xFFFFFFFFu;
+        const std::uint64_t p2_hi = p2 >> 32u;
+
+        std::uint64_t Q = p0_hi + p1_lo + p2_lo;
+
+        // The full product might now be computed as
+        //
+        // p_hi = p3 + p2_hi + p1_hi + (Q >> 32)
+        // p_lo = p0_lo + (Q << 32)
+        //
+        // But in this particular case here, the full p_lo is not required.
+        // Effectively we only need to add the highest bit in p_lo to p_hi (and
+        // Q_hi + 1 does not overflow).
+
+        Q += std::uint64_t{1} << (64u - 32u - 1u); // round, ties up
+
+        const std::uint64_t h = p3 + p2_hi + p1_hi + (Q >> 32u);
+
+        return {h, x.e + y.e + 64};
+    }
+
+    /*!
+    @brief normalize x such that the significand is >= 2^(q-1)
+    @pre x.f != 0
+    */
+    static diyfp normalize(diyfp x) noexcept
+    {
+        JSON_ASSERT(x.f != 0);
+
+        while ((x.f >> 63u) == 0)
+        {
+            x.f <<= 1u;
+            x.e--;
+        }
+
+        return x;
+    }
+
+    /*!
+    @brief normalize x such that the result has the exponent E
+    @pre e >= x.e and the upper e - x.e bits of x.f must be zero.
+    */
+    static diyfp normalize_to(const diyfp& x, const int target_exponent) noexcept
+    {
+        const int delta = x.e - target_exponent;
+
+        JSON_ASSERT(delta >= 0);
+        JSON_ASSERT(((x.f << delta) >> delta) == x.f);
+
+        return {x.f << delta, target_exponent};
+    }
+};
+
+struct boundaries
+{
+    diyfp w;
+    diyfp minus;
+    diyfp plus;
+};
+
+/*!
+Compute the (normalized) diyfp representing the input number 'value' and its
+boundaries.
+
+@pre value must be finite and positive
+*/
+template<typename FloatType>
+boundaries compute_boundaries(FloatType value)
+{
+    JSON_ASSERT(std::isfinite(value));
+    JSON_ASSERT(value > 0);
+
+    // Convert the IEEE representation into a diyfp.
+    //
+    // If v is denormal:
+    //      value = 0.F * 2^(1 - bias) = (          F) * 2^(1 - bias - (p-1))
+    // If v is normalized:
+    //      value = 1.F * 2^(E - bias) = (2^(p-1) + F) * 2^(E - bias - (p-1))
+
+    static_assert(std::numeric_limits<FloatType>::is_iec559,
+                  "internal error: dtoa_short requires an IEEE-754 floating-point implementation");
+
+    constexpr int      kPrecision = std::numeric_limits<FloatType>::digits; // = p (includes the hidden bit)
+    constexpr int      kBias      = std::numeric_limits<FloatType>::max_exponent - 1 + (kPrecision - 1);
+    constexpr int      kMinExp    = 1 - kBias;
+    constexpr std::uint64_t kHiddenBit = std::uint64_t{1} << (kPrecision - 1); // = 2^(p-1)
+
+    using bits_type = typename std::conditional<kPrecision == 24, std::uint32_t, std::uint64_t >::type;
+
+    const auto bits = static_cast<std::uint64_t>(reinterpret_bits<bits_type>(value));
+    const std::uint64_t E = bits >> (kPrecision - 1);
+    const std::uint64_t F = bits & (kHiddenBit - 1);
+
+    const bool is_denormal = E == 0;
+    const diyfp v = is_denormal
+                    ? diyfp(F, kMinExp)
+                    : diyfp(F + kHiddenBit, static_cast<int>(E) - kBias);
+
+    // Compute the boundaries m- and m+ of the floating-point value
+    // v = f * 2^e.
+    //
+    // Determine v- and v+, the floating-point predecessor and successor if v,
+    // respectively.
+    //
+    //      v- = v - 2^e        if f != 2^(p-1) or e == e_min                (A)
+    //         = v - 2^(e-1)    if f == 2^(p-1) and e > e_min                (B)
+    //
+    //      v+ = v + 2^e
+    //
+    // Let m- = (v- + v) / 2 and m+ = (v + v+) / 2. All real numbers _strictly_
+    // between m- and m+ round to v, regardless of how the input rounding
+    // algorithm breaks ties.
+    //
+    //      ---+-------------+-------------+-------------+-------------+---  (A)
+    //         v-            m-            v             m+            v+
+    //
+    //      -----------------+------+------+-------------+-------------+---  (B)
+    //                       v-     m-     v             m+            v+
+
+    const bool lower_boundary_is_closer = F == 0 && E > 1;
+    const diyfp m_plus = diyfp((2 * v.f) + 1, v.e - 1);
+    const diyfp m_minus = lower_boundary_is_closer
+                          ? diyfp((4 * v.f) - 1, v.e - 2)  // (B)
+                          : diyfp((2 * v.f) - 1, v.e - 1); // (A)
+
+    // Determine the normalized w+ = m+.
+    const diyfp w_plus = diyfp::normalize(m_plus);
+
+    // Determine w- = m- such that e_(w-) = e_(w+).
+    const diyfp w_minus = diyfp::normalize_to(m_minus, w_plus.e);
+
+    return {diyfp::normalize(v), w_minus, w_plus};
+}
+
+// Given normalized diyfp w, Grisu needs to find a (normalized) cached
+// power-of-ten c, such that the exponent of the product c * w = f * 2^e lies
+// within a certain range [alpha, gamma] (Definition 3.2 from [1])
+//
+//      alpha <= e = e_c + e_w + q <= gamma
+//
+// or
+//
+//      f_c * f_w * 2^alpha <= f_c 2^(e_c) * f_w 2^(e_w) * 2^q
+//                          <= f_c * f_w * 2^gamma
+//
+// Since c and w are normalized, i.e. 2^(q-1) <= f < 2^q, this implies
+//
+//      2^(q-1) * 2^(q-1) * 2^alpha <= c * w * 2^q < 2^q * 2^q * 2^gamma
+//
+// or
+//
+//      2^(q - 2 + alpha) <= c * w < 2^(q + gamma)
+//
+// The choice of (alpha,gamma) determines the size of the table and the form of
+// the digit generation procedure. Using (alpha,gamma)=(-60,-32) works out well
+// in practice:
+//
+// The idea is to cut the number c * w = f * 2^e into two parts, which can be
+// processed independently: An integral part p1, and a fractional part p2:
+//
+//      f * 2^e = ( (f div 2^-e) * 2^-e + (f mod 2^-e) ) * 2^e
+//              = (f div 2^-e) + (f mod 2^-e) * 2^e
+//              = p1 + p2 * 2^e
+//
+// The conversion of p1 into decimal form requires a series of divisions and
+// modulos by (a power of) 10. These operations are faster for 32-bit than for
+// 64-bit integers, so p1 should ideally fit into a 32-bit integer. This can be
+// achieved by choosing
+//
+//      -e >= 32   or   e <= -32 := gamma
+//
+// In order to convert the fractional part
+//
+//      p2 * 2^e = p2 / 2^-e = d[-1] / 10^1 + d[-2] / 10^2 + ...
+//
+// into decimal form, the fraction is repeatedly multiplied by 10 and the digits
+// d[-i] are extracted in order:
+//
+//      (10 * p2) div 2^-e = d[-1]
+//      (10 * p2) mod 2^-e = d[-2] / 10^1 + ...
+//
+// The multiplication by 10 must not overflow. It is sufficient to choose
+//
+//      10 * p2 < 16 * p2 = 2^4 * p2 <= 2^64.
+//
+// Since p2 = f mod 2^-e < 2^-e,
+//
+//      -e <= 60   or   e >= -60 := alpha
+
+constexpr int kAlpha = -60;
+constexpr int kGamma = -32;
+
+struct cached_power // c = f * 2^e ~= 10^k
+{
+    std::uint64_t f;
+    int e;
+    int k;
+};
+
+/*!
+For a normalized diyfp w = f * 2^e, this function returns a (normalized) cached
+power-of-ten c = f_c * 2^e_c, such that the exponent of the product w * c
+satisfies (Definition 3.2 from [1])
+
+     alpha <= e_c + e + q <= gamma.
+*/
+inline cached_power get_cached_power_for_binary_exponent(int e)
+{
+    // Now
+    //
+    //      alpha <= e_c + e + q <= gamma                                    (1)
+    //      ==> f_c * 2^alpha <= c * 2^e * 2^q
+    //
+    // and since the c's are normalized, 2^(q-1) <= f_c,
+    //
+    //      ==> 2^(q - 1 + alpha) <= c * 2^(e + q)
+    //      ==> 2^(alpha - e - 1) <= c
+    //
+    // If c were an exact power of ten, i.e. c = 10^k, one may determine k as
+    //
+    //      k = ceil( log_10( 2^(alpha - e - 1) ) )
+    //        = ceil( (alpha - e - 1) * log_10(2) )
+    //
+    // From the paper:
+    // "In theory the result of the procedure could be wrong since c is rounded,
+    //  and the computation itself is approximated [...]. In practice, however,
+    //  this simple function is sufficient."
+    //
+    // For IEEE double precision floating-point numbers converted into
+    // normalized diyfp's w = f * 2^e, with q = 64,
+    //
+    //      e >= -1022      (min IEEE exponent)
+    //           -52        (p - 1)
+    //           -52        (p - 1, possibly normalize denormal IEEE numbers)
+    //           -11        (normalize the diyfp)
+    //         = -1137
+    //
+    // and
+    //
+    //      e <= +1023      (max IEEE exponent)
+    //           -52        (p - 1)
+    //           -11        (normalize the diyfp)
+    //         = 960
+    //
+    // This binary exponent range [-1137,960] results in a decimal exponent
+    // range [-307,324]. One does not need to store a cached power for each
+    // k in this range. For each such k it suffices to find a cached power
+    // such that the exponent of the product lies in [alpha,gamma].
+    // This implies that the difference of the decimal exponents of adjacent
+    // table entries must be less than or equal to
+    //
+    //      floor( (gamma - alpha) * log_10(2) ) = 8.
+    //
+    // (A smaller distance gamma-alpha would require a larger table.)
+
+    // NB:
+    // Actually this function returns c, such that -60 <= e_c + e + 64 <= -34.
+
+    constexpr int kCachedPowersMinDecExp = -300;
+    constexpr int kCachedPowersDecStep = 8;
+
+    static constexpr std::array<cached_power, 79> kCachedPowers =
+    {
+        {
+            { 0xAB70FE17C79AC6CA, -1060, -300 },
+            { 0xFF77B1FCBEBCDC4F, -1034, -292 },
+            { 0xBE5691EF416BD60C, -1007, -284 },
+            { 0x8DD01FAD907FFC3C,  -980, -276 },
+            { 0xD3515C2831559A83,  -954, -268 },
+            { 0x9D71AC8FADA6C9B5,  -927, -260 },
+            { 0xEA9C227723EE8BCB,  -901, -252 },
+            { 0xAECC49914078536D,  -874, -244 },
+            { 0x823C12795DB6CE57,  -847, -236 },
+            { 0xC21094364DFB5637,  -821, -228 },
+            { 0x9096EA6F3848984F,  -794, -220 },
+            { 0xD77485CB25823AC7,  -768, -212 },
+            { 0xA086CFCD97BF97F4,  -741, -204 },
+            { 0xEF340A98172AACE5,  -715, -196 },
+            { 0xB23867FB2A35B28E,  -688, -188 },
+            { 0x84C8D4DFD2C63F3B,  -661, -180 },
+            { 0xC5DD44271AD3CDBA,  -635, -172 },
+            { 0x936B9FCEBB25C996,  -608, -164 },
+            { 0xDBAC6C247D62A584,  -582, -156 },
+            { 0xA3AB66580D5FDAF6,  -555, -148 },
+            { 0xF3E2F893DEC3F126,  -529, -140 },
+            { 0xB5B5ADA8AAFF80B8,  -502, -132 },
+            { 0x87625F056C7C4A8B,  -475, -124 },
+            { 0xC9BCFF6034C13053,  -449, -116 },
+            { 0x964E858C91BA2655,  -422, -108 },
+            { 0xDFF9772470297EBD,  -396, -100 },
+            { 0xA6DFBD9FB8E5B88F,  -369,  -92 },
+            { 0xF8A95FCF88747D94,  -343,  -84 },
+            { 0xB94470938FA89BCF,  -316,  -76 },
+            { 0x8A08F0F8BF0F156B,  -289,  -68 },
+            { 0xCDB02555653131B6,  -263,  -60 },
+            { 0x993FE2C6D07B7FAC,  -236,  -52 },
+            { 0xE45C10C42A2B3B06,  -210,  -44 },
+            { 0xAA242499697392D3,  -183,  -36 },
+            { 0xFD87B5F28300CA0E,  -157,  -28 },
+            { 0xBCE5086492111AEB,  -130,  -20 },
+            { 0x8CBCCC096F5088CC,  -103,  -12 },
+            { 0xD1B71758E219652C,   -77,   -4 },
+            { 0x9C40000000000000,   -50,    4 },
+            { 0xE8D4A51000000000,   -24,   12 },
+            { 0xAD78EBC5AC620000,     3,   20 },
+            { 0x813F3978F8940984,    30,   28 },
+            { 0xC097CE7BC90715B3,    56,   36 },
+            { 0x8F7E32CE7BEA5C70,    83,   44 },
+            { 0xD5D238A4ABE98068,   109,   52 },
+            { 0x9F4F2726179A2245,   136,   60 },
+            { 0xED63A231D4C4FB27,   162,   68 },
+            { 0xB0DE65388CC8ADA8,   189,   76 },
+            { 0x83C7088E1AAB65DB,   216,   84 },
+            { 0xC45D1DF942711D9A,   242,   92 },
+            { 0x924D692CA61BE758,   269,  100 },
+            { 0xDA01EE641A708DEA,   295,  108 },
+            { 0xA26DA3999AEF774A,   322,  116 },
+            { 0xF209787BB47D6B85,   348,  124 },
+            { 0xB454E4A179DD1877,   375,  132 },
+            { 0x865B86925B9BC5C2,   402,  140 },
+            { 0xC83553C5C8965D3D,   428,  148 },
+            { 0x952AB45CFA97A0B3,   455,  156 },
+            { 0xDE469FBD99A05FE3,   481,  164 },
+            { 0xA59BC234DB398C25,   508,  172 },
+            { 0xF6C69A72A3989F5C,   534,  180 },
+            { 0xB7DCBF5354E9BECE,   561,  188 },
+            { 0x88FCF317F22241E2,   588,  196 },
+            { 0xCC20CE9BD35C78A5,   614,  204 },
+            { 0x98165AF37B2153DF,   641,  212 },
+            { 0xE2A0B5DC971F303A,   667,  220 },
+            { 0xA8D9D1535CE3B396,   694,  228 },
+            { 0xFB9B7CD9A4A7443C,   720,  236 },
+            { 0xBB764C4CA7A44410,   747,  244 },
+            { 0x8BAB8EEFB6409C1A,   774,  252 },
+            { 0xD01FEF10A657842C,   800,  260 },
+            { 0x9B10A4E5E9913129,   827,  268 },
+            { 0xE7109BFBA19C0C9D,   853,  276 },
+            { 0xAC2820D9623BF429,   880,  284 },
+            { 0x80444B5E7AA7CF85,   907,  292 },
+            { 0xBF21E44003ACDD2D,   933,  300 },
+            { 0x8E679C2F5E44FF8F,   960,  308 },
+            { 0xD433179D9C8CB841,   986,  316 },
+            { 0x9E19DB92B4E31BA9,  1013,  324 },
+        }
+    };
+
+    // This computation gives exactly the same results for k as
+    //      k = ceil((kAlpha - e - 1) * 0.30102999566398114)
+    // for |e| <= 1500, but doesn't require floating-point operations.
+    // NB: log_10(2) ~= 78913 / 2^18
+    JSON_ASSERT(e >= -1500);
+    JSON_ASSERT(e <=  1500);
+    const int f = kAlpha - e - 1;
+    const int k = ((f * 78913) / (1 << 18)) + static_cast<int>(f > 0);
+
+    const int index = (-kCachedPowersMinDecExp + k + (kCachedPowersDecStep - 1)) / kCachedPowersDecStep;
+    JSON_ASSERT(index >= 0);
+    JSON_ASSERT(static_cast<std::size_t>(index) < kCachedPowers.size());
+
+    const cached_power cached = kCachedPowers[static_cast<std::size_t>(index)];
+    JSON_ASSERT(kAlpha <= cached.e + e + 64);
+    JSON_ASSERT(kGamma >= cached.e + e + 64);
+
+    return cached;
+}
+
+/*!
+For n != 0, returns k, such that pow10 := 10^(k-1) <= n < 10^k.
+For n == 0, returns 1 and sets pow10 := 1.
+*/
+inline int find_largest_pow10(const std::uint32_t n, std::uint32_t& pow10)
+{
+    // LCOV_EXCL_START
+    if (n >= 1000000000)
+    {
+        pow10 = 1000000000;
+        return 10;
+    }
+    // LCOV_EXCL_STOP
+    if (n >= 100000000)
+    {
+        pow10 = 100000000;
+        return  9;
+    }
+    if (n >= 10000000)
+    {
+        pow10 = 10000000;
+        return  8;
+    }
+    if (n >= 1000000)
+    {
+        pow10 = 1000000;
+        return  7;
+    }
+    if (n >= 100000)
+    {
+        pow10 = 100000;
+        return  6;
+    }
+    if (n >= 10000)
+    {
+        pow10 = 10000;
+        return  5;
+    }
+    if (n >= 1000)
+    {
+        pow10 = 1000;
+        return  4;
+    }
+    if (n >= 100)
+    {
+        pow10 = 100;
+        return  3;
+    }
+    if (n >= 10)
+    {
+        pow10 = 10;
+        return  2;
+    }
+
+    pow10 = 1;
+    return 1;
+}
+
+inline void grisu2_round(char* buf, int len, std::uint64_t dist, std::uint64_t delta,
+                         std::uint64_t rest, std::uint64_t ten_k)
+{
+    JSON_ASSERT(len >= 1);
+    JSON_ASSERT(dist <= delta);
+    JSON_ASSERT(rest <= delta);
+    JSON_ASSERT(ten_k > 0);
+
+    //               <--------------------------- delta ---->
+    //                                  <---- dist --------->
+    // --------------[------------------+-------------------]--------------
+    //               M-                 w                   M+
+    //
+    //                                  ten_k
+    //                                <------>
+    //                                       <---- rest ---->
+    // --------------[------------------+----+--------------]--------------
+    //                                  w    V
+    //                                       = buf * 10^k
+    //
+    // ten_k represents a unit-in-the-last-place in the decimal representation
+    // stored in buf.
+    // Decrement buf by ten_k while this takes buf closer to w.
+
+    // The tests are written in this order to avoid overflow in unsigned
+    // integer arithmetic.
+
+    while (rest < dist
+            && delta - rest >= ten_k
+            && (rest + ten_k < dist || dist - rest > rest + ten_k - dist))
+    {
+        JSON_ASSERT(buf[len - 1] != '0');
+        buf[len - 1]--;
+        rest += ten_k;
+    }
+}
+
+/*!
+Generates V = buffer * 10^decimal_exponent, such that M- <= V <= M+.
+M- and M+ must be normalized and share the same exponent -60 <= e <= -32.
+*/
+inline void grisu2_digit_gen(char* buffer, int& length, int& decimal_exponent,
+                             diyfp M_minus, diyfp w, diyfp M_plus)
+{
+    static_assert(kAlpha >= -60, "internal error");
+    static_assert(kGamma <= -32, "internal error");
+
+    // Generates the digits (and the exponent) of a decimal floating-point
+    // number V = buffer * 10^decimal_exponent in the range [M-, M+]. The diyfp's
+    // w, M- and M+ share the same exponent e, which satisfies alpha <= e <= gamma.
+    //
+    //               <--------------------------- delta ---->
+    //                                  <---- dist --------->
+    // --------------[------------------+-------------------]--------------
+    //               M-                 w                   M+
+    //
+    // Grisu2 generates the digits of M+ from left to right and stops as soon as
+    // V is in [M-,M+].
+
+    JSON_ASSERT(M_plus.e >= kAlpha);
+    JSON_ASSERT(M_plus.e <= kGamma);
+
+    std::uint64_t delta = diyfp::sub(M_plus, M_minus).f; // (significand of (M+ - M-), implicit exponent is e)
+    std::uint64_t dist  = diyfp::sub(M_plus, w      ).f; // (significand of (M+ - w ), implicit exponent is e)
+
+    // Split M+ = f * 2^e into two parts p1 and p2 (note: e < 0):
+    //
+    //      M+ = f * 2^e
+    //         = ((f div 2^-e) * 2^-e + (f mod 2^-e)) * 2^e
+    //         = ((p1        ) * 2^-e + (p2        )) * 2^e
+    //         = p1 + p2 * 2^e
+
+    const diyfp one(std::uint64_t{1} << -M_plus.e, M_plus.e);
+
+    auto p1 = static_cast<std::uint32_t>(M_plus.f >> -one.e); // p1 = f div 2^-e (Since -e >= 32, p1 fits into a 32-bit int.)
+    std::uint64_t p2 = M_plus.f & (one.f - 1);                    // p2 = f mod 2^-e
+
+    // 1)
+    //
+    // Generate the digits of the integral part p1 = d[n-1]...d[1]d[0]
+
+    JSON_ASSERT(p1 > 0);
+
+    std::uint32_t pow10{};
+    const int k = find_largest_pow10(p1, pow10);
+
+    //      10^(k-1) <= p1 < 10^k, pow10 = 10^(k-1)
+    //
+    //      p1 = (p1 div 10^(k-1)) * 10^(k-1) + (p1 mod 10^(k-1))
+    //         = (d[k-1]         ) * 10^(k-1) + (p1 mod 10^(k-1))
+    //
+    //      M+ = p1                                             + p2 * 2^e
+    //         = d[k-1] * 10^(k-1) + (p1 mod 10^(k-1))          + p2 * 2^e
+    //         = d[k-1] * 10^(k-1) + ((p1 mod 10^(k-1)) * 2^-e + p2) * 2^e
+    //         = d[k-1] * 10^(k-1) + (                         rest) * 2^e
+    //
+    // Now generate the digits d[n] of p1 from left to right (n = k-1,...,0)
+    //
+    //      p1 = d[k-1]...d[n] * 10^n + d[n-1]...d[0]
+    //
+    // but stop as soon as
+    //
+    //      rest * 2^e = (d[n-1]...d[0] * 2^-e + p2) * 2^e <= delta * 2^e
+
+    int n = k;
+    while (n > 0)
+    {
+        // Invariants:
+        //      M+ = buffer * 10^n + (p1 + p2 * 2^e)    (buffer = 0 for n = k)
+        //      pow10 = 10^(n-1) <= p1 < 10^n
+        //
+        const std::uint32_t d = p1 / pow10;  // d = p1 div 10^(n-1)
+        const std::uint32_t r = p1 % pow10;  // r = p1 mod 10^(n-1)
+        //
+        //      M+ = buffer * 10^n + (d * 10^(n-1) + r) + p2 * 2^e
+        //         = (buffer * 10 + d) * 10^(n-1) + (r + p2 * 2^e)
+        //
+        JSON_ASSERT(d <= 9);
+        buffer[length++] = static_cast<char>('0' + d); // buffer := buffer * 10 + d
+        //
+        //      M+ = buffer * 10^(n-1) + (r + p2 * 2^e)
+        //
+        p1 = r;
+        n--;
+        //
+        //      M+ = buffer * 10^n + (p1 + p2 * 2^e)
+        //      pow10 = 10^n
+        //
+
+        // Now check if enough digits have been generated.
+        // Compute
+        //
+        //      p1 + p2 * 2^e = (p1 * 2^-e + p2) * 2^e = rest * 2^e
+        //
+        // Note:
+        // Since rest and delta share the same exponent e, it suffices to
+        // compare the significands.
+        const std::uint64_t rest = (std::uint64_t{p1} << -one.e) + p2;
+        if (rest <= delta)
+        {
+            // V = buffer * 10^n, with M- <= V <= M+.
+
+            decimal_exponent += n;
+
+            // We may now just stop. But instead look if the buffer could be
+            // decremented to bring V closer to w.
+            //
+            // pow10 = 10^n is now 1 ulp in the decimal representation V.
+            // The rounding procedure works with diyfp's with an implicit
+            // exponent of e.
+            //
+            //      10^n = (10^n * 2^-e) * 2^e = ulp * 2^e
+            //
+            const std::uint64_t ten_n = std::uint64_t{pow10} << -one.e;
+            grisu2_round(buffer, length, dist, delta, rest, ten_n);
+
+            return;
+        }
+
+        pow10 /= 10;
+        //
+        //      pow10 = 10^(n-1) <= p1 < 10^n
+        // Invariants restored.
+    }
+
+    // 2)
+    //
+    // The digits of the integral part have been generated:
+    //
+    //      M+ = d[k-1]...d[1]d[0] + p2 * 2^e
+    //         = buffer            + p2 * 2^e
+    //
+    // Now generate the digits of the fractional part p2 * 2^e.
+    //
+    // Note:
+    // No decimal point is generated: the exponent is adjusted instead.
+    //
+    // p2 actually represents the fraction
+    //
+    //      p2 * 2^e
+    //          = p2 / 2^-e
+    //          = d[-1] / 10^1 + d[-2] / 10^2 + ...
+    //
+    // Now generate the digits d[-m] of p1 from left to right (m = 1,2,...)
+    //
+    //      p2 * 2^e = d[-1]d[-2]...d[-m] * 10^-m
+    //                      + 10^-m * (d[-m-1] / 10^1 + d[-m-2] / 10^2 + ...)
+    //
+    // using
+    //
+    //      10^m * p2 = ((10^m * p2) div 2^-e) * 2^-e + ((10^m * p2) mod 2^-e)
+    //                = (                   d) * 2^-e + (                   r)
+    //
+    // or
+    //      10^m * p2 * 2^e = d + r * 2^e
+    //
+    // i.e.
+    //
+    //      M+ = buffer + p2 * 2^e
+    //         = buffer + 10^-m * (d + r * 2^e)
+    //         = (buffer * 10^m + d) * 10^-m + 10^-m * r * 2^e
+    //
+    // and stop as soon as 10^-m * r * 2^e <= delta * 2^e
+
+    JSON_ASSERT(p2 > delta);
+
+    int m = 0;
+    for (;;)
+    {
+        // Invariant:
+        //      M+ = buffer * 10^-m + 10^-m * (d[-m-1] / 10 + d[-m-2] / 10^2 + ...) * 2^e
+        //         = buffer * 10^-m + 10^-m * (p2                                 ) * 2^e
+        //         = buffer * 10^-m + 10^-m * (1/10 * (10 * p2)                   ) * 2^e
+        //         = buffer * 10^-m + 10^-m * (1/10 * ((10*p2 div 2^-e) * 2^-e + (10*p2 mod 2^-e)) * 2^e
+        //
+        JSON_ASSERT(p2 <= (std::numeric_limits<std::uint64_t>::max)() / 10);
+        p2 *= 10;
+        const std::uint64_t d = p2 >> -one.e;     // d = (10 * p2) div 2^-e
+        const std::uint64_t r = p2 & (one.f - 1); // r = (10 * p2) mod 2^-e
+        //
+        //      M+ = buffer * 10^-m + 10^-m * (1/10 * (d * 2^-e + r) * 2^e
+        //         = buffer * 10^-m + 10^-m * (1/10 * (d + r * 2^e))
+        //         = (buffer * 10 + d) * 10^(-m-1) + 10^(-m-1) * r * 2^e
+        //
+        JSON_ASSERT(d <= 9);
+        buffer[length++] = static_cast<char>('0' + d); // buffer := buffer * 10 + d
+        //
+        //      M+ = buffer * 10^(-m-1) + 10^(-m-1) * r * 2^e
+        //
+        p2 = r;
+        m++;
+        //
+        //      M+ = buffer * 10^-m + 10^-m * p2 * 2^e
+        // Invariant restored.
+
+        // Check if enough digits have been generated.
+        //
+        //      10^-m * p2 * 2^e <= delta * 2^e
+        //              p2 * 2^e <= 10^m * delta * 2^e
+        //                    p2 <= 10^m * delta
+        delta *= 10;
+        dist  *= 10;
+        if (p2 <= delta)
+        {
+            break;
+        }
+    }
+
+    // V = buffer * 10^-m, with M- <= V <= M+.
+
+    decimal_exponent -= m;
+
+    // 1 ulp in the decimal representation is now 10^-m.
+    // Since delta and dist are now scaled by 10^m, we need to do the
+    // same with ulp in order to keep the units in sync.
+    //
+    //      10^m * 10^-m = 1 = 2^-e * 2^e = ten_m * 2^e
+    //
+    const std::uint64_t ten_m = one.f;
+    grisu2_round(buffer, length, dist, delta, p2, ten_m);
+
+    // By construction this algorithm generates the shortest possible decimal
+    // number (Loitsch, Theorem 6.2) which rounds back to w.
+    // For an input number of precision p, at least
+    //
+    //      N = 1 + ceil(p * log_10(2))
+    //
+    // decimal digits are sufficient to identify all binary floating-point
+    // numbers (Matula, "In-and-Out conversions").
+    // This implies that the algorithm does not produce more than N decimal
+    // digits.
+    //
+    //      N = 17 for p = 53 (IEEE double precision)
+    //      N = 9  for p = 24 (IEEE single precision)
+}
+
+/*!
+v = buf * 10^decimal_exponent
+len is the length of the buffer (number of decimal digits)
+The buffer must be large enough, i.e. >= max_digits10.
+*/
+JSON_HEDLEY_NON_NULL(1)
+inline void grisu2(char* buf, int& len, int& decimal_exponent,
+                   diyfp m_minus, diyfp v, diyfp m_plus)
+{
+    JSON_ASSERT(m_plus.e == m_minus.e);
+    JSON_ASSERT(m_plus.e == v.e);
+
+    //  --------(-----------------------+-----------------------)--------    (A)
+    //          m-                      v                       m+
+    //
+    //  --------------------(-----------+-----------------------)--------    (B)
+    //                      m-          v                       m+
+    //
+    // First scale v (and m- and m+) such that the exponent is in the range
+    // [alpha, gamma].
+
+    const cached_power cached = get_cached_power_for_binary_exponent(m_plus.e);
+
+    const diyfp c_minus_k(cached.f, cached.e); // = c ~= 10^-k
+
+    // The exponent of the products is = v.e + c_minus_k.e + q and is in the range [alpha,gamma]
+    const diyfp w       = diyfp::mul(v,       c_minus_k);
+    const diyfp w_minus = diyfp::mul(m_minus, c_minus_k);
+    const diyfp w_plus  = diyfp::mul(m_plus,  c_minus_k);
+
+    //  ----(---+---)---------------(---+---)---------------(---+---)----
+    //          w-                      w                       w+
+    //          = c*m-                  = c*v                   = c*m+
+    //
+    // diyfp::mul rounds its result and c_minus_k is approximated too. w, w- and
+    // w+ are now off by a small amount.
+    // In fact:
+    //
+    //      w - v * 10^k < 1 ulp
+    //
+    // To account for this inaccuracy, add resp. subtract 1 ulp.
+    //
+    //  --------+---[---------------(---+---)---------------]---+--------
+    //          w-  M-                  w                   M+  w+
+    //
+    // Now any number in [M-, M+] (bounds included) will round to w when input,
+    // regardless of how the input rounding algorithm breaks ties.
+    //
+    // And digit_gen generates the shortest possible such number in [M-, M+].
+    // Note that this does not mean that Grisu2 always generates the shortest
+    // possible number in the interval (m-, m+).
+    const diyfp M_minus(w_minus.f + 1, w_minus.e);
+    const diyfp M_plus (w_plus.f  - 1, w_plus.e );
+
+    decimal_exponent = -cached.k; // = -(-k) = k
+
+    grisu2_digit_gen(buf, len, decimal_exponent, M_minus, w, M_plus);
+}
+
+/*!
+v = buf * 10^decimal_exponent
+len is the length of the buffer (number of decimal digits)
+The buffer must be large enough, i.e. >= max_digits10.
+*/
+template<typename FloatType>
+JSON_HEDLEY_NON_NULL(1)
+void grisu2(char* buf, int& len, int& decimal_exponent, FloatType value)
+{
+    static_assert(diyfp::kPrecision >= std::numeric_limits<FloatType>::digits + 3,
+                  "internal error: not enough precision");
+
+    JSON_ASSERT(std::isfinite(value));
+    JSON_ASSERT(value > 0);
+
+    // If the neighbors (and boundaries) of 'value' are always computed for double-precision
+    // numbers, all float's can be recovered using strtod (and strtof). However, the resulting
+    // decimal representations are not exactly "short".
+    //
+    // The documentation for 'std::to_chars' (https://en.cppreference.com/w/cpp/utility/to_chars)
+    // says "value is converted to a string as if by std::sprintf in the default ("C") locale"
+    // and since sprintf promotes floats to doubles, I think this is exactly what 'std::to_chars'
+    // does.
+    // On the other hand, the documentation for 'std::to_chars' requires that "parsing the
+    // representation using the corresponding std::from_chars function recovers value exactly". That
+    // indicates that single precision floating-point numbers should be recovered using
+    // 'std::strtof'.
+    //
+    // NB: If the neighbors are computed for single-precision numbers, there is a single float
+    //     (7.0385307e-26f) which can't be recovered using strtod. The resulting double precision
+    //     value is off by 1 ulp.
+#if 0 // NOLINT(readability-avoid-unconditional-preprocessor-if)
+    const boundaries w = compute_boundaries(static_cast<double>(value));
+#else
+    const boundaries w = compute_boundaries(value);
+#endif
+
+    grisu2(buf, len, decimal_exponent, w.minus, w.w, w.plus);
+}
+
+/*!
+@brief appends a decimal representation of e to buf
+@return a pointer to the element following the exponent.
+@pre -1000 < e < 1000
+*/
+JSON_HEDLEY_NON_NULL(1)
+JSON_HEDLEY_RETURNS_NON_NULL
+inline char* append_exponent(char* buf, int e)
+{
+    JSON_ASSERT(e > -1000);
+    JSON_ASSERT(e <  1000);
+
+    if (e < 0)
+    {
+        e = -e;
+        *buf++ = '-';
+    }
+    else
+    {
+        *buf++ = '+';
+    }
+
+    auto k = static_cast<std::uint32_t>(e);
+    if (k < 10)
+    {
+        // Always print at least two digits in the exponent.
+        // This is for compatibility with printf("%g").
+        *buf++ = '0';
+        *buf++ = static_cast<char>('0' + k);
+    }
+    else if (k < 100)
+    {
+        *buf++ = static_cast<char>('0' + (k / 10));
+        k %= 10;
+        *buf++ = static_cast<char>('0' + k);
+    }
+    else
+    {
+        *buf++ = static_cast<char>('0' + (k / 100));
+        k %= 100;
+        *buf++ = static_cast<char>('0' + (k / 10));
+        k %= 10;
+        *buf++ = static_cast<char>('0' + k);
+    }
+
+    return buf;
+}
+
+/*!
+@brief prettify v = buf * 10^decimal_exponent
+
+If v is in the range [10^min_exp, 10^max_exp) it will be printed in fixed-point
+notation. Otherwise it will be printed in exponential notation.
+
+@pre min_exp < 0
+@pre max_exp > 0
+*/
+JSON_HEDLEY_NON_NULL(1)
+JSON_HEDLEY_RETURNS_NON_NULL
+inline char* format_buffer(char* buf, int len, int decimal_exponent,
+                           int min_exp, int max_exp)
+{
+    JSON_ASSERT(min_exp < 0);
+    JSON_ASSERT(max_exp > 0);
+
+    const int k = len;
+    const int n = len + decimal_exponent;
+
+    // v = buf * 10^(n-k)
+    // k is the length of the buffer (number of decimal digits)
+    // n is the position of the decimal point relative to the start of the buffer.
+
+    if (k <= n && n <= max_exp)
+    {
+        // digits[000]
+        // len <= max_exp + 2
+
+        std::memset(buf + k, '0', static_cast<size_t>(n) - static_cast<size_t>(k));
+        // Make it look like a floating-point number (#362, #378)
+        buf[n + 0] = '.';
+        buf[n + 1] = '0';
+        return buf + (static_cast<size_t>(n) + 2);
+    }
+
+    if (0 < n && n <= max_exp)
+    {
+        // dig.its
+        // len <= max_digits10 + 1
+
+        JSON_ASSERT(k > n);
+
+        std::memmove(buf + (static_cast<size_t>(n) + 1), buf + n, static_cast<size_t>(k) - static_cast<size_t>(n));
+        buf[n] = '.';
+        return buf + (static_cast<size_t>(k) + 1U);
+    }
+
+    if (min_exp < n && n <= 0)
+    {
+        // 0.[000]digits
+        // len <= 2 + (-min_exp - 1) + max_digits10
+
+        std::memmove(buf + (2 + static_cast<size_t>(-n)), buf, static_cast<size_t>(k));
+        buf[0] = '0';
+        buf[1] = '.';
+        std::memset(buf + 2, '0', static_cast<size_t>(-n));
+        return buf + (2U + static_cast<size_t>(-n) + static_cast<size_t>(k));
+    }
+
+    if (k == 1)
+    {
+        // dE+123
+        // len <= 1 + 5
+
+        buf += 1;
+    }
+    else
+    {
+        // d.igitsE+123
+        // len <= max_digits10 + 1 + 5
+
+        std::memmove(buf + 2, buf + 1, static_cast<size_t>(k) - 1);
+        buf[1] = '.';
+        buf += 1 + static_cast<size_t>(k);
+    }
+
+    *buf++ = 'e';
+    return append_exponent(buf, n - 1);
+}
+
+}  // namespace dtoa_impl
+
+/*!
+@brief generates a decimal representation of the floating-point number value in [first, last).
+
+The format of the resulting decimal representation is similar to printf's %g
+format. Returns an iterator pointing past-the-end of the decimal representation.
+
+@note The input number must be finite, i.e. NaN's and Inf's are not supported.
+@note The buffer must be large enough.
+@note The result is NOT null-terminated.
+*/
+template<typename FloatType>
+JSON_HEDLEY_NON_NULL(1, 2)
+JSON_HEDLEY_RETURNS_NON_NULL
+char* to_chars(char* first, const char* last, FloatType value)
+{
+    static_cast<void>(last); // maybe unused - fix warning
+    JSON_ASSERT(std::isfinite(value));
+
+    // Use signbit(value) instead of (value < 0) since signbit works for -0.
+    if (std::signbit(value))
+    {
+        value = -value;
+        *first++ = '-';
+    }
+
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wfloat-equal"
+#endif
+    if (value == 0) // +-0
+    {
+        *first++ = '0';
+        // Make it look like a floating-point number (#362, #378)
+        *first++ = '.';
+        *first++ = '0';
+        return first;
+    }
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
+
+    JSON_ASSERT(last - first >= std::numeric_limits<FloatType>::max_digits10);
+
+    // Compute v = buffer * 10^decimal_exponent.
+    // The decimal digits are stored in the buffer, which needs to be interpreted
+    // as an unsigned decimal integer.
+    // len is the length of the buffer, i.e. the number of decimal digits.
+    int len = 0;
+    int decimal_exponent = 0;
+    dtoa_impl::grisu2(first, len, decimal_exponent, value);
+
+    JSON_ASSERT(len <= std::numeric_limits<FloatType>::max_digits10);
+
+    // Format the buffer like printf("%.*g", prec, value)
+    constexpr int kMinExp = -4;
+    // Use digits10 here to increase compatibility with version 2.
+    constexpr int kMaxExp = std::numeric_limits<FloatType>::digits10;
+
+    JSON_ASSERT(last - first >= kMaxExp + 2);
+    JSON_ASSERT(last - first >= 2 + (-kMinExp - 1) + std::numeric_limits<FloatType>::max_digits10);
+    JSON_ASSERT(last - first >= std::numeric_limits<FloatType>::max_digits10 + 6);
+
+    return dtoa_impl::format_buffer(first, len, decimal_exponent, kMinExp, kMaxExp);
+}
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/exceptions.hpp>
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/meta/cpp_future.hpp>
+
+// #include <nlohmann/detail/output/binary_writer.hpp>
+
+// #include <nlohmann/detail/output/output_adapters.hpp>
+
+// #include <nlohmann/detail/string_concat.hpp>
+
+// #include <nlohmann/detail/value_t.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+namespace detail
+{
+
+///////////////////
+// serialization //
+///////////////////
+
+/// how to treat decoding errors
+enum class error_handler_t
+{
+    strict,  ///< throw a type_error exception in case of invalid UTF-8
+    replace, ///< replace invalid UTF-8 sequences with U+FFFD
+    ignore   ///< ignore invalid UTF-8 sequences
+};
+
+template<typename BasicJsonType>
+class serializer
+{
+    using string_t = typename BasicJsonType::string_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    using binary_char_t = typename BasicJsonType::binary_t::value_type;
+    static constexpr std::uint8_t UTF8_ACCEPT = 0;
+    static constexpr std::uint8_t UTF8_REJECT = 1;
+
+  public:
+    /*!
+    @param[in] s  output stream to serialize to
+    @param[in] ichar  indentation character to use
+    @param[in] error_handler_  how to react on decoding errors
+    */
+    serializer(output_adapter_t<char> s, const char ichar,
+               error_handler_t error_handler_ = error_handler_t::strict)
+        : o(std::move(s))
+        , loc(std::localeconv())
+        , thousands_sep(loc->thousands_sep == nullptr ? '\0' : std::char_traits<char>::to_char_type(* (loc->thousands_sep)))
+        , decimal_point(loc->decimal_point == nullptr ? '\0' : std::char_traits<char>::to_char_type(* (loc->decimal_point)))
+        , indent_char(ichar)
+        , indent_string(512, indent_char)
+        , error_handler(error_handler_)
+    {}
+
+    // delete because of pointer members
+    serializer(const serializer&) = delete;
+    serializer& operator=(const serializer&) = delete;
+    serializer(serializer&&) = delete;
+    serializer& operator=(serializer&&) = delete;
+    ~serializer() = default;
+
+    /*!
+    @brief internal implementation of the serialization function
+
+    This function is called by the public member function dump and organizes
+    the serialization internally. The indentation level is propagated as
+    additional parameter. In case of arrays and objects, the function is
+    called recursively.
+
+    - strings and object keys are escaped using `escape_string()`
+    - integer numbers are converted implicitly via `operator<<`
+    - floating-point numbers are converted to a string using `"%g"` format
+    - binary values are serialized as objects containing the subtype and the
+      byte array
+
+    @param[in] val               value to serialize
+    @param[in] pretty_print      whether the output shall be pretty-printed
+    @param[in] ensure_ascii If @a ensure_ascii is true, all non-ASCII characters
+    in the output are escaped with `\uXXXX` sequences, and the result consists
+    of ASCII characters only.
+    @param[in] indent_step       the indent level
+    @param[in] current_indent    the current indent level (only used internally)
+    */
+    void dump(const BasicJsonType& val,
+              const bool pretty_print,
+              const bool ensure_ascii,
+              const unsigned int indent_step,
+              const unsigned int current_indent = 0)
+    {
+        switch (val.m_data.m_type)
+        {
+            case value_t::object:
+            {
+                if (val.m_data.m_value.object->empty())
+                {
+                    o->write_characters("{}", 2);
+                    return;
+                }
+
+                if (pretty_print)
+                {
+                    o->write_characters("{\n", 2);
+
+                    // variable to hold indentation for recursive calls
+                    const auto new_indent = current_indent + indent_step;
+                    if (JSON_HEDLEY_UNLIKELY(indent_string.size() < new_indent))
+                    {
+                        indent_string.resize(indent_string.size() * 2, ' ');
+                    }
+
+                    // first n-1 elements
+                    auto i = val.m_data.m_value.object->cbegin();
+                    for (std::size_t cnt = 0; cnt < val.m_data.m_value.object->size() - 1; ++cnt, ++i)
+                    {
+                        o->write_characters(indent_string.c_str(), new_indent);
+                        o->write_character('\"');
+                        dump_escaped(i->first, ensure_ascii);
+                        o->write_characters("\": ", 3);
+                        dump(i->second, true, ensure_ascii, indent_step, new_indent);
+                        o->write_characters(",\n", 2);
+                    }
+
+                    // last element
+                    JSON_ASSERT(i != val.m_data.m_value.object->cend());
+                    JSON_ASSERT(std::next(i) == val.m_data.m_value.object->cend());
+                    o->write_characters(indent_string.c_str(), new_indent);
+                    o->write_character('\"');
+                    dump_escaped(i->first, ensure_ascii);
+                    o->write_characters("\": ", 3);
+                    dump(i->second, true, ensure_ascii, indent_step, new_indent);
+
+                    o->write_character('\n');
+                    o->write_characters(indent_string.c_str(), current_indent);
+                    o->write_character('}');
+                }
+                else
+                {
+                    o->write_character('{');
+
+                    // first n-1 elements
+                    auto i = val.m_data.m_value.object->cbegin();
+                    for (std::size_t cnt = 0; cnt < val.m_data.m_value.object->size() - 1; ++cnt, ++i)
+                    {
+                        o->write_character('\"');
+                        dump_escaped(i->first, ensure_ascii);
+                        o->write_characters("\":", 2);
+                        dump(i->second, false, ensure_ascii, indent_step, current_indent);
+                        o->write_character(',');
+                    }
+
+                    // last element
+                    JSON_ASSERT(i != val.m_data.m_value.object->cend());
+                    JSON_ASSERT(std::next(i) == val.m_data.m_value.object->cend());
+                    o->write_character('\"');
+                    dump_escaped(i->first, ensure_ascii);
+                    o->write_characters("\":", 2);
+                    dump(i->second, false, ensure_ascii, indent_step, current_indent);
+
+                    o->write_character('}');
+                }
+
+                return;
+            }
+
+            case value_t::array:
+            {
+                if (val.m_data.m_value.array->empty())
+                {
+                    o->write_characters("[]", 2);
+                    return;
+                }
+
+                if (pretty_print)
+                {
+                    o->write_characters("[\n", 2);
+
+                    // variable to hold indentation for recursive calls
+                    const auto new_indent = current_indent + indent_step;
+                    if (JSON_HEDLEY_UNLIKELY(indent_string.size() < new_indent))
+                    {
+                        indent_string.resize(indent_string.size() * 2, ' ');
+                    }
+
+                    // first n-1 elements
+                    for (auto i = val.m_data.m_value.array->cbegin();
+                            i != val.m_data.m_value.array->cend() - 1; ++i)
+                    {
+                        o->write_characters(indent_string.c_str(), new_indent);
+                        dump(*i, true, ensure_ascii, indent_step, new_indent);
+                        o->write_characters(",\n", 2);
+                    }
+
+                    // last element
+                    JSON_ASSERT(!val.m_data.m_value.array->empty());
+                    o->write_characters(indent_string.c_str(), new_indent);
+                    dump(val.m_data.m_value.array->back(), true, ensure_ascii, indent_step, new_indent);
+
+                    o->write_character('\n');
+                    o->write_characters(indent_string.c_str(), current_indent);
+                    o->write_character(']');
+                }
+                else
+                {
+                    o->write_character('[');
+
+                    // first n-1 elements
+                    for (auto i = val.m_data.m_value.array->cbegin();
+                            i != val.m_data.m_value.array->cend() - 1; ++i)
+                    {
+                        dump(*i, false, ensure_ascii, indent_step, current_indent);
+                        o->write_character(',');
+                    }
+
+                    // last element
+                    JSON_ASSERT(!val.m_data.m_value.array->empty());
+                    dump(val.m_data.m_value.array->back(), false, ensure_ascii, indent_step, current_indent);
+
+                    o->write_character(']');
+                }
+
+                return;
+            }
+
+            case value_t::string:
+            {
+                o->write_character('\"');
+                dump_escaped(*val.m_data.m_value.string, ensure_ascii);
+                o->write_character('\"');
+                return;
+            }
+
+            case value_t::binary:
+            {
+                if (pretty_print)
+                {
+                    o->write_characters("{\n", 2);
+
+                    // variable to hold indentation for recursive calls
+                    const auto new_indent = current_indent + indent_step;
+                    if (JSON_HEDLEY_UNLIKELY(indent_string.size() < new_indent))
+                    {
+                        indent_string.resize(indent_string.size() * 2, ' ');
+                    }
+
+                    o->write_characters(indent_string.c_str(), new_indent);
+
+                    o->write_characters("\"bytes\": [", 10);
+
+                    if (!val.m_data.m_value.binary->empty())
+                    {
+                        for (auto i = val.m_data.m_value.binary->cbegin();
+                                i != val.m_data.m_value.binary->cend() - 1; ++i)
+                        {
+                            dump_integer(*i);
+                            o->write_characters(", ", 2);
+                        }
+                        dump_integer(val.m_data.m_value.binary->back());
+                    }
+
+                    o->write_characters("],\n", 3);
+                    o->write_characters(indent_string.c_str(), new_indent);
+
+                    o->write_characters("\"subtype\": ", 11);
+                    if (val.m_data.m_value.binary->has_subtype())
+                    {
+                        dump_integer(val.m_data.m_value.binary->subtype());
+                    }
+                    else
+                    {
+                        o->write_characters("null", 4);
+                    }
+                    o->write_character('\n');
+                    o->write_characters(indent_string.c_str(), current_indent);
+                    o->write_character('}');
+                }
+                else
+                {
+                    o->write_characters("{\"bytes\":[", 10);
+
+                    if (!val.m_data.m_value.binary->empty())
+                    {
+                        for (auto i = val.m_data.m_value.binary->cbegin();
+                                i != val.m_data.m_value.binary->cend() - 1; ++i)
+                        {
+                            dump_integer(*i);
+                            o->write_character(',');
+                        }
+                        dump_integer(val.m_data.m_value.binary->back());
+                    }
+
+                    o->write_characters("],\"subtype\":", 12);
+                    if (val.m_data.m_value.binary->has_subtype())
+                    {
+                        dump_integer(val.m_data.m_value.binary->subtype());
+                        o->write_character('}');
+                    }
+                    else
+                    {
+                        o->write_characters("null}", 5);
+                    }
+                }
+                return;
+            }
+
+            case value_t::boolean:
+            {
+                if (val.m_data.m_value.boolean)
+                {
+                    o->write_characters("true", 4);
+                }
+                else
+                {
+                    o->write_characters("false", 5);
+                }
+                return;
+            }
+
+            case value_t::number_integer:
+            {
+                dump_integer(val.m_data.m_value.number_integer);
+                return;
+            }
+
+            case value_t::number_unsigned:
+            {
+                dump_integer(val.m_data.m_value.number_unsigned);
+                return;
+            }
+
+            case value_t::number_float:
+            {
+                dump_float(val.m_data.m_value.number_float);
+                return;
+            }
+
+            case value_t::discarded:
+            {
+                o->write_characters("<discarded>", 11);
+                return;
+            }
+
+            case value_t::null:
+            {
+                o->write_characters("null", 4);
+                return;
+            }
+
+            default:            // LCOV_EXCL_LINE
+                JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
+        }
+    }
+
+  JSON_PRIVATE_UNLESS_TESTED:
+    /*!
+    @brief dump escaped string
+
+    Escape a string by replacing certain special characters by a sequence of an
+    escape character (backslash) and another character and other control
+    characters by a sequence of "\u" followed by a four-digit hex
+    representation. The escaped string is written to output stream @a o.
+
+    @param[in] s  the string to escape
+    @param[in] ensure_ascii  whether to escape non-ASCII characters with
+                             \uXXXX sequences
+
+    @complexity Linear in the length of string @a s.
+    */
+    void dump_escaped(const string_t& s, const bool ensure_ascii)
+    {
+        std::uint32_t codepoint{};
+        std::uint8_t state = UTF8_ACCEPT;
+        std::size_t bytes = 0;  // number of bytes written to string_buffer
+
+        // number of bytes written at the point of the last valid byte
+        std::size_t bytes_after_last_accept = 0;
+        std::size_t undumped_chars = 0;
+
+        for (std::size_t i = 0; i < s.size(); ++i)
+        {
+            const auto byte = static_cast<std::uint8_t>(s[i]);
+
+            switch (decode(state, codepoint, byte))
+            {
+                case UTF8_ACCEPT:  // decode found a new code point
+                {
+                    switch (codepoint)
+                    {
+                        case 0x08: // backspace
+                        {
+                            string_buffer[bytes++] = '\\';
+                            string_buffer[bytes++] = 'b';
+                            break;
+                        }
+
+                        case 0x09: // horizontal tab
+                        {
+                            string_buffer[bytes++] = '\\';
+                            string_buffer[bytes++] = 't';
+                            break;
+                        }
+
+                        case 0x0A: // newline
+                        {
+                            string_buffer[bytes++] = '\\';
+                            string_buffer[bytes++] = 'n';
+                            break;
+                        }
+
+                        case 0x0C: // formfeed
+                        {
+                            string_buffer[bytes++] = '\\';
+                            string_buffer[bytes++] = 'f';
+                            break;
+                        }
+
+                        case 0x0D: // carriage return
+                        {
+                            string_buffer[bytes++] = '\\';
+                            string_buffer[bytes++] = 'r';
+                            break;
+                        }
+
+                        case 0x22: // quotation mark
+                        {
+                            string_buffer[bytes++] = '\\';
+                            string_buffer[bytes++] = '\"';
+                            break;
+                        }
+
+                        case 0x5C: // reverse solidus
+                        {
+                            string_buffer[bytes++] = '\\';
+                            string_buffer[bytes++] = '\\';
+                            break;
+                        }
+
+                        default:
+                        {
+                            // escape control characters (0x00..0x1F) or, if
+                            // ensure_ascii parameter is used, non-ASCII characters
+                            if ((codepoint <= 0x1F) || (ensure_ascii && (codepoint >= 0x7F)))
+                            {
+                                if (codepoint <= 0xFFFF)
+                                {
+                                    // NOLINTNEXTLINE(cppcoreguidelines-pro-type-vararg,hicpp-vararg)
+                                    static_cast<void>((std::snprintf)(string_buffer.data() + bytes, 7, "\\u%04x",
+                                                                      static_cast<std::uint16_t>(codepoint)));
+                                    bytes += 6;
+                                }
+                                else
+                                {
+                                    // NOLINTNEXTLINE(cppcoreguidelines-pro-type-vararg,hicpp-vararg)
+                                    static_cast<void>((std::snprintf)(string_buffer.data() + bytes, 13, "\\u%04x\\u%04x",
+                                                                      static_cast<std::uint16_t>(0xD7C0u + (codepoint >> 10u)),
+                                                                      static_cast<std::uint16_t>(0xDC00u + (codepoint & 0x3FFu))));
+                                    bytes += 12;
+                                }
+                            }
+                            else
+                            {
+                                // copy byte to buffer (all previous bytes
+                                // been copied have in default case above)
+                                string_buffer[bytes++] = s[i];
+                            }
+                            break;
+                        }
+                    }
+
+                    // write buffer and reset index; there must be 13 bytes
+                    // left, as this is the maximal number of bytes to be
+                    // written ("\uxxxx\uxxxx\0") for one code point
+                    if (string_buffer.size() - bytes < 13)
+                    {
+                        o->write_characters(string_buffer.data(), bytes);
+                        bytes = 0;
+                    }
+
+                    // remember the byte position of this accept
+                    bytes_after_last_accept = bytes;
+                    undumped_chars = 0;
+                    break;
+                }
+
+                case UTF8_REJECT:  // decode found invalid UTF-8 byte
+                {
+                    switch (error_handler)
+                    {
+                        case error_handler_t::strict:
+                        {
+                            JSON_THROW(type_error::create(316, concat("invalid UTF-8 byte at index ", std::to_string(i), ": 0x", hex_bytes(byte | 0)), nullptr));
+                        }
+
+                        case error_handler_t::ignore:
+                        case error_handler_t::replace:
+                        {
+                            // in case we saw this character the first time, we
+                            // would like to read it again, because the byte
+                            // may be OK for itself, but just not OK for the
+                            // previous sequence
+                            if (undumped_chars > 0)
+                            {
+                                --i;
+                            }
+
+                            // reset length buffer to the last accepted index;
+                            // thus removing/ignoring the invalid characters
+                            bytes = bytes_after_last_accept;
+
+                            if (error_handler == error_handler_t::replace)
+                            {
+                                // add a replacement character
+                                if (ensure_ascii)
+                                {
+                                    string_buffer[bytes++] = '\\';
+                                    string_buffer[bytes++] = 'u';
+                                    string_buffer[bytes++] = 'f';
+                                    string_buffer[bytes++] = 'f';
+                                    string_buffer[bytes++] = 'f';
+                                    string_buffer[bytes++] = 'd';
+                                }
+                                else
+                                {
+                                    string_buffer[bytes++] = detail::binary_writer<BasicJsonType, char>::to_char_type('\xEF');
+                                    string_buffer[bytes++] = detail::binary_writer<BasicJsonType, char>::to_char_type('\xBF');
+                                    string_buffer[bytes++] = detail::binary_writer<BasicJsonType, char>::to_char_type('\xBD');
+                                }
+
+                                // write buffer and reset index; there must be 13 bytes
+                                // left, as this is the maximal number of bytes to be
+                                // written ("\uxxxx\uxxxx\0") for one code point
+                                if (string_buffer.size() - bytes < 13)
+                                {
+                                    o->write_characters(string_buffer.data(), bytes);
+                                    bytes = 0;
+                                }
+
+                                bytes_after_last_accept = bytes;
+                            }
+
+                            undumped_chars = 0;
+
+                            // continue processing the string
+                            state = UTF8_ACCEPT;
+                            break;
+                        }
+
+                        default:            // LCOV_EXCL_LINE
+                            JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
+                    }
+                    break;
+                }
+
+                default:  // decode found yet incomplete multi-byte code point
+                {
+                    if (!ensure_ascii)
+                    {
+                        // code point will not be escaped - copy byte to buffer
+                        string_buffer[bytes++] = s[i];
+                    }
+                    ++undumped_chars;
+                    break;
+                }
+            }
+        }
+
+        // we finished processing the string
+        if (JSON_HEDLEY_LIKELY(state == UTF8_ACCEPT))
+        {
+            // write buffer
+            if (bytes > 0)
+            {
+                o->write_characters(string_buffer.data(), bytes);
+            }
+        }
+        else
+        {
+            // we finish reading, but do not accept: string was incomplete
+            switch (error_handler)
+            {
+                case error_handler_t::strict:
+                {
+                    JSON_THROW(type_error::create(316, concat("incomplete UTF-8 string; last byte: 0x", hex_bytes(static_cast<std::uint8_t>(s.back() | 0))), nullptr));
+                }
+
+                case error_handler_t::ignore:
+                {
+                    // write all accepted bytes
+                    o->write_characters(string_buffer.data(), bytes_after_last_accept);
+                    break;
+                }
+
+                case error_handler_t::replace:
+                {
+                    // write all accepted bytes
+                    o->write_characters(string_buffer.data(), bytes_after_last_accept);
+                    // add a replacement character
+                    if (ensure_ascii)
+                    {
+                        o->write_characters("\\ufffd", 6);
+                    }
+                    else
+                    {
+                        o->write_characters("\xEF\xBF\xBD", 3);
+                    }
+                    break;
+                }
+
+                default:            // LCOV_EXCL_LINE
+                    JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
+            }
+        }
+    }
+
+  private:
+    /*!
+    @brief count digits
+
+    Count the number of decimal (base 10) digits for an input unsigned integer.
+
+    @param[in] x  unsigned integer number to count its digits
+    @return    number of decimal digits
+    */
+    unsigned int count_digits(number_unsigned_t x) noexcept
+    {
+        unsigned int n_digits = 1;
+        for (;;)
+        {
+            if (x < 10)
+            {
+                return n_digits;
+            }
+            if (x < 100)
+            {
+                return n_digits + 1;
+            }
+            if (x < 1000)
+            {
+                return n_digits + 2;
+            }
+            if (x < 10000)
+            {
+                return n_digits + 3;
+            }
+            x = x / 10000u;
+            n_digits += 4;
+        }
+    }
+
+    /*!
+     * @brief convert a byte to a uppercase hex representation
+     * @param[in] byte byte to represent
+     * @return representation ("00".."FF")
+     */
+    static std::string hex_bytes(std::uint8_t byte)
+    {
+        std::string result = "FF";
+        constexpr const char* nibble_to_hex = "0123456789ABCDEF";
+        result[0] = nibble_to_hex[byte / 16];
+        result[1] = nibble_to_hex[byte % 16];
+        return result;
+    }
+
+    // templates to avoid warnings about useless casts
+    template <typename NumberType, enable_if_t<std::is_signed<NumberType>::value, int> = 0>
+    bool is_negative_number(NumberType x)
+    {
+        return x < 0;
+    }
+
+    template < typename NumberType, enable_if_t <std::is_unsigned<NumberType>::value, int > = 0 >
+    bool is_negative_number(NumberType /*unused*/)
+    {
+        return false;
+    }
+
+    /*!
+    @brief dump an integer
+
+    Dump a given integer to output stream @a o. Works internally with
+    @a number_buffer.
+
+    @param[in] x  integer number (signed or unsigned) to dump
+    @tparam NumberType either @a number_integer_t or @a number_unsigned_t
+    */
+    template < typename NumberType, detail::enable_if_t <
+                   std::is_integral<NumberType>::value ||
+                   std::is_same<NumberType, number_unsigned_t>::value ||
+                   std::is_same<NumberType, number_integer_t>::value ||
+                   std::is_same<NumberType, binary_char_t>::value,
+                   int > = 0 >
+    void dump_integer(NumberType x)
+    {
+        static constexpr std::array<std::array<char, 2>, 100> digits_to_99
+        {
+            {
+                {{'0', '0'}}, {{'0', '1'}}, {{'0', '2'}}, {{'0', '3'}}, {{'0', '4'}}, {{'0', '5'}}, {{'0', '6'}}, {{'0', '7'}}, {{'0', '8'}}, {{'0', '9'}},
+                {{'1', '0'}}, {{'1', '1'}}, {{'1', '2'}}, {{'1', '3'}}, {{'1', '4'}}, {{'1', '5'}}, {{'1', '6'}}, {{'1', '7'}}, {{'1', '8'}}, {{'1', '9'}},
+                {{'2', '0'}}, {{'2', '1'}}, {{'2', '2'}}, {{'2', '3'}}, {{'2', '4'}}, {{'2', '5'}}, {{'2', '6'}}, {{'2', '7'}}, {{'2', '8'}}, {{'2', '9'}},
+                {{'3', '0'}}, {{'3', '1'}}, {{'3', '2'}}, {{'3', '3'}}, {{'3', '4'}}, {{'3', '5'}}, {{'3', '6'}}, {{'3', '7'}}, {{'3', '8'}}, {{'3', '9'}},
+                {{'4', '0'}}, {{'4', '1'}}, {{'4', '2'}}, {{'4', '3'}}, {{'4', '4'}}, {{'4', '5'}}, {{'4', '6'}}, {{'4', '7'}}, {{'4', '8'}}, {{'4', '9'}},
+                {{'5', '0'}}, {{'5', '1'}}, {{'5', '2'}}, {{'5', '3'}}, {{'5', '4'}}, {{'5', '5'}}, {{'5', '6'}}, {{'5', '7'}}, {{'5', '8'}}, {{'5', '9'}},
+                {{'6', '0'}}, {{'6', '1'}}, {{'6', '2'}}, {{'6', '3'}}, {{'6', '4'}}, {{'6', '5'}}, {{'6', '6'}}, {{'6', '7'}}, {{'6', '8'}}, {{'6', '9'}},
+                {{'7', '0'}}, {{'7', '1'}}, {{'7', '2'}}, {{'7', '3'}}, {{'7', '4'}}, {{'7', '5'}}, {{'7', '6'}}, {{'7', '7'}}, {{'7', '8'}}, {{'7', '9'}},
+                {{'8', '0'}}, {{'8', '1'}}, {{'8', '2'}}, {{'8', '3'}}, {{'8', '4'}}, {{'8', '5'}}, {{'8', '6'}}, {{'8', '7'}}, {{'8', '8'}}, {{'8', '9'}},
+                {{'9', '0'}}, {{'9', '1'}}, {{'9', '2'}}, {{'9', '3'}}, {{'9', '4'}}, {{'9', '5'}}, {{'9', '6'}}, {{'9', '7'}}, {{'9', '8'}}, {{'9', '9'}},
+            }
+        };
+
+        // special case for "0"
+        if (x == 0)
+        {
+            o->write_character('0');
+            return;
+        }
+
+        // use a pointer to fill the buffer
+        auto buffer_ptr = number_buffer.begin(); // NOLINT(llvm-qualified-auto,readability-qualified-auto,cppcoreguidelines-pro-type-vararg,hicpp-vararg)
+
+        number_unsigned_t abs_value;
+
+        unsigned int n_chars{};
+
+        if (is_negative_number(x))
+        {
+            *buffer_ptr = '-';
+            abs_value = remove_sign(static_cast<number_integer_t>(x));
+
+            // account one more byte for the minus sign
+            n_chars = 1 + count_digits(abs_value);
+        }
+        else
+        {
+            abs_value = static_cast<number_unsigned_t>(x);
+            n_chars = count_digits(abs_value);
+        }
+
+        // spare 1 byte for '\0'
+        JSON_ASSERT(n_chars < number_buffer.size() - 1);
+
+        // jump to the end to generate the string from backward,
+        // so we later avoid reversing the result
+        buffer_ptr += n_chars;
+
+        // Fast int2ascii implementation inspired by "Fastware" talk by Andrei Alexandrescu
+        // See: https://www.youtube.com/watch?v=o4-CwDo2zpg
+        while (abs_value >= 100)
+        {
+            const auto digits_index = static_cast<unsigned>((abs_value % 100));
+            abs_value /= 100;
+            *(--buffer_ptr) = digits_to_99[digits_index][1];
+            *(--buffer_ptr) = digits_to_99[digits_index][0];
+        }
+
+        if (abs_value >= 10)
+        {
+            const auto digits_index = static_cast<unsigned>(abs_value);
+            *(--buffer_ptr) = digits_to_99[digits_index][1];
+            *(--buffer_ptr) = digits_to_99[digits_index][0];
+        }
+        else
+        {
+            *(--buffer_ptr) = static_cast<char>('0' + abs_value);
+        }
+
+        o->write_characters(number_buffer.data(), n_chars);
+    }
+
+    /*!
+    @brief dump a floating-point number
+
+    Dump a given floating-point number to output stream @a o. Works internally
+    with @a number_buffer.
+
+    @param[in] x  floating-point number to dump
+    */
+    void dump_float(number_float_t x)
+    {
+        // NaN / inf
+        if (!std::isfinite(x))
+        {
+            o->write_characters("null", 4);
+            return;
+        }
+
+        // If number_float_t is an IEEE-754 single or double precision number,
+        // use the Grisu2 algorithm to produce short numbers which are
+        // guaranteed to round-trip, using strtof and strtod, resp.
+        //
+        // NB: The test below works if <long double> == <double>.
+        static constexpr bool is_ieee_single_or_double
+            = (std::numeric_limits<number_float_t>::is_iec559 && std::numeric_limits<number_float_t>::digits == 24 && std::numeric_limits<number_float_t>::max_exponent == 128) ||
+              (std::numeric_limits<number_float_t>::is_iec559 && std::numeric_limits<number_float_t>::digits == 53 && std::numeric_limits<number_float_t>::max_exponent == 1024);
+
+        dump_float(x, std::integral_constant<bool, is_ieee_single_or_double>());
+    }
+
+    void dump_float(number_float_t x, std::true_type /*is_ieee_single_or_double*/)
+    {
+        auto* begin = number_buffer.data();
+        auto* end = ::nlohmann::detail::to_chars(begin, begin + number_buffer.size(), x);
+
+        o->write_characters(begin, static_cast<size_t>(end - begin));
+    }
+
+    void dump_float(number_float_t x, std::false_type /*is_ieee_single_or_double*/)
+    {
+        // get number of digits for a float -> text -> float round-trip
+        static constexpr auto d = std::numeric_limits<number_float_t>::max_digits10;
+
+        // the actual conversion
+        // NOLINTNEXTLINE(cppcoreguidelines-pro-type-vararg,hicpp-vararg)
+        std::ptrdiff_t len = (std::snprintf)(number_buffer.data(), number_buffer.size(), "%.*g", d, x);
+
+        // negative value indicates an error
+        JSON_ASSERT(len > 0);
+        // check if buffer was large enough
+        JSON_ASSERT(static_cast<std::size_t>(len) < number_buffer.size());
+
+        // erase thousands separator
+        if (thousands_sep != '\0')
+        {
+            // NOLINTNEXTLINE(readability-qualified-auto,llvm-qualified-auto): std::remove returns an iterator, see https://github.com/nlohmann/json/issues/3081
+            const auto end = std::remove(number_buffer.begin(), number_buffer.begin() + len, thousands_sep);
+            std::fill(end, number_buffer.end(), '\0');
+            JSON_ASSERT((end - number_buffer.begin()) <= len);
+            len = (end - number_buffer.begin());
+        }
+
+        // convert decimal point to '.'
+        if (decimal_point != '\0' && decimal_point != '.')
+        {
+            // NOLINTNEXTLINE(readability-qualified-auto,llvm-qualified-auto): std::find returns an iterator, see https://github.com/nlohmann/json/issues/3081
+            const auto dec_pos = std::find(number_buffer.begin(), number_buffer.end(), decimal_point);
+            if (dec_pos != number_buffer.end())
+            {
+                *dec_pos = '.';
+            }
+        }
+
+        o->write_characters(number_buffer.data(), static_cast<std::size_t>(len));
+
+        // determine if we need to append ".0"
+        const bool value_is_int_like =
+            std::none_of(number_buffer.begin(), number_buffer.begin() + len + 1,
+                         [](char c)
+        {
+            return c == '.' || c == 'e';
+        });
+
+        if (value_is_int_like)
+        {
+            o->write_characters(".0", 2);
+        }
+    }
+
+    /*!
+    @brief check whether a string is UTF-8 encoded
+
+    The function checks each byte of a string whether it is UTF-8 encoded. The
+    result of the check is stored in the @a state parameter. The function must
+    be called initially with state 0 (accept). State 1 means the string must
+    be rejected, because the current byte is not allowed. If the string is
+    completely processed, but the state is non-zero, the string ended
+    prematurely; that is, the last byte indicated more bytes should have
+    followed.
+
+    @param[in,out] state  the state of the decoding
+    @param[in,out] codep  codepoint (valid only if resulting state is UTF8_ACCEPT)
+    @param[in] byte       next byte to decode
+    @return               new state
+
+    @note The function has been edited: a std::array is used.
+
+    @copyright Copyright (c) 2008-2009 Bjoern Hoehrmann <bjoern@hoehrmann.de>
+    @sa http://bjoern.hoehrmann.de/utf-8/decoder/dfa/
+    */
+    static std::uint8_t decode(std::uint8_t& state, std::uint32_t& codep, const std::uint8_t byte) noexcept
+    {
+        static const std::array<std::uint8_t, 400> utf8d =
+        {
+            {
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 00..1F
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 20..3F
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 40..5F
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 60..7F
+                1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, // 80..9F
+                7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // A0..BF
+                8, 8, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, // C0..DF
+                0xA, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x4, 0x3, 0x3, // E0..EF
+                0xB, 0x6, 0x6, 0x6, 0x5, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, // F0..FF
+                0x0, 0x1, 0x2, 0x3, 0x5, 0x8, 0x7, 0x1, 0x1, 0x1, 0x4, 0x6, 0x1, 0x1, 0x1, 0x1, // s0..s0
+                1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, // s1..s2
+                1, 2, 1, 1, 1, 1, 1, 2, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, // s3..s4
+                1, 2, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 3, 1, 1, 1, 1, 1, 1, // s5..s6
+                1, 3, 1, 1, 1, 1, 1, 3, 1, 3, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 // s7..s8
+            }
+        };
+
+        JSON_ASSERT(byte < utf8d.size());
+        const std::uint8_t type = utf8d[byte];
+
+        codep = (state != UTF8_ACCEPT)
+                ? (byte & 0x3fu) | (codep << 6u)
+                : (0xFFu >> type) & (byte);
+
+        const std::size_t index = 256u + (static_cast<size_t>(state) * 16u) + static_cast<size_t>(type);
+        JSON_ASSERT(index < utf8d.size());
+        state = utf8d[index];
+        return state;
+    }
+
+    /*
+     * Overload to make the compiler happy while it is instantiating
+     * dump_integer for number_unsigned_t.
+     * Must never be called.
+     */
+    number_unsigned_t remove_sign(number_unsigned_t x)
+    {
+        JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
+        return x; // LCOV_EXCL_LINE
+    }
+
+    /*
+     * Helper function for dump_integer
+     *
+     * This function takes a negative signed integer and returns its absolute
+     * value as unsigned integer. The plus/minus shuffling is necessary as we can
+     * not directly remove the sign of an arbitrary signed integer as the
+     * absolute values of INT_MIN and INT_MAX are usually not the same. See
+     * #1708 for details.
+     */
+    number_unsigned_t remove_sign(number_integer_t x) noexcept
+    {
+        JSON_ASSERT(x < 0 && x < (std::numeric_limits<number_integer_t>::max)()); // NOLINT(misc-redundant-expression)
+        return static_cast<number_unsigned_t>(-(x + 1)) + 1;
+    }
+
+  private:
+    /// the output of the serializer
+    output_adapter_t<char> o = nullptr;
+
+    /// a (hopefully) large enough character buffer
+    std::array<char, 64> number_buffer{{}};
+
+    /// the locale
+    const std::lconv* loc = nullptr;
+    /// the locale's thousand separator character
+    const char thousands_sep = '\0';
+    /// the locale's decimal point character
+    const char decimal_point = '\0';
+
+    /// string buffer
+    std::array<char, 512> string_buffer{{}};
+
+    /// the indentation character
+    const char indent_char;
+    /// the indentation string
+    string_t indent_string;
+
+    /// error_handler how to react on decoding errors
+    const error_handler_t error_handler;
+};
+
+}  // namespace detail
+NLOHMANN_JSON_NAMESPACE_END
+
+// #include <nlohmann/detail/value_t.hpp>
+
+// #include <nlohmann/json_fwd.hpp>
+
+// #include <nlohmann/ordered_map.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013 - 2025 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#include <functional> // equal_to, less
+#include <initializer_list> // initializer_list
+#include <iterator> // input_iterator_tag, iterator_traits
+#include <memory> // allocator
+#include <stdexcept> // for out_of_range
+#include <type_traits> // enable_if, is_convertible
+#include <utility> // pair
+#include <vector> // vector
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/meta/type_traits.hpp>
+
+
+NLOHMANN_JSON_NAMESPACE_BEGIN
+
+/// ordered_map: a minimal map-like container that preserves insertion order
+/// for use within nlohmann::basic_json<ordered_map>
+template <class Key, class T, class IgnoredLess = std::less<Key>,
+          class Allocator = std::allocator<std::pair<const Key, T>>>
+              struct ordered_map : std::vector<std::pair<const Key, T>, Allocator>
+{
+    using key_type = Key;
+    using mapped_type = T;
+    using Container = std::vector<std::pair<const Key, T>, Allocator>;
+    using iterator = typename Container::iterator;
+    using const_iterator = typename Container::const_iterator;
+    using size_type = typename Container::size_type;
+    using value_type = typename Container::value_type;
+#ifdef JSON_HAS_CPP_14
+    using key_compare = std::equal_to<>;
+#else
+    using key_compare = std::equal_to<Key>;
+#endif
+
+    // Explicit constructors instead of `using Container::Container`
+    // otherwise older compilers choke on it (GCC <= 5.5, xcode <= 9.4)
+    ordered_map() noexcept(noexcept(Container())) : Container{} {}
+    explicit ordered_map(const Allocator& alloc) noexcept(noexcept(Container(alloc))) : Container{alloc} {}
+    template <class It>
+    ordered_map(It first, It last, const Allocator& alloc = Allocator())
+        : Container{first, last, alloc} {}
+    ordered_map(std::initializer_list<value_type> init, const Allocator& alloc = Allocator() )
+        : Container{init, alloc} {}
+
+    std::pair<iterator, bool> emplace(const key_type& key, T&& t)
+    {
+        for (auto it = this->begin(); it != this->end(); ++it)
+        {
+            if (m_compare(it->first, key))
+            {
+                return {it, false};
+            }
+        }
+        Container::emplace_back(key, std::forward<T>(t));
+        return {std::prev(this->end()), true};
+    }
+
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_key_type<key_compare, key_type, KeyType>::value, int> = 0>
+    std::pair<iterator, bool> emplace(KeyType && key, T && t)
+    {
+        for (auto it = this->begin(); it != this->end(); ++it)
+        {
+            if (m_compare(it->first, key))
+            {
+                return {it, false};
+            }
+        }
+        Container::emplace_back(std::forward<KeyType>(key), std::forward<T>(t));
+        return {std::prev(this->end()), true};
+    }
+
+    T& operator[](const key_type& key)
+    {
+        return emplace(key, T{}).first->second;
+    }
+
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_key_type<key_compare, key_type, KeyType>::value, int> = 0>
+    T & operator[](KeyType && key)
+    {
+        return emplace(std::forward<KeyType>(key), T{}).first->second;
+    }
+
+    const T& operator[](const key_type& key) const
+    {
+        return at(key);
+    }
+
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_key_type<key_compare, key_type, KeyType>::value, int> = 0>
+    const T & operator[](KeyType && key) const
+    {
+        return at(std::forward<KeyType>(key));
+    }
+
+    T& at(const key_type& key)
+    {
+        for (auto it = this->begin(); it != this->end(); ++it)
+        {
+            if (m_compare(it->first, key))
+            {
+                return it->second;
+            }
+        }
+
+        JSON_THROW(std::out_of_range("key not found"));
+    }
+
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_key_type<key_compare, key_type, KeyType>::value, int> = 0>
+    T & at(KeyType && key) // NOLINT(cppcoreguidelines-missing-std-forward)
+    {
+        for (auto it = this->begin(); it != this->end(); ++it)
+        {
+            if (m_compare(it->first, key))
+            {
+                return it->second;
+            }
+        }
+
+        JSON_THROW(std::out_of_range("key not found"));
+    }
+
+    const T& at(const key_type& key) const
+    {
+        for (auto it = this->begin(); it != this->end(); ++it)
+        {
+            if (m_compare(it->first, key))
+            {
+                return it->second;
+            }
+        }
+
+        JSON_THROW(std::out_of_range("key not found"));
+    }
+
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_key_type<key_compare, key_type, KeyType>::value, int> = 0>
+    const T & at(KeyType && key) const // NOLINT(cppcoreguidelines-missing-std-forward)
+    {
+        for (auto it = this->begin(); it != this->end(); ++it)
+        {
+            if (m_compare(it->first, key))
+            {
+                return it->second;
+            }
+        }
+
+        JSON_THROW(std::out_of_range("key not found"));
+    }
+
+    size_type erase(const key_type& key)
+    {
+        for (auto it = this->begin(); it != this->end(); ++it)
+        {
+            if (m_compare(it->first, key))
+            {
+                // Since we cannot move const Keys, re-construct them in place
+                for (auto next = it; ++next != this->end(); ++it)
+                {
+                    it->~value_type(); // Destroy but keep allocation
+                    new (&*it) value_type{std::move(*next)};
+                }
+                Container::pop_back();
+                return 1;
+            }
+        }
+        return 0;
+    }
+
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_key_type<key_compare, key_type, KeyType>::value, int> = 0>
+    size_type erase(KeyType && key) // NOLINT(cppcoreguidelines-missing-std-forward)
+    {
+        for (auto it = this->begin(); it != this->end(); ++it)
+        {
+            if (m_compare(it->first, key))
+            {
+                // Since we cannot move const Keys, re-construct them in place
+                for (auto next = it; ++next != this->end(); ++it)
+                {
+                    it->~value_type(); // Destroy but keep allocation
+                    new (&*it) value_type{std::move(*next)};
+                }
+                Container::pop_back();
+                return 1;
+            }
+        }
+        return 0;
+    }
+
+    iterator erase(iterator pos)
+    {
+        return erase(pos, std::next(pos));
+    }
+
+    iterator erase(iterator first, iterator last)
+    {
+        if (first == last)
+        {
+            return first;
+        }
+
+        const auto elements_affected = std::distance(first, last);
+        const auto offset = std::distance(Container::begin(), first);
+
+        // This is the start situation. We need to delete elements_affected
+        // elements (3 in this example: e, f, g), and need to return an
+        // iterator past the last deleted element (h in this example).
+        // Note that offset is the distance from the start of the vector
+        // to first. We will need this later.
+
+        // [ a, b, c, d, e, f, g, h, i, j ]
+        //               ^        ^
+        //             first    last
+
+        // Since we cannot move const Keys, we re-construct them in place.
+        // We start at first and re-construct (viz. copy) the elements from
+        // the back of the vector. Example for first iteration:
+
+        //               ,--------.
+        //               v        |   destroy e and re-construct with h
+        // [ a, b, c, d, e, f, g, h, i, j ]
+        //               ^        ^
+        //               it       it + elements_affected
+
+        for (auto it = first; std::next(it, elements_affected) != Container::end(); ++it)
+        {
+            it->~value_type(); // destroy but keep allocation
+            new (&*it) value_type{std::move(*std::next(it, elements_affected))}; // "move" next element to it
+        }
+
+        // [ a, b, c, d, h, i, j, h, i, j ]
+        //               ^        ^
+        //             first    last
+
+        // remove the unneeded elements at the end of the vector
+        Container::resize(this->size() - static_cast<size_type>(elements_affected));
+
+        // [ a, b, c, d, h, i, j ]
+        //               ^        ^
+        //             first    last
+
+        // first is now pointing past the last deleted element, but we cannot
+        // use this iterator, because it may have been invalidated by the
+        // resize call. Instead, we can return begin() + offset.
+        return Container::begin() + offset;
+    }
+
+    size_type count(const key_type& key) const
+    {
+        for (auto it = this->begin(); it != this->end(); ++it)
+        {
+            if (m_compare(it->first, key))
+            {
+                return 1;
+            }
+        }
+        return 0;
+    }
+
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_key_type<key_compare, key_type, KeyType>::value, int> = 0>
+    size_type count(KeyType && key) const // NOLINT(cppcoreguidelines-missing-std-forward)
+    {
+        for (auto it = this->begin(); it != this->end(); ++it)
+        {
+            if (m_compare(it->first, key))
+            {
+                return 1;
+            }
+        }
+        return 0;
+    }
+
+    iterator find(const key_type& key)
+    {
+        for (auto it = this->begin(); it != this->end(); ++it)
+        {
+            if (m_compare(it->first, key))
+            {
+                return it;
+            }
+        }
+        return Container::end();
+    }
+
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_key_type<key_compare, key_type, KeyType>::value, int> = 0>
+    iterator find(KeyType && key) // NOLINT(cppcoreguidelines-missing-std-forward)
+    {
+        for (auto it = this->begin(); it != this->end(); ++it)
+        {
+            if (m_compare(it->first, key))
+            {
+                return it;
+            }
+        }
+        return Container::end();
+    }
+
+    const_iterator find(const key_type& key) const
+    {
+        for (auto it = this->begin(); it != this->end(); ++it)
+        {
+            if (m_compare(it->first, key))
+            {
+                return it;
+            }
+        }
+        return Container::end();
+    }
+
+    std::pair<iterator, bool> insert( value_type&& value )
+    {
+        return emplace(value.first, std::move(value.second));
+    }
+
+    std::pair<iterator, bool> insert( const value_type& value )
+    {
+        for (auto it = this->begin(); it != this->end(); ++it)
+        {
+            if (m_compare(it->first, value.first))
+            {
+                return {it, false};
+            }
+        }
+        Container::push_back(value);
+        return {--this->end(), true};
+    }
+
+    template<typename InputIt>
+    using require_input_iter = typename std::enable_if<std::is_convertible<typename std::iterator_traits<InputIt>::iterator_category,
+        std::input_iterator_tag>::value>::type;
+
+    template<typename InputIt, typename = require_input_iter<InputIt>>
+    void insert(InputIt first, InputIt last)
+    {
+        for (auto it = first; it != last; ++it)
+        {
+            insert(*it);
+        }
+    }
+
+private:
+    JSON_NO_UNIQUE_ADDRESS key_compare m_compare = key_compare();
+};
+
+NLOHMANN_JSON_NAMESPACE_END
+
+
+#if defined(JSON_HAS_CPP_17)
+    #if JSON_HAS_STATIC_RTTI
+        #include <any>
+    #endif
+    #include <string_view>
+#endif
+
+/*!
+@brief namespace for Niels Lohmann
+@see https://github.com/nlohmann
+@since version 1.0.0
+*/
+NLOHMANN_JSON_NAMESPACE_BEGIN
+
+/*!
+@brief a class to store JSON values
+
+@internal
+@invariant The member variables @a m_value and @a m_type have the following
+relationship:
+- If `m_type == value_t::object`, then `m_value.object != nullptr`.
+- If `m_type == value_t::array`, then `m_value.array != nullptr`.
+- If `m_type == value_t::string`, then `m_value.string != nullptr`.
+The invariants are checked by member function assert_invariant().
+
+@note ObjectType trick from https://stackoverflow.com/a/9860911
+@endinternal
+
+@since version 1.0.0
+
+@nosubgrouping
+*/
+NLOHMANN_BASIC_JSON_TPL_DECLARATION
+class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-special-member-functions)
+    : public ::nlohmann::detail::json_base_class<CustomBaseClass>
+{
+  private:
+    template<detail::value_t> friend struct detail::external_constructor;
+
+    template<typename>
+    friend class ::nlohmann::json_pointer;
+    // can be restored when json_pointer backwards compatibility is removed
+    // friend ::nlohmann::json_pointer<StringType>;
+
+    template<typename BasicJsonType, typename InputType>
+    friend class ::nlohmann::detail::parser;
+    friend ::nlohmann::detail::serializer<basic_json>;
+    template<typename BasicJsonType>
+    friend class ::nlohmann::detail::iter_impl;
+    template<typename BasicJsonType, typename CharType>
+    friend class ::nlohmann::detail::binary_writer;
+    template<typename BasicJsonType, typename InputType, typename SAX>
+    friend class ::nlohmann::detail::binary_reader;
+    template<typename BasicJsonType, typename InputAdapterType>
+    friend class ::nlohmann::detail::json_sax_dom_parser;
+    template<typename BasicJsonType, typename InputAdapterType>
+    friend class ::nlohmann::detail::json_sax_dom_callback_parser;
+    friend class ::nlohmann::detail::exception;
+
+    /// workaround type for MSVC
+    using basic_json_t = NLOHMANN_BASIC_JSON_TPL;
+    using json_base_class_t = ::nlohmann::detail::json_base_class<CustomBaseClass>;
+
+  JSON_PRIVATE_UNLESS_TESTED:
+    // convenience aliases for types residing in namespace detail;
+    using lexer = ::nlohmann::detail::lexer_base<basic_json>;
+
+    template<typename InputAdapterType>
+    static ::nlohmann::detail::parser<basic_json, InputAdapterType> parser(
+        InputAdapterType adapter,
+        detail::parser_callback_t<basic_json>cb = nullptr,
+        const bool allow_exceptions = true,
+        const bool ignore_comments = false
+                                 )
+    {
+        return ::nlohmann::detail::parser<basic_json, InputAdapterType>(std::move(adapter),
+            std::move(cb), allow_exceptions, ignore_comments);
+    }
+
+  private:
+    using primitive_iterator_t = ::nlohmann::detail::primitive_iterator_t;
+    template<typename BasicJsonType>
+    using internal_iterator = ::nlohmann::detail::internal_iterator<BasicJsonType>;
+    template<typename BasicJsonType>
+    using iter_impl = ::nlohmann::detail::iter_impl<BasicJsonType>;
+    template<typename Iterator>
+    using iteration_proxy = ::nlohmann::detail::iteration_proxy<Iterator>;
+    template<typename Base> using json_reverse_iterator = ::nlohmann::detail::json_reverse_iterator<Base>;
+
+    template<typename CharType>
+    using output_adapter_t = ::nlohmann::detail::output_adapter_t<CharType>;
+
+    template<typename InputType>
+    using binary_reader = ::nlohmann::detail::binary_reader<basic_json, InputType>;
+    template<typename CharType> using binary_writer = ::nlohmann::detail::binary_writer<basic_json, CharType>;
+
+  JSON_PRIVATE_UNLESS_TESTED:
+    using serializer = ::nlohmann::detail::serializer<basic_json>;
+
+  public:
+    using value_t = detail::value_t;
+    /// JSON Pointer, see @ref nlohmann::json_pointer
+    using json_pointer = ::nlohmann::json_pointer<StringType>;
+    template<typename T, typename SFINAE>
+    using json_serializer = JSONSerializer<T, SFINAE>;
+    /// how to treat decoding errors
+    using error_handler_t = detail::error_handler_t;
+    /// how to treat CBOR tags
+    using cbor_tag_handler_t = detail::cbor_tag_handler_t;
+    /// how to encode BJData
+    using bjdata_version_t = detail::bjdata_version_t;
+    /// helper type for initializer lists of basic_json values
+    using initializer_list_t = std::initializer_list<detail::json_ref<basic_json>>;
+
+    using input_format_t = detail::input_format_t;
+    /// SAX interface type, see @ref nlohmann::json_sax
+    using json_sax_t = json_sax<basic_json>;
+
+    ////////////////
+    // exceptions //
+    ////////////////
+
+    /// @name exceptions
+    /// Classes to implement user-defined exceptions.
+    /// @{
+
+    using exception = detail::exception;
+    using parse_error = detail::parse_error;
+    using invalid_iterator = detail::invalid_iterator;
+    using type_error = detail::type_error;
+    using out_of_range = detail::out_of_range;
+    using other_error = detail::other_error;
+
+    /// @}
+
+    /////////////////////
+    // container types //
+    /////////////////////
+
+    /// @name container types
+    /// The canonic container types to use @ref basic_json like any other STL
+    /// container.
+    /// @{
+
+    /// the type of elements in a basic_json container
+    using value_type = basic_json;
+
+    /// the type of an element reference
+    using reference = value_type&;
+    /// the type of an element const reference
+    using const_reference = const value_type&;
+
+    /// a type to represent differences between iterators
+    using difference_type = std::ptrdiff_t;
+    /// a type to represent container sizes
+    using size_type = std::size_t;
+
+    /// the allocator type
+    using allocator_type = AllocatorType<basic_json>;
+
+    /// the type of an element pointer
+    using pointer = typename std::allocator_traits<allocator_type>::pointer;
+    /// the type of an element const pointer
+    using const_pointer = typename std::allocator_traits<allocator_type>::const_pointer;
+
+    /// an iterator for a basic_json container
+    using iterator = iter_impl<basic_json>;
+    /// a const iterator for a basic_json container
+    using const_iterator = iter_impl<const basic_json>;
+    /// a reverse iterator for a basic_json container
+    using reverse_iterator = json_reverse_iterator<typename basic_json::iterator>;
+    /// a const reverse iterator for a basic_json container
+    using const_reverse_iterator = json_reverse_iterator<typename basic_json::const_iterator>;
+
+    /// @}
+
+    /// @brief returns the allocator associated with the container
+    /// @sa https://json.nlohmann.me/api/basic_json/get_allocator/
+    static allocator_type get_allocator()
+    {
+        return allocator_type();
+    }
+
+    /// @brief returns version information on the library
+    /// @sa https://json.nlohmann.me/api/basic_json/meta/
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json meta()
+    {
+        basic_json result;
+
+        result["copyright"] = "(C) 2013-2025 Niels Lohmann";
+        result["name"] = "JSON for Modern C++";
+        result["url"] = "https://github.com/nlohmann/json";
+        result["version"]["string"] =
+            detail::concat(std::to_string(NLOHMANN_JSON_VERSION_MAJOR), '.',
+                           std::to_string(NLOHMANN_JSON_VERSION_MINOR), '.',
+                           std::to_string(NLOHMANN_JSON_VERSION_PATCH));
+        result["version"]["major"] = NLOHMANN_JSON_VERSION_MAJOR;
+        result["version"]["minor"] = NLOHMANN_JSON_VERSION_MINOR;
+        result["version"]["patch"] = NLOHMANN_JSON_VERSION_PATCH;
+
+#ifdef _WIN32
+        result["platform"] = "win32";
+#elif defined __linux__
+        result["platform"] = "linux";
+#elif defined __APPLE__
+        result["platform"] = "apple";
+#elif defined __unix__
+        result["platform"] = "unix";
+#else
+        result["platform"] = "unknown";
+#endif
+
+#if defined(__ICC) || defined(__INTEL_COMPILER)
+        result["compiler"] = {{"family", "icc"}, {"version", __INTEL_COMPILER}};
+#elif defined(__clang__)
+        result["compiler"] = {{"family", "clang"}, {"version", __clang_version__}};
+#elif defined(__GNUC__) || defined(__GNUG__)
+        result["compiler"] = {{"family", "gcc"}, {"version", detail::concat(
+                    std::to_string(__GNUC__), '.',
+                    std::to_string(__GNUC_MINOR__), '.',
+                    std::to_string(__GNUC_PATCHLEVEL__))
+            }
+        };
+#elif defined(__HP_cc) || defined(__HP_aCC)
+        result["compiler"] = "hp"
+#elif defined(__IBMCPP__)
+        result["compiler"] = {{"family", "ilecpp"}, {"version", __IBMCPP__}};
+#elif defined(_MSC_VER)
+        result["compiler"] = {{"family", "msvc"}, {"version", _MSC_VER}};
+#elif defined(__PGI)
+        result["compiler"] = {{"family", "pgcpp"}, {"version", __PGI}};
+#elif defined(__SUNPRO_CC)
+        result["compiler"] = {{"family", "sunpro"}, {"version", __SUNPRO_CC}};
+#else
+        result["compiler"] = {{"family", "unknown"}, {"version", "unknown"}};
+#endif
+
+#if defined(_MSVC_LANG)
+        result["compiler"]["c++"] = std::to_string(_MSVC_LANG);
+#elif defined(__cplusplus)
+        result["compiler"]["c++"] = std::to_string(__cplusplus);
+#else
+        result["compiler"]["c++"] = "unknown";
+#endif
+        return result;
+    }
+
+    ///////////////////////////
+    // JSON value data types //
+    ///////////////////////////
+
+    /// @name JSON value data types
+    /// The data types to store a JSON value. These types are derived from
+    /// the template arguments passed to class @ref basic_json.
+    /// @{
+
+    /// @brief default object key comparator type
+    /// The actual object key comparator type (@ref object_comparator_t) may be
+    /// different.
+    /// @sa https://json.nlohmann.me/api/basic_json/default_object_comparator_t/
+#if defined(JSON_HAS_CPP_14)
+    // use of transparent comparator avoids unnecessary repeated construction of temporaries
+    // in functions involving lookup by key with types other than object_t::key_type (aka. StringType)
+    using default_object_comparator_t = std::less<>;
+#else
+    using default_object_comparator_t = std::less<StringType>;
+#endif
+
+    /// @brief a type for an object
+    /// @sa https://json.nlohmann.me/api/basic_json/object_t/
+    using object_t = ObjectType<StringType,
+          basic_json,
+          default_object_comparator_t,
+          AllocatorType<std::pair<const StringType,
+          basic_json>>>;
+
+    /// @brief a type for an array
+    /// @sa https://json.nlohmann.me/api/basic_json/array_t/
+    using array_t = ArrayType<basic_json, AllocatorType<basic_json>>;
+
+    /// @brief a type for a string
+    /// @sa https://json.nlohmann.me/api/basic_json/string_t/
+    using string_t = StringType;
+
+    /// @brief a type for a boolean
+    /// @sa https://json.nlohmann.me/api/basic_json/boolean_t/
+    using boolean_t = BooleanType;
+
+    /// @brief a type for a number (integer)
+    /// @sa https://json.nlohmann.me/api/basic_json/number_integer_t/
+    using number_integer_t = NumberIntegerType;
+
+    /// @brief a type for a number (unsigned)
+    /// @sa https://json.nlohmann.me/api/basic_json/number_unsigned_t/
+    using number_unsigned_t = NumberUnsignedType;
+
+    /// @brief a type for a number (floating-point)
+    /// @sa https://json.nlohmann.me/api/basic_json/number_float_t/
+    using number_float_t = NumberFloatType;
+
+    /// @brief a type for a packed binary type
+    /// @sa https://json.nlohmann.me/api/basic_json/binary_t/
+    using binary_t = nlohmann::byte_container_with_subtype<BinaryType>;
+
+    /// @brief object key comparator type
+    /// @sa https://json.nlohmann.me/api/basic_json/object_comparator_t/
+    using object_comparator_t = detail::actual_object_comparator_t<basic_json>;
+
+    /// @}
+
+  private:
+
+    /// helper for exception-safe object creation
+    template<typename T, typename... Args>
+    JSON_HEDLEY_RETURNS_NON_NULL
+    static T* create(Args&& ... args)
+    {
+        AllocatorType<T> alloc;
+        using AllocatorTraits = std::allocator_traits<AllocatorType<T>>;
+
+        auto deleter = [&](T * obj)
+        {
+            AllocatorTraits::deallocate(alloc, obj, 1);
+        };
+        std::unique_ptr<T, decltype(deleter)> obj(AllocatorTraits::allocate(alloc, 1), deleter);
+        AllocatorTraits::construct(alloc, obj.get(), std::forward<Args>(args)...);
+        JSON_ASSERT(obj != nullptr);
+        return obj.release();
+    }
+
+    ////////////////////////
+    // JSON value storage //
+    ////////////////////////
+
+  JSON_PRIVATE_UNLESS_TESTED:
+    /*!
+    @brief a JSON value
+
+    The actual storage for a JSON value of the @ref basic_json class. This
+    union combines the different storage types for the JSON value types
+    defined in @ref value_t.
+
+    JSON type | value_t type    | used type
+    --------- | --------------- | ------------------------
+    object    | object          | pointer to @ref object_t
+    array     | array           | pointer to @ref array_t
+    string    | string          | pointer to @ref string_t
+    boolean   | boolean         | @ref boolean_t
+    number    | number_integer  | @ref number_integer_t
+    number    | number_unsigned | @ref number_unsigned_t
+    number    | number_float    | @ref number_float_t
+    binary    | binary          | pointer to @ref binary_t
+    null      | null            | *no value is stored*
+
+    @note Variable-length types (objects, arrays, and strings) are stored as
+    pointers. The size of the union should not exceed 64 bits if the default
+    value types are used.
+
+    @since version 1.0.0
+    */
+    union json_value
+    {
+        /// object (stored with pointer to save storage)
+        object_t* object;
+        /// array (stored with pointer to save storage)
+        array_t* array;
+        /// string (stored with pointer to save storage)
+        string_t* string;
+        /// binary (stored with pointer to save storage)
+        binary_t* binary;
+        /// boolean
+        boolean_t boolean;
+        /// number (integer)
+        number_integer_t number_integer;
+        /// number (unsigned integer)
+        number_unsigned_t number_unsigned;
+        /// number (floating-point)
+        number_float_t number_float;
+
+        /// default constructor (for null values)
+        json_value() = default;
+        /// constructor for booleans
+        json_value(boolean_t v) noexcept : boolean(v) {}
+        /// constructor for numbers (integer)
+        json_value(number_integer_t v) noexcept : number_integer(v) {}
+        /// constructor for numbers (unsigned)
+        json_value(number_unsigned_t v) noexcept : number_unsigned(v) {}
+        /// constructor for numbers (floating-point)
+        json_value(number_float_t v) noexcept : number_float(v) {}
+        /// constructor for empty values of a given type
+        json_value(value_t t)
+        {
+            switch (t)
+            {
+                case value_t::object:
+                {
+                    object = create<object_t>();
+                    break;
+                }
+
+                case value_t::array:
+                {
+                    array = create<array_t>();
+                    break;
+                }
+
+                case value_t::string:
+                {
+                    string = create<string_t>("");
+                    break;
+                }
+
+                case value_t::binary:
+                {
+                    binary = create<binary_t>();
+                    break;
+                }
+
+                case value_t::boolean:
+                {
+                    boolean = static_cast<boolean_t>(false);
+                    break;
+                }
+
+                case value_t::number_integer:
+                {
+                    number_integer = static_cast<number_integer_t>(0);
+                    break;
+                }
+
+                case value_t::number_unsigned:
+                {
+                    number_unsigned = static_cast<number_unsigned_t>(0);
+                    break;
+                }
+
+                case value_t::number_float:
+                {
+                    number_float = static_cast<number_float_t>(0.0);
+                    break;
+                }
+
+                case value_t::null:
+                {
+                    object = nullptr;  // silence warning, see #821
+                    break;
+                }
+
+                case value_t::discarded:
+                default:
+                {
+                    object = nullptr;  // silence warning, see #821
+                    if (JSON_HEDLEY_UNLIKELY(t == value_t::null))
+                    {
+                        JSON_THROW(other_error::create(500, "961c151d2e87f2686a955a9be24d316f1362bf21 3.12.0", nullptr)); // LCOV_EXCL_LINE
+                    }
+                    break;
+                }
+            }
+        }
+
+        /// constructor for strings
+        json_value(const string_t& value) : string(create<string_t>(value)) {}
+
+        /// constructor for rvalue strings
+        json_value(string_t&& value) : string(create<string_t>(std::move(value))) {}
+
+        /// constructor for objects
+        json_value(const object_t& value) : object(create<object_t>(value)) {}
+
+        /// constructor for rvalue objects
+        json_value(object_t&& value) : object(create<object_t>(std::move(value))) {}
+
+        /// constructor for arrays
+        json_value(const array_t& value) : array(create<array_t>(value)) {}
+
+        /// constructor for rvalue arrays
+        json_value(array_t&& value) : array(create<array_t>(std::move(value))) {}
+
+        /// constructor for binary arrays
+        json_value(const typename binary_t::container_type& value) : binary(create<binary_t>(value)) {}
+
+        /// constructor for rvalue binary arrays
+        json_value(typename binary_t::container_type&& value) : binary(create<binary_t>(std::move(value))) {}
+
+        /// constructor for binary arrays (internal type)
+        json_value(const binary_t& value) : binary(create<binary_t>(value)) {}
+
+        /// constructor for rvalue binary arrays (internal type)
+        json_value(binary_t&& value) : binary(create<binary_t>(std::move(value))) {}
+
+        void destroy(value_t t)
+        {
+            if (
+                (t == value_t::object && object == nullptr) ||
+                (t == value_t::array && array == nullptr) ||
+                (t == value_t::string && string == nullptr) ||
+                (t == value_t::binary && binary == nullptr)
+            )
+            {
+                //not initialized (e.g. due to exception in the ctor)
+                return;
+            }
+            if (t == value_t::array || t == value_t::object)
+            {
+                // flatten the current json_value to a heap-allocated stack
+                std::vector<basic_json> stack;
+
+                // move the top-level items to stack
+                if (t == value_t::array)
+                {
+                    stack.reserve(array->size());
+                    std::move(array->begin(), array->end(), std::back_inserter(stack));
+                }
+                else
+                {
+                    stack.reserve(object->size());
+                    for (auto&& it : *object)
+                    {
+                        stack.push_back(std::move(it.second));
+                    }
+                }
+
+                while (!stack.empty())
+                {
+                    // move the last item to local variable to be processed
+                    basic_json current_item(std::move(stack.back()));
+                    stack.pop_back();
+
+                    // if current_item is array/object, move
+                    // its children to the stack to be processed later
+                    if (current_item.is_array())
+                    {
+                        std::move(current_item.m_data.m_value.array->begin(), current_item.m_data.m_value.array->end(), std::back_inserter(stack));
+
+                        current_item.m_data.m_value.array->clear();
+                    }
+                    else if (current_item.is_object())
+                    {
+                        for (auto&& it : *current_item.m_data.m_value.object)
+                        {
+                            stack.push_back(std::move(it.second));
+                        }
+
+                        current_item.m_data.m_value.object->clear();
+                    }
+
+                    // it's now safe that current_item get destructed
+                    // since it doesn't have any children
+                }
+            }
+
+            switch (t)
+            {
+                case value_t::object:
+                {
+                    AllocatorType<object_t> alloc;
+                    std::allocator_traits<decltype(alloc)>::destroy(alloc, object);
+                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, object, 1);
+                    break;
+                }
+
+                case value_t::array:
+                {
+                    AllocatorType<array_t> alloc;
+                    std::allocator_traits<decltype(alloc)>::destroy(alloc, array);
+                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, array, 1);
+                    break;
+                }
+
+                case value_t::string:
+                {
+                    AllocatorType<string_t> alloc;
+                    std::allocator_traits<decltype(alloc)>::destroy(alloc, string);
+                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, string, 1);
+                    break;
+                }
+
+                case value_t::binary:
+                {
+                    AllocatorType<binary_t> alloc;
+                    std::allocator_traits<decltype(alloc)>::destroy(alloc, binary);
+                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, binary, 1);
+                    break;
+                }
+
+                case value_t::null:
+                case value_t::boolean:
+                case value_t::number_integer:
+                case value_t::number_unsigned:
+                case value_t::number_float:
+                case value_t::discarded:
+                default:
+                {
+                    break;
+                }
+            }
+        }
+    };
+
+  private:
+    /*!
+    @brief checks the class invariants
+
+    This function asserts the class invariants. It needs to be called at the
+    end of every constructor to make sure that created objects respect the
+    invariant. Furthermore, it has to be called each time the type of a JSON
+    value is changed, because the invariant expresses a relationship between
+    @a m_type and @a m_value.
+
+    Furthermore, the parent relation is checked for arrays and objects: If
+    @a check_parents true and the value is an array or object, then the
+    container's elements must have the current value as parent.
+
+    @param[in] check_parents  whether the parent relation should be checked.
+               The value is true by default and should only be set to false
+               during destruction of objects when the invariant does not
+               need to hold.
+    */
+    void assert_invariant(bool check_parents = true) const noexcept
+    {
+        JSON_ASSERT(m_data.m_type != value_t::object || m_data.m_value.object != nullptr);
+        JSON_ASSERT(m_data.m_type != value_t::array || m_data.m_value.array != nullptr);
+        JSON_ASSERT(m_data.m_type != value_t::string || m_data.m_value.string != nullptr);
+        JSON_ASSERT(m_data.m_type != value_t::binary || m_data.m_value.binary != nullptr);
+
+#if JSON_DIAGNOSTICS
+        JSON_TRY
+        {
+            // cppcheck-suppress assertWithSideEffect
+            JSON_ASSERT(!check_parents || !is_structured() || std::all_of(begin(), end(), [this](const basic_json & j)
+            {
+                return j.m_parent == this;
+            }));
+        }
+        JSON_CATCH(...) {} // LCOV_EXCL_LINE
+#endif
+        static_cast<void>(check_parents);
+    }
+
+    void set_parents()
+    {
+#if JSON_DIAGNOSTICS
+        switch (m_data.m_type)
+        {
+            case value_t::array:
+            {
+                for (auto& element : *m_data.m_value.array)
+                {
+                    element.m_parent = this;
+                }
+                break;
+            }
+
+            case value_t::object:
+            {
+                for (auto& element : *m_data.m_value.object)
+                {
+                    element.second.m_parent = this;
+                }
+                break;
+            }
+
+            case value_t::null:
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+                break;
+        }
+#endif
+    }
+
+    iterator set_parents(iterator it, typename iterator::difference_type count_set_parents)
+    {
+#if JSON_DIAGNOSTICS
+        for (typename iterator::difference_type i = 0; i < count_set_parents; ++i)
+        {
+            (it + i)->m_parent = this;
+        }
+#else
+        static_cast<void>(count_set_parents);
+#endif
+        return it;
+    }
+
+    reference set_parent(reference j, std::size_t old_capacity = detail::unknown_size())
+    {
+#if JSON_DIAGNOSTICS
+        if (old_capacity != detail::unknown_size())
+        {
+            // see https://github.com/nlohmann/json/issues/2838
+            JSON_ASSERT(type() == value_t::array);
+            if (JSON_HEDLEY_UNLIKELY(m_data.m_value.array->capacity() != old_capacity))
+            {
+                // capacity has changed: update all parents
+                set_parents();
+                return j;
+            }
+        }
+
+        // ordered_json uses a vector internally, so pointers could have
+        // been invalidated; see https://github.com/nlohmann/json/issues/2962
+#ifdef JSON_HEDLEY_MSVC_VERSION
+#pragma warning(push )
+#pragma warning(disable : 4127) // ignore warning to replace if with if constexpr
+#endif
+        if (detail::is_ordered_map<object_t>::value)
+        {
+            set_parents();
+            return j;
+        }
+#ifdef JSON_HEDLEY_MSVC_VERSION
+#pragma warning( pop )
+#endif
+
+        j.m_parent = this;
+#else
+        static_cast<void>(j);
+        static_cast<void>(old_capacity);
+#endif
+        return j;
+    }
+
+  public:
+    //////////////////////////
+    // JSON parser callback //
+    //////////////////////////
+
+    /// @brief parser event types
+    /// @sa https://json.nlohmann.me/api/basic_json/parse_event_t/
+    using parse_event_t = detail::parse_event_t;
+
+    /// @brief per-element parser callback type
+    /// @sa https://json.nlohmann.me/api/basic_json/parser_callback_t/
+    using parser_callback_t = detail::parser_callback_t<basic_json>;
+
+    //////////////////
+    // constructors //
+    //////////////////
+
+    /// @name constructors and destructors
+    /// Constructors of class @ref basic_json, copy/move constructor, copy
+    /// assignment, static functions creating objects, and the destructor.
+    /// @{
+
+    /// @brief create an empty value with a given type
+    /// @sa https://json.nlohmann.me/api/basic_json/basic_json/
+    basic_json(const value_t v)
+        : m_data(v)
+    {
+        assert_invariant();
+    }
+
+    /// @brief create a null object
+    /// @sa https://json.nlohmann.me/api/basic_json/basic_json/
+    basic_json(std::nullptr_t = nullptr) noexcept // NOLINT(bugprone-exception-escape)
+        : basic_json(value_t::null)
+    {
+        assert_invariant();
+    }
+
+    /// @brief create a JSON value from compatible types
+    /// @sa https://json.nlohmann.me/api/basic_json/basic_json/
+    template < typename CompatibleType,
+               typename U = detail::uncvref_t<CompatibleType>,
+               detail::enable_if_t <
+                   !detail::is_basic_json<U>::value && detail::is_compatible_type<basic_json_t, U>::value, int > = 0 >
+    basic_json(CompatibleType && val) noexcept(noexcept( // NOLINT(bugprone-forwarding-reference-overload,bugprone-exception-escape)
+            JSONSerializer<U>::to_json(std::declval<basic_json_t&>(),
+                                       std::forward<CompatibleType>(val))))
+    {
+        JSONSerializer<U>::to_json(*this, std::forward<CompatibleType>(val));
+        set_parents();
+        assert_invariant();
+    }
+
+    /// @brief create a JSON value from an existing one
+    /// @sa https://json.nlohmann.me/api/basic_json/basic_json/
+    template < typename BasicJsonType,
+               detail::enable_if_t <
+                   detail::is_basic_json<BasicJsonType>::value&& !std::is_same<basic_json, BasicJsonType>::value, int > = 0 >
+    basic_json(const BasicJsonType& val)
+#if JSON_DIAGNOSTIC_POSITIONS
+        : start_position(val.start_pos()),
+          end_position(val.end_pos())
+#endif
+    {
+        using other_boolean_t = typename BasicJsonType::boolean_t;
+        using other_number_float_t = typename BasicJsonType::number_float_t;
+        using other_number_integer_t = typename BasicJsonType::number_integer_t;
+        using other_number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+        using other_string_t = typename BasicJsonType::string_t;
+        using other_object_t = typename BasicJsonType::object_t;
+        using other_array_t = typename BasicJsonType::array_t;
+        using other_binary_t = typename BasicJsonType::binary_t;
+
+        switch (val.type())
+        {
+            case value_t::boolean:
+                JSONSerializer<other_boolean_t>::to_json(*this, val.template get<other_boolean_t>());
+                break;
+            case value_t::number_float:
+                JSONSerializer<other_number_float_t>::to_json(*this, val.template get<other_number_float_t>());
+                break;
+            case value_t::number_integer:
+                JSONSerializer<other_number_integer_t>::to_json(*this, val.template get<other_number_integer_t>());
+                break;
+            case value_t::number_unsigned:
+                JSONSerializer<other_number_unsigned_t>::to_json(*this, val.template get<other_number_unsigned_t>());
+                break;
+            case value_t::string:
+                JSONSerializer<other_string_t>::to_json(*this, val.template get_ref<const other_string_t&>());
+                break;
+            case value_t::object:
+                JSONSerializer<other_object_t>::to_json(*this, val.template get_ref<const other_object_t&>());
+                break;
+            case value_t::array:
+                JSONSerializer<other_array_t>::to_json(*this, val.template get_ref<const other_array_t&>());
+                break;
+            case value_t::binary:
+                JSONSerializer<other_binary_t>::to_json(*this, val.template get_ref<const other_binary_t&>());
+                break;
+            case value_t::null:
+                *this = nullptr;
+                break;
+            case value_t::discarded:
+                m_data.m_type = value_t::discarded;
+                break;
+            default:            // LCOV_EXCL_LINE
+                JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
+        }
+        JSON_ASSERT(m_data.m_type == val.type());
+
+        set_parents();
+        assert_invariant();
+    }
+
+    /// @brief create a container (array or object) from an initializer list
+    /// @sa https://json.nlohmann.me/api/basic_json/basic_json/
+    basic_json(initializer_list_t init,
+               bool type_deduction = true,
+               value_t manual_type = value_t::array)
+    {
+        // check if each element is an array with two elements whose first
+        // element is a string
+        bool is_an_object = std::all_of(init.begin(), init.end(),
+                                        [](const detail::json_ref<basic_json>& element_ref)
+        {
+            // The cast is to ensure op[size_type] is called, bearing in mind size_type may not be int;
+            // (many string types can be constructed from 0 via its null-pointer guise, so we get a
+            // broken call to op[key_type], the wrong semantics and a 4804 warning on Windows)
+            return element_ref->is_array() && element_ref->size() == 2 && (*element_ref)[static_cast<size_type>(0)].is_string();
+        });
+
+        // adjust type if type deduction is not wanted
+        if (!type_deduction)
+        {
+            // if array is wanted, do not create an object though possible
+            if (manual_type == value_t::array)
+            {
+                is_an_object = false;
+            }
+
+            // if object is wanted but impossible, throw an exception
+            if (JSON_HEDLEY_UNLIKELY(manual_type == value_t::object && !is_an_object))
+            {
+                JSON_THROW(type_error::create(301, "cannot create object from initializer list", nullptr));
+            }
+        }
+
+        if (is_an_object)
+        {
+            // the initializer list is a list of pairs -> create object
+            m_data.m_type = value_t::object;
+            m_data.m_value = value_t::object;
+
+            for (auto& element_ref : init)
+            {
+                auto element = element_ref.moved_or_copied();
+                m_data.m_value.object->emplace(
+                    std::move(*((*element.m_data.m_value.array)[0].m_data.m_value.string)),
+                    std::move((*element.m_data.m_value.array)[1]));
+            }
+        }
+        else
+        {
+            // the initializer list describes an array -> create array
+            m_data.m_type = value_t::array;
+            m_data.m_value.array = create<array_t>(init.begin(), init.end());
+        }
+
+        set_parents();
+        assert_invariant();
+    }
+
+    /// @brief explicitly create a binary array (without subtype)
+    /// @sa https://json.nlohmann.me/api/basic_json/binary/
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json binary(const typename binary_t::container_type& init)
+    {
+        auto res = basic_json();
+        res.m_data.m_type = value_t::binary;
+        res.m_data.m_value = init;
+        return res;
+    }
+
+    /// @brief explicitly create a binary array (with subtype)
+    /// @sa https://json.nlohmann.me/api/basic_json/binary/
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json binary(const typename binary_t::container_type& init, typename binary_t::subtype_type subtype)
+    {
+        auto res = basic_json();
+        res.m_data.m_type = value_t::binary;
+        res.m_data.m_value = binary_t(init, subtype);
+        return res;
+    }
+
+    /// @brief explicitly create a binary array
+    /// @sa https://json.nlohmann.me/api/basic_json/binary/
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json binary(typename binary_t::container_type&& init)
+    {
+        auto res = basic_json();
+        res.m_data.m_type = value_t::binary;
+        res.m_data.m_value = std::move(init);
+        return res;
+    }
+
+    /// @brief explicitly create a binary array (with subtype)
+    /// @sa https://json.nlohmann.me/api/basic_json/binary/
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json binary(typename binary_t::container_type&& init, typename binary_t::subtype_type subtype)
+    {
+        auto res = basic_json();
+        res.m_data.m_type = value_t::binary;
+        res.m_data.m_value = binary_t(std::move(init), subtype);
+        return res;
+    }
+
+    /// @brief explicitly create an array from an initializer list
+    /// @sa https://json.nlohmann.me/api/basic_json/array/
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json array(initializer_list_t init = {})
+    {
+        return basic_json(init, false, value_t::array);
+    }
+
+    /// @brief explicitly create an object from an initializer list
+    /// @sa https://json.nlohmann.me/api/basic_json/object/
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json object(initializer_list_t init = {})
+    {
+        return basic_json(init, false, value_t::object);
+    }
+
+    /// @brief construct an array with count copies of given value
+    /// @sa https://json.nlohmann.me/api/basic_json/basic_json/
+    basic_json(size_type cnt, const basic_json& val):
+        m_data{cnt, val}
+    {
+        set_parents();
+        assert_invariant();
+    }
+
+    /// @brief construct a JSON container given an iterator range
+    /// @sa https://json.nlohmann.me/api/basic_json/basic_json/
+    template < class InputIT, typename std::enable_if <
+                   std::is_same<InputIT, typename basic_json_t::iterator>::value ||
+                   std::is_same<InputIT, typename basic_json_t::const_iterator>::value, int >::type = 0 >
+    basic_json(InputIT first, InputIT last) // NOLINT(performance-unnecessary-value-param)
+    {
+        JSON_ASSERT(first.m_object != nullptr);
+        JSON_ASSERT(last.m_object != nullptr);
+
+        // make sure iterator fits the current value
+        if (JSON_HEDLEY_UNLIKELY(first.m_object != last.m_object))
+        {
+            JSON_THROW(invalid_iterator::create(201, "iterators are not compatible", nullptr));
+        }
+
+        // copy type from first iterator
+        m_data.m_type = first.m_object->m_data.m_type;
+
+        // check if iterator range is complete for primitive values
+        switch (m_data.m_type)
+        {
+            case value_t::boolean:
+            case value_t::number_float:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::string:
+            {
+                if (JSON_HEDLEY_UNLIKELY(!first.m_it.primitive_iterator.is_begin()
+                                         || !last.m_it.primitive_iterator.is_end()))
+                {
+                    JSON_THROW(invalid_iterator::create(204, "iterators out of range", first.m_object));
+                }
+                break;
+            }
+
+            case value_t::null:
+            case value_t::object:
+            case value_t::array:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+                break;
+        }
+
+        switch (m_data.m_type)
+        {
+            case value_t::number_integer:
+            {
+                m_data.m_value.number_integer = first.m_object->m_data.m_value.number_integer;
+                break;
+            }
+
+            case value_t::number_unsigned:
+            {
+                m_data.m_value.number_unsigned = first.m_object->m_data.m_value.number_unsigned;
+                break;
+            }
+
+            case value_t::number_float:
+            {
+                m_data.m_value.number_float = first.m_object->m_data.m_value.number_float;
+                break;
+            }
+
+            case value_t::boolean:
+            {
+                m_data.m_value.boolean = first.m_object->m_data.m_value.boolean;
+                break;
+            }
+
+            case value_t::string:
+            {
+                m_data.m_value = *first.m_object->m_data.m_value.string;
+                break;
+            }
+
+            case value_t::object:
+            {
+                m_data.m_value.object = create<object_t>(first.m_it.object_iterator,
+                                        last.m_it.object_iterator);
+                break;
+            }
+
+            case value_t::array:
+            {
+                m_data.m_value.array = create<array_t>(first.m_it.array_iterator,
+                                                       last.m_it.array_iterator);
+                break;
+            }
+
+            case value_t::binary:
+            {
+                m_data.m_value = *first.m_object->m_data.m_value.binary;
+                break;
+            }
+
+            case value_t::null:
+            case value_t::discarded:
+            default:
+                JSON_THROW(invalid_iterator::create(206, detail::concat("cannot construct with iterators from ", first.m_object->type_name()), first.m_object));
+        }
+
+        set_parents();
+        assert_invariant();
+    }
+
+    ///////////////////////////////////////
+    // other constructors and destructor //
+    ///////////////////////////////////////
+
+    template<typename JsonRef,
+             detail::enable_if_t<detail::conjunction<detail::is_json_ref<JsonRef>,
+                                 std::is_same<typename JsonRef::value_type, basic_json>>::value, int> = 0 >
+    basic_json(const JsonRef& ref) : basic_json(ref.moved_or_copied()) {}
+
+    /// @brief copy constructor
+    /// @sa https://json.nlohmann.me/api/basic_json/basic_json/
+    basic_json(const basic_json& other)
+        : json_base_class_t(other)
+#if JSON_DIAGNOSTIC_POSITIONS
+        , start_position(other.start_position)
+        , end_position(other.end_position)
+#endif
+    {
+        m_data.m_type = other.m_data.m_type;
+        // check of passed value is valid
+        other.assert_invariant();
+
+        switch (m_data.m_type)
+        {
+            case value_t::object:
+            {
+                m_data.m_value = *other.m_data.m_value.object;
+                break;
+            }
+
+            case value_t::array:
+            {
+                m_data.m_value = *other.m_data.m_value.array;
+                break;
+            }
+
+            case value_t::string:
+            {
+                m_data.m_value = *other.m_data.m_value.string;
+                break;
+            }
+
+            case value_t::boolean:
+            {
+                m_data.m_value = other.m_data.m_value.boolean;
+                break;
+            }
+
+            case value_t::number_integer:
+            {
+                m_data.m_value = other.m_data.m_value.number_integer;
+                break;
+            }
+
+            case value_t::number_unsigned:
+            {
+                m_data.m_value = other.m_data.m_value.number_unsigned;
+                break;
+            }
+
+            case value_t::number_float:
+            {
+                m_data.m_value = other.m_data.m_value.number_float;
+                break;
+            }
+
+            case value_t::binary:
+            {
+                m_data.m_value = *other.m_data.m_value.binary;
+                break;
+            }
+
+            case value_t::null:
+            case value_t::discarded:
+            default:
+                break;
+        }
+
+        set_parents();
+        assert_invariant();
+    }
+
+    /// @brief move constructor
+    /// @sa https://json.nlohmann.me/api/basic_json/basic_json/
+    basic_json(basic_json&& other) noexcept
+        : json_base_class_t(std::forward<json_base_class_t>(other)),
+          m_data(std::move(other.m_data)) // cppcheck-suppress[accessForwarded] TODO check
+#if JSON_DIAGNOSTIC_POSITIONS
+        , start_position(other.start_position) // cppcheck-suppress[accessForwarded] TODO check
+        , end_position(other.end_position) // cppcheck-suppress[accessForwarded] TODO check
+#endif
+    {
+        // check that passed value is valid
+        other.assert_invariant(false); // cppcheck-suppress[accessForwarded]
+
+        // invalidate payload
+        other.m_data.m_type = value_t::null;
+        other.m_data.m_value = {};
+
+#if JSON_DIAGNOSTIC_POSITIONS
+        other.start_position = std::string::npos;
+        other.end_position = std::string::npos;
+#endif
+
+        set_parents();
+        assert_invariant();
+    }
+
+    /// @brief copy assignment
+    /// @sa https://json.nlohmann.me/api/basic_json/operator=/
+    basic_json& operator=(basic_json other) noexcept (
+        std::is_nothrow_move_constructible<value_t>::value&&
+        std::is_nothrow_move_assignable<value_t>::value&&
+        std::is_nothrow_move_constructible<json_value>::value&&
+        std::is_nothrow_move_assignable<json_value>::value&&
+        std::is_nothrow_move_assignable<json_base_class_t>::value
+    )
+    {
+        // check that passed value is valid
+        other.assert_invariant();
+
+        using std::swap;
+        swap(m_data.m_type, other.m_data.m_type);
+        swap(m_data.m_value, other.m_data.m_value);
+
+#if JSON_DIAGNOSTIC_POSITIONS
+        swap(start_position, other.start_position);
+        swap(end_position, other.end_position);
+#endif
+
+        json_base_class_t::operator=(std::move(other));
+
+        set_parents();
+        assert_invariant();
+        return *this;
+    }
+
+    /// @brief destructor
+    /// @sa https://json.nlohmann.me/api/basic_json/~basic_json/
+    ~basic_json() noexcept
+    {
+        assert_invariant(false);
+    }
+
+    /// @}
+
+  public:
+    ///////////////////////
+    // object inspection //
+    ///////////////////////
+
+    /// @name object inspection
+    /// Functions to inspect the type of a JSON value.
+    /// @{
+
+    /// @brief serialization
+    /// @sa https://json.nlohmann.me/api/basic_json/dump/
+    string_t dump(const int indent = -1,
+                  const char indent_char = ' ',
+                  const bool ensure_ascii = false,
+                  const error_handler_t error_handler = error_handler_t::strict) const
+    {
+        string_t result;
+        serializer s(detail::output_adapter<char, string_t>(result), indent_char, error_handler);
+
+        if (indent >= 0)
+        {
+            s.dump(*this, true, ensure_ascii, static_cast<unsigned int>(indent));
+        }
+        else
+        {
+            s.dump(*this, false, ensure_ascii, 0);
+        }
+
+        return result;
+    }
+
+    /// @brief return the type of the JSON value (explicit)
+    /// @sa https://json.nlohmann.me/api/basic_json/type/
+    constexpr value_t type() const noexcept
+    {
+        return m_data.m_type;
+    }
+
+    /// @brief return whether type is primitive
+    /// @sa https://json.nlohmann.me/api/basic_json/is_primitive/
+    constexpr bool is_primitive() const noexcept
+    {
+        return is_null() || is_string() || is_boolean() || is_number() || is_binary();
+    }
+
+    /// @brief return whether type is structured
+    /// @sa https://json.nlohmann.me/api/basic_json/is_structured/
+    constexpr bool is_structured() const noexcept
+    {
+        return is_array() || is_object();
+    }
+
+    /// @brief return whether value is null
+    /// @sa https://json.nlohmann.me/api/basic_json/is_null/
+    constexpr bool is_null() const noexcept
+    {
+        return m_data.m_type == value_t::null;
+    }
+
+    /// @brief return whether value is a boolean
+    /// @sa https://json.nlohmann.me/api/basic_json/is_boolean/
+    constexpr bool is_boolean() const noexcept
+    {
+        return m_data.m_type == value_t::boolean;
+    }
+
+    /// @brief return whether value is a number
+    /// @sa https://json.nlohmann.me/api/basic_json/is_number/
+    constexpr bool is_number() const noexcept
+    {
+        return is_number_integer() || is_number_float();
+    }
+
+    /// @brief return whether value is an integer number
+    /// @sa https://json.nlohmann.me/api/basic_json/is_number_integer/
+    constexpr bool is_number_integer() const noexcept
+    {
+        return m_data.m_type == value_t::number_integer || m_data.m_type == value_t::number_unsigned;
+    }
+
+    /// @brief return whether value is an unsigned integer number
+    /// @sa https://json.nlohmann.me/api/basic_json/is_number_unsigned/
+    constexpr bool is_number_unsigned() const noexcept
+    {
+        return m_data.m_type == value_t::number_unsigned;
+    }
+
+    /// @brief return whether value is a floating-point number
+    /// @sa https://json.nlohmann.me/api/basic_json/is_number_float/
+    constexpr bool is_number_float() const noexcept
+    {
+        return m_data.m_type == value_t::number_float;
+    }
+
+    /// @brief return whether value is an object
+    /// @sa https://json.nlohmann.me/api/basic_json/is_object/
+    constexpr bool is_object() const noexcept
+    {
+        return m_data.m_type == value_t::object;
+    }
+
+    /// @brief return whether value is an array
+    /// @sa https://json.nlohmann.me/api/basic_json/is_array/
+    constexpr bool is_array() const noexcept
+    {
+        return m_data.m_type == value_t::array;
+    }
+
+    /// @brief return whether value is a string
+    /// @sa https://json.nlohmann.me/api/basic_json/is_string/
+    constexpr bool is_string() const noexcept
+    {
+        return m_data.m_type == value_t::string;
+    }
+
+    /// @brief return whether value is a binary array
+    /// @sa https://json.nlohmann.me/api/basic_json/is_binary/
+    constexpr bool is_binary() const noexcept
+    {
+        return m_data.m_type == value_t::binary;
+    }
+
+    /// @brief return whether value is discarded
+    /// @sa https://json.nlohmann.me/api/basic_json/is_discarded/
+    constexpr bool is_discarded() const noexcept
+    {
+        return m_data.m_type == value_t::discarded;
+    }
+
+    /// @brief return the type of the JSON value (implicit)
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_value_t/
+    constexpr operator value_t() const noexcept
+    {
+        return m_data.m_type;
+    }
+
+    /// @}
+
+  private:
+    //////////////////
+    // value access //
+    //////////////////
+
+    /// get a boolean (explicit)
+    boolean_t get_impl(boolean_t* /*unused*/) const
+    {
+        if (JSON_HEDLEY_LIKELY(is_boolean()))
+        {
+            return m_data.m_value.boolean;
+        }
+
+        JSON_THROW(type_error::create(302, detail::concat("type must be boolean, but is ", type_name()), this));
+    }
+
+    /// get a pointer to the value (object)
+    object_t* get_impl_ptr(object_t* /*unused*/) noexcept
+    {
+        return is_object() ? m_data.m_value.object : nullptr;
+    }
+
+    /// get a pointer to the value (object)
+    constexpr const object_t* get_impl_ptr(const object_t* /*unused*/) const noexcept
+    {
+        return is_object() ? m_data.m_value.object : nullptr;
+    }
+
+    /// get a pointer to the value (array)
+    array_t* get_impl_ptr(array_t* /*unused*/) noexcept
+    {
+        return is_array() ? m_data.m_value.array : nullptr;
+    }
+
+    /// get a pointer to the value (array)
+    constexpr const array_t* get_impl_ptr(const array_t* /*unused*/) const noexcept
+    {
+        return is_array() ? m_data.m_value.array : nullptr;
+    }
+
+    /// get a pointer to the value (string)
+    string_t* get_impl_ptr(string_t* /*unused*/) noexcept
+    {
+        return is_string() ? m_data.m_value.string : nullptr;
+    }
+
+    /// get a pointer to the value (string)
+    constexpr const string_t* get_impl_ptr(const string_t* /*unused*/) const noexcept
+    {
+        return is_string() ? m_data.m_value.string : nullptr;
+    }
+
+    /// get a pointer to the value (boolean)
+    boolean_t* get_impl_ptr(boolean_t* /*unused*/) noexcept
+    {
+        return is_boolean() ? &m_data.m_value.boolean : nullptr;
+    }
+
+    /// get a pointer to the value (boolean)
+    constexpr const boolean_t* get_impl_ptr(const boolean_t* /*unused*/) const noexcept
+    {
+        return is_boolean() ? &m_data.m_value.boolean : nullptr;
+    }
+
+    /// get a pointer to the value (integer number)
+    number_integer_t* get_impl_ptr(number_integer_t* /*unused*/) noexcept
+    {
+        return m_data.m_type == value_t::number_integer ? &m_data.m_value.number_integer : nullptr;
+    }
+
+    /// get a pointer to the value (integer number)
+    constexpr const number_integer_t* get_impl_ptr(const number_integer_t* /*unused*/) const noexcept
+    {
+        return m_data.m_type == value_t::number_integer ? &m_data.m_value.number_integer : nullptr;
+    }
+
+    /// get a pointer to the value (unsigned number)
+    number_unsigned_t* get_impl_ptr(number_unsigned_t* /*unused*/) noexcept
+    {
+        return is_number_unsigned() ? &m_data.m_value.number_unsigned : nullptr;
+    }
+
+    /// get a pointer to the value (unsigned number)
+    constexpr const number_unsigned_t* get_impl_ptr(const number_unsigned_t* /*unused*/) const noexcept
+    {
+        return is_number_unsigned() ? &m_data.m_value.number_unsigned : nullptr;
+    }
+
+    /// get a pointer to the value (floating-point number)
+    number_float_t* get_impl_ptr(number_float_t* /*unused*/) noexcept
+    {
+        return is_number_float() ? &m_data.m_value.number_float : nullptr;
+    }
+
+    /// get a pointer to the value (floating-point number)
+    constexpr const number_float_t* get_impl_ptr(const number_float_t* /*unused*/) const noexcept
+    {
+        return is_number_float() ? &m_data.m_value.number_float : nullptr;
+    }
+
+    /// get a pointer to the value (binary)
+    binary_t* get_impl_ptr(binary_t* /*unused*/) noexcept
+    {
+        return is_binary() ? m_data.m_value.binary : nullptr;
+    }
+
+    /// get a pointer to the value (binary)
+    constexpr const binary_t* get_impl_ptr(const binary_t* /*unused*/) const noexcept
+    {
+        return is_binary() ? m_data.m_value.binary : nullptr;
+    }
+
+    /*!
+    @brief helper function to implement get_ref()
+
+    This function helps to implement get_ref() without code duplication for
+    const and non-const overloads
+
+    @tparam ThisType will be deduced as `basic_json` or `const basic_json`
+
+    @throw type_error.303 if ReferenceType does not match underlying value
+    type of the current JSON
+    */
+    template<typename ReferenceType, typename ThisType>
+    static ReferenceType get_ref_impl(ThisType& obj)
+    {
+        // delegate the call to get_ptr<>()
+        auto* ptr = obj.template get_ptr<typename std::add_pointer<ReferenceType>::type>();
+
+        if (JSON_HEDLEY_LIKELY(ptr != nullptr))
+        {
+            return *ptr;
+        }
+
+        JSON_THROW(type_error::create(303, detail::concat("incompatible ReferenceType for get_ref, actual type is ", obj.type_name()), &obj));
+    }
+
+  public:
+    /// @name value access
+    /// Direct access to the stored value of a JSON value.
+    /// @{
+
+    /// @brief get a pointer value (implicit)
+    /// @sa https://json.nlohmann.me/api/basic_json/get_ptr/
+    template<typename PointerType, typename std::enable_if<
+                 std::is_pointer<PointerType>::value, int>::type = 0>
+    auto get_ptr() noexcept -> decltype(std::declval<basic_json_t&>().get_impl_ptr(std::declval<PointerType>()))
+    {
+        // delegate the call to get_impl_ptr<>()
+        return get_impl_ptr(static_cast<PointerType>(nullptr));
+    }
+
+    /// @brief get a pointer value (implicit)
+    /// @sa https://json.nlohmann.me/api/basic_json/get_ptr/
+    template < typename PointerType, typename std::enable_if <
+                   std::is_pointer<PointerType>::value&&
+                   std::is_const<typename std::remove_pointer<PointerType>::type>::value, int >::type = 0 >
+    constexpr auto get_ptr() const noexcept -> decltype(std::declval<const basic_json_t&>().get_impl_ptr(std::declval<PointerType>()))
+    {
+        // delegate the call to get_impl_ptr<>() const
+        return get_impl_ptr(static_cast<PointerType>(nullptr));
+    }
+
+  private:
+    /*!
+    @brief get a value (explicit)
+
+    Explicit type conversion between the JSON value and a compatible value
+    which is [CopyConstructible](https://en.cppreference.com/w/cpp/named_req/CopyConstructible)
+    and [DefaultConstructible](https://en.cppreference.com/w/cpp/named_req/DefaultConstructible).
+    The value is converted by calling the @ref json_serializer<ValueType>
+    `from_json()` method.
+
+    The function is equivalent to executing
+    @code {.cpp}
+    ValueType ret;
+    JSONSerializer<ValueType>::from_json(*this, ret);
+    return ret;
+    @endcode
+
+    This overloads is chosen if:
+    - @a ValueType is not @ref basic_json,
+    - @ref json_serializer<ValueType> has a `from_json()` method of the form
+      `void from_json(const basic_json&, ValueType&)`, and
+    - @ref json_serializer<ValueType> does not have a `from_json()` method of
+      the form `ValueType from_json(const basic_json&)`
+
+    @tparam ValueType the returned value type
+
+    @return copy of the JSON value, converted to @a ValueType
+
+    @throw what @ref json_serializer<ValueType> `from_json()` method throws
+
+    @liveexample{The example below shows several conversions from JSON values
+    to other types. There a few things to note: (1) Floating-point numbers can
+    be converted to integers\, (2) A JSON array can be converted to a standard
+    `std::vector<short>`\, (3) A JSON object can be converted to C++
+    associative containers such as `std::unordered_map<std::string\,
+    json>`.,get__ValueType_const}
+
+    @since version 2.1.0
+    */
+    template < typename ValueType,
+               detail::enable_if_t <
+                   detail::is_default_constructible<ValueType>::value&&
+                   detail::has_from_json<basic_json_t, ValueType>::value,
+                   int > = 0 >
+    ValueType get_impl(detail::priority_tag<0> /*unused*/) const noexcept(noexcept(
+            JSONSerializer<ValueType>::from_json(std::declval<const basic_json_t&>(), std::declval<ValueType&>())))
+    {
+        auto ret = ValueType();
+        JSONSerializer<ValueType>::from_json(*this, ret);
+        return ret;
+    }
+
+    /*!
+    @brief get a value (explicit); special case
+
+    Explicit type conversion between the JSON value and a compatible value
+    which is **not** [CopyConstructible](https://en.cppreference.com/w/cpp/named_req/CopyConstructible)
+    and **not** [DefaultConstructible](https://en.cppreference.com/w/cpp/named_req/DefaultConstructible).
+    The value is converted by calling the @ref json_serializer<ValueType>
+    `from_json()` method.
+
+    The function is equivalent to executing
+    @code {.cpp}
+    return JSONSerializer<ValueType>::from_json(*this);
+    @endcode
+
+    This overloads is chosen if:
+    - @a ValueType is not @ref basic_json and
+    - @ref json_serializer<ValueType> has a `from_json()` method of the form
+      `ValueType from_json(const basic_json&)`
+
+    @note If @ref json_serializer<ValueType> has both overloads of
+    `from_json()`, this one is chosen.
+
+    @tparam ValueType the returned value type
+
+    @return copy of the JSON value, converted to @a ValueType
+
+    @throw what @ref json_serializer<ValueType> `from_json()` method throws
+
+    @since version 2.1.0
+    */
+    template < typename ValueType,
+               detail::enable_if_t <
+                   detail::has_non_default_from_json<basic_json_t, ValueType>::value,
+                   int > = 0 >
+    ValueType get_impl(detail::priority_tag<1> /*unused*/) const noexcept(noexcept(
+            JSONSerializer<ValueType>::from_json(std::declval<const basic_json_t&>())))
+    {
+        return JSONSerializer<ValueType>::from_json(*this);
+    }
+
+    /*!
+    @brief get special-case overload
+
+    This overloads converts the current @ref basic_json in a different
+    @ref basic_json type
+
+    @tparam BasicJsonType == @ref basic_json
+
+    @return a copy of *this, converted into @a BasicJsonType
+
+    @complexity Depending on the implementation of the called `from_json()`
+                method.
+
+    @since version 3.2.0
+    */
+    template < typename BasicJsonType,
+               detail::enable_if_t <
+                   detail::is_basic_json<BasicJsonType>::value,
+                   int > = 0 >
+    BasicJsonType get_impl(detail::priority_tag<2> /*unused*/) const
+    {
+        return *this;
+    }
+
+    /*!
+    @brief get special-case overload
+
+    This overloads avoids a lot of template boilerplate, it can be seen as the
+    identity method
+
+    @tparam BasicJsonType == @ref basic_json
+
+    @return a copy of *this
+
+    @complexity Constant.
+
+    @since version 2.1.0
+    */
+    template<typename BasicJsonType,
+             detail::enable_if_t<
+                 std::is_same<BasicJsonType, basic_json_t>::value,
+                 int> = 0>
+    basic_json get_impl(detail::priority_tag<3> /*unused*/) const
+    {
+        return *this;
+    }
+
+    /*!
+    @brief get a pointer value (explicit)
+    @copydoc get()
+    */
+    template<typename PointerType,
+             detail::enable_if_t<
+                 std::is_pointer<PointerType>::value,
+                 int> = 0>
+    constexpr auto get_impl(detail::priority_tag<4> /*unused*/) const noexcept
+    -> decltype(std::declval<const basic_json_t&>().template get_ptr<PointerType>())
+    {
+        // delegate the call to get_ptr
+        return get_ptr<PointerType>();
+    }
+
+  public:
+    /*!
+    @brief get a (pointer) value (explicit)
+
+    Performs explicit type conversion between the JSON value and a compatible value if required.
+
+    - If the requested type is a pointer to the internally stored JSON value that pointer is returned.
+    No copies are made.
+
+    - If the requested type is the current @ref basic_json, or a different @ref basic_json convertible
+    from the current @ref basic_json.
+
+    - Otherwise the value is converted by calling the @ref json_serializer<ValueType> `from_json()`
+    method.
+
+    @tparam ValueTypeCV the provided value type
+    @tparam ValueType the returned value type
+
+    @return copy of the JSON value, converted to @tparam ValueType if necessary
+
+    @throw what @ref json_serializer<ValueType> `from_json()` method throws if conversion is required
+
+    @since version 2.1.0
+    */
+    template < typename ValueTypeCV, typename ValueType = detail::uncvref_t<ValueTypeCV>>
+#if defined(JSON_HAS_CPP_14)
+    constexpr
+#endif
+    auto get() const noexcept(
+    noexcept(std::declval<const basic_json_t&>().template get_impl<ValueType>(detail::priority_tag<4> {})))
+    -> decltype(std::declval<const basic_json_t&>().template get_impl<ValueType>(detail::priority_tag<4> {}))
+    {
+        // we cannot static_assert on ValueTypeCV being non-const, because
+        // there is support for get<const basic_json_t>(), which is why we
+        // still need the uncvref
+        static_assert(!std::is_reference<ValueTypeCV>::value,
+                      "get() cannot be used with reference types, you might want to use get_ref()");
+        return get_impl<ValueType>(detail::priority_tag<4> {});
+    }
+
+    /*!
+    @brief get a pointer value (explicit)
+
+    Explicit pointer access to the internally stored JSON value. No copies are
+    made.
+
+    @warning The pointer becomes invalid if the underlying JSON object
+    changes.
+
+    @tparam PointerType pointer type; must be a pointer to @ref array_t, @ref
+    object_t, @ref string_t, @ref boolean_t, @ref number_integer_t,
+    @ref number_unsigned_t, or @ref number_float_t.
+
+    @return pointer to the internally stored JSON value if the requested
+    pointer type @a PointerType fits to the JSON value; `nullptr` otherwise
+
+    @complexity Constant.
+
+    @liveexample{The example below shows how pointers to internal values of a
+    JSON value can be requested. Note that no type conversions are made and a
+    `nullptr` is returned if the value and the requested pointer type does not
+    match.,get__PointerType}
+
+    @sa see @ref get_ptr() for explicit pointer-member access
+
+    @since version 1.0.0
+    */
+    template<typename PointerType, typename std::enable_if<
+                 std::is_pointer<PointerType>::value, int>::type = 0>
+    auto get() noexcept -> decltype(std::declval<basic_json_t&>().template get_ptr<PointerType>())
+    {
+        // delegate the call to get_ptr
+        return get_ptr<PointerType>();
+    }
+
+    /// @brief get a value (explicit)
+    /// @sa https://json.nlohmann.me/api/basic_json/get_to/
+    template < typename ValueType,
+               detail::enable_if_t <
+                   !detail::is_basic_json<ValueType>::value&&
+                   detail::has_from_json<basic_json_t, ValueType>::value,
+                   int > = 0 >
+    ValueType & get_to(ValueType& v) const noexcept(noexcept(
+            JSONSerializer<ValueType>::from_json(std::declval<const basic_json_t&>(), v)))
+    {
+        JSONSerializer<ValueType>::from_json(*this, v);
+        return v;
+    }
+
+    // specialization to allow calling get_to with a basic_json value
+    // see https://github.com/nlohmann/json/issues/2175
+    template<typename ValueType,
+             detail::enable_if_t <
+                 detail::is_basic_json<ValueType>::value,
+                 int> = 0>
+    ValueType & get_to(ValueType& v) const
+    {
+        v = *this;
+        return v;
+    }
+
+    template <
+        typename T, std::size_t N,
+        typename Array = T (&)[N], // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
+        detail::enable_if_t <
+            detail::has_from_json<basic_json_t, Array>::value, int > = 0 >
+    Array get_to(T (&v)[N]) const // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
+    noexcept(noexcept(JSONSerializer<Array>::from_json(
+                          std::declval<const basic_json_t&>(), v)))
+    {
+        JSONSerializer<Array>::from_json(*this, v);
+        return v;
+    }
+
+    /// @brief get a reference value (implicit)
+    /// @sa https://json.nlohmann.me/api/basic_json/get_ref/
+    template<typename ReferenceType, typename std::enable_if<
+                 std::is_reference<ReferenceType>::value, int>::type = 0>
+    ReferenceType get_ref()
+    {
+        // delegate call to get_ref_impl
+        return get_ref_impl<ReferenceType>(*this);
+    }
+
+    /// @brief get a reference value (implicit)
+    /// @sa https://json.nlohmann.me/api/basic_json/get_ref/
+    template < typename ReferenceType, typename std::enable_if <
+                   std::is_reference<ReferenceType>::value&&
+                   std::is_const<typename std::remove_reference<ReferenceType>::type>::value, int >::type = 0 >
+    ReferenceType get_ref() const
+    {
+        // delegate call to get_ref_impl
+        return get_ref_impl<ReferenceType>(*this);
+    }
+
+    /*!
+    @brief get a value (implicit)
+
+    Implicit type conversion between the JSON value and a compatible value.
+    The call is realized by calling @ref get() const.
+
+    @tparam ValueType non-pointer type compatible to the JSON value, for
+    instance `int` for JSON integer numbers, `bool` for JSON booleans, or
+    `std::vector` types for JSON arrays. The character type of @ref string_t
+    as well as an initializer list of this type is excluded to avoid
+    ambiguities as these types implicitly convert to `std::string`.
+
+    @return copy of the JSON value, converted to type @a ValueType
+
+    @throw type_error.302 in case passed type @a ValueType is incompatible
+    to the JSON value type (e.g., the JSON value is of type boolean, but a
+    string is requested); see example below
+
+    @complexity Linear in the size of the JSON value.
+
+    @liveexample{The example below shows several conversions from JSON values
+    to other types. There a few things to note: (1) Floating-point numbers can
+    be converted to integers\, (2) A JSON array can be converted to a standard
+    `std::vector<short>`\, (3) A JSON object can be converted to C++
+    associative containers such as `std::unordered_map<std::string\,
+    json>`.,operator__ValueType}
+
+    @since version 1.0.0
+    */
+    template < typename ValueType, typename std::enable_if <
+                   detail::conjunction <
+                       detail::negation<std::is_pointer<ValueType>>,
+                       detail::negation<std::is_same<ValueType, std::nullptr_t>>,
+                       detail::negation<std::is_same<ValueType, detail::json_ref<basic_json>>>,
+                                        detail::negation<std::is_same<ValueType, typename string_t::value_type>>,
+                                        detail::negation<detail::is_basic_json<ValueType>>,
+                                        detail::negation<std::is_same<ValueType, std::initializer_list<typename string_t::value_type>>>,
+#if defined(JSON_HAS_CPP_17) && (defined(__GNUC__) || (defined(_MSC_VER) && _MSC_VER >= 1910 && _MSC_VER <= 1914))
+                                                detail::negation<std::is_same<ValueType, std::string_view>>,
+#endif
+#if defined(JSON_HAS_CPP_17) && JSON_HAS_STATIC_RTTI
+                                                detail::negation<std::is_same<ValueType, std::any>>,
+#endif
+                                                detail::is_detected_lazy<detail::get_template_function, const basic_json_t&, ValueType>
+                                                >::value, int >::type = 0 >
+                                        JSON_EXPLICIT operator ValueType() const
+    {
+        // delegate the call to get<>() const
+        return get<ValueType>();
+    }
+
+    /// @brief get a binary value
+    /// @sa https://json.nlohmann.me/api/basic_json/get_binary/
+    binary_t& get_binary()
+    {
+        if (!is_binary())
+        {
+            JSON_THROW(type_error::create(302, detail::concat("type must be binary, but is ", type_name()), this));
+        }
+
+        return *get_ptr<binary_t*>();
+    }
+
+    /// @brief get a binary value
+    /// @sa https://json.nlohmann.me/api/basic_json/get_binary/
+    const binary_t& get_binary() const
+    {
+        if (!is_binary())
+        {
+            JSON_THROW(type_error::create(302, detail::concat("type must be binary, but is ", type_name()), this));
+        }
+
+        return *get_ptr<const binary_t*>();
+    }
+
+    /// @}
+
+    ////////////////////
+    // element access //
+    ////////////////////
+
+    /// @name element access
+    /// Access to the JSON value.
+    /// @{
+
+    /// @brief access specified array element with bounds checking
+    /// @sa https://json.nlohmann.me/api/basic_json/at/
+    reference at(size_type idx)
+    {
+        // at only works for arrays
+        if (JSON_HEDLEY_LIKELY(is_array()))
+        {
+            JSON_TRY
+            {
+                return set_parent(m_data.m_value.array->at(idx));
+            }
+            JSON_CATCH (std::out_of_range&)
+            {
+                // create better exception explanation
+                JSON_THROW(out_of_range::create(401, detail::concat("array index ", std::to_string(idx), " is out of range"), this));
+            } // cppcheck-suppress[missingReturn]
+        }
+        else
+        {
+            JSON_THROW(type_error::create(304, detail::concat("cannot use at() with ", type_name()), this));
+        }
+    }
+
+    /// @brief access specified array element with bounds checking
+    /// @sa https://json.nlohmann.me/api/basic_json/at/
+    const_reference at(size_type idx) const
+    {
+        // at only works for arrays
+        if (JSON_HEDLEY_LIKELY(is_array()))
+        {
+            JSON_TRY
+            {
+                return m_data.m_value.array->at(idx);
+            }
+            JSON_CATCH (std::out_of_range&)
+            {
+                // create better exception explanation
+                JSON_THROW(out_of_range::create(401, detail::concat("array index ", std::to_string(idx), " is out of range"), this));
+            } // cppcheck-suppress[missingReturn]
+        }
+        else
+        {
+            JSON_THROW(type_error::create(304, detail::concat("cannot use at() with ", type_name()), this));
+        }
+    }
+
+    /// @brief access specified object element with bounds checking
+    /// @sa https://json.nlohmann.me/api/basic_json/at/
+    reference at(const typename object_t::key_type& key)
+    {
+        // at only works for objects
+        if (JSON_HEDLEY_UNLIKELY(!is_object()))
+        {
+            JSON_THROW(type_error::create(304, detail::concat("cannot use at() with ", type_name()), this));
+        }
+
+        auto it = m_data.m_value.object->find(key);
+        if (it == m_data.m_value.object->end())
+        {
+            JSON_THROW(out_of_range::create(403, detail::concat("key '", key, "' not found"), this));
+        }
+        return set_parent(it->second);
+    }
+
+    /// @brief access specified object element with bounds checking
+    /// @sa https://json.nlohmann.me/api/basic_json/at/
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_basic_json_key_type<basic_json_t, KeyType>::value, int> = 0>
+    reference at(KeyType && key)
+    {
+        // at only works for objects
+        if (JSON_HEDLEY_UNLIKELY(!is_object()))
+        {
+            JSON_THROW(type_error::create(304, detail::concat("cannot use at() with ", type_name()), this));
+        }
+
+        auto it = m_data.m_value.object->find(std::forward<KeyType>(key));
+        if (it == m_data.m_value.object->end())
+        {
+            JSON_THROW(out_of_range::create(403, detail::concat("key '", string_t(std::forward<KeyType>(key)), "' not found"), this));
+        }
+        return set_parent(it->second);
+    }
+
+    /// @brief access specified object element with bounds checking
+    /// @sa https://json.nlohmann.me/api/basic_json/at/
+    const_reference at(const typename object_t::key_type& key) const
+    {
+        // at only works for objects
+        if (JSON_HEDLEY_UNLIKELY(!is_object()))
+        {
+            JSON_THROW(type_error::create(304, detail::concat("cannot use at() with ", type_name()), this));
+        }
+
+        auto it = m_data.m_value.object->find(key);
+        if (it == m_data.m_value.object->end())
+        {
+            JSON_THROW(out_of_range::create(403, detail::concat("key '", key, "' not found"), this));
+        }
+        return it->second;
+    }
+
+    /// @brief access specified object element with bounds checking
+    /// @sa https://json.nlohmann.me/api/basic_json/at/
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_basic_json_key_type<basic_json_t, KeyType>::value, int> = 0>
+    const_reference at(KeyType && key) const
+    {
+        // at only works for objects
+        if (JSON_HEDLEY_UNLIKELY(!is_object()))
+        {
+            JSON_THROW(type_error::create(304, detail::concat("cannot use at() with ", type_name()), this));
+        }
+
+        auto it = m_data.m_value.object->find(std::forward<KeyType>(key));
+        if (it == m_data.m_value.object->end())
+        {
+            JSON_THROW(out_of_range::create(403, detail::concat("key '", string_t(std::forward<KeyType>(key)), "' not found"), this));
+        }
+        return it->second;
+    }
+
+    /// @brief access specified array element
+    /// @sa https://json.nlohmann.me/api/basic_json/operator%5B%5D/
+    reference operator[](size_type idx)
+    {
+        // implicitly convert null value to an empty array
+        if (is_null())
+        {
+            m_data.m_type = value_t::array;
+            m_data.m_value.array = create<array_t>();
+            assert_invariant();
+        }
+
+        // operator[] only works for arrays
+        if (JSON_HEDLEY_LIKELY(is_array()))
+        {
+            // fill up array with null values if given idx is outside range
+            if (idx >= m_data.m_value.array->size())
+            {
+#if JSON_DIAGNOSTICS
+                // remember array size & capacity before resizing
+                const auto old_size = m_data.m_value.array->size();
+                const auto old_capacity = m_data.m_value.array->capacity();
+#endif
+                m_data.m_value.array->resize(idx + 1);
+
+#if JSON_DIAGNOSTICS
+                if (JSON_HEDLEY_UNLIKELY(m_data.m_value.array->capacity() != old_capacity))
+                {
+                    // capacity has changed: update all parents
+                    set_parents();
+                }
+                else
+                {
+                    // set parent for values added above
+                    set_parents(begin() + static_cast<typename iterator::difference_type>(old_size), static_cast<typename iterator::difference_type>(idx + 1 - old_size));
+                }
+#endif
+                assert_invariant();
+            }
+
+            return m_data.m_value.array->operator[](idx);
+        }
+
+        JSON_THROW(type_error::create(305, detail::concat("cannot use operator[] with a numeric argument with ", type_name()), this));
+    }
+
+    /// @brief access specified array element
+    /// @sa https://json.nlohmann.me/api/basic_json/operator%5B%5D/
+    const_reference operator[](size_type idx) const
+    {
+        // const operator[] only works for arrays
+        if (JSON_HEDLEY_LIKELY(is_array()))
+        {
+            return m_data.m_value.array->operator[](idx);
+        }
+
+        JSON_THROW(type_error::create(305, detail::concat("cannot use operator[] with a numeric argument with ", type_name()), this));
+    }
+
+    /// @brief access specified object element
+    /// @sa https://json.nlohmann.me/api/basic_json/operator%5B%5D/
+    reference operator[](typename object_t::key_type key) // NOLINT(performance-unnecessary-value-param)
+    {
+        // implicitly convert null value to an empty object
+        if (is_null())
+        {
+            m_data.m_type = value_t::object;
+            m_data.m_value.object = create<object_t>();
+            assert_invariant();
+        }
+
+        // operator[] only works for objects
+        if (JSON_HEDLEY_LIKELY(is_object()))
+        {
+            auto result = m_data.m_value.object->emplace(std::move(key), nullptr);
+            return set_parent(result.first->second);
+        }
+
+        JSON_THROW(type_error::create(305, detail::concat("cannot use operator[] with a string argument with ", type_name()), this));
+    }
+
+    /// @brief access specified object element
+    /// @sa https://json.nlohmann.me/api/basic_json/operator%5B%5D/
+    const_reference operator[](const typename object_t::key_type& key) const
+    {
+        // const operator[] only works for objects
+        if (JSON_HEDLEY_LIKELY(is_object()))
+        {
+            auto it = m_data.m_value.object->find(key);
+            JSON_ASSERT(it != m_data.m_value.object->end());
+            return it->second;
+        }
+
+        JSON_THROW(type_error::create(305, detail::concat("cannot use operator[] with a string argument with ", type_name()), this));
+    }
+
+    // these two functions resolve a (const) char * ambiguity affecting Clang and MSVC
+    // (they seemingly cannot be constrained to resolve the ambiguity)
+    template<typename T>
+    reference operator[](T* key)
+    {
+        return operator[](typename object_t::key_type(key));
+    }
+
+    template<typename T>
+    const_reference operator[](T* key) const
+    {
+        return operator[](typename object_t::key_type(key));
+    }
+
+    /// @brief access specified object element
+    /// @sa https://json.nlohmann.me/api/basic_json/operator%5B%5D/
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_basic_json_key_type<basic_json_t, KeyType>::value, int > = 0 >
+    reference operator[](KeyType && key)
+    {
+        // implicitly convert null value to an empty object
+        if (is_null())
+        {
+            m_data.m_type = value_t::object;
+            m_data.m_value.object = create<object_t>();
+            assert_invariant();
+        }
+
+        // operator[] only works for objects
+        if (JSON_HEDLEY_LIKELY(is_object()))
+        {
+            auto result = m_data.m_value.object->emplace(std::forward<KeyType>(key), nullptr);
+            return set_parent(result.first->second);
+        }
+
+        JSON_THROW(type_error::create(305, detail::concat("cannot use operator[] with a string argument with ", type_name()), this));
+    }
+
+    /// @brief access specified object element
+    /// @sa https://json.nlohmann.me/api/basic_json/operator%5B%5D/
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_basic_json_key_type<basic_json_t, KeyType>::value, int > = 0 >
+    const_reference operator[](KeyType && key) const
+    {
+        // const operator[] only works for objects
+        if (JSON_HEDLEY_LIKELY(is_object()))
+        {
+            auto it = m_data.m_value.object->find(std::forward<KeyType>(key));
+            JSON_ASSERT(it != m_data.m_value.object->end());
+            return it->second;
+        }
+
+        JSON_THROW(type_error::create(305, detail::concat("cannot use operator[] with a string argument with ", type_name()), this));
+    }
+
+  private:
+    template<typename KeyType>
+    using is_comparable_with_object_key = detail::is_comparable <
+        object_comparator_t, const typename object_t::key_type&, KeyType >;
+
+    template<typename ValueType>
+    using value_return_type = std::conditional <
+        detail::is_c_string_uncvref<ValueType>::value,
+        string_t, typename std::decay<ValueType>::type >;
+
+  public:
+    /// @brief access specified object element with default value
+    /// @sa https://json.nlohmann.me/api/basic_json/value/
+    template < class ValueType, detail::enable_if_t <
+                   !detail::is_transparent<object_comparator_t>::value
+                   && detail::is_getable<basic_json_t, ValueType>::value
+                   && !std::is_same<value_t, detail::uncvref_t<ValueType>>::value, int > = 0 >
+    ValueType value(const typename object_t::key_type& key, const ValueType& default_value) const
+    {
+        // value only works for objects
+        if (JSON_HEDLEY_LIKELY(is_object()))
+        {
+            // if key is found, return value and given default value otherwise
+            const auto it = find(key);
+            if (it != end())
+            {
+                return it->template get<ValueType>();
+            }
+
+            return default_value;
+        }
+
+        JSON_THROW(type_error::create(306, detail::concat("cannot use value() with ", type_name()), this));
+    }
+
+    /// @brief access specified object element with default value
+    /// @sa https://json.nlohmann.me/api/basic_json/value/
+    template < class ValueType, class ReturnType = typename value_return_type<ValueType>::type,
+               detail::enable_if_t <
+                   !detail::is_transparent<object_comparator_t>::value
+                   && detail::is_getable<basic_json_t, ReturnType>::value
+                   && !std::is_same<value_t, detail::uncvref_t<ValueType>>::value, int > = 0 >
+    ReturnType value(const typename object_t::key_type& key, ValueType && default_value) const
+    {
+        // value only works for objects
+        if (JSON_HEDLEY_LIKELY(is_object()))
+        {
+            // if key is found, return value and given default value otherwise
+            const auto it = find(key);
+            if (it != end())
+            {
+                return it->template get<ReturnType>();
+            }
+
+            return std::forward<ValueType>(default_value);
+        }
+
+        JSON_THROW(type_error::create(306, detail::concat("cannot use value() with ", type_name()), this));
+    }
+
+    /// @brief access specified object element with default value
+    /// @sa https://json.nlohmann.me/api/basic_json/value/
+    template < class ValueType, class KeyType, detail::enable_if_t <
+                   detail::is_transparent<object_comparator_t>::value
+                   && !detail::is_json_pointer<KeyType>::value
+                   && is_comparable_with_object_key<KeyType>::value
+                   && detail::is_getable<basic_json_t, ValueType>::value
+                   && !std::is_same<value_t, detail::uncvref_t<ValueType>>::value, int > = 0 >
+    ValueType value(KeyType && key, const ValueType& default_value) const
+    {
+        // value only works for objects
+        if (JSON_HEDLEY_LIKELY(is_object()))
+        {
+            // if key is found, return value and given default value otherwise
+            const auto it = find(std::forward<KeyType>(key));
+            if (it != end())
+            {
+                return it->template get<ValueType>();
+            }
+
+            return default_value;
+        }
+
+        JSON_THROW(type_error::create(306, detail::concat("cannot use value() with ", type_name()), this));
+    }
+
+    /// @brief access specified object element via JSON Pointer with default value
+    /// @sa https://json.nlohmann.me/api/basic_json/value/
+    template < class ValueType, class KeyType, class ReturnType = typename value_return_type<ValueType>::type,
+               detail::enable_if_t <
+                   detail::is_transparent<object_comparator_t>::value
+                   && !detail::is_json_pointer<KeyType>::value
+                   && is_comparable_with_object_key<KeyType>::value
+                   && detail::is_getable<basic_json_t, ReturnType>::value
+                   && !std::is_same<value_t, detail::uncvref_t<ValueType>>::value, int > = 0 >
+    ReturnType value(KeyType && key, ValueType && default_value) const
+    {
+        // value only works for objects
+        if (JSON_HEDLEY_LIKELY(is_object()))
+        {
+            // if key is found, return value and given default value otherwise
+            const auto it = find(std::forward<KeyType>(key));
+            if (it != end())
+            {
+                return it->template get<ReturnType>();
+            }
+
+            return std::forward<ValueType>(default_value);
+        }
+
+        JSON_THROW(type_error::create(306, detail::concat("cannot use value() with ", type_name()), this));
+    }
+
+    /// @brief access specified object element via JSON Pointer with default value
+    /// @sa https://json.nlohmann.me/api/basic_json/value/
+    template < class ValueType, detail::enable_if_t <
+                   detail::is_getable<basic_json_t, ValueType>::value
+                   && !std::is_same<value_t, detail::uncvref_t<ValueType>>::value, int > = 0 >
+    ValueType value(const json_pointer& ptr, const ValueType& default_value) const
+    {
+        // value only works for objects
+        if (JSON_HEDLEY_LIKELY(is_object()))
+        {
+            // if pointer resolves a value, return it or use default value
+            JSON_TRY
+            {
+                return ptr.get_checked(this).template get<ValueType>();
+            }
+            JSON_INTERNAL_CATCH (out_of_range&)
+            {
+                return default_value;
+            }
+        }
+
+        JSON_THROW(type_error::create(306, detail::concat("cannot use value() with ", type_name()), this));
+    }
+
+    /// @brief access specified object element via JSON Pointer with default value
+    /// @sa https://json.nlohmann.me/api/basic_json/value/
+    template < class ValueType, class ReturnType = typename value_return_type<ValueType>::type,
+               detail::enable_if_t <
+                   detail::is_getable<basic_json_t, ReturnType>::value
+                   && !std::is_same<value_t, detail::uncvref_t<ValueType>>::value, int > = 0 >
+    ReturnType value(const json_pointer& ptr, ValueType && default_value) const
+    {
+        // value only works for objects
+        if (JSON_HEDLEY_LIKELY(is_object()))
+        {
+            // if pointer resolves a value, return it or use default value
+            JSON_TRY
+            {
+                return ptr.get_checked(this).template get<ReturnType>();
+            }
+            JSON_INTERNAL_CATCH (out_of_range&)
+            {
+                return std::forward<ValueType>(default_value);
+            }
+        }
+
+        JSON_THROW(type_error::create(306, detail::concat("cannot use value() with ", type_name()), this));
+    }
+
+    template < class ValueType, class BasicJsonType, detail::enable_if_t <
+                   detail::is_basic_json<BasicJsonType>::value
+                   && detail::is_getable<basic_json_t, ValueType>::value
+                   && !std::is_same<value_t, detail::uncvref_t<ValueType>>::value, int > = 0 >
+    JSON_HEDLEY_DEPRECATED_FOR(3.11.0, basic_json::json_pointer or nlohmann::json_pointer<basic_json::string_t>) // NOLINT(readability/alt_tokens)
+    ValueType value(const ::nlohmann::json_pointer<BasicJsonType>& ptr, const ValueType& default_value) const
+    {
+        return value(ptr.convert(), default_value);
+    }
+
+    template < class ValueType, class BasicJsonType, class ReturnType = typename value_return_type<ValueType>::type,
+               detail::enable_if_t <
+                   detail::is_basic_json<BasicJsonType>::value
+                   && detail::is_getable<basic_json_t, ReturnType>::value
+                   && !std::is_same<value_t, detail::uncvref_t<ValueType>>::value, int > = 0 >
+    JSON_HEDLEY_DEPRECATED_FOR(3.11.0, basic_json::json_pointer or nlohmann::json_pointer<basic_json::string_t>) // NOLINT(readability/alt_tokens)
+    ReturnType value(const ::nlohmann::json_pointer<BasicJsonType>& ptr, ValueType && default_value) const
+    {
+        return value(ptr.convert(), std::forward<ValueType>(default_value));
+    }
+
+    /// @brief access the first element
+    /// @sa https://json.nlohmann.me/api/basic_json/front/
+    reference front()
+    {
+        return *begin();
+    }
+
+    /// @brief access the first element
+    /// @sa https://json.nlohmann.me/api/basic_json/front/
+    const_reference front() const
+    {
+        return *cbegin();
+    }
+
+    /// @brief access the last element
+    /// @sa https://json.nlohmann.me/api/basic_json/back/
+    reference back()
+    {
+        auto tmp = end();
+        --tmp;
+        return *tmp;
+    }
+
+    /// @brief access the last element
+    /// @sa https://json.nlohmann.me/api/basic_json/back/
+    const_reference back() const
+    {
+        auto tmp = cend();
+        --tmp;
+        return *tmp;
+    }
+
+    /// @brief remove element given an iterator
+    /// @sa https://json.nlohmann.me/api/basic_json/erase/
+    template < class IteratorType, detail::enable_if_t <
+                   std::is_same<IteratorType, typename basic_json_t::iterator>::value ||
+                   std::is_same<IteratorType, typename basic_json_t::const_iterator>::value, int > = 0 >
+    IteratorType erase(IteratorType pos) // NOLINT(performance-unnecessary-value-param)
+    {
+        // make sure iterator fits the current value
+        if (JSON_HEDLEY_UNLIKELY(this != pos.m_object))
+        {
+            JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value", this));
+        }
+
+        IteratorType result = end();
+
+        switch (m_data.m_type)
+        {
+            case value_t::boolean:
+            case value_t::number_float:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::string:
+            case value_t::binary:
+            {
+                if (JSON_HEDLEY_UNLIKELY(!pos.m_it.primitive_iterator.is_begin()))
+                {
+                    JSON_THROW(invalid_iterator::create(205, "iterator out of range", this));
+                }
+
+                if (is_string())
+                {
+                    AllocatorType<string_t> alloc;
+                    std::allocator_traits<decltype(alloc)>::destroy(alloc, m_data.m_value.string);
+                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, m_data.m_value.string, 1);
+                    m_data.m_value.string = nullptr;
+                }
+                else if (is_binary())
+                {
+                    AllocatorType<binary_t> alloc;
+                    std::allocator_traits<decltype(alloc)>::destroy(alloc, m_data.m_value.binary);
+                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, m_data.m_value.binary, 1);
+                    m_data.m_value.binary = nullptr;
+                }
+
+                m_data.m_type = value_t::null;
+                assert_invariant();
+                break;
+            }
+
+            case value_t::object:
+            {
+                result.m_it.object_iterator = m_data.m_value.object->erase(pos.m_it.object_iterator);
+                break;
+            }
+
+            case value_t::array:
+            {
+                result.m_it.array_iterator = m_data.m_value.array->erase(pos.m_it.array_iterator);
+                break;
+            }
+
+            case value_t::null:
+            case value_t::discarded:
+            default:
+                JSON_THROW(type_error::create(307, detail::concat("cannot use erase() with ", type_name()), this));
+        }
+
+        return result;
+    }
+
+    /// @brief remove elements given an iterator range
+    /// @sa https://json.nlohmann.me/api/basic_json/erase/
+    template < class IteratorType, detail::enable_if_t <
+                   std::is_same<IteratorType, typename basic_json_t::iterator>::value ||
+                   std::is_same<IteratorType, typename basic_json_t::const_iterator>::value, int > = 0 >
+    IteratorType erase(IteratorType first, IteratorType last) // NOLINT(performance-unnecessary-value-param)
+    {
+        // make sure iterator fits the current value
+        if (JSON_HEDLEY_UNLIKELY(this != first.m_object || this != last.m_object))
+        {
+            JSON_THROW(invalid_iterator::create(203, "iterators do not fit current value", this));
+        }
+
+        IteratorType result = end();
+
+        switch (m_data.m_type)
+        {
+            case value_t::boolean:
+            case value_t::number_float:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::string:
+            case value_t::binary:
+            {
+                if (JSON_HEDLEY_LIKELY(!first.m_it.primitive_iterator.is_begin()
+                                       || !last.m_it.primitive_iterator.is_end()))
+                {
+                    JSON_THROW(invalid_iterator::create(204, "iterators out of range", this));
+                }
+
+                if (is_string())
+                {
+                    AllocatorType<string_t> alloc;
+                    std::allocator_traits<decltype(alloc)>::destroy(alloc, m_data.m_value.string);
+                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, m_data.m_value.string, 1);
+                    m_data.m_value.string = nullptr;
+                }
+                else if (is_binary())
+                {
+                    AllocatorType<binary_t> alloc;
+                    std::allocator_traits<decltype(alloc)>::destroy(alloc, m_data.m_value.binary);
+                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, m_data.m_value.binary, 1);
+                    m_data.m_value.binary = nullptr;
+                }
+
+                m_data.m_type = value_t::null;
+                assert_invariant();
+                break;
+            }
+
+            case value_t::object:
+            {
+                result.m_it.object_iterator = m_data.m_value.object->erase(first.m_it.object_iterator,
+                                              last.m_it.object_iterator);
+                break;
+            }
+
+            case value_t::array:
+            {
+                result.m_it.array_iterator = m_data.m_value.array->erase(first.m_it.array_iterator,
+                                             last.m_it.array_iterator);
+                break;
+            }
+
+            case value_t::null:
+            case value_t::discarded:
+            default:
+                JSON_THROW(type_error::create(307, detail::concat("cannot use erase() with ", type_name()), this));
+        }
+
+        return result;
+    }
+
+  private:
+    template < typename KeyType, detail::enable_if_t <
+                   detail::has_erase_with_key_type<basic_json_t, KeyType>::value, int > = 0 >
+    size_type erase_internal(KeyType && key)
+    {
+        // this erase only works for objects
+        if (JSON_HEDLEY_UNLIKELY(!is_object()))
+        {
+            JSON_THROW(type_error::create(307, detail::concat("cannot use erase() with ", type_name()), this));
+        }
+
+        return m_data.m_value.object->erase(std::forward<KeyType>(key));
+    }
+
+    template < typename KeyType, detail::enable_if_t <
+                   !detail::has_erase_with_key_type<basic_json_t, KeyType>::value, int > = 0 >
+    size_type erase_internal(KeyType && key)
+    {
+        // this erase only works for objects
+        if (JSON_HEDLEY_UNLIKELY(!is_object()))
+        {
+            JSON_THROW(type_error::create(307, detail::concat("cannot use erase() with ", type_name()), this));
+        }
+
+        const auto it = m_data.m_value.object->find(std::forward<KeyType>(key));
+        if (it != m_data.m_value.object->end())
+        {
+            m_data.m_value.object->erase(it);
+            return 1;
+        }
+        return 0;
+    }
+
+  public:
+
+    /// @brief remove element from a JSON object given a key
+    /// @sa https://json.nlohmann.me/api/basic_json/erase/
+    size_type erase(const typename object_t::key_type& key)
+    {
+        // the indirection via erase_internal() is added to avoid making this
+        // function a template and thus de-rank it during overload resolution
+        return erase_internal(key);
+    }
+
+    /// @brief remove element from a JSON object given a key
+    /// @sa https://json.nlohmann.me/api/basic_json/erase/
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_basic_json_key_type<basic_json_t, KeyType>::value, int> = 0>
+    size_type erase(KeyType && key)
+    {
+        return erase_internal(std::forward<KeyType>(key));
+    }
+
+    /// @brief remove element from a JSON array given an index
+    /// @sa https://json.nlohmann.me/api/basic_json/erase/
+    void erase(const size_type idx)
+    {
+        // this erase only works for arrays
+        if (JSON_HEDLEY_LIKELY(is_array()))
+        {
+            if (JSON_HEDLEY_UNLIKELY(idx >= size()))
+            {
+                JSON_THROW(out_of_range::create(401, detail::concat("array index ", std::to_string(idx), " is out of range"), this));
+            }
+
+            m_data.m_value.array->erase(m_data.m_value.array->begin() + static_cast<difference_type>(idx));
+        }
+        else
+        {
+            JSON_THROW(type_error::create(307, detail::concat("cannot use erase() with ", type_name()), this));
+        }
+    }
+
+    /// @}
+
+    ////////////
+    // lookup //
+    ////////////
+
+    /// @name lookup
+    /// @{
+
+    /// @brief find an element in a JSON object
+    /// @sa https://json.nlohmann.me/api/basic_json/find/
+    iterator find(const typename object_t::key_type& key)
+    {
+        auto result = end();
+
+        if (is_object())
+        {
+            result.m_it.object_iterator = m_data.m_value.object->find(key);
+        }
+
+        return result;
+    }
+
+    /// @brief find an element in a JSON object
+    /// @sa https://json.nlohmann.me/api/basic_json/find/
+    const_iterator find(const typename object_t::key_type& key) const
+    {
+        auto result = cend();
+
+        if (is_object())
+        {
+            result.m_it.object_iterator = m_data.m_value.object->find(key);
+        }
+
+        return result;
+    }
+
+    /// @brief find an element in a JSON object
+    /// @sa https://json.nlohmann.me/api/basic_json/find/
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_basic_json_key_type<basic_json_t, KeyType>::value, int> = 0>
+    iterator find(KeyType && key)
+    {
+        auto result = end();
+
+        if (is_object())
+        {
+            result.m_it.object_iterator = m_data.m_value.object->find(std::forward<KeyType>(key));
+        }
+
+        return result;
+    }
+
+    /// @brief find an element in a JSON object
+    /// @sa https://json.nlohmann.me/api/basic_json/find/
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_basic_json_key_type<basic_json_t, KeyType>::value, int> = 0>
+    const_iterator find(KeyType && key) const
+    {
+        auto result = cend();
+
+        if (is_object())
+        {
+            result.m_it.object_iterator = m_data.m_value.object->find(std::forward<KeyType>(key));
+        }
+
+        return result;
+    }
+
+    /// @brief returns the number of occurrences of a key in a JSON object
+    /// @sa https://json.nlohmann.me/api/basic_json/count/
+    size_type count(const typename object_t::key_type& key) const
+    {
+        // return 0 for all nonobject types
+        return is_object() ? m_data.m_value.object->count(key) : 0;
+    }
+
+    /// @brief returns the number of occurrences of a key in a JSON object
+    /// @sa https://json.nlohmann.me/api/basic_json/count/
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_basic_json_key_type<basic_json_t, KeyType>::value, int> = 0>
+    size_type count(KeyType && key) const
+    {
+        // return 0 for all nonobject types
+        return is_object() ? m_data.m_value.object->count(std::forward<KeyType>(key)) : 0;
+    }
+
+    /// @brief check the existence of an element in a JSON object
+    /// @sa https://json.nlohmann.me/api/basic_json/contains/
+    bool contains(const typename object_t::key_type& key) const
+    {
+        return is_object() && m_data.m_value.object->find(key) != m_data.m_value.object->end();
+    }
+
+    /// @brief check the existence of an element in a JSON object
+    /// @sa https://json.nlohmann.me/api/basic_json/contains/
+    template<class KeyType, detail::enable_if_t<
+                 detail::is_usable_as_basic_json_key_type<basic_json_t, KeyType>::value, int> = 0>
+    bool contains(KeyType && key) const
+    {
+        return is_object() && m_data.m_value.object->find(std::forward<KeyType>(key)) != m_data.m_value.object->end();
+    }
+
+    /// @brief check the existence of an element in a JSON object given a JSON pointer
+    /// @sa https://json.nlohmann.me/api/basic_json/contains/
+    bool contains(const json_pointer& ptr) const
+    {
+        return ptr.contains(this);
+    }
+
+    template<typename BasicJsonType, detail::enable_if_t<detail::is_basic_json<BasicJsonType>::value, int> = 0>
+    JSON_HEDLEY_DEPRECATED_FOR(3.11.0, basic_json::json_pointer or nlohmann::json_pointer<basic_json::string_t>) // NOLINT(readability/alt_tokens)
+    bool contains(const typename ::nlohmann::json_pointer<BasicJsonType>& ptr) const
+    {
+        return ptr.contains(this);
+    }
+
+    /// @}
+
+    ///////////////
+    // iterators //
+    ///////////////
+
+    /// @name iterators
+    /// @{
+
+    /// @brief returns an iterator to the first element
+    /// @sa https://json.nlohmann.me/api/basic_json/begin/
+    iterator begin() noexcept
+    {
+        iterator result(this);
+        result.set_begin();
+        return result;
+    }
+
+    /// @brief returns an iterator to the first element
+    /// @sa https://json.nlohmann.me/api/basic_json/begin/
+    const_iterator begin() const noexcept
+    {
+        return cbegin();
+    }
+
+    /// @brief returns a const iterator to the first element
+    /// @sa https://json.nlohmann.me/api/basic_json/cbegin/
+    const_iterator cbegin() const noexcept
+    {
+        const_iterator result(this);
+        result.set_begin();
+        return result;
+    }
+
+    /// @brief returns an iterator to one past the last element
+    /// @sa https://json.nlohmann.me/api/basic_json/end/
+    iterator end() noexcept
+    {
+        iterator result(this);
+        result.set_end();
+        return result;
+    }
+
+    /// @brief returns an iterator to one past the last element
+    /// @sa https://json.nlohmann.me/api/basic_json/end/
+    const_iterator end() const noexcept
+    {
+        return cend();
+    }
+
+    /// @brief returns an iterator to one past the last element
+    /// @sa https://json.nlohmann.me/api/basic_json/cend/
+    const_iterator cend() const noexcept
+    {
+        const_iterator result(this);
+        result.set_end();
+        return result;
+    }
+
+    /// @brief returns an iterator to the reverse-beginning
+    /// @sa https://json.nlohmann.me/api/basic_json/rbegin/
+    reverse_iterator rbegin() noexcept
+    {
+        return reverse_iterator(end());
+    }
+
+    /// @brief returns an iterator to the reverse-beginning
+    /// @sa https://json.nlohmann.me/api/basic_json/rbegin/
+    const_reverse_iterator rbegin() const noexcept
+    {
+        return crbegin();
+    }
+
+    /// @brief returns an iterator to the reverse-end
+    /// @sa https://json.nlohmann.me/api/basic_json/rend/
+    reverse_iterator rend() noexcept
+    {
+        return reverse_iterator(begin());
+    }
+
+    /// @brief returns an iterator to the reverse-end
+    /// @sa https://json.nlohmann.me/api/basic_json/rend/
+    const_reverse_iterator rend() const noexcept
+    {
+        return crend();
+    }
+
+    /// @brief returns a const reverse iterator to the last element
+    /// @sa https://json.nlohmann.me/api/basic_json/crbegin/
+    const_reverse_iterator crbegin() const noexcept
+    {
+        return const_reverse_iterator(cend());
+    }
+
+    /// @brief returns a const reverse iterator to one before the first
+    /// @sa https://json.nlohmann.me/api/basic_json/crend/
+    const_reverse_iterator crend() const noexcept
+    {
+        return const_reverse_iterator(cbegin());
+    }
+
+  public:
+    /// @brief wrapper to access iterator member functions in range-based for
+    /// @sa https://json.nlohmann.me/api/basic_json/items/
+    /// @deprecated This function is deprecated since 3.1.0 and will be removed in
+    ///             version 4.0.0 of the library. Please use @ref items() instead;
+    ///             that is, replace `json::iterator_wrapper(j)` with `j.items()`.
+    JSON_HEDLEY_DEPRECATED_FOR(3.1.0, items())
+    static iteration_proxy<iterator> iterator_wrapper(reference ref) noexcept
+    {
+        return ref.items();
+    }
+
+    /// @brief wrapper to access iterator member functions in range-based for
+    /// @sa https://json.nlohmann.me/api/basic_json/items/
+    /// @deprecated This function is deprecated since 3.1.0 and will be removed in
+    ///         version 4.0.0 of the library. Please use @ref items() instead;
+    ///         that is, replace `json::iterator_wrapper(j)` with `j.items()`.
+    JSON_HEDLEY_DEPRECATED_FOR(3.1.0, items())
+    static iteration_proxy<const_iterator> iterator_wrapper(const_reference ref) noexcept
+    {
+        return ref.items();
+    }
+
+    /// @brief helper to access iterator member functions in range-based for
+    /// @sa https://json.nlohmann.me/api/basic_json/items/
+    iteration_proxy<iterator> items() noexcept
+    {
+        return iteration_proxy<iterator>(*this);
+    }
+
+    /// @brief helper to access iterator member functions in range-based for
+    /// @sa https://json.nlohmann.me/api/basic_json/items/
+    iteration_proxy<const_iterator> items() const noexcept
+    {
+        return iteration_proxy<const_iterator>(*this);
+    }
+
+    /// @}
+
+    //////////////
+    // capacity //
+    //////////////
+
+    /// @name capacity
+    /// @{
+
+    /// @brief checks whether the container is empty.
+    /// @sa https://json.nlohmann.me/api/basic_json/empty/
+    bool empty() const noexcept
+    {
+        switch (m_data.m_type)
+        {
+            case value_t::null:
+            {
+                // null values are empty
+                return true;
+            }
+
+            case value_t::array:
+            {
+                // delegate call to array_t::empty()
+                return m_data.m_value.array->empty();
+            }
+
+            case value_t::object:
+            {
+                // delegate call to object_t::empty()
+                return m_data.m_value.object->empty();
+            }
+
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+            {
+                // all other types are nonempty
+                return false;
+            }
+        }
+    }
+
+    /// @brief returns the number of elements
+    /// @sa https://json.nlohmann.me/api/basic_json/size/
+    size_type size() const noexcept
+    {
+        switch (m_data.m_type)
+        {
+            case value_t::null:
+            {
+                // null values are empty
+                return 0;
+            }
+
+            case value_t::array:
+            {
+                // delegate call to array_t::size()
+                return m_data.m_value.array->size();
+            }
+
+            case value_t::object:
+            {
+                // delegate call to object_t::size()
+                return m_data.m_value.object->size();
+            }
+
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+            {
+                // all other types have size 1
+                return 1;
+            }
+        }
+    }
+
+    /// @brief returns the maximum possible number of elements
+    /// @sa https://json.nlohmann.me/api/basic_json/max_size/
+    size_type max_size() const noexcept
+    {
+        switch (m_data.m_type)
+        {
+            case value_t::array:
+            {
+                // delegate call to array_t::max_size()
+                return m_data.m_value.array->max_size();
+            }
+
+            case value_t::object:
+            {
+                // delegate call to object_t::max_size()
+                return m_data.m_value.object->max_size();
+            }
+
+            case value_t::null:
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+            {
+                // all other types have max_size() == size()
+                return size();
+            }
+        }
+    }
+
+    /// @}
+
+    ///////////////
+    // modifiers //
+    ///////////////
+
+    /// @name modifiers
+    /// @{
+
+    /// @brief clears the contents
+    /// @sa https://json.nlohmann.me/api/basic_json/clear/
+    void clear() noexcept
+    {
+        switch (m_data.m_type)
+        {
+            case value_t::number_integer:
+            {
+                m_data.m_value.number_integer = 0;
+                break;
+            }
+
+            case value_t::number_unsigned:
+            {
+                m_data.m_value.number_unsigned = 0;
+                break;
+            }
+
+            case value_t::number_float:
+            {
+                m_data.m_value.number_float = 0.0;
+                break;
+            }
+
+            case value_t::boolean:
+            {
+                m_data.m_value.boolean = false;
+                break;
+            }
+
+            case value_t::string:
+            {
+                m_data.m_value.string->clear();
+                break;
+            }
+
+            case value_t::binary:
+            {
+                m_data.m_value.binary->clear();
+                break;
+            }
+
+            case value_t::array:
+            {
+                m_data.m_value.array->clear();
+                break;
+            }
+
+            case value_t::object:
+            {
+                m_data.m_value.object->clear();
+                break;
+            }
+
+            case value_t::null:
+            case value_t::discarded:
+            default:
+                break;
+        }
+    }
+
+    /// @brief add an object to an array
+    /// @sa https://json.nlohmann.me/api/basic_json/push_back/
+    void push_back(basic_json&& val)
+    {
+        // push_back only works for null objects or arrays
+        if (JSON_HEDLEY_UNLIKELY(!(is_null() || is_array())))
+        {
+            JSON_THROW(type_error::create(308, detail::concat("cannot use push_back() with ", type_name()), this));
+        }
+
+        // transform null object into an array
+        if (is_null())
+        {
+            m_data.m_type = value_t::array;
+            m_data.m_value = value_t::array;
+            assert_invariant();
+        }
+
+        // add element to array (move semantics)
+        const auto old_capacity = m_data.m_value.array->capacity();
+        m_data.m_value.array->push_back(std::move(val));
+        set_parent(m_data.m_value.array->back(), old_capacity);
+        // if val is moved from, basic_json move constructor marks it null, so we do not call the destructor
+    }
+
+    /// @brief add an object to an array
+    /// @sa https://json.nlohmann.me/api/basic_json/operator+=/
+    reference operator+=(basic_json&& val)
+    {
+        push_back(std::move(val));
+        return *this;
+    }
+
+    /// @brief add an object to an array
+    /// @sa https://json.nlohmann.me/api/basic_json/push_back/
+    void push_back(const basic_json& val)
+    {
+        // push_back only works for null objects or arrays
+        if (JSON_HEDLEY_UNLIKELY(!(is_null() || is_array())))
+        {
+            JSON_THROW(type_error::create(308, detail::concat("cannot use push_back() with ", type_name()), this));
+        }
+
+        // transform null object into an array
+        if (is_null())
+        {
+            m_data.m_type = value_t::array;
+            m_data.m_value = value_t::array;
+            assert_invariant();
+        }
+
+        // add element to array
+        const auto old_capacity = m_data.m_value.array->capacity();
+        m_data.m_value.array->push_back(val);
+        set_parent(m_data.m_value.array->back(), old_capacity);
+    }
+
+    /// @brief add an object to an array
+    /// @sa https://json.nlohmann.me/api/basic_json/operator+=/
+    reference operator+=(const basic_json& val)
+    {
+        push_back(val);
+        return *this;
+    }
+
+    /// @brief add an object to an object
+    /// @sa https://json.nlohmann.me/api/basic_json/push_back/
+    void push_back(const typename object_t::value_type& val)
+    {
+        // push_back only works for null objects or objects
+        if (JSON_HEDLEY_UNLIKELY(!(is_null() || is_object())))
+        {
+            JSON_THROW(type_error::create(308, detail::concat("cannot use push_back() with ", type_name()), this));
+        }
+
+        // transform null object into an object
+        if (is_null())
+        {
+            m_data.m_type = value_t::object;
+            m_data.m_value = value_t::object;
+            assert_invariant();
+        }
+
+        // add element to object
+        auto res = m_data.m_value.object->insert(val);
+        set_parent(res.first->second);
+    }
+
+    /// @brief add an object to an object
+    /// @sa https://json.nlohmann.me/api/basic_json/operator+=/
+    reference operator+=(const typename object_t::value_type& val)
+    {
+        push_back(val);
+        return *this;
+    }
+
+    /// @brief add an object to an object
+    /// @sa https://json.nlohmann.me/api/basic_json/push_back/
+    void push_back(initializer_list_t init)
+    {
+        if (is_object() && init.size() == 2 && (*init.begin())->is_string())
+        {
+            basic_json&& key = init.begin()->moved_or_copied();
+            push_back(typename object_t::value_type(
+                          std::move(key.get_ref<string_t&>()), (init.begin() + 1)->moved_or_copied()));
+        }
+        else
+        {
+            push_back(basic_json(init));
+        }
+    }
+
+    /// @brief add an object to an object
+    /// @sa https://json.nlohmann.me/api/basic_json/operator+=/
+    reference operator+=(initializer_list_t init)
+    {
+        push_back(init);
+        return *this;
+    }
+
+    /// @brief add an object to an array
+    /// @sa https://json.nlohmann.me/api/basic_json/emplace_back/
+    template<class... Args>
+    reference emplace_back(Args&& ... args)
+    {
+        // emplace_back only works for null objects or arrays
+        if (JSON_HEDLEY_UNLIKELY(!(is_null() || is_array())))
+        {
+            JSON_THROW(type_error::create(311, detail::concat("cannot use emplace_back() with ", type_name()), this));
+        }
+
+        // transform null object into an array
+        if (is_null())
+        {
+            m_data.m_type = value_t::array;
+            m_data.m_value = value_t::array;
+            assert_invariant();
+        }
+
+        // add element to array (perfect forwarding)
+        const auto old_capacity = m_data.m_value.array->capacity();
+        m_data.m_value.array->emplace_back(std::forward<Args>(args)...);
+        return set_parent(m_data.m_value.array->back(), old_capacity);
+    }
+
+    /// @brief add an object to an object if key does not exist
+    /// @sa https://json.nlohmann.me/api/basic_json/emplace/
+    template<class... Args>
+    std::pair<iterator, bool> emplace(Args&& ... args)
+    {
+        // emplace only works for null objects or arrays
+        if (JSON_HEDLEY_UNLIKELY(!(is_null() || is_object())))
+        {
+            JSON_THROW(type_error::create(311, detail::concat("cannot use emplace() with ", type_name()), this));
+        }
+
+        // transform null object into an object
+        if (is_null())
+        {
+            m_data.m_type = value_t::object;
+            m_data.m_value = value_t::object;
+            assert_invariant();
+        }
+
+        // add element to array (perfect forwarding)
+        auto res = m_data.m_value.object->emplace(std::forward<Args>(args)...);
+        set_parent(res.first->second);
+
+        // create result iterator and set iterator to the result of emplace
+        auto it = begin();
+        it.m_it.object_iterator = res.first;
+
+        // return pair of iterator and boolean
+        return {it, res.second};
+    }
+
+    /// Helper for insertion of an iterator
+    /// @note: This uses std::distance to support GCC 4.8,
+    ///        see https://github.com/nlohmann/json/pull/1257
+    template<typename... Args>
+    iterator insert_iterator(const_iterator pos, Args&& ... args) // NOLINT(performance-unnecessary-value-param)
+    {
+        iterator result(this);
+        JSON_ASSERT(m_data.m_value.array != nullptr);
+
+        auto insert_pos = std::distance(m_data.m_value.array->begin(), pos.m_it.array_iterator);
+        m_data.m_value.array->insert(pos.m_it.array_iterator, std::forward<Args>(args)...);
+        result.m_it.array_iterator = m_data.m_value.array->begin() + insert_pos;
+
+        // This could have been written as:
+        // result.m_it.array_iterator = m_data.m_value.array->insert(pos.m_it.array_iterator, cnt, val);
+        // but the return value of insert is missing in GCC 4.8, so it is written this way instead.
+
+        set_parents();
+        return result;
+    }
+
+    /// @brief inserts element into array
+    /// @sa https://json.nlohmann.me/api/basic_json/insert/
+    iterator insert(const_iterator pos, const basic_json& val) // NOLINT(performance-unnecessary-value-param)
+    {
+        // insert only works for arrays
+        if (JSON_HEDLEY_LIKELY(is_array()))
+        {
+            // check if iterator pos fits to this JSON value
+            if (JSON_HEDLEY_UNLIKELY(pos.m_object != this))
+            {
+                JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value", this));
+            }
+
+            // insert to array and return iterator
+            return insert_iterator(pos, val);
+        }
+
+        JSON_THROW(type_error::create(309, detail::concat("cannot use insert() with ", type_name()), this));
+    }
+
+    /// @brief inserts element into array
+    /// @sa https://json.nlohmann.me/api/basic_json/insert/
+    iterator insert(const_iterator pos, basic_json&& val) // NOLINT(performance-unnecessary-value-param)
+    {
+        return insert(pos, val);
+    }
+
+    /// @brief inserts copies of element into array
+    /// @sa https://json.nlohmann.me/api/basic_json/insert/
+    iterator insert(const_iterator pos, size_type cnt, const basic_json& val) // NOLINT(performance-unnecessary-value-param)
+    {
+        // insert only works for arrays
+        if (JSON_HEDLEY_LIKELY(is_array()))
+        {
+            // check if iterator pos fits to this JSON value
+            if (JSON_HEDLEY_UNLIKELY(pos.m_object != this))
+            {
+                JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value", this));
+            }
+
+            // insert to array and return iterator
+            return insert_iterator(pos, cnt, val);
+        }
+
+        JSON_THROW(type_error::create(309, detail::concat("cannot use insert() with ", type_name()), this));
+    }
+
+    /// @brief inserts range of elements into array
+    /// @sa https://json.nlohmann.me/api/basic_json/insert/
+    iterator insert(const_iterator pos, const_iterator first, const_iterator last) // NOLINT(performance-unnecessary-value-param)
+    {
+        // insert only works for arrays
+        if (JSON_HEDLEY_UNLIKELY(!is_array()))
+        {
+            JSON_THROW(type_error::create(309, detail::concat("cannot use insert() with ", type_name()), this));
+        }
+
+        // check if iterator pos fits to this JSON value
+        if (JSON_HEDLEY_UNLIKELY(pos.m_object != this))
+        {
+            JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value", this));
+        }
+
+        // check if range iterators belong to the same JSON object
+        if (JSON_HEDLEY_UNLIKELY(first.m_object != last.m_object))
+        {
+            JSON_THROW(invalid_iterator::create(210, "iterators do not fit", this));
+        }
+
+        if (JSON_HEDLEY_UNLIKELY(first.m_object == this))
+        {
+            JSON_THROW(invalid_iterator::create(211, "passed iterators may not belong to container", this));
+        }
+
+        // insert to array and return iterator
+        return insert_iterator(pos, first.m_it.array_iterator, last.m_it.array_iterator);
+    }
+
+    /// @brief inserts elements from initializer list into array
+    /// @sa https://json.nlohmann.me/api/basic_json/insert/
+    iterator insert(const_iterator pos, initializer_list_t ilist) // NOLINT(performance-unnecessary-value-param)
+    {
+        // insert only works for arrays
+        if (JSON_HEDLEY_UNLIKELY(!is_array()))
+        {
+            JSON_THROW(type_error::create(309, detail::concat("cannot use insert() with ", type_name()), this));
+        }
+
+        // check if iterator pos fits to this JSON value
+        if (JSON_HEDLEY_UNLIKELY(pos.m_object != this))
+        {
+            JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value", this));
+        }
+
+        // insert to array and return iterator
+        return insert_iterator(pos, ilist.begin(), ilist.end());
+    }
+
+    /// @brief inserts range of elements into object
+    /// @sa https://json.nlohmann.me/api/basic_json/insert/
+    void insert(const_iterator first, const_iterator last) // NOLINT(performance-unnecessary-value-param)
+    {
+        // insert only works for objects
+        if (JSON_HEDLEY_UNLIKELY(!is_object()))
+        {
+            JSON_THROW(type_error::create(309, detail::concat("cannot use insert() with ", type_name()), this));
+        }
+
+        // check if range iterators belong to the same JSON object
+        if (JSON_HEDLEY_UNLIKELY(first.m_object != last.m_object))
+        {
+            JSON_THROW(invalid_iterator::create(210, "iterators do not fit", this));
+        }
+
+        // passed iterators must belong to objects
+        if (JSON_HEDLEY_UNLIKELY(!first.m_object->is_object()))
+        {
+            JSON_THROW(invalid_iterator::create(202, "iterators first and last must point to objects", this));
+        }
+
+        m_data.m_value.object->insert(first.m_it.object_iterator, last.m_it.object_iterator);
+        set_parents();
+    }
+
+    /// @brief updates a JSON object from another object, overwriting existing keys
+    /// @sa https://json.nlohmann.me/api/basic_json/update/
+    void update(const_reference j, bool merge_objects = false)
+    {
+        update(j.begin(), j.end(), merge_objects);
+    }
+
+    /// @brief updates a JSON object from another object, overwriting existing keys
+    /// @sa https://json.nlohmann.me/api/basic_json/update/
+    void update(const_iterator first, const_iterator last, bool merge_objects = false) // NOLINT(performance-unnecessary-value-param)
+    {
+        // implicitly convert null value to an empty object
+        if (is_null())
+        {
+            m_data.m_type = value_t::object;
+            m_data.m_value.object = create<object_t>();
+            assert_invariant();
+        }
+
+        if (JSON_HEDLEY_UNLIKELY(!is_object()))
+        {
+            JSON_THROW(type_error::create(312, detail::concat("cannot use update() with ", type_name()), this));
+        }
+
+        // check if range iterators belong to the same JSON object
+        if (JSON_HEDLEY_UNLIKELY(first.m_object != last.m_object))
+        {
+            JSON_THROW(invalid_iterator::create(210, "iterators do not fit", this));
+        }
+
+        // passed iterators must belong to objects
+        if (JSON_HEDLEY_UNLIKELY(!first.m_object->is_object()))
+        {
+            JSON_THROW(type_error::create(312, detail::concat("cannot use update() with ", first.m_object->type_name()), first.m_object));
+        }
+
+        for (auto it = first; it != last; ++it)
+        {
+            if (merge_objects && it.value().is_object())
+            {
+                auto it2 = m_data.m_value.object->find(it.key());
+                if (it2 != m_data.m_value.object->end())
+                {
+                    it2->second.update(it.value(), true);
+                    continue;
+                }
+            }
+            m_data.m_value.object->operator[](it.key()) = it.value();
+#if JSON_DIAGNOSTICS
+            m_data.m_value.object->operator[](it.key()).m_parent = this;
+#endif
+        }
+    }
+
+    /// @brief exchanges the values
+    /// @sa https://json.nlohmann.me/api/basic_json/swap/
+    void swap(reference other) noexcept (
+        std::is_nothrow_move_constructible<value_t>::value&&
+        std::is_nothrow_move_assignable<value_t>::value&&
+        std::is_nothrow_move_constructible<json_value>::value&& // NOLINT(cppcoreguidelines-noexcept-swap,performance-noexcept-swap)
+        std::is_nothrow_move_assignable<json_value>::value
+    )
+    {
+        std::swap(m_data.m_type, other.m_data.m_type);
+        std::swap(m_data.m_value, other.m_data.m_value);
+
+        set_parents();
+        other.set_parents();
+        assert_invariant();
+    }
+
+    /// @brief exchanges the values
+    /// @sa https://json.nlohmann.me/api/basic_json/swap/
+    friend void swap(reference left, reference right) noexcept (
+        std::is_nothrow_move_constructible<value_t>::value&&
+        std::is_nothrow_move_assignable<value_t>::value&&
+        std::is_nothrow_move_constructible<json_value>::value&& // NOLINT(cppcoreguidelines-noexcept-swap,performance-noexcept-swap)
+        std::is_nothrow_move_assignable<json_value>::value
+    )
+    {
+        left.swap(right);
+    }
+
+    /// @brief exchanges the values
+    /// @sa https://json.nlohmann.me/api/basic_json/swap/
+    void swap(array_t& other) // NOLINT(bugprone-exception-escape,cppcoreguidelines-noexcept-swap,performance-noexcept-swap)
+    {
+        // swap only works for arrays
+        if (JSON_HEDLEY_LIKELY(is_array()))
+        {
+            using std::swap;
+            swap(*(m_data.m_value.array), other);
+        }
+        else
+        {
+            JSON_THROW(type_error::create(310, detail::concat("cannot use swap(array_t&) with ", type_name()), this));
+        }
+    }
+
+    /// @brief exchanges the values
+    /// @sa https://json.nlohmann.me/api/basic_json/swap/
+    void swap(object_t& other) // NOLINT(bugprone-exception-escape,cppcoreguidelines-noexcept-swap,performance-noexcept-swap)
+    {
+        // swap only works for objects
+        if (JSON_HEDLEY_LIKELY(is_object()))
+        {
+            using std::swap;
+            swap(*(m_data.m_value.object), other);
+        }
+        else
+        {
+            JSON_THROW(type_error::create(310, detail::concat("cannot use swap(object_t&) with ", type_name()), this));
+        }
+    }
+
+    /// @brief exchanges the values
+    /// @sa https://json.nlohmann.me/api/basic_json/swap/
+    void swap(string_t& other) // NOLINT(bugprone-exception-escape,cppcoreguidelines-noexcept-swap,performance-noexcept-swap)
+    {
+        // swap only works for strings
+        if (JSON_HEDLEY_LIKELY(is_string()))
+        {
+            using std::swap;
+            swap(*(m_data.m_value.string), other);
+        }
+        else
+        {
+            JSON_THROW(type_error::create(310, detail::concat("cannot use swap(string_t&) with ", type_name()), this));
+        }
+    }
+
+    /// @brief exchanges the values
+    /// @sa https://json.nlohmann.me/api/basic_json/swap/
+    void swap(binary_t& other) // NOLINT(bugprone-exception-escape,cppcoreguidelines-noexcept-swap,performance-noexcept-swap)
+    {
+        // swap only works for strings
+        if (JSON_HEDLEY_LIKELY(is_binary()))
+        {
+            using std::swap;
+            swap(*(m_data.m_value.binary), other);
+        }
+        else
+        {
+            JSON_THROW(type_error::create(310, detail::concat("cannot use swap(binary_t&) with ", type_name()), this));
+        }
+    }
+
+    /// @brief exchanges the values
+    /// @sa https://json.nlohmann.me/api/basic_json/swap/
+    void swap(typename binary_t::container_type& other) // NOLINT(bugprone-exception-escape)
+    {
+        // swap only works for strings
+        if (JSON_HEDLEY_LIKELY(is_binary()))
+        {
+            using std::swap;
+            swap(*(m_data.m_value.binary), other);
+        }
+        else
+        {
+            JSON_THROW(type_error::create(310, detail::concat("cannot use swap(binary_t::container_type&) with ", type_name()), this));
+        }
+    }
+
+    /// @}
+
+    //////////////////////////////////////////
+    // lexicographical comparison operators //
+    //////////////////////////////////////////
+
+    /// @name lexicographical comparison operators
+    /// @{
+
+    // note parentheses around operands are necessary; see
+    // https://github.com/nlohmann/json/issues/1530
+#define JSON_IMPLEMENT_OPERATOR(op, null_result, unordered_result, default_result)                       \
+    const auto lhs_type = lhs.type();                                                                    \
+    const auto rhs_type = rhs.type();                                                                    \
+    \
+    if (lhs_type == rhs_type) /* NOLINT(readability/braces) */                                           \
+    {                                                                                                    \
+        switch (lhs_type)                                                                                \
+        {                                                                                                \
+            case value_t::array:                                                                         \
+                return (*lhs.m_data.m_value.array) op (*rhs.m_data.m_value.array);                                     \
+                \
+            case value_t::object:                                                                        \
+                return (*lhs.m_data.m_value.object) op (*rhs.m_data.m_value.object);                                   \
+                \
+            case value_t::null:                                                                          \
+                return (null_result);                                                                    \
+                \
+            case value_t::string:                                                                        \
+                return (*lhs.m_data.m_value.string) op (*rhs.m_data.m_value.string);                                   \
+                \
+            case value_t::boolean:                                                                       \
+                return (lhs.m_data.m_value.boolean) op (rhs.m_data.m_value.boolean);                                   \
+                \
+            case value_t::number_integer:                                                                \
+                return (lhs.m_data.m_value.number_integer) op (rhs.m_data.m_value.number_integer);                     \
+                \
+            case value_t::number_unsigned:                                                               \
+                return (lhs.m_data.m_value.number_unsigned) op (rhs.m_data.m_value.number_unsigned);                   \
+                \
+            case value_t::number_float:                                                                  \
+                return (lhs.m_data.m_value.number_float) op (rhs.m_data.m_value.number_float);                         \
+                \
+            case value_t::binary:                                                                        \
+                return (*lhs.m_data.m_value.binary) op (*rhs.m_data.m_value.binary);                                   \
+                \
+            case value_t::discarded:                                                                     \
+            default:                                                                                     \
+                return (unordered_result);                                                               \
+        }                                                                                                \
+    }                                                                                                    \
+    else if (lhs_type == value_t::number_integer && rhs_type == value_t::number_float)                   \
+    {                                                                                                    \
+        return static_cast<number_float_t>(lhs.m_data.m_value.number_integer) op rhs.m_data.m_value.number_float;      \
+    }                                                                                                    \
+    else if (lhs_type == value_t::number_float && rhs_type == value_t::number_integer)                   \
+    {                                                                                                    \
+        return lhs.m_data.m_value.number_float op static_cast<number_float_t>(rhs.m_data.m_value.number_integer);      \
+    }                                                                                                    \
+    else if (lhs_type == value_t::number_unsigned && rhs_type == value_t::number_float)                  \
+    {                                                                                                    \
+        return static_cast<number_float_t>(lhs.m_data.m_value.number_unsigned) op rhs.m_data.m_value.number_float;     \
+    }                                                                                                    \
+    else if (lhs_type == value_t::number_float && rhs_type == value_t::number_unsigned)                  \
+    {                                                                                                    \
+        return lhs.m_data.m_value.number_float op static_cast<number_float_t>(rhs.m_data.m_value.number_unsigned);     \
+    }                                                                                                    \
+    else if (lhs_type == value_t::number_unsigned && rhs_type == value_t::number_integer)                \
+    {                                                                                                    \
+        return static_cast<number_integer_t>(lhs.m_data.m_value.number_unsigned) op rhs.m_data.m_value.number_integer; \
+    }                                                                                                    \
+    else if (lhs_type == value_t::number_integer && rhs_type == value_t::number_unsigned)                \
+    {                                                                                                    \
+        return lhs.m_data.m_value.number_integer op static_cast<number_integer_t>(rhs.m_data.m_value.number_unsigned); \
+    }                                                                                                    \
+    else if(compares_unordered(lhs, rhs))\
+    {\
+        return (unordered_result);\
+    }\
+    \
+    return (default_result);
+
+  JSON_PRIVATE_UNLESS_TESTED:
+    // returns true if:
+    // - any operand is NaN and the other operand is of number type
+    // - any operand is discarded
+    // in legacy mode, discarded values are considered ordered if
+    // an operation is computed as an odd number of inverses of others
+    static bool compares_unordered(const_reference lhs, const_reference rhs, bool inverse = false) noexcept
+    {
+        if ((lhs.is_number_float() && std::isnan(lhs.m_data.m_value.number_float) && rhs.is_number())
+                || (rhs.is_number_float() && std::isnan(rhs.m_data.m_value.number_float) && lhs.is_number()))
+        {
+            return true;
+        }
+#if JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON
+        return (lhs.is_discarded() || rhs.is_discarded()) && !inverse;
+#else
+        static_cast<void>(inverse);
+        return lhs.is_discarded() || rhs.is_discarded();
+#endif
+    }
+
+  private:
+    bool compares_unordered(const_reference rhs, bool inverse = false) const noexcept
+    {
+        return compares_unordered(*this, rhs, inverse);
+    }
+
+  public:
+#if JSON_HAS_THREE_WAY_COMPARISON
+    /// @brief comparison: equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_eq/
+    bool operator==(const_reference rhs) const noexcept
+    {
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wfloat-equal"
+#endif
+        const_reference lhs = *this;
+        JSON_IMPLEMENT_OPERATOR( ==, true, false, false)
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
+    }
+
+    /// @brief comparison: equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_eq/
+    template<typename ScalarType>
+    requires std::is_scalar_v<ScalarType>
+    bool operator==(ScalarType rhs) const noexcept
+    {
+        return *this == basic_json(rhs);
+    }
+
+    /// @brief comparison: not equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_ne/
+    bool operator!=(const_reference rhs) const noexcept
+    {
+        if (compares_unordered(rhs, true))
+        {
+            return false;
+        }
+        return !operator==(rhs);
+    }
+
+    /// @brief comparison: 3-way
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_spaceship/
+    std::partial_ordering operator<=>(const_reference rhs) const noexcept // *NOPAD*
+    {
+        const_reference lhs = *this;
+        // default_result is used if we cannot compare values. In that case,
+        // we compare types.
+        JSON_IMPLEMENT_OPERATOR(<=>, // *NOPAD*
+                                std::partial_ordering::equivalent,
+                                std::partial_ordering::unordered,
+                                lhs_type <=> rhs_type) // *NOPAD*
+    }
+
+    /// @brief comparison: 3-way
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_spaceship/
+    template<typename ScalarType>
+    requires std::is_scalar_v<ScalarType>
+    std::partial_ordering operator<=>(ScalarType rhs) const noexcept // *NOPAD*
+    {
+        return *this <=> basic_json(rhs); // *NOPAD*
+    }
+
+#if JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON
+    // all operators that are computed as an odd number of inverses of others
+    // need to be overloaded to emulate the legacy comparison behavior
+
+    /// @brief comparison: less than or equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_le/
+    JSON_HEDLEY_DEPRECATED_FOR(3.11.0, undef JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON)
+    bool operator<=(const_reference rhs) const noexcept
+    {
+        if (compares_unordered(rhs, true))
+        {
+            return false;
+        }
+        return !(rhs < *this);
+    }
+
+    /// @brief comparison: less than or equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_le/
+    template<typename ScalarType>
+    requires std::is_scalar_v<ScalarType>
+    bool operator<=(ScalarType rhs) const noexcept
+    {
+        return *this <= basic_json(rhs);
+    }
+
+    /// @brief comparison: greater than or equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_ge/
+    JSON_HEDLEY_DEPRECATED_FOR(3.11.0, undef JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON)
+    bool operator>=(const_reference rhs) const noexcept
+    {
+        if (compares_unordered(rhs, true))
+        {
+            return false;
+        }
+        return !(*this < rhs);
+    }
+
+    /// @brief comparison: greater than or equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_ge/
+    template<typename ScalarType>
+    requires std::is_scalar_v<ScalarType>
+    bool operator>=(ScalarType rhs) const noexcept
+    {
+        return *this >= basic_json(rhs);
+    }
+#endif
+#else
+    /// @brief comparison: equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_eq/
+    friend bool operator==(const_reference lhs, const_reference rhs) noexcept
+    {
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wfloat-equal"
+#endif
+        JSON_IMPLEMENT_OPERATOR( ==, true, false, false)
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
+    }
+
+    /// @brief comparison: equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_eq/
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator==(const_reference lhs, ScalarType rhs) noexcept
+    {
+        return lhs == basic_json(rhs);
+    }
+
+    /// @brief comparison: equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_eq/
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator==(ScalarType lhs, const_reference rhs) noexcept
+    {
+        return basic_json(lhs) == rhs;
+    }
+
+    /// @brief comparison: not equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_ne/
+    friend bool operator!=(const_reference lhs, const_reference rhs) noexcept
+    {
+        if (compares_unordered(lhs, rhs, true))
+        {
+            return false;
+        }
+        return !(lhs == rhs);
+    }
+
+    /// @brief comparison: not equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_ne/
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator!=(const_reference lhs, ScalarType rhs) noexcept
+    {
+        return lhs != basic_json(rhs);
+    }
+
+    /// @brief comparison: not equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_ne/
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator!=(ScalarType lhs, const_reference rhs) noexcept
+    {
+        return basic_json(lhs) != rhs;
+    }
+
+    /// @brief comparison: less than
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_lt/
+    friend bool operator<(const_reference lhs, const_reference rhs) noexcept
+    {
+        // default_result is used if we cannot compare values. In that case,
+        // we compare types. Note we have to call the operator explicitly,
+        // because MSVC has problems otherwise.
+        JSON_IMPLEMENT_OPERATOR( <, false, false, operator<(lhs_type, rhs_type))
+    }
+
+    /// @brief comparison: less than
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_lt/
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator<(const_reference lhs, ScalarType rhs) noexcept
+    {
+        return lhs < basic_json(rhs);
+    }
+
+    /// @brief comparison: less than
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_lt/
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator<(ScalarType lhs, const_reference rhs) noexcept
+    {
+        return basic_json(lhs) < rhs;
+    }
+
+    /// @brief comparison: less than or equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_le/
+    friend bool operator<=(const_reference lhs, const_reference rhs) noexcept
+    {
+        if (compares_unordered(lhs, rhs, true))
+        {
+            return false;
+        }
+        return !(rhs < lhs);
+    }
+
+    /// @brief comparison: less than or equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_le/
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator<=(const_reference lhs, ScalarType rhs) noexcept
+    {
+        return lhs <= basic_json(rhs);
+    }
+
+    /// @brief comparison: less than or equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_le/
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator<=(ScalarType lhs, const_reference rhs) noexcept
+    {
+        return basic_json(lhs) <= rhs;
+    }
+
+    /// @brief comparison: greater than
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_gt/
+    friend bool operator>(const_reference lhs, const_reference rhs) noexcept
+    {
+        // double inverse
+        if (compares_unordered(lhs, rhs))
+        {
+            return false;
+        }
+        return !(lhs <= rhs);
+    }
+
+    /// @brief comparison: greater than
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_gt/
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator>(const_reference lhs, ScalarType rhs) noexcept
+    {
+        return lhs > basic_json(rhs);
+    }
+
+    /// @brief comparison: greater than
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_gt/
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator>(ScalarType lhs, const_reference rhs) noexcept
+    {
+        return basic_json(lhs) > rhs;
+    }
+
+    /// @brief comparison: greater than or equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_ge/
+    friend bool operator>=(const_reference lhs, const_reference rhs) noexcept
+    {
+        if (compares_unordered(lhs, rhs, true))
+        {
+            return false;
+        }
+        return !(lhs < rhs);
+    }
+
+    /// @brief comparison: greater than or equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_ge/
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator>=(const_reference lhs, ScalarType rhs) noexcept
+    {
+        return lhs >= basic_json(rhs);
+    }
+
+    /// @brief comparison: greater than or equal
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_ge/
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator>=(ScalarType lhs, const_reference rhs) noexcept
+    {
+        return basic_json(lhs) >= rhs;
+    }
+#endif
+
+#undef JSON_IMPLEMENT_OPERATOR
+
+    /// @}
+
+    ///////////////////
+    // serialization //
+    ///////////////////
+
+    /// @name serialization
+    /// @{
+#ifndef JSON_NO_IO
+    /// @brief serialize to stream
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_ltlt/
+    friend std::ostream& operator<<(std::ostream& o, const basic_json& j)
+    {
+        // read width member and use it as indentation parameter if nonzero
+        const bool pretty_print = o.width() > 0;
+        const auto indentation = pretty_print ? o.width() : 0;
+
+        // reset width to 0 for subsequent calls to this stream
+        o.width(0);
+
+        // do the actual serialization
+        serializer s(detail::output_adapter<char>(o), o.fill());
+        s.dump(j, pretty_print, false, static_cast<unsigned int>(indentation));
+        return o;
+    }
+
+    /// @brief serialize to stream
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_ltlt/
+    /// @deprecated This function is deprecated since 3.0.0 and will be removed in
+    ///             version 4.0.0 of the library. Please use
+    ///             operator<<(std::ostream&, const basic_json&) instead; that is,
+    ///             replace calls like `j >> o;` with `o << j;`.
+    JSON_HEDLEY_DEPRECATED_FOR(3.0.0, operator<<(std::ostream&, const basic_json&))
+    friend std::ostream& operator>>(const basic_json& j, std::ostream& o)
+    {
+        return o << j;
+    }
+#endif  // JSON_NO_IO
+    /// @}
+
+    /////////////////////
+    // deserialization //
+    /////////////////////
+
+    /// @name deserialization
+    /// @{
+
+    /// @brief deserialize from a compatible input
+    /// @sa https://json.nlohmann.me/api/basic_json/parse/
+    template<typename InputType>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json parse(InputType&& i,
+                            parser_callback_t cb = nullptr,
+                            const bool allow_exceptions = true,
+                            const bool ignore_comments = false)
+    {
+        basic_json result;
+        parser(detail::input_adapter(std::forward<InputType>(i)), std::move(cb), allow_exceptions, ignore_comments).parse(true, result); // cppcheck-suppress[accessMoved,accessForwarded]
+        return result;
+    }
+
+    /// @brief deserialize from a pair of character iterators
+    /// @sa https://json.nlohmann.me/api/basic_json/parse/
+    template<typename IteratorType>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json parse(IteratorType first,
+                            IteratorType last,
+                            parser_callback_t cb = nullptr,
+                            const bool allow_exceptions = true,
+                            const bool ignore_comments = false)
+    {
+        basic_json result;
+        parser(detail::input_adapter(std::move(first), std::move(last)), std::move(cb), allow_exceptions, ignore_comments).parse(true, result); // cppcheck-suppress[accessMoved]
+        return result;
+    }
+
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, parse(ptr, ptr + len))
+    static basic_json parse(detail::span_input_adapter&& i,
+                            parser_callback_t cb = nullptr,
+                            const bool allow_exceptions = true,
+                            const bool ignore_comments = false)
+    {
+        basic_json result;
+        parser(i.get(), std::move(cb), allow_exceptions, ignore_comments).parse(true, result); // cppcheck-suppress[accessMoved]
+        return result;
+    }
+
+    /// @brief check if the input is valid JSON
+    /// @sa https://json.nlohmann.me/api/basic_json/accept/
+    template<typename InputType>
+    static bool accept(InputType&& i,
+                       const bool ignore_comments = false)
+    {
+        return parser(detail::input_adapter(std::forward<InputType>(i)), nullptr, false, ignore_comments).accept(true);
+    }
+
+    /// @brief check if the input is valid JSON
+    /// @sa https://json.nlohmann.me/api/basic_json/accept/
+    template<typename IteratorType>
+    static bool accept(IteratorType first, IteratorType last,
+                       const bool ignore_comments = false)
+    {
+        return parser(detail::input_adapter(std::move(first), std::move(last)), nullptr, false, ignore_comments).accept(true);
+    }
+
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, accept(ptr, ptr + len))
+    static bool accept(detail::span_input_adapter&& i,
+                       const bool ignore_comments = false)
+    {
+        return parser(i.get(), nullptr, false, ignore_comments).accept(true);
+    }
+
+    /// @brief generate SAX events
+    /// @sa https://json.nlohmann.me/api/basic_json/sax_parse/
+    template <typename InputType, typename SAX>
+    JSON_HEDLEY_NON_NULL(2)
+    static bool sax_parse(InputType&& i, SAX* sax,
+                          input_format_t format = input_format_t::json,
+                          const bool strict = true,
+                          const bool ignore_comments = false)
+    {
+        auto ia = detail::input_adapter(std::forward<InputType>(i));
+        return format == input_format_t::json
+               ? parser(std::move(ia), nullptr, true, ignore_comments).sax_parse(sax, strict)
+               : detail::binary_reader<basic_json, decltype(ia), SAX>(std::move(ia), format).sax_parse(format, sax, strict);
+    }
+
+    /// @brief generate SAX events
+    /// @sa https://json.nlohmann.me/api/basic_json/sax_parse/
+    template<class IteratorType, class SAX>
+    JSON_HEDLEY_NON_NULL(3)
+    static bool sax_parse(IteratorType first, IteratorType last, SAX* sax,
+                          input_format_t format = input_format_t::json,
+                          const bool strict = true,
+                          const bool ignore_comments = false)
+    {
+        auto ia = detail::input_adapter(std::move(first), std::move(last));
+        return format == input_format_t::json
+               ? parser(std::move(ia), nullptr, true, ignore_comments).sax_parse(sax, strict)
+               : detail::binary_reader<basic_json, decltype(ia), SAX>(std::move(ia), format).sax_parse(format, sax, strict);
+    }
+
+    /// @brief generate SAX events
+    /// @sa https://json.nlohmann.me/api/basic_json/sax_parse/
+    /// @deprecated This function is deprecated since 3.8.0 and will be removed in
+    ///             version 4.0.0 of the library. Please use
+    ///             sax_parse(ptr, ptr + len) instead.
+    template <typename SAX>
+    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, sax_parse(ptr, ptr + len, ...))
+    JSON_HEDLEY_NON_NULL(2)
+    static bool sax_parse(detail::span_input_adapter&& i, SAX* sax,
+                          input_format_t format = input_format_t::json,
+                          const bool strict = true,
+                          const bool ignore_comments = false)
+    {
+        auto ia = i.get();
+        return format == input_format_t::json
+               // NOLINTNEXTLINE(hicpp-move-const-arg,performance-move-const-arg)
+               ? parser(std::move(ia), nullptr, true, ignore_comments).sax_parse(sax, strict)
+               // NOLINTNEXTLINE(hicpp-move-const-arg,performance-move-const-arg)
+               : detail::binary_reader<basic_json, decltype(ia), SAX>(std::move(ia), format).sax_parse(format, sax, strict);
+    }
+#ifndef JSON_NO_IO
+    /// @brief deserialize from stream
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_gtgt/
+    /// @deprecated This stream operator is deprecated since 3.0.0 and will be removed in
+    ///             version 4.0.0 of the library. Please use
+    ///             operator>>(std::istream&, basic_json&) instead; that is,
+    ///             replace calls like `j << i;` with `i >> j;`.
+    JSON_HEDLEY_DEPRECATED_FOR(3.0.0, operator>>(std::istream&, basic_json&))
+    friend std::istream& operator<<(basic_json& j, std::istream& i)
+    {
+        return operator>>(i, j);
+    }
+
+    /// @brief deserialize from stream
+    /// @sa https://json.nlohmann.me/api/basic_json/operator_gtgt/
+    friend std::istream& operator>>(std::istream& i, basic_json& j)
+    {
+        parser(detail::input_adapter(i)).parse(false, j);
+        return i;
+    }
+#endif  // JSON_NO_IO
+    /// @}
+
+    ///////////////////////////
+    // convenience functions //
+    ///////////////////////////
+
+    /// @brief return the type as string
+    /// @sa https://json.nlohmann.me/api/basic_json/type_name/
+    JSON_HEDLEY_RETURNS_NON_NULL
+    const char* type_name() const noexcept
+    {
+        switch (m_data.m_type)
+        {
+            case value_t::null:
+                return "null";
+            case value_t::object:
+                return "object";
+            case value_t::array:
+                return "array";
+            case value_t::string:
+                return "string";
+            case value_t::boolean:
+                return "boolean";
+            case value_t::binary:
+                return "binary";
+            case value_t::discarded:
+                return "discarded";
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            default:
+                return "number";
+        }
+    }
+
+  JSON_PRIVATE_UNLESS_TESTED:
+    //////////////////////
+    // member variables //
+    //////////////////////
+
+    struct data
+    {
+        /// the type of the current element
+        value_t m_type = value_t::null;
+
+        /// the value of the current element
+        json_value m_value = {};
+
+        data(const value_t v)
+            : m_type(v), m_value(v)
+        {
+        }
+
+        data(size_type cnt, const basic_json& val)
+            : m_type(value_t::array)
+        {
+            m_value.array = create<array_t>(cnt, val);
+        }
+
+        data() noexcept = default;
+        data(data&&) noexcept = default;
+        data(const data&) noexcept = delete;
+        data& operator=(data&&) noexcept = delete;
+        data& operator=(const data&) noexcept = delete;
+
+        ~data() noexcept
+        {
+            m_value.destroy(m_type);
+        }
+    };
+
+    data m_data = {};
+
+#if JSON_DIAGNOSTICS
+    /// a pointer to a parent value (for debugging purposes)
+    basic_json* m_parent = nullptr;
+#endif
+
+#if JSON_DIAGNOSTIC_POSITIONS
+    /// the start position of the value
+    std::size_t start_position = std::string::npos;
+    /// the end position of the value
+    std::size_t end_position = std::string::npos;
+  public:
+    constexpr std::size_t start_pos() const noexcept
+    {
+        return start_position;
+    }
+
+    constexpr std::size_t end_pos() const noexcept
+    {
+        return end_position;
+    }
+#endif
+
+    //////////////////////////////////////////
+    // binary serialization/deserialization //
+    //////////////////////////////////////////
+
+    /// @name binary serialization/deserialization support
+    /// @{
+
+  public:
+    /// @brief create a CBOR serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_cbor/
+    static std::vector<std::uint8_t> to_cbor(const basic_json& j)
+    {
+        std::vector<std::uint8_t> result;
+        to_cbor(j, result);
+        return result;
+    }
+
+    /// @brief create a CBOR serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_cbor/
+    static void to_cbor(const basic_json& j, detail::output_adapter<std::uint8_t> o)
+    {
+        binary_writer<std::uint8_t>(o).write_cbor(j);
+    }
+
+    /// @brief create a CBOR serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_cbor/
+    static void to_cbor(const basic_json& j, detail::output_adapter<char> o)
+    {
+        binary_writer<char>(o).write_cbor(j);
+    }
+
+    /// @brief create a MessagePack serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_msgpack/
+    static std::vector<std::uint8_t> to_msgpack(const basic_json& j)
+    {
+        std::vector<std::uint8_t> result;
+        to_msgpack(j, result);
+        return result;
+    }
+
+    /// @brief create a MessagePack serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_msgpack/
+    static void to_msgpack(const basic_json& j, detail::output_adapter<std::uint8_t> o)
+    {
+        binary_writer<std::uint8_t>(o).write_msgpack(j);
+    }
+
+    /// @brief create a MessagePack serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_msgpack/
+    static void to_msgpack(const basic_json& j, detail::output_adapter<char> o)
+    {
+        binary_writer<char>(o).write_msgpack(j);
+    }
+
+    /// @brief create a UBJSON serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_ubjson/
+    static std::vector<std::uint8_t> to_ubjson(const basic_json& j,
+            const bool use_size = false,
+            const bool use_type = false)
+    {
+        std::vector<std::uint8_t> result;
+        to_ubjson(j, result, use_size, use_type);
+        return result;
+    }
+
+    /// @brief create a UBJSON serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_ubjson/
+    static void to_ubjson(const basic_json& j, detail::output_adapter<std::uint8_t> o,
+                          const bool use_size = false, const bool use_type = false)
+    {
+        binary_writer<std::uint8_t>(o).write_ubjson(j, use_size, use_type);
+    }
+
+    /// @brief create a UBJSON serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_ubjson/
+    static void to_ubjson(const basic_json& j, detail::output_adapter<char> o,
+                          const bool use_size = false, const bool use_type = false)
+    {
+        binary_writer<char>(o).write_ubjson(j, use_size, use_type);
+    }
+
+    /// @brief create a BJData serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_bjdata/
+    static std::vector<std::uint8_t> to_bjdata(const basic_json& j,
+            const bool use_size = false,
+            const bool use_type = false,
+            const bjdata_version_t version = bjdata_version_t::draft2)
+    {
+        std::vector<std::uint8_t> result;
+        to_bjdata(j, result, use_size, use_type, version);
+        return result;
+    }
+
+    /// @brief create a BJData serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_bjdata/
+    static void to_bjdata(const basic_json& j, detail::output_adapter<std::uint8_t> o,
+                          const bool use_size = false, const bool use_type = false,
+                          const bjdata_version_t version = bjdata_version_t::draft2)
+    {
+        binary_writer<std::uint8_t>(o).write_ubjson(j, use_size, use_type, true, true, version);
+    }
+
+    /// @brief create a BJData serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_bjdata/
+    static void to_bjdata(const basic_json& j, detail::output_adapter<char> o,
+                          const bool use_size = false, const bool use_type = false,
+                          const bjdata_version_t version = bjdata_version_t::draft2)
+    {
+        binary_writer<char>(o).write_ubjson(j, use_size, use_type, true, true, version);
+    }
+
+    /// @brief create a BSON serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_bson/
+    static std::vector<std::uint8_t> to_bson(const basic_json& j)
+    {
+        std::vector<std::uint8_t> result;
+        to_bson(j, result);
+        return result;
+    }
+
+    /// @brief create a BSON serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_bson/
+    static void to_bson(const basic_json& j, detail::output_adapter<std::uint8_t> o)
+    {
+        binary_writer<std::uint8_t>(o).write_bson(j);
+    }
+
+    /// @brief create a BSON serialization of a given JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/to_bson/
+    static void to_bson(const basic_json& j, detail::output_adapter<char> o)
+    {
+        binary_writer<char>(o).write_bson(j);
+    }
+
+    /// @brief create a JSON value from an input in CBOR format
+    /// @sa https://json.nlohmann.me/api/basic_json/from_cbor/
+    template<typename InputType>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json from_cbor(InputType&& i,
+                                const bool strict = true,
+                                const bool allow_exceptions = true,
+                                const cbor_tag_handler_t tag_handler = cbor_tag_handler_t::error)
+    {
+        basic_json result;
+        auto ia = detail::input_adapter(std::forward<InputType>(i));
+        detail::json_sax_dom_parser<basic_json, decltype(ia)> sdp(result, allow_exceptions);
+        const bool res = binary_reader<decltype(ia)>(std::move(ia), input_format_t::cbor).sax_parse(input_format_t::cbor, &sdp, strict, tag_handler); // cppcheck-suppress[accessMoved]
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+    /// @brief create a JSON value from an input in CBOR format
+    /// @sa https://json.nlohmann.me/api/basic_json/from_cbor/
+    template<typename IteratorType>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json from_cbor(IteratorType first, IteratorType last,
+                                const bool strict = true,
+                                const bool allow_exceptions = true,
+                                const cbor_tag_handler_t tag_handler = cbor_tag_handler_t::error)
+    {
+        basic_json result;
+        auto ia = detail::input_adapter(std::move(first), std::move(last));
+        detail::json_sax_dom_parser<basic_json, decltype(ia)> sdp(result, allow_exceptions);
+        const bool res = binary_reader<decltype(ia)>(std::move(ia), input_format_t::cbor).sax_parse(input_format_t::cbor, &sdp, strict, tag_handler); // cppcheck-suppress[accessMoved]
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+    template<typename T>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_cbor(ptr, ptr + len))
+    static basic_json from_cbor(const T* ptr, std::size_t len,
+                                const bool strict = true,
+                                const bool allow_exceptions = true,
+                                const cbor_tag_handler_t tag_handler = cbor_tag_handler_t::error)
+    {
+        return from_cbor(ptr, ptr + len, strict, allow_exceptions, tag_handler);
+    }
+
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_cbor(ptr, ptr + len))
+    static basic_json from_cbor(detail::span_input_adapter&& i,
+                                const bool strict = true,
+                                const bool allow_exceptions = true,
+                                const cbor_tag_handler_t tag_handler = cbor_tag_handler_t::error)
+    {
+        basic_json result;
+        auto ia = i.get();
+        detail::json_sax_dom_parser<basic_json, decltype(ia)> sdp(result, allow_exceptions);
+        // NOLINTNEXTLINE(hicpp-move-const-arg,performance-move-const-arg)
+        const bool res = binary_reader<decltype(ia)>(std::move(ia), input_format_t::cbor).sax_parse(input_format_t::cbor, &sdp, strict, tag_handler); // cppcheck-suppress[accessMoved]
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+    /// @brief create a JSON value from an input in MessagePack format
+    /// @sa https://json.nlohmann.me/api/basic_json/from_msgpack/
+    template<typename InputType>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json from_msgpack(InputType&& i,
+                                   const bool strict = true,
+                                   const bool allow_exceptions = true)
+    {
+        basic_json result;
+        auto ia = detail::input_adapter(std::forward<InputType>(i));
+        detail::json_sax_dom_parser<basic_json, decltype(ia)> sdp(result, allow_exceptions);
+        const bool res = binary_reader<decltype(ia)>(std::move(ia), input_format_t::msgpack).sax_parse(input_format_t::msgpack, &sdp, strict); // cppcheck-suppress[accessMoved]
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+    /// @brief create a JSON value from an input in MessagePack format
+    /// @sa https://json.nlohmann.me/api/basic_json/from_msgpack/
+    template<typename IteratorType>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json from_msgpack(IteratorType first, IteratorType last,
+                                   const bool strict = true,
+                                   const bool allow_exceptions = true)
+    {
+        basic_json result;
+        auto ia = detail::input_adapter(std::move(first), std::move(last));
+        detail::json_sax_dom_parser<basic_json, decltype(ia)> sdp(result, allow_exceptions);
+        const bool res = binary_reader<decltype(ia)>(std::move(ia), input_format_t::msgpack).sax_parse(input_format_t::msgpack, &sdp, strict); // cppcheck-suppress[accessMoved]
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+    template<typename T>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_msgpack(ptr, ptr + len))
+    static basic_json from_msgpack(const T* ptr, std::size_t len,
+                                   const bool strict = true,
+                                   const bool allow_exceptions = true)
+    {
+        return from_msgpack(ptr, ptr + len, strict, allow_exceptions);
+    }
+
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_msgpack(ptr, ptr + len))
+    static basic_json from_msgpack(detail::span_input_adapter&& i,
+                                   const bool strict = true,
+                                   const bool allow_exceptions = true)
+    {
+        basic_json result;
+        auto ia = i.get();
+        detail::json_sax_dom_parser<basic_json, decltype(ia)> sdp(result, allow_exceptions);
+        // NOLINTNEXTLINE(hicpp-move-const-arg,performance-move-const-arg)
+        const bool res = binary_reader<decltype(ia)>(std::move(ia), input_format_t::msgpack).sax_parse(input_format_t::msgpack, &sdp, strict); // cppcheck-suppress[accessMoved]
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+    /// @brief create a JSON value from an input in UBJSON format
+    /// @sa https://json.nlohmann.me/api/basic_json/from_ubjson/
+    template<typename InputType>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json from_ubjson(InputType&& i,
+                                  const bool strict = true,
+                                  const bool allow_exceptions = true)
+    {
+        basic_json result;
+        auto ia = detail::input_adapter(std::forward<InputType>(i));
+        detail::json_sax_dom_parser<basic_json, decltype(ia)> sdp(result, allow_exceptions);
+        const bool res = binary_reader<decltype(ia)>(std::move(ia), input_format_t::ubjson).sax_parse(input_format_t::ubjson, &sdp, strict); // cppcheck-suppress[accessMoved]
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+    /// @brief create a JSON value from an input in UBJSON format
+    /// @sa https://json.nlohmann.me/api/basic_json/from_ubjson/
+    template<typename IteratorType>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json from_ubjson(IteratorType first, IteratorType last,
+                                  const bool strict = true,
+                                  const bool allow_exceptions = true)
+    {
+        basic_json result;
+        auto ia = detail::input_adapter(std::move(first), std::move(last));
+        detail::json_sax_dom_parser<basic_json, decltype(ia)> sdp(result, allow_exceptions);
+        const bool res = binary_reader<decltype(ia)>(std::move(ia), input_format_t::ubjson).sax_parse(input_format_t::ubjson, &sdp, strict); // cppcheck-suppress[accessMoved]
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+    template<typename T>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_ubjson(ptr, ptr + len))
+    static basic_json from_ubjson(const T* ptr, std::size_t len,
+                                  const bool strict = true,
+                                  const bool allow_exceptions = true)
+    {
+        return from_ubjson(ptr, ptr + len, strict, allow_exceptions);
+    }
+
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_ubjson(ptr, ptr + len))
+    static basic_json from_ubjson(detail::span_input_adapter&& i,
+                                  const bool strict = true,
+                                  const bool allow_exceptions = true)
+    {
+        basic_json result;
+        auto ia = i.get();
+        detail::json_sax_dom_parser<basic_json, decltype(ia)> sdp(result, allow_exceptions);
+        // NOLINTNEXTLINE(hicpp-move-const-arg,performance-move-const-arg)
+        const bool res = binary_reader<decltype(ia)>(std::move(ia), input_format_t::ubjson).sax_parse(input_format_t::ubjson, &sdp, strict); // cppcheck-suppress[accessMoved]
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+    /// @brief create a JSON value from an input in BJData format
+    /// @sa https://json.nlohmann.me/api/basic_json/from_bjdata/
+    template<typename InputType>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json from_bjdata(InputType&& i,
+                                  const bool strict = true,
+                                  const bool allow_exceptions = true)
+    {
+        basic_json result;
+        auto ia = detail::input_adapter(std::forward<InputType>(i));
+        detail::json_sax_dom_parser<basic_json, decltype(ia)> sdp(result, allow_exceptions);
+        const bool res = binary_reader<decltype(ia)>(std::move(ia), input_format_t::bjdata).sax_parse(input_format_t::bjdata, &sdp, strict); // cppcheck-suppress[accessMoved]
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+    /// @brief create a JSON value from an input in BJData format
+    /// @sa https://json.nlohmann.me/api/basic_json/from_bjdata/
+    template<typename IteratorType>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json from_bjdata(IteratorType first, IteratorType last,
+                                  const bool strict = true,
+                                  const bool allow_exceptions = true)
+    {
+        basic_json result;
+        auto ia = detail::input_adapter(std::move(first), std::move(last));
+        detail::json_sax_dom_parser<basic_json, decltype(ia)> sdp(result, allow_exceptions);
+        const bool res = binary_reader<decltype(ia)>(std::move(ia), input_format_t::bjdata).sax_parse(input_format_t::bjdata, &sdp, strict); // cppcheck-suppress[accessMoved]
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+    /// @brief create a JSON value from an input in BSON format
+    /// @sa https://json.nlohmann.me/api/basic_json/from_bson/
+    template<typename InputType>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json from_bson(InputType&& i,
+                                const bool strict = true,
+                                const bool allow_exceptions = true)
+    {
+        basic_json result;
+        auto ia = detail::input_adapter(std::forward<InputType>(i));
+        detail::json_sax_dom_parser<basic_json, decltype(ia)> sdp(result, allow_exceptions);
+        const bool res = binary_reader<decltype(ia)>(std::move(ia), input_format_t::bson).sax_parse(input_format_t::bson, &sdp, strict); // cppcheck-suppress[accessMoved]
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+    /// @brief create a JSON value from an input in BSON format
+    /// @sa https://json.nlohmann.me/api/basic_json/from_bson/
+    template<typename IteratorType>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json from_bson(IteratorType first, IteratorType last,
+                                const bool strict = true,
+                                const bool allow_exceptions = true)
+    {
+        basic_json result;
+        auto ia = detail::input_adapter(std::move(first), std::move(last));
+        detail::json_sax_dom_parser<basic_json, decltype(ia)> sdp(result, allow_exceptions);
+        const bool res = binary_reader<decltype(ia)>(std::move(ia), input_format_t::bson).sax_parse(input_format_t::bson, &sdp, strict); // cppcheck-suppress[accessMoved]
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+    template<typename T>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_bson(ptr, ptr + len))
+    static basic_json from_bson(const T* ptr, std::size_t len,
+                                const bool strict = true,
+                                const bool allow_exceptions = true)
+    {
+        return from_bson(ptr, ptr + len, strict, allow_exceptions);
+    }
+
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_bson(ptr, ptr + len))
+    static basic_json from_bson(detail::span_input_adapter&& i,
+                                const bool strict = true,
+                                const bool allow_exceptions = true)
+    {
+        basic_json result;
+        auto ia = i.get();
+        detail::json_sax_dom_parser<basic_json, decltype(ia)> sdp(result, allow_exceptions);
+        // NOLINTNEXTLINE(hicpp-move-const-arg,performance-move-const-arg)
+        const bool res = binary_reader<decltype(ia)>(std::move(ia), input_format_t::bson).sax_parse(input_format_t::bson, &sdp, strict); // cppcheck-suppress[accessMoved]
+        return res ? result : basic_json(value_t::discarded);
+    }
+    /// @}
+
+    //////////////////////////
+    // JSON Pointer support //
+    //////////////////////////
+
+    /// @name JSON Pointer functions
+    /// @{
+
+    /// @brief access specified element via JSON Pointer
+    /// @sa https://json.nlohmann.me/api/basic_json/operator%5B%5D/
+    reference operator[](const json_pointer& ptr)
+    {
+        return ptr.get_unchecked(this);
+    }
+
+    template<typename BasicJsonType, detail::enable_if_t<detail::is_basic_json<BasicJsonType>::value, int> = 0>
+    JSON_HEDLEY_DEPRECATED_FOR(3.11.0, basic_json::json_pointer or nlohmann::json_pointer<basic_json::string_t>) // NOLINT(readability/alt_tokens)
+    reference operator[](const ::nlohmann::json_pointer<BasicJsonType>& ptr)
+    {
+        return ptr.get_unchecked(this);
+    }
+
+    /// @brief access specified element via JSON Pointer
+    /// @sa https://json.nlohmann.me/api/basic_json/operator%5B%5D/
+    const_reference operator[](const json_pointer& ptr) const
+    {
+        return ptr.get_unchecked(this);
+    }
+
+    template<typename BasicJsonType, detail::enable_if_t<detail::is_basic_json<BasicJsonType>::value, int> = 0>
+    JSON_HEDLEY_DEPRECATED_FOR(3.11.0, basic_json::json_pointer or nlohmann::json_pointer<basic_json::string_t>) // NOLINT(readability/alt_tokens)
+    const_reference operator[](const ::nlohmann::json_pointer<BasicJsonType>& ptr) const
+    {
+        return ptr.get_unchecked(this);
+    }
+
+    /// @brief access specified element via JSON Pointer
+    /// @sa https://json.nlohmann.me/api/basic_json/at/
+    reference at(const json_pointer& ptr)
+    {
+        return ptr.get_checked(this);
+    }
+
+    template<typename BasicJsonType, detail::enable_if_t<detail::is_basic_json<BasicJsonType>::value, int> = 0>
+    JSON_HEDLEY_DEPRECATED_FOR(3.11.0, basic_json::json_pointer or nlohmann::json_pointer<basic_json::string_t>) // NOLINT(readability/alt_tokens)
+    reference at(const ::nlohmann::json_pointer<BasicJsonType>& ptr)
+    {
+        return ptr.get_checked(this);
+    }
+
+    /// @brief access specified element via JSON Pointer
+    /// @sa https://json.nlohmann.me/api/basic_json/at/
+    const_reference at(const json_pointer& ptr) const
+    {
+        return ptr.get_checked(this);
+    }
+
+    template<typename BasicJsonType, detail::enable_if_t<detail::is_basic_json<BasicJsonType>::value, int> = 0>
+    JSON_HEDLEY_DEPRECATED_FOR(3.11.0, basic_json::json_pointer or nlohmann::json_pointer<basic_json::string_t>) // NOLINT(readability/alt_tokens)
+    const_reference at(const ::nlohmann::json_pointer<BasicJsonType>& ptr) const
+    {
+        return ptr.get_checked(this);
+    }
+
+    /// @brief return flattened JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/flatten/
+    basic_json flatten() const
+    {
+        basic_json result(value_t::object);
+        json_pointer::flatten("", *this, result);
+        return result;
+    }
+
+    /// @brief unflatten a previously flattened JSON value
+    /// @sa https://json.nlohmann.me/api/basic_json/unflatten/
+    basic_json unflatten() const
+    {
+        return json_pointer::unflatten(*this);
+    }
+
+    /// @}
+
+    //////////////////////////
+    // JSON Patch functions //
+    //////////////////////////
+
+    /// @name JSON Patch functions
+    /// @{
+
+    /// @brief applies a JSON patch in-place without copying the object
+    /// @sa https://json.nlohmann.me/api/basic_json/patch/
+    void patch_inplace(const basic_json& json_patch)
+    {
+        basic_json& result = *this;
+        // the valid JSON Patch operations
+        enum class patch_operations {add, remove, replace, move, copy, test, invalid};
+
+        const auto get_op = [](const string_t& op)
+        {
+            if (op == "add")
+            {
+                return patch_operations::add;
+            }
+            if (op == "remove")
+            {
+                return patch_operations::remove;
+            }
+            if (op == "replace")
+            {
+                return patch_operations::replace;
+            }
+            if (op == "move")
+            {
+                return patch_operations::move;
+            }
+            if (op == "copy")
+            {
+                return patch_operations::copy;
+            }
+            if (op == "test")
+            {
+                return patch_operations::test;
+            }
+
+            return patch_operations::invalid;
+        };
+
+        // wrapper for "add" operation; add value at ptr
+        const auto operation_add = [&result](json_pointer & ptr, const basic_json & val)
+        {
+            // adding to the root of the target document means replacing it
+            if (ptr.empty())
+            {
+                result = val;
+                return;
+            }
+
+            // make sure the top element of the pointer exists
+            json_pointer const top_pointer = ptr.top();
+            if (top_pointer != ptr)
+            {
+                result.at(top_pointer);
+            }
+
+            // get reference to parent of JSON pointer ptr
+            const auto last_path = ptr.back();
+            ptr.pop_back();
+            // parent must exist when performing patch add per RFC6902 specs
+            basic_json& parent = result.at(ptr);
+
+            switch (parent.m_data.m_type)
+            {
+                case value_t::null:
+                case value_t::object:
+                {
+                    // use operator[] to add value
+                    parent[last_path] = val;
+                    break;
+                }
+
+                case value_t::array:
+                {
+                    if (last_path == "-")
+                    {
+                        // special case: append to back
+                        parent.push_back(val);
+                    }
+                    else
+                    {
+                        const auto idx = json_pointer::template array_index<basic_json_t>(last_path);
+                        if (JSON_HEDLEY_UNLIKELY(idx > parent.size()))
+                        {
+                            // avoid undefined behavior
+                            JSON_THROW(out_of_range::create(401, detail::concat("array index ", std::to_string(idx), " is out of range"), &parent));
+                        }
+
+                        // default case: insert add offset
+                        parent.insert(parent.begin() + static_cast<difference_type>(idx), val);
+                    }
+                    break;
+                }
+
+                // if there exists a parent it cannot be primitive
+                case value_t::string: // LCOV_EXCL_LINE
+                case value_t::boolean: // LCOV_EXCL_LINE
+                case value_t::number_integer: // LCOV_EXCL_LINE
+                case value_t::number_unsigned: // LCOV_EXCL_LINE
+                case value_t::number_float: // LCOV_EXCL_LINE
+                case value_t::binary: // LCOV_EXCL_LINE
+                case value_t::discarded: // LCOV_EXCL_LINE
+                default:            // LCOV_EXCL_LINE
+                    JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
+            }
+        };
+
+        // wrapper for "remove" operation; remove value at ptr
+        const auto operation_remove = [this, & result](json_pointer & ptr)
+        {
+            // get reference to parent of JSON pointer ptr
+            const auto last_path = ptr.back();
+            ptr.pop_back();
+            basic_json& parent = result.at(ptr);
+
+            // remove child
+            if (parent.is_object())
+            {
+                // perform range check
+                auto it = parent.find(last_path);
+                if (JSON_HEDLEY_LIKELY(it != parent.end()))
+                {
+                    parent.erase(it);
+                }
+                else
+                {
+                    JSON_THROW(out_of_range::create(403, detail::concat("key '", last_path, "' not found"), this));
+                }
+            }
+            else if (parent.is_array())
+            {
+                // note erase performs range check
+                parent.erase(json_pointer::template array_index<basic_json_t>(last_path));
+            }
+        };
+
+        // type check: top level value must be an array
+        if (JSON_HEDLEY_UNLIKELY(!json_patch.is_array()))
+        {
+            JSON_THROW(parse_error::create(104, 0, "JSON patch must be an array of objects", &json_patch));
+        }
+
+        // iterate and apply the operations
+        for (const auto& val : json_patch)
+        {
+            // wrapper to get a value for an operation
+            const auto get_value = [&val](const string_t& op,
+                                          const string_t& member,
+                                          bool string_type) -> basic_json &
+            {
+                // find value
+                auto it = val.m_data.m_value.object->find(member);
+
+                // context-sensitive error message
+                const auto error_msg = (op == "op") ? "operation" : detail::concat("operation '", op, '\''); // NOLINT(bugprone-unused-local-non-trivial-variable)
+
+                // check if desired value is present
+                if (JSON_HEDLEY_UNLIKELY(it == val.m_data.m_value.object->end()))
+                {
+                    // NOLINTNEXTLINE(performance-inefficient-string-concatenation)
+                    JSON_THROW(parse_error::create(105, 0, detail::concat(error_msg, " must have member '", member, "'"), &val));
+                }
+
+                // check if result is of type string
+                if (JSON_HEDLEY_UNLIKELY(string_type && !it->second.is_string()))
+                {
+                    // NOLINTNEXTLINE(performance-inefficient-string-concatenation)
+                    JSON_THROW(parse_error::create(105, 0, detail::concat(error_msg, " must have string member '", member, "'"), &val));
+                }
+
+                // no error: return value
+                return it->second;
+            };
+
+            // type check: every element of the array must be an object
+            if (JSON_HEDLEY_UNLIKELY(!val.is_object()))
+            {
+                JSON_THROW(parse_error::create(104, 0, "JSON patch must be an array of objects", &val));
+            }
+
+            // collect mandatory members
+            const auto op = get_value("op", "op", true).template get<string_t>();
+            const auto path = get_value(op, "path", true).template get<string_t>();
+            json_pointer ptr(path);
+
+            switch (get_op(op))
+            {
+                case patch_operations::add:
+                {
+                    operation_add(ptr, get_value("add", "value", false));
+                    break;
+                }
+
+                case patch_operations::remove:
+                {
+                    operation_remove(ptr);
+                    break;
+                }
+
+                case patch_operations::replace:
+                {
+                    // the "path" location must exist - use at()
+                    result.at(ptr) = get_value("replace", "value", false);
+                    break;
+                }
+
+                case patch_operations::move:
+                {
+                    const auto from_path = get_value("move", "from", true).template get<string_t>();
+                    json_pointer from_ptr(from_path);
+
+                    // the "from" location must exist - use at()
+                    basic_json const v = result.at(from_ptr);
+
+                    // The move operation is functionally identical to a
+                    // "remove" operation on the "from" location, followed
+                    // immediately by an "add" operation at the target
+                    // location with the value that was just removed.
+                    operation_remove(from_ptr);
+                    operation_add(ptr, v);
+                    break;
+                }
+
+                case patch_operations::copy:
+                {
+                    const auto from_path = get_value("copy", "from", true).template get<string_t>();
+                    const json_pointer from_ptr(from_path);
+
+                    // the "from" location must exist - use at()
+                    basic_json const v = result.at(from_ptr);
+
+                    // The copy is functionally identical to an "add"
+                    // operation at the target location using the value
+                    // specified in the "from" member.
+                    operation_add(ptr, v);
+                    break;
+                }
+
+                case patch_operations::test:
+                {
+                    bool success = false;
+                    JSON_TRY
+                    {
+                        // check if "value" matches the one at "path"
+                        // the "path" location must exist - use at()
+                        success = (result.at(ptr) == get_value("test", "value", false));
+                    }
+                    JSON_INTERNAL_CATCH (out_of_range&)
+                    {
+                        // ignore out of range errors: success remains false
+                    }
+
+                    // throw an exception if test fails
+                    if (JSON_HEDLEY_UNLIKELY(!success))
+                    {
+                        JSON_THROW(other_error::create(501, detail::concat("unsuccessful: ", val.dump()), &val));
+                    }
+
+                    break;
+                }
+
+                case patch_operations::invalid:
+                default:
+                {
+                    // op must be "add", "remove", "replace", "move", "copy", or
+                    // "test"
+                    JSON_THROW(parse_error::create(105, 0, detail::concat("operation value '", op, "' is invalid"), &val));
+                }
+            }
+        }
+    }
+
+    /// @brief applies a JSON patch to a copy of the current object
+    /// @sa https://json.nlohmann.me/api/basic_json/patch/
+    basic_json patch(const basic_json& json_patch) const
+    {
+        basic_json result = *this;
+        result.patch_inplace(json_patch);
+        return result;
+    }
+
+    /// @brief creates a diff as a JSON patch
+    /// @sa https://json.nlohmann.me/api/basic_json/diff/
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json diff(const basic_json& source, const basic_json& target,
+                           const string_t& path = "")
+    {
+        // the patch
+        basic_json result(value_t::array);
+
+        // if the values are the same, return empty patch
+        if (source == target)
+        {
+            return result;
+        }
+
+        if (source.type() != target.type())
+        {
+            // different types: replace value
+            result.push_back(
+            {
+                {"op", "replace"}, {"path", path}, {"value", target}
+            });
+            return result;
+        }
+
+        switch (source.type())
+        {
+            case value_t::array:
+            {
+                // first pass: traverse common elements
+                std::size_t i = 0;
+                while (i < source.size() && i < target.size())
+                {
+                    // recursive call to compare array values at index i
+                    auto temp_diff = diff(source[i], target[i], detail::concat<string_t>(path, '/', detail::to_string<string_t>(i)));
+                    result.insert(result.end(), temp_diff.begin(), temp_diff.end());
+                    ++i;
+                }
+
+                // We now reached the end of at least one array
+                // in a second pass, traverse the remaining elements
+
+                // remove my remaining elements
+                const auto end_index = static_cast<difference_type>(result.size());
+                while (i < source.size())
+                {
+                    // add operations in reverse order to avoid invalid
+                    // indices
+                    result.insert(result.begin() + end_index, object(
+                    {
+                        {"op", "remove"},
+                        {"path", detail::concat<string_t>(path, '/', detail::to_string<string_t>(i))}
+                    }));
+                    ++i;
+                }
+
+                // add other remaining elements
+                while (i < target.size())
+                {
+                    result.push_back(
+                    {
+                        {"op", "add"},
+                        {"path", detail::concat<string_t>(path, "/-")},
+                        {"value", target[i]}
+                    });
+                    ++i;
+                }
+
+                break;
+            }
+
+            case value_t::object:
+            {
+                // first pass: traverse this object's elements
+                for (auto it = source.cbegin(); it != source.cend(); ++it)
+                {
+                    // escape the key name to be used in a JSON patch
+                    const auto path_key = detail::concat<string_t>(path, '/', detail::escape(it.key()));
+
+                    if (target.find(it.key()) != target.end())
+                    {
+                        // recursive call to compare object values at key it
+                        auto temp_diff = diff(it.value(), target[it.key()], path_key);
+                        result.insert(result.end(), temp_diff.begin(), temp_diff.end());
+                    }
+                    else
+                    {
+                        // found a key that is not in o -> remove it
+                        result.push_back(object(
+                        {
+                            {"op", "remove"}, {"path", path_key}
+                        }));
+                    }
+                }
+
+                // second pass: traverse other object's elements
+                for (auto it = target.cbegin(); it != target.cend(); ++it)
+                {
+                    if (source.find(it.key()) == source.end())
+                    {
+                        // found a key that is not in this -> add it
+                        const auto path_key = detail::concat<string_t>(path, '/', detail::escape(it.key()));
+                        result.push_back(
+                        {
+                            {"op", "add"}, {"path", path_key},
+                            {"value", it.value()}
+                        });
+                    }
+                }
+
+                break;
+            }
+
+            case value_t::null:
+            case value_t::string:
+            case value_t::boolean:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::number_float:
+            case value_t::binary:
+            case value_t::discarded:
+            default:
+            {
+                // both primitive type: replace value
+                result.push_back(
+                {
+                    {"op", "replace"}, {"path", path}, {"value", target}
+                });
+                break;
+            }
+        }
+
+        return result;
+    }
+    /// @}
+
+    ////////////////////////////////
+    // JSON Merge Patch functions //
+    ////////////////////////////////
+
+    /// @name JSON Merge Patch functions
+    /// @{
+
+    /// @brief applies a JSON Merge Patch
+    /// @sa https://json.nlohmann.me/api/basic_json/merge_patch/
+    void merge_patch(const basic_json& apply_patch)
+    {
+        if (apply_patch.is_object())
+        {
+            if (!is_object())
+            {
+                *this = object();
+            }
+            for (auto it = apply_patch.begin(); it != apply_patch.end(); ++it)
+            {
+                if (it.value().is_null())
+                {
+                    erase(it.key());
+                }
+                else
+                {
+                    operator[](it.key()).merge_patch(it.value());
+                }
+            }
+        }
+        else
+        {
+            *this = apply_patch;
+        }
+    }
+
+    /// @}
+};
+
+/// @brief user-defined to_string function for JSON values
+/// @sa https://json.nlohmann.me/api/basic_json/to_string/
+NLOHMANN_BASIC_JSON_TPL_DECLARATION
+std::string to_string(const NLOHMANN_BASIC_JSON_TPL& j)
+{
+    return j.dump();
+}
+
+inline namespace literals
+{
+inline namespace json_literals
+{
+
+/// @brief user-defined string literal for JSON values
+/// @sa https://json.nlohmann.me/api/basic_json/operator_literal_json/
+JSON_HEDLEY_NON_NULL(1)
+#if !defined(JSON_HEDLEY_GCC_VERSION) || JSON_HEDLEY_GCC_VERSION_CHECK(4,9,0)
+    inline nlohmann::json operator ""_json(const char* s, std::size_t n)
+#else
+    inline nlohmann::json operator "" _json(const char* s, std::size_t n)
+#endif
+{
+    return nlohmann::json::parse(s, s + n);
+}
+
+/// @brief user-defined string literal for JSON pointer
+/// @sa https://json.nlohmann.me/api/basic_json/operator_literal_json_pointer/
+JSON_HEDLEY_NON_NULL(1)
+#if !defined(JSON_HEDLEY_GCC_VERSION) || JSON_HEDLEY_GCC_VERSION_CHECK(4,9,0)
+    inline nlohmann::json::json_pointer operator ""_json_pointer(const char* s, std::size_t n)
+#else
+    inline nlohmann::json::json_pointer operator "" _json_pointer(const char* s, std::size_t n)
+#endif
+{
+    return nlohmann::json::json_pointer(std::string(s, n));
+}
+
+}  // namespace json_literals
+}  // namespace literals
+NLOHMANN_JSON_NAMESPACE_END
+
+///////////////////////
+// nonmember support //
+///////////////////////
+
+namespace std // NOLINT(cert-dcl58-cpp)
+{
+
+/// @brief hash value for JSON objects
+/// @sa https://json.nlohmann.me/api/basic_json/std_hash/
+NLOHMANN_BASIC_JSON_TPL_DECLARATION
+struct hash<nlohmann::NLOHMANN_BASIC_JSON_TPL> // NOLINT(cert-dcl58-cpp)
+{
+    std::size_t operator()(const nlohmann::NLOHMANN_BASIC_JSON_TPL& j) const
+    {
+        return nlohmann::detail::hash(j);
+    }
+};
+
+// specialization for std::less<value_t>
+template<>
+struct less< ::nlohmann::detail::value_t> // do not remove the space after '<', see https://github.com/nlohmann/json/pull/679
+{
+    /*!
+    @brief compare two value_t enum values
+    @since version 3.0.0
+    */
+    bool operator()(::nlohmann::detail::value_t lhs,
+                    ::nlohmann::detail::value_t rhs) const noexcept
+    {
+#if JSON_HAS_THREE_WAY_COMPARISON
+        return std::is_lt(lhs <=> rhs); // *NOPAD*
+#else
+        return ::nlohmann::detail::operator<(lhs, rhs);
+#endif
+    }
+};
+
+// C++20 prohibit function specialization in the std namespace.
+#ifndef JSON_HAS_CPP_20
+
+/// @brief exchanges the values of two JSON objects
+/// @sa https://json.nlohmann.me/api/basic_json/std_swap/
+NLOHMANN_BASIC_JSON_TPL_DECLARATION
+inline void swap(nlohmann::NLOHMANN_BASIC_JSON_TPL& j1, nlohmann::NLOHMANN_BASIC_JSON_TPL& j2) noexcept(  // NOLINT(readability-inconsistent-declaration-parameter-name, cert-dcl58-cpp)
+    is_nothrow_move_constructible<nlohmann::NLOHMANN_BASIC_JSON_TPL>::value&&                          // NOLINT(misc-redundant-expression,cppcoreguidelines-noexcept-swap,performance-noexcept-swap)
+    is_nothrow_move_assignable<nlohmann::NLOHMANN_BASIC_JSON_TPL>::value)
+{
+    j1.swap(j2);
+}
+
+#endif
+
+}  // namespace std
+
+#if JSON_USE_GLOBAL_UDLS
+    #if !defined(JSON_HEDLEY_GCC_VERSION) || JSON_HEDLEY_GCC_VERSION_CHECK(4,9,0)
+        using nlohmann::literals::json_literals::operator ""_json; // NOLINT(misc-unused-using-decls,google-global-names-in-headers)
+        using nlohmann::literals::json_literals::operator ""_json_pointer; //NOLINT(misc-unused-using-decls,google-global-names-in-headers)
+    #else
+        using nlohmann::literals::json_literals::operator "" _json; // NOLINT(misc-unused-using-decls,google-global-names-in-headers)
+        using nlohmann::literals::json_literals::operator "" _json_pointer; //NOLINT(misc-unused-using-decls,google-global-names-in-headers)
+    #endif
+#endif
+
+// #include <nlohmann/detail/macro_unscope.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013 - 2025 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+// restore clang diagnostic settings
+#if defined(__clang__)
+    #pragma clang diagnostic pop
+#endif
+
+// clean up
+#undef JSON_ASSERT
+#undef JSON_INTERNAL_CATCH
+#undef JSON_THROW
+#undef JSON_PRIVATE_UNLESS_TESTED
+#undef NLOHMANN_BASIC_JSON_TPL_DECLARATION
+#undef NLOHMANN_BASIC_JSON_TPL
+#undef JSON_EXPLICIT
+#undef NLOHMANN_CAN_CALL_STD_FUNC_IMPL
+#undef JSON_INLINE_VARIABLE
+#undef JSON_NO_UNIQUE_ADDRESS
+#undef JSON_DISABLE_ENUM_SERIALIZATION
+#undef JSON_USE_GLOBAL_UDLS
+
+#ifndef JSON_TEST_KEEP_MACROS
+    #undef JSON_CATCH
+    #undef JSON_TRY
+    #undef JSON_HAS_CPP_11
+    #undef JSON_HAS_CPP_14
+    #undef JSON_HAS_CPP_17
+    #undef JSON_HAS_CPP_20
+    #undef JSON_HAS_CPP_23
+    #undef JSON_HAS_FILESYSTEM
+    #undef JSON_HAS_EXPERIMENTAL_FILESYSTEM
+    #undef JSON_HAS_THREE_WAY_COMPARISON
+    #undef JSON_HAS_RANGES
+    #undef JSON_HAS_STATIC_RTTI
+    #undef JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON
+#endif
+
+// #include <nlohmann/thirdparty/hedley/hedley_undef.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013 - 2025 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+#undef JSON_HEDLEY_ALWAYS_INLINE
+#undef JSON_HEDLEY_ARM_VERSION
+#undef JSON_HEDLEY_ARM_VERSION_CHECK
+#undef JSON_HEDLEY_ARRAY_PARAM
+#undef JSON_HEDLEY_ASSUME
+#undef JSON_HEDLEY_BEGIN_C_DECLS
+#undef JSON_HEDLEY_CLANG_HAS_ATTRIBUTE
+#undef JSON_HEDLEY_CLANG_HAS_BUILTIN
+#undef JSON_HEDLEY_CLANG_HAS_CPP_ATTRIBUTE
+#undef JSON_HEDLEY_CLANG_HAS_DECLSPEC_DECLSPEC_ATTRIBUTE
+#undef JSON_HEDLEY_CLANG_HAS_EXTENSION
+#undef JSON_HEDLEY_CLANG_HAS_FEATURE
+#undef JSON_HEDLEY_CLANG_HAS_WARNING
+#undef JSON_HEDLEY_COMPCERT_VERSION
+#undef JSON_HEDLEY_COMPCERT_VERSION_CHECK
+#undef JSON_HEDLEY_CONCAT
+#undef JSON_HEDLEY_CONCAT3
+#undef JSON_HEDLEY_CONCAT3_EX
+#undef JSON_HEDLEY_CONCAT_EX
+#undef JSON_HEDLEY_CONST
+#undef JSON_HEDLEY_CONSTEXPR
+#undef JSON_HEDLEY_CONST_CAST
+#undef JSON_HEDLEY_CPP_CAST
+#undef JSON_HEDLEY_CRAY_VERSION
+#undef JSON_HEDLEY_CRAY_VERSION_CHECK
+#undef JSON_HEDLEY_C_DECL
+#undef JSON_HEDLEY_DEPRECATED
+#undef JSON_HEDLEY_DEPRECATED_FOR
+#undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL
+#undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_
+#undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED
+#undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES
+#undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS
+#undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION
+#undef JSON_HEDLEY_DIAGNOSTIC_POP
+#undef JSON_HEDLEY_DIAGNOSTIC_PUSH
+#undef JSON_HEDLEY_DMC_VERSION
+#undef JSON_HEDLEY_DMC_VERSION_CHECK
+#undef JSON_HEDLEY_EMPTY_BASES
+#undef JSON_HEDLEY_EMSCRIPTEN_VERSION
+#undef JSON_HEDLEY_EMSCRIPTEN_VERSION_CHECK
+#undef JSON_HEDLEY_END_C_DECLS
+#undef JSON_HEDLEY_FLAGS
+#undef JSON_HEDLEY_FLAGS_CAST
+#undef JSON_HEDLEY_GCC_HAS_ATTRIBUTE
+#undef JSON_HEDLEY_GCC_HAS_BUILTIN
+#undef JSON_HEDLEY_GCC_HAS_CPP_ATTRIBUTE
+#undef JSON_HEDLEY_GCC_HAS_DECLSPEC_ATTRIBUTE
+#undef JSON_HEDLEY_GCC_HAS_EXTENSION
+#undef JSON_HEDLEY_GCC_HAS_FEATURE
+#undef JSON_HEDLEY_GCC_HAS_WARNING
+#undef JSON_HEDLEY_GCC_NOT_CLANG_VERSION_CHECK
+#undef JSON_HEDLEY_GCC_VERSION
+#undef JSON_HEDLEY_GCC_VERSION_CHECK
+#undef JSON_HEDLEY_GNUC_HAS_ATTRIBUTE
+#undef JSON_HEDLEY_GNUC_HAS_BUILTIN
+#undef JSON_HEDLEY_GNUC_HAS_CPP_ATTRIBUTE
+#undef JSON_HEDLEY_GNUC_HAS_DECLSPEC_ATTRIBUTE
+#undef JSON_HEDLEY_GNUC_HAS_EXTENSION
+#undef JSON_HEDLEY_GNUC_HAS_FEATURE
+#undef JSON_HEDLEY_GNUC_HAS_WARNING
+#undef JSON_HEDLEY_GNUC_VERSION
+#undef JSON_HEDLEY_GNUC_VERSION_CHECK
+#undef JSON_HEDLEY_HAS_ATTRIBUTE
+#undef JSON_HEDLEY_HAS_BUILTIN
+#undef JSON_HEDLEY_HAS_CPP_ATTRIBUTE
+#undef JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS
+#undef JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE
+#undef JSON_HEDLEY_HAS_EXTENSION
+#undef JSON_HEDLEY_HAS_FEATURE
+#undef JSON_HEDLEY_HAS_WARNING
+#undef JSON_HEDLEY_IAR_VERSION
+#undef JSON_HEDLEY_IAR_VERSION_CHECK
+#undef JSON_HEDLEY_IBM_VERSION
+#undef JSON_HEDLEY_IBM_VERSION_CHECK
+#undef JSON_HEDLEY_IMPORT
+#undef JSON_HEDLEY_INLINE
+#undef JSON_HEDLEY_INTEL_CL_VERSION
+#undef JSON_HEDLEY_INTEL_CL_VERSION_CHECK
+#undef JSON_HEDLEY_INTEL_VERSION
+#undef JSON_HEDLEY_INTEL_VERSION_CHECK
+#undef JSON_HEDLEY_IS_CONSTANT
+#undef JSON_HEDLEY_IS_CONSTEXPR_
+#undef JSON_HEDLEY_LIKELY
+#undef JSON_HEDLEY_MALLOC
+#undef JSON_HEDLEY_MCST_LCC_VERSION
+#undef JSON_HEDLEY_MCST_LCC_VERSION_CHECK
+#undef JSON_HEDLEY_MESSAGE
+#undef JSON_HEDLEY_MSVC_VERSION
+#undef JSON_HEDLEY_MSVC_VERSION_CHECK
+#undef JSON_HEDLEY_NEVER_INLINE
+#undef JSON_HEDLEY_NON_NULL
+#undef JSON_HEDLEY_NO_ESCAPE
+#undef JSON_HEDLEY_NO_RETURN
+#undef JSON_HEDLEY_NO_THROW
+#undef JSON_HEDLEY_NULL
+#undef JSON_HEDLEY_PELLES_VERSION
+#undef JSON_HEDLEY_PELLES_VERSION_CHECK
+#undef JSON_HEDLEY_PGI_VERSION
+#undef JSON_HEDLEY_PGI_VERSION_CHECK
+#undef JSON_HEDLEY_PREDICT
+#undef JSON_HEDLEY_PRINTF_FORMAT
+#undef JSON_HEDLEY_PRIVATE
+#undef JSON_HEDLEY_PUBLIC
+#undef JSON_HEDLEY_PURE
+#undef JSON_HEDLEY_REINTERPRET_CAST
+#undef JSON_HEDLEY_REQUIRE
+#undef JSON_HEDLEY_REQUIRE_CONSTEXPR
+#undef JSON_HEDLEY_REQUIRE_MSG
+#undef JSON_HEDLEY_RESTRICT
+#undef JSON_HEDLEY_RETURNS_NON_NULL
+#undef JSON_HEDLEY_SENTINEL
+#undef JSON_HEDLEY_STATIC_ASSERT
+#undef JSON_HEDLEY_STATIC_CAST
+#undef JSON_HEDLEY_STRINGIFY
+#undef JSON_HEDLEY_STRINGIFY_EX
+#undef JSON_HEDLEY_SUNPRO_VERSION
+#undef JSON_HEDLEY_SUNPRO_VERSION_CHECK
+#undef JSON_HEDLEY_TINYC_VERSION
+#undef JSON_HEDLEY_TINYC_VERSION_CHECK
+#undef JSON_HEDLEY_TI_ARMCL_VERSION
+#undef JSON_HEDLEY_TI_ARMCL_VERSION_CHECK
+#undef JSON_HEDLEY_TI_CL2000_VERSION
+#undef JSON_HEDLEY_TI_CL2000_VERSION_CHECK
+#undef JSON_HEDLEY_TI_CL430_VERSION
+#undef JSON_HEDLEY_TI_CL430_VERSION_CHECK
+#undef JSON_HEDLEY_TI_CL6X_VERSION
+#undef JSON_HEDLEY_TI_CL6X_VERSION_CHECK
+#undef JSON_HEDLEY_TI_CL7X_VERSION
+#undef JSON_HEDLEY_TI_CL7X_VERSION_CHECK
+#undef JSON_HEDLEY_TI_CLPRU_VERSION
+#undef JSON_HEDLEY_TI_CLPRU_VERSION_CHECK
+#undef JSON_HEDLEY_TI_VERSION
+#undef JSON_HEDLEY_TI_VERSION_CHECK
+#undef JSON_HEDLEY_UNAVAILABLE
+#undef JSON_HEDLEY_UNLIKELY
+#undef JSON_HEDLEY_UNPREDICTABLE
+#undef JSON_HEDLEY_UNREACHABLE
+#undef JSON_HEDLEY_UNREACHABLE_RETURN
+#undef JSON_HEDLEY_VERSION
+#undef JSON_HEDLEY_VERSION_DECODE_MAJOR
+#undef JSON_HEDLEY_VERSION_DECODE_MINOR
+#undef JSON_HEDLEY_VERSION_DECODE_REVISION
+#undef JSON_HEDLEY_VERSION_ENCODE
+#undef JSON_HEDLEY_WARNING
+#undef JSON_HEDLEY_WARN_UNUSED_RESULT
+#undef JSON_HEDLEY_WARN_UNUSED_RESULT_MSG
+#undef JSON_HEDLEY_FALL_THROUGH
+
+
+
+#endif  // INCLUDE_NLOHMANN_JSON_HPP_
diff --git a/3rdParty/dpp/nlohmann/json_fwd.hpp b/3rdParty/dpp/nlohmann/json_fwd.hpp
index d34c8afd10..c3f7e90a50 100644
--- a/3rdParty/dpp/nlohmann/json_fwd.hpp
+++ b/3rdParty/dpp/nlohmann/json_fwd.hpp
@@ -1 +1,187 @@
-#include "3rdParty/nlohmann/json_fwd.hpp"
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013 - 2025 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+#ifndef INCLUDE_NLOHMANN_JSON_FWD_HPP_
+#define INCLUDE_NLOHMANN_JSON_FWD_HPP_
+
+#include <cstdint> // int64_t, uint64_t
+#include <map> // map
+#include <memory> // allocator
+#include <string> // string
+#include <vector> // vector
+
+// #include <nlohmann/detail/abi_macros.hpp>
+//     __ _____ _____ _____
+//  __|  |   __|     |   | |  JSON for Modern C++
+// |  |  |__   |  |  | | | |  version 3.12.0
+// |_____|_____|_____|_|___|  https://github.com/nlohmann/json
+//
+// SPDX-FileCopyrightText: 2013 - 2025 Niels Lohmann <https://nlohmann.me>
+// SPDX-License-Identifier: MIT
+
+
+
+// This file contains all macro definitions affecting or depending on the ABI
+
+#ifndef JSON_SKIP_LIBRARY_VERSION_CHECK
+    #if defined(NLOHMANN_JSON_VERSION_MAJOR) && defined(NLOHMANN_JSON_VERSION_MINOR) && defined(NLOHMANN_JSON_VERSION_PATCH)
+        #if NLOHMANN_JSON_VERSION_MAJOR != 3 || NLOHMANN_JSON_VERSION_MINOR != 12 || NLOHMANN_JSON_VERSION_PATCH != 0
+            #warning "Already included a different version of the library!"
+        #endif
+    #endif
+#endif
+
+#define NLOHMANN_JSON_VERSION_MAJOR 3   // NOLINT(modernize-macro-to-enum)
+#define NLOHMANN_JSON_VERSION_MINOR 12  // NOLINT(modernize-macro-to-enum)
+#define NLOHMANN_JSON_VERSION_PATCH 0   // NOLINT(modernize-macro-to-enum)
+
+#ifndef JSON_DIAGNOSTICS
+    #define JSON_DIAGNOSTICS 0
+#endif
+
+#ifndef JSON_DIAGNOSTIC_POSITIONS
+    #define JSON_DIAGNOSTIC_POSITIONS 0
+#endif
+
+#ifndef JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON
+    #define JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON 0
+#endif
+
+#if JSON_DIAGNOSTICS
+    #define NLOHMANN_JSON_ABI_TAG_DIAGNOSTICS _diag
+#else
+    #define NLOHMANN_JSON_ABI_TAG_DIAGNOSTICS
+#endif
+
+#if JSON_DIAGNOSTIC_POSITIONS
+    #define NLOHMANN_JSON_ABI_TAG_DIAGNOSTIC_POSITIONS _dp
+#else
+    #define NLOHMANN_JSON_ABI_TAG_DIAGNOSTIC_POSITIONS
+#endif
+
+#if JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON
+    #define NLOHMANN_JSON_ABI_TAG_LEGACY_DISCARDED_VALUE_COMPARISON _ldvcmp
+#else
+    #define NLOHMANN_JSON_ABI_TAG_LEGACY_DISCARDED_VALUE_COMPARISON
+#endif
+
+#ifndef NLOHMANN_JSON_NAMESPACE_NO_VERSION
+    #define NLOHMANN_JSON_NAMESPACE_NO_VERSION 0
+#endif
+
+// Construct the namespace ABI tags component
+#define NLOHMANN_JSON_ABI_TAGS_CONCAT_EX(a, b, c) json_abi ## a ## b ## c
+#define NLOHMANN_JSON_ABI_TAGS_CONCAT(a, b, c) \
+    NLOHMANN_JSON_ABI_TAGS_CONCAT_EX(a, b, c)
+
+#define NLOHMANN_JSON_ABI_TAGS                                       \
+    NLOHMANN_JSON_ABI_TAGS_CONCAT(                                   \
+            NLOHMANN_JSON_ABI_TAG_DIAGNOSTICS,                       \
+            NLOHMANN_JSON_ABI_TAG_LEGACY_DISCARDED_VALUE_COMPARISON, \
+            NLOHMANN_JSON_ABI_TAG_DIAGNOSTIC_POSITIONS)
+
+// Construct the namespace version component
+#define NLOHMANN_JSON_NAMESPACE_VERSION_CONCAT_EX(major, minor, patch) \
+    _v ## major ## _ ## minor ## _ ## patch
+#define NLOHMANN_JSON_NAMESPACE_VERSION_CONCAT(major, minor, patch) \
+    NLOHMANN_JSON_NAMESPACE_VERSION_CONCAT_EX(major, minor, patch)
+
+#if NLOHMANN_JSON_NAMESPACE_NO_VERSION
+#define NLOHMANN_JSON_NAMESPACE_VERSION
+#else
+#define NLOHMANN_JSON_NAMESPACE_VERSION                                 \
+    NLOHMANN_JSON_NAMESPACE_VERSION_CONCAT(NLOHMANN_JSON_VERSION_MAJOR, \
+                                           NLOHMANN_JSON_VERSION_MINOR, \
+                                           NLOHMANN_JSON_VERSION_PATCH)
+#endif
+
+// Combine namespace components
+#define NLOHMANN_JSON_NAMESPACE_CONCAT_EX(a, b) a ## b
+#define NLOHMANN_JSON_NAMESPACE_CONCAT(a, b) \
+    NLOHMANN_JSON_NAMESPACE_CONCAT_EX(a, b)
+
+#ifndef NLOHMANN_JSON_NAMESPACE
+#define NLOHMANN_JSON_NAMESPACE               \
+    nlohmann::NLOHMANN_JSON_NAMESPACE_CONCAT( \
+            NLOHMANN_JSON_ABI_TAGS,           \
+            NLOHMANN_JSON_NAMESPACE_VERSION)
+#endif
+
+#ifndef NLOHMANN_JSON_NAMESPACE_BEGIN
+#define NLOHMANN_JSON_NAMESPACE_BEGIN                \
+    namespace nlohmann                               \
+    {                                                \
+    inline namespace NLOHMANN_JSON_NAMESPACE_CONCAT( \
+                NLOHMANN_JSON_ABI_TAGS,              \
+                NLOHMANN_JSON_NAMESPACE_VERSION)     \
+    {
+#endif
+
+#ifndef NLOHMANN_JSON_NAMESPACE_END
+#define NLOHMANN_JSON_NAMESPACE_END                                     \
+    }  /* namespace (inline namespace) NOLINT(readability/namespace) */ \
+    }  // namespace nlohmann
+#endif
+
+
+/*!
+@brief namespace for Niels Lohmann
+@see https://github.com/nlohmann
+@since version 1.0.0
+*/
+NLOHMANN_JSON_NAMESPACE_BEGIN
+
+/*!
+@brief default JSONSerializer template argument
+
+This serializer ignores the template arguments and uses ADL
+([argument-dependent lookup](https://en.cppreference.com/w/cpp/language/adl))
+for serialization.
+*/
+template<typename T = void, typename SFINAE = void>
+struct adl_serializer;
+
+/// a class to store JSON values
+/// @sa https://json.nlohmann.me/api/basic_json/
+template<template<typename U, typename V, typename... Args> class ObjectType =
+         std::map,
+         template<typename U, typename... Args> class ArrayType = std::vector,
+         class StringType = std::string, class BooleanType = bool,
+         class NumberIntegerType = std::int64_t,
+         class NumberUnsignedType = std::uint64_t,
+         class NumberFloatType = double,
+         template<typename U> class AllocatorType = std::allocator,
+         template<typename T, typename SFINAE = void> class JSONSerializer =
+         adl_serializer,
+         class BinaryType = std::vector<std::uint8_t>, // cppcheck-suppress syntaxError
+         class CustomBaseClass = void>
+class basic_json;
+
+/// @brief JSON Pointer defines a string syntax for identifying a specific value within a JSON document
+/// @sa https://json.nlohmann.me/api/json_pointer/
+template<typename RefStringType>
+class json_pointer;
+
+/*!
+@brief default specialization
+@sa https://json.nlohmann.me/api/json/
+*/
+using json = basic_json<>;
+
+/// @brief a minimal map-like container that preserves insertion order
+/// @sa https://json.nlohmann.me/api/ordered_map/
+template<class Key, class T, class IgnoredLess, class Allocator>
+struct ordered_map;
+
+/// @brief specialization that maintains the insertion order of object keys
+/// @sa https://json.nlohmann.me/api/ordered_json/
+using ordered_json = basic_json<nlohmann::ordered_map>;
+
+NLOHMANN_JSON_NAMESPACE_END
+
+#endif  // INCLUDE_NLOHMANN_JSON_FWD_HPP_
diff --git a/3rdParty/dpp/once.h b/3rdParty/dpp/once.h
index 0c1a8ce670..3860591d49 100644
--- a/3rdParty/dpp/once.h
+++ b/3rdParty/dpp/once.h
@@ -1,46 +1,46 @@
-/************************************************************************************
- *
- * D++, A Lightweight C++ library for Discord
- *
- * Copyright 2022 Craig Edwards and D++ contributors 
- * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- ************************************************************************************/
-#pragma once
-#include <dpp/export.h>
-#include <utility>
-
-namespace dpp {
-
-	/**
-	 * @brief Run some code within an if() statement only once.
-	 * 
-	 * Use this template like this:
-	 * 
-	 * ```
-	 * if (dpp::run_once<struct any_unique_name_you_like_here>()) {
-	 *     // Your code here
-	 * }
-	 * ```
-	 * 
-	 * @tparam T any unique 'tag' identifier name
-	 * @return auto a true/false return to say if we should execute or not
-	 */
-	template <typename T> auto run_once() {
-		static auto called = false;
-		return !std::exchange(called, true);
-	};
-
-};
+/************************************************************************************
+ *
+ * D++, A Lightweight C++ library for Discord
+ *
+ * Copyright 2022 Craig Edwards and D++ contributors 
+ * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ************************************************************************************/
+#pragma once
+#include <dpp/export.h>
+#include <utility>
+
+namespace dpp {
+
+/**
+ * @brief Run some code within an if() statement only once.
+ *
+ * Use this template like this:
+ *
+ * ```
+ * if (dpp::run_once<struct any_unique_name_you_like_here>()) {
+ *     // Your code here
+ * }
+ * ```
+ *
+ * @tparam T any unique 'tag' identifier name
+ * @return auto a true/false return to say if we should execute or not
+ */
+template <typename T> auto run_once() {
+	static auto called = false;
+	return !std::exchange(called, true);
+};
+
+}
diff --git a/3rdParty/dpp/permissions.h b/3rdParty/dpp/permissions.h
index caf248fc76..a47446129e 100644
--- a/3rdParty/dpp/permissions.h
+++ b/3rdParty/dpp/permissions.h
@@ -1,204 +1,498 @@
-/************************************************************************************
- *
- * D++, A Lightweight C++ library for Discord
- *
- * Copyright 2021 Craig Edwards and D++ contributors
- * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- ************************************************************************************/
-#pragma once
-#include <dpp/export.h>
-#include <dpp/nlohmann/json.hpp>
-#include <cstdint>
-#include <type_traits>
-
-namespace dpp {
-
-/**
- * @brief Represents the various discord permissions
- */
-enum permissions : uint64_t {
-	p_create_instant_invite = 0x00000000001,    //!< allows creation of instant invites
-	p_kick_members = 0x00000000002,    //!< allows kicking members
-	p_ban_members = 0x00000000004,    //!< allows banning members
-	p_administrator = 0x00000000008,    //!< allows all permissions and bypasses channel permission overwrites
-	p_manage_channels = 0x00000000010,    //!< allows management and editing of channels
-	p_manage_guild = 0x00000000020,    //!< allows management and editing of the guild
-	p_add_reactions = 0x00000000040,    //!< allows for the addition of reactions to messages
-	p_view_audit_log = 0x00000000080,    //!< allows for viewing of audit logs
-	p_priority_speaker = 0x00000000100,    //!< allows for using priority speaker in a voice channel
-	p_stream = 0x00000000200,    //!< allows the user to go live
-	p_view_channel = 0x00000000400,    //!< allows guild members to view a channel, which includes reading messages in text channels and joining voice channels
-	p_send_messages = 0x00000000800,    //!< allows for sending messages in a channel
-	p_send_tts_messages = 0x00000001000,    //!< allows for sending of /tts messages
-	p_manage_messages = 0x00000002000,    //!< allows for deletion of other users messages
-	p_embed_links = 0x00000004000,    //!< links sent by users with this permission will be auto-embedded
-	p_attach_files = 0x00000008000,    //!< allows for uploading images and files
-	p_read_message_history = 0x00000010000,    //!< allows for reading of message history
-	p_mention_everyone = 0x00000020000,    //!< allows for using the everyone and the here tag to notify users in a channel
-	p_use_external_emojis = 0x00000040000,    //!< allows the usage of custom emojis from other servers
-	p_view_guild_insights = 0x00000080000,    //!< allows for viewing guild insights
-	p_connect = 0x00000100000,    //!< allows for joining of a voice channel
-	p_speak = 0x00000200000,    //!< allows for speaking in a voice channel
-	p_mute_members = 0x00000400000,    //!< allows for muting members in a voice channel
-	p_deafen_members = 0x00000800000,    //!< allows for deafening of members in a voice channel
-	p_move_members = 0x00001000000,    //!< allows for moving of members between voice channels
-	p_use_vad = 0x00002000000,    //!< allows for using voice-activity-detection in a voice channel
-	p_change_nickname = 0x00004000000,    //!< allows for modification of own nickname
-	p_manage_nicknames = 0x00008000000,    //!< allows for modification of other users nicknames
-	p_manage_roles = 0x00010000000,    //!< allows management and editing of roles
-	p_manage_webhooks = 0x00020000000,    //!< allows management and editing of webhooks
-	p_manage_emojis_and_stickers = 0x00040000000,    //!< allows management and editing of emojis and stickers
-	p_use_application_commands = 0x00080000000,    //!< allows members to use application commands, including slash commands and context menus
-	p_request_to_speak = 0x00100000000,    //!< allows for requesting to speak in stage channels. (Discord: This permission is under active development and may be changed or removed.)
-	p_manage_events = 0x00200000000,    //!< allows for management (creation, updating, deleting, starting) of scheduled events
-	p_manage_threads = 0x00400000000,    //!< allows for deleting and archiving threads, and viewing all private threads
-	p_create_public_threads = 0x00800000000,    //!< allows for creating public and announcement threads
-	p_create_private_threads = 0x01000000000,    //!< allows for creating private threads
-	p_use_external_stickers = 0x02000000000,    //!< allows the usage of custom stickers from other servers
-	p_send_messages_in_threads = 0x04000000000,    //!< allows for sending messages in threads
-	p_use_embedded_activities = 0x08000000000,    //!< allows for using activities (applications with the EMBEDDED flag) in a voice channel
-	p_moderate_members = 0x10000000000,    //!< allows for timing out users to prevent them from sending or reacting to messages in chat and threads, and from speaking in voice and stage channels
-};
-
-/**
- * @brief Represents the various discord permissions
- * @deprecated Use dpp::permissions instead.
- */
-using role_permissions = permissions;
-
-/**
- * @brief Represents a permission bitmask (refer to enum dpp::permissions) which are hold in an uint64_t
- */
-class DPP_EXPORT permission {
-protected:
-	/**
-	 * @brief The permission bitmask value
-	 */
-	uint64_t value;
-
-public:
-	/**
-	 * @brief Construct a permission object
-	 * @param value A permission bitmask
-	 */
-	permission(const uint64_t& value);
-
-	/**
- 	 * @brief Construct a permission object
- 	 */
-	permission();
-
-	/**
-	 * @brief For acting like an integer
-	 * @return The permission bitmask value
-	 */
-	operator uint64_t() const;
-
-	/**
-	 * @brief For acting like an integer
-	 * @return A reference to the permission bitmask value
-	 */
-	operator uint64_t &();
-
-	/**
-	 * @brief For building json
-	 * @return The permission bitmask value as a string
-	 */
-	operator nlohmann::json() const;
-
-	/**
-	 * @brief Check for permission flags set. It uses the Bitwise AND operator
-	 * @tparam T one or more uint64_t permission bits
-	 * @param values The permissions (from dpp::permissions) to check for
-	 *
-	 * **Example:**
-	 *
-	 * ```cpp
-	 * bool is_mod = permission.has(dpp::p_kick_members, dpp::p_ban_members);
-	 * // Returns true if the permission bitmask contains p_kick_members and p_ban_members
-	 * ```
-	 *
-	 * @return bool True if it has all the given permissions
-	 */
-	template <typename... T>
-	bool has(T... values) const {
-		return (value & (0 | ... | values)) == (0 | ... | values);
-	}
-
-	/**
-	 * @brief Add a permission with the Bitwise OR operation
-	 * @tparam T one or more uint64_t permission bits
-	 * @param values The permissions (from dpp::permissions) to add
-	 *
-	 * **Example:**
-	 *
-	 * ```cpp
-	 * permission.add(dpp::p_view_channel, dpp::p_send_messages);
-	 * // Adds p_view_channel and p_send_messages to the permission bitmask
-	 * ```
-	 *
-	 * @return permission& reference to self for chaining
-	 */
-	template <typename... T>
-	typename std::enable_if<(std::is_convertible<T, uint64_t>::value && ...), permission&>::type
-	add(T... values) {
-		value |= (0 | ... | values);
-		return *this;
-	}
-
-	/**
-	 * @brief Assign a permission. This will reset the bitmask to the new value.
-	 * @tparam T one or more uint64_t permission bits
-	 * @param values The permissions (from dpp::permissions) to set
-	 *
-	 * **Example:**
-	 *
-	 * ```cpp
-	 * permission.set(dpp::p_view_channel, dpp::p_send_messages);
-	 * ```
-	 *
-	 * @return permission& reference to self for chaining
-	 */
-	template <typename... T>
-	typename std::enable_if<(std::is_convertible<T, uint64_t>::value && ...), permission&>::type
-	set(T... values) {
-		value = (0 | ... | values);
-		return *this;
-	}
-
-	/**
-	 * @brief Remove a permission with the Bitwise NOT operation
-	 * @tparam T one or more uint64_t permission bits
-	 * @param values The permissions (from dpp::permissions) to remove
-	 *
-	 * **Example:**
-	 *
-	 * ```cpp
-	 * permission.remove(dpp::p_view_channel, dpp::p_send_messages);
-	 * // Removes p_view_channel and p_send_messages permission
-	 * ```
-	 *
-	 * @return permission& reference to self for chaining
-	 */
-	template <typename... T>
-	typename std::enable_if<(std::is_convertible<T, uint64_t>::value && ...), permission&>::type
-	remove(T... values) {
-		value &= ~(0 | ... | values);
-		return *this;
-	}
-};
-
-}
+/************************************************************************************
+ *
+ * D++, A Lightweight C++ library for Discord
+ *
+ * Copyright 2021 Craig Edwards and D++ contributors
+ * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ************************************************************************************/
+#pragma once
+#include <dpp/export.h>
+#include <dpp/json.h>
+#include <cstdint>
+#include <type_traits>
+
+namespace dpp {
+
+/**
+ * @brief Represents the various discord permissions
+ */
+enum permissions : uint64_t {
+	/**
+	 * @brief Allows creation of instant invites.
+	 */
+	p_create_instant_invite = 0x00000000001,
+
+	/**
+	 * @brief Allows kicking members.
+	 */
+	p_kick_members = 0x00000000002,
+
+	/**
+	 * @brief Allows banning members.
+	 */
+	p_ban_members = 0x00000000004,
+
+	/**
+	 * @brief Allows all permissions and bypasses channel permission overwrites.
+	 */
+	p_administrator = 0x00000000008,
+
+	/**
+	 * @brief Allows management and editing of channels.
+	 */
+	p_manage_channels = 0x00000000010,
+
+	/**
+	 * @brief Allows management and editing of the guild.
+	 */
+	p_manage_guild = 0x00000000020,
+
+	/**
+	 * @brief Allows for the addition of reactions to messages.
+	 */
+	p_add_reactions = 0x00000000040,
+
+	/**
+	 * @brief Allows for viewing of audit logs.
+	 */
+	p_view_audit_log = 0x00000000080,
+
+	/**
+	 * @brief Allows for using priority speaker in a voice channel.
+	 */
+	p_priority_speaker = 0x00000000100,
+
+	/**
+	 * @brief Allows the user to go live.
+	 */
+	p_stream = 0x00000000200,
+
+	/**
+	 * @brief Allows guild members to view a channel,
+	 * which includes reading messages in text channels and joining voice channels.
+	 */
+	p_view_channel = 0x00000000400,
+
+	/**
+	 * @brief Allows for sending messages in a channel.
+	 */
+	p_send_messages = 0x00000000800,
+
+	/**
+	 * @brief Allows for sending of /tts messages.
+	 */
+	p_send_tts_messages = 0x00000001000,
+
+	/**
+	 * @brief Allows for deletion of other users messages.
+	 */
+	p_manage_messages = 0x00000002000,
+
+	/**
+	 * @brief Links sent by users with this permission will be auto-embedded.
+	 */
+	p_embed_links = 0x00000004000,
+
+	/**
+	 * @brief Allows for uploading images and files.
+	 */
+	p_attach_files = 0x00000008000,
+
+	/**
+	 * @brief Allows for reading of message history.
+	 */
+	p_read_message_history = 0x00000010000,
+
+	/**
+	 * @brief Allows for using the everyone and the here tag to notify users in a channel.
+	 */
+	p_mention_everyone = 0x00000020000,
+
+	/**
+	 * @brief Allows the usage of custom emojis from other servers.
+	 */
+	p_use_external_emojis = 0x00000040000,
+
+	/**
+	 * @brief Allows for viewing guild insights.
+	 */
+	p_view_guild_insights = 0x00000080000,
+
+	/**
+	 * @brief Allows for joining of a voice channel.
+	 */
+	p_connect = 0x00000100000,
+
+	/**
+	 * @brief Allows for speaking in a voice channel.
+	 */
+	p_speak = 0x00000200000,
+
+	/**
+	 * @brief Allows for muting members in a voice channel.
+	 */
+	p_mute_members = 0x00000400000,
+
+	/**
+	 * @brief Allows for deafening of members in a voice channel.
+	 */
+	p_deafen_members = 0x00000800000,
+
+	/**
+	 * @brief Allows for moving of members between voice channels.
+	 */
+	p_move_members = 0x00001000000,
+
+	/**
+	 * @brief Allows for using voice-activity-detection in a voice channel.
+	 */
+	p_use_vad = 0x00002000000,
+
+	/**
+	 * @brief Allows for modification of own nickname.
+	 */
+	p_change_nickname = 0x00004000000,
+
+	/**
+	 * @brief Allows for modification of other users nicknames.
+	 */
+	p_manage_nicknames = 0x00008000000,
+
+	/**
+	 * @brief Allows management and editing of roles.
+	 */
+	p_manage_roles = 0x00010000000,
+
+	/**
+	 * @brief Allows management and editing of webhooks.
+	 */
+	p_manage_webhooks = 0x00020000000,
+
+	/**
+	 * @brief Allows management and editing of emojis and stickers.
+	 */
+	p_manage_emojis_and_stickers = 0x00040000000,
+
+	/**
+	 * @brief Allows members to use application commands,
+	 * including slash commands and context menus.
+	 */
+	p_use_application_commands = 0x00080000000,
+
+	/**
+	 * @brief Allows for requesting to speak in stage channels.
+	 *
+	 * @warning Discord: This permission is under active development and may be changed or removed.
+	 */
+	p_request_to_speak = 0x00100000000,
+
+	/**
+	 * @brief Allows for management (creation, updating, deleting, starting) of scheduled events.
+	 */
+	p_manage_events = 0x00200000000,
+
+	/**
+	 * @brief Allows for deleting and archiving threads, and viewing all private threads.
+	 */
+	p_manage_threads = 0x00400000000,
+
+	/**
+	 * @brief Allows for creating public and announcement threads.
+	 */
+	p_create_public_threads = 0x00800000000,
+
+	/**
+	 * @brief Allows for creating private threads.
+	 */
+	p_create_private_threads = 0x01000000000,
+
+	/**
+	 * @brief Allows the usage of custom stickers from other servers.
+	 */
+	p_use_external_stickers = 0x02000000000,
+
+	/**
+	 * @brief Allows for sending messages in threads.
+	 */
+	p_send_messages_in_threads = 0x04000000000,
+
+	/**
+	 * @brief Allows for using activities (applications with the EMBEDDED flag) in a voice channel.
+	 */
+	p_use_embedded_activities = 0x08000000000,
+
+	/**
+	 * @brief Allows for timing out users
+	 * to prevent them from sending or reacting to messages in chat and threads,
+	 * and from speaking in voice and stage channels.
+	 */
+	p_moderate_members = 0x10000000000,
+
+	/**
+	 * @brief Allows for viewing role subscription insights.
+	 */
+	p_view_creator_monetization_analytics = 0x20000000000,
+
+	/**
+	 * @brief Allows for using soundboard in a voice channel.
+	 */
+	p_use_soundboard = 0x40000000000,
+
+	/**
+	 * @brief Allows for creating emojis, stickers, and soundboard sounds, and editing and deleting those created by the current user.
+	 *
+	 * @note Not yet available to developers.
+	 * @see https://discord.com/developers/docs/change-log#clarification-on-permission-splits-for-expressions-and-events
+	 */
+	p_create_guild_expressions = 0x80000000000,
+
+	/**
+	 * @brief Allows for creating scheduled events, and editing and deleting those created by the current user.
+	 *
+	 * @note Not yet available to developers.
+	 * @see https://discord.com/developers/docs/change-log#clarification-on-permission-splits-for-expressions-and-events
+	 */
+	p_create_events = 0x0000100000000000,
+
+	/**
+	 * @brief Allows the usage of custom soundboard sounds from other servers.
+	 */
+	p_use_external_sounds = 0x0000200000000000,
+
+	/**
+	 * @brief Allows sending voice messages.
+	 */
+	p_send_voice_messages = 0x0000400000000000,
+
+	/**
+	 * @brief Allows use of Clyde AI.
+	 */
+	p_use_clyde_ai = 0x0000800000000000,
+
+	/**
+	 * @brief Allows sending polls
+	 */
+	p_send_polls = 0x0002000000000000,
+
+	/**
+	 * @brief Allows user-installed apps to send public responses.
+	 * When disabled, users will still be allowed to use their apps but the responses will be ephemeral.
+	 *
+	 * @note This only applies to apps not also installed to the server.
+	 */
+	p_use_external_apps = 0x0004000000000000,
+
+	/**
+	 * @brief Allows pinning and unpinning messages
+	 */
+	p_pin_messages = 0x0008000000000000,
+
+	/**
+	 * @brief Allows members to bypass the slow mode rate limit for sending messages in a channel.
+	 */
+	p_bypass_slowmode = 0x0010000000000000,
+};
+
+/**
+ * @brief Represents the various discord permissions
+ * @deprecated Use dpp::permissions instead.
+ */
+using role_permissions = permissions;
+
+/**
+ * @brief Represents a permission bitmask (refer to enum dpp::permissions) which are held in an uint64_t
+ */
+class DPP_EXPORT permission {
+protected:
+	/**
+	 * @brief The permission bitmask value
+	 */
+	uint64_t value{0};
+
+public:
+	/**
+	 * @brief Default constructor, initializes permission to 0
+	 */
+	constexpr permission() = default;
+
+	/**
+	 * @brief Bitmask constructor, initializes permission to the argument
+	 * @param value The bitmask to initialize the permission to
+	 */
+	constexpr permission(uint64_t value) noexcept : value{value} {}
+
+	/**
+	 * @brief For acting like an integer
+	 * @return The permission bitmask value
+	 */
+	constexpr operator uint64_t() const noexcept {
+		return value;
+	}
+
+	/**
+	 * @brief For acting like an integer
+	 * @return A reference to the permission bitmask value
+	 */
+	constexpr operator uint64_t &() noexcept {
+		return value;
+	}
+
+	/**
+	 * @brief For building json
+	 * @return The permission bitmask value as a string
+	 */
+	operator nlohmann::json() const;
+
+	/**
+	 * @brief Check for certain permissions, taking into account administrator privileges. It uses the Bitwise AND operator
+	 * @tparam T one or more uint64_t permission bits
+	 * @param values The permissions (from dpp::permissions) to check for
+	 *
+	 * **Example:**
+	 *
+	 * ```cpp
+	 * bool is_mod = permission.can(dpp::p_kick_members, dpp::p_ban_members);
+	 * // Returns true if it has permission to p_kick_members and p_ban_members
+	 * ```
+	 *
+	 * @return bool True if it has **all** the given permissions or dpp::p_administrator
+	 */
+	template <typename... T>
+	constexpr bool can(T... values) const noexcept {
+		return has(values...) || (value & p_administrator);
+	}
+
+	/**
+	 * @brief Check for certain permissions, taking into account administrator privileges. It uses the Bitwise AND operator
+	 * @tparam T one or more uint64_t permission bits
+	 * @param values The permissions (from dpp::permissions) to check for
+	 *
+	 * **Example:**
+	 *
+	 * ```cpp
+	 * bool is_mod = permission.can_any(dpp::p_kick_members, dpp::p_ban_members);
+	 * // Returns true if it has permission to p_kick_members or p_ban_members
+	 * ```
+	 *
+	 * @return bool True if it has **any** of the given permissions or dpp::p_administrator
+	 */
+	template <typename... T>
+	constexpr bool can_any(T... values) const noexcept {
+		return has_any(values...) || (value & p_administrator);
+	}
+
+	/**
+	 * @brief Check for permission flags set. It uses the Bitwise AND operator
+	 * @tparam T one or more uint64_t permission bits
+	 * @param values The permissions (from dpp::permissions) to check for
+	 *
+	 * **Example:**
+	 *
+	 * ```cpp
+	 * bool is_mod = permission.has(dpp::p_kick_members, dpp::p_ban_members);
+	 * // Returns true if the permission bitmask contains p_kick_members and p_ban_members
+	 * ```
+	 *
+	 * @return bool True if it has **all** the given permissions
+	 */
+	template <typename... T>
+	constexpr bool has(T... values) const noexcept {
+		return (value & (0 | ... | values)) == (0 | ... | values);
+	}
+
+	/**
+	 * @brief Check for permission flags set. It uses the Bitwise AND operator
+	 * @tparam T one or more uint64_t permission bits
+	 * @param values The permissions (from dpp::permissions) to check for
+	 *
+	 * **Example:**
+	 *
+	 * ```cpp
+	 * bool is_mod = permission.has_any(dpp::p_administrator, dpp::p_ban_members);
+	 * // Returns true if the permission bitmask contains p_administrator or p_ban_members
+	 * ```
+	 *
+	 * @return bool True if it has **any** of the given permissions
+	 */
+	template <typename... T>
+	constexpr bool has_any(T... values) const noexcept {
+		return (value & (0 | ... | values)) != 0;
+	}
+
+	/**
+	 * @brief Add a permission with the Bitwise OR operation
+	 * @tparam T one or more uint64_t permission bits
+	 * @param values The permissions (from dpp::permissions) to add
+	 *
+	 * **Example:**
+	 *
+	 * ```cpp
+	 * permission.add(dpp::p_view_channel, dpp::p_send_messages);
+	 * // Adds p_view_channel and p_send_messages to the permission bitmask
+	 * ```
+	 *
+	 * @return permission& reference to self for chaining
+	 */
+	template <typename... T>
+	std::enable_if_t<(std::is_convertible_v<T, uint64_t> && ...), permission&>
+	constexpr add(T... values) noexcept {
+		value |= (0 | ... | values);
+		return *this;
+	}
+
+	/**
+	 * @brief Assign permissions. This will reset the bitmask to the new value.
+	 * @tparam T one or more uint64_t permission bits
+	 * @param values The permissions (from dpp::permissions) to set
+	 *
+	 * **Example:**
+	 *
+	 * ```cpp
+	 * permission.set(dpp::p_view_channel, dpp::p_send_messages);
+	 * ```
+	 *
+	 * @return permission& reference to self for chaining
+	 */
+	template <typename... T>
+	std::enable_if_t<(std::is_convertible_v<T, uint64_t> && ...), permission&>
+	constexpr set(T... values) noexcept {
+		value = (0 | ... | values);
+		return *this;
+	}
+
+	/**
+	 * @brief Remove a permission with the Bitwise NOT operation
+	 * @tparam T one or more uint64_t permission bits
+	 * @param values The permissions (from dpp::permissions) to remove
+	 *
+	 * **Example:**
+	 *
+	 * ```cpp
+	 * permission.remove(dpp::p_view_channel, dpp::p_send_messages);
+	 * // Removes p_view_channel and p_send_messages permission
+	 * ```
+	 *
+	 * @return permission& reference to self for chaining
+	 */
+	template <typename... T>
+	std::enable_if_t<(std::is_convertible_v<T, uint64_t> && ...), permission&>
+	constexpr remove(T... values) noexcept {
+		value &= ~(0 | ... | values);
+		return *this;
+	}
+};
+
+}
diff --git a/3rdParty/dpp/presence.h b/3rdParty/dpp/presence.h
index e018f92ecb..0a1e2ce5dd 100644
--- a/3rdParty/dpp/presence.h
+++ b/3rdParty/dpp/presence.h
@@ -1,384 +1,598 @@
-/************************************************************************************
- *
- * D++, A Lightweight C++ library for Discord
- *
- * Copyright 2021 Craig Edwards and D++ contributors 
- * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- ************************************************************************************/
-#pragma once
-#include <dpp/export.h>
-#include <dpp/snowflake.h>
-#include <dpp/emoji.h>
-#include <dpp/nlohmann/json_fwd.hpp>
-#include <unordered_map>
-#include <dpp/json_interface.h>
-
-namespace dpp {
-
-/**
- * @brief Presence flags bitmask
- */
-enum presence_flags {
-	/// Desktop: Online
-	p_desktop_online	=	0b00000001,
-	/// Desktop: DND
-	p_desktop_dnd		=	0b00000010,
-	/// Desktop: Idle
-	p_desktop_idle		=	0b00000011,
-	/// Web: Online
-	p_web_online		=	0b00000100,
-	/// Web: DND
-	p_web_dnd		=	0b00001000,
-	/// Web: Idle
-	p_web_idle		=	0b00001100,
-	/// Mobile: Online
-	p_mobile_online		=	0b00010000,
-	/// Mobile: DND
-	p_mobile_dnd		=	0b00100000,
-	/// Mobile: Idle
-	p_mobile_idle		=	0b00110000,
-	/// General: Online
-	p_status_online		=	0b01000000,
-	/// General: DND
-	p_status_dnd		=	0b10000000,
-	/// General: Idle
-	p_status_idle		=	0b11000000
-};
-
-/**
- * @brief Online presence status values
- */
-enum presence_status : uint8_t {
-	/// Offline
-	ps_offline	=	0,
-	/// Online
-	ps_online	=	1,
-	/// DND
-	ps_dnd		=	2,
-	/// Idle
-	ps_idle		=	3
-};
-
-/**
- * @brief Bit shift for desktop status
- */
-#define PF_SHIFT_DESKTOP	0
-/** Bit shift for web status */
-#define PF_SHIFT_WEB		2
-/** Bit shift for mobile status */
-#define PF_SHIFT_MOBILE		4
-/** Bit shift for main status */
-#define PF_SHIFT_MAIN		6
-/** Bit mask for status */
-#define PF_STATUS_MASK		0b00000011
-/** Bit mask for clearing desktop status */
-#define PF_CLEAR_DESKTOP	0b11111100
-/** Bit mask for clearing web status */
-#define PF_CLEAR_WEB		0b11110011
-/** Bit mask for clearing mobile status */
-#define PF_CLEAR_MOBILE		0b11001111
-/** Bit mask for clearing main status */
-#define PF_CLEAR_STATUS		0b00111111
-
-/**
- * @brief Game types
- */
-enum activity_type : uint8_t {
-	/// "Playing ..."
-	at_game		=	0,
-	/// "Streaming ..."
-	at_streaming	=	1,
-	/// "Listening to..."
-	at_listening	=	2,
-	/// "Watching..."
-	at_watching	=	3,
-	/// "Emoji..."
-	at_custom	=	4,
-	/// "Competing in..."
-	at_competing	=	5
-};
-
-/**
- * @brief Activity types for rich presence
- */
-enum activity_flags {
-	/// In an instance
-	af_instance					= 0b000000001,
-	/// Joining
-	af_join						= 0b000000010,
-	/// Spectating
-	af_spectate					= 0b000000100,
-	/// Sending join request
-	af_join_request					= 0b000001000,
-	/// Synchronising
-	af_sync						= 0b000010000,
-	/// Playing
-	af_play						= 0b000100000,
-	/// Party privacy friends
-	af_party_privacy_friends 			= 0b001000000,
-	/// Party privacy voice channel
-	af_party_privacy_voice_channel			= 0b010000000,
-	/// Embedded
-	af_embedded 					= 0b100000000
-};
-
-/**
- * @brief An activity button is a custom button shown in the rich presence. Can be to join a game or whatever
- */
-struct DPP_EXPORT activity_button {
-public:
-	/** The text shown on the button (1-32 characters)
-	 */
-	std::string label;
-	/** The url opened when clicking the button (1-512 characters). It's may be empty
-	 *
-	 * @note Bots cannot access the activity button URLs.
-	 */
-	std::string url;
-
-	/** Constructor */
-	activity_button() = default;
-};
-
-/**
- * @brief An activity asset are the images and the hover text displayed in the rich presence
- */
-struct DPP_EXPORT activity_assets {
-public:
-	/** The large asset image which usually contain snowflake ID or prefixed image ID
-	 */
-	std::string large_image;
-	/** Text displayed when hovering over the large image of the activity
-	 */
-	std::string large_text;
-	/** The small asset image which usually contain snowflake ID or prefixed image ID
-	 */
-	std::string small_image;
-	/** Text displayed when hovering over the small image of the activity
-	 */
-	std::string small_text;
-
-	/** Constructor */
-	activity_assets() = default;
-};
-
-/**
- * @brief Secrets for Rich Presence joining and spectating
- */
-struct DPP_EXPORT activity_secrets {
-public:
-	/** The secret for joining a party
-	 */
-	std::string join;
-	/** The secret for spectating a game
-	 */
-	std::string spectate;
-	/** The secret for a specific instanced match
-	 */
-	std::string match;
-
-	/** Constructor */
-	activity_secrets() = default;
-};
-
-/**
- * @brief Information for the current party of the player
- */
-struct DPP_EXPORT activity_party {
-public:
-	/** The ID of the party
-	 */
-	snowflake id;
-	/** The party's current size. Used to show the party's current size
-	 */
-	int32_t current_size;
-	/** The party's maximum size. Used to show the party's maximum size
-	 */
-	int32_t maximum_size;
-
-	/** Constructor */
-	activity_party();
-};
-
-/**
- * @brief An activity is a representation of what a user is doing. It might be a game, or a website, or a movie. Whatever.
- */
-class DPP_EXPORT activity {
-public:
-	/** Name of activity
-	 * e.g. "Fortnite"
-	 */
-	std::string name;
-	/** State of activity or the custom user status.
-	 * e.g. "Waiting in lobby"
-	 */
-	std::string state;
-	/** What the player is currently doing
-	 */
-	std::string details;
-	/** Images for the presence and their hover texts
-	 */
-	activity_assets assets;
-	/** URL.
-	 * Only applicable for certain sites such a YouTube
-	 * Alias: details
-	 */
-	std::string url;
-	/** The custom buttons shown in the Rich Presence (max 2)
-	 */
-	std::vector<activity_button> buttons;
-	/** The emoji used for the custom status
-	 */
-	dpp::emoji emoji;
-	/** Information of the current party if there is one
-	 */
-	activity_party party;
-	/** Secrets for rich presence joining and spectating
-	 */
-	activity_secrets secrets;
-	/** Activity type
-	 */
-	activity_type type;
-	/** Time activity was created
-	 */
-	time_t created_at;
-	/** Start time. e.g. when game was started
-	 */
-	time_t start;
-	/** End time, e.g. for songs on spotify
-	 */
-	time_t end;
-	/** Creating application (e.g. a linked account on the user's client)
-	 */
-	snowflake application_id;
-	/** Flags bitmask from dpp::activity_flags
-	 */
-	uint8_t flags;
-	/** Whether or not the activity is an instanced game session
-	 */
-	bool is_instance;
-
-	/**
-	 * @brief Get the assets large image url if they have one, otherwise returns an empty string. In case of prefixed image IDs (mp:{image_id}) it returns an empty string.
-	 *
-	 * @param size The size of the image in pixels. It can be any power of two between 16 and 4096. if not specified, the default sized image is returned.
-	 * @return image url or empty string
-	 */
-	std::string get_large_asset_url(uint16_t size = 0) const;
-
-	/**
-	 * @brief Get the assets small image url if they have one, otherwise returns an empty string. In case of prefixed image IDs (mp:{image_id}) it returns an empty string.
-	 *
-	 * @param size The size of the image in pixels. It can be any power of two between 16 and 4096. if not specified, the default sized image is returned.
-	 * @return image url or empty string
-	 */
-	std::string get_small_asset_url(uint16_t size = 0) const;
-
-	activity();
-
-	/**
-	 * @brief Construct a new activity
-	 * 
-	 * @param typ activity type
-	 * @param nam Name of the activity
-	 * @param stat State of the activity
-	 * @param url_ url of the activity, only works for certain sites, such as YouTube
-	 */
-	activity(const activity_type typ, const std::string& nam, const std::string& stat, const std::string& url_);
-};
-
-/**
- * @brief Represents user presence, e.g. what game they are playing and if they are online
- */
-class DPP_EXPORT presence : public json_interface<presence> {
-public:
-	/** The user the presence applies to */
-	snowflake	user_id;
-
-	/** Guild ID. Apparently, Discord supports this internally but the client doesn't... */
-	snowflake       guild_id;
-
-	/** Flags bitmask containing dpp::presence_flags */
-	uint8_t		flags;
-
-	/** List of activities */
-	std::vector<activity> activities;
-
-	/** Constructor */
-	presence();
-
-	/**
-	 * @brief Construct a new presence object with some parameters for sending to a websocket
-	 * 
-	 * @param status Status of the activity
-	 * @param type Type of activity
-	 * @param activity_description Description of the activity
-	 */
-	presence(presence_status status, activity_type type, const std::string& activity_description);
-
-	/**
-	 * @brief Construct a new presence object with some parameters for sending to a websocket.
-	 * 
-	 * @param status Status of the activity
-	 * @param a Activity itself 
-	 */
-	presence(presence_status status, const activity& a);
-
-	/** Destructor */
-	~presence();
-
-	/** Fill this object from json.
-	 * @param j JSON object to fill from
-	 * @return A reference to self
-	 */
-	 presence& fill_from_json(nlohmann::json* j);
-
-	/** Build JSON from this object.
-	 * 
-	 * Note: This excludes any part of the presence object that are not valid for websockets and bots,
-	 * and includes websocket opcode 3. You will not get what you expect if you call this on a user's
-	 * presence received from on_presence_update or on_guild_create!
-	 * 
-	 * @param with_id Add ID to output
-	 * @return The JSON text of the presence
-	 */
-	virtual std::string build_json(bool with_id = false) const;
-
-	/** The users status on desktop
-	 * @return The user's status on desktop
-	 */
-	presence_status desktop_status() const;
-
-	/** The user's status on web
-	 * @return The user's status on web
-	 */
-	presence_status web_status() const;
-
-	/** The user's status on mobile
-	 * @return The user's status on mobile
-	 */
-	presence_status mobile_status() const;
-
-	/** The user's status as shown to other users
-	 * @return The user's status as shown to other users
-	 */
-	presence_status status() const;
-};
-
-/** A container of presences */
-typedef std::unordered_map<snowflake, presence> presence_map;
-
-};
+/************************************************************************************
+ *
+ * D++, A Lightweight C++ library for Discord
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright 2021 Craig Edwards and D++ contributors 
+ * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ************************************************************************************/
+#pragma once
+#include <dpp/export.h>
+#include <dpp/snowflake.h>
+#include <dpp/emoji.h>
+#include <dpp/json_fwd.h>
+#include <unordered_map>
+#include <dpp/json_interface.h>
+
+namespace dpp {
+
+/**
+ * @brief Presence flags bitmask
+ */
+enum presence_flags {
+	/**
+	 * @brief Desktop: Online.
+	 */
+	p_desktop_online = 0b00000001,
+
+	/**
+	 * @brief Desktop: DND.
+	 */
+	p_desktop_dnd = 0b00000010,
+
+	/**
+	 * @brief Desktop: Idle.
+	 */
+	p_desktop_idle = 0b00000011,
+
+	/**
+	 * @brief Web: Online.
+	 */
+	p_web_online = 0b00000100,
+
+	/**
+	 * @brief Web: DND.
+	 */
+	p_web_dnd = 0b00001000,
+
+	/**
+	 * @brief Web: Idle.
+	 */
+	p_web_idle = 0b00001100,
+
+	/**
+	 * @brief Mobile: Online.
+	 */
+	p_mobile_online	= 0b00010000,
+
+	/**
+	 * @brief Mobile: DND.
+	 */
+	p_mobile_dnd = 0b00100000,
+
+	/**
+	 * @brief Mobile: Idle.
+	 */
+	p_mobile_idle = 0b00110000,
+
+	/**
+	 * @brief General: Online.
+	 */
+	p_status_online	= 0b01000000,
+
+	/**
+	 * @brief General: DND.
+	 */
+	p_status_dnd = 0b10000000,
+
+	/**
+	 * @brief General: Idle.
+	 */
+	p_status_idle = 0b11000000
+};
+
+/**
+ * @brief Online presence status values
+ */
+enum presence_status : uint8_t {
+	/**
+	 * @brief Offline.
+	 */
+	ps_offline = 0,
+
+	/**
+	 * @brief Online.
+	 */
+	ps_online = 1,
+
+	/**
+	 * @brief DND.
+	 */
+	ps_dnd = 2,
+
+	/**
+	 * @brief Idle.
+	 */
+	ps_idle	= 3,
+
+	/**
+	 * @brief Invisible (show as offline).
+	 */
+	ps_invisible = 4,
+};
+
+/**
+ * @brief Bit shift for desktop status.
+ */
+#define PF_SHIFT_DESKTOP	0
+
+/**
+ * @brief Bit shift for web status.
+ */
+#define PF_SHIFT_WEB		2
+
+/**
+ * @brief Bit shift for mobile status.
+ */
+#define PF_SHIFT_MOBILE		4
+
+/**
+ * @brief Bit shift for main status.
+ */
+#define PF_SHIFT_MAIN		6
+
+/**
+ * @brief Bit mask for status.
+ */
+#define PF_STATUS_MASK		0b00000011
+
+/**
+ * @brief Bit mask for clearing desktop status.
+ */
+#define PF_CLEAR_DESKTOP	0b11111100
+
+/**
+ * @brief Bit mask for clearing web status.
+ */
+#define PF_CLEAR_WEB		0b11110011
+
+/**
+ * @brief Bit mask for clearing mobile status.
+ */
+#define PF_CLEAR_MOBILE		0b11001111
+
+/**
+ * @brief Bit mask for clearing main status.
+ */
+#define PF_CLEAR_STATUS		0b00111111
+
+/**
+ * @brief Game types
+ */
+enum activity_type : uint8_t {
+	/**
+	 * @brief "Playing ..."
+	 */
+	at_game		=	0,
+
+	/**
+	 * @brief "Streaming ..."
+	 */
+	at_streaming	=	1,
+
+	/**
+	 * @brief "Listening to..."
+	 */
+	at_listening	=	2,
+
+	/**
+	 * @brief "Watching..."
+	 */
+	at_watching	=	3,
+
+	/**
+	 * @brief "Emoji..."
+	 */
+	at_custom	=	4,
+
+	/**
+	 * @brief "Competing in..."
+	 */
+	at_competing	=	5
+};
+
+/**
+ * @brief Activity types for rich presence
+ */
+enum activity_flags {
+	/**
+	 * @brief In an instance.
+	 */
+	af_instance					= 0b000000001,
+
+	/**
+	 * @brief Joining.
+	 */
+	af_join						= 0b000000010,
+
+	/**
+	 * @brief Spectating.
+	 */
+	af_spectate					= 0b000000100,
+
+	/**
+	 * @brief Sending join request.
+	 */
+	af_join_request					= 0b000001000,
+
+	/**
+	 * @brief Synchronising.
+	 */
+	af_sync						= 0b000010000,
+
+	/**
+	 * @brief Playing.
+	 */
+	af_play						= 0b000100000,
+
+	/**
+	 * @brief Party privacy friends.
+	 */
+	af_party_privacy_friends 			= 0b001000000,
+
+	/**
+	 * @brief Party privacy voice channel.
+	 */
+	af_party_privacy_voice_channel			= 0b010000000,
+
+	/**
+	 * @brief Embedded.
+	 */
+	af_embedded 					= 0b100000000
+};
+
+/**
+ * @brief An activity button is a custom button shown in the rich presence. Can be to join a game or whatever
+ */
+struct DPP_EXPORT activity_button {
+public:
+	/**
+	 * @brief The text shown on the button (1-32 characters).
+	 */
+	std::string label;
+
+	/**
+	 * @brief The url opened when clicking the button (1-512 characters, can be empty).
+	 *
+	 * @note Bots cannot access the activity button URLs.
+	 */
+	std::string url;
+
+	/** Constructor */
+	activity_button() = default;
+};
+
+/**
+ * @brief An activity asset are the images and the hover text displayed in the rich presence
+ */
+struct DPP_EXPORT activity_assets {
+public:
+	/**
+	 * @brief The large asset image which usually contain snowflake ID or prefixed image ID.
+	 */
+	std::string large_image;
+
+	/**
+	 * @brief Text displayed when hovering over the large image of the activity.
+	 */
+	std::string large_text;
+
+	/**
+	 * @brief The small asset image which usually contain snowflake ID or prefixed image ID.
+	 */
+	std::string small_image;
+
+	/**
+	 * @brief Text displayed when hovering over the small image of the activity.
+	 */
+	std::string small_text;
+
+	/** Constructor */
+	activity_assets() = default;
+};
+
+/**
+ * @brief Secrets for Rich Presence joining and spectating.
+ */
+struct DPP_EXPORT activity_secrets {
+public:
+	/**
+	 * @brief The secret for joining a party.
+	 */
+	std::string join;
+
+	/**
+	 * @brief The secret for spectating a game.
+	 */
+	std::string spectate;
+
+	/**
+	 * @brief The secret for a specific instanced match.
+	 */
+	std::string match;
+
+	/** Constructor */
+	activity_secrets() = default;
+};
+
+/**
+ * @brief Information for the current party of the player
+ */
+struct DPP_EXPORT activity_party {
+public:
+	/**
+	 * @brief The ID of the party.
+	 */
+	snowflake id;
+
+	/**
+	 * @brief The party's current size.
+	 * Used to show the party's current size.
+	 */
+	int32_t current_size;
+
+	/**
+	 * @brief The party's maximum size.
+	 * Used to show the party's maximum size.
+	 */
+	int32_t maximum_size;
+
+	/** Constructor */
+	activity_party();
+};
+
+/**
+ * @brief An activity is a representation of what a user is doing. It might be a game, or a website, or a movie. Whatever.
+ */
+class DPP_EXPORT activity {
+public:
+	/**
+	 * @brief Name of activity.
+	 * e.g. "Fortnite", "Mr Boom's Firework Factory", etc.
+	 */
+	std::string name;
+
+	/**
+	 * @brief State of activity or the custom user status.
+	 * e.g. "Waiting in lobby".
+	 */
+	std::string state;
+
+	/**
+	 * @brief What the player is currently doing.
+	 */
+	std::string details;
+
+	/**
+	 * @brief Images for the presence and their hover texts.
+	 */
+	activity_assets assets;
+
+	/**
+	 * @brief URL of activity (this is also named details).
+	 *
+	 * @note Only applicable for certain sites such a YouTube
+	 */
+	std::string url;
+
+	/**
+	 * @brief The custom buttons shown in the Rich Presence (max 2).
+	 */
+	std::vector<activity_button> buttons;
+
+	/**
+	 * @brief The emoji used for the custom status.
+	 */
+	dpp::emoji emoji;
+
+	/**
+	 * @brief Information of the current party if there is one.
+	 */
+	activity_party party;
+
+	/**
+	 * @brief Secrets for rich presence joining and spectating.
+	 */
+	activity_secrets secrets;
+
+	/**
+	 * @brief Activity type.
+	 */
+	activity_type type;
+
+	/**
+	 * @brief Time activity was created.
+	 */
+	time_t created_at;
+
+	/**
+	 * @brief Start time.
+	 * e.g. when game was started.
+	 */
+	time_t start;
+
+	/**
+	 * @brief End time.
+	 * e.g. for songs on spotify.
+	 */
+	time_t end;
+
+	/**
+	 * @brief Creating application.
+	 * e.g. a linked account on the user's client.
+	 */
+	snowflake application_id;
+
+	/**
+	 * @brief Flags bitmask from dpp::activity_flags.
+	 */
+	uint8_t flags;
+
+	/**
+	 * @brief Whether or not the activity is an instanced game session.
+	 */
+	bool is_instance;
+
+	/**
+	 * @brief Get the assets large image url if they have one, otherwise returns an empty string. In case of prefixed image IDs (mp:{image_id}) it returns an empty string.
+	 *
+	 * @see https://discord.com/developers/docs/topics/gateway-events#activity-object-activity-asset-image
+	 *
+	 * @param size The size of the image in pixels. It can be any power of two between 16 and 4096,
+	 * otherwise the default sized image is returned.
+	 * @param format The format to use for the avatar. It can be one of `i_webp`, `i_jpg` or `i_png`.
+	 * @return std::string image url or an empty string, if required attributes are missing or an invalid format was passed
+	 */
+	std::string get_large_asset_url(uint16_t size = 0, const image_type format = i_png) const;
+
+	/**
+	 * @brief Get the assets small image url if they have one, otherwise returns an empty string. In case of prefixed image IDs (mp:{image_id}) it returns an empty string.
+	 *
+	 * @see https://discord.com/developers/docs/topics/gateway-events#activity-object-activity-asset-image
+	 *
+	 * @param size The size of the image in pixels. It can be any power of two between 16 and 4096,
+	 * otherwise the default sized image is returned.
+	 * @param format The format to use for the avatar. It can be one of `i_webp`, `i_jpg` or `i_png`.
+	 * @return std::string image url or an empty string, if required attributes are missing or an invalid format was passed
+	 */
+	std::string get_small_asset_url(uint16_t size = 0, const image_type format = i_png) const;
+
+	activity();
+
+	/**
+	 * @brief Construct a new activity
+	 * 
+	 * @param typ activity type
+	 * @param nam Name of the activity
+	 * @param stat State of the activity
+	 * @param url_ url of the activity, only works for certain sites, such as YouTube
+	 */
+	activity(const activity_type typ, const std::string& nam, const std::string& stat, const std::string& url_);
+};
+
+/**
+ * @brief Represents user presence, e.g. what game they are playing and if they are online
+ */
+class DPP_EXPORT presence : public json_interface<presence> {
+protected:
+	friend struct json_interface<presence>;
+
+	/** Fill this object from json.
+	 * @param j JSON object to fill from
+	 * @return A reference to self
+	 */
+	presence& fill_from_json_impl(nlohmann::json* j);
+
+	/** Build JSON from this object.
+	 *
+	 * @note This excludes any part of the presence object that are not valid for websockets and bots,
+	 * and includes websocket opcode 3. You will not get what you expect if you call this on a user's
+	 * presence received from on_presence_update or on_guild_create!
+	 *
+	 * @param with_id Add ID to output
+	 * @return The JSON text of the presence
+	 */
+	virtual json to_json_impl(bool with_id = false) const;
+
+public:
+	/**
+	 * @brief The user the presence applies to.
+	 */
+	snowflake user_id;
+
+	/**
+	 * @brief Guild ID.
+	 *
+	 * @note Apparently, Discord supports this internally, but the client doesn't...
+	 */
+	snowflake guild_id;
+
+	/**
+	 * @brief Flags bitmask containing dpp::presence_flags
+	 */
+	uint8_t	flags;
+
+	/**
+	 * @brief List of activities.
+	 */
+	std::vector<activity> activities;
+
+	/** Constructor */
+	presence();
+
+	/**
+	 * @brief Construct a new presence object with some parameters for sending to a websocket
+	 * 
+	 * @param status Status of the activity
+	 * @param type Type of activity
+	 * @param activity_description Description of the activity
+	 */
+	presence(presence_status status, activity_type type, const std::string& activity_description);
+
+	/**
+	 * @brief Construct a new presence object with some parameters for sending to a websocket.
+	 * 
+	 * @param status Status of the activity
+	 * @param a Activity itself 
+	 */
+	presence(presence_status status, const activity& a);
+
+	/** Destructor */
+	~presence();
+
+	/**
+	 * @brief The users status on desktop
+	 * @return The user's status on desktop
+	 */
+	presence_status desktop_status() const;
+
+	/**
+	 * @brief The user's status on web
+	 * @return The user's status on web
+	 */
+	presence_status web_status() const;
+
+	/**
+	 * @brief The user's status on mobile
+	 * @return The user's status on mobile
+	 */
+	presence_status mobile_status() const;
+
+	/**
+	 * @brief The user's status as shown to other users
+	 * @return The user's status as shown to other users
+	 */
+	presence_status status() const;
+
+	/**
+	 * @brief Build JSON from this object.
+	 *
+	 * @note This excludes any part of the presence object that are not valid for websockets and bots,
+	 * and includes websocket opcode 3. You will not get what you expect if you call this on a user's
+	 * presence received from on_presence_update or on_guild_create!
+	 *
+	 * @param with_id Add ID to output
+	 * @return The JSON of the presence
+	 */
+	json to_json(bool with_id = false) const; // Intentional shadow of json_interface, mostly present for documentation
+};
+
+/**
+ * @brief A container of presences
+ */
+typedef std::unordered_map<snowflake, presence> presence_map;
+
+}
diff --git a/3rdParty/dpp/prune.h b/3rdParty/dpp/prune.h
index fe3d843908..7cdfb13e21 100644
--- a/3rdParty/dpp/prune.h
+++ b/3rdParty/dpp/prune.h
@@ -1,63 +1,80 @@
-/************************************************************************************
- *
- * D++, A Lightweight C++ library for Discord
- *
- * Copyright 2021 Craig Edwards and D++ contributors 
- * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- ************************************************************************************/
-#pragma once
-#include <dpp/export.h>
-#include <dpp/snowflake.h>
-#include <dpp/nlohmann/json_fwd.hpp>
-#include <dpp/json_interface.h>
-
-namespace dpp {
-
-/**
- * @brief Defines a request to count prunable users, or start a prune operation
- */
-struct DPP_EXPORT prune : public json_interface<prune> {
-	/**
-	 * Destroy this prune object
-	 */
-	virtual ~prune() = default;
-
-	/** Number of days to include in the prune
-	 */
-	uint32_t days = 0;
-	/** Roles to include in the prune (empty to include everyone)
-	 */
-	std::vector<snowflake> include_roles;
-	/** True if the count of pruneable users should be returned
-	 * (discord recommend not using this on big guilds)
-	 */
-	bool compute_prune_count;
-
-	/** Fill this object from json.
-	 * @param j JSON object to fill from
-	 * @return A reference to self
-	 */
-	 prune& fill_from_json(nlohmann::json* j);
-
-	/** Build JSON from this object.
-	 * @param with_prune_count True if the prune count boolean is to be set in the built JSON
-	 * @return The JSON text of the prune object
-	 */
-	virtual std::string build_json(bool with_prune_count = false) const;
-
-};
-
-};
+/************************************************************************************
+ *
+ * D++, A Lightweight C++ library for Discord
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright 2021 Craig Edwards and D++ contributors 
+ * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ************************************************************************************/
+#pragma once
+#include <dpp/export.h>
+#include <dpp/snowflake.h>
+#include <dpp/json_fwd.h>
+#include <dpp/json_interface.h>
+
+namespace dpp {
+
+/**
+ * @brief Defines a request to count prunable users, or start a prune operation
+ */
+struct DPP_EXPORT prune : public json_interface<prune> {
+protected:
+	friend struct json_interface<prune>;
+
+	/** Fill this object from json.
+	 * @param j JSON object to fill from
+	 * @return A reference to self
+	 */
+	prune& fill_from_json_impl(nlohmann::json* j);
+
+	/** Build JSON from this object.
+	 * @param with_prune_count True if the prune count boolean is to be set in the built JSON
+	 * @return The JSON of the prune object
+	 */
+	virtual json to_json_impl(bool with_prune_count = false) const;
+
+public:
+	/**
+	 * @brief Destroy this prune object
+	 */
+	virtual ~prune() = default;
+
+	/**
+	 * @brief Number of days to include in the prune.
+	 */
+	uint32_t days = 0;
+
+	/**
+	 * @brief Roles to include in the prune (empty to include everyone).
+	 */
+	std::vector<snowflake> include_roles;
+
+	/**
+	 * @brief True if the count of pruneable users should be returned.
+	 * @warning Discord recommend not using this on big guilds.
+	 */
+	bool compute_prune_count;
+
+	/**
+	 * @brief Build JSON from this object.
+	 *
+	 * @param with_id True if the prune count boolean is to be set in the built JSON
+	 * @return The JSON of the prune object
+	 */
+	json to_json(bool with_id = false) const; // Intentional shadow of json_interface, mostly present for documentation
+};
+
+}
diff --git a/3rdParty/dpp/queues.h b/3rdParty/dpp/queues.h
index e3e5a650a4..5339ce3199 100644
--- a/3rdParty/dpp/queues.h
+++ b/3rdParty/dpp/queues.h
@@ -1,457 +1,666 @@
-/************************************************************************************
- *
- * D++, A Lightweight C++ library for Discord
- *
- * Copyright 2021 Craig Edwards and D++ contributors 
- * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- ************************************************************************************/
-#pragma once
-#include <dpp/export.h>
-#include <unordered_map>
-#include <string>
-#include <queue>
-#include <map>
-#include <thread>
-#include <shared_mutex>
-#include <vector>
-#include <functional>
-#include <condition_variable>
-
-namespace dpp {
-
-/**
- * @brief Error values. Most of these are currently unused in https_client.
- */
-enum http_error {
-	/// Request successful
-	h_success = 0,
-	/// Status unknown
-	h_unknown,
-	/// Connect failed
-	h_connection,
-	/// Invalid local ip address
-	h_bind_ip_address,
-	/// Read error
-	h_read,
-	/// Write error
-	h_write,
-	/// Too many 30x redirects
-	h_exceed_redirect_count,
-	/// Request cancelled
-	h_canceled,
-	/// SSL connection error
-	h_ssl_connection,
-	/// SSL cert loading error
-	h_ssl_loading_certs,
-	/// SSL server verification error
-	h_ssl_server_verification,
-	/// Unsupported multipart boundary characters
-	h_unsupported_multipart_boundary_chars,
-	/// Compression error
-	h_compression,
-};
-
-/**
- * @brief The result of any HTTP request. Contains the headers, vital
- * rate limit figures, and returned request body.
- */
-struct DPP_EXPORT http_request_completion_t {
-	/** @brief HTTP headers of response */
-	std::map<std::string, std::string> headers;
-	/** @brief HTTP status, e.g. 200 = OK, 404 = Not found, 429 = Rate limited */
-	uint16_t status = 0;
-	/** @brief Error status (e.g. if the request could not connect at all) */
-	http_error error = h_success;
-	/** @brief Ratelimit bucket */
-	std::string ratelimit_bucket;
-	/** @brief Ratelimit limit of requests */
-	uint64_t ratelimit_limit = 0;
-	/** @brief Ratelimit remaining requests */
-	uint64_t ratelimit_remaining = 0;
-	/** @brief Ratelimit reset after (seconds) */
-	uint64_t ratelimit_reset_after = 0;
-	/** @brief Ratelimit retry after (seconds) */
-	uint64_t ratelimit_retry_after = 0;
-	/** @brief True if this request has caused us to be globally rate limited */
-	bool ratelimit_global = false;
-	/** @brief Reply body */
-	std::string body;
-	/** @brief Ping latency */
-	double latency;
-};
-
-/**
- * @brief Results of HTTP requests are called back to these std::function types.
- * @note Returned http_completion_events are called ASYNCHRONOUSLY in your
- * code which means they execute in a separate thread. The completion events
- * arrive in order.
- */
-typedef std::function<void(const http_request_completion_t&)> http_completion_event;
-
-/** 
- * @brief Various types of http method supported by the Discord API
- */
-enum http_method {
-	/// GET
-	m_get,
-	/// POST
-	m_post,
-	/// PUT
-	m_put,
-	/// PATCH
-	m_patch,
-	/// DELETE
-	m_delete
-};
-
-/**
- * @brief A HTTP request.
- * 
- * You should instantiate one of these objects via its constructor,
- * and pass a pointer to it into an instance of request_queue. Although you can
- * directly call the run() method of the object and it will make a HTTP call, be
- * aware that if you do this, it will be a **BLOCKING call** (not asynchronous) and
- * will not respect rate limits, as both of these functions are managed by the
- * request_queue class.
- */
-class DPP_EXPORT http_request {
-	/** @brief Completion callback */
-	http_completion_event complete_handler;
-	/** @brief True if request has been made */
-	bool completed;
-	/** @brief True for requests that are not going to discord (rate limits code skipped) */
-	bool non_discord;
-public:
-	/** @brief Endpoint name e.g. /api/users */
-	std::string endpoint;
-	/** @brief Major and minor parameters */
-	std::string parameters;
-	/** @brief Postdata for POST and PUT */
-	std::string postdata;
-	/** @brief HTTP method for request */
-	http_method method;
-	/** @brief Audit log reason for Discord requests, if non-empty */
-	std::string reason;
-	/** @brief Upload file name (server side) */
-	std::vector<std::string> file_name;
-	/** @brief Upload file contents (binary) */
-	std::vector<std::string> file_content;
-	/** @brief Request mime type */
-	std::string mimetype;
-	/** @brief Request headers (non-discord requests only) */
-	std::multimap<std::string, std::string> req_headers;
-	/** @brief Waiting for rate limit to expire */
-	bool waiting;
-
-	/**
-	 * @brief Constructor. When constructing one of these objects it should be passed to request_queue::post_request().
-	 * @param _endpoint The API endpoint, e.g. /api/guilds
-	 * @param _parameters Major and minor parameters for the endpoint e.g. a user id or guild id
-	 * @param completion completion event to call when done
-	 * @param _postdata Data to send in POST and PUT requests
-	 * @param method The HTTP method to use from dpp::http_method
-	 * @param audit_reason Audit log reason to send, empty to send none
-	 * @param filename The filename (server side) of any uploaded file
-	 * @param filecontent The binary content of any uploaded file for the request
-	 */
-	http_request(const std::string &_endpoint, const std::string &_parameters, http_completion_event completion, const std::string &_postdata = "", http_method method = m_get, const std::string &audit_reason = "", const std::string &filename = "", const std::string &filecontent = "");
-
-	/**
-	 * @brief Constructor. When constructing one of these objects it should be passed to request_queue::post_request().
-	 * @param _endpoint The API endpoint, e.g. /api/guilds
-	 * @param _parameters Major and minor parameters for the endpoint e.g. a user id or guild id
-	 * @param completion completion event to call when done
-	 * @param _postdata Data to send in POST and PUT requests
-	 * @param method The HTTP method to use from dpp::http_method
-	 * @param audit_reason Audit log reason to send, empty to send none
-	 * @param filename The filename (server side) of any uploaded file
-	 * @param filecontent The binary content of any uploaded file for the request
-	 */
-	http_request(const std::string &_endpoint, const std::string &_parameters, http_completion_event completion, const std::string &_postdata = "", http_method method = m_get, const std::string &audit_reason = "", const std::vector<std::string> &filename = {}, const std::vector<std::string> &filecontent = {});
-
-	/**
-	 * @brief Constructor. When constructing one of these objects it should be passed to request_queue::post_request().
-	 * @param _url Raw HTTP url
-	 * @param completion completion event to call when done
-	 * @param method The HTTP method to use from dpp::http_method
-	 * @param _postdata Data to send in POST and PUT requests
-	 * @param _mimetype POST data mime type
-	 * @param _headers HTTP headers to send
-	 */
-	http_request(const std::string &_url, http_completion_event completion, http_method method = m_get, const std::string &_postdata = "", const std::string &_mimetype = "text/plain", const std::multimap<std::string, std::string> &_headers = {});
-
-	/**
-	 * @brief Destroy the http request object
-	 */
-	~http_request();
-
-	/**
-	 * @brief Call the completion callback, if the request is complete.
-	 * @param c callback to call
-	 */
-	void complete(const http_request_completion_t &c);
-
-	/**
-	 * @brief Execute the HTTP request and mark the request complete.
-	 * @param owner creating cluster
-	 */
-	http_request_completion_t run(class cluster* owner);
-
-	/** @brief Returns true if the request is complete */
-	bool is_completed();
-};
-
-/**
- * @brief A rate limit bucket. The library builds one of these for
- * each endpoint.
- */
-struct DPP_EXPORT bucket_t {
-	/** @brief Request limit */
-	uint64_t limit;
-	/** @brief Requests remaining */
-	uint64_t remaining;
-	/** @brief Ratelimit of this bucket resets after this many seconds */
-	uint64_t reset_after;
-	/** @brief Ratelimit of this bucket can be retried after this many seconds */
-	uint64_t retry_after;
-	/** @brief Timestamp this buckets counters were updated */
-	time_t timestamp;
-};
-
-
-/**
- * @brief Represents a thread in the thread pool handling requests to HTTP(S) servers.
- * There are several of these, the total defined by a constant in queues.cpp, and each
- * one will always receive requests for the same rate limit bucket based on its endpoint
- * portion of the url. This makes rate limit handling reliable and easy to manage.
- * Each of these also has its own mutex, so that requests are less likely to block while
- * waiting for internal containers to be usable.
- */
-class DPP_EXPORT in_thread {
-private:
-	/**
-	 * @brief True if ending
-	 */
-	bool terminating;
-
-	/**
-	 * @brief Request queue that owns this in_thread
-	 */
-	class request_queue* requests;
-
-	/**
-	 * @brief The cluster that owns this in_thread
-	 */
-	class cluster* creator;
-
-	/**
-	 * @brief Inbound queue mutex thread safety
-	 */
-	std::shared_mutex in_mutex;
-
-	/**
-	 * @brief Inbound queue thread
-	 */
-	std::thread* in_thr;
-
-	/**
-	 * @brief Inbound queue condition, signalled when there are requests to fulfill
-	 */
-	std::condition_variable in_ready;
-
-	/**
-	 * @brief Ratelimit bucket counters
-	 */
-	std::map<std::string, bucket_t> buckets;
-
-	/**
-	 * @brief Queue of requests to be made
-	 */
-	std::map<std::string, std::vector<http_request*>> requests_in;
-
-	/**
-	 * @brief Inbound queue thread loop
-	 * @param index Thread index
-	 */
-	void in_loop(uint32_t index);
-public:
-	/**
-	 * @brief Construct a new in thread object
-	 * 
-	 * @param owner Owning cluster
-	 * @param req_q Owning request queue
-	 * @param index Thread index number
-	 */
-	in_thread(class cluster* owner, class request_queue* req_q, uint32_t index);
-
-	/**
-	 * @brief Destroy the in thread object
-	 * This will end the thread that is owned by this object by joining it.
-	 */
-	~in_thread();
-
-	/**
-	 * @brief Post a http_request to this thread.
-	 * 
-	 * @param req http_request to post. The pointer will be freed when it has
-	 * been executed.
-	 */
-	void post_request(http_request* req);
-};
-
-/**
- * @brief The request_queue class manages rate limits and marshalls HTTP requests that have
- * been built as http_request objects.
- * 
- * It ensures asynchronous delivery of events and queueing of requests.
- *
- * It will spawn two threads, one to make outbound HTTP requests and push the returned
- * results into a queue, and the second to call the callback methods with these results.
- * They are separated so that if the user decides to take a long time processing a reply
- * in their callback it won't affect when other requests are sent, and if a HTTP request
- * takes a long time due to latency, it won't hold up user processing.
- *
- * There are usually two request_queue objects in each dpp::cluster, one of which is used
- * internally for the various REST methods to Discord such as sending messages, and the other
- * used to support user REST calls via dpp::cluster::request().
- */
-class DPP_EXPORT request_queue {
-protected:
-	/**
-	 * @brief Required so in_thread can access these member variables
-	 */
-	friend class in_thread;
-
-	/**
-	 * @brief The cluster that owns this request_queue
-	 */
-	class cluster* creator;
-
-	/**
-	 * @brief Outbound queue mutex thread safety
-	 */
-	std::shared_mutex out_mutex;
-
-	/**
-	 * @brief Outbound queue thread
-	 * Note that although there are many 'in queues', which handle the HTTP requests,
-	 * there is only ever one 'out queue' which dispatches the results to the caller.
-	 * This is to simplify thread management in bots that use the library, as less mutexing
-	 * and thread safety boilerplate is required.
-	 */
-	std::thread* out_thread;
-
-	/**
-	 * @brief Outbound queue condition, signalled when there are requests completed to call callbacks for
-	 */
-	std::condition_variable out_ready;
-
-	/**
-	 * @brief Completed requests queue
-	 */
-	std::queue<std::pair<http_request_completion_t*, http_request*>> responses_out;
-
-	/**
-	 * @brief A vector of inbound request threads forming a pool.
-	 * There are a set number of these defined by a constant in queues.cpp. A request is always placed
-	 * on the same element in this vector, based upon its url, so that two conditions are satisfied:
-	 * 1) Any requests for the same ratelimit bucket are handled by the same thread in the pool so that
-	 * they do not create unnecessary 429 errors,
-	 * 2) Requests for different endpoints go into different buckets, so that they may be requested in parallel
-	 * A global ratelimit event pauses all threads in the pool. These are few and far between.
-	 */
-	std::vector<in_thread*> requests_in;
-
-	/**
-	 * @brief Completed requests to delete
-	 */
-	std::multimap<time_t, std::pair<http_request_completion_t*, http_request*>> responses_to_delete;
-
-	/**
-	 * @brief Set to true if the threads should terminate
-	 */
-	bool terminating;
-
-	/**
-	 * @brief True if globally rate limited - makes the entire request thread wait
-	 */
-	bool globally_ratelimited;
-
-	/**
-	 * @brief How many seconds we are globally rate limited for, if globally_ratelimited is true
-	 */
-	uint64_t globally_limited_for;
-
-	/**
-	 * @brief Number of request threads in the thread pool
-	 */
-	uint32_t in_thread_pool_size;
-
-	/**
-	 * @brief Outbound queue thread loop
-	 */
-	void out_loop();
-public:
-
-	/**
-	 * @brief constructor
-	 * @param owner The creating cluster.
-	 * @param request_threads The number of http request threads to allocate to the threadpool.
-	 * By default eight threads are allocated.
-	 * Side effects: Creates threads for the queue
-	 */
-	request_queue(class cluster* owner, uint32_t request_threads = 8);
-
-	/**
-	 * @brief Add more request threads to the library at runtime.
-	 * @note You should do this at a quiet time when there are few requests happening.
-	 * This will reorganise the hashing used to place requests into the thread pool so if you do
-	 * this while the bot is busy there is a small chance of receiving "429 rate limited" errors.
-	 * @param request_threads Number of threads to add. It is not possible to scale down at runtime.
-	 * @return reference to self
-	 */
-	request_queue& add_request_threads(uint32_t request_threads);
-
-	/**
-	 * @brief Get the request thread count
-	 * @return uint32_t number of request threads that are active
-	 */
-	uint32_t get_request_thread_count() const;
-
-	/**
-	 * @brief Destroy the request queue object.
-	 * Side effects: Joins and deletes queue threads
-	 */
-	~request_queue();
-
-	/**
-	 * @brief Put a http_request into the request queue. You should ALWAYS "new" an object
-	 * to pass to here -- don't submit an object that's on the stack!
-	 * @note Will use a simple hash function to determine which of the 'in queues' to place
-	 * this request onto.
-	 * @param req request to add
-	 * @return reference to self
-	 */
-	request_queue& post_request(http_request *req);
-
-	/**
-	 * @brief Returns true if the bot is currently globally rate limited
-	 * @return true if globally rate limited
-	 */
-	bool is_globally_ratelimited() const;
-};
-
-};
+/************************************************************************************
+ *
+ * D++, A Lightweight C++ library for Discord
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright 2021 Craig Edwards and D++ contributors 
+ * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ************************************************************************************/
+#pragma once
+#include <dpp/export.h>
+#include <unordered_map>
+#include <string>
+#include <queue>
+#include <map>
+#include <shared_mutex>
+#include <memory>
+#include <vector>
+#include <functional>
+#include <atomic>
+#include <condition_variable>		
+#include <dpp/httpsclient.h>
+
+namespace dpp {
+
+/**
+ * @brief Error values. Most of these are currently unused in https_client.
+ */
+enum http_error : uint8_t {
+	/**
+	 * @brief Request successful.
+	 */
+	h_success = 0,
+
+	/**
+	 * @brief Status unknown.
+	 */
+	h_unknown,
+
+	/**
+	 * @brief Connect failed.
+	 */
+	h_connection,
+
+	/**
+	 * @brief Invalid local ip address.
+	 */
+	h_bind_ip_address,
+
+	/**
+	 * @brief Read error.
+	 */
+	h_read,
+
+	/**
+	 * @brief Write error.
+	 */
+	h_write,
+
+	/**
+	 * @brief Too many 30x redirects.
+	 */
+	h_exceed_redirect_count,
+
+	/**
+	 * @brief Request cancelled.
+	 */
+	h_canceled,
+
+	/**
+	 * @brief SSL connection error.
+	 */
+	h_ssl_connection,
+
+	/**
+	 * @brief SSL cert loading error.
+	 */
+	h_ssl_loading_certs,
+
+	/**
+	 * @brief SSL server verification error.
+	 */
+	h_ssl_server_verification,
+
+	/**
+	 * @brief Unsupported multipart boundary characters.
+	 */
+	h_unsupported_multipart_boundary_chars,
+
+	/**
+	 * @brief Compression error.
+	 */
+	h_compression,
+};
+
+/**
+ * @brief The result of any HTTP request. Contains the headers, vital
+ * rate limit figures, and returned request body.
+ */
+struct DPP_EXPORT http_request_completion_t {
+	/**
+	 * @brief HTTP headers of response.
+	 */
+	std::multimap<std::string, std::string> headers;
+
+	/**
+	 * @brief HTTP status.
+	 * e.g. 200 = OK, 404 = Not found, 429 = Rate limited, etc.
+	 */
+	uint16_t status = 0;
+
+	/**
+	 * @brief Error status.
+	 * e.g. if the request could not connect at all.
+	 */
+	http_error error = h_success;
+
+	/**
+	 * @brief Ratelimit bucket.
+	 */
+	std::string ratelimit_bucket;
+
+	/**
+	 * @brief Ratelimit limit of requests.
+	 */
+	uint64_t ratelimit_limit = 0;
+
+	/**
+	 * @brief Ratelimit remaining requests.
+	 */
+	uint64_t ratelimit_remaining = 0;
+
+	/**
+	 * @brief Ratelimit reset after (seconds).
+	 */
+	uint64_t ratelimit_reset_after = 0;
+
+	/**
+	 * @brief Ratelimit retry after (seconds).
+	 */
+	uint64_t ratelimit_retry_after = 0;
+
+	/**
+	 * @brief True if this request has caused us to be globally rate limited.
+	 */
+	bool ratelimit_global = false;
+
+	/**
+	 * @brief Reply body.
+	 */
+	std::string body;
+
+	/**
+	 * @brief Ping latency.
+	 */
+	double latency;
+};
+
+/**
+ * @brief Results of HTTP requests are called back to these std::function types.
+ *
+ * @note Returned http_completion_events are called ASYNCHRONOUSLY in your
+ * code which means they execute in a separate thread, results for the requests going
+ * into a dpp::thread_pool. Completion events may not arrive in order depending on if
+ * one request takes longer than another. Using the callbacks or using coroutines
+ * correctly ensures that the order they arrive in the queue does not negatively affect
+ * your code.
+ */
+typedef std::function<void(const http_request_completion_t&)> http_completion_event;
+
+/** 
+ * @brief Various types of http method supported by the Discord API
+ */
+enum http_method {
+	/**
+	 * @brief GET.
+	 */
+	m_get,
+
+	/**
+	 * @brief POST.
+	 */
+	m_post,
+
+	/**
+	 * @brief PUT.
+	 */
+	m_put,
+
+	/**
+	 * @brief PATCH.
+	 */
+	m_patch,
+
+	/**
+	 * @brief DELETE.
+	 */
+	m_delete
+};
+
+/**
+ * @brief A HTTP request.
+ * 
+ * You should instantiate one of these objects via its constructor,
+ * and pass a pointer to it into an instance of request_queue. Although you can
+ * directly call the run() method of the object and it will make a HTTP call, be
+ * aware that if you do this, it will be a **BLOCKING call** (not asynchronous) and
+ * will not respect rate limits, as both of these functions are managed by the
+ * request_queue class.
+ */
+class DPP_EXPORT http_request {
+	/**
+	 * @brief Completion callback.
+	 */
+	http_completion_event complete_handler;
+
+	/**
+	 * @brief True if request has been made.
+	 */
+	std::atomic<bool> completed;
+
+	/**
+	 * @brief True for requests that are not going to discord (rate limits code skipped).
+	 */
+	bool non_discord;
+
+	/**
+	 * @brief Client mutex
+	 */
+	std::mutex cli_mutex;
+
+	/**
+	 * @brief HTTPS client
+	 */
+	std::unique_ptr<https_client> cli;
+
+	/**
+	 * @brief Mutex for this_captured_signal and this_captured
+	 */
+	std::mutex this_captured_mutex;
+
+	/**
+	 * @brief Condition variable to signal this is no longer captured by an ongoing lambda
+	 */
+	std::condition_variable this_captured_signal;
+
+
+	/**
+	 * @brief True if this is currently captured in a lambda and cannot be deleted
+	 */
+	bool this_captured{false};
+
+public:
+	/**
+	 * @brief Endpoint name
+	 * e.g. /api/users.
+	 */
+	std::string endpoint;
+
+	/**
+	 * @brief Major and minor parameters.
+	 */
+	std::string parameters;
+
+	/**
+	 * @brief Postdata for POST and PUT.
+	 */
+	std::string postdata;
+
+	/**
+	 * @brief HTTP method for request.
+	 */
+	http_method method;
+
+	/**
+	 * @brief Audit log reason for Discord requests, if non-empty.
+	 */
+	std::string reason;
+
+	/**
+	 * @brief Upload file name (server side).
+	 */
+	std::vector<std::string> file_name;
+
+	/**
+	 * @brief Upload file contents (binary).
+	 */
+	std::vector<std::string> file_content;
+
+	/**
+	 * @brief Upload file mime types.
+	 * application/octet-stream if unspecified.
+	 */
+	std::vector<std::string> file_mimetypes;
+
+	/**
+	 * @brief Request mime type.
+	 */
+	std::string mimetype;
+
+	/**
+	 * @brief Request headers (non-discord requests only).
+	 */
+	std::multimap<std::string, std::string> req_headers;
+
+	/**
+	 * @brief Waiting for rate limit to expire.
+	 */
+	bool waiting;
+
+	/**
+	 * @brief HTTP protocol.
+	 */
+	std::string protocol;
+
+	/**
+	 * @brief Constructor. When constructing one of these objects it should be passed to request_queue::post_request().
+	 * @param _endpoint The API endpoint, e.g. /api/guilds
+	 * @param _parameters Major and minor parameters for the endpoint e.g. a user id or guild id
+	 * @param completion completion event to call when done
+	 * @param _postdata Data to send in POST and PUT requests
+	 * @param method The HTTP method to use from dpp::http_method
+	 * @param audit_reason Audit log reason to send, empty to send none
+	 * @param filename The filename (server side) of any uploaded file
+	 * @param filecontent The binary content of any uploaded file for the request
+	 * @param filemimetype The MIME type of any uploaded file for the request
+	 * @param http_protocol HTTP protocol
+	 */
+	http_request(const std::string &_endpoint, const std::string &_parameters, http_completion_event completion, const std::string &_postdata = "", http_method method = m_get, const std::string &audit_reason = "", const std::string &filename = "", const std::string &filecontent = "", const std::string &filemimetype = "", const std::string &http_protocol = "1.1");
+
+	/**
+	 * @brief Constructor. When constructing one of these objects it should be passed to request_queue::post_request().
+	 * @param _endpoint The API endpoint, e.g. /api/guilds
+	 * @param _parameters Major and minor parameters for the endpoint e.g. a user id or guild id
+	 * @param completion completion event to call when done
+	 * @param _postdata Data to send in POST and PUT requests
+	 * @param method The HTTP method to use from dpp::http_method
+	 * @param audit_reason Audit log reason to send, empty to send none
+	 * @param filename The filename (server side) of any uploaded file
+	 * @param filecontent The binary content of any uploaded file for the request
+	 * @param filemimetypes The MIME type of any uploaded file for the request
+	 * @param http_protocol HTTP protocol
+	 */
+	http_request(const std::string &_endpoint, const std::string &_parameters, http_completion_event completion, const std::string &_postdata = "", http_method method = m_get, const std::string &audit_reason = "", const std::vector<std::string> &filename = {}, const std::vector<std::string> &filecontent = {}, const std::vector<std::string> &filemimetypes = {}, const std::string &http_protocol = "1.1");
+
+	/**
+	 * @brief Constructor. When constructing one of these objects it should be passed to request_queue::post_request().
+	 * @param _url Raw HTTP url
+	 * @param completion completion event to call when done
+	 * @param method The HTTP method to use from dpp::http_method
+	 * @param _postdata Data to send in POST and PUT requests
+	 * @param _mimetype POST data mime type
+	 * @param _headers HTTP headers to send
+	 * @param http_protocol HTTP protocol
+	 */
+	http_request(const std::string &_url, http_completion_event completion, http_method method = m_get, const std::string &_postdata = "", const std::string &_mimetype = "text/plain", const std::multimap<std::string, std::string> &_headers = {}, const std::string &http_protocol = "1.1");
+
+	/**
+	 * @brief Destroy the http request object
+	 */
+	~http_request();
+
+	/**
+	 * @brief Call the completion callback, if the request is complete.
+	 * @param c callback to call
+	 */
+	void complete(const http_request_completion_t &c);
+
+	/**
+	 * @brief Execute the HTTP request and mark the request complete.
+	 * @param processor Request concurrency queue this request was created by
+	 * @param owner creating cluster
+	 */
+	http_request_completion_t run(class request_concurrency_queue* processor, class cluster* owner);
+
+	/**
+	 * @brief Returns true if the request is complete
+	 * @return True if completed
+	 * */
+	bool is_completed();
+
+	/**
+	 * @brief Get the HTTPS client used to perform this request, or nullptr if there is none
+	 * @return https_client object
+	 */
+	https_client* get_client() const;
+};
+
+/**
+ * @brief A rate limit bucket. The library builds one of these for
+ * each endpoint.
+ */
+struct DPP_EXPORT bucket_t {
+	/**
+	 * @brief Request limit.
+	 */
+	uint64_t limit;
+
+	/**
+	 * @brief Requests remaining.
+	 */
+	uint64_t remaining;
+
+	/**
+	 * @brief Rate-limit of this bucket resets after this many seconds.
+	 */
+	uint64_t reset_after;
+
+	/**
+	 * @brief Rate-limit of this bucket can be retried after this many seconds.
+	 */
+	uint64_t retry_after;
+
+	/**
+	 * @brief Timestamp this buckets counters were updated.
+	 */
+	time_t timestamp;
+};
+
+
+/**
+ * @brief Represents a timer instance in a pool handling requests to HTTP(S) servers.
+ * There are several of these, the total defined by a constant in cluster.cpp, and each
+ * one will always receive requests for the same rate limit bucket based on its endpoint
+ * portion of the url. This makes rate limit handling reliable and easy to manage.
+ * Each of these also has its own mutex, making it thread safe to call and use these
+ * from anywhere in the code.
+ */
+class DPP_EXPORT request_concurrency_queue {
+public:
+	/**
+	 * @brief Queue index
+	 */
+	int in_index{0};
+
+	/**
+	 * @brief True if ending.
+	 */
+	std::atomic<bool> terminating;
+
+	/**
+	 * @brief Request queue that owns this request_concurrency_queue.
+	 */
+	class request_queue* requests;
+
+	/**
+	 * @brief The cluster that owns this request_concurrency_queue.
+	 */
+	class cluster* creator;
+
+	/**
+	 * @brief Inbound queue mutex thread safety.
+	 */
+	std::shared_mutex in_mutex;
+
+	/**
+	 * @brief Removals queue mutex thread safety.
+	 */
+	std::mutex	rem_mutex;
+
+	/**
+	 * @brief Inbound queue timer. The timer is called every second,
+	 * and when it wakes up it checks for requests pending to be sent in the queue.
+	 * If there are any requests and we are not waiting on rate limit, it will send them,
+	 * else it will wait for the rate limit to expire.
+	 */
+	dpp::timer in_timer;
+
+	/**
+	 * @brief Rate-limit bucket counters.
+	 */
+	std::map<std::string, bucket_t> buckets;
+
+	/**
+	 * @brief Queue of requests to be made. Sorted by http_request::endpoint.
+	 */
+	std::vector<std::unique_ptr<http_request>> requests_in;
+
+	/**
+	 * @brief Requests to remove after a set amount of time has passed
+	 */
+	std::vector<std::unique_ptr<http_request>> removals;
+
+	/**
+	 * @brief Timer callback
+	 * @param index Index ID for this timer
+	 */
+	void tick_and_deliver_requests(uint32_t index);
+
+	/**
+	 * @brief Construct a new concurrency queue object
+	 * 
+	 * @param owner Owning cluster
+	 * @param req_q Owning request queue
+	 * @param index Queue index number, uniquely identifies this queue for hashing
+	 */
+	request_concurrency_queue(class cluster* owner, class request_queue* req_q, uint32_t index);
+
+	/**
+	 * @brief Destroy the concurrency queue object
+	 * This will stop the timer.
+	 */
+	~request_concurrency_queue();
+
+	/**
+	 * @brief Flags the queue as terminating
+	 * This will set the internal atomic bool that indicates this queue is to accept no more requests
+	 */
+	void terminate();
+
+	/**
+	 * @brief Post a http_request to this queue.
+	 * 
+	 * @param req http_request to post. The pointer will be freed when it has
+	 * been executed.
+	 */
+	void post_request(std::unique_ptr<http_request> req);
+};
+
+/**
+ * @brief The request_queue class manages rate limits and marshalls HTTP requests that have
+ * been built as http_request objects.
+ * 
+ * It ensures asynchronous delivery of events and queueing of requests.
+ *
+ * It will spawn multiple timers to make outbound HTTP requests and then call the callbacks
+ * of those requests on completion within the dpp::thread_pool for the cluster.
+ * If the user decides to take a long time processing a reply in their callback it won't affect
+ * when other requests are sent, and if a HTTP request takes a long time due to latency, it won't
+ * hold up user processing.
+ *
+ * There are usually two request_queue objects in each dpp::cluster, one of which is used
+ * internally for the various REST methods to Discord such as sending messages, and the other
+ * used to support user REST calls via dpp::cluster::request(). They are separated so that the
+ * one for user requests can be specifically configured to never ever send the Discord token
+ * unless it is explicitly placed into the request, for security reasons.
+ */
+class DPP_EXPORT request_queue {
+public:
+	/**
+	 * @brief Required so request_concurrency_queue can access these member variables
+	 */
+	friend class request_concurrency_queue;
+
+	/**
+	 * @brief The cluster that owns this request_queue
+	 */
+	class cluster* creator;
+
+	/**
+	 * @brief A completed request. Contains both the request and the response
+	 */
+	struct completed_request {
+		/**
+		 * @brief Request sent
+		 */
+		std::unique_ptr<http_request> request;
+
+		/**
+		 * @brief Response to the request
+		 */
+		std::unique_ptr<http_request_completion_t> response;
+	};
+
+	/**
+	 * @brief A vector of timers forming a pool.
+	 *
+	 * There are a set number of these defined by a constant in cluster.cpp. A request is always placed
+	 * on the same element in this vector, based upon its url, so that two conditions are satisfied:
+	 *
+	 * 1) Any requests for the same ratelimit bucket are handled by the same concurrency queue in the pool so that
+	 * they do not create unnecessary 429 errors,
+	 * 2) Requests for different endpoints go into different buckets, so that they may be requested in parallel
+	 * A global ratelimit event pauses all timers in the pool. These are few and far between.
+	 */
+	std::vector<std::unique_ptr<request_concurrency_queue>> requests_in;
+
+	/**
+	 * @brief Set to true if the timers should terminate.
+	 * When this is set to true no further requests are accepted to the queues.
+	 */
+	std::atomic<bool> terminating;
+
+	/**
+	 * @brief True if globally rate limited
+	 *
+	 * When globally rate limited the concurrency queues associated with this request queue
+	 * will not process any requests in their timers until the global rate limit expires.
+	 */
+	std::atomic<bool> globally_ratelimited;
+
+	/**
+	 * @brief When we are globally rate limited until (unix epoch)
+	 *
+	 * @note Only valid if globally_rate limited is true. If we are globally rate limited,
+	 * queues in this class will not process requests until the current unix epoch time
+	 * is greater than this time.
+	 */
+	time_t globally_limited_until;
+
+	/**
+	 * @brief Number of request queues in the pool. This is the direct size of the requests_in
+	 * vector.
+	 */
+	uint32_t in_queue_pool_size;
+
+	/**
+	 * @brief constructor
+	 * @param owner The creating cluster.
+	 * @param request_concurrency The number of http request queues to allocate.
+	 * Each request queue is a dpp::timer which ticks every second looking for new
+	 * requests to run. The timer will hold back requests if we are waiting as to comply
+	 * with rate limits. Adding a request to this class will cause the queue it is placed in
+	 * to run immediately but this cannot override rate limits.
+	 * By default eight concurrency queues are allocated.
+	 * Side effects: Creates timers for the queue
+	 */
+	request_queue(class cluster* owner, uint32_t request_concurrency = 8);
+
+	/**
+	 * @brief Get the request queue concurrency count
+	 * @return uint32_t number of request queues that are active
+	 */
+	uint32_t get_request_queue_count() const;
+
+	/**
+	 * @brief Destroy the request queue object.
+	 * Side effects: Ends and deletes concurrency timers
+	 */
+	~request_queue();
+
+	/**
+	 * @brief Put a http_request into the request queue.
+	 * @note Will use a simple hash function to determine which of the 'in queues' to place
+	 * this request onto.
+	 * @param req request to add
+	 * @return reference to self
+	 */
+	request_queue& post_request(std::unique_ptr<http_request> req);
+
+	/**
+	 * @brief Returns true if the bot is currently globally rate limited
+	 * @return true if globally rate limited
+	 */
+	bool is_globally_ratelimited() const;
+
+	/**
+	 * @brief Returns the number of active requests on this queue
+	 * @return Total number of active requests
+	 */
+	size_t get_active_request_count() const;
+};
+
+}
diff --git a/3rdParty/dpp/restrequest.h b/3rdParty/dpp/restrequest.h
index f97f070684..4c62b8c028 100644
--- a/3rdParty/dpp/restrequest.h
+++ b/3rdParty/dpp/restrequest.h
@@ -1,205 +1,296 @@
-/************************************************************************************
- *
- * D++, A Lightweight C++ library for Discord
- *
- * Copyright 2022 Craig Edwards and D++ contributors
- * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- ************************************************************************************/
-#pragma once
-#include <dpp/export.h>
-#include <dpp/snowflake.h>
-#include <dpp/cluster.h>
-#include <dpp/invite.h>
-#include <dpp/nlohmann/json_fwd.hpp>
-
-namespace dpp {
-
-/**
- * @brief Templated REST request helper to save on typing
- * 
- * @tparam T type to return in lambda callback
- * @param c calling cluster
- * @param basepath base path for API call
- * @param major major API function
- * @param minor minor API function
- * @param method HTTP method
- * @param postdata Post data or empty string
- * @param callback Callback lambda
- */
-template<class T> inline void rest_request(dpp::cluster* c, const char* basepath, const std::string &major, const std::string &minor, http_method method, const std::string& postdata, command_completion_event_t callback) {
-	c->post_rest(basepath, major, minor, method, postdata, [c, callback](json &j, const http_request_completion_t& http) {
-		if (callback) {
-			callback(confirmation_callback_t(c, T().fill_from_json(&j), http));
-		}
-	});
-};
-
-/**
- * @brief Templated REST request helper to save on typing (specialised for message)
- * 
- * @tparam T type to return in lambda callback
- * @param c calling cluster
- * @param basepath base path for API call
- * @param major major API function
- * @param minor minor API function
- * @param method HTTP method
- * @param postdata Post data or empty string
- * @param callback Callback lambda
- */
-template<> inline void rest_request<message>(dpp::cluster* c, const char* basepath, const std::string &major, const std::string &minor, http_method method, const std::string& postdata, command_completion_event_t callback) {
-	c->post_rest(basepath, major, minor, method, postdata, [c, callback](json &j, const http_request_completion_t& http) {
-		if (callback) {
-			callback(confirmation_callback_t(c, message(c).fill_from_json(&j), http));
-		}
-	});
-};
-
-/**
- * @brief Templated REST request helper to save on typing (specialised for confirmation)
- * 
- * @tparam T type to return in lambda callback
- * @param c calling cluster
- * @param basepath base path for API call
- * @param major major API function
- * @param minor minor API function
- * @param method HTTP method
- * @param postdata Post data or empty string
- * @param callback Callback lambda
- */
-template<> inline void rest_request<confirmation>(dpp::cluster* c, const char* basepath, const std::string &major, const std::string &minor, http_method method, const std::string& postdata, command_completion_event_t callback) {
-	c->post_rest(basepath, major, minor, method, postdata, [c, callback](json &j, const http_request_completion_t& http) {
-		if (callback) {
-			callback(confirmation_callback_t(c, confirmation(), http));
-		}
-	});
-};
-
-/**
- * @brief Templated REST request helper to save on typing (for returned lists)
- *  
- * @tparam T singular type to return in lambda callback
- * @tparam T map type to return in lambda callback
- * @param c calling cluster
- * @param basepath base path for API call
- * @param major major API function
- * @param minor minor API function
- * @param method HTTP method
- * @param postdata Post data or empty string
- * @param key Key name of elements in the json list
- * @param callback Callback lambda
- */
-template<class T> inline void rest_request_list(dpp::cluster* c, const char* basepath, const std::string &major, const std::string &minor, http_method method, const std::string& postdata, command_completion_event_t callback, const std::string& key = "id") {
-	c->post_rest(basepath, major, minor, method, postdata, [c, key, callback](json &j, const http_request_completion_t& http) {
-		std::unordered_map<snowflake, T> list;
-		confirmation_callback_t e(c, confirmation(), http);
-		if (!e.is_error()) {
-			for (auto & curr_item : j) {
-				list[snowflake_not_null(&curr_item, key.c_str())] = T().fill_from_json(&curr_item);
-			}
-		}
-		if (callback) {
-			callback(confirmation_callback_t(c, list, http));
-		}
-	});
-}
-
-/**
- * @brief Templated REST request helper to save on typing (for returned lists, specialised for invites)
- *  
- * @tparam T singular type to return in lambda callback
- * @tparam T map type to return in lambda callback
- * @param c calling cluster
- * @param basepath base path for API call
- * @param major major API function
- * @param minor minor API function
- * @param method HTTP method
- * @param postdata Post data or empty string
- * @param key Key name of elements in the json list
- * @param callback Callback lambda
- */
-template<> inline void rest_request_list<invite>(dpp::cluster* c, const char* basepath, const std::string &major, const std::string &minor, http_method method, const std::string& postdata, command_completion_event_t callback, const std::string& key) {
-	c->post_rest(basepath, major, minor, method, postdata, [c, callback](json &j, const http_request_completion_t& http) {
-		std::unordered_map<std::string, invite> list;
-		confirmation_callback_t e(c, confirmation(), http);
-		if (!e.is_error()) {
-			for (auto & curr_item : j) {
-				list[string_not_null(&curr_item, "code")] = invite().fill_from_json(&curr_item);
-			}
-		}
-		if (callback) {
-			callback(confirmation_callback_t(c, list, http));
-		}
-	});
-}
-/**
- * @brief Templated REST request helper to save on typing (for returned lists, specialised for voiceregions)
- *  
- * @tparam T singular type to return in lambda callback
- * @tparam T map type to return in lambda callback
- * @param c calling cluster
- * @param basepath base path for API call
- * @param major major API function
- * @param minor minor API function
- * @param method HTTP method
- * @param postdata Post data or empty string
- * @param key Key name of elements in the json list
- * @param callback Callback lambda
- */
-template<> inline void rest_request_list<voiceregion>(dpp::cluster* c, const char* basepath, const std::string &major, const std::string &minor, http_method method, const std::string& postdata, command_completion_event_t callback, const std::string& key) {
-	c->post_rest(basepath, major, minor, method, postdata, [c, callback](json &j, const http_request_completion_t& http) {
-		std::unordered_map<std::string, voiceregion> list;
-		confirmation_callback_t e(c, confirmation(), http);
-		if (!e.is_error()) {
-			for (auto & curr_item : j) {
-				list[string_not_null(&curr_item, "id")] = voiceregion().fill_from_json(&curr_item);
-			}
-		}
-		if (callback) {
-			callback(confirmation_callback_t(c, list, http));
-		}
-	});
-}
-
-/**
- * @brief Templated REST request helper to save on typing (for returned vectors)
- *
- * @tparam T singular type to return in lambda callback
- * @tparam T vector type to return in lambda callback
- * @param c calling cluster
- * @param basepath base path for API call
- * @param major major API function
- * @param minor minor API function
- * @param method HTTP method
- * @param postdata Post data or empty string
- * @param callback Callback lambda
- */
-template<class T> inline void rest_request_vector(dpp::cluster* c, const char* basepath, const std::string &major, const std::string &minor, http_method method, const std::string& postdata, command_completion_event_t callback) {
-	c->post_rest(basepath, major, minor, method, postdata, [c, callback](json &j, const http_request_completion_t& http) {
-		std::vector<T> list;
-		confirmation_callback_t e(c, confirmation(), http);
-		if (!e.is_error()) {
-			for (auto & curr_item : j) {
-				list.push_back(T().fill_from_json(&curr_item));
-			}
-		}
-		if (callback) {
-			callback(confirmation_callback_t(c, list, http));
-		}
-	});
-}
-
-
-};
\ No newline at end of file
+/************************************************************************************
+ *
+ * D++, A Lightweight C++ library for Discord
+ *
+ * Copyright 2022 Craig Edwards and D++ contributors
+ * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ************************************************************************************/
+#pragma once
+#include <dpp/export.h>
+#include <dpp/snowflake.h>
+#include <dpp/cluster.h>
+#include <dpp/invite.h>
+#include <dpp/json_fwd.h>
+
+namespace dpp {
+
+/**
+ * @brief Templated REST request helper to save on typing
+ * 
+ * @tparam T type to return in lambda callback
+ * @param c calling cluster
+ * @param basepath base path for API call
+ * @param major major API function
+ * @param minor minor API function
+ * @param method HTTP method
+ * @param postdata Post data or empty string
+ * @param callback Callback lambda
+ */
+template<class T> inline void rest_request(dpp::cluster* c, const char* basepath, const std::string &major, const std::string &minor, http_method method, const std::string& postdata, command_completion_event_t callback) {
+	c->post_rest(basepath, major, minor, method, postdata, [c, callback](json &j, const http_request_completion_t& http) {
+		if (callback) {
+			callback(confirmation_callback_t(c, T().fill_from_json(&j), http));
+		}
+	});
+};
+
+/**
+ * @brief Templated REST request helper to save on typing (specialised for message)
+ * 
+ * @tparam T type to return in lambda callback
+ * @param c calling cluster
+ * @param basepath base path for API call
+ * @param major major API function
+ * @param minor minor API function
+ * @param method HTTP method
+ * @param postdata Post data or empty string
+ * @param callback Callback lambda
+ */
+template<> inline void rest_request<message>(dpp::cluster* c, const char* basepath, const std::string &major, const std::string &minor, http_method method, const std::string& postdata, command_completion_event_t callback) {
+	c->post_rest(basepath, major, minor, method, postdata, [c, callback](json &j, const http_request_completion_t& http) {
+		if (callback) {
+			callback(confirmation_callback_t(c, message(c).fill_from_json(&j), http));
+		}
+	});
+};
+
+/**
+ * @brief Templated REST request helper to save on typing (specialised for confirmation)
+ * 
+ * @tparam T type to return in lambda callback
+ * @param c calling cluster
+ * @param basepath base path for API call
+ * @param major major API function
+ * @param minor minor API function
+ * @param method HTTP method
+ * @param postdata Post data or empty string
+ * @param callback Callback lambda
+ */
+template<> inline void rest_request<confirmation>(dpp::cluster* c, const char* basepath, const std::string &major, const std::string &minor, http_method method, const std::string& postdata, command_completion_event_t callback) {
+	c->post_rest(basepath, major, minor, method, postdata, [c, callback](json &j, const http_request_completion_t& http) {
+		if (callback) {
+			callback(confirmation_callback_t(c, confirmation(), http));
+		}
+	});
+};
+
+/**
+ * @brief Templated REST request helper to save on typing (for returned lists)
+ *  
+ * @tparam T singular type to return in lambda callback
+ * @tparam T map type to return in lambda callback
+ * @param c calling cluster
+ * @param basepath base path for API call
+ * @param major major API function
+ * @param minor minor API function
+ * @param method HTTP method
+ * @param postdata Post data or empty string
+ * @param key Key name of elements in the json list
+ * @param callback Callback lambda
+ */
+template<class T> inline void rest_request_list(dpp::cluster* c, const char* basepath, const std::string &major, const std::string &minor, http_method method, const std::string& postdata, command_completion_event_t callback, const std::string& key = "id") {
+	c->post_rest(basepath, major, minor, method, postdata, [c, key, callback](json &j, const http_request_completion_t& http) {
+		std::unordered_map<snowflake, T> list;
+		confirmation_callback_t e(c, confirmation(), http);
+		if (!e.is_error()) {
+			for (auto & curr_item : j) {
+				list[snowflake_not_null(&curr_item, key.c_str())] = T().fill_from_json(&curr_item);
+			}
+		}
+		if (callback) {
+			callback(confirmation_callback_t(c, list, http));
+		}
+	});
+}
+
+/**
+ * @brief Templated REST request helper to save on typing (for returned lists, specialised for invites)
+ *  
+ * @tparam T singular type to return in lambda callback
+ * @tparam T map type to return in lambda callback
+ * @param c calling cluster
+ * @param basepath base path for API call
+ * @param major major API function
+ * @param minor minor API function
+ * @param method HTTP method
+ * @param postdata Post data or empty string
+ * @param key Key name of elements in the json list
+ * @param callback Callback lambda
+ */
+template<> inline void rest_request_list<invite>(dpp::cluster* c, const char* basepath, const std::string &major, const std::string &minor, http_method method, const std::string& postdata, command_completion_event_t callback, const std::string& key) {
+	c->post_rest(basepath, major, minor, method, postdata, [c, callback](json &j, const http_request_completion_t& http) {
+		invite_map list;
+		confirmation_callback_t e(c, confirmation(), http);
+		if (!e.is_error()) {
+			for (auto & curr_item : j) {
+				list[string_not_null(&curr_item, "code")] = invite().fill_from_json(&curr_item);
+			}
+		}
+		if (callback) {
+			callback(confirmation_callback_t(c, list, http));
+		}
+	});
+}
+
+/**
+ * @brief Templated REST request helper to save on typing (for returned lists, specialised for voiceregions)
+ *  
+ * @tparam T singular type to return in lambda callback
+ * @tparam T map type to return in lambda callback
+ * @param c calling cluster
+ * @param basepath base path for API call
+ * @param major major API function
+ * @param minor minor API function
+ * @param method HTTP method
+ * @param postdata Post data or empty string
+ * @param key Key name of elements in the json list
+ * @param callback Callback lambda
+ */
+template<> inline void rest_request_list<voiceregion>(dpp::cluster* c, const char* basepath, const std::string &major, const std::string &minor, http_method method, const std::string& postdata, command_completion_event_t callback, const std::string& key) {
+	c->post_rest(basepath, major, minor, method, postdata, [c, callback](json &j, const http_request_completion_t& http) {
+		voiceregion_map list;
+		confirmation_callback_t e(c, confirmation(), http);
+		if (!e.is_error()) {
+			for (auto & curr_item : j) {
+				list[string_not_null(&curr_item, "id")] = voiceregion().fill_from_json(&curr_item);
+			}
+		}
+		if (callback) {
+			callback(confirmation_callback_t(c, list, http));
+		}
+	});
+}
+
+/**
+ * @brief Templated REST request helper to save on typing (for returned lists, specialised for bans)
+ *
+ * @tparam T singular type to return in lambda callback
+ * @tparam T map type to return in lambda callback
+ * @param c calling cluster
+ * @param basepath base path for API call
+ * @param major major API function
+ * @param minor minor API function
+ * @param method HTTP method
+ * @param postdata Post data or empty string
+ * @param key Key name of elements in the json list
+ * @param callback Callback lambda
+ */
+template<> inline void rest_request_list<ban>(dpp::cluster* c, const char* basepath, const std::string &major, const std::string &minor, http_method method, const std::string& postdata, command_completion_event_t callback, const std::string& key) {
+	c->post_rest(basepath, major, minor, method, postdata, [c, callback](json &j, const http_request_completion_t& http) {
+		std::unordered_map<snowflake, ban> list;
+		confirmation_callback_t e(c, confirmation(), http);
+		if (!e.is_error()) {
+			for (auto & curr_item : j) {
+				ban curr_ban = ban().fill_from_json(&curr_item);
+				list[curr_ban.user_id] = curr_ban;
+			}
+		}
+		if (callback) {
+			callback(confirmation_callback_t(c, list, http));
+		}
+	});
+}
+
+/**
+ * @brief Templated REST request helper to save on typing (for returned lists, specialised for sticker packs)
+ *
+ * @tparam T singular type to return in lambda callback
+ * @tparam T map type to return in lambda callback
+ * @param c calling cluster
+ * @param basepath base path for API call
+ * @param major major API function
+ * @param minor minor API function
+ * @param method HTTP method
+ * @param postdata Post data or empty string
+ * @param key Key name of elements in the json list
+ * @param callback Callback lambda
+ */
+template<> inline void rest_request_list<sticker_pack>(dpp::cluster* c, const char* basepath, const std::string &major, const std::string &minor, http_method method, const std::string& postdata, command_completion_event_t callback, const std::string& key) {
+	c->post_rest(basepath, major, minor, method, postdata, [c, key, callback](json &j, const http_request_completion_t& http) {
+		std::unordered_map<snowflake, sticker_pack> list;
+		confirmation_callback_t e(c, confirmation(), http);
+		if (!e.is_error()) {
+			if (j.contains("sticker_packs")) {
+				for (auto &curr_item: j["sticker_packs"]) {
+					list[snowflake_not_null(&curr_item, key.c_str())] = sticker_pack().fill_from_json(&curr_item);
+				}
+			}
+		}
+		if (callback) {
+			callback(confirmation_callback_t(c, list, http));
+		}
+	});
+}
+
+/**
+ * @brief Templated REST request helper to save on typing (for returned lists)
+ *  
+ * @tparam T singular type to return in lambda callback
+ * @tparam T map type to return in lambda callback
+ * @param c calling cluster
+ * @param basepath base path for API call
+ * @param major major API function
+ * @param minor minor API function
+ * @param method HTTP method
+ * @param postdata Post data or empty string
+ * @param key Key name of elements in the json list
+ * @param root Root element to look for
+ * @param callback Callback lambda
+ */
+template<class T> inline void rest_request_list(dpp::cluster* c, const char* basepath, const std::string &major, const std::string &minor, http_method method, const std::string& postdata, command_completion_event_t callback, const std::string& key, const std::string& root) {
+	c->post_rest(basepath, major, minor, method, postdata, [c, root, key, callback](json &j, const http_request_completion_t& http) {
+		std::unordered_map<snowflake, T> list;
+		confirmation_callback_t e(c, confirmation(), http);
+		if (!e.is_error()) {
+			for (auto & curr_item : j[root]) {
+				list[snowflake_not_null(&curr_item, key.c_str())] = T().fill_from_json(&curr_item);
+			}
+		}
+		if (callback) {
+			callback(confirmation_callback_t(c, list, http));
+		}
+	});
+}
+
+/**
+ * @brief Templated REST request helper to save on typing (for returned lists, specialised for objects which doesn't have ids)
+ *
+ * @tparam T singular type to return in lambda callback
+ * @tparam T vector type to return in lambda callback
+ * @param c calling cluster
+ * @param basepath base path for API call
+ * @param major major API function
+ * @param minor minor API function
+ * @param method HTTP method
+ * @param postdata Post data or empty string
+ * @param callback Callback lambda
+ */
+template<class T> inline void rest_request_vector(dpp::cluster* c, const char* basepath, const std::string &major, const std::string &minor, http_method method, const std::string& postdata, command_completion_event_t callback) {
+	c->post_rest(basepath, major, minor, method, postdata, [c, callback](json &j, const http_request_completion_t& http) {
+		std::vector<T> list;
+		confirmation_callback_t e(c, confirmation(), http);
+		if (!e.is_error()) {
+			for (auto & curr_item : j) {
+				list.push_back(T().fill_from_json(&curr_item));
+			}
+		}
+		if (callback) {
+			callback(confirmation_callback_t(c, list, http));
+		}
+	});
+}
+
+}
diff --git a/3rdParty/dpp/restresults.h b/3rdParty/dpp/restresults.h
index 58c2e926ed..1830ab51a8 100644
--- a/3rdParty/dpp/restresults.h
+++ b/3rdParty/dpp/restresults.h
@@ -1,316 +1,344 @@
-/************************************************************************************
- *
- * D++, A Lightweight C++ library for Discord
- *
- * Copyright 2021 Craig Edwards and D++ contributors
- * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- ************************************************************************************/
-
-#pragma once
-
-#include <dpp/export.h>
-#include <string>
-#include <map>
-#include <variant>
-#include <dpp/snowflake.h>
-#include <dpp/dispatcher.h>
-#include <dpp/misc-enum.h>
-#include <dpp/timer.h>
-#include <dpp/nlohmann/json_fwd.hpp>
-#include <dpp/discordclient.h>
-#include <dpp/voiceregion.h>
-#include <dpp/dtemplate.h>
-#include <dpp/prune.h>
-#include <dpp/auditlog.h>
-#include <dpp/queues.h>
-#include <dpp/cache.h>
-#include <dpp/intents.h>
-#include <dpp/sync.h>
-#include <algorithm>
-#include <iostream>
-#include <shared_mutex>
-#include <cstring>
-
-using  json = nlohmann::json;
-
-namespace dpp {
-
-#ifdef _WIN32
-	#ifdef _DEBUG
-		extern "C" DPP_EXPORT void you_are_using_a_debug_build_of_dpp_on_a_release_project();
-	#else
-		extern "C" DPP_EXPORT void you_are_using_a_release_build_of_dpp_on_a_debug_project();
-	#endif
-#endif
-
-struct DPP_EXPORT version_checker {
-	version_checker() {
-		#ifdef _WIN32
-			#ifdef _DEBUG
-				you_are_using_a_debug_build_of_dpp_on_a_release_project();
-			#else
-				you_are_using_a_release_build_of_dpp_on_a_debug_project();
-			#endif
-		#endif
-	}
-};
-
-static version_checker dpp_vc;
-
-
-/**
- * @brief A list of shards
- */
-typedef std::map<uint32_t, class discord_client*> shard_list;
-
-/**
- * @brief Represents the various information from the 'get gateway bot' api call
- */
-struct DPP_EXPORT gateway {
-	/// Gateway websocket url
-	std::string url;
-
-	/// Number of suggested shards to start
-	uint32_t shards;
-
-	/// Total number of sessions that can be started
-	uint32_t session_start_total;
-
-	/// How many sessions are left
-	uint32_t session_start_remaining;
-
-	/// How many seconds until the session start quota resets
-	uint32_t session_start_reset_after;
-
-	/// How many sessions can be started at the same time
-	uint32_t session_start_max_concurrency;
-
-	/**
-	 * @brief Construct a new gateway object
-	 *
-	 * @param j JSON data to construct from
-	 */
-	gateway(nlohmann::json* j);
-
-	/**
-	 * @brief Construct a new gateway object
-	 */
-	gateway();
-
-	/**
-	 * @brief Fill this object from json
-	 * 
-	 * @param j json to fill from
-	 * @return gateway& reference to self
-	 */
-	gateway& fill_from_json(nlohmann::json* j);
-};
-
-/**
- * @brief Confirmation object represents any true or false simple REST request
- *
- */
-struct DPP_EXPORT confirmation {
-	bool success;
-};
-
-/**
- * @brief A container for types that can be returned for a REST API call
- *
- */
-typedef std::variant<
-		application_role_connection,
-		application_role_connection_metadata_list,
-		confirmation,
-		message,
-		message_map,
-		user,
-		user_identified,
-		user_map,
-		guild_member,
-		guild_member_map,
-		channel,
-		channel_map,
-		thread_member,
-		thread_member_map,
-		guild,
-		guild_map,
-		guild_command_permissions,
-		guild_command_permissions_map,
-		role,
-		role_map,
-		invite,
-		invite_map,
-		dtemplate,
-		dtemplate_map,
-		emoji,
-		emoji_map,
-		ban,
-		ban_map,
-		voiceregion,
-		voiceregion_map,
-		integration,
-		integration_map,
-		webhook,
-		webhook_map,
-		prune,
-		guild_widget,
-		gateway,
-		interaction,
-		interaction_response,
-		auditlog,
-		slashcommand,
-		slashcommand_map,
-		stage_instance,
-		sticker,
-		sticker_map,
-		sticker_pack,
-		sticker_pack_map,
-		application,
-		application_map,
-		connection,
-		connection_map,
-		thread,
-		thread_map,
-		scheduled_event,
-		scheduled_event_map,
-		event_member,
-		event_member_map,
-		automod_rule,
-		automod_rule_map
-	> confirmable_t;
-
-/**
- * @brief The details of a field in an error response
- */
-struct DPP_EXPORT error_detail {
-	/**
-	 * @brief Object name which is in error
-	 */
-	std::string object;
-	/**
-	 * @brief Field name which is in error
-	 */
-	std::string field;
-	/**
-	 * @brief Error code
-	 */
-	std::string code;
-	/**
-	 * @brief Error reason (full message)
-	 */
-	std::string reason;
-};
-
-/**
- * @brief The full details of an error from a REST response
- */
-struct DPP_EXPORT error_info {
-	/**
-	 * @brief Error code
-	 */
-	uint32_t code = 0;
-	/**
-	 * @brief Error message
-	 *
-	 */
-	std::string message;
-	/**
-	 * @brief Field specific error descriptions
-	 */
-	std::vector<error_detail> errors;
-};
-
-/**
- * @brief The results of a REST call wrapped in a convenient struct
- */
-struct DPP_EXPORT confirmation_callback_t {
-	/** Information about the HTTP call used to make the request */
-	http_request_completion_t http_info;
-
-	/** Value returned, wrapped in variant */
-	confirmable_t value;
-
-	/** Owner/creator of the callback object */
-	const class cluster* bot;
-
-	/**
-	 * @brief Construct a new confirmation callback t object
-	 */
-	confirmation_callback_t() = default;
-
-	/**
-	 * @brief Construct a new confirmation callback t object
-	 * 
-	 * @param creator owning cluster object
-	 */
-	confirmation_callback_t(cluster* creator);
-
-	/**
-	 * @brief Construct a new confirmation callback object
-	 *
-	 * @param _http The HTTP metadata from the REST call
-	 */
-	confirmation_callback_t(const http_request_completion_t& _http);
-
-	/**
-	 * @brief Construct a new confirmation callback object
-	 *
-	 * @param creator owning cluster object
-	 * @param _value The value to encapsulate in the confirmable_t
-	 * @param _http The HTTP metadata from the REST call
-	 */
-	confirmation_callback_t(cluster* creator, const confirmable_t& _value, const http_request_completion_t& _http);
-
-	/**
-	 * @brief Returns true if the call resulted in an error rather than a legitimate value in the
-	 * confirmation_callback_t::value member.
-	 *
-	 * @return true There was an error who's details can be obtained by get_error()
-	 * @return false There was no error
-	 */
-	bool is_error() const;
-
-	/**
-	 * @brief Get the error_info object.
-	 * The error_info object contains the details of any REST error, if there is an error
-	 * (to find out if there is an error check confirmation_callback_t::is_error())
-	 *
-	 * @return error_info The details of the error message
-	 */
-	error_info get_error() const;
-
-	/**
-	 * @brief Get the stored value via std::get
-	 * @tparam T type to get
-	 * @return stored value as type T
-	 */
-	template<typename T>
-	T get() const {
-		return std::get<T>(value);
-	}
-};
-
-/**
- * @brief A callback upon command completion
- */
-typedef std::function<void(const confirmation_callback_t&)> command_completion_event_t;
-
-/**
- * @brief Automatically JSON encoded HTTP result
- */
-typedef std::function<void(json&, const http_request_completion_t&)> json_encode_t;
-};
+/************************************************************************************
+ *
+ * D++, A Lightweight C++ library for Discord
+ *
+ * Copyright 2021 Craig Edwards and D++ contributors
+ * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ************************************************************************************/
+
+#pragma once
+
+#include <dpp/export.h>
+#include <string>
+#include <map>
+#include <variant>
+#include <dpp/snowflake.h>
+#include <dpp/dispatcher.h>
+#include <dpp/misc-enum.h>
+#include <dpp/timer.h>
+#include <dpp/json_fwd.h>
+#include <dpp/discordclient.h>
+#include <dpp/voiceregion.h>
+#include <dpp/dtemplate.h>
+#include <dpp/prune.h>
+#include <dpp/auditlog.h>
+#include <dpp/queues.h>
+#include <dpp/cache.h>
+#include <dpp/intents.h>
+#include <algorithm>
+#include <iostream>
+#include <shared_mutex>
+#include <cstring>
+#include <dpp/entitlement.h>
+#include <dpp/sku.h>
+
+namespace dpp {
+
+/**
+ * @brief A list of shards
+ */
+typedef std::map<uint32_t, std::unique_ptr<class discord_client>> shard_list;
+
+/**
+ * @brief List of shards awaiting reconnection, by id with earliest possible reconnect time
+ */
+typedef std::map<uint32_t, time_t> reconnect_list;
+
+/**
+ * @brief Represents the various information from the 'get gateway bot' api call
+ */
+struct DPP_EXPORT gateway : public json_interface<gateway> {
+protected:
+	friend struct json_interface<gateway>;
+
+	/**
+	 * @brief Fill this object from json
+	 * 
+	 * @param j json to fill from
+	 * @return gateway& reference to self
+	 */
+	gateway& fill_from_json_impl(nlohmann::json* j);
+
+public:
+	/**
+	 * @brief Gateway websocket url.
+	 */
+	std::string url;
+
+	/**
+	 * @brief Number of suggested shards to start.
+	 */
+	uint32_t shards;
+
+	/**
+	 * @brief Total number of sessions that can be started.
+	 */
+	uint32_t session_start_total;
+
+	/**
+	 * @brief How many sessions are left.
+	 */
+	uint32_t session_start_remaining;
+
+	/**
+	 * @brief How many seconds until the session start quota resets.
+	 */
+	uint32_t session_start_reset_after;
+
+	/**
+	 * @brief How many sessions can be started at the same time.
+	 */
+	uint32_t session_start_max_concurrency;
+
+	/**
+	 * @brief Construct a new gateway object
+	 *
+	 * @param j JSON data to construct from
+	 */
+	gateway(nlohmann::json* j);
+
+	/**
+	 * @brief Construct a new gateway object
+	 */
+	gateway();
+};
+
+/**
+ * @brief Confirmation object represents any true or false simple REST request
+ *
+ */
+struct DPP_EXPORT confirmation {
+	bool success;
+};
+
+/**
+ * @brief A container for types that can be returned for a REST API call
+ *
+ */
+typedef std::variant<
+		active_threads,
+		application_role_connection,
+		application_role_connection_metadata_list,
+		confirmation,
+		message,
+		message_map,
+		message_pin_map,
+		user,
+		user_identified,
+		user_map,
+		guild_member,
+		guild_member_map,
+		channel,
+		channel_map,
+		thread_member,
+		thread_member_map,
+		guild,
+		guild_map,
+		guild_command_permissions,
+		guild_command_permissions_map,
+		role,
+		role_map,
+		invite,
+		invite_map,
+		dtemplate,
+		dtemplate_map,
+		emoji,
+		emoji_map,
+		ban,
+		ban_map,
+		voiceregion,
+		voiceregion_map,
+		voicestate,
+		integration,
+		integration_map,
+		webhook,
+		webhook_map,
+		prune,
+		guild_widget,
+		gateway,
+		interaction,
+		interaction_response,
+		auditlog,
+		slashcommand,
+		slashcommand_map,
+		stage_instance,
+		sticker,
+		sticker_map,
+		sticker_pack,
+		sticker_pack_map,
+		application,
+		application_map,
+		connection,
+		connection_map,
+		thread,
+		thread_map,
+		scheduled_event,
+		scheduled_event_map,
+		event_member,
+		event_member_map,
+		automod_rule,
+		automod_rule_map,
+		onboarding,
+		welcome_screen,
+		entitlement,
+		entitlement_map,
+		sku,
+		sku_map,
+		message_search_result
+	> confirmable_t;
+
+/**
+ * @brief The details of a field in an error response
+ */
+struct DPP_EXPORT error_detail {
+	/**
+	 * @brief Object name which is in error
+	 */
+	std::string object;
+
+	/**
+	 * @brief Field name which is in error
+	 */
+	std::string field;
+
+	/**
+	 * @brief Error code
+	 */
+	std::string code;
+
+	/**
+	 * @brief Error reason (full message)
+	 */
+	std::string reason;
+
+	/**
+	 * @brief Object field index
+	 */
+	DPP_DEPRECATED("index is unused and will be removed in a future version") int index = 0;
+};
+
+/**
+ * @brief The full details of an error from a REST response
+ */
+struct DPP_EXPORT error_info {
+	/**
+	 * @brief Error code
+	 */
+	uint32_t code = 0;
+
+	/**
+	 * @brief Error message
+	 *
+	 */
+	std::string message;
+
+	/**
+	 * @brief Field specific error descriptions
+	 */
+	std::vector<error_detail> errors;
+
+	/**
+	 * @brief Human readable error message constructed from the above
+	 */
+	std::string human_readable;
+};
+
+/**
+ * @brief The results of a REST call wrapped in a convenient struct
+ */
+struct DPP_EXPORT confirmation_callback_t {
+	/**
+	 * @brief Information about the HTTP call used to make the request.
+	 */
+	http_request_completion_t http_info;
+
+	/**
+	 * @brief Value returned, wrapped in variant.
+	 */
+	confirmable_t value;
+
+	/**
+	 * @brief Owner/creator of the callback object.
+	 */
+	const class cluster* bot;
+
+	/**
+	 * @brief Construct a new confirmation callback t object.
+	 */
+	confirmation_callback_t() = default;
+
+	/**
+	 * @brief Construct a new confirmation callback t object
+	 * 
+	 * @param creator owning cluster object
+	 */
+	confirmation_callback_t(cluster* creator);
+
+	/**
+	 * @brief Construct a new confirmation callback object
+	 *
+	 * @param _http The HTTP metadata from the REST call
+	 */
+	confirmation_callback_t(const http_request_completion_t& _http);
+
+	/**
+	 * @brief Construct a new confirmation callback object
+	 *
+	 * @param creator owning cluster object
+	 * @param _value The value to encapsulate in the confirmable_t
+	 * @param _http The HTTP metadata from the REST call
+	 */
+	confirmation_callback_t(cluster* creator, const confirmable_t& _value, const http_request_completion_t& _http);
+
+	/**
+	 * @brief Returns true if the call resulted in an error rather than a legitimate value in the
+	 * confirmation_callback_t::value member.
+	 *
+	 * @return true There was an error who's details can be obtained by get_error()
+	 * @return false There was no error
+	 */
+	bool is_error() const;
+
+	/**
+	 * @brief Get the error_info object.
+	 * The error_info object contains the details of any REST error, if there is an error
+	 * (to find out if there is an error check confirmation_callback_t::is_error())
+	 *
+	 * @return error_info The details of the error message
+	 */
+	error_info get_error() const;
+
+	/**
+	 * @brief Get the stored value via std::get
+	 * @tparam T type to get
+	 * @return stored value as type T
+	 */
+	template<typename T>
+	T get() const {
+		return std::get<T>(value);
+	}
+};
+
+/**
+ * @brief A callback upon command completion
+ */
+typedef std::function<void(const confirmation_callback_t&)> command_completion_event_t;
+
+/**
+ * @brief Automatically JSON encoded HTTP result
+ */
+typedef std::function<void(json&, const http_request_completion_t&)> json_encode_t;
+}
diff --git a/3rdParty/dpp/role.h b/3rdParty/dpp/role.h
index bfd1ab951c..70f8506dd1 100644
--- a/3rdParty/dpp/role.h
+++ b/3rdParty/dpp/role.h
@@ -1,648 +1,1065 @@
-/************************************************************************************
- *
- * D++, A Lightweight C++ library for Discord
- *
- * Copyright 2021 Craig Edwards and D++ contributors 
- * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- ************************************************************************************/
-#pragma once
-#include <variant>
-#include <dpp/export.h>
-#include <dpp/managed.h>
-#include <dpp/nlohmann/json_fwd.hpp>
-#include <dpp/permissions.h>
-#include <dpp/guild.h>
-#include <dpp/json_interface.h>
-
-namespace dpp {
-
-/** Various flags related to dpp::role */
-enum role_flags : uint8_t {
-	r_hoist =		0b00000001, //!< Hoisted role
-	r_managed =		0b00000010, //!< Managed role (introduced by a bot or application)
-	r_mentionable =		0b00000100, //!< Mentionable with a ping
-	r_premium_subscriber =	0b00001000, //!< This is set for the role given to nitro 
-};
-
-/**
- * @brief Represents a role within a dpp::guild.
- * Roles are combined via logical OR of the permission bitmasks, then channel-specific overrides
- * can be applied on top, deny types apply a logic NOT to the bit mask, and allows apply a logical OR.
- * @note Every guild has at least one role, called the 'everyone' role, which always has the same role
- * ID as the guild's ID. This is the base permission set applied to all users where no other role or override
- * applies, and is the starting value of the bit mask looped through to calculate channel permissions.
- */
-class DPP_EXPORT role : public managed, public json_interface<role>  {
-public:
-	/**
-	 * @brief Role name
-	 * Between 1 and 100 characters.
-	 */
-	std::string name;
-	/**
-	 * @brief Guild ID
-	 */
-	snowflake guild_id;
-	/**
-	 * @brief Role colour.
-	 * A colour of 0 means no colour. If you want a black role,
-	 * you must use the value 0x000001.
-	 */
-	uint32_t colour;
-	/** Role position */
-	uint8_t position;
-	/** Role permissions bitmask values from dpp::permissions */
-	permission permissions;
-	/** Role flags from dpp::role_flags */
-	uint8_t flags;
-	/** Integration id if any (e.g. role is a bot's role created when it was invited) */
-	snowflake integration_id;
-	/** Bot id if any (e.g. role is a bot's role created when it was invited) */
-	snowflake bot_id;
-	/** The unicode emoji used for the role's icon, can be an empty string */
-	std::string unicode_emoji;
-	/** The role icon hash, can be an empty string */
-	utility::iconhash icon;
-	/** Image data for the role icon (if any) */
-	std::string* image_data;
-
-	/**
-	 * @brief Construct a new role object
-	 */
-	role();
-
-	/**
-	 * @brief Destroy the role object
-	 */
-	virtual ~role();
-
-	/**
-	* @brief Create a mentionable role.
-	* @param id The ID of the role.
-	* @return std::string The formatted mention of the role.
-	*/
-	static std::string get_mention(const snowflake& id);
-
-	/**
-	 * @brief Set the name of the role
-	 * Maximum length: 100
-	 * Minimum length: 1
-	 * @param n Name to set
-	 * @return role& reference to self
-	 * @throw dpp::exception thrown if role length is less than 1 character
-	 */
-	role& set_name(const std::string& n);
-
-	/**
-	 * @brief Set the colour
-	 * 
-	 * @param c Colour to set
-	 * @note There is an americanised version of this method, role::set_color().
-	 * @return role& reference to self
-	 */
-	role& set_colour(uint32_t c);
-
-	/**
-	 * @brief Set the color
-	 * 
-	 * @param c Colour to set
-	 * @note This is an alias of role::set_colour for American spelling.
-	 * @return role& reference to self
-	 */
-	role& set_color(uint32_t c);
-
-	/**
-	 * @brief Set the flags
-	 * 
-	 * @param f Flags to set from dpp::role_flags
-	 * @return role& reference to self
-	 */
-	role& set_flags(uint8_t f);
-
-	/**
-	 * @brief Set the integration id
-	 * 
-	 * @param i Integration ID to set
-	 * @return role& reference to self
-	 */
-	role& set_integration_id(snowflake i);
-
-	/**
-	 * @brief Set the bot id
-	 * 
-	 * @param b Bot ID to set
-	 * @return role& reference to self
-	 */
-	role& set_bot_id(snowflake b);
-
-	/**
-	 * @brief Set the guild id
-	 * 
-	 * @param gid Guild ID to set
-	 * @return role& reference to self
-	 */
-	role& set_guild_id(snowflake gid);
-
-	/**
-	 * @brief Fill this role from json.
-	 * 
-	 * @param j The json data
-	 * @return A reference to self
-	 */
-	role& fill_from_json(nlohmann::json* j);
-
-	/**
-	 * @brief Fill this role from json.
-	 * 
-	 * @param guild_id the guild id to place in the json
-	 * @param j The json data
-	 * @return A reference to self
-	 */
-	role& fill_from_json(snowflake guild_id, nlohmann::json* j);
-
-	/**
-	 * @brief Build a json string from this object.
-	 * 
-	 * @param with_id true if the ID is to be included in the json text
-	 * @return The json of the role
-	 */
-	virtual std::string build_json(bool with_id = false) const;
-
-	/**
-	 * @brief Get the mention/ping for the role
-	 * 
-	 * @return std::string mention
-	 */
-	std::string get_mention() const;
-
-	/**
-	 * @brief Returns the role's icon if they have one, otherwise returns an empty string
-	 *
-	 * @param size The size of the icon in pixels. It can be any power of two between 16 and 4096. If not specified, the default sized icon is returned.
-	 * @return std::string icon url or empty string
-	 */
-	std::string get_icon_url(uint16_t size = 0) const;
-
-	/**
-	 * @brief Load an image into the object as base64
-	 * 
-	 * @param image_blob Image binary data
-	 * @param type Type of image
-	 * @return emoji& Reference to self
-	 */
-	role& load_image(const std::string &image_blob, const image_type type);
-
-	/**
-	 * @brief Operator less than, used for checking if a role is below another.
-	 *
-	 * @param lhs first role to compare
-	 * @param rhs second role to compare
-	 * @return true if lhs is less than rhs
-	 */
-	friend inline bool operator< (const role& lhs, const role& rhs)
-	{
-		return lhs.position < rhs.position;
-	}
-
-	/**
-	 * @brief Operator greater than, used for checking if a role is above another.
-	 *
-	 * @param lhs first role to compare
-	 * @param rhs second role to compare
-	 * @return true if lhs is greater than rhs
-	 */
-	friend inline bool operator> (const role& lhs, const role& rhs)
-	{
-		return lhs.position > rhs.position;
-	}
-
-	/**
-	 * @brief Operator equals, used for checking if a role is ranked equal to another.
-	 *
-	 * @param other role to compare
-	 * @return true if is equal to other
-	 */
-	inline bool operator== (const role& other) const
-	{
-		return this->position == other.position;
-	}
-
-	/**
-	 * @brief Operator not equals, used for checking if a role is ranked equal to another.
-	 *
-	 * @param other role to compare
-	 * @return true if is not equal to other
-	 */
-	inline bool operator!= (const role& other) const
-	{
-		return this->position != other.position;
-	}
-
-	/**
-	 * @brief True if the role is hoisted
-	 * @return bool Role appears separated from others in the member list
-	 */
-	bool is_hoisted() const;
-	/**
-	 * @brief True if the role is mentionable
-	 * @return bool Role is mentionable
-	 */
-	bool is_mentionable() const;
-	/**
-	 * @brief True if the role is managed (belongs to a bot or application)
-	 * @return bool True if the role is managed (introduced for a bot or other application by Discord)
-	 */
-	bool is_managed() const;
-	/**
-	 * @brief True if has create instant invite permission
-	 * @note Having the administrator permission causes this method to always return true
-	 * Channel specific overrides may apply to permissions.
-	 * @return bool True if user has the instant invite permission or is administrator.
-	 */
-	bool has_create_instant_invite() const;
-	/**
-	 * @brief True if has the kick members permission.
-	 * @note Having the administrator permission causes this method to always return true
-	 * Channel specific overrides may apply to permissions.
-	 * @return bool True if user has the kick members permission or is administrator.
-	 */
-	bool has_kick_members() const;
-	/**
-	 * @brief True if has the ban members permission.
-	 * @note Having the administrator permission causes this method to always return true
-	 * Channel specific overrides may apply to permissions.
-	 * @return bool True if user has the ban members permission or is administrator.
-	 */
-	bool has_ban_members() const;
-	/**
-	 * @brief True if has the administrator permission.
-	 * @note Having the administrator permission causes this method to always return true
-	 * Channel specific overrides may apply to permissions.
-	 * @return bool True if user has the administrator permission or is administrator.
-	 */
-	bool has_administrator() const;
-	/**
-	 * @brief True if has the manage channels permission.
-	 * @note Having the administrator permission causes this method to always return true
-	 * Channel specific overrides may apply to permissions.
-	 * @return bool True if user has the manage channels permission or is administrator.
-	 */
-	bool has_manage_channels() const;
-	/**
-	 * @brief True if has the manage guild permission.
-	 * @note Having the administrator permission causes this method to always return true
-	 * Channel specific overrides may apply to permissions.
-	 * @return bool True if user has the manage guild permission or is administrator.
-	 */
-	bool has_manage_guild() const;
-	/**
-	 * @brief True if has the add reactions permission.
-	 * @note Having the administrator permission causes this method to always return true
-	 * Channel specific overrides may apply to permissions.
-	 * @return bool True if user has the add reactions permission or is administrator.
-	 */
-	bool has_add_reactions() const;
-	/**
-	 * @brief True if has the view audit log permission.
-	 * @note Having the administrator permission causes this method to always return true
-	 * Channel specific overrides may apply to permissions.
-	 * @return bool True if user has the view audit log permission or is administrator.
-	 */
-	bool has_view_audit_log() const;
-	/**
-	 * @brief True if has the priority speaker permission.
-	 * @note Having the administrator permission causes this method to always return true
-	 * Channel specific overrides may apply to permissions.
-	 * @return bool True if user has the priority speaker permission or is administrator.
-	 */
-	bool has_priority_speaker() const;
-	/**
-	 * @brief True if has the stream permission.
-	 * @note Having the administrator permission causes this method to always return true
-	 * Channel specific overrides may apply to permissions.
-	 * @return bool True if user has the stream permission or is administrator.
-	 */
-	bool has_stream() const;
-	/**
-	 * @brief True if has the view channel permission.
-	 * @note Having the administrator permission causes this method to always return true
-	 * Channel specific overrides may apply to permissions.
-	 * @return bool True if user has the view channel permission or is administrator.
-	 */
-	bool has_view_channel() const;
-	/**
-	 * @brief True if has the send messages permission.
-	 * @note Having the administrator permission causes this method to always return true
-	 * Channel specific overrides may apply to permissions.
-	 * @return bool True if user has the send messages permission or is administrator.
-	 */
-	bool has_send_messages() const;
-	/**
-	 * @brief True if has the send TTS messages permission.
-	 * @note Having the administrator permission causes this method to always return true
-	 * Channel specific overrides may apply to permissions.
-	 * @return bool True if user has the send TTS messages permission or is administrator.
-	 */
-	bool has_send_tts_messages() const;
-	/**
-	 * @brief True if has the manage messages permission.
-	 * @note Having the administrator permission causes this method to always return true
-	 * Channel specific overrides may apply to permissions.
-	 * @return bool True if user has the manage messages permission or is administrator.
-	 */
-	bool has_manage_messages() const;
-	/**
-	 * @brief True if has the embed links permission.
-	 * @note Having the administrator permission causes this method to always return true
-	 * Channel specific overrides may apply to permissions.
-	 * @return bool True if user has the embed links permission or is administrator.
-	 */
-	bool has_embed_links() const;
-	/**
-	 * @brief True if has the attach files permission.
-	 * @note Having the administrator permission causes this method to always return true
-	 * Channel specific overrides may apply to permissions.
-	 * @return bool True if user has the attach files permission or is administrator.
-	 */
-	bool has_attach_files() const;
-	/**
-	 * @brief True if has the read message history permission.
-	 * @note Having the administrator permission causes this method to always return true
-	 * Channel specific overrides may apply to permissions.
-	 * @return bool True if user has the read message history permission or is administrator.
-	 */
-	bool has_read_message_history() const;
-	/**
-	 * @brief True if has the mention \@everyone and \@here permission.
-	 * @note Having the administrator permission causes this method to always return true
-	 * Channel specific overrides may apply to permissions.
-	 * @return bool True if user has the mention \@everyone and \@here permission or is administrator.
-	 */
-	bool has_mention_everyone() const;
-	/**
-	 * @brief True if has the use external emojis permission.
-	 * @note Having the administrator permission causes this method to always return true
-	 * Channel specific overrides may apply to permissions.
-	 * @return bool True if user has the use external emojis permission or is administrator.
-	 */
-	bool has_use_external_emojis() const;
-	/**
-	 * @brief True if has the view guild insights permission.
-	 * @note Having the administrator permission causes this method to always return true
-	 * Channel specific overrides may apply to permissions.
-	 * @return bool True if user has the view guild insights permission or is administrator.
-	 */
-	bool has_view_guild_insights() const;
-	/**
-	 * @brief True if has the connect voice permission.
-	 * @note Having the administrator permission causes this method to always return true
-	 * Channel specific overrides may apply to permissions.
-	 * @return bool True if user has the connect voice permission or is administrator.
-	 */
-	bool has_connect() const;
-	/**
-	 * @brief True if has the speak permission.
-	 * @note Having the administrator permission causes this method to always return true
-	 * Channel specific overrides may apply to permissions.
-	 * @return bool True if user has the speak permission or is administrator.
-	 */
-	bool has_speak() const;
-	/**
-	 * @brief True if has the mute members permission.
-	 * @note Having the administrator permission causes this method to always return true
-	 * Channel specific overrides may apply to permissions.
-	 * @return bool True if user has the mute members permission or is administrator.
-	 */
-	bool has_mute_members() const;
-	/**
-	 * @brief True if has the deafen members permission.
-	 * @note Having the administrator permission causes this method to always return true
-	 * Channel specific overrides may apply to permissions.
-	 * @return bool True if user has the deafen members permission or is administrator.
-	 */
-	bool has_deafen_members() const;
-	/**
-	 * @brief True if has the move members permission.
-	 * @note Having the administrator permission causes this method to always return true
-	 * Channel specific overrides may apply to permissions.
-	 * @return bool True if user has the move members permission or is administrator.
-	 */
-	bool has_move_members() const;
-	/** True if has use voice activity detection permission */
-	bool has_use_vad() const;
-	/**
-	 * @brief True if has the change nickname permission.
-	 * @note Having the administrator permission causes this method to always return true
-	 * Channel specific overrides may apply to permissions.
-	 * @return bool True if user has the change nickname permission or is administrator.
-	 */
-	bool has_change_nickname() const;
-	/**
-	 * @brief True if has the manage nicknames permission.
-	 * @note Having the administrator permission causes this method to always return true
-	 * Channel specific overrides may apply to permissions.
-	 * @return bool True if user has the manage nicknames permission or is administrator.
-	 */
-	bool has_manage_nicknames() const;
-	/**
-	 * @brief True if has the manage roles permission.
-	 * @note Having the administrator permission causes this method to always return true
-	 * Channel specific overrides may apply to permissions.
-	 * @return bool True if user has the manage roles permission or is administrator.
-	 */
-	bool has_manage_roles() const;
-	/**
-	 * @brief True if has the manage webhooks permission.
-	 * @note Having the administrator permission causes this method to always return true
-	 * Channel specific overrides may apply to permissions.
-	 * @return bool True if user has the manage webhooks permission or is administrator.
-	 */
-	bool has_manage_webhooks() const;
-	/**
-	 * @brief True if has the manage emojis and stickers permission.
-	 * @note Having the administrator permission causes this method to always return true
-	 * Channel specific overrides may apply to permissions.
-	 * @return bool True if user has the manage emojis and stickers permission or is administrator.
-	 */
-	bool has_manage_emojis_and_stickers() const;
-	/**
-	 * @brief True if has the use application commands permission.
-	 * @note Having the administrator permission causes this method to always return true
-	 * Channel specific overrides may apply to permissions.
-	 * @return bool True if user has the use application commands permission or is administrator.
-	 */
-	bool has_use_application_commands() const;
-	/**
-	 * @brief True if has the request to speak permission.
-	 * @note Having the administrator permission causes this method to always return true
-	 * Channel specific overrides may apply to permissions.
-	 * @return bool True if user has the request to speak permission or is administrator.
-	 */
-	bool has_request_to_speak() const;
-	/**
-	 * @brief True if has the manage threads permission.
-	 * @note Having the administrator permission causes this method to always return true
-	 * Channel specific overrides may apply to permissions.
-	 * @return bool True if user has the manage threads permission or is administrator.
-	 */
-	bool has_manage_threads() const;
-	/**
-	 * @brief True if has the create public threads permission.
-	 * @note Having the administrator permission causes this method to always return true
-	 * Channel specific overrides may apply to permissions.
-	 * @return bool True if user has the create public threads permission or is administrator.
-	 */
-	bool has_create_public_threads() const;
-	/**
-	 * @brief True if has the create private threads permission.
-	 * @note Having the administrator permission causes this method to always return true
-	 * Channel specific overrides may apply to permissions.
-	 * @return bool True if user has the create private threads permission or is administrator.
-	 */
-	bool has_create_private_threads() const;
-	/**
-	 * @brief True if has the use external stickers permission.
-	 * @note Having the administrator permission causes this method to always return true
-	 * Channel specific overrides may apply to permissions.
-	 * @return bool True if user has the use external stickers permission or is administrator.
-	 */
-	bool has_use_external_stickers() const;
-	/**
-	 * @brief True if has the send messages in threads permission.
-	 * @note Having the administrator permission causes this method to always return true
-	 * Channel specific overrides may apply to permissions.
-	 * @return bool True if user has the send messages in threads permission or is administrator.
-	 */
-	bool has_send_messages_in_threads() const;
-	/**
-	 * @brief True if has the start embedded activities permission.
-	 * @note Having the administrator permission causes this method to always return true
-	 * Channel specific overrides may apply to permissions.
-	 * @return bool True if user has the start embedded activities permission or is administrator.
-	 */
-	bool has_use_embedded_activities() const;
-	/**
-	 * @brief True if has the manage events permission.
-	 * @note Having the administrator permission causes this method to always return true
-	 * Channel specific overrides may apply to permissions.
-	 * @return bool True if user has the manage events permission or is administrator.
-	 */
-	bool has_manage_events() const;
-	/**
-	 * @brief True if has the moderate users permission.
-	 * @note Having the administrator permission causes this method to always return true
-	 * Channel specific overrides may apply to permissions.
-	 * @return bool True if user has the moderate users permission or is administrator.
-	 */
-	bool has_moderate_members() const;
-
-	/**
-	 * @brief Get guild members who have this role
-	 * @note This method requires user/members cache to be active
-	 * @return members_container List of members who have this role
-	 */
-	members_container get_members() const;
-};
-
-/**
- * @brief Application Role Connection Metadata Type
- *
- * @note Each metadata type offers a comparison operation that allows guilds to configure role requirements based on metadata values stored by the bot. Bots specify a `metadata value` for each user and guilds specify the required `guild's configured value` within the guild role settings.
- */
-enum application_role_connection_metadata_type : uint8_t {
-	rc_integer_less_than_or_equal = 1, //!< The metadata value (integer) is less than or equal to the guild's configured value (integer)
-	rc_integer_greater_than_or_equal = 2, //!< The metadata value (integer) is greater than or equal to the guild's configured value (integer)
-	rc_integer_equal = 3, //!< The metadata value (integer) is equal to the guild's configured value (integer)
-	rc_integer_not_equal = 4, //!< The metadata value (integer) is not equal to the guild's configured value (integer)
-	rc_datetime_less_than_or_equal = 5, //!< The metadata value (ISO8601 string) is less than or equal to the guild's configured value (integer; days before current date)
-	rc_datetime_greater_than_or_equal = 6, //!< The metadata value (ISO8601 string) is greater than or equal to the guild's configured value (integer; days before current date)
-	rc_boolean_equal = 7, //!< The metadata value (integer) is equal to the guild's configured value (integer; 1)
-	rc_boolean_not_equal = 8, //!< The metadata value (integer) is not equal to the guild's configured value (integer; 1)
-};
-
-/**
- * @brief Application Role Connection Metadata. Represents a role connection metadata for an dpp::application
- */
-class DPP_EXPORT application_role_connection_metadata : public json_interface<application_role_connection_metadata> {
-public:
-	application_role_connection_metadata_type type; //!< Type of metadata value
-	std::string key; //!< Dictionary key for the metadata field (must be `a-z`, `0-9`, or `_` characters; max 50 characters)
-	std::string name; //!< Name of the metadata field (max 100 characters)
-	std::map<std::string, std::string> name_localizations; //!< Translations of the name
-	std::string description; //!< Description of the metadata field (max 200 characters)
-	std::map<std::string, std::string> description_localizations; //!< Translations of the description
-
-	/**
-	 * Constructor
-	 */
-	application_role_connection_metadata();
-
-	virtual ~application_role_connection_metadata() = default;
-
-	/** Fill this record from json.
-	 * @param j The json to fill this record from
-	 * @return Reference to self
-	 */
-	application_role_connection_metadata& fill_from_json(nlohmann::json* j);
-
-	/**
-	 * @brief Convert to JSON string
-	 *
-	 * @param with_id include ID in output
-	 * @return std::string JSON output
-	 */
-	virtual std::string build_json(bool with_id = false) const;
-};
-
-/**
- * @brief The application role connection that an application has attached to a user.
- */
-class DPP_EXPORT application_role_connection : public json_interface<application_role_connection> {
-public:
-	std::string platform_name; //!< Optional: The vanity name of the platform a bot has connected (max 50 characters)
-	std::string platform_username; //!< Optional: The username on the platform a bot has connected (max 100 characters)
-	std::variant<std::monostate, application_role_connection_metadata> metadata; //!< Optional: Object mapping application role connection metadata keys to their stringified value (max 100 characters) for the user on the platform a bot has connected
-
-	/**
-	 * Constructor
-	 */
-	application_role_connection();
-
-	virtual ~application_role_connection() = default;
-
-	/** Fill this record from json.
-	 * @param j The json to fill this record from
-	 * @return Reference to self
-	 */
-	application_role_connection& fill_from_json(nlohmann::json* j);
-
-	/**
-	 * @brief Convert to JSON string
-	 *
-	 * @param with_id include ID in output
-	 * @return std::string JSON output
-	 */
-	virtual std::string build_json(bool with_id = false) const;
-};
-
-/** A group of roles */
-typedef std::unordered_map<snowflake, role> role_map;
-
-/** A group of application_role_connection_metadata objects */
-typedef std::vector<application_role_connection_metadata> application_role_connection_metadata_list;
-
-};
-
+/************************************************************************************
+ *
+ * D++, A Lightweight C++ library for Discord
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright 2021 Craig Edwards and D++ contributors 
+ * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ************************************************************************************/
+#pragma once
+#include <variant>
+#include <dpp/export.h>
+#include <dpp/managed.h>
+#include <dpp/json_fwd.h>
+#include <dpp/permissions.h>
+#include <dpp/guild.h>
+#include <dpp/json_interface.h>
+
+namespace dpp {
+
+/**
+ * @brief Various flags related to dpp::role
+ */
+enum role_flags : uint8_t {
+	/**
+	 * @brief Hoisted role (if the role is pinned in the user listing).
+	 */
+	r_hoist = 0b00000001,
+
+	/**
+	 * @brief Managed role (introduced by a bot or application).
+	 */
+	r_managed = 0b00000010,
+
+	/**
+	 * @brief Whether this role is mentionable with a ping.
+	 */
+	r_mentionable =	0b00000100,
+
+	/**
+	 * @brief Whether this is the guild's booster role.
+	 */
+	r_premium_subscriber = 0b00001000,
+
+	/**
+	 * @brief Whether the role is available for purchase.
+	 */
+	r_available_for_purchase = 0b00010000,
+
+	/**
+	 * @brief Whether the role is a guild's linked role.
+	 */
+	r_guild_connections = 0b00100000,
+
+	/**
+	 * @brief Whether the role can be selected by members in an onboarding prompt.
+	 */
+	r_in_prompt = 0b01000000,
+};
+
+/**
+ * @brief Represents a role within a dpp::guild.
+ * Roles are combined via logical OR of the permission bitmasks, then channel-specific overrides
+ * can be applied on top, deny types apply a logic NOT to the bit mask, and allows apply a logical OR.
+ *
+ * @note Every guild has at least one role, called the 'everyone' role, which always has the same role
+ * ID as the guild's ID. This is the base permission set applied to all users where no other role or override
+ * applies, and is the starting value of the bit mask looped through to calculate channel permissions.
+ */
+class DPP_EXPORT role : public managed, public json_interface<role> {
+protected:
+	friend struct json_interface<role>;
+
+	/**
+	 * @brief Fill this role from json.
+	 * 
+	 * @param j The json data
+	 * @return A reference to self
+	 */
+	role& fill_from_json_impl(nlohmann::json* j);
+
+	/**
+	 * @brief Build a json from this object.
+	 * 
+	 * @param with_id true if the ID is to be included in the json
+	 * @return The json of the role
+	 */
+	virtual json to_json_impl(bool with_id = false) const;
+
+public:
+	/**
+	 * @brief Role name
+	 * Between 1 and 100 characters.
+	 */
+	std::string name{};
+
+	/**
+	 * @brief Guild ID
+	 */
+	snowflake guild_id{0};
+
+	/**
+	 * @brief Role colour.
+	 * A colour of 0 means no colour. If you want a black role,
+	 * you must use the value 0x000001.
+	 */
+	uint32_t colour{0};
+
+	/**
+	 * @brief Role position.
+	 *
+	 * @warning multiple roles can have the same position number.
+	 * As a result, comparing roles by position alone can lead to subtle bugs when checking for role hierarchy.
+	 * The recommended and correct way to compare for roles in the hierarchy is using the comparison operators on the role objects themselves.
+	 */
+	uint8_t position{0};
+
+	/**
+	 * @brief Role permissions bitmask values from dpp::permissions.
+	 */
+	permission permissions{};
+
+	/**
+	 * @brief Role flags from dpp::role_flags
+	 */
+	uint8_t flags{0};
+
+	/**
+	 * @brief Integration id if any.
+	 * (e.g. role is a bot's role created when it was invited).
+	 */
+	snowflake integration_id{};
+
+	/**
+	 * @brief Bot id if any.
+	 * (e.g. role is a bot's role created when it was invited)
+	 */
+	snowflake bot_id{};
+
+	/**
+	 * @brief The id of the role's subscription sku and listing.
+	 */
+	snowflake subscription_listing_id{};
+
+	/**
+	 * @brief The unicode emoji used for the role's icon.
+	 *
+	 * @note This can be an empty string.
+	 */
+	std::string unicode_emoji{};
+
+	/**
+	 * @brief The role icon.
+	 */
+	utility::icon icon{};
+
+	/**
+	 * @brief Construct a new role object
+	 */
+	role() = default;
+
+	/**
+	 * @brief Construct a new role object.
+	 *
+	 * @param rhs Role object to copy
+	 */
+	role(const role& rhs) = default;
+
+	/**
+	 * @brief Construct a new role object.
+	 *
+	 * @param rhs Role object to move
+	 */
+	role(role&& rhs) = default;
+
+	/**
+	 * @brief Copy another role object
+	 *
+	 * @param rhs Role object to copy
+	 */
+	role &operator=(const role& rhs) = default;
+
+	/**
+	 * @brief Move from another role object
+	 *
+	 * @param rhs Role object to copy
+	 */
+	role &operator=(role&& rhs) = default;
+
+	/**
+	 * @brief Destroy the role object
+	 */
+	virtual ~role() = default;
+
+	/**
+	* @brief Create a mentionable role.
+	* @param id The ID of the role.
+	* @return std::string The formatted mention of the role.
+	*/
+	static std::string get_mention(const snowflake& id);
+
+	/**
+	 * @brief Set the name of the role.
+	 * Maximum length: 100
+	 * Minimum length: 1
+	 * @param n Name to set
+	 * @return role& reference to self
+	 * @throw dpp::exception thrown if role length is less than 1 character
+	 */
+	role& set_name(const std::string& n);
+
+	/**
+	 * @brief Set the colour.
+	 * 
+	 * @param c Colour to set
+	 * @note There is an americanised version of this method, role::set_color().
+	 * @return role& reference to self
+	 */
+	role& set_colour(uint32_t c);
+
+	/**
+	 * @brief Set the color.
+	 * 
+	 * @param c Colour to set
+	 * @note This is an alias of role::set_colour for American spelling.
+	 * @return role& reference to self
+	 */
+	role& set_color(uint32_t c);
+
+	/**
+	 * @brief Set the flags.
+	 * 
+	 * @param f Flags to set from dpp::role_flags
+	 * @return role& reference to self
+	 */
+	role& set_flags(uint8_t f);
+
+	/**
+	 * @brief Set the integration ID.
+	 * 
+	 * @param i Integration ID to set
+	 * @return role& reference to self
+	 */
+	role& set_integration_id(snowflake i);
+
+	/**
+	 * @brief Set the bot ID.
+	 * 
+	 * @param b Bot ID to set
+	 * @return role& reference to self
+	 */
+	role& set_bot_id(snowflake b);
+
+	/**
+	 * @brief Set the guild ID.
+	 * 
+	 * @param gid Guild ID to set
+	 * @return role& reference to self
+	 */
+	role& set_guild_id(snowflake gid);
+
+	using json_interface<role>::fill_from_json;
+
+	/**
+	 * @brief Fill this role from json.
+	 * 
+	 * @param guild_id the guild id to place in the json
+	 * @param j The json data
+	 * @return A reference to self
+	 */
+	role& fill_from_json(snowflake guild_id, nlohmann::json* j);
+
+	/**
+	 * @brief Get the mention/ping for the role.
+	 * 
+	 * @return std::string mention
+	 */
+	std::string get_mention() const;
+
+	/**
+	 * @brief Returns the role's icon url if they have one, otherwise returns an empty string.
+	 *
+	 * @param size The size of the icon in pixels. It can be any power of two between 16 and 4096,
+	 * otherwise the default sized icon is returned.
+	 * @param format The format to use for the avatar. It can be one of `i_webp`, `i_jpg` or `i_png`.
+	 * @return std::string icon url or an empty string, if required attributes are missing or an invalid format was passed
+	 */
+	std::string get_icon_url(uint16_t size = 0, const image_type format = i_png) const;
+
+	/**
+	 * @brief Load a role icon.
+	 *
+	 * @param image_blob Image binary data
+	 * @param type Type of image. It can be one of `i_gif`, `i_jpg` or `i_png`.
+	 * @return emoji& Reference to self
+	 */
+	role& load_image(std::string_view image_blob, const image_type type);
+
+	/**
+	 * @brief Load a role icon.
+	 *
+	 * @param data Image binary data
+	 * @param size Size of the image.
+	 * @param type Type of image. It can be one of `i_gif`, `i_jpg` or `i_png`.
+	 * @return emoji& Reference to self
+	 */
+	role& load_image(const std::byte* data, uint32_t size, const image_type type);
+
+	/**
+	 * @brief Operator less than, used for checking if a role is below another.
+	 *
+	 * @param lhs first role to compare
+	 * @param rhs second role to compare
+	 * @return true if lhs is less than rhs
+	 */
+	friend inline bool operator< (const role& lhs, const role& rhs) {
+		if (lhs.position == rhs.position) {
+			// the higher the IDs are, the lower the position
+			return lhs.id > rhs.id;
+		}
+
+		return lhs.position < rhs.position;
+	}
+
+	/**
+	 * @brief Operator greater than, used for checking if a role is above another.
+	 *
+	 * @param lhs first role to compare
+	 * @param rhs second role to compare
+	 * @return true if lhs is greater than rhs
+	 */
+	friend inline bool operator> (const role& lhs, const role& rhs) {
+		return !(lhs < rhs);
+	}
+
+	/**
+	 * @brief Operator equals, used for checking if a role is ranked equal to another.
+	 *
+	 * @param other role to compare
+	 * @return true if is equal to other
+	 */
+	inline bool operator== (const role& other) const {
+		return this->id == other.id;
+	}
+
+	/**
+	 * @brief Operator not equals, used for checking if a role is ranked equal to another.
+	 *
+	 * @param other role to compare
+	 * @return true if is not equal to other
+	 */
+	inline bool operator!= (const role& other) const {
+		return this->id != other.id;
+	}
+
+	/**
+	 * @brief True if the role is hoisted.
+	 *
+	 * @return bool Role appears separated from others in the member list
+	 */
+	bool is_hoisted() const;
+
+	/**
+	 * @brief True if the role is mentionable.
+	 *
+	 * @return bool Role is mentionable
+	 */
+	bool is_mentionable() const;
+
+	/**
+	 * @brief True if the role is managed (belongs to a bot or application).
+	 *
+	 * @return bool True if the role is managed (introduced for a bot or other application by Discord)
+	 */
+	bool is_managed() const;
+
+	/**
+	 * @brief True if the role is the guild's Booster role.
+	 *
+	 * @return bool whether the role is the premium subscriber, AKA "boost", role for the guild
+	 */
+	bool is_premium_subscriber() const;
+
+	/**
+	 * @brief True if the role is available for purchase.
+	 *
+	 * @return bool whether this role is available for purchase
+	 */
+	bool is_available_for_purchase() const;
+
+	/**
+	 * @brief True if the role is a linked role.
+	 *
+	 * @return bool True if the role is a linked role
+	 */
+	bool is_linked() const;
+
+	/**
+	 * @brief True if the role can be selected by members in an onboarding prompt.
+	 *
+	 * @return bool True if the role can be selected by members in an onboarding prompt
+	 */
+	bool is_selectable_in_prompt() const;
+
+	/**
+	 * @brief True if has create instant invite permission.
+	 *
+	 * @note Having the administrator permission causes this method to always return true
+	 * Channel specific overrides may apply to permissions.
+	 * @return bool True if user has the instant invite permission or is administrator.
+	 */
+	bool has_create_instant_invite() const;
+
+	/**
+	 * @brief True if has the kick members permission.
+	 *
+	 * @note Having the administrator permission causes this method to always return true
+	 * Channel specific overrides may apply to permissions.
+	 * @return bool True if user has the kick members permission or is administrator.
+	 */
+	bool has_kick_members() const;
+
+	/**
+	 * @brief True if has the ban members permission.
+	 *
+	 * @note Having the administrator permission causes this method to always return true
+	 * Channel specific overrides may apply to permissions.
+	 * @return bool True if user has the ban members permission or is administrator.
+	 */
+	bool has_ban_members() const;
+
+	/**
+	 * @brief True if has the administrator permission.
+	 *
+	 * @note Having the administrator permission causes this method to always return true
+	 * Channel specific overrides may apply to permissions.
+	 * @return bool True if user has the administrator permission or is administrator.
+	 */
+	bool has_administrator() const;
+
+	/**
+	 * @brief True if has the manage channels permission.
+	 *
+	 * @note Having the administrator permission causes this method to always return true
+	 * Channel specific overrides may apply to permissions.
+	 * @return bool True if user has the manage channels permission or is administrator.
+	 */
+	bool has_manage_channels() const;
+
+	/**
+	 * @brief True if has the manage guild permission.
+	 *
+	 * @note Having the administrator permission causes this method to always return true
+	 * Channel specific overrides may apply to permissions.
+	 * @return bool True if user has the manage guild permission or is administrator.
+	 */
+	bool has_manage_guild() const;
+
+	/**
+	 * @brief True if has the add reactions permission.
+	 *
+	 * @note Having the administrator permission causes this method to always return true
+	 * Channel specific overrides may apply to permissions.
+	 * @return bool True if user has the add reactions permission or is administrator.
+	 */
+	bool has_add_reactions() const;
+
+	/**
+	 * @brief True if has the view audit log permission.
+	 *
+	 * @note Having the administrator permission causes this method to always return true
+	 * Channel specific overrides may apply to permissions.
+	 * @return bool True if user has the view audit log permission or is administrator.
+	 */
+	bool has_view_audit_log() const;
+
+	/**
+	 * @brief True if has the priority speaker permission.
+	 *
+	 * @note Having the administrator permission causes this method to always return true
+	 * Channel specific overrides may apply to permissions.
+	 * @return bool True if user has the priority speaker permission or is administrator.
+	 */
+	bool has_priority_speaker() const;
+
+	/**
+	 * @brief True if has the stream permission.
+	 *
+	 * @note Having the administrator permission causes this method to always return true
+	 * Channel specific overrides may apply to permissions.
+	 * @return bool True if user has the stream permission or is administrator.
+	 */
+	bool has_stream() const;
+
+	/**
+	 * @brief True if has the view channel permission.
+	 *
+	 * @note Having the administrator permission causes this method to always return true
+	 * Channel specific overrides may apply to permissions.
+	 * @return bool True if user has the view channel permission or is administrator.
+	 */
+	bool has_view_channel() const;
+
+	/**
+	 * @brief True if has the send messages permission.
+	 *
+	 * @note Having the administrator permission causes this method to always return true
+	 * Channel specific overrides may apply to permissions.
+	 * @return bool True if user has the send messages permission or is administrator.
+	 */
+	bool has_send_messages() const;
+
+	/**
+	 * @brief True if has the send TTS messages permission.
+	 *
+	 * @note Having the administrator permission causes this method to always return true
+	 * Channel specific overrides may apply to permissions.
+	 * @return bool True if user has the send TTS messages permission or is administrator.
+	 */
+	bool has_send_tts_messages() const;
+
+	/**
+	 * @brief True if has the manage messages permission.
+	 *
+	 * @note Having the administrator permission causes this method to always return true
+	 * Channel specific overrides may apply to permissions.
+	 * @return bool True if user has the manage messages permission or is administrator.
+	 */
+	bool has_manage_messages() const;
+
+	/**
+	 * @brief True if has the embed links permission.
+	 *
+	 * @note Having the administrator permission causes this method to always return true
+	 * Channel specific overrides may apply to permissions.
+	 * @return bool True if user has the embed links permission or is administrator.
+	 */
+	bool has_embed_links() const;
+
+	/**
+	 * @brief True if has the attach files permission.
+	 *
+	 * @note Having the administrator permission causes this method to always return true
+	 * Channel specific overrides may apply to permissions.
+	 * @return bool True if user has the attach files permission or is administrator.
+	 */
+	bool has_attach_files() const;
+
+	/**
+	 * @brief True if has the read message history permission.
+	 *
+	 * @note Having the administrator permission causes this method to always return true
+	 * Channel specific overrides may apply to permissions.
+	 * @return bool True if user has the read message history permission or is administrator.
+	 */
+	bool has_read_message_history() const;
+
+	/**
+	 * @brief True if has the mention \@everyone and \@here permission.
+	 *
+	 * @note Having the administrator permission causes this method to always return true
+	 * Channel specific overrides may apply to permissions.
+	 * @return bool True if user has the mention \@everyone and \@here permission or is administrator.
+	 */
+	bool has_mention_everyone() const;
+
+	/**
+	 * @brief True if has the use external emojis permission.
+	 *
+	 * @note Having the administrator permission causes this method to always return true
+	 * Channel specific overrides may apply to permissions.
+	 * @return bool True if user has the use external emojis permission or is administrator.
+	 */
+	bool has_use_external_emojis() const;
+
+	/**
+	 * @brief True if has the view guild insights permission.
+	 *
+	 * @note Having the administrator permission causes this method to always return true
+	 * Channel specific overrides may apply to permissions.
+	 * @return bool True if user has the view guild insights permission or is administrator.
+	 */
+	bool has_view_guild_insights() const;
+
+	/**
+	 * @brief True if has the connect voice permission.
+	 *
+	 * @note Having the administrator permission causes this method to always return true
+	 * Channel specific overrides may apply to permissions.
+	 * @return bool True if user has the connect voice permission or is administrator.
+	 */
+	bool has_connect() const;
+
+	/**
+	 * @brief True if has the speak permission.
+	 *
+	 * @note Having the administrator permission causes this method to always return true
+	 * Channel specific overrides may apply to permissions.
+	 * @return bool True if user has the speak permission or is administrator.
+	 */
+	bool has_speak() const;
+
+	/**
+	 * @brief True if has the mute members permission.
+	 *
+	 * @note Having the administrator permission causes this method to always return true
+	 * Channel specific overrides may apply to permissions.
+	 * @return bool True if user has the mute members permission or is administrator.
+	 */
+	bool has_mute_members() const;
+
+	/**
+	 * @brief True if has the deafen members permission.
+	 *
+	 * @note Having the administrator permission causes this method to always return true
+	 * Channel specific overrides may apply to permissions.
+	 * @return bool True if user has the deafen members permission or is administrator.
+	 */
+	bool has_deafen_members() const;
+
+	/**
+	 * @brief True if has the move members permission.
+	 *
+	 * @note Having the administrator permission causes this method to always return true
+	 * Channel specific overrides may apply to permissions.
+	 * @return bool True if user has the move members permission or is administrator.
+	 */
+	bool has_move_members() const;
+
+	/**
+	 * @brief True if has use voice activity detection permission
+	 *
+	 * @note Having the administrator permission causes this method to always return true
+	 * Channel specific overrides may apply to permissions.
+	 * @return bool True if user has use voice activity detection permission or is administrator.
+	 */
+	bool has_use_vad() const;
+
+	/**
+	 * @brief True if has the change nickname permission.
+	 *
+	 * @note Having the administrator permission causes this method to always return true
+	 * Channel specific overrides may apply to permissions.
+	 * @return bool True if user has the change nickname permission or is administrator.
+	 */
+	bool has_change_nickname() const;
+
+	/**
+	 * @brief True if has the manage nicknames permission.
+	 *
+	 * @note Having the administrator permission causes this method to always return true
+	 * Channel specific overrides may apply to permissions.
+	 * @return bool True if user has the manage nicknames permission or is administrator.
+	 */
+	bool has_manage_nicknames() const;
+
+	/**
+	 * @brief True if has the manage roles permission.
+	 *
+	 * @note Having the administrator permission causes this method to always return true
+	 * Channel specific overrides may apply to permissions.
+	 * @return bool True if user has the manage roles permission or is administrator.
+	 */
+	bool has_manage_roles() const;
+
+	/**
+	 * @brief True if has the manage webhooks permission.
+	 *
+	 * @note Having the administrator permission causes this method to always return true
+	 * Channel specific overrides may apply to permissions.
+	 * @return bool True if user has the manage webhooks permission or is administrator.
+	 */
+	bool has_manage_webhooks() const;
+
+	/**
+	 * @brief True if has the manage emojis and stickers permission.
+	 *
+	 * @note Having the administrator permission causes this method to always return true
+	 * Channel specific overrides may apply to permissions.
+	 * @return bool True if user has the manage emojis and stickers permission or is administrator.
+	 */
+	bool has_manage_emojis_and_stickers() const;
+
+	/**
+	 * @brief True if has the use application commands permission.
+	 *
+	 * @note Having the administrator permission causes this method to always return true
+	 * Channel specific overrides may apply to permissions.
+	 * @return bool True if user has the use application commands permission or is administrator.
+	 */
+	bool has_use_application_commands() const;
+
+	/**
+	 * @brief True if has the request to speak permission.
+	 *
+	 * @note Having the administrator permission causes this method to always return true
+	 * Channel specific overrides may apply to permissions.
+	 * @return bool True if user has the request to speak permission or is administrator.
+	 */
+	bool has_request_to_speak() const;
+
+	/**
+	 * @brief True if has the manage threads permission.
+	 *
+	 * @note Having the administrator permission causes this method to always return true
+	 * Channel specific overrides may apply to permissions.
+	 * @return bool True if user has the manage threads permission or is administrator.
+	 */
+	bool has_manage_threads() const;
+
+	/**
+	 * @brief True if has the create public threads permission.
+	 *
+	 * @note Having the administrator permission causes this method to always return true
+	 * Channel specific overrides may apply to permissions.
+	 * @return bool True if user has the create public threads permission or is administrator.
+	 */
+	bool has_create_public_threads() const;
+
+	/**
+	 * @brief True if has the create private threads permission.
+	 *
+	 * @note Having the administrator permission causes this method to always return true
+	 * Channel specific overrides may apply to permissions.
+	 * @return bool True if user has the create private threads permission or is administrator.
+	 */
+	bool has_create_private_threads() const;
+
+	/**
+	 * @brief True if has the use external stickers permission.
+	 *
+	 * @note Having the administrator permission causes this method to always return true
+	 * Channel specific overrides may apply to permissions.
+	 * @return bool True if user has the use external stickers permission or is administrator.
+	 */
+
+	bool has_use_external_stickers() const;
+	/**
+	 * @brief True if has the send messages in threads permission.
+	 *
+	 * @note Having the administrator permission causes this method to always return true
+	 * Channel specific overrides may apply to permissions.
+	 * @return bool True if user has the send messages in threads permission or is administrator.
+	 */
+	bool has_send_messages_in_threads() const;
+
+	/**
+	 * @brief True if has the start embedded activities permission.
+	 *
+	 * @note Having the administrator permission causes this method to always return true
+	 * Channel specific overrides may apply to permissions.
+	 * @return bool True if user has the start embedded activities permission or is administrator.
+	 */
+	bool has_use_embedded_activities() const;
+
+	/**
+	 * @brief True if has the manage events permission.
+	 *
+	 * @note Having the administrator permission causes this method to always return true
+	 * Channel specific overrides may apply to permissions.
+	 * @return bool True if user has the manage events permission or is administrator.
+	 */
+	bool has_manage_events() const;
+
+	/**
+	 * @brief True if has the moderate users permission.
+	 *
+	 * @note Having the administrator permission causes this method to always return true
+	 * Channel specific overrides may apply to permissions.
+	 * @return bool True if user has the moderate users permission or is administrator.
+	 */
+	bool has_moderate_members() const;
+
+	/**
+	 * @brief True if has the view creator monetization analytics permission.
+	 *
+	 * @note Having the administrator permission causes this method to always return true
+	 * Channel specific overrides may apply to permissions.
+	 * @return bool True if user has the view creator monetization analytics permission or is administrator.
+	 */
+	bool has_view_creator_monetization_analytics() const;
+
+	/**
+	 * @brief True if has the use soundboard permission.
+	 *
+	 * @note Having the administrator permission causes this method to always return true
+	 * Channel specific overrides may apply to permissions.
+	 * @return bool True if user has the use soundboard permission or is administrator.
+	 */
+	bool has_use_soundboard() const;
+
+	/**
+	 * @brief True if has the create guild expressions permission.
+	 *
+	 * @note Having the administrator permission causes this method to always return true
+	 * Channel specific overrides may apply to permissions.
+	 *
+	 * @note Not yet available to developers.
+	 * @return bool True if user has the create guild expressions permission or is administrator.
+	 */
+	bool has_create_guild_expressions() const;
+
+	/**
+	 * @brief True if has the create events permission.
+	 *
+	 * @note Having the administrator permission causes this method to always return true
+	 * Channel specific overrides may apply to permissions.
+	 *
+	 * @note Not yet available to developers.
+	 * @return bool True if user has the create events permission or is administrator.
+	 */
+	bool has_create_events() const;
+
+	/**
+	 * @brief True if has the use external sounds permission.
+	 *
+	 * @note Having the administrator permission causes this method to always return true
+	 * Channel specific overrides may apply to permissions.
+	 * @return bool True if user has the use external sounds permission or is administrator.
+	 */
+	bool has_use_external_sounds() const;
+
+	/**
+	 * @brief True if has the send voice messages permission.
+	 *
+	 * @note Having the administrator permission causes this method to always return true
+	 * Channel specific overrides may apply to permissions.
+	 * @return bool True if user has the send voice messages permission or is administrator.
+	 */
+	bool has_send_voice_messages() const;
+
+	/**
+	 * @brief True if has permission to use clyde AI.
+	 *
+	 * @note Having the administrator permission causes this method to always return true
+	 * Channel specific overrides may apply to permissions.
+	 * @return bool True if user has the clyde AI permission or is administrator.
+	 */
+	bool has_use_clyde_ai() const;
+
+	/**
+	 * @brief True if has the send polls permission.
+	 *
+	 * @note Having the administrator permission causes this method to always return true
+	 * Channel specific overrides may apply to permissions.
+	 * @return bool True if user has the send polls permission or is administrator.
+	 */
+	bool has_send_polls() const;
+
+	/**
+	 * @brief True if has the use external apps permission.
+	 *
+	 * @note Having the administrator permission causes this method to always return true
+	 * Channel specific overrides may apply to permissions.
+	 * @return bool True if user has the use external apps permission or is administrator.
+	 */
+	bool has_use_external_apps() const;
+
+	/**
+	 * @brief True if has permission to use pin messages.
+	 *
+	 * @note Having the administrator permission causes this method to always return true
+	 * Channel specific overrides may apply to permissions.
+	 * @return bool True if user has the Pin Messages permission or is administrator.
+	 */
+	bool has_pin_messages() const;
+
+	/**
+	 * @brief True if has the bypass slow mode permission.
+	 *
+	 * @note Having the administrator permission causes this method to always return true
+	 * Channel specific overrides may apply to permissions.
+	 * @return bool True if user has the bypass slow mode permission or is administrator.
+	 */
+	bool has_bypass_slowmode() const;
+
+	/**
+	 * @brief Get guild members who have this role.
+	 *
+	 * @note This method requires user/members cache to be active
+	 * @return members_container List of members who have this role
+	 */
+	members_container get_members() const;
+};
+
+/**
+ * @brief Application Role Connection Metadata Type
+ *
+ * @note Each metadata type offers a comparison operation that allows guilds
+ * to configure role requirements based on metadata values stored by the bot.
+ * Bots specify a `metadata value` for each user and guilds specify the
+ * required `guild's configured value` within the guild role settings.
+ */
+enum application_role_connection_metadata_type : uint8_t {
+	/**
+	 * @brief The metadata value (integer) is less than or equal to the guild's configured value (integer).
+	 */
+	rc_integer_less_than_or_equal = 1,
+
+	/**
+	 * @brief The metadata value (integer) is greater than or equal to the guild's configured value (integer).
+	 */
+	rc_integer_greater_than_or_equal = 2,
+
+	/**
+	 * @brief The metadata value (integer) is equal to the guild's configured value (integer).
+	 */
+	rc_integer_equal = 3,
+
+	/**
+	 * @brief The metadata value (integer) is not equal to the guild's configured value (integer).
+	 */
+	rc_integer_not_equal = 4,
+
+	/**
+	 * @brief The metadata value (ISO8601 string) is less than or equal to the guild's configured value (integer; days before current date).
+	 */
+	rc_datetime_less_than_or_equal = 5,
+
+	/**
+	 * @brief The metadata value (ISO8601 string) is greater than or equal to the guild's configured value (integer; days before current date).
+	 */
+	rc_datetime_greater_than_or_equal = 6,
+
+	/**
+	 * @brief The metadata value (integer) is equal to the guild's configured value (integer; 1).
+	 */
+	rc_boolean_equal = 7,
+
+	/**
+	 * @brief The metadata value (integer) is not equal to the guild's configured value (integer; 1).
+	 */
+	rc_boolean_not_equal = 8,
+};
+
+/**
+ * @brief Application Role Connection Metadata. Represents a role connection metadata for an dpp::application
+ */
+class DPP_EXPORT application_role_connection_metadata : public json_interface<application_role_connection_metadata> {
+protected:
+	friend struct json_interface<application_role_connection_metadata>;
+
+	/** Fill this record from json.
+	 * @param j The json to fill this record from
+	 * @return Reference to self
+	 */
+	application_role_connection_metadata& fill_from_json_impl(nlohmann::json* j);
+
+	/**
+	 * @brief Convert to JSON
+	 *
+	 * @param with_id include ID in output
+	 * @return json JSON output
+	 */
+	virtual json to_json_impl(bool with_id = false) const;
+
+public:
+	/**
+	 * @brief Type of metadata value.
+	 */
+	application_role_connection_metadata_type type;
+
+	/**
+	 * @brief Dictionary key for the metadata field (must be `a-z`, `0-9`, or `_` characters; 1-50 characters).
+	 */
+	std::string key;
+
+	/**
+	 * @brief Name of the metadata field (1-100 characters).
+	 */
+	std::string name;
+
+	/**
+	 * @brief Translations of the name.
+	 */
+	std::map<std::string, std::string> name_localizations;
+
+	/**
+	 * @brief Description of the metadata field (1-200 characters).
+	 */
+	std::string description;
+
+	/**
+	 * @brief Translations of the description.
+	 */
+	std::map<std::string, std::string> description_localizations;
+
+	/**
+	 * @brief Constructor
+	 */
+	application_role_connection_metadata();
+
+	virtual ~application_role_connection_metadata() = default;
+};
+
+/**
+ * @brief The application role connection that an application has attached to a user.
+ */
+class DPP_EXPORT application_role_connection : public json_interface<application_role_connection> {
+protected:
+	friend struct json_interface<application_role_connection>;
+
+	/**
+	 * @brief Fill this record from json.
+	 * @param j The json to fill this record from
+	 * @return Reference to self
+	 */
+	application_role_connection& fill_from_json_impl(nlohmann::json* j);
+
+	/**
+	 * @brief Convert to JSON
+	 *
+	 * @param with_id include ID in output
+	 * @return json JSON output
+	 */
+	virtual json to_json_impl(bool with_id = false) const;
+
+public:
+	/**
+	 * @brief Optional: The vanity name of the platform a bot has connected (max 50 characters).
+	 */
+	std::string platform_name;
+
+	/**
+	 * @brief Optional: The username on the platform a bot has connected (max 100 characters).
+	 */
+	std::string platform_username;
+
+	/**
+	 * @brief Optional: Object mapping application role connection metadata keys to their "stringified" value (max 100 characters) for the user on the platform a bot has connected.
+	 */
+	std::variant<std::monostate, application_role_connection_metadata> metadata;
+
+	/**
+	 * @brief Constructor
+	 */
+	application_role_connection();
+
+	virtual ~application_role_connection() = default;
+};
+
+/**
+ * @brief A group of roles.
+ */
+typedef std::unordered_map<snowflake, role> role_map;
+
+/**
+ * @brief A group of dpp::application_role_connection_metadata objects.
+ */
+typedef std::vector<application_role_connection_metadata> application_role_connection_metadata_list;
+
+}
+
diff --git a/3rdParty/dpp/scheduled_event.h b/3rdParty/dpp/scheduled_event.h
index 5e8a63ec97..c234fc73d6 100644
--- a/3rdParty/dpp/scheduled_event.h
+++ b/3rdParty/dpp/scheduled_event.h
@@ -1,224 +1,339 @@
-/************************************************************************************
- *
- * D++, A Lightweight C++ library for Discord
- *
- * Copyright 2021 Craig Edwards and D++ contributors 
- * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- ************************************************************************************/
-#pragma once
-#include <dpp/export.h>
-#include <dpp/snowflake.h>
-#include <dpp/managed.h>
-#include <dpp/user.h>
-#include <dpp/guild.h>
-#include <dpp/nlohmann/json_fwd.hpp>
-#include <dpp/json_interface.h>
-
-namespace dpp {
-
-/**
- * @brief Represents the privacy of an event
- */
-enum event_privacy_level : uint8_t {
-	/// The event is visible to only guild members.
-	ep_guild_only = 2
-};
-
-/**
- * @brief Event entity types
- */
-enum event_entity_type : uint8_t {
-	/// A stage instance
-	eet_stage_instance = 1,
-	/// A voice channel
-	eet_voice = 2,
-	/// External to discord, or a text channel etc
-	eet_external = 3
-};
-
-/**
- * @brief Event status types
- */
-enum event_status : uint8_t {
-	/// Scheduled
-	es_scheduled	=	1,
-	/// Active now
-	es_active	=	2,
-	/// Completed
-	es_completed	=	3,
-	/// Cancelled
-	es_cancelled	=	4
-};
-
-/**
- * @brief Entities for the event
- */
-struct DPP_EXPORT event_entities {
-	/// location of the event
-	std::string location;
-};
-
-/**
- * @brief Represents a guild member/user who has registered interest in an event
- * 
- */
-struct DPP_EXPORT event_member {
-	/**
-	 * @brief Event ID associated with
-	 */
-        snowflake guild_scheduled_event_id;
-	/**
-	 * @brief User details of associated user
-	 * 
-	 */
-        dpp::user user;
-	/**
-	 * @brief Member details of user on the associated guild
-	 */
-        dpp::guild_member member;
-};
-
-/**
- * @brief A scheduled event
- */
-struct DPP_EXPORT scheduled_event : public managed, public json_interface<scheduled_event> {
-	snowflake		guild_id;		//!< the guild id which the scheduled event belongs to
-	snowflake		channel_id;		//!< the channel id in which the scheduled event will be hosted, or null if scheduled entity type is EXTERNAL (may be empty)
-	snowflake		creator_id;		//!< Optional: the id of the user that created the scheduled event
-	std::string		name;			//!< the name of the scheduled event
-	std::string		description;		//!< Optional: the description of the scheduled event (1-1000 characters)
-	std::string		image;			//!< the image of the scheduled event (may be empty)
-	time_t			scheduled_start_time;	//!< the time the scheduled event will start
-	time_t			scheduled_end_time;	//!< the time the scheduled event will end, or null if the event does not have a scheduled time to end (may be empty)
-	event_privacy_level	privacy_level;		//!< the privacy level of the scheduled event
-	event_status		status;			//!< the status of the scheduled event
-	event_entity_type	entity_type;		//!< the type of hosting entity associated with a scheduled event, e.g. voice channel or stage channel
-	snowflake		entity_id;		//!< any additional id of the hosting entity associated with event, e.g. stage instance id) (may be empty)
-	event_entities		entity_metadata;	//!< the entity metadata for the scheduled event (may be empty)
-	user			creator;		//!< Optional: the creator of the scheduled event
-	uint32_t		user_count;		//!< Optional: the number of users subscribed to the scheduled event
-
-	/**
-	 * @brief Create a scheduled_event object
-	 */
-	scheduled_event();
-
-	/**
-	 * @brief Destroy the scheduled_event object
-	 */
-	~scheduled_event() = default;
-
-	/**
-	 * @brief Set the name of the event
-	 * Minimum length: 1, Maximum length: 100
-	 * @param n event name
-	 * @return scheduled_event& reference to self
-	 * @throw dpp::length_error if length < 1
-	 */
-	scheduled_event& set_name(const std::string& n);
-
-	/**
-	 * @brief Set the description of the event
-	 * Minimum length: 1 (if set), Maximum length: 100
-	 * @param d event description
-	 * @return scheduled_event& reference to self
-	 * @throw dpp::length_error if length < 1
-	 */
-	scheduled_event& set_description(const std::string& d);
-
-	/**
-	 * @brief Clear the description of the event
-	 * @return scheduled_event& reference to self
-	 */
-	scheduled_event& clear_description();
-
-	/**
-	 * @brief Set the location of the event.
-	 * Minimum length: 1, Maximum length: 1000
-	 * @note Clears channel_id
-	 * @param l event location
-	 * @return scheduled_event& reference to self
-	 * @throw dpp::length_error if length < 1
-	 */
-	scheduled_event& set_location(const std::string& l);
-
-	/**
-	 * @brief Set the voice channel id of the event
-	 * @note clears location
-	 * @param c channel ID
-	 * @return scheduled_event& reference to self
-	 */
-	scheduled_event& set_channel_id(snowflake c);
-
-	/**
-	 * @brief Set the creator id of the event
-	 * @param c creator user ID
-	 * @return scheduled_event& reference to self
-	 */
-	scheduled_event& set_creator_id(snowflake c);
-
-	/**
-	 * @brief Set the status of the event
-	 * @param s status to set
-	 * @return scheduled_event& reference to self
-	 * @throw dpp::logic_exception if status change is not valid
-	 */
-	scheduled_event& set_status(event_status s);
-
-	/**
-	 * @brief Set the start time of the event
-	 * @param t starting time
-	 * @return scheduled_event& reference to self
-	 * @throw dpp::length_error if time is before now
-	 */
-	scheduled_event& set_start_time(time_t t);
-
-	/**
-	 * @brief Set the end time of the event
-	 * @param t ending time
-	 * @return scheduled_event& reference to self
-	 * @throw dpp::length_error if time is before now
-	 */
-	scheduled_event& set_end_time(time_t t);
-
-	/**
-	 * @brief Serialise a scheduled_event object from json
-	 *
-	 * @return scheduled_event& a reference to self
-	 */
-	scheduled_event& fill_from_json(const nlohmann::json* j);
-
-	/**
-	 * @brief Build json for this object
-	 * @param with_id Include id field in json
-	 *
-	 * @return std::string Dumped json of this object
-	 */
-	virtual std::string build_json(bool with_id = false) const;
-};
-
-/**
- * @brief A group of scheduled events
- */
-typedef std::unordered_map<snowflake, scheduled_event> scheduled_event_map;
-
-/**
- * @brief A group of scheduled event members
- */
-typedef std::unordered_map<snowflake, event_member> event_member_map;
-
-
-};
+/************************************************************************************
+ *
+ * D++, A Lightweight C++ library for Discord
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright 2021 Craig Edwards and D++ contributors 
+ * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ************************************************************************************/
+#pragma once
+#include <dpp/export.h>
+#include <dpp/snowflake.h>
+#include <dpp/managed.h>
+#include <dpp/user.h>
+#include <dpp/guild.h>
+#include <dpp/json_fwd.h>
+#include <dpp/json_interface.h>
+
+namespace dpp {
+
+/**
+ * @brief Represents the privacy of an event.
+ */
+enum event_privacy_level : uint8_t {
+	/**
+	 * @brief The event is visible to only guild members.
+	 */
+	ep_guild_only = 2
+};
+
+/**
+ * @brief Event entity types.
+ */
+enum event_entity_type : uint8_t {
+	/**
+	 * @brief A stage instance.
+	 */
+	eet_stage_instance = 1,
+
+	/**
+	 * @brief A voice channel.
+	 */
+	eet_voice = 2,
+
+	/**
+	 * @brief External to discord, or a text channel etc.
+	 */
+	eet_external = 3
+};
+
+/**
+ * @brief Event status types.
+ */
+enum event_status : uint8_t {
+	/**
+	 * @brief Scheduled.
+	 */
+	es_scheduled = 1,
+
+	/**
+	 * @brief Active now.
+	 */
+	es_active = 2,
+
+	/**
+	 * @brief Completed.
+	 */
+	es_completed = 3,
+
+	/**
+	 * @brief Cancelled.
+	 */
+	es_cancelled = 4
+};
+
+/**
+ * @brief Entities for the event.
+ */
+struct DPP_EXPORT event_entities {
+	/**
+	 * @brief Location of the event.
+	 */
+	std::string location;
+};
+
+/**
+ * @brief Represents a guild member/user who has registered interest in an event.
+ * 
+ */
+struct DPP_EXPORT event_member {
+	/**
+	 * @brief Event ID associated with.
+	 */
+        snowflake guild_scheduled_event_id;
+
+	/**
+	 * @brief User details of associated user.
+	 * 
+	 */
+        dpp::user user;
+
+	/**
+	 * @brief Member details of user on the associated guild.
+	 */
+        dpp::guild_member member;
+};
+
+/**
+ * @brief A scheduled event.
+ */
+struct DPP_EXPORT scheduled_event : public managed, public json_interface<scheduled_event> {
+protected:
+	friend struct json_interface<scheduled_event>;
+
+	/**
+	 * @brief Serialise a scheduled_event object from json
+	 *
+	 * @return scheduled_event& a reference to self
+	 */
+	scheduled_event& fill_from_json_impl(const nlohmann::json* j);
+
+	/**
+	 * @brief Build json for this object
+	 * @param with_id Include id field in json
+	 *
+	 * @return std::string Json of this object
+	 */
+	json to_json_impl(bool with_id = false) const;
+
+public:
+	/**
+	 * @brief The guild ID which the scheduled event belongs to.
+	 */
+	snowflake guild_id;
+
+	/**
+	 * @brief The channel ID in which the scheduled event will be hosted, or null if scheduled entity type is EXTERNAL.
+	 *
+	 * @note This may be empty.
+	 */
+	snowflake channel_id;
+
+	/**
+	 * @brief Optional: The ID of the user that created the scheduled event.
+	 */
+	snowflake creator_id;
+
+	/**
+	 * @brief The name of the scheduled event.
+	 */
+	std::string name;
+
+	/**
+	 * @brief Optional: The description of the scheduled event (1-1000 characters).
+	 */
+	std::string description;
+
+	/**
+	 * @brief The image of the scheduled event.
+	 *
+	 * @note This may be empty.
+	 */
+	utility::icon image;
+
+	/**
+	 * @brief The time the scheduled event will start.
+	 */
+	time_t scheduled_start_time;
+
+	/**
+	 * @brief The time the scheduled event will end, or null if the event does not have a scheduled time to end.
+	 *
+	 * @note This may be empty.
+	 */
+	time_t scheduled_end_time;
+
+	/**
+	 * @brief The privacy level of the scheduled event.
+	 */
+	event_privacy_level privacy_level;
+
+	/**
+	 * @brief The status of the scheduled event.
+	 */
+	event_status status;
+
+	/**
+	 * @brief The type of hosting entity associated with a scheduled event.
+	 * e.g. voice channel or stage channel.
+	 */
+	event_entity_type entity_type;
+
+	/**
+	 * @brief Any additional ID of the hosting entity associated with event.
+	 * e.g. stage instance ID.
+	 *
+	 * @note This may be empty.
+	 */
+	snowflake entity_id;
+
+	/**
+	 * @brief The entity metadata for the scheduled event.
+	 *
+	 * @note This may be empty.
+	 */
+	event_entities entity_metadata;
+
+	/**
+	 * @brief Optional: The creator of the scheduled event.
+	 */
+	user creator;
+
+	/**
+	 * @brief Optional: The number of users subscribed to the scheduled event.
+	 */
+	uint32_t user_count;
+
+	/**
+	 * @brief Create a scheduled_event object.
+	 */
+	scheduled_event();
+
+	/**
+	 * @brief Set the name of the event.
+	 * Minimum length: 1, Maximum length: 100
+	 * @param n event name
+	 * @return scheduled_event& reference to self
+	 * @throw dpp::length_error if length < 1
+	 */
+	scheduled_event& set_name(const std::string& n);
+
+	/**
+	 * @brief Set the description of the event.
+	 * Minimum length: 1 (if set), Maximum length: 100
+	 * @param d event description
+	 * @return scheduled_event& reference to self
+	 * @throw dpp::length_error if length < 1
+	 */
+	scheduled_event& set_description(const std::string& d);
+
+	/**
+	 * @brief Clear the description of the event.
+	 * @return scheduled_event& reference to self
+	 */
+	scheduled_event& clear_description();
+
+	/**
+	 * @brief Set the location of the event.
+	 * Minimum length: 1, Maximum length: 1000
+	 * @note Clears channel_id
+	 * @param l event location
+	 * @return scheduled_event& reference to self
+	 * @throw dpp::length_error if length < 1
+	 */
+	scheduled_event& set_location(const std::string& l);
+
+	/**
+	 * @brief Set the voice channel id of the event.
+	 * @note clears location
+	 * @param c channel ID
+	 * @return scheduled_event& reference to self
+	 */
+	scheduled_event& set_channel_id(snowflake c);
+
+	/**
+	 * @brief Set the creator id of the event.
+	 * @param c creator user ID
+	 * @return scheduled_event& reference to self
+	 */
+	scheduled_event& set_creator_id(snowflake c);
+
+	/**
+	 * @brief Set the status of the event.
+	 * @param s status to set
+	 * @return scheduled_event& reference to self
+	 * @throw dpp::logic_exception if status change is not valid
+	 */
+	scheduled_event& set_status(event_status s);
+
+	/**
+	 * @brief Set the start time of the event.
+	 * @param t starting time
+	 * @return scheduled_event& reference to self
+	 * @throw dpp::length_error if time is before now
+	 */
+	scheduled_event& set_start_time(time_t t);
+
+	/**
+	 * @brief Set the end time of the event.
+	 * @param t ending time
+	 * @return scheduled_event& reference to self
+	 * @throw dpp::length_error if time is before now
+	 */
+	scheduled_event& set_end_time(time_t t);
+
+	/**
+	 * @brief Load an image for the event cover.
+	 *
+	 * @param image_blob Image binary data
+	 * @param type Type of image. It can be one of `i_gif`, `i_jpg` or `i_png`.
+	 * @return emoji& Reference to self
+	 */
+	scheduled_event& load_image(std::string_view image_blob, const image_type type);
+
+	/**
+	 * @brief Load an image for the event cover.
+	 *
+	 * @param data Image binary data
+	 * @param size Size of the image.
+	 * @param type Type of image. It can be one of `i_gif`, `i_jpg` or `i_png`.
+	 * @return emoji& Reference to self
+	 */
+	scheduled_event& load_image(const std::byte* data, uint32_t size, const image_type type);
+};
+
+/**
+ * @brief A group of scheduled events.
+ */
+typedef std::unordered_map<snowflake, scheduled_event> scheduled_event_map;
+
+/**
+ * @brief A group of scheduled event members.
+ */
+typedef std::unordered_map<snowflake, event_member> event_member_map;
+
+
+} // namespace dpp
diff --git a/3rdParty/dpp/signature_verifier.h b/3rdParty/dpp/signature_verifier.h
new file mode 100644
index 0000000000..3bc1aec36a
--- /dev/null
+++ b/3rdParty/dpp/signature_verifier.h
@@ -0,0 +1,53 @@
+/************************************************************************************
+ *
+ * D++, A Lightweight C++ library for Discord
+ *
+ * Copyright 2021 Craig Edwards and D++ contributors
+ * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ************************************************************************************/
+
+#pragma once
+
+#include <dpp/export.h>
+#include <string>
+#include <mutex>
+
+namespace dpp {
+
+/**
+ * @brief Verifies signatures on incoming webhooks using OpenSSL
+ */
+class signature_verifier {
+public:
+	/**
+	 * @brief Constructor initializes the OpenSSL context and public key buffer
+	 */
+	signature_verifier();
+
+	/**
+	 * @brief Verifies the signature with the provided public key, timestamp, body, and signature
+	 * @param timestamp The timestamp of the request
+	 * @param body The body of the request
+	 * @param signature The hex-encoded signature to verify
+	 * @param public_key_hex The hex-encoded public key
+	 * @return true if the signature is valid, false otherwise
+	 */
+	bool verify_signature(const std::string& timestamp, const std::string& body, const std::string& signature, const std::string& public_key_hex);
+
+};
+
+}
+
diff --git a/3rdParty/dpp/sku.h b/3rdParty/dpp/sku.h
new file mode 100644
index 0000000000..59c149c89a
--- /dev/null
+++ b/3rdParty/dpp/sku.h
@@ -0,0 +1,176 @@
+/************************************************************************************
+ *
+ * D++, A Lightweight C++ library for Discord
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright 2021 Craig Edwards and D++ contributors
+ * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ************************************************************************************/
+
+#pragma once
+#include <dpp/export.h>
+#include <dpp/snowflake.h>
+#include <dpp/managed.h>
+#include <dpp/json_fwd.h>
+#include <dpp/json_interface.h>
+#include <unordered_map>
+
+namespace dpp {
+
+/**
+ * @brief The type of SKU.
+ * */
+enum sku_type : uint8_t {
+	/**
+	 * @brief Represents a durable one-time purchase
+	 */
+	DURABLE = 2,
+	/**
+	 * @brief Consumable one-time purchase
+	 */
+	CONSUMABLE = 3,
+	/**
+	 * @brief Represents a recurring subscription
+	 */
+	SUBSCRIPTION = 5,
+
+	/**
+	 * @brief System-generated group for each SUBSCRIPTION SKU created
+	 * @warning These are automatically created for each subscription SKU and are not used at this time. Please refrain from using these.
+	 */
+	SUBSCRIPTION_GROUP = 6,
+};
+
+/**
+ * @brief SKU flags.
+ */
+enum sku_flags : uint16_t {
+	/**
+	 * @brief SKU is available for purchase
+	 */
+	sku_available =			0b000000000000100,
+
+	/**
+	 * @brief Recurring SKU that can be purchased by a user and applied to a single server. Grants access to every user in that server.
+	 */
+	sku_guild_subscription = 	0b000000010000000,
+
+	/**
+	 * @brief Recurring SKU purchased by a user for themselves. Grants access to the purchasing user in every server.
+	 */
+	sku_user_subscription =		0b000000100000000,
+};
+
+/**
+ * @brief A definition of a discord SKU.
+ */
+class DPP_EXPORT sku : public managed, public json_interface<sku> {
+protected:
+	friend struct json_interface<sku>;
+
+	/** Read class values from json object
+	 * @param j A json object to read from
+	 * @return A reference to self
+	 */
+	sku& fill_from_json_impl(nlohmann::json* j);
+
+	/**
+	 * @brief Build json for this SKU object
+	 *
+	 * @param with_id include the ID in the json
+	 * @return json JSON object
+	 */
+	json to_json_impl(bool with_id = false) const;
+
+public:
+	/**
+	 * @brief The type of SKU.
+	 */
+	sku_type type{sku_type::SUBSCRIPTION};
+
+	/**
+	 * @brief ID of the parent application
+	 */
+	snowflake application_id{0};
+
+	/**
+	 * @brief Customer-facing name of your premium offering
+	 */
+	std::string name{};
+
+	/**
+	 * @brief System-generated URL slug based on the SKU's name
+	 */
+	std::string slug{};
+
+	/**
+	 * @brief Flags bitmap from dpp::sku_flags
+	 */
+	uint16_t flags{0};
+
+	/**
+	 * @brief Construct a new SKU object
+	 */
+	sku() = default;
+
+	/**
+	 * @brief Construct a new SKU object with all data required.
+	 *
+	 * @param id ID of the SKU.
+	 * @param type Type of SKU (sku_type).
+	 * @param application_id ID of the parent application.
+	 * @param name Customer-facing name of your premium offering.
+	 * @param slug System-generated URL slug based on the SKU's name.
+	 * @param flags Flags bitmap from dpp::sku_flags.
+	 *
+	 */
+	sku(const snowflake id, const sku_type type, const snowflake application_id, const std::string name, const std::string slug, const uint16_t flags);
+
+	/**
+	 * @brief Get the type of SKU.
+	 *
+	 * @return sku_type SKU type
+	 */
+	sku_type get_type() const;
+
+	/**
+	 * @brief Is the SKU available for purchase?
+	 *
+	 * @return true if the SKU can be purchased.
+	 */
+	bool is_available() const;
+
+	/**
+	 * @brief Is the SKU a guild subscription?
+	 *
+	 * @return true if the SKU is a guild subscription.
+	 */
+	bool is_guild_subscription() const;
+
+	/**
+	 * @brief Is the SKU a user subscription?
+	 *
+	 * @return true if the SKU is a user subscription
+	 */
+	bool is_user_subscription() const;
+};
+
+/**
+ * @brief Group of SKUs.
+ */
+typedef std::unordered_map<snowflake, sku> sku_map;
+
+}
diff --git a/3rdParty/dpp/snowflake.h b/3rdParty/dpp/snowflake.h
index 2eb0205d1c..a675964ebe 100644
--- a/3rdParty/dpp/snowflake.h
+++ b/3rdParty/dpp/snowflake.h
@@ -1,196 +1,307 @@
-/************************************************************************************
- *
- * D++, A Lightweight C++ library for Discord
- *
- * Copyright 2021 Craig Edwards and D++ contributors 
- * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- ************************************************************************************/
-#pragma once
-#include <dpp/export.h>
-#include <dpp/nlohmann/json_fwd.hpp>
-#include <stdint.h>
-#include <functional>
-
-/**
- * @brief The main namespace for D++ functions. classes and types
- */
-namespace dpp {
-
-/** @brief A container for a 64 bit unsigned value representing many things on discord.
- * This value is known in distributed computing as a snowflake value.
- * 
- * Snowflakes are:
- * 
- * - Performant (very fast to generate at source and to compare in code)
- * - Uncoordinated (allowing high availability across clusters, data centres etc)
- * - Time ordered (newer snowflakes have higher IDs)
- * - Directly Sortable (due to time ordering)
- * - Compact (64 bit numbers, not 128 bit, or string)
- * 
- * An identical format of snowflake is used by Twitter, Instagram and several other platforms.
- * 
- * @see https://en.wikipedia.org/wiki/Snowflake_ID
- * @see https://github.com/twitter-archive/snowflake/tree/b3f6a3c6ca8e1b6847baa6ff42bf72201e2c2231
- */
-class DPP_EXPORT snowflake final {
-	friend struct std::hash<dpp::snowflake>;
-protected:
-	/**
-	 * @brief The snowflake value
-	 */
-	uint64_t value;
-
-public:
-	/**
-	 * @brief Construct a snowflake object
-	 * @param value A snowflake value
-	 */
-	snowflake(const uint64_t& value);
-
-	/**
-	 * @brief Construct a snowflake object
-	 * @param value A snowflake value
-	 */
-	snowflake(const std::string& string_value);
-
-	/**
- 	 * @brief Construct a snowflake object
- 	 */
-	snowflake();
-
-	/**
-	 * @brief Destroy the snowflake object
-	 */
-	~snowflake() = default;
-
-	/**
-	 * @brief For acting like an integer
-	 * @return The snowflake value
-	 */
-	operator uint64_t() const;
-
-	/**
-	 * @brief Returns true if the snowflake holds an empty value (is 0)
-	 * 
-	 * @return true if empty (zero)
-	 */
-	inline bool empty() const
-	{
-		return value == 0;
-	}
-
-	/**
-	 * @brief Operator less than, used for maps/unordered maps
-	 * when the snowflake is a key value.
-	 * 
-	 * @param lhs fist snowflake to compare
-	 * @param rhs second snowflake to compare
-	 * @return true if lhs is less than rhs
-	 */
-	friend inline bool operator< (const snowflake& lhs, const snowflake& rhs)
-	{
-		return lhs.value < rhs.value;
-	}
-
-	/**
-	 * @brief Assign from std::string
-	 * 
-	 * @param snowflake_val string to assign from.
-	 */
-	snowflake& operator=(const std::string &snowflake_val);
-
-	/**
-	 * @brief Assign from std::string
-	 * 
-	 * @param snowflake_val value to assign from.
-	 */
-	snowflake& operator=(const uint64_t &snowflake_val);
-
-	/**
-	 * @brief Check if one snowflake value is equal to another
-	 * 
-	 * @param other other snowflake to compare
-	 * @return True if the snowflake objects match
-	 */
-	bool operator==(const snowflake& other) const;
-
-	/**
-	 * @brief Check if one snowflake value is equal to a uint64_t
-	 * 
-	 * @param other other snowflake to compare
-	 * @return True if the snowflake objects match
-	 */
-	bool operator==(const uint64_t& other) const;
-
-	/**
-	 * @brief For acting like an integer
-	 * @return A reference to the snowflake value
-	 */
-	operator uint64_t &();
-
-	/**
-	 * @brief For building json
-	 * @return The snowflake value as a string
-	 */
-	operator nlohmann::json() const;
-
-	/**
-	 * @brief Get the creation time of this snowflake according to Discord.
-	 * 
-	 * @return double creation time inferred from the snowflake ID.
-	 * The minimum possible value is the first second of 2015.
-	 */
-	double get_creation_time() const;
-
-	/**
-	 * @brief Get the worker id that produced this snowflake value
-	 * 
-	 * @return uint8_t worker id
-	 */
-	uint8_t get_worker_id() const;
-
-	/**
-	 * @brief Get the process id that produced this snowflake value
-	 * 
-	 * @return uint8_t process id
-	 */
-	uint8_t get_process_id() const;
-
-	/**
-	 * @brief Get the increment, which is incremented for every snowflake
-	 * created over the one millisecond resolution in the timestamp.
-	 * 
-	 * @return uint64_t millisecond increment
-	 */
-	uint16_t get_increment() const;
-};
-
-};
-
-template<>
-struct std::hash<dpp::snowflake>
-{
-	/**
-	 * @brief Hashing function for dpp::slowflake
-	 * Used by std::unordered_map. This just calls std::hash<uint64_t>.
-	 * 
-	 * @param s Snowflake value to hash
-	 * @return std::size_t hash value
-	 */
-	std::size_t operator()(dpp::snowflake const& s) const noexcept {
-		return std::hash<uint64_t>{}(s.value);
-	}
-};
+/************************************************************************************
+ *
+ * D++, A Lightweight C++ library for Discord
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright 2021 Craig Edwards and D++ contributors 
+ * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ************************************************************************************/
+#pragma once
+#include <dpp/export.h>
+#include <dpp/json_fwd.h>
+#include <dpp/exception.h>
+#include <cstdint>
+#include <type_traits>
+
+#ifdef DPP_FORMATTERS
+#include <format>
+#endif
+
+/**
+ * @brief The main namespace for D++ functions. classes and types
+ */
+namespace dpp {
+
+/** @brief A container for a 64 bit unsigned value representing many things on discord.
+ * This value is known in distributed computing as a snowflake value.
+ *
+ * Snowflakes are:
+ *
+ * - Performant (very fast to generate at source and to compare in code)
+ * - Uncoordinated (allowing high availability across clusters, data centres etc)
+ * - Time ordered (newer snowflakes have higher IDs)
+ * - Directly Sortable (due to time ordering)
+ * - Compact (64 bit numbers, not 128 bit, or string)
+ *
+ * An identical format of snowflake is used by Twitter, Instagram and several other platforms.
+ *
+ * @see https://en.wikipedia.org/wiki/Snowflake_ID
+ * @see https://github.com/twitter-archive/snowflake/tree/b3f6a3c6ca8e1b6847baa6ff42bf72201e2c2231
+ */
+class DPP_EXPORT snowflake final {
+	friend struct std::hash<dpp::snowflake>;
+protected:
+	/**
+	 * @brief The snowflake value
+	 */
+	uint64_t value = 0;
+
+public:
+	/**
+	 * @brief Construct a snowflake object
+	 */
+	constexpr snowflake() noexcept = default;
+
+	/**
+	 * @brief Copy a snowflake object
+	 */
+	constexpr snowflake(const snowflake &rhs) noexcept = default;
+
+	/**
+	 * @brief Move a snowflake object
+	 */
+	constexpr snowflake(snowflake &&rhs) noexcept = default;
+
+	/**
+	 * @brief Construct a snowflake from an integer value
+	 *
+	 * @throw dpp::logic_exception on assigning a negative value. The function is noexcept if the type given is unsigned
+	 * @param snowflake_val snowflake value as an integer type
+	 */
+	template <typename T, typename = std::enable_if_t<std::is_integral_v<T> && !std::is_same_v<T, bool>>>
+	constexpr snowflake(T snowflake_val) noexcept(std::is_unsigned_v<T>) : value(static_cast<std::make_unsigned_t<T>>(snowflake_val)) {
+		/**
+		 * we cast to the unsigned version of the type given - this maintains "possible loss of data" warnings for sizeof(T) > sizeof(value)
+		 * while suppressing them for signed to unsigned conversion (for example snowflake(42) will call snowflake(int) which is a signed type)
+		 */
+		if constexpr (!std::is_unsigned_v<T>) {
+			/* if the type is signed, at compile-time, add a check at runtime that the value is unsigned */
+			if (snowflake_val < 0) {
+				value = 0;
+				throw dpp::logic_exception{"cannot assign a negative value to dpp::snowflake"};
+			}
+		}
+	}
+
+	/**
+	 * @brief Construct a snowflake object from an unsigned integer in a string
+	 *
+	 * On invalid string the value will be 0
+	 * @param string_value A snowflake value
+	 */
+	snowflake(std::string_view string_value) noexcept;
+
+	/**
+	 * @brief Construct a snowflake object from an unsigned integer in a string
+	 *
+	 * On invalid string the value will be 0
+	 * @param string_value A snowflake value
+	 */
+	template <typename T, typename = std::enable_if_t<std::is_same_v<T, std::string>>>
+	snowflake(const T &string_value) noexcept : snowflake(std::string_view{string_value}) {}
+	/* ^ this exists to preserve `message_cache.find(std::get<std::string>(event.get_parameter("message_id")));` */
+
+	/**
+	 * @brief Copy value from another snowflake
+	 *
+	 * @param rhs The snowflake to copy from
+	 */
+	constexpr dpp::snowflake &operator=(const dpp::snowflake& rhs) noexcept = default;
+
+	/**
+	 * @brief Move value from another snowflake
+	 *
+	 * @param rhs The snowflake to move from
+	 */
+	constexpr dpp::snowflake &operator=(dpp::snowflake&& rhs) noexcept = default;
+
+	/**
+	 * @brief Assign integer value to the snowflake
+	 *
+	 * @throw dpp::logic_exception on assigning a negative value. The function is noexcept if the type given is unsigned
+	 * @param snowflake_val snowflake value as an integer type
+	 */
+	template <typename T, typename = std::enable_if_t<std::is_integral_v<T>>>
+	constexpr dpp::snowflake &operator=(T snowflake_val) noexcept(std::is_unsigned_v<T>) {
+		return *this = dpp::snowflake{snowflake_val};
+	}
+
+	/**
+	 * @brief Assign value converted from a string to the snowflake
+	 *
+	 * On invalid string the value will be 0
+	 * @param snowflake_val snowflake value as a string
+	 */
+	template <typename T, typename = std::enable_if_t<std::is_convertible_v<T, std::string_view>>>
+	constexpr dpp::snowflake &operator=(T&& snowflake_val) noexcept {
+		return *this = dpp::snowflake{std::forward<T>(snowflake_val)};
+	}
+
+	/**
+	 * @brief Returns true if the snowflake holds an empty value (is 0)
+	 *
+	 * @return true if empty (zero)
+	 */
+	constexpr bool empty() const noexcept {
+		return value == 0;
+	}
+
+	/**
+	 * @brief Returns the stringified version of the snowflake value
+	 *
+	 * @return std::string string form of snowflake value
+	 */
+	inline std::string str() const {
+		return std::to_string(value);
+	}
+
+	/**
+	 * @brief Comparison operator with another snowflake
+	 *
+	 * @param snowflake_val snowflake
+	 */
+	constexpr bool operator==(dpp::snowflake snowflake_val) const noexcept {
+		return value == snowflake_val.value;
+	}
+
+	/**
+	 * @brief Comparison operator with a string
+	 *
+	 * @param snowflake_val snowflake value as a string
+	 */
+	bool operator==(std::string_view snowflake_val) const noexcept;
+
+	/**
+	 * @brief Comparison operator with an integer
+	 *
+	 * @param snowflake_val snowflake value as an integer type
+	 */
+	template <typename T, typename = std::enable_if_t<std::is_integral_v<T>>>
+	constexpr bool operator==(T snowflake_val) const noexcept {
+		/* We use the std::enable_if_t trick to disable implicit conversions so there is a perfect candidate for overload resolution for integers, and it isn't ambiguous */
+		return *this == dpp::snowflake{snowflake_val};
+	}
+
+	/**
+	 * @brief For acting like an integer
+	 * @return The snowflake value
+	 */
+	constexpr operator uint64_t() const noexcept {
+		return value;
+	}
+
+	/**
+	 * @brief For acting like an integer
+	 * @return A reference to the snowflake value
+	 */
+	constexpr operator uint64_t &() noexcept {
+		return value;
+	}
+
+	/**
+	 * @brief For building json
+	 * @return The snowflake value as a string
+	 */
+	operator json() const;
+
+	/**
+	 * @brief Get the creation time of this snowflake according to Discord.
+	 *
+	 * @return double creation time inferred from the snowflake ID.
+	 * The minimum possible value is the first second of 2015.
+	 */
+	constexpr double get_creation_time() const noexcept {
+		constexpr uint64_t first_january_2016 = 1420070400000ull;
+		return static_cast<double>((value >> 22) + first_january_2016) / 1000.0;
+	}
+
+	/**
+	 * @brief Get the worker id that produced this snowflake value
+	 *
+	 * @return uint8_t worker id
+	 */
+	constexpr uint8_t get_worker_id() const noexcept {
+		return static_cast<uint8_t>((value & 0x3E0000) >> 17);
+	}
+
+	/**
+	 * @brief Get the process id that produced this snowflake value
+	 *
+	 * @return uint8_t process id
+	 */
+	constexpr uint8_t get_process_id() const noexcept {
+		return static_cast<uint8_t>((value & 0x1F000) >> 12);
+	}
+
+	/**
+	 * @brief Get the increment, which is incremented for every snowflake
+	 * created over the one millisecond resolution in the timestamp.
+	 *
+	 * @return uint64_t millisecond increment
+	 */
+	constexpr uint16_t get_increment() const noexcept {
+		return static_cast<uint16_t>(value & 0xFFF);
+	}
+
+	/**
+	 * @brief Helper function for libfmt so that a snowflake can be directly formatted as a uint64_t.
+	 *
+	 * @see https://fmt.dev/latest/api.html#formatting-user-defined-types
+	 * @return uint64_t snowflake ID
+	 */
+	friend constexpr uint64_t format_as(snowflake s) noexcept {
+		/* note: this function must stay as "friend" - this declares it as a free function but makes it invisible unless the argument is snowflake
+		 * this effectively means no implicit conversions are performed to snowflake, for example format_as(0) doesn't call this function */
+		return s.value;
+	}
+};
+
+}
+
+template<>
+struct std::hash<dpp::snowflake>
+{
+	/**
+	 * @brief Hashing function for dpp::snowflake
+	 * Used by std::unordered_map. This just calls std::hash<uint64_t>.
+	 *
+	 * @param s Snowflake value to hash
+	 * @return std::size_t hash value
+	 */
+	std::size_t operator()(dpp::snowflake s) const noexcept {
+		return std::hash<uint64_t>{}(s.value);
+	}
+};
+
+#ifdef DPP_FORMATTERS
+/*
+ * @brief implementation of formater for dpp::snowflake for std::format support
+ * https://en.cppreference.com/w/cpp/utility/format/formatter
+ */
+template <>
+struct std::formatter<dpp::snowflake>
+{
+        template<class TP>
+        constexpr typename TP::iterator parse(TP& ctx) {
+                return ctx.begin();
+        }
+
+        template<class TF>
+        typename TF::iterator format(const dpp::snowflake& snowflake, TF& ctx) const {
+                return std::format_to(ctx.out(), "{}", snowflake.str());
+        }
+};
+#endif //DPP_FORMATTERS
diff --git a/3rdParty/dpp/socket.h b/3rdParty/dpp/socket.h
index 7f1ccc3fc1..03962adbf0 100644
--- a/3rdParty/dpp/socket.h
+++ b/3rdParty/dpp/socket.h
@@ -1,30 +1,187 @@
-#pragma once
-
-#ifndef _WIN32
-#ifndef SOCKET
-#define SOCKET int
-#endif
-#endif
-
-namespace dpp
-{
-	/**
-	 * @brief Represents a socket file descriptor.
-	 * This is used to ensure parity between windows and unix-like systems.
-	 */
-	typedef SOCKET socket;
-}
-
-#ifndef SOCKET_ERROR
-/**
- * @brief Represents a socket in error state
- */
-#define SOCKET_ERROR -1
-#endif
-
-#ifndef INVALID_SOCKET
-/**
- * @brief Represents a socket which is not yet assigned
- */
-#define INVALID_SOCKET ~0
-#endif
\ No newline at end of file
+/************************************************************************************
+ *
+ * D++, A Lightweight C++ library for Discord
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright 2021 Craig Edwards and D++ contributors
+ * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ************************************************************************************/
+#pragma once
+
+#include <dpp/export.h>
+#include <dpp/compat.h>
+
+#include <string_view>
+#include <cstdint>
+
+
+namespace dpp
+{
+/**
+ * @brief Represents a socket file descriptor.
+ * This is used to ensure parity between windows and unix-like systems.
+ */
+#ifndef _WIN32
+	using socket = int;
+#else
+	using socket = SOCKET;
+#endif
+
+#ifndef SOCKET_ERROR
+/**
+ * @brief Represents a socket in error state
+ */
+#define SOCKET_ERROR -1
+#endif
+
+#ifndef INVALID_SOCKET
+/**
+ * @brief Represents a socket which is not yet assigned
+ */
+#define INVALID_SOCKET ~0
+#endif
+
+/**
+ * @brief Represents an IPv4 address for use with socket functions such as
+ * bind().
+ *
+ * Avoids type punning with C style casts from sockaddr_in to sockaddr pointers.
+ */
+class DPP_EXPORT address_t {
+	/**
+	 * @brief Internal sockaddr struct
+	 */
+	sockaddr socket_addr{};
+
+public:
+
+	/**
+	 * @brief Create a new address_t
+	 * @param ip IPv4 address
+	 * @param port Port number
+	 * @note Leave both as defaults to create a default bind-to-any setting
+	 */
+	address_t(const std::string_view ip = "0.0.0.0", uint16_t port = 0);
+
+	/**
+	 * @brief Get sockaddr
+	 * @return sockaddr pointer
+	 */
+	[[nodiscard]] sockaddr *get_socket_address();
+
+	/**
+	 * @brief Returns size of sockaddr_in
+	 * @return sockaddr_in size
+	 * @note It is important the size this returns is sizeof(sockaddr_in) not
+	 * sizeof(sockaddr), this is NOT a bug but requirement of C socket functions.
+	 */
+	[[nodiscard]] size_t size();
+
+	/**
+	 * @brief Get the port bound to a file descriptor
+	 * @param fd File descriptor
+	 * @return Port number, or 0 if no port bound
+	 */
+	[[nodiscard]] uint16_t get_port(socket fd);
+};
+
+enum raii_socket_type {
+	rst_udp,
+	rst_tcp,
+
+};
+
+/**
+ * @brief Allocates a dpp::socket, closing it on destruction
+ */
+struct DPP_EXPORT raii_socket {
+	/**
+	 * @brief File descriptor
+	 */
+	socket fd;
+
+	/**
+	 * @brief Construct a socket.
+	 * Calls socket() and returns a new file descriptor
+	 */
+	raii_socket(raii_socket_type type = rst_udp);
+
+	/**
+	 * @brief Convert an established fd to an raii_socket
+	 * @param plain_fd
+	 */
+	raii_socket(socket plain_fd);
+
+	/**
+	 * @brief Non-copyable
+	 */
+	raii_socket(raii_socket&) = delete;
+
+	/**
+	 * @brief Non-movable
+	 */
+	raii_socket(raii_socket&&) = delete;
+
+	/**
+	 * @brief Sets the value of a socket option.
+	 * @tparam T type to set option for
+	 * @param level The level at which to change the socket options
+	 * @param name The option to change the value of
+	 * @param value The value to set
+	 * @return True if set successfully
+	 */
+	template <typename T> bool set_option(int level, int name, T value);
+
+	/**
+	 * @brief Bind socket to IP/port
+	 * @param address address to bind to
+	 * @return true on success
+	 */
+	bool bind(address_t address);
+
+	/**
+	 * @brief Listen on previously bound port
+	 * @return true on success
+	 */
+	bool listen();
+
+	/**
+	 * @brief Accept a pending connection on listening socket
+	 * @return new connection file descriptor
+	 */
+	socket accept();
+
+	/**
+	 * @brief Non-copyable
+	 */
+	raii_socket operator=(raii_socket&) = delete;
+
+	/**
+	 * @brief Non-movable
+	 */
+	raii_socket operator=(raii_socket&&) = delete;
+
+	/**
+	 * @brief Destructor
+	 * Frees the socket by closing it
+	 */
+	~raii_socket();
+};
+
+extern template DPP_EXPORT bool raii_socket::set_option<int>(int level, int name, int value);
+
+
+}
diff --git a/3rdParty/dpp/socket_listener.h b/3rdParty/dpp/socket_listener.h
new file mode 100644
index 0000000000..040a8e708b
--- /dev/null
+++ b/3rdParty/dpp/socket_listener.h
@@ -0,0 +1,154 @@
+/************************************************************************************
+ *
+ * D++, A Lightweight C++ library for Discord
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright 2021 Craig Edwards and D++ contributors
+ * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ************************************************************************************/
+#pragma once
+
+#include <dpp/export.h>
+#include <dpp/cluster.h>
+#include <dpp/socket.h>
+#include <dpp/sslconnection.h>
+#include <type_traits>
+#include <memory>
+#include <unordered_map>
+#include <string_view>
+#include <string>
+
+namespace dpp {
+
+enum socket_listener_type : uint8_t {
+	li_plaintext,
+	li_ssl,
+};
+
+/**
+ * @brief Listens on a TCP socket for new connections, and whenever a new connection is
+ * received, accept it and spawn a new connection of type T.
+ * @tparam T type for socket connection, must be derived from ssl_connection
+ */
+template<typename T, typename = std::enable_if_t<std::is_base_of_v<ssl_connection, T>>>
+struct socket_listener {
+	/**
+	 * @brief The listening socket for incoming connections
+	 */
+	raii_socket fd;
+
+	/**
+	 * @brief Active connections for the server of type T
+	 */
+	std::unordered_map<socket, std::unique_ptr<T>> connections;
+
+	/**
+	 * @brief Cluster creator
+	 */
+	cluster* creator{nullptr};
+
+	/**
+	 * @brief True if plain text connections to the server are allowed
+	 */
+	bool plaintext{true};
+
+	/**
+	 * @brief Private key PEM file path, if running an SSL server
+	 */
+	std::string private_key_file;
+
+	/**
+	 * @brief Public key PEM file path, if running an SSL server
+	 */
+	std::string public_key_file;
+	
+	/**
+	 * @brief Event to handle socket removal from the connection map
+	 */
+	event_handle close_event;
+
+	/**
+	 * @brief Socket events for listen socket in the socket engine
+	 */
+	socket_events events;
+
+	/**
+	 * @brief Create a new socket listener (TCP server)
+	 * @param owner Owning cluster
+	 * @param address IP address to bind the listening socket to, use 0.0.0.0 to bind all interfaces
+	 * @param port Port number to bind the listening socket to
+	 * @param type Type of server, plaintext or SSL
+	 * @param private_key For SSL servers, a path to the PEM private key file
+	 * @param public_key For SSL servers, a path to the PEM public key file
+	 * @throws connection_exception on failure to bind or listen to the port/interface
+	 */
+	socket_listener(cluster* owner, const std::string_view address, uint16_t port, socket_listener_type type = li_plaintext, const std::string& private_key = "", const std::string& public_key = "")
+	: fd(rst_tcp), creator(owner), plaintext(type == li_plaintext), private_key_file(private_key), public_key_file(public_key)
+	{
+		fd.set_option<int>(SOL_SOCKET, SO_REUSEADDR, 1);
+		if (!fd.bind(address_t(address, port))) {
+			// error
+			throw dpp::connection_exception("Could not bind to " + std::string(address) + ":" + std::to_string(port));
+		}
+		if (!fd.listen()) {
+			// error
+			throw dpp::connection_exception("Could not listen for connections on " + std::string(address) + ":" + std::to_string(port));
+		}
+		events = dpp::socket_events(
+			fd.fd,
+			WANT_READ | WANT_ERROR,
+			[this](socket sfd, const struct socket_events &e) {
+				handle_accept(sfd, e);
+			},
+			[](socket, const struct socket_events&) { },
+			[](socket, const struct socket_events&, int) { }
+		);
+		owner->socketengine->register_socket(events);
+
+		close_event = creator->on_socket_close([this](const socket_close_t& event) {
+			connections.erase(event.fd);
+		});
+	}
+
+	/**
+	 * @brief Destructor, detaches on_socket_close event
+	 */
+	~socket_listener() {
+		creator->on_socket_close.detach(close_event);
+	}
+
+	/**
+	 * @brief Handle a new incoming socket with accept()
+	 * Accepts a new connection, and calls emplace() if valid
+	 * @param sfd File descriptor for listening socket
+	 * @param e socket events for the listening socket
+	 */
+	virtual void handle_accept(socket sfd, const struct socket_events &e) {
+		socket new_fd{fd.accept()};
+		if (new_fd >= 0) {
+			emplace(new_fd);
+		}
+	}
+
+	/**
+	 * @brief Emplace a new connection into the connection map for the server.
+	 * This is a factory function which must be implemented by the deriving class
+	 * @param newfd File descriptor for new connection
+	 */
+	virtual void emplace(socket newfd) = 0;
+};
+
+}
diff --git a/3rdParty/dpp/socketengine.h b/3rdParty/dpp/socketengine.h
new file mode 100644
index 0000000000..931249d5c5
--- /dev/null
+++ b/3rdParty/dpp/socketengine.h
@@ -0,0 +1,332 @@
+/************************************************************************************
+ *
+ * D++, A Lightweight C++ library for Discord
+ *
+ * Copyright 2021 Craig Edwards and D++ contributors
+ * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ************************************************************************************/
+#pragma once
+#include <dpp/export.h>
+#include <dpp/socket.h>
+#include <cstdint>
+#include <unordered_map>
+#include <memory>
+#include <string_view>
+#include <functional>
+#include <shared_mutex>
+#include <dpp/thread_pool.h>
+
+namespace dpp {
+
+/**
+ * @brief Types of IO events a socket may subscribe to.
+ */
+enum socket_event_flags : uint8_t {
+	/**
+	 * @brief Socket wants to receive events when it can be read from.
+	 * This is provided by the underlying implementation.
+	 */
+	WANT_READ = 1,
+	/**
+	 * @brief Socket wants to receive events when it can be written to.
+	 * This is provided by the underlying implementation, and will be
+	 * a one-off event. If you want to receive ongoing write events you
+	 * must re-request this event type each time.
+	 */
+	WANT_WRITE = 2,
+	/**
+	 * @brief Socket wants to receive events that indicate an error condition.
+	 * Note that EOF (graceful close) is not an error condition and is indicated
+	 * by errno being 0 and ::read() returning 0.
+	 */
+	WANT_ERROR = 4,
+	/**
+	 * @brief Socket should be removed as soon as is safe to do so. Generally, this is
+	 * after the current iteration through the active event list.
+	 */
+	WANT_DELETION = 8,
+};
+
+/**
+ * @brief Read ready event
+ */
+using socket_read_event = std::function<void(dpp::socket fd, const struct socket_events&)>;
+
+/**
+ * @brief Write ready event
+ */
+using socket_write_event = std::function<void(dpp::socket fd, const struct socket_events&)>;
+
+/**
+ * @brief Error event
+ */
+using socket_error_event = std::function<void(dpp::socket fd, const struct socket_events&, int error_code)>;
+
+/**
+ * @brief Contains statistics about the IO loop
+ */
+struct DPP_EXPORT socket_stats {
+	/**
+	 * @brief Number of reads since startup
+	 */
+	uint64_t reads{0};
+
+	/**
+	 * @brief Number of writes since startup
+	 */
+	uint64_t writes{0};
+
+	/**
+	 * @brief Number of errors since startup
+	 */
+	uint64_t errors{0};
+
+	/**
+	 * @brief Number of updates to file descriptors
+	 */
+	uint64_t updates{0};
+
+	/**
+	 * @brief Number of deletions of file descriptors
+	 */
+	 uint64_t deletions{0};
+
+	/**
+	 * @brief Number of loop iterations since startup
+	 */
+	uint64_t iterations{0};
+
+	/**
+	 * @brief Number of currently active file descriptors
+	 */
+	uint64_t active_fds{0};
+
+	/**
+	 * @brief Socket engine type
+	 */
+	std::string_view engine_type;
+};
+
+/**
+ * @brief Represents an active socket event set in the socket engine.
+ *
+ * An event set contains a file descriptor, a set of event handler callbacks, and
+ * a set of bitmask flags which indicate which events it wants to receive.
+ * It is possible to quickly toggle event types on or off, as it is not always necessary
+ * or desired to receive all events all the time, in fact doing so can cause an event
+ * storm which will consume 100% CPU (e.g. if you request to receive write events all
+ * the time).
+ */
+struct DPP_EXPORT socket_events {
+	/**
+	 * @brief File descriptor
+	 *
+	 * This should be a valid file descriptor created via ::socket().
+	 */
+	dpp::socket fd{INVALID_SOCKET};
+
+	/**
+	 * @brief Flag bit mask of values from dpp::socket_event_flags
+	 */
+	uint8_t flags{0};
+
+	/**
+	 * @brief Read ready event
+	 * @note This function will be called from a different thread to that
+	 * which adds the event set to the socket engine.
+	 */
+	socket_read_event on_read{};
+
+	/**
+	 * @brief Write ready event
+	 * @note This function will be called from a different thread to that
+	 * which adds the event set to the socket engine.
+	 */
+	socket_write_event on_write{};
+
+	/**
+	 * @brief Error event
+	 * @note This function will be called from a different thread to that
+	 * which adds the event set to the socket engine.
+	 */
+	socket_error_event on_error{};
+
+	/**
+	 * @brief Construct a new socket_events
+	 * @param socket_fd file descriptor
+	 * @param _flags initial flags bitmask
+	 * @param read_event read ready event
+	 * @param write_event write ready event
+	 * @param error_event error event
+	 */
+	socket_events(dpp::socket socket_fd, uint8_t _flags, const socket_read_event& read_event, const socket_write_event& write_event = {}, const socket_error_event& error_event = {})
+		: fd(socket_fd), flags(_flags), on_read(read_event), on_write(write_event), on_error(error_event) { }
+
+	/**
+	 * @brief Default constructor
+	 */
+	socket_events() = default;
+};
+
+/**
+ * @brief Container of event sets keyed by socket file descriptor
+ */
+using socket_container = std::unordered_map<dpp::socket, std::unique_ptr<socket_events>>;
+
+/**
+ * @brief This is the base class for socket engines.
+ * The actual implementation is OS specific and the correct implementation is detected by
+ * CMake. It is then compiled specifically into DPP so only one implementation can exist
+ * in the implementation. All implementations should behave identically to the user, abstracting
+ * out implementation-specific behaviours (e.g. difference between edge and level triggered
+ * event mechanisms etc).
+ */
+struct DPP_EXPORT socket_engine_base {
+
+	/**
+	 * @brief Owning cluster
+	 */
+	class cluster* owner{nullptr};
+
+	/**
+	 * @brief Default constructor
+	 * @param creator Owning cluster
+	 */
+	socket_engine_base(class cluster* creator);
+
+	/**
+	 * @brief Non-copyable
+	 */
+	socket_engine_base(const socket_engine_base&) = delete;
+
+	/**
+	 * @brief Non-copyable
+	 */
+	socket_engine_base(socket_engine_base&&) = delete;
+
+	/**
+	 * @brief Non-movable
+	 */
+	socket_engine_base& operator=(const socket_engine_base&) = delete;
+
+	/**
+	 * @brief Non-movable
+	 */
+	socket_engine_base& operator=(socket_engine_base&&) = delete;
+
+	/**
+	 * @brief Default destructor
+	 */
+	virtual ~socket_engine_base();
+
+	/**
+	 * @brief Should be called repeatedly in a loop.
+	 * Will run for a maximum of 1 second.
+	 */
+	virtual void process_events() = 0;
+
+	/**
+	 * @brief Register a new socket with the socket engine
+	 * @param e Socket events
+	 * @return true if socket was added
+	 */
+	virtual bool register_socket(const socket_events& e);
+
+	/**
+	 * @brief Update an existing socket in the socket engine
+	 * @param e Socket events
+	 * @return true if socket was updated
+	 */
+	virtual bool update_socket(const socket_events& e);
+
+	/**
+	 * @brief Delete a socket from the socket engine
+	 * @note This will not remove the socket immediately. It will set the
+	 * WANT_DELETION flag causing it to be removed as soon as is safe to do so
+	 * (once all events associated with it are completed).
+	 * @param e File descriptor
+	 * @return true if socket was queued for deletion
+	 */
+	bool delete_socket(dpp::socket fd);
+
+	/**
+	 * @brief Iterate through the list of sockets and remove any
+	 * with WANT_DELETION set. This will also call implementation-specific
+	 * remove_socket() on each entry to be removed.
+	 */
+	void prune();
+
+	/**
+	 * @brief Merge new flags in with the given file descriptor
+	 * @param fd file descriptor
+	 * @param extra_flags extra flags to add
+	 */
+	void inplace_modify_fd(dpp::socket fd, uint8_t extra_flags);
+
+	/**
+	 * @brief Get statistics for socket engine
+	 * @return socket stats
+	 */
+	const socket_stats& get_stats() const;
+
+protected:
+
+	/**
+	 * @brief Mutex for fds
+	 */
+	std::shared_mutex fds_mutex;
+
+	/**
+	 * @brief File descriptors, and their states
+	 */
+	socket_container fds;
+
+	/**
+	 * @brief Socket engine statistics
+	 */
+	socket_stats stats{};
+
+	/**
+	 * @brief Find a file descriptors socket events
+	 * @param fd file descriptor
+	 * @return file descriptor or nullptr if doesn't exist
+	 */
+	socket_events* get_fd(dpp::socket fd);
+
+	/**
+	 * @brief Called by the prune() function to remove sockets when safe to do so.
+	 * This is normally at the end or before an iteration of the event loop.
+	 * @param fd File descriptor to remove
+	 */
+	virtual bool remove_socket(dpp::socket fd);
+};
+
+/**
+ * @brief This is implemented by whatever derived form socket_engine takes
+ * @param creator Creating cluster
+ */
+DPP_EXPORT std::unique_ptr<socket_engine_base> create_socket_engine(class cluster *creator);
+
+#ifndef _WIN32
+	/**
+	 * @brief Set up a signal handler to be ignored
+	 * @param signal Signal to set. If the signal is already set up with a handler,
+	 * this will do nothing.
+	 */
+	void set_signal_handler(int signal);
+#endif
+
+};
diff --git a/3rdParty/dpp/ssl_context.h b/3rdParty/dpp/ssl_context.h
new file mode 100644
index 0000000000..26e8e24dcb
--- /dev/null
+++ b/3rdParty/dpp/ssl_context.h
@@ -0,0 +1,53 @@
+/************************************************************************************
+ *
+ * D++, A Lightweight C++ library for Discord
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright 2021 Craig Edwards and D++ contributors
+ * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ************************************************************************************/
+#pragma once
+#include <dpp/export.h>
+#include <string>
+#include <cstdint>
+
+namespace dpp::detail {
+
+struct wrapped_ssl_ctx;
+
+/**
+ * @brief Generate a new wrapped SSL context.
+ * If an SSL context already exists for the given port number, it will be returned, else a new one will be
+ * generated and cached. Contexts with port = 0 will be considered client contexts. There can only be one
+ * client context at a time and it covers all SSL client connections. There can be many SSL server contexts,
+ * individual ones can be cached per-port, each with their own loaded SSL private and public key PEM certificate.
+ *
+ * @param port Port number. Pass zero to create or get the client context.
+ * @param private_key Private key PEM pathname for server contexts
+ * @param public_key Public key PEM pathname for server contexts
+ * @return wrapped SSL context
+ */
+DPP_EXPORT wrapped_ssl_ctx* generate_ssl_context(uint16_t port = 0, const std::string &private_key = "", const std::string &public_key = "");
+
+/**
+ * @brief Release an SSL context
+ * @warning Only do this if you are certain no SSL connections remain that use this context.
+ * As OpenSSL is a C library it is impossible for us to track this on its behalf. Be careful!
+ * @param port port number to release
+ */
+DPP_EXPORT void release_ssl_context(uint16_t port = 0);
+
+};
diff --git a/3rdParty/dpp/sslclient.h b/3rdParty/dpp/sslclient.h
deleted file mode 100644
index daf4a2b1dc..0000000000
--- a/3rdParty/dpp/sslclient.h
+++ /dev/null
@@ -1,252 +0,0 @@
-/************************************************************************************
- *
- * D++, A Lightweight C++ library for Discord
- *
- * Copyright 2021 Craig Edwards and D++ contributors 
- * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- ************************************************************************************/
-#pragma once
-#include <dpp/export.h>
-#include <dpp/misc-enum.h>
-#include <string>
-#include <functional>
-#include <dpp/socket.h>
-
-namespace dpp {
-
-/**
- * @brief This is an opaque class containing openssl library specific structures.
- * We define it this way so that the public facing D++ library doesn't require
- * the openssl headers be available to build against it.
- */
-class openssl_connection;
-
-/**
- * @brief A callback for socket status
- */
-typedef std::function<dpp::socket()> socket_callback_t;
-
-/**
- * @brief A socket notification callback
- */
-typedef std::function<void()> socket_notification_t;
-
-/**
- * @brief Close a socket 
- * 
- * @param sfd Socket to close
- * @return false on error, true on success
- */
-bool close_socket(dpp::socket sfd);
-
-/**
- * @brief Set a socket to blocking or non-blocking IO
- *
- * @param sockfd socket to act upon
- * @return false on error, true on success
- */
-bool set_nonblocking(dpp::socket sockfd, bool non_blocking);
-
-/**
- * @brief Implements a simple non-blocking SSL stream client.
- * 
- * @note although the design is non-blocking the run() method will
- * execute in an infinite loop until the socket disconnects. This is intended
- * to be run within a std::thread.
- */
-class DPP_EXPORT ssl_client
-{
-protected:
-	/**
-	 * @brief Input buffer received from socket
-	 */
-	std::string buffer;
-
-	/**
-	 * @brief Output buffer for sending to socket
-	 */
-	std::string obuffer;
-
-	/**
-	 * @brief True if in nonblocking mode. The socket switches to nonblocking mode
-	 * once ReadLoop is called.
-	 */
-	bool nonblocking;
-
-	/**
-	 * @brief Raw file descriptor of connection
-	 */
-	dpp::socket sfd;
-
-	/**
-	 * @brief Openssl opaque contexts
-	 */
-	openssl_connection* ssl;
-
-	/**
-	 * @brief SSL cipher in use
-	 */
-	std::string cipher;
-
-	/**
-	 * @brief For timers
-	 */
-	time_t last_tick;
-
-	/**
-	 * @brief Hostname connected to
-	 */
-	std::string hostname;
-
-	/**
-	 * @brief Port connected to
-	 */
-	std::string port;
-
-	/**
-	 * @brief Bytes out
-	 */
-	uint64_t bytes_out;
-
-	/**
-	 * @brief Bytes in
-	 */
-	uint64_t bytes_in;
-
-	/**
-	 * @brief True for a plain text connection
-	 */
-	bool plaintext;
-
-	/**
-	 * @brief True if we are establishing a new connection, false if otherwise.
-	 */
-	bool make_new;
-
-
-	/**
-	 * @brief Called every second
-	 */
-	virtual void one_second_timer();
-
-	/**
-	 * @brief Start SSL connection and connect to TCP endpoint
-	 * @throw dpp::exception Failed to initialise connection
-	 */
-	virtual void connect();
-public:
-	/**
-	 * @brief Get the bytes out objectGet total bytes sent
-	 * @return uint64_t bytes sent
-	 */
-	uint64_t get_bytes_out();
-	
-	/**
-	 * @brief Get total bytes received
-	 * @return uint64_t bytes received
-	 */
-	uint64_t get_bytes_in();
-
-	/**
-	 * @brief Get SSL cipher name
-	 * @return std::string ssl cipher name
-	 */
-	std::string get_cipher();
-
-	/**
-	 * @brief Attaching an additional file descriptor to this function will send notifications when there is data to read.
-	 * 
-	 * NOTE: Only hook this if you NEED it as it can increase CPU usage of the thread!
-	 * Returning -1 means that you don't want to be notified.
-	 */
-	socket_callback_t custom_readable_fd;
-
-	/**
-	 * @brief Attaching an additional file descriptor to this function will send notifications when you are able to write
-	 * to the socket.
-	 * 
-	 * NOTE: Only hook this if you NEED it as it can increase CPU usage of the thread! You should toggle this
-	 * to -1 when you do not have anything to write otherwise it'll keep triggering repeatedly (it is level triggered).
-	 */
-	socket_callback_t custom_writeable_fd;
-
-	/**
-	 * @brief This event will be called when you can read from the custom fd
-	 */
-	socket_notification_t custom_readable_ready;
-
-	/**
-	 * @brief This event will be called when you can write to a custom fd
-	 */
-	socket_notification_t custom_writeable_ready;
-
-	/**
-	 * @brief True if we are keeping the connection alive after it has finished
-	 */
-	bool keepalive;
-
-	/**
-	 * @brief Connect to a specified host and port. Throws std::runtime_error on fatal error.
-	 * @param _hostname The hostname to connect to
-	 * @param _port the Port number to connect to
-	 * @param plaintext_downgrade Set to true to connect using plaintext only, without initialising SSL.
-	 * @param reuse Attempt to reuse previous connections for this hostname and port, if available
-	 * Note that no Discord endpoints will function when downgraded. This option is provided only for
-	 * connection to non-Discord addresses such as within dpp::cluster::request().
-	 * @throw dpp::exception Failed to initialise connection
-	 */
-	ssl_client(const std::string &_hostname, const std::string &_port = "443", bool plaintext_downgrade = false, bool reuse = false);
-
-	/**
-	 * @brief Nonblocking I/O loop
-	 * @throw std::exception Any std::exception (or derivative) thrown from read_loop() causes reconnection of the shard
-	 */
-	void read_loop();
-
-	/**
-	 * @brief Destroy the ssl_client object
-	 */
-	virtual ~ssl_client();
-
-	/**
-	 * @brief Handle input from the input buffer. This function will be called until
-	 * all data in the buffer has been processed and the buffer is empty.
-	 * @param buffer the buffer content. Will be modified removing any processed front elements
-	 * @return bool True if the socket should remain connected
-	 */
-	virtual bool handle_buffer(std::string &buffer);
-
-	/**
-	 * @brief Write to the output buffer.
-	 * @param data Data to be written to the buffer
-	 * @note The data may not be written immediately and may be written at a later time to the socket.
-	 */
-	virtual void write(const std::string &data);
-
-	/**
-	 * @brief Close socket connection
-	 */
-	virtual void close();
-
-	/**
-	 * @brief Log a message
-	 * @param severity severity of log message
-	 * @param msg Log message to send
-	 */
-	virtual void log(dpp::loglevel severity, const std::string &msg) const;
-};
-
-};
diff --git a/3rdParty/dpp/sslconnection.h b/3rdParty/dpp/sslconnection.h
new file mode 100644
index 0000000000..e070a26ea6
--- /dev/null
+++ b/3rdParty/dpp/sslconnection.h
@@ -0,0 +1,411 @@
+/************************************************************************************
+ *
+ * D++, A Lightweight C++ library for Discord
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright 2021 Craig Edwards and D++ contributors 
+ * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ************************************************************************************/
+#pragma once
+#include <dpp/export.h>
+#include <dpp/misc-enum.h>
+#include <string>
+#include <functional>
+#include <ctime>
+#include <mutex>
+#include <dpp/socket.h>
+#include <cstdint>
+#include <dpp/timer.h>
+
+namespace dpp {
+
+/**
+ * @brief This is an opaque class containing openssl library specific structures.
+ * We define it this way so that the public facing D++ library doesn't require
+ * the openssl headers be available to build against it.
+ */
+class openssl_connection;
+
+/**
+ * @brief Close a socket 
+ * 
+ * @param sfd Socket to close
+ * @return false on error, true on success
+ */
+DPP_EXPORT bool close_socket(dpp::socket sfd);
+
+/**
+ * @brief Set a socket to blocking or non-blocking IO
+ *
+ * @param sockfd socket to act upon
+ * @param non_blocking should socket be non-blocking?
+ * @return false on error, true on success
+ */
+DPP_EXPORT bool set_nonblocking(dpp::socket sockfd, bool non_blocking);
+
+/**
+ * @brief SSL_read buffer size
+ *
+ * You'd think that we would get better performance with a bigger buffer, but SSL frames are 16k each.
+ * SSL_read in non-blocking mode will only read 16k at a time. There's no point in a bigger buffer as
+ * it'd go unused.
+ */
+constexpr uint16_t DPP_BUFSIZE{16 * 1024};
+
+/**
+ * @brief Represents a failed socket system call, e.g. connect() failure
+ */
+constexpr int ERROR_STATUS{-1};
+
+/**
+ * @brief Maximum number of internal connect() retries on TCP connections
+ */
+constexpr int MAX_RETRIES{4};
+
+/**
+ * @brief Implements a simple non-blocking SSL stream connection.
+ */
+class DPP_EXPORT ssl_connection
+{
+private:
+	/**
+	 * @brief Clean up resources
+	 */
+	void cleanup();
+
+	/**
+	 * @brief Mutex for creation of internal SSL pointers by openssl
+	 */
+	std::mutex ssl_mutex;
+
+	/**
+	 * @brief Mutex for output buffer
+	 */
+	std::mutex out_mutex;
+
+	/**
+	 * @brief Start offset into internal ring buffer for client to server IO
+	 */
+	size_t client_to_server_length = 0;
+
+	/**
+	 * @brief Start offset into internal ring buffer for server to client IO
+	 */
+	size_t client_to_server_offset = 0;
+
+	/**
+	 * @brief Internal ring buffer for client to server IO
+	 */
+	char client_to_server_buffer[DPP_BUFSIZE];
+
+	/**
+	 * @brief Internal ring buffer for server to client IO
+	 */
+	char server_to_client_buffer[DPP_BUFSIZE];
+
+	/**
+	 * @brief True if this connection is a server inbound connection from accept()
+	 */
+	bool is_server = false;
+
+protected:
+	/**
+	 * @brief Input buffer received from socket
+	 */
+	std::string buffer;
+
+	/**
+	 * @brief Output buffer for sending to socket
+	 */
+	std::string obuffer;
+
+	/**
+	 * @brief Raw file descriptor of connection
+	 */
+	dpp::socket sfd;
+
+	/**
+	 * @brief Openssl opaque contexts
+	 */
+	openssl_connection* ssl;
+
+	/**
+	 * @brief Protects openssl opaque contexts when closing
+	 *
+	 * There's data races when reconnecting severed connection.
+	 * This makes sure we don't double free our contexts.
+	 */
+	std::mutex ssl_close_mutex;
+
+	/**
+	 * @brief SSL cipher in use
+	 */
+	std::string cipher;
+
+	/**
+	 * @brief For timers
+	 */
+	time_t last_tick;
+
+	/**
+	 * @brief Start time of connection
+	 */
+	time_t start;
+
+	/**
+	 * @brief How many times we retried connect()
+	 */
+	uint8_t connect_retries{0};
+
+	/**
+	 * @brief Hostname connected to
+	 */
+	std::string hostname;
+
+	/**
+	 * @brief Port connected to
+	 */
+	std::string port;
+
+	/**
+	 * @brief Bytes out
+	 */
+	uint64_t bytes_out;
+
+	/**
+	 * @brief Bytes in
+	 */
+	uint64_t bytes_in;
+
+	/**
+	 * @brief True for a plain text connection
+	 */
+	bool plaintext;
+
+	/**
+	 * @brief True if connection is completed
+	 */
+	bool connected{false};
+
+	/**
+	 * @brief True if tcp connect() succeeded
+	 */
+	bool tcp_connect_done{false};
+
+	/**
+	 * @brief Timer handle for one second timer
+	 */
+	timer timer_handle;
+
+	/**
+	 * @brief Unique ID of socket used as a nonce
+	 * You can use this to identify requests vs reply
+	 * if you want. D++ itself only sets this, and does
+	 * not use it in any logic. It starts at 1 and increments
+	 * for each request made.
+	 */
+	uint64_t unique_id;
+
+	/**
+	 * @brief Called every second
+	 */
+	virtual void one_second_timer();
+
+	/**
+	 * @brief Start SSL connection and connect to TCP endpoint
+	 * @throw dpp::exception Failed to initialise connection
+	 */
+	virtual void connect();
+
+	/**
+	 * @brief Set this to true to log all IO to debug for this connection.
+	 * This is an internal developer facility. Do not enable it unless you
+	 * need to, as it will be very noisy.
+	 */
+	bool raw_trace{false};
+
+	/**
+	 * @brief If raw_trace is set to true, log a debug message for this connection
+	 * @param message debug message
+	 */
+	void do_raw_trace(const std::string& message) const;
+
+	virtual void on_buffer_drained();
+
+	/**
+	 * @brief Start connecting to a TCP socket.
+	 * This simply calls connect() and checks for error return, as the timeout is now handled in the main
+	 * IO events for the ssl_connection class.
+	 *
+	 * @param sockfd socket descriptor
+	 * @param addr address to connect to
+	 * @param addrlen address length
+	 * @param timeout_ms timeout in milliseconds
+	 * @return int -1 on error, 0 on success just like POSIX connect()
+	 * @throw dpp::connection_exception on failure
+	 */
+	int start_connecting(dpp::socket sockfd, const struct sockaddr *addr, socklen_t addrlen);
+
+public:
+	/**
+	 * @brief For low-level debugging, calling this function will
+	 * enable low level I/O logging for this connection to the logger.
+	 * This can be very loud, and output a lot of data, so only enable it
+	 * selectively where you need it.
+	 *
+	 * Generally, you won't need this, it is a library development utility.
+	 */
+	void enable_raw_tracing();
+
+	/**
+	 * @brief Get total bytes sent
+	 * @return uint64_t bytes sent
+	 */
+	uint64_t get_bytes_out();
+	
+	/**
+	 * @brief Get total bytes received
+	 * @return uint64_t bytes received
+	 */
+	uint64_t get_bytes_in();
+
+	/**
+	 * @brief Every request made has a unique ID. This increments
+	 * for every request, starting at 1. You can use this for statistics,
+	 * or to associate requests and replies in external event loops.
+	 * @return Unique ID
+	 */
+	uint64_t get_unique_id() const;
+
+	/**
+	 * @brief Get SSL cipher name
+	 * @return std::string ssl cipher name
+	 */
+	std::string get_cipher();
+
+	/**
+	 * @brief True if we are keeping the connection alive after it has finished
+	 */
+	bool keepalive;
+
+	/**
+	 * @brief Owning cluster
+	 */
+	class cluster* owner;
+
+	/**
+	 * @brief Private key PEM file path for inbound SSL connections
+	 */
+	std::string private_key_file;
+
+	/**
+	 * @brief Public key PEM file path for inbound SSL connections
+	 */
+	std::string public_key_file;
+
+	/**
+	 * @brief Connect to a specified host and port. Throws std::runtime_error on fatal error.
+	 * @param creator Creating cluster
+	 * @param _hostname The hostname to connect to
+	 * @param _port the Port number to connect to
+	 * @param plaintext_downgrade Set to true to connect using plaintext only, without initialising SSL.
+	 * @param reuse Attempt to reuse previous connections for this hostname and port, if available
+	 * Note that no Discord endpoints will function when downgraded. This option is provided only for
+	 * connection to non-Discord addresses such as within dpp::cluster::request().
+	 * @throw dpp::exception Failed to initialise connection
+	 */
+	ssl_connection(cluster* creator, const std::string &_hostname, const std::string &_port = "443", bool plaintext_downgrade = false, bool reuse = false);
+
+	/**
+	 * @brief Accept a new connection from listen()/accept() socket
+	 * @param creator Creating cluster
+	 * @param fd Socket file descriptor assigned by accept()
+	 * @param port Port the new fd came from
+	 * @param plaintext_downgrade Set to true to connect using plaintext only, without initialising SSL.
+	 * @param private_key if plaintext_downgrade is set to false, a private key PEM file for SSL connections
+	 * @param public_key if plaintext_downgrade is set to false, a public key PEM file for SSL connections
+	 */
+	ssl_connection(cluster* creator, socket fd, uint16_t port, bool plaintext_downgrade = false, const std::string& private_key = "", const std::string& public_key = "");
+
+	/**
+	 * @brief Set up non blocking I/O and configure on_read, on_write and on_error.
+	 * @throw std::exception Any std::exception (or derivative) thrown from read_loop() indicates setup failed
+	 */
+	void read_loop();
+
+	/**
+	 * @brief Destroy the ssl_connection object
+	 */
+	virtual ~ssl_connection();
+
+	/**
+	 * @brief Handle input from the input buffer. This function will be called until
+	 * all data in the buffer has been processed and the buffer is empty.
+	 * @param buffer the buffer content. Will be modified removing any processed front elements
+	 * @return bool True if the socket should remain connected
+	 */
+	virtual bool handle_buffer(std::string &buffer);
+
+	/**
+	 * @brief Write to the output buffer.
+	 * @param data Data to be written to the buffer.
+	 * @note The data may not be written immediately and may be written at a later time to the socket.
+	 */
+	void socket_write(const std::string_view data);
+
+	/**
+	 * @brief Close socket connection
+	 */
+	virtual void close();
+
+	/**
+	 * @brief Log a message
+	 * @param severity severity of log message
+	 * @param msg Log message to send
+	 */
+	virtual void log(dpp::loglevel severity, const std::string &msg) const;
+
+	/**
+	 * @brief Called while SSL handshake is in progress.
+	 * If the handshake completes, the state of the socket is progressed to
+	 * an established state.
+	 * @param ev Socket events for the socket
+	 */
+	void complete_handshake(const struct socket_events* ev);
+
+	/**
+	 * @brief Called when the TCP socket has data to read
+	 * @param fd File descriptor
+	 * @param ev Socket events
+	 */
+	void on_read(dpp::socket fd, const struct dpp::socket_events& ev);
+
+	/**
+	 * @brief Called when the TCP socket can be written to without blocking
+	 * @param fd File descriptor
+	 * @param e Socket events
+	 */
+	void on_write(dpp::socket fd, const struct dpp::socket_events& e);
+
+	/**
+	 * @brief Called when there is an error on the TCP socket
+	 * @param fd File descriptor
+	 * @param error_code Error code
+	 */
+	void on_error(dpp::socket fd, const struct dpp::socket_events&, int error_code);
+};
+
+}
diff --git a/3rdParty/dpp/stage_instance.h b/3rdParty/dpp/stage_instance.h
index 90a134f9eb..bffeac46fa 100644
--- a/3rdParty/dpp/stage_instance.h
+++ b/3rdParty/dpp/stage_instance.h
@@ -1,86 +1,112 @@
-/************************************************************************************
- *
- * D++, A Lightweight C++ library for Discord
- *
- * Copyright 2021 Craig Edwards and D++ contributors 
- * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- ************************************************************************************/
-#pragma once
-#include <dpp/export.h>
-#include <dpp/snowflake.h>
-#include <dpp/managed.h>
-#include <dpp/nlohmann/json_fwd.hpp>
-#include <unordered_map>
-#include <dpp/json_interface.h>
-
-namespace dpp {
-
-/**
- * @brief Represents the privacy of a stage instance
- */
-enum stage_privacy_level : uint8_t {
-	/// The Stage instance is visible publicly, such as on Stage Discovery.
-	sp_public = 1,
-	/// The Stage instance is visible to only guild members.
-	sp_guild_only = 2
-};
-
-/**
- * @brief A stage instance.
- * Stage instances are like a conference facility, with moderators/speakers and listeners.
- */
-struct DPP_EXPORT stage_instance : public managed, public json_interface<stage_instance>  {
-	/// The guild id of the associated Stage channel
-	snowflake guild_id;
-	/// The id of the associated Stage channel
-	snowflake channel_id;
-	/// The topic of the Stage instance (1-120 characters)
-	std::string topic;
-	/// The privacy level of the Stage instance
-	stage_privacy_level privacy_level;
-	/// Whether or not Stage Discovery is disabled
-	bool discoverable_disabled;
-
-	/**
-	 * @brief Create a stage_instance object
-	 */
-	stage_instance();
-
-	/**
-	 * @brief Destroy the stage_instance object
-	 */
-	~stage_instance() = default;
-
-	/**
-	 * @brief Serialise a stage_instance object rom json
-	 *
-	 * @return stage_instance& a reference to self
-	 */
-	 stage_instance& fill_from_json(const nlohmann::json* j);
-
-	/**
-	 * @brief Build json for this object
-	 *
-	 * @param with_id include ID
-	 * @return std::string Dumped json of this object
-	 */
-	virtual std::string build_json(bool with_id = false) const;
-};
-
-/** A group of stage instances */
-typedef std::unordered_map<snowflake, stage_instance> stage_instance_map;
-
-};
+/************************************************************************************
+ *
+ * D++, A Lightweight C++ library for Discord
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright 2021 Craig Edwards and D++ contributors 
+ * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ************************************************************************************/
+#pragma once
+#include <dpp/export.h>
+#include <dpp/snowflake.h>
+#include <dpp/managed.h>
+#include <dpp/json_fwd.h>
+#include <unordered_map>
+#include <dpp/json_interface.h>
+
+namespace dpp {
+
+/**
+ * @brief Represents the privacy of a stage instance
+ */
+enum stage_privacy_level : uint8_t {
+	/**
+	 * @brief The Stage instance is visible publicly, such as on Stage Discovery.
+	 */
+	sp_public = 1,
+
+	/**
+	 * @brief The Stage instance is visible to only guild members.
+	 */
+	sp_guild_only = 2
+};
+
+/**
+ * @brief A stage instance.
+ * Stage instances are like a conference facility, with moderators/speakers and listeners.
+ */
+struct DPP_EXPORT stage_instance : public managed, public json_interface<stage_instance> {
+protected:
+	friend struct json_interface<stage_instance>;
+
+	/**
+	 * @brief Serialise a stage_instance object rom json
+	 *
+	 * @return stage_instance& a reference to self
+	 */
+	 stage_instance& fill_from_json_impl(const nlohmann::json* j);
+
+	/**
+	 * @brief Build json for this object
+	 *
+	 * @param with_id include ID
+	 * @return json Json of this object
+	 */
+	virtual json to_json_impl(bool with_id = false) const;
+
+public:
+	/**
+	 * @brief The guild ID of the associated Stage channel.
+	 */
+	snowflake guild_id;
+
+	/**
+	 * @brief The ID of the associated Stage channel.
+	 */
+	snowflake channel_id;
+
+	/**
+	 * @brief The topic of the Stage instance (1-120 characters).
+	 */
+	std::string topic;
+
+	/**
+	 * @brief The privacy level of the Stage instance.
+	 */
+	stage_privacy_level privacy_level;
+
+	/**
+	 * @brief Whether or not Stage Discovery is disabled.
+	 */
+	bool discoverable_disabled;
+
+	/**
+	 * @brief Create a stage_instance object
+	 */
+	stage_instance();
+
+	/**
+	 * @brief Destroy the stage_instance object
+	 */
+	~stage_instance() = default;
+};
+
+/**
+ * @brief A group of stage instances
+ */
+typedef std::unordered_map<snowflake, stage_instance> stage_instance_map;
+
+}
diff --git a/3rdParty/dpp/stringops.h b/3rdParty/dpp/stringops.h
index 856ff30103..60a5045a46 100644
--- a/3rdParty/dpp/stringops.h
+++ b/3rdParty/dpp/stringops.h
@@ -1,212 +1,223 @@
-/************************************************************************************
- * 
- * D++ - A Lightweight C++ Library for Discord
- *
- * stringops.h taken from TriviaBot
- *
- * Copyright 2004 Craig Edwards <support@sporks.gg>
- *
- * Core based on Sporks, the Learning Discord Bot, Craig Edwards (c) 2019.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- ************************************************************************************/
-
-#pragma once
-#include <string>
-#include <iomanip>
-#include <locale>
-#include <algorithm>
-#include <sstream>
-#include <iostream>
-
-namespace dpp {
-/**
- * @brief Convert a string to lowercase using tolower()
- * 
- * @tparam T type of string
- * @param s String to lowercase
- * @return std::basic_string<T> lowercased string
- */
-template <typename T> std::basic_string<T> lowercase(const std::basic_string<T>& s)
-{
-    std::basic_string<T> s2 = s;
-    std::transform(s2.begin(), s2.end(), s2.begin(), tolower);
-    return s2;
-}
-
-/**
- * @brief Convert a string to uppercase using toupper()
- * 
- * @tparam T type of string
- * @param s String to uppercase
- * @return std::basic_string<T> uppercased string 
- */
-template <typename T> std::basic_string<T> uppercase(const std::basic_string<T>& s)
-{
-    std::basic_string<T> s2 = s;
-    std::transform(s2.begin(), s2.end(), s2.begin(), toupper);
-    return s2;
-}
-
-/**
- * @brief trim from end of string (right)
- * 
- * @param s String to trim
- * @return std::string trimmed string
- */
-inline std::string rtrim(std::string s)
-{
-	s.erase(s.find_last_not_of(" \t\n\r\f\v") + 1);
-	return s;
-}
-
-/**
- * @brief trim from beginning of string (left)
- * 
- * @param s string to trim
- * @return std::string trimmed string
- */
-inline std::string ltrim(std::string s)
-{
-	s.erase(0, s.find_first_not_of(" \t\n\r\f\v"));
-	return s;
-}
-
-/**
- * @brief Trim from both ends of string (right then left)
- * 
- * @param s string to trim 
- * @return std::string trimmed string
- */
-inline std::string trim(std::string s)
-{
-	return ltrim(rtrim(s));
-}
-
-/**
- * @brief Add commas to a string (or dots) based on current locale server-side
- * 
- * @tparam T type of numeric value
- * @param value Value
- * @return std::string number with commas added 
- */
-template<class T> std::string comma(T value)
-{
-	std::stringstream ss;
-	ss.imbue(std::locale(""));
-	ss << std::fixed << value;
-	return ss.str();
-}
-
-/**
- * @brief  Convert any value from a string to another type using stringstream.
- * The optional second parameter indicates the format of the input string,
- * e.g. std::dec for decimal, std::hex for hex, std::oct for octal.
- * 
- * @tparam T Type to convert to 
- * @param s String to convert from
- * @param f Numeric base, e.g. `std::dec` or `std::hex`
- * @return T Returned numeric value
- */
-template <typename T> T from_string(const std::string &s, std::ios_base & (*f)(std::ios_base&))
-{
-	T t;
-	std::istringstream iss(s);
-	iss >> f, iss >> t;
-	return t;
-}
-
-/**
- * @brief  Convert any value from a string to another type using stringstream.
- * 
- * @tparam T Type to convert to 
- * @param s String to convert from
- * @return T Returned numeric value
- *
- * @note Base 10 for numeric conversions.
- */
-template <typename T> T from_string(const std::string &s)
-{
-	T t;
-	std::istringstream iss(s);
-	iss >> t;
-	return t;
-}
-
-/**
- * @brief Specialised conversion of uint64_t from string
- * 
- * @tparam int64_t 
- * @param s string to convert 
- * @return uint64_t return value
- */
-template <uint64_t> uint64_t from_string(const std::string &s)
-{
-	return std::stoull(s, 0, 10);
-}
-
-/**
- * @brief Specialised conversion of uint32_t from string
- * 
- * @tparam uint32_t 
- * @param s string to convert
- * @return uint32_t return value
- */
-template <uint32_t> uint32_t from_string(const std::string &s)
-{
-	return std::stoul(s, 0, 10);
-}
-
-/**
- * @brief Specialised conversion of int from string
- * 
- * @tparam int 
- * @param s string to convert
- * @return int return value
- */
-template <int> int from_string(const std::string &s)
-{
-	return std::stoi(s, 0, 10);
-}
-
-/**
- * @brief Convert a numeric value to hex
- * 
- * @tparam T numeric type
- * @param i numeric value
- * @return std::string value in hex, the length will be 2* the raw size of the type
- */
-template <typename T> std::string to_hex(T i)
-{
-  std::stringstream stream;
-  stream << std::setfill('0') << std::setw(sizeof(T)*2) << std::hex << i;
-  return stream.str();
-}
-
-/**
- * @brief Format a numeric type as a string with leading zeroes
- * 
- * @tparam T numeric type
- * @param i numeric value
- * @param width width of type including the leading zeroes
- * @return std::string resultant string with leading zeroes
- */
-template <typename T> std::string leading_zeroes(T i, size_t width)
-{
-  std::stringstream stream;
-  stream << std::setfill('0') << std::setw(width) << std::dec << i;
-  return stream.str();
-}
-
-};
+/************************************************************************************
+ * 
+ * D++ - A Lightweight C++ Library for Discord
+ *
+ * stringops.h taken from TriviaBot
+ *
+ * Copyright 2004 Craig Edwards <support@sporks.gg>
+ *
+ * Core based on Sporks, the Learning Discord Bot, Craig Edwards (c) 2019.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ************************************************************************************/
+
+#pragma once
+#include <string>
+#include <iomanip>
+#include <locale>
+#include <algorithm>
+#include <sstream>
+#include <iostream>
+#include <charconv>
+
+namespace dpp {
+/**
+ * @brief Convert a string to lowercase using tolower()
+ * 
+ * @tparam T type of string
+ * @param s String to lowercase
+ * @return std::basic_string<T> lowercased string
+ */
+template <typename T> std::basic_string<T> lowercase(const std::basic_string<T>& s)
+{
+	std::basic_string<T> s2 = s;
+	std::transform(s2.begin(), s2.end(), s2.begin(), tolower);
+	return s2;
+}
+
+/**
+ * @brief Convert a string to uppercase using toupper()
+ * 
+ * @tparam T type of string
+ * @param s String to uppercase
+ * @return std::basic_string<T> uppercased string 
+ */
+template <typename T> std::basic_string<T> uppercase(const std::basic_string<T>& s)
+{
+	std::basic_string<T> s2 = s;
+	std::transform(s2.begin(), s2.end(), s2.begin(), toupper);
+	return s2;
+}
+
+/**
+ * @brief trim from end of string (right)
+ * 
+ * @param s String to trim
+ * @return std::string trimmed string
+ */
+inline std::string rtrim(std::string s)
+{
+	s.erase(s.find_last_not_of(" \t\n\r\f\v") + 1);
+	return s;
+}
+
+/**
+ * @brief trim from beginning of string (left)
+ * 
+ * @param s string to trim
+ * @return std::string trimmed string
+ */
+inline std::string ltrim(std::string s)
+{
+	s.erase(0, s.find_first_not_of(" \t\n\r\f\v"));
+	return s;
+}
+
+/**
+ * @brief Trim from both ends of string (right then left)
+ * 
+ * @param s string to trim 
+ * @return std::string trimmed string
+ */
+inline std::string trim(std::string s)
+{
+	return ltrim(rtrim(s));
+}
+
+/**
+ * @brief Add commas to a string (or dots) based on current locale server-side
+ * 
+ * @tparam T type of numeric value
+ * @param value Value
+ * @return std::string number with commas added 
+ */
+template<class T> std::string comma(T value)
+{
+	std::stringstream ss;
+	ss.imbue(std::locale(""));
+	ss << std::fixed << value;
+	return ss.str();
+}
+
+/**
+ * @brief  Convert any value from a string to another type using stringstream.
+ * The optional second parameter indicates the format of the input string,
+ * e.g. std::dec for decimal, std::hex for hex, std::oct for octal.
+ * 
+ * @tparam T Type to convert to 
+ * @param s String to convert from
+ * @param f Numeric base, e.g. `std::dec` or `std::hex`
+ * @return T Returned numeric value
+ */
+template <typename T> T from_string(const std::string &s, std::ios_base & (*f)(std::ios_base&))
+{
+	T t;
+	std::istringstream iss(s);
+	iss >> f, iss >> t;
+	return t;
+}
+
+/**
+ * @brief  Convert any value from a string to another type using stringstream.
+ * 
+ * @tparam T Type to convert to 
+ * @param s String to convert from
+ * @return T Returned numeric value
+ *
+ * @note Base 10 for numeric conversions.
+ */
+template <typename T> T from_string(const std::string &s)
+{
+	if (s.empty()) {
+		return static_cast<T>(0);
+	}
+	T t;
+	std::istringstream iss(s);
+	iss >> t;
+	return t;
+}
+
+/**
+ * @brief Specialised conversion of uint64_t from string
+ * 
+ * @tparam int64_t 
+ * @param s string to convert 
+ * @return uint64_t return value
+ */
+template <uint64_t> uint64_t from_string(const std::string &s)
+{
+	return std::stoull(s, 0, 10);
+}
+
+/**
+ * @brief Specialised conversion of uint32_t from string
+ * 
+ * @tparam uint32_t 
+ * @param s string to convert
+ * @return uint32_t return value
+ */
+template <uint32_t> uint32_t from_string(const std::string &s)
+{
+	return (uint32_t) std::stoul(s, 0, 10);
+}
+
+/**
+ * @brief Specialised conversion of int from string
+ * 
+ * @tparam int 
+ * @param s string to convert
+ * @return int return value
+ */
+template <int> int from_string(const std::string &s)
+{
+	return std::stoi(s, 0, 10);
+}
+
+/**
+ * @brief Convert a numeric value to hex
+ * 
+ * @tparam T numeric type
+ * @param i numeric value
+ * @param leading_zeroes set to false if you don't want the leading zeroes in the output
+ * @return std::string value in hex, the length will be 2* the raw size of the type
+ */
+template <typename T> std::string to_hex(T i, bool leading_zeroes = true)
+{
+	char str[26] = { 0 };
+	size_t size = sizeof(T) * 2;
+	std::to_chars(std::begin(str), std::end(str), i, 16);
+	std::string out{str};
+	if (leading_zeroes && out.length() < size) {
+		out.insert(out.begin(), size - out.length(), '0');
+	}
+	return out;
+}
+
+/**
+ * @brief Format a numeric type as a string with leading zeroes
+ * 
+ * @tparam T numeric type
+ * @param i numeric value
+ * @param width width of type including the leading zeroes
+ * @return std::string resultant string with leading zeroes
+ */
+template <typename T> std::string leading_zeroes(T i, size_t width)
+{
+	std::stringstream stream;
+	stream.imbue(std::locale::classic());
+	stream << std::setfill('0') << std::setw((int)width) << std::dec << i;
+	return stream.str();
+}
+
+}
diff --git a/3rdParty/dpp/sync.h b/3rdParty/dpp/sync.h
deleted file mode 100644
index a837103782..0000000000
--- a/3rdParty/dpp/sync.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/************************************************************************************
- *
- * D++, A Lightweight C++ library for Discord
- *
- * Copyright 2022 Craig Edwards and D++ contributors
- * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- ************************************************************************************/
-#pragma once
-#include <dpp/export.h>
-#include <dpp/snowflake.h>
-#include <future>
-#include <utility>
-#include <dpp/exception.h>
-
-namespace dpp {
-
-    /**
-     * @brief Call a D++ REST function synchronously.
-     *
-     * Synchronously calling a REST function means *IT WILL BLOCK* - This is a Bad Thing™ and strongly discouraged.
-     * There are very few circumstances you actually need this. If you do need to use this, you'll know it.
-     *
-     * Example:
-     *
-     * ```cpp
-     * dpp::message m = dpp::sync<dpp::message>(&bot, &dpp::cluster::message_create, dpp::message(channel_id, "moo."));
-     * ```
-     *
-     * @warning As previously mentioned, this template will block. It is ill-advised to call this outside of
-     * a separate thread and this should never be directly used in any event such as dpp::cluster::on_interaction_create!
-     * @tparam T type of expected return value, should match up with the method called
-     * @tparam F Type of class method in dpp::cluster to call.
-     * @tparam Ts Function parameters in method call
-     * @param c A pointer to dpp::cluster object
-     * @param func pointer to class method in dpp::cluster to call. This can call any
-     * dpp::cluster member function who's last parameter is a dpp::command_completion_event_t callback type.
-     * @param args Zero or more arguments for the method call
-     * @return An instantiated object of type T
-     * @throw dpp::rest_exception On failure of the method call, an exception is thrown
-     */
-    template<typename T, class F, class... Ts> T sync(class cluster* c, F func, Ts&&... args) {
-        std::promise<T> _p;
-        std::future<T> _f = _p.get_future();
-        /* (obj ->* func) is the obscure syntax for calling a method pointer on an object instance */
-        (c ->* func)(std::forward<Ts>(args)..., [&_p](const auto& cc) {
-            try {
-                if (cc.is_error()) {
-                    throw dpp::rest_exception(cc.get_error().message);
-                } else {
-                    try {
-                        _p.set_value(std::get<T>(cc.value));
-                    } catch (const std::exception& e) {
-                        throw dpp::rest_exception(e.what());
-                    }
-                }
-            } catch (const dpp::rest_exception&) {
-                _p.set_exception(std::current_exception());
-            }
-        });
-
-        /* Blocking calling thread until rest request is completed. 
-         * Exceptions encountered on the other thread are re-thrown.
-         */
-        return _f.get();
-    }
-
-};
diff --git a/3rdParty/dpp/sysdep.h b/3rdParty/dpp/sysdep.h
index 8971c30870..d706d7b8f5 100644
--- a/3rdParty/dpp/sysdep.h
+++ b/3rdParty/dpp/sysdep.h
@@ -1,120 +1,120 @@
-/*
- * Discord erlpack - tidied up for D++, Craig Edwards 2021.
- * 
- * MessagePack system dependencies modified for erlpack.
- * 
- * Copyright (C) 2008-2010 FURUHASHI Sadayuki
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-#pragma once
-
-#include <stdlib.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <stdbool.h>
-#if defined(__linux__)
-#include <endian.h>
-#endif
-
-#ifdef _WIN32
-
-#ifdef __cplusplus
-/* numeric_limits<T>::min,max */
-#ifdef max
-#undef max
-#endif
-#ifdef min
-#undef min
-#endif
-#endif
-
-#else
-#include <arpa/inet.h>  /* __BYTE_ORDER */
-#endif
-
-#if !defined(__LITTLE_ENDIAN__) && !defined(__BIG_ENDIAN__)
-#if __BYTE_ORDER == __LITTLE_ENDIAN
-#define __LITTLE_ENDIAN__
-#elif __BYTE_ORDER == __BIG_ENDIAN
-#define __BIG_ENDIAN__
-#elif _WIN32
-#define __LITTLE_ENDIAN__
-#endif
-#endif
-
-
-#ifdef __LITTLE_ENDIAN__
-
-#ifdef _WIN32
-#  if defined(ntohs)
-#    define etf_byte_order_16(x) ntohs(x)
-#  elif defined(_byteswap_ushort) || (defined(_MSC_VER) && _MSC_VER >= 1400)
-#    define etf_byte_order_16(x) ((uint16_t)_byteswap_ushort((unsigned short)x))
-#  else
-#    define etf_byte_order_16(x) ( \
-        ((((uint16_t)x) <<  8) ) | \
-        ((((uint16_t)x) >>  8) ) )
-#  endif
-#else
-#  define etf_byte_order_16(x) ntohs(x)
-#endif
-
-#ifdef _WIN32
-#  if defined(ntohl)
-#    define etf_byte_order_32(x) ntohl(x)
-#  elif defined(_byteswap_ulong) || (defined(_MSC_VER) && _MSC_VER >= 1400)
-#    define etf_byte_order_32(x) ((uint32_t)_byteswap_ulong((unsigned long)x))
-#  else
-#    define etf_byte_order_32(x) \
-        ( ((((uint32_t)x) << 24)               ) | \
-          ((((uint32_t)x) <<  8) & 0x00ff0000U ) | \
-          ((((uint32_t)x) >>  8) & 0x0000ff00U ) | \
-          ((((uint32_t)x) >> 24)               ) )
-#  endif
-#else
-#  define etf_byte_order_32(x) ntohl(x)
-#endif
-
-#if defined(_byteswap_uint64) || (defined(_MSC_VER) && _MSC_VER >= 1400)
-#  define etf_byte_order_64(x) (_byteswap_uint64(x))
-#elif defined(bswap_64)
-#  define etf_byte_order_64(x) bswap_64(x)
-#elif defined(__DARWIN_OSSwapInt64)
-#  define etf_byte_order_64(x) __DARWIN_OSSwapInt64(x)
-#elif defined(__linux__)
-#  define etf_byte_order_64(x) be64toh(x)
-#else
-#  define etf_byte_order_64(x) \
-    ( ((((uint64_t)x) << 56)                         ) | \
-      ((((uint64_t)x) << 40) & 0x00ff000000000000ULL ) | \
-      ((((uint64_t)x) << 24) & 0x0000ff0000000000ULL ) | \
-      ((((uint64_t)x) <<  8) & 0x000000ff00000000ULL ) | \
-      ((((uint64_t)x) >>  8) & 0x00000000ff000000ULL ) | \
-      ((((uint64_t)x) >> 24) & 0x0000000000ff0000ULL ) | \
-      ((((uint64_t)x) >> 40) & 0x000000000000ff00ULL ) | \
-      ((((uint64_t)x) >> 56)                         ) )
-#endif
-
-#else
-#define etf_byte_order_16(x) (x)
-#define etf_byte_order_32(x) (x)
-#define etf_byte_order_64(x) (x)
-#endif
-
-#define store_16_bits(to, num) \
-    do { uint16_t val = etf_byte_order_16(num); memcpy(to, &val, 2); } while(0)
-#define store_32_bits(to, num) \
-    do { uint32_t val = etf_byte_order_32(num); memcpy(to, &val, 4); } while(0)
-#define store_64_bits(to, num) \
-    do { uint64_t val = etf_byte_order_64(num); memcpy(to, &val, 8); } while(0)
+/*
+ * Discord erlpack - tidied up for D++, Craig Edwards 2021.
+ * 
+ * MessagePack system dependencies modified for erlpack.
+ * 
+ * Copyright (C) 2008-2010 FURUHASHI Sadayuki
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+#pragma once
+
+#include <stdlib.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <stdbool.h>
+#if defined(__linux__)
+#include <endian.h>
+#endif
+
+#ifdef _WIN32
+
+#ifdef __cplusplus
+/* numeric_limits<T>::min,max */
+#ifdef max
+#undef max
+#endif
+#ifdef min
+#undef min
+#endif
+#endif
+
+#else
+#include <arpa/inet.h>  /* __BYTE_ORDER */
+#endif
+
+#if !defined(__LITTLE_ENDIAN__) && !defined(__BIG_ENDIAN__)
+#if __BYTE_ORDER == __LITTLE_ENDIAN
+#define __LITTLE_ENDIAN__
+#elif __BYTE_ORDER == __BIG_ENDIAN
+#define __BIG_ENDIAN__
+#elif _WIN32
+#define __LITTLE_ENDIAN__
+#endif
+#endif
+
+
+#ifdef __LITTLE_ENDIAN__
+
+#ifdef _WIN32
+#  if defined(ntohs)
+#    define etf_byte_order_16(x) ntohs(x)
+#  elif defined(_byteswap_ushort) || (defined(_MSC_VER) && _MSC_VER >= 1400)
+#    define etf_byte_order_16(x) ((uint16_t)_byteswap_ushort((unsigned short)x))
+#  else
+#    define etf_byte_order_16(x) ( \
+        ((((uint16_t)x) <<  8) ) | \
+        ((((uint16_t)x) >>  8) ) )
+#  endif
+#else
+#  define etf_byte_order_16(x) ntohs(x)
+#endif
+
+#ifdef _WIN32
+#  if defined(ntohl)
+#    define etf_byte_order_32(x) ntohl(x)
+#  elif defined(_byteswap_ulong) || (defined(_MSC_VER) && _MSC_VER >= 1400)
+#    define etf_byte_order_32(x) ((uint32_t)_byteswap_ulong((unsigned long)x))
+#  else
+#    define etf_byte_order_32(x) \
+        ( ((((uint32_t)x) << 24)               ) | \
+          ((((uint32_t)x) <<  8) & 0x00ff0000U ) | \
+          ((((uint32_t)x) >>  8) & 0x0000ff00U ) | \
+          ((((uint32_t)x) >> 24)               ) )
+#  endif
+#else
+#  define etf_byte_order_32(x) ntohl(x)
+#endif
+
+#if defined(_byteswap_uint64) || (defined(_MSC_VER) && _MSC_VER >= 1400)
+#  define etf_byte_order_64(x) (_byteswap_uint64(x))
+#elif defined(bswap_64)
+#  define etf_byte_order_64(x) bswap_64(x)
+#elif defined(__DARWIN_OSSwapInt64)
+#  define etf_byte_order_64(x) __DARWIN_OSSwapInt64(x)
+#elif defined(__linux__)
+#  define etf_byte_order_64(x) be64toh(x)
+#else
+#  define etf_byte_order_64(x) \
+    ( ((((uint64_t)x) << 56)                         ) | \
+      ((((uint64_t)x) << 40) & 0x00ff000000000000ULL ) | \
+      ((((uint64_t)x) << 24) & 0x0000ff0000000000ULL ) | \
+      ((((uint64_t)x) <<  8) & 0x000000ff00000000ULL ) | \
+      ((((uint64_t)x) >>  8) & 0x00000000ff000000ULL ) | \
+      ((((uint64_t)x) >> 24) & 0x0000000000ff0000ULL ) | \
+      ((((uint64_t)x) >> 40) & 0x000000000000ff00ULL ) | \
+      ((((uint64_t)x) >> 56)                         ) )
+#endif
+
+#else
+#define etf_byte_order_16(x) (x)
+#define etf_byte_order_32(x) (x)
+#define etf_byte_order_64(x) (x)
+#endif
+
+#define store_16_bits(to, num) \
+    do { uint16_t val = etf_byte_order_16(num); memcpy(to, &val, 2); } while(0)
+#define store_32_bits(to, num) \
+    do { uint32_t val = etf_byte_order_32(num); memcpy(to, &val, 4); } while(0)
+#define store_64_bits(to, num) \
+    do { uint64_t val = etf_byte_order_64(num); memcpy(to, &val, 8); } while(0)
diff --git a/3rdParty/dpp/thread.h b/3rdParty/dpp/thread.h
new file mode 100644
index 0000000000..7cb160869f
--- /dev/null
+++ b/3rdParty/dpp/thread.h
@@ -0,0 +1,236 @@
+/************************************************************************************
+ *
+ * D++, A Lightweight C++ library for Discord
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright 2021 Craig Edwards and D++ contributors 
+ * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ************************************************************************************/
+
+#pragma once
+#include <dpp/export.h>
+#include <dpp/snowflake.h>
+#include <dpp/managed.h>
+#include <dpp/channel.h>
+#include <dpp/message.h>
+
+namespace dpp {
+
+/**
+ * @brief represents membership of a user with a thread
+ */
+struct DPP_EXPORT thread_member : public json_interface<thread_member> {
+protected:
+	friend struct json_interface<thread_member>;
+
+	/**
+	 * @brief Read struct values from a json object 
+	 * @param j json to read values from
+	 * @return A reference to self	
+	 */
+	thread_member& fill_from_json_impl(nlohmann::json* j);
+
+public:
+	/**
+	 * @brief ID of the thread member is part of.
+	 */
+	snowflake thread_id = {};
+
+	/**
+	 * @brief ID of the member.
+	 */
+	snowflake user_id = {};
+
+	/**
+	 * @brief The time when user last joined the thread.
+	 */
+	time_t joined = 0;
+
+	/**
+	 * @brief Any user-thread settings, currently only used for notifications.
+	 */
+	uint32_t flags = 0;
+};
+
+/**
+ * @brief A group of thread member objects. the key is the user_id of the dpp::thread_member
+ */
+typedef std::unordered_map<snowflake, thread_member> thread_member_map;
+
+/**
+ * @brief metadata for threads
+ */
+struct DPP_EXPORT thread_metadata {
+	/**
+	 * @brief Timestamp when the thread's archive status was last changed, used for calculating recent activity.
+	 */
+	time_t archive_timestamp;
+
+	/**
+	 * @brief The duration in minutes to automatically archive the thread after recent activity (60, 1440, 4320, 10080).
+	 */
+	uint16_t auto_archive_duration;
+
+	/**
+	 * @brief Whether a thread is archived
+	 */
+	bool archived;
+
+	/**
+	 * @brief Whether a thread is locked. When a thread is locked,
+	 * only users with `MANAGE_THREADS` can un-archive it.
+	 */
+	bool locked;
+
+	/**
+	 * @brief Whether non-moderators can add other non-moderators. Only for private threads.
+	 */
+	bool invitable;
+};
+
+/** @brief A definition of a discord thread.
+ * A thread is a superset of a channel. Not to be confused with `std::thread`!
+ */
+class DPP_EXPORT thread : public channel, public json_interface<thread> {
+protected:
+	friend struct json_interface<thread>;
+
+	/** Read class values from json object
+	 * @param j A json object to read from
+	 * @return A reference to self
+	 */
+	thread& fill_from_json_impl(nlohmann::json* j);
+
+	/**
+	 * @brief Build json for this thread object
+	 *
+	 * @param with_id include the ID in the json
+	 * @return std::string JSON string
+	 */
+	json to_json_impl(bool with_id = false) const override;
+
+public:
+	using json_interface<thread>::fill_from_json;
+	using json_interface<thread>::build_json;
+	using json_interface<thread>::to_json;
+
+	/**
+	 * @brief Thread member of current user if joined to the thread.
+	 * Note this is only set by certain api calls otherwise contains default data
+	 */
+	thread_member member = {};
+
+	/**
+	 * @brief Thread metadata (threads)
+	 */
+	thread_metadata metadata = {};
+
+	/**
+	 * @brief Created message. Only filled within the cluster::thread_create_in_forum() method
+	 */
+	message msg = {};
+
+	/**
+	 * @brief A list of dpp::forum_tag IDs that have been applied to a thread in a forum or media channel.
+	 */
+	std::vector<snowflake> applied_tags = {};
+
+	/**
+	 * @brief Number of messages ever sent in the thread.
+	 * It's similar to thread::message_count on message creation, but will not decrement the number when a message is deleted
+	 */
+	uint32_t total_messages_sent = 0;
+
+	/**
+	 * @brief Number of messages (not including the initial message or deleted messages) of the thread.
+	 * For threads created before July 1, 2022, the message count is inaccurate when it's greater than 50.
+	 */
+	uint8_t message_count = 0;
+
+	/**
+	 * @brief Approximate count of members in a thread (stops counting at 50)
+	 */
+	uint8_t member_count = 0;
+
+	/**
+	 * @brief Was this thread newly created?
+	 * @note This will only show in dpp::cluster::on_thread_create if the thread was just made.
+	 */
+	bool newly_created{false};
+
+	/**
+	 * @brief Returns true if the thread is within an announcement channel
+	 *
+	 * @return true if announcement thread
+	 */
+	constexpr bool is_news_thread() const noexcept {
+		return (flags & channel::CHANNEL_TYPE_MASK) == CHANNEL_ANNOUNCEMENT_THREAD;
+	}
+
+	/**
+	 * @brief Returns true if the channel is a public thread
+	 *
+	 * @return true if public thread
+	 */
+	constexpr bool is_public_thread() const noexcept {
+		return (flags & channel::CHANNEL_TYPE_MASK) == CHANNEL_PUBLIC_THREAD;
+	}
+
+	/**
+	 * @brief Returns true if the channel is a private thread
+	 *
+	 * @return true if private thread
+	 */
+	constexpr bool is_private_thread() const noexcept {
+		return (flags & channel::CHANNEL_TYPE_MASK) == CHANNEL_PRIVATE_THREAD;
+	}
+};
+
+
+/**
+ * @brief Serialize a thread_metadata object to json
+ *
+ * @param j JSON object to serialize to
+ * @param tmdata object to serialize
+ */
+void to_json(nlohmann::json& j, const thread_metadata& tmdata);
+
+/**
+ * @brief A group of threads
+ */
+typedef std::unordered_map<snowflake, thread> thread_map;
+
+/**
+ * @brief A thread alongside the bot's optional thread_member object tied to it
+ */
+struct active_thread_info {
+	/**
+	 * @brief The thread object
+	 */
+	thread active_thread;
+
+	/**
+	 * @brief The bot as a thread member, only present if the bot is in the thread
+	 */
+	std::optional<thread_member> bot_member;
+};
+
+/**
+ * @brief A map of threads alongside optionally the thread_member tied to the bot if it is in the thread. The map's key is the thread id. Returned from the cluster::threads_get_active method
+ */
+using active_threads = std::map<snowflake, active_thread_info>;
+
+}
diff --git a/3rdParty/dpp/thread_pool.h b/3rdParty/dpp/thread_pool.h
new file mode 100644
index 0000000000..85771b2053
--- /dev/null
+++ b/3rdParty/dpp/thread_pool.h
@@ -0,0 +1,117 @@
+/************************************************************************************
+ *
+ * D++, A Lightweight C++ library for Discord
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright 2021 Craig Edwards and D++ contributors
+ * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ************************************************************************************/
+
+#pragma once
+#include <thread>
+#include <queue>
+#include <vector>
+#include <condition_variable>
+#include <mutex>
+#include <functional>
+
+namespace dpp {
+
+/**
+ * @brief A work unit is a lambda executed in the thread pool
+ */
+using work_unit = std::function<void()>;
+
+/**
+ * @brief A task within a thread pool. A simple lambda that accepts no parameters and returns void.
+ */
+struct DPP_EXPORT thread_pool_task {
+	/**
+	 * @brief Task priority, lower value is higher priority
+	 */
+	int priority;
+	/**
+	 * @brief Work unit to execute as the task
+	 */
+	work_unit function;
+};
+
+/**
+ * @brief Compares two thread pool tasks by priority
+ */
+struct DPP_EXPORT thread_pool_task_comparator {
+	/**
+	 * @brief Compare two tasks
+	 * @param a first task
+	 * @param b second task
+	 * @return true if a > b
+	 */
+	bool operator()(const thread_pool_task &a, const thread_pool_task &b) const {
+		return a.priority > b.priority;
+	};
+};
+
+/**
+ * @brief A thread pool contains 1 or more worker threads which accept thread_pool_task lambadas
+ * into a queue, which is processed in-order by whichever thread is free.
+ */
+struct DPP_EXPORT thread_pool {
+
+	/**
+	 * @brief Threads that comprise the thread pool
+	 */
+	std::vector<std::thread> threads;
+
+	/**
+	 * @brief Priority queue of tasks to be executed
+	 */
+	std::priority_queue<thread_pool_task, std::vector<thread_pool_task>, thread_pool_task_comparator> tasks;
+
+	/**
+	 * @brief Mutex for accessing the priority queue
+	 */
+	std::mutex queue_mutex;
+
+	/**
+	 * @brief Condition variable to notify for new tasks to run
+	 */
+	std::condition_variable cv;
+
+	/**
+	 * @brief True if the thread pool is due to stop
+	 */
+	bool stop{false};
+
+	/**
+	 * @brief Create a new priority thread pool
+	 * @param creator creating cluster (for logging)
+	 * @param num_threads number of threads in the pool
+	 */
+	explicit thread_pool(class cluster* creator, size_t num_threads = std::thread::hardware_concurrency());
+
+	/**
+	 * @brief Destroy the thread pool
+	 */
+	~thread_pool();
+
+	/**
+	 * @brief Enqueue a new task to the thread pool
+	 * @param task task to enqueue
+	 */
+	void enqueue(thread_pool_task task);
+};
+
+}
\ No newline at end of file
diff --git a/3rdParty/dpp/timed_listener.h b/3rdParty/dpp/timed_listener.h
index 467f0046e0..48051ff19b 100644
--- a/3rdParty/dpp/timed_listener.h
+++ b/3rdParty/dpp/timed_listener.h
@@ -1,95 +1,105 @@
-/************************************************************************************
- *
- * D++, A Lightweight C++ library for Discord
- *
- * Copyright 2021 Craig Edwards and D++ contributors
- * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- ************************************************************************************/
-#pragma once
-
-#include <dpp/export.h>
-#include <dpp/cluster.h>
-#include <time.h>
-#include <map>
-#include <functional>
-#include <string>
-
-namespace dpp {
-
-/**
- * @brief A timed_listener is a way to temporarily attach to an event for a specific timeframe, then detach when complete.
- * A lambda may also be optionally called when the timeout is reached. Destructing the timed_listener detaches any attached
- * event listeners, and cancels any created timers, but does not call any timeout lambda.
- * 
- * @tparam attached_event Event within cluster to attach to within the cluster::dispatch member (dpp::dispatcher object)
- * @tparam listening_function Definition of lambda function that matches up with the attached_event.
- */
-template <typename attached_event, class listening_function> class timed_listener 
-{
-private:
-	/// Owning cluster
-	cluster* owner;
-
-	/// Duration of listen
-	time_t duration;
-
-	/// Reference to attached event in cluster
-	//event_router_t<thread_member_update_t> on_thread_member_update;
-	attached_event& ev;
-
-	/// Timer handle
-	timer th;
-
-	/// Event handle
-	event_handle listener_handle;
-	
-public:
-	/**
-	 * @brief Construct a new timed listener object
-	 * 
-	 * @param cl Owning cluster
-	 * @param _duration Duration of timed event in seconds
-	 * @param event Event to hook, e.g. cluster.on_message_create
-	 * @param on_end An optional void() lambda to trigger when the timed_listener times out.
-	 * Calling the destructor before the timeout is reached does not call this lambda.
-	 * @param listener Lambda to receive events. Type must match up properly with that passed into the 'event' parameter.
-	 */
-	timed_listener(cluster* cl, uint64_t _duration, attached_event& event, listening_function listener, timer_callback_t on_end = {})
-	: owner(cl), duration(_duration), ev(event)
-	{
-		/* Attach event */
-		listener_handle = ev(listener);
-		/* Create timer */
-		th = cl->start_timer([this](dpp::timer timer_handle) {
-			/* Timer has finished, detach it from event.
-			 * Only allowed to tick once.
-			 */
-			ev.detach(listener_handle);
-			owner->stop_timer(th);
-		}, duration, on_end);
-	}
-
-	/**
-	 * @brief Destroy the timed listener object
-	 */
-	~timed_listener() {
-		/* Stop timer and detach event, but do not call on_end */
-		ev.detach(listener_handle);
-		owner->stop_timer(th);
-	}
-};
-
-};
\ No newline at end of file
+/************************************************************************************
+ *
+ * D++, A Lightweight C++ library for Discord
+ *
+ * Copyright 2021 Craig Edwards and D++ contributors
+ * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ************************************************************************************/
+#pragma once
+
+#include <dpp/export.h>
+#include <dpp/cluster.h>
+#include <time.h>
+#include <map>
+#include <functional>
+#include <string>
+
+namespace dpp {
+
+/**
+ * @brief A timed_listener is a way to temporarily attach to an event for a specific timeframe, then detach when complete.
+ * A lambda may also be optionally called when the timeout is reached. Destructing the timed_listener detaches any attached
+ * event listeners, and cancels any created timers, but does not call any timeout lambda.
+ * 
+ * @tparam attached_event Event within cluster to attach to within the cluster::dispatch member (dpp::dispatcher object)
+ * @tparam listening_function Definition of lambda function that matches up with the attached_event.
+ */
+template <typename attached_event, class listening_function> class timed_listener 
+{
+private:
+	/**
+	 * @brief Owning cluster.
+	 */
+	cluster* owner;
+
+	/**
+	 * @brief Duration of listen.
+	 */
+	time_t duration;
+
+	/**
+	 * @brief Reference to attached event in cluster.
+	 */
+	//event_router_t<thread_member_update_t> on_thread_member_update;
+	attached_event& ev;
+
+	/**
+	 * @brief Timer handle.
+	 */
+	timer th;
+
+	/**
+	 * @brief Event handle.
+	 */
+	event_handle listener_handle;
+	
+public:
+	/**
+	 * @brief Construct a new timed listener object
+	 * 
+	 * @param cl Owning cluster
+	 * @param _duration Duration of timed event in seconds
+	 * @param event Event to hook, e.g. cluster.on_message_create
+	 * @param on_end An optional void() lambda to trigger when the timed_listener times out.
+	 * Calling the destructor before the timeout is reached does not call this lambda.
+	 * @param listener Lambda to receive events. Type must match up properly with that passed into the 'event' parameter.
+	 */
+	timed_listener(cluster* cl, uint64_t _duration, attached_event& event, listening_function listener, timer_callback_t on_end = {})
+	: owner(cl), duration(_duration), ev(event)
+	{
+		/* Attach event */
+		listener_handle = ev(listener);
+		/* Create timer */
+		th = cl->start_timer([this]([[maybe_unused]] dpp::timer timer_handle) {
+			/* Timer has finished, detach it from event.
+			 * Only allowed to tick once.
+			 */
+			ev.detach(listener_handle);
+			owner->stop_timer(th);
+		}, duration, on_end);
+	}
+
+	/**
+	 * @brief Destroy the timed listener object
+	 */
+	~timed_listener() {
+		/* Stop timer and detach event, but do not call on_end */
+		ev.detach(listener_handle);
+		owner->stop_timer(th);
+	}
+};
+
+}
diff --git a/3rdParty/dpp/timer.h b/3rdParty/dpp/timer.h
index 92c5a05db1..6bc5037a7f 100644
--- a/3rdParty/dpp/timer.h
+++ b/3rdParty/dpp/timer.h
@@ -1,124 +1,150 @@
-/************************************************************************************
- *
- * D++, A Lightweight C++ library for Discord
- *
- * Copyright 2021 Craig Edwards and D++ contributors 
- * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- ************************************************************************************/
-
-#pragma once
-#include <dpp/export.h>
-#include <stdint.h>
-#include <map>
-#include <unordered_map>
-#include <stddef.h>
-#include <ctime>
-#include <functional>
-
-namespace dpp {
-
-/**
- * @brief Represents a timer handle.
- * Returned from cluster::start_timer and used by cluster::stop_timer.
- * This is obtained from a simple incrementing value, internally.
- */
-typedef size_t timer;
-
-/**
- * @brief The type for a timer callback
- */
-typedef std::function<void(timer)> timer_callback_t;
-
-/**
- * @brief Used internally to store state of active timers
- */
-struct DPP_EXPORT timer_t {
-	/**
-	 * @brief Timer handle
-	 */
-	timer handle;
-	/**
-	 * @brief Next timer tick as unix epoch
-	 */
-	time_t next_tick;
-	/**
-	 * @brief Frequency between ticks
-	 */
-	uint64_t frequency;
-	/**
-	 * @brief Lambda to call on tick
-	 */
-	timer_callback_t on_tick;
-	/**
-	 * @brief Lambda to call on stop (optional)
-	 */
-	timer_callback_t on_stop;
-};
-
-/**
- * @brief A map of timers, ordered by earliest first so that map::begin() is always the 
- * soonest to be due.
- */
-typedef std::multimap<time_t, timer_t*> timer_next_t;
-
-/**
- * @brief A map of timers stored by handle
- */
-typedef std::unordered_map<timer, timer_t*> timer_reg_t;
-
-/**
- * @brief Trigger a timed event once.
- * The provided callback is called only once.
- */
-class DPP_EXPORT oneshot_timer
-{
-private:
-	/// Owning cluster
-	class cluster* owner;
-	/// Timer handle
-	timer th;
-public:
-	/**
-	 * @brief Construct a new oneshot timer object
-	 * 
-	 * @param cl cluster owner
-	 * @param duration duration before firing
-	 * @param callback callback to call on firing
-	 */
-	oneshot_timer(class cluster* cl, uint64_t duration, timer_callback_t callback);
-
-	/**
-	 * @brief Get the handle for the created one-shot timer
-	 * 
-	 * @return timer handle for use with stop_timer
-	 */
-	timer get_handle();
-
-	/**
-	 * @brief Cancel the one shot timer immediately.
-	 * Callback function is not called.
-	 */
-	void cancel();
-
-	/**
-	 * @brief Destroy the oneshot timer object
-	 */
-	~oneshot_timer();
-};
-
-
-
-};
+/************************************************************************************
+ *
+ * D++, A Lightweight C++ library for Discord
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright 2021 Craig Edwards and D++ contributors 
+ * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ************************************************************************************/
+
+#pragma once
+#include <dpp/export.h>
+#include <cstdint>
+#include <map>
+#include <unordered_map>
+#include <cstddef>
+#include <ctime>
+#include <set>
+#include <queue>
+#include <functional>
+
+namespace dpp {
+
+/**
+ * @brief Represents a timer handle.
+ * Returned from cluster::start_timer and used by cluster::stop_timer.
+ * This is obtained from a simple incrementing value, internally.
+ */
+typedef size_t timer;
+
+/**
+ * @brief The type for a timer callback
+ */
+typedef std::function<void(timer)> timer_callback_t;
+
+/**
+ * @brief Used internally to store state of active timers
+ */
+struct DPP_EXPORT timer_t {
+	/**
+	 * @brief Timer handle
+	 */
+	timer handle{0};
+
+	/**
+	 * @brief Next timer tick as unix epoch
+	 */
+	time_t next_tick{0};
+
+	/**
+	 * @brief Frequency between ticks
+	 */
+	uint64_t frequency{0};
+
+	/**
+	 * @brief Lambda to call on tick
+	 */
+	timer_callback_t on_tick{};
+
+	/**
+	 * @brief Lambda to call on stop (optional)
+	 */
+	timer_callback_t on_stop{};
+};
+
+/**
+ * @brief Used to compare two timers next tick times in a priority queue
+ */
+struct DPP_EXPORT timer_comparator {
+	/**
+	 * @brief Compare two timers
+	 * @param a first timer
+	 * @param b second timer
+	 * @return returns true if a > b
+	 */
+	bool operator()(const timer_t &a, const timer_t &b) const {
+		return a.next_tick > b.next_tick;
+	};
+};
+
+
+/**
+ * @brief A priority timers, ordered by earliest first so that the head is always the
+ * soonest to be due.
+ */
+typedef std::priority_queue<timer_t, std::vector<timer_t>, timer_comparator> timer_next_t;
+
+/**
+ * @brief A set of deleted timer handles
+ */
+typedef std::set<timer> timers_deleted_t;
+
+/**
+ * @brief Trigger a timed event once.
+ * The provided callback is called only once.
+ */
+class DPP_EXPORT oneshot_timer
+{
+private:
+	/**
+	 * @brief Owning cluster.
+	 */
+	class cluster* owner;
+
+	/**
+	 * @brief Timer handle.
+	 */
+	timer th;
+public:
+	/**
+	 * @brief Construct a new oneshot timer object
+	 * 
+	 * @param cl cluster owner
+	 * @param duration duration before firing
+	 * @param callback callback to call on firing
+	 */
+	oneshot_timer(class cluster* cl, uint64_t duration, timer_callback_t callback);
+
+	/**
+	 * @brief Get the handle for the created one-shot timer
+	 * 
+	 * @return timer handle for use with stop_timer
+	 */
+	timer get_handle();
+
+	/**
+	 * @brief Cancel the one shot timer immediately.
+	 * Callback function is not called.
+	 */
+	void cancel();
+
+	/**
+	 * @brief Destroy the oneshot timer object
+	 */
+	~oneshot_timer();
+};
+
+}
diff --git a/3rdParty/dpp/unicode_emoji.h b/3rdParty/dpp/unicode_emoji.h
new file mode 100644
index 0000000000..accb13fe3d
--- /dev/null
+++ b/3rdParty/dpp/unicode_emoji.h
@@ -0,0 +1,5739 @@
+#pragma once
+
+namespace dpp {
+
+/**
+ * @brief Emoji unicodes.
+ *
+ * @note The unicode emojis in this namespace are auto-generated from https://raw.githubusercontent.com/ArkinSolomon/discord-emoji-converter/master/emojis.json
+ *
+ * @warning If you want to use this, you have to pull the header in separately. For example:
+ * ```cpp
+ * #include <dpp/dpp.h>
+ * #include <dpp/unicode_emoji.h>
+ * ```
+ */
+namespace unicode_emoji {
+	inline constexpr const char _100[] = "💯";
+	inline constexpr const char _1234[] = "🔢";
+	inline constexpr const char soccer[] = "⚽";
+	inline constexpr const char soccer_ball[] = "⚽";
+	inline constexpr const char basketball[] = "🏀";
+	inline constexpr const char football[] = "🏈";
+	inline constexpr const char baseball[] = "⚾";
+	inline constexpr const char softball[] = "🥎";
+	inline constexpr const char tennis[] = "🎾";
+	inline constexpr const char volleyball[] = "🏐";
+	inline constexpr const char rugby_football[] = "🏉";
+	inline constexpr const char flying_disc[] = "🥏";
+	inline constexpr const char _8ball[] = "🎱";
+	inline constexpr const char yo_yo[] = "🪀";
+	inline constexpr const char ping_pong[] = "🏓";
+	inline constexpr const char table_tennis[] = "🏓";
+	inline constexpr const char badminton[] = "🏸";
+	inline constexpr const char hockey[] = "🏒";
+	inline constexpr const char ice_hockey[] = "🏒";
+	inline constexpr const char field_hockey[] = "🏑";
+	inline constexpr const char lacrosse[] = "🥍";
+	inline constexpr const char cricket_game[] = "🏏";
+	inline constexpr const char cricket_bat_ball[] = "🏏";
+	inline constexpr const char boomerang[] = "🪃";
+	inline constexpr const char goal[] = "🥅";
+	inline constexpr const char goal_net[] = "🥅";
+	inline constexpr const char golf[] = "⛳";
+	inline constexpr const char flag_in_hole[] = "⛳";
+	inline constexpr const char kite[] = "🪁";
+	inline constexpr const char playground_slide[] = "🛝";
+	inline constexpr const char bow_and_arrow[] = "🏹";
+	inline constexpr const char archery[] = "🏹";
+	inline constexpr const char fishing_pole_and_fish[] = "🎣";
+	inline constexpr const char fishing_pole[] = "🎣";
+	inline constexpr const char diving_mask[] = "🤿";
+	inline constexpr const char boxing_glove[] = "🥊";
+	inline constexpr const char boxing_gloves[] = "🥊";
+	inline constexpr const char martial_arts_uniform[] = "🥋";
+	inline constexpr const char karate_uniform[] = "🥋";
+	inline constexpr const char running_shirt_with_sash[] = "🎽";
+	inline constexpr const char running_shirt[] = "🎽";
+	inline constexpr const char skateboard[] = "🛹";
+	inline constexpr const char roller_skate[] = "🛼";
+	inline constexpr const char sled[] = "🛷";
+	inline constexpr const char ice_skate[] = "⛸️";
+	inline constexpr const char curling_stone[] = "🥌";
+	inline constexpr const char ski[] = "🎿";
+	inline constexpr const char skis[] = "🎿";
+	inline constexpr const char skier[] = "⛷️";
+	inline constexpr const char snowboarder[] = "🏂";
+	inline constexpr const char snowboarder_tone1[] = "🏂🏻";
+	inline constexpr const char snowboarder_light_skin_tone[] = "🏂🏻";
+	inline constexpr const char snowboarder_tone2[] = "🏂🏼";
+	inline constexpr const char snowboarder_medium_light_skin_tone[] = "🏂🏼";
+	inline constexpr const char snowboarder_tone3[] = "🏂🏽";
+	inline constexpr const char snowboarder_medium_skin_tone[] = "🏂🏽";
+	inline constexpr const char snowboarder_tone4[] = "🏂🏾";
+	inline constexpr const char snowboarder_medium_dark_skin_tone[] = "🏂🏾";
+	inline constexpr const char snowboarder_tone5[] = "🏂🏿";
+	inline constexpr const char snowboarder_dark_skin_tone[] = "🏂🏿";
+	inline constexpr const char parachute[] = "🪂";
+	inline constexpr const char person_lifting_weights[] = "🏋️";
+	inline constexpr const char lifter[] = "🏋️";
+	inline constexpr const char weight_lifter[] = "🏋️";
+	inline constexpr const char person_lifting_weights_tone1[] = "🏋🏻";
+	inline constexpr const char lifter_tone1[] = "🏋🏻";
+	inline constexpr const char weight_lifter_tone1[] = "🏋🏻";
+	inline constexpr const char person_lifting_weights_tone2[] = "🏋🏼";
+	inline constexpr const char lifter_tone2[] = "🏋🏼";
+	inline constexpr const char weight_lifter_tone2[] = "🏋🏼";
+	inline constexpr const char person_lifting_weights_tone3[] = "🏋🏽";
+	inline constexpr const char lifter_tone3[] = "🏋🏽";
+	inline constexpr const char weight_lifter_tone3[] = "🏋🏽";
+	inline constexpr const char person_lifting_weights_tone4[] = "🏋🏾";
+	inline constexpr const char lifter_tone4[] = "🏋🏾";
+	inline constexpr const char weight_lifter_tone4[] = "🏋🏾";
+	inline constexpr const char person_lifting_weights_tone5[] = "🏋🏿";
+	inline constexpr const char lifter_tone5[] = "🏋🏿";
+	inline constexpr const char weight_lifter_tone5[] = "🏋🏿";
+	inline constexpr const char woman_lifting_weights[] = "🏋️‍♀️";
+	inline constexpr const char woman_lifting_weights_tone1[] = "🏋🏻‍♀️";
+	inline constexpr const char woman_lifting_weights_light_skin_tone[] = "🏋🏻‍♀️";
+	inline constexpr const char woman_lifting_weights_tone2[] = "🏋🏼‍♀️";
+	inline constexpr const char woman_lifting_weights_medium_light_skin_tone[] = "🏋🏼‍♀️";
+	inline constexpr const char woman_lifting_weights_tone3[] = "🏋🏽‍♀️";
+	inline constexpr const char woman_lifting_weights_medium_skin_tone[] = "🏋🏽‍♀️";
+	inline constexpr const char woman_lifting_weights_tone4[] = "🏋🏾‍♀️";
+	inline constexpr const char woman_lifting_weights_medium_dark_skin_tone[] = "🏋🏾‍♀️";
+	inline constexpr const char woman_lifting_weights_tone5[] = "🏋🏿‍♀️";
+	inline constexpr const char woman_lifting_weights_dark_skin_tone[] = "🏋🏿‍♀️";
+	inline constexpr const char man_lifting_weights[] = "🏋️‍♂️";
+	inline constexpr const char man_lifting_weights_tone1[] = "🏋🏻‍♂️";
+	inline constexpr const char man_lifting_weights_light_skin_tone[] = "🏋🏻‍♂️";
+	inline constexpr const char man_lifting_weights_tone2[] = "🏋🏼‍♂️";
+	inline constexpr const char man_lifting_weights_medium_light_skin_tone[] = "🏋🏼‍♂️";
+	inline constexpr const char man_lifting_weights_tone3[] = "🏋🏽‍♂️";
+	inline constexpr const char man_lifting_weights_medium_skin_tone[] = "🏋🏽‍♂️";
+	inline constexpr const char man_lifting_weights_tone4[] = "🏋🏾‍♂️";
+	inline constexpr const char man_lifting_weights_medium_dark_skin_tone[] = "🏋🏾‍♂️";
+	inline constexpr const char man_lifting_weights_tone5[] = "🏋🏿‍♂️";
+	inline constexpr const char man_lifting_weights_dark_skin_tone[] = "🏋🏿‍♂️";
+	inline constexpr const char people_wrestling[] = "🤼";
+	inline constexpr const char wrestlers[] = "🤼";
+	inline constexpr const char wrestling[] = "🤼";
+	inline constexpr const char women_wrestling[] = "🤼‍♀️";
+	inline constexpr const char men_wrestling[] = "🤼‍♂️";
+	inline constexpr const char person_doing_cartwheel[] = "🤸";
+	inline constexpr const char cartwheel[] = "🤸";
+	inline constexpr const char person_doing_cartwheel_tone1[] = "🤸🏻";
+	inline constexpr const char cartwheel_tone1[] = "🤸🏻";
+	inline constexpr const char person_doing_cartwheel_tone2[] = "🤸🏼";
+	inline constexpr const char cartwheel_tone2[] = "🤸🏼";
+	inline constexpr const char person_doing_cartwheel_tone3[] = "🤸🏽";
+	inline constexpr const char cartwheel_tone3[] = "🤸🏽";
+	inline constexpr const char person_doing_cartwheel_tone4[] = "🤸🏾";
+	inline constexpr const char cartwheel_tone4[] = "🤸🏾";
+	inline constexpr const char person_doing_cartwheel_tone5[] = "🤸🏿";
+	inline constexpr const char cartwheel_tone5[] = "🤸🏿";
+	inline constexpr const char woman_cartwheeling[] = "🤸‍♀️";
+	inline constexpr const char woman_cartwheeling_tone1[] = "🤸🏻‍♀️";
+	inline constexpr const char woman_cartwheeling_light_skin_tone[] = "🤸🏻‍♀️";
+	inline constexpr const char woman_cartwheeling_tone2[] = "🤸🏼‍♀️";
+	inline constexpr const char woman_cartwheeling_medium_light_skin_tone[] = "🤸🏼‍♀️";
+	inline constexpr const char woman_cartwheeling_tone3[] = "🤸🏽‍♀️";
+	inline constexpr const char woman_cartwheeling_medium_skin_tone[] = "🤸🏽‍♀️";
+	inline constexpr const char woman_cartwheeling_tone4[] = "🤸🏾‍♀️";
+	inline constexpr const char woman_cartwheeling_medium_dark_skin_tone[] = "🤸🏾‍♀️";
+	inline constexpr const char woman_cartwheeling_tone5[] = "🤸🏿‍♀️";
+	inline constexpr const char woman_cartwheeling_dark_skin_tone[] = "🤸🏿‍♀️";
+	inline constexpr const char man_cartwheeling[] = "🤸‍♂️";
+	inline constexpr const char man_cartwheeling_tone1[] = "🤸🏻‍♂️";
+	inline constexpr const char man_cartwheeling_light_skin_tone[] = "🤸🏻‍♂️";
+	inline constexpr const char man_cartwheeling_tone2[] = "🤸🏼‍♂️";
+	inline constexpr const char man_cartwheeling_medium_light_skin_tone[] = "🤸🏼‍♂️";
+	inline constexpr const char man_cartwheeling_tone3[] = "🤸🏽‍♂️";
+	inline constexpr const char man_cartwheeling_medium_skin_tone[] = "🤸🏽‍♂️";
+	inline constexpr const char man_cartwheeling_tone4[] = "🤸🏾‍♂️";
+	inline constexpr const char man_cartwheeling_medium_dark_skin_tone[] = "🤸🏾‍♂️";
+	inline constexpr const char man_cartwheeling_tone5[] = "🤸🏿‍♂️";
+	inline constexpr const char man_cartwheeling_dark_skin_tone[] = "🤸🏿‍♂️";
+	inline constexpr const char person_bouncing_ball[] = "⛹️";
+	inline constexpr const char basketball_player[] = "⛹️";
+	inline constexpr const char person_with_ball[] = "⛹️";
+	inline constexpr const char person_bouncing_ball_tone1[] = "⛹🏻";
+	inline constexpr const char basketball_player_tone1[] = "⛹🏻";
+	inline constexpr const char person_with_ball_tone1[] = "⛹🏻";
+	inline constexpr const char person_bouncing_ball_tone2[] = "⛹🏼";
+	inline constexpr const char basketball_player_tone2[] = "⛹🏼";
+	inline constexpr const char person_with_ball_tone2[] = "⛹🏼";
+	inline constexpr const char person_bouncing_ball_tone3[] = "⛹🏽";
+	inline constexpr const char basketball_player_tone3[] = "⛹🏽";
+	inline constexpr const char person_with_ball_tone3[] = "⛹🏽";
+	inline constexpr const char person_bouncing_ball_tone4[] = "⛹🏾";
+	inline constexpr const char basketball_player_tone4[] = "⛹🏾";
+	inline constexpr const char person_with_ball_tone4[] = "⛹🏾";
+	inline constexpr const char person_bouncing_ball_tone5[] = "⛹🏿";
+	inline constexpr const char basketball_player_tone5[] = "⛹🏿";
+	inline constexpr const char person_with_ball_tone5[] = "⛹🏿";
+	inline constexpr const char woman_bouncing_ball[] = "⛹️‍♀️";
+	inline constexpr const char woman_bouncing_ball_tone1[] = "⛹🏻‍♀️";
+	inline constexpr const char woman_bouncing_ball_light_skin_tone[] = "⛹🏻‍♀️";
+	inline constexpr const char woman_bouncing_ball_tone2[] = "⛹🏼‍♀️";
+	inline constexpr const char woman_bouncing_ball_medium_light_skin_tone[] = "⛹🏼‍♀️";
+	inline constexpr const char woman_bouncing_ball_tone3[] = "⛹🏽‍♀️";
+	inline constexpr const char woman_bouncing_ball_medium_skin_tone[] = "⛹🏽‍♀️";
+	inline constexpr const char woman_bouncing_ball_tone4[] = "⛹🏾‍♀️";
+	inline constexpr const char woman_bouncing_ball_medium_dark_skin_tone[] = "⛹🏾‍♀️";
+	inline constexpr const char woman_bouncing_ball_tone5[] = "⛹🏿‍♀️";
+	inline constexpr const char woman_bouncing_ball_dark_skin_tone[] = "⛹🏿‍♀️";
+	inline constexpr const char man_bouncing_ball[] = "⛹️‍♂️";
+	inline constexpr const char man_bouncing_ball_tone1[] = "⛹🏻‍♂️";
+	inline constexpr const char man_bouncing_ball_light_skin_tone[] = "⛹🏻‍♂️";
+	inline constexpr const char man_bouncing_ball_tone2[] = "⛹🏼‍♂️";
+	inline constexpr const char man_bouncing_ball_medium_light_skin_tone[] = "⛹🏼‍♂️";
+	inline constexpr const char man_bouncing_ball_tone3[] = "⛹🏽‍♂️";
+	inline constexpr const char man_bouncing_ball_medium_skin_tone[] = "⛹🏽‍♂️";
+	inline constexpr const char man_bouncing_ball_tone4[] = "⛹🏾‍♂️";
+	inline constexpr const char man_bouncing_ball_medium_dark_skin_tone[] = "⛹🏾‍♂️";
+	inline constexpr const char man_bouncing_ball_tone5[] = "⛹🏿‍♂️";
+	inline constexpr const char man_bouncing_ball_dark_skin_tone[] = "⛹🏿‍♂️";
+	inline constexpr const char person_fencing[] = "🤺";
+	inline constexpr const char fencer[] = "🤺";
+	inline constexpr const char fencing[] = "🤺";
+	inline constexpr const char person_playing_handball[] = "🤾";
+	inline constexpr const char handball[] = "🤾";
+	inline constexpr const char person_playing_handball_tone1[] = "🤾🏻";
+	inline constexpr const char handball_tone1[] = "🤾🏻";
+	inline constexpr const char person_playing_handball_tone2[] = "🤾🏼";
+	inline constexpr const char handball_tone2[] = "🤾🏼";
+	inline constexpr const char person_playing_handball_tone3[] = "🤾🏽";
+	inline constexpr const char handball_tone3[] = "🤾🏽";
+	inline constexpr const char person_playing_handball_tone4[] = "🤾🏾";
+	inline constexpr const char handball_tone4[] = "🤾🏾";
+	inline constexpr const char person_playing_handball_tone5[] = "🤾🏿";
+	inline constexpr const char handball_tone5[] = "🤾🏿";
+	inline constexpr const char woman_playing_handball[] = "🤾‍♀️";
+	inline constexpr const char woman_playing_handball_tone1[] = "🤾🏻‍♀️";
+	inline constexpr const char woman_playing_handball_light_skin_tone[] = "🤾🏻‍♀️";
+	inline constexpr const char woman_playing_handball_tone2[] = "🤾🏼‍♀️";
+	inline constexpr const char woman_playing_handball_medium_light_skin_tone[] = "🤾🏼‍♀️";
+	inline constexpr const char woman_playing_handball_tone3[] = "🤾🏽‍♀️";
+	inline constexpr const char woman_playing_handball_medium_skin_tone[] = "🤾🏽‍♀️";
+	inline constexpr const char woman_playing_handball_tone4[] = "🤾🏾‍♀️";
+	inline constexpr const char woman_playing_handball_medium_dark_skin_tone[] = "🤾🏾‍♀️";
+	inline constexpr const char woman_playing_handball_tone5[] = "🤾🏿‍♀️";
+	inline constexpr const char woman_playing_handball_dark_skin_tone[] = "🤾🏿‍♀️";
+	inline constexpr const char man_playing_handball[] = "🤾‍♂️";
+	inline constexpr const char man_playing_handball_tone1[] = "🤾🏻‍♂️";
+	inline constexpr const char man_playing_handball_light_skin_tone[] = "🤾🏻‍♂️";
+	inline constexpr const char man_playing_handball_tone2[] = "🤾🏼‍♂️";
+	inline constexpr const char man_playing_handball_medium_light_skin_tone[] = "🤾🏼‍♂️";
+	inline constexpr const char man_playing_handball_tone3[] = "🤾🏽‍♂️";
+	inline constexpr const char man_playing_handball_medium_skin_tone[] = "🤾🏽‍♂️";
+	inline constexpr const char man_playing_handball_tone4[] = "🤾🏾‍♂️";
+	inline constexpr const char man_playing_handball_medium_dark_skin_tone[] = "🤾🏾‍♂️";
+	inline constexpr const char man_playing_handball_tone5[] = "🤾🏿‍♂️";
+	inline constexpr const char man_playing_handball_dark_skin_tone[] = "🤾🏿‍♂️";
+	inline constexpr const char person_golfing[] = "🏌️";
+	inline constexpr const char golfer[] = "🏌️";
+	inline constexpr const char person_golfing_tone1[] = "🏌🏻";
+	inline constexpr const char person_golfing_light_skin_tone[] = "🏌🏻";
+	inline constexpr const char person_golfing_tone2[] = "🏌🏼";
+	inline constexpr const char person_golfing_medium_light_skin_tone[] = "🏌🏼";
+	inline constexpr const char person_golfing_tone3[] = "🏌🏽";
+	inline constexpr const char person_golfing_medium_skin_tone[] = "🏌🏽";
+	inline constexpr const char person_golfing_tone4[] = "🏌🏾";
+	inline constexpr const char person_golfing_medium_dark_skin_tone[] = "🏌🏾";
+	inline constexpr const char person_golfing_tone5[] = "🏌🏿";
+	inline constexpr const char person_golfing_dark_skin_tone[] = "🏌🏿";
+	inline constexpr const char woman_golfing[] = "🏌️‍♀️";
+	inline constexpr const char woman_golfing_tone1[] = "🏌🏻‍♀️";
+	inline constexpr const char woman_golfing_light_skin_tone[] = "🏌🏻‍♀️";
+	inline constexpr const char woman_golfing_tone2[] = "🏌🏼‍♀️";
+	inline constexpr const char woman_golfing_medium_light_skin_tone[] = "🏌🏼‍♀️";
+	inline constexpr const char woman_golfing_tone3[] = "🏌🏽‍♀️";
+	inline constexpr const char woman_golfing_medium_skin_tone[] = "🏌🏽‍♀️";
+	inline constexpr const char woman_golfing_tone4[] = "🏌🏾‍♀️";
+	inline constexpr const char woman_golfing_medium_dark_skin_tone[] = "🏌🏾‍♀️";
+	inline constexpr const char woman_golfing_tone5[] = "🏌🏿‍♀️";
+	inline constexpr const char woman_golfing_dark_skin_tone[] = "🏌🏿‍♀️";
+	inline constexpr const char man_golfing[] = "🏌️‍♂️";
+	inline constexpr const char man_golfing_tone1[] = "🏌🏻‍♂️";
+	inline constexpr const char man_golfing_light_skin_tone[] = "🏌🏻‍♂️";
+	inline constexpr const char man_golfing_tone2[] = "🏌🏼‍♂️";
+	inline constexpr const char man_golfing_medium_light_skin_tone[] = "🏌🏼‍♂️";
+	inline constexpr const char man_golfing_tone3[] = "🏌🏽‍♂️";
+	inline constexpr const char man_golfing_medium_skin_tone[] = "🏌🏽‍♂️";
+	inline constexpr const char man_golfing_tone4[] = "🏌🏾‍♂️";
+	inline constexpr const char man_golfing_medium_dark_skin_tone[] = "🏌🏾‍♂️";
+	inline constexpr const char man_golfing_tone5[] = "🏌🏿‍♂️";
+	inline constexpr const char man_golfing_dark_skin_tone[] = "🏌🏿‍♂️";
+	inline constexpr const char horse_racing[] = "🏇";
+	inline constexpr const char horse_racing_tone1[] = "🏇🏻";
+	inline constexpr const char horse_racing_tone2[] = "🏇🏼";
+	inline constexpr const char horse_racing_tone3[] = "🏇🏽";
+	inline constexpr const char horse_racing_tone4[] = "🏇🏾";
+	inline constexpr const char horse_racing_tone5[] = "🏇🏿";
+	inline constexpr const char person_in_lotus_position[] = "🧘";
+	inline constexpr const char person_in_lotus_position_tone1[] = "🧘🏻";
+	inline constexpr const char person_in_lotus_position_light_skin_tone[] = "🧘🏻";
+	inline constexpr const char person_in_lotus_position_tone2[] = "🧘🏼";
+	inline constexpr const char person_in_lotus_position_medium_light_skin_tone[] = "🧘🏼";
+	inline constexpr const char person_in_lotus_position_tone3[] = "🧘🏽";
+	inline constexpr const char person_in_lotus_position_medium_skin_tone[] = "🧘🏽";
+	inline constexpr const char person_in_lotus_position_tone4[] = "🧘🏾";
+	inline constexpr const char person_in_lotus_position_medium_dark_skin_tone[] = "🧘🏾";
+	inline constexpr const char person_in_lotus_position_tone5[] = "🧘🏿";
+	inline constexpr const char person_in_lotus_position_dark_skin_tone[] = "🧘🏿";
+	inline constexpr const char woman_in_lotus_position[] = "🧘‍♀️";
+	inline constexpr const char woman_in_lotus_position_tone1[] = "🧘🏻‍♀️";
+	inline constexpr const char woman_in_lotus_position_light_skin_tone[] = "🧘🏻‍♀️";
+	inline constexpr const char woman_in_lotus_position_tone2[] = "🧘🏼‍♀️";
+	inline constexpr const char woman_in_lotus_position_medium_light_skin_tone[] = "🧘🏼‍♀️";
+	inline constexpr const char woman_in_lotus_position_tone3[] = "🧘🏽‍♀️";
+	inline constexpr const char woman_in_lotus_position_medium_skin_tone[] = "🧘🏽‍♀️";
+	inline constexpr const char woman_in_lotus_position_tone4[] = "🧘🏾‍♀️";
+	inline constexpr const char woman_in_lotus_position_medium_dark_skin_tone[] = "🧘🏾‍♀️";
+	inline constexpr const char woman_in_lotus_position_tone5[] = "🧘🏿‍♀️";
+	inline constexpr const char woman_in_lotus_position_dark_skin_tone[] = "🧘🏿‍♀️";
+	inline constexpr const char man_in_lotus_position[] = "🧘‍♂️";
+	inline constexpr const char man_in_lotus_position_tone1[] = "🧘🏻‍♂️";
+	inline constexpr const char man_in_lotus_position_light_skin_tone[] = "🧘🏻‍♂️";
+	inline constexpr const char man_in_lotus_position_tone2[] = "🧘🏼‍♂️";
+	inline constexpr const char man_in_lotus_position_medium_light_skin_tone[] = "🧘🏼‍♂️";
+	inline constexpr const char man_in_lotus_position_tone3[] = "🧘🏽‍♂️";
+	inline constexpr const char man_in_lotus_position_medium_skin_tone[] = "🧘🏽‍♂️";
+	inline constexpr const char man_in_lotus_position_tone4[] = "🧘🏾‍♂️";
+	inline constexpr const char man_in_lotus_position_medium_dark_skin_tone[] = "🧘🏾‍♂️";
+	inline constexpr const char man_in_lotus_position_tone5[] = "🧘🏿‍♂️";
+	inline constexpr const char man_in_lotus_position_dark_skin_tone[] = "🧘🏿‍♂️";
+	inline constexpr const char person_surfing[] = "🏄";
+	inline constexpr const char surfer[] = "🏄";
+	inline constexpr const char person_surfing_tone1[] = "🏄🏻";
+	inline constexpr const char surfer_tone1[] = "🏄🏻";
+	inline constexpr const char person_surfing_tone2[] = "🏄🏼";
+	inline constexpr const char surfer_tone2[] = "🏄🏼";
+	inline constexpr const char person_surfing_tone3[] = "🏄🏽";
+	inline constexpr const char surfer_tone3[] = "🏄🏽";
+	inline constexpr const char person_surfing_tone4[] = "🏄🏾";
+	inline constexpr const char surfer_tone4[] = "🏄🏾";
+	inline constexpr const char person_surfing_tone5[] = "🏄🏿";
+	inline constexpr const char surfer_tone5[] = "🏄🏿";
+	inline constexpr const char woman_surfing[] = "🏄‍♀️";
+	inline constexpr const char woman_surfing_tone1[] = "🏄🏻‍♀️";
+	inline constexpr const char woman_surfing_light_skin_tone[] = "🏄🏻‍♀️";
+	inline constexpr const char woman_surfing_tone2[] = "🏄🏼‍♀️";
+	inline constexpr const char woman_surfing_medium_light_skin_tone[] = "🏄🏼‍♀️";
+	inline constexpr const char woman_surfing_tone3[] = "🏄🏽‍♀️";
+	inline constexpr const char woman_surfing_medium_skin_tone[] = "🏄🏽‍♀️";
+	inline constexpr const char woman_surfing_tone4[] = "🏄🏾‍♀️";
+	inline constexpr const char woman_surfing_medium_dark_skin_tone[] = "🏄🏾‍♀️";
+	inline constexpr const char woman_surfing_tone5[] = "🏄🏿‍♀️";
+	inline constexpr const char woman_surfing_dark_skin_tone[] = "🏄🏿‍♀️";
+	inline constexpr const char man_surfing[] = "🏄‍♂️";
+	inline constexpr const char man_surfing_tone1[] = "🏄🏻‍♂️";
+	inline constexpr const char man_surfing_light_skin_tone[] = "🏄🏻‍♂️";
+	inline constexpr const char man_surfing_tone2[] = "🏄🏼‍♂️";
+	inline constexpr const char man_surfing_medium_light_skin_tone[] = "🏄🏼‍♂️";
+	inline constexpr const char man_surfing_tone3[] = "🏄🏽‍♂️";
+	inline constexpr const char man_surfing_medium_skin_tone[] = "🏄🏽‍♂️";
+	inline constexpr const char man_surfing_tone4[] = "🏄🏾‍♂️";
+	inline constexpr const char man_surfing_medium_dark_skin_tone[] = "🏄🏾‍♂️";
+	inline constexpr const char man_surfing_tone5[] = "🏄🏿‍♂️";
+	inline constexpr const char man_surfing_dark_skin_tone[] = "🏄🏿‍♂️";
+	inline constexpr const char person_swimming[] = "🏊";
+	inline constexpr const char swimmer[] = "🏊";
+	inline constexpr const char person_swimming_tone1[] = "🏊🏻";
+	inline constexpr const char swimmer_tone1[] = "🏊🏻";
+	inline constexpr const char person_swimming_tone2[] = "🏊🏼";
+	inline constexpr const char swimmer_tone2[] = "🏊🏼";
+	inline constexpr const char person_swimming_tone3[] = "🏊🏽";
+	inline constexpr const char swimmer_tone3[] = "🏊🏽";
+	inline constexpr const char person_swimming_tone4[] = "🏊🏾";
+	inline constexpr const char swimmer_tone4[] = "🏊🏾";
+	inline constexpr const char person_swimming_tone5[] = "🏊🏿";
+	inline constexpr const char swimmer_tone5[] = "🏊🏿";
+	inline constexpr const char woman_swimming[] = "🏊‍♀️";
+	inline constexpr const char woman_swimming_tone1[] = "🏊🏻‍♀️";
+	inline constexpr const char woman_swimming_light_skin_tone[] = "🏊🏻‍♀️";
+	inline constexpr const char woman_swimming_tone2[] = "🏊🏼‍♀️";
+	inline constexpr const char woman_swimming_medium_light_skin_tone[] = "🏊🏼‍♀️";
+	inline constexpr const char woman_swimming_tone3[] = "🏊🏽‍♀️";
+	inline constexpr const char woman_swimming_medium_skin_tone[] = "🏊🏽‍♀️";
+	inline constexpr const char woman_swimming_tone4[] = "🏊🏾‍♀️";
+	inline constexpr const char woman_swimming_medium_dark_skin_tone[] = "🏊🏾‍♀️";
+	inline constexpr const char woman_swimming_tone5[] = "🏊🏿‍♀️";
+	inline constexpr const char woman_swimming_dark_skin_tone[] = "🏊🏿‍♀️";
+	inline constexpr const char man_swimming[] = "🏊‍♂️";
+	inline constexpr const char man_swimming_tone1[] = "🏊🏻‍♂️";
+	inline constexpr const char man_swimming_light_skin_tone[] = "🏊🏻‍♂️";
+	inline constexpr const char man_swimming_tone2[] = "🏊🏼‍♂️";
+	inline constexpr const char man_swimming_medium_light_skin_tone[] = "🏊🏼‍♂️";
+	inline constexpr const char man_swimming_tone3[] = "🏊🏽‍♂️";
+	inline constexpr const char man_swimming_medium_skin_tone[] = "🏊🏽‍♂️";
+	inline constexpr const char man_swimming_tone4[] = "🏊🏾‍♂️";
+	inline constexpr const char man_swimming_medium_dark_skin_tone[] = "🏊🏾‍♂️";
+	inline constexpr const char man_swimming_tone5[] = "🏊🏿‍♂️";
+	inline constexpr const char man_swimming_dark_skin_tone[] = "🏊🏿‍♂️";
+	inline constexpr const char person_playing_water_polo[] = "🤽";
+	inline constexpr const char water_polo[] = "🤽";
+	inline constexpr const char person_playing_water_polo_tone1[] = "🤽🏻";
+	inline constexpr const char water_polo_tone1[] = "🤽🏻";
+	inline constexpr const char person_playing_water_polo_tone2[] = "🤽🏼";
+	inline constexpr const char water_polo_tone2[] = "🤽🏼";
+	inline constexpr const char person_playing_water_polo_tone3[] = "🤽🏽";
+	inline constexpr const char water_polo_tone3[] = "🤽🏽";
+	inline constexpr const char person_playing_water_polo_tone4[] = "🤽🏾";
+	inline constexpr const char water_polo_tone4[] = "🤽🏾";
+	inline constexpr const char person_playing_water_polo_tone5[] = "🤽🏿";
+	inline constexpr const char water_polo_tone5[] = "🤽🏿";
+	inline constexpr const char woman_playing_water_polo[] = "🤽‍♀️";
+	inline constexpr const char woman_playing_water_polo_tone1[] = "🤽🏻‍♀️";
+	inline constexpr const char woman_playing_water_polo_light_skin_tone[] = "🤽🏻‍♀️";
+	inline constexpr const char woman_playing_water_polo_tone2[] = "🤽🏼‍♀️";
+	inline constexpr const char woman_playing_water_polo_medium_light_skin_tone[] = "🤽🏼‍♀️";
+	inline constexpr const char woman_playing_water_polo_tone3[] = "🤽🏽‍♀️";
+	inline constexpr const char woman_playing_water_polo_medium_skin_tone[] = "🤽🏽‍♀️";
+	inline constexpr const char woman_playing_water_polo_tone4[] = "🤽🏾‍♀️";
+	inline constexpr const char woman_playing_water_polo_medium_dark_skin_tone[] = "🤽🏾‍♀️";
+	inline constexpr const char woman_playing_water_polo_tone5[] = "🤽🏿‍♀️";
+	inline constexpr const char woman_playing_water_polo_dark_skin_tone[] = "🤽🏿‍♀️";
+	inline constexpr const char man_playing_water_polo[] = "🤽‍♂️";
+	inline constexpr const char man_playing_water_polo_tone1[] = "🤽🏻‍♂️";
+	inline constexpr const char man_playing_water_polo_light_skin_tone[] = "🤽🏻‍♂️";
+	inline constexpr const char man_playing_water_polo_tone2[] = "🤽🏼‍♂️";
+	inline constexpr const char man_playing_water_polo_medium_light_skin_tone[] = "🤽🏼‍♂️";
+	inline constexpr const char man_playing_water_polo_tone3[] = "🤽🏽‍♂️";
+	inline constexpr const char man_playing_water_polo_medium_skin_tone[] = "🤽🏽‍♂️";
+	inline constexpr const char man_playing_water_polo_tone4[] = "🤽🏾‍♂️";
+	inline constexpr const char man_playing_water_polo_medium_dark_skin_tone[] = "🤽🏾‍♂️";
+	inline constexpr const char man_playing_water_polo_tone5[] = "🤽🏿‍♂️";
+	inline constexpr const char man_playing_water_polo_dark_skin_tone[] = "🤽🏿‍♂️";
+	inline constexpr const char person_rowing_boat[] = "🚣";
+	inline constexpr const char rowboat[] = "🚣";
+	inline constexpr const char person_rowing_boat_tone1[] = "🚣🏻";
+	inline constexpr const char rowboat_tone1[] = "🚣🏻";
+	inline constexpr const char person_rowing_boat_tone2[] = "🚣🏼";
+	inline constexpr const char rowboat_tone2[] = "🚣🏼";
+	inline constexpr const char person_rowing_boat_tone3[] = "🚣🏽";
+	inline constexpr const char rowboat_tone3[] = "🚣🏽";
+	inline constexpr const char person_rowing_boat_tone4[] = "🚣🏾";
+	inline constexpr const char rowboat_tone4[] = "🚣🏾";
+	inline constexpr const char person_rowing_boat_tone5[] = "🚣🏿";
+	inline constexpr const char rowboat_tone5[] = "🚣🏿";
+	inline constexpr const char woman_rowing_boat[] = "🚣‍♀️";
+	inline constexpr const char woman_rowing_boat_tone1[] = "🚣🏻‍♀️";
+	inline constexpr const char woman_rowing_boat_light_skin_tone[] = "🚣🏻‍♀️";
+	inline constexpr const char woman_rowing_boat_tone2[] = "🚣🏼‍♀️";
+	inline constexpr const char woman_rowing_boat_medium_light_skin_tone[] = "🚣🏼‍♀️";
+	inline constexpr const char woman_rowing_boat_tone3[] = "🚣🏽‍♀️";
+	inline constexpr const char woman_rowing_boat_medium_skin_tone[] = "🚣🏽‍♀️";
+	inline constexpr const char woman_rowing_boat_tone4[] = "🚣🏾‍♀️";
+	inline constexpr const char woman_rowing_boat_medium_dark_skin_tone[] = "🚣🏾‍♀️";
+	inline constexpr const char woman_rowing_boat_tone5[] = "🚣🏿‍♀️";
+	inline constexpr const char woman_rowing_boat_dark_skin_tone[] = "🚣🏿‍♀️";
+	inline constexpr const char man_rowing_boat[] = "🚣‍♂️";
+	inline constexpr const char man_rowing_boat_tone1[] = "🚣🏻‍♂️";
+	inline constexpr const char man_rowing_boat_light_skin_tone[] = "🚣🏻‍♂️";
+	inline constexpr const char man_rowing_boat_tone2[] = "🚣🏼‍♂️";
+	inline constexpr const char man_rowing_boat_medium_light_skin_tone[] = "🚣🏼‍♂️";
+	inline constexpr const char man_rowing_boat_tone3[] = "🚣🏽‍♂️";
+	inline constexpr const char man_rowing_boat_medium_skin_tone[] = "🚣🏽‍♂️";
+	inline constexpr const char man_rowing_boat_tone4[] = "🚣🏾‍♂️";
+	inline constexpr const char man_rowing_boat_medium_dark_skin_tone[] = "🚣🏾‍♂️";
+	inline constexpr const char man_rowing_boat_tone5[] = "🚣🏿‍♂️";
+	inline constexpr const char man_rowing_boat_dark_skin_tone[] = "🚣🏿‍♂️";
+	inline constexpr const char person_climbing[] = "🧗";
+	inline constexpr const char person_climbing_tone1[] = "🧗🏻";
+	inline constexpr const char person_climbing_light_skin_tone[] = "🧗🏻";
+	inline constexpr const char person_climbing_tone2[] = "🧗🏼";
+	inline constexpr const char person_climbing_medium_light_skin_tone[] = "🧗🏼";
+	inline constexpr const char person_climbing_tone3[] = "🧗🏽";
+	inline constexpr const char person_climbing_medium_skin_tone[] = "🧗🏽";
+	inline constexpr const char person_climbing_tone4[] = "🧗🏾";
+	inline constexpr const char person_climbing_medium_dark_skin_tone[] = "🧗🏾";
+	inline constexpr const char person_climbing_tone5[] = "🧗🏿";
+	inline constexpr const char person_climbing_dark_skin_tone[] = "🧗🏿";
+	inline constexpr const char woman_climbing[] = "🧗‍♀️";
+	inline constexpr const char woman_climbing_tone1[] = "🧗🏻‍♀️";
+	inline constexpr const char woman_climbing_light_skin_tone[] = "🧗🏻‍♀️";
+	inline constexpr const char woman_climbing_tone2[] = "🧗🏼‍♀️";
+	inline constexpr const char woman_climbing_medium_light_skin_tone[] = "🧗🏼‍♀️";
+	inline constexpr const char woman_climbing_tone3[] = "🧗🏽‍♀️";
+	inline constexpr const char woman_climbing_medium_skin_tone[] = "🧗🏽‍♀️";
+	inline constexpr const char woman_climbing_tone4[] = "🧗🏾‍♀️";
+	inline constexpr const char woman_climbing_medium_dark_skin_tone[] = "🧗🏾‍♀️";
+	inline constexpr const char woman_climbing_tone5[] = "🧗🏿‍♀️";
+	inline constexpr const char woman_climbing_dark_skin_tone[] = "🧗🏿‍♀️";
+	inline constexpr const char man_climbing[] = "🧗‍♂️";
+	inline constexpr const char man_climbing_tone1[] = "🧗🏻‍♂️";
+	inline constexpr const char man_climbing_light_skin_tone[] = "🧗🏻‍♂️";
+	inline constexpr const char man_climbing_tone2[] = "🧗🏼‍♂️";
+	inline constexpr const char man_climbing_medium_light_skin_tone[] = "🧗🏼‍♂️";
+	inline constexpr const char man_climbing_tone3[] = "🧗🏽‍♂️";
+	inline constexpr const char man_climbing_medium_skin_tone[] = "🧗🏽‍♂️";
+	inline constexpr const char man_climbing_tone4[] = "🧗🏾‍♂️";
+	inline constexpr const char man_climbing_medium_dark_skin_tone[] = "🧗🏾‍♂️";
+	inline constexpr const char man_climbing_tone5[] = "🧗🏿‍♂️";
+	inline constexpr const char man_climbing_dark_skin_tone[] = "🧗🏿‍♂️";
+	inline constexpr const char person_mountain_biking[] = "🚵";
+	inline constexpr const char mountain_bicyclist[] = "🚵";
+	inline constexpr const char person_mountain_biking_tone1[] = "🚵🏻";
+	inline constexpr const char mountain_bicyclist_tone1[] = "🚵🏻";
+	inline constexpr const char person_mountain_biking_tone2[] = "🚵🏼";
+	inline constexpr const char mountain_bicyclist_tone2[] = "🚵🏼";
+	inline constexpr const char person_mountain_biking_tone3[] = "🚵🏽";
+	inline constexpr const char mountain_bicyclist_tone3[] = "🚵🏽";
+	inline constexpr const char person_mountain_biking_tone4[] = "🚵🏾";
+	inline constexpr const char mountain_bicyclist_tone4[] = "🚵🏾";
+	inline constexpr const char person_mountain_biking_tone5[] = "🚵🏿";
+	inline constexpr const char mountain_bicyclist_tone5[] = "🚵🏿";
+	inline constexpr const char woman_mountain_biking[] = "🚵‍♀️";
+	inline constexpr const char woman_mountain_biking_tone1[] = "🚵🏻‍♀️";
+	inline constexpr const char woman_mountain_biking_light_skin_tone[] = "🚵🏻‍♀️";
+	inline constexpr const char woman_mountain_biking_tone2[] = "🚵🏼‍♀️";
+	inline constexpr const char woman_mountain_biking_medium_light_skin_tone[] = "🚵🏼‍♀️";
+	inline constexpr const char woman_mountain_biking_tone3[] = "🚵🏽‍♀️";
+	inline constexpr const char woman_mountain_biking_medium_skin_tone[] = "🚵🏽‍♀️";
+	inline constexpr const char woman_mountain_biking_tone4[] = "🚵🏾‍♀️";
+	inline constexpr const char woman_mountain_biking_medium_dark_skin_tone[] = "🚵🏾‍♀️";
+	inline constexpr const char woman_mountain_biking_tone5[] = "🚵🏿‍♀️";
+	inline constexpr const char woman_mountain_biking_dark_skin_tone[] = "🚵🏿‍♀️";
+	inline constexpr const char man_mountain_biking[] = "🚵‍♂️";
+	inline constexpr const char man_mountain_biking_tone1[] = "🚵🏻‍♂️";
+	inline constexpr const char man_mountain_biking_light_skin_tone[] = "🚵🏻‍♂️";
+	inline constexpr const char man_mountain_biking_tone2[] = "🚵🏼‍♂️";
+	inline constexpr const char man_mountain_biking_medium_light_skin_tone[] = "🚵🏼‍♂️";
+	inline constexpr const char man_mountain_biking_tone3[] = "🚵🏽‍♂️";
+	inline constexpr const char man_mountain_biking_medium_skin_tone[] = "🚵🏽‍♂️";
+	inline constexpr const char man_mountain_biking_tone4[] = "🚵🏾‍♂️";
+	inline constexpr const char man_mountain_biking_medium_dark_skin_tone[] = "🚵🏾‍♂️";
+	inline constexpr const char man_mountain_biking_tone5[] = "🚵🏿‍♂️";
+	inline constexpr const char man_mountain_biking_dark_skin_tone[] = "🚵🏿‍♂️";
+	inline constexpr const char person_biking[] = "🚴";
+	inline constexpr const char bicyclist[] = "🚴";
+	inline constexpr const char person_biking_tone1[] = "🚴🏻";
+	inline constexpr const char bicyclist_tone1[] = "🚴🏻";
+	inline constexpr const char person_biking_tone2[] = "🚴🏼";
+	inline constexpr const char bicyclist_tone2[] = "🚴🏼";
+	inline constexpr const char person_biking_tone3[] = "🚴🏽";
+	inline constexpr const char bicyclist_tone3[] = "🚴🏽";
+	inline constexpr const char person_biking_tone4[] = "🚴🏾";
+	inline constexpr const char bicyclist_tone4[] = "🚴🏾";
+	inline constexpr const char person_biking_tone5[] = "🚴🏿";
+	inline constexpr const char bicyclist_tone5[] = "🚴🏿";
+	inline constexpr const char woman_biking[] = "🚴‍♀️";
+	inline constexpr const char woman_biking_tone1[] = "🚴🏻‍♀️";
+	inline constexpr const char woman_biking_light_skin_tone[] = "🚴🏻‍♀️";
+	inline constexpr const char woman_biking_tone2[] = "🚴🏼‍♀️";
+	inline constexpr const char woman_biking_medium_light_skin_tone[] = "🚴🏼‍♀️";
+	inline constexpr const char woman_biking_tone3[] = "🚴🏽‍♀️";
+	inline constexpr const char woman_biking_medium_skin_tone[] = "🚴🏽‍♀️";
+	inline constexpr const char woman_biking_tone4[] = "🚴🏾‍♀️";
+	inline constexpr const char woman_biking_medium_dark_skin_tone[] = "🚴🏾‍♀️";
+	inline constexpr const char woman_biking_tone5[] = "🚴🏿‍♀️";
+	inline constexpr const char woman_biking_dark_skin_tone[] = "🚴🏿‍♀️";
+	inline constexpr const char man_biking[] = "🚴‍♂️";
+	inline constexpr const char man_biking_tone1[] = "🚴🏻‍♂️";
+	inline constexpr const char man_biking_light_skin_tone[] = "🚴🏻‍♂️";
+	inline constexpr const char man_biking_tone2[] = "🚴🏼‍♂️";
+	inline constexpr const char man_biking_medium_light_skin_tone[] = "🚴🏼‍♂️";
+	inline constexpr const char man_biking_tone3[] = "🚴🏽‍♂️";
+	inline constexpr const char man_biking_medium_skin_tone[] = "🚴🏽‍♂️";
+	inline constexpr const char man_biking_tone4[] = "🚴🏾‍♂️";
+	inline constexpr const char man_biking_medium_dark_skin_tone[] = "🚴🏾‍♂️";
+	inline constexpr const char man_biking_tone5[] = "🚴🏿‍♂️";
+	inline constexpr const char man_biking_dark_skin_tone[] = "🚴🏿‍♂️";
+	inline constexpr const char trophy[] = "🏆";
+	inline constexpr const char first_place[] = "🥇";
+	inline constexpr const char first_place_medal[] = "🥇";
+	inline constexpr const char second_place[] = "🥈";
+	inline constexpr const char second_place_medal[] = "🥈";
+	inline constexpr const char third_place[] = "🥉";
+	inline constexpr const char third_place_medal[] = "🥉";
+	inline constexpr const char medal[] = "🏅";
+	inline constexpr const char sports_medal[] = "🏅";
+	inline constexpr const char military_medal[] = "🎖️";
+	inline constexpr const char rosette[] = "🏵️";
+	inline constexpr const char reminder_ribbon[] = "🎗️";
+	inline constexpr const char ticket[] = "🎫";
+	inline constexpr const char tickets[] = "🎟️";
+	inline constexpr const char admission_tickets[] = "🎟️";
+	inline constexpr const char circus_tent[] = "🎪";
+	inline constexpr const char person_juggling[] = "🤹";
+	inline constexpr const char juggling[] = "🤹";
+	inline constexpr const char juggler[] = "🤹";
+	inline constexpr const char person_juggling_tone1[] = "🤹🏻";
+	inline constexpr const char juggling_tone1[] = "🤹🏻";
+	inline constexpr const char juggler_tone1[] = "🤹🏻";
+	inline constexpr const char person_juggling_tone2[] = "🤹🏼";
+	inline constexpr const char juggling_tone2[] = "🤹🏼";
+	inline constexpr const char juggler_tone2[] = "🤹🏼";
+	inline constexpr const char person_juggling_tone3[] = "🤹🏽";
+	inline constexpr const char juggling_tone3[] = "🤹🏽";
+	inline constexpr const char juggler_tone3[] = "🤹🏽";
+	inline constexpr const char person_juggling_tone4[] = "🤹🏾";
+	inline constexpr const char juggling_tone4[] = "🤹🏾";
+	inline constexpr const char juggler_tone4[] = "🤹🏾";
+	inline constexpr const char person_juggling_tone5[] = "🤹🏿";
+	inline constexpr const char juggling_tone5[] = "🤹🏿";
+	inline constexpr const char juggler_tone5[] = "🤹🏿";
+	inline constexpr const char woman_juggling[] = "🤹‍♀️";
+	inline constexpr const char woman_juggling_tone1[] = "🤹🏻‍♀️";
+	inline constexpr const char woman_juggling_light_skin_tone[] = "🤹🏻‍♀️";
+	inline constexpr const char woman_juggling_tone2[] = "🤹🏼‍♀️";
+	inline constexpr const char woman_juggling_medium_light_skin_tone[] = "🤹🏼‍♀️";
+	inline constexpr const char woman_juggling_tone3[] = "🤹🏽‍♀️";
+	inline constexpr const char woman_juggling_medium_skin_tone[] = "🤹🏽‍♀️";
+	inline constexpr const char woman_juggling_tone4[] = "🤹🏾‍♀️";
+	inline constexpr const char woman_juggling_medium_dark_skin_tone[] = "🤹🏾‍♀️";
+	inline constexpr const char woman_juggling_tone5[] = "🤹🏿‍♀️";
+	inline constexpr const char woman_juggling_dark_skin_tone[] = "🤹🏿‍♀️";
+	inline constexpr const char man_juggling[] = "🤹‍♂️";
+	inline constexpr const char man_juggling_tone1[] = "🤹🏻‍♂️";
+	inline constexpr const char man_juggling_light_skin_tone[] = "🤹🏻‍♂️";
+	inline constexpr const char man_juggling_tone2[] = "🤹🏼‍♂️";
+	inline constexpr const char man_juggling_medium_light_skin_tone[] = "🤹🏼‍♂️";
+	inline constexpr const char man_juggling_tone3[] = "🤹🏽‍♂️";
+	inline constexpr const char man_juggling_medium_skin_tone[] = "🤹🏽‍♂️";
+	inline constexpr const char man_juggling_tone4[] = "🤹🏾‍♂️";
+	inline constexpr const char man_juggling_medium_dark_skin_tone[] = "🤹🏾‍♂️";
+	inline constexpr const char man_juggling_tone5[] = "🤹🏿‍♂️";
+	inline constexpr const char man_juggling_dark_skin_tone[] = "🤹🏿‍♂️";
+	inline constexpr const char performing_arts[] = "🎭";
+	inline constexpr const char ballet_shoes[] = "🩰";
+	inline constexpr const char art[] = "🎨";
+	inline constexpr const char clapper[] = "🎬";
+	inline constexpr const char clapper_board[] = "🎬";
+	inline constexpr const char microphone[] = "🎤";
+	inline constexpr const char headphones[] = "🎧";
+	inline constexpr const char headphone[] = "🎧";
+	inline constexpr const char musical_score[] = "🎼";
+	inline constexpr const char musical_keyboard[] = "🎹";
+	inline constexpr const char maracas[] = "🪇";
+	inline constexpr const char drum[] = "🥁";
+	inline constexpr const char drum_with_drumsticks[] = "🥁";
+	inline constexpr const char long_drum[] = "🪘";
+	inline constexpr const char saxophone[] = "🎷";
+	inline constexpr const char trumpet[] = "🎺";
+	inline constexpr const char accordion[] = "🪗";
+	inline constexpr const char guitar[] = "🎸";
+	inline constexpr const char banjo[] = "🪕";
+	inline constexpr const char violin[] = "🎻";
+	inline constexpr const char flute[] = "🪈";
+	inline constexpr const char game_die[] = "🎲";
+	inline constexpr const char chess_pawn[] = "♟️";
+	inline constexpr const char dart[] = "🎯";
+	inline constexpr const char direct_hit[] = "🎯";
+	inline constexpr const char bowling[] = "🎳";
+	inline constexpr const char video_game[] = "🎮";
+	inline constexpr const char slot_machine[] = "🎰";
+	inline constexpr const char jigsaw[] = "🧩";
+	inline constexpr const char puzzle_piece[] = "🧩";
+	inline constexpr const char flag_white[] = "🏳️";
+	inline constexpr const char flag_black[] = "🏴";
+	inline constexpr const char pirate_flag[] = "🏴‍☠️";
+	inline constexpr const char checkered_flag[] = "🏁";
+	inline constexpr const char triangular_flag_on_post[] = "🚩";
+	inline constexpr const char rainbow_flag[] = "🏳️‍🌈";
+	inline constexpr const char gay_pride_flag[] = "🏳️‍🌈";
+	inline constexpr const char transgender_flag[] = "🏳️‍⚧️";
+	inline constexpr const char united_nations[] = "🇺🇳";
+	inline constexpr const char flag_af[] = "🇦🇫";
+	inline constexpr const char flag_ax[] = "🇦🇽";
+	inline constexpr const char flag_al[] = "🇦🇱";
+	inline constexpr const char flag_dz[] = "🇩🇿";
+	inline constexpr const char flag_as[] = "🇦🇸";
+	inline constexpr const char flag_ad[] = "🇦🇩";
+	inline constexpr const char flag_ao[] = "🇦🇴";
+	inline constexpr const char flag_ai[] = "🇦🇮";
+	inline constexpr const char flag_aq[] = "🇦🇶";
+	inline constexpr const char flag_ag[] = "🇦🇬";
+	inline constexpr const char flag_ar[] = "🇦🇷";
+	inline constexpr const char flag_am[] = "🇦🇲";
+	inline constexpr const char flag_aw[] = "🇦🇼";
+	inline constexpr const char flag_au[] = "🇦🇺";
+	inline constexpr const char flag_at[] = "🇦🇹";
+	inline constexpr const char flag_az[] = "🇦🇿";
+	inline constexpr const char flag_bs[] = "🇧🇸";
+	inline constexpr const char flag_bh[] = "🇧🇭";
+	inline constexpr const char flag_bd[] = "🇧🇩";
+	inline constexpr const char flag_bb[] = "🇧🇧";
+	inline constexpr const char flag_by[] = "🇧🇾";
+	inline constexpr const char flag_be[] = "🇧🇪";
+	inline constexpr const char flag_bz[] = "🇧🇿";
+	inline constexpr const char flag_bj[] = "🇧🇯";
+	inline constexpr const char flag_bm[] = "🇧🇲";
+	inline constexpr const char flag_bt[] = "🇧🇹";
+	inline constexpr const char flag_bo[] = "🇧🇴";
+	inline constexpr const char flag_ba[] = "🇧🇦";
+	inline constexpr const char flag_bw[] = "🇧🇼";
+	inline constexpr const char flag_br[] = "🇧🇷";
+	inline constexpr const char flag_io[] = "🇮🇴";
+	inline constexpr const char flag_vg[] = "🇻🇬";
+	inline constexpr const char flag_bn[] = "🇧🇳";
+	inline constexpr const char flag_bg[] = "🇧🇬";
+	inline constexpr const char flag_bf[] = "🇧🇫";
+	inline constexpr const char flag_bi[] = "🇧🇮";
+	inline constexpr const char flag_kh[] = "🇰🇭";
+	inline constexpr const char flag_cm[] = "🇨🇲";
+	inline constexpr const char flag_ca[] = "🇨🇦";
+	inline constexpr const char flag_ic[] = "🇮🇨";
+	inline constexpr const char flag_cv[] = "🇨🇻";
+	inline constexpr const char flag_bq[] = "🇧🇶";
+	inline constexpr const char flag_ky[] = "🇰🇾";
+	inline constexpr const char flag_cf[] = "🇨🇫";
+	inline constexpr const char flag_td[] = "🇹🇩";
+	inline constexpr const char flag_cl[] = "🇨🇱";
+	inline constexpr const char flag_cn[] = "🇨🇳";
+	inline constexpr const char flag_cx[] = "🇨🇽";
+	inline constexpr const char flag_cc[] = "🇨🇨";
+	inline constexpr const char flag_co[] = "🇨🇴";
+	inline constexpr const char flag_km[] = "🇰🇲";
+	inline constexpr const char flag_cg[] = "🇨🇬";
+	inline constexpr const char flag_cd[] = "🇨🇩";
+	inline constexpr const char flag_ck[] = "🇨🇰";
+	inline constexpr const char flag_cr[] = "🇨🇷";
+	inline constexpr const char flag_ci[] = "🇨🇮";
+	inline constexpr const char flag_hr[] = "🇭🇷";
+	inline constexpr const char flag_cu[] = "🇨🇺";
+	inline constexpr const char flag_cw[] = "🇨🇼";
+	inline constexpr const char flag_cy[] = "🇨🇾";
+	inline constexpr const char flag_cz[] = "🇨🇿";
+	inline constexpr const char flag_dk[] = "🇩🇰";
+	inline constexpr const char flag_dj[] = "🇩🇯";
+	inline constexpr const char flag_dm[] = "🇩🇲";
+	inline constexpr const char flag_do[] = "🇩🇴";
+	inline constexpr const char flag_ec[] = "🇪🇨";
+	inline constexpr const char flag_eg[] = "🇪🇬";
+	inline constexpr const char flag_sv[] = "🇸🇻";
+	inline constexpr const char flag_gq[] = "🇬🇶";
+	inline constexpr const char flag_er[] = "🇪🇷";
+	inline constexpr const char flag_ee[] = "🇪🇪";
+	inline constexpr const char flag_et[] = "🇪🇹";
+	inline constexpr const char flag_eu[] = "🇪🇺";
+	inline constexpr const char flag_fk[] = "🇫🇰";
+	inline constexpr const char flag_fo[] = "🇫🇴";
+	inline constexpr const char flag_fj[] = "🇫🇯";
+	inline constexpr const char flag_fi[] = "🇫🇮";
+	inline constexpr const char flag_fr[] = "🇫🇷";
+	inline constexpr const char flag_gf[] = "🇬🇫";
+	inline constexpr const char flag_pf[] = "🇵🇫";
+	inline constexpr const char flag_tf[] = "🇹🇫";
+	inline constexpr const char flag_ga[] = "🇬🇦";
+	inline constexpr const char flag_gm[] = "🇬🇲";
+	inline constexpr const char flag_ge[] = "🇬🇪";
+	inline constexpr const char flag_de[] = "🇩🇪";
+	inline constexpr const char flag_gh[] = "🇬🇭";
+	inline constexpr const char flag_gi[] = "🇬🇮";
+	inline constexpr const char flag_gr[] = "🇬🇷";
+	inline constexpr const char flag_gl[] = "🇬🇱";
+	inline constexpr const char flag_gd[] = "🇬🇩";
+	inline constexpr const char flag_gp[] = "🇬🇵";
+	inline constexpr const char flag_gu[] = "🇬🇺";
+	inline constexpr const char flag_gt[] = "🇬🇹";
+	inline constexpr const char flag_gg[] = "🇬🇬";
+	inline constexpr const char flag_gn[] = "🇬🇳";
+	inline constexpr const char flag_gw[] = "🇬🇼";
+	inline constexpr const char flag_gy[] = "🇬🇾";
+	inline constexpr const char flag_ht[] = "🇭🇹";
+	inline constexpr const char flag_hn[] = "🇭🇳";
+	inline constexpr const char flag_hk[] = "🇭🇰";
+	inline constexpr const char flag_hu[] = "🇭🇺";
+	inline constexpr const char flag_is[] = "🇮🇸";
+	inline constexpr const char flag_in[] = "🇮🇳";
+	inline constexpr const char flag_id[] = "🇮🇩";
+	inline constexpr const char flag_ir[] = "🇮🇷";
+	inline constexpr const char flag_iq[] = "🇮🇶";
+	inline constexpr const char flag_ie[] = "🇮🇪";
+	inline constexpr const char flag_im[] = "🇮🇲";
+	inline constexpr const char flag_il[] = "🇮🇱";
+	inline constexpr const char flag_it[] = "🇮🇹";
+	inline constexpr const char flag_jm[] = "🇯🇲";
+	inline constexpr const char flag_jp[] = "🇯🇵";
+	inline constexpr const char crossed_flags[] = "🎌";
+	inline constexpr const char flag_je[] = "🇯🇪";
+	inline constexpr const char flag_jo[] = "🇯🇴";
+	inline constexpr const char flag_kz[] = "🇰🇿";
+	inline constexpr const char flag_ke[] = "🇰🇪";
+	inline constexpr const char flag_ki[] = "🇰🇮";
+	inline constexpr const char flag_xk[] = "🇽🇰";
+	inline constexpr const char flag_kw[] = "🇰🇼";
+	inline constexpr const char flag_kg[] = "🇰🇬";
+	inline constexpr const char flag_la[] = "🇱🇦";
+	inline constexpr const char flag_lv[] = "🇱🇻";
+	inline constexpr const char flag_lb[] = "🇱🇧";
+	inline constexpr const char flag_ls[] = "🇱🇸";
+	inline constexpr const char flag_lr[] = "🇱🇷";
+	inline constexpr const char flag_ly[] = "🇱🇾";
+	inline constexpr const char flag_li[] = "🇱🇮";
+	inline constexpr const char flag_lt[] = "🇱🇹";
+	inline constexpr const char flag_lu[] = "🇱🇺";
+	inline constexpr const char flag_mo[] = "🇲🇴";
+	inline constexpr const char flag_mk[] = "🇲🇰";
+	inline constexpr const char flag_mg[] = "🇲🇬";
+	inline constexpr const char flag_mw[] = "🇲🇼";
+	inline constexpr const char flag_my[] = "🇲🇾";
+	inline constexpr const char flag_mv[] = "🇲🇻";
+	inline constexpr const char flag_ml[] = "🇲🇱";
+	inline constexpr const char flag_mt[] = "🇲🇹";
+	inline constexpr const char flag_mh[] = "🇲🇭";
+	inline constexpr const char flag_mq[] = "🇲🇶";
+	inline constexpr const char flag_mr[] = "🇲🇷";
+	inline constexpr const char flag_mu[] = "🇲🇺";
+	inline constexpr const char flag_yt[] = "🇾🇹";
+	inline constexpr const char flag_mx[] = "🇲🇽";
+	inline constexpr const char flag_fm[] = "🇫🇲";
+	inline constexpr const char flag_md[] = "🇲🇩";
+	inline constexpr const char flag_mc[] = "🇲🇨";
+	inline constexpr const char flag_mn[] = "🇲🇳";
+	inline constexpr const char flag_me[] = "🇲🇪";
+	inline constexpr const char flag_ms[] = "🇲🇸";
+	inline constexpr const char flag_ma[] = "🇲🇦";
+	inline constexpr const char flag_mz[] = "🇲🇿";
+	inline constexpr const char flag_mm[] = "🇲🇲";
+	inline constexpr const char flag_na[] = "🇳🇦";
+	inline constexpr const char flag_nr[] = "🇳🇷";
+	inline constexpr const char flag_np[] = "🇳🇵";
+	inline constexpr const char flag_nl[] = "🇳🇱";
+	inline constexpr const char flag_nc[] = "🇳🇨";
+	inline constexpr const char flag_nz[] = "🇳🇿";
+	inline constexpr const char flag_ni[] = "🇳🇮";
+	inline constexpr const char flag_ne[] = "🇳🇪";
+	inline constexpr const char flag_ng[] = "🇳🇬";
+	inline constexpr const char flag_nu[] = "🇳🇺";
+	inline constexpr const char flag_nf[] = "🇳🇫";
+	inline constexpr const char flag_kp[] = "🇰🇵";
+	inline constexpr const char flag_mp[] = "🇲🇵";
+	inline constexpr const char flag_no[] = "🇳🇴";
+	inline constexpr const char flag_om[] = "🇴🇲";
+	inline constexpr const char flag_pk[] = "🇵🇰";
+	inline constexpr const char flag_pw[] = "🇵🇼";
+	inline constexpr const char flag_ps[] = "🇵🇸";
+	inline constexpr const char flag_pa[] = "🇵🇦";
+	inline constexpr const char flag_pg[] = "🇵🇬";
+	inline constexpr const char flag_py[] = "🇵🇾";
+	inline constexpr const char flag_pe[] = "🇵🇪";
+	inline constexpr const char flag_ph[] = "🇵🇭";
+	inline constexpr const char flag_pn[] = "🇵🇳";
+	inline constexpr const char flag_pl[] = "🇵🇱";
+	inline constexpr const char flag_pt[] = "🇵🇹";
+	inline constexpr const char flag_pr[] = "🇵🇷";
+	inline constexpr const char flag_qa[] = "🇶🇦";
+	inline constexpr const char flag_re[] = "🇷🇪";
+	inline constexpr const char flag_ro[] = "🇷🇴";
+	inline constexpr const char flag_ru[] = "🇷🇺";
+	inline constexpr const char flag_rw[] = "🇷🇼";
+	inline constexpr const char flag_ws[] = "🇼🇸";
+	inline constexpr const char flag_sm[] = "🇸🇲";
+	inline constexpr const char flag_st[] = "🇸🇹";
+	inline constexpr const char flag_sa[] = "🇸🇦";
+	inline constexpr const char flag_sn[] = "🇸🇳";
+	inline constexpr const char flag_rs[] = "🇷🇸";
+	inline constexpr const char flag_sc[] = "🇸🇨";
+	inline constexpr const char flag_sl[] = "🇸🇱";
+	inline constexpr const char flag_sg[] = "🇸🇬";
+	inline constexpr const char flag_sx[] = "🇸🇽";
+	inline constexpr const char flag_sk[] = "🇸🇰";
+	inline constexpr const char flag_si[] = "🇸🇮";
+	inline constexpr const char flag_gs[] = "🇬🇸";
+	inline constexpr const char flag_sb[] = "🇸🇧";
+	inline constexpr const char flag_so[] = "🇸🇴";
+	inline constexpr const char flag_za[] = "🇿🇦";
+	inline constexpr const char flag_kr[] = "🇰🇷";
+	inline constexpr const char flag_ss[] = "🇸🇸";
+	inline constexpr const char flag_es[] = "🇪🇸";
+	inline constexpr const char flag_lk[] = "🇱🇰";
+	inline constexpr const char flag_bl[] = "🇧🇱";
+	inline constexpr const char flag_sh[] = "🇸🇭";
+	inline constexpr const char flag_kn[] = "🇰🇳";
+	inline constexpr const char flag_lc[] = "🇱🇨";
+	inline constexpr const char flag_pm[] = "🇵🇲";
+	inline constexpr const char flag_vc[] = "🇻🇨";
+	inline constexpr const char flag_sd[] = "🇸🇩";
+	inline constexpr const char flag_sr[] = "🇸🇷";
+	inline constexpr const char flag_sz[] = "🇸🇿";
+	inline constexpr const char flag_se[] = "🇸🇪";
+	inline constexpr const char flag_ch[] = "🇨🇭";
+	inline constexpr const char flag_sy[] = "🇸🇾";
+	inline constexpr const char flag_tw[] = "🇹🇼";
+	inline constexpr const char flag_tj[] = "🇹🇯";
+	inline constexpr const char flag_tz[] = "🇹🇿";
+	inline constexpr const char flag_th[] = "🇹🇭";
+	inline constexpr const char flag_tl[] = "🇹🇱";
+	inline constexpr const char flag_tg[] = "🇹🇬";
+	inline constexpr const char flag_tk[] = "🇹🇰";
+	inline constexpr const char flag_to[] = "🇹🇴";
+	inline constexpr const char flag_tt[] = "🇹🇹";
+	inline constexpr const char flag_tn[] = "🇹🇳";
+	inline constexpr const char flag_tr[] = "🇹🇷";
+	inline constexpr const char flag_tm[] = "🇹🇲";
+	inline constexpr const char flag_tc[] = "🇹🇨";
+	inline constexpr const char flag_vi[] = "🇻🇮";
+	inline constexpr const char flag_tv[] = "🇹🇻";
+	inline constexpr const char flag_ug[] = "🇺🇬";
+	inline constexpr const char flag_ua[] = "🇺🇦";
+	inline constexpr const char flag_ae[] = "🇦🇪";
+	inline constexpr const char flag_gb[] = "🇬🇧";
+	inline constexpr const char england[] = "🏴󠁧󠁢󠁥󠁮󠁧󠁿";
+	inline constexpr const char scotland[] = "🏴󠁧󠁢󠁳󠁣󠁴󠁿";
+	inline constexpr const char wales[] = "🏴󠁧󠁢󠁷󠁬󠁳󠁿";
+	inline constexpr const char flag_us[] = "🇺🇸";
+	inline constexpr const char flag_uy[] = "🇺🇾";
+	inline constexpr const char flag_uz[] = "🇺🇿";
+	inline constexpr const char flag_vu[] = "🇻🇺";
+	inline constexpr const char flag_va[] = "🇻🇦";
+	inline constexpr const char flag_ve[] = "🇻🇪";
+	inline constexpr const char flag_vn[] = "🇻🇳";
+	inline constexpr const char flag_wf[] = "🇼🇫";
+	inline constexpr const char flag_eh[] = "🇪🇭";
+	inline constexpr const char flag_ye[] = "🇾🇪";
+	inline constexpr const char flag_zm[] = "🇿🇲";
+	inline constexpr const char flag_zw[] = "🇿🇼";
+	inline constexpr const char flag_ac[] = "🇦🇨";
+	inline constexpr const char flag_bv[] = "🇧🇻";
+	inline constexpr const char flag_cp[] = "🇨🇵";
+	inline constexpr const char flag_ea[] = "🇪🇦";
+	inline constexpr const char flag_dg[] = "🇩🇬";
+	inline constexpr const char flag_hm[] = "🇭🇲";
+	inline constexpr const char flag_mf[] = "🇲🇫";
+	inline constexpr const char flag_sj[] = "🇸🇯";
+	inline constexpr const char flag_ta[] = "🇹🇦";
+	inline constexpr const char flag_um[] = "🇺🇲";
+	inline constexpr const char green_apple[] = "🍏";
+	inline constexpr const char apple[] = "🍎";
+	inline constexpr const char red_apple[] = "🍎";
+	inline constexpr const char pear[] = "🍐";
+	inline constexpr const char tangerine[] = "🍊";
+	inline constexpr const char lemon[] = "🍋";
+	inline constexpr const char banana[] = "🍌";
+	inline constexpr const char watermelon[] = "🍉";
+	inline constexpr const char grapes[] = "🍇";
+	inline constexpr const char strawberry[] = "🍓";
+	inline constexpr const char blueberries[] = "🫐";
+	inline constexpr const char melon[] = "🍈";
+	inline constexpr const char cherries[] = "🍒";
+	inline constexpr const char peach[] = "🍑";
+	inline constexpr const char mango[] = "🥭";
+	inline constexpr const char pineapple[] = "🍍";
+	inline constexpr const char coconut[] = "🥥";
+	inline constexpr const char kiwi[] = "🥝";
+	inline constexpr const char kiwifruit[] = "🥝";
+	inline constexpr const char kiwi_fruit[] = "🥝";
+	inline constexpr const char tomato[] = "🍅";
+	inline constexpr const char eggplant[] = "🍆";
+	inline constexpr const char avocado[] = "🥑";
+	inline constexpr const char pea_pod[] = "🫛";
+	inline constexpr const char broccoli[] = "🥦";
+	inline constexpr const char leafy_green[] = "🥬";
+	inline constexpr const char cucumber[] = "🥒";
+	inline constexpr const char hot_pepper[] = "🌶️";
+	inline constexpr const char bell_pepper[] = "🫑";
+	inline constexpr const char corn[] = "🌽";
+	inline constexpr const char ear_of_corn[] = "🌽";
+	inline constexpr const char carrot[] = "🥕";
+	inline constexpr const char olive[] = "🫒";
+	inline constexpr const char garlic[] = "🧄";
+	inline constexpr const char onion[] = "🧅";
+	inline constexpr const char potato[] = "🥔";
+	inline constexpr const char sweet_potato[] = "🍠";
+	inline constexpr const char ginger_root[] = "🫚";
+	inline constexpr const char croissant[] = "🥐";
+	inline constexpr const char bagel[] = "🥯";
+	inline constexpr const char bread[] = "🍞";
+	inline constexpr const char french_bread[] = "🥖";
+	inline constexpr const char baguette_bread[] = "🥖";
+	inline constexpr const char pretzel[] = "🥨";
+	inline constexpr const char cheese[] = "🧀";
+	inline constexpr const char cheese_wedge[] = "🧀";
+	inline constexpr const char egg[] = "🥚";
+	inline constexpr const char cooking[] = "🍳";
+	inline constexpr const char butter[] = "🧈";
+	inline constexpr const char pancakes[] = "🥞";
+	inline constexpr const char waffle[] = "🧇";
+	inline constexpr const char bacon[] = "🥓";
+	inline constexpr const char cut_of_meat[] = "🥩";
+	inline constexpr const char poultry_leg[] = "🍗";
+	inline constexpr const char meat_on_bone[] = "🍖";
+	inline constexpr const char bone[] = "🦴";
+	inline constexpr const char hotdog[] = "🌭";
+	inline constexpr const char hot_dog[] = "🌭";
+	inline constexpr const char hamburger[] = "🍔";
+	inline constexpr const char fries[] = "🍟";
+	inline constexpr const char french_fries[] = "🍟";
+	inline constexpr const char pizza[] = "🍕";
+	inline constexpr const char flatbread[] = "🫓";
+	inline constexpr const char sandwich[] = "🥪";
+	inline constexpr const char stuffed_flatbread[] = "🥙";
+	inline constexpr const char stuffed_pita[] = "🥙";
+	inline constexpr const char falafel[] = "🧆";
+	inline constexpr const char taco[] = "🌮";
+	inline constexpr const char burrito[] = "🌯";
+	inline constexpr const char tamale[] = "🫔";
+	inline constexpr const char salad[] = "🥗";
+	inline constexpr const char green_salad[] = "🥗";
+	inline constexpr const char shallow_pan_of_food[] = "🥘";
+	inline constexpr const char paella[] = "🥘";
+	inline constexpr const char fondue[] = "🫕";
+	inline constexpr const char canned_food[] = "🥫";
+	inline constexpr const char jar[] = "🫙";
+	inline constexpr const char spaghetti[] = "🍝";
+	inline constexpr const char ramen[] = "🍜";
+	inline constexpr const char steaming_bowl[] = "🍜";
+	inline constexpr const char stew[] = "🍲";
+	inline constexpr const char pot_of_food[] = "🍲";
+	inline constexpr const char curry[] = "🍛";
+	inline constexpr const char curry_rice[] = "🍛";
+	inline constexpr const char sushi[] = "🍣";
+	inline constexpr const char bento[] = "🍱";
+	inline constexpr const char bento_box[] = "🍱";
+	inline constexpr const char dumpling[] = "🥟";
+	inline constexpr const char oyster[] = "🦪";
+	inline constexpr const char fried_shrimp[] = "🍤";
+	inline constexpr const char rice_ball[] = "🍙";
+	inline constexpr const char rice[] = "🍚";
+	inline constexpr const char cooked_rice[] = "🍚";
+	inline constexpr const char rice_cracker[] = "🍘";
+	inline constexpr const char fish_cake[] = "🍥";
+	inline constexpr const char fortune_cookie[] = "🥠";
+	inline constexpr const char moon_cake[] = "🥮";
+	inline constexpr const char oden[] = "🍢";
+	inline constexpr const char dango[] = "🍡";
+	inline constexpr const char shaved_ice[] = "🍧";
+	inline constexpr const char ice_cream[] = "🍨";
+	inline constexpr const char icecream[] = "🍦";
+	inline constexpr const char pie[] = "🥧";
+	inline constexpr const char cupcake[] = "🧁";
+	inline constexpr const char cake[] = "🍰";
+	inline constexpr const char shortcake[] = "🍰";
+	inline constexpr const char birthday[] = "🎂";
+	inline constexpr const char birthday_cake[] = "🎂";
+	inline constexpr const char custard[] = "🍮";
+	inline constexpr const char pudding[] = "🍮";
+	inline constexpr const char flan[] = "🍮";
+	inline constexpr const char lollipop[] = "🍭";
+	inline constexpr const char candy[] = "🍬";
+	inline constexpr const char chocolate_bar[] = "🍫";
+	inline constexpr const char popcorn[] = "🍿";
+	inline constexpr const char doughnut[] = "🍩";
+	inline constexpr const char cookie[] = "🍪";
+	inline constexpr const char chestnut[] = "🌰";
+	inline constexpr const char peanuts[] = "🥜";
+	inline constexpr const char shelled_peanut[] = "🥜";
+	inline constexpr const char beans[] = "🫘";
+	inline constexpr const char honey_pot[] = "🍯";
+	inline constexpr const char milk[] = "🥛";
+	inline constexpr const char glass_of_milk[] = "🥛";
+	inline constexpr const char pouring_liquid[] = "🫗";
+	inline constexpr const char baby_bottle[] = "🍼";
+	inline constexpr const char teapot[] = "🫖";
+	inline constexpr const char coffee[] = "☕";
+	inline constexpr const char hot_beverage[] = "☕";
+	inline constexpr const char tea[] = "🍵";
+	inline constexpr const char mate[] = "🧉";
+	inline constexpr const char beverage_box[] = "🧃";
+	inline constexpr const char cup_with_straw[] = "🥤";
+	inline constexpr const char bubble_tea[] = "🧋";
+	inline constexpr const char sake[] = "🍶";
+	inline constexpr const char beer[] = "🍺";
+	inline constexpr const char beer_mug[] = "🍺";
+	inline constexpr const char beers[] = "🍻";
+	inline constexpr const char champagne_glass[] = "🥂";
+	inline constexpr const char clinking_glass[] = "🥂";
+	inline constexpr const char wine_glass[] = "🍷";
+	inline constexpr const char tumbler_glass[] = "🥃";
+	inline constexpr const char whisky[] = "🥃";
+	inline constexpr const char cocktail[] = "🍸";
+	inline constexpr const char tropical_drink[] = "🍹";
+	inline constexpr const char champagne[] = "🍾";
+	inline constexpr const char bottle_with_popping_cork[] = "🍾";
+	inline constexpr const char ice_cube[] = "🧊";
+	inline constexpr const char spoon[] = "🥄";
+	inline constexpr const char fork_and_knife[] = "🍴";
+	inline constexpr const char fork_knife_plate[] = "🍽️";
+	inline constexpr const char fork_and_knife_with_plate[] = "🍽️";
+	inline constexpr const char bowl_with_spoon[] = "🥣";
+	inline constexpr const char takeout_box[] = "🥡";
+	inline constexpr const char chopsticks[] = "🥢";
+	inline constexpr const char salt[] = "🧂";
+	inline constexpr const char dog[] = "🐶";
+	inline constexpr const char dog_face[] = "🐶";
+	inline constexpr const char cat[] = "🐱";
+	inline constexpr const char cat_face[] = "🐱";
+	inline constexpr const char mouse[] = "🐭";
+	inline constexpr const char mouse_face[] = "🐭";
+	inline constexpr const char hamster[] = "🐹";
+	inline constexpr const char rabbit[] = "🐰";
+	inline constexpr const char rabbit_face[] = "🐰";
+	inline constexpr const char fox[] = "🦊";
+	inline constexpr const char fox_face[] = "🦊";
+	inline constexpr const char bear[] = "🐻";
+	inline constexpr const char panda_face[] = "🐼";
+	inline constexpr const char panda[] = "🐼";
+	inline constexpr const char polar_bear[] = "🐻‍❄️";
+	inline constexpr const char koala[] = "🐨";
+	inline constexpr const char tiger[] = "🐯";
+	inline constexpr const char tiger_face[] = "🐯";
+	inline constexpr const char lion_face[] = "🦁";
+	inline constexpr const char lion[] = "🦁";
+	inline constexpr const char cow[] = "🐮";
+	inline constexpr const char cow_face[] = "🐮";
+	inline constexpr const char pig[] = "🐷";
+	inline constexpr const char pig_face[] = "🐷";
+	inline constexpr const char pig_nose[] = "🐽";
+	inline constexpr const char frog[] = "🐸";
+	inline constexpr const char monkey_face[] = "🐵";
+	inline constexpr const char see_no_evil[] = "🙈";
+	inline constexpr const char hear_no_evil[] = "🙉";
+	inline constexpr const char speak_no_evil[] = "🙊";
+	inline constexpr const char monkey[] = "🐒";
+	inline constexpr const char chicken[] = "🐔";
+	inline constexpr const char penguin[] = "🐧";
+	inline constexpr const char bird[] = "🐦";
+	inline constexpr const char baby_chick[] = "🐤";
+	inline constexpr const char hatching_chick[] = "🐣";
+	inline constexpr const char hatched_chick[] = "🐥";
+	inline constexpr const char goose[] = "🪿";
+	inline constexpr const char duck[] = "🦆";
+	inline constexpr const char black_bird[] = "🐦‍⬛";
+	inline constexpr const char eagle[] = "🦅";
+	inline constexpr const char owl[] = "🦉";
+	inline constexpr const char bat[] = "🦇";
+	inline constexpr const char wolf[] = "🐺";
+	inline constexpr const char boar[] = "🐗";
+	inline constexpr const char horse[] = "🐴";
+	inline constexpr const char horse_face[] = "🐴";
+	inline constexpr const char unicorn[] = "🦄";
+	inline constexpr const char unicorn_face[] = "🦄";
+	inline constexpr const char moose[] = "🫎";
+	inline constexpr const char bee[] = "🐝";
+	inline constexpr const char honeybee[] = "🐝";
+	inline constexpr const char worm[] = "🪱";
+	inline constexpr const char bug[] = "🐛";
+	inline constexpr const char butterfly[] = "🦋";
+	inline constexpr const char snail[] = "🐌";
+	inline constexpr const char lady_beetle[] = "🐞";
+	inline constexpr const char ant[] = "🐜";
+	inline constexpr const char fly[] = "🪰";
+	inline constexpr const char beetle[] = "🪲";
+	inline constexpr const char cockroach[] = "🪳";
+	inline constexpr const char mosquito[] = "🦟";
+	inline constexpr const char cricket[] = "🦗";
+	inline constexpr const char spider[] = "🕷️";
+	inline constexpr const char spider_web[] = "🕸️";
+	inline constexpr const char scorpion[] = "🦂";
+	inline constexpr const char turtle[] = "🐢";
+	inline constexpr const char snake[] = "🐍";
+	inline constexpr const char lizard[] = "🦎";
+	inline constexpr const char t_rex[] = "🦖";
+	inline constexpr const char sauropod[] = "🦕";
+	inline constexpr const char octopus[] = "🐙";
+	inline constexpr const char squid[] = "🦑";
+	inline constexpr const char jellyfish[] = "🪼";
+	inline constexpr const char shrimp[] = "🦐";
+	inline constexpr const char lobster[] = "🦞";
+	inline constexpr const char crab[] = "🦀";
+	inline constexpr const char blowfish[] = "🐡";
+	inline constexpr const char tropical_fish[] = "🐠";
+	inline constexpr const char fish[] = "🐟";
+	inline constexpr const char dolphin[] = "🐬";
+	inline constexpr const char whale[] = "🐳";
+	inline constexpr const char whale2[] = "🐋";
+	inline constexpr const char shark[] = "🦈";
+	inline constexpr const char seal[] = "🦭";
+	inline constexpr const char crocodile[] = "🐊";
+	inline constexpr const char tiger2[] = "🐅";
+	inline constexpr const char leopard[] = "🐆";
+	inline constexpr const char zebra[] = "🦓";
+	inline constexpr const char gorilla[] = "🦍";
+	inline constexpr const char orangutan[] = "🦧";
+	inline constexpr const char mammoth[] = "🦣";
+	inline constexpr const char elephant[] = "🐘";
+	inline constexpr const char hippopotamus[] = "🦛";
+	inline constexpr const char rhino[] = "🦏";
+	inline constexpr const char rhinoceros[] = "🦏";
+	inline constexpr const char dromedary_camel[] = "🐪";
+	inline constexpr const char camel[] = "🐫";
+	inline constexpr const char giraffe[] = "🦒";
+	inline constexpr const char kangaroo[] = "🦘";
+	inline constexpr const char bison[] = "🦬";
+	inline constexpr const char water_buffalo[] = "🐃";
+	inline constexpr const char ox[] = "🐂";
+	inline constexpr const char cow2[] = "🐄";
+	inline constexpr const char donkey[] = "🫏";
+	inline constexpr const char racehorse[] = "🐎";
+	inline constexpr const char pig2[] = "🐖";
+	inline constexpr const char ram[] = "🐏";
+	inline constexpr const char sheep[] = "🐑";
+	inline constexpr const char ewe[] = "🐑";
+	inline constexpr const char llama[] = "🦙";
+	inline constexpr const char goat[] = "🐐";
+	inline constexpr const char deer[] = "🦌";
+	inline constexpr const char dog2[] = "🐕";
+	inline constexpr const char poodle[] = "🐩";
+	inline constexpr const char guide_dog[] = "🦮";
+	inline constexpr const char service_dog[] = "🐕‍🦺";
+	inline constexpr const char cat2[] = "🐈";
+	inline constexpr const char black_cat[] = "🐈‍⬛";
+	inline constexpr const char feather[] = "🪶";
+	inline constexpr const char wing[] = "🪽";
+	inline constexpr const char rooster[] = "🐓";
+	inline constexpr const char turkey[] = "🦃";
+	inline constexpr const char dodo[] = "🦤";
+	inline constexpr const char peacock[] = "🦚";
+	inline constexpr const char parrot[] = "🦜";
+	inline constexpr const char swan[] = "🦢";
+	inline constexpr const char flamingo[] = "🦩";
+	inline constexpr const char dove[] = "🕊️";
+	inline constexpr const char dove_of_peace[] = "🕊️";
+	inline constexpr const char rabbit2[] = "🐇";
+	inline constexpr const char raccoon[] = "🦝";
+	inline constexpr const char skunk[] = "🦨";
+	inline constexpr const char badger[] = "🦡";
+	inline constexpr const char beaver[] = "🦫";
+	inline constexpr const char otter[] = "🦦";
+	inline constexpr const char sloth[] = "🦥";
+	inline constexpr const char mouse2[] = "🐁";
+	inline constexpr const char rat[] = "🐀";
+	inline constexpr const char chipmunk[] = "🐿️";
+	inline constexpr const char hedgehog[] = "🦔";
+	inline constexpr const char feet[] = "🐾";
+	inline constexpr const char paw_prints[] = "🐾";
+	inline constexpr const char dragon[] = "🐉";
+	inline constexpr const char dragon_face[] = "🐲";
+	inline constexpr const char cactus[] = "🌵";
+	inline constexpr const char christmas_tree[] = "🎄";
+	inline constexpr const char evergreen_tree[] = "🌲";
+	inline constexpr const char deciduous_tree[] = "🌳";
+	inline constexpr const char palm_tree[] = "🌴";
+	inline constexpr const char wood[] = "🪵";
+	inline constexpr const char seedling[] = "🌱";
+	inline constexpr const char herb[] = "🌿";
+	inline constexpr const char shamrock[] = "☘️";
+	inline constexpr const char four_leaf_clover[] = "🍀";
+	inline constexpr const char bamboo[] = "🎍";
+	inline constexpr const char potted_plant[] = "🪴";
+	inline constexpr const char tanabata_tree[] = "🎋";
+	inline constexpr const char leaves[] = "🍃";
+	inline constexpr const char fallen_leaf[] = "🍂";
+	inline constexpr const char maple_leaf[] = "🍁";
+	inline constexpr const char nest_with_eggs[] = "🪺";
+	inline constexpr const char empty_nest[] = "🪹";
+	inline constexpr const char mushroom[] = "🍄";
+	inline constexpr const char shell[] = "🐚";
+	inline constexpr const char spiral_shell[] = "🐚";
+	inline constexpr const char coral[] = "🪸";
+	inline constexpr const char rock[] = "🪨";
+	inline constexpr const char ear_of_rice[] = "🌾";
+	inline constexpr const char sheaf_of_rice[] = "🌾";
+	inline constexpr const char bouquet[] = "💐";
+	inline constexpr const char tulip[] = "🌷";
+	inline constexpr const char rose[] = "🌹";
+	inline constexpr const char wilted_rose[] = "🥀";
+	inline constexpr const char wilted_flower[] = "🥀";
+	inline constexpr const char hyacinth[] = "🪻";
+	inline constexpr const char lotus[] = "🪷";
+	inline constexpr const char hibiscus[] = "🌺";
+	inline constexpr const char cherry_blossom[] = "🌸";
+	inline constexpr const char blossom[] = "🌼";
+	inline constexpr const char sunflower[] = "🌻";
+	inline constexpr const char sun_with_face[] = "🌞";
+	inline constexpr const char full_moon_with_face[] = "🌝";
+	inline constexpr const char first_quarter_moon_with_face[] = "🌛";
+	inline constexpr const char last_quarter_moon_with_face[] = "🌜";
+	inline constexpr const char new_moon_with_face[] = "🌚";
+	inline constexpr const char new_moon_face[] = "🌚";
+	inline constexpr const char full_moon[] = "🌕";
+	inline constexpr const char waning_gibbous_moon[] = "🌖";
+	inline constexpr const char last_quarter_moon[] = "🌗";
+	inline constexpr const char waning_crescent_moon[] = "🌘";
+	inline constexpr const char new_moon[] = "🌑";
+	inline constexpr const char waxing_crescent_moon[] = "🌒";
+	inline constexpr const char first_quarter_moon[] = "🌓";
+	inline constexpr const char waxing_gibbous_moon[] = "🌔";
+	inline constexpr const char crescent_moon[] = "🌙";
+	inline constexpr const char earth_americas[] = "🌎";
+	inline constexpr const char earth_africa[] = "🌍";
+	inline constexpr const char earth_asia[] = "🌏";
+	inline constexpr const char ringed_planet[] = "🪐";
+	inline constexpr const char dizzy[] = "💫";
+	inline constexpr const char star[] = "⭐";
+	inline constexpr const char star2[] = "🌟";
+	inline constexpr const char glowing_star[] = "🌟";
+	inline constexpr const char sparkles[] = "✨";
+	inline constexpr const char zap[] = "⚡";
+	inline constexpr const char high_voltage[] = "⚡";
+	inline constexpr const char comet[] = "☄️";
+	inline constexpr const char boom[] = "💥";
+	inline constexpr const char collision[] = "💥";
+	inline constexpr const char fire[] = "🔥";
+	inline constexpr const char flame[] = "🔥";
+	inline constexpr const char cloud_tornado[] = "🌪️";
+	inline constexpr const char cloud_with_tornado[] = "🌪️";
+	inline constexpr const char tornado[] = "🌪️";
+	inline constexpr const char rainbow[] = "🌈";
+	inline constexpr const char sunny[] = "☀️";
+	inline constexpr const char sun[] = "☀️";
+	inline constexpr const char white_sun_small_cloud[] = "🌤️";
+	inline constexpr const char white_sun_with_small_cloud[] = "🌤️";
+	inline constexpr const char partly_sunny[] = "⛅";
+	inline constexpr const char white_sun_cloud[] = "🌥️";
+	inline constexpr const char white_sun_behind_cloud[] = "🌥️";
+	inline constexpr const char cloud[] = "☁️";
+	inline constexpr const char white_sun_rain_cloud[] = "🌦️";
+	inline constexpr const char white_sun_behind_cloud_with_rain[] = "🌦️";
+	inline constexpr const char cloud_rain[] = "🌧️";
+	inline constexpr const char cloud_with_rain[] = "🌧️";
+	inline constexpr const char thunder_cloud_rain[] = "⛈️";
+	inline constexpr const char thunder_cloud_and_rain[] = "⛈️";
+	inline constexpr const char cloud_lightning[] = "🌩️";
+	inline constexpr const char cloud_with_lightning[] = "🌩️";
+	inline constexpr const char cloud_snow[] = "🌨️";
+	inline constexpr const char cloud_with_snow[] = "🌨️";
+	inline constexpr const char snowflake[] = "❄️";
+	inline constexpr const char snowman2[] = "☃️";
+	inline constexpr const char snowman[] = "⛄";
+	inline constexpr const char wind_blowing_face[] = "🌬️";
+	inline constexpr const char wind_face[] = "🌬️";
+	inline constexpr const char dash[] = "💨";
+	inline constexpr const char dashing_away[] = "💨";
+	inline constexpr const char droplet[] = "💧";
+	inline constexpr const char sweat_drops[] = "💦";
+	inline constexpr const char bubbles[] = "🫧";
+	inline constexpr const char umbrella[] = "☔";
+	inline constexpr const char umbrella2[] = "☂️";
+	inline constexpr const char ocean[] = "🌊";
+	inline constexpr const char water_wave[] = "🌊";
+	inline constexpr const char fog[] = "🌫️";
+	inline constexpr const char watch[] = "⌚";
+	inline constexpr const char mobile_phone[] = "📱";
+	inline constexpr const char iphone[] = "📱";
+	inline constexpr const char calling[] = "📲";
+	inline constexpr const char computer[] = "💻";
+	inline constexpr const char keyboard[] = "⌨️";
+	inline constexpr const char desktop[] = "🖥️";
+	inline constexpr const char desktop_computer[] = "🖥️";
+	inline constexpr const char printer[] = "🖨️";
+	inline constexpr const char mouse_three_button[] = "🖱️";
+	inline constexpr const char three_button_mouse[] = "🖱️";
+	inline constexpr const char trackball[] = "🖲️";
+	inline constexpr const char joystick[] = "🕹️";
+	inline constexpr const char compression[] = "🗜️";
+	inline constexpr const char clamp[] = "🗜️";
+	inline constexpr const char minidisc[] = "💽";
+	inline constexpr const char computer_disk[] = "💽";
+	inline constexpr const char floppy_disk[] = "💾";
+	inline constexpr const char cd[] = "💿";
+	inline constexpr const char optical_disk[] = "💿";
+	inline constexpr const char dvd[] = "📀";
+	inline constexpr const char vhs[] = "📼";
+	inline constexpr const char videocassette[] = "📼";
+	inline constexpr const char camera[] = "📷";
+	inline constexpr const char camera_with_flash[] = "📸";
+	inline constexpr const char video_camera[] = "📹";
+	inline constexpr const char movie_camera[] = "🎥";
+	inline constexpr const char projector[] = "📽️";
+	inline constexpr const char film_projector[] = "📽️";
+	inline constexpr const char film_frames[] = "🎞️";
+	inline constexpr const char telephone_receiver[] = "📞";
+	inline constexpr const char telephone[] = "☎️";
+	inline constexpr const char pager[] = "📟";
+	inline constexpr const char fax[] = "📠";
+	inline constexpr const char fax_machine[] = "📠";
+	inline constexpr const char tv[] = "📺";
+	inline constexpr const char television[] = "📺";
+	inline constexpr const char radio[] = "📻";
+	inline constexpr const char microphone2[] = "🎙️";
+	inline constexpr const char studio_microphone[] = "🎙️";
+	inline constexpr const char level_slider[] = "🎚️";
+	inline constexpr const char control_knobs[] = "🎛️";
+	inline constexpr const char compass[] = "🧭";
+	inline constexpr const char stopwatch[] = "⏱️";
+	inline constexpr const char timer[] = "⏲️";
+	inline constexpr const char timer_clock[] = "⏲️";
+	inline constexpr const char alarm_clock[] = "⏰";
+	inline constexpr const char clock[] = "🕰️";
+	inline constexpr const char mantlepiece_clock[] = "🕰️";
+	inline constexpr const char hourglass[] = "⌛";
+	inline constexpr const char hourglass_flowing_sand[] = "⏳";
+	inline constexpr const char satellite[] = "📡";
+	inline constexpr const char battery[] = "🔋";
+	inline constexpr const char low_battery[] = "🪫";
+	inline constexpr const char electric_plug[] = "🔌";
+	inline constexpr const char bulb[] = "💡";
+	inline constexpr const char light_bulb[] = "💡";
+	inline constexpr const char flashlight[] = "🔦";
+	inline constexpr const char candle[] = "🕯️";
+	inline constexpr const char diya_lamp[] = "🪔";
+	inline constexpr const char fire_extinguisher[] = "🧯";
+	inline constexpr const char oil[] = "🛢️";
+	inline constexpr const char oil_drum[] = "🛢️";
+	inline constexpr const char money_with_wings[] = "💸";
+	inline constexpr const char dollar[] = "💵";
+	inline constexpr const char yen[] = "💴";
+	inline constexpr const char yen_banknote[] = "💴";
+	inline constexpr const char euro[] = "💶";
+	inline constexpr const char euro_banknote[] = "💶";
+	inline constexpr const char pound[] = "💷";
+	inline constexpr const char coin[] = "🪙";
+	inline constexpr const char moneybag[] = "💰";
+	inline constexpr const char money_bag[] = "💰";
+	inline constexpr const char credit_card[] = "💳";
+	inline constexpr const char identification_card[] = "🪪";
+	inline constexpr const char gem[] = "💎";
+	inline constexpr const char gem_stone[] = "💎";
+	inline constexpr const char scales[] = "⚖️";
+	inline constexpr const char balance_scale[] = "⚖️";
+	inline constexpr const char ladder[] = "🪜";
+	inline constexpr const char toolbox[] = "🧰";
+	inline constexpr const char screwdriver[] = "🪛";
+	inline constexpr const char wrench[] = "🔧";
+	inline constexpr const char hammer[] = "🔨";
+	inline constexpr const char hammer_pick[] = "⚒️";
+	inline constexpr const char hammer_and_pick[] = "⚒️";
+	inline constexpr const char tools[] = "🛠️";
+	inline constexpr const char hammer_and_wrench[] = "🛠️";
+	inline constexpr const char pick[] = "⛏️";
+	inline constexpr const char carpentry_saw[] = "🪚";
+	inline constexpr const char nut_and_bolt[] = "🔩";
+	inline constexpr const char gear[] = "⚙️";
+	inline constexpr const char mouse_trap[] = "🪤";
+	inline constexpr const char bricks[] = "🧱";
+	inline constexpr const char brick[] = "🧱";
+	inline constexpr const char chains[] = "⛓️";
+	inline constexpr const char magnet[] = "🧲";
+	inline constexpr const char gun[] = "🔫";
+	inline constexpr const char pistol[] = "🔫";
+	inline constexpr const char bomb[] = "💣";
+	inline constexpr const char firecracker[] = "🧨";
+	inline constexpr const char axe[] = "🪓";
+	inline constexpr const char knife[] = "🔪";
+	inline constexpr const char kitchen_knife[] = "🔪";
+	inline constexpr const char dagger[] = "🗡️";
+	inline constexpr const char dagger_knife[] = "🗡️";
+	inline constexpr const char crossed_swords[] = "⚔️";
+	inline constexpr const char shield[] = "🛡️";
+	inline constexpr const char smoking[] = "🚬";
+	inline constexpr const char cigarette[] = "🚬";
+	inline constexpr const char coffin[] = "⚰️";
+	inline constexpr const char headstone[] = "🪦";
+	inline constexpr const char urn[] = "⚱️";
+	inline constexpr const char funeral_urn[] = "⚱️";
+	inline constexpr const char amphora[] = "🏺";
+	inline constexpr const char crystal_ball[] = "🔮";
+	inline constexpr const char prayer_beads[] = "📿";
+	inline constexpr const char nazar_amulet[] = "🧿";
+	inline constexpr const char hamsa[] = "🪬";
+	inline constexpr const char barber[] = "💈";
+	inline constexpr const char barber_pole[] = "💈";
+	inline constexpr const char alembic[] = "⚗️";
+	inline constexpr const char telescope[] = "🔭";
+	inline constexpr const char microscope[] = "🔬";
+	inline constexpr const char hole[] = "🕳️";
+	inline constexpr const char x_ray[] = "🩻";
+	inline constexpr const char adhesive_bandage[] = "🩹";
+	inline constexpr const char stethoscope[] = "🩺";
+	inline constexpr const char pill[] = "💊";
+	inline constexpr const char syringe[] = "💉";
+	inline constexpr const char drop_of_blood[] = "🩸";
+	inline constexpr const char dna[] = "🧬";
+	inline constexpr const char microbe[] = "🦠";
+	inline constexpr const char petri_dish[] = "🧫";
+	inline constexpr const char test_tube[] = "🧪";
+	inline constexpr const char thermometer[] = "🌡️";
+	inline constexpr const char broom[] = "🧹";
+	inline constexpr const char plunger[] = "🪠";
+	inline constexpr const char basket[] = "🧺";
+	inline constexpr const char roll_of_paper[] = "🧻";
+	inline constexpr const char toilet[] = "🚽";
+	inline constexpr const char potable_water[] = "🚰";
+	inline constexpr const char shower[] = "🚿";
+	inline constexpr const char bathtub[] = "🛁";
+	inline constexpr const char bath[] = "🛀";
+	inline constexpr const char bath_tone1[] = "🛀🏻";
+	inline constexpr const char bath_tone2[] = "🛀🏼";
+	inline constexpr const char bath_tone3[] = "🛀🏽";
+	inline constexpr const char bath_tone4[] = "🛀🏾";
+	inline constexpr const char bath_tone5[] = "🛀🏿";
+	inline constexpr const char soap[] = "🧼";
+	inline constexpr const char toothbrush[] = "🪥";
+	inline constexpr const char razor[] = "🪒";
+	inline constexpr const char hair_pick[] = "🪮";
+	inline constexpr const char sponge[] = "🧽";
+	inline constexpr const char bucket[] = "🪣";
+	inline constexpr const char squeeze_bottle[] = "🧴";
+	inline constexpr const char lotion_bottle[] = "🧴";
+	inline constexpr const char bellhop[] = "🛎️";
+	inline constexpr const char bellhop_bell[] = "🛎️";
+	inline constexpr const char key[] = "🔑";
+	inline constexpr const char key2[] = "🗝️";
+	inline constexpr const char old_key[] = "🗝️";
+	inline constexpr const char door[] = "🚪";
+	inline constexpr const char chair[] = "🪑";
+	inline constexpr const char couch[] = "🛋️";
+	inline constexpr const char couch_and_lamp[] = "🛋️";
+	inline constexpr const char bed[] = "🛏️";
+	inline constexpr const char sleeping_accommodation[] = "🛌";
+	inline constexpr const char person_in_bed[] = "🛌";
+	inline constexpr const char person_in_bed_tone1[] = "🛌🏻";
+	inline constexpr const char person_in_bed_light_skin_tone[] = "🛌🏻";
+	inline constexpr const char person_in_bed_tone2[] = "🛌🏼";
+	inline constexpr const char person_in_bed_medium_light_skin_tone[] = "🛌🏼";
+	inline constexpr const char person_in_bed_tone3[] = "🛌🏽";
+	inline constexpr const char person_in_bed_medium_skin_tone[] = "🛌🏽";
+	inline constexpr const char person_in_bed_tone4[] = "🛌🏾";
+	inline constexpr const char person_in_bed_medium_dark_skin_tone[] = "🛌🏾";
+	inline constexpr const char person_in_bed_tone5[] = "🛌🏿";
+	inline constexpr const char person_in_bed_dark_skin_tone[] = "🛌🏿";
+	inline constexpr const char teddy_bear[] = "🧸";
+	inline constexpr const char nesting_dolls[] = "🪆";
+	inline constexpr const char frame_photo[] = "🖼️";
+	inline constexpr const char frame_with_picture[] = "🖼️";
+	inline constexpr const char mirror[] = "🪞";
+	inline constexpr const char window[] = "🪟";
+	inline constexpr const char shopping_bags[] = "🛍️";
+	inline constexpr const char shopping_cart[] = "🛒";
+	inline constexpr const char shopping_trolley[] = "🛒";
+	inline constexpr const char gift[] = "🎁";
+	inline constexpr const char wrapped_gift[] = "🎁";
+	inline constexpr const char balloon[] = "🎈";
+	inline constexpr const char flags[] = "🎏";
+	inline constexpr const char carp_streamer[] = "🎏";
+	inline constexpr const char ribbon[] = "🎀";
+	inline constexpr const char magic_wand[] = "🪄";
+	inline constexpr const char pinata[] = "🪅";
+	inline constexpr const char confetti_ball[] = "🎊";
+	inline constexpr const char tada[] = "🎉";
+	inline constexpr const char party_popper[] = "🎉";
+	inline constexpr const char dolls[] = "🎎";
+	inline constexpr const char folding_hand_fan[] = "🪭";
+	inline constexpr const char izakaya_lantern[] = "🏮";
+	inline constexpr const char wind_chime[] = "🎐";
+	inline constexpr const char mirror_ball[] = "🪩";
+	inline constexpr const char red_envelope[] = "🧧";
+	inline constexpr const char envelope[] = "✉️";
+	inline constexpr const char envelope_with_arrow[] = "📩";
+	inline constexpr const char incoming_envelope[] = "📨";
+	inline constexpr const char e_mail[] = "📧";
+	inline constexpr const char email[] = "📧";
+	inline constexpr const char love_letter[] = "💌";
+	inline constexpr const char inbox_tray[] = "📥";
+	inline constexpr const char outbox_tray[] = "📤";
+	inline constexpr const char package[] = "📦";
+	inline constexpr const char label[] = "🏷️";
+	inline constexpr const char placard[] = "🪧";
+	inline constexpr const char mailbox_closed[] = "📪";
+	inline constexpr const char mailbox[] = "📫";
+	inline constexpr const char mailbox_with_mail[] = "📬";
+	inline constexpr const char mailbox_with_no_mail[] = "📭";
+	inline constexpr const char postbox[] = "📮";
+	inline constexpr const char postal_horn[] = "📯";
+	inline constexpr const char scroll[] = "📜";
+	inline constexpr const char page_with_curl[] = "📃";
+	inline constexpr const char page_facing_up[] = "📄";
+	inline constexpr const char bookmark_tabs[] = "📑";
+	inline constexpr const char receipt[] = "🧾";
+	inline constexpr const char bar_chart[] = "📊";
+	inline constexpr const char chart_with_upwards_trend[] = "📈";
+	inline constexpr const char chart_with_downwards_trend[] = "📉";
+	inline constexpr const char notepad_spiral[] = "🗒️";
+	inline constexpr const char spiral_note_pad[] = "🗒️";
+	inline constexpr const char calendar_spiral[] = "🗓️";
+	inline constexpr const char spiral_calendar_pad[] = "🗓️";
+	inline constexpr const char calendar[] = "📆";
+	inline constexpr const char date[] = "📅";
+	inline constexpr const char wastebasket[] = "🗑️";
+	inline constexpr const char card_index[] = "📇";
+	inline constexpr const char card_box[] = "🗃️";
+	inline constexpr const char card_file_box[] = "🗃️";
+	inline constexpr const char ballot_box[] = "🗳️";
+	inline constexpr const char ballot_box_with_ballot[] = "🗳️";
+	inline constexpr const char file_cabinet[] = "🗄️";
+	inline constexpr const char clipboard[] = "📋";
+	inline constexpr const char file_folder[] = "📁";
+	inline constexpr const char open_file_folder[] = "📂";
+	inline constexpr const char dividers[] = "🗂️";
+	inline constexpr const char card_index_dividers[] = "🗂️";
+	inline constexpr const char newspaper2[] = "🗞️";
+	inline constexpr const char rolled_up_newspaper[] = "🗞️";
+	inline constexpr const char newspaper[] = "📰";
+	inline constexpr const char notebook[] = "📓";
+	inline constexpr const char notebook_with_decorative_cover[] = "📔";
+	inline constexpr const char ledger[] = "📒";
+	inline constexpr const char closed_book[] = "📕";
+	inline constexpr const char green_book[] = "📗";
+	inline constexpr const char blue_book[] = "📘";
+	inline constexpr const char orange_book[] = "📙";
+	inline constexpr const char books[] = "📚";
+	inline constexpr const char book[] = "📖";
+	inline constexpr const char open_book[] = "📖";
+	inline constexpr const char bookmark[] = "🔖";
+	inline constexpr const char safety_pin[] = "🧷";
+	inline constexpr const char link[] = "🔗";
+	inline constexpr const char paperclip[] = "📎";
+	inline constexpr const char paperclips[] = "🖇️";
+	inline constexpr const char linked_paperclips[] = "🖇️";
+	inline constexpr const char triangular_ruler[] = "📐";
+	inline constexpr const char straight_ruler[] = "📏";
+	inline constexpr const char abacus[] = "🧮";
+	inline constexpr const char pushpin[] = "📌";
+	inline constexpr const char round_pushpin[] = "📍";
+	inline constexpr const char scissors[] = "✂️";
+	inline constexpr const char pen_ballpoint[] = "🖊️";
+	inline constexpr const char lower_left_ballpoint_pen[] = "🖊️";
+	inline constexpr const char pen[] = "🖊️";
+	inline constexpr const char pen_fountain[] = "🖋️";
+	inline constexpr const char lower_left_fountain_pen[] = "🖋️";
+	inline constexpr const char fountain_pen[] = "🖋️";
+	inline constexpr const char black_nib[] = "✒️";
+	inline constexpr const char paintbrush[] = "🖌️";
+	inline constexpr const char lower_left_paintbrush[] = "🖌️";
+	inline constexpr const char crayon[] = "🖍️";
+	inline constexpr const char lower_left_crayon[] = "🖍️";
+	inline constexpr const char pencil[] = "📝";
+	inline constexpr const char memo[] = "📝";
+	inline constexpr const char pencil2[] = "✏️";
+	inline constexpr const char mag[] = "🔍";
+	inline constexpr const char mag_right[] = "🔎";
+	inline constexpr const char lock_with_ink_pen[] = "🔏";
+	inline constexpr const char closed_lock_with_key[] = "🔐";
+	inline constexpr const char lock[] = "🔒";
+	inline constexpr const char locked[] = "🔒";
+	inline constexpr const char unlock[] = "🔓";
+	inline constexpr const char unlocked[] = "🔓";
+	inline constexpr const char grinning[] = "😀";
+	inline constexpr const char grinning_face[] = "😀";
+	inline constexpr const char smiley[] = "😃";
+	inline constexpr const char smile[] = "😄";
+	inline constexpr const char grin[] = "😁";
+	inline constexpr const char laughing[] = "😆";
+	inline constexpr const char satisfied[] = "😆";
+	inline constexpr const char face_holding_back_tears[] = "🥹";
+	inline constexpr const char sweat_smile[] = "😅";
+	inline constexpr const char joy[] = "😂";
+	inline constexpr const char rofl[] = "🤣";
+	inline constexpr const char rolling_on_the_floor_laughing[] = "🤣";
+	inline constexpr const char smiling_face_with_tear[] = "🥲";
+	inline constexpr const char relaxed[] = "☺️";
+	inline constexpr const char smiling_face[] = "☺️";
+	inline constexpr const char blush[] = "😊";
+	inline constexpr const char innocent[] = "😇";
+	inline constexpr const char slight_smile[] = "🙂";
+	inline constexpr const char slightly_smiling_face[] = "🙂";
+	inline constexpr const char upside_down[] = "🙃";
+	inline constexpr const char upside_down_face[] = "🙃";
+	inline constexpr const char wink[] = "😉";
+	inline constexpr const char winking_face[] = "😉";
+	inline constexpr const char relieved[] = "😌";
+	inline constexpr const char relieved_face[] = "😌";
+	inline constexpr const char heart_eyes[] = "😍";
+	inline constexpr const char smiling_face_with_3_hearts[] = "🥰";
+	inline constexpr const char kissing_heart[] = "😘";
+	inline constexpr const char kissing[] = "😗";
+	inline constexpr const char kissing_face[] = "😗";
+	inline constexpr const char kissing_smiling_eyes[] = "😙";
+	inline constexpr const char kissing_closed_eyes[] = "😚";
+	inline constexpr const char yum[] = "😋";
+	inline constexpr const char stuck_out_tongue[] = "😛";
+	inline constexpr const char stuck_out_tongue_closed_eyes[] = "😝";
+	inline constexpr const char stuck_out_tongue_winking_eye[] = "😜";
+	inline constexpr const char zany_face[] = "🤪";
+	inline constexpr const char face_with_raised_eyebrow[] = "🤨";
+	inline constexpr const char face_with_monocle[] = "🧐";
+	inline constexpr const char nerd[] = "🤓";
+	inline constexpr const char nerd_face[] = "🤓";
+	inline constexpr const char sunglasses[] = "😎";
+	inline constexpr const char disguised_face[] = "🥸";
+	inline constexpr const char star_struck[] = "🤩";
+	inline constexpr const char partying_face[] = "🥳";
+	inline constexpr const char smirk[] = "😏";
+	inline constexpr const char smirking_face[] = "😏";
+	inline constexpr const char unamused[] = "😒";
+	inline constexpr const char unamused_face[] = "😒";
+	inline constexpr const char disappointed[] = "😞";
+	inline constexpr const char pensive[] = "😔";
+	inline constexpr const char pensive_face[] = "😔";
+	inline constexpr const char worried[] = "😟";
+	inline constexpr const char worried_face[] = "😟";
+	inline constexpr const char confused[] = "😕";
+	inline constexpr const char confused_face[] = "😕";
+	inline constexpr const char slight_frown[] = "🙁";
+	inline constexpr const char slightly_frowning_face[] = "🙁";
+	inline constexpr const char frowning2[] = "☹️";
+	inline constexpr const char white_frowning_face[] = "☹️";
+	inline constexpr const char frowning_face[] = "☹️";
+	inline constexpr const char persevere[] = "😣";
+	inline constexpr const char confounded[] = "😖";
+	inline constexpr const char tired_face[] = "😫";
+	inline constexpr const char weary[] = "😩";
+	inline constexpr const char weary_face[] = "😩";
+	inline constexpr const char pleading_face[] = "🥺";
+	inline constexpr const char cry[] = "😢";
+	inline constexpr const char crying_face[] = "😢";
+	inline constexpr const char sob[] = "😭";
+	inline constexpr const char triumph[] = "😤";
+	inline constexpr const char angry[] = "😠";
+	inline constexpr const char angry_face[] = "😠";
+	inline constexpr const char rage[] = "😡";
+	inline constexpr const char pouting_face[] = "😡";
+	inline constexpr const char face_with_symbols_over_mouth[] = "🤬";
+	inline constexpr const char exploding_head[] = "🤯";
+	inline constexpr const char flushed[] = "😳";
+	inline constexpr const char flushed_face[] = "😳";
+	inline constexpr const char hot_face[] = "🥵";
+	inline constexpr const char cold_face[] = "🥶";
+	inline constexpr const char face_in_clouds[] = "😶‍🌫️";
+	inline constexpr const char scream[] = "😱";
+	inline constexpr const char fearful[] = "😨";
+	inline constexpr const char fearful_face[] = "😨";
+	inline constexpr const char cold_sweat[] = "😰";
+	inline constexpr const char disappointed_relieved[] = "😥";
+	inline constexpr const char sweat[] = "😓";
+	inline constexpr const char hugging[] = "🤗";
+	inline constexpr const char hugging_face[] = "🤗";
+	inline constexpr const char thinking[] = "🤔";
+	inline constexpr const char thinking_face[] = "🤔";
+	inline constexpr const char face_with_peeking_eye[] = "🫣";
+	inline constexpr const char face_with_hand_over_mouth[] = "🤭";
+	inline constexpr const char face_with_open_eyes_and_hand_over_mouth[] = "🫢";
+	inline constexpr const char saluting_face[] = "🫡";
+	inline constexpr const char shushing_face[] = "🤫";
+	inline constexpr const char melting_face[] = "🫠";
+	inline constexpr const char lying_face[] = "🤥";
+	inline constexpr const char liar[] = "🤥";
+	inline constexpr const char no_mouth[] = "😶";
+	inline constexpr const char dotted_line_face[] = "🫥";
+	inline constexpr const char neutral_face[] = "😐";
+	inline constexpr const char face_with_diagonal_mouth[] = "🫤";
+	inline constexpr const char expressionless[] = "😑";
+	inline constexpr const char shaking_face[] = "🫨";
+	inline constexpr const char grimacing[] = "😬";
+	inline constexpr const char rolling_eyes[] = "🙄";
+	inline constexpr const char face_with_rolling_eyes[] = "🙄";
+	inline constexpr const char hushed[] = "😯";
+	inline constexpr const char hushed_face[] = "😯";
+	inline constexpr const char frowning[] = "😦";
+	inline constexpr const char anguished[] = "😧";
+	inline constexpr const char open_mouth[] = "😮";
+	inline constexpr const char astonished[] = "😲";
+	inline constexpr const char yawning_face[] = "🥱";
+	inline constexpr const char sleeping[] = "😴";
+	inline constexpr const char sleeping_face[] = "😴";
+	inline constexpr const char drooling_face[] = "🤤";
+	inline constexpr const char drool[] = "🤤";
+	inline constexpr const char sleepy[] = "😪";
+	inline constexpr const char sleepy_face[] = "😪";
+	inline constexpr const char face_exhaling[] = "😮‍💨";
+	inline constexpr const char dizzy_face[] = "😵";
+	inline constexpr const char face_with_spiral_eyes[] = "😵‍💫";
+	inline constexpr const char zipper_mouth[] = "🤐";
+	inline constexpr const char zipper_mouth_face[] = "🤐";
+	inline constexpr const char woozy_face[] = "🥴";
+	inline constexpr const char nauseated_face[] = "🤢";
+	inline constexpr const char sick[] = "🤢";
+	inline constexpr const char face_vomiting[] = "🤮";
+	inline constexpr const char sneezing_face[] = "🤧";
+	inline constexpr const char sneeze[] = "🤧";
+	inline constexpr const char mask[] = "😷";
+	inline constexpr const char thermometer_face[] = "🤒";
+	inline constexpr const char face_with_thermometer[] = "🤒";
+	inline constexpr const char head_bandage[] = "🤕";
+	inline constexpr const char face_with_head_bandage[] = "🤕";
+	inline constexpr const char money_mouth[] = "🤑";
+	inline constexpr const char money_mouth_face[] = "🤑";
+	inline constexpr const char cowboy[] = "🤠";
+	inline constexpr const char face_with_cowboy_hat[] = "🤠";
+	inline constexpr const char smiling_imp[] = "😈";
+	inline constexpr const char imp[] = "👿";
+	inline constexpr const char japanese_ogre[] = "👹";
+	inline constexpr const char ogre[] = "👹";
+	inline constexpr const char japanese_goblin[] = "👺";
+	inline constexpr const char goblin[] = "👺";
+	inline constexpr const char clown[] = "🤡";
+	inline constexpr const char clown_face[] = "🤡";
+	inline constexpr const char poop[] = "💩";
+	inline constexpr const char shit[] = "💩";
+	inline constexpr const char hankey[] = "💩";
+	inline constexpr const char poo[] = "💩";
+	inline constexpr const char pile_of_poo[] = "💩";
+	inline constexpr const char ghost[] = "👻";
+	inline constexpr const char skull[] = "💀";
+	inline constexpr const char skeleton[] = "💀";
+	inline constexpr const char skull_crossbones[] = "☠️";
+	inline constexpr const char skull_and_crossbones[] = "☠️";
+	inline constexpr const char alien[] = "👽";
+	inline constexpr const char space_invader[] = "👾";
+	inline constexpr const char alien_monster[] = "👾";
+	inline constexpr const char robot[] = "🤖";
+	inline constexpr const char robot_face[] = "🤖";
+	inline constexpr const char jack_o_lantern[] = "🎃";
+	inline constexpr const char smiley_cat[] = "😺";
+	inline constexpr const char grinning_cat[] = "😺";
+	inline constexpr const char smile_cat[] = "😸";
+	inline constexpr const char joy_cat[] = "😹";
+	inline constexpr const char heart_eyes_cat[] = "😻";
+	inline constexpr const char smirk_cat[] = "😼";
+	inline constexpr const char kissing_cat[] = "😽";
+	inline constexpr const char scream_cat[] = "🙀";
+	inline constexpr const char weary_cat[] = "🙀";
+	inline constexpr const char crying_cat_face[] = "😿";
+	inline constexpr const char crying_cat[] = "😿";
+	inline constexpr const char pouting_cat[] = "😾";
+	inline constexpr const char heart_hands[] = "🫶";
+	inline constexpr const char heart_hands_tone1[] = "🫶🏻";
+	inline constexpr const char heart_hands_light_skin_tone[] = "🫶🏻";
+	inline constexpr const char heart_hands_tone2[] = "🫶🏼";
+	inline constexpr const char heart_hands_medium_light_skin_tone[] = "🫶🏼";
+	inline constexpr const char heart_hands_tone3[] = "🫶🏽";
+	inline constexpr const char heart_hands_medium_skin_tone[] = "🫶🏽";
+	inline constexpr const char heart_hands_tone4[] = "🫶🏾";
+	inline constexpr const char heart_hands_medium_dark_skin_tone[] = "🫶🏾";
+	inline constexpr const char heart_hands_tone5[] = "🫶🏿";
+	inline constexpr const char heart_hands_dark_skin_tone[] = "🫶🏿";
+	inline constexpr const char palms_up_together[] = "🤲";
+	inline constexpr const char palms_up_together_tone1[] = "🤲🏻";
+	inline constexpr const char palms_up_together_light_skin_tone[] = "🤲🏻";
+	inline constexpr const char palms_up_together_tone2[] = "🤲🏼";
+	inline constexpr const char palms_up_together_medium_light_skin_tone[] = "🤲🏼";
+	inline constexpr const char palms_up_together_tone3[] = "🤲🏽";
+	inline constexpr const char palms_up_together_medium_skin_tone[] = "🤲🏽";
+	inline constexpr const char palms_up_together_tone4[] = "🤲🏾";
+	inline constexpr const char palms_up_together_medium_dark_skin_tone[] = "🤲🏾";
+	inline constexpr const char palms_up_together_tone5[] = "🤲🏿";
+	inline constexpr const char palms_up_together_dark_skin_tone[] = "🤲🏿";
+	inline constexpr const char open_hands[] = "👐";
+	inline constexpr const char open_hands_tone1[] = "👐🏻";
+	inline constexpr const char open_hands_tone2[] = "👐🏼";
+	inline constexpr const char open_hands_tone3[] = "👐🏽";
+	inline constexpr const char open_hands_tone4[] = "👐🏾";
+	inline constexpr const char open_hands_tone5[] = "👐🏿";
+	inline constexpr const char raised_hands[] = "🙌";
+	inline constexpr const char raising_hands[] = "🙌";
+	inline constexpr const char raised_hands_tone1[] = "🙌🏻";
+	inline constexpr const char raised_hands_tone2[] = "🙌🏼";
+	inline constexpr const char raised_hands_tone3[] = "🙌🏽";
+	inline constexpr const char raised_hands_tone4[] = "🙌🏾";
+	inline constexpr const char raised_hands_tone5[] = "🙌🏿";
+	inline constexpr const char clap[] = "👏";
+	inline constexpr const char clap_tone1[] = "👏🏻";
+	inline constexpr const char clap_tone2[] = "👏🏼";
+	inline constexpr const char clap_tone3[] = "👏🏽";
+	inline constexpr const char clap_tone4[] = "👏🏾";
+	inline constexpr const char clap_tone5[] = "👏🏿";
+	inline constexpr const char handshake[] = "🤝";
+	inline constexpr const char shaking_hands[] = "🤝";
+	inline constexpr const char handshake_tone1[] = "🤝🏻";
+	inline constexpr const char handshake_light_skin_tone[] = "🤝🏻";
+	inline constexpr const char handshake_tone1_tone2[] = "🫱🏻‍🫲🏼";
+	inline constexpr const char handshake_light_skin_tone_medium_light_skin_tone[] = "🫱🏻‍🫲🏼";
+	inline constexpr const char handshake_tone1_tone3[] = "🫱🏻‍🫲🏽";
+	inline constexpr const char handshake_light_skin_tone_medium_skin_tone[] = "🫱🏻‍🫲🏽";
+	inline constexpr const char handshake_tone1_tone4[] = "🫱🏻‍🫲🏾";
+	inline constexpr const char handshake_light_skin_tone_medium_dark_skin_tone[] = "🫱🏻‍🫲🏾";
+	inline constexpr const char handshake_tone1_tone5[] = "🫱🏻‍🫲🏿";
+	inline constexpr const char handshake_light_skin_tone_dark_skin_tone[] = "🫱🏻‍🫲🏿";
+	inline constexpr const char handshake_tone2_tone1[] = "🫱🏼‍🫲🏻";
+	inline constexpr const char handshake_medium_light_skin_tone_light_skin_tone[] = "🫱🏼‍🫲🏻";
+	inline constexpr const char handshake_tone2[] = "🤝🏼";
+	inline constexpr const char handshake_medium_light_skin_tone[] = "🤝🏼";
+	inline constexpr const char handshake_tone2_tone3[] = "🫱🏼‍🫲🏽";
+	inline constexpr const char handshake_medium_light_skin_tone_medium_skin_tone[] = "🫱🏼‍🫲🏽";
+	inline constexpr const char handshake_tone2_tone4[] = "🫱🏼‍🫲🏾";
+	inline constexpr const char handshake_medium_light_skin_tone_medium_dark_skin_tone[] = "🫱🏼‍🫲🏾";
+	inline constexpr const char handshake_tone2_tone5[] = "🫱🏼‍🫲🏿";
+	inline constexpr const char handshake_medium_light_skin_tone_dark_skin_tone[] = "🫱🏼‍🫲🏿";
+	inline constexpr const char handshake_tone3_tone1[] = "🫱🏽‍🫲🏻";
+	inline constexpr const char handshake_medium_skin_tone_light_skin_tone[] = "🫱🏽‍🫲🏻";
+	inline constexpr const char handshake_tone3_tone2[] = "🫱🏽‍🫲🏼";
+	inline constexpr const char handshake_medium_skin_tone_medium_light_skin_tone[] = "🫱🏽‍🫲🏼";
+	inline constexpr const char handshake_tone3[] = "🤝🏽";
+	inline constexpr const char handshake_medium_skin_tone[] = "🤝🏽";
+	inline constexpr const char handshake_tone3_tone4[] = "🫱🏽‍🫲🏾";
+	inline constexpr const char handshake_medium_skin_tone_medium_dark_skin_tone[] = "🫱🏽‍🫲🏾";
+	inline constexpr const char handshake_tone3_tone5[] = "🫱🏽‍🫲🏿";
+	inline constexpr const char handshake_medium_skin_tone_dark_skin_tone[] = "🫱🏽‍🫲🏿";
+	inline constexpr const char handshake_tone4_tone1[] = "🫱🏾‍🫲🏻";
+	inline constexpr const char handshake_medium_dark_skin_tone_light_skin_tone[] = "🫱🏾‍🫲🏻";
+	inline constexpr const char handshake_tone4_tone2[] = "🫱🏾‍🫲🏼";
+	inline constexpr const char handshake_medium_dark_skin_tone_medium_light_skin_tone[] = "🫱🏾‍🫲🏼";
+	inline constexpr const char handshake_tone4_tone3[] = "🫱🏾‍🫲🏽";
+	inline constexpr const char handshake_medium_dark_skin_tone_medium_skin_tone[] = "🫱🏾‍🫲🏽";
+	inline constexpr const char handshake_tone4[] = "🤝🏾";
+	inline constexpr const char handshake_medium_dark_skin_tone[] = "🤝🏾";
+	inline constexpr const char handshake_tone4_tone5[] = "🫱🏾‍🫲🏿";
+	inline constexpr const char handshake_medium_dark_skin_tone_dark_skin_tone[] = "🫱🏾‍🫲🏿";
+	inline constexpr const char handshake_tone5_tone1[] = "🫱🏿‍🫲🏻";
+	inline constexpr const char handshake_dark_skin_tone_light_skin_tone[] = "🫱🏿‍🫲🏻";
+	inline constexpr const char handshake_tone5_tone2[] = "🫱🏿‍🫲🏼";
+	inline constexpr const char handshake_dark_skin_tone_medium_light_skin_tone[] = "🫱🏿‍🫲🏼";
+	inline constexpr const char handshake_tone5_tone3[] = "🫱🏿‍🫲🏽";
+	inline constexpr const char handshake_dark_skin_tone_medium_skin_tone[] = "🫱🏿‍🫲🏽";
+	inline constexpr const char handshake_tone5_tone4[] = "🫱🏿‍🫲🏾";
+	inline constexpr const char handshake_dark_skin_tone_medium_dark_skin_tone[] = "🫱🏿‍🫲🏾";
+	inline constexpr const char handshake_tone5[] = "🤝🏿";
+	inline constexpr const char handshake_dark_skin_tone[] = "🤝🏿";
+	inline constexpr const char thumbsup[] = "👍";
+	inline constexpr const char plus1[] = "👍";
+	inline constexpr const char thumbup[] = "👍";
+	inline constexpr const char thumbs_up[] = "👍";
+	inline constexpr const char thumbsup_tone1[] = "👍🏻";
+	inline constexpr const char plus1_tone1[] = "👍🏻";
+	inline constexpr const char thumbup_tone1[] = "👍🏻";
+	inline constexpr const char thumbsup_tone2[] = "👍🏼";
+	inline constexpr const char plus1_tone2[] = "👍🏼";
+	inline constexpr const char thumbup_tone2[] = "👍🏼";
+	inline constexpr const char thumbsup_tone3[] = "👍🏽";
+	inline constexpr const char plus1_tone3[] = "👍🏽";
+	inline constexpr const char thumbup_tone3[] = "👍🏽";
+	inline constexpr const char thumbsup_tone4[] = "👍🏾";
+	inline constexpr const char plus1_tone4[] = "👍🏾";
+	inline constexpr const char thumbup_tone4[] = "👍🏾";
+	inline constexpr const char thumbsup_tone5[] = "👍🏿";
+	inline constexpr const char plus1_tone5[] = "👍🏿";
+	inline constexpr const char thumbup_tone5[] = "👍🏿";
+	inline constexpr const char thumbsdown[] = "👎";
+	inline constexpr const char minus1[] = "👎";
+	inline constexpr const char thumbdown[] = "👎";
+	inline constexpr const char thumbs_down[] = "👎";
+	inline constexpr const char thumbsdown_tone1[] = "👎🏻";
+	inline constexpr const char _1_tone1[] = "👎🏻";
+	inline constexpr const char thumbdown_tone1[] = "👎🏻";
+	inline constexpr const char thumbsdown_tone2[] = "👎🏼";
+	inline constexpr const char _1_tone2[] = "👎🏼";
+	inline constexpr const char thumbdown_tone2[] = "👎🏼";
+	inline constexpr const char thumbsdown_tone3[] = "👎🏽";
+	inline constexpr const char _1_tone3[] = "👎🏽";
+	inline constexpr const char thumbdown_tone3[] = "👎🏽";
+	inline constexpr const char thumbsdown_tone4[] = "👎🏾";
+	inline constexpr const char _1_tone4[] = "👎🏾";
+	inline constexpr const char thumbdown_tone4[] = "👎🏾";
+	inline constexpr const char thumbsdown_tone5[] = "👎🏿";
+	inline constexpr const char _1_tone5[] = "👎🏿";
+	inline constexpr const char thumbdown_tone5[] = "👎🏿";
+	inline constexpr const char punch[] = "👊";
+	inline constexpr const char oncoming_fist[] = "👊";
+	inline constexpr const char punch_tone1[] = "👊🏻";
+	inline constexpr const char punch_tone2[] = "👊🏼";
+	inline constexpr const char punch_tone3[] = "👊🏽";
+	inline constexpr const char punch_tone4[] = "👊🏾";
+	inline constexpr const char punch_tone5[] = "👊🏿";
+	inline constexpr const char fist[] = "✊";
+	inline constexpr const char raised_fist[] = "✊";
+	inline constexpr const char fist_tone1[] = "✊🏻";
+	inline constexpr const char fist_tone2[] = "✊🏼";
+	inline constexpr const char fist_tone3[] = "✊🏽";
+	inline constexpr const char fist_tone4[] = "✊🏾";
+	inline constexpr const char fist_tone5[] = "✊🏿";
+	inline constexpr const char left_facing_fist[] = "🤛";
+	inline constexpr const char left_fist[] = "🤛";
+	inline constexpr const char left_facing_fist_tone1[] = "🤛🏻";
+	inline constexpr const char left_fist_tone1[] = "🤛🏻";
+	inline constexpr const char left_facing_fist_tone2[] = "🤛🏼";
+	inline constexpr const char left_fist_tone2[] = "🤛🏼";
+	inline constexpr const char left_facing_fist_tone3[] = "🤛🏽";
+	inline constexpr const char left_fist_tone3[] = "🤛🏽";
+	inline constexpr const char left_facing_fist_tone4[] = "🤛🏾";
+	inline constexpr const char left_fist_tone4[] = "🤛🏾";
+	inline constexpr const char left_facing_fist_tone5[] = "🤛🏿";
+	inline constexpr const char left_fist_tone5[] = "🤛🏿";
+	inline constexpr const char right_facing_fist[] = "🤜";
+	inline constexpr const char right_fist[] = "🤜";
+	inline constexpr const char right_facing_fist_tone1[] = "🤜🏻";
+	inline constexpr const char right_fist_tone1[] = "🤜🏻";
+	inline constexpr const char right_facing_fist_tone2[] = "🤜🏼";
+	inline constexpr const char right_fist_tone2[] = "🤜🏼";
+	inline constexpr const char right_facing_fist_tone3[] = "🤜🏽";
+	inline constexpr const char right_fist_tone3[] = "🤜🏽";
+	inline constexpr const char right_facing_fist_tone4[] = "🤜🏾";
+	inline constexpr const char right_fist_tone4[] = "🤜🏾";
+	inline constexpr const char right_facing_fist_tone5[] = "🤜🏿";
+	inline constexpr const char right_fist_tone5[] = "🤜🏿";
+	inline constexpr const char leftwards_pushing_hand[] = "🫷";
+	inline constexpr const char leftwards_pushing_hand_tone1[] = "🫷🏻";
+	inline constexpr const char leftwards_pushing_hand_light_skin_tone[] = "🫷🏻";
+	inline constexpr const char leftwards_pushing_hand_tone2[] = "🫷🏼";
+	inline constexpr const char leftwards_pushing_hand_medium_light_skin_tone[] = "🫷🏼";
+	inline constexpr const char leftwards_pushing_hand_tone3[] = "🫷🏽";
+	inline constexpr const char leftwards_pushing_hand_medium_skin_tone[] = "🫷🏽";
+	inline constexpr const char leftwards_pushing_hand_tone4[] = "🫷🏾";
+	inline constexpr const char leftwards_pushing_hand_medium_dark_skin_tone[] = "🫷🏾";
+	inline constexpr const char leftwards_pushing_hand_tone5[] = "🫷🏿";
+	inline constexpr const char leftwards_pushing_hand_dark_skin_tone[] = "🫷🏿";
+	inline constexpr const char rightwards_pushing_hand[] = "🫸";
+	inline constexpr const char rightwards_pushing_hand_tone1[] = "🫸🏻";
+	inline constexpr const char rightwards_pushing_hand_light_skin_tone[] = "🫸🏻";
+	inline constexpr const char rightwards_pushing_hand_tone2[] = "🫸🏼";
+	inline constexpr const char rightwards_pushing_hand_medium_light_skin_tone[] = "🫸🏼";
+	inline constexpr const char rightwards_pushing_hand_tone3[] = "🫸🏽";
+	inline constexpr const char rightwards_pushing_hand_medium_skin_tone[] = "🫸🏽";
+	inline constexpr const char rightwards_pushing_hand_tone4[] = "🫸🏾";
+	inline constexpr const char rightwards_pushing_hand_medium_dark_skin_tone[] = "🫸🏾";
+	inline constexpr const char rightwards_pushing_hand_tone5[] = "🫸🏿";
+	inline constexpr const char rightwards_pushing_hand_dark_skin_tone[] = "🫸🏿";
+	inline constexpr const char fingers_crossed[] = "🤞";
+	inline constexpr const char hand_with_index_and_middle_finger_crossed[] = "🤞";
+	inline constexpr const char fingers_crossed_tone1[] = "🤞🏻";
+	inline constexpr const char hand_with_index_and_middle_fingers_crossed_tone1[] = "🤞🏻";
+	inline constexpr const char fingers_crossed_tone2[] = "🤞🏼";
+	inline constexpr const char hand_with_index_and_middle_fingers_crossed_tone2[] = "🤞🏼";
+	inline constexpr const char fingers_crossed_tone3[] = "🤞🏽";
+	inline constexpr const char hand_with_index_and_middle_fingers_crossed_tone3[] = "🤞🏽";
+	inline constexpr const char fingers_crossed_tone4[] = "🤞🏾";
+	inline constexpr const char hand_with_index_and_middle_fingers_crossed_tone4[] = "🤞🏾";
+	inline constexpr const char fingers_crossed_tone5[] = "🤞🏿";
+	inline constexpr const char hand_with_index_and_middle_fingers_crossed_tone5[] = "🤞🏿";
+	inline constexpr const char v[] = "✌️";
+	inline constexpr const char victory_hand[] = "✌️";
+	inline constexpr const char v_tone1[] = "✌🏻";
+	inline constexpr const char v_tone2[] = "✌🏼";
+	inline constexpr const char v_tone3[] = "✌🏽";
+	inline constexpr const char v_tone4[] = "✌🏾";
+	inline constexpr const char v_tone5[] = "✌🏿";
+	inline constexpr const char hand_with_index_finger_and_thumb_crossed[] = "🫰";
+	inline constexpr const char hand_with_index_finger_and_thumb_crossed_tone1[] = "🫰🏻";
+	inline constexpr const char hand_with_index_finger_and_thumb_crossed_light_skin_tone[] = "🫰🏻";
+	inline constexpr const char hand_with_index_finger_and_thumb_crossed_tone2[] = "🫰🏼";
+	inline constexpr const char hand_with_index_finger_and_thumb_crossed_medium_light_skin_tone[] = "🫰🏼";
+	inline constexpr const char hand_with_index_finger_and_thumb_crossed_tone3[] = "🫰🏽";
+	inline constexpr const char hand_with_index_finger_and_thumb_crossed_medium_skin_tone[] = "🫰🏽";
+	inline constexpr const char hand_with_index_finger_and_thumb_crossed_tone4[] = "🫰🏾";
+	inline constexpr const char hand_with_index_finger_and_thumb_crossed_medium_dark_skin_tone[] = "🫰🏾";
+	inline constexpr const char hand_with_index_finger_and_thumb_crossed_tone5[] = "🫰🏿";
+	inline constexpr const char hand_with_index_finger_and_thumb_crossed_dark_skin_tone[] = "🫰🏿";
+	inline constexpr const char love_you_gesture[] = "🤟";
+	inline constexpr const char love_you_gesture_tone1[] = "🤟🏻";
+	inline constexpr const char love_you_gesture_light_skin_tone[] = "🤟🏻";
+	inline constexpr const char love_you_gesture_tone2[] = "🤟🏼";
+	inline constexpr const char love_you_gesture_medium_light_skin_tone[] = "🤟🏼";
+	inline constexpr const char love_you_gesture_tone3[] = "🤟🏽";
+	inline constexpr const char love_you_gesture_medium_skin_tone[] = "🤟🏽";
+	inline constexpr const char love_you_gesture_tone4[] = "🤟🏾";
+	inline constexpr const char love_you_gesture_medium_dark_skin_tone[] = "🤟🏾";
+	inline constexpr const char love_you_gesture_tone5[] = "🤟🏿";
+	inline constexpr const char love_you_gesture_dark_skin_tone[] = "🤟🏿";
+	inline constexpr const char metal[] = "🤘";
+	inline constexpr const char sign_of_the_horns[] = "🤘";
+	inline constexpr const char metal_tone1[] = "🤘🏻";
+	inline constexpr const char sign_of_the_horns_tone1[] = "🤘🏻";
+	inline constexpr const char metal_tone2[] = "🤘🏼";
+	inline constexpr const char sign_of_the_horns_tone2[] = "🤘🏼";
+	inline constexpr const char metal_tone3[] = "🤘🏽";
+	inline constexpr const char sign_of_the_horns_tone3[] = "🤘🏽";
+	inline constexpr const char metal_tone4[] = "🤘🏾";
+	inline constexpr const char sign_of_the_horns_tone4[] = "🤘🏾";
+	inline constexpr const char metal_tone5[] = "🤘🏿";
+	inline constexpr const char sign_of_the_horns_tone5[] = "🤘🏿";
+	inline constexpr const char ok_hand[] = "👌";
+	inline constexpr const char ok_hand_tone1[] = "👌🏻";
+	inline constexpr const char ok_hand_tone2[] = "👌🏼";
+	inline constexpr const char ok_hand_tone3[] = "👌🏽";
+	inline constexpr const char ok_hand_tone4[] = "👌🏾";
+	inline constexpr const char ok_hand_tone5[] = "👌🏿";
+	inline constexpr const char pinched_fingers[] = "🤌";
+	inline constexpr const char pinched_fingers_tone2[] = "🤌🏼";
+	inline constexpr const char pinched_fingers_medium_light_skin_tone[] = "🤌🏼";
+	inline constexpr const char pinched_fingers_tone1[] = "🤌🏻";
+	inline constexpr const char pinched_fingers_light_skin_tone[] = "🤌🏻";
+	inline constexpr const char pinched_fingers_tone3[] = "🤌🏽";
+	inline constexpr const char pinched_fingers_medium_skin_tone[] = "🤌🏽";
+	inline constexpr const char pinched_fingers_tone4[] = "🤌🏾";
+	inline constexpr const char pinched_fingers_medium_dark_skin_tone[] = "🤌🏾";
+	inline constexpr const char pinched_fingers_tone5[] = "🤌🏿";
+	inline constexpr const char pinched_fingers_dark_skin_tone[] = "🤌🏿";
+	inline constexpr const char pinching_hand[] = "🤏";
+	inline constexpr const char pinching_hand_tone1[] = "🤏🏻";
+	inline constexpr const char pinching_hand_light_skin_tone[] = "🤏🏻";
+	inline constexpr const char pinching_hand_tone2[] = "🤏🏼";
+	inline constexpr const char pinching_hand_medium_light_skin_tone[] = "🤏🏼";
+	inline constexpr const char pinching_hand_tone3[] = "🤏🏽";
+	inline constexpr const char pinching_hand_medium_skin_tone[] = "🤏🏽";
+	inline constexpr const char pinching_hand_tone4[] = "🤏🏾";
+	inline constexpr const char pinching_hand_medium_dark_skin_tone[] = "🤏🏾";
+	inline constexpr const char pinching_hand_tone5[] = "🤏🏿";
+	inline constexpr const char pinching_hand_dark_skin_tone[] = "🤏🏿";
+	inline constexpr const char palm_down_hand[] = "🫳";
+	inline constexpr const char palm_down_hand_tone1[] = "🫳🏻";
+	inline constexpr const char palm_down_hand_light_skin_tone[] = "🫳🏻";
+	inline constexpr const char palm_down_hand_tone2[] = "🫳🏼";
+	inline constexpr const char palm_down_hand_medium_light_skin_tone[] = "🫳🏼";
+	inline constexpr const char palm_down_hand_tone3[] = "🫳🏽";
+	inline constexpr const char palm_down_hand_medium_skin_tone[] = "🫳🏽";
+	inline constexpr const char palm_down_hand_tone4[] = "🫳🏾";
+	inline constexpr const char palm_down_hand_medium_dark_skin_tone[] = "🫳🏾";
+	inline constexpr const char palm_down_hand_tone5[] = "🫳🏿";
+	inline constexpr const char palm_down_hand_dark_skin_tone[] = "🫳🏿";
+	inline constexpr const char palm_up_hand[] = "🫴";
+	inline constexpr const char palm_up_hand_tone1[] = "🫴🏻";
+	inline constexpr const char palm_up_hand_light_skin_tone[] = "🫴🏻";
+	inline constexpr const char palm_up_hand_tone2[] = "🫴🏼";
+	inline constexpr const char palm_up_hand_medium_light_skin_tone[] = "🫴🏼";
+	inline constexpr const char palm_up_hand_tone3[] = "🫴🏽";
+	inline constexpr const char palm_up_hand_medium_skin_tone[] = "🫴🏽";
+	inline constexpr const char palm_up_hand_tone4[] = "🫴🏾";
+	inline constexpr const char palm_up_hand_medium_dark_skin_tone[] = "🫴🏾";
+	inline constexpr const char palm_up_hand_tone5[] = "🫴🏿";
+	inline constexpr const char palm_up_hand_dark_skin_tone[] = "🫴🏿";
+	inline constexpr const char point_left[] = "👈";
+	inline constexpr const char point_left_tone1[] = "👈🏻";
+	inline constexpr const char point_left_tone2[] = "👈🏼";
+	inline constexpr const char point_left_tone3[] = "👈🏽";
+	inline constexpr const char point_left_tone4[] = "👈🏾";
+	inline constexpr const char point_left_tone5[] = "👈🏿";
+	inline constexpr const char point_right[] = "👉";
+	inline constexpr const char point_right_tone1[] = "👉🏻";
+	inline constexpr const char point_right_tone2[] = "👉🏼";
+	inline constexpr const char point_right_tone3[] = "👉🏽";
+	inline constexpr const char point_right_tone4[] = "👉🏾";
+	inline constexpr const char point_right_tone5[] = "👉🏿";
+	inline constexpr const char point_up_2[] = "👆";
+	inline constexpr const char point_up_2_tone1[] = "👆🏻";
+	inline constexpr const char point_up_2_tone2[] = "👆🏼";
+	inline constexpr const char point_up_2_tone3[] = "👆🏽";
+	inline constexpr const char point_up_2_tone4[] = "👆🏾";
+	inline constexpr const char point_up_2_tone5[] = "👆🏿";
+	inline constexpr const char point_down[] = "👇";
+	inline constexpr const char point_down_tone1[] = "👇🏻";
+	inline constexpr const char point_down_tone2[] = "👇🏼";
+	inline constexpr const char point_down_tone3[] = "👇🏽";
+	inline constexpr const char point_down_tone4[] = "👇🏾";
+	inline constexpr const char point_down_tone5[] = "👇🏿";
+	inline constexpr const char point_up[] = "☝️";
+	inline constexpr const char point_up_tone1[] = "☝🏻";
+	inline constexpr const char point_up_tone2[] = "☝🏼";
+	inline constexpr const char point_up_tone3[] = "☝🏽";
+	inline constexpr const char point_up_tone4[] = "☝🏾";
+	inline constexpr const char point_up_tone5[] = "☝🏿";
+	inline constexpr const char raised_hand[] = "✋";
+	inline constexpr const char raised_hand_tone1[] = "✋🏻";
+	inline constexpr const char raised_hand_tone2[] = "✋🏼";
+	inline constexpr const char raised_hand_tone3[] = "✋🏽";
+	inline constexpr const char raised_hand_tone4[] = "✋🏾";
+	inline constexpr const char raised_hand_tone5[] = "✋🏿";
+	inline constexpr const char raised_back_of_hand[] = "🤚";
+	inline constexpr const char back_of_hand[] = "🤚";
+	inline constexpr const char raised_back_of_hand_tone1[] = "🤚🏻";
+	inline constexpr const char back_of_hand_tone1[] = "🤚🏻";
+	inline constexpr const char raised_back_of_hand_tone2[] = "🤚🏼";
+	inline constexpr const char back_of_hand_tone2[] = "🤚🏼";
+	inline constexpr const char raised_back_of_hand_tone3[] = "🤚🏽";
+	inline constexpr const char back_of_hand_tone3[] = "🤚🏽";
+	inline constexpr const char raised_back_of_hand_tone4[] = "🤚🏾";
+	inline constexpr const char back_of_hand_tone4[] = "🤚🏾";
+	inline constexpr const char raised_back_of_hand_tone5[] = "🤚🏿";
+	inline constexpr const char back_of_hand_tone5[] = "🤚🏿";
+	inline constexpr const char hand_splayed[] = "🖐️";
+	inline constexpr const char raised_hand_with_fingers_splayed[] = "🖐️";
+	inline constexpr const char hand_splayed_tone1[] = "🖐🏻";
+	inline constexpr const char raised_hand_with_fingers_splayed_tone1[] = "🖐🏻";
+	inline constexpr const char hand_splayed_tone2[] = "🖐🏼";
+	inline constexpr const char raised_hand_with_fingers_splayed_tone2[] = "🖐🏼";
+	inline constexpr const char hand_splayed_tone3[] = "🖐🏽";
+	inline constexpr const char raised_hand_with_fingers_splayed_tone3[] = "🖐🏽";
+	inline constexpr const char hand_splayed_tone4[] = "🖐🏾";
+	inline constexpr const char raised_hand_with_fingers_splayed_tone4[] = "🖐🏾";
+	inline constexpr const char hand_splayed_tone5[] = "🖐🏿";
+	inline constexpr const char raised_hand_with_fingers_splayed_tone5[] = "🖐🏿";
+	inline constexpr const char vulcan[] = "🖖";
+	inline constexpr const char raised_hand_with_part_between_middle_and_ring_fingers[] = "🖖";
+	inline constexpr const char vulcan_salute[] = "🖖";
+	inline constexpr const char vulcan_tone1[] = "🖖🏻";
+	inline constexpr const char raised_hand_with_part_between_middle_and_ring_fingers_tone1[] = "🖖🏻";
+	inline constexpr const char vulcan_tone2[] = "🖖🏼";
+	inline constexpr const char raised_hand_with_part_between_middle_and_ring_fingers_tone2[] = "🖖🏼";
+	inline constexpr const char vulcan_tone3[] = "🖖🏽";
+	inline constexpr const char raised_hand_with_part_between_middle_and_ring_fingers_tone3[] = "🖖🏽";
+	inline constexpr const char vulcan_tone4[] = "🖖🏾";
+	inline constexpr const char raised_hand_with_part_between_middle_and_ring_fingers_tone4[] = "🖖🏾";
+	inline constexpr const char vulcan_tone5[] = "🖖🏿";
+	inline constexpr const char raised_hand_with_part_between_middle_and_ring_fingers_tone5[] = "🖖🏿";
+	inline constexpr const char wave[] = "👋";
+	inline constexpr const char waving_hand[] = "👋";
+	inline constexpr const char wave_tone1[] = "👋🏻";
+	inline constexpr const char wave_tone2[] = "👋🏼";
+	inline constexpr const char wave_tone3[] = "👋🏽";
+	inline constexpr const char wave_tone4[] = "👋🏾";
+	inline constexpr const char wave_tone5[] = "👋🏿";
+	inline constexpr const char call_me[] = "🤙";
+	inline constexpr const char call_me_hand[] = "🤙";
+	inline constexpr const char call_me_tone1[] = "🤙🏻";
+	inline constexpr const char call_me_hand_tone1[] = "🤙🏻";
+	inline constexpr const char call_me_tone2[] = "🤙🏼";
+	inline constexpr const char call_me_hand_tone2[] = "🤙🏼";
+	inline constexpr const char call_me_tone3[] = "🤙🏽";
+	inline constexpr const char call_me_hand_tone3[] = "🤙🏽";
+	inline constexpr const char call_me_tone4[] = "🤙🏾";
+	inline constexpr const char call_me_hand_tone4[] = "🤙🏾";
+	inline constexpr const char call_me_tone5[] = "🤙🏿";
+	inline constexpr const char call_me_hand_tone5[] = "🤙🏿";
+	inline constexpr const char leftwards_hand[] = "🫲";
+	inline constexpr const char leftwards_hand_tone1[] = "🫲🏻";
+	inline constexpr const char leftwards_hand_light_skin_tone[] = "🫲🏻";
+	inline constexpr const char leftwards_hand_tone2[] = "🫲🏼";
+	inline constexpr const char leftwards_hand_medium_light_skin_tone[] = "🫲🏼";
+	inline constexpr const char leftwards_hand_tone3[] = "🫲🏽";
+	inline constexpr const char leftwards_hand_medium_skin_tone[] = "🫲🏽";
+	inline constexpr const char leftwards_hand_tone4[] = "🫲🏾";
+	inline constexpr const char leftwards_hand_medium_dark_skin_tone[] = "🫲🏾";
+	inline constexpr const char leftwards_hand_tone5[] = "🫲🏿";
+	inline constexpr const char leftwards_hand_dark_skin_tone[] = "🫲🏿";
+	inline constexpr const char rightwards_hand[] = "🫱";
+	inline constexpr const char rightwards_hand_tone1[] = "🫱🏻";
+	inline constexpr const char rightwards_hand_light_skin_tone[] = "🫱🏻";
+	inline constexpr const char rightwards_hand_tone2[] = "🫱🏼";
+	inline constexpr const char rightwards_hand_medium_light_skin_tone[] = "🫱🏼";
+	inline constexpr const char rightwards_hand_tone3[] = "🫱🏽";
+	inline constexpr const char rightwards_hand_medium_skin_tone[] = "🫱🏽";
+	inline constexpr const char rightwards_hand_tone4[] = "🫱🏾";
+	inline constexpr const char rightwards_hand_medium_dark_skin_tone[] = "🫱🏾";
+	inline constexpr const char rightwards_hand_tone5[] = "🫱🏿";
+	inline constexpr const char rightwards_hand_dark_skin_tone[] = "🫱🏿";
+	inline constexpr const char muscle[] = "💪";
+	inline constexpr const char flexed_biceps[] = "💪";
+	inline constexpr const char muscle_tone1[] = "💪🏻";
+	inline constexpr const char muscle_tone2[] = "💪🏼";
+	inline constexpr const char muscle_tone3[] = "💪🏽";
+	inline constexpr const char muscle_tone4[] = "💪🏾";
+	inline constexpr const char muscle_tone5[] = "💪🏿";
+	inline constexpr const char mechanical_arm[] = "🦾";
+	inline constexpr const char middle_finger[] = "🖕";
+	inline constexpr const char reversed_hand_with_middle_finger_extended[] = "🖕";
+	inline constexpr const char middle_finger_tone1[] = "🖕🏻";
+	inline constexpr const char reversed_hand_with_middle_finger_extended_tone1[] = "🖕🏻";
+	inline constexpr const char middle_finger_tone2[] = "🖕🏼";
+	inline constexpr const char reversed_hand_with_middle_finger_extended_tone2[] = "🖕🏼";
+	inline constexpr const char middle_finger_tone3[] = "🖕🏽";
+	inline constexpr const char reversed_hand_with_middle_finger_extended_tone3[] = "🖕🏽";
+	inline constexpr const char middle_finger_tone4[] = "🖕🏾";
+	inline constexpr const char reversed_hand_with_middle_finger_extended_tone4[] = "🖕🏾";
+	inline constexpr const char middle_finger_tone5[] = "🖕🏿";
+	inline constexpr const char reversed_hand_with_middle_finger_extended_tone5[] = "🖕🏿";
+	inline constexpr const char writing_hand[] = "✍️";
+	inline constexpr const char writing_hand_tone1[] = "✍🏻";
+	inline constexpr const char writing_hand_tone2[] = "✍🏼";
+	inline constexpr const char writing_hand_tone3[] = "✍🏽";
+	inline constexpr const char writing_hand_tone4[] = "✍🏾";
+	inline constexpr const char writing_hand_tone5[] = "✍🏿";
+	inline constexpr const char pray[] = "🙏";
+	inline constexpr const char folded_hands[] = "🙏";
+	inline constexpr const char pray_tone1[] = "🙏🏻";
+	inline constexpr const char pray_tone2[] = "🙏🏼";
+	inline constexpr const char pray_tone3[] = "🙏🏽";
+	inline constexpr const char pray_tone4[] = "🙏🏾";
+	inline constexpr const char pray_tone5[] = "🙏🏿";
+	inline constexpr const char index_pointing_at_the_viewer[] = "🫵";
+	inline constexpr const char index_pointing_at_the_viewer_tone1[] = "🫵🏻";
+	inline constexpr const char index_pointing_at_the_viewer_light_skin_tone[] = "🫵🏻";
+	inline constexpr const char index_pointing_at_the_viewer_tone2[] = "🫵🏼";
+	inline constexpr const char index_pointing_at_the_viewer_medium_light_skin_tone[] = "🫵🏼";
+	inline constexpr const char index_pointing_at_the_viewer_tone3[] = "🫵🏽";
+	inline constexpr const char index_pointing_at_the_viewer_medium_skin_tone[] = "🫵🏽";
+	inline constexpr const char index_pointing_at_the_viewer_tone4[] = "🫵🏾";
+	inline constexpr const char index_pointing_at_the_viewer_medium_dark_skin_tone[] = "🫵🏾";
+	inline constexpr const char index_pointing_at_the_viewer_tone5[] = "🫵🏿";
+	inline constexpr const char index_pointing_at_the_viewer_dark_skin_tone[] = "🫵🏿";
+	inline constexpr const char foot[] = "🦶";
+	inline constexpr const char foot_tone1[] = "🦶🏻";
+	inline constexpr const char foot_light_skin_tone[] = "🦶🏻";
+	inline constexpr const char foot_tone2[] = "🦶🏼";
+	inline constexpr const char foot_medium_light_skin_tone[] = "🦶🏼";
+	inline constexpr const char foot_tone3[] = "🦶🏽";
+	inline constexpr const char foot_medium_skin_tone[] = "🦶🏽";
+	inline constexpr const char foot_tone4[] = "🦶🏾";
+	inline constexpr const char foot_medium_dark_skin_tone[] = "🦶🏾";
+	inline constexpr const char foot_tone5[] = "🦶🏿";
+	inline constexpr const char foot_dark_skin_tone[] = "🦶🏿";
+	inline constexpr const char leg[] = "🦵";
+	inline constexpr const char leg_tone1[] = "🦵🏻";
+	inline constexpr const char leg_light_skin_tone[] = "🦵🏻";
+	inline constexpr const char leg_tone2[] = "🦵🏼";
+	inline constexpr const char leg_medium_light_skin_tone[] = "🦵🏼";
+	inline constexpr const char leg_tone3[] = "🦵🏽";
+	inline constexpr const char leg_medium_skin_tone[] = "🦵🏽";
+	inline constexpr const char leg_tone4[] = "🦵🏾";
+	inline constexpr const char leg_medium_dark_skin_tone[] = "🦵🏾";
+	inline constexpr const char leg_tone5[] = "🦵🏿";
+	inline constexpr const char leg_dark_skin_tone[] = "🦵🏿";
+	inline constexpr const char mechanical_leg[] = "🦿";
+	inline constexpr const char lipstick[] = "💄";
+	inline constexpr const char kiss[] = "💋";
+	inline constexpr const char kiss_mark[] = "💋";
+	inline constexpr const char lips[] = "👄";
+	inline constexpr const char mouth[] = "👄";
+	inline constexpr const char biting_lip[] = "🫦";
+	inline constexpr const char tooth[] = "🦷";
+	inline constexpr const char tongue[] = "👅";
+	inline constexpr const char ear[] = "👂";
+	inline constexpr const char ear_tone1[] = "👂🏻";
+	inline constexpr const char ear_tone2[] = "👂🏼";
+	inline constexpr const char ear_tone3[] = "👂🏽";
+	inline constexpr const char ear_tone4[] = "👂🏾";
+	inline constexpr const char ear_tone5[] = "👂🏿";
+	inline constexpr const char ear_with_hearing_aid[] = "🦻";
+	inline constexpr const char ear_with_hearing_aid_tone1[] = "🦻🏻";
+	inline constexpr const char ear_with_hearing_aid_light_skin_tone[] = "🦻🏻";
+	inline constexpr const char ear_with_hearing_aid_tone2[] = "🦻🏼";
+	inline constexpr const char ear_with_hearing_aid_medium_light_skin_tone[] = "🦻🏼";
+	inline constexpr const char ear_with_hearing_aid_tone3[] = "🦻🏽";
+	inline constexpr const char ear_with_hearing_aid_medium_skin_tone[] = "🦻🏽";
+	inline constexpr const char ear_with_hearing_aid_tone4[] = "🦻🏾";
+	inline constexpr const char ear_with_hearing_aid_medium_dark_skin_tone[] = "🦻🏾";
+	inline constexpr const char ear_with_hearing_aid_tone5[] = "🦻🏿";
+	inline constexpr const char ear_with_hearing_aid_dark_skin_tone[] = "🦻🏿";
+	inline constexpr const char nose[] = "👃";
+	inline constexpr const char nose_tone1[] = "👃🏻";
+	inline constexpr const char nose_tone2[] = "👃🏼";
+	inline constexpr const char nose_tone3[] = "👃🏽";
+	inline constexpr const char nose_tone4[] = "👃🏾";
+	inline constexpr const char nose_tone5[] = "👃🏿";
+	inline constexpr const char footprints[] = "👣";
+	inline constexpr const char eye[] = "👁️";
+	inline constexpr const char eyes[] = "👀";
+	inline constexpr const char anatomical_heart[] = "🫀";
+	inline constexpr const char lungs[] = "🫁";
+	inline constexpr const char brain[] = "🧠";
+	inline constexpr const char speaking_head[] = "🗣️";
+	inline constexpr const char speaking_head_in_silhouette[] = "🗣️";
+	inline constexpr const char bust_in_silhouette[] = "👤";
+	inline constexpr const char busts_in_silhouette[] = "👥";
+	inline constexpr const char people_hugging[] = "🫂";
+	inline constexpr const char baby[] = "👶";
+	inline constexpr const char baby_tone1[] = "👶🏻";
+	inline constexpr const char baby_tone2[] = "👶🏼";
+	inline constexpr const char baby_tone3[] = "👶🏽";
+	inline constexpr const char baby_tone4[] = "👶🏾";
+	inline constexpr const char baby_tone5[] = "👶🏿";
+	inline constexpr const char child[] = "🧒";
+	inline constexpr const char child_tone1[] = "🧒🏻";
+	inline constexpr const char child_light_skin_tone[] = "🧒🏻";
+	inline constexpr const char child_tone2[] = "🧒🏼";
+	inline constexpr const char child_medium_light_skin_tone[] = "🧒🏼";
+	inline constexpr const char child_tone3[] = "🧒🏽";
+	inline constexpr const char child_medium_skin_tone[] = "🧒🏽";
+	inline constexpr const char child_tone4[] = "🧒🏾";
+	inline constexpr const char child_medium_dark_skin_tone[] = "🧒🏾";
+	inline constexpr const char child_tone5[] = "🧒🏿";
+	inline constexpr const char child_dark_skin_tone[] = "🧒🏿";
+	inline constexpr const char girl[] = "👧";
+	inline constexpr const char girl_tone1[] = "👧🏻";
+	inline constexpr const char girl_tone2[] = "👧🏼";
+	inline constexpr const char girl_tone3[] = "👧🏽";
+	inline constexpr const char girl_tone4[] = "👧🏾";
+	inline constexpr const char girl_tone5[] = "👧🏿";
+	inline constexpr const char boy[] = "👦";
+	inline constexpr const char boy_tone1[] = "👦🏻";
+	inline constexpr const char boy_tone2[] = "👦🏼";
+	inline constexpr const char boy_tone3[] = "👦🏽";
+	inline constexpr const char boy_tone4[] = "👦🏾";
+	inline constexpr const char boy_tone5[] = "👦🏿";
+	inline constexpr const char adult[] = "🧑";
+	inline constexpr const char person[] = "🧑";
+	inline constexpr const char adult_tone1[] = "🧑🏻";
+	inline constexpr const char adult_light_skin_tone[] = "🧑🏻";
+	inline constexpr const char adult_tone2[] = "🧑🏼";
+	inline constexpr const char adult_medium_light_skin_tone[] = "🧑🏼";
+	inline constexpr const char adult_tone3[] = "🧑🏽";
+	inline constexpr const char adult_medium_skin_tone[] = "🧑🏽";
+	inline constexpr const char adult_tone4[] = "🧑🏾";
+	inline constexpr const char adult_medium_dark_skin_tone[] = "🧑🏾";
+	inline constexpr const char adult_tone5[] = "🧑🏿";
+	inline constexpr const char adult_dark_skin_tone[] = "🧑🏿";
+	inline constexpr const char woman[] = "👩";
+	inline constexpr const char woman_tone1[] = "👩🏻";
+	inline constexpr const char woman_tone2[] = "👩🏼";
+	inline constexpr const char woman_tone3[] = "👩🏽";
+	inline constexpr const char woman_tone4[] = "👩🏾";
+	inline constexpr const char woman_tone5[] = "👩🏿";
+	inline constexpr const char man[] = "👨";
+	inline constexpr const char man_tone1[] = "👨🏻";
+	inline constexpr const char man_tone2[] = "👨🏼";
+	inline constexpr const char man_tone3[] = "👨🏽";
+	inline constexpr const char man_tone4[] = "👨🏾";
+	inline constexpr const char man_tone5[] = "👨🏿";
+	inline constexpr const char person_curly_hair[] = "🧑‍🦱";
+	inline constexpr const char person_tone1_curly_hair[] = "🧑🏻‍🦱";
+	inline constexpr const char person_light_skin_tone_curly_hair[] = "🧑🏻‍🦱";
+	inline constexpr const char person_tone2_curly_hair[] = "🧑🏼‍🦱";
+	inline constexpr const char person_medium_light_skin_tone_curly_hair[] = "🧑🏼‍🦱";
+	inline constexpr const char person_tone3_curly_hair[] = "🧑🏽‍🦱";
+	inline constexpr const char person_medium_skin_tone_curly_hair[] = "🧑🏽‍🦱";
+	inline constexpr const char person_tone4_curly_hair[] = "🧑🏾‍🦱";
+	inline constexpr const char person_medium_dark_skin_tone_curly_hair[] = "🧑🏾‍🦱";
+	inline constexpr const char person_tone5_curly_hair[] = "🧑🏿‍🦱";
+	inline constexpr const char person_dark_skin_tone_curly_hair[] = "🧑🏿‍🦱";
+	inline constexpr const char woman_curly_haired[] = "👩‍🦱";
+	inline constexpr const char woman_curly_haired_tone1[] = "👩🏻‍🦱";
+	inline constexpr const char woman_curly_haired_light_skin_tone[] = "👩🏻‍🦱";
+	inline constexpr const char woman_curly_haired_tone2[] = "👩🏼‍🦱";
+	inline constexpr const char woman_curly_haired_medium_light_skin_tone[] = "👩🏼‍🦱";
+	inline constexpr const char woman_curly_haired_tone3[] = "👩🏽‍🦱";
+	inline constexpr const char woman_curly_haired_medium_skin_tone[] = "👩🏽‍🦱";
+	inline constexpr const char woman_curly_haired_tone4[] = "👩🏾‍🦱";
+	inline constexpr const char woman_curly_haired_medium_dark_skin_tone[] = "👩🏾‍🦱";
+	inline constexpr const char woman_curly_haired_tone5[] = "👩🏿‍🦱";
+	inline constexpr const char woman_curly_haired_dark_skin_tone[] = "👩🏿‍🦱";
+	inline constexpr const char man_curly_haired[] = "👨‍🦱";
+	inline constexpr const char man_curly_haired_tone1[] = "👨🏻‍🦱";
+	inline constexpr const char man_curly_haired_light_skin_tone[] = "👨🏻‍🦱";
+	inline constexpr const char man_curly_haired_tone2[] = "👨🏼‍🦱";
+	inline constexpr const char man_curly_haired_medium_light_skin_tone[] = "👨🏼‍🦱";
+	inline constexpr const char man_curly_haired_tone3[] = "👨🏽‍🦱";
+	inline constexpr const char man_curly_haired_medium_skin_tone[] = "👨🏽‍🦱";
+	inline constexpr const char man_curly_haired_tone4[] = "👨🏾‍🦱";
+	inline constexpr const char man_curly_haired_medium_dark_skin_tone[] = "👨🏾‍🦱";
+	inline constexpr const char man_curly_haired_tone5[] = "👨🏿‍🦱";
+	inline constexpr const char man_curly_haired_dark_skin_tone[] = "👨🏿‍🦱";
+	inline constexpr const char person_red_hair[] = "🧑‍🦰";
+	inline constexpr const char person_tone1_red_hair[] = "🧑🏻‍🦰";
+	inline constexpr const char person_light_skin_tone_red_hair[] = "🧑🏻‍🦰";
+	inline constexpr const char person_tone2_red_hair[] = "🧑🏼‍🦰";
+	inline constexpr const char person_medium_light_skin_tone_red_hair[] = "🧑🏼‍🦰";
+	inline constexpr const char person_tone3_red_hair[] = "🧑🏽‍🦰";
+	inline constexpr const char person_medium_skin_tone_red_hair[] = "🧑🏽‍🦰";
+	inline constexpr const char person_tone4_red_hair[] = "🧑🏾‍🦰";
+	inline constexpr const char person_medium_dark_skin_tone_red_hair[] = "🧑🏾‍🦰";
+	inline constexpr const char person_tone5_red_hair[] = "🧑🏿‍🦰";
+	inline constexpr const char person_dark_skin_tone_red_hair[] = "🧑🏿‍🦰";
+	inline constexpr const char woman_red_haired[] = "👩‍🦰";
+	inline constexpr const char woman_red_haired_tone1[] = "👩🏻‍🦰";
+	inline constexpr const char woman_red_haired_light_skin_tone[] = "👩🏻‍🦰";
+	inline constexpr const char woman_red_haired_tone2[] = "👩🏼‍🦰";
+	inline constexpr const char woman_red_haired_medium_light_skin_tone[] = "👩🏼‍🦰";
+	inline constexpr const char woman_red_haired_tone3[] = "👩🏽‍🦰";
+	inline constexpr const char woman_red_haired_medium_skin_tone[] = "👩🏽‍🦰";
+	inline constexpr const char woman_red_haired_tone4[] = "👩🏾‍🦰";
+	inline constexpr const char woman_red_haired_medium_dark_skin_tone[] = "👩🏾‍🦰";
+	inline constexpr const char woman_red_haired_tone5[] = "👩🏿‍🦰";
+	inline constexpr const char woman_red_haired_dark_skin_tone[] = "👩🏿‍🦰";
+	inline constexpr const char man_red_haired[] = "👨‍🦰";
+	inline constexpr const char man_red_hair[] = "👨‍🦰";
+	inline constexpr const char man_red_haired_tone1[] = "👨🏻‍🦰";
+	inline constexpr const char man_red_haired_light_skin_tone[] = "👨🏻‍🦰";
+	inline constexpr const char man_red_haired_tone2[] = "👨🏼‍🦰";
+	inline constexpr const char man_red_haired_medium_light_skin_tone[] = "👨🏼‍🦰";
+	inline constexpr const char man_red_haired_tone3[] = "👨🏽‍🦰";
+	inline constexpr const char man_red_haired_medium_skin_tone[] = "👨🏽‍🦰";
+	inline constexpr const char man_red_haired_tone4[] = "👨🏾‍🦰";
+	inline constexpr const char man_red_haired_medium_dark_skin_tone[] = "👨🏾‍🦰";
+	inline constexpr const char man_red_haired_tone5[] = "👨🏿‍🦰";
+	inline constexpr const char man_red_haired_dark_skin_tone[] = "👨🏿‍🦰";
+	inline constexpr const char blond_haired_person[] = "👱";
+	inline constexpr const char person_with_blond_hair[] = "👱";
+	inline constexpr const char blond_haired_person_tone1[] = "👱🏻";
+	inline constexpr const char person_with_blond_hair_tone1[] = "👱🏻";
+	inline constexpr const char blond_haired_person_tone2[] = "👱🏼";
+	inline constexpr const char person_with_blond_hair_tone2[] = "👱🏼";
+	inline constexpr const char blond_haired_person_tone3[] = "👱🏽";
+	inline constexpr const char person_with_blond_hair_tone3[] = "👱🏽";
+	inline constexpr const char blond_haired_person_tone4[] = "👱🏾";
+	inline constexpr const char person_with_blond_hair_tone4[] = "👱🏾";
+	inline constexpr const char blond_haired_person_tone5[] = "👱🏿";
+	inline constexpr const char person_with_blond_hair_tone5[] = "👱🏿";
+	inline constexpr const char blond_haired_woman[] = "👱‍♀️";
+	inline constexpr const char blond_haired_woman_tone1[] = "👱🏻‍♀️";
+	inline constexpr const char blond_haired_woman_light_skin_tone[] = "👱🏻‍♀️";
+	inline constexpr const char blond_haired_woman_tone2[] = "👱🏼‍♀️";
+	inline constexpr const char blond_haired_woman_medium_light_skin_tone[] = "👱🏼‍♀️";
+	inline constexpr const char blond_haired_woman_tone3[] = "👱🏽‍♀️";
+	inline constexpr const char blond_haired_woman_medium_skin_tone[] = "👱🏽‍♀️";
+	inline constexpr const char blond_haired_woman_tone4[] = "👱🏾‍♀️";
+	inline constexpr const char blond_haired_woman_medium_dark_skin_tone[] = "👱🏾‍♀️";
+	inline constexpr const char blond_haired_woman_tone5[] = "👱🏿‍♀️";
+	inline constexpr const char blond_haired_woman_dark_skin_tone[] = "👱🏿‍♀️";
+	inline constexpr const char blond_haired_man[] = "👱‍♂️";
+	inline constexpr const char blond_haired_man_tone1[] = "👱🏻‍♂️";
+	inline constexpr const char blond_haired_man_light_skin_tone[] = "👱🏻‍♂️";
+	inline constexpr const char blond_haired_man_tone2[] = "👱🏼‍♂️";
+	inline constexpr const char blond_haired_man_medium_light_skin_tone[] = "👱🏼‍♂️";
+	inline constexpr const char blond_haired_man_tone3[] = "👱🏽‍♂️";
+	inline constexpr const char blond_haired_man_medium_skin_tone[] = "👱🏽‍♂️";
+	inline constexpr const char blond_haired_man_tone4[] = "👱🏾‍♂️";
+	inline constexpr const char blond_haired_man_medium_dark_skin_tone[] = "👱🏾‍♂️";
+	inline constexpr const char blond_haired_man_tone5[] = "👱🏿‍♂️";
+	inline constexpr const char blond_haired_man_dark_skin_tone[] = "👱🏿‍♂️";
+	inline constexpr const char person_white_hair[] = "🧑‍🦳";
+	inline constexpr const char person_tone1_white_hair[] = "🧑🏻‍🦳";
+	inline constexpr const char person_light_skin_tone_white_hair[] = "🧑🏻‍🦳";
+	inline constexpr const char person_tone2_white_hair[] = "🧑🏼‍🦳";
+	inline constexpr const char person_medium_light_skin_tone_white_hair[] = "🧑🏼‍🦳";
+	inline constexpr const char person_tone3_white_hair[] = "🧑🏽‍🦳";
+	inline constexpr const char person_medium_skin_tone_white_hair[] = "🧑🏽‍🦳";
+	inline constexpr const char person_tone4_white_hair[] = "🧑🏾‍🦳";
+	inline constexpr const char person_medium_dark_skin_tone_white_hair[] = "🧑🏾‍🦳";
+	inline constexpr const char person_tone5_white_hair[] = "🧑🏿‍🦳";
+	inline constexpr const char person_dark_skin_tone_white_hair[] = "🧑🏿‍🦳";
+	inline constexpr const char woman_white_haired[] = "👩‍🦳";
+	inline constexpr const char woman_white_haired_tone1[] = "👩🏻‍🦳";
+	inline constexpr const char woman_white_haired_light_skin_tone[] = "👩🏻‍🦳";
+	inline constexpr const char woman_white_haired_tone2[] = "👩🏼‍🦳";
+	inline constexpr const char woman_white_haired_medium_light_skin_tone[] = "👩🏼‍🦳";
+	inline constexpr const char woman_white_haired_tone3[] = "👩🏽‍🦳";
+	inline constexpr const char woman_white_haired_medium_skin_tone[] = "👩🏽‍🦳";
+	inline constexpr const char woman_white_haired_tone4[] = "👩🏾‍🦳";
+	inline constexpr const char woman_white_haired_medium_dark_skin_tone[] = "👩🏾‍🦳";
+	inline constexpr const char woman_white_haired_tone5[] = "👩🏿‍🦳";
+	inline constexpr const char woman_white_haired_dark_skin_tone[] = "👩🏿‍🦳";
+	inline constexpr const char man_white_haired[] = "👨‍🦳";
+	inline constexpr const char man_white_haired_tone1[] = "👨🏻‍🦳";
+	inline constexpr const char man_white_haired_light_skin_tone[] = "👨🏻‍🦳";
+	inline constexpr const char man_white_haired_tone2[] = "👨🏼‍🦳";
+	inline constexpr const char man_white_haired_medium_light_skin_tone[] = "👨🏼‍🦳";
+	inline constexpr const char man_white_haired_tone3[] = "👨🏽‍🦳";
+	inline constexpr const char man_white_haired_medium_skin_tone[] = "👨🏽‍🦳";
+	inline constexpr const char man_white_haired_tone4[] = "👨🏾‍🦳";
+	inline constexpr const char man_white_haired_medium_dark_skin_tone[] = "👨🏾‍🦳";
+	inline constexpr const char man_white_haired_tone5[] = "👨🏿‍🦳";
+	inline constexpr const char man_white_haired_dark_skin_tone[] = "👨🏿‍🦳";
+	inline constexpr const char person_bald[] = "🧑‍🦲";
+	inline constexpr const char person_tone1_bald[] = "🧑🏻‍🦲";
+	inline constexpr const char person_light_skin_tone_bald[] = "🧑🏻‍🦲";
+	inline constexpr const char person_tone2_bald[] = "🧑🏼‍🦲";
+	inline constexpr const char person_medium_light_skin_tone_bald[] = "🧑🏼‍🦲";
+	inline constexpr const char person_tone3_bald[] = "🧑🏽‍🦲";
+	inline constexpr const char person_medium_skin_tone_bald[] = "🧑🏽‍🦲";
+	inline constexpr const char person_tone4_bald[] = "🧑🏾‍🦲";
+	inline constexpr const char person_medium_dark_skin_tone_bald[] = "🧑🏾‍🦲";
+	inline constexpr const char person_tone5_bald[] = "🧑🏿‍🦲";
+	inline constexpr const char person_dark_skin_tone_bald[] = "🧑🏿‍🦲";
+	inline constexpr const char woman_bald[] = "👩‍🦲";
+	inline constexpr const char woman_bald_tone1[] = "👩🏻‍🦲";
+	inline constexpr const char woman_bald_light_skin_tone[] = "👩🏻‍🦲";
+	inline constexpr const char woman_bald_tone2[] = "👩🏼‍🦲";
+	inline constexpr const char woman_bald_medium_light_skin_tone[] = "👩🏼‍🦲";
+	inline constexpr const char woman_bald_tone3[] = "👩🏽‍🦲";
+	inline constexpr const char woman_bald_medium_skin_tone[] = "👩🏽‍🦲";
+	inline constexpr const char woman_bald_tone4[] = "👩🏾‍🦲";
+	inline constexpr const char woman_bald_medium_dark_skin_tone[] = "👩🏾‍🦲";
+	inline constexpr const char woman_bald_tone5[] = "👩🏿‍🦲";
+	inline constexpr const char woman_bald_dark_skin_tone[] = "👩🏿‍🦲";
+	inline constexpr const char man_bald[] = "👨‍🦲";
+	inline constexpr const char man_bald_tone1[] = "👨🏻‍🦲";
+	inline constexpr const char man_bald_light_skin_tone[] = "👨🏻‍🦲";
+	inline constexpr const char man_bald_tone2[] = "👨🏼‍🦲";
+	inline constexpr const char man_bald_medium_light_skin_tone[] = "👨🏼‍🦲";
+	inline constexpr const char man_bald_tone3[] = "👨🏽‍🦲";
+	inline constexpr const char man_bald_medium_skin_tone[] = "👨🏽‍🦲";
+	inline constexpr const char man_bald_tone4[] = "👨🏾‍🦲";
+	inline constexpr const char man_bald_medium_dark_skin_tone[] = "👨🏾‍🦲";
+	inline constexpr const char man_bald_tone5[] = "👨🏿‍🦲";
+	inline constexpr const char man_bald_dark_skin_tone[] = "👨🏿‍🦲";
+	inline constexpr const char bearded_person[] = "🧔";
+	inline constexpr const char person_beard[] = "🧔";
+	inline constexpr const char bearded_person_tone1[] = "🧔🏻";
+	inline constexpr const char bearded_person_light_skin_tone[] = "🧔🏻";
+	inline constexpr const char bearded_person_tone2[] = "🧔🏼";
+	inline constexpr const char bearded_person_medium_light_skin_tone[] = "🧔🏼";
+	inline constexpr const char bearded_person_tone3[] = "🧔🏽";
+	inline constexpr const char bearded_person_medium_skin_tone[] = "🧔🏽";
+	inline constexpr const char bearded_person_tone4[] = "🧔🏾";
+	inline constexpr const char bearded_person_medium_dark_skin_tone[] = "🧔🏾";
+	inline constexpr const char bearded_person_tone5[] = "🧔🏿";
+	inline constexpr const char bearded_person_dark_skin_tone[] = "🧔🏿";
+	inline constexpr const char woman_beard[] = "🧔‍♀️";
+	inline constexpr const char woman_tone1_beard[] = "🧔🏻‍♀️";
+	inline constexpr const char woman_light_skin_tone_beard[] = "🧔🏻‍♀️";
+	inline constexpr const char woman_tone2_beard[] = "🧔🏼‍♀️";
+	inline constexpr const char woman_medium_light_skin_tone_beard[] = "🧔🏼‍♀️";
+	inline constexpr const char woman_tone3_beard[] = "🧔🏽‍♀️";
+	inline constexpr const char woman_medium_skin_tone_beard[] = "🧔🏽‍♀️";
+	inline constexpr const char woman_tone4_beard[] = "🧔🏾‍♀️";
+	inline constexpr const char woman_medium_dark_skin_tone_beard[] = "🧔🏾‍♀️";
+	inline constexpr const char woman_tone5_beard[] = "🧔🏿‍♀️";
+	inline constexpr const char woman_dark_skin_tone_beard[] = "🧔🏿‍♀️";
+	inline constexpr const char man_beard[] = "🧔‍♂️";
+	inline constexpr const char man_tone1_beard[] = "🧔🏻‍♂️";
+	inline constexpr const char man_light_skin_tone_beard[] = "🧔🏻‍♂️";
+	inline constexpr const char man_tone2_beard[] = "🧔🏼‍♂️";
+	inline constexpr const char man_medium_light_skin_tone_beard[] = "🧔🏼‍♂️";
+	inline constexpr const char man_tone3_beard[] = "🧔🏽‍♂️";
+	inline constexpr const char man_medium_skin_tone_beard[] = "🧔🏽‍♂️";
+	inline constexpr const char man_tone4_beard[] = "🧔🏾‍♂️";
+	inline constexpr const char man_medium_dark_skin_tone_beard[] = "🧔🏾‍♂️";
+	inline constexpr const char man_tone5_beard[] = "🧔🏿‍♂️";
+	inline constexpr const char man_dark_skin_tone_beard[] = "🧔🏿‍♂️";
+	inline constexpr const char older_adult[] = "🧓";
+	inline constexpr const char older_person[] = "🧓";
+	inline constexpr const char older_adult_tone1[] = "🧓🏻";
+	inline constexpr const char older_adult_light_skin_tone[] = "🧓🏻";
+	inline constexpr const char older_adult_tone2[] = "🧓🏼";
+	inline constexpr const char older_adult_medium_light_skin_tone[] = "🧓🏼";
+	inline constexpr const char older_adult_tone3[] = "🧓🏽";
+	inline constexpr const char older_adult_medium_skin_tone[] = "🧓🏽";
+	inline constexpr const char older_adult_tone4[] = "🧓🏾";
+	inline constexpr const char older_adult_medium_dark_skin_tone[] = "🧓🏾";
+	inline constexpr const char older_adult_tone5[] = "🧓🏿";
+	inline constexpr const char older_adult_dark_skin_tone[] = "🧓🏿";
+	inline constexpr const char older_woman[] = "👵";
+	inline constexpr const char grandma[] = "👵";
+	inline constexpr const char old_woman[] = "👵";
+	inline constexpr const char older_woman_tone1[] = "👵🏻";
+	inline constexpr const char grandma_tone1[] = "👵🏻";
+	inline constexpr const char older_woman_tone2[] = "👵🏼";
+	inline constexpr const char grandma_tone2[] = "👵🏼";
+	inline constexpr const char older_woman_tone3[] = "👵🏽";
+	inline constexpr const char grandma_tone3[] = "👵🏽";
+	inline constexpr const char older_woman_tone4[] = "👵🏾";
+	inline constexpr const char grandma_tone4[] = "👵🏾";
+	inline constexpr const char older_woman_tone5[] = "👵🏿";
+	inline constexpr const char grandma_tone5[] = "👵🏿";
+	inline constexpr const char older_man[] = "👴";
+	inline constexpr const char old_man[] = "👴";
+	inline constexpr const char older_man_tone1[] = "👴🏻";
+	inline constexpr const char older_man_tone2[] = "👴🏼";
+	inline constexpr const char older_man_tone3[] = "👴🏽";
+	inline constexpr const char older_man_tone4[] = "👴🏾";
+	inline constexpr const char older_man_tone5[] = "👴🏿";
+	inline constexpr const char man_with_chinese_cap[] = "👲";
+	inline constexpr const char man_with_gua_pi_mao[] = "👲";
+	inline constexpr const char man_with_chinese_cap_tone1[] = "👲🏻";
+	inline constexpr const char man_with_gua_pi_mao_tone1[] = "👲🏻";
+	inline constexpr const char man_with_chinese_cap_tone2[] = "👲🏼";
+	inline constexpr const char man_with_gua_pi_mao_tone2[] = "👲🏼";
+	inline constexpr const char man_with_chinese_cap_tone3[] = "👲🏽";
+	inline constexpr const char man_with_gua_pi_mao_tone3[] = "👲🏽";
+	inline constexpr const char man_with_chinese_cap_tone4[] = "👲🏾";
+	inline constexpr const char man_with_gua_pi_mao_tone4[] = "👲🏾";
+	inline constexpr const char man_with_chinese_cap_tone5[] = "👲🏿";
+	inline constexpr const char man_with_gua_pi_mao_tone5[] = "👲🏿";
+	inline constexpr const char person_wearing_turban[] = "👳";
+	inline constexpr const char man_with_turban[] = "👳";
+	inline constexpr const char person_wearing_turban_tone1[] = "👳🏻";
+	inline constexpr const char man_with_turban_tone1[] = "👳🏻";
+	inline constexpr const char person_wearing_turban_tone2[] = "👳🏼";
+	inline constexpr const char man_with_turban_tone2[] = "👳🏼";
+	inline constexpr const char person_wearing_turban_tone3[] = "👳🏽";
+	inline constexpr const char man_with_turban_tone3[] = "👳🏽";
+	inline constexpr const char person_wearing_turban_tone4[] = "👳🏾";
+	inline constexpr const char man_with_turban_tone4[] = "👳🏾";
+	inline constexpr const char person_wearing_turban_tone5[] = "👳🏿";
+	inline constexpr const char man_with_turban_tone5[] = "👳🏿";
+	inline constexpr const char woman_wearing_turban[] = "👳‍♀️";
+	inline constexpr const char woman_wearing_turban_tone1[] = "👳🏻‍♀️";
+	inline constexpr const char woman_wearing_turban_light_skin_tone[] = "👳🏻‍♀️";
+	inline constexpr const char woman_wearing_turban_tone2[] = "👳🏼‍♀️";
+	inline constexpr const char woman_wearing_turban_medium_light_skin_tone[] = "👳🏼‍♀️";
+	inline constexpr const char woman_wearing_turban_tone3[] = "👳🏽‍♀️";
+	inline constexpr const char woman_wearing_turban_medium_skin_tone[] = "👳🏽‍♀️";
+	inline constexpr const char woman_wearing_turban_tone4[] = "👳🏾‍♀️";
+	inline constexpr const char woman_wearing_turban_medium_dark_skin_tone[] = "👳🏾‍♀️";
+	inline constexpr const char woman_wearing_turban_tone5[] = "👳🏿‍♀️";
+	inline constexpr const char woman_wearing_turban_dark_skin_tone[] = "👳🏿‍♀️";
+	inline constexpr const char man_wearing_turban[] = "👳‍♂️";
+	inline constexpr const char man_wearing_turban_tone1[] = "👳🏻‍♂️";
+	inline constexpr const char man_wearing_turban_light_skin_tone[] = "👳🏻‍♂️";
+	inline constexpr const char man_wearing_turban_tone2[] = "👳🏼‍♂️";
+	inline constexpr const char man_wearing_turban_medium_light_skin_tone[] = "👳🏼‍♂️";
+	inline constexpr const char man_wearing_turban_tone3[] = "👳🏽‍♂️";
+	inline constexpr const char man_wearing_turban_medium_skin_tone[] = "👳🏽‍♂️";
+	inline constexpr const char man_wearing_turban_tone4[] = "👳🏾‍♂️";
+	inline constexpr const char man_wearing_turban_medium_dark_skin_tone[] = "👳🏾‍♂️";
+	inline constexpr const char man_wearing_turban_tone5[] = "👳🏿‍♂️";
+	inline constexpr const char man_wearing_turban_dark_skin_tone[] = "👳🏿‍♂️";
+	inline constexpr const char woman_with_headscarf[] = "🧕";
+	inline constexpr const char woman_with_headscarf_tone1[] = "🧕🏻";
+	inline constexpr const char woman_with_headscarf_light_skin_tone[] = "🧕🏻";
+	inline constexpr const char woman_with_headscarf_tone2[] = "🧕🏼";
+	inline constexpr const char woman_with_headscarf_medium_light_skin_tone[] = "🧕🏼";
+	inline constexpr const char woman_with_headscarf_tone3[] = "🧕🏽";
+	inline constexpr const char woman_with_headscarf_medium_skin_tone[] = "🧕🏽";
+	inline constexpr const char woman_with_headscarf_tone4[] = "🧕🏾";
+	inline constexpr const char woman_with_headscarf_medium_dark_skin_tone[] = "🧕🏾";
+	inline constexpr const char woman_with_headscarf_tone5[] = "🧕🏿";
+	inline constexpr const char woman_with_headscarf_dark_skin_tone[] = "🧕🏿";
+	inline constexpr const char police_officer[] = "👮";
+	inline constexpr const char cop[] = "👮";
+	inline constexpr const char police_officer_tone1[] = "👮🏻";
+	inline constexpr const char cop_tone1[] = "👮🏻";
+	inline constexpr const char police_officer_tone2[] = "👮🏼";
+	inline constexpr const char cop_tone2[] = "👮🏼";
+	inline constexpr const char police_officer_tone3[] = "👮🏽";
+	inline constexpr const char cop_tone3[] = "👮🏽";
+	inline constexpr const char police_officer_tone4[] = "👮🏾";
+	inline constexpr const char cop_tone4[] = "👮🏾";
+	inline constexpr const char police_officer_tone5[] = "👮🏿";
+	inline constexpr const char cop_tone5[] = "👮🏿";
+	inline constexpr const char woman_police_officer[] = "👮‍♀️";
+	inline constexpr const char woman_police_officer_tone1[] = "👮🏻‍♀️";
+	inline constexpr const char woman_police_officer_light_skin_tone[] = "👮🏻‍♀️";
+	inline constexpr const char woman_police_officer_tone2[] = "👮🏼‍♀️";
+	inline constexpr const char woman_police_officer_medium_light_skin_tone[] = "👮🏼‍♀️";
+	inline constexpr const char woman_police_officer_tone3[] = "👮🏽‍♀️";
+	inline constexpr const char woman_police_officer_medium_skin_tone[] = "👮🏽‍♀️";
+	inline constexpr const char woman_police_officer_tone4[] = "👮🏾‍♀️";
+	inline constexpr const char woman_police_officer_medium_dark_skin_tone[] = "👮🏾‍♀️";
+	inline constexpr const char woman_police_officer_tone5[] = "👮🏿‍♀️";
+	inline constexpr const char woman_police_officer_dark_skin_tone[] = "👮🏿‍♀️";
+	inline constexpr const char man_police_officer[] = "👮‍♂️";
+	inline constexpr const char man_police_officer_tone1[] = "👮🏻‍♂️";
+	inline constexpr const char man_police_officer_light_skin_tone[] = "👮🏻‍♂️";
+	inline constexpr const char man_police_officer_tone2[] = "👮🏼‍♂️";
+	inline constexpr const char man_police_officer_medium_light_skin_tone[] = "👮🏼‍♂️";
+	inline constexpr const char man_police_officer_tone3[] = "👮🏽‍♂️";
+	inline constexpr const char man_police_officer_medium_skin_tone[] = "👮🏽‍♂️";
+	inline constexpr const char man_police_officer_tone4[] = "👮🏾‍♂️";
+	inline constexpr const char man_police_officer_medium_dark_skin_tone[] = "👮🏾‍♂️";
+	inline constexpr const char man_police_officer_tone5[] = "👮🏿‍♂️";
+	inline constexpr const char man_police_officer_dark_skin_tone[] = "👮🏿‍♂️";
+	inline constexpr const char construction_worker[] = "👷";
+	inline constexpr const char construction_worker_tone1[] = "👷🏻";
+	inline constexpr const char construction_worker_tone2[] = "👷🏼";
+	inline constexpr const char construction_worker_tone3[] = "👷🏽";
+	inline constexpr const char construction_worker_tone4[] = "👷🏾";
+	inline constexpr const char construction_worker_tone5[] = "👷🏿";
+	inline constexpr const char woman_construction_worker[] = "👷‍♀️";
+	inline constexpr const char woman_construction_worker_tone1[] = "👷🏻‍♀️";
+	inline constexpr const char woman_construction_worker_light_skin_tone[] = "👷🏻‍♀️";
+	inline constexpr const char woman_construction_worker_tone2[] = "👷🏼‍♀️";
+	inline constexpr const char woman_construction_worker_medium_light_skin_tone[] = "👷🏼‍♀️";
+	inline constexpr const char woman_construction_worker_tone3[] = "👷🏽‍♀️";
+	inline constexpr const char woman_construction_worker_medium_skin_tone[] = "👷🏽‍♀️";
+	inline constexpr const char woman_construction_worker_tone4[] = "👷🏾‍♀️";
+	inline constexpr const char woman_construction_worker_medium_dark_skin_tone[] = "👷🏾‍♀️";
+	inline constexpr const char woman_construction_worker_tone5[] = "👷🏿‍♀️";
+	inline constexpr const char woman_construction_worker_dark_skin_tone[] = "👷🏿‍♀️";
+	inline constexpr const char man_construction_worker[] = "👷‍♂️";
+	inline constexpr const char man_construction_worker_tone1[] = "👷🏻‍♂️";
+	inline constexpr const char man_construction_worker_light_skin_tone[] = "👷🏻‍♂️";
+	inline constexpr const char man_construction_worker_tone2[] = "👷🏼‍♂️";
+	inline constexpr const char man_construction_worker_medium_light_skin_tone[] = "👷🏼‍♂️";
+	inline constexpr const char man_construction_worker_tone3[] = "👷🏽‍♂️";
+	inline constexpr const char man_construction_worker_medium_skin_tone[] = "👷🏽‍♂️";
+	inline constexpr const char man_construction_worker_tone4[] = "👷🏾‍♂️";
+	inline constexpr const char man_construction_worker_medium_dark_skin_tone[] = "👷🏾‍♂️";
+	inline constexpr const char man_construction_worker_tone5[] = "👷🏿‍♂️";
+	inline constexpr const char man_construction_worker_dark_skin_tone[] = "👷🏿‍♂️";
+	inline constexpr const char guard[] = "💂";
+	inline constexpr const char guardsman[] = "💂";
+	inline constexpr const char guard_tone1[] = "💂🏻";
+	inline constexpr const char guardsman_tone1[] = "💂🏻";
+	inline constexpr const char guard_tone2[] = "💂🏼";
+	inline constexpr const char guardsman_tone2[] = "💂🏼";
+	inline constexpr const char guard_tone3[] = "💂🏽";
+	inline constexpr const char guardsman_tone3[] = "💂🏽";
+	inline constexpr const char guard_tone4[] = "💂🏾";
+	inline constexpr const char guardsman_tone4[] = "💂🏾";
+	inline constexpr const char guard_tone5[] = "💂🏿";
+	inline constexpr const char guardsman_tone5[] = "💂🏿";
+	inline constexpr const char woman_guard[] = "💂‍♀️";
+	inline constexpr const char woman_guard_tone1[] = "💂🏻‍♀️";
+	inline constexpr const char woman_guard_light_skin_tone[] = "💂🏻‍♀️";
+	inline constexpr const char woman_guard_tone2[] = "💂🏼‍♀️";
+	inline constexpr const char woman_guard_medium_light_skin_tone[] = "💂🏼‍♀️";
+	inline constexpr const char woman_guard_tone3[] = "💂🏽‍♀️";
+	inline constexpr const char woman_guard_medium_skin_tone[] = "💂🏽‍♀️";
+	inline constexpr const char woman_guard_tone4[] = "💂🏾‍♀️";
+	inline constexpr const char woman_guard_medium_dark_skin_tone[] = "💂🏾‍♀️";
+	inline constexpr const char woman_guard_tone5[] = "💂🏿‍♀️";
+	inline constexpr const char woman_guard_dark_skin_tone[] = "💂🏿‍♀️";
+	inline constexpr const char man_guard[] = "💂‍♂️";
+	inline constexpr const char man_guard_tone1[] = "💂🏻‍♂️";
+	inline constexpr const char man_guard_light_skin_tone[] = "💂🏻‍♂️";
+	inline constexpr const char man_guard_tone2[] = "💂🏼‍♂️";
+	inline constexpr const char man_guard_medium_light_skin_tone[] = "💂🏼‍♂️";
+	inline constexpr const char man_guard_tone3[] = "💂🏽‍♂️";
+	inline constexpr const char man_guard_medium_skin_tone[] = "💂🏽‍♂️";
+	inline constexpr const char man_guard_tone4[] = "💂🏾‍♂️";
+	inline constexpr const char man_guard_medium_dark_skin_tone[] = "💂🏾‍♂️";
+	inline constexpr const char man_guard_tone5[] = "💂🏿‍♂️";
+	inline constexpr const char man_guard_dark_skin_tone[] = "💂🏿‍♂️";
+	inline constexpr const char detective[] = "🕵️";
+	inline constexpr const char spy[] = "🕵️";
+	inline constexpr const char sleuth_or_spy[] = "🕵️";
+	inline constexpr const char detective_tone1[] = "🕵🏻";
+	inline constexpr const char spy_tone1[] = "🕵🏻";
+	inline constexpr const char sleuth_or_spy_tone1[] = "🕵🏻";
+	inline constexpr const char detective_tone2[] = "🕵🏼";
+	inline constexpr const char spy_tone2[] = "🕵🏼";
+	inline constexpr const char sleuth_or_spy_tone2[] = "🕵🏼";
+	inline constexpr const char detective_tone3[] = "🕵🏽";
+	inline constexpr const char spy_tone3[] = "🕵🏽";
+	inline constexpr const char sleuth_or_spy_tone3[] = "🕵🏽";
+	inline constexpr const char detective_tone4[] = "🕵🏾";
+	inline constexpr const char spy_tone4[] = "🕵🏾";
+	inline constexpr const char sleuth_or_spy_tone4[] = "🕵🏾";
+	inline constexpr const char detective_tone5[] = "🕵🏿";
+	inline constexpr const char spy_tone5[] = "🕵🏿";
+	inline constexpr const char sleuth_or_spy_tone5[] = "🕵🏿";
+	inline constexpr const char woman_detective[] = "🕵️‍♀️";
+	inline constexpr const char woman_detective_tone1[] = "🕵🏻‍♀️";
+	inline constexpr const char woman_detective_light_skin_tone[] = "🕵🏻‍♀️";
+	inline constexpr const char woman_detective_tone2[] = "🕵🏼‍♀️";
+	inline constexpr const char woman_detective_medium_light_skin_tone[] = "🕵🏼‍♀️";
+	inline constexpr const char woman_detective_tone3[] = "🕵🏽‍♀️";
+	inline constexpr const char woman_detective_medium_skin_tone[] = "🕵🏽‍♀️";
+	inline constexpr const char woman_detective_tone4[] = "🕵🏾‍♀️";
+	inline constexpr const char woman_detective_medium_dark_skin_tone[] = "🕵🏾‍♀️";
+	inline constexpr const char woman_detective_tone5[] = "🕵🏿‍♀️";
+	inline constexpr const char woman_detective_dark_skin_tone[] = "🕵🏿‍♀️";
+	inline constexpr const char man_detective[] = "🕵️‍♂️";
+	inline constexpr const char man_detective_tone1[] = "🕵🏻‍♂️";
+	inline constexpr const char man_detective_light_skin_tone[] = "🕵🏻‍♂️";
+	inline constexpr const char man_detective_tone2[] = "🕵🏼‍♂️";
+	inline constexpr const char man_detective_medium_light_skin_tone[] = "🕵🏼‍♂️";
+	inline constexpr const char man_detective_tone3[] = "🕵🏽‍♂️";
+	inline constexpr const char man_detective_medium_skin_tone[] = "🕵🏽‍♂️";
+	inline constexpr const char man_detective_tone4[] = "🕵🏾‍♂️";
+	inline constexpr const char man_detective_medium_dark_skin_tone[] = "🕵🏾‍♂️";
+	inline constexpr const char man_detective_tone5[] = "🕵🏿‍♂️";
+	inline constexpr const char man_detective_dark_skin_tone[] = "🕵🏿‍♂️";
+	inline constexpr const char health_worker[] = "🧑‍⚕️";
+	inline constexpr const char health_worker_tone1[] = "🧑🏻‍⚕️";
+	inline constexpr const char health_worker_light_skin_tone[] = "🧑🏻‍⚕️";
+	inline constexpr const char health_worker_tone2[] = "🧑🏼‍⚕️";
+	inline constexpr const char health_worker_medium_light_skin_tone[] = "🧑🏼‍⚕️";
+	inline constexpr const char health_worker_tone3[] = "🧑🏽‍⚕️";
+	inline constexpr const char health_worker_medium_skin_tone[] = "🧑🏽‍⚕️";
+	inline constexpr const char health_worker_tone4[] = "🧑🏾‍⚕️";
+	inline constexpr const char health_worker_medium_dark_skin_tone[] = "🧑🏾‍⚕️";
+	inline constexpr const char health_worker_tone5[] = "🧑🏿‍⚕️";
+	inline constexpr const char health_worker_dark_skin_tone[] = "🧑🏿‍⚕️";
+	inline constexpr const char woman_health_worker[] = "👩‍⚕️";
+	inline constexpr const char woman_health_worker_tone1[] = "👩🏻‍⚕️";
+	inline constexpr const char woman_health_worker_light_skin_tone[] = "👩🏻‍⚕️";
+	inline constexpr const char woman_health_worker_tone2[] = "👩🏼‍⚕️";
+	inline constexpr const char woman_health_worker_medium_light_skin_tone[] = "👩🏼‍⚕️";
+	inline constexpr const char woman_health_worker_tone3[] = "👩🏽‍⚕️";
+	inline constexpr const char woman_health_worker_medium_skin_tone[] = "👩🏽‍⚕️";
+	inline constexpr const char woman_health_worker_tone4[] = "👩🏾‍⚕️";
+	inline constexpr const char woman_health_worker_medium_dark_skin_tone[] = "👩🏾‍⚕️";
+	inline constexpr const char woman_health_worker_tone5[] = "👩🏿‍⚕️";
+	inline constexpr const char woman_health_worker_dark_skin_tone[] = "👩🏿‍⚕️";
+	inline constexpr const char man_health_worker[] = "👨‍⚕️";
+	inline constexpr const char man_health_worker_tone1[] = "👨🏻‍⚕️";
+	inline constexpr const char man_health_worker_light_skin_tone[] = "👨🏻‍⚕️";
+	inline constexpr const char man_health_worker_tone2[] = "👨🏼‍⚕️";
+	inline constexpr const char man_health_worker_medium_light_skin_tone[] = "👨🏼‍⚕️";
+	inline constexpr const char man_health_worker_tone3[] = "👨🏽‍⚕️";
+	inline constexpr const char man_health_worker_medium_skin_tone[] = "👨🏽‍⚕️";
+	inline constexpr const char man_health_worker_tone4[] = "👨🏾‍⚕️";
+	inline constexpr const char man_health_worker_medium_dark_skin_tone[] = "👨🏾‍⚕️";
+	inline constexpr const char man_health_worker_tone5[] = "👨🏿‍⚕️";
+	inline constexpr const char man_health_worker_dark_skin_tone[] = "👨🏿‍⚕️";
+	inline constexpr const char farmer[] = "🧑‍🌾";
+	inline constexpr const char farmer_tone1[] = "🧑🏻‍🌾";
+	inline constexpr const char farmer_light_skin_tone[] = "🧑🏻‍🌾";
+	inline constexpr const char farmer_tone2[] = "🧑🏼‍🌾";
+	inline constexpr const char farmer_medium_light_skin_tone[] = "🧑🏼‍🌾";
+	inline constexpr const char farmer_tone3[] = "🧑🏽‍🌾";
+	inline constexpr const char farmer_medium_skin_tone[] = "🧑🏽‍🌾";
+	inline constexpr const char farmer_tone4[] = "🧑🏾‍🌾";
+	inline constexpr const char farmer_medium_dark_skin_tone[] = "🧑🏾‍🌾";
+	inline constexpr const char farmer_tone5[] = "🧑🏿‍🌾";
+	inline constexpr const char farmer_dark_skin_tone[] = "🧑🏿‍🌾";
+	inline constexpr const char woman_farmer[] = "👩‍🌾";
+	inline constexpr const char woman_farmer_tone1[] = "👩🏻‍🌾";
+	inline constexpr const char woman_farmer_light_skin_tone[] = "👩🏻‍🌾";
+	inline constexpr const char woman_farmer_tone2[] = "👩🏼‍🌾";
+	inline constexpr const char woman_farmer_medium_light_skin_tone[] = "👩🏼‍🌾";
+	inline constexpr const char woman_farmer_tone3[] = "👩🏽‍🌾";
+	inline constexpr const char woman_farmer_medium_skin_tone[] = "👩🏽‍🌾";
+	inline constexpr const char woman_farmer_tone4[] = "👩🏾‍🌾";
+	inline constexpr const char woman_farmer_medium_dark_skin_tone[] = "👩🏾‍🌾";
+	inline constexpr const char woman_farmer_tone5[] = "👩🏿‍🌾";
+	inline constexpr const char woman_farmer_dark_skin_tone[] = "👩🏿‍🌾";
+	inline constexpr const char man_farmer[] = "👨‍🌾";
+	inline constexpr const char man_farmer_tone1[] = "👨🏻‍🌾";
+	inline constexpr const char man_farmer_light_skin_tone[] = "👨🏻‍🌾";
+	inline constexpr const char man_farmer_tone2[] = "👨🏼‍🌾";
+	inline constexpr const char man_farmer_medium_light_skin_tone[] = "👨🏼‍🌾";
+	inline constexpr const char man_farmer_tone3[] = "👨🏽‍🌾";
+	inline constexpr const char man_farmer_medium_skin_tone[] = "👨🏽‍🌾";
+	inline constexpr const char man_farmer_tone4[] = "👨🏾‍🌾";
+	inline constexpr const char man_farmer_medium_dark_skin_tone[] = "👨🏾‍🌾";
+	inline constexpr const char man_farmer_tone5[] = "👨🏿‍🌾";
+	inline constexpr const char man_farmer_dark_skin_tone[] = "👨🏿‍🌾";
+	inline constexpr const char cook[] = "🧑‍🍳";
+	inline constexpr const char cook_tone1[] = "🧑🏻‍🍳";
+	inline constexpr const char cook_light_skin_tone[] = "🧑🏻‍🍳";
+	inline constexpr const char cook_tone2[] = "🧑🏼‍🍳";
+	inline constexpr const char cook_medium_light_skin_tone[] = "🧑🏼‍🍳";
+	inline constexpr const char cook_tone3[] = "🧑🏽‍🍳";
+	inline constexpr const char cook_medium_skin_tone[] = "🧑🏽‍🍳";
+	inline constexpr const char cook_tone4[] = "🧑🏾‍🍳";
+	inline constexpr const char cook_medium_dark_skin_tone[] = "🧑🏾‍🍳";
+	inline constexpr const char cook_tone5[] = "🧑🏿‍🍳";
+	inline constexpr const char cook_dark_skin_tone[] = "🧑🏿‍🍳";
+	inline constexpr const char woman_cook[] = "👩‍🍳";
+	inline constexpr const char woman_cook_tone1[] = "👩🏻‍🍳";
+	inline constexpr const char woman_cook_light_skin_tone[] = "👩🏻‍🍳";
+	inline constexpr const char woman_cook_tone2[] = "👩🏼‍🍳";
+	inline constexpr const char woman_cook_medium_light_skin_tone[] = "👩🏼‍🍳";
+	inline constexpr const char woman_cook_tone3[] = "👩🏽‍🍳";
+	inline constexpr const char woman_cook_medium_skin_tone[] = "👩🏽‍🍳";
+	inline constexpr const char woman_cook_tone4[] = "👩🏾‍🍳";
+	inline constexpr const char woman_cook_medium_dark_skin_tone[] = "👩🏾‍🍳";
+	inline constexpr const char woman_cook_tone5[] = "👩🏿‍🍳";
+	inline constexpr const char woman_cook_dark_skin_tone[] = "👩🏿‍🍳";
+	inline constexpr const char man_cook[] = "👨‍🍳";
+	inline constexpr const char man_cook_tone1[] = "👨🏻‍🍳";
+	inline constexpr const char man_cook_light_skin_tone[] = "👨🏻‍🍳";
+	inline constexpr const char man_cook_tone2[] = "👨🏼‍🍳";
+	inline constexpr const char man_cook_medium_light_skin_tone[] = "👨🏼‍🍳";
+	inline constexpr const char man_cook_tone3[] = "👨🏽‍🍳";
+	inline constexpr const char man_cook_medium_skin_tone[] = "👨🏽‍🍳";
+	inline constexpr const char man_cook_tone4[] = "👨🏾‍🍳";
+	inline constexpr const char man_cook_medium_dark_skin_tone[] = "👨🏾‍🍳";
+	inline constexpr const char man_cook_tone5[] = "👨🏿‍🍳";
+	inline constexpr const char man_cook_dark_skin_tone[] = "👨🏿‍🍳";
+	inline constexpr const char student[] = "🧑‍🎓";
+	inline constexpr const char student_tone1[] = "🧑🏻‍🎓";
+	inline constexpr const char student_light_skin_tone[] = "🧑🏻‍🎓";
+	inline constexpr const char student_tone2[] = "🧑🏼‍🎓";
+	inline constexpr const char student_medium_light_skin_tone[] = "🧑🏼‍🎓";
+	inline constexpr const char student_tone3[] = "🧑🏽‍🎓";
+	inline constexpr const char student_medium_skin_tone[] = "🧑🏽‍🎓";
+	inline constexpr const char student_tone4[] = "🧑🏾‍🎓";
+	inline constexpr const char student_medium_dark_skin_tone[] = "🧑🏾‍🎓";
+	inline constexpr const char student_tone5[] = "🧑🏿‍🎓";
+	inline constexpr const char student_dark_skin_tone[] = "🧑🏿‍🎓";
+	inline constexpr const char woman_student[] = "👩‍🎓";
+	inline constexpr const char woman_student_tone1[] = "👩🏻‍🎓";
+	inline constexpr const char woman_student_light_skin_tone[] = "👩🏻‍🎓";
+	inline constexpr const char woman_student_tone2[] = "👩🏼‍🎓";
+	inline constexpr const char woman_student_medium_light_skin_tone[] = "👩🏼‍🎓";
+	inline constexpr const char woman_student_tone3[] = "👩🏽‍🎓";
+	inline constexpr const char woman_student_medium_skin_tone[] = "👩🏽‍🎓";
+	inline constexpr const char woman_student_tone4[] = "👩🏾‍🎓";
+	inline constexpr const char woman_student_medium_dark_skin_tone[] = "👩🏾‍🎓";
+	inline constexpr const char woman_student_tone5[] = "👩🏿‍🎓";
+	inline constexpr const char woman_student_dark_skin_tone[] = "👩🏿‍🎓";
+	inline constexpr const char man_student[] = "👨‍🎓";
+	inline constexpr const char man_student_tone1[] = "👨🏻‍🎓";
+	inline constexpr const char man_student_light_skin_tone[] = "👨🏻‍🎓";
+	inline constexpr const char man_student_tone2[] = "👨🏼‍🎓";
+	inline constexpr const char man_student_medium_light_skin_tone[] = "👨🏼‍🎓";
+	inline constexpr const char man_student_tone3[] = "👨🏽‍🎓";
+	inline constexpr const char man_student_medium_skin_tone[] = "👨🏽‍🎓";
+	inline constexpr const char man_student_tone4[] = "👨🏾‍🎓";
+	inline constexpr const char man_student_medium_dark_skin_tone[] = "👨🏾‍🎓";
+	inline constexpr const char man_student_tone5[] = "👨🏿‍🎓";
+	inline constexpr const char man_student_dark_skin_tone[] = "👨🏿‍🎓";
+	inline constexpr const char singer[] = "🧑‍🎤";
+	inline constexpr const char singer_tone1[] = "🧑🏻‍🎤";
+	inline constexpr const char singer_light_skin_tone[] = "🧑🏻‍🎤";
+	inline constexpr const char singer_tone2[] = "🧑🏼‍🎤";
+	inline constexpr const char singer_medium_light_skin_tone[] = "🧑🏼‍🎤";
+	inline constexpr const char singer_tone3[] = "🧑🏽‍🎤";
+	inline constexpr const char singer_medium_skin_tone[] = "🧑🏽‍🎤";
+	inline constexpr const char singer_tone4[] = "🧑🏾‍🎤";
+	inline constexpr const char singer_medium_dark_skin_tone[] = "🧑🏾‍🎤";
+	inline constexpr const char singer_tone5[] = "🧑🏿‍🎤";
+	inline constexpr const char singer_dark_skin_tone[] = "🧑🏿‍🎤";
+	inline constexpr const char woman_singer[] = "👩‍🎤";
+	inline constexpr const char woman_singer_tone1[] = "👩🏻‍🎤";
+	inline constexpr const char woman_singer_light_skin_tone[] = "👩🏻‍🎤";
+	inline constexpr const char woman_singer_tone2[] = "👩🏼‍🎤";
+	inline constexpr const char woman_singer_medium_light_skin_tone[] = "👩🏼‍🎤";
+	inline constexpr const char woman_singer_tone3[] = "👩🏽‍🎤";
+	inline constexpr const char woman_singer_medium_skin_tone[] = "👩🏽‍🎤";
+	inline constexpr const char woman_singer_tone4[] = "👩🏾‍🎤";
+	inline constexpr const char woman_singer_medium_dark_skin_tone[] = "👩🏾‍🎤";
+	inline constexpr const char woman_singer_tone5[] = "👩🏿‍🎤";
+	inline constexpr const char woman_singer_dark_skin_tone[] = "👩🏿‍🎤";
+	inline constexpr const char man_singer[] = "👨‍🎤";
+	inline constexpr const char man_singer_tone1[] = "👨🏻‍🎤";
+	inline constexpr const char man_singer_light_skin_tone[] = "👨🏻‍🎤";
+	inline constexpr const char man_singer_tone2[] = "👨🏼‍🎤";
+	inline constexpr const char man_singer_medium_light_skin_tone[] = "👨🏼‍🎤";
+	inline constexpr const char man_singer_tone3[] = "👨🏽‍🎤";
+	inline constexpr const char man_singer_medium_skin_tone[] = "👨🏽‍🎤";
+	inline constexpr const char man_singer_tone4[] = "👨🏾‍🎤";
+	inline constexpr const char man_singer_medium_dark_skin_tone[] = "👨🏾‍🎤";
+	inline constexpr const char man_singer_tone5[] = "👨🏿‍🎤";
+	inline constexpr const char man_singer_dark_skin_tone[] = "👨🏿‍🎤";
+	inline constexpr const char teacher[] = "🧑‍🏫";
+	inline constexpr const char teacher_tone1[] = "🧑🏻‍🏫";
+	inline constexpr const char teacher_light_skin_tone[] = "🧑🏻‍🏫";
+	inline constexpr const char teacher_tone2[] = "🧑🏼‍🏫";
+	inline constexpr const char teacher_medium_light_skin_tone[] = "🧑🏼‍🏫";
+	inline constexpr const char teacher_tone3[] = "🧑🏽‍🏫";
+	inline constexpr const char teacher_medium_skin_tone[] = "🧑🏽‍🏫";
+	inline constexpr const char teacher_tone4[] = "🧑🏾‍🏫";
+	inline constexpr const char teacher_medium_dark_skin_tone[] = "🧑🏾‍🏫";
+	inline constexpr const char teacher_tone5[] = "🧑🏿‍🏫";
+	inline constexpr const char teacher_dark_skin_tone[] = "🧑🏿‍🏫";
+	inline constexpr const char woman_teacher[] = "👩‍🏫";
+	inline constexpr const char woman_teacher_tone1[] = "👩🏻‍🏫";
+	inline constexpr const char woman_teacher_light_skin_tone[] = "👩🏻‍🏫";
+	inline constexpr const char woman_teacher_tone2[] = "👩🏼‍🏫";
+	inline constexpr const char woman_teacher_medium_light_skin_tone[] = "👩🏼‍🏫";
+	inline constexpr const char woman_teacher_tone3[] = "👩🏽‍🏫";
+	inline constexpr const char woman_teacher_medium_skin_tone[] = "👩🏽‍🏫";
+	inline constexpr const char woman_teacher_tone4[] = "👩🏾‍🏫";
+	inline constexpr const char woman_teacher_medium_dark_skin_tone[] = "👩🏾‍🏫";
+	inline constexpr const char woman_teacher_tone5[] = "👩🏿‍🏫";
+	inline constexpr const char woman_teacher_dark_skin_tone[] = "👩🏿‍🏫";
+	inline constexpr const char man_teacher[] = "👨‍🏫";
+	inline constexpr const char man_teacher_tone1[] = "👨🏻‍🏫";
+	inline constexpr const char man_teacher_light_skin_tone[] = "👨🏻‍🏫";
+	inline constexpr const char man_teacher_tone2[] = "👨🏼‍🏫";
+	inline constexpr const char man_teacher_medium_light_skin_tone[] = "👨🏼‍🏫";
+	inline constexpr const char man_teacher_tone3[] = "👨🏽‍🏫";
+	inline constexpr const char man_teacher_medium_skin_tone[] = "👨🏽‍🏫";
+	inline constexpr const char man_teacher_tone4[] = "👨🏾‍🏫";
+	inline constexpr const char man_teacher_medium_dark_skin_tone[] = "👨🏾‍🏫";
+	inline constexpr const char man_teacher_tone5[] = "👨🏿‍🏫";
+	inline constexpr const char man_teacher_dark_skin_tone[] = "👨🏿‍🏫";
+	inline constexpr const char factory_worker[] = "🧑‍🏭";
+	inline constexpr const char factory_worker_tone1[] = "🧑🏻‍🏭";
+	inline constexpr const char factory_worker_light_skin_tone[] = "🧑🏻‍🏭";
+	inline constexpr const char factory_worker_tone2[] = "🧑🏼‍🏭";
+	inline constexpr const char factory_worker_medium_light_skin_tone[] = "🧑🏼‍🏭";
+	inline constexpr const char factory_worker_tone3[] = "🧑🏽‍🏭";
+	inline constexpr const char factory_worker_medium_skin_tone[] = "🧑🏽‍🏭";
+	inline constexpr const char factory_worker_tone4[] = "🧑🏾‍🏭";
+	inline constexpr const char factory_worker_medium_dark_skin_tone[] = "🧑🏾‍🏭";
+	inline constexpr const char factory_worker_tone5[] = "🧑🏿‍🏭";
+	inline constexpr const char factory_worker_dark_skin_tone[] = "🧑🏿‍🏭";
+	inline constexpr const char woman_factory_worker[] = "👩‍🏭";
+	inline constexpr const char woman_factory_worker_tone1[] = "👩🏻‍🏭";
+	inline constexpr const char woman_factory_worker_light_skin_tone[] = "👩🏻‍🏭";
+	inline constexpr const char woman_factory_worker_tone2[] = "👩🏼‍🏭";
+	inline constexpr const char woman_factory_worker_medium_light_skin_tone[] = "👩🏼‍🏭";
+	inline constexpr const char woman_factory_worker_tone3[] = "👩🏽‍🏭";
+	inline constexpr const char woman_factory_worker_medium_skin_tone[] = "👩🏽‍🏭";
+	inline constexpr const char woman_factory_worker_tone4[] = "👩🏾‍🏭";
+	inline constexpr const char woman_factory_worker_medium_dark_skin_tone[] = "👩🏾‍🏭";
+	inline constexpr const char woman_factory_worker_tone5[] = "👩🏿‍🏭";
+	inline constexpr const char woman_factory_worker_dark_skin_tone[] = "👩🏿‍🏭";
+	inline constexpr const char man_factory_worker[] = "👨‍🏭";
+	inline constexpr const char man_factory_worker_tone1[] = "👨🏻‍🏭";
+	inline constexpr const char man_factory_worker_light_skin_tone[] = "👨🏻‍🏭";
+	inline constexpr const char man_factory_worker_tone2[] = "👨🏼‍🏭";
+	inline constexpr const char man_factory_worker_medium_light_skin_tone[] = "👨🏼‍🏭";
+	inline constexpr const char man_factory_worker_tone3[] = "👨🏽‍🏭";
+	inline constexpr const char man_factory_worker_medium_skin_tone[] = "👨🏽‍🏭";
+	inline constexpr const char man_factory_worker_tone4[] = "👨🏾‍🏭";
+	inline constexpr const char man_factory_worker_medium_dark_skin_tone[] = "👨🏾‍🏭";
+	inline constexpr const char man_factory_worker_tone5[] = "👨🏿‍🏭";
+	inline constexpr const char man_factory_worker_dark_skin_tone[] = "👨🏿‍🏭";
+	inline constexpr const char technologist[] = "🧑‍💻";
+	inline constexpr const char technologist_tone1[] = "🧑🏻‍💻";
+	inline constexpr const char technologist_light_skin_tone[] = "🧑🏻‍💻";
+	inline constexpr const char technologist_tone2[] = "🧑🏼‍💻";
+	inline constexpr const char technologist_medium_light_skin_tone[] = "🧑🏼‍💻";
+	inline constexpr const char technologist_tone3[] = "🧑🏽‍💻";
+	inline constexpr const char technologist_medium_skin_tone[] = "🧑🏽‍💻";
+	inline constexpr const char technologist_tone4[] = "🧑🏾‍💻";
+	inline constexpr const char technologist_medium_dark_skin_tone[] = "🧑🏾‍💻";
+	inline constexpr const char technologist_tone5[] = "🧑🏿‍💻";
+	inline constexpr const char technologist_dark_skin_tone[] = "🧑🏿‍💻";
+	inline constexpr const char woman_technologist[] = "👩‍💻";
+	inline constexpr const char woman_technologist_tone1[] = "👩🏻‍💻";
+	inline constexpr const char woman_technologist_light_skin_tone[] = "👩🏻‍💻";
+	inline constexpr const char woman_technologist_tone2[] = "👩🏼‍💻";
+	inline constexpr const char woman_technologist_medium_light_skin_tone[] = "👩🏼‍💻";
+	inline constexpr const char woman_technologist_tone3[] = "👩🏽‍💻";
+	inline constexpr const char woman_technologist_medium_skin_tone[] = "👩🏽‍💻";
+	inline constexpr const char woman_technologist_tone4[] = "👩🏾‍💻";
+	inline constexpr const char woman_technologist_medium_dark_skin_tone[] = "👩🏾‍💻";
+	inline constexpr const char woman_technologist_tone5[] = "👩🏿‍💻";
+	inline constexpr const char woman_technologist_dark_skin_tone[] = "👩🏿‍💻";
+	inline constexpr const char man_technologist[] = "👨‍💻";
+	inline constexpr const char man_technologist_tone1[] = "👨🏻‍💻";
+	inline constexpr const char man_technologist_light_skin_tone[] = "👨🏻‍💻";
+	inline constexpr const char man_technologist_tone2[] = "👨🏼‍💻";
+	inline constexpr const char man_technologist_medium_light_skin_tone[] = "👨🏼‍💻";
+	inline constexpr const char man_technologist_tone3[] = "👨🏽‍💻";
+	inline constexpr const char man_technologist_medium_skin_tone[] = "👨🏽‍💻";
+	inline constexpr const char man_technologist_tone4[] = "👨🏾‍💻";
+	inline constexpr const char man_technologist_medium_dark_skin_tone[] = "👨🏾‍💻";
+	inline constexpr const char man_technologist_tone5[] = "👨🏿‍💻";
+	inline constexpr const char man_technologist_dark_skin_tone[] = "👨🏿‍💻";
+	inline constexpr const char office_worker[] = "🧑‍💼";
+	inline constexpr const char office_worker_tone1[] = "🧑🏻‍💼";
+	inline constexpr const char office_worker_light_skin_tone[] = "🧑🏻‍💼";
+	inline constexpr const char office_worker_tone2[] = "🧑🏼‍💼";
+	inline constexpr const char office_worker_medium_light_skin_tone[] = "🧑🏼‍💼";
+	inline constexpr const char office_worker_tone3[] = "🧑🏽‍💼";
+	inline constexpr const char office_worker_medium_skin_tone[] = "🧑🏽‍💼";
+	inline constexpr const char office_worker_tone4[] = "🧑🏾‍💼";
+	inline constexpr const char office_worker_medium_dark_skin_tone[] = "🧑🏾‍💼";
+	inline constexpr const char office_worker_tone5[] = "🧑🏿‍💼";
+	inline constexpr const char office_worker_dark_skin_tone[] = "🧑🏿‍💼";
+	inline constexpr const char woman_office_worker[] = "👩‍💼";
+	inline constexpr const char woman_office_worker_tone1[] = "👩🏻‍💼";
+	inline constexpr const char woman_office_worker_light_skin_tone[] = "👩🏻‍💼";
+	inline constexpr const char woman_office_worker_tone2[] = "👩🏼‍💼";
+	inline constexpr const char woman_office_worker_medium_light_skin_tone[] = "👩🏼‍💼";
+	inline constexpr const char woman_office_worker_tone3[] = "👩🏽‍💼";
+	inline constexpr const char woman_office_worker_medium_skin_tone[] = "👩🏽‍💼";
+	inline constexpr const char woman_office_worker_tone4[] = "👩🏾‍💼";
+	inline constexpr const char woman_office_worker_medium_dark_skin_tone[] = "👩🏾‍💼";
+	inline constexpr const char woman_office_worker_tone5[] = "👩🏿‍💼";
+	inline constexpr const char woman_office_worker_dark_skin_tone[] = "👩🏿‍💼";
+	inline constexpr const char man_office_worker[] = "👨‍💼";
+	inline constexpr const char man_office_worker_tone1[] = "👨🏻‍💼";
+	inline constexpr const char man_office_worker_light_skin_tone[] = "👨🏻‍💼";
+	inline constexpr const char man_office_worker_tone2[] = "👨🏼‍💼";
+	inline constexpr const char man_office_worker_medium_light_skin_tone[] = "👨🏼‍💼";
+	inline constexpr const char man_office_worker_tone3[] = "👨🏽‍💼";
+	inline constexpr const char man_office_worker_medium_skin_tone[] = "👨🏽‍💼";
+	inline constexpr const char man_office_worker_tone4[] = "👨🏾‍💼";
+	inline constexpr const char man_office_worker_medium_dark_skin_tone[] = "👨🏾‍💼";
+	inline constexpr const char man_office_worker_tone5[] = "👨🏿‍💼";
+	inline constexpr const char man_office_worker_dark_skin_tone[] = "👨🏿‍💼";
+	inline constexpr const char mechanic[] = "🧑‍🔧";
+	inline constexpr const char mechanic_tone1[] = "🧑🏻‍🔧";
+	inline constexpr const char mechanic_light_skin_tone[] = "🧑🏻‍🔧";
+	inline constexpr const char mechanic_tone2[] = "🧑🏼‍🔧";
+	inline constexpr const char mechanic_medium_light_skin_tone[] = "🧑🏼‍🔧";
+	inline constexpr const char mechanic_tone3[] = "🧑🏽‍🔧";
+	inline constexpr const char mechanic_medium_skin_tone[] = "🧑🏽‍🔧";
+	inline constexpr const char mechanic_tone4[] = "🧑🏾‍🔧";
+	inline constexpr const char mechanic_medium_dark_skin_tone[] = "🧑🏾‍🔧";
+	inline constexpr const char mechanic_tone5[] = "🧑🏿‍🔧";
+	inline constexpr const char mechanic_dark_skin_tone[] = "🧑🏿‍🔧";
+	inline constexpr const char woman_mechanic[] = "👩‍🔧";
+	inline constexpr const char woman_mechanic_tone1[] = "👩🏻‍🔧";
+	inline constexpr const char woman_mechanic_light_skin_tone[] = "👩🏻‍🔧";
+	inline constexpr const char woman_mechanic_tone2[] = "👩🏼‍🔧";
+	inline constexpr const char woman_mechanic_medium_light_skin_tone[] = "👩🏼‍🔧";
+	inline constexpr const char woman_mechanic_tone3[] = "👩🏽‍🔧";
+	inline constexpr const char woman_mechanic_medium_skin_tone[] = "👩🏽‍🔧";
+	inline constexpr const char woman_mechanic_tone4[] = "👩🏾‍🔧";
+	inline constexpr const char woman_mechanic_medium_dark_skin_tone[] = "👩🏾‍🔧";
+	inline constexpr const char woman_mechanic_tone5[] = "👩🏿‍🔧";
+	inline constexpr const char woman_mechanic_dark_skin_tone[] = "👩🏿‍🔧";
+	inline constexpr const char man_mechanic[] = "👨‍🔧";
+	inline constexpr const char man_mechanic_tone1[] = "👨🏻‍🔧";
+	inline constexpr const char man_mechanic_light_skin_tone[] = "👨🏻‍🔧";
+	inline constexpr const char man_mechanic_tone2[] = "👨🏼‍🔧";
+	inline constexpr const char man_mechanic_medium_light_skin_tone[] = "👨🏼‍🔧";
+	inline constexpr const char man_mechanic_tone3[] = "👨🏽‍🔧";
+	inline constexpr const char man_mechanic_medium_skin_tone[] = "👨🏽‍🔧";
+	inline constexpr const char man_mechanic_tone4[] = "👨🏾‍🔧";
+	inline constexpr const char man_mechanic_medium_dark_skin_tone[] = "👨🏾‍🔧";
+	inline constexpr const char man_mechanic_tone5[] = "👨🏿‍🔧";
+	inline constexpr const char man_mechanic_dark_skin_tone[] = "👨🏿‍🔧";
+	inline constexpr const char scientist[] = "🧑‍🔬";
+	inline constexpr const char scientist_tone1[] = "🧑🏻‍🔬";
+	inline constexpr const char scientist_light_skin_tone[] = "🧑🏻‍🔬";
+	inline constexpr const char scientist_tone2[] = "🧑🏼‍🔬";
+	inline constexpr const char scientist_medium_light_skin_tone[] = "🧑🏼‍🔬";
+	inline constexpr const char scientist_tone3[] = "🧑🏽‍🔬";
+	inline constexpr const char scientist_medium_skin_tone[] = "🧑🏽‍🔬";
+	inline constexpr const char scientist_tone4[] = "🧑🏾‍🔬";
+	inline constexpr const char scientist_medium_dark_skin_tone[] = "🧑🏾‍🔬";
+	inline constexpr const char scientist_tone5[] = "🧑🏿‍🔬";
+	inline constexpr const char scientist_dark_skin_tone[] = "🧑🏿‍🔬";
+	inline constexpr const char woman_scientist[] = "👩‍🔬";
+	inline constexpr const char woman_scientist_tone1[] = "👩🏻‍🔬";
+	inline constexpr const char woman_scientist_light_skin_tone[] = "👩🏻‍🔬";
+	inline constexpr const char woman_scientist_tone2[] = "👩🏼‍🔬";
+	inline constexpr const char woman_scientist_medium_light_skin_tone[] = "👩🏼‍🔬";
+	inline constexpr const char woman_scientist_tone3[] = "👩🏽‍🔬";
+	inline constexpr const char woman_scientist_medium_skin_tone[] = "👩🏽‍🔬";
+	inline constexpr const char woman_scientist_tone4[] = "👩🏾‍🔬";
+	inline constexpr const char woman_scientist_medium_dark_skin_tone[] = "👩🏾‍🔬";
+	inline constexpr const char woman_scientist_tone5[] = "👩🏿‍🔬";
+	inline constexpr const char woman_scientist_dark_skin_tone[] = "👩🏿‍🔬";
+	inline constexpr const char man_scientist[] = "👨‍🔬";
+	inline constexpr const char man_scientist_tone1[] = "👨🏻‍🔬";
+	inline constexpr const char man_scientist_light_skin_tone[] = "👨🏻‍🔬";
+	inline constexpr const char man_scientist_tone2[] = "👨🏼‍🔬";
+	inline constexpr const char man_scientist_medium_light_skin_tone[] = "👨🏼‍🔬";
+	inline constexpr const char man_scientist_tone3[] = "👨🏽‍🔬";
+	inline constexpr const char man_scientist_medium_skin_tone[] = "👨🏽‍🔬";
+	inline constexpr const char man_scientist_tone4[] = "👨🏾‍🔬";
+	inline constexpr const char man_scientist_medium_dark_skin_tone[] = "👨🏾‍🔬";
+	inline constexpr const char man_scientist_tone5[] = "👨🏿‍🔬";
+	inline constexpr const char man_scientist_dark_skin_tone[] = "👨🏿‍🔬";
+	inline constexpr const char artist[] = "🧑‍🎨";
+	inline constexpr const char artist_tone1[] = "🧑🏻‍🎨";
+	inline constexpr const char artist_light_skin_tone[] = "🧑🏻‍🎨";
+	inline constexpr const char artist_tone2[] = "🧑🏼‍🎨";
+	inline constexpr const char artist_medium_light_skin_tone[] = "🧑🏼‍🎨";
+	inline constexpr const char artist_tone3[] = "🧑🏽‍🎨";
+	inline constexpr const char artist_medium_skin_tone[] = "🧑🏽‍🎨";
+	inline constexpr const char artist_tone4[] = "🧑🏾‍🎨";
+	inline constexpr const char artist_medium_dark_skin_tone[] = "🧑🏾‍🎨";
+	inline constexpr const char artist_tone5[] = "🧑🏿‍🎨";
+	inline constexpr const char artist_dark_skin_tone[] = "🧑🏿‍🎨";
+	inline constexpr const char woman_artist[] = "👩‍🎨";
+	inline constexpr const char woman_artist_tone1[] = "👩🏻‍🎨";
+	inline constexpr const char woman_artist_light_skin_tone[] = "👩🏻‍🎨";
+	inline constexpr const char woman_artist_tone2[] = "👩🏼‍🎨";
+	inline constexpr const char woman_artist_medium_light_skin_tone[] = "👩🏼‍🎨";
+	inline constexpr const char woman_artist_tone3[] = "👩🏽‍🎨";
+	inline constexpr const char woman_artist_medium_skin_tone[] = "👩🏽‍🎨";
+	inline constexpr const char woman_artist_tone4[] = "👩🏾‍🎨";
+	inline constexpr const char woman_artist_medium_dark_skin_tone[] = "👩🏾‍🎨";
+	inline constexpr const char woman_artist_tone5[] = "👩🏿‍🎨";
+	inline constexpr const char woman_artist_dark_skin_tone[] = "👩🏿‍🎨";
+	inline constexpr const char man_artist[] = "👨‍🎨";
+	inline constexpr const char man_artist_tone1[] = "👨🏻‍🎨";
+	inline constexpr const char man_artist_light_skin_tone[] = "👨🏻‍🎨";
+	inline constexpr const char man_artist_tone2[] = "👨🏼‍🎨";
+	inline constexpr const char man_artist_medium_light_skin_tone[] = "👨🏼‍🎨";
+	inline constexpr const char man_artist_tone3[] = "👨🏽‍🎨";
+	inline constexpr const char man_artist_medium_skin_tone[] = "👨🏽‍🎨";
+	inline constexpr const char man_artist_tone4[] = "👨🏾‍🎨";
+	inline constexpr const char man_artist_medium_dark_skin_tone[] = "👨🏾‍🎨";
+	inline constexpr const char man_artist_tone5[] = "👨🏿‍🎨";
+	inline constexpr const char man_artist_dark_skin_tone[] = "👨🏿‍🎨";
+	inline constexpr const char firefighter[] = "🧑‍🚒";
+	inline constexpr const char firefighter_tone1[] = "🧑🏻‍🚒";
+	inline constexpr const char firefighter_light_skin_tone[] = "🧑🏻‍🚒";
+	inline constexpr const char firefighter_tone2[] = "🧑🏼‍🚒";
+	inline constexpr const char firefighter_medium_light_skin_tone[] = "🧑🏼‍🚒";
+	inline constexpr const char firefighter_tone3[] = "🧑🏽‍🚒";
+	inline constexpr const char firefighter_medium_skin_tone[] = "🧑🏽‍🚒";
+	inline constexpr const char firefighter_tone4[] = "🧑🏾‍🚒";
+	inline constexpr const char firefighter_medium_dark_skin_tone[] = "🧑🏾‍🚒";
+	inline constexpr const char firefighter_tone5[] = "🧑🏿‍🚒";
+	inline constexpr const char firefighter_dark_skin_tone[] = "🧑🏿‍🚒";
+	inline constexpr const char woman_firefighter[] = "👩‍🚒";
+	inline constexpr const char woman_firefighter_tone1[] = "👩🏻‍🚒";
+	inline constexpr const char woman_firefighter_light_skin_tone[] = "👩🏻‍🚒";
+	inline constexpr const char woman_firefighter_tone2[] = "👩🏼‍🚒";
+	inline constexpr const char woman_firefighter_medium_light_skin_tone[] = "👩🏼‍🚒";
+	inline constexpr const char woman_firefighter_tone3[] = "👩🏽‍🚒";
+	inline constexpr const char woman_firefighter_medium_skin_tone[] = "👩🏽‍🚒";
+	inline constexpr const char woman_firefighter_tone4[] = "👩🏾‍🚒";
+	inline constexpr const char woman_firefighter_medium_dark_skin_tone[] = "👩🏾‍🚒";
+	inline constexpr const char woman_firefighter_tone5[] = "👩🏿‍🚒";
+	inline constexpr const char woman_firefighter_dark_skin_tone[] = "👩🏿‍🚒";
+	inline constexpr const char man_firefighter[] = "👨‍🚒";
+	inline constexpr const char man_firefighter_tone1[] = "👨🏻‍🚒";
+	inline constexpr const char man_firefighter_light_skin_tone[] = "👨🏻‍🚒";
+	inline constexpr const char man_firefighter_tone2[] = "👨🏼‍🚒";
+	inline constexpr const char man_firefighter_medium_light_skin_tone[] = "👨🏼‍🚒";
+	inline constexpr const char man_firefighter_tone3[] = "👨🏽‍🚒";
+	inline constexpr const char man_firefighter_medium_skin_tone[] = "👨🏽‍🚒";
+	inline constexpr const char man_firefighter_tone4[] = "👨🏾‍🚒";
+	inline constexpr const char man_firefighter_medium_dark_skin_tone[] = "👨🏾‍🚒";
+	inline constexpr const char man_firefighter_tone5[] = "👨🏿‍🚒";
+	inline constexpr const char man_firefighter_dark_skin_tone[] = "👨🏿‍🚒";
+	inline constexpr const char pilot[] = "🧑‍✈️";
+	inline constexpr const char pilot_tone1[] = "🧑🏻‍✈️";
+	inline constexpr const char pilot_light_skin_tone[] = "🧑🏻‍✈️";
+	inline constexpr const char pilot_tone2[] = "🧑🏼‍✈️";
+	inline constexpr const char pilot_medium_light_skin_tone[] = "🧑🏼‍✈️";
+	inline constexpr const char pilot_tone3[] = "🧑🏽‍✈️";
+	inline constexpr const char pilot_medium_skin_tone[] = "🧑🏽‍✈️";
+	inline constexpr const char pilot_tone4[] = "🧑🏾‍✈️";
+	inline constexpr const char pilot_medium_dark_skin_tone[] = "🧑🏾‍✈️";
+	inline constexpr const char pilot_tone5[] = "🧑🏿‍✈️";
+	inline constexpr const char pilot_dark_skin_tone[] = "🧑🏿‍✈️";
+	inline constexpr const char woman_pilot[] = "👩‍✈️";
+	inline constexpr const char woman_pilot_tone1[] = "👩🏻‍✈️";
+	inline constexpr const char woman_pilot_light_skin_tone[] = "👩🏻‍✈️";
+	inline constexpr const char woman_pilot_tone2[] = "👩🏼‍✈️";
+	inline constexpr const char woman_pilot_medium_light_skin_tone[] = "👩🏼‍✈️";
+	inline constexpr const char woman_pilot_tone3[] = "👩🏽‍✈️";
+	inline constexpr const char woman_pilot_medium_skin_tone[] = "👩🏽‍✈️";
+	inline constexpr const char woman_pilot_tone4[] = "👩🏾‍✈️";
+	inline constexpr const char woman_pilot_medium_dark_skin_tone[] = "👩🏾‍✈️";
+	inline constexpr const char woman_pilot_tone5[] = "👩🏿‍✈️";
+	inline constexpr const char woman_pilot_dark_skin_tone[] = "👩🏿‍✈️";
+	inline constexpr const char man_pilot[] = "👨‍✈️";
+	inline constexpr const char man_pilot_tone1[] = "👨🏻‍✈️";
+	inline constexpr const char man_pilot_light_skin_tone[] = "👨🏻‍✈️";
+	inline constexpr const char man_pilot_tone2[] = "👨🏼‍✈️";
+	inline constexpr const char man_pilot_medium_light_skin_tone[] = "👨🏼‍✈️";
+	inline constexpr const char man_pilot_tone3[] = "👨🏽‍✈️";
+	inline constexpr const char man_pilot_medium_skin_tone[] = "👨🏽‍✈️";
+	inline constexpr const char man_pilot_tone4[] = "👨🏾‍✈️";
+	inline constexpr const char man_pilot_medium_dark_skin_tone[] = "👨🏾‍✈️";
+	inline constexpr const char man_pilot_tone5[] = "👨🏿‍✈️";
+	inline constexpr const char man_pilot_dark_skin_tone[] = "👨🏿‍✈️";
+	inline constexpr const char astronaut[] = "🧑‍🚀";
+	inline constexpr const char astronaut_tone1[] = "🧑🏻‍🚀";
+	inline constexpr const char astronaut_light_skin_tone[] = "🧑🏻‍🚀";
+	inline constexpr const char astronaut_tone2[] = "🧑🏼‍🚀";
+	inline constexpr const char astronaut_medium_light_skin_tone[] = "🧑🏼‍🚀";
+	inline constexpr const char astronaut_tone3[] = "🧑🏽‍🚀";
+	inline constexpr const char astronaut_medium_skin_tone[] = "🧑🏽‍🚀";
+	inline constexpr const char astronaut_tone4[] = "🧑🏾‍🚀";
+	inline constexpr const char astronaut_medium_dark_skin_tone[] = "🧑🏾‍🚀";
+	inline constexpr const char astronaut_tone5[] = "🧑🏿‍🚀";
+	inline constexpr const char astronaut_dark_skin_tone[] = "🧑🏿‍🚀";
+	inline constexpr const char woman_astronaut[] = "👩‍🚀";
+	inline constexpr const char woman_astronaut_tone1[] = "👩🏻‍🚀";
+	inline constexpr const char woman_astronaut_light_skin_tone[] = "👩🏻‍🚀";
+	inline constexpr const char woman_astronaut_tone2[] = "👩🏼‍🚀";
+	inline constexpr const char woman_astronaut_medium_light_skin_tone[] = "👩🏼‍🚀";
+	inline constexpr const char woman_astronaut_tone3[] = "👩🏽‍🚀";
+	inline constexpr const char woman_astronaut_medium_skin_tone[] = "👩🏽‍🚀";
+	inline constexpr const char woman_astronaut_tone4[] = "👩🏾‍🚀";
+	inline constexpr const char woman_astronaut_medium_dark_skin_tone[] = "👩🏾‍🚀";
+	inline constexpr const char woman_astronaut_tone5[] = "👩🏿‍🚀";
+	inline constexpr const char woman_astronaut_dark_skin_tone[] = "👩🏿‍🚀";
+	inline constexpr const char man_astronaut[] = "👨‍🚀";
+	inline constexpr const char man_astronaut_tone1[] = "👨🏻‍🚀";
+	inline constexpr const char man_astronaut_light_skin_tone[] = "👨🏻‍🚀";
+	inline constexpr const char man_astronaut_tone2[] = "👨🏼‍🚀";
+	inline constexpr const char man_astronaut_medium_light_skin_tone[] = "👨🏼‍🚀";
+	inline constexpr const char man_astronaut_tone3[] = "👨🏽‍🚀";
+	inline constexpr const char man_astronaut_medium_skin_tone[] = "👨🏽‍🚀";
+	inline constexpr const char man_astronaut_tone4[] = "👨🏾‍🚀";
+	inline constexpr const char man_astronaut_medium_dark_skin_tone[] = "👨🏾‍🚀";
+	inline constexpr const char man_astronaut_tone5[] = "👨🏿‍🚀";
+	inline constexpr const char man_astronaut_dark_skin_tone[] = "👨🏿‍🚀";
+	inline constexpr const char judge[] = "🧑‍⚖️";
+	inline constexpr const char judge_tone1[] = "🧑🏻‍⚖️";
+	inline constexpr const char judge_light_skin_tone[] = "🧑🏻‍⚖️";
+	inline constexpr const char judge_tone2[] = "🧑🏼‍⚖️";
+	inline constexpr const char judge_medium_light_skin_tone[] = "🧑🏼‍⚖️";
+	inline constexpr const char judge_tone3[] = "🧑🏽‍⚖️";
+	inline constexpr const char judge_medium_skin_tone[] = "🧑🏽‍⚖️";
+	inline constexpr const char judge_tone4[] = "🧑🏾‍⚖️";
+	inline constexpr const char judge_medium_dark_skin_tone[] = "🧑🏾‍⚖️";
+	inline constexpr const char judge_tone5[] = "🧑🏿‍⚖️";
+	inline constexpr const char judge_dark_skin_tone[] = "🧑🏿‍⚖️";
+	inline constexpr const char woman_judge[] = "👩‍⚖️";
+	inline constexpr const char woman_judge_tone1[] = "👩🏻‍⚖️";
+	inline constexpr const char woman_judge_light_skin_tone[] = "👩🏻‍⚖️";
+	inline constexpr const char woman_judge_tone2[] = "👩🏼‍⚖️";
+	inline constexpr const char woman_judge_medium_light_skin_tone[] = "👩🏼‍⚖️";
+	inline constexpr const char woman_judge_tone3[] = "👩🏽‍⚖️";
+	inline constexpr const char woman_judge_medium_skin_tone[] = "👩🏽‍⚖️";
+	inline constexpr const char woman_judge_tone4[] = "👩🏾‍⚖️";
+	inline constexpr const char woman_judge_medium_dark_skin_tone[] = "👩🏾‍⚖️";
+	inline constexpr const char woman_judge_tone5[] = "👩🏿‍⚖️";
+	inline constexpr const char woman_judge_dark_skin_tone[] = "👩🏿‍⚖️";
+	inline constexpr const char man_judge[] = "👨‍⚖️";
+	inline constexpr const char man_judge_tone1[] = "👨🏻‍⚖️";
+	inline constexpr const char man_judge_light_skin_tone[] = "👨🏻‍⚖️";
+	inline constexpr const char man_judge_tone2[] = "👨🏼‍⚖️";
+	inline constexpr const char man_judge_medium_light_skin_tone[] = "👨🏼‍⚖️";
+	inline constexpr const char man_judge_tone3[] = "👨🏽‍⚖️";
+	inline constexpr const char man_judge_medium_skin_tone[] = "👨🏽‍⚖️";
+	inline constexpr const char man_judge_tone4[] = "👨🏾‍⚖️";
+	inline constexpr const char man_judge_medium_dark_skin_tone[] = "👨🏾‍⚖️";
+	inline constexpr const char man_judge_tone5[] = "👨🏿‍⚖️";
+	inline constexpr const char man_judge_dark_skin_tone[] = "👨🏿‍⚖️";
+	inline constexpr const char person_with_veil[] = "👰";
+	inline constexpr const char person_with_veil_tone1[] = "👰🏻";
+	inline constexpr const char person_with_veil_tone2[] = "👰🏼";
+	inline constexpr const char person_with_veil_tone3[] = "👰🏽";
+	inline constexpr const char person_with_veil_tone4[] = "👰🏾";
+	inline constexpr const char person_with_veil_tone5[] = "👰🏿";
+	inline constexpr const char woman_with_veil[] = "👰‍♀️";
+	inline constexpr const char bride_with_veil[] = "👰‍♀️";
+	inline constexpr const char woman_with_veil_tone1[] = "👰🏻‍♀️";
+	inline constexpr const char woman_with_veil_light_skin_tone[] = "👰🏻‍♀️";
+	inline constexpr const char woman_with_veil_tone2[] = "👰🏼‍♀️";
+	inline constexpr const char woman_with_veil_medium_light_skin_tone[] = "👰🏼‍♀️";
+	inline constexpr const char woman_with_veil_tone3[] = "👰🏽‍♀️";
+	inline constexpr const char woman_with_veil_medium_skin_tone[] = "👰🏽‍♀️";
+	inline constexpr const char woman_with_veil_tone4[] = "👰🏾‍♀️";
+	inline constexpr const char woman_with_veil_medium_dark_skin_tone[] = "👰🏾‍♀️";
+	inline constexpr const char woman_with_veil_tone5[] = "👰🏿‍♀️";
+	inline constexpr const char woman_with_veil_dark_skin_tone[] = "👰🏿‍♀️";
+	inline constexpr const char man_with_veil[] = "👰‍♂️";
+	inline constexpr const char man_with_veil_tone1[] = "👰🏻‍♂️";
+	inline constexpr const char man_with_veil_light_skin_tone[] = "👰🏻‍♂️";
+	inline constexpr const char man_with_veil_tone2[] = "👰🏼‍♂️";
+	inline constexpr const char man_with_veil_medium_light_skin_tone[] = "👰🏼‍♂️";
+	inline constexpr const char man_with_veil_tone3[] = "👰🏽‍♂️";
+	inline constexpr const char man_with_veil_medium_skin_tone[] = "👰🏽‍♂️";
+	inline constexpr const char man_with_veil_tone4[] = "👰🏾‍♂️";
+	inline constexpr const char man_with_veil_medium_dark_skin_tone[] = "👰🏾‍♂️";
+	inline constexpr const char man_with_veil_tone5[] = "👰🏿‍♂️";
+	inline constexpr const char man_with_veil_dark_skin_tone[] = "👰🏿‍♂️";
+	inline constexpr const char person_in_tuxedo[] = "🤵";
+	inline constexpr const char person_in_tuxedo_tone1[] = "🤵🏻";
+	inline constexpr const char tuxedo_tone1[] = "🤵🏻";
+	inline constexpr const char person_in_tuxedo_tone2[] = "🤵🏼";
+	inline constexpr const char tuxedo_tone2[] = "🤵🏼";
+	inline constexpr const char person_in_tuxedo_tone3[] = "🤵🏽";
+	inline constexpr const char tuxedo_tone3[] = "🤵🏽";
+	inline constexpr const char person_in_tuxedo_tone4[] = "🤵🏾";
+	inline constexpr const char tuxedo_tone4[] = "🤵🏾";
+	inline constexpr const char person_in_tuxedo_tone5[] = "🤵🏿";
+	inline constexpr const char tuxedo_tone5[] = "🤵🏿";
+	inline constexpr const char woman_in_tuxedo[] = "🤵‍♀️";
+	inline constexpr const char woman_in_tuxedo_tone1[] = "🤵🏻‍♀️";
+	inline constexpr const char woman_in_tuxedo_light_skin_tone[] = "🤵🏻‍♀️";
+	inline constexpr const char woman_in_tuxedo_tone2[] = "🤵🏼‍♀️";
+	inline constexpr const char woman_in_tuxedo_medium_light_skin_tone[] = "🤵🏼‍♀️";
+	inline constexpr const char woman_in_tuxedo_tone3[] = "🤵🏽‍♀️";
+	inline constexpr const char woman_in_tuxedo_medium_skin_tone[] = "🤵🏽‍♀️";
+	inline constexpr const char woman_in_tuxedo_tone4[] = "🤵🏾‍♀️";
+	inline constexpr const char woman_in_tuxedo_medium_dark_skin_tone[] = "🤵🏾‍♀️";
+	inline constexpr const char woman_in_tuxedo_tone5[] = "🤵🏿‍♀️";
+	inline constexpr const char woman_in_tuxedo_dark_skin_tone[] = "🤵🏿‍♀️";
+	inline constexpr const char man_in_tuxedo[] = "🤵‍♂️";
+	inline constexpr const char man_in_tuxedo_tone1[] = "🤵🏻‍♂️";
+	inline constexpr const char man_in_tuxedo_light_skin_tone[] = "🤵🏻‍♂️";
+	inline constexpr const char man_in_tuxedo_tone2[] = "🤵🏼‍♂️";
+	inline constexpr const char man_in_tuxedo_medium_light_skin_tone[] = "🤵🏼‍♂️";
+	inline constexpr const char man_in_tuxedo_tone3[] = "🤵🏽‍♂️";
+	inline constexpr const char man_in_tuxedo_medium_skin_tone[] = "🤵🏽‍♂️";
+	inline constexpr const char man_in_tuxedo_tone4[] = "🤵🏾‍♂️";
+	inline constexpr const char man_in_tuxedo_medium_dark_skin_tone[] = "🤵🏾‍♂️";
+	inline constexpr const char man_in_tuxedo_tone5[] = "🤵🏿‍♂️";
+	inline constexpr const char man_in_tuxedo_dark_skin_tone[] = "🤵🏿‍♂️";
+	inline constexpr const char person_with_crown[] = "🫅";
+	inline constexpr const char person_with_crown_tone1[] = "🫅🏻";
+	inline constexpr const char person_with_crown_light_skin_tone[] = "🫅🏻";
+	inline constexpr const char person_with_crown_tone2[] = "🫅🏼";
+	inline constexpr const char person_with_crown_medium_light_skin_tone[] = "🫅🏼";
+	inline constexpr const char person_with_crown_tone3[] = "🫅🏽";
+	inline constexpr const char person_with_crown_medium_skin_tone[] = "🫅🏽";
+	inline constexpr const char person_with_crown_tone4[] = "🫅🏾";
+	inline constexpr const char person_with_crown_medium_dark_skin_tone[] = "🫅🏾";
+	inline constexpr const char person_with_crown_tone5[] = "🫅🏿";
+	inline constexpr const char person_with_crown_dark_skin_tone[] = "🫅🏿";
+	inline constexpr const char princess[] = "👸";
+	inline constexpr const char princess_tone1[] = "👸🏻";
+	inline constexpr const char princess_tone2[] = "👸🏼";
+	inline constexpr const char princess_tone3[] = "👸🏽";
+	inline constexpr const char princess_tone4[] = "👸🏾";
+	inline constexpr const char princess_tone5[] = "👸🏿";
+	inline constexpr const char prince[] = "🤴";
+	inline constexpr const char prince_tone1[] = "🤴🏻";
+	inline constexpr const char prince_tone2[] = "🤴🏼";
+	inline constexpr const char prince_tone3[] = "🤴🏽";
+	inline constexpr const char prince_tone4[] = "🤴🏾";
+	inline constexpr const char prince_tone5[] = "🤴🏿";
+	inline constexpr const char superhero[] = "🦸";
+	inline constexpr const char superhero_tone1[] = "🦸🏻";
+	inline constexpr const char superhero_light_skin_tone[] = "🦸🏻";
+	inline constexpr const char superhero_tone2[] = "🦸🏼";
+	inline constexpr const char superhero_medium_light_skin_tone[] = "🦸🏼";
+	inline constexpr const char superhero_tone3[] = "🦸🏽";
+	inline constexpr const char superhero_medium_skin_tone[] = "🦸🏽";
+	inline constexpr const char superhero_tone4[] = "🦸🏾";
+	inline constexpr const char superhero_medium_dark_skin_tone[] = "🦸🏾";
+	inline constexpr const char superhero_tone5[] = "🦸🏿";
+	inline constexpr const char superhero_dark_skin_tone[] = "🦸🏿";
+	inline constexpr const char woman_superhero[] = "🦸‍♀️";
+	inline constexpr const char woman_superhero_tone1[] = "🦸🏻‍♀️";
+	inline constexpr const char woman_superhero_light_skin_tone[] = "🦸🏻‍♀️";
+	inline constexpr const char woman_superhero_tone2[] = "🦸🏼‍♀️";
+	inline constexpr const char woman_superhero_medium_light_skin_tone[] = "🦸🏼‍♀️";
+	inline constexpr const char woman_superhero_tone3[] = "🦸🏽‍♀️";
+	inline constexpr const char woman_superhero_medium_skin_tone[] = "🦸🏽‍♀️";
+	inline constexpr const char woman_superhero_tone4[] = "🦸🏾‍♀️";
+	inline constexpr const char woman_superhero_medium_dark_skin_tone[] = "🦸🏾‍♀️";
+	inline constexpr const char woman_superhero_tone5[] = "🦸🏿‍♀️";
+	inline constexpr const char woman_superhero_dark_skin_tone[] = "🦸🏿‍♀️";
+	inline constexpr const char man_superhero[] = "🦸‍♂️";
+	inline constexpr const char man_superhero_tone1[] = "🦸🏻‍♂️";
+	inline constexpr const char man_superhero_light_skin_tone[] = "🦸🏻‍♂️";
+	inline constexpr const char man_superhero_tone2[] = "🦸🏼‍♂️";
+	inline constexpr const char man_superhero_medium_light_skin_tone[] = "🦸🏼‍♂️";
+	inline constexpr const char man_superhero_tone3[] = "🦸🏽‍♂️";
+	inline constexpr const char man_superhero_medium_skin_tone[] = "🦸🏽‍♂️";
+	inline constexpr const char man_superhero_tone4[] = "🦸🏾‍♂️";
+	inline constexpr const char man_superhero_medium_dark_skin_tone[] = "🦸🏾‍♂️";
+	inline constexpr const char man_superhero_tone5[] = "🦸🏿‍♂️";
+	inline constexpr const char man_superhero_dark_skin_tone[] = "🦸🏿‍♂️";
+	inline constexpr const char supervillain[] = "🦹";
+	inline constexpr const char supervillain_tone1[] = "🦹🏻";
+	inline constexpr const char supervillain_light_skin_tone[] = "🦹🏻";
+	inline constexpr const char supervillain_tone2[] = "🦹🏼";
+	inline constexpr const char supervillain_medium_light_skin_tone[] = "🦹🏼";
+	inline constexpr const char supervillain_tone3[] = "🦹🏽";
+	inline constexpr const char supervillain_medium_skin_tone[] = "🦹🏽";
+	inline constexpr const char supervillain_tone4[] = "🦹🏾";
+	inline constexpr const char supervillain_medium_dark_skin_tone[] = "🦹🏾";
+	inline constexpr const char supervillain_tone5[] = "🦹🏿";
+	inline constexpr const char supervillain_dark_skin_tone[] = "🦹🏿";
+	inline constexpr const char woman_supervillain[] = "🦹‍♀️";
+	inline constexpr const char woman_supervillain_tone1[] = "🦹🏻‍♀️";
+	inline constexpr const char woman_supervillain_light_skin_tone[] = "🦹🏻‍♀️";
+	inline constexpr const char woman_supervillain_tone2[] = "🦹🏼‍♀️";
+	inline constexpr const char woman_supervillain_medium_light_skin_tone[] = "🦹🏼‍♀️";
+	inline constexpr const char woman_supervillain_tone3[] = "🦹🏽‍♀️";
+	inline constexpr const char woman_supervillain_medium_skin_tone[] = "🦹🏽‍♀️";
+	inline constexpr const char woman_supervillain_tone4[] = "🦹🏾‍♀️";
+	inline constexpr const char woman_supervillain_medium_dark_skin_tone[] = "🦹🏾‍♀️";
+	inline constexpr const char woman_supervillain_tone5[] = "🦹🏿‍♀️";
+	inline constexpr const char woman_supervillain_dark_skin_tone[] = "🦹🏿‍♀️";
+	inline constexpr const char man_supervillain[] = "🦹‍♂️";
+	inline constexpr const char man_supervillain_tone1[] = "🦹🏻‍♂️";
+	inline constexpr const char man_supervillain_light_skin_tone[] = "🦹🏻‍♂️";
+	inline constexpr const char man_supervillain_tone2[] = "🦹🏼‍♂️";
+	inline constexpr const char man_supervillain_medium_light_skin_tone[] = "🦹🏼‍♂️";
+	inline constexpr const char man_supervillain_tone3[] = "🦹🏽‍♂️";
+	inline constexpr const char man_supervillain_medium_skin_tone[] = "🦹🏽‍♂️";
+	inline constexpr const char man_supervillain_tone4[] = "🦹🏾‍♂️";
+	inline constexpr const char man_supervillain_medium_dark_skin_tone[] = "🦹🏾‍♂️";
+	inline constexpr const char man_supervillain_tone5[] = "🦹🏿‍♂️";
+	inline constexpr const char man_supervillain_dark_skin_tone[] = "🦹🏿‍♂️";
+	inline constexpr const char ninja[] = "🥷";
+	inline constexpr const char ninja_tone1[] = "🥷🏻";
+	inline constexpr const char ninja_light_skin_tone[] = "🥷🏻";
+	inline constexpr const char ninja_tone2[] = "🥷🏼";
+	inline constexpr const char ninja_medium_light_skin_tone[] = "🥷🏼";
+	inline constexpr const char ninja_tone3[] = "🥷🏽";
+	inline constexpr const char ninja_medium_skin_tone[] = "🥷🏽";
+	inline constexpr const char ninja_tone4[] = "🥷🏾";
+	inline constexpr const char ninja_medium_dark_skin_tone[] = "🥷🏾";
+	inline constexpr const char ninja_tone5[] = "🥷🏿";
+	inline constexpr const char ninja_dark_skin_tone[] = "🥷🏿";
+	inline constexpr const char mx_claus[] = "🧑‍🎄";
+	inline constexpr const char mx_claus_tone1[] = "🧑🏻‍🎄";
+	inline constexpr const char mx_claus_light_skin_tone[] = "🧑🏻‍🎄";
+	inline constexpr const char mx_claus_tone2[] = "🧑🏼‍🎄";
+	inline constexpr const char mx_claus_medium_light_skin_tone[] = "🧑🏼‍🎄";
+	inline constexpr const char mx_claus_tone3[] = "🧑🏽‍🎄";
+	inline constexpr const char mx_claus_medium_skin_tone[] = "🧑🏽‍🎄";
+	inline constexpr const char mx_claus_tone4[] = "🧑🏾‍🎄";
+	inline constexpr const char mx_claus_medium_dark_skin_tone[] = "🧑🏾‍🎄";
+	inline constexpr const char mx_claus_tone5[] = "🧑🏿‍🎄";
+	inline constexpr const char mx_claus_dark_skin_tone[] = "🧑🏿‍🎄";
+	inline constexpr const char mrs_claus[] = "🤶";
+	inline constexpr const char mother_christmas[] = "🤶";
+	inline constexpr const char mrs_claus_tone1[] = "🤶🏻";
+	inline constexpr const char mother_christmas_tone1[] = "🤶🏻";
+	inline constexpr const char mrs_claus_tone2[] = "🤶🏼";
+	inline constexpr const char mother_christmas_tone2[] = "🤶🏼";
+	inline constexpr const char mrs_claus_tone3[] = "🤶🏽";
+	inline constexpr const char mother_christmas_tone3[] = "🤶🏽";
+	inline constexpr const char mrs_claus_tone4[] = "🤶🏾";
+	inline constexpr const char mother_christmas_tone4[] = "🤶🏾";
+	inline constexpr const char mrs_claus_tone5[] = "🤶🏿";
+	inline constexpr const char mother_christmas_tone5[] = "🤶🏿";
+	inline constexpr const char santa[] = "🎅";
+	inline constexpr const char santa_claus[] = "🎅";
+	inline constexpr const char santa_tone1[] = "🎅🏻";
+	inline constexpr const char santa_tone2[] = "🎅🏼";
+	inline constexpr const char santa_tone3[] = "🎅🏽";
+	inline constexpr const char santa_tone4[] = "🎅🏾";
+	inline constexpr const char santa_tone5[] = "🎅🏿";
+	inline constexpr const char mage[] = "🧙";
+	inline constexpr const char mage_tone1[] = "🧙🏻";
+	inline constexpr const char mage_light_skin_tone[] = "🧙🏻";
+	inline constexpr const char mage_tone2[] = "🧙🏼";
+	inline constexpr const char mage_medium_light_skin_tone[] = "🧙🏼";
+	inline constexpr const char mage_tone3[] = "🧙🏽";
+	inline constexpr const char mage_medium_skin_tone[] = "🧙🏽";
+	inline constexpr const char mage_tone4[] = "🧙🏾";
+	inline constexpr const char mage_medium_dark_skin_tone[] = "🧙🏾";
+	inline constexpr const char mage_tone5[] = "🧙🏿";
+	inline constexpr const char mage_dark_skin_tone[] = "🧙🏿";
+	inline constexpr const char woman_mage[] = "🧙‍♀️";
+	inline constexpr const char woman_mage_tone1[] = "🧙🏻‍♀️";
+	inline constexpr const char woman_mage_light_skin_tone[] = "🧙🏻‍♀️";
+	inline constexpr const char woman_mage_tone2[] = "🧙🏼‍♀️";
+	inline constexpr const char woman_mage_medium_light_skin_tone[] = "🧙🏼‍♀️";
+	inline constexpr const char woman_mage_tone3[] = "🧙🏽‍♀️";
+	inline constexpr const char woman_mage_medium_skin_tone[] = "🧙🏽‍♀️";
+	inline constexpr const char woman_mage_tone4[] = "🧙🏾‍♀️";
+	inline constexpr const char woman_mage_medium_dark_skin_tone[] = "🧙🏾‍♀️";
+	inline constexpr const char woman_mage_tone5[] = "🧙🏿‍♀️";
+	inline constexpr const char woman_mage_dark_skin_tone[] = "🧙🏿‍♀️";
+	inline constexpr const char man_mage[] = "🧙‍♂️";
+	inline constexpr const char man_mage_tone1[] = "🧙🏻‍♂️";
+	inline constexpr const char man_mage_light_skin_tone[] = "🧙🏻‍♂️";
+	inline constexpr const char man_mage_tone2[] = "🧙🏼‍♂️";
+	inline constexpr const char man_mage_medium_light_skin_tone[] = "🧙🏼‍♂️";
+	inline constexpr const char man_mage_tone3[] = "🧙🏽‍♂️";
+	inline constexpr const char man_mage_medium_skin_tone[] = "🧙🏽‍♂️";
+	inline constexpr const char man_mage_tone4[] = "🧙🏾‍♂️";
+	inline constexpr const char man_mage_medium_dark_skin_tone[] = "🧙🏾‍♂️";
+	inline constexpr const char man_mage_tone5[] = "🧙🏿‍♂️";
+	inline constexpr const char man_mage_dark_skin_tone[] = "🧙🏿‍♂️";
+	inline constexpr const char elf[] = "🧝";
+	inline constexpr const char elf_tone1[] = "🧝🏻";
+	inline constexpr const char elf_light_skin_tone[] = "🧝🏻";
+	inline constexpr const char elf_tone2[] = "🧝🏼";
+	inline constexpr const char elf_medium_light_skin_tone[] = "🧝🏼";
+	inline constexpr const char elf_tone3[] = "🧝🏽";
+	inline constexpr const char elf_medium_skin_tone[] = "🧝🏽";
+	inline constexpr const char elf_tone4[] = "🧝🏾";
+	inline constexpr const char elf_medium_dark_skin_tone[] = "🧝🏾";
+	inline constexpr const char elf_tone5[] = "🧝🏿";
+	inline constexpr const char elf_dark_skin_tone[] = "🧝🏿";
+	inline constexpr const char woman_elf[] = "🧝‍♀️";
+	inline constexpr const char woman_elf_tone1[] = "🧝🏻‍♀️";
+	inline constexpr const char woman_elf_light_skin_tone[] = "🧝🏻‍♀️";
+	inline constexpr const char woman_elf_tone2[] = "🧝🏼‍♀️";
+	inline constexpr const char woman_elf_medium_light_skin_tone[] = "🧝🏼‍♀️";
+	inline constexpr const char woman_elf_tone3[] = "🧝🏽‍♀️";
+	inline constexpr const char woman_elf_medium_skin_tone[] = "🧝🏽‍♀️";
+	inline constexpr const char woman_elf_tone4[] = "🧝🏾‍♀️";
+	inline constexpr const char woman_elf_medium_dark_skin_tone[] = "🧝🏾‍♀️";
+	inline constexpr const char woman_elf_tone5[] = "🧝🏿‍♀️";
+	inline constexpr const char woman_elf_dark_skin_tone[] = "🧝🏿‍♀️";
+	inline constexpr const char man_elf[] = "🧝‍♂️";
+	inline constexpr const char man_elf_tone1[] = "🧝🏻‍♂️";
+	inline constexpr const char man_elf_light_skin_tone[] = "🧝🏻‍♂️";
+	inline constexpr const char man_elf_tone2[] = "🧝🏼‍♂️";
+	inline constexpr const char man_elf_medium_light_skin_tone[] = "🧝🏼‍♂️";
+	inline constexpr const char man_elf_tone3[] = "🧝🏽‍♂️";
+	inline constexpr const char man_elf_medium_skin_tone[] = "🧝🏽‍♂️";
+	inline constexpr const char man_elf_tone4[] = "🧝🏾‍♂️";
+	inline constexpr const char man_elf_medium_dark_skin_tone[] = "🧝🏾‍♂️";
+	inline constexpr const char man_elf_tone5[] = "🧝🏿‍♂️";
+	inline constexpr const char man_elf_dark_skin_tone[] = "🧝🏿‍♂️";
+	inline constexpr const char troll[] = "🧌";
+	inline constexpr const char vampire[] = "🧛";
+	inline constexpr const char vampire_tone1[] = "🧛🏻";
+	inline constexpr const char vampire_light_skin_tone[] = "🧛🏻";
+	inline constexpr const char vampire_tone2[] = "🧛🏼";
+	inline constexpr const char vampire_medium_light_skin_tone[] = "🧛🏼";
+	inline constexpr const char vampire_tone3[] = "🧛🏽";
+	inline constexpr const char vampire_medium_skin_tone[] = "🧛🏽";
+	inline constexpr const char vampire_tone4[] = "🧛🏾";
+	inline constexpr const char vampire_medium_dark_skin_tone[] = "🧛🏾";
+	inline constexpr const char vampire_tone5[] = "🧛🏿";
+	inline constexpr const char vampire_dark_skin_tone[] = "🧛🏿";
+	inline constexpr const char woman_vampire[] = "🧛‍♀️";
+	inline constexpr const char woman_vampire_tone1[] = "🧛🏻‍♀️";
+	inline constexpr const char woman_vampire_light_skin_tone[] = "🧛🏻‍♀️";
+	inline constexpr const char woman_vampire_tone2[] = "🧛🏼‍♀️";
+	inline constexpr const char woman_vampire_medium_light_skin_tone[] = "🧛🏼‍♀️";
+	inline constexpr const char woman_vampire_tone3[] = "🧛🏽‍♀️";
+	inline constexpr const char woman_vampire_medium_skin_tone[] = "🧛🏽‍♀️";
+	inline constexpr const char woman_vampire_tone4[] = "🧛🏾‍♀️";
+	inline constexpr const char woman_vampire_medium_dark_skin_tone[] = "🧛🏾‍♀️";
+	inline constexpr const char woman_vampire_tone5[] = "🧛🏿‍♀️";
+	inline constexpr const char woman_vampire_dark_skin_tone[] = "🧛🏿‍♀️";
+	inline constexpr const char man_vampire[] = "🧛‍♂️";
+	inline constexpr const char man_vampire_tone1[] = "🧛🏻‍♂️";
+	inline constexpr const char man_vampire_light_skin_tone[] = "🧛🏻‍♂️";
+	inline constexpr const char man_vampire_tone2[] = "🧛🏼‍♂️";
+	inline constexpr const char man_vampire_medium_light_skin_tone[] = "🧛🏼‍♂️";
+	inline constexpr const char man_vampire_tone3[] = "🧛🏽‍♂️";
+	inline constexpr const char man_vampire_medium_skin_tone[] = "🧛🏽‍♂️";
+	inline constexpr const char man_vampire_tone4[] = "🧛🏾‍♂️";
+	inline constexpr const char man_vampire_medium_dark_skin_tone[] = "🧛🏾‍♂️";
+	inline constexpr const char man_vampire_tone5[] = "🧛🏿‍♂️";
+	inline constexpr const char man_vampire_dark_skin_tone[] = "🧛🏿‍♂️";
+	inline constexpr const char zombie[] = "🧟";
+	inline constexpr const char woman_zombie[] = "🧟‍♀️";
+	inline constexpr const char man_zombie[] = "🧟‍♂️";
+	inline constexpr const char genie[] = "🧞";
+	inline constexpr const char woman_genie[] = "🧞‍♀️";
+	inline constexpr const char man_genie[] = "🧞‍♂️";
+	inline constexpr const char merperson[] = "🧜";
+	inline constexpr const char merperson_tone1[] = "🧜🏻";
+	inline constexpr const char merperson_light_skin_tone[] = "🧜🏻";
+	inline constexpr const char merperson_tone2[] = "🧜🏼";
+	inline constexpr const char merperson_medium_light_skin_tone[] = "🧜🏼";
+	inline constexpr const char merperson_tone3[] = "🧜🏽";
+	inline constexpr const char merperson_medium_skin_tone[] = "🧜🏽";
+	inline constexpr const char merperson_tone4[] = "🧜🏾";
+	inline constexpr const char merperson_medium_dark_skin_tone[] = "🧜🏾";
+	inline constexpr const char merperson_tone5[] = "🧜🏿";
+	inline constexpr const char merperson_dark_skin_tone[] = "🧜🏿";
+	inline constexpr const char mermaid[] = "🧜‍♀️";
+	inline constexpr const char mermaid_tone1[] = "🧜🏻‍♀️";
+	inline constexpr const char mermaid_light_skin_tone[] = "🧜🏻‍♀️";
+	inline constexpr const char mermaid_tone2[] = "🧜🏼‍♀️";
+	inline constexpr const char mermaid_medium_light_skin_tone[] = "🧜🏼‍♀️";
+	inline constexpr const char mermaid_tone3[] = "🧜🏽‍♀️";
+	inline constexpr const char mermaid_medium_skin_tone[] = "🧜🏽‍♀️";
+	inline constexpr const char mermaid_tone4[] = "🧜🏾‍♀️";
+	inline constexpr const char mermaid_medium_dark_skin_tone[] = "🧜🏾‍♀️";
+	inline constexpr const char mermaid_tone5[] = "🧜🏿‍♀️";
+	inline constexpr const char mermaid_dark_skin_tone[] = "🧜🏿‍♀️";
+	inline constexpr const char merman[] = "🧜‍♂️";
+	inline constexpr const char merman_tone1[] = "🧜🏻‍♂️";
+	inline constexpr const char merman_light_skin_tone[] = "🧜🏻‍♂️";
+	inline constexpr const char merman_tone2[] = "🧜🏼‍♂️";
+	inline constexpr const char merman_medium_light_skin_tone[] = "🧜🏼‍♂️";
+	inline constexpr const char merman_tone3[] = "🧜🏽‍♂️";
+	inline constexpr const char merman_medium_skin_tone[] = "🧜🏽‍♂️";
+	inline constexpr const char merman_tone4[] = "🧜🏾‍♂️";
+	inline constexpr const char merman_medium_dark_skin_tone[] = "🧜🏾‍♂️";
+	inline constexpr const char merman_tone5[] = "🧜🏿‍♂️";
+	inline constexpr const char merman_dark_skin_tone[] = "🧜🏿‍♂️";
+	inline constexpr const char fairy[] = "🧚";
+	inline constexpr const char fairy_tone1[] = "🧚🏻";
+	inline constexpr const char fairy_light_skin_tone[] = "🧚🏻";
+	inline constexpr const char fairy_tone2[] = "🧚🏼";
+	inline constexpr const char fairy_medium_light_skin_tone[] = "🧚🏼";
+	inline constexpr const char fairy_tone3[] = "🧚🏽";
+	inline constexpr const char fairy_medium_skin_tone[] = "🧚🏽";
+	inline constexpr const char fairy_tone4[] = "🧚🏾";
+	inline constexpr const char fairy_medium_dark_skin_tone[] = "🧚🏾";
+	inline constexpr const char fairy_tone5[] = "🧚🏿";
+	inline constexpr const char fairy_dark_skin_tone[] = "🧚🏿";
+	inline constexpr const char woman_fairy[] = "🧚‍♀️";
+	inline constexpr const char woman_fairy_tone1[] = "🧚🏻‍♀️";
+	inline constexpr const char woman_fairy_light_skin_tone[] = "🧚🏻‍♀️";
+	inline constexpr const char woman_fairy_tone2[] = "🧚🏼‍♀️";
+	inline constexpr const char woman_fairy_medium_light_skin_tone[] = "🧚🏼‍♀️";
+	inline constexpr const char woman_fairy_tone3[] = "🧚🏽‍♀️";
+	inline constexpr const char woman_fairy_medium_skin_tone[] = "🧚🏽‍♀️";
+	inline constexpr const char woman_fairy_tone4[] = "🧚🏾‍♀️";
+	inline constexpr const char woman_fairy_medium_dark_skin_tone[] = "🧚🏾‍♀️";
+	inline constexpr const char woman_fairy_tone5[] = "🧚🏿‍♀️";
+	inline constexpr const char woman_fairy_dark_skin_tone[] = "🧚🏿‍♀️";
+	inline constexpr const char man_fairy[] = "🧚‍♂️";
+	inline constexpr const char man_fairy_tone1[] = "🧚🏻‍♂️";
+	inline constexpr const char man_fairy_light_skin_tone[] = "🧚🏻‍♂️";
+	inline constexpr const char man_fairy_tone2[] = "🧚🏼‍♂️";
+	inline constexpr const char man_fairy_medium_light_skin_tone[] = "🧚🏼‍♂️";
+	inline constexpr const char man_fairy_tone3[] = "🧚🏽‍♂️";
+	inline constexpr const char man_fairy_medium_skin_tone[] = "🧚🏽‍♂️";
+	inline constexpr const char man_fairy_tone4[] = "🧚🏾‍♂️";
+	inline constexpr const char man_fairy_medium_dark_skin_tone[] = "🧚🏾‍♂️";
+	inline constexpr const char man_fairy_tone5[] = "🧚🏿‍♂️";
+	inline constexpr const char man_fairy_dark_skin_tone[] = "🧚🏿‍♂️";
+	inline constexpr const char angel[] = "👼";
+	inline constexpr const char baby_angel[] = "👼";
+	inline constexpr const char angel_tone1[] = "👼🏻";
+	inline constexpr const char angel_tone2[] = "👼🏼";
+	inline constexpr const char angel_tone3[] = "👼🏽";
+	inline constexpr const char angel_tone4[] = "👼🏾";
+	inline constexpr const char angel_tone5[] = "👼🏿";
+	inline constexpr const char pregnant_person[] = "🫄";
+	inline constexpr const char pregnant_person_tone1[] = "🫄🏻";
+	inline constexpr const char pregnant_person_light_skin_tone[] = "🫄🏻";
+	inline constexpr const char pregnant_person_tone2[] = "🫄🏼";
+	inline constexpr const char pregnant_person_medium_light_skin_tone[] = "🫄🏼";
+	inline constexpr const char pregnant_person_tone3[] = "🫄🏽";
+	inline constexpr const char pregnant_person_medium_skin_tone[] = "🫄🏽";
+	inline constexpr const char pregnant_person_tone4[] = "🫄🏾";
+	inline constexpr const char pregnant_person_medium_dark_skin_tone[] = "🫄🏾";
+	inline constexpr const char pregnant_person_tone5[] = "🫄🏿";
+	inline constexpr const char pregnant_person_dark_skin_tone[] = "🫄🏿";
+	inline constexpr const char pregnant_woman[] = "🤰";
+	inline constexpr const char expecting_woman[] = "🤰";
+	inline constexpr const char pregnant_woman_tone1[] = "🤰🏻";
+	inline constexpr const char expecting_woman_tone1[] = "🤰🏻";
+	inline constexpr const char pregnant_woman_tone2[] = "🤰🏼";
+	inline constexpr const char expecting_woman_tone2[] = "🤰🏼";
+	inline constexpr const char pregnant_woman_tone3[] = "🤰🏽";
+	inline constexpr const char expecting_woman_tone3[] = "🤰🏽";
+	inline constexpr const char pregnant_woman_tone4[] = "🤰🏾";
+	inline constexpr const char expecting_woman_tone4[] = "🤰🏾";
+	inline constexpr const char pregnant_woman_tone5[] = "🤰🏿";
+	inline constexpr const char expecting_woman_tone5[] = "🤰🏿";
+	inline constexpr const char pregnant_man[] = "🫃";
+	inline constexpr const char pregnant_man_tone1[] = "🫃🏻";
+	inline constexpr const char pregnant_man_light_skin_tone[] = "🫃🏻";
+	inline constexpr const char pregnant_man_tone2[] = "🫃🏼";
+	inline constexpr const char pregnant_man_medium_light_skin_tone[] = "🫃🏼";
+	inline constexpr const char pregnant_man_tone3[] = "🫃🏽";
+	inline constexpr const char pregnant_man_medium_skin_tone[] = "🫃🏽";
+	inline constexpr const char pregnant_man_tone4[] = "🫃🏾";
+	inline constexpr const char pregnant_man_medium_dark_skin_tone[] = "🫃🏾";
+	inline constexpr const char pregnant_man_tone5[] = "🫃🏿";
+	inline constexpr const char pregnant_man_dark_skin_tone[] = "🫃🏿";
+	inline constexpr const char breast_feeding[] = "🤱";
+	inline constexpr const char breast_feeding_tone1[] = "🤱🏻";
+	inline constexpr const char breast_feeding_light_skin_tone[] = "🤱🏻";
+	inline constexpr const char breast_feeding_tone2[] = "🤱🏼";
+	inline constexpr const char breast_feeding_medium_light_skin_tone[] = "🤱🏼";
+	inline constexpr const char breast_feeding_tone3[] = "🤱🏽";
+	inline constexpr const char breast_feeding_medium_skin_tone[] = "🤱🏽";
+	inline constexpr const char breast_feeding_tone4[] = "🤱🏾";
+	inline constexpr const char breast_feeding_medium_dark_skin_tone[] = "🤱🏾";
+	inline constexpr const char breast_feeding_tone5[] = "🤱🏿";
+	inline constexpr const char breast_feeding_dark_skin_tone[] = "🤱🏿";
+	inline constexpr const char person_feeding_baby[] = "🧑‍🍼";
+	inline constexpr const char person_feeding_baby_tone1[] = "🧑🏻‍🍼";
+	inline constexpr const char person_feeding_baby_light_skin_tone[] = "🧑🏻‍🍼";
+	inline constexpr const char person_feeding_baby_tone2[] = "🧑🏼‍🍼";
+	inline constexpr const char person_feeding_baby_medium_light_skin_tone[] = "🧑🏼‍🍼";
+	inline constexpr const char person_feeding_baby_tone3[] = "🧑🏽‍🍼";
+	inline constexpr const char person_feeding_baby_medium_skin_tone[] = "🧑🏽‍🍼";
+	inline constexpr const char person_feeding_baby_tone4[] = "🧑🏾‍🍼";
+	inline constexpr const char person_feeding_baby_medium_dark_skin_tone[] = "🧑🏾‍🍼";
+	inline constexpr const char person_feeding_baby_tone5[] = "🧑🏿‍🍼";
+	inline constexpr const char person_feeding_baby_dark_skin_tone[] = "🧑🏿‍🍼";
+	inline constexpr const char woman_feeding_baby[] = "👩‍🍼";
+	inline constexpr const char woman_feeding_baby_tone1[] = "👩🏻‍🍼";
+	inline constexpr const char woman_feeding_baby_light_skin_tone[] = "👩🏻‍🍼";
+	inline constexpr const char woman_feeding_baby_tone2[] = "👩🏼‍🍼";
+	inline constexpr const char woman_feeding_baby_medium_light_skin_tone[] = "👩🏼‍🍼";
+	inline constexpr const char woman_feeding_baby_tone3[] = "👩🏽‍🍼";
+	inline constexpr const char woman_feeding_baby_medium_skin_tone[] = "👩🏽‍🍼";
+	inline constexpr const char woman_feeding_baby_tone4[] = "👩🏾‍🍼";
+	inline constexpr const char woman_feeding_baby_medium_dark_skin_tone[] = "👩🏾‍🍼";
+	inline constexpr const char woman_feeding_baby_tone5[] = "👩🏿‍🍼";
+	inline constexpr const char woman_feeding_baby_dark_skin_tone[] = "👩🏿‍🍼";
+	inline constexpr const char man_feeding_baby[] = "👨‍🍼";
+	inline constexpr const char man_feeding_baby_tone1[] = "👨🏻‍🍼";
+	inline constexpr const char man_feeding_baby_light_skin_tone[] = "👨🏻‍🍼";
+	inline constexpr const char man_feeding_baby_tone2[] = "👨🏼‍🍼";
+	inline constexpr const char man_feeding_baby_medium_light_skin_tone[] = "👨🏼‍🍼";
+	inline constexpr const char man_feeding_baby_tone3[] = "👨🏽‍🍼";
+	inline constexpr const char man_feeding_baby_medium_skin_tone[] = "👨🏽‍🍼";
+	inline constexpr const char man_feeding_baby_tone4[] = "👨🏾‍🍼";
+	inline constexpr const char man_feeding_baby_medium_dark_skin_tone[] = "👨🏾‍🍼";
+	inline constexpr const char man_feeding_baby_tone5[] = "👨🏿‍🍼";
+	inline constexpr const char man_feeding_baby_dark_skin_tone[] = "👨🏿‍🍼";
+	inline constexpr const char person_bowing[] = "🙇";
+	inline constexpr const char bow[] = "🙇";
+	inline constexpr const char person_bowing_tone1[] = "🙇🏻";
+	inline constexpr const char bow_tone1[] = "🙇🏻";
+	inline constexpr const char person_bowing_tone2[] = "🙇🏼";
+	inline constexpr const char bow_tone2[] = "🙇🏼";
+	inline constexpr const char person_bowing_tone3[] = "🙇🏽";
+	inline constexpr const char bow_tone3[] = "🙇🏽";
+	inline constexpr const char person_bowing_tone4[] = "🙇🏾";
+	inline constexpr const char bow_tone4[] = "🙇🏾";
+	inline constexpr const char person_bowing_tone5[] = "🙇🏿";
+	inline constexpr const char bow_tone5[] = "🙇🏿";
+	inline constexpr const char woman_bowing[] = "🙇‍♀️";
+	inline constexpr const char woman_bowing_tone1[] = "🙇🏻‍♀️";
+	inline constexpr const char woman_bowing_light_skin_tone[] = "🙇🏻‍♀️";
+	inline constexpr const char woman_bowing_tone2[] = "🙇🏼‍♀️";
+	inline constexpr const char woman_bowing_medium_light_skin_tone[] = "🙇🏼‍♀️";
+	inline constexpr const char woman_bowing_tone3[] = "🙇🏽‍♀️";
+	inline constexpr const char woman_bowing_medium_skin_tone[] = "🙇🏽‍♀️";
+	inline constexpr const char woman_bowing_tone4[] = "🙇🏾‍♀️";
+	inline constexpr const char woman_bowing_medium_dark_skin_tone[] = "🙇🏾‍♀️";
+	inline constexpr const char woman_bowing_tone5[] = "🙇🏿‍♀️";
+	inline constexpr const char woman_bowing_dark_skin_tone[] = "🙇🏿‍♀️";
+	inline constexpr const char man_bowing[] = "🙇‍♂️";
+	inline constexpr const char man_bowing_tone1[] = "🙇🏻‍♂️";
+	inline constexpr const char man_bowing_light_skin_tone[] = "🙇🏻‍♂️";
+	inline constexpr const char man_bowing_tone2[] = "🙇🏼‍♂️";
+	inline constexpr const char man_bowing_medium_light_skin_tone[] = "🙇🏼‍♂️";
+	inline constexpr const char man_bowing_tone3[] = "🙇🏽‍♂️";
+	inline constexpr const char man_bowing_medium_skin_tone[] = "🙇🏽‍♂️";
+	inline constexpr const char man_bowing_tone4[] = "🙇🏾‍♂️";
+	inline constexpr const char man_bowing_medium_dark_skin_tone[] = "🙇🏾‍♂️";
+	inline constexpr const char man_bowing_tone5[] = "🙇🏿‍♂️";
+	inline constexpr const char man_bowing_dark_skin_tone[] = "🙇🏿‍♂️";
+	inline constexpr const char person_tipping_hand[] = "💁";
+	inline constexpr const char information_desk_person[] = "💁";
+	inline constexpr const char person_tipping_hand_tone1[] = "💁🏻";
+	inline constexpr const char information_desk_person_tone1[] = "💁🏻";
+	inline constexpr const char person_tipping_hand_tone2[] = "💁🏼";
+	inline constexpr const char information_desk_person_tone2[] = "💁🏼";
+	inline constexpr const char person_tipping_hand_tone3[] = "💁🏽";
+	inline constexpr const char information_desk_person_tone3[] = "💁🏽";
+	inline constexpr const char person_tipping_hand_tone4[] = "💁🏾";
+	inline constexpr const char information_desk_person_tone4[] = "💁🏾";
+	inline constexpr const char person_tipping_hand_tone5[] = "💁🏿";
+	inline constexpr const char information_desk_person_tone5[] = "💁🏿";
+	inline constexpr const char woman_tipping_hand[] = "💁‍♀️";
+	inline constexpr const char woman_tipping_hand_tone1[] = "💁🏻‍♀️";
+	inline constexpr const char woman_tipping_hand_light_skin_tone[] = "💁🏻‍♀️";
+	inline constexpr const char woman_tipping_hand_tone2[] = "💁🏼‍♀️";
+	inline constexpr const char woman_tipping_hand_medium_light_skin_tone[] = "💁🏼‍♀️";
+	inline constexpr const char woman_tipping_hand_tone3[] = "💁🏽‍♀️";
+	inline constexpr const char woman_tipping_hand_medium_skin_tone[] = "💁🏽‍♀️";
+	inline constexpr const char woman_tipping_hand_tone4[] = "💁🏾‍♀️";
+	inline constexpr const char woman_tipping_hand_medium_dark_skin_tone[] = "💁🏾‍♀️";
+	inline constexpr const char woman_tipping_hand_tone5[] = "💁🏿‍♀️";
+	inline constexpr const char woman_tipping_hand_dark_skin_tone[] = "💁🏿‍♀️";
+	inline constexpr const char man_tipping_hand[] = "💁‍♂️";
+	inline constexpr const char man_tipping_hand_tone1[] = "💁🏻‍♂️";
+	inline constexpr const char man_tipping_hand_light_skin_tone[] = "💁🏻‍♂️";
+	inline constexpr const char man_tipping_hand_tone2[] = "💁🏼‍♂️";
+	inline constexpr const char man_tipping_hand_medium_light_skin_tone[] = "💁🏼‍♂️";
+	inline constexpr const char man_tipping_hand_tone3[] = "💁🏽‍♂️";
+	inline constexpr const char man_tipping_hand_medium_skin_tone[] = "💁🏽‍♂️";
+	inline constexpr const char man_tipping_hand_tone4[] = "💁🏾‍♂️";
+	inline constexpr const char man_tipping_hand_medium_dark_skin_tone[] = "💁🏾‍♂️";
+	inline constexpr const char man_tipping_hand_tone5[] = "💁🏿‍♂️";
+	inline constexpr const char man_tipping_hand_dark_skin_tone[] = "💁🏿‍♂️";
+	inline constexpr const char person_gesturing_no[] = "🙅";
+	inline constexpr const char no_good[] = "🙅";
+	inline constexpr const char person_gesturing_no_tone1[] = "🙅🏻";
+	inline constexpr const char no_good_tone1[] = "🙅🏻";
+	inline constexpr const char person_gesturing_no_tone2[] = "🙅🏼";
+	inline constexpr const char no_good_tone2[] = "🙅🏼";
+	inline constexpr const char person_gesturing_no_tone3[] = "🙅🏽";
+	inline constexpr const char no_good_tone3[] = "🙅🏽";
+	inline constexpr const char person_gesturing_no_tone4[] = "🙅🏾";
+	inline constexpr const char no_good_tone4[] = "🙅🏾";
+	inline constexpr const char person_gesturing_no_tone5[] = "🙅🏿";
+	inline constexpr const char no_good_tone5[] = "🙅🏿";
+	inline constexpr const char woman_gesturing_no[] = "🙅‍♀️";
+	inline constexpr const char woman_gesturing_no_tone1[] = "🙅🏻‍♀️";
+	inline constexpr const char woman_gesturing_no_light_skin_tone[] = "🙅🏻‍♀️";
+	inline constexpr const char woman_gesturing_no_tone2[] = "🙅🏼‍♀️";
+	inline constexpr const char woman_gesturing_no_medium_light_skin_tone[] = "🙅🏼‍♀️";
+	inline constexpr const char woman_gesturing_no_tone3[] = "🙅🏽‍♀️";
+	inline constexpr const char woman_gesturing_no_medium_skin_tone[] = "🙅🏽‍♀️";
+	inline constexpr const char woman_gesturing_no_tone4[] = "🙅🏾‍♀️";
+	inline constexpr const char woman_gesturing_no_medium_dark_skin_tone[] = "🙅🏾‍♀️";
+	inline constexpr const char woman_gesturing_no_tone5[] = "🙅🏿‍♀️";
+	inline constexpr const char woman_gesturing_no_dark_skin_tone[] = "🙅🏿‍♀️";
+	inline constexpr const char man_gesturing_no[] = "🙅‍♂️";
+	inline constexpr const char man_gesturing_no_tone1[] = "🙅🏻‍♂️";
+	inline constexpr const char man_gesturing_no_light_skin_tone[] = "🙅🏻‍♂️";
+	inline constexpr const char man_gesturing_no_tone2[] = "🙅🏼‍♂️";
+	inline constexpr const char man_gesturing_no_medium_light_skin_tone[] = "🙅🏼‍♂️";
+	inline constexpr const char man_gesturing_no_tone3[] = "🙅🏽‍♂️";
+	inline constexpr const char man_gesturing_no_medium_skin_tone[] = "🙅🏽‍♂️";
+	inline constexpr const char man_gesturing_no_tone4[] = "🙅🏾‍♂️";
+	inline constexpr const char man_gesturing_no_medium_dark_skin_tone[] = "🙅🏾‍♂️";
+	inline constexpr const char man_gesturing_no_tone5[] = "🙅🏿‍♂️";
+	inline constexpr const char man_gesturing_no_dark_skin_tone[] = "🙅🏿‍♂️";
+	inline constexpr const char person_gesturing_ok[] = "🙆";
+	inline constexpr const char person_gesturing_ok_tone1[] = "🙆🏻";
+	inline constexpr const char person_gesturing_ok_tone2[] = "🙆🏼";
+	inline constexpr const char person_gesturing_ok_tone3[] = "🙆🏽";
+	inline constexpr const char person_gesturing_ok_tone4[] = "🙆🏾";
+	inline constexpr const char person_gesturing_ok_tone5[] = "🙆🏿";
+	inline constexpr const char woman_gesturing_ok[] = "🙆‍♀️";
+	inline constexpr const char woman_gesturing_ok_tone1[] = "🙆🏻‍♀️";
+	inline constexpr const char woman_gesturing_ok_light_skin_tone[] = "🙆🏻‍♀️";
+	inline constexpr const char woman_gesturing_ok_tone2[] = "🙆🏼‍♀️";
+	inline constexpr const char woman_gesturing_ok_medium_light_skin_tone[] = "🙆🏼‍♀️";
+	inline constexpr const char woman_gesturing_ok_tone3[] = "🙆🏽‍♀️";
+	inline constexpr const char woman_gesturing_ok_medium_skin_tone[] = "🙆🏽‍♀️";
+	inline constexpr const char woman_gesturing_ok_tone4[] = "🙆🏾‍♀️";
+	inline constexpr const char woman_gesturing_ok_medium_dark_skin_tone[] = "🙆🏾‍♀️";
+	inline constexpr const char woman_gesturing_ok_tone5[] = "🙆🏿‍♀️";
+	inline constexpr const char woman_gesturing_ok_dark_skin_tone[] = "🙆🏿‍♀️";
+	inline constexpr const char man_gesturing_ok[] = "🙆‍♂️";
+	inline constexpr const char man_gesturing_ok_tone1[] = "🙆🏻‍♂️";
+	inline constexpr const char man_gesturing_ok_light_skin_tone[] = "🙆🏻‍♂️";
+	inline constexpr const char man_gesturing_ok_tone2[] = "🙆🏼‍♂️";
+	inline constexpr const char man_gesturing_ok_medium_light_skin_tone[] = "🙆🏼‍♂️";
+	inline constexpr const char man_gesturing_ok_tone3[] = "🙆🏽‍♂️";
+	inline constexpr const char man_gesturing_ok_medium_skin_tone[] = "🙆🏽‍♂️";
+	inline constexpr const char man_gesturing_ok_tone4[] = "🙆🏾‍♂️";
+	inline constexpr const char man_gesturing_ok_medium_dark_skin_tone[] = "🙆🏾‍♂️";
+	inline constexpr const char man_gesturing_ok_tone5[] = "🙆🏿‍♂️";
+	inline constexpr const char man_gesturing_ok_dark_skin_tone[] = "🙆🏿‍♂️";
+	inline constexpr const char person_raising_hand[] = "🙋";
+	inline constexpr const char raising_hand[] = "🙋";
+	inline constexpr const char person_raising_hand_tone1[] = "🙋🏻";
+	inline constexpr const char raising_hand_tone1[] = "🙋🏻";
+	inline constexpr const char person_raising_hand_tone2[] = "🙋🏼";
+	inline constexpr const char raising_hand_tone2[] = "🙋🏼";
+	inline constexpr const char person_raising_hand_tone3[] = "🙋🏽";
+	inline constexpr const char raising_hand_tone3[] = "🙋🏽";
+	inline constexpr const char person_raising_hand_tone4[] = "🙋🏾";
+	inline constexpr const char raising_hand_tone4[] = "🙋🏾";
+	inline constexpr const char person_raising_hand_tone5[] = "🙋🏿";
+	inline constexpr const char raising_hand_tone5[] = "🙋🏿";
+	inline constexpr const char woman_raising_hand[] = "🙋‍♀️";
+	inline constexpr const char woman_raising_hand_tone1[] = "🙋🏻‍♀️";
+	inline constexpr const char woman_raising_hand_light_skin_tone[] = "🙋🏻‍♀️";
+	inline constexpr const char woman_raising_hand_tone2[] = "🙋🏼‍♀️";
+	inline constexpr const char woman_raising_hand_medium_light_skin_tone[] = "🙋🏼‍♀️";
+	inline constexpr const char woman_raising_hand_tone3[] = "🙋🏽‍♀️";
+	inline constexpr const char woman_raising_hand_medium_skin_tone[] = "🙋🏽‍♀️";
+	inline constexpr const char woman_raising_hand_tone4[] = "🙋🏾‍♀️";
+	inline constexpr const char woman_raising_hand_medium_dark_skin_tone[] = "🙋🏾‍♀️";
+	inline constexpr const char woman_raising_hand_tone5[] = "🙋🏿‍♀️";
+	inline constexpr const char woman_raising_hand_dark_skin_tone[] = "🙋🏿‍♀️";
+	inline constexpr const char man_raising_hand[] = "🙋‍♂️";
+	inline constexpr const char man_raising_hand_tone1[] = "🙋🏻‍♂️";
+	inline constexpr const char man_raising_hand_light_skin_tone[] = "🙋🏻‍♂️";
+	inline constexpr const char man_raising_hand_tone2[] = "🙋🏼‍♂️";
+	inline constexpr const char man_raising_hand_medium_light_skin_tone[] = "🙋🏼‍♂️";
+	inline constexpr const char man_raising_hand_tone3[] = "🙋🏽‍♂️";
+	inline constexpr const char man_raising_hand_medium_skin_tone[] = "🙋🏽‍♂️";
+	inline constexpr const char man_raising_hand_tone4[] = "🙋🏾‍♂️";
+	inline constexpr const char man_raising_hand_medium_dark_skin_tone[] = "🙋🏾‍♂️";
+	inline constexpr const char man_raising_hand_tone5[] = "🙋🏿‍♂️";
+	inline constexpr const char man_raising_hand_dark_skin_tone[] = "🙋🏿‍♂️";
+	inline constexpr const char deaf_person[] = "🧏";
+	inline constexpr const char deaf_person_tone1[] = "🧏🏻";
+	inline constexpr const char deaf_person_light_skin_tone[] = "🧏🏻";
+	inline constexpr const char deaf_person_tone2[] = "🧏🏼";
+	inline constexpr const char deaf_person_medium_light_skin_tone[] = "🧏🏼";
+	inline constexpr const char deaf_person_tone3[] = "🧏🏽";
+	inline constexpr const char deaf_person_medium_skin_tone[] = "🧏🏽";
+	inline constexpr const char deaf_person_tone4[] = "🧏🏾";
+	inline constexpr const char deaf_person_medium_dark_skin_tone[] = "🧏🏾";
+	inline constexpr const char deaf_person_tone5[] = "🧏🏿";
+	inline constexpr const char deaf_person_dark_skin_tone[] = "🧏🏿";
+	inline constexpr const char deaf_woman[] = "🧏‍♀️";
+	inline constexpr const char deaf_woman_tone1[] = "🧏🏻‍♀️";
+	inline constexpr const char deaf_woman_light_skin_tone[] = "🧏🏻‍♀️";
+	inline constexpr const char deaf_woman_tone2[] = "🧏🏼‍♀️";
+	inline constexpr const char deaf_woman_medium_light_skin_tone[] = "🧏🏼‍♀️";
+	inline constexpr const char deaf_woman_tone3[] = "🧏🏽‍♀️";
+	inline constexpr const char deaf_woman_medium_skin_tone[] = "🧏🏽‍♀️";
+	inline constexpr const char deaf_woman_tone4[] = "🧏🏾‍♀️";
+	inline constexpr const char deaf_woman_medium_dark_skin_tone[] = "🧏🏾‍♀️";
+	inline constexpr const char deaf_woman_tone5[] = "🧏🏿‍♀️";
+	inline constexpr const char deaf_woman_dark_skin_tone[] = "🧏🏿‍♀️";
+	inline constexpr const char deaf_man[] = "🧏‍♂️";
+	inline constexpr const char deaf_man_tone1[] = "🧏🏻‍♂️";
+	inline constexpr const char deaf_man_light_skin_tone[] = "🧏🏻‍♂️";
+	inline constexpr const char deaf_man_tone2[] = "🧏🏼‍♂️";
+	inline constexpr const char deaf_man_medium_light_skin_tone[] = "🧏🏼‍♂️";
+	inline constexpr const char deaf_man_tone3[] = "🧏🏽‍♂️";
+	inline constexpr const char deaf_man_medium_skin_tone[] = "🧏🏽‍♂️";
+	inline constexpr const char deaf_man_tone4[] = "🧏🏾‍♂️";
+	inline constexpr const char deaf_man_medium_dark_skin_tone[] = "🧏🏾‍♂️";
+	inline constexpr const char deaf_man_tone5[] = "🧏🏿‍♂️";
+	inline constexpr const char deaf_man_dark_skin_tone[] = "🧏🏿‍♂️";
+	inline constexpr const char person_facepalming[] = "🤦";
+	inline constexpr const char face_palm[] = "🤦";
+	inline constexpr const char facepalm[] = "🤦";
+	inline constexpr const char person_facepalming_tone1[] = "🤦🏻";
+	inline constexpr const char face_palm_tone1[] = "🤦🏻";
+	inline constexpr const char facepalm_tone1[] = "🤦🏻";
+	inline constexpr const char person_facepalming_tone2[] = "🤦🏼";
+	inline constexpr const char face_palm_tone2[] = "🤦🏼";
+	inline constexpr const char facepalm_tone2[] = "🤦🏼";
+	inline constexpr const char person_facepalming_tone3[] = "🤦🏽";
+	inline constexpr const char face_palm_tone3[] = "🤦🏽";
+	inline constexpr const char facepalm_tone3[] = "🤦🏽";
+	inline constexpr const char person_facepalming_tone4[] = "🤦🏾";
+	inline constexpr const char face_palm_tone4[] = "🤦🏾";
+	inline constexpr const char facepalm_tone4[] = "🤦🏾";
+	inline constexpr const char person_facepalming_tone5[] = "🤦🏿";
+	inline constexpr const char face_palm_tone5[] = "🤦🏿";
+	inline constexpr const char facepalm_tone5[] = "🤦🏿";
+	inline constexpr const char woman_facepalming[] = "🤦‍♀️";
+	inline constexpr const char woman_facepalming_tone1[] = "🤦🏻‍♀️";
+	inline constexpr const char woman_facepalming_light_skin_tone[] = "🤦🏻‍♀️";
+	inline constexpr const char woman_facepalming_tone2[] = "🤦🏼‍♀️";
+	inline constexpr const char woman_facepalming_medium_light_skin_tone[] = "🤦🏼‍♀️";
+	inline constexpr const char woman_facepalming_tone3[] = "🤦🏽‍♀️";
+	inline constexpr const char woman_facepalming_medium_skin_tone[] = "🤦🏽‍♀️";
+	inline constexpr const char woman_facepalming_tone4[] = "🤦🏾‍♀️";
+	inline constexpr const char woman_facepalming_medium_dark_skin_tone[] = "🤦🏾‍♀️";
+	inline constexpr const char woman_facepalming_tone5[] = "🤦🏿‍♀️";
+	inline constexpr const char woman_facepalming_dark_skin_tone[] = "🤦🏿‍♀️";
+	inline constexpr const char man_facepalming[] = "🤦‍♂️";
+	inline constexpr const char man_facepalming_tone1[] = "🤦🏻‍♂️";
+	inline constexpr const char man_facepalming_light_skin_tone[] = "🤦🏻‍♂️";
+	inline constexpr const char man_facepalming_tone2[] = "🤦🏼‍♂️";
+	inline constexpr const char man_facepalming_medium_light_skin_tone[] = "🤦🏼‍♂️";
+	inline constexpr const char man_facepalming_tone3[] = "🤦🏽‍♂️";
+	inline constexpr const char man_facepalming_medium_skin_tone[] = "🤦🏽‍♂️";
+	inline constexpr const char man_facepalming_tone4[] = "🤦🏾‍♂️";
+	inline constexpr const char man_facepalming_medium_dark_skin_tone[] = "🤦🏾‍♂️";
+	inline constexpr const char man_facepalming_tone5[] = "🤦🏿‍♂️";
+	inline constexpr const char man_facepalming_dark_skin_tone[] = "🤦🏿‍♂️";
+	inline constexpr const char person_shrugging[] = "🤷";
+	inline constexpr const char shrug[] = "🤷";
+	inline constexpr const char person_shrugging_tone1[] = "🤷🏻";
+	inline constexpr const char shrug_tone1[] = "🤷🏻";
+	inline constexpr const char person_shrugging_tone2[] = "🤷🏼";
+	inline constexpr const char shrug_tone2[] = "🤷🏼";
+	inline constexpr const char person_shrugging_tone3[] = "🤷🏽";
+	inline constexpr const char shrug_tone3[] = "🤷🏽";
+	inline constexpr const char person_shrugging_tone4[] = "🤷🏾";
+	inline constexpr const char shrug_tone4[] = "🤷🏾";
+	inline constexpr const char person_shrugging_tone5[] = "🤷🏿";
+	inline constexpr const char shrug_tone5[] = "🤷🏿";
+	inline constexpr const char woman_shrugging[] = "🤷‍♀️";
+	inline constexpr const char woman_shrugging_tone1[] = "🤷🏻‍♀️";
+	inline constexpr const char woman_shrugging_light_skin_tone[] = "🤷🏻‍♀️";
+	inline constexpr const char woman_shrugging_tone2[] = "🤷🏼‍♀️";
+	inline constexpr const char woman_shrugging_medium_light_skin_tone[] = "🤷🏼‍♀️";
+	inline constexpr const char woman_shrugging_tone3[] = "🤷🏽‍♀️";
+	inline constexpr const char woman_shrugging_medium_skin_tone[] = "🤷🏽‍♀️";
+	inline constexpr const char woman_shrugging_tone4[] = "🤷🏾‍♀️";
+	inline constexpr const char woman_shrugging_medium_dark_skin_tone[] = "🤷🏾‍♀️";
+	inline constexpr const char woman_shrugging_tone5[] = "🤷🏿‍♀️";
+	inline constexpr const char woman_shrugging_dark_skin_tone[] = "🤷🏿‍♀️";
+	inline constexpr const char man_shrugging[] = "🤷‍♂️";
+	inline constexpr const char man_shrugging_tone1[] = "🤷🏻‍♂️";
+	inline constexpr const char man_shrugging_light_skin_tone[] = "🤷🏻‍♂️";
+	inline constexpr const char man_shrugging_tone2[] = "🤷🏼‍♂️";
+	inline constexpr const char man_shrugging_medium_light_skin_tone[] = "🤷🏼‍♂️";
+	inline constexpr const char man_shrugging_tone3[] = "🤷🏽‍♂️";
+	inline constexpr const char man_shrugging_medium_skin_tone[] = "🤷🏽‍♂️";
+	inline constexpr const char man_shrugging_tone4[] = "🤷🏾‍♂️";
+	inline constexpr const char man_shrugging_medium_dark_skin_tone[] = "🤷🏾‍♂️";
+	inline constexpr const char man_shrugging_tone5[] = "🤷🏿‍♂️";
+	inline constexpr const char man_shrugging_dark_skin_tone[] = "🤷🏿‍♂️";
+	inline constexpr const char person_pouting[] = "🙎";
+	inline constexpr const char person_with_pouting_face[] = "🙎";
+	inline constexpr const char person_pouting_tone1[] = "🙎🏻";
+	inline constexpr const char person_with_pouting_face_tone1[] = "🙎🏻";
+	inline constexpr const char person_pouting_tone2[] = "🙎🏼";
+	inline constexpr const char person_with_pouting_face_tone2[] = "🙎🏼";
+	inline constexpr const char person_pouting_tone3[] = "🙎🏽";
+	inline constexpr const char person_with_pouting_face_tone3[] = "🙎🏽";
+	inline constexpr const char person_pouting_tone4[] = "🙎🏾";
+	inline constexpr const char person_with_pouting_face_tone4[] = "🙎🏾";
+	inline constexpr const char person_pouting_tone5[] = "🙎🏿";
+	inline constexpr const char person_with_pouting_face_tone5[] = "🙎🏿";
+	inline constexpr const char woman_pouting[] = "🙎‍♀️";
+	inline constexpr const char woman_pouting_tone1[] = "🙎🏻‍♀️";
+	inline constexpr const char woman_pouting_light_skin_tone[] = "🙎🏻‍♀️";
+	inline constexpr const char woman_pouting_tone2[] = "🙎🏼‍♀️";
+	inline constexpr const char woman_pouting_medium_light_skin_tone[] = "🙎🏼‍♀️";
+	inline constexpr const char woman_pouting_tone3[] = "🙎🏽‍♀️";
+	inline constexpr const char woman_pouting_medium_skin_tone[] = "🙎🏽‍♀️";
+	inline constexpr const char woman_pouting_tone4[] = "🙎🏾‍♀️";
+	inline constexpr const char woman_pouting_medium_dark_skin_tone[] = "🙎🏾‍♀️";
+	inline constexpr const char woman_pouting_tone5[] = "🙎🏿‍♀️";
+	inline constexpr const char woman_pouting_dark_skin_tone[] = "🙎🏿‍♀️";
+	inline constexpr const char man_pouting[] = "🙎‍♂️";
+	inline constexpr const char man_pouting_tone1[] = "🙎🏻‍♂️";
+	inline constexpr const char man_pouting_light_skin_tone[] = "🙎🏻‍♂️";
+	inline constexpr const char man_pouting_tone2[] = "🙎🏼‍♂️";
+	inline constexpr const char man_pouting_medium_light_skin_tone[] = "🙎🏼‍♂️";
+	inline constexpr const char man_pouting_tone3[] = "🙎🏽‍♂️";
+	inline constexpr const char man_pouting_medium_skin_tone[] = "🙎🏽‍♂️";
+	inline constexpr const char man_pouting_tone4[] = "🙎🏾‍♂️";
+	inline constexpr const char man_pouting_medium_dark_skin_tone[] = "🙎🏾‍♂️";
+	inline constexpr const char man_pouting_tone5[] = "🙎🏿‍♂️";
+	inline constexpr const char man_pouting_dark_skin_tone[] = "🙎🏿‍♂️";
+	inline constexpr const char person_frowning[] = "🙍";
+	inline constexpr const char person_frowning_tone1[] = "🙍🏻";
+	inline constexpr const char person_frowning_tone2[] = "🙍🏼";
+	inline constexpr const char person_frowning_tone3[] = "🙍🏽";
+	inline constexpr const char person_frowning_tone4[] = "🙍🏾";
+	inline constexpr const char person_frowning_tone5[] = "🙍🏿";
+	inline constexpr const char woman_frowning[] = "🙍‍♀️";
+	inline constexpr const char woman_frowning_tone1[] = "🙍🏻‍♀️";
+	inline constexpr const char woman_frowning_light_skin_tone[] = "🙍🏻‍♀️";
+	inline constexpr const char woman_frowning_tone2[] = "🙍🏼‍♀️";
+	inline constexpr const char woman_frowning_medium_light_skin_tone[] = "🙍🏼‍♀️";
+	inline constexpr const char woman_frowning_tone3[] = "🙍🏽‍♀️";
+	inline constexpr const char woman_frowning_medium_skin_tone[] = "🙍🏽‍♀️";
+	inline constexpr const char woman_frowning_tone4[] = "🙍🏾‍♀️";
+	inline constexpr const char woman_frowning_medium_dark_skin_tone[] = "🙍🏾‍♀️";
+	inline constexpr const char woman_frowning_tone5[] = "🙍🏿‍♀️";
+	inline constexpr const char woman_frowning_dark_skin_tone[] = "🙍🏿‍♀️";
+	inline constexpr const char man_frowning[] = "🙍‍♂️";
+	inline constexpr const char man_frowning_tone1[] = "🙍🏻‍♂️";
+	inline constexpr const char man_frowning_light_skin_tone[] = "🙍🏻‍♂️";
+	inline constexpr const char man_frowning_tone2[] = "🙍🏼‍♂️";
+	inline constexpr const char man_frowning_medium_light_skin_tone[] = "🙍🏼‍♂️";
+	inline constexpr const char man_frowning_tone3[] = "🙍🏽‍♂️";
+	inline constexpr const char man_frowning_medium_skin_tone[] = "🙍🏽‍♂️";
+	inline constexpr const char man_frowning_tone4[] = "🙍🏾‍♂️";
+	inline constexpr const char man_frowning_medium_dark_skin_tone[] = "🙍🏾‍♂️";
+	inline constexpr const char man_frowning_tone5[] = "🙍🏿‍♂️";
+	inline constexpr const char man_frowning_dark_skin_tone[] = "🙍🏿‍♂️";
+	inline constexpr const char person_getting_haircut[] = "💇";
+	inline constexpr const char haircut[] = "💇";
+	inline constexpr const char person_getting_haircut_tone1[] = "💇🏻";
+	inline constexpr const char haircut_tone1[] = "💇🏻";
+	inline constexpr const char person_getting_haircut_tone2[] = "💇🏼";
+	inline constexpr const char haircut_tone2[] = "💇🏼";
+	inline constexpr const char person_getting_haircut_tone3[] = "💇🏽";
+	inline constexpr const char haircut_tone3[] = "💇🏽";
+	inline constexpr const char person_getting_haircut_tone4[] = "💇🏾";
+	inline constexpr const char haircut_tone4[] = "💇🏾";
+	inline constexpr const char person_getting_haircut_tone5[] = "💇🏿";
+	inline constexpr const char haircut_tone5[] = "💇🏿";
+	inline constexpr const char woman_getting_haircut[] = "💇‍♀️";
+	inline constexpr const char woman_getting_haircut_tone1[] = "💇🏻‍♀️";
+	inline constexpr const char woman_getting_haircut_light_skin_tone[] = "💇🏻‍♀️";
+	inline constexpr const char woman_getting_haircut_tone2[] = "💇🏼‍♀️";
+	inline constexpr const char woman_getting_haircut_medium_light_skin_tone[] = "💇🏼‍♀️";
+	inline constexpr const char woman_getting_haircut_tone3[] = "💇🏽‍♀️";
+	inline constexpr const char woman_getting_haircut_medium_skin_tone[] = "💇🏽‍♀️";
+	inline constexpr const char woman_getting_haircut_tone4[] = "💇🏾‍♀️";
+	inline constexpr const char woman_getting_haircut_medium_dark_skin_tone[] = "💇🏾‍♀️";
+	inline constexpr const char woman_getting_haircut_tone5[] = "💇🏿‍♀️";
+	inline constexpr const char woman_getting_haircut_dark_skin_tone[] = "💇🏿‍♀️";
+	inline constexpr const char man_getting_haircut[] = "💇‍♂️";
+	inline constexpr const char man_getting_haircut_tone1[] = "💇🏻‍♂️";
+	inline constexpr const char man_getting_haircut_light_skin_tone[] = "💇🏻‍♂️";
+	inline constexpr const char man_getting_haircut_tone2[] = "💇🏼‍♂️";
+	inline constexpr const char man_getting_haircut_medium_light_skin_tone[] = "💇🏼‍♂️";
+	inline constexpr const char man_getting_haircut_tone3[] = "💇🏽‍♂️";
+	inline constexpr const char man_getting_haircut_medium_skin_tone[] = "💇🏽‍♂️";
+	inline constexpr const char man_getting_haircut_tone4[] = "💇🏾‍♂️";
+	inline constexpr const char man_getting_haircut_medium_dark_skin_tone[] = "💇🏾‍♂️";
+	inline constexpr const char man_getting_haircut_tone5[] = "💇🏿‍♂️";
+	inline constexpr const char man_getting_haircut_dark_skin_tone[] = "💇🏿‍♂️";
+	inline constexpr const char person_getting_massage[] = "💆";
+	inline constexpr const char massage[] = "💆";
+	inline constexpr const char person_getting_massage_tone1[] = "💆🏻";
+	inline constexpr const char massage_tone1[] = "💆🏻";
+	inline constexpr const char person_getting_massage_tone2[] = "💆🏼";
+	inline constexpr const char massage_tone2[] = "💆🏼";
+	inline constexpr const char person_getting_massage_tone3[] = "💆🏽";
+	inline constexpr const char massage_tone3[] = "💆🏽";
+	inline constexpr const char person_getting_massage_tone4[] = "💆🏾";
+	inline constexpr const char massage_tone4[] = "💆🏾";
+	inline constexpr const char person_getting_massage_tone5[] = "💆🏿";
+	inline constexpr const char massage_tone5[] = "💆🏿";
+	inline constexpr const char woman_getting_face_massage[] = "💆‍♀️";
+	inline constexpr const char woman_getting_face_massage_tone1[] = "💆🏻‍♀️";
+	inline constexpr const char woman_getting_face_massage_light_skin_tone[] = "💆🏻‍♀️";
+	inline constexpr const char woman_getting_face_massage_tone2[] = "💆🏼‍♀️";
+	inline constexpr const char woman_getting_face_massage_medium_light_skin_tone[] = "💆🏼‍♀️";
+	inline constexpr const char woman_getting_face_massage_tone3[] = "💆🏽‍♀️";
+	inline constexpr const char woman_getting_face_massage_medium_skin_tone[] = "💆🏽‍♀️";
+	inline constexpr const char woman_getting_face_massage_tone4[] = "💆🏾‍♀️";
+	inline constexpr const char woman_getting_face_massage_medium_dark_skin_tone[] = "💆🏾‍♀️";
+	inline constexpr const char woman_getting_face_massage_tone5[] = "💆🏿‍♀️";
+	inline constexpr const char woman_getting_face_massage_dark_skin_tone[] = "💆🏿‍♀️";
+	inline constexpr const char man_getting_face_massage[] = "💆‍♂️";
+	inline constexpr const char man_getting_face_massage_tone1[] = "💆🏻‍♂️";
+	inline constexpr const char man_getting_face_massage_light_skin_tone[] = "💆🏻‍♂️";
+	inline constexpr const char man_getting_face_massage_tone2[] = "💆🏼‍♂️";
+	inline constexpr const char man_getting_face_massage_medium_light_skin_tone[] = "💆🏼‍♂️";
+	inline constexpr const char man_getting_face_massage_tone3[] = "💆🏽‍♂️";
+	inline constexpr const char man_getting_face_massage_medium_skin_tone[] = "💆🏽‍♂️";
+	inline constexpr const char man_getting_face_massage_tone4[] = "💆🏾‍♂️";
+	inline constexpr const char man_getting_face_massage_medium_dark_skin_tone[] = "💆🏾‍♂️";
+	inline constexpr const char man_getting_face_massage_tone5[] = "💆🏿‍♂️";
+	inline constexpr const char man_getting_face_massage_dark_skin_tone[] = "💆🏿‍♂️";
+	inline constexpr const char person_in_steamy_room[] = "🧖";
+	inline constexpr const char person_in_steamy_room_tone1[] = "🧖🏻";
+	inline constexpr const char person_in_steamy_room_light_skin_tone[] = "🧖🏻";
+	inline constexpr const char person_in_steamy_room_tone2[] = "🧖🏼";
+	inline constexpr const char person_in_steamy_room_medium_light_skin_tone[] = "🧖🏼";
+	inline constexpr const char person_in_steamy_room_tone3[] = "🧖🏽";
+	inline constexpr const char person_in_steamy_room_medium_skin_tone[] = "🧖🏽";
+	inline constexpr const char person_in_steamy_room_tone4[] = "🧖🏾";
+	inline constexpr const char person_in_steamy_room_medium_dark_skin_tone[] = "🧖🏾";
+	inline constexpr const char person_in_steamy_room_tone5[] = "🧖🏿";
+	inline constexpr const char person_in_steamy_room_dark_skin_tone[] = "🧖🏿";
+	inline constexpr const char woman_in_steamy_room[] = "🧖‍♀️";
+	inline constexpr const char woman_in_steamy_room_tone1[] = "🧖🏻‍♀️";
+	inline constexpr const char woman_in_steamy_room_light_skin_tone[] = "🧖🏻‍♀️";
+	inline constexpr const char woman_in_steamy_room_tone2[] = "🧖🏼‍♀️";
+	inline constexpr const char woman_in_steamy_room_medium_light_skin_tone[] = "🧖🏼‍♀️";
+	inline constexpr const char woman_in_steamy_room_tone3[] = "🧖🏽‍♀️";
+	inline constexpr const char woman_in_steamy_room_medium_skin_tone[] = "🧖🏽‍♀️";
+	inline constexpr const char woman_in_steamy_room_tone4[] = "🧖🏾‍♀️";
+	inline constexpr const char woman_in_steamy_room_medium_dark_skin_tone[] = "🧖🏾‍♀️";
+	inline constexpr const char woman_in_steamy_room_tone5[] = "🧖🏿‍♀️";
+	inline constexpr const char woman_in_steamy_room_dark_skin_tone[] = "🧖🏿‍♀️";
+	inline constexpr const char man_in_steamy_room[] = "🧖‍♂️";
+	inline constexpr const char man_in_steamy_room_tone1[] = "🧖🏻‍♂️";
+	inline constexpr const char man_in_steamy_room_light_skin_tone[] = "🧖🏻‍♂️";
+	inline constexpr const char man_in_steamy_room_tone2[] = "🧖🏼‍♂️";
+	inline constexpr const char man_in_steamy_room_medium_light_skin_tone[] = "🧖🏼‍♂️";
+	inline constexpr const char man_in_steamy_room_tone3[] = "🧖🏽‍♂️";
+	inline constexpr const char man_in_steamy_room_medium_skin_tone[] = "🧖🏽‍♂️";
+	inline constexpr const char man_in_steamy_room_tone4[] = "🧖🏾‍♂️";
+	inline constexpr const char man_in_steamy_room_medium_dark_skin_tone[] = "🧖🏾‍♂️";
+	inline constexpr const char man_in_steamy_room_tone5[] = "🧖🏿‍♂️";
+	inline constexpr const char man_in_steamy_room_dark_skin_tone[] = "🧖🏿‍♂️";
+	inline constexpr const char nail_care[] = "💅";
+	inline constexpr const char nail_polish[] = "💅";
+	inline constexpr const char nail_care_tone1[] = "💅🏻";
+	inline constexpr const char nail_care_tone2[] = "💅🏼";
+	inline constexpr const char nail_care_tone3[] = "💅🏽";
+	inline constexpr const char nail_care_tone4[] = "💅🏾";
+	inline constexpr const char nail_care_tone5[] = "💅🏿";
+	inline constexpr const char selfie[] = "🤳";
+	inline constexpr const char selfie_tone1[] = "🤳🏻";
+	inline constexpr const char selfie_tone2[] = "🤳🏼";
+	inline constexpr const char selfie_tone3[] = "🤳🏽";
+	inline constexpr const char selfie_tone4[] = "🤳🏾";
+	inline constexpr const char selfie_tone5[] = "🤳🏿";
+	inline constexpr const char dancer[] = "💃";
+	inline constexpr const char woman_dancing[] = "💃";
+	inline constexpr const char dancer_tone1[] = "💃🏻";
+	inline constexpr const char dancer_tone2[] = "💃🏼";
+	inline constexpr const char dancer_tone3[] = "💃🏽";
+	inline constexpr const char dancer_tone4[] = "💃🏾";
+	inline constexpr const char dancer_tone5[] = "💃🏿";
+	inline constexpr const char man_dancing[] = "🕺";
+	inline constexpr const char male_dancer[] = "🕺";
+	inline constexpr const char man_dancing_tone1[] = "🕺🏻";
+	inline constexpr const char male_dancer_tone1[] = "🕺🏻";
+	inline constexpr const char man_dancing_tone2[] = "🕺🏼";
+	inline constexpr const char male_dancer_tone2[] = "🕺🏼";
+	inline constexpr const char man_dancing_tone3[] = "🕺🏽";
+	inline constexpr const char male_dancer_tone3[] = "🕺🏽";
+	inline constexpr const char man_dancing_tone5[] = "🕺🏿";
+	inline constexpr const char male_dancer_tone5[] = "🕺🏿";
+	inline constexpr const char man_dancing_tone4[] = "🕺🏾";
+	inline constexpr const char male_dancer_tone4[] = "🕺🏾";
+	inline constexpr const char people_with_bunny_ears_partying[] = "👯";
+	inline constexpr const char dancers[] = "👯";
+	inline constexpr const char women_with_bunny_ears_partying[] = "👯‍♀️";
+	inline constexpr const char men_with_bunny_ears_partying[] = "👯‍♂️";
+	inline constexpr const char levitate[] = "🕴️";
+	inline constexpr const char man_in_business_suit_levitating[] = "🕴️";
+	inline constexpr const char levitate_tone1[] = "🕴🏻";
+	inline constexpr const char man_in_business_suit_levitating_tone1[] = "🕴🏻";
+	inline constexpr const char man_in_business_suit_levitating_light_skin_tone[] = "🕴🏻";
+	inline constexpr const char levitate_tone2[] = "🕴🏼";
+	inline constexpr const char man_in_business_suit_levitating_tone2[] = "🕴🏼";
+	inline constexpr const char man_in_business_suit_levitating_medium_light_skin_tone[] = "🕴🏼";
+	inline constexpr const char levitate_tone3[] = "🕴🏽";
+	inline constexpr const char man_in_business_suit_levitating_tone3[] = "🕴🏽";
+	inline constexpr const char man_in_business_suit_levitating_medium_skin_tone[] = "🕴🏽";
+	inline constexpr const char levitate_tone4[] = "🕴🏾";
+	inline constexpr const char man_in_business_suit_levitating_tone4[] = "🕴🏾";
+	inline constexpr const char man_in_business_suit_levitating_medium_dark_skin_tone[] = "🕴🏾";
+	inline constexpr const char levitate_tone5[] = "🕴🏿";
+	inline constexpr const char man_in_business_suit_levitating_tone5[] = "🕴🏿";
+	inline constexpr const char man_in_business_suit_levitating_dark_skin_tone[] = "🕴🏿";
+	inline constexpr const char person_in_manual_wheelchair[] = "🧑‍🦽";
+	inline constexpr const char person_in_manual_wheelchair_tone1[] = "🧑🏻‍🦽";
+	inline constexpr const char person_in_manual_wheelchair_light_skin_tone[] = "🧑🏻‍🦽";
+	inline constexpr const char person_in_manual_wheelchair_tone2[] = "🧑🏼‍🦽";
+	inline constexpr const char person_in_manual_wheelchair_medium_light_skin_tone[] = "🧑🏼‍🦽";
+	inline constexpr const char person_in_manual_wheelchair_tone3[] = "🧑🏽‍🦽";
+	inline constexpr const char person_in_manual_wheelchair_medium_skin_tone[] = "🧑🏽‍🦽";
+	inline constexpr const char person_in_manual_wheelchair_tone4[] = "🧑🏾‍🦽";
+	inline constexpr const char person_in_manual_wheelchair_medium_dark_skin_tone[] = "🧑🏾‍🦽";
+	inline constexpr const char person_in_manual_wheelchair_tone5[] = "🧑🏿‍🦽";
+	inline constexpr const char person_in_manual_wheelchair_dark_skin_tone[] = "🧑🏿‍🦽";
+	inline constexpr const char woman_in_manual_wheelchair[] = "👩‍🦽";
+	inline constexpr const char woman_in_manual_wheelchair_tone1[] = "👩🏻‍🦽";
+	inline constexpr const char woman_in_manual_wheelchair_light_skin_tone[] = "👩🏻‍🦽";
+	inline constexpr const char woman_in_manual_wheelchair_tone2[] = "👩🏼‍🦽";
+	inline constexpr const char woman_in_manual_wheelchair_medium_light_skin_tone[] = "👩🏼‍🦽";
+	inline constexpr const char woman_in_manual_wheelchair_tone3[] = "👩🏽‍🦽";
+	inline constexpr const char woman_in_manual_wheelchair_medium_skin_tone[] = "👩🏽‍🦽";
+	inline constexpr const char woman_in_manual_wheelchair_tone4[] = "👩🏾‍🦽";
+	inline constexpr const char woman_in_manual_wheelchair_medium_dark_skin_tone[] = "👩🏾‍🦽";
+	inline constexpr const char woman_in_manual_wheelchair_tone5[] = "👩🏿‍🦽";
+	inline constexpr const char woman_in_manual_wheelchair_dark_skin_tone[] = "👩🏿‍🦽";
+	inline constexpr const char man_in_manual_wheelchair[] = "👨‍🦽";
+	inline constexpr const char man_in_manual_wheelchair_tone1[] = "👨🏻‍🦽";
+	inline constexpr const char man_in_manual_wheelchair_light_skin_tone[] = "👨🏻‍🦽";
+	inline constexpr const char man_in_manual_wheelchair_tone2[] = "👨🏼‍🦽";
+	inline constexpr const char man_in_manual_wheelchair_medium_light_skin_tone[] = "👨🏼‍🦽";
+	inline constexpr const char man_in_manual_wheelchair_tone3[] = "👨🏽‍🦽";
+	inline constexpr const char man_in_manual_wheelchair_medium_skin_tone[] = "👨🏽‍🦽";
+	inline constexpr const char man_in_manual_wheelchair_tone4[] = "👨🏾‍🦽";
+	inline constexpr const char man_in_manual_wheelchair_medium_dark_skin_tone[] = "👨🏾‍🦽";
+	inline constexpr const char man_in_manual_wheelchair_tone5[] = "👨🏿‍🦽";
+	inline constexpr const char man_in_manual_wheelchair_dark_skin_tone[] = "👨🏿‍🦽";
+	inline constexpr const char person_in_motorized_wheelchair[] = "🧑‍🦼";
+	inline constexpr const char person_in_motorized_wheelchair_tone1[] = "🧑🏻‍🦼";
+	inline constexpr const char person_in_motorized_wheelchair_light_skin_tone[] = "🧑🏻‍🦼";
+	inline constexpr const char person_in_motorized_wheelchair_tone2[] = "🧑🏼‍🦼";
+	inline constexpr const char person_in_motorized_wheelchair_medium_light_skin_tone[] = "🧑🏼‍🦼";
+	inline constexpr const char person_in_motorized_wheelchair_tone3[] = "🧑🏽‍🦼";
+	inline constexpr const char person_in_motorized_wheelchair_medium_skin_tone[] = "🧑🏽‍🦼";
+	inline constexpr const char person_in_motorized_wheelchair_tone4[] = "🧑🏾‍🦼";
+	inline constexpr const char person_in_motorized_wheelchair_medium_dark_skin_tone[] = "🧑🏾‍🦼";
+	inline constexpr const char person_in_motorized_wheelchair_tone5[] = "🧑🏿‍🦼";
+	inline constexpr const char person_in_motorized_wheelchair_dark_skin_tone[] = "🧑🏿‍🦼";
+	inline constexpr const char woman_in_motorized_wheelchair[] = "👩‍🦼";
+	inline constexpr const char woman_in_motorized_wheelchair_tone1[] = "👩🏻‍🦼";
+	inline constexpr const char woman_in_motorized_wheelchair_light_skin_tone[] = "👩🏻‍🦼";
+	inline constexpr const char woman_in_motorized_wheelchair_tone2[] = "👩🏼‍🦼";
+	inline constexpr const char woman_in_motorized_wheelchair_medium_light_skin_tone[] = "👩🏼‍🦼";
+	inline constexpr const char woman_in_motorized_wheelchair_tone3[] = "👩🏽‍🦼";
+	inline constexpr const char woman_in_motorized_wheelchair_medium_skin_tone[] = "👩🏽‍🦼";
+	inline constexpr const char woman_in_motorized_wheelchair_tone4[] = "👩🏾‍🦼";
+	inline constexpr const char woman_in_motorized_wheelchair_medium_dark_skin_tone[] = "👩🏾‍🦼";
+	inline constexpr const char woman_in_motorized_wheelchair_tone5[] = "👩🏿‍🦼";
+	inline constexpr const char woman_in_motorized_wheelchair_dark_skin_tone[] = "👩🏿‍🦼";
+	inline constexpr const char man_in_motorized_wheelchair[] = "👨‍🦼";
+	inline constexpr const char man_in_motorized_wheelchair_tone1[] = "👨🏻‍🦼";
+	inline constexpr const char man_in_motorized_wheelchair_light_skin_tone[] = "👨🏻‍🦼";
+	inline constexpr const char man_in_motorized_wheelchair_tone2[] = "👨🏼‍🦼";
+	inline constexpr const char man_in_motorized_wheelchair_medium_light_skin_tone[] = "👨🏼‍🦼";
+	inline constexpr const char man_in_motorized_wheelchair_tone3[] = "👨🏽‍🦼";
+	inline constexpr const char man_in_motorized_wheelchair_medium_skin_tone[] = "👨🏽‍🦼";
+	inline constexpr const char man_in_motorized_wheelchair_tone4[] = "👨🏾‍🦼";
+	inline constexpr const char man_in_motorized_wheelchair_medium_dark_skin_tone[] = "👨🏾‍🦼";
+	inline constexpr const char man_in_motorized_wheelchair_tone5[] = "👨🏿‍🦼";
+	inline constexpr const char man_in_motorized_wheelchair_dark_skin_tone[] = "👨🏿‍🦼";
+	inline constexpr const char person_walking[] = "🚶";
+	inline constexpr const char walking[] = "🚶";
+	inline constexpr const char person_walking_tone1[] = "🚶🏻";
+	inline constexpr const char walking_tone1[] = "🚶🏻";
+	inline constexpr const char person_walking_tone2[] = "🚶🏼";
+	inline constexpr const char walking_tone2[] = "🚶🏼";
+	inline constexpr const char person_walking_tone3[] = "🚶🏽";
+	inline constexpr const char walking_tone3[] = "🚶🏽";
+	inline constexpr const char person_walking_tone4[] = "🚶🏾";
+	inline constexpr const char walking_tone4[] = "🚶🏾";
+	inline constexpr const char person_walking_tone5[] = "🚶🏿";
+	inline constexpr const char walking_tone5[] = "🚶🏿";
+	inline constexpr const char woman_walking[] = "🚶‍♀️";
+	inline constexpr const char woman_walking_tone1[] = "🚶🏻‍♀️";
+	inline constexpr const char woman_walking_light_skin_tone[] = "🚶🏻‍♀️";
+	inline constexpr const char woman_walking_tone2[] = "🚶🏼‍♀️";
+	inline constexpr const char woman_walking_medium_light_skin_tone[] = "🚶🏼‍♀️";
+	inline constexpr const char woman_walking_tone3[] = "🚶🏽‍♀️";
+	inline constexpr const char woman_walking_medium_skin_tone[] = "🚶🏽‍♀️";
+	inline constexpr const char woman_walking_tone4[] = "🚶🏾‍♀️";
+	inline constexpr const char woman_walking_medium_dark_skin_tone[] = "🚶🏾‍♀️";
+	inline constexpr const char woman_walking_tone5[] = "🚶🏿‍♀️";
+	inline constexpr const char woman_walking_dark_skin_tone[] = "🚶🏿‍♀️";
+	inline constexpr const char man_walking[] = "🚶‍♂️";
+	inline constexpr const char man_walking_tone1[] = "🚶🏻‍♂️";
+	inline constexpr const char man_walking_light_skin_tone[] = "🚶🏻‍♂️";
+	inline constexpr const char man_walking_tone2[] = "🚶🏼‍♂️";
+	inline constexpr const char man_walking_medium_light_skin_tone[] = "🚶🏼‍♂️";
+	inline constexpr const char man_walking_tone3[] = "🚶🏽‍♂️";
+	inline constexpr const char man_walking_medium_skin_tone[] = "🚶🏽‍♂️";
+	inline constexpr const char man_walking_tone4[] = "🚶🏾‍♂️";
+	inline constexpr const char man_walking_medium_dark_skin_tone[] = "🚶🏾‍♂️";
+	inline constexpr const char man_walking_tone5[] = "🚶🏿‍♂️";
+	inline constexpr const char man_walking_dark_skin_tone[] = "🚶🏿‍♂️";
+	inline constexpr const char person_with_probing_cane[] = "🧑‍🦯";
+	inline constexpr const char person_with_probing_cane_tone1[] = "🧑🏻‍🦯";
+	inline constexpr const char person_with_probing_cane_light_skin_tone[] = "🧑🏻‍🦯";
+	inline constexpr const char person_with_probing_cane_tone2[] = "🧑🏼‍🦯";
+	inline constexpr const char person_with_probing_cane_medium_light_skin_tone[] = "🧑🏼‍🦯";
+	inline constexpr const char person_with_probing_cane_tone3[] = "🧑🏽‍🦯";
+	inline constexpr const char person_with_probing_cane_medium_skin_tone[] = "🧑🏽‍🦯";
+	inline constexpr const char person_with_probing_cane_tone4[] = "🧑🏾‍🦯";
+	inline constexpr const char person_with_probing_cane_medium_dark_skin_tone[] = "🧑🏾‍🦯";
+	inline constexpr const char person_with_probing_cane_tone5[] = "🧑🏿‍🦯";
+	inline constexpr const char person_with_probing_cane_dark_skin_tone[] = "🧑🏿‍🦯";
+	inline constexpr const char woman_with_probing_cane[] = "👩‍🦯";
+	inline constexpr const char woman_with_probing_cane_tone1[] = "👩🏻‍🦯";
+	inline constexpr const char woman_with_probing_cane_light_skin_tone[] = "👩🏻‍🦯";
+	inline constexpr const char woman_with_probing_cane_tone2[] = "👩🏼‍🦯";
+	inline constexpr const char woman_with_probing_cane_medium_light_skin_tone[] = "👩🏼‍🦯";
+	inline constexpr const char woman_with_probing_cane_tone3[] = "👩🏽‍🦯";
+	inline constexpr const char woman_with_probing_cane_medium_skin_tone[] = "👩🏽‍🦯";
+	inline constexpr const char woman_with_probing_cane_tone4[] = "👩🏾‍🦯";
+	inline constexpr const char woman_with_probing_cane_medium_dark_skin_tone[] = "👩🏾‍🦯";
+	inline constexpr const char woman_with_probing_cane_tone5[] = "👩🏿‍🦯";
+	inline constexpr const char woman_with_probing_cane_dark_skin_tone[] = "👩🏿‍🦯";
+	inline constexpr const char man_with_probing_cane[] = "👨‍🦯";
+	inline constexpr const char man_with_probing_cane_tone1[] = "👨🏻‍🦯";
+	inline constexpr const char man_with_probing_cane_light_skin_tone[] = "👨🏻‍🦯";
+	inline constexpr const char man_with_probing_cane_tone2[] = "👨🏼‍🦯";
+	inline constexpr const char man_with_probing_cane_medium_light_skin_tone[] = "👨🏼‍🦯";
+	inline constexpr const char man_with_probing_cane_tone3[] = "👨🏽‍🦯";
+	inline constexpr const char man_with_probing_cane_medium_skin_tone[] = "👨🏽‍🦯";
+	inline constexpr const char man_with_probing_cane_tone4[] = "👨🏾‍🦯";
+	inline constexpr const char man_with_probing_cane_medium_dark_skin_tone[] = "👨🏾‍🦯";
+	inline constexpr const char man_with_probing_cane_tone5[] = "👨🏿‍🦯";
+	inline constexpr const char man_with_probing_cane_dark_skin_tone[] = "👨🏿‍🦯";
+	inline constexpr const char person_kneeling[] = "🧎";
+	inline constexpr const char person_kneeling_tone1[] = "🧎🏻";
+	inline constexpr const char person_kneeling_light_skin_tone[] = "🧎🏻";
+	inline constexpr const char person_kneeling_tone2[] = "🧎🏼";
+	inline constexpr const char person_kneeling_medium_light_skin_tone[] = "🧎🏼";
+	inline constexpr const char person_kneeling_tone3[] = "🧎🏽";
+	inline constexpr const char person_kneeling_medium_skin_tone[] = "🧎🏽";
+	inline constexpr const char person_kneeling_tone4[] = "🧎🏾";
+	inline constexpr const char person_kneeling_medium_dark_skin_tone[] = "🧎🏾";
+	inline constexpr const char person_kneeling_tone5[] = "🧎🏿";
+	inline constexpr const char person_kneeling_dark_skin_tone[] = "🧎🏿";
+	inline constexpr const char woman_kneeling[] = "🧎‍♀️";
+	inline constexpr const char woman_kneeling_tone1[] = "🧎🏻‍♀️";
+	inline constexpr const char woman_kneeling_light_skin_tone[] = "🧎🏻‍♀️";
+	inline constexpr const char woman_kneeling_tone2[] = "🧎🏼‍♀️";
+	inline constexpr const char woman_kneeling_medium_light_skin_tone[] = "🧎🏼‍♀️";
+	inline constexpr const char woman_kneeling_tone3[] = "🧎🏽‍♀️";
+	inline constexpr const char woman_kneeling_medium_skin_tone[] = "🧎🏽‍♀️";
+	inline constexpr const char woman_kneeling_tone4[] = "🧎🏾‍♀️";
+	inline constexpr const char woman_kneeling_medium_dark_skin_tone[] = "🧎🏾‍♀️";
+	inline constexpr const char woman_kneeling_tone5[] = "🧎🏿‍♀️";
+	inline constexpr const char woman_kneeling_dark_skin_tone[] = "🧎🏿‍♀️";
+	inline constexpr const char man_kneeling[] = "🧎‍♂️";
+	inline constexpr const char man_kneeling_tone1[] = "🧎🏻‍♂️";
+	inline constexpr const char man_kneeling_light_skin_tone[] = "🧎🏻‍♂️";
+	inline constexpr const char man_kneeling_tone2[] = "🧎🏼‍♂️";
+	inline constexpr const char man_kneeling_medium_light_skin_tone[] = "🧎🏼‍♂️";
+	inline constexpr const char man_kneeling_tone3[] = "🧎🏽‍♂️";
+	inline constexpr const char man_kneeling_medium_skin_tone[] = "🧎🏽‍♂️";
+	inline constexpr const char man_kneeling_tone4[] = "🧎🏾‍♂️";
+	inline constexpr const char man_kneeling_medium_dark_skin_tone[] = "🧎🏾‍♂️";
+	inline constexpr const char man_kneeling_tone5[] = "🧎🏿‍♂️";
+	inline constexpr const char man_kneeling_dark_skin_tone[] = "🧎🏿‍♂️";
+	inline constexpr const char person_running[] = "🏃";
+	inline constexpr const char runner[] = "🏃";
+	inline constexpr const char person_running_tone1[] = "🏃🏻";
+	inline constexpr const char runner_tone1[] = "🏃🏻";
+	inline constexpr const char person_running_tone2[] = "🏃🏼";
+	inline constexpr const char runner_tone2[] = "🏃🏼";
+	inline constexpr const char person_running_tone3[] = "🏃🏽";
+	inline constexpr const char runner_tone3[] = "🏃🏽";
+	inline constexpr const char person_running_tone4[] = "🏃🏾";
+	inline constexpr const char runner_tone4[] = "🏃🏾";
+	inline constexpr const char person_running_tone5[] = "🏃🏿";
+	inline constexpr const char runner_tone5[] = "🏃🏿";
+	inline constexpr const char woman_running[] = "🏃‍♀️";
+	inline constexpr const char woman_running_tone1[] = "🏃🏻‍♀️";
+	inline constexpr const char woman_running_light_skin_tone[] = "🏃🏻‍♀️";
+	inline constexpr const char woman_running_tone2[] = "🏃🏼‍♀️";
+	inline constexpr const char woman_running_medium_light_skin_tone[] = "🏃🏼‍♀️";
+	inline constexpr const char woman_running_tone3[] = "🏃🏽‍♀️";
+	inline constexpr const char woman_running_medium_skin_tone[] = "🏃🏽‍♀️";
+	inline constexpr const char woman_running_tone4[] = "🏃🏾‍♀️";
+	inline constexpr const char woman_running_medium_dark_skin_tone[] = "🏃🏾‍♀️";
+	inline constexpr const char woman_running_tone5[] = "🏃🏿‍♀️";
+	inline constexpr const char woman_running_dark_skin_tone[] = "🏃🏿‍♀️";
+	inline constexpr const char man_running[] = "🏃‍♂️";
+	inline constexpr const char man_running_tone1[] = "🏃🏻‍♂️";
+	inline constexpr const char man_running_light_skin_tone[] = "🏃🏻‍♂️";
+	inline constexpr const char man_running_tone2[] = "🏃🏼‍♂️";
+	inline constexpr const char man_running_medium_light_skin_tone[] = "🏃🏼‍♂️";
+	inline constexpr const char man_running_tone3[] = "🏃🏽‍♂️";
+	inline constexpr const char man_running_medium_skin_tone[] = "🏃🏽‍♂️";
+	inline constexpr const char man_running_tone4[] = "🏃🏾‍♂️";
+	inline constexpr const char man_running_medium_dark_skin_tone[] = "🏃🏾‍♂️";
+	inline constexpr const char man_running_tone5[] = "🏃🏿‍♂️";
+	inline constexpr const char man_running_dark_skin_tone[] = "🏃🏿‍♂️";
+	inline constexpr const char person_standing[] = "🧍";
+	inline constexpr const char person_standing_tone1[] = "🧍🏻";
+	inline constexpr const char person_standing_light_skin_tone[] = "🧍🏻";
+	inline constexpr const char person_standing_tone2[] = "🧍🏼";
+	inline constexpr const char person_standing_medium_light_skin_tone[] = "🧍🏼";
+	inline constexpr const char person_standing_tone3[] = "🧍🏽";
+	inline constexpr const char person_standing_medium_skin_tone[] = "🧍🏽";
+	inline constexpr const char person_standing_tone4[] = "🧍🏾";
+	inline constexpr const char person_standing_medium_dark_skin_tone[] = "🧍🏾";
+	inline constexpr const char person_standing_tone5[] = "🧍🏿";
+	inline constexpr const char person_standing_dark_skin_tone[] = "🧍🏿";
+	inline constexpr const char woman_standing[] = "🧍‍♀️";
+	inline constexpr const char woman_standing_tone1[] = "🧍🏻‍♀️";
+	inline constexpr const char woman_standing_light_skin_tone[] = "🧍🏻‍♀️";
+	inline constexpr const char woman_standing_tone2[] = "🧍🏼‍♀️";
+	inline constexpr const char woman_standing_medium_light_skin_tone[] = "🧍🏼‍♀️";
+	inline constexpr const char woman_standing_tone3[] = "🧍🏽‍♀️";
+	inline constexpr const char woman_standing_medium_skin_tone[] = "🧍🏽‍♀️";
+	inline constexpr const char woman_standing_tone4[] = "🧍🏾‍♀️";
+	inline constexpr const char woman_standing_medium_dark_skin_tone[] = "🧍🏾‍♀️";
+	inline constexpr const char woman_standing_tone5[] = "🧍🏿‍♀️";
+	inline constexpr const char woman_standing_dark_skin_tone[] = "🧍🏿‍♀️";
+	inline constexpr const char man_standing[] = "🧍‍♂️";
+	inline constexpr const char man_standing_tone1[] = "🧍🏻‍♂️";
+	inline constexpr const char man_standing_light_skin_tone[] = "🧍🏻‍♂️";
+	inline constexpr const char man_standing_tone2[] = "🧍🏼‍♂️";
+	inline constexpr const char man_standing_medium_light_skin_tone[] = "🧍🏼‍♂️";
+	inline constexpr const char man_standing_tone3[] = "🧍🏽‍♂️";
+	inline constexpr const char man_standing_medium_skin_tone[] = "🧍🏽‍♂️";
+	inline constexpr const char man_standing_tone4[] = "🧍🏾‍♂️";
+	inline constexpr const char man_standing_medium_dark_skin_tone[] = "🧍🏾‍♂️";
+	inline constexpr const char man_standing_tone5[] = "🧍🏿‍♂️";
+	inline constexpr const char man_standing_dark_skin_tone[] = "🧍🏿‍♂️";
+	inline constexpr const char people_holding_hands[] = "🧑‍🤝‍🧑";
+	inline constexpr const char people_holding_hands_tone1[] = "🧑🏻‍🤝‍🧑🏻";
+	inline constexpr const char people_holding_hands_light_skin_tone[] = "🧑🏻‍🤝‍🧑🏻";
+	inline constexpr const char people_holding_hands_tone1_tone2[] = "🧑🏻‍🤝‍🧑🏼";
+	inline constexpr const char people_holding_hands_light_skin_tone_medium_light_skin_tone[] = "🧑🏻‍🤝‍🧑🏼";
+	inline constexpr const char people_holding_hands_tone1_tone3[] = "🧑🏻‍🤝‍🧑🏽";
+	inline constexpr const char people_holding_hands_light_skin_tone_medium_skin_tone[] = "🧑🏻‍🤝‍🧑🏽";
+	inline constexpr const char people_holding_hands_tone1_tone4[] = "🧑🏻‍🤝‍🧑🏾";
+	inline constexpr const char people_holding_hands_light_skin_tone_medium_dark_skin_tone[] = "🧑🏻‍🤝‍🧑🏾";
+	inline constexpr const char people_holding_hands_tone1_tone5[] = "🧑🏻‍🤝‍🧑🏿";
+	inline constexpr const char people_holding_hands_light_skin_tone_dark_skin_tone[] = "🧑🏻‍🤝‍🧑🏿";
+	inline constexpr const char people_holding_hands_tone2_tone1[] = "🧑🏼‍🤝‍🧑🏻";
+	inline constexpr const char people_holding_hands_medium_light_skin_tone_light_skin_tone[] = "🧑🏼‍🤝‍🧑🏻";
+	inline constexpr const char people_holding_hands_tone2[] = "🧑🏼‍🤝‍🧑🏼";
+	inline constexpr const char people_holding_hands_medium_light_skin_tone[] = "🧑🏼‍🤝‍🧑🏼";
+	inline constexpr const char people_holding_hands_tone2_tone3[] = "🧑🏼‍🤝‍🧑🏽";
+	inline constexpr const char people_holding_hands_medium_light_skin_tone_medium_skin_tone[] = "🧑🏼‍🤝‍🧑🏽";
+	inline constexpr const char people_holding_hands_tone2_tone4[] = "🧑🏼‍🤝‍🧑🏾";
+	inline constexpr const char people_holding_hands_medium_light_skin_tone_medium_dark_skin_tone[] = "🧑🏼‍🤝‍🧑🏾";
+	inline constexpr const char people_holding_hands_tone2_tone5[] = "🧑🏼‍🤝‍🧑🏿";
+	inline constexpr const char people_holding_hands_medium_light_skin_tone_dark_skin_tone[] = "🧑🏼‍🤝‍🧑🏿";
+	inline constexpr const char people_holding_hands_tone3_tone1[] = "🧑🏽‍🤝‍🧑🏻";
+	inline constexpr const char people_holding_hands_medium_skin_tone_light_skin_tone[] = "🧑🏽‍🤝‍🧑🏻";
+	inline constexpr const char people_holding_hands_tone3_tone2[] = "🧑🏽‍🤝‍🧑🏼";
+	inline constexpr const char people_holding_hands_medium_skin_tone_medium_light_skin_tone[] = "🧑🏽‍🤝‍🧑🏼";
+	inline constexpr const char people_holding_hands_tone3[] = "🧑🏽‍🤝‍🧑🏽";
+	inline constexpr const char people_holding_hands_medium_skin_tone[] = "🧑🏽‍🤝‍🧑🏽";
+	inline constexpr const char people_holding_hands_tone3_tone4[] = "🧑🏽‍🤝‍🧑🏾";
+	inline constexpr const char people_holding_hands_medium_skin_tone_medium_dark_skin_tone[] = "🧑🏽‍🤝‍🧑🏾";
+	inline constexpr const char people_holding_hands_tone3_tone5[] = "🧑🏽‍🤝‍🧑🏿";
+	inline constexpr const char people_holding_hands_medium_skin_tone_dark_skin_tone[] = "🧑🏽‍🤝‍🧑🏿";
+	inline constexpr const char people_holding_hands_tone4_tone1[] = "🧑🏾‍🤝‍🧑🏻";
+	inline constexpr const char people_holding_hands_medium_dark_skin_tone_light_skin_tone[] = "🧑🏾‍🤝‍🧑🏻";
+	inline constexpr const char people_holding_hands_tone4_tone2[] = "🧑🏾‍🤝‍🧑🏼";
+	inline constexpr const char people_holding_hands_medium_dark_skin_tone_medium_light_skin_tone[] = "🧑🏾‍🤝‍🧑🏼";
+	inline constexpr const char people_holding_hands_tone4_tone3[] = "🧑🏾‍🤝‍🧑🏽";
+	inline constexpr const char people_holding_hands_medium_dark_skin_tone_medium_skin_tone[] = "🧑🏾‍🤝‍🧑🏽";
+	inline constexpr const char people_holding_hands_tone4[] = "🧑🏾‍🤝‍🧑🏾";
+	inline constexpr const char people_holding_hands_medium_dark_skin_tone[] = "🧑🏾‍🤝‍🧑🏾";
+	inline constexpr const char people_holding_hands_tone4_tone5[] = "🧑🏾‍🤝‍🧑🏿";
+	inline constexpr const char people_holding_hands_medium_dark_skin_tone_dark_skin_tone[] = "🧑🏾‍🤝‍🧑🏿";
+	inline constexpr const char people_holding_hands_tone5_tone1[] = "🧑🏿‍🤝‍🧑🏻";
+	inline constexpr const char people_holding_hands_dark_skin_tone_light_skin_tone[] = "🧑🏿‍🤝‍🧑🏻";
+	inline constexpr const char people_holding_hands_tone5_tone2[] = "🧑🏿‍🤝‍🧑🏼";
+	inline constexpr const char people_holding_hands_dark_skin_tone_medium_light_skin_tone[] = "🧑🏿‍🤝‍🧑🏼";
+	inline constexpr const char people_holding_hands_tone5_tone3[] = "🧑🏿‍🤝‍🧑🏽";
+	inline constexpr const char people_holding_hands_dark_skin_tone_medium_skin_tone[] = "🧑🏿‍🤝‍🧑🏽";
+	inline constexpr const char people_holding_hands_tone5_tone4[] = "🧑🏿‍🤝‍🧑🏾";
+	inline constexpr const char people_holding_hands_dark_skin_tone_medium_dark_skin_tone[] = "🧑🏿‍🤝‍🧑🏾";
+	inline constexpr const char people_holding_hands_tone5[] = "🧑🏿‍🤝‍🧑🏿";
+	inline constexpr const char people_holding_hands_dark_skin_tone[] = "🧑🏿‍🤝‍🧑🏿";
+	inline constexpr const char couple[] = "👫";
+	inline constexpr const char woman_and_man_holding_hands_tone1[] = "👫🏻";
+	inline constexpr const char woman_and_man_holding_hands_light_skin_tone[] = "👫🏻";
+	inline constexpr const char woman_and_man_holding_hands_tone1_tone2[] = "👩🏻‍🤝‍👨🏼";
+	inline constexpr const char woman_and_man_holding_hands_light_skin_tone_medium_light_skin_tone[] = "👩🏻‍🤝‍👨🏼";
+	inline constexpr const char woman_and_man_holding_hands_tone1_tone3[] = "👩🏻‍🤝‍👨🏽";
+	inline constexpr const char woman_and_man_holding_hands_light_skin_tone_medium_skin_tone[] = "👩🏻‍🤝‍👨🏽";
+	inline constexpr const char woman_and_man_holding_hands_tone1_tone4[] = "👩🏻‍🤝‍👨🏾";
+	inline constexpr const char woman_and_man_holding_hands_light_skin_tone_medium_dark_skin_tone[] = "👩🏻‍🤝‍👨🏾";
+	inline constexpr const char woman_and_man_holding_hands_tone1_tone5[] = "👩🏻‍🤝‍👨🏿";
+	inline constexpr const char woman_and_man_holding_hands_light_skin_tone_dark_skin_tone[] = "👩🏻‍🤝‍👨🏿";
+	inline constexpr const char woman_and_man_holding_hands_tone2_tone1[] = "👩🏼‍🤝‍👨🏻";
+	inline constexpr const char woman_and_man_holding_hands_medium_light_skin_tone_light_skin_tone[] = "👩🏼‍🤝‍👨🏻";
+	inline constexpr const char woman_and_man_holding_hands_tone2[] = "👫🏼";
+	inline constexpr const char woman_and_man_holding_hands_medium_light_skin_tone[] = "👫🏼";
+	inline constexpr const char woman_and_man_holding_hands_tone2_tone3[] = "👩🏼‍🤝‍👨🏽";
+	inline constexpr const char woman_and_man_holding_hands_medium_light_skin_tone_medium_skin_tone[] = "👩🏼‍🤝‍👨🏽";
+	inline constexpr const char woman_and_man_holding_hands_tone2_tone4[] = "👩🏼‍🤝‍👨🏾";
+	inline constexpr const char woman_and_man_holding_hands_medium_light_skin_tone_medium_dark_skin_tone[] = "👩🏼‍🤝‍👨🏾";
+	inline constexpr const char woman_and_man_holding_hands_tone2_tone5[] = "👩🏼‍🤝‍👨🏿";
+	inline constexpr const char woman_and_man_holding_hands_medium_light_skin_tone_dark_skin_tone[] = "👩🏼‍🤝‍👨🏿";
+	inline constexpr const char woman_and_man_holding_hands_tone3_tone1[] = "👩🏽‍🤝‍👨🏻";
+	inline constexpr const char woman_and_man_holding_hands_medium_skin_tone_light_skin_tone[] = "👩🏽‍🤝‍👨🏻";
+	inline constexpr const char woman_and_man_holding_hands_tone3_tone2[] = "👩🏽‍🤝‍👨🏼";
+	inline constexpr const char woman_and_man_holding_hands_medium_skin_tone_medium_light_skin_tone[] = "👩🏽‍🤝‍👨🏼";
+	inline constexpr const char woman_and_man_holding_hands_tone3[] = "👫🏽";
+	inline constexpr const char woman_and_man_holding_hands_medium_skin_tone[] = "👫🏽";
+	inline constexpr const char woman_and_man_holding_hands_tone3_tone4[] = "👩🏽‍🤝‍👨🏾";
+	inline constexpr const char woman_and_man_holding_hands_medium_skin_tone_medium_dark_skin_tone[] = "👩🏽‍🤝‍👨🏾";
+	inline constexpr const char woman_and_man_holding_hands_tone3_tone5[] = "👩🏽‍🤝‍👨🏿";
+	inline constexpr const char woman_and_man_holding_hands_medium_skin_tone_dark_skin_tone[] = "👩🏽‍🤝‍👨🏿";
+	inline constexpr const char woman_and_man_holding_hands_tone4_tone1[] = "👩🏾‍🤝‍👨🏻";
+	inline constexpr const char woman_and_man_holding_hands_medium_dark_skin_tone_light_skin_tone[] = "👩🏾‍🤝‍👨🏻";
+	inline constexpr const char woman_and_man_holding_hands_tone4_tone2[] = "👩🏾‍🤝‍👨🏼";
+	inline constexpr const char woman_and_man_holding_hands_medium_dark_skin_tone_medium_light_skin_tone[] = "👩🏾‍🤝‍👨🏼";
+	inline constexpr const char woman_and_man_holding_hands_tone4_tone3[] = "👩🏾‍🤝‍👨🏽";
+	inline constexpr const char woman_and_man_holding_hands_medium_dark_skin_tone_medium_skin_tone[] = "👩🏾‍🤝‍👨🏽";
+	inline constexpr const char woman_and_man_holding_hands_tone4[] = "👫🏾";
+	inline constexpr const char woman_and_man_holding_hands_medium_dark_skin_tone[] = "👫🏾";
+	inline constexpr const char woman_and_man_holding_hands_tone4_tone5[] = "👩🏾‍🤝‍👨🏿";
+	inline constexpr const char woman_and_man_holding_hands_medium_dark_skin_tone_dark_skin_tone[] = "👩🏾‍🤝‍👨🏿";
+	inline constexpr const char woman_and_man_holding_hands_tone5_tone1[] = "👩🏿‍🤝‍👨🏻";
+	inline constexpr const char woman_and_man_holding_hands_dark_skin_tone_light_skin_tone[] = "👩🏿‍🤝‍👨🏻";
+	inline constexpr const char woman_and_man_holding_hands_tone5_tone2[] = "👩🏿‍🤝‍👨🏼";
+	inline constexpr const char woman_and_man_holding_hands_dark_skin_tone_medium_light_skin_tone[] = "👩🏿‍🤝‍👨🏼";
+	inline constexpr const char woman_and_man_holding_hands_tone5_tone3[] = "👩🏿‍🤝‍👨🏽";
+	inline constexpr const char woman_and_man_holding_hands_dark_skin_tone_medium_skin_tone[] = "👩🏿‍🤝‍👨🏽";
+	inline constexpr const char woman_and_man_holding_hands_tone5_tone4[] = "👩🏿‍🤝‍👨🏾";
+	inline constexpr const char woman_and_man_holding_hands_dark_skin_tone_medium_dark_skin_tone[] = "👩🏿‍🤝‍👨🏾";
+	inline constexpr const char woman_and_man_holding_hands_tone5[] = "👫🏿";
+	inline constexpr const char woman_and_man_holding_hands_dark_skin_tone[] = "👫🏿";
+	inline constexpr const char two_women_holding_hands[] = "👭";
+	inline constexpr const char women_holding_hands_tone1[] = "👭🏻";
+	inline constexpr const char women_holding_hands_light_skin_tone[] = "👭🏻";
+	inline constexpr const char women_holding_hands_tone1_tone2[] = "👩🏻‍🤝‍👩🏼";
+	inline constexpr const char women_holding_hands_light_skin_tone_medium_light_skin_tone[] = "👩🏻‍🤝‍👩🏼";
+	inline constexpr const char women_holding_hands_tone1_tone3[] = "👩🏻‍🤝‍👩🏽";
+	inline constexpr const char women_holding_hands_light_skin_tone_medium_skin_tone[] = "👩🏻‍🤝‍👩🏽";
+	inline constexpr const char women_holding_hands_tone1_tone4[] = "👩🏻‍🤝‍👩🏾";
+	inline constexpr const char women_holding_hands_light_skin_tone_medium_dark_skin_tone[] = "👩🏻‍🤝‍👩🏾";
+	inline constexpr const char women_holding_hands_tone1_tone5[] = "👩🏻‍🤝‍👩🏿";
+	inline constexpr const char women_holding_hands_light_skin_tone_dark_skin_tone[] = "👩🏻‍🤝‍👩🏿";
+	inline constexpr const char women_holding_hands_tone2_tone1[] = "👩🏼‍🤝‍👩🏻";
+	inline constexpr const char women_holding_hands_medium_light_skin_tone_light_skin_tone[] = "👩🏼‍🤝‍👩🏻";
+	inline constexpr const char women_holding_hands_tone2[] = "👭🏼";
+	inline constexpr const char women_holding_hands_medium_light_skin_tone[] = "👭🏼";
+	inline constexpr const char women_holding_hands_tone2_tone3[] = "👩🏼‍🤝‍👩🏽";
+	inline constexpr const char women_holding_hands_medium_light_skin_tone_medium_skin_tone[] = "👩🏼‍🤝‍👩🏽";
+	inline constexpr const char women_holding_hands_tone2_tone4[] = "👩🏼‍🤝‍👩🏾";
+	inline constexpr const char women_holding_hands_medium_light_skin_tone_medium_dark_skin_tone[] = "👩🏼‍🤝‍👩🏾";
+	inline constexpr const char women_holding_hands_tone2_tone5[] = "👩🏼‍🤝‍👩🏿";
+	inline constexpr const char women_holding_hands_medium_light_skin_tone_dark_skin_tone[] = "👩🏼‍🤝‍👩🏿";
+	inline constexpr const char women_holding_hands_tone3_tone1[] = "👩🏽‍🤝‍👩🏻";
+	inline constexpr const char women_holding_hands_medium_skin_tone_light_skin_tone[] = "👩🏽‍🤝‍👩🏻";
+	inline constexpr const char women_holding_hands_tone3_tone2[] = "👩🏽‍🤝‍👩🏼";
+	inline constexpr const char women_holding_hands_medium_skin_tone_medium_light_skin_tone[] = "👩🏽‍🤝‍👩🏼";
+	inline constexpr const char women_holding_hands_tone3[] = "👭🏽";
+	inline constexpr const char women_holding_hands_medium_skin_tone[] = "👭🏽";
+	inline constexpr const char women_holding_hands_tone3_tone4[] = "👩🏽‍🤝‍👩🏾";
+	inline constexpr const char women_holding_hands_medium_skin_tone_medium_dark_skin_tone[] = "👩🏽‍🤝‍👩🏾";
+	inline constexpr const char women_holding_hands_tone3_tone5[] = "👩🏽‍🤝‍👩🏿";
+	inline constexpr const char women_holding_hands_medium_skin_tone_dark_skin_tone[] = "👩🏽‍🤝‍👩🏿";
+	inline constexpr const char women_holding_hands_tone4_tone1[] = "👩🏾‍🤝‍👩🏻";
+	inline constexpr const char women_holding_hands_medium_dark_skin_tone_light_skin_tone[] = "👩🏾‍🤝‍👩🏻";
+	inline constexpr const char women_holding_hands_tone4_tone2[] = "👩🏾‍🤝‍👩🏼";
+	inline constexpr const char women_holding_hands_medium_dark_skin_tone_medium_light_skin_tone[] = "👩🏾‍🤝‍👩🏼";
+	inline constexpr const char women_holding_hands_tone4_tone3[] = "👩🏾‍🤝‍👩🏽";
+	inline constexpr const char women_holding_hands_medium_dark_skin_tone_medium_skin_tone[] = "👩🏾‍🤝‍👩🏽";
+	inline constexpr const char women_holding_hands_tone4[] = "👭🏾";
+	inline constexpr const char women_holding_hands_medium_dark_skin_tone[] = "👭🏾";
+	inline constexpr const char women_holding_hands_tone4_tone5[] = "👩🏾‍🤝‍👩🏿";
+	inline constexpr const char women_holding_hands_medium_dark_skin_tone_dark_skin_tone[] = "👩🏾‍🤝‍👩🏿";
+	inline constexpr const char women_holding_hands_tone5_tone1[] = "👩🏿‍🤝‍👩🏻";
+	inline constexpr const char women_holding_hands_dark_skin_tone_light_skin_tone[] = "👩🏿‍🤝‍👩🏻";
+	inline constexpr const char women_holding_hands_tone5_tone2[] = "👩🏿‍🤝‍👩🏼";
+	inline constexpr const char women_holding_hands_dark_skin_tone_medium_light_skin_tone[] = "👩🏿‍🤝‍👩🏼";
+	inline constexpr const char women_holding_hands_tone5_tone3[] = "👩🏿‍🤝‍👩🏽";
+	inline constexpr const char women_holding_hands_dark_skin_tone_medium_skin_tone[] = "👩🏿‍🤝‍👩🏽";
+	inline constexpr const char women_holding_hands_tone5_tone4[] = "👩🏿‍🤝‍👩🏾";
+	inline constexpr const char women_holding_hands_dark_skin_tone_medium_dark_skin_tone[] = "👩🏿‍🤝‍👩🏾";
+	inline constexpr const char women_holding_hands_tone5[] = "👭🏿";
+	inline constexpr const char women_holding_hands_dark_skin_tone[] = "👭🏿";
+	inline constexpr const char two_men_holding_hands[] = "👬";
+	inline constexpr const char men_holding_hands_tone1[] = "👬🏻";
+	inline constexpr const char men_holding_hands_light_skin_tone[] = "👬🏻";
+	inline constexpr const char men_holding_hands_tone1_tone2[] = "👨🏻‍🤝‍👨🏼";
+	inline constexpr const char men_holding_hands_light_skin_tone_medium_light_skin_tone[] = "👨🏻‍🤝‍👨🏼";
+	inline constexpr const char men_holding_hands_tone1_tone3[] = "👨🏻‍🤝‍👨🏽";
+	inline constexpr const char men_holding_hands_light_skin_tone_medium_skin_tone[] = "👨🏻‍🤝‍👨🏽";
+	inline constexpr const char men_holding_hands_tone1_tone4[] = "👨🏻‍🤝‍👨🏾";
+	inline constexpr const char men_holding_hands_light_skin_tone_medium_dark_skin_tone[] = "👨🏻‍🤝‍👨🏾";
+	inline constexpr const char men_holding_hands_tone1_tone5[] = "👨🏻‍🤝‍👨🏿";
+	inline constexpr const char men_holding_hands_light_skin_tone_dark_skin_tone[] = "👨🏻‍🤝‍👨🏿";
+	inline constexpr const char men_holding_hands_tone2_tone1[] = "👨🏼‍🤝‍👨🏻";
+	inline constexpr const char men_holding_hands_medium_light_skin_tone_light_skin_tone[] = "👨🏼‍🤝‍👨🏻";
+	inline constexpr const char men_holding_hands_tone2[] = "👬🏼";
+	inline constexpr const char men_holding_hands_medium_light_skin_tone[] = "👬🏼";
+	inline constexpr const char men_holding_hands_tone2_tone3[] = "👨🏼‍🤝‍👨🏽";
+	inline constexpr const char men_holding_hands_medium_light_skin_tone_medium_skin_tone[] = "👨🏼‍🤝‍👨🏽";
+	inline constexpr const char men_holding_hands_tone2_tone4[] = "👨🏼‍🤝‍👨🏾";
+	inline constexpr const char men_holding_hands_medium_light_skin_tone_medium_dark_skin_tone[] = "👨🏼‍🤝‍👨🏾";
+	inline constexpr const char men_holding_hands_tone2_tone5[] = "👨🏼‍🤝‍👨🏿";
+	inline constexpr const char men_holding_hands_medium_light_skin_tone_dark_skin_tone[] = "👨🏼‍🤝‍👨🏿";
+	inline constexpr const char men_holding_hands_tone3_tone1[] = "👨🏽‍🤝‍👨🏻";
+	inline constexpr const char men_holding_hands_medium_skin_tone_light_skin_tone[] = "👨🏽‍🤝‍👨🏻";
+	inline constexpr const char men_holding_hands_tone3_tone2[] = "👨🏽‍🤝‍👨🏼";
+	inline constexpr const char men_holding_hands_medium_skin_tone_medium_light_skin_tone[] = "👨🏽‍🤝‍👨🏼";
+	inline constexpr const char men_holding_hands_tone3[] = "👬🏽";
+	inline constexpr const char men_holding_hands_medium_skin_tone[] = "👬🏽";
+	inline constexpr const char men_holding_hands_tone3_tone4[] = "👨🏽‍🤝‍👨🏾";
+	inline constexpr const char men_holding_hands_medium_skin_tone_medium_dark_skin_tone[] = "👨🏽‍🤝‍👨🏾";
+	inline constexpr const char men_holding_hands_tone3_tone5[] = "👨🏽‍🤝‍👨🏿";
+	inline constexpr const char men_holding_hands_medium_skin_tone_dark_skin_tone[] = "👨🏽‍🤝‍👨🏿";
+	inline constexpr const char men_holding_hands_tone4_tone1[] = "👨🏾‍🤝‍👨🏻";
+	inline constexpr const char men_holding_hands_medium_dark_skin_tone_light_skin_tone[] = "👨🏾‍🤝‍👨🏻";
+	inline constexpr const char men_holding_hands_tone4_tone2[] = "👨🏾‍🤝‍👨🏼";
+	inline constexpr const char men_holding_hands_medium_dark_skin_tone_medium_light_skin_tone[] = "👨🏾‍🤝‍👨🏼";
+	inline constexpr const char men_holding_hands_tone4_tone3[] = "👨🏾‍🤝‍👨🏽";
+	inline constexpr const char men_holding_hands_medium_dark_skin_tone_medium_skin_tone[] = "👨🏾‍🤝‍👨🏽";
+	inline constexpr const char men_holding_hands_tone4[] = "👬🏾";
+	inline constexpr const char men_holding_hands_medium_dark_skin_tone[] = "👬🏾";
+	inline constexpr const char men_holding_hands_tone4_tone5[] = "👨🏾‍🤝‍👨🏿";
+	inline constexpr const char men_holding_hands_medium_dark_skin_tone_dark_skin_tone[] = "👨🏾‍🤝‍👨🏿";
+	inline constexpr const char men_holding_hands_tone5_tone1[] = "👨🏿‍🤝‍👨🏻";
+	inline constexpr const char men_holding_hands_dark_skin_tone_light_skin_tone[] = "👨🏿‍🤝‍👨🏻";
+	inline constexpr const char men_holding_hands_tone5_tone2[] = "👨🏿‍🤝‍👨🏼";
+	inline constexpr const char men_holding_hands_dark_skin_tone_medium_light_skin_tone[] = "👨🏿‍🤝‍👨🏼";
+	inline constexpr const char men_holding_hands_tone5_tone3[] = "👨🏿‍🤝‍👨🏽";
+	inline constexpr const char men_holding_hands_dark_skin_tone_medium_skin_tone[] = "👨🏿‍🤝‍👨🏽";
+	inline constexpr const char men_holding_hands_tone5_tone4[] = "👨🏿‍🤝‍👨🏾";
+	inline constexpr const char men_holding_hands_dark_skin_tone_medium_dark_skin_tone[] = "👨🏿‍🤝‍👨🏾";
+	inline constexpr const char men_holding_hands_tone5[] = "👬🏿";
+	inline constexpr const char men_holding_hands_dark_skin_tone[] = "👬🏿";
+	inline constexpr const char couple_with_heart[] = "💑";
+	inline constexpr const char couple_with_heart_tone1[] = "💑🏻";
+	inline constexpr const char couple_with_heart_light_skin_tone[] = "💑🏻";
+	inline constexpr const char couple_with_heart_person_person_tone1_tone2[] = "🧑🏻‍❤️‍🧑🏼";
+	inline constexpr const char couple_with_heart_person_person_light_skin_tone_medium_light_skin_tone[] = "🧑🏻‍❤️‍🧑🏼";
+	inline constexpr const char couple_with_heart_person_person_tone1_tone3[] = "🧑🏻‍❤️‍🧑🏽";
+	inline constexpr const char couple_with_heart_person_person_light_skin_tone_medium_skin_tone[] = "🧑🏻‍❤️‍🧑🏽";
+	inline constexpr const char couple_with_heart_person_person_tone1_tone4[] = "🧑🏻‍❤️‍🧑🏾";
+	inline constexpr const char couple_with_heart_person_person_light_skin_tone_medium_dark_skin_tone[] = "🧑🏻‍❤️‍🧑🏾";
+	inline constexpr const char couple_with_heart_person_person_tone1_tone5[] = "🧑🏻‍❤️‍🧑🏿";
+	inline constexpr const char couple_with_heart_person_person_light_skin_tone_dark_skin_tone[] = "🧑🏻‍❤️‍🧑🏿";
+	inline constexpr const char couple_with_heart_person_person_tone2_tone1[] = "🧑🏼‍❤️‍🧑🏻";
+	inline constexpr const char couple_with_heart_person_person_medium_light_skin_tone_light_skin_tone[] = "🧑🏼‍❤️‍🧑🏻";
+	inline constexpr const char couple_with_heart_tone2[] = "💑🏼";
+	inline constexpr const char couple_with_heart_medium_light_skin_tone[] = "💑🏼";
+	inline constexpr const char couple_with_heart_person_person_tone2_tone3[] = "🧑🏼‍❤️‍🧑🏽";
+	inline constexpr const char couple_with_heart_person_person_medium_light_skin_tone_medium_skin_tone[] = "🧑🏼‍❤️‍🧑🏽";
+	inline constexpr const char couple_with_heart_person_person_tone2_tone4[] = "🧑🏼‍❤️‍🧑🏾";
+	inline constexpr const char couple_with_heart_person_person_medium_light_skin_tone_medium_dark_skin_tone[] = "🧑🏼‍❤️‍🧑🏾";
+	inline constexpr const char couple_with_heart_person_person_tone2_tone5[] = "🧑🏼‍❤️‍🧑🏿";
+	inline constexpr const char couple_with_heart_person_person_medium_light_skin_tone_dark_skin_tone[] = "🧑🏼‍❤️‍🧑🏿";
+	inline constexpr const char couple_with_heart_person_person_tone3_tone1[] = "🧑🏽‍❤️‍🧑🏻";
+	inline constexpr const char couple_with_heart_person_person_medium_skin_tone_light_skin_tone[] = "🧑🏽‍❤️‍🧑🏻";
+	inline constexpr const char couple_with_heart_person_person_tone3_tone2[] = "🧑🏽‍❤️‍🧑🏼";
+	inline constexpr const char couple_with_heart_person_person_medium_skin_tone_medium_light_skin_tone[] = "🧑🏽‍❤️‍🧑🏼";
+	inline constexpr const char couple_with_heart_tone3[] = "💑🏽";
+	inline constexpr const char couple_with_heart_medium_skin_tone[] = "💑🏽";
+	inline constexpr const char couple_with_heart_person_person_tone3_tone4[] = "🧑🏽‍❤️‍🧑🏾";
+	inline constexpr const char couple_with_heart_person_person_medium_skin_tone_medium_dark_skin_tone[] = "🧑🏽‍❤️‍🧑🏾";
+	inline constexpr const char couple_with_heart_person_person_tone3_tone5[] = "🧑🏽‍❤️‍🧑🏿";
+	inline constexpr const char couple_with_heart_person_person_medium_skin_tone_dark_skin_tone[] = "🧑🏽‍❤️‍🧑🏿";
+	inline constexpr const char couple_with_heart_person_person_tone4_tone1[] = "🧑🏾‍❤️‍🧑🏻";
+	inline constexpr const char couple_with_heart_person_person_medium_dark_skin_tone_light_skin_tone[] = "🧑🏾‍❤️‍🧑🏻";
+	inline constexpr const char couple_with_heart_person_person_tone4_tone2[] = "🧑🏾‍❤️‍🧑🏼";
+	inline constexpr const char couple_with_heart_person_person_medium_dark_skin_tone_medium_light_skin_tone[] = "🧑🏾‍❤️‍🧑🏼";
+	inline constexpr const char couple_with_heart_person_person_tone4_tone3[] = "🧑🏾‍❤️‍🧑🏽";
+	inline constexpr const char couple_with_heart_person_person_medium_dark_skin_tone_medium_skin_tone[] = "🧑🏾‍❤️‍🧑🏽";
+	inline constexpr const char couple_with_heart_tone4[] = "💑🏾";
+	inline constexpr const char couple_with_heart_medium_dark_skin_tone[] = "💑🏾";
+	inline constexpr const char couple_with_heart_person_person_tone4_tone5[] = "🧑🏾‍❤️‍🧑🏿";
+	inline constexpr const char couple_with_heart_person_person_medium_dark_skin_tone_dark_skin_tone[] = "🧑🏾‍❤️‍🧑🏿";
+	inline constexpr const char couple_with_heart_person_person_tone5_tone1[] = "🧑🏿‍❤️‍🧑🏻";
+	inline constexpr const char couple_with_heart_person_person_dark_skin_tone_light_skin_tone[] = "🧑🏿‍❤️‍🧑🏻";
+	inline constexpr const char couple_with_heart_person_person_tone5_tone2[] = "🧑🏿‍❤️‍🧑🏼";
+	inline constexpr const char couple_with_heart_person_person_dark_skin_tone_medium_light_skin_tone[] = "🧑🏿‍❤️‍🧑🏼";
+	inline constexpr const char couple_with_heart_person_person_tone5_tone3[] = "🧑🏿‍❤️‍🧑🏽";
+	inline constexpr const char couple_with_heart_person_person_dark_skin_tone_medium_skin_tone[] = "🧑🏿‍❤️‍🧑🏽";
+	inline constexpr const char couple_with_heart_person_person_tone5_tone4[] = "🧑🏿‍❤️‍🧑🏾";
+	inline constexpr const char couple_with_heart_person_person_dark_skin_tone_medium_dark_skin_tone[] = "🧑🏿‍❤️‍🧑🏾";
+	inline constexpr const char couple_with_heart_tone5[] = "💑🏿";
+	inline constexpr const char couple_with_heart_dark_skin_tone[] = "💑🏿";
+	inline constexpr const char couple_with_heart_woman_man[] = "👩‍❤️‍👨";
+	inline constexpr const char couple_with_heart_woman_man_tone1[] = "👩🏻‍❤️‍👨🏻";
+	inline constexpr const char couple_with_heart_woman_man_light_skin_tone[] = "👩🏻‍❤️‍👨🏻";
+	inline constexpr const char couple_with_heart_woman_man_tone1_tone2[] = "👩🏻‍❤️‍👨🏼";
+	inline constexpr const char couple_with_heart_woman_man_light_skin_tone_medium_light_skin_tone[] = "👩🏻‍❤️‍👨🏼";
+	inline constexpr const char couple_with_heart_woman_man_tone1_tone3[] = "👩🏻‍❤️‍👨🏽";
+	inline constexpr const char couple_with_heart_woman_man_light_skin_tone_medium_skin_tone[] = "👩🏻‍❤️‍👨🏽";
+	inline constexpr const char couple_with_heart_woman_man_tone1_tone4[] = "👩🏻‍❤️‍👨🏾";
+	inline constexpr const char couple_with_heart_woman_man_light_skin_tone_medium_dark_skin_tone[] = "👩🏻‍❤️‍👨🏾";
+	inline constexpr const char couple_with_heart_woman_man_tone1_tone5[] = "👩🏻‍❤️‍👨🏿";
+	inline constexpr const char couple_with_heart_woman_man_light_skin_tone_dark_skin_tone[] = "👩🏻‍❤️‍👨🏿";
+	inline constexpr const char couple_with_heart_woman_man_tone2_tone1[] = "👩🏼‍❤️‍👨🏻";
+	inline constexpr const char couple_with_heart_woman_man_medium_light_skin_tone_light_skin_tone[] = "👩🏼‍❤️‍👨🏻";
+	inline constexpr const char couple_with_heart_woman_man_tone2[] = "👩🏼‍❤️‍👨🏼";
+	inline constexpr const char couple_with_heart_woman_man_medium_light_skin_tone[] = "👩🏼‍❤️‍👨🏼";
+	inline constexpr const char couple_with_heart_woman_man_tone2_tone3[] = "👩🏼‍❤️‍👨🏽";
+	inline constexpr const char couple_with_heart_woman_man_medium_light_skin_tone_medium_skin_tone[] = "👩🏼‍❤️‍👨🏽";
+	inline constexpr const char couple_with_heart_woman_man_tone2_tone4[] = "👩🏼‍❤️‍👨🏾";
+	inline constexpr const char couple_with_heart_woman_man_medium_light_skin_tone_medium_dark_skin_tone[] = "👩🏼‍❤️‍👨🏾";
+	inline constexpr const char couple_with_heart_woman_man_tone2_tone5[] = "👩🏼‍❤️‍👨🏿";
+	inline constexpr const char couple_with_heart_woman_man_medium_light_skin_tone_dark_skin_tone[] = "👩🏼‍❤️‍👨🏿";
+	inline constexpr const char couple_with_heart_woman_man_tone3_tone1[] = "👩🏽‍❤️‍👨🏻";
+	inline constexpr const char couple_with_heart_woman_man_medium_skin_tone_light_skin_tone[] = "👩🏽‍❤️‍👨🏻";
+	inline constexpr const char couple_with_heart_woman_man_tone3_tone2[] = "👩🏽‍❤️‍👨🏼";
+	inline constexpr const char couple_with_heart_woman_man_medium_skin_tone_medium_light_skin_tone[] = "👩🏽‍❤️‍👨🏼";
+	inline constexpr const char couple_with_heart_woman_man_tone3[] = "👩🏽‍❤️‍👨🏽";
+	inline constexpr const char couple_with_heart_woman_man_medium_skin_tone[] = "👩🏽‍❤️‍👨🏽";
+	inline constexpr const char couple_with_heart_woman_man_tone3_tone4[] = "👩🏽‍❤️‍👨🏾";
+	inline constexpr const char couple_with_heart_woman_man_medium_skin_tone_medium_dark_skin_tone[] = "👩🏽‍❤️‍👨🏾";
+	inline constexpr const char couple_with_heart_woman_man_tone3_tone5[] = "👩🏽‍❤️‍👨🏿";
+	inline constexpr const char couple_with_heart_woman_man_medium_skin_tone_dark_skin_tone[] = "👩🏽‍❤️‍👨🏿";
+	inline constexpr const char couple_with_heart_woman_man_tone4_tone1[] = "👩🏾‍❤️‍👨🏻";
+	inline constexpr const char couple_with_heart_woman_man_medium_dark_skin_tone_light_skin_tone[] = "👩🏾‍❤️‍👨🏻";
+	inline constexpr const char couple_with_heart_woman_man_tone4_tone2[] = "👩🏾‍❤️‍👨🏼";
+	inline constexpr const char couple_with_heart_woman_man_medium_dark_skin_tone_medium_light_skin_tone[] = "👩🏾‍❤️‍👨🏼";
+	inline constexpr const char couple_with_heart_woman_man_tone4_tone3[] = "👩🏾‍❤️‍👨🏽";
+	inline constexpr const char couple_with_heart_woman_man_medium_dark_skin_tone_medium_skin_tone[] = "👩🏾‍❤️‍👨🏽";
+	inline constexpr const char couple_with_heart_woman_man_tone4[] = "👩🏾‍❤️‍👨🏾";
+	inline constexpr const char couple_with_heart_woman_man_medium_dark_skin_tone[] = "👩🏾‍❤️‍👨🏾";
+	inline constexpr const char couple_with_heart_woman_man_tone4_tone5[] = "👩🏾‍❤️‍👨🏿";
+	inline constexpr const char couple_with_heart_woman_man_medium_dark_skin_tone_dark_skin_tone[] = "👩🏾‍❤️‍👨🏿";
+	inline constexpr const char couple_with_heart_woman_man_tone5_tone1[] = "👩🏿‍❤️‍👨🏻";
+	inline constexpr const char couple_with_heart_woman_man_dark_skin_tone_light_skin_tone[] = "👩🏿‍❤️‍👨🏻";
+	inline constexpr const char couple_with_heart_woman_man_tone5_tone2[] = "👩🏿‍❤️‍👨🏼";
+	inline constexpr const char couple_with_heart_woman_man_dark_skin_tone_medium_light_skin_tone[] = "👩🏿‍❤️‍👨🏼";
+	inline constexpr const char couple_with_heart_woman_man_tone5_tone3[] = "👩🏿‍❤️‍👨🏽";
+	inline constexpr const char couple_with_heart_woman_man_dark_skin_tone_medium_skin_tone[] = "👩🏿‍❤️‍👨🏽";
+	inline constexpr const char couple_with_heart_woman_man_tone5_tone4[] = "👩🏿‍❤️‍👨🏾";
+	inline constexpr const char couple_with_heart_woman_man_dark_skin_tone_medium_dark_skin_tone[] = "👩🏿‍❤️‍👨🏾";
+	inline constexpr const char couple_with_heart_woman_man_tone5[] = "👩🏿‍❤️‍👨🏿";
+	inline constexpr const char couple_with_heart_woman_man_dark_skin_tone[] = "👩🏿‍❤️‍👨🏿";
+	inline constexpr const char couple_ww[] = "👩‍❤️‍👩";
+	inline constexpr const char couple_with_heart_ww[] = "👩‍❤️‍👩";
+	inline constexpr const char couple_with_heart_woman_woman_tone1[] = "👩🏻‍❤️‍👩🏻";
+	inline constexpr const char couple_with_heart_woman_woman_light_skin_tone[] = "👩🏻‍❤️‍👩🏻";
+	inline constexpr const char couple_with_heart_woman_woman_tone1_tone2[] = "👩🏻‍❤️‍👩🏼";
+	inline constexpr const char couple_with_heart_woman_woman_light_skin_tone_medium_light_skin_tone[] = "👩🏻‍❤️‍👩🏼";
+	inline constexpr const char couple_with_heart_woman_woman_tone1_tone3[] = "👩🏻‍❤️‍👩🏽";
+	inline constexpr const char couple_with_heart_woman_woman_light_skin_tone_medium_skin_tone[] = "👩🏻‍❤️‍👩🏽";
+	inline constexpr const char couple_with_heart_woman_woman_tone1_tone4[] = "👩🏻‍❤️‍👩🏾";
+	inline constexpr const char couple_with_heart_woman_woman_light_skin_tone_medium_dark_skin_tone[] = "👩🏻‍❤️‍👩🏾";
+	inline constexpr const char couple_with_heart_woman_woman_tone1_tone5[] = "👩🏻‍❤️‍👩🏿";
+	inline constexpr const char couple_with_heart_woman_woman_light_skin_tone_dark_skin_tone[] = "👩🏻‍❤️‍👩🏿";
+	inline constexpr const char couple_with_heart_woman_woman_tone2_tone1[] = "👩🏼‍❤️‍👩🏻";
+	inline constexpr const char couple_with_heart_woman_woman_medium_light_skin_tone_light_skin_tone[] = "👩🏼‍❤️‍👩🏻";
+	inline constexpr const char couple_with_heart_woman_woman_tone2[] = "👩🏼‍❤️‍👩🏼";
+	inline constexpr const char couple_with_heart_woman_woman_medium_light_skin_tone[] = "👩🏼‍❤️‍👩🏼";
+	inline constexpr const char couple_with_heart_woman_woman_tone2_tone3[] = "👩🏼‍❤️‍👩🏽";
+	inline constexpr const char couple_with_heart_woman_woman_medium_light_skin_tone_medium_skin_tone[] = "👩🏼‍❤️‍👩🏽";
+	inline constexpr const char couple_with_heart_woman_woman_tone2_tone4[] = "👩🏼‍❤️‍👩🏾";
+	inline constexpr const char couple_with_heart_woman_woman_medium_light_skin_tone_medium_dark_skin_tone[] = "👩🏼‍❤️‍👩🏾";
+	inline constexpr const char couple_with_heart_woman_woman_tone2_tone5[] = "👩🏼‍❤️‍👩🏿";
+	inline constexpr const char couple_with_heart_woman_woman_medium_light_skin_tone_dark_skin_tone[] = "👩🏼‍❤️‍👩🏿";
+	inline constexpr const char couple_with_heart_woman_woman_tone3_tone1[] = "👩🏽‍❤️‍👩🏻";
+	inline constexpr const char couple_with_heart_woman_woman_medium_skin_tone_light_skin_tone[] = "👩🏽‍❤️‍👩🏻";
+	inline constexpr const char couple_with_heart_woman_woman_tone3_tone2[] = "👩🏽‍❤️‍👩🏼";
+	inline constexpr const char couple_with_heart_woman_woman_medium_skin_tone_medium_light_skin_tone[] = "👩🏽‍❤️‍👩🏼";
+	inline constexpr const char couple_with_heart_woman_woman_tone3[] = "👩🏽‍❤️‍👩🏽";
+	inline constexpr const char couple_with_heart_woman_woman_medium_skin_tone[] = "👩🏽‍❤️‍👩🏽";
+	inline constexpr const char couple_with_heart_woman_woman_tone3_tone4[] = "👩🏽‍❤️‍👩🏾";
+	inline constexpr const char couple_with_heart_woman_woman_medium_skin_tone_medium_dark_skin_tone[] = "👩🏽‍❤️‍👩🏾";
+	inline constexpr const char couple_with_heart_woman_woman_tone3_tone5[] = "👩🏽‍❤️‍👩🏿";
+	inline constexpr const char couple_with_heart_woman_woman_medium_skin_tone_dark_skin_tone[] = "👩🏽‍❤️‍👩🏿";
+	inline constexpr const char couple_with_heart_woman_woman_tone4_tone1[] = "👩🏾‍❤️‍👩🏻";
+	inline constexpr const char couple_with_heart_woman_woman_medium_dark_skin_tone_light_skin_tone[] = "👩🏾‍❤️‍👩🏻";
+	inline constexpr const char couple_with_heart_woman_woman_tone4_tone2[] = "👩🏾‍❤️‍👩🏼";
+	inline constexpr const char couple_with_heart_woman_woman_medium_dark_skin_tone_medium_light_skin_tone[] = "👩🏾‍❤️‍👩🏼";
+	inline constexpr const char couple_with_heart_woman_woman_tone4_tone3[] = "👩🏾‍❤️‍👩🏽";
+	inline constexpr const char couple_with_heart_woman_woman_medium_dark_skin_tone_medium_skin_tone[] = "👩🏾‍❤️‍👩🏽";
+	inline constexpr const char couple_with_heart_woman_woman_tone4[] = "👩🏾‍❤️‍👩🏾";
+	inline constexpr const char couple_with_heart_woman_woman_medium_dark_skin_tone[] = "👩🏾‍❤️‍👩🏾";
+	inline constexpr const char couple_with_heart_woman_woman_tone4_tone5[] = "👩🏾‍❤️‍👩🏿";
+	inline constexpr const char couple_with_heart_woman_woman_medium_dark_skin_tone_dark_skin_tone[] = "👩🏾‍❤️‍👩🏿";
+	inline constexpr const char couple_with_heart_woman_woman_tone5_tone1[] = "👩🏿‍❤️‍👩🏻";
+	inline constexpr const char couple_with_heart_woman_woman_dark_skin_tone_light_skin_tone[] = "👩🏿‍❤️‍👩🏻";
+	inline constexpr const char couple_with_heart_woman_woman_tone5_tone2[] = "👩🏿‍❤️‍👩🏼";
+	inline constexpr const char couple_with_heart_woman_woman_dark_skin_tone_medium_light_skin_tone[] = "👩🏿‍❤️‍👩🏼";
+	inline constexpr const char couple_with_heart_woman_woman_tone5_tone3[] = "👩🏿‍❤️‍👩🏽";
+	inline constexpr const char couple_with_heart_woman_woman_dark_skin_tone_medium_skin_tone[] = "👩🏿‍❤️‍👩🏽";
+	inline constexpr const char couple_with_heart_woman_woman_tone5_tone4[] = "👩🏿‍❤️‍👩🏾";
+	inline constexpr const char couple_with_heart_woman_woman_dark_skin_tone_medium_dark_skin_tone[] = "👩🏿‍❤️‍👩🏾";
+	inline constexpr const char couple_with_heart_woman_woman_tone5[] = "👩🏿‍❤️‍👩🏿";
+	inline constexpr const char couple_with_heart_woman_woman_dark_skin_tone[] = "👩🏿‍❤️‍👩🏿";
+	inline constexpr const char couple_mm[] = "👨‍❤️‍👨";
+	inline constexpr const char couple_with_heart_mm[] = "👨‍❤️‍👨";
+	inline constexpr const char couple_with_heart_man_man_tone1[] = "👨🏻‍❤️‍👨🏻";
+	inline constexpr const char couple_with_heart_man_man_light_skin_tone[] = "👨🏻‍❤️‍👨🏻";
+	inline constexpr const char couple_with_heart_man_man_tone1_tone2[] = "👨🏻‍❤️‍👨🏼";
+	inline constexpr const char couple_with_heart_man_man_light_skin_tone_medium_light_skin_tone[] = "👨🏻‍❤️‍👨🏼";
+	inline constexpr const char couple_with_heart_man_man_tone1_tone3[] = "👨🏻‍❤️‍👨🏽";
+	inline constexpr const char couple_with_heart_man_man_light_skin_tone_medium_skin_tone[] = "👨🏻‍❤️‍👨🏽";
+	inline constexpr const char couple_with_heart_man_man_tone1_tone4[] = "👨🏻‍❤️‍👨🏾";
+	inline constexpr const char couple_with_heart_man_man_light_skin_tone_medium_dark_skin_tone[] = "👨🏻‍❤️‍👨🏾";
+	inline constexpr const char couple_with_heart_man_man_tone1_tone5[] = "👨🏻‍❤️‍👨🏿";
+	inline constexpr const char couple_with_heart_man_man_light_skin_tone_dark_skin_tone[] = "👨🏻‍❤️‍👨🏿";
+	inline constexpr const char couple_with_heart_man_man_tone2_tone1[] = "👨🏼‍❤️‍👨🏻";
+	inline constexpr const char couple_with_heart_man_man_medium_light_skin_tone_light_skin_tone[] = "👨🏼‍❤️‍👨🏻";
+	inline constexpr const char couple_with_heart_man_man_tone2[] = "👨🏼‍❤️‍👨🏼";
+	inline constexpr const char couple_with_heart_man_man_medium_light_skin_tone[] = "👨🏼‍❤️‍👨🏼";
+	inline constexpr const char couple_with_heart_man_man_tone2_tone3[] = "👨🏼‍❤️‍👨🏽";
+	inline constexpr const char couple_with_heart_man_man_medium_light_skin_tone_medium_skin_tone[] = "👨🏼‍❤️‍👨🏽";
+	inline constexpr const char couple_with_heart_man_man_tone2_tone4[] = "👨🏼‍❤️‍👨🏾";
+	inline constexpr const char couple_with_heart_man_man_medium_light_skin_tone_medium_dark_skin_tone[] = "👨🏼‍❤️‍👨🏾";
+	inline constexpr const char couple_with_heart_man_man_tone2_tone5[] = "👨🏼‍❤️‍👨🏿";
+	inline constexpr const char couple_with_heart_man_man_medium_light_skin_tone_dark_skin_tone[] = "👨🏼‍❤️‍👨🏿";
+	inline constexpr const char couple_with_heart_man_man_tone3_tone1[] = "👨🏽‍❤️‍👨🏻";
+	inline constexpr const char couple_with_heart_man_man_medium_skin_tone_light_skin_tone[] = "👨🏽‍❤️‍👨🏻";
+	inline constexpr const char couple_with_heart_man_man_tone3_tone2[] = "👨🏽‍❤️‍👨🏼";
+	inline constexpr const char couple_with_heart_man_man_medium_skin_tone_medium_light_skin_tone[] = "👨🏽‍❤️‍👨🏼";
+	inline constexpr const char couple_with_heart_man_man_tone3[] = "👨🏽‍❤️‍👨🏽";
+	inline constexpr const char couple_with_heart_man_man_medium_skin_tone[] = "👨🏽‍❤️‍👨🏽";
+	inline constexpr const char couple_with_heart_man_man_tone3_tone4[] = "👨🏽‍❤️‍👨🏾";
+	inline constexpr const char couple_with_heart_man_man_medium_skin_tone_medium_dark_skin_tone[] = "👨🏽‍❤️‍👨🏾";
+	inline constexpr const char couple_with_heart_man_man_tone3_tone5[] = "👨🏽‍❤️‍👨🏿";
+	inline constexpr const char couple_with_heart_man_man_medium_skin_tone_dark_skin_tone[] = "👨🏽‍❤️‍👨🏿";
+	inline constexpr const char couple_with_heart_man_man_tone4_tone1[] = "👨🏾‍❤️‍👨🏻";
+	inline constexpr const char couple_with_heart_man_man_medium_dark_skin_tone_light_skin_tone[] = "👨🏾‍❤️‍👨🏻";
+	inline constexpr const char couple_with_heart_man_man_tone4_tone2[] = "👨🏾‍❤️‍👨🏼";
+	inline constexpr const char couple_with_heart_man_man_medium_dark_skin_tone_medium_light_skin_tone[] = "👨🏾‍❤️‍👨🏼";
+	inline constexpr const char couple_with_heart_man_man_tone4_tone3[] = "👨🏾‍❤️‍👨🏽";
+	inline constexpr const char couple_with_heart_man_man_medium_dark_skin_tone_medium_skin_tone[] = "👨🏾‍❤️‍👨🏽";
+	inline constexpr const char couple_with_heart_man_man_tone4[] = "👨🏾‍❤️‍👨🏾";
+	inline constexpr const char couple_with_heart_man_man_medium_dark_skin_tone[] = "👨🏾‍❤️‍👨🏾";
+	inline constexpr const char couple_with_heart_man_man_tone4_tone5[] = "👨🏾‍❤️‍👨🏿";
+	inline constexpr const char couple_with_heart_man_man_medium_dark_skin_tone_dark_skin_tone[] = "👨🏾‍❤️‍👨🏿";
+	inline constexpr const char couple_with_heart_man_man_tone5_tone1[] = "👨🏿‍❤️‍👨🏻";
+	inline constexpr const char couple_with_heart_man_man_dark_skin_tone_light_skin_tone[] = "👨🏿‍❤️‍👨🏻";
+	inline constexpr const char couple_with_heart_man_man_tone5_tone2[] = "👨🏿‍❤️‍👨🏼";
+	inline constexpr const char couple_with_heart_man_man_dark_skin_tone_medium_light_skin_tone[] = "👨🏿‍❤️‍👨🏼";
+	inline constexpr const char couple_with_heart_man_man_tone5_tone3[] = "👨🏿‍❤️‍👨🏽";
+	inline constexpr const char couple_with_heart_man_man_dark_skin_tone_medium_skin_tone[] = "👨🏿‍❤️‍👨🏽";
+	inline constexpr const char couple_with_heart_man_man_tone5_tone4[] = "👨🏿‍❤️‍👨🏾";
+	inline constexpr const char couple_with_heart_man_man_dark_skin_tone_medium_dark_skin_tone[] = "👨🏿‍❤️‍👨🏾";
+	inline constexpr const char couple_with_heart_man_man_tone5[] = "👨🏿‍❤️‍👨🏿";
+	inline constexpr const char couple_with_heart_man_man_dark_skin_tone[] = "👨🏿‍❤️‍👨🏿";
+	inline constexpr const char couplekiss[] = "💏";
+	inline constexpr const char kiss_tone1[] = "💏🏻";
+	inline constexpr const char kiss_light_skin_tone[] = "💏🏻";
+	inline constexpr const char kiss_person_person_tone1_tone2[] = "🧑🏻‍❤️‍💋‍🧑🏼";
+	inline constexpr const char kiss_person_person_light_skin_tone_medium_light_skin_tone[] = "🧑🏻‍❤️‍💋‍🧑🏼";
+	inline constexpr const char kiss_person_person_tone1_tone3[] = "🧑🏻‍❤️‍💋‍🧑🏽";
+	inline constexpr const char kiss_person_person_light_skin_tone_medium_skin_tone[] = "🧑🏻‍❤️‍💋‍🧑🏽";
+	inline constexpr const char kiss_person_person_tone1_tone4[] = "🧑🏻‍❤️‍💋‍🧑🏾";
+	inline constexpr const char kiss_person_person_light_skin_tone_medium_dark_skin_tone[] = "🧑🏻‍❤️‍💋‍🧑🏾";
+	inline constexpr const char kiss_person_person_tone1_tone5[] = "🧑🏻‍❤️‍💋‍🧑🏿";
+	inline constexpr const char kiss_person_person_light_skin_tone_dark_skin_tone[] = "🧑🏻‍❤️‍💋‍🧑🏿";
+	inline constexpr const char kiss_person_person_tone2_tone1[] = "🧑🏼‍❤️‍💋‍🧑🏻";
+	inline constexpr const char kiss_person_person_medium_light_skin_tone_light_skin_tone[] = "🧑🏼‍❤️‍💋‍🧑🏻";
+	inline constexpr const char kiss_tone2[] = "💏🏼";
+	inline constexpr const char kiss_medium_light_skin_tone[] = "💏🏼";
+	inline constexpr const char kiss_person_person_tone2_tone3[] = "🧑🏼‍❤️‍💋‍🧑🏽";
+	inline constexpr const char kiss_person_person_medium_light_skin_tone_medium_skin_tone[] = "🧑🏼‍❤️‍💋‍🧑🏽";
+	inline constexpr const char kiss_person_person_tone2_tone4[] = "🧑🏼‍❤️‍💋‍🧑🏾";
+	inline constexpr const char kiss_person_person_medium_light_skin_tone_medium_dark_skin_tone[] = "🧑🏼‍❤️‍💋‍🧑🏾";
+	inline constexpr const char kiss_person_person_tone2_tone5[] = "🧑🏼‍❤️‍💋‍🧑🏿";
+	inline constexpr const char kiss_person_person_medium_light_skin_tone_dark_skin_tone[] = "🧑🏼‍❤️‍💋‍🧑🏿";
+	inline constexpr const char kiss_person_person_tone3_tone1[] = "🧑🏽‍❤️‍💋‍🧑🏻";
+	inline constexpr const char kiss_person_person_medium_skin_tone_light_skin_tone[] = "🧑🏽‍❤️‍💋‍🧑🏻";
+	inline constexpr const char kiss_person_person_tone3_tone2[] = "🧑🏽‍❤️‍💋‍🧑🏼";
+	inline constexpr const char kiss_person_person_medium_skin_tone_medium_light_skin_tone[] = "🧑🏽‍❤️‍💋‍🧑🏼";
+	inline constexpr const char kiss_tone3[] = "💏🏽";
+	inline constexpr const char kiss_medium_skin_tone[] = "💏🏽";
+	inline constexpr const char kiss_person_person_tone3_tone4[] = "🧑🏽‍❤️‍💋‍🧑🏾";
+	inline constexpr const char kiss_person_person_medium_skin_tone_medium_dark_skin_tone[] = "🧑🏽‍❤️‍💋‍🧑🏾";
+	inline constexpr const char kiss_person_person_tone3_tone5[] = "🧑🏽‍❤️‍💋‍🧑🏿";
+	inline constexpr const char kiss_person_person_medium_skin_tone_dark_skin_tone[] = "🧑🏽‍❤️‍💋‍🧑🏿";
+	inline constexpr const char kiss_person_person_tone4_tone1[] = "🧑🏾‍❤️‍💋‍🧑🏻";
+	inline constexpr const char kiss_person_person_medium_dark_skin_tone_light_skin_tone[] = "🧑🏾‍❤️‍💋‍🧑🏻";
+	inline constexpr const char kiss_person_person_tone4_tone2[] = "🧑🏾‍❤️‍💋‍🧑🏼";
+	inline constexpr const char kiss_person_person_medium_dark_skin_tone_medium_light_skin_tone[] = "🧑🏾‍❤️‍💋‍🧑🏼";
+	inline constexpr const char kiss_person_person_tone4_tone3[] = "🧑🏾‍❤️‍💋‍🧑🏽";
+	inline constexpr const char kiss_person_person_medium_dark_skin_tone_medium_skin_tone[] = "🧑🏾‍❤️‍💋‍🧑🏽";
+	inline constexpr const char kiss_tone4[] = "💏🏾";
+	inline constexpr const char kiss_medium_dark_skin_tone[] = "💏🏾";
+	inline constexpr const char kiss_person_person_tone4_tone5[] = "🧑🏾‍❤️‍💋‍🧑🏿";
+	inline constexpr const char kiss_person_person_medium_dark_skin_tone_dark_skin_tone[] = "🧑🏾‍❤️‍💋‍🧑🏿";
+	inline constexpr const char kiss_person_person_tone5_tone1[] = "🧑🏿‍❤️‍💋‍🧑🏻";
+	inline constexpr const char kiss_person_person_dark_skin_tone_light_skin_tone[] = "🧑🏿‍❤️‍💋‍🧑🏻";
+	inline constexpr const char kiss_person_person_tone5_tone2[] = "🧑🏿‍❤️‍💋‍🧑🏼";
+	inline constexpr const char kiss_person_person_dark_skin_tone_medium_light_skin_tone[] = "🧑🏿‍❤️‍💋‍🧑🏼";
+	inline constexpr const char kiss_person_person_tone5_tone3[] = "🧑🏿‍❤️‍💋‍🧑🏽";
+	inline constexpr const char kiss_person_person_dark_skin_tone_medium_skin_tone[] = "🧑🏿‍❤️‍💋‍🧑🏽";
+	inline constexpr const char kiss_person_person_tone5_tone4[] = "🧑🏿‍❤️‍💋‍🧑🏾";
+	inline constexpr const char kiss_person_person_dark_skin_tone_medium_dark_skin_tone[] = "🧑🏿‍❤️‍💋‍🧑🏾";
+	inline constexpr const char kiss_tone5[] = "💏🏿";
+	inline constexpr const char kiss_dark_skin_tone[] = "💏🏿";
+	inline constexpr const char kiss_woman_man[] = "👩‍❤️‍💋‍👨";
+	inline constexpr const char kiss_woman_man_tone1[] = "👩🏻‍❤️‍💋‍👨🏻";
+	inline constexpr const char kiss_woman_man_light_skin_tone[] = "👩🏻‍❤️‍💋‍👨🏻";
+	inline constexpr const char kiss_woman_man_tone1_tone2[] = "👩🏻‍❤️‍💋‍👨🏼";
+	inline constexpr const char kiss_woman_man_light_skin_tone_medium_light_skin_tone[] = "👩🏻‍❤️‍💋‍👨🏼";
+	inline constexpr const char kiss_woman_man_tone1_tone3[] = "👩🏻‍❤️‍💋‍👨🏽";
+	inline constexpr const char kiss_woman_man_light_skin_tone_medium_skin_tone[] = "👩🏻‍❤️‍💋‍👨🏽";
+	inline constexpr const char kiss_woman_man_tone1_tone4[] = "👩🏻‍❤️‍💋‍👨🏾";
+	inline constexpr const char kiss_woman_man_light_skin_tone_medium_dark_skin_tone[] = "👩🏻‍❤️‍💋‍👨🏾";
+	inline constexpr const char kiss_woman_man_tone1_tone5[] = "👩🏻‍❤️‍💋‍👨🏿";
+	inline constexpr const char kiss_woman_man_light_skin_tone_dark_skin_tone[] = "👩🏻‍❤️‍💋‍👨🏿";
+	inline constexpr const char kiss_woman_man_tone2_tone1[] = "👩🏼‍❤️‍💋‍👨🏻";
+	inline constexpr const char kiss_woman_man_medium_light_skin_tone_light_skin_tone[] = "👩🏼‍❤️‍💋‍👨🏻";
+	inline constexpr const char kiss_woman_man_tone2[] = "👩🏼‍❤️‍💋‍👨🏼";
+	inline constexpr const char kiss_woman_man_medium_light_skin_tone[] = "👩🏼‍❤️‍💋‍👨🏼";
+	inline constexpr const char kiss_woman_man_tone2_tone3[] = "👩🏼‍❤️‍💋‍👨🏽";
+	inline constexpr const char kiss_woman_man_medium_light_skin_tone_medium_skin_tone[] = "👩🏼‍❤️‍💋‍👨🏽";
+	inline constexpr const char kiss_woman_man_tone2_tone4[] = "👩🏼‍❤️‍💋‍👨🏾";
+	inline constexpr const char kiss_woman_man_medium_light_skin_tone_medium_dark_skin_tone[] = "👩🏼‍❤️‍💋‍👨🏾";
+	inline constexpr const char kiss_woman_man_tone2_tone5[] = "👩🏼‍❤️‍💋‍👨🏿";
+	inline constexpr const char kiss_woman_man_medium_light_skin_tone_dark_skin_tone[] = "👩🏼‍❤️‍💋‍👨🏿";
+	inline constexpr const char kiss_woman_man_tone3_tone1[] = "👩🏽‍❤️‍💋‍👨🏻";
+	inline constexpr const char kiss_woman_man_medium_skin_tone_light_skin_tone[] = "👩🏽‍❤️‍💋‍👨🏻";
+	inline constexpr const char kiss_woman_man_tone3_tone2[] = "👩🏽‍❤️‍💋‍👨🏼";
+	inline constexpr const char kiss_woman_man_medium_skin_tone_medium_light_skin_tone[] = "👩🏽‍❤️‍💋‍👨🏼";
+	inline constexpr const char kiss_woman_man_tone3[] = "👩🏽‍❤️‍💋‍👨🏽";
+	inline constexpr const char kiss_woman_man_medium_skin_tone[] = "👩🏽‍❤️‍💋‍👨🏽";
+	inline constexpr const char kiss_woman_man_tone3_tone4[] = "👩🏽‍❤️‍💋‍👨🏾";
+	inline constexpr const char kiss_woman_man_medium_skin_tone_medium_dark_skin_tone[] = "👩🏽‍❤️‍💋‍👨🏾";
+	inline constexpr const char kiss_woman_man_tone3_tone5[] = "👩🏽‍❤️‍💋‍👨🏿";
+	inline constexpr const char kiss_woman_man_medium_skin_tone_dark_skin_tone[] = "👩🏽‍❤️‍💋‍👨🏿";
+	inline constexpr const char kiss_woman_man_tone4_tone1[] = "👩🏾‍❤️‍💋‍👨🏻";
+	inline constexpr const char kiss_woman_man_medium_dark_skin_tone_light_skin_tone[] = "👩🏾‍❤️‍💋‍👨🏻";
+	inline constexpr const char kiss_woman_man_tone4_tone2[] = "👩🏾‍❤️‍💋‍👨🏼";
+	inline constexpr const char kiss_woman_man_medium_dark_skin_tone_medium_light_skin_tone[] = "👩🏾‍❤️‍💋‍👨🏼";
+	inline constexpr const char kiss_woman_man_tone4_tone3[] = "👩🏾‍❤️‍💋‍👨🏽";
+	inline constexpr const char kiss_woman_man_medium_dark_skin_tone_medium_skin_tone[] = "👩🏾‍❤️‍💋‍👨🏽";
+	inline constexpr const char kiss_woman_man_tone4[] = "👩🏾‍❤️‍💋‍👨🏾";
+	inline constexpr const char kiss_woman_man_medium_dark_skin_tone[] = "👩🏾‍❤️‍💋‍👨🏾";
+	inline constexpr const char kiss_woman_man_tone4_tone5[] = "👩🏾‍❤️‍💋‍👨🏿";
+	inline constexpr const char kiss_woman_man_medium_dark_skin_tone_dark_skin_tone[] = "👩🏾‍❤️‍💋‍👨🏿";
+	inline constexpr const char kiss_woman_man_tone5_tone1[] = "👩🏿‍❤️‍💋‍👨🏻";
+	inline constexpr const char kiss_woman_man_dark_skin_tone_light_skin_tone[] = "👩🏿‍❤️‍💋‍👨🏻";
+	inline constexpr const char kiss_woman_man_tone5_tone2[] = "👩🏿‍❤️‍💋‍👨🏼";
+	inline constexpr const char kiss_woman_man_dark_skin_tone_medium_light_skin_tone[] = "👩🏿‍❤️‍💋‍👨🏼";
+	inline constexpr const char kiss_woman_man_tone5_tone3[] = "👩🏿‍❤️‍💋‍👨🏽";
+	inline constexpr const char kiss_woman_man_dark_skin_tone_medium_skin_tone[] = "👩🏿‍❤️‍💋‍👨🏽";
+	inline constexpr const char kiss_woman_man_tone5_tone4[] = "👩🏿‍❤️‍💋‍👨🏾";
+	inline constexpr const char kiss_woman_man_dark_skin_tone_medium_dark_skin_tone[] = "👩🏿‍❤️‍💋‍👨🏾";
+	inline constexpr const char kiss_woman_man_tone5[] = "👩🏿‍❤️‍💋‍👨🏿";
+	inline constexpr const char kiss_woman_man_dark_skin_tone[] = "👩🏿‍❤️‍💋‍👨🏿";
+	inline constexpr const char kiss_ww[] = "👩‍❤️‍💋‍👩";
+	inline constexpr const char couplekiss_ww[] = "👩‍❤️‍💋‍👩";
+	inline constexpr const char kiss_woman_woman_tone1[] = "👩🏻‍❤️‍💋‍👩🏻";
+	inline constexpr const char kiss_woman_woman_light_skin_tone[] = "👩🏻‍❤️‍💋‍👩🏻";
+	inline constexpr const char kiss_woman_woman_tone1_tone2[] = "👩🏻‍❤️‍💋‍👩🏼";
+	inline constexpr const char kiss_woman_woman_light_skin_tone_medium_light_skin_tone[] = "👩🏻‍❤️‍💋‍👩🏼";
+	inline constexpr const char kiss_woman_woman_tone1_tone3[] = "👩🏻‍❤️‍💋‍👩🏽";
+	inline constexpr const char kiss_woman_woman_light_skin_tone_medium_skin_tone[] = "👩🏻‍❤️‍💋‍👩🏽";
+	inline constexpr const char kiss_woman_woman_tone1_tone4[] = "👩🏻‍❤️‍💋‍👩🏾";
+	inline constexpr const char kiss_woman_woman_light_skin_tone_medium_dark_skin_tone[] = "👩🏻‍❤️‍💋‍👩🏾";
+	inline constexpr const char kiss_woman_woman_tone1_tone5[] = "👩🏻‍❤️‍💋‍👩🏿";
+	inline constexpr const char kiss_woman_woman_light_skin_tone_dark_skin_tone[] = "👩🏻‍❤️‍💋‍👩🏿";
+	inline constexpr const char kiss_woman_woman_tone2_tone1[] = "👩🏼‍❤️‍💋‍👩🏻";
+	inline constexpr const char kiss_woman_woman_medium_light_skin_tone_light_skin_tone[] = "👩🏼‍❤️‍💋‍👩🏻";
+	inline constexpr const char kiss_woman_woman_tone2[] = "👩🏼‍❤️‍💋‍👩🏼";
+	inline constexpr const char kiss_woman_woman_medium_light_skin_tone[] = "👩🏼‍❤️‍💋‍👩🏼";
+	inline constexpr const char kiss_woman_woman_tone2_tone3[] = "👩🏼‍❤️‍💋‍👩🏽";
+	inline constexpr const char kiss_woman_woman_medium_light_skin_tone_medium_skin_tone[] = "👩🏼‍❤️‍💋‍👩🏽";
+	inline constexpr const char kiss_woman_woman_tone2_tone4[] = "👩🏼‍❤️‍💋‍👩🏾";
+	inline constexpr const char kiss_woman_woman_medium_light_skin_tone_medium_dark_skin_tone[] = "👩🏼‍❤️‍💋‍👩🏾";
+	inline constexpr const char kiss_woman_woman_tone2_tone5[] = "👩🏼‍❤️‍💋‍👩🏿";
+	inline constexpr const char kiss_woman_woman_medium_light_skin_tone_dark_skin_tone[] = "👩🏼‍❤️‍💋‍👩🏿";
+	inline constexpr const char kiss_woman_woman_tone3_tone1[] = "👩🏽‍❤️‍💋‍👩🏻";
+	inline constexpr const char kiss_woman_woman_medium_skin_tone_light_skin_tone[] = "👩🏽‍❤️‍💋‍👩🏻";
+	inline constexpr const char kiss_woman_woman_tone3_tone2[] = "👩🏽‍❤️‍💋‍👩🏼";
+	inline constexpr const char kiss_woman_woman_medium_skin_tone_medium_light_skin_tone[] = "👩🏽‍❤️‍💋‍👩🏼";
+	inline constexpr const char kiss_woman_woman_tone3[] = "👩🏽‍❤️‍💋‍👩🏽";
+	inline constexpr const char kiss_woman_woman_medium_skin_tone[] = "👩🏽‍❤️‍💋‍👩🏽";
+	inline constexpr const char kiss_woman_woman_tone3_tone4[] = "👩🏽‍❤️‍💋‍👩🏾";
+	inline constexpr const char kiss_woman_woman_medium_skin_tone_medium_dark_skin_tone[] = "👩🏽‍❤️‍💋‍👩🏾";
+	inline constexpr const char kiss_woman_woman_tone3_tone5[] = "👩🏽‍❤️‍💋‍👩🏿";
+	inline constexpr const char kiss_woman_woman_medium_skin_tone_dark_skin_tone[] = "👩🏽‍❤️‍💋‍👩🏿";
+	inline constexpr const char kiss_woman_woman_tone4_tone1[] = "👩🏾‍❤️‍💋‍👩🏻";
+	inline constexpr const char kiss_woman_woman_medium_dark_skin_tone_light_skin_tone[] = "👩🏾‍❤️‍💋‍👩🏻";
+	inline constexpr const char kiss_woman_woman_tone4_tone2[] = "👩🏾‍❤️‍💋‍👩🏼";
+	inline constexpr const char kiss_woman_woman_medium_dark_skin_tone_medium_light_skin_tone[] = "👩🏾‍❤️‍💋‍👩🏼";
+	inline constexpr const char kiss_woman_woman_tone4_tone3[] = "👩🏾‍❤️‍💋‍👩🏽";
+	inline constexpr const char kiss_woman_woman_medium_dark_skin_tone_medium_skin_tone[] = "👩🏾‍❤️‍💋‍👩🏽";
+	inline constexpr const char kiss_woman_woman_tone4[] = "👩🏾‍❤️‍💋‍👩🏾";
+	inline constexpr const char kiss_woman_woman_medium_dark_skin_tone[] = "👩🏾‍❤️‍💋‍👩🏾";
+	inline constexpr const char kiss_woman_woman_tone4_tone5[] = "👩🏾‍❤️‍💋‍👩🏿";
+	inline constexpr const char kiss_woman_woman_medium_dark_skin_tone_dark_skin_tone[] = "👩🏾‍❤️‍💋‍👩🏿";
+	inline constexpr const char kiss_woman_woman_tone5_tone1[] = "👩🏿‍❤️‍💋‍👩🏻";
+	inline constexpr const char kiss_woman_woman_dark_skin_tone_light_skin_tone[] = "👩🏿‍❤️‍💋‍👩🏻";
+	inline constexpr const char kiss_woman_woman_tone5_tone2[] = "👩🏿‍❤️‍💋‍👩🏼";
+	inline constexpr const char kiss_woman_woman_dark_skin_tone_medium_light_skin_tone[] = "👩🏿‍❤️‍💋‍👩🏼";
+	inline constexpr const char kiss_woman_woman_tone5_tone3[] = "👩🏿‍❤️‍💋‍👩🏽";
+	inline constexpr const char kiss_woman_woman_dark_skin_tone_medium_skin_tone[] = "👩🏿‍❤️‍💋‍👩🏽";
+	inline constexpr const char kiss_woman_woman_tone5_tone4[] = "👩🏿‍❤️‍💋‍👩🏾";
+	inline constexpr const char kiss_woman_woman_dark_skin_tone_medium_dark_skin_tone[] = "👩🏿‍❤️‍💋‍👩🏾";
+	inline constexpr const char kiss_woman_woman_tone5[] = "👩🏿‍❤️‍💋‍👩🏿";
+	inline constexpr const char kiss_woman_woman_dark_skin_tone[] = "👩🏿‍❤️‍💋‍👩🏿";
+	inline constexpr const char kiss_mm[] = "👨‍❤️‍💋‍👨";
+	inline constexpr const char couplekiss_mm[] = "👨‍❤️‍💋‍👨";
+	inline constexpr const char kiss_man_man[] = "👨‍❤️‍💋‍👨";
+	inline constexpr const char kiss_man_man_tone1[] = "👨🏻‍❤️‍💋‍👨🏻";
+	inline constexpr const char kiss_man_man_light_skin_tone[] = "👨🏻‍❤️‍💋‍👨🏻";
+	inline constexpr const char kiss_man_man_tone1_tone2[] = "👨🏻‍❤️‍💋‍👨🏼";
+	inline constexpr const char kiss_man_man_light_skin_tone_medium_light_skin_tone[] = "👨🏻‍❤️‍💋‍👨🏼";
+	inline constexpr const char kiss_man_man_tone1_tone3[] = "👨🏻‍❤️‍💋‍👨🏽";
+	inline constexpr const char kiss_man_man_light_skin_tone_medium_skin_tone[] = "👨🏻‍❤️‍💋‍👨🏽";
+	inline constexpr const char kiss_man_man_tone1_tone4[] = "👨🏻‍❤️‍💋‍👨🏾";
+	inline constexpr const char kiss_man_man_light_skin_tone_medium_dark_skin_tone[] = "👨🏻‍❤️‍💋‍👨🏾";
+	inline constexpr const char kiss_man_man_tone1_tone5[] = "👨🏻‍❤️‍💋‍👨🏿";
+	inline constexpr const char kiss_man_man_light_skin_tone_dark_skin_tone[] = "👨🏻‍❤️‍💋‍👨🏿";
+	inline constexpr const char kiss_man_man_tone2_tone1[] = "👨🏼‍❤️‍💋‍👨🏻";
+	inline constexpr const char kiss_man_man_medium_light_skin_tone_light_skin_tone[] = "👨🏼‍❤️‍💋‍👨🏻";
+	inline constexpr const char kiss_man_man_tone2[] = "👨🏼‍❤️‍💋‍👨🏼";
+	inline constexpr const char kiss_man_man_medium_light_skin_tone[] = "👨🏼‍❤️‍💋‍👨🏼";
+	inline constexpr const char kiss_man_man_tone2_tone3[] = "👨🏼‍❤️‍💋‍👨🏽";
+	inline constexpr const char kiss_man_man_medium_light_skin_tone_medium_skin_tone[] = "👨🏼‍❤️‍💋‍👨🏽";
+	inline constexpr const char kiss_man_man_tone2_tone4[] = "👨🏼‍❤️‍💋‍👨🏾";
+	inline constexpr const char kiss_man_man_medium_light_skin_tone_medium_dark_skin_tone[] = "👨🏼‍❤️‍💋‍👨🏾";
+	inline constexpr const char kiss_man_man_tone2_tone5[] = "👨🏼‍❤️‍💋‍👨🏿";
+	inline constexpr const char kiss_man_man_medium_light_skin_tone_dark_skin_tone[] = "👨🏼‍❤️‍💋‍👨🏿";
+	inline constexpr const char kiss_man_man_tone3_tone1[] = "👨🏽‍❤️‍💋‍👨🏻";
+	inline constexpr const char kiss_man_man_medium_skin_tone_light_skin_tone[] = "👨🏽‍❤️‍💋‍👨🏻";
+	inline constexpr const char kiss_man_man_tone3_tone2[] = "👨🏽‍❤️‍💋‍👨🏼";
+	inline constexpr const char kiss_man_man_medium_skin_tone_medium_light_skin_tone[] = "👨🏽‍❤️‍💋‍👨🏼";
+	inline constexpr const char kiss_man_man_tone3[] = "👨🏽‍❤️‍💋‍👨🏽";
+	inline constexpr const char kiss_man_man_medium_skin_tone[] = "👨🏽‍❤️‍💋‍👨🏽";
+	inline constexpr const char kiss_man_man_tone3_tone4[] = "👨🏽‍❤️‍💋‍👨🏾";
+	inline constexpr const char kiss_man_man_medium_skin_tone_medium_dark_skin_tone[] = "👨🏽‍❤️‍💋‍👨🏾";
+	inline constexpr const char kiss_man_man_tone3_tone5[] = "👨🏽‍❤️‍💋‍👨🏿";
+	inline constexpr const char kiss_man_man_medium_skin_tone_dark_skin_tone[] = "👨🏽‍❤️‍💋‍👨🏿";
+	inline constexpr const char kiss_man_man_tone4_tone1[] = "👨🏾‍❤️‍💋‍👨🏻";
+	inline constexpr const char kiss_man_man_medium_dark_skin_tone_light_skin_tone[] = "👨🏾‍❤️‍💋‍👨🏻";
+	inline constexpr const char kiss_man_man_tone4_tone2[] = "👨🏾‍❤️‍💋‍👨🏼";
+	inline constexpr const char kiss_man_man_medium_dark_skin_tone_medium_light_skin_tone[] = "👨🏾‍❤️‍💋‍👨🏼";
+	inline constexpr const char kiss_man_man_tone4_tone3[] = "👨🏾‍❤️‍💋‍👨🏽";
+	inline constexpr const char kiss_man_man_medium_dark_skin_tone_medium_skin_tone[] = "👨🏾‍❤️‍💋‍👨🏽";
+	inline constexpr const char kiss_man_man_tone4[] = "👨🏾‍❤️‍💋‍👨🏾";
+	inline constexpr const char kiss_man_man_medium_dark_skin_tone[] = "👨🏾‍❤️‍💋‍👨🏾";
+	inline constexpr const char kiss_man_man_tone4_tone5[] = "👨🏾‍❤️‍💋‍👨🏿";
+	inline constexpr const char kiss_man_man_medium_dark_skin_tone_dark_skin_tone[] = "👨🏾‍❤️‍💋‍👨🏿";
+	inline constexpr const char kiss_man_man_tone5_tone1[] = "👨🏿‍❤️‍💋‍👨🏻";
+	inline constexpr const char kiss_man_man_dark_skin_tone_light_skin_tone[] = "👨🏿‍❤️‍💋‍👨🏻";
+	inline constexpr const char kiss_man_man_tone5_tone2[] = "👨🏿‍❤️‍💋‍👨🏼";
+	inline constexpr const char kiss_man_man_dark_skin_tone_medium_light_skin_tone[] = "👨🏿‍❤️‍💋‍👨🏼";
+	inline constexpr const char kiss_man_man_tone5_tone3[] = "👨🏿‍❤️‍💋‍👨🏽";
+	inline constexpr const char kiss_man_man_dark_skin_tone_medium_skin_tone[] = "👨🏿‍❤️‍💋‍👨🏽";
+	inline constexpr const char kiss_man_man_tone5_tone4[] = "👨🏿‍❤️‍💋‍👨🏾";
+	inline constexpr const char kiss_man_man_dark_skin_tone_medium_dark_skin_tone[] = "👨🏿‍❤️‍💋‍👨🏾";
+	inline constexpr const char kiss_man_man_tone5[] = "👨🏿‍❤️‍💋‍👨🏿";
+	inline constexpr const char kiss_man_man_dark_skin_tone[] = "👨🏿‍❤️‍💋‍👨🏿";
+	inline constexpr const char family[] = "👪";
+	inline constexpr const char family_man_woman_boy[] = "👨‍👩‍👦";
+	inline constexpr const char family_mwg[] = "👨‍👩‍👧";
+	inline constexpr const char family_mwgb[] = "👨‍👩‍👧‍👦";
+	inline constexpr const char family_mwbb[] = "👨‍👩‍👦‍👦";
+	inline constexpr const char family_mwgg[] = "👨‍👩‍👧‍👧";
+	inline constexpr const char family_wwb[] = "👩‍👩‍👦";
+	inline constexpr const char family_wwg[] = "👩‍👩‍👧";
+	inline constexpr const char family_wwgb[] = "👩‍👩‍👧‍👦";
+	inline constexpr const char family_wwbb[] = "👩‍👩‍👦‍👦";
+	inline constexpr const char family_wwgg[] = "👩‍👩‍👧‍👧";
+	inline constexpr const char family_mmb[] = "👨‍👨‍👦";
+	inline constexpr const char family_mmg[] = "👨‍👨‍👧";
+	inline constexpr const char family_mmgb[] = "👨‍👨‍👧‍👦";
+	inline constexpr const char family_mmbb[] = "👨‍👨‍👦‍👦";
+	inline constexpr const char family_mmgg[] = "👨‍👨‍👧‍👧";
+	inline constexpr const char family_woman_boy[] = "👩‍👦";
+	inline constexpr const char family_woman_girl[] = "👩‍👧";
+	inline constexpr const char family_woman_girl_boy[] = "👩‍👧‍👦";
+	inline constexpr const char family_woman_boy_boy[] = "👩‍👦‍👦";
+	inline constexpr const char family_woman_girl_girl[] = "👩‍👧‍👧";
+	inline constexpr const char family_man_boy[] = "👨‍👦";
+	inline constexpr const char family_man_girl[] = "👨‍👧";
+	inline constexpr const char family_man_girl_boy[] = "👨‍👧‍👦";
+	inline constexpr const char family_man_boy_boy[] = "👨‍👦‍👦";
+	inline constexpr const char family_man_girl_girl[] = "👨‍👧‍👧";
+	inline constexpr const char knot[] = "🪢";
+	inline constexpr const char yarn[] = "🧶";
+	inline constexpr const char thread[] = "🧵";
+	inline constexpr const char sewing_needle[] = "🪡";
+	inline constexpr const char coat[] = "🧥";
+	inline constexpr const char lab_coat[] = "🥼";
+	inline constexpr const char safety_vest[] = "🦺";
+	inline constexpr const char womans_clothes[] = "👚";
+	inline constexpr const char shirt[] = "👕";
+	inline constexpr const char t_shirt[] = "👕";
+	inline constexpr const char jeans[] = "👖";
+	inline constexpr const char briefs[] = "🩲";
+	inline constexpr const char shorts[] = "🩳";
+	inline constexpr const char necktie[] = "👔";
+	inline constexpr const char dress[] = "👗";
+	inline constexpr const char bikini[] = "👙";
+	inline constexpr const char one_piece_swimsuit[] = "🩱";
+	inline constexpr const char kimono[] = "👘";
+	inline constexpr const char sari[] = "🥻";
+	inline constexpr const char thong_sandal[] = "🩴";
+	inline constexpr const char womans_flat_shoe[] = "🥿";
+	inline constexpr const char flat_shoe[] = "🥿";
+	inline constexpr const char high_heel[] = "👠";
+	inline constexpr const char sandal[] = "👡";
+	inline constexpr const char womans_sandal[] = "👡";
+	inline constexpr const char boot[] = "👢";
+	inline constexpr const char womans_boot[] = "👢";
+	inline constexpr const char mans_shoe[] = "👞";
+	inline constexpr const char athletic_shoe[] = "👟";
+	inline constexpr const char running_shoe[] = "👟";
+	inline constexpr const char hiking_boot[] = "🥾";
+	inline constexpr const char socks[] = "🧦";
+	inline constexpr const char gloves[] = "🧤";
+	inline constexpr const char scarf[] = "🧣";
+	inline constexpr const char tophat[] = "🎩";
+	inline constexpr const char top_hat[] = "🎩";
+	inline constexpr const char billed_cap[] = "🧢";
+	inline constexpr const char womans_hat[] = "👒";
+	inline constexpr const char mortar_board[] = "🎓";
+	inline constexpr const char helmet_with_cross[] = "⛑️";
+	inline constexpr const char helmet_with_white_cross[] = "⛑️";
+	inline constexpr const char military_helmet[] = "🪖";
+	inline constexpr const char crown[] = "👑";
+	inline constexpr const char ring[] = "💍";
+	inline constexpr const char pouch[] = "👝";
+	inline constexpr const char clutch_bag[] = "👝";
+	inline constexpr const char purse[] = "👛";
+	inline constexpr const char handbag[] = "👜";
+	inline constexpr const char briefcase[] = "💼";
+	inline constexpr const char school_satchel[] = "🎒";
+	inline constexpr const char backpack[] = "🎒";
+	inline constexpr const char luggage[] = "🧳";
+	inline constexpr const char eyeglasses[] = "👓";
+	inline constexpr const char glasses[] = "👓";
+	inline constexpr const char dark_sunglasses[] = "🕶️";
+	inline constexpr const char goggles[] = "🥽";
+	inline constexpr const char closed_umbrella[] = "🌂";
+	inline constexpr const char pink_heart[] = "🩷";
+	inline constexpr const char heart[] = "❤️";
+	inline constexpr const char red_heart[] = "❤️";
+	inline constexpr const char orange_heart[] = "🧡";
+	inline constexpr const char yellow_heart[] = "💛";
+	inline constexpr const char green_heart[] = "💚";
+	inline constexpr const char light_blue_heart[] = "🩵";
+	inline constexpr const char blue_heart[] = "💙";
+	inline constexpr const char purple_heart[] = "💜";
+	inline constexpr const char black_heart[] = "🖤";
+	inline constexpr const char grey_heart[] = "🩶";
+	inline constexpr const char white_heart[] = "🤍";
+	inline constexpr const char brown_heart[] = "🤎";
+	inline constexpr const char broken_heart[] = "💔";
+	inline constexpr const char heart_exclamation[] = "❣️";
+	inline constexpr const char heavy_heart_exclamation_mark_ornament[] = "❣️";
+	inline constexpr const char two_hearts[] = "💕";
+	inline constexpr const char revolving_hearts[] = "💞";
+	inline constexpr const char heartbeat[] = "💓";
+	inline constexpr const char beating_heart[] = "💓";
+	inline constexpr const char heartpulse[] = "💗";
+	inline constexpr const char growing_heart[] = "💗";
+	inline constexpr const char sparkling_heart[] = "💖";
+	inline constexpr const char cupid[] = "💘";
+	inline constexpr const char gift_heart[] = "💝";
+	inline constexpr const char mending_heart[] = "❤️‍🩹";
+	inline constexpr const char heart_on_fire[] = "❤️‍🔥";
+	inline constexpr const char heart_decoration[] = "💟";
+	inline constexpr const char peace[] = "☮️";
+	inline constexpr const char peace_symbol[] = "☮️";
+	inline constexpr const char cross[] = "✝️";
+	inline constexpr const char latin_cross[] = "✝️";
+	inline constexpr const char star_and_crescent[] = "☪️";
+	inline constexpr const char om_symbol[] = "🕉️";
+	inline constexpr const char wheel_of_dharma[] = "☸️";
+	inline constexpr const char khanda[] = "🪯";
+	inline constexpr const char star_of_david[] = "✡️";
+	inline constexpr const char six_pointed_star[] = "🔯";
+	inline constexpr const char menorah[] = "🕎";
+	inline constexpr const char yin_yang[] = "☯️";
+	inline constexpr const char orthodox_cross[] = "☦️";
+	inline constexpr const char place_of_worship[] = "🛐";
+	inline constexpr const char worship_symbol[] = "🛐";
+	inline constexpr const char ophiuchus[] = "⛎";
+	inline constexpr const char aries[] = "♈";
+	inline constexpr const char taurus[] = "♉";
+	inline constexpr const char gemini[] = "♊";
+	inline constexpr const char cancer[] = "♋";
+	inline constexpr const char leo[] = "♌";
+	inline constexpr const char virgo[] = "♍";
+	inline constexpr const char libra[] = "♎";
+	inline constexpr const char scorpius[] = "♏";
+	inline constexpr const char scorpio[] = "♏";
+	inline constexpr const char sagittarius[] = "♐";
+	inline constexpr const char capricorn[] = "♑";
+	inline constexpr const char aquarius[] = "♒";
+	inline constexpr const char pisces[] = "♓";
+	inline constexpr const char id[] = "🆔";
+	inline constexpr const char atom[] = "⚛️";
+	inline constexpr const char atom_symbol[] = "⚛️";
+	inline constexpr const char accept[] = "🉑";
+	inline constexpr const char radioactive[] = "☢️";
+	inline constexpr const char radioactive_sign[] = "☢️";
+	inline constexpr const char biohazard[] = "☣️";
+	inline constexpr const char biohazard_sign[] = "☣️";
+	inline constexpr const char mobile_phone_off[] = "📴";
+	inline constexpr const char vibration_mode[] = "📳";
+	inline constexpr const char u6709[] = "🈶";
+	inline constexpr const char u7121[] = "🈚";
+	inline constexpr const char u7533[] = "🈸";
+	inline constexpr const char u55b6[] = "🈺";
+	inline constexpr const char u6708[] = "🈷️";
+	inline constexpr const char eight_pointed_black_star[] = "✴️";
+	inline constexpr const char vs[] = "🆚";
+	inline constexpr const char white_flower[] = "💮";
+	inline constexpr const char ideograph_advantage[] = "🉐";
+	inline constexpr const char secret[] = "㊙️";
+	inline constexpr const char congratulations[] = "㊗️";
+	inline constexpr const char u5408[] = "🈴";
+	inline constexpr const char u6e80[] = "🈵";
+	inline constexpr const char u5272[] = "🈹";
+	inline constexpr const char u7981[] = "🈲";
+	inline constexpr const char a[] = "🅰️";
+	inline constexpr const char b[] = "🅱️";
+	inline constexpr const char ab[] = "🆎";
+	inline constexpr const char cl[] = "🆑";
+	inline constexpr const char o2[] = "🅾️";
+	inline constexpr const char sos[] = "🆘";
+	inline constexpr const char x[] = "❌";
+	inline constexpr const char cross_mark[] = "❌";
+	inline constexpr const char o[] = "⭕";
+	inline constexpr const char octagonal_sign[] = "🛑";
+	inline constexpr const char stop_sign[] = "🛑";
+	inline constexpr const char no_entry[] = "⛔";
+	inline constexpr const char name_badge[] = "📛";
+	inline constexpr const char no_entry_sign[] = "🚫";
+	inline constexpr const char prohibited[] = "🚫";
+	inline constexpr const char anger[] = "💢";
+	inline constexpr const char hotsprings[] = "♨️";
+	inline constexpr const char hot_springs[] = "♨️";
+	inline constexpr const char no_pedestrians[] = "🚷";
+	inline constexpr const char do_not_litter[] = "🚯";
+	inline constexpr const char no_littering[] = "🚯";
+	inline constexpr const char no_bicycles[] = "🚳";
+	inline constexpr const char non_potable_water[] = "🚱";
+	inline constexpr const char underage[] = "🔞";
+	inline constexpr const char no_mobile_phones[] = "📵";
+	inline constexpr const char no_smoking[] = "🚭";
+	inline constexpr const char exclamation[] = "❗";
+	inline constexpr const char grey_exclamation[] = "❕";
+	inline constexpr const char question[] = "❓";
+	inline constexpr const char question_mark[] = "❓";
+	inline constexpr const char grey_question[] = "❔";
+	inline constexpr const char bangbang[] = "‼️";
+	inline constexpr const char interrobang[] = "⁉️";
+	inline constexpr const char low_brightness[] = "🔅";
+	inline constexpr const char high_brightness[] = "🔆";
+	inline constexpr const char part_alternation_mark[] = "〽️";
+	inline constexpr const char warning[] = "⚠️";
+	inline constexpr const char children_crossing[] = "🚸";
+	inline constexpr const char trident[] = "🔱";
+	inline constexpr const char fleur_de_lis[] = "⚜️";
+	inline constexpr const char beginner[] = "🔰";
+	inline constexpr const char recycle[] = "♻️";
+	inline constexpr const char white_check_mark[] = "✅";
+	inline constexpr const char u6307[] = "🈯";
+	inline constexpr const char chart[] = "💹";
+	inline constexpr const char sparkle[] = "❇️";
+	inline constexpr const char eight_spoked_asterisk[] = "✳️";
+	inline constexpr const char negative_squared_cross_mark[] = "❎";
+	inline constexpr const char globe_with_meridians[] = "🌐";
+	inline constexpr const char diamond_shape_with_a_dot_inside[] = "💠";
+	inline constexpr const char m[] = "Ⓜ️";
+	inline constexpr const char circled_m[] = "Ⓜ️";
+	inline constexpr const char cyclone[] = "🌀";
+	inline constexpr const char zzz[] = "💤";
+	inline constexpr const char atm[] = "🏧";
+	inline constexpr const char wc[] = "🚾";
+	inline constexpr const char water_closet[] = "🚾";
+	inline constexpr const char wheelchair[] = "♿";
+	inline constexpr const char parking[] = "🅿️";
+	inline constexpr const char elevator[] = "🛗";
+	inline constexpr const char u7a7a[] = "🈳";
+	inline constexpr const char sa[] = "🈂️";
+	inline constexpr const char passport_control[] = "🛂";
+	inline constexpr const char customs[] = "🛃";
+	inline constexpr const char baggage_claim[] = "🛄";
+	inline constexpr const char left_luggage[] = "🛅";
+	inline constexpr const char wireless[] = "🛜";
+	inline constexpr const char mens[] = "🚹";
+	inline constexpr const char mens_room[] = "🚹";
+	inline constexpr const char womens[] = "🚺";
+	inline constexpr const char womens_room[] = "🚺";
+	inline constexpr const char baby_symbol[] = "🚼";
+	inline constexpr const char restroom[] = "🚻";
+	inline constexpr const char put_litter_in_its_place[] = "🚮";
+	inline constexpr const char cinema[] = "🎦";
+	inline constexpr const char signal_strength[] = "📶";
+	inline constexpr const char antenna_bars[] = "📶";
+	inline constexpr const char koko[] = "🈁";
+	inline constexpr const char symbols[] = "🔣";
+	inline constexpr const char input_symbols[] = "🔣";
+	inline constexpr const char information_source[] = "ℹ️";
+	inline constexpr const char information[] = "ℹ️";
+	inline constexpr const char abc[] = "🔤";
+	inline constexpr const char abcd[] = "🔡";
+	inline constexpr const char capital_abcd[] = "🔠";
+	inline constexpr const char ng[] = "🆖";
+	inline constexpr const char ok[] = "🆗";
+	inline constexpr const char up[] = "🆙";
+	inline constexpr const char cool[] = "🆒";
+	inline constexpr const char _new[] = "🆕";
+	inline constexpr const char free[] = "🆓";
+	inline constexpr const char zero[] = "0️⃣";
+	inline constexpr const char one[] = "1️⃣";
+	inline constexpr const char two[] = "2️⃣";
+	inline constexpr const char three[] = "3️⃣";
+	inline constexpr const char four[] = "4️⃣";
+	inline constexpr const char five[] = "5️⃣";
+	inline constexpr const char six[] = "6️⃣";
+	inline constexpr const char seven[] = "7️⃣";
+	inline constexpr const char eight[] = "8️⃣";
+	inline constexpr const char nine[] = "9️⃣";
+	inline constexpr const char keycap_ten[] = "🔟";
+	inline constexpr const char input_numbers[] = "🔢";
+	inline constexpr const char hash[] = "#️⃣";
+	inline constexpr const char asterisk[] = "*️⃣";
+	inline constexpr const char keycap_asterisk[] = "*️⃣";
+	inline constexpr const char eject[] = "⏏️";
+	inline constexpr const char eject_symbol[] = "⏏️";
+	inline constexpr const char arrow_forward[] = "▶️";
+	inline constexpr const char pause_button[] = "⏸️";
+	inline constexpr const char double_vertical_bar[] = "⏸️";
+	inline constexpr const char play_pause[] = "⏯️";
+	inline constexpr const char stop_button[] = "⏹️";
+	inline constexpr const char record_button[] = "⏺️";
+	inline constexpr const char track_next[] = "⏭️";
+	inline constexpr const char next_track[] = "⏭️";
+	inline constexpr const char track_previous[] = "⏮️";
+	inline constexpr const char previous_track[] = "⏮️";
+	inline constexpr const char fast_forward[] = "⏩";
+	inline constexpr const char rewind[] = "⏪";
+	inline constexpr const char arrow_double_up[] = "⏫";
+	inline constexpr const char arrow_double_down[] = "⏬";
+	inline constexpr const char arrow_backward[] = "◀️";
+	inline constexpr const char arrow_up_small[] = "🔼";
+	inline constexpr const char arrow_down_small[] = "🔽";
+	inline constexpr const char arrow_right[] = "➡️";
+	inline constexpr const char right_arrow[] = "➡️";
+	inline constexpr const char arrow_left[] = "⬅️";
+	inline constexpr const char left_arrow[] = "⬅️";
+	inline constexpr const char arrow_up[] = "⬆️";
+	inline constexpr const char up_arrow[] = "⬆️";
+	inline constexpr const char arrow_down[] = "⬇️";
+	inline constexpr const char down_arrow[] = "⬇️";
+	inline constexpr const char arrow_upper_right[] = "↗️";
+	inline constexpr const char arrow_lower_right[] = "↘️";
+	inline constexpr const char arrow_lower_left[] = "↙️";
+	inline constexpr const char arrow_upper_left[] = "↖️";
+	inline constexpr const char up_left_arrow[] = "↖️";
+	inline constexpr const char arrow_up_down[] = "↕️";
+	inline constexpr const char up_down_arrow[] = "↕️";
+	inline constexpr const char left_right_arrow[] = "↔️";
+	inline constexpr const char arrow_right_hook[] = "↪️";
+	inline constexpr const char leftwards_arrow_with_hook[] = "↩️";
+	inline constexpr const char arrow_heading_up[] = "⤴️";
+	inline constexpr const char arrow_heading_down[] = "⤵️";
+	inline constexpr const char twisted_rightwards_arrows[] = "🔀";
+	inline constexpr const char repeat[] = "🔁";
+	inline constexpr const char repeat_one[] = "🔂";
+	inline constexpr const char arrows_counterclockwise[] = "🔄";
+	inline constexpr const char arrows_clockwise[] = "🔃";
+	inline constexpr const char musical_note[] = "🎵";
+	inline constexpr const char notes[] = "🎶";
+	inline constexpr const char musical_notes[] = "🎶";
+	inline constexpr const char heavy_plus_sign[] = "➕";
+	inline constexpr const char heavy_minus_sign[] = "➖";
+	inline constexpr const char heavy_division_sign[] = "➗";
+	inline constexpr const char heavy_multiplication_x[] = "✖️";
+	inline constexpr const char heavy_equals_sign[] = "🟰";
+	inline constexpr const char infinity[] = "♾️";
+	inline constexpr const char heavy_dollar_sign[] = "💲";
+	inline constexpr const char currency_exchange[] = "💱";
+	inline constexpr const char tm[] = "™️";
+	inline constexpr const char trade_mark[] = "™️";
+	inline constexpr const char copyright[] = "©️";
+	inline constexpr const char registered[] = "®️";
+	inline constexpr const char wavy_dash[] = "〰️";
+	inline constexpr const char curly_loop[] = "➰";
+	inline constexpr const char loop[] = "➿";
+	inline constexpr const char end[] = "🔚";
+	inline constexpr const char end_arrow[] = "🔚";
+	inline constexpr const char back[] = "🔙";
+	inline constexpr const char back_arrow[] = "🔙";
+	inline constexpr const char on[] = "🔛";
+	inline constexpr const char on_arrow[] = "🔛";
+	inline constexpr const char top[] = "🔝";
+	inline constexpr const char top_arrow[] = "🔝";
+	inline constexpr const char soon[] = "🔜";
+	inline constexpr const char soon_arrow[] = "🔜";
+	inline constexpr const char heavy_check_mark[] = "✔️";
+	inline constexpr const char check_mark[] = "✔️";
+	inline constexpr const char ballot_box_with_check[] = "☑️";
+	inline constexpr const char radio_button[] = "🔘";
+	inline constexpr const char white_circle[] = "⚪";
+	inline constexpr const char black_circle[] = "⚫";
+	inline constexpr const char red_circle[] = "🔴";
+	inline constexpr const char blue_circle[] = "🔵";
+	inline constexpr const char brown_circle[] = "🟤";
+	inline constexpr const char purple_circle[] = "🟣";
+	inline constexpr const char green_circle[] = "🟢";
+	inline constexpr const char yellow_circle[] = "🟡";
+	inline constexpr const char orange_circle[] = "🟠";
+	inline constexpr const char small_red_triangle[] = "🔺";
+	inline constexpr const char small_red_triangle_down[] = "🔻";
+	inline constexpr const char small_orange_diamond[] = "🔸";
+	inline constexpr const char small_blue_diamond[] = "🔹";
+	inline constexpr const char large_orange_diamond[] = "🔶";
+	inline constexpr const char large_blue_diamond[] = "🔷";
+	inline constexpr const char white_square_button[] = "🔳";
+	inline constexpr const char black_square_button[] = "🔲";
+	inline constexpr const char black_small_square[] = "▪️";
+	inline constexpr const char white_small_square[] = "▫️";
+	inline constexpr const char black_medium_small_square[] = "◾";
+	inline constexpr const char white_medium_small_square[] = "◽";
+	inline constexpr const char black_medium_square[] = "◼️";
+	inline constexpr const char white_medium_square[] = "◻️";
+	inline constexpr const char black_large_square[] = "⬛";
+	inline constexpr const char white_large_square[] = "⬜";
+	inline constexpr const char orange_square[] = "🟧";
+	inline constexpr const char blue_square[] = "🟦";
+	inline constexpr const char red_square[] = "🟥";
+	inline constexpr const char brown_square[] = "🟫";
+	inline constexpr const char purple_square[] = "🟪";
+	inline constexpr const char green_square[] = "🟩";
+	inline constexpr const char yellow_square[] = "🟨";
+	inline constexpr const char speaker[] = "🔈";
+	inline constexpr const char mute[] = "🔇";
+	inline constexpr const char muted_speaker[] = "🔇";
+	inline constexpr const char sound[] = "🔉";
+	inline constexpr const char loud_sound[] = "🔊";
+	inline constexpr const char bell[] = "🔔";
+	inline constexpr const char no_bell[] = "🔕";
+	inline constexpr const char mega[] = "📣";
+	inline constexpr const char megaphone[] = "📣";
+	inline constexpr const char loudspeaker[] = "📢";
+	inline constexpr const char speech_left[] = "🗨️";
+	inline constexpr const char left_speech_bubble[] = "🗨️";
+	inline constexpr const char eye_in_speech_bubble[] = "👁‍🗨";
+	inline constexpr const char speech_balloon[] = "💬";
+	inline constexpr const char thought_balloon[] = "💭";
+	inline constexpr const char anger_right[] = "🗯️";
+	inline constexpr const char right_anger_bubble[] = "🗯️";
+	inline constexpr const char spades[] = "♠️";
+	inline constexpr const char spade_suit[] = "♠️";
+	inline constexpr const char clubs[] = "♣️";
+	inline constexpr const char club_suit[] = "♣️";
+	inline constexpr const char hearts[] = "♥️";
+	inline constexpr const char heart_suit[] = "♥️";
+	inline constexpr const char diamonds[] = "♦️";
+	inline constexpr const char diamond_suit[] = "♦️";
+	inline constexpr const char black_joker[] = "🃏";
+	inline constexpr const char joker[] = "🃏";
+	inline constexpr const char flower_playing_cards[] = "🎴";
+	inline constexpr const char mahjong[] = "🀄";
+	inline constexpr const char clock1[] = "🕐";
+	inline constexpr const char one_oclock[] = "🕐";
+	inline constexpr const char clock2[] = "🕑";
+	inline constexpr const char two_oclock[] = "🕑";
+	inline constexpr const char clock3[] = "🕒";
+	inline constexpr const char three_oclock[] = "🕒";
+	inline constexpr const char clock4[] = "🕓";
+	inline constexpr const char four_oclock[] = "🕓";
+	inline constexpr const char clock5[] = "🕔";
+	inline constexpr const char five_oclock[] = "🕔";
+	inline constexpr const char clock6[] = "🕕";
+	inline constexpr const char six_oclock[] = "🕕";
+	inline constexpr const char clock7[] = "🕖";
+	inline constexpr const char seven_oclock[] = "🕖";
+	inline constexpr const char clock8[] = "🕗";
+	inline constexpr const char eight_oclock[] = "🕗";
+	inline constexpr const char clock9[] = "🕘";
+	inline constexpr const char nine_oclock[] = "🕘";
+	inline constexpr const char clock10[] = "🕙";
+	inline constexpr const char ten_oclock[] = "🕙";
+	inline constexpr const char clock11[] = "🕚";
+	inline constexpr const char eleven_oclock[] = "🕚";
+	inline constexpr const char clock12[] = "🕛";
+	inline constexpr const char twelve_oclock[] = "🕛";
+	inline constexpr const char clock130[] = "🕜";
+	inline constexpr const char one_thirty[] = "🕜";
+	inline constexpr const char clock230[] = "🕝";
+	inline constexpr const char two_thirty[] = "🕝";
+	inline constexpr const char clock330[] = "🕞";
+	inline constexpr const char three_thirty[] = "🕞";
+	inline constexpr const char clock430[] = "🕟";
+	inline constexpr const char four_thirty[] = "🕟";
+	inline constexpr const char clock530[] = "🕠";
+	inline constexpr const char five_thirty[] = "🕠";
+	inline constexpr const char clock630[] = "🕡";
+	inline constexpr const char six_thirty[] = "🕡";
+	inline constexpr const char clock730[] = "🕢";
+	inline constexpr const char seven_thirty[] = "🕢";
+	inline constexpr const char clock830[] = "🕣";
+	inline constexpr const char eight_thirty[] = "🕣";
+	inline constexpr const char clock930[] = "🕤";
+	inline constexpr const char nine_thirty[] = "🕤";
+	inline constexpr const char clock1030[] = "🕥";
+	inline constexpr const char ten_thirty[] = "🕥";
+	inline constexpr const char clock1130[] = "🕦";
+	inline constexpr const char eleven_thirty[] = "🕦";
+	inline constexpr const char clock1230[] = "🕧";
+	inline constexpr const char twelve_thirty[] = "🕧";
+	inline constexpr const char female_sign[] = "♀️";
+	inline constexpr const char male_sign[] = "♂️";
+	inline constexpr const char transgender_symbol[] = "⚧";
+	inline constexpr const char medical_symbol[] = "⚕️";
+	inline constexpr const char regional_indicator_z[] = "🇿";
+	inline constexpr const char regional_indicator_y[] = "🇾";
+	inline constexpr const char regional_indicator_x[] = "🇽";
+	inline constexpr const char regional_indicator_w[] = "🇼";
+	inline constexpr const char regional_indicator_v[] = "🇻";
+	inline constexpr const char regional_indicator_u[] = "🇺";
+	inline constexpr const char regional_indicator_t[] = "🇹";
+	inline constexpr const char regional_indicator_s[] = "🇸";
+	inline constexpr const char regional_indicator_r[] = "🇷";
+	inline constexpr const char regional_indicator_q[] = "🇶";
+	inline constexpr const char regional_indicator_p[] = "🇵";
+	inline constexpr const char regional_indicator_o[] = "🇴";
+	inline constexpr const char regional_indicator_n[] = "🇳";
+	inline constexpr const char regional_indicator_m[] = "🇲";
+	inline constexpr const char regional_indicator_l[] = "🇱";
+	inline constexpr const char regional_indicator_k[] = "🇰";
+	inline constexpr const char regional_indicator_j[] = "🇯";
+	inline constexpr const char regional_indicator_i[] = "🇮";
+	inline constexpr const char regional_indicator_h[] = "🇭";
+	inline constexpr const char regional_indicator_g[] = "🇬";
+	inline constexpr const char regional_indicator_f[] = "🇫";
+	inline constexpr const char regional_indicator_e[] = "🇪";
+	inline constexpr const char regional_indicator_d[] = "🇩";
+	inline constexpr const char regional_indicator_c[] = "🇨";
+	inline constexpr const char regional_indicator_b[] = "🇧";
+	inline constexpr const char regional_indicator_a[] = "🇦";
+	inline constexpr const char red_car[] = "🚗";
+	inline constexpr const char automobile[] = "🚗";
+	inline constexpr const char taxi[] = "🚕";
+	inline constexpr const char blue_car[] = "🚙";
+	inline constexpr const char pickup_truck[] = "🛻";
+	inline constexpr const char minibus[] = "🚐";
+	inline constexpr const char bus[] = "🚌";
+	inline constexpr const char trolleybus[] = "🚎";
+	inline constexpr const char race_car[] = "🏎️";
+	inline constexpr const char racing_car[] = "🏎️";
+	inline constexpr const char police_car[] = "🚓";
+	inline constexpr const char ambulance[] = "🚑";
+	inline constexpr const char fire_engine[] = "🚒";
+	inline constexpr const char truck[] = "🚚";
+	inline constexpr const char articulated_lorry[] = "🚛";
+	inline constexpr const char tractor[] = "🚜";
+	inline constexpr const char probing_cane[] = "🦯";
+	inline constexpr const char manual_wheelchair[] = "🦽";
+	inline constexpr const char motorized_wheelchair[] = "🦼";
+	inline constexpr const char crutch[] = "🩼";
+	inline constexpr const char scooter[] = "🛴";
+	inline constexpr const char kick_scooter[] = "🛴";
+	inline constexpr const char bike[] = "🚲";
+	inline constexpr const char bicycle[] = "🚲";
+	inline constexpr const char motor_scooter[] = "🛵";
+	inline constexpr const char motorbike[] = "🛵";
+	inline constexpr const char motorcycle[] = "🏍️";
+	inline constexpr const char racing_motorcycle[] = "🏍️";
+	inline constexpr const char auto_rickshaw[] = "🛺";
+	inline constexpr const char wheel[] = "🛞";
+	inline constexpr const char rotating_light[] = "🚨";
+	inline constexpr const char oncoming_police_car[] = "🚔";
+	inline constexpr const char oncoming_bus[] = "🚍";
+	inline constexpr const char oncoming_automobile[] = "🚘";
+	inline constexpr const char oncoming_taxi[] = "🚖";
+	inline constexpr const char aerial_tramway[] = "🚡";
+	inline constexpr const char mountain_cableway[] = "🚠";
+	inline constexpr const char suspension_railway[] = "🚟";
+	inline constexpr const char railway_car[] = "🚃";
+	inline constexpr const char train[] = "🚋";
+	inline constexpr const char tram_car[] = "🚋";
+	inline constexpr const char mountain_railway[] = "🚞";
+	inline constexpr const char monorail[] = "🚝";
+	inline constexpr const char bullettrain_side[] = "🚄";
+	inline constexpr const char bullettrain_front[] = "🚅";
+	inline constexpr const char bullet_train[] = "🚅";
+	inline constexpr const char light_rail[] = "🚈";
+	inline constexpr const char steam_locomotive[] = "🚂";
+	inline constexpr const char locomotive[] = "🚂";
+	inline constexpr const char train2[] = "🚆";
+	inline constexpr const char metro[] = "🚇";
+	inline constexpr const char tram[] = "🚊";
+	inline constexpr const char station[] = "🚉";
+	inline constexpr const char airplane[] = "✈️";
+	inline constexpr const char airplane_departure[] = "🛫";
+	inline constexpr const char airplane_arriving[] = "🛬";
+	inline constexpr const char airplane_small[] = "🛩️";
+	inline constexpr const char small_airplane[] = "🛩️";
+	inline constexpr const char seat[] = "💺";
+	inline constexpr const char satellite_orbital[] = "🛰️";
+	inline constexpr const char rocket[] = "🚀";
+	inline constexpr const char flying_saucer[] = "🛸";
+	inline constexpr const char helicopter[] = "🚁";
+	inline constexpr const char canoe[] = "🛶";
+	inline constexpr const char kayak[] = "🛶";
+	inline constexpr const char sailboat[] = "⛵";
+	inline constexpr const char speedboat[] = "🚤";
+	inline constexpr const char motorboat[] = "🛥️";
+	inline constexpr const char motor_boat[] = "🛥️";
+	inline constexpr const char cruise_ship[] = "🛳️";
+	inline constexpr const char passenger_ship[] = "🛳️";
+	inline constexpr const char ferry[] = "⛴️";
+	inline constexpr const char ship[] = "🚢";
+	inline constexpr const char ring_buoy[] = "🛟";
+	inline constexpr const char anchor[] = "⚓";
+	inline constexpr const char hook[] = "🪝";
+	inline constexpr const char fuelpump[] = "⛽";
+	inline constexpr const char fuel_pump[] = "⛽";
+	inline constexpr const char construction[] = "🚧";
+	inline constexpr const char vertical_traffic_light[] = "🚦";
+	inline constexpr const char traffic_light[] = "🚥";
+	inline constexpr const char busstop[] = "🚏";
+	inline constexpr const char bus_stop[] = "🚏";
+	inline constexpr const char map[] = "🗺️";
+	inline constexpr const char world_map[] = "🗺️";
+	inline constexpr const char moyai[] = "🗿";
+	inline constexpr const char moai[] = "🗿";
+	inline constexpr const char statue_of_liberty[] = "🗽";
+	inline constexpr const char tokyo_tower[] = "🗼";
+	inline constexpr const char european_castle[] = "🏰";
+	inline constexpr const char castle[] = "🏰";
+	inline constexpr const char japanese_castle[] = "🏯";
+	inline constexpr const char stadium[] = "🏟️";
+	inline constexpr const char ferris_wheel[] = "🎡";
+	inline constexpr const char roller_coaster[] = "🎢";
+	inline constexpr const char carousel_horse[] = "🎠";
+	inline constexpr const char fountain[] = "⛲";
+	inline constexpr const char beach_umbrella[] = "⛱️";
+	inline constexpr const char umbrella_on_ground[] = "⛱️";
+	inline constexpr const char beach[] = "🏖️";
+	inline constexpr const char beach_with_umbrella[] = "🏖️";
+	inline constexpr const char island[] = "🏝️";
+	inline constexpr const char desert_island[] = "🏝️";
+	inline constexpr const char desert[] = "🏜️";
+	inline constexpr const char volcano[] = "🌋";
+	inline constexpr const char mountain[] = "⛰️";
+	inline constexpr const char mountain_snow[] = "🏔️";
+	inline constexpr const char snow_capped_mountain[] = "🏔️";
+	inline constexpr const char mount_fuji[] = "🗻";
+	inline constexpr const char camping[] = "🏕️";
+	inline constexpr const char tent[] = "⛺";
+	inline constexpr const char house[] = "🏠";
+	inline constexpr const char house_with_garden[] = "🏡";
+	inline constexpr const char homes[] = "🏘️";
+	inline constexpr const char house_buildings[] = "🏘️";
+	inline constexpr const char houses[] = "🏘️";
+	inline constexpr const char house_abandoned[] = "🏚️";
+	inline constexpr const char derelict_house_building[] = "🏚️";
+	inline constexpr const char hut[] = "🛖";
+	inline constexpr const char construction_site[] = "🏗️";
+	inline constexpr const char building_construction[] = "🏗️";
+	inline constexpr const char factory[] = "🏭";
+	inline constexpr const char office[] = "🏢";
+	inline constexpr const char department_store[] = "🏬";
+	inline constexpr const char post_office[] = "🏣";
+	inline constexpr const char european_post_office[] = "🏤";
+	inline constexpr const char hospital[] = "🏥";
+	inline constexpr const char bank[] = "🏦";
+	inline constexpr const char hotel[] = "🏨";
+	inline constexpr const char convenience_store[] = "🏪";
+	inline constexpr const char school[] = "🏫";
+	inline constexpr const char love_hotel[] = "🏩";
+	inline constexpr const char wedding[] = "💒";
+	inline constexpr const char classical_building[] = "🏛️";
+	inline constexpr const char church[] = "⛪";
+	inline constexpr const char mosque[] = "🕌";
+	inline constexpr const char synagogue[] = "🕍";
+	inline constexpr const char hindu_temple[] = "🛕";
+	inline constexpr const char kaaba[] = "🕋";
+	inline constexpr const char shinto_shrine[] = "⛩️";
+	inline constexpr const char railway_track[] = "🛤️";
+	inline constexpr const char railroad_track[] = "🛤️";
+	inline constexpr const char motorway[] = "🛣️";
+	inline constexpr const char japan[] = "🗾";
+	inline constexpr const char map_of_japan[] = "🗾";
+	inline constexpr const char rice_scene[] = "🎑";
+	inline constexpr const char park[] = "🏞️";
+	inline constexpr const char national_park[] = "🏞️";
+	inline constexpr const char sunrise[] = "🌅";
+	inline constexpr const char sunrise_over_mountains[] = "🌄";
+	inline constexpr const char stars[] = "🌠";
+	inline constexpr const char shooting_star[] = "🌠";
+	inline constexpr const char sparkler[] = "🎇";
+	inline constexpr const char fireworks[] = "🎆";
+	inline constexpr const char city_sunset[] = "🌇";
+	inline constexpr const char city_sunrise[] = "🌇";
+	inline constexpr const char sunset[] = "🌇";
+	inline constexpr const char city_dusk[] = "🌆";
+	inline constexpr const char cityscape[] = "🏙️";
+	inline constexpr const char night_with_stars[] = "🌃";
+	inline constexpr const char milky_way[] = "🌌";
+	inline constexpr const char bridge_at_night[] = "🌉";
+	inline constexpr const char foggy[] = "🌁";
+}
+};
diff --git a/3rdParty/dpp/user.h b/3rdParty/dpp/user.h
index 4ff03664cd..e67294038f 100644
--- a/3rdParty/dpp/user.h
+++ b/3rdParty/dpp/user.h
@@ -1,371 +1,589 @@
-/************************************************************************************
- *
- * D++, A Lightweight C++ library for Discord
- *
- * Copyright 2021 Craig Edwards and D++ contributors
- * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- ************************************************************************************/
-#pragma once
-#include <dpp/export.h>
-#include <dpp/nlohmann/json_fwd.hpp>
-#include <dpp/snowflake.h>
-#include <dpp/managed.h>
-#include <dpp/utility.h>
-#include <dpp/json_interface.h>
-
-namespace dpp {
-
-/**
- * @brief Various bitmask flags used to represent information about a dpp::user
- */
-enum user_flags : uint32_t {
-	/// User is a bot
-	u_bot =				0b00000000000000000000001,
-	/// User is a system user (Clyde!)
-	u_system =			0b00000000000000000000010,
-	/// User has multi-factor authentication enabled
-	u_mfa_enabled =			0b00000000000000000000100,
-	/// User is verified (verified email address)
-	u_verified =			0b00000000000000000001000,
-	/// User has full nitro
-	u_nitro_full =			0b00000000000000000010000,
-	/// User has nitro classic
-	u_nitro_classic =		0b00000000000000000100000,
-	/// User is discord staff
-	u_discord_employee =		0b00000000000000001000000,
-	/// User owns a partnered server
-	u_partnered_owner =		0b00000000000000010000000,
-	/// User is a member of hypesquad events
-	u_hypesquad_events =		0b00000000000000100000000,
-	/// User has BugHunter level 1
-	u_bughunter_1 =			0b00000000000001000000000,
-	/// User is a member of House Bravery
-	u_house_bravery =		0b00000000000010000000000,
-	/// User is a member of House Brilliance
-	u_house_brilliance =		0b00000000000100000000000,
-	/// User is a member of House Balance
-	u_house_balance =		0b00000000001000000000000,
-	/// User is an early supporter
-	u_early_supporter =		0b00000000010000000000000,
-	/// User is a team user
-	u_team_user =			0b00000000100000000000000,
-	/// User is has Bug Hunter level 2
-	u_bughunter_2 =			0b00000001000000000000000,
-	/// User is a verified bot
-	u_verified_bot =		0b00000010000000000000000,
-	/// User has the Early Verified Bot Developer badge
-	u_verified_bot_dev =	 	0b00000100000000000000000,
-	/// User's icon is animated
-	u_animated_icon =		0b00001000000000000000000,
-	/// User is a certified moderator
-	u_certified_moderator =		0b00010000000000000000000,
-	/// User is a bot using HTTP interactions (shows online even when not connected to a websocket)
-	u_bot_http_interactions =	0b00100000000000000000000,
-	/// User has nitro basic
-	u_nitro_basic = 			0b01000000000000000000000,
-	/// User has the active developer badge
-	u_active_developer =		0b10000000000000000000000,
-};
-
-/**
- * @brief Represents a user on discord. May or may not be a member of a dpp::guild.
- */
-class DPP_EXPORT user : public managed, public json_interface<user>  {
-public:
-	/** Discord username */
-	std::string username;
-	/** Avatar hash */
-	utility::iconhash avatar;
-	/** Flags built from a bitmask of values in dpp::user_flags */
-	uint32_t flags;
-	/** Discriminator (aka tag), 4 digits usually displayed with leading zeroes.
-	 *
-	 * @note To print the discriminator with leading zeroes, use format_username()
-	 */
-	uint16_t discriminator;
-	/** Reference count of how many guilds this user is in */
-	uint8_t refcount;
-
-	/**
-	 * @brief Construct a new user object
-	 */
-	user();
-
-	/**
-	 * @brief Destroy the user object
-	 */
-	virtual ~user();
-
-	/**
-	* @brief Create a mentionable user.
-	 * @param id The ID of the user.
-	 * @return std::string The formatted mention of the user.
-	*/
-	static std::string get_mention(const snowflake& id);
-
-	/** Fill this record from json.
-	 * @param j The json to fill this record from
-	 * @return Reference to self
-	 */
-	user& fill_from_json(nlohmann::json* j);
-
-	/**
-	 * @brief Convert to JSON string
-	 * 
-	 * @param with_id include ID in output
-	 * @return std::string JSON output
-	 */
-	virtual std::string build_json(bool with_id = true) const;
-
-	/**
-	 * @brief Get the avatar url of the user object
-	 *
-	 * @param size The size of the avatar in pixels. It can be any power of two between 16 and 4096. if not specified, the default sized avatar is returned.
-	 * @return std::string avatar url. If the user doesn't have an avatar, the default user avatar url is returned
-	 */
-	std::string get_avatar_url(uint16_t size = 0) const;
-
-	/**
-	 * @brief Return a ping/mention for the user
-	 * 
-	 * @return std::string mention
-	 */
-	std::string get_mention() const;
-
-	/**
-	 * @brief Return true if user has the active Developer badge
-	 *
-	 * @return true if has active developer
-	 */
-	bool is_active_developer() const;
-	/**
-	 * @brief User is a bot
-	 *
-	 * @return True if the user is a bot
-	 */
-	bool is_bot() const;
-	/**
-	 * @brief User is a system user (Clyde)
-	 *
-	 * @return true  if user is a system user
-	 */
-	bool is_system() const;
-	/**
-	 * @brief User has multi-factor authentication enabled
-	 *
-	 * @return true if multi-factor is enabled
-	 */
-	bool is_mfa_enabled() const;
-	/**
-	 * @brief Return true if user has verified account
-	 *
-	 * @return true if verified
-	 */
-	bool is_verified() const;
-	/**
-	 * @brief Return true if user has full nitro.
-	 * This is mutually exclusive with full nitro.
-	 *
-	 * @return true if user has full nitro
-	 */
-	bool has_nitro_full() const;
-	/**
-	 * @brief Return true if user has nitro classic.
-	 * This is mutually exclusive with nitro classic.
-	 *
-	 * @return true if user has nitro classic
-	 */
-	bool has_nitro_classic() const;
-	/**
-	 * @brief Return true if user has nitro basic.
-	 * This is mutually exclusive with nitro basic.
-	 *
-	 * @return true if user has nitro basic
-	 */
-	bool has_nitro_basic() const;
-	/**
-	 * @brief Return true if user is a discord employee
-	 *
-	 * @return true if user is discord staff
-	 */
-	bool is_discord_employee() const;
-	/**
-	 * @brief Return true if user owns a partnered server
-	 *
-	 * @return true if user has partnered server
-	 */
-	bool is_partnered_owner() const;
-	/**
-	 * @brief Return true if user has hypesquad events
-	 *
-	 * @return true if has hypesquad events
-	 */
-	bool has_hypesquad_events() const;
-	/**
-	 * @brief Return true if user has the bughunter level 1 badge
-	 *
-	 * @return true if has bughunter level 1
-	 */
-	bool is_bughunter_1() const;
-	/**
-	 * @brief Return true if user is in house bravery
-	 *
-	 * @return true if in house bravery
-	 */
-	bool is_house_bravery() const;
-	/**
-	 * @brief Return true if user is in house brilliance
-	 *
-	 * @return true if in house brilliance
-	 */
-	bool is_house_brilliance() const;
-	/**
-	 * @brief Return true if user is in house balance
-	 *
-	 * @return true if in house brilliance
-	 */
-	bool is_house_balance() const;
-	/**
-	 * @brief Return true if user is an early supporter
-	 *
-	 * @return true if early supporter
-	 */
-	bool is_early_supporter() const;
-	/**
-	 * @brief Return true if user is a team user
-	 *
-	 * @return true if a team user
-	 */
-	bool is_team_user() const;
-	/**
-	 * @brief Return true if user has the bughunter level 2 badge
-	 *
-	 * @return true if has bughunter level 2
-	 */
-	bool is_bughunter_2() const;
-	/**
-	 * @brief Return true if user has the verified bot badge
-	 *
-	 * @return true if verified bot
-	 */
-	bool is_verified_bot() const;
-	/**
-	 * @brief Return true if user is an early verified bot developer
-	 *
-	 * @return true if verified bot developer
-	 */
-	bool is_verified_bot_dev() const;
-	/**
-	 * @brief Return true if user is a certified moderator
-	 *
-	 * @return true if certified moderator
-	 */
-	bool is_certified_moderator() const;
-	/**
-	 * @brief Return true if user is a bot which exclusively uses HTTP interactions.
-	 * Bots using HTTP interactions are always considered online even when not connected to a websocket.
-	 *
-	 * @return true if is a http interactions only bot
-	 */
-	bool is_bot_http_interactions() const;
-	/**
-	 * @brief Return true if user has an animated icon
-	 *
-	 * @return true if icon is animated (gif)
-	 */
-	bool has_animated_icon() const;
-
-	/**
-	 * @brief Format a username into user#discriminator
-	 * 
-	 * For example Brain#0001
-	 * 
-	 * @return Formatted username and discriminator
-	 */
-	std::string format_username() const;
-};
-
-/**
- * @brief A user with additional fields only available via the oauth2 identify scope.
- * These are not included in dpp::user as additional scopes are needed to fetch them
- * which bots do not normally have.
- */
-class DPP_EXPORT user_identified : public user, public json_interface<user_identified> {
-public:
-	std::string		locale;		//!< Optional: the user's chosen language option identify
-	std::string		email;		//!< Optional: the user's email  email (may be empty)
-	utility::iconhash	banner;		//!< Optional: the user's banner hash    identify (may be empty)
-	uint32_t		accent_color;	//!< Optional: the user's banner color encoded as an integer representation of hexadecimal color code    identify (may be empty)
-	bool			verified;	//!< Optional: whether the email on this account has been verified       email
-	
-	/** Fill this record from json.
-	 * @param j The json to fill this record from
-	 * @return Reference to self
-	 */
-	user_identified& fill_from_json(nlohmann::json* j);
-
-	/**
-	 * @brief Convert to JSON string
-	 * 
-	 * @param with_id include ID in output
-	 * @return std::string JSON output
-	 */
-	virtual std::string build_json(bool with_id = true) const;
-
-	/**
-	 * @brief Construct a new user identified object
-	 */
-	user_identified();
-
-	/**
-	 * @brief Destroy the user identified object
-	 */
-	virtual ~user_identified();
-
-	/**
-	 * @brief Get the user identified's banner url if they have one, otherwise returns an empty string
-	 *
-	 * @param size The size of the banner in pixels. It can be any power of two between 16 and 4096. if not specified, the default sized banner is returned.
-	 * @return std::string banner url or empty string
-	 */
-	std::string get_banner_url(uint16_t size = 0) const;
-
-};
-
-/**
- * @brief helper function to deserialize a user from json
- *
- * @see https://github.com/nlohmann/json#arbitrary-types-conversions
- *
- * @param j output json object
- * @param u user to be deserialized
- */
-void from_json(const nlohmann::json& j, user& u);
-
-/**
- * @brief helper function to deserialize a user_identified from json
- *
- * @see https://github.com/nlohmann/json#arbitrary-types-conversions
- *
- * @param j output json object
- * @param u user to be deserialized
- */
-void from_json(const nlohmann::json& j, user_identified& u);
-
-/** A group of users */
-typedef std::unordered_map<snowflake, user> user_map;
-
-};
+/************************************************************************************
+ *
+ * D++, A Lightweight C++ library for Discord
+ *
+ * Copyright 2021 Craig Edwards and D++ contributors
+ * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ************************************************************************************/
+#pragma once
+#include <dpp/export.h>
+#include <dpp/json_fwd.h>
+#include <dpp/snowflake.h>
+#include <dpp/managed.h>
+#include <dpp/utility.h>
+#include <dpp/json_interface.h>
+
+namespace dpp {
+
+constexpr uint32_t MAX_AVATAR_SIZE = 10240 * 1000; // 10240KB.
+
+/**
+ * @brief Various bitmask flags used to represent information about a dpp::user
+ */
+enum user_flags : uint32_t {
+	/**
+	 * @brief User is a bot.
+	 */
+	u_bot =	0b00000000000000000000000000000001,
+
+	/**
+	 * @brief User is a system user (Clyde!).
+	 */
+	u_system = 0b00000000000000000000000000000010,
+
+	/**
+	 * @brief User has multi-factor authentication enabled.
+	 */
+	u_mfa_enabled = 0b00000000000000000000000000000100,
+
+	/**
+	 * @brief User is verified (verified email address).
+	 */
+	u_verified = 0b00000000000000000000000000001000,
+
+	/**
+	 * @brief User has full nitro.
+	 */
+	u_nitro_full = 0b00000000000000000000000000010000,
+
+	/**
+	 * @brief User has nitro classic.
+	 */
+	u_nitro_classic = 0b00000000000000000000000000100000,
+
+	/**
+	 * @brief User is discord staff.
+	 */
+	u_discord_employee = 0b00000000000000000000000001000000,
+
+	/**
+	 * @brief User owns a partnered server.
+	 */
+	u_partnered_owner = 0b00000000000000000000000010000000,
+
+	/**
+	 * @brief User is a member of hypesquad events.
+	 */
+	u_hypesquad_events = 0b00000000000000000000000100000000,
+
+	/**
+	 * @brief User has BugHunter level 1.
+	 */
+	u_bughunter_1 =	0b00000000000000000000001000000000,
+
+	/**
+	 * @brief User is a member of House Bravery.
+	 */
+	u_house_bravery = 0b00000000000000000000010000000000,
+
+	/**
+	 * @brief User is a member of House Brilliance.
+	 */
+	u_house_brilliance = 0b00000000000000000000100000000000,
+
+	/**
+	 * @brief User is a member of House Balance.
+	 */
+	u_house_balance = 0b00000000000000000001000000000000,
+
+	/**
+	 * @brief User is an early supporter.
+	 */
+	u_early_supporter = 0b00000000000000000010000000000000,
+
+	/**
+	 * @brief User is a team user.
+	 */
+	u_team_user = 0b00000000000000000100000000000000,
+
+	/**
+	 * @brief User is has Bug Hunter level 2.
+	 */
+	u_bughunter_2 =	0b00000000000000001000000000000000,
+
+	/**
+	 * @brief User is a verified bot.
+	 */
+	u_verified_bot = 0b00000000000000010000000000000000,
+
+	/**
+	 * @brief User has the Early Verified Bot Developer badge.
+	 */
+	u_verified_bot_dev = 0b00000000000000100000000000000000,
+
+	/**
+	 * @brief User's icon is animated.
+	 */
+	u_animated_icon = 0b00000000000001000000000000000000,
+
+	/**
+	 * @brief User is a certified moderator.
+	 */
+	u_certified_moderator =	0b00000000000010000000000000000000,
+
+	/**
+	 * @brief User is a bot using HTTP interactions.
+	 *
+	 * @note shows online even when not connected to a websocket.
+	 */
+	u_bot_http_interactions = 0b00000000000100000000000000000000,
+
+	/**
+	 * @brief User has nitro basic.
+	 */
+	u_nitro_basic = 0b00000000001000000000000000000000,
+
+	/**
+	 * @brief User has the active developer badge.
+	 */
+	u_active_developer = 0b00000000010000000000000000000000,
+
+	/**
+	 * @brief User's banner is animated.
+	 */
+	u_animated_banner =			0b00000000100000000000000000000000,
+};
+
+/**
+ * @brief Represents a user on discord. May or may not be a member of a dpp::guild.
+ */
+class DPP_EXPORT user : public managed, public json_interface<user> {
+protected:
+	friend struct json_interface<user>;
+
+	/** Fill this record from json.
+	 * @param j The json to fill this record from
+	 * @return Reference to self
+	 */
+	user& fill_from_json_impl(nlohmann::json* j);
+
+	/**
+	 * @brief Convert to JSON
+	 *
+	 * @param with_id include ID in output
+	 * @return json JSON output
+	 */
+	virtual json to_json_impl(bool with_id = true) const;
+
+public:
+	/**
+	 * @brief Discord username.
+	 */
+	std::string username;
+
+	/**
+	 * @brief Global display name.
+	 */
+	std::string global_name;
+
+	/**
+	 * @brief Avatar hash.
+	 */
+	utility::iconhash avatar;
+
+	/**
+	 * @brief Avatar decoration hash.
+	 */
+	utility::iconhash avatar_decoration;
+
+	/**
+	 * @brief Primary guild object (server tag)
+	 */
+	utility::primaryguild primary_guild;
+
+	/**
+	 * @brief Flags built from a bitmask of values in dpp::user_flags.
+	 */
+	uint32_t flags;
+
+	/**
+	 * @brief Discriminator (aka tag), 4 digits usually displayed with leading zeroes.
+	 *
+	 * @note To print the discriminator with leading zeroes, use format_username().
+	 * 0 for users that have migrated to the new username format.
+	 */
+	uint16_t discriminator;
+
+	/**
+	 * @brief Reference count of how many guilds this user is in.
+	 */
+	uint8_t refcount;
+
+	/**
+	 * @brief Construct a new user object
+	 */
+	user();
+
+	/**
+	 * @brief Destroy the user object
+	 */
+	virtual ~user() = default;
+
+	/**
+	 * @brief Create a mentionable user.
+	 * @param id The ID of the user.
+	 * @return std::string The formatted mention of the user.
+	 */
+	static std::string get_mention(const snowflake& id);
+
+	/**
+	 * @brief Get the avatar url of the user
+	 *
+	 * @note If the user doesn't have an avatar, the default user avatar url is returned which is always in `png` format!
+	 *
+	 * @param size The size of the avatar in pixels. It can be any power of two between 16 and 4096,
+	 * otherwise the default sized avatar is returned.
+	 * @param format The format to use for the avatar. It can be one of `i_webp`, `i_jpg`, `i_png` or `i_gif`.
+	 * When passing `i_gif`, it returns an empty string for non-animated images. Consider using the `prefer_animated` parameter instead.
+	 * @param prefer_animated Whether you prefer gif format.
+	 * If true, it'll return gif format whenever the image is available as animated.
+	 * @return std::string avatar url or an empty string, if required attributes are missing or an invalid format was passed
+	 */
+	std::string get_avatar_url(uint16_t size = 0, const image_type format = i_png, bool prefer_animated = true) const;
+
+	/**
+	 * @brief Get the default avatar url of the user. This is calculated by the discriminator.
+	 *
+	 * @return std::string avatar url or an empty string, if the discriminator is empty
+	 */
+	std::string get_default_avatar_url() const;
+
+	/**
+	 * @brief Get the avatar decoration url of the user if they have one, otherwise returns an empty string.
+	 *
+	 * @param size The size of the avatar decoration in pixels. It can be any power of two between 16 and 4096,
+	 * otherwise the default sized avatar decoration is returned.
+	 * @return std::string avatar url or an empty string
+	 */
+	std::string get_avatar_decoration_url(uint16_t size = 0) const;
+
+	/**
+	 * @brief Return a ping/mention for the user
+	 * 
+	 * @return std::string mention
+	 */
+	std::string get_mention() const;
+
+	/**
+	 * @brief Returns URL to user 
+	 * 
+	 * @return string of URL to user
+	 */
+	std::string get_url() const;
+
+	/**
+	 * @brief Return true if user has the active Developer badge
+	 *
+	 * @return true if has active developer
+	 */
+	bool is_active_developer() const;
+
+	/**
+	 * @brief User is a bot
+	 *
+	 * @return True if the user is a bot
+	 */
+	bool is_bot() const;
+
+	/**
+	 * @brief User is a system user (Clyde)
+	 *
+	 * @return true  if user is a system user
+	 */
+	bool is_system() const;
+
+	/**
+	 * @brief User has multi-factor authentication enabled
+	 *
+	 * @return true if multi-factor is enabled
+	 */
+	bool is_mfa_enabled() const;
+
+	/**
+	 * @brief Return true if user has verified account
+	 *
+	 * @return true if verified
+	 */
+	bool is_verified() const;
+
+	/**
+	 * @brief Return true if user has full nitro.
+	 * This is mutually exclusive with full nitro.
+	 *
+	 * @return true if user has full nitro
+	 */
+	bool has_nitro_full() const;
+
+	/**
+	 * @brief Return true if user has nitro classic.
+	 * This is mutually exclusive with nitro classic.
+	 *
+	 * @return true if user has nitro classic
+	 */
+	bool has_nitro_classic() const;
+
+	/**
+	 * @brief Return true if user has nitro basic.
+	 * This is mutually exclusive with nitro basic.
+	 *
+	 * @return true if user has nitro basic
+	 */
+	bool has_nitro_basic() const;
+
+	/**
+	 * @brief Return true if user is a discord employee
+	 *
+	 * @return true if user is discord staff
+	 */
+	bool is_discord_employee() const;
+
+	/**
+	 * @brief Return true if user owns a partnered server
+	 *
+	 * @return true if user has partnered server
+	 */
+	bool is_partnered_owner() const;
+
+	/**
+	 * @brief Return true if user has hypesquad events
+	 *
+	 * @return true if has hypesquad events
+	 */
+	bool has_hypesquad_events() const;
+
+	/**
+	 * @brief Return true if user has the bughunter level 1 badge
+	 *
+	 * @return true if has bughunter level 1
+	 */
+	bool is_bughunter_1() const;
+
+	/**
+	 * @brief Return true if user is in house bravery
+	 *
+	 * @return true if in house bravery
+	 */
+	bool is_house_bravery() const;
+
+	/**
+	 * @brief Return true if user is in house brilliance
+	 *
+	 * @return true if in house brilliance
+	 */
+	bool is_house_brilliance() const;
+
+	/**
+	 * @brief Return true if user is in house balance
+	 *
+	 * @return true if in house brilliance
+	 */
+	bool is_house_balance() const;
+
+	/**
+	 * @brief Return true if user is an early supporter
+	 *
+	 * @return true if early supporter
+	 */
+	bool is_early_supporter() const;
+
+	/**
+	 * @brief Return true if user is a team user
+	 *
+	 * @return true if a team user
+	 */
+	bool is_team_user() const;
+
+	/**
+	 * @brief Return true if user has the bughunter level 2 badge
+	 *
+	 * @return true if has bughunter level 2
+	 */
+	bool is_bughunter_2() const;
+
+	/**
+	 * @brief Return true if user has the verified bot badge
+	 *
+	 * @return true if verified bot
+	 */
+	bool is_verified_bot() const;
+
+	/**
+	 * @brief Return true if user is an early verified bot developer
+	 *
+	 * @return true if verified bot developer
+	 */
+	bool is_verified_bot_dev() const;
+
+	/**
+	 * @brief Return true if user is a certified moderator
+	 *
+	 * @return true if certified moderator
+	 */
+	bool is_certified_moderator() const;
+
+	/**
+	 * @brief Return true if user is a bot which exclusively uses HTTP interactions.
+	 * Bots using HTTP interactions are always considered online even when not connected to a websocket.
+	 *
+	 * @return true if is a http interactions only bot
+	 */
+	bool is_bot_http_interactions() const;
+
+	/**
+	 * @brief Return true if user has an animated icon
+	 *
+	 * @return true if icon is animated (gif)
+	 */
+	bool has_animated_icon() const;
+
+	/**
+	 * @brief Format a username into user\#discriminator
+	 * 
+	 * For example Brain#0001
+	 *
+	 * @note This will, most often, return something like Brain#0000 due to discriminators slowly being removed.
+	 * Some accounts, along with most bots, still have discriminators, so they will still show as Bot#1234.
+	 * 
+	 * @return Formatted username and discriminator
+	 */
+	std::string format_username() const;
+};
+
+/**
+ * @brief A user with additional fields only available via the oauth2 identify scope.
+ * These are not included in dpp::user as additional scopes are needed to fetch them
+ * which bots do not normally have.
+ */
+class DPP_EXPORT user_identified : public user, public json_interface<user_identified> {
+protected:
+	friend struct json_interface<user_identified>;
+
+	/** Fill this record from json.
+	 * @param j The json to fill this record from
+	 * @return Reference to self
+	 */
+	user_identified& fill_from_json_impl(nlohmann::json* j);
+
+	/**
+	 * @brief Convert to JSON
+	 *
+	 * @param with_id include ID in output
+	 * @return json JSON output
+	 */
+	virtual json to_json_impl(bool with_id = true) const;
+
+public:
+	/**
+	 * @brief Optional: The user's chosen language option identify.
+	 */
+	std::string locale;
+
+	/**
+	 * @brief Optional: The user's email.
+	 *
+	 * @note This may be empty.
+	 */
+	std::string email;
+
+	/**
+	 * @brief Optional: The user's banner hash identify.
+	 *
+	 * @note This may be empty.
+	 */
+	utility::iconhash banner;
+
+	/**
+	 * @brief Optional: The user's banner color encoded as an integer representation of hexadecimal color code identify.
+	 *
+	 * @note This may be empty.
+	 */
+	uint32_t accent_color;
+
+
+	/**
+	 * @brief Optional: Whether the email on this account has been verified email.
+	 */
+	bool verified;
+
+	/**
+	 * @brief Construct a new user identified object
+	 */
+	user_identified();
+
+	/**
+	 * @brief Construct a new user identified object from a user object
+	 * 
+	 * @param u user object
+	 */
+	user_identified(const user& u);
+
+	/**
+	 * @brief Destroy the user identified object
+	 */
+	virtual ~user_identified() = default;
+
+	using json_interface<user_identified>::fill_from_json;
+	using json_interface<user_identified>::build_json;
+	using json_interface<user_identified>::to_json;
+
+	/**
+	 * @brief Return true if user has an animated banner
+	 *
+	 * @return true if banner is animated (gif)
+	 */
+	bool has_animated_banner() const;
+
+	/**
+	 * @brief Get the user identified's banner url if they have one, otherwise returns an empty string
+	 *
+	 * @param size The size of the banner in pixels. It can be any power of two between 16 and 4096,
+	 * otherwise the default sized banner is returned.
+	 * @param format The format to use for the avatar. It can be one of `i_webp`, `i_jpg`, `i_png` or `i_gif`.
+	 * When passing `i_gif`, it returns an empty string for non-animated images. Consider using the `prefer_animated` parameter instead.
+	 * @param prefer_animated Whether you prefer gif format.
+	 * If true, it'll return gif format whenever the image is available as animated.
+	 * @return std::string banner url or an empty string, if required attributes are missing or an invalid format was passed
+	 */
+	std::string get_banner_url(uint16_t size = 0, const image_type format = i_png, bool prefer_animated = true) const;
+
+};
+
+/**
+ * @brief helper function to deserialize a user from json
+ *
+ * @see https://github.com/nlohmann/json#arbitrary-types-conversions
+ *
+ * @param j output json object
+ * @param u user to be deserialized
+ */
+void from_json(const nlohmann::json& j, user& u);
+
+/**
+ * @brief helper function to deserialize a user_identified from json
+ *
+ * @see https://github.com/nlohmann/json#arbitrary-types-conversions
+ *
+ * @param j output json object
+ * @param u user to be deserialized
+ */
+void from_json(const nlohmann::json& j, user_identified& u);
+
+/**
+ * @brief A group of users.
+ */
+typedef std::unordered_map<snowflake, user> user_map;
+
+}
diff --git a/3rdParty/dpp/utility.h b/3rdParty/dpp/utility.h
index 963e9d0161..d8d1704ada 100644
--- a/3rdParty/dpp/utility.h
+++ b/3rdParty/dpp/utility.h
@@ -1,487 +1,1096 @@
-/************************************************************************************
- *
- * D++, A Lightweight C++ library for Discord
- *
- * Copyright 2021 Craig Edwards and D++ contributors 
- * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- ************************************************************************************/
-#pragma once
-#include <dpp/export.h>
-#include <dpp/snowflake.h>
-#include <dpp/misc-enum.h>
-#include <string>
-#include <vector>
-#include <unordered_map>
-#include <map>
-#include <functional>
-
-/**
- * @brief The main namespace for D++ functions, classes and types
- */
-namespace dpp {
-	/**
-	 * @brief Utility helper functions, generally for logging, running programs, time/date manipulation, etc
-	 */
-	namespace utility {
-
-		/**
-		 * @brief Timestamp formats for dpp::utility::timestamp()
-		 * 
-		 * @note These values are the actual character values specified by the Discord API
-		 * and should not be changed unless the Discord API changes the specification!
-		 * They have been sorted into numerical order of their ASCII value to keep C++ happy.
-		 */
-		enum time_format : uint8_t {
-			/// "20 April 2021" - Long Date
-			tf_long_date		=	'D',
-			/// "Tuesday, 20 April 2021 16:20" - Long Date/Time
-			tf_long_datetime	=	'F',
-			/// "2 months ago" - Relative Time		
-			tf_relative_time	=	'R',
-			/// "16:20:30" - Long Time
-			tf_long_time		=	'T',
-			/// "20/04/2021" - Short Date
-			tf_short_date		=	'd',
-			/// "20 April 2021 16:20" - Short Date/Time
-			tf_short_datetime	=	'f',
-			/// "16:20" - Short Time
-			tf_short_time		=	't',
-		};
-
-		/**
-		 * @brief The base URL for CDN content such as profile pictures and guild icons.
-		 */
-		const std::string cdn_host = "https://cdn.discordapp.com"; 
-
-		/**
-		 * @brief Callback for the results of a command executed via dpp::utility::exec
-		 */
-		typedef std::function<void(const std::string& output)> cmd_result_t;
-
-		/**
-		 * @brief Run a commandline program asynchronously. The command line program
-		 * is spawned in a separate std::thread, and when complete, its output from
-		 * stdout is passed to the callback function in its string parameter. For example
-		 * ```
-		 * dpp::utility::exec("/bin/ls", {"-al"}, [](const std::string& output) {
-		 *     std::cout << "Output of 'ls -al': " << output << "\n";
-		 * });
-		 * ```
-		 * 
-		 * @param cmd The command to run.
-		 * @param parameters Command line parameters. Each will be escaped using `std::quoted`.
-		 * @param callback The callback to call on completion.
-		 */
-		void DPP_EXPORT exec(const std::string& cmd, std::vector<std::string> parameters = {}, cmd_result_t callback = {});
-
-		/**
-		 * @brief Return a mentionable timestamp (used in a message). These timestamps will display the given timestamp in the user's timezone and locale.
-		 * 
-		 * @param ts Time stamp to convert
-		 * @param tf Format of timestamp using dpp::utility::time_format
-		 * @return std::string The formatted timestamp
-		 */
-		std::string DPP_EXPORT timestamp(time_t ts, time_format tf = tf_short_datetime);
-
-		/**
-		 * @brief Returns current date and time
-		 * 
-		 * @return std::string Current date and time in "Y-m-d H:M:S" format
-		 */
-		std::string DPP_EXPORT current_date_time();
-		/**
-		 * @brief Convert a dpp::loglevel enum value to a string
-		 * 
-		 * @param in log level to convert
-		 * @return std::string string form of log level
-		 */
-		std::string DPP_EXPORT loglevel(dpp::loglevel in);
-
-		/**
-		 * @brief Store a 128 bit icon hash (profile picture, server icon etc)
-		 * as a 128 bit binary value made of two uint64_t.
-		 * Has a constructor to build one from a string, and a method to fetch
-		 * the value back in string form.
-		 */
-		struct DPP_EXPORT iconhash {
-
-			uint64_t first;		//!< High 64 bits
-			uint64_t second;	//!< Low 64 bits
-
-			/**
-			 * @brief Construct a new iconhash object
-			 * @param _first Leftmost portion of the hash value
-			 * @param _second Rightmost portion of the hash value
-			 */
-			iconhash(uint64_t _first = 0, uint64_t _second = 0);
-
-			/**
-			 * @brief Construct a new iconhash object
-			 */
-			iconhash(const iconhash&);
-
-			/**
-			 * @brief Destroy the iconhash object
-			 */
-			~iconhash();
-
-			/**
-			 * @brief Construct a new iconhash object
-			 * 
-			 * @param hash String hash to construct from.
-			 * Must contain a 32 character hex string.
-			 * 
-			 * @throws std::length_error if the provided
-			 * string is not exactly 32 characters long.
-			 */
-			iconhash(const std::string &hash);
-
-			/**
-			 * @brief Assign from std::string
-			 * 
-			 * @param assignment string to assign from.
-			 * 
-			 * @throws std::length_error if the provided
-			 * string is not exactly 32 characters long.
-			 */
-			iconhash& operator=(const std::string &assignment);
-
-			/**
-			 * @brief Check if one iconhash is equal to another
-			 * 
-			 * @param other other iconhash to compare
-			 * @return True if the iconhash objects match
-			 */
-			bool operator==(const iconhash& other) const;
-
-			/**
-			 * @brief Change value of iconhash object
-			 * 
-			 * @param hash String hash to change to.
-			 * Must contain a 32 character hex string.
-			 * 
-			 * @throws std::length_error if the provided
-			 * string is not exactly 32 characters long.
-			 */
-			void set(const std::string &hash);
-
-			/**
-			 * @brief Convert iconhash back to 32 character
-			 * string value.
-			 * 
-			 * @return std::string Hash value 
-			 */
-			std::string to_string() const;
-		};
-
-		/**
-		 * @brief Return the current time with fractions of seconds.
-		 * This is a unix epoch time with the fractional seconds part
-		 * after the decimal place.
-		 * 
-		 * @return double time with fractional seconds
-		 */
-		double DPP_EXPORT time_f();
-
-		/**
-		 * @brief Returns true if D++ was built with voice support
-		 * 
-		 * @return bool True if voice support is compiled in (libsodium/libopus) 
-		 */
-		bool DPP_EXPORT has_voice();
-
-		/**
-		 * @brief Convert a byte count to display value
-		 * 
-		 * @param c number of bytes
-		 * @return std::string display value suffixed with M, G, T where necessary
-		 */
-		std::string DPP_EXPORT bytes(uint64_t c);
-
-		/**
-		 * @brief A class used to represent an uptime in hours, minutes,
-		 * seconds and days, with helper functions to convert from time_t
-		 * and display as a string.
-		 */
-		struct DPP_EXPORT uptime {
-			uint16_t days;	//!< Number of days
-			uint8_t hours;	//!< Number of hours
-			uint8_t mins;	//!< Number of minutes
-			uint8_t secs;	//!< Number of seconds
-
-			/**
-			 * @brief Construct a new uptime object
-			 */
-			uptime();
-
-			/**
-			 * @brief Construct a new uptime object
-			 * 
-			 * @param diff A time_t to initialise the object from
-			 */
-			uptime(time_t diff);
-
-			/**
-			 * @brief Construct a new uptime object
-			 * 
-			 * @param diff A time_t to initialise the object from
-			 */
-			uptime(double diff);
-
-			/**
-			 * @brief Get uptime as string
-			 * 
-			 * @return std::string Uptime as string
-			 */
-			std::string to_string() const;
-
-			/**
-			 * @brief Get uptime as seconds
-			 * 
-			 * @return uint64_t Uptime as seconds
-			 */
-			uint64_t to_secs() const;
-
-			/**
-			 * @brief Get uptime as milliseconds
-			 * 
-			 * @return uint64_t Uptime as milliseconds
-			 */
-			uint64_t to_msecs() const;
-		};
-
-		/**
-		 * @brief Convert doubles to RGB for sending in embeds
-		 * 
-		 * @param red red value, between 0 and 1 inclusive
-		 * @param green green value, between 0 and 1 inclusive
-		 * @param blue blue value, between 0 and 1 inclusive
-		 * @return uint32_t returned integer colour value
-		 */
-		uint32_t DPP_EXPORT rgb(double red, double green, double blue);
-
-		/**
-		 * @brief Convert ints to RGB for sending in embeds
-		 *
-		 * @param red red value, between 0 and 255 inclusive
-		 * @param green green value, between 0 and 255 inclusive
-		 * @param blue blue value, between 0 and 255 inclusive
-		 * @return uint32_t returned integer colour value
-		 */
-		uint32_t DPP_EXPORT rgb(int red, int green, int blue);
-
-	        /**
-		 * @brief Convert doubles to CMYK for sending in embeds
-		 *
-		 * @param c cyan value, between 0 and 1 inclusive
-		 * @param m magenta value, between 0 and 1 inclusive
-		 * @param y yellow value, between 0 and 1 inclusive
-		 * @param k key (black) value, between 0 and 1 inclusive
-		 * @return uint32_t returned integer colour value
-		 */
-		uint32_t DPP_EXPORT cmyk(double c, double m, double y, double k);
-		
-		/**
-		 * @brief Convert ints to CMYK for sending in embeds
-		 *
-		 * @param c cyan value, between 0 and 255 inclusive
-		 * @param m magenta value, between 0 and 255 inclusive
-		 * @param y yellow value, between 0 and 255 inclusive
-		 * @param k key (black) value, between 0 and 255 inclusive
-		 * @return uint32_t returned integer colour value
-		 */
-		uint32_t DPP_EXPORT cmyk(int c, int m, int y, int k);
-
-		/**
-		 * @brief Output hex values of a section of memory for debugging
-		 * 
-		 * @param data The start of the data to display
-		 * @param length The length of data to display
-		 */
-		std::string DPP_EXPORT debug_dump(uint8_t* data, size_t length);
-
-		/**
-		 * @brief Returns the length of a UTF-8 string in codepoints
-		 * 
-		 * @param str string to count length of
-		 * @return size_t length of string (0 for invalid utf8)
-		 */
-		size_t DPP_EXPORT utf8len(const std::string &str);
-
-		/**
-		 * @brief Return substring of a UTF-8 encoded string in codepoints
-		 * 
-		 * @param str string to return substring from
-		 * @param start start codepoint offset
-		 * @param length length in codepoints
-		 * @return std::string Substring in UTF-8 or empty string if invalid UTF-8 passed in
-		 */
-		std::string DPP_EXPORT utf8substr(const std::string& str, std::string::size_type start, std::string::size_type length);
-
-		/**
-		 * @brief Read a whole file into a std::string.
-		 * Be sure you have enough memory to read the file, if you are reading a large file.
-		 * @note Be aware this function can block! If you are regularly reading large files, consider caching them.
-		 * @param filename The path to the file to read
-		 * @return std::string The file contents
-		 * @throw dpp::exception on failure to read the entire file
-		 */
-		std::string DPP_EXPORT read_file(const std::string& filename);
-
-		/**
-		 * @brief Validate a string value
-		 * In the event the length of the string is less than _min, then an exception of type dpp:length_exception
-		 * will be thrown. If the string is longer than _max UTF8 codepoints it will be truncated to fit.
-		 * 
-		 * @param value The value to validate
-		 * @param _min Minimum length
-		 * @param _max Maximum length
-		 * @param exception_message Exception message to throw if value length < _min
-		 * @return std::string Validated string, truncated if necessary.
-		 * @throw dpp::length_exception if value UTF8 length < _min
-		 */
-		std::string DPP_EXPORT validate(const std::string& value, size_t _min, size_t _max, const std::string& exception_message);
-
-		/**
-		 * @brief Return the url parameter for an avatar size, or empty if the size is 0
-		 * 
-		 * @param size size to generate url parameter for
-		 * @return std::string url parameter
-		 */
-		std::string DPP_EXPORT avatar_size(uint32_t size);
-
-		/**
-		 * @brief Split (tokenize) a string into a vector, using the given separators
-		 * 
-		 * @param in Input string
-		 * @param sep Separator characters
-		 * @return std::vector<std::string> Tokenized strings 
-		 */
-		std::vector<std::string> DPP_EXPORT tokenize(std::string const &in, const char* sep = "\r\n");
-
-		/**
-		 * @brief Create a bot invite
-		 * 
-		 * @param bot_id Bot ID
-		 * @param permissions Permission bitmask of the bot to invite
-		 * @param scopes Scopes to use
-		 * @return Invite URL
-		 */
-		std::string DPP_EXPORT bot_invite_url(const snowflake bot_id, const uint64_t permissions = 0, const std::vector<std::string>& scopes = {"bot", "applications.commands"});
-
-		/**
-		 * @brief Escapes Discord's markdown sequences in a string
-		 * 
-		 * @param text Text to escape
-		 * @param escape_code_blocks If set to false, then code blocks are not escaped.
-		 * This means that you can still use a code block, and the text within will be left as-is.
-		 * If set to true, code blocks will also be escaped so that ` symbol may be used as a normal
-		 * character.
-		 * @return std::string The text with the markdown special characters escaped with a backslash
-		 */
-		std::string DPP_EXPORT markdown_escape(const std::string& text, bool escape_code_blocks = false);
-
-		/**
-		 * @brief Encodes a url parameter similar to [php urlencode()](https://www.php.net/manual/en/function.urlencode.php)
-		 * 
-		 * @param value String to encode
-		 * @return std::string URL encoded string
-		 */
-		std::string DPP_EXPORT url_encode(const std::string &value);
-
-		/**
-		 * @brief Create a mentionable slashcommand (used in a message).
-		 * @param command_id The ID of the slashcommand
-		 * @param command_name The command name
-		 * @param subcommand Optional: The subcommand name (for mentioning a subcommand)
-		 * @return std::string The formatted mention
-		 */
-		std::string DPP_EXPORT slashcommand_mention(snowflake command_id, const std::string &command_name, const std::string &subcommand = "");
-
-		/**
-		 * @brief Create a mentionable slashcommand (used in a message).
-		 * @param command_id The ID of the slashcommand
-		 * @param command_name The command name
-		 * @param subcommand_group The subcommand group name
-		 * @param subcommand The subcommand name
-		 * @return std::string The formatted mention of the slashcommand with its subcommand
-		 */
-		std::string DPP_EXPORT slashcommand_mention(snowflake command_id, const std::string &command_name, const std::string &subcommand_group, const std::string &subcommand);
-
-        	/**
-		 * @brief Create a mentionable user.
-		 * @param id The ID of the user.
-		 * @return std::string The formatted mention of the user.
-		 */
-		std::string DPP_EXPORT user_mention(const snowflake& id);
-
-		/**
-		* @brief Create a mentionable channel.
-		* @param id The ID of the channel.
-		* @return std::string The formatted mention of the channel.
-		*/
-		std::string DPP_EXPORT channel_mention(const snowflake& id);
-
-		/**
-		* @brief Create a mentionable emoji
-		* @param name The name of the emoji.
-		* @param id The ID of the emoji.
-		* @param is_animated is emoji animated.
-		* @return std::string The formatted mention of the emoji.
-		*/
-		std::string DPP_EXPORT emoji_mention(const std::string& name, const snowflake& id, bool is_animated = false);
-
-		/**
-		* @brief Create a mentionable role.
-		* @param id The ID of the role.
-		* @return std::string The formatted mention of the role.
-		*/
-		std::string DPP_EXPORT role_mention(const snowflake& id);
-
-		/**
-		 * @brief Returns the library's version string
-		 * 
-		 * @return std::string version
-		 */
-		std::string DPP_EXPORT version();
-
-		/**
-		 * @brief Build a URL parameter string e.g. "?a=b&c=d&e=f" from a map of key/value pairs.
-		 * Entries with empty key names or values are omitted.
-		 * 
-		 * @param parameters parameters to create a url query string for
-		 * @return std::string A correctly encoded url query string
-		 */
-		std::string DPP_EXPORT make_url_parameters(const std::map<std::string, std::string>& parameters);
-
-		/**
-		 * @brief Build a URL parameter string e.g. "?a=b&c=d&e=f" from a map of key/value pairs.
-		 * Entries with empty key names or zero values are omitted.
-		 * 
-		 * @param parameters parameters to create a url query string for
-		 * @return std::string A correctly encoded url query string
-		 */
-		std::string DPP_EXPORT make_url_parameters(const std::map<std::string, uint64_t>& parameters);
-
-		/**
-		 * @brief Set the name of the current thread for debugging and statistical reporting
-		 * 
-		 * @param name New name to set
-		 */
-		void DPP_EXPORT set_thread_name(const std::string& name);
-
-	};
-};
+/************************************************************************************
+ *
+ * D++, A Lightweight C++ library for Discord
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright 2021 Craig Edwards and D++ contributors 
+ * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ************************************************************************************/
+#pragma once
+#include <dpp/export.h>
+#include <dpp/snowflake.h>
+#include <dpp/misc-enum.h>
+#include <string>
+#include <vector>
+#include <unordered_map>
+#include <map>
+#include <functional>
+#include <cstddef>
+#include <variant>
+#include <memory>
+#include <string_view>
+
+/**
+ * @brief The main namespace for D++ functions, classes and types
+ */
+namespace dpp {
+
+enum sticker_format : uint8_t;
+
+/**
+ * @brief Macro that expands to static_asserts checking sizeof and alignof are equal between two types.
+ */
+#define DPP_CHECK_ABI_COMPAT(a, b) \
+static_assert(sizeof(a) == sizeof(b), #a " and " #b " must be the same size for ABI compatibility"); \
+static_assert(alignof(a) == alignof(b), #a " and " #b " must be the same alignment for ABI compatibility"); \
+
+/**
+ * @brief Utility helper functions, generally for logging, running programs, time/date manipulation, etc
+ */
+namespace utility {
+
+/**
+ * @brief Helper function to easily create discord's cdn endpoint urls.
+ * @warning **For internal use only!**
+ *
+ * @see https://discord.com/developers/docs/reference#image-formatting-cdn-endpoints
+ * @param allowed_formats A vector of supported formats for the endpoint from the discord docs
+ * @param path_without_extension The path for the endpoint (without the extension e.g. `.png`)
+ * @param format the wished format to return. Must be one of the formats passed in `allowed_formats`, otherwise it returns an empty string
+ * @param size the image size which will be appended as a querystring to the url.
+ * It must be any power of two between 16 and 4096, otherwise no querystring will be appended (discord then returns the image as their default size)
+ * @param prefer_animated Whether the user prefers gif format. If true, it'll return gif format whenever the image is available as animated.
+ * In this case, the `format`-parameter is only used for non-animated images.
+ * @param is_animated Whether the image is actually animated or not
+ * @return std::string endpoint url or empty string
+ */
+std::string DPP_EXPORT cdn_endpoint_url(const std::vector<image_type> &allowed_formats, const std::string &path_without_extension, const dpp::image_type format, uint16_t size, bool prefer_animated = false, bool is_animated = false);
+
+/**
+ * @brief Helper function to easily create discord's cdn endpoint urls.
+ * @warning **For internal use only!**
+ *
+ * @see https://discord.com/developers/docs/reference#image-formatting-cdn-endpoints
+ * @param allowed_formats A vector of supported formats for the endpoint from the discord docs
+ * @param path_without_extension The path for the endpoint (without the extension e.g. `.png`)
+ * @param hash The hash (optional). If not empty, it will be prefixed with `a_` for animated images (`is_animated`=true)
+ * @param format the wished format to return. Must be one of the formats passed in `allowed_formats`, otherwise it returns an empty string
+ * @param size the image size which will be appended as a querystring to the url.
+ * It must be any power of two between 16 and 4096, otherwise no querystring will be appended (discord then returns the image as their default size)
+ * @param prefer_animated Whether the user prefers gif format. If true, it'll return gif format whenever the image is available as animated.
+ * In this case, the `format`-parameter is only used for non-animated images.
+ * @param is_animated Whether the image is actually animated or not
+ * @return std::string endpoint url or empty string
+ */
+std::string DPP_EXPORT cdn_endpoint_url_hash(const std::vector<image_type> &allowed_formats, const std::string &path_without_extension, const std::string &hash, const dpp::image_type format, uint16_t size, bool prefer_animated = false, bool is_animated = false);
+
+/**
+ * @brief Helper function to easily create discord's cdn endpoint urls (specialised for stickers)
+ * @warning **For internal use only!**
+ *
+ * @see https://discord.com/developers/docs/reference#image-formatting-cdn-endpoints
+ * @param sticker_id The sticker ID. Returns empty string if 0
+ * @param format The format type
+ * @return std::string endpoint url or empty string
+ */
+std::string DPP_EXPORT cdn_endpoint_url_sticker(snowflake sticker_id, sticker_format format);
+
+/**
+ * @brief Supported AVX instruction set type for audio mixing
+ */
+enum avx_type_t : uint8_t {
+	/**
+	 * @brief No AVX Support
+	 */
+	avx_none,
+
+	/**
+	 * @brief AVX support
+	 */
+	avx_1,
+
+	/**
+	 * @brief AVX2 support
+	 */
+	avx_2,
+
+	/**
+	 * @brief AVX512 support
+	 */
+	avx_512,
+};
+
+/**
+ * @brief Timestamp formats for dpp::utility::timestamp()
+ * 
+ * @note These values are the actual character values specified by the Discord API
+ * and should not be changed unless the Discord API changes the specification!
+ * They have been sorted into numerical order of their ASCII value to keep C++ happy.
+ */
+enum time_format : uint8_t {
+	/**
+	 * @brief "20 April 2021" - Long Date
+	 */
+	tf_long_date = 'D',
+
+	/**
+	 * @brief "Tuesday, 20 April 2021 16:20" - Long Date/Time
+	 */
+	tf_long_datetime = 'F',
+
+	/**
+	 * @brief "2 months ago" - Relative Time
+	 */
+	tf_relative_time = 'R',
+
+	/**
+	 * @brief "16:20:30" - Long Time
+	 */
+	tf_long_time = 'T',
+
+	/**
+	 * @brief "20/04/2021" - Short Date
+	 */
+	tf_short_date =	'd',
+
+	/**
+	 * @brief "20 April 2021 16:20" - Short Date/Time
+	 */
+	tf_short_datetime = 'f',
+
+	/**
+	 * @brief "16:20" - Short Time
+	 */
+	tf_short_time =	't',
+};
+
+/**
+ * @brief Guild navigation types for dpp::utility::guild_navigation()
+ */
+enum guild_navigation_type {
+	/**
+	 * @brief _Customize_ tab with the server's dpp::onboarding_prompt
+	 */
+	gnt_customize,
+
+	/**
+	 * @brief "16:20" _Browse Channels_ tab
+	 */
+	gnt_browse,
+
+	/**
+	 * @brief Server Guide
+	 */
+	gnt_guide,
+};
+
+/**
+ * @brief The base URL for CDN content such as profile pictures and guild icons.
+ */
+inline const std::string cdn_host = "https://cdn.discordapp.com"; 
+
+/**
+ * @brief The base URL for message/user/channel links.
+ */
+inline const std::string url_host = "https://discord.com"; 
+
+/**
+ * @brief Callback for the results of a command executed via dpp::utility::exec
+ */
+typedef std::function<void(const std::string& output)> cmd_result_t;
+
+/**
+ * @brief Run a commandline program asynchronously. The command line program
+ * is spawned in a separate std::thread, and when complete, its output from
+ * stdout is passed to the callback function in its string parameter. For example:
+ * ```cpp
+ * dpp::utility::exec("/bin/ls", {"-al"}, [](const std::string& output) {
+ *     std::cout << "Output of 'ls -al': " << output << "\n";
+ * });
+ * ```
+ * 
+ * @param cmd The command to run.
+ * @param parameters Command line parameters. Each will be escaped using `std::quoted`.
+ * @param callback The callback to call on completion.
+ */
+void DPP_EXPORT exec(const std::string& cmd, std::vector<std::string> parameters = {}, cmd_result_t callback = {});
+
+/**
+ * @brief Return a mentionable timestamp (used in a message). These timestamps will display the given timestamp in the user's timezone and locale.
+ * 
+ * @param ts Time stamp to convert
+ * @param tf Format of timestamp using dpp::utility::time_format
+ * @return std::string The formatted timestamp
+ */
+std::string DPP_EXPORT timestamp(time_t ts, time_format tf = tf_short_datetime);
+
+/**
+ * @brief Create a mentionable guild navigation (used in a message).
+ *
+ * @param guild_id The guild ID
+ * @param gnt Guild navigation type using dpp::utility::guild_navigation_type
+ * @return std::string The formatted timestamp
+ */
+std::string DPP_EXPORT guild_navigation(const snowflake guild_id, guild_navigation_type gnt);
+
+/**
+ * @brief Returns current date and time
+ * 
+ * @return std::string Current date and time in "Y-m-d H:M:S" format
+ */
+std::string DPP_EXPORT current_date_time();
+/**
+ * @brief Convert a dpp::loglevel enum value to a string
+ * 
+ * @param in log level to convert
+ * @return std::string string form of log level
+ */
+std::string DPP_EXPORT loglevel(dpp::loglevel in);
+
+/**
+ * @brief Store a 128 bit icon hash (profile picture, server icon etc)
+ * as a 128 bit binary value made of two uint64_t.
+ * Has a constructor to build one from a string, and a method to fetch
+ * the value back in string form.
+ */
+struct DPP_EXPORT iconhash {
+	/**
+	 * @brief High 64 bits.
+	 */
+	uint64_t first;
+
+	/**
+	 * @brief Low 64 bits.
+	 */
+	uint64_t second;
+
+	/**
+	 * @brief Construct a new iconhash object
+	 * @param _first Leftmost portion of the hash value
+	 * @param _second Rightmost portion of the hash value
+	 */
+	iconhash(uint64_t _first = 0, uint64_t _second = 0) noexcept;
+
+	/**
+	 * @brief Construct a new iconhash object
+	 *
+	 * @param hash String hash to construct from.
+	 * Must contain a 32 character hex string.
+	 *
+	 * @throws std::length_error if the provided
+	 * string is not exactly 32 characters long.
+	 */
+	iconhash(const std::string &hash);
+
+	/**
+	 * @brief Assign from std::string
+	 *
+	 * @param assignment string to assign from.
+	 *
+	 * @throws std::length_error if the provided
+	 * string is not exactly 32 characters long.
+	 */
+	iconhash& operator=(const std::string &assignment);
+
+	/**
+	 * @brief Check if one iconhash is equal to another
+	 *
+	 * @param other other iconhash to compare
+	 * @return True if the iconhash objects match
+	 */
+	bool operator==(const iconhash& other) const noexcept;
+
+	/**
+	 * @brief Change value of iconhash object
+	 *
+	 * @param hash String hash to change to.
+	 * Must contain a 32 character hex string.
+	 *
+	 * @throws std::length_error if the provided
+	 * string is not exactly 32 characters long.
+	 */
+	void set(const std::string &hash);
+
+	/**
+	 * @brief Convert iconhash back to 32 character
+	 * string value.
+	 *
+	 * @return std::string Hash value
+	 */
+	std::string to_string() const;
+};
+
+/**
+ * @brief User's primary guild (server tag)
+ */
+struct DPP_EXPORT primaryguild {
+	/**
+	 * @brief The id of the user's primary guild
+	 *
+	 * @see guild
+	 */
+	snowflake id;
+
+	/**
+	 * @brief Whether the user is displaying the primary guild's server tag
+	 */
+	bool enabled;
+
+	/**
+	 * @brief The text of the user's server tag. Limited to 4 characters
+	 */
+	std::string tag;
+
+	/**
+	 * @brief The server tag badge
+	 */
+	iconhash badge;
+};
+
+/**
+ * @brief Image to be received or sent to API calls.
+ *
+ * This class is carefully crafted to be 16 bytes,
+ * this is why we use a ptr + 4 byte size instead of a vector.
+ * We want this class to be substitutable with iconhash in data structures.
+ */
+struct DPP_EXPORT image_data {
+	/**
+	 * @brief Data in bytes of the image.
+	 */
+	std::unique_ptr<std::byte[]> data = nullptr;
+
+	/**
+	 * @brief Size of the data in bytes.
+	 */
+	uint32_t size = 0;
+
+	/**
+	 * @brief Type of the image.
+	 *
+	 * @see image_type
+	 */
+	image_type type = {};
+
+	/**
+	 * @brief Construct an empty image.
+	 */
+	image_data() = default;
+
+	/**
+	 * @brief Copy an image.
+	 *
+	 * @param rhs Image to copy
+	 */
+	image_data(const image_data& rhs);
+
+	/**
+	 * @brief Move an image.
+	 *
+	 * @param rhs Image to copy
+	 */
+	image_data(image_data&& rhs) noexcept = default;
+
+	/**
+	 * @brief Construct from string buffer
+	 *
+	 * @param format Image format
+	 * @param bytes Data in a string
+	 * @see image_type
+	 */
+	image_data(image_type format, std::string_view bytes);
+
+	/**
+	 * @brief Construct from byte buffer
+	 *
+	 * @param format Image format
+	 * @param bytes Data of the image
+	 * @param byte_size Image size in bytes
+	 * @see image_type
+	 */
+	image_data(image_type format, const std::byte* bytes, uint32_t byte_size);
+
+	/**
+	 * @brief Copy an image data.
+	 *
+	 * @param rhs Image to copy
+	 * @return self for chaining
+	 */
+	image_data& operator=(const image_data& rhs);
+
+	/**
+	 * @brief Move an image data.
+	 *
+	 * @param rhs Image to move from
+	 * @return self for chaining
+	 */
+	image_data& operator=(image_data&& rhs) noexcept = default;
+
+	/**
+	 * @brief Set image data.
+	 *
+	 * @param format Image format
+	 * @param bytes Data of the image
+	 */
+	void set(image_type format, std::string_view bytes);
+
+	/**
+	 * @brief Set image data.
+	 *
+	 * @param format Format of the image
+	 * @param bytes Data of the image
+	 * @param byte_size Image size in bytes
+	 */
+	void set(image_type format, const std::byte* bytes, uint32_t byte_size);
+
+	/**
+	 * @brief Encode to base64.
+	 *
+	 * @return std::string New string with the image data encoded in base64
+	 */
+	std::string base64_encode() const;
+
+	/**
+	 * @brief Get the file extension.
+	 *
+	 * Alias for \ref file_extension
+	 * @return std::string File extension e.g. `.png`
+	 */
+	std::string get_file_extension() const;
+
+	/**
+	 * @brief Get the mime type.
+	 *
+	 * Alias for \ref mime_type
+	 * @return std::string File mime type e.g. "image/png"
+	 */
+	std::string get_mime_type() const;
+
+	/**
+	 * @brief Check if this is an empty image.
+	 *
+	 * @return bool Whether the image is empty or not
+	 */
+	bool empty() const noexcept;
+
+	/**
+	 * @brief Build a data URI scheme suitable for sending to Discord
+	 *
+	 * @see https://discord.com/developers/docs/reference#image-data
+	 * @return The data URI scheme as a json or null if empty
+	 */
+	json to_nullable_json() const;
+};
+
+/**
+ * @brief Wrapper class around a variant for either iconhash or image,
+ * for API objects that have one or the other (generally iconhash when receiving,
+ * image when uploading an image)
+ */
+struct icon {
+	/**
+	 * @brief Iconhash received or image data for upload.
+	 */
+	std::variant<std::monostate, iconhash, image_data> hash_or_data;
+
+	/**
+	 * @brief Assign to iconhash.
+	 *
+	 * @param hash Iconhash
+	 */
+	icon& operator=(const iconhash& hash);
+
+	/**
+	 * @brief Assign to iconhash.
+	 *
+	 * @param hash Iconhash
+	 */
+	icon& operator=(iconhash&& hash) noexcept;
+
+	/**
+	 * @brief Assign to image.
+	 *
+	 * @param img Image
+	 */
+	icon& operator=(const image_data& img);
+
+	/**
+	 * @brief Assign to image.
+	 *
+	 * @param img Image
+	 */
+	icon& operator=(image_data&& img) noexcept;
+
+	/**
+	 * @brief Check whether this icon is stored as an iconhash
+	 *
+	 * @see iconhash
+	 * @return bool Whether this icon is stored as an iconhash
+	 */
+	bool is_iconhash() const;
+
+	/**
+	 * @brief Get as icon hash.
+	 *
+	 * @warning The behavior is undefined if `is_iconhash() == false`
+	 * @return iconhash& This iconhash
+	 */
+	iconhash& as_iconhash() &;
+
+	/**
+	 * @brief Get as icon hash.
+	 *
+	 * @warning The behavior is undefined if `is_iconhash() == false`
+	 * @return iconhash& This iconhash
+	 */
+	const iconhash& as_iconhash() const&;
+
+	/**
+	 * @brief Get as icon hash.
+	 *
+	 * @warning The behavior is undefined if `is_iconhash() == false`
+	 * @return iconhash& This iconhash
+	 */
+	iconhash&& as_iconhash() &&;
+
+	/**
+	 * @brief Check whether this icon is stored as an image
+	 *
+	 * @see image_data
+	 * @return bool Whether this icon is stored as an image
+	 */
+	bool is_image_data() const;
+
+	/**
+	 * @brief Get as image data.
+	 *
+	 * @warning The behavior is undefined if `is_image_data() == false`
+	 * @return image_data& This image
+	 */
+	image_data& as_image_data() &;
+
+	/**
+	 * @brief Get as image.
+	 *
+	 * @warning The behavior is undefined if `is_image_data() == false`
+	 * @return image_data& This image
+	 */
+	const image_data& as_image_data() const&;
+
+	/**
+	 * @brief Get as image.
+	 *
+	 * @warning The behavior is undefined if `is_image_data() == false`
+	 * @return image_data& This image
+	 */
+	image_data&& as_image_data() &&;
+};
+
+/**
+ * @brief Return the current time with fractions of seconds.
+ * This is a unix epoch time with the fractional seconds part
+ * after the decimal place.
+ * 
+ * @return double time with fractional seconds
+ */
+double DPP_EXPORT time_f();
+
+/**
+ * @brief Returns true if D++ was built with voice support
+ * 
+ * @return bool True if voice support is compiled in (libopus)
+ */
+bool DPP_EXPORT has_voice();
+
+/**
+ * @brief Returns an enum value indicating which AVX instruction
+ * set is used for mixing received voice data, if any
+ * 
+ * @return avx_type_t AVX type
+ */
+avx_type_t DPP_EXPORT voice_avx();
+
+/**
+ * @brief Returns true if D++ was built with coroutine support
+ * 
+ * @return bool True if coroutines are supported 
+ */
+bool DPP_EXPORT is_coro_enabled();
+
+/**
+ * @brief Convert a byte count to display value
+ * 
+ * @param c number of bytes
+ * @return std::string display value suffixed with M, G, T where necessary
+ */
+std::string DPP_EXPORT bytes(uint64_t c);
+
+/**
+ * @brief A class used to represent an uptime in hours, minutes,
+ * seconds and days, with helper functions to convert from time_t
+ * and display as a string.
+ */
+struct DPP_EXPORT uptime {
+	/**
+	 * @brief Number of days.
+	 */
+	uint16_t days;
+
+	/**
+	 * @brief Number of hours.
+	 */
+	uint8_t hours;
+
+	/**
+	 * @brief Number of minutes.
+	 */
+	uint8_t mins;
+
+	/**
+	 * @brief Number of seconds.
+	 */
+	uint8_t secs;
+
+	/**
+	 * @brief Construct a new uptime object
+	 */
+	uptime();
+
+	/**
+	 * @brief Construct a new uptime object
+	 * 
+	 * @param diff A time_t to initialise the object from
+	 */
+	uptime(time_t diff);
+
+	/**
+	 * @brief Construct a new uptime object
+	 * 
+	 * @param diff A time_t to initialise the object from
+	 */
+	uptime(double diff);
+
+	/**
+	 * @brief Get uptime as string
+	 * 
+	 * @return std::string Uptime as string
+	 */
+	std::string to_string() const;
+
+	/**
+	 * @brief Get uptime as seconds
+	 * 
+	 * @return uint64_t Uptime as seconds
+	 */
+	uint64_t to_secs() const;
+
+	/**
+	 * @brief Get uptime as milliseconds
+	 * 
+	 * @return uint64_t Uptime as milliseconds
+	 */
+	uint64_t to_msecs() const;
+};
+
+/**
+ * @brief Convert doubles to RGB for sending in embeds
+ * 
+ * @param red red value, between 0 and 1 inclusive
+ * @param green green value, between 0 and 1 inclusive
+ * @param blue blue value, between 0 and 1 inclusive
+ * @return uint32_t returned integer colour value
+ */
+uint32_t DPP_EXPORT rgb(double red, double green, double blue);
+
+/**
+ * @brief Convert ints to RGB for sending in embeds
+ *
+ * @param red red value, between 0 and 255 inclusive
+ * @param green green value, between 0 and 255 inclusive
+ * @param blue blue value, between 0 and 255 inclusive
+ * @return uint32_t returned integer colour value
+ */
+uint32_t DPP_EXPORT rgb(int red, int green, int blue);
+
+/**
+ * @brief Convert doubles to CMYK for sending in embeds
+ *
+ * @param c cyan value, between 0 and 1 inclusive
+ * @param m magenta value, between 0 and 1 inclusive
+ * @param y yellow value, between 0 and 1 inclusive
+ * @param k key (black) value, between 0 and 1 inclusive
+ * @return uint32_t returned integer colour value
+ */
+uint32_t DPP_EXPORT cmyk(double c, double m, double y, double k);
+
+/**
+ * @brief Convert ints to CMYK for sending in embeds
+ *
+ * @param c cyan value, between 0 and 255 inclusive
+ * @param m magenta value, between 0 and 255 inclusive
+ * @param y yellow value, between 0 and 255 inclusive
+ * @param k key (black) value, between 0 and 255 inclusive
+ * @return uint32_t returned integer colour value
+ */
+uint32_t DPP_EXPORT cmyk(int c, int m, int y, int k);
+
+/**
+ * @brief Convert doubles to HSL for sending in embeds
+ *
+ * @param h hue value, between 0 and 1 inclusive
+ * @param s saturation value in percentage, between 0 and 1 inclusive
+ * @param l lightness value in percentage, between 0 and 1 inclusive
+ * @return uint32_t returned integer colour value
+ */
+uint32_t DPP_EXPORT hsl(double h, double s, double l);
+
+/**
+ * @brief Convert ints to HSL for sending in embeds
+ *
+ * @param h hue value, between 0 and 360 inclusive
+ * @param s saturation value in percentage, between 0 and 100 inclusive
+ * @param l lightness value in percentage, between 0 and 100 inclusive
+ * @return uint32_t returned integer colour value
+ */
+uint32_t DPP_EXPORT hsl(int h, int s, int l);
+
+/**
+ * @brief Output hex values of a section of memory for debugging
+ * 
+ * @param data The start of the data to display
+ * @param length The length of data to display
+ */
+std::string DPP_EXPORT debug_dump(const uint8_t* data, size_t length);
+
+/**
+ * @brief Returns the length of a UTF-8 string in codepoints.
+ * @note Result is unspecified for strings that are not valid UTF-8.
+ *
+ * @param str string to count length of
+ * @return size_t Length of string
+ */
+size_t DPP_EXPORT utf8len(std::string_view str);
+
+/**
+ * @brief Return subview of a UTF-8 encoded string in codepoints.
+ * @note You must ensure that the resulting view is not used after the lifetime of the viewed string has ended.
+ * @note Result is unspecified for strings that are not valid UTF-8.
+ *
+ * @param str string to return substring from
+ * @param start start codepoint offset
+ * @param length length in codepoints
+ * @return std::string_view The requested subview
+ */
+std::string_view DPP_EXPORT utf8subview(std::string_view str, size_t start, size_t length);
+
+/**
+ * @brief Return substring of a UTF-8 encoded string in codepoints.
+ * @note Result is unspecified for strings that are not valid UTF-8.
+ *
+ * @param str string to return substring from
+ * @param start start codepoint offset
+ * @param length length in codepoints
+ * @return std::string The requested substring
+ */
+std::string DPP_EXPORT utf8substr(std::string_view str, size_t start, size_t length);
+
+/**
+ * @brief Read a whole file into a std::string.
+ * @note This function can take a while if this is a large file, causing events to not reply and also taking up a lot of memory. Make sure you have enough memory, and use dpp::interaction_create_t::thinking in events where you call this function on big files.
+ * @warning Be aware this function can block! If you are regularly reading large files, consider caching them.
+ * @param filename The path to the file to read
+ * @return std::string The file contents
+ * @throw dpp::file_exception on failure to read the entire file
+ */
+std::string DPP_EXPORT read_file(const std::string& filename);
+
+/**
+ * @brief Validate a string value
+ * In the event the length of the string is less than _min, then an exception of type dpp:length_exception
+ * will be thrown. If the string is longer than _max UTF8 codepoints it will be truncated to fit.
+ * 
+ * @param value The value to validate
+ * @param _min Minimum length
+ * @param _max Maximum length
+ * @param exception_message Exception message to throw if value length < _min
+ * @return std::string Validated string, truncated if necessary.
+ * @throw dpp::length_exception if value UTF8 length < _min
+ */
+std::string DPP_EXPORT validate(const std::string& value, size_t _min, size_t _max, const std::string& exception_message);
+
+/**
+ * @brief Get the url query parameter for the cdn endpoint. Internally used to build url getters.
+ * 
+ * @param size size to generate url parameter for. Must be any power of two between 16 and 4096 (inclusive) or it'll return an empty string.
+ * @return std::string url query parameter e.g. `?size=128`, or an empty string
+ */
+std::string DPP_EXPORT avatar_size(uint32_t size);
+
+/**
+ * @brief Split (tokenize) a string into a vector, using the given separators
+ * 
+ * @param in Input string
+ * @param sep Separator characters
+ * @return std::vector<std::string> Tokenized strings 
+ */
+std::vector<std::string> DPP_EXPORT tokenize(std::string const &in, const char* sep = "\r\n");
+
+/**
+ * @brief Create a bot invite
+ * 
+ * @param bot_id Bot ID
+ * @param permissions Permission bitmask of the bot to invite
+ * @param scopes Scopes to use
+ * @return Invite URL
+ */
+std::string DPP_EXPORT bot_invite_url(const snowflake bot_id, const uint64_t permissions = 0, const std::vector<std::string>& scopes = {"bot", "applications.commands"});
+
+/**
+ * @brief Escapes Discord's markdown sequences in a string
+ * 
+ * @param text Text to escape
+ * @param escape_code_blocks If set to false, then code blocks are not escaped.
+ * This means that you can still use a code block, and the text within will be left as-is.
+ * If set to true, code blocks will also be escaped so that ` symbol may be used as a normal
+ * character.
+ * @return std::string The text with the markdown special characters escaped with a backslash
+ */
+std::string DPP_EXPORT markdown_escape(const std::string& text, bool escape_code_blocks = false);
+
+/**
+ * @brief Encodes a url parameter similar to [php urlencode()](https://www.php.net/manual/en/function.urlencode.php)
+ * 
+ * @param value String to encode
+ * @return std::string URL encoded string
+ */
+std::string DPP_EXPORT url_encode(const std::string &value);
+
+/**
+ * @brief Create a mentionable slashcommand (used in a message).
+ * @param command_id The ID of the slashcommand
+ * @param command_name The command name
+ * @param subcommand Optional: The subcommand name (for mentioning a subcommand)
+ * @return std::string The formatted mention
+ */
+std::string DPP_EXPORT slashcommand_mention(snowflake command_id, const std::string &command_name, const std::string &subcommand = "");
+
+/**
+ * @brief Create a mentionable slashcommand (used in a message).
+ * @param command_id The ID of the slashcommand
+ * @param command_name The command name
+ * @param subcommand_group The subcommand group name
+ * @param subcommand The subcommand name
+ * @return std::string The formatted mention of the slashcommand with its subcommand
+ */
+std::string DPP_EXPORT slashcommand_mention(snowflake command_id, const std::string &command_name, const std::string &subcommand_group, const std::string &subcommand);
+
+/**
+ * @brief Create a mentionable user.
+ * @param id The ID of the user.
+ * @return std::string The formatted mention of the user.
+ */
+std::string DPP_EXPORT user_mention(const snowflake& id);
+
+/**
+* @brief Create a mentionable channel.
+* @param id The ID of the channel.
+* @return std::string The formatted mention of the channel.
+*/
+std::string DPP_EXPORT channel_mention(const snowflake& id);
+
+/**
+* @brief Create a mentionable emoji
+* @param name The name of the emoji.
+* @param id The ID of the emoji.
+* @param is_animated is emoji animated.
+* @return std::string The formatted mention of the emoji.
+*/
+std::string DPP_EXPORT emoji_mention(std::string_view name, snowflake id, bool is_animated = false);
+
+/**
+* @brief Create a mentionable role.
+* @param id The ID of the role.
+* @return std::string The formatted mention of the role.
+*/
+std::string DPP_EXPORT role_mention(const snowflake& id);
+
+/**
+* @brief Create a URL for message.
+* @param guild_id The ID of the guild where message is written.
+* @param channel_id The ID of the channel where message is written.
+* @param message_id The ID of the message.
+* @return std::string The URL to message or empty string if any of ids is 0.
+*/
+std::string DPP_EXPORT message_url(const snowflake& guild_id, const snowflake& channel_id, const snowflake& message_id);
+
+/**
+* @brief Create a URL for message.
+* @param guild_id The ID of the guild where channel is located.
+* @param channel_id The ID of the channel.
+* @return std::string The URL to message or empty string if any of ids is 0.
+*/
+std::string DPP_EXPORT channel_url(const snowflake& guild_id, const snowflake& channel_id);
+
+/**
+* @brief Create a URL for message.
+* @param guild_id The ID of the guild where thread is located.
+* @param thread_id The ID of the thread.
+* @return std::string The URL to message or empty string if any of ids is 0.
+*/
+std::string DPP_EXPORT thread_url(const snowflake& guild_id, const snowflake& thread_id);
+
+/**
+* @brief Create a URL for message.
+* @param user_id The ID of the guild where thread is located.
+* @return std::string The URL to message or empty string if id is 0.
+*/
+std::string DPP_EXPORT user_url(const snowflake& user_id);
+
+
+
+#ifdef _DOXYGEN_
+/**
+ * @brief Get the mime type for an image type.
+ * @param type Image type
+ * @return std::string The mime type for this image type
+ */
+std::string DPP_EXPORT mime_type(image_type type);
+
+/**
+ * @brief Get the mime type for a sticker format.
+ * @param format Sticker format
+ * @return std::string The mime type for this sticker format
+ */
+std::string DPP_EXPORT mime_type(sticker_format format);
+
+/**
+ * @brief Get the file extension for an image type.
+ * @param type Image type
+ * @return std::string The file extension (e.g. ".png") for this image type
+ */
+std::string DPP_EXPORT file_extension(image_type type);
+
+/**
+ * @brief Get the file extension for a sticker format.
+ * @param format Sticker format
+ * @return std::string The file extension (e.g. ".png") for this sticker format
+ */
+std::string DPP_EXPORT file_extension(sticker_format format);
+#else
+/**
+ * @brief Get the mime type for an image type.
+ * @param type Image type
+ * @return std::string The mime type for this image type
+ */
+template <typename T>
+extern std::enable_if_t<std::is_same_v<T, image_type>, std::string> DPP_EXPORT mime_type(T type);
+
+/**
+ * @brief Get the mime type for a sticker format.
+ * @param format Sticker format
+ * @return std::string The mime type for this sticker format
+ */
+template <typename T>
+extern std::enable_if_t<std::is_same_v<T, sticker_format>, std::string> DPP_EXPORT mime_type(T format);
+
+/**
+ * @brief Get the file extension for an image type.
+ * @param type Image type
+ * @return std::string The file extension (e.g. ".png") for this image type
+ */
+template <typename T>
+extern std::enable_if_t<std::is_same_v<T, image_type>, std::string> DPP_EXPORT file_extension(T type);
+
+/**
+ * @brief Get the file extension for a sticker format.
+ * @param format Sticker format
+ * @return std::string The file extension (e.g. ".png") for this sticker format
+ */
+template <typename T>
+extern std::enable_if_t<std::is_same_v<T, sticker_format>, std::string> DPP_EXPORT file_extension(T format);
+#endif
+
+/**
+ * @brief Returns the library's version string
+ * 
+ * @return std::string version
+ */
+std::string DPP_EXPORT version();
+
+/**
+ * @brief Build a URL parameter string e.g. "?a=b&c=d&e=f" from a map of key/value pairs.
+ * Entries with empty key names or values are omitted.
+ * 
+ * @param parameters parameters to create a url query string for
+ * @return std::string A correctly encoded url query string
+ */
+std::string DPP_EXPORT make_url_parameters(const std::map<std::string, std::string>& parameters);
+
+/**
+ * @brief Build a URL parameter string e.g. "?a=b&c=d&e=f" from a map of key/value pairs.
+ * Entries with empty key names or zero values are omitted.
+ * 
+ * @param parameters parameters to create a url query string for
+ * @return std::string A correctly encoded url query string
+ */
+std::string DPP_EXPORT make_url_parameters(const std::map<std::string, uint64_t>& parameters);
+
+/**
+ * @brief Set the name of the current thread for debugging and statistical reporting
+ * 
+ * @param name New name to set
+ */
+void DPP_EXPORT set_thread_name(const std::string& name);
+
+#ifdef __cpp_concepts // if c++20
+/**
+ * @brief Concept satisfied if a callable F can be called using the arguments Args, and that its return value is convertible to R.
+ *
+ * @tparam F Callable object
+ * @tparam R Return type to check for convertibility to
+ * @tparam Args... Arguments to use to resolve the overload
+ * @return Whether the expression `F(Args...)` is convertible to R
+ */
+template <typename F, typename R, typename... Args>
+concept callable_returns = std::convertible_to<std::invoke_result_t<F, Args...>, R>;
+
+/**
+ * @brief Type trait to check if a callable F can be called using the arguments Args, and that its return value is convertible to R.
+ *
+ * @deprecated In C++20 mode, prefer using the concept `callable_returns`.
+ * @tparam F Callable object
+ * @tparam R Return type to check for convertibility to
+ * @tparam Args... Arguments to use to resolve the overload
+ * @return Whether the expression `F(Args...)` is convertible to R
+ */
+template <typename F, typename R, typename... Args>
+inline constexpr bool callable_returns_v = callable_returns<F, R, Args...>;
+#else
+/**
+ * @brief Type trait to check if a callable F can be called using the arguments Args, and that its return value is convertible to R.
+ *
+ * @tparam F Callable object
+ * @tparam R Return type to check for convertibility to
+ * @tparam Args... Arguments to use to resolve the overload
+ * @return Whether the expression `F(Args...)` is convertible to R
+ */
+template <typename F, typename R, typename... Args>
+inline constexpr bool callable_returns_v = std::is_convertible_v<std::invoke_result_t<F, Args...>, R>;
+#endif
+
+/**
+ * @brief Utility struct that has the same size and alignment as another but does nothing. Useful for ABI compatibility.
+ *
+ * @tparam T Type to mimic
+ */
+template <typename T>
+struct alignas(T) dummy {
+	/** @brief Array of bytes with a size mimicking T */
+	std::array<std::byte, sizeof(T)> data;
+};
+
+} // namespace utility
+}
diff --git a/3rdParty/dpp/version.h b/3rdParty/dpp/version.h
index bb8d69338a..64e7e1fd0c 100644
--- a/3rdParty/dpp/version.h
+++ b/3rdParty/dpp/version.h
@@ -1,31 +1,32 @@
-/************************************************************************************
- *
- * D++, A Lightweight C++ library for Discord
- *
- * Copyright 2021 Craig Edwards and D++ contributors 
- * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- ************************************************************************************/
-#pragma once
-
-#if !defined(DPP_VERSION_LONG)
-#define DPP_VERSION_LONG 0x00100022
-#define DPP_VERSION_SHORT 100022
-#define DPP_VERSION_TEXT "D++ 10.0.22 (01-Nov-2022)"
-
-#define DPP_VERSION_MAJOR ((DPP_VERSION_LONG & 0x00ff0000) >> 16)
-#define DPP_VERSION_MINOR ((DPP_VERSION_LONG & 0x0000ff00) >> 8)
-#define DPP_VERSION_PATCH (DPP_VERSION_LONG & 0x000000ff)
-#endif
+/************************************************************************************
+ *
+ * D++, A Lightweight C++ library for Discord
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright 2021 Craig Edwards and D++ contributors 
+ * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ************************************************************************************/
+#pragma once
+
+#ifndef DPP_VERSION_LONG
+#define DPP_VERSION_LONG 0x00100106
+#define DPP_VERSION_SHORT 100106
+#define DPP_VERSION_TEXT "D++ 10.1.6 (20-May-2026)"
+
+#define DPP_VERSION_MAJOR ((DPP_VERSION_LONG & 0x00ff0000) >> 16)
+#define DPP_VERSION_MINOR ((DPP_VERSION_LONG & 0x0000ff00) >> 8)
+#define DPP_VERSION_PATCH (DPP_VERSION_LONG & 0x000000ff)
+#endif
diff --git a/3rdParty/dpp/voice_channel_effect.h b/3rdParty/dpp/voice_channel_effect.h
new file mode 100644
index 0000000000..1a12cd4318
--- /dev/null
+++ b/3rdParty/dpp/voice_channel_effect.h
@@ -0,0 +1,119 @@
+/************************************************************************************
+ *
+ * D++, A Lightweight C++ library for Discord
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright 2021 Craig Edwards and D++ contributors
+ * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ************************************************************************************/
+#pragma once
+#include <dpp/export.h>
+#include <dpp/json_fwd.h>
+#include <dpp/json_interface.h>
+#include <dpp/snowflake.h>
+#include <dpp/emoji.h>
+
+namespace dpp {
+
+/**
+ * @brief Animation types that a voice channel effect can have
+ */
+enum animation_types : uint8_t {
+	at_premium = 0,
+	at_basic = 1
+};
+
+/**
+ * @brief Represents a voice channel effect e.g. a soundboard sound or an emoji reaction.
+ */
+class DPP_EXPORT voice_channel_effect : public json_interface<voice_channel_effect> {
+protected:
+	friend struct json_interface<voice_channel_effect>;
+
+	/**
+	 * @brief Fill voice channel effect object from json data
+	 *
+	 * @param j JSON data to fill from
+	 * @return voice_channel_effect& Reference to self
+	 */
+	voice_channel_effect& fill_from_json_impl(nlohmann::json* j);
+
+public:
+	/**
+	 * @brief Owning shard.
+	 */
+	int32_t shard_id{0};
+
+	/**
+	 * @brief The channel id the user who sent the effect is connected to.
+	 */
+	snowflake channel_id{0};
+
+	/**
+	 * @brief The guild id with the channel this effect was sent in.
+	 */
+	snowflake guild_id{0};
+
+	/**
+	 * @brief The user id who sent the effect.
+	 */
+	snowflake user_id{0};
+
+	/**
+	 * @brief The emoji of the voice channel effect.
+	 */
+	dpp::emoji emoji;
+
+	/**
+	 * @brief The type of emoji animation, for emoji reaction and soundboard effects.
+	 *
+	 * @note This may be empty.
+	 */
+	uint8_t animation_type{0};
+
+	/**
+	 * @brief The ID of the emoji animation, for emoji reaction and soundboard effects.
+	 *
+	 * @note This may be empty.
+	 */
+	uint32_t animation_id{0};
+
+	/**
+	 * @brief The ID of the soundboard sound, for soundboard effects.
+	 *
+	 * @note This may be empty.
+	 */
+	snowflake sound_id{0};
+
+	/**
+	 * @brief The volume of the soundboard sound, from 0 to 1, for soundboard effects.
+	 *
+	 * @note This may be empty.
+	 */
+	double sound_volume{0};
+
+	/**
+	 * @brief Construct a new voice_channel_effect object
+	 */
+	voice_channel_effect();
+
+	/**
+	 * @brief Destroy the voice_channel_effect object
+	 */
+	virtual ~voice_channel_effect() = default;
+};
+
+}
diff --git a/3rdParty/dpp/voiceregion.h b/3rdParty/dpp/voiceregion.h
index 1ca805b06a..ce14995854 100644
--- a/3rdParty/dpp/voiceregion.h
+++ b/3rdParty/dpp/voiceregion.h
@@ -1,119 +1,126 @@
-/************************************************************************************
- *
- * D++, A Lightweight C++ library for Discord
- *
- * Copyright 2021 Craig Edwards and D++ contributors 
- * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- ************************************************************************************/
-#pragma once
-#include <dpp/export.h>
-#include <unordered_map>
-#include <dpp/nlohmann/json_fwd.hpp>
-#include <dpp/json_interface.h>
-
-namespace dpp {
-
-/**
- * @brief Flags related to a voice region
- */
-enum voiceregion_flags {
-	v_optimal	= 0x00000001,
-	v_deprecated	= 0x00000010,
-	v_custom	= 0x00000100,
-	v_vip		= 0x00001000
-};
-
-/**
- * @brief Represents a voice region on discord
- */
-class DPP_EXPORT voiceregion : public json_interface<voiceregion> {
-public:
-	/**
-	 * @brief Voice server ID
-	 */
-	std::string id;
-
-	/**
-	 * @brief Voice server name
-	 */
-	std::string name;
-
-	/**
-	 * @brief Flags bitmap
-	 */
-	uint8_t flags;
-
-	/**
-	 * @brief Construct a new voiceregion object
-	 */
-	voiceregion();
-
-	/**
-	 * @brief Destroy the voiceregion object
-	 */
-	virtual ~voiceregion() = default;
-
-	/**
-	 * @brief Fill object properties from JSON
-	 * 
-	 * @param j JSON to fill from
-	 * @return voiceregion& Reference to self
-	 */
-	voiceregion& fill_from_json(nlohmann::json* j);
-
-	/**
-	 * @brief Build a json string for this object
-	 * 
-	 * @param with_id Add ID to output
-	 * @return std::string JSON string
-	 */
-	virtual std::string build_json(bool with_id = false) const;
-
-	/**
-	 * @brief True if is the optimal voice server
-	 * 
-	 * @return true if optimal 
-	 */
-	bool is_optimal() const;
-
-	/**
-	 * @brief True if is a deprecated voice server
-	 * 
-	 * @return true if deprecated
-	 */
-	bool is_deprecated() const;
-
-	/**
-	 * @brief True if is a custom voice server
-	 * 
-	 * @return true if custom
-	 */
-	bool is_custom() const;
-
-	/**
-	 * @brief True if is a VIP voice server
-	 * 
-	 * @return true if VIP 
-	 */
-	bool is_vip() const;
-};
-
-/**
- * @brief A group of voice regions
- */
-typedef std::unordered_map<std::string, voiceregion> voiceregion_map;
-
-};
+/************************************************************************************
+ *
+ * D++, A Lightweight C++ library for Discord
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright 2021 Craig Edwards and D++ contributors 
+ * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ************************************************************************************/
+#pragma once
+#include <dpp/export.h>
+#include <unordered_map>
+#include <dpp/json_fwd.h>
+#include <dpp/json_interface.h>
+
+namespace dpp {
+
+/**
+ * @brief Flags related to a voice region
+ */
+enum voiceregion_flags {
+    	/**
+	 * @brief The closest (optimal) voice region.
+	 */
+	v_optimal = 0x00000001,
+
+	/**
+	 * @brief A Deprecated voice region (avoid switching to these).
+	 */
+	v_deprecated = 0x00000010,
+
+	/**
+	 * @brief A custom voice region (used for events/etc).
+	 */
+	v_custom = 0x00000100
+};
+
+/**
+ * @brief Represents a voice region on discord
+ */
+class DPP_EXPORT voiceregion : public json_interface<voiceregion> {
+protected:
+	friend struct json_interface<voiceregion>;
+
+	/**
+	 * @brief Fill object properties from JSON
+	 * 
+	 * @param j JSON to fill from
+	 * @return voiceregion& Reference to self
+	 */
+	voiceregion& fill_from_json_impl(nlohmann::json* j);
+
+	/**
+	 * @brief Build a json for this object
+	 *
+	 * @param with_id Add ID to output
+	 * @return json JSON string
+	 */
+	virtual json to_json_impl(bool with_id = false) const;
+
+public:
+	/**
+	 * @brief Voice server ID
+	 */
+	std::string id;
+
+	/**
+	 * @brief Voice server name
+	 */
+	std::string name;
+
+	/**
+	 * @brief Flags bitmap
+	 */
+	uint8_t flags;
+
+	/**
+	 * @brief Construct a new voiceregion object
+	 */
+	voiceregion();
+
+	/**
+	 * @brief Destroy the voiceregion object
+	 */
+	virtual ~voiceregion() = default;
+
+	/**
+	 * @brief True if is the optimal voice server
+	 * 
+	 * @return true if optimal 
+	 */
+	bool is_optimal() const;
+
+	/**
+	 * @brief True if is a deprecated voice server
+	 * 
+	 * @return true if deprecated
+	 */
+	bool is_deprecated() const;
+
+	/**
+	 * @brief True if is a custom voice server
+	 * 
+	 * @return true if custom
+	 */
+	bool is_custom() const;
+};
+
+/**
+ * @brief A group of voice regions
+ */
+typedef std::unordered_map<std::string, voiceregion> voiceregion_map;
+
+}
diff --git a/3rdParty/dpp/voicestate.h b/3rdParty/dpp/voicestate.h
index 6edabe6307..ad6a517542 100644
--- a/3rdParty/dpp/voicestate.h
+++ b/3rdParty/dpp/voicestate.h
@@ -1,110 +1,179 @@
-/************************************************************************************
- *
- * D++, A Lightweight C++ library for Discord
- *
- * Copyright 2021 Craig Edwards and D++ contributors 
- * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- ************************************************************************************/
-#pragma once
-#include <dpp/export.h>
-#include <dpp/snowflake.h>
-#include <dpp/nlohmann/json_fwd.hpp>
-#include <unordered_map>
-#include <dpp/json_interface.h>
-
-namespace dpp {
-
-/**
- * @brief Bit mask flags relating to voice states
- */
-enum voicestate_flags {
-	vs_deaf		=	0b00000001,	//!< Deafened by the server
-	vs_mute		=	0b00000010,	//!< Muted by the server
-	vs_self_mute	=	0b00000100,	//!< Locally Muted
-	vs_self_deaf	=	0b00001000,	//!< Locally deafened
-	vs_self_stream	=	0b00010000,	//!< Whether this user is streaming using "Go Live"
-	vs_self_video	=	0b00100000,	//!< Whether this user's camera is enabled
-	vs_suppress	=	0b01000000	//!< Whether this user's permission to speak is denied
-};
-
-/**
- * @brief Represents the voice state of a user on a guild
- * These are stored in the dpp::guild object, and accessible there,
- * or via dpp::channel::get_voice_members
- */
-class DPP_EXPORT voicestate : public json_interface<voicestate> {
-public:
-	class discord_client*	shard;             //!< Owning shard
-	snowflake		guild_id;          //!< Optional: the guild id this voice state is for
-	snowflake		channel_id;        //!< the channel id this user is connected to (may be empty)
-	snowflake		user_id;           //!< the user id this voice state is for
-	std::string		session_id;        //!< the session id for this voice state
-	uint8_t			flags;             //!< Voice state flags (see dpp::voicestate_flags)
-	time_t			request_to_speak;  //!< The time at which the user requested to speak, or 0
-
-	/**
-	 * @brief Construct a new voicestate object
-	 */
-	voicestate();
-
-	/**
-	 * @brief Destroy the voicestate object
-	 */
-	virtual ~voicestate() = default;
-
-	/**
-	 * @brief Fill voicestate object from json data
-	 * 
-	 * @param j JSON data to fill from
-	 * @return voicestate& Reference to self
-	 */
-	voicestate& fill_from_json(nlohmann::json* j);
-
-	/**
-	 * @brief Build json representation of the object
-	 * 
-	 * @param with_id Add ID to output
-	 * @return std::string JSON string
-	 */
-	virtual std::string build_json(bool with_id = false) const;
-
-	/// Return true if the user is deafened by the server
-	bool is_deaf() const;
-
-	/// Return true if the user is muted by the server
-	bool is_mute() const;
-
-	/// Return true if user muted themselves
-	bool is_self_mute() const;
-
-	/// Return true if user deafened themselves
-	bool is_self_deaf() const;
-
-	/// Return true if the user is streaming using "Go Live"
-	bool self_stream() const;
-
-	/// Return true if the user's camera is enabled
-	bool self_video() const;
-
-	/// Return true if user is suppressed.
-	/// "HELP HELP I'M BEING SUPPRESSED!"
-	bool is_suppressed() const;
-};
-
-/** A container of voicestates */
-typedef std::unordered_map<std::string, voicestate> voicestate_map;
-
-};
+/************************************************************************************
+ *
+ * D++, A Lightweight C++ library for Discord
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright 2021 Craig Edwards and D++ contributors 
+ * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ************************************************************************************/
+#pragma once
+#include <dpp/export.h>
+#include <dpp/snowflake.h>
+#include <dpp/json_fwd.h>
+#include <unordered_map>
+#include <dpp/json_interface.h>
+
+namespace dpp {
+
+/**
+ * @brief Bit mask flags relating to voice states
+ */
+enum voicestate_flags {
+	/**
+	 * @brief Deafened by the server.
+	 */
+	vs_deaf	= 0b00000001,
+
+	/**
+	 * @brief Muted by the server.
+	 */
+	vs_mute	= 0b00000010,
+
+	/**
+	 * @brief Locally Muted.
+	 */
+	vs_self_mute = 0b00000100,
+
+	/**
+	 * @brief Locally deafened.
+	 */
+	vs_self_deaf = 0b00001000,
+
+	/**
+	 * @brief Whether this user is streaming using "Go Live".
+	 */
+	vs_self_stream = 0b00010000,
+
+	/**
+	 * @brief Whether this user's camera is enabled.
+	 */
+	vs_self_video =	0b00100000,
+
+	/**
+	 * @brief Whether this user's permission to speak is denied.
+	 */
+	vs_suppress = 0b01000000
+};
+
+/**
+ * @brief Represents the voice state of a user on a guild
+ * These are stored in the dpp::guild object, and accessible there,
+ * or via dpp::channel::get_voice_members
+ */
+class DPP_EXPORT voicestate : public json_interface<voicestate> {
+protected:
+	friend struct json_interface<voicestate>;
+
+	/**
+	 * @brief Fill voicestate object from json data
+	 * 
+	 * @param j JSON data to fill from
+	 * @return voicestate& Reference to self
+	 */
+	voicestate& fill_from_json_impl(nlohmann::json* j);
+
+public:
+	/**
+	 * @brief Owning shard.
+	 */
+	int32_t shard_id{0};
+
+	/**
+	 * @brief Optional: The guild id this voice state is for.
+	 */
+	snowflake guild_id{0};
+
+	/**
+	 * @brief The channel id this user is connected to.
+	 *
+	 * @note This may be empty.
+	 */
+	snowflake channel_id{0};
+
+	/**
+	 * @brief The user id this voice state is for.
+	 */
+	snowflake user_id{0};
+
+	/**
+	 * @brief The session id for this voice state.
+	 */
+	std::string session_id;
+
+	/**
+	 * @brief Voice state flags from dpp::voicestate_flags.
+	 */
+	uint8_t	flags{0};
+
+	/**
+	 * @brief The time at which the user requested to speak.
+	 *
+	 * @note If the user never requested to speak, this is 0.
+	 */
+	time_t request_to_speak{0};
+
+	/**
+	 * @brief Construct a new voicestate object
+	 */
+	voicestate();
+
+	/**
+	 * @brief Destroy the voicestate object
+	 */
+	virtual ~voicestate() = default;
+
+	/**
+	 * @brief Return true if the user is deafened by the server.
+	 */
+	bool is_deaf() const;
+
+	/**
+	 * @brief Return true if the user is muted by the server.
+	 */
+	bool is_mute() const;
+
+	/**
+	 * @brief Return true if user muted themselves.
+	 */
+	bool is_self_mute() const;
+
+	/**
+	 * @brief Return true if user deafened themselves.
+	 */
+	bool is_self_deaf() const;
+
+	/**
+	 * @brief Return true if the user is streaming using "Go Live".
+	 */
+	bool self_stream() const;
+
+	/**
+	 * @brief Return true if the user's camera is enabled.
+	 */
+	bool self_video() const;
+
+	/**
+	 * @brief Return true if user is suppressed.
+	 *
+	 * "HELP HELP I'M BEING SUPPRESSED!"
+	 */
+	bool is_suppressed() const;
+};
+
+/** A container of voicestates */
+typedef std::unordered_map<std::string, voicestate> voicestate_map;
+
+}
diff --git a/3rdParty/dpp/webhook.h b/3rdParty/dpp/webhook.h
index 98fa1767fc..92ca9833f5 100644
--- a/3rdParty/dpp/webhook.h
+++ b/3rdParty/dpp/webhook.h
@@ -1,113 +1,208 @@
-/************************************************************************************
- *
- * D++, A Lightweight C++ library for Discord
- *
- * Copyright 2021 Craig Edwards and D++ contributors 
- * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- ************************************************************************************/
-#pragma once
-#include <dpp/export.h>
-#include <dpp/snowflake.h>
-#include <dpp/misc-enum.h>
-#include <dpp/managed.h>
-#include <dpp/nlohmann/json_fwd.hpp>
-#include <unordered_map>
-#include <dpp/json_interface.h>
-
-namespace dpp {
-
-/**
- * @brief Defines types of webhook
- */
-enum webhook_type {
-	w_incoming = 1,		//!< Incoming webhook
-	w_channel_follower = 2	//!< Channel following webhook
-};
-
-/**
- * @brief Represents a discord webhook
- */
-class DPP_EXPORT webhook : public managed, public json_interface<webhook>  {
-public:
-	uint8_t type;   		//!< the type of the webhook
-	snowflake guild_id;     	//!< Optional: the guild id this webhook is for
-	snowflake channel_id;   	//!< the channel id this webhook is for
-	snowflake user_id;		//!< Optional: the user this webhook was created by (not returned when getting a webhook with its token)
-	std::string name;		//!< the default name of the webhook (may be empty)
-	std::string avatar;		//!< the default avatar of the webhook (may be empty)
-	std::string token;		//!< Optional: the secure token of the webhook (returned for Incoming Webhooks)
-	snowflake application_id;	//!< the bot/OAuth2 application that created this webhook (may be empty)
-	std::string* image_data;	//!< base64 encoded image data if uploading a new image
-
-	/**
-	 * @brief Construct a new webhook object
-	 */
-	webhook();
-
-	/**
-	 * @brief Construct a new webhook object using the Webhook URL provided by Discord
-	 *
-	 * @param webhook_url a fully qualified web address of an existing webhook
-	 */
-	webhook(const std::string& webhook_url);
-
-	/**
-	 * @brief Construct a new webhook object using the webhook ID and the webhook token
-	 *
-	 * @param webhook_id id taken from a link of an existing webhook
-	 * @param webhook_token token taken from a link of an existing webhook
-	 */
-	webhook(const snowflake webhook_id, const std::string& webhook_token);
-
-	/**
-	 * @brief Destroy the webhook object
-	 */
-	~webhook();
-
-	/**
-	 * @brief Fill in object from json data
-	 * 
-	 * @param j JSON data
-	 * @return webhook& Reference to self
-	 */
-	 webhook& fill_from_json(nlohmann::json* j);
-
-	/**
-	 * @brief Build JSON string from object
-	 * 
-	 * @param with_id Include the ID of the webhook in the json
-	 * @return std::string JSON encoded object
-	 */
-	virtual std::string build_json(bool with_id = false) const;
-
-	/**
-	 * @brief Base64 encode image data and allocate it to image_data
-	 * 
-	 * @param image_blob Binary image data
-	 * @param type Image type
-	 * @param is_base64_encoded True if the image data is already base64 encoded
-	 * @return webhook& Reference to self
-	 * @throw dpp::exception Image data is larger than the maximum size of 256 kilobytes
-	 */
-	webhook& load_image(const std::string &image_blob, const image_type type, bool is_base64_encoded = false);
-};
-
-/**
- * @brief A group of webhooks
- */
-typedef std::unordered_map<snowflake, webhook> webhook_map;
-
-};
+/************************************************************************************
+ *
+ * D++, A Lightweight C++ library for Discord
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright 2021 Craig Edwards and D++ contributors 
+ * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ************************************************************************************/
+#pragma once
+#include <dpp/export.h>
+#include <dpp/snowflake.h>
+#include <dpp/misc-enum.h>
+#include <dpp/managed.h>
+#include <dpp/json_fwd.h>
+#include <dpp/user.h>
+#include <dpp/guild.h>
+#include <dpp/channel.h>
+#include <unordered_map>
+#include <dpp/json_interface.h>
+
+namespace dpp {
+
+/**
+ * @brief Defines types of webhook
+ */
+enum webhook_type {
+	/**
+	 * @brief Incoming webhook.
+	 */
+	w_incoming = 1,
+
+	/**
+	 * @brief Channel following webhook.
+	 */
+	w_channel_follower = 2,
+
+	/**
+	 * @brief Application webhooks for interactions.
+	 */
+	w_application = 3
+};
+
+/**
+ * @brief Represents a discord webhook
+ */
+class DPP_EXPORT webhook : public managed, public json_interface<webhook> {
+protected:
+	friend struct json_interface<webhook>;
+
+	/**
+	 * @brief Fill in object from json data
+	 * 
+	 * @param j JSON data
+	 * @return webhook& Reference to self
+	 */
+	webhook& fill_from_json_impl(nlohmann::json* j);
+
+	/**
+	 * @brief Build JSON string from object
+	 * 
+	 * @param with_id Include the ID of the webhook in the json
+	 * @return std::string JSON encoded object
+	 */
+	virtual json to_json_impl(bool with_id = false) const;
+
+public:
+	/**
+	 * @brief Type of the webhook from dpp::webhook_type.
+	 */
+	uint8_t type;
+
+	/**
+	 * @brief The guild id this webhook is for.
+	 *
+	 * @note This field is optional, and may also be empty.
+	 */
+	snowflake guild_id;
+
+	/**
+	 * @brief The channel id this webhook is for.
+	 *
+	 * @note This may be empty.
+	 */
+	snowflake channel_id;
+
+	/**
+	 * @brief The user this webhook was created by.
+	 *
+	 * @note This field is optional.
+	 * @warning This is not returned when getting a webhook with its token!
+	 */
+	user user_obj;
+
+	/**
+	 * @brief The default name of the webhook.
+	 *
+	 * @note This may be empty.
+	 */
+	std::string name;
+
+	/**
+	 * @brief The default avatar of the webhook.
+	 *
+	 * @note This value will not have any effect when `avatar_url` is set, they are mutually exclusive.
+	 * @note This may be empty.
+	 */
+	utility::iconhash avatar;
+
+	/**
+	 * @brief Avatar URL to use instead of the default if it is set.
+	 *
+	 * @note This will override `avatar` if it is set, they are mutually exclusive.
+	 * @note This may be empty.
+	 */
+	std::string avatar_url;
+
+	/**
+	 * @brief The secure token of the webhook (returned for Incoming Webhooks).
+	 *
+	 * @note This field is optional.
+	 */
+	std::string token;
+
+	/**
+	 * @brief The bot/OAuth2 application that created this webhook.
+	 *
+	 * @note This may be empty.
+	 */
+	snowflake application_id;
+
+	/**
+	 * @brief The guild of the channel that this webhook is following (only for Channel Follower Webhooks).
+	 *
+	 * @warning This will be absent if the webhook creator has since lost access to the guild where the followed channel resides!
+	 */
+	guild source_guild;
+
+	/**
+	 * @brief The channel that this webhook is following (only for Channel Follower Webhooks).
+	 *
+	 * @warning This will be absent if the webhook creator has since lost access to the guild where the followed channel resides!
+	 */
+	channel	source_channel;
+
+	/**
+	 * @brief The url used for executing the webhook (returned by the webhooks OAuth2 flow).
+	 */
+	std::string url;
+
+	/**
+	 * @brief base64 encoded image data if uploading a new image.
+	 *
+	 * @warning You should only ever read data from here. If you want to set the data, use dpp::webhook::load_image.
+	 */
+	std::string image_data;
+
+	/**
+	 * @brief Construct a new webhook object
+	 */
+	webhook();
+
+	/**
+	 * @brief Construct a new webhook object using the Webhook URL provided by Discord
+	 *
+	 * @param webhook_url a fully qualified web address of an existing webhook
+	 * @throw logic_exception if the webhook url could not be parsed
+	 */
+	webhook(const std::string& webhook_url);
+
+	/**
+	 * @brief Construct a new webhook object using the webhook ID and the webhook token
+	 *
+	 * @param webhook_id id taken from a link of an existing webhook
+	 * @param webhook_token token taken from a link of an existing webhook
+	 */
+	webhook(const snowflake webhook_id, const std::string& webhook_token);
+
+	/**
+	 * @brief Base64 encode image data and allocate it to image_data
+	 * 
+	 * @param image_blob Binary image data
+	 * @param type Image type. It can be one of `i_gif`, `i_jpg` or `i_png`.
+	 * @param is_base64_encoded True if the image data is already base64 encoded
+	 * @return webhook& Reference to self
+	 * @throw dpp::length_exception Image data is larger than the maximum size of 256 kilobytes
+	 */
+	webhook& load_image(const std::string &image_blob, const image_type type, bool is_base64_encoded = false);
+};
+
+/**
+ * @brief A group of webhooks
+ */
+typedef std::unordered_map<snowflake, webhook> webhook_map;
+
+}
diff --git a/3rdParty/dpp/win32_safe_warnings.h b/3rdParty/dpp/win32_safe_warnings.h
index 104b6660bb..2ab24d2bd5 100644
--- a/3rdParty/dpp/win32_safe_warnings.h
+++ b/3rdParty/dpp/win32_safe_warnings.h
@@ -1,32 +1,33 @@
-/************************************************************************************
- *
- * D++, A Lightweight C++ library for Discord
- *
- * Copyright 2021 Craig Edwards and D++ contributors 
- * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- ************************************************************************************/
-#pragma once
-
-/* This file contains pragmas to disable warnings on win32 builds with msvc only.
- * It is only included during build of D++ itself, and not when including the headers
- * into a user's project.
- * 
- * Before adding a warning here please be ABSOLUTELY SURE it is one we cannot easily fix
- * and is to be silenced, thrown into the sarlacc pit to be eaten for 1000 years...
- */
-
-_Pragma("warning( disable : 4251 )"); // 4251 warns when we export classes or structures with stl member variables
-_Pragma("warning( disable : 5105 )"); // 5105 is to do with macro warnings
+/************************************************************************************
+ *
+ * D++, A Lightweight C++ library for Discord
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright 2021 Craig Edwards and D++ contributors 
+ * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ************************************************************************************/
+#pragma once
+
+/* This file contains pragmas to disable warnings on win32 builds with msvc only.
+ * It is only included during build of D++ itself, and not when including the headers
+ * into a user's project.
+ * 
+ * Before adding a warning here please be ABSOLUTELY SURE it is one we cannot easily fix
+ * and is to be silenced, thrown into the sarlacc pit to be eaten for 1000 years...
+ */
+
+_Pragma("warning( disable : 4251 )"); // 4251 warns when we export classes or structures with stl member variables
+_Pragma("warning( disable : 5105 )"); // 5105 is to do with macro warnings
diff --git a/3rdParty/dpp/wrapped_ssl_ctx.h b/3rdParty/dpp/wrapped_ssl_ctx.h
new file mode 100644
index 0000000000..e7a38ac494
--- /dev/null
+++ b/3rdParty/dpp/wrapped_ssl_ctx.h
@@ -0,0 +1,106 @@
+/************************************************************************************
+ *
+ * D++, A Lightweight C++ library for Discord
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright 2021 Craig Edwards and D++ contributors
+ * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ************************************************************************************/
+#include <dpp/exception.h>
+#include <openssl/ssl.h>
+#include <openssl/err.h>
+#include <string>
+#pragma once
+
+namespace dpp::detail {
+
+/**
+ * @brief This class wraps a raw SSL_CTX pointer, managing moving,
+ * creation, and RAII destruction.
+ */
+struct wrapped_ssl_ctx {
+
+	/**
+	 * @brief SSL_CTX pointer, raw C pointer nastiness
+	 */
+	SSL_CTX *context{nullptr};
+
+	/**
+	 * @brief Get last SSL error message
+	 * @return SSL error message
+	 */
+	std::string get_ssl_error() {
+		unsigned long error_code = ERR_get_error();
+		if (error_code == 0) {
+			return "No error";
+		}
+		char error_buffer[1024]{0};
+		ERR_error_string_n(error_code, error_buffer, sizeof(error_buffer));
+		return std::string(error_buffer);
+	}
+
+	/**
+	 * @brief Create a wrapped SSL context
+	 * @param is_server true to create a server context, false to create a client context
+	 * @throws dpp::connection_exception if context could not be created
+	 */
+	explicit wrapped_ssl_ctx(bool is_server = false) : context(SSL_CTX_new(is_server ? TLS_server_method() : TLS_client_method())) {
+		if (context == nullptr) {
+			throw dpp::connection_exception(err_ssl_context, "Failed to create SSL client context: " + get_ssl_error());
+		}
+	}
+
+	/**
+	 * @brief Copy constructor
+	 * @note Intentionally deleted
+	 */
+	wrapped_ssl_ctx(const wrapped_ssl_ctx&) = delete;
+
+	/**
+	 * @brief Copy assignment operator
+	 * @note Intentionally deleted
+	 */
+	wrapped_ssl_ctx& operator=(const wrapped_ssl_ctx&) = delete;
+
+	/**
+	 * @brief Move constructor
+	 * @param other source context
+	 */
+	wrapped_ssl_ctx(wrapped_ssl_ctx&& other) noexcept : context(other.context) {
+		other.context = nullptr;
+	}
+
+	/**
+	 * @brief Move assignment operator
+	 * @param other source context
+	 * @return self
+	 */
+	wrapped_ssl_ctx& operator=(wrapped_ssl_ctx&& other) noexcept {
+		if (this != &other) {
+			/* Free current context if any and transfer ownership */
+			SSL_CTX_free(context);
+			context = other.context;
+			other.context = nullptr;
+		}
+		return *this;
+	}
+
+	~wrapped_ssl_ctx() {
+		SSL_CTX_free(context);
+	}
+};
+
+};
diff --git a/3rdParty/dpp/wsclient.h b/3rdParty/dpp/wsclient.h
index 6f05840f5c..f1d19a1683 100644
--- a/3rdParty/dpp/wsclient.h
+++ b/3rdParty/dpp/wsclient.h
@@ -1,212 +1,252 @@
-/************************************************************************************
- *
- * D++, A Lightweight C++ library for Discord
- *
- * Copyright 2021 Craig Edwards and D++ contributors 
- * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- ************************************************************************************/
-#pragma once
-#include <dpp/export.h>
-#include <string>
-#include <map>
-#include <vector>
-#include <variant>
-#include <dpp/sslclient.h>
-
-namespace dpp {
-
-/**
- * @brief Websocket protocol types available on Discord
- */
-enum websocket_protocol_t : uint8_t {
-	/**
-	 * @brief JSON data, text, UTF-8 character set
-	 */
-	ws_json = 0,
-	/**
-	 * @brief Erlang Term Format (ETF) binary protocol
-	 */
-	ws_etf = 1
-};
-
-/**
- * @brief Websocket connection status
- */
-enum ws_state : uint8_t {
-	/**
-	 * @brief Sending/receiving HTTP headers, acting as a standard HTTP connection.
-	 * This is the state prior to receiving "HTTP/1.1 101 Switching Protocols" from the
-	 * server side.
-	 */
-	HTTP_HEADERS,
-
-	/**
-	 * @brief Connected as a websocket, and "upgraded". Now talking using binary frames.
-	 */
-	CONNECTED
-};
-
-/**
- * @brief Low-level websocket opcodes for frames
- */
-enum ws_opcode : uint8_t
-{
-        OP_CONTINUATION = 0x00,	//!< Continuation
-        OP_TEXT = 0x01,		//!< Text frame
-        OP_BINARY = 0x02,	//!< Binary frame
-        OP_CLOSE = 0x08,	//!< Close notification with close code
-        OP_PING = 0x09,		//!< Low level ping
-        OP_PONG = 0x0a		//!< Low level pong
-};
-
-/**
- * @brief Implements a websocket client based on the SSL client
- */
-class DPP_EXPORT websocket_client : public ssl_client
-{
-	/**
-	 * @brief Connection key used in the HTTP headers
-	 */
-	std::string key;
-
-	/**
-	 * @brief Current websocket state
-	 */
-	ws_state state;
-
-	/**
-	 * @brief Path part of URL for websocket
-	 */
-	std::string path;
-
-	/**
-	 * @brief Data opcode, represents the type of frames we send
-	 */
-	ws_opcode data_opcode;
-
-	/**
-	 * @brief HTTP headers received on connecting/upgrading
-	 */
-	std::map<std::string, std::string> http_headers;
-
-	/**
-	 * @brief Parse headers for a websocket frame from the buffer.
-	 * @param buffer The buffer to operate on. Will modify the string removing completed items from the head of the queue
-	 * @return true if a complete header has been received
-	 */
-	bool parseheader(std::string &buffer);
-
-	/**
-	 * @brief Unpack a frame and pass completed frames up the stack.
-	 * @param buffer The buffer to operate on. Gets modified to remove completed frames on the head of the buffer
-	 * @param offset The offset to start at (reserved for future use)
-	 * @param first True if is the first element (reserved for future use)
-	 * @return true if a complete frame has been received
-	 */
-	bool unpack(std::string &buffer, uint32_t offset, bool first = true);
-
-	/**
-	 * @brief Fill a header for outbound messages
-	 * @param outbuf The raw frame to fill
-	 * @param sendlength The size of the data to encapsulate
-	 * @param opcode the ws_opcode to send in the header
-	 * @return size of filled header
-	 */
-	size_t fill_header(unsigned char* outbuf, size_t sendlength, ws_opcode opcode);
-
-	/**
-	 * @brief Handle ping and pong requests.
-	 * @param ping True if this is a ping, false if it is a pong 
-	 * @param payload The ping payload, to be returned as-is for a ping
-	 */
-	void handle_ping_pong(bool ping, const std::string &payload);
-
-protected:
-
-	/**
-	 * @brief (Re)connect
-	 */
-	virtual void connect();
-
-	/**
-	 * @brief Get websocket state
-	 * @return websocket state
-	 */
-	ws_state get_state();
-
-public:
-
-	/**
-	 * @brief Connect to a specific websocket server.
-	 * @param hostname Hostname to connect to
-	 * @param port Port to connect to
-	 * @param urlpath The URL path components of the HTTP request to send
-	 * @param opcode The encoding type to use, either OP_BINARY or OP_TEXT
-	 * @note Voice websockets only support OP_TEXT, and other websockets must be
-	 * OP_BINARY if you are going to send ETF.
-	 */
-        websocket_client(const std::string &hostname, const std::string &port = "443", const std::string &urlpath = "", ws_opcode opcode = OP_BINARY);
-
-	/**
-	 * @brief Destroy the websocket client object
-	 */
-        virtual ~websocket_client();
-
-	/**
-	 * @brief Write to websocket. Encapsulates data in frames if the status is CONNECTED.
-	 * @param data The data to send.
-	 */
-        virtual void write(const std::string &data);
-
-	/**
-	 * @brief Processes incoming frames from the SSL socket input buffer.
-	 * @param buffer The buffer contents. Can modify this value removing the head elements when processed.
-	 */
-        virtual bool handle_buffer(std::string &buffer);
-
-	/**
-	 * @brief Close websocket
-	 */
-        virtual void close();
-
-	/**
-	 * @brief Receives raw frame content only without headers
-	 * 
-	 * @param buffer The buffer contents
-	 * @return True if the frame was successfully handled. False if no valid frame is in the buffer.
-	 */
-	virtual bool handle_frame(const std::string &buffer);
-
-	/**
-	 * @brief Called upon error frame.
-	 * 
-	 * @param errorcode The error code from the websocket server
-	 */
-	virtual void error(uint32_t errorcode);
-
-	/**
-	 * @brief Fires every second from the underlying socket I/O loop, used for sending websocket pings
-	 */
-	virtual void one_second_timer();
-
-	/**
-	 * @brief Send OP_CLOSE error code 1000 to the other side of the connection.
-	 * This indicates graceful close.
-	 */
-	void send_close_packet();
-};
-
-};
\ No newline at end of file
+/************************************************************************************
+ *
+ * D++, A Lightweight C++ library for Discord
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright 2021 Craig Edwards and D++ contributors 
+ * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ************************************************************************************/
+#pragma once
+#include <dpp/export.h>
+#include <string>
+#include <map>
+#include <dpp/sslconnection.h>
+
+namespace dpp {
+
+/**
+ * @brief Websocket protocol types available on Discord
+ */
+enum websocket_protocol_t : uint8_t {
+	/**
+	 * @brief JSON data, text, UTF-8 character set
+	 */
+	ws_json = 0,
+
+	/**
+	 * @brief Erlang Term Format (ETF) binary protocol
+	 */
+	ws_etf = 1
+};
+
+/**
+ * @brief Websocket connection status
+ */
+enum ws_state : uint8_t {
+	/**
+	 * @brief Sending/receiving HTTP headers, acting as a standard HTTP connection.
+	 * This is the state prior to receiving "HTTP/1.1 101 Switching Protocols" from the
+	 * server side.
+	 */
+	HTTP_HEADERS,
+
+	/**
+	 * @brief Connected as a websocket, and "upgraded". Now talking using binary frames.
+	 */
+	CONNECTED
+};
+
+/**
+ * @brief Low-level websocket opcodes for frames
+ */
+enum ws_opcode : uint8_t {
+	/**
+	 * @brief Continuation.
+	 */
+	OP_CONTINUATION = 0x00,
+
+	/**
+	 * @brief Text frame.
+	 */
+	OP_TEXT = 0x01,
+
+	/**
+	 * @brief Binary frame.
+	 */
+	OP_BINARY = 0x02,
+
+	/**
+	 * @brief Close notification with close code.
+	 */
+	OP_CLOSE = 0x08,
+
+	/**
+	 * @brief Low level ping.
+	 */
+	OP_PING = 0x09,
+
+	/**
+	 * @brief Low level pong.
+	 */
+	OP_PONG = 0x0a,
+
+	/**
+	 * @brief Automatic selection of type
+	 */
+	 OP_AUTO = 0xff,
+};
+
+/**
+ * @brief Implements a websocket client based on the SSL client
+ */
+class DPP_EXPORT websocket_client : public ssl_connection {
+	/**
+	 * @brief Connection key used in the HTTP headers
+	 */
+	std::string key;
+
+	/**
+	 * @brief Current websocket state
+	 */
+	ws_state state;
+
+	/**
+	 * @brief Path part of URL for websocket
+	 */
+	std::string path;
+
+	/**
+	 * @brief Data opcode, represents the type of frames we send
+	 */
+	ws_opcode data_opcode;
+
+	/**
+	 * @brief HTTP headers received on connecting/upgrading
+	 */
+	std::map<std::string, std::string> http_headers;
+
+	/**
+	 * @brief Parse headers for a websocket frame from the buffer.
+	 * @param buffer The buffer to operate on. Will modify the string removing completed items from the head of the queue
+	 * @return true if a complete header has been received
+	 */
+	bool parseheader(std::string& buffer);
+
+	/**
+	 * @brief Fill a header for outbound messages
+	 * @param outbuf The raw frame to fill
+	 * @param sendlength The size of the data to encapsulate
+	 * @param opcode the ws_opcode to send in the header
+	 * @return size of filled header
+	 */
+	size_t fill_header(unsigned char* outbuf, size_t sendlength, ws_opcode opcode);
+
+	/**
+	 * @brief Handle ping requests.
+	 * @param payload The ping payload, to be returned as-is for a pong
+	 */
+	void handle_ping(const std::string& payload);
+
+protected:
+
+	/**
+	 * @brief Connect to websocket server
+	 */
+	virtual void connect() override;
+
+	/**
+	 * @brief Get websocket state
+	 * @return websocket state
+	 */
+	[[nodiscard]] ws_state get_state() const;
+
+	/**
+	 * @brief If true the connection timed out while waiting,
+	 * when waiting for SSL negotiation, TCP connect(), or HTTP.
+	 */
+	bool timed_out;
+
+	/**
+	 * @brief Time at which the connection should be abandoned,
+	 * if we are still connecting or negotiating with a HTTP server
+	 */
+	time_t timeout;
+
+public:
+
+	/**
+	 * @brief Connect to a specific websocket server.
+	 * @param creator Creating cluster
+	 * @param hostname Hostname to connect to
+	 * @param port Port to connect to
+	 * @param urlpath The URL path components of the HTTP request to send
+	 * @param opcode The encoding type to use, either OP_BINARY or OP_TEXT
+	 * @note This just indicates the default for frames sent. Certain sockets,
+	 * such as voice websockets, may send a combination of OP_TEXT and OP_BINARY
+	 * frames, whereas shard websockets will only ever send OP_BINARY for ETF and
+	 * OP_TEXT for JSON.
+	 */
+	websocket_client(cluster* creator, const std::string& hostname, const std::string& port = "443", const std::string& urlpath = "", ws_opcode opcode = OP_BINARY);
+
+	/**
+	 * @brief Destroy the websocket client object
+	 */
+	virtual ~websocket_client() = default;
+
+	/**
+	 * @brief Write to websocket. Encapsulates data in frames if the status is CONNECTED.
+	 * @param data The data to send.
+	 * @param _opcode The opcode of the data to send, either binary or text. The default
+	 * is to use the socket's opcode as set in the constructor.
+	 */
+	virtual void write(const std::string_view data, ws_opcode _opcode = OP_AUTO);
+
+	/**
+	 * @brief Processes incoming frames from the SSL socket input buffer.
+	 * @param buffer The buffer contents. Can modify this value removing the head elements when processed.
+	 */
+	virtual bool handle_buffer(std::string& buffer) override;
+
+	/**
+	 * @brief Close websocket
+	 */
+	virtual void close() override;
+
+	/**
+	 * @brief Receives raw frame content only without headers
+	 *
+	 * @param buffer The buffer contents
+	 * @param opcode Frame type, e.g. OP_TEXT, OP_BINARY
+	 * @return True if the frame was successfully handled. False if no valid frame is in the buffer.
+	 */
+	virtual bool handle_frame(const std::string& buffer, ws_opcode opcode);
+
+	/**
+	 * @brief Called upon error frame.
+	 *
+	 * @param errorcode The error code from the websocket server
+	 */
+	virtual void error(uint32_t errorcode);
+
+	/**
+	 * @brief Fires every second from the underlying socket I/O loop, used for sending websocket pings
+	 */
+	virtual void one_second_timer() override;
+
+	/**
+	 * @brief Send OP_CLOSE error code 1000 to the other side of the connection.
+	 * This indicates graceful close.
+	 * @note This informs Discord to invalidate the session, you cannot resume if you send this
+	 */
+	void send_close_packet();
+
+	/**
+	 * @brief Called on HTTP socket closure
+	 */
+	virtual void on_disconnect();
+};
+
+}
diff --git a/3rdParty/dpp/zlibcontext.h b/3rdParty/dpp/zlibcontext.h
new file mode 100644
index 0000000000..58ec39c9c4
--- /dev/null
+++ b/3rdParty/dpp/zlibcontext.h
@@ -0,0 +1,85 @@
+/************************************************************************************
+ *
+ * D++, A Lightweight C++ library for Discord
+ *
+ * Copyright 2021 Craig Edwards and D++ contributors
+ * (https://github.com/brainboxdotcc/DPP/graphs/contributors)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ ************************************************************************************/
+#pragma once
+#include <dpp/export.h>
+#include <dpp/exception.h>
+#include <cstdint>
+#include <vector>
+#include <memory>
+
+/**
+ * @brief Forward declaration for zlib stream type
+ */
+typedef struct z_stream_s z_stream;
+
+namespace dpp {
+
+/**
+ * @brief Size of decompression buffer for zlib compressed traffic
+ */
+constexpr size_t DECOMP_BUFFER_SIZE = 512 * 1024;
+
+/**
+ * @brief This is an opaque class containing zlib library specific structures.
+ * This wraps the C pointers needed for zlib with unique_ptr and gives us a nice
+ * buffer abstraction so we don't need to wrestle with raw pointers.
+ */
+class DPP_EXPORT zlibcontext {
+public:
+	/**
+	 * @brief Zlib stream struct. The actual type is defined in zlib.h
+	 * so is only defined in the implementation file.
+	 */
+	z_stream* d_stream{};
+
+	/**
+	 * @brief ZLib decompression buffer.
+	 * This is automatically set to DECOMP_BUFFER_SIZE bytes when
+	 * the class is constructed.
+	 */
+	std::vector<unsigned char> decomp_buffer{};
+
+	/**
+	 * @brief Total decompressed received bytes counter
+	 */
+	uint64_t decompressed_total{};
+
+	/**
+	 * @brief Initialise zlib struct via inflateInit()
+	 * and size the buffer
+	 */
+	zlibcontext();
+
+	/**
+	 * @brief Destroy zlib struct via inflateEnd()
+	 */
+	~zlibcontext();
+
+	/**
+	 * @brief Decompress zlib deflated buffer
+	 * @param buffer input compressed stream
+	 * @param decompressed output decompressed content
+	 * @return an error code on error, or err_no_code_specified (0) on success
+	 */
+	exception_error_code decompress(const std::string& buffer, std::string& decompressed);
+};
+
+}
\ No newline at end of file
diff --git a/3rdParty/nlohmann/json.hpp b/3rdParty/nlohmann/json.hpp
deleted file mode 100644
index cb27e05811..0000000000
--- a/3rdParty/nlohmann/json.hpp
+++ /dev/null
@@ -1,22091 +0,0 @@
-/*
-    __ _____ _____ _____
- __|  |   __|     |   | |  JSON for Modern C++
-|  |  |__   |  |  | | | |  version 3.10.5
-|_____|_____|_____|_|___|  https://github.com/nlohmann/json
-
-Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-SPDX-License-Identifier: MIT
-Copyright (c) 2013-2022 Niels Lohmann <http://nlohmann.me>.
-
-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.
-*/
-
-/****************************************************************************\
- * Note on documentation: The source files contain links to the online      *
- * documentation of the public API at https://json.nlohmann.me. This URL    *
- * contains the most recent documentation and should also be applicable to  *
- * previous versions; documentation for deprecated functions is not         *
- * removed, but marked deprecated. See "Generate documentation" section in  *
- * file doc/README.md.                                                      *
-\****************************************************************************/
-
-#ifndef INCLUDE_NLOHMANN_JSON_HPP_
-#define INCLUDE_NLOHMANN_JSON_HPP_
-
-#define NLOHMANN_JSON_VERSION_MAJOR 3
-#define NLOHMANN_JSON_VERSION_MINOR 10
-#define NLOHMANN_JSON_VERSION_PATCH 5
-
-#include <algorithm> // all_of, find, for_each
-#include <cstddef> // nullptr_t, ptrdiff_t, size_t
-#include <functional> // hash, less
-#include <initializer_list> // initializer_list
-#ifndef JSON_NO_IO
-    #include <iosfwd> // istream, ostream
-#endif  // JSON_NO_IO
-#include <iterator> // random_access_iterator_tag
-#include <memory> // unique_ptr
-#include <numeric> // accumulate
-#include <string> // string, stoi, to_string
-#include <utility> // declval, forward, move, pair, swap
-#include <vector> // vector
-
-// #include <nlohmann/adl_serializer.hpp>
-
-
-#include <type_traits>
-#include <utility>
-
-// #include <nlohmann/detail/conversions/from_json.hpp>
-
-
-#include <algorithm> // transform
-#include <array> // array
-#include <forward_list> // forward_list
-#include <iterator> // inserter, front_inserter, end
-#include <map> // map
-#include <string> // string
-#include <tuple> // tuple, make_tuple
-#include <type_traits> // is_arithmetic, is_same, is_enum, underlying_type, is_convertible
-#include <unordered_map> // unordered_map
-#include <utility> // pair, declval
-#include <valarray> // valarray
-
-// #include <nlohmann/detail/exceptions.hpp>
-
-
-#include <exception> // exception
-#include <stdexcept> // runtime_error
-#include <string> // to_string
-#include <vector> // vector
-
-// #include <nlohmann/detail/value_t.hpp>
-
-
-#include <array> // array
-#include <cstddef> // size_t
-#include <cstdint> // uint8_t
-#include <string> // string
-
-namespace nlohmann
-{
-namespace detail
-{
-///////////////////////////
-// JSON type enumeration //
-///////////////////////////
-
-/*!
-@brief the JSON type enumeration
-
-This enumeration collects the different JSON types. It is internally used to
-distinguish the stored values, and the functions @ref basic_json::is_null(),
-@ref basic_json::is_object(), @ref basic_json::is_array(),
-@ref basic_json::is_string(), @ref basic_json::is_boolean(),
-@ref basic_json::is_number() (with @ref basic_json::is_number_integer(),
-@ref basic_json::is_number_unsigned(), and @ref basic_json::is_number_float()),
-@ref basic_json::is_discarded(), @ref basic_json::is_primitive(), and
-@ref basic_json::is_structured() rely on it.
-
-@note There are three enumeration entries (number_integer, number_unsigned, and
-number_float), because the library distinguishes these three types for numbers:
-@ref basic_json::number_unsigned_t is used for unsigned integers,
-@ref basic_json::number_integer_t is used for signed integers, and
-@ref basic_json::number_float_t is used for floating-point numbers or to
-approximate integers which do not fit in the limits of their respective type.
-
-@sa see @ref basic_json::basic_json(const value_t value_type) -- create a JSON
-value with the default value for a given type
-
-@since version 1.0.0
-*/
-enum class value_t : std::uint8_t
-{
-    null,             ///< null value
-    object,           ///< object (unordered set of name/value pairs)
-    array,            ///< array (ordered collection of values)
-    string,           ///< string value
-    boolean,          ///< boolean value
-    number_integer,   ///< number value (signed integer)
-    number_unsigned,  ///< number value (unsigned integer)
-    number_float,     ///< number value (floating-point)
-    binary,           ///< binary array (ordered collection of bytes)
-    discarded         ///< discarded by the parser callback function
-};
-
-/*!
-@brief comparison operator for JSON types
-
-Returns an ordering that is similar to Python:
-- order: null < boolean < number < object < array < string < binary
-- furthermore, each type is not smaller than itself
-- discarded values are not comparable
-- binary is represented as a b"" string in python and directly comparable to a
-  string; however, making a binary array directly comparable with a string would
-  be surprising behavior in a JSON file.
-
-@since version 1.0.0
-*/
-inline bool operator<(const value_t lhs, const value_t rhs) noexcept
-{
-    static constexpr std::array<std::uint8_t, 9> order = {{
-            0 /* null */, 3 /* object */, 4 /* array */, 5 /* string */,
-            1 /* boolean */, 2 /* integer */, 2 /* unsigned */, 2 /* float */,
-            6 /* binary */
-        }
-    };
-
-    const auto l_index = static_cast<std::size_t>(lhs);
-    const auto r_index = static_cast<std::size_t>(rhs);
-    return l_index < order.size() && r_index < order.size() && order[l_index] < order[r_index];
-}
-}  // namespace detail
-}  // namespace nlohmann
-
-// #include <nlohmann/detail/string_escape.hpp>
-
-
-#include <string>
-// #include <nlohmann/detail/macro_scope.hpp>
-
-
-#include <utility> // declval, pair
-// #include <nlohmann/thirdparty/hedley/hedley.hpp>
-
-
-/* Hedley - https://nemequ.github.io/hedley
- * Created by Evan Nemerson <evan@nemerson.com>
- *
- * To the extent possible under law, the author(s) have dedicated all
- * copyright and related and neighboring rights to this software to
- * the public domain worldwide. This software is distributed without
- * any warranty.
- *
- * For details, see <http://creativecommons.org/publicdomain/zero/1.0/>.
- * SPDX-License-Identifier: CC0-1.0
- */
-
-#if !defined(JSON_HEDLEY_VERSION) || (JSON_HEDLEY_VERSION < 15)
-#if defined(JSON_HEDLEY_VERSION)
-    #undef JSON_HEDLEY_VERSION
-#endif
-#define JSON_HEDLEY_VERSION 15
-
-#if defined(JSON_HEDLEY_STRINGIFY_EX)
-    #undef JSON_HEDLEY_STRINGIFY_EX
-#endif
-#define JSON_HEDLEY_STRINGIFY_EX(x) #x
-
-#if defined(JSON_HEDLEY_STRINGIFY)
-    #undef JSON_HEDLEY_STRINGIFY
-#endif
-#define JSON_HEDLEY_STRINGIFY(x) JSON_HEDLEY_STRINGIFY_EX(x)
-
-#if defined(JSON_HEDLEY_CONCAT_EX)
-    #undef JSON_HEDLEY_CONCAT_EX
-#endif
-#define JSON_HEDLEY_CONCAT_EX(a,b) a##b
-
-#if defined(JSON_HEDLEY_CONCAT)
-    #undef JSON_HEDLEY_CONCAT
-#endif
-#define JSON_HEDLEY_CONCAT(a,b) JSON_HEDLEY_CONCAT_EX(a,b)
-
-#if defined(JSON_HEDLEY_CONCAT3_EX)
-    #undef JSON_HEDLEY_CONCAT3_EX
-#endif
-#define JSON_HEDLEY_CONCAT3_EX(a,b,c) a##b##c
-
-#if defined(JSON_HEDLEY_CONCAT3)
-    #undef JSON_HEDLEY_CONCAT3
-#endif
-#define JSON_HEDLEY_CONCAT3(a,b,c) JSON_HEDLEY_CONCAT3_EX(a,b,c)
-
-#if defined(JSON_HEDLEY_VERSION_ENCODE)
-    #undef JSON_HEDLEY_VERSION_ENCODE
-#endif
-#define JSON_HEDLEY_VERSION_ENCODE(major,minor,revision) (((major) * 1000000) + ((minor) * 1000) + (revision))
-
-#if defined(JSON_HEDLEY_VERSION_DECODE_MAJOR)
-    #undef JSON_HEDLEY_VERSION_DECODE_MAJOR
-#endif
-#define JSON_HEDLEY_VERSION_DECODE_MAJOR(version) ((version) / 1000000)
-
-#if defined(JSON_HEDLEY_VERSION_DECODE_MINOR)
-    #undef JSON_HEDLEY_VERSION_DECODE_MINOR
-#endif
-#define JSON_HEDLEY_VERSION_DECODE_MINOR(version) (((version) % 1000000) / 1000)
-
-#if defined(JSON_HEDLEY_VERSION_DECODE_REVISION)
-    #undef JSON_HEDLEY_VERSION_DECODE_REVISION
-#endif
-#define JSON_HEDLEY_VERSION_DECODE_REVISION(version) ((version) % 1000)
-
-#if defined(JSON_HEDLEY_GNUC_VERSION)
-    #undef JSON_HEDLEY_GNUC_VERSION
-#endif
-#if defined(__GNUC__) && defined(__GNUC_PATCHLEVEL__)
-    #define JSON_HEDLEY_GNUC_VERSION JSON_HEDLEY_VERSION_ENCODE(__GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__)
-#elif defined(__GNUC__)
-    #define JSON_HEDLEY_GNUC_VERSION JSON_HEDLEY_VERSION_ENCODE(__GNUC__, __GNUC_MINOR__, 0)
-#endif
-
-#if defined(JSON_HEDLEY_GNUC_VERSION_CHECK)
-    #undef JSON_HEDLEY_GNUC_VERSION_CHECK
-#endif
-#if defined(JSON_HEDLEY_GNUC_VERSION)
-    #define JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_GNUC_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
-#else
-    #define JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch) (0)
-#endif
-
-#if defined(JSON_HEDLEY_MSVC_VERSION)
-    #undef JSON_HEDLEY_MSVC_VERSION
-#endif
-#if defined(_MSC_FULL_VER) && (_MSC_FULL_VER >= 140000000) && !defined(__ICL)
-    #define JSON_HEDLEY_MSVC_VERSION JSON_HEDLEY_VERSION_ENCODE(_MSC_FULL_VER / 10000000, (_MSC_FULL_VER % 10000000) / 100000, (_MSC_FULL_VER % 100000) / 100)
-#elif defined(_MSC_FULL_VER) && !defined(__ICL)
-    #define JSON_HEDLEY_MSVC_VERSION JSON_HEDLEY_VERSION_ENCODE(_MSC_FULL_VER / 1000000, (_MSC_FULL_VER % 1000000) / 10000, (_MSC_FULL_VER % 10000) / 10)
-#elif defined(_MSC_VER) && !defined(__ICL)
-    #define JSON_HEDLEY_MSVC_VERSION JSON_HEDLEY_VERSION_ENCODE(_MSC_VER / 100, _MSC_VER % 100, 0)
-#endif
-
-#if defined(JSON_HEDLEY_MSVC_VERSION_CHECK)
-    #undef JSON_HEDLEY_MSVC_VERSION_CHECK
-#endif
-#if !defined(JSON_HEDLEY_MSVC_VERSION)
-    #define JSON_HEDLEY_MSVC_VERSION_CHECK(major,minor,patch) (0)
-#elif defined(_MSC_VER) && (_MSC_VER >= 1400)
-    #define JSON_HEDLEY_MSVC_VERSION_CHECK(major,minor,patch) (_MSC_FULL_VER >= ((major * 10000000) + (minor * 100000) + (patch)))
-#elif defined(_MSC_VER) && (_MSC_VER >= 1200)
-    #define JSON_HEDLEY_MSVC_VERSION_CHECK(major,minor,patch) (_MSC_FULL_VER >= ((major * 1000000) + (minor * 10000) + (patch)))
-#else
-    #define JSON_HEDLEY_MSVC_VERSION_CHECK(major,minor,patch) (_MSC_VER >= ((major * 100) + (minor)))
-#endif
-
-#if defined(JSON_HEDLEY_INTEL_VERSION)
-    #undef JSON_HEDLEY_INTEL_VERSION
-#endif
-#if defined(__INTEL_COMPILER) && defined(__INTEL_COMPILER_UPDATE) && !defined(__ICL)
-    #define JSON_HEDLEY_INTEL_VERSION JSON_HEDLEY_VERSION_ENCODE(__INTEL_COMPILER / 100, __INTEL_COMPILER % 100, __INTEL_COMPILER_UPDATE)
-#elif defined(__INTEL_COMPILER) && !defined(__ICL)
-    #define JSON_HEDLEY_INTEL_VERSION JSON_HEDLEY_VERSION_ENCODE(__INTEL_COMPILER / 100, __INTEL_COMPILER % 100, 0)
-#endif
-
-#if defined(JSON_HEDLEY_INTEL_VERSION_CHECK)
-    #undef JSON_HEDLEY_INTEL_VERSION_CHECK
-#endif
-#if defined(JSON_HEDLEY_INTEL_VERSION)
-    #define JSON_HEDLEY_INTEL_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_INTEL_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
-#else
-    #define JSON_HEDLEY_INTEL_VERSION_CHECK(major,minor,patch) (0)
-#endif
-
-#if defined(JSON_HEDLEY_INTEL_CL_VERSION)
-    #undef JSON_HEDLEY_INTEL_CL_VERSION
-#endif
-#if defined(__INTEL_COMPILER) && defined(__INTEL_COMPILER_UPDATE) && defined(__ICL)
-    #define JSON_HEDLEY_INTEL_CL_VERSION JSON_HEDLEY_VERSION_ENCODE(__INTEL_COMPILER, __INTEL_COMPILER_UPDATE, 0)
-#endif
-
-#if defined(JSON_HEDLEY_INTEL_CL_VERSION_CHECK)
-    #undef JSON_HEDLEY_INTEL_CL_VERSION_CHECK
-#endif
-#if defined(JSON_HEDLEY_INTEL_CL_VERSION)
-    #define JSON_HEDLEY_INTEL_CL_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_INTEL_CL_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
-#else
-    #define JSON_HEDLEY_INTEL_CL_VERSION_CHECK(major,minor,patch) (0)
-#endif
-
-#if defined(JSON_HEDLEY_PGI_VERSION)
-    #undef JSON_HEDLEY_PGI_VERSION
-#endif
-#if defined(__PGI) && defined(__PGIC__) && defined(__PGIC_MINOR__) && defined(__PGIC_PATCHLEVEL__)
-    #define JSON_HEDLEY_PGI_VERSION JSON_HEDLEY_VERSION_ENCODE(__PGIC__, __PGIC_MINOR__, __PGIC_PATCHLEVEL__)
-#endif
-
-#if defined(JSON_HEDLEY_PGI_VERSION_CHECK)
-    #undef JSON_HEDLEY_PGI_VERSION_CHECK
-#endif
-#if defined(JSON_HEDLEY_PGI_VERSION)
-    #define JSON_HEDLEY_PGI_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_PGI_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
-#else
-    #define JSON_HEDLEY_PGI_VERSION_CHECK(major,minor,patch) (0)
-#endif
-
-#if defined(JSON_HEDLEY_SUNPRO_VERSION)
-    #undef JSON_HEDLEY_SUNPRO_VERSION
-#endif
-#if defined(__SUNPRO_C) && (__SUNPRO_C > 0x1000)
-    #define JSON_HEDLEY_SUNPRO_VERSION JSON_HEDLEY_VERSION_ENCODE((((__SUNPRO_C >> 16) & 0xf) * 10) + ((__SUNPRO_C >> 12) & 0xf), (((__SUNPRO_C >> 8) & 0xf) * 10) + ((__SUNPRO_C >> 4) & 0xf), (__SUNPRO_C & 0xf) * 10)
-#elif defined(__SUNPRO_C)
-    #define JSON_HEDLEY_SUNPRO_VERSION JSON_HEDLEY_VERSION_ENCODE((__SUNPRO_C >> 8) & 0xf, (__SUNPRO_C >> 4) & 0xf, (__SUNPRO_C) & 0xf)
-#elif defined(__SUNPRO_CC) && (__SUNPRO_CC > 0x1000)
-    #define JSON_HEDLEY_SUNPRO_VERSION JSON_HEDLEY_VERSION_ENCODE((((__SUNPRO_CC >> 16) & 0xf) * 10) + ((__SUNPRO_CC >> 12) & 0xf), (((__SUNPRO_CC >> 8) & 0xf) * 10) + ((__SUNPRO_CC >> 4) & 0xf), (__SUNPRO_CC & 0xf) * 10)
-#elif defined(__SUNPRO_CC)
-    #define JSON_HEDLEY_SUNPRO_VERSION JSON_HEDLEY_VERSION_ENCODE((__SUNPRO_CC >> 8) & 0xf, (__SUNPRO_CC >> 4) & 0xf, (__SUNPRO_CC) & 0xf)
-#endif
-
-#if defined(JSON_HEDLEY_SUNPRO_VERSION_CHECK)
-    #undef JSON_HEDLEY_SUNPRO_VERSION_CHECK
-#endif
-#if defined(JSON_HEDLEY_SUNPRO_VERSION)
-    #define JSON_HEDLEY_SUNPRO_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_SUNPRO_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
-#else
-    #define JSON_HEDLEY_SUNPRO_VERSION_CHECK(major,minor,patch) (0)
-#endif
-
-#if defined(JSON_HEDLEY_EMSCRIPTEN_VERSION)
-    #undef JSON_HEDLEY_EMSCRIPTEN_VERSION
-#endif
-#if defined(__EMSCRIPTEN__)
-    #define JSON_HEDLEY_EMSCRIPTEN_VERSION JSON_HEDLEY_VERSION_ENCODE(__EMSCRIPTEN_major__, __EMSCRIPTEN_minor__, __EMSCRIPTEN_tiny__)
-#endif
-
-#if defined(JSON_HEDLEY_EMSCRIPTEN_VERSION_CHECK)
-    #undef JSON_HEDLEY_EMSCRIPTEN_VERSION_CHECK
-#endif
-#if defined(JSON_HEDLEY_EMSCRIPTEN_VERSION)
-    #define JSON_HEDLEY_EMSCRIPTEN_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_EMSCRIPTEN_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
-#else
-    #define JSON_HEDLEY_EMSCRIPTEN_VERSION_CHECK(major,minor,patch) (0)
-#endif
-
-#if defined(JSON_HEDLEY_ARM_VERSION)
-    #undef JSON_HEDLEY_ARM_VERSION
-#endif
-#if defined(__CC_ARM) && defined(__ARMCOMPILER_VERSION)
-    #define JSON_HEDLEY_ARM_VERSION JSON_HEDLEY_VERSION_ENCODE(__ARMCOMPILER_VERSION / 1000000, (__ARMCOMPILER_VERSION % 1000000) / 10000, (__ARMCOMPILER_VERSION % 10000) / 100)
-#elif defined(__CC_ARM) && defined(__ARMCC_VERSION)
-    #define JSON_HEDLEY_ARM_VERSION JSON_HEDLEY_VERSION_ENCODE(__ARMCC_VERSION / 1000000, (__ARMCC_VERSION % 1000000) / 10000, (__ARMCC_VERSION % 10000) / 100)
-#endif
-
-#if defined(JSON_HEDLEY_ARM_VERSION_CHECK)
-    #undef JSON_HEDLEY_ARM_VERSION_CHECK
-#endif
-#if defined(JSON_HEDLEY_ARM_VERSION)
-    #define JSON_HEDLEY_ARM_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_ARM_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
-#else
-    #define JSON_HEDLEY_ARM_VERSION_CHECK(major,minor,patch) (0)
-#endif
-
-#if defined(JSON_HEDLEY_IBM_VERSION)
-    #undef JSON_HEDLEY_IBM_VERSION
-#endif
-#if defined(__ibmxl__)
-    #define JSON_HEDLEY_IBM_VERSION JSON_HEDLEY_VERSION_ENCODE(__ibmxl_version__, __ibmxl_release__, __ibmxl_modification__)
-#elif defined(__xlC__) && defined(__xlC_ver__)
-    #define JSON_HEDLEY_IBM_VERSION JSON_HEDLEY_VERSION_ENCODE(__xlC__ >> 8, __xlC__ & 0xff, (__xlC_ver__ >> 8) & 0xff)
-#elif defined(__xlC__)
-    #define JSON_HEDLEY_IBM_VERSION JSON_HEDLEY_VERSION_ENCODE(__xlC__ >> 8, __xlC__ & 0xff, 0)
-#endif
-
-#if defined(JSON_HEDLEY_IBM_VERSION_CHECK)
-    #undef JSON_HEDLEY_IBM_VERSION_CHECK
-#endif
-#if defined(JSON_HEDLEY_IBM_VERSION)
-    #define JSON_HEDLEY_IBM_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_IBM_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
-#else
-    #define JSON_HEDLEY_IBM_VERSION_CHECK(major,minor,patch) (0)
-#endif
-
-#if defined(JSON_HEDLEY_TI_VERSION)
-    #undef JSON_HEDLEY_TI_VERSION
-#endif
-#if \
-    defined(__TI_COMPILER_VERSION__) && \
-    ( \
-      defined(__TMS470__) || defined(__TI_ARM__) || \
-      defined(__MSP430__) || \
-      defined(__TMS320C2000__) \
-    )
-#if (__TI_COMPILER_VERSION__ >= 16000000)
-    #define JSON_HEDLEY_TI_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000))
-#endif
-#endif
-
-#if defined(JSON_HEDLEY_TI_VERSION_CHECK)
-    #undef JSON_HEDLEY_TI_VERSION_CHECK
-#endif
-#if defined(JSON_HEDLEY_TI_VERSION)
-    #define JSON_HEDLEY_TI_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
-#else
-    #define JSON_HEDLEY_TI_VERSION_CHECK(major,minor,patch) (0)
-#endif
-
-#if defined(JSON_HEDLEY_TI_CL2000_VERSION)
-    #undef JSON_HEDLEY_TI_CL2000_VERSION
-#endif
-#if defined(__TI_COMPILER_VERSION__) && defined(__TMS320C2000__)
-    #define JSON_HEDLEY_TI_CL2000_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000))
-#endif
-
-#if defined(JSON_HEDLEY_TI_CL2000_VERSION_CHECK)
-    #undef JSON_HEDLEY_TI_CL2000_VERSION_CHECK
-#endif
-#if defined(JSON_HEDLEY_TI_CL2000_VERSION)
-    #define JSON_HEDLEY_TI_CL2000_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_CL2000_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
-#else
-    #define JSON_HEDLEY_TI_CL2000_VERSION_CHECK(major,minor,patch) (0)
-#endif
-
-#if defined(JSON_HEDLEY_TI_CL430_VERSION)
-    #undef JSON_HEDLEY_TI_CL430_VERSION
-#endif
-#if defined(__TI_COMPILER_VERSION__) && defined(__MSP430__)
-    #define JSON_HEDLEY_TI_CL430_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000))
-#endif
-
-#if defined(JSON_HEDLEY_TI_CL430_VERSION_CHECK)
-    #undef JSON_HEDLEY_TI_CL430_VERSION_CHECK
-#endif
-#if defined(JSON_HEDLEY_TI_CL430_VERSION)
-    #define JSON_HEDLEY_TI_CL430_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_CL430_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
-#else
-    #define JSON_HEDLEY_TI_CL430_VERSION_CHECK(major,minor,patch) (0)
-#endif
-
-#if defined(JSON_HEDLEY_TI_ARMCL_VERSION)
-    #undef JSON_HEDLEY_TI_ARMCL_VERSION
-#endif
-#if defined(__TI_COMPILER_VERSION__) && (defined(__TMS470__) || defined(__TI_ARM__))
-    #define JSON_HEDLEY_TI_ARMCL_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000))
-#endif
-
-#if defined(JSON_HEDLEY_TI_ARMCL_VERSION_CHECK)
-    #undef JSON_HEDLEY_TI_ARMCL_VERSION_CHECK
-#endif
-#if defined(JSON_HEDLEY_TI_ARMCL_VERSION)
-    #define JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_ARMCL_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
-#else
-    #define JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(major,minor,patch) (0)
-#endif
-
-#if defined(JSON_HEDLEY_TI_CL6X_VERSION)
-    #undef JSON_HEDLEY_TI_CL6X_VERSION
-#endif
-#if defined(__TI_COMPILER_VERSION__) && defined(__TMS320C6X__)
-    #define JSON_HEDLEY_TI_CL6X_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000))
-#endif
-
-#if defined(JSON_HEDLEY_TI_CL6X_VERSION_CHECK)
-    #undef JSON_HEDLEY_TI_CL6X_VERSION_CHECK
-#endif
-#if defined(JSON_HEDLEY_TI_CL6X_VERSION)
-    #define JSON_HEDLEY_TI_CL6X_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_CL6X_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
-#else
-    #define JSON_HEDLEY_TI_CL6X_VERSION_CHECK(major,minor,patch) (0)
-#endif
-
-#if defined(JSON_HEDLEY_TI_CL7X_VERSION)
-    #undef JSON_HEDLEY_TI_CL7X_VERSION
-#endif
-#if defined(__TI_COMPILER_VERSION__) && defined(__C7000__)
-    #define JSON_HEDLEY_TI_CL7X_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000))
-#endif
-
-#if defined(JSON_HEDLEY_TI_CL7X_VERSION_CHECK)
-    #undef JSON_HEDLEY_TI_CL7X_VERSION_CHECK
-#endif
-#if defined(JSON_HEDLEY_TI_CL7X_VERSION)
-    #define JSON_HEDLEY_TI_CL7X_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_CL7X_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
-#else
-    #define JSON_HEDLEY_TI_CL7X_VERSION_CHECK(major,minor,patch) (0)
-#endif
-
-#if defined(JSON_HEDLEY_TI_CLPRU_VERSION)
-    #undef JSON_HEDLEY_TI_CLPRU_VERSION
-#endif
-#if defined(__TI_COMPILER_VERSION__) && defined(__PRU__)
-    #define JSON_HEDLEY_TI_CLPRU_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000))
-#endif
-
-#if defined(JSON_HEDLEY_TI_CLPRU_VERSION_CHECK)
-    #undef JSON_HEDLEY_TI_CLPRU_VERSION_CHECK
-#endif
-#if defined(JSON_HEDLEY_TI_CLPRU_VERSION)
-    #define JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_CLPRU_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
-#else
-    #define JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(major,minor,patch) (0)
-#endif
-
-#if defined(JSON_HEDLEY_CRAY_VERSION)
-    #undef JSON_HEDLEY_CRAY_VERSION
-#endif
-#if defined(_CRAYC)
-    #if defined(_RELEASE_PATCHLEVEL)
-        #define JSON_HEDLEY_CRAY_VERSION JSON_HEDLEY_VERSION_ENCODE(_RELEASE_MAJOR, _RELEASE_MINOR, _RELEASE_PATCHLEVEL)
-    #else
-        #define JSON_HEDLEY_CRAY_VERSION JSON_HEDLEY_VERSION_ENCODE(_RELEASE_MAJOR, _RELEASE_MINOR, 0)
-    #endif
-#endif
-
-#if defined(JSON_HEDLEY_CRAY_VERSION_CHECK)
-    #undef JSON_HEDLEY_CRAY_VERSION_CHECK
-#endif
-#if defined(JSON_HEDLEY_CRAY_VERSION)
-    #define JSON_HEDLEY_CRAY_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_CRAY_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
-#else
-    #define JSON_HEDLEY_CRAY_VERSION_CHECK(major,minor,patch) (0)
-#endif
-
-#if defined(JSON_HEDLEY_IAR_VERSION)
-    #undef JSON_HEDLEY_IAR_VERSION
-#endif
-#if defined(__IAR_SYSTEMS_ICC__)
-    #if __VER__ > 1000
-        #define JSON_HEDLEY_IAR_VERSION JSON_HEDLEY_VERSION_ENCODE((__VER__ / 1000000), ((__VER__ / 1000) % 1000), (__VER__ % 1000))
-    #else
-        #define JSON_HEDLEY_IAR_VERSION JSON_HEDLEY_VERSION_ENCODE(__VER__ / 100, __VER__ % 100, 0)
-    #endif
-#endif
-
-#if defined(JSON_HEDLEY_IAR_VERSION_CHECK)
-    #undef JSON_HEDLEY_IAR_VERSION_CHECK
-#endif
-#if defined(JSON_HEDLEY_IAR_VERSION)
-    #define JSON_HEDLEY_IAR_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_IAR_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
-#else
-    #define JSON_HEDLEY_IAR_VERSION_CHECK(major,minor,patch) (0)
-#endif
-
-#if defined(JSON_HEDLEY_TINYC_VERSION)
-    #undef JSON_HEDLEY_TINYC_VERSION
-#endif
-#if defined(__TINYC__)
-    #define JSON_HEDLEY_TINYC_VERSION JSON_HEDLEY_VERSION_ENCODE(__TINYC__ / 1000, (__TINYC__ / 100) % 10, __TINYC__ % 100)
-#endif
-
-#if defined(JSON_HEDLEY_TINYC_VERSION_CHECK)
-    #undef JSON_HEDLEY_TINYC_VERSION_CHECK
-#endif
-#if defined(JSON_HEDLEY_TINYC_VERSION)
-    #define JSON_HEDLEY_TINYC_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TINYC_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
-#else
-    #define JSON_HEDLEY_TINYC_VERSION_CHECK(major,minor,patch) (0)
-#endif
-
-#if defined(JSON_HEDLEY_DMC_VERSION)
-    #undef JSON_HEDLEY_DMC_VERSION
-#endif
-#if defined(__DMC__)
-    #define JSON_HEDLEY_DMC_VERSION JSON_HEDLEY_VERSION_ENCODE(__DMC__ >> 8, (__DMC__ >> 4) & 0xf, __DMC__ & 0xf)
-#endif
-
-#if defined(JSON_HEDLEY_DMC_VERSION_CHECK)
-    #undef JSON_HEDLEY_DMC_VERSION_CHECK
-#endif
-#if defined(JSON_HEDLEY_DMC_VERSION)
-    #define JSON_HEDLEY_DMC_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_DMC_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
-#else
-    #define JSON_HEDLEY_DMC_VERSION_CHECK(major,minor,patch) (0)
-#endif
-
-#if defined(JSON_HEDLEY_COMPCERT_VERSION)
-    #undef JSON_HEDLEY_COMPCERT_VERSION
-#endif
-#if defined(__COMPCERT_VERSION__)
-    #define JSON_HEDLEY_COMPCERT_VERSION JSON_HEDLEY_VERSION_ENCODE(__COMPCERT_VERSION__ / 10000, (__COMPCERT_VERSION__ / 100) % 100, __COMPCERT_VERSION__ % 100)
-#endif
-
-#if defined(JSON_HEDLEY_COMPCERT_VERSION_CHECK)
-    #undef JSON_HEDLEY_COMPCERT_VERSION_CHECK
-#endif
-#if defined(JSON_HEDLEY_COMPCERT_VERSION)
-    #define JSON_HEDLEY_COMPCERT_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_COMPCERT_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
-#else
-    #define JSON_HEDLEY_COMPCERT_VERSION_CHECK(major,minor,patch) (0)
-#endif
-
-#if defined(JSON_HEDLEY_PELLES_VERSION)
-    #undef JSON_HEDLEY_PELLES_VERSION
-#endif
-#if defined(__POCC__)
-    #define JSON_HEDLEY_PELLES_VERSION JSON_HEDLEY_VERSION_ENCODE(__POCC__ / 100, __POCC__ % 100, 0)
-#endif
-
-#if defined(JSON_HEDLEY_PELLES_VERSION_CHECK)
-    #undef JSON_HEDLEY_PELLES_VERSION_CHECK
-#endif
-#if defined(JSON_HEDLEY_PELLES_VERSION)
-    #define JSON_HEDLEY_PELLES_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_PELLES_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
-#else
-    #define JSON_HEDLEY_PELLES_VERSION_CHECK(major,minor,patch) (0)
-#endif
-
-#if defined(JSON_HEDLEY_MCST_LCC_VERSION)
-    #undef JSON_HEDLEY_MCST_LCC_VERSION
-#endif
-#if defined(__LCC__) && defined(__LCC_MINOR__)
-    #define JSON_HEDLEY_MCST_LCC_VERSION JSON_HEDLEY_VERSION_ENCODE(__LCC__ / 100, __LCC__ % 100, __LCC_MINOR__)
-#endif
-
-#if defined(JSON_HEDLEY_MCST_LCC_VERSION_CHECK)
-    #undef JSON_HEDLEY_MCST_LCC_VERSION_CHECK
-#endif
-#if defined(JSON_HEDLEY_MCST_LCC_VERSION)
-    #define JSON_HEDLEY_MCST_LCC_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_MCST_LCC_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
-#else
-    #define JSON_HEDLEY_MCST_LCC_VERSION_CHECK(major,minor,patch) (0)
-#endif
-
-#if defined(JSON_HEDLEY_GCC_VERSION)
-    #undef JSON_HEDLEY_GCC_VERSION
-#endif
-#if \
-    defined(JSON_HEDLEY_GNUC_VERSION) && \
-    !defined(__clang__) && \
-    !defined(JSON_HEDLEY_INTEL_VERSION) && \
-    !defined(JSON_HEDLEY_PGI_VERSION) && \
-    !defined(JSON_HEDLEY_ARM_VERSION) && \
-    !defined(JSON_HEDLEY_CRAY_VERSION) && \
-    !defined(JSON_HEDLEY_TI_VERSION) && \
-    !defined(JSON_HEDLEY_TI_ARMCL_VERSION) && \
-    !defined(JSON_HEDLEY_TI_CL430_VERSION) && \
-    !defined(JSON_HEDLEY_TI_CL2000_VERSION) && \
-    !defined(JSON_HEDLEY_TI_CL6X_VERSION) && \
-    !defined(JSON_HEDLEY_TI_CL7X_VERSION) && \
-    !defined(JSON_HEDLEY_TI_CLPRU_VERSION) && \
-    !defined(__COMPCERT__) && \
-    !defined(JSON_HEDLEY_MCST_LCC_VERSION)
-    #define JSON_HEDLEY_GCC_VERSION JSON_HEDLEY_GNUC_VERSION
-#endif
-
-#if defined(JSON_HEDLEY_GCC_VERSION_CHECK)
-    #undef JSON_HEDLEY_GCC_VERSION_CHECK
-#endif
-#if defined(JSON_HEDLEY_GCC_VERSION)
-    #define JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_GCC_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
-#else
-    #define JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch) (0)
-#endif
-
-#if defined(JSON_HEDLEY_HAS_ATTRIBUTE)
-    #undef JSON_HEDLEY_HAS_ATTRIBUTE
-#endif
-#if \
-  defined(__has_attribute) && \
-  ( \
-    (!defined(JSON_HEDLEY_IAR_VERSION) || JSON_HEDLEY_IAR_VERSION_CHECK(8,5,9)) \
-  )
-#  define JSON_HEDLEY_HAS_ATTRIBUTE(attribute) __has_attribute(attribute)
-#else
-#  define JSON_HEDLEY_HAS_ATTRIBUTE(attribute) (0)
-#endif
-
-#if defined(JSON_HEDLEY_GNUC_HAS_ATTRIBUTE)
-    #undef JSON_HEDLEY_GNUC_HAS_ATTRIBUTE
-#endif
-#if defined(__has_attribute)
-    #define JSON_HEDLEY_GNUC_HAS_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_HAS_ATTRIBUTE(attribute)
-#else
-    #define JSON_HEDLEY_GNUC_HAS_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch)
-#endif
-
-#if defined(JSON_HEDLEY_GCC_HAS_ATTRIBUTE)
-    #undef JSON_HEDLEY_GCC_HAS_ATTRIBUTE
-#endif
-#if defined(__has_attribute)
-    #define JSON_HEDLEY_GCC_HAS_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_HAS_ATTRIBUTE(attribute)
-#else
-    #define JSON_HEDLEY_GCC_HAS_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
-#endif
-
-#if defined(JSON_HEDLEY_HAS_CPP_ATTRIBUTE)
-    #undef JSON_HEDLEY_HAS_CPP_ATTRIBUTE
-#endif
-#if \
-    defined(__has_cpp_attribute) && \
-    defined(__cplusplus) && \
-    (!defined(JSON_HEDLEY_SUNPRO_VERSION) || JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,15,0))
-    #define JSON_HEDLEY_HAS_CPP_ATTRIBUTE(attribute) __has_cpp_attribute(attribute)
-#else
-    #define JSON_HEDLEY_HAS_CPP_ATTRIBUTE(attribute) (0)
-#endif
-
-#if defined(JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS)
-    #undef JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS
-#endif
-#if !defined(__cplusplus) || !defined(__has_cpp_attribute)
-    #define JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS(ns,attribute) (0)
-#elif \
-    !defined(JSON_HEDLEY_PGI_VERSION) && \
-    !defined(JSON_HEDLEY_IAR_VERSION) && \
-    (!defined(JSON_HEDLEY_SUNPRO_VERSION) || JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,15,0)) && \
-    (!defined(JSON_HEDLEY_MSVC_VERSION) || JSON_HEDLEY_MSVC_VERSION_CHECK(19,20,0))
-    #define JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS(ns,attribute) JSON_HEDLEY_HAS_CPP_ATTRIBUTE(ns::attribute)
-#else
-    #define JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS(ns,attribute) (0)
-#endif
-
-#if defined(JSON_HEDLEY_GNUC_HAS_CPP_ATTRIBUTE)
-    #undef JSON_HEDLEY_GNUC_HAS_CPP_ATTRIBUTE
-#endif
-#if defined(__has_cpp_attribute) && defined(__cplusplus)
-    #define JSON_HEDLEY_GNUC_HAS_CPP_ATTRIBUTE(attribute,major,minor,patch) __has_cpp_attribute(attribute)
-#else
-    #define JSON_HEDLEY_GNUC_HAS_CPP_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch)
-#endif
-
-#if defined(JSON_HEDLEY_GCC_HAS_CPP_ATTRIBUTE)
-    #undef JSON_HEDLEY_GCC_HAS_CPP_ATTRIBUTE
-#endif
-#if defined(__has_cpp_attribute) && defined(__cplusplus)
-    #define JSON_HEDLEY_GCC_HAS_CPP_ATTRIBUTE(attribute,major,minor,patch) __has_cpp_attribute(attribute)
-#else
-    #define JSON_HEDLEY_GCC_HAS_CPP_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
-#endif
-
-#if defined(JSON_HEDLEY_HAS_BUILTIN)
-    #undef JSON_HEDLEY_HAS_BUILTIN
-#endif
-#if defined(__has_builtin)
-    #define JSON_HEDLEY_HAS_BUILTIN(builtin) __has_builtin(builtin)
-#else
-    #define JSON_HEDLEY_HAS_BUILTIN(builtin) (0)
-#endif
-
-#if defined(JSON_HEDLEY_GNUC_HAS_BUILTIN)
-    #undef JSON_HEDLEY_GNUC_HAS_BUILTIN
-#endif
-#if defined(__has_builtin)
-    #define JSON_HEDLEY_GNUC_HAS_BUILTIN(builtin,major,minor,patch) __has_builtin(builtin)
-#else
-    #define JSON_HEDLEY_GNUC_HAS_BUILTIN(builtin,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch)
-#endif
-
-#if defined(JSON_HEDLEY_GCC_HAS_BUILTIN)
-    #undef JSON_HEDLEY_GCC_HAS_BUILTIN
-#endif
-#if defined(__has_builtin)
-    #define JSON_HEDLEY_GCC_HAS_BUILTIN(builtin,major,minor,patch) __has_builtin(builtin)
-#else
-    #define JSON_HEDLEY_GCC_HAS_BUILTIN(builtin,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
-#endif
-
-#if defined(JSON_HEDLEY_HAS_FEATURE)
-    #undef JSON_HEDLEY_HAS_FEATURE
-#endif
-#if defined(__has_feature)
-    #define JSON_HEDLEY_HAS_FEATURE(feature) __has_feature(feature)
-#else
-    #define JSON_HEDLEY_HAS_FEATURE(feature) (0)
-#endif
-
-#if defined(JSON_HEDLEY_GNUC_HAS_FEATURE)
-    #undef JSON_HEDLEY_GNUC_HAS_FEATURE
-#endif
-#if defined(__has_feature)
-    #define JSON_HEDLEY_GNUC_HAS_FEATURE(feature,major,minor,patch) __has_feature(feature)
-#else
-    #define JSON_HEDLEY_GNUC_HAS_FEATURE(feature,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch)
-#endif
-
-#if defined(JSON_HEDLEY_GCC_HAS_FEATURE)
-    #undef JSON_HEDLEY_GCC_HAS_FEATURE
-#endif
-#if defined(__has_feature)
-    #define JSON_HEDLEY_GCC_HAS_FEATURE(feature,major,minor,patch) __has_feature(feature)
-#else
-    #define JSON_HEDLEY_GCC_HAS_FEATURE(feature,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
-#endif
-
-#if defined(JSON_HEDLEY_HAS_EXTENSION)
-    #undef JSON_HEDLEY_HAS_EXTENSION
-#endif
-#if defined(__has_extension)
-    #define JSON_HEDLEY_HAS_EXTENSION(extension) __has_extension(extension)
-#else
-    #define JSON_HEDLEY_HAS_EXTENSION(extension) (0)
-#endif
-
-#if defined(JSON_HEDLEY_GNUC_HAS_EXTENSION)
-    #undef JSON_HEDLEY_GNUC_HAS_EXTENSION
-#endif
-#if defined(__has_extension)
-    #define JSON_HEDLEY_GNUC_HAS_EXTENSION(extension,major,minor,patch) __has_extension(extension)
-#else
-    #define JSON_HEDLEY_GNUC_HAS_EXTENSION(extension,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch)
-#endif
-
-#if defined(JSON_HEDLEY_GCC_HAS_EXTENSION)
-    #undef JSON_HEDLEY_GCC_HAS_EXTENSION
-#endif
-#if defined(__has_extension)
-    #define JSON_HEDLEY_GCC_HAS_EXTENSION(extension,major,minor,patch) __has_extension(extension)
-#else
-    #define JSON_HEDLEY_GCC_HAS_EXTENSION(extension,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
-#endif
-
-#if defined(JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE)
-    #undef JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE
-#endif
-#if defined(__has_declspec_attribute)
-    #define JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE(attribute) __has_declspec_attribute(attribute)
-#else
-    #define JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE(attribute) (0)
-#endif
-
-#if defined(JSON_HEDLEY_GNUC_HAS_DECLSPEC_ATTRIBUTE)
-    #undef JSON_HEDLEY_GNUC_HAS_DECLSPEC_ATTRIBUTE
-#endif
-#if defined(__has_declspec_attribute)
-    #define JSON_HEDLEY_GNUC_HAS_DECLSPEC_ATTRIBUTE(attribute,major,minor,patch) __has_declspec_attribute(attribute)
-#else
-    #define JSON_HEDLEY_GNUC_HAS_DECLSPEC_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch)
-#endif
-
-#if defined(JSON_HEDLEY_GCC_HAS_DECLSPEC_ATTRIBUTE)
-    #undef JSON_HEDLEY_GCC_HAS_DECLSPEC_ATTRIBUTE
-#endif
-#if defined(__has_declspec_attribute)
-    #define JSON_HEDLEY_GCC_HAS_DECLSPEC_ATTRIBUTE(attribute,major,minor,patch) __has_declspec_attribute(attribute)
-#else
-    #define JSON_HEDLEY_GCC_HAS_DECLSPEC_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
-#endif
-
-#if defined(JSON_HEDLEY_HAS_WARNING)
-    #undef JSON_HEDLEY_HAS_WARNING
-#endif
-#if defined(__has_warning)
-    #define JSON_HEDLEY_HAS_WARNING(warning) __has_warning(warning)
-#else
-    #define JSON_HEDLEY_HAS_WARNING(warning) (0)
-#endif
-
-#if defined(JSON_HEDLEY_GNUC_HAS_WARNING)
-    #undef JSON_HEDLEY_GNUC_HAS_WARNING
-#endif
-#if defined(__has_warning)
-    #define JSON_HEDLEY_GNUC_HAS_WARNING(warning,major,minor,patch) __has_warning(warning)
-#else
-    #define JSON_HEDLEY_GNUC_HAS_WARNING(warning,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch)
-#endif
-
-#if defined(JSON_HEDLEY_GCC_HAS_WARNING)
-    #undef JSON_HEDLEY_GCC_HAS_WARNING
-#endif
-#if defined(__has_warning)
-    #define JSON_HEDLEY_GCC_HAS_WARNING(warning,major,minor,patch) __has_warning(warning)
-#else
-    #define JSON_HEDLEY_GCC_HAS_WARNING(warning,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
-#endif
-
-#if \
-    (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)) || \
-    defined(__clang__) || \
-    JSON_HEDLEY_GCC_VERSION_CHECK(3,0,0) || \
-    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
-    JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0) || \
-    JSON_HEDLEY_PGI_VERSION_CHECK(18,4,0) || \
-    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
-    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
-    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,7,0) || \
-    JSON_HEDLEY_TI_CL430_VERSION_CHECK(2,0,1) || \
-    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,1,0) || \
-    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,0,0) || \
-    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
-    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
-    JSON_HEDLEY_CRAY_VERSION_CHECK(5,0,0) || \
-    JSON_HEDLEY_TINYC_VERSION_CHECK(0,9,17) || \
-    JSON_HEDLEY_SUNPRO_VERSION_CHECK(8,0,0) || \
-    (JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) && defined(__C99_PRAGMA_OPERATOR))
-    #define JSON_HEDLEY_PRAGMA(value) _Pragma(#value)
-#elif JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0)
-    #define JSON_HEDLEY_PRAGMA(value) __pragma(value)
-#else
-    #define JSON_HEDLEY_PRAGMA(value)
-#endif
-
-#if defined(JSON_HEDLEY_DIAGNOSTIC_PUSH)
-    #undef JSON_HEDLEY_DIAGNOSTIC_PUSH
-#endif
-#if defined(JSON_HEDLEY_DIAGNOSTIC_POP)
-    #undef JSON_HEDLEY_DIAGNOSTIC_POP
-#endif
-#if defined(__clang__)
-    #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("clang diagnostic push")
-    #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("clang diagnostic pop")
-#elif JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("warning(push)")
-    #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("warning(pop)")
-#elif JSON_HEDLEY_GCC_VERSION_CHECK(4,6,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("GCC diagnostic push")
-    #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("GCC diagnostic pop")
-#elif \
-    JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0) || \
-    JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_PUSH __pragma(warning(push))
-    #define JSON_HEDLEY_DIAGNOSTIC_POP __pragma(warning(pop))
-#elif JSON_HEDLEY_ARM_VERSION_CHECK(5,6,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("push")
-    #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("pop")
-#elif \
-    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
-    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
-    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,4,0) || \
-    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,1,0) || \
-    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
-    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("diag_push")
-    #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("diag_pop")
-#elif JSON_HEDLEY_PELLES_VERSION_CHECK(2,90,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("warning(push)")
-    #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("warning(pop)")
-#else
-    #define JSON_HEDLEY_DIAGNOSTIC_PUSH
-    #define JSON_HEDLEY_DIAGNOSTIC_POP
-#endif
-
-/* JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_ is for
-   HEDLEY INTERNAL USE ONLY.  API subject to change without notice. */
-#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_)
-    #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_
-#endif
-#if defined(__cplusplus)
-#  if JSON_HEDLEY_HAS_WARNING("-Wc++98-compat")
-#    if JSON_HEDLEY_HAS_WARNING("-Wc++17-extensions")
-#      if JSON_HEDLEY_HAS_WARNING("-Wc++1z-extensions")
-#        define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(xpr) \
-    JSON_HEDLEY_DIAGNOSTIC_PUSH \
-    _Pragma("clang diagnostic ignored \"-Wc++98-compat\"") \
-    _Pragma("clang diagnostic ignored \"-Wc++17-extensions\"") \
-    _Pragma("clang diagnostic ignored \"-Wc++1z-extensions\"") \
-    xpr \
-    JSON_HEDLEY_DIAGNOSTIC_POP
-#      else
-#        define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(xpr) \
-    JSON_HEDLEY_DIAGNOSTIC_PUSH \
-    _Pragma("clang diagnostic ignored \"-Wc++98-compat\"") \
-    _Pragma("clang diagnostic ignored \"-Wc++17-extensions\"") \
-    xpr \
-    JSON_HEDLEY_DIAGNOSTIC_POP
-#      endif
-#    else
-#      define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(xpr) \
-    JSON_HEDLEY_DIAGNOSTIC_PUSH \
-    _Pragma("clang diagnostic ignored \"-Wc++98-compat\"") \
-    xpr \
-    JSON_HEDLEY_DIAGNOSTIC_POP
-#    endif
-#  endif
-#endif
-#if !defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(x) x
-#endif
-
-#if defined(JSON_HEDLEY_CONST_CAST)
-    #undef JSON_HEDLEY_CONST_CAST
-#endif
-#if defined(__cplusplus)
-#  define JSON_HEDLEY_CONST_CAST(T, expr) (const_cast<T>(expr))
-#elif \
-  JSON_HEDLEY_HAS_WARNING("-Wcast-qual") || \
-  JSON_HEDLEY_GCC_VERSION_CHECK(4,6,0) || \
-  JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
-#  define JSON_HEDLEY_CONST_CAST(T, expr) (__extension__ ({ \
-        JSON_HEDLEY_DIAGNOSTIC_PUSH \
-        JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL \
-        ((T) (expr)); \
-        JSON_HEDLEY_DIAGNOSTIC_POP \
-    }))
-#else
-#  define JSON_HEDLEY_CONST_CAST(T, expr) ((T) (expr))
-#endif
-
-#if defined(JSON_HEDLEY_REINTERPRET_CAST)
-    #undef JSON_HEDLEY_REINTERPRET_CAST
-#endif
-#if defined(__cplusplus)
-    #define JSON_HEDLEY_REINTERPRET_CAST(T, expr) (reinterpret_cast<T>(expr))
-#else
-    #define JSON_HEDLEY_REINTERPRET_CAST(T, expr) ((T) (expr))
-#endif
-
-#if defined(JSON_HEDLEY_STATIC_CAST)
-    #undef JSON_HEDLEY_STATIC_CAST
-#endif
-#if defined(__cplusplus)
-    #define JSON_HEDLEY_STATIC_CAST(T, expr) (static_cast<T>(expr))
-#else
-    #define JSON_HEDLEY_STATIC_CAST(T, expr) ((T) (expr))
-#endif
-
-#if defined(JSON_HEDLEY_CPP_CAST)
-    #undef JSON_HEDLEY_CPP_CAST
-#endif
-#if defined(__cplusplus)
-#  if JSON_HEDLEY_HAS_WARNING("-Wold-style-cast")
-#    define JSON_HEDLEY_CPP_CAST(T, expr) \
-    JSON_HEDLEY_DIAGNOSTIC_PUSH \
-    _Pragma("clang diagnostic ignored \"-Wold-style-cast\"") \
-    ((T) (expr)) \
-    JSON_HEDLEY_DIAGNOSTIC_POP
-#  elif JSON_HEDLEY_IAR_VERSION_CHECK(8,3,0)
-#    define JSON_HEDLEY_CPP_CAST(T, expr) \
-    JSON_HEDLEY_DIAGNOSTIC_PUSH \
-    _Pragma("diag_suppress=Pe137") \
-    JSON_HEDLEY_DIAGNOSTIC_POP
-#  else
-#    define JSON_HEDLEY_CPP_CAST(T, expr) ((T) (expr))
-#  endif
-#else
-#  define JSON_HEDLEY_CPP_CAST(T, expr) (expr)
-#endif
-
-#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED)
-    #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED
-#endif
-#if JSON_HEDLEY_HAS_WARNING("-Wdeprecated-declarations")
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("clang diagnostic ignored \"-Wdeprecated-declarations\"")
-#elif JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("warning(disable:1478 1786)")
-#elif JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED __pragma(warning(disable:1478 1786))
-#elif JSON_HEDLEY_PGI_VERSION_CHECK(20,7,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("diag_suppress 1215,1216,1444,1445")
-#elif JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("diag_suppress 1215,1444")
-#elif JSON_HEDLEY_GCC_VERSION_CHECK(4,3,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"")
-#elif JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED __pragma(warning(disable:4996))
-#elif JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("diag_suppress 1215,1444")
-#elif \
-    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
-    (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
-    (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
-    (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
-    (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
-    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
-    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("diag_suppress 1291,1718")
-#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,13,0) && !defined(__cplusplus)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("error_messages(off,E_DEPRECATED_ATT,E_DEPRECATED_ATT_MESS)")
-#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,13,0) && defined(__cplusplus)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("error_messages(off,symdeprecated,symdeprecated2)")
-#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("diag_suppress=Pe1444,Pe1215")
-#elif JSON_HEDLEY_PELLES_VERSION_CHECK(2,90,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("warn(disable:2241)")
-#else
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED
-#endif
-
-#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS)
-    #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS
-#endif
-#if JSON_HEDLEY_HAS_WARNING("-Wunknown-pragmas")
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("clang diagnostic ignored \"-Wunknown-pragmas\"")
-#elif JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("warning(disable:161)")
-#elif JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS __pragma(warning(disable:161))
-#elif JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("diag_suppress 1675")
-#elif JSON_HEDLEY_GCC_VERSION_CHECK(4,3,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("GCC diagnostic ignored \"-Wunknown-pragmas\"")
-#elif JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS __pragma(warning(disable:4068))
-#elif \
-    JSON_HEDLEY_TI_VERSION_CHECK(16,9,0) || \
-    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,0,0) || \
-    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
-    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,3,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("diag_suppress 163")
-#elif JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,0,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("diag_suppress 163")
-#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("diag_suppress=Pe161")
-#elif JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("diag_suppress 161")
-#else
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS
-#endif
-
-#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES)
-    #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES
-#endif
-#if JSON_HEDLEY_HAS_WARNING("-Wunknown-attributes")
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("clang diagnostic ignored \"-Wunknown-attributes\"")
-#elif JSON_HEDLEY_GCC_VERSION_CHECK(4,6,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"")
-#elif JSON_HEDLEY_INTEL_VERSION_CHECK(17,0,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("warning(disable:1292)")
-#elif JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES __pragma(warning(disable:1292))
-#elif JSON_HEDLEY_MSVC_VERSION_CHECK(19,0,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES __pragma(warning(disable:5030))
-#elif JSON_HEDLEY_PGI_VERSION_CHECK(20,7,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("diag_suppress 1097,1098")
-#elif JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("diag_suppress 1097")
-#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,14,0) && defined(__cplusplus)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("error_messages(off,attrskipunsup)")
-#elif \
-    JSON_HEDLEY_TI_VERSION_CHECK(18,1,0) || \
-    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,3,0) || \
-    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("diag_suppress 1173")
-#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("diag_suppress=Pe1097")
-#elif JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("diag_suppress 1097")
-#else
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES
-#endif
-
-#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL)
-    #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL
-#endif
-#if JSON_HEDLEY_HAS_WARNING("-Wcast-qual")
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL _Pragma("clang diagnostic ignored \"-Wcast-qual\"")
-#elif JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL _Pragma("warning(disable:2203 2331)")
-#elif JSON_HEDLEY_GCC_VERSION_CHECK(3,0,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL _Pragma("GCC diagnostic ignored \"-Wcast-qual\"")
-#else
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL
-#endif
-
-#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION)
-    #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION
-#endif
-#if JSON_HEDLEY_HAS_WARNING("-Wunused-function")
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION _Pragma("clang diagnostic ignored \"-Wunused-function\"")
-#elif JSON_HEDLEY_GCC_VERSION_CHECK(3,4,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION _Pragma("GCC diagnostic ignored \"-Wunused-function\"")
-#elif JSON_HEDLEY_MSVC_VERSION_CHECK(1,0,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION __pragma(warning(disable:4505))
-#elif JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION _Pragma("diag_suppress 3142")
-#else
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION
-#endif
-
-#if defined(JSON_HEDLEY_DEPRECATED)
-    #undef JSON_HEDLEY_DEPRECATED
-#endif
-#if defined(JSON_HEDLEY_DEPRECATED_FOR)
-    #undef JSON_HEDLEY_DEPRECATED_FOR
-#endif
-#if \
-    JSON_HEDLEY_MSVC_VERSION_CHECK(14,0,0) || \
-    JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
-    #define JSON_HEDLEY_DEPRECATED(since) __declspec(deprecated("Since " # since))
-    #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) __declspec(deprecated("Since " #since "; use " #replacement))
-#elif \
-    (JSON_HEDLEY_HAS_EXTENSION(attribute_deprecated_with_message) && !defined(JSON_HEDLEY_IAR_VERSION)) || \
-    JSON_HEDLEY_GCC_VERSION_CHECK(4,5,0) || \
-    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
-    JSON_HEDLEY_ARM_VERSION_CHECK(5,6,0) || \
-    JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,13,0) || \
-    JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) || \
-    JSON_HEDLEY_TI_VERSION_CHECK(18,1,0) || \
-    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(18,1,0) || \
-    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,3,0) || \
-    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
-    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,3,0) || \
-    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
-    #define JSON_HEDLEY_DEPRECATED(since) __attribute__((__deprecated__("Since " #since)))
-    #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) __attribute__((__deprecated__("Since " #since "; use " #replacement)))
-#elif defined(__cplusplus) && (__cplusplus >= 201402L)
-    #define JSON_HEDLEY_DEPRECATED(since) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[deprecated("Since " #since)]])
-    #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[deprecated("Since " #since "; use " #replacement)]])
-#elif \
-    JSON_HEDLEY_HAS_ATTRIBUTE(deprecated) || \
-    JSON_HEDLEY_GCC_VERSION_CHECK(3,1,0) || \
-    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
-    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
-    (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
-    (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
-    (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
-    (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
-    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
-    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
-    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) || \
-    JSON_HEDLEY_IAR_VERSION_CHECK(8,10,0)
-    #define JSON_HEDLEY_DEPRECATED(since) __attribute__((__deprecated__))
-    #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) __attribute__((__deprecated__))
-#elif \
-    JSON_HEDLEY_MSVC_VERSION_CHECK(13,10,0) || \
-    JSON_HEDLEY_PELLES_VERSION_CHECK(6,50,0) || \
-    JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
-    #define JSON_HEDLEY_DEPRECATED(since) __declspec(deprecated)
-    #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) __declspec(deprecated)
-#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
-    #define JSON_HEDLEY_DEPRECATED(since) _Pragma("deprecated")
-    #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) _Pragma("deprecated")
-#else
-    #define JSON_HEDLEY_DEPRECATED(since)
-    #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement)
-#endif
-
-#if defined(JSON_HEDLEY_UNAVAILABLE)
-    #undef JSON_HEDLEY_UNAVAILABLE
-#endif
-#if \
-    JSON_HEDLEY_HAS_ATTRIBUTE(warning) || \
-    JSON_HEDLEY_GCC_VERSION_CHECK(4,3,0) || \
-    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
-    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
-    #define JSON_HEDLEY_UNAVAILABLE(available_since) __attribute__((__warning__("Not available until " #available_since)))
-#else
-    #define JSON_HEDLEY_UNAVAILABLE(available_since)
-#endif
-
-#if defined(JSON_HEDLEY_WARN_UNUSED_RESULT)
-    #undef JSON_HEDLEY_WARN_UNUSED_RESULT
-#endif
-#if defined(JSON_HEDLEY_WARN_UNUSED_RESULT_MSG)
-    #undef JSON_HEDLEY_WARN_UNUSED_RESULT_MSG
-#endif
-#if \
-    JSON_HEDLEY_HAS_ATTRIBUTE(warn_unused_result) || \
-    JSON_HEDLEY_GCC_VERSION_CHECK(3,4,0) || \
-    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
-    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
-    (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
-    (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
-    (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
-    (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
-    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
-    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
-    (JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,15,0) && defined(__cplusplus)) || \
-    JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) || \
-    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
-    #define JSON_HEDLEY_WARN_UNUSED_RESULT __attribute__((__warn_unused_result__))
-    #define JSON_HEDLEY_WARN_UNUSED_RESULT_MSG(msg) __attribute__((__warn_unused_result__))
-#elif (JSON_HEDLEY_HAS_CPP_ATTRIBUTE(nodiscard) >= 201907L)
-    #define JSON_HEDLEY_WARN_UNUSED_RESULT JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[nodiscard]])
-    #define JSON_HEDLEY_WARN_UNUSED_RESULT_MSG(msg) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[nodiscard(msg)]])
-#elif JSON_HEDLEY_HAS_CPP_ATTRIBUTE(nodiscard)
-    #define JSON_HEDLEY_WARN_UNUSED_RESULT JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[nodiscard]])
-    #define JSON_HEDLEY_WARN_UNUSED_RESULT_MSG(msg) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[nodiscard]])
-#elif defined(_Check_return_) /* SAL */
-    #define JSON_HEDLEY_WARN_UNUSED_RESULT _Check_return_
-    #define JSON_HEDLEY_WARN_UNUSED_RESULT_MSG(msg) _Check_return_
-#else
-    #define JSON_HEDLEY_WARN_UNUSED_RESULT
-    #define JSON_HEDLEY_WARN_UNUSED_RESULT_MSG(msg)
-#endif
-
-#if defined(JSON_HEDLEY_SENTINEL)
-    #undef JSON_HEDLEY_SENTINEL
-#endif
-#if \
-    JSON_HEDLEY_HAS_ATTRIBUTE(sentinel) || \
-    JSON_HEDLEY_GCC_VERSION_CHECK(4,0,0) || \
-    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
-    JSON_HEDLEY_ARM_VERSION_CHECK(5,4,0) || \
-    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
-    #define JSON_HEDLEY_SENTINEL(position) __attribute__((__sentinel__(position)))
-#else
-    #define JSON_HEDLEY_SENTINEL(position)
-#endif
-
-#if defined(JSON_HEDLEY_NO_RETURN)
-    #undef JSON_HEDLEY_NO_RETURN
-#endif
-#if JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
-    #define JSON_HEDLEY_NO_RETURN __noreturn
-#elif \
-    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
-    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
-    #define JSON_HEDLEY_NO_RETURN __attribute__((__noreturn__))
-#elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L
-    #define JSON_HEDLEY_NO_RETURN _Noreturn
-#elif defined(__cplusplus) && (__cplusplus >= 201103L)
-    #define JSON_HEDLEY_NO_RETURN JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[noreturn]])
-#elif \
-    JSON_HEDLEY_HAS_ATTRIBUTE(noreturn) || \
-    JSON_HEDLEY_GCC_VERSION_CHECK(3,2,0) || \
-    JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \
-    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
-    JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
-    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
-    (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
-    (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
-    (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
-    (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
-    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
-    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
-    JSON_HEDLEY_IAR_VERSION_CHECK(8,10,0)
-    #define JSON_HEDLEY_NO_RETURN __attribute__((__noreturn__))
-#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0)
-    #define JSON_HEDLEY_NO_RETURN _Pragma("does_not_return")
-#elif \
-    JSON_HEDLEY_MSVC_VERSION_CHECK(13,10,0) || \
-    JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
-    #define JSON_HEDLEY_NO_RETURN __declspec(noreturn)
-#elif JSON_HEDLEY_TI_CL6X_VERSION_CHECK(6,0,0) && defined(__cplusplus)
-    #define JSON_HEDLEY_NO_RETURN _Pragma("FUNC_NEVER_RETURNS;")
-#elif JSON_HEDLEY_COMPCERT_VERSION_CHECK(3,2,0)
-    #define JSON_HEDLEY_NO_RETURN __attribute((noreturn))
-#elif JSON_HEDLEY_PELLES_VERSION_CHECK(9,0,0)
-    #define JSON_HEDLEY_NO_RETURN __declspec(noreturn)
-#else
-    #define JSON_HEDLEY_NO_RETURN
-#endif
-
-#if defined(JSON_HEDLEY_NO_ESCAPE)
-    #undef JSON_HEDLEY_NO_ESCAPE
-#endif
-#if JSON_HEDLEY_HAS_ATTRIBUTE(noescape)
-    #define JSON_HEDLEY_NO_ESCAPE __attribute__((__noescape__))
-#else
-    #define JSON_HEDLEY_NO_ESCAPE
-#endif
-
-#if defined(JSON_HEDLEY_UNREACHABLE)
-    #undef JSON_HEDLEY_UNREACHABLE
-#endif
-#if defined(JSON_HEDLEY_UNREACHABLE_RETURN)
-    #undef JSON_HEDLEY_UNREACHABLE_RETURN
-#endif
-#if defined(JSON_HEDLEY_ASSUME)
-    #undef JSON_HEDLEY_ASSUME
-#endif
-#if \
-    JSON_HEDLEY_MSVC_VERSION_CHECK(13,10,0) || \
-    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
-    JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
-    #define JSON_HEDLEY_ASSUME(expr) __assume(expr)
-#elif JSON_HEDLEY_HAS_BUILTIN(__builtin_assume)
-    #define JSON_HEDLEY_ASSUME(expr) __builtin_assume(expr)
-#elif \
-    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,2,0) || \
-    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(4,0,0)
-    #if defined(__cplusplus)
-        #define JSON_HEDLEY_ASSUME(expr) std::_nassert(expr)
-    #else
-        #define JSON_HEDLEY_ASSUME(expr) _nassert(expr)
-    #endif
-#endif
-#if \
-    (JSON_HEDLEY_HAS_BUILTIN(__builtin_unreachable) && (!defined(JSON_HEDLEY_ARM_VERSION))) || \
-    JSON_HEDLEY_GCC_VERSION_CHECK(4,5,0) || \
-    JSON_HEDLEY_PGI_VERSION_CHECK(18,10,0) || \
-    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
-    JSON_HEDLEY_IBM_VERSION_CHECK(13,1,5) || \
-    JSON_HEDLEY_CRAY_VERSION_CHECK(10,0,0) || \
-    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
-    #define JSON_HEDLEY_UNREACHABLE() __builtin_unreachable()
-#elif defined(JSON_HEDLEY_ASSUME)
-    #define JSON_HEDLEY_UNREACHABLE() JSON_HEDLEY_ASSUME(0)
-#endif
-#if !defined(JSON_HEDLEY_ASSUME)
-    #if defined(JSON_HEDLEY_UNREACHABLE)
-        #define JSON_HEDLEY_ASSUME(expr) JSON_HEDLEY_STATIC_CAST(void, ((expr) ? 1 : (JSON_HEDLEY_UNREACHABLE(), 1)))
-    #else
-        #define JSON_HEDLEY_ASSUME(expr) JSON_HEDLEY_STATIC_CAST(void, expr)
-    #endif
-#endif
-#if defined(JSON_HEDLEY_UNREACHABLE)
-    #if  \
-        JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,2,0) || \
-        JSON_HEDLEY_TI_CL6X_VERSION_CHECK(4,0,0)
-        #define JSON_HEDLEY_UNREACHABLE_RETURN(value) return (JSON_HEDLEY_STATIC_CAST(void, JSON_HEDLEY_ASSUME(0)), (value))
-    #else
-        #define JSON_HEDLEY_UNREACHABLE_RETURN(value) JSON_HEDLEY_UNREACHABLE()
-    #endif
-#else
-    #define JSON_HEDLEY_UNREACHABLE_RETURN(value) return (value)
-#endif
-#if !defined(JSON_HEDLEY_UNREACHABLE)
-    #define JSON_HEDLEY_UNREACHABLE() JSON_HEDLEY_ASSUME(0)
-#endif
-
-JSON_HEDLEY_DIAGNOSTIC_PUSH
-#if JSON_HEDLEY_HAS_WARNING("-Wpedantic")
-    #pragma clang diagnostic ignored "-Wpedantic"
-#endif
-#if JSON_HEDLEY_HAS_WARNING("-Wc++98-compat-pedantic") && defined(__cplusplus)
-    #pragma clang diagnostic ignored "-Wc++98-compat-pedantic"
-#endif
-#if JSON_HEDLEY_GCC_HAS_WARNING("-Wvariadic-macros",4,0,0)
-    #if defined(__clang__)
-        #pragma clang diagnostic ignored "-Wvariadic-macros"
-    #elif defined(JSON_HEDLEY_GCC_VERSION)
-        #pragma GCC diagnostic ignored "-Wvariadic-macros"
-    #endif
-#endif
-#if defined(JSON_HEDLEY_NON_NULL)
-    #undef JSON_HEDLEY_NON_NULL
-#endif
-#if \
-    JSON_HEDLEY_HAS_ATTRIBUTE(nonnull) || \
-    JSON_HEDLEY_GCC_VERSION_CHECK(3,3,0) || \
-    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
-    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0)
-    #define JSON_HEDLEY_NON_NULL(...) __attribute__((__nonnull__(__VA_ARGS__)))
-#else
-    #define JSON_HEDLEY_NON_NULL(...)
-#endif
-JSON_HEDLEY_DIAGNOSTIC_POP
-
-#if defined(JSON_HEDLEY_PRINTF_FORMAT)
-    #undef JSON_HEDLEY_PRINTF_FORMAT
-#endif
-#if defined(__MINGW32__) && JSON_HEDLEY_GCC_HAS_ATTRIBUTE(format,4,4,0) && !defined(__USE_MINGW_ANSI_STDIO)
-    #define JSON_HEDLEY_PRINTF_FORMAT(string_idx,first_to_check) __attribute__((__format__(ms_printf, string_idx, first_to_check)))
-#elif defined(__MINGW32__) && JSON_HEDLEY_GCC_HAS_ATTRIBUTE(format,4,4,0) && defined(__USE_MINGW_ANSI_STDIO)
-    #define JSON_HEDLEY_PRINTF_FORMAT(string_idx,first_to_check) __attribute__((__format__(gnu_printf, string_idx, first_to_check)))
-#elif \
-    JSON_HEDLEY_HAS_ATTRIBUTE(format) || \
-    JSON_HEDLEY_GCC_VERSION_CHECK(3,1,0) || \
-    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
-    JSON_HEDLEY_ARM_VERSION_CHECK(5,6,0) || \
-    JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
-    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
-    (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
-    (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
-    (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
-    (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
-    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
-    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
-    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
-    #define JSON_HEDLEY_PRINTF_FORMAT(string_idx,first_to_check) __attribute__((__format__(__printf__, string_idx, first_to_check)))
-#elif JSON_HEDLEY_PELLES_VERSION_CHECK(6,0,0)
-    #define JSON_HEDLEY_PRINTF_FORMAT(string_idx,first_to_check) __declspec(vaformat(printf,string_idx,first_to_check))
-#else
-    #define JSON_HEDLEY_PRINTF_FORMAT(string_idx,first_to_check)
-#endif
-
-#if defined(JSON_HEDLEY_CONSTEXPR)
-    #undef JSON_HEDLEY_CONSTEXPR
-#endif
-#if defined(__cplusplus)
-    #if __cplusplus >= 201103L
-        #define JSON_HEDLEY_CONSTEXPR JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(constexpr)
-    #endif
-#endif
-#if !defined(JSON_HEDLEY_CONSTEXPR)
-    #define JSON_HEDLEY_CONSTEXPR
-#endif
-
-#if defined(JSON_HEDLEY_PREDICT)
-    #undef JSON_HEDLEY_PREDICT
-#endif
-#if defined(JSON_HEDLEY_LIKELY)
-    #undef JSON_HEDLEY_LIKELY
-#endif
-#if defined(JSON_HEDLEY_UNLIKELY)
-    #undef JSON_HEDLEY_UNLIKELY
-#endif
-#if defined(JSON_HEDLEY_UNPREDICTABLE)
-    #undef JSON_HEDLEY_UNPREDICTABLE
-#endif
-#if JSON_HEDLEY_HAS_BUILTIN(__builtin_unpredictable)
-    #define JSON_HEDLEY_UNPREDICTABLE(expr) __builtin_unpredictable((expr))
-#endif
-#if \
-  (JSON_HEDLEY_HAS_BUILTIN(__builtin_expect_with_probability) && !defined(JSON_HEDLEY_PGI_VERSION)) || \
-  JSON_HEDLEY_GCC_VERSION_CHECK(9,0,0) || \
-  JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
-#  define JSON_HEDLEY_PREDICT(expr, value, probability) __builtin_expect_with_probability(  (expr), (value), (probability))
-#  define JSON_HEDLEY_PREDICT_TRUE(expr, probability)   __builtin_expect_with_probability(!!(expr),    1   , (probability))
-#  define JSON_HEDLEY_PREDICT_FALSE(expr, probability)  __builtin_expect_with_probability(!!(expr),    0   , (probability))
-#  define JSON_HEDLEY_LIKELY(expr)                      __builtin_expect                 (!!(expr),    1                  )
-#  define JSON_HEDLEY_UNLIKELY(expr)                    __builtin_expect                 (!!(expr),    0                  )
-#elif \
-  (JSON_HEDLEY_HAS_BUILTIN(__builtin_expect) && !defined(JSON_HEDLEY_INTEL_CL_VERSION)) || \
-  JSON_HEDLEY_GCC_VERSION_CHECK(3,0,0) || \
-  JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
-  (JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,15,0) && defined(__cplusplus)) || \
-  JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
-  JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
-  JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
-  JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,7,0) || \
-  JSON_HEDLEY_TI_CL430_VERSION_CHECK(3,1,0) || \
-  JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,1,0) || \
-  JSON_HEDLEY_TI_CL6X_VERSION_CHECK(6,1,0) || \
-  JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
-  JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
-  JSON_HEDLEY_TINYC_VERSION_CHECK(0,9,27) || \
-  JSON_HEDLEY_CRAY_VERSION_CHECK(8,1,0) || \
-  JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
-#  define JSON_HEDLEY_PREDICT(expr, expected, probability) \
-    (((probability) >= 0.9) ? __builtin_expect((expr), (expected)) : (JSON_HEDLEY_STATIC_CAST(void, expected), (expr)))
-#  define JSON_HEDLEY_PREDICT_TRUE(expr, probability) \
-    (__extension__ ({ \
-        double hedley_probability_ = (probability); \
-        ((hedley_probability_ >= 0.9) ? __builtin_expect(!!(expr), 1) : ((hedley_probability_ <= 0.1) ? __builtin_expect(!!(expr), 0) : !!(expr))); \
-    }))
-#  define JSON_HEDLEY_PREDICT_FALSE(expr, probability) \
-    (__extension__ ({ \
-        double hedley_probability_ = (probability); \
-        ((hedley_probability_ >= 0.9) ? __builtin_expect(!!(expr), 0) : ((hedley_probability_ <= 0.1) ? __builtin_expect(!!(expr), 1) : !!(expr))); \
-    }))
-#  define JSON_HEDLEY_LIKELY(expr)   __builtin_expect(!!(expr), 1)
-#  define JSON_HEDLEY_UNLIKELY(expr) __builtin_expect(!!(expr), 0)
-#else
-#  define JSON_HEDLEY_PREDICT(expr, expected, probability) (JSON_HEDLEY_STATIC_CAST(void, expected), (expr))
-#  define JSON_HEDLEY_PREDICT_TRUE(expr, probability) (!!(expr))
-#  define JSON_HEDLEY_PREDICT_FALSE(expr, probability) (!!(expr))
-#  define JSON_HEDLEY_LIKELY(expr) (!!(expr))
-#  define JSON_HEDLEY_UNLIKELY(expr) (!!(expr))
-#endif
-#if !defined(JSON_HEDLEY_UNPREDICTABLE)
-    #define JSON_HEDLEY_UNPREDICTABLE(expr) JSON_HEDLEY_PREDICT(expr, 1, 0.5)
-#endif
-
-#if defined(JSON_HEDLEY_MALLOC)
-    #undef JSON_HEDLEY_MALLOC
-#endif
-#if \
-    JSON_HEDLEY_HAS_ATTRIBUTE(malloc) || \
-    JSON_HEDLEY_GCC_VERSION_CHECK(3,1,0) || \
-    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
-    JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \
-    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
-    JSON_HEDLEY_IBM_VERSION_CHECK(12,1,0) || \
-    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
-    (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
-    (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
-    (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
-    (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
-    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
-    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
-    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
-    #define JSON_HEDLEY_MALLOC __attribute__((__malloc__))
-#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0)
-    #define JSON_HEDLEY_MALLOC _Pragma("returns_new_memory")
-#elif \
-    JSON_HEDLEY_MSVC_VERSION_CHECK(14,0,0) || \
-    JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
-    #define JSON_HEDLEY_MALLOC __declspec(restrict)
-#else
-    #define JSON_HEDLEY_MALLOC
-#endif
-
-#if defined(JSON_HEDLEY_PURE)
-    #undef JSON_HEDLEY_PURE
-#endif
-#if \
-  JSON_HEDLEY_HAS_ATTRIBUTE(pure) || \
-  JSON_HEDLEY_GCC_VERSION_CHECK(2,96,0) || \
-  JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
-  JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \
-  JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
-  JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
-  JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
-  (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-  JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
-  (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-  JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
-  (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-  JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
-  (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-  JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
-  JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
-  JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
-  JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) || \
-  JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
-#  define JSON_HEDLEY_PURE __attribute__((__pure__))
-#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0)
-#  define JSON_HEDLEY_PURE _Pragma("does_not_write_global_data")
-#elif defined(__cplusplus) && \
-    ( \
-      JSON_HEDLEY_TI_CL430_VERSION_CHECK(2,0,1) || \
-      JSON_HEDLEY_TI_CL6X_VERSION_CHECK(4,0,0) || \
-      JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) \
-    )
-#  define JSON_HEDLEY_PURE _Pragma("FUNC_IS_PURE;")
-#else
-#  define JSON_HEDLEY_PURE
-#endif
-
-#if defined(JSON_HEDLEY_CONST)
-    #undef JSON_HEDLEY_CONST
-#endif
-#if \
-    JSON_HEDLEY_HAS_ATTRIBUTE(const) || \
-    JSON_HEDLEY_GCC_VERSION_CHECK(2,5,0) || \
-    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
-    JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \
-    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
-    JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
-    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
-    (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
-    (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
-    (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
-    (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
-    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
-    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
-    JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) || \
-    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
-    #define JSON_HEDLEY_CONST __attribute__((__const__))
-#elif \
-    JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0)
-    #define JSON_HEDLEY_CONST _Pragma("no_side_effect")
-#else
-    #define JSON_HEDLEY_CONST JSON_HEDLEY_PURE
-#endif
-
-#if defined(JSON_HEDLEY_RESTRICT)
-    #undef JSON_HEDLEY_RESTRICT
-#endif
-#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) && !defined(__cplusplus)
-    #define JSON_HEDLEY_RESTRICT restrict
-#elif \
-    JSON_HEDLEY_GCC_VERSION_CHECK(3,1,0) || \
-    JSON_HEDLEY_MSVC_VERSION_CHECK(14,0,0) || \
-    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
-    JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) || \
-    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
-    JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
-    JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) || \
-    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
-    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,2,4) || \
-    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,1,0) || \
-    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
-    (JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,14,0) && defined(__cplusplus)) || \
-    JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0) || \
-    defined(__clang__) || \
-    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
-    #define JSON_HEDLEY_RESTRICT __restrict
-#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,3,0) && !defined(__cplusplus)
-    #define JSON_HEDLEY_RESTRICT _Restrict
-#else
-    #define JSON_HEDLEY_RESTRICT
-#endif
-
-#if defined(JSON_HEDLEY_INLINE)
-    #undef JSON_HEDLEY_INLINE
-#endif
-#if \
-    (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)) || \
-    (defined(__cplusplus) && (__cplusplus >= 199711L))
-    #define JSON_HEDLEY_INLINE inline
-#elif \
-    defined(JSON_HEDLEY_GCC_VERSION) || \
-    JSON_HEDLEY_ARM_VERSION_CHECK(6,2,0)
-    #define JSON_HEDLEY_INLINE __inline__
-#elif \
-    JSON_HEDLEY_MSVC_VERSION_CHECK(12,0,0) || \
-    JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) || \
-    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
-    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,1,0) || \
-    JSON_HEDLEY_TI_CL430_VERSION_CHECK(3,1,0) || \
-    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,2,0) || \
-    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,0,0) || \
-    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
-    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
-    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
-    #define JSON_HEDLEY_INLINE __inline
-#else
-    #define JSON_HEDLEY_INLINE
-#endif
-
-#if defined(JSON_HEDLEY_ALWAYS_INLINE)
-    #undef JSON_HEDLEY_ALWAYS_INLINE
-#endif
-#if \
-  JSON_HEDLEY_HAS_ATTRIBUTE(always_inline) || \
-  JSON_HEDLEY_GCC_VERSION_CHECK(4,0,0) || \
-  JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
-  JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \
-  JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
-  JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
-  JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
-  (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-  JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
-  (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-  JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
-  (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-  JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
-  (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-  JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
-  JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
-  JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
-  JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) || \
-  JSON_HEDLEY_IAR_VERSION_CHECK(8,10,0)
-#  define JSON_HEDLEY_ALWAYS_INLINE __attribute__((__always_inline__)) JSON_HEDLEY_INLINE
-#elif \
-  JSON_HEDLEY_MSVC_VERSION_CHECK(12,0,0) || \
-  JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
-#  define JSON_HEDLEY_ALWAYS_INLINE __forceinline
-#elif defined(__cplusplus) && \
-    ( \
-      JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
-      JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
-      JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
-      JSON_HEDLEY_TI_CL6X_VERSION_CHECK(6,1,0) || \
-      JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
-      JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) \
-    )
-#  define JSON_HEDLEY_ALWAYS_INLINE _Pragma("FUNC_ALWAYS_INLINE;")
-#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
-#  define JSON_HEDLEY_ALWAYS_INLINE _Pragma("inline=forced")
-#else
-#  define JSON_HEDLEY_ALWAYS_INLINE JSON_HEDLEY_INLINE
-#endif
-
-#if defined(JSON_HEDLEY_NEVER_INLINE)
-    #undef JSON_HEDLEY_NEVER_INLINE
-#endif
-#if \
-    JSON_HEDLEY_HAS_ATTRIBUTE(noinline) || \
-    JSON_HEDLEY_GCC_VERSION_CHECK(4,0,0) || \
-    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
-    JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \
-    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
-    JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
-    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
-    (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
-    (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
-    (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
-    (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
-    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
-    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
-    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) || \
-    JSON_HEDLEY_IAR_VERSION_CHECK(8,10,0)
-    #define JSON_HEDLEY_NEVER_INLINE __attribute__((__noinline__))
-#elif \
-    JSON_HEDLEY_MSVC_VERSION_CHECK(13,10,0) || \
-    JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
-    #define JSON_HEDLEY_NEVER_INLINE __declspec(noinline)
-#elif JSON_HEDLEY_PGI_VERSION_CHECK(10,2,0)
-    #define JSON_HEDLEY_NEVER_INLINE _Pragma("noinline")
-#elif JSON_HEDLEY_TI_CL6X_VERSION_CHECK(6,0,0) && defined(__cplusplus)
-    #define JSON_HEDLEY_NEVER_INLINE _Pragma("FUNC_CANNOT_INLINE;")
-#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
-    #define JSON_HEDLEY_NEVER_INLINE _Pragma("inline=never")
-#elif JSON_HEDLEY_COMPCERT_VERSION_CHECK(3,2,0)
-    #define JSON_HEDLEY_NEVER_INLINE __attribute((noinline))
-#elif JSON_HEDLEY_PELLES_VERSION_CHECK(9,0,0)
-    #define JSON_HEDLEY_NEVER_INLINE __declspec(noinline)
-#else
-    #define JSON_HEDLEY_NEVER_INLINE
-#endif
-
-#if defined(JSON_HEDLEY_PRIVATE)
-    #undef JSON_HEDLEY_PRIVATE
-#endif
-#if defined(JSON_HEDLEY_PUBLIC)
-    #undef JSON_HEDLEY_PUBLIC
-#endif
-#if defined(JSON_HEDLEY_IMPORT)
-    #undef JSON_HEDLEY_IMPORT
-#endif
-#if defined(_WIN32) || defined(__CYGWIN__)
-#  define JSON_HEDLEY_PRIVATE
-#  define JSON_HEDLEY_PUBLIC   __declspec(dllexport)
-#  define JSON_HEDLEY_IMPORT   __declspec(dllimport)
-#else
-#  if \
-    JSON_HEDLEY_HAS_ATTRIBUTE(visibility) || \
-    JSON_HEDLEY_GCC_VERSION_CHECK(3,3,0) || \
-    JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \
-    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
-    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
-    JSON_HEDLEY_IBM_VERSION_CHECK(13,1,0) || \
-    ( \
-      defined(__TI_EABI__) && \
-      ( \
-        (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-        JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) \
-      ) \
-    ) || \
-    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
-#    define JSON_HEDLEY_PRIVATE __attribute__((__visibility__("hidden")))
-#    define JSON_HEDLEY_PUBLIC  __attribute__((__visibility__("default")))
-#  else
-#    define JSON_HEDLEY_PRIVATE
-#    define JSON_HEDLEY_PUBLIC
-#  endif
-#  define JSON_HEDLEY_IMPORT    extern
-#endif
-
-#if defined(JSON_HEDLEY_NO_THROW)
-    #undef JSON_HEDLEY_NO_THROW
-#endif
-#if \
-    JSON_HEDLEY_HAS_ATTRIBUTE(nothrow) || \
-    JSON_HEDLEY_GCC_VERSION_CHECK(3,3,0) || \
-    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
-    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
-    #define JSON_HEDLEY_NO_THROW __attribute__((__nothrow__))
-#elif \
-    JSON_HEDLEY_MSVC_VERSION_CHECK(13,1,0) || \
-    JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) || \
-    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0)
-    #define JSON_HEDLEY_NO_THROW __declspec(nothrow)
-#else
-    #define JSON_HEDLEY_NO_THROW
-#endif
-
-#if defined(JSON_HEDLEY_FALL_THROUGH)
-    #undef JSON_HEDLEY_FALL_THROUGH
-#endif
-#if \
-    JSON_HEDLEY_HAS_ATTRIBUTE(fallthrough) || \
-    JSON_HEDLEY_GCC_VERSION_CHECK(7,0,0) || \
-    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
-    #define JSON_HEDLEY_FALL_THROUGH __attribute__((__fallthrough__))
-#elif JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS(clang,fallthrough)
-    #define JSON_HEDLEY_FALL_THROUGH JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[clang::fallthrough]])
-#elif JSON_HEDLEY_HAS_CPP_ATTRIBUTE(fallthrough)
-    #define JSON_HEDLEY_FALL_THROUGH JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[fallthrough]])
-#elif defined(__fallthrough) /* SAL */
-    #define JSON_HEDLEY_FALL_THROUGH __fallthrough
-#else
-    #define JSON_HEDLEY_FALL_THROUGH
-#endif
-
-#if defined(JSON_HEDLEY_RETURNS_NON_NULL)
-    #undef JSON_HEDLEY_RETURNS_NON_NULL
-#endif
-#if \
-    JSON_HEDLEY_HAS_ATTRIBUTE(returns_nonnull) || \
-    JSON_HEDLEY_GCC_VERSION_CHECK(4,9,0) || \
-    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
-    #define JSON_HEDLEY_RETURNS_NON_NULL __attribute__((__returns_nonnull__))
-#elif defined(_Ret_notnull_) /* SAL */
-    #define JSON_HEDLEY_RETURNS_NON_NULL _Ret_notnull_
-#else
-    #define JSON_HEDLEY_RETURNS_NON_NULL
-#endif
-
-#if defined(JSON_HEDLEY_ARRAY_PARAM)
-    #undef JSON_HEDLEY_ARRAY_PARAM
-#endif
-#if \
-    defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) && \
-    !defined(__STDC_NO_VLA__) && \
-    !defined(__cplusplus) && \
-    !defined(JSON_HEDLEY_PGI_VERSION) && \
-    !defined(JSON_HEDLEY_TINYC_VERSION)
-    #define JSON_HEDLEY_ARRAY_PARAM(name) (name)
-#else
-    #define JSON_HEDLEY_ARRAY_PARAM(name)
-#endif
-
-#if defined(JSON_HEDLEY_IS_CONSTANT)
-    #undef JSON_HEDLEY_IS_CONSTANT
-#endif
-#if defined(JSON_HEDLEY_REQUIRE_CONSTEXPR)
-    #undef JSON_HEDLEY_REQUIRE_CONSTEXPR
-#endif
-/* JSON_HEDLEY_IS_CONSTEXPR_ is for
-   HEDLEY INTERNAL USE ONLY.  API subject to change without notice. */
-#if defined(JSON_HEDLEY_IS_CONSTEXPR_)
-    #undef JSON_HEDLEY_IS_CONSTEXPR_
-#endif
-#if \
-    JSON_HEDLEY_HAS_BUILTIN(__builtin_constant_p) || \
-    JSON_HEDLEY_GCC_VERSION_CHECK(3,4,0) || \
-    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
-    JSON_HEDLEY_TINYC_VERSION_CHECK(0,9,19) || \
-    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
-    JSON_HEDLEY_IBM_VERSION_CHECK(13,1,0) || \
-    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(6,1,0) || \
-    (JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0) && !defined(__cplusplus)) || \
-    JSON_HEDLEY_CRAY_VERSION_CHECK(8,1,0) || \
-    JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10)
-    #define JSON_HEDLEY_IS_CONSTANT(expr) __builtin_constant_p(expr)
-#endif
-#if !defined(__cplusplus)
-#  if \
-       JSON_HEDLEY_HAS_BUILTIN(__builtin_types_compatible_p) || \
-       JSON_HEDLEY_GCC_VERSION_CHECK(3,4,0) || \
-       JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
-       JSON_HEDLEY_IBM_VERSION_CHECK(13,1,0) || \
-       JSON_HEDLEY_CRAY_VERSION_CHECK(8,1,0) || \
-       JSON_HEDLEY_ARM_VERSION_CHECK(5,4,0) || \
-       JSON_HEDLEY_TINYC_VERSION_CHECK(0,9,24)
-#if defined(__INTPTR_TYPE__)
-    #define JSON_HEDLEY_IS_CONSTEXPR_(expr) __builtin_types_compatible_p(__typeof__((1 ? (void*) ((__INTPTR_TYPE__) ((expr) * 0)) : (int*) 0)), int*)
-#else
-    #include <stdint.h>
-    #define JSON_HEDLEY_IS_CONSTEXPR_(expr) __builtin_types_compatible_p(__typeof__((1 ? (void*) ((intptr_t) ((expr) * 0)) : (int*) 0)), int*)
-#endif
-#  elif \
-       ( \
-          defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L) && \
-          !defined(JSON_HEDLEY_SUNPRO_VERSION) && \
-          !defined(JSON_HEDLEY_PGI_VERSION) && \
-          !defined(JSON_HEDLEY_IAR_VERSION)) || \
-       (JSON_HEDLEY_HAS_EXTENSION(c_generic_selections) && !defined(JSON_HEDLEY_IAR_VERSION)) || \
-       JSON_HEDLEY_GCC_VERSION_CHECK(4,9,0) || \
-       JSON_HEDLEY_INTEL_VERSION_CHECK(17,0,0) || \
-       JSON_HEDLEY_IBM_VERSION_CHECK(12,1,0) || \
-       JSON_HEDLEY_ARM_VERSION_CHECK(5,3,0)
-#if defined(__INTPTR_TYPE__)
-    #define JSON_HEDLEY_IS_CONSTEXPR_(expr) _Generic((1 ? (void*) ((__INTPTR_TYPE__) ((expr) * 0)) : (int*) 0), int*: 1, void*: 0)
-#else
-    #include <stdint.h>
-    #define JSON_HEDLEY_IS_CONSTEXPR_(expr) _Generic((1 ? (void*) ((intptr_t) * 0) : (int*) 0), int*: 1, void*: 0)
-#endif
-#  elif \
-       defined(JSON_HEDLEY_GCC_VERSION) || \
-       defined(JSON_HEDLEY_INTEL_VERSION) || \
-       defined(JSON_HEDLEY_TINYC_VERSION) || \
-       defined(JSON_HEDLEY_TI_ARMCL_VERSION) || \
-       JSON_HEDLEY_TI_CL430_VERSION_CHECK(18,12,0) || \
-       defined(JSON_HEDLEY_TI_CL2000_VERSION) || \
-       defined(JSON_HEDLEY_TI_CL6X_VERSION) || \
-       defined(JSON_HEDLEY_TI_CL7X_VERSION) || \
-       defined(JSON_HEDLEY_TI_CLPRU_VERSION) || \
-       defined(__clang__)
-#    define JSON_HEDLEY_IS_CONSTEXPR_(expr) ( \
-        sizeof(void) != \
-        sizeof(*( \
-                  1 ? \
-                  ((void*) ((expr) * 0L) ) : \
-((struct { char v[sizeof(void) * 2]; } *) 1) \
-                ) \
-              ) \
-                                            )
-#  endif
-#endif
-#if defined(JSON_HEDLEY_IS_CONSTEXPR_)
-    #if !defined(JSON_HEDLEY_IS_CONSTANT)
-        #define JSON_HEDLEY_IS_CONSTANT(expr) JSON_HEDLEY_IS_CONSTEXPR_(expr)
-    #endif
-    #define JSON_HEDLEY_REQUIRE_CONSTEXPR(expr) (JSON_HEDLEY_IS_CONSTEXPR_(expr) ? (expr) : (-1))
-#else
-    #if !defined(JSON_HEDLEY_IS_CONSTANT)
-        #define JSON_HEDLEY_IS_CONSTANT(expr) (0)
-    #endif
-    #define JSON_HEDLEY_REQUIRE_CONSTEXPR(expr) (expr)
-#endif
-
-#if defined(JSON_HEDLEY_BEGIN_C_DECLS)
-    #undef JSON_HEDLEY_BEGIN_C_DECLS
-#endif
-#if defined(JSON_HEDLEY_END_C_DECLS)
-    #undef JSON_HEDLEY_END_C_DECLS
-#endif
-#if defined(JSON_HEDLEY_C_DECL)
-    #undef JSON_HEDLEY_C_DECL
-#endif
-#if defined(__cplusplus)
-    #define JSON_HEDLEY_BEGIN_C_DECLS extern "C" {
-    #define JSON_HEDLEY_END_C_DECLS }
-    #define JSON_HEDLEY_C_DECL extern "C"
-#else
-    #define JSON_HEDLEY_BEGIN_C_DECLS
-    #define JSON_HEDLEY_END_C_DECLS
-    #define JSON_HEDLEY_C_DECL
-#endif
-
-#if defined(JSON_HEDLEY_STATIC_ASSERT)
-    #undef JSON_HEDLEY_STATIC_ASSERT
-#endif
-#if \
-  !defined(__cplusplus) && ( \
-      (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L)) || \
-      (JSON_HEDLEY_HAS_FEATURE(c_static_assert) && !defined(JSON_HEDLEY_INTEL_CL_VERSION)) || \
-      JSON_HEDLEY_GCC_VERSION_CHECK(6,0,0) || \
-      JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
-      defined(_Static_assert) \
-    )
-#  define JSON_HEDLEY_STATIC_ASSERT(expr, message) _Static_assert(expr, message)
-#elif \
-  (defined(__cplusplus) && (__cplusplus >= 201103L)) || \
-  JSON_HEDLEY_MSVC_VERSION_CHECK(16,0,0) || \
-  JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
-#  define JSON_HEDLEY_STATIC_ASSERT(expr, message) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(static_assert(expr, message))
-#else
-#  define JSON_HEDLEY_STATIC_ASSERT(expr, message)
-#endif
-
-#if defined(JSON_HEDLEY_NULL)
-    #undef JSON_HEDLEY_NULL
-#endif
-#if defined(__cplusplus)
-    #if __cplusplus >= 201103L
-        #define JSON_HEDLEY_NULL JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(nullptr)
-    #elif defined(NULL)
-        #define JSON_HEDLEY_NULL NULL
-    #else
-        #define JSON_HEDLEY_NULL JSON_HEDLEY_STATIC_CAST(void*, 0)
-    #endif
-#elif defined(NULL)
-    #define JSON_HEDLEY_NULL NULL
-#else
-    #define JSON_HEDLEY_NULL ((void*) 0)
-#endif
-
-#if defined(JSON_HEDLEY_MESSAGE)
-    #undef JSON_HEDLEY_MESSAGE
-#endif
-#if JSON_HEDLEY_HAS_WARNING("-Wunknown-pragmas")
-#  define JSON_HEDLEY_MESSAGE(msg) \
-    JSON_HEDLEY_DIAGNOSTIC_PUSH \
-    JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS \
-    JSON_HEDLEY_PRAGMA(message msg) \
-    JSON_HEDLEY_DIAGNOSTIC_POP
-#elif \
-  JSON_HEDLEY_GCC_VERSION_CHECK(4,4,0) || \
-  JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
-#  define JSON_HEDLEY_MESSAGE(msg) JSON_HEDLEY_PRAGMA(message msg)
-#elif JSON_HEDLEY_CRAY_VERSION_CHECK(5,0,0)
-#  define JSON_HEDLEY_MESSAGE(msg) JSON_HEDLEY_PRAGMA(_CRI message msg)
-#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
-#  define JSON_HEDLEY_MESSAGE(msg) JSON_HEDLEY_PRAGMA(message(msg))
-#elif JSON_HEDLEY_PELLES_VERSION_CHECK(2,0,0)
-#  define JSON_HEDLEY_MESSAGE(msg) JSON_HEDLEY_PRAGMA(message(msg))
-#else
-#  define JSON_HEDLEY_MESSAGE(msg)
-#endif
-
-#if defined(JSON_HEDLEY_WARNING)
-    #undef JSON_HEDLEY_WARNING
-#endif
-#if JSON_HEDLEY_HAS_WARNING("-Wunknown-pragmas")
-#  define JSON_HEDLEY_WARNING(msg) \
-    JSON_HEDLEY_DIAGNOSTIC_PUSH \
-    JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS \
-    JSON_HEDLEY_PRAGMA(clang warning msg) \
-    JSON_HEDLEY_DIAGNOSTIC_POP
-#elif \
-  JSON_HEDLEY_GCC_VERSION_CHECK(4,8,0) || \
-  JSON_HEDLEY_PGI_VERSION_CHECK(18,4,0) || \
-  JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
-#  define JSON_HEDLEY_WARNING(msg) JSON_HEDLEY_PRAGMA(GCC warning msg)
-#elif \
-  JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0) || \
-  JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
-#  define JSON_HEDLEY_WARNING(msg) JSON_HEDLEY_PRAGMA(message(msg))
-#else
-#  define JSON_HEDLEY_WARNING(msg) JSON_HEDLEY_MESSAGE(msg)
-#endif
-
-#if defined(JSON_HEDLEY_REQUIRE)
-    #undef JSON_HEDLEY_REQUIRE
-#endif
-#if defined(JSON_HEDLEY_REQUIRE_MSG)
-    #undef JSON_HEDLEY_REQUIRE_MSG
-#endif
-#if JSON_HEDLEY_HAS_ATTRIBUTE(diagnose_if)
-#  if JSON_HEDLEY_HAS_WARNING("-Wgcc-compat")
-#    define JSON_HEDLEY_REQUIRE(expr) \
-    JSON_HEDLEY_DIAGNOSTIC_PUSH \
-    _Pragma("clang diagnostic ignored \"-Wgcc-compat\"") \
-    __attribute__((diagnose_if(!(expr), #expr, "error"))) \
-    JSON_HEDLEY_DIAGNOSTIC_POP
-#    define JSON_HEDLEY_REQUIRE_MSG(expr,msg) \
-    JSON_HEDLEY_DIAGNOSTIC_PUSH \
-    _Pragma("clang diagnostic ignored \"-Wgcc-compat\"") \
-    __attribute__((diagnose_if(!(expr), msg, "error"))) \
-    JSON_HEDLEY_DIAGNOSTIC_POP
-#  else
-#    define JSON_HEDLEY_REQUIRE(expr) __attribute__((diagnose_if(!(expr), #expr, "error")))
-#    define JSON_HEDLEY_REQUIRE_MSG(expr,msg) __attribute__((diagnose_if(!(expr), msg, "error")))
-#  endif
-#else
-#  define JSON_HEDLEY_REQUIRE(expr)
-#  define JSON_HEDLEY_REQUIRE_MSG(expr,msg)
-#endif
-
-#if defined(JSON_HEDLEY_FLAGS)
-    #undef JSON_HEDLEY_FLAGS
-#endif
-#if JSON_HEDLEY_HAS_ATTRIBUTE(flag_enum) && (!defined(__cplusplus) || JSON_HEDLEY_HAS_WARNING("-Wbitfield-enum-conversion"))
-    #define JSON_HEDLEY_FLAGS __attribute__((__flag_enum__))
-#else
-    #define JSON_HEDLEY_FLAGS
-#endif
-
-#if defined(JSON_HEDLEY_FLAGS_CAST)
-    #undef JSON_HEDLEY_FLAGS_CAST
-#endif
-#if JSON_HEDLEY_INTEL_VERSION_CHECK(19,0,0)
-#  define JSON_HEDLEY_FLAGS_CAST(T, expr) (__extension__ ({ \
-        JSON_HEDLEY_DIAGNOSTIC_PUSH \
-        _Pragma("warning(disable:188)") \
-        ((T) (expr)); \
-        JSON_HEDLEY_DIAGNOSTIC_POP \
-    }))
-#else
-#  define JSON_HEDLEY_FLAGS_CAST(T, expr) JSON_HEDLEY_STATIC_CAST(T, expr)
-#endif
-
-#if defined(JSON_HEDLEY_EMPTY_BASES)
-    #undef JSON_HEDLEY_EMPTY_BASES
-#endif
-#if \
-    (JSON_HEDLEY_MSVC_VERSION_CHECK(19,0,23918) && !JSON_HEDLEY_MSVC_VERSION_CHECK(20,0,0)) || \
-    JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0)
-    #define JSON_HEDLEY_EMPTY_BASES __declspec(empty_bases)
-#else
-    #define JSON_HEDLEY_EMPTY_BASES
-#endif
-
-/* Remaining macros are deprecated. */
-
-#if defined(JSON_HEDLEY_GCC_NOT_CLANG_VERSION_CHECK)
-    #undef JSON_HEDLEY_GCC_NOT_CLANG_VERSION_CHECK
-#endif
-#if defined(__clang__)
-    #define JSON_HEDLEY_GCC_NOT_CLANG_VERSION_CHECK(major,minor,patch) (0)
-#else
-    #define JSON_HEDLEY_GCC_NOT_CLANG_VERSION_CHECK(major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
-#endif
-
-#if defined(JSON_HEDLEY_CLANG_HAS_ATTRIBUTE)
-    #undef JSON_HEDLEY_CLANG_HAS_ATTRIBUTE
-#endif
-#define JSON_HEDLEY_CLANG_HAS_ATTRIBUTE(attribute) JSON_HEDLEY_HAS_ATTRIBUTE(attribute)
-
-#if defined(JSON_HEDLEY_CLANG_HAS_CPP_ATTRIBUTE)
-    #undef JSON_HEDLEY_CLANG_HAS_CPP_ATTRIBUTE
-#endif
-#define JSON_HEDLEY_CLANG_HAS_CPP_ATTRIBUTE(attribute) JSON_HEDLEY_HAS_CPP_ATTRIBUTE(attribute)
-
-#if defined(JSON_HEDLEY_CLANG_HAS_BUILTIN)
-    #undef JSON_HEDLEY_CLANG_HAS_BUILTIN
-#endif
-#define JSON_HEDLEY_CLANG_HAS_BUILTIN(builtin) JSON_HEDLEY_HAS_BUILTIN(builtin)
-
-#if defined(JSON_HEDLEY_CLANG_HAS_FEATURE)
-    #undef JSON_HEDLEY_CLANG_HAS_FEATURE
-#endif
-#define JSON_HEDLEY_CLANG_HAS_FEATURE(feature) JSON_HEDLEY_HAS_FEATURE(feature)
-
-#if defined(JSON_HEDLEY_CLANG_HAS_EXTENSION)
-    #undef JSON_HEDLEY_CLANG_HAS_EXTENSION
-#endif
-#define JSON_HEDLEY_CLANG_HAS_EXTENSION(extension) JSON_HEDLEY_HAS_EXTENSION(extension)
-
-#if defined(JSON_HEDLEY_CLANG_HAS_DECLSPEC_DECLSPEC_ATTRIBUTE)
-    #undef JSON_HEDLEY_CLANG_HAS_DECLSPEC_DECLSPEC_ATTRIBUTE
-#endif
-#define JSON_HEDLEY_CLANG_HAS_DECLSPEC_ATTRIBUTE(attribute) JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE(attribute)
-
-#if defined(JSON_HEDLEY_CLANG_HAS_WARNING)
-    #undef JSON_HEDLEY_CLANG_HAS_WARNING
-#endif
-#define JSON_HEDLEY_CLANG_HAS_WARNING(warning) JSON_HEDLEY_HAS_WARNING(warning)
-
-#endif /* !defined(JSON_HEDLEY_VERSION) || (JSON_HEDLEY_VERSION < X) */
-
-// #include <nlohmann/detail/meta/detected.hpp>
-
-
-#include <type_traits>
-
-// #include <nlohmann/detail/meta/void_t.hpp>
-
-
-namespace nlohmann
-{
-namespace detail
-{
-template<typename ...Ts> struct make_void
-{
-    using type = void;
-};
-template<typename ...Ts> using void_t = typename make_void<Ts...>::type;
-} // namespace detail
-}  // namespace nlohmann
-
-
-// https://en.cppreference.com/w/cpp/experimental/is_detected
-namespace nlohmann
-{
-namespace detail
-{
-struct nonesuch
-{
-    nonesuch() = delete;
-    ~nonesuch() = delete;
-    nonesuch(nonesuch const&) = delete;
-    nonesuch(nonesuch const&&) = delete;
-    void operator=(nonesuch const&) = delete;
-    void operator=(nonesuch&&) = delete;
-};
-
-template<class Default,
-         class AlwaysVoid,
-         template<class...> class Op,
-         class... Args>
-struct detector
-{
-    using value_t = std::false_type;
-    using type = Default;
-};
-
-template<class Default, template<class...> class Op, class... Args>
-struct detector<Default, void_t<Op<Args...>>, Op, Args...>
-{
-    using value_t = std::true_type;
-    using type = Op<Args...>;
-};
-
-template<template<class...> class Op, class... Args>
-using is_detected = typename detector<nonesuch, void, Op, Args...>::value_t;
-
-template<template<class...> class Op, class... Args>
-struct is_detected_lazy : is_detected<Op, Args...> { };
-
-template<template<class...> class Op, class... Args>
-using detected_t = typename detector<nonesuch, void, Op, Args...>::type;
-
-template<class Default, template<class...> class Op, class... Args>
-using detected_or = detector<Default, void, Op, Args...>;
-
-template<class Default, template<class...> class Op, class... Args>
-using detected_or_t = typename detected_or<Default, Op, Args...>::type;
-
-template<class Expected, template<class...> class Op, class... Args>
-using is_detected_exact = std::is_same<Expected, detected_t<Op, Args...>>;
-
-template<class To, template<class...> class Op, class... Args>
-using is_detected_convertible =
-    std::is_convertible<detected_t<Op, Args...>, To>;
-}  // namespace detail
-}  // namespace nlohmann
-
-
-// This file contains all internal macro definitions
-// You MUST include macro_unscope.hpp at the end of json.hpp to undef all of them
-
-// exclude unsupported compilers
-#if !defined(JSON_SKIP_UNSUPPORTED_COMPILER_CHECK)
-    #if defined(__clang__)
-        #if (__clang_major__ * 10000 + __clang_minor__ * 100 + __clang_patchlevel__) < 30400
-            #error "unsupported Clang version - see https://github.com/nlohmann/json#supported-compilers"
-        #endif
-    #elif defined(__GNUC__) && !(defined(__ICC) || defined(__INTEL_COMPILER))
-        #if (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) < 40800
-            #error "unsupported GCC version - see https://github.com/nlohmann/json#supported-compilers"
-        #endif
-    #endif
-#endif
-
-// C++ language standard detection
-// if the user manually specified the used c++ version this is skipped
-#if !defined(JSON_HAS_CPP_20) && !defined(JSON_HAS_CPP_17) && !defined(JSON_HAS_CPP_14) && !defined(JSON_HAS_CPP_11)
-    #if (defined(__cplusplus) && __cplusplus >= 202002L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 202002L)
-        #define JSON_HAS_CPP_20
-        #define JSON_HAS_CPP_17
-        #define JSON_HAS_CPP_14
-    #elif (defined(__cplusplus) && __cplusplus >= 201703L) || (defined(_HAS_CXX17) && _HAS_CXX17 == 1) // fix for issue #464
-        #define JSON_HAS_CPP_17
-        #define JSON_HAS_CPP_14
-    #elif (defined(__cplusplus) && __cplusplus >= 201402L) || (defined(_HAS_CXX14) && _HAS_CXX14 == 1)
-        #define JSON_HAS_CPP_14
-    #endif
-    // the cpp 11 flag is always specified because it is the minimal required version
-    #define JSON_HAS_CPP_11
-#endif
-
-#if !defined(JSON_HAS_FILESYSTEM) && !defined(JSON_HAS_EXPERIMENTAL_FILESYSTEM)
-    #ifdef JSON_HAS_CPP_17
-        #if defined(__cpp_lib_filesystem)
-            #define JSON_HAS_FILESYSTEM 1
-        #elif defined(__cpp_lib_experimental_filesystem)
-            #define JSON_HAS_EXPERIMENTAL_FILESYSTEM 1
-        #elif !defined(__has_include)
-            #define JSON_HAS_EXPERIMENTAL_FILESYSTEM 1
-        #elif __has_include(<filesystem>)
-            #define JSON_HAS_FILESYSTEM 1
-        #elif __has_include(<experimental/filesystem>)
-            #define JSON_HAS_EXPERIMENTAL_FILESYSTEM 1
-        #endif
-
-        // std::filesystem does not work on MinGW GCC 8: https://sourceforge.net/p/mingw-w64/bugs/737/
-        #if defined(__MINGW32__) && defined(__GNUC__) && __GNUC__ == 8
-            #undef JSON_HAS_FILESYSTEM
-            #undef JSON_HAS_EXPERIMENTAL_FILESYSTEM
-        #endif
-
-        // no filesystem support before GCC 8: https://en.cppreference.com/w/cpp/compiler_support
-        #if defined(__GNUC__) && !defined(__clang__) && __GNUC__ < 8
-            #undef JSON_HAS_FILESYSTEM
-            #undef JSON_HAS_EXPERIMENTAL_FILESYSTEM
-        #endif
-
-        // no filesystem support before Clang 7: https://en.cppreference.com/w/cpp/compiler_support
-        #if defined(__clang_major__) && __clang_major__ < 7
-            #undef JSON_HAS_FILESYSTEM
-            #undef JSON_HAS_EXPERIMENTAL_FILESYSTEM
-        #endif
-
-        // no filesystem support before MSVC 19.14: https://en.cppreference.com/w/cpp/compiler_support
-        #if defined(_MSC_VER) && _MSC_VER < 1940
-            #undef JSON_HAS_FILESYSTEM
-            #undef JSON_HAS_EXPERIMENTAL_FILESYSTEM
-        #endif
-
-        // no filesystem support before iOS 13
-        #if defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && __IPHONE_OS_VERSION_MIN_REQUIRED < 130000
-            #undef JSON_HAS_FILESYSTEM
-            #undef JSON_HAS_EXPERIMENTAL_FILESYSTEM
-        #endif
-
-        // no filesystem support before macOS Catalina
-        #if defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101500
-            #undef JSON_HAS_FILESYSTEM
-            #undef JSON_HAS_EXPERIMENTAL_FILESYSTEM
-        #endif
-    #endif
-#endif
-
-#ifndef JSON_HAS_EXPERIMENTAL_FILESYSTEM
-    #define JSON_HAS_EXPERIMENTAL_FILESYSTEM 0
-#endif
-
-#ifndef JSON_HAS_FILESYSTEM
-    #define JSON_HAS_FILESYSTEM 0
-#endif
-
-// disable documentation warnings on clang
-#if defined(__clang__)
-    #pragma clang diagnostic push
-    #pragma clang diagnostic ignored "-Wdocumentation"
-    #pragma clang diagnostic ignored "-Wdocumentation-unknown-command"
-#endif
-
-// allow disabling exceptions
-#if (defined(__cpp_exceptions) || defined(__EXCEPTIONS) || defined(_CPPUNWIND)) && !defined(JSON_NOEXCEPTION)
-    #define JSON_THROW(exception) throw exception
-    #define JSON_TRY try
-    #define JSON_CATCH(exception) catch(exception)
-    #define JSON_INTERNAL_CATCH(exception) catch(exception)
-#else
-    #include <cstdlib>
-    #define JSON_THROW(exception) std::abort()
-    #define JSON_TRY if(true)
-    #define JSON_CATCH(exception) if(false)
-    #define JSON_INTERNAL_CATCH(exception) if(false)
-#endif
-
-// override exception macros
-#if defined(JSON_THROW_USER)
-    #undef JSON_THROW
-    #define JSON_THROW JSON_THROW_USER
-#endif
-#if defined(JSON_TRY_USER)
-    #undef JSON_TRY
-    #define JSON_TRY JSON_TRY_USER
-#endif
-#if defined(JSON_CATCH_USER)
-    #undef JSON_CATCH
-    #define JSON_CATCH JSON_CATCH_USER
-    #undef JSON_INTERNAL_CATCH
-    #define JSON_INTERNAL_CATCH JSON_CATCH_USER
-#endif
-#if defined(JSON_INTERNAL_CATCH_USER)
-    #undef JSON_INTERNAL_CATCH
-    #define JSON_INTERNAL_CATCH JSON_INTERNAL_CATCH_USER
-#endif
-
-// allow overriding assert
-#if !defined(JSON_ASSERT)
-    #include <cassert> // assert
-    #define JSON_ASSERT(x) assert(x)
-#endif
-
-// allow to access some private functions (needed by the test suite)
-#if defined(JSON_TESTS_PRIVATE)
-    #define JSON_PRIVATE_UNLESS_TESTED public
-#else
-    #define JSON_PRIVATE_UNLESS_TESTED private
-#endif
-
-/*!
-@brief macro to briefly define a mapping between an enum and JSON
-@def NLOHMANN_JSON_SERIALIZE_ENUM
-@since version 3.4.0
-*/
-#define NLOHMANN_JSON_SERIALIZE_ENUM(ENUM_TYPE, ...)                                            \
-    template<typename BasicJsonType>                                                            \
-    inline void to_json(BasicJsonType& j, const ENUM_TYPE& e)                                   \
-    {                                                                                           \
-        static_assert(std::is_enum<ENUM_TYPE>::value, #ENUM_TYPE " must be an enum!");          \
-        static const std::pair<ENUM_TYPE, BasicJsonType> m[] = __VA_ARGS__;                     \
-        auto it = std::find_if(std::begin(m), std::end(m),                                      \
-                               [e](const std::pair<ENUM_TYPE, BasicJsonType>& ej_pair) -> bool  \
-        {                                                                                       \
-            return ej_pair.first == e;                                                          \
-        });                                                                                     \
-        j = ((it != std::end(m)) ? it : std::begin(m))->second;                                 \
-    }                                                                                           \
-    template<typename BasicJsonType>                                                            \
-    inline void from_json(const BasicJsonType& j, ENUM_TYPE& e)                                 \
-    {                                                                                           \
-        static_assert(std::is_enum<ENUM_TYPE>::value, #ENUM_TYPE " must be an enum!");          \
-        static const std::pair<ENUM_TYPE, BasicJsonType> m[] = __VA_ARGS__;                     \
-        auto it = std::find_if(std::begin(m), std::end(m),                                      \
-                               [&j](const std::pair<ENUM_TYPE, BasicJsonType>& ej_pair) -> bool \
-        {                                                                                       \
-            return ej_pair.second == j;                                                         \
-        });                                                                                     \
-        e = ((it != std::end(m)) ? it : std::begin(m))->first;                                  \
-    }
-
-// Ugly macros to avoid uglier copy-paste when specializing basic_json. They
-// may be removed in the future once the class is split.
-
-#define NLOHMANN_BASIC_JSON_TPL_DECLARATION                                \
-    template<template<typename, typename, typename...> class ObjectType,   \
-             template<typename, typename...> class ArrayType,              \
-             class StringType, class BooleanType, class NumberIntegerType, \
-             class NumberUnsignedType, class NumberFloatType,              \
-             template<typename> class AllocatorType,                       \
-             template<typename, typename = void> class JSONSerializer,     \
-             class BinaryType>
-
-#define NLOHMANN_BASIC_JSON_TPL                                            \
-    basic_json<ObjectType, ArrayType, StringType, BooleanType,             \
-    NumberIntegerType, NumberUnsignedType, NumberFloatType,                \
-    AllocatorType, JSONSerializer, BinaryType>
-
-// Macros to simplify conversion from/to types
-
-#define NLOHMANN_JSON_EXPAND( x ) x
-#define NLOHMANN_JSON_GET_MACRO(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50, _51, _52, _53, _54, _55, _56, _57, _58, _59, _60, _61, _62, _63, _64, NAME,...) NAME
-#define NLOHMANN_JSON_PASTE(...) NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_GET_MACRO(__VA_ARGS__, \
-        NLOHMANN_JSON_PASTE64, \
-        NLOHMANN_JSON_PASTE63, \
-        NLOHMANN_JSON_PASTE62, \
-        NLOHMANN_JSON_PASTE61, \
-        NLOHMANN_JSON_PASTE60, \
-        NLOHMANN_JSON_PASTE59, \
-        NLOHMANN_JSON_PASTE58, \
-        NLOHMANN_JSON_PASTE57, \
-        NLOHMANN_JSON_PASTE56, \
-        NLOHMANN_JSON_PASTE55, \
-        NLOHMANN_JSON_PASTE54, \
-        NLOHMANN_JSON_PASTE53, \
-        NLOHMANN_JSON_PASTE52, \
-        NLOHMANN_JSON_PASTE51, \
-        NLOHMANN_JSON_PASTE50, \
-        NLOHMANN_JSON_PASTE49, \
-        NLOHMANN_JSON_PASTE48, \
-        NLOHMANN_JSON_PASTE47, \
-        NLOHMANN_JSON_PASTE46, \
-        NLOHMANN_JSON_PASTE45, \
-        NLOHMANN_JSON_PASTE44, \
-        NLOHMANN_JSON_PASTE43, \
-        NLOHMANN_JSON_PASTE42, \
-        NLOHMANN_JSON_PASTE41, \
-        NLOHMANN_JSON_PASTE40, \
-        NLOHMANN_JSON_PASTE39, \
-        NLOHMANN_JSON_PASTE38, \
-        NLOHMANN_JSON_PASTE37, \
-        NLOHMANN_JSON_PASTE36, \
-        NLOHMANN_JSON_PASTE35, \
-        NLOHMANN_JSON_PASTE34, \
-        NLOHMANN_JSON_PASTE33, \
-        NLOHMANN_JSON_PASTE32, \
-        NLOHMANN_JSON_PASTE31, \
-        NLOHMANN_JSON_PASTE30, \
-        NLOHMANN_JSON_PASTE29, \
-        NLOHMANN_JSON_PASTE28, \
-        NLOHMANN_JSON_PASTE27, \
-        NLOHMANN_JSON_PASTE26, \
-        NLOHMANN_JSON_PASTE25, \
-        NLOHMANN_JSON_PASTE24, \
-        NLOHMANN_JSON_PASTE23, \
-        NLOHMANN_JSON_PASTE22, \
-        NLOHMANN_JSON_PASTE21, \
-        NLOHMANN_JSON_PASTE20, \
-        NLOHMANN_JSON_PASTE19, \
-        NLOHMANN_JSON_PASTE18, \
-        NLOHMANN_JSON_PASTE17, \
-        NLOHMANN_JSON_PASTE16, \
-        NLOHMANN_JSON_PASTE15, \
-        NLOHMANN_JSON_PASTE14, \
-        NLOHMANN_JSON_PASTE13, \
-        NLOHMANN_JSON_PASTE12, \
-        NLOHMANN_JSON_PASTE11, \
-        NLOHMANN_JSON_PASTE10, \
-        NLOHMANN_JSON_PASTE9, \
-        NLOHMANN_JSON_PASTE8, \
-        NLOHMANN_JSON_PASTE7, \
-        NLOHMANN_JSON_PASTE6, \
-        NLOHMANN_JSON_PASTE5, \
-        NLOHMANN_JSON_PASTE4, \
-        NLOHMANN_JSON_PASTE3, \
-        NLOHMANN_JSON_PASTE2, \
-        NLOHMANN_JSON_PASTE1)(__VA_ARGS__))
-#define NLOHMANN_JSON_PASTE2(func, v1) func(v1)
-#define NLOHMANN_JSON_PASTE3(func, v1, v2) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE2(func, v2)
-#define NLOHMANN_JSON_PASTE4(func, v1, v2, v3) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE3(func, v2, v3)
-#define NLOHMANN_JSON_PASTE5(func, v1, v2, v3, v4) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE4(func, v2, v3, v4)
-#define NLOHMANN_JSON_PASTE6(func, v1, v2, v3, v4, v5) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE5(func, v2, v3, v4, v5)
-#define NLOHMANN_JSON_PASTE7(func, v1, v2, v3, v4, v5, v6) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE6(func, v2, v3, v4, v5, v6)
-#define NLOHMANN_JSON_PASTE8(func, v1, v2, v3, v4, v5, v6, v7) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE7(func, v2, v3, v4, v5, v6, v7)
-#define NLOHMANN_JSON_PASTE9(func, v1, v2, v3, v4, v5, v6, v7, v8) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE8(func, v2, v3, v4, v5, v6, v7, v8)
-#define NLOHMANN_JSON_PASTE10(func, v1, v2, v3, v4, v5, v6, v7, v8, v9) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE9(func, v2, v3, v4, v5, v6, v7, v8, v9)
-#define NLOHMANN_JSON_PASTE11(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE10(func, v2, v3, v4, v5, v6, v7, v8, v9, v10)
-#define NLOHMANN_JSON_PASTE12(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE11(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11)
-#define NLOHMANN_JSON_PASTE13(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE12(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12)
-#define NLOHMANN_JSON_PASTE14(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE13(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13)
-#define NLOHMANN_JSON_PASTE15(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE14(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14)
-#define NLOHMANN_JSON_PASTE16(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE15(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15)
-#define NLOHMANN_JSON_PASTE17(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE16(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16)
-#define NLOHMANN_JSON_PASTE18(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE17(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17)
-#define NLOHMANN_JSON_PASTE19(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE18(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18)
-#define NLOHMANN_JSON_PASTE20(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE19(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19)
-#define NLOHMANN_JSON_PASTE21(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE20(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20)
-#define NLOHMANN_JSON_PASTE22(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE21(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21)
-#define NLOHMANN_JSON_PASTE23(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE22(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22)
-#define NLOHMANN_JSON_PASTE24(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE23(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23)
-#define NLOHMANN_JSON_PASTE25(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE24(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24)
-#define NLOHMANN_JSON_PASTE26(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE25(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25)
-#define NLOHMANN_JSON_PASTE27(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE26(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26)
-#define NLOHMANN_JSON_PASTE28(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE27(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27)
-#define NLOHMANN_JSON_PASTE29(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE28(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28)
-#define NLOHMANN_JSON_PASTE30(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE29(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29)
-#define NLOHMANN_JSON_PASTE31(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE30(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30)
-#define NLOHMANN_JSON_PASTE32(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE31(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31)
-#define NLOHMANN_JSON_PASTE33(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE32(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32)
-#define NLOHMANN_JSON_PASTE34(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE33(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33)
-#define NLOHMANN_JSON_PASTE35(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE34(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34)
-#define NLOHMANN_JSON_PASTE36(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE35(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35)
-#define NLOHMANN_JSON_PASTE37(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE36(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36)
-#define NLOHMANN_JSON_PASTE38(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE37(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37)
-#define NLOHMANN_JSON_PASTE39(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE38(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38)
-#define NLOHMANN_JSON_PASTE40(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE39(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39)
-#define NLOHMANN_JSON_PASTE41(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE40(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40)
-#define NLOHMANN_JSON_PASTE42(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE41(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41)
-#define NLOHMANN_JSON_PASTE43(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE42(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42)
-#define NLOHMANN_JSON_PASTE44(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE43(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43)
-#define NLOHMANN_JSON_PASTE45(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE44(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44)
-#define NLOHMANN_JSON_PASTE46(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE45(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45)
-#define NLOHMANN_JSON_PASTE47(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE46(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46)
-#define NLOHMANN_JSON_PASTE48(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE47(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47)
-#define NLOHMANN_JSON_PASTE49(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE48(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48)
-#define NLOHMANN_JSON_PASTE50(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE49(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49)
-#define NLOHMANN_JSON_PASTE51(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE50(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50)
-#define NLOHMANN_JSON_PASTE52(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE51(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51)
-#define NLOHMANN_JSON_PASTE53(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE52(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52)
-#define NLOHMANN_JSON_PASTE54(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE53(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53)
-#define NLOHMANN_JSON_PASTE55(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE54(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54)
-#define NLOHMANN_JSON_PASTE56(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE55(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55)
-#define NLOHMANN_JSON_PASTE57(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE56(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56)
-#define NLOHMANN_JSON_PASTE58(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE57(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57)
-#define NLOHMANN_JSON_PASTE59(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE58(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58)
-#define NLOHMANN_JSON_PASTE60(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE59(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59)
-#define NLOHMANN_JSON_PASTE61(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE60(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60)
-#define NLOHMANN_JSON_PASTE62(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE61(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61)
-#define NLOHMANN_JSON_PASTE63(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61, v62) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE62(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61, v62)
-#define NLOHMANN_JSON_PASTE64(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61, v62, v63) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE63(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61, v62, v63)
-
-#define NLOHMANN_JSON_TO(v1) nlohmann_json_j[#v1] = nlohmann_json_t.v1;
-#define NLOHMANN_JSON_FROM(v1) nlohmann_json_j.at(#v1).get_to(nlohmann_json_t.v1);
-
-/*!
-@brief macro
-@def NLOHMANN_DEFINE_TYPE_INTRUSIVE
-@since version 3.9.0
-*/
-#define NLOHMANN_DEFINE_TYPE_INTRUSIVE(Type, ...)  \
-    friend void to_json(nlohmann::json& nlohmann_json_j, const Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) } \
-    friend void from_json(const nlohmann::json& nlohmann_json_j, Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_FROM, __VA_ARGS__)) }
-
-/*!
-@brief macro
-@def NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE
-@since version 3.9.0
-*/
-#define NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(Type, ...)  \
-    inline void to_json(nlohmann::json& nlohmann_json_j, const Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) } \
-    inline void from_json(const nlohmann::json& nlohmann_json_j, Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_FROM, __VA_ARGS__)) }
-
-
-// inspired from https://stackoverflow.com/a/26745591
-// allows to call any std function as if (e.g. with begin):
-// using std::begin; begin(x);
-//
-// it allows using the detected idiom to retrieve the return type
-// of such an expression
-#define NLOHMANN_CAN_CALL_STD_FUNC_IMPL(std_name)                                 \
-    namespace detail {                                                            \
-    using std::std_name;                                                          \
-    \
-    template<typename... T>                                                       \
-    using result_of_##std_name = decltype(std_name(std::declval<T>()...));        \
-    }                                                                             \
-    \
-    namespace detail2 {                                                           \
-    struct std_name##_tag                                                         \
-    {                                                                             \
-    };                                                                            \
-    \
-    template<typename... T>                                                       \
-    std_name##_tag std_name(T&&...);                                              \
-    \
-    template<typename... T>                                                       \
-    using result_of_##std_name = decltype(std_name(std::declval<T>()...));        \
-    \
-    template<typename... T>                                                       \
-    struct would_call_std_##std_name                                              \
-    {                                                                             \
-        static constexpr auto const value = ::nlohmann::detail::                  \
-                                            is_detected_exact<std_name##_tag, result_of_##std_name, T...>::value; \
-    };                                                                            \
-    } /* namespace detail2 */ \
-    \
-    template<typename... T>                                                       \
-    struct would_call_std_##std_name : detail2::would_call_std_##std_name<T...>   \
-    {                                                                             \
-    }
-
-#ifndef JSON_USE_IMPLICIT_CONVERSIONS
-    #define JSON_USE_IMPLICIT_CONVERSIONS 1
-#endif
-
-#if JSON_USE_IMPLICIT_CONVERSIONS
-    #define JSON_EXPLICIT
-#else
-    #define JSON_EXPLICIT explicit
-#endif
-
-#ifndef JSON_DIAGNOSTICS
-    #define JSON_DIAGNOSTICS 0
-#endif
-
-
-namespace nlohmann
-{
-namespace detail
-{
-
-/*!
-@brief replace all occurrences of a substring by another string
-
-@param[in,out] s  the string to manipulate; changed so that all
-               occurrences of @a f are replaced with @a t
-@param[in]     f  the substring to replace with @a t
-@param[in]     t  the string to replace @a f
-
-@pre The search string @a f must not be empty. **This precondition is
-enforced with an assertion.**
-
-@since version 2.0.0
-*/
-inline void replace_substring(std::string& s, const std::string& f,
-                              const std::string& t)
-{
-    JSON_ASSERT(!f.empty());
-    for (auto pos = s.find(f);                // find first occurrence of f
-            pos != std::string::npos;         // make sure f was found
-            s.replace(pos, f.size(), t),      // replace with t, and
-            pos = s.find(f, pos + t.size()))  // find next occurrence of f
-    {}
-}
-
-/*!
- * @brief string escaping as described in RFC 6901 (Sect. 4)
- * @param[in] s string to escape
- * @return    escaped string
- *
- * Note the order of escaping "~" to "~0" and "/" to "~1" is important.
- */
-inline std::string escape(std::string s)
-{
-    replace_substring(s, "~", "~0");
-    replace_substring(s, "/", "~1");
-    return s;
-}
-
-/*!
- * @brief string unescaping as described in RFC 6901 (Sect. 4)
- * @param[in] s string to unescape
- * @return    unescaped string
- *
- * Note the order of escaping "~1" to "/" and "~0" to "~" is important.
- */
-static void unescape(std::string& s)
-{
-    replace_substring(s, "~1", "/");
-    replace_substring(s, "~0", "~");
-}
-
-} // namespace detail
-} // namespace nlohmann
-
-// #include <nlohmann/detail/input/position_t.hpp>
-
-
-#include <cstddef> // size_t
-
-namespace nlohmann
-{
-namespace detail
-{
-/// struct to capture the start position of the current token
-struct position_t
-{
-    /// the total number of characters read
-    std::size_t chars_read_total = 0;
-    /// the number of characters read in the current line
-    std::size_t chars_read_current_line = 0;
-    /// the number of lines read
-    std::size_t lines_read = 0;
-
-    /// conversion to size_t to preserve SAX interface
-    constexpr operator size_t() const
-    {
-        return chars_read_total;
-    }
-};
-
-} // namespace detail
-} // namespace nlohmann
-
-// #include <nlohmann/detail/macro_scope.hpp>
-
-
-namespace nlohmann
-{
-namespace detail
-{
-////////////////
-// exceptions //
-////////////////
-
-/// @brief general exception of the @ref basic_json class
-/// @sa https://json.nlohmann.me/api/basic_json/exception/
-class exception : public std::exception
-{
-  public:
-    /// returns the explanatory string
-    const char* what() const noexcept override
-    {
-        return m.what();
-    }
-
-    /// the id of the exception
-    const int id; // NOLINT(cppcoreguidelines-non-private-member-variables-in-classes)
-
-  protected:
-    JSON_HEDLEY_NON_NULL(3)
-    exception(int id_, const char* what_arg) : id(id_), m(what_arg) {} // NOLINT(bugprone-throw-keyword-missing)
-
-    static std::string name(const std::string& ename, int id_)
-    {
-        return "[json.exception." + ename + "." + std::to_string(id_) + "] ";
-    }
-
-    template<typename BasicJsonType>
-    static std::string diagnostics(const BasicJsonType& leaf_element)
-    {
-#if JSON_DIAGNOSTICS
-        std::vector<std::string> tokens;
-        for (const auto* current = &leaf_element; current->m_parent != nullptr; current = current->m_parent)
-        {
-            switch (current->m_parent->type())
-            {
-                case value_t::array:
-                {
-                    for (std::size_t i = 0; i < current->m_parent->m_value.array->size(); ++i)
-                    {
-                        if (&current->m_parent->m_value.array->operator[](i) == current)
-                        {
-                            tokens.emplace_back(std::to_string(i));
-                            break;
-                        }
-                    }
-                    break;
-                }
-
-                case value_t::object:
-                {
-                    for (const auto& element : *current->m_parent->m_value.object)
-                    {
-                        if (&element.second == current)
-                        {
-                            tokens.emplace_back(element.first.c_str());
-                            break;
-                        }
-                    }
-                    break;
-                }
-
-                case value_t::null: // LCOV_EXCL_LINE
-                case value_t::string: // LCOV_EXCL_LINE
-                case value_t::boolean: // LCOV_EXCL_LINE
-                case value_t::number_integer: // LCOV_EXCL_LINE
-                case value_t::number_unsigned: // LCOV_EXCL_LINE
-                case value_t::number_float: // LCOV_EXCL_LINE
-                case value_t::binary: // LCOV_EXCL_LINE
-                case value_t::discarded: // LCOV_EXCL_LINE
-                default:   // LCOV_EXCL_LINE
-                    break; // LCOV_EXCL_LINE
-            }
-        }
-
-        if (tokens.empty())
-        {
-            return "";
-        }
-
-        return "(" + std::accumulate(tokens.rbegin(), tokens.rend(), std::string{},
-                                     [](const std::string & a, const std::string & b)
-        {
-            return a + "/" + detail::escape(b);
-        }) + ") ";
-#else
-        static_cast<void>(leaf_element);
-        return "";
-#endif
-    }
-
-  private:
-    /// an exception object as storage for error messages
-    std::runtime_error m;
-};
-
-/// @brief exception indicating a parse error
-/// @sa https://json.nlohmann.me/api/basic_json/parse_error/
-class parse_error : public exception
-{
-  public:
-    /*!
-    @brief create a parse error exception
-    @param[in] id_       the id of the exception
-    @param[in] pos       the position where the error occurred (or with
-                         chars_read_total=0 if the position cannot be
-                         determined)
-    @param[in] what_arg  the explanatory string
-    @return parse_error object
-    */
-    template<typename BasicJsonType>
-    static parse_error create(int id_, const position_t& pos, const std::string& what_arg, const BasicJsonType& context)
-    {
-        std::string w = exception::name("parse_error", id_) + "parse error" +
-                        position_string(pos) + ": " + exception::diagnostics(context) + what_arg;
-        return {id_, pos.chars_read_total, w.c_str()};
-    }
-
-    template<typename BasicJsonType>
-    static parse_error create(int id_, std::size_t byte_, const std::string& what_arg, const BasicJsonType& context)
-    {
-        std::string w = exception::name("parse_error", id_) + "parse error" +
-                        (byte_ != 0 ? (" at byte " + std::to_string(byte_)) : "") +
-                        ": " + exception::diagnostics(context) + what_arg;
-        return {id_, byte_, w.c_str()};
-    }
-
-    /*!
-    @brief byte index of the parse error
-
-    The byte index of the last read character in the input file.
-
-    @note For an input with n bytes, 1 is the index of the first character and
-          n+1 is the index of the terminating null byte or the end of file.
-          This also holds true when reading a byte vector (CBOR or MessagePack).
-    */
-    const std::size_t byte;
-
-  private:
-    parse_error(int id_, std::size_t byte_, const char* what_arg)
-        : exception(id_, what_arg), byte(byte_) {}
-
-    static std::string position_string(const position_t& pos)
-    {
-        return " at line " + std::to_string(pos.lines_read + 1) +
-               ", column " + std::to_string(pos.chars_read_current_line);
-    }
-};
-
-/// @brief exception indicating errors with iterators
-/// @sa https://json.nlohmann.me/api/basic_json/invalid_iterator/
-class invalid_iterator : public exception
-{
-  public:
-    template<typename BasicJsonType>
-    static invalid_iterator create(int id_, const std::string& what_arg, const BasicJsonType& context)
-    {
-        std::string w = exception::name("invalid_iterator", id_) + exception::diagnostics(context) + what_arg;
-        return {id_, w.c_str()};
-    }
-
-  private:
-    JSON_HEDLEY_NON_NULL(3)
-    invalid_iterator(int id_, const char* what_arg)
-        : exception(id_, what_arg) {}
-};
-
-/// @brief exception indicating executing a member function with a wrong type
-/// @sa https://json.nlohmann.me/api/basic_json/type_error/
-class type_error : public exception
-{
-  public:
-    template<typename BasicJsonType>
-    static type_error create(int id_, const std::string& what_arg, const BasicJsonType& context)
-    {
-        std::string w = exception::name("type_error", id_) + exception::diagnostics(context) + what_arg;
-        return {id_, w.c_str()};
-    }
-
-  private:
-    JSON_HEDLEY_NON_NULL(3)
-    type_error(int id_, const char* what_arg) : exception(id_, what_arg) {}
-};
-
-/// @brief exception indicating access out of the defined range
-/// @sa https://json.nlohmann.me/api/basic_json/out_of_range/
-class out_of_range : public exception
-{
-  public:
-    template<typename BasicJsonType>
-    static out_of_range create(int id_, const std::string& what_arg, const BasicJsonType& context)
-    {
-        std::string w = exception::name("out_of_range", id_) + exception::diagnostics(context) + what_arg;
-        return {id_, w.c_str()};
-    }
-
-  private:
-    JSON_HEDLEY_NON_NULL(3)
-    out_of_range(int id_, const char* what_arg) : exception(id_, what_arg) {}
-};
-
-/// @brief exception indicating other library errors
-/// @sa https://json.nlohmann.me/api/basic_json/other_error/
-class other_error : public exception
-{
-  public:
-    template<typename BasicJsonType>
-    static other_error create(int id_, const std::string& what_arg, const BasicJsonType& context)
-    {
-        std::string w = exception::name("other_error", id_) + exception::diagnostics(context) + what_arg;
-        return {id_, w.c_str()};
-    }
-
-  private:
-    JSON_HEDLEY_NON_NULL(3)
-    other_error(int id_, const char* what_arg) : exception(id_, what_arg) {}
-};
-
-}  // namespace detail
-}  // namespace nlohmann
-
-// #include <nlohmann/detail/macro_scope.hpp>
-
-// #include <nlohmann/detail/meta/cpp_future.hpp>
-
-
-#include <cstddef> // size_t
-#include <type_traits> // conditional, enable_if, false_type, integral_constant, is_constructible, is_integral, is_same, remove_cv, remove_reference, true_type
-#include <utility> // index_sequence, make_index_sequence, index_sequence_for
-
-// #include <nlohmann/detail/macro_scope.hpp>
-
-
-namespace nlohmann
-{
-namespace detail
-{
-
-template<typename T>
-using uncvref_t = typename std::remove_cv<typename std::remove_reference<T>::type>::type;
-
-#ifdef JSON_HAS_CPP_14
-
-// the following utilities are natively available in C++14
-using std::enable_if_t;
-using std::index_sequence;
-using std::make_index_sequence;
-using std::index_sequence_for;
-
-#else
-
-// alias templates to reduce boilerplate
-template<bool B, typename T = void>
-using enable_if_t = typename std::enable_if<B, T>::type;
-
-// The following code is taken from https://github.com/abseil/abseil-cpp/blob/10cb35e459f5ecca5b2ff107635da0bfa41011b4/absl/utility/utility.h
-// which is part of Google Abseil (https://github.com/abseil/abseil-cpp), licensed under the Apache License 2.0.
-
-//// START OF CODE FROM GOOGLE ABSEIL
-
-// integer_sequence
-//
-// Class template representing a compile-time integer sequence. An instantiation
-// of `integer_sequence<T, Ints...>` has a sequence of integers encoded in its
-// type through its template arguments (which is a common need when
-// working with C++11 variadic templates). `absl::integer_sequence` is designed
-// to be a drop-in replacement for C++14's `std::integer_sequence`.
-//
-// Example:
-//
-//   template< class T, T... Ints >
-//   void user_function(integer_sequence<T, Ints...>);
-//
-//   int main()
-//   {
-//     // user_function's `T` will be deduced to `int` and `Ints...`
-//     // will be deduced to `0, 1, 2, 3, 4`.
-//     user_function(make_integer_sequence<int, 5>());
-//   }
-template <typename T, T... Ints>
-struct integer_sequence
-{
-    using value_type = T;
-    static constexpr std::size_t size() noexcept
-    {
-        return sizeof...(Ints);
-    }
-};
-
-// index_sequence
-//
-// A helper template for an `integer_sequence` of `size_t`,
-// `absl::index_sequence` is designed to be a drop-in replacement for C++14's
-// `std::index_sequence`.
-template <size_t... Ints>
-using index_sequence = integer_sequence<size_t, Ints...>;
-
-namespace utility_internal
-{
-
-template <typename Seq, size_t SeqSize, size_t Rem>
-struct Extend;
-
-// Note that SeqSize == sizeof...(Ints). It's passed explicitly for efficiency.
-template <typename T, T... Ints, size_t SeqSize>
-struct Extend<integer_sequence<T, Ints...>, SeqSize, 0>
-{
-    using type = integer_sequence < T, Ints..., (Ints + SeqSize)... >;
-};
-
-template <typename T, T... Ints, size_t SeqSize>
-struct Extend<integer_sequence<T, Ints...>, SeqSize, 1>
-{
-    using type = integer_sequence < T, Ints..., (Ints + SeqSize)..., 2 * SeqSize >;
-};
-
-// Recursion helper for 'make_integer_sequence<T, N>'.
-// 'Gen<T, N>::type' is an alias for 'integer_sequence<T, 0, 1, ... N-1>'.
-template <typename T, size_t N>
-struct Gen
-{
-    using type =
-        typename Extend < typename Gen < T, N / 2 >::type, N / 2, N % 2 >::type;
-};
-
-template <typename T>
-struct Gen<T, 0>
-{
-    using type = integer_sequence<T>;
-};
-
-}  // namespace utility_internal
-
-// Compile-time sequences of integers
-
-// make_integer_sequence
-//
-// This template alias is equivalent to
-// `integer_sequence<int, 0, 1, ..., N-1>`, and is designed to be a drop-in
-// replacement for C++14's `std::make_integer_sequence`.
-template <typename T, T N>
-using make_integer_sequence = typename utility_internal::Gen<T, N>::type;
-
-// make_index_sequence
-//
-// This template alias is equivalent to `index_sequence<0, 1, ..., N-1>`,
-// and is designed to be a drop-in replacement for C++14's
-// `std::make_index_sequence`.
-template <size_t N>
-using make_index_sequence = make_integer_sequence<size_t, N>;
-
-// index_sequence_for
-//
-// Converts a typename pack into an index sequence of the same length, and
-// is designed to be a drop-in replacement for C++14's
-// `std::index_sequence_for()`
-template <typename... Ts>
-using index_sequence_for = make_index_sequence<sizeof...(Ts)>;
-
-//// END OF CODE FROM GOOGLE ABSEIL
-
-#endif
-
-// dispatch utility (taken from ranges-v3)
-template<unsigned N> struct priority_tag : priority_tag < N - 1 > {};
-template<> struct priority_tag<0> {};
-
-// taken from ranges-v3
-template<typename T>
-struct static_const
-{
-    static constexpr T value{};
-};
-
-template<typename T>
-constexpr T static_const<T>::value; // NOLINT(readability-redundant-declaration)
-
-}  // namespace detail
-}  // namespace nlohmann
-
-// #include <nlohmann/detail/meta/identity_tag.hpp>
-
-
-namespace nlohmann
-{
-namespace detail
-{
-// dispatching helper struct
-template <class T> struct identity_tag {};
-}  // namespace detail
-}  // namespace nlohmann
-
-// #include <nlohmann/detail/meta/type_traits.hpp>
-
-
-#include <limits> // numeric_limits
-#include <type_traits> // false_type, is_constructible, is_integral, is_same, true_type
-#include <utility> // declval
-#include <tuple> // tuple
-
-// #include <nlohmann/detail/macro_scope.hpp>
-
-
-// #include <nlohmann/detail/iterators/iterator_traits.hpp>
-
-
-#include <iterator> // random_access_iterator_tag
-
-// #include <nlohmann/detail/meta/void_t.hpp>
-
-// #include <nlohmann/detail/meta/cpp_future.hpp>
-
-
-namespace nlohmann
-{
-namespace detail
-{
-template<typename It, typename = void>
-struct iterator_types {};
-
-template<typename It>
-struct iterator_types <
-    It,
-    void_t<typename It::difference_type, typename It::value_type, typename It::pointer,
-    typename It::reference, typename It::iterator_category >>
-{
-    using difference_type = typename It::difference_type;
-    using value_type = typename It::value_type;
-    using pointer = typename It::pointer;
-    using reference = typename It::reference;
-    using iterator_category = typename It::iterator_category;
-};
-
-// This is required as some compilers implement std::iterator_traits in a way that
-// doesn't work with SFINAE. See https://github.com/nlohmann/json/issues/1341.
-template<typename T, typename = void>
-struct iterator_traits
-{
-};
-
-template<typename T>
-struct iterator_traits < T, enable_if_t < !std::is_pointer<T>::value >>
-            : iterator_types<T>
-{
-};
-
-template<typename T>
-struct iterator_traits<T*, enable_if_t<std::is_object<T>::value>>
-{
-    using iterator_category = std::random_access_iterator_tag;
-    using value_type = T;
-    using difference_type = ptrdiff_t;
-    using pointer = T*;
-    using reference = T&;
-};
-} // namespace detail
-} // namespace nlohmann
-
-// #include <nlohmann/detail/meta/call_std/begin.hpp>
-
-
-// #include <nlohmann/detail/macro_scope.hpp>
-
-
-namespace nlohmann
-{
-NLOHMANN_CAN_CALL_STD_FUNC_IMPL(begin);
-} // namespace nlohmann
-
-// #include <nlohmann/detail/meta/call_std/end.hpp>
-
-
-// #include <nlohmann/detail/macro_scope.hpp>
-
-
-namespace nlohmann
-{
-NLOHMANN_CAN_CALL_STD_FUNC_IMPL(end);
-}  // namespace nlohmann
-
-// #include <nlohmann/detail/meta/cpp_future.hpp>
-
-// #include <nlohmann/detail/meta/detected.hpp>
-
-// #include <nlohmann/json_fwd.hpp>
-#ifndef INCLUDE_NLOHMANN_JSON_FWD_HPP_
-#define INCLUDE_NLOHMANN_JSON_FWD_HPP_
-
-#include <cstdint> // int64_t, uint64_t
-#include <map> // map
-#include <memory> // allocator
-#include <string> // string
-#include <vector> // vector
-
-/*!
-@brief namespace for Niels Lohmann
-@see https://github.com/nlohmann
-@since version 1.0.0
-*/
-namespace nlohmann
-{
-/*!
-@brief default JSONSerializer template argument
-
-This serializer ignores the template arguments and uses ADL
-([argument-dependent lookup](https://en.cppreference.com/w/cpp/language/adl))
-for serialization.
-*/
-template<typename T = void, typename SFINAE = void>
-struct adl_serializer;
-
-/// a class to store JSON values
-/// @sa https://json.nlohmann.me/api/basic_json/
-template<template<typename U, typename V, typename... Args> class ObjectType =
-         std::map,
-         template<typename U, typename... Args> class ArrayType = std::vector,
-         class StringType = std::string, class BooleanType = bool,
-         class NumberIntegerType = std::int64_t,
-         class NumberUnsignedType = std::uint64_t,
-         class NumberFloatType = double,
-         template<typename U> class AllocatorType = std::allocator,
-         template<typename T, typename SFINAE = void> class JSONSerializer =
-         adl_serializer,
-         class BinaryType = std::vector<std::uint8_t>>
-class basic_json;
-
-/// @brief JSON Pointer defines a string syntax for identifying a specific value within a JSON document
-/// @sa https://json.nlohmann.me/api/json_pointer/
-template<typename BasicJsonType>
-class json_pointer;
-
-/*!
-@brief default specialization
-@sa https://json.nlohmann.me/api/json/
-*/
-using json = basic_json<>;
-
-/// @brief a minimal map-like container that preserves insertion order
-/// @sa https://json.nlohmann.me/api/ordered_map/
-template<class Key, class T, class IgnoredLess, class Allocator>
-struct ordered_map;
-
-/// @brief specialization that maintains the insertion order of object keys
-/// @sa https://json.nlohmann.me/api/ordered_json/
-using ordered_json = basic_json<nlohmann::ordered_map>;
-
-}  // namespace nlohmann
-
-#endif  // INCLUDE_NLOHMANN_JSON_FWD_HPP_
-
-
-namespace nlohmann
-{
-/*!
-@brief detail namespace with internal helper functions
-
-This namespace collects functions that should not be exposed,
-implementations of some @ref basic_json methods, and meta-programming helpers.
-
-@since version 2.1.0
-*/
-namespace detail
-{
-/////////////
-// helpers //
-/////////////
-
-// Note to maintainers:
-//
-// Every trait in this file expects a non CV-qualified type.
-// The only exceptions are in the 'aliases for detected' section
-// (i.e. those of the form: decltype(T::member_function(std::declval<T>())))
-//
-// In this case, T has to be properly CV-qualified to constraint the function arguments
-// (e.g. to_json(BasicJsonType&, const T&))
-
-template<typename> struct is_basic_json : std::false_type {};
-
-NLOHMANN_BASIC_JSON_TPL_DECLARATION
-struct is_basic_json<NLOHMANN_BASIC_JSON_TPL> : std::true_type {};
-
-//////////////////////
-// json_ref helpers //
-//////////////////////
-
-template<typename>
-class json_ref;
-
-template<typename>
-struct is_json_ref : std::false_type {};
-
-template<typename T>
-struct is_json_ref<json_ref<T>> : std::true_type {};
-
-//////////////////////////
-// aliases for detected //
-//////////////////////////
-
-template<typename T>
-using mapped_type_t = typename T::mapped_type;
-
-template<typename T>
-using key_type_t = typename T::key_type;
-
-template<typename T>
-using value_type_t = typename T::value_type;
-
-template<typename T>
-using difference_type_t = typename T::difference_type;
-
-template<typename T>
-using pointer_t = typename T::pointer;
-
-template<typename T>
-using reference_t = typename T::reference;
-
-template<typename T>
-using iterator_category_t = typename T::iterator_category;
-
-template<typename T, typename... Args>
-using to_json_function = decltype(T::to_json(std::declval<Args>()...));
-
-template<typename T, typename... Args>
-using from_json_function = decltype(T::from_json(std::declval<Args>()...));
-
-template<typename T, typename U>
-using get_template_function = decltype(std::declval<T>().template get<U>());
-
-// trait checking if JSONSerializer<T>::from_json(json const&, udt&) exists
-template<typename BasicJsonType, typename T, typename = void>
-struct has_from_json : std::false_type {};
-
-// trait checking if j.get<T> is valid
-// use this trait instead of std::is_constructible or std::is_convertible,
-// both rely on, or make use of implicit conversions, and thus fail when T
-// has several constructors/operator= (see https://github.com/nlohmann/json/issues/958)
-template <typename BasicJsonType, typename T>
-struct is_getable
-{
-    static constexpr bool value = is_detected<get_template_function, const BasicJsonType&, T>::value;
-};
-
-template<typename BasicJsonType, typename T>
-struct has_from_json < BasicJsonType, T, enable_if_t < !is_basic_json<T>::value >>
-{
-    using serializer = typename BasicJsonType::template json_serializer<T, void>;
-
-    static constexpr bool value =
-        is_detected_exact<void, from_json_function, serializer,
-        const BasicJsonType&, T&>::value;
-};
-
-// This trait checks if JSONSerializer<T>::from_json(json const&) exists
-// this overload is used for non-default-constructible user-defined-types
-template<typename BasicJsonType, typename T, typename = void>
-struct has_non_default_from_json : std::false_type {};
-
-template<typename BasicJsonType, typename T>
-struct has_non_default_from_json < BasicJsonType, T, enable_if_t < !is_basic_json<T>::value >>
-{
-    using serializer = typename BasicJsonType::template json_serializer<T, void>;
-
-    static constexpr bool value =
-        is_detected_exact<T, from_json_function, serializer,
-        const BasicJsonType&>::value;
-};
-
-// This trait checks if BasicJsonType::json_serializer<T>::to_json exists
-// Do not evaluate the trait when T is a basic_json type, to avoid template instantiation infinite recursion.
-template<typename BasicJsonType, typename T, typename = void>
-struct has_to_json : std::false_type {};
-
-template<typename BasicJsonType, typename T>
-struct has_to_json < BasicJsonType, T, enable_if_t < !is_basic_json<T>::value >>
-{
-    using serializer = typename BasicJsonType::template json_serializer<T, void>;
-
-    static constexpr bool value =
-        is_detected_exact<void, to_json_function, serializer, BasicJsonType&,
-        T>::value;
-};
-
-
-///////////////////
-// is_ functions //
-///////////////////
-
-// https://en.cppreference.com/w/cpp/types/conjunction
-template<class...> struct conjunction : std::true_type { };
-template<class B1> struct conjunction<B1> : B1 { };
-template<class B1, class... Bn>
-struct conjunction<B1, Bn...>
-: std::conditional<bool(B1::value), conjunction<Bn...>, B1>::type {};
-
-// https://en.cppreference.com/w/cpp/types/negation
-template<class B> struct negation : std::integral_constant < bool, !B::value > { };
-
-// Reimplementation of is_constructible and is_default_constructible, due to them being broken for
-// std::pair and std::tuple until LWG 2367 fix (see https://cplusplus.github.io/LWG/lwg-defects.html#2367).
-// This causes compile errors in e.g. clang 3.5 or gcc 4.9.
-template <typename T>
-struct is_default_constructible : std::is_default_constructible<T> {};
-
-template <typename T1, typename T2>
-struct is_default_constructible<std::pair<T1, T2>>
-            : conjunction<is_default_constructible<T1>, is_default_constructible<T2>> {};
-
-template <typename T1, typename T2>
-struct is_default_constructible<const std::pair<T1, T2>>
-            : conjunction<is_default_constructible<T1>, is_default_constructible<T2>> {};
-
-template <typename... Ts>
-struct is_default_constructible<std::tuple<Ts...>>
-            : conjunction<is_default_constructible<Ts>...> {};
-
-template <typename... Ts>
-struct is_default_constructible<const std::tuple<Ts...>>
-            : conjunction<is_default_constructible<Ts>...> {};
-
-
-template <typename T, typename... Args>
-struct is_constructible : std::is_constructible<T, Args...> {};
-
-template <typename T1, typename T2>
-struct is_constructible<std::pair<T1, T2>> : is_default_constructible<std::pair<T1, T2>> {};
-
-template <typename T1, typename T2>
-struct is_constructible<const std::pair<T1, T2>> : is_default_constructible<const std::pair<T1, T2>> {};
-
-template <typename... Ts>
-struct is_constructible<std::tuple<Ts...>> : is_default_constructible<std::tuple<Ts...>> {};
-
-template <typename... Ts>
-struct is_constructible<const std::tuple<Ts...>> : is_default_constructible<const std::tuple<Ts...>> {};
-
-
-template<typename T, typename = void>
-struct is_iterator_traits : std::false_type {};
-
-template<typename T>
-struct is_iterator_traits<iterator_traits<T>>
-{
-  private:
-    using traits = iterator_traits<T>;
-
-  public:
-    static constexpr auto value =
-        is_detected<value_type_t, traits>::value &&
-        is_detected<difference_type_t, traits>::value &&
-        is_detected<pointer_t, traits>::value &&
-        is_detected<iterator_category_t, traits>::value &&
-        is_detected<reference_t, traits>::value;
-};
-
-template<typename T>
-struct is_range
-{
-  private:
-    using t_ref = typename std::add_lvalue_reference<T>::type;
-
-    using iterator = detected_t<result_of_begin, t_ref>;
-    using sentinel = detected_t<result_of_end, t_ref>;
-
-    // to be 100% correct, it should use https://en.cppreference.com/w/cpp/iterator/input_or_output_iterator
-    // and https://en.cppreference.com/w/cpp/iterator/sentinel_for
-    // but reimplementing these would be too much work, as a lot of other concepts are used underneath
-    static constexpr auto is_iterator_begin =
-        is_iterator_traits<iterator_traits<iterator>>::value;
-
-  public:
-    static constexpr bool value = !std::is_same<iterator, nonesuch>::value && !std::is_same<sentinel, nonesuch>::value && is_iterator_begin;
-};
-
-template<typename R>
-using iterator_t = enable_if_t<is_range<R>::value, result_of_begin<decltype(std::declval<R&>())>>;
-
-template<typename T>
-using range_value_t = value_type_t<iterator_traits<iterator_t<T>>>;
-
-// The following implementation of is_complete_type is taken from
-// https://blogs.msdn.microsoft.com/vcblog/2015/12/02/partial-support-for-expression-sfinae-in-vs-2015-update-1/
-// and is written by Xiang Fan who agreed to using it in this library.
-
-template<typename T, typename = void>
-struct is_complete_type : std::false_type {};
-
-template<typename T>
-struct is_complete_type<T, decltype(void(sizeof(T)))> : std::true_type {};
-
-template<typename BasicJsonType, typename CompatibleObjectType,
-         typename = void>
-struct is_compatible_object_type_impl : std::false_type {};
-
-template<typename BasicJsonType, typename CompatibleObjectType>
-struct is_compatible_object_type_impl <
-    BasicJsonType, CompatibleObjectType,
-    enable_if_t < is_detected<mapped_type_t, CompatibleObjectType>::value&&
-    is_detected<key_type_t, CompatibleObjectType>::value >>
-{
-    using object_t = typename BasicJsonType::object_t;
-
-    // macOS's is_constructible does not play well with nonesuch...
-    static constexpr bool value =
-        is_constructible<typename object_t::key_type,
-        typename CompatibleObjectType::key_type>::value &&
-        is_constructible<typename object_t::mapped_type,
-        typename CompatibleObjectType::mapped_type>::value;
-};
-
-template<typename BasicJsonType, typename CompatibleObjectType>
-struct is_compatible_object_type
-    : is_compatible_object_type_impl<BasicJsonType, CompatibleObjectType> {};
-
-template<typename BasicJsonType, typename ConstructibleObjectType,
-         typename = void>
-struct is_constructible_object_type_impl : std::false_type {};
-
-template<typename BasicJsonType, typename ConstructibleObjectType>
-struct is_constructible_object_type_impl <
-    BasicJsonType, ConstructibleObjectType,
-    enable_if_t < is_detected<mapped_type_t, ConstructibleObjectType>::value&&
-    is_detected<key_type_t, ConstructibleObjectType>::value >>
-{
-    using object_t = typename BasicJsonType::object_t;
-
-    static constexpr bool value =
-        (is_default_constructible<ConstructibleObjectType>::value &&
-         (std::is_move_assignable<ConstructibleObjectType>::value ||
-          std::is_copy_assignable<ConstructibleObjectType>::value) &&
-         (is_constructible<typename ConstructibleObjectType::key_type,
-          typename object_t::key_type>::value &&
-          std::is_same <
-          typename object_t::mapped_type,
-          typename ConstructibleObjectType::mapped_type >::value)) ||
-        (has_from_json<BasicJsonType,
-         typename ConstructibleObjectType::mapped_type>::value ||
-         has_non_default_from_json <
-         BasicJsonType,
-         typename ConstructibleObjectType::mapped_type >::value);
-};
-
-template<typename BasicJsonType, typename ConstructibleObjectType>
-struct is_constructible_object_type
-    : is_constructible_object_type_impl<BasicJsonType,
-      ConstructibleObjectType> {};
-
-template<typename BasicJsonType, typename CompatibleStringType>
-struct is_compatible_string_type
-{
-    static constexpr auto value =
-        is_constructible<typename BasicJsonType::string_t, CompatibleStringType>::value;
-};
-
-template<typename BasicJsonType, typename ConstructibleStringType>
-struct is_constructible_string_type
-{
-    static constexpr auto value =
-        is_constructible<ConstructibleStringType,
-        typename BasicJsonType::string_t>::value;
-};
-
-template<typename BasicJsonType, typename CompatibleArrayType, typename = void>
-struct is_compatible_array_type_impl : std::false_type {};
-
-template<typename BasicJsonType, typename CompatibleArrayType>
-struct is_compatible_array_type_impl <
-    BasicJsonType, CompatibleArrayType,
-    enable_if_t <
-    is_detected<iterator_t, CompatibleArrayType>::value&&
-    is_iterator_traits<iterator_traits<detected_t<iterator_t, CompatibleArrayType>>>::value&&
-// special case for types like std::filesystem::path whose iterator's value_type are themselves
-// c.f. https://github.com/nlohmann/json/pull/3073
-    !std::is_same<CompatibleArrayType, detected_t<range_value_t, CompatibleArrayType>>::value >>
-{
-    static constexpr bool value =
-        is_constructible<BasicJsonType,
-        range_value_t<CompatibleArrayType>>::value;
-};
-
-template<typename BasicJsonType, typename CompatibleArrayType>
-struct is_compatible_array_type
-    : is_compatible_array_type_impl<BasicJsonType, CompatibleArrayType> {};
-
-template<typename BasicJsonType, typename ConstructibleArrayType, typename = void>
-struct is_constructible_array_type_impl : std::false_type {};
-
-template<typename BasicJsonType, typename ConstructibleArrayType>
-struct is_constructible_array_type_impl <
-    BasicJsonType, ConstructibleArrayType,
-    enable_if_t<std::is_same<ConstructibleArrayType,
-    typename BasicJsonType::value_type>::value >>
-            : std::true_type {};
-
-template<typename BasicJsonType, typename ConstructibleArrayType>
-struct is_constructible_array_type_impl <
-    BasicJsonType, ConstructibleArrayType,
-    enable_if_t < !std::is_same<ConstructibleArrayType,
-    typename BasicJsonType::value_type>::value&&
-    !is_compatible_string_type<BasicJsonType, ConstructibleArrayType>::value&&
-    is_default_constructible<ConstructibleArrayType>::value&&
-(std::is_move_assignable<ConstructibleArrayType>::value ||
- std::is_copy_assignable<ConstructibleArrayType>::value)&&
-is_detected<iterator_t, ConstructibleArrayType>::value&&
-is_iterator_traits<iterator_traits<detected_t<iterator_t, ConstructibleArrayType>>>::value&&
-is_detected<range_value_t, ConstructibleArrayType>::value&&
-// special case for types like std::filesystem::path whose iterator's value_type are themselves
-// c.f. https://github.com/nlohmann/json/pull/3073
-!std::is_same<ConstructibleArrayType, detected_t<range_value_t, ConstructibleArrayType>>::value&&
-        is_complete_type <
-        detected_t<range_value_t, ConstructibleArrayType >>::value >>
-{
-    using value_type = range_value_t<ConstructibleArrayType>;
-
-    static constexpr bool value =
-        std::is_same<value_type,
-        typename BasicJsonType::array_t::value_type>::value ||
-        has_from_json<BasicJsonType,
-        value_type>::value ||
-        has_non_default_from_json <
-        BasicJsonType,
-        value_type >::value;
-};
-
-template<typename BasicJsonType, typename ConstructibleArrayType>
-struct is_constructible_array_type
-    : is_constructible_array_type_impl<BasicJsonType, ConstructibleArrayType> {};
-
-template<typename RealIntegerType, typename CompatibleNumberIntegerType,
-         typename = void>
-struct is_compatible_integer_type_impl : std::false_type {};
-
-template<typename RealIntegerType, typename CompatibleNumberIntegerType>
-struct is_compatible_integer_type_impl <
-    RealIntegerType, CompatibleNumberIntegerType,
-    enable_if_t < std::is_integral<RealIntegerType>::value&&
-    std::is_integral<CompatibleNumberIntegerType>::value&&
-    !std::is_same<bool, CompatibleNumberIntegerType>::value >>
-{
-    // is there an assert somewhere on overflows?
-    using RealLimits = std::numeric_limits<RealIntegerType>;
-    using CompatibleLimits = std::numeric_limits<CompatibleNumberIntegerType>;
-
-    static constexpr auto value =
-        is_constructible<RealIntegerType,
-        CompatibleNumberIntegerType>::value &&
-        CompatibleLimits::is_integer &&
-        RealLimits::is_signed == CompatibleLimits::is_signed;
-};
-
-template<typename RealIntegerType, typename CompatibleNumberIntegerType>
-struct is_compatible_integer_type
-    : is_compatible_integer_type_impl<RealIntegerType,
-      CompatibleNumberIntegerType> {};
-
-template<typename BasicJsonType, typename CompatibleType, typename = void>
-struct is_compatible_type_impl: std::false_type {};
-
-template<typename BasicJsonType, typename CompatibleType>
-struct is_compatible_type_impl <
-    BasicJsonType, CompatibleType,
-    enable_if_t<is_complete_type<CompatibleType>::value >>
-{
-    static constexpr bool value =
-        has_to_json<BasicJsonType, CompatibleType>::value;
-};
-
-template<typename BasicJsonType, typename CompatibleType>
-struct is_compatible_type
-    : is_compatible_type_impl<BasicJsonType, CompatibleType> {};
-
-template<typename T1, typename T2>
-struct is_constructible_tuple : std::false_type {};
-
-template<typename T1, typename... Args>
-struct is_constructible_tuple<T1, std::tuple<Args...>> : conjunction<is_constructible<T1, Args>...> {};
-
-// a naive helper to check if a type is an ordered_map (exploits the fact that
-// ordered_map inherits capacity() from std::vector)
-template <typename T>
-struct is_ordered_map
-{
-    using one = char;
-
-    struct two
-    {
-        char x[2]; // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
-    };
-
-    template <typename C> static one test( decltype(&C::capacity) ) ;
-    template <typename C> static two test(...);
-
-    enum { value = sizeof(test<T>(nullptr)) == sizeof(char) }; // NOLINT(cppcoreguidelines-pro-type-vararg,hicpp-vararg)
-};
-
-// to avoid useless casts (see https://github.com/nlohmann/json/issues/2893#issuecomment-889152324)
-template < typename T, typename U, enable_if_t < !std::is_same<T, U>::value, int > = 0 >
-T conditional_static_cast(U value)
-{
-    return static_cast<T>(value);
-}
-
-template<typename T, typename U, enable_if_t<std::is_same<T, U>::value, int> = 0>
-T conditional_static_cast(U value)
-{
-    return value;
-}
-
-}  // namespace detail
-}  // namespace nlohmann
-
-// #include <nlohmann/detail/value_t.hpp>
-
-
-#if JSON_HAS_EXPERIMENTAL_FILESYSTEM
-#include <experimental/filesystem>
-namespace nlohmann::detail
-{
-namespace std_fs = std::experimental::filesystem;
-} // namespace nlohmann::detail
-#elif JSON_HAS_FILESYSTEM
-#include <filesystem>
-namespace nlohmann::detail
-{
-namespace std_fs = std::filesystem;
-} // namespace nlohmann::detail
-#endif
-
-namespace nlohmann
-{
-namespace detail
-{
-template<typename BasicJsonType>
-void from_json(const BasicJsonType& j, typename std::nullptr_t& n)
-{
-    if (JSON_HEDLEY_UNLIKELY(!j.is_null()))
-    {
-        JSON_THROW(type_error::create(302, "type must be null, but is " + std::string(j.type_name()), j));
-    }
-    n = nullptr;
-}
-
-// overloads for basic_json template parameters
-template < typename BasicJsonType, typename ArithmeticType,
-           enable_if_t < std::is_arithmetic<ArithmeticType>::value&&
-                         !std::is_same<ArithmeticType, typename BasicJsonType::boolean_t>::value,
-                         int > = 0 >
-void get_arithmetic_value(const BasicJsonType& j, ArithmeticType& val)
-{
-    switch (static_cast<value_t>(j))
-    {
-        case value_t::number_unsigned:
-        {
-            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::number_unsigned_t*>());
-            break;
-        }
-        case value_t::number_integer:
-        {
-            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::number_integer_t*>());
-            break;
-        }
-        case value_t::number_float:
-        {
-            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::number_float_t*>());
-            break;
-        }
-
-        case value_t::null:
-        case value_t::object:
-        case value_t::array:
-        case value_t::string:
-        case value_t::boolean:
-        case value_t::binary:
-        case value_t::discarded:
-        default:
-            JSON_THROW(type_error::create(302, "type must be number, but is " + std::string(j.type_name()), j));
-    }
-}
-
-template<typename BasicJsonType>
-void from_json(const BasicJsonType& j, typename BasicJsonType::boolean_t& b)
-{
-    if (JSON_HEDLEY_UNLIKELY(!j.is_boolean()))
-    {
-        JSON_THROW(type_error::create(302, "type must be boolean, but is " + std::string(j.type_name()), j));
-    }
-    b = *j.template get_ptr<const typename BasicJsonType::boolean_t*>();
-}
-
-template<typename BasicJsonType>
-void from_json(const BasicJsonType& j, typename BasicJsonType::string_t& s)
-{
-    if (JSON_HEDLEY_UNLIKELY(!j.is_string()))
-    {
-        JSON_THROW(type_error::create(302, "type must be string, but is " + std::string(j.type_name()), j));
-    }
-    s = *j.template get_ptr<const typename BasicJsonType::string_t*>();
-}
-
-template <
-    typename BasicJsonType, typename ConstructibleStringType,
-    enable_if_t <
-        is_constructible_string_type<BasicJsonType, ConstructibleStringType>::value&&
-        !std::is_same<typename BasicJsonType::string_t,
-                      ConstructibleStringType>::value,
-        int > = 0 >
-void from_json(const BasicJsonType& j, ConstructibleStringType& s)
-{
-    if (JSON_HEDLEY_UNLIKELY(!j.is_string()))
-    {
-        JSON_THROW(type_error::create(302, "type must be string, but is " + std::string(j.type_name()), j));
-    }
-
-    s = *j.template get_ptr<const typename BasicJsonType::string_t*>();
-}
-
-template<typename BasicJsonType>
-void from_json(const BasicJsonType& j, typename BasicJsonType::number_float_t& val)
-{
-    get_arithmetic_value(j, val);
-}
-
-template<typename BasicJsonType>
-void from_json(const BasicJsonType& j, typename BasicJsonType::number_unsigned_t& val)
-{
-    get_arithmetic_value(j, val);
-}
-
-template<typename BasicJsonType>
-void from_json(const BasicJsonType& j, typename BasicJsonType::number_integer_t& val)
-{
-    get_arithmetic_value(j, val);
-}
-
-template<typename BasicJsonType, typename EnumType,
-         enable_if_t<std::is_enum<EnumType>::value, int> = 0>
-void from_json(const BasicJsonType& j, EnumType& e)
-{
-    typename std::underlying_type<EnumType>::type val;
-    get_arithmetic_value(j, val);
-    e = static_cast<EnumType>(val);
-}
-
-// forward_list doesn't have an insert method
-template<typename BasicJsonType, typename T, typename Allocator,
-         enable_if_t<is_getable<BasicJsonType, T>::value, int> = 0>
-void from_json(const BasicJsonType& j, std::forward_list<T, Allocator>& l)
-{
-    if (JSON_HEDLEY_UNLIKELY(!j.is_array()))
-    {
-        JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(j.type_name()), j));
-    }
-    l.clear();
-    std::transform(j.rbegin(), j.rend(),
-                   std::front_inserter(l), [](const BasicJsonType & i)
-    {
-        return i.template get<T>();
-    });
-}
-
-// valarray doesn't have an insert method
-template<typename BasicJsonType, typename T,
-         enable_if_t<is_getable<BasicJsonType, T>::value, int> = 0>
-void from_json(const BasicJsonType& j, std::valarray<T>& l)
-{
-    if (JSON_HEDLEY_UNLIKELY(!j.is_array()))
-    {
-        JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(j.type_name()), j));
-    }
-    l.resize(j.size());
-    std::transform(j.begin(), j.end(), std::begin(l),
-                   [](const BasicJsonType & elem)
-    {
-        return elem.template get<T>();
-    });
-}
-
-template<typename BasicJsonType, typename T, std::size_t N>
-auto from_json(const BasicJsonType& j, T (&arr)[N])  // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
--> decltype(j.template get<T>(), void())
-{
-    for (std::size_t i = 0; i < N; ++i)
-    {
-        arr[i] = j.at(i).template get<T>();
-    }
-}
-
-template<typename BasicJsonType>
-void from_json_array_impl(const BasicJsonType& j, typename BasicJsonType::array_t& arr, priority_tag<3> /*unused*/)
-{
-    arr = *j.template get_ptr<const typename BasicJsonType::array_t*>();
-}
-
-template<typename BasicJsonType, typename T, std::size_t N>
-auto from_json_array_impl(const BasicJsonType& j, std::array<T, N>& arr,
-                          priority_tag<2> /*unused*/)
--> decltype(j.template get<T>(), void())
-{
-    for (std::size_t i = 0; i < N; ++i)
-    {
-        arr[i] = j.at(i).template get<T>();
-    }
-}
-
-template<typename BasicJsonType, typename ConstructibleArrayType,
-         enable_if_t<
-             std::is_assignable<ConstructibleArrayType&, ConstructibleArrayType>::value,
-             int> = 0>
-auto from_json_array_impl(const BasicJsonType& j, ConstructibleArrayType& arr, priority_tag<1> /*unused*/)
--> decltype(
-    arr.reserve(std::declval<typename ConstructibleArrayType::size_type>()),
-    j.template get<typename ConstructibleArrayType::value_type>(),
-    void())
-{
-    using std::end;
-
-    ConstructibleArrayType ret;
-    ret.reserve(j.size());
-    std::transform(j.begin(), j.end(),
-                   std::inserter(ret, end(ret)), [](const BasicJsonType & i)
-    {
-        // get<BasicJsonType>() returns *this, this won't call a from_json
-        // method when value_type is BasicJsonType
-        return i.template get<typename ConstructibleArrayType::value_type>();
-    });
-    arr = std::move(ret);
-}
-
-template<typename BasicJsonType, typename ConstructibleArrayType,
-         enable_if_t<
-             std::is_assignable<ConstructibleArrayType&, ConstructibleArrayType>::value,
-             int> = 0>
-void from_json_array_impl(const BasicJsonType& j, ConstructibleArrayType& arr,
-                          priority_tag<0> /*unused*/)
-{
-    using std::end;
-
-    ConstructibleArrayType ret;
-    std::transform(
-        j.begin(), j.end(), std::inserter(ret, end(ret)),
-        [](const BasicJsonType & i)
-    {
-        // get<BasicJsonType>() returns *this, this won't call a from_json
-        // method when value_type is BasicJsonType
-        return i.template get<typename ConstructibleArrayType::value_type>();
-    });
-    arr = std::move(ret);
-}
-
-template < typename BasicJsonType, typename ConstructibleArrayType,
-           enable_if_t <
-               is_constructible_array_type<BasicJsonType, ConstructibleArrayType>::value&&
-               !is_constructible_object_type<BasicJsonType, ConstructibleArrayType>::value&&
-               !is_constructible_string_type<BasicJsonType, ConstructibleArrayType>::value&&
-               !std::is_same<ConstructibleArrayType, typename BasicJsonType::binary_t>::value&&
-               !is_basic_json<ConstructibleArrayType>::value,
-               int > = 0 >
-auto from_json(const BasicJsonType& j, ConstructibleArrayType& arr)
--> decltype(from_json_array_impl(j, arr, priority_tag<3> {}),
-j.template get<typename ConstructibleArrayType::value_type>(),
-void())
-{
-    if (JSON_HEDLEY_UNLIKELY(!j.is_array()))
-    {
-        JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(j.type_name()), j));
-    }
-
-    from_json_array_impl(j, arr, priority_tag<3> {});
-}
-
-template < typename BasicJsonType, typename T, std::size_t... Idx >
-std::array<T, sizeof...(Idx)> from_json_inplace_array_impl(BasicJsonType&& j,
-        identity_tag<std::array<T, sizeof...(Idx)>> /*unused*/, index_sequence<Idx...> /*unused*/)
-{
-    return { { std::forward<BasicJsonType>(j).at(Idx).template get<T>()... } };
-}
-
-template < typename BasicJsonType, typename T, std::size_t N >
-auto from_json(BasicJsonType&& j, identity_tag<std::array<T, N>> tag)
--> decltype(from_json_inplace_array_impl(std::forward<BasicJsonType>(j), tag, make_index_sequence<N> {}))
-{
-    if (JSON_HEDLEY_UNLIKELY(!j.is_array()))
-    {
-        JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(j.type_name()), j));
-    }
-
-    return from_json_inplace_array_impl(std::forward<BasicJsonType>(j), tag, make_index_sequence<N> {});
-}
-
-template<typename BasicJsonType>
-void from_json(const BasicJsonType& j, typename BasicJsonType::binary_t& bin)
-{
-    if (JSON_HEDLEY_UNLIKELY(!j.is_binary()))
-    {
-        JSON_THROW(type_error::create(302, "type must be binary, but is " + std::string(j.type_name()), j));
-    }
-
-    bin = *j.template get_ptr<const typename BasicJsonType::binary_t*>();
-}
-
-template<typename BasicJsonType, typename ConstructibleObjectType,
-         enable_if_t<is_constructible_object_type<BasicJsonType, ConstructibleObjectType>::value, int> = 0>
-void from_json(const BasicJsonType& j, ConstructibleObjectType& obj)
-{
-    if (JSON_HEDLEY_UNLIKELY(!j.is_object()))
-    {
-        JSON_THROW(type_error::create(302, "type must be object, but is " + std::string(j.type_name()), j));
-    }
-
-    ConstructibleObjectType ret;
-    const auto* inner_object = j.template get_ptr<const typename BasicJsonType::object_t*>();
-    using value_type = typename ConstructibleObjectType::value_type;
-    std::transform(
-        inner_object->begin(), inner_object->end(),
-        std::inserter(ret, ret.begin()),
-        [](typename BasicJsonType::object_t::value_type const & p)
-    {
-        return value_type(p.first, p.second.template get<typename ConstructibleObjectType::mapped_type>());
-    });
-    obj = std::move(ret);
-}
-
-// overload for arithmetic types, not chosen for basic_json template arguments
-// (BooleanType, etc..); note: Is it really necessary to provide explicit
-// overloads for boolean_t etc. in case of a custom BooleanType which is not
-// an arithmetic type?
-template < typename BasicJsonType, typename ArithmeticType,
-           enable_if_t <
-               std::is_arithmetic<ArithmeticType>::value&&
-               !std::is_same<ArithmeticType, typename BasicJsonType::number_unsigned_t>::value&&
-               !std::is_same<ArithmeticType, typename BasicJsonType::number_integer_t>::value&&
-               !std::is_same<ArithmeticType, typename BasicJsonType::number_float_t>::value&&
-               !std::is_same<ArithmeticType, typename BasicJsonType::boolean_t>::value,
-               int > = 0 >
-void from_json(const BasicJsonType& j, ArithmeticType& val)
-{
-    switch (static_cast<value_t>(j))
-    {
-        case value_t::number_unsigned:
-        {
-            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::number_unsigned_t*>());
-            break;
-        }
-        case value_t::number_integer:
-        {
-            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::number_integer_t*>());
-            break;
-        }
-        case value_t::number_float:
-        {
-            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::number_float_t*>());
-            break;
-        }
-        case value_t::boolean:
-        {
-            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::boolean_t*>());
-            break;
-        }
-
-        case value_t::null:
-        case value_t::object:
-        case value_t::array:
-        case value_t::string:
-        case value_t::binary:
-        case value_t::discarded:
-        default:
-            JSON_THROW(type_error::create(302, "type must be number, but is " + std::string(j.type_name()), j));
-    }
-}
-
-template<typename BasicJsonType, typename... Args, std::size_t... Idx>
-std::tuple<Args...> from_json_tuple_impl_base(BasicJsonType&& j, index_sequence<Idx...> /*unused*/)
-{
-    return std::make_tuple(std::forward<BasicJsonType>(j).at(Idx).template get<Args>()...);
-}
-
-template < typename BasicJsonType, class A1, class A2 >
-std::pair<A1, A2> from_json_tuple_impl(BasicJsonType&& j, identity_tag<std::pair<A1, A2>> /*unused*/, priority_tag<0> /*unused*/)
-{
-    return {std::forward<BasicJsonType>(j).at(0).template get<A1>(),
-            std::forward<BasicJsonType>(j).at(1).template get<A2>()};
-}
-
-template<typename BasicJsonType, typename A1, typename A2>
-void from_json_tuple_impl(BasicJsonType&& j, std::pair<A1, A2>& p, priority_tag<1> /*unused*/)
-{
-    p = from_json_tuple_impl(std::forward<BasicJsonType>(j), identity_tag<std::pair<A1, A2>> {}, priority_tag<0> {});
-}
-
-template<typename BasicJsonType, typename... Args>
-std::tuple<Args...> from_json_tuple_impl(BasicJsonType&& j, identity_tag<std::tuple<Args...>> /*unused*/, priority_tag<2> /*unused*/)
-{
-    return from_json_tuple_impl_base<BasicJsonType, Args...>(std::forward<BasicJsonType>(j), index_sequence_for<Args...> {});
-}
-
-template<typename BasicJsonType, typename... Args>
-void from_json_tuple_impl(BasicJsonType&& j, std::tuple<Args...>& t, priority_tag<3> /*unused*/)
-{
-    t = from_json_tuple_impl_base<BasicJsonType, Args...>(std::forward<BasicJsonType>(j), index_sequence_for<Args...> {});
-}
-
-template<typename BasicJsonType, typename TupleRelated>
-auto from_json(BasicJsonType&& j, TupleRelated&& t)
--> decltype(from_json_tuple_impl(std::forward<BasicJsonType>(j), std::forward<TupleRelated>(t), priority_tag<3> {}))
-{
-    if (JSON_HEDLEY_UNLIKELY(!j.is_array()))
-    {
-        JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(j.type_name()), j));
-    }
-
-    return from_json_tuple_impl(std::forward<BasicJsonType>(j), std::forward<TupleRelated>(t), priority_tag<3> {});
-}
-
-template < typename BasicJsonType, typename Key, typename Value, typename Compare, typename Allocator,
-           typename = enable_if_t < !std::is_constructible <
-                                        typename BasicJsonType::string_t, Key >::value >>
-void from_json(const BasicJsonType& j, std::map<Key, Value, Compare, Allocator>& m)
-{
-    if (JSON_HEDLEY_UNLIKELY(!j.is_array()))
-    {
-        JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(j.type_name()), j));
-    }
-    m.clear();
-    for (const auto& p : j)
-    {
-        if (JSON_HEDLEY_UNLIKELY(!p.is_array()))
-        {
-            JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(p.type_name()), j));
-        }
-        m.emplace(p.at(0).template get<Key>(), p.at(1).template get<Value>());
-    }
-}
-
-template < typename BasicJsonType, typename Key, typename Value, typename Hash, typename KeyEqual, typename Allocator,
-           typename = enable_if_t < !std::is_constructible <
-                                        typename BasicJsonType::string_t, Key >::value >>
-void from_json(const BasicJsonType& j, std::unordered_map<Key, Value, Hash, KeyEqual, Allocator>& m)
-{
-    if (JSON_HEDLEY_UNLIKELY(!j.is_array()))
-    {
-        JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(j.type_name()), j));
-    }
-    m.clear();
-    for (const auto& p : j)
-    {
-        if (JSON_HEDLEY_UNLIKELY(!p.is_array()))
-        {
-            JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(p.type_name()), j));
-        }
-        m.emplace(p.at(0).template get<Key>(), p.at(1).template get<Value>());
-    }
-}
-
-#if JSON_HAS_FILESYSTEM || JSON_HAS_EXPERIMENTAL_FILESYSTEM
-template<typename BasicJsonType>
-void from_json(const BasicJsonType& j, std_fs::path& p)
-{
-    if (JSON_HEDLEY_UNLIKELY(!j.is_string()))
-    {
-        JSON_THROW(type_error::create(302, "type must be string, but is " + std::string(j.type_name()), j));
-    }
-    p = *j.template get_ptr<const typename BasicJsonType::string_t*>();
-}
-#endif
-
-struct from_json_fn
-{
-    template<typename BasicJsonType, typename T>
-    auto operator()(const BasicJsonType& j, T&& val) const
-    noexcept(noexcept(from_json(j, std::forward<T>(val))))
-    -> decltype(from_json(j, std::forward<T>(val)))
-    {
-        return from_json(j, std::forward<T>(val));
-    }
-};
-}  // namespace detail
-
-/// namespace to hold default `from_json` function
-/// to see why this is required:
-/// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2015/n4381.html
-namespace // NOLINT(cert-dcl59-cpp,fuchsia-header-anon-namespaces,google-build-namespaces)
-{
-constexpr const auto& from_json = detail::static_const<detail::from_json_fn>::value; // NOLINT(misc-definitions-in-headers)
-} // namespace
-} // namespace nlohmann
-
-// #include <nlohmann/detail/conversions/to_json.hpp>
-
-
-#include <algorithm> // copy
-#include <iterator> // begin, end
-#include <string> // string
-#include <tuple> // tuple, get
-#include <type_traits> // is_same, is_constructible, is_floating_point, is_enum, underlying_type
-#include <utility> // move, forward, declval, pair
-#include <valarray> // valarray
-#include <vector> // vector
-
-// #include <nlohmann/detail/macro_scope.hpp>
-
-// #include <nlohmann/detail/iterators/iteration_proxy.hpp>
-
-
-#include <cstddef> // size_t
-#include <iterator> // input_iterator_tag
-#include <string> // string, to_string
-#include <tuple> // tuple_size, get, tuple_element
-#include <utility> // move
-
-// #include <nlohmann/detail/meta/type_traits.hpp>
-
-// #include <nlohmann/detail/value_t.hpp>
-
-
-namespace nlohmann
-{
-namespace detail
-{
-template<typename string_type>
-void int_to_string( string_type& target, std::size_t value )
-{
-    // For ADL
-    using std::to_string;
-    target = to_string(value);
-}
-template<typename IteratorType> class iteration_proxy_value
-{
-  public:
-    using difference_type = std::ptrdiff_t;
-    using value_type = iteration_proxy_value;
-    using pointer = value_type * ;
-    using reference = value_type & ;
-    using iterator_category = std::input_iterator_tag;
-    using string_type = typename std::remove_cv< typename std::remove_reference<decltype( std::declval<IteratorType>().key() ) >::type >::type;
-
-  private:
-    /// the iterator
-    IteratorType anchor;
-    /// an index for arrays (used to create key names)
-    std::size_t array_index = 0;
-    /// last stringified array index
-    mutable std::size_t array_index_last = 0;
-    /// a string representation of the array index
-    mutable string_type array_index_str = "0";
-    /// an empty string (to return a reference for primitive values)
-    const string_type empty_str{};
-
-  public:
-    explicit iteration_proxy_value(IteratorType it) noexcept
-        : anchor(std::move(it))
-    {}
-
-    /// dereference operator (needed for range-based for)
-    iteration_proxy_value& operator*()
-    {
-        return *this;
-    }
-
-    /// increment operator (needed for range-based for)
-    iteration_proxy_value& operator++()
-    {
-        ++anchor;
-        ++array_index;
-
-        return *this;
-    }
-
-    /// equality operator (needed for InputIterator)
-    bool operator==(const iteration_proxy_value& o) const
-    {
-        return anchor == o.anchor;
-    }
-
-    /// inequality operator (needed for range-based for)
-    bool operator!=(const iteration_proxy_value& o) const
-    {
-        return anchor != o.anchor;
-    }
-
-    /// return key of the iterator
-    const string_type& key() const
-    {
-        JSON_ASSERT(anchor.m_object != nullptr);
-
-        switch (anchor.m_object->type())
-        {
-            // use integer array index as key
-            case value_t::array:
-            {
-                if (array_index != array_index_last)
-                {
-                    int_to_string( array_index_str, array_index );
-                    array_index_last = array_index;
-                }
-                return array_index_str;
-            }
-
-            // use key from the object
-            case value_t::object:
-                return anchor.key();
-
-            // use an empty key for all primitive types
-            case value_t::null:
-            case value_t::string:
-            case value_t::boolean:
-            case value_t::number_integer:
-            case value_t::number_unsigned:
-            case value_t::number_float:
-            case value_t::binary:
-            case value_t::discarded:
-            default:
-                return empty_str;
-        }
-    }
-
-    /// return value of the iterator
-    typename IteratorType::reference value() const
-    {
-        return anchor.value();
-    }
-};
-
-/// proxy class for the items() function
-template<typename IteratorType> class iteration_proxy
-{
-  private:
-    /// the container to iterate
-    typename IteratorType::reference container;
-
-  public:
-    /// construct iteration proxy from a container
-    explicit iteration_proxy(typename IteratorType::reference cont) noexcept
-        : container(cont) {}
-
-    /// return iterator begin (needed for range-based for)
-    iteration_proxy_value<IteratorType> begin() noexcept
-    {
-        return iteration_proxy_value<IteratorType>(container.begin());
-    }
-
-    /// return iterator end (needed for range-based for)
-    iteration_proxy_value<IteratorType> end() noexcept
-    {
-        return iteration_proxy_value<IteratorType>(container.end());
-    }
-};
-// Structured Bindings Support
-// For further reference see https://blog.tartanllama.xyz/structured-bindings/
-// And see https://github.com/nlohmann/json/pull/1391
-template<std::size_t N, typename IteratorType, enable_if_t<N == 0, int> = 0>
-auto get(const nlohmann::detail::iteration_proxy_value<IteratorType>& i) -> decltype(i.key())
-{
-    return i.key();
-}
-// Structured Bindings Support
-// For further reference see https://blog.tartanllama.xyz/structured-bindings/
-// And see https://github.com/nlohmann/json/pull/1391
-template<std::size_t N, typename IteratorType, enable_if_t<N == 1, int> = 0>
-auto get(const nlohmann::detail::iteration_proxy_value<IteratorType>& i) -> decltype(i.value())
-{
-    return i.value();
-}
-}  // namespace detail
-}  // namespace nlohmann
-
-// The Addition to the STD Namespace is required to add
-// Structured Bindings Support to the iteration_proxy_value class
-// For further reference see https://blog.tartanllama.xyz/structured-bindings/
-// And see https://github.com/nlohmann/json/pull/1391
-namespace std
-{
-#if defined(__clang__)
-    // Fix: https://github.com/nlohmann/json/issues/1401
-    #pragma clang diagnostic push
-    #pragma clang diagnostic ignored "-Wmismatched-tags"
-#endif
-template<typename IteratorType>
-class tuple_size<::nlohmann::detail::iteration_proxy_value<IteratorType>>
-            : public std::integral_constant<std::size_t, 2> {};
-
-template<std::size_t N, typename IteratorType>
-class tuple_element<N, ::nlohmann::detail::iteration_proxy_value<IteratorType >>
-{
-  public:
-    using type = decltype(
-                     get<N>(std::declval <
-                            ::nlohmann::detail::iteration_proxy_value<IteratorType >> ()));
-};
-#if defined(__clang__)
-    #pragma clang diagnostic pop
-#endif
-} // namespace std
-
-// #include <nlohmann/detail/meta/cpp_future.hpp>
-
-// #include <nlohmann/detail/meta/type_traits.hpp>
-
-// #include <nlohmann/detail/value_t.hpp>
-
-
-#if JSON_HAS_EXPERIMENTAL_FILESYSTEM
-#include <experimental/filesystem>
-namespace nlohmann::detail
-{
-namespace std_fs = std::experimental::filesystem;
-} // namespace nlohmann::detail
-#elif JSON_HAS_FILESYSTEM
-#include <filesystem>
-namespace nlohmann::detail
-{
-namespace std_fs = std::filesystem;
-} // namespace nlohmann::detail
-#endif
-
-namespace nlohmann
-{
-namespace detail
-{
-//////////////////
-// constructors //
-//////////////////
-
-/*
- * Note all external_constructor<>::construct functions need to call
- * j.m_value.destroy(j.m_type) to avoid a memory leak in case j contains an
- * allocated value (e.g., a string). See bug issue
- * https://github.com/nlohmann/json/issues/2865 for more information.
- */
-
-template<value_t> struct external_constructor;
-
-template<>
-struct external_constructor<value_t::boolean>
-{
-    template<typename BasicJsonType>
-    static void construct(BasicJsonType& j, typename BasicJsonType::boolean_t b) noexcept
-    {
-        j.m_value.destroy(j.m_type);
-        j.m_type = value_t::boolean;
-        j.m_value = b;
-        j.assert_invariant();
-    }
-};
-
-template<>
-struct external_constructor<value_t::string>
-{
-    template<typename BasicJsonType>
-    static void construct(BasicJsonType& j, const typename BasicJsonType::string_t& s)
-    {
-        j.m_value.destroy(j.m_type);
-        j.m_type = value_t::string;
-        j.m_value = s;
-        j.assert_invariant();
-    }
-
-    template<typename BasicJsonType>
-    static void construct(BasicJsonType& j, typename BasicJsonType::string_t&& s)
-    {
-        j.m_value.destroy(j.m_type);
-        j.m_type = value_t::string;
-        j.m_value = std::move(s);
-        j.assert_invariant();
-    }
-
-    template < typename BasicJsonType, typename CompatibleStringType,
-               enable_if_t < !std::is_same<CompatibleStringType, typename BasicJsonType::string_t>::value,
-                             int > = 0 >
-    static void construct(BasicJsonType& j, const CompatibleStringType& str)
-    {
-        j.m_value.destroy(j.m_type);
-        j.m_type = value_t::string;
-        j.m_value.string = j.template create<typename BasicJsonType::string_t>(str);
-        j.assert_invariant();
-    }
-};
-
-template<>
-struct external_constructor<value_t::binary>
-{
-    template<typename BasicJsonType>
-    static void construct(BasicJsonType& j, const typename BasicJsonType::binary_t& b)
-    {
-        j.m_value.destroy(j.m_type);
-        j.m_type = value_t::binary;
-        j.m_value = typename BasicJsonType::binary_t(b);
-        j.assert_invariant();
-    }
-
-    template<typename BasicJsonType>
-    static void construct(BasicJsonType& j, typename BasicJsonType::binary_t&& b)
-    {
-        j.m_value.destroy(j.m_type);
-        j.m_type = value_t::binary;
-        j.m_value = typename BasicJsonType::binary_t(std::move(b));
-        j.assert_invariant();
-    }
-};
-
-template<>
-struct external_constructor<value_t::number_float>
-{
-    template<typename BasicJsonType>
-    static void construct(BasicJsonType& j, typename BasicJsonType::number_float_t val) noexcept
-    {
-        j.m_value.destroy(j.m_type);
-        j.m_type = value_t::number_float;
-        j.m_value = val;
-        j.assert_invariant();
-    }
-};
-
-template<>
-struct external_constructor<value_t::number_unsigned>
-{
-    template<typename BasicJsonType>
-    static void construct(BasicJsonType& j, typename BasicJsonType::number_unsigned_t val) noexcept
-    {
-        j.m_value.destroy(j.m_type);
-        j.m_type = value_t::number_unsigned;
-        j.m_value = val;
-        j.assert_invariant();
-    }
-};
-
-template<>
-struct external_constructor<value_t::number_integer>
-{
-    template<typename BasicJsonType>
-    static void construct(BasicJsonType& j, typename BasicJsonType::number_integer_t val) noexcept
-    {
-        j.m_value.destroy(j.m_type);
-        j.m_type = value_t::number_integer;
-        j.m_value = val;
-        j.assert_invariant();
-    }
-};
-
-template<>
-struct external_constructor<value_t::array>
-{
-    template<typename BasicJsonType>
-    static void construct(BasicJsonType& j, const typename BasicJsonType::array_t& arr)
-    {
-        j.m_value.destroy(j.m_type);
-        j.m_type = value_t::array;
-        j.m_value = arr;
-        j.set_parents();
-        j.assert_invariant();
-    }
-
-    template<typename BasicJsonType>
-    static void construct(BasicJsonType& j, typename BasicJsonType::array_t&& arr)
-    {
-        j.m_value.destroy(j.m_type);
-        j.m_type = value_t::array;
-        j.m_value = std::move(arr);
-        j.set_parents();
-        j.assert_invariant();
-    }
-
-    template < typename BasicJsonType, typename CompatibleArrayType,
-               enable_if_t < !std::is_same<CompatibleArrayType, typename BasicJsonType::array_t>::value,
-                             int > = 0 >
-    static void construct(BasicJsonType& j, const CompatibleArrayType& arr)
-    {
-        using std::begin;
-        using std::end;
-
-        j.m_value.destroy(j.m_type);
-        j.m_type = value_t::array;
-        j.m_value.array = j.template create<typename BasicJsonType::array_t>(begin(arr), end(arr));
-        j.set_parents();
-        j.assert_invariant();
-    }
-
-    template<typename BasicJsonType>
-    static void construct(BasicJsonType& j, const std::vector<bool>& arr)
-    {
-        j.m_value.destroy(j.m_type);
-        j.m_type = value_t::array;
-        j.m_value = value_t::array;
-        j.m_value.array->reserve(arr.size());
-        for (const bool x : arr)
-        {
-            j.m_value.array->push_back(x);
-            j.set_parent(j.m_value.array->back());
-        }
-        j.assert_invariant();
-    }
-
-    template<typename BasicJsonType, typename T,
-             enable_if_t<std::is_convertible<T, BasicJsonType>::value, int> = 0>
-    static void construct(BasicJsonType& j, const std::valarray<T>& arr)
-    {
-        j.m_value.destroy(j.m_type);
-        j.m_type = value_t::array;
-        j.m_value = value_t::array;
-        j.m_value.array->resize(arr.size());
-        if (arr.size() > 0)
-        {
-            std::copy(std::begin(arr), std::end(arr), j.m_value.array->begin());
-        }
-        j.set_parents();
-        j.assert_invariant();
-    }
-};
-
-template<>
-struct external_constructor<value_t::object>
-{
-    template<typename BasicJsonType>
-    static void construct(BasicJsonType& j, const typename BasicJsonType::object_t& obj)
-    {
-        j.m_value.destroy(j.m_type);
-        j.m_type = value_t::object;
-        j.m_value = obj;
-        j.set_parents();
-        j.assert_invariant();
-    }
-
-    template<typename BasicJsonType>
-    static void construct(BasicJsonType& j, typename BasicJsonType::object_t&& obj)
-    {
-        j.m_value.destroy(j.m_type);
-        j.m_type = value_t::object;
-        j.m_value = std::move(obj);
-        j.set_parents();
-        j.assert_invariant();
-    }
-
-    template < typename BasicJsonType, typename CompatibleObjectType,
-               enable_if_t < !std::is_same<CompatibleObjectType, typename BasicJsonType::object_t>::value, int > = 0 >
-    static void construct(BasicJsonType& j, const CompatibleObjectType& obj)
-    {
-        using std::begin;
-        using std::end;
-
-        j.m_value.destroy(j.m_type);
-        j.m_type = value_t::object;
-        j.m_value.object = j.template create<typename BasicJsonType::object_t>(begin(obj), end(obj));
-        j.set_parents();
-        j.assert_invariant();
-    }
-};
-
-/////////////
-// to_json //
-/////////////
-
-template<typename BasicJsonType, typename T,
-         enable_if_t<std::is_same<T, typename BasicJsonType::boolean_t>::value, int> = 0>
-void to_json(BasicJsonType& j, T b) noexcept
-{
-    external_constructor<value_t::boolean>::construct(j, b);
-}
-
-template<typename BasicJsonType, typename CompatibleString,
-         enable_if_t<std::is_constructible<typename BasicJsonType::string_t, CompatibleString>::value, int> = 0>
-void to_json(BasicJsonType& j, const CompatibleString& s)
-{
-    external_constructor<value_t::string>::construct(j, s);
-}
-
-template<typename BasicJsonType>
-void to_json(BasicJsonType& j, typename BasicJsonType::string_t&& s)
-{
-    external_constructor<value_t::string>::construct(j, std::move(s));
-}
-
-template<typename BasicJsonType, typename FloatType,
-         enable_if_t<std::is_floating_point<FloatType>::value, int> = 0>
-void to_json(BasicJsonType& j, FloatType val) noexcept
-{
-    external_constructor<value_t::number_float>::construct(j, static_cast<typename BasicJsonType::number_float_t>(val));
-}
-
-template<typename BasicJsonType, typename CompatibleNumberUnsignedType,
-         enable_if_t<is_compatible_integer_type<typename BasicJsonType::number_unsigned_t, CompatibleNumberUnsignedType>::value, int> = 0>
-void to_json(BasicJsonType& j, CompatibleNumberUnsignedType val) noexcept
-{
-    external_constructor<value_t::number_unsigned>::construct(j, static_cast<typename BasicJsonType::number_unsigned_t>(val));
-}
-
-template<typename BasicJsonType, typename CompatibleNumberIntegerType,
-         enable_if_t<is_compatible_integer_type<typename BasicJsonType::number_integer_t, CompatibleNumberIntegerType>::value, int> = 0>
-void to_json(BasicJsonType& j, CompatibleNumberIntegerType val) noexcept
-{
-    external_constructor<value_t::number_integer>::construct(j, static_cast<typename BasicJsonType::number_integer_t>(val));
-}
-
-template<typename BasicJsonType, typename EnumType,
-         enable_if_t<std::is_enum<EnumType>::value, int> = 0>
-void to_json(BasicJsonType& j, EnumType e) noexcept
-{
-    using underlying_type = typename std::underlying_type<EnumType>::type;
-    external_constructor<value_t::number_integer>::construct(j, static_cast<underlying_type>(e));
-}
-
-template<typename BasicJsonType>
-void to_json(BasicJsonType& j, const std::vector<bool>& e)
-{
-    external_constructor<value_t::array>::construct(j, e);
-}
-
-template < typename BasicJsonType, typename CompatibleArrayType,
-           enable_if_t < is_compatible_array_type<BasicJsonType,
-                         CompatibleArrayType>::value&&
-                         !is_compatible_object_type<BasicJsonType, CompatibleArrayType>::value&&
-                         !is_compatible_string_type<BasicJsonType, CompatibleArrayType>::value&&
-                         !std::is_same<typename BasicJsonType::binary_t, CompatibleArrayType>::value&&
-                         !is_basic_json<CompatibleArrayType>::value,
-                         int > = 0 >
-void to_json(BasicJsonType& j, const CompatibleArrayType& arr)
-{
-    external_constructor<value_t::array>::construct(j, arr);
-}
-
-template<typename BasicJsonType>
-void to_json(BasicJsonType& j, const typename BasicJsonType::binary_t& bin)
-{
-    external_constructor<value_t::binary>::construct(j, bin);
-}
-
-template<typename BasicJsonType, typename T,
-         enable_if_t<std::is_convertible<T, BasicJsonType>::value, int> = 0>
-void to_json(BasicJsonType& j, const std::valarray<T>& arr)
-{
-    external_constructor<value_t::array>::construct(j, std::move(arr));
-}
-
-template<typename BasicJsonType>
-void to_json(BasicJsonType& j, typename BasicJsonType::array_t&& arr)
-{
-    external_constructor<value_t::array>::construct(j, std::move(arr));
-}
-
-template < typename BasicJsonType, typename CompatibleObjectType,
-           enable_if_t < is_compatible_object_type<BasicJsonType, CompatibleObjectType>::value&& !is_basic_json<CompatibleObjectType>::value, int > = 0 >
-void to_json(BasicJsonType& j, const CompatibleObjectType& obj)
-{
-    external_constructor<value_t::object>::construct(j, obj);
-}
-
-template<typename BasicJsonType>
-void to_json(BasicJsonType& j, typename BasicJsonType::object_t&& obj)
-{
-    external_constructor<value_t::object>::construct(j, std::move(obj));
-}
-
-template <
-    typename BasicJsonType, typename T, std::size_t N,
-    enable_if_t < !std::is_constructible<typename BasicJsonType::string_t,
-                  const T(&)[N]>::value, // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
-                  int > = 0 >
-void to_json(BasicJsonType& j, const T(&arr)[N]) // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
-{
-    external_constructor<value_t::array>::construct(j, arr);
-}
-
-template < typename BasicJsonType, typename T1, typename T2, enable_if_t < std::is_constructible<BasicJsonType, T1>::value&& std::is_constructible<BasicJsonType, T2>::value, int > = 0 >
-void to_json(BasicJsonType& j, const std::pair<T1, T2>& p)
-{
-    j = { p.first, p.second };
-}
-
-// for https://github.com/nlohmann/json/pull/1134
-template<typename BasicJsonType, typename T,
-         enable_if_t<std::is_same<T, iteration_proxy_value<typename BasicJsonType::iterator>>::value, int> = 0>
-void to_json(BasicJsonType& j, const T& b)
-{
-    j = { {b.key(), b.value()} };
-}
-
-template<typename BasicJsonType, typename Tuple, std::size_t... Idx>
-void to_json_tuple_impl(BasicJsonType& j, const Tuple& t, index_sequence<Idx...> /*unused*/)
-{
-    j = { std::get<Idx>(t)... };
-}
-
-template<typename BasicJsonType, typename T, enable_if_t<is_constructible_tuple<BasicJsonType, T>::value, int > = 0>
-void to_json(BasicJsonType& j, const T& t)
-{
-    to_json_tuple_impl(j, t, make_index_sequence<std::tuple_size<T>::value> {});
-}
-
-#if JSON_HAS_FILESYSTEM || JSON_HAS_EXPERIMENTAL_FILESYSTEM
-template<typename BasicJsonType>
-void to_json(BasicJsonType& j, const std_fs::path& p)
-{
-    j = p.string();
-}
-#endif
-
-struct to_json_fn
-{
-    template<typename BasicJsonType, typename T>
-    auto operator()(BasicJsonType& j, T&& val) const noexcept(noexcept(to_json(j, std::forward<T>(val))))
-    -> decltype(to_json(j, std::forward<T>(val)), void())
-    {
-        return to_json(j, std::forward<T>(val));
-    }
-};
-}  // namespace detail
-
-/// namespace to hold default `to_json` function
-/// to see why this is required:
-/// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2015/n4381.html
-namespace // NOLINT(cert-dcl59-cpp,fuchsia-header-anon-namespaces,google-build-namespaces)
-{
-constexpr const auto& to_json = detail::static_const<detail::to_json_fn>::value; // NOLINT(misc-definitions-in-headers)
-} // namespace
-} // namespace nlohmann
-
-// #include <nlohmann/detail/meta/identity_tag.hpp>
-
-// #include <nlohmann/detail/meta/type_traits.hpp>
-
-
-namespace nlohmann
-{
-
-/// @sa https://json.nlohmann.me/api/adl_serializer/
-template<typename ValueType, typename>
-struct adl_serializer
-{
-    /// @brief convert a JSON value to any value type
-    /// @sa https://json.nlohmann.me/api/adl_serializer/from_json/
-    template<typename BasicJsonType, typename TargetType = ValueType>
-    static auto from_json(BasicJsonType && j, TargetType& val) noexcept(
-        noexcept(::nlohmann::from_json(std::forward<BasicJsonType>(j), val)))
-    -> decltype(::nlohmann::from_json(std::forward<BasicJsonType>(j), val), void())
-    {
-        ::nlohmann::from_json(std::forward<BasicJsonType>(j), val);
-    }
-
-    /// @brief convert a JSON value to any value type
-    /// @sa https://json.nlohmann.me/api/adl_serializer/from_json/
-    template<typename BasicJsonType, typename TargetType = ValueType>
-    static auto from_json(BasicJsonType && j) noexcept(
-    noexcept(::nlohmann::from_json(std::forward<BasicJsonType>(j), detail::identity_tag<TargetType> {})))
-    -> decltype(::nlohmann::from_json(std::forward<BasicJsonType>(j), detail::identity_tag<TargetType> {}))
-    {
-        return ::nlohmann::from_json(std::forward<BasicJsonType>(j), detail::identity_tag<TargetType> {});
-    }
-
-    /// @brief convert any value type to a JSON value
-    /// @sa https://json.nlohmann.me/api/adl_serializer/to_json/
-    template<typename BasicJsonType, typename TargetType = ValueType>
-    static auto to_json(BasicJsonType& j, TargetType && val) noexcept(
-        noexcept(::nlohmann::to_json(j, std::forward<TargetType>(val))))
-    -> decltype(::nlohmann::to_json(j, std::forward<TargetType>(val)), void())
-    {
-        ::nlohmann::to_json(j, std::forward<TargetType>(val));
-    }
-};
-}  // namespace nlohmann
-
-// #include <nlohmann/byte_container_with_subtype.hpp>
-
-
-#include <cstdint> // uint8_t, uint64_t
-#include <tuple> // tie
-#include <utility> // move
-
-namespace nlohmann
-{
-
-/// @brief an internal type for a backed binary type
-/// @sa https://json.nlohmann.me/api/byte_container_with_subtype/
-template<typename BinaryType>
-class byte_container_with_subtype : public BinaryType
-{
-  public:
-    using container_type = BinaryType;
-    using subtype_type = std::uint64_t;
-
-    /// @sa https://json.nlohmann.me/api/byte_container_with_subtype/byte_container_with_subtype/
-    byte_container_with_subtype() noexcept(noexcept(container_type()))
-        : container_type()
-    {}
-
-    /// @sa https://json.nlohmann.me/api/byte_container_with_subtype/byte_container_with_subtype/
-    byte_container_with_subtype(const container_type& b) noexcept(noexcept(container_type(b)))
-        : container_type(b)
-    {}
-
-    /// @sa https://json.nlohmann.me/api/byte_container_with_subtype/byte_container_with_subtype/
-    byte_container_with_subtype(container_type&& b) noexcept(noexcept(container_type(std::move(b))))
-        : container_type(std::move(b))
-    {}
-
-    /// @sa https://json.nlohmann.me/api/byte_container_with_subtype/byte_container_with_subtype/
-    byte_container_with_subtype(const container_type& b, subtype_type subtype_) noexcept(noexcept(container_type(b)))
-        : container_type(b)
-        , m_subtype(subtype_)
-        , m_has_subtype(true)
-    {}
-
-    /// @sa https://json.nlohmann.me/api/byte_container_with_subtype/byte_container_with_subtype/
-    byte_container_with_subtype(container_type&& b, subtype_type subtype_) noexcept(noexcept(container_type(std::move(b))))
-        : container_type(std::move(b))
-        , m_subtype(subtype_)
-        , m_has_subtype(true)
-    {}
-
-    bool operator==(const byte_container_with_subtype& rhs) const
-    {
-        return std::tie(static_cast<const BinaryType&>(*this), m_subtype, m_has_subtype) ==
-               std::tie(static_cast<const BinaryType&>(rhs), rhs.m_subtype, rhs.m_has_subtype);
-    }
-
-    bool operator!=(const byte_container_with_subtype& rhs) const
-    {
-        return !(rhs == *this);
-    }
-
-    /// @brief sets the binary subtype
-    /// @sa https://json.nlohmann.me/api/byte_container_with_subtype/set_subtype/
-    void set_subtype(subtype_type subtype_) noexcept
-    {
-        m_subtype = subtype_;
-        m_has_subtype = true;
-    }
-
-    /// @brief return the binary subtype
-    /// @sa https://json.nlohmann.me/api/byte_container_with_subtype/subtype/
-    constexpr subtype_type subtype() const noexcept
-    {
-        return m_has_subtype ? m_subtype : static_cast<subtype_type>(-1);
-    }
-
-    /// @brief return whether the value has a subtype
-    /// @sa https://json.nlohmann.me/api/byte_container_with_subtype/has_subtype/
-    constexpr bool has_subtype() const noexcept
-    {
-        return m_has_subtype;
-    }
-
-    /// @brief clears the binary subtype
-    /// @sa https://json.nlohmann.me/api/byte_container_with_subtype/clear_subtype/
-    void clear_subtype() noexcept
-    {
-        m_subtype = 0;
-        m_has_subtype = false;
-    }
-
-  private:
-    subtype_type m_subtype = 0;
-    bool m_has_subtype = false;
-};
-
-}  // namespace nlohmann
-
-// #include <nlohmann/detail/conversions/from_json.hpp>
-
-// #include <nlohmann/detail/conversions/to_json.hpp>
-
-// #include <nlohmann/detail/exceptions.hpp>
-
-// #include <nlohmann/detail/hash.hpp>
-
-
-#include <cstdint> // uint8_t
-#include <cstddef> // size_t
-#include <functional> // hash
-
-// #include <nlohmann/detail/macro_scope.hpp>
-
-// #include <nlohmann/detail/value_t.hpp>
-
-
-namespace nlohmann
-{
-namespace detail
-{
-
-// boost::hash_combine
-inline std::size_t combine(std::size_t seed, std::size_t h) noexcept
-{
-    seed ^= h + 0x9e3779b9 + (seed << 6U) + (seed >> 2U);
-    return seed;
-}
-
-/*!
-@brief hash a JSON value
-
-The hash function tries to rely on std::hash where possible. Furthermore, the
-type of the JSON value is taken into account to have different hash values for
-null, 0, 0U, and false, etc.
-
-@tparam BasicJsonType basic_json specialization
-@param j JSON value to hash
-@return hash value of j
-*/
-template<typename BasicJsonType>
-std::size_t hash(const BasicJsonType& j)
-{
-    using string_t = typename BasicJsonType::string_t;
-    using number_integer_t = typename BasicJsonType::number_integer_t;
-    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
-    using number_float_t = typename BasicJsonType::number_float_t;
-
-    const auto type = static_cast<std::size_t>(j.type());
-    switch (j.type())
-    {
-        case BasicJsonType::value_t::null:
-        case BasicJsonType::value_t::discarded:
-        {
-            return combine(type, 0);
-        }
-
-        case BasicJsonType::value_t::object:
-        {
-            auto seed = combine(type, j.size());
-            for (const auto& element : j.items())
-            {
-                const auto h = std::hash<string_t> {}(element.key());
-                seed = combine(seed, h);
-                seed = combine(seed, hash(element.value()));
-            }
-            return seed;
-        }
-
-        case BasicJsonType::value_t::array:
-        {
-            auto seed = combine(type, j.size());
-            for (const auto& element : j)
-            {
-                seed = combine(seed, hash(element));
-            }
-            return seed;
-        }
-
-        case BasicJsonType::value_t::string:
-        {
-            const auto h = std::hash<string_t> {}(j.template get_ref<const string_t&>());
-            return combine(type, h);
-        }
-
-        case BasicJsonType::value_t::boolean:
-        {
-            const auto h = std::hash<bool> {}(j.template get<bool>());
-            return combine(type, h);
-        }
-
-        case BasicJsonType::value_t::number_integer:
-        {
-            const auto h = std::hash<number_integer_t> {}(j.template get<number_integer_t>());
-            return combine(type, h);
-        }
-
-        case BasicJsonType::value_t::number_unsigned:
-        {
-            const auto h = std::hash<number_unsigned_t> {}(j.template get<number_unsigned_t>());
-            return combine(type, h);
-        }
-
-        case BasicJsonType::value_t::number_float:
-        {
-            const auto h = std::hash<number_float_t> {}(j.template get<number_float_t>());
-            return combine(type, h);
-        }
-
-        case BasicJsonType::value_t::binary:
-        {
-            auto seed = combine(type, j.get_binary().size());
-            const auto h = std::hash<bool> {}(j.get_binary().has_subtype());
-            seed = combine(seed, h);
-            seed = combine(seed, static_cast<std::size_t>(j.get_binary().subtype()));
-            for (const auto byte : j.get_binary())
-            {
-                seed = combine(seed, std::hash<std::uint8_t> {}(byte));
-            }
-            return seed;
-        }
-
-        default:                   // LCOV_EXCL_LINE
-            JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
-            return 0;              // LCOV_EXCL_LINE
-    }
-}
-
-}  // namespace detail
-}  // namespace nlohmann
-
-// #include <nlohmann/detail/input/binary_reader.hpp>
-
-
-#include <algorithm> // generate_n
-#include <array> // array
-#include <cmath> // ldexp
-#include <cstddef> // size_t
-#include <cstdint> // uint8_t, uint16_t, uint32_t, uint64_t
-#include <cstdio> // snprintf
-#include <cstring> // memcpy
-#include <iterator> // back_inserter
-#include <limits> // numeric_limits
-#include <string> // char_traits, string
-#include <utility> // make_pair, move
-#include <vector> // vector
-
-// #include <nlohmann/detail/exceptions.hpp>
-
-// #include <nlohmann/detail/input/input_adapters.hpp>
-
-
-#include <array> // array
-#include <cstddef> // size_t
-#include <cstring> // strlen
-#include <iterator> // begin, end, iterator_traits, random_access_iterator_tag, distance, next
-#include <memory> // shared_ptr, make_shared, addressof
-#include <numeric> // accumulate
-#include <string> // string, char_traits
-#include <type_traits> // enable_if, is_base_of, is_pointer, is_integral, remove_pointer
-#include <utility> // pair, declval
-
-#ifndef JSON_NO_IO
-    #include <cstdio>   // FILE *
-    #include <istream>  // istream
-#endif                  // JSON_NO_IO
-
-// #include <nlohmann/detail/iterators/iterator_traits.hpp>
-
-// #include <nlohmann/detail/macro_scope.hpp>
-
-
-namespace nlohmann
-{
-namespace detail
-{
-/// the supported input formats
-enum class input_format_t { json, cbor, msgpack, ubjson, bson };
-
-////////////////////
-// input adapters //
-////////////////////
-
-#ifndef JSON_NO_IO
-/*!
-Input adapter for stdio file access. This adapter read only 1 byte and do not use any
- buffer. This adapter is a very low level adapter.
-*/
-class file_input_adapter
-{
-  public:
-    using char_type = char;
-
-    JSON_HEDLEY_NON_NULL(2)
-    explicit file_input_adapter(std::FILE* f) noexcept
-        : m_file(f)
-    {}
-
-    // make class move-only
-    file_input_adapter(const file_input_adapter&) = delete;
-    file_input_adapter(file_input_adapter&&) noexcept = default;
-    file_input_adapter& operator=(const file_input_adapter&) = delete;
-    file_input_adapter& operator=(file_input_adapter&&) = delete;
-    ~file_input_adapter() = default;
-
-    std::char_traits<char>::int_type get_character() noexcept
-    {
-        return std::fgetc(m_file);
-    }
-
-  private:
-    /// the file pointer to read from
-    std::FILE* m_file;
-};
-
-
-/*!
-Input adapter for a (caching) istream. Ignores a UFT Byte Order Mark at
-beginning of input. Does not support changing the underlying std::streambuf
-in mid-input. Maintains underlying std::istream and std::streambuf to support
-subsequent use of standard std::istream operations to process any input
-characters following those used in parsing the JSON input.  Clears the
-std::istream flags; any input errors (e.g., EOF) will be detected by the first
-subsequent call for input from the std::istream.
-*/
-class input_stream_adapter
-{
-  public:
-    using char_type = char;
-
-    ~input_stream_adapter()
-    {
-        // clear stream flags; we use underlying streambuf I/O, do not
-        // maintain ifstream flags, except eof
-        if (is != nullptr)
-        {
-            is->clear(is->rdstate() & std::ios::eofbit);
-        }
-    }
-
-    explicit input_stream_adapter(std::istream& i)
-        : is(&i), sb(i.rdbuf())
-    {}
-
-    // delete because of pointer members
-    input_stream_adapter(const input_stream_adapter&) = delete;
-    input_stream_adapter& operator=(input_stream_adapter&) = delete;
-    input_stream_adapter& operator=(input_stream_adapter&&) = delete;
-
-    input_stream_adapter(input_stream_adapter&& rhs) noexcept
-        : is(rhs.is), sb(rhs.sb)
-    {
-        rhs.is = nullptr;
-        rhs.sb = nullptr;
-    }
-
-    // std::istream/std::streambuf use std::char_traits<char>::to_int_type, to
-    // ensure that std::char_traits<char>::eof() and the character 0xFF do not
-    // end up as the same value, e.g. 0xFFFFFFFF.
-    std::char_traits<char>::int_type get_character()
-    {
-        auto res = sb->sbumpc();
-        // set eof manually, as we don't use the istream interface.
-        if (JSON_HEDLEY_UNLIKELY(res == std::char_traits<char>::eof()))
-        {
-            is->clear(is->rdstate() | std::ios::eofbit);
-        }
-        return res;
-    }
-
-  private:
-    /// the associated input stream
-    std::istream* is = nullptr;
-    std::streambuf* sb = nullptr;
-};
-#endif  // JSON_NO_IO
-
-// General-purpose iterator-based adapter. It might not be as fast as
-// theoretically possible for some containers, but it is extremely versatile.
-template<typename IteratorType>
-class iterator_input_adapter
-{
-  public:
-    using char_type = typename std::iterator_traits<IteratorType>::value_type;
-
-    iterator_input_adapter(IteratorType first, IteratorType last)
-        : current(std::move(first)), end(std::move(last))
-    {}
-
-    typename std::char_traits<char_type>::int_type get_character()
-    {
-        if (JSON_HEDLEY_LIKELY(current != end))
-        {
-            auto result = std::char_traits<char_type>::to_int_type(*current);
-            std::advance(current, 1);
-            return result;
-        }
-
-        return std::char_traits<char_type>::eof();
-    }
-
-  private:
-    IteratorType current;
-    IteratorType end;
-
-    template<typename BaseInputAdapter, size_t T>
-    friend struct wide_string_input_helper;
-
-    bool empty() const
-    {
-        return current == end;
-    }
-};
-
-
-template<typename BaseInputAdapter, size_t T>
-struct wide_string_input_helper;
-
-template<typename BaseInputAdapter>
-struct wide_string_input_helper<BaseInputAdapter, 4>
-{
-    // UTF-32
-    static void fill_buffer(BaseInputAdapter& input,
-                            std::array<std::char_traits<char>::int_type, 4>& utf8_bytes,
-                            size_t& utf8_bytes_index,
-                            size_t& utf8_bytes_filled)
-    {
-        utf8_bytes_index = 0;
-
-        if (JSON_HEDLEY_UNLIKELY(input.empty()))
-        {
-            utf8_bytes[0] = std::char_traits<char>::eof();
-            utf8_bytes_filled = 1;
-        }
-        else
-        {
-            // get the current character
-            const auto wc = input.get_character();
-
-            // UTF-32 to UTF-8 encoding
-            if (wc < 0x80)
-            {
-                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(wc);
-                utf8_bytes_filled = 1;
-            }
-            else if (wc <= 0x7FF)
-            {
-                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(0xC0u | ((static_cast<unsigned int>(wc) >> 6u) & 0x1Fu));
-                utf8_bytes[1] = static_cast<std::char_traits<char>::int_type>(0x80u | (static_cast<unsigned int>(wc) & 0x3Fu));
-                utf8_bytes_filled = 2;
-            }
-            else if (wc <= 0xFFFF)
-            {
-                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(0xE0u | ((static_cast<unsigned int>(wc) >> 12u) & 0x0Fu));
-                utf8_bytes[1] = static_cast<std::char_traits<char>::int_type>(0x80u | ((static_cast<unsigned int>(wc) >> 6u) & 0x3Fu));
-                utf8_bytes[2] = static_cast<std::char_traits<char>::int_type>(0x80u | (static_cast<unsigned int>(wc) & 0x3Fu));
-                utf8_bytes_filled = 3;
-            }
-            else if (wc <= 0x10FFFF)
-            {
-                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(0xF0u | ((static_cast<unsigned int>(wc) >> 18u) & 0x07u));
-                utf8_bytes[1] = static_cast<std::char_traits<char>::int_type>(0x80u | ((static_cast<unsigned int>(wc) >> 12u) & 0x3Fu));
-                utf8_bytes[2] = static_cast<std::char_traits<char>::int_type>(0x80u | ((static_cast<unsigned int>(wc) >> 6u) & 0x3Fu));
-                utf8_bytes[3] = static_cast<std::char_traits<char>::int_type>(0x80u | (static_cast<unsigned int>(wc) & 0x3Fu));
-                utf8_bytes_filled = 4;
-            }
-            else
-            {
-                // unknown character
-                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(wc);
-                utf8_bytes_filled = 1;
-            }
-        }
-    }
-};
-
-template<typename BaseInputAdapter>
-struct wide_string_input_helper<BaseInputAdapter, 2>
-{
-    // UTF-16
-    static void fill_buffer(BaseInputAdapter& input,
-                            std::array<std::char_traits<char>::int_type, 4>& utf8_bytes,
-                            size_t& utf8_bytes_index,
-                            size_t& utf8_bytes_filled)
-    {
-        utf8_bytes_index = 0;
-
-        if (JSON_HEDLEY_UNLIKELY(input.empty()))
-        {
-            utf8_bytes[0] = std::char_traits<char>::eof();
-            utf8_bytes_filled = 1;
-        }
-        else
-        {
-            // get the current character
-            const auto wc = input.get_character();
-
-            // UTF-16 to UTF-8 encoding
-            if (wc < 0x80)
-            {
-                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(wc);
-                utf8_bytes_filled = 1;
-            }
-            else if (wc <= 0x7FF)
-            {
-                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(0xC0u | ((static_cast<unsigned int>(wc) >> 6u)));
-                utf8_bytes[1] = static_cast<std::char_traits<char>::int_type>(0x80u | (static_cast<unsigned int>(wc) & 0x3Fu));
-                utf8_bytes_filled = 2;
-            }
-            else if (0xD800 > wc || wc >= 0xE000)
-            {
-                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(0xE0u | ((static_cast<unsigned int>(wc) >> 12u)));
-                utf8_bytes[1] = static_cast<std::char_traits<char>::int_type>(0x80u | ((static_cast<unsigned int>(wc) >> 6u) & 0x3Fu));
-                utf8_bytes[2] = static_cast<std::char_traits<char>::int_type>(0x80u | (static_cast<unsigned int>(wc) & 0x3Fu));
-                utf8_bytes_filled = 3;
-            }
-            else
-            {
-                if (JSON_HEDLEY_UNLIKELY(!input.empty()))
-                {
-                    const auto wc2 = static_cast<unsigned int>(input.get_character());
-                    const auto charcode = 0x10000u + (((static_cast<unsigned int>(wc) & 0x3FFu) << 10u) | (wc2 & 0x3FFu));
-                    utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(0xF0u | (charcode >> 18u));
-                    utf8_bytes[1] = static_cast<std::char_traits<char>::int_type>(0x80u | ((charcode >> 12u) & 0x3Fu));
-                    utf8_bytes[2] = static_cast<std::char_traits<char>::int_type>(0x80u | ((charcode >> 6u) & 0x3Fu));
-                    utf8_bytes[3] = static_cast<std::char_traits<char>::int_type>(0x80u | (charcode & 0x3Fu));
-                    utf8_bytes_filled = 4;
-                }
-                else
-                {
-                    utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(wc);
-                    utf8_bytes_filled = 1;
-                }
-            }
-        }
-    }
-};
-
-// Wraps another input apdater to convert wide character types into individual bytes.
-template<typename BaseInputAdapter, typename WideCharType>
-class wide_string_input_adapter
-{
-  public:
-    using char_type = char;
-
-    wide_string_input_adapter(BaseInputAdapter base)
-        : base_adapter(base) {}
-
-    typename std::char_traits<char>::int_type get_character() noexcept
-    {
-        // check if buffer needs to be filled
-        if (utf8_bytes_index == utf8_bytes_filled)
-        {
-            fill_buffer<sizeof(WideCharType)>();
-
-            JSON_ASSERT(utf8_bytes_filled > 0);
-            JSON_ASSERT(utf8_bytes_index == 0);
-        }
-
-        // use buffer
-        JSON_ASSERT(utf8_bytes_filled > 0);
-        JSON_ASSERT(utf8_bytes_index < utf8_bytes_filled);
-        return utf8_bytes[utf8_bytes_index++];
-    }
-
-  private:
-    BaseInputAdapter base_adapter;
-
-    template<size_t T>
-    void fill_buffer()
-    {
-        wide_string_input_helper<BaseInputAdapter, T>::fill_buffer(base_adapter, utf8_bytes, utf8_bytes_index, utf8_bytes_filled);
-    }
-
-    /// a buffer for UTF-8 bytes
-    std::array<std::char_traits<char>::int_type, 4> utf8_bytes = {{0, 0, 0, 0}};
-
-    /// index to the utf8_codes array for the next valid byte
-    std::size_t utf8_bytes_index = 0;
-    /// number of valid bytes in the utf8_codes array
-    std::size_t utf8_bytes_filled = 0;
-};
-
-
-template<typename IteratorType, typename Enable = void>
-struct iterator_input_adapter_factory
-{
-    using iterator_type = IteratorType;
-    using char_type = typename std::iterator_traits<iterator_type>::value_type;
-    using adapter_type = iterator_input_adapter<iterator_type>;
-
-    static adapter_type create(IteratorType first, IteratorType last)
-    {
-        return adapter_type(std::move(first), std::move(last));
-    }
-};
-
-template<typename T>
-struct is_iterator_of_multibyte
-{
-    using value_type = typename std::iterator_traits<T>::value_type;
-    enum
-    {
-        value = sizeof(value_type) > 1
-    };
-};
-
-template<typename IteratorType>
-struct iterator_input_adapter_factory<IteratorType, enable_if_t<is_iterator_of_multibyte<IteratorType>::value>>
-{
-    using iterator_type = IteratorType;
-    using char_type = typename std::iterator_traits<iterator_type>::value_type;
-    using base_adapter_type = iterator_input_adapter<iterator_type>;
-    using adapter_type = wide_string_input_adapter<base_adapter_type, char_type>;
-
-    static adapter_type create(IteratorType first, IteratorType last)
-    {
-        return adapter_type(base_adapter_type(std::move(first), std::move(last)));
-    }
-};
-
-// General purpose iterator-based input
-template<typename IteratorType>
-typename iterator_input_adapter_factory<IteratorType>::adapter_type input_adapter(IteratorType first, IteratorType last)
-{
-    using factory_type = iterator_input_adapter_factory<IteratorType>;
-    return factory_type::create(first, last);
-}
-
-// Convenience shorthand from container to iterator
-// Enables ADL on begin(container) and end(container)
-// Encloses the using declarations in namespace for not to leak them to outside scope
-
-namespace container_input_adapter_factory_impl
-{
-
-using std::begin;
-using std::end;
-
-template<typename ContainerType, typename Enable = void>
-struct container_input_adapter_factory {};
-
-template<typename ContainerType>
-struct container_input_adapter_factory< ContainerType,
-       void_t<decltype(begin(std::declval<ContainerType>()), end(std::declval<ContainerType>()))>>
-       {
-           using adapter_type = decltype(input_adapter(begin(std::declval<ContainerType>()), end(std::declval<ContainerType>())));
-
-           static adapter_type create(const ContainerType& container)
-{
-    return input_adapter(begin(container), end(container));
-}
-       };
-
-} // namespace container_input_adapter_factory_impl
-
-template<typename ContainerType>
-typename container_input_adapter_factory_impl::container_input_adapter_factory<ContainerType>::adapter_type input_adapter(const ContainerType& container)
-{
-    return container_input_adapter_factory_impl::container_input_adapter_factory<ContainerType>::create(container);
-}
-
-#ifndef JSON_NO_IO
-// Special cases with fast paths
-inline file_input_adapter input_adapter(std::FILE* file)
-{
-    return file_input_adapter(file);
-}
-
-inline input_stream_adapter input_adapter(std::istream& stream)
-{
-    return input_stream_adapter(stream);
-}
-
-inline input_stream_adapter input_adapter(std::istream&& stream)
-{
-    return input_stream_adapter(stream);
-}
-#endif  // JSON_NO_IO
-
-using contiguous_bytes_input_adapter = decltype(input_adapter(std::declval<const char*>(), std::declval<const char*>()));
-
-// Null-delimited strings, and the like.
-template < typename CharT,
-           typename std::enable_if <
-               std::is_pointer<CharT>::value&&
-               !std::is_array<CharT>::value&&
-               std::is_integral<typename std::remove_pointer<CharT>::type>::value&&
-               sizeof(typename std::remove_pointer<CharT>::type) == 1,
-               int >::type = 0 >
-contiguous_bytes_input_adapter input_adapter(CharT b)
-{
-    auto length = std::strlen(reinterpret_cast<const char*>(b));
-    const auto* ptr = reinterpret_cast<const char*>(b);
-    return input_adapter(ptr, ptr + length);
-}
-
-template<typename T, std::size_t N>
-auto input_adapter(T (&array)[N]) -> decltype(input_adapter(array, array + N)) // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
-{
-    return input_adapter(array, array + N);
-}
-
-// This class only handles inputs of input_buffer_adapter type.
-// It's required so that expressions like {ptr, len} can be implicitly cast
-// to the correct adapter.
-class span_input_adapter
-{
-  public:
-    template < typename CharT,
-               typename std::enable_if <
-                   std::is_pointer<CharT>::value&&
-                   std::is_integral<typename std::remove_pointer<CharT>::type>::value&&
-                   sizeof(typename std::remove_pointer<CharT>::type) == 1,
-                   int >::type = 0 >
-    span_input_adapter(CharT b, std::size_t l)
-        : ia(reinterpret_cast<const char*>(b), reinterpret_cast<const char*>(b) + l) {}
-
-    template<class IteratorType,
-             typename std::enable_if<
-                 std::is_same<typename iterator_traits<IteratorType>::iterator_category, std::random_access_iterator_tag>::value,
-                 int>::type = 0>
-    span_input_adapter(IteratorType first, IteratorType last)
-        : ia(input_adapter(first, last)) {}
-
-    contiguous_bytes_input_adapter&& get()
-    {
-        return std::move(ia); // NOLINT(hicpp-move-const-arg,performance-move-const-arg)
-    }
-
-  private:
-    contiguous_bytes_input_adapter ia;
-};
-}  // namespace detail
-}  // namespace nlohmann
-
-// #include <nlohmann/detail/input/json_sax.hpp>
-
-
-#include <cstddef>
-#include <string> // string
-#include <utility> // move
-#include <vector> // vector
-
-// #include <nlohmann/detail/exceptions.hpp>
-
-// #include <nlohmann/detail/macro_scope.hpp>
-
-
-namespace nlohmann
-{
-
-/*!
-@brief SAX interface
-
-This class describes the SAX interface used by @ref nlohmann::json::sax_parse.
-Each function is called in different situations while the input is parsed. The
-boolean return value informs the parser whether to continue processing the
-input.
-*/
-template<typename BasicJsonType>
-struct json_sax
-{
-    using number_integer_t = typename BasicJsonType::number_integer_t;
-    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
-    using number_float_t = typename BasicJsonType::number_float_t;
-    using string_t = typename BasicJsonType::string_t;
-    using binary_t = typename BasicJsonType::binary_t;
-
-    /*!
-    @brief a null value was read
-    @return whether parsing should proceed
-    */
-    virtual bool null() = 0;
-
-    /*!
-    @brief a boolean value was read
-    @param[in] val  boolean value
-    @return whether parsing should proceed
-    */
-    virtual bool boolean(bool val) = 0;
-
-    /*!
-    @brief an integer number was read
-    @param[in] val  integer value
-    @return whether parsing should proceed
-    */
-    virtual bool number_integer(number_integer_t val) = 0;
-
-    /*!
-    @brief an unsigned integer number was read
-    @param[in] val  unsigned integer value
-    @return whether parsing should proceed
-    */
-    virtual bool number_unsigned(number_unsigned_t val) = 0;
-
-    /*!
-    @brief a floating-point number was read
-    @param[in] val  floating-point value
-    @param[in] s    raw token value
-    @return whether parsing should proceed
-    */
-    virtual bool number_float(number_float_t val, const string_t& s) = 0;
-
-    /*!
-    @brief a string value was read
-    @param[in] val  string value
-    @return whether parsing should proceed
-    @note It is safe to move the passed string value.
-    */
-    virtual bool string(string_t& val) = 0;
-
-    /*!
-    @brief a binary value was read
-    @param[in] val  binary value
-    @return whether parsing should proceed
-    @note It is safe to move the passed binary value.
-    */
-    virtual bool binary(binary_t& val) = 0;
-
-    /*!
-    @brief the beginning of an object was read
-    @param[in] elements  number of object elements or -1 if unknown
-    @return whether parsing should proceed
-    @note binary formats may report the number of elements
-    */
-    virtual bool start_object(std::size_t elements) = 0;
-
-    /*!
-    @brief an object key was read
-    @param[in] val  object key
-    @return whether parsing should proceed
-    @note It is safe to move the passed string.
-    */
-    virtual bool key(string_t& val) = 0;
-
-    /*!
-    @brief the end of an object was read
-    @return whether parsing should proceed
-    */
-    virtual bool end_object() = 0;
-
-    /*!
-    @brief the beginning of an array was read
-    @param[in] elements  number of array elements or -1 if unknown
-    @return whether parsing should proceed
-    @note binary formats may report the number of elements
-    */
-    virtual bool start_array(std::size_t elements) = 0;
-
-    /*!
-    @brief the end of an array was read
-    @return whether parsing should proceed
-    */
-    virtual bool end_array() = 0;
-
-    /*!
-    @brief a parse error occurred
-    @param[in] position    the position in the input where the error occurs
-    @param[in] last_token  the last read token
-    @param[in] ex          an exception object describing the error
-    @return whether parsing should proceed (must return false)
-    */
-    virtual bool parse_error(std::size_t position,
-                             const std::string& last_token,
-                             const detail::exception& ex) = 0;
-
-    json_sax() = default;
-    json_sax(const json_sax&) = default;
-    json_sax(json_sax&&) noexcept = default;
-    json_sax& operator=(const json_sax&) = default;
-    json_sax& operator=(json_sax&&) noexcept = default;
-    virtual ~json_sax() = default;
-};
-
-
-namespace detail
-{
-/*!
-@brief SAX implementation to create a JSON value from SAX events
-
-This class implements the @ref json_sax interface and processes the SAX events
-to create a JSON value which makes it basically a DOM parser. The structure or
-hierarchy of the JSON value is managed by the stack `ref_stack` which contains
-a pointer to the respective array or object for each recursion depth.
-
-After successful parsing, the value that is passed by reference to the
-constructor contains the parsed value.
-
-@tparam BasicJsonType  the JSON type
-*/
-template<typename BasicJsonType>
-class json_sax_dom_parser
-{
-  public:
-    using number_integer_t = typename BasicJsonType::number_integer_t;
-    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
-    using number_float_t = typename BasicJsonType::number_float_t;
-    using string_t = typename BasicJsonType::string_t;
-    using binary_t = typename BasicJsonType::binary_t;
-
-    /*!
-    @param[in,out] r  reference to a JSON value that is manipulated while
-                       parsing
-    @param[in] allow_exceptions_  whether parse errors yield exceptions
-    */
-    explicit json_sax_dom_parser(BasicJsonType& r, const bool allow_exceptions_ = true)
-        : root(r), allow_exceptions(allow_exceptions_)
-    {}
-
-    // make class move-only
-    json_sax_dom_parser(const json_sax_dom_parser&) = delete;
-    json_sax_dom_parser(json_sax_dom_parser&&) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor)
-    json_sax_dom_parser& operator=(const json_sax_dom_parser&) = delete;
-    json_sax_dom_parser& operator=(json_sax_dom_parser&&) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor)
-    ~json_sax_dom_parser() = default;
-
-    bool null()
-    {
-        handle_value(nullptr);
-        return true;
-    }
-
-    bool boolean(bool val)
-    {
-        handle_value(val);
-        return true;
-    }
-
-    bool number_integer(number_integer_t val)
-    {
-        handle_value(val);
-        return true;
-    }
-
-    bool number_unsigned(number_unsigned_t val)
-    {
-        handle_value(val);
-        return true;
-    }
-
-    bool number_float(number_float_t val, const string_t& /*unused*/)
-    {
-        handle_value(val);
-        return true;
-    }
-
-    bool string(string_t& val)
-    {
-        handle_value(val);
-        return true;
-    }
-
-    bool binary(binary_t& val)
-    {
-        handle_value(std::move(val));
-        return true;
-    }
-
-    bool start_object(std::size_t len)
-    {
-        ref_stack.push_back(handle_value(BasicJsonType::value_t::object));
-
-        if (JSON_HEDLEY_UNLIKELY(len != static_cast<std::size_t>(-1) && len > ref_stack.back()->max_size()))
-        {
-            JSON_THROW(out_of_range::create(408, "excessive object size: " + std::to_string(len), *ref_stack.back()));
-        }
-
-        return true;
-    }
-
-    bool key(string_t& val)
-    {
-        // add null at given key and store the reference for later
-        object_element = &(ref_stack.back()->m_value.object->operator[](val));
-        return true;
-    }
-
-    bool end_object()
-    {
-        ref_stack.back()->set_parents();
-        ref_stack.pop_back();
-        return true;
-    }
-
-    bool start_array(std::size_t len)
-    {
-        ref_stack.push_back(handle_value(BasicJsonType::value_t::array));
-
-        if (JSON_HEDLEY_UNLIKELY(len != static_cast<std::size_t>(-1) && len > ref_stack.back()->max_size()))
-        {
-            JSON_THROW(out_of_range::create(408, "excessive array size: " + std::to_string(len), *ref_stack.back()));
-        }
-
-        return true;
-    }
-
-    bool end_array()
-    {
-        ref_stack.back()->set_parents();
-        ref_stack.pop_back();
-        return true;
-    }
-
-    template<class Exception>
-    bool parse_error(std::size_t /*unused*/, const std::string& /*unused*/,
-                     const Exception& ex)
-    {
-        errored = true;
-        static_cast<void>(ex);
-        if (allow_exceptions)
-        {
-            JSON_THROW(ex);
-        }
-        return false;
-    }
-
-    constexpr bool is_errored() const
-    {
-        return errored;
-    }
-
-  private:
-    /*!
-    @invariant If the ref stack is empty, then the passed value will be the new
-               root.
-    @invariant If the ref stack contains a value, then it is an array or an
-               object to which we can add elements
-    */
-    template<typename Value>
-    JSON_HEDLEY_RETURNS_NON_NULL
-    BasicJsonType* handle_value(Value&& v)
-    {
-        if (ref_stack.empty())
-        {
-            root = BasicJsonType(std::forward<Value>(v));
-            return &root;
-        }
-
-        JSON_ASSERT(ref_stack.back()->is_array() || ref_stack.back()->is_object());
-
-        if (ref_stack.back()->is_array())
-        {
-            ref_stack.back()->m_value.array->emplace_back(std::forward<Value>(v));
-            return &(ref_stack.back()->m_value.array->back());
-        }
-
-        JSON_ASSERT(ref_stack.back()->is_object());
-        JSON_ASSERT(object_element);
-        *object_element = BasicJsonType(std::forward<Value>(v));
-        return object_element;
-    }
-
-    /// the parsed JSON value
-    BasicJsonType& root;
-    /// stack to model hierarchy of values
-    std::vector<BasicJsonType*> ref_stack {};
-    /// helper to hold the reference for the next object element
-    BasicJsonType* object_element = nullptr;
-    /// whether a syntax error occurred
-    bool errored = false;
-    /// whether to throw exceptions in case of errors
-    const bool allow_exceptions = true;
-};
-
-template<typename BasicJsonType>
-class json_sax_dom_callback_parser
-{
-  public:
-    using number_integer_t = typename BasicJsonType::number_integer_t;
-    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
-    using number_float_t = typename BasicJsonType::number_float_t;
-    using string_t = typename BasicJsonType::string_t;
-    using binary_t = typename BasicJsonType::binary_t;
-    using parser_callback_t = typename BasicJsonType::parser_callback_t;
-    using parse_event_t = typename BasicJsonType::parse_event_t;
-
-    json_sax_dom_callback_parser(BasicJsonType& r,
-                                 const parser_callback_t cb,
-                                 const bool allow_exceptions_ = true)
-        : root(r), callback(cb), allow_exceptions(allow_exceptions_)
-    {
-        keep_stack.push_back(true);
-    }
-
-    // make class move-only
-    json_sax_dom_callback_parser(const json_sax_dom_callback_parser&) = delete;
-    json_sax_dom_callback_parser(json_sax_dom_callback_parser&&) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor)
-    json_sax_dom_callback_parser& operator=(const json_sax_dom_callback_parser&) = delete;
-    json_sax_dom_callback_parser& operator=(json_sax_dom_callback_parser&&) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor)
-    ~json_sax_dom_callback_parser() = default;
-
-    bool null()
-    {
-        handle_value(nullptr);
-        return true;
-    }
-
-    bool boolean(bool val)
-    {
-        handle_value(val);
-        return true;
-    }
-
-    bool number_integer(number_integer_t val)
-    {
-        handle_value(val);
-        return true;
-    }
-
-    bool number_unsigned(number_unsigned_t val)
-    {
-        handle_value(val);
-        return true;
-    }
-
-    bool number_float(number_float_t val, const string_t& /*unused*/)
-    {
-        handle_value(val);
-        return true;
-    }
-
-    bool string(string_t& val)
-    {
-        handle_value(val);
-        return true;
-    }
-
-    bool binary(binary_t& val)
-    {
-        handle_value(std::move(val));
-        return true;
-    }
-
-    bool start_object(std::size_t len)
-    {
-        // check callback for object start
-        const bool keep = callback(static_cast<int>(ref_stack.size()), parse_event_t::object_start, discarded);
-        keep_stack.push_back(keep);
-
-        auto val = handle_value(BasicJsonType::value_t::object, true);
-        ref_stack.push_back(val.second);
-
-        // check object limit
-        if (ref_stack.back() && JSON_HEDLEY_UNLIKELY(len != static_cast<std::size_t>(-1) && len > ref_stack.back()->max_size()))
-        {
-            JSON_THROW(out_of_range::create(408, "excessive object size: " + std::to_string(len), *ref_stack.back()));
-        }
-
-        return true;
-    }
-
-    bool key(string_t& val)
-    {
-        BasicJsonType k = BasicJsonType(val);
-
-        // check callback for key
-        const bool keep = callback(static_cast<int>(ref_stack.size()), parse_event_t::key, k);
-        key_keep_stack.push_back(keep);
-
-        // add discarded value at given key and store the reference for later
-        if (keep && ref_stack.back())
-        {
-            object_element = &(ref_stack.back()->m_value.object->operator[](val) = discarded);
-        }
-
-        return true;
-    }
-
-    bool end_object()
-    {
-        if (ref_stack.back())
-        {
-            if (!callback(static_cast<int>(ref_stack.size()) - 1, parse_event_t::object_end, *ref_stack.back()))
-            {
-                // discard object
-                *ref_stack.back() = discarded;
-            }
-            else
-            {
-                ref_stack.back()->set_parents();
-            }
-        }
-
-        JSON_ASSERT(!ref_stack.empty());
-        JSON_ASSERT(!keep_stack.empty());
-        ref_stack.pop_back();
-        keep_stack.pop_back();
-
-        if (!ref_stack.empty() && ref_stack.back() && ref_stack.back()->is_structured())
-        {
-            // remove discarded value
-            for (auto it = ref_stack.back()->begin(); it != ref_stack.back()->end(); ++it)
-            {
-                if (it->is_discarded())
-                {
-                    ref_stack.back()->erase(it);
-                    break;
-                }
-            }
-        }
-
-        return true;
-    }
-
-    bool start_array(std::size_t len)
-    {
-        const bool keep = callback(static_cast<int>(ref_stack.size()), parse_event_t::array_start, discarded);
-        keep_stack.push_back(keep);
-
-        auto val = handle_value(BasicJsonType::value_t::array, true);
-        ref_stack.push_back(val.second);
-
-        // check array limit
-        if (ref_stack.back() && JSON_HEDLEY_UNLIKELY(len != static_cast<std::size_t>(-1) && len > ref_stack.back()->max_size()))
-        {
-            JSON_THROW(out_of_range::create(408, "excessive array size: " + std::to_string(len), *ref_stack.back()));
-        }
-
-        return true;
-    }
-
-    bool end_array()
-    {
-        bool keep = true;
-
-        if (ref_stack.back())
-        {
-            keep = callback(static_cast<int>(ref_stack.size()) - 1, parse_event_t::array_end, *ref_stack.back());
-            if (keep)
-            {
-                ref_stack.back()->set_parents();
-            }
-            else
-            {
-                // discard array
-                *ref_stack.back() = discarded;
-            }
-        }
-
-        JSON_ASSERT(!ref_stack.empty());
-        JSON_ASSERT(!keep_stack.empty());
-        ref_stack.pop_back();
-        keep_stack.pop_back();
-
-        // remove discarded value
-        if (!keep && !ref_stack.empty() && ref_stack.back()->is_array())
-        {
-            ref_stack.back()->m_value.array->pop_back();
-        }
-
-        return true;
-    }
-
-    template<class Exception>
-    bool parse_error(std::size_t /*unused*/, const std::string& /*unused*/,
-                     const Exception& ex)
-    {
-        errored = true;
-        static_cast<void>(ex);
-        if (allow_exceptions)
-        {
-            JSON_THROW(ex);
-        }
-        return false;
-    }
-
-    constexpr bool is_errored() const
-    {
-        return errored;
-    }
-
-  private:
-    /*!
-    @param[in] v  value to add to the JSON value we build during parsing
-    @param[in] skip_callback  whether we should skip calling the callback
-               function; this is required after start_array() and
-               start_object() SAX events, because otherwise we would call the
-               callback function with an empty array or object, respectively.
-
-    @invariant If the ref stack is empty, then the passed value will be the new
-               root.
-    @invariant If the ref stack contains a value, then it is an array or an
-               object to which we can add elements
-
-    @return pair of boolean (whether value should be kept) and pointer (to the
-            passed value in the ref_stack hierarchy; nullptr if not kept)
-    */
-    template<typename Value>
-    std::pair<bool, BasicJsonType*> handle_value(Value&& v, const bool skip_callback = false)
-    {
-        JSON_ASSERT(!keep_stack.empty());
-
-        // do not handle this value if we know it would be added to a discarded
-        // container
-        if (!keep_stack.back())
-        {
-            return {false, nullptr};
-        }
-
-        // create value
-        auto value = BasicJsonType(std::forward<Value>(v));
-
-        // check callback
-        const bool keep = skip_callback || callback(static_cast<int>(ref_stack.size()), parse_event_t::value, value);
-
-        // do not handle this value if we just learnt it shall be discarded
-        if (!keep)
-        {
-            return {false, nullptr};
-        }
-
-        if (ref_stack.empty())
-        {
-            root = std::move(value);
-            return {true, &root};
-        }
-
-        // skip this value if we already decided to skip the parent
-        // (https://github.com/nlohmann/json/issues/971#issuecomment-413678360)
-        if (!ref_stack.back())
-        {
-            return {false, nullptr};
-        }
-
-        // we now only expect arrays and objects
-        JSON_ASSERT(ref_stack.back()->is_array() || ref_stack.back()->is_object());
-
-        // array
-        if (ref_stack.back()->is_array())
-        {
-            ref_stack.back()->m_value.array->emplace_back(std::move(value));
-            return {true, &(ref_stack.back()->m_value.array->back())};
-        }
-
-        // object
-        JSON_ASSERT(ref_stack.back()->is_object());
-        // check if we should store an element for the current key
-        JSON_ASSERT(!key_keep_stack.empty());
-        const bool store_element = key_keep_stack.back();
-        key_keep_stack.pop_back();
-
-        if (!store_element)
-        {
-            return {false, nullptr};
-        }
-
-        JSON_ASSERT(object_element);
-        *object_element = std::move(value);
-        return {true, object_element};
-    }
-
-    /// the parsed JSON value
-    BasicJsonType& root;
-    /// stack to model hierarchy of values
-    std::vector<BasicJsonType*> ref_stack {};
-    /// stack to manage which values to keep
-    std::vector<bool> keep_stack {};
-    /// stack to manage which object keys to keep
-    std::vector<bool> key_keep_stack {};
-    /// helper to hold the reference for the next object element
-    BasicJsonType* object_element = nullptr;
-    /// whether a syntax error occurred
-    bool errored = false;
-    /// callback function
-    const parser_callback_t callback = nullptr;
-    /// whether to throw exceptions in case of errors
-    const bool allow_exceptions = true;
-    /// a discarded value for the callback
-    BasicJsonType discarded = BasicJsonType::value_t::discarded;
-};
-
-template<typename BasicJsonType>
-class json_sax_acceptor
-{
-  public:
-    using number_integer_t = typename BasicJsonType::number_integer_t;
-    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
-    using number_float_t = typename BasicJsonType::number_float_t;
-    using string_t = typename BasicJsonType::string_t;
-    using binary_t = typename BasicJsonType::binary_t;
-
-    bool null()
-    {
-        return true;
-    }
-
-    bool boolean(bool /*unused*/)
-    {
-        return true;
-    }
-
-    bool number_integer(number_integer_t /*unused*/)
-    {
-        return true;
-    }
-
-    bool number_unsigned(number_unsigned_t /*unused*/)
-    {
-        return true;
-    }
-
-    bool number_float(number_float_t /*unused*/, const string_t& /*unused*/)
-    {
-        return true;
-    }
-
-    bool string(string_t& /*unused*/)
-    {
-        return true;
-    }
-
-    bool binary(binary_t& /*unused*/)
-    {
-        return true;
-    }
-
-    bool start_object(std::size_t /*unused*/ = static_cast<std::size_t>(-1))
-    {
-        return true;
-    }
-
-    bool key(string_t& /*unused*/)
-    {
-        return true;
-    }
-
-    bool end_object()
-    {
-        return true;
-    }
-
-    bool start_array(std::size_t /*unused*/ = static_cast<std::size_t>(-1))
-    {
-        return true;
-    }
-
-    bool end_array()
-    {
-        return true;
-    }
-
-    bool parse_error(std::size_t /*unused*/, const std::string& /*unused*/, const detail::exception& /*unused*/)
-    {
-        return false;
-    }
-};
-}  // namespace detail
-
-}  // namespace nlohmann
-
-// #include <nlohmann/detail/input/lexer.hpp>
-
-
-#include <array> // array
-#include <clocale> // localeconv
-#include <cstddef> // size_t
-#include <cstdio> // snprintf
-#include <cstdlib> // strtof, strtod, strtold, strtoll, strtoull
-#include <initializer_list> // initializer_list
-#include <string> // char_traits, string
-#include <utility> // move
-#include <vector> // vector
-
-// #include <nlohmann/detail/input/input_adapters.hpp>
-
-// #include <nlohmann/detail/input/position_t.hpp>
-
-// #include <nlohmann/detail/macro_scope.hpp>
-
-
-namespace nlohmann
-{
-namespace detail
-{
-///////////
-// lexer //
-///////////
-
-template<typename BasicJsonType>
-class lexer_base
-{
-  public:
-    /// token types for the parser
-    enum class token_type
-    {
-        uninitialized,    ///< indicating the scanner is uninitialized
-        literal_true,     ///< the `true` literal
-        literal_false,    ///< the `false` literal
-        literal_null,     ///< the `null` literal
-        value_string,     ///< a string -- use get_string() for actual value
-        value_unsigned,   ///< an unsigned integer -- use get_number_unsigned() for actual value
-        value_integer,    ///< a signed integer -- use get_number_integer() for actual value
-        value_float,      ///< an floating point number -- use get_number_float() for actual value
-        begin_array,      ///< the character for array begin `[`
-        begin_object,     ///< the character for object begin `{`
-        end_array,        ///< the character for array end `]`
-        end_object,       ///< the character for object end `}`
-        name_separator,   ///< the name separator `:`
-        value_separator,  ///< the value separator `,`
-        parse_error,      ///< indicating a parse error
-        end_of_input,     ///< indicating the end of the input buffer
-        literal_or_value  ///< a literal or the begin of a value (only for diagnostics)
-    };
-
-    /// return name of values of type token_type (only used for errors)
-    JSON_HEDLEY_RETURNS_NON_NULL
-    JSON_HEDLEY_CONST
-    static const char* token_type_name(const token_type t) noexcept
-    {
-        switch (t)
-        {
-            case token_type::uninitialized:
-                return "<uninitialized>";
-            case token_type::literal_true:
-                return "true literal";
-            case token_type::literal_false:
-                return "false literal";
-            case token_type::literal_null:
-                return "null literal";
-            case token_type::value_string:
-                return "string literal";
-            case token_type::value_unsigned:
-            case token_type::value_integer:
-            case token_type::value_float:
-                return "number literal";
-            case token_type::begin_array:
-                return "'['";
-            case token_type::begin_object:
-                return "'{'";
-            case token_type::end_array:
-                return "']'";
-            case token_type::end_object:
-                return "'}'";
-            case token_type::name_separator:
-                return "':'";
-            case token_type::value_separator:
-                return "','";
-            case token_type::parse_error:
-                return "<parse error>";
-            case token_type::end_of_input:
-                return "end of input";
-            case token_type::literal_or_value:
-                return "'[', '{', or a literal";
-            // LCOV_EXCL_START
-            default: // catch non-enum values
-                return "unknown token";
-                // LCOV_EXCL_STOP
-        }
-    }
-};
-/*!
-@brief lexical analysis
-
-This class organizes the lexical analysis during JSON deserialization.
-*/
-template<typename BasicJsonType, typename InputAdapterType>
-class lexer : public lexer_base<BasicJsonType>
-{
-    using number_integer_t = typename BasicJsonType::number_integer_t;
-    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
-    using number_float_t = typename BasicJsonType::number_float_t;
-    using string_t = typename BasicJsonType::string_t;
-    using char_type = typename InputAdapterType::char_type;
-    using char_int_type = typename std::char_traits<char_type>::int_type;
-
-  public:
-    using token_type = typename lexer_base<BasicJsonType>::token_type;
-
-    explicit lexer(InputAdapterType&& adapter, bool ignore_comments_ = false) noexcept
-        : ia(std::move(adapter))
-        , ignore_comments(ignore_comments_)
-        , decimal_point_char(static_cast<char_int_type>(get_decimal_point()))
-    {}
-
-    // delete because of pointer members
-    lexer(const lexer&) = delete;
-    lexer(lexer&&) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor)
-    lexer& operator=(lexer&) = delete;
-    lexer& operator=(lexer&&) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor)
-    ~lexer() = default;
-
-  private:
-    /////////////////////
-    // locales
-    /////////////////////
-
-    /// return the locale-dependent decimal point
-    JSON_HEDLEY_PURE
-    static char get_decimal_point() noexcept
-    {
-        const auto* loc = localeconv();
-        JSON_ASSERT(loc != nullptr);
-        return (loc->decimal_point == nullptr) ? '.' : *(loc->decimal_point);
-    }
-
-    /////////////////////
-    // scan functions
-    /////////////////////
-
-    /*!
-    @brief get codepoint from 4 hex characters following `\u`
-
-    For input "\u c1 c2 c3 c4" the codepoint is:
-      (c1 * 0x1000) + (c2 * 0x0100) + (c3 * 0x0010) + c4
-    = (c1 << 12) + (c2 << 8) + (c3 << 4) + (c4 << 0)
-
-    Furthermore, the possible characters '0'..'9', 'A'..'F', and 'a'..'f'
-    must be converted to the integers 0x0..0x9, 0xA..0xF, 0xA..0xF, resp. The
-    conversion is done by subtracting the offset (0x30, 0x37, and 0x57)
-    between the ASCII value of the character and the desired integer value.
-
-    @return codepoint (0x0000..0xFFFF) or -1 in case of an error (e.g. EOF or
-            non-hex character)
-    */
-    int get_codepoint()
-    {
-        // this function only makes sense after reading `\u`
-        JSON_ASSERT(current == 'u');
-        int codepoint = 0;
-
-        const auto factors = { 12u, 8u, 4u, 0u };
-        for (const auto factor : factors)
-        {
-            get();
-
-            if (current >= '0' && current <= '9')
-            {
-                codepoint += static_cast<int>((static_cast<unsigned int>(current) - 0x30u) << factor);
-            }
-            else if (current >= 'A' && current <= 'F')
-            {
-                codepoint += static_cast<int>((static_cast<unsigned int>(current) - 0x37u) << factor);
-            }
-            else if (current >= 'a' && current <= 'f')
-            {
-                codepoint += static_cast<int>((static_cast<unsigned int>(current) - 0x57u) << factor);
-            }
-            else
-            {
-                return -1;
-            }
-        }
-
-        JSON_ASSERT(0x0000 <= codepoint && codepoint <= 0xFFFF);
-        return codepoint;
-    }
-
-    /*!
-    @brief check if the next byte(s) are inside a given range
-
-    Adds the current byte and, for each passed range, reads a new byte and
-    checks if it is inside the range. If a violation was detected, set up an
-    error message and return false. Otherwise, return true.
-
-    @param[in] ranges  list of integers; interpreted as list of pairs of
-                       inclusive lower and upper bound, respectively
-
-    @pre The passed list @a ranges must have 2, 4, or 6 elements; that is,
-         1, 2, or 3 pairs. This precondition is enforced by an assertion.
-
-    @return true if and only if no range violation was detected
-    */
-    bool next_byte_in_range(std::initializer_list<char_int_type> ranges)
-    {
-        JSON_ASSERT(ranges.size() == 2 || ranges.size() == 4 || ranges.size() == 6);
-        add(current);
-
-        for (auto range = ranges.begin(); range != ranges.end(); ++range)
-        {
-            get();
-            if (JSON_HEDLEY_LIKELY(*range <= current && current <= *(++range)))
-            {
-                add(current);
-            }
-            else
-            {
-                error_message = "invalid string: ill-formed UTF-8 byte";
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    /*!
-    @brief scan a string literal
-
-    This function scans a string according to Sect. 7 of RFC 8259. While
-    scanning, bytes are escaped and copied into buffer token_buffer. Then the
-    function returns successfully, token_buffer is *not* null-terminated (as it
-    may contain \0 bytes), and token_buffer.size() is the number of bytes in the
-    string.
-
-    @return token_type::value_string if string could be successfully scanned,
-            token_type::parse_error otherwise
-
-    @note In case of errors, variable error_message contains a textual
-          description.
-    */
-    token_type scan_string()
-    {
-        // reset token_buffer (ignore opening quote)
-        reset();
-
-        // we entered the function by reading an open quote
-        JSON_ASSERT(current == '\"');
-
-        while (true)
-        {
-            // get next character
-            switch (get())
-            {
-                // end of file while parsing string
-                case std::char_traits<char_type>::eof():
-                {
-                    error_message = "invalid string: missing closing quote";
-                    return token_type::parse_error;
-                }
-
-                // closing quote
-                case '\"':
-                {
-                    return token_type::value_string;
-                }
-
-                // escapes
-                case '\\':
-                {
-                    switch (get())
-                    {
-                        // quotation mark
-                        case '\"':
-                            add('\"');
-                            break;
-                        // reverse solidus
-                        case '\\':
-                            add('\\');
-                            break;
-                        // solidus
-                        case '/':
-                            add('/');
-                            break;
-                        // backspace
-                        case 'b':
-                            add('\b');
-                            break;
-                        // form feed
-                        case 'f':
-                            add('\f');
-                            break;
-                        // line feed
-                        case 'n':
-                            add('\n');
-                            break;
-                        // carriage return
-                        case 'r':
-                            add('\r');
-                            break;
-                        // tab
-                        case 't':
-                            add('\t');
-                            break;
-
-                        // unicode escapes
-                        case 'u':
-                        {
-                            const int codepoint1 = get_codepoint();
-                            int codepoint = codepoint1; // start with codepoint1
-
-                            if (JSON_HEDLEY_UNLIKELY(codepoint1 == -1))
-                            {
-                                error_message = "invalid string: '\\u' must be followed by 4 hex digits";
-                                return token_type::parse_error;
-                            }
-
-                            // check if code point is a high surrogate
-                            if (0xD800 <= codepoint1 && codepoint1 <= 0xDBFF)
-                            {
-                                // expect next \uxxxx entry
-                                if (JSON_HEDLEY_LIKELY(get() == '\\' && get() == 'u'))
-                                {
-                                    const int codepoint2 = get_codepoint();
-
-                                    if (JSON_HEDLEY_UNLIKELY(codepoint2 == -1))
-                                    {
-                                        error_message = "invalid string: '\\u' must be followed by 4 hex digits";
-                                        return token_type::parse_error;
-                                    }
-
-                                    // check if codepoint2 is a low surrogate
-                                    if (JSON_HEDLEY_LIKELY(0xDC00 <= codepoint2 && codepoint2 <= 0xDFFF))
-                                    {
-                                        // overwrite codepoint
-                                        codepoint = static_cast<int>(
-                                                        // high surrogate occupies the most significant 22 bits
-                                                        (static_cast<unsigned int>(codepoint1) << 10u)
-                                                        // low surrogate occupies the least significant 15 bits
-                                                        + static_cast<unsigned int>(codepoint2)
-                                                        // there is still the 0xD800, 0xDC00 and 0x10000 noise
-                                                        // in the result, so we have to subtract with:
-                                                        // (0xD800 << 10) + DC00 - 0x10000 = 0x35FDC00
-                                                        - 0x35FDC00u);
-                                    }
-                                    else
-                                    {
-                                        error_message = "invalid string: surrogate U+D800..U+DBFF must be followed by U+DC00..U+DFFF";
-                                        return token_type::parse_error;
-                                    }
-                                }
-                                else
-                                {
-                                    error_message = "invalid string: surrogate U+D800..U+DBFF must be followed by U+DC00..U+DFFF";
-                                    return token_type::parse_error;
-                                }
-                            }
-                            else
-                            {
-                                if (JSON_HEDLEY_UNLIKELY(0xDC00 <= codepoint1 && codepoint1 <= 0xDFFF))
-                                {
-                                    error_message = "invalid string: surrogate U+DC00..U+DFFF must follow U+D800..U+DBFF";
-                                    return token_type::parse_error;
-                                }
-                            }
-
-                            // result of the above calculation yields a proper codepoint
-                            JSON_ASSERT(0x00 <= codepoint && codepoint <= 0x10FFFF);
-
-                            // translate codepoint into bytes
-                            if (codepoint < 0x80)
-                            {
-                                // 1-byte characters: 0xxxxxxx (ASCII)
-                                add(static_cast<char_int_type>(codepoint));
-                            }
-                            else if (codepoint <= 0x7FF)
-                            {
-                                // 2-byte characters: 110xxxxx 10xxxxxx
-                                add(static_cast<char_int_type>(0xC0u | (static_cast<unsigned int>(codepoint) >> 6u)));
-                                add(static_cast<char_int_type>(0x80u | (static_cast<unsigned int>(codepoint) & 0x3Fu)));
-                            }
-                            else if (codepoint <= 0xFFFF)
-                            {
-                                // 3-byte characters: 1110xxxx 10xxxxxx 10xxxxxx
-                                add(static_cast<char_int_type>(0xE0u | (static_cast<unsigned int>(codepoint) >> 12u)));
-                                add(static_cast<char_int_type>(0x80u | ((static_cast<unsigned int>(codepoint) >> 6u) & 0x3Fu)));
-                                add(static_cast<char_int_type>(0x80u | (static_cast<unsigned int>(codepoint) & 0x3Fu)));
-                            }
-                            else
-                            {
-                                // 4-byte characters: 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
-                                add(static_cast<char_int_type>(0xF0u | (static_cast<unsigned int>(codepoint) >> 18u)));
-                                add(static_cast<char_int_type>(0x80u | ((static_cast<unsigned int>(codepoint) >> 12u) & 0x3Fu)));
-                                add(static_cast<char_int_type>(0x80u | ((static_cast<unsigned int>(codepoint) >> 6u) & 0x3Fu)));
-                                add(static_cast<char_int_type>(0x80u | (static_cast<unsigned int>(codepoint) & 0x3Fu)));
-                            }
-
-                            break;
-                        }
-
-                        // other characters after escape
-                        default:
-                            error_message = "invalid string: forbidden character after backslash";
-                            return token_type::parse_error;
-                    }
-
-                    break;
-                }
-
-                // invalid control characters
-                case 0x00:
-                {
-                    error_message = "invalid string: control character U+0000 (NUL) must be escaped to \\u0000";
-                    return token_type::parse_error;
-                }
-
-                case 0x01:
-                {
-                    error_message = "invalid string: control character U+0001 (SOH) must be escaped to \\u0001";
-                    return token_type::parse_error;
-                }
-
-                case 0x02:
-                {
-                    error_message = "invalid string: control character U+0002 (STX) must be escaped to \\u0002";
-                    return token_type::parse_error;
-                }
-
-                case 0x03:
-                {
-                    error_message = "invalid string: control character U+0003 (ETX) must be escaped to \\u0003";
-                    return token_type::parse_error;
-                }
-
-                case 0x04:
-                {
-                    error_message = "invalid string: control character U+0004 (EOT) must be escaped to \\u0004";
-                    return token_type::parse_error;
-                }
-
-                case 0x05:
-                {
-                    error_message = "invalid string: control character U+0005 (ENQ) must be escaped to \\u0005";
-                    return token_type::parse_error;
-                }
-
-                case 0x06:
-                {
-                    error_message = "invalid string: control character U+0006 (ACK) must be escaped to \\u0006";
-                    return token_type::parse_error;
-                }
-
-                case 0x07:
-                {
-                    error_message = "invalid string: control character U+0007 (BEL) must be escaped to \\u0007";
-                    return token_type::parse_error;
-                }
-
-                case 0x08:
-                {
-                    error_message = "invalid string: control character U+0008 (BS) must be escaped to \\u0008 or \\b";
-                    return token_type::parse_error;
-                }
-
-                case 0x09:
-                {
-                    error_message = "invalid string: control character U+0009 (HT) must be escaped to \\u0009 or \\t";
-                    return token_type::parse_error;
-                }
-
-                case 0x0A:
-                {
-                    error_message = "invalid string: control character U+000A (LF) must be escaped to \\u000A or \\n";
-                    return token_type::parse_error;
-                }
-
-                case 0x0B:
-                {
-                    error_message = "invalid string: control character U+000B (VT) must be escaped to \\u000B";
-                    return token_type::parse_error;
-                }
-
-                case 0x0C:
-                {
-                    error_message = "invalid string: control character U+000C (FF) must be escaped to \\u000C or \\f";
-                    return token_type::parse_error;
-                }
-
-                case 0x0D:
-                {
-                    error_message = "invalid string: control character U+000D (CR) must be escaped to \\u000D or \\r";
-                    return token_type::parse_error;
-                }
-
-                case 0x0E:
-                {
-                    error_message = "invalid string: control character U+000E (SO) must be escaped to \\u000E";
-                    return token_type::parse_error;
-                }
-
-                case 0x0F:
-                {
-                    error_message = "invalid string: control character U+000F (SI) must be escaped to \\u000F";
-                    return token_type::parse_error;
-                }
-
-                case 0x10:
-                {
-                    error_message = "invalid string: control character U+0010 (DLE) must be escaped to \\u0010";
-                    return token_type::parse_error;
-                }
-
-                case 0x11:
-                {
-                    error_message = "invalid string: control character U+0011 (DC1) must be escaped to \\u0011";
-                    return token_type::parse_error;
-                }
-
-                case 0x12:
-                {
-                    error_message = "invalid string: control character U+0012 (DC2) must be escaped to \\u0012";
-                    return token_type::parse_error;
-                }
-
-                case 0x13:
-                {
-                    error_message = "invalid string: control character U+0013 (DC3) must be escaped to \\u0013";
-                    return token_type::parse_error;
-                }
-
-                case 0x14:
-                {
-                    error_message = "invalid string: control character U+0014 (DC4) must be escaped to \\u0014";
-                    return token_type::parse_error;
-                }
-
-                case 0x15:
-                {
-                    error_message = "invalid string: control character U+0015 (NAK) must be escaped to \\u0015";
-                    return token_type::parse_error;
-                }
-
-                case 0x16:
-                {
-                    error_message = "invalid string: control character U+0016 (SYN) must be escaped to \\u0016";
-                    return token_type::parse_error;
-                }
-
-                case 0x17:
-                {
-                    error_message = "invalid string: control character U+0017 (ETB) must be escaped to \\u0017";
-                    return token_type::parse_error;
-                }
-
-                case 0x18:
-                {
-                    error_message = "invalid string: control character U+0018 (CAN) must be escaped to \\u0018";
-                    return token_type::parse_error;
-                }
-
-                case 0x19:
-                {
-                    error_message = "invalid string: control character U+0019 (EM) must be escaped to \\u0019";
-                    return token_type::parse_error;
-                }
-
-                case 0x1A:
-                {
-                    error_message = "invalid string: control character U+001A (SUB) must be escaped to \\u001A";
-                    return token_type::parse_error;
-                }
-
-                case 0x1B:
-                {
-                    error_message = "invalid string: control character U+001B (ESC) must be escaped to \\u001B";
-                    return token_type::parse_error;
-                }
-
-                case 0x1C:
-                {
-                    error_message = "invalid string: control character U+001C (FS) must be escaped to \\u001C";
-                    return token_type::parse_error;
-                }
-
-                case 0x1D:
-                {
-                    error_message = "invalid string: control character U+001D (GS) must be escaped to \\u001D";
-                    return token_type::parse_error;
-                }
-
-                case 0x1E:
-                {
-                    error_message = "invalid string: control character U+001E (RS) must be escaped to \\u001E";
-                    return token_type::parse_error;
-                }
-
-                case 0x1F:
-                {
-                    error_message = "invalid string: control character U+001F (US) must be escaped to \\u001F";
-                    return token_type::parse_error;
-                }
-
-                // U+0020..U+007F (except U+0022 (quote) and U+005C (backspace))
-                case 0x20:
-                case 0x21:
-                case 0x23:
-                case 0x24:
-                case 0x25:
-                case 0x26:
-                case 0x27:
-                case 0x28:
-                case 0x29:
-                case 0x2A:
-                case 0x2B:
-                case 0x2C:
-                case 0x2D:
-                case 0x2E:
-                case 0x2F:
-                case 0x30:
-                case 0x31:
-                case 0x32:
-                case 0x33:
-                case 0x34:
-                case 0x35:
-                case 0x36:
-                case 0x37:
-                case 0x38:
-                case 0x39:
-                case 0x3A:
-                case 0x3B:
-                case 0x3C:
-                case 0x3D:
-                case 0x3E:
-                case 0x3F:
-                case 0x40:
-                case 0x41:
-                case 0x42:
-                case 0x43:
-                case 0x44:
-                case 0x45:
-                case 0x46:
-                case 0x47:
-                case 0x48:
-                case 0x49:
-                case 0x4A:
-                case 0x4B:
-                case 0x4C:
-                case 0x4D:
-                case 0x4E:
-                case 0x4F:
-                case 0x50:
-                case 0x51:
-                case 0x52:
-                case 0x53:
-                case 0x54:
-                case 0x55:
-                case 0x56:
-                case 0x57:
-                case 0x58:
-                case 0x59:
-                case 0x5A:
-                case 0x5B:
-                case 0x5D:
-                case 0x5E:
-                case 0x5F:
-                case 0x60:
-                case 0x61:
-                case 0x62:
-                case 0x63:
-                case 0x64:
-                case 0x65:
-                case 0x66:
-                case 0x67:
-                case 0x68:
-                case 0x69:
-                case 0x6A:
-                case 0x6B:
-                case 0x6C:
-                case 0x6D:
-                case 0x6E:
-                case 0x6F:
-                case 0x70:
-                case 0x71:
-                case 0x72:
-                case 0x73:
-                case 0x74:
-                case 0x75:
-                case 0x76:
-                case 0x77:
-                case 0x78:
-                case 0x79:
-                case 0x7A:
-                case 0x7B:
-                case 0x7C:
-                case 0x7D:
-                case 0x7E:
-                case 0x7F:
-                {
-                    add(current);
-                    break;
-                }
-
-                // U+0080..U+07FF: bytes C2..DF 80..BF
-                case 0xC2:
-                case 0xC3:
-                case 0xC4:
-                case 0xC5:
-                case 0xC6:
-                case 0xC7:
-                case 0xC8:
-                case 0xC9:
-                case 0xCA:
-                case 0xCB:
-                case 0xCC:
-                case 0xCD:
-                case 0xCE:
-                case 0xCF:
-                case 0xD0:
-                case 0xD1:
-                case 0xD2:
-                case 0xD3:
-                case 0xD4:
-                case 0xD5:
-                case 0xD6:
-                case 0xD7:
-                case 0xD8:
-                case 0xD9:
-                case 0xDA:
-                case 0xDB:
-                case 0xDC:
-                case 0xDD:
-                case 0xDE:
-                case 0xDF:
-                {
-                    if (JSON_HEDLEY_UNLIKELY(!next_byte_in_range({0x80, 0xBF})))
-                    {
-                        return token_type::parse_error;
-                    }
-                    break;
-                }
-
-                // U+0800..U+0FFF: bytes E0 A0..BF 80..BF
-                case 0xE0:
-                {
-                    if (JSON_HEDLEY_UNLIKELY(!(next_byte_in_range({0xA0, 0xBF, 0x80, 0xBF}))))
-                    {
-                        return token_type::parse_error;
-                    }
-                    break;
-                }
-
-                // U+1000..U+CFFF: bytes E1..EC 80..BF 80..BF
-                // U+E000..U+FFFF: bytes EE..EF 80..BF 80..BF
-                case 0xE1:
-                case 0xE2:
-                case 0xE3:
-                case 0xE4:
-                case 0xE5:
-                case 0xE6:
-                case 0xE7:
-                case 0xE8:
-                case 0xE9:
-                case 0xEA:
-                case 0xEB:
-                case 0xEC:
-                case 0xEE:
-                case 0xEF:
-                {
-                    if (JSON_HEDLEY_UNLIKELY(!(next_byte_in_range({0x80, 0xBF, 0x80, 0xBF}))))
-                    {
-                        return token_type::parse_error;
-                    }
-                    break;
-                }
-
-                // U+D000..U+D7FF: bytes ED 80..9F 80..BF
-                case 0xED:
-                {
-                    if (JSON_HEDLEY_UNLIKELY(!(next_byte_in_range({0x80, 0x9F, 0x80, 0xBF}))))
-                    {
-                        return token_type::parse_error;
-                    }
-                    break;
-                }
-
-                // U+10000..U+3FFFF F0 90..BF 80..BF 80..BF
-                case 0xF0:
-                {
-                    if (JSON_HEDLEY_UNLIKELY(!(next_byte_in_range({0x90, 0xBF, 0x80, 0xBF, 0x80, 0xBF}))))
-                    {
-                        return token_type::parse_error;
-                    }
-                    break;
-                }
-
-                // U+40000..U+FFFFF F1..F3 80..BF 80..BF 80..BF
-                case 0xF1:
-                case 0xF2:
-                case 0xF3:
-                {
-                    if (JSON_HEDLEY_UNLIKELY(!(next_byte_in_range({0x80, 0xBF, 0x80, 0xBF, 0x80, 0xBF}))))
-                    {
-                        return token_type::parse_error;
-                    }
-                    break;
-                }
-
-                // U+100000..U+10FFFF F4 80..8F 80..BF 80..BF
-                case 0xF4:
-                {
-                    if (JSON_HEDLEY_UNLIKELY(!(next_byte_in_range({0x80, 0x8F, 0x80, 0xBF, 0x80, 0xBF}))))
-                    {
-                        return token_type::parse_error;
-                    }
-                    break;
-                }
-
-                // remaining bytes (80..C1 and F5..FF) are ill-formed
-                default:
-                {
-                    error_message = "invalid string: ill-formed UTF-8 byte";
-                    return token_type::parse_error;
-                }
-            }
-        }
-    }
-
-    /*!
-     * @brief scan a comment
-     * @return whether comment could be scanned successfully
-     */
-    bool scan_comment()
-    {
-        switch (get())
-        {
-            // single-line comments skip input until a newline or EOF is read
-            case '/':
-            {
-                while (true)
-                {
-                    switch (get())
-                    {
-                        case '\n':
-                        case '\r':
-                        case std::char_traits<char_type>::eof():
-                        case '\0':
-                            return true;
-
-                        default:
-                            break;
-                    }
-                }
-            }
-
-            // multi-line comments skip input until */ is read
-            case '*':
-            {
-                while (true)
-                {
-                    switch (get())
-                    {
-                        case std::char_traits<char_type>::eof():
-                        case '\0':
-                        {
-                            error_message = "invalid comment; missing closing '*/'";
-                            return false;
-                        }
-
-                        case '*':
-                        {
-                            switch (get())
-                            {
-                                case '/':
-                                    return true;
-
-                                default:
-                                {
-                                    unget();
-                                    continue;
-                                }
-                            }
-                        }
-
-                        default:
-                            continue;
-                    }
-                }
-            }
-
-            // unexpected character after reading '/'
-            default:
-            {
-                error_message = "invalid comment; expecting '/' or '*' after '/'";
-                return false;
-            }
-        }
-    }
-
-    JSON_HEDLEY_NON_NULL(2)
-    static void strtof(float& f, const char* str, char** endptr) noexcept
-    {
-        f = std::strtof(str, endptr);
-    }
-
-    JSON_HEDLEY_NON_NULL(2)
-    static void strtof(double& f, const char* str, char** endptr) noexcept
-    {
-        f = std::strtod(str, endptr);
-    }
-
-    JSON_HEDLEY_NON_NULL(2)
-    static void strtof(long double& f, const char* str, char** endptr) noexcept
-    {
-        f = std::strtold(str, endptr);
-    }
-
-    /*!
-    @brief scan a number literal
-
-    This function scans a string according to Sect. 6 of RFC 8259.
-
-    The function is realized with a deterministic finite state machine derived
-    from the grammar described in RFC 8259. Starting in state "init", the
-    input is read and used to determined the next state. Only state "done"
-    accepts the number. State "error" is a trap state to model errors. In the
-    table below, "anything" means any character but the ones listed before.
-
-    state    | 0        | 1-9      | e E      | +       | -       | .        | anything
-    ---------|----------|----------|----------|---------|---------|----------|-----------
-    init     | zero     | any1     | [error]  | [error] | minus   | [error]  | [error]
-    minus    | zero     | any1     | [error]  | [error] | [error] | [error]  | [error]
-    zero     | done     | done     | exponent | done    | done    | decimal1 | done
-    any1     | any1     | any1     | exponent | done    | done    | decimal1 | done
-    decimal1 | decimal2 | decimal2 | [error]  | [error] | [error] | [error]  | [error]
-    decimal2 | decimal2 | decimal2 | exponent | done    | done    | done     | done
-    exponent | any2     | any2     | [error]  | sign    | sign    | [error]  | [error]
-    sign     | any2     | any2     | [error]  | [error] | [error] | [error]  | [error]
-    any2     | any2     | any2     | done     | done    | done    | done     | done
-
-    The state machine is realized with one label per state (prefixed with
-    "scan_number_") and `goto` statements between them. The state machine
-    contains cycles, but any cycle can be left when EOF is read. Therefore,
-    the function is guaranteed to terminate.
-
-    During scanning, the read bytes are stored in token_buffer. This string is
-    then converted to a signed integer, an unsigned integer, or a
-    floating-point number.
-
-    @return token_type::value_unsigned, token_type::value_integer, or
-            token_type::value_float if number could be successfully scanned,
-            token_type::parse_error otherwise
-
-    @note The scanner is independent of the current locale. Internally, the
-          locale's decimal point is used instead of `.` to work with the
-          locale-dependent converters.
-    */
-    token_type scan_number()  // lgtm [cpp/use-of-goto]
-    {
-        // reset token_buffer to store the number's bytes
-        reset();
-
-        // the type of the parsed number; initially set to unsigned; will be
-        // changed if minus sign, decimal point or exponent is read
-        token_type number_type = token_type::value_unsigned;
-
-        // state (init): we just found out we need to scan a number
-        switch (current)
-        {
-            case '-':
-            {
-                add(current);
-                goto scan_number_minus;
-            }
-
-            case '0':
-            {
-                add(current);
-                goto scan_number_zero;
-            }
-
-            case '1':
-            case '2':
-            case '3':
-            case '4':
-            case '5':
-            case '6':
-            case '7':
-            case '8':
-            case '9':
-            {
-                add(current);
-                goto scan_number_any1;
-            }
-
-            // all other characters are rejected outside scan_number()
-            default:            // LCOV_EXCL_LINE
-                JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
-        }
-
-scan_number_minus:
-        // state: we just parsed a leading minus sign
-        number_type = token_type::value_integer;
-        switch (get())
-        {
-            case '0':
-            {
-                add(current);
-                goto scan_number_zero;
-            }
-
-            case '1':
-            case '2':
-            case '3':
-            case '4':
-            case '5':
-            case '6':
-            case '7':
-            case '8':
-            case '9':
-            {
-                add(current);
-                goto scan_number_any1;
-            }
-
-            default:
-            {
-                error_message = "invalid number; expected digit after '-'";
-                return token_type::parse_error;
-            }
-        }
-
-scan_number_zero:
-        // state: we just parse a zero (maybe with a leading minus sign)
-        switch (get())
-        {
-            case '.':
-            {
-                add(decimal_point_char);
-                goto scan_number_decimal1;
-            }
-
-            case 'e':
-            case 'E':
-            {
-                add(current);
-                goto scan_number_exponent;
-            }
-
-            default:
-                goto scan_number_done;
-        }
-
-scan_number_any1:
-        // state: we just parsed a number 0-9 (maybe with a leading minus sign)
-        switch (get())
-        {
-            case '0':
-            case '1':
-            case '2':
-            case '3':
-            case '4':
-            case '5':
-            case '6':
-            case '7':
-            case '8':
-            case '9':
-            {
-                add(current);
-                goto scan_number_any1;
-            }
-
-            case '.':
-            {
-                add(decimal_point_char);
-                goto scan_number_decimal1;
-            }
-
-            case 'e':
-            case 'E':
-            {
-                add(current);
-                goto scan_number_exponent;
-            }
-
-            default:
-                goto scan_number_done;
-        }
-
-scan_number_decimal1:
-        // state: we just parsed a decimal point
-        number_type = token_type::value_float;
-        switch (get())
-        {
-            case '0':
-            case '1':
-            case '2':
-            case '3':
-            case '4':
-            case '5':
-            case '6':
-            case '7':
-            case '8':
-            case '9':
-            {
-                add(current);
-                goto scan_number_decimal2;
-            }
-
-            default:
-            {
-                error_message = "invalid number; expected digit after '.'";
-                return token_type::parse_error;
-            }
-        }
-
-scan_number_decimal2:
-        // we just parsed at least one number after a decimal point
-        switch (get())
-        {
-            case '0':
-            case '1':
-            case '2':
-            case '3':
-            case '4':
-            case '5':
-            case '6':
-            case '7':
-            case '8':
-            case '9':
-            {
-                add(current);
-                goto scan_number_decimal2;
-            }
-
-            case 'e':
-            case 'E':
-            {
-                add(current);
-                goto scan_number_exponent;
-            }
-
-            default:
-                goto scan_number_done;
-        }
-
-scan_number_exponent:
-        // we just parsed an exponent
-        number_type = token_type::value_float;
-        switch (get())
-        {
-            case '+':
-            case '-':
-            {
-                add(current);
-                goto scan_number_sign;
-            }
-
-            case '0':
-            case '1':
-            case '2':
-            case '3':
-            case '4':
-            case '5':
-            case '6':
-            case '7':
-            case '8':
-            case '9':
-            {
-                add(current);
-                goto scan_number_any2;
-            }
-
-            default:
-            {
-                error_message =
-                    "invalid number; expected '+', '-', or digit after exponent";
-                return token_type::parse_error;
-            }
-        }
-
-scan_number_sign:
-        // we just parsed an exponent sign
-        switch (get())
-        {
-            case '0':
-            case '1':
-            case '2':
-            case '3':
-            case '4':
-            case '5':
-            case '6':
-            case '7':
-            case '8':
-            case '9':
-            {
-                add(current);
-                goto scan_number_any2;
-            }
-
-            default:
-            {
-                error_message = "invalid number; expected digit after exponent sign";
-                return token_type::parse_error;
-            }
-        }
-
-scan_number_any2:
-        // we just parsed a number after the exponent or exponent sign
-        switch (get())
-        {
-            case '0':
-            case '1':
-            case '2':
-            case '3':
-            case '4':
-            case '5':
-            case '6':
-            case '7':
-            case '8':
-            case '9':
-            {
-                add(current);
-                goto scan_number_any2;
-            }
-
-            default:
-                goto scan_number_done;
-        }
-
-scan_number_done:
-        // unget the character after the number (we only read it to know that
-        // we are done scanning a number)
-        unget();
-
-        char* endptr = nullptr; // NOLINT(cppcoreguidelines-pro-type-vararg,hicpp-vararg)
-        errno = 0;
-
-        // try to parse integers first and fall back to floats
-        if (number_type == token_type::value_unsigned)
-        {
-            const auto x = std::strtoull(token_buffer.data(), &endptr, 10);
-
-            // we checked the number format before
-            JSON_ASSERT(endptr == token_buffer.data() + token_buffer.size());
-
-            if (errno == 0)
-            {
-                value_unsigned = static_cast<number_unsigned_t>(x);
-                if (value_unsigned == x)
-                {
-                    return token_type::value_unsigned;
-                }
-            }
-        }
-        else if (number_type == token_type::value_integer)
-        {
-            const auto x = std::strtoll(token_buffer.data(), &endptr, 10);
-
-            // we checked the number format before
-            JSON_ASSERT(endptr == token_buffer.data() + token_buffer.size());
-
-            if (errno == 0)
-            {
-                value_integer = static_cast<number_integer_t>(x);
-                if (value_integer == x)
-                {
-                    return token_type::value_integer;
-                }
-            }
-        }
-
-        // this code is reached if we parse a floating-point number or if an
-        // integer conversion above failed
-        strtof(value_float, token_buffer.data(), &endptr);
-
-        // we checked the number format before
-        JSON_ASSERT(endptr == token_buffer.data() + token_buffer.size());
-
-        return token_type::value_float;
-    }
-
-    /*!
-    @param[in] literal_text  the literal text to expect
-    @param[in] length        the length of the passed literal text
-    @param[in] return_type   the token type to return on success
-    */
-    JSON_HEDLEY_NON_NULL(2)
-    token_type scan_literal(const char_type* literal_text, const std::size_t length,
-                            token_type return_type)
-    {
-        JSON_ASSERT(std::char_traits<char_type>::to_char_type(current) == literal_text[0]);
-        for (std::size_t i = 1; i < length; ++i)
-        {
-            if (JSON_HEDLEY_UNLIKELY(std::char_traits<char_type>::to_char_type(get()) != literal_text[i]))
-            {
-                error_message = "invalid literal";
-                return token_type::parse_error;
-            }
-        }
-        return return_type;
-    }
-
-    /////////////////////
-    // input management
-    /////////////////////
-
-    /// reset token_buffer; current character is beginning of token
-    void reset() noexcept
-    {
-        token_buffer.clear();
-        token_string.clear();
-        token_string.push_back(std::char_traits<char_type>::to_char_type(current));
-    }
-
-    /*
-    @brief get next character from the input
-
-    This function provides the interface to the used input adapter. It does
-    not throw in case the input reached EOF, but returns a
-    `std::char_traits<char>::eof()` in that case.  Stores the scanned characters
-    for use in error messages.
-
-    @return character read from the input
-    */
-    char_int_type get()
-    {
-        ++position.chars_read_total;
-        ++position.chars_read_current_line;
-
-        if (next_unget)
-        {
-            // just reset the next_unget variable and work with current
-            next_unget = false;
-        }
-        else
-        {
-            current = ia.get_character();
-        }
-
-        if (JSON_HEDLEY_LIKELY(current != std::char_traits<char_type>::eof()))
-        {
-            token_string.push_back(std::char_traits<char_type>::to_char_type(current));
-        }
-
-        if (current == '\n')
-        {
-            ++position.lines_read;
-            position.chars_read_current_line = 0;
-        }
-
-        return current;
-    }
-
-    /*!
-    @brief unget current character (read it again on next get)
-
-    We implement unget by setting variable next_unget to true. The input is not
-    changed - we just simulate ungetting by modifying chars_read_total,
-    chars_read_current_line, and token_string. The next call to get() will
-    behave as if the unget character is read again.
-    */
-    void unget()
-    {
-        next_unget = true;
-
-        --position.chars_read_total;
-
-        // in case we "unget" a newline, we have to also decrement the lines_read
-        if (position.chars_read_current_line == 0)
-        {
-            if (position.lines_read > 0)
-            {
-                --position.lines_read;
-            }
-        }
-        else
-        {
-            --position.chars_read_current_line;
-        }
-
-        if (JSON_HEDLEY_LIKELY(current != std::char_traits<char_type>::eof()))
-        {
-            JSON_ASSERT(!token_string.empty());
-            token_string.pop_back();
-        }
-    }
-
-    /// add a character to token_buffer
-    void add(char_int_type c)
-    {
-        token_buffer.push_back(static_cast<typename string_t::value_type>(c));
-    }
-
-  public:
-    /////////////////////
-    // value getters
-    /////////////////////
-
-    /// return integer value
-    constexpr number_integer_t get_number_integer() const noexcept
-    {
-        return value_integer;
-    }
-
-    /// return unsigned integer value
-    constexpr number_unsigned_t get_number_unsigned() const noexcept
-    {
-        return value_unsigned;
-    }
-
-    /// return floating-point value
-    constexpr number_float_t get_number_float() const noexcept
-    {
-        return value_float;
-    }
-
-    /// return current string value (implicitly resets the token; useful only once)
-    string_t& get_string()
-    {
-        return token_buffer;
-    }
-
-    /////////////////////
-    // diagnostics
-    /////////////////////
-
-    /// return position of last read token
-    constexpr position_t get_position() const noexcept
-    {
-        return position;
-    }
-
-    /// return the last read token (for errors only).  Will never contain EOF
-    /// (an arbitrary value that is not a valid char value, often -1), because
-    /// 255 may legitimately occur.  May contain NUL, which should be escaped.
-    std::string get_token_string() const
-    {
-        // escape control characters
-        std::string result;
-        for (const auto c : token_string)
-        {
-            if (static_cast<unsigned char>(c) <= '\x1F')
-            {
-                // escape control characters
-                std::array<char, 9> cs{{}};
-                static_cast<void>((std::snprintf)(cs.data(), cs.size(), "<U+%.4X>", static_cast<unsigned char>(c))); // NOLINT(cppcoreguidelines-pro-type-vararg,hicpp-vararg)
-                result += cs.data();
-            }
-            else
-            {
-                // add character as is
-                result.push_back(static_cast<std::string::value_type>(c));
-            }
-        }
-
-        return result;
-    }
-
-    /// return syntax error message
-    JSON_HEDLEY_RETURNS_NON_NULL
-    constexpr const char* get_error_message() const noexcept
-    {
-        return error_message;
-    }
-
-    /////////////////////
-    // actual scanner
-    /////////////////////
-
-    /*!
-    @brief skip the UTF-8 byte order mark
-    @return true iff there is no BOM or the correct BOM has been skipped
-    */
-    bool skip_bom()
-    {
-        if (get() == 0xEF)
-        {
-            // check if we completely parse the BOM
-            return get() == 0xBB && get() == 0xBF;
-        }
-
-        // the first character is not the beginning of the BOM; unget it to
-        // process is later
-        unget();
-        return true;
-    }
-
-    void skip_whitespace()
-    {
-        do
-        {
-            get();
-        }
-        while (current == ' ' || current == '\t' || current == '\n' || current == '\r');
-    }
-
-    token_type scan()
-    {
-        // initially, skip the BOM
-        if (position.chars_read_total == 0 && !skip_bom())
-        {
-            error_message = "invalid BOM; must be 0xEF 0xBB 0xBF if given";
-            return token_type::parse_error;
-        }
-
-        // read next character and ignore whitespace
-        skip_whitespace();
-
-        // ignore comments
-        while (ignore_comments && current == '/')
-        {
-            if (!scan_comment())
-            {
-                return token_type::parse_error;
-            }
-
-            // skip following whitespace
-            skip_whitespace();
-        }
-
-        switch (current)
-        {
-            // structural characters
-            case '[':
-                return token_type::begin_array;
-            case ']':
-                return token_type::end_array;
-            case '{':
-                return token_type::begin_object;
-            case '}':
-                return token_type::end_object;
-            case ':':
-                return token_type::name_separator;
-            case ',':
-                return token_type::value_separator;
-
-            // literals
-            case 't':
-            {
-                std::array<char_type, 4> true_literal = {{static_cast<char_type>('t'), static_cast<char_type>('r'), static_cast<char_type>('u'), static_cast<char_type>('e')}};
-                return scan_literal(true_literal.data(), true_literal.size(), token_type::literal_true);
-            }
-            case 'f':
-            {
-                std::array<char_type, 5> false_literal = {{static_cast<char_type>('f'), static_cast<char_type>('a'), static_cast<char_type>('l'), static_cast<char_type>('s'), static_cast<char_type>('e')}};
-                return scan_literal(false_literal.data(), false_literal.size(), token_type::literal_false);
-            }
-            case 'n':
-            {
-                std::array<char_type, 4> null_literal = {{static_cast<char_type>('n'), static_cast<char_type>('u'), static_cast<char_type>('l'), static_cast<char_type>('l')}};
-                return scan_literal(null_literal.data(), null_literal.size(), token_type::literal_null);
-            }
-
-            // string
-            case '\"':
-                return scan_string();
-
-            // number
-            case '-':
-            case '0':
-            case '1':
-            case '2':
-            case '3':
-            case '4':
-            case '5':
-            case '6':
-            case '7':
-            case '8':
-            case '9':
-                return scan_number();
-
-            // end of input (the null byte is needed when parsing from
-            // string literals)
-            case '\0':
-            case std::char_traits<char_type>::eof():
-                return token_type::end_of_input;
-
-            // error
-            default:
-                error_message = "invalid literal";
-                return token_type::parse_error;
-        }
-    }
-
-  private:
-    /// input adapter
-    InputAdapterType ia;
-
-    /// whether comments should be ignored (true) or signaled as errors (false)
-    const bool ignore_comments = false;
-
-    /// the current character
-    char_int_type current = std::char_traits<char_type>::eof();
-
-    /// whether the next get() call should just return current
-    bool next_unget = false;
-
-    /// the start position of the current token
-    position_t position {};
-
-    /// raw input token string (for error messages)
-    std::vector<char_type> token_string {};
-
-    /// buffer for variable-length tokens (numbers, strings)
-    string_t token_buffer {};
-
-    /// a description of occurred lexer errors
-    const char* error_message = "";
-
-    // number values
-    number_integer_t value_integer = 0;
-    number_unsigned_t value_unsigned = 0;
-    number_float_t value_float = 0;
-
-    /// the decimal point
-    const char_int_type decimal_point_char = '.';
-};
-}  // namespace detail
-}  // namespace nlohmann
-
-// #include <nlohmann/detail/macro_scope.hpp>
-
-// #include <nlohmann/detail/meta/is_sax.hpp>
-
-
-#include <cstdint> // size_t
-#include <utility> // declval
-#include <string> // string
-
-// #include <nlohmann/detail/meta/detected.hpp>
-
-// #include <nlohmann/detail/meta/type_traits.hpp>
-
-
-namespace nlohmann
-{
-namespace detail
-{
-template<typename T>
-using null_function_t = decltype(std::declval<T&>().null());
-
-template<typename T>
-using boolean_function_t =
-    decltype(std::declval<T&>().boolean(std::declval<bool>()));
-
-template<typename T, typename Integer>
-using number_integer_function_t =
-    decltype(std::declval<T&>().number_integer(std::declval<Integer>()));
-
-template<typename T, typename Unsigned>
-using number_unsigned_function_t =
-    decltype(std::declval<T&>().number_unsigned(std::declval<Unsigned>()));
-
-template<typename T, typename Float, typename String>
-using number_float_function_t = decltype(std::declval<T&>().number_float(
-                                    std::declval<Float>(), std::declval<const String&>()));
-
-template<typename T, typename String>
-using string_function_t =
-    decltype(std::declval<T&>().string(std::declval<String&>()));
-
-template<typename T, typename Binary>
-using binary_function_t =
-    decltype(std::declval<T&>().binary(std::declval<Binary&>()));
-
-template<typename T>
-using start_object_function_t =
-    decltype(std::declval<T&>().start_object(std::declval<std::size_t>()));
-
-template<typename T, typename String>
-using key_function_t =
-    decltype(std::declval<T&>().key(std::declval<String&>()));
-
-template<typename T>
-using end_object_function_t = decltype(std::declval<T&>().end_object());
-
-template<typename T>
-using start_array_function_t =
-    decltype(std::declval<T&>().start_array(std::declval<std::size_t>()));
-
-template<typename T>
-using end_array_function_t = decltype(std::declval<T&>().end_array());
-
-template<typename T, typename Exception>
-using parse_error_function_t = decltype(std::declval<T&>().parse_error(
-        std::declval<std::size_t>(), std::declval<const std::string&>(),
-        std::declval<const Exception&>()));
-
-template<typename SAX, typename BasicJsonType>
-struct is_sax
-{
-  private:
-    static_assert(is_basic_json<BasicJsonType>::value,
-                  "BasicJsonType must be of type basic_json<...>");
-
-    using number_integer_t = typename BasicJsonType::number_integer_t;
-    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
-    using number_float_t = typename BasicJsonType::number_float_t;
-    using string_t = typename BasicJsonType::string_t;
-    using binary_t = typename BasicJsonType::binary_t;
-    using exception_t = typename BasicJsonType::exception;
-
-  public:
-    static constexpr bool value =
-        is_detected_exact<bool, null_function_t, SAX>::value &&
-        is_detected_exact<bool, boolean_function_t, SAX>::value &&
-        is_detected_exact<bool, number_integer_function_t, SAX, number_integer_t>::value &&
-        is_detected_exact<bool, number_unsigned_function_t, SAX, number_unsigned_t>::value &&
-        is_detected_exact<bool, number_float_function_t, SAX, number_float_t, string_t>::value &&
-        is_detected_exact<bool, string_function_t, SAX, string_t>::value &&
-        is_detected_exact<bool, binary_function_t, SAX, binary_t>::value &&
-        is_detected_exact<bool, start_object_function_t, SAX>::value &&
-        is_detected_exact<bool, key_function_t, SAX, string_t>::value &&
-        is_detected_exact<bool, end_object_function_t, SAX>::value &&
-        is_detected_exact<bool, start_array_function_t, SAX>::value &&
-        is_detected_exact<bool, end_array_function_t, SAX>::value &&
-        is_detected_exact<bool, parse_error_function_t, SAX, exception_t>::value;
-};
-
-template<typename SAX, typename BasicJsonType>
-struct is_sax_static_asserts
-{
-  private:
-    static_assert(is_basic_json<BasicJsonType>::value,
-                  "BasicJsonType must be of type basic_json<...>");
-
-    using number_integer_t = typename BasicJsonType::number_integer_t;
-    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
-    using number_float_t = typename BasicJsonType::number_float_t;
-    using string_t = typename BasicJsonType::string_t;
-    using binary_t = typename BasicJsonType::binary_t;
-    using exception_t = typename BasicJsonType::exception;
-
-  public:
-    static_assert(is_detected_exact<bool, null_function_t, SAX>::value,
-                  "Missing/invalid function: bool null()");
-    static_assert(is_detected_exact<bool, boolean_function_t, SAX>::value,
-                  "Missing/invalid function: bool boolean(bool)");
-    static_assert(is_detected_exact<bool, boolean_function_t, SAX>::value,
-                  "Missing/invalid function: bool boolean(bool)");
-    static_assert(
-        is_detected_exact<bool, number_integer_function_t, SAX,
-        number_integer_t>::value,
-        "Missing/invalid function: bool number_integer(number_integer_t)");
-    static_assert(
-        is_detected_exact<bool, number_unsigned_function_t, SAX,
-        number_unsigned_t>::value,
-        "Missing/invalid function: bool number_unsigned(number_unsigned_t)");
-    static_assert(is_detected_exact<bool, number_float_function_t, SAX,
-                  number_float_t, string_t>::value,
-                  "Missing/invalid function: bool number_float(number_float_t, const string_t&)");
-    static_assert(
-        is_detected_exact<bool, string_function_t, SAX, string_t>::value,
-        "Missing/invalid function: bool string(string_t&)");
-    static_assert(
-        is_detected_exact<bool, binary_function_t, SAX, binary_t>::value,
-        "Missing/invalid function: bool binary(binary_t&)");
-    static_assert(is_detected_exact<bool, start_object_function_t, SAX>::value,
-                  "Missing/invalid function: bool start_object(std::size_t)");
-    static_assert(is_detected_exact<bool, key_function_t, SAX, string_t>::value,
-                  "Missing/invalid function: bool key(string_t&)");
-    static_assert(is_detected_exact<bool, end_object_function_t, SAX>::value,
-                  "Missing/invalid function: bool end_object()");
-    static_assert(is_detected_exact<bool, start_array_function_t, SAX>::value,
-                  "Missing/invalid function: bool start_array(std::size_t)");
-    static_assert(is_detected_exact<bool, end_array_function_t, SAX>::value,
-                  "Missing/invalid function: bool end_array()");
-    static_assert(
-        is_detected_exact<bool, parse_error_function_t, SAX, exception_t>::value,
-        "Missing/invalid function: bool parse_error(std::size_t, const "
-        "std::string&, const exception&)");
-};
-}  // namespace detail
-}  // namespace nlohmann
-
-// #include <nlohmann/detail/meta/type_traits.hpp>
-
-// #include <nlohmann/detail/value_t.hpp>
-
-
-namespace nlohmann
-{
-namespace detail
-{
-
-/// how to treat CBOR tags
-enum class cbor_tag_handler_t
-{
-    error,   ///< throw a parse_error exception in case of a tag
-    ignore,  ///< ignore tags
-    store    ///< store tags as binary type
-};
-
-/*!
-@brief determine system byte order
-
-@return true if and only if system's byte order is little endian
-
-@note from https://stackoverflow.com/a/1001328/266378
-*/
-static inline bool little_endianness(int num = 1) noexcept
-{
-    return *reinterpret_cast<char*>(&num) == 1;
-}
-
-
-///////////////////
-// binary reader //
-///////////////////
-
-/*!
-@brief deserialization of CBOR, MessagePack, and UBJSON values
-*/
-template<typename BasicJsonType, typename InputAdapterType, typename SAX = json_sax_dom_parser<BasicJsonType>>
-class binary_reader
-{
-    using number_integer_t = typename BasicJsonType::number_integer_t;
-    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
-    using number_float_t = typename BasicJsonType::number_float_t;
-    using string_t = typename BasicJsonType::string_t;
-    using binary_t = typename BasicJsonType::binary_t;
-    using json_sax_t = SAX;
-    using char_type = typename InputAdapterType::char_type;
-    using char_int_type = typename std::char_traits<char_type>::int_type;
-
-  public:
-    /*!
-    @brief create a binary reader
-
-    @param[in] adapter  input adapter to read from
-    */
-    explicit binary_reader(InputAdapterType&& adapter) noexcept : ia(std::move(adapter))
-    {
-        (void)detail::is_sax_static_asserts<SAX, BasicJsonType> {};
-    }
-
-    // make class move-only
-    binary_reader(const binary_reader&) = delete;
-    binary_reader(binary_reader&&) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor)
-    binary_reader& operator=(const binary_reader&) = delete;
-    binary_reader& operator=(binary_reader&&) = default; // NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor)
-    ~binary_reader() = default;
-
-    /*!
-    @param[in] format  the binary format to parse
-    @param[in] sax_    a SAX event processor
-    @param[in] strict  whether to expect the input to be consumed completed
-    @param[in] tag_handler  how to treat CBOR tags
-
-    @return whether parsing was successful
-    */
-    JSON_HEDLEY_NON_NULL(3)
-    bool sax_parse(const input_format_t format,
-                   json_sax_t* sax_,
-                   const bool strict = true,
-                   const cbor_tag_handler_t tag_handler = cbor_tag_handler_t::error)
-    {
-        sax = sax_;
-        bool result = false;
-
-        switch (format)
-        {
-            case input_format_t::bson:
-                result = parse_bson_internal();
-                break;
-
-            case input_format_t::cbor:
-                result = parse_cbor_internal(true, tag_handler);
-                break;
-
-            case input_format_t::msgpack:
-                result = parse_msgpack_internal();
-                break;
-
-            case input_format_t::ubjson:
-                result = parse_ubjson_internal();
-                break;
-
-            case input_format_t::json: // LCOV_EXCL_LINE
-            default:            // LCOV_EXCL_LINE
-                JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
-        }
-
-        // strict mode: next byte must be EOF
-        if (result && strict)
-        {
-            if (format == input_format_t::ubjson)
-            {
-                get_ignore_noop();
-            }
-            else
-            {
-                get();
-            }
-
-            if (JSON_HEDLEY_UNLIKELY(current != std::char_traits<char_type>::eof()))
-            {
-                return sax->parse_error(chars_read, get_token_string(),
-                                        parse_error::create(110, chars_read, exception_message(format, "expected end of input; last byte: 0x" + get_token_string(), "value"), BasicJsonType()));
-            }
-        }
-
-        return result;
-    }
-
-  private:
-    //////////
-    // BSON //
-    //////////
-
-    /*!
-    @brief Reads in a BSON-object and passes it to the SAX-parser.
-    @return whether a valid BSON-value was passed to the SAX parser
-    */
-    bool parse_bson_internal()
-    {
-        std::int32_t document_size{};
-        get_number<std::int32_t, true>(input_format_t::bson, document_size);
-
-        if (JSON_HEDLEY_UNLIKELY(!sax->start_object(static_cast<std::size_t>(-1))))
-        {
-            return false;
-        }
-
-        if (JSON_HEDLEY_UNLIKELY(!parse_bson_element_list(/*is_array*/false)))
-        {
-            return false;
-        }
-
-        return sax->end_object();
-    }
-
-    /*!
-    @brief Parses a C-style string from the BSON input.
-    @param[in,out] result  A reference to the string variable where the read
-                            string is to be stored.
-    @return `true` if the \x00-byte indicating the end of the string was
-             encountered before the EOF; false` indicates an unexpected EOF.
-    */
-    bool get_bson_cstr(string_t& result)
-    {
-        auto out = std::back_inserter(result);
-        while (true)
-        {
-            get();
-            if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::bson, "cstring")))
-            {
-                return false;
-            }
-            if (current == 0x00)
-            {
-                return true;
-            }
-            *out++ = static_cast<typename string_t::value_type>(current);
-        }
-    }
-
-    /*!
-    @brief Parses a zero-terminated string of length @a len from the BSON
-           input.
-    @param[in] len  The length (including the zero-byte at the end) of the
-                    string to be read.
-    @param[in,out] result  A reference to the string variable where the read
-                            string is to be stored.
-    @tparam NumberType The type of the length @a len
-    @pre len >= 1
-    @return `true` if the string was successfully parsed
-    */
-    template<typename NumberType>
-    bool get_bson_string(const NumberType len, string_t& result)
-    {
-        if (JSON_HEDLEY_UNLIKELY(len < 1))
-        {
-            auto last_token = get_token_string();
-            return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format_t::bson, "string length must be at least 1, is " + std::to_string(len), "string"), BasicJsonType()));
-        }
-
-        return get_string(input_format_t::bson, len - static_cast<NumberType>(1), result) && get() != std::char_traits<char_type>::eof();
-    }
-
-    /*!
-    @brief Parses a byte array input of length @a len from the BSON input.
-    @param[in] len  The length of the byte array to be read.
-    @param[in,out] result  A reference to the binary variable where the read
-                            array is to be stored.
-    @tparam NumberType The type of the length @a len
-    @pre len >= 0
-    @return `true` if the byte array was successfully parsed
-    */
-    template<typename NumberType>
-    bool get_bson_binary(const NumberType len, binary_t& result)
-    {
-        if (JSON_HEDLEY_UNLIKELY(len < 0))
-        {
-            auto last_token = get_token_string();
-            return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format_t::bson, "byte array length cannot be negative, is " + std::to_string(len), "binary"), BasicJsonType()));
-        }
-
-        // All BSON binary values have a subtype
-        std::uint8_t subtype{};
-        get_number<std::uint8_t>(input_format_t::bson, subtype);
-        result.set_subtype(subtype);
-
-        return get_binary(input_format_t::bson, len, result);
-    }
-
-    /*!
-    @brief Read a BSON document element of the given @a element_type.
-    @param[in] element_type The BSON element type, c.f. http://bsonspec.org/spec.html
-    @param[in] element_type_parse_position The position in the input stream,
-               where the `element_type` was read.
-    @warning Not all BSON element types are supported yet. An unsupported
-             @a element_type will give rise to a parse_error.114:
-             Unsupported BSON record type 0x...
-    @return whether a valid BSON-object/array was passed to the SAX parser
-    */
-    bool parse_bson_element_internal(const char_int_type element_type,
-                                     const std::size_t element_type_parse_position)
-    {
-        switch (element_type)
-        {
-            case 0x01: // double
-            {
-                double number{};
-                return get_number<double, true>(input_format_t::bson, number) && sax->number_float(static_cast<number_float_t>(number), "");
-            }
-
-            case 0x02: // string
-            {
-                std::int32_t len{};
-                string_t value;
-                return get_number<std::int32_t, true>(input_format_t::bson, len) && get_bson_string(len, value) && sax->string(value);
-            }
-
-            case 0x03: // object
-            {
-                return parse_bson_internal();
-            }
-
-            case 0x04: // array
-            {
-                return parse_bson_array();
-            }
-
-            case 0x05: // binary
-            {
-                std::int32_t len{};
-                binary_t value;
-                return get_number<std::int32_t, true>(input_format_t::bson, len) && get_bson_binary(len, value) && sax->binary(value);
-            }
-
-            case 0x08: // boolean
-            {
-                return sax->boolean(get() != 0);
-            }
-
-            case 0x0A: // null
-            {
-                return sax->null();
-            }
-
-            case 0x10: // int32
-            {
-                std::int32_t value{};
-                return get_number<std::int32_t, true>(input_format_t::bson, value) && sax->number_integer(value);
-            }
-
-            case 0x12: // int64
-            {
-                std::int64_t value{};
-                return get_number<std::int64_t, true>(input_format_t::bson, value) && sax->number_integer(value);
-            }
-
-            default: // anything else not supported (yet)
-            {
-                std::array<char, 3> cr{{}};
-                static_cast<void>((std::snprintf)(cr.data(), cr.size(), "%.2hhX", static_cast<unsigned char>(element_type))); // NOLINT(cppcoreguidelines-pro-type-vararg,hicpp-vararg)
-                return sax->parse_error(element_type_parse_position, std::string(cr.data()), parse_error::create(114, element_type_parse_position, "Unsupported BSON record type 0x" + std::string(cr.data()), BasicJsonType()));
-            }
-        }
-    }
-
-    /*!
-    @brief Read a BSON element list (as specified in the BSON-spec)
-
-    The same binary layout is used for objects and arrays, hence it must be
-    indicated with the argument @a is_array which one is expected
-    (true --> array, false --> object).
-
-    @param[in] is_array Determines if the element list being read is to be
-                        treated as an object (@a is_array == false), or as an
-                        array (@a is_array == true).
-    @return whether a valid BSON-object/array was passed to the SAX parser
-    */
-    bool parse_bson_element_list(const bool is_array)
-    {
-        string_t key;
-
-        while (auto element_type = get())
-        {
-            if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::bson, "element list")))
-            {
-                return false;
-            }
-
-            const std::size_t element_type_parse_position = chars_read;
-            if (JSON_HEDLEY_UNLIKELY(!get_bson_cstr(key)))
-            {
-                return false;
-            }
-
-            if (!is_array && !sax->key(key))
-            {
-                return false;
-            }
-
-            if (JSON_HEDLEY_UNLIKELY(!parse_bson_element_internal(element_type, element_type_parse_position)))
-            {
-                return false;
-            }
-
-            // get_bson_cstr only appends
-            key.clear();
-        }
-
-        return true;
-    }
-
-    /*!
-    @brief Reads an array from the BSON input and passes it to the SAX-parser.
-    @return whether a valid BSON-array was passed to the SAX parser
-    */
-    bool parse_bson_array()
-    {
-        std::int32_t document_size{};
-        get_number<std::int32_t, true>(input_format_t::bson, document_size);
-
-        if (JSON_HEDLEY_UNLIKELY(!sax->start_array(static_cast<std::size_t>(-1))))
-        {
-            return false;
-        }
-
-        if (JSON_HEDLEY_UNLIKELY(!parse_bson_element_list(/*is_array*/true)))
-        {
-            return false;
-        }
-
-        return sax->end_array();
-    }
-
-    //////////
-    // CBOR //
-    //////////
-
-    /*!
-    @param[in] get_char  whether a new character should be retrieved from the
-                         input (true) or whether the last read character should
-                         be considered instead (false)
-    @param[in] tag_handler how CBOR tags should be treated
-
-    @return whether a valid CBOR value was passed to the SAX parser
-    */
-    bool parse_cbor_internal(const bool get_char,
-                             const cbor_tag_handler_t tag_handler)
-    {
-        switch (get_char ? get() : current)
-        {
-            // EOF
-            case std::char_traits<char_type>::eof():
-                return unexpect_eof(input_format_t::cbor, "value");
-
-            // Integer 0x00..0x17 (0..23)
-            case 0x00:
-            case 0x01:
-            case 0x02:
-            case 0x03:
-            case 0x04:
-            case 0x05:
-            case 0x06:
-            case 0x07:
-            case 0x08:
-            case 0x09:
-            case 0x0A:
-            case 0x0B:
-            case 0x0C:
-            case 0x0D:
-            case 0x0E:
-            case 0x0F:
-            case 0x10:
-            case 0x11:
-            case 0x12:
-            case 0x13:
-            case 0x14:
-            case 0x15:
-            case 0x16:
-            case 0x17:
-                return sax->number_unsigned(static_cast<number_unsigned_t>(current));
-
-            case 0x18: // Unsigned integer (one-byte uint8_t follows)
-            {
-                std::uint8_t number{};
-                return get_number(input_format_t::cbor, number) && sax->number_unsigned(number);
-            }
-
-            case 0x19: // Unsigned integer (two-byte uint16_t follows)
-            {
-                std::uint16_t number{};
-                return get_number(input_format_t::cbor, number) && sax->number_unsigned(number);
-            }
-
-            case 0x1A: // Unsigned integer (four-byte uint32_t follows)
-            {
-                std::uint32_t number{};
-                return get_number(input_format_t::cbor, number) && sax->number_unsigned(number);
-            }
-
-            case 0x1B: // Unsigned integer (eight-byte uint64_t follows)
-            {
-                std::uint64_t number{};
-                return get_number(input_format_t::cbor, number) && sax->number_unsigned(number);
-            }
-
-            // Negative integer -1-0x00..-1-0x17 (-1..-24)
-            case 0x20:
-            case 0x21:
-            case 0x22:
-            case 0x23:
-            case 0x24:
-            case 0x25:
-            case 0x26:
-            case 0x27:
-            case 0x28:
-            case 0x29:
-            case 0x2A:
-            case 0x2B:
-            case 0x2C:
-            case 0x2D:
-            case 0x2E:
-            case 0x2F:
-            case 0x30:
-            case 0x31:
-            case 0x32:
-            case 0x33:
-            case 0x34:
-            case 0x35:
-            case 0x36:
-            case 0x37:
-                return sax->number_integer(static_cast<std::int8_t>(0x20 - 1 - current));
-
-            case 0x38: // Negative integer (one-byte uint8_t follows)
-            {
-                std::uint8_t number{};
-                return get_number(input_format_t::cbor, number) && sax->number_integer(static_cast<number_integer_t>(-1) - number);
-            }
-
-            case 0x39: // Negative integer -1-n (two-byte uint16_t follows)
-            {
-                std::uint16_t number{};
-                return get_number(input_format_t::cbor, number) && sax->number_integer(static_cast<number_integer_t>(-1) - number);
-            }
-
-            case 0x3A: // Negative integer -1-n (four-byte uint32_t follows)
-            {
-                std::uint32_t number{};
-                return get_number(input_format_t::cbor, number) && sax->number_integer(static_cast<number_integer_t>(-1) - number);
-            }
-
-            case 0x3B: // Negative integer -1-n (eight-byte uint64_t follows)
-            {
-                std::uint64_t number{};
-                return get_number(input_format_t::cbor, number) && sax->number_integer(static_cast<number_integer_t>(-1)
-                        - static_cast<number_integer_t>(number));
-            }
-
-            // Binary data (0x00..0x17 bytes follow)
-            case 0x40:
-            case 0x41:
-            case 0x42:
-            case 0x43:
-            case 0x44:
-            case 0x45:
-            case 0x46:
-            case 0x47:
-            case 0x48:
-            case 0x49:
-            case 0x4A:
-            case 0x4B:
-            case 0x4C:
-            case 0x4D:
-            case 0x4E:
-            case 0x4F:
-            case 0x50:
-            case 0x51:
-            case 0x52:
-            case 0x53:
-            case 0x54:
-            case 0x55:
-            case 0x56:
-            case 0x57:
-            case 0x58: // Binary data (one-byte uint8_t for n follows)
-            case 0x59: // Binary data (two-byte uint16_t for n follow)
-            case 0x5A: // Binary data (four-byte uint32_t for n follow)
-            case 0x5B: // Binary data (eight-byte uint64_t for n follow)
-            case 0x5F: // Binary data (indefinite length)
-            {
-                binary_t b;
-                return get_cbor_binary(b) && sax->binary(b);
-            }
-
-            // UTF-8 string (0x00..0x17 bytes follow)
-            case 0x60:
-            case 0x61:
-            case 0x62:
-            case 0x63:
-            case 0x64:
-            case 0x65:
-            case 0x66:
-            case 0x67:
-            case 0x68:
-            case 0x69:
-            case 0x6A:
-            case 0x6B:
-            case 0x6C:
-            case 0x6D:
-            case 0x6E:
-            case 0x6F:
-            case 0x70:
-            case 0x71:
-            case 0x72:
-            case 0x73:
-            case 0x74:
-            case 0x75:
-            case 0x76:
-            case 0x77:
-            case 0x78: // UTF-8 string (one-byte uint8_t for n follows)
-            case 0x79: // UTF-8 string (two-byte uint16_t for n follow)
-            case 0x7A: // UTF-8 string (four-byte uint32_t for n follow)
-            case 0x7B: // UTF-8 string (eight-byte uint64_t for n follow)
-            case 0x7F: // UTF-8 string (indefinite length)
-            {
-                string_t s;
-                return get_cbor_string(s) && sax->string(s);
-            }
-
-            // array (0x00..0x17 data items follow)
-            case 0x80:
-            case 0x81:
-            case 0x82:
-            case 0x83:
-            case 0x84:
-            case 0x85:
-            case 0x86:
-            case 0x87:
-            case 0x88:
-            case 0x89:
-            case 0x8A:
-            case 0x8B:
-            case 0x8C:
-            case 0x8D:
-            case 0x8E:
-            case 0x8F:
-            case 0x90:
-            case 0x91:
-            case 0x92:
-            case 0x93:
-            case 0x94:
-            case 0x95:
-            case 0x96:
-            case 0x97:
-                return get_cbor_array(static_cast<std::size_t>(static_cast<unsigned int>(current) & 0x1Fu), tag_handler);
-
-            case 0x98: // array (one-byte uint8_t for n follows)
-            {
-                std::uint8_t len{};
-                return get_number(input_format_t::cbor, len) && get_cbor_array(static_cast<std::size_t>(len), tag_handler);
-            }
-
-            case 0x99: // array (two-byte uint16_t for n follow)
-            {
-                std::uint16_t len{};
-                return get_number(input_format_t::cbor, len) && get_cbor_array(static_cast<std::size_t>(len), tag_handler);
-            }
-
-            case 0x9A: // array (four-byte uint32_t for n follow)
-            {
-                std::uint32_t len{};
-                return get_number(input_format_t::cbor, len) && get_cbor_array(static_cast<std::size_t>(len), tag_handler);
-            }
-
-            case 0x9B: // array (eight-byte uint64_t for n follow)
-            {
-                std::uint64_t len{};
-                return get_number(input_format_t::cbor, len) && get_cbor_array(detail::conditional_static_cast<std::size_t>(len), tag_handler);
-            }
-
-            case 0x9F: // array (indefinite length)
-                return get_cbor_array(static_cast<std::size_t>(-1), tag_handler);
-
-            // map (0x00..0x17 pairs of data items follow)
-            case 0xA0:
-            case 0xA1:
-            case 0xA2:
-            case 0xA3:
-            case 0xA4:
-            case 0xA5:
-            case 0xA6:
-            case 0xA7:
-            case 0xA8:
-            case 0xA9:
-            case 0xAA:
-            case 0xAB:
-            case 0xAC:
-            case 0xAD:
-            case 0xAE:
-            case 0xAF:
-            case 0xB0:
-            case 0xB1:
-            case 0xB2:
-            case 0xB3:
-            case 0xB4:
-            case 0xB5:
-            case 0xB6:
-            case 0xB7:
-                return get_cbor_object(static_cast<std::size_t>(static_cast<unsigned int>(current) & 0x1Fu), tag_handler);
-
-            case 0xB8: // map (one-byte uint8_t for n follows)
-            {
-                std::uint8_t len{};
-                return get_number(input_format_t::cbor, len) && get_cbor_object(static_cast<std::size_t>(len), tag_handler);
-            }
-
-            case 0xB9: // map (two-byte uint16_t for n follow)
-            {
-                std::uint16_t len{};
-                return get_number(input_format_t::cbor, len) && get_cbor_object(static_cast<std::size_t>(len), tag_handler);
-            }
-
-            case 0xBA: // map (four-byte uint32_t for n follow)
-            {
-                std::uint32_t len{};
-                return get_number(input_format_t::cbor, len) && get_cbor_object(static_cast<std::size_t>(len), tag_handler);
-            }
-
-            case 0xBB: // map (eight-byte uint64_t for n follow)
-            {
-                std::uint64_t len{};
-                return get_number(input_format_t::cbor, len) && get_cbor_object(detail::conditional_static_cast<std::size_t>(len), tag_handler);
-            }
-
-            case 0xBF: // map (indefinite length)
-                return get_cbor_object(static_cast<std::size_t>(-1), tag_handler);
-
-            case 0xC6: // tagged item
-            case 0xC7:
-            case 0xC8:
-            case 0xC9:
-            case 0xCA:
-            case 0xCB:
-            case 0xCC:
-            case 0xCD:
-            case 0xCE:
-            case 0xCF:
-            case 0xD0:
-            case 0xD1:
-            case 0xD2:
-            case 0xD3:
-            case 0xD4:
-            case 0xD8: // tagged item (1 bytes follow)
-            case 0xD9: // tagged item (2 bytes follow)
-            case 0xDA: // tagged item (4 bytes follow)
-            case 0xDB: // tagged item (8 bytes follow)
-            {
-                switch (tag_handler)
-                {
-                    case cbor_tag_handler_t::error:
-                    {
-                        auto last_token = get_token_string();
-                        return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format_t::cbor, "invalid byte: 0x" + last_token, "value"), BasicJsonType()));
-                    }
-
-                    case cbor_tag_handler_t::ignore:
-                    {
-                        // ignore binary subtype
-                        switch (current)
-                        {
-                            case 0xD8:
-                            {
-                                std::uint8_t subtype_to_ignore{};
-                                get_number(input_format_t::cbor, subtype_to_ignore);
-                                break;
-                            }
-                            case 0xD9:
-                            {
-                                std::uint16_t subtype_to_ignore{};
-                                get_number(input_format_t::cbor, subtype_to_ignore);
-                                break;
-                            }
-                            case 0xDA:
-                            {
-                                std::uint32_t subtype_to_ignore{};
-                                get_number(input_format_t::cbor, subtype_to_ignore);
-                                break;
-                            }
-                            case 0xDB:
-                            {
-                                std::uint64_t subtype_to_ignore{};
-                                get_number(input_format_t::cbor, subtype_to_ignore);
-                                break;
-                            }
-                            default:
-                                break;
-                        }
-                        return parse_cbor_internal(true, tag_handler);
-                    }
-
-                    case cbor_tag_handler_t::store:
-                    {
-                        binary_t b;
-                        // use binary subtype and store in binary container
-                        switch (current)
-                        {
-                            case 0xD8:
-                            {
-                                std::uint8_t subtype{};
-                                get_number(input_format_t::cbor, subtype);
-                                b.set_subtype(detail::conditional_static_cast<typename binary_t::subtype_type>(subtype));
-                                break;
-                            }
-                            case 0xD9:
-                            {
-                                std::uint16_t subtype{};
-                                get_number(input_format_t::cbor, subtype);
-                                b.set_subtype(detail::conditional_static_cast<typename binary_t::subtype_type>(subtype));
-                                break;
-                            }
-                            case 0xDA:
-                            {
-                                std::uint32_t subtype{};
-                                get_number(input_format_t::cbor, subtype);
-                                b.set_subtype(detail::conditional_static_cast<typename binary_t::subtype_type>(subtype));
-                                break;
-                            }
-                            case 0xDB:
-                            {
-                                std::uint64_t subtype{};
-                                get_number(input_format_t::cbor, subtype);
-                                b.set_subtype(detail::conditional_static_cast<typename binary_t::subtype_type>(subtype));
-                                break;
-                            }
-                            default:
-                                return parse_cbor_internal(true, tag_handler);
-                        }
-                        get();
-                        return get_cbor_binary(b) && sax->binary(b);
-                    }
-
-                    default:                 // LCOV_EXCL_LINE
-                        JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
-                        return false;        // LCOV_EXCL_LINE
-                }
-            }
-
-            case 0xF4: // false
-                return sax->boolean(false);
-
-            case 0xF5: // true
-                return sax->boolean(true);
-
-            case 0xF6: // null
-                return sax->null();
-
-            case 0xF9: // Half-Precision Float (two-byte IEEE 754)
-            {
-                const auto byte1_raw = get();
-                if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::cbor, "number")))
-                {
-                    return false;
-                }
-                const auto byte2_raw = get();
-                if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::cbor, "number")))
-                {
-                    return false;
-                }
-
-                const auto byte1 = static_cast<unsigned char>(byte1_raw);
-                const auto byte2 = static_cast<unsigned char>(byte2_raw);
-
-                // code from RFC 7049, Appendix D, Figure 3:
-                // As half-precision floating-point numbers were only added
-                // to IEEE 754 in 2008, today's programming platforms often
-                // still only have limited support for them. It is very
-                // easy to include at least decoding support for them even
-                // without such support. An example of a small decoder for
-                // half-precision floating-point numbers in the C language
-                // is shown in Fig. 3.
-                const auto half = static_cast<unsigned int>((byte1 << 8u) + byte2);
-                const double val = [&half]
-                {
-                    const int exp = (half >> 10u) & 0x1Fu;
-                    const unsigned int mant = half & 0x3FFu;
-                    JSON_ASSERT(0 <= exp&& exp <= 32);
-                    JSON_ASSERT(mant <= 1024);
-                    switch (exp)
-                    {
-                        case 0:
-                            return std::ldexp(mant, -24);
-                        case 31:
-                            return (mant == 0)
-                            ? std::numeric_limits<double>::infinity()
-                            : std::numeric_limits<double>::quiet_NaN();
-                        default:
-                            return std::ldexp(mant + 1024, exp - 25);
-                    }
-                }();
-                return sax->number_float((half & 0x8000u) != 0
-                                         ? static_cast<number_float_t>(-val)
-                                         : static_cast<number_float_t>(val), "");
-            }
-
-            case 0xFA: // Single-Precision Float (four-byte IEEE 754)
-            {
-                float number{};
-                return get_number(input_format_t::cbor, number) && sax->number_float(static_cast<number_float_t>(number), "");
-            }
-
-            case 0xFB: // Double-Precision Float (eight-byte IEEE 754)
-            {
-                double number{};
-                return get_number(input_format_t::cbor, number) && sax->number_float(static_cast<number_float_t>(number), "");
-            }
-
-            default: // anything else (0xFF is handled inside the other types)
-            {
-                auto last_token = get_token_string();
-                return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format_t::cbor, "invalid byte: 0x" + last_token, "value"), BasicJsonType()));
-            }
-        }
-    }
-
-    /*!
-    @brief reads a CBOR string
-
-    This function first reads starting bytes to determine the expected
-    string length and then copies this number of bytes into a string.
-    Additionally, CBOR's strings with indefinite lengths are supported.
-
-    @param[out] result  created string
-
-    @return whether string creation completed
-    */
-    bool get_cbor_string(string_t& result)
-    {
-        if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::cbor, "string")))
-        {
-            return false;
-        }
-
-        switch (current)
-        {
-            // UTF-8 string (0x00..0x17 bytes follow)
-            case 0x60:
-            case 0x61:
-            case 0x62:
-            case 0x63:
-            case 0x64:
-            case 0x65:
-            case 0x66:
-            case 0x67:
-            case 0x68:
-            case 0x69:
-            case 0x6A:
-            case 0x6B:
-            case 0x6C:
-            case 0x6D:
-            case 0x6E:
-            case 0x6F:
-            case 0x70:
-            case 0x71:
-            case 0x72:
-            case 0x73:
-            case 0x74:
-            case 0x75:
-            case 0x76:
-            case 0x77:
-            {
-                return get_string(input_format_t::cbor, static_cast<unsigned int>(current) & 0x1Fu, result);
-            }
-
-            case 0x78: // UTF-8 string (one-byte uint8_t for n follows)
-            {
-                std::uint8_t len{};
-                return get_number(input_format_t::cbor, len) && get_string(input_format_t::cbor, len, result);
-            }
-
-            case 0x79: // UTF-8 string (two-byte uint16_t for n follow)
-            {
-                std::uint16_t len{};
-                return get_number(input_format_t::cbor, len) && get_string(input_format_t::cbor, len, result);
-            }
-
-            case 0x7A: // UTF-8 string (four-byte uint32_t for n follow)
-            {
-                std::uint32_t len{};
-                return get_number(input_format_t::cbor, len) && get_string(input_format_t::cbor, len, result);
-            }
-
-            case 0x7B: // UTF-8 string (eight-byte uint64_t for n follow)
-            {
-                std::uint64_t len{};
-                return get_number(input_format_t::cbor, len) && get_string(input_format_t::cbor, len, result);
-            }
-
-            case 0x7F: // UTF-8 string (indefinite length)
-            {
-                while (get() != 0xFF)
-                {
-                    string_t chunk;
-                    if (!get_cbor_string(chunk))
-                    {
-                        return false;
-                    }
-                    result.append(chunk);
-                }
-                return true;
-            }
-
-            default:
-            {
-                auto last_token = get_token_string();
-                return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format_t::cbor, "expected length specification (0x60-0x7B) or indefinite string type (0x7F); last byte: 0x" + last_token, "string"), BasicJsonType()));
-            }
-        }
-    }
-
-    /*!
-    @brief reads a CBOR byte array
-
-    This function first reads starting bytes to determine the expected
-    byte array length and then copies this number of bytes into the byte array.
-    Additionally, CBOR's byte arrays with indefinite lengths are supported.
-
-    @param[out] result  created byte array
-
-    @return whether byte array creation completed
-    */
-    bool get_cbor_binary(binary_t& result)
-    {
-        if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::cbor, "binary")))
-        {
-            return false;
-        }
-
-        switch (current)
-        {
-            // Binary data (0x00..0x17 bytes follow)
-            case 0x40:
-            case 0x41:
-            case 0x42:
-            case 0x43:
-            case 0x44:
-            case 0x45:
-            case 0x46:
-            case 0x47:
-            case 0x48:
-            case 0x49:
-            case 0x4A:
-            case 0x4B:
-            case 0x4C:
-            case 0x4D:
-            case 0x4E:
-            case 0x4F:
-            case 0x50:
-            case 0x51:
-            case 0x52:
-            case 0x53:
-            case 0x54:
-            case 0x55:
-            case 0x56:
-            case 0x57:
-            {
-                return get_binary(input_format_t::cbor, static_cast<unsigned int>(current) & 0x1Fu, result);
-            }
-
-            case 0x58: // Binary data (one-byte uint8_t for n follows)
-            {
-                std::uint8_t len{};
-                return get_number(input_format_t::cbor, len) &&
-                       get_binary(input_format_t::cbor, len, result);
-            }
-
-            case 0x59: // Binary data (two-byte uint16_t for n follow)
-            {
-                std::uint16_t len{};
-                return get_number(input_format_t::cbor, len) &&
-                       get_binary(input_format_t::cbor, len, result);
-            }
-
-            case 0x5A: // Binary data (four-byte uint32_t for n follow)
-            {
-                std::uint32_t len{};
-                return get_number(input_format_t::cbor, len) &&
-                       get_binary(input_format_t::cbor, len, result);
-            }
-
-            case 0x5B: // Binary data (eight-byte uint64_t for n follow)
-            {
-                std::uint64_t len{};
-                return get_number(input_format_t::cbor, len) &&
-                       get_binary(input_format_t::cbor, len, result);
-            }
-
-            case 0x5F: // Binary data (indefinite length)
-            {
-                while (get() != 0xFF)
-                {
-                    binary_t chunk;
-                    if (!get_cbor_binary(chunk))
-                    {
-                        return false;
-                    }
-                    result.insert(result.end(), chunk.begin(), chunk.end());
-                }
-                return true;
-            }
-
-            default:
-            {
-                auto last_token = get_token_string();
-                return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format_t::cbor, "expected length specification (0x40-0x5B) or indefinite binary array type (0x5F); last byte: 0x" + last_token, "binary"), BasicJsonType()));
-            }
-        }
-    }
-
-    /*!
-    @param[in] len  the length of the array or static_cast<std::size_t>(-1) for an
-                    array of indefinite size
-    @param[in] tag_handler how CBOR tags should be treated
-    @return whether array creation completed
-    */
-    bool get_cbor_array(const std::size_t len,
-                        const cbor_tag_handler_t tag_handler)
-    {
-        if (JSON_HEDLEY_UNLIKELY(!sax->start_array(len)))
-        {
-            return false;
-        }
-
-        if (len != static_cast<std::size_t>(-1))
-        {
-            for (std::size_t i = 0; i < len; ++i)
-            {
-                if (JSON_HEDLEY_UNLIKELY(!parse_cbor_internal(true, tag_handler)))
-                {
-                    return false;
-                }
-            }
-        }
-        else
-        {
-            while (get() != 0xFF)
-            {
-                if (JSON_HEDLEY_UNLIKELY(!parse_cbor_internal(false, tag_handler)))
-                {
-                    return false;
-                }
-            }
-        }
-
-        return sax->end_array();
-    }
-
-    /*!
-    @param[in] len  the length of the object or static_cast<std::size_t>(-1) for an
-                    object of indefinite size
-    @param[in] tag_handler how CBOR tags should be treated
-    @return whether object creation completed
-    */
-    bool get_cbor_object(const std::size_t len,
-                         const cbor_tag_handler_t tag_handler)
-    {
-        if (JSON_HEDLEY_UNLIKELY(!sax->start_object(len)))
-        {
-            return false;
-        }
-
-        if (len != 0)
-        {
-            string_t key;
-            if (len != static_cast<std::size_t>(-1))
-            {
-                for (std::size_t i = 0; i < len; ++i)
-                {
-                    get();
-                    if (JSON_HEDLEY_UNLIKELY(!get_cbor_string(key) || !sax->key(key)))
-                    {
-                        return false;
-                    }
-
-                    if (JSON_HEDLEY_UNLIKELY(!parse_cbor_internal(true, tag_handler)))
-                    {
-                        return false;
-                    }
-                    key.clear();
-                }
-            }
-            else
-            {
-                while (get() != 0xFF)
-                {
-                    if (JSON_HEDLEY_UNLIKELY(!get_cbor_string(key) || !sax->key(key)))
-                    {
-                        return false;
-                    }
-
-                    if (JSON_HEDLEY_UNLIKELY(!parse_cbor_internal(true, tag_handler)))
-                    {
-                        return false;
-                    }
-                    key.clear();
-                }
-            }
-        }
-
-        return sax->end_object();
-    }
-
-    /////////////
-    // MsgPack //
-    /////////////
-
-    /*!
-    @return whether a valid MessagePack value was passed to the SAX parser
-    */
-    bool parse_msgpack_internal()
-    {
-        switch (get())
-        {
-            // EOF
-            case std::char_traits<char_type>::eof():
-                return unexpect_eof(input_format_t::msgpack, "value");
-
-            // positive fixint
-            case 0x00:
-            case 0x01:
-            case 0x02:
-            case 0x03:
-            case 0x04:
-            case 0x05:
-            case 0x06:
-            case 0x07:
-            case 0x08:
-            case 0x09:
-            case 0x0A:
-            case 0x0B:
-            case 0x0C:
-            case 0x0D:
-            case 0x0E:
-            case 0x0F:
-            case 0x10:
-            case 0x11:
-            case 0x12:
-            case 0x13:
-            case 0x14:
-            case 0x15:
-            case 0x16:
-            case 0x17:
-            case 0x18:
-            case 0x19:
-            case 0x1A:
-            case 0x1B:
-            case 0x1C:
-            case 0x1D:
-            case 0x1E:
-            case 0x1F:
-            case 0x20:
-            case 0x21:
-            case 0x22:
-            case 0x23:
-            case 0x24:
-            case 0x25:
-            case 0x26:
-            case 0x27:
-            case 0x28:
-            case 0x29:
-            case 0x2A:
-            case 0x2B:
-            case 0x2C:
-            case 0x2D:
-            case 0x2E:
-            case 0x2F:
-            case 0x30:
-            case 0x31:
-            case 0x32:
-            case 0x33:
-            case 0x34:
-            case 0x35:
-            case 0x36:
-            case 0x37:
-            case 0x38:
-            case 0x39:
-            case 0x3A:
-            case 0x3B:
-            case 0x3C:
-            case 0x3D:
-            case 0x3E:
-            case 0x3F:
-            case 0x40:
-            case 0x41:
-            case 0x42:
-            case 0x43:
-            case 0x44:
-            case 0x45:
-            case 0x46:
-            case 0x47:
-            case 0x48:
-            case 0x49:
-            case 0x4A:
-            case 0x4B:
-            case 0x4C:
-            case 0x4D:
-            case 0x4E:
-            case 0x4F:
-            case 0x50:
-            case 0x51:
-            case 0x52:
-            case 0x53:
-            case 0x54:
-            case 0x55:
-            case 0x56:
-            case 0x57:
-            case 0x58:
-            case 0x59:
-            case 0x5A:
-            case 0x5B:
-            case 0x5C:
-            case 0x5D:
-            case 0x5E:
-            case 0x5F:
-            case 0x60:
-            case 0x61:
-            case 0x62:
-            case 0x63:
-            case 0x64:
-            case 0x65:
-            case 0x66:
-            case 0x67:
-            case 0x68:
-            case 0x69:
-            case 0x6A:
-            case 0x6B:
-            case 0x6C:
-            case 0x6D:
-            case 0x6E:
-            case 0x6F:
-            case 0x70:
-            case 0x71:
-            case 0x72:
-            case 0x73:
-            case 0x74:
-            case 0x75:
-            case 0x76:
-            case 0x77:
-            case 0x78:
-            case 0x79:
-            case 0x7A:
-            case 0x7B:
-            case 0x7C:
-            case 0x7D:
-            case 0x7E:
-            case 0x7F:
-                return sax->number_unsigned(static_cast<number_unsigned_t>(current));
-
-            // fixmap
-            case 0x80:
-            case 0x81:
-            case 0x82:
-            case 0x83:
-            case 0x84:
-            case 0x85:
-            case 0x86:
-            case 0x87:
-            case 0x88:
-            case 0x89:
-            case 0x8A:
-            case 0x8B:
-            case 0x8C:
-            case 0x8D:
-            case 0x8E:
-            case 0x8F:
-                return get_msgpack_object(static_cast<std::size_t>(static_cast<unsigned int>(current) & 0x0Fu));
-
-            // fixarray
-            case 0x90:
-            case 0x91:
-            case 0x92:
-            case 0x93:
-            case 0x94:
-            case 0x95:
-            case 0x96:
-            case 0x97:
-            case 0x98:
-            case 0x99:
-            case 0x9A:
-            case 0x9B:
-            case 0x9C:
-            case 0x9D:
-            case 0x9E:
-            case 0x9F:
-                return get_msgpack_array(static_cast<std::size_t>(static_cast<unsigned int>(current) & 0x0Fu));
-
-            // fixstr
-            case 0xA0:
-            case 0xA1:
-            case 0xA2:
-            case 0xA3:
-            case 0xA4:
-            case 0xA5:
-            case 0xA6:
-            case 0xA7:
-            case 0xA8:
-            case 0xA9:
-            case 0xAA:
-            case 0xAB:
-            case 0xAC:
-            case 0xAD:
-            case 0xAE:
-            case 0xAF:
-            case 0xB0:
-            case 0xB1:
-            case 0xB2:
-            case 0xB3:
-            case 0xB4:
-            case 0xB5:
-            case 0xB6:
-            case 0xB7:
-            case 0xB8:
-            case 0xB9:
-            case 0xBA:
-            case 0xBB:
-            case 0xBC:
-            case 0xBD:
-            case 0xBE:
-            case 0xBF:
-            case 0xD9: // str 8
-            case 0xDA: // str 16
-            case 0xDB: // str 32
-            {
-                string_t s;
-                return get_msgpack_string(s) && sax->string(s);
-            }
-
-            case 0xC0: // nil
-                return sax->null();
-
-            case 0xC2: // false
-                return sax->boolean(false);
-
-            case 0xC3: // true
-                return sax->boolean(true);
-
-            case 0xC4: // bin 8
-            case 0xC5: // bin 16
-            case 0xC6: // bin 32
-            case 0xC7: // ext 8
-            case 0xC8: // ext 16
-            case 0xC9: // ext 32
-            case 0xD4: // fixext 1
-            case 0xD5: // fixext 2
-            case 0xD6: // fixext 4
-            case 0xD7: // fixext 8
-            case 0xD8: // fixext 16
-            {
-                binary_t b;
-                return get_msgpack_binary(b) && sax->binary(b);
-            }
-
-            case 0xCA: // float 32
-            {
-                float number{};
-                return get_number(input_format_t::msgpack, number) && sax->number_float(static_cast<number_float_t>(number), "");
-            }
-
-            case 0xCB: // float 64
-            {
-                double number{};
-                return get_number(input_format_t::msgpack, number) && sax->number_float(static_cast<number_float_t>(number), "");
-            }
-
-            case 0xCC: // uint 8
-            {
-                std::uint8_t number{};
-                return get_number(input_format_t::msgpack, number) && sax->number_unsigned(number);
-            }
-
-            case 0xCD: // uint 16
-            {
-                std::uint16_t number{};
-                return get_number(input_format_t::msgpack, number) && sax->number_unsigned(number);
-            }
-
-            case 0xCE: // uint 32
-            {
-                std::uint32_t number{};
-                return get_number(input_format_t::msgpack, number) && sax->number_unsigned(number);
-            }
-
-            case 0xCF: // uint 64
-            {
-                std::uint64_t number{};
-                return get_number(input_format_t::msgpack, number) && sax->number_unsigned(number);
-            }
-
-            case 0xD0: // int 8
-            {
-                std::int8_t number{};
-                return get_number(input_format_t::msgpack, number) && sax->number_integer(number);
-            }
-
-            case 0xD1: // int 16
-            {
-                std::int16_t number{};
-                return get_number(input_format_t::msgpack, number) && sax->number_integer(number);
-            }
-
-            case 0xD2: // int 32
-            {
-                std::int32_t number{};
-                return get_number(input_format_t::msgpack, number) && sax->number_integer(number);
-            }
-
-            case 0xD3: // int 64
-            {
-                std::int64_t number{};
-                return get_number(input_format_t::msgpack, number) && sax->number_integer(number);
-            }
-
-            case 0xDC: // array 16
-            {
-                std::uint16_t len{};
-                return get_number(input_format_t::msgpack, len) && get_msgpack_array(static_cast<std::size_t>(len));
-            }
-
-            case 0xDD: // array 32
-            {
-                std::uint32_t len{};
-                return get_number(input_format_t::msgpack, len) && get_msgpack_array(static_cast<std::size_t>(len));
-            }
-
-            case 0xDE: // map 16
-            {
-                std::uint16_t len{};
-                return get_number(input_format_t::msgpack, len) && get_msgpack_object(static_cast<std::size_t>(len));
-            }
-
-            case 0xDF: // map 32
-            {
-                std::uint32_t len{};
-                return get_number(input_format_t::msgpack, len) && get_msgpack_object(static_cast<std::size_t>(len));
-            }
-
-            // negative fixint
-            case 0xE0:
-            case 0xE1:
-            case 0xE2:
-            case 0xE3:
-            case 0xE4:
-            case 0xE5:
-            case 0xE6:
-            case 0xE7:
-            case 0xE8:
-            case 0xE9:
-            case 0xEA:
-            case 0xEB:
-            case 0xEC:
-            case 0xED:
-            case 0xEE:
-            case 0xEF:
-            case 0xF0:
-            case 0xF1:
-            case 0xF2:
-            case 0xF3:
-            case 0xF4:
-            case 0xF5:
-            case 0xF6:
-            case 0xF7:
-            case 0xF8:
-            case 0xF9:
-            case 0xFA:
-            case 0xFB:
-            case 0xFC:
-            case 0xFD:
-            case 0xFE:
-            case 0xFF:
-                return sax->number_integer(static_cast<std::int8_t>(current));
-
-            default: // anything else
-            {
-                auto last_token = get_token_string();
-                return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format_t::msgpack, "invalid byte: 0x" + last_token, "value"), BasicJsonType()));
-            }
-        }
-    }
-
-    /*!
-    @brief reads a MessagePack string
-
-    This function first reads starting bytes to determine the expected
-    string length and then copies this number of bytes into a string.
-
-    @param[out] result  created string
-
-    @return whether string creation completed
-    */
-    bool get_msgpack_string(string_t& result)
-    {
-        if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::msgpack, "string")))
-        {
-            return false;
-        }
-
-        switch (current)
-        {
-            // fixstr
-            case 0xA0:
-            case 0xA1:
-            case 0xA2:
-            case 0xA3:
-            case 0xA4:
-            case 0xA5:
-            case 0xA6:
-            case 0xA7:
-            case 0xA8:
-            case 0xA9:
-            case 0xAA:
-            case 0xAB:
-            case 0xAC:
-            case 0xAD:
-            case 0xAE:
-            case 0xAF:
-            case 0xB0:
-            case 0xB1:
-            case 0xB2:
-            case 0xB3:
-            case 0xB4:
-            case 0xB5:
-            case 0xB6:
-            case 0xB7:
-            case 0xB8:
-            case 0xB9:
-            case 0xBA:
-            case 0xBB:
-            case 0xBC:
-            case 0xBD:
-            case 0xBE:
-            case 0xBF:
-            {
-                return get_string(input_format_t::msgpack, static_cast<unsigned int>(current) & 0x1Fu, result);
-            }
-
-            case 0xD9: // str 8
-            {
-                std::uint8_t len{};
-                return get_number(input_format_t::msgpack, len) && get_string(input_format_t::msgpack, len, result);
-            }
-
-            case 0xDA: // str 16
-            {
-                std::uint16_t len{};
-                return get_number(input_format_t::msgpack, len) && get_string(input_format_t::msgpack, len, result);
-            }
-
-            case 0xDB: // str 32
-            {
-                std::uint32_t len{};
-                return get_number(input_format_t::msgpack, len) && get_string(input_format_t::msgpack, len, result);
-            }
-
-            default:
-            {
-                auto last_token = get_token_string();
-                return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format_t::msgpack, "expected length specification (0xA0-0xBF, 0xD9-0xDB); last byte: 0x" + last_token, "string"), BasicJsonType()));
-            }
-        }
-    }
-
-    /*!
-    @brief reads a MessagePack byte array
-
-    This function first reads starting bytes to determine the expected
-    byte array length and then copies this number of bytes into a byte array.
-
-    @param[out] result  created byte array
-
-    @return whether byte array creation completed
-    */
-    bool get_msgpack_binary(binary_t& result)
-    {
-        // helper function to set the subtype
-        auto assign_and_return_true = [&result](std::int8_t subtype)
-        {
-            result.set_subtype(static_cast<std::uint8_t>(subtype));
-            return true;
-        };
-
-        switch (current)
-        {
-            case 0xC4: // bin 8
-            {
-                std::uint8_t len{};
-                return get_number(input_format_t::msgpack, len) &&
-                       get_binary(input_format_t::msgpack, len, result);
-            }
-
-            case 0xC5: // bin 16
-            {
-                std::uint16_t len{};
-                return get_number(input_format_t::msgpack, len) &&
-                       get_binary(input_format_t::msgpack, len, result);
-            }
-
-            case 0xC6: // bin 32
-            {
-                std::uint32_t len{};
-                return get_number(input_format_t::msgpack, len) &&
-                       get_binary(input_format_t::msgpack, len, result);
-            }
-
-            case 0xC7: // ext 8
-            {
-                std::uint8_t len{};
-                std::int8_t subtype{};
-                return get_number(input_format_t::msgpack, len) &&
-                       get_number(input_format_t::msgpack, subtype) &&
-                       get_binary(input_format_t::msgpack, len, result) &&
-                       assign_and_return_true(subtype);
-            }
-
-            case 0xC8: // ext 16
-            {
-                std::uint16_t len{};
-                std::int8_t subtype{};
-                return get_number(input_format_t::msgpack, len) &&
-                       get_number(input_format_t::msgpack, subtype) &&
-                       get_binary(input_format_t::msgpack, len, result) &&
-                       assign_and_return_true(subtype);
-            }
-
-            case 0xC9: // ext 32
-            {
-                std::uint32_t len{};
-                std::int8_t subtype{};
-                return get_number(input_format_t::msgpack, len) &&
-                       get_number(input_format_t::msgpack, subtype) &&
-                       get_binary(input_format_t::msgpack, len, result) &&
-                       assign_and_return_true(subtype);
-            }
-
-            case 0xD4: // fixext 1
-            {
-                std::int8_t subtype{};
-                return get_number(input_format_t::msgpack, subtype) &&
-                       get_binary(input_format_t::msgpack, 1, result) &&
-                       assign_and_return_true(subtype);
-            }
-
-            case 0xD5: // fixext 2
-            {
-                std::int8_t subtype{};
-                return get_number(input_format_t::msgpack, subtype) &&
-                       get_binary(input_format_t::msgpack, 2, result) &&
-                       assign_and_return_true(subtype);
-            }
-
-            case 0xD6: // fixext 4
-            {
-                std::int8_t subtype{};
-                return get_number(input_format_t::msgpack, subtype) &&
-                       get_binary(input_format_t::msgpack, 4, result) &&
-                       assign_and_return_true(subtype);
-            }
-
-            case 0xD7: // fixext 8
-            {
-                std::int8_t subtype{};
-                return get_number(input_format_t::msgpack, subtype) &&
-                       get_binary(input_format_t::msgpack, 8, result) &&
-                       assign_and_return_true(subtype);
-            }
-
-            case 0xD8: // fixext 16
-            {
-                std::int8_t subtype{};
-                return get_number(input_format_t::msgpack, subtype) &&
-                       get_binary(input_format_t::msgpack, 16, result) &&
-                       assign_and_return_true(subtype);
-            }
-
-            default:           // LCOV_EXCL_LINE
-                return false;  // LCOV_EXCL_LINE
-        }
-    }
-
-    /*!
-    @param[in] len  the length of the array
-    @return whether array creation completed
-    */
-    bool get_msgpack_array(const std::size_t len)
-    {
-        if (JSON_HEDLEY_UNLIKELY(!sax->start_array(len)))
-        {
-            return false;
-        }
-
-        for (std::size_t i = 0; i < len; ++i)
-        {
-            if (JSON_HEDLEY_UNLIKELY(!parse_msgpack_internal()))
-            {
-                return false;
-            }
-        }
-
-        return sax->end_array();
-    }
-
-    /*!
-    @param[in] len  the length of the object
-    @return whether object creation completed
-    */
-    bool get_msgpack_object(const std::size_t len)
-    {
-        if (JSON_HEDLEY_UNLIKELY(!sax->start_object(len)))
-        {
-            return false;
-        }
-
-        string_t key;
-        for (std::size_t i = 0; i < len; ++i)
-        {
-            get();
-            if (JSON_HEDLEY_UNLIKELY(!get_msgpack_string(key) || !sax->key(key)))
-            {
-                return false;
-            }
-
-            if (JSON_HEDLEY_UNLIKELY(!parse_msgpack_internal()))
-            {
-                return false;
-            }
-            key.clear();
-        }
-
-        return sax->end_object();
-    }
-
-    ////////////
-    // UBJSON //
-    ////////////
-
-    /*!
-    @param[in] get_char  whether a new character should be retrieved from the
-                         input (true, default) or whether the last read
-                         character should be considered instead
-
-    @return whether a valid UBJSON value was passed to the SAX parser
-    */
-    bool parse_ubjson_internal(const bool get_char = true)
-    {
-        return get_ubjson_value(get_char ? get_ignore_noop() : current);
-    }
-
-    /*!
-    @brief reads a UBJSON string
-
-    This function is either called after reading the 'S' byte explicitly
-    indicating a string, or in case of an object key where the 'S' byte can be
-    left out.
-
-    @param[out] result   created string
-    @param[in] get_char  whether a new character should be retrieved from the
-                         input (true, default) or whether the last read
-                         character should be considered instead
-
-    @return whether string creation completed
-    */
-    bool get_ubjson_string(string_t& result, const bool get_char = true)
-    {
-        if (get_char)
-        {
-            get();  // TODO(niels): may we ignore N here?
-        }
-
-        if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::ubjson, "value")))
-        {
-            return false;
-        }
-
-        switch (current)
-        {
-            case 'U':
-            {
-                std::uint8_t len{};
-                return get_number(input_format_t::ubjson, len) && get_string(input_format_t::ubjson, len, result);
-            }
-
-            case 'i':
-            {
-                std::int8_t len{};
-                return get_number(input_format_t::ubjson, len) && get_string(input_format_t::ubjson, len, result);
-            }
-
-            case 'I':
-            {
-                std::int16_t len{};
-                return get_number(input_format_t::ubjson, len) && get_string(input_format_t::ubjson, len, result);
-            }
-
-            case 'l':
-            {
-                std::int32_t len{};
-                return get_number(input_format_t::ubjson, len) && get_string(input_format_t::ubjson, len, result);
-            }
-
-            case 'L':
-            {
-                std::int64_t len{};
-                return get_number(input_format_t::ubjson, len) && get_string(input_format_t::ubjson, len, result);
-            }
-
-            default:
-                auto last_token = get_token_string();
-                return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format_t::ubjson, "expected length type specification (U, i, I, l, L); last byte: 0x" + last_token, "string"), BasicJsonType()));
-        }
-    }
-
-    /*!
-    @param[out] result  determined size
-    @return whether size determination completed
-    */
-    bool get_ubjson_size_value(std::size_t& result)
-    {
-        switch (get_ignore_noop())
-        {
-            case 'U':
-            {
-                std::uint8_t number{};
-                if (JSON_HEDLEY_UNLIKELY(!get_number(input_format_t::ubjson, number)))
-                {
-                    return false;
-                }
-                result = static_cast<std::size_t>(number);
-                return true;
-            }
-
-            case 'i':
-            {
-                std::int8_t number{};
-                if (JSON_HEDLEY_UNLIKELY(!get_number(input_format_t::ubjson, number)))
-                {
-                    return false;
-                }
-                result = static_cast<std::size_t>(number); // NOLINT(bugprone-signed-char-misuse,cert-str34-c): number is not a char
-                return true;
-            }
-
-            case 'I':
-            {
-                std::int16_t number{};
-                if (JSON_HEDLEY_UNLIKELY(!get_number(input_format_t::ubjson, number)))
-                {
-                    return false;
-                }
-                result = static_cast<std::size_t>(number);
-                return true;
-            }
-
-            case 'l':
-            {
-                std::int32_t number{};
-                if (JSON_HEDLEY_UNLIKELY(!get_number(input_format_t::ubjson, number)))
-                {
-                    return false;
-                }
-                result = static_cast<std::size_t>(number);
-                return true;
-            }
-
-            case 'L':
-            {
-                std::int64_t number{};
-                if (JSON_HEDLEY_UNLIKELY(!get_number(input_format_t::ubjson, number)))
-                {
-                    return false;
-                }
-                result = static_cast<std::size_t>(number);
-                return true;
-            }
-
-            default:
-            {
-                auto last_token = get_token_string();
-                return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format_t::ubjson, "expected length type specification (U, i, I, l, L) after '#'; last byte: 0x" + last_token, "size"), BasicJsonType()));
-            }
-        }
-    }
-
-    /*!
-    @brief determine the type and size for a container
-
-    In the optimized UBJSON format, a type and a size can be provided to allow
-    for a more compact representation.
-
-    @param[out] result  pair of the size and the type
-
-    @return whether pair creation completed
-    */
-    bool get_ubjson_size_type(std::pair<std::size_t, char_int_type>& result)
-    {
-        result.first = string_t::npos; // size
-        result.second = 0; // type
-
-        get_ignore_noop();
-
-        if (current == '$')
-        {
-            result.second = get();  // must not ignore 'N', because 'N' maybe the type
-            if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::ubjson, "type")))
-            {
-                return false;
-            }
-
-            get_ignore_noop();
-            if (JSON_HEDLEY_UNLIKELY(current != '#'))
-            {
-                if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::ubjson, "value")))
-                {
-                    return false;
-                }
-                auto last_token = get_token_string();
-                return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format_t::ubjson, "expected '#' after type information; last byte: 0x" + last_token, "size"), BasicJsonType()));
-            }
-
-            return get_ubjson_size_value(result.first);
-        }
-
-        if (current == '#')
-        {
-            return get_ubjson_size_value(result.first);
-        }
-
-        return true;
-    }
-
-    /*!
-    @param prefix  the previously read or set type prefix
-    @return whether value creation completed
-    */
-    bool get_ubjson_value(const char_int_type prefix)
-    {
-        switch (prefix)
-        {
-            case std::char_traits<char_type>::eof():  // EOF
-                return unexpect_eof(input_format_t::ubjson, "value");
-
-            case 'T':  // true
-                return sax->boolean(true);
-            case 'F':  // false
-                return sax->boolean(false);
-
-            case 'Z':  // null
-                return sax->null();
-
-            case 'U':
-            {
-                std::uint8_t number{};
-                return get_number(input_format_t::ubjson, number) && sax->number_unsigned(number);
-            }
-
-            case 'i':
-            {
-                std::int8_t number{};
-                return get_number(input_format_t::ubjson, number) && sax->number_integer(number);
-            }
-
-            case 'I':
-            {
-                std::int16_t number{};
-                return get_number(input_format_t::ubjson, number) && sax->number_integer(number);
-            }
-
-            case 'l':
-            {
-                std::int32_t number{};
-                return get_number(input_format_t::ubjson, number) && sax->number_integer(number);
-            }
-
-            case 'L':
-            {
-                std::int64_t number{};
-                return get_number(input_format_t::ubjson, number) && sax->number_integer(number);
-            }
-
-            case 'd':
-            {
-                float number{};
-                return get_number(input_format_t::ubjson, number) && sax->number_float(static_cast<number_float_t>(number), "");
-            }
-
-            case 'D':
-            {
-                double number{};
-                return get_number(input_format_t::ubjson, number) && sax->number_float(static_cast<number_float_t>(number), "");
-            }
-
-            case 'H':
-            {
-                return get_ubjson_high_precision_number();
-            }
-
-            case 'C':  // char
-            {
-                get();
-                if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::ubjson, "char")))
-                {
-                    return false;
-                }
-                if (JSON_HEDLEY_UNLIKELY(current > 127))
-                {
-                    auto last_token = get_token_string();
-                    return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format_t::ubjson, "byte after 'C' must be in range 0x00..0x7F; last byte: 0x" + last_token, "char"), BasicJsonType()));
-                }
-                string_t s(1, static_cast<typename string_t::value_type>(current));
-                return sax->string(s);
-            }
-
-            case 'S':  // string
-            {
-                string_t s;
-                return get_ubjson_string(s) && sax->string(s);
-            }
-
-            case '[':  // array
-                return get_ubjson_array();
-
-            case '{':  // object
-                return get_ubjson_object();
-
-            default: // anything else
-            {
-                auto last_token = get_token_string();
-                return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format_t::ubjson, "invalid byte: 0x" + last_token, "value"), BasicJsonType()));
-            }
-        }
-    }
-
-    /*!
-    @return whether array creation completed
-    */
-    bool get_ubjson_array()
-    {
-        std::pair<std::size_t, char_int_type> size_and_type;
-        if (JSON_HEDLEY_UNLIKELY(!get_ubjson_size_type(size_and_type)))
-        {
-            return false;
-        }
-
-        if (size_and_type.first != string_t::npos)
-        {
-            if (JSON_HEDLEY_UNLIKELY(!sax->start_array(size_and_type.first)))
-            {
-                return false;
-            }
-
-            if (size_and_type.second != 0)
-            {
-                if (size_and_type.second != 'N')
-                {
-                    for (std::size_t i = 0; i < size_and_type.first; ++i)
-                    {
-                        if (JSON_HEDLEY_UNLIKELY(!get_ubjson_value(size_and_type.second)))
-                        {
-                            return false;
-                        }
-                    }
-                }
-            }
-            else
-            {
-                for (std::size_t i = 0; i < size_and_type.first; ++i)
-                {
-                    if (JSON_HEDLEY_UNLIKELY(!parse_ubjson_internal()))
-                    {
-                        return false;
-                    }
-                }
-            }
-        }
-        else
-        {
-            if (JSON_HEDLEY_UNLIKELY(!sax->start_array(static_cast<std::size_t>(-1))))
-            {
-                return false;
-            }
-
-            while (current != ']')
-            {
-                if (JSON_HEDLEY_UNLIKELY(!parse_ubjson_internal(false)))
-                {
-                    return false;
-                }
-                get_ignore_noop();
-            }
-        }
-
-        return sax->end_array();
-    }
-
-    /*!
-    @return whether object creation completed
-    */
-    bool get_ubjson_object()
-    {
-        std::pair<std::size_t, char_int_type> size_and_type;
-        if (JSON_HEDLEY_UNLIKELY(!get_ubjson_size_type(size_and_type)))
-        {
-            return false;
-        }
-
-        string_t key;
-        if (size_and_type.first != string_t::npos)
-        {
-            if (JSON_HEDLEY_UNLIKELY(!sax->start_object(size_and_type.first)))
-            {
-                return false;
-            }
-
-            if (size_and_type.second != 0)
-            {
-                for (std::size_t i = 0; i < size_and_type.first; ++i)
-                {
-                    if (JSON_HEDLEY_UNLIKELY(!get_ubjson_string(key) || !sax->key(key)))
-                    {
-                        return false;
-                    }
-                    if (JSON_HEDLEY_UNLIKELY(!get_ubjson_value(size_and_type.second)))
-                    {
-                        return false;
-                    }
-                    key.clear();
-                }
-            }
-            else
-            {
-                for (std::size_t i = 0; i < size_and_type.first; ++i)
-                {
-                    if (JSON_HEDLEY_UNLIKELY(!get_ubjson_string(key) || !sax->key(key)))
-                    {
-                        return false;
-                    }
-                    if (JSON_HEDLEY_UNLIKELY(!parse_ubjson_internal()))
-                    {
-                        return false;
-                    }
-                    key.clear();
-                }
-            }
-        }
-        else
-        {
-            if (JSON_HEDLEY_UNLIKELY(!sax->start_object(static_cast<std::size_t>(-1))))
-            {
-                return false;
-            }
-
-            while (current != '}')
-            {
-                if (JSON_HEDLEY_UNLIKELY(!get_ubjson_string(key, false) || !sax->key(key)))
-                {
-                    return false;
-                }
-                if (JSON_HEDLEY_UNLIKELY(!parse_ubjson_internal()))
-                {
-                    return false;
-                }
-                get_ignore_noop();
-                key.clear();
-            }
-        }
-
-        return sax->end_object();
-    }
-
-    // Note, no reader for UBJSON binary types is implemented because they do
-    // not exist
-
-    bool get_ubjson_high_precision_number()
-    {
-        // get size of following number string
-        std::size_t size{};
-        auto res = get_ubjson_size_value(size);
-        if (JSON_HEDLEY_UNLIKELY(!res))
-        {
-            return res;
-        }
-
-        // get number string
-        std::vector<char> number_vector;
-        for (std::size_t i = 0; i < size; ++i)
-        {
-            get();
-            if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::ubjson, "number")))
-            {
-                return false;
-            }
-            number_vector.push_back(static_cast<char>(current));
-        }
-
-        // parse number string
-        using ia_type = decltype(detail::input_adapter(number_vector));
-        auto number_lexer = detail::lexer<BasicJsonType, ia_type>(detail::input_adapter(number_vector), false);
-        const auto result_number = number_lexer.scan();
-        const auto number_string = number_lexer.get_token_string();
-        const auto result_remainder = number_lexer.scan();
-
-        using token_type = typename detail::lexer_base<BasicJsonType>::token_type;
-
-        if (JSON_HEDLEY_UNLIKELY(result_remainder != token_type::end_of_input))
-        {
-            return sax->parse_error(chars_read, number_string, parse_error::create(115, chars_read, exception_message(input_format_t::ubjson, "invalid number text: " + number_lexer.get_token_string(), "high-precision number"), BasicJsonType()));
-        }
-
-        switch (result_number)
-        {
-            case token_type::value_integer:
-                return sax->number_integer(number_lexer.get_number_integer());
-            case token_type::value_unsigned:
-                return sax->number_unsigned(number_lexer.get_number_unsigned());
-            case token_type::value_float:
-                return sax->number_float(number_lexer.get_number_float(), std::move(number_string));
-            case token_type::uninitialized:
-            case token_type::literal_true:
-            case token_type::literal_false:
-            case token_type::literal_null:
-            case token_type::value_string:
-            case token_type::begin_array:
-            case token_type::begin_object:
-            case token_type::end_array:
-            case token_type::end_object:
-            case token_type::name_separator:
-            case token_type::value_separator:
-            case token_type::parse_error:
-            case token_type::end_of_input:
-            case token_type::literal_or_value:
-            default:
-                return sax->parse_error(chars_read, number_string, parse_error::create(115, chars_read, exception_message(input_format_t::ubjson, "invalid number text: " + number_lexer.get_token_string(), "high-precision number"), BasicJsonType()));
-        }
-    }
-
-    ///////////////////////
-    // Utility functions //
-    ///////////////////////
-
-    /*!
-    @brief get next character from the input
-
-    This function provides the interface to the used input adapter. It does
-    not throw in case the input reached EOF, but returns a -'ve valued
-    `std::char_traits<char_type>::eof()` in that case.
-
-    @return character read from the input
-    */
-    char_int_type get()
-    {
-        ++chars_read;
-        return current = ia.get_character();
-    }
-
-    /*!
-    @return character read from the input after ignoring all 'N' entries
-    */
-    char_int_type get_ignore_noop()
-    {
-        do
-        {
-            get();
-        }
-        while (current == 'N');
-
-        return current;
-    }
-
-    /*
-    @brief read a number from the input
-
-    @tparam NumberType the type of the number
-    @param[in] format   the current format (for diagnostics)
-    @param[out] result  number of type @a NumberType
-
-    @return whether conversion completed
-
-    @note This function needs to respect the system's endianness, because
-          bytes in CBOR, MessagePack, and UBJSON are stored in network order
-          (big endian) and therefore need reordering on little endian systems.
-    */
-    template<typename NumberType, bool InputIsLittleEndian = false>
-    bool get_number(const input_format_t format, NumberType& result)
-    {
-        // step 1: read input into array with system's byte order
-        std::array<std::uint8_t, sizeof(NumberType)> vec{};
-        for (std::size_t i = 0; i < sizeof(NumberType); ++i)
-        {
-            get();
-            if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(format, "number")))
-            {
-                return false;
-            }
-
-            // reverse byte order prior to conversion if necessary
-            if (is_little_endian != InputIsLittleEndian)
-            {
-                vec[sizeof(NumberType) - i - 1] = static_cast<std::uint8_t>(current);
-            }
-            else
-            {
-                vec[i] = static_cast<std::uint8_t>(current); // LCOV_EXCL_LINE
-            }
-        }
-
-        // step 2: convert array into number of type T and return
-        std::memcpy(&result, vec.data(), sizeof(NumberType));
-        return true;
-    }
-
-    /*!
-    @brief create a string by reading characters from the input
-
-    @tparam NumberType the type of the number
-    @param[in] format the current format (for diagnostics)
-    @param[in] len number of characters to read
-    @param[out] result string created by reading @a len bytes
-
-    @return whether string creation completed
-
-    @note We can not reserve @a len bytes for the result, because @a len
-          may be too large. Usually, @ref unexpect_eof() detects the end of
-          the input before we run out of string memory.
-    */
-    template<typename NumberType>
-    bool get_string(const input_format_t format,
-                    const NumberType len,
-                    string_t& result)
-    {
-        bool success = true;
-        for (NumberType i = 0; i < len; i++)
-        {
-            get();
-            if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(format, "string")))
-            {
-                success = false;
-                break;
-            }
-            result.push_back(static_cast<typename string_t::value_type>(current));
-        }
-        return success;
-    }
-
-    /*!
-    @brief create a byte array by reading bytes from the input
-
-    @tparam NumberType the type of the number
-    @param[in] format the current format (for diagnostics)
-    @param[in] len number of bytes to read
-    @param[out] result byte array created by reading @a len bytes
-
-    @return whether byte array creation completed
-
-    @note We can not reserve @a len bytes for the result, because @a len
-          may be too large. Usually, @ref unexpect_eof() detects the end of
-          the input before we run out of memory.
-    */
-    template<typename NumberType>
-    bool get_binary(const input_format_t format,
-                    const NumberType len,
-                    binary_t& result)
-    {
-        bool success = true;
-        for (NumberType i = 0; i < len; i++)
-        {
-            get();
-            if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(format, "binary")))
-            {
-                success = false;
-                break;
-            }
-            result.push_back(static_cast<std::uint8_t>(current));
-        }
-        return success;
-    }
-
-    /*!
-    @param[in] format   the current format (for diagnostics)
-    @param[in] context  further context information (for diagnostics)
-    @return whether the last read character is not EOF
-    */
-    JSON_HEDLEY_NON_NULL(3)
-    bool unexpect_eof(const input_format_t format, const char* context) const
-    {
-        if (JSON_HEDLEY_UNLIKELY(current == std::char_traits<char_type>::eof()))
-        {
-            return sax->parse_error(chars_read, "<end of file>",
-                                    parse_error::create(110, chars_read, exception_message(format, "unexpected end of input", context), BasicJsonType()));
-        }
-        return true;
-    }
-
-    /*!
-    @return a string representation of the last read byte
-    */
-    std::string get_token_string() const
-    {
-        std::array<char, 3> cr{{}};
-        static_cast<void>((std::snprintf)(cr.data(), cr.size(), "%.2hhX", static_cast<unsigned char>(current))); // NOLINT(cppcoreguidelines-pro-type-vararg,hicpp-vararg)
-        return std::string{cr.data()};
-    }
-
-    /*!
-    @param[in] format   the current format
-    @param[in] detail   a detailed error message
-    @param[in] context  further context information
-    @return a message string to use in the parse_error exceptions
-    */
-    std::string exception_message(const input_format_t format,
-                                  const std::string& detail,
-                                  const std::string& context) const
-    {
-        std::string error_msg = "syntax error while parsing ";
-
-        switch (format)
-        {
-            case input_format_t::cbor:
-                error_msg += "CBOR";
-                break;
-
-            case input_format_t::msgpack:
-                error_msg += "MessagePack";
-                break;
-
-            case input_format_t::ubjson:
-                error_msg += "UBJSON";
-                break;
-
-            case input_format_t::bson:
-                error_msg += "BSON";
-                break;
-
-            case input_format_t::json: // LCOV_EXCL_LINE
-            default:            // LCOV_EXCL_LINE
-                JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
-        }
-
-        return error_msg + " " + context + ": " + detail;
-    }
-
-  private:
-    /// input adapter
-    InputAdapterType ia;
-
-    /// the current character
-    char_int_type current = std::char_traits<char_type>::eof();
-
-    /// the number of characters read
-    std::size_t chars_read = 0;
-
-    /// whether we can assume little endianness
-    const bool is_little_endian = little_endianness();
-
-    /// the SAX parser
-    json_sax_t* sax = nullptr;
-};
-}  // namespace detail
-}  // namespace nlohmann
-
-// #include <nlohmann/detail/input/input_adapters.hpp>
-
-// #include <nlohmann/detail/input/lexer.hpp>
-
-// #include <nlohmann/detail/input/parser.hpp>
-
-
-#include <cmath> // isfinite
-#include <cstdint> // uint8_t
-#include <functional> // function
-#include <string> // string
-#include <utility> // move
-#include <vector> // vector
-
-// #include <nlohmann/detail/exceptions.hpp>
-
-// #include <nlohmann/detail/input/input_adapters.hpp>
-
-// #include <nlohmann/detail/input/json_sax.hpp>
-
-// #include <nlohmann/detail/input/lexer.hpp>
-
-// #include <nlohmann/detail/macro_scope.hpp>
-
-// #include <nlohmann/detail/meta/is_sax.hpp>
-
-// #include <nlohmann/detail/value_t.hpp>
-
-
-namespace nlohmann
-{
-namespace detail
-{
-////////////
-// parser //
-////////////
-
-enum class parse_event_t : std::uint8_t
-{
-    /// the parser read `{` and started to process a JSON object
-    object_start,
-    /// the parser read `}` and finished processing a JSON object
-    object_end,
-    /// the parser read `[` and started to process a JSON array
-    array_start,
-    /// the parser read `]` and finished processing a JSON array
-    array_end,
-    /// the parser read a key of a value in an object
-    key,
-    /// the parser finished reading a JSON value
-    value
-};
-
-template<typename BasicJsonType>
-using parser_callback_t =
-    std::function<bool(int /*depth*/, parse_event_t /*event*/, BasicJsonType& /*parsed*/)>;
-
-/*!
-@brief syntax analysis
-
-This class implements a recursive descent parser.
-*/
-template<typename BasicJsonType, typename InputAdapterType>
-class parser
-{
-    using number_integer_t = typename BasicJsonType::number_integer_t;
-    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
-    using number_float_t = typename BasicJsonType::number_float_t;
-    using string_t = typename BasicJsonType::string_t;
-    using lexer_t = lexer<BasicJsonType, InputAdapterType>;
-    using token_type = typename lexer_t::token_type;
-
-  public:
-    /// a parser reading from an input adapter
-    explicit parser(InputAdapterType&& adapter,
-                    const parser_callback_t<BasicJsonType> cb = nullptr,
-                    const bool allow_exceptions_ = true,
-                    const bool skip_comments = false)
-        : callback(cb)
-        , m_lexer(std::move(adapter), skip_comments)
-        , allow_exceptions(allow_exceptions_)
-    {
-        // read first token
-        get_token();
-    }
-
-    /*!
-    @brief public parser interface
-
-    @param[in] strict      whether to expect the last token to be EOF
-    @param[in,out] result  parsed JSON value
-
-    @throw parse_error.101 in case of an unexpected token
-    @throw parse_error.102 if to_unicode fails or surrogate error
-    @throw parse_error.103 if to_unicode fails
-    */
-    void parse(const bool strict, BasicJsonType& result)
-    {
-        if (callback)
-        {
-            json_sax_dom_callback_parser<BasicJsonType> sdp(result, callback, allow_exceptions);
-            sax_parse_internal(&sdp);
-
-            // in strict mode, input must be completely read
-            if (strict && (get_token() != token_type::end_of_input))
-            {
-                sdp.parse_error(m_lexer.get_position(),
-                                m_lexer.get_token_string(),
-                                parse_error::create(101, m_lexer.get_position(),
-                                                    exception_message(token_type::end_of_input, "value"), BasicJsonType()));
-            }
-
-            // in case of an error, return discarded value
-            if (sdp.is_errored())
-            {
-                result = value_t::discarded;
-                return;
-            }
-
-            // set top-level value to null if it was discarded by the callback
-            // function
-            if (result.is_discarded())
-            {
-                result = nullptr;
-            }
-        }
-        else
-        {
-            json_sax_dom_parser<BasicJsonType> sdp(result, allow_exceptions);
-            sax_parse_internal(&sdp);
-
-            // in strict mode, input must be completely read
-            if (strict && (get_token() != token_type::end_of_input))
-            {
-                sdp.parse_error(m_lexer.get_position(),
-                                m_lexer.get_token_string(),
-                                parse_error::create(101, m_lexer.get_position(), exception_message(token_type::end_of_input, "value"), BasicJsonType()));
-            }
-
-            // in case of an error, return discarded value
-            if (sdp.is_errored())
-            {
-                result = value_t::discarded;
-                return;
-            }
-        }
-
-        result.assert_invariant();
-    }
-
-    /*!
-    @brief public accept interface
-
-    @param[in] strict  whether to expect the last token to be EOF
-    @return whether the input is a proper JSON text
-    */
-    bool accept(const bool strict = true)
-    {
-        json_sax_acceptor<BasicJsonType> sax_acceptor;
-        return sax_parse(&sax_acceptor, strict);
-    }
-
-    template<typename SAX>
-    JSON_HEDLEY_NON_NULL(2)
-    bool sax_parse(SAX* sax, const bool strict = true)
-    {
-        (void)detail::is_sax_static_asserts<SAX, BasicJsonType> {};
-        const bool result = sax_parse_internal(sax);
-
-        // strict mode: next byte must be EOF
-        if (result && strict && (get_token() != token_type::end_of_input))
-        {
-            return sax->parse_error(m_lexer.get_position(),
-                                    m_lexer.get_token_string(),
-                                    parse_error::create(101, m_lexer.get_position(), exception_message(token_type::end_of_input, "value"), BasicJsonType()));
-        }
-
-        return result;
-    }
-
-  private:
-    template<typename SAX>
-    JSON_HEDLEY_NON_NULL(2)
-    bool sax_parse_internal(SAX* sax)
-    {
-        // stack to remember the hierarchy of structured values we are parsing
-        // true = array; false = object
-        std::vector<bool> states;
-        // value to avoid a goto (see comment where set to true)
-        bool skip_to_state_evaluation = false;
-
-        while (true)
-        {
-            if (!skip_to_state_evaluation)
-            {
-                // invariant: get_token() was called before each iteration
-                switch (last_token)
-                {
-                    case token_type::begin_object:
-                    {
-                        if (JSON_HEDLEY_UNLIKELY(!sax->start_object(static_cast<std::size_t>(-1))))
-                        {
-                            return false;
-                        }
-
-                        // closing } -> we are done
-                        if (get_token() == token_type::end_object)
-                        {
-                            if (JSON_HEDLEY_UNLIKELY(!sax->end_object()))
-                            {
-                                return false;
-                            }
-                            break;
-                        }
-
-                        // parse key
-                        if (JSON_HEDLEY_UNLIKELY(last_token != token_type::value_string))
-                        {
-                            return sax->parse_error(m_lexer.get_position(),
-                                                    m_lexer.get_token_string(),
-                                                    parse_error::create(101, m_lexer.get_position(), exception_message(token_type::value_string, "object key"), BasicJsonType()));
-                        }
-                        if (JSON_HEDLEY_UNLIKELY(!sax->key(m_lexer.get_string())))
-                        {
-                            return false;
-                        }
-
-                        // parse separator (:)
-                        if (JSON_HEDLEY_UNLIKELY(get_token() != token_type::name_separator))
-                        {
-                            return sax->parse_error(m_lexer.get_position(),
-                                                    m_lexer.get_token_string(),
-                                                    parse_error::create(101, m_lexer.get_position(), exception_message(token_type::name_separator, "object separator"), BasicJsonType()));
-                        }
-
-                        // remember we are now inside an object
-                        states.push_back(false);
-
-                        // parse values
-                        get_token();
-                        continue;
-                    }
-
-                    case token_type::begin_array:
-                    {
-                        if (JSON_HEDLEY_UNLIKELY(!sax->start_array(static_cast<std::size_t>(-1))))
-                        {
-                            return false;
-                        }
-
-                        // closing ] -> we are done
-                        if (get_token() == token_type::end_array)
-                        {
-                            if (JSON_HEDLEY_UNLIKELY(!sax->end_array()))
-                            {
-                                return false;
-                            }
-                            break;
-                        }
-
-                        // remember we are now inside an array
-                        states.push_back(true);
-
-                        // parse values (no need to call get_token)
-                        continue;
-                    }
-
-                    case token_type::value_float:
-                    {
-                        const auto res = m_lexer.get_number_float();
-
-                        if (JSON_HEDLEY_UNLIKELY(!std::isfinite(res)))
-                        {
-                            return sax->parse_error(m_lexer.get_position(),
-                                                    m_lexer.get_token_string(),
-                                                    out_of_range::create(406, "number overflow parsing '" + m_lexer.get_token_string() + "'", BasicJsonType()));
-                        }
-
-                        if (JSON_HEDLEY_UNLIKELY(!sax->number_float(res, m_lexer.get_string())))
-                        {
-                            return false;
-                        }
-
-                        break;
-                    }
-
-                    case token_type::literal_false:
-                    {
-                        if (JSON_HEDLEY_UNLIKELY(!sax->boolean(false)))
-                        {
-                            return false;
-                        }
-                        break;
-                    }
-
-                    case token_type::literal_null:
-                    {
-                        if (JSON_HEDLEY_UNLIKELY(!sax->null()))
-                        {
-                            return false;
-                        }
-                        break;
-                    }
-
-                    case token_type::literal_true:
-                    {
-                        if (JSON_HEDLEY_UNLIKELY(!sax->boolean(true)))
-                        {
-                            return false;
-                        }
-                        break;
-                    }
-
-                    case token_type::value_integer:
-                    {
-                        if (JSON_HEDLEY_UNLIKELY(!sax->number_integer(m_lexer.get_number_integer())))
-                        {
-                            return false;
-                        }
-                        break;
-                    }
-
-                    case token_type::value_string:
-                    {
-                        if (JSON_HEDLEY_UNLIKELY(!sax->string(m_lexer.get_string())))
-                        {
-                            return false;
-                        }
-                        break;
-                    }
-
-                    case token_type::value_unsigned:
-                    {
-                        if (JSON_HEDLEY_UNLIKELY(!sax->number_unsigned(m_lexer.get_number_unsigned())))
-                        {
-                            return false;
-                        }
-                        break;
-                    }
-
-                    case token_type::parse_error:
-                    {
-                        // using "uninitialized" to avoid "expected" message
-                        return sax->parse_error(m_lexer.get_position(),
-                                                m_lexer.get_token_string(),
-                                                parse_error::create(101, m_lexer.get_position(), exception_message(token_type::uninitialized, "value"), BasicJsonType()));
-                    }
-
-                    case token_type::uninitialized:
-                    case token_type::end_array:
-                    case token_type::end_object:
-                    case token_type::name_separator:
-                    case token_type::value_separator:
-                    case token_type::end_of_input:
-                    case token_type::literal_or_value:
-                    default: // the last token was unexpected
-                    {
-                        return sax->parse_error(m_lexer.get_position(),
-                                                m_lexer.get_token_string(),
-                                                parse_error::create(101, m_lexer.get_position(), exception_message(token_type::literal_or_value, "value"), BasicJsonType()));
-                    }
-                }
-            }
-            else
-            {
-                skip_to_state_evaluation = false;
-            }
-
-            // we reached this line after we successfully parsed a value
-            if (states.empty())
-            {
-                // empty stack: we reached the end of the hierarchy: done
-                return true;
-            }
-
-            if (states.back())  // array
-            {
-                // comma -> next value
-                if (get_token() == token_type::value_separator)
-                {
-                    // parse a new value
-                    get_token();
-                    continue;
-                }
-
-                // closing ]
-                if (JSON_HEDLEY_LIKELY(last_token == token_type::end_array))
-                {
-                    if (JSON_HEDLEY_UNLIKELY(!sax->end_array()))
-                    {
-                        return false;
-                    }
-
-                    // We are done with this array. Before we can parse a
-                    // new value, we need to evaluate the new state first.
-                    // By setting skip_to_state_evaluation to false, we
-                    // are effectively jumping to the beginning of this if.
-                    JSON_ASSERT(!states.empty());
-                    states.pop_back();
-                    skip_to_state_evaluation = true;
-                    continue;
-                }
-
-                return sax->parse_error(m_lexer.get_position(),
-                                        m_lexer.get_token_string(),
-                                        parse_error::create(101, m_lexer.get_position(), exception_message(token_type::end_array, "array"), BasicJsonType()));
-            }
-
-            // states.back() is false -> object
-
-            // comma -> next value
-            if (get_token() == token_type::value_separator)
-            {
-                // parse key
-                if (JSON_HEDLEY_UNLIKELY(get_token() != token_type::value_string))
-                {
-                    return sax->parse_error(m_lexer.get_position(),
-                                            m_lexer.get_token_string(),
-                                            parse_error::create(101, m_lexer.get_position(), exception_message(token_type::value_string, "object key"), BasicJsonType()));
-                }
-
-                if (JSON_HEDLEY_UNLIKELY(!sax->key(m_lexer.get_string())))
-                {
-                    return false;
-                }
-
-                // parse separator (:)
-                if (JSON_HEDLEY_UNLIKELY(get_token() != token_type::name_separator))
-                {
-                    return sax->parse_error(m_lexer.get_position(),
-                                            m_lexer.get_token_string(),
-                                            parse_error::create(101, m_lexer.get_position(), exception_message(token_type::name_separator, "object separator"), BasicJsonType()));
-                }
-
-                // parse values
-                get_token();
-                continue;
-            }
-
-            // closing }
-            if (JSON_HEDLEY_LIKELY(last_token == token_type::end_object))
-            {
-                if (JSON_HEDLEY_UNLIKELY(!sax->end_object()))
-                {
-                    return false;
-                }
-
-                // We are done with this object. Before we can parse a
-                // new value, we need to evaluate the new state first.
-                // By setting skip_to_state_evaluation to false, we
-                // are effectively jumping to the beginning of this if.
-                JSON_ASSERT(!states.empty());
-                states.pop_back();
-                skip_to_state_evaluation = true;
-                continue;
-            }
-
-            return sax->parse_error(m_lexer.get_position(),
-                                    m_lexer.get_token_string(),
-                                    parse_error::create(101, m_lexer.get_position(), exception_message(token_type::end_object, "object"), BasicJsonType()));
-        }
-    }
-
-    /// get next token from lexer
-    token_type get_token()
-    {
-        return last_token = m_lexer.scan();
-    }
-
-    std::string exception_message(const token_type expected, const std::string& context)
-    {
-        std::string error_msg = "syntax error ";
-
-        if (!context.empty())
-        {
-            error_msg += "while parsing " + context + " ";
-        }
-
-        error_msg += "- ";
-
-        if (last_token == token_type::parse_error)
-        {
-            error_msg += std::string(m_lexer.get_error_message()) + "; last read: '" +
-                         m_lexer.get_token_string() + "'";
-        }
-        else
-        {
-            error_msg += "unexpected " + std::string(lexer_t::token_type_name(last_token));
-        }
-
-        if (expected != token_type::uninitialized)
-        {
-            error_msg += "; expected " + std::string(lexer_t::token_type_name(expected));
-        }
-
-        return error_msg;
-    }
-
-  private:
-    /// callback function
-    const parser_callback_t<BasicJsonType> callback = nullptr;
-    /// the type of the last read token
-    token_type last_token = token_type::uninitialized;
-    /// the lexer
-    lexer_t m_lexer;
-    /// whether to throw exceptions in case of errors
-    const bool allow_exceptions = true;
-};
-
-}  // namespace detail
-}  // namespace nlohmann
-
-// #include <nlohmann/detail/iterators/internal_iterator.hpp>
-
-
-// #include <nlohmann/detail/iterators/primitive_iterator.hpp>
-
-
-#include <cstddef> // ptrdiff_t
-#include <limits>  // numeric_limits
-
-// #include <nlohmann/detail/macro_scope.hpp>
-
-
-namespace nlohmann
-{
-namespace detail
-{
-/*
-@brief an iterator for primitive JSON types
-
-This class models an iterator for primitive JSON types (boolean, number,
-string). It's only purpose is to allow the iterator/const_iterator classes
-to "iterate" over primitive values. Internally, the iterator is modeled by
-a `difference_type` variable. Value begin_value (`0`) models the begin,
-end_value (`1`) models past the end.
-*/
-class primitive_iterator_t
-{
-  private:
-    using difference_type = std::ptrdiff_t;
-    static constexpr difference_type begin_value = 0;
-    static constexpr difference_type end_value = begin_value + 1;
-
-  JSON_PRIVATE_UNLESS_TESTED:
-    /// iterator as signed integer type
-    difference_type m_it = (std::numeric_limits<std::ptrdiff_t>::min)();
-
-  public:
-    constexpr difference_type get_value() const noexcept
-    {
-        return m_it;
-    }
-
-    /// set iterator to a defined beginning
-    void set_begin() noexcept
-    {
-        m_it = begin_value;
-    }
-
-    /// set iterator to a defined past the end
-    void set_end() noexcept
-    {
-        m_it = end_value;
-    }
-
-    /// return whether the iterator can be dereferenced
-    constexpr bool is_begin() const noexcept
-    {
-        return m_it == begin_value;
-    }
-
-    /// return whether the iterator is at end
-    constexpr bool is_end() const noexcept
-    {
-        return m_it == end_value;
-    }
-
-    friend constexpr bool operator==(primitive_iterator_t lhs, primitive_iterator_t rhs) noexcept
-    {
-        return lhs.m_it == rhs.m_it;
-    }
-
-    friend constexpr bool operator<(primitive_iterator_t lhs, primitive_iterator_t rhs) noexcept
-    {
-        return lhs.m_it < rhs.m_it;
-    }
-
-    primitive_iterator_t operator+(difference_type n) noexcept
-    {
-        auto result = *this;
-        result += n;
-        return result;
-    }
-
-    friend constexpr difference_type operator-(primitive_iterator_t lhs, primitive_iterator_t rhs) noexcept
-    {
-        return lhs.m_it - rhs.m_it;
-    }
-
-    primitive_iterator_t& operator++() noexcept
-    {
-        ++m_it;
-        return *this;
-    }
-
-    primitive_iterator_t const operator++(int) noexcept // NOLINT(readability-const-return-type)
-    {
-        auto result = *this;
-        ++m_it;
-        return result;
-    }
-
-    primitive_iterator_t& operator--() noexcept
-    {
-        --m_it;
-        return *this;
-    }
-
-    primitive_iterator_t const operator--(int) noexcept // NOLINT(readability-const-return-type)
-    {
-        auto result = *this;
-        --m_it;
-        return result;
-    }
-
-    primitive_iterator_t& operator+=(difference_type n) noexcept
-    {
-        m_it += n;
-        return *this;
-    }
-
-    primitive_iterator_t& operator-=(difference_type n) noexcept
-    {
-        m_it -= n;
-        return *this;
-    }
-};
-}  // namespace detail
-}  // namespace nlohmann
-
-
-namespace nlohmann
-{
-namespace detail
-{
-/*!
-@brief an iterator value
-
-@note This structure could easily be a union, but MSVC currently does not allow
-unions members with complex constructors, see https://github.com/nlohmann/json/pull/105.
-*/
-template<typename BasicJsonType> struct internal_iterator
-{
-    /// iterator for JSON objects
-    typename BasicJsonType::object_t::iterator object_iterator {};
-    /// iterator for JSON arrays
-    typename BasicJsonType::array_t::iterator array_iterator {};
-    /// generic iterator for all other types
-    primitive_iterator_t primitive_iterator {};
-};
-}  // namespace detail
-}  // namespace nlohmann
-
-// #include <nlohmann/detail/iterators/iter_impl.hpp>
-
-
-#include <iterator> // iterator, random_access_iterator_tag, bidirectional_iterator_tag, advance, next
-#include <type_traits> // conditional, is_const, remove_const
-
-// #include <nlohmann/detail/exceptions.hpp>
-
-// #include <nlohmann/detail/iterators/internal_iterator.hpp>
-
-// #include <nlohmann/detail/iterators/primitive_iterator.hpp>
-
-// #include <nlohmann/detail/macro_scope.hpp>
-
-// #include <nlohmann/detail/meta/cpp_future.hpp>
-
-// #include <nlohmann/detail/meta/type_traits.hpp>
-
-// #include <nlohmann/detail/value_t.hpp>
-
-
-namespace nlohmann
-{
-namespace detail
-{
-// forward declare, to be able to friend it later on
-template<typename IteratorType> class iteration_proxy;
-template<typename IteratorType> class iteration_proxy_value;
-
-/*!
-@brief a template for a bidirectional iterator for the @ref basic_json class
-This class implements a both iterators (iterator and const_iterator) for the
-@ref basic_json class.
-@note An iterator is called *initialized* when a pointer to a JSON value has
-      been set (e.g., by a constructor or a copy assignment). If the iterator is
-      default-constructed, it is *uninitialized* and most methods are undefined.
-      **The library uses assertions to detect calls on uninitialized iterators.**
-@requirement The class satisfies the following concept requirements:
--
-[BidirectionalIterator](https://en.cppreference.com/w/cpp/named_req/BidirectionalIterator):
-  The iterator that can be moved can be moved in both directions (i.e.
-  incremented and decremented).
-@since version 1.0.0, simplified in version 2.0.9, change to bidirectional
-       iterators in version 3.0.0 (see https://github.com/nlohmann/json/issues/593)
-*/
-template<typename BasicJsonType>
-class iter_impl // NOLINT(cppcoreguidelines-special-member-functions,hicpp-special-member-functions)
-{
-    /// the iterator with BasicJsonType of different const-ness
-    using other_iter_impl = iter_impl<typename std::conditional<std::is_const<BasicJsonType>::value, typename std::remove_const<BasicJsonType>::type, const BasicJsonType>::type>;
-    /// allow basic_json to access private members
-    friend other_iter_impl;
-    friend BasicJsonType;
-    friend iteration_proxy<iter_impl>;
-    friend iteration_proxy_value<iter_impl>;
-
-    using object_t = typename BasicJsonType::object_t;
-    using array_t = typename BasicJsonType::array_t;
-    // make sure BasicJsonType is basic_json or const basic_json
-    static_assert(is_basic_json<typename std::remove_const<BasicJsonType>::type>::value,
-                  "iter_impl only accepts (const) basic_json");
-
-  public:
-
-    /// The std::iterator class template (used as a base class to provide typedefs) is deprecated in C++17.
-    /// The C++ Standard has never required user-defined iterators to derive from std::iterator.
-    /// A user-defined iterator should provide publicly accessible typedefs named
-    /// iterator_category, value_type, difference_type, pointer, and reference.
-    /// Note that value_type is required to be non-const, even for constant iterators.
-    using iterator_category = std::bidirectional_iterator_tag;
-
-    /// the type of the values when the iterator is dereferenced
-    using value_type = typename BasicJsonType::value_type;
-    /// a type to represent differences between iterators
-    using difference_type = typename BasicJsonType::difference_type;
-    /// defines a pointer to the type iterated over (value_type)
-    using pointer = typename std::conditional<std::is_const<BasicJsonType>::value,
-          typename BasicJsonType::const_pointer,
-          typename BasicJsonType::pointer>::type;
-    /// defines a reference to the type iterated over (value_type)
-    using reference =
-        typename std::conditional<std::is_const<BasicJsonType>::value,
-        typename BasicJsonType::const_reference,
-        typename BasicJsonType::reference>::type;
-
-    iter_impl() = default;
-    ~iter_impl() = default;
-    iter_impl(iter_impl&&) noexcept = default;
-    iter_impl& operator=(iter_impl&&) noexcept = default;
-
-    /*!
-    @brief constructor for a given JSON instance
-    @param[in] object  pointer to a JSON object for this iterator
-    @pre object != nullptr
-    @post The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    explicit iter_impl(pointer object) noexcept : m_object(object)
-    {
-        JSON_ASSERT(m_object != nullptr);
-
-        switch (m_object->m_type)
-        {
-            case value_t::object:
-            {
-                m_it.object_iterator = typename object_t::iterator();
-                break;
-            }
-
-            case value_t::array:
-            {
-                m_it.array_iterator = typename array_t::iterator();
-                break;
-            }
-
-            case value_t::null:
-            case value_t::string:
-            case value_t::boolean:
-            case value_t::number_integer:
-            case value_t::number_unsigned:
-            case value_t::number_float:
-            case value_t::binary:
-            case value_t::discarded:
-            default:
-            {
-                m_it.primitive_iterator = primitive_iterator_t();
-                break;
-            }
-        }
-    }
-
-    /*!
-    @note The conventional copy constructor and copy assignment are implicitly
-          defined. Combined with the following converting constructor and
-          assignment, they support: (1) copy from iterator to iterator, (2)
-          copy from const iterator to const iterator, and (3) conversion from
-          iterator to const iterator. However conversion from const iterator
-          to iterator is not defined.
-    */
-
-    /*!
-    @brief const copy constructor
-    @param[in] other const iterator to copy from
-    @note This copy constructor had to be defined explicitly to circumvent a bug
-          occurring on msvc v19.0 compiler (VS 2015) debug build. For more
-          information refer to: https://github.com/nlohmann/json/issues/1608
-    */
-    iter_impl(const iter_impl<const BasicJsonType>& other) noexcept
-        : m_object(other.m_object), m_it(other.m_it)
-    {}
-
-    /*!
-    @brief converting assignment
-    @param[in] other const iterator to copy from
-    @return const/non-const iterator
-    @note It is not checked whether @a other is initialized.
-    */
-    iter_impl& operator=(const iter_impl<const BasicJsonType>& other) noexcept
-    {
-        if (&other != this)
-        {
-            m_object = other.m_object;
-            m_it = other.m_it;
-        }
-        return *this;
-    }
-
-    /*!
-    @brief converting constructor
-    @param[in] other  non-const iterator to copy from
-    @note It is not checked whether @a other is initialized.
-    */
-    iter_impl(const iter_impl<typename std::remove_const<BasicJsonType>::type>& other) noexcept
-        : m_object(other.m_object), m_it(other.m_it)
-    {}
-
-    /*!
-    @brief converting assignment
-    @param[in] other  non-const iterator to copy from
-    @return const/non-const iterator
-    @note It is not checked whether @a other is initialized.
-    */
-    iter_impl& operator=(const iter_impl<typename std::remove_const<BasicJsonType>::type>& other) noexcept // NOLINT(cert-oop54-cpp)
-    {
-        m_object = other.m_object;
-        m_it = other.m_it;
-        return *this;
-    }
-
-  JSON_PRIVATE_UNLESS_TESTED:
-    /*!
-    @brief set the iterator to the first value
-    @pre The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    void set_begin() noexcept
-    {
-        JSON_ASSERT(m_object != nullptr);
-
-        switch (m_object->m_type)
-        {
-            case value_t::object:
-            {
-                m_it.object_iterator = m_object->m_value.object->begin();
-                break;
-            }
-
-            case value_t::array:
-            {
-                m_it.array_iterator = m_object->m_value.array->begin();
-                break;
-            }
-
-            case value_t::null:
-            {
-                // set to end so begin()==end() is true: null is empty
-                m_it.primitive_iterator.set_end();
-                break;
-            }
-
-            case value_t::string:
-            case value_t::boolean:
-            case value_t::number_integer:
-            case value_t::number_unsigned:
-            case value_t::number_float:
-            case value_t::binary:
-            case value_t::discarded:
-            default:
-            {
-                m_it.primitive_iterator.set_begin();
-                break;
-            }
-        }
-    }
-
-    /*!
-    @brief set the iterator past the last value
-    @pre The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    void set_end() noexcept
-    {
-        JSON_ASSERT(m_object != nullptr);
-
-        switch (m_object->m_type)
-        {
-            case value_t::object:
-            {
-                m_it.object_iterator = m_object->m_value.object->end();
-                break;
-            }
-
-            case value_t::array:
-            {
-                m_it.array_iterator = m_object->m_value.array->end();
-                break;
-            }
-
-            case value_t::null:
-            case value_t::string:
-            case value_t::boolean:
-            case value_t::number_integer:
-            case value_t::number_unsigned:
-            case value_t::number_float:
-            case value_t::binary:
-            case value_t::discarded:
-            default:
-            {
-                m_it.primitive_iterator.set_end();
-                break;
-            }
-        }
-    }
-
-  public:
-    /*!
-    @brief return a reference to the value pointed to by the iterator
-    @pre The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    reference operator*() const
-    {
-        JSON_ASSERT(m_object != nullptr);
-
-        switch (m_object->m_type)
-        {
-            case value_t::object:
-            {
-                JSON_ASSERT(m_it.object_iterator != m_object->m_value.object->end());
-                return m_it.object_iterator->second;
-            }
-
-            case value_t::array:
-            {
-                JSON_ASSERT(m_it.array_iterator != m_object->m_value.array->end());
-                return *m_it.array_iterator;
-            }
-
-            case value_t::null:
-                JSON_THROW(invalid_iterator::create(214, "cannot get value", *m_object));
-
-            case value_t::string:
-            case value_t::boolean:
-            case value_t::number_integer:
-            case value_t::number_unsigned:
-            case value_t::number_float:
-            case value_t::binary:
-            case value_t::discarded:
-            default:
-            {
-                if (JSON_HEDLEY_LIKELY(m_it.primitive_iterator.is_begin()))
-                {
-                    return *m_object;
-                }
-
-                JSON_THROW(invalid_iterator::create(214, "cannot get value", *m_object));
-            }
-        }
-    }
-
-    /*!
-    @brief dereference the iterator
-    @pre The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    pointer operator->() const
-    {
-        JSON_ASSERT(m_object != nullptr);
-
-        switch (m_object->m_type)
-        {
-            case value_t::object:
-            {
-                JSON_ASSERT(m_it.object_iterator != m_object->m_value.object->end());
-                return &(m_it.object_iterator->second);
-            }
-
-            case value_t::array:
-            {
-                JSON_ASSERT(m_it.array_iterator != m_object->m_value.array->end());
-                return &*m_it.array_iterator;
-            }
-
-            case value_t::null:
-            case value_t::string:
-            case value_t::boolean:
-            case value_t::number_integer:
-            case value_t::number_unsigned:
-            case value_t::number_float:
-            case value_t::binary:
-            case value_t::discarded:
-            default:
-            {
-                if (JSON_HEDLEY_LIKELY(m_it.primitive_iterator.is_begin()))
-                {
-                    return m_object;
-                }
-
-                JSON_THROW(invalid_iterator::create(214, "cannot get value", *m_object));
-            }
-        }
-    }
-
-    /*!
-    @brief post-increment (it++)
-    @pre The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    iter_impl const operator++(int) // NOLINT(readability-const-return-type)
-    {
-        auto result = *this;
-        ++(*this);
-        return result;
-    }
-
-    /*!
-    @brief pre-increment (++it)
-    @pre The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    iter_impl& operator++()
-    {
-        JSON_ASSERT(m_object != nullptr);
-
-        switch (m_object->m_type)
-        {
-            case value_t::object:
-            {
-                std::advance(m_it.object_iterator, 1);
-                break;
-            }
-
-            case value_t::array:
-            {
-                std::advance(m_it.array_iterator, 1);
-                break;
-            }
-
-            case value_t::null:
-            case value_t::string:
-            case value_t::boolean:
-            case value_t::number_integer:
-            case value_t::number_unsigned:
-            case value_t::number_float:
-            case value_t::binary:
-            case value_t::discarded:
-            default:
-            {
-                ++m_it.primitive_iterator;
-                break;
-            }
-        }
-
-        return *this;
-    }
-
-    /*!
-    @brief post-decrement (it--)
-    @pre The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    iter_impl const operator--(int) // NOLINT(readability-const-return-type)
-    {
-        auto result = *this;
-        --(*this);
-        return result;
-    }
-
-    /*!
-    @brief pre-decrement (--it)
-    @pre The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    iter_impl& operator--()
-    {
-        JSON_ASSERT(m_object != nullptr);
-
-        switch (m_object->m_type)
-        {
-            case value_t::object:
-            {
-                std::advance(m_it.object_iterator, -1);
-                break;
-            }
-
-            case value_t::array:
-            {
-                std::advance(m_it.array_iterator, -1);
-                break;
-            }
-
-            case value_t::null:
-            case value_t::string:
-            case value_t::boolean:
-            case value_t::number_integer:
-            case value_t::number_unsigned:
-            case value_t::number_float:
-            case value_t::binary:
-            case value_t::discarded:
-            default:
-            {
-                --m_it.primitive_iterator;
-                break;
-            }
-        }
-
-        return *this;
-    }
-
-    /*!
-    @brief comparison: equal
-    @pre The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    template < typename IterImpl, detail::enable_if_t < (std::is_same<IterImpl, iter_impl>::value || std::is_same<IterImpl, other_iter_impl>::value), std::nullptr_t > = nullptr >
-    bool operator==(const IterImpl& other) const
-    {
-        // if objects are not the same, the comparison is undefined
-        if (JSON_HEDLEY_UNLIKELY(m_object != other.m_object))
-        {
-            JSON_THROW(invalid_iterator::create(212, "cannot compare iterators of different containers", *m_object));
-        }
-
-        JSON_ASSERT(m_object != nullptr);
-
-        switch (m_object->m_type)
-        {
-            case value_t::object:
-                return (m_it.object_iterator == other.m_it.object_iterator);
-
-            case value_t::array:
-                return (m_it.array_iterator == other.m_it.array_iterator);
-
-            case value_t::null:
-            case value_t::string:
-            case value_t::boolean:
-            case value_t::number_integer:
-            case value_t::number_unsigned:
-            case value_t::number_float:
-            case value_t::binary:
-            case value_t::discarded:
-            default:
-                return (m_it.primitive_iterator == other.m_it.primitive_iterator);
-        }
-    }
-
-    /*!
-    @brief comparison: not equal
-    @pre The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    template < typename IterImpl, detail::enable_if_t < (std::is_same<IterImpl, iter_impl>::value || std::is_same<IterImpl, other_iter_impl>::value), std::nullptr_t > = nullptr >
-    bool operator!=(const IterImpl& other) const
-    {
-        return !operator==(other);
-    }
-
-    /*!
-    @brief comparison: smaller
-    @pre The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    bool operator<(const iter_impl& other) const
-    {
-        // if objects are not the same, the comparison is undefined
-        if (JSON_HEDLEY_UNLIKELY(m_object != other.m_object))
-        {
-            JSON_THROW(invalid_iterator::create(212, "cannot compare iterators of different containers", *m_object));
-        }
-
-        JSON_ASSERT(m_object != nullptr);
-
-        switch (m_object->m_type)
-        {
-            case value_t::object:
-                JSON_THROW(invalid_iterator::create(213, "cannot compare order of object iterators", *m_object));
-
-            case value_t::array:
-                return (m_it.array_iterator < other.m_it.array_iterator);
-
-            case value_t::null:
-            case value_t::string:
-            case value_t::boolean:
-            case value_t::number_integer:
-            case value_t::number_unsigned:
-            case value_t::number_float:
-            case value_t::binary:
-            case value_t::discarded:
-            default:
-                return (m_it.primitive_iterator < other.m_it.primitive_iterator);
-        }
-    }
-
-    /*!
-    @brief comparison: less than or equal
-    @pre The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    bool operator<=(const iter_impl& other) const
-    {
-        return !other.operator < (*this);
-    }
-
-    /*!
-    @brief comparison: greater than
-    @pre The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    bool operator>(const iter_impl& other) const
-    {
-        return !operator<=(other);
-    }
-
-    /*!
-    @brief comparison: greater than or equal
-    @pre The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    bool operator>=(const iter_impl& other) const
-    {
-        return !operator<(other);
-    }
-
-    /*!
-    @brief add to iterator
-    @pre The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    iter_impl& operator+=(difference_type i)
-    {
-        JSON_ASSERT(m_object != nullptr);
-
-        switch (m_object->m_type)
-        {
-            case value_t::object:
-                JSON_THROW(invalid_iterator::create(209, "cannot use offsets with object iterators", *m_object));
-
-            case value_t::array:
-            {
-                std::advance(m_it.array_iterator, i);
-                break;
-            }
-
-            case value_t::null:
-            case value_t::string:
-            case value_t::boolean:
-            case value_t::number_integer:
-            case value_t::number_unsigned:
-            case value_t::number_float:
-            case value_t::binary:
-            case value_t::discarded:
-            default:
-            {
-                m_it.primitive_iterator += i;
-                break;
-            }
-        }
-
-        return *this;
-    }
-
-    /*!
-    @brief subtract from iterator
-    @pre The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    iter_impl& operator-=(difference_type i)
-    {
-        return operator+=(-i);
-    }
-
-    /*!
-    @brief add to iterator
-    @pre The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    iter_impl operator+(difference_type i) const
-    {
-        auto result = *this;
-        result += i;
-        return result;
-    }
-
-    /*!
-    @brief addition of distance and iterator
-    @pre The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    friend iter_impl operator+(difference_type i, const iter_impl& it)
-    {
-        auto result = it;
-        result += i;
-        return result;
-    }
-
-    /*!
-    @brief subtract from iterator
-    @pre The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    iter_impl operator-(difference_type i) const
-    {
-        auto result = *this;
-        result -= i;
-        return result;
-    }
-
-    /*!
-    @brief return difference
-    @pre The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    difference_type operator-(const iter_impl& other) const
-    {
-        JSON_ASSERT(m_object != nullptr);
-
-        switch (m_object->m_type)
-        {
-            case value_t::object:
-                JSON_THROW(invalid_iterator::create(209, "cannot use offsets with object iterators", *m_object));
-
-            case value_t::array:
-                return m_it.array_iterator - other.m_it.array_iterator;
-
-            case value_t::null:
-            case value_t::string:
-            case value_t::boolean:
-            case value_t::number_integer:
-            case value_t::number_unsigned:
-            case value_t::number_float:
-            case value_t::binary:
-            case value_t::discarded:
-            default:
-                return m_it.primitive_iterator - other.m_it.primitive_iterator;
-        }
-    }
-
-    /*!
-    @brief access to successor
-    @pre The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    reference operator[](difference_type n) const
-    {
-        JSON_ASSERT(m_object != nullptr);
-
-        switch (m_object->m_type)
-        {
-            case value_t::object:
-                JSON_THROW(invalid_iterator::create(208, "cannot use operator[] for object iterators", *m_object));
-
-            case value_t::array:
-                return *std::next(m_it.array_iterator, n);
-
-            case value_t::null:
-                JSON_THROW(invalid_iterator::create(214, "cannot get value", *m_object));
-
-            case value_t::string:
-            case value_t::boolean:
-            case value_t::number_integer:
-            case value_t::number_unsigned:
-            case value_t::number_float:
-            case value_t::binary:
-            case value_t::discarded:
-            default:
-            {
-                if (JSON_HEDLEY_LIKELY(m_it.primitive_iterator.get_value() == -n))
-                {
-                    return *m_object;
-                }
-
-                JSON_THROW(invalid_iterator::create(214, "cannot get value", *m_object));
-            }
-        }
-    }
-
-    /*!
-    @brief return the key of an object iterator
-    @pre The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    const typename object_t::key_type& key() const
-    {
-        JSON_ASSERT(m_object != nullptr);
-
-        if (JSON_HEDLEY_LIKELY(m_object->is_object()))
-        {
-            return m_it.object_iterator->first;
-        }
-
-        JSON_THROW(invalid_iterator::create(207, "cannot use key() for non-object iterators", *m_object));
-    }
-
-    /*!
-    @brief return the value of an iterator
-    @pre The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    reference value() const
-    {
-        return operator*();
-    }
-
-  JSON_PRIVATE_UNLESS_TESTED:
-    /// associated JSON instance
-    pointer m_object = nullptr;
-    /// the actual iterator of the associated instance
-    internal_iterator<typename std::remove_const<BasicJsonType>::type> m_it {};
-};
-} // namespace detail
-} // namespace nlohmann
-
-// #include <nlohmann/detail/iterators/iteration_proxy.hpp>
-
-// #include <nlohmann/detail/iterators/json_reverse_iterator.hpp>
-
-
-#include <cstddef> // ptrdiff_t
-#include <iterator> // reverse_iterator
-#include <utility> // declval
-
-namespace nlohmann
-{
-namespace detail
-{
-//////////////////////
-// reverse_iterator //
-//////////////////////
-
-/*!
-@brief a template for a reverse iterator class
-
-@tparam Base the base iterator type to reverse. Valid types are @ref
-iterator (to create @ref reverse_iterator) and @ref const_iterator (to
-create @ref const_reverse_iterator).
-
-@requirement The class satisfies the following concept requirements:
--
-[BidirectionalIterator](https://en.cppreference.com/w/cpp/named_req/BidirectionalIterator):
-  The iterator that can be moved can be moved in both directions (i.e.
-  incremented and decremented).
-- [OutputIterator](https://en.cppreference.com/w/cpp/named_req/OutputIterator):
-  It is possible to write to the pointed-to element (only if @a Base is
-  @ref iterator).
-
-@since version 1.0.0
-*/
-template<typename Base>
-class json_reverse_iterator : public std::reverse_iterator<Base>
-{
-  public:
-    using difference_type = std::ptrdiff_t;
-    /// shortcut to the reverse iterator adapter
-    using base_iterator = std::reverse_iterator<Base>;
-    /// the reference type for the pointed-to element
-    using reference = typename Base::reference;
-
-    /// create reverse iterator from iterator
-    explicit json_reverse_iterator(const typename base_iterator::iterator_type& it) noexcept
-        : base_iterator(it) {}
-
-    /// create reverse iterator from base class
-    explicit json_reverse_iterator(const base_iterator& it) noexcept : base_iterator(it) {}
-
-    /// post-increment (it++)
-    json_reverse_iterator const operator++(int) // NOLINT(readability-const-return-type)
-    {
-        return static_cast<json_reverse_iterator>(base_iterator::operator++(1));
-    }
-
-    /// pre-increment (++it)
-    json_reverse_iterator& operator++()
-    {
-        return static_cast<json_reverse_iterator&>(base_iterator::operator++());
-    }
-
-    /// post-decrement (it--)
-    json_reverse_iterator const operator--(int) // NOLINT(readability-const-return-type)
-    {
-        return static_cast<json_reverse_iterator>(base_iterator::operator--(1));
-    }
-
-    /// pre-decrement (--it)
-    json_reverse_iterator& operator--()
-    {
-        return static_cast<json_reverse_iterator&>(base_iterator::operator--());
-    }
-
-    /// add to iterator
-    json_reverse_iterator& operator+=(difference_type i)
-    {
-        return static_cast<json_reverse_iterator&>(base_iterator::operator+=(i));
-    }
-
-    /// add to iterator
-    json_reverse_iterator operator+(difference_type i) const
-    {
-        return static_cast<json_reverse_iterator>(base_iterator::operator+(i));
-    }
-
-    /// subtract from iterator
-    json_reverse_iterator operator-(difference_type i) const
-    {
-        return static_cast<json_reverse_iterator>(base_iterator::operator-(i));
-    }
-
-    /// return difference
-    difference_type operator-(const json_reverse_iterator& other) const
-    {
-        return base_iterator(*this) - base_iterator(other);
-    }
-
-    /// access to successor
-    reference operator[](difference_type n) const
-    {
-        return *(this->operator+(n));
-    }
-
-    /// return the key of an object iterator
-    auto key() const -> decltype(std::declval<Base>().key())
-    {
-        auto it = --this->base();
-        return it.key();
-    }
-
-    /// return the value of an iterator
-    reference value() const
-    {
-        auto it = --this->base();
-        return it.operator * ();
-    }
-};
-}  // namespace detail
-}  // namespace nlohmann
-
-// #include <nlohmann/detail/iterators/primitive_iterator.hpp>
-
-// #include <nlohmann/detail/json_pointer.hpp>
-
-
-#include <algorithm> // all_of
-#include <cctype> // isdigit
-#include <limits> // max
-#include <numeric> // accumulate
-#include <string> // string
-#include <utility> // move
-#include <vector> // vector
-
-// #include <nlohmann/detail/exceptions.hpp>
-
-// #include <nlohmann/detail/macro_scope.hpp>
-
-// #include <nlohmann/detail/string_escape.hpp>
-
-// #include <nlohmann/detail/value_t.hpp>
-
-
-namespace nlohmann
-{
-
-/// @brief JSON Pointer defines a string syntax for identifying a specific value within a JSON document
-/// @sa https://json.nlohmann.me/api/json_pointer/
-template<typename BasicJsonType>
-class json_pointer
-{
-    // allow basic_json to access private members
-    NLOHMANN_BASIC_JSON_TPL_DECLARATION
-    friend class basic_json;
-
-  public:
-    /// @brief create JSON pointer
-    /// @sa https://json.nlohmann.me/api/json_pointer/json_pointer/
-    explicit json_pointer(const std::string& s = "")
-        : reference_tokens(split(s))
-    {}
-
-    /// @brief return a string representation of the JSON pointer
-    /// @sa https://json.nlohmann.me/api/json_pointer/to_string/
-    std::string to_string() const
-    {
-        return std::accumulate(reference_tokens.begin(), reference_tokens.end(),
-                               std::string{},
-                               [](const std::string & a, const std::string & b)
-        {
-            return a + "/" + detail::escape(b);
-        });
-    }
-
-    /// @brief return a string representation of the JSON pointer
-    /// @sa https://json.nlohmann.me/api/json_pointer/operator_string/
-    operator std::string() const
-    {
-        return to_string();
-    }
-
-    /// @brief append another JSON pointer at the end of this JSON pointer
-    /// @sa https://json.nlohmann.me/api/json_pointer/operator_slasheq/
-    json_pointer& operator/=(const json_pointer& ptr)
-    {
-        reference_tokens.insert(reference_tokens.end(),
-                                ptr.reference_tokens.begin(),
-                                ptr.reference_tokens.end());
-        return *this;
-    }
-
-    /// @brief append an unescaped reference token at the end of this JSON pointer
-    /// @sa https://json.nlohmann.me/api/json_pointer/operator_slasheq/
-    json_pointer& operator/=(std::string token)
-    {
-        push_back(std::move(token));
-        return *this;
-    }
-
-    /// @brief append an array index at the end of this JSON pointer
-    /// @sa https://json.nlohmann.me/api/json_pointer/operator_slasheq/
-    json_pointer& operator/=(std::size_t array_idx)
-    {
-        return *this /= std::to_string(array_idx);
-    }
-
-    /// @brief create a new JSON pointer by appending the right JSON pointer at the end of the left JSON pointer
-    /// @sa https://json.nlohmann.me/api/json_pointer/operator_slash/
-    friend json_pointer operator/(const json_pointer& lhs,
-                                  const json_pointer& rhs)
-    {
-        return json_pointer(lhs) /= rhs;
-    }
-
-    /// @brief create a new JSON pointer by appending the unescaped token at the end of the JSON pointer
-    /// @sa https://json.nlohmann.me/api/json_pointer/operator_slash/
-    friend json_pointer operator/(const json_pointer& lhs, std::string token) // NOLINT(performance-unnecessary-value-param)
-    {
-        return json_pointer(lhs) /= std::move(token);
-    }
-
-    /// @brief create a new JSON pointer by appending the array-index-token at the end of the JSON pointer
-    /// @sa https://json.nlohmann.me/api/json_pointer/operator_slash/
-    friend json_pointer operator/(const json_pointer& lhs, std::size_t array_idx)
-    {
-        return json_pointer(lhs) /= array_idx;
-    }
-
-    /// @brief returns the parent of this JSON pointer
-    /// @sa https://json.nlohmann.me/api/json_pointer/parent_pointer/
-    json_pointer parent_pointer() const
-    {
-        if (empty())
-        {
-            return *this;
-        }
-
-        json_pointer res = *this;
-        res.pop_back();
-        return res;
-    }
-
-    /// @brief remove last reference token
-    /// @sa https://json.nlohmann.me/api/json_pointer/pop_back/
-    void pop_back()
-    {
-        if (JSON_HEDLEY_UNLIKELY(empty()))
-        {
-            JSON_THROW(detail::out_of_range::create(405, "JSON pointer has no parent", BasicJsonType()));
-        }
-
-        reference_tokens.pop_back();
-    }
-
-    /// @brief return last reference token
-    /// @sa https://json.nlohmann.me/api/json_pointer/back/
-    const std::string& back() const
-    {
-        if (JSON_HEDLEY_UNLIKELY(empty()))
-        {
-            JSON_THROW(detail::out_of_range::create(405, "JSON pointer has no parent", BasicJsonType()));
-        }
-
-        return reference_tokens.back();
-    }
-
-    /// @brief append an unescaped token at the end of the reference pointer
-    /// @sa https://json.nlohmann.me/api/json_pointer/push_back/
-    void push_back(const std::string& token)
-    {
-        reference_tokens.push_back(token);
-    }
-
-    /// @brief append an unescaped token at the end of the reference pointer
-    /// @sa https://json.nlohmann.me/api/json_pointer/push_back/
-    void push_back(std::string&& token)
-    {
-        reference_tokens.push_back(std::move(token));
-    }
-
-    /// @brief return whether pointer points to the root document
-    /// @sa https://json.nlohmann.me/api/json_pointer/empty/
-    bool empty() const noexcept
-    {
-        return reference_tokens.empty();
-    }
-
-  private:
-    /*!
-    @param[in] s  reference token to be converted into an array index
-
-    @return integer representation of @a s
-
-    @throw parse_error.106  if an array index begins with '0'
-    @throw parse_error.109  if an array index begins not with a digit
-    @throw out_of_range.404 if string @a s could not be converted to an integer
-    @throw out_of_range.410 if an array index exceeds size_type
-    */
-    static typename BasicJsonType::size_type array_index(const std::string& s)
-    {
-        using size_type = typename BasicJsonType::size_type;
-
-        // error condition (cf. RFC 6901, Sect. 4)
-        if (JSON_HEDLEY_UNLIKELY(s.size() > 1 && s[0] == '0'))
-        {
-            JSON_THROW(detail::parse_error::create(106, 0, "array index '" + s + "' must not begin with '0'", BasicJsonType()));
-        }
-
-        // error condition (cf. RFC 6901, Sect. 4)
-        if (JSON_HEDLEY_UNLIKELY(s.size() > 1 && !(s[0] >= '1' && s[0] <= '9')))
-        {
-            JSON_THROW(detail::parse_error::create(109, 0, "array index '" + s + "' is not a number", BasicJsonType()));
-        }
-
-        std::size_t processed_chars = 0;
-        unsigned long long res = 0;  // NOLINT(runtime/int)
-        JSON_TRY
-        {
-            res = std::stoull(s, &processed_chars);
-        }
-        JSON_CATCH(std::out_of_range&)
-        {
-            JSON_THROW(detail::out_of_range::create(404, "unresolved reference token '" + s + "'", BasicJsonType()));
-        }
-
-        // check if the string was completely read
-        if (JSON_HEDLEY_UNLIKELY(processed_chars != s.size()))
-        {
-            JSON_THROW(detail::out_of_range::create(404, "unresolved reference token '" + s + "'", BasicJsonType()));
-        }
-
-        // only triggered on special platforms (like 32bit), see also
-        // https://github.com/nlohmann/json/pull/2203
-        if (res >= static_cast<unsigned long long>((std::numeric_limits<size_type>::max)()))  // NOLINT(runtime/int)
-        {
-            JSON_THROW(detail::out_of_range::create(410, "array index " + s + " exceeds size_type", BasicJsonType())); // LCOV_EXCL_LINE
-        }
-
-        return static_cast<size_type>(res);
-    }
-
-  JSON_PRIVATE_UNLESS_TESTED:
-    json_pointer top() const
-    {
-        if (JSON_HEDLEY_UNLIKELY(empty()))
-        {
-            JSON_THROW(detail::out_of_range::create(405, "JSON pointer has no parent", BasicJsonType()));
-        }
-
-        json_pointer result = *this;
-        result.reference_tokens = {reference_tokens[0]};
-        return result;
-    }
-
-  private:
-    /*!
-    @brief create and return a reference to the pointed to value
-
-    @complexity Linear in the number of reference tokens.
-
-    @throw parse_error.109 if array index is not a number
-    @throw type_error.313 if value cannot be unflattened
-    */
-    BasicJsonType& get_and_create(BasicJsonType& j) const
-    {
-        auto* result = &j;
-
-        // in case no reference tokens exist, return a reference to the JSON value
-        // j which will be overwritten by a primitive value
-        for (const auto& reference_token : reference_tokens)
-        {
-            switch (result->type())
-            {
-                case detail::value_t::null:
-                {
-                    if (reference_token == "0")
-                    {
-                        // start a new array if reference token is 0
-                        result = &result->operator[](0);
-                    }
-                    else
-                    {
-                        // start a new object otherwise
-                        result = &result->operator[](reference_token);
-                    }
-                    break;
-                }
-
-                case detail::value_t::object:
-                {
-                    // create an entry in the object
-                    result = &result->operator[](reference_token);
-                    break;
-                }
-
-                case detail::value_t::array:
-                {
-                    // create an entry in the array
-                    result = &result->operator[](array_index(reference_token));
-                    break;
-                }
-
-                /*
-                The following code is only reached if there exists a reference
-                token _and_ the current value is primitive. In this case, we have
-                an error situation, because primitive values may only occur as
-                single value; that is, with an empty list of reference tokens.
-                */
-                case detail::value_t::string:
-                case detail::value_t::boolean:
-                case detail::value_t::number_integer:
-                case detail::value_t::number_unsigned:
-                case detail::value_t::number_float:
-                case detail::value_t::binary:
-                case detail::value_t::discarded:
-                default:
-                    JSON_THROW(detail::type_error::create(313, "invalid value to unflatten", j));
-            }
-        }
-
-        return *result;
-    }
-
-    /*!
-    @brief return a reference to the pointed to value
-
-    @note This version does not throw if a value is not present, but tries to
-          create nested values instead. For instance, calling this function
-          with pointer `"/this/that"` on a null value is equivalent to calling
-          `operator[]("this").operator[]("that")` on that value, effectively
-          changing the null value to an object.
-
-    @param[in] ptr  a JSON value
-
-    @return reference to the JSON value pointed to by the JSON pointer
-
-    @complexity Linear in the length of the JSON pointer.
-
-    @throw parse_error.106   if an array index begins with '0'
-    @throw parse_error.109   if an array index was not a number
-    @throw out_of_range.404  if the JSON pointer can not be resolved
-    */
-    BasicJsonType& get_unchecked(BasicJsonType* ptr) const
-    {
-        for (const auto& reference_token : reference_tokens)
-        {
-            // convert null values to arrays or objects before continuing
-            if (ptr->is_null())
-            {
-                // check if reference token is a number
-                const bool nums =
-                    std::all_of(reference_token.begin(), reference_token.end(),
-                                [](const unsigned char x)
-                {
-                    return std::isdigit(x);
-                });
-
-                // change value to array for numbers or "-" or to object otherwise
-                *ptr = (nums || reference_token == "-")
-                       ? detail::value_t::array
-                       : detail::value_t::object;
-            }
-
-            switch (ptr->type())
-            {
-                case detail::value_t::object:
-                {
-                    // use unchecked object access
-                    ptr = &ptr->operator[](reference_token);
-                    break;
-                }
-
-                case detail::value_t::array:
-                {
-                    if (reference_token == "-")
-                    {
-                        // explicitly treat "-" as index beyond the end
-                        ptr = &ptr->operator[](ptr->m_value.array->size());
-                    }
-                    else
-                    {
-                        // convert array index to number; unchecked access
-                        ptr = &ptr->operator[](array_index(reference_token));
-                    }
-                    break;
-                }
-
-                case detail::value_t::null:
-                case detail::value_t::string:
-                case detail::value_t::boolean:
-                case detail::value_t::number_integer:
-                case detail::value_t::number_unsigned:
-                case detail::value_t::number_float:
-                case detail::value_t::binary:
-                case detail::value_t::discarded:
-                default:
-                    JSON_THROW(detail::out_of_range::create(404, "unresolved reference token '" + reference_token + "'", *ptr));
-            }
-        }
-
-        return *ptr;
-    }
-
-    /*!
-    @throw parse_error.106   if an array index begins with '0'
-    @throw parse_error.109   if an array index was not a number
-    @throw out_of_range.402  if the array index '-' is used
-    @throw out_of_range.404  if the JSON pointer can not be resolved
-    */
-    BasicJsonType& get_checked(BasicJsonType* ptr) const
-    {
-        for (const auto& reference_token : reference_tokens)
-        {
-            switch (ptr->type())
-            {
-                case detail::value_t::object:
-                {
-                    // note: at performs range check
-                    ptr = &ptr->at(reference_token);
-                    break;
-                }
-
-                case detail::value_t::array:
-                {
-                    if (JSON_HEDLEY_UNLIKELY(reference_token == "-"))
-                    {
-                        // "-" always fails the range check
-                        JSON_THROW(detail::out_of_range::create(402,
-                                                                "array index '-' (" + std::to_string(ptr->m_value.array->size()) +
-                                                                ") is out of range", *ptr));
-                    }
-
-                    // note: at performs range check
-                    ptr = &ptr->at(array_index(reference_token));
-                    break;
-                }
-
-                case detail::value_t::null:
-                case detail::value_t::string:
-                case detail::value_t::boolean:
-                case detail::value_t::number_integer:
-                case detail::value_t::number_unsigned:
-                case detail::value_t::number_float:
-                case detail::value_t::binary:
-                case detail::value_t::discarded:
-                default:
-                    JSON_THROW(detail::out_of_range::create(404, "unresolved reference token '" + reference_token + "'", *ptr));
-            }
-        }
-
-        return *ptr;
-    }
-
-    /*!
-    @brief return a const reference to the pointed to value
-
-    @param[in] ptr  a JSON value
-
-    @return const reference to the JSON value pointed to by the JSON
-    pointer
-
-    @throw parse_error.106   if an array index begins with '0'
-    @throw parse_error.109   if an array index was not a number
-    @throw out_of_range.402  if the array index '-' is used
-    @throw out_of_range.404  if the JSON pointer can not be resolved
-    */
-    const BasicJsonType& get_unchecked(const BasicJsonType* ptr) const
-    {
-        for (const auto& reference_token : reference_tokens)
-        {
-            switch (ptr->type())
-            {
-                case detail::value_t::object:
-                {
-                    // use unchecked object access
-                    ptr = &ptr->operator[](reference_token);
-                    break;
-                }
-
-                case detail::value_t::array:
-                {
-                    if (JSON_HEDLEY_UNLIKELY(reference_token == "-"))
-                    {
-                        // "-" cannot be used for const access
-                        JSON_THROW(detail::out_of_range::create(402, "array index '-' (" + std::to_string(ptr->m_value.array->size()) + ") is out of range", *ptr));
-                    }
-
-                    // use unchecked array access
-                    ptr = &ptr->operator[](array_index(reference_token));
-                    break;
-                }
-
-                case detail::value_t::null:
-                case detail::value_t::string:
-                case detail::value_t::boolean:
-                case detail::value_t::number_integer:
-                case detail::value_t::number_unsigned:
-                case detail::value_t::number_float:
-                case detail::value_t::binary:
-                case detail::value_t::discarded:
-                default:
-                    JSON_THROW(detail::out_of_range::create(404, "unresolved reference token '" + reference_token + "'", *ptr));
-            }
-        }
-
-        return *ptr;
-    }
-
-    /*!
-    @throw parse_error.106   if an array index begins with '0'
-    @throw parse_error.109   if an array index was not a number
-    @throw out_of_range.402  if the array index '-' is used
-    @throw out_of_range.404  if the JSON pointer can not be resolved
-    */
-    const BasicJsonType& get_checked(const BasicJsonType* ptr) const
-    {
-        for (const auto& reference_token : reference_tokens)
-        {
-            switch (ptr->type())
-            {
-                case detail::value_t::object:
-                {
-                    // note: at performs range check
-                    ptr = &ptr->at(reference_token);
-                    break;
-                }
-
-                case detail::value_t::array:
-                {
-                    if (JSON_HEDLEY_UNLIKELY(reference_token == "-"))
-                    {
-                        // "-" always fails the range check
-                        JSON_THROW(detail::out_of_range::create(402,
-                                                                "array index '-' (" + std::to_string(ptr->m_value.array->size()) +
-                                                                ") is out of range", *ptr));
-                    }
-
-                    // note: at performs range check
-                    ptr = &ptr->at(array_index(reference_token));
-                    break;
-                }
-
-                case detail::value_t::null:
-                case detail::value_t::string:
-                case detail::value_t::boolean:
-                case detail::value_t::number_integer:
-                case detail::value_t::number_unsigned:
-                case detail::value_t::number_float:
-                case detail::value_t::binary:
-                case detail::value_t::discarded:
-                default:
-                    JSON_THROW(detail::out_of_range::create(404, "unresolved reference token '" + reference_token + "'", *ptr));
-            }
-        }
-
-        return *ptr;
-    }
-
-    /*!
-    @throw parse_error.106   if an array index begins with '0'
-    @throw parse_error.109   if an array index was not a number
-    */
-    bool contains(const BasicJsonType* ptr) const
-    {
-        for (const auto& reference_token : reference_tokens)
-        {
-            switch (ptr->type())
-            {
-                case detail::value_t::object:
-                {
-                    if (!ptr->contains(reference_token))
-                    {
-                        // we did not find the key in the object
-                        return false;
-                    }
-
-                    ptr = &ptr->operator[](reference_token);
-                    break;
-                }
-
-                case detail::value_t::array:
-                {
-                    if (JSON_HEDLEY_UNLIKELY(reference_token == "-"))
-                    {
-                        // "-" always fails the range check
-                        return false;
-                    }
-                    if (JSON_HEDLEY_UNLIKELY(reference_token.size() == 1 && !("0" <= reference_token && reference_token <= "9")))
-                    {
-                        // invalid char
-                        return false;
-                    }
-                    if (JSON_HEDLEY_UNLIKELY(reference_token.size() > 1))
-                    {
-                        if (JSON_HEDLEY_UNLIKELY(!('1' <= reference_token[0] && reference_token[0] <= '9')))
-                        {
-                            // first char should be between '1' and '9'
-                            return false;
-                        }
-                        for (std::size_t i = 1; i < reference_token.size(); i++)
-                        {
-                            if (JSON_HEDLEY_UNLIKELY(!('0' <= reference_token[i] && reference_token[i] <= '9')))
-                            {
-                                // other char should be between '0' and '9'
-                                return false;
-                            }
-                        }
-                    }
-
-                    const auto idx = array_index(reference_token);
-                    if (idx >= ptr->size())
-                    {
-                        // index out of range
-                        return false;
-                    }
-
-                    ptr = &ptr->operator[](idx);
-                    break;
-                }
-
-                case detail::value_t::null:
-                case detail::value_t::string:
-                case detail::value_t::boolean:
-                case detail::value_t::number_integer:
-                case detail::value_t::number_unsigned:
-                case detail::value_t::number_float:
-                case detail::value_t::binary:
-                case detail::value_t::discarded:
-                default:
-                {
-                    // we do not expect primitive values if there is still a
-                    // reference token to process
-                    return false;
-                }
-            }
-        }
-
-        // no reference token left means we found a primitive value
-        return true;
-    }
-
-    /*!
-    @brief split the string input to reference tokens
-
-    @note This function is only called by the json_pointer constructor.
-          All exceptions below are documented there.
-
-    @throw parse_error.107  if the pointer is not empty or begins with '/'
-    @throw parse_error.108  if character '~' is not followed by '0' or '1'
-    */
-    static std::vector<std::string> split(const std::string& reference_string)
-    {
-        std::vector<std::string> result;
-
-        // special case: empty reference string -> no reference tokens
-        if (reference_string.empty())
-        {
-            return result;
-        }
-
-        // check if nonempty reference string begins with slash
-        if (JSON_HEDLEY_UNLIKELY(reference_string[0] != '/'))
-        {
-            JSON_THROW(detail::parse_error::create(107, 1, "JSON pointer must be empty or begin with '/' - was: '" + reference_string + "'", BasicJsonType()));
-        }
-
-        // extract the reference tokens:
-        // - slash: position of the last read slash (or end of string)
-        // - start: position after the previous slash
-        for (
-            // search for the first slash after the first character
-            std::size_t slash = reference_string.find_first_of('/', 1),
-            // set the beginning of the first reference token
-            start = 1;
-            // we can stop if start == 0 (if slash == std::string::npos)
-            start != 0;
-            // set the beginning of the next reference token
-            // (will eventually be 0 if slash == std::string::npos)
-            start = (slash == std::string::npos) ? 0 : slash + 1,
-            // find next slash
-            slash = reference_string.find_first_of('/', start))
-        {
-            // use the text between the beginning of the reference token
-            // (start) and the last slash (slash).
-            auto reference_token = reference_string.substr(start, slash - start);
-
-            // check reference tokens are properly escaped
-            for (std::size_t pos = reference_token.find_first_of('~');
-                    pos != std::string::npos;
-                    pos = reference_token.find_first_of('~', pos + 1))
-            {
-                JSON_ASSERT(reference_token[pos] == '~');
-
-                // ~ must be followed by 0 or 1
-                if (JSON_HEDLEY_UNLIKELY(pos == reference_token.size() - 1 ||
-                                         (reference_token[pos + 1] != '0' &&
-                                          reference_token[pos + 1] != '1')))
-                {
-                    JSON_THROW(detail::parse_error::create(108, 0, "escape character '~' must be followed with '0' or '1'", BasicJsonType()));
-                }
-            }
-
-            // finally, store the reference token
-            detail::unescape(reference_token);
-            result.push_back(reference_token);
-        }
-
-        return result;
-    }
-
-  private:
-    /*!
-    @param[in] reference_string  the reference string to the current value
-    @param[in] value             the value to consider
-    @param[in,out] result        the result object to insert values to
-
-    @note Empty objects or arrays are flattened to `null`.
-    */
-    static void flatten(const std::string& reference_string,
-                        const BasicJsonType& value,
-                        BasicJsonType& result)
-    {
-        switch (value.type())
-        {
-            case detail::value_t::array:
-            {
-                if (value.m_value.array->empty())
-                {
-                    // flatten empty array as null
-                    result[reference_string] = nullptr;
-                }
-                else
-                {
-                    // iterate array and use index as reference string
-                    for (std::size_t i = 0; i < value.m_value.array->size(); ++i)
-                    {
-                        flatten(reference_string + "/" + std::to_string(i),
-                                value.m_value.array->operator[](i), result);
-                    }
-                }
-                break;
-            }
-
-            case detail::value_t::object:
-            {
-                if (value.m_value.object->empty())
-                {
-                    // flatten empty object as null
-                    result[reference_string] = nullptr;
-                }
-                else
-                {
-                    // iterate object and use keys as reference string
-                    for (const auto& element : *value.m_value.object)
-                    {
-                        flatten(reference_string + "/" + detail::escape(element.first), element.second, result);
-                    }
-                }
-                break;
-            }
-
-            case detail::value_t::null:
-            case detail::value_t::string:
-            case detail::value_t::boolean:
-            case detail::value_t::number_integer:
-            case detail::value_t::number_unsigned:
-            case detail::value_t::number_float:
-            case detail::value_t::binary:
-            case detail::value_t::discarded:
-            default:
-            {
-                // add primitive value with its reference string
-                result[reference_string] = value;
-                break;
-            }
-        }
-    }
-
-    /*!
-    @param[in] value  flattened JSON
-
-    @return unflattened JSON
-
-    @throw parse_error.109 if array index is not a number
-    @throw type_error.314  if value is not an object
-    @throw type_error.315  if object values are not primitive
-    @throw type_error.313  if value cannot be unflattened
-    */
-    static BasicJsonType
-    unflatten(const BasicJsonType& value)
-    {
-        if (JSON_HEDLEY_UNLIKELY(!value.is_object()))
-        {
-            JSON_THROW(detail::type_error::create(314, "only objects can be unflattened", value));
-        }
-
-        BasicJsonType result;
-
-        // iterate the JSON object values
-        for (const auto& element : *value.m_value.object)
-        {
-            if (JSON_HEDLEY_UNLIKELY(!element.second.is_primitive()))
-            {
-                JSON_THROW(detail::type_error::create(315, "values in object must be primitive", element.second));
-            }
-
-            // assign value to reference pointed to by JSON pointer; Note that if
-            // the JSON pointer is "" (i.e., points to the whole value), function
-            // get_and_create returns a reference to result itself. An assignment
-            // will then create a primitive value.
-            json_pointer(element.first).get_and_create(result) = element.second;
-        }
-
-        return result;
-    }
-
-    /*!
-    @brief compares two JSON pointers for equality
-
-    @param[in] lhs  JSON pointer to compare
-    @param[in] rhs  JSON pointer to compare
-    @return whether @a lhs is equal to @a rhs
-
-    @complexity Linear in the length of the JSON pointer
-
-    @exceptionsafety No-throw guarantee: this function never throws exceptions.
-    */
-    friend bool operator==(json_pointer const& lhs,
-                           json_pointer const& rhs) noexcept
-    {
-        return lhs.reference_tokens == rhs.reference_tokens;
-    }
-
-    /*!
-    @brief compares two JSON pointers for inequality
-
-    @param[in] lhs  JSON pointer to compare
-    @param[in] rhs  JSON pointer to compare
-    @return whether @a lhs is not equal @a rhs
-
-    @complexity Linear in the length of the JSON pointer
-
-    @exceptionsafety No-throw guarantee: this function never throws exceptions.
-    */
-    friend bool operator!=(json_pointer const& lhs,
-                           json_pointer const& rhs) noexcept
-    {
-        return !(lhs == rhs);
-    }
-
-    /// the reference tokens
-    std::vector<std::string> reference_tokens;
-};
-}  // namespace nlohmann
-
-// #include <nlohmann/detail/json_ref.hpp>
-
-
-#include <initializer_list>
-#include <utility>
-
-// #include <nlohmann/detail/meta/type_traits.hpp>
-
-
-namespace nlohmann
-{
-namespace detail
-{
-template<typename BasicJsonType>
-class json_ref
-{
-  public:
-    using value_type = BasicJsonType;
-
-    json_ref(value_type&& value)
-        : owned_value(std::move(value))
-    {}
-
-    json_ref(const value_type& value)
-        : value_ref(&value)
-    {}
-
-    json_ref(std::initializer_list<json_ref> init)
-        : owned_value(init)
-    {}
-
-    template <
-        class... Args,
-        enable_if_t<std::is_constructible<value_type, Args...>::value, int> = 0 >
-    json_ref(Args && ... args)
-        : owned_value(std::forward<Args>(args)...)
-    {}
-
-    // class should be movable only
-    json_ref(json_ref&&) noexcept = default;
-    json_ref(const json_ref&) = delete;
-    json_ref& operator=(const json_ref&) = delete;
-    json_ref& operator=(json_ref&&) = delete;
-    ~json_ref() = default;
-
-    value_type moved_or_copied() const
-    {
-        if (value_ref == nullptr)
-        {
-            return std::move(owned_value);
-        }
-        return *value_ref;
-    }
-
-    value_type const& operator*() const
-    {
-        return value_ref ? *value_ref : owned_value;
-    }
-
-    value_type const* operator->() const
-    {
-        return &** this;
-    }
-
-  private:
-    mutable value_type owned_value = nullptr;
-    value_type const* value_ref = nullptr;
-};
-}  // namespace detail
-}  // namespace nlohmann
-
-// #include <nlohmann/detail/macro_scope.hpp>
-
-// #include <nlohmann/detail/string_escape.hpp>
-
-// #include <nlohmann/detail/meta/cpp_future.hpp>
-
-// #include <nlohmann/detail/meta/type_traits.hpp>
-
-// #include <nlohmann/detail/output/binary_writer.hpp>
-
-
-#include <algorithm> // reverse
-#include <array> // array
-#include <cmath> // isnan, isinf
-#include <cstdint> // uint8_t, uint16_t, uint32_t, uint64_t
-#include <cstring> // memcpy
-#include <limits> // numeric_limits
-#include <string> // string
-#include <utility> // move
-
-// #include <nlohmann/detail/input/binary_reader.hpp>
-
-// #include <nlohmann/detail/macro_scope.hpp>
-
-// #include <nlohmann/detail/output/output_adapters.hpp>
-
-
-#include <algorithm> // copy
-#include <cstddef> // size_t
-#include <iterator> // back_inserter
-#include <memory> // shared_ptr, make_shared
-#include <string> // basic_string
-#include <vector> // vector
-
-#ifndef JSON_NO_IO
-    #include <ios>      // streamsize
-    #include <ostream>  // basic_ostream
-#endif  // JSON_NO_IO
-
-// #include <nlohmann/detail/macro_scope.hpp>
-
-
-namespace nlohmann
-{
-namespace detail
-{
-/// abstract output adapter interface
-template<typename CharType> struct output_adapter_protocol
-{
-    virtual void write_character(CharType c) = 0;
-    virtual void write_characters(const CharType* s, std::size_t length) = 0;
-    virtual ~output_adapter_protocol() = default;
-
-    output_adapter_protocol() = default;
-    output_adapter_protocol(const output_adapter_protocol&) = default;
-    output_adapter_protocol(output_adapter_protocol&&) noexcept = default;
-    output_adapter_protocol& operator=(const output_adapter_protocol&) = default;
-    output_adapter_protocol& operator=(output_adapter_protocol&&) noexcept = default;
-};
-
-/// a type to simplify interfaces
-template<typename CharType>
-using output_adapter_t = std::shared_ptr<output_adapter_protocol<CharType>>;
-
-/// output adapter for byte vectors
-template<typename CharType, typename AllocatorType = std::allocator<CharType>>
-class output_vector_adapter : public output_adapter_protocol<CharType>
-{
-  public:
-    explicit output_vector_adapter(std::vector<CharType, AllocatorType>& vec) noexcept
-        : v(vec)
-    {}
-
-    void write_character(CharType c) override
-    {
-        v.push_back(c);
-    }
-
-    JSON_HEDLEY_NON_NULL(2)
-    void write_characters(const CharType* s, std::size_t length) override
-    {
-        std::copy(s, s + length, std::back_inserter(v));
-    }
-
-  private:
-    std::vector<CharType, AllocatorType>& v;
-};
-
-#ifndef JSON_NO_IO
-/// output adapter for output streams
-template<typename CharType>
-class output_stream_adapter : public output_adapter_protocol<CharType>
-{
-  public:
-    explicit output_stream_adapter(std::basic_ostream<CharType>& s) noexcept
-        : stream(s)
-    {}
-
-    void write_character(CharType c) override
-    {
-        stream.put(c);
-    }
-
-    JSON_HEDLEY_NON_NULL(2)
-    void write_characters(const CharType* s, std::size_t length) override
-    {
-        stream.write(s, static_cast<std::streamsize>(length));
-    }
-
-  private:
-    std::basic_ostream<CharType>& stream;
-};
-#endif  // JSON_NO_IO
-
-/// output adapter for basic_string
-template<typename CharType, typename StringType = std::basic_string<CharType>>
-class output_string_adapter : public output_adapter_protocol<CharType>
-{
-  public:
-    explicit output_string_adapter(StringType& s) noexcept
-        : str(s)
-    {}
-
-    void write_character(CharType c) override
-    {
-        str.push_back(c);
-    }
-
-    JSON_HEDLEY_NON_NULL(2)
-    void write_characters(const CharType* s, std::size_t length) override
-    {
-        str.append(s, length);
-    }
-
-  private:
-    StringType& str;
-};
-
-template<typename CharType, typename StringType = std::basic_string<CharType>>
-class output_adapter
-{
-  public:
-    template<typename AllocatorType = std::allocator<CharType>>
-    output_adapter(std::vector<CharType, AllocatorType>& vec)
-        : oa(std::make_shared<output_vector_adapter<CharType, AllocatorType>>(vec)) {}
-
-#ifndef JSON_NO_IO
-    output_adapter(std::basic_ostream<CharType>& s)
-        : oa(std::make_shared<output_stream_adapter<CharType>>(s)) {}
-#endif  // JSON_NO_IO
-
-    output_adapter(StringType& s)
-        : oa(std::make_shared<output_string_adapter<CharType, StringType>>(s)) {}
-
-    operator output_adapter_t<CharType>()
-    {
-        return oa;
-    }
-
-  private:
-    output_adapter_t<CharType> oa = nullptr;
-};
-}  // namespace detail
-}  // namespace nlohmann
-
-
-namespace nlohmann
-{
-namespace detail
-{
-///////////////////
-// binary writer //
-///////////////////
-
-/*!
-@brief serialization to CBOR and MessagePack values
-*/
-template<typename BasicJsonType, typename CharType>
-class binary_writer
-{
-    using string_t = typename BasicJsonType::string_t;
-    using binary_t = typename BasicJsonType::binary_t;
-    using number_float_t = typename BasicJsonType::number_float_t;
-
-  public:
-    /*!
-    @brief create a binary writer
-
-    @param[in] adapter  output adapter to write to
-    */
-    explicit binary_writer(output_adapter_t<CharType> adapter) : oa(std::move(adapter))
-    {
-        JSON_ASSERT(oa);
-    }
-
-    /*!
-    @param[in] j  JSON value to serialize
-    @pre       j.type() == value_t::object
-    */
-    void write_bson(const BasicJsonType& j)
-    {
-        switch (j.type())
-        {
-            case value_t::object:
-            {
-                write_bson_object(*j.m_value.object);
-                break;
-            }
-
-            case value_t::null:
-            case value_t::array:
-            case value_t::string:
-            case value_t::boolean:
-            case value_t::number_integer:
-            case value_t::number_unsigned:
-            case value_t::number_float:
-            case value_t::binary:
-            case value_t::discarded:
-            default:
-            {
-                JSON_THROW(type_error::create(317, "to serialize to BSON, top-level type must be object, but is " + std::string(j.type_name()), j));
-            }
-        }
-    }
-
-    /*!
-    @param[in] j  JSON value to serialize
-    */
-    void write_cbor(const BasicJsonType& j)
-    {
-        switch (j.type())
-        {
-            case value_t::null:
-            {
-                oa->write_character(to_char_type(0xF6));
-                break;
-            }
-
-            case value_t::boolean:
-            {
-                oa->write_character(j.m_value.boolean
-                                    ? to_char_type(0xF5)
-                                    : to_char_type(0xF4));
-                break;
-            }
-
-            case value_t::number_integer:
-            {
-                if (j.m_value.number_integer >= 0)
-                {
-                    // CBOR does not differentiate between positive signed
-                    // integers and unsigned integers. Therefore, we used the
-                    // code from the value_t::number_unsigned case here.
-                    if (j.m_value.number_integer <= 0x17)
-                    {
-                        write_number(static_cast<std::uint8_t>(j.m_value.number_integer));
-                    }
-                    else if (j.m_value.number_integer <= (std::numeric_limits<std::uint8_t>::max)())
-                    {
-                        oa->write_character(to_char_type(0x18));
-                        write_number(static_cast<std::uint8_t>(j.m_value.number_integer));
-                    }
-                    else if (j.m_value.number_integer <= (std::numeric_limits<std::uint16_t>::max)())
-                    {
-                        oa->write_character(to_char_type(0x19));
-                        write_number(static_cast<std::uint16_t>(j.m_value.number_integer));
-                    }
-                    else if (j.m_value.number_integer <= (std::numeric_limits<std::uint32_t>::max)())
-                    {
-                        oa->write_character(to_char_type(0x1A));
-                        write_number(static_cast<std::uint32_t>(j.m_value.number_integer));
-                    }
-                    else
-                    {
-                        oa->write_character(to_char_type(0x1B));
-                        write_number(static_cast<std::uint64_t>(j.m_value.number_integer));
-                    }
-                }
-                else
-                {
-                    // The conversions below encode the sign in the first
-                    // byte, and the value is converted to a positive number.
-                    const auto positive_number = -1 - j.m_value.number_integer;
-                    if (j.m_value.number_integer >= -24)
-                    {
-                        write_number(static_cast<std::uint8_t>(0x20 + positive_number));
-                    }
-                    else if (positive_number <= (std::numeric_limits<std::uint8_t>::max)())
-                    {
-                        oa->write_character(to_char_type(0x38));
-                        write_number(static_cast<std::uint8_t>(positive_number));
-                    }
-                    else if (positive_number <= (std::numeric_limits<std::uint16_t>::max)())
-                    {
-                        oa->write_character(to_char_type(0x39));
-                        write_number(static_cast<std::uint16_t>(positive_number));
-                    }
-                    else if (positive_number <= (std::numeric_limits<std::uint32_t>::max)())
-                    {
-                        oa->write_character(to_char_type(0x3A));
-                        write_number(static_cast<std::uint32_t>(positive_number));
-                    }
-                    else
-                    {
-                        oa->write_character(to_char_type(0x3B));
-                        write_number(static_cast<std::uint64_t>(positive_number));
-                    }
-                }
-                break;
-            }
-
-            case value_t::number_unsigned:
-            {
-                if (j.m_value.number_unsigned <= 0x17)
-                {
-                    write_number(static_cast<std::uint8_t>(j.m_value.number_unsigned));
-                }
-                else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint8_t>::max)())
-                {
-                    oa->write_character(to_char_type(0x18));
-                    write_number(static_cast<std::uint8_t>(j.m_value.number_unsigned));
-                }
-                else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint16_t>::max)())
-                {
-                    oa->write_character(to_char_type(0x19));
-                    write_number(static_cast<std::uint16_t>(j.m_value.number_unsigned));
-                }
-                else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint32_t>::max)())
-                {
-                    oa->write_character(to_char_type(0x1A));
-                    write_number(static_cast<std::uint32_t>(j.m_value.number_unsigned));
-                }
-                else
-                {
-                    oa->write_character(to_char_type(0x1B));
-                    write_number(static_cast<std::uint64_t>(j.m_value.number_unsigned));
-                }
-                break;
-            }
-
-            case value_t::number_float:
-            {
-                if (std::isnan(j.m_value.number_float))
-                {
-                    // NaN is 0xf97e00 in CBOR
-                    oa->write_character(to_char_type(0xF9));
-                    oa->write_character(to_char_type(0x7E));
-                    oa->write_character(to_char_type(0x00));
-                }
-                else if (std::isinf(j.m_value.number_float))
-                {
-                    // Infinity is 0xf97c00, -Infinity is 0xf9fc00
-                    oa->write_character(to_char_type(0xf9));
-                    oa->write_character(j.m_value.number_float > 0 ? to_char_type(0x7C) : to_char_type(0xFC));
-                    oa->write_character(to_char_type(0x00));
-                }
-                else
-                {
-                    write_compact_float(j.m_value.number_float, detail::input_format_t::cbor);
-                }
-                break;
-            }
-
-            case value_t::string:
-            {
-                // step 1: write control byte and the string length
-                const auto N = j.m_value.string->size();
-                if (N <= 0x17)
-                {
-                    write_number(static_cast<std::uint8_t>(0x60 + N));
-                }
-                else if (N <= (std::numeric_limits<std::uint8_t>::max)())
-                {
-                    oa->write_character(to_char_type(0x78));
-                    write_number(static_cast<std::uint8_t>(N));
-                }
-                else if (N <= (std::numeric_limits<std::uint16_t>::max)())
-                {
-                    oa->write_character(to_char_type(0x79));
-                    write_number(static_cast<std::uint16_t>(N));
-                }
-                else if (N <= (std::numeric_limits<std::uint32_t>::max)())
-                {
-                    oa->write_character(to_char_type(0x7A));
-                    write_number(static_cast<std::uint32_t>(N));
-                }
-                // LCOV_EXCL_START
-                else if (N <= (std::numeric_limits<std::uint64_t>::max)())
-                {
-                    oa->write_character(to_char_type(0x7B));
-                    write_number(static_cast<std::uint64_t>(N));
-                }
-                // LCOV_EXCL_STOP
-
-                // step 2: write the string
-                oa->write_characters(
-                    reinterpret_cast<const CharType*>(j.m_value.string->c_str()),
-                    j.m_value.string->size());
-                break;
-            }
-
-            case value_t::array:
-            {
-                // step 1: write control byte and the array size
-                const auto N = j.m_value.array->size();
-                if (N <= 0x17)
-                {
-                    write_number(static_cast<std::uint8_t>(0x80 + N));
-                }
-                else if (N <= (std::numeric_limits<std::uint8_t>::max)())
-                {
-                    oa->write_character(to_char_type(0x98));
-                    write_number(static_cast<std::uint8_t>(N));
-                }
-                else if (N <= (std::numeric_limits<std::uint16_t>::max)())
-                {
-                    oa->write_character(to_char_type(0x99));
-                    write_number(static_cast<std::uint16_t>(N));
-                }
-                else if (N <= (std::numeric_limits<std::uint32_t>::max)())
-                {
-                    oa->write_character(to_char_type(0x9A));
-                    write_number(static_cast<std::uint32_t>(N));
-                }
-                // LCOV_EXCL_START
-                else if (N <= (std::numeric_limits<std::uint64_t>::max)())
-                {
-                    oa->write_character(to_char_type(0x9B));
-                    write_number(static_cast<std::uint64_t>(N));
-                }
-                // LCOV_EXCL_STOP
-
-                // step 2: write each element
-                for (const auto& el : *j.m_value.array)
-                {
-                    write_cbor(el);
-                }
-                break;
-            }
-
-            case value_t::binary:
-            {
-                if (j.m_value.binary->has_subtype())
-                {
-                    if (j.m_value.binary->subtype() <= (std::numeric_limits<std::uint8_t>::max)())
-                    {
-                        write_number(static_cast<std::uint8_t>(0xd8));
-                        write_number(static_cast<std::uint8_t>(j.m_value.binary->subtype()));
-                    }
-                    else if (j.m_value.binary->subtype() <= (std::numeric_limits<std::uint16_t>::max)())
-                    {
-                        write_number(static_cast<std::uint8_t>(0xd9));
-                        write_number(static_cast<std::uint16_t>(j.m_value.binary->subtype()));
-                    }
-                    else if (j.m_value.binary->subtype() <= (std::numeric_limits<std::uint32_t>::max)())
-                    {
-                        write_number(static_cast<std::uint8_t>(0xda));
-                        write_number(static_cast<std::uint32_t>(j.m_value.binary->subtype()));
-                    }
-                    else if (j.m_value.binary->subtype() <= (std::numeric_limits<std::uint64_t>::max)())
-                    {
-                        write_number(static_cast<std::uint8_t>(0xdb));
-                        write_number(static_cast<std::uint64_t>(j.m_value.binary->subtype()));
-                    }
-                }
-
-                // step 1: write control byte and the binary array size
-                const auto N = j.m_value.binary->size();
-                if (N <= 0x17)
-                {
-                    write_number(static_cast<std::uint8_t>(0x40 + N));
-                }
-                else if (N <= (std::numeric_limits<std::uint8_t>::max)())
-                {
-                    oa->write_character(to_char_type(0x58));
-                    write_number(static_cast<std::uint8_t>(N));
-                }
-                else if (N <= (std::numeric_limits<std::uint16_t>::max)())
-                {
-                    oa->write_character(to_char_type(0x59));
-                    write_number(static_cast<std::uint16_t>(N));
-                }
-                else if (N <= (std::numeric_limits<std::uint32_t>::max)())
-                {
-                    oa->write_character(to_char_type(0x5A));
-                    write_number(static_cast<std::uint32_t>(N));
-                }
-                // LCOV_EXCL_START
-                else if (N <= (std::numeric_limits<std::uint64_t>::max)())
-                {
-                    oa->write_character(to_char_type(0x5B));
-                    write_number(static_cast<std::uint64_t>(N));
-                }
-                // LCOV_EXCL_STOP
-
-                // step 2: write each element
-                oa->write_characters(
-                    reinterpret_cast<const CharType*>(j.m_value.binary->data()),
-                    N);
-
-                break;
-            }
-
-            case value_t::object:
-            {
-                // step 1: write control byte and the object size
-                const auto N = j.m_value.object->size();
-                if (N <= 0x17)
-                {
-                    write_number(static_cast<std::uint8_t>(0xA0 + N));
-                }
-                else if (N <= (std::numeric_limits<std::uint8_t>::max)())
-                {
-                    oa->write_character(to_char_type(0xB8));
-                    write_number(static_cast<std::uint8_t>(N));
-                }
-                else if (N <= (std::numeric_limits<std::uint16_t>::max)())
-                {
-                    oa->write_character(to_char_type(0xB9));
-                    write_number(static_cast<std::uint16_t>(N));
-                }
-                else if (N <= (std::numeric_limits<std::uint32_t>::max)())
-                {
-                    oa->write_character(to_char_type(0xBA));
-                    write_number(static_cast<std::uint32_t>(N));
-                }
-                // LCOV_EXCL_START
-                else if (N <= (std::numeric_limits<std::uint64_t>::max)())
-                {
-                    oa->write_character(to_char_type(0xBB));
-                    write_number(static_cast<std::uint64_t>(N));
-                }
-                // LCOV_EXCL_STOP
-
-                // step 2: write each element
-                for (const auto& el : *j.m_value.object)
-                {
-                    write_cbor(el.first);
-                    write_cbor(el.second);
-                }
-                break;
-            }
-
-            case value_t::discarded:
-            default:
-                break;
-        }
-    }
-
-    /*!
-    @param[in] j  JSON value to serialize
-    */
-    void write_msgpack(const BasicJsonType& j)
-    {
-        switch (j.type())
-        {
-            case value_t::null: // nil
-            {
-                oa->write_character(to_char_type(0xC0));
-                break;
-            }
-
-            case value_t::boolean: // true and false
-            {
-                oa->write_character(j.m_value.boolean
-                                    ? to_char_type(0xC3)
-                                    : to_char_type(0xC2));
-                break;
-            }
-
-            case value_t::number_integer:
-            {
-                if (j.m_value.number_integer >= 0)
-                {
-                    // MessagePack does not differentiate between positive
-                    // signed integers and unsigned integers. Therefore, we used
-                    // the code from the value_t::number_unsigned case here.
-                    if (j.m_value.number_unsigned < 128)
-                    {
-                        // positive fixnum
-                        write_number(static_cast<std::uint8_t>(j.m_value.number_integer));
-                    }
-                    else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint8_t>::max)())
-                    {
-                        // uint 8
-                        oa->write_character(to_char_type(0xCC));
-                        write_number(static_cast<std::uint8_t>(j.m_value.number_integer));
-                    }
-                    else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint16_t>::max)())
-                    {
-                        // uint 16
-                        oa->write_character(to_char_type(0xCD));
-                        write_number(static_cast<std::uint16_t>(j.m_value.number_integer));
-                    }
-                    else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint32_t>::max)())
-                    {
-                        // uint 32
-                        oa->write_character(to_char_type(0xCE));
-                        write_number(static_cast<std::uint32_t>(j.m_value.number_integer));
-                    }
-                    else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint64_t>::max)())
-                    {
-                        // uint 64
-                        oa->write_character(to_char_type(0xCF));
-                        write_number(static_cast<std::uint64_t>(j.m_value.number_integer));
-                    }
-                }
-                else
-                {
-                    if (j.m_value.number_integer >= -32)
-                    {
-                        // negative fixnum
-                        write_number(static_cast<std::int8_t>(j.m_value.number_integer));
-                    }
-                    else if (j.m_value.number_integer >= (std::numeric_limits<std::int8_t>::min)() &&
-                             j.m_value.number_integer <= (std::numeric_limits<std::int8_t>::max)())
-                    {
-                        // int 8
-                        oa->write_character(to_char_type(0xD0));
-                        write_number(static_cast<std::int8_t>(j.m_value.number_integer));
-                    }
-                    else if (j.m_value.number_integer >= (std::numeric_limits<std::int16_t>::min)() &&
-                             j.m_value.number_integer <= (std::numeric_limits<std::int16_t>::max)())
-                    {
-                        // int 16
-                        oa->write_character(to_char_type(0xD1));
-                        write_number(static_cast<std::int16_t>(j.m_value.number_integer));
-                    }
-                    else if (j.m_value.number_integer >= (std::numeric_limits<std::int32_t>::min)() &&
-                             j.m_value.number_integer <= (std::numeric_limits<std::int32_t>::max)())
-                    {
-                        // int 32
-                        oa->write_character(to_char_type(0xD2));
-                        write_number(static_cast<std::int32_t>(j.m_value.number_integer));
-                    }
-                    else if (j.m_value.number_integer >= (std::numeric_limits<std::int64_t>::min)() &&
-                             j.m_value.number_integer <= (std::numeric_limits<std::int64_t>::max)())
-                    {
-                        // int 64
-                        oa->write_character(to_char_type(0xD3));
-                        write_number(static_cast<std::int64_t>(j.m_value.number_integer));
-                    }
-                }
-                break;
-            }
-
-            case value_t::number_unsigned:
-            {
-                if (j.m_value.number_unsigned < 128)
-                {
-                    // positive fixnum
-                    write_number(static_cast<std::uint8_t>(j.m_value.number_integer));
-                }
-                else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint8_t>::max)())
-                {
-                    // uint 8
-                    oa->write_character(to_char_type(0xCC));
-                    write_number(static_cast<std::uint8_t>(j.m_value.number_integer));
-                }
-                else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint16_t>::max)())
-                {
-                    // uint 16
-                    oa->write_character(to_char_type(0xCD));
-                    write_number(static_cast<std::uint16_t>(j.m_value.number_integer));
-                }
-                else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint32_t>::max)())
-                {
-                    // uint 32
-                    oa->write_character(to_char_type(0xCE));
-                    write_number(static_cast<std::uint32_t>(j.m_value.number_integer));
-                }
-                else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint64_t>::max)())
-                {
-                    // uint 64
-                    oa->write_character(to_char_type(0xCF));
-                    write_number(static_cast<std::uint64_t>(j.m_value.number_integer));
-                }
-                break;
-            }
-
-            case value_t::number_float:
-            {
-                write_compact_float(j.m_value.number_float, detail::input_format_t::msgpack);
-                break;
-            }
-
-            case value_t::string:
-            {
-                // step 1: write control byte and the string length
-                const auto N = j.m_value.string->size();
-                if (N <= 31)
-                {
-                    // fixstr
-                    write_number(static_cast<std::uint8_t>(0xA0 | N));
-                }
-                else if (N <= (std::numeric_limits<std::uint8_t>::max)())
-                {
-                    // str 8
-                    oa->write_character(to_char_type(0xD9));
-                    write_number(static_cast<std::uint8_t>(N));
-                }
-                else if (N <= (std::numeric_limits<std::uint16_t>::max)())
-                {
-                    // str 16
-                    oa->write_character(to_char_type(0xDA));
-                    write_number(static_cast<std::uint16_t>(N));
-                }
-                else if (N <= (std::numeric_limits<std::uint32_t>::max)())
-                {
-                    // str 32
-                    oa->write_character(to_char_type(0xDB));
-                    write_number(static_cast<std::uint32_t>(N));
-                }
-
-                // step 2: write the string
-                oa->write_characters(
-                    reinterpret_cast<const CharType*>(j.m_value.string->c_str()),
-                    j.m_value.string->size());
-                break;
-            }
-
-            case value_t::array:
-            {
-                // step 1: write control byte and the array size
-                const auto N = j.m_value.array->size();
-                if (N <= 15)
-                {
-                    // fixarray
-                    write_number(static_cast<std::uint8_t>(0x90 | N));
-                }
-                else if (N <= (std::numeric_limits<std::uint16_t>::max)())
-                {
-                    // array 16
-                    oa->write_character(to_char_type(0xDC));
-                    write_number(static_cast<std::uint16_t>(N));
-                }
-                else if (N <= (std::numeric_limits<std::uint32_t>::max)())
-                {
-                    // array 32
-                    oa->write_character(to_char_type(0xDD));
-                    write_number(static_cast<std::uint32_t>(N));
-                }
-
-                // step 2: write each element
-                for (const auto& el : *j.m_value.array)
-                {
-                    write_msgpack(el);
-                }
-                break;
-            }
-
-            case value_t::binary:
-            {
-                // step 0: determine if the binary type has a set subtype to
-                // determine whether or not to use the ext or fixext types
-                const bool use_ext = j.m_value.binary->has_subtype();
-
-                // step 1: write control byte and the byte string length
-                const auto N = j.m_value.binary->size();
-                if (N <= (std::numeric_limits<std::uint8_t>::max)())
-                {
-                    std::uint8_t output_type{};
-                    bool fixed = true;
-                    if (use_ext)
-                    {
-                        switch (N)
-                        {
-                            case 1:
-                                output_type = 0xD4; // fixext 1
-                                break;
-                            case 2:
-                                output_type = 0xD5; // fixext 2
-                                break;
-                            case 4:
-                                output_type = 0xD6; // fixext 4
-                                break;
-                            case 8:
-                                output_type = 0xD7; // fixext 8
-                                break;
-                            case 16:
-                                output_type = 0xD8; // fixext 16
-                                break;
-                            default:
-                                output_type = 0xC7; // ext 8
-                                fixed = false;
-                                break;
-                        }
-
-                    }
-                    else
-                    {
-                        output_type = 0xC4; // bin 8
-                        fixed = false;
-                    }
-
-                    oa->write_character(to_char_type(output_type));
-                    if (!fixed)
-                    {
-                        write_number(static_cast<std::uint8_t>(N));
-                    }
-                }
-                else if (N <= (std::numeric_limits<std::uint16_t>::max)())
-                {
-                    std::uint8_t output_type = use_ext
-                                               ? 0xC8 // ext 16
-                                               : 0xC5; // bin 16
-
-                    oa->write_character(to_char_type(output_type));
-                    write_number(static_cast<std::uint16_t>(N));
-                }
-                else if (N <= (std::numeric_limits<std::uint32_t>::max)())
-                {
-                    std::uint8_t output_type = use_ext
-                                               ? 0xC9 // ext 32
-                                               : 0xC6; // bin 32
-
-                    oa->write_character(to_char_type(output_type));
-                    write_number(static_cast<std::uint32_t>(N));
-                }
-
-                // step 1.5: if this is an ext type, write the subtype
-                if (use_ext)
-                {
-                    write_number(static_cast<std::int8_t>(j.m_value.binary->subtype()));
-                }
-
-                // step 2: write the byte string
-                oa->write_characters(
-                    reinterpret_cast<const CharType*>(j.m_value.binary->data()),
-                    N);
-
-                break;
-            }
-
-            case value_t::object:
-            {
-                // step 1: write control byte and the object size
-                const auto N = j.m_value.object->size();
-                if (N <= 15)
-                {
-                    // fixmap
-                    write_number(static_cast<std::uint8_t>(0x80 | (N & 0xF)));
-                }
-                else if (N <= (std::numeric_limits<std::uint16_t>::max)())
-                {
-                    // map 16
-                    oa->write_character(to_char_type(0xDE));
-                    write_number(static_cast<std::uint16_t>(N));
-                }
-                else if (N <= (std::numeric_limits<std::uint32_t>::max)())
-                {
-                    // map 32
-                    oa->write_character(to_char_type(0xDF));
-                    write_number(static_cast<std::uint32_t>(N));
-                }
-
-                // step 2: write each element
-                for (const auto& el : *j.m_value.object)
-                {
-                    write_msgpack(el.first);
-                    write_msgpack(el.second);
-                }
-                break;
-            }
-
-            case value_t::discarded:
-            default:
-                break;
-        }
-    }
-
-    /*!
-    @param[in] j  JSON value to serialize
-    @param[in] use_count   whether to use '#' prefixes (optimized format)
-    @param[in] use_type    whether to use '$' prefixes (optimized format)
-    @param[in] add_prefix  whether prefixes need to be used for this value
-    */
-    void write_ubjson(const BasicJsonType& j, const bool use_count,
-                      const bool use_type, const bool add_prefix = true)
-    {
-        switch (j.type())
-        {
-            case value_t::null:
-            {
-                if (add_prefix)
-                {
-                    oa->write_character(to_char_type('Z'));
-                }
-                break;
-            }
-
-            case value_t::boolean:
-            {
-                if (add_prefix)
-                {
-                    oa->write_character(j.m_value.boolean
-                                        ? to_char_type('T')
-                                        : to_char_type('F'));
-                }
-                break;
-            }
-
-            case value_t::number_integer:
-            {
-                write_number_with_ubjson_prefix(j.m_value.number_integer, add_prefix);
-                break;
-            }
-
-            case value_t::number_unsigned:
-            {
-                write_number_with_ubjson_prefix(j.m_value.number_unsigned, add_prefix);
-                break;
-            }
-
-            case value_t::number_float:
-            {
-                write_number_with_ubjson_prefix(j.m_value.number_float, add_prefix);
-                break;
-            }
-
-            case value_t::string:
-            {
-                if (add_prefix)
-                {
-                    oa->write_character(to_char_type('S'));
-                }
-                write_number_with_ubjson_prefix(j.m_value.string->size(), true);
-                oa->write_characters(
-                    reinterpret_cast<const CharType*>(j.m_value.string->c_str()),
-                    j.m_value.string->size());
-                break;
-            }
-
-            case value_t::array:
-            {
-                if (add_prefix)
-                {
-                    oa->write_character(to_char_type('['));
-                }
-
-                bool prefix_required = true;
-                if (use_type && !j.m_value.array->empty())
-                {
-                    JSON_ASSERT(use_count);
-                    const CharType first_prefix = ubjson_prefix(j.front());
-                    const bool same_prefix = std::all_of(j.begin() + 1, j.end(),
-                                                         [this, first_prefix](const BasicJsonType & v)
-                    {
-                        return ubjson_prefix(v) == first_prefix;
-                    });
-
-                    if (same_prefix)
-                    {
-                        prefix_required = false;
-                        oa->write_character(to_char_type('$'));
-                        oa->write_character(first_prefix);
-                    }
-                }
-
-                if (use_count)
-                {
-                    oa->write_character(to_char_type('#'));
-                    write_number_with_ubjson_prefix(j.m_value.array->size(), true);
-                }
-
-                for (const auto& el : *j.m_value.array)
-                {
-                    write_ubjson(el, use_count, use_type, prefix_required);
-                }
-
-                if (!use_count)
-                {
-                    oa->write_character(to_char_type(']'));
-                }
-
-                break;
-            }
-
-            case value_t::binary:
-            {
-                if (add_prefix)
-                {
-                    oa->write_character(to_char_type('['));
-                }
-
-                if (use_type && !j.m_value.binary->empty())
-                {
-                    JSON_ASSERT(use_count);
-                    oa->write_character(to_char_type('$'));
-                    oa->write_character('U');
-                }
-
-                if (use_count)
-                {
-                    oa->write_character(to_char_type('#'));
-                    write_number_with_ubjson_prefix(j.m_value.binary->size(), true);
-                }
-
-                if (use_type)
-                {
-                    oa->write_characters(
-                        reinterpret_cast<const CharType*>(j.m_value.binary->data()),
-                        j.m_value.binary->size());
-                }
-                else
-                {
-                    for (size_t i = 0; i < j.m_value.binary->size(); ++i)
-                    {
-                        oa->write_character(to_char_type('U'));
-                        oa->write_character(j.m_value.binary->data()[i]);
-                    }
-                }
-
-                if (!use_count)
-                {
-                    oa->write_character(to_char_type(']'));
-                }
-
-                break;
-            }
-
-            case value_t::object:
-            {
-                if (add_prefix)
-                {
-                    oa->write_character(to_char_type('{'));
-                }
-
-                bool prefix_required = true;
-                if (use_type && !j.m_value.object->empty())
-                {
-                    JSON_ASSERT(use_count);
-                    const CharType first_prefix = ubjson_prefix(j.front());
-                    const bool same_prefix = std::all_of(j.begin(), j.end(),
-                                                         [this, first_prefix](const BasicJsonType & v)
-                    {
-                        return ubjson_prefix(v) == first_prefix;
-                    });
-
-                    if (same_prefix)
-                    {
-                        prefix_required = false;
-                        oa->write_character(to_char_type('$'));
-                        oa->write_character(first_prefix);
-                    }
-                }
-
-                if (use_count)
-                {
-                    oa->write_character(to_char_type('#'));
-                    write_number_with_ubjson_prefix(j.m_value.object->size(), true);
-                }
-
-                for (const auto& el : *j.m_value.object)
-                {
-                    write_number_with_ubjson_prefix(el.first.size(), true);
-                    oa->write_characters(
-                        reinterpret_cast<const CharType*>(el.first.c_str()),
-                        el.first.size());
-                    write_ubjson(el.second, use_count, use_type, prefix_required);
-                }
-
-                if (!use_count)
-                {
-                    oa->write_character(to_char_type('}'));
-                }
-
-                break;
-            }
-
-            case value_t::discarded:
-            default:
-                break;
-        }
-    }
-
-  private:
-    //////////
-    // BSON //
-    //////////
-
-    /*!
-    @return The size of a BSON document entry header, including the id marker
-            and the entry name size (and its null-terminator).
-    */
-    static std::size_t calc_bson_entry_header_size(const string_t& name, const BasicJsonType& j)
-    {
-        const auto it = name.find(static_cast<typename string_t::value_type>(0));
-        if (JSON_HEDLEY_UNLIKELY(it != BasicJsonType::string_t::npos))
-        {
-            JSON_THROW(out_of_range::create(409, "BSON key cannot contain code point U+0000 (at byte " + std::to_string(it) + ")", j));
-            static_cast<void>(j);
-        }
-
-        return /*id*/ 1ul + name.size() + /*zero-terminator*/1u;
-    }
-
-    /*!
-    @brief Writes the given @a element_type and @a name to the output adapter
-    */
-    void write_bson_entry_header(const string_t& name,
-                                 const std::uint8_t element_type)
-    {
-        oa->write_character(to_char_type(element_type)); // boolean
-        oa->write_characters(
-            reinterpret_cast<const CharType*>(name.c_str()),
-            name.size() + 1u);
-    }
-
-    /*!
-    @brief Writes a BSON element with key @a name and boolean value @a value
-    */
-    void write_bson_boolean(const string_t& name,
-                            const bool value)
-    {
-        write_bson_entry_header(name, 0x08);
-        oa->write_character(value ? to_char_type(0x01) : to_char_type(0x00));
-    }
-
-    /*!
-    @brief Writes a BSON element with key @a name and double value @a value
-    */
-    void write_bson_double(const string_t& name,
-                           const double value)
-    {
-        write_bson_entry_header(name, 0x01);
-        write_number<double, true>(value);
-    }
-
-    /*!
-    @return The size of the BSON-encoded string in @a value
-    */
-    static std::size_t calc_bson_string_size(const string_t& value)
-    {
-        return sizeof(std::int32_t) + value.size() + 1ul;
-    }
-
-    /*!
-    @brief Writes a BSON element with key @a name and string value @a value
-    */
-    void write_bson_string(const string_t& name,
-                           const string_t& value)
-    {
-        write_bson_entry_header(name, 0x02);
-
-        write_number<std::int32_t, true>(static_cast<std::int32_t>(value.size() + 1ul));
-        oa->write_characters(
-            reinterpret_cast<const CharType*>(value.c_str()),
-            value.size() + 1);
-    }
-
-    /*!
-    @brief Writes a BSON element with key @a name and null value
-    */
-    void write_bson_null(const string_t& name)
-    {
-        write_bson_entry_header(name, 0x0A);
-    }
-
-    /*!
-    @return The size of the BSON-encoded integer @a value
-    */
-    static std::size_t calc_bson_integer_size(const std::int64_t value)
-    {
-        return (std::numeric_limits<std::int32_t>::min)() <= value && value <= (std::numeric_limits<std::int32_t>::max)()
-               ? sizeof(std::int32_t)
-               : sizeof(std::int64_t);
-    }
-
-    /*!
-    @brief Writes a BSON element with key @a name and integer @a value
-    */
-    void write_bson_integer(const string_t& name,
-                            const std::int64_t value)
-    {
-        if ((std::numeric_limits<std::int32_t>::min)() <= value && value <= (std::numeric_limits<std::int32_t>::max)())
-        {
-            write_bson_entry_header(name, 0x10); // int32
-            write_number<std::int32_t, true>(static_cast<std::int32_t>(value));
-        }
-        else
-        {
-            write_bson_entry_header(name, 0x12); // int64
-            write_number<std::int64_t, true>(static_cast<std::int64_t>(value));
-        }
-    }
-
-    /*!
-    @return The size of the BSON-encoded unsigned integer in @a j
-    */
-    static constexpr std::size_t calc_bson_unsigned_size(const std::uint64_t value) noexcept
-    {
-        return (value <= static_cast<std::uint64_t>((std::numeric_limits<std::int32_t>::max)()))
-               ? sizeof(std::int32_t)
-               : sizeof(std::int64_t);
-    }
-
-    /*!
-    @brief Writes a BSON element with key @a name and unsigned @a value
-    */
-    void write_bson_unsigned(const string_t& name,
-                             const BasicJsonType& j)
-    {
-        if (j.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::int32_t>::max)()))
-        {
-            write_bson_entry_header(name, 0x10 /* int32 */);
-            write_number<std::int32_t, true>(static_cast<std::int32_t>(j.m_value.number_unsigned));
-        }
-        else if (j.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::int64_t>::max)()))
-        {
-            write_bson_entry_header(name, 0x12 /* int64 */);
-            write_number<std::int64_t, true>(static_cast<std::int64_t>(j.m_value.number_unsigned));
-        }
-        else
-        {
-            JSON_THROW(out_of_range::create(407, "integer number " + std::to_string(j.m_value.number_unsigned) + " cannot be represented by BSON as it does not fit int64", j));
-        }
-    }
-
-    /*!
-    @brief Writes a BSON element with key @a name and object @a value
-    */
-    void write_bson_object_entry(const string_t& name,
-                                 const typename BasicJsonType::object_t& value)
-    {
-        write_bson_entry_header(name, 0x03); // object
-        write_bson_object(value);
-    }
-
-    /*!
-    @return The size of the BSON-encoded array @a value
-    */
-    static std::size_t calc_bson_array_size(const typename BasicJsonType::array_t& value)
-    {
-        std::size_t array_index = 0ul;
-
-        const std::size_t embedded_document_size = std::accumulate(std::begin(value), std::end(value), static_cast<std::size_t>(0), [&array_index](std::size_t result, const typename BasicJsonType::array_t::value_type & el)
-        {
-            return result + calc_bson_element_size(std::to_string(array_index++), el);
-        });
-
-        return sizeof(std::int32_t) + embedded_document_size + 1ul;
-    }
-
-    /*!
-    @return The size of the BSON-encoded binary array @a value
-    */
-    static std::size_t calc_bson_binary_size(const typename BasicJsonType::binary_t& value)
-    {
-        return sizeof(std::int32_t) + value.size() + 1ul;
-    }
-
-    /*!
-    @brief Writes a BSON element with key @a name and array @a value
-    */
-    void write_bson_array(const string_t& name,
-                          const typename BasicJsonType::array_t& value)
-    {
-        write_bson_entry_header(name, 0x04); // array
-        write_number<std::int32_t, true>(static_cast<std::int32_t>(calc_bson_array_size(value)));
-
-        std::size_t array_index = 0ul;
-
-        for (const auto& el : value)
-        {
-            write_bson_element(std::to_string(array_index++), el);
-        }
-
-        oa->write_character(to_char_type(0x00));
-    }
-
-    /*!
-    @brief Writes a BSON element with key @a name and binary value @a value
-    */
-    void write_bson_binary(const string_t& name,
-                           const binary_t& value)
-    {
-        write_bson_entry_header(name, 0x05);
-
-        write_number<std::int32_t, true>(static_cast<std::int32_t>(value.size()));
-        write_number(value.has_subtype() ? static_cast<std::uint8_t>(value.subtype()) : static_cast<std::uint8_t>(0x00));
-
-        oa->write_characters(reinterpret_cast<const CharType*>(value.data()), value.size());
-    }
-
-    /*!
-    @brief Calculates the size necessary to serialize the JSON value @a j with its @a name
-    @return The calculated size for the BSON document entry for @a j with the given @a name.
-    */
-    static std::size_t calc_bson_element_size(const string_t& name,
-            const BasicJsonType& j)
-    {
-        const auto header_size = calc_bson_entry_header_size(name, j);
-        switch (j.type())
-        {
-            case value_t::object:
-                return header_size + calc_bson_object_size(*j.m_value.object);
-
-            case value_t::array:
-                return header_size + calc_bson_array_size(*j.m_value.array);
-
-            case value_t::binary:
-                return header_size + calc_bson_binary_size(*j.m_value.binary);
-
-            case value_t::boolean:
-                return header_size + 1ul;
-
-            case value_t::number_float:
-                return header_size + 8ul;
-
-            case value_t::number_integer:
-                return header_size + calc_bson_integer_size(j.m_value.number_integer);
-
-            case value_t::number_unsigned:
-                return header_size + calc_bson_unsigned_size(j.m_value.number_unsigned);
-
-            case value_t::string:
-                return header_size + calc_bson_string_size(*j.m_value.string);
-
-            case value_t::null:
-                return header_size + 0ul;
-
-            // LCOV_EXCL_START
-            case value_t::discarded:
-            default:
-                JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert)
-                return 0ul;
-                // LCOV_EXCL_STOP
-        }
-    }
-
-    /*!
-    @brief Serializes the JSON value @a j to BSON and associates it with the
-           key @a name.
-    @param name The name to associate with the JSON entity @a j within the
-                current BSON document
-    */
-    void write_bson_element(const string_t& name,
-                            const BasicJsonType& j)
-    {
-        switch (j.type())
-        {
-            case value_t::object:
-                return write_bson_object_entry(name, *j.m_value.object);
-
-            case value_t::array:
-                return write_bson_array(name, *j.m_value.array);
-
-            case value_t::binary:
-                return write_bson_binary(name, *j.m_value.binary);
-
-            case value_t::boolean:
-                return write_bson_boolean(name, j.m_value.boolean);
-
-            case value_t::number_float:
-                return write_bson_double(name, j.m_value.number_float);
-
-            case value_t::number_integer:
-                return write_bson_integer(name, j.m_value.number_integer);
-
-            case value_t::number_unsigned:
-                return write_bson_unsigned(name, j);
-
-            case value_t::string:
-                return write_bson_string(name, *j.m_value.string);
-
-            case value_t::null:
-                return write_bson_null(name);
-
-            // LCOV_EXCL_START
-            case value_t::discarded:
-            default:
-                JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert)
-                return;
-                // LCOV_EXCL_STOP
-        }
-    }
-
-    /*!
-    @brief Calculates the size of the BSON serialization of the given
-           JSON-object @a j.
-    @param[in] value  JSON value to serialize
-    @pre       value.type() == value_t::object
-    */
-    static std::size_t calc_bson_object_size(const typename BasicJsonType::object_t& value)
-    {
-        std::size_t document_size = std::accumulate(value.begin(), value.end(), static_cast<std::size_t>(0),
-                                    [](size_t result, const typename BasicJsonType::object_t::value_type & el)
-        {
-            return result += calc_bson_element_size(el.first, el.second);
-        });
-
-        return sizeof(std::int32_t) + document_size + 1ul;
-    }
-
-    /*!
-    @param[in] value  JSON value to serialize
-    @pre       value.type() == value_t::object
-    */
-    void write_bson_object(const typename BasicJsonType::object_t& value)
-    {
-        write_number<std::int32_t, true>(static_cast<std::int32_t>(calc_bson_object_size(value)));
-
-        for (const auto& el : value)
-        {
-            write_bson_element(el.first, el.second);
-        }
-
-        oa->write_character(to_char_type(0x00));
-    }
-
-    //////////
-    // CBOR //
-    //////////
-
-    static constexpr CharType get_cbor_float_prefix(float /*unused*/)
-    {
-        return to_char_type(0xFA);  // Single-Precision Float
-    }
-
-    static constexpr CharType get_cbor_float_prefix(double /*unused*/)
-    {
-        return to_char_type(0xFB);  // Double-Precision Float
-    }
-
-    /////////////
-    // MsgPack //
-    /////////////
-
-    static constexpr CharType get_msgpack_float_prefix(float /*unused*/)
-    {
-        return to_char_type(0xCA);  // float 32
-    }
-
-    static constexpr CharType get_msgpack_float_prefix(double /*unused*/)
-    {
-        return to_char_type(0xCB);  // float 64
-    }
-
-    ////////////
-    // UBJSON //
-    ////////////
-
-    // UBJSON: write number (floating point)
-    template<typename NumberType, typename std::enable_if<
-                 std::is_floating_point<NumberType>::value, int>::type = 0>
-    void write_number_with_ubjson_prefix(const NumberType n,
-                                         const bool add_prefix)
-    {
-        if (add_prefix)
-        {
-            oa->write_character(get_ubjson_float_prefix(n));
-        }
-        write_number(n);
-    }
-
-    // UBJSON: write number (unsigned integer)
-    template<typename NumberType, typename std::enable_if<
-                 std::is_unsigned<NumberType>::value, int>::type = 0>
-    void write_number_with_ubjson_prefix(const NumberType n,
-                                         const bool add_prefix)
-    {
-        if (n <= static_cast<std::uint64_t>((std::numeric_limits<std::int8_t>::max)()))
-        {
-            if (add_prefix)
-            {
-                oa->write_character(to_char_type('i'));  // int8
-            }
-            write_number(static_cast<std::uint8_t>(n));
-        }
-        else if (n <= (std::numeric_limits<std::uint8_t>::max)())
-        {
-            if (add_prefix)
-            {
-                oa->write_character(to_char_type('U'));  // uint8
-            }
-            write_number(static_cast<std::uint8_t>(n));
-        }
-        else if (n <= static_cast<std::uint64_t>((std::numeric_limits<std::int16_t>::max)()))
-        {
-            if (add_prefix)
-            {
-                oa->write_character(to_char_type('I'));  // int16
-            }
-            write_number(static_cast<std::int16_t>(n));
-        }
-        else if (n <= static_cast<std::uint64_t>((std::numeric_limits<std::int32_t>::max)()))
-        {
-            if (add_prefix)
-            {
-                oa->write_character(to_char_type('l'));  // int32
-            }
-            write_number(static_cast<std::int32_t>(n));
-        }
-        else if (n <= static_cast<std::uint64_t>((std::numeric_limits<std::int64_t>::max)()))
-        {
-            if (add_prefix)
-            {
-                oa->write_character(to_char_type('L'));  // int64
-            }
-            write_number(static_cast<std::int64_t>(n));
-        }
-        else
-        {
-            if (add_prefix)
-            {
-                oa->write_character(to_char_type('H'));  // high-precision number
-            }
-
-            const auto number = BasicJsonType(n).dump();
-            write_number_with_ubjson_prefix(number.size(), true);
-            for (std::size_t i = 0; i < number.size(); ++i)
-            {
-                oa->write_character(to_char_type(static_cast<std::uint8_t>(number[i])));
-            }
-        }
-    }
-
-    // UBJSON: write number (signed integer)
-    template < typename NumberType, typename std::enable_if <
-                   std::is_signed<NumberType>::value&&
-                   !std::is_floating_point<NumberType>::value, int >::type = 0 >
-    void write_number_with_ubjson_prefix(const NumberType n,
-                                         const bool add_prefix)
-    {
-        if ((std::numeric_limits<std::int8_t>::min)() <= n && n <= (std::numeric_limits<std::int8_t>::max)())
-        {
-            if (add_prefix)
-            {
-                oa->write_character(to_char_type('i'));  // int8
-            }
-            write_number(static_cast<std::int8_t>(n));
-        }
-        else if (static_cast<std::int64_t>((std::numeric_limits<std::uint8_t>::min)()) <= n && n <= static_cast<std::int64_t>((std::numeric_limits<std::uint8_t>::max)()))
-        {
-            if (add_prefix)
-            {
-                oa->write_character(to_char_type('U'));  // uint8
-            }
-            write_number(static_cast<std::uint8_t>(n));
-        }
-        else if ((std::numeric_limits<std::int16_t>::min)() <= n && n <= (std::numeric_limits<std::int16_t>::max)())
-        {
-            if (add_prefix)
-            {
-                oa->write_character(to_char_type('I'));  // int16
-            }
-            write_number(static_cast<std::int16_t>(n));
-        }
-        else if ((std::numeric_limits<std::int32_t>::min)() <= n && n <= (std::numeric_limits<std::int32_t>::max)())
-        {
-            if (add_prefix)
-            {
-                oa->write_character(to_char_type('l'));  // int32
-            }
-            write_number(static_cast<std::int32_t>(n));
-        }
-        else if ((std::numeric_limits<std::int64_t>::min)() <= n && n <= (std::numeric_limits<std::int64_t>::max)())
-        {
-            if (add_prefix)
-            {
-                oa->write_character(to_char_type('L'));  // int64
-            }
-            write_number(static_cast<std::int64_t>(n));
-        }
-        // LCOV_EXCL_START
-        else
-        {
-            if (add_prefix)
-            {
-                oa->write_character(to_char_type('H'));  // high-precision number
-            }
-
-            const auto number = BasicJsonType(n).dump();
-            write_number_with_ubjson_prefix(number.size(), true);
-            for (std::size_t i = 0; i < number.size(); ++i)
-            {
-                oa->write_character(to_char_type(static_cast<std::uint8_t>(number[i])));
-            }
-        }
-        // LCOV_EXCL_STOP
-    }
-
-    /*!
-    @brief determine the type prefix of container values
-    */
-    CharType ubjson_prefix(const BasicJsonType& j) const noexcept
-    {
-        switch (j.type())
-        {
-            case value_t::null:
-                return 'Z';
-
-            case value_t::boolean:
-                return j.m_value.boolean ? 'T' : 'F';
-
-            case value_t::number_integer:
-            {
-                if ((std::numeric_limits<std::int8_t>::min)() <= j.m_value.number_integer && j.m_value.number_integer <= (std::numeric_limits<std::int8_t>::max)())
-                {
-                    return 'i';
-                }
-                if ((std::numeric_limits<std::uint8_t>::min)() <= j.m_value.number_integer && j.m_value.number_integer <= (std::numeric_limits<std::uint8_t>::max)())
-                {
-                    return 'U';
-                }
-                if ((std::numeric_limits<std::int16_t>::min)() <= j.m_value.number_integer && j.m_value.number_integer <= (std::numeric_limits<std::int16_t>::max)())
-                {
-                    return 'I';
-                }
-                if ((std::numeric_limits<std::int32_t>::min)() <= j.m_value.number_integer && j.m_value.number_integer <= (std::numeric_limits<std::int32_t>::max)())
-                {
-                    return 'l';
-                }
-                if ((std::numeric_limits<std::int64_t>::min)() <= j.m_value.number_integer && j.m_value.number_integer <= (std::numeric_limits<std::int64_t>::max)())
-                {
-                    return 'L';
-                }
-                // anything else is treated as high-precision number
-                return 'H'; // LCOV_EXCL_LINE
-            }
-
-            case value_t::number_unsigned:
-            {
-                if (j.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::int8_t>::max)()))
-                {
-                    return 'i';
-                }
-                if (j.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::uint8_t>::max)()))
-                {
-                    return 'U';
-                }
-                if (j.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::int16_t>::max)()))
-                {
-                    return 'I';
-                }
-                if (j.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::int32_t>::max)()))
-                {
-                    return 'l';
-                }
-                if (j.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::int64_t>::max)()))
-                {
-                    return 'L';
-                }
-                // anything else is treated as high-precision number
-                return 'H'; // LCOV_EXCL_LINE
-            }
-
-            case value_t::number_float:
-                return get_ubjson_float_prefix(j.m_value.number_float);
-
-            case value_t::string:
-                return 'S';
-
-            case value_t::array: // fallthrough
-            case value_t::binary:
-                return '[';
-
-            case value_t::object:
-                return '{';
-
-            case value_t::discarded:
-            default:  // discarded values
-                return 'N';
-        }
-    }
-
-    static constexpr CharType get_ubjson_float_prefix(float /*unused*/)
-    {
-        return 'd';  // float 32
-    }
-
-    static constexpr CharType get_ubjson_float_prefix(double /*unused*/)
-    {
-        return 'D';  // float 64
-    }
-
-    ///////////////////////
-    // Utility functions //
-    ///////////////////////
-
-    /*
-    @brief write a number to output input
-    @param[in] n number of type @a NumberType
-    @tparam NumberType the type of the number
-    @tparam OutputIsLittleEndian Set to true if output data is
-                                 required to be little endian
-
-    @note This function needs to respect the system's endianness, because bytes
-          in CBOR, MessagePack, and UBJSON are stored in network order (big
-          endian) and therefore need reordering on little endian systems.
-    */
-    template<typename NumberType, bool OutputIsLittleEndian = false>
-    void write_number(const NumberType n)
-    {
-        // step 1: write number to array of length NumberType
-        std::array<CharType, sizeof(NumberType)> vec{};
-        std::memcpy(vec.data(), &n, sizeof(NumberType));
-
-        // step 2: write array to output (with possible reordering)
-        if (is_little_endian != OutputIsLittleEndian)
-        {
-            // reverse byte order prior to conversion if necessary
-            std::reverse(vec.begin(), vec.end());
-        }
-
-        oa->write_characters(vec.data(), sizeof(NumberType));
-    }
-
-    void write_compact_float(const number_float_t n, detail::input_format_t format)
-    {
-#ifdef __GNUC__
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wfloat-equal"
-#endif
-        if (static_cast<double>(n) >= static_cast<double>(std::numeric_limits<float>::lowest()) &&
-                static_cast<double>(n) <= static_cast<double>((std::numeric_limits<float>::max)()) &&
-                static_cast<double>(static_cast<float>(n)) == static_cast<double>(n))
-        {
-            oa->write_character(format == detail::input_format_t::cbor
-                                ? get_cbor_float_prefix(static_cast<float>(n))
-                                : get_msgpack_float_prefix(static_cast<float>(n)));
-            write_number(static_cast<float>(n));
-        }
-        else
-        {
-            oa->write_character(format == detail::input_format_t::cbor
-                                ? get_cbor_float_prefix(n)
-                                : get_msgpack_float_prefix(n));
-            write_number(n);
-        }
-#ifdef __GNUC__
-#pragma GCC diagnostic pop
-#endif
-    }
-
-  public:
-    // The following to_char_type functions are implement the conversion
-    // between uint8_t and CharType. In case CharType is not unsigned,
-    // such a conversion is required to allow values greater than 128.
-    // See <https://github.com/nlohmann/json/issues/1286> for a discussion.
-    template < typename C = CharType,
-               enable_if_t < std::is_signed<C>::value && std::is_signed<char>::value > * = nullptr >
-    static constexpr CharType to_char_type(std::uint8_t x) noexcept
-    {
-        return *reinterpret_cast<char*>(&x);
-    }
-
-    template < typename C = CharType,
-               enable_if_t < std::is_signed<C>::value && std::is_unsigned<char>::value > * = nullptr >
-    static CharType to_char_type(std::uint8_t x) noexcept
-    {
-        static_assert(sizeof(std::uint8_t) == sizeof(CharType), "size of CharType must be equal to std::uint8_t");
-        static_assert(std::is_trivial<CharType>::value, "CharType must be trivial");
-        CharType result;
-        std::memcpy(&result, &x, sizeof(x));
-        return result;
-    }
-
-    template<typename C = CharType,
-             enable_if_t<std::is_unsigned<C>::value>* = nullptr>
-    static constexpr CharType to_char_type(std::uint8_t x) noexcept
-    {
-        return x;
-    }
-
-    template < typename InputCharType, typename C = CharType,
-               enable_if_t <
-                   std::is_signed<C>::value &&
-                   std::is_signed<char>::value &&
-                   std::is_same<char, typename std::remove_cv<InputCharType>::type>::value
-                   > * = nullptr >
-    static constexpr CharType to_char_type(InputCharType x) noexcept
-    {
-        return x;
-    }
-
-  private:
-    /// whether we can assume little endianness
-    const bool is_little_endian = little_endianness();
-
-    /// the output
-    output_adapter_t<CharType> oa = nullptr;
-};
-}  // namespace detail
-}  // namespace nlohmann
-
-// #include <nlohmann/detail/output/output_adapters.hpp>
-
-// #include <nlohmann/detail/output/serializer.hpp>
-
-
-#include <algorithm> // reverse, remove, fill, find, none_of
-#include <array> // array
-#include <clocale> // localeconv, lconv
-#include <cmath> // labs, isfinite, isnan, signbit
-#include <cstddef> // size_t, ptrdiff_t
-#include <cstdint> // uint8_t
-#include <cstdio> // snprintf
-#include <limits> // numeric_limits
-#include <string> // string, char_traits
-#include <iomanip> // setfill, setw
-#include <sstream> // stringstream
-#include <type_traits> // is_same
-#include <utility> // move
-
-// #include <nlohmann/detail/conversions/to_chars.hpp>
-
-
-#include <array> // array
-#include <cmath>   // signbit, isfinite
-#include <cstdint> // intN_t, uintN_t
-#include <cstring> // memcpy, memmove
-#include <limits> // numeric_limits
-#include <type_traits> // conditional
-
-// #include <nlohmann/detail/macro_scope.hpp>
-
-
-namespace nlohmann
-{
-namespace detail
-{
-
-/*!
-@brief implements the Grisu2 algorithm for binary to decimal floating-point
-conversion.
-
-This implementation is a slightly modified version of the reference
-implementation which may be obtained from
-http://florian.loitsch.com/publications (bench.tar.gz).
-
-The code is distributed under the MIT license, Copyright (c) 2009 Florian Loitsch.
-
-For a detailed description of the algorithm see:
-
-[1] Loitsch, "Printing Floating-Point Numbers Quickly and Accurately with
-    Integers", Proceedings of the ACM SIGPLAN 2010 Conference on Programming
-    Language Design and Implementation, PLDI 2010
-[2] Burger, Dybvig, "Printing Floating-Point Numbers Quickly and Accurately",
-    Proceedings of the ACM SIGPLAN 1996 Conference on Programming Language
-    Design and Implementation, PLDI 1996
-*/
-namespace dtoa_impl
-{
-
-template<typename Target, typename Source>
-Target reinterpret_bits(const Source source)
-{
-    static_assert(sizeof(Target) == sizeof(Source), "size mismatch");
-
-    Target target;
-    std::memcpy(&target, &source, sizeof(Source));
-    return target;
-}
-
-struct diyfp // f * 2^e
-{
-    static constexpr int kPrecision = 64; // = q
-
-    std::uint64_t f = 0;
-    int e = 0;
-
-    constexpr diyfp(std::uint64_t f_, int e_) noexcept : f(f_), e(e_) {}
-
-    /*!
-    @brief returns x - y
-    @pre x.e == y.e and x.f >= y.f
-    */
-    static diyfp sub(const diyfp& x, const diyfp& y) noexcept
-    {
-        JSON_ASSERT(x.e == y.e);
-        JSON_ASSERT(x.f >= y.f);
-
-        return {x.f - y.f, x.e};
-    }
-
-    /*!
-    @brief returns x * y
-    @note The result is rounded. (Only the upper q bits are returned.)
-    */
-    static diyfp mul(const diyfp& x, const diyfp& y) noexcept
-    {
-        static_assert(kPrecision == 64, "internal error");
-
-        // Computes:
-        //  f = round((x.f * y.f) / 2^q)
-        //  e = x.e + y.e + q
-
-        // Emulate the 64-bit * 64-bit multiplication:
-        //
-        // p = u * v
-        //   = (u_lo + 2^32 u_hi) (v_lo + 2^32 v_hi)
-        //   = (u_lo v_lo         ) + 2^32 ((u_lo v_hi         ) + (u_hi v_lo         )) + 2^64 (u_hi v_hi         )
-        //   = (p0                ) + 2^32 ((p1                ) + (p2                )) + 2^64 (p3                )
-        //   = (p0_lo + 2^32 p0_hi) + 2^32 ((p1_lo + 2^32 p1_hi) + (p2_lo + 2^32 p2_hi)) + 2^64 (p3                )
-        //   = (p0_lo             ) + 2^32 (p0_hi + p1_lo + p2_lo                      ) + 2^64 (p1_hi + p2_hi + p3)
-        //   = (p0_lo             ) + 2^32 (Q                                          ) + 2^64 (H                 )
-        //   = (p0_lo             ) + 2^32 (Q_lo + 2^32 Q_hi                           ) + 2^64 (H                 )
-        //
-        // (Since Q might be larger than 2^32 - 1)
-        //
-        //   = (p0_lo + 2^32 Q_lo) + 2^64 (Q_hi + H)
-        //
-        // (Q_hi + H does not overflow a 64-bit int)
-        //
-        //   = p_lo + 2^64 p_hi
-
-        const std::uint64_t u_lo = x.f & 0xFFFFFFFFu;
-        const std::uint64_t u_hi = x.f >> 32u;
-        const std::uint64_t v_lo = y.f & 0xFFFFFFFFu;
-        const std::uint64_t v_hi = y.f >> 32u;
-
-        const std::uint64_t p0 = u_lo * v_lo;
-        const std::uint64_t p1 = u_lo * v_hi;
-        const std::uint64_t p2 = u_hi * v_lo;
-        const std::uint64_t p3 = u_hi * v_hi;
-
-        const std::uint64_t p0_hi = p0 >> 32u;
-        const std::uint64_t p1_lo = p1 & 0xFFFFFFFFu;
-        const std::uint64_t p1_hi = p1 >> 32u;
-        const std::uint64_t p2_lo = p2 & 0xFFFFFFFFu;
-        const std::uint64_t p2_hi = p2 >> 32u;
-
-        std::uint64_t Q = p0_hi + p1_lo + p2_lo;
-
-        // The full product might now be computed as
-        //
-        // p_hi = p3 + p2_hi + p1_hi + (Q >> 32)
-        // p_lo = p0_lo + (Q << 32)
-        //
-        // But in this particular case here, the full p_lo is not required.
-        // Effectively we only need to add the highest bit in p_lo to p_hi (and
-        // Q_hi + 1 does not overflow).
-
-        Q += std::uint64_t{1} << (64u - 32u - 1u); // round, ties up
-
-        const std::uint64_t h = p3 + p2_hi + p1_hi + (Q >> 32u);
-
-        return {h, x.e + y.e + 64};
-    }
-
-    /*!
-    @brief normalize x such that the significand is >= 2^(q-1)
-    @pre x.f != 0
-    */
-    static diyfp normalize(diyfp x) noexcept
-    {
-        JSON_ASSERT(x.f != 0);
-
-        while ((x.f >> 63u) == 0)
-        {
-            x.f <<= 1u;
-            x.e--;
-        }
-
-        return x;
-    }
-
-    /*!
-    @brief normalize x such that the result has the exponent E
-    @pre e >= x.e and the upper e - x.e bits of x.f must be zero.
-    */
-    static diyfp normalize_to(const diyfp& x, const int target_exponent) noexcept
-    {
-        const int delta = x.e - target_exponent;
-
-        JSON_ASSERT(delta >= 0);
-        JSON_ASSERT(((x.f << delta) >> delta) == x.f);
-
-        return {x.f << delta, target_exponent};
-    }
-};
-
-struct boundaries
-{
-    diyfp w;
-    diyfp minus;
-    diyfp plus;
-};
-
-/*!
-Compute the (normalized) diyfp representing the input number 'value' and its
-boundaries.
-
-@pre value must be finite and positive
-*/
-template<typename FloatType>
-boundaries compute_boundaries(FloatType value)
-{
-    JSON_ASSERT(std::isfinite(value));
-    JSON_ASSERT(value > 0);
-
-    // Convert the IEEE representation into a diyfp.
-    //
-    // If v is denormal:
-    //      value = 0.F * 2^(1 - bias) = (          F) * 2^(1 - bias - (p-1))
-    // If v is normalized:
-    //      value = 1.F * 2^(E - bias) = (2^(p-1) + F) * 2^(E - bias - (p-1))
-
-    static_assert(std::numeric_limits<FloatType>::is_iec559,
-                  "internal error: dtoa_short requires an IEEE-754 floating-point implementation");
-
-    constexpr int      kPrecision = std::numeric_limits<FloatType>::digits; // = p (includes the hidden bit)
-    constexpr int      kBias      = std::numeric_limits<FloatType>::max_exponent - 1 + (kPrecision - 1);
-    constexpr int      kMinExp    = 1 - kBias;
-    constexpr std::uint64_t kHiddenBit = std::uint64_t{1} << (kPrecision - 1); // = 2^(p-1)
-
-    using bits_type = typename std::conditional<kPrecision == 24, std::uint32_t, std::uint64_t >::type;
-
-    const auto bits = static_cast<std::uint64_t>(reinterpret_bits<bits_type>(value));
-    const std::uint64_t E = bits >> (kPrecision - 1);
-    const std::uint64_t F = bits & (kHiddenBit - 1);
-
-    const bool is_denormal = E == 0;
-    const diyfp v = is_denormal
-                    ? diyfp(F, kMinExp)
-                    : diyfp(F + kHiddenBit, static_cast<int>(E) - kBias);
-
-    // Compute the boundaries m- and m+ of the floating-point value
-    // v = f * 2^e.
-    //
-    // Determine v- and v+, the floating-point predecessor and successor if v,
-    // respectively.
-    //
-    //      v- = v - 2^e        if f != 2^(p-1) or e == e_min                (A)
-    //         = v - 2^(e-1)    if f == 2^(p-1) and e > e_min                (B)
-    //
-    //      v+ = v + 2^e
-    //
-    // Let m- = (v- + v) / 2 and m+ = (v + v+) / 2. All real numbers _strictly_
-    // between m- and m+ round to v, regardless of how the input rounding
-    // algorithm breaks ties.
-    //
-    //      ---+-------------+-------------+-------------+-------------+---  (A)
-    //         v-            m-            v             m+            v+
-    //
-    //      -----------------+------+------+-------------+-------------+---  (B)
-    //                       v-     m-     v             m+            v+
-
-    const bool lower_boundary_is_closer = F == 0 && E > 1;
-    const diyfp m_plus = diyfp(2 * v.f + 1, v.e - 1);
-    const diyfp m_minus = lower_boundary_is_closer
-                          ? diyfp(4 * v.f - 1, v.e - 2)  // (B)
-                          : diyfp(2 * v.f - 1, v.e - 1); // (A)
-
-    // Determine the normalized w+ = m+.
-    const diyfp w_plus = diyfp::normalize(m_plus);
-
-    // Determine w- = m- such that e_(w-) = e_(w+).
-    const diyfp w_minus = diyfp::normalize_to(m_minus, w_plus.e);
-
-    return {diyfp::normalize(v), w_minus, w_plus};
-}
-
-// Given normalized diyfp w, Grisu needs to find a (normalized) cached
-// power-of-ten c, such that the exponent of the product c * w = f * 2^e lies
-// within a certain range [alpha, gamma] (Definition 3.2 from [1])
-//
-//      alpha <= e = e_c + e_w + q <= gamma
-//
-// or
-//
-//      f_c * f_w * 2^alpha <= f_c 2^(e_c) * f_w 2^(e_w) * 2^q
-//                          <= f_c * f_w * 2^gamma
-//
-// Since c and w are normalized, i.e. 2^(q-1) <= f < 2^q, this implies
-//
-//      2^(q-1) * 2^(q-1) * 2^alpha <= c * w * 2^q < 2^q * 2^q * 2^gamma
-//
-// or
-//
-//      2^(q - 2 + alpha) <= c * w < 2^(q + gamma)
-//
-// The choice of (alpha,gamma) determines the size of the table and the form of
-// the digit generation procedure. Using (alpha,gamma)=(-60,-32) works out well
-// in practice:
-//
-// The idea is to cut the number c * w = f * 2^e into two parts, which can be
-// processed independently: An integral part p1, and a fractional part p2:
-//
-//      f * 2^e = ( (f div 2^-e) * 2^-e + (f mod 2^-e) ) * 2^e
-//              = (f div 2^-e) + (f mod 2^-e) * 2^e
-//              = p1 + p2 * 2^e
-//
-// The conversion of p1 into decimal form requires a series of divisions and
-// modulos by (a power of) 10. These operations are faster for 32-bit than for
-// 64-bit integers, so p1 should ideally fit into a 32-bit integer. This can be
-// achieved by choosing
-//
-//      -e >= 32   or   e <= -32 := gamma
-//
-// In order to convert the fractional part
-//
-//      p2 * 2^e = p2 / 2^-e = d[-1] / 10^1 + d[-2] / 10^2 + ...
-//
-// into decimal form, the fraction is repeatedly multiplied by 10 and the digits
-// d[-i] are extracted in order:
-//
-//      (10 * p2) div 2^-e = d[-1]
-//      (10 * p2) mod 2^-e = d[-2] / 10^1 + ...
-//
-// The multiplication by 10 must not overflow. It is sufficient to choose
-//
-//      10 * p2 < 16 * p2 = 2^4 * p2 <= 2^64.
-//
-// Since p2 = f mod 2^-e < 2^-e,
-//
-//      -e <= 60   or   e >= -60 := alpha
-
-constexpr int kAlpha = -60;
-constexpr int kGamma = -32;
-
-struct cached_power // c = f * 2^e ~= 10^k
-{
-    std::uint64_t f;
-    int e;
-    int k;
-};
-
-/*!
-For a normalized diyfp w = f * 2^e, this function returns a (normalized) cached
-power-of-ten c = f_c * 2^e_c, such that the exponent of the product w * c
-satisfies (Definition 3.2 from [1])
-
-     alpha <= e_c + e + q <= gamma.
-*/
-inline cached_power get_cached_power_for_binary_exponent(int e)
-{
-    // Now
-    //
-    //      alpha <= e_c + e + q <= gamma                                    (1)
-    //      ==> f_c * 2^alpha <= c * 2^e * 2^q
-    //
-    // and since the c's are normalized, 2^(q-1) <= f_c,
-    //
-    //      ==> 2^(q - 1 + alpha) <= c * 2^(e + q)
-    //      ==> 2^(alpha - e - 1) <= c
-    //
-    // If c were an exact power of ten, i.e. c = 10^k, one may determine k as
-    //
-    //      k = ceil( log_10( 2^(alpha - e - 1) ) )
-    //        = ceil( (alpha - e - 1) * log_10(2) )
-    //
-    // From the paper:
-    // "In theory the result of the procedure could be wrong since c is rounded,
-    //  and the computation itself is approximated [...]. In practice, however,
-    //  this simple function is sufficient."
-    //
-    // For IEEE double precision floating-point numbers converted into
-    // normalized diyfp's w = f * 2^e, with q = 64,
-    //
-    //      e >= -1022      (min IEEE exponent)
-    //           -52        (p - 1)
-    //           -52        (p - 1, possibly normalize denormal IEEE numbers)
-    //           -11        (normalize the diyfp)
-    //         = -1137
-    //
-    // and
-    //
-    //      e <= +1023      (max IEEE exponent)
-    //           -52        (p - 1)
-    //           -11        (normalize the diyfp)
-    //         = 960
-    //
-    // This binary exponent range [-1137,960] results in a decimal exponent
-    // range [-307,324]. One does not need to store a cached power for each
-    // k in this range. For each such k it suffices to find a cached power
-    // such that the exponent of the product lies in [alpha,gamma].
-    // This implies that the difference of the decimal exponents of adjacent
-    // table entries must be less than or equal to
-    //
-    //      floor( (gamma - alpha) * log_10(2) ) = 8.
-    //
-    // (A smaller distance gamma-alpha would require a larger table.)
-
-    // NB:
-    // Actually this function returns c, such that -60 <= e_c + e + 64 <= -34.
-
-    constexpr int kCachedPowersMinDecExp = -300;
-    constexpr int kCachedPowersDecStep = 8;
-
-    static constexpr std::array<cached_power, 79> kCachedPowers =
-    {
-        {
-            { 0xAB70FE17C79AC6CA, -1060, -300 },
-            { 0xFF77B1FCBEBCDC4F, -1034, -292 },
-            { 0xBE5691EF416BD60C, -1007, -284 },
-            { 0x8DD01FAD907FFC3C,  -980, -276 },
-            { 0xD3515C2831559A83,  -954, -268 },
-            { 0x9D71AC8FADA6C9B5,  -927, -260 },
-            { 0xEA9C227723EE8BCB,  -901, -252 },
-            { 0xAECC49914078536D,  -874, -244 },
-            { 0x823C12795DB6CE57,  -847, -236 },
-            { 0xC21094364DFB5637,  -821, -228 },
-            { 0x9096EA6F3848984F,  -794, -220 },
-            { 0xD77485CB25823AC7,  -768, -212 },
-            { 0xA086CFCD97BF97F4,  -741, -204 },
-            { 0xEF340A98172AACE5,  -715, -196 },
-            { 0xB23867FB2A35B28E,  -688, -188 },
-            { 0x84C8D4DFD2C63F3B,  -661, -180 },
-            { 0xC5DD44271AD3CDBA,  -635, -172 },
-            { 0x936B9FCEBB25C996,  -608, -164 },
-            { 0xDBAC6C247D62A584,  -582, -156 },
-            { 0xA3AB66580D5FDAF6,  -555, -148 },
-            { 0xF3E2F893DEC3F126,  -529, -140 },
-            { 0xB5B5ADA8AAFF80B8,  -502, -132 },
-            { 0x87625F056C7C4A8B,  -475, -124 },
-            { 0xC9BCFF6034C13053,  -449, -116 },
-            { 0x964E858C91BA2655,  -422, -108 },
-            { 0xDFF9772470297EBD,  -396, -100 },
-            { 0xA6DFBD9FB8E5B88F,  -369,  -92 },
-            { 0xF8A95FCF88747D94,  -343,  -84 },
-            { 0xB94470938FA89BCF,  -316,  -76 },
-            { 0x8A08F0F8BF0F156B,  -289,  -68 },
-            { 0xCDB02555653131B6,  -263,  -60 },
-            { 0x993FE2C6D07B7FAC,  -236,  -52 },
-            { 0xE45C10C42A2B3B06,  -210,  -44 },
-            { 0xAA242499697392D3,  -183,  -36 },
-            { 0xFD87B5F28300CA0E,  -157,  -28 },
-            { 0xBCE5086492111AEB,  -130,  -20 },
-            { 0x8CBCCC096F5088CC,  -103,  -12 },
-            { 0xD1B71758E219652C,   -77,   -4 },
-            { 0x9C40000000000000,   -50,    4 },
-            { 0xE8D4A51000000000,   -24,   12 },
-            { 0xAD78EBC5AC620000,     3,   20 },
-            { 0x813F3978F8940984,    30,   28 },
-            { 0xC097CE7BC90715B3,    56,   36 },
-            { 0x8F7E32CE7BEA5C70,    83,   44 },
-            { 0xD5D238A4ABE98068,   109,   52 },
-            { 0x9F4F2726179A2245,   136,   60 },
-            { 0xED63A231D4C4FB27,   162,   68 },
-            { 0xB0DE65388CC8ADA8,   189,   76 },
-            { 0x83C7088E1AAB65DB,   216,   84 },
-            { 0xC45D1DF942711D9A,   242,   92 },
-            { 0x924D692CA61BE758,   269,  100 },
-            { 0xDA01EE641A708DEA,   295,  108 },
-            { 0xA26DA3999AEF774A,   322,  116 },
-            { 0xF209787BB47D6B85,   348,  124 },
-            { 0xB454E4A179DD1877,   375,  132 },
-            { 0x865B86925B9BC5C2,   402,  140 },
-            { 0xC83553C5C8965D3D,   428,  148 },
-            { 0x952AB45CFA97A0B3,   455,  156 },
-            { 0xDE469FBD99A05FE3,   481,  164 },
-            { 0xA59BC234DB398C25,   508,  172 },
-            { 0xF6C69A72A3989F5C,   534,  180 },
-            { 0xB7DCBF5354E9BECE,   561,  188 },
-            { 0x88FCF317F22241E2,   588,  196 },
-            { 0xCC20CE9BD35C78A5,   614,  204 },
-            { 0x98165AF37B2153DF,   641,  212 },
-            { 0xE2A0B5DC971F303A,   667,  220 },
-            { 0xA8D9D1535CE3B396,   694,  228 },
-            { 0xFB9B7CD9A4A7443C,   720,  236 },
-            { 0xBB764C4CA7A44410,   747,  244 },
-            { 0x8BAB8EEFB6409C1A,   774,  252 },
-            { 0xD01FEF10A657842C,   800,  260 },
-            { 0x9B10A4E5E9913129,   827,  268 },
-            { 0xE7109BFBA19C0C9D,   853,  276 },
-            { 0xAC2820D9623BF429,   880,  284 },
-            { 0x80444B5E7AA7CF85,   907,  292 },
-            { 0xBF21E44003ACDD2D,   933,  300 },
-            { 0x8E679C2F5E44FF8F,   960,  308 },
-            { 0xD433179D9C8CB841,   986,  316 },
-            { 0x9E19DB92B4E31BA9,  1013,  324 },
-        }
-    };
-
-    // This computation gives exactly the same results for k as
-    //      k = ceil((kAlpha - e - 1) * 0.30102999566398114)
-    // for |e| <= 1500, but doesn't require floating-point operations.
-    // NB: log_10(2) ~= 78913 / 2^18
-    JSON_ASSERT(e >= -1500);
-    JSON_ASSERT(e <=  1500);
-    const int f = kAlpha - e - 1;
-    const int k = (f * 78913) / (1 << 18) + static_cast<int>(f > 0);
-
-    const int index = (-kCachedPowersMinDecExp + k + (kCachedPowersDecStep - 1)) / kCachedPowersDecStep;
-    JSON_ASSERT(index >= 0);
-    JSON_ASSERT(static_cast<std::size_t>(index) < kCachedPowers.size());
-
-    const cached_power cached = kCachedPowers[static_cast<std::size_t>(index)];
-    JSON_ASSERT(kAlpha <= cached.e + e + 64);
-    JSON_ASSERT(kGamma >= cached.e + e + 64);
-
-    return cached;
-}
-
-/*!
-For n != 0, returns k, such that pow10 := 10^(k-1) <= n < 10^k.
-For n == 0, returns 1 and sets pow10 := 1.
-*/
-inline int find_largest_pow10(const std::uint32_t n, std::uint32_t& pow10)
-{
-    // LCOV_EXCL_START
-    if (n >= 1000000000)
-    {
-        pow10 = 1000000000;
-        return 10;
-    }
-    // LCOV_EXCL_STOP
-    if (n >= 100000000)
-    {
-        pow10 = 100000000;
-        return  9;
-    }
-    if (n >= 10000000)
-    {
-        pow10 = 10000000;
-        return  8;
-    }
-    if (n >= 1000000)
-    {
-        pow10 = 1000000;
-        return  7;
-    }
-    if (n >= 100000)
-    {
-        pow10 = 100000;
-        return  6;
-    }
-    if (n >= 10000)
-    {
-        pow10 = 10000;
-        return  5;
-    }
-    if (n >= 1000)
-    {
-        pow10 = 1000;
-        return  4;
-    }
-    if (n >= 100)
-    {
-        pow10 = 100;
-        return  3;
-    }
-    if (n >= 10)
-    {
-        pow10 = 10;
-        return  2;
-    }
-
-    pow10 = 1;
-    return 1;
-}
-
-inline void grisu2_round(char* buf, int len, std::uint64_t dist, std::uint64_t delta,
-                         std::uint64_t rest, std::uint64_t ten_k)
-{
-    JSON_ASSERT(len >= 1);
-    JSON_ASSERT(dist <= delta);
-    JSON_ASSERT(rest <= delta);
-    JSON_ASSERT(ten_k > 0);
-
-    //               <--------------------------- delta ---->
-    //                                  <---- dist --------->
-    // --------------[------------------+-------------------]--------------
-    //               M-                 w                   M+
-    //
-    //                                  ten_k
-    //                                <------>
-    //                                       <---- rest ---->
-    // --------------[------------------+----+--------------]--------------
-    //                                  w    V
-    //                                       = buf * 10^k
-    //
-    // ten_k represents a unit-in-the-last-place in the decimal representation
-    // stored in buf.
-    // Decrement buf by ten_k while this takes buf closer to w.
-
-    // The tests are written in this order to avoid overflow in unsigned
-    // integer arithmetic.
-
-    while (rest < dist
-            && delta - rest >= ten_k
-            && (rest + ten_k < dist || dist - rest > rest + ten_k - dist))
-    {
-        JSON_ASSERT(buf[len - 1] != '0');
-        buf[len - 1]--;
-        rest += ten_k;
-    }
-}
-
-/*!
-Generates V = buffer * 10^decimal_exponent, such that M- <= V <= M+.
-M- and M+ must be normalized and share the same exponent -60 <= e <= -32.
-*/
-inline void grisu2_digit_gen(char* buffer, int& length, int& decimal_exponent,
-                             diyfp M_minus, diyfp w, diyfp M_plus)
-{
-    static_assert(kAlpha >= -60, "internal error");
-    static_assert(kGamma <= -32, "internal error");
-
-    // Generates the digits (and the exponent) of a decimal floating-point
-    // number V = buffer * 10^decimal_exponent in the range [M-, M+]. The diyfp's
-    // w, M- and M+ share the same exponent e, which satisfies alpha <= e <= gamma.
-    //
-    //               <--------------------------- delta ---->
-    //                                  <---- dist --------->
-    // --------------[------------------+-------------------]--------------
-    //               M-                 w                   M+
-    //
-    // Grisu2 generates the digits of M+ from left to right and stops as soon as
-    // V is in [M-,M+].
-
-    JSON_ASSERT(M_plus.e >= kAlpha);
-    JSON_ASSERT(M_plus.e <= kGamma);
-
-    std::uint64_t delta = diyfp::sub(M_plus, M_minus).f; // (significand of (M+ - M-), implicit exponent is e)
-    std::uint64_t dist  = diyfp::sub(M_plus, w      ).f; // (significand of (M+ - w ), implicit exponent is e)
-
-    // Split M+ = f * 2^e into two parts p1 and p2 (note: e < 0):
-    //
-    //      M+ = f * 2^e
-    //         = ((f div 2^-e) * 2^-e + (f mod 2^-e)) * 2^e
-    //         = ((p1        ) * 2^-e + (p2        )) * 2^e
-    //         = p1 + p2 * 2^e
-
-    const diyfp one(std::uint64_t{1} << -M_plus.e, M_plus.e);
-
-    auto p1 = static_cast<std::uint32_t>(M_plus.f >> -one.e); // p1 = f div 2^-e (Since -e >= 32, p1 fits into a 32-bit int.)
-    std::uint64_t p2 = M_plus.f & (one.f - 1);                    // p2 = f mod 2^-e
-
-    // 1)
-    //
-    // Generate the digits of the integral part p1 = d[n-1]...d[1]d[0]
-
-    JSON_ASSERT(p1 > 0);
-
-    std::uint32_t pow10{};
-    const int k = find_largest_pow10(p1, pow10);
-
-    //      10^(k-1) <= p1 < 10^k, pow10 = 10^(k-1)
-    //
-    //      p1 = (p1 div 10^(k-1)) * 10^(k-1) + (p1 mod 10^(k-1))
-    //         = (d[k-1]         ) * 10^(k-1) + (p1 mod 10^(k-1))
-    //
-    //      M+ = p1                                             + p2 * 2^e
-    //         = d[k-1] * 10^(k-1) + (p1 mod 10^(k-1))          + p2 * 2^e
-    //         = d[k-1] * 10^(k-1) + ((p1 mod 10^(k-1)) * 2^-e + p2) * 2^e
-    //         = d[k-1] * 10^(k-1) + (                         rest) * 2^e
-    //
-    // Now generate the digits d[n] of p1 from left to right (n = k-1,...,0)
-    //
-    //      p1 = d[k-1]...d[n] * 10^n + d[n-1]...d[0]
-    //
-    // but stop as soon as
-    //
-    //      rest * 2^e = (d[n-1]...d[0] * 2^-e + p2) * 2^e <= delta * 2^e
-
-    int n = k;
-    while (n > 0)
-    {
-        // Invariants:
-        //      M+ = buffer * 10^n + (p1 + p2 * 2^e)    (buffer = 0 for n = k)
-        //      pow10 = 10^(n-1) <= p1 < 10^n
-        //
-        const std::uint32_t d = p1 / pow10;  // d = p1 div 10^(n-1)
-        const std::uint32_t r = p1 % pow10;  // r = p1 mod 10^(n-1)
-        //
-        //      M+ = buffer * 10^n + (d * 10^(n-1) + r) + p2 * 2^e
-        //         = (buffer * 10 + d) * 10^(n-1) + (r + p2 * 2^e)
-        //
-        JSON_ASSERT(d <= 9);
-        buffer[length++] = static_cast<char>('0' + d); // buffer := buffer * 10 + d
-        //
-        //      M+ = buffer * 10^(n-1) + (r + p2 * 2^e)
-        //
-        p1 = r;
-        n--;
-        //
-        //      M+ = buffer * 10^n + (p1 + p2 * 2^e)
-        //      pow10 = 10^n
-        //
-
-        // Now check if enough digits have been generated.
-        // Compute
-        //
-        //      p1 + p2 * 2^e = (p1 * 2^-e + p2) * 2^e = rest * 2^e
-        //
-        // Note:
-        // Since rest and delta share the same exponent e, it suffices to
-        // compare the significands.
-        const std::uint64_t rest = (std::uint64_t{p1} << -one.e) + p2;
-        if (rest <= delta)
-        {
-            // V = buffer * 10^n, with M- <= V <= M+.
-
-            decimal_exponent += n;
-
-            // We may now just stop. But instead look if the buffer could be
-            // decremented to bring V closer to w.
-            //
-            // pow10 = 10^n is now 1 ulp in the decimal representation V.
-            // The rounding procedure works with diyfp's with an implicit
-            // exponent of e.
-            //
-            //      10^n = (10^n * 2^-e) * 2^e = ulp * 2^e
-            //
-            const std::uint64_t ten_n = std::uint64_t{pow10} << -one.e;
-            grisu2_round(buffer, length, dist, delta, rest, ten_n);
-
-            return;
-        }
-
-        pow10 /= 10;
-        //
-        //      pow10 = 10^(n-1) <= p1 < 10^n
-        // Invariants restored.
-    }
-
-    // 2)
-    //
-    // The digits of the integral part have been generated:
-    //
-    //      M+ = d[k-1]...d[1]d[0] + p2 * 2^e
-    //         = buffer            + p2 * 2^e
-    //
-    // Now generate the digits of the fractional part p2 * 2^e.
-    //
-    // Note:
-    // No decimal point is generated: the exponent is adjusted instead.
-    //
-    // p2 actually represents the fraction
-    //
-    //      p2 * 2^e
-    //          = p2 / 2^-e
-    //          = d[-1] / 10^1 + d[-2] / 10^2 + ...
-    //
-    // Now generate the digits d[-m] of p1 from left to right (m = 1,2,...)
-    //
-    //      p2 * 2^e = d[-1]d[-2]...d[-m] * 10^-m
-    //                      + 10^-m * (d[-m-1] / 10^1 + d[-m-2] / 10^2 + ...)
-    //
-    // using
-    //
-    //      10^m * p2 = ((10^m * p2) div 2^-e) * 2^-e + ((10^m * p2) mod 2^-e)
-    //                = (                   d) * 2^-e + (                   r)
-    //
-    // or
-    //      10^m * p2 * 2^e = d + r * 2^e
-    //
-    // i.e.
-    //
-    //      M+ = buffer + p2 * 2^e
-    //         = buffer + 10^-m * (d + r * 2^e)
-    //         = (buffer * 10^m + d) * 10^-m + 10^-m * r * 2^e
-    //
-    // and stop as soon as 10^-m * r * 2^e <= delta * 2^e
-
-    JSON_ASSERT(p2 > delta);
-
-    int m = 0;
-    for (;;)
-    {
-        // Invariant:
-        //      M+ = buffer * 10^-m + 10^-m * (d[-m-1] / 10 + d[-m-2] / 10^2 + ...) * 2^e
-        //         = buffer * 10^-m + 10^-m * (p2                                 ) * 2^e
-        //         = buffer * 10^-m + 10^-m * (1/10 * (10 * p2)                   ) * 2^e
-        //         = buffer * 10^-m + 10^-m * (1/10 * ((10*p2 div 2^-e) * 2^-e + (10*p2 mod 2^-e)) * 2^e
-        //
-        JSON_ASSERT(p2 <= (std::numeric_limits<std::uint64_t>::max)() / 10);
-        p2 *= 10;
-        const std::uint64_t d = p2 >> -one.e;     // d = (10 * p2) div 2^-e
-        const std::uint64_t r = p2 & (one.f - 1); // r = (10 * p2) mod 2^-e
-        //
-        //      M+ = buffer * 10^-m + 10^-m * (1/10 * (d * 2^-e + r) * 2^e
-        //         = buffer * 10^-m + 10^-m * (1/10 * (d + r * 2^e))
-        //         = (buffer * 10 + d) * 10^(-m-1) + 10^(-m-1) * r * 2^e
-        //
-        JSON_ASSERT(d <= 9);
-        buffer[length++] = static_cast<char>('0' + d); // buffer := buffer * 10 + d
-        //
-        //      M+ = buffer * 10^(-m-1) + 10^(-m-1) * r * 2^e
-        //
-        p2 = r;
-        m++;
-        //
-        //      M+ = buffer * 10^-m + 10^-m * p2 * 2^e
-        // Invariant restored.
-
-        // Check if enough digits have been generated.
-        //
-        //      10^-m * p2 * 2^e <= delta * 2^e
-        //              p2 * 2^e <= 10^m * delta * 2^e
-        //                    p2 <= 10^m * delta
-        delta *= 10;
-        dist  *= 10;
-        if (p2 <= delta)
-        {
-            break;
-        }
-    }
-
-    // V = buffer * 10^-m, with M- <= V <= M+.
-
-    decimal_exponent -= m;
-
-    // 1 ulp in the decimal representation is now 10^-m.
-    // Since delta and dist are now scaled by 10^m, we need to do the
-    // same with ulp in order to keep the units in sync.
-    //
-    //      10^m * 10^-m = 1 = 2^-e * 2^e = ten_m * 2^e
-    //
-    const std::uint64_t ten_m = one.f;
-    grisu2_round(buffer, length, dist, delta, p2, ten_m);
-
-    // By construction this algorithm generates the shortest possible decimal
-    // number (Loitsch, Theorem 6.2) which rounds back to w.
-    // For an input number of precision p, at least
-    //
-    //      N = 1 + ceil(p * log_10(2))
-    //
-    // decimal digits are sufficient to identify all binary floating-point
-    // numbers (Matula, "In-and-Out conversions").
-    // This implies that the algorithm does not produce more than N decimal
-    // digits.
-    //
-    //      N = 17 for p = 53 (IEEE double precision)
-    //      N = 9  for p = 24 (IEEE single precision)
-}
-
-/*!
-v = buf * 10^decimal_exponent
-len is the length of the buffer (number of decimal digits)
-The buffer must be large enough, i.e. >= max_digits10.
-*/
-JSON_HEDLEY_NON_NULL(1)
-inline void grisu2(char* buf, int& len, int& decimal_exponent,
-                   diyfp m_minus, diyfp v, diyfp m_plus)
-{
-    JSON_ASSERT(m_plus.e == m_minus.e);
-    JSON_ASSERT(m_plus.e == v.e);
-
-    //  --------(-----------------------+-----------------------)--------    (A)
-    //          m-                      v                       m+
-    //
-    //  --------------------(-----------+-----------------------)--------    (B)
-    //                      m-          v                       m+
-    //
-    // First scale v (and m- and m+) such that the exponent is in the range
-    // [alpha, gamma].
-
-    const cached_power cached = get_cached_power_for_binary_exponent(m_plus.e);
-
-    const diyfp c_minus_k(cached.f, cached.e); // = c ~= 10^-k
-
-    // The exponent of the products is = v.e + c_minus_k.e + q and is in the range [alpha,gamma]
-    const diyfp w       = diyfp::mul(v,       c_minus_k);
-    const diyfp w_minus = diyfp::mul(m_minus, c_minus_k);
-    const diyfp w_plus  = diyfp::mul(m_plus,  c_minus_k);
-
-    //  ----(---+---)---------------(---+---)---------------(---+---)----
-    //          w-                      w                       w+
-    //          = c*m-                  = c*v                   = c*m+
-    //
-    // diyfp::mul rounds its result and c_minus_k is approximated too. w, w- and
-    // w+ are now off by a small amount.
-    // In fact:
-    //
-    //      w - v * 10^k < 1 ulp
-    //
-    // To account for this inaccuracy, add resp. subtract 1 ulp.
-    //
-    //  --------+---[---------------(---+---)---------------]---+--------
-    //          w-  M-                  w                   M+  w+
-    //
-    // Now any number in [M-, M+] (bounds included) will round to w when input,
-    // regardless of how the input rounding algorithm breaks ties.
-    //
-    // And digit_gen generates the shortest possible such number in [M-, M+].
-    // Note that this does not mean that Grisu2 always generates the shortest
-    // possible number in the interval (m-, m+).
-    const diyfp M_minus(w_minus.f + 1, w_minus.e);
-    const diyfp M_plus (w_plus.f  - 1, w_plus.e );
-
-    decimal_exponent = -cached.k; // = -(-k) = k
-
-    grisu2_digit_gen(buf, len, decimal_exponent, M_minus, w, M_plus);
-}
-
-/*!
-v = buf * 10^decimal_exponent
-len is the length of the buffer (number of decimal digits)
-The buffer must be large enough, i.e. >= max_digits10.
-*/
-template<typename FloatType>
-JSON_HEDLEY_NON_NULL(1)
-void grisu2(char* buf, int& len, int& decimal_exponent, FloatType value)
-{
-    static_assert(diyfp::kPrecision >= std::numeric_limits<FloatType>::digits + 3,
-                  "internal error: not enough precision");
-
-    JSON_ASSERT(std::isfinite(value));
-    JSON_ASSERT(value > 0);
-
-    // If the neighbors (and boundaries) of 'value' are always computed for double-precision
-    // numbers, all float's can be recovered using strtod (and strtof). However, the resulting
-    // decimal representations are not exactly "short".
-    //
-    // The documentation for 'std::to_chars' (https://en.cppreference.com/w/cpp/utility/to_chars)
-    // says "value is converted to a string as if by std::sprintf in the default ("C") locale"
-    // and since sprintf promotes floats to doubles, I think this is exactly what 'std::to_chars'
-    // does.
-    // On the other hand, the documentation for 'std::to_chars' requires that "parsing the
-    // representation using the corresponding std::from_chars function recovers value exactly". That
-    // indicates that single precision floating-point numbers should be recovered using
-    // 'std::strtof'.
-    //
-    // NB: If the neighbors are computed for single-precision numbers, there is a single float
-    //     (7.0385307e-26f) which can't be recovered using strtod. The resulting double precision
-    //     value is off by 1 ulp.
-#if 0
-    const boundaries w = compute_boundaries(static_cast<double>(value));
-#else
-    const boundaries w = compute_boundaries(value);
-#endif
-
-    grisu2(buf, len, decimal_exponent, w.minus, w.w, w.plus);
-}
-
-/*!
-@brief appends a decimal representation of e to buf
-@return a pointer to the element following the exponent.
-@pre -1000 < e < 1000
-*/
-JSON_HEDLEY_NON_NULL(1)
-JSON_HEDLEY_RETURNS_NON_NULL
-inline char* append_exponent(char* buf, int e)
-{
-    JSON_ASSERT(e > -1000);
-    JSON_ASSERT(e <  1000);
-
-    if (e < 0)
-    {
-        e = -e;
-        *buf++ = '-';
-    }
-    else
-    {
-        *buf++ = '+';
-    }
-
-    auto k = static_cast<std::uint32_t>(e);
-    if (k < 10)
-    {
-        // Always print at least two digits in the exponent.
-        // This is for compatibility with printf("%g").
-        *buf++ = '0';
-        *buf++ = static_cast<char>('0' + k);
-    }
-    else if (k < 100)
-    {
-        *buf++ = static_cast<char>('0' + k / 10);
-        k %= 10;
-        *buf++ = static_cast<char>('0' + k);
-    }
-    else
-    {
-        *buf++ = static_cast<char>('0' + k / 100);
-        k %= 100;
-        *buf++ = static_cast<char>('0' + k / 10);
-        k %= 10;
-        *buf++ = static_cast<char>('0' + k);
-    }
-
-    return buf;
-}
-
-/*!
-@brief prettify v = buf * 10^decimal_exponent
-
-If v is in the range [10^min_exp, 10^max_exp) it will be printed in fixed-point
-notation. Otherwise it will be printed in exponential notation.
-
-@pre min_exp < 0
-@pre max_exp > 0
-*/
-JSON_HEDLEY_NON_NULL(1)
-JSON_HEDLEY_RETURNS_NON_NULL
-inline char* format_buffer(char* buf, int len, int decimal_exponent,
-                           int min_exp, int max_exp)
-{
-    JSON_ASSERT(min_exp < 0);
-    JSON_ASSERT(max_exp > 0);
-
-    const int k = len;
-    const int n = len + decimal_exponent;
-
-    // v = buf * 10^(n-k)
-    // k is the length of the buffer (number of decimal digits)
-    // n is the position of the decimal point relative to the start of the buffer.
-
-    if (k <= n && n <= max_exp)
-    {
-        // digits[000]
-        // len <= max_exp + 2
-
-        std::memset(buf + k, '0', static_cast<size_t>(n) - static_cast<size_t>(k));
-        // Make it look like a floating-point number (#362, #378)
-        buf[n + 0] = '.';
-        buf[n + 1] = '0';
-        return buf + (static_cast<size_t>(n) + 2);
-    }
-
-    if (0 < n && n <= max_exp)
-    {
-        // dig.its
-        // len <= max_digits10 + 1
-
-        JSON_ASSERT(k > n);
-
-        std::memmove(buf + (static_cast<size_t>(n) + 1), buf + n, static_cast<size_t>(k) - static_cast<size_t>(n));
-        buf[n] = '.';
-        return buf + (static_cast<size_t>(k) + 1U);
-    }
-
-    if (min_exp < n && n <= 0)
-    {
-        // 0.[000]digits
-        // len <= 2 + (-min_exp - 1) + max_digits10
-
-        std::memmove(buf + (2 + static_cast<size_t>(-n)), buf, static_cast<size_t>(k));
-        buf[0] = '0';
-        buf[1] = '.';
-        std::memset(buf + 2, '0', static_cast<size_t>(-n));
-        return buf + (2U + static_cast<size_t>(-n) + static_cast<size_t>(k));
-    }
-
-    if (k == 1)
-    {
-        // dE+123
-        // len <= 1 + 5
-
-        buf += 1;
-    }
-    else
-    {
-        // d.igitsE+123
-        // len <= max_digits10 + 1 + 5
-
-        std::memmove(buf + 2, buf + 1, static_cast<size_t>(k) - 1);
-        buf[1] = '.';
-        buf += 1 + static_cast<size_t>(k);
-    }
-
-    *buf++ = 'e';
-    return append_exponent(buf, n - 1);
-}
-
-} // namespace dtoa_impl
-
-/*!
-@brief generates a decimal representation of the floating-point number value in [first, last).
-
-The format of the resulting decimal representation is similar to printf's %g
-format. Returns an iterator pointing past-the-end of the decimal representation.
-
-@note The input number must be finite, i.e. NaN's and Inf's are not supported.
-@note The buffer must be large enough.
-@note The result is NOT null-terminated.
-*/
-template<typename FloatType>
-JSON_HEDLEY_NON_NULL(1, 2)
-JSON_HEDLEY_RETURNS_NON_NULL
-char* to_chars(char* first, const char* last, FloatType value)
-{
-    static_cast<void>(last); // maybe unused - fix warning
-    JSON_ASSERT(std::isfinite(value));
-
-    // Use signbit(value) instead of (value < 0) since signbit works for -0.
-    if (std::signbit(value))
-    {
-        value = -value;
-        *first++ = '-';
-    }
-
-#ifdef __GNUC__
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wfloat-equal"
-#endif
-    if (value == 0) // +-0
-    {
-        *first++ = '0';
-        // Make it look like a floating-point number (#362, #378)
-        *first++ = '.';
-        *first++ = '0';
-        return first;
-    }
-#ifdef __GNUC__
-#pragma GCC diagnostic pop
-#endif
-
-    JSON_ASSERT(last - first >= std::numeric_limits<FloatType>::max_digits10);
-
-    // Compute v = buffer * 10^decimal_exponent.
-    // The decimal digits are stored in the buffer, which needs to be interpreted
-    // as an unsigned decimal integer.
-    // len is the length of the buffer, i.e. the number of decimal digits.
-    int len = 0;
-    int decimal_exponent = 0;
-    dtoa_impl::grisu2(first, len, decimal_exponent, value);
-
-    JSON_ASSERT(len <= std::numeric_limits<FloatType>::max_digits10);
-
-    // Format the buffer like printf("%.*g", prec, value)
-    constexpr int kMinExp = -4;
-    // Use digits10 here to increase compatibility with version 2.
-    constexpr int kMaxExp = std::numeric_limits<FloatType>::digits10;
-
-    JSON_ASSERT(last - first >= kMaxExp + 2);
-    JSON_ASSERT(last - first >= 2 + (-kMinExp - 1) + std::numeric_limits<FloatType>::max_digits10);
-    JSON_ASSERT(last - first >= std::numeric_limits<FloatType>::max_digits10 + 6);
-
-    return dtoa_impl::format_buffer(first, len, decimal_exponent, kMinExp, kMaxExp);
-}
-
-} // namespace detail
-} // namespace nlohmann
-
-// #include <nlohmann/detail/exceptions.hpp>
-
-// #include <nlohmann/detail/macro_scope.hpp>
-
-// #include <nlohmann/detail/meta/cpp_future.hpp>
-
-// #include <nlohmann/detail/output/binary_writer.hpp>
-
-// #include <nlohmann/detail/output/output_adapters.hpp>
-
-// #include <nlohmann/detail/value_t.hpp>
-
-
-namespace nlohmann
-{
-namespace detail
-{
-///////////////////
-// serialization //
-///////////////////
-
-/// how to treat decoding errors
-enum class error_handler_t
-{
-    strict,  ///< throw a type_error exception in case of invalid UTF-8
-    replace, ///< replace invalid UTF-8 sequences with U+FFFD
-    ignore   ///< ignore invalid UTF-8 sequences
-};
-
-template<typename BasicJsonType>
-class serializer
-{
-    using string_t = typename BasicJsonType::string_t;
-    using number_float_t = typename BasicJsonType::number_float_t;
-    using number_integer_t = typename BasicJsonType::number_integer_t;
-    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
-    using binary_char_t = typename BasicJsonType::binary_t::value_type;
-    static constexpr std::uint8_t UTF8_ACCEPT = 0;
-    static constexpr std::uint8_t UTF8_REJECT = 1;
-
-  public:
-    /*!
-    @param[in] s  output stream to serialize to
-    @param[in] ichar  indentation character to use
-    @param[in] error_handler_  how to react on decoding errors
-    */
-    serializer(output_adapter_t<char> s, const char ichar,
-               error_handler_t error_handler_ = error_handler_t::strict)
-        : o(std::move(s))
-        , loc(std::localeconv())
-        , thousands_sep(loc->thousands_sep == nullptr ? '\0' : std::char_traits<char>::to_char_type(* (loc->thousands_sep)))
-        , decimal_point(loc->decimal_point == nullptr ? '\0' : std::char_traits<char>::to_char_type(* (loc->decimal_point)))
-        , indent_char(ichar)
-        , indent_string(512, indent_char)
-        , error_handler(error_handler_)
-    {}
-
-    // delete because of pointer members
-    serializer(const serializer&) = delete;
-    serializer& operator=(const serializer&) = delete;
-    serializer(serializer&&) = delete;
-    serializer& operator=(serializer&&) = delete;
-    ~serializer() = default;
-
-    /*!
-    @brief internal implementation of the serialization function
-
-    This function is called by the public member function dump and organizes
-    the serialization internally. The indentation level is propagated as
-    additional parameter. In case of arrays and objects, the function is
-    called recursively.
-
-    - strings and object keys are escaped using `escape_string()`
-    - integer numbers are converted implicitly via `operator<<`
-    - floating-point numbers are converted to a string using `"%g"` format
-    - binary values are serialized as objects containing the subtype and the
-      byte array
-
-    @param[in] val               value to serialize
-    @param[in] pretty_print      whether the output shall be pretty-printed
-    @param[in] ensure_ascii If @a ensure_ascii is true, all non-ASCII characters
-    in the output are escaped with `\uXXXX` sequences, and the result consists
-    of ASCII characters only.
-    @param[in] indent_step       the indent level
-    @param[in] current_indent    the current indent level (only used internally)
-    */
-    void dump(const BasicJsonType& val,
-              const bool pretty_print,
-              const bool ensure_ascii,
-              const unsigned int indent_step,
-              const unsigned int current_indent = 0)
-    {
-        switch (val.m_type)
-        {
-            case value_t::object:
-            {
-                if (val.m_value.object->empty())
-                {
-                    o->write_characters("{}", 2);
-                    return;
-                }
-
-                if (pretty_print)
-                {
-                    o->write_characters("{\n", 2);
-
-                    // variable to hold indentation for recursive calls
-                    const auto new_indent = current_indent + indent_step;
-                    if (JSON_HEDLEY_UNLIKELY(indent_string.size() < new_indent))
-                    {
-                        indent_string.resize(indent_string.size() * 2, ' ');
-                    }
-
-                    // first n-1 elements
-                    auto i = val.m_value.object->cbegin();
-                    for (std::size_t cnt = 0; cnt < val.m_value.object->size() - 1; ++cnt, ++i)
-                    {
-                        o->write_characters(indent_string.c_str(), new_indent);
-                        o->write_character('\"');
-                        dump_escaped(i->first, ensure_ascii);
-                        o->write_characters("\": ", 3);
-                        dump(i->second, true, ensure_ascii, indent_step, new_indent);
-                        o->write_characters(",\n", 2);
-                    }
-
-                    // last element
-                    JSON_ASSERT(i != val.m_value.object->cend());
-                    JSON_ASSERT(std::next(i) == val.m_value.object->cend());
-                    o->write_characters(indent_string.c_str(), new_indent);
-                    o->write_character('\"');
-                    dump_escaped(i->first, ensure_ascii);
-                    o->write_characters("\": ", 3);
-                    dump(i->second, true, ensure_ascii, indent_step, new_indent);
-
-                    o->write_character('\n');
-                    o->write_characters(indent_string.c_str(), current_indent);
-                    o->write_character('}');
-                }
-                else
-                {
-                    o->write_character('{');
-
-                    // first n-1 elements
-                    auto i = val.m_value.object->cbegin();
-                    for (std::size_t cnt = 0; cnt < val.m_value.object->size() - 1; ++cnt, ++i)
-                    {
-                        o->write_character('\"');
-                        dump_escaped(i->first, ensure_ascii);
-                        o->write_characters("\":", 2);
-                        dump(i->second, false, ensure_ascii, indent_step, current_indent);
-                        o->write_character(',');
-                    }
-
-                    // last element
-                    JSON_ASSERT(i != val.m_value.object->cend());
-                    JSON_ASSERT(std::next(i) == val.m_value.object->cend());
-                    o->write_character('\"');
-                    dump_escaped(i->first, ensure_ascii);
-                    o->write_characters("\":", 2);
-                    dump(i->second, false, ensure_ascii, indent_step, current_indent);
-
-                    o->write_character('}');
-                }
-
-                return;
-            }
-
-            case value_t::array:
-            {
-                if (val.m_value.array->empty())
-                {
-                    o->write_characters("[]", 2);
-                    return;
-                }
-
-                if (pretty_print)
-                {
-                    o->write_characters("[\n", 2);
-
-                    // variable to hold indentation for recursive calls
-                    const auto new_indent = current_indent + indent_step;
-                    if (JSON_HEDLEY_UNLIKELY(indent_string.size() < new_indent))
-                    {
-                        indent_string.resize(indent_string.size() * 2, ' ');
-                    }
-
-                    // first n-1 elements
-                    for (auto i = val.m_value.array->cbegin();
-                            i != val.m_value.array->cend() - 1; ++i)
-                    {
-                        o->write_characters(indent_string.c_str(), new_indent);
-                        dump(*i, true, ensure_ascii, indent_step, new_indent);
-                        o->write_characters(",\n", 2);
-                    }
-
-                    // last element
-                    JSON_ASSERT(!val.m_value.array->empty());
-                    o->write_characters(indent_string.c_str(), new_indent);
-                    dump(val.m_value.array->back(), true, ensure_ascii, indent_step, new_indent);
-
-                    o->write_character('\n');
-                    o->write_characters(indent_string.c_str(), current_indent);
-                    o->write_character(']');
-                }
-                else
-                {
-                    o->write_character('[');
-
-                    // first n-1 elements
-                    for (auto i = val.m_value.array->cbegin();
-                            i != val.m_value.array->cend() - 1; ++i)
-                    {
-                        dump(*i, false, ensure_ascii, indent_step, current_indent);
-                        o->write_character(',');
-                    }
-
-                    // last element
-                    JSON_ASSERT(!val.m_value.array->empty());
-                    dump(val.m_value.array->back(), false, ensure_ascii, indent_step, current_indent);
-
-                    o->write_character(']');
-                }
-
-                return;
-            }
-
-            case value_t::string:
-            {
-                o->write_character('\"');
-                dump_escaped(*val.m_value.string, ensure_ascii);
-                o->write_character('\"');
-                return;
-            }
-
-            case value_t::binary:
-            {
-                if (pretty_print)
-                {
-                    o->write_characters("{\n", 2);
-
-                    // variable to hold indentation for recursive calls
-                    const auto new_indent = current_indent + indent_step;
-                    if (JSON_HEDLEY_UNLIKELY(indent_string.size() < new_indent))
-                    {
-                        indent_string.resize(indent_string.size() * 2, ' ');
-                    }
-
-                    o->write_characters(indent_string.c_str(), new_indent);
-
-                    o->write_characters("\"bytes\": [", 10);
-
-                    if (!val.m_value.binary->empty())
-                    {
-                        for (auto i = val.m_value.binary->cbegin();
-                                i != val.m_value.binary->cend() - 1; ++i)
-                        {
-                            dump_integer(*i);
-                            o->write_characters(", ", 2);
-                        }
-                        dump_integer(val.m_value.binary->back());
-                    }
-
-                    o->write_characters("],\n", 3);
-                    o->write_characters(indent_string.c_str(), new_indent);
-
-                    o->write_characters("\"subtype\": ", 11);
-                    if (val.m_value.binary->has_subtype())
-                    {
-                        dump_integer(val.m_value.binary->subtype());
-                    }
-                    else
-                    {
-                        o->write_characters("null", 4);
-                    }
-                    o->write_character('\n');
-                    o->write_characters(indent_string.c_str(), current_indent);
-                    o->write_character('}');
-                }
-                else
-                {
-                    o->write_characters("{\"bytes\":[", 10);
-
-                    if (!val.m_value.binary->empty())
-                    {
-                        for (auto i = val.m_value.binary->cbegin();
-                                i != val.m_value.binary->cend() - 1; ++i)
-                        {
-                            dump_integer(*i);
-                            o->write_character(',');
-                        }
-                        dump_integer(val.m_value.binary->back());
-                    }
-
-                    o->write_characters("],\"subtype\":", 12);
-                    if (val.m_value.binary->has_subtype())
-                    {
-                        dump_integer(val.m_value.binary->subtype());
-                        o->write_character('}');
-                    }
-                    else
-                    {
-                        o->write_characters("null}", 5);
-                    }
-                }
-                return;
-            }
-
-            case value_t::boolean:
-            {
-                if (val.m_value.boolean)
-                {
-                    o->write_characters("true", 4);
-                }
-                else
-                {
-                    o->write_characters("false", 5);
-                }
-                return;
-            }
-
-            case value_t::number_integer:
-            {
-                dump_integer(val.m_value.number_integer);
-                return;
-            }
-
-            case value_t::number_unsigned:
-            {
-                dump_integer(val.m_value.number_unsigned);
-                return;
-            }
-
-            case value_t::number_float:
-            {
-                dump_float(val.m_value.number_float);
-                return;
-            }
-
-            case value_t::discarded:
-            {
-                o->write_characters("<discarded>", 11);
-                return;
-            }
-
-            case value_t::null:
-            {
-                o->write_characters("null", 4);
-                return;
-            }
-
-            default:            // LCOV_EXCL_LINE
-                JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
-        }
-    }
-
-  JSON_PRIVATE_UNLESS_TESTED:
-    /*!
-    @brief dump escaped string
-
-    Escape a string by replacing certain special characters by a sequence of an
-    escape character (backslash) and another character and other control
-    characters by a sequence of "\u" followed by a four-digit hex
-    representation. The escaped string is written to output stream @a o.
-
-    @param[in] s  the string to escape
-    @param[in] ensure_ascii  whether to escape non-ASCII characters with
-                             \uXXXX sequences
-
-    @complexity Linear in the length of string @a s.
-    */
-    void dump_escaped(const string_t& s, const bool ensure_ascii)
-    {
-        std::uint32_t codepoint{};
-        std::uint8_t state = UTF8_ACCEPT;
-        std::size_t bytes = 0;  // number of bytes written to string_buffer
-
-        // number of bytes written at the point of the last valid byte
-        std::size_t bytes_after_last_accept = 0;
-        std::size_t undumped_chars = 0;
-
-        for (std::size_t i = 0; i < s.size(); ++i)
-        {
-            const auto byte = static_cast<std::uint8_t>(s[i]);
-
-            switch (decode(state, codepoint, byte))
-            {
-                case UTF8_ACCEPT:  // decode found a new code point
-                {
-                    switch (codepoint)
-                    {
-                        case 0x08: // backspace
-                        {
-                            string_buffer[bytes++] = '\\';
-                            string_buffer[bytes++] = 'b';
-                            break;
-                        }
-
-                        case 0x09: // horizontal tab
-                        {
-                            string_buffer[bytes++] = '\\';
-                            string_buffer[bytes++] = 't';
-                            break;
-                        }
-
-                        case 0x0A: // newline
-                        {
-                            string_buffer[bytes++] = '\\';
-                            string_buffer[bytes++] = 'n';
-                            break;
-                        }
-
-                        case 0x0C: // formfeed
-                        {
-                            string_buffer[bytes++] = '\\';
-                            string_buffer[bytes++] = 'f';
-                            break;
-                        }
-
-                        case 0x0D: // carriage return
-                        {
-                            string_buffer[bytes++] = '\\';
-                            string_buffer[bytes++] = 'r';
-                            break;
-                        }
-
-                        case 0x22: // quotation mark
-                        {
-                            string_buffer[bytes++] = '\\';
-                            string_buffer[bytes++] = '\"';
-                            break;
-                        }
-
-                        case 0x5C: // reverse solidus
-                        {
-                            string_buffer[bytes++] = '\\';
-                            string_buffer[bytes++] = '\\';
-                            break;
-                        }
-
-                        default:
-                        {
-                            // escape control characters (0x00..0x1F) or, if
-                            // ensure_ascii parameter is used, non-ASCII characters
-                            if ((codepoint <= 0x1F) || (ensure_ascii && (codepoint >= 0x7F)))
-                            {
-                                if (codepoint <= 0xFFFF)
-                                {
-                                    // NOLINTNEXTLINE(cppcoreguidelines-pro-type-vararg,hicpp-vararg)
-                                    static_cast<void>((std::snprintf)(string_buffer.data() + bytes, 7, "\\u%04x",
-                                                                      static_cast<std::uint16_t>(codepoint)));
-                                    bytes += 6;
-                                }
-                                else
-                                {
-                                    // NOLINTNEXTLINE(cppcoreguidelines-pro-type-vararg,hicpp-vararg)
-                                    static_cast<void>((std::snprintf)(string_buffer.data() + bytes, 13, "\\u%04x\\u%04x",
-                                                                      static_cast<std::uint16_t>(0xD7C0u + (codepoint >> 10u)),
-                                                                      static_cast<std::uint16_t>(0xDC00u + (codepoint & 0x3FFu))));
-                                    bytes += 12;
-                                }
-                            }
-                            else
-                            {
-                                // copy byte to buffer (all previous bytes
-                                // been copied have in default case above)
-                                string_buffer[bytes++] = s[i];
-                            }
-                            break;
-                        }
-                    }
-
-                    // write buffer and reset index; there must be 13 bytes
-                    // left, as this is the maximal number of bytes to be
-                    // written ("\uxxxx\uxxxx\0") for one code point
-                    if (string_buffer.size() - bytes < 13)
-                    {
-                        o->write_characters(string_buffer.data(), bytes);
-                        bytes = 0;
-                    }
-
-                    // remember the byte position of this accept
-                    bytes_after_last_accept = bytes;
-                    undumped_chars = 0;
-                    break;
-                }
-
-                case UTF8_REJECT:  // decode found invalid UTF-8 byte
-                {
-                    switch (error_handler)
-                    {
-                        case error_handler_t::strict:
-                        {
-                            std::stringstream ss;
-                            ss << std::uppercase << std::setfill('0') << std::setw(2) << std::hex << (byte | 0);
-                            JSON_THROW(type_error::create(316, "invalid UTF-8 byte at index " + std::to_string(i) + ": 0x" + ss.str(), BasicJsonType()));
-                        }
-
-                        case error_handler_t::ignore:
-                        case error_handler_t::replace:
-                        {
-                            // in case we saw this character the first time, we
-                            // would like to read it again, because the byte
-                            // may be OK for itself, but just not OK for the
-                            // previous sequence
-                            if (undumped_chars > 0)
-                            {
-                                --i;
-                            }
-
-                            // reset length buffer to the last accepted index;
-                            // thus removing/ignoring the invalid characters
-                            bytes = bytes_after_last_accept;
-
-                            if (error_handler == error_handler_t::replace)
-                            {
-                                // add a replacement character
-                                if (ensure_ascii)
-                                {
-                                    string_buffer[bytes++] = '\\';
-                                    string_buffer[bytes++] = 'u';
-                                    string_buffer[bytes++] = 'f';
-                                    string_buffer[bytes++] = 'f';
-                                    string_buffer[bytes++] = 'f';
-                                    string_buffer[bytes++] = 'd';
-                                }
-                                else
-                                {
-                                    string_buffer[bytes++] = detail::binary_writer<BasicJsonType, char>::to_char_type('\xEF');
-                                    string_buffer[bytes++] = detail::binary_writer<BasicJsonType, char>::to_char_type('\xBF');
-                                    string_buffer[bytes++] = detail::binary_writer<BasicJsonType, char>::to_char_type('\xBD');
-                                }
-
-                                // write buffer and reset index; there must be 13 bytes
-                                // left, as this is the maximal number of bytes to be
-                                // written ("\uxxxx\uxxxx\0") for one code point
-                                if (string_buffer.size() - bytes < 13)
-                                {
-                                    o->write_characters(string_buffer.data(), bytes);
-                                    bytes = 0;
-                                }
-
-                                bytes_after_last_accept = bytes;
-                            }
-
-                            undumped_chars = 0;
-
-                            // continue processing the string
-                            state = UTF8_ACCEPT;
-                            break;
-                        }
-
-                        default:            // LCOV_EXCL_LINE
-                            JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
-                    }
-                    break;
-                }
-
-                default:  // decode found yet incomplete multi-byte code point
-                {
-                    if (!ensure_ascii)
-                    {
-                        // code point will not be escaped - copy byte to buffer
-                        string_buffer[bytes++] = s[i];
-                    }
-                    ++undumped_chars;
-                    break;
-                }
-            }
-        }
-
-        // we finished processing the string
-        if (JSON_HEDLEY_LIKELY(state == UTF8_ACCEPT))
-        {
-            // write buffer
-            if (bytes > 0)
-            {
-                o->write_characters(string_buffer.data(), bytes);
-            }
-        }
-        else
-        {
-            // we finish reading, but do not accept: string was incomplete
-            switch (error_handler)
-            {
-                case error_handler_t::strict:
-                {
-                    std::stringstream ss;
-                    ss << std::uppercase << std::setfill('0') << std::setw(2) << std::hex << (static_cast<std::uint8_t>(s.back()) | 0);
-                    JSON_THROW(type_error::create(316, "incomplete UTF-8 string; last byte: 0x" + ss.str(), BasicJsonType()));
-                }
-
-                case error_handler_t::ignore:
-                {
-                    // write all accepted bytes
-                    o->write_characters(string_buffer.data(), bytes_after_last_accept);
-                    break;
-                }
-
-                case error_handler_t::replace:
-                {
-                    // write all accepted bytes
-                    o->write_characters(string_buffer.data(), bytes_after_last_accept);
-                    // add a replacement character
-                    if (ensure_ascii)
-                    {
-                        o->write_characters("\\ufffd", 6);
-                    }
-                    else
-                    {
-                        o->write_characters("\xEF\xBF\xBD", 3);
-                    }
-                    break;
-                }
-
-                default:            // LCOV_EXCL_LINE
-                    JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
-            }
-        }
-    }
-
-  private:
-    /*!
-    @brief count digits
-
-    Count the number of decimal (base 10) digits for an input unsigned integer.
-
-    @param[in] x  unsigned integer number to count its digits
-    @return    number of decimal digits
-    */
-    inline unsigned int count_digits(number_unsigned_t x) noexcept
-    {
-        unsigned int n_digits = 1;
-        for (;;)
-        {
-            if (x < 10)
-            {
-                return n_digits;
-            }
-            if (x < 100)
-            {
-                return n_digits + 1;
-            }
-            if (x < 1000)
-            {
-                return n_digits + 2;
-            }
-            if (x < 10000)
-            {
-                return n_digits + 3;
-            }
-            x = x / 10000u;
-            n_digits += 4;
-        }
-    }
-
-    // templates to avoid warnings about useless casts
-    template <typename NumberType, enable_if_t<std::is_signed<NumberType>::value, int> = 0>
-    bool is_negative_number(NumberType x)
-    {
-        return x < 0;
-    }
-
-    template < typename NumberType, enable_if_t <std::is_unsigned<NumberType>::value, int > = 0 >
-    bool is_negative_number(NumberType /*unused*/)
-    {
-        return false;
-    }
-
-    /*!
-    @brief dump an integer
-
-    Dump a given integer to output stream @a o. Works internally with
-    @a number_buffer.
-
-    @param[in] x  integer number (signed or unsigned) to dump
-    @tparam NumberType either @a number_integer_t or @a number_unsigned_t
-    */
-    template < typename NumberType, detail::enable_if_t <
-                   std::is_integral<NumberType>::value ||
-                   std::is_same<NumberType, number_unsigned_t>::value ||
-                   std::is_same<NumberType, number_integer_t>::value ||
-                   std::is_same<NumberType, binary_char_t>::value,
-                   int > = 0 >
-    void dump_integer(NumberType x)
-    {
-        static constexpr std::array<std::array<char, 2>, 100> digits_to_99
-        {
-            {
-                {{'0', '0'}}, {{'0', '1'}}, {{'0', '2'}}, {{'0', '3'}}, {{'0', '4'}}, {{'0', '5'}}, {{'0', '6'}}, {{'0', '7'}}, {{'0', '8'}}, {{'0', '9'}},
-                {{'1', '0'}}, {{'1', '1'}}, {{'1', '2'}}, {{'1', '3'}}, {{'1', '4'}}, {{'1', '5'}}, {{'1', '6'}}, {{'1', '7'}}, {{'1', '8'}}, {{'1', '9'}},
-                {{'2', '0'}}, {{'2', '1'}}, {{'2', '2'}}, {{'2', '3'}}, {{'2', '4'}}, {{'2', '5'}}, {{'2', '6'}}, {{'2', '7'}}, {{'2', '8'}}, {{'2', '9'}},
-                {{'3', '0'}}, {{'3', '1'}}, {{'3', '2'}}, {{'3', '3'}}, {{'3', '4'}}, {{'3', '5'}}, {{'3', '6'}}, {{'3', '7'}}, {{'3', '8'}}, {{'3', '9'}},
-                {{'4', '0'}}, {{'4', '1'}}, {{'4', '2'}}, {{'4', '3'}}, {{'4', '4'}}, {{'4', '5'}}, {{'4', '6'}}, {{'4', '7'}}, {{'4', '8'}}, {{'4', '9'}},
-                {{'5', '0'}}, {{'5', '1'}}, {{'5', '2'}}, {{'5', '3'}}, {{'5', '4'}}, {{'5', '5'}}, {{'5', '6'}}, {{'5', '7'}}, {{'5', '8'}}, {{'5', '9'}},
-                {{'6', '0'}}, {{'6', '1'}}, {{'6', '2'}}, {{'6', '3'}}, {{'6', '4'}}, {{'6', '5'}}, {{'6', '6'}}, {{'6', '7'}}, {{'6', '8'}}, {{'6', '9'}},
-                {{'7', '0'}}, {{'7', '1'}}, {{'7', '2'}}, {{'7', '3'}}, {{'7', '4'}}, {{'7', '5'}}, {{'7', '6'}}, {{'7', '7'}}, {{'7', '8'}}, {{'7', '9'}},
-                {{'8', '0'}}, {{'8', '1'}}, {{'8', '2'}}, {{'8', '3'}}, {{'8', '4'}}, {{'8', '5'}}, {{'8', '6'}}, {{'8', '7'}}, {{'8', '8'}}, {{'8', '9'}},
-                {{'9', '0'}}, {{'9', '1'}}, {{'9', '2'}}, {{'9', '3'}}, {{'9', '4'}}, {{'9', '5'}}, {{'9', '6'}}, {{'9', '7'}}, {{'9', '8'}}, {{'9', '9'}},
-            }
-        };
-
-        // special case for "0"
-        if (x == 0)
-        {
-            o->write_character('0');
-            return;
-        }
-
-        // use a pointer to fill the buffer
-        auto buffer_ptr = number_buffer.begin(); // NOLINT(llvm-qualified-auto,readability-qualified-auto,cppcoreguidelines-pro-type-vararg,hicpp-vararg)
-
-        number_unsigned_t abs_value;
-
-        unsigned int n_chars{};
-
-        if (is_negative_number(x))
-        {
-            *buffer_ptr = '-';
-            abs_value = remove_sign(static_cast<number_integer_t>(x));
-
-            // account one more byte for the minus sign
-            n_chars = 1 + count_digits(abs_value);
-        }
-        else
-        {
-            abs_value = static_cast<number_unsigned_t>(x);
-            n_chars = count_digits(abs_value);
-        }
-
-        // spare 1 byte for '\0'
-        JSON_ASSERT(n_chars < number_buffer.size() - 1);
-
-        // jump to the end to generate the string from backward,
-        // so we later avoid reversing the result
-        buffer_ptr += n_chars;
-
-        // Fast int2ascii implementation inspired by "Fastware" talk by Andrei Alexandrescu
-        // See: https://www.youtube.com/watch?v=o4-CwDo2zpg
-        while (abs_value >= 100)
-        {
-            const auto digits_index = static_cast<unsigned>((abs_value % 100));
-            abs_value /= 100;
-            *(--buffer_ptr) = digits_to_99[digits_index][1];
-            *(--buffer_ptr) = digits_to_99[digits_index][0];
-        }
-
-        if (abs_value >= 10)
-        {
-            const auto digits_index = static_cast<unsigned>(abs_value);
-            *(--buffer_ptr) = digits_to_99[digits_index][1];
-            *(--buffer_ptr) = digits_to_99[digits_index][0];
-        }
-        else
-        {
-            *(--buffer_ptr) = static_cast<char>('0' + abs_value);
-        }
-
-        o->write_characters(number_buffer.data(), n_chars);
-    }
-
-    /*!
-    @brief dump a floating-point number
-
-    Dump a given floating-point number to output stream @a o. Works internally
-    with @a number_buffer.
-
-    @param[in] x  floating-point number to dump
-    */
-    void dump_float(number_float_t x)
-    {
-        // NaN / inf
-        if (!std::isfinite(x))
-        {
-            o->write_characters("null", 4);
-            return;
-        }
-
-        // If number_float_t is an IEEE-754 single or double precision number,
-        // use the Grisu2 algorithm to produce short numbers which are
-        // guaranteed to round-trip, using strtof and strtod, resp.
-        //
-        // NB: The test below works if <long double> == <double>.
-        static constexpr bool is_ieee_single_or_double
-            = (std::numeric_limits<number_float_t>::is_iec559 && std::numeric_limits<number_float_t>::digits == 24 && std::numeric_limits<number_float_t>::max_exponent == 128) ||
-              (std::numeric_limits<number_float_t>::is_iec559 && std::numeric_limits<number_float_t>::digits == 53 && std::numeric_limits<number_float_t>::max_exponent == 1024);
-
-        dump_float(x, std::integral_constant<bool, is_ieee_single_or_double>());
-    }
-
-    void dump_float(number_float_t x, std::true_type /*is_ieee_single_or_double*/)
-    {
-        auto* begin = number_buffer.data();
-        auto* end = ::nlohmann::detail::to_chars(begin, begin + number_buffer.size(), x);
-
-        o->write_characters(begin, static_cast<size_t>(end - begin));
-    }
-
-    void dump_float(number_float_t x, std::false_type /*is_ieee_single_or_double*/)
-    {
-        // get number of digits for a float -> text -> float round-trip
-        static constexpr auto d = std::numeric_limits<number_float_t>::max_digits10;
-
-        // the actual conversion
-        // NOLINTNEXTLINE(cppcoreguidelines-pro-type-vararg,hicpp-vararg)
-        std::ptrdiff_t len = (std::snprintf)(number_buffer.data(), number_buffer.size(), "%.*g", d, x);
-
-        // negative value indicates an error
-        JSON_ASSERT(len > 0);
-        // check if buffer was large enough
-        JSON_ASSERT(static_cast<std::size_t>(len) < number_buffer.size());
-
-        // erase thousands separator
-        if (thousands_sep != '\0')
-        {
-            // NOLINTNEXTLINE(readability-qualified-auto,llvm-qualified-auto): std::remove returns an iterator, see https://github.com/nlohmann/json/issues/3081
-            const auto end = std::remove(number_buffer.begin(), number_buffer.begin() + len, thousands_sep);
-            std::fill(end, number_buffer.end(), '\0');
-            JSON_ASSERT((end - number_buffer.begin()) <= len);
-            len = (end - number_buffer.begin());
-        }
-
-        // convert decimal point to '.'
-        if (decimal_point != '\0' && decimal_point != '.')
-        {
-            // NOLINTNEXTLINE(readability-qualified-auto,llvm-qualified-auto): std::find returns an iterator, see https://github.com/nlohmann/json/issues/3081
-            const auto dec_pos = std::find(number_buffer.begin(), number_buffer.end(), decimal_point);
-            if (dec_pos != number_buffer.end())
-            {
-                *dec_pos = '.';
-            }
-        }
-
-        o->write_characters(number_buffer.data(), static_cast<std::size_t>(len));
-
-        // determine if we need to append ".0"
-        const bool value_is_int_like =
-            std::none_of(number_buffer.begin(), number_buffer.begin() + len + 1,
-                         [](char c)
-        {
-            return c == '.' || c == 'e';
-        });
-
-        if (value_is_int_like)
-        {
-            o->write_characters(".0", 2);
-        }
-    }
-
-    /*!
-    @brief check whether a string is UTF-8 encoded
-
-    The function checks each byte of a string whether it is UTF-8 encoded. The
-    result of the check is stored in the @a state parameter. The function must
-    be called initially with state 0 (accept). State 1 means the string must
-    be rejected, because the current byte is not allowed. If the string is
-    completely processed, but the state is non-zero, the string ended
-    prematurely; that is, the last byte indicated more bytes should have
-    followed.
-
-    @param[in,out] state  the state of the decoding
-    @param[in,out] codep  codepoint (valid only if resulting state is UTF8_ACCEPT)
-    @param[in] byte       next byte to decode
-    @return               new state
-
-    @note The function has been edited: a std::array is used.
-
-    @copyright Copyright (c) 2008-2009 Bjoern Hoehrmann <bjoern@hoehrmann.de>
-    @sa http://bjoern.hoehrmann.de/utf-8/decoder/dfa/
-    */
-    static std::uint8_t decode(std::uint8_t& state, std::uint32_t& codep, const std::uint8_t byte) noexcept
-    {
-        static const std::array<std::uint8_t, 400> utf8d =
-        {
-            {
-                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 00..1F
-                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 20..3F
-                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 40..5F
-                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 60..7F
-                1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, // 80..9F
-                7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // A0..BF
-                8, 8, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, // C0..DF
-                0xA, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x4, 0x3, 0x3, // E0..EF
-                0xB, 0x6, 0x6, 0x6, 0x5, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, // F0..FF
-                0x0, 0x1, 0x2, 0x3, 0x5, 0x8, 0x7, 0x1, 0x1, 0x1, 0x4, 0x6, 0x1, 0x1, 0x1, 0x1, // s0..s0
-                1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, // s1..s2
-                1, 2, 1, 1, 1, 1, 1, 2, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, // s3..s4
-                1, 2, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 3, 1, 1, 1, 1, 1, 1, // s5..s6
-                1, 3, 1, 1, 1, 1, 1, 3, 1, 3, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 // s7..s8
-            }
-        };
-
-        JSON_ASSERT(byte < utf8d.size());
-        const std::uint8_t type = utf8d[byte];
-
-        codep = (state != UTF8_ACCEPT)
-                ? (byte & 0x3fu) | (codep << 6u)
-                : (0xFFu >> type) & (byte);
-
-        std::size_t index = 256u + static_cast<size_t>(state) * 16u + static_cast<size_t>(type);
-        JSON_ASSERT(index < 400);
-        state = utf8d[index];
-        return state;
-    }
-
-    /*
-     * Overload to make the compiler happy while it is instantiating
-     * dump_integer for number_unsigned_t.
-     * Must never be called.
-     */
-    number_unsigned_t remove_sign(number_unsigned_t x)
-    {
-        JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
-        return x; // LCOV_EXCL_LINE
-    }
-
-    /*
-     * Helper function for dump_integer
-     *
-     * This function takes a negative signed integer and returns its absolute
-     * value as unsigned integer. The plus/minus shuffling is necessary as we can
-     * not directly remove the sign of an arbitrary signed integer as the
-     * absolute values of INT_MIN and INT_MAX are usually not the same. See
-     * #1708 for details.
-     */
-    inline number_unsigned_t remove_sign(number_integer_t x) noexcept
-    {
-        JSON_ASSERT(x < 0 && x < (std::numeric_limits<number_integer_t>::max)()); // NOLINT(misc-redundant-expression)
-        return static_cast<number_unsigned_t>(-(x + 1)) + 1;
-    }
-
-  private:
-    /// the output of the serializer
-    output_adapter_t<char> o = nullptr;
-
-    /// a (hopefully) large enough character buffer
-    std::array<char, 64> number_buffer{{}};
-
-    /// the locale
-    const std::lconv* loc = nullptr;
-    /// the locale's thousand separator character
-    const char thousands_sep = '\0';
-    /// the locale's decimal point character
-    const char decimal_point = '\0';
-
-    /// string buffer
-    std::array<char, 512> string_buffer{{}};
-
-    /// the indentation character
-    const char indent_char;
-    /// the indentation string
-    string_t indent_string;
-
-    /// error_handler how to react on decoding errors
-    const error_handler_t error_handler;
-};
-}  // namespace detail
-}  // namespace nlohmann
-
-// #include <nlohmann/detail/value_t.hpp>
-
-// #include <nlohmann/json_fwd.hpp>
-
-// #include <nlohmann/ordered_map.hpp>
-
-
-#include <functional> // less
-#include <initializer_list> // initializer_list
-#include <iterator> // input_iterator_tag, iterator_traits
-#include <memory> // allocator
-#include <stdexcept> // for out_of_range
-#include <type_traits> // enable_if, is_convertible
-#include <utility> // pair
-#include <vector> // vector
-
-// #include <nlohmann/detail/macro_scope.hpp>
-
-
-namespace nlohmann
-{
-
-/// ordered_map: a minimal map-like container that preserves insertion order
-/// for use within nlohmann::basic_json<ordered_map>
-template <class Key, class T, class IgnoredLess = std::less<Key>,
-          class Allocator = std::allocator<std::pair<const Key, T>>>
-                  struct ordered_map : std::vector<std::pair<const Key, T>, Allocator>
-{
-    using key_type = Key;
-    using mapped_type = T;
-    using Container = std::vector<std::pair<const Key, T>, Allocator>;
-    using iterator = typename Container::iterator;
-    using const_iterator = typename Container::const_iterator;
-    using size_type = typename Container::size_type;
-    using value_type = typename Container::value_type;
-
-    // Explicit constructors instead of `using Container::Container`
-    // otherwise older compilers choke on it (GCC <= 5.5, xcode <= 9.4)
-    ordered_map(const Allocator& alloc = Allocator()) : Container{alloc} {}
-    template <class It>
-    ordered_map(It first, It last, const Allocator& alloc = Allocator())
-        : Container{first, last, alloc} {}
-    ordered_map(std::initializer_list<T> init, const Allocator& alloc = Allocator() )
-        : Container{init, alloc} {}
-
-    std::pair<iterator, bool> emplace(const key_type& key, T&& t)
-    {
-        for (auto it = this->begin(); it != this->end(); ++it)
-        {
-            if (it->first == key)
-            {
-                return {it, false};
-            }
-        }
-        Container::emplace_back(key, t);
-        return {--this->end(), true};
-    }
-
-    T& operator[](const Key& key)
-    {
-        return emplace(key, T{}).first->second;
-    }
-
-    const T& operator[](const Key& key) const
-    {
-        return at(key);
-    }
-
-    T& at(const Key& key)
-    {
-        for (auto it = this->begin(); it != this->end(); ++it)
-        {
-            if (it->first == key)
-            {
-                return it->second;
-            }
-        }
-
-        JSON_THROW(std::out_of_range("key not found"));
-    }
-
-    const T& at(const Key& key) const
-    {
-        for (auto it = this->begin(); it != this->end(); ++it)
-        {
-            if (it->first == key)
-            {
-                return it->second;
-            }
-        }
-
-        JSON_THROW(std::out_of_range("key not found"));
-    }
-
-    size_type erase(const Key& key)
-    {
-        for (auto it = this->begin(); it != this->end(); ++it)
-        {
-            if (it->first == key)
-            {
-                // Since we cannot move const Keys, re-construct them in place
-                for (auto next = it; ++next != this->end(); ++it)
-                {
-                    it->~value_type(); // Destroy but keep allocation
-                    new (&*it) value_type{std::move(*next)};
-                }
-                Container::pop_back();
-                return 1;
-            }
-        }
-        return 0;
-    }
-
-    iterator erase(iterator pos)
-    {
-        return erase(pos, std::next(pos));
-    }
-
-    iterator erase(iterator first, iterator last)
-    {
-        const auto elements_affected = std::distance(first, last);
-        const auto offset = std::distance(Container::begin(), first);
-
-        // This is the start situation. We need to delete elements_affected
-        // elements (3 in this example: e, f, g), and need to return an
-        // iterator past the last deleted element (h in this example).
-        // Note that offset is the distance from the start of the vector
-        // to first. We will need this later.
-
-        // [ a, b, c, d, e, f, g, h, i, j ]
-        //               ^        ^
-        //             first    last
-
-        // Since we cannot move const Keys, we re-construct them in place.
-        // We start at first and re-construct (viz. copy) the elements from
-        // the back of the vector. Example for first iteration:
-
-        //               ,--------.
-        //               v        |   destroy e and re-construct with h
-        // [ a, b, c, d, e, f, g, h, i, j ]
-        //               ^        ^
-        //               it       it + elements_affected
-
-        for (auto it = first; std::next(it, elements_affected) != Container::end(); ++it)
-        {
-            it->~value_type(); // destroy but keep allocation
-            new (&*it) value_type{std::move(*std::next(it, elements_affected))}; // "move" next element to it
-        }
-
-        // [ a, b, c, d, h, i, j, h, i, j ]
-        //               ^        ^
-        //             first    last
-
-        // remove the unneeded elements at the end of the vector
-        Container::resize(this->size() - static_cast<size_type>(elements_affected));
-
-        // [ a, b, c, d, h, i, j ]
-        //               ^        ^
-        //             first    last
-
-        // first is now pointing past the last deleted element, but we cannot
-        // use this iterator, because it may have been invalidated by the
-        // resize call. Instead, we can return begin() + offset.
-        return Container::begin() + offset;
-    }
-
-    size_type count(const Key& key) const
-    {
-        for (auto it = this->begin(); it != this->end(); ++it)
-        {
-            if (it->first == key)
-            {
-                return 1;
-            }
-        }
-        return 0;
-    }
-
-    iterator find(const Key& key)
-    {
-        for (auto it = this->begin(); it != this->end(); ++it)
-        {
-            if (it->first == key)
-            {
-                return it;
-            }
-        }
-        return Container::end();
-    }
-
-    const_iterator find(const Key& key) const
-    {
-        for (auto it = this->begin(); it != this->end(); ++it)
-        {
-            if (it->first == key)
-            {
-                return it;
-            }
-        }
-        return Container::end();
-    }
-
-    std::pair<iterator, bool> insert( value_type&& value )
-    {
-        return emplace(value.first, std::move(value.second));
-    }
-
-    std::pair<iterator, bool> insert( const value_type& value )
-    {
-        for (auto it = this->begin(); it != this->end(); ++it)
-        {
-            if (it->first == value.first)
-            {
-                return {it, false};
-            }
-        }
-        Container::push_back(value);
-        return {--this->end(), true};
-    }
-
-    template<typename InputIt>
-    using require_input_iter = typename std::enable_if<std::is_convertible<typename std::iterator_traits<InputIt>::iterator_category,
-            std::input_iterator_tag>::value>::type;
-
-    template<typename InputIt, typename = require_input_iter<InputIt>>
-    void insert(InputIt first, InputIt last)
-    {
-        for (auto it = first; it != last; ++it)
-        {
-            insert(*it);
-        }
-    }
-};
-
-}  // namespace nlohmann
-
-
-#if defined(JSON_HAS_CPP_17)
-    #include <string_view>
-#endif
-
-/*!
-@brief namespace for Niels Lohmann
-@see https://github.com/nlohmann
-@since version 1.0.0
-*/
-namespace nlohmann
-{
-
-/*!
-@brief a class to store JSON values
-
-@internal
-@invariant The member variables @a m_value and @a m_type have the following
-relationship:
-- If `m_type == value_t::object`, then `m_value.object != nullptr`.
-- If `m_type == value_t::array`, then `m_value.array != nullptr`.
-- If `m_type == value_t::string`, then `m_value.string != nullptr`.
-The invariants are checked by member function assert_invariant().
-
-@note ObjectType trick from https://stackoverflow.com/a/9860911
-@endinternal
-
-@since version 1.0.0
-
-@nosubgrouping
-*/
-NLOHMANN_BASIC_JSON_TPL_DECLARATION
-class basic_json // NOLINT(cppcoreguidelines-special-member-functions,hicpp-special-member-functions)
-{
-  private:
-    template<detail::value_t> friend struct detail::external_constructor;
-    friend ::nlohmann::json_pointer<basic_json>;
-
-    template<typename BasicJsonType, typename InputType>
-    friend class ::nlohmann::detail::parser;
-    friend ::nlohmann::detail::serializer<basic_json>;
-    template<typename BasicJsonType>
-    friend class ::nlohmann::detail::iter_impl;
-    template<typename BasicJsonType, typename CharType>
-    friend class ::nlohmann::detail::binary_writer;
-    template<typename BasicJsonType, typename InputType, typename SAX>
-    friend class ::nlohmann::detail::binary_reader;
-    template<typename BasicJsonType>
-    friend class ::nlohmann::detail::json_sax_dom_parser;
-    template<typename BasicJsonType>
-    friend class ::nlohmann::detail::json_sax_dom_callback_parser;
-    friend class ::nlohmann::detail::exception;
-
-    /// workaround type for MSVC
-    using basic_json_t = NLOHMANN_BASIC_JSON_TPL;
-
-  JSON_PRIVATE_UNLESS_TESTED:
-    // convenience aliases for types residing in namespace detail;
-    using lexer = ::nlohmann::detail::lexer_base<basic_json>;
-
-    template<typename InputAdapterType>
-    static ::nlohmann::detail::parser<basic_json, InputAdapterType> parser(
-        InputAdapterType adapter,
-        detail::parser_callback_t<basic_json>cb = nullptr,
-        const bool allow_exceptions = true,
-        const bool ignore_comments = false
-                                 )
-    {
-        return ::nlohmann::detail::parser<basic_json, InputAdapterType>(std::move(adapter),
-                std::move(cb), allow_exceptions, ignore_comments);
-    }
-
-  private:
-    using primitive_iterator_t = ::nlohmann::detail::primitive_iterator_t;
-    template<typename BasicJsonType>
-    using internal_iterator = ::nlohmann::detail::internal_iterator<BasicJsonType>;
-    template<typename BasicJsonType>
-    using iter_impl = ::nlohmann::detail::iter_impl<BasicJsonType>;
-    template<typename Iterator>
-    using iteration_proxy = ::nlohmann::detail::iteration_proxy<Iterator>;
-    template<typename Base> using json_reverse_iterator = ::nlohmann::detail::json_reverse_iterator<Base>;
-
-    template<typename CharType>
-    using output_adapter_t = ::nlohmann::detail::output_adapter_t<CharType>;
-
-    template<typename InputType>
-    using binary_reader = ::nlohmann::detail::binary_reader<basic_json, InputType>;
-    template<typename CharType> using binary_writer = ::nlohmann::detail::binary_writer<basic_json, CharType>;
-
-  JSON_PRIVATE_UNLESS_TESTED:
-    using serializer = ::nlohmann::detail::serializer<basic_json>;
-
-  public:
-    using value_t = detail::value_t;
-    /// JSON Pointer, see @ref nlohmann::json_pointer
-    using json_pointer = ::nlohmann::json_pointer<basic_json>;
-    template<typename T, typename SFINAE>
-    using json_serializer = JSONSerializer<T, SFINAE>;
-    /// how to treat decoding errors
-    using error_handler_t = detail::error_handler_t;
-    /// how to treat CBOR tags
-    using cbor_tag_handler_t = detail::cbor_tag_handler_t;
-    /// helper type for initializer lists of basic_json values
-    using initializer_list_t = std::initializer_list<detail::json_ref<basic_json>>;
-
-    using input_format_t = detail::input_format_t;
-    /// SAX interface type, see @ref nlohmann::json_sax
-    using json_sax_t = json_sax<basic_json>;
-
-    ////////////////
-    // exceptions //
-    ////////////////
-
-    /// @name exceptions
-    /// Classes to implement user-defined exceptions.
-    /// @{
-
-    using exception = detail::exception;
-    using parse_error = detail::parse_error;
-    using invalid_iterator = detail::invalid_iterator;
-    using type_error = detail::type_error;
-    using out_of_range = detail::out_of_range;
-    using other_error = detail::other_error;
-
-    /// @}
-
-
-    /////////////////////
-    // container types //
-    /////////////////////
-
-    /// @name container types
-    /// The canonic container types to use @ref basic_json like any other STL
-    /// container.
-    /// @{
-
-    /// the type of elements in a basic_json container
-    using value_type = basic_json;
-
-    /// the type of an element reference
-    using reference = value_type&;
-    /// the type of an element const reference
-    using const_reference = const value_type&;
-
-    /// a type to represent differences between iterators
-    using difference_type = std::ptrdiff_t;
-    /// a type to represent container sizes
-    using size_type = std::size_t;
-
-    /// the allocator type
-    using allocator_type = AllocatorType<basic_json>;
-
-    /// the type of an element pointer
-    using pointer = typename std::allocator_traits<allocator_type>::pointer;
-    /// the type of an element const pointer
-    using const_pointer = typename std::allocator_traits<allocator_type>::const_pointer;
-
-    /// an iterator for a basic_json container
-    using iterator = iter_impl<basic_json>;
-    /// a const iterator for a basic_json container
-    using const_iterator = iter_impl<const basic_json>;
-    /// a reverse iterator for a basic_json container
-    using reverse_iterator = json_reverse_iterator<typename basic_json::iterator>;
-    /// a const reverse iterator for a basic_json container
-    using const_reverse_iterator = json_reverse_iterator<typename basic_json::const_iterator>;
-
-    /// @}
-
-
-    /// @brief returns the allocator associated with the container
-    /// @sa https://json.nlohmann.me/api/basic_json/get_allocator/
-    static allocator_type get_allocator()
-    {
-        return allocator_type();
-    }
-
-    /// @brief returns version information on the library
-    /// @sa https://json.nlohmann.me/api/basic_json/meta/
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    static basic_json meta()
-    {
-        basic_json result;
-
-        result["copyright"] = "(C) 2013-2022 Niels Lohmann";
-        result["name"] = "JSON for Modern C++";
-        result["url"] = "https://github.com/nlohmann/json";
-        result["version"]["string"] =
-            std::to_string(NLOHMANN_JSON_VERSION_MAJOR) + "." +
-            std::to_string(NLOHMANN_JSON_VERSION_MINOR) + "." +
-            std::to_string(NLOHMANN_JSON_VERSION_PATCH);
-        result["version"]["major"] = NLOHMANN_JSON_VERSION_MAJOR;
-        result["version"]["minor"] = NLOHMANN_JSON_VERSION_MINOR;
-        result["version"]["patch"] = NLOHMANN_JSON_VERSION_PATCH;
-
-#ifdef _WIN32
-        result["platform"] = "win32";
-#elif defined __linux__
-        result["platform"] = "linux";
-#elif defined __APPLE__
-        result["platform"] = "apple";
-#elif defined __unix__
-        result["platform"] = "unix";
-#else
-        result["platform"] = "unknown";
-#endif
-
-#if defined(__ICC) || defined(__INTEL_COMPILER)
-        result["compiler"] = {{"family", "icc"}, {"version", __INTEL_COMPILER}};
-#elif defined(__clang__)
-        result["compiler"] = {{"family", "clang"}, {"version", __clang_version__}};
-#elif defined(__GNUC__) || defined(__GNUG__)
-        result["compiler"] = {{"family", "gcc"}, {"version", std::to_string(__GNUC__) + "." + std::to_string(__GNUC_MINOR__) + "." + std::to_string(__GNUC_PATCHLEVEL__)}};
-#elif defined(__HP_cc) || defined(__HP_aCC)
-        result["compiler"] = "hp"
-#elif defined(__IBMCPP__)
-        result["compiler"] = {{"family", "ilecpp"}, {"version", __IBMCPP__}};
-#elif defined(_MSC_VER)
-        result["compiler"] = {{"family", "msvc"}, {"version", _MSC_VER}};
-#elif defined(__PGI)
-        result["compiler"] = {{"family", "pgcpp"}, {"version", __PGI}};
-#elif defined(__SUNPRO_CC)
-        result["compiler"] = {{"family", "sunpro"}, {"version", __SUNPRO_CC}};
-#else
-        result["compiler"] = {{"family", "unknown"}, {"version", "unknown"}};
-#endif
-
-#ifdef __cplusplus
-        result["compiler"]["c++"] = std::to_string(__cplusplus);
-#else
-        result["compiler"]["c++"] = "unknown";
-#endif
-        return result;
-    }
-
-
-    ///////////////////////////
-    // JSON value data types //
-    ///////////////////////////
-
-    /// @name JSON value data types
-    /// The data types to store a JSON value. These types are derived from
-    /// the template arguments passed to class @ref basic_json.
-    /// @{
-
-    /// @brief object key comparator type
-    /// @sa https://json.nlohmann.me/api/basic_json/object_comparator_t/
-#if defined(JSON_HAS_CPP_14)
-    // Use transparent comparator if possible, combined with perfect forwarding
-    // on find() and count() calls prevents unnecessary string construction.
-    using object_comparator_t = std::less<>;
-#else
-    using object_comparator_t = std::less<StringType>;
-#endif
-
-    /// @brief a type for an object
-    /// @sa https://json.nlohmann.me/api/basic_json/object_t/
-    using object_t = ObjectType<StringType,
-          basic_json,
-          object_comparator_t,
-          AllocatorType<std::pair<const StringType,
-          basic_json>>>;
-
-    /// @brief a type for an array
-    /// @sa https://json.nlohmann.me/api/basic_json/array_t/
-    using array_t = ArrayType<basic_json, AllocatorType<basic_json>>;
-
-    /// @brief a type for a string
-    /// @sa https://json.nlohmann.me/api/basic_json/string_t/
-    using string_t = StringType;
-
-    /// @brief a type for a boolean
-    /// @sa https://json.nlohmann.me/api/basic_json/boolean_t/
-    using boolean_t = BooleanType;
-
-    /// @brief a type for a number (integer)
-    /// @sa https://json.nlohmann.me/api/basic_json/number_integer_t/
-    using number_integer_t = NumberIntegerType;
-
-    /// @brief a type for a number (unsigned)
-    /// @sa https://json.nlohmann.me/api/basic_json/number_unsigned_t/
-    using number_unsigned_t = NumberUnsignedType;
-
-    /// @brief a type for a number (floating-point)
-    /// @sa https://json.nlohmann.me/api/basic_json/number_float_t/
-    using number_float_t = NumberFloatType;
-
-    /// @brief a type for a packed binary type
-    /// @sa https://json.nlohmann.me/api/basic_json/binary_t/
-    using binary_t = nlohmann::byte_container_with_subtype<BinaryType>;
-
-    /// @}
-
-  private:
-
-    /// helper for exception-safe object creation
-    template<typename T, typename... Args>
-    JSON_HEDLEY_RETURNS_NON_NULL
-    static T* create(Args&& ... args)
-    {
-        AllocatorType<T> alloc;
-        using AllocatorTraits = std::allocator_traits<AllocatorType<T>>;
-
-        auto deleter = [&](T * obj)
-        {
-            AllocatorTraits::deallocate(alloc, obj, 1);
-        };
-        std::unique_ptr<T, decltype(deleter)> obj(AllocatorTraits::allocate(alloc, 1), deleter);
-        AllocatorTraits::construct(alloc, obj.get(), std::forward<Args>(args)...);
-        JSON_ASSERT(obj != nullptr);
-        return obj.release();
-    }
-
-    ////////////////////////
-    // JSON value storage //
-    ////////////////////////
-
-  JSON_PRIVATE_UNLESS_TESTED:
-    /*!
-    @brief a JSON value
-
-    The actual storage for a JSON value of the @ref basic_json class. This
-    union combines the different storage types for the JSON value types
-    defined in @ref value_t.
-
-    JSON type | value_t type    | used type
-    --------- | --------------- | ------------------------
-    object    | object          | pointer to @ref object_t
-    array     | array           | pointer to @ref array_t
-    string    | string          | pointer to @ref string_t
-    boolean   | boolean         | @ref boolean_t
-    number    | number_integer  | @ref number_integer_t
-    number    | number_unsigned | @ref number_unsigned_t
-    number    | number_float    | @ref number_float_t
-    binary    | binary          | pointer to @ref binary_t
-    null      | null            | *no value is stored*
-
-    @note Variable-length types (objects, arrays, and strings) are stored as
-    pointers. The size of the union should not exceed 64 bits if the default
-    value types are used.
-
-    @since version 1.0.0
-    */
-    union json_value
-    {
-        /// object (stored with pointer to save storage)
-        object_t* object;
-        /// array (stored with pointer to save storage)
-        array_t* array;
-        /// string (stored with pointer to save storage)
-        string_t* string;
-        /// binary (stored with pointer to save storage)
-        binary_t* binary;
-        /// boolean
-        boolean_t boolean;
-        /// number (integer)
-        number_integer_t number_integer;
-        /// number (unsigned integer)
-        number_unsigned_t number_unsigned;
-        /// number (floating-point)
-        number_float_t number_float;
-
-        /// default constructor (for null values)
-        json_value() = default;
-        /// constructor for booleans
-        json_value(boolean_t v) noexcept : boolean(v) {}
-        /// constructor for numbers (integer)
-        json_value(number_integer_t v) noexcept : number_integer(v) {}
-        /// constructor for numbers (unsigned)
-        json_value(number_unsigned_t v) noexcept : number_unsigned(v) {}
-        /// constructor for numbers (floating-point)
-        json_value(number_float_t v) noexcept : number_float(v) {}
-        /// constructor for empty values of a given type
-        json_value(value_t t)
-        {
-            switch (t)
-            {
-                case value_t::object:
-                {
-                    object = create<object_t>();
-                    break;
-                }
-
-                case value_t::array:
-                {
-                    array = create<array_t>();
-                    break;
-                }
-
-                case value_t::string:
-                {
-                    string = create<string_t>("");
-                    break;
-                }
-
-                case value_t::binary:
-                {
-                    binary = create<binary_t>();
-                    break;
-                }
-
-                case value_t::boolean:
-                {
-                    boolean = static_cast<boolean_t>(false);
-                    break;
-                }
-
-                case value_t::number_integer:
-                {
-                    number_integer = static_cast<number_integer_t>(0);
-                    break;
-                }
-
-                case value_t::number_unsigned:
-                {
-                    number_unsigned = static_cast<number_unsigned_t>(0);
-                    break;
-                }
-
-                case value_t::number_float:
-                {
-                    number_float = static_cast<number_float_t>(0.0);
-                    break;
-                }
-
-                case value_t::null:
-                {
-                    object = nullptr;  // silence warning, see #821
-                    break;
-                }
-
-                case value_t::discarded:
-                default:
-                {
-                    object = nullptr;  // silence warning, see #821
-                    if (JSON_HEDLEY_UNLIKELY(t == value_t::null))
-                    {
-                        JSON_THROW(other_error::create(500, "961c151d2e87f2686a955a9be24d316f1362bf21 3.10.5", basic_json())); // LCOV_EXCL_LINE
-                    }
-                    break;
-                }
-            }
-        }
-
-        /// constructor for strings
-        json_value(const string_t& value) : string(create<string_t>(value)) {}
-
-        /// constructor for rvalue strings
-        json_value(string_t&& value) : string(create<string_t>(std::move(value))) {}
-
-        /// constructor for objects
-        json_value(const object_t& value) : object(create<object_t>(value)) {}
-
-        /// constructor for rvalue objects
-        json_value(object_t&& value) : object(create<object_t>(std::move(value))) {}
-
-        /// constructor for arrays
-        json_value(const array_t& value) : array(create<array_t>(value)) {}
-
-        /// constructor for rvalue arrays
-        json_value(array_t&& value) : array(create<array_t>(std::move(value))) {}
-
-        /// constructor for binary arrays
-        json_value(const typename binary_t::container_type& value) : binary(create<binary_t>(value)) {}
-
-        /// constructor for rvalue binary arrays
-        json_value(typename binary_t::container_type&& value) : binary(create<binary_t>(std::move(value))) {}
-
-        /// constructor for binary arrays (internal type)
-        json_value(const binary_t& value) : binary(create<binary_t>(value)) {}
-
-        /// constructor for rvalue binary arrays (internal type)
-        json_value(binary_t&& value) : binary(create<binary_t>(std::move(value))) {}
-
-        void destroy(value_t t)
-        {
-            if (t == value_t::array || t == value_t::object)
-            {
-                // flatten the current json_value to a heap-allocated stack
-                std::vector<basic_json> stack;
-
-                // move the top-level items to stack
-                if (t == value_t::array)
-                {
-                    stack.reserve(array->size());
-                    std::move(array->begin(), array->end(), std::back_inserter(stack));
-                }
-                else
-                {
-                    stack.reserve(object->size());
-                    for (auto&& it : *object)
-                    {
-                        stack.push_back(std::move(it.second));
-                    }
-                }
-
-                while (!stack.empty())
-                {
-                    // move the last item to local variable to be processed
-                    basic_json current_item(std::move(stack.back()));
-                    stack.pop_back();
-
-                    // if current_item is array/object, move
-                    // its children to the stack to be processed later
-                    if (current_item.is_array())
-                    {
-                        std::move(current_item.m_value.array->begin(), current_item.m_value.array->end(), std::back_inserter(stack));
-
-                        current_item.m_value.array->clear();
-                    }
-                    else if (current_item.is_object())
-                    {
-                        for (auto&& it : *current_item.m_value.object)
-                        {
-                            stack.push_back(std::move(it.second));
-                        }
-
-                        current_item.m_value.object->clear();
-                    }
-
-                    // it's now safe that current_item get destructed
-                    // since it doesn't have any children
-                }
-            }
-
-            switch (t)
-            {
-                case value_t::object:
-                {
-                    AllocatorType<object_t> alloc;
-                    std::allocator_traits<decltype(alloc)>::destroy(alloc, object);
-                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, object, 1);
-                    break;
-                }
-
-                case value_t::array:
-                {
-                    AllocatorType<array_t> alloc;
-                    std::allocator_traits<decltype(alloc)>::destroy(alloc, array);
-                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, array, 1);
-                    break;
-                }
-
-                case value_t::string:
-                {
-                    AllocatorType<string_t> alloc;
-                    std::allocator_traits<decltype(alloc)>::destroy(alloc, string);
-                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, string, 1);
-                    break;
-                }
-
-                case value_t::binary:
-                {
-                    AllocatorType<binary_t> alloc;
-                    std::allocator_traits<decltype(alloc)>::destroy(alloc, binary);
-                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, binary, 1);
-                    break;
-                }
-
-                case value_t::null:
-                case value_t::boolean:
-                case value_t::number_integer:
-                case value_t::number_unsigned:
-                case value_t::number_float:
-                case value_t::discarded:
-                default:
-                {
-                    break;
-                }
-            }
-        }
-    };
-
-  private:
-    /*!
-    @brief checks the class invariants
-
-    This function asserts the class invariants. It needs to be called at the
-    end of every constructor to make sure that created objects respect the
-    invariant. Furthermore, it has to be called each time the type of a JSON
-    value is changed, because the invariant expresses a relationship between
-    @a m_type and @a m_value.
-
-    Furthermore, the parent relation is checked for arrays and objects: If
-    @a check_parents true and the value is an array or object, then the
-    container's elements must have the current value as parent.
-
-    @param[in] check_parents  whether the parent relation should be checked.
-               The value is true by default and should only be set to false
-               during destruction of objects when the invariant does not
-               need to hold.
-    */
-    void assert_invariant(bool check_parents = true) const noexcept
-    {
-        JSON_ASSERT(m_type != value_t::object || m_value.object != nullptr);
-        JSON_ASSERT(m_type != value_t::array || m_value.array != nullptr);
-        JSON_ASSERT(m_type != value_t::string || m_value.string != nullptr);
-        JSON_ASSERT(m_type != value_t::binary || m_value.binary != nullptr);
-
-#if JSON_DIAGNOSTICS
-        JSON_TRY
-        {
-            // cppcheck-suppress assertWithSideEffect
-            JSON_ASSERT(!check_parents || !is_structured() || std::all_of(begin(), end(), [this](const basic_json & j)
-            {
-                return j.m_parent == this;
-            }));
-        }
-        JSON_CATCH(...) {} // LCOV_EXCL_LINE
-#endif
-        static_cast<void>(check_parents);
-    }
-
-    void set_parents()
-    {
-#if JSON_DIAGNOSTICS
-        switch (m_type)
-        {
-            case value_t::array:
-            {
-                for (auto& element : *m_value.array)
-                {
-                    element.m_parent = this;
-                }
-                break;
-            }
-
-            case value_t::object:
-            {
-                for (auto& element : *m_value.object)
-                {
-                    element.second.m_parent = this;
-                }
-                break;
-            }
-
-            case value_t::null:
-            case value_t::string:
-            case value_t::boolean:
-            case value_t::number_integer:
-            case value_t::number_unsigned:
-            case value_t::number_float:
-            case value_t::binary:
-            case value_t::discarded:
-            default:
-                break;
-        }
-#endif
-    }
-
-    iterator set_parents(iterator it, typename iterator::difference_type count_set_parents)
-    {
-#if JSON_DIAGNOSTICS
-        for (typename iterator::difference_type i = 0; i < count_set_parents; ++i)
-        {
-            (it + i)->m_parent = this;
-        }
-#else
-        static_cast<void>(count_set_parents);
-#endif
-        return it;
-    }
-
-    reference set_parent(reference j, std::size_t old_capacity = static_cast<std::size_t>(-1))
-    {
-#if JSON_DIAGNOSTICS
-        if (old_capacity != static_cast<std::size_t>(-1))
-        {
-            // see https://github.com/nlohmann/json/issues/2838
-            JSON_ASSERT(type() == value_t::array);
-            if (JSON_HEDLEY_UNLIKELY(m_value.array->capacity() != old_capacity))
-            {
-                // capacity has changed: update all parents
-                set_parents();
-                return j;
-            }
-        }
-
-        // ordered_json uses a vector internally, so pointers could have
-        // been invalidated; see https://github.com/nlohmann/json/issues/2962
-#ifdef JSON_HEDLEY_MSVC_VERSION
-#pragma warning(push )
-#pragma warning(disable : 4127) // ignore warning to replace if with if constexpr
-#endif
-        if (detail::is_ordered_map<object_t>::value)
-        {
-            set_parents();
-            return j;
-        }
-#ifdef JSON_HEDLEY_MSVC_VERSION
-#pragma warning( pop )
-#endif
-
-        j.m_parent = this;
-#else
-        static_cast<void>(j);
-        static_cast<void>(old_capacity);
-#endif
-        return j;
-    }
-
-  public:
-    //////////////////////////
-    // JSON parser callback //
-    //////////////////////////
-
-    /// @brief parser event types
-    /// @sa https://json.nlohmann.me/api/basic_json/parse_event_t/
-    using parse_event_t = detail::parse_event_t;
-
-    /// @brief per-element parser callback type
-    /// @sa https://json.nlohmann.me/api/basic_json/parser_callback_t/
-    using parser_callback_t = detail::parser_callback_t<basic_json>;
-
-    //////////////////
-    // constructors //
-    //////////////////
-
-    /// @name constructors and destructors
-    /// Constructors of class @ref basic_json, copy/move constructor, copy
-    /// assignment, static functions creating objects, and the destructor.
-    /// @{
-
-    /// @brief create an empty value with a given type
-    /// @sa https://json.nlohmann.me/api/basic_json/basic_json/
-    basic_json(const value_t v)
-        : m_type(v), m_value(v)
-    {
-        assert_invariant();
-    }
-
-    /// @brief create a null object
-    /// @sa https://json.nlohmann.me/api/basic_json/basic_json/
-    basic_json(std::nullptr_t = nullptr) noexcept
-        : basic_json(value_t::null)
-    {
-        assert_invariant();
-    }
-
-    /// @brief create a JSON value from compatible types
-    /// @sa https://json.nlohmann.me/api/basic_json/basic_json/
-    template < typename CompatibleType,
-               typename U = detail::uncvref_t<CompatibleType>,
-               detail::enable_if_t <
-                   !detail::is_basic_json<U>::value && detail::is_compatible_type<basic_json_t, U>::value, int > = 0 >
-    basic_json(CompatibleType && val) noexcept(noexcept( // NOLINT(bugprone-forwarding-reference-overload,bugprone-exception-escape)
-                JSONSerializer<U>::to_json(std::declval<basic_json_t&>(),
-                                           std::forward<CompatibleType>(val))))
-    {
-        JSONSerializer<U>::to_json(*this, std::forward<CompatibleType>(val));
-        set_parents();
-        assert_invariant();
-    }
-
-    /// @brief create a JSON value from an existing one
-    /// @sa https://json.nlohmann.me/api/basic_json/basic_json/
-    template < typename BasicJsonType,
-               detail::enable_if_t <
-                   detail::is_basic_json<BasicJsonType>::value&& !std::is_same<basic_json, BasicJsonType>::value, int > = 0 >
-    basic_json(const BasicJsonType& val)
-    {
-        using other_boolean_t = typename BasicJsonType::boolean_t;
-        using other_number_float_t = typename BasicJsonType::number_float_t;
-        using other_number_integer_t = typename BasicJsonType::number_integer_t;
-        using other_number_unsigned_t = typename BasicJsonType::number_unsigned_t;
-        using other_string_t = typename BasicJsonType::string_t;
-        using other_object_t = typename BasicJsonType::object_t;
-        using other_array_t = typename BasicJsonType::array_t;
-        using other_binary_t = typename BasicJsonType::binary_t;
-
-        switch (val.type())
-        {
-            case value_t::boolean:
-                JSONSerializer<other_boolean_t>::to_json(*this, val.template get<other_boolean_t>());
-                break;
-            case value_t::number_float:
-                JSONSerializer<other_number_float_t>::to_json(*this, val.template get<other_number_float_t>());
-                break;
-            case value_t::number_integer:
-                JSONSerializer<other_number_integer_t>::to_json(*this, val.template get<other_number_integer_t>());
-                break;
-            case value_t::number_unsigned:
-                JSONSerializer<other_number_unsigned_t>::to_json(*this, val.template get<other_number_unsigned_t>());
-                break;
-            case value_t::string:
-                JSONSerializer<other_string_t>::to_json(*this, val.template get_ref<const other_string_t&>());
-                break;
-            case value_t::object:
-                JSONSerializer<other_object_t>::to_json(*this, val.template get_ref<const other_object_t&>());
-                break;
-            case value_t::array:
-                JSONSerializer<other_array_t>::to_json(*this, val.template get_ref<const other_array_t&>());
-                break;
-            case value_t::binary:
-                JSONSerializer<other_binary_t>::to_json(*this, val.template get_ref<const other_binary_t&>());
-                break;
-            case value_t::null:
-                *this = nullptr;
-                break;
-            case value_t::discarded:
-                m_type = value_t::discarded;
-                break;
-            default:            // LCOV_EXCL_LINE
-                JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
-        }
-        set_parents();
-        assert_invariant();
-    }
-
-    /// @brief create a container (array or object) from an initializer list
-    /// @sa https://json.nlohmann.me/api/basic_json/basic_json/
-    basic_json(initializer_list_t init,
-               bool type_deduction = true,
-               value_t manual_type = value_t::array)
-    {
-        // check if each element is an array with two elements whose first
-        // element is a string
-        bool is_an_object = std::all_of(init.begin(), init.end(),
-                                        [](const detail::json_ref<basic_json>& element_ref)
-        {
-            return element_ref->is_array() && element_ref->size() == 2 && (*element_ref)[0].is_string();
-        });
-
-        // adjust type if type deduction is not wanted
-        if (!type_deduction)
-        {
-            // if array is wanted, do not create an object though possible
-            if (manual_type == value_t::array)
-            {
-                is_an_object = false;
-            }
-
-            // if object is wanted but impossible, throw an exception
-            if (JSON_HEDLEY_UNLIKELY(manual_type == value_t::object && !is_an_object))
-            {
-                JSON_THROW(type_error::create(301, "cannot create object from initializer list", basic_json()));
-            }
-        }
-
-        if (is_an_object)
-        {
-            // the initializer list is a list of pairs -> create object
-            m_type = value_t::object;
-            m_value = value_t::object;
-
-            for (auto& element_ref : init)
-            {
-                auto element = element_ref.moved_or_copied();
-                m_value.object->emplace(
-                    std::move(*((*element.m_value.array)[0].m_value.string)),
-                    std::move((*element.m_value.array)[1]));
-            }
-        }
-        else
-        {
-            // the initializer list describes an array -> create array
-            m_type = value_t::array;
-            m_value.array = create<array_t>(init.begin(), init.end());
-        }
-
-        set_parents();
-        assert_invariant();
-    }
-
-    /// @brief explicitly create a binary array (without subtype)
-    /// @sa https://json.nlohmann.me/api/basic_json/binary/
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    static basic_json binary(const typename binary_t::container_type& init)
-    {
-        auto res = basic_json();
-        res.m_type = value_t::binary;
-        res.m_value = init;
-        return res;
-    }
-
-    /// @brief explicitly create a binary array (with subtype)
-    /// @sa https://json.nlohmann.me/api/basic_json/binary/
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    static basic_json binary(const typename binary_t::container_type& init, typename binary_t::subtype_type subtype)
-    {
-        auto res = basic_json();
-        res.m_type = value_t::binary;
-        res.m_value = binary_t(init, subtype);
-        return res;
-    }
-
-    /// @brief explicitly create a binary array
-    /// @sa https://json.nlohmann.me/api/basic_json/binary/
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    static basic_json binary(typename binary_t::container_type&& init)
-    {
-        auto res = basic_json();
-        res.m_type = value_t::binary;
-        res.m_value = std::move(init);
-        return res;
-    }
-
-    /// @brief explicitly create a binary array (with subtype)
-    /// @sa https://json.nlohmann.me/api/basic_json/binary/
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    static basic_json binary(typename binary_t::container_type&& init, typename binary_t::subtype_type subtype)
-    {
-        auto res = basic_json();
-        res.m_type = value_t::binary;
-        res.m_value = binary_t(std::move(init), subtype);
-        return res;
-    }
-
-    /// @brief explicitly create an array from an initializer list
-    /// @sa https://json.nlohmann.me/api/basic_json/array/
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    static basic_json array(initializer_list_t init = {})
-    {
-        return basic_json(init, false, value_t::array);
-    }
-
-    /// @brief explicitly create an object from an initializer list
-    /// @sa https://json.nlohmann.me/api/basic_json/object/
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    static basic_json object(initializer_list_t init = {})
-    {
-        return basic_json(init, false, value_t::object);
-    }
-
-    /// @brief construct an array with count copies of given value
-    /// @sa https://json.nlohmann.me/api/basic_json/basic_json/
-    basic_json(size_type cnt, const basic_json& val)
-        : m_type(value_t::array)
-    {
-        m_value.array = create<array_t>(cnt, val);
-        set_parents();
-        assert_invariant();
-    }
-
-    /// @brief construct a JSON container given an iterator range
-    /// @sa https://json.nlohmann.me/api/basic_json/basic_json/
-    template < class InputIT, typename std::enable_if <
-                   std::is_same<InputIT, typename basic_json_t::iterator>::value ||
-                   std::is_same<InputIT, typename basic_json_t::const_iterator>::value, int >::type = 0 >
-    basic_json(InputIT first, InputIT last)
-    {
-        JSON_ASSERT(first.m_object != nullptr);
-        JSON_ASSERT(last.m_object != nullptr);
-
-        // make sure iterator fits the current value
-        if (JSON_HEDLEY_UNLIKELY(first.m_object != last.m_object))
-        {
-            JSON_THROW(invalid_iterator::create(201, "iterators are not compatible", basic_json()));
-        }
-
-        // copy type from first iterator
-        m_type = first.m_object->m_type;
-
-        // check if iterator range is complete for primitive values
-        switch (m_type)
-        {
-            case value_t::boolean:
-            case value_t::number_float:
-            case value_t::number_integer:
-            case value_t::number_unsigned:
-            case value_t::string:
-            {
-                if (JSON_HEDLEY_UNLIKELY(!first.m_it.primitive_iterator.is_begin()
-                                         || !last.m_it.primitive_iterator.is_end()))
-                {
-                    JSON_THROW(invalid_iterator::create(204, "iterators out of range", *first.m_object));
-                }
-                break;
-            }
-
-            case value_t::null:
-            case value_t::object:
-            case value_t::array:
-            case value_t::binary:
-            case value_t::discarded:
-            default:
-                break;
-        }
-
-        switch (m_type)
-        {
-            case value_t::number_integer:
-            {
-                m_value.number_integer = first.m_object->m_value.number_integer;
-                break;
-            }
-
-            case value_t::number_unsigned:
-            {
-                m_value.number_unsigned = first.m_object->m_value.number_unsigned;
-                break;
-            }
-
-            case value_t::number_float:
-            {
-                m_value.number_float = first.m_object->m_value.number_float;
-                break;
-            }
-
-            case value_t::boolean:
-            {
-                m_value.boolean = first.m_object->m_value.boolean;
-                break;
-            }
-
-            case value_t::string:
-            {
-                m_value = *first.m_object->m_value.string;
-                break;
-            }
-
-            case value_t::object:
-            {
-                m_value.object = create<object_t>(first.m_it.object_iterator,
-                                                  last.m_it.object_iterator);
-                break;
-            }
-
-            case value_t::array:
-            {
-                m_value.array = create<array_t>(first.m_it.array_iterator,
-                                                last.m_it.array_iterator);
-                break;
-            }
-
-            case value_t::binary:
-            {
-                m_value = *first.m_object->m_value.binary;
-                break;
-            }
-
-            case value_t::null:
-            case value_t::discarded:
-            default:
-                JSON_THROW(invalid_iterator::create(206, "cannot construct with iterators from " + std::string(first.m_object->type_name()), *first.m_object));
-        }
-
-        set_parents();
-        assert_invariant();
-    }
-
-
-    ///////////////////////////////////////
-    // other constructors and destructor //
-    ///////////////////////////////////////
-
-    template<typename JsonRef,
-             detail::enable_if_t<detail::conjunction<detail::is_json_ref<JsonRef>,
-                                 std::is_same<typename JsonRef::value_type, basic_json>>::value, int> = 0 >
-    basic_json(const JsonRef& ref) : basic_json(ref.moved_or_copied()) {}
-
-    /// @brief copy constructor
-    /// @sa https://json.nlohmann.me/api/basic_json/basic_json/
-    basic_json(const basic_json& other)
-        : m_type(other.m_type)
-    {
-        // check of passed value is valid
-        other.assert_invariant();
-
-        switch (m_type)
-        {
-            case value_t::object:
-            {
-                m_value = *other.m_value.object;
-                break;
-            }
-
-            case value_t::array:
-            {
-                m_value = *other.m_value.array;
-                break;
-            }
-
-            case value_t::string:
-            {
-                m_value = *other.m_value.string;
-                break;
-            }
-
-            case value_t::boolean:
-            {
-                m_value = other.m_value.boolean;
-                break;
-            }
-
-            case value_t::number_integer:
-            {
-                m_value = other.m_value.number_integer;
-                break;
-            }
-
-            case value_t::number_unsigned:
-            {
-                m_value = other.m_value.number_unsigned;
-                break;
-            }
-
-            case value_t::number_float:
-            {
-                m_value = other.m_value.number_float;
-                break;
-            }
-
-            case value_t::binary:
-            {
-                m_value = *other.m_value.binary;
-                break;
-            }
-
-            case value_t::null:
-            case value_t::discarded:
-            default:
-                break;
-        }
-
-        set_parents();
-        assert_invariant();
-    }
-
-    /// @brief move constructor
-    /// @sa https://json.nlohmann.me/api/basic_json/basic_json/
-    basic_json(basic_json&& other) noexcept
-        : m_type(std::move(other.m_type)),
-          m_value(std::move(other.m_value))
-    {
-        // check that passed value is valid
-        other.assert_invariant(false);
-
-        // invalidate payload
-        other.m_type = value_t::null;
-        other.m_value = {};
-
-        set_parents();
-        assert_invariant();
-    }
-
-    /// @brief copy assignment
-    /// @sa https://json.nlohmann.me/api/basic_json/operator=/
-    basic_json& operator=(basic_json other) noexcept (
-        std::is_nothrow_move_constructible<value_t>::value&&
-        std::is_nothrow_move_assignable<value_t>::value&&
-        std::is_nothrow_move_constructible<json_value>::value&&
-        std::is_nothrow_move_assignable<json_value>::value
-    )
-    {
-        // check that passed value is valid
-        other.assert_invariant();
-
-        using std::swap;
-        swap(m_type, other.m_type);
-        swap(m_value, other.m_value);
-
-        set_parents();
-        assert_invariant();
-        return *this;
-    }
-
-    /// @brief destructor
-    /// @sa https://json.nlohmann.me/api/basic_json/~basic_json/
-    ~basic_json() noexcept
-    {
-        assert_invariant(false);
-        m_value.destroy(m_type);
-    }
-
-    /// @}
-
-  public:
-    ///////////////////////
-    // object inspection //
-    ///////////////////////
-
-    /// @name object inspection
-    /// Functions to inspect the type of a JSON value.
-    /// @{
-
-    /// @brief serialization
-    /// @sa https://json.nlohmann.me/api/basic_json/dump/
-    string_t dump(const int indent = -1,
-                  const char indent_char = ' ',
-                  const bool ensure_ascii = false,
-                  const error_handler_t error_handler = error_handler_t::strict) const
-    {
-        string_t result;
-        serializer s(detail::output_adapter<char, string_t>(result), indent_char, error_handler);
-
-        if (indent >= 0)
-        {
-            s.dump(*this, true, ensure_ascii, static_cast<unsigned int>(indent));
-        }
-        else
-        {
-            s.dump(*this, false, ensure_ascii, 0);
-        }
-
-        return result;
-    }
-
-    /// @brief return the type of the JSON value (explicit)
-    /// @sa https://json.nlohmann.me/api/basic_json/type/
-    constexpr value_t type() const noexcept
-    {
-        return m_type;
-    }
-
-    /// @brief return whether type is primitive
-    /// @sa https://json.nlohmann.me/api/basic_json/is_primitive/
-    constexpr bool is_primitive() const noexcept
-    {
-        return is_null() || is_string() || is_boolean() || is_number() || is_binary();
-    }
-
-    /// @brief return whether type is structured
-    /// @sa https://json.nlohmann.me/api/basic_json/is_structured/
-    constexpr bool is_structured() const noexcept
-    {
-        return is_array() || is_object();
-    }
-
-    /// @brief return whether value is null
-    /// @sa https://json.nlohmann.me/api/basic_json/is_null/
-    constexpr bool is_null() const noexcept
-    {
-        return m_type == value_t::null;
-    }
-
-    /// @brief return whether value is a boolean
-    /// @sa https://json.nlohmann.me/api/basic_json/is_boolean/
-    constexpr bool is_boolean() const noexcept
-    {
-        return m_type == value_t::boolean;
-    }
-
-    /// @brief return whether value is a number
-    /// @sa https://json.nlohmann.me/api/basic_json/is_number/
-    constexpr bool is_number() const noexcept
-    {
-        return is_number_integer() || is_number_float();
-    }
-
-    /// @brief return whether value is an integer number
-    /// @sa https://json.nlohmann.me/api/basic_json/is_number_integer/
-    constexpr bool is_number_integer() const noexcept
-    {
-        return m_type == value_t::number_integer || m_type == value_t::number_unsigned;
-    }
-
-    /// @brief return whether value is an unsigned integer number
-    /// @sa https://json.nlohmann.me/api/basic_json/is_number_unsigned/
-    constexpr bool is_number_unsigned() const noexcept
-    {
-        return m_type == value_t::number_unsigned;
-    }
-
-    /// @brief return whether value is a floating-point number
-    /// @sa https://json.nlohmann.me/api/basic_json/is_number_float/
-    constexpr bool is_number_float() const noexcept
-    {
-        return m_type == value_t::number_float;
-    }
-
-    /// @brief return whether value is an object
-    /// @sa https://json.nlohmann.me/api/basic_json/is_object/
-    constexpr bool is_object() const noexcept
-    {
-        return m_type == value_t::object;
-    }
-
-    /// @brief return whether value is an array
-    /// @sa https://json.nlohmann.me/api/basic_json/is_array/
-    constexpr bool is_array() const noexcept
-    {
-        return m_type == value_t::array;
-    }
-
-    /// @brief return whether value is a string
-    /// @sa https://json.nlohmann.me/api/basic_json/is_string/
-    constexpr bool is_string() const noexcept
-    {
-        return m_type == value_t::string;
-    }
-
-    /// @brief return whether value is a binary array
-    /// @sa https://json.nlohmann.me/api/basic_json/is_binary/
-    constexpr bool is_binary() const noexcept
-    {
-        return m_type == value_t::binary;
-    }
-
-    /// @brief return whether value is discarded
-    /// @sa https://json.nlohmann.me/api/basic_json/is_discarded/
-    constexpr bool is_discarded() const noexcept
-    {
-        return m_type == value_t::discarded;
-    }
-
-    /// @brief return the type of the JSON value (implicit)
-    /// @sa https://json.nlohmann.me/api/basic_json/operator_value_t/
-    constexpr operator value_t() const noexcept
-    {
-        return m_type;
-    }
-
-    /// @}
-
-  private:
-    //////////////////
-    // value access //
-    //////////////////
-
-    /// get a boolean (explicit)
-    boolean_t get_impl(boolean_t* /*unused*/) const
-    {
-        if (JSON_HEDLEY_LIKELY(is_boolean()))
-        {
-            return m_value.boolean;
-        }
-
-        JSON_THROW(type_error::create(302, "type must be boolean, but is " + std::string(type_name()), *this));
-    }
-
-    /// get a pointer to the value (object)
-    object_t* get_impl_ptr(object_t* /*unused*/) noexcept
-    {
-        return is_object() ? m_value.object : nullptr;
-    }
-
-    /// get a pointer to the value (object)
-    constexpr const object_t* get_impl_ptr(const object_t* /*unused*/) const noexcept
-    {
-        return is_object() ? m_value.object : nullptr;
-    }
-
-    /// get a pointer to the value (array)
-    array_t* get_impl_ptr(array_t* /*unused*/) noexcept
-    {
-        return is_array() ? m_value.array : nullptr;
-    }
-
-    /// get a pointer to the value (array)
-    constexpr const array_t* get_impl_ptr(const array_t* /*unused*/) const noexcept
-    {
-        return is_array() ? m_value.array : nullptr;
-    }
-
-    /// get a pointer to the value (string)
-    string_t* get_impl_ptr(string_t* /*unused*/) noexcept
-    {
-        return is_string() ? m_value.string : nullptr;
-    }
-
-    /// get a pointer to the value (string)
-    constexpr const string_t* get_impl_ptr(const string_t* /*unused*/) const noexcept
-    {
-        return is_string() ? m_value.string : nullptr;
-    }
-
-    /// get a pointer to the value (boolean)
-    boolean_t* get_impl_ptr(boolean_t* /*unused*/) noexcept
-    {
-        return is_boolean() ? &m_value.boolean : nullptr;
-    }
-
-    /// get a pointer to the value (boolean)
-    constexpr const boolean_t* get_impl_ptr(const boolean_t* /*unused*/) const noexcept
-    {
-        return is_boolean() ? &m_value.boolean : nullptr;
-    }
-
-    /// get a pointer to the value (integer number)
-    number_integer_t* get_impl_ptr(number_integer_t* /*unused*/) noexcept
-    {
-        return is_number_integer() ? &m_value.number_integer : nullptr;
-    }
-
-    /// get a pointer to the value (integer number)
-    constexpr const number_integer_t* get_impl_ptr(const number_integer_t* /*unused*/) const noexcept
-    {
-        return is_number_integer() ? &m_value.number_integer : nullptr;
-    }
-
-    /// get a pointer to the value (unsigned number)
-    number_unsigned_t* get_impl_ptr(number_unsigned_t* /*unused*/) noexcept
-    {
-        return is_number_unsigned() ? &m_value.number_unsigned : nullptr;
-    }
-
-    /// get a pointer to the value (unsigned number)
-    constexpr const number_unsigned_t* get_impl_ptr(const number_unsigned_t* /*unused*/) const noexcept
-    {
-        return is_number_unsigned() ? &m_value.number_unsigned : nullptr;
-    }
-
-    /// get a pointer to the value (floating-point number)
-    number_float_t* get_impl_ptr(number_float_t* /*unused*/) noexcept
-    {
-        return is_number_float() ? &m_value.number_float : nullptr;
-    }
-
-    /// get a pointer to the value (floating-point number)
-    constexpr const number_float_t* get_impl_ptr(const number_float_t* /*unused*/) const noexcept
-    {
-        return is_number_float() ? &m_value.number_float : nullptr;
-    }
-
-    /// get a pointer to the value (binary)
-    binary_t* get_impl_ptr(binary_t* /*unused*/) noexcept
-    {
-        return is_binary() ? m_value.binary : nullptr;
-    }
-
-    /// get a pointer to the value (binary)
-    constexpr const binary_t* get_impl_ptr(const binary_t* /*unused*/) const noexcept
-    {
-        return is_binary() ? m_value.binary : nullptr;
-    }
-
-    /*!
-    @brief helper function to implement get_ref()
-
-    This function helps to implement get_ref() without code duplication for
-    const and non-const overloads
-
-    @tparam ThisType will be deduced as `basic_json` or `const basic_json`
-
-    @throw type_error.303 if ReferenceType does not match underlying value
-    type of the current JSON
-    */
-    template<typename ReferenceType, typename ThisType>
-    static ReferenceType get_ref_impl(ThisType& obj)
-    {
-        // delegate the call to get_ptr<>()
-        auto* ptr = obj.template get_ptr<typename std::add_pointer<ReferenceType>::type>();
-
-        if (JSON_HEDLEY_LIKELY(ptr != nullptr))
-        {
-            return *ptr;
-        }
-
-        JSON_THROW(type_error::create(303, "incompatible ReferenceType for get_ref, actual type is " + std::string(obj.type_name()), obj));
-    }
-
-  public:
-    /// @name value access
-    /// Direct access to the stored value of a JSON value.
-    /// @{
-
-    /// @brief get a pointer value (implicit)
-    /// @sa https://json.nlohmann.me/api/basic_json/get_ptr/
-    template<typename PointerType, typename std::enable_if<
-                 std::is_pointer<PointerType>::value, int>::type = 0>
-    auto get_ptr() noexcept -> decltype(std::declval<basic_json_t&>().get_impl_ptr(std::declval<PointerType>()))
-    {
-        // delegate the call to get_impl_ptr<>()
-        return get_impl_ptr(static_cast<PointerType>(nullptr));
-    }
-
-    /// @brief get a pointer value (implicit)
-    /// @sa https://json.nlohmann.me/api/basic_json/get_ptr/
-    template < typename PointerType, typename std::enable_if <
-                   std::is_pointer<PointerType>::value&&
-                   std::is_const<typename std::remove_pointer<PointerType>::type>::value, int >::type = 0 >
-    constexpr auto get_ptr() const noexcept -> decltype(std::declval<const basic_json_t&>().get_impl_ptr(std::declval<PointerType>()))
-    {
-        // delegate the call to get_impl_ptr<>() const
-        return get_impl_ptr(static_cast<PointerType>(nullptr));
-    }
-
-  private:
-    /*!
-    @brief get a value (explicit)
-
-    Explicit type conversion between the JSON value and a compatible value
-    which is [CopyConstructible](https://en.cppreference.com/w/cpp/named_req/CopyConstructible)
-    and [DefaultConstructible](https://en.cppreference.com/w/cpp/named_req/DefaultConstructible).
-    The value is converted by calling the @ref json_serializer<ValueType>
-    `from_json()` method.
-
-    The function is equivalent to executing
-    @code {.cpp}
-    ValueType ret;
-    JSONSerializer<ValueType>::from_json(*this, ret);
-    return ret;
-    @endcode
-
-    This overloads is chosen if:
-    - @a ValueType is not @ref basic_json,
-    - @ref json_serializer<ValueType> has a `from_json()` method of the form
-      `void from_json(const basic_json&, ValueType&)`, and
-    - @ref json_serializer<ValueType> does not have a `from_json()` method of
-      the form `ValueType from_json(const basic_json&)`
-
-    @tparam ValueType the returned value type
-
-    @return copy of the JSON value, converted to @a ValueType
-
-    @throw what @ref json_serializer<ValueType> `from_json()` method throws
-
-    @liveexample{The example below shows several conversions from JSON values
-    to other types. There a few things to note: (1) Floating-point numbers can
-    be converted to integers\, (2) A JSON array can be converted to a standard
-    `std::vector<short>`\, (3) A JSON object can be converted to C++
-    associative containers such as `std::unordered_map<std::string\,
-    json>`.,get__ValueType_const}
-
-    @since version 2.1.0
-    */
-    template < typename ValueType,
-               detail::enable_if_t <
-                   detail::is_default_constructible<ValueType>::value&&
-                   detail::has_from_json<basic_json_t, ValueType>::value,
-                   int > = 0 >
-    ValueType get_impl(detail::priority_tag<0> /*unused*/) const noexcept(noexcept(
-                JSONSerializer<ValueType>::from_json(std::declval<const basic_json_t&>(), std::declval<ValueType&>())))
-    {
-        auto ret = ValueType();
-        JSONSerializer<ValueType>::from_json(*this, ret);
-        return ret;
-    }
-
-    /*!
-    @brief get a value (explicit); special case
-
-    Explicit type conversion between the JSON value and a compatible value
-    which is **not** [CopyConstructible](https://en.cppreference.com/w/cpp/named_req/CopyConstructible)
-    and **not** [DefaultConstructible](https://en.cppreference.com/w/cpp/named_req/DefaultConstructible).
-    The value is converted by calling the @ref json_serializer<ValueType>
-    `from_json()` method.
-
-    The function is equivalent to executing
-    @code {.cpp}
-    return JSONSerializer<ValueType>::from_json(*this);
-    @endcode
-
-    This overloads is chosen if:
-    - @a ValueType is not @ref basic_json and
-    - @ref json_serializer<ValueType> has a `from_json()` method of the form
-      `ValueType from_json(const basic_json&)`
-
-    @note If @ref json_serializer<ValueType> has both overloads of
-    `from_json()`, this one is chosen.
-
-    @tparam ValueType the returned value type
-
-    @return copy of the JSON value, converted to @a ValueType
-
-    @throw what @ref json_serializer<ValueType> `from_json()` method throws
-
-    @since version 2.1.0
-    */
-    template < typename ValueType,
-               detail::enable_if_t <
-                   detail::has_non_default_from_json<basic_json_t, ValueType>::value,
-                   int > = 0 >
-    ValueType get_impl(detail::priority_tag<1> /*unused*/) const noexcept(noexcept(
-                JSONSerializer<ValueType>::from_json(std::declval<const basic_json_t&>())))
-    {
-        return JSONSerializer<ValueType>::from_json(*this);
-    }
-
-    /*!
-    @brief get special-case overload
-
-    This overloads converts the current @ref basic_json in a different
-    @ref basic_json type
-
-    @tparam BasicJsonType == @ref basic_json
-
-    @return a copy of *this, converted into @a BasicJsonType
-
-    @complexity Depending on the implementation of the called `from_json()`
-                method.
-
-    @since version 3.2.0
-    */
-    template < typename BasicJsonType,
-               detail::enable_if_t <
-                   detail::is_basic_json<BasicJsonType>::value,
-                   int > = 0 >
-    BasicJsonType get_impl(detail::priority_tag<2> /*unused*/) const
-    {
-        return *this;
-    }
-
-    /*!
-    @brief get special-case overload
-
-    This overloads avoids a lot of template boilerplate, it can be seen as the
-    identity method
-
-    @tparam BasicJsonType == @ref basic_json
-
-    @return a copy of *this
-
-    @complexity Constant.
-
-    @since version 2.1.0
-    */
-    template<typename BasicJsonType,
-             detail::enable_if_t<
-                 std::is_same<BasicJsonType, basic_json_t>::value,
-                 int> = 0>
-    basic_json get_impl(detail::priority_tag<3> /*unused*/) const
-    {
-        return *this;
-    }
-
-    /*!
-    @brief get a pointer value (explicit)
-    @copydoc get()
-    */
-    template<typename PointerType,
-             detail::enable_if_t<
-                 std::is_pointer<PointerType>::value,
-                 int> = 0>
-    constexpr auto get_impl(detail::priority_tag<4> /*unused*/) const noexcept
-    -> decltype(std::declval<const basic_json_t&>().template get_ptr<PointerType>())
-    {
-        // delegate the call to get_ptr
-        return get_ptr<PointerType>();
-    }
-
-  public:
-    /*!
-    @brief get a (pointer) value (explicit)
-
-    Performs explicit type conversion between the JSON value and a compatible value if required.
-
-    - If the requested type is a pointer to the internally stored JSON value that pointer is returned.
-    No copies are made.
-
-    - If the requested type is the current @ref basic_json, or a different @ref basic_json convertible
-    from the current @ref basic_json.
-
-    - Otherwise the value is converted by calling the @ref json_serializer<ValueType> `from_json()`
-    method.
-
-    @tparam ValueTypeCV the provided value type
-    @tparam ValueType the returned value type
-
-    @return copy of the JSON value, converted to @tparam ValueType if necessary
-
-    @throw what @ref json_serializer<ValueType> `from_json()` method throws if conversion is required
-
-    @since version 2.1.0
-    */
-    template < typename ValueTypeCV, typename ValueType = detail::uncvref_t<ValueTypeCV>>
-#if defined(JSON_HAS_CPP_14)
-    constexpr
-#endif
-    auto get() const noexcept(
-    noexcept(std::declval<const basic_json_t&>().template get_impl<ValueType>(detail::priority_tag<4> {})))
-    -> decltype(std::declval<const basic_json_t&>().template get_impl<ValueType>(detail::priority_tag<4> {}))
-    {
-        // we cannot static_assert on ValueTypeCV being non-const, because
-        // there is support for get<const basic_json_t>(), which is why we
-        // still need the uncvref
-        static_assert(!std::is_reference<ValueTypeCV>::value,
-                      "get() cannot be used with reference types, you might want to use get_ref()");
-        return get_impl<ValueType>(detail::priority_tag<4> {});
-    }
-
-    /*!
-    @brief get a pointer value (explicit)
-
-    Explicit pointer access to the internally stored JSON value. No copies are
-    made.
-
-    @warning The pointer becomes invalid if the underlying JSON object
-    changes.
-
-    @tparam PointerType pointer type; must be a pointer to @ref array_t, @ref
-    object_t, @ref string_t, @ref boolean_t, @ref number_integer_t,
-    @ref number_unsigned_t, or @ref number_float_t.
-
-    @return pointer to the internally stored JSON value if the requested
-    pointer type @a PointerType fits to the JSON value; `nullptr` otherwise
-
-    @complexity Constant.
-
-    @liveexample{The example below shows how pointers to internal values of a
-    JSON value can be requested. Note that no type conversions are made and a
-    `nullptr` is returned if the value and the requested pointer type does not
-    match.,get__PointerType}
-
-    @sa see @ref get_ptr() for explicit pointer-member access
-
-    @since version 1.0.0
-    */
-    template<typename PointerType, typename std::enable_if<
-                 std::is_pointer<PointerType>::value, int>::type = 0>
-    auto get() noexcept -> decltype(std::declval<basic_json_t&>().template get_ptr<PointerType>())
-    {
-        // delegate the call to get_ptr
-        return get_ptr<PointerType>();
-    }
-
-    /// @brief get a value (explicit)
-    /// @sa https://json.nlohmann.me/api/basic_json/get_to/
-    template < typename ValueType,
-               detail::enable_if_t <
-                   !detail::is_basic_json<ValueType>::value&&
-                   detail::has_from_json<basic_json_t, ValueType>::value,
-                   int > = 0 >
-    ValueType & get_to(ValueType& v) const noexcept(noexcept(
-                JSONSerializer<ValueType>::from_json(std::declval<const basic_json_t&>(), v)))
-    {
-        JSONSerializer<ValueType>::from_json(*this, v);
-        return v;
-    }
-
-    // specialization to allow calling get_to with a basic_json value
-    // see https://github.com/nlohmann/json/issues/2175
-    template<typename ValueType,
-             detail::enable_if_t <
-                 detail::is_basic_json<ValueType>::value,
-                 int> = 0>
-    ValueType & get_to(ValueType& v) const
-    {
-        v = *this;
-        return v;
-    }
-
-    template <
-        typename T, std::size_t N,
-        typename Array = T (&)[N], // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
-        detail::enable_if_t <
-            detail::has_from_json<basic_json_t, Array>::value, int > = 0 >
-    Array get_to(T (&v)[N]) const // NOLINT(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
-    noexcept(noexcept(JSONSerializer<Array>::from_json(
-                          std::declval<const basic_json_t&>(), v)))
-    {
-        JSONSerializer<Array>::from_json(*this, v);
-        return v;
-    }
-
-    /// @brief get a reference value (implicit)
-    /// @sa https://json.nlohmann.me/api/basic_json/get_ref/
-    template<typename ReferenceType, typename std::enable_if<
-                 std::is_reference<ReferenceType>::value, int>::type = 0>
-    ReferenceType get_ref()
-    {
-        // delegate call to get_ref_impl
-        return get_ref_impl<ReferenceType>(*this);
-    }
-
-    /// @brief get a reference value (implicit)
-    /// @sa https://json.nlohmann.me/api/basic_json/get_ref/
-    template < typename ReferenceType, typename std::enable_if <
-                   std::is_reference<ReferenceType>::value&&
-                   std::is_const<typename std::remove_reference<ReferenceType>::type>::value, int >::type = 0 >
-    ReferenceType get_ref() const
-    {
-        // delegate call to get_ref_impl
-        return get_ref_impl<ReferenceType>(*this);
-    }
-
-    /*!
-    @brief get a value (implicit)
-
-    Implicit type conversion between the JSON value and a compatible value.
-    The call is realized by calling @ref get() const.
-
-    @tparam ValueType non-pointer type compatible to the JSON value, for
-    instance `int` for JSON integer numbers, `bool` for JSON booleans, or
-    `std::vector` types for JSON arrays. The character type of @ref string_t
-    as well as an initializer list of this type is excluded to avoid
-    ambiguities as these types implicitly convert to `std::string`.
-
-    @return copy of the JSON value, converted to type @a ValueType
-
-    @throw type_error.302 in case passed type @a ValueType is incompatible
-    to the JSON value type (e.g., the JSON value is of type boolean, but a
-    string is requested); see example below
-
-    @complexity Linear in the size of the JSON value.
-
-    @liveexample{The example below shows several conversions from JSON values
-    to other types. There a few things to note: (1) Floating-point numbers can
-    be converted to integers\, (2) A JSON array can be converted to a standard
-    `std::vector<short>`\, (3) A JSON object can be converted to C++
-    associative containers such as `std::unordered_map<std::string\,
-    json>`.,operator__ValueType}
-
-    @since version 1.0.0
-    */
-    template < typename ValueType, typename std::enable_if <
-                   detail::conjunction <
-                       detail::negation<std::is_pointer<ValueType>>,
-                       detail::negation<std::is_same<ValueType, detail::json_ref<basic_json>>>,
-                                        detail::negation<std::is_same<ValueType, typename string_t::value_type>>,
-                                        detail::negation<detail::is_basic_json<ValueType>>,
-                                        detail::negation<std::is_same<ValueType, std::initializer_list<typename string_t::value_type>>>,
-
-#if defined(JSON_HAS_CPP_17) && (defined(__GNUC__) || (defined(_MSC_VER) && _MSC_VER >= 1910 && _MSC_VER <= 1914))
-                                                detail::negation<std::is_same<ValueType, std::string_view>>,
-#endif
-                                                detail::is_detected_lazy<detail::get_template_function, const basic_json_t&, ValueType>
-                                                >::value, int >::type = 0 >
-                                        JSON_EXPLICIT operator ValueType() const
-    {
-        // delegate the call to get<>() const
-        return get<ValueType>();
-    }
-
-    /// @brief get a binary value
-    /// @sa https://json.nlohmann.me/api/basic_json/get_binary/
-    binary_t& get_binary()
-    {
-        if (!is_binary())
-        {
-            JSON_THROW(type_error::create(302, "type must be binary, but is " + std::string(type_name()), *this));
-        }
-
-        return *get_ptr<binary_t*>();
-    }
-
-    /// @brief get a binary value
-    /// @sa https://json.nlohmann.me/api/basic_json/get_binary/
-    const binary_t& get_binary() const
-    {
-        if (!is_binary())
-        {
-            JSON_THROW(type_error::create(302, "type must be binary, but is " + std::string(type_name()), *this));
-        }
-
-        return *get_ptr<const binary_t*>();
-    }
-
-    /// @}
-
-
-    ////////////////////
-    // element access //
-    ////////////////////
-
-    /// @name element access
-    /// Access to the JSON value.
-    /// @{
-
-    /// @brief access specified array element with bounds checking
-    /// @sa https://json.nlohmann.me/api/basic_json/at/
-    reference at(size_type idx)
-    {
-        // at only works for arrays
-        if (JSON_HEDLEY_LIKELY(is_array()))
-        {
-            JSON_TRY
-            {
-                return set_parent(m_value.array->at(idx));
-            }
-            JSON_CATCH (std::out_of_range&)
-            {
-                // create better exception explanation
-                JSON_THROW(out_of_range::create(401, "array index " + std::to_string(idx) + " is out of range", *this));
-            }
-        }
-        else
-        {
-            JSON_THROW(type_error::create(304, "cannot use at() with " + std::string(type_name()), *this));
-        }
-    }
-
-    /// @brief access specified array element with bounds checking
-    /// @sa https://json.nlohmann.me/api/basic_json/at/
-    const_reference at(size_type idx) const
-    {
-        // at only works for arrays
-        if (JSON_HEDLEY_LIKELY(is_array()))
-        {
-            JSON_TRY
-            {
-                return m_value.array->at(idx);
-            }
-            JSON_CATCH (std::out_of_range&)
-            {
-                // create better exception explanation
-                JSON_THROW(out_of_range::create(401, "array index " + std::to_string(idx) + " is out of range", *this));
-            }
-        }
-        else
-        {
-            JSON_THROW(type_error::create(304, "cannot use at() with " + std::string(type_name()), *this));
-        }
-    }
-
-    /// @brief access specified object element with bounds checking
-    /// @sa https://json.nlohmann.me/api/basic_json/at/
-    reference at(const typename object_t::key_type& key)
-    {
-        // at only works for objects
-        if (JSON_HEDLEY_LIKELY(is_object()))
-        {
-            JSON_TRY
-            {
-                return set_parent(m_value.object->at(key));
-            }
-            JSON_CATCH (std::out_of_range&)
-            {
-                // create better exception explanation
-                JSON_THROW(out_of_range::create(403, "key '" + key + "' not found", *this));
-            }
-        }
-        else
-        {
-            JSON_THROW(type_error::create(304, "cannot use at() with " + std::string(type_name()), *this));
-        }
-    }
-
-    /// @brief access specified object element with bounds checking
-    /// @sa https://json.nlohmann.me/api/basic_json/at/
-    const_reference at(const typename object_t::key_type& key) const
-    {
-        // at only works for objects
-        if (JSON_HEDLEY_LIKELY(is_object()))
-        {
-            JSON_TRY
-            {
-                return m_value.object->at(key);
-            }
-            JSON_CATCH (std::out_of_range&)
-            {
-                // create better exception explanation
-                JSON_THROW(out_of_range::create(403, "key '" + key + "' not found", *this));
-            }
-        }
-        else
-        {
-            JSON_THROW(type_error::create(304, "cannot use at() with " + std::string(type_name()), *this));
-        }
-    }
-
-    /// @brief access specified array element
-    /// @sa https://json.nlohmann.me/api/basic_json/operator%5B%5D/
-    reference operator[](size_type idx)
-    {
-        // implicitly convert null value to an empty array
-        if (is_null())
-        {
-            m_type = value_t::array;
-            m_value.array = create<array_t>();
-            assert_invariant();
-        }
-
-        // operator[] only works for arrays
-        if (JSON_HEDLEY_LIKELY(is_array()))
-        {
-            // fill up array with null values if given idx is outside range
-            if (idx >= m_value.array->size())
-            {
-#if JSON_DIAGNOSTICS
-                // remember array size & capacity before resizing
-                const auto old_size = m_value.array->size();
-                const auto old_capacity = m_value.array->capacity();
-#endif
-                m_value.array->resize(idx + 1);
-
-#if JSON_DIAGNOSTICS
-                if (JSON_HEDLEY_UNLIKELY(m_value.array->capacity() != old_capacity))
-                {
-                    // capacity has changed: update all parents
-                    set_parents();
-                }
-                else
-                {
-                    // set parent for values added above
-                    set_parents(begin() + static_cast<typename iterator::difference_type>(old_size), static_cast<typename iterator::difference_type>(idx + 1 - old_size));
-                }
-#endif
-                assert_invariant();
-            }
-
-            return m_value.array->operator[](idx);
-        }
-
-        JSON_THROW(type_error::create(305, "cannot use operator[] with a numeric argument with " + std::string(type_name()), *this));
-    }
-
-    /// @brief access specified array element
-    /// @sa https://json.nlohmann.me/api/basic_json/operator%5B%5D/
-    const_reference operator[](size_type idx) const
-    {
-        // const operator[] only works for arrays
-        if (JSON_HEDLEY_LIKELY(is_array()))
-        {
-            return m_value.array->operator[](idx);
-        }
-
-        JSON_THROW(type_error::create(305, "cannot use operator[] with a numeric argument with " + std::string(type_name()), *this));
-    }
-
-    /// @brief access specified object element
-    /// @sa https://json.nlohmann.me/api/basic_json/operator%5B%5D/
-    reference operator[](const typename object_t::key_type& key)
-    {
-        // implicitly convert null value to an empty object
-        if (is_null())
-        {
-            m_type = value_t::object;
-            m_value.object = create<object_t>();
-            assert_invariant();
-        }
-
-        // operator[] only works for objects
-        if (JSON_HEDLEY_LIKELY(is_object()))
-        {
-            return set_parent(m_value.object->operator[](key));
-        }
-
-        JSON_THROW(type_error::create(305, "cannot use operator[] with a string argument with " + std::string(type_name()), *this));
-    }
-
-    /// @brief access specified object element
-    /// @sa https://json.nlohmann.me/api/basic_json/operator%5B%5D/
-    const_reference operator[](const typename object_t::key_type& key) const
-    {
-        // const operator[] only works for objects
-        if (JSON_HEDLEY_LIKELY(is_object()))
-        {
-            JSON_ASSERT(m_value.object->find(key) != m_value.object->end());
-            return m_value.object->find(key)->second;
-        }
-
-        JSON_THROW(type_error::create(305, "cannot use operator[] with a string argument with " + std::string(type_name()), *this));
-    }
-
-    /// @brief access specified object element
-    /// @sa https://json.nlohmann.me/api/basic_json/operator%5B%5D/
-    template<typename T>
-    JSON_HEDLEY_NON_NULL(2)
-    reference operator[](T* key)
-    {
-        // implicitly convert null to object
-        if (is_null())
-        {
-            m_type = value_t::object;
-            m_value = value_t::object;
-            assert_invariant();
-        }
-
-        // at only works for objects
-        if (JSON_HEDLEY_LIKELY(is_object()))
-        {
-            return set_parent(m_value.object->operator[](key));
-        }
-
-        JSON_THROW(type_error::create(305, "cannot use operator[] with a string argument with " + std::string(type_name()), *this));
-    }
-
-    /// @brief access specified object element
-    /// @sa https://json.nlohmann.me/api/basic_json/operator%5B%5D/
-    template<typename T>
-    JSON_HEDLEY_NON_NULL(2)
-    const_reference operator[](T* key) const
-    {
-        // at only works for objects
-        if (JSON_HEDLEY_LIKELY(is_object()))
-        {
-            JSON_ASSERT(m_value.object->find(key) != m_value.object->end());
-            return m_value.object->find(key)->second;
-        }
-
-        JSON_THROW(type_error::create(305, "cannot use operator[] with a string argument with " + std::string(type_name()), *this));
-    }
-
-    /// @brief access specified object element with default value
-    /// @sa https://json.nlohmann.me/api/basic_json/value/
-    /// using std::is_convertible in a std::enable_if will fail when using explicit conversions
-    template < class ValueType, typename std::enable_if <
-                   detail::is_getable<basic_json_t, ValueType>::value
-                   && !std::is_same<value_t, ValueType>::value, int >::type = 0 >
-    ValueType value(const typename object_t::key_type& key, const ValueType& default_value) const
-    {
-        // at only works for objects
-        if (JSON_HEDLEY_LIKELY(is_object()))
-        {
-            // if key is found, return value and given default value otherwise
-            const auto it = find(key);
-            if (it != end())
-            {
-                return it->template get<ValueType>();
-            }
-
-            return default_value;
-        }
-
-        JSON_THROW(type_error::create(306, "cannot use value() with " + std::string(type_name()), *this));
-    }
-
-    /// @brief access specified object element with default value
-    /// @sa https://json.nlohmann.me/api/basic_json/value/
-    /// overload for a default value of type const char*
-    string_t value(const typename object_t::key_type& key, const char* default_value) const
-    {
-        return value(key, string_t(default_value));
-    }
-
-    /// @brief access specified object element via JSON Pointer with default value
-    /// @sa https://json.nlohmann.me/api/basic_json/value/
-    template<class ValueType, typename std::enable_if<
-                 detail::is_getable<basic_json_t, ValueType>::value, int>::type = 0>
-    ValueType value(const json_pointer& ptr, const ValueType& default_value) const
-    {
-        // at only works for objects
-        if (JSON_HEDLEY_LIKELY(is_object()))
-        {
-            // if pointer resolves a value, return it or use default value
-            JSON_TRY
-            {
-                return ptr.get_checked(this).template get<ValueType>();
-            }
-            JSON_INTERNAL_CATCH (out_of_range&)
-            {
-                return default_value;
-            }
-        }
-
-        JSON_THROW(type_error::create(306, "cannot use value() with " + std::string(type_name()), *this));
-    }
-
-    /// @brief access specified object element via JSON Pointer with default value
-    /// @sa https://json.nlohmann.me/api/basic_json/value/
-    /// overload for a default value of type const char*
-    JSON_HEDLEY_NON_NULL(3)
-    string_t value(const json_pointer& ptr, const char* default_value) const
-    {
-        return value(ptr, string_t(default_value));
-    }
-
-    /// @brief access the first element
-    /// @sa https://json.nlohmann.me/api/basic_json/front/
-    reference front()
-    {
-        return *begin();
-    }
-
-    /// @brief access the first element
-    /// @sa https://json.nlohmann.me/api/basic_json/front/
-    const_reference front() const
-    {
-        return *cbegin();
-    }
-
-    /// @brief access the last element
-    /// @sa https://json.nlohmann.me/api/basic_json/back/
-    reference back()
-    {
-        auto tmp = end();
-        --tmp;
-        return *tmp;
-    }
-
-    /// @brief access the last element
-    /// @sa https://json.nlohmann.me/api/basic_json/back/
-    const_reference back() const
-    {
-        auto tmp = cend();
-        --tmp;
-        return *tmp;
-    }
-
-    /// @brief remove element given an iterator
-    /// @sa https://json.nlohmann.me/api/basic_json/erase/
-    template < class IteratorType, typename std::enable_if <
-                   std::is_same<IteratorType, typename basic_json_t::iterator>::value ||
-                   std::is_same<IteratorType, typename basic_json_t::const_iterator>::value, int >::type
-               = 0 >
-    IteratorType erase(IteratorType pos)
-    {
-        // make sure iterator fits the current value
-        if (JSON_HEDLEY_UNLIKELY(this != pos.m_object))
-        {
-            JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value", *this));
-        }
-
-        IteratorType result = end();
-
-        switch (m_type)
-        {
-            case value_t::boolean:
-            case value_t::number_float:
-            case value_t::number_integer:
-            case value_t::number_unsigned:
-            case value_t::string:
-            case value_t::binary:
-            {
-                if (JSON_HEDLEY_UNLIKELY(!pos.m_it.primitive_iterator.is_begin()))
-                {
-                    JSON_THROW(invalid_iterator::create(205, "iterator out of range", *this));
-                }
-
-                if (is_string())
-                {
-                    AllocatorType<string_t> alloc;
-                    std::allocator_traits<decltype(alloc)>::destroy(alloc, m_value.string);
-                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, m_value.string, 1);
-                    m_value.string = nullptr;
-                }
-                else if (is_binary())
-                {
-                    AllocatorType<binary_t> alloc;
-                    std::allocator_traits<decltype(alloc)>::destroy(alloc, m_value.binary);
-                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, m_value.binary, 1);
-                    m_value.binary = nullptr;
-                }
-
-                m_type = value_t::null;
-                assert_invariant();
-                break;
-            }
-
-            case value_t::object:
-            {
-                result.m_it.object_iterator = m_value.object->erase(pos.m_it.object_iterator);
-                break;
-            }
-
-            case value_t::array:
-            {
-                result.m_it.array_iterator = m_value.array->erase(pos.m_it.array_iterator);
-                break;
-            }
-
-            case value_t::null:
-            case value_t::discarded:
-            default:
-                JSON_THROW(type_error::create(307, "cannot use erase() with " + std::string(type_name()), *this));
-        }
-
-        return result;
-    }
-
-    /// @brief remove elements given an iterator range
-    /// @sa https://json.nlohmann.me/api/basic_json/erase/
-    template < class IteratorType, typename std::enable_if <
-                   std::is_same<IteratorType, typename basic_json_t::iterator>::value ||
-                   std::is_same<IteratorType, typename basic_json_t::const_iterator>::value, int >::type
-               = 0 >
-    IteratorType erase(IteratorType first, IteratorType last)
-    {
-        // make sure iterator fits the current value
-        if (JSON_HEDLEY_UNLIKELY(this != first.m_object || this != last.m_object))
-        {
-            JSON_THROW(invalid_iterator::create(203, "iterators do not fit current value", *this));
-        }
-
-        IteratorType result = end();
-
-        switch (m_type)
-        {
-            case value_t::boolean:
-            case value_t::number_float:
-            case value_t::number_integer:
-            case value_t::number_unsigned:
-            case value_t::string:
-            case value_t::binary:
-            {
-                if (JSON_HEDLEY_LIKELY(!first.m_it.primitive_iterator.is_begin()
-                                       || !last.m_it.primitive_iterator.is_end()))
-                {
-                    JSON_THROW(invalid_iterator::create(204, "iterators out of range", *this));
-                }
-
-                if (is_string())
-                {
-                    AllocatorType<string_t> alloc;
-                    std::allocator_traits<decltype(alloc)>::destroy(alloc, m_value.string);
-                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, m_value.string, 1);
-                    m_value.string = nullptr;
-                }
-                else if (is_binary())
-                {
-                    AllocatorType<binary_t> alloc;
-                    std::allocator_traits<decltype(alloc)>::destroy(alloc, m_value.binary);
-                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, m_value.binary, 1);
-                    m_value.binary = nullptr;
-                }
-
-                m_type = value_t::null;
-                assert_invariant();
-                break;
-            }
-
-            case value_t::object:
-            {
-                result.m_it.object_iterator = m_value.object->erase(first.m_it.object_iterator,
-                                              last.m_it.object_iterator);
-                break;
-            }
-
-            case value_t::array:
-            {
-                result.m_it.array_iterator = m_value.array->erase(first.m_it.array_iterator,
-                                             last.m_it.array_iterator);
-                break;
-            }
-
-            case value_t::null:
-            case value_t::discarded:
-            default:
-                JSON_THROW(type_error::create(307, "cannot use erase() with " + std::string(type_name()), *this));
-        }
-
-        return result;
-    }
-
-    /// @brief remove element from a JSON object given a key
-    /// @sa https://json.nlohmann.me/api/basic_json/erase/
-    size_type erase(const typename object_t::key_type& key)
-    {
-        // this erase only works for objects
-        if (JSON_HEDLEY_LIKELY(is_object()))
-        {
-            return m_value.object->erase(key);
-        }
-
-        JSON_THROW(type_error::create(307, "cannot use erase() with " + std::string(type_name()), *this));
-    }
-
-    /// @brief remove element from a JSON array given an index
-    /// @sa https://json.nlohmann.me/api/basic_json/erase/
-    void erase(const size_type idx)
-    {
-        // this erase only works for arrays
-        if (JSON_HEDLEY_LIKELY(is_array()))
-        {
-            if (JSON_HEDLEY_UNLIKELY(idx >= size()))
-            {
-                JSON_THROW(out_of_range::create(401, "array index " + std::to_string(idx) + " is out of range", *this));
-            }
-
-            m_value.array->erase(m_value.array->begin() + static_cast<difference_type>(idx));
-        }
-        else
-        {
-            JSON_THROW(type_error::create(307, "cannot use erase() with " + std::string(type_name()), *this));
-        }
-    }
-
-    /// @}
-
-
-    ////////////
-    // lookup //
-    ////////////
-
-    /// @name lookup
-    /// @{
-
-    /// @brief find an element in a JSON object
-    /// @sa https://json.nlohmann.me/api/basic_json/find/
-    template<typename KeyT>
-    iterator find(KeyT&& key)
-    {
-        auto result = end();
-
-        if (is_object())
-        {
-            result.m_it.object_iterator = m_value.object->find(std::forward<KeyT>(key));
-        }
-
-        return result;
-    }
-
-    /// @brief find an element in a JSON object
-    /// @sa https://json.nlohmann.me/api/basic_json/find/
-    template<typename KeyT>
-    const_iterator find(KeyT&& key) const
-    {
-        auto result = cend();
-
-        if (is_object())
-        {
-            result.m_it.object_iterator = m_value.object->find(std::forward<KeyT>(key));
-        }
-
-        return result;
-    }
-
-    /// @brief returns the number of occurrences of a key in a JSON object
-    /// @sa https://json.nlohmann.me/api/basic_json/count/
-    template<typename KeyT>
-    size_type count(KeyT&& key) const
-    {
-        // return 0 for all nonobject types
-        return is_object() ? m_value.object->count(std::forward<KeyT>(key)) : 0;
-    }
-
-    /// @brief check the existence of an element in a JSON object
-    /// @sa https://json.nlohmann.me/api/basic_json/contains/
-    template < typename KeyT, typename std::enable_if <
-                   !std::is_same<typename std::decay<KeyT>::type, json_pointer>::value, int >::type = 0 >
-    bool contains(KeyT && key) const
-    {
-        return is_object() && m_value.object->find(std::forward<KeyT>(key)) != m_value.object->end();
-    }
-
-    /// @brief check the existence of an element in a JSON object given a JSON pointer
-    /// @sa https://json.nlohmann.me/api/basic_json/contains/
-    bool contains(const json_pointer& ptr) const
-    {
-        return ptr.contains(this);
-    }
-
-    /// @}
-
-
-    ///////////////
-    // iterators //
-    ///////////////
-
-    /// @name iterators
-    /// @{
-
-    /// @brief returns an iterator to the first element
-    /// @sa https://json.nlohmann.me/api/basic_json/begin/
-    iterator begin() noexcept
-    {
-        iterator result(this);
-        result.set_begin();
-        return result;
-    }
-
-    /// @brief returns an iterator to the first element
-    /// @sa https://json.nlohmann.me/api/basic_json/begin/
-    const_iterator begin() const noexcept
-    {
-        return cbegin();
-    }
-
-    /// @brief returns a const iterator to the first element
-    /// @sa https://json.nlohmann.me/api/basic_json/cbegin/
-    const_iterator cbegin() const noexcept
-    {
-        const_iterator result(this);
-        result.set_begin();
-        return result;
-    }
-
-    /// @brief returns an iterator to one past the last element
-    /// @sa https://json.nlohmann.me/api/basic_json/end/
-    iterator end() noexcept
-    {
-        iterator result(this);
-        result.set_end();
-        return result;
-    }
-
-    /// @brief returns an iterator to one past the last element
-    /// @sa https://json.nlohmann.me/api/basic_json/end/
-    const_iterator end() const noexcept
-    {
-        return cend();
-    }
-
-    /// @brief returns an iterator to one past the last element
-    /// @sa https://json.nlohmann.me/api/basic_json/cend/
-    const_iterator cend() const noexcept
-    {
-        const_iterator result(this);
-        result.set_end();
-        return result;
-    }
-
-    /// @brief returns an iterator to the reverse-beginning
-    /// @sa https://json.nlohmann.me/api/basic_json/rbegin/
-    reverse_iterator rbegin() noexcept
-    {
-        return reverse_iterator(end());
-    }
-
-    /// @brief returns an iterator to the reverse-beginning
-    /// @sa https://json.nlohmann.me/api/basic_json/rbegin/
-    const_reverse_iterator rbegin() const noexcept
-    {
-        return crbegin();
-    }
-
-    /// @brief returns an iterator to the reverse-end
-    /// @sa https://json.nlohmann.me/api/basic_json/rend/
-    reverse_iterator rend() noexcept
-    {
-        return reverse_iterator(begin());
-    }
-
-    /// @brief returns an iterator to the reverse-end
-    /// @sa https://json.nlohmann.me/api/basic_json/rend/
-    const_reverse_iterator rend() const noexcept
-    {
-        return crend();
-    }
-
-    /// @brief returns a const reverse iterator to the last element
-    /// @sa https://json.nlohmann.me/api/basic_json/crbegin/
-    const_reverse_iterator crbegin() const noexcept
-    {
-        return const_reverse_iterator(cend());
-    }
-
-    /// @brief returns a const reverse iterator to one before the first
-    /// @sa https://json.nlohmann.me/api/basic_json/crend/
-    const_reverse_iterator crend() const noexcept
-    {
-        return const_reverse_iterator(cbegin());
-    }
-
-  public:
-    /// @brief wrapper to access iterator member functions in range-based for
-    /// @sa https://json.nlohmann.me/api/basic_json/items/
-    /// @deprecated This function is deprecated since 3.1.0 and will be removed in
-    ///             version 4.0.0 of the library. Please use @ref items() instead;
-    ///             that is, replace `json::iterator_wrapper(j)` with `j.items()`.
-    JSON_HEDLEY_DEPRECATED_FOR(3.1.0, items())
-    static iteration_proxy<iterator> iterator_wrapper(reference ref) noexcept
-    {
-        return ref.items();
-    }
-
-    /// @brief wrapper to access iterator member functions in range-based for
-    /// @sa https://json.nlohmann.me/api/basic_json/items/
-    /// @deprecated This function is deprecated since 3.1.0 and will be removed in
-    ///         version 4.0.0 of the library. Please use @ref items() instead;
-    ///         that is, replace `json::iterator_wrapper(j)` with `j.items()`.
-    JSON_HEDLEY_DEPRECATED_FOR(3.1.0, items())
-    static iteration_proxy<const_iterator> iterator_wrapper(const_reference ref) noexcept
-    {
-        return ref.items();
-    }
-
-    /// @brief helper to access iterator member functions in range-based for
-    /// @sa https://json.nlohmann.me/api/basic_json/items/
-    iteration_proxy<iterator> items() noexcept
-    {
-        return iteration_proxy<iterator>(*this);
-    }
-
-    /// @brief helper to access iterator member functions in range-based for
-    /// @sa https://json.nlohmann.me/api/basic_json/items/
-    iteration_proxy<const_iterator> items() const noexcept
-    {
-        return iteration_proxy<const_iterator>(*this);
-    }
-
-    /// @}
-
-
-    //////////////
-    // capacity //
-    //////////////
-
-    /// @name capacity
-    /// @{
-
-    /// @brief checks whether the container is empty.
-    /// @sa https://json.nlohmann.me/api/basic_json/empty/
-    bool empty() const noexcept
-    {
-        switch (m_type)
-        {
-            case value_t::null:
-            {
-                // null values are empty
-                return true;
-            }
-
-            case value_t::array:
-            {
-                // delegate call to array_t::empty()
-                return m_value.array->empty();
-            }
-
-            case value_t::object:
-            {
-                // delegate call to object_t::empty()
-                return m_value.object->empty();
-            }
-
-            case value_t::string:
-            case value_t::boolean:
-            case value_t::number_integer:
-            case value_t::number_unsigned:
-            case value_t::number_float:
-            case value_t::binary:
-            case value_t::discarded:
-            default:
-            {
-                // all other types are nonempty
-                return false;
-            }
-        }
-    }
-
-    /// @brief returns the number of elements
-    /// @sa https://json.nlohmann.me/api/basic_json/size/
-    size_type size() const noexcept
-    {
-        switch (m_type)
-        {
-            case value_t::null:
-            {
-                // null values are empty
-                return 0;
-            }
-
-            case value_t::array:
-            {
-                // delegate call to array_t::size()
-                return m_value.array->size();
-            }
-
-            case value_t::object:
-            {
-                // delegate call to object_t::size()
-                return m_value.object->size();
-            }
-
-            case value_t::string:
-            case value_t::boolean:
-            case value_t::number_integer:
-            case value_t::number_unsigned:
-            case value_t::number_float:
-            case value_t::binary:
-            case value_t::discarded:
-            default:
-            {
-                // all other types have size 1
-                return 1;
-            }
-        }
-    }
-
-    /// @brief returns the maximum possible number of elements
-    /// @sa https://json.nlohmann.me/api/basic_json/max_size/
-    size_type max_size() const noexcept
-    {
-        switch (m_type)
-        {
-            case value_t::array:
-            {
-                // delegate call to array_t::max_size()
-                return m_value.array->max_size();
-            }
-
-            case value_t::object:
-            {
-                // delegate call to object_t::max_size()
-                return m_value.object->max_size();
-            }
-
-            case value_t::null:
-            case value_t::string:
-            case value_t::boolean:
-            case value_t::number_integer:
-            case value_t::number_unsigned:
-            case value_t::number_float:
-            case value_t::binary:
-            case value_t::discarded:
-            default:
-            {
-                // all other types have max_size() == size()
-                return size();
-            }
-        }
-    }
-
-    /// @}
-
-
-    ///////////////
-    // modifiers //
-    ///////////////
-
-    /// @name modifiers
-    /// @{
-
-    /// @brief clears the contents
-    /// @sa https://json.nlohmann.me/api/basic_json/clear/
-    void clear() noexcept
-    {
-        switch (m_type)
-        {
-            case value_t::number_integer:
-            {
-                m_value.number_integer = 0;
-                break;
-            }
-
-            case value_t::number_unsigned:
-            {
-                m_value.number_unsigned = 0;
-                break;
-            }
-
-            case value_t::number_float:
-            {
-                m_value.number_float = 0.0;
-                break;
-            }
-
-            case value_t::boolean:
-            {
-                m_value.boolean = false;
-                break;
-            }
-
-            case value_t::string:
-            {
-                m_value.string->clear();
-                break;
-            }
-
-            case value_t::binary:
-            {
-                m_value.binary->clear();
-                break;
-            }
-
-            case value_t::array:
-            {
-                m_value.array->clear();
-                break;
-            }
-
-            case value_t::object:
-            {
-                m_value.object->clear();
-                break;
-            }
-
-            case value_t::null:
-            case value_t::discarded:
-            default:
-                break;
-        }
-    }
-
-    /// @brief add an object to an array
-    /// @sa https://json.nlohmann.me/api/basic_json/push_back/
-    void push_back(basic_json&& val)
-    {
-        // push_back only works for null objects or arrays
-        if (JSON_HEDLEY_UNLIKELY(!(is_null() || is_array())))
-        {
-            JSON_THROW(type_error::create(308, "cannot use push_back() with " + std::string(type_name()), *this));
-        }
-
-        // transform null object into an array
-        if (is_null())
-        {
-            m_type = value_t::array;
-            m_value = value_t::array;
-            assert_invariant();
-        }
-
-        // add element to array (move semantics)
-        const auto old_capacity = m_value.array->capacity();
-        m_value.array->push_back(std::move(val));
-        set_parent(m_value.array->back(), old_capacity);
-        // if val is moved from, basic_json move constructor marks it null, so we do not call the destructor
-    }
-
-    /// @brief add an object to an array
-    /// @sa https://json.nlohmann.me/api/basic_json/operator+=/
-    reference operator+=(basic_json&& val)
-    {
-        push_back(std::move(val));
-        return *this;
-    }
-
-    /// @brief add an object to an array
-    /// @sa https://json.nlohmann.me/api/basic_json/push_back/
-    void push_back(const basic_json& val)
-    {
-        // push_back only works for null objects or arrays
-        if (JSON_HEDLEY_UNLIKELY(!(is_null() || is_array())))
-        {
-            JSON_THROW(type_error::create(308, "cannot use push_back() with " + std::string(type_name()), *this));
-        }
-
-        // transform null object into an array
-        if (is_null())
-        {
-            m_type = value_t::array;
-            m_value = value_t::array;
-            assert_invariant();
-        }
-
-        // add element to array
-        const auto old_capacity = m_value.array->capacity();
-        m_value.array->push_back(val);
-        set_parent(m_value.array->back(), old_capacity);
-    }
-
-    /// @brief add an object to an array
-    /// @sa https://json.nlohmann.me/api/basic_json/operator+=/
-    reference operator+=(const basic_json& val)
-    {
-        push_back(val);
-        return *this;
-    }
-
-    /// @brief add an object to an object
-    /// @sa https://json.nlohmann.me/api/basic_json/push_back/
-    void push_back(const typename object_t::value_type& val)
-    {
-        // push_back only works for null objects or objects
-        if (JSON_HEDLEY_UNLIKELY(!(is_null() || is_object())))
-        {
-            JSON_THROW(type_error::create(308, "cannot use push_back() with " + std::string(type_name()), *this));
-        }
-
-        // transform null object into an object
-        if (is_null())
-        {
-            m_type = value_t::object;
-            m_value = value_t::object;
-            assert_invariant();
-        }
-
-        // add element to object
-        auto res = m_value.object->insert(val);
-        set_parent(res.first->second);
-    }
-
-    /// @brief add an object to an object
-    /// @sa https://json.nlohmann.me/api/basic_json/operator+=/
-    reference operator+=(const typename object_t::value_type& val)
-    {
-        push_back(val);
-        return *this;
-    }
-
-    /// @brief add an object to an object
-    /// @sa https://json.nlohmann.me/api/basic_json/push_back/
-    void push_back(initializer_list_t init)
-    {
-        if (is_object() && init.size() == 2 && (*init.begin())->is_string())
-        {
-            basic_json&& key = init.begin()->moved_or_copied();
-            push_back(typename object_t::value_type(
-                          std::move(key.get_ref<string_t&>()), (init.begin() + 1)->moved_or_copied()));
-        }
-        else
-        {
-            push_back(basic_json(init));
-        }
-    }
-
-    /// @brief add an object to an object
-    /// @sa https://json.nlohmann.me/api/basic_json/operator+=/
-    reference operator+=(initializer_list_t init)
-    {
-        push_back(init);
-        return *this;
-    }
-
-    /// @brief add an object to an array
-    /// @sa https://json.nlohmann.me/api/basic_json/emplace_back/
-    template<class... Args>
-    reference emplace_back(Args&& ... args)
-    {
-        // emplace_back only works for null objects or arrays
-        if (JSON_HEDLEY_UNLIKELY(!(is_null() || is_array())))
-        {
-            JSON_THROW(type_error::create(311, "cannot use emplace_back() with " + std::string(type_name()), *this));
-        }
-
-        // transform null object into an array
-        if (is_null())
-        {
-            m_type = value_t::array;
-            m_value = value_t::array;
-            assert_invariant();
-        }
-
-        // add element to array (perfect forwarding)
-        const auto old_capacity = m_value.array->capacity();
-        m_value.array->emplace_back(std::forward<Args>(args)...);
-        return set_parent(m_value.array->back(), old_capacity);
-    }
-
-    /// @brief add an object to an object if key does not exist
-    /// @sa https://json.nlohmann.me/api/basic_json/emplace/
-    template<class... Args>
-    std::pair<iterator, bool> emplace(Args&& ... args)
-    {
-        // emplace only works for null objects or arrays
-        if (JSON_HEDLEY_UNLIKELY(!(is_null() || is_object())))
-        {
-            JSON_THROW(type_error::create(311, "cannot use emplace() with " + std::string(type_name()), *this));
-        }
-
-        // transform null object into an object
-        if (is_null())
-        {
-            m_type = value_t::object;
-            m_value = value_t::object;
-            assert_invariant();
-        }
-
-        // add element to array (perfect forwarding)
-        auto res = m_value.object->emplace(std::forward<Args>(args)...);
-        set_parent(res.first->second);
-
-        // create result iterator and set iterator to the result of emplace
-        auto it = begin();
-        it.m_it.object_iterator = res.first;
-
-        // return pair of iterator and boolean
-        return {it, res.second};
-    }
-
-    /// Helper for insertion of an iterator
-    /// @note: This uses std::distance to support GCC 4.8,
-    ///        see https://github.com/nlohmann/json/pull/1257
-    template<typename... Args>
-    iterator insert_iterator(const_iterator pos, Args&& ... args)
-    {
-        iterator result(this);
-        JSON_ASSERT(m_value.array != nullptr);
-
-        auto insert_pos = std::distance(m_value.array->begin(), pos.m_it.array_iterator);
-        m_value.array->insert(pos.m_it.array_iterator, std::forward<Args>(args)...);
-        result.m_it.array_iterator = m_value.array->begin() + insert_pos;
-
-        // This could have been written as:
-        // result.m_it.array_iterator = m_value.array->insert(pos.m_it.array_iterator, cnt, val);
-        // but the return value of insert is missing in GCC 4.8, so it is written this way instead.
-
-        set_parents();
-        return result;
-    }
-
-    /// @brief inserts element into array
-    /// @sa https://json.nlohmann.me/api/basic_json/insert/
-    iterator insert(const_iterator pos, const basic_json& val)
-    {
-        // insert only works for arrays
-        if (JSON_HEDLEY_LIKELY(is_array()))
-        {
-            // check if iterator pos fits to this JSON value
-            if (JSON_HEDLEY_UNLIKELY(pos.m_object != this))
-            {
-                JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value", *this));
-            }
-
-            // insert to array and return iterator
-            return insert_iterator(pos, val);
-        }
-
-        JSON_THROW(type_error::create(309, "cannot use insert() with " + std::string(type_name()), *this));
-    }
-
-    /// @brief inserts element into array
-    /// @sa https://json.nlohmann.me/api/basic_json/insert/
-    iterator insert(const_iterator pos, basic_json&& val)
-    {
-        return insert(pos, val);
-    }
-
-    /// @brief inserts copies of element into array
-    /// @sa https://json.nlohmann.me/api/basic_json/insert/
-    iterator insert(const_iterator pos, size_type cnt, const basic_json& val)
-    {
-        // insert only works for arrays
-        if (JSON_HEDLEY_LIKELY(is_array()))
-        {
-            // check if iterator pos fits to this JSON value
-            if (JSON_HEDLEY_UNLIKELY(pos.m_object != this))
-            {
-                JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value", *this));
-            }
-
-            // insert to array and return iterator
-            return insert_iterator(pos, cnt, val);
-        }
-
-        JSON_THROW(type_error::create(309, "cannot use insert() with " + std::string(type_name()), *this));
-    }
-
-    /// @brief inserts range of elements into array
-    /// @sa https://json.nlohmann.me/api/basic_json/insert/
-    iterator insert(const_iterator pos, const_iterator first, const_iterator last)
-    {
-        // insert only works for arrays
-        if (JSON_HEDLEY_UNLIKELY(!is_array()))
-        {
-            JSON_THROW(type_error::create(309, "cannot use insert() with " + std::string(type_name()), *this));
-        }
-
-        // check if iterator pos fits to this JSON value
-        if (JSON_HEDLEY_UNLIKELY(pos.m_object != this))
-        {
-            JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value", *this));
-        }
-
-        // check if range iterators belong to the same JSON object
-        if (JSON_HEDLEY_UNLIKELY(first.m_object != last.m_object))
-        {
-            JSON_THROW(invalid_iterator::create(210, "iterators do not fit", *this));
-        }
-
-        if (JSON_HEDLEY_UNLIKELY(first.m_object == this))
-        {
-            JSON_THROW(invalid_iterator::create(211, "passed iterators may not belong to container", *this));
-        }
-
-        // insert to array and return iterator
-        return insert_iterator(pos, first.m_it.array_iterator, last.m_it.array_iterator);
-    }
-
-    /// @brief inserts elements from initializer list into array
-    /// @sa https://json.nlohmann.me/api/basic_json/insert/
-    iterator insert(const_iterator pos, initializer_list_t ilist)
-    {
-        // insert only works for arrays
-        if (JSON_HEDLEY_UNLIKELY(!is_array()))
-        {
-            JSON_THROW(type_error::create(309, "cannot use insert() with " + std::string(type_name()), *this));
-        }
-
-        // check if iterator pos fits to this JSON value
-        if (JSON_HEDLEY_UNLIKELY(pos.m_object != this))
-        {
-            JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value", *this));
-        }
-
-        // insert to array and return iterator
-        return insert_iterator(pos, ilist.begin(), ilist.end());
-    }
-
-    /// @brief inserts range of elements into object
-    /// @sa https://json.nlohmann.me/api/basic_json/insert/
-    void insert(const_iterator first, const_iterator last)
-    {
-        // insert only works for objects
-        if (JSON_HEDLEY_UNLIKELY(!is_object()))
-        {
-            JSON_THROW(type_error::create(309, "cannot use insert() with " + std::string(type_name()), *this));
-        }
-
-        // check if range iterators belong to the same JSON object
-        if (JSON_HEDLEY_UNLIKELY(first.m_object != last.m_object))
-        {
-            JSON_THROW(invalid_iterator::create(210, "iterators do not fit", *this));
-        }
-
-        // passed iterators must belong to objects
-        if (JSON_HEDLEY_UNLIKELY(!first.m_object->is_object()))
-        {
-            JSON_THROW(invalid_iterator::create(202, "iterators first and last must point to objects", *this));
-        }
-
-        m_value.object->insert(first.m_it.object_iterator, last.m_it.object_iterator);
-    }
-
-    /// @brief updates a JSON object from another object, overwriting existing keys
-    /// @sa https://json.nlohmann.me/api/basic_json/update/
-    void update(const_reference j, bool merge_objects = false)
-    {
-        update(j.begin(), j.end(), merge_objects);
-    }
-
-    /// @brief updates a JSON object from another object, overwriting existing keys
-    /// @sa https://json.nlohmann.me/api/basic_json/update/
-    void update(const_iterator first, const_iterator last, bool merge_objects = false)
-    {
-        // implicitly convert null value to an empty object
-        if (is_null())
-        {
-            m_type = value_t::object;
-            m_value.object = create<object_t>();
-            assert_invariant();
-        }
-
-        if (JSON_HEDLEY_UNLIKELY(!is_object()))
-        {
-            JSON_THROW(type_error::create(312, "cannot use update() with " + std::string(type_name()), *this));
-        }
-
-        // check if range iterators belong to the same JSON object
-        if (JSON_HEDLEY_UNLIKELY(first.m_object != last.m_object))
-        {
-            JSON_THROW(invalid_iterator::create(210, "iterators do not fit", *this));
-        }
-
-        // passed iterators must belong to objects
-        if (JSON_HEDLEY_UNLIKELY(!first.m_object->is_object()))
-        {
-            JSON_THROW(type_error::create(312, "cannot use update() with " + std::string(first.m_object->type_name()), *first.m_object));
-        }
-
-        for (auto it = first; it != last; ++it)
-        {
-            if (merge_objects && it.value().is_object())
-            {
-                auto it2 = m_value.object->find(it.key());
-                if (it2 != m_value.object->end())
-                {
-                    it2->second.update(it.value(), true);
-                    continue;
-                }
-            }
-            m_value.object->operator[](it.key()) = it.value();
-#if JSON_DIAGNOSTICS
-            m_value.object->operator[](it.key()).m_parent = this;
-#endif
-        }
-    }
-
-    /// @brief exchanges the values
-    /// @sa https://json.nlohmann.me/api/basic_json/swap/
-    void swap(reference other) noexcept (
-        std::is_nothrow_move_constructible<value_t>::value&&
-        std::is_nothrow_move_assignable<value_t>::value&&
-        std::is_nothrow_move_constructible<json_value>::value&&
-        std::is_nothrow_move_assignable<json_value>::value
-    )
-    {
-        std::swap(m_type, other.m_type);
-        std::swap(m_value, other.m_value);
-
-        set_parents();
-        other.set_parents();
-        assert_invariant();
-    }
-
-    /// @brief exchanges the values
-    /// @sa https://json.nlohmann.me/api/basic_json/swap/
-    friend void swap(reference left, reference right) noexcept (
-        std::is_nothrow_move_constructible<value_t>::value&&
-        std::is_nothrow_move_assignable<value_t>::value&&
-        std::is_nothrow_move_constructible<json_value>::value&&
-        std::is_nothrow_move_assignable<json_value>::value
-    )
-    {
-        left.swap(right);
-    }
-
-    /// @brief exchanges the values
-    /// @sa https://json.nlohmann.me/api/basic_json/swap/
-    void swap(array_t& other) // NOLINT(bugprone-exception-escape)
-    {
-        // swap only works for arrays
-        if (JSON_HEDLEY_LIKELY(is_array()))
-        {
-            std::swap(*(m_value.array), other);
-        }
-        else
-        {
-            JSON_THROW(type_error::create(310, "cannot use swap() with " + std::string(type_name()), *this));
-        }
-    }
-
-    /// @brief exchanges the values
-    /// @sa https://json.nlohmann.me/api/basic_json/swap/
-    void swap(object_t& other) // NOLINT(bugprone-exception-escape)
-    {
-        // swap only works for objects
-        if (JSON_HEDLEY_LIKELY(is_object()))
-        {
-            std::swap(*(m_value.object), other);
-        }
-        else
-        {
-            JSON_THROW(type_error::create(310, "cannot use swap() with " + std::string(type_name()), *this));
-        }
-    }
-
-    /// @brief exchanges the values
-    /// @sa https://json.nlohmann.me/api/basic_json/swap/
-    void swap(string_t& other) // NOLINT(bugprone-exception-escape)
-    {
-        // swap only works for strings
-        if (JSON_HEDLEY_LIKELY(is_string()))
-        {
-            std::swap(*(m_value.string), other);
-        }
-        else
-        {
-            JSON_THROW(type_error::create(310, "cannot use swap() with " + std::string(type_name()), *this));
-        }
-    }
-
-    /// @brief exchanges the values
-    /// @sa https://json.nlohmann.me/api/basic_json/swap/
-    void swap(binary_t& other) // NOLINT(bugprone-exception-escape)
-    {
-        // swap only works for strings
-        if (JSON_HEDLEY_LIKELY(is_binary()))
-        {
-            std::swap(*(m_value.binary), other);
-        }
-        else
-        {
-            JSON_THROW(type_error::create(310, "cannot use swap() with " + std::string(type_name()), *this));
-        }
-    }
-
-    /// @brief exchanges the values
-    /// @sa https://json.nlohmann.me/api/basic_json/swap/
-    void swap(typename binary_t::container_type& other) // NOLINT(bugprone-exception-escape)
-    {
-        // swap only works for strings
-        if (JSON_HEDLEY_LIKELY(is_binary()))
-        {
-            std::swap(*(m_value.binary), other);
-        }
-        else
-        {
-            JSON_THROW(type_error::create(310, "cannot use swap() with " + std::string(type_name()), *this));
-        }
-    }
-
-    /// @}
-
-  public:
-    //////////////////////////////////////////
-    // lexicographical comparison operators //
-    //////////////////////////////////////////
-
-    /// @name lexicographical comparison operators
-    /// @{
-
-    /// @brief comparison: equal
-    /// @sa https://json.nlohmann.me/api/basic_json/operator_eq/
-    friend bool operator==(const_reference lhs, const_reference rhs) noexcept
-    {
-#ifdef __GNUC__
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wfloat-equal"
-#endif
-        const auto lhs_type = lhs.type();
-        const auto rhs_type = rhs.type();
-
-        if (lhs_type == rhs_type)
-        {
-            switch (lhs_type)
-            {
-                case value_t::array:
-                    return *lhs.m_value.array == *rhs.m_value.array;
-
-                case value_t::object:
-                    return *lhs.m_value.object == *rhs.m_value.object;
-
-                case value_t::null:
-                    return true;
-
-                case value_t::string:
-                    return *lhs.m_value.string == *rhs.m_value.string;
-
-                case value_t::boolean:
-                    return lhs.m_value.boolean == rhs.m_value.boolean;
-
-                case value_t::number_integer:
-                    return lhs.m_value.number_integer == rhs.m_value.number_integer;
-
-                case value_t::number_unsigned:
-                    return lhs.m_value.number_unsigned == rhs.m_value.number_unsigned;
-
-                case value_t::number_float:
-                    return lhs.m_value.number_float == rhs.m_value.number_float;
-
-                case value_t::binary:
-                    return *lhs.m_value.binary == *rhs.m_value.binary;
-
-                case value_t::discarded:
-                default:
-                    return false;
-            }
-        }
-        else if (lhs_type == value_t::number_integer && rhs_type == value_t::number_float)
-        {
-            return static_cast<number_float_t>(lhs.m_value.number_integer) == rhs.m_value.number_float;
-        }
-        else if (lhs_type == value_t::number_float && rhs_type == value_t::number_integer)
-        {
-            return lhs.m_value.number_float == static_cast<number_float_t>(rhs.m_value.number_integer);
-        }
-        else if (lhs_type == value_t::number_unsigned && rhs_type == value_t::number_float)
-        {
-            return static_cast<number_float_t>(lhs.m_value.number_unsigned) == rhs.m_value.number_float;
-        }
-        else if (lhs_type == value_t::number_float && rhs_type == value_t::number_unsigned)
-        {
-            return lhs.m_value.number_float == static_cast<number_float_t>(rhs.m_value.number_unsigned);
-        }
-        else if (lhs_type == value_t::number_unsigned && rhs_type == value_t::number_integer)
-        {
-            return static_cast<number_integer_t>(lhs.m_value.number_unsigned) == rhs.m_value.number_integer;
-        }
-        else if (lhs_type == value_t::number_integer && rhs_type == value_t::number_unsigned)
-        {
-            return lhs.m_value.number_integer == static_cast<number_integer_t>(rhs.m_value.number_unsigned);
-        }
-
-        return false;
-#ifdef __GNUC__
-#pragma GCC diagnostic pop
-#endif
-    }
-
-    /// @brief comparison: equal
-    /// @sa https://json.nlohmann.me/api/basic_json/operator_eq/
-    template<typename ScalarType, typename std::enable_if<
-                 std::is_scalar<ScalarType>::value, int>::type = 0>
-    friend bool operator==(const_reference lhs, ScalarType rhs) noexcept
-    {
-        return lhs == basic_json(rhs);
-    }
-
-    /// @brief comparison: equal
-    /// @sa https://json.nlohmann.me/api/basic_json/operator_eq/
-    template<typename ScalarType, typename std::enable_if<
-                 std::is_scalar<ScalarType>::value, int>::type = 0>
-    friend bool operator==(ScalarType lhs, const_reference rhs) noexcept
-    {
-        return basic_json(lhs) == rhs;
-    }
-
-    /// @brief comparison: not equal
-    /// @sa https://json.nlohmann.me/api/basic_json/operator_ne/
-    friend bool operator!=(const_reference lhs, const_reference rhs) noexcept
-    {
-        return !(lhs == rhs);
-    }
-
-    /// @brief comparison: not equal
-    /// @sa https://json.nlohmann.me/api/basic_json/operator_ne/
-    template<typename ScalarType, typename std::enable_if<
-                 std::is_scalar<ScalarType>::value, int>::type = 0>
-    friend bool operator!=(const_reference lhs, ScalarType rhs) noexcept
-    {
-        return lhs != basic_json(rhs);
-    }
-
-    /// @brief comparison: not equal
-    /// @sa https://json.nlohmann.me/api/basic_json/operator_ne/
-    template<typename ScalarType, typename std::enable_if<
-                 std::is_scalar<ScalarType>::value, int>::type = 0>
-    friend bool operator!=(ScalarType lhs, const_reference rhs) noexcept
-    {
-        return basic_json(lhs) != rhs;
-    }
-
-    /// @brief comparison: less than
-    /// @sa https://json.nlohmann.me/api/basic_json/operator_lt/
-    friend bool operator<(const_reference lhs, const_reference rhs) noexcept
-    {
-        const auto lhs_type = lhs.type();
-        const auto rhs_type = rhs.type();
-
-        if (lhs_type == rhs_type)
-        {
-            switch (lhs_type)
-            {
-                case value_t::array:
-                    // note parentheses are necessary, see
-                    // https://github.com/nlohmann/json/issues/1530
-                    return (*lhs.m_value.array) < (*rhs.m_value.array);
-
-                case value_t::object:
-                    return (*lhs.m_value.object) < (*rhs.m_value.object);
-
-                case value_t::null:
-                    return false;
-
-                case value_t::string:
-                    return (*lhs.m_value.string) < (*rhs.m_value.string);
-
-                case value_t::boolean:
-                    return (lhs.m_value.boolean) < (rhs.m_value.boolean);
-
-                case value_t::number_integer:
-                    return (lhs.m_value.number_integer) < (rhs.m_value.number_integer);
-
-                case value_t::number_unsigned:
-                    return (lhs.m_value.number_unsigned) < (rhs.m_value.number_unsigned);
-
-                case value_t::number_float:
-                    return (lhs.m_value.number_float) < (rhs.m_value.number_float);
-
-                case value_t::binary:
-                    return (*lhs.m_value.binary) < (*rhs.m_value.binary);
-
-                case value_t::discarded:
-                default:
-                    return false;
-            }
-        }
-        else if (lhs_type == value_t::number_integer && rhs_type == value_t::number_float)
-        {
-            return static_cast<number_float_t>(lhs.m_value.number_integer) < rhs.m_value.number_float;
-        }
-        else if (lhs_type == value_t::number_float && rhs_type == value_t::number_integer)
-        {
-            return lhs.m_value.number_float < static_cast<number_float_t>(rhs.m_value.number_integer);
-        }
-        else if (lhs_type == value_t::number_unsigned && rhs_type == value_t::number_float)
-        {
-            return static_cast<number_float_t>(lhs.m_value.number_unsigned) < rhs.m_value.number_float;
-        }
-        else if (lhs_type == value_t::number_float && rhs_type == value_t::number_unsigned)
-        {
-            return lhs.m_value.number_float < static_cast<number_float_t>(rhs.m_value.number_unsigned);
-        }
-        else if (lhs_type == value_t::number_integer && rhs_type == value_t::number_unsigned)
-        {
-            return lhs.m_value.number_integer < static_cast<number_integer_t>(rhs.m_value.number_unsigned);
-        }
-        else if (lhs_type == value_t::number_unsigned && rhs_type == value_t::number_integer)
-        {
-            return static_cast<number_integer_t>(lhs.m_value.number_unsigned) < rhs.m_value.number_integer;
-        }
-
-        // We only reach this line if we cannot compare values. In that case,
-        // we compare types. Note we have to call the operator explicitly,
-        // because MSVC has problems otherwise.
-        return operator<(lhs_type, rhs_type);
-    }
-
-    /// @brief comparison: less than
-    /// @sa https://json.nlohmann.me/api/basic_json/operator_lt/
-    template<typename ScalarType, typename std::enable_if<
-                 std::is_scalar<ScalarType>::value, int>::type = 0>
-    friend bool operator<(const_reference lhs, ScalarType rhs) noexcept
-    {
-        return lhs < basic_json(rhs);
-    }
-
-    /// @brief comparison: less than
-    /// @sa https://json.nlohmann.me/api/basic_json/operator_lt/
-    template<typename ScalarType, typename std::enable_if<
-                 std::is_scalar<ScalarType>::value, int>::type = 0>
-    friend bool operator<(ScalarType lhs, const_reference rhs) noexcept
-    {
-        return basic_json(lhs) < rhs;
-    }
-
-    /// @brief comparison: less than or equal
-    /// @sa https://json.nlohmann.me/api/basic_json/operator_le/
-    friend bool operator<=(const_reference lhs, const_reference rhs) noexcept
-    {
-        return !(rhs < lhs);
-    }
-
-    /// @brief comparison: less than or equal
-    /// @sa https://json.nlohmann.me/api/basic_json/operator_le/
-    template<typename ScalarType, typename std::enable_if<
-                 std::is_scalar<ScalarType>::value, int>::type = 0>
-    friend bool operator<=(const_reference lhs, ScalarType rhs) noexcept
-    {
-        return lhs <= basic_json(rhs);
-    }
-
-    /// @brief comparison: less than or equal
-    /// @sa https://json.nlohmann.me/api/basic_json/operator_le/
-    template<typename ScalarType, typename std::enable_if<
-                 std::is_scalar<ScalarType>::value, int>::type = 0>
-    friend bool operator<=(ScalarType lhs, const_reference rhs) noexcept
-    {
-        return basic_json(lhs) <= rhs;
-    }
-
-    /// @brief comparison: greater than
-    /// @sa https://json.nlohmann.me/api/basic_json/operator_gt/
-    friend bool operator>(const_reference lhs, const_reference rhs) noexcept
-    {
-        return !(lhs <= rhs);
-    }
-
-    /// @brief comparison: greater than
-    /// @sa https://json.nlohmann.me/api/basic_json/operator_gt/
-    template<typename ScalarType, typename std::enable_if<
-                 std::is_scalar<ScalarType>::value, int>::type = 0>
-    friend bool operator>(const_reference lhs, ScalarType rhs) noexcept
-    {
-        return lhs > basic_json(rhs);
-    }
-
-    /// @brief comparison: greater than
-    /// @sa https://json.nlohmann.me/api/basic_json/operator_gt/
-    template<typename ScalarType, typename std::enable_if<
-                 std::is_scalar<ScalarType>::value, int>::type = 0>
-    friend bool operator>(ScalarType lhs, const_reference rhs) noexcept
-    {
-        return basic_json(lhs) > rhs;
-    }
-
-    /// @brief comparison: greater than or equal
-    /// @sa https://json.nlohmann.me/api/basic_json/operator_ge/
-    friend bool operator>=(const_reference lhs, const_reference rhs) noexcept
-    {
-        return !(lhs < rhs);
-    }
-
-    /// @brief comparison: greater than or equal
-    /// @sa https://json.nlohmann.me/api/basic_json/operator_ge/
-    template<typename ScalarType, typename std::enable_if<
-                 std::is_scalar<ScalarType>::value, int>::type = 0>
-    friend bool operator>=(const_reference lhs, ScalarType rhs) noexcept
-    {
-        return lhs >= basic_json(rhs);
-    }
-
-    /// @brief comparison: greater than or equal
-    /// @sa https://json.nlohmann.me/api/basic_json/operator_ge/
-    template<typename ScalarType, typename std::enable_if<
-                 std::is_scalar<ScalarType>::value, int>::type = 0>
-    friend bool operator>=(ScalarType lhs, const_reference rhs) noexcept
-    {
-        return basic_json(lhs) >= rhs;
-    }
-
-    /// @}
-
-    ///////////////////
-    // serialization //
-    ///////////////////
-
-    /// @name serialization
-    /// @{
-#ifndef JSON_NO_IO
-    /// @brief serialize to stream
-    /// @sa https://json.nlohmann.me/api/basic_json/operator_ltlt/
-    friend std::ostream& operator<<(std::ostream& o, const basic_json& j)
-    {
-        // read width member and use it as indentation parameter if nonzero
-        const bool pretty_print = o.width() > 0;
-        const auto indentation = pretty_print ? o.width() : 0;
-
-        // reset width to 0 for subsequent calls to this stream
-        o.width(0);
-
-        // do the actual serialization
-        serializer s(detail::output_adapter<char>(o), o.fill());
-        s.dump(j, pretty_print, false, static_cast<unsigned int>(indentation));
-        return o;
-    }
-
-    /// @brief serialize to stream
-    /// @sa https://json.nlohmann.me/api/basic_json/operator_ltlt/
-    /// @deprecated This function is deprecated since 3.0.0 and will be removed in
-    ///             version 4.0.0 of the library. Please use
-    ///             operator<<(std::ostream&, const basic_json&) instead; that is,
-    ///             replace calls like `j >> o;` with `o << j;`.
-    JSON_HEDLEY_DEPRECATED_FOR(3.0.0, operator<<(std::ostream&, const basic_json&))
-    friend std::ostream& operator>>(const basic_json& j, std::ostream& o)
-    {
-        return o << j;
-    }
-#endif  // JSON_NO_IO
-    /// @}
-
-
-    /////////////////////
-    // deserialization //
-    /////////////////////
-
-    /// @name deserialization
-    /// @{
-
-    /// @brief deserialize from a compatible input
-    /// @sa https://json.nlohmann.me/api/basic_json/parse/
-    template<typename InputType>
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    static basic_json parse(InputType&& i,
-                            const parser_callback_t cb = nullptr,
-                            const bool allow_exceptions = true,
-                            const bool ignore_comments = false)
-    {
-        basic_json result;
-        parser(detail::input_adapter(std::forward<InputType>(i)), cb, allow_exceptions, ignore_comments).parse(true, result);
-        return result;
-    }
-
-    /// @brief deserialize from a pair of character iterators
-    /// @sa https://json.nlohmann.me/api/basic_json/parse/
-    template<typename IteratorType>
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    static basic_json parse(IteratorType first,
-                            IteratorType last,
-                            const parser_callback_t cb = nullptr,
-                            const bool allow_exceptions = true,
-                            const bool ignore_comments = false)
-    {
-        basic_json result;
-        parser(detail::input_adapter(std::move(first), std::move(last)), cb, allow_exceptions, ignore_comments).parse(true, result);
-        return result;
-    }
-
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, parse(ptr, ptr + len))
-    static basic_json parse(detail::span_input_adapter&& i,
-                            const parser_callback_t cb = nullptr,
-                            const bool allow_exceptions = true,
-                            const bool ignore_comments = false)
-    {
-        basic_json result;
-        parser(i.get(), cb, allow_exceptions, ignore_comments).parse(true, result);
-        return result;
-    }
-
-    /// @brief check if the input is valid JSON
-    /// @sa https://json.nlohmann.me/api/basic_json/accept/
-    template<typename InputType>
-    static bool accept(InputType&& i,
-                       const bool ignore_comments = false)
-    {
-        return parser(detail::input_adapter(std::forward<InputType>(i)), nullptr, false, ignore_comments).accept(true);
-    }
-
-    /// @brief check if the input is valid JSON
-    /// @sa https://json.nlohmann.me/api/basic_json/accept/
-    template<typename IteratorType>
-    static bool accept(IteratorType first, IteratorType last,
-                       const bool ignore_comments = false)
-    {
-        return parser(detail::input_adapter(std::move(first), std::move(last)), nullptr, false, ignore_comments).accept(true);
-    }
-
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, accept(ptr, ptr + len))
-    static bool accept(detail::span_input_adapter&& i,
-                       const bool ignore_comments = false)
-    {
-        return parser(i.get(), nullptr, false, ignore_comments).accept(true);
-    }
-
-    /// @brief generate SAX events
-    /// @sa https://json.nlohmann.me/api/basic_json/sax_parse/
-    template <typename InputType, typename SAX>
-    JSON_HEDLEY_NON_NULL(2)
-    static bool sax_parse(InputType&& i, SAX* sax,
-                          input_format_t format = input_format_t::json,
-                          const bool strict = true,
-                          const bool ignore_comments = false)
-    {
-        auto ia = detail::input_adapter(std::forward<InputType>(i));
-        return format == input_format_t::json
-               ? parser(std::move(ia), nullptr, true, ignore_comments).sax_parse(sax, strict)
-               : detail::binary_reader<basic_json, decltype(ia), SAX>(std::move(ia)).sax_parse(format, sax, strict);
-    }
-
-    /// @brief generate SAX events
-    /// @sa https://json.nlohmann.me/api/basic_json/sax_parse/
-    template<class IteratorType, class SAX>
-    JSON_HEDLEY_NON_NULL(3)
-    static bool sax_parse(IteratorType first, IteratorType last, SAX* sax,
-                          input_format_t format = input_format_t::json,
-                          const bool strict = true,
-                          const bool ignore_comments = false)
-    {
-        auto ia = detail::input_adapter(std::move(first), std::move(last));
-        return format == input_format_t::json
-               ? parser(std::move(ia), nullptr, true, ignore_comments).sax_parse(sax, strict)
-               : detail::binary_reader<basic_json, decltype(ia), SAX>(std::move(ia)).sax_parse(format, sax, strict);
-    }
-
-    /// @brief generate SAX events
-    /// @sa https://json.nlohmann.me/api/basic_json/sax_parse/
-    /// @deprecated This function is deprecated since 3.8.0 and will be removed in
-    ///             version 4.0.0 of the library. Please use
-    ///             sax_parse(ptr, ptr + len) instead.
-    template <typename SAX>
-    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, sax_parse(ptr, ptr + len, ...))
-    JSON_HEDLEY_NON_NULL(2)
-    static bool sax_parse(detail::span_input_adapter&& i, SAX* sax,
-                          input_format_t format = input_format_t::json,
-                          const bool strict = true,
-                          const bool ignore_comments = false)
-    {
-        auto ia = i.get();
-        return format == input_format_t::json
-               // NOLINTNEXTLINE(hicpp-move-const-arg,performance-move-const-arg)
-               ? parser(std::move(ia), nullptr, true, ignore_comments).sax_parse(sax, strict)
-               // NOLINTNEXTLINE(hicpp-move-const-arg,performance-move-const-arg)
-               : detail::binary_reader<basic_json, decltype(ia), SAX>(std::move(ia)).sax_parse(format, sax, strict);
-    }
-#ifndef JSON_NO_IO
-    /// @brief deserialize from stream
-    /// @sa https://json.nlohmann.me/api/basic_json/operator_gtgt/
-    /// @deprecated This stream operator is deprecated since 3.0.0 and will be removed in
-    ///             version 4.0.0 of the library. Please use
-    ///             operator>>(std::istream&, basic_json&) instead; that is,
-    ///             replace calls like `j << i;` with `i >> j;`.
-    JSON_HEDLEY_DEPRECATED_FOR(3.0.0, operator>>(std::istream&, basic_json&))
-    friend std::istream& operator<<(basic_json& j, std::istream& i)
-    {
-        return operator>>(i, j);
-    }
-
-    /// @brief deserialize from stream
-    /// @sa https://json.nlohmann.me/api/basic_json/operator_gtgt/
-    friend std::istream& operator>>(std::istream& i, basic_json& j)
-    {
-        parser(detail::input_adapter(i)).parse(false, j);
-        return i;
-    }
-#endif  // JSON_NO_IO
-    /// @}
-
-    ///////////////////////////
-    // convenience functions //
-    ///////////////////////////
-
-    /// @brief return the type as string
-    /// @sa https://json.nlohmann.me/api/basic_json/type_name/
-    JSON_HEDLEY_RETURNS_NON_NULL
-    const char* type_name() const noexcept
-    {
-        switch (m_type)
-        {
-            case value_t::null:
-                return "null";
-            case value_t::object:
-                return "object";
-            case value_t::array:
-                return "array";
-            case value_t::string:
-                return "string";
-            case value_t::boolean:
-                return "boolean";
-            case value_t::binary:
-                return "binary";
-            case value_t::discarded:
-                return "discarded";
-            case value_t::number_integer:
-            case value_t::number_unsigned:
-            case value_t::number_float:
-            default:
-                return "number";
-        }
-    }
-
-
-  JSON_PRIVATE_UNLESS_TESTED:
-    //////////////////////
-    // member variables //
-    //////////////////////
-
-    /// the type of the current element
-    value_t m_type = value_t::null;
-
-    /// the value of the current element
-    json_value m_value = {};
-
-#if JSON_DIAGNOSTICS
-    /// a pointer to a parent value (for debugging purposes)
-    basic_json* m_parent = nullptr;
-#endif
-
-    //////////////////////////////////////////
-    // binary serialization/deserialization //
-    //////////////////////////////////////////
-
-    /// @name binary serialization/deserialization support
-    /// @{
-
-  public:
-    /// @brief create a CBOR serialization of a given JSON value
-    /// @sa https://json.nlohmann.me/api/basic_json/to_cbor/
-    static std::vector<std::uint8_t> to_cbor(const basic_json& j)
-    {
-        std::vector<std::uint8_t> result;
-        to_cbor(j, result);
-        return result;
-    }
-
-    /// @brief create a CBOR serialization of a given JSON value
-    /// @sa https://json.nlohmann.me/api/basic_json/to_cbor/
-    static void to_cbor(const basic_json& j, detail::output_adapter<std::uint8_t> o)
-    {
-        binary_writer<std::uint8_t>(o).write_cbor(j);
-    }
-
-    /// @brief create a CBOR serialization of a given JSON value
-    /// @sa https://json.nlohmann.me/api/basic_json/to_cbor/
-    static void to_cbor(const basic_json& j, detail::output_adapter<char> o)
-    {
-        binary_writer<char>(o).write_cbor(j);
-    }
-
-    /// @brief create a MessagePack serialization of a given JSON value
-    /// @sa https://json.nlohmann.me/api/basic_json/to_msgpack/
-    static std::vector<std::uint8_t> to_msgpack(const basic_json& j)
-    {
-        std::vector<std::uint8_t> result;
-        to_msgpack(j, result);
-        return result;
-    }
-
-    /// @brief create a MessagePack serialization of a given JSON value
-    /// @sa https://json.nlohmann.me/api/basic_json/to_msgpack/
-    static void to_msgpack(const basic_json& j, detail::output_adapter<std::uint8_t> o)
-    {
-        binary_writer<std::uint8_t>(o).write_msgpack(j);
-    }
-
-    /// @brief create a MessagePack serialization of a given JSON value
-    /// @sa https://json.nlohmann.me/api/basic_json/to_msgpack/
-    static void to_msgpack(const basic_json& j, detail::output_adapter<char> o)
-    {
-        binary_writer<char>(o).write_msgpack(j);
-    }
-
-    /// @brief create a UBJSON serialization of a given JSON value
-    /// @sa https://json.nlohmann.me/api/basic_json/to_ubjson/
-    static std::vector<std::uint8_t> to_ubjson(const basic_json& j,
-            const bool use_size = false,
-            const bool use_type = false)
-    {
-        std::vector<std::uint8_t> result;
-        to_ubjson(j, result, use_size, use_type);
-        return result;
-    }
-
-    /// @brief create a UBJSON serialization of a given JSON value
-    /// @sa https://json.nlohmann.me/api/basic_json/to_ubjson/
-    static void to_ubjson(const basic_json& j, detail::output_adapter<std::uint8_t> o,
-                          const bool use_size = false, const bool use_type = false)
-    {
-        binary_writer<std::uint8_t>(o).write_ubjson(j, use_size, use_type);
-    }
-
-    /// @brief create a UBJSON serialization of a given JSON value
-    /// @sa https://json.nlohmann.me/api/basic_json/to_ubjson/
-    static void to_ubjson(const basic_json& j, detail::output_adapter<char> o,
-                          const bool use_size = false, const bool use_type = false)
-    {
-        binary_writer<char>(o).write_ubjson(j, use_size, use_type);
-    }
-
-    /// @brief create a BSON serialization of a given JSON value
-    /// @sa https://json.nlohmann.me/api/basic_json/to_bson/
-    static std::vector<std::uint8_t> to_bson(const basic_json& j)
-    {
-        std::vector<std::uint8_t> result;
-        to_bson(j, result);
-        return result;
-    }
-
-    /// @brief create a BSON serialization of a given JSON value
-    /// @sa https://json.nlohmann.me/api/basic_json/to_bson/
-    static void to_bson(const basic_json& j, detail::output_adapter<std::uint8_t> o)
-    {
-        binary_writer<std::uint8_t>(o).write_bson(j);
-    }
-
-    /// @brief create a BSON serialization of a given JSON value
-    /// @sa https://json.nlohmann.me/api/basic_json/to_bson/
-    static void to_bson(const basic_json& j, detail::output_adapter<char> o)
-    {
-        binary_writer<char>(o).write_bson(j);
-    }
-
-    /// @brief create a JSON value from an input in CBOR format
-    /// @sa https://json.nlohmann.me/api/basic_json/from_cbor/
-    template<typename InputType>
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    static basic_json from_cbor(InputType&& i,
-                                const bool strict = true,
-                                const bool allow_exceptions = true,
-                                const cbor_tag_handler_t tag_handler = cbor_tag_handler_t::error)
-    {
-        basic_json result;
-        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
-        auto ia = detail::input_adapter(std::forward<InputType>(i));
-        const bool res = binary_reader<decltype(ia)>(std::move(ia)).sax_parse(input_format_t::cbor, &sdp, strict, tag_handler);
-        return res ? result : basic_json(value_t::discarded);
-    }
-
-    /// @brief create a JSON value from an input in CBOR format
-    /// @sa https://json.nlohmann.me/api/basic_json/from_cbor/
-    template<typename IteratorType>
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    static basic_json from_cbor(IteratorType first, IteratorType last,
-                                const bool strict = true,
-                                const bool allow_exceptions = true,
-                                const cbor_tag_handler_t tag_handler = cbor_tag_handler_t::error)
-    {
-        basic_json result;
-        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
-        auto ia = detail::input_adapter(std::move(first), std::move(last));
-        const bool res = binary_reader<decltype(ia)>(std::move(ia)).sax_parse(input_format_t::cbor, &sdp, strict, tag_handler);
-        return res ? result : basic_json(value_t::discarded);
-    }
-
-    template<typename T>
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_cbor(ptr, ptr + len))
-    static basic_json from_cbor(const T* ptr, std::size_t len,
-                                const bool strict = true,
-                                const bool allow_exceptions = true,
-                                const cbor_tag_handler_t tag_handler = cbor_tag_handler_t::error)
-    {
-        return from_cbor(ptr, ptr + len, strict, allow_exceptions, tag_handler);
-    }
-
-
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_cbor(ptr, ptr + len))
-    static basic_json from_cbor(detail::span_input_adapter&& i,
-                                const bool strict = true,
-                                const bool allow_exceptions = true,
-                                const cbor_tag_handler_t tag_handler = cbor_tag_handler_t::error)
-    {
-        basic_json result;
-        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
-        auto ia = i.get();
-        // NOLINTNEXTLINE(hicpp-move-const-arg,performance-move-const-arg)
-        const bool res = binary_reader<decltype(ia)>(std::move(ia)).sax_parse(input_format_t::cbor, &sdp, strict, tag_handler);
-        return res ? result : basic_json(value_t::discarded);
-    }
-
-    /// @brief create a JSON value from an input in MessagePack format
-    /// @sa https://json.nlohmann.me/api/basic_json/from_msgpack/
-    template<typename InputType>
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    static basic_json from_msgpack(InputType&& i,
-                                   const bool strict = true,
-                                   const bool allow_exceptions = true)
-    {
-        basic_json result;
-        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
-        auto ia = detail::input_adapter(std::forward<InputType>(i));
-        const bool res = binary_reader<decltype(ia)>(std::move(ia)).sax_parse(input_format_t::msgpack, &sdp, strict);
-        return res ? result : basic_json(value_t::discarded);
-    }
-
-    /// @brief create a JSON value from an input in MessagePack format
-    /// @sa https://json.nlohmann.me/api/basic_json/from_msgpack/
-    template<typename IteratorType>
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    static basic_json from_msgpack(IteratorType first, IteratorType last,
-                                   const bool strict = true,
-                                   const bool allow_exceptions = true)
-    {
-        basic_json result;
-        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
-        auto ia = detail::input_adapter(std::move(first), std::move(last));
-        const bool res = binary_reader<decltype(ia)>(std::move(ia)).sax_parse(input_format_t::msgpack, &sdp, strict);
-        return res ? result : basic_json(value_t::discarded);
-    }
-
-    template<typename T>
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_msgpack(ptr, ptr + len))
-    static basic_json from_msgpack(const T* ptr, std::size_t len,
-                                   const bool strict = true,
-                                   const bool allow_exceptions = true)
-    {
-        return from_msgpack(ptr, ptr + len, strict, allow_exceptions);
-    }
-
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_msgpack(ptr, ptr + len))
-    static basic_json from_msgpack(detail::span_input_adapter&& i,
-                                   const bool strict = true,
-                                   const bool allow_exceptions = true)
-    {
-        basic_json result;
-        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
-        auto ia = i.get();
-        // NOLINTNEXTLINE(hicpp-move-const-arg,performance-move-const-arg)
-        const bool res = binary_reader<decltype(ia)>(std::move(ia)).sax_parse(input_format_t::msgpack, &sdp, strict);
-        return res ? result : basic_json(value_t::discarded);
-    }
-
-    /// @brief create a JSON value from an input in UBJSON format
-    /// @sa https://json.nlohmann.me/api/basic_json/from_ubjson/
-    template<typename InputType>
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    static basic_json from_ubjson(InputType&& i,
-                                  const bool strict = true,
-                                  const bool allow_exceptions = true)
-    {
-        basic_json result;
-        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
-        auto ia = detail::input_adapter(std::forward<InputType>(i));
-        const bool res = binary_reader<decltype(ia)>(std::move(ia)).sax_parse(input_format_t::ubjson, &sdp, strict);
-        return res ? result : basic_json(value_t::discarded);
-    }
-
-    /// @brief create a JSON value from an input in UBJSON format
-    /// @sa https://json.nlohmann.me/api/basic_json/from_ubjson/
-    template<typename IteratorType>
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    static basic_json from_ubjson(IteratorType first, IteratorType last,
-                                  const bool strict = true,
-                                  const bool allow_exceptions = true)
-    {
-        basic_json result;
-        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
-        auto ia = detail::input_adapter(std::move(first), std::move(last));
-        const bool res = binary_reader<decltype(ia)>(std::move(ia)).sax_parse(input_format_t::ubjson, &sdp, strict);
-        return res ? result : basic_json(value_t::discarded);
-    }
-
-    template<typename T>
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_ubjson(ptr, ptr + len))
-    static basic_json from_ubjson(const T* ptr, std::size_t len,
-                                  const bool strict = true,
-                                  const bool allow_exceptions = true)
-    {
-        return from_ubjson(ptr, ptr + len, strict, allow_exceptions);
-    }
-
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_ubjson(ptr, ptr + len))
-    static basic_json from_ubjson(detail::span_input_adapter&& i,
-                                  const bool strict = true,
-                                  const bool allow_exceptions = true)
-    {
-        basic_json result;
-        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
-        auto ia = i.get();
-        // NOLINTNEXTLINE(hicpp-move-const-arg,performance-move-const-arg)
-        const bool res = binary_reader<decltype(ia)>(std::move(ia)).sax_parse(input_format_t::ubjson, &sdp, strict);
-        return res ? result : basic_json(value_t::discarded);
-    }
-
-    /// @brief create a JSON value from an input in BSON format
-    /// @sa https://json.nlohmann.me/api/basic_json/from_bson/
-    template<typename InputType>
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    static basic_json from_bson(InputType&& i,
-                                const bool strict = true,
-                                const bool allow_exceptions = true)
-    {
-        basic_json result;
-        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
-        auto ia = detail::input_adapter(std::forward<InputType>(i));
-        const bool res = binary_reader<decltype(ia)>(std::move(ia)).sax_parse(input_format_t::bson, &sdp, strict);
-        return res ? result : basic_json(value_t::discarded);
-    }
-
-    /// @brief create a JSON value from an input in BSON format
-    /// @sa https://json.nlohmann.me/api/basic_json/from_bson/
-    template<typename IteratorType>
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    static basic_json from_bson(IteratorType first, IteratorType last,
-                                const bool strict = true,
-                                const bool allow_exceptions = true)
-    {
-        basic_json result;
-        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
-        auto ia = detail::input_adapter(std::move(first), std::move(last));
-        const bool res = binary_reader<decltype(ia)>(std::move(ia)).sax_parse(input_format_t::bson, &sdp, strict);
-        return res ? result : basic_json(value_t::discarded);
-    }
-
-    template<typename T>
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_bson(ptr, ptr + len))
-    static basic_json from_bson(const T* ptr, std::size_t len,
-                                const bool strict = true,
-                                const bool allow_exceptions = true)
-    {
-        return from_bson(ptr, ptr + len, strict, allow_exceptions);
-    }
-
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_bson(ptr, ptr + len))
-    static basic_json from_bson(detail::span_input_adapter&& i,
-                                const bool strict = true,
-                                const bool allow_exceptions = true)
-    {
-        basic_json result;
-        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
-        auto ia = i.get();
-        // NOLINTNEXTLINE(hicpp-move-const-arg,performance-move-const-arg)
-        const bool res = binary_reader<decltype(ia)>(std::move(ia)).sax_parse(input_format_t::bson, &sdp, strict);
-        return res ? result : basic_json(value_t::discarded);
-    }
-    /// @}
-
-    //////////////////////////
-    // JSON Pointer support //
-    //////////////////////////
-
-    /// @name JSON Pointer functions
-    /// @{
-
-    /// @brief access specified element via JSON Pointer
-    /// @sa https://json.nlohmann.me/api/basic_json/operator%5B%5D/
-    reference operator[](const json_pointer& ptr)
-    {
-        return ptr.get_unchecked(this);
-    }
-
-    /// @brief access specified element via JSON Pointer
-    /// @sa https://json.nlohmann.me/api/basic_json/operator%5B%5D/
-    const_reference operator[](const json_pointer& ptr) const
-    {
-        return ptr.get_unchecked(this);
-    }
-
-    /// @brief access specified element via JSON Pointer
-    /// @sa https://json.nlohmann.me/api/basic_json/at/
-    reference at(const json_pointer& ptr)
-    {
-        return ptr.get_checked(this);
-    }
-
-    /// @brief access specified element via JSON Pointer
-    /// @sa https://json.nlohmann.me/api/basic_json/at/
-    const_reference at(const json_pointer& ptr) const
-    {
-        return ptr.get_checked(this);
-    }
-
-    /// @brief return flattened JSON value
-    /// @sa https://json.nlohmann.me/api/basic_json/flatten/
-    basic_json flatten() const
-    {
-        basic_json result(value_t::object);
-        json_pointer::flatten("", *this, result);
-        return result;
-    }
-
-    /// @brief unflatten a previously flattened JSON value
-    /// @sa https://json.nlohmann.me/api/basic_json/unflatten/
-    basic_json unflatten() const
-    {
-        return json_pointer::unflatten(*this);
-    }
-
-    /// @}
-
-    //////////////////////////
-    // JSON Patch functions //
-    //////////////////////////
-
-    /// @name JSON Patch functions
-    /// @{
-
-    /// @brief applies a JSON patch
-    /// @sa https://json.nlohmann.me/api/basic_json/patch/
-    basic_json patch(const basic_json& json_patch) const
-    {
-        // make a working copy to apply the patch to
-        basic_json result = *this;
-
-        // the valid JSON Patch operations
-        enum class patch_operations {add, remove, replace, move, copy, test, invalid};
-
-        const auto get_op = [](const std::string & op)
-        {
-            if (op == "add")
-            {
-                return patch_operations::add;
-            }
-            if (op == "remove")
-            {
-                return patch_operations::remove;
-            }
-            if (op == "replace")
-            {
-                return patch_operations::replace;
-            }
-            if (op == "move")
-            {
-                return patch_operations::move;
-            }
-            if (op == "copy")
-            {
-                return patch_operations::copy;
-            }
-            if (op == "test")
-            {
-                return patch_operations::test;
-            }
-
-            return patch_operations::invalid;
-        };
-
-        // wrapper for "add" operation; add value at ptr
-        const auto operation_add = [&result](json_pointer & ptr, basic_json val)
-        {
-            // adding to the root of the target document means replacing it
-            if (ptr.empty())
-            {
-                result = val;
-                return;
-            }
-
-            // make sure the top element of the pointer exists
-            json_pointer top_pointer = ptr.top();
-            if (top_pointer != ptr)
-            {
-                result.at(top_pointer);
-            }
-
-            // get reference to parent of JSON pointer ptr
-            const auto last_path = ptr.back();
-            ptr.pop_back();
-            basic_json& parent = result[ptr];
-
-            switch (parent.m_type)
-            {
-                case value_t::null:
-                case value_t::object:
-                {
-                    // use operator[] to add value
-                    parent[last_path] = val;
-                    break;
-                }
-
-                case value_t::array:
-                {
-                    if (last_path == "-")
-                    {
-                        // special case: append to back
-                        parent.push_back(val);
-                    }
-                    else
-                    {
-                        const auto idx = json_pointer::array_index(last_path);
-                        if (JSON_HEDLEY_UNLIKELY(idx > parent.size()))
-                        {
-                            // avoid undefined behavior
-                            JSON_THROW(out_of_range::create(401, "array index " + std::to_string(idx) + " is out of range", parent));
-                        }
-
-                        // default case: insert add offset
-                        parent.insert(parent.begin() + static_cast<difference_type>(idx), val);
-                    }
-                    break;
-                }
-
-                // if there exists a parent it cannot be primitive
-                case value_t::string: // LCOV_EXCL_LINE
-                case value_t::boolean: // LCOV_EXCL_LINE
-                case value_t::number_integer: // LCOV_EXCL_LINE
-                case value_t::number_unsigned: // LCOV_EXCL_LINE
-                case value_t::number_float: // LCOV_EXCL_LINE
-                case value_t::binary: // LCOV_EXCL_LINE
-                case value_t::discarded: // LCOV_EXCL_LINE
-                default:            // LCOV_EXCL_LINE
-                    JSON_ASSERT(false); // NOLINT(cert-dcl03-c,hicpp-static-assert,misc-static-assert) LCOV_EXCL_LINE
-            }
-        };
-
-        // wrapper for "remove" operation; remove value at ptr
-        const auto operation_remove = [this, &result](json_pointer & ptr)
-        {
-            // get reference to parent of JSON pointer ptr
-            const auto last_path = ptr.back();
-            ptr.pop_back();
-            basic_json& parent = result.at(ptr);
-
-            // remove child
-            if (parent.is_object())
-            {
-                // perform range check
-                auto it = parent.find(last_path);
-                if (JSON_HEDLEY_LIKELY(it != parent.end()))
-                {
-                    parent.erase(it);
-                }
-                else
-                {
-                    JSON_THROW(out_of_range::create(403, "key '" + last_path + "' not found", *this));
-                }
-            }
-            else if (parent.is_array())
-            {
-                // note erase performs range check
-                parent.erase(json_pointer::array_index(last_path));
-            }
-        };
-
-        // type check: top level value must be an array
-        if (JSON_HEDLEY_UNLIKELY(!json_patch.is_array()))
-        {
-            JSON_THROW(parse_error::create(104, 0, "JSON patch must be an array of objects", json_patch));
-        }
-
-        // iterate and apply the operations
-        for (const auto& val : json_patch)
-        {
-            // wrapper to get a value for an operation
-            const auto get_value = [&val](const std::string & op,
-                                          const std::string & member,
-                                          bool string_type) -> basic_json &
-            {
-                // find value
-                auto it = val.m_value.object->find(member);
-
-                // context-sensitive error message
-                const auto error_msg = (op == "op") ? "operation" : "operation '" + op + "'";
-
-                // check if desired value is present
-                if (JSON_HEDLEY_UNLIKELY(it == val.m_value.object->end()))
-                {
-                    // NOLINTNEXTLINE(performance-inefficient-string-concatenation)
-                    JSON_THROW(parse_error::create(105, 0, error_msg + " must have member '" + member + "'", val));
-                }
-
-                // check if result is of type string
-                if (JSON_HEDLEY_UNLIKELY(string_type && !it->second.is_string()))
-                {
-                    // NOLINTNEXTLINE(performance-inefficient-string-concatenation)
-                    JSON_THROW(parse_error::create(105, 0, error_msg + " must have string member '" + member + "'", val));
-                }
-
-                // no error: return value
-                return it->second;
-            };
-
-            // type check: every element of the array must be an object
-            if (JSON_HEDLEY_UNLIKELY(!val.is_object()))
-            {
-                JSON_THROW(parse_error::create(104, 0, "JSON patch must be an array of objects", val));
-            }
-
-            // collect mandatory members
-            const auto op = get_value("op", "op", true).template get<std::string>();
-            const auto path = get_value(op, "path", true).template get<std::string>();
-            json_pointer ptr(path);
-
-            switch (get_op(op))
-            {
-                case patch_operations::add:
-                {
-                    operation_add(ptr, get_value("add", "value", false));
-                    break;
-                }
-
-                case patch_operations::remove:
-                {
-                    operation_remove(ptr);
-                    break;
-                }
-
-                case patch_operations::replace:
-                {
-                    // the "path" location must exist - use at()
-                    result.at(ptr) = get_value("replace", "value", false);
-                    break;
-                }
-
-                case patch_operations::move:
-                {
-                    const auto from_path = get_value("move", "from", true).template get<std::string>();
-                    json_pointer from_ptr(from_path);
-
-                    // the "from" location must exist - use at()
-                    basic_json v = result.at(from_ptr);
-
-                    // The move operation is functionally identical to a
-                    // "remove" operation on the "from" location, followed
-                    // immediately by an "add" operation at the target
-                    // location with the value that was just removed.
-                    operation_remove(from_ptr);
-                    operation_add(ptr, v);
-                    break;
-                }
-
-                case patch_operations::copy:
-                {
-                    const auto from_path = get_value("copy", "from", true).template get<std::string>();
-                    const json_pointer from_ptr(from_path);
-
-                    // the "from" location must exist - use at()
-                    basic_json v = result.at(from_ptr);
-
-                    // The copy is functionally identical to an "add"
-                    // operation at the target location using the value
-                    // specified in the "from" member.
-                    operation_add(ptr, v);
-                    break;
-                }
-
-                case patch_operations::test:
-                {
-                    bool success = false;
-                    JSON_TRY
-                    {
-                        // check if "value" matches the one at "path"
-                        // the "path" location must exist - use at()
-                        success = (result.at(ptr) == get_value("test", "value", false));
-                    }
-                    JSON_INTERNAL_CATCH (out_of_range&)
-                    {
-                        // ignore out of range errors: success remains false
-                    }
-
-                    // throw an exception if test fails
-                    if (JSON_HEDLEY_UNLIKELY(!success))
-                    {
-                        JSON_THROW(other_error::create(501, "unsuccessful: " + val.dump(), val));
-                    }
-
-                    break;
-                }
-
-                case patch_operations::invalid:
-                default:
-                {
-                    // op must be "add", "remove", "replace", "move", "copy", or
-                    // "test"
-                    JSON_THROW(parse_error::create(105, 0, "operation value '" + op + "' is invalid", val));
-                }
-            }
-        }
-
-        return result;
-    }
-
-    /// @brief creates a diff as a JSON patch
-    /// @sa https://json.nlohmann.me/api/basic_json/diff/
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    static basic_json diff(const basic_json& source, const basic_json& target,
-                           const std::string& path = "")
-    {
-        // the patch
-        basic_json result(value_t::array);
-
-        // if the values are the same, return empty patch
-        if (source == target)
-        {
-            return result;
-        }
-
-        if (source.type() != target.type())
-        {
-            // different types: replace value
-            result.push_back(
-            {
-                {"op", "replace"}, {"path", path}, {"value", target}
-            });
-            return result;
-        }
-
-        switch (source.type())
-        {
-            case value_t::array:
-            {
-                // first pass: traverse common elements
-                std::size_t i = 0;
-                while (i < source.size() && i < target.size())
-                {
-                    // recursive call to compare array values at index i
-                    auto temp_diff = diff(source[i], target[i], path + "/" + std::to_string(i));
-                    result.insert(result.end(), temp_diff.begin(), temp_diff.end());
-                    ++i;
-                }
-
-                // We now reached the end of at least one array
-                // in a second pass, traverse the remaining elements
-
-                // remove my remaining elements
-                const auto end_index = static_cast<difference_type>(result.size());
-                while (i < source.size())
-                {
-                    // add operations in reverse order to avoid invalid
-                    // indices
-                    result.insert(result.begin() + end_index, object(
-                    {
-                        {"op", "remove"},
-                        {"path", path + "/" + std::to_string(i)}
-                    }));
-                    ++i;
-                }
-
-                // add other remaining elements
-                while (i < target.size())
-                {
-                    result.push_back(
-                    {
-                        {"op", "add"},
-                        {"path", path + "/-"},
-                        {"value", target[i]}
-                    });
-                    ++i;
-                }
-
-                break;
-            }
-
-            case value_t::object:
-            {
-                // first pass: traverse this object's elements
-                for (auto it = source.cbegin(); it != source.cend(); ++it)
-                {
-                    // escape the key name to be used in a JSON patch
-                    const auto path_key = path + "/" + detail::escape(it.key());
-
-                    if (target.find(it.key()) != target.end())
-                    {
-                        // recursive call to compare object values at key it
-                        auto temp_diff = diff(it.value(), target[it.key()], path_key);
-                        result.insert(result.end(), temp_diff.begin(), temp_diff.end());
-                    }
-                    else
-                    {
-                        // found a key that is not in o -> remove it
-                        result.push_back(object(
-                        {
-                            {"op", "remove"}, {"path", path_key}
-                        }));
-                    }
-                }
-
-                // second pass: traverse other object's elements
-                for (auto it = target.cbegin(); it != target.cend(); ++it)
-                {
-                    if (source.find(it.key()) == source.end())
-                    {
-                        // found a key that is not in this -> add it
-                        const auto path_key = path + "/" + detail::escape(it.key());
-                        result.push_back(
-                        {
-                            {"op", "add"}, {"path", path_key},
-                            {"value", it.value()}
-                        });
-                    }
-                }
-
-                break;
-            }
-
-            case value_t::null:
-            case value_t::string:
-            case value_t::boolean:
-            case value_t::number_integer:
-            case value_t::number_unsigned:
-            case value_t::number_float:
-            case value_t::binary:
-            case value_t::discarded:
-            default:
-            {
-                // both primitive type: replace value
-                result.push_back(
-                {
-                    {"op", "replace"}, {"path", path}, {"value", target}
-                });
-                break;
-            }
-        }
-
-        return result;
-    }
-
-    /// @}
-
-    ////////////////////////////////
-    // JSON Merge Patch functions //
-    ////////////////////////////////
-
-    /// @name JSON Merge Patch functions
-    /// @{
-
-    /// @brief applies a JSON Merge Patch
-    /// @sa https://json.nlohmann.me/api/basic_json/merge_patch/
-    void merge_patch(const basic_json& apply_patch)
-    {
-        if (apply_patch.is_object())
-        {
-            if (!is_object())
-            {
-                *this = object();
-            }
-            for (auto it = apply_patch.begin(); it != apply_patch.end(); ++it)
-            {
-                if (it.value().is_null())
-                {
-                    erase(it.key());
-                }
-                else
-                {
-                    operator[](it.key()).merge_patch(it.value());
-                }
-            }
-        }
-        else
-        {
-            *this = apply_patch;
-        }
-    }
-
-    /// @}
-};
-
-/// @brief user-defined to_string function for JSON values
-/// @sa https://json.nlohmann.me/api/basic_json/to_string/
-NLOHMANN_BASIC_JSON_TPL_DECLARATION
-std::string to_string(const NLOHMANN_BASIC_JSON_TPL& j)
-{
-    return j.dump();
-}
-
-} // namespace nlohmann
-
-///////////////////////
-// nonmember support //
-///////////////////////
-
-namespace std // NOLINT(cert-dcl58-cpp)
-{
-
-/// @brief hash value for JSON objects
-/// @sa https://json.nlohmann.me/api/basic_json/std_hash/
-NLOHMANN_BASIC_JSON_TPL_DECLARATION
-struct hash<nlohmann::NLOHMANN_BASIC_JSON_TPL>
-{
-    std::size_t operator()(const nlohmann::NLOHMANN_BASIC_JSON_TPL& j) const
-    {
-        return nlohmann::detail::hash(j);
-    }
-};
-
-// specialization for std::less<value_t>
-template<>
-struct less< ::nlohmann::detail::value_t> // do not remove the space after '<', see https://github.com/nlohmann/json/pull/679
-{
-    /*!
-    @brief compare two value_t enum values
-    @since version 3.0.0
-    */
-    bool operator()(nlohmann::detail::value_t lhs,
-                    nlohmann::detail::value_t rhs) const noexcept
-    {
-        return nlohmann::detail::operator<(lhs, rhs);
-    }
-};
-
-// C++20 prohibit function specialization in the std namespace.
-#ifndef JSON_HAS_CPP_20
-
-/// @brief exchanges the values of two JSON objects
-/// @sa https://json.nlohmann.me/api/basic_json/std_swap/
-NLOHMANN_BASIC_JSON_TPL_DECLARATION
-inline void swap(nlohmann::NLOHMANN_BASIC_JSON_TPL& j1, nlohmann::NLOHMANN_BASIC_JSON_TPL& j2) noexcept(  // NOLINT(readability-inconsistent-declaration-parameter-name)
-    is_nothrow_move_constructible<nlohmann::NLOHMANN_BASIC_JSON_TPL>::value&&                          // NOLINT(misc-redundant-expression)
-    is_nothrow_move_assignable<nlohmann::NLOHMANN_BASIC_JSON_TPL>::value)
-{
-    j1.swap(j2);
-}
-
-#endif
-
-} // namespace std
-
-/// @brief user-defined string literal for JSON values
-/// @sa https://json.nlohmann.me/api/basic_json/operator_literal_json/
-JSON_HEDLEY_NON_NULL(1)
-inline nlohmann::json operator "" _json(const char* s, std::size_t n)
-{
-    return nlohmann::json::parse(s, s + n);
-}
-
-/// @brief user-defined string literal for JSON pointer
-/// @sa https://json.nlohmann.me/api/basic_json/operator_literal_json_pointer/
-JSON_HEDLEY_NON_NULL(1)
-inline nlohmann::json::json_pointer operator "" _json_pointer(const char* s, std::size_t n)
-{
-    return nlohmann::json::json_pointer(std::string(s, n));
-}
-
-// #include <nlohmann/detail/macro_unscope.hpp>
-
-
-// restore clang diagnostic settings
-#if defined(__clang__)
-    #pragma clang diagnostic pop
-#endif
-
-// clean up
-#undef JSON_ASSERT
-#undef JSON_INTERNAL_CATCH
-#undef JSON_CATCH
-#undef JSON_THROW
-#undef JSON_TRY
-#undef JSON_PRIVATE_UNLESS_TESTED
-#undef JSON_HAS_CPP_11
-#undef JSON_HAS_CPP_14
-#undef JSON_HAS_CPP_17
-#undef JSON_HAS_CPP_20
-#undef JSON_HAS_FILESYSTEM
-#undef JSON_HAS_EXPERIMENTAL_FILESYSTEM
-#undef NLOHMANN_BASIC_JSON_TPL_DECLARATION
-#undef NLOHMANN_BASIC_JSON_TPL
-#undef JSON_EXPLICIT
-#undef NLOHMANN_CAN_CALL_STD_FUNC_IMPL
-
-// #include <nlohmann/thirdparty/hedley/hedley_undef.hpp>
-
-
-#undef JSON_HEDLEY_ALWAYS_INLINE
-#undef JSON_HEDLEY_ARM_VERSION
-#undef JSON_HEDLEY_ARM_VERSION_CHECK
-#undef JSON_HEDLEY_ARRAY_PARAM
-#undef JSON_HEDLEY_ASSUME
-#undef JSON_HEDLEY_BEGIN_C_DECLS
-#undef JSON_HEDLEY_CLANG_HAS_ATTRIBUTE
-#undef JSON_HEDLEY_CLANG_HAS_BUILTIN
-#undef JSON_HEDLEY_CLANG_HAS_CPP_ATTRIBUTE
-#undef JSON_HEDLEY_CLANG_HAS_DECLSPEC_DECLSPEC_ATTRIBUTE
-#undef JSON_HEDLEY_CLANG_HAS_EXTENSION
-#undef JSON_HEDLEY_CLANG_HAS_FEATURE
-#undef JSON_HEDLEY_CLANG_HAS_WARNING
-#undef JSON_HEDLEY_COMPCERT_VERSION
-#undef JSON_HEDLEY_COMPCERT_VERSION_CHECK
-#undef JSON_HEDLEY_CONCAT
-#undef JSON_HEDLEY_CONCAT3
-#undef JSON_HEDLEY_CONCAT3_EX
-#undef JSON_HEDLEY_CONCAT_EX
-#undef JSON_HEDLEY_CONST
-#undef JSON_HEDLEY_CONSTEXPR
-#undef JSON_HEDLEY_CONST_CAST
-#undef JSON_HEDLEY_CPP_CAST
-#undef JSON_HEDLEY_CRAY_VERSION
-#undef JSON_HEDLEY_CRAY_VERSION_CHECK
-#undef JSON_HEDLEY_C_DECL
-#undef JSON_HEDLEY_DEPRECATED
-#undef JSON_HEDLEY_DEPRECATED_FOR
-#undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL
-#undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_
-#undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED
-#undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES
-#undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS
-#undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION
-#undef JSON_HEDLEY_DIAGNOSTIC_POP
-#undef JSON_HEDLEY_DIAGNOSTIC_PUSH
-#undef JSON_HEDLEY_DMC_VERSION
-#undef JSON_HEDLEY_DMC_VERSION_CHECK
-#undef JSON_HEDLEY_EMPTY_BASES
-#undef JSON_HEDLEY_EMSCRIPTEN_VERSION
-#undef JSON_HEDLEY_EMSCRIPTEN_VERSION_CHECK
-#undef JSON_HEDLEY_END_C_DECLS
-#undef JSON_HEDLEY_FLAGS
-#undef JSON_HEDLEY_FLAGS_CAST
-#undef JSON_HEDLEY_GCC_HAS_ATTRIBUTE
-#undef JSON_HEDLEY_GCC_HAS_BUILTIN
-#undef JSON_HEDLEY_GCC_HAS_CPP_ATTRIBUTE
-#undef JSON_HEDLEY_GCC_HAS_DECLSPEC_ATTRIBUTE
-#undef JSON_HEDLEY_GCC_HAS_EXTENSION
-#undef JSON_HEDLEY_GCC_HAS_FEATURE
-#undef JSON_HEDLEY_GCC_HAS_WARNING
-#undef JSON_HEDLEY_GCC_NOT_CLANG_VERSION_CHECK
-#undef JSON_HEDLEY_GCC_VERSION
-#undef JSON_HEDLEY_GCC_VERSION_CHECK
-#undef JSON_HEDLEY_GNUC_HAS_ATTRIBUTE
-#undef JSON_HEDLEY_GNUC_HAS_BUILTIN
-#undef JSON_HEDLEY_GNUC_HAS_CPP_ATTRIBUTE
-#undef JSON_HEDLEY_GNUC_HAS_DECLSPEC_ATTRIBUTE
-#undef JSON_HEDLEY_GNUC_HAS_EXTENSION
-#undef JSON_HEDLEY_GNUC_HAS_FEATURE
-#undef JSON_HEDLEY_GNUC_HAS_WARNING
-#undef JSON_HEDLEY_GNUC_VERSION
-#undef JSON_HEDLEY_GNUC_VERSION_CHECK
-#undef JSON_HEDLEY_HAS_ATTRIBUTE
-#undef JSON_HEDLEY_HAS_BUILTIN
-#undef JSON_HEDLEY_HAS_CPP_ATTRIBUTE
-#undef JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS
-#undef JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE
-#undef JSON_HEDLEY_HAS_EXTENSION
-#undef JSON_HEDLEY_HAS_FEATURE
-#undef JSON_HEDLEY_HAS_WARNING
-#undef JSON_HEDLEY_IAR_VERSION
-#undef JSON_HEDLEY_IAR_VERSION_CHECK
-#undef JSON_HEDLEY_IBM_VERSION
-#undef JSON_HEDLEY_IBM_VERSION_CHECK
-#undef JSON_HEDLEY_IMPORT
-#undef JSON_HEDLEY_INLINE
-#undef JSON_HEDLEY_INTEL_CL_VERSION
-#undef JSON_HEDLEY_INTEL_CL_VERSION_CHECK
-#undef JSON_HEDLEY_INTEL_VERSION
-#undef JSON_HEDLEY_INTEL_VERSION_CHECK
-#undef JSON_HEDLEY_IS_CONSTANT
-#undef JSON_HEDLEY_IS_CONSTEXPR_
-#undef JSON_HEDLEY_LIKELY
-#undef JSON_HEDLEY_MALLOC
-#undef JSON_HEDLEY_MCST_LCC_VERSION
-#undef JSON_HEDLEY_MCST_LCC_VERSION_CHECK
-#undef JSON_HEDLEY_MESSAGE
-#undef JSON_HEDLEY_MSVC_VERSION
-#undef JSON_HEDLEY_MSVC_VERSION_CHECK
-#undef JSON_HEDLEY_NEVER_INLINE
-#undef JSON_HEDLEY_NON_NULL
-#undef JSON_HEDLEY_NO_ESCAPE
-#undef JSON_HEDLEY_NO_RETURN
-#undef JSON_HEDLEY_NO_THROW
-#undef JSON_HEDLEY_NULL
-#undef JSON_HEDLEY_PELLES_VERSION
-#undef JSON_HEDLEY_PELLES_VERSION_CHECK
-#undef JSON_HEDLEY_PGI_VERSION
-#undef JSON_HEDLEY_PGI_VERSION_CHECK
-#undef JSON_HEDLEY_PREDICT
-#undef JSON_HEDLEY_PRINTF_FORMAT
-#undef JSON_HEDLEY_PRIVATE
-#undef JSON_HEDLEY_PUBLIC
-#undef JSON_HEDLEY_PURE
-#undef JSON_HEDLEY_REINTERPRET_CAST
-#undef JSON_HEDLEY_REQUIRE
-#undef JSON_HEDLEY_REQUIRE_CONSTEXPR
-#undef JSON_HEDLEY_REQUIRE_MSG
-#undef JSON_HEDLEY_RESTRICT
-#undef JSON_HEDLEY_RETURNS_NON_NULL
-#undef JSON_HEDLEY_SENTINEL
-#undef JSON_HEDLEY_STATIC_ASSERT
-#undef JSON_HEDLEY_STATIC_CAST
-#undef JSON_HEDLEY_STRINGIFY
-#undef JSON_HEDLEY_STRINGIFY_EX
-#undef JSON_HEDLEY_SUNPRO_VERSION
-#undef JSON_HEDLEY_SUNPRO_VERSION_CHECK
-#undef JSON_HEDLEY_TINYC_VERSION
-#undef JSON_HEDLEY_TINYC_VERSION_CHECK
-#undef JSON_HEDLEY_TI_ARMCL_VERSION
-#undef JSON_HEDLEY_TI_ARMCL_VERSION_CHECK
-#undef JSON_HEDLEY_TI_CL2000_VERSION
-#undef JSON_HEDLEY_TI_CL2000_VERSION_CHECK
-#undef JSON_HEDLEY_TI_CL430_VERSION
-#undef JSON_HEDLEY_TI_CL430_VERSION_CHECK
-#undef JSON_HEDLEY_TI_CL6X_VERSION
-#undef JSON_HEDLEY_TI_CL6X_VERSION_CHECK
-#undef JSON_HEDLEY_TI_CL7X_VERSION
-#undef JSON_HEDLEY_TI_CL7X_VERSION_CHECK
-#undef JSON_HEDLEY_TI_CLPRU_VERSION
-#undef JSON_HEDLEY_TI_CLPRU_VERSION_CHECK
-#undef JSON_HEDLEY_TI_VERSION
-#undef JSON_HEDLEY_TI_VERSION_CHECK
-#undef JSON_HEDLEY_UNAVAILABLE
-#undef JSON_HEDLEY_UNLIKELY
-#undef JSON_HEDLEY_UNPREDICTABLE
-#undef JSON_HEDLEY_UNREACHABLE
-#undef JSON_HEDLEY_UNREACHABLE_RETURN
-#undef JSON_HEDLEY_VERSION
-#undef JSON_HEDLEY_VERSION_DECODE_MAJOR
-#undef JSON_HEDLEY_VERSION_DECODE_MINOR
-#undef JSON_HEDLEY_VERSION_DECODE_REVISION
-#undef JSON_HEDLEY_VERSION_ENCODE
-#undef JSON_HEDLEY_WARNING
-#undef JSON_HEDLEY_WARN_UNUSED_RESULT
-#undef JSON_HEDLEY_WARN_UNUSED_RESULT_MSG
-#undef JSON_HEDLEY_FALL_THROUGH
-
-
-
-#endif  // INCLUDE_NLOHMANN_JSON_HPP_
diff --git a/3rdParty/nlohmann/json_fwd.hpp b/3rdParty/nlohmann/json_fwd.hpp
deleted file mode 100644
index 2d5ba384be..0000000000
--- a/3rdParty/nlohmann/json_fwd.hpp
+++ /dev/null
@@ -1,64 +0,0 @@
-#ifndef INCLUDE_NLOHMANN_JSON_FWD_HPP_
-#define INCLUDE_NLOHMANN_JSON_FWD_HPP_
-
-#include <cstdint> // int64_t, uint64_t
-#include <map> // map
-#include <memory> // allocator
-#include <string> // string
-#include <vector> // vector
-
-/*!
-@brief namespace for Niels Lohmann
-@see https://github.com/nlohmann
-@since version 1.0.0
-*/
-namespace nlohmann
-{
-/*!
-@brief default JSONSerializer template argument
-
-This serializer ignores the template arguments and uses ADL
-([argument-dependent lookup](https://en.cppreference.com/w/cpp/language/adl))
-for serialization.
-*/
-template<typename T = void, typename SFINAE = void>
-struct adl_serializer;
-
-/// a class to store JSON values
-/// @sa https://json.nlohmann.me/api/basic_json/
-template<template<typename U, typename V, typename... Args> class ObjectType =
-         std::map,
-         template<typename U, typename... Args> class ArrayType = std::vector,
-         class StringType = std::string, class BooleanType = bool,
-         class NumberIntegerType = std::int64_t,
-         class NumberUnsignedType = std::uint64_t,
-         class NumberFloatType = double,
-         template<typename U> class AllocatorType = std::allocator,
-         template<typename T, typename SFINAE = void> class JSONSerializer =
-         adl_serializer,
-         class BinaryType = std::vector<std::uint8_t>>
-class basic_json;
-
-/// @brief JSON Pointer defines a string syntax for identifying a specific value within a JSON document
-/// @sa https://json.nlohmann.me/api/json_pointer/
-template<typename BasicJsonType>
-class json_pointer;
-
-/*!
-@brief default specialization
-@sa https://json.nlohmann.me/api/json/
-*/
-using json = basic_json<>;
-
-/// @brief a minimal map-like container that preserves insertion order
-/// @sa https://json.nlohmann.me/api/ordered_map/
-template<class Key, class T, class IgnoredLess, class Allocator>
-struct ordered_map;
-
-/// @brief specialization that maintains the insertion order of object keys
-/// @sa https://json.nlohmann.me/api/ordered_json/
-using ordered_json = basic_json<nlohmann::ordered_map>;
-
-}  // namespace nlohmann
-
-#endif  // INCLUDE_NLOHMANN_JSON_FWD_HPP_
diff --git a/3rdParty/opencv2/calib3d.hpp b/3rdParty/opencv-4.12.0/opencv2/calib3d.hpp
similarity index 86%
rename from 3rdParty/opencv2/calib3d.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/calib3d.hpp
index 4c125d7345..e750c80676 100644
--- a/3rdParty/opencv2/calib3d.hpp
+++ b/3rdParty/opencv-4.12.0/opencv2/calib3d.hpp
@@ -48,6 +48,7 @@
 #include "opencv2/core/types.hpp"
 #include "opencv2/features2d.hpp"
 #include "opencv2/core/affine.hpp"
+#include "opencv2/core/utils/logger.hpp"
 
 /**
   @defgroup calib3d Camera Calibration and 3D Reconstruction
@@ -382,6 +383,110 @@ R & t \\
 0 & 1
 \end{bmatrix} P_{h_0}.\f]
 
+<B> Homogeneous Transformations, Object frame / Camera frame </B><br>
+Change of basis or computing the 3D coordinates from one frame to another frame can be achieved easily using
+the following notation:
+
+\f[
+\mathbf{X}_c = \hspace{0.2em}
+{}^{c}\mathbf{T}_o \hspace{0.2em} \mathbf{X}_o
+\f]
+
+\f[
+\begin{bmatrix}
+X_c \\
+Y_c \\
+Z_c \\
+1
+\end{bmatrix} =
+\begin{bmatrix}
+{}^{c}\mathbf{R}_o & {}^{c}\mathbf{t}_o \\
+0_{1 \times 3} & 1
+\end{bmatrix}
+\begin{bmatrix}
+X_o \\
+Y_o \\
+Z_o \\
+1
+\end{bmatrix}
+\f]
+
+For a 3D points (\f$ \mathbf{X}_o \f$) expressed in the object frame, the homogeneous transformation matrix
+\f$ {}^{c}\mathbf{T}_o \f$ allows computing the corresponding coordinate (\f$ \mathbf{X}_c \f$) in the camera frame.
+This transformation matrix is composed of a 3x3 rotation matrix \f$ {}^{c}\mathbf{R}_o \f$ and a 3x1 translation vector
+\f$ {}^{c}\mathbf{t}_o \f$.
+The 3x1 translation vector \f$ {}^{c}\mathbf{t}_o \f$ is the position of the object frame in the camera frame and the
+3x3 rotation matrix \f$ {}^{c}\mathbf{R}_o \f$ the orientation of the object frame in the camera frame.
+
+With this simple notation, it is easy to chain the transformations. For instance, to compute the 3D coordinates of a point
+expressed in the object frame in the world frame can be done with:
+
+\f[
+\mathbf{X}_w = \hspace{0.2em}
+{}^{w}\mathbf{T}_c \hspace{0.2em} {}^{c}\mathbf{T}_o \hspace{0.2em}
+\mathbf{X}_o =
+{}^{w}\mathbf{T}_o \hspace{0.2em} \mathbf{X}_o
+\f]
+
+Similarly, computing the inverse transformation can be done with:
+
+\f[
+\mathbf{X}_o = \hspace{0.2em}
+{}^{o}\mathbf{T}_c \hspace{0.2em} \mathbf{X}_c =
+\left( {}^{c}\mathbf{T}_o \right)^{-1} \hspace{0.2em} \mathbf{X}_c
+\f]
+
+The inverse of an homogeneous transformation matrix is then:
+
+\f[
+{}^{o}\mathbf{T}_c = \left( {}^{c}\mathbf{T}_o \right)^{-1} =
+\begin{bmatrix}
+{}^{c}\mathbf{R}^{\top}_o & - \hspace{0.2em} {}^{c}\mathbf{R}^{\top}_o \hspace{0.2em} {}^{c}\mathbf{t}_o \\
+0_{1 \times 3} & 1
+\end{bmatrix}
+\f]
+
+One can note that the inverse of a 3x3 rotation matrix is directly its matrix transpose.
+
+![Perspective projection, from object to camera frame](pics/pinhole_homogeneous_transformation.png)
+
+This figure summarizes the whole process. The object pose returned for instance by the @ref solvePnP function
+or pose from fiducial marker detection is this \f$ {}^{c}\mathbf{T}_o \f$ transformation.
+
+The camera intrinsic matrix \f$ \mathbf{K} \f$ allows projecting the 3D point expressed in the camera frame onto the image plane
+assuming a perspective projection model (pinhole camera model). Image coordinates extracted from classical image processing functions
+assume a (u,v) top-left coordinates frame.
+
+\note
+- for an online video course on this topic, see for instance:
+  - ["3.3.1. Homogeneous Transformation Matrices", Modern Robotics, Kevin M. Lynch and Frank C. Park](https://modernrobotics.northwestern.edu/nu-gm-book-resource/3-3-1-homogeneous-transformation-matrices/)
+- the 3x3 rotation matrix is composed of 9 values but describes a 3 dof transformation
+- some additional properties of the 3x3 rotation matrix are:
+  - \f$ \mathrm{det} \left( \mathbf{R} \right) = 1 \f$
+  - \f$ \mathbf{R} \mathbf{R}^{\top} = \mathbf{R}^{\top} \mathbf{R} = \mathrm{I}_{3 \times 3} \f$
+  - interpolating rotation can be done using the [Slerp (spherical linear interpolation)](https://en.wikipedia.org/wiki/Slerp) method
+- quick conversions between the different rotation formalisms can be done using this [online tool](https://www.andre-gaschler.com/rotationconverter/)
+
+<B> Intrinsic parameters from camera lens specifications </B><br>
+When dealing with industrial cameras, the camera intrinsic matrix or more precisely \f$ \left(f_x, f_y \right) \f$
+can be deduced, approximated from the camera specifications:
+
+\f[
+f_x = \frac{f_{\text{mm}}}{\text{pixel_size_in_mm}} = \frac{f_{\text{mm}}}{\text{sensor_size_in_mm} / \text{nb_pixels}}
+\f]
+
+In a same way, the physical focal length can be deduced from the angular field of view:
+
+\f[
+f_{\text{mm}} = \frac{\text{sensor_size_in_mm}}{2 \times \tan{\frac{\text{fov}}{2}}}
+\f]
+
+This latter conversion can be useful when using a rendering software to mimic a physical camera device.
+
+@note
+    -    See also #calibrationMatrixValues
+
+<B> Additional references, notes </B><br>
 @note
     -   Many functions in this module take a camera intrinsic matrix as an input parameter. Although all
         functions assume the same structure of this parameter, they may name it differently. The
@@ -411,11 +516,11 @@ R & t \\
     where R is the rotation matrix corresponding to the rotation vector om: R = rodrigues(om); call x, y
     and z the 3 coordinates of Xc:
 
-    \f[x = Xc_1 \\ y = Xc_2 \\ z = Xc_3\f]
+    \f[\begin{array}{l} x = Xc_1 \\ y = Xc_2 \\ z = Xc_3 \end{array} \f]
 
     The pinhole projection coordinates of P is [a; b] where
 
-    \f[a = x / z \ and \ b = y / z \\ r^2 = a^2 + b^2 \\ \theta = atan(r)\f]
+    \f[\begin{array}{l} a = x / z \ and \ b = y / z \\ r^2 = a^2 + b^2 \\ \theta = atan(r) \end{array} \f]
 
     Fisheye distortion:
 
@@ -423,18 +528,16 @@ R & t \\
 
     The distorted point coordinates are [x'; y'] where
 
-    \f[x' = (\theta_d / r) a \\ y' = (\theta_d / r) b \f]
+    \f[\begin{array}{l} x' = (\theta_d / r) a \\ y' = (\theta_d / r) b \end{array} \f]
 
     Finally, conversion into pixel coordinates: The final pixel coordinates vector [u; v] where:
 
-    \f[u = f_x (x' + \alpha y') + c_x \\
-    v = f_y y' + c_y\f]
+    \f[\begin{array}{l} u = f_x (x' + \alpha y') + c_x \\
+    v = f_y y' + c_y \end{array} \f]
 
     Summary:
     Generic camera model @cite Kannala2006 with perspective projection and without distortion correction
 
-    @defgroup calib3d_c C API
-
   @}
  */
 
@@ -490,7 +593,8 @@ enum { CALIB_CB_ADAPTIVE_THRESH = 1,
        CALIB_CB_EXHAUSTIVE      = 16,
        CALIB_CB_ACCURACY        = 32,
        CALIB_CB_LARGER          = 64,
-       CALIB_CB_MARKER          = 128
+       CALIB_CB_MARKER          = 128,
+       CALIB_CB_PLAIN           = 256
      };
 
 enum { CALIB_CB_SYMMETRIC_GRID  = 1,
@@ -548,12 +652,13 @@ enum RobotWorldHandEyeCalibrationMethod
     CALIB_ROBOT_WORLD_HAND_EYE_LI   = 1  //!< Simultaneous robot-world and hand-eye calibration using dual-quaternions and kronecker product @cite Li2010SimultaneousRA
 };
 
-enum SamplingMethod { SAMPLING_UNIFORM, SAMPLING_PROGRESSIVE_NAPSAC, SAMPLING_NAPSAC,
-        SAMPLING_PROSAC };
-enum LocalOptimMethod {LOCAL_OPTIM_NULL, LOCAL_OPTIM_INNER_LO, LOCAL_OPTIM_INNER_AND_ITER_LO,
-        LOCAL_OPTIM_GC, LOCAL_OPTIM_SIGMA};
-enum ScoreMethod {SCORE_METHOD_RANSAC, SCORE_METHOD_MSAC, SCORE_METHOD_MAGSAC, SCORE_METHOD_LMEDS};
-enum NeighborSearchMethod { NEIGH_FLANN_KNN, NEIGH_GRID, NEIGH_FLANN_RADIUS };
+enum SamplingMethod { SAMPLING_UNIFORM=0, SAMPLING_PROGRESSIVE_NAPSAC=1, SAMPLING_NAPSAC=2,
+        SAMPLING_PROSAC=3 };
+enum LocalOptimMethod {LOCAL_OPTIM_NULL=0, LOCAL_OPTIM_INNER_LO=1, LOCAL_OPTIM_INNER_AND_ITER_LO=2,
+        LOCAL_OPTIM_GC=3, LOCAL_OPTIM_SIGMA=4};
+enum ScoreMethod {SCORE_METHOD_RANSAC=0, SCORE_METHOD_MSAC=1, SCORE_METHOD_MAGSAC=2, SCORE_METHOD_LMEDS=3};
+enum NeighborSearchMethod { NEIGH_FLANN_KNN=0, NEIGH_GRID=1, NEIGH_FLANN_RADIUS=2 };
+enum PolishingMethod { NONE_POLISHER=0, LSQ_POLISHER=1, MAGSAC=2, COV_POLISHER=3 };
 
 struct CV_EXPORTS_W_SIMPLE UsacParams
 { // in alphabetical order
@@ -569,6 +674,8 @@ struct CV_EXPORTS_W_SIMPLE UsacParams
     CV_PROP_RW SamplingMethod sampler;
     CV_PROP_RW ScoreMethod score;
     CV_PROP_RW double threshold;
+    CV_PROP_RW PolishingMethod final_polisher;
+    CV_PROP_RW int final_polisher_iterations;
 };
 
 /** @brief Converts a rotation matrix to a rotation vector or vice versa.
@@ -619,7 +726,7 @@ class CV_EXPORTS LMSolver : public Algorithm
 
          @param param the current vector of parameters
          @param err output vector of errors: err_i = actual_f_i - ideal_f_i
-         @param J output Jacobian: J_ij = d(err_i)/d(param_j)
+         @param J output Jacobian: J_ij = d(ideal_f_i)/d(param_j)
 
          when J=noArray(), it means that it does not need to be computed.
          Dimensionality of error vector and param vector can be different.
@@ -685,7 +792,7 @@ a vector\<Point2f\> .
 -   @ref RHO - PROSAC-based robust method
 @param ransacReprojThreshold Maximum allowed reprojection error to treat a point pair as an inlier
 (used in the RANSAC and RHO methods only). That is, if
-\f[\| \texttt{dstPoints} _i -  \texttt{convertPointsHomogeneous} ( \texttt{H} * \texttt{srcPoints} _i) \|_2  >  \texttt{ransacReprojThreshold}\f]
+\f[\| \texttt{dstPoints} _i -  \texttt{convertPointsHomogeneous} ( \texttt{H} \cdot \texttt{srcPoints} _i) \|_2  >  \texttt{ransacReprojThreshold}\f]
 then the point \f$i\f$ is considered as an outlier. If srcPoints and dstPoints are measured in pixels,
 it usually makes sense to set this parameter somewhere in the range of 1 to 10.
 @param mask Optional output mask set by a robust method ( RANSAC or LMeDS ). Note that the input
@@ -724,8 +831,8 @@ correctly only when there are more than 50% of inliers. Finally, if there are no
 noise is rather small, use the default method (method=0).
 
 The function is used to find initial intrinsic and extrinsic matrices. Homography matrix is
-determined up to a scale. Thus, it is normalized so that \f$h_{33}=1\f$. Note that whenever an \f$H\f$ matrix
-cannot be estimated, an empty one will be returned.
+determined up to a scale. If \f$h_{33}\f$ is non-zero, the matrix is normalized so that \f$h_{33}=1\f$.
+@note Whenever an \f$H\f$ matrix cannot be estimated, an empty one will be returned.
 
 @sa
 getAffineTransform, estimateAffine2D, estimateAffinePartial2D, getPerspectiveTransform, warpPerspective,
@@ -760,7 +867,7 @@ and a rotation matrix.
 It optionally returns three rotation matrices, one for each axis, and the three Euler angles in
 degrees (as the return value) that could be used in OpenGL. Note, there is always more than one
 sequence of rotations about the three principal axes that results in the same orientation of an
-object, e.g. see @cite Slabaugh . Returned tree rotation matrices and corresponding three Euler angles
+object, e.g. see @cite Slabaugh . Returned three rotation matrices and corresponding three Euler angles
 are only one of the possible solutions.
  */
 CV_EXPORTS_W Vec3d RQDecomp3x3( InputArray src, OutputArray mtxR, OutputArray mtxQ,
@@ -786,9 +893,9 @@ matrix and the position of a camera.
 It optionally returns three rotation matrices, one for each axis, and three Euler angles that could
 be used in OpenGL. Note, there is always more than one sequence of rotations about the three
 principal axes that results in the same orientation of an object, e.g. see @cite Slabaugh . Returned
-tree rotation matrices and corresponding three Euler angles are only one of the possible solutions.
+three rotation matrices and corresponding three Euler angles are only one of the possible solutions.
 
-The function is based on RQDecomp3x3 .
+The function is based on #RQDecomp3x3 .
  */
 CV_EXPORTS_W void decomposeProjectionMatrix( InputArray projMatrix, OutputArray cameraMatrix,
                                              OutputArray rotMatrix, OutputArray transVect,
@@ -834,10 +941,10 @@ The functions compute:
 \f[\begin{array}{l} \texttt{rvec3} =  \mathrm{rodrigues} ^{-1} \left ( \mathrm{rodrigues} ( \texttt{rvec2} )  \cdot \mathrm{rodrigues} ( \texttt{rvec1} ) \right )  \\ \texttt{tvec3} =  \mathrm{rodrigues} ( \texttt{rvec2} )  \cdot \texttt{tvec1} +  \texttt{tvec2} \end{array} ,\f]
 
 where \f$\mathrm{rodrigues}\f$ denotes a rotation vector to a rotation matrix transformation, and
-\f$\mathrm{rodrigues}^{-1}\f$ denotes the inverse transformation. See Rodrigues for details.
+\f$\mathrm{rodrigues}^{-1}\f$ denotes the inverse transformation. See #Rodrigues for details.
 
 Also, the functions can compute the derivatives of the output vectors with regards to the input
-vectors (see matMulDeriv ). The functions are used inside #stereoCalibrate but can also be used in
+vectors (see #matMulDeriv ). The functions are used inside #stereoCalibrate but can also be used in
 your own code where Levenberg-Marquardt or another gradient-based solver is used to optimize a
 function that contains a matrix multiplication.
  */
@@ -895,7 +1002,9 @@ An example program about homography from the camera displacement
 Check @ref tutorial_homography "the corresponding tutorial" for more details
 */
 
-/** @brief Finds an object pose from 3D-2D point correspondences.
+/** @brief Finds an object pose \f$ {}^{c}\mathbf{T}_o \f$ from 3D-2D point correspondences:
+
+![Perspective projection, from object to camera frame](pics/pinhole_homogeneous_transformation.png){ width=50% }
 
 @see @ref calib3d_solvePnP
 
@@ -958,14 +1067,16 @@ More information about Perspective-n-Points is described in @ref calib3d_solvePn
          - point 1: [ squareLength / 2,  squareLength / 2, 0]
          - point 2: [ squareLength / 2, -squareLength / 2, 0]
          - point 3: [-squareLength / 2, -squareLength / 2, 0]
-    -  With @ref SOLVEPNP_SQPNP input points must be >= 3
+   -   With @ref SOLVEPNP_SQPNP input points must be >= 3
  */
 CV_EXPORTS_W bool solvePnP( InputArray objectPoints, InputArray imagePoints,
                             InputArray cameraMatrix, InputArray distCoeffs,
                             OutputArray rvec, OutputArray tvec,
                             bool useExtrinsicGuess = false, int flags = SOLVEPNP_ITERATIVE );
 
-/** @brief Finds an object pose from 3D-2D point correspondences using the RANSAC scheme.
+/** @brief Finds an object pose \f$ {}^{c}\mathbf{T}_o \f$ from 3D-2D point correspondences using the RANSAC scheme to deal with bad matches.
+
+![Perspective projection, from object to camera frame](pics/pinhole_homogeneous_transformation.png){ width=50% }
 
 @see @ref calib3d_solvePnP
 
@@ -998,8 +1109,8 @@ projections imagePoints and the projected (using @ref projectPoints ) objectPoin
 makes the function resistant to outliers.
 
 @note
-   -   An example of how to use solvePNPRansac for object detection can be found at
-        opencv_source_code/samples/cpp/tutorial_code/calib3d/real_time_pose_estimation/
+   -   An example of how to use solvePnPRansac for object detection can be found at
+        @ref tutorial_real_time_pose
    -   The default method used to estimate the camera pose for the Minimal Sample Sets step
        is #SOLVEPNP_EPNP. Exceptions are:
          - if you choose #SOLVEPNP_P3P or #SOLVEPNP_AP3P, these methods will be used.
@@ -1025,7 +1136,9 @@ CV_EXPORTS_W bool solvePnPRansac( InputArray objectPoints, InputArray imagePoint
                      OutputArray rvec, OutputArray tvec, OutputArray inliers,
                      const UsacParams &params=UsacParams());
 
-/** @brief Finds an object pose from 3 3D-2D point correspondences.
+/** @brief Finds an object pose \f$ {}^{c}\mathbf{T}_o \f$ from **3** 3D-2D point correspondences.
+
+![Perspective projection, from object to camera frame](pics/pinhole_homogeneous_transformation.png){ width=50% }
 
 @see @ref calib3d_solvePnP
 
@@ -1118,7 +1231,9 @@ CV_EXPORTS_W void solvePnPRefineVVS( InputArray objectPoints, InputArray imagePo
                                      TermCriteria criteria = TermCriteria(TermCriteria::EPS + TermCriteria::COUNT, 20, FLT_EPSILON),
                                      double VVSlambda = 1);
 
-/** @brief Finds an object pose from 3D-2D point correspondences.
+/** @brief Finds an object pose \f$ {}^{c}\mathbf{T}_o \f$ from 3D-2D point correspondences.
+
+![Perspective projection, from object to camera frame](pics/pinhole_homogeneous_transformation.png){ width=50% }
 
 @see @ref calib3d_solvePnP
 
@@ -1189,6 +1304,7 @@ More information is described in @ref calib3d_solvePnP
          - point 1: [ squareLength / 2,  squareLength / 2, 0]
          - point 2: [ squareLength / 2, -squareLength / 2, 0]
          - point 3: [-squareLength / 2, -squareLength / 2, 0]
+   -   With @ref SOLVEPNP_SQPNP input points must be >= 3
  */
 CV_EXPORTS_W int solvePnPGeneric( InputArray objectPoints, InputArray imagePoints,
                                   InputArray cameraMatrix, InputArray distCoeffs,
@@ -1206,7 +1322,7 @@ coordinate space. In the old interface all the per-view vectors are concatenated
 old interface all the per-view vectors are concatenated.
 @param imageSize Image size in pixels used to initialize the principal point.
 @param aspectRatio If it is zero or negative, both \f$f_x\f$ and \f$f_y\f$ are estimated independently.
-Otherwise, \f$f_x = f_y * \texttt{aspectRatio}\f$ .
+Otherwise, \f$f_x = f_y \cdot \texttt{aspectRatio}\f$ .
 
 The function estimates and returns an initial camera intrinsic matrix for the camera calibration process.
 Currently, the function only supports planar calibration patterns, which are patterns where each
@@ -1225,13 +1341,17 @@ CV_EXPORTS_W Mat initCameraMatrix2D( InputArrayOfArrays objectPoints,
 @param flags Various operation flags that can be zero or a combination of the following values:
 -   @ref CALIB_CB_ADAPTIVE_THRESH Use adaptive thresholding to convert the image to black
 and white, rather than a fixed threshold level (computed from the average image brightness).
--   @ref CALIB_CB_NORMALIZE_IMAGE Normalize the image gamma with equalizeHist before
+-   @ref CALIB_CB_NORMALIZE_IMAGE Normalize the image gamma with #equalizeHist before
 applying fixed or adaptive thresholding.
 -   @ref CALIB_CB_FILTER_QUADS Use additional criteria (like contour area, perimeter,
 square-like shape) to filter out false quads extracted at the contour retrieval stage.
 -   @ref CALIB_CB_FAST_CHECK Run a fast check on the image that looks for chessboard corners,
 and shortcut the call if none is found. This can drastically speed up the call in the
 degenerate condition when no chessboard is observed.
+-   @ref CALIB_CB_PLAIN All other flags are ignored. The input image is taken as is.
+No image processing is done to improve to find the checkerboard. This has the effect of speeding up the
+execution of the function but could lead to not recognizing the checkerboard if the image
+is not previously binarized in the appropriate manner.
 
 The function attempts to determine whether the input image is a view of the chessboard pattern and
 locate the internal chessboard corners. The function returns a non-zero value if all of the corners
@@ -1239,7 +1359,7 @@ are found and they are placed in a certain order (row by row, left to right in e
 Otherwise, if the function fails to find all the corners or reorder them, it returns 0. For example,
 a regular chessboard has 8 x 8 squares and 7 x 7 internal corners, that is, points where the black
 squares touch each other. The detected coordinates are approximate, and to determine their positions
-more accurately, the function calls cornerSubPix. You also may use the function cornerSubPix with
+more accurately, the function calls #cornerSubPix. You also may use the function #cornerSubPix with
 different parameters if returned coordinates are not accurate enough.
 
 Sample usage of detecting and drawing chessboard corners: :
@@ -1265,7 +1385,8 @@ the board to make the detection more robust in various environments. Otherwise,
 border and the background is dark, the outer black squares cannot be segmented properly and so the
 square grouping and ordering algorithm fails.
 
-Use gen_pattern.py (@ref tutorial_camera_calibration_pattern) to create checkerboard.
+Use the `gen_pattern.py` Python script (@ref tutorial_camera_calibration_pattern)
+to create the desired checkerboard pattern.
  */
 CV_EXPORTS_W bool findChessboardCorners( InputArray image, Size patternSize, OutputArray corners,
                                          int flags = CALIB_CB_ADAPTIVE_THRESH + CALIB_CB_NORMALIZE_IMAGE );
@@ -1323,8 +1444,9 @@ which are located on the outside of the board. The following figure illustrates
 a sample checkerboard optimized for the detection. However, any other checkerboard
 can be used as well.
 
-Use gen_pattern.py (@ref tutorial_camera_calibration_pattern) to create checkerboard.
-![Checkerboard](pics/checkerboard_radon.png)
+Use the `gen_pattern.py` Python script (@ref tutorial_camera_calibration_pattern)
+to create the corresponding checkerboard pattern:
+\image html pics/checkerboard_radon.png width=60%
  */
 CV_EXPORTS_AS(findChessboardCornersSBWithMeta)
 bool findChessboardCornersSB(InputArray image,Size patternSize, OutputArray corners,
@@ -1592,6 +1714,10 @@ The algorithm performs the following steps:
     \f$f_y\f$ (ratios of 10:1 or more)), then you are probably using patternSize=cvSize(rows,cols)
     instead of using patternSize=cvSize(cols,rows) in @ref findChessboardCorners.
 
+@note
+    The function may throw exceptions, if unsupported combination of parameters is provided or
+    the system is underconstrained.
+
 @sa
    calibrateCameraRO, findChessboardCorners, solvePnP, initCameraMatrix2D, stereoCalibrate,
    undistort
@@ -1748,6 +1874,15 @@ second camera coordinate system.
 @param T Output translation vector, see description above.
 @param E Output essential matrix.
 @param F Output fundamental matrix.
+@param rvecs Output vector of rotation vectors ( @ref Rodrigues ) estimated for each pattern view in the
+coordinate system of the first camera of the stereo pair (e.g. std::vector<cv::Mat>). More in detail, each
+i-th rotation vector together with the corresponding i-th translation vector (see the next output parameter
+description) brings the calibration pattern from the object coordinate space (in which object points are
+specified) to the camera coordinate space of the first camera of the stereo pair. In more technical terms,
+the tuple of the i-th rotation and translation vector performs a change of basis from object coordinate space
+to camera coordinate space of the first camera of the stereo pair.
+@param tvecs Output vector of translation vectors estimated for each pattern view, see parameter description
+of previous output parameter ( rvecs ).
 @param perViewErrors Output vector of the RMS re-projection error estimated for each pattern view.
 @param flags Different flags that may be zero or a combination of the following values:
 -   @ref CALIB_FIX_INTRINSIC Fix cameraMatrix? and distCoeffs? so that only R, T, E, and F
@@ -1844,8 +1979,8 @@ CV_EXPORTS_AS(stereoCalibrateExtended) double stereoCalibrate( InputArrayOfArray
                                      InputArrayOfArrays imagePoints1, InputArrayOfArrays imagePoints2,
                                      InputOutputArray cameraMatrix1, InputOutputArray distCoeffs1,
                                      InputOutputArray cameraMatrix2, InputOutputArray distCoeffs2,
-                                     Size imageSize, InputOutputArray R,InputOutputArray T, OutputArray E, OutputArray F,
-                                     OutputArray perViewErrors, int flags = CALIB_FIX_INTRINSIC,
+                                     Size imageSize, InputOutputArray R, InputOutputArray T, OutputArray E, OutputArray F,
+                                     OutputArrayOfArrays rvecs, OutputArrayOfArrays tvecs, OutputArray perViewErrors, int flags = CALIB_FIX_INTRINSIC,
                                      TermCriteria criteria = TermCriteria(TermCriteria::COUNT+TermCriteria::EPS, 30, 1e-6) );
 
 /// @overload
@@ -1857,6 +1992,15 @@ CV_EXPORTS_W double stereoCalibrate( InputArrayOfArrays objectPoints,
                                      int flags = CALIB_FIX_INTRINSIC,
                                      TermCriteria criteria = TermCriteria(TermCriteria::COUNT+TermCriteria::EPS, 30, 1e-6) );
 
+/// @overload
+CV_EXPORTS_W double stereoCalibrate( InputArrayOfArrays objectPoints,
+                                     InputArrayOfArrays imagePoints1, InputArrayOfArrays imagePoints2,
+                                     InputOutputArray cameraMatrix1, InputOutputArray distCoeffs1,
+                                     InputOutputArray cameraMatrix2, InputOutputArray distCoeffs2,
+                                     Size imageSize, InputOutputArray R, InputOutputArray T, OutputArray E, OutputArray F,
+                                     OutputArray perViewErrors, int flags = CALIB_FIX_INTRINSIC,
+                                     TermCriteria criteria = TermCriteria(TermCriteria::COUNT+TermCriteria::EPS, 30, 1e-6) );
+
 /** @brief Computes rectification transforms for each head of a calibrated stereo camera.
 
 @param cameraMatrix1 First camera intrinsic matrix.
@@ -1924,11 +2068,18 @@ coordinates. The function distinguishes the following two cases:
                      \end{bmatrix}\f]
 
     \f[\texttt{P2} = \begin{bmatrix}
-                        f & 0 & cx_2 & T_x*f \\
+                        f & 0 & cx_2 & T_x \cdot f \\
                         0 & f & cy & 0 \\
                         0 & 0 & 1 & 0
                      \end{bmatrix} ,\f]
 
+    \f[\texttt{Q} = \begin{bmatrix}
+                        1 & 0 & 0 & -cx_1 \\
+                        0 & 1 & 0 & -cy \\
+                        0 & 0 & 0 & f \\
+                        0 & 0 & -\frac{1}{T_x} & \frac{cx_1 - cx_2}{T_x}
+                    \end{bmatrix} \f]
+
     where \f$T_x\f$ is a horizontal shift between the cameras and \f$cx_1=cx_2\f$ if
     @ref CALIB_ZERO_DISPARITY is set.
 
@@ -1944,10 +2095,17 @@ coordinates. The function distinguishes the following two cases:
 
     \f[\texttt{P2} = \begin{bmatrix}
                         f & 0 & cx & 0 \\
-                        0 & f & cy_2 & T_y*f \\
+                        0 & f & cy_2 & T_y \cdot f \\
                         0 & 0 & 1 & 0
                      \end{bmatrix},\f]
 
+    \f[\texttt{Q} = \begin{bmatrix}
+                        1 & 0 & 0 & -cx \\
+                        0 & 1 & 0 & -cy_1 \\
+                        0 & 0 & 0 & f \\
+                        0 & 0 & -\frac{1}{T_y} & \frac{cy_1 - cy_2}{T_y}
+                    \end{bmatrix} \f]
+
     where \f$T_y\f$ is a vertical shift between the cameras and \f$cy_1=cy_2\f$ if
     @ref CALIB_ZERO_DISPARITY is set.
 
@@ -1983,8 +2141,8 @@ CV_EXPORTS_W void stereoRectify( InputArray cameraMatrix1, InputArray distCoeffs
 @param H2 Output rectification homography matrix for the second image.
 @param threshold Optional threshold used to filter out the outliers. If the parameter is greater
 than zero, all the point pairs that do not comply with the epipolar geometry (that is, the points
-for which \f$|\texttt{points2[i]}^T*\texttt{F}*\texttt{points1[i]}|>\texttt{threshold}\f$ ) are
-rejected prior to computing the homographies. Otherwise, all the points are considered inliers.
+for which \f$|\texttt{points2[i]}^T \cdot \texttt{F} \cdot \texttt{points1[i]}|>\texttt{threshold}\f$ )
+are rejected prior to computing the homographies. Otherwise, all the points are considered inliers.
 
 The function computes the rectification transformations without knowing intrinsic parameters of the
 cameras and their relative position in the space, which explains the suffix "uncalibrated". Another
@@ -2407,7 +2565,7 @@ the found fundamental matrix. Normally just one matrix is found. But in case of
 algorithm, the function may return up to 3 solutions ( \f$9 \times 3\f$ matrix that stores all 3
 matrices sequentially).
 
-The calculated fundamental matrix may be passed further to computeCorrespondEpilines that finds the
+The calculated fundamental matrix may be passed further to #computeCorrespondEpilines that finds the
 epipolar lines corresponding to the specified points. It can also be passed to
 #stereoRectifyUncalibrated to compute the rectification transformation. :
 @code
@@ -2450,13 +2608,13 @@ CV_EXPORTS_W Mat findFundamentalMat( InputArray points1, InputArray points2,
 
 @param points1 Array of N (N \>= 5) 2D points from the first image. The point coordinates should
 be floating-point (single or double precision).
-@param points2 Array of the second image points of the same size and format as points1 .
+@param points2 Array of the second image points of the same size and format as points1.
 @param cameraMatrix Camera intrinsic matrix \f$\cameramatrix{A}\f$ .
 Note that this function assumes that points1 and points2 are feature points from cameras with the
-same camera intrinsic matrix. If this assumption does not hold for your use case, use
-#undistortPoints with `P = cv::NoArray()` for both cameras to transform image points
-to normalized image coordinates, which are valid for the identity camera intrinsic matrix. When
-passing these coordinates, pass the identity matrix for this parameter.
+same camera intrinsic matrix. If this assumption does not hold for your use case, use another
+function overload or #undistortPoints with `P = cv::NoArray()` for both cameras to transform image
+points to normalized image coordinates, which are valid for the identity camera intrinsic matrix.
+When passing these coordinates, pass the identity matrix for this parameter.
 @param method Method for computing an essential matrix.
 -   @ref RANSAC for the RANSAC algorithm.
 -   @ref LMEDS for the LMedS algorithm.
@@ -2477,7 +2635,7 @@ This function estimates essential matrix based on the five-point algorithm solve
 
 where \f$E\f$ is an essential matrix, \f$p_1\f$ and \f$p_2\f$ are corresponding points in the first and the
 second images, respectively. The result of this function may be passed further to
-#decomposeEssentialMat or  #recoverPose to recover the relative pose between cameras.
+#decomposeEssentialMat or #recoverPose to recover the relative pose between cameras.
  */
 CV_EXPORTS_W
 Mat findEssentialMat(
@@ -2548,23 +2706,13 @@ Mat findEssentialMat(
 
 @param points1 Array of N (N \>= 5) 2D points from the first image. The point coordinates should
 be floating-point (single or double precision).
-@param points2 Array of the second image points of the same size and format as points1 .
-@param cameraMatrix1 Camera matrix \f$K = \vecthreethree{f_x}{0}{c_x}{0}{f_y}{c_y}{0}{0}{1}\f$ .
-Note that this function assumes that points1 and points2 are feature points from cameras with the
-same camera matrix. If this assumption does not hold for your use case, use
-#undistortPoints with `P = cv::NoArray()` for both cameras to transform image points
-to normalized image coordinates, which are valid for the identity camera matrix. When
-passing these coordinates, pass the identity matrix for this parameter.
-@param cameraMatrix2 Camera matrix \f$K = \vecthreethree{f_x}{0}{c_x}{0}{f_y}{c_y}{0}{0}{1}\f$ .
-Note that this function assumes that points1 and points2 are feature points from cameras with the
-same camera matrix. If this assumption does not hold for your use case, use
-#undistortPoints with `P = cv::NoArray()` for both cameras to transform image points
-to normalized image coordinates, which are valid for the identity camera matrix. When
-passing these coordinates, pass the identity matrix for this parameter.
-@param distCoeffs1 Input vector of distortion coefficients
+@param points2 Array of the second image points of the same size and format as points1.
+@param cameraMatrix1 Camera matrix for the first camera \f$K = \vecthreethree{f_x}{0}{c_x}{0}{f_y}{c_y}{0}{0}{1}\f$ .
+@param cameraMatrix2 Camera matrix for the second camera \f$K = \vecthreethree{f_x}{0}{c_x}{0}{f_y}{c_y}{0}{0}{1}\f$ .
+@param distCoeffs1 Input vector of distortion coefficients for the first camera
 \f$(k_1, k_2, p_1, p_2[, k_3[, k_4, k_5, k_6[, s_1, s_2, s_3, s_4[, \tau_x, \tau_y]]]])\f$
 of 4, 5, 8, 12 or 14 elements. If the vector is NULL/empty, the zero distortion coefficients are assumed.
-@param distCoeffs2 Input vector of distortion coefficients
+@param distCoeffs2 Input vector of distortion coefficients for the second camera
 \f$(k_1, k_2, p_1, p_2[, k_3[, k_4, k_5, k_6[, s_1, s_2, s_3, s_4[, \tau_x, \tau_y]]]])\f$
 of 4, 5, 8, 12 or 14 elements. If the vector is NULL/empty, the zero distortion coefficients are assumed.
 @param method Method for computing an essential matrix.
@@ -2692,7 +2840,7 @@ CV_EXPORTS_W int recoverPose( InputArray points1, InputArray points2,
                             InputOutputArray mask = noArray());
 
 /** @brief Recovers the relative camera rotation and the translation from an estimated essential
-matrix and the corresponding points in two images, using cheirality check. Returns the number of
+matrix and the corresponding points in two images, using chirality check. Returns the number of
 inliers that pass the check.
 
 @param E The input essential matrix.
@@ -2710,11 +2858,11 @@ described below.
 therefore is only known up to scale, i.e. t is the direction of the translation vector and has unit
 length.
 @param mask Input/output mask for inliers in points1 and points2. If it is not empty, then it marks
-inliers in points1 and points2 for then given essential matrix E. Only these inliers will be used to
-recover pose. In the output mask only inliers which pass the cheirality check.
+inliers in points1 and points2 for the given essential matrix E. Only these inliers will be used to
+recover pose. In the output mask only inliers which pass the chirality check.
 
 This function decomposes an essential matrix using @ref decomposeEssentialMat and then verifies
-possible pose hypotheses by doing cheirality check. The cheirality check means that the
+possible pose hypotheses by doing chirality check. The chirality check means that the
 triangulated 3D points should have positive depth. Some details can be found in @cite Nister03.
 
 This function can be used to process the output E and mask from @ref findEssentialMat. In this
@@ -2761,8 +2909,8 @@ length.
 are feature points from cameras with same focal length and principal point.
 @param pp principal point of the camera.
 @param mask Input/output mask for inliers in points1 and points2. If it is not empty, then it marks
-inliers in points1 and points2 for then given essential matrix E. Only these inliers will be used to
-recover pose. In the output mask only inliers which pass the cheirality check.
+inliers in points1 and points2 for the given essential matrix E. Only these inliers will be used to
+recover pose. In the output mask only inliers which pass the chirality check.
 
 This function differs from the one above that it computes camera intrinsic matrix from focal length and
 principal point:
@@ -2797,12 +2945,12 @@ length.
 @param distanceThresh threshold distance which is used to filter out far away points (i.e. infinite
 points).
 @param mask Input/output mask for inliers in points1 and points2. If it is not empty, then it marks
-inliers in points1 and points2 for then given essential matrix E. Only these inliers will be used to
-recover pose. In the output mask only inliers which pass the cheirality check.
+inliers in points1 and points2 for the given essential matrix E. Only these inliers will be used to
+recover pose. In the output mask only inliers which pass the chirality check.
 @param triangulatedPoints 3D points which were reconstructed by triangulation.
 
 This function differs from the one above that it outputs the triangulated 3D point that are used for
-the cheirality check.
+the chirality check.
  */
 CV_EXPORTS_W int recoverPose( InputArray E, InputArray points1, InputArray points2,
                             InputArray cameraMatrix, OutputArray R, OutputArray t, double distanceThresh, InputOutputArray mask = noArray(),
@@ -2870,12 +3018,12 @@ CV_EXPORTS_W void triangulatePoints( InputArray projMatr1, InputArray projMatr2,
 @param newPoints1 The optimized points1.
 @param newPoints2 The optimized points2.
 
-The function implements the Optimal Triangulation Method (see Multiple View Geometry for details).
+The function implements the Optimal Triangulation Method (see Multiple View Geometry @cite HartleyZ00 for details).
 For each given point correspondence points1[i] \<-\> points2[i], and a fundamental matrix F, it
 computes the corrected correspondences newPoints1[i] \<-\> newPoints2[i] that minimize the geometric
 error \f$d(points1[i], newPoints1[i])^2 + d(points2[i],newPoints2[i])^2\f$ (where \f$d(a,b)\f$ is the
 geometric distance between points \f$a\f$ and \f$b\f$ ) subject to the epipolar constraint
-\f$newPoints2^T * F * newPoints1 = 0\f$ .
+\f$newPoints2^T \cdot F \cdot newPoints1 = 0\f$ .
  */
 CV_EXPORTS_W void correctMatches( InputArray F, InputArray points1, InputArray points2,
                                   OutputArray newPoints1, OutputArray newPoints2 );
@@ -2939,7 +3087,7 @@ W
 x \\
 y \\
 \texttt{disparity} (x,y) \\
-z
+1
 \end{bmatrix}.\f]
 
 @sa
@@ -3230,7 +3378,7 @@ Check @ref tutorial_homography "the corresponding tutorial" for more details.
 
 This function extracts relative camera motion between two views of a planar object and returns up to
 four mathematical solution tuples of rotation, translation, and plane normal. The decomposition of
-the homography matrix H is described in detail in @cite Malis.
+the homography matrix H is described in detail in @cite Malis2007.
 
 If the homography H, induced by the plane, gives the constraint
 \f[s_i \vecthree{x'_i}{y'_i}{1} \sim H \vecthree{x_i}{y_i}{1}\f] on the source image points
@@ -3258,7 +3406,7 @@ CV_EXPORTS_W int decomposeHomographyMat(InputArray H,
 @param pointsMask optional Mat/Vector of 8u type representing the mask for the inliers as given by the #findHomography function
 
 This function is intended to filter the output of the #decomposeHomographyMat based on additional
-information as described in @cite Malis . The summary of the method: the #decomposeHomographyMat function
+information as described in @cite Malis2007 . The summary of the method: the #decomposeHomographyMat function
 returns 2 unique solutions and their "opposites" for a total of 4 solutions. If we have access to the
 sets of points visible in the camera frame before and after the homography transformation is applied,
 we can determine which are the true potential solutions and which are the opposites by verifying which
@@ -3313,52 +3461,136 @@ class CV_EXPORTS_W StereoMatcher : public Algorithm
 };
 
 
-/** @brief Class for computing stereo correspondence using the block matching algorithm, introduced and
-contributed to OpenCV by K. Konolige.
+/**
+ * @brief Class for computing stereo correspondence using the block matching algorithm, introduced and contributed to OpenCV by K. Konolige.
+ * @details This class implements a block matching algorithm for stereo correspondence, which is used to compute disparity maps from stereo image pairs. It provides methods to fine-tune parameters such as pre-filtering, texture thresholds, uniqueness ratios, and regions of interest (ROIs) to optimize performance and accuracy.
  */
 class CV_EXPORTS_W StereoBM : public StereoMatcher
 {
 public:
-    enum { PREFILTER_NORMALIZED_RESPONSE = 0,
-           PREFILTER_XSOBEL              = 1
-         };
+    /**
+     * @brief Pre-filter types for the stereo matching algorithm.
+     * @details These constants define the type of pre-filtering applied to the images before computing the disparity map.
+     * - PREFILTER_NORMALIZED_RESPONSE: Uses normalized response for pre-filtering.
+     * - PREFILTER_XSOBEL: Uses the X-Sobel operator for pre-filtering.
+     */
+    enum {
+        PREFILTER_NORMALIZED_RESPONSE = 0,  ///< Normalized response pre-filter
+        PREFILTER_XSOBEL              = 1   ///< X-Sobel pre-filter
+    };
 
+    /**
+     * @brief Gets the type of pre-filtering currently used in the algorithm.
+     * @return The current pre-filter type: 0 for PREFILTER_NORMALIZED_RESPONSE or 1 for PREFILTER_XSOBEL.
+     */
     CV_WRAP virtual int getPreFilterType() const = 0;
+
+    /**
+     * @brief Sets the type of pre-filtering used in the algorithm.
+     * @param preFilterType The type of pre-filter to use. Possible values are:
+     * - PREFILTER_NORMALIZED_RESPONSE (0): Uses normalized response for pre-filtering.
+     * - PREFILTER_XSOBEL (1): Uses the X-Sobel operator for pre-filtering.
+     * @details The pre-filter type affects how the images are prepared before computing the disparity map. Different pre-filtering methods can enhance specific image features or reduce noise, influencing the quality of the disparity map.
+     */
     CV_WRAP virtual void setPreFilterType(int preFilterType) = 0;
 
+    /**
+     * @brief Gets the current size of the pre-filter kernel.
+     * @return The current pre-filter size.
+     */
     CV_WRAP virtual int getPreFilterSize() const = 0;
+
+    /**
+     * @brief Sets the size of the pre-filter kernel.
+     * @param preFilterSize The size of the pre-filter kernel. Must be an odd integer, typically between 5 and 255.
+     * @details The pre-filter size determines the spatial extent of the pre-filtering operation, which prepares the images for disparity computation by normalizing brightness and enhancing texture. Larger sizes reduce noise but may blur details, while smaller sizes preserve details but are more susceptible to noise.
+     */
     CV_WRAP virtual void setPreFilterSize(int preFilterSize) = 0;
 
+    /**
+     * @brief Gets the current truncation value for prefiltered pixels.
+     * @return The current pre-filter cap value.
+     */
     CV_WRAP virtual int getPreFilterCap() const = 0;
+
+    /**
+     * @brief Sets the truncation value for prefiltered pixels.
+     * @param preFilterCap The truncation value. Typically in the range [1, 63].
+     * @details This value caps the output of the pre-filter to [-preFilterCap, preFilterCap], helping to reduce the impact of noise and outliers in the pre-filtered image.
+     */
     CV_WRAP virtual void setPreFilterCap(int preFilterCap) = 0;
 
+    /**
+     * @brief Gets the current texture threshold value.
+     * @return The current texture threshold.
+     */
     CV_WRAP virtual int getTextureThreshold() const = 0;
+
+    /**
+     * @brief Sets the threshold for filtering low-texture regions.
+     * @param textureThreshold The threshold value. Must be non-negative.
+     * @details This parameter filters out regions with low texture, where establishing correspondences is difficult, thus reducing noise in the disparity map. Higher values filter more aggressively but may discard valid information.
+     */
     CV_WRAP virtual void setTextureThreshold(int textureThreshold) = 0;
 
+    /**
+     * @brief Gets the current uniqueness ratio value.
+     * @return The current uniqueness ratio.
+     */
     CV_WRAP virtual int getUniquenessRatio() const = 0;
+
+    /**
+     * @brief Sets the uniqueness ratio for filtering ambiguous matches.
+     * @param uniquenessRatio The uniqueness ratio value. Typically in the range [5, 15], but can be from 0 to 100.
+     * @details This parameter ensures that the best match is sufficiently better than the next best match, reducing false positives. Higher values are stricter but may filter out valid matches in difficult regions.
+     */
     CV_WRAP virtual void setUniquenessRatio(int uniquenessRatio) = 0;
 
+    /**
+     * @brief Gets the current size of the smaller block used for texture check.
+     * @return The current smaller block size.
+     */
     CV_WRAP virtual int getSmallerBlockSize() const = 0;
+
+    /**
+     * @brief Sets the size of the smaller block used for texture check.
+     * @param blockSize The size of the smaller block. Must be an odd integer between 5 and 255.
+     * @details This parameter determines the size of the block used to compute texture variance. Smaller blocks capture finer details but are more sensitive to noise, while larger blocks are more robust but may miss fine details.
+     */
     CV_WRAP virtual void setSmallerBlockSize(int blockSize) = 0;
 
+    /**
+     * @brief Gets the current Region of Interest (ROI) for the left image.
+     * @return The current ROI for the left image.
+     */
     CV_WRAP virtual Rect getROI1() const = 0;
+
+    /**
+     * @brief Sets the Region of Interest (ROI) for the left image.
+     * @param roi1 The ROI rectangle for the left image.
+     * @details By setting the ROI, the stereo matching computation is limited to the specified region, improving performance and potentially accuracy by focusing on relevant parts of the image.
+     */
     CV_WRAP virtual void setROI1(Rect roi1) = 0;
 
+    /**
+     * @brief Gets the current Region of Interest (ROI) for the right image.
+     * @return The current ROI for the right image.
+     */
     CV_WRAP virtual Rect getROI2() const = 0;
-    CV_WRAP virtual void setROI2(Rect roi2) = 0;
 
-    /** @brief Creates StereoBM object
-
-    @param numDisparities the disparity search range. For each pixel algorithm will find the best
-    disparity from 0 (default minimum disparity) to numDisparities. The search range can then be
-    shifted by changing the minimum disparity.
-    @param blockSize the linear size of the blocks compared by the algorithm. The size should be odd
-    (as the block is centered at the current pixel). Larger block size implies smoother, though less
-    accurate disparity map. Smaller block size gives more detailed disparity map, but there is higher
-    chance for algorithm to find a wrong correspondence.
+    /**
+     * @brief Sets the Region of Interest (ROI) for the right image.
+     * @param roi2 The ROI rectangle for the right image.
+     * @details Similar to setROI1, this limits the computation to the specified region in the right image.
+     */
+    CV_WRAP virtual void setROI2(Rect roi2) = 0;
 
-    The function create StereoBM object. You can then call StereoBM::compute() to compute disparity for
-    a specific stereo pair.
+    /**
+     * @brief Creates StereoBM object
+     * @param numDisparities The disparity search range. For each pixel, the algorithm will find the best disparity from 0 (default minimum disparity) to numDisparities. The search range can be shifted by changing the minimum disparity.
+     * @param blockSize The linear size of the blocks compared by the algorithm. The size should be odd (as the block is centered at the current pixel). Larger block size implies smoother, though less accurate disparity map. Smaller block size gives more detailed disparity map, but there is a higher chance for the algorithm to find a wrong correspondence.
+     * @return A pointer to the created StereoBM object.
+     * @details The function creates a StereoBM object. You can then call StereoBM::compute() to compute disparity for a specific stereo pair.
      */
     CV_WRAP static Ptr<StereoBM> create(int numDisparities = 0, int blockSize = 21);
 };
@@ -3548,7 +3780,7 @@ where cameraMatrix can be chosen arbitrarily.
 of 4, 5, 8, 12 or 14 elements. If the vector is NULL/empty, the zero distortion coefficients are assumed.
 @param R Optional rectification transformation in the object space (3x3 matrix). R1 or R2 ,
 computed by #stereoRectify can be passed here. If the matrix is empty, the identity transformation
-is assumed. In cvInitUndistortMap R assumed to be an identity matrix.
+is assumed. In #initUndistortRectifyMap R assumed to be an identity matrix.
 @param newCameraMatrix New camera matrix \f$A'=\vecthreethree{f_x'}{0}{c_x'}{0}{f_y'}{c_y'}{0}{0}{1}\f$.
 @param size Undistorted image size.
 @param m1type Type of the first output map that can be CV_32FC1, CV_32FC2 or CV_16SC2, see #convertMaps
@@ -3772,7 +4004,7 @@ namespace fisheye
     @param imagePoints Output array of image points, 2xN/Nx2 1-channel or 1xN/Nx1 2-channel, or
     vector\<Point2f\>.
     @param affine
-    @param K Camera intrinsic matrix \f$cameramatrix{K}\f$.
+    @param K Camera intrinsic matrix \f$\cameramatrix{K}\f$.
     @param D Input vector of distortion coefficients \f$\distcoeffsfisheye\f$.
     @param alpha The skew coefficient.
     @param jacobian Optional output 2Nx15 jacobian matrix of derivatives of image points with respect
@@ -3796,21 +4028,36 @@ namespace fisheye
 
     @param undistorted Array of object points, 1xN/Nx1 2-channel (or vector\<Point2f\> ), where N is
     the number of points in the view.
-    @param K Camera intrinsic matrix \f$cameramatrix{K}\f$.
+    @param K Camera intrinsic matrix \f$\cameramatrix{K}\f$.
     @param D Input vector of distortion coefficients \f$\distcoeffsfisheye\f$.
     @param alpha The skew coefficient.
     @param distorted Output array of image points, 1xN/Nx1 2-channel, or vector\<Point2f\> .
 
     Note that the function assumes the camera intrinsic matrix of the undistorted points to be identity.
-    This means if you want to distort image points you have to multiply them with \f$K^{-1}\f$.
+    This means if you want to distort image points you have to multiply them with \f$K^{-1}\f$ or
+    use another function overload.
      */
     CV_EXPORTS_W void distortPoints(InputArray undistorted, OutputArray distorted, InputArray K, InputArray D, double alpha = 0);
 
+    /** @overload
+    Overload of distortPoints function to handle cases when undistorted points are obtained with non-identity
+    camera matrix, e.g. output of #estimateNewCameraMatrixForUndistortRectify.
+    @param undistorted Array of object points, 1xN/Nx1 2-channel (or vector\<Point2f\> ), where N is
+    the number of points in the view.
+    @param Kundistorted Camera intrinsic matrix used as new camera matrix for undistortion.
+    @param K Camera intrinsic matrix \f$\cameramatrix{K}\f$.
+    @param D Input vector of distortion coefficients \f$\distcoeffsfisheye\f$.
+    @param alpha The skew coefficient.
+    @param distorted Output array of image points, 1xN/Nx1 2-channel, or vector\<Point2f\> .
+    @sa estimateNewCameraMatrixForUndistortRectify
+    */
+    CV_EXPORTS_W void distortPoints(InputArray undistorted, OutputArray distorted, InputArray Kundistorted, InputArray K, InputArray D, double alpha = 0);
+
     /** @brief Undistorts 2D points using fisheye model
 
     @param distorted Array of object points, 1xN/Nx1 2-channel (or vector\<Point2f\> ), where N is the
     number of points in the view.
-    @param K Camera intrinsic matrix \f$cameramatrix{K}\f$.
+    @param K Camera intrinsic matrix \f$\cameramatrix{K}\f$.
     @param D Input vector of distortion coefficients \f$\distcoeffsfisheye\f$.
     @param R Rectification transformation in the object space: 3x3 1-channel, or vector: 3x1/1x3
     1-channel or 1x1 3-channel
@@ -3825,7 +4072,7 @@ namespace fisheye
     /** @brief Computes undistortion and rectification maps for image transform by #remap. If D is empty zero
     distortion is used, if R or P is empty identity matrixes are used.
 
-    @param K Camera intrinsic matrix \f$cameramatrix{K}\f$.
+    @param K Camera intrinsic matrix \f$\cameramatrix{K}\f$.
     @param D Input vector of distortion coefficients \f$\distcoeffsfisheye\f$.
     @param R Rectification transformation in the object space: 3x3 1-channel, or vector: 3x1/1x3
     1-channel or 1x1 3-channel
@@ -3843,7 +4090,7 @@ namespace fisheye
 
     @param distorted image with fisheye lens distortion.
     @param undistorted Output image with compensated fisheye lens distortion.
-    @param K Camera intrinsic matrix \f$cameramatrix{K}\f$.
+    @param K Camera intrinsic matrix \f$\cameramatrix{K}\f$.
     @param D Input vector of distortion coefficients \f$\distcoeffsfisheye\f$.
     @param Knew Camera intrinsic matrix of the distorted image. By default, it is the identity matrix but you
     may additionally scale and shift the result by using a different matrix.
@@ -3872,7 +4119,7 @@ namespace fisheye
 
     /** @brief Estimates new camera intrinsic matrix for undistortion or rectification.
 
-    @param K Camera intrinsic matrix \f$cameramatrix{K}\f$.
+    @param K Camera intrinsic matrix \f$\cameramatrix{K}\f$.
     @param image_size Size of the image
     @param D Input vector of distortion coefficients \f$\distcoeffsfisheye\f$.
     @param R Rectification transformation in the object space: 3x3 1-channel, or vector: 3x1/1x3
@@ -3899,7 +4146,7 @@ namespace fisheye
     @ref fisheye::CALIB_USE_INTRINSIC_GUESS is specified, some or all of fx, fy, cx, cy must be
     initialized before calling the function.
     @param D Output vector of distortion coefficients \f$\distcoeffsfisheye\f$.
-    @param rvecs Output vector of rotation vectors (see Rodrigues ) estimated for each pattern view.
+    @param rvecs Output vector of rotation vectors (see @ref Rodrigues ) estimated for each pattern view.
     That is, each k-th rotation vector together with the corresponding k-th translation vector (see
     the next output parameter description) brings the calibration pattern from the model coordinate
     space (in which object points are specified) to the world coordinate space, that is, a real
@@ -3941,7 +4188,7 @@ optimization. It is the \f$max(width,height)/\pi\f$ or the provided \f$f_x\f$, \
     camera.
     @param P2 Output 3x4 projection matrix in the new (rectified) coordinate systems for the second
     camera.
-    @param Q Output \f$4 \times 4\f$ disparity-to-depth mapping matrix (see reprojectImageTo3D ).
+    @param Q Output \f$4 \times 4\f$ disparity-to-depth mapping matrix (see #reprojectImageTo3D ).
     @param flags Operation flags that may be zero or @ref fisheye::CALIB_ZERO_DISPARITY . If the flag is set,
     the function makes the principal points of each camera have the same pixel coordinates in the
     rectified views. And if the flag is not set, the function may still shift the images in the
@@ -3977,6 +4224,15 @@ optimization. It is the \f$max(width,height)/\pi\f$ or the provided \f$f_x\f$, \
     @param imageSize Size of the image used only to initialize camera intrinsic matrix.
     @param R Output rotation matrix between the 1st and the 2nd camera coordinate systems.
     @param T Output translation vector between the coordinate systems of the cameras.
+    @param rvecs Output vector of rotation vectors ( @ref Rodrigues ) estimated for each pattern view in the
+    coordinate system of the first camera of the stereo pair (e.g. std::vector<cv::Mat>). More in detail, each
+    i-th rotation vector together with the corresponding i-th translation vector (see the next output parameter
+    description) brings the calibration pattern from the object coordinate space (in which object points are
+    specified) to the camera coordinate space of the first camera of the stereo pair. In more technical terms,
+    the tuple of the i-th rotation and translation vector performs a change of basis from object coordinate space
+    to camera coordinate space of the first camera of the stereo pair.
+    @param tvecs Output vector of translation vectors estimated for each pattern view, see parameter description
+    of previous output parameter ( rvecs ).
     @param flags Different flags that may be zero or a combination of the following values:
     -    @ref fisheye::CALIB_FIX_INTRINSIC  Fix K1, K2? and D1, D2? so that only R, T matrices
     are estimated.
@@ -3991,11 +4247,92 @@ optimization. It is the \f$max(width,height)/\pi\f$ or the provided \f$f_x\f$, \
     zero.
     @param criteria Termination criteria for the iterative optimization algorithm.
      */
+    CV_EXPORTS_W double stereoCalibrate(InputArrayOfArrays objectPoints, InputArrayOfArrays imagePoints1, InputArrayOfArrays imagePoints2,
+                                  InputOutputArray K1, InputOutputArray D1, InputOutputArray K2, InputOutputArray D2, Size imageSize,
+                                  OutputArray R, OutputArray T, OutputArrayOfArrays rvecs, OutputArrayOfArrays tvecs, int flags = fisheye::CALIB_FIX_INTRINSIC,
+                                  TermCriteria criteria = TermCriteria(TermCriteria::COUNT + TermCriteria::EPS, 100, DBL_EPSILON));
+
+    /// @overload
     CV_EXPORTS_W double stereoCalibrate(InputArrayOfArrays objectPoints, InputArrayOfArrays imagePoints1, InputArrayOfArrays imagePoints2,
                                   InputOutputArray K1, InputOutputArray D1, InputOutputArray K2, InputOutputArray D2, Size imageSize,
                                   OutputArray R, OutputArray T, int flags = fisheye::CALIB_FIX_INTRINSIC,
                                   TermCriteria criteria = TermCriteria(TermCriteria::COUNT + TermCriteria::EPS, 100, DBL_EPSILON));
 
+    /**
+    @brief Finds an object pose from 3D-2D point correspondences for fisheye camera moodel.
+
+    @param objectPoints Array of object points in the object coordinate space, Nx3 1-channel or
+    1xN/Nx1 3-channel, where N is the number of points. vector\<Point3d\> can also be passed here.
+    @param imagePoints Array of corresponding image points, Nx2 1-channel or 1xN/Nx1 2-channel,
+    where N is the number of points. vector\<Point2d\> can also be passed here.
+    @param cameraMatrix Input camera intrinsic matrix \f$\cameramatrix{A}\f$ .
+    @param distCoeffs Input vector of distortion coefficients (4x1/1x4).
+    @param rvec Output rotation vector (see @ref Rodrigues ) that, together with tvec, brings points from
+    the model coordinate system to the camera coordinate system.
+    @param tvec Output translation vector.
+    @param useExtrinsicGuess Parameter used for #SOLVEPNP_ITERATIVE. If true (1), the function uses
+    the provided rvec and tvec values as initial approximations of the rotation and translation
+    vectors, respectively, and further optimizes them.
+    @param flags Method for solving a PnP problem: see @ref calib3d_solvePnP_flags
+    @param criteria Termination criteria for internal undistortPoints call.
+    The function interally undistorts points with @ref undistortPoints and call @ref cv::solvePnP,
+    thus the input are very similar. More information about Perspective-n-Points is described in @ref calib3d_solvePnP
+    for more information.
+    */
+    CV_EXPORTS_W bool solvePnP( InputArray objectPoints, InputArray imagePoints,
+                                InputArray cameraMatrix, InputArray distCoeffs,
+                                OutputArray rvec, OutputArray tvec,
+                                bool useExtrinsicGuess = false, int flags = SOLVEPNP_ITERATIVE,
+                                TermCriteria criteria = TermCriteria(TermCriteria::MAX_ITER + TermCriteria::EPS, 10, 1e-8)
+                              );
+
+    /**
+    @brief Finds an object pose from 3D-2D point correspondences using the RANSAC scheme for fisheye camera moodel.
+
+    @param objectPoints Array of object points in the object coordinate space, Nx3 1-channel or
+    1xN/Nx1 3-channel, where N is the number of points. vector\<Point3d\> can be also passed here.
+    @param imagePoints Array of corresponding image points, Nx2 1-channel or 1xN/Nx1 2-channel,
+    where N is the number of points. vector\<Point2d\> can be also passed here.
+    @param cameraMatrix Input camera intrinsic matrix \f$\cameramatrix{A}\f$ .
+    @param distCoeffs Input vector of distortion coefficients (4x1/1x4).
+    @param rvec Output rotation vector (see @ref Rodrigues ) that, together with tvec, brings points from
+    the model coordinate system to the camera coordinate system.
+    @param tvec Output translation vector.
+    @param useExtrinsicGuess Parameter used for #SOLVEPNP_ITERATIVE. If true (1), the function uses
+    the provided rvec and tvec values as initial approximations of the rotation and translation
+    vectors, respectively, and further optimizes them.
+    @param iterationsCount Number of iterations.
+    @param reprojectionError Inlier threshold value used by the RANSAC procedure. The parameter value
+    is the maximum allowed distance between the observed and computed point projections to consider it
+    an inlier.
+    @param confidence The probability that the algorithm produces a useful result.
+    @param inliers Output vector that contains indices of inliers in objectPoints and imagePoints .
+    @param flags Method for solving a PnP problem: see @ref calib3d_solvePnP_flags
+    This function returns the rotation and the translation vectors that transform a 3D point expressed in the object
+    coordinate frame to the camera coordinate frame, using different methods:
+    - P3P methods (@ref SOLVEPNP_P3P, @ref SOLVEPNP_AP3P): need 4 input points to return a unique solution.
+    - @ref SOLVEPNP_IPPE Input points must be >= 4 and object points must be coplanar.
+    - @ref SOLVEPNP_IPPE_SQUARE Special case suitable for marker pose estimation.
+    Number of input points must be 4. Object points must be defined in the following order:
+    - point 0: [-squareLength / 2,  squareLength / 2, 0]
+    - point 1: [ squareLength / 2,  squareLength / 2, 0]
+    - point 2: [ squareLength / 2, -squareLength / 2, 0]
+    - point 3: [-squareLength / 2, -squareLength / 2, 0]
+    - for all the other flags, number of input points must be >= 4 and object points can be in any configuration.
+    @param criteria Termination criteria for internal undistortPoints call.
+    The function interally undistorts points with @ref undistortPoints and call @ref cv::solvePnP,
+    thus the input are very similar. More information about Perspective-n-Points is described in @ref calib3d_solvePnP
+    for more information.
+    */
+    CV_EXPORTS_W bool solvePnPRansac( InputArray objectPoints, InputArray imagePoints,
+                                      InputArray cameraMatrix, InputArray distCoeffs,
+                                      OutputArray rvec, OutputArray tvec,
+                                      bool useExtrinsicGuess = false, int iterationsCount = 100,
+                                      float reprojectionError = 8.0, double confidence = 0.99,
+                                      OutputArray inliers = noArray(), int flags = SOLVEPNP_ITERATIVE,
+                                      TermCriteria criteria = TermCriteria(TermCriteria::MAX_ITER + TermCriteria::EPS, 10, 1e-8)
+                                    );
+
 //! @} calib3d_fisheye
 } // end namespace fisheye
 
diff --git a/3rdParty/opencv2/calib3d/calib3d.hpp b/3rdParty/opencv-4.12.0/opencv2/calib3d/calib3d.hpp
similarity index 100%
rename from 3rdParty/opencv2/calib3d/calib3d.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/calib3d/calib3d.hpp
diff --git a/3rdParty/opencv2/calib3d/calib3d_c.h b/3rdParty/opencv-4.12.0/opencv2/calib3d/calib3d_c.h
similarity index 100%
rename from 3rdParty/opencv2/calib3d/calib3d_c.h
rename to 3rdParty/opencv-4.12.0/opencv2/calib3d/calib3d_c.h
diff --git a/3rdParty/opencv-4.12.0/opencv2/core.hpp b/3rdParty/opencv-4.12.0/opencv2/core.hpp
new file mode 100644
index 0000000000..41938b0d75
--- /dev/null
+++ b/3rdParty/opencv-4.12.0/opencv2/core.hpp
@@ -0,0 +1,3424 @@
+/*M///////////////////////////////////////////////////////////////////////////////////////
+//
+//  IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
+//
+//  By downloading, copying, installing or using the software you agree to this license.
+//  If you do not agree to this license, do not download, install,
+//  copy or use the software.
+//
+//
+//                           License Agreement
+//                For Open Source Computer Vision Library
+//
+// Copyright (C) 2000-2015, Intel Corporation, all rights reserved.
+// Copyright (C) 2009-2011, Willow Garage Inc., all rights reserved.
+// Copyright (C) 2015, OpenCV Foundation, all rights reserved.
+// Copyright (C) 2015, Itseez Inc., all rights reserved.
+// Third party copyrights are property of their respective owners.
+//
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
+//
+//   * Redistribution's of source code must retain the above copyright notice,
+//     this list of conditions and the following disclaimer.
+//
+//   * Redistribution's in binary form must reproduce the above copyright notice,
+//     this list of conditions and the following disclaimer in the documentation
+//     and/or other materials provided with the distribution.
+//
+//   * The name of the copyright holders may not be used to endorse or promote products
+//     derived from this software without specific prior written permission.
+//
+// This software is provided by the copyright holders and contributors "as is" and
+// any express or implied warranties, including, but not limited to, the implied
+// warranties of merchantability and fitness for a particular purpose are disclaimed.
+// In no event shall the Intel Corporation or contributors be liable for any direct,
+// indirect, incidental, special, exemplary, or consequential damages
+// (including, but not limited to, procurement of substitute goods or services;
+// loss of use, data, or profits; or business interruption) however caused
+// and on any theory of liability, whether in contract, strict liability,
+// or tort (including negligence or otherwise) arising in any way out of
+// the use of this software, even if advised of the possibility of such damage.
+//
+//M*/
+
+#ifndef OPENCV_CORE_HPP
+#define OPENCV_CORE_HPP
+
+#ifndef __cplusplus
+#  error core.hpp header must be compiled as C++
+#endif
+
+#include "opencv2/core/cvdef.h"
+#include "opencv2/core/base.hpp"
+#include "opencv2/core/cvstd.hpp"
+#include "opencv2/core/traits.hpp"
+#include "opencv2/core/matx.hpp"
+#include "opencv2/core/types.hpp"
+#include "opencv2/core/mat.hpp"
+#include "opencv2/core/persistence.hpp"
+
+/**
+@defgroup core Core functionality
+
+The Core module is the backbone of OpenCV, offering fundamental data structures, matrix operations,
+and utility functions that other modules depend on. It’s essential for handling image data,
+performing mathematical computations, and managing memory efficiently within the OpenCV ecosystem.
+
+@{
+    @defgroup core_basic Basic structures
+    @defgroup core_array Operations on arrays
+    @defgroup core_async Asynchronous API
+    @defgroup core_xml XML/YAML/JSON Persistence
+    @defgroup core_cluster Clustering
+    @defgroup core_utils Utility and system functions and macros
+    @{
+        @defgroup core_logging Logging facilities
+        @defgroup core_utils_sse SSE utilities
+        @defgroup core_utils_neon NEON utilities
+        @defgroup core_utils_vsx VSX utilities
+        @defgroup core_utils_softfloat Softfloat support
+        @defgroup core_utils_samples Utility functions for OpenCV samples
+    @}
+    @defgroup core_opengl OpenGL interoperability
+    @defgroup core_optim Optimization Algorithms
+    @defgroup core_directx DirectX interoperability
+    @defgroup core_eigen Eigen support
+    @defgroup core_opencl OpenCL support
+    @defgroup core_va_intel Intel VA-API/OpenCL (CL-VA) interoperability
+    @defgroup core_hal Hardware Acceleration Layer
+    @{
+        @defgroup core_hal_functions Functions
+        @defgroup core_hal_interface Interface
+        @defgroup core_hal_intrin Universal intrinsics
+        @{
+            @defgroup core_hal_intrin_impl Private implementation helpers
+        @}
+        @defgroup core_lowlevel_api Low-level API for external libraries / plugins
+    @}
+    @defgroup core_parallel Parallel Processing
+    @{
+        @defgroup core_parallel_backend Parallel backends API
+    @}
+    @defgroup core_quaternion Quaternion
+@}
+ */
+
+namespace cv {
+
+//! @addtogroup core_utils
+//! @{
+
+/*! @brief Class passed to an error.
+
+This class encapsulates all or almost all necessary
+information about the error happened in the program. The exception is
+usually constructed and thrown implicitly via CV_Error and CV_Error_ macros.
+@see error
+ */
+class CV_EXPORTS Exception : public std::exception
+{
+public:
+    /*!
+     Default constructor
+     */
+    Exception();
+    /*!
+     Full constructor. Normally the constructor is not called explicitly.
+     Instead, the macros CV_Error(), CV_Error_() and CV_Assert() are used.
+    */
+    Exception(int _code, const String& _err, const String& _func, const String& _file, int _line);
+    virtual ~Exception() CV_NOEXCEPT;
+
+    /*!
+     \return the error description and the context as a text string.
+    */
+    virtual const char *what() const CV_NOEXCEPT CV_OVERRIDE;
+    void formatMessage();
+
+    String msg; ///< the formatted error message
+
+    int code; ///< error code @see CVStatus
+    String err; ///< error description
+    String func; ///< function name. Available only when the compiler supports getting it
+    String file; ///< source file name where the error has occurred
+    int line; ///< line number in the source file where the error has occurred
+};
+
+/*! @brief Signals an error and raises the exception.
+
+By default the function prints information about the error to stderr,
+then it either stops if cv::setBreakOnError() had been called before or raises the exception.
+It is possible to alternate error processing by using #redirectError().
+@param exc the exception raisen.
+@deprecated drop this version
+ */
+CV_EXPORTS CV_NORETURN void error(const Exception& exc);
+
+enum SortFlags { SORT_EVERY_ROW    = 0, //!< each matrix row is sorted independently
+                 SORT_EVERY_COLUMN = 1, //!< each matrix column is sorted
+                                        //!< independently; this flag and the previous one are
+                                        //!< mutually exclusive.
+                 SORT_ASCENDING    = 0, //!< each matrix row is sorted in the ascending
+                                        //!< order.
+                 SORT_DESCENDING   = 16 //!< each matrix row is sorted in the
+                                        //!< descending order; this flag and the previous one are also
+                                        //!< mutually exclusive.
+               };
+
+//! @} core_utils
+
+//! @addtogroup core_array
+//! @{
+
+//! Covariation flags
+enum CovarFlags {
+    /** The output covariance matrix is calculated as:
+       \f[\texttt{scale}   \cdot  [  \texttt{vects}  [0]-  \texttt{mean}  , \texttt{vects}  [1]-  \texttt{mean}  ,...]^T  \cdot  [ \texttt{vects}  [0]- \texttt{mean}  , \texttt{vects}  [1]- \texttt{mean}  ,...],\f]
+       The covariance matrix will be nsamples x nsamples. Such an unusual covariance matrix is used
+       for fast PCA of a set of very large vectors (see, for example, the EigenFaces technique for
+       face recognition). Eigenvalues of this "scrambled" matrix match the eigenvalues of the true
+       covariance matrix. The "true" eigenvectors can be easily calculated from the eigenvectors of
+       the "scrambled" covariance matrix. */
+    COVAR_SCRAMBLED = 0,
+    /**The output covariance matrix is calculated as:
+        \f[\texttt{scale}   \cdot  [  \texttt{vects}  [0]-  \texttt{mean}  , \texttt{vects}  [1]-  \texttt{mean}  ,...]  \cdot  [ \texttt{vects}  [0]- \texttt{mean}  , \texttt{vects}  [1]- \texttt{mean}  ,...]^T,\f]
+        covar will be a square matrix of the same size as the total number of elements in each input
+        vector. One and only one of #COVAR_SCRAMBLED and #COVAR_NORMAL must be specified.*/
+    COVAR_NORMAL    = 1,
+    /** If the flag is specified, the function does not calculate mean from
+        the input vectors but, instead, uses the passed mean vector. This is useful if mean has been
+        pre-calculated or known in advance, or if the covariance matrix is calculated by parts. In
+        this case, mean is not a mean vector of the input sub-set of vectors but rather the mean
+        vector of the whole set.*/
+    COVAR_USE_AVG   = 2,
+    /** If the flag is specified, the covariance matrix is scaled. In the
+        "normal" mode, scale is 1./nsamples . In the "scrambled" mode, scale is the reciprocal of the
+        total number of elements in each input vector. By default (if the flag is not specified), the
+        covariance matrix is not scaled ( scale=1 ).*/
+    COVAR_SCALE     = 4,
+    /** If the flag is
+        specified, all the input vectors are stored as rows of the samples matrix. mean should be a
+        single-row vector in this case.*/
+    COVAR_ROWS      = 8,
+    /** If the flag is
+        specified, all the input vectors are stored as columns of the samples matrix. mean should be a
+        single-column vector in this case.*/
+    COVAR_COLS      = 16
+};
+
+enum ReduceTypes { REDUCE_SUM = 0, //!< the output is the sum of all rows/columns of the matrix.
+                   REDUCE_AVG = 1, //!< the output is the mean vector of all rows/columns of the matrix.
+                   REDUCE_MAX = 2, //!< the output is the maximum (column/row-wise) of all rows/columns of the matrix.
+                   REDUCE_MIN = 3,  //!< the output is the minimum (column/row-wise) of all rows/columns of the matrix.
+                   REDUCE_SUM2 = 4  //!< the output is the sum of all squared rows/columns of the matrix.
+                 };
+
+/** @brief Swaps two matrices
+*/
+CV_EXPORTS void swap(Mat& a, Mat& b);
+/** @overload */
+CV_EXPORTS void swap( UMat& a, UMat& b );
+
+/** @brief Computes the source location of an extrapolated pixel.
+
+The function computes and returns the coordinate of a donor pixel corresponding to the specified
+extrapolated pixel when using the specified extrapolation border mode. For example, if you use
+cv::BORDER_WRAP mode in the horizontal direction, cv::BORDER_REFLECT_101 in the vertical direction and
+want to compute value of the "virtual" pixel Point(-5, 100) in a floating-point image img, it
+looks like:
+@code{.cpp}
+    float val = img.at<float>(borderInterpolate(100, img.rows, cv::BORDER_REFLECT_101),
+                              borderInterpolate(-5, img.cols, cv::BORDER_WRAP));
+@endcode
+Normally, the function is not called directly. It is used inside filtering functions and also in
+copyMakeBorder.
+@param p 0-based coordinate of the extrapolated pixel along one of the axes, likely \<0 or \>= len
+@param len Length of the array along the corresponding axis.
+@param borderType Border type, one of the #BorderTypes, except for #BORDER_TRANSPARENT and
+#BORDER_ISOLATED. When borderType==#BORDER_CONSTANT, the function always returns -1, regardless
+of p and len.
+
+@sa copyMakeBorder
+*/
+CV_EXPORTS_W int borderInterpolate(int p, int len, int borderType);
+
+/** @example samples/cpp/tutorial_code/ImgTrans/copyMakeBorder_demo.cpp
+An example using copyMakeBorder function.
+Check @ref tutorial_copyMakeBorder "the corresponding tutorial" for more details
+*/
+
+/** @brief Forms a border around an image.
+
+The function copies the source image into the middle of the destination image. The areas to the
+left, to the right, above and below the copied source image will be filled with extrapolated
+pixels. This is not what filtering functions based on it do (they extrapolate pixels on-fly), but
+what other more complex functions, including your own, may do to simplify image boundary handling.
+
+The function supports the mode when src is already in the middle of dst . In this case, the
+function does not copy src itself but simply constructs the border, for example:
+
+@code{.cpp}
+    // let border be the same in all directions
+    int border=2;
+    // constructs a larger image to fit both the image and the border
+    Mat gray_buf(rgb.rows + border*2, rgb.cols + border*2, rgb.depth());
+    // select the middle part of it w/o copying data
+    Mat gray(gray_canvas, Rect(border, border, rgb.cols, rgb.rows));
+    // convert image from RGB to grayscale
+    cvtColor(rgb, gray, COLOR_RGB2GRAY);
+    // form a border in-place
+    copyMakeBorder(gray, gray_buf, border, border,
+                   border, border, BORDER_REPLICATE);
+    // now do some custom filtering ...
+    ...
+@endcode
+@note When the source image is a part (ROI) of a bigger image, the function will try to use the
+pixels outside of the ROI to form a border. To disable this feature and always do extrapolation, as
+if src was not a ROI, use borderType | #BORDER_ISOLATED.
+
+@param src Source image.
+@param dst Destination image of the same type as src and the size Size(src.cols+left+right,
+src.rows+top+bottom) .
+@param top the top pixels
+@param bottom the bottom pixels
+@param left the left pixels
+@param right Parameter specifying how many pixels in each direction from the source image rectangle
+to extrapolate. For example, top=1, bottom=1, left=1, right=1 mean that 1 pixel-wide border needs
+to be built.
+@param borderType Border type. See borderInterpolate for details.
+@param value Border value if borderType==BORDER_CONSTANT .
+
+@sa  borderInterpolate
+*/
+CV_EXPORTS_W void copyMakeBorder(InputArray src, OutputArray dst,
+                                 int top, int bottom, int left, int right,
+                                 int borderType, const Scalar& value = Scalar() );
+
+/** @brief Calculates the per-element sum of two arrays or an array and a scalar.
+
+The function add calculates:
+- Sum of two arrays when both input arrays have the same size and the same number of channels:
+\f[\texttt{dst}(I) =  \texttt{saturate} ( \texttt{src1}(I) +  \texttt{src2}(I)) \quad \texttt{if mask}(I) \ne0\f]
+- Sum of an array and a scalar when src2 is constructed from Scalar or has the same number of
+elements as `src1.channels()`:
+\f[\texttt{dst}(I) =  \texttt{saturate} ( \texttt{src1}(I) +  \texttt{src2} ) \quad \texttt{if mask}(I) \ne0\f]
+- Sum of a scalar and an array when src1 is constructed from Scalar or has the same number of
+elements as `src2.channels()`:
+\f[\texttt{dst}(I) =  \texttt{saturate} ( \texttt{src1} +  \texttt{src2}(I) ) \quad \texttt{if mask}(I) \ne0\f]
+where `I` is a multi-dimensional index of array elements. In case of multi-channel arrays, each
+channel is processed independently.
+
+The first function in the list above can be replaced with matrix expressions:
+@code{.cpp}
+    dst = src1 + src2;
+    dst += src1; // equivalent to add(dst, src1, dst);
+@endcode
+The input arrays and the output array can all have the same or different depths. For example, you
+can add a 16-bit unsigned array to a 8-bit signed array and store the sum as a 32-bit
+floating-point array. Depth of the output array is determined by the dtype parameter. In the second
+and third cases above, as well as in the first case, when src1.depth() == src2.depth(), dtype can
+be set to the default -1. In this case, the output array will have the same depth as the input
+array, be it src1, src2 or both.
+@note Saturation is not applied when the output array has the depth CV_32S. You may even get
+result of an incorrect sign in the case of overflow.
+@note (Python) Be careful to difference behaviour between src1/src2 are single number and they are tuple/array.
+`add(src,X)` means `add(src,(X,X,X,X))`.
+`add(src,(X,))` means `add(src,(X,0,0,0))`.
+@param src1 first input array or a scalar.
+@param src2 second input array or a scalar.
+@param dst output array that has the same size and number of channels as the input array(s); the
+depth is defined by dtype or src1/src2.
+@param mask optional operation mask - 8-bit single channel array, that specifies elements of the
+output array to be changed.
+@param dtype optional depth of the output array (see the discussion below).
+@sa subtract, addWeighted, scaleAdd, Mat::convertTo
+*/
+CV_EXPORTS_W void add(InputArray src1, InputArray src2, OutputArray dst,
+                      InputArray mask = noArray(), int dtype = -1);
+
+/** @brief Calculates the per-element difference between two arrays or array and a scalar.
+
+The function subtract calculates:
+- Difference between two arrays, when both input arrays have the same size and the same number of
+channels:
+    \f[\texttt{dst}(I) =  \texttt{saturate} ( \texttt{src1}(I) -  \texttt{src2}(I)) \quad \texttt{if mask}(I) \ne0\f]
+- Difference between an array and a scalar, when src2 is constructed from Scalar or has the same
+number of elements as `src1.channels()`:
+    \f[\texttt{dst}(I) =  \texttt{saturate} ( \texttt{src1}(I) -  \texttt{src2} ) \quad \texttt{if mask}(I) \ne0\f]
+- Difference between a scalar and an array, when src1 is constructed from Scalar or has the same
+number of elements as `src2.channels()`:
+    \f[\texttt{dst}(I) =  \texttt{saturate} ( \texttt{src1} -  \texttt{src2}(I) ) \quad \texttt{if mask}(I) \ne0\f]
+- The reverse difference between a scalar and an array in the case of `SubRS`:
+    \f[\texttt{dst}(I) =  \texttt{saturate} ( \texttt{src2} -  \texttt{src1}(I) ) \quad \texttt{if mask}(I) \ne0\f]
+where I is a multi-dimensional index of array elements. In case of multi-channel arrays, each
+channel is processed independently.
+
+The first function in the list above can be replaced with matrix expressions:
+@code{.cpp}
+    dst = src1 - src2;
+    dst -= src1; // equivalent to subtract(dst, src1, dst);
+@endcode
+The input arrays and the output array can all have the same or different depths. For example, you
+can subtract to 8-bit unsigned arrays and store the difference in a 16-bit signed array. Depth of
+the output array is determined by dtype parameter. In the second and third cases above, as well as
+in the first case, when src1.depth() == src2.depth(), dtype can be set to the default -1. In this
+case the output array will have the same depth as the input array, be it src1, src2 or both.
+@note Saturation is not applied when the output array has the depth CV_32S. You may even get
+result of an incorrect sign in the case of overflow.
+@note (Python) Be careful to difference behaviour between src1/src2 are single number and they are tuple/array.
+`subtract(src,X)` means `subtract(src,(X,X,X,X))`.
+`subtract(src,(X,))` means `subtract(src,(X,0,0,0))`.
+@param src1 first input array or a scalar.
+@param src2 second input array or a scalar.
+@param dst output array of the same size and the same number of channels as the input array.
+@param mask optional operation mask; this is an 8-bit single channel array that specifies elements
+of the output array to be changed.
+@param dtype optional depth of the output array
+@sa  add, addWeighted, scaleAdd, Mat::convertTo
+  */
+CV_EXPORTS_W void subtract(InputArray src1, InputArray src2, OutputArray dst,
+                           InputArray mask = noArray(), int dtype = -1);
+
+
+/** @brief Calculates the per-element scaled product of two arrays.
+
+The function multiply calculates the per-element product of two arrays:
+
+\f[\texttt{dst} (I)= \texttt{saturate} ( \texttt{scale} \cdot \texttt{src1} (I)  \cdot \texttt{src2} (I))\f]
+
+There is also a @ref MatrixExpressions -friendly variant of the first function. See Mat::mul .
+
+For a not-per-element matrix product, see gemm .
+
+@note Saturation is not applied when the output array has the depth
+CV_32S. You may even get result of an incorrect sign in the case of
+overflow.
+@note (Python) Be careful to difference behaviour between src1/src2 are single number and they are tuple/array.
+`multiply(src,X)` means `multiply(src,(X,X,X,X))`.
+`multiply(src,(X,))` means `multiply(src,(X,0,0,0))`.
+@param src1 first input array.
+@param src2 second input array of the same size and the same type as src1.
+@param dst output array of the same size and type as src1.
+@param scale optional scale factor.
+@param dtype optional depth of the output array
+@sa add, subtract, divide, scaleAdd, addWeighted, accumulate, accumulateProduct, accumulateSquare,
+Mat::convertTo
+*/
+CV_EXPORTS_W void multiply(InputArray src1, InputArray src2,
+                           OutputArray dst, double scale = 1, int dtype = -1);
+
+/** @brief Performs per-element division of two arrays or a scalar by an array.
+
+The function cv::divide divides one array by another:
+\f[\texttt{dst(I) = saturate(src1(I)*scale/src2(I))}\f]
+or a scalar by an array when there is no src1 :
+\f[\texttt{dst(I) = saturate(scale/src2(I))}\f]
+
+Different channels of multi-channel arrays are processed independently.
+
+For integer types when src2(I) is zero, dst(I) will also be zero.
+
+@note In case of floating point data there is no special defined behavior for zero src2(I) values.
+Regular floating-point division is used.
+Expect correct IEEE-754 behaviour for floating-point data (with NaN, Inf result values).
+
+@note Saturation is not applied when the output array has the depth CV_32S. You may even get
+result of an incorrect sign in the case of overflow.
+@note (Python) Be careful to difference behaviour between src1/src2 are single number and they are tuple/array.
+`divide(src,X)` means `divide(src,(X,X,X,X))`.
+`divide(src,(X,))` means `divide(src,(X,0,0,0))`.
+@param src1 first input array.
+@param src2 second input array of the same size and type as src1.
+@param scale scalar factor.
+@param dst output array of the same size and type as src2.
+@param dtype optional depth of the output array; if -1, dst will have depth src2.depth(), but in
+case of an array-by-array division, you can only pass -1 when src1.depth()==src2.depth().
+@sa  multiply, add, subtract
+*/
+CV_EXPORTS_W void divide(InputArray src1, InputArray src2, OutputArray dst,
+                         double scale = 1, int dtype = -1);
+
+/** @overload */
+CV_EXPORTS_W void divide(double scale, InputArray src2,
+                         OutputArray dst, int dtype = -1);
+
+/** @brief Calculates the sum of a scaled array and another array.
+
+The function scaleAdd is one of the classical primitive linear algebra operations, known as DAXPY
+or SAXPY in [BLAS](http://en.wikipedia.org/wiki/Basic_Linear_Algebra_Subprograms). It calculates
+the sum of a scaled array and another array:
+\f[\texttt{dst} (I)= \texttt{scale} \cdot \texttt{src1} (I) +  \texttt{src2} (I)\f]
+The function can also be emulated with a matrix expression, for example:
+@code{.cpp}
+    Mat A(3, 3, CV_64F);
+    ...
+    A.row(0) = A.row(1)*2 + A.row(2);
+@endcode
+@param src1 first input array.
+@param alpha scale factor for the first array.
+@param src2 second input array of the same size and type as src1.
+@param dst output array of the same size and type as src1.
+@sa add, addWeighted, subtract, Mat::dot, Mat::convertTo
+*/
+CV_EXPORTS_W void scaleAdd(InputArray src1, double alpha, InputArray src2, OutputArray dst);
+
+/** @brief Calculates the weighted sum of two arrays.
+
+The function addWeighted calculates the weighted sum of two arrays as follows:
+\f[\texttt{dst} (I)= \texttt{saturate} ( \texttt{src1} (I)* \texttt{alpha} +  \texttt{src2} (I)* \texttt{beta} +  \texttt{gamma} )\f]
+where I is a multi-dimensional index of array elements. In case of multi-channel arrays, each
+channel is processed independently.
+The function can be replaced with a matrix expression:
+@code{.cpp}
+    dst = src1*alpha + src2*beta + gamma;
+@endcode
+@note Saturation is not applied when the output array has the depth CV_32S. You may even get
+result of an incorrect sign in the case of overflow.
+@param src1 first input array.
+@param alpha weight of the first array elements.
+@param src2 second input array of the same size and channel number as src1.
+@param beta weight of the second array elements.
+@param gamma scalar added to each sum.
+@param dst output array that has the same size and number of channels as the input arrays.
+@param dtype optional depth of the output array; when both input arrays have the same depth, dtype
+can be set to -1, which will be equivalent to src1.depth().
+@sa  add, subtract, scaleAdd, Mat::convertTo
+*/
+CV_EXPORTS_W void addWeighted(InputArray src1, double alpha, InputArray src2,
+                              double beta, double gamma, OutputArray dst, int dtype = -1);
+
+/** @brief Scales, calculates absolute values, and converts the result to 8-bit.
+
+On each element of the input array, the function convertScaleAbs
+performs three operations sequentially: scaling, taking an absolute
+value, conversion to an unsigned 8-bit type:
+\f[\texttt{dst} (I)= \texttt{saturate\_cast<uchar>} (| \texttt{src} (I)* \texttt{alpha} +  \texttt{beta} |)\f]
+In case of multi-channel arrays, the function processes each channel
+independently. When the output is not 8-bit, the operation can be
+emulated by calling the Mat::convertTo method (or by using matrix
+expressions) and then by calculating an absolute value of the result.
+For example:
+@code{.cpp}
+    Mat_<float> A(30,30);
+    randu(A, Scalar(-100), Scalar(100));
+    Mat_<float> B = A*5 + 3;
+    B = abs(B);
+    // Mat_<float> B = abs(A*5+3) will also do the job,
+    // but it will allocate a temporary matrix
+@endcode
+@param src input array.
+@param dst output array.
+@param alpha optional scale factor.
+@param beta optional delta added to the scaled values.
+@sa  Mat::convertTo, cv::abs(const Mat&)
+*/
+CV_EXPORTS_W void convertScaleAbs(InputArray src, OutputArray dst,
+                                  double alpha = 1, double beta = 0);
+
+/** @brief Converts an array to half precision floating number.
+
+This function converts FP32 (single precision floating point) from/to FP16 (half precision floating point). CV_16S format is used to represent FP16 data.
+There are two use modes (src -> dst): CV_32F -> CV_16S and CV_16S -> CV_32F. The input array has to have type of CV_32F or
+CV_16S to represent the bit depth. If the input array is neither of them, the function will raise an error.
+The format of half precision floating point is defined in IEEE 754-2008.
+
+@param src input array.
+@param dst output array.
+
+@deprecated Use Mat::convertTo with CV_16F instead.
+*/
+CV_EXPORTS_W void convertFp16(InputArray src, OutputArray dst);
+
+/** @example samples/cpp/tutorial_code/core/how_to_scan_images/how_to_scan_images.cpp
+Check @ref tutorial_how_to_scan_images "the corresponding tutorial" for more details
+*/
+
+/** @brief Performs a look-up table transform of an array.
+
+The function LUT fills the output array with values from the look-up table. Indices of the entries
+are taken from the input array. That is, the function processes each element of src as follows:
+\f[\texttt{dst} (I)  \leftarrow \texttt{lut(src(I) + d)}\f]
+where
+\f[d =  \fork{0}{if \(\texttt{src}\) has depth \(\texttt{CV_8U}\)}{128}{if \(\texttt{src}\) has depth \(\texttt{CV_8S}\)}\f]
+@param src input array of 8-bit elements.
+@param lut look-up table of 256 elements; in case of multi-channel input array, the table should
+either have a single channel (in this case the same table is used for all channels) or the same
+number of channels as in the input array.
+@param dst output array of the same size and number of channels as src, and the same depth as lut.
+@sa  convertScaleAbs, Mat::convertTo
+*/
+CV_EXPORTS_W void LUT(InputArray src, InputArray lut, OutputArray dst);
+
+/** @brief Calculates the sum of array elements.
+
+The function cv::sum calculates and returns the sum of array elements,
+independently for each channel.
+@param src input array that must have from 1 to 4 channels.
+@sa  countNonZero, mean, meanStdDev, norm, minMaxLoc, reduce
+*/
+CV_EXPORTS_AS(sumElems) Scalar sum(InputArray src);
+
+/** @brief Checks for the presence of at least one non-zero array element.
+
+The function returns whether there are non-zero elements in src
+
+The function do not work with multi-channel arrays. If you need to check non-zero array
+elements across all the channels, use Mat::reshape first to reinterpret the array as
+single-channel. Or you may extract the particular channel using either extractImageCOI, or
+mixChannels, or split.
+
+@note
+- If the location of non-zero array elements is important, @ref findNonZero is helpful.
+- If the count of non-zero array elements is important, @ref countNonZero is helpful.
+@param src single-channel array.
+@sa  mean, meanStdDev, norm, minMaxLoc, calcCovarMatrix
+@sa  findNonZero, countNonZero
+*/
+CV_EXPORTS_W bool hasNonZero( InputArray src );
+
+/** @brief Counts non-zero array elements.
+
+The function returns the number of non-zero elements in src :
+\f[\sum _{I: \; \texttt{src} (I) \ne0 } 1\f]
+
+The function do not work with multi-channel arrays. If you need to count non-zero array
+elements across all the channels, use Mat::reshape first to reinterpret the array as
+single-channel. Or you may extract the particular channel using either extractImageCOI, or
+mixChannels, or split.
+
+@note
+- If only whether there are non-zero elements is important, @ref hasNonZero is helpful.
+- If the location of non-zero array elements is important, @ref findNonZero is helpful.
+@param src single-channel array.
+@sa  mean, meanStdDev, norm, minMaxLoc, calcCovarMatrix
+@sa  findNonZero, hasNonZero
+*/
+CV_EXPORTS_W int countNonZero( InputArray src );
+
+/** @brief Returns the list of locations of non-zero pixels
+
+Given a binary matrix (likely returned from an operation such
+as threshold(), compare(), >, ==, etc, return all of
+the non-zero indices as a cv::Mat or std::vector<cv::Point> (x,y)
+For example:
+@code{.cpp}
+    cv::Mat binaryImage; // input, binary image
+    cv::Mat locations;   // output, locations of non-zero pixels
+    cv::findNonZero(binaryImage, locations);
+
+    // access pixel coordinates
+    Point pnt = locations.at<Point>(i);
+@endcode
+or
+@code{.cpp}
+    cv::Mat binaryImage; // input, binary image
+    vector<Point> locations;   // output, locations of non-zero pixels
+    cv::findNonZero(binaryImage, locations);
+
+    // access pixel coordinates
+    Point pnt = locations[i];
+@endcode
+
+The function do not work with multi-channel arrays. If you need to find non-zero
+elements across all the channels, use Mat::reshape first to reinterpret the array as
+single-channel. Or you may extract the particular channel using either extractImageCOI, or
+mixChannels, or split.
+
+@note
+- If only count of non-zero array elements is important, @ref countNonZero is helpful.
+- If only whether there are non-zero elements is important, @ref hasNonZero is helpful.
+@param src single-channel array
+@param idx the output array, type of cv::Mat or std::vector<Point>, corresponding to non-zero indices in the input
+@sa  countNonZero, hasNonZero
+*/
+CV_EXPORTS_W void findNonZero( InputArray src, OutputArray idx );
+
+/** @brief Calculates an average (mean) of array elements.
+
+The function cv::mean calculates the mean value M of array elements,
+independently for each channel, and return it:
+\f[\begin{array}{l} N =  \sum _{I: \; \texttt{mask} (I) \ne 0} 1 \\ M_c =  \left ( \sum _{I: \; \texttt{mask} (I) \ne 0}{ \texttt{mtx} (I)_c} \right )/N \end{array}\f]
+When all the mask elements are 0's, the function returns Scalar::all(0)
+@param src input array that should have from 1 to 4 channels so that the result can be stored in
+Scalar_ .
+@param mask optional operation mask.
+@sa  countNonZero, meanStdDev, norm, minMaxLoc
+*/
+CV_EXPORTS_W Scalar mean(InputArray src, InputArray mask = noArray());
+
+/** Calculates a mean and standard deviation of array elements.
+
+The function cv::meanStdDev calculates the mean and the standard deviation M
+of array elements independently for each channel and returns it via the
+output parameters:
+\f[\begin{array}{l} N =  \sum _{I, \texttt{mask} (I)  \ne 0} 1 \\ \texttt{mean} _c =  \frac{\sum_{ I: \; \texttt{mask}(I) \ne 0} \texttt{src} (I)_c}{N} \\ \texttt{stddev} _c =  \sqrt{\frac{\sum_{ I: \; \texttt{mask}(I) \ne 0} \left ( \texttt{src} (I)_c -  \texttt{mean} _c \right )^2}{N}} \end{array}\f]
+When all the mask elements are 0's, the function returns
+mean=stddev=Scalar::all(0).
+@note The calculated standard deviation is only the diagonal of the
+complete normalized covariance matrix. If the full matrix is needed, you
+can reshape the multi-channel array M x N to the single-channel array
+M\*N x mtx.channels() (only possible when the matrix is continuous) and
+then pass the matrix to calcCovarMatrix .
+@param src input array that should have from 1 to 4 channels so that the results can be stored in
+Scalar_ 's.
+@param mean output parameter: calculated mean value.
+@param stddev output parameter: calculated standard deviation.
+@param mask optional operation mask.
+@sa  countNonZero, mean, norm, minMaxLoc, calcCovarMatrix
+*/
+CV_EXPORTS_W void meanStdDev(InputArray src, OutputArray mean, OutputArray stddev,
+                             InputArray mask=noArray());
+
+/** @brief Calculates the  absolute norm of an array.
+
+This version of #norm calculates the absolute norm of src1. The type of norm to calculate is specified using #NormTypes.
+
+As example for one array consider the function \f$r(x)= \begin{pmatrix} x \\ 1-x \end{pmatrix}, x \in [-1;1]\f$.
+The \f$ L_{1}, L_{2} \f$ and \f$ L_{\infty} \f$ norm for the sample value \f$r(-1) = \begin{pmatrix} -1 \\ 2 \end{pmatrix}\f$
+is calculated as follows
+\f{align*}
+    \| r(-1) \|_{L_1} &= |-1| + |2| = 3 \\
+    \| r(-1) \|_{L_2} &= \sqrt{(-1)^{2} + (2)^{2}} = \sqrt{5} \\
+    \| r(-1) \|_{L_\infty} &= \max(|-1|,|2|) = 2
+\f}
+and for \f$r(0.5) = \begin{pmatrix} 0.5 \\ 0.5 \end{pmatrix}\f$ the calculation is
+\f{align*}
+    \| r(0.5) \|_{L_1} &= |0.5| + |0.5| = 1 \\
+    \| r(0.5) \|_{L_2} &= \sqrt{(0.5)^{2} + (0.5)^{2}} = \sqrt{0.5} \\
+    \| r(0.5) \|_{L_\infty} &= \max(|0.5|,|0.5|) = 0.5.
+\f}
+The following graphic shows all values for the three norm functions \f$\| r(x) \|_{L_1}, \| r(x) \|_{L_2}\f$ and \f$\| r(x) \|_{L_\infty}\f$.
+It is notable that the \f$ L_{1} \f$ norm forms the upper and the \f$ L_{\infty} \f$ norm forms the lower border for the example function \f$ r(x) \f$.
+![Graphs for the different norm functions from the above example](pics/NormTypes_OneArray_1-2-INF.png)
+
+When the mask parameter is specified and it is not empty, the norm is
+
+If normType is not specified, #NORM_L2 is used.
+calculated only over the region specified by the mask.
+
+Multi-channel input arrays are treated as single-channel arrays, that is,
+the results for all channels are combined.
+
+Hamming norms can only be calculated with CV_8U depth arrays.
+
+@param src1 first input array.
+@param normType type of the norm (see #NormTypes).
+@param mask optional operation mask; it must have the same size as src1 and CV_8UC1 type.
+*/
+CV_EXPORTS_W double norm(InputArray src1, int normType = NORM_L2, InputArray mask = noArray());
+
+/** @brief Calculates an absolute difference norm or a relative difference norm.
+
+This version of cv::norm calculates the absolute difference norm
+or the relative difference norm of arrays src1 and src2.
+The type of norm to calculate is specified using #NormTypes.
+
+@param src1 first input array.
+@param src2 second input array of the same size and the same type as src1.
+@param normType type of the norm (see #NormTypes).
+@param mask optional operation mask; it must have the same size as src1 and CV_8UC1 type.
+*/
+CV_EXPORTS_W double norm(InputArray src1, InputArray src2,
+                         int normType = NORM_L2, InputArray mask = noArray());
+/** @overload
+@param src first input array.
+@param normType type of the norm (see #NormTypes).
+*/
+CV_EXPORTS double norm( const SparseMat& src, int normType );
+
+/** @brief Computes the Peak Signal-to-Noise Ratio (PSNR) image quality metric.
+
+This function calculates the Peak Signal-to-Noise Ratio (PSNR) image quality metric in decibels (dB),
+between two input arrays src1 and src2. The arrays must have the same type.
+
+The PSNR is calculated as follows:
+
+\f[
+\texttt{PSNR} = 10 \cdot \log_{10}{\left( \frac{R^2}{MSE} \right) }
+\f]
+
+where R is the maximum integer value of depth (e.g. 255 in the case of CV_8U data)
+and MSE is the mean squared error between the two arrays.
+
+@param src1 first input array.
+@param src2 second input array of the same size as src1.
+@param R the maximum pixel value (255 by default)
+
+  */
+CV_EXPORTS_W double PSNR(InputArray src1, InputArray src2, double R=255.);
+
+/** @brief naive nearest neighbor finder
+
+see http://en.wikipedia.org/wiki/Nearest_neighbor_search
+@todo document
+  */
+CV_EXPORTS_W void batchDistance(InputArray src1, InputArray src2,
+                                OutputArray dist, int dtype, OutputArray nidx,
+                                int normType = NORM_L2, int K = 0,
+                                InputArray mask = noArray(), int update = 0,
+                                bool crosscheck = false);
+
+/** @brief Normalizes the norm or value range of an array.
+
+The function cv::normalize normalizes scale and shift the input array elements so that
+\f[\| \texttt{dst} \| _{L_p}= \texttt{alpha}\f]
+(where p=Inf, 1 or 2) when normType=NORM_INF, NORM_L1, or NORM_L2, respectively; or so that
+\f[\min _I  \texttt{dst} (I)= \texttt{alpha} , \, \, \max _I  \texttt{dst} (I)= \texttt{beta}\f]
+
+when normType=NORM_MINMAX (for dense arrays only). The optional mask specifies a sub-array to be
+normalized. This means that the norm or min-n-max are calculated over the sub-array, and then this
+sub-array is modified to be normalized. If you want to only use the mask to calculate the norm or
+min-max but modify the whole array, you can use norm and Mat::convertTo.
+
+In case of sparse matrices, only the non-zero values are analyzed and transformed. Because of this,
+the range transformation for sparse matrices is not allowed since it can shift the zero level.
+
+Possible usage with some positive example data:
+@code{.cpp}
+    vector<double> positiveData = { 2.0, 8.0, 10.0 };
+    vector<double> normalizedData_l1, normalizedData_l2, normalizedData_inf, normalizedData_minmax;
+
+    // Norm to probability (total count)
+    // sum(numbers) = 20.0
+    // 2.0      0.1     (2.0/20.0)
+    // 8.0      0.4     (8.0/20.0)
+    // 10.0     0.5     (10.0/20.0)
+    normalize(positiveData, normalizedData_l1, 1.0, 0.0, NORM_L1);
+
+    // Norm to unit vector: ||positiveData|| = 1.0
+    // 2.0      0.15
+    // 8.0      0.62
+    // 10.0     0.77
+    normalize(positiveData, normalizedData_l2, 1.0, 0.0, NORM_L2);
+
+    // Norm to max element
+    // 2.0      0.2     (2.0/10.0)
+    // 8.0      0.8     (8.0/10.0)
+    // 10.0     1.0     (10.0/10.0)
+    normalize(positiveData, normalizedData_inf, 1.0, 0.0, NORM_INF);
+
+    // Norm to range [0.0;1.0]
+    // 2.0      0.0     (shift to left border)
+    // 8.0      0.75    (6.0/8.0)
+    // 10.0     1.0     (shift to right border)
+    normalize(positiveData, normalizedData_minmax, 1.0, 0.0, NORM_MINMAX);
+@endcode
+
+@note Due to rounding issues, min-max normalization can result in values outside provided boundaries.
+If exact range conformity is needed, following workarounds can be used:
+- use double floating point precision (dtype = CV_64F)
+- manually clip values (`cv::max(res, left_bound, res)`, `cv::min(res, right_bound, res)` or `np.clip`)
+
+@param src input array.
+@param dst output array of the same size as src .
+@param alpha norm value to normalize to or the lower range boundary in case of the range
+normalization.
+@param beta upper range boundary in case of the range normalization; it is not used for the norm
+normalization.
+@param norm_type normalization type (see cv::NormTypes).
+@param dtype when negative, the output array has the same type as src; otherwise, it has the same
+number of channels as src and the depth =CV_MAT_DEPTH(dtype).
+@param mask optional operation mask.
+@sa norm, Mat::convertTo, SparseMat::convertTo
+*/
+CV_EXPORTS_W void normalize( InputArray src, InputOutputArray dst, double alpha = 1, double beta = 0,
+                             int norm_type = NORM_L2, int dtype = -1, InputArray mask = noArray());
+
+/** @overload
+@param src input array.
+@param dst output array of the same size as src .
+@param alpha norm value to normalize to or the lower range boundary in case of the range
+normalization.
+@param normType normalization type (see cv::NormTypes).
+*/
+CV_EXPORTS void normalize( const SparseMat& src, SparseMat& dst, double alpha, int normType );
+
+/** @brief Finds the global minimum and maximum in an array.
+
+The function cv::minMaxLoc finds the minimum and maximum element values and their positions. The
+extrema are searched across the whole array or, if mask is not an empty array, in the specified
+array region.
+
+In C++, if the input is multi-channel, you should omit the minLoc, maxLoc, and mask arguments
+(i.e. leave them as NULL, NULL, and noArray() respectively). These arguments are not
+supported for multi-channel input arrays. If working with multi-channel input and you
+need the minLoc, maxLoc, or mask arguments, then use Mat::reshape first to reinterpret
+the array as single-channel. Alternatively, you can extract the particular channel using either
+extractImageCOI, mixChannels, or split.
+
+In Python, multi-channel input is not supported at all due to a limitation in the
+binding generation process (there is no way to set minLoc and maxLoc to NULL). A
+workaround is to operate on each channel individually or to use NumPy to achieve the same
+functionality.
+
+@param src input single-channel array.
+@param minVal pointer to the returned minimum value; NULL is used if not required.
+@param maxVal pointer to the returned maximum value; NULL is used if not required.
+@param minLoc pointer to the returned minimum location (in 2D case); NULL is used if not required.
+@param maxLoc pointer to the returned maximum location (in 2D case); NULL is used if not required.
+@param mask optional mask used to select a sub-array.
+@sa max, min, reduceArgMin, reduceArgMax, compare, inRange, extractImageCOI, mixChannels, split, Mat::reshape
+*/
+CV_EXPORTS_W void minMaxLoc(InputArray src, CV_OUT double* minVal,
+                            CV_OUT double* maxVal = 0, CV_OUT Point* minLoc = 0,
+                            CV_OUT Point* maxLoc = 0, InputArray mask = noArray());
+
+/**
+ * @brief Finds indices of min elements along provided axis
+ *
+ * @note
+ *      - If input or output array is not continuous, this function will create an internal copy.
+ *      - NaN handling is left unspecified, see patchNaNs().
+ *      - The returned index is always in bounds of input matrix.
+ *
+ * @param src input single-channel array.
+ * @param dst output array of type CV_32SC1 with the same dimensionality as src,
+ * except for axis being reduced - it should be set to 1.
+ * @param lastIndex whether to get the index of first or last occurrence of min.
+ * @param axis axis to reduce along.
+ * @sa reduceArgMax, minMaxLoc, min, max, compare, reduce
+ */
+CV_EXPORTS_W void reduceArgMin(InputArray src, OutputArray dst, int axis, bool lastIndex = false);
+
+/**
+ * @brief Finds indices of max elements along provided axis
+ *
+ * @note
+ *      - If input or output array is not continuous, this function will create an internal copy.
+ *      - NaN handling is left unspecified, see patchNaNs().
+ *      - The returned index is always in bounds of input matrix.
+ *
+ * @param src input single-channel array.
+ * @param dst output array of type CV_32SC1 with the same dimensionality as src,
+ * except for axis being reduced - it should be set to 1.
+ * @param lastIndex whether to get the index of first or last occurrence of max.
+ * @param axis axis to reduce along.
+ * @sa reduceArgMin, minMaxLoc, min, max, compare, reduce
+ */
+CV_EXPORTS_W void reduceArgMax(InputArray src, OutputArray dst, int axis, bool lastIndex = false);
+
+/** @brief Finds the global minimum and maximum in an array
+
+The function cv::minMaxIdx finds the minimum and maximum element values and their positions. The
+extremums are searched across the whole array or, if mask is not an empty array, in the specified
+array region. In case of a sparse matrix, the minimum is found among non-zero elements
+only. Multi-channel input is supported without mask and extremums indexes (should be nullptr).
+@note When minIdx is not NULL, it must have at least 2 elements (as well as maxIdx), even if src is
+a single-row or single-column matrix. In OpenCV (following MATLAB) each array has at least 2
+dimensions, i.e. single-column matrix is Mx1 matrix (and therefore minIdx/maxIdx will be
+(i1,0)/(i2,0)) and single-row matrix is 1xN matrix (and therefore minIdx/maxIdx will be
+(0,j1)/(0,j2)).
+@param src input single-channel array.
+@param minVal pointer to the returned minimum value; NULL is used if not required.
+@param maxVal pointer to the returned maximum value; NULL is used if not required.
+@param minIdx pointer to the returned minimum location (in nD case); NULL is used if not required;
+Otherwise, it must point to an array of src.dims elements, the coordinates of the minimum element
+in each dimension are stored there sequentially.
+@param maxIdx pointer to the returned maximum location (in nD case). NULL is used if not required.
+@param mask specified array region
+*/
+CV_EXPORTS void minMaxIdx(InputArray src, double* minVal, double* maxVal = 0,
+                          int* minIdx = 0, int* maxIdx = 0, InputArray mask = noArray());
+
+/** @overload
+@param a input single-channel array.
+@param minVal pointer to the returned minimum value; NULL is used if not required.
+@param maxVal pointer to the returned maximum value; NULL is used if not required.
+@param minIdx pointer to the returned minimum location (in nD case); NULL is used if not required;
+Otherwise, it must point to an array of src.dims elements, the coordinates of the minimum element
+in each dimension are stored there sequentially.
+@param maxIdx pointer to the returned maximum location (in nD case). NULL is used if not required.
+*/
+CV_EXPORTS void minMaxLoc(const SparseMat& a, double* minVal,
+                          double* maxVal, int* minIdx = 0, int* maxIdx = 0);
+
+/** @brief Reduces a matrix to a vector.
+
+The function #reduce reduces the matrix to a vector by treating the matrix rows/columns as a set of
+1D vectors and performing the specified operation on the vectors until a single row/column is
+obtained. For example, the function can be used to compute horizontal and vertical projections of a
+raster image. In case of #REDUCE_MAX and #REDUCE_MIN, the output image should have the same type as the source one.
+In case of #REDUCE_SUM, #REDUCE_SUM2 and #REDUCE_AVG, the output may have a larger element bit-depth to preserve accuracy.
+And multi-channel arrays are also supported in these two reduction modes.
+
+The following code demonstrates its usage for a single channel matrix.
+@snippet snippets/core_reduce.cpp example
+
+And the following code demonstrates its usage for a two-channel matrix.
+@snippet snippets/core_reduce.cpp example2
+
+@param src input 2D matrix.
+@param dst output vector. Its size and type is defined by dim and dtype parameters.
+@param dim dimension index along which the matrix is reduced. 0 means that the matrix is reduced to
+a single row. 1 means that the matrix is reduced to a single column.
+@param rtype reduction operation that could be one of #ReduceTypes
+@param dtype when negative, the output vector will have the same type as the input matrix,
+otherwise, its type will be CV_MAKE_TYPE(CV_MAT_DEPTH(dtype), src.channels()).
+@sa repeat, reduceArgMin, reduceArgMax
+*/
+CV_EXPORTS_W void reduce(InputArray src, OutputArray dst, int dim, int rtype, int dtype = -1);
+
+/** @brief Creates one multi-channel array out of several single-channel ones.
+
+The function cv::merge merges several arrays to make a single multi-channel array. That is, each
+element of the output array will be a concatenation of the elements of the input arrays, where
+elements of i-th input array are treated as mv[i].channels()-element vectors.
+
+The function cv::split does the reverse operation. If you need to shuffle channels in some other
+advanced way, use cv::mixChannels.
+
+The following example shows how to merge 3 single channel matrices into a single 3-channel matrix.
+@snippet snippets/core_merge.cpp example
+
+@param mv input array of matrices to be merged; all the matrices in mv must have the same
+size and the same depth.
+@param count number of input matrices when mv is a plain C array; it must be greater than zero.
+@param dst output array of the same size and the same depth as mv[0]; The number of channels will
+be equal to the parameter count.
+@sa  mixChannels, split, Mat::reshape
+*/
+CV_EXPORTS void merge(const Mat* mv, size_t count, OutputArray dst);
+
+/** @overload
+@param mv input vector of matrices to be merged; all the matrices in mv must have the same
+size and the same depth.
+@param dst output array of the same size and the same depth as mv[0]; The number of channels will
+be the total number of channels in the matrix array.
+  */
+CV_EXPORTS_W void merge(InputArrayOfArrays mv, OutputArray dst);
+
+/** @brief Divides a multi-channel array into several single-channel arrays.
+
+The function cv::split splits a multi-channel array into separate single-channel arrays:
+\f[\texttt{mv} [c](I) =  \texttt{src} (I)_c\f]
+If you need to extract a single channel or do some other sophisticated channel permutation, use
+mixChannels.
+
+The following example demonstrates how to split a 3-channel matrix into 3 single channel matrices.
+@snippet snippets/core_split.cpp example
+
+@param src input multi-channel array.
+@param mvbegin output array; the number of arrays must match src.channels(); the arrays themselves are
+reallocated, if needed.
+@sa merge, mixChannels, cvtColor
+*/
+CV_EXPORTS void split(const Mat& src, Mat* mvbegin);
+
+/** @overload
+@param m input multi-channel array.
+@param mv output vector of arrays; the arrays themselves are reallocated, if needed.
+*/
+CV_EXPORTS_W void split(InputArray m, OutputArrayOfArrays mv);
+
+/** @brief Copies specified channels from input arrays to the specified channels of
+output arrays.
+
+The function cv::mixChannels provides an advanced mechanism for shuffling image channels.
+
+cv::split,cv::merge,cv::extractChannel,cv::insertChannel and some forms of cv::cvtColor are partial cases of cv::mixChannels.
+
+In the example below, the code splits a 4-channel BGRA image into a 3-channel BGR (with B and R
+channels swapped) and a separate alpha-channel image:
+@code{.cpp}
+    Mat bgra( 100, 100, CV_8UC4, Scalar(255,0,0,255) );
+    Mat bgr( bgra.rows, bgra.cols, CV_8UC3 );
+    Mat alpha( bgra.rows, bgra.cols, CV_8UC1 );
+
+    // forming an array of matrices is a quite efficient operation,
+    // because the matrix data is not copied, only the headers
+    Mat out[] = { bgr, alpha };
+    // bgra[0] -> bgr[2], bgra[1] -> bgr[1],
+    // bgra[2] -> bgr[0], bgra[3] -> alpha[0]
+    int from_to[] = { 0,2, 1,1, 2,0, 3,3 };
+    mixChannels( &bgra, 1, out, 2, from_to, 4 );
+@endcode
+@note Unlike many other new-style C++ functions in OpenCV (see the introduction section and
+Mat::create ), cv::mixChannels requires the output arrays to be pre-allocated before calling the
+function.
+@param src input array or vector of matrices; all of the matrices must have the same size and the
+same depth.
+@param nsrcs number of matrices in `src`.
+@param dst output array or vector of matrices; all the matrices **must be allocated**; their size and
+depth must be the same as in `src[0]`.
+@param ndsts number of matrices in `dst`.
+@param fromTo array of index pairs specifying which channels are copied and where; fromTo[k\*2] is
+a 0-based index of the input channel in src, fromTo[k\*2+1] is an index of the output channel in
+dst; the continuous channel numbering is used: the first input image channels are indexed from 0 to
+src[0].channels()-1, the second input image channels are indexed from src[0].channels() to
+src[0].channels() + src[1].channels()-1, and so on, the same scheme is used for the output image
+channels; as a special case, when fromTo[k\*2] is negative, the corresponding output channel is
+filled with zero .
+@param npairs number of index pairs in `fromTo`.
+@sa split, merge, extractChannel, insertChannel, cvtColor
+*/
+CV_EXPORTS void mixChannels(const Mat* src, size_t nsrcs, Mat* dst, size_t ndsts,
+                            const int* fromTo, size_t npairs);
+
+/** @overload
+@param src input array or vector of matrices; all of the matrices must have the same size and the
+same depth.
+@param dst output array or vector of matrices; all the matrices **must be allocated**; their size and
+depth must be the same as in src[0].
+@param fromTo array of index pairs specifying which channels are copied and where; fromTo[k\*2] is
+a 0-based index of the input channel in src, fromTo[k\*2+1] is an index of the output channel in
+dst; the continuous channel numbering is used: the first input image channels are indexed from 0 to
+src[0].channels()-1, the second input image channels are indexed from src[0].channels() to
+src[0].channels() + src[1].channels()-1, and so on, the same scheme is used for the output image
+channels; as a special case, when fromTo[k\*2] is negative, the corresponding output channel is
+filled with zero .
+@param npairs number of index pairs in fromTo.
+*/
+CV_EXPORTS void mixChannels(InputArrayOfArrays src, InputOutputArrayOfArrays dst,
+                            const int* fromTo, size_t npairs);
+
+/** @overload
+@param src input array or vector of matrices; all of the matrices must have the same size and the
+same depth.
+@param dst output array or vector of matrices; all the matrices **must be allocated**; their size and
+depth must be the same as in src[0].
+@param fromTo array of index pairs specifying which channels are copied and where; fromTo[k\*2] is
+a 0-based index of the input channel in src, fromTo[k\*2+1] is an index of the output channel in
+dst; the continuous channel numbering is used: the first input image channels are indexed from 0 to
+src[0].channels()-1, the second input image channels are indexed from src[0].channels() to
+src[0].channels() + src[1].channels()-1, and so on, the same scheme is used for the output image
+channels; as a special case, when fromTo[k\*2] is negative, the corresponding output channel is
+filled with zero .
+*/
+CV_EXPORTS_W void mixChannels(InputArrayOfArrays src, InputOutputArrayOfArrays dst,
+                              const std::vector<int>& fromTo);
+
+/** @brief Extracts a single channel from src (coi is 0-based index)
+@param src input array
+@param dst output array
+@param coi index of channel to extract
+@sa mixChannels, split
+*/
+CV_EXPORTS_W void extractChannel(InputArray src, OutputArray dst, int coi);
+
+/** @brief Inserts a single channel to dst (coi is 0-based index)
+@param src input array
+@param dst output array
+@param coi index of channel for insertion
+@sa mixChannels, merge
+*/
+CV_EXPORTS_W void insertChannel(InputArray src, InputOutputArray dst, int coi);
+
+/** @brief Flips a 2D array around vertical, horizontal, or both axes.
+
+The function cv::flip flips the array in one of three different ways (row
+and column indices are 0-based):
+\f[\texttt{dst} _{ij} =
+\left\{
+\begin{array}{l l}
+\texttt{src} _{\texttt{src.rows}-i-1,j} & if\;  \texttt{flipCode} = 0 \\
+\texttt{src} _{i, \texttt{src.cols} -j-1} & if\;  \texttt{flipCode} > 0 \\
+\texttt{src} _{ \texttt{src.rows} -i-1, \texttt{src.cols} -j-1} & if\; \texttt{flipCode} < 0 \\
+\end{array}
+\right.\f]
+The example scenarios of using the function are the following:
+*   Vertical flipping of the image (flipCode == 0) to switch between
+    top-left and bottom-left image origin. This is a typical operation
+    in video processing on Microsoft Windows\* OS.
+*   Horizontal flipping of the image with the subsequent horizontal
+    shift and absolute difference calculation to check for a
+    vertical-axis symmetry (flipCode \> 0).
+*   Simultaneous horizontal and vertical flipping of the image with
+    the subsequent shift and absolute difference calculation to check
+    for a central symmetry (flipCode \< 0).
+*   Reversing the order of point arrays (flipCode \> 0 or
+    flipCode == 0).
+@param src input array.
+@param dst output array of the same size and type as src.
+@param flipCode a flag to specify how to flip the array; 0 means
+flipping around the x-axis and positive value (for example, 1) means
+flipping around y-axis. Negative value (for example, -1) means flipping
+around both axes.
+@sa transpose, repeat, completeSymm
+*/
+CV_EXPORTS_W void flip(InputArray src, OutputArray dst, int flipCode);
+
+/** @brief Flips a n-dimensional at given axis
+ *  @param src input array
+ *  @param dst output array that has the same shape of src
+ *  @param axis axis that performs a flip on. 0 <= axis < src.dims.
+ */
+CV_EXPORTS_W void flipND(InputArray src, OutputArray dst, int axis);
+
+/** @brief Broadcast the given Mat to the given shape.
+ * @param src input array
+ * @param shape target shape. Should be a list of CV_32S numbers. Note that negative values are not supported.
+ * @param dst output array that has the given shape
+ */
+CV_EXPORTS_W void broadcast(InputArray src, InputArray shape, OutputArray dst);
+
+enum RotateFlags {
+    ROTATE_90_CLOCKWISE = 0, //!<Rotate 90 degrees clockwise
+    ROTATE_180 = 1, //!<Rotate 180 degrees clockwise
+    ROTATE_90_COUNTERCLOCKWISE = 2, //!<Rotate 270 degrees clockwise
+};
+/** @brief Rotates a 2D array in multiples of 90 degrees.
+The function cv::rotate rotates the array in one of three different ways:
+*   Rotate by 90 degrees clockwise (rotateCode = ROTATE_90_CLOCKWISE).
+*   Rotate by 180 degrees clockwise (rotateCode = ROTATE_180).
+*   Rotate by 270 degrees clockwise (rotateCode = ROTATE_90_COUNTERCLOCKWISE).
+@param src input array.
+@param dst output array of the same type as src.  The size is the same with ROTATE_180,
+and the rows and cols are switched for ROTATE_90_CLOCKWISE and ROTATE_90_COUNTERCLOCKWISE.
+@param rotateCode an enum to specify how to rotate the array; see the enum #RotateFlags
+@sa transpose, repeat, completeSymm, flip, RotateFlags
+*/
+CV_EXPORTS_W void rotate(InputArray src, OutputArray dst, int rotateCode);
+
+/** @brief Fills the output array with repeated copies of the input array.
+
+The function cv::repeat duplicates the input array one or more times along each of the two axes:
+\f[\texttt{dst} _{ij}= \texttt{src} _{i\mod src.rows, \; j\mod src.cols }\f]
+The second variant of the function is more convenient to use with @ref MatrixExpressions.
+@param src input array to replicate.
+@param ny Flag to specify how many times the `src` is repeated along the
+vertical axis.
+@param nx Flag to specify how many times the `src` is repeated along the
+horizontal axis.
+@param dst output array of the same type as `src`.
+@sa cv::reduce
+*/
+CV_EXPORTS_W void repeat(InputArray src, int ny, int nx, OutputArray dst);
+
+/** @overload
+@param src input array to replicate.
+@param ny Flag to specify how many times the `src` is repeated along the
+vertical axis.
+@param nx Flag to specify how many times the `src` is repeated along the
+horizontal axis.
+  */
+CV_EXPORTS Mat repeat(const Mat& src, int ny, int nx);
+
+/** @brief Applies horizontal concatenation to given matrices.
+
+The function horizontally concatenates two or more cv::Mat matrices (with the same number of rows).
+@code{.cpp}
+    cv::Mat matArray[] = { cv::Mat(4, 1, CV_8UC1, cv::Scalar(1)),
+                           cv::Mat(4, 1, CV_8UC1, cv::Scalar(2)),
+                           cv::Mat(4, 1, CV_8UC1, cv::Scalar(3)),};
+
+    cv::Mat out;
+    cv::hconcat( matArray, 3, out );
+    //out:
+    //[1, 2, 3;
+    // 1, 2, 3;
+    // 1, 2, 3;
+    // 1, 2, 3]
+@endcode
+@param src input array or vector of matrices. all of the matrices must have the same number of rows and the same depth.
+@param nsrc number of matrices in src.
+@param dst output array. It has the same number of rows and depth as the src, and the sum of cols of the src.
+@sa cv::vconcat(const Mat*, size_t, OutputArray), @sa cv::vconcat(InputArrayOfArrays, OutputArray) and @sa cv::vconcat(InputArray, InputArray, OutputArray)
+*/
+CV_EXPORTS void hconcat(const Mat* src, size_t nsrc, OutputArray dst);
+/** @overload
+ @code{.cpp}
+    cv::Mat_<float> A = (cv::Mat_<float>(3, 2) << 1, 4,
+                                                  2, 5,
+                                                  3, 6);
+    cv::Mat_<float> B = (cv::Mat_<float>(3, 2) << 7, 10,
+                                                  8, 11,
+                                                  9, 12);
+
+    cv::Mat C;
+    cv::hconcat(A, B, C);
+    //C:
+    //[1, 4, 7, 10;
+    // 2, 5, 8, 11;
+    // 3, 6, 9, 12]
+ @endcode
+ @param src1 first input array to be considered for horizontal concatenation.
+ @param src2 second input array to be considered for horizontal concatenation.
+ @param dst output array. It has the same number of rows and depth as the src1 and src2, and the sum of cols of the src1 and src2.
+ */
+CV_EXPORTS void hconcat(InputArray src1, InputArray src2, OutputArray dst);
+/** @overload
+ @code{.cpp}
+    std::vector<cv::Mat> matrices = { cv::Mat(4, 1, CV_8UC1, cv::Scalar(1)),
+                                      cv::Mat(4, 1, CV_8UC1, cv::Scalar(2)),
+                                      cv::Mat(4, 1, CV_8UC1, cv::Scalar(3)),};
+
+    cv::Mat out;
+    cv::hconcat( matrices, out );
+    //out:
+    //[1, 2, 3;
+    // 1, 2, 3;
+    // 1, 2, 3;
+    // 1, 2, 3]
+ @endcode
+ @param src input array or vector of matrices. all of the matrices must have the same number of rows and the same depth.
+ @param dst output array. It has the same number of rows and depth as the src, and the sum of cols of the src.
+same depth.
+ */
+CV_EXPORTS_W void hconcat(InputArrayOfArrays src, OutputArray dst);
+
+/** @brief Applies vertical concatenation to given matrices.
+
+The function vertically concatenates two or more cv::Mat matrices (with the same number of cols).
+@code{.cpp}
+    cv::Mat matArray[] = { cv::Mat(1, 4, CV_8UC1, cv::Scalar(1)),
+                           cv::Mat(1, 4, CV_8UC1, cv::Scalar(2)),
+                           cv::Mat(1, 4, CV_8UC1, cv::Scalar(3)),};
+
+    cv::Mat out;
+    cv::vconcat( matArray, 3, out );
+    //out:
+    //[1,   1,   1,   1;
+    // 2,   2,   2,   2;
+    // 3,   3,   3,   3]
+@endcode
+@param src input array or vector of matrices. all of the matrices must have the same number of cols and the same depth.
+@param nsrc number of matrices in src.
+@param dst output array. It has the same number of cols and depth as the src, and the sum of rows of the src.
+@sa cv::hconcat(const Mat*, size_t, OutputArray), @sa cv::hconcat(InputArrayOfArrays, OutputArray) and @sa cv::hconcat(InputArray, InputArray, OutputArray)
+*/
+CV_EXPORTS void vconcat(const Mat* src, size_t nsrc, OutputArray dst);
+/** @overload
+ @code{.cpp}
+    cv::Mat_<float> A = (cv::Mat_<float>(3, 2) << 1, 7,
+                                                  2, 8,
+                                                  3, 9);
+    cv::Mat_<float> B = (cv::Mat_<float>(3, 2) << 4, 10,
+                                                  5, 11,
+                                                  6, 12);
+
+    cv::Mat C;
+    cv::vconcat(A, B, C);
+    //C:
+    //[1, 7;
+    // 2, 8;
+    // 3, 9;
+    // 4, 10;
+    // 5, 11;
+    // 6, 12]
+ @endcode
+ @param src1 first input array to be considered for vertical concatenation.
+ @param src2 second input array to be considered for vertical concatenation.
+ @param dst output array. It has the same number of cols and depth as the src1 and src2, and the sum of rows of the src1 and src2.
+ */
+CV_EXPORTS void vconcat(InputArray src1, InputArray src2, OutputArray dst);
+/** @overload
+ @code{.cpp}
+    std::vector<cv::Mat> matrices = { cv::Mat(1, 4, CV_8UC1, cv::Scalar(1)),
+                                      cv::Mat(1, 4, CV_8UC1, cv::Scalar(2)),
+                                      cv::Mat(1, 4, CV_8UC1, cv::Scalar(3)),};
+
+    cv::Mat out;
+    cv::vconcat( matrices, out );
+    //out:
+    //[1,   1,   1,   1;
+    // 2,   2,   2,   2;
+    // 3,   3,   3,   3]
+ @endcode
+ @param src input array or vector of matrices. all of the matrices must have the same number of cols and the same depth
+ @param dst output array. It has the same number of cols and depth as the src, and the sum of rows of the src.
+same depth.
+ */
+CV_EXPORTS_W void vconcat(InputArrayOfArrays src, OutputArray dst);
+
+/** @brief computes bitwise conjunction of the two arrays (dst = src1 & src2)
+Calculates the per-element bit-wise conjunction of two arrays or an
+array and a scalar.
+
+The function cv::bitwise_and calculates the per-element bit-wise logical conjunction for:
+*   Two arrays when src1 and src2 have the same size:
+    \f[\texttt{dst} (I) =  \texttt{src1} (I)  \wedge \texttt{src2} (I) \quad \texttt{if mask} (I) \ne0\f]
+*   An array and a scalar when src2 is constructed from Scalar or has
+    the same number of elements as `src1.channels()`:
+    \f[\texttt{dst} (I) =  \texttt{src1} (I)  \wedge \texttt{src2} \quad \texttt{if mask} (I) \ne0\f]
+*   A scalar and an array when src1 is constructed from Scalar or has
+    the same number of elements as `src2.channels()`:
+    \f[\texttt{dst} (I) =  \texttt{src1}  \wedge \texttt{src2} (I) \quad \texttt{if mask} (I) \ne0\f]
+In case of floating-point arrays, their machine-specific bit
+representations (usually IEEE754-compliant) are used for the operation.
+In case of multi-channel arrays, each channel is processed
+independently. In the second and third cases above, the scalar is first
+converted to the array type.
+@param src1 first input array or a scalar.
+@param src2 second input array or a scalar.
+@param dst output array that has the same size and type as the input
+arrays.
+@param mask optional operation mask, 8-bit single channel array, that
+specifies elements of the output array to be changed.
+*/
+CV_EXPORTS_W void bitwise_and(InputArray src1, InputArray src2,
+                              OutputArray dst, InputArray mask = noArray());
+
+/** @brief Calculates the per-element bit-wise disjunction of two arrays or an
+array and a scalar.
+
+The function cv::bitwise_or calculates the per-element bit-wise logical disjunction for:
+*   Two arrays when src1 and src2 have the same size:
+    \f[\texttt{dst} (I) =  \texttt{src1} (I)  \vee \texttt{src2} (I) \quad \texttt{if mask} (I) \ne0\f]
+*   An array and a scalar when src2 is constructed from Scalar or has
+    the same number of elements as `src1.channels()`:
+    \f[\texttt{dst} (I) =  \texttt{src1} (I)  \vee \texttt{src2} \quad \texttt{if mask} (I) \ne0\f]
+*   A scalar and an array when src1 is constructed from Scalar or has
+    the same number of elements as `src2.channels()`:
+    \f[\texttt{dst} (I) =  \texttt{src1}  \vee \texttt{src2} (I) \quad \texttt{if mask} (I) \ne0\f]
+In case of floating-point arrays, their machine-specific bit
+representations (usually IEEE754-compliant) are used for the operation.
+In case of multi-channel arrays, each channel is processed
+independently. In the second and third cases above, the scalar is first
+converted to the array type.
+@param src1 first input array or a scalar.
+@param src2 second input array or a scalar.
+@param dst output array that has the same size and type as the input
+arrays.
+@param mask optional operation mask, 8-bit single channel array, that
+specifies elements of the output array to be changed.
+*/
+CV_EXPORTS_W void bitwise_or(InputArray src1, InputArray src2,
+                             OutputArray dst, InputArray mask = noArray());
+
+/** @brief Calculates the per-element bit-wise "exclusive or" operation on two
+arrays or an array and a scalar.
+
+The function cv::bitwise_xor calculates the per-element bit-wise logical "exclusive-or"
+operation for:
+*   Two arrays when src1 and src2 have the same size:
+    \f[\texttt{dst} (I) =  \texttt{src1} (I)  \oplus \texttt{src2} (I) \quad \texttt{if mask} (I) \ne0\f]
+*   An array and a scalar when src2 is constructed from Scalar or has
+    the same number of elements as `src1.channels()`:
+    \f[\texttt{dst} (I) =  \texttt{src1} (I)  \oplus \texttt{src2} \quad \texttt{if mask} (I) \ne0\f]
+*   A scalar and an array when src1 is constructed from Scalar or has
+    the same number of elements as `src2.channels()`:
+    \f[\texttt{dst} (I) =  \texttt{src1}  \oplus \texttt{src2} (I) \quad \texttt{if mask} (I) \ne0\f]
+In case of floating-point arrays, their machine-specific bit
+representations (usually IEEE754-compliant) are used for the operation.
+In case of multi-channel arrays, each channel is processed
+independently. In the 2nd and 3rd cases above, the scalar is first
+converted to the array type.
+@param src1 first input array or a scalar.
+@param src2 second input array or a scalar.
+@param dst output array that has the same size and type as the input
+arrays.
+@param mask optional operation mask, 8-bit single channel array, that
+specifies elements of the output array to be changed.
+*/
+CV_EXPORTS_W void bitwise_xor(InputArray src1, InputArray src2,
+                              OutputArray dst, InputArray mask = noArray());
+
+/** @brief  Inverts every bit of an array.
+
+The function cv::bitwise_not calculates per-element bit-wise inversion of the input
+array:
+\f[\texttt{dst} (I) =  \neg \texttt{src} (I)\f]
+In case of a floating-point input array, its machine-specific bit
+representation (usually IEEE754-compliant) is used for the operation. In
+case of multi-channel arrays, each channel is processed independently.
+@param src input array.
+@param dst output array that has the same size and type as the input
+array.
+@param mask optional operation mask, 8-bit single channel array, that
+specifies elements of the output array to be changed.
+*/
+CV_EXPORTS_W void bitwise_not(InputArray src, OutputArray dst,
+                              InputArray mask = noArray());
+
+/** @brief Calculates the per-element absolute difference between two arrays or between an array and a scalar.
+
+The function cv::absdiff calculates:
+*   Absolute difference between two arrays when they have the same
+    size and type:
+    \f[\texttt{dst}(I) =  \texttt{saturate} (| \texttt{src1}(I) -  \texttt{src2}(I)|)\f]
+*   Absolute difference between an array and a scalar when the second
+    array is constructed from Scalar or has as many elements as the
+    number of channels in `src1`:
+    \f[\texttt{dst}(I) =  \texttt{saturate} (| \texttt{src1}(I) -  \texttt{src2} |)\f]
+*   Absolute difference between a scalar and an array when the first
+    array is constructed from Scalar or has as many elements as the
+    number of channels in `src2`:
+    \f[\texttt{dst}(I) =  \texttt{saturate} (| \texttt{src1} -  \texttt{src2}(I) |)\f]
+    where I is a multi-dimensional index of array elements. In case of
+    multi-channel arrays, each channel is processed independently.
+@note Saturation is not applied when the arrays have the depth CV_32S.
+You may even get a negative value in the case of overflow.
+@note (Python) Be careful to difference behaviour between src1/src2 are single number and they are tuple/array.
+`absdiff(src,X)` means `absdiff(src,(X,X,X,X))`.
+`absdiff(src,(X,))` means `absdiff(src,(X,0,0,0))`.
+@param src1 first input array or a scalar.
+@param src2 second input array or a scalar.
+@param dst output array that has the same size and type as input arrays.
+@sa cv::abs(const Mat&)
+*/
+CV_EXPORTS_W void absdiff(InputArray src1, InputArray src2, OutputArray dst);
+
+/** @brief  This is an overloaded member function, provided for convenience (python)
+Copies the matrix to another one.
+When the operation mask is specified, if the Mat::create call shown above reallocates the matrix, the newly allocated matrix is initialized with all zeros before copying the data.
+@param src source matrix.
+@param dst Destination matrix. If it does not have a proper size or type before the operation, it is
+reallocated.
+@param mask Operation mask of the same size as \*this. Its non-zero elements indicate which matrix
+elements need to be copied. The mask has to be of type CV_8U and can have 1 or multiple channels.
+*/
+
+void CV_EXPORTS_W copyTo(InputArray src, OutputArray dst, InputArray mask);
+/** @brief  Checks if array elements lie between the elements of two other arrays.
+
+The function checks the range as follows:
+-   For every element of a single-channel input array:
+    \f[\texttt{dst} (I)= \texttt{lowerb} (I)_0  \leq \texttt{src} (I)_0 \leq  \texttt{upperb} (I)_0\f]
+-   For two-channel arrays:
+    \f[\texttt{dst} (I)= \texttt{lowerb} (I)_0  \leq \texttt{src} (I)_0 \leq  \texttt{upperb} (I)_0  \land \texttt{lowerb} (I)_1  \leq \texttt{src} (I)_1 \leq  \texttt{upperb} (I)_1\f]
+-   and so forth.
+
+That is, dst (I) is set to 255 (all 1 -bits) if src (I) is within the
+specified 1D, 2D, 3D, ... box and 0 otherwise.
+
+When the lower and/or upper boundary parameters are scalars, the indexes
+(I) at lowerb and upperb in the above formulas should be omitted.
+@param src first input array.
+@param lowerb inclusive lower boundary array or a scalar.
+@param upperb inclusive upper boundary array or a scalar.
+@param dst output array of the same size as src and CV_8U type.
+*/
+CV_EXPORTS_W void inRange(InputArray src, InputArray lowerb,
+                          InputArray upperb, OutputArray dst);
+
+/** @brief Performs the per-element comparison of two arrays or an array and scalar value.
+
+The function compares:
+*   Elements of two arrays when src1 and src2 have the same size:
+    \f[\texttt{dst} (I) =  \texttt{src1} (I)  \,\texttt{cmpop}\, \texttt{src2} (I)\f]
+*   Elements of src1 with a scalar src2 when src2 is constructed from
+    Scalar or has a single element:
+    \f[\texttt{dst} (I) =  \texttt{src1}(I) \,\texttt{cmpop}\,  \texttt{src2}\f]
+*   src1 with elements of src2 when src1 is constructed from Scalar or
+    has a single element:
+    \f[\texttt{dst} (I) =  \texttt{src1}  \,\texttt{cmpop}\, \texttt{src2} (I)\f]
+When the comparison result is true, the corresponding element of output
+array is set to 255. The comparison operations can be replaced with the
+equivalent matrix expressions:
+@code{.cpp}
+    Mat dst1 = src1 >= src2;
+    Mat dst2 = src1 < 8;
+    ...
+@endcode
+@param src1 first input array or a scalar; when it is an array, it must have a single channel.
+@param src2 second input array or a scalar; when it is an array, it must have a single channel.
+@param dst output array of type ref CV_8U that has the same size and the same number of channels as
+    the input arrays.
+@param cmpop a flag, that specifies correspondence between the arrays (cv::CmpTypes)
+@sa checkRange, min, max, threshold
+*/
+CV_EXPORTS_W void compare(InputArray src1, InputArray src2, OutputArray dst, int cmpop);
+
+/** @brief Calculates per-element minimum of two arrays or an array and a scalar.
+
+The function cv::min calculates the per-element minimum of two arrays:
+\f[\texttt{dst} (I)= \min ( \texttt{src1} (I), \texttt{src2} (I))\f]
+or array and a scalar:
+\f[\texttt{dst} (I)= \min ( \texttt{src1} (I), \texttt{value} )\f]
+@param src1 first input array.
+@param src2 second input array of the same size and type as src1.
+@param dst output array of the same size and type as src1.
+@sa max, compare, inRange, minMaxLoc
+*/
+CV_EXPORTS_W void min(InputArray src1, InputArray src2, OutputArray dst);
+/** @overload
+needed to avoid conflicts with const _Tp& std::min(const _Tp&, const _Tp&, _Compare)
+*/
+CV_EXPORTS void min(const Mat& src1, const Mat& src2, Mat& dst);
+/** @overload
+needed to avoid conflicts with const _Tp& std::min(const _Tp&, const _Tp&, _Compare)
+*/
+CV_EXPORTS void min(const UMat& src1, const UMat& src2, UMat& dst);
+
+/** @brief Calculates per-element maximum of two arrays or an array and a scalar.
+
+The function cv::max calculates the per-element maximum of two arrays:
+\f[\texttt{dst} (I)= \max ( \texttt{src1} (I), \texttt{src2} (I))\f]
+or array and a scalar:
+\f[\texttt{dst} (I)= \max ( \texttt{src1} (I), \texttt{value} )\f]
+@param src1 first input array.
+@param src2 second input array of the same size and type as src1 .
+@param dst output array of the same size and type as src1.
+@sa  min, compare, inRange, minMaxLoc, @ref MatrixExpressions
+*/
+CV_EXPORTS_W void max(InputArray src1, InputArray src2, OutputArray dst);
+/** @overload
+needed to avoid conflicts with const _Tp& std::min(const _Tp&, const _Tp&, _Compare)
+*/
+CV_EXPORTS void max(const Mat& src1, const Mat& src2, Mat& dst);
+/** @overload
+needed to avoid conflicts with const _Tp& std::min(const _Tp&, const _Tp&, _Compare)
+*/
+CV_EXPORTS void max(const UMat& src1, const UMat& src2, UMat& dst);
+
+/** @brief Calculates a square root of array elements.
+
+The function cv::sqrt calculates a square root of each input array element.
+In case of multi-channel arrays, each channel is processed
+independently. The accuracy is approximately the same as of the built-in
+std::sqrt .
+@param src input floating-point array.
+@param dst output array of the same size and type as src.
+*/
+CV_EXPORTS_W void sqrt(InputArray src, OutputArray dst);
+
+/** @brief Raises every array element to a power.
+
+The function cv::pow raises every element of the input array to power :
+\f[\texttt{dst} (I) =  \fork{\texttt{src}(I)^{power}}{if \(\texttt{power}\) is integer}{|\texttt{src}(I)|^{power}}{otherwise}\f]
+
+So, for a non-integer power exponent, the absolute values of input array
+elements are used. However, it is possible to get true values for
+negative values using some extra operations. In the example below,
+computing the 5th root of array src shows:
+@code{.cpp}
+    Mat mask = src < 0;
+    pow(src, 1./5, dst);
+    subtract(Scalar::all(0), dst, dst, mask);
+@endcode
+For some values of power, such as integer values, 0.5 and -0.5,
+specialized faster algorithms are used.
+
+Special values (NaN, Inf) are not handled.
+@param src input array.
+@param power exponent of power.
+@param dst output array of the same size and type as src.
+@sa sqrt, exp, log, cartToPolar, polarToCart
+*/
+CV_EXPORTS_W void pow(InputArray src, double power, OutputArray dst);
+
+/** @brief Calculates the exponent of every array element.
+
+The function cv::exp calculates the exponent of every element of the input
+array:
+\f[\texttt{dst} [I] = e^{ src(I) }\f]
+
+The maximum relative error is about 7e-6 for single-precision input and
+less than 1e-10 for double-precision input. Currently, the function
+converts denormalized values to zeros on output. Special values (NaN,
+Inf) are not handled.
+@param src input array.
+@param dst output array of the same size and type as src.
+@sa log, cartToPolar, polarToCart, phase, pow, sqrt, magnitude
+*/
+CV_EXPORTS_W void exp(InputArray src, OutputArray dst);
+
+/** @brief Calculates the natural logarithm of every array element.
+
+The function cv::log calculates the natural logarithm of every element of the input array:
+\f[\texttt{dst} (I) =  \log (\texttt{src}(I)) \f]
+
+Output on zero, negative and special (NaN, Inf) values is undefined.
+
+@param src input array.
+@param dst output array of the same size and type as src .
+@sa exp, cartToPolar, polarToCart, phase, pow, sqrt, magnitude
+*/
+CV_EXPORTS_W void log(InputArray src, OutputArray dst);
+
+/** @brief Calculates x and y coordinates of 2D vectors from their magnitude and angle.
+
+The function cv::polarToCart calculates the Cartesian coordinates of each 2D
+vector represented by the corresponding elements of magnitude and angle:
+\f[\begin{array}{l} \texttt{x} (I) =  \texttt{magnitude} (I) \cos ( \texttt{angle} (I)) \\ \texttt{y} (I) =  \texttt{magnitude} (I) \sin ( \texttt{angle} (I)) \\ \end{array}\f]
+
+The relative accuracy of the estimated coordinates is about 1e-6.
+@param magnitude input floating-point array of magnitudes of 2D vectors;
+it can be an empty matrix (=Mat()), in this case, the function assumes
+that all the magnitudes are =1; if it is not empty, it must have the
+same size and type as angle.
+@param angle input floating-point array of angles of 2D vectors.
+@param x output array of x-coordinates of 2D vectors; it has the same
+size and type as angle.
+@param y output array of y-coordinates of 2D vectors; it has the same
+size and type as angle.
+@param angleInDegrees when true, the input angles are measured in
+degrees, otherwise, they are measured in radians.
+@sa cartToPolar, magnitude, phase, exp, log, pow, sqrt
+*/
+CV_EXPORTS_W void polarToCart(InputArray magnitude, InputArray angle,
+                              OutputArray x, OutputArray y, bool angleInDegrees = false);
+
+/** @brief Calculates the magnitude and angle of 2D vectors.
+
+The function cv::cartToPolar calculates either the magnitude, angle, or both
+for every 2D vector (x(I),y(I)):
+\f[\begin{array}{l} \texttt{magnitude} (I)= \sqrt{\texttt{x}(I)^2+\texttt{y}(I)^2} , \\ \texttt{angle} (I)= \texttt{atan2} ( \texttt{y} (I), \texttt{x} (I))[ \cdot180 / \pi ] \end{array}\f]
+
+The angles are calculated with accuracy about 0.3 degrees. For the point
+(0,0), the angle is set to 0.
+@param x array of x-coordinates; this must be a single-precision or
+double-precision floating-point array.
+@param y array of y-coordinates, that must have the same size and same type as x.
+@param magnitude output array of magnitudes of the same size and type as x.
+@param angle output array of angles that has the same size and type as
+x; the angles are measured in radians (from 0 to 2\*Pi) or in degrees (0 to 360 degrees).
+@param angleInDegrees a flag, indicating whether the angles are measured
+in radians (which is by default), or in degrees.
+@sa Sobel, Scharr
+*/
+CV_EXPORTS_W void cartToPolar(InputArray x, InputArray y,
+                              OutputArray magnitude, OutputArray angle,
+                              bool angleInDegrees = false);
+
+/** @brief Calculates the rotation angle of 2D vectors.
+
+The function cv::phase calculates the rotation angle of each 2D vector that
+is formed from the corresponding elements of x and y :
+\f[\texttt{angle} (I) =  \texttt{atan2} ( \texttt{y} (I), \texttt{x} (I))\f]
+
+The angle estimation accuracy is about 0.3 degrees. When x(I)=y(I)=0 ,
+the corresponding angle(I) is set to 0.
+@param x input floating-point array of x-coordinates of 2D vectors.
+@param y input array of y-coordinates of 2D vectors; it must have the
+same size and the same type as x.
+@param angle output array of vector angles; it has the same size and
+same type as x .
+@param angleInDegrees when true, the function calculates the angle in
+degrees, otherwise, they are measured in radians.
+*/
+CV_EXPORTS_W void phase(InputArray x, InputArray y, OutputArray angle,
+                        bool angleInDegrees = false);
+
+/** @brief Calculates the magnitude of 2D vectors.
+
+The function cv::magnitude calculates the magnitude of 2D vectors formed
+from the corresponding elements of x and y arrays:
+\f[\texttt{dst} (I) =  \sqrt{\texttt{x}(I)^2 + \texttt{y}(I)^2}\f]
+@param x floating-point array of x-coordinates of the vectors.
+@param y floating-point array of y-coordinates of the vectors; it must
+have the same size as x.
+@param magnitude output array of the same size and type as x.
+@sa cartToPolar, polarToCart, phase, sqrt
+*/
+CV_EXPORTS_W void magnitude(InputArray x, InputArray y, OutputArray magnitude);
+
+/** @brief Checks every element of an input array for invalid values.
+
+The function cv::checkRange checks that every array element is neither NaN nor infinite. When minVal \>
+-DBL_MAX and maxVal \< DBL_MAX, the function also checks that each value is between minVal and
+maxVal. In case of multi-channel arrays, each channel is processed independently. If some values
+are out of range, position of the first outlier is stored in pos (when pos != NULL). Then, the
+function either returns false (when quiet=true) or throws an exception.
+@param a input array.
+@param quiet a flag, indicating whether the functions quietly return false when the array elements
+are out of range or they throw an exception.
+@param pos optional output parameter, when not NULL, must be a pointer to array of src.dims
+elements.
+@param minVal inclusive lower boundary of valid values range.
+@param maxVal exclusive upper boundary of valid values range.
+*/
+CV_EXPORTS_W bool checkRange(InputArray a, bool quiet = true, CV_OUT Point* pos = 0,
+                            double minVal = -DBL_MAX, double maxVal = DBL_MAX);
+
+/** @brief Replaces NaNs by given number
+@param a input/output matrix (CV_32F type).
+@param val value to convert the NaNs
+*/
+CV_EXPORTS_W void patchNaNs(InputOutputArray a, double val = 0);
+
+/** @brief Performs generalized matrix multiplication.
+
+The function cv::gemm performs generalized matrix multiplication similar to the
+gemm functions in BLAS level 3. For example,
+`gemm(src1, src2, alpha, src3, beta, dst, GEMM_1_T + GEMM_3_T)`
+corresponds to
+\f[\texttt{dst} =  \texttt{alpha} \cdot \texttt{src1} ^T  \cdot \texttt{src2} +  \texttt{beta} \cdot \texttt{src3} ^T\f]
+
+In case of complex (two-channel) data, performed a complex matrix
+multiplication.
+
+The function can be replaced with a matrix expression. For example, the
+above call can be replaced with:
+@code{.cpp}
+    dst = alpha*src1.t()*src2 + beta*src3.t();
+@endcode
+@param src1 first multiplied input matrix that could be real(CV_32FC1,
+CV_64FC1) or complex(CV_32FC2, CV_64FC2).
+@param src2 second multiplied input matrix of the same type as src1.
+@param alpha weight of the matrix product.
+@param src3 third optional delta matrix added to the matrix product; it
+should have the same type as src1 and src2.
+@param beta weight of src3.
+@param dst output matrix; it has the proper size and the same type as
+input matrices.
+@param flags operation flags (cv::GemmFlags)
+@sa mulTransposed, transform
+*/
+CV_EXPORTS_W void gemm(InputArray src1, InputArray src2, double alpha,
+                       InputArray src3, double beta, OutputArray dst, int flags = 0);
+
+/** @brief Calculates the product of a matrix and its transposition.
+
+The function cv::mulTransposed calculates the product of src and its
+transposition:
+\f[\texttt{dst} = \texttt{scale} ( \texttt{src} - \texttt{delta} )^T ( \texttt{src} - \texttt{delta} )\f]
+if aTa=true, and
+\f[\texttt{dst} = \texttt{scale} ( \texttt{src} - \texttt{delta} ) ( \texttt{src} - \texttt{delta} )^T\f]
+otherwise. The function is used to calculate the covariance matrix. With
+zero delta, it can be used as a faster substitute for general matrix
+product A\*B when B=A'
+@param src input single-channel matrix. Note that unlike gemm, the
+function can multiply not only floating-point matrices.
+@param dst output square matrix.
+@param aTa Flag specifying the multiplication ordering. See the
+description below.
+@param delta Optional delta matrix subtracted from src before the
+multiplication. When the matrix is empty ( delta=noArray() ), it is
+assumed to be zero, that is, nothing is subtracted. If it has the same
+size as src, it is simply subtracted. Otherwise, it is "repeated" (see
+repeat ) to cover the full src and then subtracted. Type of the delta
+matrix, when it is not empty, must be the same as the type of created
+output matrix. See the dtype parameter description below.
+@param scale Optional scale factor for the matrix product.
+@param dtype Optional type of the output matrix. When it is negative,
+the output matrix will have the same type as src . Otherwise, it will be
+type=CV_MAT_DEPTH(dtype) that should be either CV_32F or CV_64F .
+@sa calcCovarMatrix, gemm, repeat, reduce
+*/
+CV_EXPORTS_W void mulTransposed( InputArray src, OutputArray dst, bool aTa,
+                                 InputArray delta = noArray(),
+                                 double scale = 1, int dtype = -1 );
+
+/** @brief Transposes a matrix.
+
+The function cv::transpose transposes the matrix src :
+\f[\texttt{dst} (i,j) =  \texttt{src} (j,i)\f]
+@note No complex conjugation is done in case of a complex matrix. It
+should be done separately if needed.
+@param src input array.
+@param dst output array of the same type as src.
+*/
+CV_EXPORTS_W void transpose(InputArray src, OutputArray dst);
+
+/** @brief Transpose for n-dimensional matrices.
+ *
+ * @note Input should be continuous single-channel matrix.
+ * @param src input array.
+ * @param order a permutation of [0,1,..,N-1] where N is the number of axes of src.
+ * The i'th axis of dst will correspond to the axis numbered order[i] of the input.
+ * @param dst output array of the same type as src.
+ */
+CV_EXPORTS_W void transposeND(InputArray src, const std::vector<int>& order, OutputArray dst);
+
+/** @brief Performs the matrix transformation of every array element.
+
+The function cv::transform performs the matrix transformation of every
+element of the array src and stores the results in dst :
+\f[\texttt{dst} (I) =  \texttt{m} \cdot \texttt{src} (I)\f]
+(when m.cols=src.channels() ), or
+\f[\texttt{dst} (I) =  \texttt{m} \cdot [ \texttt{src} (I); 1]\f]
+(when m.cols=src.channels()+1 )
+
+Every element of the N -channel array src is interpreted as N -element
+vector that is transformed using the M x N or M x (N+1) matrix m to
+M-element vector - the corresponding element of the output array dst .
+
+The function may be used for geometrical transformation of
+N -dimensional points, arbitrary linear color space transformation (such
+as various kinds of RGB to YUV transforms), shuffling the image
+channels, and so forth.
+@param src input array that must have as many channels (1 to 4) as
+m.cols or m.cols-1.
+@param dst output array of the same size and depth as src; it has as
+many channels as m.rows.
+@param m transformation 2x2 or 2x3 floating-point matrix.
+@sa perspectiveTransform, getAffineTransform, estimateAffine2D, warpAffine, warpPerspective
+*/
+CV_EXPORTS_W void transform(InputArray src, OutputArray dst, InputArray m );
+
+/** @brief Performs the perspective matrix transformation of vectors.
+
+The function cv::perspectiveTransform transforms every element of src by
+treating it as a 2D or 3D vector, in the following way:
+\f[(x, y, z)  \rightarrow (x'/w, y'/w, z'/w)\f]
+where
+\f[(x', y', z', w') =  \texttt{mat} \cdot \begin{bmatrix} x & y & z & 1  \end{bmatrix}\f]
+and
+\f[w =  \fork{w'}{if \(w' \ne 0\)}{\infty}{otherwise}\f]
+
+Here a 3D vector transformation is shown. In case of a 2D vector
+transformation, the z component is omitted.
+
+@note The function transforms a sparse set of 2D or 3D vectors. If you
+want to transform an image using perspective transformation, use
+warpPerspective . If you have an inverse problem, that is, you want to
+compute the most probable perspective transformation out of several
+pairs of corresponding points, you can use getPerspectiveTransform or
+findHomography .
+@param src input two-channel or three-channel floating-point array; each
+element is a 2D/3D vector to be transformed.
+@param dst output array of the same size and type as src.
+@param m 3x3 or 4x4 floating-point transformation matrix.
+@sa  transform, warpPerspective, getPerspectiveTransform, findHomography
+*/
+CV_EXPORTS_W void perspectiveTransform(InputArray src, OutputArray dst, InputArray m );
+
+/** @brief Copies the lower or the upper half of a square matrix to its another half.
+
+The function cv::completeSymm copies the lower or the upper half of a square matrix to
+its another half. The matrix diagonal remains unchanged:
+ - \f$\texttt{m}_{ij}=\texttt{m}_{ji}\f$ for \f$i > j\f$ if
+    lowerToUpper=false
+ - \f$\texttt{m}_{ij}=\texttt{m}_{ji}\f$ for \f$i < j\f$ if
+    lowerToUpper=true
+
+@param m input-output floating-point square matrix.
+@param lowerToUpper operation flag; if true, the lower half is copied to
+the upper half. Otherwise, the upper half is copied to the lower half.
+@sa flip, transpose
+*/
+CV_EXPORTS_W void completeSymm(InputOutputArray m, bool lowerToUpper = false);
+
+/** @brief Initializes a scaled identity matrix.
+
+The function cv::setIdentity initializes a scaled identity matrix:
+\f[\texttt{mtx} (i,j)= \fork{\texttt{value}}{ if \(i=j\)}{0}{otherwise}\f]
+
+The function can also be emulated using the matrix initializers and the
+matrix expressions:
+@code
+    Mat A = Mat::eye(4, 3, CV_32F)*5;
+    // A will be set to [[5, 0, 0], [0, 5, 0], [0, 0, 5], [0, 0, 0]]
+@endcode
+@param mtx matrix to initialize (not necessarily square).
+@param s value to assign to diagonal elements.
+@sa Mat::zeros, Mat::ones, Mat::setTo, Mat::operator=
+*/
+CV_EXPORTS_W void setIdentity(InputOutputArray mtx, const Scalar& s = Scalar(1));
+
+/** @brief Returns the determinant of a square floating-point matrix.
+
+The function cv::determinant calculates and returns the determinant of the
+specified matrix. For small matrices ( mtx.cols=mtx.rows\<=3 ), the
+direct method is used. For larger matrices, the function uses LU
+factorization with partial pivoting.
+
+For symmetric positively-determined matrices, it is also possible to use
+eigen decomposition to calculate the determinant.
+@param mtx input matrix that must have CV_32FC1 or CV_64FC1 type and
+square size.
+@sa trace, invert, solve, eigen, @ref MatrixExpressions
+*/
+CV_EXPORTS_W double determinant(InputArray mtx);
+
+/** @brief Returns the trace of a matrix.
+
+The function cv::trace returns the sum of the diagonal elements of the
+matrix mtx .
+\f[\mathrm{tr} ( \texttt{mtx} ) =  \sum _i  \texttt{mtx} (i,i)\f]
+@param mtx input matrix.
+*/
+CV_EXPORTS_W Scalar trace(InputArray mtx);
+
+/** @brief Finds the inverse or pseudo-inverse of a matrix.
+
+The function cv::invert inverts the matrix src and stores the result in dst
+. When the matrix src is singular or non-square, the function calculates
+the pseudo-inverse matrix (the dst matrix) so that norm(src\*dst - I) is
+minimal, where I is an identity matrix.
+
+In case of the #DECOMP_LU method, the function returns non-zero value if
+the inverse has been successfully calculated and 0 if src is singular.
+
+In case of the #DECOMP_SVD method, the function returns the inverse
+condition number of src (the ratio of the smallest singular value to the
+largest singular value) and 0 if src is singular. The SVD method
+calculates a pseudo-inverse matrix if src is singular.
+
+Similarly to #DECOMP_LU, the method #DECOMP_CHOLESKY works only with
+non-singular square matrices that should also be symmetrical and
+positively defined. In this case, the function stores the inverted
+matrix in dst and returns non-zero. Otherwise, it returns 0.
+
+@param src input floating-point M x N matrix.
+@param dst output matrix of N x M size and the same type as src.
+@param flags inversion method (cv::DecompTypes)
+@sa solve, SVD
+*/
+CV_EXPORTS_W double invert(InputArray src, OutputArray dst, int flags = DECOMP_LU);
+
+/** @brief Solves one or more linear systems or least-squares problems.
+
+The function cv::solve solves a linear system or least-squares problem (the
+latter is possible with SVD or QR methods, or by specifying the flag
+#DECOMP_NORMAL ):
+\f[\texttt{dst} =  \arg \min _X \| \texttt{src1} \cdot \texttt{X} -  \texttt{src2} \|\f]
+
+If #DECOMP_LU or #DECOMP_CHOLESKY method is used, the function returns 1
+if src1 (or \f$\texttt{src1}^T\texttt{src1}\f$ ) is non-singular. Otherwise,
+it returns 0. In the latter case, dst is not valid. Other methods find a
+pseudo-solution in case of a singular left-hand side part.
+
+@note If you want to find a unity-norm solution of an under-defined
+singular system \f$\texttt{src1}\cdot\texttt{dst}=0\f$ , the function solve
+will not do the work. Use SVD::solveZ instead.
+
+@param src1 input matrix on the left-hand side of the system.
+@param src2 input matrix on the right-hand side of the system.
+@param dst output solution.
+@param flags solution (matrix inversion) method (#DecompTypes)
+@sa invert, SVD, eigen
+*/
+CV_EXPORTS_W bool solve(InputArray src1, InputArray src2,
+                        OutputArray dst, int flags = DECOMP_LU);
+
+/** @brief Sorts each row or each column of a matrix.
+
+The function cv::sort sorts each matrix row or each matrix column in
+ascending or descending order. So you should pass two operation flags to
+get desired behaviour. If you want to sort matrix rows or columns
+lexicographically, you can use STL std::sort generic function with the
+proper comparison predicate.
+
+@param src input single-channel array.
+@param dst output array of the same size and type as src.
+@param flags operation flags, a combination of #SortFlags
+@sa sortIdx, randShuffle
+*/
+CV_EXPORTS_W void sort(InputArray src, OutputArray dst, int flags);
+
+/** @brief Sorts each row or each column of a matrix.
+
+The function cv::sortIdx sorts each matrix row or each matrix column in the
+ascending or descending order. So you should pass two operation flags to
+get desired behaviour. Instead of reordering the elements themselves, it
+stores the indices of sorted elements in the output array. For example:
+@code
+    Mat A = Mat::eye(3,3,CV_32F), B;
+    sortIdx(A, B, SORT_EVERY_ROW + SORT_ASCENDING);
+    // B will probably contain
+    // (because of equal elements in A some permutations are possible):
+    // [[1, 2, 0], [0, 2, 1], [0, 1, 2]]
+@endcode
+@param src input single-channel array.
+@param dst output integer array of the same size as src.
+@param flags operation flags that could be a combination of cv::SortFlags
+@sa sort, randShuffle
+*/
+CV_EXPORTS_W void sortIdx(InputArray src, OutputArray dst, int flags);
+
+/** @brief Finds the real roots of a cubic equation.
+
+The function solveCubic finds the real roots of a cubic equation:
+-   if coeffs is a 4-element vector:
+\f[\texttt{coeffs} [0] x^3 +  \texttt{coeffs} [1] x^2 +  \texttt{coeffs} [2] x +  \texttt{coeffs} [3] = 0\f]
+-   if coeffs is a 3-element vector:
+\f[x^3 +  \texttt{coeffs} [0] x^2 +  \texttt{coeffs} [1] x +  \texttt{coeffs} [2] = 0\f]
+
+The roots are stored in the roots array.
+@param coeffs equation coefficients, an array of 3 or 4 elements.
+@param roots output array of real roots that has 0, 1, 2 or 3 elements.
+@return number of real roots. It can be -1 (all real numbers), 0, 1, 2 or 3.
+*/
+CV_EXPORTS_W int solveCubic(InputArray coeffs, OutputArray roots);
+
+/** @brief Finds the real or complex roots of a polynomial equation.
+
+The function cv::solvePoly finds real and complex roots of a polynomial equation:
+\f[\texttt{coeffs} [n] x^{n} +  \texttt{coeffs} [n-1] x^{n-1} + ... +  \texttt{coeffs} [1] x +  \texttt{coeffs} [0] = 0\f]
+@param coeffs array of polynomial coefficients.
+@param roots output (complex) array of roots.
+@param maxIters maximum number of iterations the algorithm does.
+*/
+CV_EXPORTS_W double solvePoly(InputArray coeffs, OutputArray roots, int maxIters = 300);
+
+/** @brief Calculates eigenvalues and eigenvectors of a symmetric matrix.
+
+The function cv::eigen calculates just eigenvalues, or eigenvalues and eigenvectors of the symmetric
+matrix src:
+@code
+    src*eigenvectors.row(i).t() = eigenvalues.at<srcType>(i)*eigenvectors.row(i).t()
+@endcode
+
+@note Use cv::eigenNonSymmetric for calculation of real eigenvalues and eigenvectors of non-symmetric matrix.
+
+@param src input matrix that must have CV_32FC1 or CV_64FC1 type, square size and be symmetrical
+(src ^T^ == src).
+@param eigenvalues output vector of eigenvalues of the same type as src; the eigenvalues are stored
+in the descending order.
+@param eigenvectors output matrix of eigenvectors; it has the same size and type as src; the
+eigenvectors are stored as subsequent matrix rows, in the same order as the corresponding
+eigenvalues.
+@sa eigenNonSymmetric, completeSymm, PCA
+*/
+CV_EXPORTS_W bool eigen(InputArray src, OutputArray eigenvalues,
+                        OutputArray eigenvectors = noArray());
+
+/** @brief Calculates eigenvalues and eigenvectors of a non-symmetric matrix (real eigenvalues only).
+
+@note Assumes real eigenvalues.
+
+The function calculates eigenvalues and eigenvectors (optional) of the square matrix src:
+@code
+    src*eigenvectors.row(i).t() = eigenvalues.at<srcType>(i)*eigenvectors.row(i).t()
+@endcode
+
+@param src input matrix (CV_32FC1 or CV_64FC1 type).
+@param eigenvalues output vector of eigenvalues (type is the same type as src).
+@param eigenvectors output matrix of eigenvectors (type is the same type as src). The eigenvectors are stored as subsequent matrix rows, in the same order as the corresponding eigenvalues.
+@sa eigen
+*/
+CV_EXPORTS_W void eigenNonSymmetric(InputArray src, OutputArray eigenvalues,
+                                    OutputArray eigenvectors);
+
+/** @brief Calculates the covariance matrix of a set of vectors.
+
+The function cv::calcCovarMatrix calculates the covariance matrix and, optionally, the mean vector of
+the set of input vectors.
+@param samples samples stored as separate matrices
+@param nsamples number of samples
+@param covar output covariance matrix of the type ctype and square size.
+@param mean input or output (depending on the flags) array as the average value of the input vectors.
+@param flags operation flags as a combination of #CovarFlags
+@param ctype type of the matrixl; it equals 'CV_64F' by default.
+@sa PCA, mulTransposed, Mahalanobis
+@todo InputArrayOfArrays
+*/
+CV_EXPORTS void calcCovarMatrix( const Mat* samples, int nsamples, Mat& covar, Mat& mean,
+                                 int flags, int ctype = CV_64F);
+
+/** @overload
+@note use #COVAR_ROWS or #COVAR_COLS flag
+@param samples samples stored as rows/columns of a single matrix.
+@param covar output covariance matrix of the type ctype and square size.
+@param mean input or output (depending on the flags) array as the average value of the input vectors.
+@param flags operation flags as a combination of #CovarFlags
+@param ctype type of the matrixl; it equals 'CV_64F' by default.
+*/
+CV_EXPORTS_W void calcCovarMatrix( InputArray samples, OutputArray covar,
+                                   InputOutputArray mean, int flags, int ctype = CV_64F);
+
+/** wrap PCA::operator() */
+CV_EXPORTS_W void PCACompute(InputArray data, InputOutputArray mean,
+                             OutputArray eigenvectors, int maxComponents = 0);
+
+/** wrap PCA::operator() and add eigenvalues output parameter */
+CV_EXPORTS_AS(PCACompute2) void PCACompute(InputArray data, InputOutputArray mean,
+                                           OutputArray eigenvectors, OutputArray eigenvalues,
+                                           int maxComponents = 0);
+
+/** wrap PCA::operator() */
+CV_EXPORTS_W void PCACompute(InputArray data, InputOutputArray mean,
+                             OutputArray eigenvectors, double retainedVariance);
+
+/** wrap PCA::operator() and add eigenvalues output parameter */
+CV_EXPORTS_AS(PCACompute2) void PCACompute(InputArray data, InputOutputArray mean,
+                                           OutputArray eigenvectors, OutputArray eigenvalues,
+                                           double retainedVariance);
+
+/** wrap PCA::project */
+CV_EXPORTS_W void PCAProject(InputArray data, InputArray mean,
+                             InputArray eigenvectors, OutputArray result);
+
+/** wrap PCA::backProject */
+CV_EXPORTS_W void PCABackProject(InputArray data, InputArray mean,
+                                 InputArray eigenvectors, OutputArray result);
+
+/** wrap SVD::compute */
+CV_EXPORTS_W void SVDecomp( InputArray src, OutputArray w, OutputArray u, OutputArray vt, int flags = 0 );
+
+/** wrap SVD::backSubst */
+CV_EXPORTS_W void SVBackSubst( InputArray w, InputArray u, InputArray vt,
+                               InputArray rhs, OutputArray dst );
+
+/** @brief Calculates the Mahalanobis distance between two vectors.
+
+The function cv::Mahalanobis calculates and returns the weighted distance between two vectors:
+\f[d( \texttt{vec1} , \texttt{vec2} )= \sqrt{\sum_{i,j}{\texttt{icovar(i,j)}\cdot(\texttt{vec1}(I)-\texttt{vec2}(I))\cdot(\texttt{vec1(j)}-\texttt{vec2(j)})} }\f]
+The covariance matrix may be calculated using the #calcCovarMatrix function and then inverted using
+the invert function (preferably using the #DECOMP_SVD method, as the most accurate).
+@param v1 first 1D input vector.
+@param v2 second 1D input vector.
+@param icovar inverse covariance matrix.
+*/
+CV_EXPORTS_W double Mahalanobis(InputArray v1, InputArray v2, InputArray icovar);
+
+/** @brief Performs a forward or inverse Discrete Fourier transform of a 1D or 2D floating-point array.
+
+The function cv::dft performs one of the following:
+-   Forward the Fourier transform of a 1D vector of N elements:
+    \f[Y = F^{(N)}  \cdot X,\f]
+    where \f$F^{(N)}_{jk}=\exp(-2\pi i j k/N)\f$ and \f$i=\sqrt{-1}\f$
+-   Inverse the Fourier transform of a 1D vector of N elements:
+    \f[\begin{array}{l} X'=  \left (F^{(N)} \right )^{-1}  \cdot Y =  \left (F^{(N)} \right )^*  \cdot y  \\ X = (1/N)  \cdot X, \end{array}\f]
+    where \f$F^*=\left(\textrm{Re}(F^{(N)})-\textrm{Im}(F^{(N)})\right)^T\f$
+-   Forward the 2D Fourier transform of a M x N matrix:
+    \f[Y = F^{(M)}  \cdot X  \cdot F^{(N)}\f]
+-   Inverse the 2D Fourier transform of a M x N matrix:
+    \f[\begin{array}{l} X'=  \left (F^{(M)} \right )^*  \cdot Y  \cdot \left (F^{(N)} \right )^* \\ X =  \frac{1}{M \cdot N} \cdot X' \end{array}\f]
+
+In case of real (single-channel) data, the output spectrum of the forward Fourier transform or input
+spectrum of the inverse Fourier transform can be represented in a packed format called *CCS*
+(complex-conjugate-symmetrical). It was borrowed from IPL (Intel\* Image Processing Library). Here
+is how 2D *CCS* spectrum looks:
+\f[\begin{bmatrix} Re Y_{0,0} & Re Y_{0,1} & Im Y_{0,1} & Re Y_{0,2} & Im Y_{0,2} &  \cdots & Re Y_{0,N/2-1} & Im Y_{0,N/2-1} & Re Y_{0,N/2}  \\ Re Y_{1,0} & Re Y_{1,1} & Im Y_{1,1} & Re Y_{1,2} & Im Y_{1,2} &  \cdots & Re Y_{1,N/2-1} & Im Y_{1,N/2-1} & Re Y_{1,N/2}  \\ Im Y_{1,0} & Re Y_{2,1} & Im Y_{2,1} & Re Y_{2,2} & Im Y_{2,2} &  \cdots & Re Y_{2,N/2-1} & Im Y_{2,N/2-1} & Im Y_{1,N/2}  \\ \hdotsfor{9} \\ Re Y_{M/2-1,0} &  Re Y_{M-3,1}  & Im Y_{M-3,1} &  \hdotsfor{3} & Re Y_{M-3,N/2-1} & Im Y_{M-3,N/2-1}& Re Y_{M/2-1,N/2}  \\ Im Y_{M/2-1,0} &  Re Y_{M-2,1}  & Im Y_{M-2,1} &  \hdotsfor{3} & Re Y_{M-2,N/2-1} & Im Y_{M-2,N/2-1}& Im Y_{M/2-1,N/2}  \\ Re Y_{M/2,0}  &  Re Y_{M-1,1} &  Im Y_{M-1,1} &  \hdotsfor{3} & Re Y_{M-1,N/2-1} & Im Y_{M-1,N/2-1}& Re Y_{M/2,N/2} \end{bmatrix}\f]
+
+In case of 1D transform of a real vector, the output looks like the first row of the matrix above.
+
+So, the function chooses an operation mode depending on the flags and size of the input array:
+-   If #DFT_ROWS is set or the input array has a single row or single column, the function
+    performs a 1D forward or inverse transform of each row of a matrix when #DFT_ROWS is set.
+    Otherwise, it performs a 2D transform.
+-   If the input array is real and #DFT_INVERSE is not set, the function performs a forward 1D or
+    2D transform:
+    -   When #DFT_COMPLEX_OUTPUT is set, the output is a complex matrix of the same size as
+        input.
+    -   When #DFT_COMPLEX_OUTPUT is not set, the output is a real matrix of the same size as
+        input. In case of 2D transform, it uses the packed format as shown above. In case of a
+        single 1D transform, it looks like the first row of the matrix above. In case of
+        multiple 1D transforms (when using the #DFT_ROWS flag), each row of the output matrix
+        looks like the first row of the matrix above.
+-   If the input array is complex and either #DFT_INVERSE or #DFT_REAL_OUTPUT are not set, the
+    output is a complex array of the same size as input. The function performs a forward or
+    inverse 1D or 2D transform of the whole input array or each row of the input array
+    independently, depending on the flags DFT_INVERSE and DFT_ROWS.
+-   When #DFT_INVERSE is set and the input array is real, or it is complex but #DFT_REAL_OUTPUT
+    is set, the output is a real array of the same size as input. The function performs a 1D or 2D
+    inverse transformation of the whole input array or each individual row, depending on the flags
+    #DFT_INVERSE and #DFT_ROWS.
+
+If #DFT_SCALE is set, the scaling is done after the transformation.
+
+Unlike dct, the function supports arrays of arbitrary size. But only those arrays are processed
+efficiently, whose sizes can be factorized in a product of small prime numbers (2, 3, and 5 in the
+current implementation). Such an efficient DFT size can be calculated using the getOptimalDFTSize
+method.
+
+The sample below illustrates how to calculate a DFT-based convolution of two 2D real arrays:
+@code
+    void convolveDFT(InputArray A, InputArray B, OutputArray C)
+    {
+        // reallocate the output array if needed
+        C.create(abs(A.rows - B.rows)+1, abs(A.cols - B.cols)+1, A.type());
+        Size dftSize;
+        // calculate the size of DFT transform
+        dftSize.width = getOptimalDFTSize(A.cols + B.cols - 1);
+        dftSize.height = getOptimalDFTSize(A.rows + B.rows - 1);
+
+        // allocate temporary buffers and initialize them with 0's
+        Mat tempA(dftSize, A.type(), Scalar::all(0));
+        Mat tempB(dftSize, B.type(), Scalar::all(0));
+
+        // copy A and B to the top-left corners of tempA and tempB, respectively
+        Mat roiA(tempA, Rect(0,0,A.cols,A.rows));
+        A.copyTo(roiA);
+        Mat roiB(tempB, Rect(0,0,B.cols,B.rows));
+        B.copyTo(roiB);
+
+        // now transform the padded A & B in-place;
+        // use "nonzeroRows" hint for faster processing
+        dft(tempA, tempA, 0, A.rows);
+        dft(tempB, tempB, 0, B.rows);
+
+        // multiply the spectrums;
+        // the function handles packed spectrum representations well
+        mulSpectrums(tempA, tempB, tempA);
+
+        // transform the product back from the frequency domain.
+        // Even though all the result rows will be non-zero,
+        // you need only the first C.rows of them, and thus you
+        // pass nonzeroRows == C.rows
+        dft(tempA, tempA, DFT_INVERSE + DFT_SCALE, C.rows);
+
+        // now copy the result back to C.
+        tempA(Rect(0, 0, C.cols, C.rows)).copyTo(C);
+
+        // all the temporary buffers will be deallocated automatically
+    }
+@endcode
+To optimize this sample, consider the following approaches:
+-   Since nonzeroRows != 0 is passed to the forward transform calls and since A and B are copied to
+    the top-left corners of tempA and tempB, respectively, it is not necessary to clear the whole
+    tempA and tempB. It is only necessary to clear the tempA.cols - A.cols ( tempB.cols - B.cols)
+    rightmost columns of the matrices.
+-   This DFT-based convolution does not have to be applied to the whole big arrays, especially if B
+    is significantly smaller than A or vice versa. Instead, you can calculate convolution by parts.
+    To do this, you need to split the output array C into multiple tiles. For each tile, estimate
+    which parts of A and B are required to calculate convolution in this tile. If the tiles in C are
+    too small, the speed will decrease a lot because of repeated work. In the ultimate case, when
+    each tile in C is a single pixel, the algorithm becomes equivalent to the naive convolution
+    algorithm. If the tiles are too big, the temporary arrays tempA and tempB become too big and
+    there is also a slowdown because of bad cache locality. So, there is an optimal tile size
+    somewhere in the middle.
+-   If different tiles in C can be calculated in parallel and, thus, the convolution is done by
+    parts, the loop can be threaded.
+
+All of the above improvements have been implemented in #matchTemplate and #filter2D . Therefore, by
+using them, you can get the performance even better than with the above theoretically optimal
+implementation. Though, those two functions actually calculate cross-correlation, not convolution,
+so you need to "flip" the second convolution operand B vertically and horizontally using flip .
+@note
+-   An example using the discrete fourier transform can be found at
+    opencv_source_code/samples/cpp/dft.cpp
+-   (Python) An example using the dft functionality to perform Wiener deconvolution can be found
+    at opencv_source/samples/python/deconvolution.py
+-   (Python) An example rearranging the quadrants of a Fourier image can be found at
+    opencv_source/samples/python/dft.py
+@param src input array that could be real or complex.
+@param dst output array whose size and type depends on the flags .
+@param flags transformation flags, representing a combination of the #DftFlags
+@param nonzeroRows when the parameter is not zero, the function assumes that only the first
+nonzeroRows rows of the input array (#DFT_INVERSE is not set) or only the first nonzeroRows of the
+output array (#DFT_INVERSE is set) contain non-zeros, thus, the function can handle the rest of the
+rows more efficiently and save some time; this technique is very useful for calculating array
+cross-correlation or convolution using DFT.
+@sa dct, getOptimalDFTSize, mulSpectrums, filter2D, matchTemplate, flip, cartToPolar,
+magnitude, phase
+*/
+CV_EXPORTS_W void dft(InputArray src, OutputArray dst, int flags = 0, int nonzeroRows = 0);
+
+/** @brief Calculates the inverse Discrete Fourier Transform of a 1D or 2D array.
+
+idft(src, dst, flags) is equivalent to dft(src, dst, flags | #DFT_INVERSE) .
+@note None of dft and idft scales the result by default. So, you should pass #DFT_SCALE to one of
+dft or idft explicitly to make these transforms mutually inverse.
+@sa dft, dct, idct, mulSpectrums, getOptimalDFTSize
+@param src input floating-point real or complex array.
+@param dst output array whose size and type depend on the flags.
+@param flags operation flags (see dft and #DftFlags).
+@param nonzeroRows number of dst rows to process; the rest of the rows have undefined content (see
+the convolution sample in dft description.
+*/
+CV_EXPORTS_W void idft(InputArray src, OutputArray dst, int flags = 0, int nonzeroRows = 0);
+
+/** @brief Performs a forward or inverse discrete Cosine transform of 1D or 2D array.
+
+The function cv::dct performs a forward or inverse discrete Cosine transform (DCT) of a 1D or 2D
+floating-point array:
+-   Forward Cosine transform of a 1D vector of N elements:
+    \f[Y = C^{(N)}  \cdot X\f]
+    where
+    \f[C^{(N)}_{jk}= \sqrt{\alpha_j/N} \cos \left ( \frac{\pi(2k+1)j}{2N} \right )\f]
+    and
+    \f$\alpha_0=1\f$, \f$\alpha_j=2\f$ for *j \> 0*.
+-   Inverse Cosine transform of a 1D vector of N elements:
+    \f[X =  \left (C^{(N)} \right )^{-1}  \cdot Y =  \left (C^{(N)} \right )^T  \cdot Y\f]
+    (since \f$C^{(N)}\f$ is an orthogonal matrix, \f$C^{(N)} \cdot \left(C^{(N)}\right)^T = I\f$ )
+-   Forward 2D Cosine transform of M x N matrix:
+    \f[Y = C^{(N)}  \cdot X  \cdot \left (C^{(N)} \right )^T\f]
+-   Inverse 2D Cosine transform of M x N matrix:
+    \f[X =  \left (C^{(N)} \right )^T  \cdot X  \cdot C^{(N)}\f]
+
+The function chooses the mode of operation by looking at the flags and size of the input array:
+-   If (flags & #DCT_INVERSE) == 0, the function does a forward 1D or 2D transform. Otherwise, it
+    is an inverse 1D or 2D transform.
+-   If (flags & #DCT_ROWS) != 0, the function performs a 1D transform of each row.
+-   If the array is a single column or a single row, the function performs a 1D transform.
+-   If none of the above is true, the function performs a 2D transform.
+
+@note Currently dct supports even-size arrays (2, 4, 6 ...). For data analysis and approximation, you
+can pad the array when necessary.
+Also, the function performance depends very much, and not monotonically, on the array size (see
+getOptimalDFTSize ). In the current implementation DCT of a vector of size N is calculated via DFT
+of a vector of size N/2 . Thus, the optimal DCT size N1 \>= N can be calculated as:
+@code
+    size_t getOptimalDCTSize(size_t N) { return 2*getOptimalDFTSize((N+1)/2); }
+    N1 = getOptimalDCTSize(N);
+@endcode
+@param src input floating-point array.
+@param dst output array of the same size and type as src .
+@param flags transformation flags as a combination of cv::DftFlags (DCT_*)
+@sa dft, getOptimalDFTSize, idct
+*/
+CV_EXPORTS_W void dct(InputArray src, OutputArray dst, int flags = 0);
+
+/** @brief Calculates the inverse Discrete Cosine Transform of a 1D or 2D array.
+
+idct(src, dst, flags) is equivalent to dct(src, dst, flags | DCT_INVERSE).
+@param src input floating-point single-channel array.
+@param dst output array of the same size and type as src.
+@param flags operation flags.
+@sa  dct, dft, idft, getOptimalDFTSize
+*/
+CV_EXPORTS_W void idct(InputArray src, OutputArray dst, int flags = 0);
+
+/** @brief Performs the per-element multiplication of two Fourier spectrums.
+
+The function cv::mulSpectrums performs the per-element multiplication of the two CCS-packed or complex
+matrices that are results of a real or complex Fourier transform.
+
+The function, together with dft and idft, may be used to calculate convolution (pass conjB=false )
+or correlation (pass conjB=true ) of two arrays rapidly. When the arrays are complex, they are
+simply multiplied (per element) with an optional conjugation of the second-array elements. When the
+arrays are real, they are assumed to be CCS-packed (see dft for details).
+@param a first input array.
+@param b second input array of the same size and type as src1 .
+@param c output array of the same size and type as src1 .
+@param flags operation flags; currently, the only supported flag is cv::DFT_ROWS, which indicates that
+each row of src1 and src2 is an independent 1D Fourier spectrum. If you do not want to use this flag, then simply add a `0` as value.
+@param conjB optional flag that conjugates the second input array before the multiplication (true)
+or not (false).
+*/
+CV_EXPORTS_W void mulSpectrums(InputArray a, InputArray b, OutputArray c,
+                               int flags, bool conjB = false);
+
+/** @brief Returns the optimal DFT size for a given vector size.
+
+DFT performance is not a monotonic function of a vector size. Therefore, when you calculate
+convolution of two arrays or perform the spectral analysis of an array, it usually makes sense to
+pad the input data with zeros to get a bit larger array that can be transformed much faster than the
+original one. Arrays whose size is a power-of-two (2, 4, 8, 16, 32, ...) are the fastest to process.
+Though, the arrays whose size is a product of 2's, 3's, and 5's (for example, 300 = 5\*5\*3\*2\*2)
+are also processed quite efficiently.
+
+The function cv::getOptimalDFTSize returns the minimum number N that is greater than or equal to vecsize
+so that the DFT of a vector of size N can be processed efficiently. In the current implementation N
+= 2 ^p^ \* 3 ^q^ \* 5 ^r^ for some integer p, q, r.
+
+The function returns a negative number if vecsize is too large (very close to INT_MAX ).
+
+While the function cannot be used directly to estimate the optimal vector size for DCT transform
+(since the current DCT implementation supports only even-size vectors), it can be easily processed
+as getOptimalDFTSize((vecsize+1)/2)\*2.
+@param vecsize vector size.
+@sa dft, dct, idft, idct, mulSpectrums
+*/
+CV_EXPORTS_W int getOptimalDFTSize(int vecsize);
+
+/** @brief Returns the default random number generator.
+
+The function cv::theRNG returns the default random number generator. For each thread, there is a
+separate random number generator, so you can use the function safely in multi-thread environments.
+If you just need to get a single random number using this generator or initialize an array, you can
+use randu or randn instead. But if you are going to generate many random numbers inside a loop, it
+is much faster to use this function to retrieve the generator and then use RNG::operator _Tp() .
+@sa RNG, randu, randn
+*/
+CV_EXPORTS RNG& theRNG();
+
+/** @brief Sets state of default random number generator.
+
+The function cv::setRNGSeed sets state of default random number generator to custom value.
+@param seed new state for default random number generator
+@sa RNG, randu, randn
+*/
+CV_EXPORTS_W void setRNGSeed(int seed);
+
+/** @brief Generates a single uniformly-distributed random number or an array of random numbers.
+
+Non-template variant of the function fills the matrix dst with uniformly-distributed
+random numbers from the specified range:
+\f[\texttt{low} _c  \leq \texttt{dst} (I)_c <  \texttt{high} _c\f]
+@param dst output array of random numbers; the array must be pre-allocated.
+@param low inclusive lower boundary of the generated random numbers.
+@param high exclusive upper boundary of the generated random numbers.
+@sa RNG, randn, theRNG
+*/
+CV_EXPORTS_W void randu(InputOutputArray dst, InputArray low, InputArray high);
+
+/** @brief Fills the array with normally distributed random numbers.
+
+The function cv::randn fills the matrix dst with normally distributed random numbers with the specified
+mean vector and the standard deviation matrix. The generated random numbers are clipped to fit the
+value range of the output array data type.
+@param dst output array of random numbers; the array must be pre-allocated and have 1 to 4 channels.
+@param mean mean value (expectation) of the generated random numbers.
+@param stddev standard deviation of the generated random numbers; it can be either a vector (in
+which case a diagonal standard deviation matrix is assumed) or a square matrix.
+@sa RNG, randu
+*/
+CV_EXPORTS_W void randn(InputOutputArray dst, InputArray mean, InputArray stddev);
+
+/** @brief Shuffles the array elements randomly.
+
+The function cv::randShuffle shuffles the specified 1D array by randomly choosing pairs of elements and
+swapping them. The number of such swap operations will be dst.rows\*dst.cols\*iterFactor .
+@param dst input/output numerical 1D array.
+@param iterFactor scale factor that determines the number of random swap operations (see the details
+below).
+@param rng optional random number generator used for shuffling; if it is zero, theRNG () is used
+instead.
+@sa RNG, sort
+*/
+CV_EXPORTS_W void randShuffle(InputOutputArray dst, double iterFactor = 1., RNG* rng = 0);
+
+/** @brief Principal Component Analysis
+
+The class is used to calculate a special basis for a set of vectors. The
+basis will consist of eigenvectors of the covariance matrix calculated
+from the input set of vectors. The class %PCA can also transform
+vectors to/from the new coordinate space defined by the basis. Usually,
+in this new coordinate system, each vector from the original set (and
+any linear combination of such vectors) can be quite accurately
+approximated by taking its first few components, corresponding to the
+eigenvectors of the largest eigenvalues of the covariance matrix.
+Geometrically it means that you calculate a projection of the vector to
+a subspace formed by a few eigenvectors corresponding to the dominant
+eigenvalues of the covariance matrix. And usually such a projection is
+very close to the original vector. So, you can represent the original
+vector from a high-dimensional space with a much shorter vector
+consisting of the projected vector's coordinates in the subspace. Such a
+transformation is also known as Karhunen-Loeve Transform, or KLT.
+See http://en.wikipedia.org/wiki/Principal_component_analysis
+
+The sample below is the function that takes two matrices. The first
+function stores a set of vectors (a row per vector) that is used to
+calculate PCA. The second function stores another "test" set of vectors
+(a row per vector). First, these vectors are compressed with PCA, then
+reconstructed back, and then the reconstruction error norm is computed
+and printed for each vector. :
+
+@code{.cpp}
+using namespace cv;
+
+PCA compressPCA(const Mat& pcaset, int maxComponents,
+                const Mat& testset, Mat& compressed)
+{
+    PCA pca(pcaset, // pass the data
+            Mat(), // we do not have a pre-computed mean vector,
+                   // so let the PCA engine to compute it
+            PCA::DATA_AS_ROW, // indicate that the vectors
+                                // are stored as matrix rows
+                                // (use PCA::DATA_AS_COL if the vectors are
+                                // the matrix columns)
+            maxComponents // specify, how many principal components to retain
+            );
+    // if there is no test data, just return the computed basis, ready-to-use
+    if( !testset.data )
+        return pca;
+    CV_Assert( testset.cols == pcaset.cols );
+
+    compressed.create(testset.rows, maxComponents, testset.type());
+
+    Mat reconstructed;
+    for( int i = 0; i < testset.rows; i++ )
+    {
+        Mat vec = testset.row(i), coeffs = compressed.row(i), reconstructed;
+        // compress the vector, the result will be stored
+        // in the i-th row of the output matrix
+        pca.project(vec, coeffs);
+        // and then reconstruct it
+        pca.backProject(coeffs, reconstructed);
+        // and measure the error
+        printf("%d. diff = %g\n", i, norm(vec, reconstructed, NORM_L2));
+    }
+    return pca;
+}
+@endcode
+@sa calcCovarMatrix, mulTransposed, SVD, dft, dct
+*/
+class CV_EXPORTS PCA
+{
+public:
+    enum Flags { DATA_AS_ROW = 0, //!< indicates that the input samples are stored as matrix rows
+                 DATA_AS_COL = 1, //!< indicates that the input samples are stored as matrix columns
+                 USE_AVG     = 2  //!
+               };
+
+    /** @brief default constructor
+
+    The default constructor initializes an empty %PCA structure. The other
+    constructors initialize the structure and call PCA::operator()().
+    */
+    PCA();
+
+    /** @overload
+    @param data input samples stored as matrix rows or matrix columns.
+    @param mean optional mean value; if the matrix is empty (@c noArray()),
+    the mean is computed from the data.
+    @param flags operation flags; currently the parameter is only used to
+    specify the data layout (PCA::Flags)
+    @param maxComponents maximum number of components that %PCA should
+    retain; by default, all the components are retained.
+    */
+    PCA(InputArray data, InputArray mean, int flags, int maxComponents = 0);
+
+    /** @overload
+    @param data input samples stored as matrix rows or matrix columns.
+    @param mean optional mean value; if the matrix is empty (noArray()),
+    the mean is computed from the data.
+    @param flags operation flags; currently the parameter is only used to
+    specify the data layout (PCA::Flags)
+    @param retainedVariance Percentage of variance that PCA should retain.
+    Using this parameter will let the PCA decided how many components to
+    retain but it will always keep at least 2.
+    */
+    PCA(InputArray data, InputArray mean, int flags, double retainedVariance);
+
+    /** @brief performs %PCA
+
+    The operator performs %PCA of the supplied dataset. It is safe to reuse
+    the same PCA structure for multiple datasets. That is, if the structure
+    has been previously used with another dataset, the existing internal
+    data is reclaimed and the new @ref eigenvalues, @ref eigenvectors and @ref
+    mean are allocated and computed.
+
+    The computed @ref eigenvalues are sorted from the largest to the smallest and
+    the corresponding @ref eigenvectors are stored as eigenvectors rows.
+
+    @param data input samples stored as the matrix rows or as the matrix
+    columns.
+    @param mean optional mean value; if the matrix is empty (noArray()),
+    the mean is computed from the data.
+    @param flags operation flags; currently the parameter is only used to
+    specify the data layout. (Flags)
+    @param maxComponents maximum number of components that PCA should
+    retain; by default, all the components are retained.
+    */
+    PCA& operator()(InputArray data, InputArray mean, int flags, int maxComponents = 0);
+
+    /** @overload
+    @param data input samples stored as the matrix rows or as the matrix
+    columns.
+    @param mean optional mean value; if the matrix is empty (noArray()),
+    the mean is computed from the data.
+    @param flags operation flags; currently the parameter is only used to
+    specify the data layout. (PCA::Flags)
+    @param retainedVariance Percentage of variance that %PCA should retain.
+    Using this parameter will let the %PCA decided how many components to
+    retain but it will always keep at least 2.
+     */
+    PCA& operator()(InputArray data, InputArray mean, int flags, double retainedVariance);
+
+    /** @brief Projects vector(s) to the principal component subspace.
+
+    The methods project one or more vectors to the principal component
+    subspace, where each vector projection is represented by coefficients in
+    the principal component basis. The first form of the method returns the
+    matrix that the second form writes to the result. So the first form can
+    be used as a part of expression while the second form can be more
+    efficient in a processing loop.
+    @param vec input vector(s); must have the same dimensionality and the
+    same layout as the input data used at %PCA phase, that is, if
+    DATA_AS_ROW are specified, then `vec.cols==data.cols`
+    (vector dimensionality) and `vec.rows` is the number of vectors to
+    project, and the same is true for the PCA::DATA_AS_COL case.
+    */
+    Mat project(InputArray vec) const;
+
+    /** @overload
+    @param vec input vector(s); must have the same dimensionality and the
+    same layout as the input data used at PCA phase, that is, if
+    DATA_AS_ROW are specified, then `vec.cols==data.cols`
+    (vector dimensionality) and `vec.rows` is the number of vectors to
+    project, and the same is true for the PCA::DATA_AS_COL case.
+    @param result output vectors; in case of PCA::DATA_AS_COL, the
+    output matrix has as many columns as the number of input vectors, this
+    means that `result.cols==vec.cols` and the number of rows match the
+    number of principal components (for example, `maxComponents` parameter
+    passed to the constructor).
+     */
+    void project(InputArray vec, OutputArray result) const;
+
+    /** @brief Reconstructs vectors from their PC projections.
+
+    The methods are inverse operations to PCA::project. They take PC
+    coordinates of projected vectors and reconstruct the original vectors.
+    Unless all the principal components have been retained, the
+    reconstructed vectors are different from the originals. But typically,
+    the difference is small if the number of components is large enough (but
+    still much smaller than the original vector dimensionality). As a
+    result, PCA is used.
+    @param vec coordinates of the vectors in the principal component
+    subspace, the layout and size are the same as of PCA::project output
+    vectors.
+     */
+    Mat backProject(InputArray vec) const;
+
+    /** @overload
+    @param vec coordinates of the vectors in the principal component
+    subspace, the layout and size are the same as of PCA::project output
+    vectors.
+    @param result reconstructed vectors; the layout and size are the same as
+    of PCA::project input vectors.
+     */
+    void backProject(InputArray vec, OutputArray result) const;
+
+    /** @brief write PCA objects
+
+    Writes @ref eigenvalues @ref eigenvectors and @ref mean to specified FileStorage
+     */
+    void write(FileStorage& fs) const;
+
+    /** @brief load PCA objects
+
+    Loads @ref eigenvalues @ref eigenvectors and @ref mean from specified FileNode
+     */
+    void read(const FileNode& fn);
+
+    Mat eigenvectors; //!< eigenvectors of the covariation matrix
+    Mat eigenvalues; //!< eigenvalues of the covariation matrix
+    Mat mean; //!< mean value subtracted before the projection and added after the back projection
+};
+
+/** @example samples/cpp/pca.cpp
+An example using %PCA for dimensionality reduction while maintaining an amount of variance
+*/
+
+/** @example samples/cpp/tutorial_code/ml/introduction_to_pca/introduction_to_pca.cpp
+Check @ref tutorial_introduction_to_pca "the corresponding tutorial" for more details
+*/
+
+/**
+@brief Linear Discriminant Analysis
+@todo document this class
+*/
+class CV_EXPORTS LDA
+{
+public:
+    /** @brief constructor
+    Initializes a LDA with num_components (default 0).
+    */
+    explicit LDA(int num_components = 0);
+
+    /** Initializes and performs a Discriminant Analysis with Fisher's
+     Optimization Criterion on given data in src and corresponding labels
+     in labels. If 0 (or less) number of components are given, they are
+     automatically determined for given data in computation.
+    */
+    LDA(InputArrayOfArrays src, InputArray labels, int num_components = 0);
+
+    /** Serializes this object to a given filename.
+      */
+    void save(const String& filename) const;
+
+    /** Deserializes this object from a given filename.
+      */
+    void load(const String& filename);
+
+    /** Serializes this object to a given cv::FileStorage.
+      */
+    void save(FileStorage& fs) const;
+
+    /** Deserializes this object from a given cv::FileStorage.
+      */
+    void load(const FileStorage& node);
+
+    /** destructor
+      */
+    ~LDA();
+
+    /** Compute the discriminants for data in src (row aligned) and labels.
+      */
+    void compute(InputArrayOfArrays src, InputArray labels);
+
+    /** Projects samples into the LDA subspace.
+        src may be one or more row aligned samples.
+      */
+    Mat project(InputArray src);
+
+    /** Reconstructs projections from the LDA subspace.
+        src may be one or more row aligned projections.
+      */
+    Mat reconstruct(InputArray src);
+
+    /** Returns the eigenvectors of this LDA.
+      */
+    Mat eigenvectors() const { return _eigenvectors; }
+
+    /** Returns the eigenvalues of this LDA.
+      */
+    Mat eigenvalues() const { return _eigenvalues; }
+
+    static Mat subspaceProject(InputArray W, InputArray mean, InputArray src);
+    static Mat subspaceReconstruct(InputArray W, InputArray mean, InputArray src);
+
+protected:
+    int _num_components;
+    Mat _eigenvectors;
+    Mat _eigenvalues;
+    void lda(InputArrayOfArrays src, InputArray labels);
+};
+
+/** @brief Singular Value Decomposition
+
+Class for computing Singular Value Decomposition of a floating-point
+matrix. The Singular Value Decomposition is used to solve least-square
+problems, under-determined linear systems, invert matrices, compute
+condition numbers, and so on.
+
+If you want to compute a condition number of a matrix or an absolute value of
+its determinant, you do not need `u` and `vt`. You can pass
+flags=SVD::NO_UV|... . Another flag SVD::FULL_UV indicates that full-size u
+and vt must be computed, which is not necessary most of the time.
+
+@sa invert, solve, eigen, determinant
+*/
+class CV_EXPORTS SVD
+{
+public:
+    enum Flags {
+        /** allow the algorithm to modify the decomposed matrix; it can save space and speed up
+            processing. currently ignored. */
+        MODIFY_A = 1,
+        /** indicates that only a vector of singular values `w` is to be processed, while u and vt
+            will be set to empty matrices */
+        NO_UV    = 2,
+        /** when the matrix is not square, by default the algorithm produces u and vt matrices of
+            sufficiently large size for the further A reconstruction; if, however, FULL_UV flag is
+            specified, u and vt will be full-size square orthogonal matrices.*/
+        FULL_UV  = 4
+    };
+
+    /** @brief the default constructor
+
+    initializes an empty SVD structure
+      */
+    SVD();
+
+    /** @overload
+    initializes an empty SVD structure and then calls SVD::operator()
+    @param src decomposed matrix. The depth has to be CV_32F or CV_64F.
+    @param flags operation flags (SVD::Flags)
+      */
+    SVD( InputArray src, int flags = 0 );
+
+    /** @brief the operator that performs SVD. The previously allocated u, w and vt are released.
+
+    The operator performs the singular value decomposition of the supplied
+    matrix. The u,`vt` , and the vector of singular values w are stored in
+    the structure. The same SVD structure can be reused many times with
+    different matrices. Each time, if needed, the previous u,`vt` , and w
+    are reclaimed and the new matrices are created, which is all handled by
+    Mat::create.
+    @param src decomposed matrix. The depth has to be CV_32F or CV_64F.
+    @param flags operation flags (SVD::Flags)
+      */
+    SVD& operator ()( InputArray src, int flags = 0 );
+
+    /** @brief decomposes matrix and stores the results to user-provided matrices
+
+    The methods/functions perform SVD of matrix. Unlike SVD::SVD constructor
+    and SVD::operator(), they store the results to the user-provided
+    matrices:
+
+    @code{.cpp}
+    Mat A, w, u, vt;
+    SVD::compute(A, w, u, vt);
+    @endcode
+
+    @param src decomposed matrix. The depth has to be CV_32F or CV_64F.
+    @param w calculated singular values
+    @param u calculated left singular vectors
+    @param vt transposed matrix of right singular vectors
+    @param flags operation flags - see SVD::Flags.
+      */
+    static void compute( InputArray src, OutputArray w,
+                         OutputArray u, OutputArray vt, int flags = 0 );
+
+    /** @overload
+    computes singular values of a matrix
+    @param src decomposed matrix. The depth has to be CV_32F or CV_64F.
+    @param w calculated singular values
+    @param flags operation flags - see SVD::Flags.
+      */
+    static void compute( InputArray src, OutputArray w, int flags = 0 );
+
+    /** @brief performs back substitution
+      */
+    static void backSubst( InputArray w, InputArray u,
+                           InputArray vt, InputArray rhs,
+                           OutputArray dst );
+
+    /** @brief solves an under-determined singular linear system
+
+    The method finds a unit-length solution x of a singular linear system
+    A\*x = 0. Depending on the rank of A, there can be no solutions, a
+    single solution or an infinite number of solutions. In general, the
+    algorithm solves the following problem:
+    \f[dst =  \arg \min _{x:  \| x \| =1}  \| src  \cdot x  \|\f]
+    @param src left-hand-side matrix.
+    @param dst found solution.
+      */
+    static void solveZ( InputArray src, OutputArray dst );
+
+    /** @brief performs a singular value back substitution.
+
+    The method calculates a back substitution for the specified right-hand
+    side:
+
+    \f[\texttt{x} =  \texttt{vt} ^T  \cdot diag( \texttt{w} )^{-1}  \cdot \texttt{u} ^T  \cdot \texttt{rhs} \sim \texttt{A} ^{-1}  \cdot \texttt{rhs}\f]
+
+    Using this technique you can either get a very accurate solution of the
+    convenient linear system, or the best (in the least-squares terms)
+    pseudo-solution of an overdetermined linear system.
+
+    @param rhs right-hand side of a linear system (u\*w\*v')\*dst = rhs to
+    be solved, where A has been previously decomposed.
+
+    @param dst found solution of the system.
+
+    @note Explicit SVD with the further back substitution only makes sense
+    if you need to solve many linear systems with the same left-hand side
+    (for example, src ). If all you need is to solve a single system
+    (possibly with multiple rhs immediately available), simply call solve
+    add pass #DECOMP_SVD there. It does absolutely the same thing.
+      */
+    void backSubst( InputArray rhs, OutputArray dst ) const;
+
+    /** @todo document */
+    template<typename _Tp, int m, int n, int nm> static
+    void compute( const Matx<_Tp, m, n>& a, Matx<_Tp, nm, 1>& w, Matx<_Tp, m, nm>& u, Matx<_Tp, n, nm>& vt );
+
+    /** @todo document */
+    template<typename _Tp, int m, int n, int nm> static
+    void compute( const Matx<_Tp, m, n>& a, Matx<_Tp, nm, 1>& w );
+
+    /** @todo document */
+    template<typename _Tp, int m, int n, int nm, int nb> static
+    void backSubst( const Matx<_Tp, nm, 1>& w, const Matx<_Tp, m, nm>& u, const Matx<_Tp, n, nm>& vt, const Matx<_Tp, m, nb>& rhs, Matx<_Tp, n, nb>& dst );
+
+    Mat u, w, vt;
+};
+
+/** @brief Random Number Generator
+
+Random number generator. It encapsulates the state (currently, a 64-bit
+integer) and has methods to return scalar random values and to fill
+arrays with random values. Currently it supports uniform and Gaussian
+(normal) distributions. The generator uses Multiply-With-Carry
+algorithm, introduced by G. Marsaglia (
+<http://en.wikipedia.org/wiki/Multiply-with-carry> ).
+Gaussian-distribution random numbers are generated using the Ziggurat
+algorithm ( <http://en.wikipedia.org/wiki/Ziggurat_algorithm> ),
+introduced by G. Marsaglia and W. W. Tsang.
+*/
+class CV_EXPORTS RNG
+{
+public:
+    enum { UNIFORM = 0,
+           NORMAL  = 1
+         };
+
+    /** @brief constructor
+
+    These are the RNG constructors. The first form sets the state to some
+    pre-defined value, equal to 2\*\*32-1 in the current implementation. The
+    second form sets the state to the specified value. If you passed state=0
+    , the constructor uses the above default value instead to avoid the
+    singular random number sequence, consisting of all zeros.
+    */
+    RNG();
+    /** @overload
+    @param state 64-bit value used to initialize the RNG.
+    */
+    RNG(uint64 state);
+    /**The method updates the state using the MWC algorithm and returns the
+    next 32-bit random number.*/
+    unsigned next();
+
+    /**Each of the methods updates the state using the MWC algorithm and
+    returns the next random number of the specified type. In case of integer
+    types, the returned number is from the available value range for the
+    specified type. In case of floating-point types, the returned value is
+    from [0,1) range.
+    */
+    operator uchar();
+    /** @overload */
+    operator schar();
+    /** @overload */
+    operator ushort();
+    /** @overload */
+    operator short();
+    /** @overload */
+    operator unsigned();
+    /** @overload */
+    operator int();
+    /** @overload */
+    operator float();
+    /** @overload */
+    operator double();
+
+    /** @brief returns a random integer sampled uniformly from [0, N).
+
+    The methods transform the state using the MWC algorithm and return the
+    next random number. The first form is equivalent to RNG::next . The
+    second form returns the random number modulo N, which means that the
+    result is in the range [0, N) .
+    */
+    unsigned operator ()();
+    /** @overload
+    @param N upper non-inclusive boundary of the returned random number.
+    */
+    unsigned operator ()(unsigned N);
+
+    /** @brief returns uniformly distributed integer random number from [a,b) range
+
+    The methods transform the state using the MWC algorithm and return the
+    next uniformly-distributed random number of the specified type, deduced
+    from the input parameter type, from the range [a, b) . There is a nuance
+    illustrated by the following sample:
+
+    @code{.cpp}
+    RNG rng;
+
+    // always produces 0
+    double a = rng.uniform(0, 1);
+
+    // produces double from [0, 1)
+    double a1 = rng.uniform((double)0, (double)1);
+
+    // produces float from [0, 1)
+    float b = rng.uniform(0.f, 1.f);
+
+    // produces double from [0, 1)
+    double c = rng.uniform(0., 1.);
+
+    // may cause compiler error because of ambiguity:
+    //  RNG::uniform(0, (int)0.999999)? or RNG::uniform((double)0, 0.99999)?
+    double d = rng.uniform(0, 0.999999);
+    @endcode
+
+    The compiler does not take into account the type of the variable to
+    which you assign the result of RNG::uniform . The only thing that
+    matters to the compiler is the type of a and b parameters. So, if you
+    want a floating-point random number, but the range boundaries are
+    integer numbers, either put dots in the end, if they are constants, or
+    use explicit type cast operators, as in the a1 initialization above.
+    @param a lower inclusive boundary of the returned random number.
+    @param b upper non-inclusive boundary of the returned random number.
+    */
+    int uniform(int a, int b);
+    /** @overload */
+    float uniform(float a, float b);
+    /** @overload */
+    double uniform(double a, double b);
+
+    /** @brief Fills arrays with random numbers.
+
+    @param mat 2D or N-dimensional matrix; currently matrices with more than
+    4 channels are not supported by the methods, use Mat::reshape as a
+    possible workaround.
+    @param distType distribution type, RNG::UNIFORM or RNG::NORMAL.
+    @param a first distribution parameter; in case of the uniform
+    distribution, this is an inclusive lower boundary, in case of the normal
+    distribution, this is a mean value.
+    @param b second distribution parameter; in case of the uniform
+    distribution, this is a non-inclusive upper boundary, in case of the
+    normal distribution, this is a standard deviation (diagonal of the
+    standard deviation matrix or the full standard deviation matrix).
+    @param saturateRange pre-saturation flag; for uniform distribution only;
+    if true, the method will first convert a and b to the acceptable value
+    range (according to the mat datatype) and then will generate uniformly
+    distributed random numbers within the range [saturate(a), saturate(b)),
+    if saturateRange=false, the method will generate uniformly distributed
+    random numbers in the original range [a, b) and then will saturate them,
+    it means, for example, that
+    <tt>theRNG().fill(mat_8u, RNG::UNIFORM, -DBL_MAX, DBL_MAX)</tt> will likely
+    produce array mostly filled with 0's and 255's, since the range (0, 255)
+    is significantly smaller than [-DBL_MAX, DBL_MAX).
+
+    Each of the methods fills the matrix with the random values from the
+    specified distribution. As the new numbers are generated, the RNG state
+    is updated accordingly. In case of multiple-channel images, every
+    channel is filled independently, which means that RNG cannot generate
+    samples from the multi-dimensional Gaussian distribution with
+    non-diagonal covariance matrix directly. To do that, the method
+    generates samples from multi-dimensional standard Gaussian distribution
+    with zero mean and identity covariation matrix, and then transforms them
+    using transform to get samples from the specified Gaussian distribution.
+    */
+    void fill( InputOutputArray mat, int distType, InputArray a, InputArray b, bool saturateRange = false );
+
+    /** @brief Returns the next random number sampled from the Gaussian distribution
+    @param sigma standard deviation of the distribution.
+
+    The method transforms the state using the MWC algorithm and returns the
+    next random number from the Gaussian distribution N(0,sigma) . That is,
+    the mean value of the returned random numbers is zero and the standard
+    deviation is the specified sigma .
+    */
+    double gaussian(double sigma);
+
+    uint64 state;
+
+    bool operator ==(const RNG& other) const;
+};
+
+/** @brief Mersenne Twister random number generator
+
+Inspired by http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/MT2002/CODES/mt19937ar.c
+@todo document
+*/
+class CV_EXPORTS RNG_MT19937
+{
+public:
+    RNG_MT19937();
+    RNG_MT19937(unsigned s);
+    void seed(unsigned s);
+
+    unsigned next();
+
+    operator int();
+    operator unsigned();
+    operator float();
+    operator double();
+
+    unsigned operator ()(unsigned N);
+    unsigned operator ()();
+
+    /** @brief returns uniformly distributed integer random number from [a,b) range*/
+    int uniform(int a, int b);
+    /** @brief returns uniformly distributed floating-point random number from [a,b) range*/
+    float uniform(float a, float b);
+    /** @brief returns uniformly distributed double-precision floating-point random number from [a,b) range*/
+    double uniform(double a, double b);
+
+private:
+    enum PeriodParameters {N = 624, M = 397};
+    unsigned state[N];
+    int mti;
+};
+
+//! @} core_array
+
+//! @addtogroup core_cluster
+//!  @{
+
+//! k-means flags
+enum KmeansFlags {
+    /** Select random initial centers in each attempt.*/
+    KMEANS_RANDOM_CENTERS     = 0,
+    /** Use kmeans++ center initialization by Arthur and Vassilvitskii [Arthur2007].*/
+    KMEANS_PP_CENTERS         = 2,
+    /** During the first (and possibly the only) attempt, use the
+        user-supplied labels instead of computing them from the initial centers. For the second and
+        further attempts, use the random or semi-random centers. Use one of KMEANS_\*_CENTERS flag
+        to specify the exact method.*/
+    KMEANS_USE_INITIAL_LABELS = 1
+};
+
+/** @example samples/cpp/kmeans.cpp
+An example on k-means clustering
+*/
+
+/** @brief Finds centers of clusters and groups input samples around the clusters.
+
+The function kmeans implements a k-means algorithm that finds the centers of cluster_count clusters
+and groups the input samples around the clusters. As an output, \f$\texttt{bestLabels}_i\f$ contains a
+0-based cluster index for the sample stored in the \f$i^{th}\f$ row of the samples matrix.
+
+@note
+-   (Python) An example on k-means clustering can be found at
+    opencv_source_code/samples/python/kmeans.py
+@param data Data for clustering. An array of N-Dimensional points with float coordinates is needed.
+Examples of this array can be:
+-   Mat points(count, 2, CV_32F);
+-   Mat points(count, 1, CV_32FC2);
+-   Mat points(1, count, CV_32FC2);
+-   std::vector\<cv::Point2f\> points(sampleCount);
+@param K Number of clusters to split the set by.
+@param bestLabels Input/output integer array that stores the cluster indices for every sample.
+@param criteria The algorithm termination criteria, that is, the maximum number of iterations and/or
+the desired accuracy. The accuracy is specified as criteria.epsilon. As soon as each of the cluster
+centers moves by less than criteria.epsilon on some iteration, the algorithm stops.
+@param attempts Flag to specify the number of times the algorithm is executed using different
+initial labellings. The algorithm returns the labels that yield the best compactness (see the last
+function parameter).
+@param flags Flag that can take values of cv::KmeansFlags
+@param centers Output matrix of the cluster centers, one row per each cluster center.
+@return The function returns the compactness measure that is computed as
+\f[\sum _i  \| \texttt{samples} _i -  \texttt{centers} _{ \texttt{labels} _i} \| ^2\f]
+after every attempt. The best (minimum) value is chosen and the corresponding labels and the
+compactness value are returned by the function. Basically, you can use only the core of the
+function, set the number of attempts to 1, initialize labels each time using a custom algorithm,
+pass them with the ( flags = #KMEANS_USE_INITIAL_LABELS ) flag, and then choose the best
+(most-compact) clustering.
+*/
+CV_EXPORTS_W double kmeans( InputArray data, int K, InputOutputArray bestLabels,
+                            TermCriteria criteria, int attempts,
+                            int flags, OutputArray centers = noArray() );
+
+//! @} core_cluster
+
+//! @addtogroup core_basic
+//! @{
+
+/////////////////////////////// Formatted output of cv::Mat ///////////////////////////
+
+/** @todo document */
+class CV_EXPORTS Formatted
+{
+public:
+    virtual const char* next() = 0;
+    virtual void reset() = 0;
+    virtual ~Formatted();
+};
+
+/** @todo document */
+class CV_EXPORTS Formatter
+{
+public:
+    enum FormatType {
+           FMT_DEFAULT = 0,
+           FMT_MATLAB  = 1,
+           FMT_CSV     = 2,
+           FMT_PYTHON  = 3,
+           FMT_NUMPY   = 4,
+           FMT_C       = 5
+         };
+
+    virtual ~Formatter();
+
+    virtual Ptr<Formatted> format(const Mat& mtx) const = 0;
+
+    virtual void set16fPrecision(int p = 4) = 0;
+    virtual void set32fPrecision(int p = 8) = 0;
+    virtual void set64fPrecision(int p = 16) = 0;
+    virtual void setMultiline(bool ml = true) = 0;
+
+    static Ptr<Formatter> get(Formatter::FormatType fmt = FMT_DEFAULT);
+
+};
+
+static inline
+String& operator << (String& out, Ptr<Formatted> fmtd)
+{
+    fmtd->reset();
+    for(const char* str = fmtd->next(); str; str = fmtd->next())
+        out += cv::String(str);
+    return out;
+}
+
+static inline
+String& operator << (String& out, const Mat& mtx)
+{
+    return out << Formatter::get()->format(mtx);
+}
+
+//////////////////////////////////////// Algorithm ////////////////////////////////////
+
+class CV_EXPORTS Algorithm;
+
+template<typename _Tp, typename _EnumTp = void> struct ParamType {};
+
+
+/** @brief This is a base class for all more or less complex algorithms in OpenCV
+
+especially for classes of algorithms, for which there can be multiple implementations. The examples
+are stereo correspondence (for which there are algorithms like block matching, semi-global block
+matching, graph-cut etc.), background subtraction (which can be done using mixture-of-gaussians
+models, codebook-based algorithm etc.), optical flow (block matching, Lucas-Kanade, Horn-Schunck
+etc.).
+
+Here is example of SimpleBlobDetector use in your application via Algorithm interface:
+@snippet snippets/core_various.cpp Algorithm
+*/
+class CV_EXPORTS_W Algorithm
+{
+public:
+    Algorithm();
+    virtual ~Algorithm();
+
+    /** @brief Clears the algorithm state
+    */
+    CV_WRAP virtual void clear() {}
+
+    /** @brief Stores algorithm parameters in a file storage
+    */
+    CV_WRAP virtual void write(FileStorage& fs) const { CV_UNUSED(fs); }
+
+    /**
+    * @overload
+    */
+    CV_WRAP void write(FileStorage& fs, const String& name) const;
+#if CV_VERSION_MAJOR < 5
+    /** @deprecated */
+    void write(const Ptr<FileStorage>& fs, const String& name = String()) const;
+#endif
+
+    /** @brief Reads algorithm parameters from a file storage
+    */
+    CV_WRAP virtual void read(const FileNode& fn) { CV_UNUSED(fn); }
+
+    /** @brief Returns true if the Algorithm is empty (e.g. in the very beginning or after unsuccessful read
+    */
+    CV_WRAP virtual bool empty() const { return false; }
+
+    /** @brief Reads algorithm from the file node
+
+    This is static template method of Algorithm. It's usage is following (in the case of SVM):
+    @code
+    cv::FileStorage fsRead("example.xml", FileStorage::READ);
+    Ptr<SVM> svm = Algorithm::read<SVM>(fsRead.root());
+    @endcode
+    In order to make this method work, the derived class must overwrite Algorithm::read(const
+    FileNode& fn) and also have static create() method without parameters
+    (or with all the optional parameters)
+    */
+    template<typename _Tp> static Ptr<_Tp> read(const FileNode& fn)
+    {
+        Ptr<_Tp> obj = _Tp::create();
+        obj->read(fn);
+        return !obj->empty() ? obj : Ptr<_Tp>();
+    }
+
+    /** @brief Loads algorithm from the file
+
+    @param filename Name of the file to read.
+    @param objname The optional name of the node to read (if empty, the first top-level node will be used)
+
+    This is static template method of Algorithm. It's usage is following (in the case of SVM):
+    @code
+    Ptr<SVM> svm = Algorithm::load<SVM>("my_svm_model.xml");
+    @endcode
+    In order to make this method work, the derived class must overwrite Algorithm::read(const
+    FileNode& fn).
+    */
+    template<typename _Tp> static Ptr<_Tp> load(const String& filename, const String& objname=String())
+    {
+        FileStorage fs(filename, FileStorage::READ);
+        CV_Assert(fs.isOpened());
+        FileNode fn = objname.empty() ? fs.getFirstTopLevelNode() : fs[objname];
+        if (fn.empty()) return Ptr<_Tp>();
+        Ptr<_Tp> obj = _Tp::create();
+        obj->read(fn);
+        return !obj->empty() ? obj : Ptr<_Tp>();
+    }
+
+    /** @brief Loads algorithm from a String
+
+    @param strModel The string variable containing the model you want to load.
+    @param objname The optional name of the node to read (if empty, the first top-level node will be used)
+
+    This is static template method of Algorithm. It's usage is following (in the case of SVM):
+    @code
+    Ptr<SVM> svm = Algorithm::loadFromString<SVM>(myStringModel);
+    @endcode
+    */
+    template<typename _Tp> static Ptr<_Tp> loadFromString(const String& strModel, const String& objname=String())
+    {
+        FileStorage fs(strModel, FileStorage::READ + FileStorage::MEMORY);
+        FileNode fn = objname.empty() ? fs.getFirstTopLevelNode() : fs[objname];
+        Ptr<_Tp> obj = _Tp::create();
+        obj->read(fn);
+        return !obj->empty() ? obj : Ptr<_Tp>();
+    }
+
+    /** Saves the algorithm to a file.
+    In order to make this method work, the derived class must implement Algorithm::write(FileStorage& fs). */
+    CV_WRAP virtual void save(const String& filename) const;
+
+    /** Returns the algorithm string identifier.
+    This string is used as top level xml/yml node tag when the object is saved to a file or string. */
+    CV_WRAP virtual String getDefaultName() const;
+
+protected:
+    void writeFormat(FileStorage& fs) const;
+};
+
+enum struct Param {
+    INT=0, BOOLEAN=1, REAL=2, STRING=3, MAT=4, MAT_VECTOR=5, ALGORITHM=6, FLOAT=7,
+    UNSIGNED_INT=8, UINT64=9, UCHAR=11, SCALAR=12
+};
+
+
+
+template<> struct ParamType<bool>
+{
+    typedef bool const_param_type;
+    typedef bool member_type;
+
+    static const Param type = Param::BOOLEAN;
+};
+
+template<> struct ParamType<int>
+{
+    typedef int const_param_type;
+    typedef int member_type;
+
+    static const Param type = Param::INT;
+};
+
+template<> struct ParamType<double>
+{
+    typedef double const_param_type;
+    typedef double member_type;
+
+    static const Param type = Param::REAL;
+};
+
+template<> struct ParamType<String>
+{
+    typedef const String& const_param_type;
+    typedef String member_type;
+
+    static const Param type = Param::STRING;
+};
+
+template<> struct ParamType<Mat>
+{
+    typedef const Mat& const_param_type;
+    typedef Mat member_type;
+
+    static const Param type = Param::MAT;
+};
+
+template<> struct ParamType<std::vector<Mat> >
+{
+    typedef const std::vector<Mat>& const_param_type;
+    typedef std::vector<Mat> member_type;
+
+    static const Param type = Param::MAT_VECTOR;
+};
+
+template<> struct ParamType<Algorithm>
+{
+    typedef const Ptr<Algorithm>& const_param_type;
+    typedef Ptr<Algorithm> member_type;
+
+    static const Param type = Param::ALGORITHM;
+};
+
+template<> struct ParamType<float>
+{
+    typedef float const_param_type;
+    typedef float member_type;
+
+    static const Param type = Param::FLOAT;
+};
+
+template<> struct ParamType<unsigned>
+{
+    typedef unsigned const_param_type;
+    typedef unsigned member_type;
+
+    static const Param type = Param::UNSIGNED_INT;
+};
+
+template<> struct ParamType<uint64>
+{
+    typedef uint64 const_param_type;
+    typedef uint64 member_type;
+
+    static const Param type = Param::UINT64;
+};
+
+template<> struct ParamType<uchar>
+{
+    typedef uchar const_param_type;
+    typedef uchar member_type;
+
+    static const Param type = Param::UCHAR;
+};
+
+template<> struct ParamType<Scalar>
+{
+    typedef const Scalar& const_param_type;
+    typedef Scalar member_type;
+
+    static const Param type = Param::SCALAR;
+};
+
+template<typename _Tp>
+struct ParamType<_Tp, typename std::enable_if< std::is_enum<_Tp>::value >::type>
+{
+    typedef typename std::underlying_type<_Tp>::type const_param_type;
+    typedef typename std::underlying_type<_Tp>::type member_type;
+
+    static const Param type = Param::INT;
+};
+
+//! @} core_basic
+
+} //namespace cv
+
+#include "opencv2/core/operations.hpp"
+#include "opencv2/core/cvstd.inl.hpp"
+#include "opencv2/core/utility.hpp"
+#include "opencv2/core/optim.hpp"
+#include "opencv2/core/ovx.hpp"
+
+#endif /*OPENCV_CORE_HPP*/
diff --git a/3rdParty/opencv2/core/affine.hpp b/3rdParty/opencv-4.12.0/opencv2/core/affine.hpp
similarity index 96%
rename from 3rdParty/opencv2/core/affine.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/affine.hpp
index 5b01b35f2c..bb5774231c 100644
--- a/3rdParty/opencv2/core/affine.hpp
+++ b/3rdParty/opencv-4.12.0/opencv2/core/affine.hpp
@@ -51,7 +51,7 @@
 namespace cv
 {
 
-//! @addtogroup core
+//! @addtogroup core_eigen
 //! @{
 
     /** @brief Affine transform
diff --git a/3rdParty/opencv2/core/async.hpp b/3rdParty/opencv-4.12.0/opencv2/core/async.hpp
similarity index 94%
rename from 3rdParty/opencv2/core/async.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/async.hpp
index 4c0b298f8a..4c56354d28 100644
--- a/3rdParty/opencv2/core/async.hpp
+++ b/3rdParty/opencv-4.12.0/opencv2/core/async.hpp
@@ -7,10 +7,8 @@
 
 #include <opencv2/core/mat.hpp>
 
-#ifdef CV_CXX11
 //#include <future>
 #include <chrono>
-#endif
 
 namespace cv {
 
@@ -69,7 +67,6 @@ class CV_EXPORTS_W AsyncArray
 
     CV_WRAP bool valid() const CV_NOEXCEPT;
 
-#ifdef CV_CXX11
     inline AsyncArray(AsyncArray&& o) { p = o.p; o.p = NULL; }
     inline AsyncArray& operator=(AsyncArray&& o) CV_NOEXCEPT { std::swap(p, o.p); return *this; }
 
@@ -89,7 +86,6 @@ class CV_EXPORTS_W AsyncArray
     std::future<Mat> getFutureMat() const;
     std::future<UMat> getFutureUMat() const;
 #endif
-#endif
 
 
     // PImpl
diff --git a/3rdParty/opencv-4.12.0/opencv2/core/base.hpp b/3rdParty/opencv-4.12.0/opencv2/core/base.hpp
new file mode 100644
index 0000000000..bebc02edd4
--- /dev/null
+++ b/3rdParty/opencv-4.12.0/opencv2/core/base.hpp
@@ -0,0 +1,746 @@
+/*M///////////////////////////////////////////////////////////////////////////////////////
+//
+//  IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
+//
+//  By downloading, copying, installing or using the software you agree to this license.
+//  If you do not agree to this license, do not download, install,
+//  copy or use the software.
+//
+//
+//                          License Agreement
+//                For Open Source Computer Vision Library
+//
+// Copyright (C) 2000-2008, Intel Corporation, all rights reserved.
+// Copyright (C) 2009, Willow Garage Inc., all rights reserved.
+// Copyright (C) 2013, OpenCV Foundation, all rights reserved.
+// Copyright (C) 2014, Itseez Inc., all rights reserved.
+// Third party copyrights are property of their respective owners.
+//
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
+//
+//   * Redistribution's of source code must retain the above copyright notice,
+//     this list of conditions and the following disclaimer.
+//
+//   * Redistribution's in binary form must reproduce the above copyright notice,
+//     this list of conditions and the following disclaimer in the documentation
+//     and/or other materials provided with the distribution.
+//
+//   * The name of the copyright holders may not be used to endorse or promote products
+//     derived from this software without specific prior written permission.
+//
+// This software is provided by the copyright holders and contributors "as is" and
+// any express or implied warranties, including, but not limited to, the implied
+// warranties of merchantability and fitness for a particular purpose are disclaimed.
+// In no event shall the Intel Corporation or contributors be liable for any direct,
+// indirect, incidental, special, exemplary, or consequential damages
+// (including, but not limited to, procurement of substitute goods or services;
+// loss of use, data, or profits; or business interruption) however caused
+// and on any theory of liability, whether in contract, strict liability,
+// or tort (including negligence or otherwise) arising in any way out of
+// the use of this software, even if advised of the possibility of such damage.
+//
+//M*/
+
+#ifndef OPENCV_CORE_BASE_HPP
+#define OPENCV_CORE_BASE_HPP
+
+#ifndef __cplusplus
+#  error base.hpp header must be compiled as C++
+#endif
+
+#include "opencv2/opencv_modules.hpp"
+
+#include <climits>
+#include <algorithm>
+
+#include "opencv2/core/cvdef.h"
+#include "opencv2/core/cvstd.hpp"
+
+namespace cv
+{
+
+//! @addtogroup core_utils
+//! @{
+
+namespace Error {
+//! error codes
+enum Code {
+    StsOk=                       0,  //!< everything is ok
+    StsBackTrace=               -1,  //!< pseudo error for back trace
+    StsError=                   -2,  //!< unknown /unspecified error
+    StsInternal=                -3,  //!< internal error (bad state)
+    StsNoMem=                   -4,  //!< insufficient memory
+    StsBadArg=                  -5,  //!< function arg/param is bad
+    StsBadFunc=                 -6,  //!< unsupported function
+    StsNoConv=                  -7,  //!< iteration didn't converge
+    StsAutoTrace=               -8,  //!< tracing
+    HeaderIsNull=               -9,  //!< image header is NULL
+    BadImageSize=              -10,  //!< image size is invalid
+    BadOffset=                 -11,  //!< offset is invalid
+    BadDataPtr=                -12,  //!<
+    BadStep=                   -13,  //!< image step is wrong, this may happen for a non-continuous matrix.
+    BadModelOrChSeq=           -14,  //!<
+    BadNumChannels=            -15,  //!< bad number of channels, for example, some functions accept only single channel matrices.
+    BadNumChannel1U=           -16,  //!<
+    BadDepth=                  -17,  //!< input image depth is not supported by the function
+    BadAlphaChannel=           -18,  //!<
+    BadOrder=                  -19,  //!< number of dimensions is out of range
+    BadOrigin=                 -20,  //!< incorrect input origin
+    BadAlign=                  -21,  //!< incorrect input align
+    BadCallBack=               -22,  //!<
+    BadTileSize=               -23,  //!<
+    BadCOI=                    -24,  //!< input COI is not supported
+    BadROISize=                -25,  //!< incorrect input roi
+    MaskIsTiled=               -26,  //!<
+    StsNullPtr=                -27,  //!< null pointer
+    StsVecLengthErr=           -28,  //!< incorrect vector length
+    StsFilterStructContentErr= -29,  //!< incorrect filter structure content
+    StsKernelStructContentErr= -30,  //!< incorrect transform kernel content
+    StsFilterOffsetErr=        -31,  //!< incorrect filter offset value
+    StsBadSize=                -201, //!< the input/output structure size is incorrect
+    StsDivByZero=              -202, //!< division by zero
+    StsInplaceNotSupported=    -203, //!< in-place operation is not supported
+    StsObjectNotFound=         -204, //!< request can't be completed
+    StsUnmatchedFormats=       -205, //!< formats of input/output arrays differ
+    StsBadFlag=                -206, //!< flag is wrong or not supported
+    StsBadPoint=               -207, //!< bad CvPoint
+    StsBadMask=                -208, //!< bad format of mask (neither 8uC1 nor 8sC1)
+    StsUnmatchedSizes=         -209, //!< sizes of input/output structures do not match
+    StsUnsupportedFormat=      -210, //!< the data format/type is not supported by the function
+    StsOutOfRange=             -211, //!< some of parameters are out of range
+    StsParseError=             -212, //!< invalid syntax/structure of the parsed file
+    StsNotImplemented=         -213, //!< the requested function/feature is not implemented
+    StsBadMemBlock=            -214, //!< an allocated block has been corrupted
+    StsAssert=                 -215, //!< assertion failed
+    GpuNotSupported=           -216, //!< no CUDA support
+    GpuApiCallError=           -217, //!< GPU API call error
+    OpenGlNotSupported=        -218, //!< no OpenGL support
+    OpenGlApiCallError=        -219, //!< OpenGL API call error
+    OpenCLApiCallError=        -220, //!< OpenCL API call error
+    OpenCLDoubleNotSupported=  -221,
+    OpenCLInitError=           -222, //!< OpenCL initialization error
+    OpenCLNoAMDBlasFft=        -223
+};
+} //Error
+
+//! @} core_utils
+
+//! @addtogroup core_array
+//! @{
+
+//! matrix decomposition types
+enum DecompTypes {
+    /** Gaussian elimination with the optimal pivot element chosen. */
+    DECOMP_LU       = 0,
+    /** singular value decomposition (SVD) method; the system can be over-defined and/or the matrix
+    src1 can be singular */
+    DECOMP_SVD      = 1,
+    /** eigenvalue decomposition; the matrix src1 must be symmetrical */
+    DECOMP_EIG      = 2,
+    /** Cholesky \f$LL^T\f$ factorization; the matrix src1 must be symmetrical and positively
+    defined */
+    DECOMP_CHOLESKY = 3,
+    /** QR factorization; the system can be over-defined and/or the matrix src1 can be singular */
+    DECOMP_QR       = 4,
+    /** while all the previous flags are mutually exclusive, this flag can be used together with
+    any of the previous; it means that the normal equations
+    \f$\texttt{src1}^T\cdot\texttt{src1}\cdot\texttt{dst}=\texttt{src1}^T\texttt{src2}\f$ are
+    solved instead of the original system
+    \f$\texttt{src1}\cdot\texttt{dst}=\texttt{src2}\f$ */
+    DECOMP_NORMAL   = 16
+};
+
+/** norm types
+
+src1 and src2 denote input arrays.
+*/
+
+enum NormTypes {
+                /**
+                \f[
+                norm =  \forkthree
+                {\|\texttt{src1}\|_{L_{\infty}} =  \max _I | \texttt{src1} (I)|}{if  \(\texttt{normType} = \texttt{NORM_INF}\) }
+                {\|\texttt{src1}-\texttt{src2}\|_{L_{\infty}} =  \max _I | \texttt{src1} (I) -  \texttt{src2} (I)|}{if  \(\texttt{normType} = \texttt{NORM_INF}\) }
+                {\frac{\|\texttt{src1}-\texttt{src2}\|_{L_{\infty}}    }{\|\texttt{src2}\|_{L_{\infty}} }}{if  \(\texttt{normType} = \texttt{NORM_RELATIVE | NORM_INF}\) }
+                \f]
+                */
+                NORM_INF       = 1,
+                /**
+                \f[
+                norm =  \forkthree
+                {\| \texttt{src1} \| _{L_1} =  \sum _I | \texttt{src1} (I)|}{if  \(\texttt{normType} = \texttt{NORM_L1}\)}
+                { \| \texttt{src1} - \texttt{src2} \| _{L_1} =  \sum _I | \texttt{src1} (I) -  \texttt{src2} (I)|}{if  \(\texttt{normType} = \texttt{NORM_L1}\) }
+                { \frac{\|\texttt{src1}-\texttt{src2}\|_{L_1} }{\|\texttt{src2}\|_{L_1}} }{if  \(\texttt{normType} = \texttt{NORM_RELATIVE | NORM_L1}\) }
+                \f]*/
+                 NORM_L1        = 2,
+                 /**
+                 \f[
+                 norm =  \forkthree
+                 { \| \texttt{src1} \| _{L_2} =  \sqrt{\sum_I \texttt{src1}(I)^2} }{if  \(\texttt{normType} = \texttt{NORM_L2}\) }
+                 { \| \texttt{src1} - \texttt{src2} \| _{L_2} =  \sqrt{\sum_I (\texttt{src1}(I) - \texttt{src2}(I))^2} }{if  \(\texttt{normType} = \texttt{NORM_L2}\) }
+                 { \frac{\|\texttt{src1}-\texttt{src2}\|_{L_2} }{\|\texttt{src2}\|_{L_2}} }{if  \(\texttt{normType} = \texttt{NORM_RELATIVE | NORM_L2}\) }
+                 \f]
+                 */
+                 NORM_L2        = 4,
+                 /**
+                 \f[
+                 norm =  \forkthree
+                 { \| \texttt{src1} \| _{L_2} ^{2} = \sum_I \texttt{src1}(I)^2} {if  \(\texttt{normType} = \texttt{NORM_L2SQR}\)}
+                 { \| \texttt{src1} - \texttt{src2} \| _{L_2} ^{2} =  \sum_I (\texttt{src1}(I) - \texttt{src2}(I))^2 }{if  \(\texttt{normType} = \texttt{NORM_L2SQR}\) }
+                 { \left(\frac{\|\texttt{src1}-\texttt{src2}\|_{L_2} }{\|\texttt{src2}\|_{L_2}}\right)^2 }{if  \(\texttt{normType} = \texttt{NORM_RELATIVE | NORM_L2SQR}\) }
+                 \f]
+                 */
+                 NORM_L2SQR     = 5,
+                 /**
+                 In the case of one input array, calculates the Hamming distance of the array from zero,
+                 In the case of two input arrays, calculates the Hamming distance between the arrays.
+                 */
+                 NORM_HAMMING   = 6,
+                 /**
+                 Similar to NORM_HAMMING, but in the calculation, each two bits of the input sequence will
+                 be added and treated as a single bit to be used in the same calculation as NORM_HAMMING.
+                 */
+                 NORM_HAMMING2  = 7,
+                 NORM_TYPE_MASK = 7, //!< bit-mask which can be used to separate norm type from norm flags
+                 NORM_RELATIVE  = 8, //!< flag
+                 NORM_MINMAX    = 32 //!< flag
+               };
+
+//! comparison types
+enum CmpTypes { CMP_EQ = 0, //!< src1 is equal to src2.
+                CMP_GT = 1, //!< src1 is greater than src2.
+                CMP_GE = 2, //!< src1 is greater than or equal to src2.
+                CMP_LT = 3, //!< src1 is less than src2.
+                CMP_LE = 4, //!< src1 is less than or equal to src2.
+                CMP_NE = 5  //!< src1 is unequal to src2.
+              };
+
+//! generalized matrix multiplication flags
+enum GemmFlags { GEMM_1_T = 1, //!< transposes src1
+                 GEMM_2_T = 2, //!< transposes src2
+                 GEMM_3_T = 4 //!< transposes src3
+               };
+
+enum DftFlags {
+    /** performs an inverse 1D or 2D transform instead of the default forward
+        transform. */
+    DFT_INVERSE        = 1,
+    /** scales the result: divide it by the number of array elements. Normally, it is
+        combined with DFT_INVERSE. */
+    DFT_SCALE          = 2,
+    /** performs a forward or inverse transform of every individual row of the input
+        matrix; this flag enables you to transform multiple vectors simultaneously and can be used to
+        decrease the overhead (which is sometimes several times larger than the processing itself) to
+        perform 3D and higher-dimensional transformations and so forth.*/
+    DFT_ROWS           = 4,
+    /** performs a forward transformation of 1D or 2D real array; the result,
+        though being a complex array, has complex-conjugate symmetry (*CCS*, see the function
+        description below for details), and such an array can be packed into a real array of the same
+        size as input, which is the fastest option and which is what the function does by default;
+        however, you may wish to get a full complex array (for simpler spectrum analysis, and so on) -
+        pass the flag to enable the function to produce a full-size complex output array. */
+    DFT_COMPLEX_OUTPUT = 16,
+    /** performs an inverse transformation of a 1D or 2D complex array; the
+        result is normally a complex array of the same size, however, if the input array has
+        conjugate-complex symmetry (for example, it is a result of forward transformation with
+        DFT_COMPLEX_OUTPUT flag), the output is a real array; while the function itself does not
+        check whether the input is symmetrical or not, you can pass the flag and then the function
+        will assume the symmetry and produce the real output array (note that when the input is packed
+        into a real array and inverse transformation is executed, the function treats the input as a
+        packed complex-conjugate symmetrical array, and the output will also be a real array). */
+    DFT_REAL_OUTPUT    = 32,
+    /** specifies that input is complex input. If this flag is set, the input must have 2 channels.
+        On the other hand, for backwards compatibility reason, if input has 2 channels, input is
+        already considered complex. */
+    DFT_COMPLEX_INPUT  = 64,
+    /** performs an inverse 1D or 2D transform instead of the default forward transform. */
+    DCT_INVERSE        = DFT_INVERSE,
+    /** performs a forward or inverse transform of every individual row of the input
+        matrix. This flag enables you to transform multiple vectors simultaneously and can be used to
+        decrease the overhead (which is sometimes several times larger than the processing itself) to
+        perform 3D and higher-dimensional transforms and so forth.*/
+    DCT_ROWS           = DFT_ROWS
+};
+
+/*! Various border types, image boundaries are denoted with the `|` character in the table below, when describing each method.
+
+The following examples show the result of the @ref copyMakeBorder call according to different methods.
+Input image is `6x4` (width x height) size and the @ref copyMakeBorder function is used with a border size of 2 pixels
+in each direction, giving a resulting image of `10x8` resolution.
+
+@code
+Input image:
+[[ 0  1  2  3  4  5]
+ [ 6  7  8  9 10 11]
+ [12 13 14 15 16 17]
+ [18 19 20 21 22 23]]
+
+Border type: BORDER_CONSTANT (a constant value of 255 is used)
+[[255 255 255 255 255 255 255 255 255 255]
+ [255 255 255 255 255 255 255 255 255 255]
+ [255 255   0   1   2   3   4   5 255 255]
+ [255 255   6   7   8   9  10  11 255 255]
+ [255 255  12  13  14  15  16  17 255 255]
+ [255 255  18  19  20  21  22  23 255 255]
+ [255 255 255 255 255 255 255 255 255 255]
+ [255 255 255 255 255 255 255 255 255 255]]
+
+Border type: BORDER_REPLICATE
+[[ 0  0  0  1  2  3  4  5  5  5]
+ [ 0  0  0  1  2  3  4  5  5  5]
+ [ 0  0  0  1  2  3  4  5  5  5]
+ [ 6  6  6  7  8  9 10 11 11 11]
+ [12 12 12 13 14 15 16 17 17 17]
+ [18 18 18 19 20 21 22 23 23 23]
+ [18 18 18 19 20 21 22 23 23 23]
+ [18 18 18 19 20 21 22 23 23 23]]
+
+Border type: BORDER_REFLECT
+[[ 7  6  6  7  8  9 10 11 11 10]
+ [ 1  0  0  1  2  3  4  5  5  4]
+ [ 1  0  0  1  2  3  4  5  5  4]
+ [ 7  6  6  7  8  9 10 11 11 10]
+ [13 12 12 13 14 15 16 17 17 16]
+ [19 18 18 19 20 21 22 23 23 22]
+ [19 18 18 19 20 21 22 23 23 22]
+ [13 12 12 13 14 15 16 17 17 16]]
+
+Border type: BORDER_WRAP
+[[16 17 12 13 14 15 16 17 12 13]
+ [22 23 18 19 20 21 22 23 18 19]
+ [ 4  5  0  1  2  3  4  5  0  1]
+ [10 11  6  7  8  9 10 11  6  7]
+ [16 17 12 13 14 15 16 17 12 13]
+ [22 23 18 19 20 21 22 23 18 19]
+ [ 4  5  0  1  2  3  4  5  0  1]
+ [10 11  6  7  8  9 10 11  6  7]]
+
+Border type: BORDER_REFLECT_101
+[[14 13 12 13 14 15 16 17 16 15]
+ [ 8  7  6  7  8  9 10 11 10  9]
+ [ 2  1  0  1  2  3  4  5  4  3]
+ [ 8  7  6  7  8  9 10 11 10  9]
+ [14 13 12 13 14 15 16 17 16 15]
+ [20 19 18 19 20 21 22 23 22 21]
+ [14 13 12 13 14 15 16 17 16 15]
+ [ 8  7  6  7  8  9 10 11 10  9]]
+@endcode
+
+@see borderInterpolate, copyMakeBorder
+ */
+enum BorderTypes {
+    BORDER_CONSTANT    = 0, //!< `iiiiii|abcdefgh|iiiiiii`  with some specified `i`
+    BORDER_REPLICATE   = 1, //!< `aaaaaa|abcdefgh|hhhhhhh`
+    BORDER_REFLECT     = 2, //!< `fedcba|abcdefgh|hgfedcb`
+    BORDER_WRAP        = 3, //!< `cdefgh|abcdefgh|abcdefg`
+    BORDER_REFLECT_101 = 4, //!< `gfedcb|abcdefgh|gfedcba`
+    BORDER_TRANSPARENT = 5, //!< `uvwxyz|abcdefgh|ijklmno` - Treats outliers as transparent.
+
+    BORDER_REFLECT101  = BORDER_REFLECT_101, //!< same as BORDER_REFLECT_101
+    BORDER_DEFAULT     = BORDER_REFLECT_101, //!< same as BORDER_REFLECT_101
+    BORDER_ISOLATED    = 16 //!< Interpolation restricted within the ROI boundaries.
+};
+
+//! @} core_array
+
+//! @addtogroup core_utils
+//! @{
+
+/*! @brief Signals an error and raises the exception.
+
+By default the function prints information about the error to stderr,
+then it either stops if setBreakOnError() had been called before or raises the exception.
+It is possible to alternate error processing by using redirectError().
+@param code - error code (Error::Code)
+@param err - error description
+@param func - function name. Available only when the compiler supports getting it
+@param file - source file name where the error has occurred
+@param line - line number in the source file where the error has occurred
+@see CV_Error, CV_Error_, CV_Assert, CV_DbgAssert
+ */
+CV_EXPORTS CV_NORETURN void error(int code, const String& err, const char* func, const char* file, int line);
+
+/*! @brief Signals an error and terminate application.
+
+By default the function prints information about the error to stderr, then it terminates application
+with std::terminate. The function is designed for invariants check in functions and methods with
+noexcept attribute.
+@param code - error code (Error::Code)
+@param err - error description
+@param func - function name. Available only when the compiler supports getting it
+@param file - source file name where the error has occurred
+@param line - line number in the source file where the error has occurred
+@see CV_AssertTerminate
+ */
+CV_EXPORTS CV_NORETURN void terminate(int code, const String& err, const char* func, const char* file, int line) CV_NOEXCEPT;
+
+
+#ifdef CV_STATIC_ANALYSIS
+
+// In practice, some macro are not processed correctly (noreturn is not detected).
+// We need to use simplified definition for them.
+#define CV_Error(code, msg) do { (void)(code); (void)(msg); abort(); } while (0)
+#define CV_Error_(code, args) do { (void)(code); (void)(cv::format args); abort(); } while (0)
+#define CV_Assert( expr ) do { if (!(expr)) abort(); } while (0)
+
+#else // CV_STATIC_ANALYSIS
+
+/** @brief Call the error handler.
+
+Currently, the error handler prints the error code and the error message to the standard
+error stream `stderr`. In the Debug configuration, it then provokes memory access violation, so that
+the execution stack and all the parameters can be analyzed by the debugger. In the Release
+configuration, the exception is thrown.
+
+@param code one of Error::Code
+@param msg error message
+*/
+#define CV_Error( code, msg ) cv::error( code, msg, CV_Func, __FILE__, __LINE__ )
+
+/**  @brief Call the error handler.
+
+This macro can be used to construct an error message on-fly to include some dynamic information,
+for example:
+@code
+    // note the extra parentheses around the formatted text message
+    CV_Error_(Error::StsOutOfRange,
+    ("the value at (%d, %d)=%g is out of range", badPt.x, badPt.y, badValue));
+@endcode
+@param code one of Error::Code
+@param args printf-like formatted error message in parentheses
+*/
+#define CV_Error_( code, args ) cv::error( code, cv::format args, CV_Func, __FILE__, __LINE__ )
+
+/** @brief Checks a condition at runtime and throws exception if it fails
+
+The macros CV_Assert (and CV_DbgAssert(expr)) evaluate the specified expression. If it is 0, the macros
+raise an error (see cv::error). The macro CV_Assert checks the condition in both Debug and Release
+configurations while CV_DbgAssert is only retained in the Debug configuration.
+CV_AssertTerminate is analog of CV_Assert for invariants check in functions with noexcept attribute.
+It does not throw exception, but terminates the application.
+*/
+#define CV_Assert( expr ) do { if(!!(expr)) ; else cv::error( cv::Error::StsAssert, #expr, CV_Func, __FILE__, __LINE__ ); } while(0)
+#define CV_AssertTerminate( expr ) do { if(!!(expr)) ; else cv::terminate( #expr, CV_Func, __FILE__, __LINE__ ); } while(0)
+
+#endif // CV_STATIC_ANALYSIS
+
+//! @cond IGNORED
+#if !defined(__OPENCV_BUILD)  // TODO: backward compatibility only
+#ifndef CV_ErrorNoReturn
+#define CV_ErrorNoReturn CV_Error
+#endif
+#ifndef CV_ErrorNoReturn_
+#define CV_ErrorNoReturn_ CV_Error_
+#endif
+#endif
+
+#define CV_Assert_1 CV_Assert
+#define CV_Assert_2( expr, ... ) CV_Assert_1(expr); __CV_EXPAND(CV_Assert_1( __VA_ARGS__ ))
+#define CV_Assert_3( expr, ... ) CV_Assert_1(expr); __CV_EXPAND(CV_Assert_2( __VA_ARGS__ ))
+#define CV_Assert_4( expr, ... ) CV_Assert_1(expr); __CV_EXPAND(CV_Assert_3( __VA_ARGS__ ))
+#define CV_Assert_5( expr, ... ) CV_Assert_1(expr); __CV_EXPAND(CV_Assert_4( __VA_ARGS__ ))
+#define CV_Assert_6( expr, ... ) CV_Assert_1(expr); __CV_EXPAND(CV_Assert_5( __VA_ARGS__ ))
+#define CV_Assert_7( expr, ... ) CV_Assert_1(expr); __CV_EXPAND(CV_Assert_6( __VA_ARGS__ ))
+#define CV_Assert_8( expr, ... ) CV_Assert_1(expr); __CV_EXPAND(CV_Assert_7( __VA_ARGS__ ))
+#define CV_Assert_9( expr, ... ) CV_Assert_1(expr); __CV_EXPAND(CV_Assert_8( __VA_ARGS__ ))
+#define CV_Assert_10( expr, ... ) CV_Assert_1(expr); __CV_EXPAND(CV_Assert_9( __VA_ARGS__ ))
+
+#define CV_Assert_N(...) do { __CV_EXPAND(__CV_CAT(CV_Assert_, __CV_VA_NUM_ARGS(__VA_ARGS__)) (__VA_ARGS__)); } while(0)
+
+//! @endcond
+
+#if !defined(NDEBUG) || defined(CV_STATIC_ANALYSIS)
+#  define CV_DbgAssert(expr) CV_Assert(expr)
+#else
+/** replaced with CV_Assert(expr) in Debug configuration */
+#  define CV_DbgAssert(expr)
+#endif
+
+/*
+ * Hamming distance functor - counts the bit differences between two strings - useful for the Brief descriptor
+ * bit count of A exclusive XOR'ed with B
+ */
+struct CV_EXPORTS Hamming
+{
+    static const NormTypes normType = NORM_HAMMING;
+    typedef unsigned char ValueType;
+    typedef int ResultType;
+
+    /** this will count the bits in a ^ b
+     */
+    ResultType operator()( const unsigned char* a, const unsigned char* b, int size ) const;
+};
+
+typedef Hamming HammingLUT;
+
+/////////////////////////////////// inline norms ////////////////////////////////////
+
+template<typename _Tp> inline _Tp cv_abs(_Tp x) { return std::abs(x); }
+inline int cv_abs(uchar x) { return x; }
+inline int cv_abs(schar x) { return std::abs(x); }
+inline int cv_abs(ushort x) { return x; }
+inline int cv_abs(short x) { return std::abs(x); }
+
+template<typename _Tp, typename _AccTp> static inline
+_AccTp normL2Sqr(const _Tp* a, int n)
+{
+    _AccTp s = 0;
+    int i=0;
+#if CV_ENABLE_UNROLLED
+    for( ; i <= n - 4; i += 4 )
+    {
+        _AccTp v0 = a[i], v1 = a[i+1], v2 = a[i+2], v3 = a[i+3];
+        s += v0*v0 + v1*v1 + v2*v2 + v3*v3;
+    }
+#endif
+    for( ; i < n; i++ )
+    {
+        _AccTp v = a[i];
+        s += v*v;
+    }
+    return s;
+}
+
+template<typename _Tp, typename _AccTp> static inline
+_AccTp normL1(const _Tp* a, int n)
+{
+    _AccTp s = 0;
+    int i = 0;
+#if CV_ENABLE_UNROLLED
+    for(; i <= n - 4; i += 4 )
+    {
+        s += (_AccTp)cv_abs(a[i]) + (_AccTp)cv_abs(a[i+1]) +
+            (_AccTp)cv_abs(a[i+2]) + (_AccTp)cv_abs(a[i+3]);
+    }
+#endif
+    for( ; i < n; i++ )
+        s += cv_abs(a[i]);
+    return s;
+}
+
+template<typename _Tp, typename _AccTp> static inline
+_AccTp normInf(const _Tp* a, int n)
+{
+    _AccTp s = 0;
+    for( int i = 0; i < n; i++ )
+        s = std::max(s, (_AccTp)cv_abs(a[i]));
+    return s;
+}
+
+template<typename _Tp, typename _AccTp> static inline
+_AccTp normL2Sqr(const _Tp* a, const _Tp* b, int n)
+{
+    _AccTp s = 0;
+    int i= 0;
+#if CV_ENABLE_UNROLLED
+    for(; i <= n - 4; i += 4 )
+    {
+        _AccTp v0 = _AccTp(a[i] - b[i]), v1 = _AccTp(a[i+1] - b[i+1]), v2 = _AccTp(a[i+2] - b[i+2]), v3 = _AccTp(a[i+3] - b[i+3]);
+        s += v0*v0 + v1*v1 + v2*v2 + v3*v3;
+    }
+#endif
+    for( ; i < n; i++ )
+    {
+        _AccTp v = _AccTp(a[i] - b[i]);
+        s += v*v;
+    }
+    return s;
+}
+
+static inline float normL2Sqr(const float* a, const float* b, int n)
+{
+    float s = 0.f;
+    for( int i = 0; i < n; i++ )
+    {
+        float v = a[i] - b[i];
+        s += v*v;
+    }
+    return s;
+}
+
+template<typename _Tp, typename _AccTp> static inline
+_AccTp normL1(const _Tp* a, const _Tp* b, int n)
+{
+    _AccTp s = 0;
+    int i= 0;
+#if CV_ENABLE_UNROLLED
+    for(; i <= n - 4; i += 4 )
+    {
+        _AccTp v0 = _AccTp(a[i] - b[i]), v1 = _AccTp(a[i+1] - b[i+1]), v2 = _AccTp(a[i+2] - b[i+2]), v3 = _AccTp(a[i+3] - b[i+3]);
+        s += std::abs(v0) + std::abs(v1) + std::abs(v2) + std::abs(v3);
+    }
+#endif
+    for( ; i < n; i++ )
+    {
+        _AccTp v = _AccTp(a[i] - b[i]);
+        s += std::abs(v);
+    }
+    return s;
+}
+
+inline float normL1(const float* a, const float* b, int n)
+{
+    float s = 0.f;
+    for( int i = 0; i < n; i++ )
+    {
+        s += std::abs(a[i] - b[i]);
+    }
+    return s;
+}
+
+inline int normL1(const uchar* a, const uchar* b, int n)
+{
+    int s = 0;
+    for( int i = 0; i < n; i++ )
+    {
+        s += std::abs(a[i] - b[i]);
+    }
+    return s;
+}
+
+template<typename _Tp, typename _AccTp> static inline
+_AccTp normInf(const _Tp* a, const _Tp* b, int n)
+{
+    _AccTp s = 0;
+    for( int i = 0; i < n; i++ )
+    {
+        _AccTp v0 = a[i] - b[i];
+        s = std::max(s, std::abs(v0));
+    }
+    return s;
+}
+
+/** @brief Computes the cube root of an argument.
+
+ The function cubeRoot computes \f$\sqrt[3]{\texttt{val}}\f$. Negative arguments are handled correctly.
+ NaN and Inf are not handled. The accuracy approaches the maximum possible accuracy for
+ single-precision data.
+ @param val A function argument.
+ */
+CV_EXPORTS_W float cubeRoot(float val);
+
+/** @overload
+
+cubeRoot with argument of `double` type calls `std::cbrt(double)`
+*/
+static inline
+double cubeRoot(double val)
+{
+    return std::cbrt(val);
+}
+
+/** @brief Calculates the angle of a 2D vector in degrees.
+
+ The function fastAtan2 calculates the full-range angle of an input 2D vector. The angle is measured
+ in degrees and varies from 0 to 360 degrees. The accuracy is about 0.3 degrees.
+ @param x x-coordinate of the vector.
+ @param y y-coordinate of the vector.
+ */
+CV_EXPORTS_W float fastAtan2(float y, float x);
+
+/** proxy for hal::LU */
+CV_EXPORTS int LU(float* A, size_t astep, int m, float* b, size_t bstep, int n);
+/** proxy for hal::LU */
+CV_EXPORTS int LU(double* A, size_t astep, int m, double* b, size_t bstep, int n);
+/** proxy for hal::Cholesky */
+CV_EXPORTS bool Cholesky(float* A, size_t astep, int m, float* b, size_t bstep, int n);
+/** proxy for hal::Cholesky */
+CV_EXPORTS bool Cholesky(double* A, size_t astep, int m, double* b, size_t bstep, int n);
+
+////////////////// forward declarations for important OpenCV types //////////////////
+
+//! @cond IGNORED
+
+template<typename _Tp, int cn> class Vec;
+template<typename _Tp, int m, int n> class Matx;
+
+template<typename _Tp> class Complex;
+template<typename _Tp> class Point_;
+template<typename _Tp> class Point3_;
+template<typename _Tp> class Size_;
+template<typename _Tp> class Rect_;
+template<typename _Tp> class Scalar_;
+
+class CV_EXPORTS RotatedRect;
+class CV_EXPORTS Range;
+class CV_EXPORTS TermCriteria;
+class CV_EXPORTS KeyPoint;
+class CV_EXPORTS DMatch;
+class CV_EXPORTS RNG;
+
+class CV_EXPORTS Mat;
+class CV_EXPORTS MatExpr;
+
+class CV_EXPORTS UMat;
+
+class CV_EXPORTS SparseMat;
+typedef Mat MatND;
+
+template<typename _Tp> class Mat_;
+template<typename _Tp> class SparseMat_;
+
+class CV_EXPORTS MatConstIterator;
+class CV_EXPORTS SparseMatIterator;
+class CV_EXPORTS SparseMatConstIterator;
+template<typename _Tp> class MatIterator_;
+template<typename _Tp> class MatConstIterator_;
+template<typename _Tp> class SparseMatIterator_;
+template<typename _Tp> class SparseMatConstIterator_;
+
+namespace ogl
+{
+    class CV_EXPORTS Buffer;
+    class CV_EXPORTS Texture2D;
+    class CV_EXPORTS Arrays;
+}
+
+namespace cuda
+{
+    class CV_EXPORTS GpuMat;
+    class CV_EXPORTS HostMem;
+    class CV_EXPORTS Stream;
+    class CV_EXPORTS Event;
+}
+
+namespace cudev
+{
+    template <typename _Tp> class GpuMat_;
+}
+
+namespace ipp
+{
+CV_EXPORTS   unsigned long long getIppFeatures();
+CV_EXPORTS   void setIppStatus(int status, const char * const funcname = NULL, const char * const filename = NULL,
+                             int line = 0);
+CV_EXPORTS   int getIppStatus();
+CV_EXPORTS   String getIppErrorLocation();
+CV_EXPORTS_W bool   useIPP();
+CV_EXPORTS_W void   setUseIPP(bool flag);
+CV_EXPORTS_W String getIppVersion();
+
+// IPP Not-Exact mode. This function may force use of IPP then both IPP and OpenCV provide proper results
+// but have internal accuracy differences which have too much direct or indirect impact on accuracy tests.
+CV_EXPORTS_W bool useIPP_NotExact();
+CV_EXPORTS_W void setUseIPP_NotExact(bool flag);
+#ifndef DISABLE_OPENCV_3_COMPATIBILITY
+static inline bool useIPP_NE() { return useIPP_NotExact(); }
+static inline void setUseIPP_NE(bool flag) { setUseIPP_NotExact(flag); }
+#endif
+
+} // ipp
+
+//! @endcond
+
+//! @} core_utils
+
+
+
+
+} // cv
+
+#include "opencv2/core/neon_utils.hpp"
+#include "opencv2/core/vsx_utils.hpp"
+#include "opencv2/core/check.hpp"
+
+#endif //OPENCV_CORE_BASE_HPP
diff --git a/3rdParty/opencv2/core/bindings_utils.hpp b/3rdParty/opencv-4.12.0/opencv2/core/bindings_utils.hpp
similarity index 81%
rename from 3rdParty/opencv2/core/bindings_utils.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/bindings_utils.hpp
index 9f96a01eda..0e18693e24 100644
--- a/3rdParty/opencv2/core/bindings_utils.hpp
+++ b/3rdParty/opencv-4.12.0/opencv2/core/bindings_utils.hpp
@@ -35,6 +35,14 @@ String dumpInt(int argument)
     return cv::format("Int: %d", argument);
 }
 
+CV_WRAP static inline
+String dumpInt64(int64 argument)
+{
+    std::ostringstream oss("Int64: ", std::ios::ate);
+    oss << argument;
+    return oss.str();
+}
+
 CV_WRAP static inline
 String dumpSizeT(size_t argument)
 {
@@ -67,20 +75,6 @@ String dumpString(const String& argument)
     return cv::format("String: %s", argument.c_str());
 }
 
-CV_WRAP static inline
-String testOverloadResolution(int value, const Point& point = Point(42, 24))
-{
-    return format("overload (int=%d, point=(x=%d, y=%d))", value, point.x,
-                  point.y);
-}
-
-CV_WRAP static inline
-String testOverloadResolution(const Rect& rect)
-{
-    return format("overload (rect=(x=%d, y=%d, w=%d, h=%d))", rect.x, rect.y,
-                  rect.width, rect.height);
-}
-
 CV_WRAP static inline
 String dumpRect(const Rect& argument)
 {
@@ -103,6 +97,42 @@ String dumpRotatedRect(const RotatedRect& argument)
                   argument.size.height, argument.angle);
 }
 
+CV_WRAP static inline
+String dumpRange(const Range& argument)
+{
+    if (argument == Range::all())
+    {
+        return "range: all";
+    }
+    else
+    {
+        return format("range: (s=%d, e=%d)", argument.start, argument.end);
+    }
+}
+
+CV_EXPORTS_W String dumpVectorOfInt(const std::vector<int>& vec);
+
+CV_EXPORTS_W String dumpVectorOfDouble(const std::vector<double>& vec);
+
+CV_EXPORTS_W String dumpVectorOfRect(const std::vector<Rect>& vec);
+
+
+//! @cond IGNORED
+
+CV_WRAP static inline
+String testOverloadResolution(int value, const Point& point = Point(42, 24))
+{
+    return format("overload (int=%d, point=(x=%d, y=%d))", value, point.x,
+                  point.y);
+}
+
+CV_WRAP static inline
+String testOverloadResolution(const Rect& rect)
+{
+    return format("overload (rect=(x=%d, y=%d, w=%d, h=%d))", rect.x, rect.y,
+                  rect.width, rect.height);
+}
+
 CV_WRAP static inline
 RotatedRect testRotatedRect(float x, float y, float w, float h, float angle)
 {
@@ -118,19 +148,6 @@ std::vector<RotatedRect> testRotatedRectVector(float x, float y, float w, float
     return result;
 }
 
-CV_WRAP static inline
-String dumpRange(const Range& argument)
-{
-    if (argument == Range::all())
-    {
-        return "range: all";
-    }
-    else
-    {
-        return format("range: (s=%d, e=%d)", argument.start, argument.end);
-    }
-}
-
 CV_WRAP static inline
 int testOverwriteNativeMethod(int argument)
 {
@@ -143,12 +160,6 @@ String testReservedKeywordConversion(int positional_argument, int lambda = 2, in
     return format("arg=%d, lambda=%d, from=%d", positional_argument, lambda, from);
 }
 
-CV_EXPORTS_W String dumpVectorOfInt(const std::vector<int>& vec);
-
-CV_EXPORTS_W String dumpVectorOfDouble(const std::vector<double>& vec);
-
-CV_EXPORTS_W String dumpVectorOfRect(const std::vector<Rect>& vec);
-
 CV_WRAP static inline
 void generateVectorOfRect(size_t len, CV_OUT std::vector<Rect>& vec)
 {
@@ -219,6 +230,49 @@ AsyncArray testAsyncException()
     return p.getArrayResult();
 }
 
+CV_WRAP static inline
+String dumpVec2i(const cv::Vec2i value = cv::Vec2i(42, 24)) {
+    return format("Vec2i(%d, %d)", value[0], value[1]);
+}
+
+struct CV_EXPORTS_W_SIMPLE ClassWithKeywordProperties {
+    CV_PROP_RW int lambda;
+    CV_PROP int except;
+
+    CV_WRAP explicit ClassWithKeywordProperties(int lambda_arg = 24, int except_arg = 42)
+    {
+        lambda = lambda_arg;
+        except = except_arg;
+    }
+};
+
+struct CV_EXPORTS_W_PARAMS FunctionParams
+{
+    CV_PROP_RW int lambda = -1;
+    CV_PROP_RW float sigma = 0.0f;
+
+    FunctionParams& setLambda(int value) CV_NOEXCEPT
+    {
+        lambda = value;
+        return *this;
+    }
+
+    FunctionParams& setSigma(float value) CV_NOEXCEPT
+    {
+        sigma = value;
+        return *this;
+    }
+};
+
+CV_WRAP static inline String
+copyMatAndDumpNamedArguments(InputArray src, OutputArray dst,
+                             const FunctionParams& params = FunctionParams())
+{
+    src.copyTo(dst);
+    return format("lambda=%d, sigma=%.1f", params.lambda,
+                  params.sigma);
+}
+
 namespace nested {
 CV_WRAP static inline bool testEchoBooleanFunction(bool flag) {
     return flag;
@@ -272,6 +326,8 @@ class CV_EXPORTS_W CV_WRAP_AS(ExportClassName) OriginalClassName
 typedef OriginalClassName::Params OriginalClassName_Params;
 } // namespace nested
 
+//! @endcond IGNORED
+
 namespace fs {
     CV_EXPORTS_W cv::String getCacheDirectoryForDownloads();
 } // namespace fs
diff --git a/3rdParty/opencv2/core/bufferpool.hpp b/3rdParty/opencv-4.12.0/opencv2/core/bufferpool.hpp
similarity index 92%
rename from 3rdParty/opencv2/core/bufferpool.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/bufferpool.hpp
index 90af9d0d81..5322c87953 100644
--- a/3rdParty/opencv2/core/bufferpool.hpp
+++ b/3rdParty/opencv-4.12.0/opencv2/core/bufferpool.hpp
@@ -15,7 +15,7 @@
 namespace cv
 {
 
-//! @addtogroup core
+//! @addtogroup core_opencl
 //! @{
 
 class BufferPoolController
diff --git a/3rdParty/opencv2/core/check.hpp b/3rdParty/opencv-4.12.0/opencv2/core/check.hpp
similarity index 89%
rename from 3rdParty/opencv2/core/check.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/check.hpp
index 5dd206f656..dc1dd70820 100644
--- a/3rdParty/opencv2/core/check.hpp
+++ b/3rdParty/opencv-4.12.0/opencv2/core/check.hpp
@@ -65,6 +65,7 @@ struct CheckContext {
     static const cv::detail::CheckContext CV__CHECK_LOCATION_VARNAME(id) = \
             { CV__CHECK_FUNCTION, CV__CHECK_FILENAME, __LINE__, testOp, "" message, "" p1_str, "" p2_str }
 
+CV_EXPORTS void CV_NORETURN check_failed_auto(const bool v1, const bool v2, const CheckContext& ctx);
 CV_EXPORTS void CV_NORETURN check_failed_auto(const int v1, const int v2, const CheckContext& ctx);
 CV_EXPORTS void CV_NORETURN check_failed_auto(const size_t v1, const size_t v2, const CheckContext& ctx);
 CV_EXPORTS void CV_NORETURN check_failed_auto(const float v1, const float v2, const CheckContext& ctx);
@@ -74,6 +75,9 @@ CV_EXPORTS void CV_NORETURN check_failed_MatDepth(const int v1, const int v2, co
 CV_EXPORTS void CV_NORETURN check_failed_MatType(const int v1, const int v2, const CheckContext& ctx);
 CV_EXPORTS void CV_NORETURN check_failed_MatChannels(const int v1, const int v2, const CheckContext& ctx);
 
+CV_EXPORTS void CV_NORETURN check_failed_true(const bool v, const CheckContext& ctx);
+CV_EXPORTS void CV_NORETURN check_failed_false(const bool v, const CheckContext& ctx);
+
 CV_EXPORTS void CV_NORETURN check_failed_auto(const int v, const CheckContext& ctx);
 CV_EXPORTS void CV_NORETURN check_failed_auto(const size_t v, const CheckContext& ctx);
 CV_EXPORTS void CV_NORETURN check_failed_auto(const float v, const CheckContext& ctx);
@@ -131,9 +135,18 @@ CV_EXPORTS void CV_NORETURN check_failed_MatChannels(const int v, const CheckCon
 /// Example: depth == CV_32F || depth == CV_64F
 #define CV_CheckDepth(t, test_expr, msg)  CV__CHECK_CUSTOM_TEST(_, MatDepth, t, (test_expr), #t, #test_expr, msg)
 
+/// Example: channel == 1 || channel == 3
+#define CV_CheckChannels(t, test_expr, msg)  CV__CHECK_CUSTOM_TEST(_, MatChannels, t, (test_expr), #t, #test_expr, msg)
+
 /// Example: v == A || v == B
 #define CV_Check(v, test_expr, msg)  CV__CHECK_CUSTOM_TEST(_, auto, v, (test_expr), #v, #test_expr, msg)
 
+/// Example: v == true
+#define CV_CheckTrue(v, msg)  CV__CHECK_CUSTOM_TEST(_, true, v, v, #v, "", msg)
+
+/// Example: v == false
+#define CV_CheckFalse(v, msg)  CV__CHECK_CUSTOM_TEST(_, false, v, (!(v)), #v, "", msg)
+
 /// Some complex conditions: CV_Check(src2, src2.empty() || (src2.type() == src1.type() && src2.size() == src1.size()), "src2 should have same size/type as src1")
 // TODO define pretty-printers
 
diff --git a/3rdParty/opencv2/core/core.hpp b/3rdParty/opencv-4.12.0/opencv2/core/core.hpp
similarity index 100%
rename from 3rdParty/opencv2/core/core.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/core.hpp
diff --git a/3rdParty/opencv2/core/core_c.h b/3rdParty/opencv-4.12.0/opencv2/core/core_c.h
similarity index 100%
rename from 3rdParty/opencv2/core/core_c.h
rename to 3rdParty/opencv-4.12.0/opencv2/core/core_c.h
diff --git a/3rdParty/opencv-4.12.0/opencv2/core/cuda.hpp b/3rdParty/opencv-4.12.0/opencv2/core/cuda.hpp
new file mode 100644
index 0000000000..ab4bb2417a
--- /dev/null
+++ b/3rdParty/opencv-4.12.0/opencv2/core/cuda.hpp
@@ -0,0 +1,1346 @@
+/*M///////////////////////////////////////////////////////////////////////////////////////
+//
+//  IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
+//
+//  By downloading, copying, installing or using the software you agree to this license.
+//  If you do not agree to this license, do not download, install,
+//  copy or use the software.
+//
+//
+//                          License Agreement
+//                For Open Source Computer Vision Library
+//
+// Copyright (C) 2000-2008, Intel Corporation, all rights reserved.
+// Copyright (C) 2009, Willow Garage Inc., all rights reserved.
+// Copyright (C) 2013, OpenCV Foundation, all rights reserved.
+// Third party copyrights are property of their respective owners.
+//
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
+//
+//   * Redistribution's of source code must retain the above copyright notice,
+//     this list of conditions and the following disclaimer.
+//
+//   * Redistribution's in binary form must reproduce the above copyright notice,
+//     this list of conditions and the following disclaimer in the documentation
+//     and/or other materials provided with the distribution.
+//
+//   * The name of the copyright holders may not be used to endorse or promote products
+//     derived from this software without specific prior written permission.
+//
+// This software is provided by the copyright holders and contributors "as is" and
+// any express or implied warranties, including, but not limited to, the implied
+// warranties of merchantability and fitness for a particular purpose are disclaimed.
+// In no event shall the Intel Corporation or contributors be liable for any direct,
+// indirect, incidental, special, exemplary, or consequential damages
+// (including, but not limited to, procurement of substitute goods or services;
+// loss of use, data, or profits; or business interruption) however caused
+// and on any theory of liability, whether in contract, strict liability,
+// or tort (including negligence or otherwise) arising in any way out of
+// the use of this software, even if advised of the possibility of such damage.
+//
+//M*/
+
+#ifndef OPENCV_CORE_CUDA_HPP
+#define OPENCV_CORE_CUDA_HPP
+
+#ifndef __cplusplus
+#  error cuda.hpp header must be compiled as C++
+#endif
+
+#include "opencv2/core.hpp"
+#include "opencv2/core/cuda_types.hpp"
+
+/**
+  @defgroup cuda CUDA-accelerated Computer Vision
+  @{
+    @defgroup cudacore Core part
+    @{
+      @defgroup cudacore_init Initialization and Information
+      @defgroup cudacore_struct Data Structures
+    @}
+  @}
+ */
+
+namespace cv { namespace cuda {
+
+//! @addtogroup cudacore_struct
+//! @{
+
+//===================================================================================
+// GpuMat
+//===================================================================================
+
+/** @brief Base storage class for GPU memory with reference counting.
+
+Its interface matches the Mat interface with the following limitations:
+
+-   no arbitrary dimensions support (only 2D)
+-   no functions that return references to their data (because references on GPU are not valid for
+    CPU)
+-   no expression templates technique support
+
+Beware that the latter limitation may lead to overloaded matrix operators that cause memory
+allocations. The GpuMat class is convertible to cuda::PtrStepSz and cuda::PtrStep so it can be
+passed directly to the kernel.
+
+@note In contrast with Mat, in most cases GpuMat::isContinuous() == false . This means that rows are
+aligned to a size depending on the hardware. Single-row GpuMat is always a continuous matrix.
+
+@note You are not recommended to leave static or global GpuMat variables allocated, that is, to rely
+on its destructor. The destruction order of such variables and CUDA context is undefined. GPU memory
+release function returns error if the CUDA context has been destroyed before.
+
+Some member functions are described as a "Blocking Call" while some are described as a
+"Non-Blocking Call". Blocking functions are synchronous to host. It is guaranteed that the GPU
+operation is finished when the function returns. However, non-blocking functions are asynchronous to
+host. Those functions may return even if the GPU operation is not finished.
+
+Compared to their blocking counterpart, non-blocking functions accept Stream as an additional
+argument. If a non-default stream is passed, the GPU operation may overlap with operations in other
+streams.
+
+@sa Mat
+ */
+class CV_EXPORTS_W GpuMat
+{
+public:
+    class CV_EXPORTS_W Allocator
+    {
+    public:
+        virtual ~Allocator() {}
+
+        // allocator must fill data, step and refcount fields
+        virtual bool allocate(GpuMat* mat, int rows, int cols, size_t elemSize) = 0;
+        virtual void free(GpuMat* mat) = 0;
+    };
+
+    //! default allocator
+    CV_WRAP static GpuMat::Allocator* defaultAllocator();
+    CV_WRAP static void setDefaultAllocator(GpuMat::Allocator* allocator);
+    CV_WRAP static GpuMat::Allocator* getStdAllocator();
+
+    //! default constructor
+    CV_WRAP explicit GpuMat(GpuMat::Allocator* allocator = GpuMat::defaultAllocator());
+
+    //! constructs GpuMat of the specified size and type
+    CV_WRAP GpuMat(int rows, int cols, int type, GpuMat::Allocator* allocator = GpuMat::defaultAllocator());
+    CV_WRAP GpuMat(Size size, int type, GpuMat::Allocator* allocator = GpuMat::defaultAllocator());
+
+    //! constructs GpuMat and fills it with the specified value _s
+    CV_WRAP GpuMat(int rows, int cols, int type, Scalar s, GpuMat::Allocator* allocator = GpuMat::defaultAllocator());
+    CV_WRAP GpuMat(Size size, int type, Scalar s, GpuMat::Allocator* allocator = GpuMat::defaultAllocator());
+
+    //! copy constructor
+    CV_WRAP GpuMat(const GpuMat& m);
+
+    //! constructor for GpuMat headers pointing to user-allocated data
+    GpuMat(int rows, int cols, int type, void* data, size_t step = Mat::AUTO_STEP);
+    GpuMat(Size size, int type, void* data, size_t step = Mat::AUTO_STEP);
+
+    //! creates a GpuMat header for a part of the bigger matrix
+    CV_WRAP GpuMat(const GpuMat& m, Range rowRange, Range colRange);
+    CV_WRAP GpuMat(const GpuMat& m, Rect roi);
+
+    //! builds GpuMat from host memory (Blocking call)
+    CV_WRAP explicit GpuMat(InputArray arr, GpuMat::Allocator* allocator = GpuMat::defaultAllocator());
+
+    //! destructor - calls release()
+    ~GpuMat();
+
+    //! assignment operators
+    GpuMat& operator =(const GpuMat& m);
+
+    //! allocates new GpuMat data unless the GpuMat already has specified size and type
+    CV_WRAP void create(int rows, int cols, int type);
+    CV_WRAP void create(Size size, int type);
+
+    //! decreases reference counter, deallocate the data when reference counter reaches 0
+    CV_WRAP void release();
+
+    //! swaps with other smart pointer
+    CV_WRAP void swap(GpuMat& mat);
+
+    /** @brief Performs data upload to GpuMat (Blocking call)
+
+    This function copies data from host memory to device memory. As being a blocking call, it is
+    guaranteed that the copy operation is finished when this function returns.
+    */
+    CV_WRAP void upload(InputArray arr);
+
+    /** @brief Performs data upload to GpuMat (Non-Blocking call)
+
+    This function copies data from host memory to device memory. As being a non-blocking call, this
+    function may return even if the copy operation is not finished.
+
+    The copy operation may be overlapped with operations in other non-default streams if \p stream is
+    not the default stream and \p dst is HostMem allocated with HostMem::PAGE_LOCKED option.
+    */
+    CV_WRAP void upload(InputArray arr, Stream& stream);
+
+    /** @brief Performs data download from GpuMat (Blocking call)
+
+    This function copies data from device memory to host memory. As being a blocking call, it is
+    guaranteed that the copy operation is finished when this function returns.
+    */
+    CV_WRAP void download(OutputArray dst) const;
+
+    /** @brief Performs data download from GpuMat (Non-Blocking call)
+
+    This function copies data from device memory to host memory. As being a non-blocking call, this
+    function may return even if the copy operation is not finished.
+
+    The copy operation may be overlapped with operations in other non-default streams if \p stream is
+    not the default stream and \p dst is HostMem allocated with HostMem::PAGE_LOCKED option.
+    */
+    CV_WRAP void download(OutputArray dst, Stream& stream) const;
+
+    //! returns deep copy of the GpuMat, i.e. the data is copied
+    CV_WRAP GpuMat clone() const;
+
+    //! copies the GpuMat content to device memory (Blocking call)
+    void copyTo(OutputArray dst) const;
+    //! bindings overload which copies the GpuMat content to device memory (Blocking call)
+    CV_WRAP void copyTo(CV_OUT GpuMat& dst) const {
+        copyTo(static_cast<OutputArray>(dst));
+    }
+
+    //! copies the GpuMat content to device memory (Non-Blocking call)
+    void copyTo(OutputArray dst, Stream& stream) const;
+    //! bindings overload which copies the GpuMat content to device memory (Non-Blocking call)
+    CV_WRAP void copyTo(CV_OUT GpuMat& dst, Stream& stream) const {
+        copyTo(static_cast<OutputArray>(dst), stream);
+    }
+
+    //! copies those GpuMat elements to "m" that are marked with non-zero mask elements (Blocking call)
+    void copyTo(OutputArray dst, InputArray mask) const;
+    //! bindings overload which copies those GpuMat elements to "m" that are marked with non-zero mask elements (Blocking call)
+    CV_WRAP void copyTo(CV_OUT GpuMat& dst, GpuMat& mask) const {
+        copyTo(static_cast<OutputArray>(dst), static_cast<InputArray>(mask));
+    }
+
+    //! copies those GpuMat elements to "m" that are marked with non-zero mask elements (Non-Blocking call)
+    void copyTo(OutputArray dst, InputArray mask, Stream& stream) const;
+    //! bindings overload which copies those GpuMat elements to "m" that are marked with non-zero mask elements (Non-Blocking call)
+    CV_WRAP void copyTo(CV_OUT GpuMat& dst, GpuMat& mask, Stream& stream) const {
+        copyTo(static_cast<OutputArray>(dst), static_cast<InputArray>(mask), stream);
+    }
+
+    //! sets some of the GpuMat elements to s (Blocking call)
+    CV_WRAP GpuMat& setTo(Scalar s);
+
+    //! sets some of the GpuMat elements to s (Non-Blocking call)
+    CV_WRAP GpuMat& setTo(Scalar s, Stream& stream);
+
+    //! sets some of the GpuMat elements to s, according to the mask (Blocking call)
+    CV_WRAP GpuMat& setTo(Scalar s, InputArray mask);
+
+    //! sets some of the GpuMat elements to s, according to the mask (Non-Blocking call)
+    CV_WRAP GpuMat& setTo(Scalar s, InputArray mask, Stream& stream);
+
+    //! converts GpuMat to another datatype (Blocking call)
+    void convertTo(OutputArray dst, int rtype) const;
+    //! bindings overload which converts GpuMat to another datatype (Blocking call)
+    CV_WRAP void convertTo(CV_OUT GpuMat& dst, int rtype) const {
+        convertTo(static_cast<OutputArray>(dst), rtype);
+    }
+
+    //! converts GpuMat to another datatype (Non-Blocking call)
+    void convertTo(OutputArray dst, int rtype, Stream& stream) const;
+    //! bindings overload which converts GpuMat to another datatype (Non-Blocking call)
+    CV_WRAP void convertTo(CV_OUT GpuMat& dst, int rtype, Stream& stream) const {
+        convertTo(static_cast<OutputArray>(dst), rtype, stream);
+    }
+
+    //! converts GpuMat to another datatype with scaling (Blocking call)
+    void convertTo(OutputArray dst, int rtype, double alpha, double beta = 0.0) const;
+
+    //! bindings overload which converts GpuMat to another datatype with scaling(Blocking call)
+#ifdef OPENCV_BINDINGS_PARSER
+    CV_WRAP void convertTo(CV_OUT GpuMat& dst, int rtype, double alpha=1.0, double beta = 0.0) const {
+        convertTo(static_cast<OutputArray>(dst), rtype, alpha, beta);
+    }
+#endif
+
+    //! converts GpuMat to another datatype with scaling (Non-Blocking call)
+    void convertTo(OutputArray dst, int rtype, double alpha, Stream& stream) const;
+
+    //! converts GpuMat to another datatype with scaling (Non-Blocking call)
+    void convertTo(OutputArray dst, int rtype, double alpha, double beta, Stream& stream) const;
+    //! bindings overload which converts GpuMat to another datatype with scaling (Non-Blocking call)
+    CV_WRAP void convertTo(CV_OUT GpuMat& dst, int rtype, double alpha, double beta, Stream& stream) const {
+        convertTo(static_cast<OutputArray>(dst), rtype, alpha, beta, stream);
+    }
+
+    CV_WRAP void assignTo(GpuMat& m, int type = -1) const;
+
+    //! returns pointer to y-th row
+    uchar* ptr(int y = 0);
+    const uchar* ptr(int y = 0) const;
+
+    //! template version of the above method
+    template<typename _Tp> _Tp* ptr(int y = 0);
+    template<typename _Tp> const _Tp* ptr(int y = 0) const;
+
+    template <typename _Tp> operator PtrStepSz<_Tp>() const;
+    template <typename _Tp> operator PtrStep<_Tp>() const;
+
+    //! returns a new GpuMat header for the specified row
+    CV_WRAP GpuMat row(int y) const;
+
+    //! returns a new GpuMat header for the specified column
+    CV_WRAP GpuMat col(int x) const;
+
+    //! ... for the specified row span
+    CV_WRAP GpuMat rowRange(int startrow, int endrow) const;
+    CV_WRAP GpuMat rowRange(Range r) const;
+
+    //! ... for the specified column span
+    CV_WRAP GpuMat colRange(int startcol, int endcol) const;
+    CV_WRAP GpuMat colRange(Range r) const;
+
+    //! extracts a rectangular sub-GpuMat (this is a generalized form of row, rowRange etc.)
+    GpuMat operator ()(Range rowRange, Range colRange) const;
+    GpuMat operator ()(Rect roi) const;
+
+    //! creates alternative GpuMat header for the same data, with different
+    //! number of channels and/or different number of rows
+    CV_WRAP GpuMat reshape(int cn, int rows = 0) const;
+
+    //! locates GpuMat header within a parent GpuMat
+    CV_WRAP void locateROI(Size& wholeSize, Point& ofs) const;
+
+    //! moves/resizes the current GpuMat ROI inside the parent GpuMat
+    CV_WRAP GpuMat& adjustROI(int dtop, int dbottom, int dleft, int dright);
+
+    //! returns true iff the GpuMat data is continuous
+    //! (i.e. when there are no gaps between successive rows)
+    CV_WRAP bool isContinuous() const;
+
+    //! returns element size in bytes
+    CV_WRAP size_t elemSize() const;
+
+    //! returns the size of element channel in bytes
+    CV_WRAP size_t elemSize1() const;
+
+    //! returns element type
+    CV_WRAP int type() const;
+
+    //! returns element type
+    CV_WRAP int depth() const;
+
+    //! returns number of channels
+    CV_WRAP int channels() const;
+
+    //! returns step/elemSize1()
+    CV_WRAP size_t step1() const;
+
+    //! returns GpuMat size : width == number of columns, height == number of rows
+    CV_WRAP Size size() const;
+
+    //! returns true if GpuMat data is NULL
+    CV_WRAP bool empty() const;
+
+    // returns pointer to cuda memory
+    CV_WRAP void* cudaPtr() const;
+
+    //! internal use method: updates the continuity flag
+    CV_WRAP void updateContinuityFlag();
+
+    /*! includes several bit-fields:
+    - the magic signature
+    - continuity flag
+    - depth
+    - number of channels
+    */
+    int flags;
+
+    //! the number of rows and columns
+    int rows, cols;
+
+    //! a distance between successive rows in bytes; includes the gap if any
+    CV_PROP size_t step;
+
+    //! pointer to the data
+    uchar* data;
+
+    //! pointer to the reference counter;
+    //! when GpuMat points to user-allocated data, the pointer is NULL
+    int* refcount;
+
+    //! helper fields used in locateROI and adjustROI
+    uchar* datastart;
+    const uchar* dataend;
+
+    //! allocator
+    Allocator* allocator;
+};
+
+struct CV_EXPORTS_W GpuData
+{
+    explicit GpuData(size_t _size);
+     ~GpuData();
+
+    GpuData(const GpuData&) = delete;
+    GpuData& operator=(const GpuData&) = delete;
+
+    GpuData(GpuData&&) = delete;
+    GpuData& operator=(GpuData&&) = delete;
+
+    uchar* data;
+    size_t size;
+};
+
+class CV_EXPORTS_W GpuMatND
+{
+public:
+    using SizeArray = std::vector<int>;
+    using StepArray = std::vector<size_t>;
+    using IndexArray = std::vector<int>;
+
+    //! destructor
+    ~GpuMatND();
+
+    //! default constructor
+    GpuMatND();
+
+    /** @overload
+    @param size Array of integers specifying an n-dimensional array shape.
+    @param type Array type. Use CV_8UC1, ..., CV_16FC4 to create 1-4 channel matrices, or
+    CV_8UC(n), ..., CV_64FC(n) to create multi-channel (up to CV_CN_MAX channels) matrices.
+    */
+    GpuMatND(SizeArray size, int type);
+
+    /** @overload
+    @param size Array of integers specifying an n-dimensional array shape.
+    @param type Array type. Use CV_8UC1, ..., CV_16FC4 to create 1-4 channel matrices, or
+    CV_8UC(n), ..., CV_64FC(n) to create multi-channel (up to CV_CN_MAX channels) matrices.
+    @param data Pointer to the user data. Matrix constructors that take data and step parameters do not
+    allocate matrix data. Instead, they just initialize the matrix header that points to the specified
+    data, which means that no data is copied. This operation is very efficient and can be used to
+    process external data using OpenCV functions. The external data is not automatically deallocated, so
+    you should take care of it.
+    @param step Array of _size.size() or _size.size()-1 steps in case of a multi-dimensional array
+    (if specified, the last step must be equal to the element size, otherwise it will be added as such).
+    If not specified, the matrix is assumed to be continuous.
+    */
+    GpuMatND(SizeArray size, int type, void* data, StepArray step = StepArray());
+
+    /** @brief Allocates GPU memory.
+    Suppose there is some GPU memory already allocated. In that case, this method may choose to reuse that
+    GPU memory under the specific condition: it must be of the same size and type, not externally allocated,
+    the GPU memory is continuous(i.e., isContinuous() is true), and is not a sub-matrix of another GpuMatND
+    (i.e., isSubmatrix() is false). In other words, this method guarantees that the GPU memory allocated by
+    this method is always continuous and is not a sub-region of another GpuMatND.
+    */
+    void create(SizeArray size, int type);
+
+    void release();
+
+    void swap(GpuMatND& m) noexcept;
+
+    /** @brief Creates a full copy of the array and the underlying data.
+    The method creates a full copy of the array. It mimics the behavior of Mat::clone(), i.e.
+    the original step is not taken into account. So, the array copy is a continuous array
+    occupying total()\*elemSize() bytes.
+    */
+    GpuMatND clone() const;
+
+    /** @overload
+    This overload is non-blocking, so it may return even if the copy operation is not finished.
+    */
+    GpuMatND clone(Stream& stream) const;
+
+    /** @brief Extracts a sub-matrix.
+    The operator makes a new header for the specified sub-array of \*this.
+    The operator is an O(1) operation, that is, no matrix data is copied.
+    @param ranges Array of selected ranges along each dimension.
+    */
+    GpuMatND operator()(const std::vector<Range>& ranges) const;
+
+    /** @brief Creates a GpuMat header for a 2D plane part of an n-dim matrix.
+    @note The returned GpuMat is constructed with the constructor for user-allocated data.
+    That is, It does not perform reference counting.
+    @note This function does not increment this GpuMatND's reference counter.
+    */
+    GpuMat createGpuMatHeader(IndexArray idx, Range rowRange, Range colRange) const;
+
+    /** @overload
+    Creates a GpuMat header if this GpuMatND is effectively 2D.
+    @note The returned GpuMat is constructed with the constructor for user-allocated data.
+    That is, It does not perform reference counting.
+    @note This function does not increment this GpuMatND's reference counter.
+    */
+    GpuMat createGpuMatHeader() const;
+
+    /** @brief Extracts a 2D plane part of an n-dim matrix.
+    It differs from createGpuMatHeader(IndexArray, Range, Range) in that it clones a part of this
+    GpuMatND to the returned GpuMat.
+    @note This operator does not increment this GpuMatND's reference counter;
+    */
+    GpuMat operator()(IndexArray idx, Range rowRange, Range colRange) const;
+
+    /** @brief Extracts a 2D plane part of an n-dim matrix if this GpuMatND is effectively 2D.
+    It differs from createGpuMatHeader() in that it clones a part of this GpuMatND.
+    @note This operator does not increment this GpuMatND's reference counter;
+    */
+    operator GpuMat() const;
+
+    GpuMatND(const GpuMatND&) = default;
+    GpuMatND& operator=(const GpuMatND&) = default;
+
+#if defined(__GNUC__) && __GNUC__ < 5
+    // error: function '...' defaulted on its first declaration with an exception-specification
+    // that differs from the implicit declaration '...'
+
+    GpuMatND(GpuMatND&&) = default;
+    GpuMatND& operator=(GpuMatND&&) = default;
+#else
+    GpuMatND(GpuMatND&&) noexcept = default;
+    GpuMatND& operator=(GpuMatND&&) noexcept = default;
+#endif
+
+    void upload(InputArray src);
+    void upload(InputArray src, Stream& stream);
+    void download(OutputArray dst) const;
+    void download(OutputArray dst, Stream& stream) const;
+
+    //! returns true iff the GpuMatND data is continuous
+    //! (i.e. when there are no gaps between successive rows)
+    bool isContinuous() const;
+
+    //! returns true if the matrix is a sub-matrix of another matrix
+    bool isSubmatrix() const;
+
+    //! returns element size in bytes
+    size_t elemSize() const;
+
+    //! returns the size of element channel in bytes
+    size_t elemSize1() const;
+
+    //! returns true if data is null
+    bool empty() const;
+
+    //! returns true if not empty and points to external(user-allocated) gpu memory
+    bool external() const;
+
+    //! returns pointer to the first byte of the GPU memory
+    uchar* getDevicePtr() const;
+
+    //! returns the total number of array elements
+    size_t total() const;
+
+    //! returns the size of underlying memory in bytes
+    size_t totalMemSize() const;
+
+    //! returns element type
+    int type() const;
+
+private:
+    //! internal use
+    void setFields(SizeArray size, int type, StepArray step = StepArray());
+
+public:
+    /*! includes several bit-fields:
+    - the magic signature
+    - continuity flag
+    - depth
+    - number of channels
+    */
+    int flags;
+
+    //! matrix dimensionality
+    int dims;
+
+    //! shape of this array
+    SizeArray size;
+
+    /*! step values
+    Their semantics is identical to the semantics of step for Mat.
+    */
+    StepArray step;
+
+private:
+    /*! internal use
+    If this GpuMatND holds external memory, this is empty.
+    */
+    std::shared_ptr<GpuData> data_;
+
+    /*! internal use
+    If this GpuMatND manages memory with reference counting, this value is
+    always equal to data_->data. If this GpuMatND holds external memory,
+    data_ is empty and data points to the external memory.
+    */
+    uchar* data;
+
+    /*! internal use
+    If this GpuMatND is a sub-matrix of a larger matrix, this value is the
+    difference of the first byte between the sub-matrix and the whole matrix.
+    */
+    size_t offset;
+};
+
+/** @brief Creates a continuous matrix.
+
+@param rows Row count.
+@param cols Column count.
+@param type Type of the matrix.
+@param arr Destination matrix. This parameter changes only if it has a proper type and area (
+\f$\texttt{rows} \times \texttt{cols}\f$ ).
+
+Matrix is called continuous if its elements are stored continuously, that is, without gaps at the
+end of each row.
+ */
+CV_EXPORTS_W void createContinuous(int rows, int cols, int type, OutputArray arr);
+
+/** @brief Ensures that the size of a matrix is big enough and the matrix has a proper type.
+
+@param rows Minimum desired number of rows.
+@param cols Minimum desired number of columns.
+@param type Desired matrix type.
+@param arr Destination matrix.
+
+The function does not reallocate memory if the matrix has proper attributes already.
+ */
+CV_EXPORTS_W void ensureSizeIsEnough(int rows, int cols, int type, OutputArray arr);
+
+/** @brief Bindings overload to create a GpuMat from existing GPU memory.
+@param rows Row count.
+@param cols Column count.
+@param type Type of the matrix.
+@param cudaMemoryAddress Address of the allocated GPU memory on the device. This does not allocate matrix data. Instead, it just initializes the matrix header that points to the specified \a cudaMemoryAddress, which means that no data is copied. This operation is very efficient and can be used to process external data using OpenCV functions. The external data is not automatically deallocated, so you should take care of it.
+@param step Number of bytes each matrix row occupies. The value should include the padding bytes at the end of each row, if any. If the parameter is missing (set to Mat::AUTO_STEP ), no padding is assumed and the actual step is calculated as cols*elemSize(). See GpuMat::elemSize.
+@note Overload for generation of bindings only, not exported or intended for use internally from C++.
+ */
+CV_EXPORTS_W GpuMat inline createGpuMatFromCudaMemory(int rows, int cols, int type, size_t cudaMemoryAddress, size_t step = Mat::AUTO_STEP) {
+    return GpuMat(rows, cols, type, reinterpret_cast<void*>(cudaMemoryAddress), step);
+}
+
+ /** @overload
+@param size 2D array size: Size(cols, rows). In the Size() constructor, the number of rows and the number of columns go in the reverse order.
+@param type Type of the matrix.
+@param cudaMemoryAddress Address of the allocated GPU memory on the device. This does not allocate matrix data. Instead, it just initializes the matrix header that points to the specified \a cudaMemoryAddress, which means that no data is copied. This operation is very efficient and can be used to process external data using OpenCV functions. The external data is not automatically deallocated, so you should take care of it.
+@param step Number of bytes each matrix row occupies. The value should include the padding bytes at the end of each row, if any. If the parameter is missing (set to Mat::AUTO_STEP ), no padding is assumed and the actual step is calculated as cols*elemSize(). See GpuMat::elemSize.
+@note Overload for generation of bindings only, not exported or intended for use internally from C++.
+ */
+CV_EXPORTS_W inline GpuMat createGpuMatFromCudaMemory(Size size, int type, size_t cudaMemoryAddress, size_t step = Mat::AUTO_STEP) {
+    return GpuMat(size, type, reinterpret_cast<void*>(cudaMemoryAddress), step);
+}
+
+/** @brief BufferPool for use with CUDA streams
+
+BufferPool utilizes Stream's allocator to create new buffers for GpuMat's. It is
+only useful when enabled with #setBufferPoolUsage.
+
+@code
+    setBufferPoolUsage(true);
+@endcode
+
+@note #setBufferPoolUsage must be called \em before any Stream declaration.
+
+Users may specify custom allocator for Stream and may implement their own stream based
+functions utilizing the same underlying GPU memory management.
+
+If custom allocator is not specified, BufferPool utilizes StackAllocator by
+default. StackAllocator allocates a chunk of GPU device memory beforehand,
+and when GpuMat is declared later on, it is given the pre-allocated memory.
+This kind of strategy reduces the number of calls for memory allocating APIs
+such as cudaMalloc or cudaMallocPitch.
+
+Below is an example that utilizes BufferPool with StackAllocator:
+
+@code
+    #include <opencv2/opencv.hpp>
+
+    using namespace cv;
+    using namespace cv::cuda
+
+    int main()
+    {
+        setBufferPoolUsage(true);                               // Tell OpenCV that we are going to utilize BufferPool
+        setBufferPoolConfig(getDevice(), 1024 * 1024 * 64, 2);  // Allocate 64 MB, 2 stacks (default is 10 MB, 5 stacks)
+
+        Stream stream1, stream2;                                // Each stream uses 1 stack
+        BufferPool pool1(stream1), pool2(stream2);
+
+        GpuMat d_src1 = pool1.getBuffer(4096, 4096, CV_8UC1);   // 16MB
+        GpuMat d_dst1 = pool1.getBuffer(4096, 4096, CV_8UC3);   // 48MB, pool1 is now full
+
+        GpuMat d_src2 = pool2.getBuffer(1024, 1024, CV_8UC1);   // 1MB
+        GpuMat d_dst2 = pool2.getBuffer(1024, 1024, CV_8UC3);   // 3MB
+
+        cvtColor(d_src1, d_dst1, cv::COLOR_GRAY2BGR, 0, stream1);
+        cvtColor(d_src2, d_dst2, cv::COLOR_GRAY2BGR, 0, stream2);
+    }
+@endcode
+
+If we allocate another GpuMat on pool1 in the above example, it will be carried out by
+the DefaultAllocator since the stack for pool1 is full.
+
+@code
+    GpuMat d_add1 = pool1.getBuffer(1024, 1024, CV_8UC1);   // Stack for pool1 is full, memory is allocated with DefaultAllocator
+@endcode
+
+If a third stream is declared in the above example, allocating with #getBuffer
+within that stream will also be carried out by the DefaultAllocator because we've run out of
+stacks.
+
+@code
+    Stream stream3;                                         // Only 2 stacks were allocated, we've run out of stacks
+    BufferPool pool3(stream3);
+    GpuMat d_src3 = pool3.getBuffer(1024, 1024, CV_8UC1);   // Memory is allocated with DefaultAllocator
+@endcode
+
+@warning When utilizing StackAllocator, deallocation order is important.
+
+Just like a stack, deallocation must be done in LIFO order. Below is an example of
+erroneous usage that violates LIFO rule. If OpenCV is compiled in Debug mode, this
+sample code will emit CV_Assert error.
+
+@code
+    int main()
+    {
+        setBufferPoolUsage(true);                               // Tell OpenCV that we are going to utilize BufferPool
+        Stream stream;                                          // A default size (10 MB) stack is allocated to this stream
+        BufferPool pool(stream);
+
+        GpuMat mat1 = pool.getBuffer(1024, 1024, CV_8UC1);      // Allocate mat1 (1MB)
+        GpuMat mat2 = pool.getBuffer(1024, 1024, CV_8UC1);      // Allocate mat2 (1MB)
+
+        mat1.release();                                         // erroneous usage : mat2 must be deallocated before mat1
+    }
+@endcode
+
+Since C++ local variables are destroyed in the reverse order of construction,
+the code sample below satisfies the LIFO rule. Local GpuMat's are deallocated
+and the corresponding memory is automatically returned to the pool for later usage.
+
+@code
+    int main()
+    {
+        setBufferPoolUsage(true);                               // Tell OpenCV that we are going to utilize BufferPool
+        setBufferPoolConfig(getDevice(), 1024 * 1024 * 64, 2);  // Allocate 64 MB, 2 stacks (default is 10 MB, 5 stacks)
+
+        Stream stream1, stream2;                                // Each stream uses 1 stack
+        BufferPool pool1(stream1), pool2(stream2);
+
+        for (int i = 0; i < 10; i++)
+        {
+            GpuMat d_src1 = pool1.getBuffer(4096, 4096, CV_8UC1);   // 16MB
+            GpuMat d_dst1 = pool1.getBuffer(4096, 4096, CV_8UC3);   // 48MB, pool1 is now full
+
+            GpuMat d_src2 = pool2.getBuffer(1024, 1024, CV_8UC1);   // 1MB
+            GpuMat d_dst2 = pool2.getBuffer(1024, 1024, CV_8UC3);   // 3MB
+
+            d_src1.setTo(Scalar(i), stream1);
+            d_src2.setTo(Scalar(i), stream2);
+
+            cvtColor(d_src1, d_dst1, cv::COLOR_GRAY2BGR, 0, stream1);
+            cvtColor(d_src2, d_dst2, cv::COLOR_GRAY2BGR, 0, stream2);
+                                                                    // The order of destruction of the local variables is:
+                                                                    //   d_dst2 => d_src2 => d_dst1 => d_src1
+                                                                    // LIFO rule is satisfied, this code runs without error
+        }
+    }
+@endcode
+ */
+class CV_EXPORTS_W BufferPool
+{
+public:
+
+    //! Gets the BufferPool for the given stream.
+    CV_WRAP explicit BufferPool(Stream& stream);
+
+    //! Allocates a new GpuMat of given size and type.
+    CV_WRAP GpuMat getBuffer(int rows, int cols, int type);
+
+// WARNING: unreachable code using Ninja
+#if defined _MSC_VER && _MSC_VER >= 1920
+#pragma warning(push)
+#pragma warning(disable: 4702)
+#endif
+    //! Allocates a new GpuMat of given size and type.
+    CV_WRAP GpuMat getBuffer(Size size, int type) { return getBuffer(size.height, size.width, type); }
+#if defined _MSC_VER && _MSC_VER >= 1920
+#pragma warning(pop)
+#endif
+
+    //! Returns the allocator associated with the stream.
+    CV_WRAP Ptr<GpuMat::Allocator> getAllocator() const { return allocator_; }
+
+private:
+    Ptr<GpuMat::Allocator> allocator_;
+};
+
+//! BufferPool management (must be called before Stream creation)
+CV_EXPORTS_W void setBufferPoolUsage(bool on);
+CV_EXPORTS_W void setBufferPoolConfig(int deviceId, size_t stackSize, int stackCount);
+
+//===================================================================================
+// HostMem
+//===================================================================================
+
+/** @brief Class with reference counting wrapping special memory type allocation functions from CUDA.
+
+Its interface is also Mat-like but with additional memory type parameters.
+
+-   **PAGE_LOCKED** sets a page locked memory type used commonly for fast and asynchronous
+    uploading/downloading data from/to GPU.
+-   **SHARED** specifies a zero copy memory allocation that enables mapping the host memory to GPU
+    address space, if supported.
+-   **WRITE_COMBINED** sets the write combined buffer that is not cached by CPU. Such buffers are
+    used to supply GPU with data when GPU only reads it. The advantage is a better CPU cache
+    utilization.
+
+@note Allocation size of such memory types is usually limited. For more details, see *CUDA 2.2
+Pinned Memory APIs* document or *CUDA C Programming Guide*.
+ */
+class CV_EXPORTS_W HostMem
+{
+public:
+    enum AllocType { PAGE_LOCKED = 1, SHARED = 2, WRITE_COMBINED = 4 };
+
+    static MatAllocator* getAllocator(HostMem::AllocType alloc_type = HostMem::AllocType::PAGE_LOCKED);
+
+    CV_WRAP explicit HostMem(HostMem::AllocType alloc_type = HostMem::AllocType::PAGE_LOCKED);
+
+    HostMem(const HostMem& m);
+
+    CV_WRAP HostMem(int rows, int cols, int type, HostMem::AllocType alloc_type = HostMem::AllocType::PAGE_LOCKED);
+    CV_WRAP HostMem(Size size, int type, HostMem::AllocType alloc_type = HostMem::AllocType::PAGE_LOCKED);
+
+    //! creates from host memory with coping data
+    CV_WRAP explicit HostMem(InputArray arr, HostMem::AllocType alloc_type = HostMem::AllocType::PAGE_LOCKED);
+
+    ~HostMem();
+
+    HostMem& operator =(const HostMem& m);
+
+    //! swaps with other smart pointer
+    CV_WRAP void swap(HostMem& b);
+
+    //! returns deep copy of the matrix, i.e. the data is copied
+    CV_WRAP HostMem clone() const;
+
+    //! allocates new matrix data unless the matrix already has specified size and type.
+    CV_WRAP void create(int rows, int cols, int type);
+    void create(Size size, int type);
+
+    //! creates alternative HostMem header for the same data, with different
+    //! number of channels and/or different number of rows
+    CV_WRAP HostMem reshape(int cn, int rows = 0) const;
+
+    //! decrements reference counter and released memory if needed.
+    void release();
+
+    //! returns matrix header with disabled reference counting for HostMem data.
+    CV_WRAP Mat createMatHeader() const;
+
+    /** @brief Maps CPU memory to GPU address space and creates the cuda::GpuMat header without reference counting
+    for it.
+
+    This can be done only if memory was allocated with the SHARED flag and if it is supported by the
+    hardware. Laptops often share video and CPU memory, so address spaces can be mapped, which
+    eliminates an extra copy.
+     */
+    GpuMat createGpuMatHeader() const;
+
+    // Please see cv::Mat for descriptions
+    CV_WRAP bool isContinuous() const;
+    CV_WRAP size_t elemSize() const;
+    CV_WRAP size_t elemSize1() const;
+    CV_WRAP int type() const;
+    CV_WRAP int depth() const;
+    CV_WRAP int channels() const;
+    CV_WRAP size_t step1() const;
+    CV_WRAP Size size() const;
+    CV_WRAP bool empty() const;
+
+    // Please see cv::Mat for descriptions
+    int flags;
+    int rows, cols;
+    CV_PROP size_t step;
+
+    uchar* data;
+    int* refcount;
+
+    uchar* datastart;
+    const uchar* dataend;
+
+    AllocType alloc_type;
+};
+
+/** @brief Page-locks the memory of matrix and maps it for the device(s).
+
+@param m Input matrix.
+ */
+CV_EXPORTS_W void registerPageLocked(Mat& m);
+
+/** @brief Unmaps the memory of matrix and makes it pageable again.
+
+@param m Input matrix.
+ */
+CV_EXPORTS_W void unregisterPageLocked(Mat& m);
+
+//===================================================================================
+// Stream
+//===================================================================================
+
+/** @brief This class encapsulates a queue of asynchronous calls.
+
+@note Currently, you may face problems if an operation is enqueued twice with different data. Some
+functions use the constant GPU memory, and next call may update the memory before the previous one
+has been finished. But calling different operations asynchronously is safe because each operation
+has its own constant buffer. Memory copy/upload/download/set operations to the buffers you hold are
+also safe.
+
+@note The Stream class is not thread-safe. Please use different Stream objects for different CPU threads.
+
+@code
+void thread1()
+{
+    cv::cuda::Stream stream1;
+    cv::cuda::func1(..., stream1);
+}
+
+void thread2()
+{
+    cv::cuda::Stream stream2;
+    cv::cuda::func2(..., stream2);
+}
+@endcode
+
+@note By default all CUDA routines are launched in Stream::Null() object, if the stream is not specified by user.
+In multi-threading environment the stream objects must be passed explicitly (see previous note).
+ */
+class CV_EXPORTS_W Stream
+{
+    typedef void (Stream::*bool_type)() const;
+    void this_type_does_not_support_comparisons() const {}
+
+public:
+    typedef void (*StreamCallback)(int status, void* userData);
+
+    //! creates a new asynchronous stream
+    CV_WRAP Stream();
+
+    //! creates a new asynchronous stream with custom allocator
+    CV_WRAP Stream(const Ptr<GpuMat::Allocator>& allocator);
+
+    /** @brief creates a new Stream using the cudaFlags argument to determine the behaviors of the stream
+
+    @note The cudaFlags parameter is passed to the underlying api cudaStreamCreateWithFlags() and
+    supports the same parameter values.
+    @code
+        // creates an OpenCV cuda::Stream that manages an asynchronous, non-blocking,
+        // non-default CUDA stream
+        cv::cuda::Stream cvStream(cudaStreamNonBlocking);
+    @endcode
+     */
+    CV_WRAP Stream(const size_t cudaFlags);
+
+    /** @brief Returns true if the current stream queue is finished. Otherwise, it returns false.
+    */
+    CV_WRAP bool queryIfComplete() const;
+
+    /** @brief Blocks the current CPU thread until all operations in the stream are complete.
+    */
+    CV_WRAP void waitForCompletion();
+
+    /** @brief Makes a compute stream wait on an event.
+    */
+    CV_WRAP void waitEvent(const Event& event);
+
+    /** @brief Adds a callback to be called on the host after all currently enqueued items in the stream have
+    completed.
+
+    @note Callbacks must not make any CUDA API calls. Callbacks must not perform any synchronization
+    that may depend on outstanding device work or other callbacks that are not mandated to run earlier.
+    Callbacks without a mandated order (in independent streams) execute in undefined order and may be
+    serialized.
+     */
+    void enqueueHostCallback(StreamCallback callback, void* userData);
+
+    //! return Stream object for default CUDA stream
+    CV_WRAP static Stream& Null();
+
+    //! returns true if stream object is not default (!= 0)
+    operator bool_type() const;
+
+    //! return Pointer to CUDA stream
+    CV_WRAP void* cudaPtr() const;
+
+    class Impl;
+
+private:
+    Ptr<Impl> impl_;
+    Stream(const Ptr<Impl>& impl);
+
+    friend struct StreamAccessor;
+    friend class BufferPool;
+    friend class DefaultDeviceInitializer;
+};
+
+
+/** @brief Bindings overload to create a Stream object from the address stored in an existing CUDA Runtime API stream pointer (cudaStream_t).
+@param cudaStreamMemoryAddress Memory address stored in a CUDA Runtime API stream pointer (cudaStream_t). The created Stream object does not perform any allocation or deallocation and simply wraps existing raw CUDA Runtime API stream pointer.
+@note Overload for generation of bindings only, not exported or intended for use internally from C++.
+ */
+CV_EXPORTS_W Stream wrapStream(size_t cudaStreamMemoryAddress);
+
+class CV_EXPORTS_W Event
+{
+public:
+    enum CreateFlags
+    {
+        DEFAULT        = 0x00,  /**< Default event flag */
+        BLOCKING_SYNC  = 0x01,  /**< Event uses blocking synchronization */
+        DISABLE_TIMING = 0x02,  /**< Event will not record timing data */
+        INTERPROCESS   = 0x04   /**< Event is suitable for interprocess use. DisableTiming must be set */
+    };
+
+    CV_WRAP explicit Event(const Event::CreateFlags flags = Event::CreateFlags::DEFAULT);
+
+    //! records an event
+    CV_WRAP void record(Stream& stream = Stream::Null());
+
+    //! queries an event's status
+    CV_WRAP bool queryIfComplete() const;
+
+    //! waits for an event to complete
+    CV_WRAP void waitForCompletion();
+
+    //! computes the elapsed time between events
+    CV_WRAP static float elapsedTime(const Event& start, const Event& end);
+
+    class Impl;
+
+private:
+    Ptr<Impl> impl_;
+    Event(const Ptr<Impl>& impl);
+
+    friend struct EventAccessor;
+};
+CV_ENUM_FLAGS(Event::CreateFlags)
+
+//! @} cudacore_struct
+
+//===================================================================================
+// Initialization & Info
+//===================================================================================
+
+//! @addtogroup cudacore_init
+//! @{
+
+/** @brief Returns the number of installed CUDA-enabled devices.
+
+Use this function before any other CUDA functions calls. If OpenCV is compiled without CUDA support,
+this function returns 0. If the CUDA driver is not installed, or is incompatible, this function
+returns -1.
+ */
+CV_EXPORTS_W int getCudaEnabledDeviceCount();
+
+/** @brief Sets a device and initializes it for the current thread.
+
+@param device System index of a CUDA device starting with 0.
+
+If the call of this function is omitted, a default device is initialized at the fist CUDA usage.
+ */
+CV_EXPORTS_W void setDevice(int device);
+
+/** @brief Returns the current device index set by cuda::setDevice or initialized by default.
+ */
+CV_EXPORTS_W int getDevice();
+
+/** @brief Explicitly destroys and cleans up all resources associated with the current device in the current
+process.
+
+Any subsequent API call to this device will reinitialize the device.
+ */
+CV_EXPORTS_W void resetDevice();
+
+/** @brief Enumeration providing CUDA computing features.
+ */
+enum FeatureSet
+{
+    FEATURE_SET_COMPUTE_10 = 10,
+    FEATURE_SET_COMPUTE_11 = 11,
+    FEATURE_SET_COMPUTE_12 = 12,
+    FEATURE_SET_COMPUTE_13 = 13,
+    FEATURE_SET_COMPUTE_20 = 20,
+    FEATURE_SET_COMPUTE_21 = 21,
+    FEATURE_SET_COMPUTE_30 = 30,
+    FEATURE_SET_COMPUTE_32 = 32,
+    FEATURE_SET_COMPUTE_35 = 35,
+    FEATURE_SET_COMPUTE_50 = 50,
+
+    GLOBAL_ATOMICS = FEATURE_SET_COMPUTE_11,
+    SHARED_ATOMICS = FEATURE_SET_COMPUTE_12,
+    NATIVE_DOUBLE = FEATURE_SET_COMPUTE_13,
+    WARP_SHUFFLE_FUNCTIONS = FEATURE_SET_COMPUTE_30,
+    DYNAMIC_PARALLELISM = FEATURE_SET_COMPUTE_35
+};
+
+//! checks whether current device supports the given feature
+CV_EXPORTS bool deviceSupports(FeatureSet feature_set);
+
+/** @brief Class providing a set of static methods to check what NVIDIA\* card architecture the CUDA module was
+built for.
+
+According to the CUDA C Programming Guide Version 3.2: "PTX code produced for some specific compute
+capability can always be compiled to binary code of greater or equal compute capability".
+ */
+class CV_EXPORTS_W TargetArchs
+{
+public:
+    /** @brief The following method checks whether the module was built with the support of the given feature:
+
+    @param feature_set Features to be checked. See :ocvcuda::FeatureSet.
+     */
+    static bool builtWith(FeatureSet feature_set);
+
+    /** @brief There is a set of methods to check whether the module contains intermediate (PTX) or binary CUDA
+    code for the given architecture(s):
+
+    @param major Major compute capability version.
+    @param minor Minor compute capability version.
+     */
+    CV_WRAP static bool has(int major, int minor);
+    CV_WRAP static bool hasPtx(int major, int minor);
+    CV_WRAP static bool hasBin(int major, int minor);
+
+    CV_WRAP static bool hasEqualOrLessPtx(int major, int minor);
+    CV_WRAP static bool hasEqualOrGreater(int major, int minor);
+    CV_WRAP static bool hasEqualOrGreaterPtx(int major, int minor);
+    CV_WRAP static bool hasEqualOrGreaterBin(int major, int minor);
+};
+
+/** @brief Class providing functionality for querying the specified GPU properties.
+ */
+class CV_EXPORTS_W DeviceInfo
+{
+public:
+    //! creates DeviceInfo object for the current GPU
+    CV_WRAP DeviceInfo();
+
+    /** @brief The constructors.
+
+    @param device_id System index of the CUDA device starting with 0.
+
+    Constructs the DeviceInfo object for the specified device. If device_id parameter is missed, it
+    constructs an object for the current device.
+     */
+    CV_WRAP DeviceInfo(int device_id);
+
+    /** @brief Returns system index of the CUDA device starting with 0.
+    */
+    CV_WRAP int deviceID() const;
+
+    //! ASCII string identifying device
+    const char* name() const;
+
+    //! global memory available on device in bytes
+    CV_WRAP size_t totalGlobalMem() const;
+
+    //! shared memory available per block in bytes
+    CV_WRAP size_t sharedMemPerBlock() const;
+
+    //! 32-bit registers available per block
+    CV_WRAP int regsPerBlock() const;
+
+    //! warp size in threads
+    CV_WRAP int warpSize() const;
+
+    //! maximum pitch in bytes allowed by memory copies
+    CV_WRAP size_t memPitch() const;
+
+    //! maximum number of threads per block
+    CV_WRAP int maxThreadsPerBlock() const;
+
+    //! maximum size of each dimension of a block
+    CV_WRAP Vec3i maxThreadsDim() const;
+
+    //! maximum size of each dimension of a grid
+    CV_WRAP Vec3i maxGridSize() const;
+
+    //! clock frequency in kilohertz
+    CV_WRAP int clockRate() const;
+
+    //! constant memory available on device in bytes
+    CV_WRAP size_t totalConstMem() const;
+
+    //! major compute capability
+    CV_WRAP int majorVersion() const;
+
+    //! minor compute capability
+    CV_WRAP int minorVersion() const;
+
+    //! alignment requirement for textures
+    CV_WRAP size_t textureAlignment() const;
+
+    //! pitch alignment requirement for texture references bound to pitched memory
+    CV_WRAP size_t texturePitchAlignment() const;
+
+    //! number of multiprocessors on device
+    CV_WRAP int multiProcessorCount() const;
+
+    //! specified whether there is a run time limit on kernels
+    CV_WRAP bool kernelExecTimeoutEnabled() const;
+
+    //! device is integrated as opposed to discrete
+    CV_WRAP bool integrated() const;
+
+    //! device can map host memory with cudaHostAlloc/cudaHostGetDevicePointer
+    CV_WRAP bool canMapHostMemory() const;
+
+    enum ComputeMode
+    {
+        ComputeModeDefault,         /**< default compute mode (Multiple threads can use cudaSetDevice with this device) */
+        ComputeModeExclusive,       /**< compute-exclusive-thread mode (Only one thread in one process will be able to use cudaSetDevice with this device) */
+        ComputeModeProhibited,      /**< compute-prohibited mode (No threads can use cudaSetDevice with this device) */
+        ComputeModeExclusiveProcess /**< compute-exclusive-process mode (Many threads in one process will be able to use cudaSetDevice with this device) */
+    };
+
+    //! compute mode
+    CV_WRAP DeviceInfo::ComputeMode computeMode() const;
+
+    //! maximum 1D texture size
+    CV_WRAP int maxTexture1D() const;
+
+    //! maximum 1D mipmapped texture size
+    CV_WRAP int maxTexture1DMipmap() const;
+
+    //! maximum size for 1D textures bound to linear memory
+    CV_WRAP int maxTexture1DLinear() const;
+
+    //! maximum 2D texture dimensions
+    CV_WRAP Vec2i maxTexture2D() const;
+
+    //! maximum 2D mipmapped texture dimensions
+    CV_WRAP Vec2i maxTexture2DMipmap() const;
+
+    //! maximum dimensions (width, height, pitch) for 2D textures bound to pitched memory
+    CV_WRAP Vec3i maxTexture2DLinear() const;
+
+    //! maximum 2D texture dimensions if texture gather operations have to be performed
+    CV_WRAP Vec2i maxTexture2DGather() const;
+
+    //! maximum 3D texture dimensions
+    CV_WRAP Vec3i maxTexture3D() const;
+
+    //! maximum Cubemap texture dimensions
+    CV_WRAP int maxTextureCubemap() const;
+
+    //! maximum 1D layered texture dimensions
+    CV_WRAP Vec2i maxTexture1DLayered() const;
+
+    //! maximum 2D layered texture dimensions
+    CV_WRAP Vec3i maxTexture2DLayered() const;
+
+    //! maximum Cubemap layered texture dimensions
+    CV_WRAP Vec2i maxTextureCubemapLayered() const;
+
+    //! maximum 1D surface size
+    CV_WRAP int maxSurface1D() const;
+
+    //! maximum 2D surface dimensions
+    CV_WRAP Vec2i maxSurface2D() const;
+
+    //! maximum 3D surface dimensions
+    CV_WRAP Vec3i maxSurface3D() const;
+
+    //! maximum 1D layered surface dimensions
+    CV_WRAP Vec2i maxSurface1DLayered() const;
+
+    //! maximum 2D layered surface dimensions
+    CV_WRAP Vec3i maxSurface2DLayered() const;
+
+    //! maximum Cubemap surface dimensions
+    CV_WRAP int maxSurfaceCubemap() const;
+
+    //! maximum Cubemap layered surface dimensions
+    CV_WRAP Vec2i maxSurfaceCubemapLayered() const;
+
+    //! alignment requirements for surfaces
+    CV_WRAP size_t surfaceAlignment() const;
+
+    //! device can possibly execute multiple kernels concurrently
+    CV_WRAP bool concurrentKernels() const;
+
+    //! device has ECC support enabled
+    CV_WRAP bool ECCEnabled() const;
+
+    //! PCI bus ID of the device
+    CV_WRAP int pciBusID() const;
+
+    //! PCI device ID of the device
+    CV_WRAP int pciDeviceID() const;
+
+    //! PCI domain ID of the device
+    CV_WRAP int pciDomainID() const;
+
+    //! true if device is a Tesla device using TCC driver, false otherwise
+    CV_WRAP bool tccDriver() const;
+
+    //! number of asynchronous engines
+    CV_WRAP int asyncEngineCount() const;
+
+    //! device shares a unified address space with the host
+    CV_WRAP bool unifiedAddressing() const;
+
+    //! peak memory clock frequency in kilohertz
+    CV_WRAP int memoryClockRate() const;
+
+    //! global memory bus width in bits
+    CV_WRAP int memoryBusWidth() const;
+
+    //! size of L2 cache in bytes
+    CV_WRAP int l2CacheSize() const;
+
+    //! maximum resident threads per multiprocessor
+    CV_WRAP int maxThreadsPerMultiProcessor() const;
+
+    //! gets free and total device memory
+    CV_WRAP void queryMemory(size_t& totalMemory, size_t& freeMemory) const;
+    CV_WRAP size_t freeMemory() const;
+    CV_WRAP size_t totalMemory() const;
+
+    /** @brief Provides information on CUDA feature support.
+
+    @param feature_set Features to be checked. See cuda::FeatureSet.
+
+    This function returns true if the device has the specified CUDA feature. Otherwise, it returns false
+     */
+    bool supports(FeatureSet feature_set) const;
+
+    /** @brief Checks the CUDA module and device compatibility.
+
+    This function returns true if the CUDA module can be run on the specified device. Otherwise, it
+    returns false .
+     */
+    CV_WRAP bool isCompatible() const;
+
+private:
+    int device_id_;
+};
+
+CV_EXPORTS_W void printCudaDeviceInfo(int device);
+CV_EXPORTS_W void printShortCudaDeviceInfo(int device);
+
+/** @brief Converts an array to half precision floating number.
+
+@param _src input array.
+@param _dst output array.
+@param stream Stream for the asynchronous version.
+@sa convertFp16
+*/
+CV_EXPORTS void convertFp16(InputArray _src, OutputArray _dst, Stream& stream = Stream::Null());
+
+//! @} cudacore_init
+
+}} // namespace cv { namespace cuda {
+
+
+#include "opencv2/core/cuda.inl.hpp"
+
+#endif /* OPENCV_CORE_CUDA_HPP */
diff --git a/3rdParty/opencv2/core/cuda.inl.hpp b/3rdParty/opencv-4.12.0/opencv2/core/cuda.inl.hpp
similarity index 89%
rename from 3rdParty/opencv2/core/cuda.inl.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/cuda.inl.hpp
index 01d7ec0c84..9eae299806 100644
--- a/3rdParty/opencv2/core/cuda.inl.hpp
+++ b/3rdParty/opencv-4.12.0/opencv2/core/cuda.inl.hpp
@@ -75,6 +75,11 @@ GpuMat::GpuMat(Size size_, int type_, Allocator* allocator_)
         create(size_.height, size_.width, type_);
 }
 
+// WARNING: unreachable code using Ninja
+#if defined _MSC_VER && _MSC_VER >= 1920
+#pragma warning(push)
+#pragma warning(disable: 4702)
+#endif
 inline
 GpuMat::GpuMat(int rows_, int cols_, int type_, Scalar s_, Allocator* allocator_)
     : flags(0), rows(0), cols(0), step(0), data(0), refcount(0), datastart(0), dataend(0), allocator(allocator_)
@@ -96,6 +101,9 @@ GpuMat::GpuMat(Size size_, int type_, Scalar s_, Allocator* allocator_)
         setTo(s_);
     }
 }
+#if defined _MSC_VER && _MSC_VER >= 1920
+#pragma warning(pop)
+#endif
 
 inline
 GpuMat::GpuMat(const GpuMat& m)
@@ -158,11 +166,19 @@ GpuMat GpuMat::clone() const
     return m;
 }
 
+// WARNING: unreachable code using Ninja
+#if defined _MSC_VER && _MSC_VER >= 1920
+#pragma warning(push)
+#pragma warning(disable: 4702)
+#endif
 inline
 void GpuMat::copyTo(OutputArray dst, InputArray mask) const
 {
     copyTo(dst, mask, Stream::Null());
 }
+#if defined _MSC_VER && _MSC_VER >= 1920
+#pragma warning(pop)
+#endif
 
 inline
 GpuMat& GpuMat::setTo(Scalar s)
@@ -176,6 +192,11 @@ GpuMat& GpuMat::setTo(Scalar s, InputArray mask)
     return setTo(s, mask, Stream::Null());
 }
 
+// WARNING: unreachable code using Ninja
+#if defined _MSC_VER && _MSC_VER >= 1920
+#pragma warning(push)
+#pragma warning(disable: 4702)
+#endif
 inline
 void GpuMat::convertTo(OutputArray dst, int rtype) const
 {
@@ -187,6 +208,9 @@ void GpuMat::convertTo(OutputArray dst, int rtype, double alpha, double beta) co
 {
     convertTo(dst, rtype, alpha, beta, Stream::Null());
 }
+#if defined _MSC_VER && _MSC_VER >= 1920
+#pragma warning(pop)
+#endif
 
 inline
 void GpuMat::convertTo(OutputArray dst, int rtype, double alpha, Stream& stream) const
@@ -646,6 +670,11 @@ Event::Event(const Ptr<Impl>& impl)
 // Initialization & Info
 //===================================================================================
 
+// WARNING: unreachable code using Ninja
+#if defined _MSC_VER && _MSC_VER >= 1920
+#pragma warning(push)
+#pragma warning(disable: 4702)
+#endif
 inline
 bool TargetArchs::has(int major, int minor)
 {
@@ -663,6 +692,9 @@ DeviceInfo::DeviceInfo()
 {
     device_id_ = getDevice();
 }
+#if defined _MSC_VER && _MSC_VER >= 1920
+#pragma warning(pop)
+#endif
 
 inline
 DeviceInfo::DeviceInfo(int device_id)
@@ -671,6 +703,11 @@ DeviceInfo::DeviceInfo(int device_id)
     device_id_ = device_id;
 }
 
+// WARNING: unreachable code using Ninja
+#if defined _MSC_VER && _MSC_VER >= 1920
+#pragma warning(push)
+#pragma warning(disable: 4702)
+#endif
 inline
 int DeviceInfo::deviceID() const
 {
@@ -699,6 +736,9 @@ bool DeviceInfo::supports(FeatureSet feature_set) const
     int version = majorVersion() * 10 + minorVersion();
     return version >= feature_set;
 }
+#if defined _MSC_VER && _MSC_VER >= 1920
+#pragma warning(pop)
+#endif
 
 
 }} // namespace cv { namespace cuda {
diff --git a/3rdParty/opencv2/core/cuda/block.hpp b/3rdParty/opencv-4.12.0/opencv2/core/cuda/block.hpp
similarity index 100%
rename from 3rdParty/opencv2/core/cuda/block.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/cuda/block.hpp
diff --git a/3rdParty/opencv2/core/cuda/border_interpolate.hpp b/3rdParty/opencv-4.12.0/opencv2/core/cuda/border_interpolate.hpp
similarity index 100%
rename from 3rdParty/opencv2/core/cuda/border_interpolate.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/cuda/border_interpolate.hpp
diff --git a/3rdParty/opencv2/core/cuda/color.hpp b/3rdParty/opencv-4.12.0/opencv2/core/cuda/color.hpp
similarity index 100%
rename from 3rdParty/opencv2/core/cuda/color.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/cuda/color.hpp
diff --git a/3rdParty/opencv2/core/cuda/common.hpp b/3rdParty/opencv-4.12.0/opencv2/core/cuda/common.hpp
similarity index 89%
rename from 3rdParty/opencv2/core/cuda/common.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/cuda/common.hpp
index 7acb219555..58cf9d8579 100644
--- a/3rdParty/opencv2/core/cuda/common.hpp
+++ b/3rdParty/opencv-4.12.0/opencv2/core/cuda/common.hpp
@@ -65,8 +65,10 @@
 namespace cv { namespace cuda {
     static inline void checkCudaError(cudaError_t err, const char* file, const int line, const char* func)
     {
-        if (cudaSuccess != err)
+        if (cudaSuccess != err) {
+            cudaGetLastError(); // reset the last stored error to cudaSuccess
             cv::error(cv::Error::GpuApiCallError, cudaGetErrorString(err), func, file, line);
+        }
     }
 }}
 
@@ -96,6 +98,11 @@ namespace cv { namespace cuda
             return (total + grain - 1) / grain;
         }
 
+#if (CUDART_VERSION >= 12000)
+        template<class T> inline void createTextureObjectPitch2D(cudaTextureObject_t*, PtrStepSz<T>&, const cudaTextureDesc&) {
+            CV_Error(cv::Error::GpuNotSupported, "Function removed in CUDA SDK 12"); }
+#else
+        //TODO: remove from OpenCV 5.x
         template<class T> inline void bindTexture(const textureReference* tex, const PtrStepSz<T>& img)
         {
             cudaChannelFormatDesc desc = cudaCreateChannelDesc<T>();
@@ -115,6 +122,7 @@ namespace cv { namespace cuda
 
             cudaSafeCall( cudaCreateTextureObject(tex, &resDesc, &texDesc, NULL) );
         }
+#endif
     }
 }}
 
diff --git a/3rdParty/opencv2/core/cuda/datamov_utils.hpp b/3rdParty/opencv-4.12.0/opencv2/core/cuda/datamov_utils.hpp
similarity index 100%
rename from 3rdParty/opencv2/core/cuda/datamov_utils.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/cuda/datamov_utils.hpp
diff --git a/3rdParty/opencv2/core/cuda/detail/color_detail.hpp b/3rdParty/opencv-4.12.0/opencv2/core/cuda/detail/color_detail.hpp
similarity index 100%
rename from 3rdParty/opencv2/core/cuda/detail/color_detail.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/cuda/detail/color_detail.hpp
diff --git a/3rdParty/opencv-4.12.0/opencv2/core/cuda/detail/reduce.hpp b/3rdParty/opencv-4.12.0/opencv2/core/cuda/detail/reduce.hpp
new file mode 100644
index 0000000000..507e6b334d
--- /dev/null
+++ b/3rdParty/opencv-4.12.0/opencv2/core/cuda/detail/reduce.hpp
@@ -0,0 +1,394 @@
+/*M///////////////////////////////////////////////////////////////////////////////////////
+//
+//  IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
+//
+//  By downloading, copying, installing or using the software you agree to this license.
+//  If you do not agree to this license, do not download, install,
+//  copy or use the software.
+//
+//
+//                           License Agreement
+//                For Open Source Computer Vision Library
+//
+// Copyright (C) 2000-2008, Intel Corporation, all rights reserved.
+// Copyright (C) 2009, Willow Garage Inc., all rights reserved.
+// Third party copyrights are property of their respective owners.
+//
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
+//
+//   * Redistribution's of source code must retain the above copyright notice,
+//     this list of conditions and the following disclaimer.
+//
+//   * Redistribution's in binary form must reproduce the above copyright notice,
+//     this list of conditions and the following disclaimer in the documentation
+//     and/or other materials provided with the distribution.
+//
+//   * The name of the copyright holders may not be used to endorse or promote products
+//     derived from this software without specific prior written permission.
+//
+// This software is provided by the copyright holders and contributors "as is" and
+// any express or implied warranties, including, but not limited to, the implied
+// warranties of merchantability and fitness for a particular purpose are disclaimed.
+// In no event shall the Intel Corporation or contributors be liable for any direct,
+// indirect, incidental, special, exemplary, or consequential damages
+// (including, but not limited to, procurement of substitute goods or services;
+// loss of use, data, or profits; or business interruption) however caused
+// and on any theory of liability, whether in contract, strict liability,
+// or tort (including negligence or otherwise) arising in any way out of
+// the use of this software, even if advised of the possibility of such damage.
+//
+//M*/
+
+#ifndef OPENCV_CUDA_REDUCE_DETAIL_HPP
+#define OPENCV_CUDA_REDUCE_DETAIL_HPP
+
+#include <thrust/tuple.h>
+#include "../warp.hpp"
+#include "../warp_shuffle.hpp"
+
+//! @cond IGNORED
+
+namespace cv { namespace cuda { namespace device
+{
+    namespace reduce_detail
+    {
+        template <typename T> struct GetType;
+        template <typename T> struct GetType<T*>
+        {
+            typedef T type;
+        };
+        template <typename T> struct GetType<volatile T*>
+        {
+            typedef T type;
+        };
+        template <typename T> struct GetType<T&>
+        {
+            typedef T type;
+        };
+
+        template <unsigned int I, unsigned int N>
+        struct For
+        {
+            template <class PointerTuple, class ValTuple>
+            static __device__ void loadToSmem(const PointerTuple& smem, const ValTuple& val, unsigned int tid)
+            {
+                thrust::get<I>(smem)[tid] = thrust::get<I>(val);
+
+                For<I + 1, N>::loadToSmem(smem, val, tid);
+            }
+            template <class PointerTuple, class ValTuple>
+            static __device__ void loadFromSmem(const PointerTuple& smem, const ValTuple& val, unsigned int tid)
+            {
+                thrust::get<I>(val) = thrust::get<I>(smem)[tid];
+
+                For<I + 1, N>::loadFromSmem(smem, val, tid);
+            }
+
+            template <class PointerTuple, class ValTuple, class OpTuple>
+            static __device__ void merge(const PointerTuple& smem, const ValTuple& val, unsigned int tid, unsigned int delta, const OpTuple& op)
+            {
+                typename GetType<typename thrust::tuple_element<I, PointerTuple>::type>::type reg = thrust::get<I>(smem)[tid + delta];
+                thrust::get<I>(smem)[tid] = thrust::get<I>(val) = thrust::get<I>(op)(thrust::get<I>(val), reg);
+
+                For<I + 1, N>::merge(smem, val, tid, delta, op);
+            }
+            template <class ValTuple, class OpTuple>
+            static __device__ void mergeShfl(const ValTuple& val, unsigned int delta, unsigned int width, const OpTuple& op)
+            {
+                typename GetType<typename thrust::tuple_element<I, ValTuple>::type>::type reg = shfl_down(thrust::get<I>(val), delta, width);
+                thrust::get<I>(val) = thrust::get<I>(op)(thrust::get<I>(val), reg);
+
+                For<I + 1, N>::mergeShfl(val, delta, width, op);
+            }
+        };
+        template <unsigned int N>
+        struct For<N, N>
+        {
+            template <class PointerTuple, class ValTuple>
+            static __device__ void loadToSmem(const PointerTuple&, const ValTuple&, unsigned int)
+            {
+            }
+            template <class PointerTuple, class ValTuple>
+            static __device__ void loadFromSmem(const PointerTuple&, const ValTuple&, unsigned int)
+            {
+            }
+
+            template <class PointerTuple, class ValTuple, class OpTuple>
+            static __device__ void merge(const PointerTuple&, const ValTuple&, unsigned int, unsigned int, const OpTuple&)
+            {
+            }
+            template <class ValTuple, class OpTuple>
+            static __device__ void mergeShfl(const ValTuple&, unsigned int, unsigned int, const OpTuple&)
+            {
+            }
+        };
+
+        template <typename T>
+        __device__ __forceinline__ void loadToSmem(volatile T* smem, T& val, unsigned int tid)
+        {
+            smem[tid] = val;
+        }
+        template <typename T>
+        __device__ __forceinline__ void loadFromSmem(volatile T* smem, T& val, unsigned int tid)
+        {
+            val = smem[tid];
+        }
+
+        template <typename T, class Op>
+        __device__ __forceinline__ void merge(volatile T* smem, T& val, unsigned int tid, unsigned int delta, const Op& op)
+        {
+            T reg = smem[tid + delta];
+            smem[tid] = val = op(val, reg);
+        }
+
+        template <typename T, class Op>
+        __device__ __forceinline__ void mergeShfl(T& val, unsigned int delta, unsigned int width, const Op& op)
+        {
+            T reg = shfl_down(val, delta, width);
+            val = op(val, reg);
+        }
+
+#if (CUDART_VERSION < 12040) // details: https://github.com/opencv/opencv_contrib/issues/3690
+        template <typename P0, typename P1, typename P2, typename P3, typename P4, typename P5, typename P6, typename P7, typename P8, typename P9,
+                  typename R0, typename R1, typename R2, typename R3, typename R4, typename R5, typename R6, typename R7, typename R8, typename R9>
+        __device__ __forceinline__ void loadToSmem(const thrust::tuple<P0, P1, P2, P3, P4, P5, P6, P7, P8, P9>& smem,
+                                                       const thrust::tuple<R0, R1, R2, R3, R4, R5, R6, R7, R8, R9>& val,
+                                                       unsigned int tid)
+        {
+            For<0, thrust::tuple_size<thrust::tuple<P0, P1, P2, P3, P4, P5, P6, P7, P8, P9> >::value>::loadToSmem(smem, val, tid);
+        }
+
+        template <typename P0, typename P1, typename P2, typename P3, typename P4, typename P5, typename P6, typename P7, typename P8, typename P9,
+                  typename R0, typename R1, typename R2, typename R3, typename R4, typename R5, typename R6, typename R7, typename R8, typename R9>
+        __device__ __forceinline__ void loadFromSmem(const thrust::tuple<P0, P1, P2, P3, P4, P5, P6, P7, P8, P9>& smem,
+                                                         const thrust::tuple<R0, R1, R2, R3, R4, R5, R6, R7, R8, R9>& val,
+                                                         unsigned int tid)
+        {
+            For<0, thrust::tuple_size<thrust::tuple<P0, P1, P2, P3, P4, P5, P6, P7, P8, P9> >::value>::loadFromSmem(smem, val, tid);
+        }
+
+        template <typename P0, typename P1, typename P2, typename P3, typename P4, typename P5, typename P6, typename P7, typename P8, typename P9,
+                  typename R0, typename R1, typename R2, typename R3, typename R4, typename R5, typename R6, typename R7, typename R8, typename R9,
+                  class Op0, class Op1, class Op2, class Op3, class Op4, class Op5, class Op6, class Op7, class Op8, class Op9>
+        __device__ __forceinline__ void merge(const thrust::tuple<P0, P1, P2, P3, P4, P5, P6, P7, P8, P9>& smem,
+                                              const thrust::tuple<R0, R1, R2, R3, R4, R5, R6, R7, R8, R9>& val,
+                                              unsigned int tid,
+                                              unsigned int delta,
+                                              const thrust::tuple<Op0, Op1, Op2, Op3, Op4, Op5, Op6, Op7, Op8, Op9>& op)
+        {
+            For<0, thrust::tuple_size<thrust::tuple<P0, P1, P2, P3, P4, P5, P6, P7, P8, P9> >::value>::merge(smem, val, tid, delta, op);
+        }
+        template <typename R0, typename R1, typename R2, typename R3, typename R4, typename R5, typename R6, typename R7, typename R8, typename R9,
+                  class Op0, class Op1, class Op2, class Op3, class Op4, class Op5, class Op6, class Op7, class Op8, class Op9>
+        __device__ __forceinline__ void mergeShfl(const thrust::tuple<R0, R1, R2, R3, R4, R5, R6, R7, R8, R9>& val,
+                                                  unsigned int delta,
+                                                  unsigned int width,
+                                                  const thrust::tuple<Op0, Op1, Op2, Op3, Op4, Op5, Op6, Op7, Op8, Op9>& op)
+        {
+            For<0, thrust::tuple_size<thrust::tuple<R0, R1, R2, R3, R4, R5, R6, R7, R8, R9> >::value>::mergeShfl(val, delta, width, op);
+        }
+#else
+        template <typename... P, typename... R>
+        __device__ __forceinline__ void loadToSmem(const thrust::tuple<P...>& smem, const thrust::tuple<R...>& val, unsigned int tid)
+        {
+            For<0, thrust::tuple_size<thrust::tuple<P...> >::value>::loadToSmem(smem, val, tid);
+        }
+
+        template <typename... P, typename... R>
+        __device__ __forceinline__ void loadFromSmem(const thrust::tuple<P...>& smem, const thrust::tuple<R...>& val, unsigned int tid)
+        {
+            For<0, thrust::tuple_size<thrust::tuple<P...> >::value>::loadFromSmem(smem, val, tid);
+        }
+
+        template <typename... P, typename... R, class... Op>
+        __device__ __forceinline__ void merge(const thrust::tuple<P...>& smem, const thrust::tuple<R...>& val, unsigned int tid, unsigned int delta, const thrust::tuple<Op...>& op)
+        {
+            For<0, thrust::tuple_size<thrust::tuple<P...> >::value>::merge(smem, val, tid, delta, op);
+        }
+
+        template <typename... R, class... Op>
+        __device__ __forceinline__ void mergeShfl(const thrust::tuple<R...>& val, unsigned int delta, unsigned int width, const thrust::tuple<Op...>& op)
+        {
+            For<0, thrust::tuple_size<thrust::tuple<R...> >::value>::mergeShfl(val, delta, width, op);
+        }
+#endif
+        template <unsigned int N> struct Generic
+        {
+            template <typename Pointer, typename Reference, class Op>
+            static __device__ void reduce(Pointer smem, Reference val, unsigned int tid, Op op)
+            {
+                loadToSmem(smem, val, tid);
+                if (N >= 32)
+                    __syncthreads();
+
+                if (N >= 2048)
+                {
+                    if (tid < 1024)
+                        merge(smem, val, tid, 1024, op);
+
+                    __syncthreads();
+                }
+                if (N >= 1024)
+                {
+                    if (tid < 512)
+                        merge(smem, val, tid, 512, op);
+
+                    __syncthreads();
+                }
+                if (N >= 512)
+                {
+                    if (tid < 256)
+                        merge(smem, val, tid, 256, op);
+
+                    __syncthreads();
+                }
+                if (N >= 256)
+                {
+                    if (tid < 128)
+                        merge(smem, val, tid, 128, op);
+
+                    __syncthreads();
+                }
+                if (N >= 128)
+                {
+                    if (tid < 64)
+                        merge(smem, val, tid, 64, op);
+
+                    __syncthreads();
+                }
+                if (N >= 64)
+                {
+                    if (tid < 32)
+                        merge(smem, val, tid, 32, op);
+                }
+
+                if (tid < 16)
+                {
+                    merge(smem, val, tid, 16, op);
+                    merge(smem, val, tid, 8, op);
+                    merge(smem, val, tid, 4, op);
+                    merge(smem, val, tid, 2, op);
+                    merge(smem, val, tid, 1, op);
+                }
+            }
+        };
+
+        template <unsigned int I, typename Pointer, typename Reference, class Op>
+        struct Unroll
+        {
+            static __device__ void loopShfl(Reference val, Op op, unsigned int N)
+            {
+                mergeShfl(val, I, N, op);
+                Unroll<I / 2, Pointer, Reference, Op>::loopShfl(val, op, N);
+            }
+            static __device__ void loop(Pointer smem, Reference val, unsigned int tid, Op op)
+            {
+                merge(smem, val, tid, I, op);
+                Unroll<I / 2, Pointer, Reference, Op>::loop(smem, val, tid, op);
+            }
+        };
+        template <typename Pointer, typename Reference, class Op>
+        struct Unroll<0, Pointer, Reference, Op>
+        {
+            static __device__ void loopShfl(Reference, Op, unsigned int)
+            {
+            }
+            static __device__ void loop(Pointer, Reference, unsigned int, Op)
+            {
+            }
+        };
+
+        template <unsigned int N> struct WarpOptimized
+        {
+            template <typename Pointer, typename Reference, class Op>
+            static __device__ void reduce(Pointer smem, Reference val, unsigned int tid, Op op)
+            {
+            #if defined __CUDA_ARCH__ && __CUDA_ARCH__ >= 300
+                CV_UNUSED(smem);
+                CV_UNUSED(tid);
+
+                Unroll<N / 2, Pointer, Reference, Op>::loopShfl(val, op, N);
+            #else
+                loadToSmem(smem, val, tid);
+
+                if (tid < N / 2)
+                    Unroll<N / 2, Pointer, Reference, Op>::loop(smem, val, tid, op);
+            #endif
+            }
+        };
+
+        template <unsigned int N> struct GenericOptimized32
+        {
+            enum { M = N / 32 };
+
+            template <typename Pointer, typename Reference, class Op>
+            static __device__ void reduce(Pointer smem, Reference val, unsigned int tid, Op op)
+            {
+                const unsigned int laneId = Warp::laneId();
+
+            #if defined __CUDA_ARCH__ && __CUDA_ARCH__ >= 300
+                Unroll<16, Pointer, Reference, Op>::loopShfl(val, op, warpSize);
+
+                if (laneId == 0)
+                    loadToSmem(smem, val, tid / 32);
+            #else
+                loadToSmem(smem, val, tid);
+
+                if (laneId < 16)
+                    Unroll<16, Pointer, Reference, Op>::loop(smem, val, tid, op);
+
+                __syncthreads();
+
+                if (laneId == 0)
+                    loadToSmem(smem, val, tid / 32);
+            #endif
+
+                __syncthreads();
+
+                loadFromSmem(smem, val, tid);
+
+                if (tid < 32)
+                {
+                #if defined __CUDA_ARCH__ && __CUDA_ARCH__ >= 300
+                    Unroll<M / 2, Pointer, Reference, Op>::loopShfl(val, op, M);
+                #else
+                    Unroll<M / 2, Pointer, Reference, Op>::loop(smem, val, tid, op);
+                #endif
+                }
+            }
+        };
+
+        template <bool val, class T1, class T2> struct StaticIf;
+        template <class T1, class T2> struct StaticIf<true, T1, T2>
+        {
+            typedef T1 type;
+        };
+        template <class T1, class T2> struct StaticIf<false, T1, T2>
+        {
+            typedef T2 type;
+        };
+
+        template <unsigned int N> struct IsPowerOf2
+        {
+            enum { value = ((N != 0) && !(N & (N - 1))) };
+        };
+
+        template <unsigned int N> struct Dispatcher
+        {
+            typedef typename StaticIf<
+                (N <= 32) && IsPowerOf2<N>::value,
+                WarpOptimized<N>,
+                typename StaticIf<
+                    (N <= 1024) && IsPowerOf2<N>::value,
+                    GenericOptimized32<N>,
+                    Generic<N>
+                >::type
+            >::type reductor;
+        };
+    }
+}}}
+
+//! @endcond
+
+#endif // OPENCV_CUDA_REDUCE_DETAIL_HPP
diff --git a/3rdParty/opencv2/core/cuda/detail/reduce_key_val.hpp b/3rdParty/opencv-4.12.0/opencv2/core/cuda/detail/reduce_key_val.hpp
similarity index 84%
rename from 3rdParty/opencv2/core/cuda/detail/reduce_key_val.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/cuda/detail/reduce_key_val.hpp
index f90fbcd557..535f9d8ed0 100644
--- a/3rdParty/opencv2/core/cuda/detail/reduce_key_val.hpp
+++ b/3rdParty/opencv-4.12.0/opencv2/core/cuda/detail/reduce_key_val.hpp
@@ -177,6 +177,8 @@ namespace cv { namespace cuda { namespace device
         {
             data = smem[tid];
         }
+
+#if (CUDART_VERSION < 12040)
         template <typename VP0, typename VP1, typename VP2, typename VP3, typename VP4, typename VP5, typename VP6, typename VP7, typename VP8, typename VP9,
                   typename VR0, typename VR1, typename VR2, typename VR3, typename VR4, typename VR5, typename VR6, typename VR7, typename VR8, typename VR9>
         __device__ __forceinline__ void loadToSmem(const thrust::tuple<VP0, VP1, VP2, VP3, VP4, VP5, VP6, VP7, VP8, VP9>& smem,
@@ -193,9 +195,18 @@ namespace cv { namespace cuda { namespace device
         {
             For<0, thrust::tuple_size<thrust::tuple<VP0, VP1, VP2, VP3, VP4, VP5, VP6, VP7, VP8, VP9> >::value>::loadFromSmem(smem, data, tid);
         }
-
-        //////////////////////////////////////////////////////
-        // copyVals
+#else
+        template <typename... VP, typename... VR>
+        __device__ __forceinline__ void loadToSmem(const thrust::tuple<VP...>& smem, const thrust::tuple<VR...>& data, unsigned int tid)
+        {
+            For<0, thrust::tuple_size<thrust::tuple<VP...> >::value>::loadToSmem(smem, data, tid);
+        }
+        template <typename... VP, typename... VR>
+        __device__ __forceinline__ void loadFromSmem(const thrust::tuple<VP...>& smem, const thrust::tuple<VR...>& data, unsigned int tid)
+        {
+            For<0, thrust::tuple_size<thrust::tuple<VP...> >::value>::loadFromSmem(smem, data, tid);
+        }
+#endif
 
         template <typename V>
         __device__ __forceinline__ void copyValsShfl(V& val, unsigned int delta, int width)
@@ -207,24 +218,6 @@ namespace cv { namespace cuda { namespace device
         {
             svals[tid] = val = svals[tid + delta];
         }
-        template <typename VR0, typename VR1, typename VR2, typename VR3, typename VR4, typename VR5, typename VR6, typename VR7, typename VR8, typename VR9>
-        __device__ __forceinline__ void copyValsShfl(const thrust::tuple<VR0, VR1, VR2, VR3, VR4, VR5, VR6, VR7, VR8, VR9>& val,
-                                                     unsigned int delta,
-                                                     int width)
-        {
-            For<0, thrust::tuple_size<thrust::tuple<VR0, VR1, VR2, VR3, VR4, VR5, VR6, VR7, VR8, VR9> >::value>::copyShfl(val, delta, width);
-        }
-        template <typename VP0, typename VP1, typename VP2, typename VP3, typename VP4, typename VP5, typename VP6, typename VP7, typename VP8, typename VP9,
-                  typename VR0, typename VR1, typename VR2, typename VR3, typename VR4, typename VR5, typename VR6, typename VR7, typename VR8, typename VR9>
-        __device__ __forceinline__ void copyVals(const thrust::tuple<VP0, VP1, VP2, VP3, VP4, VP5, VP6, VP7, VP8, VP9>& svals,
-                                                 const thrust::tuple<VR0, VR1, VR2, VR3, VR4, VR5, VR6, VR7, VR8, VR9>& val,
-                                                 unsigned int tid, unsigned int delta)
-        {
-            For<0, thrust::tuple_size<thrust::tuple<VP0, VP1, VP2, VP3, VP4, VP5, VP6, VP7, VP8, VP9> >::value>::copy(svals, val, tid, delta);
-        }
-
-        //////////////////////////////////////////////////////
-        // merge
 
         template <typename K, typename V, class Cmp>
         __device__ __forceinline__ void mergeShfl(K& key, V& val, const Cmp& cmp, unsigned int delta, int width)
@@ -248,6 +241,24 @@ namespace cv { namespace cuda { namespace device
                 copyVals(svals, val, tid, delta);
             }
         }
+
+#if (CUDART_VERSION < 12040) // details: https://github.com/opencv/opencv_contrib/issues/3690
+        template <typename VR0, typename VR1, typename VR2, typename VR3, typename VR4, typename VR5, typename VR6, typename VR7, typename VR8, typename VR9>
+        __device__ __forceinline__ void copyValsShfl(const thrust::tuple<VR0, VR1, VR2, VR3, VR4, VR5, VR6, VR7, VR8, VR9>& val,
+                                                     unsigned int delta,
+                                                     int width)
+        {
+            For<0, thrust::tuple_size<thrust::tuple<VR0, VR1, VR2, VR3, VR4, VR5, VR6, VR7, VR8, VR9> >::value>::copyShfl(val, delta, width);
+        }
+        template <typename VP0, typename VP1, typename VP2, typename VP3, typename VP4, typename VP5, typename VP6, typename VP7, typename VP8, typename VP9,
+                  typename VR0, typename VR1, typename VR2, typename VR3, typename VR4, typename VR5, typename VR6, typename VR7, typename VR8, typename VR9>
+        __device__ __forceinline__ void copyVals(const thrust::tuple<VP0, VP1, VP2, VP3, VP4, VP5, VP6, VP7, VP8, VP9>& svals,
+                                                 const thrust::tuple<VR0, VR1, VR2, VR3, VR4, VR5, VR6, VR7, VR8, VR9>& val,
+                                                 unsigned int tid, unsigned int delta)
+        {
+            For<0, thrust::tuple_size<thrust::tuple<VP0, VP1, VP2, VP3, VP4, VP5, VP6, VP7, VP8, VP9> >::value>::copy(svals, val, tid, delta);
+        }
+
         template <typename K,
                   typename VR0, typename VR1, typename VR2, typename VR3, typename VR4, typename VR5, typename VR6, typename VR7, typename VR8, typename VR9,
                   class Cmp>
@@ -305,7 +316,61 @@ namespace cv { namespace cuda { namespace device
         {
             For<0, thrust::tuple_size<thrust::tuple<VP0, VP1, VP2, VP3, VP4, VP5, VP6, VP7, VP8, VP9> >::value>::merge(skeys, key, svals, val, cmp, tid, delta);
         }
+#else
+        template <typename... VR>
+        __device__ __forceinline__ void copyValsShfl(const thrust::tuple<VR...>& val, unsigned int delta, int width)
+        {
+            For<0, thrust::tuple_size<thrust::tuple<VR...> >::value>::copyShfl(val, delta, width);
+        }
+        template <typename... VP, typename... VR>
+        __device__ __forceinline__ void copyVals(const thrust::tuple<VP...>& svals, const thrust::tuple<VR...>& val, unsigned int tid, unsigned int delta)
+        {
+            For<0, thrust::tuple_size<thrust::tuple<VP...> >::value>::copy(svals, val, tid, delta);
+        }
+
+        template <typename K, typename... VR, class Cmp>
+        __device__ __forceinline__ void mergeShfl(K& key, const thrust::tuple<VR...>& val, const Cmp& cmp, unsigned int delta, int width)
+        {
+            K reg = shfl_down(key, delta, width);
+
+            if (cmp(reg, key))
+            {
+                key = reg;
+                copyValsShfl(val, delta, width);
+            }
+        }
+        template <typename K, typename... VP, typename... VR, class Cmp>
+        __device__ __forceinline__ void merge(volatile K* skeys, K& key, const thrust::tuple<VP...>& svals,
+                                              const thrust::tuple<VR...>& val, const Cmp& cmp, unsigned int tid, unsigned int delta)
+        {
+            K reg = skeys[tid + delta];
+
+            if (cmp(reg, key))
+            {
+                skeys[tid] = key = reg;
+                copyVals(svals, val, tid, delta);
+            }
+        }
+        template <typename... KR, typename... VR, class... Cmp>
+        __device__ __forceinline__ void mergeShfl(const thrust::tuple<KR...>& key,
+                                                  const thrust::tuple<VR...>& val,
+                                                  const thrust::tuple<Cmp...>& cmp,
+                                                  unsigned int delta, int width)
+        {
+            For<0, thrust::tuple_size<thrust::tuple<KR...> >::value>::mergeShfl(key, val, cmp, delta, width);
+        }
+        template <typename... KP, typename... KR, typename... VP, typename... VR, class... Cmp>
+        __device__ __forceinline__ void merge(const thrust::tuple<KP...>& skeys,
+                                              const thrust::tuple<KR...>& key,
+                                              const thrust::tuple<VP...>& svals,
+                                              const thrust::tuple<VR...>& val,
+                                              const thrust::tuple<Cmp...>& cmp,
+                                              unsigned int tid, unsigned int delta)
+        {
+            For<0, thrust::tuple_size<thrust::tuple<VP...> >::value>::merge(skeys, key, svals, val, cmp, tid, delta);
+        }
 
+#endif
         //////////////////////////////////////////////////////
         // Generic
 
diff --git a/3rdParty/opencv2/core/cuda/detail/transform_detail.hpp b/3rdParty/opencv-4.12.0/opencv2/core/cuda/detail/transform_detail.hpp
similarity index 100%
rename from 3rdParty/opencv2/core/cuda/detail/transform_detail.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/cuda/detail/transform_detail.hpp
diff --git a/3rdParty/opencv2/core/cuda/detail/type_traits_detail.hpp b/3rdParty/opencv-4.12.0/opencv2/core/cuda/detail/type_traits_detail.hpp
similarity index 100%
rename from 3rdParty/opencv2/core/cuda/detail/type_traits_detail.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/cuda/detail/type_traits_detail.hpp
diff --git a/3rdParty/opencv2/core/cuda/detail/vec_distance_detail.hpp b/3rdParty/opencv-4.12.0/opencv2/core/cuda/detail/vec_distance_detail.hpp
similarity index 100%
rename from 3rdParty/opencv2/core/cuda/detail/vec_distance_detail.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/cuda/detail/vec_distance_detail.hpp
diff --git a/3rdParty/opencv2/core/cuda/dynamic_smem.hpp b/3rdParty/opencv-4.12.0/opencv2/core/cuda/dynamic_smem.hpp
similarity index 100%
rename from 3rdParty/opencv2/core/cuda/dynamic_smem.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/cuda/dynamic_smem.hpp
diff --git a/3rdParty/opencv2/core/cuda/emulation.hpp b/3rdParty/opencv-4.12.0/opencv2/core/cuda/emulation.hpp
similarity index 100%
rename from 3rdParty/opencv2/core/cuda/emulation.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/cuda/emulation.hpp
diff --git a/3rdParty/opencv2/core/cuda/filters.hpp b/3rdParty/opencv-4.12.0/opencv2/core/cuda/filters.hpp
similarity index 100%
rename from 3rdParty/opencv2/core/cuda/filters.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/cuda/filters.hpp
diff --git a/3rdParty/opencv2/core/cuda/funcattrib.hpp b/3rdParty/opencv-4.12.0/opencv2/core/cuda/funcattrib.hpp
similarity index 100%
rename from 3rdParty/opencv2/core/cuda/funcattrib.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/cuda/funcattrib.hpp
diff --git a/3rdParty/opencv2/core/cuda/functional.hpp b/3rdParty/opencv-4.12.0/opencv2/core/cuda/functional.hpp
similarity index 100%
rename from 3rdParty/opencv2/core/cuda/functional.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/cuda/functional.hpp
diff --git a/3rdParty/opencv2/core/cuda/limits.hpp b/3rdParty/opencv-4.12.0/opencv2/core/cuda/limits.hpp
similarity index 100%
rename from 3rdParty/opencv2/core/cuda/limits.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/cuda/limits.hpp
diff --git a/3rdParty/opencv-4.12.0/opencv2/core/cuda/reduce.hpp b/3rdParty/opencv-4.12.0/opencv2/core/cuda/reduce.hpp
new file mode 100644
index 0000000000..f422b0d58d
--- /dev/null
+++ b/3rdParty/opencv-4.12.0/opencv2/core/cuda/reduce.hpp
@@ -0,0 +1,230 @@
+/*M///////////////////////////////////////////////////////////////////////////////////////
+//
+//  IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
+//
+//  By downloading, copying, installing or using the software you agree to this license.
+//  If you do not agree to this license, do not download, install,
+//  copy or use the software.
+//
+//
+//                           License Agreement
+//                For Open Source Computer Vision Library
+//
+// Copyright (C) 2000-2008, Intel Corporation, all rights reserved.
+// Copyright (C) 2009, Willow Garage Inc., all rights reserved.
+// Third party copyrights are property of their respective owners.
+//
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
+//
+//   * Redistribution's of source code must retain the above copyright notice,
+//     this list of conditions and the following disclaimer.
+//
+//   * Redistribution's in binary form must reproduce the above copyright notice,
+//     this list of conditions and the following disclaimer in the documentation
+//     and/or other materials provided with the distribution.
+//
+//   * The name of the copyright holders may not be used to endorse or promote products
+//     derived from this software without specific prior written permission.
+//
+// This software is provided by the copyright holders and contributors "as is" and
+// any express or implied warranties, including, but not limited to, the implied
+// warranties of merchantability and fitness for a particular purpose are disclaimed.
+// In no event shall the Intel Corporation or contributors be liable for any direct,
+// indirect, incidental, special, exemplary, or consequential damages
+// (including, but not limited to, procurement of substitute goods or services;
+// loss of use, data, or profits; or business interruption) however caused
+// and on any theory of liability, whether in contract, strict liability,
+// or tort (including negligence or otherwise) arising in any way out of
+// the use of this software, even if advised of the possibility of such damage.
+//
+//M*/
+
+#ifndef OPENCV_CUDA_REDUCE_HPP
+#define OPENCV_CUDA_REDUCE_HPP
+
+#ifndef THRUST_DEBUG // eliminate -Wundef warning
+#define THRUST_DEBUG 0
+#endif
+
+#include <thrust/tuple.h>
+#include "detail/reduce.hpp"
+#include "detail/reduce_key_val.hpp"
+
+/** @file
+ * @deprecated Use @ref cudev instead.
+ */
+
+//! @cond IGNORED
+
+namespace cv { namespace cuda { namespace device
+{
+    template <int N, typename T, class Op>
+    __device__ __forceinline__ void reduce(volatile T* smem, T& val, unsigned int tid, const Op& op)
+    {
+        reduce_detail::Dispatcher<N>::reductor::template reduce<volatile T*, T&, const Op&>(smem, val, tid, op);
+    }
+    template <unsigned int N, typename K, typename V, class Cmp>
+    __device__ __forceinline__ void reduceKeyVal(volatile K* skeys, K& key, volatile V* svals, V& val, unsigned int tid, const Cmp& cmp)
+    {
+        reduce_key_val_detail::Dispatcher<N>::reductor::template reduce<volatile K*, K&, volatile V*, V&, const Cmp&>(skeys, key, svals, val, tid, cmp);
+    }
+#if (CUDART_VERSION < 12040) // details: https://github.com/opencv/opencv_contrib/issues/3690
+    template <int N,
+              typename P0, typename P1, typename P2, typename P3, typename P4, typename P5, typename P6, typename P7, typename P8, typename P9,
+              typename R0, typename R1, typename R2, typename R3, typename R4, typename R5, typename R6, typename R7, typename R8, typename R9,
+              class Op0, class Op1, class Op2, class Op3, class Op4, class Op5, class Op6, class Op7, class Op8, class Op9>
+    __device__ __forceinline__ void reduce(const thrust::tuple<P0, P1, P2, P3, P4, P5, P6, P7, P8, P9>& smem,
+                                           const thrust::tuple<R0, R1, R2, R3, R4, R5, R6, R7, R8, R9>& val,
+                                           unsigned int tid,
+                                           const thrust::tuple<Op0, Op1, Op2, Op3, Op4, Op5, Op6, Op7, Op8, Op9>& op)
+    {
+        reduce_detail::Dispatcher<N>::reductor::template reduce<
+                const thrust::tuple<P0, P1, P2, P3, P4, P5, P6, P7, P8, P9>&,
+                const thrust::tuple<R0, R1, R2, R3, R4, R5, R6, R7, R8, R9>&,
+                const thrust::tuple<Op0, Op1, Op2, Op3, Op4, Op5, Op6, Op7, Op8, Op9>&>(smem, val, tid, op);
+    }
+
+    template <unsigned int N,
+              typename K,
+              typename VP0, typename VP1, typename VP2, typename VP3, typename VP4, typename VP5, typename VP6, typename VP7, typename VP8, typename VP9,
+              typename VR0, typename VR1, typename VR2, typename VR3, typename VR4, typename VR5, typename VR6, typename VR7, typename VR8, typename VR9,
+              class Cmp>
+    __device__ __forceinline__ void reduceKeyVal(volatile K* skeys, K& key,
+                                                 const thrust::tuple<VP0, VP1, VP2, VP3, VP4, VP5, VP6, VP7, VP8, VP9>& svals,
+                                                 const thrust::tuple<VR0, VR1, VR2, VR3, VR4, VR5, VR6, VR7, VR8, VR9>& val,
+                                                 unsigned int tid, const Cmp& cmp)
+    {
+        reduce_key_val_detail::Dispatcher<N>::reductor::template reduce<volatile K*, K&,
+                const thrust::tuple<VP0, VP1, VP2, VP3, VP4, VP5, VP6, VP7, VP8, VP9>&,
+                const thrust::tuple<VR0, VR1, VR2, VR3, VR4, VR5, VR6, VR7, VR8, VR9>&,
+                const Cmp&>(skeys, key, svals, val, tid, cmp);
+    }
+
+    template <unsigned int N,
+              typename KP0, typename KP1, typename KP2, typename KP3, typename KP4, typename KP5, typename KP6, typename KP7, typename KP8, typename KP9,
+              typename KR0, typename KR1, typename KR2, typename KR3, typename KR4, typename KR5, typename KR6, typename KR7, typename KR8, typename KR9,
+              typename VP0, typename VP1, typename VP2, typename VP3, typename VP4, typename VP5, typename VP6, typename VP7, typename VP8, typename VP9,
+              typename VR0, typename VR1, typename VR2, typename VR3, typename VR4, typename VR5, typename VR6, typename VR7, typename VR8, typename VR9,
+              class Cmp0, class Cmp1, class Cmp2, class Cmp3, class Cmp4, class Cmp5, class Cmp6, class Cmp7, class Cmp8, class Cmp9>
+    __device__ __forceinline__ void reduceKeyVal(const thrust::tuple<KP0, KP1, KP2, KP3, KP4, KP5, KP6, KP7, KP8, KP9>& skeys,
+                                                 const thrust::tuple<KR0, KR1, KR2, KR3, KR4, KR5, KR6, KR7, KR8, KR9>& key,
+                                                 const thrust::tuple<VP0, VP1, VP2, VP3, VP4, VP5, VP6, VP7, VP8, VP9>& svals,
+                                                 const thrust::tuple<VR0, VR1, VR2, VR3, VR4, VR5, VR6, VR7, VR8, VR9>& val,
+                                                 unsigned int tid,
+                                                 const thrust::tuple<Cmp0, Cmp1, Cmp2, Cmp3, Cmp4, Cmp5, Cmp6, Cmp7, Cmp8, Cmp9>& cmp)
+    {
+        reduce_key_val_detail::Dispatcher<N>::reductor::template reduce<
+                const thrust::tuple<KP0, KP1, KP2, KP3, KP4, KP5, KP6, KP7, KP8, KP9>&,
+                const thrust::tuple<KR0, KR1, KR2, KR3, KR4, KR5, KR6, KR7, KR8, KR9>&,
+                const thrust::tuple<VP0, VP1, VP2, VP3, VP4, VP5, VP6, VP7, VP8, VP9>&,
+                const thrust::tuple<VR0, VR1, VR2, VR3, VR4, VR5, VR6, VR7, VR8, VR9>&,
+                const thrust::tuple<Cmp0, Cmp1, Cmp2, Cmp3, Cmp4, Cmp5, Cmp6, Cmp7, Cmp8, Cmp9>&
+                >(skeys, key, svals, val, tid, cmp);
+    }
+#else
+    template <int N, typename... P, typename... R, class... Op>
+    __device__ __forceinline__ void reduce(const thrust::tuple<P...>& smem, const thrust::tuple<R...>& val, unsigned int tid, const thrust::tuple<Op...>& op)
+    {
+        reduce_detail::Dispatcher<N>::reductor::template reduce<const thrust::tuple<P...>&, const thrust::tuple<R...>&, const thrust::tuple<Op...>&>(smem, val, tid, op);
+    }
+
+    template <unsigned int N, typename K, typename... VP, typename... VR, class Cmp>
+    __device__ __forceinline__ void reduceKeyVal(volatile K* skeys, K& key, const thrust::tuple<VP...>& svals, const thrust::tuple<VR...>& val, unsigned int tid, const Cmp& cmp)
+    {
+        reduce_key_val_detail::Dispatcher<N>::reductor::template reduce<volatile K*, K&, const thrust::tuple<VP...>&, const thrust::tuple<VR...>&, const Cmp&>(skeys, key, svals, val, tid, cmp);
+    }
+
+    template <unsigned int N, typename... KP, typename... KR, typename... VP, typename... VR, class... Cmp>
+    __device__ __forceinline__ void reduceKeyVal(const thrust::tuple<KP...>& skeys, const thrust::tuple<KR...>& key, const thrust::tuple<VP...>& svals, const thrust::tuple<VR...>& val, unsigned int tid, const thrust::tuple<Cmp...>& cmp)
+    {
+        reduce_key_val_detail::Dispatcher<N>::reductor::template reduce<const thrust::tuple<KP...>&, const thrust::tuple<KR...>&, const thrust::tuple<VP...>&, const thrust::tuple<VR...>&, const thrust::tuple<Cmp...>&>(skeys, key, svals, val, tid, cmp);
+    }
+#endif
+
+    // smem_tuple
+
+    template <typename T0>
+    __device__ __forceinline__
+    thrust::tuple<volatile T0*>
+    smem_tuple(T0* t0)
+    {
+        return thrust::make_tuple((volatile T0*) t0);
+    }
+
+    template <typename T0, typename T1>
+    __device__ __forceinline__
+    thrust::tuple<volatile T0*, volatile T1*>
+    smem_tuple(T0* t0, T1* t1)
+    {
+        return thrust::make_tuple((volatile T0*) t0, (volatile T1*) t1);
+    }
+
+    template <typename T0, typename T1, typename T2>
+    __device__ __forceinline__
+    thrust::tuple<volatile T0*, volatile T1*, volatile T2*>
+    smem_tuple(T0* t0, T1* t1, T2* t2)
+    {
+        return thrust::make_tuple((volatile T0*) t0, (volatile T1*) t1, (volatile T2*) t2);
+    }
+
+    template <typename T0, typename T1, typename T2, typename T3>
+    __device__ __forceinline__
+    thrust::tuple<volatile T0*, volatile T1*, volatile T2*, volatile T3*>
+    smem_tuple(T0* t0, T1* t1, T2* t2, T3* t3)
+    {
+        return thrust::make_tuple((volatile T0*) t0, (volatile T1*) t1, (volatile T2*) t2, (volatile T3*) t3);
+    }
+
+    template <typename T0, typename T1, typename T2, typename T3, typename T4>
+    __device__ __forceinline__
+    thrust::tuple<volatile T0*, volatile T1*, volatile T2*, volatile T3*, volatile T4*>
+    smem_tuple(T0* t0, T1* t1, T2* t2, T3* t3, T4* t4)
+    {
+        return thrust::make_tuple((volatile T0*) t0, (volatile T1*) t1, (volatile T2*) t2, (volatile T3*) t3, (volatile T4*) t4);
+    }
+
+    template <typename T0, typename T1, typename T2, typename T3, typename T4, typename T5>
+    __device__ __forceinline__
+    thrust::tuple<volatile T0*, volatile T1*, volatile T2*, volatile T3*, volatile T4*, volatile T5*>
+    smem_tuple(T0* t0, T1* t1, T2* t2, T3* t3, T4* t4, T5* t5)
+    {
+        return thrust::make_tuple((volatile T0*) t0, (volatile T1*) t1, (volatile T2*) t2, (volatile T3*) t3, (volatile T4*) t4, (volatile T5*) t5);
+    }
+
+    template <typename T0, typename T1, typename T2, typename T3, typename T4, typename T5, typename T6>
+    __device__ __forceinline__
+    thrust::tuple<volatile T0*, volatile T1*, volatile T2*, volatile T3*, volatile T4*, volatile T5*, volatile T6*>
+    smem_tuple(T0* t0, T1* t1, T2* t2, T3* t3, T4* t4, T5* t5, T6* t6)
+    {
+        return thrust::make_tuple((volatile T0*) t0, (volatile T1*) t1, (volatile T2*) t2, (volatile T3*) t3, (volatile T4*) t4, (volatile T5*) t5, (volatile T6*) t6);
+    }
+
+    template <typename T0, typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7>
+    __device__ __forceinline__
+    thrust::tuple<volatile T0*, volatile T1*, volatile T2*, volatile T3*, volatile T4*, volatile T5*, volatile T6*, volatile T7*>
+    smem_tuple(T0* t0, T1* t1, T2* t2, T3* t3, T4* t4, T5* t5, T6* t6, T7* t7)
+    {
+        return thrust::make_tuple((volatile T0*) t0, (volatile T1*) t1, (volatile T2*) t2, (volatile T3*) t3, (volatile T4*) t4, (volatile T5*) t5, (volatile T6*) t6, (volatile T7*) t7);
+    }
+
+    template <typename T0, typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8>
+    __device__ __forceinline__
+    thrust::tuple<volatile T0*, volatile T1*, volatile T2*, volatile T3*, volatile T4*, volatile T5*, volatile T6*, volatile T7*, volatile T8*>
+    smem_tuple(T0* t0, T1* t1, T2* t2, T3* t3, T4* t4, T5* t5, T6* t6, T7* t7, T8* t8)
+    {
+        return thrust::make_tuple((volatile T0*) t0, (volatile T1*) t1, (volatile T2*) t2, (volatile T3*) t3, (volatile T4*) t4, (volatile T5*) t5, (volatile T6*) t6, (volatile T7*) t7, (volatile T8*) t8);
+    }
+
+    template <typename T0, typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8, typename T9>
+    __device__ __forceinline__
+    thrust::tuple<volatile T0*, volatile T1*, volatile T2*, volatile T3*, volatile T4*, volatile T5*, volatile T6*, volatile T7*, volatile T8*, volatile T9*>
+    smem_tuple(T0* t0, T1* t1, T2* t2, T3* t3, T4* t4, T5* t5, T6* t6, T7* t7, T8* t8, T9* t9)
+    {
+        return thrust::make_tuple((volatile T0*) t0, (volatile T1*) t1, (volatile T2*) t2, (volatile T3*) t3, (volatile T4*) t4, (volatile T5*) t5, (volatile T6*) t6, (volatile T7*) t7, (volatile T8*) t8, (volatile T9*) t9);
+    }
+}}}
+
+//! @endcond
+
+#endif // OPENCV_CUDA_REDUCE_HPP
diff --git a/3rdParty/opencv2/core/cuda/saturate_cast.hpp b/3rdParty/opencv-4.12.0/opencv2/core/cuda/saturate_cast.hpp
similarity index 100%
rename from 3rdParty/opencv2/core/cuda/saturate_cast.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/cuda/saturate_cast.hpp
diff --git a/3rdParty/opencv2/core/cuda/scan.hpp b/3rdParty/opencv-4.12.0/opencv2/core/cuda/scan.hpp
similarity index 100%
rename from 3rdParty/opencv2/core/cuda/scan.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/cuda/scan.hpp
diff --git a/3rdParty/opencv2/core/cuda/simd_functions.hpp b/3rdParty/opencv-4.12.0/opencv2/core/cuda/simd_functions.hpp
similarity index 100%
rename from 3rdParty/opencv2/core/cuda/simd_functions.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/cuda/simd_functions.hpp
diff --git a/3rdParty/opencv2/core/cuda/transform.hpp b/3rdParty/opencv-4.12.0/opencv2/core/cuda/transform.hpp
similarity index 100%
rename from 3rdParty/opencv2/core/cuda/transform.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/cuda/transform.hpp
diff --git a/3rdParty/opencv2/core/cuda/type_traits.hpp b/3rdParty/opencv-4.12.0/opencv2/core/cuda/type_traits.hpp
similarity index 100%
rename from 3rdParty/opencv2/core/cuda/type_traits.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/cuda/type_traits.hpp
diff --git a/3rdParty/opencv2/core/cuda/utility.hpp b/3rdParty/opencv-4.12.0/opencv2/core/cuda/utility.hpp
similarity index 100%
rename from 3rdParty/opencv2/core/cuda/utility.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/cuda/utility.hpp
diff --git a/3rdParty/opencv2/core/cuda/vec_distance.hpp b/3rdParty/opencv-4.12.0/opencv2/core/cuda/vec_distance.hpp
similarity index 100%
rename from 3rdParty/opencv2/core/cuda/vec_distance.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/cuda/vec_distance.hpp
diff --git a/3rdParty/opencv2/core/cuda/vec_math.hpp b/3rdParty/opencv-4.12.0/opencv2/core/cuda/vec_math.hpp
similarity index 100%
rename from 3rdParty/opencv2/core/cuda/vec_math.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/cuda/vec_math.hpp
diff --git a/3rdParty/opencv2/core/cuda/vec_traits.hpp b/3rdParty/opencv-4.12.0/opencv2/core/cuda/vec_traits.hpp
similarity index 100%
rename from 3rdParty/opencv2/core/cuda/vec_traits.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/cuda/vec_traits.hpp
diff --git a/3rdParty/opencv2/core/cuda/warp.hpp b/3rdParty/opencv-4.12.0/opencv2/core/cuda/warp.hpp
similarity index 100%
rename from 3rdParty/opencv2/core/cuda/warp.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/cuda/warp.hpp
diff --git a/3rdParty/opencv2/core/cuda/warp_reduce.hpp b/3rdParty/opencv-4.12.0/opencv2/core/cuda/warp_reduce.hpp
similarity index 100%
rename from 3rdParty/opencv2/core/cuda/warp_reduce.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/cuda/warp_reduce.hpp
diff --git a/3rdParty/opencv2/core/cuda/warp_shuffle.hpp b/3rdParty/opencv-4.12.0/opencv2/core/cuda/warp_shuffle.hpp
similarity index 100%
rename from 3rdParty/opencv2/core/cuda/warp_shuffle.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/cuda/warp_shuffle.hpp
diff --git a/3rdParty/opencv2/core/cuda_stream_accessor.hpp b/3rdParty/opencv-4.12.0/opencv2/core/cuda_stream_accessor.hpp
similarity index 100%
rename from 3rdParty/opencv2/core/cuda_stream_accessor.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/cuda_stream_accessor.hpp
diff --git a/3rdParty/opencv2/core/cuda_types.hpp b/3rdParty/opencv-4.12.0/opencv2/core/cuda_types.hpp
similarity index 90%
rename from 3rdParty/opencv2/core/cuda_types.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/cuda_types.hpp
index 269befec9f..73131b1d32 100644
--- a/3rdParty/opencv2/core/cuda_types.hpp
+++ b/3rdParty/opencv-4.12.0/opencv2/core/cuda_types.hpp
@@ -66,6 +66,9 @@
     #define __CV_CUDA_HOST_DEVICE__
 #endif
 
+#include "opencv2/core/cvdef.h"
+#include "opencv2/core.hpp"
+
 namespace cv
 {
     namespace cuda
@@ -124,6 +127,11 @@ namespace cv
 
             int cols;
             int rows;
+
+            CV_NODISCARD_STD __CV_CUDA_HOST_DEVICE__ Size size() const { return {cols, rows}; }
+            CV_NODISCARD_STD __CV_CUDA_HOST_DEVICE__ T& operator ()(const Point &pos)       { return (*this)(pos.y, pos.x); }
+            CV_NODISCARD_STD __CV_CUDA_HOST_DEVICE__ const T& operator ()(const Point &pos) const { return (*this)(pos.y, pos.x); }
+            using PtrStep<T>::operator();
         };
 
         typedef PtrStepSz<unsigned char> PtrStepSzb;
diff --git a/3rdParty/opencv2/core/cv_cpu_dispatch.h b/3rdParty/opencv-4.12.0/opencv2/core/cv_cpu_dispatch.h
similarity index 82%
rename from 3rdParty/opencv2/core/cv_cpu_dispatch.h
rename to 3rdParty/opencv-4.12.0/opencv2/core/cv_cpu_dispatch.h
index 9cfd787318..5fbe656dc7 100644
--- a/3rdParty/opencv2/core/cv_cpu_dispatch.h
+++ b/3rdParty/opencv-4.12.0/opencv2/core/cv_cpu_dispatch.h
@@ -72,13 +72,17 @@
 #  define CV_AVX 1
 #endif
 #ifdef CV_CPU_COMPILE_FP16
-#  if defined(__arm__) || defined(__aarch64__) || defined(_M_ARM) || defined(_M_ARM64)
+#  if defined(__arm__) || defined(__aarch64__) || defined(_M_ARM) || defined(_M_ARM64) || defined(_M_ARM64EC)
 #    include <arm_neon.h>
 #  else
 #    include <immintrin.h>
 #  endif
 #  define CV_FP16 1
 #endif
+#ifdef CV_CPU_COMPILE_NEON_DOTPROD
+#  include <arm_neon.h>
+#  define CV_NEON_DOT 1
+#endif
 #ifdef CV_CPU_COMPILE_AVX2
 #  include <immintrin.h>
 #  define CV_AVX2 1
@@ -133,22 +137,32 @@
 #  define CV_FMA3 1
 #endif
 
-#if defined _WIN32 && (defined(_M_ARM) || defined(_M_ARM64)) && (defined(CV_CPU_COMPILE_NEON) || !defined(_MSC_VER))
+#if defined _WIN32 && (defined(_M_ARM) || defined(_M_ARM64) || defined(_M_ARM64EC)) && (defined(CV_CPU_COMPILE_NEON) || !defined(_MSC_VER))
 # include <Intrin.h>
 # include <arm_neon.h>
 # define CV_NEON 1
-#elif defined(__ARM_NEON__) || (defined (__ARM_NEON) && defined(__aarch64__))
+#elif defined(__ARM_NEON)
 #  include <arm_neon.h>
 #  define CV_NEON 1
 #endif
 
-#if defined(__riscv) && defined(__riscv_vector) && defined(__riscv_vector_071)
-# include<riscv-vector.h>
-# define CV_RVV071 1
-#endif
-
-#if defined(__ARM_NEON__) || defined(__aarch64__)
-#  include <arm_neon.h>
+/* RVV-related macro states with different compiler
+// +--------------------+----------+----------+
+// | Macro              | Upstream | XuanTie  |
+// +--------------------+----------+----------+
+// | CV_CPU_COMPILE_RVV | defined  | defined  |
+// | CV_RVV             | 1        | 0        |
+// | CV_RVV071          | 0        | 1        |
+// | CV_TRY_RVV         | 1        | 1        |
+// +--------------------+----------+----------+
+*/
+#ifdef CV_CPU_COMPILE_RVV
+#  ifdef __riscv_vector_071
+#    define CV_RVV071 1
+#  else
+#    define CV_RVV 1
+#  endif
+#include <riscv_vector.h>
 #endif
 
 #ifdef CV_CPU_COMPILE_VSX
@@ -168,16 +182,21 @@
 #  define CV_MSA 1
 #endif
 
+#ifdef CV_CPU_COMPILE_LSX
+#  include <lsxintrin.h>
+#  define CV_LSX 1
+#endif
+
+#ifdef CV_CPU_COMPILE_LASX
+#  include <lasxintrin.h>
+#  define CV_LASX 1
+#endif
+
 #ifdef __EMSCRIPTEN__
 #  define CV_WASM_SIMD 1
 #  include <wasm_simd128.h>
 #endif
 
-#if defined CV_CPU_COMPILE_RVV
-#  define CV_RVV 1
-#  include <riscv_vector.h>
-#endif
-
 #endif // CV_ENABLE_INTRINSICS && !CV_DISABLE_OPTIMIZATION && !__CUDACC__
 
 #if defined CV_CPU_COMPILE_AVX && !defined CV_CPU_BASELINE_COMPILE_AVX
@@ -211,11 +230,11 @@ struct VZeroUpperGuard {
 #  define CV_MMX 1
 #  define CV_SSE 1
 #  define CV_SSE2 1
-#elif defined _WIN32 && (defined(_M_ARM) || defined(_M_ARM64)) && (defined(CV_CPU_COMPILE_NEON) || !defined(_MSC_VER))
+#elif defined _WIN32 && (defined(_M_ARM) || defined(_M_ARM64) || defined(_M_ARM64EC)) && (defined(CV_CPU_COMPILE_NEON) || !defined(_MSC_VER))
 # include <Intrin.h>
 # include <arm_neon.h>
 # define CV_NEON 1
-#elif defined(__ARM_NEON__) || (defined (__ARM_NEON) && defined(__aarch64__))
+#elif defined(__ARM_NEON)
 #  include <arm_neon.h>
 #  define CV_NEON 1
 #elif defined(__VSX__) && defined(__PPC64__) && defined(__LITTLE_ENDIAN__)
@@ -366,3 +385,11 @@ struct VZeroUpperGuard {
 #ifndef CV_RVV
 #  define CV_RVV 0
 #endif
+
+#ifndef CV_LSX
+#  define CV_LSX 0
+#endif
+
+#ifndef CV_LASX
+#  define CV_LASX 0
+#endif
diff --git a/3rdParty/opencv2/core/cv_cpu_helper.h b/3rdParty/opencv-4.12.0/opencv2/core/cv_cpu_helper.h
similarity index 80%
rename from 3rdParty/opencv2/core/cv_cpu_helper.h
rename to 3rdParty/opencv-4.12.0/opencv2/core/cv_cpu_helper.h
index 5c54f0b348..29952aec36 100644
--- a/3rdParty/opencv2/core/cv_cpu_helper.h
+++ b/3rdParty/opencv-4.12.0/opencv2/core/cv_cpu_helper.h
@@ -420,6 +420,69 @@
 #endif
 #define __CV_CPU_DISPATCH_CHAIN_NEON(fn, args, mode, ...)  CV_CPU_CALL_NEON(fn, args); __CV_EXPAND(__CV_CPU_DISPATCH_CHAIN_ ## mode(fn, args, __VA_ARGS__))
 
+#if !defined CV_DISABLE_OPTIMIZATION && defined CV_ENABLE_INTRINSICS && defined CV_CPU_COMPILE_NEON_DOTPROD
+#  define CV_TRY_NEON_DOTPROD 1
+#  define CV_CPU_FORCE_NEON_DOTPROD 1
+#  define CV_CPU_HAS_SUPPORT_NEON_DOTPROD 1
+#  define CV_CPU_CALL_NEON_DOTPROD(fn, args) return (cpu_baseline::fn args)
+#  define CV_CPU_CALL_NEON_DOTPROD_(fn, args) return (opt_NEON_DOTPROD::fn args)
+#elif !defined CV_DISABLE_OPTIMIZATION && defined CV_ENABLE_INTRINSICS && defined CV_CPU_DISPATCH_COMPILE_NEON_DOTPROD
+#  define CV_TRY_NEON_DOTPROD 1
+#  define CV_CPU_FORCE_NEON_DOTPROD 0
+#  define CV_CPU_HAS_SUPPORT_NEON_DOTPROD (cv::checkHardwareSupport(CV_CPU_NEON_DOTPROD))
+#  define CV_CPU_CALL_NEON_DOTPROD(fn, args) if (CV_CPU_HAS_SUPPORT_NEON_DOTPROD) return (opt_NEON_DOTPROD::fn args)
+#  define CV_CPU_CALL_NEON_DOTPROD_(fn, args) if (CV_CPU_HAS_SUPPORT_NEON_DOTPROD) return (opt_NEON_DOTPROD::fn args)
+#else
+#  define CV_TRY_NEON_DOTPROD 0
+#  define CV_CPU_FORCE_NEON_DOTPROD 0
+#  define CV_CPU_HAS_SUPPORT_NEON_DOTPROD 0
+#  define CV_CPU_CALL_NEON_DOTPROD(fn, args)
+#  define CV_CPU_CALL_NEON_DOTPROD_(fn, args)
+#endif
+#define __CV_CPU_DISPATCH_CHAIN_NEON_DOTPROD(fn, args, mode, ...)  CV_CPU_CALL_NEON_DOTPROD(fn, args); __CV_EXPAND(__CV_CPU_DISPATCH_CHAIN_ ## mode(fn, args, __VA_ARGS__))
+
+#if !defined CV_DISABLE_OPTIMIZATION && defined CV_ENABLE_INTRINSICS && defined CV_CPU_COMPILE_NEON_FP16
+#  define CV_TRY_NEON_FP16 1
+#  define CV_CPU_FORCE_NEON_FP16 1
+#  define CV_CPU_HAS_SUPPORT_NEON_FP16 1
+#  define CV_CPU_CALL_NEON_FP16(fn, args) return (cpu_baseline::fn args)
+#  define CV_CPU_CALL_NEON_FP16_(fn, args) return (opt_NEON_FP16::fn args)
+#elif !defined CV_DISABLE_OPTIMIZATION && defined CV_ENABLE_INTRINSICS && defined CV_CPU_DISPATCH_COMPILE_NEON_FP16
+#  define CV_TRY_NEON_FP16 1
+#  define CV_CPU_FORCE_NEON_FP16 0
+#  define CV_CPU_HAS_SUPPORT_NEON_FP16 (cv::checkHardwareSupport(CV_CPU_NEON_FP16))
+#  define CV_CPU_CALL_NEON_FP16(fn, args) if (CV_CPU_HAS_SUPPORT_NEON_FP16) return (opt_NEON_FP16::fn args)
+#  define CV_CPU_CALL_NEON_FP16_(fn, args) if (CV_CPU_HAS_SUPPORT_NEON_FP16) return (opt_NEON_FP16::fn args)
+#else
+#  define CV_TRY_NEON_FP16 0
+#  define CV_CPU_FORCE_NEON_FP16 0
+#  define CV_CPU_HAS_SUPPORT_NEON_FP16 0
+#  define CV_CPU_CALL_NEON_FP16(fn, args)
+#  define CV_CPU_CALL_NEON_FP16_(fn, args)
+#endif
+#define __CV_CPU_DISPATCH_CHAIN_NEON_FP16(fn, args, mode, ...)  CV_CPU_CALL_NEON_FP16(fn, args); __CV_EXPAND(__CV_CPU_DISPATCH_CHAIN_ ## mode(fn, args, __VA_ARGS__))
+
+#if !defined CV_DISABLE_OPTIMIZATION && defined CV_ENABLE_INTRINSICS && defined CV_CPU_COMPILE_NEON_BF16
+#  define CV_TRY_NEON_BF16 1
+#  define CV_CPU_FORCE_NEON_BF16 1
+#  define CV_CPU_HAS_SUPPORT_NEON_BF16 1
+#  define CV_CPU_CALL_NEON_BF16(fn, args) return (cpu_baseline::fn args)
+#  define CV_CPU_CALL_NEON_BF16_(fn, args) return (opt_NEON_BF16::fn args)
+#elif !defined CV_DISABLE_OPTIMIZATION && defined CV_ENABLE_INTRINSICS && defined CV_CPU_DISPATCH_COMPILE_NEON_BF16
+#  define CV_TRY_NEON_BF16 1
+#  define CV_CPU_FORCE_NEON_BF16 0
+#  define CV_CPU_HAS_SUPPORT_NEON_BF16 (cv::checkHardwareSupport(CV_CPU_NEON_BF16))
+#  define CV_CPU_CALL_NEON_BF16(fn, args) if (CV_CPU_HAS_SUPPORT_NEON_BF16) return (opt_NEON_BF16::fn args)
+#  define CV_CPU_CALL_NEON_BF16_(fn, args) if (CV_CPU_HAS_SUPPORT_NEON_BF16) return (opt_NEON_BF16::fn args)
+#else
+#  define CV_TRY_NEON_BF16 0
+#  define CV_CPU_FORCE_NEON_BF16 0
+#  define CV_CPU_HAS_SUPPORT_NEON_BF16 0
+#  define CV_CPU_CALL_NEON_BF16(fn, args)
+#  define CV_CPU_CALL_NEON_BF16_(fn, args)
+#endif
+#define __CV_CPU_DISPATCH_CHAIN_NEON_BF16(fn, args, mode, ...)  CV_CPU_CALL_NEON_BF16(fn, args); __CV_EXPAND(__CV_CPU_DISPATCH_CHAIN_ ## mode(fn, args, __VA_ARGS__))
+
 #if !defined CV_DISABLE_OPTIMIZATION && defined CV_ENABLE_INTRINSICS && defined CV_CPU_COMPILE_MSA
 #  define CV_TRY_MSA 1
 #  define CV_CPU_FORCE_MSA 1
@@ -504,5 +567,47 @@
 #endif
 #define __CV_CPU_DISPATCH_CHAIN_RVV(fn, args, mode, ...)  CV_CPU_CALL_RVV(fn, args); __CV_EXPAND(__CV_CPU_DISPATCH_CHAIN_ ## mode(fn, args, __VA_ARGS__))
 
+#if !defined CV_DISABLE_OPTIMIZATION && defined CV_ENABLE_INTRINSICS && defined CV_CPU_COMPILE_LSX
+#  define CV_TRY_LSX 1
+#  define CV_CPU_FORCE_LSX 1
+#  define CV_CPU_HAS_SUPPORT_LSX 1
+#  define CV_CPU_CALL_LSX(fn, args) return (cpu_baseline::fn args)
+#  define CV_CPU_CALL_LSX_(fn, args) return (opt_LSX::fn args)
+#elif !defined CV_DISABLE_OPTIMIZATION && defined CV_ENABLE_INTRINSICS && defined CV_CPU_DISPATCH_COMPILE_LSX
+#  define CV_TRY_LSX 1
+#  define CV_CPU_FORCE_LSX 0
+#  define CV_CPU_HAS_SUPPORT_LSX (cv::checkHardwareSupport(CV_CPU_LSX))
+#  define CV_CPU_CALL_LSX(fn, args) if (CV_CPU_HAS_SUPPORT_LSX) return (opt_LSX::fn args)
+#  define CV_CPU_CALL_LSX_(fn, args) if (CV_CPU_HAS_SUPPORT_LSX) return (opt_LSX::fn args)
+#else
+#  define CV_TRY_LSX 0
+#  define CV_CPU_FORCE_LSX 0
+#  define CV_CPU_HAS_SUPPORT_LSX 0
+#  define CV_CPU_CALL_LSX(fn, args)
+#  define CV_CPU_CALL_LSX_(fn, args)
+#endif
+#define __CV_CPU_DISPATCH_CHAIN_LSX(fn, args, mode, ...)  CV_CPU_CALL_LSX(fn, args); __CV_EXPAND(__CV_CPU_DISPATCH_CHAIN_ ## mode(fn, args, __VA_ARGS__))
+
+#if !defined CV_DISABLE_OPTIMIZATION && defined CV_ENABLE_INTRINSICS && defined CV_CPU_COMPILE_LASX
+#  define CV_TRY_LASX 1
+#  define CV_CPU_FORCE_LASX 1
+#  define CV_CPU_HAS_SUPPORT_LASX 1
+#  define CV_CPU_CALL_LASX(fn, args) return (cpu_baseline::fn args)
+#  define CV_CPU_CALL_LASX_(fn, args) return (opt_LASX::fn args)
+#elif !defined CV_DISABLE_OPTIMIZATION && defined CV_ENABLE_INTRINSICS && defined CV_CPU_DISPATCH_COMPILE_LASX
+#  define CV_TRY_LASX 1
+#  define CV_CPU_FORCE_LASX 0
+#  define CV_CPU_HAS_SUPPORT_LASX (cv::checkHardwareSupport(CV_CPU_LASX))
+#  define CV_CPU_CALL_LASX(fn, args) if (CV_CPU_HAS_SUPPORT_LASX) return (opt_LASX::fn args)
+#  define CV_CPU_CALL_LASX_(fn, args) if (CV_CPU_HAS_SUPPORT_LASX) return (opt_LASX::fn args)
+#else
+#  define CV_TRY_LASX 0
+#  define CV_CPU_FORCE_LASX 0
+#  define CV_CPU_HAS_SUPPORT_LASX 0
+#  define CV_CPU_CALL_LASX(fn, args)
+#  define CV_CPU_CALL_LASX_(fn, args)
+#endif
+#define __CV_CPU_DISPATCH_CHAIN_LASX(fn, args, mode, ...)  CV_CPU_CALL_LASX(fn, args); __CV_EXPAND(__CV_CPU_DISPATCH_CHAIN_ ## mode(fn, args, __VA_ARGS__))
+
 #define CV_CPU_CALL_BASELINE(fn, args) return (cpu_baseline::fn args)
 #define __CV_CPU_DISPATCH_CHAIN_BASELINE(fn, args, mode, ...)  CV_CPU_CALL_BASELINE(fn, args) /* last in sequence */
diff --git a/3rdParty/opencv2/core/cvdef.h b/3rdParty/opencv-4.12.0/opencv2/core/cvdef.h
similarity index 87%
rename from 3rdParty/opencv2/core/cvdef.h
rename to 3rdParty/opencv-4.12.0/opencv2/core/cvdef.h
index 51274637b6..60e5cd5775 100644
--- a/3rdParty/opencv2/core/cvdef.h
+++ b/3rdParty/opencv-4.12.0/opencv2/core/cvdef.h
@@ -201,6 +201,14 @@ namespace cv {
 #  define CV_ICC   __INTEL_COMPILER
 #endif
 
+#if defined _WIN32
+#  define CV_CDECL __cdecl
+#  define CV_STDCALL __stdcall
+#else
+#  define CV_CDECL
+#  define CV_STDCALL
+#endif
+
 #ifndef CV_INLINE
 #  if defined __cplusplus
 #    define CV_INLINE static inline
@@ -268,6 +276,9 @@ namespace cv {
 #define CV_CPU_AVX_5124FMAPS    27
 
 #define CV_CPU_NEON             100
+#define CV_CPU_NEON_DOTPROD     101
+#define CV_CPU_NEON_FP16        102
+#define CV_CPU_NEON_BF16        103
 
 #define CV_CPU_MSA              150
 
@@ -278,6 +289,9 @@ namespace cv {
 
 #define CV_CPU_RVV              210
 
+#define CV_CPU_LSX              230
+#define CV_CPU_LASX             231
+
 // CPU features groups
 #define CV_CPU_AVX512_SKX       256
 #define CV_CPU_AVX512_COMMON    257
@@ -324,6 +338,9 @@ enum CpuFeatures {
     CPU_AVX_5124FMAPS   = 27,
 
     CPU_NEON            = 100,
+    CPU_NEON_DOTPROD    = 101,
+    CPU_NEON_FP16       = 102,
+    CPU_NEON_BF16       = 103,
 
     CPU_MSA             = 150,
 
@@ -334,6 +351,9 @@ enum CpuFeatures {
 
     CPU_RVV             = 210,
 
+    CPU_LSX             = 230,
+    CPU_LASX            = 231,
+
     CPU_AVX512_SKX      = 256, //!< Skylake-X with AVX-512F/CD/BW/DQ/VL
     CPU_AVX512_COMMON   = 257, //!< Common instructions AVX-512F/CD for all CPUs that support AVX-512
     CPU_AVX512_KNL      = 258, //!< Knights Landing with AVX-512F/CD/ER/PF
@@ -348,7 +368,7 @@ enum CpuFeatures {
 
 #include "cv_cpu_dispatch.h"
 
-#if !defined(CV_STRONG_ALIGNMENT) && defined(__arm__) && !(defined(__aarch64__) || defined(_M_ARM64))
+#if !defined(CV_STRONG_ALIGNMENT) && defined(__arm__) && !(defined(__aarch64__) || defined(_M_ARM64) || defined(_M_ARM64EC))
 // int*, int64* should be propertly aligned pointers on ARMv7
 #define CV_STRONG_ALIGNMENT 1
 #endif
@@ -453,20 +473,25 @@ Cv64suf;
 #define CV_EXPORTS_W_SIMPLE CV_EXPORTS
 #define CV_EXPORTS_AS(synonym) CV_EXPORTS
 #define CV_EXPORTS_W_MAP CV_EXPORTS
+#define CV_EXPORTS_W_PARAMS CV_EXPORTS
 #define CV_IN_OUT
 #define CV_OUT
 #define CV_PROP
 #define CV_PROP_RW
+#define CV_ND // Indicates that input data should be parsed into Mat without channels
 #define CV_WRAP
 #define CV_WRAP_AS(synonym)
 #define CV_WRAP_MAPPABLE(mappable)
 #define CV_WRAP_PHANTOM(phantom_header)
 #define CV_WRAP_DEFAULT(val)
+/* Indicates that the function parameter has filesystem path semantic */
+#define CV_WRAP_FILE_PATH
 
 /****************************************************************************************\
 *                                  Matrix type (Mat)                                     *
 \****************************************************************************************/
 
+#define CV_MAX_DIM              32
 #define CV_MAT_CN_MASK          ((CV_CN_MAX - 1) << CV_CN_SHIFT)
 #define CV_MAT_CN(flags)        ((((flags) & CV_MAT_CN_MASK) >> CV_CN_SHIFT) + 1)
 #define CV_MAT_TYPE_MASK        (CV_DEPTH_MAX*CV_CN_MAX - 1)
@@ -493,6 +518,13 @@ Cv64suf;
 #  define MAX(a,b)  ((a) < (b) ? (b) : (a))
 #endif
 
+/** min & max without jumps */
+#define CV_IMIN(a, b)  ((a) ^ (((a)^(b)) & (((a) < (b)) - 1)))
+#define CV_IMAX(a, b)  ((a) ^ (((a)^(b)) & (((a) > (b)) - 1)))
+#define CV_SWAP(a,b,t) ((t) = (a), (a) = (b), (b) = (t))
+#define CV_CMP(a,b)    (((a) > (b)) - ((a) < (b)))
+#define CV_SIGN(a)     CV_CMP((a),0)
+
 ///////////////////////////////////////// Enum operators ///////////////////////////////////////
 
 /**
@@ -665,7 +697,7 @@ __CV_ENUM_FLAGS_BITWISE_XOR_EQ   (EnumType, EnumType)
 #ifdef CV_XADD
   // allow to use user-defined macro
 #elif defined __GNUC__ || defined __clang__
-#  if defined __clang__ && __clang_major__ >= 3 && !defined __ANDROID__ && !defined __EMSCRIPTEN__ && !defined(__CUDACC__)  && !defined __INTEL_COMPILER
+#  if defined __clang__ && __clang_major__ >= 3 && !defined __EMSCRIPTEN__ && !defined __INTEL_COMPILER
 #    ifdef __ATOMIC_ACQ_REL
 #      define CV_XADD(addr, delta) __c11_atomic_fetch_add((_Atomic(int)*)(addr), delta, __ATOMIC_ACQ_REL)
 #    else
@@ -715,7 +747,11 @@ __CV_ENUM_FLAGS_BITWISE_XOR_EQ   (EnumType, EnumType)
 #    define __has_cpp_attribute(__x) 0
 #  endif
 #  if __has_cpp_attribute(nodiscard)
-#    define CV_NODISCARD_STD [[nodiscard]]
+#    if defined(__NVCC__) && __CUDACC_VER_MAJOR__ < 12
+#       define CV_NODISCARD_STD
+#    else
+#       define CV_NODISCARD_STD [[nodiscard]]
+#    endif
 #  elif __cplusplus >= 201703L
 //   available when compiler is C++17 compliant
 #    define CV_NODISCARD_STD [[nodiscard]]
@@ -738,88 +774,43 @@ __CV_ENUM_FLAGS_BITWISE_XOR_EQ   (EnumType, EnumType)
 
 
 /****************************************************************************************\
-*                      CV_NODISCARD attribute (deprecated, GCC only)                     *
-* DONT USE: use instead the standard CV_NODISCARD_STD macro above                        *
-*           this legacy method silently fails to issue warning until some version        *
-*           after gcc 6.3.0. Yet with gcc 7+ you can use the above standard method       *
-*           which makes this method useless. Don't use it.                               *
-* @deprecated use instead CV_NODISCARD_STD                                               *
+*                                    C++ 11                                              *
 \****************************************************************************************/
-#ifndef CV_NODISCARD
-#  if defined(__GNUC__)
-#    define CV_NODISCARD __attribute__((__warn_unused_result__))
-#  elif defined(__clang__) && defined(__has_attribute)
-#    if __has_attribute(__warn_unused_result__)
-#      define CV_NODISCARD __attribute__((__warn_unused_result__))
+#ifdef __cplusplus
+// MSVC was stuck at __cplusplus == 199711L for a long time, even where it supports C++11,
+// so check _MSC_VER instead. See:
+// <https://devblogs.microsoft.com/cppblog/msvc-now-correctly-reports-__cplusplus>
+#  if defined(_MSC_VER)
+#    if _MSC_VER < 1800
+#      error "OpenCV 4.x+ requires enabled C++11 support"
 #    endif
+#  elif __cplusplus < 201103L
+#    error "OpenCV 4.x+ requires enabled C++11 support"
 #  endif
 #endif
-#ifndef CV_NODISCARD
-#  define CV_NODISCARD /* nothing by default */
-#endif
-
 
-/****************************************************************************************\
-*                                    C++ 11                                              *
-\****************************************************************************************/
-#ifndef CV_CXX11
-#  if __cplusplus >= 201103L || (defined(_MSC_VER) && _MSC_VER >= 1800)
-#    define CV_CXX11 1
-#  endif
-#else
-#  if CV_CXX11 == 0
-#    undef CV_CXX11
-#  endif
-#endif
 #ifndef CV_CXX11
-#  error "OpenCV 4.x+ requires enabled C++11 support"
+#  define CV_CXX11 1
 #endif
 
-#define CV_CXX_MOVE_SEMANTICS 1
-#define CV_CXX_MOVE(x) std::move(x)
-#define CV_CXX_STD_ARRAY 1
-#include <array>
 #ifndef CV_OVERRIDE
 #  define CV_OVERRIDE override
 #endif
+
 #ifndef CV_FINAL
 #  define CV_FINAL final
 #endif
 
 #ifndef CV_NOEXCEPT
-#  if __cplusplus >= 201103L || (defined(_MSC_VER) && _MSC_VER >= 1900/*MSVS 2015*/)
-#    define CV_NOEXCEPT noexcept
-#  endif
-#endif
-#ifndef CV_NOEXCEPT
-#  define CV_NOEXCEPT
+#  define CV_NOEXCEPT noexcept
 #endif
 
 #ifndef CV_CONSTEXPR
-#  if __cplusplus >= 201103L || (defined(_MSC_VER) && _MSC_VER >= 1900/*MSVS 2015*/)
-#    define CV_CONSTEXPR constexpr
-#  endif
-#endif
-#ifndef CV_CONSTEXPR
-#  define CV_CONSTEXPR
+#  define CV_CONSTEXPR constexpr
 #endif
 
-// Integer types portatibility
-#ifdef OPENCV_STDINT_HEADER
-#include OPENCV_STDINT_HEADER
-#elif defined(__cplusplus)
-#if defined(_MSC_VER) && _MSC_VER < 1600 /* MSVS 2010 */
-namespace cv {
-typedef signed char int8_t;
-typedef unsigned char uint8_t;
-typedef signed short int16_t;
-typedef unsigned short uint16_t;
-typedef signed int int32_t;
-typedef unsigned int uint32_t;
-typedef signed __int64 int64_t;
-typedef unsigned __int64 uint64_t;
-}
-#elif defined(_MSC_VER) || __cplusplus >= 201103L
+// Integer types portability
+#ifdef __cplusplus
 #include <cstdint>
 namespace cv {
 using std::int8_t;
@@ -831,19 +822,6 @@ using std::uint32_t;
 using std::int64_t;
 using std::uint64_t;
 }
-#else
-#include <stdint.h>
-namespace cv {
-typedef ::int8_t int8_t;
-typedef ::uint8_t uint8_t;
-typedef ::int16_t int16_t;
-typedef ::uint16_t uint16_t;
-typedef ::int32_t int32_t;
-typedef ::uint32_t uint32_t;
-typedef ::int64_t int64_t;
-typedef ::uint64_t uint64_t;
-}
-#endif
 #else // pure C
 #include <stdint.h>
 #endif
@@ -852,42 +830,22 @@ typedef ::uint64_t uint64_t;
 namespace cv
 {
 
-class float16_t
+class hfloat
 {
 public:
 #if CV_FP16_TYPE
 
-    float16_t() : h(0) {}
-    explicit float16_t(float x) { h = (__fp16)x; }
+    hfloat() : h(0) {}
+    explicit hfloat(float x) { h = (__fp16)x; }
     operator float() const { return (float)h; }
-    static float16_t fromBits(ushort w)
-    {
-        Cv16suf u;
-        u.u = w;
-        float16_t result;
-        result.h = u.h;
-        return result;
-    }
-    static float16_t zero()
-    {
-        float16_t result;
-        result.h = (__fp16)0;
-        return result;
-    }
-    ushort bits() const
-    {
-        Cv16suf u;
-        u.h = h;
-        return u.u;
-    }
 protected:
     __fp16 h;
 
 #else
-    float16_t() : w(0) {}
-    explicit float16_t(float x)
+    hfloat() : w(0) {}
+    explicit hfloat(float x)
     {
-    #if CV_FP16
+    #if CV_FP16 && CV_AVX2
         __m128 v = _mm_load_ss(&x);
         w = (ushort)_mm_cvtsi128_si32(_mm_cvtps_ph(v, 0));
     #else
@@ -918,7 +876,7 @@ class float16_t
 
     operator float() const
     {
-    #if CV_FP16
+    #if CV_FP16 && CV_AVX2
         float f;
         _mm_store_ss(&f, _mm_cvtph_ps(_mm_cvtsi32_si128(w)));
         return f;
@@ -936,28 +894,51 @@ class float16_t
     #endif
     }
 
-    static float16_t fromBits(ushort b)
-    {
-        float16_t result;
-        result.w = b;
-        return result;
-    }
-    static float16_t zero()
-    {
-        float16_t result;
-        result.w = (ushort)0;
-        return result;
-    }
-    ushort bits() const { return w; }
 protected:
     ushort w;
 
 #endif
 };
 
+inline hfloat hfloatFromBits(ushort w) {
+#if CV_FP16_TYPE
+    Cv16suf u;
+    u.u = w;
+    hfloat res(float(u.h));
+    return res;
+#else
+    Cv32suf out;
+
+    unsigned t = ((w & 0x7fff) << 13) + 0x38000000;
+    unsigned sign = (w & 0x8000) << 16;
+    unsigned e = w & 0x7c00;
+
+    out.u = t + (1 << 23);
+    out.u = (e >= 0x7c00 ? t + 0x38000000 :
+            e == 0 ? (static_cast<void>(out.f -= 6.103515625e-05f), out.u) : t) | sign;
+    hfloat res(out.f);
+    return res;
+#endif
 }
+
+#if !defined(__OPENCV_BUILD) && !(defined __STDCPP_FLOAT16_T__) && !(defined __ARM_NEON)
+typedef hfloat float16_t;
 #endif
 
+}
+#endif
+
+/** @brief Constructs the 'fourcc' code, used in video codecs and many other places.
+    Simply call it with 4 chars like `CV_FOURCC('I', 'Y', 'U', 'V')`
+*/
+CV_INLINE int CV_FOURCC(char c1, char c2, char c3, char c4)
+{
+    return (c1 & 255) + ((c2 & 255) << 8) + ((c3 & 255) << 16) + ((c4 & 255) << 24);
+}
+
+//! Macro to construct the fourcc code of the codec. Same as CV_FOURCC()
+#define CV_FOURCC_MACRO(c1, c2, c3, c4) (((c1) & 255) + (((c2) & 255) << 8) + (((c3) & 255) << 16) + (((c4) & 255) << 24))
+
 //! @}
 
 #ifndef __cplusplus
diff --git a/3rdParty/opencv2/core/cvstd.hpp b/3rdParty/opencv-4.12.0/opencv2/core/cvstd.hpp
similarity index 96%
rename from 3rdParty/opencv2/core/cvstd.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/cvstd.hpp
index 70fb97d8dd..1946f2521f 100644
--- a/3rdParty/opencv2/core/cvstd.hpp
+++ b/3rdParty/opencv-4.12.0/opencv2/core/cvstd.hpp
@@ -140,7 +140,6 @@ template<typename _Tp> class Allocator
 
 //! @} core_utils
 
-//! @endcond
 
 //! @addtogroup core_basic
 //! @{
diff --git a/3rdParty/opencv2/core/cvstd.inl.hpp b/3rdParty/opencv-4.12.0/opencv2/core/cvstd.inl.hpp
similarity index 100%
rename from 3rdParty/opencv2/core/cvstd.inl.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/cvstd.inl.hpp
diff --git a/3rdParty/opencv2/core/cvstd_wrapper.hpp b/3rdParty/opencv-4.12.0/opencv2/core/cvstd_wrapper.hpp
similarity index 100%
rename from 3rdParty/opencv2/core/cvstd_wrapper.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/cvstd_wrapper.hpp
diff --git a/3rdParty/opencv2/core/detail/async_promise.hpp b/3rdParty/opencv-4.12.0/opencv2/core/detail/async_promise.hpp
similarity index 94%
rename from 3rdParty/opencv2/core/detail/async_promise.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/detail/async_promise.hpp
index 113e494e94..811a24324f 100644
--- a/3rdParty/opencv2/core/detail/async_promise.hpp
+++ b/3rdParty/opencv-4.12.0/opencv2/core/detail/async_promise.hpp
@@ -52,10 +52,8 @@ class CV_EXPORTS AsyncPromise
     */
     void setException(const cv::Exception& exception);
 
-#ifdef CV_CXX11
     explicit AsyncPromise(AsyncPromise&& o) { p = o.p; o.p = NULL; }
     AsyncPromise& operator=(AsyncPromise&& o) CV_NOEXCEPT { std::swap(p, o.p); return *this; }
-#endif
 
 
     // PImpl
diff --git a/3rdParty/opencv2/core/detail/dispatch_helper.impl.hpp b/3rdParty/opencv-4.12.0/opencv2/core/detail/dispatch_helper.impl.hpp
similarity index 100%
rename from 3rdParty/opencv2/core/detail/dispatch_helper.impl.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/detail/dispatch_helper.impl.hpp
diff --git a/3rdParty/opencv-4.12.0/opencv2/core/detail/exception_ptr.hpp b/3rdParty/opencv-4.12.0/opencv2/core/detail/exception_ptr.hpp
new file mode 100644
index 0000000000..ed5c40f24f
--- /dev/null
+++ b/3rdParty/opencv-4.12.0/opencv2/core/detail/exception_ptr.hpp
@@ -0,0 +1,21 @@
+// This file is part of OpenCV project.
+// It is subject to the license terms in the LICENSE file found in the top-level directory
+// of this distribution and at http://opencv.org/license.html.
+
+#ifndef OPENCV_CORE_DETAILS_EXCEPTION_PTR_H
+#define OPENCV_CORE_DETAILS_EXCEPTION_PTR_H
+
+#ifndef CV__EXCEPTION_PTR
+#  if defined(__ANDROID__) && defined(ATOMIC_INT_LOCK_FREE) && ATOMIC_INT_LOCK_FREE < 2
+#    define CV__EXCEPTION_PTR 0  // Not supported, details: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58938
+#  else
+#    define CV__EXCEPTION_PTR 1
+#  endif
+#endif
+#ifndef CV__EXCEPTION_PTR
+#  define CV__EXCEPTION_PTR 0
+#elif CV__EXCEPTION_PTR
+#  include <exception>  // std::exception_ptr
+#endif
+
+#endif // OPENCV_CORE_DETAILS_EXCEPTION_PTR_H
diff --git a/3rdParty/opencv2/core/directx.hpp b/3rdParty/opencv-4.12.0/opencv2/core/directx.hpp
similarity index 100%
rename from 3rdParty/opencv2/core/directx.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/directx.hpp
diff --git a/3rdParty/opencv2/core/dualquaternion.hpp b/3rdParty/opencv-4.12.0/opencv2/core/dualquaternion.hpp
similarity index 97%
rename from 3rdParty/opencv2/core/dualquaternion.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/dualquaternion.hpp
index 788403179c..990ca101c6 100644
--- a/3rdParty/opencv2/core/dualquaternion.hpp
+++ b/3rdParty/opencv-4.12.0/opencv2/core/dualquaternion.hpp
@@ -30,7 +30,7 @@
 #include <opencv2/core/affine.hpp>
 
 namespace cv{
-//! @addtogroup core
+//! @addtogroup core_quaternion
 //! @{
 
 template <typename _Tp> class DualQuat;
diff --git a/3rdParty/opencv2/core/dualquaternion.inl.hpp b/3rdParty/opencv-4.12.0/opencv2/core/dualquaternion.inl.hpp
similarity index 96%
rename from 3rdParty/opencv2/core/dualquaternion.inl.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/dualquaternion.inl.hpp
index 22cc67c12b..6d3d1f0f2e 100644
--- a/3rdParty/opencv2/core/dualquaternion.inl.hpp
+++ b/3rdParty/opencv-4.12.0/opencv2/core/dualquaternion.inl.hpp
@@ -36,15 +36,15 @@
 namespace cv {
 
 template <typename T>
-DualQuat<T>::DualQuat():w(0), x(0), y(0), z(0), w_(0), x_(0), y_(0), z_(0){};
+DualQuat<T>::DualQuat():w(0), x(0), y(0), z(0), w_(0), x_(0), y_(0), z_(0){}
 
 template <typename T>
 DualQuat<T>::DualQuat(const T vw, const T vx, const T vy, const T vz, const T _w, const T _x, const T _y, const T _z):
-                      w(vw), x(vx), y(vy), z(vz), w_(_w), x_(_x), y_(_y), z_(_z){};
+                      w(vw), x(vx), y(vy), z(vz), w_(_w), x_(_x), y_(_y), z_(_z){}
 
 template <typename T>
 DualQuat<T>::DualQuat(const Vec<T, 8> &q):w(q[0]), x(q[1]), y(q[2]), z(q[3]),
-                                          w_(q[4]), x_(q[5]), y_(q[6]), z_(q[7]){};
+                                          w_(q[4]), x_(q[5]), y_(q[6]), z_(q[7]){}
 
 template <typename T>
 DualQuat<T> DualQuat<T>::createFromQuat(const Quat<T> &realPart, const Quat<T> &dualPart)
diff --git a/3rdParty/opencv2/core/eigen.hpp b/3rdParty/opencv-4.12.0/opencv2/core/eigen.hpp
similarity index 91%
rename from 3rdParty/opencv2/core/eigen.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/eigen.hpp
index 5e87988c54..ad3c84225f 100644
--- a/3rdParty/opencv2/core/eigen.hpp
+++ b/3rdParty/opencv-4.12.0/opencv2/core/eigen.hpp
@@ -52,15 +52,16 @@
 #include "opencv2/core.hpp"
 
 #if defined _MSC_VER && _MSC_VER >= 1200
+#ifndef NOMINMAX
 #define NOMINMAX // fix https://github.com/opencv/opencv/issues/17548
+#endif
 #pragma warning( disable: 4714 ) //__forceinline is not inlined
 #pragma warning( disable: 4127 ) //conditional expression is constant
 #pragma warning( disable: 4244 ) //conversion from '__int64' to 'int', possible loss of data
 #endif
 
 #if !defined(OPENCV_DISABLE_EIGEN_TENSOR_SUPPORT)
-#if EIGEN_WORLD_VERSION == 3 && EIGEN_MAJOR_VERSION >= 3 \
-    && defined(CV_CXX11) && defined(CV_CXX_STD_ARRAY)
+#if EIGEN_WORLD_VERSION == 3 && EIGEN_MAJOR_VERSION >= 3
 #include <unsupported/Eigen/CXX11/Tensor>
 #define OPENCV_EIGEN_TENSOR_SUPPORT 1
 #endif  // EIGEN_WORLD_VERSION == 3 && EIGEN_MAJOR_VERSION >= 3
@@ -286,6 +287,17 @@ void cv2eigen( const Mat& src,
     }
 }
 
+template<typename _Tp>  static inline
+void cv2eigen( const Mat& src,
+               Eigen::Matrix<_Tp, Eigen::Dynamic, Eigen::Dynamic, Eigen::RowMajor>& dst )
+{
+    CV_CheckEQ(src.dims, 2, "");
+    dst.resize(src.rows, src.cols);
+    const Mat _dst(src.rows, src.cols, traits::Type<_Tp>::value,
+             dst.data(), (size_t)(dst.outerStride()*sizeof(_Tp)));
+    src.convertTo(_dst, _dst.type());
+}
+
 // Matx case
 template<typename _Tp, int _rows, int _cols> static inline
 void cv2eigen( const Matx<_Tp, _rows, _cols>& src,
@@ -306,6 +318,17 @@ void cv2eigen( const Matx<_Tp, _rows, _cols>& src,
     }
 }
 
+template<typename _Tp, int _rows, int _cols> static inline
+void cv2eigen( const Matx<_Tp, _rows, _cols>& src,
+               Eigen::Matrix<_Tp, Eigen::Dynamic, Eigen::Dynamic, Eigen::RowMajor>& dst )
+{
+    CV_CheckEQ(src.dims, 2, "");
+    dst.resize(_rows, _cols);
+    const Mat _dst(_rows, _cols, traits::Type<_Tp>::value,
+                   dst.data(), (size_t)(dst.outerStride()*sizeof(_Tp)));
+    Mat(src).copyTo(_dst);
+}
+
 template<typename _Tp> static inline
 void cv2eigen( const Mat& src,
                Eigen::Matrix<_Tp, Eigen::Dynamic, 1>& dst )
diff --git a/3rdParty/opencv2/core/fast_math.hpp b/3rdParty/opencv-4.12.0/opencv2/core/fast_math.hpp
similarity index 80%
rename from 3rdParty/opencv2/core/fast_math.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/fast_math.hpp
index 9f0f1f9b9b..5e659b0155 100644
--- a/3rdParty/opencv2/core/fast_math.hpp
+++ b/3rdParty/opencv-4.12.0/opencv2/core/fast_math.hpp
@@ -68,7 +68,7 @@
   // nothing, intrinsics/asm code is not supported
 #else
   #if ((defined _MSC_VER && defined _M_X64) \
-      || (defined __GNUC__ && defined __x86_64__ && defined __SSE2__)) \
+      || (defined __GNUC__ && defined __SSE2__)) \
       && !defined(OPENCV_SKIP_INCLUDE_EMMINTRIN_H)
     #include <emmintrin.h>
   #endif
@@ -84,7 +84,7 @@
   #if defined(CV_INLINE_ROUND_FLT)
     // user-specified version
     // CV_INLINE_ROUND_DBL should be defined too
-  #elif defined __GNUC__ && defined __arm__ && (defined __ARM_PCS_VFP || defined __ARM_VFPV3__ || defined __ARM_NEON__) && !defined __SOFTFP__
+  #elif defined __GNUC__ && defined __arm__ && (defined __ARM_PCS_VFP || defined __ARM_VFPV3__ || defined __ARM_NEON) && !defined __SOFTFP__
     // 1. general scheme
     #define ARM_ROUND(_value, _asm_string) \
         int res; \
@@ -201,9 +201,7 @@ cvRound( double value )
 {
 #if defined CV_INLINE_ROUND_DBL
     CV_INLINE_ROUND_DBL(value);
-#elif ((defined _MSC_VER && defined _M_X64) || (defined __GNUC__ && defined __x86_64__ \
-    && defined __SSE2__ && !defined __APPLE__) || CV_SSE2) \
-    && !defined(__CUDACC__)
+#elif ((defined _MSC_VER && defined _M_X64) || (defined __GNUC__ && defined __SSE2__)) && !defined(__CUDACC__)
     __m128d t = _mm_set_sd( value );
     return _mm_cvtsd_si32(t);
 #elif defined _MSC_VER && defined _M_IX86
@@ -214,12 +212,11 @@ cvRound( double value )
         fistp t;
     }
     return t;
-#elif defined CV_ICC || defined __GNUC__
-    return (int)(lrint(value));
+#elif defined CV__FASTMATH_ENABLE_GCC_MATH_BUILTINS || \
+      defined CV__FASTMATH_ENABLE_CLANG_MATH_BUILTINS
+    return (int)__builtin_lrint(value);
 #else
-    /* it's ok if round does not comply with IEEE754 standard;
-       the tests should allow +/-1 difference when the tested functions use round */
-    return (int)(value + (value >= 0 ? 0.5 : -0.5));
+    return (int)lrint(value);
 #endif
 }
 
@@ -233,11 +230,18 @@ cvRound( double value )
  */
 CV_INLINE int cvFloor( double value )
 {
-#if (defined CV__FASTMATH_ENABLE_GCC_MATH_BUILTINS || defined CV__FASTMATH_ENABLE_CLANG_MATH_BUILTINS) \
-    && ( \
-        defined(__PPC64__) \
-    )
-    return __builtin_floor(value);
+#if defined CV__FASTMATH_ENABLE_GCC_MATH_BUILTINS || \
+    defined CV__FASTMATH_ENABLE_CLANG_MATH_BUILTINS
+    return (int)__builtin_floor(value);
+#elif defined __loongarch64
+    int i;
+    double tmp;
+    __asm__ ("ftintrm.l.d     %[tmp],    %[in]       \n\t"
+             "movfr2gr.d      %[i],      %[tmp]      \n\t"
+             : [i] "=r" (i), [tmp] "=f" (tmp)
+             : [in] "f" (value)
+             :);
+    return i;
 #else
     int i = (int)value;
     return i - (i > value);
@@ -253,11 +257,18 @@ CV_INLINE int cvFloor( double value )
  */
 CV_INLINE int cvCeil( double value )
 {
-#if (defined CV__FASTMATH_ENABLE_GCC_MATH_BUILTINS || defined CV__FASTMATH_ENABLE_CLANG_MATH_BUILTINS) \
-    && ( \
-        defined(__PPC64__) \
-    )
-    return __builtin_ceil(value);
+#if defined CV__FASTMATH_ENABLE_GCC_MATH_BUILTINS || \
+    defined CV__FASTMATH_ENABLE_CLANG_MATH_BUILTINS
+    return (int)__builtin_ceil(value);
+#elif defined __loongarch64
+    int i;
+    double tmp;
+    __asm__ ("ftintrp.l.d     %[tmp],    %[in]       \n\t"
+             "movfr2gr.d      %[i],      %[tmp]      \n\t"
+             : [i] "=r" (i), [tmp] "=f" (tmp)
+             : [in] "f" (value)
+             :);
+    return i;
 #else
     int i = (int)value;
     return i + (i < value);
@@ -292,10 +303,10 @@ CV_INLINE int cvIsInf( double value )
 {
 #if defined CV_INLINE_ISINF_DBL
     CV_INLINE_ISINF_DBL(value);
-#elif defined(__x86_64__) || defined(_M_X64) || defined(__aarch64__) || defined(_M_ARM64) || defined(__PPC64__)
+#elif defined(__x86_64__) || defined(_M_X64) || defined(__aarch64__) || defined(_M_ARM64) || defined(_M_ARM64EC) || defined(__PPC64__) || defined(__loongarch64)
     Cv64suf ieee754;
     ieee754.f = value;
-    return (ieee754.u & 0x7fffffff00000000) ==
+    return (ieee754.u & 0x7fffffffffffffff) ==
                         0x7ff0000000000000;
 #else
     Cv64suf ieee754;
@@ -312,9 +323,7 @@ CV_INLINE int cvRound(float value)
 {
 #if defined CV_INLINE_ROUND_FLT
     CV_INLINE_ROUND_FLT(value);
-#elif ((defined _MSC_VER && defined _M_X64) || (defined __GNUC__ && defined __x86_64__ \
-    && defined __SSE2__ && !defined __APPLE__) || CV_SSE2) \
-    && !defined(__CUDACC__)
+#elif ((defined _MSC_VER && defined _M_X64) || (defined __GNUC__ && defined __SSE2__)) && !defined(__CUDACC__)
     __m128 t = _mm_set_ss( value );
     return _mm_cvtss_si32(t);
 #elif defined _MSC_VER && defined _M_IX86
@@ -325,12 +334,11 @@ CV_INLINE int cvRound(float value)
         fistp t;
     }
     return t;
-#elif defined CV_ICC || defined __GNUC__
-    return (int)(lrintf(value));
+#elif defined CV__FASTMATH_ENABLE_GCC_MATH_BUILTINS || \
+      defined CV__FASTMATH_ENABLE_CLANG_MATH_BUILTINS
+    return (int)__builtin_lrintf(value);
 #else
-    /* it's ok if round does not comply with IEEE754 standard;
-     the tests should allow +/-1 difference when the tested functions use round */
-    return (int)(value + (value >= 0 ? 0.5f : -0.5f));
+    return (int)lrintf(value);
 #endif
 }
 
@@ -343,11 +351,18 @@ CV_INLINE int cvRound( int value )
 /** @overload */
 CV_INLINE int cvFloor( float value )
 {
-#if (defined CV__FASTMATH_ENABLE_GCC_MATH_BUILTINS || defined CV__FASTMATH_ENABLE_CLANG_MATH_BUILTINS) \
-    && ( \
-        defined(__PPC64__) \
-    )
-    return __builtin_floorf(value);
+#if defined CV__FASTMATH_ENABLE_GCC_MATH_BUILTINS || \
+    defined CV__FASTMATH_ENABLE_CLANG_MATH_BUILTINS
+    return (int)__builtin_floorf(value);
+#elif defined __loongarch__
+    int i;
+    float tmp;
+    __asm__ ("ftintrm.w.s     %[tmp],    %[in]       \n\t"
+             "movfr2gr.s      %[i],      %[tmp]      \n\t"
+             : [i] "=r" (i), [tmp] "=f" (tmp)
+             : [in] "f" (value)
+             :);
+    return i;
 #else
     int i = (int)value;
     return i - (i > value);
@@ -363,11 +378,18 @@ CV_INLINE int cvFloor( int value )
 /** @overload */
 CV_INLINE int cvCeil( float value )
 {
-#if (defined CV__FASTMATH_ENABLE_GCC_MATH_BUILTINS || defined CV__FASTMATH_ENABLE_CLANG_MATH_BUILTINS) \
-    && ( \
-        defined(__PPC64__) \
-    )
-    return __builtin_ceilf(value);
+#if defined CV__FASTMATH_ENABLE_GCC_MATH_BUILTINS || \
+    defined CV__FASTMATH_ENABLE_CLANG_MATH_BUILTINS
+    return (int)__builtin_ceilf(value);
+#elif defined __loongarch__
+    int i;
+    float tmp;
+    __asm__ ("ftintrp.w.s     %[tmp],    %[in]       \n\t"
+             "movfr2gr.s      %[i],      %[tmp]      \n\t"
+             : [i] "=r" (i), [tmp] "=f" (tmp)
+             : [in] "f" (value)
+             :);
+    return i;
 #else
     int i = (int)value;
     return i + (i < value);
diff --git a/3rdParty/opencv-4.12.0/opencv2/core/hal/hal.hpp b/3rdParty/opencv-4.12.0/opencv2/core/hal/hal.hpp
new file mode 100644
index 0000000000..34505515c0
--- /dev/null
+++ b/3rdParty/opencv-4.12.0/opencv2/core/hal/hal.hpp
@@ -0,0 +1,260 @@
+/*M///////////////////////////////////////////////////////////////////////////////////////
+//
+//  IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
+//
+//  By downloading, copying, installing or using the software you agree to this license.
+//  If you do not agree to this license, do not download, install,
+//  copy or use the software.
+//
+//
+//                          License Agreement
+//                For Open Source Computer Vision Library
+//
+// Copyright (C) 2000-2008, Intel Corporation, all rights reserved.
+// Copyright (C) 2009, Willow Garage Inc., all rights reserved.
+// Copyright (C) 2013, OpenCV Foundation, all rights reserved.
+// Copyright (C) 2015, Itseez Inc., all rights reserved.
+// Third party copyrights are property of their respective owners.
+//
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
+//
+//   * Redistribution's of source code must retain the above copyright notice,
+//     this list of conditions and the following disclaimer.
+//
+//   * Redistribution's in binary form must reproduce the above copyright notice,
+//     this list of conditions and the following disclaimer in the documentation
+//     and/or other materials provided with the distribution.
+//
+//   * The name of the copyright holders may not be used to endorse or promote products
+//     derived from this software without specific prior written permission.
+//
+// This software is provided by the copyright holders and contributors "as is" and
+// any express or implied warranties, including, but not limited to, the implied
+// warranties of merchantability and fitness for a particular purpose are disclaimed.
+// In no event shall the Intel Corporation or contributors be liable for any direct,
+// indirect, incidental, special, exemplary, or consequential damages
+// (including, but not limited to, procurement of substitute goods or services;
+// loss of use, data, or profits; or business interruption) however caused
+// and on any theory of liability, whether in contract, strict liability,
+// or tort (including negligence or otherwise) arising in any way out of
+// the use of this software, even if advised of the possibility of such damage.
+//
+//M*/
+
+#ifndef OPENCV_HAL_HPP
+#define OPENCV_HAL_HPP
+
+#include "opencv2/core/cvdef.h"
+#include "opencv2/core/cvstd.hpp"
+#include "opencv2/core/hal/interface.h"
+
+namespace cv { namespace hal {
+
+//! @addtogroup core_hal_functions
+//! @{
+
+CV_EXPORTS int normHamming(const uchar* a, int n);
+CV_EXPORTS int normHamming(const uchar* a, const uchar* b, int n);
+
+CV_EXPORTS int normHamming(const uchar* a, int n, int cellSize);
+CV_EXPORTS int normHamming(const uchar* a, const uchar* b, int n, int cellSize);
+
+CV_EXPORTS int LU32f(float* A, size_t astep, int m, float* b, size_t bstep, int n);
+CV_EXPORTS int LU64f(double* A, size_t astep, int m, double* b, size_t bstep, int n);
+CV_EXPORTS bool Cholesky32f(float* A, size_t astep, int m, float* b, size_t bstep, int n);
+CV_EXPORTS bool Cholesky64f(double* A, size_t astep, int m, double* b, size_t bstep, int n);
+CV_EXPORTS void SVD32f(float* At, size_t astep, float* W, float* U, size_t ustep, float* Vt, size_t vstep, int m, int n, int flags);
+CV_EXPORTS void SVD64f(double* At, size_t astep, double* W, double* U, size_t ustep, double* Vt, size_t vstep, int m, int n, int flags);
+CV_EXPORTS int QR32f(float* A, size_t astep, int m, int n, int k, float* b, size_t bstep, float* hFactors);
+CV_EXPORTS int QR64f(double* A, size_t astep, int m, int n, int k, double* b, size_t bstep, double* hFactors);
+
+CV_EXPORTS void gemm32f(const float* src1, size_t src1_step, const float* src2, size_t src2_step,
+                        float alpha, const float* src3, size_t src3_step, float beta, float* dst, size_t dst_step,
+                        int m_a, int n_a, int n_d, int flags);
+CV_EXPORTS void gemm64f(const double* src1, size_t src1_step, const double* src2, size_t src2_step,
+                        double alpha, const double* src3, size_t src3_step, double beta, double* dst, size_t dst_step,
+                        int m_a, int n_a, int n_d, int flags);
+CV_EXPORTS void gemm32fc(const float* src1, size_t src1_step, const float* src2, size_t src2_step,
+                        float alpha, const float* src3, size_t src3_step, float beta, float* dst, size_t dst_step,
+                        int m_a, int n_a, int n_d, int flags);
+CV_EXPORTS void gemm64fc(const double* src1, size_t src1_step, const double* src2, size_t src2_step,
+                        double alpha, const double* src3, size_t src3_step, double beta, double* dst, size_t dst_step,
+                        int m_a, int n_a, int n_d, int flags);
+
+CV_EXPORTS int normL1_(const uchar* a, const uchar* b, int n);
+CV_EXPORTS float normL1_(const float* a, const float* b, int n);
+CV_EXPORTS float normL2Sqr_(const float* a, const float* b, int n);
+
+CV_EXPORTS void exp32f(const float* src, float* dst, int n);
+CV_EXPORTS void exp64f(const double* src, double* dst, int n);
+CV_EXPORTS void log32f(const float* src, float* dst, int n);
+CV_EXPORTS void log64f(const double* src, double* dst, int n);
+
+CV_EXPORTS void cartToPolar32f(const float* x, const float* y, float* mag, float* angle, int n, bool angleInDegrees);
+CV_EXPORTS void cartToPolar64f(const double* x, const double* y, double* mag, double* angle, int n, bool angleInDegrees);
+CV_EXPORTS void fastAtan32f(const float* y, const float* x, float* dst, int n, bool angleInDegrees);
+CV_EXPORTS void fastAtan64f(const double* y, const double* x, double* dst, int n, bool angleInDegrees);
+CV_EXPORTS void magnitude32f(const float* x, const float* y, float* dst, int n);
+CV_EXPORTS void magnitude64f(const double* x, const double* y, double* dst, int n);
+CV_EXPORTS void polarToCart32f(const float* mag, const float* angle, float* x, float* y, int n, bool angleInDegrees);
+CV_EXPORTS void polarToCart64f(const double* mag, const double* angle, double* x, double* y, int n, bool angleInDegrees);
+CV_EXPORTS void sqrt32f(const float* src, float* dst, int len);
+CV_EXPORTS void sqrt64f(const double* src, double* dst, int len);
+CV_EXPORTS void invSqrt32f(const float* src, float* dst, int len);
+CV_EXPORTS void invSqrt64f(const double* src, double* dst, int len);
+
+CV_EXPORTS void split8u(const uchar* src, uchar** dst, int len, int cn );
+CV_EXPORTS void split16u(const ushort* src, ushort** dst, int len, int cn );
+CV_EXPORTS void split32s(const int* src, int** dst, int len, int cn );
+CV_EXPORTS void split64s(const int64* src, int64** dst, int len, int cn );
+
+CV_EXPORTS void merge8u(const uchar** src, uchar* dst, int len, int cn );
+CV_EXPORTS void merge16u(const ushort** src, ushort* dst, int len, int cn );
+CV_EXPORTS void merge32s(const int** src, int* dst, int len, int cn );
+CV_EXPORTS void merge64s(const int64** src, int64* dst, int len, int cn );
+
+CV_EXPORTS void add8u( const uchar* src1, size_t step1, const uchar* src2, size_t step2, uchar* dst, size_t step, int width, int height, void* );
+CV_EXPORTS void add8s( const schar* src1, size_t step1, const schar* src2, size_t step2, schar* dst, size_t step, int width, int height, void* );
+CV_EXPORTS void add16u( const ushort* src1, size_t step1, const ushort* src2, size_t step2, ushort* dst, size_t step, int width, int height, void* );
+CV_EXPORTS void add16s( const short* src1, size_t step1, const short* src2, size_t step2, short* dst, size_t step, int width, int height, void* );
+CV_EXPORTS void add32s( const int* src1, size_t step1, const int* src2, size_t step2, int* dst, size_t step, int width, int height, void* );
+CV_EXPORTS void add32f( const float* src1, size_t step1, const float* src2, size_t step2, float* dst, size_t step, int width, int height, void* );
+CV_EXPORTS void add64f( const double* src1, size_t step1, const double* src2, size_t step2, double* dst, size_t step, int width, int height, void* );
+
+CV_EXPORTS void sub8u( const uchar* src1, size_t step1, const uchar* src2, size_t step2, uchar* dst, size_t step, int width, int height, void* );
+CV_EXPORTS void sub8s( const schar* src1, size_t step1, const schar* src2, size_t step2, schar* dst, size_t step, int width, int height, void* );
+CV_EXPORTS void sub16u( const ushort* src1, size_t step1, const ushort* src2, size_t step2, ushort* dst, size_t step, int width, int height, void* );
+CV_EXPORTS void sub16s( const short* src1, size_t step1, const short* src2, size_t step2, short* dst, size_t step, int width, int height, void* );
+CV_EXPORTS void sub32s( const int* src1, size_t step1, const int* src2, size_t step2, int* dst, size_t step, int width, int height, void* );
+CV_EXPORTS void sub32f( const float* src1, size_t step1, const float* src2, size_t step2, float* dst, size_t step, int width, int height, void* );
+CV_EXPORTS void sub64f( const double* src1, size_t step1, const double* src2, size_t step2, double* dst, size_t step, int width, int height, void* );
+
+CV_EXPORTS void max8u( const uchar* src1, size_t step1, const uchar* src2, size_t step2, uchar* dst, size_t step, int width, int height, void* );
+CV_EXPORTS void max8s( const schar* src1, size_t step1, const schar* src2, size_t step2, schar* dst, size_t step, int width, int height, void* );
+CV_EXPORTS void max16u( const ushort* src1, size_t step1, const ushort* src2, size_t step2, ushort* dst, size_t step, int width, int height, void* );
+CV_EXPORTS void max16s( const short* src1, size_t step1, const short* src2, size_t step2, short* dst, size_t step, int width, int height, void* );
+CV_EXPORTS void max32s( const int* src1, size_t step1, const int* src2, size_t step2, int* dst, size_t step, int width, int height, void* );
+CV_EXPORTS void max32f( const float* src1, size_t step1, const float* src2, size_t step2, float* dst, size_t step, int width, int height, void* );
+CV_EXPORTS void max64f( const double* src1, size_t step1, const double* src2, size_t step2, double* dst, size_t step, int width, int height, void* );
+
+CV_EXPORTS void min8u( const uchar* src1, size_t step1, const uchar* src2, size_t step2, uchar* dst, size_t step, int width, int height, void* );
+CV_EXPORTS void min8s( const schar* src1, size_t step1, const schar* src2, size_t step2, schar* dst, size_t step, int width, int height, void* );
+CV_EXPORTS void min16u( const ushort* src1, size_t step1, const ushort* src2, size_t step2, ushort* dst, size_t step, int width, int height, void* );
+CV_EXPORTS void min16s( const short* src1, size_t step1, const short* src2, size_t step2, short* dst, size_t step, int width, int height, void* );
+CV_EXPORTS void min32s( const int* src1, size_t step1, const int* src2, size_t step2, int* dst, size_t step, int width, int height, void* );
+CV_EXPORTS void min32f( const float* src1, size_t step1, const float* src2, size_t step2, float* dst, size_t step, int width, int height, void* );
+CV_EXPORTS void min64f( const double* src1, size_t step1, const double* src2, size_t step2, double* dst, size_t step, int width, int height, void* );
+
+CV_EXPORTS void absdiff8u( const uchar* src1, size_t step1, const uchar* src2, size_t step2, uchar* dst, size_t step, int width, int height, void* );
+CV_EXPORTS void absdiff8s( const schar* src1, size_t step1, const schar* src2, size_t step2, schar* dst, size_t step, int width, int height, void* );
+CV_EXPORTS void absdiff16u( const ushort* src1, size_t step1, const ushort* src2, size_t step2, ushort* dst, size_t step, int width, int height, void* );
+CV_EXPORTS void absdiff16s( const short* src1, size_t step1, const short* src2, size_t step2, short* dst, size_t step, int width, int height, void* );
+CV_EXPORTS void absdiff32s( const int* src1, size_t step1, const int* src2, size_t step2, int* dst, size_t step, int width, int height, void* );
+CV_EXPORTS void absdiff32f( const float* src1, size_t step1, const float* src2, size_t step2, float* dst, size_t step, int width, int height, void* );
+CV_EXPORTS void absdiff64f( const double* src1, size_t step1, const double* src2, size_t step2, double* dst, size_t step, int width, int height, void* );
+
+CV_EXPORTS void and8u( const uchar* src1, size_t step1, const uchar* src2, size_t step2, uchar* dst, size_t step, int width, int height, void* );
+CV_EXPORTS void or8u( const uchar* src1, size_t step1, const uchar* src2, size_t step2, uchar* dst, size_t step, int width, int height, void* );
+CV_EXPORTS void xor8u( const uchar* src1, size_t step1, const uchar* src2, size_t step2, uchar* dst, size_t step, int width, int height, void* );
+CV_EXPORTS void not8u( const uchar* src1, size_t step1, const uchar* src2, size_t step2, uchar* dst, size_t step, int width, int height, void* );
+
+CV_EXPORTS void cmp8u(const uchar* src1, size_t step1, const uchar* src2, size_t step2, uchar* dst, size_t step, int width, int height, void* _cmpop);
+CV_EXPORTS void cmp8s(const schar* src1, size_t step1, const schar* src2, size_t step2, uchar* dst, size_t step, int width, int height, void* _cmpop);
+CV_EXPORTS void cmp16u(const ushort* src1, size_t step1, const ushort* src2, size_t step2, uchar* dst, size_t step, int width, int height, void* _cmpop);
+CV_EXPORTS void cmp16s(const short* src1, size_t step1, const short* src2, size_t step2, uchar* dst, size_t step, int width, int height, void* _cmpop);
+CV_EXPORTS void cmp32s(const int* src1, size_t step1, const int* src2, size_t step2, uchar* dst, size_t step, int width, int height, void* _cmpop);
+CV_EXPORTS void cmp32f(const float* src1, size_t step1, const float* src2, size_t step2, uchar* dst, size_t step, int width, int height, void* _cmpop);
+CV_EXPORTS void cmp64f(const double* src1, size_t step1, const double* src2, size_t step2, uchar* dst, size_t step, int width, int height, void* _cmpop);
+
+CV_EXPORTS void mul8u( const uchar* src1, size_t step1, const uchar* src2, size_t step2, uchar* dst, size_t step, int width, int height, void* scale);
+CV_EXPORTS void mul8s( const schar* src1, size_t step1, const schar* src2, size_t step2, schar* dst, size_t step, int width, int height, void* scale);
+CV_EXPORTS void mul16u( const ushort* src1, size_t step1, const ushort* src2, size_t step2, ushort* dst, size_t step, int width, int height, void* scale);
+CV_EXPORTS void mul16s( const short* src1, size_t step1, const short* src2, size_t step2, short* dst, size_t step, int width, int height, void* scale);
+CV_EXPORTS void mul32s( const int* src1, size_t step1, const int* src2, size_t step2, int* dst, size_t step, int width, int height, void* scale);
+CV_EXPORTS void mul32f( const float* src1, size_t step1, const float* src2, size_t step2, float* dst, size_t step, int width, int height, void* scale);
+CV_EXPORTS void mul64f( const double* src1, size_t step1, const double* src2, size_t step2, double* dst, size_t step, int width, int height, void* scale);
+
+CV_EXPORTS void div8u( const uchar* src1, size_t step1, const uchar* src2, size_t step2, uchar* dst, size_t step, int width, int height, void* scale);
+CV_EXPORTS void div8s( const schar* src1, size_t step1, const schar* src2, size_t step2, schar* dst, size_t step, int width, int height, void* scale);
+CV_EXPORTS void div16u( const ushort* src1, size_t step1, const ushort* src2, size_t step2, ushort* dst, size_t step, int width, int height, void* scale);
+CV_EXPORTS void div16s( const short* src1, size_t step1, const short* src2, size_t step2, short* dst, size_t step, int width, int height, void* scale);
+CV_EXPORTS void div32s( const int* src1, size_t step1, const int* src2, size_t step2, int* dst, size_t step, int width, int height, void* scale);
+CV_EXPORTS void div32f( const float* src1, size_t step1, const float* src2, size_t step2, float* dst, size_t step, int width, int height, void* scale);
+CV_EXPORTS void div64f( const double* src1, size_t step1, const double* src2, size_t step2, double* dst, size_t step, int width, int height, void* scale);
+
+CV_EXPORTS void recip8u( const uchar *, size_t, const uchar * src2, size_t step2, uchar* dst, size_t step, int width, int height, void* scale);
+CV_EXPORTS void recip8s( const schar *, size_t, const schar * src2, size_t step2, schar* dst, size_t step, int width, int height, void* scale);
+CV_EXPORTS void recip16u( const ushort *, size_t, const ushort * src2, size_t step2, ushort* dst, size_t step, int width, int height, void* scale);
+CV_EXPORTS void recip16s( const short *, size_t, const short * src2, size_t step2, short* dst, size_t step, int width, int height, void* scale);
+CV_EXPORTS void recip32s( const int *, size_t, const int * src2, size_t step2, int* dst, size_t step, int width, int height, void* scale);
+CV_EXPORTS void recip32f( const float *, size_t, const float * src2, size_t step2, float* dst, size_t step, int width, int height, void* scale);
+CV_EXPORTS void recip64f( const double *, size_t, const double * src2, size_t step2, double* dst, size_t step, int width, int height, void* scale);
+
+CV_EXPORTS void addWeighted8u( const uchar* src1, size_t step1, const uchar* src2, size_t step2, uchar* dst, size_t step, int width, int height, void* _scalars );
+CV_EXPORTS void addWeighted8s( const schar* src1, size_t step1, const schar* src2, size_t step2, schar* dst, size_t step, int width, int height, void* scalars );
+CV_EXPORTS void addWeighted16u( const ushort* src1, size_t step1, const ushort* src2, size_t step2, ushort* dst, size_t step, int width, int height, void* scalars );
+CV_EXPORTS void addWeighted16s( const short* src1, size_t step1, const short* src2, size_t step2, short* dst, size_t step, int width, int height, void* scalars );
+CV_EXPORTS void addWeighted32s( const int* src1, size_t step1, const int* src2, size_t step2, int* dst, size_t step, int width, int height, void* scalars );
+CV_EXPORTS void addWeighted32f( const float* src1, size_t step1, const float* src2, size_t step2, float* dst, size_t step, int width, int height, void* scalars );
+CV_EXPORTS void addWeighted64f( const double* src1, size_t step1, const double* src2, size_t step2, double* dst, size_t step, int width, int height, void* scalars );
+
+CV_EXPORTS void cvt16f32f( const hfloat* src, float* dst, int len );
+CV_EXPORTS void cvt32f16f( const float* src, hfloat* dst, int len );
+
+CV_EXPORTS void addRNGBias32f( float* arr, const float* scaleBiasPairs, int len );
+CV_EXPORTS void addRNGBias64f( double* arr, const double* scaleBiasPairs, int len );
+
+struct CV_EXPORTS DFT1D
+{
+    static Ptr<DFT1D> create(int len, int count, int depth, int flags, bool * useBuffer = 0);
+    virtual void apply(const uchar *src, uchar *dst) = 0;
+    virtual ~DFT1D() {}
+};
+
+struct CV_EXPORTS DFT2D
+{
+    static Ptr<DFT2D> create(int width, int height, int depth,
+                             int src_channels, int dst_channels,
+                             int flags, int nonzero_rows = 0);
+    virtual void apply(const uchar *src_data, size_t src_step, uchar *dst_data, size_t dst_step) = 0;
+    virtual ~DFT2D() {}
+};
+
+struct CV_EXPORTS DCT2D
+{
+    static Ptr<DCT2D> create(int width, int height, int depth, int flags);
+    virtual void apply(const uchar *src_data, size_t src_step, uchar *dst_data, size_t dst_step) = 0;
+    virtual ~DCT2D() {}
+};
+
+//! @} core_hal
+
+//=============================================================================
+// for binary compatibility with 3.0
+
+//! @cond IGNORED
+
+CV_EXPORTS int LU(float* A, size_t astep, int m, float* b, size_t bstep, int n);
+CV_EXPORTS int LU(double* A, size_t astep, int m, double* b, size_t bstep, int n);
+CV_EXPORTS bool Cholesky(float* A, size_t astep, int m, float* b, size_t bstep, int n);
+CV_EXPORTS bool Cholesky(double* A, size_t astep, int m, double* b, size_t bstep, int n);
+
+CV_EXPORTS void exp(const float* src, float* dst, int n);
+CV_EXPORTS void exp(const double* src, double* dst, int n);
+CV_EXPORTS void log(const float* src, float* dst, int n);
+CV_EXPORTS void log(const double* src, double* dst, int n);
+
+CV_EXPORTS void fastAtan2(const float* y, const float* x, float* dst, int n, bool angleInDegrees);
+CV_EXPORTS void magnitude(const float* x, const float* y, float* dst, int n);
+CV_EXPORTS void magnitude(const double* x, const double* y, double* dst, int n);
+CV_EXPORTS void sqrt(const float* src, float* dst, int len);
+CV_EXPORTS void sqrt(const double* src, double* dst, int len);
+CV_EXPORTS void invSqrt(const float* src, float* dst, int len);
+CV_EXPORTS void invSqrt(const double* src, double* dst, int len);
+
+//! @endcond
+
+}} //cv::hal
+
+#endif //OPENCV_HAL_HPP
diff --git a/3rdParty/opencv2/core/hal/interface.h b/3rdParty/opencv-4.12.0/opencv2/core/hal/interface.h
similarity index 100%
rename from 3rdParty/opencv2/core/hal/interface.h
rename to 3rdParty/opencv-4.12.0/opencv2/core/hal/interface.h
diff --git a/3rdParty/opencv-4.12.0/opencv2/core/hal/intrin.hpp b/3rdParty/opencv-4.12.0/opencv2/core/hal/intrin.hpp
new file mode 100644
index 0000000000..afb74dc953
--- /dev/null
+++ b/3rdParty/opencv-4.12.0/opencv2/core/hal/intrin.hpp
@@ -0,0 +1,988 @@
+/*M///////////////////////////////////////////////////////////////////////////////////////
+//
+//  IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
+//
+//  By downloading, copying, installing or using the software you agree to this license.
+//  If you do not agree to this license, do not download, install,
+//  copy or use the software.
+//
+//
+//                          License Agreement
+//                For Open Source Computer Vision Library
+//
+// Copyright (C) 2000-2008, Intel Corporation, all rights reserved.
+// Copyright (C) 2009, Willow Garage Inc., all rights reserved.
+// Copyright (C) 2013, OpenCV Foundation, all rights reserved.
+// Copyright (C) 2015, Itseez Inc., all rights reserved.
+// Third party copyrights are property of their respective owners.
+//
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
+//
+//   * Redistribution's of source code must retain the above copyright notice,
+//     this list of conditions and the following disclaimer.
+//
+//   * Redistribution's in binary form must reproduce the above copyright notice,
+//     this list of conditions and the following disclaimer in the documentation
+//     and/or other materials provided with the distribution.
+//
+//   * The name of the copyright holders may not be used to endorse or promote products
+//     derived from this software without specific prior written permission.
+//
+// This software is provided by the copyright holders and contributors "as is" and
+// any express or implied warranties, including, but not limited to, the implied
+// warranties of merchantability and fitness for a particular purpose are disclaimed.
+// In no event shall the Intel Corporation or contributors be liable for any direct,
+// indirect, incidental, special, exemplary, or consequential damages
+// (including, but not limited to, procurement of substitute goods or services;
+// loss of use, data, or profits; or business interruption) however caused
+// and on any theory of liability, whether in contract, strict liability,
+// or tort (including negligence or otherwise) arising in any way out of
+// the use of this software, even if advised of the possibility of such damage.
+//
+//M*/
+
+#ifndef OPENCV_HAL_INTRIN_HPP
+#define OPENCV_HAL_INTRIN_HPP
+
+#include <cmath>
+#include <float.h>
+#include <stdlib.h>
+#include "opencv2/core/cvdef.h"
+
+#if defined(__GNUC__) && __GNUC__ == 12
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wuninitialized"
+#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+#endif
+
+#define OPENCV_HAL_ADD(a, b) ((a) + (b))
+#define OPENCV_HAL_AND(a, b) ((a) & (b))
+#define OPENCV_HAL_NOP(a) (a)
+#define OPENCV_HAL_1ST(a, b) (a)
+
+namespace {
+inline unsigned int trailingZeros32(unsigned int value) {
+#if defined(_MSC_VER)
+#if (_MSC_VER < 1700) || defined(_M_ARM) || defined(_M_ARM64) || defined(_M_ARM64EC)
+    unsigned long index = 0;
+    _BitScanForward(&index, value);
+    return (unsigned int)index;
+#elif defined(__clang__)
+    // clang-cl doesn't export _tzcnt_u32 for non BMI systems
+    return value ? __builtin_ctz(value) : 32;
+#else
+    return _tzcnt_u32(value);
+#endif
+#elif defined(__GNUC__) || defined(__GNUG__)
+    return __builtin_ctz(value);
+#elif defined(__ICC) || defined(__INTEL_COMPILER)
+    return _bit_scan_forward(value);
+#elif defined(__clang__)
+    return llvm.cttz.i32(value, true);
+#else
+    static const int MultiplyDeBruijnBitPosition[32] = {
+        0, 1, 28, 2, 29, 14, 24, 3, 30, 22, 20, 15, 25, 17, 4, 8,
+        31, 27, 13, 23, 21, 19, 16, 7, 26, 12, 18, 6, 11, 5, 10, 9 };
+    return MultiplyDeBruijnBitPosition[((uint32_t)((value & -value) * 0x077CB531U)) >> 27];
+#endif
+}
+}
+
+// unlike HAL API, which is in cv::hal,
+// we put intrinsics into cv namespace to make its
+// access from within opencv code more accessible
+namespace cv {
+
+namespace hal {
+
+enum StoreMode
+{
+    STORE_UNALIGNED = 0,
+    STORE_ALIGNED = 1,
+    STORE_ALIGNED_NOCACHE = 2
+};
+
+}
+
+// TODO FIXIT: Don't use "God" traits. Split on separate cases.
+template<typename _Tp> struct V_TypeTraits
+{
+};
+
+#define CV_INTRIN_DEF_TYPE_TRAITS(type, int_type_, uint_type_, abs_type_, w_type_, q_type_, sum_type_) \
+    template<> struct V_TypeTraits<type> \
+    { \
+        typedef type value_type; \
+        typedef int_type_ int_type; \
+        typedef abs_type_ abs_type; \
+        typedef uint_type_ uint_type; \
+        typedef w_type_ w_type; \
+        typedef q_type_ q_type; \
+        typedef sum_type_ sum_type; \
+    \
+        static inline int_type reinterpret_int(type x) \
+        { \
+            union { type l; int_type i; } v; \
+            v.l = x; \
+            return v.i; \
+        } \
+    \
+        static inline type reinterpret_from_int(int_type x) \
+        { \
+            union { type l; int_type i; } v; \
+            v.i = x; \
+            return v.l; \
+        } \
+    }
+
+#define CV_INTRIN_DEF_TYPE_TRAITS_NO_Q_TYPE(type, int_type_, uint_type_, abs_type_, w_type_, sum_type_) \
+    template<> struct V_TypeTraits<type> \
+    { \
+        typedef type value_type; \
+        typedef int_type_ int_type; \
+        typedef abs_type_ abs_type; \
+        typedef uint_type_ uint_type; \
+        typedef w_type_ w_type; \
+        typedef sum_type_ sum_type; \
+    \
+        static inline int_type reinterpret_int(type x) \
+        { \
+            union { type l; int_type i; } v; \
+            v.l = x; \
+            return v.i; \
+        } \
+    \
+        static inline type reinterpret_from_int(int_type x) \
+        { \
+            union { type l; int_type i; } v; \
+            v.i = x; \
+            return v.l; \
+        } \
+    }
+
+CV_INTRIN_DEF_TYPE_TRAITS(uchar, schar, uchar, uchar, ushort, unsigned, unsigned);
+CV_INTRIN_DEF_TYPE_TRAITS(schar, schar, uchar, uchar, short, int, int);
+CV_INTRIN_DEF_TYPE_TRAITS(ushort, short, ushort, ushort, unsigned, uint64, unsigned);
+CV_INTRIN_DEF_TYPE_TRAITS(short, short, ushort, ushort, int, int64, int);
+CV_INTRIN_DEF_TYPE_TRAITS_NO_Q_TYPE(unsigned, int, unsigned, unsigned, uint64, unsigned);
+CV_INTRIN_DEF_TYPE_TRAITS_NO_Q_TYPE(int, int, unsigned, unsigned, int64, int);
+CV_INTRIN_DEF_TYPE_TRAITS_NO_Q_TYPE(float, int, unsigned, float, double, float);
+CV_INTRIN_DEF_TYPE_TRAITS_NO_Q_TYPE(uint64, int64, uint64, uint64, void, uint64);
+CV_INTRIN_DEF_TYPE_TRAITS_NO_Q_TYPE(int64, int64, uint64, uint64, void, int64);
+CV_INTRIN_DEF_TYPE_TRAITS_NO_Q_TYPE(double, int64, uint64, double, void, double);
+
+#ifndef CV_DOXYGEN
+
+#ifndef CV_CPU_OPTIMIZATION_HAL_NAMESPACE
+#ifdef CV_FORCE_SIMD128_CPP
+    #define CV_CPU_OPTIMIZATION_HAL_NAMESPACE hal_EMULATOR_CPP
+    #define CV_CPU_OPTIMIZATION_HAL_NAMESPACE_BEGIN namespace hal_EMULATOR_CPP {
+    #define CV_CPU_OPTIMIZATION_HAL_NAMESPACE_END }
+#elif defined(CV_CPU_DISPATCH_MODE)
+    #define CV_CPU_OPTIMIZATION_HAL_NAMESPACE __CV_CAT(hal_, CV_CPU_DISPATCH_MODE)
+    #define CV_CPU_OPTIMIZATION_HAL_NAMESPACE_BEGIN namespace __CV_CAT(hal_, CV_CPU_DISPATCH_MODE) {
+    #define CV_CPU_OPTIMIZATION_HAL_NAMESPACE_END }
+#else
+    #define CV_CPU_OPTIMIZATION_HAL_NAMESPACE hal_baseline
+    #define CV_CPU_OPTIMIZATION_HAL_NAMESPACE_BEGIN namespace hal_baseline {
+    #define CV_CPU_OPTIMIZATION_HAL_NAMESPACE_END }
+#endif
+#endif // CV_CPU_OPTIMIZATION_HAL_NAMESPACE
+
+CV_CPU_OPTIMIZATION_HAL_NAMESPACE_BEGIN
+
+template <typename _VecTp> inline _VecTp v_setzero_();
+template <typename _VecTp> inline _VecTp v_setall_(uchar);
+template <typename _VecTp> inline _VecTp v_setall_(schar);
+template <typename _VecTp> inline _VecTp v_setall_(ushort);
+template <typename _VecTp> inline _VecTp v_setall_(short);
+template <typename _VecTp> inline _VecTp v_setall_(unsigned);
+template <typename _VecTp> inline _VecTp v_setall_(int);
+template <typename _VecTp> inline _VecTp v_setall_(uint64);
+template <typename _VecTp> inline _VecTp v_setall_(int64);
+template <typename _VecTp> inline _VecTp v_setall_(float);
+template <typename _VecTp> inline _VecTp v_setall_(double);
+
+CV_CPU_OPTIMIZATION_HAL_NAMESPACE_END
+using namespace CV_CPU_OPTIMIZATION_HAL_NAMESPACE;
+#endif
+}
+
+#ifdef CV_DOXYGEN
+#   undef CV_AVX2
+#   undef CV_SSE2
+#   undef CV_NEON
+#   undef CV_VSX
+#   undef CV_FP16
+#   undef CV_MSA
+#   undef CV_RVV
+#endif
+
+#if (CV_SSE2 || CV_NEON || CV_VSX || CV_MSA || CV_WASM_SIMD || CV_RVV071 || CV_LSX) && !defined(CV_FORCE_SIMD128_CPP)
+#define CV__SIMD_FORWARD 128
+#include "opencv2/core/hal/intrin_forward.hpp"
+#endif
+
+#if CV_SSE2 && !defined(CV_FORCE_SIMD128_CPP)
+
+#include "opencv2/core/hal/intrin_sse_em.hpp"
+#include "opencv2/core/hal/intrin_sse.hpp"
+
+#elif CV_NEON && !defined(CV_FORCE_SIMD128_CPP)
+
+#include "opencv2/core/hal/intrin_neon.hpp"
+
+#elif CV_RVV071 && !defined(CV_FORCE_SIMD128_CPP)
+#define CV_SIMD128_CPP 0
+#include "opencv2/core/hal/intrin_rvv071.hpp"
+
+#elif CV_VSX && !defined(CV_FORCE_SIMD128_CPP)
+
+#include "opencv2/core/hal/intrin_vsx.hpp"
+
+#elif CV_MSA && !defined(CV_FORCE_SIMD128_CPP)
+
+#include "opencv2/core/hal/intrin_msa.hpp"
+
+#elif CV_WASM_SIMD && !defined(CV_FORCE_SIMD128_CPP)
+#include "opencv2/core/hal/intrin_wasm.hpp"
+
+#elif CV_RVV && !defined(CV_FORCE_SIMD128_CPP)
+#include "opencv2/core/hal/intrin_rvv_scalable.hpp"
+
+#elif CV_LSX && !defined(CV_FORCE_SIMD128_CPP)
+
+#include "opencv2/core/hal/intrin_lsx.hpp"
+
+#else
+
+#include "opencv2/core/hal/intrin_cpp.hpp"
+
+#endif
+
+// AVX2 can be used together with SSE2, so
+// we define those two sets of intrinsics at once.
+// Most of the intrinsics do not conflict (the proper overloaded variant is
+// resolved by the argument types, e.g. v_float32x4 ~ SSE2, v_float32x8 ~ AVX2),
+// but some of AVX2 intrinsics get v256_ prefix instead of v_, e.g. v256_load() vs v_load().
+// Correspondingly, the wide intrinsics (which are mapped to the "widest"
+// available instruction set) will get vx_ prefix
+// (and will be mapped to v256_ counterparts) (e.g. vx_load() => v256_load())
+#if CV_AVX2
+
+#define CV__SIMD_FORWARD 256
+#include "opencv2/core/hal/intrin_forward.hpp"
+#include "opencv2/core/hal/intrin_avx.hpp"
+
+#endif
+
+// AVX512 can be used together with SSE2 and AVX2, so
+// we define those sets of intrinsics at once.
+// For some of AVX512 intrinsics get v512_ prefix instead of v_, e.g. v512_load() vs v_load().
+// Wide intrinsics will be mapped to v512_ counterparts in this case(e.g. vx_load() => v512_load())
+#if CV_AVX512_SKX
+
+#define CV__SIMD_FORWARD 512
+#include "opencv2/core/hal/intrin_forward.hpp"
+#include "opencv2/core/hal/intrin_avx512.hpp"
+
+#endif
+
+#if CV_LASX
+
+#define CV__SIMD_FORWARD 256
+#include "opencv2/core/hal/intrin_forward.hpp"
+#include "opencv2/core/hal/intrin_lasx.hpp"
+
+#endif
+
+//! @cond IGNORED
+
+namespace cv {
+
+#ifndef CV_DOXYGEN
+CV_CPU_OPTIMIZATION_HAL_NAMESPACE_BEGIN
+#endif
+
+#ifndef CV_SIMD128
+#define CV_SIMD128 0
+#endif
+
+#ifndef CV_SIMD128_CPP
+#define CV_SIMD128_CPP 0
+#endif
+
+#ifndef CV_SIMD128_64F
+#define CV_SIMD128_64F 0
+#endif
+
+#ifndef CV_SIMD256
+#define CV_SIMD256 0
+#endif
+
+#ifndef CV_SIMD256_64F
+#define CV_SIMD256_64F 0
+#endif
+
+#ifndef CV_SIMD512
+#define CV_SIMD512 0
+#endif
+
+#ifndef CV_SIMD512_64F
+#define CV_SIMD512_64F 0
+#endif
+
+#ifndef CV_SIMD128_FP16
+#define CV_SIMD128_FP16 0
+#endif
+
+#ifndef CV_SIMD256_FP16
+#define CV_SIMD256_FP16 0
+#endif
+
+#ifndef CV_SIMD512_FP16
+#define CV_SIMD512_FP16 0
+#endif
+
+#ifndef CV_SIMD_SCALABLE
+#define CV_SIMD_SCALABLE 0
+#endif
+
+#ifndef CV_SIMD_SCALABLE_64F
+#define CV_SIMD_SCALABLE_64F 0
+#endif
+
+//==================================================================================================
+
+template<typename _Tp> struct V_RegTraits
+{
+};
+
+#define CV_DEF_REG_TRAITS(prefix, _reg, lane_type, suffix, _u_reg, _w_reg, _q_reg, _int_reg, _round_reg) \
+    template<> struct V_RegTraits<_reg> \
+    { \
+        typedef _reg reg; \
+        typedef _u_reg u_reg; \
+        typedef _w_reg w_reg; \
+        typedef _q_reg q_reg; \
+        typedef _int_reg int_reg; \
+        typedef _round_reg round_reg; \
+    }
+
+#if CV_SIMD128 || CV_SIMD128_CPP
+    CV_DEF_REG_TRAITS(v, v_uint8x16, uchar, u8, v_uint8x16, v_uint16x8, v_uint32x4, v_int8x16, void);
+    CV_DEF_REG_TRAITS(v, v_int8x16, schar, s8, v_uint8x16, v_int16x8, v_int32x4, v_int8x16, void);
+    CV_DEF_REG_TRAITS(v, v_uint16x8, ushort, u16, v_uint16x8, v_uint32x4, v_uint64x2, v_int16x8, void);
+    CV_DEF_REG_TRAITS(v, v_int16x8, short, s16, v_uint16x8, v_int32x4, v_int64x2, v_int16x8, void);
+    CV_DEF_REG_TRAITS(v, v_uint32x4, unsigned, u32, v_uint32x4, v_uint64x2, void, v_int32x4, void);
+    CV_DEF_REG_TRAITS(v, v_int32x4, int, s32, v_uint32x4, v_int64x2, void, v_int32x4, void);
+#if CV_SIMD128_64F || CV_SIMD128_CPP
+    CV_DEF_REG_TRAITS(v, v_float32x4, float, f32, v_float32x4, v_float64x2, void, v_int32x4, v_int32x4);
+#else
+    CV_DEF_REG_TRAITS(v, v_float32x4, float, f32, v_float32x4, void, void, v_int32x4, v_int32x4);
+#endif
+    CV_DEF_REG_TRAITS(v, v_uint64x2, uint64, u64, v_uint64x2, void, void, v_int64x2, void);
+    CV_DEF_REG_TRAITS(v, v_int64x2, int64, s64, v_uint64x2, void, void, v_int64x2, void);
+#if CV_SIMD128_64F
+    CV_DEF_REG_TRAITS(v, v_float64x2, double, f64, v_float64x2, void, void, v_int64x2, v_int32x4);
+#endif
+#endif
+
+#if CV_SIMD256
+    CV_DEF_REG_TRAITS(v256, v_uint8x32, uchar, u8, v_uint8x32, v_uint16x16, v_uint32x8, v_int8x32, void);
+    CV_DEF_REG_TRAITS(v256, v_int8x32, schar, s8, v_uint8x32, v_int16x16, v_int32x8, v_int8x32, void);
+    CV_DEF_REG_TRAITS(v256, v_uint16x16, ushort, u16, v_uint16x16, v_uint32x8, v_uint64x4, v_int16x16, void);
+    CV_DEF_REG_TRAITS(v256, v_int16x16, short, s16, v_uint16x16, v_int32x8, v_int64x4, v_int16x16, void);
+    CV_DEF_REG_TRAITS(v256, v_uint32x8, unsigned, u32, v_uint32x8, v_uint64x4, void, v_int32x8, void);
+    CV_DEF_REG_TRAITS(v256, v_int32x8, int, s32, v_uint32x8, v_int64x4, void, v_int32x8, void);
+    CV_DEF_REG_TRAITS(v256, v_float32x8, float, f32, v_float32x8, v_float64x4, void, v_int32x8, v_int32x8);
+    CV_DEF_REG_TRAITS(v256, v_uint64x4, uint64, u64, v_uint64x4, void, void, v_int64x4, void);
+    CV_DEF_REG_TRAITS(v256, v_int64x4, int64, s64, v_uint64x4, void, void, v_int64x4, void);
+    CV_DEF_REG_TRAITS(v256, v_float64x4, double, f64, v_float64x4, void, void, v_int64x4, v_int32x8);
+#endif
+
+#if CV_SIMD512
+    CV_DEF_REG_TRAITS(v512, v_uint8x64, uchar, u8, v_uint8x64, v_uint16x32, v_uint32x16, v_int8x64, void);
+    CV_DEF_REG_TRAITS(v512, v_int8x64, schar, s8, v_uint8x64, v_int16x32, v_int32x16, v_int8x64, void);
+    CV_DEF_REG_TRAITS(v512, v_uint16x32, ushort, u16, v_uint16x32, v_uint32x16, v_uint64x8, v_int16x32, void);
+    CV_DEF_REG_TRAITS(v512, v_int16x32, short, s16, v_uint16x32, v_int32x16, v_int64x8, v_int16x32, void);
+    CV_DEF_REG_TRAITS(v512, v_uint32x16, unsigned, u32, v_uint32x16, v_uint64x8, void, v_int32x16, void);
+    CV_DEF_REG_TRAITS(v512, v_int32x16, int, s32, v_uint32x16, v_int64x8, void, v_int32x16, void);
+    CV_DEF_REG_TRAITS(v512, v_float32x16, float, f32, v_float32x16, v_float64x8, void, v_int32x16, v_int32x16);
+    CV_DEF_REG_TRAITS(v512, v_uint64x8, uint64, u64, v_uint64x8, void, void, v_int64x8, void);
+    CV_DEF_REG_TRAITS(v512, v_int64x8, int64, s64, v_uint64x8, void, void, v_int64x8, void);
+    CV_DEF_REG_TRAITS(v512, v_float64x8, double, f64, v_float64x8, void, void, v_int64x8, v_int32x16);
+#endif
+#if CV_SIMD_SCALABLE
+    CV_DEF_REG_TRAITS(v, v_uint8, uchar, u8, v_uint8, v_uint16, v_uint32, v_int8, void);
+    CV_DEF_REG_TRAITS(v, v_int8, schar, s8, v_uint8, v_int16, v_int32, v_int8, void);
+    CV_DEF_REG_TRAITS(v, v_uint16, ushort, u16, v_uint16, v_uint32, v_uint64, v_int16, void);
+    CV_DEF_REG_TRAITS(v, v_int16, short, s16, v_uint16, v_int32, v_int64, v_int16, void);
+    CV_DEF_REG_TRAITS(v, v_uint32, unsigned, u32, v_uint32, v_uint64, void, v_int32, void);
+    CV_DEF_REG_TRAITS(v, v_int32, int, s32, v_uint32, v_int64, void, v_int32, void);
+    CV_DEF_REG_TRAITS(v, v_float32, float, f32, v_float32, v_float64, void, v_int32, v_int32);
+    CV_DEF_REG_TRAITS(v, v_uint64, uint64, u64, v_uint64, void, void, v_int64, void);
+    CV_DEF_REG_TRAITS(v, v_int64, int64, s64, v_uint64, void, void, v_int64, void);
+    CV_DEF_REG_TRAITS(v, v_float64, double, f64, v_float64, void, void, v_int64, v_int32);
+#endif
+//! @endcond
+
+#if CV_SIMD512 && (!defined(CV__SIMD_FORCE_WIDTH) || CV__SIMD_FORCE_WIDTH == 512)
+#define CV__SIMD_NAMESPACE simd512
+namespace CV__SIMD_NAMESPACE {
+    #define CV_SIMD 1
+    #define CV_SIMD_64F CV_SIMD512_64F
+    #define CV_SIMD_FP16 CV_SIMD512_FP16
+    #define CV_SIMD_WIDTH 64
+//! @addtogroup core_hal_intrin
+//! @{
+    //! @brief Maximum available vector register capacity 8-bit unsigned integer values
+    typedef v_uint8x64    v_uint8;
+    //! @brief Maximum available vector register capacity 8-bit signed integer values
+    typedef v_int8x64     v_int8;
+    //! @brief Maximum available vector register capacity 16-bit unsigned integer values
+    typedef v_uint16x32   v_uint16;
+    //! @brief Maximum available vector register capacity 16-bit signed integer values
+    typedef v_int16x32    v_int16;
+    //! @brief Maximum available vector register capacity 32-bit unsigned integer values
+    typedef v_uint32x16   v_uint32;
+    //! @brief Maximum available vector register capacity 32-bit signed integer values
+    typedef v_int32x16    v_int32;
+    //! @brief Maximum available vector register capacity 64-bit unsigned integer values
+    typedef v_uint64x8    v_uint64;
+    //! @brief Maximum available vector register capacity 64-bit signed integer values
+    typedef v_int64x8     v_int64;
+    //! @brief Maximum available vector register capacity 32-bit floating point values (single precision)
+    typedef v_float32x16  v_float32;
+    #if CV_SIMD512_64F
+    //! @brief Maximum available vector register capacity 64-bit floating point values (double precision)
+    typedef v_float64x8   v_float64;
+    #endif
+//! @}
+
+    #define VXPREFIX(func) v512##func
+} // namespace
+using namespace CV__SIMD_NAMESPACE;
+#elif CV_SIMD256 && (!defined(CV__SIMD_FORCE_WIDTH) || CV__SIMD_FORCE_WIDTH == 256)
+#define CV__SIMD_NAMESPACE simd256
+namespace CV__SIMD_NAMESPACE {
+    #define CV_SIMD 1
+    #define CV_SIMD_64F CV_SIMD256_64F
+    #define CV_SIMD_FP16 CV_SIMD256_FP16
+    #define CV_SIMD_WIDTH 32
+//! @addtogroup core_hal_intrin
+//! @{
+    //! @brief Maximum available vector register capacity 8-bit unsigned integer values
+    typedef v_uint8x32   v_uint8;
+    //! @brief Maximum available vector register capacity 8-bit signed integer values
+    typedef v_int8x32    v_int8;
+    //! @brief Maximum available vector register capacity 16-bit unsigned integer values
+    typedef v_uint16x16  v_uint16;
+    //! @brief Maximum available vector register capacity 16-bit signed integer values
+    typedef v_int16x16   v_int16;
+    //! @brief Maximum available vector register capacity 32-bit unsigned integer values
+    typedef v_uint32x8   v_uint32;
+    //! @brief Maximum available vector register capacity 32-bit signed integer values
+    typedef v_int32x8    v_int32;
+    //! @brief Maximum available vector register capacity 64-bit unsigned integer values
+    typedef v_uint64x4   v_uint64;
+    //! @brief Maximum available vector register capacity 64-bit signed integer values
+    typedef v_int64x4    v_int64;
+    //! @brief Maximum available vector register capacity 32-bit floating point values (single precision)
+    typedef v_float32x8  v_float32;
+    #if CV_SIMD256_64F
+    //! @brief Maximum available vector register capacity 64-bit floating point values (double precision)
+    typedef v_float64x4  v_float64;
+    #endif
+//! @}
+
+    #define VXPREFIX(func) v256##func
+} // namespace
+using namespace CV__SIMD_NAMESPACE;
+#elif (CV_SIMD128 || CV_SIMD128_CPP) && (!defined(CV__SIMD_FORCE_WIDTH) || CV__SIMD_FORCE_WIDTH == 128)
+#if defined CV_SIMD128_CPP
+#define CV__SIMD_NAMESPACE simd128_cpp
+#else
+#define CV__SIMD_NAMESPACE simd128
+#endif
+namespace CV__SIMD_NAMESPACE {
+    #define CV_SIMD CV_SIMD128
+    #define CV_SIMD_64F CV_SIMD128_64F
+    #define CV_SIMD_WIDTH 16
+//! @addtogroup core_hal_intrin
+//! @{
+    //! @brief Maximum available vector register capacity 8-bit unsigned integer values
+    typedef v_uint8x16  v_uint8;
+    //! @brief Maximum available vector register capacity 8-bit signed integer values
+    typedef v_int8x16   v_int8;
+    //! @brief Maximum available vector register capacity 16-bit unsigned integer values
+    typedef v_uint16x8  v_uint16;
+    //! @brief Maximum available vector register capacity 16-bit signed integer values
+    typedef v_int16x8   v_int16;
+    //! @brief Maximum available vector register capacity 32-bit unsigned integer values
+    typedef v_uint32x4  v_uint32;
+    //! @brief Maximum available vector register capacity 32-bit signed integer values
+    typedef v_int32x4   v_int32;
+    //! @brief Maximum available vector register capacity 64-bit unsigned integer values
+    typedef v_uint64x2  v_uint64;
+    //! @brief Maximum available vector register capacity 64-bit signed integer values
+    typedef v_int64x2   v_int64;
+    //! @brief Maximum available vector register capacity 32-bit floating point values (single precision)
+    typedef v_float32x4 v_float32;
+    #if CV_SIMD128_64F
+    //! @brief Maximum available vector register capacity 64-bit floating point values (double precision)
+    typedef v_float64x2 v_float64;
+    #endif
+//! @}
+
+    #define VXPREFIX(func) v##func
+} // namespace
+using namespace CV__SIMD_NAMESPACE;
+
+#elif CV_SIMD_SCALABLE
+#define CV__SIMD_NAMESPACE simd
+namespace CV__SIMD_NAMESPACE {
+    #define CV_SIMD 0
+    #define CV_SIMD_WIDTH 128  /* 1024/8 */
+
+    #define VXPREFIX(func) v##func
+} // namespace
+using namespace CV__SIMD_NAMESPACE;
+
+#endif
+
+//! @cond IGNORED
+#ifndef CV_SIMD_64F
+#define CV_SIMD_64F 0
+#endif
+
+namespace CV__SIMD_NAMESPACE {
+//! @addtogroup core_hal_intrin
+//! @{
+    //! @name Wide init with value
+    //! @{
+    //! @brief Create maximum available capacity vector with elements set to a specific value
+    inline v_uint8 vx_setall_u8(uchar v) { return VXPREFIX(_setall_u8)(v); }
+    inline v_int8 vx_setall_s8(schar v) { return VXPREFIX(_setall_s8)(v); }
+    inline v_uint16 vx_setall_u16(ushort v) { return VXPREFIX(_setall_u16)(v); }
+    inline v_int16 vx_setall_s16(short v) { return VXPREFIX(_setall_s16)(v); }
+    inline v_int32 vx_setall_s32(int v) { return VXPREFIX(_setall_s32)(v); }
+    inline v_uint32 vx_setall_u32(unsigned v) { return VXPREFIX(_setall_u32)(v); }
+    inline v_float32 vx_setall_f32(float v) { return VXPREFIX(_setall_f32)(v); }
+    inline v_int64 vx_setall_s64(int64 v) { return VXPREFIX(_setall_s64)(v); }
+    inline v_uint64 vx_setall_u64(uint64 v) { return VXPREFIX(_setall_u64)(v); }
+#if CV_SIMD_64F || CV_SIMD_SCALABLE_64F
+    inline v_float64 vx_setall_f64(double v) { return VXPREFIX(_setall_f64)(v); }
+#endif
+    //! @}
+
+    //! @name Wide init with zero
+    //! @{
+    //! @brief Create maximum available capacity vector with elements set to zero
+    inline v_uint8 vx_setzero_u8() { return VXPREFIX(_setzero_u8)(); }
+    inline v_int8 vx_setzero_s8() { return VXPREFIX(_setzero_s8)(); }
+    inline v_uint16 vx_setzero_u16() { return VXPREFIX(_setzero_u16)(); }
+    inline v_int16 vx_setzero_s16() { return VXPREFIX(_setzero_s16)(); }
+    inline v_int32 vx_setzero_s32() { return VXPREFIX(_setzero_s32)(); }
+    inline v_uint32 vx_setzero_u32() { return VXPREFIX(_setzero_u32)(); }
+    inline v_float32 vx_setzero_f32() { return VXPREFIX(_setzero_f32)(); }
+    inline v_int64 vx_setzero_s64() { return VXPREFIX(_setzero_s64)(); }
+    inline v_uint64 vx_setzero_u64() { return VXPREFIX(_setzero_u64)(); }
+#if CV_SIMD_64F || CV_SIMD_SCALABLE_64F
+    inline v_float64 vx_setzero_f64() { return VXPREFIX(_setzero_f64)(); }
+#endif
+    //! @}
+
+    //! @name Wide load from memory
+    //! @{
+    //! @brief Load maximum available capacity register contents from memory
+    inline v_uint8 vx_load(const uchar * ptr) { return VXPREFIX(_load)(ptr); }
+    inline v_int8 vx_load(const schar * ptr) { return VXPREFIX(_load)(ptr); }
+    inline v_uint16 vx_load(const ushort * ptr) { return VXPREFIX(_load)(ptr); }
+    inline v_int16 vx_load(const short * ptr) { return VXPREFIX(_load)(ptr); }
+    inline v_int32 vx_load(const int * ptr) { return VXPREFIX(_load)(ptr); }
+    inline v_uint32 vx_load(const unsigned * ptr) { return VXPREFIX(_load)(ptr); }
+    inline v_float32 vx_load(const float * ptr) { return VXPREFIX(_load)(ptr); }
+    inline v_int64 vx_load(const int64 * ptr) { return VXPREFIX(_load)(ptr); }
+    inline v_uint64 vx_load(const uint64 * ptr) { return VXPREFIX(_load)(ptr); }
+#if CV_SIMD_64F || CV_SIMD_SCALABLE_64F
+    inline v_float64 vx_load(const double * ptr) { return VXPREFIX(_load)(ptr); }
+#endif
+    //! @}
+
+    //! @name Wide load from memory(aligned)
+    //! @{
+    //! @brief Load maximum available capacity register contents from memory(aligned)
+    inline v_uint8 vx_load_aligned(const uchar * ptr) { return VXPREFIX(_load_aligned)(ptr); }
+    inline v_int8 vx_load_aligned(const schar * ptr) { return VXPREFIX(_load_aligned)(ptr); }
+    inline v_uint16 vx_load_aligned(const ushort * ptr) { return VXPREFIX(_load_aligned)(ptr); }
+    inline v_int16 vx_load_aligned(const short * ptr) { return VXPREFIX(_load_aligned)(ptr); }
+    inline v_int32 vx_load_aligned(const int * ptr) { return VXPREFIX(_load_aligned)(ptr); }
+    inline v_uint32 vx_load_aligned(const unsigned * ptr) { return VXPREFIX(_load_aligned)(ptr); }
+    inline v_float32 vx_load_aligned(const float * ptr) { return VXPREFIX(_load_aligned)(ptr); }
+    inline v_int64 vx_load_aligned(const int64 * ptr) { return VXPREFIX(_load_aligned)(ptr); }
+    inline v_uint64 vx_load_aligned(const uint64 * ptr) { return VXPREFIX(_load_aligned)(ptr); }
+#if CV_SIMD_64F || CV_SIMD_SCALABLE_64F
+    inline v_float64 vx_load_aligned(const double * ptr) { return VXPREFIX(_load_aligned)(ptr); }
+#endif
+    //! @}
+
+    //! @name Wide load lower half from memory
+    //! @{
+    //! @brief Load lower half of maximum available capacity register from memory
+    inline v_uint8 vx_load_low(const uchar * ptr) { return VXPREFIX(_load_low)(ptr); }
+    inline v_int8 vx_load_low(const schar * ptr) { return VXPREFIX(_load_low)(ptr); }
+    inline v_uint16 vx_load_low(const ushort * ptr) { return VXPREFIX(_load_low)(ptr); }
+    inline v_int16 vx_load_low(const short * ptr) { return VXPREFIX(_load_low)(ptr); }
+    inline v_int32 vx_load_low(const int * ptr) { return VXPREFIX(_load_low)(ptr); }
+    inline v_uint32 vx_load_low(const unsigned * ptr) { return VXPREFIX(_load_low)(ptr); }
+    inline v_float32 vx_load_low(const float * ptr) { return VXPREFIX(_load_low)(ptr); }
+    inline v_int64 vx_load_low(const int64 * ptr) { return VXPREFIX(_load_low)(ptr); }
+    inline v_uint64 vx_load_low(const uint64 * ptr) { return VXPREFIX(_load_low)(ptr); }
+#if CV_SIMD_64F || CV_SIMD_SCALABLE_64F
+    inline v_float64 vx_load_low(const double * ptr) { return VXPREFIX(_load_low)(ptr); }
+#endif
+    //! @}
+
+    //! @name Wide load halfs from memory
+    //! @{
+    //! @brief Load maximum available capacity register contents from two memory blocks
+    inline v_uint8 vx_load_halves(const uchar * ptr0, const uchar * ptr1) { return VXPREFIX(_load_halves)(ptr0, ptr1); }
+    inline v_int8 vx_load_halves(const schar * ptr0, const schar * ptr1) { return VXPREFIX(_load_halves)(ptr0, ptr1); }
+    inline v_uint16 vx_load_halves(const ushort * ptr0, const ushort * ptr1) { return VXPREFIX(_load_halves)(ptr0, ptr1); }
+    inline v_int16 vx_load_halves(const short * ptr0, const short * ptr1) { return VXPREFIX(_load_halves)(ptr0, ptr1); }
+    inline v_int32 vx_load_halves(const int * ptr0, const int * ptr1) { return VXPREFIX(_load_halves)(ptr0, ptr1); }
+    inline v_uint32 vx_load_halves(const unsigned * ptr0, const unsigned * ptr1) { return VXPREFIX(_load_halves)(ptr0, ptr1); }
+    inline v_float32 vx_load_halves(const float * ptr0, const float * ptr1) { return VXPREFIX(_load_halves)(ptr0, ptr1); }
+    inline v_int64 vx_load_halves(const int64 * ptr0, const int64 * ptr1) { return VXPREFIX(_load_halves)(ptr0, ptr1); }
+    inline v_uint64 vx_load_halves(const uint64 * ptr0, const uint64 * ptr1) { return VXPREFIX(_load_halves)(ptr0, ptr1); }
+#if CV_SIMD_64F || CV_SIMD_SCALABLE_64F
+    inline v_float64 vx_load_halves(const double * ptr0, const double * ptr1) { return VXPREFIX(_load_halves)(ptr0, ptr1); }
+#endif
+    //! @}
+
+    //! @name Wide LUT of elements
+    //! @{
+    //! @brief Load maximum available capacity register contents with array elements by provided indexes
+    inline v_uint8 vx_lut(const uchar * ptr, const int* idx) { return VXPREFIX(_lut)(ptr, idx); }
+    inline v_int8 vx_lut(const schar * ptr, const int* idx) { return VXPREFIX(_lut)(ptr, idx); }
+    inline v_uint16 vx_lut(const ushort * ptr, const int* idx) { return VXPREFIX(_lut)(ptr, idx); }
+    inline v_int16 vx_lut(const short* ptr, const int* idx) { return VXPREFIX(_lut)(ptr, idx); }
+    inline v_int32 vx_lut(const int* ptr, const int* idx) { return VXPREFIX(_lut)(ptr, idx); }
+    inline v_uint32 vx_lut(const unsigned* ptr, const int* idx) { return VXPREFIX(_lut)(ptr, idx); }
+    inline v_float32 vx_lut(const float* ptr, const int* idx) { return VXPREFIX(_lut)(ptr, idx); }
+    inline v_int64 vx_lut(const int64 * ptr, const int* idx) { return VXPREFIX(_lut)(ptr, idx); }
+    inline v_uint64 vx_lut(const uint64 * ptr, const int* idx) { return VXPREFIX(_lut)(ptr, idx); }
+#if CV_SIMD_64F || CV_SIMD_SCALABLE_64F
+    inline v_float64 vx_lut(const double* ptr, const int* idx) { return VXPREFIX(_lut)(ptr, idx); }
+#endif
+    //! @}
+
+    //! @name Wide LUT of element pairs
+    //! @{
+    //! @brief Load maximum available capacity register contents with array element pairs by provided indexes
+    inline v_uint8 vx_lut_pairs(const uchar * ptr, const int* idx) { return VXPREFIX(_lut_pairs)(ptr, idx); }
+    inline v_int8 vx_lut_pairs(const schar * ptr, const int* idx) { return VXPREFIX(_lut_pairs)(ptr, idx); }
+    inline v_uint16 vx_lut_pairs(const ushort * ptr, const int* idx) { return VXPREFIX(_lut_pairs)(ptr, idx); }
+    inline v_int16 vx_lut_pairs(const short* ptr, const int* idx) { return VXPREFIX(_lut_pairs)(ptr, idx); }
+    inline v_int32 vx_lut_pairs(const int* ptr, const int* idx) { return VXPREFIX(_lut_pairs)(ptr, idx); }
+    inline v_uint32 vx_lut_pairs(const unsigned* ptr, const int* idx) { return VXPREFIX(_lut_pairs)(ptr, idx); }
+    inline v_float32 vx_lut_pairs(const float* ptr, const int* idx) { return VXPREFIX(_lut_pairs)(ptr, idx); }
+    inline v_int64 vx_lut_pairs(const int64 * ptr, const int* idx) { return VXPREFIX(_lut_pairs)(ptr, idx); }
+    inline v_uint64 vx_lut_pairs(const uint64 * ptr, const int* idx) { return VXPREFIX(_lut_pairs)(ptr, idx); }
+#if CV_SIMD_64F || CV_SIMD_SCALABLE_64F
+    inline v_float64 vx_lut_pairs(const double* ptr, const int* idx) { return VXPREFIX(_lut_pairs)(ptr, idx); }
+#endif
+    //! @}
+
+    //! @name Wide LUT of element quads
+    //! @{
+    //! @brief Load maximum available capacity register contents with array element quads by provided indexes
+    inline v_uint8 vx_lut_quads(const uchar* ptr, const int* idx) { return VXPREFIX(_lut_quads)(ptr, idx); }
+    inline v_int8 vx_lut_quads(const schar* ptr, const int* idx) { return VXPREFIX(_lut_quads)(ptr, idx); }
+    inline v_uint16 vx_lut_quads(const ushort* ptr, const int* idx) { return VXPREFIX(_lut_quads)(ptr, idx); }
+    inline v_int16 vx_lut_quads(const short* ptr, const int* idx) { return VXPREFIX(_lut_quads)(ptr, idx); }
+    inline v_int32 vx_lut_quads(const int* ptr, const int* idx) { return VXPREFIX(_lut_quads)(ptr, idx); }
+    inline v_uint32 vx_lut_quads(const unsigned* ptr, const int* idx) { return VXPREFIX(_lut_quads)(ptr, idx); }
+    inline v_float32 vx_lut_quads(const float* ptr, const int* idx) { return VXPREFIX(_lut_quads)(ptr, idx); }
+    //! @}
+
+    //! @name Wide load with double expansion
+    //! @{
+    //! @brief Load maximum available capacity register contents from memory with double expand
+    inline v_uint16 vx_load_expand(const uchar * ptr) { return VXPREFIX(_load_expand)(ptr); }
+    inline v_int16 vx_load_expand(const schar * ptr) { return VXPREFIX(_load_expand)(ptr); }
+    inline v_uint32 vx_load_expand(const ushort * ptr) { return VXPREFIX(_load_expand)(ptr); }
+    inline v_int32 vx_load_expand(const short* ptr) { return VXPREFIX(_load_expand)(ptr); }
+    inline v_int64 vx_load_expand(const int* ptr) { return VXPREFIX(_load_expand)(ptr); }
+    inline v_uint64 vx_load_expand(const unsigned* ptr) { return VXPREFIX(_load_expand)(ptr); }
+    inline v_float32 vx_load_expand(const hfloat * ptr) { return VXPREFIX(_load_expand)(ptr); }
+    //! @}
+
+    //! @name Wide load with quad expansion
+    //! @{
+    //! @brief Load maximum available capacity register contents from memory with quad expand
+    inline v_uint32 vx_load_expand_q(const uchar * ptr) { return VXPREFIX(_load_expand_q)(ptr); }
+    inline v_int32 vx_load_expand_q(const schar * ptr) { return VXPREFIX(_load_expand_q)(ptr); }
+    //! @}
+
+    /** @brief SIMD processing state cleanup call */
+    inline void vx_cleanup() { VXPREFIX(_cleanup)(); }
+
+#if !CV_SIMD_SCALABLE
+    // Compatibility layer
+#if !(CV_NEON && !defined(CV_FORCE_SIMD128_CPP))
+    template<typename T> struct VTraits {
+        static inline int vlanes() { return T::nlanes; }
+        enum { nlanes = T::nlanes, max_nlanes = T::nlanes };
+        using lane_type = typename T::lane_type;
+    };
+
+    //////////// get0 ////////////
+    #define OPENCV_HAL_WRAP_GRT0(_Tpvec) \
+    inline typename VTraits<_Tpvec>::lane_type v_get0(const _Tpvec& v) \
+    { \
+        return v.get0(); \
+    }
+
+    OPENCV_HAL_WRAP_GRT0(v_uint8)
+    OPENCV_HAL_WRAP_GRT0(v_int8)
+    OPENCV_HAL_WRAP_GRT0(v_uint16)
+    OPENCV_HAL_WRAP_GRT0(v_int16)
+    OPENCV_HAL_WRAP_GRT0(v_uint32)
+    OPENCV_HAL_WRAP_GRT0(v_int32)
+    OPENCV_HAL_WRAP_GRT0(v_uint64)
+    OPENCV_HAL_WRAP_GRT0(v_int64)
+    OPENCV_HAL_WRAP_GRT0(v_float32)
+    #if CV_SIMD_64F
+    OPENCV_HAL_WRAP_GRT0(v_float64)
+    #endif
+    #if CV_SIMD_WIDTH != 16/*128*/ && CV_SIMD128
+        OPENCV_HAL_WRAP_GRT0(v_uint8x16)
+        OPENCV_HAL_WRAP_GRT0(v_uint16x8)
+        OPENCV_HAL_WRAP_GRT0(v_uint32x4)
+        OPENCV_HAL_WRAP_GRT0(v_uint64x2)
+        OPENCV_HAL_WRAP_GRT0(v_int8x16)
+        OPENCV_HAL_WRAP_GRT0(v_int16x8)
+        OPENCV_HAL_WRAP_GRT0(v_int32x4)
+        OPENCV_HAL_WRAP_GRT0(v_int64x2)
+        OPENCV_HAL_WRAP_GRT0(v_float32x4)
+        #if CV_SIMD_64F
+        OPENCV_HAL_WRAP_GRT0(v_float64x2)
+        #endif
+    #endif
+    #if CV_SIMD_WIDTH != 32/*256*/ && CV_SIMD256
+        OPENCV_HAL_WRAP_GRT0(v_uint8x32)
+        OPENCV_HAL_WRAP_GRT0(v_uint16x16)
+        OPENCV_HAL_WRAP_GRT0(v_uint32x8)
+        OPENCV_HAL_WRAP_GRT0(v_uint64x4)
+        OPENCV_HAL_WRAP_GRT0(v_int8x32)
+        OPENCV_HAL_WRAP_GRT0(v_int16x16)
+        OPENCV_HAL_WRAP_GRT0(v_int32x8)
+        OPENCV_HAL_WRAP_GRT0(v_int64x4)
+        OPENCV_HAL_WRAP_GRT0(v_float32x8)
+        #if CV_SIMD_64F
+        OPENCV_HAL_WRAP_GRT0(v_float64x4)
+        #endif
+    #endif
+#endif
+
+    #define OPENCV_HAL_WRAP_BIN_OP_ADDSUB(_Tpvec) \
+    template<typename... Args> \
+    inline _Tpvec v_add(const _Tpvec& f1, const _Tpvec& f2, const _Tpvec& f3, const Args&... vf) { \
+        return v_add(v_add(f1, f2), f3, vf...); \
+    }
+
+    OPENCV_HAL_WRAP_BIN_OP_ADDSUB(v_uint8)
+    OPENCV_HAL_WRAP_BIN_OP_ADDSUB(v_uint16)
+    OPENCV_HAL_WRAP_BIN_OP_ADDSUB(v_uint32)
+    OPENCV_HAL_WRAP_BIN_OP_ADDSUB(v_uint64)
+    OPENCV_HAL_WRAP_BIN_OP_ADDSUB(v_int8)
+    OPENCV_HAL_WRAP_BIN_OP_ADDSUB(v_int16)
+    OPENCV_HAL_WRAP_BIN_OP_ADDSUB(v_int32)
+    OPENCV_HAL_WRAP_BIN_OP_ADDSUB(v_int64)
+    OPENCV_HAL_WRAP_BIN_OP_ADDSUB(v_float32)
+    #if CV_SIMD_64F
+    OPENCV_HAL_WRAP_BIN_OP_ADDSUB(v_float64)
+    #endif
+    #if CV_SIMD_WIDTH != 16/*128*/ && CV_SIMD128
+    // when we use CV_SIMD128 with 256/512 bit SIMD (e.g. AVX2 or AVX512)
+        OPENCV_HAL_WRAP_BIN_OP_ADDSUB(v_uint8x16)
+        OPENCV_HAL_WRAP_BIN_OP_ADDSUB(v_uint16x8)
+        OPENCV_HAL_WRAP_BIN_OP_ADDSUB(v_uint32x4)
+        OPENCV_HAL_WRAP_BIN_OP_ADDSUB(v_uint64x2)
+        OPENCV_HAL_WRAP_BIN_OP_ADDSUB(v_int8x16)
+        OPENCV_HAL_WRAP_BIN_OP_ADDSUB(v_int16x8)
+        OPENCV_HAL_WRAP_BIN_OP_ADDSUB(v_int32x4)
+        OPENCV_HAL_WRAP_BIN_OP_ADDSUB(v_int64x2)
+        OPENCV_HAL_WRAP_BIN_OP_ADDSUB(v_float32x4)
+        #if CV_SIMD_64F
+        OPENCV_HAL_WRAP_BIN_OP_ADDSUB(v_float64x2)
+        #endif
+    #endif
+    #if CV_SIMD_WIDTH != 32/*256*/ && CV_SIMD256
+    // when we use CV_SIMD256 with 512 bit SIMD (e.g. AVX512)
+        OPENCV_HAL_WRAP_BIN_OP_ADDSUB(v_uint8x32)
+        OPENCV_HAL_WRAP_BIN_OP_ADDSUB(v_uint16x16)
+        OPENCV_HAL_WRAP_BIN_OP_ADDSUB(v_uint32x8)
+        OPENCV_HAL_WRAP_BIN_OP_ADDSUB(v_uint64x4)
+        OPENCV_HAL_WRAP_BIN_OP_ADDSUB(v_int8x32)
+        OPENCV_HAL_WRAP_BIN_OP_ADDSUB(v_int16x16)
+        OPENCV_HAL_WRAP_BIN_OP_ADDSUB(v_int32x8)
+        OPENCV_HAL_WRAP_BIN_OP_ADDSUB(v_int64x4)
+        OPENCV_HAL_WRAP_BIN_OP_ADDSUB(v_float32x8)
+        #if CV_SIMD_64F
+        OPENCV_HAL_WRAP_BIN_OP_ADDSUB(v_float64x4)
+        #endif
+    #endif
+
+    #define OPENCV_HAL_WRAP_BIN_OP_MUL(_Tpvec) \
+    template<typename... Args> \
+    inline _Tpvec v_mul(const _Tpvec& f1, const _Tpvec& f2, const _Tpvec& f3, const Args&... vf) { \
+        return v_mul(v_mul(f1, f2), f3, vf...); \
+    }
+    OPENCV_HAL_WRAP_BIN_OP_MUL(v_uint8)
+    OPENCV_HAL_WRAP_BIN_OP_MUL(v_int8)
+    OPENCV_HAL_WRAP_BIN_OP_MUL(v_uint16)
+    OPENCV_HAL_WRAP_BIN_OP_MUL(v_uint32)
+    OPENCV_HAL_WRAP_BIN_OP_MUL(v_int16)
+    OPENCV_HAL_WRAP_BIN_OP_MUL(v_int32)
+    OPENCV_HAL_WRAP_BIN_OP_MUL(v_float32)
+    #if CV_SIMD_64F
+    OPENCV_HAL_WRAP_BIN_OP_MUL(v_float64)
+    #endif
+    #if CV_SIMD_WIDTH != 16/*128*/ && CV_SIMD128
+        OPENCV_HAL_WRAP_BIN_OP_MUL(v_uint8x16)
+        OPENCV_HAL_WRAP_BIN_OP_MUL(v_uint16x8)
+        OPENCV_HAL_WRAP_BIN_OP_MUL(v_uint32x4)
+        OPENCV_HAL_WRAP_BIN_OP_MUL(v_int8x16)
+        OPENCV_HAL_WRAP_BIN_OP_MUL(v_int16x8)
+        OPENCV_HAL_WRAP_BIN_OP_MUL(v_int32x4)
+        OPENCV_HAL_WRAP_BIN_OP_MUL(v_float32x4)
+        #if CV_SIMD_64F
+        OPENCV_HAL_WRAP_BIN_OP_MUL(v_float64x2)
+        #endif
+    #endif
+    #if CV_SIMD_WIDTH != 32/*256*/ && CV_SIMD256
+        OPENCV_HAL_WRAP_BIN_OP_MUL(v_uint8x32)
+        OPENCV_HAL_WRAP_BIN_OP_MUL(v_uint16x16)
+        OPENCV_HAL_WRAP_BIN_OP_MUL(v_uint32x8)
+        OPENCV_HAL_WRAP_BIN_OP_MUL(v_int8x32)
+        OPENCV_HAL_WRAP_BIN_OP_MUL(v_int16x16)
+        OPENCV_HAL_WRAP_BIN_OP_MUL(v_int32x8)
+        OPENCV_HAL_WRAP_BIN_OP_MUL(v_float32x8)
+        #if CV_SIMD_64F
+        OPENCV_HAL_WRAP_BIN_OP_MUL(v_float64x4)
+        #endif
+    #endif
+
+    #define OPENCV_HAL_WRAP_EXTRACT(_Tpvec) \
+    inline typename VTraits<_Tpvec>::lane_type v_extract_highest(const _Tpvec& v) \
+    { \
+        return v_extract_n<VTraits<_Tpvec>::nlanes-1>(v); \
+    }
+
+    OPENCV_HAL_WRAP_EXTRACT(v_uint8)
+    OPENCV_HAL_WRAP_EXTRACT(v_int8)
+    OPENCV_HAL_WRAP_EXTRACT(v_uint16)
+    OPENCV_HAL_WRAP_EXTRACT(v_int16)
+    OPENCV_HAL_WRAP_EXTRACT(v_uint32)
+    OPENCV_HAL_WRAP_EXTRACT(v_int32)
+    OPENCV_HAL_WRAP_EXTRACT(v_uint64)
+    OPENCV_HAL_WRAP_EXTRACT(v_int64)
+    OPENCV_HAL_WRAP_EXTRACT(v_float32)
+    #if CV_SIMD_64F
+    OPENCV_HAL_WRAP_EXTRACT(v_float64)
+    #endif
+    #if CV_SIMD_WIDTH != 16/*128*/ && CV_SIMD128
+        OPENCV_HAL_WRAP_EXTRACT(v_uint8x16)
+        OPENCV_HAL_WRAP_EXTRACT(v_uint16x8)
+        OPENCV_HAL_WRAP_EXTRACT(v_uint32x4)
+        OPENCV_HAL_WRAP_EXTRACT(v_uint64x2)
+        OPENCV_HAL_WRAP_EXTRACT(v_int8x16)
+        OPENCV_HAL_WRAP_EXTRACT(v_int16x8)
+        OPENCV_HAL_WRAP_EXTRACT(v_int32x4)
+        OPENCV_HAL_WRAP_EXTRACT(v_int64x2)
+        OPENCV_HAL_WRAP_EXTRACT(v_float32x4)
+        #if CV_SIMD_64F
+        OPENCV_HAL_WRAP_EXTRACT(v_float64x2)
+        #endif
+    #endif
+    #if CV_SIMD_WIDTH != 32/*256*/ && CV_SIMD256
+        OPENCV_HAL_WRAP_EXTRACT(v_uint8x32)
+        OPENCV_HAL_WRAP_EXTRACT(v_uint16x16)
+        OPENCV_HAL_WRAP_EXTRACT(v_uint32x8)
+        OPENCV_HAL_WRAP_EXTRACT(v_uint64x4)
+        OPENCV_HAL_WRAP_EXTRACT(v_int8x32)
+        OPENCV_HAL_WRAP_EXTRACT(v_int16x16)
+        OPENCV_HAL_WRAP_EXTRACT(v_int32x8)
+        OPENCV_HAL_WRAP_EXTRACT(v_int64x4)
+        OPENCV_HAL_WRAP_EXTRACT(v_float32x8)
+        #if CV_SIMD_64F
+        OPENCV_HAL_WRAP_EXTRACT(v_float64x4)
+        #endif
+    #endif
+
+    #define OPENCV_HAL_WRAP_BROADCAST(_Tpvec) \
+    inline _Tpvec v_broadcast_highest(const _Tpvec& v) \
+    { \
+        return v_broadcast_element<VTraits<_Tpvec>::nlanes-1>(v); \
+    }
+
+    OPENCV_HAL_WRAP_BROADCAST(v_uint32)
+    OPENCV_HAL_WRAP_BROADCAST(v_int32)
+    OPENCV_HAL_WRAP_BROADCAST(v_float32)
+    #if CV_SIMD_WIDTH != 16/*128*/ && CV_SIMD128
+        OPENCV_HAL_WRAP_BROADCAST(v_uint32x4)
+        OPENCV_HAL_WRAP_BROADCAST(v_int32x4)
+        OPENCV_HAL_WRAP_BROADCAST(v_float32x4)
+    #endif
+    #if CV_SIMD_WIDTH != 32/*256*/ && CV_SIMD256
+        OPENCV_HAL_WRAP_BROADCAST(v_uint32x8)
+        OPENCV_HAL_WRAP_BROADCAST(v_int32x8)
+        OPENCV_HAL_WRAP_BROADCAST(v_float32x8)
+    #endif
+
+#endif //!CV_SIMD_SCALABLE
+
+//! @cond IGNORED
+
+    // backward compatibility
+    template<typename _Tp, typename _Tvec> static inline
+    void vx_store(_Tp* dst, const _Tvec& v) { return v_store(dst, v); }
+    // backward compatibility
+    template<typename _Tp, typename _Tvec> static inline
+    void vx_store_aligned(_Tp* dst, const _Tvec& v) { return v_store_aligned(dst, v); }
+
+//! @endcond
+
+
+//! @}
+    #undef VXPREFIX
+} // namespace
+
+
+#ifndef CV_SIMD_FP16
+#define CV_SIMD_FP16 0  //!< Defined to 1 on native support of operations with float16x8_t / float16x16_t (SIMD256) types
+#endif
+
+#ifndef CV_SIMD
+#define CV_SIMD 0
+#endif
+
+#include "simd_utils.impl.hpp"
+
+#ifndef CV_DOXYGEN
+CV_CPU_OPTIMIZATION_HAL_NAMESPACE_END
+#endif
+
+} // cv::
+
+//! @endcond
+
+#if defined(__GNUC__) && __GNUC__ == 12
+#pragma GCC diagnostic pop
+#endif
+
+#endif
diff --git a/3rdParty/opencv2/core/hal/intrin_avx.hpp b/3rdParty/opencv-4.12.0/opencv2/core/hal/intrin_avx.hpp
similarity index 90%
rename from 3rdParty/opencv2/core/hal/intrin_avx.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/hal/intrin_avx.hpp
index 058b06ca9e..f9a58ccd77 100644
--- a/3rdParty/opencv2/core/hal/intrin_avx.hpp
+++ b/3rdParty/opencv-4.12.0/opencv2/core/hal/intrin_avx.hpp
@@ -447,6 +447,10 @@ OPENCV_HAL_IMPL_AVX_LOADSTORE_FLT(v_float64x4, double, pd, __m128d)
     { return _Tpvec(_mm256_setzero_si256()); }                                   \
     inline _Tpvec v256_setall_##suffix(_Tp v)                                    \
     { return _Tpvec(_mm256_set1_##ssuffix((ctype_s)v)); }                        \
+    template <> inline _Tpvec v_setzero_()                                       \
+    { return v256_setzero_##suffix(); }                                          \
+    template <> inline _Tpvec v_setall_(_Tp v)                                   \
+    { return v256_setall_##suffix(v); }                                          \
     OPENCV_HAL_IMPL_AVX_CAST(_Tpvec, v_uint8x32,  suffix, OPENCV_HAL_NOP)        \
     OPENCV_HAL_IMPL_AVX_CAST(_Tpvec, v_int8x32,   suffix, OPENCV_HAL_NOP)        \
     OPENCV_HAL_IMPL_AVX_CAST(_Tpvec, v_uint16x16, suffix, OPENCV_HAL_NOP)        \
@@ -472,6 +476,10 @@ OPENCV_HAL_IMPL_AVX_INIT(v_int64x4,   int64,    s64, epi64x, int64)
     { return _Tpvec(_mm256_setzero_##zsuffix()); }                       \
     inline _Tpvec v256_setall_##suffix(_Tp v)                            \
     { return _Tpvec(_mm256_set1_##zsuffix(v)); }                         \
+    template <> inline _Tpvec v_setzero_()                               \
+    { return v256_setzero_##suffix(); }                                  \
+    template <> inline _Tpvec v_setall_(_Tp v)                           \
+    { return v256_setall_##suffix(v); }                                  \
     OPENCV_HAL_IMPL_AVX_CAST(_Tpvec, v_uint8x32,  suffix, cast)          \
     OPENCV_HAL_IMPL_AVX_CAST(_Tpvec, v_int8x32,   suffix, cast)          \
     OPENCV_HAL_IMPL_AVX_CAST(_Tpvec, v_uint16x16, suffix, cast)          \
@@ -673,53 +681,51 @@ OPENCV_HAL_IMPL_AVX_ZIP(v_float64x4)
 
 /** Arithmetics **/
 #define OPENCV_HAL_IMPL_AVX_BIN_OP(bin_op, _Tpvec, intrin)            \
-    inline _Tpvec operator bin_op (const _Tpvec& a, const _Tpvec& b)  \
-    { return _Tpvec(intrin(a.val, b.val)); }                          \
-    inline _Tpvec& operator bin_op##= (_Tpvec& a, const _Tpvec& b)    \
-    { a.val = intrin(a.val, b.val); return a; }
-
-OPENCV_HAL_IMPL_AVX_BIN_OP(+, v_uint8x32,  _mm256_adds_epu8)
-OPENCV_HAL_IMPL_AVX_BIN_OP(-, v_uint8x32,  _mm256_subs_epu8)
-OPENCV_HAL_IMPL_AVX_BIN_OP(+, v_int8x32,   _mm256_adds_epi8)
-OPENCV_HAL_IMPL_AVX_BIN_OP(-, v_int8x32,   _mm256_subs_epi8)
-OPENCV_HAL_IMPL_AVX_BIN_OP(+, v_uint16x16, _mm256_adds_epu16)
-OPENCV_HAL_IMPL_AVX_BIN_OP(-, v_uint16x16, _mm256_subs_epu16)
-OPENCV_HAL_IMPL_AVX_BIN_OP(+, v_int16x16,  _mm256_adds_epi16)
-OPENCV_HAL_IMPL_AVX_BIN_OP(-, v_int16x16,  _mm256_subs_epi16)
-OPENCV_HAL_IMPL_AVX_BIN_OP(+, v_uint32x8,  _mm256_add_epi32)
-OPENCV_HAL_IMPL_AVX_BIN_OP(-, v_uint32x8,  _mm256_sub_epi32)
-OPENCV_HAL_IMPL_AVX_BIN_OP(*, v_uint32x8,  _mm256_mullo_epi32)
-OPENCV_HAL_IMPL_AVX_BIN_OP(+, v_int32x8,   _mm256_add_epi32)
-OPENCV_HAL_IMPL_AVX_BIN_OP(-, v_int32x8,   _mm256_sub_epi32)
-OPENCV_HAL_IMPL_AVX_BIN_OP(*, v_int32x8,   _mm256_mullo_epi32)
-OPENCV_HAL_IMPL_AVX_BIN_OP(+, v_uint64x4,  _mm256_add_epi64)
-OPENCV_HAL_IMPL_AVX_BIN_OP(-, v_uint64x4,  _mm256_sub_epi64)
-OPENCV_HAL_IMPL_AVX_BIN_OP(+, v_int64x4,   _mm256_add_epi64)
-OPENCV_HAL_IMPL_AVX_BIN_OP(-, v_int64x4,   _mm256_sub_epi64)
-
-OPENCV_HAL_IMPL_AVX_BIN_OP(+, v_float32x8, _mm256_add_ps)
-OPENCV_HAL_IMPL_AVX_BIN_OP(-, v_float32x8, _mm256_sub_ps)
-OPENCV_HAL_IMPL_AVX_BIN_OP(*, v_float32x8, _mm256_mul_ps)
-OPENCV_HAL_IMPL_AVX_BIN_OP(/, v_float32x8, _mm256_div_ps)
-OPENCV_HAL_IMPL_AVX_BIN_OP(+, v_float64x4, _mm256_add_pd)
-OPENCV_HAL_IMPL_AVX_BIN_OP(-, v_float64x4, _mm256_sub_pd)
-OPENCV_HAL_IMPL_AVX_BIN_OP(*, v_float64x4, _mm256_mul_pd)
-OPENCV_HAL_IMPL_AVX_BIN_OP(/, v_float64x4, _mm256_div_pd)
+    inline _Tpvec bin_op(const _Tpvec& a, const _Tpvec& b)            \
+    { return _Tpvec(intrin(a.val, b.val)); }
+
+OPENCV_HAL_IMPL_AVX_BIN_OP(v_add, v_uint8x32,  _mm256_adds_epu8)
+OPENCV_HAL_IMPL_AVX_BIN_OP(v_sub, v_uint8x32,  _mm256_subs_epu8)
+OPENCV_HAL_IMPL_AVX_BIN_OP(v_add, v_int8x32,   _mm256_adds_epi8)
+OPENCV_HAL_IMPL_AVX_BIN_OP(v_sub, v_int8x32,   _mm256_subs_epi8)
+OPENCV_HAL_IMPL_AVX_BIN_OP(v_add, v_uint16x16, _mm256_adds_epu16)
+OPENCV_HAL_IMPL_AVX_BIN_OP(v_sub, v_uint16x16, _mm256_subs_epu16)
+OPENCV_HAL_IMPL_AVX_BIN_OP(v_add, v_int16x16,  _mm256_adds_epi16)
+OPENCV_HAL_IMPL_AVX_BIN_OP(v_sub, v_int16x16,  _mm256_subs_epi16)
+OPENCV_HAL_IMPL_AVX_BIN_OP(v_add, v_uint32x8,  _mm256_add_epi32)
+OPENCV_HAL_IMPL_AVX_BIN_OP(v_sub, v_uint32x8,  _mm256_sub_epi32)
+OPENCV_HAL_IMPL_AVX_BIN_OP(v_mul, v_uint32x8,  _mm256_mullo_epi32)
+OPENCV_HAL_IMPL_AVX_BIN_OP(v_add, v_int32x8,   _mm256_add_epi32)
+OPENCV_HAL_IMPL_AVX_BIN_OP(v_sub, v_int32x8,   _mm256_sub_epi32)
+OPENCV_HAL_IMPL_AVX_BIN_OP(v_mul, v_int32x8,   _mm256_mullo_epi32)
+OPENCV_HAL_IMPL_AVX_BIN_OP(v_add, v_uint64x4,  _mm256_add_epi64)
+OPENCV_HAL_IMPL_AVX_BIN_OP(v_sub, v_uint64x4,  _mm256_sub_epi64)
+OPENCV_HAL_IMPL_AVX_BIN_OP(v_add, v_int64x4,   _mm256_add_epi64)
+OPENCV_HAL_IMPL_AVX_BIN_OP(v_sub, v_int64x4,   _mm256_sub_epi64)
+
+OPENCV_HAL_IMPL_AVX_BIN_OP(v_add, v_float32x8, _mm256_add_ps)
+OPENCV_HAL_IMPL_AVX_BIN_OP(v_sub, v_float32x8, _mm256_sub_ps)
+OPENCV_HAL_IMPL_AVX_BIN_OP(v_mul, v_float32x8, _mm256_mul_ps)
+OPENCV_HAL_IMPL_AVX_BIN_OP(v_div, v_float32x8, _mm256_div_ps)
+OPENCV_HAL_IMPL_AVX_BIN_OP(v_add, v_float64x4, _mm256_add_pd)
+OPENCV_HAL_IMPL_AVX_BIN_OP(v_sub, v_float64x4, _mm256_sub_pd)
+OPENCV_HAL_IMPL_AVX_BIN_OP(v_mul, v_float64x4, _mm256_mul_pd)
+OPENCV_HAL_IMPL_AVX_BIN_OP(v_div, v_float64x4, _mm256_div_pd)
 
 // saturating multiply 8-bit, 16-bit
-inline v_uint8x32 operator * (const v_uint8x32& a, const v_uint8x32& b)
+inline v_uint8x32 v_mul(const v_uint8x32& a, const v_uint8x32& b)
 {
     v_uint16x16 c, d;
     v_mul_expand(a, b, c, d);
     return v_pack(c, d);
 }
-inline v_int8x32 operator * (const v_int8x32& a, const v_int8x32& b)
+inline v_int8x32 v_mul(const v_int8x32& a, const v_int8x32& b)
 {
     v_int16x16 c, d;
     v_mul_expand(a, b, c, d);
     return v_pack(c, d);
 }
-inline v_uint16x16 operator * (const v_uint16x16& a, const v_uint16x16& b)
+inline v_uint16x16 v_mul(const v_uint16x16& a, const v_uint16x16& b)
 {
     __m256i pl = _mm256_mullo_epi16(a.val, b.val);
     __m256i ph = _mm256_mulhi_epu16(a.val, b.val);
@@ -727,7 +733,7 @@ inline v_uint16x16 operator * (const v_uint16x16& a, const v_uint16x16& b)
     __m256i p1 = _mm256_unpackhi_epi16(pl, ph);
     return v_uint16x16(_v256_packs_epu32(p0, p1));
 }
-inline v_int16x16 operator * (const v_int16x16& a, const v_int16x16& b)
+inline v_int16x16 v_mul(const v_int16x16& a, const v_int16x16& b)
 {
     __m256i pl = _mm256_mullo_epi16(a.val, b.val);
     __m256i ph = _mm256_mulhi_epi16(a.val, b.val);
@@ -735,14 +741,6 @@ inline v_int16x16 operator * (const v_int16x16& a, const v_int16x16& b)
     __m256i p1 = _mm256_unpackhi_epi16(pl, ph);
     return v_int16x16(_mm256_packs_epi32(p0, p1));
 }
-inline v_uint8x32& operator *= (v_uint8x32& a, const v_uint8x32& b)
-{ a = a * b; return a; }
-inline v_int8x32& operator *= (v_int8x32& a, const v_int8x32& b)
-{ a = a * b; return a; }
-inline v_uint16x16& operator *= (v_uint16x16& a, const v_uint16x16& b)
-{ a = a * b; return a; }
-inline v_int16x16& operator *= (v_int16x16& a, const v_int16x16& b)
-{ a = a * b; return a; }
 
 /** Non-saturating arithmetics **/
 #define OPENCV_HAL_IMPL_AVX_BIN_FUNC(func, _Tpvec, intrin) \
@@ -833,13 +831,13 @@ inline v_uint16x16 v_mul_hi(const v_uint16x16& a, const v_uint16x16& b) { return
 
 /** Bitwise shifts **/
 #define OPENCV_HAL_IMPL_AVX_SHIFT_OP(_Tpuvec, _Tpsvec, suffix, srai)  \
-    inline _Tpuvec operator << (const _Tpuvec& a, int imm)            \
+    inline _Tpuvec v_shl(const _Tpuvec& a, int imm)                   \
     { return _Tpuvec(_mm256_slli_##suffix(a.val, imm)); }             \
-    inline _Tpsvec operator << (const _Tpsvec& a, int imm)            \
+    inline _Tpsvec v_shl(const _Tpsvec& a, int imm)                   \
     { return _Tpsvec(_mm256_slli_##suffix(a.val, imm)); }             \
-    inline _Tpuvec operator >> (const _Tpuvec& a, int imm)            \
+    inline _Tpuvec v_shr(const _Tpuvec& a, int imm)                   \
     { return _Tpuvec(_mm256_srli_##suffix(a.val, imm)); }             \
-    inline _Tpsvec operator >> (const _Tpsvec& a, int imm)            \
+    inline _Tpsvec v_shr(const _Tpsvec& a, int imm)                   \
     { return _Tpsvec(srai(a.val, imm)); }                             \
     template<int imm>                                                 \
     inline _Tpuvec v_shl(const _Tpuvec& a)                            \
@@ -867,11 +865,11 @@ OPENCV_HAL_IMPL_AVX_SHIFT_OP(v_uint64x4,  v_int64x4,  epi64, _mm256_srai_epi64xx
 
 
 /** Bitwise logic **/
-#define OPENCV_HAL_IMPL_AVX_LOGIC_OP(_Tpvec, suffix, not_const)  \
-    OPENCV_HAL_IMPL_AVX_BIN_OP(&, _Tpvec, _mm256_and_##suffix)   \
-    OPENCV_HAL_IMPL_AVX_BIN_OP(|, _Tpvec, _mm256_or_##suffix)    \
-    OPENCV_HAL_IMPL_AVX_BIN_OP(^, _Tpvec, _mm256_xor_##suffix)   \
-    inline _Tpvec operator ~ (const _Tpvec& a)                   \
+#define OPENCV_HAL_IMPL_AVX_LOGIC_OP(_Tpvec, suffix, not_const)     \
+    OPENCV_HAL_IMPL_AVX_BIN_OP(v_and, _Tpvec, _mm256_and_##suffix)  \
+    OPENCV_HAL_IMPL_AVX_BIN_OP(v_or, _Tpvec, _mm256_or_##suffix)    \
+    OPENCV_HAL_IMPL_AVX_BIN_OP(v_xor, _Tpvec, _mm256_xor_##suffix)  \
+    inline _Tpvec v_not(const _Tpvec& a)                            \
     { return _Tpvec(_mm256_xor_##suffix(a.val, not_const)); }
 
 OPENCV_HAL_IMPL_AVX_LOGIC_OP(v_uint8x32,   si256, _mm256_set1_epi32(-1))
@@ -900,29 +898,29 @@ OPENCV_HAL_IMPL_AVX_SELECT(v_float32x8, ps)
 OPENCV_HAL_IMPL_AVX_SELECT(v_float64x4, pd)
 
 /** Comparison **/
-#define OPENCV_HAL_IMPL_AVX_CMP_OP_OV(_Tpvec)                     \
-    inline _Tpvec operator != (const _Tpvec& a, const _Tpvec& b)  \
-    { return ~(a == b); }                                         \
-    inline _Tpvec operator <  (const _Tpvec& a, const _Tpvec& b)  \
-    { return b > a; }                                             \
-    inline _Tpvec operator >= (const _Tpvec& a, const _Tpvec& b)  \
-    { return ~(a < b); }                                          \
-    inline _Tpvec operator <= (const _Tpvec& a, const _Tpvec& b)  \
-    { return b >= a; }
+#define OPENCV_HAL_IMPL_AVX_CMP_OP_OV(_Tpvec)                            \
+    inline _Tpvec v_ne(const _Tpvec& a, const _Tpvec& b)                 \
+    { return v_not(v_eq(a, b)); }                                        \
+    inline _Tpvec v_lt(const _Tpvec& a, const _Tpvec& b)                 \
+    { return v_gt(b, a); }                                               \
+    inline _Tpvec v_ge(const _Tpvec& a, const _Tpvec& b)                 \
+    { return v_not(v_lt(a, b)); }                                        \
+    inline _Tpvec v_le(const _Tpvec& a, const _Tpvec& b)                 \
+    { return v_ge(b, a); }
 
 #define OPENCV_HAL_IMPL_AVX_CMP_OP_INT(_Tpuvec, _Tpsvec, suffix, sbit)   \
-    inline _Tpuvec operator == (const _Tpuvec& a, const _Tpuvec& b)      \
+    inline _Tpuvec v_eq(const _Tpuvec& a, const _Tpuvec& b)              \
     { return _Tpuvec(_mm256_cmpeq_##suffix(a.val, b.val)); }             \
-    inline _Tpuvec operator > (const _Tpuvec& a, const _Tpuvec& b)       \
+    inline _Tpuvec v_gt(const _Tpuvec& a, const _Tpuvec& b)              \
     {                                                                    \
         __m256i smask = _mm256_set1_##suffix(sbit);                      \
         return _Tpuvec(_mm256_cmpgt_##suffix(                            \
                        _mm256_xor_si256(a.val, smask),                   \
                        _mm256_xor_si256(b.val, smask)));                 \
     }                                                                    \
-    inline _Tpsvec operator == (const _Tpsvec& a, const _Tpsvec& b)      \
+    inline _Tpsvec v_eq(const _Tpsvec& a, const _Tpsvec& b)              \
     { return _Tpsvec(_mm256_cmpeq_##suffix(a.val, b.val)); }             \
-    inline _Tpsvec operator > (const _Tpsvec& a, const _Tpsvec& b)       \
+    inline _Tpsvec v_gt(const _Tpsvec& a, const _Tpsvec& b)              \
     { return _Tpsvec(_mm256_cmpgt_##suffix(a.val, b.val)); }             \
     OPENCV_HAL_IMPL_AVX_CMP_OP_OV(_Tpuvec)                               \
     OPENCV_HAL_IMPL_AVX_CMP_OP_OV(_Tpsvec)
@@ -932,25 +930,25 @@ OPENCV_HAL_IMPL_AVX_CMP_OP_INT(v_uint16x16, v_int16x16, epi16, (short)-32768)
 OPENCV_HAL_IMPL_AVX_CMP_OP_INT(v_uint32x8,  v_int32x8,  epi32, (int)0x80000000)
 
 #define OPENCV_HAL_IMPL_AVX_CMP_OP_64BIT(_Tpvec)                 \
-    inline _Tpvec operator == (const _Tpvec& a, const _Tpvec& b) \
+    inline _Tpvec v_eq(const _Tpvec& a, const _Tpvec& b)         \
     { return _Tpvec(_mm256_cmpeq_epi64(a.val, b.val)); }         \
-    inline _Tpvec operator != (const _Tpvec& a, const _Tpvec& b) \
-    { return ~(a == b); }
+    inline _Tpvec v_ne(const _Tpvec& a, const _Tpvec& b)         \
+    { return v_not(v_eq(a, b)); }
 
 OPENCV_HAL_IMPL_AVX_CMP_OP_64BIT(v_uint64x4)
 OPENCV_HAL_IMPL_AVX_CMP_OP_64BIT(v_int64x4)
 
 #define OPENCV_HAL_IMPL_AVX_CMP_FLT(bin_op, imm8, _Tpvec, suffix)    \
-    inline _Tpvec operator bin_op (const _Tpvec& a, const _Tpvec& b) \
+    inline _Tpvec bin_op(const _Tpvec& a, const _Tpvec& b)           \
     { return _Tpvec(_mm256_cmp_##suffix(a.val, b.val, imm8)); }
 
 #define OPENCV_HAL_IMPL_AVX_CMP_OP_FLT(_Tpvec, suffix)               \
-    OPENCV_HAL_IMPL_AVX_CMP_FLT(==, _CMP_EQ_OQ,  _Tpvec, suffix)     \
-    OPENCV_HAL_IMPL_AVX_CMP_FLT(!=, _CMP_NEQ_OQ, _Tpvec, suffix)     \
-    OPENCV_HAL_IMPL_AVX_CMP_FLT(<,  _CMP_LT_OQ,  _Tpvec, suffix)     \
-    OPENCV_HAL_IMPL_AVX_CMP_FLT(>,  _CMP_GT_OQ,  _Tpvec, suffix)     \
-    OPENCV_HAL_IMPL_AVX_CMP_FLT(<=, _CMP_LE_OQ,  _Tpvec, suffix)     \
-    OPENCV_HAL_IMPL_AVX_CMP_FLT(>=, _CMP_GE_OQ,  _Tpvec, suffix)
+    OPENCV_HAL_IMPL_AVX_CMP_FLT(v_eq, _CMP_EQ_OQ,  _Tpvec, suffix)   \
+    OPENCV_HAL_IMPL_AVX_CMP_FLT(v_ne, _CMP_NEQ_OQ, _Tpvec, suffix)   \
+    OPENCV_HAL_IMPL_AVX_CMP_FLT(v_lt,  _CMP_LT_OQ,  _Tpvec, suffix)  \
+    OPENCV_HAL_IMPL_AVX_CMP_FLT(v_gt,  _CMP_GT_OQ,  _Tpvec, suffix)  \
+    OPENCV_HAL_IMPL_AVX_CMP_FLT(v_le, _CMP_LE_OQ,  _Tpvec, suffix)   \
+    OPENCV_HAL_IMPL_AVX_CMP_FLT(v_ge, _CMP_GE_OQ,  _Tpvec, suffix)
 
 OPENCV_HAL_IMPL_AVX_CMP_OP_FLT(v_float32x8, ps)
 OPENCV_HAL_IMPL_AVX_CMP_OP_FLT(v_float64x4, pd)
@@ -1216,9 +1214,9 @@ inline unsigned v_reduce_sum(const v_uint32x8& a)
 { return v_reduce_sum(v_reinterpret_as_s32(a)); }
 
 inline int v_reduce_sum(const v_int16x16& a)
-{ return v_reduce_sum(v_expand_low(a) + v_expand_high(a)); }
+{ return v_reduce_sum(v_add(v_expand_low(a), v_expand_high(a))); }
 inline unsigned v_reduce_sum(const v_uint16x16& a)
-{ return v_reduce_sum(v_expand_low(a) + v_expand_high(a)); }
+{ return v_reduce_sum(v_add(v_expand_low(a), v_expand_high(a))); }
 
 inline float v_reduce_sum(const v_float32x8& a)
 {
@@ -1273,27 +1271,27 @@ inline unsigned v_reduce_sad(const v_int8x32& a, const v_int8x32& b)
 inline unsigned v_reduce_sad(const v_uint16x16& a, const v_uint16x16& b)
 {
     v_uint32x8 l, h;
-    v_expand(v_add_wrap(a - b, b - a), l, h);
-    return v_reduce_sum(l + h);
+    v_expand(v_add_wrap(v_sub(a, b), v_sub(b, a)), l, h);
+    return v_reduce_sum(v_add(l, h));
 }
 inline unsigned v_reduce_sad(const v_int16x16& a, const v_int16x16& b)
 {
     v_uint32x8 l, h;
     v_expand(v_reinterpret_as_u16(v_sub_wrap(v_max(a, b), v_min(a, b))), l, h);
-    return v_reduce_sum(l + h);
+    return v_reduce_sum(v_add(l, h));
 }
 inline unsigned v_reduce_sad(const v_uint32x8& a, const v_uint32x8& b)
 {
-    return v_reduce_sum(v_max(a, b) - v_min(a, b));
+    return v_reduce_sum(v_sub(v_max(a, b), v_min(a, b)));
 }
 inline unsigned v_reduce_sad(const v_int32x8& a, const v_int32x8& b)
 {
-    v_int32x8 m = a < b;
-    return v_reduce_sum(v_reinterpret_as_u32(((a - b) ^ m) - m));
+    v_int32x8 m = v_lt(a, b);
+    return v_reduce_sum(v_reinterpret_as_u32(v_sub(v_xor(v_sub(a, b), m), m)));
 }
 inline float v_reduce_sad(const v_float32x8& a, const v_float32x8& b)
 {
-    return v_reduce_sum((a - b) & v_float32x8(_mm256_castsi256_ps(_mm256_set1_epi32(0x7fffffff))));
+    return v_reduce_sum(v_and(v_sub(a, b), v_float32x8(_mm256_castsi256_ps(_mm256_set1_epi32(0x7fffffff)))));
 }
 
 /** Popcount **/
@@ -1308,15 +1306,15 @@ inline v_uint8x32 v_popcount(const v_uint8x32& a)
 inline v_uint16x16 v_popcount(const v_uint16x16& a)
 {
     v_uint8x32 p = v_popcount(v_reinterpret_as_u8(a));
-    p += v_rotate_right<1>(p);
-    return v_reinterpret_as_u16(p) & v256_setall_u16(0x00ff);
+    p = v_add(p, v_rotate_right<1>(p));
+    return v_and(v_reinterpret_as_u16(p), v256_setall_u16(0x00ff));
 }
 inline v_uint32x8 v_popcount(const v_uint32x8& a)
 {
     v_uint8x32 p = v_popcount(v_reinterpret_as_u8(a));
-    p += v_rotate_right<1>(p);
-    p += v_rotate_right<2>(p);
-    return v_reinterpret_as_u32(p) & v256_setall_u32(0x000000ff);
+    p = v_add(p, v_rotate_right<1>(p));
+    p = v_add(p, v_rotate_right<2>(p));
+    return v_and(v_reinterpret_as_u32(p), v256_setall_u32(0x000000ff));
 }
 inline v_uint64x4 v_popcount(const v_uint64x4& a)
 {
@@ -1408,9 +1406,9 @@ OPENCV_HAL_IMPL_AVX_CHECK_SHORT(v_int16x16)
     inline _Tpvec v_sqrt(const _Tpvec& x)                                     \
     { return _Tpvec(_mm256_sqrt_##suffix(x.val)); }                           \
     inline _Tpvec v_sqr_magnitude(const _Tpvec& a, const _Tpvec& b)           \
-    { return v_fma(a, a, b * b); }                                            \
+    { return v_fma(a, a, v_mul(b, b)); }                                      \
     inline _Tpvec v_magnitude(const _Tpvec& a, const _Tpvec& b)               \
-    { return v_sqrt(v_fma(a, a, b*b)); }
+    { return v_sqrt(v_fma(a, a, v_mul(b, b))); }
 
 OPENCV_HAL_IMPL_AVX_MULADD(v_float32x8, ps)
 OPENCV_HAL_IMPL_AVX_MULADD(v_float64x4, pd)
@@ -1419,7 +1417,7 @@ OPENCV_HAL_IMPL_AVX_MISC(v_float64x4, pd)
 
 inline v_int32x8 v_fma(const v_int32x8& a, const v_int32x8& b, const v_int32x8& c)
 {
-    return a * b + c;
+    return v_add(v_mul(a, b), c);
 }
 
 inline v_int32x8 v_muladd(const v_int32x8& a, const v_int32x8& b, const v_int32x8& c)
@@ -1429,16 +1427,16 @@ inline v_int32x8 v_muladd(const v_int32x8& a, const v_int32x8& b, const v_int32x
 
 inline v_float32x8 v_invsqrt(const v_float32x8& x)
 {
-    v_float32x8 half = x * v256_setall_f32(0.5);
+    v_float32x8 half = v_mul(x, v256_setall_f32(0.5));
     v_float32x8 t  = v_float32x8(_mm256_rsqrt_ps(x.val));
     // todo: _mm256_fnmsub_ps
-    t *= v256_setall_f32(1.5) - ((t * t) * half);
+    t = v_mul(t, v_sub(v256_setall_f32(1.5), v_mul(v_mul(t, t), half)));
     return t;
 }
 
 inline v_float64x4 v_invsqrt(const v_float64x4& x)
 {
-    return v256_setall_f64(1.) / v_sqrt(x);
+    return v_div(v256_setall_f64(1.), v_sqrt(x));
 }
 
 /** Absolute values **/
@@ -1451,23 +1449,23 @@ OPENCV_HAL_IMPL_AVX_ABS(int16x16, epi16)
 OPENCV_HAL_IMPL_AVX_ABS(int32x8,  epi32)
 
 inline v_float32x8 v_abs(const v_float32x8& x)
-{ return x & v_float32x8(_mm256_castsi256_ps(_mm256_set1_epi32(0x7fffffff))); }
+{ return v_and(x, v_float32x8(_mm256_castsi256_ps(_mm256_set1_epi32(0x7fffffff)))); }
 inline v_float64x4 v_abs(const v_float64x4& x)
-{ return x & v_float64x4(_mm256_castsi256_pd(_mm256_srli_epi64(_mm256_set1_epi64x(-1), 1))); }
+{ return v_and(x, v_float64x4(_mm256_castsi256_pd(_mm256_srli_epi64(_mm256_set1_epi64x(-1), 1)))); }
 
 /** Absolute difference **/
 inline v_uint8x32 v_absdiff(const v_uint8x32& a, const v_uint8x32& b)
-{ return v_add_wrap(a - b,  b - a); }
+{ return v_add_wrap(v_sub(a, b), v_sub(b, a)); }
 inline v_uint16x16 v_absdiff(const v_uint16x16& a, const v_uint16x16& b)
-{ return v_add_wrap(a - b,  b - a); }
+{ return v_add_wrap(v_sub(a, b), v_sub(b, a)); }
 inline v_uint32x8 v_absdiff(const v_uint32x8& a, const v_uint32x8& b)
-{ return v_max(a, b) - v_min(a, b); }
+{ return v_sub(v_max(a, b), v_min(a, b)); }
 
 inline v_uint8x32 v_absdiff(const v_int8x32& a, const v_int8x32& b)
 {
     v_int8x32 d = v_sub_wrap(a, b);
-    v_int8x32 m = a < b;
-    return v_reinterpret_as_u8(v_sub_wrap(d ^ m, m));
+    v_int8x32 m = v_lt(a, b);
+    return v_reinterpret_as_u8(v_sub_wrap(v_xor(d, m), m));
 }
 
 inline v_uint16x16 v_absdiff(const v_int16x16& a, const v_int16x16& b)
@@ -1475,26 +1473,26 @@ inline v_uint16x16 v_absdiff(const v_int16x16& a, const v_int16x16& b)
 
 inline v_uint32x8 v_absdiff(const v_int32x8& a, const v_int32x8& b)
 {
-    v_int32x8 d = a - b;
-    v_int32x8 m = a < b;
-    return v_reinterpret_as_u32((d ^ m) - m);
+    v_int32x8 d = v_sub(a, b);
+    v_int32x8 m = v_lt(a, b);
+    return v_reinterpret_as_u32(v_sub(v_xor(d, m), m));
 }
 
 inline v_float32x8 v_absdiff(const v_float32x8& a, const v_float32x8& b)
-{ return v_abs(a - b); }
+{ return v_abs(v_sub(a, b)); }
 
 inline v_float64x4 v_absdiff(const v_float64x4& a, const v_float64x4& b)
-{ return v_abs(a - b); }
+{ return v_abs(v_sub(a, b)); }
 
 /** Saturating absolute difference **/
 inline v_int8x32 v_absdiffs(const v_int8x32& a, const v_int8x32& b)
 {
-    v_int8x32 d = a - b;
-    v_int8x32 m = a < b;
-    return (d ^ m) - m;
+    v_int8x32 d = v_sub(a, b);
+    v_int8x32 m = v_lt(a, b);
+    return v_sub(v_xor(d, m), m);
 }
 inline v_int16x16 v_absdiffs(const v_int16x16& a, const v_int16x16& b)
-{ return v_max(a, b) - v_min(a, b); }
+{ return v_sub(v_max(a, b), v_min(a, b)); }
 
 ////////// Conversions /////////
 
@@ -1789,7 +1787,7 @@ inline v_float32x8 v_pack_triplets(const v_float32x8& vec)
 inline v_int32x8 v_dotprod(const v_int16x16& a, const v_int16x16& b)
 { return v_int32x8(_mm256_madd_epi16(a.val, b.val)); }
 inline v_int32x8 v_dotprod(const v_int16x16& a, const v_int16x16& b, const v_int32x8& c)
-{ return v_dotprod(a, b) + c; }
+{ return v_add(v_dotprod(a, b), c); }
 
 // 32 >> 64
 inline v_int64x4 v_dotprod(const v_int32x8& a, const v_int32x8& b)
@@ -1799,7 +1797,7 @@ inline v_int64x4 v_dotprod(const v_int32x8& a, const v_int32x8& b)
     return v_int64x4(_mm256_add_epi64(even, odd));
 }
 inline v_int64x4 v_dotprod(const v_int32x8& a, const v_int32x8& b, const v_int64x4& c)
-{ return v_dotprod(a, b) + c; }
+{ return v_add(v_dotprod(a, b), c); }
 
 // 8 >> 32
 inline v_uint32x8 v_dotprod_expand(const v_uint8x32& a, const v_uint8x32& b)
@@ -1816,7 +1814,7 @@ inline v_uint32x8 v_dotprod_expand(const v_uint8x32& a, const v_uint8x32& b)
     return v_uint32x8(_mm256_add_epi32(prod0, prod1));
 }
 inline v_uint32x8 v_dotprod_expand(const v_uint8x32& a, const v_uint8x32& b, const v_uint32x8& c)
-{ return v_dotprod_expand(a, b) + c; }
+{ return v_add(v_dotprod_expand(a, b), c); }
 
 inline v_int32x8 v_dotprod_expand(const v_int8x32& a, const v_int8x32& b)
 {
@@ -1831,7 +1829,7 @@ inline v_int32x8 v_dotprod_expand(const v_int8x32& a, const v_int8x32& b)
     return v_int32x8(_mm256_add_epi32(prod0, prod1));
 }
 inline v_int32x8 v_dotprod_expand(const v_int8x32& a, const v_int8x32& b, const v_int32x8& c)
-{ return v_dotprod_expand(a, b) + c; }
+{ return v_add(v_dotprod_expand(a, b), c); }
 
 // 16 >> 64
 inline v_uint64x4 v_dotprod_expand(const v_uint16x16& a, const v_uint16x16& b)
@@ -1855,7 +1853,7 @@ inline v_uint64x4 v_dotprod_expand(const v_uint16x16& a, const v_uint16x16& b)
     ));
 }
 inline v_uint64x4 v_dotprod_expand(const v_uint16x16& a, const v_uint16x16& b, const v_uint64x4& c)
-{ return v_dotprod_expand(a, b) + c; }
+{ return v_add(v_dotprod_expand(a, b), c); }
 
 inline v_int64x4 v_dotprod_expand(const v_int16x16& a, const v_int16x16& b)
 {
@@ -1871,13 +1869,13 @@ inline v_int64x4 v_dotprod_expand(const v_int16x16& a, const v_int16x16& b)
     ));
 }
 inline v_int64x4 v_dotprod_expand(const v_int16x16& a, const v_int16x16& b, const v_int64x4& c)
-{ return v_dotprod_expand(a, b) + c; }
+{ return v_add(v_dotprod_expand(a, b), c); }
 
 // 32 >> 64f
 inline v_float64x4 v_dotprod_expand(const v_int32x8& a, const v_int32x8& b)
 { return v_cvt_f64(v_dotprod(a, b)); }
 inline v_float64x4 v_dotprod_expand(const v_int32x8& a, const v_int32x8& b, const v_float64x4& c)
-{ return v_dotprod_expand(a, b) + c; }
+{ return v_add(v_dotprod_expand(a, b), c); }
 
 //////// Fast Dot Product ////////
 
@@ -1923,7 +1921,7 @@ inline v_uint64x4 v_dotprod_expand_fast(const v_uint16x16& a, const v_uint16x16&
     return v_uint64x4(_mm256_add_epi64(p15_, p9d_));
 }
 inline v_uint64x4 v_dotprod_expand_fast(const v_uint16x16& a, const v_uint16x16& b, const v_uint64x4& c)
-{ return v_dotprod_expand_fast(a, b) + c; }
+{ return v_add(v_dotprod_expand_fast(a, b), c); }
 
 inline v_int64x4 v_dotprod_expand_fast(const v_int16x16& a, const v_int16x16& b)
 {
@@ -1934,7 +1932,7 @@ inline v_int64x4 v_dotprod_expand_fast(const v_int16x16& a, const v_int16x16& b)
     return v_int64x4(_mm256_add_epi64(lo, hi));
 }
 inline v_int64x4 v_dotprod_expand_fast(const v_int16x16& a, const v_int16x16& b, const v_int64x4& c)
-{ return v_dotprod_expand_fast(a, b) + c; }
+{ return v_add(v_dotprod_expand_fast(a, b), c); }
 
 // 32 >> 64f
 inline v_float64x4 v_dotprod_expand_fast(const v_int32x8& a, const v_int32x8& b)
@@ -1953,7 +1951,7 @@ inline v_float32x8 v_matmul(const v_float32x8& v, const v_float32x8& m0,
     v_float32x8 v15 = OPENCV_HAL_AVX_SPLAT2_PS(v, 1);
     v_float32x8 v26 = OPENCV_HAL_AVX_SPLAT2_PS(v, 2);
     v_float32x8 v37 = OPENCV_HAL_AVX_SPLAT2_PS(v, 3);
-    return v_fma(v04, m0, v_fma(v15, m1, v_fma(v26, m2, v37 * m3)));
+    return v_fma(v04, m0, v_fma(v15, m1, v_fma(v26, m2, v_mul(v37, m3))));
 }
 
 inline v_float32x8 v_matmuladd(const v_float32x8& v, const v_float32x8& m0,
@@ -2058,43 +2056,43 @@ v_uint8x32 v_rshr_pack(const v_uint16x16& a, const v_uint16x16& b)
 {
     // we assume that n > 0, and so the shifted 16-bit values can be treated as signed numbers.
     v_uint16x16 delta = v256_setall_u16((short)(1 << (n-1)));
-    return v_pack_u(v_reinterpret_as_s16((a + delta) >> n),
-                    v_reinterpret_as_s16((b + delta) >> n));
+    return v_pack_u(v_reinterpret_as_s16(v_shr(v_add(a, delta), n)),
+                    v_reinterpret_as_s16(v_shr(v_add(b, delta), n)));
 }
 
 template<int n> inline
 void v_rshr_pack_store(uchar* ptr, const v_uint16x16& a)
 {
     v_uint16x16 delta = v256_setall_u16((short)(1 << (n-1)));
-    v_pack_u_store(ptr, v_reinterpret_as_s16((a + delta) >> n));
+    v_pack_u_store(ptr, v_reinterpret_as_s16(v_shr(v_add(a, delta), n)));
 }
 
 template<int n> inline
 v_uint8x32 v_rshr_pack_u(const v_int16x16& a, const v_int16x16& b)
 {
     v_int16x16 delta = v256_setall_s16((short)(1 << (n-1)));
-    return v_pack_u((a + delta) >> n, (b + delta) >> n);
+    return v_pack_u(v_shr(v_add(a, delta), n), v_shr(v_add(b, delta), n));
 }
 
 template<int n> inline
 void v_rshr_pack_u_store(uchar* ptr, const v_int16x16& a)
 {
     v_int16x16 delta = v256_setall_s16((short)(1 << (n-1)));
-    v_pack_u_store(ptr, (a + delta) >> n);
+    v_pack_u_store(ptr, v_shr(v_add(a, delta), n));
 }
 
 template<int n> inline
 v_int8x32 v_rshr_pack(const v_int16x16& a, const v_int16x16& b)
 {
     v_int16x16 delta = v256_setall_s16((short)(1 << (n-1)));
-    return v_pack((a + delta) >> n, (b + delta) >> n);
+    return v_pack(v_shr(v_add(a, delta), n), v_shr(v_add(b, delta), n));
 }
 
 template<int n> inline
 void v_rshr_pack_store(schar* ptr, const v_int16x16& a)
 {
     v_int16x16 delta = v256_setall_s16((short)(1 << (n-1)));
-    v_pack_store(ptr, (a + delta) >> n);
+    v_pack_store(ptr, v_shr(v_add(a, delta), n));
 }
 
 // 32
@@ -2127,43 +2125,43 @@ v_uint16x16 v_rshr_pack(const v_uint32x8& a, const v_uint32x8& b)
 {
     // we assume that n > 0, and so the shifted 32-bit values can be treated as signed numbers.
     v_uint32x8 delta = v256_setall_u32(1 << (n-1));
-    return v_pack_u(v_reinterpret_as_s32((a + delta) >> n),
-                    v_reinterpret_as_s32((b + delta) >> n));
+    return v_pack_u(v_reinterpret_as_s32(v_shr(v_add(a, delta), n)),
+                    v_reinterpret_as_s32(v_shr(v_add(b, delta), n)));
 }
 
 template<int n> inline
 void v_rshr_pack_store(ushort* ptr, const v_uint32x8& a)
 {
     v_uint32x8 delta = v256_setall_u32(1 << (n-1));
-    v_pack_u_store(ptr, v_reinterpret_as_s32((a + delta) >> n));
+    v_pack_u_store(ptr, v_reinterpret_as_s32(v_shr(v_add(a, delta), n)));
 }
 
 template<int n> inline
 v_uint16x16 v_rshr_pack_u(const v_int32x8& a, const v_int32x8& b)
 {
     v_int32x8 delta = v256_setall_s32(1 << (n-1));
-    return v_pack_u((a + delta) >> n, (b + delta) >> n);
+    return v_pack_u(v_shr(v_add(a, delta), n), v_shr(v_add(b, delta), n));
 }
 
 template<int n> inline
 void v_rshr_pack_u_store(ushort* ptr, const v_int32x8& a)
 {
     v_int32x8 delta = v256_setall_s32(1 << (n-1));
-    v_pack_u_store(ptr, (a + delta) >> n);
+    v_pack_u_store(ptr, v_shr(v_add(a, delta), n));
 }
 
 template<int n> inline
 v_int16x16 v_rshr_pack(const v_int32x8& a, const v_int32x8& b)
 {
     v_int32x8 delta = v256_setall_s32(1 << (n-1));
-    return v_pack((a + delta) >> n, (b + delta) >> n);
+    return v_pack(v_shr(v_add(a, delta), n), v_shr(v_add(b, delta), n));
 }
 
 template<int n> inline
 void v_rshr_pack_store(short* ptr, const v_int32x8& a)
 {
     v_int32x8 delta = v256_setall_s32(1 << (n-1));
-    v_pack_store(ptr, (a + delta) >> n);
+    v_pack_store(ptr, v_shr(v_add(a, delta), n));
 }
 
 // 64
@@ -2192,28 +2190,28 @@ template<int n> inline
 v_uint32x8 v_rshr_pack(const v_uint64x4& a, const v_uint64x4& b)
 {
     v_uint64x4 delta = v256_setall_u64((uint64)1 << (n-1));
-    return v_pack((a + delta) >> n, (b + delta) >> n);
+    return v_pack(v_shr(v_add(a, delta), n), v_shr(v_add(b, delta), n));
 }
 
 template<int n> inline
 void v_rshr_pack_store(unsigned* ptr, const v_uint64x4& a)
 {
     v_uint64x4 delta = v256_setall_u64((uint64)1 << (n-1));
-    v_pack_store(ptr, (a + delta) >> n);
+    v_pack_store(ptr, v_shr(v_add(a, delta), n));
 }
 
 template<int n> inline
 v_int32x8 v_rshr_pack(const v_int64x4& a, const v_int64x4& b)
 {
     v_int64x4 delta = v256_setall_s64((int64)1 << (n-1));
-    return v_pack((a + delta) >> n, (b + delta) >> n);
+    return v_pack(v_shr(v_add(a, delta), n), v_shr(v_add(b, delta), n));
 }
 
 template<int n> inline
 void v_rshr_pack_store(int* ptr, const v_int64x4& a)
 {
     v_int64x4 delta = v256_setall_s64((int64)1 << (n-1));
-    v_pack_store(ptr, (a + delta) >> n);
+    v_pack_store(ptr, v_shr(v_add(a, delta), n));
 }
 
 // pack boolean
@@ -3137,7 +3135,7 @@ OPENCV_HAL_IMPL_AVX_LOADSTORE_INTERLEAVE(v_float64x4, double, f64, v_uint64x4, u
 // FP16
 //
 
-inline v_float32x8 v256_load_expand(const float16_t* ptr)
+inline v_float32x8 v256_load_expand(const hfloat* ptr)
 {
 #if CV_FP16
     return v_float32x8(_mm256_cvtph_ps(_mm_loadu_si128((const __m128i*)ptr)));
@@ -3149,7 +3147,7 @@ inline v_float32x8 v256_load_expand(const float16_t* ptr)
 #endif
 }
 
-inline void v_pack_store(float16_t* ptr, const v_float32x8& a)
+inline void v_pack_store(hfloat* ptr, const v_float32x8& a)
 {
 #if CV_FP16
     __m128i ah = _mm256_cvtps_ph(a.val, 0);
@@ -3158,7 +3156,7 @@ inline void v_pack_store(float16_t* ptr, const v_float32x8& a)
     float CV_DECL_ALIGNED(32) buf[8];
     v_store_aligned(buf, a);
     for (int i = 0; i < 8; i++)
-        ptr[i] = float16_t(buf[i]);
+        ptr[i] = hfloat(buf[i]);
 #endif
 }
 
@@ -3168,6 +3166,20 @@ inline void v_pack_store(float16_t* ptr, const v_float32x8& a)
 
 inline void v256_cleanup() { _mm256_zeroall(); }
 
+#include "intrin_math.hpp"
+inline v_float32x8 v_exp(const v_float32x8& x) { return v_exp_default_32f<v_float32x8, v_int32x8>(x); }
+inline v_float32x8 v_log(const v_float32x8& x) { return v_log_default_32f<v_float32x8, v_int32x8>(x); }
+inline void v_sincos(const v_float32x8& x, v_float32x8& s, v_float32x8& c) { v_sincos_default_32f<v_float32x8, v_int32x8>(x, s, c); }
+inline v_float32x8 v_sin(const v_float32x8& x) { return v_sin_default_32f<v_float32x8, v_int32x8>(x); }
+inline v_float32x8 v_cos(const v_float32x8& x) { return v_cos_default_32f<v_float32x8, v_int32x8>(x); }
+inline v_float32x8 v_erf(const v_float32x8& x) { return v_erf_default_32f<v_float32x8, v_int32x8>(x); }
+
+inline v_float64x4 v_exp(const v_float64x4& x) { return v_exp_default_64f<v_float64x4, v_int64x4>(x); }
+inline v_float64x4 v_log(const v_float64x4& x) { return v_log_default_64f<v_float64x4, v_int64x4>(x); }
+inline void v_sincos(const v_float64x4& x, v_float64x4& s, v_float64x4& c) { v_sincos_default_64f<v_float64x4, v_int64x4>(x, s, c); }
+inline v_float64x4 v_sin(const v_float64x4& x) { return v_sin_default_64f<v_float64x4, v_int64x4>(x); }
+inline v_float64x4 v_cos(const v_float64x4& x) { return v_cos_default_64f<v_float64x4, v_int64x4>(x); }
+
 CV_CPU_OPTIMIZATION_HAL_NAMESPACE_END
 
 //! @endcond
diff --git a/3rdParty/opencv2/core/hal/intrin_avx512.hpp b/3rdParty/opencv-4.12.0/opencv2/core/hal/intrin_avx512.hpp
similarity index 92%
rename from 3rdParty/opencv2/core/hal/intrin_avx512.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/hal/intrin_avx512.hpp
index 226187587e..9d6eee2dde 100644
--- a/3rdParty/opencv2/core/hal/intrin_avx512.hpp
+++ b/3rdParty/opencv-4.12.0/opencv2/core/hal/intrin_avx512.hpp
@@ -458,6 +458,10 @@ OPENCV_HAL_IMPL_AVX512_LOADSTORE_FLT(v_float64x8, double, pd, __m256d)
     { return _Tpvec(_mm512_setzero_si512()); }                                     \
     inline _Tpvec v512_setall_##suffix(_Tp v)                                      \
     { return _Tpvec(_mm512_set1_##ssuffix((ctype_s)v)); }                          \
+    template <> inline _Tpvec v_setzero_()                                         \
+    { return v512_setzero_##suffix(); }                                            \
+    template <> inline _Tpvec v_setall_(_Tp v)                                     \
+    { return v512_setall_##suffix(v); }                                            \
     OPENCV_HAL_IMPL_AVX512_CAST(_Tpvec, v_uint8x64,   suffix, OPENCV_HAL_NOP)      \
     OPENCV_HAL_IMPL_AVX512_CAST(_Tpvec, v_int8x64,    suffix, OPENCV_HAL_NOP)      \
     OPENCV_HAL_IMPL_AVX512_CAST(_Tpvec, v_uint16x32,  suffix, OPENCV_HAL_NOP)      \
@@ -483,6 +487,10 @@ OPENCV_HAL_IMPL_AVX512_INIT(v_int64x8,   int64,    s64, epi64,  int64)
     { return _Tpvec(_mm512_setzero_##zsuffix()); }                          \
     inline _Tpvec v512_setall_##suffix(_Tp v)                               \
     { return _Tpvec(_mm512_set1_##zsuffix(v)); }                            \
+    template <> inline _Tpvec v_setzero_()                                  \
+    { return v512_setzero_##suffix(); }                                     \
+    template <> inline _Tpvec v_setall_(_Tp v)                              \
+    { return v512_setall_##suffix(v); }                                     \
     OPENCV_HAL_IMPL_AVX512_CAST(_Tpvec, v_uint8x64,  suffix, cast)          \
     OPENCV_HAL_IMPL_AVX512_CAST(_Tpvec, v_int8x64,   suffix, cast)          \
     OPENCV_HAL_IMPL_AVX512_CAST(_Tpvec, v_uint16x32, suffix, cast)          \
@@ -506,12 +514,12 @@ inline v_float64x8 v_reinterpret_as_f64(const v_float32x16& a)
 { return v_float64x8(_mm512_castps_pd(a.val)); }
 
 // FP16
-inline v_float32x16 v512_load_expand(const float16_t* ptr)
+inline v_float32x16 v512_load_expand(const hfloat* ptr)
 {
     return v_float32x16(_mm512_cvtph_ps(_mm256_loadu_si256((const __m256i*)ptr)));
 }
 
-inline void v_pack_store(float16_t* ptr, const v_float32x16& a)
+inline void v_pack_store(hfloat* ptr, const v_float32x16& a)
 {
     __m256i ah = _mm512_cvtps_ph(a.val, 0);
     _mm256_storeu_si256((__m256i*)ptr, ah);
@@ -663,58 +671,56 @@ inline v_int8x64 v_mul_wrap(const v_int8x64& a, const v_int8x64& b)
 }
 
 #define OPENCV_HAL_IMPL_AVX512_BIN_OP(bin_op, _Tpvec, intrin)            \
-    inline _Tpvec operator bin_op (const _Tpvec& a, const _Tpvec& b)     \
-    { return _Tpvec(intrin(a.val, b.val)); }                             \
-    inline _Tpvec& operator bin_op##= (_Tpvec& a, const _Tpvec& b)       \
-    { a.val = intrin(a.val, b.val); return a; }
-
-OPENCV_HAL_IMPL_AVX512_BIN_OP(+, v_uint32x16, _mm512_add_epi32)
-OPENCV_HAL_IMPL_AVX512_BIN_OP(-, v_uint32x16, _mm512_sub_epi32)
-OPENCV_HAL_IMPL_AVX512_BIN_OP(+, v_int32x16, _mm512_add_epi32)
-OPENCV_HAL_IMPL_AVX512_BIN_OP(-, v_int32x16, _mm512_sub_epi32)
-OPENCV_HAL_IMPL_AVX512_BIN_OP(+, v_uint64x8, _mm512_add_epi64)
-OPENCV_HAL_IMPL_AVX512_BIN_OP(-, v_uint64x8, _mm512_sub_epi64)
-OPENCV_HAL_IMPL_AVX512_BIN_OP(+, v_int64x8, _mm512_add_epi64)
-OPENCV_HAL_IMPL_AVX512_BIN_OP(-, v_int64x8, _mm512_sub_epi64)
-
-OPENCV_HAL_IMPL_AVX512_BIN_OP(*, v_uint32x16, _mm512_mullo_epi32)
-OPENCV_HAL_IMPL_AVX512_BIN_OP(*, v_int32x16, _mm512_mullo_epi32)
-OPENCV_HAL_IMPL_AVX512_BIN_OP(*, v_uint64x8, _mm512_mullo_epi64)
-OPENCV_HAL_IMPL_AVX512_BIN_OP(*, v_int64x8, _mm512_mullo_epi64)
+    inline _Tpvec bin_op(const _Tpvec& a, const _Tpvec& b)               \
+    { return _Tpvec(intrin(a.val, b.val)); }
+
+OPENCV_HAL_IMPL_AVX512_BIN_OP(v_add, v_uint32x16, _mm512_add_epi32)
+OPENCV_HAL_IMPL_AVX512_BIN_OP(v_sub, v_uint32x16, _mm512_sub_epi32)
+OPENCV_HAL_IMPL_AVX512_BIN_OP(v_add, v_int32x16, _mm512_add_epi32)
+OPENCV_HAL_IMPL_AVX512_BIN_OP(v_sub, v_int32x16, _mm512_sub_epi32)
+OPENCV_HAL_IMPL_AVX512_BIN_OP(v_add, v_uint64x8, _mm512_add_epi64)
+OPENCV_HAL_IMPL_AVX512_BIN_OP(v_sub, v_uint64x8, _mm512_sub_epi64)
+OPENCV_HAL_IMPL_AVX512_BIN_OP(v_add, v_int64x8, _mm512_add_epi64)
+OPENCV_HAL_IMPL_AVX512_BIN_OP(v_sub, v_int64x8, _mm512_sub_epi64)
+
+OPENCV_HAL_IMPL_AVX512_BIN_OP(v_mul, v_uint32x16, _mm512_mullo_epi32)
+OPENCV_HAL_IMPL_AVX512_BIN_OP(v_mul, v_int32x16, _mm512_mullo_epi32)
+OPENCV_HAL_IMPL_AVX512_BIN_OP(v_mul, v_uint64x8, _mm512_mullo_epi64)
+OPENCV_HAL_IMPL_AVX512_BIN_OP(v_mul, v_int64x8, _mm512_mullo_epi64)
 
 /** Saturating arithmetics **/
-OPENCV_HAL_IMPL_AVX512_BIN_OP(+, v_uint8x64,  _mm512_adds_epu8)
-OPENCV_HAL_IMPL_AVX512_BIN_OP(-, v_uint8x64,  _mm512_subs_epu8)
-OPENCV_HAL_IMPL_AVX512_BIN_OP(+, v_int8x64,   _mm512_adds_epi8)
-OPENCV_HAL_IMPL_AVX512_BIN_OP(-, v_int8x64,   _mm512_subs_epi8)
-OPENCV_HAL_IMPL_AVX512_BIN_OP(+, v_uint16x32, _mm512_adds_epu16)
-OPENCV_HAL_IMPL_AVX512_BIN_OP(-, v_uint16x32, _mm512_subs_epu16)
-OPENCV_HAL_IMPL_AVX512_BIN_OP(+, v_int16x32,  _mm512_adds_epi16)
-OPENCV_HAL_IMPL_AVX512_BIN_OP(-, v_int16x32,  _mm512_subs_epi16)
-
-OPENCV_HAL_IMPL_AVX512_BIN_OP(+, v_float32x16, _mm512_add_ps)
-OPENCV_HAL_IMPL_AVX512_BIN_OP(-, v_float32x16, _mm512_sub_ps)
-OPENCV_HAL_IMPL_AVX512_BIN_OP(*, v_float32x16, _mm512_mul_ps)
-OPENCV_HAL_IMPL_AVX512_BIN_OP(/, v_float32x16, _mm512_div_ps)
-OPENCV_HAL_IMPL_AVX512_BIN_OP(+, v_float64x8, _mm512_add_pd)
-OPENCV_HAL_IMPL_AVX512_BIN_OP(-, v_float64x8, _mm512_sub_pd)
-OPENCV_HAL_IMPL_AVX512_BIN_OP(*, v_float64x8, _mm512_mul_pd)
-OPENCV_HAL_IMPL_AVX512_BIN_OP(/, v_float64x8, _mm512_div_pd)
+OPENCV_HAL_IMPL_AVX512_BIN_OP(v_add, v_uint8x64,  _mm512_adds_epu8)
+OPENCV_HAL_IMPL_AVX512_BIN_OP(v_sub, v_uint8x64,  _mm512_subs_epu8)
+OPENCV_HAL_IMPL_AVX512_BIN_OP(v_add, v_int8x64,   _mm512_adds_epi8)
+OPENCV_HAL_IMPL_AVX512_BIN_OP(v_sub, v_int8x64,   _mm512_subs_epi8)
+OPENCV_HAL_IMPL_AVX512_BIN_OP(v_add, v_uint16x32, _mm512_adds_epu16)
+OPENCV_HAL_IMPL_AVX512_BIN_OP(v_sub, v_uint16x32, _mm512_subs_epu16)
+OPENCV_HAL_IMPL_AVX512_BIN_OP(v_add, v_int16x32,  _mm512_adds_epi16)
+OPENCV_HAL_IMPL_AVX512_BIN_OP(v_sub, v_int16x32,  _mm512_subs_epi16)
+
+OPENCV_HAL_IMPL_AVX512_BIN_OP(v_add, v_float32x16, _mm512_add_ps)
+OPENCV_HAL_IMPL_AVX512_BIN_OP(v_sub, v_float32x16, _mm512_sub_ps)
+OPENCV_HAL_IMPL_AVX512_BIN_OP(v_mul, v_float32x16, _mm512_mul_ps)
+OPENCV_HAL_IMPL_AVX512_BIN_OP(v_div, v_float32x16, _mm512_div_ps)
+OPENCV_HAL_IMPL_AVX512_BIN_OP(v_add, v_float64x8, _mm512_add_pd)
+OPENCV_HAL_IMPL_AVX512_BIN_OP(v_sub, v_float64x8, _mm512_sub_pd)
+OPENCV_HAL_IMPL_AVX512_BIN_OP(v_mul, v_float64x8, _mm512_mul_pd)
+OPENCV_HAL_IMPL_AVX512_BIN_OP(v_div, v_float64x8, _mm512_div_pd)
 
 // saturating multiply
-inline v_uint8x64 operator * (const v_uint8x64& a, const v_uint8x64& b)
+inline v_uint8x64 v_mul(const v_uint8x64& a, const v_uint8x64& b)
 {
     v_uint16x32 c, d;
     v_mul_expand(a, b, c, d);
     return v_pack(c, d);
 }
-inline v_int8x64 operator * (const v_int8x64& a, const v_int8x64& b)
+inline v_int8x64 v_mul(const v_int8x64& a, const v_int8x64& b)
 {
     v_int16x32 c, d;
     v_mul_expand(a, b, c, d);
     return v_pack(c, d);
 }
-inline v_uint16x32 operator * (const v_uint16x32& a, const v_uint16x32& b)
+inline v_uint16x32 v_mul(const v_uint16x32& a, const v_uint16x32& b)
 {
     __m512i pl = _mm512_mullo_epi16(a.val, b.val);
     __m512i ph = _mm512_mulhi_epu16(a.val, b.val);
@@ -724,7 +730,7 @@ inline v_uint16x32 operator * (const v_uint16x32& a, const v_uint16x32& b)
     const __m512i m = _mm512_set1_epi32(65535);
     return v_uint16x32(_mm512_packus_epi32(_mm512_min_epu32(p0, m), _mm512_min_epu32(p1, m)));
 }
-inline v_int16x32 operator * (const v_int16x32& a, const v_int16x32& b)
+inline v_int16x32 v_mul(const v_int16x32& a, const v_int16x32& b)
 {
     __m512i pl = _mm512_mullo_epi16(a.val, b.val);
     __m512i ph = _mm512_mulhi_epi16(a.val, b.val);
@@ -733,15 +739,6 @@ inline v_int16x32 operator * (const v_int16x32& a, const v_int16x32& b)
     return v_int16x32(_mm512_packs_epi32(p0, p1));
 }
 
-inline v_uint8x64& operator *= (v_uint8x64& a, const v_uint8x64& b)
-{ a = a * b; return a; }
-inline v_int8x64& operator *= (v_int8x64& a, const v_int8x64& b)
-{ a = a * b; return a; }
-inline v_uint16x32& operator *= (v_uint16x32& a, const v_uint16x32& b)
-{ a = a * b; return a; }
-inline v_int16x32& operator *= (v_int16x32& a, const v_int16x32& b)
-{ a = a * b; return a; }
-
 inline v_int16x32 v_mul_hi(const v_int16x32& a, const v_int16x32& b) { return v_int16x32(_mm512_mulhi_epi16(a.val, b.val)); }
 inline v_uint16x32 v_mul_hi(const v_uint16x32& a, const v_uint16x32& b) { return v_uint16x32(_mm512_mulhi_epu16(a.val, b.val)); }
 
@@ -802,13 +799,13 @@ inline void v_mul_expand(const v_int32x16& a, const v_int32x16& b,
 
 /** Bitwise shifts **/
 #define OPENCV_HAL_IMPL_AVX512_SHIFT_OP(_Tpuvec, _Tpsvec, suffix) \
-    inline _Tpuvec operator << (const _Tpuvec& a, int imm)        \
+    inline _Tpuvec v_shl(const _Tpuvec& a, int imm)               \
     { return _Tpuvec(_mm512_slli_##suffix(a.val, imm)); }         \
-    inline _Tpsvec operator << (const _Tpsvec& a, int imm)        \
+    inline _Tpsvec v_shl(const _Tpsvec& a, int imm)               \
     { return _Tpsvec(_mm512_slli_##suffix(a.val, imm)); }         \
-    inline _Tpuvec operator >> (const _Tpuvec& a, int imm)        \
+    inline _Tpuvec v_shr(const _Tpuvec& a, int imm)               \
     { return _Tpuvec(_mm512_srli_##suffix(a.val, imm)); }         \
-    inline _Tpsvec operator >> (const _Tpsvec& a, int imm)        \
+    inline _Tpsvec v_shr(const _Tpsvec& a, int imm)               \
     { return _Tpsvec(_mm512_srai_##suffix(a.val, imm)); }         \
     template<int imm>                                             \
     inline _Tpuvec v_shl(const _Tpuvec& a)                        \
@@ -830,10 +827,10 @@ OPENCV_HAL_IMPL_AVX512_SHIFT_OP(v_uint64x8,  v_int64x8,  epi64)
 
 /** Bitwise logic **/
 #define OPENCV_HAL_IMPL_AVX512_LOGIC_OP(_Tpvec, suffix, not_const) \
-    OPENCV_HAL_IMPL_AVX512_BIN_OP(&, _Tpvec, _mm512_and_##suffix)  \
-    OPENCV_HAL_IMPL_AVX512_BIN_OP(|, _Tpvec, _mm512_or_##suffix)   \
-    OPENCV_HAL_IMPL_AVX512_BIN_OP(^, _Tpvec, _mm512_xor_##suffix)  \
-    inline _Tpvec operator ~ (const _Tpvec& a)                     \
+    OPENCV_HAL_IMPL_AVX512_BIN_OP(v_and, _Tpvec, _mm512_and_##suffix)  \
+    OPENCV_HAL_IMPL_AVX512_BIN_OP(v_or, _Tpvec, _mm512_or_##suffix)    \
+    OPENCV_HAL_IMPL_AVX512_BIN_OP(v_xor, _Tpvec, _mm512_xor_##suffix)  \
+    inline _Tpvec v_not(const _Tpvec& a)                               \
     { return _Tpvec(_mm512_xor_##suffix(a.val, not_const)); }
 
 OPENCV_HAL_IMPL_AVX512_LOGIC_OP(v_uint8x64,   si512, _mm512_set1_epi32(-1))
@@ -865,16 +862,16 @@ OPENCV_HAL_IMPL_AVX512_SELECT(v_float64x8,    pd,    pd)
 
 /** Comparison **/
 #define OPENCV_HAL_IMPL_AVX512_CMP_INT(bin_op, imm8, _Tpvec, sufcmp, sufset, tval) \
-    inline _Tpvec operator bin_op (const _Tpvec& a, const _Tpvec& b)               \
+    inline _Tpvec bin_op(const _Tpvec& a, const _Tpvec& b)                         \
     { return _Tpvec(_mm512_maskz_set1_##sufset(_mm512_cmp_##sufcmp##_mask(a.val, b.val, imm8), tval)); }
 
 #define OPENCV_HAL_IMPL_AVX512_CMP_OP_INT(_Tpvec, sufcmp, sufset, tval)              \
-    OPENCV_HAL_IMPL_AVX512_CMP_INT(==, _MM_CMPINT_EQ,  _Tpvec, sufcmp, sufset, tval) \
-    OPENCV_HAL_IMPL_AVX512_CMP_INT(!=, _MM_CMPINT_NE,  _Tpvec, sufcmp, sufset, tval) \
-    OPENCV_HAL_IMPL_AVX512_CMP_INT(<,  _MM_CMPINT_LT,  _Tpvec, sufcmp, sufset, tval) \
-    OPENCV_HAL_IMPL_AVX512_CMP_INT(>,  _MM_CMPINT_NLE, _Tpvec, sufcmp, sufset, tval) \
-    OPENCV_HAL_IMPL_AVX512_CMP_INT(<=, _MM_CMPINT_LE,  _Tpvec, sufcmp, sufset, tval) \
-    OPENCV_HAL_IMPL_AVX512_CMP_INT(>=, _MM_CMPINT_NLT, _Tpvec, sufcmp, sufset, tval)
+    OPENCV_HAL_IMPL_AVX512_CMP_INT(v_eq, _MM_CMPINT_EQ,  _Tpvec, sufcmp, sufset, tval)  \
+    OPENCV_HAL_IMPL_AVX512_CMP_INT(v_ne, _MM_CMPINT_NE,  _Tpvec, sufcmp, sufset, tval)  \
+    OPENCV_HAL_IMPL_AVX512_CMP_INT(v_lt,  _MM_CMPINT_LT,  _Tpvec, sufcmp, sufset, tval) \
+    OPENCV_HAL_IMPL_AVX512_CMP_INT(v_gt,  _MM_CMPINT_NLE, _Tpvec, sufcmp, sufset, tval) \
+    OPENCV_HAL_IMPL_AVX512_CMP_INT(v_le, _MM_CMPINT_LE,  _Tpvec, sufcmp, sufset, tval)  \
+    OPENCV_HAL_IMPL_AVX512_CMP_INT(v_ge, _MM_CMPINT_NLT, _Tpvec, sufcmp, sufset, tval)
 
 OPENCV_HAL_IMPL_AVX512_CMP_OP_INT(v_uint8x64,   epu8,  epi8, (char)-1)
 OPENCV_HAL_IMPL_AVX512_CMP_OP_INT(v_int8x64,    epi8,  epi8, (char)-1)
@@ -886,16 +883,16 @@ OPENCV_HAL_IMPL_AVX512_CMP_OP_INT(v_uint64x8,  epu64, epi64, (int64)-1)
 OPENCV_HAL_IMPL_AVX512_CMP_OP_INT(v_int64x8,   epi64, epi64, (int64)-1)
 
 #define OPENCV_HAL_IMPL_AVX512_CMP_FLT(bin_op, imm8, _Tpvec, sufcmp, sufset, tval) \
-    inline _Tpvec operator bin_op (const _Tpvec& a, const _Tpvec& b)               \
+    inline _Tpvec bin_op(const _Tpvec& a, const _Tpvec& b)                        \
     { return _Tpvec(_mm512_castsi512_##sufcmp(_mm512_maskz_set1_##sufset(_mm512_cmp_##sufcmp##_mask(a.val, b.val, imm8), tval))); }
 
 #define OPENCV_HAL_IMPL_AVX512_CMP_OP_FLT(_Tpvec, sufcmp, sufset, tval)           \
-    OPENCV_HAL_IMPL_AVX512_CMP_FLT(==, _CMP_EQ_OQ,  _Tpvec, sufcmp, sufset, tval) \
-    OPENCV_HAL_IMPL_AVX512_CMP_FLT(!=, _CMP_NEQ_OQ, _Tpvec, sufcmp, sufset, tval) \
-    OPENCV_HAL_IMPL_AVX512_CMP_FLT(<,  _CMP_LT_OQ,  _Tpvec, sufcmp, sufset, tval) \
-    OPENCV_HAL_IMPL_AVX512_CMP_FLT(>,  _CMP_GT_OQ,  _Tpvec, sufcmp, sufset, tval) \
-    OPENCV_HAL_IMPL_AVX512_CMP_FLT(<=, _CMP_LE_OQ,  _Tpvec, sufcmp, sufset, tval) \
-    OPENCV_HAL_IMPL_AVX512_CMP_FLT(>=, _CMP_GE_OQ,  _Tpvec, sufcmp, sufset, tval)
+    OPENCV_HAL_IMPL_AVX512_CMP_FLT(v_eq, _CMP_EQ_OQ,  _Tpvec, sufcmp, sufset, tval)  \
+    OPENCV_HAL_IMPL_AVX512_CMP_FLT(v_ne, _CMP_NEQ_OQ, _Tpvec, sufcmp, sufset, tval)  \
+    OPENCV_HAL_IMPL_AVX512_CMP_FLT(v_lt,  _CMP_LT_OQ,  _Tpvec, sufcmp, sufset, tval) \
+    OPENCV_HAL_IMPL_AVX512_CMP_FLT(v_gt,  _CMP_GT_OQ,  _Tpvec, sufcmp, sufset, tval) \
+    OPENCV_HAL_IMPL_AVX512_CMP_FLT(v_le, _CMP_LE_OQ,  _Tpvec, sufcmp, sufset, tval)  \
+    OPENCV_HAL_IMPL_AVX512_CMP_FLT(v_ge, _CMP_GE_OQ,  _Tpvec, sufcmp, sufset, tval)
 
 OPENCV_HAL_IMPL_AVX512_CMP_OP_FLT(v_float32x16, ps, epi32, (int)-1)
 OPENCV_HAL_IMPL_AVX512_CMP_OP_FLT(v_float64x8,  pd, epi64, (int64)-1)
@@ -1250,9 +1247,9 @@ OPENCV_HAL_IMPL_AVX512_REDUCE_32(short,  min, v_int16x32,  min_epi16)
 OPENCV_HAL_IMPL_AVX512_REDUCE_32(short,  max, v_int16x32,  max_epi16)
 
 inline int v_reduce_sum(const v_int16x32& a)
-{ return v_reduce_sum(v_expand_low(a) + v_expand_high(a)); }
+{ return v_reduce_sum(v_add(v_expand_low(a), v_expand_high(a))); }
 inline uint v_reduce_sum(const v_uint16x32& a)
-{ return v_reduce_sum(v_expand_low(a) + v_expand_high(a)); }
+{ return v_reduce_sum(v_add(v_expand_low(a), v_expand_high(a))); }
 
 #define OPENCV_HAL_IMPL_AVX512_REDUCE_64(sctype, func, _Tpvec, ifunc)                                 \
     inline sctype v_reduce_##func(const _Tpvec& a)                                                    \
@@ -1306,17 +1303,17 @@ inline unsigned v_reduce_sad(const v_int8x64& a, const v_int8x64& b)
     return (unsigned)_mm_cvtsi128_si32(_mm_add_epi32(quarter, _mm_unpackhi_epi64(quarter, quarter)));
 }
 inline unsigned v_reduce_sad(const v_uint16x32& a, const v_uint16x32& b)
-{ return v_reduce_sum(v_add_wrap(a - b, b - a)); }
+{ return v_reduce_sum(v_add_wrap(v_sub(a, b), v_sub(b, a))); }
 inline unsigned v_reduce_sad(const v_int16x32& a, const v_int16x32& b)
 { return v_reduce_sum(v_reinterpret_as_u16(v_sub_wrap(v_max(a, b), v_min(a, b)))); }
 inline unsigned v_reduce_sad(const v_uint32x16& a, const v_uint32x16& b)
-{ return v_reduce_sum(v_max(a, b) - v_min(a, b)); }
+{ return v_reduce_sum(v_sub(v_max(a, b), v_min(a, b))); }
 inline unsigned v_reduce_sad(const v_int32x16& a, const v_int32x16& b)
-{ return v_reduce_sum(v_reinterpret_as_u32(v_max(a, b) - v_min(a, b))); }
+{ return v_reduce_sum(v_reinterpret_as_u32(v_sub(v_max(a, b), v_min(a, b)))); }
 inline float v_reduce_sad(const v_float32x16& a, const v_float32x16& b)
-{ return v_reduce_sum((a - b) & v_float32x16(_mm512_castsi512_ps(_mm512_set1_epi32(0x7fffffff)))); }
+{ return v_reduce_sum(v_and(v_sub(a, b), v_float32x16(_mm512_castsi512_ps(_mm512_set1_epi32(0x7fffffff))))); }
 inline double v_reduce_sad(const v_float64x8& a, const v_float64x8& b)
-{ return v_reduce_sum((a - b) & v_float64x8(_mm512_castsi512_pd(_mm512_set1_epi64(0x7fffffffffffffff)))); }
+{ return v_reduce_sum(v_and(v_sub(a, b), v_float64x8(_mm512_castsi512_pd(_mm512_set1_epi64(0x7fffffffffffffff))))); }
 
 /** Popcount **/
 inline v_uint8x64 v_popcount(const v_int8x64& a)
@@ -1351,8 +1348,8 @@ inline v_uint16x32 v_popcount(const v_int16x32& a)
                                           _mm512_popcnt_epi32(_mm512_unpackhi_epi16(a.val, zero))));
 #else
     v_uint8x64 p = v_popcount(v_reinterpret_as_s8(a));
-    p += v_rotate_right<1>(p);
-    return v_reinterpret_as_u16(p) & v512_setall_u16(0x00ff);
+    p = v_add(p, v_rotate_right<1>(p));
+    return v_and(v_reinterpret_as_u16(p), v512_setall_u16(0x00ff));
 #endif
 }
 inline v_uint32x16 v_popcount(const v_int32x16& a)
@@ -1361,9 +1358,9 @@ inline v_uint32x16 v_popcount(const v_int32x16& a)
     return v_uint32x16(_mm512_popcnt_epi32(a.val));
 #else
     v_uint8x64 p = v_popcount(v_reinterpret_as_s8(a));
-    p += v_rotate_right<1>(p);
-    p += v_rotate_right<2>(p);
-    return v_reinterpret_as_u32(p) & v512_setall_u32(0x000000ff);
+    p = v_add(p, v_rotate_right<1>(p));
+    p = v_add(p, v_rotate_right<2>(p));
+    return v_and(v_reinterpret_as_u32(p), v512_setall_u32(0x000000ff));
 #endif
 }
 inline v_uint64x8 v_popcount(const v_int64x8& a)
@@ -1403,9 +1400,9 @@ inline v_uint64x8  v_popcount(const v_uint64x8&  a) { return v_popcount(v_reinte
     inline _Tpvec v_sqrt(const _Tpvec& x)                                     \
     { return _Tpvec(_mm512_sqrt_##suffix(x.val)); }                           \
     inline _Tpvec v_sqr_magnitude(const _Tpvec& a, const _Tpvec& b)           \
-    { return v_fma(a, a, b * b); }                                            \
+    { return v_fma(a, a, v_mul(b, b)); }                                      \
     inline _Tpvec v_magnitude(const _Tpvec& a, const _Tpvec& b)               \
-    { return v_sqrt(v_fma(a, a, b * b)); }
+    { return v_sqrt(v_fma(a, a, v_mul(b, b))); }
 
 OPENCV_HAL_IMPL_AVX512_MULADD(v_float32x16, ps)
 OPENCV_HAL_IMPL_AVX512_MULADD(v_float64x8,  pd)
@@ -1413,7 +1410,7 @@ OPENCV_HAL_IMPL_AVX512_MISC(v_float32x16, ps)
 OPENCV_HAL_IMPL_AVX512_MISC(v_float64x8,  pd)
 
 inline v_int32x16 v_fma(const v_int32x16& a, const v_int32x16& b, const v_int32x16& c)
-{ return a * b + c; }
+{ return v_add(v_mul(a, b), c); }
 inline v_int32x16 v_muladd(const v_int32x16& a, const v_int32x16& b, const v_int32x16& c)
 { return v_fma(a, b, c); }
 
@@ -1422,9 +1419,9 @@ inline v_float32x16 v_invsqrt(const v_float32x16& x)
 #if CV_AVX_512ER
     return v_float32x16(_mm512_rsqrt28_ps(x.val));
 #else
-    v_float32x16 half = x * v512_setall_f32(0.5);
+    v_float32x16 half = v_mul(x, v512_setall_f32(0.5));
     v_float32x16 t  = v_float32x16(_mm512_rsqrt14_ps(x.val));
-    t *= v512_setall_f32(1.5) - ((t * t) * half);
+    t = v_mul(t, v_sub(v512_setall_f32(1.5), v_mul(v_mul(t, t), half)));
     return t;
 #endif
 }
@@ -1434,7 +1431,7 @@ inline v_float64x8 v_invsqrt(const v_float64x8& x)
 #if CV_AVX_512ER
     return v_float64x8(_mm512_rsqrt28_pd(x.val));
 #else
-    return v512_setall_f64(1.) / v_sqrt(x);
+    return v_div(v512_setall_f64(1.), v_sqrt(x));
 //    v_float64x8 half = x * v512_setall_f64(0.5);
 //    v_float64x8 t = v_float64x8(_mm512_rsqrt14_pd(x.val));
 //    t *= v512_setall_f64(1.5) - ((t * t) * half);
@@ -1482,17 +1479,17 @@ inline v_float64x8 v_abs(const v_float64x8& x)
 
 /** Absolute difference **/
 inline v_uint8x64 v_absdiff(const v_uint8x64& a, const v_uint8x64& b)
-{ return v_add_wrap(a - b,  b - a); }
+{ return v_add_wrap(v_sub(a, b), v_sub(b, a)); }
 inline v_uint16x32 v_absdiff(const v_uint16x32& a, const v_uint16x32& b)
-{ return v_add_wrap(a - b,  b - a); }
+{ return v_add_wrap(v_sub(a, b), v_sub(b, a)); }
 inline v_uint32x16 v_absdiff(const v_uint32x16& a, const v_uint32x16& b)
-{ return v_max(a, b) - v_min(a, b); }
+{ return v_sub(v_max(a, b), v_min(a, b)); }
 
 inline v_uint8x64 v_absdiff(const v_int8x64& a, const v_int8x64& b)
 {
     v_int8x64 d = v_sub_wrap(a, b);
-    v_int8x64 m = a < b;
-    return v_reinterpret_as_u8(v_sub_wrap(d ^ m, m));
+    v_int8x64 m = v_lt(a, b);
+    return v_reinterpret_as_u8(v_sub_wrap(v_xor(d, m), m));
 }
 
 inline v_uint16x32 v_absdiff(const v_int16x32& a, const v_int16x32& b)
@@ -1500,26 +1497,26 @@ inline v_uint16x32 v_absdiff(const v_int16x32& a, const v_int16x32& b)
 
 inline v_uint32x16 v_absdiff(const v_int32x16& a, const v_int32x16& b)
 {
-    v_int32x16 d = a - b;
-    v_int32x16 m = a < b;
-    return v_reinterpret_as_u32((d ^ m) - m);
+    v_int32x16 d = v_sub(a, b);
+    v_int32x16 m = v_lt(a, b);
+    return v_reinterpret_as_u32(v_sub(v_xor(d, m), m));
 }
 
 inline v_float32x16 v_absdiff(const v_float32x16& a, const v_float32x16& b)
-{ return v_abs(a - b); }
+{ return v_abs(v_sub(a, b)); }
 
 inline v_float64x8 v_absdiff(const v_float64x8& a, const v_float64x8& b)
-{ return v_abs(a - b); }
+{ return v_abs(v_sub(a, b)); }
 
 /** Saturating absolute difference **/
 inline v_int8x64 v_absdiffs(const v_int8x64& a, const v_int8x64& b)
 {
-    v_int8x64 d = a - b;
-    v_int8x64 m = a < b;
-    return (d ^ m) - m;
+    v_int8x64 d = v_sub(a, b);
+    v_int8x64 m = v_lt(a, b);
+    return v_sub(v_xor(d, m), m);
 }
 inline v_int16x32 v_absdiffs(const v_int16x32& a, const v_int16x32& b)
-{ return v_max(a, b) - v_min(a, b); }
+{ return v_sub(v_max(a, b), v_min(a, b)); }
 
 ////////// Conversions /////////
 
@@ -1818,7 +1815,7 @@ inline v_float32x16 v_pack_triplets(const v_float32x16& vec)
 inline v_int32x16 v_dotprod(const v_int16x32& a, const v_int16x32& b)
 { return v_int32x16(_mm512_madd_epi16(a.val, b.val)); }
 inline v_int32x16 v_dotprod(const v_int16x32& a, const v_int16x32& b, const v_int32x16& c)
-{ return v_dotprod(a, b) + c; }
+{ return v_add(v_dotprod(a, b), c); }
 
 // 32 >> 64
 inline v_int64x8 v_dotprod(const v_int32x16& a, const v_int32x16& b)
@@ -1828,7 +1825,7 @@ inline v_int64x8 v_dotprod(const v_int32x16& a, const v_int32x16& b)
     return v_int64x8(_mm512_add_epi64(even, odd));
 }
 inline v_int64x8 v_dotprod(const v_int32x16& a, const v_int32x16& b, const v_int64x8& c)
-{ return v_dotprod(a, b) + c; }
+{ return v_add(v_dotprod(a, b), c); }
 
 // 8 >> 32
 inline v_uint32x16 v_dotprod_expand(const v_uint8x64& a, const v_uint8x64& b)
@@ -1844,7 +1841,7 @@ inline v_uint32x16 v_dotprod_expand(const v_uint8x64& a, const v_uint8x64& b)
     return v_uint32x16(_mm512_add_epi32(prod0, prod1));
 }
 inline v_uint32x16 v_dotprod_expand(const v_uint8x64& a, const v_uint8x64& b, const v_uint32x16& c)
-{ return v_dotprod_expand(a, b) + c; }
+{ return v_add(v_dotprod_expand(a, b), c); }
 
 inline v_int32x16 v_dotprod_expand(const v_int8x64& a, const v_int8x64& b)
 {
@@ -1859,7 +1856,7 @@ inline v_int32x16 v_dotprod_expand(const v_int8x64& a, const v_int8x64& b)
     return v_int32x16(_mm512_add_epi32(prod0, prod1));
 }
 inline v_int32x16 v_dotprod_expand(const v_int8x64& a, const v_int8x64& b, const v_int32x16& c)
-{ return v_dotprod_expand(a, b) + c; }
+{ return v_add(v_dotprod_expand(a, b), c); }
 
 // 16 >> 64
 inline v_uint64x8 v_dotprod_expand(const v_uint16x32& a, const v_uint16x32& b)
@@ -1883,7 +1880,7 @@ inline v_uint64x8 v_dotprod_expand(const v_uint16x32& a, const v_uint16x32& b)
     ));
 }
 inline v_uint64x8 v_dotprod_expand(const v_uint16x32& a, const v_uint16x32& b, const v_uint64x8& c)
-{ return v_dotprod_expand(a, b) + c; }
+{ return v_add(v_dotprod_expand(a, b), c); }
 
 inline v_int64x8 v_dotprod_expand(const v_int16x32& a, const v_int16x32& b)
 {
@@ -1893,13 +1890,13 @@ inline v_int64x8 v_dotprod_expand(const v_int16x32& a, const v_int16x32& b)
     return v_int64x8(_mm512_add_epi64(even, odd));
 }
 inline v_int64x8 v_dotprod_expand(const v_int16x32& a, const v_int16x32& b, const v_int64x8& c)
-{ return v_dotprod_expand(a, b) + c; }
+{ return v_add(v_dotprod_expand(a, b), c); }
 
 // 32 >> 64f
 inline v_float64x8 v_dotprod_expand(const v_int32x16& a, const v_int32x16& b)
 { return v_cvt_f64(v_dotprod(a, b)); }
 inline v_float64x8 v_dotprod_expand(const v_int32x16& a, const v_int32x16& b, const v_float64x8& c)
-{ return v_dotprod_expand(a, b) + c; }
+{ return v_add(v_dotprod_expand(a, b), c); }
 
 //////// Fast Dot Product ////////
 
@@ -1944,7 +1941,7 @@ inline v_uint64x8 v_dotprod_expand_fast(const v_uint16x32& a, const v_uint16x32&
     return v_uint64x8(_mm512_add_epi64(p15_, p9d_));
 }
 inline v_uint64x8 v_dotprod_expand_fast(const v_uint16x32& a, const v_uint16x32& b, const v_uint64x8& c)
-{ return v_dotprod_expand_fast(a, b) + c; }
+{ return v_add(v_dotprod_expand_fast(a, b), c); }
 
 inline v_int64x8 v_dotprod_expand_fast(const v_int16x32& a, const v_int16x32& b)
 { return v_dotprod_expand(a, b); }
@@ -1955,7 +1952,7 @@ inline v_int64x8 v_dotprod_expand_fast(const v_int16x32& a, const v_int16x32& b,
 inline v_float64x8 v_dotprod_expand_fast(const v_int32x16& a, const v_int32x16& b)
 { return v_dotprod_expand(a, b); }
 inline v_float64x8 v_dotprod_expand_fast(const v_int32x16& a, const v_int32x16& b, const v_float64x8& c)
-{ return v_dotprod_expand(a, b) + c; }
+{ return v_add(v_dotprod_expand(a, b), c); }
 
 
 #define OPENCV_HAL_AVX512_SPLAT2_PS(a, im) \
@@ -1969,7 +1966,7 @@ inline v_float32x16 v_matmul(const v_float32x16& v,
     v_float32x16 v15 = OPENCV_HAL_AVX512_SPLAT2_PS(v, 1);
     v_float32x16 v26 = OPENCV_HAL_AVX512_SPLAT2_PS(v, 2);
     v_float32x16 v37 = OPENCV_HAL_AVX512_SPLAT2_PS(v, 3);
-    return v_fma(v04, m0, v_fma(v15, m1, v_fma(v26, m2, v37 * m3)));
+    return v_fma(v04, m0, v_fma(v15, m1, v_fma(v26, m2, v_mul(v37, m3))));
 }
 
 inline v_float32x16 v_matmuladd(const v_float32x16& v,
@@ -2070,43 +2067,43 @@ v_uint8x64 v_rshr_pack(const v_uint16x32& a, const v_uint16x32& b)
 {
     // we assume that n > 0, and so the shifted 16-bit values can be treated as signed numbers.
     v_uint16x32 delta = v512_setall_u16((short)(1 << (n-1)));
-    return v_pack_u(v_reinterpret_as_s16((a + delta) >> n),
-                    v_reinterpret_as_s16((b + delta) >> n));
+    return v_pack_u(v_reinterpret_as_s16(v_shr(v_add(a, delta), n)),
+                    v_reinterpret_as_s16(v_shr(v_add(b, delta), n)));
 }
 
 template<int n> inline
 void v_rshr_pack_store(uchar* ptr, const v_uint16x32& a)
 {
     v_uint16x32 delta = v512_setall_u16((short)(1 << (n-1)));
-    v_pack_u_store(ptr, v_reinterpret_as_s16((a + delta) >> n));
+    v_pack_u_store(ptr, v_reinterpret_as_s16(v_shr(v_add(a, delta), n)));
 }
 
 template<int n> inline
 v_uint8x64 v_rshr_pack_u(const v_int16x32& a, const v_int16x32& b)
 {
     v_int16x32 delta = v512_setall_s16((short)(1 << (n-1)));
-    return v_pack_u((a + delta) >> n, (b + delta) >> n);
+    return v_pack_u(v_shr(v_add(a, delta), n), v_shr(v_add(b, delta), n));
 }
 
 template<int n> inline
 void v_rshr_pack_u_store(uchar* ptr, const v_int16x32& a)
 {
     v_int16x32 delta = v512_setall_s16((short)(1 << (n-1)));
-    v_pack_u_store(ptr, (a + delta) >> n);
+    v_pack_u_store(ptr, v_shr(v_add(a, delta), n));
 }
 
 template<int n> inline
 v_int8x64 v_rshr_pack(const v_int16x32& a, const v_int16x32& b)
 {
     v_int16x32 delta = v512_setall_s16((short)(1 << (n-1)));
-    return v_pack((a + delta) >> n, (b + delta) >> n);
+    return v_pack(v_shr(v_add(a, delta), n), v_shr(v_add(b, delta), n));
 }
 
 template<int n> inline
 void v_rshr_pack_store(schar* ptr, const v_int16x32& a)
 {
     v_int16x32 delta = v512_setall_s16((short)(1 << (n-1)));
-    v_pack_store(ptr, (a + delta) >> n);
+    v_pack_store(ptr, v_shr(v_add(a, delta), n));
 }
 
 // 32
@@ -2139,43 +2136,43 @@ template<int n> inline
 v_uint16x32 v_rshr_pack(const v_uint32x16& a, const v_uint32x16& b)
 {
     v_uint32x16 delta = v512_setall_u32(1 << (n-1));
-    return v_pack_u(v_reinterpret_as_s32((a + delta) >> n),
-                    v_reinterpret_as_s32((b + delta) >> n));
+    return v_pack_u(v_reinterpret_as_s32(v_shr(v_add(a, delta), n)),
+                    v_reinterpret_as_s32(v_shr(v_add(b, delta), n)));
 }
 
 template<int n> inline
 void v_rshr_pack_store(ushort* ptr, const v_uint32x16& a)
 {
     v_uint32x16 delta = v512_setall_u32(1 << (n-1));
-    v_pack_u_store(ptr, v_reinterpret_as_s32((a + delta) >> n));
+    v_pack_u_store(ptr, v_reinterpret_as_s32(v_shr(v_add(a, delta), n)));
 }
 
 template<int n> inline
 v_uint16x32 v_rshr_pack_u(const v_int32x16& a, const v_int32x16& b)
 {
     v_int32x16 delta = v512_setall_s32(1 << (n-1));
-    return v_pack_u((a + delta) >> n, (b + delta) >> n);
+    return v_pack_u(v_shr(v_add(a, delta), n), v_shr(v_add(b, delta), n));
 }
 
 template<int n> inline
 void v_rshr_pack_u_store(ushort* ptr, const v_int32x16& a)
 {
     v_int32x16 delta = v512_setall_s32(1 << (n-1));
-    v_pack_u_store(ptr, (a + delta) >> n);
+    v_pack_u_store(ptr, v_shr(v_add(a, delta), n));
 }
 
 template<int n> inline
 v_int16x32 v_rshr_pack(const v_int32x16& a, const v_int32x16& b)
 {
     v_int32x16 delta = v512_setall_s32(1 << (n-1));
-    return v_pack((a + delta) >> n, (b + delta) >> n);
+    return v_pack(v_shr(v_add(a, delta), n), v_shr(v_add(b, delta), n));
 }
 
 template<int n> inline
 void v_rshr_pack_store(short* ptr, const v_int32x16& a)
 {
     v_int32x16 delta = v512_setall_s32(1 << (n-1));
-    v_pack_store(ptr, (a + delta) >> n);
+    v_pack_store(ptr, v_shr(v_add(a, delta), n));
 }
 
 // 64
@@ -2196,28 +2193,28 @@ template<int n> inline
 v_uint32x16 v_rshr_pack(const v_uint64x8& a, const v_uint64x8& b)
 {
     v_uint64x8 delta = v512_setall_u64((uint64)1 << (n-1));
-    return v_pack((a + delta) >> n, (b + delta) >> n);
+    return v_pack(v_shr(v_add(a, delta), n), v_shr(v_add(b, delta), n));
 }
 
 template<int n> inline
 void v_rshr_pack_store(unsigned* ptr, const v_uint64x8& a)
 {
     v_uint64x8 delta = v512_setall_u64((uint64)1 << (n-1));
-    v_pack_store(ptr, (a + delta) >> n);
+    v_pack_store(ptr, v_shr(v_add(a, delta), n));
 }
 
 template<int n> inline
 v_int32x16 v_rshr_pack(const v_int64x8& a, const v_int64x8& b)
 {
     v_int64x8 delta = v512_setall_s64((int64)1 << (n-1));
-    return v_pack((a + delta) >> n, (b + delta) >> n);
+    return v_pack(v_shr(v_add(a, delta), n), v_shr(v_add(b, delta), n));
 }
 
 template<int n> inline
 void v_rshr_pack_store(int* ptr, const v_int64x8& a)
 {
     v_int64x8 delta = v512_setall_s64((int64)1 << (n-1));
-    v_pack_store(ptr, (a + delta) >> n);
+    v_pack_store(ptr, v_shr(v_add(a, delta), n));
 }
 
 // pack boolean
@@ -3081,6 +3078,20 @@ inline int v_scan_forward(const v_float64x8& a) { return trailingZeros32(v_signm
 
 inline void v512_cleanup() { _mm256_zeroall(); }
 
+#include "intrin_math.hpp"
+inline v_float32x16 v_exp(const v_float32x16& x) { return v_exp_default_32f<v_float32x16, v_int32x16>(x); }
+inline v_float32x16 v_log(const v_float32x16& x) { return v_log_default_32f<v_float32x16, v_int32x16>(x); }
+inline void v_sincos(const v_float32x16& x, v_float32x16& s, v_float32x16& c) { v_sincos_default_32f<v_float32x16, v_int32x16>(x, s, c); }
+inline v_float32x16 v_sin(const v_float32x16& x) { return v_sin_default_32f<v_float32x16, v_int32x16>(x); }
+inline v_float32x16 v_cos(const v_float32x16& x) { return v_cos_default_32f<v_float32x16, v_int32x16>(x); }
+inline v_float32x16 v_erf(const v_float32x16& x) { return v_erf_default_32f<v_float32x16, v_int32x16>(x); }
+
+inline v_float64x8 v_exp(const v_float64x8& x) { return v_exp_default_64f<v_float64x8, v_int64x8>(x); }
+inline v_float64x8 v_log(const v_float64x8& x) { return v_log_default_64f<v_float64x8, v_int64x8>(x); }
+inline void v_sincos(const v_float64x8& x, v_float64x8& s, v_float64x8& c) { v_sincos_default_64f<v_float64x8, v_int64x8>(x, s, c); }
+inline v_float64x8 v_sin(const v_float64x8& x) { return v_sin_default_64f<v_float64x8, v_int64x8>(x); }
+inline v_float64x8 v_cos(const v_float64x8& x) { return v_cos_default_64f<v_float64x8, v_int64x8>(x); }
+
 CV_CPU_OPTIMIZATION_HAL_NAMESPACE_END
 
 //! @endcond
diff --git a/3rdParty/opencv2/core/hal/intrin_cpp.hpp b/3rdParty/opencv-4.12.0/opencv2/core/hal/intrin_cpp.hpp
similarity index 90%
rename from 3rdParty/opencv2/core/hal/intrin_cpp.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/hal/intrin_cpp.hpp
index 3e0cd66fd6..88ed596a4b 100644
--- a/3rdParty/opencv2/core/hal/intrin_cpp.hpp
+++ b/3rdParty/opencv-4.12.0/opencv2/core/hal/intrin_cpp.hpp
@@ -48,6 +48,7 @@
 #include <limits>
 #include <cstring>
 #include <algorithm>
+#include "opencv2/core/utility.hpp"
 #include "opencv2/core/saturate.hpp"
 
 //! @cond IGNORED
@@ -224,32 +225,30 @@ These operations allow to reorder or recombine elements in one or multiple vecto
 Element-wise binary and unary operations.
 
 - Arithmetics:
-@ref operator +(const v_reg &a, const v_reg &b) "+",
-@ref operator -(const v_reg &a, const v_reg &b) "-",
-@ref operator *(const v_reg &a, const v_reg &b) "*",
-@ref operator /(const v_reg &a, const v_reg &b) "/",
+@ref v_add,
+@ref v_sub,
+@ref v_mul,
+@ref v_div,
 @ref v_mul_expand
 
 - Non-saturating arithmetics: @ref v_add_wrap, @ref v_sub_wrap
 
 - Bitwise shifts:
-@ref operator <<(const v_reg &a, int s) "<<",
-@ref operator >>(const v_reg &a, int s) ">>",
 @ref v_shl, @ref v_shr
 
 - Bitwise logic:
-@ref operator &(const v_reg &a, const v_reg &b) "&",
-@ref operator |(const v_reg &a, const v_reg &b) "|",
-@ref operator ^(const v_reg &a, const v_reg &b) "^",
-@ref operator ~(const v_reg &a) "~"
+@ref v_and,
+@ref v_or,
+@ref v_xor,
+@ref v_not
 
 - Comparison:
-@ref operator >(const v_reg &a, const v_reg &b) ">",
-@ref operator >=(const v_reg &a, const v_reg &b) ">=",
-@ref operator <(const v_reg &a, const v_reg &b) "<",
-@ref operator <=(const v_reg &a, const v_reg &b) "<=",
-@ref operator ==(const v_reg &a, const v_reg &b) "==",
-@ref operator !=(const v_reg &a, const v_reg &b) "!="
+@ref v_gt,
+@ref v_ge,
+@ref v_lt,
+@ref v_le,
+@ref v_eq,
+@ref v_ne
 
 - min/max: @ref v_min, @ref v_max
 
@@ -262,7 +261,8 @@ Most of these operations return only one value.
 
 ### Other math
 
-- Some frequent operations: @ref v_sqrt, @ref v_invsqrt, @ref v_magnitude, @ref v_sqr_magnitude
+- Some frequent operations: @ref v_sqrt, @ref v_invsqrt, @ref v_magnitude, @ref v_sqr_magnitude, @ref v_exp, @ref v_log,
+                            @ref v_erf, @ref v_sin, @ref v_cos
 - Absolute values: @ref v_abs, @ref v_absdiff, @ref v_absdiffs
 
 ### Conversions
@@ -362,6 +362,9 @@ Floating point:
 |reverse            | x | x |
 |extract_n          | x | x |
 |broadcast_element  | x |   |
+|exp                | x | x |
+|log                | x | x |
+|sin, cos           | x | x |
 
  @{ */
 
@@ -569,50 +572,43 @@ enum {
 /** @brief Add values
 
 For all types. */
-template<typename _Tp, int n> CV_INLINE v_reg<_Tp, n> operator+(const v_reg<_Tp, n>& a, const v_reg<_Tp, n>& b);
-template<typename _Tp, int n> CV_INLINE v_reg<_Tp, n>& operator+=(v_reg<_Tp, n>& a, const v_reg<_Tp, n>& b);
+template<typename _Tp, int n> CV_INLINE v_reg<_Tp, n> v_add(const v_reg<_Tp, n>& a, const v_reg<_Tp, n>& b);
 
 /** @brief Subtract values
 
 For all types. */
-template<typename _Tp, int n> CV_INLINE v_reg<_Tp, n> operator-(const v_reg<_Tp, n>& a, const v_reg<_Tp, n>& b);
-template<typename _Tp, int n> CV_INLINE v_reg<_Tp, n>& operator-=(v_reg<_Tp, n>& a, const v_reg<_Tp, n>& b);
+template<typename _Tp, int n> CV_INLINE v_reg<_Tp, n> v_sub(const v_reg<_Tp, n>& a, const v_reg<_Tp, n>& b);
 
 /** @brief Multiply values
 
 For 16- and 32-bit integer types and floating types. */
-template<typename _Tp, int n> CV_INLINE v_reg<_Tp, n> operator*(const v_reg<_Tp, n>& a, const v_reg<_Tp, n>& b);
-template<typename _Tp, int n> CV_INLINE v_reg<_Tp, n>& operator*=(v_reg<_Tp, n>& a, const v_reg<_Tp, n>& b);
+template<typename _Tp, int n> CV_INLINE v_reg<_Tp, n> v_mul(const v_reg<_Tp, n>& a, const v_reg<_Tp, n>& b);
 
 /** @brief Divide values
 
 For floating types only. */
-template<typename _Tp, int n> CV_INLINE v_reg<_Tp, n> operator/(const v_reg<_Tp, n>& a, const v_reg<_Tp, n>& b);
-template<typename _Tp, int n> CV_INLINE v_reg<_Tp, n>& operator/=(v_reg<_Tp, n>& a, const v_reg<_Tp, n>& b);
+template<typename _Tp, int n> CV_INLINE v_reg<_Tp, n> v_div(const v_reg<_Tp, n>& a, const v_reg<_Tp, n>& b);
 
 
 /** @brief Bitwise AND
 
 Only for integer types. */
-template<typename _Tp, int n> CV_INLINE v_reg<_Tp, n> operator&(const v_reg<_Tp, n>& a, const v_reg<_Tp, n>& b);
-template<typename _Tp, int n> CV_INLINE v_reg<_Tp, n>& operator&=(v_reg<_Tp, n>& a, const v_reg<_Tp, n>& b);
+template<typename _Tp, int n> CV_INLINE v_reg<_Tp, n> v_and(const v_reg<_Tp, n>& a, const v_reg<_Tp, n>& b);
 
 /** @brief Bitwise OR
 
 Only for integer types. */
-template<typename _Tp, int n> CV_INLINE v_reg<_Tp, n> operator|(const v_reg<_Tp, n>& a, const v_reg<_Tp, n>& b);
-template<typename _Tp, int n> CV_INLINE v_reg<_Tp, n>& operator|=(v_reg<_Tp, n>& a, const v_reg<_Tp, n>& b);
+template<typename _Tp, int n> CV_INLINE v_reg<_Tp, n> v_or(const v_reg<_Tp, n>& a, const v_reg<_Tp, n>& b);
 
 /** @brief Bitwise XOR
 
 Only for integer types.*/
-template<typename _Tp, int n> CV_INLINE v_reg<_Tp, n> operator^(const v_reg<_Tp, n>& a, const v_reg<_Tp, n>& b);
-template<typename _Tp, int n> CV_INLINE v_reg<_Tp, n>& operator^=(v_reg<_Tp, n>& a, const v_reg<_Tp, n>& b);
+template<typename _Tp, int n> CV_INLINE v_reg<_Tp, n> v_xor(const v_reg<_Tp, n>& a, const v_reg<_Tp, n>& b);
 
 /** @brief Bitwise NOT
 
 Only for integer types.*/
-template<typename _Tp, int n> CV_INLINE v_reg<_Tp, n> operator~(const v_reg<_Tp, n>& a);
+template<typename _Tp, int n> CV_INLINE v_reg<_Tp, n> v_not(const v_reg<_Tp, n>& a);
 
 
 #ifndef CV_DOXYGEN
@@ -635,33 +631,26 @@ __CV_EXPAND(macro_name(double, __VA_ARGS__)) \
 CV__HAL_INTRIN_EXPAND_WITH_INTEGER_TYPES(macro_name, __VA_ARGS__) \
 CV__HAL_INTRIN_EXPAND_WITH_FP_TYPES(macro_name, __VA_ARGS__) \
 
-#define CV__HAL_INTRIN_IMPL_BIN_OP_(_Tp, bin_op) \
+#define CV__HAL_INTRIN_IMPL_BIN_OP_(_Tp, bin_op, func) \
 template<int n> inline \
-v_reg<_Tp, n> operator bin_op (const v_reg<_Tp, n>& a, const v_reg<_Tp, n>& b) \
+v_reg<_Tp, n> func(const v_reg<_Tp, n>& a, const v_reg<_Tp, n>& b) \
 { \
     v_reg<_Tp, n> c; \
     for( int i = 0; i < n; i++ ) \
         c.s[i] = saturate_cast<_Tp>(a.s[i] bin_op b.s[i]); \
     return c; \
-} \
-template<int n> inline \
-v_reg<_Tp, n>& operator bin_op##= (v_reg<_Tp, n>& a, const v_reg<_Tp, n>& b) \
-{ \
-    for( int i = 0; i < n; i++ ) \
-        a.s[i] = saturate_cast<_Tp>(a.s[i] bin_op b.s[i]); \
-    return a; \
 }
 
-#define CV__HAL_INTRIN_IMPL_BIN_OP(bin_op) CV__HAL_INTRIN_EXPAND_WITH_ALL_TYPES(CV__HAL_INTRIN_IMPL_BIN_OP_, bin_op)
+#define CV__HAL_INTRIN_IMPL_BIN_OP(bin_op, func) CV__HAL_INTRIN_EXPAND_WITH_ALL_TYPES(CV__HAL_INTRIN_IMPL_BIN_OP_, bin_op, func)
 
-CV__HAL_INTRIN_IMPL_BIN_OP(+)
-CV__HAL_INTRIN_IMPL_BIN_OP(-)
-CV__HAL_INTRIN_IMPL_BIN_OP(*)
-CV__HAL_INTRIN_EXPAND_WITH_FP_TYPES(CV__HAL_INTRIN_IMPL_BIN_OP_, /)
+CV__HAL_INTRIN_IMPL_BIN_OP(+, v_add)
+CV__HAL_INTRIN_IMPL_BIN_OP(-, v_sub)
+CV__HAL_INTRIN_IMPL_BIN_OP(*, v_mul)
+CV__HAL_INTRIN_EXPAND_WITH_FP_TYPES(CV__HAL_INTRIN_IMPL_BIN_OP_, /, v_div)
 
-#define CV__HAL_INTRIN_IMPL_BIT_OP_(_Tp, bit_op) \
+#define CV__HAL_INTRIN_IMPL_BIT_OP_(_Tp, bit_op, func) \
 template<int n> CV_INLINE \
-v_reg<_Tp, n> operator bit_op (const v_reg<_Tp, n>& a, const v_reg<_Tp, n>& b) \
+v_reg<_Tp, n> func(const v_reg<_Tp, n>& a, const v_reg<_Tp, n>& b) \
 { \
     v_reg<_Tp, n> c; \
     typedef typename V_TypeTraits<_Tp>::int_type itype; \
@@ -669,29 +658,20 @@ v_reg<_Tp, n> operator bit_op (const v_reg<_Tp, n>& a, const v_reg<_Tp, n>& b) \
         c.s[i] = V_TypeTraits<_Tp>::reinterpret_from_int((itype)(V_TypeTraits<_Tp>::reinterpret_int(a.s[i]) bit_op \
                                                         V_TypeTraits<_Tp>::reinterpret_int(b.s[i]))); \
     return c; \
-} \
-template<int n> CV_INLINE \
-v_reg<_Tp, n>& operator bit_op##= (v_reg<_Tp, n>& a, const v_reg<_Tp, n>& b) \
-{ \
-    typedef typename V_TypeTraits<_Tp>::int_type itype; \
-    for( int i = 0; i < n; i++ ) \
-        a.s[i] = V_TypeTraits<_Tp>::reinterpret_from_int((itype)(V_TypeTraits<_Tp>::reinterpret_int(a.s[i]) bit_op \
-                                                        V_TypeTraits<_Tp>::reinterpret_int(b.s[i]))); \
-    return a; \
 }
 
-#define CV__HAL_INTRIN_IMPL_BIT_OP(bit_op) \
-CV__HAL_INTRIN_EXPAND_WITH_INTEGER_TYPES(CV__HAL_INTRIN_IMPL_BIT_OP_, bit_op) \
-CV__HAL_INTRIN_EXPAND_WITH_FP_TYPES(CV__HAL_INTRIN_IMPL_BIT_OP_, bit_op) /* TODO: FIXIT remove this after masks refactoring */
+#define CV__HAL_INTRIN_IMPL_BIT_OP(bit_op, func) \
+CV__HAL_INTRIN_EXPAND_WITH_INTEGER_TYPES(CV__HAL_INTRIN_IMPL_BIT_OP_, bit_op, func) \
+CV__HAL_INTRIN_EXPAND_WITH_FP_TYPES(CV__HAL_INTRIN_IMPL_BIT_OP_, bit_op, func) /* TODO: FIXIT remove this after masks refactoring */
 
 
-CV__HAL_INTRIN_IMPL_BIT_OP(&)
-CV__HAL_INTRIN_IMPL_BIT_OP(|)
-CV__HAL_INTRIN_IMPL_BIT_OP(^)
+CV__HAL_INTRIN_IMPL_BIT_OP(&, v_and)
+CV__HAL_INTRIN_IMPL_BIT_OP(|, v_or)
+CV__HAL_INTRIN_IMPL_BIT_OP(^, v_xor)
 
-#define CV__HAL_INTRIN_IMPL_BITWISE_NOT_(_Tp, dummy) \
+#define CV__HAL_INTRIN_IMPL_BITWISE_NOT_(_Tp, dummy, dummy2) \
 template<int n> CV_INLINE \
-v_reg<_Tp, n> operator ~ (const v_reg<_Tp, n>& a) \
+v_reg<_Tp, n> v_not(const v_reg<_Tp, n>& a) \
 { \
     v_reg<_Tp, n> c; \
     for( int i = 0; i < n; i++ ) \
@@ -699,7 +679,7 @@ v_reg<_Tp, n> operator ~ (const v_reg<_Tp, n>& a) \
     return c; \
 } \
 
-CV__HAL_INTRIN_EXPAND_WITH_INTEGER_TYPES(CV__HAL_INTRIN_IMPL_BITWISE_NOT_, ~)
+CV__HAL_INTRIN_EXPAND_WITH_INTEGER_TYPES(CV__HAL_INTRIN_IMPL_BITWISE_NOT_, ~, v_not)
 
 #endif  // !CV_DOXYGEN
 
@@ -720,12 +700,85 @@ template<typename _Tp, int n> inline v_reg<_Tp2, n> func(const v_reg<_Tp, n>& a)
 Only for floating point types.*/
 OPENCV_HAL_IMPL_MATH_FUNC(v_sqrt, std::sqrt, _Tp)
 
-//! @cond IGNORED
-OPENCV_HAL_IMPL_MATH_FUNC(v_sin, std::sin, _Tp)
-OPENCV_HAL_IMPL_MATH_FUNC(v_cos, std::cos, _Tp)
+/**
+ * @brief Exponential \f$ e^x \f$ of elements
+ *
+ * Only for floating point types. Core implementation steps:
+ * 1. Decompose Input: Convert the input to \f$ 2^{x \cdot \log_2e} \f$ and split its exponential into integer and fractional parts:
+ *    \f$ x \cdot \log_2e = n + f \f$, where \f$ n \f$ is the integer part and \f$ f \f$ is the fractional part.
+ * 2. Compute \f$ 2^n \f$: Calculated by shifting the bits.
+ * 3. Adjust Fractional Part: Compute \f$ f \cdot \ln2 \f$ to convert the fractional part to base \f$ e \f$.
+ *    \f$ C1 \f$ and \f$ C2 \f$ are used to adjust the fractional part.
+ * 4. Polynomial Approximation for \f$ e^{f \cdot \ln2} \f$: The closer the fractional part is to 0, the more accurate the result.
+ *    - For float16 and float32, use a Taylor Series with 6 terms.
+ *    - For float64, use Pade Polynomials Approximation with 4 terms.
+ * 5. Combine Results: Multiply the two parts together to get the final result:
+ *    \f$ e^x = 2^n \cdot e^{f \cdot \ln2} \f$.
+ *
+ * @note The precision of the calculation depends on the implementation and the data type of the input vector.
+ */
 OPENCV_HAL_IMPL_MATH_FUNC(v_exp, std::exp, _Tp)
+#define OPENCV_HAL_MATH_HAVE_EXP 1
+
+/**
+ * @brief Natural logarithm \f$ \log(x) \f$ of elements
+ *
+ * Only for floating point types. Core implementation steps:
+ * 1. Decompose Input: Use binary representation to decompose the input into mantissa part \f$ m \f$ and exponent part \f$ e \f$. Such that \f$ \log(x) = \log(m \cdot 2^e) = \log(m) + e \cdot \ln(2) \f$.
+ * 2. Adjust Mantissa and Exponent Parts: If the mantissa is less than \f$ \sqrt{0.5} \f$, adjust the exponent and mantissa to ensure the mantissa is in the range \f$ (\sqrt{0.5}, \sqrt{2}) \f$ for better approximation.
+ * 3. Polynomial Approximation for \f$ \log(m) \f$: The closer the \f$ m \f$ is to 1, the more accurate the result.
+ *    - For float16 and float32, use a Taylor Series with 9 terms.
+ *    - For float64, use Pade Polynomials Approximation with 6 terms.
+ * 4. Combine Results: Add the two parts together to get the final result.
+ *
+ * @note The precision of the calculation depends on the implementation and the data type of the input.
+ *
+ * @note Similar to the behavior of std::log(), \f$ \ln(0) = -\infty \f$.
+ */
 OPENCV_HAL_IMPL_MATH_FUNC(v_log, std::log, _Tp)
-//! @endcond
+
+/**
+ * @brief Error function.
+ *
+ * @note Support FP32 precision for now.
+ */
+OPENCV_HAL_IMPL_MATH_FUNC(v_erf, std::erf, _Tp)
+
+/**
+ * @brief Compute sine \f$ sin(x) \f$ and cosine \f$ cos(x) \f$ of elements at the same time
+ *
+ * Only for floating point types. Core implementation steps:
+ * 1. Input Normalization: Scale the periodicity from 2π to 4 and reduce the angle to the range \f$ [0, \frac{\pi}{4}] \f$ using periodicity and trigonometric identities.
+ * 2. Polynomial Approximation for \f$ sin(x) \f$ and \f$ cos(x) \f$:
+ *   - For float16 and float32, use a Taylor series with 4 terms for sine and 5 terms for cosine.
+ *   - For float64, use a Taylor series with 7 terms for sine and 8 terms for cosine.
+ * 3. Select Results: select and convert the final sine and cosine values for the original input angle.
+ *
+ * @note The precision of the calculation depends on the implementation and the data type of the input vector.
+ */
+template<typename _Tp, int n>
+inline void v_sincos(const v_reg<_Tp, n>& x, v_reg<_Tp, n>& s, v_reg<_Tp, n>& c)
+{
+    for( int i = 0; i < n; i++ )
+    {
+        s.s[i] = std::sin(x.s[i]);
+        c.s[i] = std::cos(x.s[i]);
+    }
+}
+
+/**
+ * @brief Sine \f$ sin(x) \f$ of elements
+ *
+ * Only for floating point types. Core implementation the same as @ref v_sincos.
+ */
+OPENCV_HAL_IMPL_MATH_FUNC(v_sin, std::sin, _Tp)
+
+/**
+ * @brief Cosine \f$ cos(x) \f$ of elements
+ *
+ * Only for floating point types. Core implementation the same as @ref v_sincos.
+ */
+OPENCV_HAL_IMPL_MATH_FUNC(v_cos, std::cos, _Tp)
 
 /** @brief Absolute value of elements
 
@@ -848,9 +901,9 @@ inline void v_minmax( const v_reg<_Tp, n>& a, const v_reg<_Tp, n>& b,
 
 //! @brief Helper macro
 //! @ingroup core_hal_intrin_impl
-#define OPENCV_HAL_IMPL_CMP_OP(cmp_op) \
+#define OPENCV_HAL_IMPL_CMP_OP(cmp_op, func) \
 template<typename _Tp, int n> \
-inline v_reg<_Tp, n> operator cmp_op(const v_reg<_Tp, n>& a, const v_reg<_Tp, n>& b) \
+inline v_reg<_Tp, n> func(const v_reg<_Tp, n>& a, const v_reg<_Tp, n>& b) \
 { \
     typedef typename V_TypeTraits<_Tp>::int_type itype; \
     v_reg<_Tp, n> c; \
@@ -862,32 +915,28 @@ inline v_reg<_Tp, n> operator cmp_op(const v_reg<_Tp, n>& a, const v_reg<_Tp, n>
 /** @brief Less-than comparison
 
 For all types except 64-bit integer values. */
-OPENCV_HAL_IMPL_CMP_OP(<)
+OPENCV_HAL_IMPL_CMP_OP(<, v_lt)
 
 /** @brief Greater-than comparison
 
 For all types except 64-bit integer values. */
-OPENCV_HAL_IMPL_CMP_OP(>)
+OPENCV_HAL_IMPL_CMP_OP(>, v_gt)
 
 /** @brief Less-than or equal comparison
 
 For all types except 64-bit integer values. */
-OPENCV_HAL_IMPL_CMP_OP(<=)
+OPENCV_HAL_IMPL_CMP_OP(<=, v_le)
 
 /** @brief Greater-than or equal comparison
 
 For all types except 64-bit integer values. */
-OPENCV_HAL_IMPL_CMP_OP(>=)
+OPENCV_HAL_IMPL_CMP_OP(>=, v_ge)
 
-/** @brief Equal comparison
+/** @brief Equal comparison */
+OPENCV_HAL_IMPL_CMP_OP(==, v_eq)
 
-For all types except 64-bit integer values. */
-OPENCV_HAL_IMPL_CMP_OP(==)
-
-/** @brief Not equal comparison
-
-For all types except 64-bit integer values. */
-OPENCV_HAL_IMPL_CMP_OP(!=)
+/** @brief Not equal comparison */
+OPENCV_HAL_IMPL_CMP_OP(!=, v_ne)
 
 template<int n>
 inline v_reg<float, n> v_not_nan(const v_reg<float, n>& a)
@@ -1256,8 +1305,8 @@ template<typename _Tp, int n> inline void v_hsum(const v_reg<_Tp, n>& a,
 
 //! @brief Helper macro
 //! @ingroup core_hal_intrin_impl
-#define OPENCV_HAL_IMPL_SHIFT_OP(shift_op) \
-template<typename _Tp, int n> inline v_reg<_Tp, n> operator shift_op(const v_reg<_Tp, n>& a, int imm) \
+#define OPENCV_HAL_IMPL_SHIFT_OP(shift_op, func) \
+template<typename _Tp, int n> inline v_reg<_Tp, n> func(const v_reg<_Tp, n>& a, int imm) \
 { \
     v_reg<_Tp, n> c; \
     for( int i = 0; i < n; i++ ) \
@@ -1268,12 +1317,12 @@ template<typename _Tp, int n> inline v_reg<_Tp, n> operator shift_op(const v_reg
 /** @brief Bitwise shift left
 
 For 16-, 32- and 64-bit integer values. */
-OPENCV_HAL_IMPL_SHIFT_OP(<< )
+OPENCV_HAL_IMPL_SHIFT_OP(<<, v_shl)
 
 /** @brief Bitwise shift right
 
 For 16-, 32- and 64-bit integer values. */
-OPENCV_HAL_IMPL_SHIFT_OP(>> )
+OPENCV_HAL_IMPL_SHIFT_OP(>>, v_shr)
 
 //! @brief Helper macro
 //! @ingroup core_hal_intrin_impl
@@ -2782,7 +2831,8 @@ inline void v_transpose4x4( v_reg<_Tp, n>& a0, const v_reg<_Tp, n>& a1,
 //! @brief Helper macro
 //! @ingroup core_hal_intrin_impl
 #define OPENCV_HAL_IMPL_C_INIT_ZERO(_Tpvec, prefix, suffix) \
-inline _Tpvec prefix##_setzero_##suffix() { return _Tpvec::zero(); }
+inline _Tpvec prefix##_setzero_##suffix() { return _Tpvec::zero(); } \
+template <> inline _Tpvec v_setzero_() { return _Tpvec::zero(); }
 
 //! @name Init with zero
 //! @{
@@ -2828,7 +2878,8 @@ OPENCV_HAL_IMPL_C_INIT_ZERO(v_int64x8, v512, s64)
 //! @brief Helper macro
 //! @ingroup core_hal_intrin_impl
 #define OPENCV_HAL_IMPL_C_INIT_VAL(_Tpvec, _Tp, prefix, suffix) \
-inline _Tpvec prefix##_setall_##suffix(_Tp val) { return _Tpvec::all(val); }
+inline _Tpvec prefix##_setall_##suffix(_Tp val) { return _Tpvec::all(val); } \
+template <> inline _Tpvec v_setall_(_Tp val) { return _Tpvec::all(val); }
 
 //! @name Init with value
 //! @{
@@ -2897,7 +2948,7 @@ OPENCV_HAL_IMPL_C_REINTERPRET(int64, s64)
 //! @ingroup core_hal_intrin_impl
 #define OPENCV_HAL_IMPL_C_SHIFTL(_Tp) \
 template<int shift, int n> inline v_reg<_Tp, n> v_shl(const v_reg<_Tp, n>& a) \
-{ return a << shift; }
+{ return v_shl(a, shift); }
 
 //! @name Left shift
 //! @{
@@ -2914,7 +2965,7 @@ OPENCV_HAL_IMPL_C_SHIFTL(int64)
 //! @ingroup core_hal_intrin_impl
 #define OPENCV_HAL_IMPL_C_SHIFTR(_Tp) \
 template<int shift, int n> inline v_reg<_Tp, n> v_shr(const v_reg<_Tp, n>& a) \
-{ return a >> shift; }
+{ return v_shr(a, shift); }
 
 //! @name Right shift
 //! @{
@@ -3240,7 +3291,7 @@ inline v_reg<float, n> v_matmuladd(const v_reg<float, n>& v,
 
 
 template<int n> inline v_reg<double, n/2> v_dotprod_expand(const v_reg<int, n>& a, const v_reg<int, n>& b)
-{ return v_fma(v_cvt_f64(a), v_cvt_f64(b), v_cvt_f64_high(a) * v_cvt_f64_high(b)); }
+{ return v_fma(v_cvt_f64(a), v_cvt_f64(b), v_mul(v_cvt_f64_high(a), v_cvt_f64_high(b))); }
 template<int n> inline v_reg<double, n/2> v_dotprod_expand(const v_reg<int, n>& a, const v_reg<int, n>& b,
                                                            const v_reg<double, n/2>& c)
 { return v_fma(v_cvt_f64(a), v_cvt_f64(b), v_fma(v_cvt_f64_high(a), v_cvt_f64_high(b), c)); }
@@ -3254,7 +3305,7 @@ template<int n> inline v_reg<double, n/2> v_dotprod_expand_fast(const v_reg<int,
 ////// FP16 support ///////
 
 inline v_reg<float, simd128_width / sizeof(float)>
-v_load_expand(const float16_t* ptr)
+v_load_expand(const hfloat* ptr)
 {
     v_reg<float, simd128_width / sizeof(float)> v;
     for( int i = 0; i < v.nlanes; i++ )
@@ -3265,7 +3316,7 @@ v_load_expand(const float16_t* ptr)
 }
 #if CV_SIMD256
 inline v_reg<float, simd256_width / sizeof(float)>
-v256_load_expand(const float16_t* ptr)
+v256_load_expand(const hfloat* ptr)
 {
     v_reg<float, simd256_width / sizeof(float)> v;
     for (int i = 0; i < v.nlanes; i++)
@@ -3277,7 +3328,7 @@ v256_load_expand(const float16_t* ptr)
 #endif
 #if CV_SIMD512
 inline v_reg<float, simd512_width / sizeof(float)>
-v512_load_expand(const float16_t* ptr)
+v512_load_expand(const hfloat* ptr)
 {
     v_reg<float, simd512_width / sizeof(float)> v;
     for (int i = 0; i < v.nlanes; i++)
@@ -3289,11 +3340,11 @@ v512_load_expand(const float16_t* ptr)
 #endif
 
 template<int n> inline void
-v_pack_store(float16_t* ptr, const v_reg<float, n>& v)
+v_pack_store(hfloat* ptr, const v_reg<float, n>& v)
 {
     for( int i = 0; i < v.nlanes; i++ )
     {
-        ptr[i] = float16_t(v.s[i]);
+        ptr[i] = hfloat(v.s[i]);
     }
 }
 
diff --git a/3rdParty/opencv2/core/hal/intrin_forward.hpp b/3rdParty/opencv-4.12.0/opencv2/core/hal/intrin_forward.hpp
similarity index 96%
rename from 3rdParty/opencv2/core/hal/intrin_forward.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/hal/intrin_forward.hpp
index 7c5066f4da..524574c6d8 100644
--- a/3rdParty/opencv2/core/hal/intrin_forward.hpp
+++ b/3rdParty/opencv-4.12.0/opencv2/core/hal/intrin_forward.hpp
@@ -188,4 +188,4 @@ CV_CPU_OPTIMIZATION_HAL_NAMESPACE_END
 
 //! @endcond
 
-} // cv::
\ No newline at end of file
+} // cv::
diff --git a/3rdParty/opencv-4.12.0/opencv2/core/hal/intrin_lasx.hpp b/3rdParty/opencv-4.12.0/opencv2/core/hal/intrin_lasx.hpp
new file mode 100644
index 0000000000..6f53a5f9bf
--- /dev/null
+++ b/3rdParty/opencv-4.12.0/opencv2/core/hal/intrin_lasx.hpp
@@ -0,0 +1,3036 @@
+// This file is part of OpenCV project.
+// It is subject to the license terms in the LICENSE file found in the top-level directory
+// of this distribution and at http://opencv.org/license.html
+
+#ifndef OPENCV_HAL_INTRIN_LASX_HPP
+#define OPENCV_HAL_INTRIN_LASX_HPP
+
+#include <lsxintrin.h>
+#include <lasxintrin.h>
+
+#define CV_SIMD256 1
+#define CV_SIMD256_64F 1
+#define CV_SIMD256_FP16 0
+
+namespace cv
+{
+
+//! @cond IGNORED
+
+CV_CPU_OPTIMIZATION_HAL_NAMESPACE_BEGIN
+
+///////// Utils ////////////
+
+inline __m256i _v256_setr_b(char v0, char v1, char v2, char v3, char v4, char v5, char v6, char v7, char v8,  char v9,
+                    char v10, char v11, char v12, char v13, char v14, char v15, char v16, char v17, char v18, char v19,
+                    char v20, char v21, char v22, char v23, char v24, char v25, char v26, char v27, char v28, char v29,
+                    char v30, char v31)
+{
+    return (__m256i)v32i8{ v0, v1, v2, v3, v4, v5, v6, v7, v8, v9,
+                           v10, v11, v12, v13, v14, v15, v16, v17, v18, v19,
+                           v20, v21, v22, v23, v24, v25, v26, v27, v28, v29,
+                           v30, v31 };
+}
+
+inline __m256i _v256_set_b(char v0, char v1, char v2, char v3, char v4, char v5, char v6, char v7, char v8,  char v9,
+                   char v10, char v11, char v12, char v13, char v14, char v15, char v16, char v17, char v18, char v19,
+                   char v20, char v21, char v22, char v23, char v24, char v25, char v26, char v27, char v28, char v29,
+                   char v30, char v31)
+{
+    return (__m256i)v32i8{ v31, v30,
+                           v29, v28, v27, v26, v25, v24, v23, v22, v21, v20,
+                           v19, v18, v17, v16, v15, v14, v13, v12, v11, v10,
+                           v9, v8, v7, v6, v5, v4, v3, v2, v1, v0 };
+}
+
+inline __m256i _v256_setr_h(short v0, short v1, short v2, short v3, short v4, short v5, short v6, short v7,
+                            short v8,  short v9, short v10, short v11, short v12, short v13, short v14, short v15)
+{
+    return (__m256i)v16i16{ v0, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15 };
+}
+
+inline __m256i _v256_setr_w(int v0, int v1, int v2, int v3, int v4, int v5, int v6, int v7)
+{
+    return (__m256i)v8i32{ v0, v1, v2, v3, v4, v5, v6, v7 };
+}
+
+inline __m256i _v256_set_w(int v0, int v1, int v2, int v3, int v4, int v5, int v6, int v7)
+{
+    return (__m256i)v8i32{ v7, v6, v5, v4, v3, v2, v1, v0 };
+}
+
+inline __m256i _v256_setall_w(int v0)
+{
+    return (__m256i)v8i32{ v0, v0, v0, v0, v0, v0, v0, v0 };
+}
+
+inline __m256i _v256_setr_d(int64 v0, int64 v1, int64 v2, int64 v3)
+{
+    return (__m256i)v4i64{ v0, v1, v2, v3 };
+}
+
+inline __m256i _v256_set_d(int64 v0, int64 v1, int64 v2, int64 v3)
+{
+    return (__m256i)v4i64{ v3, v2, v1, v0 };
+}
+
+inline __m256 _v256_setr_ps(float v0, float v1, float v2, float v3, float v4, float v5, float v6, float v7)
+{
+    return (__m256)v8f32{ v0, v1, v2, v3, v4, v5, v6, v7 };
+}
+
+inline __m256 _v256_setall_ps(float f32)
+{
+    return (__m256)v8f32{ f32, f32, f32, f32, f32, f32, f32, f32 };
+}
+
+inline __m256d _v256_setr_pd(double v0, double v1, double v2, double v3)
+{
+    return (__m256d)v4f64{ v0, v1, v2, v3 };
+}
+
+inline __m256d _v256_setall_pd(double f64)
+{
+    return (__m256d)v4f64{ f64, f64, f64, f64 };
+}
+
+inline __m256i _lasx_packus_h(const __m256i& a, const __m256i& b)
+{
+    return __lasx_xvssrarni_bu_h(b, a, 0);
+}
+
+inline __m256i _lasx_packs_h(const __m256i& a, const __m256i& b)
+{
+    return __lasx_xvssrarni_b_h(b, a, 0);
+}
+
+inline __m256i _lasx_packus_w(const __m256i& a, const __m256i& b)
+{
+    return __lasx_xvssrarni_hu_w(b, a, 0);
+}
+
+inline __m256i _lasx_packs_w(const __m256i& a, const __m256i& b)
+{
+    return __lasx_xvssrarni_h_w(b, a, 0);
+}
+
+inline __m256i _v256_combine(const __m128i& lo, const __m128i& hi)
+{ return __lasx_xvpermi_q(*((__m256i*)&lo), *((__m256i*)&hi), 0x02); }
+
+inline __m256 _v256_combine(const __m128& lo, const __m128& hi)
+{ return __m256(__lasx_xvpermi_q(*((__m256i*)&lo), *((__m256i*)&hi), 0x02)); }
+
+inline __m256d _v256_combine(const __m128d& lo, const __m128d& hi)
+{ return __m256d(__lasx_xvpermi_q(*((__m256i*)&lo), *((__m256i*)&hi), 0x02)); }
+
+inline __m256i _v256_shuffle_odd_64(const __m256i& v)
+{ return __lasx_xvpermi_d(v, 0xd8); }
+
+inline __m256d _v256_shuffle_odd_64(const __m256d& v)
+{ return __m256d(__lasx_xvpermi_d(*((__m256i*)&v), 0xd8)); }
+
+//LASX: only use for permute WITHOUT zero clearing
+template<int imm>
+inline __m256i _v256_permute2x128(const __m256i& a, const __m256i& b)
+{ return __lasx_xvpermi_q(a, b, imm); }
+
+template<int imm>
+inline __m256 _v256_permute2x128(const __m256& a, const __m256& b)
+{ return __m256(__lasx_xvpermi_q(*((__m256i*)&a), *((__m256i*)&b), imm)); }
+
+template<int imm>
+inline __m256d _v256_permute2x128(const __m256d& a, const __m256d& b)
+{ return __m256d(__lasx_xvpermi_q(*((__m256i*)&a), *((__m256i*)&b), imm)); }
+
+template<int imm, typename _Tpvec>
+inline _Tpvec v256_permute2x128(const _Tpvec& a, const _Tpvec& b)
+{ return _Tpvec(_v256_permute2x128<imm>(a.val, b.val)); }
+
+template<int imm>
+inline __m256i _v256_permute4x64(const __m256i& a)
+{ return __lasx_xvpermi_d(a, imm); }
+
+template<int imm>
+inline __m256d _v256_permute4x64(const __m256d& a)
+{ return __m256d(__lasx_xvpermi_d(*((__m256i*)&a), imm)); }
+
+template<int imm, typename _Tpvec>
+inline _Tpvec v256_permute4x64(const _Tpvec& a)
+{ return _Tpvec(_v256_permute4x64<imm>(a.val)); }
+
+inline __m128i _v256_extract_high(const __m256i& v)
+{ __m256i temp256i = __lasx_xvpermi_d(v, 0x4E);
+  return *((__m128i*)&temp256i); }
+
+inline __m128  _v256_extract_high(const __m256& v)
+{ return __m128(_v256_extract_high(*((__m256i*)&v))); }
+
+inline __m128d _v256_extract_high(const __m256d& v)
+{ return __m128d(_v256_extract_high(*((__m256i*)&v))); }
+
+inline __m128i _v256_extract_low(const __m256i& v)
+{ return *((__m128i*)&v); }
+
+inline __m128  _v256_extract_low(const __m256& v)
+{ return __m128(_v256_extract_low(*((__m256i*)&v))); }
+
+inline __m128d _v256_extract_low(const __m256d& v)
+{ return __m128d(_v256_extract_low(*((__m256i*)&v))); }
+
+inline __m256i _v256_packs_epu32(const __m256i& a, const __m256i& b)
+{
+    return __lasx_xvssrlrni_hu_w(b, a, 0);
+}
+
+template<int i>
+inline int _v256_extract_b(const __m256i& a)
+{
+    int des[1] = {0};
+    __lasx_xvstelm_b(a, des, 0, i);
+    return des[0];
+}
+
+template<int i>
+inline int _v256_extract_h(const __m256i& a)
+{
+    int des[1] = {0};
+    __lasx_xvstelm_h(a, des, 0, i);
+    return des[0];
+}
+
+template<int i>
+inline int _v256_extract_w(const __m256i& a)
+{
+    return __lasx_xvpickve2gr_w(a, i);
+}
+
+template<int i>
+inline int64 _v256_extract_d(const __m256i& a)
+{
+    return __lasx_xvpickve2gr_d(a, i);
+}
+
+///////// Types ////////////
+
+struct v_uint8x32
+{
+    typedef uchar lane_type;
+    enum { nlanes = 32 };
+    __m256i val;
+
+    explicit v_uint8x32(__m256i v) : val(v) {}
+    v_uint8x32(uchar v0,  uchar v1,  uchar v2,  uchar v3,
+               uchar v4,  uchar v5,  uchar v6,  uchar v7,
+               uchar v8,  uchar v9,  uchar v10, uchar v11,
+               uchar v12, uchar v13, uchar v14, uchar v15,
+               uchar v16, uchar v17, uchar v18, uchar v19,
+               uchar v20, uchar v21, uchar v22, uchar v23,
+               uchar v24, uchar v25, uchar v26, uchar v27,
+               uchar v28, uchar v29, uchar v30, uchar v31)
+    {
+        val = _v256_setr_b((char)v0, (char)v1, (char)v2, (char)v3,
+            (char)v4,  (char)v5,  (char)v6 , (char)v7,  (char)v8,  (char)v9,
+            (char)v10, (char)v11, (char)v12, (char)v13, (char)v14, (char)v15,
+            (char)v16, (char)v17, (char)v18, (char)v19, (char)v20, (char)v21,
+            (char)v22, (char)v23, (char)v24, (char)v25, (char)v26, (char)v27,
+            (char)v28, (char)v29, (char)v30, (char)v31);
+    }
+    /* coverity[uninit_ctor]: suppress warning */
+    v_uint8x32() {}
+
+    uchar get0() const {
+        uchar des[1] = {0};
+        __lasx_xvstelm_b(val, des, 0, 0);
+        return des[0];
+    }
+};
+
+struct v_int8x32
+{
+    typedef schar lane_type;
+    enum { nlanes = 32 };
+    __m256i val;
+
+    explicit v_int8x32(__m256i v) : val(v) {}
+    v_int8x32(schar v0,  schar v1,  schar v2,  schar v3,
+              schar v4,  schar v5,  schar v6,  schar v7,
+              schar v8,  schar v9,  schar v10, schar v11,
+              schar v12, schar v13, schar v14, schar v15,
+              schar v16, schar v17, schar v18, schar v19,
+              schar v20, schar v21, schar v22, schar v23,
+              schar v24, schar v25, schar v26, schar v27,
+              schar v28, schar v29, schar v30, schar v31)
+    {
+        val = _v256_setr_b(v0, v1, v2, v3, v4, v5, v6, v7, v8, v9,
+            v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20,
+            v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31);
+    }
+    /* coverity[uninit_ctor]: suppress warning */
+    v_int8x32() {}
+
+    schar get0() const {
+        schar des[1] = {0};
+        __lasx_xvstelm_b(val, des, 0, 0);
+        return des[0];
+    }
+};
+
+struct v_uint16x16
+{
+    typedef ushort lane_type;
+    enum { nlanes = 16 };
+    __m256i val;
+
+    explicit v_uint16x16(__m256i v) : val(v) {}
+    v_uint16x16(ushort v0,  ushort v1,  ushort v2,  ushort v3,
+                ushort v4,  ushort v5,  ushort v6,  ushort v7,
+                ushort v8,  ushort v9,  ushort v10, ushort v11,
+                ushort v12, ushort v13, ushort v14, ushort v15)
+    {
+        val = _v256_setr_h((short)v0, (short)v1, (short)v2, (short)v3,
+            (short)v4,  (short)v5,  (short)v6,  (short)v7,  (short)v8,  (short)v9,
+            (short)v10, (short)v11, (short)v12, (short)v13, (short)v14, (short)v15);
+    }
+    /* coverity[uninit_ctor]: suppress warning */
+    v_uint16x16() {}
+
+    ushort get0() const {
+        ushort des[1] = {0};
+        __lasx_xvstelm_h(val, des, 0, 0);
+        return des[0];
+    }
+};
+
+struct v_int16x16
+{
+    typedef short lane_type;
+    enum { nlanes = 16 };
+    __m256i val;
+
+    explicit v_int16x16(__m256i v) : val(v) {}
+    v_int16x16(short v0,  short v1,  short v2,  short v3,
+               short v4,  short v5,  short v6,  short v7,
+               short v8,  short v9,  short v10, short v11,
+               short v12, short v13, short v14, short v15)
+    {
+        val = _v256_setr_h(v0, v1, v2, v3, v4, v5, v6, v7,
+            v8, v9, v10, v11, v12, v13, v14, v15);
+    }
+    /* coverity[uninit_ctor]: suppress warning */
+    v_int16x16() {}
+
+    short get0() const {
+        short des[1] = {0};
+        __lasx_xvstelm_h(val, des, 0, 0);
+        return des[0];
+    }
+};
+
+struct v_uint32x8
+{
+    typedef unsigned lane_type;
+    enum { nlanes = 8 };
+    __m256i val;
+
+    explicit v_uint32x8(__m256i v) : val(v) {}
+    v_uint32x8(unsigned v0, unsigned v1, unsigned v2, unsigned v3,
+               unsigned v4, unsigned v5, unsigned v6, unsigned v7)
+    {
+        val = _v256_setr_w((unsigned)v0, (unsigned)v1, (unsigned)v2,
+            (unsigned)v3, (unsigned)v4, (unsigned)v5, (unsigned)v6, (unsigned)v7);
+    }
+    /* coverity[uninit_ctor]: suppress warning */
+    v_uint32x8() {}
+
+    unsigned get0() const { return __lasx_xvpickve2gr_wu(val, 0); }
+};
+
+struct v_int32x8
+{
+    typedef int lane_type;
+    enum { nlanes = 8 };
+    __m256i val;
+
+    explicit v_int32x8(__m256i v) : val(v) {}
+    v_int32x8(int v0, int v1, int v2, int v3,
+              int v4, int v5, int v6, int v7)
+    {
+        val = _v256_setr_w(v0, v1, v2, v3, v4, v5, v6, v7);
+    }
+    /* coverity[uninit_ctor]: suppress warning */
+    v_int32x8() {}
+
+    int get0() const { return __lasx_xvpickve2gr_w(val, 0); }
+};
+
+struct v_float32x8
+{
+    typedef float lane_type;
+    enum { nlanes = 8 };
+    __m256 val;
+
+    explicit v_float32x8(__m256 v) : val(v) {}
+    explicit v_float32x8(__m256i v) { val = *((__m256*)&v); }
+    v_float32x8(float v0, float v1, float v2, float v3,
+                float v4, float v5, float v6, float v7)
+    {
+        val = _v256_setr_ps(v0, v1, v2, v3, v4, v5, v6, v7);
+    }
+    /* coverity[uninit_ctor]: suppress warning */
+    v_float32x8() {}
+
+    float get0() const {
+        float des[1] = {0};
+        __lasx_xvstelm_w(*((__m256i*)&val), des, 0, 0);
+        return des[0];
+    }
+
+    int get0toint() const {
+        int des[1] = {0};
+        __lasx_xvstelm_w(*((__m256i*)&val), des, 0, 0);
+        return des[0];
+    }
+};
+
+struct v_uint64x4
+{
+    typedef uint64 lane_type;
+    enum { nlanes = 4 };
+    __m256i val;
+
+    explicit v_uint64x4(__m256i v) : val(v) {}
+    v_uint64x4(uint64 v0, uint64 v1, uint64 v2, uint64 v3)
+    { val = _v256_setr_d((int64)v0, (int64)v1, (int64)v2, (int64)v3); }
+    /* coverity[uninit_ctor]: suppress warning */
+    v_uint64x4() {}
+
+    uint64 get0() const
+    {
+        return __lasx_xvpickve2gr_du(val, 0);
+    }
+};
+
+struct v_int64x4
+{
+    typedef int64 lane_type;
+    enum { nlanes = 4 };
+    __m256i val;
+
+    explicit v_int64x4(__m256i v) : val(v) {}
+    v_int64x4(int64 v0, int64 v1, int64 v2, int64 v3)
+    { val = _v256_setr_d(v0, v1, v2, v3); }
+    /* coverity[uninit_ctor]: suppress warning */
+    v_int64x4() {}
+
+    int64 get0() const
+    {
+        return __lasx_xvpickve2gr_d(val, 0);
+    }
+};
+
+struct v_float64x4
+{
+    typedef double lane_type;
+    enum { nlanes = 4 };
+    __m256d val;
+
+    explicit v_float64x4(__m256d v) : val(v) {}
+    explicit v_float64x4(__m256i v) { val = *((__m256d*)&v); }
+    v_float64x4(double v0, double v1, double v2, double v3)
+    { val = _v256_setr_pd(v0, v1, v2, v3); }
+    /* coverity[uninit_ctor]: suppress warning */
+    v_float64x4() {}
+
+    double get0() const {
+        double des[1] = {0};
+        __lasx_xvstelm_d(*((__m256i*)&val), des, 0, 0);
+        return des[0];
+    }
+
+    int64 get0toint64() const {
+        int64 des[1] = {0};
+        __lasx_xvstelm_d(*((__m256i*)&val), des, 0, 0);
+        return des[0];
+    }
+};
+
+//////////////// Load and store operations ///////////////
+
+#define OPENCV_HAL_IMPL_LASX_LOADSTORE(_Tpvec, _Tp)                   \
+    inline _Tpvec v256_load(const _Tp* ptr)                           \
+    { return _Tpvec(__lasx_xvld(ptr, 0)); }                           \
+    inline _Tpvec v256_load_aligned(const _Tp* ptr)                   \
+    { return _Tpvec(__lasx_xvld(ptr, 0)); }                           \
+    inline _Tpvec v256_load_low(const _Tp* ptr)                       \
+    {                                                                 \
+        __m128i v128 = __lsx_vld(ptr, 0);                             \
+        return _Tpvec(*((__m256i*)&v128));                            \
+    }                                                                 \
+    inline _Tpvec v256_load_halves(const _Tp* ptr0, const _Tp* ptr1)  \
+    {                                                                 \
+        __m128i vlo = __lsx_vld(ptr0, 0);                             \
+        __m128i vhi = __lsx_vld(ptr1, 0);                             \
+        return _Tpvec(_v256_combine(vlo, vhi));                       \
+    }                                                                 \
+    inline void v_store(_Tp* ptr, const _Tpvec& a)                    \
+    { __lasx_xvst(a.val, ptr, 0); }                                   \
+    inline void v_store_aligned(_Tp* ptr, const _Tpvec& a)            \
+    { __lasx_xvst(a.val, ptr, 0); }                                   \
+    inline void v_store_aligned_nocache(_Tp* ptr, const _Tpvec& a)    \
+    { __lasx_xvst(a.val, ptr, 0); }                                   \
+    inline void v_store(_Tp* ptr, const _Tpvec& a, hal::StoreMode mode) \
+    { \
+        if( mode == hal::STORE_UNALIGNED ) \
+            __lasx_xvst(a.val, ptr, 0); \
+        else if( mode == hal::STORE_ALIGNED_NOCACHE )  \
+            __lasx_xvst(a.val, ptr, 0); \
+        else \
+            __lasx_xvst(a.val, ptr, 0); \
+    } \
+    inline void v_store_low(_Tp* ptr, const _Tpvec& a)                \
+    { __lsx_vst(_v256_extract_low(a.val), ptr, 0); }                  \
+    inline void v_store_high(_Tp* ptr, const _Tpvec& a)               \
+    { __lsx_vst(_v256_extract_high(a.val), ptr, 0); }
+
+OPENCV_HAL_IMPL_LASX_LOADSTORE(v_uint8x32,  uchar)
+OPENCV_HAL_IMPL_LASX_LOADSTORE(v_int8x32,   schar)
+OPENCV_HAL_IMPL_LASX_LOADSTORE(v_uint16x16, ushort)
+OPENCV_HAL_IMPL_LASX_LOADSTORE(v_int16x16,  short)
+OPENCV_HAL_IMPL_LASX_LOADSTORE(v_uint32x8,  unsigned)
+OPENCV_HAL_IMPL_LASX_LOADSTORE(v_int32x8,   int)
+OPENCV_HAL_IMPL_LASX_LOADSTORE(v_uint64x4,  uint64)
+OPENCV_HAL_IMPL_LASX_LOADSTORE(v_int64x4,   int64)
+
+
+#define OPENCV_HAL_IMPL_LASX_LOADSTORE_FLT(_Tpvec, _Tp, halfreg)          \
+    inline _Tpvec v256_load(const _Tp* ptr)                               \
+    { return _Tpvec(__lasx_xvld(ptr, 0)); }                               \
+    inline _Tpvec v256_load_aligned(const _Tp* ptr)                       \
+    { return _Tpvec(__lasx_xvld(ptr, 0)); }                               \
+    inline _Tpvec v256_load_low(const _Tp* ptr)                           \
+    {                                                                     \
+        __m128i v128 = __lsx_vld(ptr, 0);                                 \
+        return _Tpvec(*((__m256i*)&v128));                                \
+    }                                                                     \
+    inline _Tpvec v256_load_halves(const _Tp* ptr0, const _Tp* ptr1)      \
+    {                                                                     \
+        halfreg vlo = __lsx_vld(ptr0, 0);                                 \
+        halfreg vhi = __lsx_vld(ptr1, 0);                                 \
+        return _Tpvec(_v256_combine(vlo, vhi));                           \
+    }                                                                     \
+    inline void v_store(_Tp* ptr, const _Tpvec& a)                        \
+    { __lasx_xvst(a.val, ptr, 0); }                                       \
+    inline void v_store_aligned(_Tp* ptr, const _Tpvec& a)                \
+    { __lasx_xvst(a.val, ptr, 0); }                                       \
+    inline void v_store_aligned_nocache(_Tp* ptr, const _Tpvec& a)        \
+    { __lasx_xvst(a.val, ptr, 0); }                                       \
+    inline void v_store(_Tp* ptr, const _Tpvec& a, hal::StoreMode mode) \
+    { \
+        if( mode == hal::STORE_UNALIGNED ) \
+            __lasx_xvst(a.val, ptr, 0); \
+        else if( mode == hal::STORE_ALIGNED_NOCACHE )  \
+            __lasx_xvst(a.val, ptr, 0); \
+        else \
+            __lasx_xvst(a.val, ptr, 0); \
+    } \
+    inline void v_store_low(_Tp* ptr, const _Tpvec& a)                    \
+    { __lsx_vst(_v256_extract_low(a.val), ptr, 0); }                      \
+    inline void v_store_high(_Tp* ptr, const _Tpvec& a)                   \
+    { __lsx_vst(_v256_extract_high(a.val), ptr, 0); }
+
+OPENCV_HAL_IMPL_LASX_LOADSTORE_FLT(v_float32x8, float, __m128i)
+OPENCV_HAL_IMPL_LASX_LOADSTORE_FLT(v_float64x4, double, __m128i)
+
+
+inline __m256i _lasx_256_castps_si256(const __m256& v)
+{ return __m256i(v); }
+
+inline __m256i _lasx_256_castpd_si256(const __m256d& v)
+{ return __m256i(v); }
+
+#define OPENCV_HAL_IMPL_LASX_CAST(_Tpvec, _Tpvecf, suffix, cast) \
+    inline _Tpvec v_reinterpret_as_##suffix(const _Tpvecf& a)   \
+    { return _Tpvec(cast(a.val)); }
+
+#define OPENCV_HAL_IMPL_LASX_INIT(_Tpvec, _Tp, suffix, ssuffix, ctype_s)          \
+    inline _Tpvec v256_setzero_##suffix()                                         \
+    { return _Tpvec(__lasx_xvreplgr2vr_d(0)); }                                   \
+    inline _Tpvec v256_setall_##suffix(_Tp v)                                     \
+    { return _Tpvec(__lasx_xvreplgr2vr_##ssuffix((ctype_s)v)); }                  \
+    template <> inline _Tpvec v_setzero_()                                        \
+    { return v256_setzero_##suffix(); }                                           \
+    template <> inline _Tpvec v_setall_(_Tp v)                                    \
+    { return v256_setall_##suffix(v); }                                           \
+    OPENCV_HAL_IMPL_LASX_CAST(_Tpvec, v_uint8x32,  suffix, OPENCV_HAL_NOP)        \
+    OPENCV_HAL_IMPL_LASX_CAST(_Tpvec, v_int8x32,   suffix, OPENCV_HAL_NOP)        \
+    OPENCV_HAL_IMPL_LASX_CAST(_Tpvec, v_uint16x16, suffix, OPENCV_HAL_NOP)        \
+    OPENCV_HAL_IMPL_LASX_CAST(_Tpvec, v_int16x16,  suffix, OPENCV_HAL_NOP)        \
+    OPENCV_HAL_IMPL_LASX_CAST(_Tpvec, v_uint32x8,  suffix, OPENCV_HAL_NOP)        \
+    OPENCV_HAL_IMPL_LASX_CAST(_Tpvec, v_int32x8,   suffix, OPENCV_HAL_NOP)        \
+    OPENCV_HAL_IMPL_LASX_CAST(_Tpvec, v_uint64x4,  suffix, OPENCV_HAL_NOP)        \
+    OPENCV_HAL_IMPL_LASX_CAST(_Tpvec, v_int64x4,   suffix, OPENCV_HAL_NOP)        \
+    OPENCV_HAL_IMPL_LASX_CAST(_Tpvec, v_float32x8, suffix, _lasx_256_castps_si256) \
+    OPENCV_HAL_IMPL_LASX_CAST(_Tpvec, v_float64x4, suffix, _lasx_256_castpd_si256)
+
+OPENCV_HAL_IMPL_LASX_INIT(v_uint8x32,  uchar,    u8,  b,   int)
+OPENCV_HAL_IMPL_LASX_INIT(v_int8x32,   schar,    s8,  b,   int)
+OPENCV_HAL_IMPL_LASX_INIT(v_uint16x16, ushort,   u16, h,  int)
+OPENCV_HAL_IMPL_LASX_INIT(v_int16x16,  short,    s16, h,  int)
+OPENCV_HAL_IMPL_LASX_INIT(v_uint32x8,  unsigned, u32, w,  int)
+OPENCV_HAL_IMPL_LASX_INIT(v_int32x8,   int,      s32, w,  int)
+OPENCV_HAL_IMPL_LASX_INIT(v_uint64x4,  uint64,   u64, d, long int)
+OPENCV_HAL_IMPL_LASX_INIT(v_int64x4,   int64,    s64, d, long int)
+
+
+inline __m256 _lasx_256_castsi256_ps(const __m256i &v)
+{ return __m256(v); }
+
+inline __m256d _lasx_256_castsi256_pd(const __m256i &v)
+{ return __m256d(v); }
+
+#define OPENCV_HAL_IMPL_LASX_INIT_FLT(_Tpvec, _Tp, suffix, zsuffix, cast) \
+    inline _Tpvec v256_setzero_##suffix()                                 \
+    { return _Tpvec(__lasx_xvreplgr2vr_d(0)); }                           \
+    inline _Tpvec v256_setall_##suffix(_Tp v)                             \
+    { return _Tpvec(_v256_setall_##zsuffix(v)); }                         \
+    template <> inline _Tpvec v_setzero_()                                \
+    { return v256_setzero_##suffix(); }                                   \
+    template <> inline _Tpvec v_setall_(_Tp v)                            \
+    { return v256_setall_##suffix(v); }                                   \
+    OPENCV_HAL_IMPL_LASX_CAST(_Tpvec, v_uint8x32,  suffix, cast)          \
+    OPENCV_HAL_IMPL_LASX_CAST(_Tpvec, v_int8x32,   suffix, cast)          \
+    OPENCV_HAL_IMPL_LASX_CAST(_Tpvec, v_uint16x16, suffix, cast)          \
+    OPENCV_HAL_IMPL_LASX_CAST(_Tpvec, v_int16x16,  suffix, cast)          \
+    OPENCV_HAL_IMPL_LASX_CAST(_Tpvec, v_uint32x8,  suffix, cast)          \
+    OPENCV_HAL_IMPL_LASX_CAST(_Tpvec, v_int32x8,   suffix, cast)          \
+    OPENCV_HAL_IMPL_LASX_CAST(_Tpvec, v_uint64x4,  suffix, cast)          \
+    OPENCV_HAL_IMPL_LASX_CAST(_Tpvec, v_int64x4,   suffix, cast)
+
+OPENCV_HAL_IMPL_LASX_INIT_FLT(v_float32x8, float,  f32, ps, _lasx_256_castsi256_ps)
+OPENCV_HAL_IMPL_LASX_INIT_FLT(v_float64x4, double, f64, pd, _lasx_256_castsi256_pd)
+
+inline v_float32x8 v_reinterpret_as_f32(const v_float32x8& a)
+{ return a; }
+inline v_float32x8 v_reinterpret_as_f32(const v_float64x4& a)
+{ return v_float32x8(_lasx_256_castps_si256(__m256(a.val))); }
+
+inline v_float64x4 v_reinterpret_as_f64(const v_float64x4& a)
+{ return a; }
+inline v_float64x4 v_reinterpret_as_f64(const v_float32x8& a)
+{ return v_float64x4(_lasx_256_castpd_si256(__m256d(a.val))); }
+
+
+//////////////// Variant Value reordering ///////////////
+
+// unpacks
+#define OPENCV_HAL_IMPL_LASX_UNPACK(_Tpvec, suffix)                 \
+    inline _Tpvec v256_unpacklo(const _Tpvec& a, const _Tpvec& b)   \
+    { return _Tpvec(__lasx_xvilvl_##suffix(__m256i(b.val), __m256i(a.val))); }        \
+    inline _Tpvec v256_unpackhi(const _Tpvec& a, const _Tpvec& b)   \
+    { return _Tpvec(__lasx_xvilvh_##suffix(__m256i(b.val), __m256i(a.val))); }
+
+OPENCV_HAL_IMPL_LASX_UNPACK(v_uint8x32,  b)
+OPENCV_HAL_IMPL_LASX_UNPACK(v_int8x32,   b)
+OPENCV_HAL_IMPL_LASX_UNPACK(v_uint16x16, h)
+OPENCV_HAL_IMPL_LASX_UNPACK(v_int16x16,  h)
+OPENCV_HAL_IMPL_LASX_UNPACK(v_uint32x8,  w)
+OPENCV_HAL_IMPL_LASX_UNPACK(v_int32x8,   w)
+OPENCV_HAL_IMPL_LASX_UNPACK(v_uint64x4,  d)
+OPENCV_HAL_IMPL_LASX_UNPACK(v_int64x4,   d)
+OPENCV_HAL_IMPL_LASX_UNPACK(v_float32x8, w)
+OPENCV_HAL_IMPL_LASX_UNPACK(v_float64x4, d)
+
+
+// shuffle
+// todo: emulate 64bit
+#define OPENCV_HAL_IMPL_LASX_SHUFFLE(_Tpvec, intrin)  \
+    template<int m>                                  \
+    inline _Tpvec v256_shuffle(const _Tpvec& a)      \
+    { return _Tpvec(__lasx_xvshuf4i_##intrin(a.val, m)); }
+
+OPENCV_HAL_IMPL_LASX_SHUFFLE(v_uint32x8,  w)
+OPENCV_HAL_IMPL_LASX_SHUFFLE(v_int32x8,   w)
+
+template<int m>
+inline v_float32x8 v256_shuffle(const v_float32x8 &a)
+{ return v_float32x8(__lasx_xvshuf4i_w(*((__m256i*)&a.val), m)); }
+
+template<int m>
+inline v_float64x4 v256_shuffle(const v_float64x4 &a)
+{
+    const int m1 = m & 0b1;
+    const int m2 = m & 0b10;
+    const int m3 = m & 0b100;
+    const int m4 = m & 0b1000;
+    const int m5 = m2 << 1;
+    const int m6 = m3 << 2;
+    const int m7 = m4 << 3;
+    const int m8 = m1 & m5 & m6 & m7;
+
+    return v_float64x4(__lasx_xvshuf4i_d(*((__m256i*)&a.val), *((__m256i*)&a.val), m8));
+}
+
+template<typename _Tpvec>
+inline void v256_zip(const _Tpvec& a, const _Tpvec& b, _Tpvec& ab0, _Tpvec& ab1)
+{
+    ab0 = v256_unpacklo(a, b);
+    ab1 = v256_unpackhi(a, b);
+}
+
+template<typename _Tpvec>
+inline _Tpvec v256_combine_diagonal(const _Tpvec& a, const _Tpvec& b)
+{ return _Tpvec(__lasx_xvpermi_q(a.val, b.val, 0x12)); }
+
+inline v_float32x8 v256_combine_diagonal(const v_float32x8& a, const v_float32x8& b)
+{ return v_float32x8(__lasx_xvpermi_q(a.val, b.val, 0x12)); }
+
+inline v_float64x4 v256_combine_diagonal(const v_float64x4& a, const v_float64x4& b)
+{ return v_float64x4(__lasx_xvpermi_q(a.val, b.val, 0x12)); }
+
+template<typename _Tpvec>
+inline _Tpvec v256_alignr_128(const _Tpvec& a, const _Tpvec& b)
+{ return v256_permute2x128<0x03>(a, b); }
+
+inline __m256i _v256_alignr_b(const __m256i &a, const __m256i &b, const int imm)
+{
+    if (imm == 8) {
+        return __lasx_xvshuf4i_d(b, a, 0x9); // b.d1 a.d0 b.d3 a.d2
+    } else {
+        __m256i byteIndex = _v256_setr_b(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+                                         0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15);
+        return __lasx_xvshuf_b(a, b, __lasx_xvadd_b(__lasx_xvreplgr2vr_b(imm), byteIndex));
+    }
+}
+
+template<typename _Tpvec>
+inline _Tpvec v256_alignr_64(const _Tpvec& a, const _Tpvec& b)
+{ return _Tpvec(_v256_alignr_b(a.val, b.val, 8)); }
+inline v_float64x4 v256_alignr_64(const v_float64x4& a, const v_float64x4& b)
+{ return v_float64x4(__lasx_xvshuf4i_d(b.val, a.val, 0x9)); } // b.d1 a.d0 b.d3 a.d2
+// todo: emulate float32
+
+template<typename _Tpvec>
+inline _Tpvec v256_swap_halves(const _Tpvec& a)
+{ return v256_permute2x128<1>(a, a); }
+
+template<typename _Tpvec>
+inline _Tpvec v256_reverse_64(const _Tpvec& a)
+{ return v256_permute4x64<0x1b>(a); }
+
+
+// ZIP
+#define OPENCV_HAL_IMPL_LASX_ZIP(_Tpvec)                             \
+    inline _Tpvec v_combine_low(const _Tpvec& a, const _Tpvec& b)    \
+    { return v256_permute2x128<0x02>(a, b); }                        \
+    inline _Tpvec v_combine_high(const _Tpvec& a, const _Tpvec& b)   \
+    { return v256_permute2x128<0x13>(a, b); }                        \
+    inline void v_recombine(const _Tpvec& a, const _Tpvec& b,        \
+                             _Tpvec& c, _Tpvec& d)                   \
+    {                                                                \
+        _Tpvec a1b0 = v256_alignr_128(a, b);                         \
+        c = v256_combine_diagonal(a, a1b0);                          \
+        d = v256_combine_diagonal(a1b0, b);                          \
+    }                                                                \
+    inline void v_zip(const _Tpvec& a, const _Tpvec& b,              \
+                      _Tpvec& ab0, _Tpvec& ab1)                      \
+    {                                                                \
+        _Tpvec ab0ab2, ab1ab3;                                       \
+        v256_zip(a, b, ab0ab2, ab1ab3);                              \
+        v_recombine(ab0ab2, ab1ab3, ab0, ab1);                       \
+    }
+
+OPENCV_HAL_IMPL_LASX_ZIP(v_uint8x32)
+OPENCV_HAL_IMPL_LASX_ZIP(v_int8x32)
+OPENCV_HAL_IMPL_LASX_ZIP(v_uint16x16)
+OPENCV_HAL_IMPL_LASX_ZIP(v_int16x16)
+OPENCV_HAL_IMPL_LASX_ZIP(v_uint32x8)
+OPENCV_HAL_IMPL_LASX_ZIP(v_int32x8)
+OPENCV_HAL_IMPL_LASX_ZIP(v_uint64x4)
+OPENCV_HAL_IMPL_LASX_ZIP(v_int64x4)
+OPENCV_HAL_IMPL_LASX_ZIP(v_float32x8)
+OPENCV_HAL_IMPL_LASX_ZIP(v_float64x4)
+
+////////// Arithmetic, bitwise and comparison operations /////////
+
+/** Arithmetics **/
+#define OPENCV_HAL_IMPL_LASX_BIN_OP(bin_op, _Tpvec, intrin)           \
+    inline _Tpvec bin_op(const _Tpvec& a, const _Tpvec& b)            \
+    { return _Tpvec(intrin(a.val, b.val)); }
+
+OPENCV_HAL_IMPL_LASX_BIN_OP(v_add, v_uint8x32,  __lasx_xvsadd_bu)
+OPENCV_HAL_IMPL_LASX_BIN_OP(v_sub, v_uint8x32,  __lasx_xvssub_bu)
+OPENCV_HAL_IMPL_LASX_BIN_OP(v_add, v_int8x32,   __lasx_xvsadd_b)
+OPENCV_HAL_IMPL_LASX_BIN_OP(v_sub, v_int8x32,   __lasx_xvssub_b)
+OPENCV_HAL_IMPL_LASX_BIN_OP(v_add, v_uint16x16, __lasx_xvsadd_hu)
+OPENCV_HAL_IMPL_LASX_BIN_OP(v_sub, v_uint16x16, __lasx_xvssub_hu)
+OPENCV_HAL_IMPL_LASX_BIN_OP(v_add, v_int16x16,  __lasx_xvsadd_h)
+OPENCV_HAL_IMPL_LASX_BIN_OP(v_sub, v_int16x16,  __lasx_xvssub_h)
+OPENCV_HAL_IMPL_LASX_BIN_OP(v_add, v_uint32x8,  __lasx_xvadd_w)
+OPENCV_HAL_IMPL_LASX_BIN_OP(v_sub, v_uint32x8,  __lasx_xvsub_w)
+OPENCV_HAL_IMPL_LASX_BIN_OP(v_mul, v_uint32x8,  __lasx_xvmul_w)
+OPENCV_HAL_IMPL_LASX_BIN_OP(v_add, v_int32x8,   __lasx_xvadd_w)
+OPENCV_HAL_IMPL_LASX_BIN_OP(v_sub, v_int32x8,   __lasx_xvsub_w)
+OPENCV_HAL_IMPL_LASX_BIN_OP(v_mul, v_int32x8,   __lasx_xvmul_w)
+OPENCV_HAL_IMPL_LASX_BIN_OP(v_add, v_uint64x4,  __lasx_xvadd_d)
+OPENCV_HAL_IMPL_LASX_BIN_OP(v_sub, v_uint64x4,  __lasx_xvsub_d)
+OPENCV_HAL_IMPL_LASX_BIN_OP(v_add, v_int64x4,   __lasx_xvadd_d)
+OPENCV_HAL_IMPL_LASX_BIN_OP(v_sub, v_int64x4,   __lasx_xvsub_d)
+
+OPENCV_HAL_IMPL_LASX_BIN_OP(v_add, v_float32x8, __lasx_xvfadd_s)
+OPENCV_HAL_IMPL_LASX_BIN_OP(v_sub, v_float32x8, __lasx_xvfsub_s)
+OPENCV_HAL_IMPL_LASX_BIN_OP(v_mul, v_float32x8, __lasx_xvfmul_s)
+OPENCV_HAL_IMPL_LASX_BIN_OP(v_div, v_float32x8, __lasx_xvfdiv_s)
+OPENCV_HAL_IMPL_LASX_BIN_OP(v_add, v_float64x4, __lasx_xvfadd_d)
+OPENCV_HAL_IMPL_LASX_BIN_OP(v_sub, v_float64x4, __lasx_xvfsub_d)
+OPENCV_HAL_IMPL_LASX_BIN_OP(v_mul, v_float64x4, __lasx_xvfmul_d)
+OPENCV_HAL_IMPL_LASX_BIN_OP(v_div, v_float64x4, __lasx_xvfdiv_d)
+
+// saturating multiply 8-bit, 16-bit
+inline v_uint8x32 v_mul(const v_uint8x32& a, const v_uint8x32& b)
+{
+    v_uint16x16 c, d;
+    v_mul_expand(a, b, c, d);
+    return v_pack(c, d);
+}
+inline v_int8x32 v_mul(const v_int8x32& a, const v_int8x32& b)
+{
+    v_int16x16 c, d;
+    v_mul_expand(a, b, c, d);
+    return v_pack(c, d);
+}
+inline v_uint16x16 v_mul(const v_uint16x16& a, const v_uint16x16& b)
+{
+    __m256i pl = __lasx_xvmul_h(a.val, b.val);
+    __m256i ph = __lasx_xvmuh_hu(a.val, b.val);
+    __m256i p0 = __lasx_xvilvl_h(ph, pl);
+    __m256i p1 = __lasx_xvilvh_h(ph, pl);
+    return v_uint16x16(_v256_packs_epu32(p0, p1));
+}
+inline v_int16x16 v_mul(const v_int16x16& a, const v_int16x16& b)
+{
+    __m256i pl = __lasx_xvmul_h(a.val, b.val);
+    __m256i ph = __lasx_xvmuh_h(a.val, b.val);
+    __m256i p0 = __lasx_xvilvl_h(ph, pl);
+    __m256i p1 = __lasx_xvilvh_h(ph, pl);
+    return v_int16x16(_lasx_packs_w(p0, p1));
+}
+
+/** Non-saturating arithmetics **/
+
+#define OPENCV_HAL_IMPL_LASX_BIN_FUNC(func, _Tpvec, intrin) \
+    inline _Tpvec func(const _Tpvec& a, const _Tpvec& b)    \
+    { return _Tpvec(intrin(a.val, b.val)); }
+
+OPENCV_HAL_IMPL_LASX_BIN_FUNC(v_add_wrap, v_uint8x32,  __lasx_xvadd_b)
+OPENCV_HAL_IMPL_LASX_BIN_FUNC(v_add_wrap, v_int8x32,   __lasx_xvadd_b)
+OPENCV_HAL_IMPL_LASX_BIN_FUNC(v_add_wrap, v_uint16x16, __lasx_xvadd_h)
+OPENCV_HAL_IMPL_LASX_BIN_FUNC(v_add_wrap, v_int16x16,  __lasx_xvadd_h)
+OPENCV_HAL_IMPL_LASX_BIN_FUNC(v_sub_wrap, v_uint8x32,  __lasx_xvsub_b)
+OPENCV_HAL_IMPL_LASX_BIN_FUNC(v_sub_wrap, v_int8x32,   __lasx_xvsub_b)
+OPENCV_HAL_IMPL_LASX_BIN_FUNC(v_sub_wrap, v_uint16x16, __lasx_xvsub_h)
+OPENCV_HAL_IMPL_LASX_BIN_FUNC(v_sub_wrap, v_int16x16,  __lasx_xvsub_h)
+OPENCV_HAL_IMPL_LASX_BIN_FUNC(v_mul_wrap, v_uint16x16, __lasx_xvmul_h)
+OPENCV_HAL_IMPL_LASX_BIN_FUNC(v_mul_wrap, v_int16x16,  __lasx_xvmul_h)
+
+inline v_uint8x32 v_mul_wrap(const v_uint8x32& a, const v_uint8x32& b)
+{
+    __m256i p0 = __lasx_xvmulwev_h_bu(a.val, b.val);
+    __m256i p1 = __lasx_xvmulwod_h_bu(a.val, b.val);
+    return v_uint8x32(__lasx_xvpackev_b(p1, p0));
+}
+
+inline v_int8x32 v_mul_wrap(const v_int8x32& a, const v_int8x32& b)
+{
+    return v_reinterpret_as_s8(v_mul_wrap(v_reinterpret_as_u8(a), v_reinterpret_as_u8(b)));
+}
+
+//  Multiply and expand
+inline void v_mul_expand(const v_uint8x32& a, const v_uint8x32& b,
+                         v_uint16x16& c, v_uint16x16& d)
+{
+    v_uint16x16 a0, a1, b0, b1;
+    v_expand(a, a0, a1);
+    v_expand(b, b0, b1);
+    c = v_mul_wrap(a0, b0);
+    d = v_mul_wrap(a1, b1);
+}
+
+inline void v_mul_expand(const v_int8x32& a, const v_int8x32& b,
+                         v_int16x16& c, v_int16x16& d)
+{
+    v_int16x16 a0, a1, b0, b1;
+    v_expand(a, a0, a1);
+    v_expand(b, b0, b1);
+    c = v_mul_wrap(a0, b0);
+    d = v_mul_wrap(a1, b1);
+}
+
+inline void v_mul_expand(const v_int16x16& a, const v_int16x16& b,
+                         v_int32x8& c, v_int32x8& d)
+{
+    v_int16x16 vhi = v_int16x16(__lasx_xvmuh_h(a.val, b.val));
+
+    v_int16x16 v0, v1;
+    v_zip(v_mul_wrap(a, b), vhi, v0, v1);
+
+    c = v_reinterpret_as_s32(v0);
+    d = v_reinterpret_as_s32(v1);
+}
+
+inline void v_mul_expand(const v_uint16x16& a, const v_uint16x16& b,
+                         v_uint32x8& c, v_uint32x8& d)
+{
+    v_uint16x16 vhi = v_uint16x16(__lasx_xvmuh_hu(a.val, b.val));
+
+    v_uint16x16 v0, v1;
+    v_zip(v_mul_wrap(a, b), vhi, v0, v1);
+
+    c = v_reinterpret_as_u32(v0);
+    d = v_reinterpret_as_u32(v1);
+}
+
+inline void v_mul_expand(const v_uint32x8& a, const v_uint32x8& b,
+                         v_uint64x4& c, v_uint64x4& d)
+{
+    __m256i v0 = __lasx_xvmulwev_d_wu(a.val, b.val);
+    __m256i v1 = __lasx_xvmulwod_d_wu(a.val, b.val);
+    v_zip(v_uint64x4(v0), v_uint64x4(v1), c, d);
+}
+
+inline v_int16x16 v_mul_hi(const v_int16x16& a, const v_int16x16& b) { return v_int16x16(__lasx_xvmuh_h(a.val, b.val)); }
+inline v_uint16x16 v_mul_hi(const v_uint16x16& a, const v_uint16x16& b) { return v_uint16x16(__lasx_xvmuh_hu(a.val, b.val)); }
+
+/** Bitwise shifts **/
+#define OPENCV_HAL_IMPL_LASX_SHIFT_OP(_Tpuvec, _Tpsvec, suffix, srai)                             \
+    inline _Tpuvec v_shl(const _Tpuvec& a, int imm)                                               \
+    { return _Tpuvec(__lasx_xvsll_##suffix(a.val, __lasx_xvreplgr2vr_##suffix(imm))); }           \
+    inline _Tpsvec v_shl(const _Tpsvec& a, int imm)                                               \
+    { return _Tpsvec(__lasx_xvsll_##suffix(a.val, __lasx_xvreplgr2vr_##suffix(imm))); }           \
+    inline _Tpuvec v_shr(const _Tpuvec& a, int imm)                                               \
+    { return _Tpuvec(__lasx_xvsrl_##suffix(a.val, __lasx_xvreplgr2vr_##suffix(imm))); }           \
+    inline _Tpsvec v_shr(const _Tpsvec& a, int imm)                                               \
+    { return _Tpsvec(srai(a.val, __lasx_xvreplgr2vr_##suffix(imm))); }                            \
+    template<int imm>                                                                             \
+    inline _Tpuvec v_shl(const _Tpuvec& a)                                                        \
+    { return _Tpuvec(__lasx_xvsll_##suffix(a.val, __lasx_xvreplgr2vr_##suffix(imm))); }           \
+    template<int imm>                                                                             \
+    inline _Tpsvec v_shl(const _Tpsvec& a)                                                        \
+    { return _Tpsvec(__lasx_xvsll_##suffix(a.val, __lasx_xvreplgr2vr_##suffix(imm))); }           \
+    template<int imm>                                                                             \
+    inline _Tpuvec v_shr(const _Tpuvec& a)                                                        \
+    { return _Tpuvec(__lasx_xvsrl_##suffix(a.val, __lasx_xvreplgr2vr_##suffix(imm))); }           \
+    template<int imm>                                                                             \
+    inline _Tpsvec v_shr(const _Tpsvec& a)                                                        \
+    { return _Tpsvec(srai(a.val, __lasx_xvreplgr2vr_##suffix(imm))); }
+
+OPENCV_HAL_IMPL_LASX_SHIFT_OP(v_uint16x16, v_int16x16, h, __lasx_xvsra_h)
+OPENCV_HAL_IMPL_LASX_SHIFT_OP(v_uint32x8,  v_int32x8,  w, __lasx_xvsra_w)
+OPENCV_HAL_IMPL_LASX_SHIFT_OP(v_uint64x4,  v_int64x4,  d, __lasx_xvsra_d)
+
+
+/** Bitwise logic **/
+#define OPENCV_HAL_IMPL_LASX_LOGIC_OP(_Tpvec, suffix, not_const)    \
+    OPENCV_HAL_IMPL_LASX_BIN_OP(v_and, _Tpvec, __lasx_xvand_##suffix)  \
+    OPENCV_HAL_IMPL_LASX_BIN_OP(v_or, _Tpvec, __lasx_xvor_##suffix)    \
+    OPENCV_HAL_IMPL_LASX_BIN_OP(v_xor, _Tpvec, __lasx_xvxor_##suffix)  \
+    inline _Tpvec v_not(const _Tpvec& a)                               \
+    { return _Tpvec(__lasx_xvnori_b(a.val, 0)); }
+
+OPENCV_HAL_IMPL_LASX_LOGIC_OP(v_uint8x32,   v, __lasx_xvreplgr2vr_w(-1))
+OPENCV_HAL_IMPL_LASX_LOGIC_OP(v_int8x32,    v, __lasx_xvreplgr2vr_w(-1))
+OPENCV_HAL_IMPL_LASX_LOGIC_OP(v_uint16x16,  v, __lasx_xvreplgr2vr_w(-1))
+OPENCV_HAL_IMPL_LASX_LOGIC_OP(v_int16x16,   v, __lasx_xvreplgr2vr_w(-1))
+OPENCV_HAL_IMPL_LASX_LOGIC_OP(v_uint32x8,   v, __lasx_xvreplgr2vr_w(-1))
+OPENCV_HAL_IMPL_LASX_LOGIC_OP(v_int32x8,    v, __lasx_xvreplgr2vr_w(-1))
+OPENCV_HAL_IMPL_LASX_LOGIC_OP(v_uint64x4,   v, __lasx_xvreplgr2vr_d(-1))
+OPENCV_HAL_IMPL_LASX_LOGIC_OP(v_int64x4,    v, __lasx_xvreplgr2vr_d(-1))
+
+#define OPENCV_HAL_IMPL_LASX_FLOAT_BIN_OP(bin_op, _Tpvec, intrin, cast)                         \
+    inline _Tpvec bin_op(const _Tpvec& a, const _Tpvec& b)                                      \
+    { return _Tpvec(intrin(*((__m256i*)(&a.val)), *((__m256i*)(&b.val)))); }
+
+#define OPENCV_HAL_IMPL_LASX_FLOAT_LOGIC_OP(_Tpvec, suffix, not_const, cast)       \
+    OPENCV_HAL_IMPL_LASX_FLOAT_BIN_OP(v_and, _Tpvec, __lasx_xvand_##suffix, cast)  \
+    OPENCV_HAL_IMPL_LASX_FLOAT_BIN_OP(v_or, _Tpvec, __lasx_xvor_##suffix, cast)    \
+    OPENCV_HAL_IMPL_LASX_FLOAT_BIN_OP(v_xor, _Tpvec, __lasx_xvxor_##suffix, cast)  \
+    inline _Tpvec v_not(const _Tpvec& a)                                           \
+    { return _Tpvec(__lasx_xvxor_##suffix(*((__m256i*)(&a.val)), not_const)); }
+
+OPENCV_HAL_IMPL_LASX_FLOAT_LOGIC_OP(v_float32x8,  v, __lasx_xvreplgr2vr_w(-1), _lasx_256_castsi256_ps)
+OPENCV_HAL_IMPL_LASX_FLOAT_LOGIC_OP(v_float64x4,  v, __lasx_xvreplgr2vr_d(-1), _lasx_256_castsi256_pd)
+
+/** Select **/
+#define OPENCV_HAL_IMPL_LASX_SELECT(_Tpvec)                                      \
+    inline _Tpvec v_select(const _Tpvec& mask, const _Tpvec& a, const _Tpvec& b) \
+    { return _Tpvec(__lasx_xvbitsel_v(b.val, a.val, mask.val)); }
+
+OPENCV_HAL_IMPL_LASX_SELECT(v_uint8x32)
+OPENCV_HAL_IMPL_LASX_SELECT(v_int8x32)
+OPENCV_HAL_IMPL_LASX_SELECT(v_uint16x16)
+OPENCV_HAL_IMPL_LASX_SELECT(v_int16x16)
+OPENCV_HAL_IMPL_LASX_SELECT(v_uint32x8)
+OPENCV_HAL_IMPL_LASX_SELECT(v_int32x8)
+
+inline v_float32x8 v_select(const v_float32x8 &mask, const v_float32x8 &a, const v_float32x8 &b)
+{ return v_float32x8(__lasx_xvbitsel_v(*((__m256i*)&b.val), *((__m256i*)&a.val), *((__m256i*)&mask.val))); }
+
+inline v_float64x4 v_select(const v_float64x4 &mask, const v_float64x4 &a, const v_float64x4 &b)
+{ return v_float64x4(__lasx_xvbitsel_v(*((__m256i*)&b.val), *((__m256i*)&a.val), *((__m256i*)&mask.val))); }
+
+/** Comparison **/
+#define OPENCV_HAL_IMPL_LASX_CMP_OP_OV(_Tpvec)                     \
+    inline _Tpvec v_ne(const _Tpvec& a, const _Tpvec& b)           \
+    { return v_not(v_eq(a, b)); }                                  \
+    inline _Tpvec v_lt(const _Tpvec& a, const _Tpvec& b)           \
+    { return v_gt(b, a); }                                         \
+    inline _Tpvec v_ge(const _Tpvec& a, const _Tpvec& b)           \
+    { return v_not(v_lt(a, b)); }                                  \
+    inline _Tpvec v_le(const _Tpvec& a, const _Tpvec& b)           \
+    { return v_ge(b, a); }
+
+#define OPENCV_HAL_IMPL_LASX_CMP_OP_INT(_Tpuvec, _Tpsvec, suffix, usuffix)   \
+    inline _Tpuvec v_eq(const _Tpuvec& a, const _Tpuvec& b)                  \
+    { return _Tpuvec(__lasx_xvseq_##suffix(a.val, b.val)); }                 \
+    inline _Tpuvec v_gt(const _Tpuvec& a, const _Tpuvec& b)                  \
+    {                                                                        \
+        return _Tpuvec(__lasx_xvslt_##usuffix(b.val, a.val));                \
+    }                                                                        \
+    inline _Tpsvec v_eq(const _Tpsvec& a, const _Tpsvec& b)                  \
+    { return _Tpsvec(__lasx_xvseq_##suffix(a.val, b.val)); }                 \
+    inline _Tpsvec v_gt(const _Tpsvec& a, const _Tpsvec& b)                  \
+    { return _Tpsvec(__lasx_xvslt_##suffix(b.val, a.val)); }                 \
+    OPENCV_HAL_IMPL_LASX_CMP_OP_OV(_Tpuvec)                                  \
+    OPENCV_HAL_IMPL_LASX_CMP_OP_OV(_Tpsvec)
+
+OPENCV_HAL_IMPL_LASX_CMP_OP_INT(v_uint8x32,  v_int8x32,  b, bu)
+OPENCV_HAL_IMPL_LASX_CMP_OP_INT(v_uint16x16, v_int16x16, h, hu)
+OPENCV_HAL_IMPL_LASX_CMP_OP_INT(v_uint32x8,  v_int32x8,  w, wu)
+
+#define OPENCV_HAL_IMPL_LASX_CMP_OP_64BIT(_Tpvec, suffix)         \
+    inline _Tpvec v_eq(const _Tpvec& a, const _Tpvec& b)          \
+    { return _Tpvec(__lasx_xvseq_##suffix(a.val, b.val)); }       \
+    inline _Tpvec v_ne(const _Tpvec& a, const _Tpvec& b)          \
+    { return v_not(v_eq(a, b)); }
+
+OPENCV_HAL_IMPL_LASX_CMP_OP_64BIT(v_uint64x4, d)
+OPENCV_HAL_IMPL_LASX_CMP_OP_64BIT(v_int64x4, d)
+
+#define OPENCV_HAL_IMPL_LASX_CMP_FLT(bin_op, suffix, _Tpvec, ssuffix)    \
+    inline _Tpvec bin_op(const _Tpvec& a, const _Tpvec& b)               \
+    { return _Tpvec(__lasx_##suffix##_##ssuffix(a.val, b.val)); }
+
+#define OPENCV_HAL_IMPL_LASX_CMP_OP_FLT(_Tpvec, ssuffix)              \
+    OPENCV_HAL_IMPL_LASX_CMP_FLT(v_eq, xvfcmp_ceq, _Tpvec, ssuffix)   \
+    OPENCV_HAL_IMPL_LASX_CMP_FLT(v_ne, xvfcmp_cne, _Tpvec, ssuffix)   \
+    OPENCV_HAL_IMPL_LASX_CMP_FLT(v_lt,  xvfcmp_clt, _Tpvec, ssuffix)  \
+    OPENCV_HAL_IMPL_LASX_CMP_FLT(v_le, xvfcmp_cle, _Tpvec, ssuffix)
+
+OPENCV_HAL_IMPL_LASX_CMP_OP_FLT(v_float32x8, s)
+OPENCV_HAL_IMPL_LASX_CMP_OP_FLT(v_float64x4, d)
+
+inline v_float32x8 v_gt(const v_float32x8 &a, const v_float32x8 &b)
+{ return v_float32x8(__lasx_xvfcmp_clt_s(b.val, a.val)); }
+
+inline v_float32x8 v_ge(const v_float32x8 &a, const v_float32x8 &b)
+{ return v_float32x8(__lasx_xvfcmp_cle_s(b.val, a.val)); }
+
+inline v_float64x4 v_gt(const v_float64x4 &a, const v_float64x4 &b)
+{ return v_float64x4(__lasx_xvfcmp_clt_d(b.val, a.val)); }
+
+inline v_float64x4 v_ge(const v_float64x4 &a, const v_float64x4 &b)
+{ return v_float64x4(__lasx_xvfcmp_cle_d(b.val, a.val)); }
+
+inline v_float32x8 v_not_nan(const v_float32x8& a)
+{ return v_float32x8(__lasx_xvfcmp_cor_s(a.val, a.val)); }
+inline v_float64x4 v_not_nan(const v_float64x4& a)
+{ return v_float64x4(__lasx_xvfcmp_cor_d(a.val, a.val)); }
+
+/** min/max **/
+OPENCV_HAL_IMPL_LASX_BIN_FUNC(v_min, v_uint8x32,  __lasx_xvmin_bu)
+OPENCV_HAL_IMPL_LASX_BIN_FUNC(v_max, v_uint8x32,  __lasx_xvmax_bu)
+OPENCV_HAL_IMPL_LASX_BIN_FUNC(v_min, v_int8x32,   __lasx_xvmin_b)
+OPENCV_HAL_IMPL_LASX_BIN_FUNC(v_max, v_int8x32,   __lasx_xvmax_b)
+OPENCV_HAL_IMPL_LASX_BIN_FUNC(v_min, v_uint16x16, __lasx_xvmin_hu)
+OPENCV_HAL_IMPL_LASX_BIN_FUNC(v_max, v_uint16x16, __lasx_xvmax_hu)
+OPENCV_HAL_IMPL_LASX_BIN_FUNC(v_min, v_int16x16,  __lasx_xvmin_h)
+OPENCV_HAL_IMPL_LASX_BIN_FUNC(v_max, v_int16x16,  __lasx_xvmax_h)
+OPENCV_HAL_IMPL_LASX_BIN_FUNC(v_min, v_uint32x8,  __lasx_xvmin_wu)
+OPENCV_HAL_IMPL_LASX_BIN_FUNC(v_max, v_uint32x8,  __lasx_xvmax_wu)
+OPENCV_HAL_IMPL_LASX_BIN_FUNC(v_min, v_int32x8,   __lasx_xvmin_w)
+OPENCV_HAL_IMPL_LASX_BIN_FUNC(v_max, v_int32x8,   __lasx_xvmax_w)
+OPENCV_HAL_IMPL_LASX_BIN_FUNC(v_min, v_float32x8, __lasx_xvfmin_s)
+OPENCV_HAL_IMPL_LASX_BIN_FUNC(v_max, v_float32x8, __lasx_xvfmax_s)
+OPENCV_HAL_IMPL_LASX_BIN_FUNC(v_min, v_float64x4, __lasx_xvfmin_d)
+OPENCV_HAL_IMPL_LASX_BIN_FUNC(v_max, v_float64x4, __lasx_xvfmax_d)
+
+/** Rotate **/
+template<int imm>
+inline v_uint8x32 v_rotate_left(const v_uint8x32& a, const v_uint8x32& b)
+{
+    enum {IMM_R = (16 - imm) & 0xFF};
+    enum {IMM_R2 = (32 - imm) & 0xFF};
+
+    if (imm == 0)  return a;
+    if (imm == 32) return b;
+    if (imm > 32)  return v_uint8x32();
+
+    __m256i swap = _v256_permute2x128<0x21>(a.val, b.val);
+    if (imm == 16) return v_uint8x32(swap);
+    if (imm < 16)  return v_uint8x32(_v256_alignr_b(a.val, swap, IMM_R));
+    return v_uint8x32(_v256_alignr_b(swap, b.val, IMM_R2)); // imm < 32
+}
+
+template<int imm>
+inline v_uint8x32 v_rotate_right(const v_uint8x32& a, const v_uint8x32& b)
+{
+    enum {IMM_L = (imm - 16) & 0xFF};
+
+    if (imm == 0)  return a;
+    if (imm == 32) return b;
+    if (imm > 32)  return v_uint8x32();
+
+    __m256i swap = _v256_permute2x128<0x03>(a.val, b.val);
+    if (imm == 16) return v_uint8x32(swap);
+    if (imm < 16)  return v_uint8x32(_v256_alignr_b(swap, a.val, imm));
+    return v_uint8x32(_v256_alignr_b(b.val, swap, IMM_L));
+}
+
+template<int imm>
+inline v_uint8x32 v_rotate_left(const v_uint8x32& a)
+{
+    enum {IMM_L = ((imm - 16) & 0xFF) > 31 ? 31 : ((imm - 16) & 0xFF)};
+    enum {IMM_R = (16 - imm) & 0xFF};
+
+    if (imm == 0) return a;
+    if (imm > 32) return v_uint8x32();
+
+    // ESAC control[3] ? [127:0] = 0
+    __m256i vzero = __lasx_xvreplgr2vr_w(0);
+    __m256i swapz = __lasx_xvpermi_q(a.val, vzero, 0x20);;
+    if (imm == 16) return v_uint8x32(swapz);
+    if (imm < 16)  return v_uint8x32(_v256_alignr_b(a.val, swapz, IMM_R));
+    return v_uint8x32(__lasx_xvbsll_v(swapz, IMM_L));
+}
+
+template<int imm>
+inline v_uint8x32 v_rotate_right(const v_uint8x32& a)
+{
+    enum {IMM_L = ((imm - 16) & 0xFF) > 31 ? 31 : ((imm - 16) & 0xFF)};
+
+    if (imm == 0) return a;
+    if (imm > 32) return v_uint8x32();
+
+    // ESAC control[3] ? [127:0] = 0
+    __m256i vzero = __lasx_xvreplgr2vr_w(0);
+    __m256i swapz = __lasx_xvpermi_q(vzero, a.val, 0x21);;
+    if (imm == 16) return v_uint8x32(swapz);
+    if (imm < 16)  return v_uint8x32(_v256_alignr_b(swapz, a.val, imm));
+    return v_uint8x32(__lasx_xvbsrl_v(swapz, IMM_L));
+}
+
+#define OPENCV_HAL_IMPL_LASX_ROTATE_CAST(intrin, _Tpvec, cast)    \
+    template<int imm>                                             \
+    inline _Tpvec intrin(const _Tpvec& a, const _Tpvec& b)        \
+    {                                                             \
+        enum {IMMxW = imm * sizeof(typename _Tpvec::lane_type)};  \
+        v_uint8x32 ret = intrin<IMMxW>(v_reinterpret_as_u8(a),    \
+                                       v_reinterpret_as_u8(b));   \
+        return _Tpvec(cast(ret.val));                             \
+    }                                                             \
+    template<int imm>                                             \
+    inline _Tpvec intrin(const _Tpvec& a)                         \
+    {                                                             \
+        enum {IMMxW = imm * sizeof(typename _Tpvec::lane_type)};  \
+        v_uint8x32 ret = intrin<IMMxW>(v_reinterpret_as_u8(a));   \
+        return _Tpvec(cast(ret.val));                             \
+    }
+
+#define OPENCV_HAL_IMPL_LASX_ROTATE(_Tpvec)                                  \
+    OPENCV_HAL_IMPL_LASX_ROTATE_CAST(v_rotate_left,  _Tpvec, OPENCV_HAL_NOP) \
+    OPENCV_HAL_IMPL_LASX_ROTATE_CAST(v_rotate_right, _Tpvec, OPENCV_HAL_NOP)
+
+OPENCV_HAL_IMPL_LASX_ROTATE(v_int8x32)
+OPENCV_HAL_IMPL_LASX_ROTATE(v_uint16x16)
+OPENCV_HAL_IMPL_LASX_ROTATE(v_int16x16)
+OPENCV_HAL_IMPL_LASX_ROTATE(v_uint32x8)
+OPENCV_HAL_IMPL_LASX_ROTATE(v_int32x8)
+OPENCV_HAL_IMPL_LASX_ROTATE(v_uint64x4)
+OPENCV_HAL_IMPL_LASX_ROTATE(v_int64x4)
+
+OPENCV_HAL_IMPL_LASX_ROTATE_CAST(v_rotate_left,  v_float32x8, _lasx_256_castsi256_ps)
+OPENCV_HAL_IMPL_LASX_ROTATE_CAST(v_rotate_right, v_float32x8, _lasx_256_castsi256_ps)
+OPENCV_HAL_IMPL_LASX_ROTATE_CAST(v_rotate_left,  v_float64x4, _lasx_256_castsi256_pd)
+OPENCV_HAL_IMPL_LASX_ROTATE_CAST(v_rotate_right, v_float64x4, _lasx_256_castsi256_pd)
+
+/** Reverse **/
+inline v_uint8x32 v_reverse(const v_uint8x32 &a)
+{
+    static const __m256i perm = _v256_setr_b(
+            15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0,
+            15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0);
+    __m256i vec = __lasx_xvshuf_b(a.val, a.val, perm);
+    return v_uint8x32(__lasx_xvpermi_q(vec, vec, 1));
+}
+
+inline v_int8x32 v_reverse(const v_int8x32 &a)
+{ return v_reinterpret_as_s8(v_reverse(v_reinterpret_as_u8(a))); }
+
+inline v_uint16x16 v_reverse(const v_uint16x16 &a)
+{
+    __m256i vec = __lasx_xvshuf4i_h(a.val, 0x1B);
+    vec = __lasx_xvshuf4i_w(vec, 0x4E);
+    return v_uint16x16(__lasx_xvpermi_d(vec, 0x4E));
+}
+
+inline v_int16x16 v_reverse(const v_int16x16 &a)
+{ return v_reinterpret_as_s16(v_reverse(v_reinterpret_as_u16(a))); }
+
+inline v_uint32x8 v_reverse(const v_uint32x8 &a)
+{
+    __m256i vec = __lasx_xvshuf4i_w(a.val, 0x1B);
+    return v_uint32x8(__lasx_xvpermi_d(vec, 0x4E));
+}
+
+inline v_int32x8 v_reverse(const v_int32x8 &a)
+{ return v_reinterpret_as_s32(v_reverse(v_reinterpret_as_u32(a))); }
+
+inline v_float32x8 v_reverse(const v_float32x8 &a)
+{ return v_reinterpret_as_f32(v_reverse(v_reinterpret_as_u32(a))); }
+
+inline v_uint64x4 v_reverse(const v_uint64x4 &a)
+{
+    return v_uint64x4(__lasx_xvpermi_d(a.val, 0x1b));
+}
+
+inline v_int64x4 v_reverse(const v_int64x4 &a)
+{ return v_reinterpret_as_s64(v_reverse(v_reinterpret_as_u64(a))); }
+
+inline v_float64x4 v_reverse(const v_float64x4 &a)
+{ return v_reinterpret_as_f64(v_reverse(v_reinterpret_as_u64(a))); }
+
+////////// Reduce and mask /////////
+
+/** Reduce **/
+// this function is return a[0]+a[1]+...+a[31]
+inline unsigned v_reduce_sum(const v_uint8x32& a)
+{
+    __m256i t1 = __lasx_xvhaddw_hu_bu(a.val, a.val);
+    __m256i t2 = __lasx_xvhaddw_wu_hu(t1, t1);
+    __m256i t3 = __lasx_xvhaddw_du_wu(t2, t2);
+    __m256i t4 = __lasx_xvhaddw_qu_du(t3, t3);
+    return (unsigned)(((v8u32)t4)[0]+((v8u32)t4)[4]);
+}
+
+inline int v_reduce_sum(const v_int8x32& a)
+{
+    __m256i t1 = __lasx_xvhaddw_h_b(a.val, a.val);
+    __m256i t2 = __lasx_xvhaddw_w_h(t1, t1);
+    __m256i t3 = __lasx_xvhaddw_d_w(t2, t2);
+    __m256i t4 = __lasx_xvhaddw_q_d(t3, t3);
+    return (int)(((v8i32)t4)[0]+((v8i32)t4)[4]);
+}
+
+#define OPENCV_HAL_IMPL_LASX_REDUCE_32(_Tpvec, sctype, func, intrin) \
+    inline sctype v_reduce_##func(const _Tpvec& a) \
+    { \
+        __m128i val = intrin(_v256_extract_low(a.val), _v256_extract_high(a.val)); \
+        val = intrin(val, __lsx_vbsrl_v(val,8));    \
+        val = intrin(val, __lsx_vbsrl_v(val,4));    \
+        val = intrin(val, __lsx_vbsrl_v(val,2));    \
+        val = intrin(val, __lsx_vbsrl_v(val,1));    \
+        return (sctype)__lsx_vpickve2gr_w(val, 0);  \
+    }
+
+OPENCV_HAL_IMPL_LASX_REDUCE_32(v_uint8x32, uchar, min, __lsx_vmin_bu)
+OPENCV_HAL_IMPL_LASX_REDUCE_32(v_int8x32,  schar, min, __lsx_vmin_b)
+OPENCV_HAL_IMPL_LASX_REDUCE_32(v_uint8x32, uchar, max, __lsx_vmax_bu)
+OPENCV_HAL_IMPL_LASX_REDUCE_32(v_int8x32,  schar, max, __lsx_vmax_b)
+
+#define OPENCV_HAL_IMPL_LASX_REDUCE_16(_Tpvec, sctype, func, intrin) \
+    inline sctype v_reduce_##func(const _Tpvec& a)                   \
+    {                                                                \
+        __m128i v0 = _v256_extract_low(a.val);                       \
+        __m128i v1 = _v256_extract_high(a.val);                      \
+        v0 = intrin(v0, v1);                                         \
+        v0 = intrin(v0, __lsx_vbsrl_v(v0, 8));                       \
+        v0 = intrin(v0, __lsx_vbsrl_v(v0, 4));                       \
+        v0 = intrin(v0, __lsx_vbsrl_v(v0, 2));                       \
+        return (sctype) __lsx_vpickve2gr_w(v0, 0);                   \
+    }
+
+OPENCV_HAL_IMPL_LASX_REDUCE_16(v_uint16x16, ushort, min, __lsx_vmin_hu)
+OPENCV_HAL_IMPL_LASX_REDUCE_16(v_int16x16,  short,  min, __lsx_vmin_h)
+OPENCV_HAL_IMPL_LASX_REDUCE_16(v_uint16x16, ushort, max, __lsx_vmax_hu)
+OPENCV_HAL_IMPL_LASX_REDUCE_16(v_int16x16,  short,  max, __lsx_vmax_h)
+
+#define OPENCV_HAL_IMPL_LASX_REDUCE_8(_Tpvec, sctype, func, intrin) \
+    inline sctype v_reduce_##func(const _Tpvec& a)                  \
+    {                                                               \
+        __m128i v0 = _v256_extract_low(a.val);                      \
+        __m128i v1 = _v256_extract_high(a.val);                     \
+        v0 = intrin(v0, v1);                                        \
+        v0 = intrin(v0, __lsx_vbsrl_v(v0, 8));                      \
+        v0 = intrin(v0, __lsx_vbsrl_v(v0, 4));                      \
+        return (sctype) __lsx_vpickve2gr_w(v0, 0);                  \
+    }
+
+OPENCV_HAL_IMPL_LASX_REDUCE_8(v_uint32x8, unsigned, min, __lsx_vmin_wu)
+OPENCV_HAL_IMPL_LASX_REDUCE_8(v_int32x8,  int,      min, __lsx_vmin_w)
+OPENCV_HAL_IMPL_LASX_REDUCE_8(v_uint32x8, unsigned, max, __lsx_vmax_wu)
+OPENCV_HAL_IMPL_LASX_REDUCE_8(v_int32x8,  int,      max, __lsx_vmax_w)
+
+#define OPENCV_HAL_IMPL_LASX_REDUCE_FLT(func, intrin)                 \
+    inline float v_reduce_##func(const v_float32x8& a)                \
+    {                                                                 \
+        __m128 v0 = _v256_extract_low(a.val);                         \
+        __m128 v1 = _v256_extract_high(a.val);                        \
+        v0 = intrin(v0, v1);                                          \
+        v0 = intrin(v0, __m128(__lsx_vpermi_w(*((__m128i*)&v0), *((__m128i*)&v0), 0x0e))); \
+        v0 = intrin(v0, __m128(__lsx_vpermi_w(*((__m128i*)&v0), *((__m128i*)&v0), 0x01))); \
+        float *fvalue = (float*)&v0;                                  \
+        return fvalue[0];                                             \
+    }
+
+OPENCV_HAL_IMPL_LASX_REDUCE_FLT(min, __lsx_vfmin_s)
+OPENCV_HAL_IMPL_LASX_REDUCE_FLT(max, __lsx_vfmax_s)
+
+inline int v_reduce_sum(const v_int32x8& a)
+{
+    __m256i t1 = __lasx_xvhaddw_d_w(a.val, a.val);
+    __m256i t2 = __lasx_xvhaddw_q_d(t1, t1);
+    return (int)(((v8i32)t2)[0]+((v8i32)t2)[4]);
+}
+
+inline unsigned v_reduce_sum(const v_uint32x8& a)
+{ return v_reduce_sum(v_reinterpret_as_s32(a)); }
+
+inline int v_reduce_sum(const v_int16x16& a)
+{ return v_reduce_sum(v_add(v_expand_low(a), v_expand_high(a))); }
+inline unsigned v_reduce_sum(const v_uint16x16& a)
+{ return v_reduce_sum(v_add(v_expand_low(a), v_expand_high(a))); }
+
+inline float v_reduce_sum(const v_float32x8& a)
+{
+    float result = 0;
+    float *pa = (float*)&a;
+    for (int i = 0; i < 2; ++i) {
+        result += pa[i*4] + pa[i*4+1] + pa[i*4+2] + pa[i*4+3];
+    }
+    return result;
+}
+
+inline uint64 v_reduce_sum(const v_uint64x4& a)
+{
+    __m256i t0 = __lasx_xvhaddw_qu_du(a.val, a.val);
+    return (uint64)(((v4u64)t0)[0] + ((v4u64)t0)[2]);
+}
+inline int64 v_reduce_sum(const v_int64x4& a)
+{
+    __m256i t0 = __lasx_xvhaddw_q_d(a.val, a.val);
+    return (int64)(((v4i64)t0)[0] + ((v4i64)t0)[2]);
+}
+inline double v_reduce_sum(const v_float64x4& a)
+{
+    double *pa = (double*)&a;
+    return pa[0] + pa[1] + pa[2] + pa[3];
+}
+
+inline v_float32x8 v_reduce_sum4(const v_float32x8& a, const v_float32x8& b,
+                                 const v_float32x8& c, const v_float32x8& d)
+{
+    float *pa = (float*)&a;
+    float *pb = (float*)&b;
+    float *pc = (float*)&c;
+    float *pd = (float*)&d;
+
+    float v0 = pa[0] + pa[1] + pa[2] + pa[3];
+    float v1 = pb[0] + pb[1] + pb[2] + pb[3];
+    float v2 = pc[0] + pc[1] + pc[2] + pc[3];
+    float v3 = pd[0] + pd[1] + pd[2] + pd[3];
+    float v4 = pa[4] + pa[5] + pa[6] + pa[7];
+    float v5 = pb[4] + pb[5] + pb[6] + pb[7];
+    float v6 = pc[4] + pc[5] + pc[6] + pc[7];
+    float v7 = pd[4] + pd[5] + pd[6] + pd[7];
+    return v_float32x8(v0, v1, v2, v3, v4, v5, v6, v7);
+}
+
+inline unsigned v_reduce_sad(const v_uint8x32& a, const v_uint8x32& b)
+{
+    __m256i t0 = __lasx_xvabsd_bu(a.val, b.val);
+    __m256i t1 = __lasx_xvhaddw_hu_bu(t0, t0);
+    __m256i t2 = __lasx_xvhaddw_wu_hu(t1, t1);
+    __m256i t3 = __lasx_xvhaddw_du_wu(t2, t2);
+    __m256i t4 = __lasx_xvhaddw_qu_du(t3, t3);
+    return (unsigned)(((v8u32)t4)[0]+((v8u32)t4)[4]);
+}
+inline unsigned v_reduce_sad(const v_int8x32& a, const v_int8x32& b)
+{
+    __m256i t0 = __lasx_xvabsd_b(a.val, b.val);
+    __m256i t1 = __lasx_xvhaddw_hu_bu(t0, t0);
+    __m256i t2 = __lasx_xvhaddw_wu_hu(t1, t1);
+    __m256i t3 = __lasx_xvhaddw_du_wu(t2, t2);
+    __m256i t4 = __lasx_xvhaddw_qu_du(t3, t3);
+    return (unsigned)(((v8u32)t4)[0]+((v8u32)t4)[4]);
+}
+inline unsigned v_reduce_sad(const v_uint16x16& a, const v_uint16x16& b)
+{
+    v_uint32x8 l, h;
+    v_expand(v_add_wrap(v_sub(a, b), v_sub(b, a)), l, h);
+    return v_reduce_sum(v_add(l, h));
+}
+inline unsigned v_reduce_sad(const v_int16x16& a, const v_int16x16& b)
+{
+    v_uint32x8 l, h;
+    v_expand(v_reinterpret_as_u16(v_sub_wrap(v_max(a, b), v_min(a, b))), l, h);
+    return v_reduce_sum(v_add(l, h));
+}
+inline unsigned v_reduce_sad(const v_uint32x8& a, const v_uint32x8& b)
+{
+    return v_reduce_sum(v_sub(v_max(a, b), v_min(a, b)));
+}
+inline unsigned v_reduce_sad(const v_int32x8& a, const v_int32x8& b)
+{
+    v_int32x8 m = v_lt(a, b);
+    return v_reduce_sum(v_reinterpret_as_u32(v_sub(v_xor(v_sub(a, b), m), m)));
+}
+inline float v_reduce_sad(const v_float32x8& a, const v_float32x8& b)
+{
+    v_float32x8 a_b = v_sub(a, b);
+    return v_reduce_sum(v_float32x8(*((__m256i*)&a_b.val) & __lasx_xvreplgr2vr_w(0x7fffffff)));
+}
+
+/** Popcount **/
+inline v_uint8x32 v_popcount(const v_uint8x32& a)
+{ return v_uint8x32(__lasx_xvpcnt_b(a.val)); }
+inline v_uint16x16 v_popcount(const v_uint16x16& a)
+{ return v_uint16x16(__lasx_xvpcnt_h(a.val)); }
+inline v_uint32x8 v_popcount(const v_uint32x8& a)
+{ return v_uint32x8(__lasx_xvpcnt_w(a.val)); }
+inline v_uint64x4 v_popcount(const v_uint64x4& a)
+{ return v_uint64x4(__lasx_xvpcnt_d(a.val)); }
+inline v_uint8x32 v_popcount(const v_int8x32& a)
+{ return v_popcount(v_reinterpret_as_u8(a)); }
+inline v_uint16x16 v_popcount(const v_int16x16& a)
+{ return v_popcount(v_reinterpret_as_u16(a)); }
+inline v_uint32x8 v_popcount(const v_int32x8& a)
+{ return v_popcount(v_reinterpret_as_u32(a)); }
+inline v_uint64x4 v_popcount(const v_int64x4& a)
+{ return v_popcount(v_reinterpret_as_u64(a)); }
+
+inline int v_signmask(const v_int8x32& a)
+{
+    __m256i result = __lasx_xvmskltz_b(a.val);
+    int mask = __lasx_xvpickve2gr_w(result, 0);
+    mask |= (__lasx_xvpickve2gr_w(result, 4) << 16);
+    return mask;
+}
+inline int v_signmask(const v_uint8x32& a)
+{ return v_signmask(v_reinterpret_as_s8(a)); }
+
+inline int v_signmask(const v_int16x16& a)
+{ return v_signmask(v_pack(a, a)) & 0xFFFF; }
+inline int v_signmask(const v_uint16x16& a)
+{ return v_signmask(v_reinterpret_as_s16(a)); }
+
+inline int v_signmask(const v_int32x8& a)
+{
+    __m256i result = __lasx_xvmskltz_w(a.val);
+    int mask = __lasx_xvpickve2gr_w(result, 0);
+    mask |= (__lasx_xvpickve2gr_w(result, 4) << 4);
+    return mask;
+}
+inline int v_signmask(const v_uint32x8& a)
+{ return v_signmask(*(v_int32x8*)(&a)); }
+
+inline int v_signmask(const v_int64x4& a)
+{
+    __m256i result = __lasx_xvmskltz_d(a.val);
+    int mask = __lasx_xvpickve2gr_d(result, 0);
+    mask |= (__lasx_xvpickve2gr_w(result, 4) << 2);
+    return mask;
+}
+inline int v_signmask(const v_uint64x4& a)
+{ return v_signmask(v_reinterpret_as_s64(a)); }
+
+inline int v_signmask(const v_float32x8& a)
+{ return v_signmask(*(v_int32x8*)(&a)); }
+
+inline int v_signmask(const v_float64x4& a)
+{ return v_signmask(*(v_int64x4*)(&a)); }
+
+inline int v_scan_forward(const v_int8x32& a) { return trailingZeros32(v_signmask(v_reinterpret_as_s8(a))); }
+inline int v_scan_forward(const v_uint8x32& a) { return trailingZeros32(v_signmask(v_reinterpret_as_s8(a))); }
+inline int v_scan_forward(const v_int16x16& a) { return trailingZeros32(v_signmask(v_reinterpret_as_s8(a))) / 2; }
+inline int v_scan_forward(const v_uint16x16& a) { return trailingZeros32(v_signmask(v_reinterpret_as_s8(a))) / 2; }
+inline int v_scan_forward(const v_int32x8& a) { return trailingZeros32(v_signmask(v_reinterpret_as_s8(a))) / 4; }
+inline int v_scan_forward(const v_uint32x8& a) { return trailingZeros32(v_signmask(v_reinterpret_as_s8(a))) / 4; }
+inline int v_scan_forward(const v_float32x8& a) { return trailingZeros32(v_signmask(v_reinterpret_as_s8(a))) / 4; }
+inline int v_scan_forward(const v_int64x4& a) { return trailingZeros32(v_signmask(v_reinterpret_as_s8(a))) / 8; }
+inline int v_scan_forward(const v_uint64x4& a) { return trailingZeros32(v_signmask(v_reinterpret_as_s8(a))) / 8; }
+inline int v_scan_forward(const v_float64x4& a) { return trailingZeros32(v_signmask(v_reinterpret_as_s8(a))) / 8; }
+
+/** Checks **/
+#define OPENCV_HAL_IMPL_LASX_CHECK(_Tpvec, allmask) \
+    inline bool v_check_all(const _Tpvec& a) { return v_signmask(a) == allmask; } \
+    inline bool v_check_any(const _Tpvec& a) { return v_signmask(a) != 0; }
+OPENCV_HAL_IMPL_LASX_CHECK(v_uint8x32, -1)
+OPENCV_HAL_IMPL_LASX_CHECK(v_int8x32, -1)
+OPENCV_HAL_IMPL_LASX_CHECK(v_uint32x8, 255)
+OPENCV_HAL_IMPL_LASX_CHECK(v_int32x8, 255)
+OPENCV_HAL_IMPL_LASX_CHECK(v_uint64x4, 15)
+OPENCV_HAL_IMPL_LASX_CHECK(v_int64x4, 15)
+OPENCV_HAL_IMPL_LASX_CHECK(v_float32x8, 255)
+OPENCV_HAL_IMPL_LASX_CHECK(v_float64x4, 15)
+
+#define OPENCV_HAL_IMPL_LASX_CHECK_SHORT(_Tpvec)  \
+    inline bool v_check_all(const _Tpvec& a) { return (v_signmask(v_reinterpret_as_s8(a)) & 0xaaaaaaaa) == 0xaaaaaaaa; } \
+    inline bool v_check_any(const _Tpvec& a) { return (v_signmask(v_reinterpret_as_s8(a)) & 0xaaaaaaaa) != 0; }
+OPENCV_HAL_IMPL_LASX_CHECK_SHORT(v_uint16x16)
+OPENCV_HAL_IMPL_LASX_CHECK_SHORT(v_int16x16)
+
+////////// Other math /////////
+
+/** Some frequent operations **/
+#define OPENCV_HAL_IMPL_LASX_MULADD(_Tpvec, suffix)                            \
+    inline _Tpvec v_fma(const _Tpvec& a, const _Tpvec& b, const _Tpvec& c)     \
+    { return _Tpvec(__lasx_xvfmadd_##suffix(a.val, b.val, c.val)); }           \
+    inline _Tpvec v_muladd(const _Tpvec& a, const _Tpvec& b, const _Tpvec& c)  \
+    { return _Tpvec(__lasx_xvfmadd_##suffix(a.val, b.val, c.val)); }           \
+    inline _Tpvec v_sqrt(const _Tpvec& x)                                      \
+    { return _Tpvec(__lasx_xvfsqrt_##suffix(x.val)); }                         \
+    inline _Tpvec v_sqr_magnitude(const _Tpvec& a, const _Tpvec& b)            \
+    { return v_fma(a, a, v_mul(b, b)); }                                       \
+    inline _Tpvec v_magnitude(const _Tpvec& a, const _Tpvec& b)                \
+    { return v_sqrt(v_fma(a, a, v_mul(b, b))); }
+
+OPENCV_HAL_IMPL_LASX_MULADD(v_float32x8, s)
+OPENCV_HAL_IMPL_LASX_MULADD(v_float64x4, d)
+
+inline v_int32x8 v_fma(const v_int32x8& a, const v_int32x8& b, const v_int32x8& c)
+{
+    return v_int32x8(__lasx_xvmadd_w(c.val, a.val, b.val));
+}
+
+inline v_int32x8 v_muladd(const v_int32x8& a, const v_int32x8& b, const v_int32x8& c)
+{
+    return v_fma(a, b, c);
+}
+
+inline v_float32x8 v_invsqrt(const v_float32x8& x)
+{ return v_float32x8(__lasx_xvfrsqrt_s(x.val)); }
+
+inline v_float64x4 v_invsqrt(const v_float64x4& x)
+{ return v_float64x4(__lasx_xvfrsqrt_d(x.val)); }
+
+/** Absolute values **/
+#define OPENCV_HAL_IMPL_LASX_ABS(_Tpvec, suffix)         \
+    inline v_u##_Tpvec v_abs(const v_##_Tpvec& x)        \
+    { return v_u##_Tpvec(__lasx_xvabsd_##suffix(x.val, __lasx_xvreplgr2vr_w(0))); }
+
+OPENCV_HAL_IMPL_LASX_ABS(int8x32,  b)
+OPENCV_HAL_IMPL_LASX_ABS(int16x16, h)
+OPENCV_HAL_IMPL_LASX_ABS(int32x8,  w)
+
+inline v_float32x8 v_abs(const v_float32x8& x)
+{ return v_float32x8(*((__m256i*)&x) & __lasx_xvreplgr2vr_w(0x7fffffff)); }
+inline v_float64x4 v_abs(const v_float64x4& x)
+{ return v_float64x4(*((__m256i*)&x) & __lasx_xvreplgr2vr_d(0x7fffffffffffffff)); }
+
+/** Absolute difference **/
+inline v_uint8x32 v_absdiff(const v_uint8x32& a, const v_uint8x32& b)
+{ return (v_uint8x32)__lasx_xvabsd_bu(a.val, b.val); }
+inline v_uint16x16 v_absdiff(const v_uint16x16& a, const v_uint16x16& b)
+{ return (v_uint16x16)__lasx_xvabsd_hu(a.val, b.val); }
+inline v_uint32x8 v_absdiff(const v_uint32x8& a, const v_uint32x8& b)
+{ return (v_uint32x8)__lasx_xvabsd_wu(a.val, b.val); }
+
+inline v_uint8x32 v_absdiff(const v_int8x32& a, const v_int8x32& b)
+{ return (v_uint8x32)__lasx_xvabsd_b(a.val, b.val); }
+inline v_uint16x16 v_absdiff(const v_int16x16& a, const v_int16x16& b)
+{ return (v_uint16x16)__lasx_xvabsd_h(a.val, b.val); }
+inline v_uint32x8 v_absdiff(const v_int32x8& a, const v_int32x8& b)
+{ return (v_uint32x8)__lasx_xvabsd_w(a.val, b.val); }
+
+inline v_float32x8 v_absdiff(const v_float32x8& a, const v_float32x8& b)
+{ return v_abs(v_sub(a, b)); }
+
+inline v_float64x4 v_absdiff(const v_float64x4& a, const v_float64x4& b)
+{ return v_abs(v_sub(a, b)); }
+
+/** Saturating absolute difference **/
+inline v_int8x32 v_absdiffs(const v_int8x32& a, const v_int8x32& b)
+{
+    v_int8x32 d = v_sub(a, b);
+    v_int8x32 m = v_lt(a, b);
+    return v_sub(v_xor(d, m), m);
+}
+inline v_int16x16 v_absdiffs(const v_int16x16& a, const v_int16x16& b)
+{ return v_sub(v_max(a, b), v_min(a, b)); }
+
+////////// Conversions /////////
+
+/** Rounding **/
+inline v_int32x8 v_round(const v_float32x8& a)
+{ return v_int32x8(__lasx_xvftint_w_s(a.val)); }
+
+inline v_int32x8 v_round(const v_float64x4& a)
+{ __m256i t = __lasx_xvftint_w_d(a.val, a.val);
+  return v_int32x8(__lasx_xvpermi_d(t, 0x88)); }
+
+inline v_int32x8 v_round(const v_float64x4& a, const v_float64x4& b)
+{
+    __m256i abi = __lasx_xvftint_w_d(b.val, a.val);
+    return v_int32x8(__lasx_xvpermi_d(abi, 0b11011000)); //3120
+}
+
+inline v_int32x8 v_trunc(const v_float32x8& a)
+{ return v_int32x8(__lasx_xvftintrz_w_s(a.val)); }
+
+inline v_int32x8 v_trunc(const v_float64x4& a)
+{ __m256i t = __lasx_xvftintrz_w_d(a.val, a.val);
+  return v_int32x8(__lasx_xvpermi_d(t, 0x88)); }
+
+inline v_int32x8 v_floor(const v_float32x8& a)
+{ return v_int32x8(__lasx_xvftintrz_w_s(__m256(__lasx_xvfrintrm_s(a.val)))); }
+
+inline v_int32x8 v_floor(const v_float64x4& a)
+{ return v_trunc(v_float64x4(__lasx_xvfrintrm_d(a.val))); }
+
+inline v_int32x8 v_ceil(const v_float32x8& a)
+{ return v_int32x8(__lasx_xvftintrz_w_s(__m256(__lasx_xvfrintrp_s(a.val)))); }
+
+inline v_int32x8 v_ceil(const v_float64x4& a)
+{ return v_trunc(v_float64x4(__lasx_xvfrintrp_d(a.val))); }
+
+/** To float **/
+inline v_float32x8 v_cvt_f32(const v_int32x8& a)
+{ return v_float32x8(__lasx_xvffint_s_w(a.val)); }
+
+inline v_float32x8 v_cvt_f32(const v_float64x4& a)
+{ return v_float32x8(__lasx_xvpermi_d(__lasx_xvfcvt_s_d(a.val, a.val), 0x88)); }
+
+inline v_float32x8 v_cvt_f32(const v_float64x4& a, const v_float64x4& b)
+{
+    __m256 abf = __lasx_xvfcvt_s_d(a.val, b.val);  //warnning: order of a,b is diff from instruction xvfcvt.s.d
+    return v_float32x8(__lasx_xvpermi_d(abf, 0x8D));
+}
+
+inline v_float64x4 v_cvt_f64(const v_int32x8& a)
+{
+    __m256i alow = __lasx_xvpermi_d(a.val, 0x10);
+    return v_float64x4(__lasx_xvffintl_d_w(alow));
+}
+
+inline v_float64x4 v_cvt_f64_high(const v_int32x8& a)
+{
+    __m256i ahigh = __lasx_xvpermi_d(a.val, 0x32);
+    return v_float64x4(__lasx_xvffintl_d_w(ahigh));
+}
+
+inline v_float64x4 v_cvt_f64(const v_float32x8& a)
+{
+    __m256i alow = __lasx_xvpermi_d(a.val, 0x10);
+    return v_float64x4(__lasx_xvfcvtl_d_s((__m256)alow));
+}
+
+inline v_float64x4 v_cvt_f64_high(const v_float32x8& a)
+{
+    __m256i ahigh = __lasx_xvpermi_d(a.val, 0x32);
+    return v_float64x4(__lasx_xvfcvtl_d_s((__m256)ahigh));
+}
+
+inline v_float64x4 v_cvt_f64(const v_int64x4& v)
+{ return v_float64x4(__lasx_xvffint_d_l(v.val)); }
+
+////////////// Lookup table access ////////////////////
+
+inline v_int8x32 v256_lut(const schar* tab, const int* idx)
+{
+    return v_int8x32(_v256_setr_b(tab[idx[ 0]], tab[idx[ 1]], tab[idx[ 2]], tab[idx[ 3]], tab[idx[ 4]], tab[idx[ 5]],
+                                  tab[idx[ 6]], tab[idx[ 7]], tab[idx[ 8]], tab[idx[ 9]], tab[idx[10]], tab[idx[11]],
+                                  tab[idx[12]], tab[idx[13]], tab[idx[14]], tab[idx[15]], tab[idx[16]], tab[idx[17]],
+                                  tab[idx[18]], tab[idx[19]], tab[idx[20]], tab[idx[21]], tab[idx[22]], tab[idx[23]],
+                                  tab[idx[24]], tab[idx[25]], tab[idx[26]], tab[idx[27]], tab[idx[28]], tab[idx[29]],
+                                  tab[idx[30]], tab[idx[31]]));
+}
+inline v_int8x32 v256_lut_pairs(const schar* tab, const int* idx)
+{
+    return v_int8x32(_v256_setr_h(*(const short*)(tab + idx[ 0]), *(const short*)(tab + idx[ 1]), *(const short*)(tab + idx[ 2]),
+                                  *(const short*)(tab + idx[ 3]), *(const short*)(tab + idx[ 4]), *(const short*)(tab + idx[ 5]),
+                                  *(const short*)(tab + idx[ 6]), *(const short*)(tab + idx[ 7]), *(const short*)(tab + idx[ 8]),
+                                  *(const short*)(tab + idx[ 9]), *(const short*)(tab + idx[10]), *(const short*)(tab + idx[11]),
+                                  *(const short*)(tab + idx[12]), *(const short*)(tab + idx[13]), *(const short*)(tab + idx[14]),
+                                  *(const short*)(tab + idx[15])));
+}
+inline v_int8x32 v256_lut_quads(const schar* tab, const int* idx)
+{
+    return v_int8x32(_v256_setr_w(*(const int*)(tab + idx[0]), *(const int*)(tab + idx[1]),
+                                  *(const int*)(tab + idx[2]), *(const int*)(tab + idx[3]),
+                                  *(const int*)(tab + idx[4]), *(const int*)(tab + idx[5]),
+                                  *(const int*)(tab + idx[6]), *(const int*)(tab + idx[7])));
+}
+inline v_uint8x32 v256_lut(const uchar* tab, const int* idx) { return v_reinterpret_as_u8(v256_lut((const schar *)tab, idx)); }
+inline v_uint8x32 v256_lut_pairs(const uchar* tab, const int* idx) { return v_reinterpret_as_u8(v256_lut_pairs((const schar *)tab, idx)); }
+inline v_uint8x32 v256_lut_quads(const uchar* tab, const int* idx) { return v_reinterpret_as_u8(v256_lut_quads((const schar *)tab, idx)); }
+
+inline v_int16x16 v256_lut(const short* tab, const int* idx)
+{
+    return v_int16x16(_v256_setr_h(tab[idx[ 0]], tab[idx[ 1]], tab[idx[ 2]], tab[idx[ 3]], tab[idx[ 4]],
+                                   tab[idx[ 5]], tab[idx[ 6]], tab[idx[ 7]], tab[idx[ 8]], tab[idx[ 9]],
+                                   tab[idx[10]], tab[idx[11]], tab[idx[12]], tab[idx[13]], tab[idx[14]],
+                                   tab[idx[15]]));
+}
+inline v_int16x16 v256_lut_pairs(const short* tab, const int* idx)
+{
+    return v_int16x16(_v256_setr_w(*(const int*)(tab + idx[0]), *(const int*)(tab + idx[1]),
+                                   *(const int*)(tab + idx[2]), *(const int*)(tab + idx[3]),
+                                   *(const int*)(tab + idx[4]), *(const int*)(tab + idx[5]),
+                                   *(const int*)(tab + idx[6]), *(const int*)(tab + idx[7]) ));
+}
+inline v_int16x16 v256_lut_quads(const short* tab, const int* idx)
+{
+    return v_int16x16(_v256_setr_d(*(const long long int*)(tab + idx[0]), *(const long long int*)(tab + idx[1]),
+                                   *(const long long int*)(tab + idx[2]), *(const long long int*)(tab + idx[3]) ));
+
+}
+inline v_uint16x16 v256_lut(const ushort* tab, const int* idx) { return v_reinterpret_as_u16(v256_lut((const short *)tab, idx)); }
+inline v_uint16x16 v256_lut_pairs(const ushort* tab, const int* idx) { return v_reinterpret_as_u16(v256_lut_pairs((const short *)tab, idx)); }
+inline v_uint16x16 v256_lut_quads(const ushort* tab, const int* idx) { return v_reinterpret_as_u16(v256_lut_quads((const short *)tab, idx)); }
+
+inline v_int32x8 v256_lut(const int* tab, const int* idx)
+{
+    return v_int32x8(_v256_setr_w(*(const int*)(tab + idx[0]), *(const int*)(tab + idx[1]),
+                                  *(const int*)(tab + idx[2]), *(const int*)(tab + idx[3]),
+                                  *(const int*)(tab + idx[4]), *(const int*)(tab + idx[5]),
+                                  *(const int*)(tab + idx[6]), *(const int*)(tab + idx[7]) ));
+}
+inline v_int32x8 v256_lut_pairs(const int* tab, const int* idx)
+{
+    return v_int32x8(_v256_setr_d(*(const long long int*)(tab + idx[0]), *(const long long int*)(tab + idx[1]),
+                                  *(const long long int*)(tab + idx[2]), *(const long long int*)(tab + idx[3]) ));
+}
+inline v_int32x8 v256_lut_quads(const int* tab, const int* idx)
+{
+    return v_int32x8(_v256_combine(__lsx_vld(tab + idx[0], 0), __lsx_vld(tab + idx[1], 0)));
+}
+inline v_uint32x8 v256_lut(const unsigned* tab, const int* idx) { return v_reinterpret_as_u32(v256_lut((const int *)tab, idx)); }
+inline v_uint32x8 v256_lut_pairs(const unsigned* tab, const int* idx) { return v_reinterpret_as_u32(v256_lut_pairs((const int *)tab, idx)); }
+inline v_uint32x8 v256_lut_quads(const unsigned* tab, const int* idx) { return v_reinterpret_as_u32(v256_lut_quads((const int *)tab, idx)); }
+
+inline v_int64x4 v256_lut(const int64* tab, const int* idx)
+{
+    return v_int64x4(_v256_setr_d(*(const long long int*)(tab + idx[0]), *(const long long int*)(tab + idx[1]),
+                                  *(const long long int*)(tab + idx[2]), *(const long long int*)(tab + idx[3]) ));
+}
+inline v_int64x4 v256_lut_pairs(const int64* tab, const int* idx)
+{
+    return v_int64x4(_v256_combine(__lsx_vld(tab + idx[0], 0), __lsx_vld(tab + idx[1], 0)));
+}
+inline v_uint64x4 v256_lut(const uint64* tab, const int* idx) { return v_reinterpret_as_u64(v256_lut((const int64 *)tab, idx)); }
+inline v_uint64x4 v256_lut_pairs(const uint64* tab, const int* idx) { return v_reinterpret_as_u64(v256_lut_pairs((const int64 *)tab, idx)); }
+
+inline v_float32x8 v256_lut(const float* tab, const int* idx)
+{
+    return v_float32x8(_v256_setr_ps(tab[idx[0]], tab[idx[1]], tab[idx[2]], tab[idx[3]],
+                                     tab[idx[4]], tab[idx[5]], tab[idx[6]], tab[idx[7]]));
+}
+inline v_float32x8 v256_lut_pairs(const float* tab, const int* idx) { return v_reinterpret_as_f32(v256_lut_pairs((const int *)tab, idx)); }
+inline v_float32x8 v256_lut_quads(const float* tab, const int* idx) { return v_reinterpret_as_f32(v256_lut_quads((const int *)tab, idx)); }
+
+inline v_float64x4 v256_lut(const double* tab, const int* idx)
+{
+    return v_float64x4(_v256_setr_pd(tab[idx[0]], tab[idx[1]], tab[idx[2]], tab[idx[3]]));
+}
+inline v_float64x4 v256_lut_pairs(const double* tab, const int* idx)
+{ return v_float64x4(_v256_combine(__lsx_vld(tab + idx[0], 0), __lsx_vld(tab + idx[1], 0))); }
+
+inline v_int32x8 v_lut(const int* tab, const v_int32x8& idxvec)
+{
+    int *idx = (int*)&idxvec.val;
+    return v256_lut(tab, idx);
+}
+
+inline v_uint32x8 v_lut(const unsigned* tab, const v_int32x8& idxvec)
+{
+    return v_reinterpret_as_u32(v_lut((const int *)tab, idxvec));
+}
+
+inline v_float32x8 v_lut(const float* tab, const v_int32x8& idxvec)
+{
+    const int *idx = (const int*)&idxvec.val;
+    return v256_lut(tab, idx);
+}
+
+inline v_float64x4 v_lut(const double* tab, const v_int32x8& idxvec)
+{
+    const int *idx = (const int*)&idxvec.val;
+    return v256_lut(tab, idx);
+}
+
+inline void v_lut_deinterleave(const float* tab, const v_int32x8& idxvec, v_float32x8& x, v_float32x8& y)
+{
+    const int *idx = (const int*)&idxvec.val;
+    __m128i xy01, xy45, xy23, xy67;
+    xy01 = __lsx_vld(tab + idx[0], 0);
+    xy01 = __lsx_vextrins_d(xy01, __lsx_vld(tab + idx[1], 0), 0x10);
+    xy45 = __lsx_vld(tab + idx[4], 0);
+    xy45 = __lsx_vextrins_d(xy45, __lsx_vld(tab + idx[5], 0), 0x10);
+    __m256i xy0145 = _v256_combine(xy01, xy45);
+    xy23 = __lsx_vld(tab + idx[2], 0);
+    xy23 = __lsx_vextrins_d(xy23, __lsx_vld(tab + idx[3], 0), 0x10);
+    xy67 = __lsx_vld(tab + idx[6], 0);
+    xy67 = __lsx_vextrins_d(xy67, __lsx_vld(tab + idx[7], 0), 0x10);
+    __m256i xy2367 = _v256_combine(xy23, xy67);
+
+    __m256i xxyy0145 = __lasx_xvilvl_w(xy2367, xy0145);
+    __m256i xxyy2367 = __lasx_xvilvh_w(xy2367, xy0145);
+
+    x = v_float32x8(__lasx_xvilvl_w(xxyy2367, xxyy0145));
+    y = v_float32x8(__lasx_xvilvh_w(xxyy2367, xxyy0145));
+}
+
+inline void v_lut_deinterleave(const double* tab, const v_int32x8& idxvec, v_float64x4& x, v_float64x4& y)
+{
+    //int CV_DECL_ALIGNED(32) idx[4];
+    const int *idx = (const int*)&idxvec.val;
+    __m128i xy0 = __lsx_vld(tab + idx[0], 0);
+    __m128i xy2 = __lsx_vld(tab + idx[2], 0);
+    __m128i xy1 = __lsx_vld(tab + idx[1], 0);
+    __m128i xy3 = __lsx_vld(tab + idx[3], 0);
+    __m256i xy02 = _v256_combine(xy0, xy2);
+    __m256i xy13 = _v256_combine(xy1, xy3);
+
+    x = v_float64x4(__lasx_xvilvl_d(xy13, xy02));
+    y = v_float64x4(__lasx_xvilvh_d(xy13, xy02));
+}
+
+inline v_int8x32 v_interleave_pairs(const v_int8x32& vec)
+{
+    return v_int8x32(__lasx_xvshuf_b(vec.val, vec.val,
+                       _v256_set_d(0x0f0d0e0c0b090a08, 0x0705060403010200, 0x0f0d0e0c0b090a08, 0x0705060403010200)));
+}
+inline v_uint8x32 v_interleave_pairs(const v_uint8x32& vec)
+{ return v_reinterpret_as_u8(v_interleave_pairs(v_reinterpret_as_s8(vec))); }
+inline v_int8x32 v_interleave_quads(const v_int8x32& vec)
+{
+    return v_int8x32(__lasx_xvshuf_b(vec.val, vec.val,
+                       _v256_set_d(0x0f0b0e0a0d090c08, 0x0703060205010400, 0x0f0b0e0a0d090c08, 0x0703060205010400)));
+}
+inline v_uint8x32 v_interleave_quads(const v_uint8x32& vec)
+{ return v_reinterpret_as_u8(v_interleave_quads(v_reinterpret_as_s8(vec))); }
+
+inline v_int16x16 v_interleave_pairs(const v_int16x16& vec)
+{
+    return v_int16x16(__lasx_xvshuf_b(vec.val, vec.val,
+                        _v256_set_d(0x0f0e0b0a0d0c0908, 0x0706030205040100, 0x0f0e0b0a0d0c0908, 0x0706030205040100)));
+}
+inline v_uint16x16 v_interleave_pairs(const v_uint16x16& vec)
+{ return v_reinterpret_as_u16(v_interleave_pairs(v_reinterpret_as_s16(vec))); }
+inline v_int16x16 v_interleave_quads(const v_int16x16& vec)
+{
+    return v_int16x16(__lasx_xvshuf_b(vec.val, vec.val,
+                        _v256_set_d(0x0f0e07060d0c0504, 0x0b0a030209080100, 0x0f0e07060d0c0504, 0x0b0a030209080100)));
+}
+inline v_uint16x16 v_interleave_quads(const v_uint16x16& vec)
+{ return v_reinterpret_as_u16(v_interleave_quads(v_reinterpret_as_s16(vec))); }
+
+inline v_int32x8 v_interleave_pairs(const v_int32x8& vec)
+{
+    return v_int32x8(__lasx_xvshuf4i_w(vec.val, 0xd8));
+}
+inline v_uint32x8 v_interleave_pairs(const v_uint32x8& vec)
+{ return v_reinterpret_as_u32(v_interleave_pairs(v_reinterpret_as_s32(vec))); }
+inline v_float32x8 v_interleave_pairs(const v_float32x8& vec)
+{ return v_reinterpret_as_f32(v_interleave_pairs(v_reinterpret_as_s32(vec))); }
+
+inline v_int8x32 v_pack_triplets(const v_int8x32& vec)
+{
+    __m256i vzero = __lasx_xvreplgr2vr_w(0);
+    __m256i t1 = __lasx_xvshuf_b(vzero, vec.val,
+                   _v256_set_d(0x1211100f0e0d0c0a, 0x0908060504020100, 0x1211100f0e0d0c0a, 0x0908060504020100));
+    return v_int8x32(__lasx_xvperm_w(t1,
+                       _v256_set_d(0x0000000700000007, 0x0000000600000005, 0x0000000400000002, 0x0000000100000000)));
+}
+inline v_uint8x32 v_pack_triplets(const v_uint8x32& vec)
+{ return v_reinterpret_as_u8(v_pack_triplets(v_reinterpret_as_s8(vec))); }
+
+inline v_int16x16 v_pack_triplets(const v_int16x16& vec)
+{
+    __m256i vzero = __lasx_xvreplgr2vr_w(0);
+    __m256i t1 = __lasx_xvshuf_b(vzero, vec.val,
+                   _v256_set_d(0x11100f0e0d0c0b0a, 0x0908050403020100, 0x11100f0e0d0c0b0a, 0x0908050403020100));
+    return v_int16x16(__lasx_xvperm_w(t1,
+                        _v256_set_d(0x0000000700000007, 0x0000000600000005, 0x0000000400000002, 0x0000000100000000)));
+}
+inline v_uint16x16 v_pack_triplets(const v_uint16x16& vec)
+{ return v_reinterpret_as_u16(v_pack_triplets(v_reinterpret_as_s16(vec))); }
+
+inline v_int32x8 v_pack_triplets(const v_int32x8& vec)
+{
+    return v_int32x8(__lasx_xvperm_w(vec.val,
+                       _v256_set_d(0x0000000700000007, 0x0000000600000005, 0x0000000400000002, 0x0000000100000000)));
+}
+inline v_uint32x8 v_pack_triplets(const v_uint32x8& vec)
+{ return v_reinterpret_as_u32(v_pack_triplets(v_reinterpret_as_s32(vec))); }
+inline v_float32x8 v_pack_triplets(const v_float32x8& vec)
+{
+    return v_float32x8(__lasx_xvperm_w(*(__m256i*)(&vec.val),
+                         _v256_set_d(0x0000000700000007, 0x0000000600000005, 0x0000000400000002, 0x0000000100000000)));
+}
+
+////////// Matrix operations /////////
+
+//////// Dot Product ////////
+
+// 16 >> 32
+inline v_int32x8 v_dotprod(const v_int16x16& a, const v_int16x16& b)
+{ return v_int32x8(__lasx_xvadd_w(__lasx_xvmulwev_w_h(a.val, b.val), __lasx_xvmulwod_w_h(a.val, b.val))); }
+
+inline v_int32x8 v_dotprod(const v_int16x16& a, const v_int16x16& b, const v_int32x8& c)
+{ return v_add(v_dotprod(a, b), c); }
+
+// 32 >> 64
+inline v_int64x4 v_dotprod(const v_int32x8& a, const v_int32x8& b)
+{
+    __m256i even = __lasx_xvmulwev_d_w(a.val, b.val);
+    return v_int64x4(__lasx_xvmaddwod_d_w(even, a.val, b.val));
+}
+inline v_int64x4 v_dotprod(const v_int32x8& a, const v_int32x8& b, const v_int64x4& c)
+{
+    __m256i even = __lasx_xvmaddwev_d_w(c.val, a.val, b.val);
+    return v_int64x4(__lasx_xvmaddwod_d_w(even, a.val, b.val));
+}
+
+// 8 >> 32
+inline v_uint32x8 v_dotprod_expand(const v_uint8x32& a, const v_uint8x32& b)
+{
+    __m256i even  = __lasx_xvmulwev_h_bu(a.val, b.val);
+    __m256i odd   = __lasx_xvmulwod_h_bu(a.val, b.val);
+    __m256i prod0 = __lasx_xvhaddw_wu_hu(even, even);
+    __m256i prod1 = __lasx_xvhaddw_wu_hu(odd, odd);
+    return v_uint32x8(__lasx_xvadd_w(prod0, prod1));
+}
+inline v_uint32x8 v_dotprod_expand(const v_uint8x32& a, const v_uint8x32& b, const v_uint32x8& c)
+{ return v_add(v_dotprod_expand(a, b), c); }
+
+inline v_int32x8 v_dotprod_expand(const v_int8x32& a, const v_int8x32& b)
+{
+    __m256i even  = __lasx_xvmulwev_h_b(a.val, b.val);
+    __m256i odd   = __lasx_xvmulwod_h_b(a.val, b.val);
+    __m256i prod0 = __lasx_xvhaddw_w_h(even, even);
+    __m256i prod1 = __lasx_xvhaddw_w_h(odd, odd);
+    return v_int32x8(__lasx_xvadd_w(prod0, prod1));
+}
+inline v_int32x8 v_dotprod_expand(const v_int8x32& a, const v_int8x32& b, const v_int32x8& c)
+{ return v_add(v_dotprod_expand(a, b), c); }
+
+// 16 >> 64
+inline v_uint64x4 v_dotprod_expand(const v_uint16x16& a, const v_uint16x16& b)
+{
+    __m256i even  = __lasx_xvmulwev_w_hu(a.val, b.val);
+    __m256i odd   = __lasx_xvmulwod_w_hu(a.val, b.val);
+    __m256i prod0 = __lasx_xvhaddw_du_wu(even, even);
+    __m256i prod1 = __lasx_xvhaddw_du_wu(odd, odd);
+    return v_uint64x4(__lasx_xvadd_d(prod0, prod1));
+}
+inline v_uint64x4 v_dotprod_expand(const v_uint16x16& a, const v_uint16x16& b, const v_uint64x4& c)
+{ return v_add(v_dotprod_expand(a, b), c); }
+
+inline v_int64x4 v_dotprod_expand(const v_int16x16& a, const v_int16x16& b)
+{
+    __m256i even  = __lasx_xvmulwev_w_h(a.val, b.val);
+    __m256i odd   = __lasx_xvmulwod_w_h(a.val, b.val);
+    __m256i prod0 = __lasx_xvhaddw_d_w(even, even);
+    __m256i prod1 = __lasx_xvhaddw_d_w(odd, odd);
+    return v_int64x4(__lasx_xvadd_d(prod0, prod1));
+}
+
+inline v_int64x4 v_dotprod_expand(const v_int16x16& a, const v_int16x16& b, const v_int64x4& c)
+{ return v_add(v_dotprod_expand(a, b), c); }
+
+// 32 >> 64f
+inline v_float64x4 v_dotprod_expand(const v_int32x8& a, const v_int32x8& b)
+{ return v_cvt_f64(v_dotprod(a, b)); }
+inline v_float64x4 v_dotprod_expand(const v_int32x8& a, const v_int32x8& b, const v_float64x4& c)
+{ return v_add(v_dotprod_expand(a, b), c); }
+
+//////// Fast Dot Product ////////
+
+// 16 >> 32
+inline v_int32x8 v_dotprod_fast(const v_int16x16& a, const v_int16x16& b)
+{ return v_dotprod(a, b); }
+inline v_int32x8 v_dotprod_fast(const v_int16x16& a, const v_int16x16& b, const v_int32x8& c)
+{ return v_dotprod(a, b, c); }
+
+// 32 >> 64
+inline v_int64x4 v_dotprod_fast(const v_int32x8& a, const v_int32x8& b)
+{ return v_dotprod(a, b); }
+inline v_int64x4 v_dotprod_fast(const v_int32x8& a, const v_int32x8& b, const v_int64x4& c)
+{ return v_dotprod(a, b, c); }
+
+// 8 >> 32
+inline v_uint32x8 v_dotprod_expand_fast(const v_uint8x32& a, const v_uint8x32& b)
+{ return v_dotprod_expand(a, b); }
+inline v_uint32x8 v_dotprod_expand_fast(const v_uint8x32& a, const v_uint8x32& b, const v_uint32x8& c)
+{ return v_dotprod_expand(a, b, c); }
+
+inline v_int32x8 v_dotprod_expand_fast(const v_int8x32& a, const v_int8x32& b)
+{ return v_dotprod_expand(a, b); }
+inline v_int32x8 v_dotprod_expand_fast(const v_int8x32& a, const v_int8x32& b, const v_int32x8& c)
+{ return v_dotprod_expand(a, b, c); }
+
+// 16 >> 64
+inline v_uint64x4 v_dotprod_expand_fast(const v_uint16x16& a, const v_uint16x16& b)
+{
+    __m256i even  = __lasx_xvmulwev_w_hu(a.val, b.val);
+    __m256i odd   = __lasx_xvmulwod_w_hu(a.val, b.val);
+    __m256i prod0 = __lasx_xvhaddw_du_wu(even, even);
+    __m256i prod1 = __lasx_xvhaddw_du_wu(odd, odd);
+    return v_uint64x4(__lasx_xvadd_d(__lasx_xvilvl_d(prod1, prod0), __lasx_xvilvh_d(prod1, prod0)));
+}
+inline v_uint64x4 v_dotprod_expand_fast(const v_uint16x16& a, const v_uint16x16& b, const v_uint64x4& c)
+{ return v_add(v_dotprod_expand_fast(a, b), c); }
+
+inline v_int64x4 v_dotprod_expand_fast(const v_int16x16& a, const v_int16x16& b)
+{
+    __m256i prod = __lasx_xvadd_w(__lasx_xvmulwev_w_h(a.val, b.val), __lasx_xvmulwod_w_h(a.val, b.val));
+    __m256i sign = __lasx_xvsrai_w(prod, 31);
+    __m256i lo = __lasx_xvilvl_w(sign, prod);
+    __m256i hi = __lasx_xvilvh_w(sign, prod);
+    return v_int64x4(__lasx_xvadd_d(lo, hi));
+}
+inline v_int64x4 v_dotprod_expand_fast(const v_int16x16& a, const v_int16x16& b, const v_int64x4& c)
+{ return v_add(v_dotprod_expand_fast(a, b), c); }
+
+// 32 >> 64f
+inline v_float64x4 v_dotprod_expand_fast(const v_int32x8& a, const v_int32x8& b)
+{ return v_dotprod_expand(a, b); }
+inline v_float64x4 v_dotprod_expand_fast(const v_int32x8& a, const v_int32x8& b, const v_float64x4& c)
+{ return v_dotprod_expand(a, b, c); }
+
+
+#define OPENCV_HAL_LASX_SPLAT2_PS(a, im) \
+    v_float32x8(__lasx_xvpermi_w(a.val, a.val, im))
+
+inline v_float32x8 v_matmul(const v_float32x8& v, const v_float32x8& m0,
+                            const v_float32x8& m1, const v_float32x8& m2,
+                            const v_float32x8& m3)
+{
+    v_float32x8 v04 = OPENCV_HAL_LASX_SPLAT2_PS(v, 0);
+    v_float32x8 v15 = OPENCV_HAL_LASX_SPLAT2_PS(v, 0x55);
+    v_float32x8 v26 = OPENCV_HAL_LASX_SPLAT2_PS(v, 0xAA);
+    v_float32x8 v37 = OPENCV_HAL_LASX_SPLAT2_PS(v, 0xFF);
+    return v_fma(v04, m0, v_fma(v15, m1, v_fma(v26, m2, v_mul(v37, m3))));
+}
+
+inline v_float32x8 v_matmuladd(const v_float32x8& v, const v_float32x8& m0,
+                               const v_float32x8& m1, const v_float32x8& m2,
+                               const v_float32x8& a)
+{
+    v_float32x8 v04 = OPENCV_HAL_LASX_SPLAT2_PS(v, 0);
+    v_float32x8 v15 = OPENCV_HAL_LASX_SPLAT2_PS(v, 0x55);
+    v_float32x8 v26 = OPENCV_HAL_LASX_SPLAT2_PS(v, 0xAA);
+    return v_fma(v04, m0, v_fma(v15, m1, v_fma(v26, m2, a)));
+}
+
+
+#define OPENCV_HAL_IMPL_LASX_TRANSPOSE4x4(_Tpvec, cast_from, cast_to)           \
+    inline void v_transpose4x4(const _Tpvec& a0, const _Tpvec& a1,              \
+                               const _Tpvec& a2, const _Tpvec& a3,              \
+                               _Tpvec& b0, _Tpvec& b1, _Tpvec& b2, _Tpvec& b3)  \
+    {                                                                           \
+        __m256i t0 = cast_from(__lasx_xvilvl_w(a1.val, a0.val));                \
+        __m256i t1 = cast_from(__lasx_xvilvl_w(a3.val, a2.val));                \
+        __m256i t2 = cast_from(__lasx_xvilvh_w(a1.val, a0.val));                \
+        __m256i t3 = cast_from(__lasx_xvilvh_w(a3.val, a2.val));                \
+        b0.val = cast_to(__lasx_xvilvl_d(t1, t0));                              \
+        b1.val = cast_to(__lasx_xvilvh_d(t1, t0));                              \
+        b2.val = cast_to(__lasx_xvilvl_d(t3, t2));                              \
+        b3.val = cast_to(__lasx_xvilvh_d(t3, t2));                              \
+    }
+
+OPENCV_HAL_IMPL_LASX_TRANSPOSE4x4(v_uint32x8, OPENCV_HAL_NOP, OPENCV_HAL_NOP)
+OPENCV_HAL_IMPL_LASX_TRANSPOSE4x4(v_int32x8,  OPENCV_HAL_NOP, OPENCV_HAL_NOP)
+
+inline void v_transpose4x4(const v_float32x8 &a0, const v_float32x8 &a1,
+                           const v_float32x8 &a2, const v_float32x8 &a3,
+                           v_float32x8 &b0, v_float32x8 &b1, v_float32x8 &b2, v_float32x8 &b3)
+{
+    __m256i t0 = __lasx_xvilvl_w(__m256i(a1.val), __m256i(a0.val));
+    __m256i t1 = __lasx_xvilvl_w(__m256i(a3.val), __m256i(a2.val));
+    __m256i t2 = __lasx_xvilvh_w(__m256i(a1.val), __m256i(a0.val));
+    __m256i t3 = __lasx_xvilvh_w(__m256i(a3.val), __m256i(a2.val));
+    b0.val = __m256(__lasx_xvilvl_d(t1, t0));
+    b1.val = __m256(__lasx_xvilvh_d(t1, t0));
+    b2.val = __m256(__lasx_xvilvl_d(t3, t2));
+    b3.val = __m256(__lasx_xvilvh_d(t3, t2));
+}
+
+//////////////// Value reordering ///////////////
+
+/* Expand */
+#define OPENCV_HAL_IMPL_LASX_EXPAND(_Tpvec, _Tpwvec, _Tp, intrin)     \
+    inline void v_expand(const _Tpvec& a, _Tpwvec& b0, _Tpwvec& b1)   \
+    {                                                                 \
+        b0.val = intrin(a.val);                                       \
+        b1.val = intrin(__lasx_xvpermi_q(a.val, a.val, 0x11));        \
+    }                                                                 \
+    inline _Tpwvec v_expand_low(const _Tpvec& a)                      \
+    { return _Tpwvec(intrin(a.val)); }                                \
+    inline _Tpwvec v_expand_high(const _Tpvec& a)                     \
+    { return _Tpwvec(intrin(__lasx_xvpermi_q(a.val, a.val, 0x11))); } \
+    inline _Tpwvec v256_load_expand(const _Tp* ptr)                   \
+    {                                                                 \
+        __m128i a = __lsx_vld(ptr, 0);                                \
+        return _Tpwvec(intrin(*((__m256i*)&a)));                      \
+    }
+
+OPENCV_HAL_IMPL_LASX_EXPAND(v_uint8x32,  v_uint16x16, uchar,    __lasx_vext2xv_hu_bu)
+OPENCV_HAL_IMPL_LASX_EXPAND(v_int8x32,   v_int16x16,  schar,    __lasx_vext2xv_h_b)
+OPENCV_HAL_IMPL_LASX_EXPAND(v_uint16x16, v_uint32x8,  ushort,   __lasx_vext2xv_wu_hu)
+OPENCV_HAL_IMPL_LASX_EXPAND(v_int16x16,  v_int32x8,   short,    __lasx_vext2xv_w_h)
+OPENCV_HAL_IMPL_LASX_EXPAND(v_uint32x8,  v_uint64x4,  unsigned, __lasx_vext2xv_du_wu)
+OPENCV_HAL_IMPL_LASX_EXPAND(v_int32x8,   v_int64x4,   int,      __lasx_vext2xv_d_w)
+
+#define OPENCV_HAL_IMPL_LASX_EXPAND_Q(_Tpvec, _Tp, intrin)   \
+    inline _Tpvec v256_load_expand_q(const _Tp* ptr)         \
+    {                                                        \
+        __m128i a = __lsx_vld(ptr, 0);                       \
+        return _Tpvec(intrin(*((__m256i*)&a)));              \
+    }
+
+OPENCV_HAL_IMPL_LASX_EXPAND_Q(v_uint32x8, uchar, __lasx_vext2xv_wu_bu)
+OPENCV_HAL_IMPL_LASX_EXPAND_Q(v_int32x8,  schar, __lasx_vext2xv_w_b)
+
+/* pack */
+// 16
+inline v_int8x32 v_pack(const v_int16x16& a, const v_int16x16& b)
+{ return v_int8x32(_v256_shuffle_odd_64(_lasx_packs_h(a.val, b.val))); }
+
+inline v_uint8x32 v_pack(const v_uint16x16& a, const v_uint16x16& b)
+{ return v_uint8x32(_v256_shuffle_odd_64(__lasx_xvssrlrni_bu_h(b.val, a.val, 0))); }
+
+inline v_uint8x32 v_pack_u(const v_int16x16& a, const v_int16x16& b)
+{
+    return v_uint8x32(_v256_shuffle_odd_64(_lasx_packus_h(a.val, b.val)));
+}
+
+inline void v_pack_store(schar* ptr, const v_int16x16& a)
+{ v_store_low(ptr, v_pack(a, a)); }
+
+inline void v_pack_store(uchar *ptr, const v_uint16x16& a)
+{ v_store_low(ptr, v_pack(a, a)); }
+
+inline void v_pack_u_store(uchar* ptr, const v_int16x16& a)
+{ v_store_low(ptr, v_pack_u(a, a)); }
+
+template<int n> inline
+v_uint8x32 v_rshr_pack(const v_uint16x16& a, const v_uint16x16& b)
+{
+    __m256i res = __lasx_xvssrlrni_bu_h(b.val, a.val, n);
+    return v_uint8x32(_v256_shuffle_odd_64(res));
+}
+
+template<int n> inline
+void v_rshr_pack_store(uchar* ptr, const v_uint16x16& a)
+{
+    __m256i res = __lasx_xvssrlrni_bu_h(a.val, a.val, n);
+    __lasx_xvstelm_d(res, ptr, 0, 0);
+    __lasx_xvstelm_d(res, ptr, 8, 2);
+}
+
+template<int n> inline
+v_uint8x32 v_rshr_pack_u(const v_int16x16& a, const v_int16x16& b)
+{
+    __m256i res = __lasx_xvssrarni_bu_h(b.val, a.val, n);
+    return v_uint8x32(_v256_shuffle_odd_64(res));
+}
+
+template<int n> inline
+void v_rshr_pack_u_store(uchar* ptr, const v_int16x16& a)
+{
+    __m256i res = __lasx_xvssrarni_bu_h(a.val, a.val, n);
+    __lasx_xvstelm_d(res, ptr, 0, 0);
+    __lasx_xvstelm_d(res, ptr, 8, 2);
+}
+
+template<int n> inline
+v_int8x32 v_rshr_pack(const v_int16x16& a, const v_int16x16& b)
+{
+    __m256i res = __lasx_xvssrarni_b_h(b.val, a.val, n);
+    return v_int8x32(_v256_shuffle_odd_64(res));
+}
+
+template<int n> inline
+void v_rshr_pack_store(schar* ptr, const v_int16x16& a)
+{
+    __m256i res = __lasx_xvssrarni_b_h(a.val, a.val, n);
+    __lasx_xvstelm_d(res, ptr, 0, 0);
+    __lasx_xvstelm_d(res, ptr, 8, 2);
+}
+
+// 32
+inline v_int16x16 v_pack(const v_int32x8& a, const v_int32x8& b)
+{ return v_int16x16(_v256_shuffle_odd_64(_lasx_packs_w(a.val, b.val))); }
+
+inline v_uint16x16 v_pack(const v_uint32x8& a, const v_uint32x8& b)
+{ return v_uint16x16(_v256_shuffle_odd_64(_v256_packs_epu32(a.val, b.val))); }
+
+inline v_uint16x16 v_pack_u(const v_int32x8& a, const v_int32x8& b)
+{ return v_uint16x16(_v256_shuffle_odd_64(_lasx_packus_w(a.val, b.val))); }
+
+inline void v_pack_store(short* ptr, const v_int32x8& a)
+{ v_store_low(ptr, v_pack(a, a)); }
+
+inline void v_pack_store(ushort* ptr, const v_uint32x8& a)
+{
+    __m256i res = __lasx_xvssrlrni_hu_w(a.val, a.val, 0);
+    __lasx_xvstelm_d(res, ptr, 0, 0);
+    __lasx_xvstelm_d(res, ptr, 8, 2);
+}
+
+inline void v_pack_u_store(ushort* ptr, const v_int32x8& a)
+{ v_store_low(ptr, v_pack_u(a, a)); }
+
+template<int n> inline
+v_uint16x16 v_rshr_pack(const v_uint32x8& a, const v_uint32x8& b)
+{ return v_uint16x16(_v256_shuffle_odd_64(__lasx_xvssrlrni_hu_w(b.val, a.val, n))); }
+
+template<int n> inline
+void v_rshr_pack_store(ushort* ptr, const v_uint32x8& a)
+{
+    __m256i res = __lasx_xvssrlrni_hu_w(a.val, a.val, n);
+    __lasx_xvstelm_d(res, ptr, 0, 0);
+    __lasx_xvstelm_d(res, ptr, 8, 2);
+}
+
+template<int n> inline
+v_uint16x16 v_rshr_pack_u(const v_int32x8& a, const v_int32x8& b)
+{ return v_uint16x16(_v256_shuffle_odd_64(__lasx_xvssrarni_hu_w(b.val, a.val, n))); }
+
+template<int n> inline
+void v_rshr_pack_u_store(ushort* ptr, const v_int32x8& a)
+{
+    __m256i res = __lasx_xvssrarni_hu_w(a.val, a.val, n);
+    __lasx_xvstelm_d(res, ptr, 0, 0);
+    __lasx_xvstelm_d(res, ptr, 8, 2);
+}
+
+template<int n> inline
+v_int16x16 v_rshr_pack(const v_int32x8& a, const v_int32x8& b)
+{ return v_int16x16(_v256_shuffle_odd_64(__lasx_xvssrarni_h_w(b.val, a.val, n))); }
+
+template<int n> inline
+void v_rshr_pack_store(short* ptr, const v_int32x8& a)
+{
+    __m256i res = __lasx_xvssrarni_h_w(a.val, a.val, n);
+    __lasx_xvstelm_d(res, ptr, 0, 0);
+    __lasx_xvstelm_d(res, ptr, 8, 2);
+}
+
+// 64
+// Non-saturating pack
+inline v_uint32x8 v_pack(const v_uint64x4& a, const v_uint64x4& b)
+{
+    __m256i ab = __lasx_xvpickev_w(b.val, a.val);
+    return v_uint32x8(_v256_shuffle_odd_64(ab));
+}
+
+inline v_int32x8 v_pack(const v_int64x4& a, const v_int64x4& b)
+{ return v_reinterpret_as_s32(v_pack(v_reinterpret_as_u64(a), v_reinterpret_as_u64(b))); }
+
+inline void v_pack_store(unsigned* ptr, const v_uint64x4& a)
+{
+    __m256i a0 = __lasx_xvshuf4i_w(a.val, 0x08);
+    v_store_low(ptr, v_uint32x8(_v256_shuffle_odd_64(a0)));
+}
+
+inline void v_pack_store(int* ptr, const v_int64x4& b)
+{ v_pack_store((unsigned*)ptr, v_reinterpret_as_u64(b)); }
+
+template<int n> inline
+v_uint32x8 v_rshr_pack(const v_uint64x4& a, const v_uint64x4& b)
+{ return v_uint32x8(_v256_shuffle_odd_64(__lasx_xvsrlrni_w_d(b.val, a.val, n))); }
+
+template<int n> inline
+void v_rshr_pack_store(unsigned* ptr, const v_uint64x4& a)
+{
+    __m256i res = __lasx_xvsrlrni_w_d(a.val, a.val, n);
+    __lasx_xvstelm_d(res, ptr, 0, 0);
+    __lasx_xvstelm_d(res, ptr, 8, 2);
+}
+
+template<int n> inline
+v_int32x8 v_rshr_pack(const v_int64x4& a, const v_int64x4& b)
+{ return v_int32x8(_v256_shuffle_odd_64(__lasx_xvsrarni_w_d(b.val, a.val, n))); }
+
+template<int n> inline
+void v_rshr_pack_store(int* ptr, const v_int64x4& a)
+{
+    __m256i res = __lasx_xvsrarni_w_d(a.val, a.val, n);
+    __lasx_xvstelm_d(res, ptr, 0, 0);
+    __lasx_xvstelm_d(res, ptr, 8, 2);
+}
+
+// pack boolean
+inline v_uint8x32 v_pack_b(const v_uint16x16& a, const v_uint16x16& b)
+{
+    __m256i ab = _lasx_packs_h(a.val, b.val);
+    return v_uint8x32(_v256_shuffle_odd_64(ab));
+}
+
+inline v_uint8x32 v_pack_b(const v_uint32x8& a, const v_uint32x8& b,
+                           const v_uint32x8& c, const v_uint32x8& d)
+{
+    __m256i ab = _lasx_packs_w(a.val, b.val);
+    __m256i cd = _lasx_packs_w(c.val, d.val);
+
+    __m256i abcd = _v256_shuffle_odd_64(_lasx_packs_h(ab, cd));
+    return v_uint8x32(__lasx_xvshuf4i_w(abcd, 0xd8));
+}
+
+inline v_uint8x32 v_pack_b(const v_uint64x4& a, const v_uint64x4& b, const v_uint64x4& c,
+                           const v_uint64x4& d, const v_uint64x4& e, const v_uint64x4& f,
+                           const v_uint64x4& g, const v_uint64x4& h)
+{
+    __m256i ab = _lasx_packs_w(a.val, b.val);
+    __m256i cd = _lasx_packs_w(c.val, d.val);
+    __m256i ef = _lasx_packs_w(e.val, f.val);
+    __m256i gh = _lasx_packs_w(g.val, h.val);
+
+    __m256i abcd = _lasx_packs_w(ab, cd);
+    __m256i efgh = _lasx_packs_w(ef, gh);
+    __m256i pkall = _v256_shuffle_odd_64(_lasx_packs_h(abcd, efgh));
+
+    __m256i rev = _v256_alignr_b(pkall, pkall, 8);
+    return v_uint8x32(__lasx_xvilvl_h(rev, pkall));
+}
+
+/* Recombine */
+// its up there with load and store operations
+
+/* Extract */
+#define OPENCV_HAL_IMPL_LASX_EXTRACT(_Tpvec)                    \
+    template<int s>                                             \
+    inline _Tpvec v_extract(const _Tpvec& a, const _Tpvec& b)   \
+    { return v_rotate_right<s>(a, b); }
+
+OPENCV_HAL_IMPL_LASX_EXTRACT(v_uint8x32)
+OPENCV_HAL_IMPL_LASX_EXTRACT(v_int8x32)
+OPENCV_HAL_IMPL_LASX_EXTRACT(v_uint16x16)
+OPENCV_HAL_IMPL_LASX_EXTRACT(v_int16x16)
+OPENCV_HAL_IMPL_LASX_EXTRACT(v_uint32x8)
+OPENCV_HAL_IMPL_LASX_EXTRACT(v_int32x8)
+OPENCV_HAL_IMPL_LASX_EXTRACT(v_uint64x4)
+OPENCV_HAL_IMPL_LASX_EXTRACT(v_int64x4)
+OPENCV_HAL_IMPL_LASX_EXTRACT(v_float32x8)
+OPENCV_HAL_IMPL_LASX_EXTRACT(v_float64x4)
+
+template<int i>
+inline uchar v_extract_n(v_uint8x32 a)
+{
+    return (uchar)_v256_extract_b<i>(a.val);
+}
+
+template<int i>
+inline schar v_extract_n(v_int8x32 a)
+{
+    return (schar)v_extract_n<i>(v_reinterpret_as_u8(a));
+}
+
+template<int i>
+inline ushort v_extract_n(v_uint16x16 a)
+{
+    return (ushort)_v256_extract_h<i>(a.val);
+}
+
+template<int i>
+inline short v_extract_n(v_int16x16 a)
+{
+    return (short)v_extract_n<i>(v_reinterpret_as_u16(a));
+}
+
+template<int i>
+inline uint v_extract_n(v_uint32x8 a)
+{
+    return (uint)_v256_extract_w<i>(a.val);
+}
+
+template<int i>
+inline int v_extract_n(v_int32x8 a)
+{
+    return (int)v_extract_n<i>(v_reinterpret_as_u32(a));
+}
+
+template<int i>
+inline uint64 v_extract_n(v_uint64x4 a)
+{
+    return (uint64)_v256_extract_d<i>(a.val);
+}
+
+template<int i>
+inline int64 v_extract_n(v_int64x4 v)
+{
+    return (int64)v_extract_n<i>(v_reinterpret_as_u64(v));
+}
+
+template<int i>
+inline float v_extract_n(v_float32x8 v)
+{
+    union { uint iv; float fv; } d;
+    d.iv = v_extract_n<i>(v_reinterpret_as_u32(v));
+    return d.fv;
+}
+
+template<int i>
+inline double v_extract_n(v_float64x4 v)
+{
+    union { uint64 iv; double dv; } d;
+    d.iv = v_extract_n<i>(v_reinterpret_as_u64(v));
+    return d.dv;
+}
+
+template<int i>
+inline v_uint32x8 v_broadcast_element(v_uint32x8 a)
+{
+    static const __m256i perm = __lasx_xvreplgr2vr_w((char)i);
+    return v_uint32x8(__lasx_xvperm_w(a.val, perm));
+}
+
+template<int i>
+inline v_int32x8 v_broadcast_element(const v_int32x8 &a)
+{ return v_reinterpret_as_s32(v_broadcast_element<i>(v_reinterpret_as_u32(a))); }
+
+template<int i>
+inline v_float32x8 v_broadcast_element(const v_float32x8 &a)
+{ return v_reinterpret_as_f32(v_broadcast_element<i>(v_reinterpret_as_u32(a))); }
+
+///////////////////// load deinterleave /////////////////////////////
+
+inline void v_load_deinterleave(const uchar* ptr, v_uint8x32& a, v_uint8x32& b)
+{
+    __m256i t0 = __lasx_xvld(ptr, 0);
+    __m256i t1 = __lasx_xvld(ptr, 32);
+
+    __m256i p0 = __lasx_xvpickev_b(t1, t0);
+    __m256i p1 = __lasx_xvpickod_b(t1, t0);
+
+    a.val = __lasx_xvpermi_d(p0, 0xd8);
+    b.val = __lasx_xvpermi_d(p1, 0xd8);
+}
+
+inline void v_load_deinterleave( const ushort* ptr, v_uint16x16& a, v_uint16x16& b )
+{
+    __m256i t0 = __lasx_xvld(ptr, 0);
+    __m256i t1 = __lasx_xvld(ptr, 32);
+
+    __m256i p0 = __lasx_xvpickev_h(t1, t0);
+    __m256i p1 = __lasx_xvpickod_h(t1, t0);
+
+    a.val = __lasx_xvpermi_d(p0, 0xd8);
+    b.val = __lasx_xvpermi_d(p1, 0xd8);
+}
+
+inline void v_load_deinterleave( const unsigned* ptr, v_uint32x8& a, v_uint32x8& b )
+{
+    __m256i t0 = __lasx_xvld(ptr, 0);
+    __m256i t1 = __lasx_xvld(ptr, 32);
+
+    __m256i p0 = __lasx_xvpickev_w(t1, t0);
+    __m256i p1 = __lasx_xvpickod_w(t1, t0);
+
+    a.val = __lasx_xvpermi_d(p0, 0xd8);
+    b.val = __lasx_xvpermi_d(p1, 0xd8);
+}
+
+inline void v_load_deinterleave( const uint64* ptr, v_uint64x4& a, v_uint64x4& b )
+{
+    __m256i ab0 = __lasx_xvld(ptr, 0);
+    __m256i ab1 = __lasx_xvld(ptr, 32);
+
+    __m256i pl = __lasx_xvpermi_q(ab0, ab1, 0x02);
+    __m256i ph = __lasx_xvpermi_q(ab0, ab1, 0x13);
+    __m256i a0 = __lasx_xvilvl_d(ph, pl);
+    __m256i b0 = __lasx_xvilvh_d(ph, pl);
+    a = v_uint64x4(a0);
+    b = v_uint64x4(b0);
+}
+
+inline void v_load_deinterleave( const uchar* ptr, v_uint8x32& a, v_uint8x32& b, v_uint8x32& c )
+{
+    __m256i bgr0 = __lasx_xvld(ptr, 0);
+    __m256i bgr1 = __lasx_xvld(ptr, 32);
+    __m256i bgr2 = __lasx_xvld(ptr, 64);
+
+    __m256i s02_low = __lasx_xvpermi_q(bgr0, bgr2, 0x02);
+    __m256i s02_high = __lasx_xvpermi_q(bgr0, bgr2, 0x13);
+
+    const __m256i m0 = _v256_setr_b(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, 0, -1, 0, 0, -1, 0, 0);
+    const __m256i m1 = _v256_setr_b(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, -1, 0, 0, -1, 0, 0, -1);
+
+    __m256i b0 = __lasx_xvbitsel_v(__lasx_xvbitsel_v(s02_low, s02_high, m0), bgr1, m1);
+    __m256i g0 = __lasx_xvbitsel_v(__lasx_xvbitsel_v(s02_high, s02_low, m1), bgr1, m0);
+    __m256i r0 = __lasx_xvbitsel_v(__lasx_xvbitsel_v(bgr1, s02_low, m0), s02_high, m1);
+
+    const __m256i
+    sh_b = _v256_setr_b(0, 3, 6, 9, 12, 15, 2, 5, 8, 11, 14, 1, 4, 7, 10, 13,
+                        0, 3, 6, 9, 12, 15, 2, 5, 8, 11, 14, 1, 4, 7, 10, 13),
+    sh_g = _v256_setr_b(1, 4, 7, 10, 13, 0, 3, 6, 9, 12, 15, 2, 5, 8, 11, 14,
+                        1, 4, 7, 10, 13, 0, 3, 6, 9, 12, 15, 2, 5, 8, 11, 14),
+    sh_r = _v256_setr_b(2, 5, 8, 11, 14, 1, 4, 7, 10, 13, 0, 3, 6, 9, 12, 15,
+                        2, 5, 8, 11, 14, 1, 4, 7, 10, 13, 0, 3, 6, 9, 12, 15);
+    b0 = __lasx_xvshuf_b(b0, b0, sh_b);
+    g0 = __lasx_xvshuf_b(g0, g0, sh_g);
+    r0 = __lasx_xvshuf_b(r0, r0, sh_r);
+
+    a = v_uint8x32(b0);
+    b = v_uint8x32(g0);
+    c = v_uint8x32(r0);
+}
+
+inline void v_load_deinterleave( const ushort* ptr, v_uint16x16& a, v_uint16x16& b, v_uint16x16& c )
+{
+    __m256i bgr0 = __lasx_xvld(ptr, 0);
+    __m256i bgr1 = __lasx_xvld(ptr, 32);
+    __m256i bgr2 = __lasx_xvld(ptr, 64);
+
+    __m256i s02_low = __lasx_xvpermi_q(bgr0, bgr2, 0x02);
+    __m256i s02_high = __lasx_xvpermi_q(bgr0, bgr2, 0x13);
+
+    const __m256i m0 = _v256_setr_b(0, 0, -1, -1, 0, 0, 0, 0, -1, -1, 0, 0, 0, 0, -1, -1,
+                                    0, 0, 0, 0, -1, -1, 0, 0, 0, 0, -1, -1, 0, 0, 0, 0);
+    const __m256i m1 = _v256_setr_b(0, 0, 0, 0, -1, -1, 0, 0, 0, 0, -1, -1, 0, 0, 0, 0,
+                                    -1, -1, 0, 0, 0, 0, -1, -1, 0, 0, 0, 0, -1, -1, 0, 0);
+    __m256i b0 = __lasx_xvbitsel_v(__lasx_xvbitsel_v(s02_low, s02_high, m0), bgr1, m1);
+    __m256i g0 = __lasx_xvbitsel_v(__lasx_xvbitsel_v(bgr1, s02_low, m0), s02_high, m1);
+    __m256i r0 = __lasx_xvbitsel_v(__lasx_xvbitsel_v(s02_high, s02_low, m1), bgr1, m0);
+    const __m256i sh_b = _v256_setr_b(0, 1, 6, 7, 12, 13, 2, 3, 8, 9, 14, 15, 4, 5, 10, 11,
+                                      0, 1, 6, 7, 12, 13, 2, 3, 8, 9, 14, 15, 4, 5, 10, 11);
+    const __m256i sh_g = _v256_setr_b(2, 3, 8, 9, 14, 15, 4, 5, 10, 11, 0, 1, 6, 7, 12, 13,
+                                      2, 3, 8, 9, 14, 15, 4, 5, 10, 11, 0, 1, 6, 7, 12, 13);
+    const __m256i sh_r = _v256_setr_b(4, 5, 10, 11, 0, 1, 6, 7, 12, 13, 2, 3, 8, 9, 14, 15,
+                                      4, 5, 10, 11, 0, 1, 6, 7, 12, 13, 2, 3, 8, 9, 14, 15);
+    b0 = __lasx_xvshuf_b(b0, b0, sh_b);
+    g0 = __lasx_xvshuf_b(g0, g0, sh_g);
+    r0 = __lasx_xvshuf_b(r0, r0, sh_r);
+
+    a = v_uint16x16(b0);
+    b = v_uint16x16(g0);
+    c = v_uint16x16(r0);
+}
+
+inline void v_load_deinterleave( const unsigned* ptr, v_uint32x8& a, v_uint32x8& b, v_uint32x8& c )
+{
+    __m256i bgr0 = __lasx_xvld(ptr, 0);
+    __m256i bgr1 = __lasx_xvld(ptr, 32);
+    __m256i bgr2 = __lasx_xvld(ptr, 64);
+
+    __m256i s02_low = __lasx_xvpermi_q(bgr0, bgr2, 0x02);
+    __m256i s02_high = __lasx_xvpermi_q(bgr0, bgr2, 0x13);
+
+    __m256i m24 = _v256_set_w(0, 0, -1, 0, 0, -1, 0, 0);
+    __m256i m92 = _v256_set_w(-1, 0, 0, -1, 0, 0, -1, 0);
+    __m256i b0 = __lasx_xvbitsel_v(__lasx_xvbitsel_v(s02_low, s02_high, m24), bgr1, m92);
+    __m256i g0 = __lasx_xvbitsel_v(__lasx_xvbitsel_v(s02_high, s02_low, m92), bgr1, m24);
+    __m256i r0 = __lasx_xvbitsel_v(__lasx_xvbitsel_v(bgr1, s02_low, m24), s02_high, m92);
+
+    b0 = __lasx_xvshuf4i_w(b0, 0x6c);
+    g0 = __lasx_xvshuf4i_w(g0, 0xb1);
+    r0 = __lasx_xvshuf4i_w(r0, 0xc6);
+
+    a = v_uint32x8(b0);
+    b = v_uint32x8(g0);
+    c = v_uint32x8(r0);
+}
+
+inline void v_load_deinterleave( const uint64* ptr, v_uint64x4& a, v_uint64x4& b, v_uint64x4& c )
+{
+    __m256i bgr0 = __lasx_xvld(ptr, 0);
+    __m256i bgr1 = __lasx_xvld(ptr, 32);
+    __m256i bgr2 = __lasx_xvld(ptr, 64);
+
+    __m256i s01 = __lasx_xvpermi_q(bgr0, bgr1, 0x12); // get bgr0 low 128 and bgr1 high 128
+    __m256i s12 = __lasx_xvpermi_q(bgr1, bgr2, 0x12);
+    __m256i s20r = __lasx_xvpermi_d(__lasx_xvpermi_q(bgr2, bgr0, 0x12), 0x1b);
+    __m256i b0 = __lasx_xvilvl_d(s20r, s01);
+    __m256i g0 = _v256_alignr_b(s12, s01, 8);
+    __m256i r0 = __lasx_xvilvh_d(s12, s20r);
+
+    a = v_uint64x4(b0);
+    b = v_uint64x4(g0);
+    c = v_uint64x4(r0);
+}
+
+inline void v_load_deinterleave(const uchar* ptr, v_uint8x32& a, v_uint8x32& b, v_uint8x32& c, v_uint8x32& d)
+{
+    __m256i t0 = __lasx_xvld(ptr, 0);
+    __m256i t1 = __lasx_xvld(ptr, 32);
+    __m256i t2 = __lasx_xvld(ptr, 64);
+    __m256i t3 = __lasx_xvld(ptr, 96);
+
+    const __m256i sh = _v256_setr_w(0, 4, 1, 5, 2, 6, 3, 7);
+    __m256i ac_lo = __lasx_xvpickev_b(t1, t0);
+    __m256i bd_lo = __lasx_xvpickod_b(t1, t0);
+    __m256i ac_hi = __lasx_xvpickev_b(t3, t2);
+    __m256i bd_hi = __lasx_xvpickod_b(t3, t2);
+
+    __m256i a_pre = __lasx_xvpickev_b(ac_hi, ac_lo);
+    __m256i c_pre = __lasx_xvpickod_b(ac_hi, ac_lo);
+    __m256i b_pre = __lasx_xvpickev_b(bd_hi, bd_lo);
+    __m256i d_pre = __lasx_xvpickod_b(bd_hi, bd_lo);
+
+    a.val = __lasx_xvperm_w(a_pre, sh);
+    b.val = __lasx_xvperm_w(b_pre, sh);
+    c.val = __lasx_xvperm_w(c_pre, sh);
+    d.val = __lasx_xvperm_w(d_pre, sh);
+}
+
+inline void v_load_deinterleave(const ushort* ptr, v_uint16x16& a, v_uint16x16& b, v_uint16x16& c, v_uint16x16& d)
+{
+    __m256i t0 = __lasx_xvld(ptr, 0);
+    __m256i t1 = __lasx_xvld(ptr, 32);
+    __m256i t2 = __lasx_xvld(ptr, 64);
+    __m256i t3 = __lasx_xvld(ptr, 96);
+
+    const __m256i sh = _v256_setr_w(0, 4, 1, 5, 2, 6, 3, 7);
+    __m256i ac_lo = __lasx_xvpickev_h(t1, t0);
+    __m256i bd_lo = __lasx_xvpickod_h(t1, t0);
+    __m256i ac_hi = __lasx_xvpickev_h(t3, t2);
+    __m256i bd_hi = __lasx_xvpickod_h(t3, t2);
+
+    __m256i a_pre = __lasx_xvpickev_h(ac_hi, ac_lo);
+    __m256i c_pre = __lasx_xvpickod_h(ac_hi, ac_lo);
+    __m256i b_pre = __lasx_xvpickev_h(bd_hi, bd_lo);
+    __m256i d_pre = __lasx_xvpickod_h(bd_hi, bd_lo);
+
+    a.val = __lasx_xvperm_w(a_pre, sh);
+    b.val = __lasx_xvperm_w(b_pre, sh);
+    c.val = __lasx_xvperm_w(c_pre, sh);
+    d.val = __lasx_xvperm_w(d_pre, sh);
+}
+
+inline void v_load_deinterleave( const unsigned* ptr, v_uint32x8& a, v_uint32x8& b, v_uint32x8& c, v_uint32x8& d )
+{
+    __m256i p0 = __lasx_xvld(ptr, 0);
+    __m256i p1 = __lasx_xvld(ptr, 32);
+    __m256i p2 = __lasx_xvld(ptr, 64);
+    __m256i p3 = __lasx_xvld(ptr, 96);
+
+    __m256i p01l = __lasx_xvilvl_w(p1, p0);
+    __m256i p01h = __lasx_xvilvh_w(p1, p0);
+    __m256i p23l = __lasx_xvilvl_w(p3, p2);
+    __m256i p23h = __lasx_xvilvh_w(p3, p2);
+
+    __m256i pll = __lasx_xvpermi_q(p01l, p23l, 0x02);
+    __m256i plh = __lasx_xvpermi_q(p01l, p23l, 0x13);
+    __m256i phl = __lasx_xvpermi_q(p01h, p23h, 0x02);
+    __m256i phh = __lasx_xvpermi_q(p01h, p23h, 0x13);
+
+    __m256i b0 = __lasx_xvilvl_w(plh, pll);
+    __m256i g0 = __lasx_xvilvh_w(plh, pll);
+    __m256i r0 = __lasx_xvilvl_w(phh, phl);
+    __m256i a0 = __lasx_xvilvh_w(phh, phl);
+
+    a = v_uint32x8(b0);
+    b = v_uint32x8(g0);
+    c = v_uint32x8(r0);
+    d = v_uint32x8(a0);
+}
+
+inline void v_load_deinterleave( const uint64* ptr, v_uint64x4& a, v_uint64x4& b, v_uint64x4& c, v_uint64x4& d )
+{
+    __m256i bgra0 = __lasx_xvld(ptr, 0);
+    __m256i bgra1 = __lasx_xvld(ptr, 32);
+    __m256i bgra2 = __lasx_xvld(ptr, 64);
+    __m256i bgra3 = __lasx_xvld(ptr, 96);
+
+    __m256i l02 = __lasx_xvpermi_q(bgra0, bgra2, 0x02);
+    __m256i h02 = __lasx_xvpermi_q(bgra0, bgra2, 0x13);
+    __m256i l13 = __lasx_xvpermi_q(bgra1, bgra3, 0x02);
+    __m256i h13 = __lasx_xvpermi_q(bgra1, bgra3, 0x13);
+
+    __m256i b0 = __lasx_xvilvl_d(l13, l02);
+    __m256i g0 = __lasx_xvilvh_d(l13, l02);
+    __m256i r0 = __lasx_xvilvl_d(h13, h02);
+    __m256i a0 = __lasx_xvilvh_d(h13, h02);
+
+    a = v_uint64x4(b0);
+    b = v_uint64x4(g0);
+    c = v_uint64x4(r0);
+    d = v_uint64x4(a0);
+}
+
+///////////////////////////// store interleave /////////////////////////////////////
+
+inline void v_store_interleave( uchar* ptr, const v_uint8x32& x, const v_uint8x32& y,
+                                hal::StoreMode /*mode*/=hal::STORE_UNALIGNED )
+{
+    __m256i xy_l = __lasx_xvilvl_b(y.val, x.val);
+    __m256i xy_h = __lasx_xvilvh_b(y.val, x.val);
+
+    __m256i xy0 = __lasx_xvpermi_q(xy_h, xy_l, 0 + 2*16);
+    __m256i xy1 = __lasx_xvpermi_q(xy_h, xy_l, 1 + 3*16);
+
+    __lasx_xvst(xy0, (__m256i*)ptr, 0);
+    __lasx_xvst(xy1, (__m256i*)ptr, 32*1);
+}
+
+inline void v_store_interleave( ushort* ptr, const v_uint16x16& x, const v_uint16x16& y,
+                                hal::StoreMode /*mode*/=hal::STORE_UNALIGNED )
+{
+    __m256i xy_l = __lasx_xvilvl_h(y.val, x.val);
+    __m256i xy_h = __lasx_xvilvh_h(y.val, x.val);
+
+    __m256i xy0 = __lasx_xvpermi_q(xy_h, xy_l, 0 + 2*16);
+    __m256i xy1 = __lasx_xvpermi_q(xy_h, xy_l, 1 + 3*16);
+
+    __lasx_xvst(xy0, (__m256i*)ptr, 0);
+    __lasx_xvst(xy1, (__m256i*)ptr, 16*2);
+}
+
+inline void v_store_interleave( unsigned* ptr, const v_uint32x8& x, const v_uint32x8& y,
+                                hal::StoreMode /*mode*/=hal::STORE_UNALIGNED )
+{
+    __m256i xy_l = __lasx_xvilvl_w(y.val, x.val);
+    __m256i xy_h = __lasx_xvilvh_w(y.val, x.val);
+
+    __m256i xy0 = __lasx_xvpermi_q(xy_h, xy_l, 0 + 2*16);
+    __m256i xy1 = __lasx_xvpermi_q(xy_h, xy_l, 1 + 3*16);
+
+    __lasx_xvst(xy0, (__m256i*)ptr, 0);
+    __lasx_xvst(xy1, (__m256i*)ptr, 8*4);
+}
+
+inline void v_store_interleave( uint64* ptr, const v_uint64x4& x, const v_uint64x4& y,
+                                hal::StoreMode /*mode*/=hal::STORE_UNALIGNED )
+{
+    __m256i xy_l = __lasx_xvilvl_d(y.val, x.val);
+    __m256i xy_h = __lasx_xvilvh_d(y.val, x.val);
+
+    __m256i xy0 = __lasx_xvpermi_q(xy_h, xy_l, 0 + 2*16);
+    __m256i xy1 = __lasx_xvpermi_q(xy_h, xy_l, 1 + 3*16);
+
+    __lasx_xvst(xy0, (__m256i*)ptr, 0);
+    __lasx_xvst(xy1, (__m256i*)ptr, 4*8);
+}
+
+inline void v_store_interleave( uchar* ptr, const v_uint8x32& a, const v_uint8x32& b, const v_uint8x32& c,
+                                hal::StoreMode /*mode*/=hal::STORE_UNALIGNED )
+{
+    const __m256i sh_b = _v256_setr_b(
+            0, 11, 6, 1, 12, 7, 2, 13, 8, 3, 14, 9, 4, 15, 10, 5,
+            0, 11, 6, 1, 12, 7, 2, 13, 8, 3, 14, 9, 4, 15, 10, 5);
+    const __m256i sh_g = _v256_setr_b(
+            5, 0, 11, 6, 1, 12, 7, 2, 13, 8, 3, 14, 9, 4, 15, 10,
+            5, 0, 11, 6, 1, 12, 7, 2, 13, 8, 3, 14, 9, 4, 15, 10);
+    const __m256i sh_r = _v256_setr_b(
+            10, 5, 0, 11, 6, 1, 12, 7, 2, 13, 8, 3, 14, 9, 4, 15,
+            10, 5, 0, 11, 6, 1, 12, 7, 2, 13, 8, 3, 14, 9, 4, 15);
+
+    __m256i b0 = __lasx_xvshuf_b(a.val, a.val, sh_b);
+    __m256i g0 = __lasx_xvshuf_b(b.val, b.val, sh_g);
+    __m256i r0 = __lasx_xvshuf_b(c.val, c.val, sh_r);
+
+    const __m256i m0 = _v256_setr_b(0, -1, 0, 0, -1, 0, 0, -1, 0, 0, -1, 0, 0, -1, 0, 0,
+                                    0, -1, 0, 0, -1, 0, 0, -1, 0, 0, -1, 0, 0, -1, 0, 0);
+    const __m256i m1 = _v256_setr_b(0, 0, -1, 0, 0, -1, 0, 0, -1, 0, 0, -1, 0, 0, -1, 0,
+                                    0, 0, -1, 0, 0, -1, 0, 0, -1, 0, 0, -1, 0, 0, -1, 0);
+
+    __m256i p0 = __lasx_xvbitsel_v(__lasx_xvbitsel_v(b0, g0, m0), r0, m1);
+    __m256i p1 = __lasx_xvbitsel_v(__lasx_xvbitsel_v(g0, r0, m0), b0, m1);
+    __m256i p2 = __lasx_xvbitsel_v(__lasx_xvbitsel_v(r0, b0, m0), g0, m1);
+
+    __m256i bgr0 = __lasx_xvpermi_q(p1, p0, 0 + 2*16);
+    __m256i bgr1 = __lasx_xvpermi_q(p0, p2, 0 + 3*16);
+    __m256i bgr2 = __lasx_xvpermi_q(p2, p1, 1 + 3*16);
+
+    __lasx_xvst(bgr0, (__m256i*)ptr, 0);
+    __lasx_xvst(bgr1, (__m256i*)ptr, 32);
+    __lasx_xvst(bgr2, (__m256i*)ptr, 64);
+}
+
+inline void v_store_interleave( ushort* ptr, const v_uint16x16& a, const v_uint16x16& b, const v_uint16x16& c,
+                                hal::StoreMode /*mode*/=hal::STORE_UNALIGNED )
+{
+    const __m256i sh_b = _v256_setr_b(
+         0, 1, 6, 7, 12, 13, 2, 3, 8, 9, 14, 15, 4, 5, 10, 11,
+         0, 1, 6, 7, 12, 13, 2, 3, 8, 9, 14, 15, 4, 5, 10, 11);
+    const __m256i sh_g = _v256_setr_b(
+         10, 11, 0, 1, 6, 7, 12, 13, 2, 3, 8, 9, 14, 15, 4, 5,
+         10, 11, 0, 1, 6, 7, 12, 13, 2, 3, 8, 9, 14, 15, 4, 5);
+    const __m256i sh_r = _v256_setr_b(
+         4, 5, 10, 11, 0, 1, 6, 7, 12, 13, 2, 3, 8, 9, 14, 15,
+         4, 5, 10, 11, 0, 1, 6, 7, 12, 13, 2, 3, 8, 9, 14, 15);
+
+    __m256i b0 = __lasx_xvshuf_b(a.val, a.val, sh_b);
+    __m256i g0 = __lasx_xvshuf_b(b.val, b.val, sh_g);
+    __m256i r0 = __lasx_xvshuf_b(c.val, c.val, sh_r);
+
+    const __m256i m0 = _v256_setr_b(0, 0, -1, -1, 0, 0, 0, 0, -1, -1, 0, 0, 0, 0, -1, -1,
+                                    0, 0, 0, 0, -1, -1, 0, 0, 0, 0, -1, -1, 0, 0, 0, 0);
+    const __m256i m1 = _v256_setr_b(0, 0, 0, 0, -1, -1, 0, 0, 0, 0, -1, -1, 0, 0, 0, 0,
+                                    -1, -1, 0, 0, 0, 0, -1, -1, 0, 0, 0, 0, -1, -1, 0, 0);
+
+    __m256i p0 = __lasx_xvbitsel_v(__lasx_xvbitsel_v(b0, g0, m0), r0, m1);
+    __m256i p1 = __lasx_xvbitsel_v(__lasx_xvbitsel_v(g0, r0, m0), b0, m1);
+    __m256i p2 = __lasx_xvbitsel_v(__lasx_xvbitsel_v(r0, b0, m0), g0, m1);
+
+    __m256i bgr0 = __lasx_xvpermi_q(p2, p0, 0 + 2*16);
+    __m256i bgr2 = __lasx_xvpermi_q(p2, p0, 1 + 3*16);
+
+    __lasx_xvst(bgr0, (__m256i*)ptr, 0);
+    __lasx_xvst(p1,   (__m256i*)ptr, 16*2);
+    __lasx_xvst(bgr2, (__m256i*)ptr, 32*2);
+}
+
+inline void v_store_interleave( unsigned* ptr, const v_uint32x8& a, const v_uint32x8& b, const v_uint32x8& c,
+                                hal::StoreMode /*mode*/=hal::STORE_UNALIGNED )
+{
+    __m256i b0 = __lasx_xvshuf4i_w(a.val, 0x6c);
+    __m256i g0 = __lasx_xvshuf4i_w(b.val, 0xb1);
+    __m256i r0 = __lasx_xvshuf4i_w(c.val, 0xc6);
+
+    __m256i bitmask_1 = _v256_set_w(-1, 0, 0, -1, 0, 0, -1, 0);
+    __m256i bitmask_2 = _v256_set_w(0, 0, -1, 0, 0, -1, 0, 0);
+
+    __m256i p0 = __lasx_xvbitsel_v(__lasx_xvbitsel_v(b0, g0, bitmask_1), r0, bitmask_2);
+    __m256i p1 = __lasx_xvbitsel_v(__lasx_xvbitsel_v(g0, r0, bitmask_1), b0, bitmask_2);
+    __m256i p2 = __lasx_xvbitsel_v(__lasx_xvbitsel_v(r0, b0, bitmask_1), g0, bitmask_2);
+
+    __m256i bgr0 = __lasx_xvpermi_q(p1, p0, 0 + 2*16);
+    __m256i bgr2 = __lasx_xvpermi_q(p1, p0, 1 + 3*16);
+
+    __lasx_xvst(bgr0, (__m256i*)ptr, 0);
+    __lasx_xvst(p2,   (__m256i*)ptr, 8*4);
+    __lasx_xvst(bgr2, (__m256i*)ptr, 16*4);
+}
+
+inline void v_store_interleave( uint64* ptr, const v_uint64x4& a, const v_uint64x4& b, const v_uint64x4& c,
+                                hal::StoreMode /*mode*/=hal::STORE_UNALIGNED )
+{
+    __m256i s01 = __lasx_xvilvl_d(b.val, a.val);
+    __m256i s12 = __lasx_xvilvh_d(c.val, b.val);
+    __m256i s20 = __lasx_xvpermi_w(a.val, c.val, 0xe4);
+
+    __m256i bgr0 = __lasx_xvpermi_q(s20, s01, 0 + 2*16);
+    __m256i bgr1 = __lasx_xvpermi_q(s01, s12, 0x30);
+    __m256i bgr2 = __lasx_xvpermi_q(s12, s20, 1 + 3*16);
+
+    __lasx_xvst(bgr0, (__m256i*)ptr, 0);
+    __lasx_xvst(bgr1, (__m256i*)ptr, 4*8);
+    __lasx_xvst(bgr2, (__m256i*)ptr, 8*8);
+}
+
+inline void v_store_interleave( uchar* ptr, const v_uint8x32& a, const v_uint8x32& b,
+                                const v_uint8x32& c, const v_uint8x32& d,
+                                hal::StoreMode /*mode*/=hal::STORE_UNALIGNED )
+{
+    __m256i bg0 = __lasx_xvilvl_b(b.val, a.val);
+    __m256i bg1 = __lasx_xvilvh_b(b.val, a.val);
+    __m256i ra0 = __lasx_xvilvl_b(d.val, c.val);
+    __m256i ra1 = __lasx_xvilvh_b(d.val, c.val);
+
+    __m256i bgra0_ = __lasx_xvilvl_h(ra0, bg0);
+    __m256i bgra1_ = __lasx_xvilvh_h(ra0, bg0);
+    __m256i bgra2_ = __lasx_xvilvl_h(ra1, bg1);
+    __m256i bgra3_ = __lasx_xvilvh_h(ra1, bg1);
+
+    __m256i bgra0 = __lasx_xvpermi_q(bgra1_, bgra0_, 0 + 2*16);
+    __m256i bgra2 = __lasx_xvpermi_q(bgra1_, bgra0_, 1 + 3*16);
+    __m256i bgra1 = __lasx_xvpermi_q(bgra3_, bgra2_, 0 + 2*16);
+    __m256i bgra3 = __lasx_xvpermi_q(bgra3_, bgra2_, 1 + 3*16);
+
+    __lasx_xvst(bgra0, (__m256i*)ptr, 0);
+    __lasx_xvst(bgra1, (__m256i*)ptr, 32);
+    __lasx_xvst(bgra2, (__m256i*)ptr, 64);
+    __lasx_xvst(bgra3, (__m256i*)ptr, 96);
+}
+
+inline void v_store_interleave( ushort* ptr, const v_uint16x16& a, const v_uint16x16& b,
+                                const v_uint16x16& c, const v_uint16x16& d,
+                                hal::StoreMode /*mode*/=hal::STORE_UNALIGNED )
+{
+    __m256i bg0 = __lasx_xvilvl_h(b.val, a.val);
+    __m256i bg1 = __lasx_xvilvh_h(b.val, a.val);
+    __m256i ra0 = __lasx_xvilvl_h(d.val, c.val);
+    __m256i ra1 = __lasx_xvilvh_h(d.val, c.val);
+
+    __m256i bgra0_ = __lasx_xvilvl_w(ra0, bg0);
+    __m256i bgra1_ = __lasx_xvilvh_w(ra0, bg0);
+    __m256i bgra2_ = __lasx_xvilvl_w(ra1, bg1);
+    __m256i bgra3_ = __lasx_xvilvh_w(ra1, bg1);
+
+    __m256i bgra0 = __lasx_xvpermi_q(bgra1_, bgra0_, 0 + 2*16);
+    __m256i bgra2 = __lasx_xvpermi_q(bgra1_, bgra0_, 1 + 3*16);
+    __m256i bgra1 = __lasx_xvpermi_q(bgra3_, bgra2_, 0 + 2*16);
+    __m256i bgra3 = __lasx_xvpermi_q(bgra3_, bgra2_, 1 + 3*16);
+
+    __lasx_xvst(bgra0, (__m256i*)ptr, 0);
+    __lasx_xvst(bgra1, (__m256i*)ptr, 16*2);
+    __lasx_xvst(bgra2, (__m256i*)ptr, 32*2);
+    __lasx_xvst(bgra3, (__m256i*)ptr, 48*2);
+}
+
+inline void v_store_interleave( unsigned* ptr, const v_uint32x8& a, const v_uint32x8& b,
+                                const v_uint32x8& c, const v_uint32x8& d,
+                                hal::StoreMode /*mode*/=hal::STORE_UNALIGNED )
+{
+    __m256i bg0 = __lasx_xvilvl_w(b.val, a.val);
+    __m256i bg1 = __lasx_xvilvh_w(b.val, a.val);
+    __m256i ra0 = __lasx_xvilvl_w(d.val, c.val);
+    __m256i ra1 = __lasx_xvilvh_w(d.val, c.val);
+
+    __m256i bgra0_ = __lasx_xvilvl_d(ra0, bg0);
+    __m256i bgra1_ = __lasx_xvilvh_d(ra0, bg0);
+    __m256i bgra2_ = __lasx_xvilvl_d(ra1, bg1);
+    __m256i bgra3_ = __lasx_xvilvh_d(ra1, bg1);
+
+    __m256i bgra0 = __lasx_xvpermi_q(bgra1_, bgra0_, 0 + 2*16);
+    __m256i bgra2 = __lasx_xvpermi_q(bgra1_, bgra0_, 1 + 3*16);
+    __m256i bgra1 = __lasx_xvpermi_q(bgra3_, bgra2_, 0 + 2*16);
+    __m256i bgra3 = __lasx_xvpermi_q(bgra3_, bgra2_, 1 + 3*16);
+
+    __lasx_xvst(bgra0, (__m256i*)ptr, 0);
+    __lasx_xvst(bgra1, (__m256i*)ptr, 8*4);
+    __lasx_xvst(bgra2, (__m256i*)ptr, 16*4);
+    __lasx_xvst(bgra3, (__m256i*)ptr, 24*4);
+}
+
+inline void v_store_interleave( uint64* ptr, const v_uint64x4& a, const v_uint64x4& b,
+                                const v_uint64x4& c, const v_uint64x4& d,
+                                hal::StoreMode /*mode*/=hal::STORE_UNALIGNED )
+{
+    __m256i bg0 = __lasx_xvilvl_d(b.val, a.val);
+    __m256i bg1 = __lasx_xvilvh_d(b.val, a.val);
+    __m256i ra0 = __lasx_xvilvl_d(d.val, c.val);
+    __m256i ra1 = __lasx_xvilvh_d(d.val, c.val);
+
+    __m256i bgra0 = __lasx_xvpermi_q(ra0, bg0, 0 + 2*16);
+    __m256i bgra1 = __lasx_xvpermi_q(ra1, bg1, 0 + 2*16);
+    __m256i bgra2 = __lasx_xvpermi_q(ra0, bg0, 1 + 3*16);
+    __m256i bgra3 = __lasx_xvpermi_q(ra1, bg1, 1 + 3*16);
+
+    __lasx_xvst(bgra0, (__m256i*)ptr, 0);
+    __lasx_xvst(bgra1, (__m256i*)(ptr), 4*8);
+    __lasx_xvst(bgra2, (__m256i*)(ptr), 8*8);
+    __lasx_xvst(bgra3, (__m256i*)(ptr), 12*8);
+}
+
+
+#define OPENCV_HAL_IMPL_LASX_LOADSTORE_INTERLEAVE(_Tpvec0, _Tp0, suffix0, _Tpvec1, _Tp1, suffix1) \
+inline void v_load_deinterleave( const _Tp0* ptr, _Tpvec0& a0, _Tpvec0& b0 ) \
+{ \
+    _Tpvec1 a1, b1; \
+    v_load_deinterleave((const _Tp1*)ptr, a1, b1); \
+    a0 = v_reinterpret_as_##suffix0(a1); \
+    b0 = v_reinterpret_as_##suffix0(b1); \
+} \
+inline void v_load_deinterleave( const _Tp0* ptr, _Tpvec0& a0, _Tpvec0& b0, _Tpvec0& c0 ) \
+{ \
+    _Tpvec1 a1, b1, c1; \
+    v_load_deinterleave((const _Tp1*)ptr, a1, b1, c1); \
+    a0 = v_reinterpret_as_##suffix0(a1); \
+    b0 = v_reinterpret_as_##suffix0(b1); \
+    c0 = v_reinterpret_as_##suffix0(c1); \
+} \
+inline void v_load_deinterleave( const _Tp0* ptr, _Tpvec0& a0, _Tpvec0& b0, _Tpvec0& c0, _Tpvec0& d0 ) \
+{ \
+    _Tpvec1 a1, b1, c1, d1; \
+    v_load_deinterleave((const _Tp1*)ptr, a1, b1, c1, d1); \
+    a0 = v_reinterpret_as_##suffix0(a1); \
+    b0 = v_reinterpret_as_##suffix0(b1); \
+    c0 = v_reinterpret_as_##suffix0(c1); \
+    d0 = v_reinterpret_as_##suffix0(d1); \
+} \
+inline void v_store_interleave( _Tp0* ptr, const _Tpvec0& a0, const _Tpvec0& b0, \
+                                hal::StoreMode /*mode*/=hal::STORE_UNALIGNED ) \
+{ \
+    _Tpvec1 a1 = v_reinterpret_as_##suffix1(a0); \
+    _Tpvec1 b1 = v_reinterpret_as_##suffix1(b0); \
+    v_store_interleave((_Tp1*)ptr, a1, b1/*, mode*/);      \
+} \
+inline void v_store_interleave( _Tp0* ptr, const _Tpvec0& a0, const _Tpvec0& b0, const _Tpvec0& c0, \
+                                hal::StoreMode /*mode*/=hal::STORE_UNALIGNED ) \
+{ \
+    _Tpvec1 a1 = v_reinterpret_as_##suffix1(a0); \
+    _Tpvec1 b1 = v_reinterpret_as_##suffix1(b0); \
+    _Tpvec1 c1 = v_reinterpret_as_##suffix1(c0); \
+    v_store_interleave((_Tp1*)ptr, a1, b1, c1/*, mode*/);  \
+} \
+inline void v_store_interleave( _Tp0* ptr, const _Tpvec0& a0, const _Tpvec0& b0, \
+                                const _Tpvec0& c0, const _Tpvec0& d0, \
+                                hal::StoreMode /*mode*/=hal::STORE_UNALIGNED ) \
+{ \
+    _Tpvec1 a1 = v_reinterpret_as_##suffix1(a0); \
+    _Tpvec1 b1 = v_reinterpret_as_##suffix1(b0); \
+    _Tpvec1 c1 = v_reinterpret_as_##suffix1(c0); \
+    _Tpvec1 d1 = v_reinterpret_as_##suffix1(d0); \
+    v_store_interleave((_Tp1*)ptr, a1, b1, c1, d1/*, mode*/); \
+}
+
+OPENCV_HAL_IMPL_LASX_LOADSTORE_INTERLEAVE(v_int8x32, schar, s8, v_uint8x32, uchar, u8)
+OPENCV_HAL_IMPL_LASX_LOADSTORE_INTERLEAVE(v_int16x16, short, s16, v_uint16x16, ushort, u16)
+OPENCV_HAL_IMPL_LASX_LOADSTORE_INTERLEAVE(v_int32x8, int, s32, v_uint32x8, unsigned, u32)
+OPENCV_HAL_IMPL_LASX_LOADSTORE_INTERLEAVE(v_float32x8, float, f32, v_uint32x8, unsigned, u32)
+OPENCV_HAL_IMPL_LASX_LOADSTORE_INTERLEAVE(v_int64x4, int64, s64, v_uint64x4, uint64, u64)
+OPENCV_HAL_IMPL_LASX_LOADSTORE_INTERLEAVE(v_float64x4, double, f64, v_uint64x4, uint64, u64)
+
+//
+// FP16
+//
+
+inline v_float32x8 v256_load_expand(const hfloat* ptr)
+{
+#if CV_FP16
+    //1-load128, 2-permi, 3-cvt
+   return v_float32x8(__lasx_xvfcvtl_s_h(__lasx_xvpermi_d(__lsx_vld((const __m128i*)ptr, 0), 0x10)));
+#else
+    float CV_DECL_ALIGNED(32) buf[8];
+    for (int i = 0; i < 8; i++)
+        buf[i] = (float)ptr[i];
+    return v256_load_aligned(buf);
+#endif
+}
+
+inline void v_pack_store(hfloat* ptr, const v_float32x8& a)
+{
+#if CV_FP16
+    __m256i ah = __lasx_xvfcvt_h_s(a.val, a.val);
+    __lsx_vst((_m128i)ah, ptr, 0);
+#else
+    float CV_DECL_ALIGNED(32) buf[8];
+    v_store_aligned(buf, a);
+    for (int i = 0; i < 8; i++)
+        ptr[i] = hfloat(buf[i]);
+#endif
+}
+
+//
+// end of FP16
+//
+
+inline void v256_cleanup() {}
+
+#include "intrin_math.hpp"
+inline v_float32x8 v_exp(const v_float32x8& x) { return v_exp_default_32f<v_float32x8, v_int32x8>(x); }
+inline v_float32x8 v_log(const v_float32x8& x) { return v_log_default_32f<v_float32x8, v_int32x8>(x); }
+inline void v_sincos(const v_float32x8& x, v_float32x8& s, v_float32x8& c) { v_sincos_default_32f<v_float32x8, v_int32x8>(x, s, c); }
+inline v_float32x8 v_sin(const v_float32x8& x) { return v_sin_default_32f<v_float32x8, v_int32x8>(x); }
+inline v_float32x8 v_cos(const v_float32x8& x) { return v_cos_default_32f<v_float32x8, v_int32x8>(x); }
+inline v_float32x8 v_erf(const v_float32x8& x) { return v_erf_default_32f<v_float32x8, v_int32x8>(x); }
+
+inline v_float64x4 v_exp(const v_float64x4& x) { return v_exp_default_64f<v_float64x4, v_int64x4>(x); }
+inline v_float64x4 v_log(const v_float64x4& x) { return v_log_default_64f<v_float64x4, v_int64x4>(x); }
+inline void v_sincos(const v_float64x4& x, v_float64x4& s, v_float64x4& c) { v_sincos_default_64f<v_float64x4, v_int64x4>(x, s, c); }
+inline v_float64x4 v_sin(const v_float64x4& x) { return v_sin_default_64f<v_float64x4, v_int64x4>(x); }
+inline v_float64x4 v_cos(const v_float64x4& x) { return v_cos_default_64f<v_float64x4, v_int64x4>(x); }
+
+CV_CPU_OPTIMIZATION_HAL_NAMESPACE_END
+
+//! @endcond
+
+} // cv::
+
+#endif // OPENCV_HAL_INTRIN_LASX_HPP
diff --git a/3rdParty/opencv-4.12.0/opencv2/core/hal/intrin_legacy_ops.h b/3rdParty/opencv-4.12.0/opencv2/core/hal/intrin_legacy_ops.h
new file mode 100644
index 0000000000..397228a64e
--- /dev/null
+++ b/3rdParty/opencv-4.12.0/opencv2/core/hal/intrin_legacy_ops.h
@@ -0,0 +1,111 @@
+// This file is part of OpenCV project.
+// It is subject to the license terms in the LICENSE file found in the top-level directory
+// of this distribution and at http://opencv.org/license.html
+
+// This file has been created for compatibility with older versions of Universal Intrinscs
+// Binary operators for vector types has been removed since version 4.11
+// Include this file manually after OpenCV headers if you need these operators
+
+#ifndef OPENCV_HAL_INTRIN_LEGACY_OPS_HPP
+#define OPENCV_HAL_INTRIN_LEGACY_OPS_HPP
+
+#ifdef __OPENCV_BUILD
+#error "Universal Intrinsics operators are deprecated and should not be used in OpenCV library"
+#endif
+
+#ifdef __riscv
+#warning "Operators might conflict with built-in functions on RISC-V platform"
+#endif
+
+#if defined(CV_VERSION) && CV_VERSION_MAJOR == 4 && CV_VERSION_MINOR < 9
+#warning "Older versions of OpenCV (<4.9) already have Universal Intrinscs operators"
+#endif
+
+
+namespace cv { namespace hal {
+
+#define BIN_OP(OP, FUN) \
+template <typename R> R operator OP (const R & lhs, const R & rhs) { return FUN(lhs, rhs); }
+
+#define BIN_A_OP(OP, FUN) \
+template <typename R> R & operator OP (R & res, const R & val) { res = FUN(res, val); return res; }
+
+#define UN_OP(OP, FUN) \
+template <typename R> R operator OP (const R & val) { return FUN(val); }
+
+BIN_OP(+, v_add)
+BIN_OP(-, v_sub)
+BIN_OP(*, v_mul)
+BIN_OP(/, v_div)
+BIN_OP(&, v_and)
+BIN_OP(|, v_or)
+BIN_OP(^, v_xor)
+
+BIN_OP(==, v_eq)
+BIN_OP(!=, v_ne)
+BIN_OP(<, v_lt)
+BIN_OP(>, v_gt)
+BIN_OP(<=, v_le)
+BIN_OP(>=, v_ge)
+
+BIN_A_OP(+=, v_add)
+BIN_A_OP(-=, v_sub)
+BIN_A_OP(*=, v_mul)
+BIN_A_OP(/=, v_div)
+BIN_A_OP(&=, v_and)
+BIN_A_OP(|=, v_or)
+BIN_A_OP(^=, v_xor)
+
+UN_OP(~, v_not)
+
+// TODO: shift operators?
+
+}} // cv::hal::
+
+//==============================================================================
+
+#ifdef OPENCV_ENABLE_INLINE_INTRIN_OPERATOR_TEST
+
+namespace cv { namespace hal {
+
+inline static void opencv_operator_compile_test()
+{
+    using namespace cv;
+    v_float32 a, b, c;
+    uint8_t shift = 1;
+    a = b + c;
+    a = b - c;
+    a = b * c;
+    a = b / c;
+    a = b & c;
+    a = b | c;
+    a = b ^ c;
+    // a = b >> shift;
+    // a = b << shift;
+
+    a = (b == c);
+    a = (b != c);
+    a = (b < c);}}
+    a = (b > c);
+    a = (b <= c);
+    a = (b >= c);
+
+    a += b;
+    a -= b;
+    a *= b;
+    a /= b;
+    a &= b;
+    a |= b;
+    a ^= b;
+    // a <<= shift;
+    // a >>= shift;
+
+    a = ~b;
+}
+
+}} // cv::hal::
+
+#endif
+
+
+#endif // OPENCV_HAL_INTRIN_LEGACY_OPS_HPP
diff --git a/3rdParty/opencv-4.12.0/opencv2/core/hal/intrin_lsx.hpp b/3rdParty/opencv-4.12.0/opencv2/core/hal/intrin_lsx.hpp
new file mode 100644
index 0000000000..e89c9e5a47
--- /dev/null
+++ b/3rdParty/opencv-4.12.0/opencv2/core/hal/intrin_lsx.hpp
@@ -0,0 +1,2546 @@
+// This file is part of OpenCV project.
+// It is subject to the license terms in the LICENSE file found in the top-level directory
+// of this distribution and at http://opencv.org/license.html
+
+#ifndef OPENCV_HAL_INTRIN_LSX_HPP
+#define OPENCV_HAL_INTRIN_LSX_HPP
+
+#include <lsxintrin.h>
+
+#define CV_SIMD128 1
+#define CV_SIMD128_64F 1
+#define CV_SIMD128_FP16 0
+
+namespace cv
+{
+
+//! @cond IGNORED
+
+CV_CPU_OPTIMIZATION_HAL_NAMESPACE_BEGIN
+
+/////////// Utils ////////
+
+inline __m128i _v128_setr_b(char v0, char v1, char v2, char v3, char v4, char v5, char v6,
+        char v7, char v8, char v9, char v10, char v11, char v12, char v13, char v14, char v15)
+{
+    return (__m128i)v16i8{ v0, v1, v2, v3, v4, v5, v6, v7,
+                           v8, v9, v10, v11, v12, v13, v14, v15 };
+}
+
+inline __m128i _v128_set_b(char v0, char v1, char v2, char v3, char v4, char v5, char v6,
+        char v7, char v8, char v9, char v10, char v11, char v12, char v13, char v14, char v15)
+{
+    return (__m128i)v16i8{ v15, v14, v13, v12, v11, v10, v9, v8,
+                           v7, v6, v5, v4, v3, v2, v1, v0 };
+}
+
+inline __m128i _v128_setr_h(short v0, short v1, short v2, short v3, short v4, short v5,
+       short v6, short v7)
+{
+    return (__m128i)v8i16{ v0, v1, v2, v3, v4, v5, v6, v7 };
+}
+
+inline __m128i _v128_setr_w(int v0, int v1, int v2, int v3)
+{
+    return (__m128i)v4i32{ v0, v1, v2, v3 };
+}
+
+inline __m128i _v128_set_w(int v0, int v1, int v2, int v3)
+{
+    return (__m128i)v4i32{ v3, v2, v1, v0 };
+}
+
+inline __m128i _v128_setall_w(int v0)
+{
+    return __lsx_vreplgr2vr_w(v0);
+}
+
+inline __m128i _v128_setr_d(int64 v0, int64 v1)
+{
+    return (__m128i)v2i64{ v0, v1 };
+}
+
+inline __m128i _v128_set_d(int64 v0, int64 v1)
+{
+    return (__m128i)v2i64{ v1, v0 };
+}
+
+inline __m128 _v128_setr_ps(float v0, float v1, float v2, float v3)
+{
+    return (__m128)v4f32{ v0, v1, v2, v3 };
+}
+
+inline __m128 _v128_setall_ps(float v0)
+{
+    return (__m128)v4f32{ v0, v0, v0, v0 };
+}
+
+inline __m128d _v128_setr_pd(double v0, double v1)
+{
+    return (__m128d)v2f64{ v0, v1 };
+}
+
+inline __m128d _v128_setall_pd(double v0)
+{
+    return (__m128d)v2f64{ v0, v0 };
+}
+
+inline __m128i _lsx_packus_h(const __m128i& a, const __m128i& b)
+{
+    return __lsx_vssrarni_bu_h(b, a, 0);
+}
+
+inline __m128i _lsx_packs_h(const __m128i& a, const __m128i& b)
+{
+    return __lsx_vssrarni_b_h(b, a, 0);
+}
+
+inline __m128i _lsx_packus_w(const __m128i& a, const __m128i& b)
+{
+    return __lsx_vssrarni_hu_w(b, a, 0);
+}
+
+/////// Types ///////
+
+struct v_uint8x16
+{
+    typedef uchar lane_type;
+    enum { nlanes = 16};
+
+    v_uint8x16() {}
+    explicit v_uint8x16(__m128i v): val(v) {}
+    v_uint8x16(uchar v0, uchar v1, uchar v2, uchar v3, uchar v4, uchar v5, uchar v6, uchar v7,
+             uchar v8, uchar v9, uchar v10, uchar v11, uchar v12, uchar v13, uchar v14, uchar v15)
+    {
+        val = _v128_setr_b(v0, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15);
+    }
+
+    uchar get0() const
+    {
+        return (uchar)__lsx_vpickve2gr_bu(val, 0);
+    }
+
+    __m128i val;
+};
+
+struct v_int8x16
+{
+    typedef schar lane_type;
+    enum { nlanes = 16 };
+
+    v_int8x16() {}
+    explicit v_int8x16(__m128i v) : val(v) {}
+    v_int8x16(schar v0, schar v1, schar v2, schar v3, schar v4, schar v5, schar v6, schar v7,
+            schar v8, schar v9, schar v10, schar v11, schar v12, schar v13, schar v14, schar v15)
+    {
+        val = _v128_setr_b(v0, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15);
+    }
+
+    schar get0() const
+    {
+        return (schar)__lsx_vpickve2gr_b(val, 0);
+    }
+
+    __m128i val;
+};
+
+struct v_uint16x8
+{
+    typedef ushort lane_type;
+    enum { nlanes = 8 };
+
+    v_uint16x8() {}
+    explicit v_uint16x8(__m128i v) : val(v) {}
+    v_uint16x8(ushort v0, ushort v1, ushort v2, ushort v3, ushort v4, ushort v5, ushort v6, ushort v7)
+    {
+        val = _v128_setr_h(v0, v1, v2, v3, v4, v5, v6, v7);
+    }
+
+    ushort get0() const
+    {
+        return (ushort)__lsx_vpickve2gr_hu(val, 0);
+    }
+
+    __m128i val;
+};
+
+struct v_int16x8
+{
+    typedef short lane_type;
+    enum { nlanes = 8 };
+
+    v_int16x8() {}
+    explicit v_int16x8(__m128i v) : val(v) {}
+    v_int16x8(short v0, short v1, short v2, short v3, short v4, short v5, short v6, short v7)
+    {
+        val = _v128_setr_h(v0, v1, v2, v3, v4, v5, v6, v7);
+    }
+
+    short get0() const
+    {
+        return (short)__lsx_vpickve2gr_h(val, 0);
+    }
+
+    __m128i val;
+};
+
+struct v_uint32x4
+{
+    typedef unsigned lane_type;
+    enum { nlanes = 4 };
+
+    v_uint32x4() {}
+    explicit v_uint32x4(__m128i v) : val(v) {}
+    v_uint32x4(unsigned v0, unsigned v1, unsigned v2, unsigned v3)
+    {
+        val = _v128_setr_w(v0, v1, v2, v3);
+    }
+
+    unsigned get0() const
+    {
+        return (unsigned)__lsx_vpickve2gr_wu(val, 0);
+    }
+
+    __m128i val;
+};
+
+struct v_int32x4
+{
+    typedef int lane_type;
+    enum { nlanes = 4 };
+
+    v_int32x4() {}
+    explicit v_int32x4(__m128i v) : val(v) {}
+    v_int32x4(int v0, int v1, int v2, int v3)
+    {
+        val = _v128_setr_w(v0, v1, v2, v3);
+    }
+
+    int get0() const
+    {
+        return (int)__lsx_vpickve2gr_w(val, 0);
+    }
+
+    __m128i val;
+};
+
+struct v_float32x4
+{
+    typedef float lane_type;
+    enum { nlanes = 4};
+
+    v_float32x4() {}
+    explicit v_float32x4(__m128 v) : val(v) {}
+    explicit v_float32x4(__m128i v) { val = *((__m128*)&v); }
+    v_float32x4(float v0, float v1, float v2, float v3)
+    {
+        val = _v128_setr_ps(v0, v1, v2, v3);
+    }
+
+    float get0() const
+    {
+        union { int iv; float fv; } d;
+        d.iv = __lsx_vpickve2gr_w(val, 0);
+        return d.fv;
+    }
+
+    int get0toint() const
+    {
+        __m128i result = __lsx_vftintrz_w_s(val);
+        return (int)__lsx_vpickve2gr_w(result, 0);
+    }
+
+    __m128 val;
+};
+
+struct v_uint64x2
+{
+    typedef uint64 lane_type;
+    enum { nlanes = 2};
+
+    v_uint64x2() {}
+    explicit v_uint64x2(__m128i v) : val(v) {}
+    v_uint64x2(uint64 v0, uint64 v1)
+    {
+        val = _v128_setr_d(v0, v1);
+    }
+
+    uint64 get0() const
+    {
+        return __lsx_vpickve2gr_du(val, 0);
+    }
+
+    __m128i val;
+};
+
+struct v_int64x2
+{
+    typedef int64 lane_type;
+    enum { nlanes = 2};
+
+    v_int64x2() {}
+    explicit v_int64x2(__m128i v) : val(v) {}
+    v_int64x2(int64 v0, int64 v1)
+    {
+        val = _v128_setr_d(v0, v1);
+    }
+
+    uint64 get0() const
+    {
+        return __lsx_vpickve2gr_d(val, 0);
+    }
+
+    __m128i val;
+};
+
+struct v_float64x2
+{
+    typedef double lane_type;
+    enum { nlanes = 2};
+
+    v_float64x2() {}
+    explicit v_float64x2(__m128d v) : val(v) {}
+    explicit v_float64x2(__m128i v) { val = *((__m128d*)&v); }
+    v_float64x2(double v0, double v1)
+    {
+        val = _v128_setr_pd(v0, v1);
+    }
+
+    double get0() const
+    {
+        union { int64 iv; double fv; } d;
+        d.iv = __lsx_vpickve2gr_d(val, 0);
+        return d.fv;
+    }
+
+    int64 get0toint64() const
+    {
+        __m128i result = __lsx_vftintrz_l_d(val);
+        return (int64)__lsx_vpickve2gr_d(result, 0);
+    }
+
+    __m128d val;
+};
+
+////////////// Load and store operations /////////
+
+#define OPENCV_HAL_IMPL_LSX_LOADSTORE(_Tpvec, _Tp)                     \
+    inline _Tpvec v_load(const _Tp* ptr)                               \
+    { return _Tpvec(__lsx_vld(ptr, 0)); }                              \
+    inline _Tpvec v_load_aligned(const _Tp* ptr)                       \
+    { return _Tpvec(__lsx_vld(ptr, 0)); }                              \
+    inline _Tpvec v_load_low(const _Tp* ptr)                           \
+    { return _Tpvec(__lsx_vldrepl_d(ptr, 0)); }                        \
+    inline _Tpvec v_load_halves(const _Tp* ptr0, const _Tp* ptr1)      \
+    {                                                                  \
+        __m128i vl = __lsx_vldrepl_d(ptr0, 0);                         \
+        __m128i vh = __lsx_vldrepl_d(ptr1, 0);                         \
+        return _Tpvec(__lsx_vilvl_d(vh, vl));                          \
+    }                                                                  \
+    inline void v_store(_Tp* ptr, const _Tpvec& a)                     \
+    { __lsx_vst(a.val, ptr, 0); }                                      \
+    inline void v_store_aligned(_Tp* ptr, const _Tpvec& a)             \
+    { __lsx_vst(a.val, ptr, 0); }                                      \
+    inline void v_store_aligned_nocache(_Tp* ptr, const _Tpvec& a)     \
+    { __lsx_vst(a.val, ptr, 0); }                                      \
+    inline void v_store(_Tp* ptr, const _Tpvec& a, hal::StoreMode mode)\
+    {                                                                  \
+        if ( mode == hal::STORE_UNALIGNED)                             \
+            __lsx_vst(a.val, ptr, 0);                                  \
+        else if ( mode == hal::STORE_ALIGNED_NOCACHE)                  \
+            __lsx_vst(a.val, ptr, 0);                                  \
+        else                                                           \
+            __lsx_vst(a.val, ptr, 0);                                  \
+    }                                                                  \
+    inline void v_store_low(_Tp* ptr, const _Tpvec& a)                 \
+    {  __lsx_vstelm_d(a.val, ptr, 0, 0); }                             \
+    inline void v_store_high(_Tp* ptr, const _Tpvec& a)                \
+    {  __lsx_vstelm_d(a.val, ptr, 0, 1); }                             \
+
+OPENCV_HAL_IMPL_LSX_LOADSTORE(v_uint8x16,  uchar)
+OPENCV_HAL_IMPL_LSX_LOADSTORE(v_int8x16,   schar)
+OPENCV_HAL_IMPL_LSX_LOADSTORE(v_uint16x8, ushort)
+OPENCV_HAL_IMPL_LSX_LOADSTORE(v_int16x8,  short)
+OPENCV_HAL_IMPL_LSX_LOADSTORE(v_uint32x4,  unsigned)
+OPENCV_HAL_IMPL_LSX_LOADSTORE(v_int32x4,   int)
+OPENCV_HAL_IMPL_LSX_LOADSTORE(v_uint64x2,  uint64)
+OPENCV_HAL_IMPL_LSX_LOADSTORE(v_int64x2,   int64)
+
+#define OPENCV_HAL_IMPL_LSX_LOADSTORE_FLT(_Tpvec, _Tp, halfreg)        \
+    inline _Tpvec v_load(const _Tp* ptr)                               \
+    { return _Tpvec((halfreg)__lsx_vld(ptr, 0)); }                     \
+    inline _Tpvec v_load_aligned(const _Tp* ptr)                       \
+    { return _Tpvec((halfreg)__lsx_vld(ptr, 0)); }                     \
+    inline _Tpvec v_load_low(const _Tp* ptr)                           \
+    { return _Tpvec((halfreg)__lsx_vldrepl_d(ptr, 0)); }               \
+    inline _Tpvec v_load_halves(const _Tp* ptr0, const _Tp* ptr1)      \
+    {                                                                  \
+        __m128i vl = __lsx_vldrepl_d(ptr0, 0);                         \
+        __m128i vh = __lsx_vldrepl_d(ptr1, 0);                         \
+        return _Tpvec((halfreg)__lsx_vilvl_d(vh, vl));                 \
+    }                                                                  \
+    inline void v_store(_Tp* ptr, const _Tpvec& a)                     \
+    {  __lsx_vst((__m128i)a.val, ptr, 0); }                            \
+    inline void v_store_aligned(_Tp* ptr, const _Tpvec& a)             \
+    {  __lsx_vst((__m128i)a.val, ptr, 0); }                            \
+    inline void v_store_aligned_nocache(_Tp* ptr, const _Tpvec& a)     \
+    {  __lsx_vst((__m128i)a.val, ptr, 0); }                            \
+    inline void v_store(_Tp* ptr, const _Tpvec& a, hal::StoreMode mode)\
+    {                                                                  \
+        if( mode == hal::STORE_UNALIGNED)                              \
+            __lsx_vst((__m128i)a.val, ptr, 0);                         \
+        else if( mode == hal::STORE_ALIGNED_NOCACHE)                   \
+            __lsx_vst((__m128i)a.val, ptr, 0);                         \
+        else                                                           \
+            __lsx_vst((__m128i)a.val, ptr, 0);                         \
+    }                                                                  \
+    inline void v_store_low(_Tp* ptr, const _Tpvec& a)                 \
+    {  __lsx_vstelm_d((__m128i)a.val, ptr, 0, 0); }                    \
+    inline void v_store_high(_Tp* ptr, const _Tpvec& a)                \
+    {  __lsx_vstelm_d((__m128i)a.val, ptr, 0, 1); }                    \
+
+OPENCV_HAL_IMPL_LSX_LOADSTORE_FLT(v_float32x4, float, __m128)
+OPENCV_HAL_IMPL_LSX_LOADSTORE_FLT(v_float64x2, double, __m128d)
+
+inline __m128i _lsx_128_castps_si128(const __m128& v)
+{ return __m128i(v); }
+
+inline __m128i _lsx_128_castpd_si128(const __m128d& v)
+{ return __m128i(v); }
+
+#define OPENCV_HAL_IMPL_LSX_CAST(_Tpvec, _Tpvecf, suffix, cast)  \
+    inline _Tpvec v_reinterpret_as_##suffix(const _Tpvecf& a)    \
+    { return _Tpvec(cast(a.val)); }
+
+#define OPENCV_HAL_IMPL_LSX_INIT(_Tpvec, _Tp, suffix, ssuffix, ctype_s)           \
+    inline _Tpvec v_setzero_##suffix()                                            \
+    { return _Tpvec(__lsx_vldi(0)); }                                             \
+    inline _Tpvec v_setall_##suffix(_Tp v)                                        \
+    { return _Tpvec(__lsx_vreplgr2vr_##ssuffix((ctype_s)v)); }                    \
+    template <> inline _Tpvec v_setzero_()                                        \
+    { return v_setzero_##suffix(); }                                              \
+    template <> inline _Tpvec v_setall_(_Tp v)                                    \
+    { return v_setall_##suffix(v); }                                              \
+    OPENCV_HAL_IMPL_LSX_CAST(_Tpvec, v_uint8x16,  suffix, OPENCV_HAL_NOP)         \
+    OPENCV_HAL_IMPL_LSX_CAST(_Tpvec, v_int8x16,   suffix, OPENCV_HAL_NOP)         \
+    OPENCV_HAL_IMPL_LSX_CAST(_Tpvec, v_uint16x8,  suffix, OPENCV_HAL_NOP)         \
+    OPENCV_HAL_IMPL_LSX_CAST(_Tpvec, v_int16x8,   suffix, OPENCV_HAL_NOP)         \
+    OPENCV_HAL_IMPL_LSX_CAST(_Tpvec, v_uint32x4,  suffix, OPENCV_HAL_NOP)         \
+    OPENCV_HAL_IMPL_LSX_CAST(_Tpvec, v_int32x4,   suffix, OPENCV_HAL_NOP)         \
+    OPENCV_HAL_IMPL_LSX_CAST(_Tpvec, v_uint64x2,  suffix, OPENCV_HAL_NOP)         \
+    OPENCV_HAL_IMPL_LSX_CAST(_Tpvec, v_int64x2,   suffix, OPENCV_HAL_NOP)         \
+    OPENCV_HAL_IMPL_LSX_CAST(_Tpvec, v_float32x4, suffix, _lsx_128_castps_si128)  \
+    OPENCV_HAL_IMPL_LSX_CAST(_Tpvec, v_float64x2, suffix, _lsx_128_castpd_si128)  \
+
+OPENCV_HAL_IMPL_LSX_INIT(v_uint8x16,  uchar,    u8,   b,  int)
+OPENCV_HAL_IMPL_LSX_INIT(v_int8x16,   schar,    s8,   b,  int)
+OPENCV_HAL_IMPL_LSX_INIT(v_uint16x8,  ushort,   u16,  h,  int)
+OPENCV_HAL_IMPL_LSX_INIT(v_int16x8,   short,    s16,  h,  int)
+OPENCV_HAL_IMPL_LSX_INIT(v_uint32x4,  unsigned, u32,  w,  int)
+OPENCV_HAL_IMPL_LSX_INIT(v_int32x4,   int,      s32,  w,  int)
+OPENCV_HAL_IMPL_LSX_INIT(v_uint64x2,  uint64,   u64,  d,  long int)
+OPENCV_HAL_IMPL_LSX_INIT(v_int64x2,   int64,    s64,  d,  long int)
+
+inline __m128 _lsx_128_castsi128_ps(const __m128i &v)
+{ return __m128(v); }
+
+inline __m128d _lsx_128_castsi128_pd(const __m128i &v)
+{ return __m128d(v); }
+
+#define OPENCV_HAL_IMPL_LSX_INIT_FLT(_Tpvec, _Tp, suffix, zsuffix, cast)    \
+    inline _Tpvec v_setzero_##suffix()                                      \
+    { return _Tpvec(__lsx_vldi(0)); }                                       \
+    inline _Tpvec v_setall_##suffix(_Tp v)                                  \
+    { return _Tpvec(_v128_setall_##zsuffix(v)); }                           \
+    template <> inline _Tpvec v_setzero_()                                  \
+    { return v_setzero_##suffix(); }                                        \
+    template <> inline _Tpvec v_setall_(_Tp v)                              \
+    { return v_setall_##suffix(v); }                                        \
+    OPENCV_HAL_IMPL_LSX_CAST(_Tpvec, v_uint8x16,     suffix,   cast)        \
+    OPENCV_HAL_IMPL_LSX_CAST(_Tpvec, v_int8x16,      suffix,   cast)        \
+    OPENCV_HAL_IMPL_LSX_CAST(_Tpvec, v_uint16x8,     suffix,   cast)        \
+    OPENCV_HAL_IMPL_LSX_CAST(_Tpvec, v_int16x8,      suffix,   cast)        \
+    OPENCV_HAL_IMPL_LSX_CAST(_Tpvec, v_uint32x4,     suffix,   cast)        \
+    OPENCV_HAL_IMPL_LSX_CAST(_Tpvec, v_int32x4,      suffix,   cast)        \
+    OPENCV_HAL_IMPL_LSX_CAST(_Tpvec, v_uint64x2,     suffix,   cast)        \
+    OPENCV_HAL_IMPL_LSX_CAST(_Tpvec, v_int64x2,      suffix,   cast)        \
+
+OPENCV_HAL_IMPL_LSX_INIT_FLT(v_float32x4, float,  f32, ps, _lsx_128_castsi128_ps)
+OPENCV_HAL_IMPL_LSX_INIT_FLT(v_float64x2, double, f64, pd, _lsx_128_castsi128_pd)
+
+inline v_float32x4 v_reinterpret_as_f32(const v_float32x4& a)
+{ return a; }
+inline v_float32x4 v_reinterpret_as_f32(const v_float64x2& a)
+{ return v_float32x4(_lsx_128_castps_si128(__m128(a.val))); }
+
+inline v_float64x2 v_reinterpret_as_f64(const v_float64x2& a)
+{ return a; }
+inline v_float64x2 v_reinterpret_as_f64(const v_float32x4& a)
+{ return v_float64x2(_lsx_128_castpd_si128(__m128d(a.val))); }
+
+//////////////// Variant Value reordering ///////////////
+
+// unpacks
+#define OPENCV_HAL_IMPL_LSX_UNPACK(_Tpvec, suffix)                            \
+    inline _Tpvec v128_unpacklo(const _Tpvec& a, const _Tpvec& b)             \
+    { return _Tpvec(__lsx_vilvl_##suffix(__m128i(b.val), __m128i(a.val))); }  \
+    inline _Tpvec v128_unpackhi(const _Tpvec& a, const _Tpvec& b)             \
+    { return _Tpvec(__lsx_vilvh_##suffix(__m128i(b.val), __m128i(a.val))); }  \
+
+OPENCV_HAL_IMPL_LSX_UNPACK(v_uint8x16,  b)
+OPENCV_HAL_IMPL_LSX_UNPACK(v_int8x16,   b)
+OPENCV_HAL_IMPL_LSX_UNPACK(v_uint16x8,  h)
+OPENCV_HAL_IMPL_LSX_UNPACK(v_int16x8,   h)
+OPENCV_HAL_IMPL_LSX_UNPACK(v_uint32x4,  w)
+OPENCV_HAL_IMPL_LSX_UNPACK(v_int32x4,   w)
+OPENCV_HAL_IMPL_LSX_UNPACK(v_uint64x2,  d)
+OPENCV_HAL_IMPL_LSX_UNPACK(v_int64x2,   d)
+OPENCV_HAL_IMPL_LSX_UNPACK(v_float32x4, w)
+OPENCV_HAL_IMPL_LSX_UNPACK(v_float64x2, d)
+
+//ZIP
+#define OPENCV_HAL_IMPL_LSX_ZIP(_Tpvec)                               \
+    inline _Tpvec v_combine_low(const _Tpvec& a, const _Tpvec& b)     \
+    { return (_Tpvec)__lsx_vilvl_d((__m128i)b.val, (__m128i)a.val); } \
+    inline _Tpvec v_combine_high(const _Tpvec& a, const _Tpvec& b)    \
+    { return (_Tpvec)__lsx_vilvh_d((__m128i)b.val, (__m128i)a.val); } \
+    inline void v_recombine(const _Tpvec& a, const _Tpvec& b,         \
+                            _Tpvec& c, _Tpvec& d)                     \
+    {                                                                 \
+        __m128i a1 = (__m128i)a.val,  b1 = (__m128i)b.val;            \
+        c = _Tpvec(__lsx_vilvl_d(b1, a1));                            \
+        d = _Tpvec(__lsx_vilvh_d(b1, a1));                            \
+    }                                                                 \
+    inline void v_zip(const _Tpvec& a, const _Tpvec& b,               \
+                      _Tpvec& ab0, _Tpvec& ab1)                       \
+    {                                                                 \
+        ab0 = v128_unpacklo(a, b);                                    \
+        ab1 = v128_unpackhi(a, b);                                    \
+    }
+
+OPENCV_HAL_IMPL_LSX_ZIP(v_uint8x16)
+OPENCV_HAL_IMPL_LSX_ZIP(v_int8x16)
+OPENCV_HAL_IMPL_LSX_ZIP(v_uint16x8)
+OPENCV_HAL_IMPL_LSX_ZIP(v_int16x8)
+OPENCV_HAL_IMPL_LSX_ZIP(v_uint32x4)
+OPENCV_HAL_IMPL_LSX_ZIP(v_int32x4)
+OPENCV_HAL_IMPL_LSX_ZIP(v_uint64x2)
+OPENCV_HAL_IMPL_LSX_ZIP(v_int64x2)
+OPENCV_HAL_IMPL_LSX_ZIP(v_float32x4)
+OPENCV_HAL_IMPL_LSX_ZIP(v_float64x2)
+
+////////// Arithmetic, bitwise and comparison operations /////////
+
+/** Arithmetics **/
+#define OPENCV_HAL_IMPL_LSX_BIN_OP(bin_op, _Tpvec, intrin)           \
+    inline _Tpvec bin_op(const _Tpvec& a, const _Tpvec& b)  \
+    { return _Tpvec(intrin(a.val, b.val)); }
+
+OPENCV_HAL_IMPL_LSX_BIN_OP(v_add, v_uint8x16,  __lsx_vsadd_bu)
+OPENCV_HAL_IMPL_LSX_BIN_OP(v_sub, v_uint8x16,  __lsx_vssub_bu)
+OPENCV_HAL_IMPL_LSX_BIN_OP(v_add, v_int8x16,   __lsx_vsadd_b)
+OPENCV_HAL_IMPL_LSX_BIN_OP(v_sub, v_int8x16,   __lsx_vssub_b)
+OPENCV_HAL_IMPL_LSX_BIN_OP(v_add, v_uint16x8,  __lsx_vsadd_hu)
+OPENCV_HAL_IMPL_LSX_BIN_OP(v_sub, v_uint16x8,  __lsx_vssub_hu)
+OPENCV_HAL_IMPL_LSX_BIN_OP(v_add, v_int16x8,   __lsx_vsadd_h)
+OPENCV_HAL_IMPL_LSX_BIN_OP(v_sub, v_int16x8,   __lsx_vssub_h)
+OPENCV_HAL_IMPL_LSX_BIN_OP(v_add, v_uint32x4,  __lsx_vadd_w)
+OPENCV_HAL_IMPL_LSX_BIN_OP(v_sub, v_uint32x4,  __lsx_vsub_w)
+OPENCV_HAL_IMPL_LSX_BIN_OP(v_mul, v_uint32x4,  __lsx_vmul_w)
+OPENCV_HAL_IMPL_LSX_BIN_OP(v_add, v_int32x4,   __lsx_vadd_w)
+OPENCV_HAL_IMPL_LSX_BIN_OP(v_sub, v_int32x4,   __lsx_vsub_w)
+OPENCV_HAL_IMPL_LSX_BIN_OP(v_mul, v_int32x4,   __lsx_vmul_w)
+OPENCV_HAL_IMPL_LSX_BIN_OP(v_add, v_uint64x2,  __lsx_vadd_d)
+OPENCV_HAL_IMPL_LSX_BIN_OP(v_sub, v_uint64x2,  __lsx_vsub_d)
+OPENCV_HAL_IMPL_LSX_BIN_OP(v_add, v_int64x2,   __lsx_vadd_d)
+OPENCV_HAL_IMPL_LSX_BIN_OP(v_sub, v_int64x2,   __lsx_vsub_d)
+
+OPENCV_HAL_IMPL_LSX_BIN_OP(v_add, v_float32x4, __lsx_vfadd_s)
+OPENCV_HAL_IMPL_LSX_BIN_OP(v_sub, v_float32x4, __lsx_vfsub_s)
+OPENCV_HAL_IMPL_LSX_BIN_OP(v_mul, v_float32x4, __lsx_vfmul_s)
+OPENCV_HAL_IMPL_LSX_BIN_OP(v_div, v_float32x4, __lsx_vfdiv_s)
+OPENCV_HAL_IMPL_LSX_BIN_OP(v_add, v_float64x2, __lsx_vfadd_d)
+OPENCV_HAL_IMPL_LSX_BIN_OP(v_sub, v_float64x2, __lsx_vfsub_d)
+OPENCV_HAL_IMPL_LSX_BIN_OP(v_mul, v_float64x2, __lsx_vfmul_d)
+OPENCV_HAL_IMPL_LSX_BIN_OP(v_div, v_float64x2, __lsx_vfdiv_d)
+
+// saturating multiply 8-bit, 16-bit
+inline v_uint8x16 v_mul(const v_uint8x16& a, const v_uint8x16& b)
+{
+    v_uint16x8 c, d;
+    v_mul_expand(a, b, c, d);
+    return v_pack(c, d);
+}
+inline v_int8x16 v_mul(const v_int8x16& a, const v_int8x16& b)
+{
+    v_int16x8 c, d;
+    v_mul_expand(a, b, c, d);
+    return v_pack(c, d);
+}
+inline v_uint16x8 v_mul(const v_uint16x8& a, const v_uint16x8& b)
+{
+    __m128i a0 = a.val, b0 = b.val;
+    __m128i pev = __lsx_vmulwev_w_hu(a0, b0);
+    __m128i pod = __lsx_vmulwod_w_hu(a0, b0);
+    __m128i pl  = __lsx_vilvl_w(pod, pev);
+    __m128i ph  = __lsx_vilvh_w(pod, pev);
+    return (v_uint16x8)__lsx_vssrlrni_hu_w(ph, pl, 0);
+}
+inline v_int16x8 v_mul(const v_int16x8& a, const v_int16x8& b)
+{
+    __m128i a0 = a.val, b0 = b.val;
+    __m128i pev = __lsx_vmulwev_w_h(a0, b0);
+    __m128i pod = __lsx_vmulwod_w_h(a0, b0);
+    __m128i pl  = __lsx_vilvl_w(pod, pev);
+    __m128i ph  = __lsx_vilvh_w(pod, pev);
+    return (v_int16x8)__lsx_vssrarni_h_w(ph, pl, 0);
+}
+
+/** Non-saturating arithmetics **/
+
+#define OPENCV_HAL_IMPL_LSX_BIN_FUNC(func, _Tpvec, intrin)         \
+    inline _Tpvec func(const _Tpvec& a, const _Tpvec& b)           \
+    { return _Tpvec(intrin(a.val, b.val)); }                       \
+
+OPENCV_HAL_IMPL_LSX_BIN_FUNC(v_add_wrap, v_uint8x16,  __lsx_vadd_b)
+OPENCV_HAL_IMPL_LSX_BIN_FUNC(v_add_wrap, v_int8x16,   __lsx_vadd_b)
+OPENCV_HAL_IMPL_LSX_BIN_FUNC(v_add_wrap, v_uint16x8,  __lsx_vadd_h)
+OPENCV_HAL_IMPL_LSX_BIN_FUNC(v_add_wrap, v_int16x8,   __lsx_vadd_h)
+OPENCV_HAL_IMPL_LSX_BIN_FUNC(v_sub_wrap, v_uint8x16,  __lsx_vsub_b)
+OPENCV_HAL_IMPL_LSX_BIN_FUNC(v_sub_wrap, v_int8x16,   __lsx_vsub_b)
+OPENCV_HAL_IMPL_LSX_BIN_FUNC(v_sub_wrap, v_uint16x8,  __lsx_vsub_h)
+OPENCV_HAL_IMPL_LSX_BIN_FUNC(v_sub_wrap, v_int16x8,   __lsx_vsub_h)
+OPENCV_HAL_IMPL_LSX_BIN_FUNC(v_mul_wrap, v_uint16x8,  __lsx_vmul_h)
+OPENCV_HAL_IMPL_LSX_BIN_FUNC(v_mul_wrap, v_int16x8,   __lsx_vmul_h)
+
+inline v_uint8x16 v_mul_wrap(const v_uint8x16& a, const v_uint8x16& b)
+{
+    __m128i a0 = a.val, b0 = b.val;
+    __m128i p0 = __lsx_vmulwev_h_bu(a0, b0);
+    __m128i p1 = __lsx_vmulwod_h_bu(a0, b0);
+    return v_uint8x16(__lsx_vpackev_b(p1, p0));
+}
+
+inline v_int8x16 v_mul_wrap(const v_int8x16& a, const v_int8x16& b)
+{
+    return v_reinterpret_as_s8(v_mul_wrap(v_reinterpret_as_u8(a), v_reinterpret_as_u8(b)));
+}
+
+// Multiply and expand
+inline void v_mul_expand(const v_uint8x16& a, const v_uint8x16& b,
+                         v_uint16x8& c, v_uint16x8& d)
+{
+    __m128i a0 = a.val, b0 = b.val;
+    __m128i p0 = __lsx_vmulwev_h_bu(a0, b0);
+    __m128i p1 = __lsx_vmulwod_h_bu(a0, b0);
+    c.val = __lsx_vilvl_h(p1, p0);
+    d.val = __lsx_vilvh_h(p1, p0);
+}
+inline void v_mul_expand(const v_int8x16& a, const v_int8x16& b,
+                         v_int16x8& c, v_int16x8& d)
+{
+    __m128i a0 = a.val, b0 = b.val;
+    __m128i p0 = __lsx_vmulwev_h_b(a0, b0);
+    __m128i p1 = __lsx_vmulwod_h_b(a0, b0);
+    c.val = __lsx_vilvl_h(p1, p0);
+    d.val = __lsx_vilvh_h(p1, p0);
+}
+inline void v_mul_expand(const v_int16x8& a, const v_int16x8& b,
+                         v_int32x4& c, v_int32x4& d)
+{
+    __m128i a0 = a.val, b0 = b.val;
+    __m128i p0 = __lsx_vmulwev_w_h(a0, b0);
+    __m128i p1 = __lsx_vmulwod_w_h(a0, b0);
+    c.val = __lsx_vilvl_w(p1, p0);
+    d.val = __lsx_vilvh_w(p1, p0);
+}
+inline void v_mul_expand(const v_uint16x8& a, const v_uint16x8& b,
+                         v_uint32x4& c, v_uint32x4& d)
+{
+    __m128i a0 = a.val, b0 = b.val;
+    __m128i p0 = __lsx_vmulwev_w_hu(a0, b0);
+    __m128i p1 = __lsx_vmulwod_w_hu(a0, b0);
+    c.val = __lsx_vilvl_w(p1, p0);
+    d.val = __lsx_vilvh_w(p1, p0);
+}
+inline void v_mul_expand(const v_uint32x4& a, const v_uint32x4& b,
+                         v_uint64x2& c, v_uint64x2& d)
+{
+    __m128i a0 = a.val, b0 = b.val;
+    __m128i p0 = __lsx_vmulwev_d_wu(a0, b0);
+    __m128i p1 = __lsx_vmulwod_d_wu(a0, b0);
+    c.val = __lsx_vilvl_d(p1, p0);
+    d.val = __lsx_vilvh_d(p1, p0);
+}
+inline v_int16x8 v_mul_hi(const v_int16x8& a, const v_int16x8& b)
+{ return v_int16x8(__lsx_vmuh_h(a.val, b.val)); }
+inline v_uint16x8 v_mul_hi(const v_uint16x8& a, const v_uint16x8& b)
+{ return v_uint16x8(__lsx_vmuh_hu(a.val, b.val)); }
+
+/** Bitwise shifts **/
+#define OPENCV_HAL_IMPL_LSX_SHIFT_OP(_Tpuvec, _Tpsvec, suffix, srai)                 \
+    inline _Tpuvec v_shl(const _Tpuvec& a, int imm)                                  \
+    { return _Tpuvec(__lsx_vsll_##suffix(a.val, __lsx_vreplgr2vr_##suffix(imm))); }  \
+    inline _Tpsvec v_shl(const _Tpsvec& a, int imm)                                  \
+    { return _Tpsvec(__lsx_vsll_##suffix(a.val, __lsx_vreplgr2vr_##suffix(imm))); }  \
+    inline _Tpuvec v_shr(const _Tpuvec& a, int imm)                                  \
+    { return _Tpuvec(__lsx_vsrl_##suffix(a.val, __lsx_vreplgr2vr_##suffix(imm))); }  \
+    inline _Tpsvec v_shr(const _Tpsvec& a, int imm)                                  \
+    { return _Tpsvec(srai(a.val, __lsx_vreplgr2vr_##suffix(imm))); }                 \
+    template<int imm>                                                                \
+    inline _Tpuvec v_shl(const _Tpuvec& a)                                           \
+    { return _Tpuvec(__lsx_vslli_##suffix(a.val, imm)); }                            \
+    template<int imm>                                                                \
+    inline _Tpsvec v_shl(const _Tpsvec& a)                                           \
+    { return _Tpsvec(__lsx_vslli_##suffix(a.val, imm)); }                            \
+    template<int imm>                                                                \
+    inline _Tpuvec v_shr(const _Tpuvec& a)                                           \
+    { return _Tpuvec(__lsx_vsrli_##suffix(a.val, imm)); }                            \
+    template<int imm>                                                                \
+    inline _Tpsvec v_shr(const _Tpsvec& a)                                           \
+    { return _Tpsvec(__lsx_vsrai_##suffix(a.val, imm)); }                            \
+
+OPENCV_HAL_IMPL_LSX_SHIFT_OP(v_uint16x8, v_int16x8, h, __lsx_vsra_h)
+OPENCV_HAL_IMPL_LSX_SHIFT_OP(v_uint32x4, v_int32x4, w, __lsx_vsra_w)
+OPENCV_HAL_IMPL_LSX_SHIFT_OP(v_uint64x2, v_int64x2, d, __lsx_vsra_d)
+
+/** Bitwise logic **/
+#define OPENCV_HAL_IMPL_LSX_LOGIC_OP(_Tpvec, suffix)                                 \
+    OPENCV_HAL_IMPL_LSX_BIN_OP(v_and, _Tpvec, __lsx_vand_##suffix)                   \
+    OPENCV_HAL_IMPL_LSX_BIN_OP(v_or, _Tpvec, __lsx_vor_##suffix)                     \
+    OPENCV_HAL_IMPL_LSX_BIN_OP(v_xor, _Tpvec, __lsx_vxor_##suffix)                   \
+    inline _Tpvec v_not(const _Tpvec& a)                                             \
+    { return _Tpvec(__lsx_vnori_b(a.val, 0)); }                                      \
+
+OPENCV_HAL_IMPL_LSX_LOGIC_OP(v_uint8x16,   v)
+OPENCV_HAL_IMPL_LSX_LOGIC_OP(v_int8x16,    v)
+OPENCV_HAL_IMPL_LSX_LOGIC_OP(v_uint16x8,   v)
+OPENCV_HAL_IMPL_LSX_LOGIC_OP(v_int16x8,    v)
+OPENCV_HAL_IMPL_LSX_LOGIC_OP(v_uint32x4,   v)
+OPENCV_HAL_IMPL_LSX_LOGIC_OP(v_int32x4,    v)
+OPENCV_HAL_IMPL_LSX_LOGIC_OP(v_uint64x2,   v)
+OPENCV_HAL_IMPL_LSX_LOGIC_OP(v_int64x2,    v)
+
+#define OPENCV_HAL_IMPL_LSX_FLOAT_BIN_OP(bin_op, _Tpvec, intrin, cast)               \
+    inline _Tpvec bin_op(const _Tpvec& a, const _Tpvec& b)                           \
+    { return _Tpvec(intrin((__m128i)(a.val), (__m128i)(b.val))); }
+
+#define OPENCV_HAL_IMPL_LSX_FLOAT_LOGIC_OP(_Tpvec, cast)                             \
+    OPENCV_HAL_IMPL_LSX_FLOAT_BIN_OP(v_and, _Tpvec, __lsx_vand_v, cast)              \
+    OPENCV_HAL_IMPL_LSX_FLOAT_BIN_OP(v_or, _Tpvec, __lsx_vor_v, cast)                \
+    OPENCV_HAL_IMPL_LSX_FLOAT_BIN_OP(v_xor, _Tpvec, __lsx_vxor_v, cast)              \
+    inline _Tpvec v_not(const _Tpvec& a)                                             \
+    { return _Tpvec(__lsx_vnori_b((__m128i)(a.val), 0)); }                           \
+
+OPENCV_HAL_IMPL_LSX_FLOAT_LOGIC_OP(v_float32x4, _lsx_128_castsi128_ps)
+OPENCV_HAL_IMPL_LSX_FLOAT_LOGIC_OP(v_float64x2, _lsx_128_castsi128_pd)
+
+/** Select **/
+#define OPENCV_HAL_IMPL_LSX_SELECT(_Tpvec)                                           \
+    inline _Tpvec v_select(const _Tpvec& mask, const _Tpvec& a, const _Tpvec& b)     \
+    { return _Tpvec(__lsx_vbitsel_v(b.val, a.val, mask.val)); }                      \
+
+OPENCV_HAL_IMPL_LSX_SELECT(v_uint8x16)
+OPENCV_HAL_IMPL_LSX_SELECT(v_int8x16)
+OPENCV_HAL_IMPL_LSX_SELECT(v_uint16x8)
+OPENCV_HAL_IMPL_LSX_SELECT(v_int16x8)
+OPENCV_HAL_IMPL_LSX_SELECT(v_uint32x4)
+OPENCV_HAL_IMPL_LSX_SELECT(v_int32x4)
+
+inline v_float32x4 v_select(const v_float32x4 &mask, const v_float32x4 &a, const v_float32x4 &b)
+{ return v_float32x4(__lsx_vbitsel_v((__m128i)b.val, (__m128i)a.val, (__m128i)mask.val)); }
+inline v_float64x2 v_select(const v_float64x2 &mask, const v_float64x2 &a, const v_float64x2 &b)
+{ return v_float64x2(__lsx_vbitsel_v((__m128i)b.val, (__m128i)a.val, (__m128i)mask.val)); }
+
+/** Comparison **/
+#define OPENCV_HAL_IMPL_LSX_CMP_OP_OV(_Tpvec)                            \
+    inline _Tpvec v_ne(const _Tpvec& a, const _Tpvec& b)                 \
+    { return v_not(v_eq(a, b)); }                                        \
+    inline _Tpvec v_lt(const _Tpvec& a, const _Tpvec& b)                 \
+    { return v_gt(b, a); }                                               \
+    inline _Tpvec v_ge(const _Tpvec& a, const _Tpvec& b)                 \
+    { return v_not(v_lt(a, b)); }                                        \
+    inline _Tpvec v_le(const _Tpvec& a, const _Tpvec& b)                 \
+    { return v_ge(b, a); }                                               \
+
+#define OPENCV_HAL_IMPL_LSX_CMP_OP_INT(_Tpuvec, _Tpsvec, suffix, usuffix)    \
+    inline _Tpuvec v_eq(const _Tpuvec& a, const _Tpuvec& b)                  \
+    { return _Tpuvec(__lsx_vseq_##suffix(a.val, b.val)); }                   \
+    inline _Tpuvec v_gt(const _Tpuvec& a, const _Tpuvec& b)                  \
+    { return _Tpuvec(__lsx_vslt_##usuffix(b.val, a.val)); }                  \
+    inline _Tpsvec v_eq(const _Tpsvec& a, const _Tpsvec& b)                  \
+    { return _Tpsvec(__lsx_vseq_##suffix(a.val, b.val)); }                   \
+    inline _Tpsvec v_gt(const _Tpsvec& a, const _Tpsvec& b)                  \
+    { return _Tpsvec(__lsx_vslt_##suffix(b.val, a.val)); }                   \
+    OPENCV_HAL_IMPL_LSX_CMP_OP_OV(_Tpuvec)                                   \
+    OPENCV_HAL_IMPL_LSX_CMP_OP_OV(_Tpsvec)
+
+OPENCV_HAL_IMPL_LSX_CMP_OP_INT(v_uint8x16,  v_int8x16,  b, bu)
+OPENCV_HAL_IMPL_LSX_CMP_OP_INT(v_uint16x8,  v_int16x8,  h, hu)
+OPENCV_HAL_IMPL_LSX_CMP_OP_INT(v_uint32x4,  v_int32x4,  w, wu)
+
+#define OPENCV_HAL_IMPL_LSX_CMP_OP_64BIT(_Tpvec, suffix)          \
+    inline _Tpvec v_eq(const _Tpvec& a, const _Tpvec& b)          \
+    { return _Tpvec(__lsx_vseq_##suffix(a.val, b.val)); }         \
+    inline _Tpvec v_ne(const _Tpvec& a, const _Tpvec& b)          \
+    { return v_not(v_eq(a, b)); }
+
+OPENCV_HAL_IMPL_LSX_CMP_OP_64BIT(v_uint64x2, d)
+OPENCV_HAL_IMPL_LSX_CMP_OP_64BIT(v_int64x2, d)
+
+#define OPENCV_HAL_IMPL_LSX_CMP_FLT(bin_op, suffix, _Tpvec, ssuffix)       \
+    inline _Tpvec bin_op(const _Tpvec& a, const _Tpvec& b)                 \
+    { return _Tpvec(__lsx_##suffix##_##ssuffix(a.val, b.val)); }           \
+
+#define OPENCV_HAL_IMPL_LSX_CMP_OP_FLT(_Tpvec, ssuffix)                    \
+    OPENCV_HAL_IMPL_LSX_CMP_FLT(v_eq, vfcmp_ceq, _Tpvec, ssuffix)          \
+    OPENCV_HAL_IMPL_LSX_CMP_FLT(v_ne, vfcmp_cne, _Tpvec, ssuffix)          \
+    OPENCV_HAL_IMPL_LSX_CMP_FLT(v_lt,  vfcmp_clt, _Tpvec, ssuffix)         \
+    OPENCV_HAL_IMPL_LSX_CMP_FLT(v_le, vfcmp_cle, _Tpvec, ssuffix)          \
+
+OPENCV_HAL_IMPL_LSX_CMP_OP_FLT(v_float32x4, s)
+OPENCV_HAL_IMPL_LSX_CMP_OP_FLT(v_float64x2, d)
+
+inline v_float32x4 v_gt(const v_float32x4 &a, const v_float32x4 &b)
+{ return v_float32x4(__lsx_vfcmp_clt_s(b.val, a.val)); }
+
+inline v_float32x4 v_ge(const v_float32x4 &a, const v_float32x4 &b)
+{ return v_float32x4(__lsx_vfcmp_cle_s(b.val, a.val)); }
+
+inline v_float64x2 v_gt(const v_float64x2 &a, const v_float64x2 &b)
+{ return v_float64x2(__lsx_vfcmp_clt_d(b.val, a.val)); }
+
+inline v_float64x2 v_ge(const v_float64x2 &a, const v_float64x2 &b)
+{ return v_float64x2(__lsx_vfcmp_cle_d(b.val, a.val)); }
+
+inline v_float32x4 v_not_nan(const v_float32x4& a)
+{ return v_float32x4(__lsx_vfcmp_cor_s(a.val, a.val)); }
+
+inline v_float64x2 v_not_nan(const v_float64x2& a)
+{ return v_float64x2(__lsx_vfcmp_cor_d(a.val, a.val)); }
+
+/** min/max **/
+OPENCV_HAL_IMPL_LSX_BIN_FUNC(v_min, v_uint8x16,  __lsx_vmin_bu)
+OPENCV_HAL_IMPL_LSX_BIN_FUNC(v_max, v_uint8x16,  __lsx_vmax_bu)
+OPENCV_HAL_IMPL_LSX_BIN_FUNC(v_min, v_int8x16,   __lsx_vmin_b)
+OPENCV_HAL_IMPL_LSX_BIN_FUNC(v_max, v_int8x16,   __lsx_vmax_b)
+OPENCV_HAL_IMPL_LSX_BIN_FUNC(v_min, v_uint16x8,  __lsx_vmin_hu)
+OPENCV_HAL_IMPL_LSX_BIN_FUNC(v_max, v_uint16x8,  __lsx_vmax_hu)
+OPENCV_HAL_IMPL_LSX_BIN_FUNC(v_min, v_int16x8,   __lsx_vmin_h)
+OPENCV_HAL_IMPL_LSX_BIN_FUNC(v_max, v_int16x8,   __lsx_vmax_h)
+OPENCV_HAL_IMPL_LSX_BIN_FUNC(v_min, v_uint32x4,  __lsx_vmin_wu)
+OPENCV_HAL_IMPL_LSX_BIN_FUNC(v_max, v_uint32x4,  __lsx_vmax_wu)
+OPENCV_HAL_IMPL_LSX_BIN_FUNC(v_min, v_int32x4,   __lsx_vmin_w)
+OPENCV_HAL_IMPL_LSX_BIN_FUNC(v_max, v_int32x4,   __lsx_vmax_w)
+OPENCV_HAL_IMPL_LSX_BIN_FUNC(v_min, v_float32x4, __lsx_vfmin_s)
+OPENCV_HAL_IMPL_LSX_BIN_FUNC(v_max, v_float32x4, __lsx_vfmax_s)
+OPENCV_HAL_IMPL_LSX_BIN_FUNC(v_min, v_float64x2, __lsx_vfmin_d)
+OPENCV_HAL_IMPL_LSX_BIN_FUNC(v_max, v_float64x2, __lsx_vfmax_d)
+
+template <int imm,
+    bool is_invalid = ((imm < 0) || (imm > 16)),
+    bool is_first = (imm == 0),
+    bool is_half = (imm == 8),
+    bool is_second = (imm == 16),
+    bool is_other = (((imm > 0) && (imm < 8)) || ((imm > 8) && (imm < 16)))>
+class v_lsx_palignr_u8_class;
+
+template <int imm>
+class v_lsx_palignr_u8_class<imm, true, false, false, false, false>;
+
+template <int imm>
+class v_lsx_palignr_u8_class<imm, false, true, false, false, false>
+{
+public:
+    inline __m128i operator()(const __m128i& a, const __m128i& b) const
+    {
+        CV_UNUSED(b);
+        return a;
+    }
+};
+
+template <int imm>
+class v_lsx_palignr_u8_class<imm, false, false, true, false, false>
+{
+public:
+    inline __m128i operator()(const __m128i& a, const __m128i& b) const
+    {
+        return __lsx_vshuf4i_d(a, b, 0x9);
+    }
+};
+
+template <int imm>
+class v_lsx_palignr_u8_class<imm, false, false, false, true, false>
+{
+public:
+    inline __m128i operator()(const __m128i& a, const __m128i& b) const
+    {
+        CV_UNUSED(a);
+        return b;
+    }
+};
+
+template <int imm>
+class v_lsx_palignr_u8_class<imm, false, false, false, false, true>
+{
+public:
+    inline __m128i operator()(const __m128i& a, const __m128i& b) const
+    {
+        enum { imm2 = (sizeof(__m128i) - imm) };
+        return __lsx_vor_v(__lsx_vbsrl_v(a, imm), __lsx_vbsll_v(b, imm2));
+    }
+};
+
+template <int imm>
+inline __m128i v_lsx_palignr_u8(const __m128i& a, const __m128i& b)
+{
+    CV_StaticAssert((imm >= 0) && (imm <= 16), "Invalid imm for v_lsx_palignr_u8");
+    return v_lsx_palignr_u8_class<imm>()(a, b);
+}
+/** Rotate **/
+#define OPENCV_HAL_IMPL_LSX_ROTATE_CAST(_Tpvec, cast)                                   \
+    template<int imm>                                                                   \
+    inline _Tpvec v_rotate_right(const _Tpvec &a)                                       \
+    {                                                                                   \
+        enum { imm2 = (imm * sizeof(typename _Tpvec::lane_type))};                      \
+        __m128i ret = __lsx_vbsrl_v((__m128i)a.val, imm2);                              \
+        return _Tpvec(cast(ret));                                                       \
+    }                                                                                   \
+    template<int imm>                                                                   \
+    inline _Tpvec v_rotate_left(const _Tpvec &a)                                        \
+    {                                                                                   \
+        enum { imm2 = (imm * sizeof(typename _Tpvec::lane_type))};                      \
+        __m128i ret = __lsx_vbsll_v((__m128i)a.val, imm2);                              \
+        return _Tpvec(cast(ret));                                                       \
+    }                                                                                   \
+    template<int imm>                                                                   \
+    inline _Tpvec v_rotate_right(const _Tpvec& a, const _Tpvec& b)                      \
+    {                                                                                   \
+        enum { imm2 = (imm * sizeof(typename _Tpvec::lane_type))};                      \
+        return _Tpvec(cast(v_lsx_palignr_u8<imm2>((__m128i)a.val, (__m128i)b.val)));    \
+    }                                                                                   \
+    template<int imm>                                                                   \
+    inline _Tpvec v_rotate_left(const _Tpvec& a, const _Tpvec& b)                       \
+    {                                                                                   \
+        enum { imm2 = ((_Tpvec::nlanes - imm) * sizeof(typename _Tpvec::lane_type))};   \
+        return _Tpvec(cast(v_lsx_palignr_u8<imm2>((__m128i)b.val, (__m128i)a.val)));    \
+    }
+
+OPENCV_HAL_IMPL_LSX_ROTATE_CAST(v_uint8x16, OPENCV_HAL_NOP)                             \
+OPENCV_HAL_IMPL_LSX_ROTATE_CAST(v_int8x16,  OPENCV_HAL_NOP)                             \
+OPENCV_HAL_IMPL_LSX_ROTATE_CAST(v_uint16x8, OPENCV_HAL_NOP)                             \
+OPENCV_HAL_IMPL_LSX_ROTATE_CAST(v_int16x8,  OPENCV_HAL_NOP)                             \
+OPENCV_HAL_IMPL_LSX_ROTATE_CAST(v_uint32x4, OPENCV_HAL_NOP)                             \
+OPENCV_HAL_IMPL_LSX_ROTATE_CAST(v_int32x4,  OPENCV_HAL_NOP)                             \
+OPENCV_HAL_IMPL_LSX_ROTATE_CAST(v_uint64x2, OPENCV_HAL_NOP)                             \
+OPENCV_HAL_IMPL_LSX_ROTATE_CAST(v_int64x2,  OPENCV_HAL_NOP)                             \
+
+OPENCV_HAL_IMPL_LSX_ROTATE_CAST(v_float32x4, _lsx_128_castsi128_ps)
+OPENCV_HAL_IMPL_LSX_ROTATE_CAST(v_float64x2, _lsx_128_castsi128_pd)
+
+/** Rverse **/
+inline v_uint8x16 v_reverse(const v_uint8x16 &a)
+{
+    __m128i vec = __lsx_vshuf4i_b(a.val, 0x1B);
+    return v_uint8x16(__lsx_vshuf4i_w(vec, 0x1B));
+}
+
+inline v_int8x16 v_reverse(const v_int8x16 &a)
+{ return v_reinterpret_as_s8(v_reverse(v_reinterpret_as_u8(a))); }
+
+inline v_uint16x8 v_reverse(const v_uint16x8 &a)
+{
+    __m128i vec = __lsx_vshuf4i_h(a.val, 0x1B);
+    return v_uint16x8(__lsx_vshuf4i_w(vec, 0x4E));
+}
+
+inline v_int16x8 v_reverse(const v_int16x8 &a)
+{ return v_reinterpret_as_s16(v_reverse(v_reinterpret_as_u16(a))); }
+
+inline v_uint32x4 v_reverse(const v_uint32x4 &a)
+{ return v_uint32x4(__lsx_vshuf4i_w(a.val, 0x1B)); }
+
+inline v_int32x4 v_reverse(const v_int32x4 &a)
+{ return v_int32x4(__lsx_vshuf4i_w(a.val, 0x1B)); }
+
+inline v_uint64x2 v_reverse(const v_uint64x2 &a)
+{ return v_uint64x2(__lsx_vshuf4i_w(a.val, 0x4E)); }
+
+inline v_int64x2 v_reverse(const v_int64x2 &a)
+{ return v_int64x2(__lsx_vshuf4i_w(a.val, 0x4E)); }
+
+inline v_float32x4 v_reverse(const v_float32x4 &a)
+{ return v_reinterpret_as_f32(v_reverse(v_reinterpret_as_u32(a))); }
+
+inline v_float64x2 v_reverse(const v_float64x2 &a)
+{ return v_reinterpret_as_f64(v_reverse(v_reinterpret_as_u64(a))); }
+
+////////////// Reduce and mask ////////////
+
+/** Reduce **/
+// this function is return a[0]+a[1]+...+a[31]
+inline unsigned v_reduce_sum(const v_uint8x16& a)
+{
+    __m128i t1 = __lsx_vhaddw_hu_bu(a.val, a.val);
+    __m128i t2 = __lsx_vhaddw_wu_hu(t1, t1);
+    __m128i t3 = __lsx_vhaddw_du_wu(t2, t2);
+    __m128i t4 = __lsx_vhaddw_qu_du(t3, t3);
+    return (unsigned)__lsx_vpickve2gr_w(t4, 0);
+}
+
+inline int v_reduce_sum(const v_int8x16 &a)
+{
+    __m128i t1 = __lsx_vhaddw_h_b(a.val, a.val);
+    __m128i t2 = __lsx_vhaddw_w_h(t1, t1);
+    __m128i t3 = __lsx_vhaddw_d_w(t2, t2);
+    __m128i t4 = __lsx_vhaddw_q_d(t3, t3);
+    return (int)__lsx_vpickve2gr_w(t4, 0);
+}
+
+#define OPENCV_HAL_IMPL_LSX_REDUCE_16(_Tpvec, sctype, func, intrin)            \
+    inline sctype v_reduce_##func(const _Tpvec& a)                             \
+    {                                                                          \
+        __m128i val = intrin(a.val, __lsx_vbsrl_v(a.val, 8));                  \
+        val = intrin(val, __lsx_vbsrl_v(val, 4));                              \
+        val = intrin(val, __lsx_vbsrl_v(val, 2));                              \
+        val = intrin(val, __lsx_vbsrl_v(val, 1));                              \
+        return (sctype)__lsx_vpickve2gr_b(val, 0);                             \
+    }
+
+OPENCV_HAL_IMPL_LSX_REDUCE_16(v_uint8x16, uchar, min, __lsx_vmin_bu)
+OPENCV_HAL_IMPL_LSX_REDUCE_16(v_uint8x16, uchar, max, __lsx_vmax_bu)
+OPENCV_HAL_IMPL_LSX_REDUCE_16(v_int8x16,  schar, min, __lsx_vmin_b)
+OPENCV_HAL_IMPL_LSX_REDUCE_16(v_int8x16,  schar, max, __lsx_vmax_b)
+
+#define OPENCV_HAL_IMPL_LSX_REDUCE_8(_Tpvec, sctype, func, intrin)             \
+    inline sctype v_reduce_##func(const _Tpvec &a)                             \
+    {                                                                          \
+        __m128i val = intrin(a.val, __lsx_vbsrl_v(a.val, 8));                  \
+        val = intrin(val, __lsx_vbsrl_v(val, 4));                              \
+        val = intrin(val, __lsx_vbsrl_v(val, 2));                              \
+        return (sctype)__lsx_vpickve2gr_h(val, 0);                             \
+    }
+
+OPENCV_HAL_IMPL_LSX_REDUCE_8(v_uint16x8, ushort, min, __lsx_vmin_hu)
+OPENCV_HAL_IMPL_LSX_REDUCE_8(v_uint16x8, ushort, max, __lsx_vmax_hu)
+OPENCV_HAL_IMPL_LSX_REDUCE_8(v_int16x8,  short,  min, __lsx_vmin_h)
+OPENCV_HAL_IMPL_LSX_REDUCE_8(v_int16x8,  short,  max, __lsx_vmax_h)
+
+#define OPENCV_HAL_IMPL_LSX_REDUCE_4(_Tpvec, sctype, func, intrin)             \
+    inline sctype v_reduce_##func(const _Tpvec &a)                             \
+    {                                                                          \
+        __m128i val = intrin(a.val, __lsx_vbsrl_v(a.val, 8));                  \
+        val = intrin(val, __lsx_vbsrl_v(val, 4));                              \
+        return (sctype)__lsx_vpickve2gr_w(val, 0);                             \
+    }
+
+OPENCV_HAL_IMPL_LSX_REDUCE_4(v_uint32x4, unsigned, min, __lsx_vmin_wu)
+OPENCV_HAL_IMPL_LSX_REDUCE_4(v_uint32x4, unsigned, max, __lsx_vmax_wu)
+OPENCV_HAL_IMPL_LSX_REDUCE_4(v_int32x4,  int,      min, __lsx_vmin_w)
+OPENCV_HAL_IMPL_LSX_REDUCE_4(v_int32x4,  int,      max, __lsx_vmax_w)
+
+#define OPENCV_HAL_IMPL_LSX_REDUCE_FLT(func, intrin)                           \
+    inline float v_reduce_##func(const v_float32x4 &a)                         \
+    {                                                                          \
+        __m128 val   = a.val;                                                  \
+        val = intrin(val, (__m128)__lsx_vbsrl_v((__m128i)val, 8));             \
+        val = intrin(val, (__m128)__lsx_vbsrl_v((__m128i)val, 4));             \
+        float *fval = (float*)&val;                                            \
+        return fval[0];                                                        \
+    }
+
+OPENCV_HAL_IMPL_LSX_REDUCE_FLT(min, __lsx_vfmin_s)
+OPENCV_HAL_IMPL_LSX_REDUCE_FLT(max, __lsx_vfmax_s)
+
+inline int v_reduce_sum(const v_int32x4 &a)
+{
+    __m128i t1 = __lsx_vhaddw_d_w(a.val, a.val);
+    __m128i t2 = __lsx_vhaddw_q_d(t1, t1);
+    return (int)__lsx_vpickve2gr_w(t2, 0);
+}
+
+inline unsigned v_reduce_sum(const v_uint32x4 &a)
+{
+    __m128i t1 = __lsx_vhaddw_du_wu(a.val, a.val);
+    __m128i t2 = __lsx_vhaddw_qu_du(t1, t1);
+    return (int)__lsx_vpickve2gr_w(t2, 0);
+}
+
+inline int v_reduce_sum(const v_int16x8 &a)
+{
+    __m128i t1 = __lsx_vhaddw_w_h(a.val, a.val);
+    __m128i t2 = __lsx_vhaddw_d_w(t1, t1);
+    __m128i t3 = __lsx_vhaddw_q_d(t2, t2);
+    return (int)__lsx_vpickve2gr_w(t3, 0);
+}
+
+inline unsigned v_reduce_sum(const v_uint16x8 &a)
+{
+    __m128i t1 = __lsx_vhaddw_wu_hu(a.val, a.val);
+    __m128i t2 = __lsx_vhaddw_du_wu(t1, t1);
+    __m128i t3 = __lsx_vhaddw_qu_du(t2, t2);
+    return (int)__lsx_vpickve2gr_w(t3, 0);
+}
+
+inline float v_reduce_sum(const v_float32x4 &a)
+{
+    __m128i val = (__m128i)a.val;
+    val = __lsx_vbsrl_v(val, 8);
+    __m128 result = __lsx_vfadd_s(a.val, (__m128)val);
+    float *pa = (float*)&result;
+    return (float)(pa[0] + pa[1]);
+}
+
+inline uint64 v_reduce_sum(const v_uint64x2 &a)
+{
+    __m128i t0 = __lsx_vhaddw_qu_du(a.val, a.val);
+    return (uint64)__lsx_vpickve2gr_du(t0, 0);
+}
+
+inline int64 v_reduce_sum(const v_int64x2 &a)
+{
+    __m128i t0 = __lsx_vhaddw_q_d(a.val, a.val);
+    return (int64)__lsx_vpickve2gr_d(t0, 0);
+}
+
+inline double v_reduce_sum(const v_float64x2 &a)
+{
+    double *pa = (double*)&a;
+    return pa[0] + pa[1];
+}
+
+inline v_float32x4 v_reduce_sum4(const v_float32x4& a, const v_float32x4& b,
+                                 const v_float32x4& c, const v_float32x4& d)
+{
+    __m128i a0 = (__m128i)a.val;
+    __m128i b0 = (__m128i)b.val;
+    __m128i c0 = (__m128i)c.val;
+    __m128i d0 = (__m128i)d.val;
+    __m128i ac_l = __lsx_vilvl_w(c0, a0);
+    __m128i ac_h = __lsx_vilvh_w(c0, a0);
+    __m128i bd_l = __lsx_vilvl_w(d0, b0);
+    __m128i bd_h = __lsx_vilvh_w(d0, b0);
+    __m128  ac   = __lsx_vfadd_s((__m128)ac_l, (__m128)ac_h);
+    __m128  bd   = __lsx_vfadd_s((__m128)bd_l, (__m128)bd_h);
+    return v_float32x4(__lsx_vfadd_s((__m128)__lsx_vilvl_w((__m128i)bd, (__m128i)ac),
+                       (__m128)__lsx_vilvh_w((__m128i)bd, (__m128i)ac)));
+}
+
+inline unsigned v_reduce_sad(const v_int8x16& a, const v_int8x16& b)
+{
+    __m128i t0 = __lsx_vabsd_b(a.val, b.val);
+    __m128i t1 = __lsx_vhaddw_hu_bu(t0, t0);
+    __m128i t2 = __lsx_vhaddw_wu_hu(t1, t1);
+    __m128i t3 = __lsx_vhaddw_du_wu(t2, t2);
+    __m128i t4 = __lsx_vhaddw_qu_du(t3, t3);
+    return (unsigned)__lsx_vpickve2gr_w(t4, 0);
+}
+
+inline unsigned v_reduce_sad(const v_uint8x16& a, const v_uint8x16& b)
+{
+    __m128i t0 = __lsx_vabsd_bu(a.val, b.val);
+    __m128i t1 = __lsx_vhaddw_hu_bu(t0, t0);
+    __m128i t2 = __lsx_vhaddw_wu_hu(t1, t1);
+    __m128i t3 = __lsx_vhaddw_du_wu(t2, t2);
+    __m128i t4 = __lsx_vhaddw_qu_du(t3, t3);
+    return (unsigned)__lsx_vpickve2gr_w(t4, 0);
+}
+
+inline unsigned v_reduce_sad(const v_uint16x8& a, const v_uint16x8& b)
+{
+    __m128i t0 = __lsx_vabsd_hu(a.val, b.val);
+    __m128i t1 = __lsx_vhaddw_wu_hu(t0, t0);
+    __m128i t2 = __lsx_vhaddw_du_wu(t1, t1);
+    __m128i t3 = __lsx_vhaddw_qu_du(t2, t2);
+    return (unsigned)__lsx_vpickve2gr_w(t3, 0);
+}
+
+inline unsigned v_reduce_sad(const v_int16x8& a, const v_int16x8& b)
+{
+    __m128i t0 = __lsx_vabsd_h(a.val, b.val);
+    __m128i t1 = __lsx_vhaddw_wu_hu(t0, t0);
+    __m128i t2 = __lsx_vhaddw_du_wu(t1, t1);
+    __m128i t3 = __lsx_vhaddw_qu_du(t2, t2);
+    return (unsigned)__lsx_vpickve2gr_w(t3, 0);
+}
+
+inline unsigned v_reduce_sad(const v_uint32x4& a, const v_uint32x4& b)
+{
+    __m128i t0 = __lsx_vabsd_wu(a.val, b.val);
+    __m128i t1 = __lsx_vhaddw_du_wu(t0, t0);
+    __m128i t2 = __lsx_vhaddw_qu_du(t1, t1);
+    return (unsigned)__lsx_vpickve2gr_w(t2, 0);
+}
+
+inline unsigned v_reduce_sad(const v_int32x4& a, const v_int32x4& b)
+{
+    __m128i t0 = __lsx_vabsd_w(a.val, b.val);
+    __m128i t1 = __lsx_vhaddw_du_wu(t0, t0);
+    __m128i t2 = __lsx_vhaddw_qu_du(t1, t1);
+    return (unsigned)__lsx_vpickve2gr_w(t2, 0);
+}
+
+inline float v_reduce_sad(const v_float32x4& a, const v_float32x4& b)
+{
+    v_float32x4 a_b = v_sub(a, b);
+    return v_reduce_sum(v_float32x4((__m128i)a_b.val & __lsx_vreplgr2vr_w(0x7fffffff)));
+}
+
+/** Popcount **/
+#define OPENCV_HAL_IMPL_LSX_POPCOUNT(_Tpvec, _Tp, suffix)                  \
+inline _Tpvec v_popcount(const _Tp& a)                                     \
+{ return _Tpvec(__lsx_vpcnt_##suffix(a.val)); }
+
+OPENCV_HAL_IMPL_LSX_POPCOUNT(v_uint8x16,  v_uint8x16,  b);
+OPENCV_HAL_IMPL_LSX_POPCOUNT(v_uint8x16,  v_int8x16,   b);
+OPENCV_HAL_IMPL_LSX_POPCOUNT(v_uint16x8,  v_uint16x8,  h);
+OPENCV_HAL_IMPL_LSX_POPCOUNT(v_uint16x8,  v_int16x8,   h);
+OPENCV_HAL_IMPL_LSX_POPCOUNT(v_uint32x4,  v_uint32x4,  w);
+OPENCV_HAL_IMPL_LSX_POPCOUNT(v_uint32x4,  v_int32x4,   w);
+OPENCV_HAL_IMPL_LSX_POPCOUNT(v_uint64x2,  v_uint64x2,  d);
+OPENCV_HAL_IMPL_LSX_POPCOUNT(v_uint64x2,  v_int64x2,   d);
+
+/** Mask **/
+#define OPENCV_HAL_IMPL_REINTERPRET_INT(ft, tt)              \
+inline tt reinterpret_int(ft x) { union {ft l; tt i;} v; v.l = x; return v.i; }
+OPENCV_HAL_IMPL_REINTERPRET_INT(uchar, schar)
+OPENCV_HAL_IMPL_REINTERPRET_INT(schar, schar)
+OPENCV_HAL_IMPL_REINTERPRET_INT(ushort, short)
+OPENCV_HAL_IMPL_REINTERPRET_INT(short, short)
+OPENCV_HAL_IMPL_REINTERPRET_INT(unsigned, int)
+OPENCV_HAL_IMPL_REINTERPRET_INT(int, int)
+OPENCV_HAL_IMPL_REINTERPRET_INT(float, int)
+OPENCV_HAL_IMPL_REINTERPRET_INT(uint64, int64)
+OPENCV_HAL_IMPL_REINTERPRET_INT(int64, int64)
+OPENCV_HAL_IMPL_REINTERPRET_INT(double, int64)
+
+inline int v_signmask(const v_int8x16& a)
+{
+    __m128i result = __lsx_vmskltz_b(a.val);
+    return __lsx_vpickve2gr_w(result, 0);
+}
+inline int v_signmask(const v_uint8x16& a)
+{ return v_signmask(v_reinterpret_as_s8(a)) ;}
+
+inline int v_signmask(const v_int16x8 &a)
+{
+    __m128i result = __lsx_vmskltz_h(a.val);
+    return __lsx_vpickve2gr_w(result, 0);
+}
+inline int v_signmask(const v_uint16x8 &a)
+{ return v_signmask(v_reinterpret_as_s16(a)); }
+
+inline int v_signmask(const v_uint32x4& a)
+{
+    __m128i result = __lsx_vmskltz_w(a.val);
+    return __lsx_vpickve2gr_w(result, 0);
+}
+inline int v_signmask(const v_int32x4& a)
+{ return v_signmask(v_reinterpret_as_u32(a)); }
+
+inline int v_signmask(const v_uint64x2& a)
+{
+    __m128i result = __lsx_vmskltz_d(a.val);
+    return __lsx_vpickve2gr_w(result, 0);
+}
+inline int v_signmask(const v_int64x2& a)
+{ return v_signmask(v_reinterpret_as_u64(a)); }
+
+inline int v_signmask(const v_float32x4& a)
+{ return v_signmask(*(v_int32x4*)(&a)); }
+
+inline int v_signmask(const v_float64x2& a)
+{ return v_signmask(*(v_int64x2*)(&a)); }
+
+inline int v_scan_forward(const v_int8x16& a) { return trailingZeros32(v_signmask(v_reinterpret_as_s8(a))); }
+inline int v_scan_forward(const v_uint8x16& a) { return trailingZeros32(v_signmask(v_reinterpret_as_s8(a))); }
+inline int v_scan_forward(const v_int16x8& a) { return trailingZeros32(v_signmask(v_reinterpret_as_s8(a))) / 2; }
+inline int v_scan_forward(const v_uint16x8& a) { return trailingZeros32(v_signmask(v_reinterpret_as_s8(a))) / 2; }
+inline int v_scan_forward(const v_int32x4& a) { return trailingZeros32(v_signmask(v_reinterpret_as_s8(a))) / 4; }
+inline int v_scan_forward(const v_uint32x4& a) { return trailingZeros32(v_signmask(v_reinterpret_as_s8(a))) / 4; }
+inline int v_scan_forward(const v_float32x4& a) { return trailingZeros32(v_signmask(v_reinterpret_as_s8(a))) / 4; }
+inline int v_scan_forward(const v_int64x2& a) { return trailingZeros32(v_signmask(v_reinterpret_as_s8(a))) / 8; }
+inline int v_scan_forward(const v_uint64x2& a) { return trailingZeros32(v_signmask(v_reinterpret_as_s8(a))) / 8; }
+inline int v_scan_forward(const v_float64x2& a) { return trailingZeros32(v_signmask(v_reinterpret_as_s8(a))) / 8; }
+
+/** Checks **/
+#define OPENCV_HAL_IMPL_LSX_CHECK(_Tpvec, allmask) \
+    inline bool v_check_all(const _Tpvec& a) { return v_signmask(a) == allmask; } \
+    inline bool v_check_any(const _Tpvec& a) { return v_signmask(a) != 0; }
+OPENCV_HAL_IMPL_LSX_CHECK(v_uint8x16, 65535)
+OPENCV_HAL_IMPL_LSX_CHECK(v_int8x16, 65535)
+OPENCV_HAL_IMPL_LSX_CHECK(v_uint16x8, 255);
+OPENCV_HAL_IMPL_LSX_CHECK(v_int16x8, 255);
+OPENCV_HAL_IMPL_LSX_CHECK(v_uint32x4, 15)
+OPENCV_HAL_IMPL_LSX_CHECK(v_int32x4, 15)
+OPENCV_HAL_IMPL_LSX_CHECK(v_uint64x2, 3)
+OPENCV_HAL_IMPL_LSX_CHECK(v_int64x2, 3)
+OPENCV_HAL_IMPL_LSX_CHECK(v_float32x4, 15)
+OPENCV_HAL_IMPL_LSX_CHECK(v_float64x2, 3)
+
+///////////// Other math /////////////
+
+/** Some frequent operations **/
+#define OPENCV_HAL_IMPL_LSX_MULADD(_Tpvec, suffix)                              \
+    inline _Tpvec v_fma(const _Tpvec& a, const _Tpvec& b, const _Tpvec& c)      \
+    { return _Tpvec(__lsx_vfmadd_##suffix(a.val, b.val, c.val)); }              \
+    inline _Tpvec v_muladd(const _Tpvec& a, const _Tpvec &b, const _Tpvec& c)   \
+    { return _Tpvec(__lsx_vfmadd_##suffix(a.val, b.val, c.val)); }              \
+    inline _Tpvec v_sqrt(const _Tpvec& x)                                       \
+    { return _Tpvec(__lsx_vfsqrt_##suffix(x.val)); }                            \
+    inline _Tpvec v_sqr_magnitude(const _Tpvec& a, const _Tpvec& b)             \
+    { return v_fma(a, a, v_mul(b, b)); }                                        \
+    inline _Tpvec v_magnitude(const _Tpvec& a, const _Tpvec& b)                 \
+    { return v_sqrt(v_fma(a, a, v_mul(b, b))); }
+
+OPENCV_HAL_IMPL_LSX_MULADD(v_float32x4, s)
+OPENCV_HAL_IMPL_LSX_MULADD(v_float64x2, d)
+
+inline v_int32x4 v_fma(const v_int32x4& a, const v_int32x4& b, const v_int32x4& c)
+{ return v_int32x4(__lsx_vmadd_w(c.val, a.val, b.val)); }
+
+inline v_int32x4 v_muladd(const v_int32x4& a, const v_int32x4& b, const v_int32x4& c)
+{ return v_fma(a, b, c); }
+
+inline v_float32x4 v_invsqrt(const v_float32x4& x)
+{
+    return v_float32x4(__lsx_vfrsqrt_s(x.val));
+}
+
+inline v_float64x2 v_invsqrt(const v_float64x2& x)
+{
+    return v_float64x2(__lsx_vfrsqrt_d(x.val));
+}
+
+/** Absolute values **/
+#define OPENCV_HAL_IMPL_LSX_ABS(_Tpvec, suffix)                          \
+    inline v_u##_Tpvec v_abs(const v_##_Tpvec& x)                        \
+    { return v_u##_Tpvec(__lsx_vabsd_##suffix(x.val, __lsx_vldi(0))); }
+
+OPENCV_HAL_IMPL_LSX_ABS(int8x16, b)
+OPENCV_HAL_IMPL_LSX_ABS(int16x8, h)
+OPENCV_HAL_IMPL_LSX_ABS(int32x4, w)
+
+inline v_float32x4 v_abs(const v_float32x4& x)
+{ return v_float32x4(*((__m128i*)&x) & __lsx_vreplgr2vr_w(0x7fffffff)); }
+inline v_float64x2 v_abs(const v_float64x2& x)
+{ return v_float64x2(*((__m128i*)&x) & __lsx_vreplgr2vr_d(0x7fffffffffffffff)); }
+
+/** Absolute difference **/
+
+inline v_uint8x16 v_absdiff(const v_uint8x16& a, const v_uint8x16& b)
+{ return (v_uint8x16)__lsx_vabsd_bu(a.val, b.val); }
+inline v_uint16x8 v_absdiff(const v_uint16x8& a, const v_uint16x8& b)
+{ return (v_uint16x8)__lsx_vabsd_hu(a.val, b.val); }
+inline v_uint32x4 v_absdiff(const v_uint32x4& a, const v_uint32x4& b)
+{ return (v_uint32x4)__lsx_vabsd_wu(a.val, b.val); }
+
+inline v_uint8x16 v_absdiff(const v_int8x16& a, const v_int8x16& b)
+{ return (v_uint8x16)__lsx_vabsd_b(a.val, b.val); }
+inline v_uint16x8 v_absdiff(const v_int16x8& a, const v_int16x8& b)
+{ return (v_uint16x8)__lsx_vabsd_h(a.val, b.val); }
+inline v_uint32x4 v_absdiff(const v_int32x4& a, const v_int32x4& b)
+{ return (v_uint32x4)__lsx_vabsd_w(a.val, b.val); }
+
+inline v_float32x4 v_absdiff(const v_float32x4& a, const v_float32x4& b)
+{ return v_abs(v_sub(a, b)); }
+
+inline v_float64x2 v_absdiff(const v_float64x2& a, const v_float64x2& b)
+{ return v_abs(v_sub(a, b)); }
+
+/** Saturating absolute difference **/
+inline v_int8x16 v_absdiffs(const v_int8x16& a, const v_int8x16& b)
+{
+    v_int8x16 d = v_sub(a, b);
+    v_int8x16 m = v_lt(a, b);
+    return v_sub(v_xor(d, m), m);
+}
+inline v_int16x8 v_absdiffs(const v_int16x8& a, const v_int16x8& b)
+{ return v_sub(v_max(a, b), v_min(a, b)); }
+
+///////// Conversions /////////
+
+/** Rounding **/
+inline v_int32x4 v_round(const v_float32x4& a)
+{ return v_int32x4(__lsx_vftint_w_s(a.val)); }
+
+inline v_int32x4 v_round(const v_float64x2& a)
+{ return v_int32x4(__lsx_vftint_w_d(a.val, a.val)); }
+
+inline v_int32x4 v_round(const v_float64x2& a, const v_float64x2& b)
+{ return v_int32x4(__lsx_vftint_w_d(b.val, a.val)); }
+
+inline v_int32x4 v_trunc(const v_float32x4& a)
+{ return v_int32x4(__lsx_vftintrz_w_s(a.val)); }
+
+inline v_int32x4 v_trunc(const v_float64x2& a)
+{ return v_int32x4(__lsx_vftintrz_w_d(a.val, a.val)); }
+
+inline v_int32x4 v_floor(const v_float32x4& a)
+{ return v_int32x4(__lsx_vftintrz_w_s(__m128(__lsx_vfrintrm_s(a.val)))); }
+
+inline v_int32x4 v_floor(const v_float64x2& a)
+{ return v_trunc(v_float64x2(__lsx_vfrintrm_d(a.val))); }
+
+inline v_int32x4 v_ceil(const v_float32x4& a)
+{ return v_int32x4(__lsx_vftintrz_w_s(__m128(__lsx_vfrintrp_s(a.val)))); }
+
+inline v_int32x4 v_ceil(const v_float64x2& a)
+{ return v_trunc(v_float64x2(__lsx_vfrintrp_d(a.val))); }
+
+/** To float **/
+inline v_float32x4 v_cvt_f32(const v_int32x4& a)
+{ return v_float32x4(__lsx_vffint_s_w(a.val)); }
+
+inline v_float32x4 v_cvt_f32(const v_float64x2& a)
+{ return v_float32x4(__lsx_vfcvt_s_d(a.val, a.val)); }
+
+inline v_float32x4 v_cvt_f32(const v_float64x2& a, const v_float64x2& b)
+{ return v_float32x4(__lsx_vfcvt_s_d(b.val, a.val)); }
+
+inline v_float64x2 v_cvt_f64(const v_int32x4& a)
+{ return v_float64x2(__lsx_vffintl_d_w(a.val)); }
+
+inline v_float64x2 v_cvt_f64_high(const v_int32x4& a)
+{ return v_float64x2(__lsx_vffinth_d_w(a.val)); }
+
+inline v_float64x2 v_cvt_f64(const v_float32x4& a)
+{ return v_float64x2(__lsx_vfcvtl_d_s(a.val)); }
+
+inline v_float64x2 v_cvt_f64_high(const v_float32x4& a)
+{ return v_float64x2(__lsx_vfcvth_d_s(a.val)); }
+
+inline v_float64x2 v_cvt_f64(const v_int64x2& v)
+{ return v_float64x2(__lsx_vffint_d_l(v.val)); }
+
+
+//////////////// Lookup table access ////////////////
+inline v_int8x16 v_lut(const schar* tab, const int* idx)
+{
+    return v_int8x16(_v128_setr_b(tab[idx[0]], tab[idx[1]], tab[idx[2]], tab[idx[3]],
+                     tab[idx[4]], tab[idx[5]], tab[idx[6]], tab[idx[7]], tab[idx[8]],
+                     tab[idx[9]], tab[idx[10]], tab[idx[11]], tab[idx[12]], tab[idx[13]],
+                     tab[idx[14]], tab[idx[15]]));
+}
+
+inline v_int8x16 v_lut_pairs(const schar* tab, const int* idx)
+{
+    return v_int8x16(_v128_setr_h(*(const short*)(tab + idx[0]), *(const short*)(tab + idx[1]),
+           *(const short*)(tab + idx[2]), *(const short*)(tab + idx[3]), *(const short*)(tab + idx[4]),
+           *(const short*)(tab + idx[5]), *(const short*)(tab + idx[6]), *(const short*)(tab + idx[7])));
+}
+
+inline v_int8x16 v_lut_quads(const schar* tab, const int* idx)
+{
+    return v_int8x16(_v128_setr_w(*(const int*)(tab + idx[0]), *(const int*)(tab + idx[1]),
+                *(const int*)(tab + idx[2]), *(const int*)(tab + idx[3])));
+}
+
+inline v_uint8x16 v_lut(const uchar* tab, const int* idx)
+{ return v_reinterpret_as_u8(v_lut((const schar*)tab, idx)); }
+inline v_uint8x16 v_lut_pairs(const uchar* tab, const int* idx)
+{ return v_reinterpret_as_u8(v_lut_pairs((const schar*)tab, idx)); }
+inline v_uint8x16 v_lut_quads(const uchar* tab, const int* idx)
+{ return v_reinterpret_as_u8(v_lut_quads((const schar*)tab, idx)); }
+
+inline v_int16x8 v_lut(const short* tab, const int* idx)
+{
+    return v_int16x8(_v128_setr_h(tab[idx[0]], tab[idx[1]], tab[idx[2]], tab[idx[3]],
+                     tab[idx[4]], tab[idx[5]], tab[idx[6]], tab[idx[7]]));
+}
+inline v_int16x8 v_lut_pairs(const short* tab, const int* idx)
+{
+    return v_int16x8(_v128_setr_w(*(const int*)(tab + idx[0]), *(const int*)(tab + idx[1]),
+                *(const int*)(tab + idx[2]), *(const int*)(tab + idx[3])));
+}
+inline v_int16x8 v_lut_quads(const short* tab, const int* idx)
+{
+    return v_int16x8(_v128_setr_d(*(const int64_t*)(tab + idx[0]), *(const int64_t*)(tab + idx[1])));
+}
+
+inline v_uint16x8 v_lut(const ushort* tab, const int* idx)
+{ return v_reinterpret_as_u16(v_lut((const short *)tab, idx)); }
+inline v_uint16x8 v_lut_pairs(const ushort* tab, const int* idx)
+{ return v_reinterpret_as_u16(v_lut_pairs((const short *)tab, idx)); }
+inline v_uint16x8 v_lut_quads(const ushort* tab, const int* idx)
+{ return v_reinterpret_as_u16(v_lut_quads((const short *)tab, idx)); }
+
+inline v_int32x4 v_lut(const int* tab, const int* idx)
+{
+    return v_int32x4(_v128_setr_w(tab[idx[0]], tab[idx[1]], tab[idx[2]], tab[idx[3]]));
+}
+inline v_int32x4 v_lut_pairs(const int *tab, const int* idx)
+{
+    return v_int32x4(_v128_setr_d(*(const int64_t*)(tab + idx[0]), *(const int64_t*)(tab + idx[1])));
+}
+inline v_int32x4 v_lut_quads(const int* tab, const int* idx)
+{
+    return v_int32x4(__lsx_vld(tab + idx[0], 0));
+}
+
+inline v_uint32x4 v_lut(const unsigned* tab, const int* idx) { return v_reinterpret_as_u32(v_lut((const int *)tab, idx)); }
+inline v_uint32x4 v_lut_pairs(const unsigned* tab, const int* idx) { return v_reinterpret_as_u32(v_lut_pairs((const int *)tab, idx)); }
+inline v_uint32x4 v_lut_quads(const unsigned* tab, const int* idx) { return v_reinterpret_as_u32(v_lut_quads((const int *)tab, idx)); }
+
+inline v_int64x2 v_lut(const int64_t* tab, const int *idx)
+{
+    return v_int64x2(_v128_setr_d(tab[idx[0]], tab[idx[1]]));
+}
+inline v_int64x2 v_lut_pairs(const int64_t* tab, const int* idx)
+{
+    return v_int64x2(__lsx_vld(tab + idx[0], 0));
+}
+
+inline v_uint64x2 v_lut(const uint64_t* tab, const int* idx) { return v_reinterpret_as_u64(v_lut((const int64_t *)tab, idx)); }
+inline v_uint64x2 v_lut_pairs(const uint64_t* tab, const int* idx) { return v_reinterpret_as_u64(v_lut_pairs((const int64_t *)tab, idx)); }
+
+inline v_float32x4 v_lut(const float* tab, const int* idx)
+{
+    return v_float32x4(_v128_setr_ps(tab[idx[0]], tab[idx[1]], tab[idx[2]], tab[idx[3]]));
+}
+inline v_float32x4 v_lut_pairs(const float* tab, const int* idx)
+{
+    return v_float32x4((__m128)_v128_setr_pd(*(const double*)(tab + idx[0]), *(const double*)(tab + idx[1])));
+}
+inline v_float32x4 v_lut_quads(const float* tab, const int* idx)
+{
+    return v_float32x4((__m128)__lsx_vld(tab + idx[0], 0));
+}
+
+inline v_float64x2 v_lut(const double* tab, const int* idx)
+{
+    return v_float64x2(_v128_setr_pd(tab[idx[0]], tab[idx[1]]));
+}
+inline v_float64x2 v_lut_pairs(const double* tab, const int* idx)
+{
+    return v_float64x2((__m128d)__lsx_vld(tab + idx[0], 0));
+}
+
+inline v_int32x4 v_lut(const int* tab, const v_int32x4& idxvec)
+{
+    int *idx = (int*)&idxvec.val;
+    return v_lut(tab, idx);
+}
+
+inline v_uint32x4 v_lut(const unsigned* tab, const v_int32x4& idxvec)
+{
+    return v_reinterpret_as_u32(v_lut((const int *)tab, idxvec));
+}
+
+inline v_float32x4 v_lut(const float* tab, const v_int32x4& idxvec)
+{
+    const int *idx = (const int*)&idxvec.val;
+    return v_lut(tab, idx);
+}
+
+inline v_float64x2 v_lut(const double* tab, const v_int32x4& idxvec)
+{
+    const int *idx = (const int*)&idxvec.val;
+    return v_lut(tab, idx);
+}
+
+inline void v_lut_deinterleave(const float* tab, const v_int32x4& idxvec, v_float32x4& x, v_float32x4& y)
+{
+    const int *idx = (const int*)&idxvec.val;
+    __m128i xy0  = __lsx_vld(tab + idx[0], 0);
+    __m128i xy1  = __lsx_vld(tab + idx[1], 0);
+    __m128i xy2  = __lsx_vld(tab + idx[2], 0);
+    __m128i xy3  = __lsx_vld(tab + idx[3], 0);
+    __m128i xy01 = __lsx_vilvl_d(xy1, xy0);
+    __m128i xy23 = __lsx_vilvl_d(xy3, xy2);
+    __m128i xxyy02 = __lsx_vilvl_w(xy23, xy01);
+    __m128i xxyy13 = __lsx_vilvh_w(xy23, xy01);
+    x = v_float32x4((__m128)__lsx_vilvl_w(xxyy13, xxyy02));
+    y = v_float32x4((__m128)__lsx_vilvh_w(xxyy13, xxyy02));
+}
+
+inline void v_lut_deinterleave(const double* tab, const v_int32x4& idxvec, v_float64x2& x, v_float64x2& y)
+{
+    const int* idx = (const int*)&idxvec.val;
+    __m128i xy0 = __lsx_vld(tab + idx[0], 0);
+    __m128i xy1 = __lsx_vld(tab + idx[1], 0);
+    x = v_float64x2((__m128d)__lsx_vilvl_d(xy1, xy0));
+    y = v_float64x2((__m128d)__lsx_vilvh_d(xy1, xy0));
+}
+
+inline v_int8x16 v_interleave_pairs(const v_int8x16& vec)
+{
+    return v_int8x16(__lsx_vshuf_b(vec.val, vec.val,
+                _v128_setr_d(0x0705060403010200, 0x0f0d0e0c0b090a08)));
+}
+inline v_uint8x16 v_interleave_pairs(const v_uint8x16& vec)
+{ return v_reinterpret_as_u8(v_interleave_pairs(v_reinterpret_as_s8(vec))); }
+inline v_int8x16 v_interleave_quads(const v_int8x16& vec)
+{
+    return v_int8x16(__lsx_vshuf_b(vec.val, vec.val,
+                _v128_setr_d(0x0703060205010400, 0x0f0b0e0a0d090c08)));
+}
+inline v_uint8x16 v_interleave_quads(const v_uint8x16& vec)
+{ return v_reinterpret_as_u8(v_interleave_quads(v_reinterpret_as_s8(vec))); }
+
+inline v_int16x8 v_interleave_pairs(const v_int16x8& vec)
+{
+    return v_int16x8(__lsx_vshuf_b(vec.val, vec.val,
+                _v128_setr_d(0x0706030205040100, 0x0f0e0b0a0d0c0908)));
+}
+inline v_uint16x8 v_interleave_pairs(const v_uint16x8& vec)
+{ return v_reinterpret_as_u16(v_interleave_pairs(v_reinterpret_as_s16(vec))); }
+inline v_int16x8 v_interleave_quads(const v_int16x8& vec)
+{
+    return v_int16x8(__lsx_vshuf_b(vec.val, vec.val,
+                _v128_setr_d(0x0b0a030209080100, 0x0f0e07060d0c0504)));
+}
+inline v_uint16x8 v_interleave_quads(const v_uint16x8& vec)
+{ return v_reinterpret_as_u16(v_interleave_quads(v_reinterpret_as_s16(vec))); }
+
+inline v_int32x4 v_interleave_pairs(const v_int32x4& vec)
+{
+    return v_int32x4(__lsx_vshuf4i_w(vec.val, 0xd8));
+}
+inline v_uint32x4 v_interleave_pairs(const v_uint32x4& vec)
+{ return v_reinterpret_as_u32(v_interleave_pairs(v_reinterpret_as_s32(vec))); }
+
+inline v_float32x4 v_interleave_pairs(const v_float32x4& vec)
+{ return v_reinterpret_as_f32(v_interleave_pairs(v_reinterpret_as_s32(vec))); }
+
+inline v_int8x16 v_pack_triplets(const v_int8x16& vec)
+{
+    __m128i zero = __lsx_vldi(0);
+    return v_int8x16(__lsx_vshuf_b(zero, vec.val,
+           _v128_set_d(0x1211100f0e0d0c0a, 0x0908060504020100)));
+}
+inline v_uint8x16 v_pack_triplets(const v_uint8x16& vec)
+{ return v_reinterpret_as_u8(v_pack_triplets(v_reinterpret_as_s8(vec))); }
+
+inline v_int16x8 v_pack_triplets(const v_int16x8& vec)
+{
+    __m128i zero = __lsx_vldi(0);
+    return v_int16x8(__lsx_vshuf_b(zero, vec.val,
+           _v128_set_d(0x11100f0e0d0c0b0a, 0x0908050403020100)));
+}
+inline v_uint16x8 v_pack_triplets(const v_uint16x8& vec)
+{ return v_reinterpret_as_u16(v_pack_triplets(v_reinterpret_as_s16(vec))); }
+
+inline v_int32x4 v_pack_triplets(const v_int32x4& vec) { return vec; }
+inline v_uint32x4 v_pack_triplets(const v_uint32x4& vec) { return vec; }
+inline v_float32x4 v_pack_triplets(const v_float32x4& vec) { return vec; }
+
+//////////// Matrix operations /////////
+
+/////////// Dot Product /////////
+
+// 16 >> 32
+inline v_int32x4 v_dotprod(const v_int16x8& a, const v_int16x8& b)
+{
+    __m128i x = a.val, y = b.val;
+    return v_int32x4(__lsx_vmaddwod_w_h(__lsx_vmulwev_w_h(x, y), x, y));
+}
+inline v_int32x4 v_dotprod(const v_int16x8& a, const v_int16x8& b, const v_int32x4& c)
+{
+    __m128i x = a.val, y = b.val, z = c.val;
+    __m128i t = __lsx_vmaddwev_w_h(z, x, y);
+    return v_int32x4(__lsx_vmaddwod_w_h(t, x, y));
+}
+
+// 32 >> 64
+inline v_int64x2 v_dotprod(const v_int32x4& a, const v_int32x4& b)
+{
+    __m128i x = a.val, y = b.val;
+    return v_int64x2(__lsx_vmaddwod_d_w(__lsx_vmulwev_d_w(x, y), x, y));
+}
+inline v_int64x2 v_dotprod(const v_int32x4& a, const v_int32x4& b, const v_int64x2& c)
+{
+    __m128i x = a.val, y = b.val, z = c.val;
+    __m128i t = __lsx_vmaddwev_d_w(z, x, y);
+    return v_int64x2(__lsx_vmaddwod_d_w(t, x, y));
+}
+
+// 8 >> 32
+inline v_uint32x4 v_dotprod_expand(const v_uint8x16& a, const v_uint8x16& b)
+{
+    __m128i x = a.val, y = b.val;
+    __m128i even  = __lsx_vmulwev_h_bu(x, y);
+    __m128i odd   = __lsx_vmulwod_h_bu(x, y);
+    __m128i prod0 = __lsx_vhaddw_wu_hu(even, even);
+    __m128i prod1 = __lsx_vhaddw_wu_hu(odd, odd);
+    return v_uint32x4(__lsx_vadd_w(prod0, prod1));
+}
+
+inline v_uint32x4 v_dotprod_expand(const v_uint8x16& a, const v_uint8x16& b, const v_uint32x4& c)
+{ return v_add(v_dotprod_expand(a, b), c) ;}
+
+inline v_int32x4 v_dotprod_expand(const v_int8x16& a, const v_int8x16& b)
+{
+    __m128i x = a.val, y = b.val;
+    __m128i even  = __lsx_vmulwev_h_b(x, y);
+    __m128i odd   = __lsx_vmulwod_h_b(x, y);
+    __m128i prod0 = __lsx_vhaddw_w_h(even, even);
+    __m128i prod1 = __lsx_vhaddw_w_h(odd, odd);
+    return v_int32x4(__lsx_vadd_w(prod0, prod1));
+}
+inline v_int32x4 v_dotprod_expand(const v_int8x16& a, const v_int8x16& b, const v_int32x4& c)
+{ return v_add(v_dotprod_expand(a, b), c); }
+
+// 16 >> 64
+inline v_uint64x2 v_dotprod_expand(const v_uint16x8& a, const v_uint16x8& b)
+{
+    __m128i x = a.val, y = b.val;
+    __m128i even  = __lsx_vmulwev_w_hu(x, y);
+    __m128i odd   = __lsx_vmulwod_w_hu(x, y);
+    __m128i prod0 = __lsx_vhaddw_du_wu(even, even);
+    __m128i prod1 = __lsx_vhaddw_du_wu(odd, odd);
+    return v_uint64x2(__lsx_vadd_d(prod0, prod1));
+}
+inline v_uint64x2 v_dotprod_expand(const v_uint16x8& a, const v_uint16x8& b, const v_uint64x2& c)
+{ return v_add(v_dotprod_expand(a, b), c); }
+
+inline v_int64x2 v_dotprod_expand(const v_int16x8& a, const v_int16x8& b)
+{
+    __m128i x = a.val, y = b.val;
+    __m128i even  = __lsx_vmulwev_w_h(x, y);
+    __m128i odd   = __lsx_vmulwod_w_h(x, y);
+    __m128i prod0 = __lsx_vhaddw_d_w(even, even);
+    __m128i prod1 = __lsx_vhaddw_d_w(odd, odd);
+    return v_int64x2(__lsx_vadd_d(prod0, prod1));
+}
+inline v_int64x2 v_dotprod_expand(const v_int16x8& a, const v_int16x8& b, const v_int64x2& c)
+{ return v_add(v_dotprod_expand(a, b), c); }
+
+//32 >> 64f
+inline v_float64x2 v_dotprod_expand(const v_int32x4& a, const v_int32x4& b)
+{ return v_cvt_f64(v_dotprod(a, b)); }
+inline v_float64x2 v_dotprod_expand(const v_int32x4& a, const v_int32x4& b, const v_float64x2& c)
+{ return v_add(v_dotprod_expand(a, b), c); }
+
+
+///////// Fast Dot Product //////
+
+// 16 >> 32
+inline v_int32x4 v_dotprod_fast(const v_int16x8& a, const v_int16x8& b)
+{ return v_dotprod(a, b); }
+inline v_int32x4 v_dotprod_fast(const v_int16x8& a, const v_int16x8& b, const v_int32x4& c)
+{ return v_dotprod(a, b, c); }
+
+// 32 >> 64
+inline v_int64x2 v_dotprod_fast(const v_int32x4& a, const v_int32x4& b)
+{ return v_dotprod(a, b); }
+inline v_int64x2 v_dotprod_fast(const v_int32x4& a, const v_int32x4& b, const v_int64x2& c)
+{ return v_dotprod(a, b, c); }
+
+// 8 >> 32
+inline v_uint32x4 v_dotprod_expand_fast(const v_uint8x16& a, const v_uint8x16& b)
+{ return v_dotprod_expand(a, b); }
+inline v_uint32x4 v_dotprod_expand_fast(const v_uint8x16& a, const v_uint8x16& b, const v_uint32x4& c)
+{ return v_dotprod_expand(a, b, c); }
+
+inline v_int32x4 v_dotprod_expand_fast(const v_int8x16& a, const v_int8x16& b)
+{ return v_dotprod_expand(a, b); }
+inline v_int32x4 v_dotprod_expand_fast(const v_int8x16& a, const v_int8x16& b, const v_int32x4& c)
+{ return v_dotprod_expand(a, b, c); }
+
+// 16 >> 64
+inline v_uint64x2 v_dotprod_expand_fast(const v_uint16x8& a, const v_uint16x8& b)
+{
+    __m128i x = a.val, y = b.val;
+    __m128i even  = __lsx_vmulwev_w_hu(x, y);
+    __m128i odd   = __lsx_vmulwod_w_hu(x, y);
+    __m128i prod0 = __lsx_vhaddw_du_wu(even, even);
+    __m128i prod1 = __lsx_vhaddw_du_wu(odd, odd);
+    return v_uint64x2(__lsx_vilvl_d(__lsx_vhaddw_qu_du(prod0, prod0), __lsx_vhaddw_qu_du(prod1, prod1)));
+}
+inline v_uint64x2 v_dotprod_expand_fast(const v_uint16x8& a, const v_uint16x8& b, const v_uint64x2& c)
+{ return v_add(v_dotprod_expand_fast(a, b), c); }
+
+inline v_int64x2 v_dotprod_expand_fast(const v_int16x8& a, const v_int16x8& b)
+{
+    __m128i x = a.val, y = b.val;
+    __m128i prod = __lsx_vmaddwod_w_h(__lsx_vmulwev_w_h(x, y), x, y);
+    __m128i sign = __lsx_vsrai_w(prod, 31);
+    __m128i lo   = __lsx_vilvl_w(sign, prod);
+    __m128i hi   = __lsx_vilvh_w(sign, prod);
+    return v_int64x2(__lsx_vadd_d(lo, hi));
+}
+inline v_int64x2 v_dotprod_expand_fast(const v_int16x8& a, const v_int16x8& b, const v_int64x2& c)
+{ return v_add(v_dotprod_expand_fast(a, b), c); }
+
+// 32 >> 64f
+inline v_float64x2 v_dotprod_expand_fast(const v_int32x4& a, const v_int32x4& b)
+{ return v_dotprod_expand(a, b); }
+inline v_float64x2 v_dotprod_expand_fast(const v_int32x4& a, const v_int32x4& b, const v_float64x2& c)
+{ return v_dotprod_expand(a, b, c); }
+
+inline v_float32x4 v_matmul(const v_float32x4& v, const v_float32x4& m0,
+                            const v_float32x4& m1, const v_float32x4& m2, const v_float32x4& m3)
+{
+    __m128i x = (__m128i)v.val;
+    __m128 v0 = __lsx_vfmul_s((__m128)__lsx_vshuf4i_w(x, 0x0), m0.val);
+    __m128 v1 = __lsx_vfmul_s((__m128)__lsx_vshuf4i_w(x, 0x55), m1.val);
+    __m128 v2 = __lsx_vfmul_s((__m128)__lsx_vshuf4i_w(x, 0xAA), m2.val);
+    __m128 v3 = __lsx_vfmul_s((__m128)__lsx_vshuf4i_w(x, 0xFF), m3.val);
+
+    return v_float32x4(__lsx_vfadd_s(__lsx_vfadd_s(v0, v1), __lsx_vfadd_s(v2, v3)));
+}
+
+inline v_float32x4 v_matmuladd(const v_float32x4& v, const  v_float32x4& m0,
+                               const v_float32x4& m1, const v_float32x4& m2, const v_float32x4& a)
+{
+    __m128i x = (__m128i)v.val;
+    __m128 v0 = __lsx_vfmul_s((__m128)__lsx_vshuf4i_w(x, 0x0), m0.val);
+    __m128 v1 = __lsx_vfmul_s((__m128)__lsx_vshuf4i_w(x, 0x55), m1.val);
+    __m128 v2 = __lsx_vfmadd_s((__m128)__lsx_vshuf4i_w(x, 0xAA), m2.val, a.val);
+
+    return v_float32x4(__lsx_vfadd_s(__lsx_vfadd_s(v0, v1), v2));
+}
+
+#define OPENCV_HAL_IMPL_LSX_TRANSPOSE4X4(_Tpvec, cast_from, cast_to)                          \
+    inline void v_transpose4x4(const _Tpvec& a0, const _Tpvec& a1,                            \
+                               const _Tpvec& a2, const _Tpvec& a3,                            \
+                               _Tpvec& b0, _Tpvec& b1, _Tpvec& b2, _Tpvec& b3)                \
+   {                                                                                          \
+       __m128i t0 = cast_from(__lsx_vilvl_w(a1.val, a0.val));                                 \
+       __m128i t1 = cast_from(__lsx_vilvl_w(a3.val, a2.val));                                 \
+       __m128i t2 = cast_from(__lsx_vilvh_w(a1.val, a0.val));                                 \
+       __m128i t3 = cast_from(__lsx_vilvh_w(a3.val, a2.val));                                 \
+       b0.val = cast_to(__lsx_vilvl_d(t1, t0));                                               \
+       b1.val = cast_to(__lsx_vilvh_d(t1, t0));                                               \
+       b2.val = cast_to(__lsx_vilvl_d(t3, t2));                                               \
+       b3.val = cast_to(__lsx_vilvh_d(t3, t2));                                               \
+   }
+
+OPENCV_HAL_IMPL_LSX_TRANSPOSE4X4(v_uint32x4, OPENCV_HAL_NOP, OPENCV_HAL_NOP)
+OPENCV_HAL_IMPL_LSX_TRANSPOSE4X4(v_int32x4, OPENCV_HAL_NOP, OPENCV_HAL_NOP)
+
+inline void v_transpose4x4(const v_float32x4& a0, const v_float32x4& a1,
+                           const v_float32x4& a2, const v_float32x4& a3,
+                           v_float32x4& b0, v_float32x4& b1, v_float32x4& b2, v_float32x4& b3)
+{
+    __m128i vec0 = (__m128i)a0.val, vec1 = (__m128i)a1.val;
+    __m128i vec2 = (__m128i)a2.val, vec3 = (__m128i)a3.val;
+    __m128i t0 = __lsx_vilvl_w(vec1, vec0);
+    __m128i t1 = __lsx_vilvl_w(vec3, vec2);
+    __m128i t2 = __lsx_vilvh_w(vec1, vec0);
+    __m128i t3 = __lsx_vilvh_w(vec3, vec2);
+    b0.val = __m128(__lsx_vilvl_d(t1, t0));
+    b1.val = __m128(__lsx_vilvh_d(t1, t0));
+    b2.val = __m128(__lsx_vilvl_d(t3, t2));
+    b3.val = __m128(__lsx_vilvh_d(t3, t2));
+}
+
+////////////////// Value reordering ////////////////
+
+/* Expand */
+#define OPENCV_HAL_IMPL_LSX_EXPAND(_Tpvec, _Tpwvec, _Tp, intrin_lo, intrin_hi)     \
+    inline void v_expand(const _Tpvec& a, _Tpwvec& b0, _Tpwvec& b1)                \
+    {                                                                              \
+        b0.val = intrin_lo(a.val, 0);                                              \
+        b1.val = intrin_hi(a.val);                                                 \
+    }                                                                              \
+    inline _Tpwvec v_expand_low(const _Tpvec& a)                                   \
+    { return _Tpwvec(intrin_lo(a.val, 0)); }                                       \
+    inline _Tpwvec v_expand_high(const _Tpvec& a)                                  \
+    { return _Tpwvec(intrin_hi(a.val)); }                                          \
+    inline _Tpwvec v_load_expand(const _Tp* ptr)                                   \
+    {                                                                              \
+        __m128i a = __lsx_vld(ptr, 0);                                             \
+        return _Tpwvec(intrin_lo(a, 0));                                           \
+    }
+
+OPENCV_HAL_IMPL_LSX_EXPAND(v_uint8x16, v_uint16x8, uchar,     __lsx_vsllwil_hu_bu, __lsx_vexth_hu_bu)
+OPENCV_HAL_IMPL_LSX_EXPAND(v_int8x16,  v_int16x8,  schar,     __lsx_vsllwil_h_b,   __lsx_vexth_h_b)
+OPENCV_HAL_IMPL_LSX_EXPAND(v_uint16x8, v_uint32x4, ushort,    __lsx_vsllwil_wu_hu, __lsx_vexth_wu_hu)
+OPENCV_HAL_IMPL_LSX_EXPAND(v_int16x8,  v_int32x4,  short,     __lsx_vsllwil_w_h,   __lsx_vexth_w_h)
+OPENCV_HAL_IMPL_LSX_EXPAND(v_uint32x4, v_uint64x2, unsigned,  __lsx_vsllwil_du_wu, __lsx_vexth_du_wu)
+OPENCV_HAL_IMPL_LSX_EXPAND(v_int32x4,  v_int64x2,  int,       __lsx_vsllwil_d_w,   __lsx_vexth_d_w)
+
+#define OPENCV_HAL_IMPL_LSX_EXPAND_Q(_Tpvec, _Tp, intrin_lo, intrin_hi)          \
+    inline _Tpvec v_load_expand_q(const _Tp* ptr)                                \
+    {                                                                            \
+        __m128i a = __lsx_vld(ptr, 0);                                           \
+        __m128i b = intrin_lo(a, 0);                                             \
+        return _Tpvec(intrin_hi(b, 0));                                          \
+    }
+
+OPENCV_HAL_IMPL_LSX_EXPAND_Q(v_uint32x4, uchar, __lsx_vsllwil_hu_bu, __lsx_vsllwil_wu_hu)
+OPENCV_HAL_IMPL_LSX_EXPAND_Q(v_int32x4,  schar, __lsx_vsllwil_h_b,   __lsx_vsllwil_w_h)
+
+/* pack */
+// 16
+inline v_int8x16 v_pack(const v_int16x8& a, const v_int16x8& b)
+{ return v_int8x16(_lsx_packs_h(a.val, b.val)); }
+
+inline v_uint8x16 v_pack(const v_uint16x8& a, const v_uint16x8& b)
+{ return v_uint8x16(__lsx_vssrlrni_bu_h(b.val, a.val, 0)); }
+
+inline v_uint8x16 v_pack_u(const v_int16x8& a, const v_int16x8& b)
+{ return v_uint8x16(_lsx_packus_h(a.val, b.val)); }
+
+inline void v_pack_store(schar* ptr, const v_int16x8& a)
+{ v_store_low(ptr, v_pack(a, a)); }
+
+inline void v_pack_store(uchar* ptr, const v_uint16x8& a)
+{ v_store_low(ptr, v_pack(a, a)); }
+
+inline void v_pack_u_store(uchar* ptr, const v_int16x8& a)
+{ v_store_low(ptr, v_pack_u(a, a)); }
+
+template<int n> inline
+v_uint8x16 v_rshr_pack(const v_uint16x8& a, const v_uint16x8& b)
+{ return v_uint8x16(__lsx_vssrlrni_bu_h(b.val, a.val, n)); }
+
+template<int n> inline
+void v_rshr_pack_store(uchar* ptr, const v_uint16x8& a)
+{ __lsx_vstelm_d(__lsx_vssrlrni_bu_h(a.val, a.val, n), ptr, 0, 0); }
+
+template<int n> inline
+v_uint8x16 v_rshr_pack_u(const v_int16x8& a, const v_int16x8& b)
+{ return v_uint8x16(__lsx_vssrarni_bu_h(b.val, a.val, n)); }
+
+template<int n> inline
+void v_rshr_pack_u_store(uchar* ptr, const v_int16x8& a)
+{ __lsx_vstelm_d(__lsx_vssrarni_bu_h(a.val, a.val, n), ptr, 0, 0); }
+
+template<int n> inline
+v_int8x16 v_rshr_pack(const v_int16x8& a, const v_int16x8& b)
+{ return v_int8x16(__lsx_vssrarni_b_h(b.val, a.val, n)); }
+
+template<int n> inline
+void v_rshr_pack_store(schar* ptr, const v_int16x8& a)
+{ __lsx_vstelm_d(__lsx_vssrarni_b_h(a.val, a.val, n), ptr, 0, 0); }
+
+//32
+inline v_int16x8 v_pack(const v_int32x4& a, const v_int32x4& b)
+{ return v_int16x8(__lsx_vssrarni_h_w(b.val, a.val, 0)); }
+
+inline v_uint16x8 v_pack(const v_uint32x4& a, const v_uint32x4& b)
+{ return v_uint16x8(__lsx_vssrlrni_hu_w(b.val, a.val, 0)); }
+
+inline v_uint16x8 v_pack_u(const v_int32x4& a, const v_int32x4& b)
+{ return v_uint16x8(__lsx_vssrarni_hu_w(b.val, a.val, 0)); }
+
+inline void v_pack_store(short* ptr, const v_int32x4& a)
+{ v_store_low(ptr, v_pack(a, a)); }
+
+inline void v_pack_store(ushort *ptr, const v_uint32x4& a)
+{ __lsx_vstelm_d(__lsx_vssrlrni_hu_w(a.val, a.val, 0), ptr,  0, 0); }
+
+inline void v_pack_u_store(ushort* ptr, const v_int32x4& a)
+{ __lsx_vstelm_d(__lsx_vssrarni_hu_w(a.val, a.val, 0), ptr, 0, 0); }
+
+template<int n> inline
+v_uint16x8 v_rshr_pack(const v_uint32x4& a, const v_uint32x4& b)
+{ return v_uint16x8(__lsx_vssrlrni_hu_w(b.val, a.val, n)); }
+
+template<int n> inline
+void v_rshr_pack_store(ushort* ptr, const v_uint32x4& a)
+{ __lsx_vstelm_d(__lsx_vssrlrni_hu_w(a.val, a.val, n), ptr, 0, 0); }
+
+template<int n> inline
+v_uint16x8 v_rshr_pack_u(const v_int32x4& a, const v_int32x4& b)
+{ return v_uint16x8(__lsx_vssrarni_hu_w(b.val, a.val, n)); }
+
+template<int n> inline
+void v_rshr_pack_u_store(ushort* ptr, const v_int32x4& a)
+{ __lsx_vstelm_d(__lsx_vssrarni_hu_w(a.val, a.val, n), ptr, 0, 0); }
+
+template<int n> inline
+v_int16x8 v_rshr_pack(const v_int32x4& a, const v_int32x4& b)
+{ return v_int16x8(__lsx_vssrarni_h_w(b.val, a.val, n)); }
+
+template<int n> inline
+void v_rshr_pack_store(short* ptr, const v_int32x4& a)
+{ __lsx_vstelm_d(__lsx_vssrarni_h_w(a.val, a.val, n), ptr, 0, 0); }
+
+// 64
+// Non-saturaing pack
+inline v_uint32x4 v_pack(const v_uint64x2& a, const v_uint64x2& b)
+{ return v_uint32x4(__lsx_vpickev_w(b.val, a.val)); }
+
+inline v_int32x4 v_pack(const v_int64x2& a, const v_int64x2& b)
+{ return v_reinterpret_as_s32(v_pack(v_reinterpret_as_u64(a), v_reinterpret_as_u64(b))); }
+
+inline void v_pack_store(unsigned* ptr, const v_uint64x2& a)
+{ __lsx_vstelm_d(__lsx_vshuf4i_w(a.val, 0x08), ptr, 0, 0); }
+
+inline void v_pack_store(int *ptr, const v_int64x2& a)
+{ v_pack_store((unsigned*)ptr, v_reinterpret_as_u64(a)); }
+
+template<int n> inline
+v_uint32x4 v_rshr_pack(const v_uint64x2& a, const v_uint64x2& b)
+{ return v_uint32x4(__lsx_vsrlrni_w_d(b.val, a.val, n)); }
+
+template<int n> inline
+void v_rshr_pack_store(unsigned* ptr, const v_uint64x2& a)
+{ __lsx_vstelm_d(__lsx_vsrlrni_w_d(a.val, a.val, n), ptr, 0, 0); }
+
+template<int n> inline
+v_int32x4 v_rshr_pack(const v_int64x2& a, const v_int64x2& b)
+{ return v_int32x4(__lsx_vsrarni_w_d(b.val, a.val, n)); }
+
+template<int n> inline
+void v_rshr_pack_store(int* ptr, const v_int64x2& a)
+{ __lsx_vstelm_d(__lsx_vsrarni_w_d(a.val, a.val, n), ptr, 0, 0); }
+
+// pack boolean
+inline v_uint8x16 v_pack_b(const v_uint16x8& a, const v_uint16x8& b)
+{ return v_uint8x16(__lsx_vssrarni_b_h(b.val, a.val, 0)); }
+
+inline v_uint8x16 v_pack_b(const v_uint32x4& a, const v_uint32x4& b,
+                           const v_uint32x4& c, const v_uint32x4& d)
+{
+    __m128i ab = __lsx_vssrarni_h_w(b.val, a.val, 0);
+    __m128i cd = __lsx_vssrarni_h_w(d.val, c.val, 0);
+    return v_uint8x16(__lsx_vssrarni_b_h(cd, ab, 0));
+}
+
+inline v_uint8x16 v_pack_b(const v_uint64x2& a, const v_uint64x2& b, const v_uint64x2& c,
+                           const v_uint64x2& d, const v_uint64x2& e, const v_uint64x2& f,
+                           const v_uint64x2& g, const v_uint64x2& h)
+{
+    __m128i ab = __lsx_vssrarni_w_d(b.val, a.val, 0);
+    __m128i cd = __lsx_vssrarni_w_d(d.val, c.val, 0);
+    __m128i ef = __lsx_vssrarni_w_d(f.val, e.val, 0);
+    __m128i gh = __lsx_vssrarni_w_d(h.val, g.val, 0);
+
+    __m128i abcd = __lsx_vssrarni_h_w(cd, ab, 0);
+    __m128i efgh = __lsx_vssrarni_h_w(gh, ef, 0);
+    return v_uint8x16(__lsx_vssrarni_b_h(efgh, abcd, 0));
+}
+
+/* Recombine */
+// its up there with load and store operations
+
+/* Extract */
+#define OPENCV_HAL_IMPL_LSX_EXTRACT(_Tpvec)                    \
+    template<int s>                                            \
+    inline _Tpvec v_extract(const _Tpvec& a, const _Tpvec& b)  \
+    { return v_rotate_right<s>(a, b); }
+
+OPENCV_HAL_IMPL_LSX_EXTRACT(v_uint8x16)
+OPENCV_HAL_IMPL_LSX_EXTRACT(v_int8x16)
+OPENCV_HAL_IMPL_LSX_EXTRACT(v_uint16x8)
+OPENCV_HAL_IMPL_LSX_EXTRACT(v_int16x8)
+OPENCV_HAL_IMPL_LSX_EXTRACT(v_uint32x4)
+OPENCV_HAL_IMPL_LSX_EXTRACT(v_int32x4)
+OPENCV_HAL_IMPL_LSX_EXTRACT(v_uint64x2)
+OPENCV_HAL_IMPL_LSX_EXTRACT(v_int64x2)
+OPENCV_HAL_IMPL_LSX_EXTRACT(v_float32x4)
+OPENCV_HAL_IMPL_LSX_EXTRACT(v_float64x2)
+
+#define OPENCV_HAL_IMPL_LSX_EXTRACT_N(_Tpvec, _Twvec, intrin)             \
+template<int i>                                                           \
+inline _Twvec v_extract_n(const _Tpvec& a)                                \
+{ return (_Twvec)intrin(a.val, i); }
+
+OPENCV_HAL_IMPL_LSX_EXTRACT_N(v_uint8x16, uchar,   __lsx_vpickve2gr_b)
+OPENCV_HAL_IMPL_LSX_EXTRACT_N(v_int8x16,  schar,   __lsx_vpickve2gr_b)
+OPENCV_HAL_IMPL_LSX_EXTRACT_N(v_uint16x8, ushort,  __lsx_vpickve2gr_h)
+OPENCV_HAL_IMPL_LSX_EXTRACT_N(v_int16x8,  short,   __lsx_vpickve2gr_h)
+OPENCV_HAL_IMPL_LSX_EXTRACT_N(v_uint32x4, uint,    __lsx_vpickve2gr_w)
+OPENCV_HAL_IMPL_LSX_EXTRACT_N(v_int32x4,  int,     __lsx_vpickve2gr_w)
+OPENCV_HAL_IMPL_LSX_EXTRACT_N(v_uint64x2, uint64,  __lsx_vpickve2gr_d)
+OPENCV_HAL_IMPL_LSX_EXTRACT_N(v_int64x2,  int64,   __lsx_vpickve2gr_d)
+
+template<int i>
+inline float v_extract_n(const v_float32x4& v)
+{
+    union { uint iv; float fv; } d;
+    d.iv = __lsx_vpickve2gr_w(v.val, i);
+    return d.fv;
+}
+
+template<int i>
+inline double v_extract_n(const v_float64x2& v)
+{
+    union { uint64 iv; double dv; } d;
+    d.iv = __lsx_vpickve2gr_d(v.val, i);
+    return d.dv;
+}
+
+template<int i>
+inline v_uint32x4 v_broadcast_element(const v_uint32x4& a)
+{ return v_uint32x4(__lsx_vreplvei_w(a.val, i)); }
+
+template<int i>
+inline v_int32x4 v_broadcast_element(const v_int32x4& a)
+{ return v_int32x4(__lsx_vreplvei_w(a.val, i)); }
+
+template<int i>
+inline v_float32x4 v_broadcast_element(const v_float32x4& a)
+{ return v_float32x4((__m128)__lsx_vreplvei_w((__m128i)a.val, i)); }
+
+/////////////////// load deinterleave //////////////////////////////
+
+inline void v_load_deinterleave(const uchar* ptr, v_uint8x16& a, v_uint8x16& b)
+{
+    __m128i t0 = __lsx_vld(ptr, 0);
+    __m128i t1 = __lsx_vld(ptr, 16);
+
+    a.val = __lsx_vpickev_b(t1, t0);
+    b.val = __lsx_vpickod_b(t1, t0);
+}
+
+inline void v_load_deinterleave(const ushort* ptr, v_uint16x8& a, v_uint16x8& b)
+{
+    __m128i t0 = __lsx_vld(ptr, 0);
+    __m128i t1 = __lsx_vld(ptr, 16);
+    a.val = __lsx_vpickev_h(t1, t0);
+    b.val = __lsx_vpickod_h(t1, t0);
+}
+
+inline void v_load_deinterleave(const unsigned* ptr, v_uint32x4& a, v_uint32x4& b)
+{
+    __m128i t0 = __lsx_vld(ptr, 0);
+    __m128i t1 = __lsx_vld(ptr, 16);
+    a.val = __lsx_vpickev_w(t1, t0);
+    b.val = __lsx_vpickod_w(t1, t0);
+}
+
+inline void v_load_deinterleave(const uint64* ptr, v_uint64x2& a, v_uint64x2& b)
+{
+    __m128i t0 = __lsx_vld(ptr, 0);
+    __m128i t1 = __lsx_vld(ptr, 16);
+    a.val = __lsx_vilvl_d(t1, t0);
+    b.val = __lsx_vilvh_d(t1, t0);
+}
+
+inline void v_load_deinterleave(const uchar* ptr, v_uint8x16& a, v_uint8x16& b, v_uint8x16& c)
+{
+    __m128i t0 = __lsx_vld(ptr, 0);
+    __m128i t1 = __lsx_vld(ptr, 16);
+    __m128i t2 = __lsx_vld(ptr, 32);
+    const __m128i shuff0 = _v128_setr_b(0, 0, -1, 0, 0, -1, 0, 0, -1, 0, 0, -1, 0, 0, -1, 0);
+    const __m128i shuff1 = _v128_setr_b(0, -1, 0, 0, -1, 0, 0, -1, 0, 0, -1, 0, 0, -1, 0, 0);
+    __m128i a0 = __lsx_vbitsel_v(t0, t1, shuff0);
+    __m128i b0 = __lsx_vbitsel_v(t1, t0, shuff1);
+    __m128i c0 = __lsx_vbitsel_v(t1, t0, shuff0);
+    const __m128i shuff_a = _v128_setr_b(0, 3, 6, 9, 12, 15, 2, 5, 8, 11, 14, 17, 20, 23, 26, 29);
+    const __m128i shuff_b = _v128_setr_b(1, 4, 7, 10, 13, 0, 3, 6, 9, 12, 15, 18, 21, 24, 27, 30);
+    const __m128i shuff_c = _v128_setr_b(2, 5, 8, 11, 14, 1, 4, 7, 10, 13, 16, 19, 22, 25, 28, 31);
+
+    a.val = __lsx_vshuf_b(t2, a0, shuff_a);
+    b.val = __lsx_vshuf_b(t2, b0, shuff_b);
+    c.val = __lsx_vshuf_b(t2, c0, shuff_c);
+}
+
+inline void v_load_deinterleave(const ushort* ptr, v_uint16x8& a, v_uint16x8& b, v_uint16x8& c)
+{
+    __m128i t0 = __lsx_vld(ptr, 0);
+    __m128i t1 = __lsx_vld(ptr, 16);
+    __m128i t2 = __lsx_vld(ptr, 32);
+    const __m128i shuff0 = _v128_setr_h(0, 0, -1, 0, 0, -1, 0, 0);
+    const __m128i shuff1 = _v128_setr_h(0, -1, 0, 0, -1, 0, 0, -1);
+
+    __m128i a0 = __lsx_vbitsel_v(t0, t1, shuff1);
+    __m128i b0 = __lsx_vbitsel_v(t0, t1, shuff0);
+    __m128i c0 = __lsx_vbitsel_v(t1, t0, shuff0);
+
+    const __m128i shuff_a = _v128_setr_b(0, 1, 6, 7, 12, 13, 2, 3, 8, 9, 14, 15, 20, 21, 26, 27);
+    const __m128i shuff_b = _v128_setr_b(2, 3, 8, 9, 14, 15, 4, 5, 10, 11, 16, 17, 22, 23, 28, 29);
+    const __m128i shuff_c = _v128_setr_b(4, 5, 10, 11, 0, 1, 6, 7, 12, 13, 18, 19, 24, 25, 30, 31);
+
+    a.val = __lsx_vshuf_b(t2, a0, shuff_a);
+    b.val = __lsx_vshuf_b(t2, b0, shuff_b);
+    c.val = __lsx_vshuf_b(t2, c0, shuff_c);
+}
+
+inline void v_load_deinterleave(const unsigned* ptr, v_uint32x4& a, v_uint32x4& b, v_uint32x4& c)
+{
+    __m128i t0 = __lsx_vld(ptr, 0);
+    __m128i t1 = __lsx_vld(ptr, 16);
+    __m128i t2 = __lsx_vld(ptr, 32);
+
+    __m128i a0 = __lsx_vpermi_w(t1, t0, 0xAC);
+    __m128i b0 = __lsx_vpermi_w(t1, t0, 0xC5);
+    __m128i c0 = __lsx_vpermi_w(t1, t0, 0x5A);
+
+    a.val = __lsx_vextrins_w(a0, t2, 0x31);
+    b0    = __lsx_vshuf4i_w(b0, 0x38);
+    c0    = __lsx_vshuf4i_w(c0, 0x8);
+    b.val = __lsx_vextrins_w(b0, t2, 0x32);
+    c.val = __lsx_vpermi_w(t2, c0, 0xC4);
+}
+
+inline void v_load_deinterleave(const uint64* ptr, v_uint64x2& a, v_uint64x2& b, v_uint64x2& c)
+{
+    __m128i t0 = __lsx_vld(ptr, 0);
+    __m128i t1 = __lsx_vld(ptr, 16);
+    __m128i t2 = __lsx_vld(ptr, 32);
+
+    a.val = __lsx_vshuf4i_d(t0, t1, 0xC);
+    b.val = __lsx_vshuf4i_d(t0, t2, 0x9);
+    c.val = __lsx_vshuf4i_d(t1, t2, 0xC);
+}
+
+inline void v_load_deinterleave(const uchar* ptr, v_uint8x16& a, v_uint8x16& b, v_uint8x16& c, v_uint8x16& d)
+{
+    __m128i t0 = __lsx_vld(ptr, 0);
+    __m128i t1 = __lsx_vld(ptr, 16);
+    __m128i t2 = __lsx_vld(ptr, 32);
+    __m128i t3 = __lsx_vld(ptr, 48);
+
+    __m128i ac_lo = __lsx_vpickev_b(t1, t0);
+    __m128i bd_lo = __lsx_vpickod_b(t1, t0);
+    __m128i ac_hi = __lsx_vpickev_b(t3, t2);
+    __m128i bd_hi = __lsx_vpickod_b(t3, t2);
+
+    a.val = __lsx_vpickev_b(ac_hi, ac_lo);
+    c.val = __lsx_vpickod_b(ac_hi, ac_lo);
+    b.val = __lsx_vpickev_b(bd_hi, bd_lo);
+    d.val = __lsx_vpickod_b(bd_hi, bd_lo);
+}
+
+inline void v_load_deinterleave(const ushort* ptr, v_uint16x8& a, v_uint16x8& b, v_uint16x8& c, v_uint16x8& d)
+{
+    __m128i t0 = __lsx_vld(ptr, 0);
+    __m128i t1 = __lsx_vld(ptr, 16);
+    __m128i t2 = __lsx_vld(ptr, 32);
+    __m128i t3 = __lsx_vld(ptr, 48);
+
+    __m128i ac_lo = __lsx_vpickev_h(t1, t0);
+    __m128i bd_lo = __lsx_vpickod_h(t1, t0);
+    __m128i ac_hi = __lsx_vpickev_h(t3, t2);
+    __m128i bd_hi = __lsx_vpickod_h(t3, t2);
+
+    a.val = __lsx_vpickev_h(ac_hi, ac_lo);
+    c.val = __lsx_vpickod_h(ac_hi, ac_lo);
+    b.val = __lsx_vpickev_h(bd_hi, bd_lo);
+    d.val = __lsx_vpickod_h(bd_hi, bd_lo);
+}
+
+inline void v_load_deinterleave(const unsigned* ptr, v_uint32x4& a, v_uint32x4& b, v_uint32x4& c, v_uint32x4& d)
+{
+    __m128i p0 = __lsx_vld(ptr, 0);
+    __m128i p1 = __lsx_vld(ptr, 16);
+    __m128i p2 = __lsx_vld(ptr, 32);
+    __m128i p3 = __lsx_vld(ptr, 48);
+
+    __m128i t0 = __lsx_vilvl_w(p1, p0);
+    __m128i t1 = __lsx_vilvl_w(p3, p2);
+    __m128i t2 = __lsx_vilvh_w(p1, p0);
+    __m128i t3 = __lsx_vilvh_w(p3, p2);
+    a.val = __lsx_vilvl_d(t1, t0);
+    b.val = __lsx_vilvh_d(t1, t0);
+    c.val = __lsx_vilvl_d(t3, t2);
+    d.val = __lsx_vilvh_d(t3, t2);
+}
+
+inline void v_load_deinterleave(const uint64* ptr, v_uint64x2& a, v_uint64x2& b, v_uint64x2& c, v_uint64x2& d)
+{
+    __m128i t0 = __lsx_vld(ptr, 0);
+    __m128i t1 = __lsx_vld(ptr, 16);
+    __m128i t2 = __lsx_vld(ptr, 32);
+    __m128i t3 = __lsx_vld(ptr, 48);
+
+    a.val = __lsx_vilvl_d(t2, t0);
+    b.val = __lsx_vilvh_d(t2, t0);
+    c.val = __lsx_vilvl_d(t3, t1);
+    d.val = __lsx_vilvh_d(t3, t1);
+}
+
+////////////////////////// store interleave ////////////////////////////////
+
+inline void v_store_interleave(uchar* ptr, const v_uint8x16& a, const v_uint8x16& b,
+                               hal::StoreMode /*mode*/ = hal::STORE_UNALIGNED)
+{
+    __m128i v0 = __lsx_vilvl_b(b.val, a.val);
+    __m128i v1 = __lsx_vilvh_b(b.val, a.val);
+
+    __lsx_vst(v0, ptr, 0);
+    __lsx_vst(v1, ptr, 16);
+}
+
+inline void v_store_interleave(ushort* ptr, const v_uint16x8& a, const v_uint16x8& b,
+                               hal::StoreMode /*mode*/ = hal::STORE_UNALIGNED)
+{
+    __m128i v0 = __lsx_vilvl_h(b.val, a.val);
+    __m128i v1 = __lsx_vilvh_h(b.val, a.val);
+
+    __lsx_vst(v0, ptr, 0);
+    __lsx_vst(v1, ptr, 16);
+}
+
+inline void v_store_interleave(unsigned* ptr, const v_uint32x4& a, const v_uint32x4& b,
+                               hal::StoreMode /*mode*/ = hal::STORE_UNALIGNED)
+{
+    __m128i v0 = __lsx_vilvl_w(b.val, a.val);
+    __m128i v1 = __lsx_vilvh_w(b.val, a.val);
+
+    __lsx_vst(v0, ptr, 0);
+    __lsx_vst(v1, ptr, 16);
+}
+
+inline void v_store_interleave(uint64* ptr, const v_uint64x2& a, const v_uint64x2& b,
+                               hal::StoreMode /*mode*/ = hal::STORE_UNALIGNED)
+{
+    __m128i v0 = __lsx_vilvl_d(b.val, a.val);
+    __m128i v1 = __lsx_vilvh_d(b.val, a.val);
+
+    __lsx_vst(v0, ptr, 0);
+    __lsx_vst(v1, ptr, 16);
+}
+
+inline void v_store_interleave(uchar* ptr, const v_uint8x16& a, const v_uint8x16& b, const v_uint8x16& c,
+                               hal::StoreMode /*mode*/ = hal::STORE_UNALIGNED)
+{
+    __m128i ab_lo = __lsx_vilvl_b(b.val, a.val);
+    __m128i ab_hi = __lsx_vilvh_b(b.val, a.val);
+    __m128i v_c = c.val;
+    const __m128i shuff0 = _v128_setr_b(0, 1, 16, 2, 3, 17, 4, 5, 18, 6, 7, 19, 8, 9, 20, 10);
+    const __m128i shuff1 = _v128_setr_b(11, 21, 12, 13, 22, 14, 15, 23, 0, 0, 0, 0, 0, 0, 0, 0);
+    const __m128i shuff2 = _v128_setr_b(0, 1, 2, 3, 4, 5, 6, 7, 16, 17, 24, 18, 19, 25, 20, 21);
+    const __m128i shuff3 = _v128_setr_b(26, 6, 7, 27, 8, 9, 28, 10, 11, 29, 12, 13, 30, 14, 15, 31);
+    __m128i abc = __lsx_vpermi_w(v_c, ab_hi, 0xE4);
+
+    __m128i dst0 = __lsx_vshuf_b(v_c, ab_lo, shuff0);
+    __m128i dst1 = __lsx_vshuf_b(v_c, ab_lo, shuff1);
+    __m128i dst2 = __lsx_vshuf_b(v_c, ab_hi, shuff3);
+    dst1 = __lsx_vshuf_b(abc, dst1, shuff2);
+
+    __lsx_vst(dst0, ptr, 0);
+    __lsx_vst(dst1, ptr, 16);
+    __lsx_vst(dst2, ptr, 32);
+}
+
+inline void v_store_interleave(ushort* ptr, const v_uint16x8& a, const v_uint16x8& b, const v_uint16x8& c,
+                               hal::StoreMode /*mode*/ = hal::STORE_UNALIGNED)
+{
+    __m128i ab_lo = __lsx_vilvl_h(b.val, a.val);
+    __m128i ab_hi = __lsx_vilvh_h(b.val, a.val);
+    __m128i v_c = c.val;
+    const __m128i shuff0 = _v128_setr_b(0, 1, 2, 3, 16, 17, 4, 5, 6, 7, 18, 19, 8, 9, 10, 11);
+    const __m128i shuff1 = _v128_setr_b(20, 21, 12, 13, 14, 15, 22, 23, 0, 0, 0, 0, 0, 0, 0, 0);
+    const __m128i shuff2 = _v128_setr_b(0, 1, 2, 3, 4, 5, 6, 7, 16, 17, 18, 19, 24, 25, 20, 21);
+    const __m128i shuff3 = _v128_setr_b(6, 7, 26, 27, 8, 9, 10, 11, 28, 29, 12, 13, 14, 15, 30, 31);
+    __m128i abc = __lsx_vpermi_w(v_c, ab_hi, 0xE4);
+
+    __m128i dst0 = __lsx_vshuf_b(v_c, ab_lo, shuff0);
+    __m128i dst1 = __lsx_vshuf_b(v_c, ab_lo, shuff1);
+    __m128i dst2 = __lsx_vshuf_b(v_c, ab_hi, shuff3);
+    dst1 = __lsx_vshuf_b(abc, dst1, shuff2);
+
+    __lsx_vst(dst0, ptr, 0);
+    __lsx_vst(dst1, ptr, 16);
+    __lsx_vst(dst2, ptr, 32);
+}
+
+inline void v_store_interleave(unsigned* ptr, const v_uint32x4& a, const v_uint32x4& b, const v_uint32x4& c,
+                               hal::StoreMode /*mode*/ = hal::STORE_UNALIGNED)
+{
+    __m128i v_c = c.val;
+    __m128i ab_lo = __lsx_vilvl_w(b.val, a.val);  //a0 b0 a1 b1
+    __m128i ab_hi = __lsx_vilvh_w(b.val, a.val);  //a2 b2 a3 b3
+    __m128i bc_od = __lsx_vpackod_w(v_c, b.val); // b1 c1 b3 c3
+
+    __m128i dst0 = __lsx_vshuf4i_w(ab_lo, 0xB4);  //a0 b0 b1 a1
+    __m128i dst1 = __lsx_vilvl_d(ab_hi, bc_od); //b1 c1 a2 b2
+    __m128i dst2 = __lsx_vpermi_w(bc_od, ab_hi, 0xE8); //a2, a3, b3, c3
+
+    dst0 = __lsx_vextrins_w(dst0, v_c, 0x20);
+    dst2 = __lsx_vextrins_w(dst2, v_c, 0x2);
+    __lsx_vst(dst0, ptr, 0);  //a0 b0 c0 a1
+    __lsx_vst(dst1, ptr, 16); //b1 c1 a2 b2
+    __lsx_vst(dst2, ptr, 32); //c2 a3 b3 c3
+}
+
+inline void v_store_interleave(uint64* ptr, const v_uint64x2& a, const v_uint64x2& b, const v_uint64x2& c,
+                               hal::StoreMode /*mode*/ = hal::STORE_UNALIGNED)
+{
+    __m128i dst0 = __lsx_vilvl_d(b.val, a.val);
+    __m128i dst1 = __lsx_vpermi_w(a.val, c.val, 0xE4);
+    __m128i dst2 = __lsx_vilvh_d(c.val, b.val);
+
+    __lsx_vst(dst0, ptr, 0);
+    __lsx_vst(dst1, ptr, 16);
+    __lsx_vst(dst2, ptr, 32);
+}
+
+inline void v_store_interleave(uchar* ptr, const v_uint8x16& a, const v_uint8x16& b,
+                               const v_uint8x16& c, const v_uint8x16& d,
+                               hal::StoreMode /*mode*/ = hal::STORE_UNALIGNED)
+{
+    __m128i ab_lo = __lsx_vilvl_b(b.val, a.val);
+    __m128i ab_hi = __lsx_vilvh_b(b.val, a.val);
+    __m128i cd_lo = __lsx_vilvl_b(d.val, c.val);
+    __m128i cd_hi = __lsx_vilvh_b(d.val, c.val);
+
+    __m128i dst0 = __lsx_vilvl_h(cd_lo, ab_lo);
+    __m128i dst1 = __lsx_vilvh_h(cd_lo, ab_lo);
+    __m128i dst2 = __lsx_vilvl_h(cd_hi, ab_hi);
+    __m128i dst3 = __lsx_vilvh_h(cd_hi, ab_hi);
+
+    __lsx_vst(dst0, ptr, 0);
+    __lsx_vst(dst1, ptr, 16);
+    __lsx_vst(dst2, ptr, 32);
+    __lsx_vst(dst3, ptr, 48);
+}
+
+inline void v_store_interleave(ushort* ptr, const v_uint16x8& a, const v_uint16x8& b,
+                               const v_uint16x8& c, const v_uint16x8& d,
+                               hal::StoreMode /*mode*/ = hal::STORE_UNALIGNED)
+{
+    __m128i ab_lo = __lsx_vilvl_h(b.val, a.val);
+    __m128i ab_hi = __lsx_vilvh_h(b.val, a.val);
+    __m128i cd_lo = __lsx_vilvl_h(d.val, c.val);
+    __m128i cd_hi = __lsx_vilvh_h(d.val, c.val);
+
+    __m128i dst0 = __lsx_vilvl_w(cd_lo, ab_lo);
+    __m128i dst1 = __lsx_vilvh_w(cd_lo, ab_lo);
+    __m128i dst2 = __lsx_vilvl_w(cd_hi, ab_hi);
+    __m128i dst3 = __lsx_vilvh_w(cd_hi, ab_hi);
+
+    __lsx_vst(dst0, ptr, 0);
+    __lsx_vst(dst1, ptr, 16);
+    __lsx_vst(dst2, ptr, 32);
+    __lsx_vst(dst3, ptr, 48);
+}
+
+inline void v_store_interleave(unsigned* ptr, const v_uint32x4& a, const v_uint32x4& b,
+                               const v_uint32x4& c, const v_uint32x4& d,
+                               hal::StoreMode /*mode*/ = hal::STORE_UNALIGNED)
+{
+    __m128i ab_lo = __lsx_vilvl_w(b.val, a.val);
+    __m128i ab_hi = __lsx_vilvh_w(b.val, a.val);
+    __m128i cd_lo = __lsx_vilvl_w(d.val, c.val);
+    __m128i cd_hi = __lsx_vilvh_w(d.val, c.val);
+
+    __m128i dst0 = __lsx_vilvl_d(cd_lo, ab_lo);
+    __m128i dst1 = __lsx_vilvh_d(cd_lo, ab_lo);
+    __m128i dst2 = __lsx_vilvl_d(cd_hi, ab_hi);
+    __m128i dst3 = __lsx_vilvh_d(cd_hi, ab_hi);
+
+    __lsx_vst(dst0, ptr, 0);
+    __lsx_vst(dst1, ptr, 16);
+    __lsx_vst(dst2, ptr, 32);
+    __lsx_vst(dst3, ptr, 48);
+}
+
+inline void v_store_interleave(uint64* ptr, const v_uint64x2& a, const v_uint64x2& b,
+                               const v_uint64x2& c, const v_uint64x2& d,
+                               hal::StoreMode /*mode*/ = hal::STORE_UNALIGNED)
+{
+    __m128i dst0 = __lsx_vilvl_d(b.val, a.val);
+    __m128i dst2 = __lsx_vilvh_d(b.val, a.val);
+    __m128i dst1 = __lsx_vilvl_d(d.val, c.val);
+    __m128i dst3 = __lsx_vilvh_d(d.val, c.val);
+
+    __lsx_vst(dst0, ptr, 0);
+    __lsx_vst(dst1, ptr, 16);
+    __lsx_vst(dst2, ptr, 32);
+    __lsx_vst(dst3, ptr, 48);
+}
+
+#define OPENCV_HAL_IMPL_LSX_LOADSTORE_INTERLEAVE(_Tpvec0, _Tp0, suffix0, _Tpvec1, _Tp1, suffix1)  \
+inline void v_load_deinterleave(const _Tp0* ptr, _Tpvec0& a0, _Tpvec0& b0)                        \
+{                                                                                                 \
+    _Tpvec1 a1, b1;                                                                               \
+    v_load_deinterleave((const _Tp1*)ptr, a1, b1);                                                \
+    a0 = v_reinterpret_as_##suffix0(a1);                                                          \
+    b0 = v_reinterpret_as_##suffix0(b1);                                                          \
+}                                                                                                 \
+inline void v_load_deinterleave(const _Tp0* ptr, _Tpvec0& a0, _Tpvec0& b0, _Tpvec0& c0)           \
+{                                                                                                 \
+    _Tpvec1 a1, b1, c1;                                                                           \
+    v_load_deinterleave((const _Tp1*)ptr, a1, b1, c1);                                            \
+    a0 = v_reinterpret_as_##suffix0(a1);                                                          \
+    b0 = v_reinterpret_as_##suffix0(b1);                                                          \
+    c0 = v_reinterpret_as_##suffix0(c1);                                                          \
+}                                                                                                 \
+inline void v_load_deinterleave(const _Tp0* ptr, _Tpvec0& a0, _Tpvec0& b0,                        \
+                                _Tpvec0& c0, _Tpvec0& d0)                                         \
+{                                                                                                 \
+    _Tpvec1 a1, b1, c1, d1;                                                                       \
+    v_load_deinterleave((const _Tp1*)ptr, a1, b1, c1, d1);                                        \
+    a0 = v_reinterpret_as_##suffix0(a1);                                                          \
+    b0 = v_reinterpret_as_##suffix0(b1);                                                          \
+    c0 = v_reinterpret_as_##suffix0(c1);                                                          \
+    d0 = v_reinterpret_as_##suffix0(d1);                                                          \
+}                                                                                                 \
+inline void v_store_interleave(_Tp0* ptr, const _Tpvec0& a0, const _Tpvec0& b0,                   \
+                               hal::StoreMode /*mode*/=hal::STORE_UNALIGNED)                      \
+{                                                                                                 \
+    _Tpvec1 a1 = v_reinterpret_as_##suffix1(a0);                                                  \
+    _Tpvec1 b1 = v_reinterpret_as_##suffix1(b0);                                                  \
+    v_store_interleave((_Tp1*)ptr, a1, b1);                                                     \
+}                                                                                                 \
+inline void v_store_interleave(_Tp0* ptr, const _Tpvec0& a0, const _Tpvec0& b0, const _Tpvec0& c0,\
+                               hal::StoreMode /*mode*/=hal::STORE_UNALIGNED)                      \
+{                                                                                                 \
+    _Tpvec1 a1 = v_reinterpret_as_##suffix1(a0);                                                  \
+    _Tpvec1 b1 = v_reinterpret_as_##suffix1(b0);                                                  \
+    _Tpvec1 c1 = v_reinterpret_as_##suffix1(c0);                                                  \
+    v_store_interleave((_Tp1*)ptr, a1, b1, c1);                                                 \
+}                                                                                                 \
+inline void v_store_interleave(_Tp0* ptr, const _Tpvec0& a0, const _Tpvec0& b0,                   \
+                               const _Tpvec0& c0, const _Tpvec0& d0,                              \
+                               hal::StoreMode /*mode*/=hal::STORE_UNALIGNED)                      \
+{                                                                                                 \
+    _Tpvec1 a1 = v_reinterpret_as_##suffix1(a0);                                                  \
+    _Tpvec1 b1 = v_reinterpret_as_##suffix1(b0);                                                  \
+    _Tpvec1 c1 = v_reinterpret_as_##suffix1(c0);                                                  \
+    _Tpvec1 d1 = v_reinterpret_as_##suffix1(d0);                                                  \
+    v_store_interleave((_Tp1*)ptr, a1, b1, c1, d1);                                             \
+}
+
+OPENCV_HAL_IMPL_LSX_LOADSTORE_INTERLEAVE(v_int8x16, schar, s8, v_uint8x16, uchar, u8)
+OPENCV_HAL_IMPL_LSX_LOADSTORE_INTERLEAVE(v_int16x8, short, s16, v_uint16x8, ushort, u16)
+OPENCV_HAL_IMPL_LSX_LOADSTORE_INTERLEAVE(v_int32x4, int, s32, v_uint32x4, unsigned, u32)
+OPENCV_HAL_IMPL_LSX_LOADSTORE_INTERLEAVE(v_float32x4, float, f32, v_uint32x4, unsigned, u32)
+OPENCV_HAL_IMPL_LSX_LOADSTORE_INTERLEAVE(v_int64x2, int64, s64, v_uint64x2, uint64, u64)
+OPENCV_HAL_IMPL_LSX_LOADSTORE_INTERLEAVE(v_float64x2, double, f64, v_uint64x2, uint64, u64)
+
+//
+// FP16
+//
+
+inline v_float32x4 v_load_expand(const hfloat* ptr)
+{
+#if CV_FP16
+    return v_float32x4(__lsx_vfcvtl_s_h((__m128)__lsx_vld(ptr, 0)));
+#else
+    float CV_DECL_ALIGNED(32) buf[4];
+    for (int i = 0; i < 4; i++)
+        buf[i] = (float)ptr[i];
+    return v_float32x4((__m128)__lsx_vld(buf, 0));
+#endif
+}
+
+inline void v_pack_store(hfloat* ptr, const v_float32x4& a)
+{
+#if CV_FP16
+    __m128i res = (__m218i)__lsx_vfcvt_h_s(a.val, a.val);
+    __lsx_vstelm_d(res, ptr, 0, 0);
+#else
+    float CV_DECL_ALIGNED(32) buf[4];
+    v_store_aligned(buf, a);
+    for (int i = 0; i < 4; i++)
+        ptr[i] = hfloat(buf[i]);
+#endif
+}
+
+//
+// end of FP16
+//
+
+inline void v_cleanup() {}
+
+#include "intrin_math.hpp"
+inline v_float32x4 v_exp(const v_float32x4& x) { return v_exp_default_32f<v_float32x4, v_int32x4>(x); }
+inline v_float32x4 v_log(const v_float32x4& x) { return v_log_default_32f<v_float32x4, v_int32x4>(x); }
+inline void v_sincos(const v_float32x4& x, v_float32x4& s, v_float32x4& c) { v_sincos_default_32f<v_float32x4, v_int32x4>(x, s, c); }
+inline v_float32x4 v_sin(const v_float32x4& x) { return v_sin_default_32f<v_float32x4, v_int32x4>(x); }
+inline v_float32x4 v_cos(const v_float32x4& x) { return v_cos_default_32f<v_float32x4, v_int32x4>(x); }
+inline v_float32x4 v_erf(const v_float32x4& x) { return v_erf_default_32f<v_float32x4, v_int32x4>(x); }
+
+inline v_float64x2 v_exp(const v_float64x2& x) { return v_exp_default_64f<v_float64x2, v_int64x2>(x); }
+inline v_float64x2 v_log(const v_float64x2& x) { return v_log_default_64f<v_float64x2, v_int64x2>(x); }
+inline void v_sincos(const v_float64x2& x, v_float64x2& s, v_float64x2& c) { v_sincos_default_64f<v_float64x2, v_int64x2>(x, s, c); }
+inline v_float64x2 v_sin(const v_float64x2& x) { return v_sin_default_64f<v_float64x2, v_int64x2>(x); }
+inline v_float64x2 v_cos(const v_float64x2& x) { return v_cos_default_64f<v_float64x2, v_int64x2>(x); }
+
+CV_CPU_OPTIMIZATION_HAL_NAMESPACE_END
+
+//! @endcond
+
+} // cv::
+
+#endif // OPENCV_HAL_INTRIN_LSX_HPP
diff --git a/3rdParty/opencv-4.12.0/opencv2/core/hal/intrin_math.hpp b/3rdParty/opencv-4.12.0/opencv2/core/hal/intrin_math.hpp
new file mode 100644
index 0000000000..b6912a7a8a
--- /dev/null
+++ b/3rdParty/opencv-4.12.0/opencv2/core/hal/intrin_math.hpp
@@ -0,0 +1,687 @@
+// This file is part of OpenCV project.
+// It is subject to the license terms in the LICENSE file found in the top-level directory
+// of this distribution and at http://opencv.org/license.html
+
+
+/* Universal Intrinsics implementation of sin, cos, exp and log
+
+   Inspired by Intel Approximate Math library, and based on the
+   corresponding algorithms of the cephes math library
+*/
+
+/* Copyright (C) 2010,2011  RJVB - extensions */
+/* Copyright (C) 2011  Julien Pommier
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  (this is the zlib license)
+*/
+#ifndef OPENCV_HAL_INTRIN_MATH_HPP
+#define OPENCV_HAL_INTRIN_MATH_HPP
+
+//! @name Exponential
+//! @{
+// Implementation is the same as float32 vector.
+template<typename _TpVec16F, typename _TpVec16S>
+inline _TpVec16F v_exp_default_16f(const _TpVec16F &x) {
+    const _TpVec16F _vexp_lo_f16 = v_setall_<_TpVec16F>(-10.7421875f);
+    const _TpVec16F _vexp_hi_f16 = v_setall_<_TpVec16F>(11.f);
+    const _TpVec16F _vexp_half_fp16 = v_setall_<_TpVec16F>(0.5f);
+    const _TpVec16F _vexp_one_fp16 = v_setall_<_TpVec16F>(1.f);
+    const _TpVec16F _vexp_LOG2EF_f16 = v_setall_<_TpVec16F>(1.44269504088896341f);
+    const _TpVec16F _vexp_C1_f16 = v_setall_<_TpVec16F>(-6.93359375E-1f);
+    const _TpVec16F _vexp_C2_f16 = v_setall_<_TpVec16F>(2.12194440E-4f);
+    const _TpVec16F _vexp_p0_f16 = v_setall_<_TpVec16F>(1.9875691500E-4f);
+    const _TpVec16F _vexp_p1_f16 = v_setall_<_TpVec16F>(1.3981999507E-3f);
+    const _TpVec16F _vexp_p2_f16 = v_setall_<_TpVec16F>(8.3334519073E-3f);
+    const _TpVec16F _vexp_p3_f16 = v_setall_<_TpVec16F>(4.1665795894E-2f);
+    const _TpVec16F _vexp_p4_f16 = v_setall_<_TpVec16F>(1.6666665459E-1f);
+    const _TpVec16F _vexp_p5_f16 = v_setall_<_TpVec16F>(5.0000001201E-1f);
+
+    _TpVec16F _vexp_, _vexp_x, _vexp_y, _vexp_xx;
+    _TpVec16S _vexp_mm;
+    const _TpVec16S _vexp_bias_s16 = v_setall_<_TpVec16S>((short)0xf);
+
+    // compute exponential of x
+    _vexp_x = v_max(x, _vexp_lo_f16);
+    _vexp_x = v_min(_vexp_x, _vexp_hi_f16);
+
+    _vexp_ = v_fma(_vexp_x, _vexp_LOG2EF_f16, _vexp_half_fp16);
+    _vexp_mm = v_floor(_vexp_);
+    _vexp_ = v_cvt_f16(_vexp_mm);
+    _vexp_mm = v_add(_vexp_mm, _vexp_bias_s16);
+    _vexp_mm = v_shl(_vexp_mm, 10);
+
+    _vexp_x = v_fma(_vexp_, _vexp_C1_f16, _vexp_x);
+    _vexp_x = v_fma(_vexp_, _vexp_C2_f16, _vexp_x);
+    _vexp_xx = v_mul(_vexp_x, _vexp_x);
+
+    _vexp_y = v_fma(_vexp_x, _vexp_p0_f16, _vexp_p1_f16);
+    _vexp_y = v_fma(_vexp_y, _vexp_x, _vexp_p2_f16);
+    _vexp_y = v_fma(_vexp_y, _vexp_x, _vexp_p3_f16);
+    _vexp_y = v_fma(_vexp_y, _vexp_x, _vexp_p4_f16);
+    _vexp_y = v_fma(_vexp_y, _vexp_x, _vexp_p5_f16);
+
+    _vexp_y = v_fma(_vexp_y, _vexp_xx, _vexp_x);
+    _vexp_y = v_add(_vexp_y, _vexp_one_fp16);
+    _vexp_y = v_mul(_vexp_y, v_reinterpret_as_f16(_vexp_mm));
+
+    // exp(NAN) -> NAN
+    _TpVec16F mask_not_nan = v_not_nan(x);
+    return v_select(mask_not_nan, _vexp_y, v_reinterpret_as_f16(v_setall_<_TpVec16S>((short)0x7e00)));
+}
+
+template<typename _TpVec32F, typename _TpVec32S>
+inline _TpVec32F v_exp_default_32f(const _TpVec32F &x) {
+    const _TpVec32F _vexp_lo_f32 = v_setall_<_TpVec32F>(-88.3762626647949f);
+    const _TpVec32F _vexp_hi_f32 = v_setall_<_TpVec32F>(89.f);
+    const _TpVec32F _vexp_half_fp32 = v_setall_<_TpVec32F>(0.5f);
+    const _TpVec32F _vexp_one_fp32 = v_setall_<_TpVec32F>(1.f);
+    const _TpVec32F _vexp_LOG2EF_f32 = v_setall_<_TpVec32F>(1.44269504088896341f);
+    const _TpVec32F _vexp_C1_f32 = v_setall_<_TpVec32F>(-6.93359375E-1f);
+    const _TpVec32F _vexp_C2_f32 = v_setall_<_TpVec32F>(2.12194440E-4f);
+    const _TpVec32F _vexp_p0_f32 = v_setall_<_TpVec32F>(1.9875691500E-4f);
+    const _TpVec32F _vexp_p1_f32 = v_setall_<_TpVec32F>(1.3981999507E-3f);
+    const _TpVec32F _vexp_p2_f32 = v_setall_<_TpVec32F>(8.3334519073E-3f);
+    const _TpVec32F _vexp_p3_f32 = v_setall_<_TpVec32F>(4.1665795894E-2f);
+    const _TpVec32F _vexp_p4_f32 = v_setall_<_TpVec32F>(1.6666665459E-1f);
+    const _TpVec32F _vexp_p5_f32 = v_setall_<_TpVec32F>(5.0000001201E-1f);
+
+    _TpVec32F _vexp_, _vexp_x, _vexp_y, _vexp_xx;
+    _TpVec32S _vexp_mm;
+    const _TpVec32S _vexp_bias_s32 = v_setall_<_TpVec32S>((int)0x7f);
+
+    // compute exponential of x
+    _vexp_x = v_max(x, _vexp_lo_f32);
+    _vexp_x = v_min(_vexp_x, _vexp_hi_f32);
+
+    _vexp_ = v_fma(_vexp_x, _vexp_LOG2EF_f32, _vexp_half_fp32);
+    _vexp_mm = v_floor(_vexp_);
+    _vexp_ = v_cvt_f32(_vexp_mm);
+    _vexp_mm = v_add(_vexp_mm, _vexp_bias_s32);
+    _vexp_mm = v_shl(_vexp_mm, 23);
+
+    _vexp_x = v_fma(_vexp_, _vexp_C1_f32, _vexp_x);
+    _vexp_x = v_fma(_vexp_, _vexp_C2_f32, _vexp_x);
+    _vexp_xx = v_mul(_vexp_x, _vexp_x);
+
+    _vexp_y = v_fma(_vexp_x, _vexp_p0_f32, _vexp_p1_f32);
+    _vexp_y = v_fma(_vexp_y, _vexp_x, _vexp_p2_f32);
+    _vexp_y = v_fma(_vexp_y, _vexp_x, _vexp_p3_f32);
+    _vexp_y = v_fma(_vexp_y, _vexp_x, _vexp_p4_f32);
+    _vexp_y = v_fma(_vexp_y, _vexp_x, _vexp_p5_f32);
+
+    _vexp_y = v_fma(_vexp_y, _vexp_xx, _vexp_x);
+    _vexp_y = v_add(_vexp_y, _vexp_one_fp32);
+    _vexp_y = v_mul(_vexp_y, v_reinterpret_as_f32(_vexp_mm));
+
+    // exp(NAN) -> NAN
+    _TpVec32F mask_not_nan = v_not_nan(x);
+    return v_select(mask_not_nan, _vexp_y, v_reinterpret_as_f32(v_setall_<_TpVec32S>((int)0x7fc00000)));
+}
+
+template<typename _TpVec64F, typename _TpVec64S>
+inline _TpVec64F v_exp_default_64f(const _TpVec64F &x) {
+    const _TpVec64F _vexp_lo_f64 = v_setall_<_TpVec64F>(-709.43613930310391424428);
+    const _TpVec64F _vexp_hi_f64 = v_setall_<_TpVec64F>(710.);
+    const _TpVec64F _vexp_half_f64 = v_setall_<_TpVec64F>(0.5);
+    const _TpVec64F _vexp_one_f64 = v_setall_<_TpVec64F>(1.0);
+    const _TpVec64F _vexp_two_f64 = v_setall_<_TpVec64F>(2.0);
+    const _TpVec64F _vexp_LOG2EF_f64 = v_setall_<_TpVec64F>(1.44269504088896340736);
+    const _TpVec64F _vexp_C1_f64 = v_setall_<_TpVec64F>(-6.93145751953125E-1);
+    const _TpVec64F _vexp_C2_f64 = v_setall_<_TpVec64F>(-1.42860682030941723212E-6);
+    const _TpVec64F _vexp_p0_f64 = v_setall_<_TpVec64F>(1.26177193074810590878E-4);
+    const _TpVec64F _vexp_p1_f64 = v_setall_<_TpVec64F>(3.02994407707441961300E-2);
+    const _TpVec64F _vexp_p2_f64 = v_setall_<_TpVec64F>(9.99999999999999999910E-1);
+    const _TpVec64F _vexp_q0_f64 = v_setall_<_TpVec64F>(3.00198505138664455042E-6);
+    const _TpVec64F _vexp_q1_f64 = v_setall_<_TpVec64F>(2.52448340349684104192E-3);
+    const _TpVec64F _vexp_q2_f64 = v_setall_<_TpVec64F>(2.27265548208155028766E-1);
+    const _TpVec64F _vexp_q3_f64 = v_setall_<_TpVec64F>(2.00000000000000000009E0);
+
+    _TpVec64F _vexp_, _vexp_x, _vexp_y, _vexp_z, _vexp_xx;
+    _TpVec64S _vexp_mm;
+    const _TpVec64S _vexp_bias_s64 = v_setall_<_TpVec64S>((int64)0x3ff);
+
+    // compute exponential of x
+    _vexp_x = v_max(x, _vexp_lo_f64);
+    _vexp_x = v_min(_vexp_x, _vexp_hi_f64);
+
+    _vexp_ = v_fma(_vexp_x, _vexp_LOG2EF_f64, _vexp_half_f64);
+    _vexp_mm = v_expand_low(v_floor(_vexp_));
+    _vexp_ = v_cvt_f64(_vexp_mm);
+    _vexp_mm = v_add(_vexp_mm, _vexp_bias_s64);
+    _vexp_mm = v_shl(_vexp_mm, 52);
+
+    _vexp_x = v_fma(_vexp_, _vexp_C1_f64, _vexp_x);
+    _vexp_x = v_fma(_vexp_, _vexp_C2_f64, _vexp_x);
+    _vexp_xx = v_mul(_vexp_x, _vexp_x);
+
+    _vexp_y = v_fma(_vexp_xx, _vexp_p0_f64, _vexp_p1_f64);
+    _vexp_y = v_fma(_vexp_y, _vexp_xx, _vexp_p2_f64);
+    _vexp_y = v_mul(_vexp_y, _vexp_x);
+
+    _vexp_z = v_fma(_vexp_xx, _vexp_q0_f64, _vexp_q1_f64);
+    _vexp_z = v_fma(_vexp_xx, _vexp_z, _vexp_q2_f64);
+    _vexp_z = v_fma(_vexp_xx, _vexp_z, _vexp_q3_f64);
+
+    _vexp_z = v_div(_vexp_y, v_sub(_vexp_z, _vexp_y));
+    _vexp_z = v_fma(_vexp_two_f64, _vexp_z, _vexp_one_f64);
+    _vexp_z = v_mul(_vexp_z, v_reinterpret_as_f64(_vexp_mm));
+
+    // exp(NAN) -> NAN
+    _TpVec64F mask_not_nan = v_not_nan(x);
+    return v_select(mask_not_nan, _vexp_z, v_reinterpret_as_f64(v_setall_<_TpVec64S>((int64)0x7FF8000000000000)));
+}
+//! @}
+
+//! @name Natural Logarithm
+//! @{
+template<typename _TpVec16F, typename _TpVec16S>
+inline _TpVec16F v_log_default_16f(const _TpVec16F &x) {
+    const _TpVec16F _vlog_one_fp16 = v_setall_<_TpVec16F>(1.0f);
+    const _TpVec16F _vlog_SQRTHF_fp16 = v_setall_<_TpVec16F>(0.707106781186547524f);
+    const _TpVec16F _vlog_q1_fp16 = v_setall_<_TpVec16F>(-2.12194440E-4f);
+    const _TpVec16F _vlog_q2_fp16 = v_setall_<_TpVec16F>(0.693359375f);
+    const _TpVec16F _vlog_p0_fp16 = v_setall_<_TpVec16F>(7.0376836292E-2f);
+    const _TpVec16F _vlog_p1_fp16 = v_setall_<_TpVec16F>(-1.1514610310E-1f);
+    const _TpVec16F _vlog_p2_fp16 = v_setall_<_TpVec16F>(1.1676998740E-1f);
+    const _TpVec16F _vlog_p3_fp16 = v_setall_<_TpVec16F>(-1.2420140846E-1f);
+    const _TpVec16F _vlog_p4_fp16 = v_setall_<_TpVec16F>(1.4249322787E-1f);
+    const _TpVec16F _vlog_p5_fp16 = v_setall_<_TpVec16F>(-1.6668057665E-1f);
+    const _TpVec16F _vlog_p6_fp16 = v_setall_<_TpVec16F>(2.0000714765E-1f);
+    const _TpVec16F _vlog_p7_fp16 = v_setall_<_TpVec16F>(-2.4999993993E-1f);
+    const _TpVec16F _vlog_p8_fp16 = v_setall_<_TpVec16F>(3.3333331174E-1f);
+
+    _TpVec16F _vlog_x, _vlog_e, _vlog_y, _vlog_z, _vlog_tmp;
+    _TpVec16S _vlog_ux, _vlog_emm0;
+    const _TpVec16S _vlog_inv_mant_mask_s16 = v_setall_<_TpVec16S>((short)~0x7c00);
+
+    _vlog_ux = v_reinterpret_as_s16(x);
+    _vlog_emm0 = v_shr(_vlog_ux, 10);
+
+    _vlog_ux = v_and(_vlog_ux, _vlog_inv_mant_mask_s16);
+    _vlog_ux = v_or(_vlog_ux, v_reinterpret_as_s16(v_setall_<_TpVec16F>(0.5f)));
+    _vlog_x = v_reinterpret_as_f16(_vlog_ux);
+
+    _vlog_emm0 = v_sub(_vlog_emm0, v_setall_<_TpVec16S>((short)0xf));
+    _vlog_e = v_cvt_f16(_vlog_emm0);
+
+    _vlog_e = v_add(_vlog_e, _vlog_one_fp16);
+
+    _TpVec16F _vlog_mask = v_lt(_vlog_x, _vlog_SQRTHF_fp16);
+    _vlog_tmp = v_and(_vlog_x, _vlog_mask);
+    _vlog_x = v_sub(_vlog_x, _vlog_one_fp16);
+    _vlog_e = v_sub(_vlog_e, v_and(_vlog_one_fp16, _vlog_mask));
+    _vlog_x = v_add(_vlog_x, _vlog_tmp);
+
+    _vlog_z = v_mul(_vlog_x, _vlog_x);
+
+    _vlog_y = v_fma(_vlog_p0_fp16, _vlog_x, _vlog_p1_fp16);
+    _vlog_y = v_fma(_vlog_y, _vlog_x, _vlog_p2_fp16);
+    _vlog_y = v_fma(_vlog_y, _vlog_x, _vlog_p3_fp16);
+    _vlog_y = v_fma(_vlog_y, _vlog_x, _vlog_p4_fp16);
+    _vlog_y = v_fma(_vlog_y, _vlog_x, _vlog_p5_fp16);
+    _vlog_y = v_fma(_vlog_y, _vlog_x, _vlog_p6_fp16);
+    _vlog_y = v_fma(_vlog_y, _vlog_x, _vlog_p7_fp16);
+    _vlog_y = v_fma(_vlog_y, _vlog_x, _vlog_p8_fp16);
+    _vlog_y = v_mul(_vlog_y, _vlog_x);
+    _vlog_y = v_mul(_vlog_y, _vlog_z);
+
+    _vlog_y = v_fma(_vlog_e, _vlog_q1_fp16, _vlog_y);
+
+    _vlog_y = v_sub(_vlog_y, v_mul(_vlog_z, v_setall_<_TpVec16F>(0.5f)));
+
+    _vlog_x = v_add(_vlog_x, _vlog_y);
+    _vlog_x = v_fma(_vlog_e, _vlog_q2_fp16, _vlog_x);
+    // log(0) -> -INF
+    _TpVec16F mask_zero = v_eq(x, v_setzero_<_TpVec16F>());
+    _vlog_x = v_select(mask_zero, v_reinterpret_as_f16(v_setall_<_TpVec16S>((short)0xfc00)), _vlog_x);
+    // log(NEG), log(NAN) -> NAN
+    _TpVec16F mask_not_nan = v_ge(x, v_setzero_<_TpVec16F>());
+    _vlog_x = v_select(mask_not_nan, _vlog_x, v_reinterpret_as_f16(v_setall_<_TpVec16S>((short)0x7e00)));
+    // log(INF) -> INF
+    _TpVec16F mask_inf = v_eq(x, v_reinterpret_as_f16(v_setall_<_TpVec16S>((short)0x7c00)));
+    _vlog_x = v_select(mask_inf, x, _vlog_x);
+    return _vlog_x;
+}
+
+template<typename _TpVec32F, typename _TpVec32S>
+inline _TpVec32F v_log_default_32f(const _TpVec32F &x) {
+    const _TpVec32F _vlog_one_fp32 = v_setall_<_TpVec32F>(1.0f);
+    const _TpVec32F _vlog_SQRTHF_fp32 = v_setall_<_TpVec32F>(0.707106781186547524f);
+    const _TpVec32F _vlog_q1_fp32 = v_setall_<_TpVec32F>(-2.12194440E-4f);
+    const _TpVec32F _vlog_q2_fp32 = v_setall_<_TpVec32F>(0.693359375f);
+    const _TpVec32F _vlog_p0_fp32 = v_setall_<_TpVec32F>(7.0376836292E-2f);
+    const _TpVec32F _vlog_p1_fp32 = v_setall_<_TpVec32F>(-1.1514610310E-1f);
+    const _TpVec32F _vlog_p2_fp32 = v_setall_<_TpVec32F>(1.1676998740E-1f);
+    const _TpVec32F _vlog_p3_fp32 = v_setall_<_TpVec32F>(-1.2420140846E-1f);
+    const _TpVec32F _vlog_p4_fp32 = v_setall_<_TpVec32F>(1.4249322787E-1f);
+    const _TpVec32F _vlog_p5_fp32 = v_setall_<_TpVec32F>(-1.6668057665E-1f);
+    const _TpVec32F _vlog_p6_fp32 = v_setall_<_TpVec32F>(2.0000714765E-1f);
+    const _TpVec32F _vlog_p7_fp32 = v_setall_<_TpVec32F>(-2.4999993993E-1f);
+    const _TpVec32F _vlog_p8_fp32 = v_setall_<_TpVec32F>(3.3333331174E-1f);
+
+    _TpVec32F _vlog_x, _vlog_e, _vlog_y, _vlog_z, _vlog_tmp;
+    _TpVec32S _vlog_ux, _vlog_emm0;
+    const _TpVec32S _vlog_inv_mant_mask_s32 = v_setall_<_TpVec32S>((int)~0x7f800000);
+
+    _vlog_ux = v_reinterpret_as_s32(x);
+    _vlog_emm0 = v_shr(_vlog_ux, 23);
+
+    _vlog_ux = v_and(_vlog_ux, _vlog_inv_mant_mask_s32);
+    _vlog_ux = v_or(_vlog_ux, v_reinterpret_as_s32(v_setall_<_TpVec32F>(0.5f)));
+    _vlog_x = v_reinterpret_as_f32(_vlog_ux);
+
+    _vlog_emm0 = v_sub(_vlog_emm0, v_setall_<_TpVec32S>((int)0x7f));
+    _vlog_e = v_cvt_f32(_vlog_emm0);
+
+    _vlog_e = v_add(_vlog_e, _vlog_one_fp32);
+
+    _TpVec32F _vlog_mask = v_lt(_vlog_x, _vlog_SQRTHF_fp32);
+    _vlog_tmp = v_and(_vlog_x, _vlog_mask);
+    _vlog_x = v_sub(_vlog_x, _vlog_one_fp32);
+    _vlog_e = v_sub(_vlog_e, v_and(_vlog_one_fp32, _vlog_mask));
+    _vlog_x = v_add(_vlog_x, _vlog_tmp);
+
+    _vlog_z = v_mul(_vlog_x, _vlog_x);
+
+    _vlog_y = v_fma(_vlog_p0_fp32, _vlog_x, _vlog_p1_fp32);
+    _vlog_y = v_fma(_vlog_y, _vlog_x, _vlog_p2_fp32);
+    _vlog_y = v_fma(_vlog_y, _vlog_x, _vlog_p3_fp32);
+    _vlog_y = v_fma(_vlog_y, _vlog_x, _vlog_p4_fp32);
+    _vlog_y = v_fma(_vlog_y, _vlog_x, _vlog_p5_fp32);
+    _vlog_y = v_fma(_vlog_y, _vlog_x, _vlog_p6_fp32);
+    _vlog_y = v_fma(_vlog_y, _vlog_x, _vlog_p7_fp32);
+    _vlog_y = v_fma(_vlog_y, _vlog_x, _vlog_p8_fp32);
+    _vlog_y = v_mul(_vlog_y, _vlog_x);
+    _vlog_y = v_mul(_vlog_y, _vlog_z);
+
+    _vlog_y = v_fma(_vlog_e, _vlog_q1_fp32, _vlog_y);
+
+    _vlog_y = v_sub(_vlog_y, v_mul(_vlog_z, v_setall_<_TpVec32F>(0.5f)));
+
+    _vlog_x = v_add(_vlog_x, _vlog_y);
+    _vlog_x = v_fma(_vlog_e, _vlog_q2_fp32, _vlog_x);
+    // log(0) -> -INF
+    _TpVec32F mask_zero = v_eq(x, v_setzero_<_TpVec32F>());
+    _vlog_x = v_select(mask_zero, v_reinterpret_as_f32(v_setall_<_TpVec32S>((int)0xff800000)), _vlog_x);
+    // log(NEG), log(NAN) -> NAN
+    _TpVec32F mask_not_nan = v_ge(x, v_setzero_<_TpVec32F>());
+    _vlog_x = v_select(mask_not_nan, _vlog_x, v_reinterpret_as_f32(v_setall_<_TpVec32S>((int)0x7fc00000)));
+    // log(INF) -> INF
+    _TpVec32F mask_inf = v_eq(x, v_reinterpret_as_f32(v_setall_<_TpVec32S>((int)0x7f800000)));
+    _vlog_x = v_select(mask_inf, x, _vlog_x);
+    return _vlog_x;
+}
+
+template<typename _TpVec64F, typename _TpVec64S>
+inline _TpVec64F v_log_default_64f(const _TpVec64F &x) {
+    const _TpVec64F _vlog_one_fp64 = v_setall_<_TpVec64F>(1.0);
+    const _TpVec64F _vlog_SQRTHF_fp64 = v_setall_<_TpVec64F>(0.7071067811865475244);
+    const _TpVec64F _vlog_p0_fp64 = v_setall_<_TpVec64F>(1.01875663804580931796E-4);
+    const _TpVec64F _vlog_p1_fp64 = v_setall_<_TpVec64F>(4.97494994976747001425E-1);
+    const _TpVec64F _vlog_p2_fp64 = v_setall_<_TpVec64F>(4.70579119878881725854);
+    const _TpVec64F _vlog_p3_fp64 = v_setall_<_TpVec64F>(1.44989225341610930846E1);
+    const _TpVec64F _vlog_p4_fp64 = v_setall_<_TpVec64F>(1.79368678507819816313E1);
+    const _TpVec64F _vlog_p5_fp64 = v_setall_<_TpVec64F>(7.70838733755885391666);
+    const _TpVec64F _vlog_q0_fp64 = v_setall_<_TpVec64F>(1.12873587189167450590E1);
+    const _TpVec64F _vlog_q1_fp64 = v_setall_<_TpVec64F>(4.52279145837532221105E1);
+    const _TpVec64F _vlog_q2_fp64 = v_setall_<_TpVec64F>(8.29875266912776603211E1);
+    const _TpVec64F _vlog_q3_fp64 = v_setall_<_TpVec64F>(7.11544750618563894466E1);
+    const _TpVec64F _vlog_q4_fp64 = v_setall_<_TpVec64F>(2.31251620126765340583E1);
+
+    const _TpVec64F _vlog_C0_fp64 = v_setall_<_TpVec64F>(2.121944400546905827679e-4);
+    const _TpVec64F _vlog_C1_fp64 = v_setall_<_TpVec64F>(0.693359375);
+
+    _TpVec64F _vlog_x, _vlog_e, _vlog_y, _vlog_z, _vlog_tmp, _vlog_xx;
+    _TpVec64S _vlog_ux, _vlog_emm0;
+    const _TpVec64S _vlog_inv_mant_mask_s64 = v_setall_<_TpVec64S>((int64)~0x7ff0000000000000);
+
+    _vlog_ux = v_reinterpret_as_s64(x);
+    _vlog_emm0 = v_shr(_vlog_ux, 52);
+
+    _vlog_ux = v_and(_vlog_ux, _vlog_inv_mant_mask_s64);
+    _vlog_ux = v_or(_vlog_ux, v_reinterpret_as_s64(v_setall_<_TpVec64F>(0.5)));
+    _vlog_x = v_reinterpret_as_f64(_vlog_ux);
+
+    _vlog_emm0 = v_sub(_vlog_emm0, v_setall_<_TpVec64S>((int64)0x3ff));
+    _vlog_e = v_cvt_f64(_vlog_emm0);
+
+    _vlog_e = v_add(_vlog_e, _vlog_one_fp64);
+
+    _TpVec64F _vlog_mask = v_lt(_vlog_x, _vlog_SQRTHF_fp64);
+    _vlog_tmp = v_and(_vlog_x, _vlog_mask);
+    _vlog_x = v_sub(_vlog_x, _vlog_one_fp64);
+    _vlog_e = v_sub(_vlog_e, v_and(_vlog_one_fp64, _vlog_mask));
+    _vlog_x = v_add(_vlog_x, _vlog_tmp);
+
+    _vlog_xx = v_mul(_vlog_x, _vlog_x);
+
+    _vlog_y = v_fma(_vlog_p0_fp64, _vlog_x, _vlog_p1_fp64);
+    _vlog_y = v_fma(_vlog_y, _vlog_x, _vlog_p2_fp64);
+    _vlog_y = v_fma(_vlog_y, _vlog_x, _vlog_p3_fp64);
+    _vlog_y = v_fma(_vlog_y, _vlog_x, _vlog_p4_fp64);
+    _vlog_y = v_fma(_vlog_y, _vlog_x, _vlog_p5_fp64);
+    _vlog_y = v_mul(_vlog_y, _vlog_x);
+    _vlog_y = v_mul(_vlog_y, _vlog_xx);
+
+    _vlog_z = v_add(_vlog_x, _vlog_q0_fp64);
+    _vlog_z = v_fma(_vlog_z, _vlog_x, _vlog_q1_fp64);
+    _vlog_z = v_fma(_vlog_z, _vlog_x, _vlog_q2_fp64);
+    _vlog_z = v_fma(_vlog_z, _vlog_x, _vlog_q3_fp64);
+    _vlog_z = v_fma(_vlog_z, _vlog_x, _vlog_q4_fp64);
+
+    _vlog_z = v_div(_vlog_y, _vlog_z);
+    _vlog_z = v_sub(_vlog_z, v_mul(_vlog_e, _vlog_C0_fp64));
+    _vlog_z = v_sub(_vlog_z, v_mul(_vlog_xx, v_setall_<_TpVec64F>(0.5)));
+
+    _vlog_z = v_add(_vlog_z, _vlog_x);
+    _vlog_z = v_fma(_vlog_e, _vlog_C1_fp64, _vlog_z);
+
+    // log(0) -> -INF
+    _TpVec64F mask_zero = v_eq(x, v_setzero_<_TpVec64F>());
+    _vlog_z = v_select(mask_zero, v_reinterpret_as_f64(v_setall_<_TpVec64S>((int64)0xfff0000000000000)), _vlog_z);
+    // log(NEG), log(NAN) -> NAN
+    _TpVec64F mask_not_nan = v_ge(x, v_setzero_<_TpVec64F>());
+    _vlog_z = v_select(mask_not_nan, _vlog_z, v_reinterpret_as_f64(v_setall_<_TpVec64S>((int64)0x7ff8000000000000)));
+    // log(INF) -> INF
+    _TpVec64F mask_inf = v_eq(x, v_reinterpret_as_f64(v_setall_<_TpVec64S>((int64)0x7ff0000000000000)));
+    _vlog_z = v_select(mask_inf, x, _vlog_z);
+    return _vlog_z;
+}
+//! @}
+
+//! @name Sine and Cosine
+//! @{
+template<typename _TpVec16F, typename _TpVec16S>
+inline void v_sincos_default_16f(const _TpVec16F &x, _TpVec16F &ysin, _TpVec16F &ycos) {
+    const _TpVec16F v_cephes_FOPI = v_setall_<_TpVec16F>(hfloat(1.27323954473516f)); // 4 / M_PI
+    const _TpVec16F v_minus_DP1 = v_setall_<_TpVec16F>(hfloat(-0.78515625f));
+    const _TpVec16F v_minus_DP2 = v_setall_<_TpVec16F>(hfloat(-2.4187564849853515625E-4f));
+    const _TpVec16F v_minus_DP3 = v_setall_<_TpVec16F>(hfloat(-3.77489497744594108E-8f));
+    const _TpVec16F v_sincof_p0 = v_setall_<_TpVec16F>(hfloat(-1.9515295891E-4f));
+    const _TpVec16F v_sincof_p1 = v_setall_<_TpVec16F>(hfloat(8.3321608736E-3f));
+    const _TpVec16F v_sincof_p2 = v_setall_<_TpVec16F>(hfloat(-1.6666654611E-1f));
+    const _TpVec16F v_coscof_p0 = v_setall_<_TpVec16F>(hfloat(2.443315711809948E-5f));
+    const _TpVec16F v_coscof_p1 = v_setall_<_TpVec16F>(hfloat(-1.388731625493765E-3f));
+    const _TpVec16F v_coscof_p2 = v_setall_<_TpVec16F>(hfloat(4.166664568298827E-2f));
+    const _TpVec16F v_nan = v_reinterpret_as_f16(v_setall_<_TpVec16S>((short)0x7e00));
+    const _TpVec16F v_neg_zero = v_setall_<_TpVec16F>(hfloat(-0.f));
+
+    _TpVec16F _vx, _vy, sign_mask_sin, sign_mask_cos;
+    _TpVec16S emm2;
+
+    sign_mask_sin = v_lt(x, v_setzero_<_TpVec16F>());
+    _vx = v_abs(x);
+    _vy = v_mul(_vx, v_cephes_FOPI);
+
+    emm2 = v_trunc(_vy);
+    emm2 = v_add(emm2, v_setall_<_TpVec16S>((short)1));
+    emm2 = v_and(emm2, v_setall_<_TpVec16S>((short)~1));
+    _vy = v_cvt_f16(emm2);
+
+    _TpVec16F poly_mask = v_reinterpret_as_f16(v_eq(v_and(emm2, v_setall_<_TpVec16S>((short)2)), v_setall_<_TpVec16S>((short)0)));
+
+    _vx = v_fma(_vy, v_minus_DP1, _vx);
+    _vx = v_fma(_vy, v_minus_DP2, _vx);
+    _vx = v_fma(_vy, v_minus_DP3, _vx);
+
+    sign_mask_sin = v_xor(sign_mask_sin, v_reinterpret_as_f16(v_eq(v_and(emm2, v_setall_<_TpVec16S>((short)4)), v_setall_<_TpVec16S>((short)0))));
+    sign_mask_cos = v_reinterpret_as_f16(v_eq(v_and(v_sub(emm2, v_setall_<_TpVec16S>((short)2)), v_setall_<_TpVec16S>((short)4)), v_setall_<_TpVec16S>((short)0)));
+
+    _TpVec16F _vxx = v_mul(_vx, _vx);
+    _TpVec16F y1, y2;
+
+    y1 = v_fma(v_coscof_p0, _vxx, v_coscof_p1);
+    y1 = v_fma(y1, _vxx, v_coscof_p2);
+    y1 = v_fma(y1, _vxx, v_setall_<_TpVec16F>(hfloat(-0.5f)));
+    y1 = v_fma(y1, _vxx, v_setall_<_TpVec16F>(hfloat(1.f)));
+
+    y2 = v_fma(v_sincof_p0, _vxx, v_sincof_p1);
+    y2 = v_fma(y2, _vxx, v_sincof_p2);
+    y2 = v_mul(y2, _vxx);
+    y2 = v_fma(y2, _vx, _vx);
+
+    ysin = v_select(poly_mask, y2, y1);
+    ycos = v_select(poly_mask, y1, y2);
+    ysin = v_select(sign_mask_sin, ysin, v_xor(v_neg_zero, ysin));
+    ycos = v_select(sign_mask_cos, v_xor(v_neg_zero, ycos), ycos);
+
+    // sincos(NAN) -> NAN, sincos(±INF) -> NAN
+    _TpVec16F mask_inf = v_eq(_vx, v_reinterpret_as_f16(v_setall_<_TpVec16S>((short)0x7c00)));
+    _TpVec16F mask_nan = v_or(mask_inf, v_ne(x, x));
+    ysin = v_select(mask_nan, v_nan, ysin);
+    ycos = v_select(mask_nan, v_nan, ycos);
+}
+
+template<typename _TpVec16F, typename _TpVec16S>
+inline _TpVec16F v_sin_default_16f(const _TpVec16F &x) {
+    _TpVec16F ysin, ycos;
+    v_sincos_default_16f<_TpVec16F, _TpVec16S>(x, ysin, ycos);
+    return ysin;
+}
+
+template<typename _TpVec16F, typename _TpVec16S>
+inline _TpVec16F v_cos_default_16f(const _TpVec16F &x) {
+    _TpVec16F ysin, ycos;
+    v_sincos_default_16f<_TpVec16F, _TpVec16S>(x, ysin, ycos);
+    return ycos;
+}
+
+
+template<typename _TpVec32F, typename _TpVec32S>
+inline void v_sincos_default_32f(const _TpVec32F &x, _TpVec32F &ysin, _TpVec32F &ycos) {
+    const _TpVec32F v_cephes_FOPI = v_setall_<_TpVec32F>(1.27323954473516f); // 4 / M_PI
+    const _TpVec32F v_minus_DP1 = v_setall_<_TpVec32F>(-0.78515625f);
+    const _TpVec32F v_minus_DP2 = v_setall_<_TpVec32F>(-2.4187564849853515625E-4f);
+    const _TpVec32F v_minus_DP3 = v_setall_<_TpVec32F>(-3.77489497744594108E-8f);
+    const _TpVec32F v_sincof_p0 = v_setall_<_TpVec32F>(-1.9515295891E-4f);
+    const _TpVec32F v_sincof_p1 = v_setall_<_TpVec32F>(8.3321608736E-3f);
+    const _TpVec32F v_sincof_p2 = v_setall_<_TpVec32F>(-1.6666654611E-1f);
+    const _TpVec32F v_coscof_p0 = v_setall_<_TpVec32F>(2.443315711809948E-5f);
+    const _TpVec32F v_coscof_p1 = v_setall_<_TpVec32F>(-1.388731625493765E-3f);
+    const _TpVec32F v_coscof_p2 = v_setall_<_TpVec32F>(4.166664568298827E-2f);
+    const _TpVec32F v_nan = v_reinterpret_as_f32(v_setall_<_TpVec32S>((int)0x7fc00000));
+    const _TpVec32F v_neg_zero = v_setall_<_TpVec32F>(-0.f);
+
+    _TpVec32F _vx, _vy, sign_mask_sin, sign_mask_cos;
+    _TpVec32S emm2;
+
+    sign_mask_sin = v_lt(x, v_setzero_<_TpVec32F>());
+    _vx = v_abs(x);
+    _vy = v_mul(_vx, v_cephes_FOPI);
+
+    emm2 = v_trunc(_vy);
+    emm2 = v_add(emm2, v_setall_<_TpVec32S>(1));
+    emm2 = v_and(emm2, v_setall_<_TpVec32S>(~1));
+    _vy = v_cvt_f32(emm2);
+
+    _TpVec32F poly_mask = v_reinterpret_as_f32(v_eq(v_and(emm2, v_setall_<_TpVec32S>(2)), v_setall_<_TpVec32S>(0)));
+
+    _vx = v_fma(_vy, v_minus_DP1, _vx);
+    _vx = v_fma(_vy, v_minus_DP2, _vx);
+    _vx = v_fma(_vy, v_minus_DP3, _vx);
+
+    sign_mask_sin = v_xor(sign_mask_sin, v_reinterpret_as_f32(v_eq(v_and(emm2, v_setall_<_TpVec32S>(4)), v_setall_<_TpVec32S>(0))));
+    sign_mask_cos = v_reinterpret_as_f32(v_eq(v_and(v_sub(emm2, v_setall_<_TpVec32S>(2)), v_setall_<_TpVec32S>(4)), v_setall_<_TpVec32S>(0)));
+
+    _TpVec32F _vxx = v_mul(_vx, _vx);
+    _TpVec32F y1, y2;
+
+    y1 = v_fma(v_coscof_p0, _vxx, v_coscof_p1);
+    y1 = v_fma(y1, _vxx, v_coscof_p2);
+    y1 = v_fma(y1, _vxx, v_setall_<_TpVec32F>(-0.5f));
+    y1 = v_fma(y1, _vxx, v_setall_<_TpVec32F>(1.f));
+
+    y2 = v_fma(v_sincof_p0, _vxx, v_sincof_p1);
+    y2 = v_fma(y2, _vxx, v_sincof_p2);
+    y2 = v_mul(y2, _vxx);
+    y2 = v_fma(y2, _vx, _vx);
+
+    ysin = v_select(poly_mask, y2, y1);
+    ycos = v_select(poly_mask, y1, y2);
+    ysin = v_select(sign_mask_sin, ysin, v_xor(v_neg_zero, ysin));
+    ycos = v_select(sign_mask_cos, v_xor(v_neg_zero, ycos), ycos);
+
+    // sincos(NAN) -> NAN, sincos(±INF) -> NAN
+    _TpVec32F mask_inf = v_eq(_vx, v_reinterpret_as_f32(v_setall_<_TpVec32S>((int)0x7f800000)));
+    _TpVec32F mask_nan = v_or(mask_inf, v_ne(x, x));
+    ysin = v_select(mask_nan, v_nan, ysin);
+    ycos = v_select(mask_nan, v_nan, ycos);
+}
+
+template<typename _TpVec32F, typename _TpVec32S>
+inline _TpVec32F v_sin_default_32f(const _TpVec32F &x) {
+    _TpVec32F ysin, ycos;
+    v_sincos_default_32f<_TpVec32F, _TpVec32S>(x, ysin, ycos);
+    return ysin;
+}
+
+template<typename _TpVec32F, typename _TpVec32S>
+inline _TpVec32F v_cos_default_32f(const _TpVec32F &x) {
+    _TpVec32F ysin, ycos;
+    v_sincos_default_32f<_TpVec32F, _TpVec32S>(x, ysin, ycos);
+    return ycos;
+}
+
+template<typename _TpVec64F, typename _TpVec64S>
+inline void v_sincos_default_64f(const _TpVec64F &x, _TpVec64F &ysin, _TpVec64F &ycos) {
+    const _TpVec64F v_cephes_FOPI = v_setall_<_TpVec64F>(1.2732395447351626861510701069801148); // 4 / M_PI
+    const _TpVec64F v_minus_DP1 = v_setall_<_TpVec64F>(-7.853981554508209228515625E-1);
+    const _TpVec64F v_minus_DP2 = v_setall_<_TpVec64F>(-7.94662735614792836714E-9);
+    const _TpVec64F v_minus_DP3 = v_setall_<_TpVec64F>(-3.06161699786838294307E-17);
+    const _TpVec64F v_sin_C1 = v_setall_<_TpVec64F>(1.58962301576546568060E-10);
+    const _TpVec64F v_sin_C2 = v_setall_<_TpVec64F>(-2.50507477628578072866E-8);
+    const _TpVec64F v_sin_C3 = v_setall_<_TpVec64F>(2.75573136213857245213E-6);
+    const _TpVec64F v_sin_C4 = v_setall_<_TpVec64F>(-1.98412698295895385996E-4);
+    const _TpVec64F v_sin_C5 = v_setall_<_TpVec64F>(8.33333333332211858878E-3);
+    const _TpVec64F v_sin_C6 = v_setall_<_TpVec64F>(-1.66666666666666307295E-1);
+    const _TpVec64F v_cos_C1 = v_setall_<_TpVec64F>(-1.13585365213876817300E-11);
+    const _TpVec64F v_cos_C2 = v_setall_<_TpVec64F>(2.08757008419747316778E-9);
+    const _TpVec64F v_cos_C3 = v_setall_<_TpVec64F>(-2.75573141792967388112E-7);
+    const _TpVec64F v_cos_C4 = v_setall_<_TpVec64F>(2.48015872888517045348E-5);
+    const _TpVec64F v_cos_C5 = v_setall_<_TpVec64F>(-1.38888888888730564116E-3);
+    const _TpVec64F v_cos_C6 = v_setall_<_TpVec64F>(4.16666666666665929218E-2);
+    const _TpVec64F v_nan = v_reinterpret_as_f64(v_setall_<_TpVec64S>((int64)0x7ff8000000000000));
+    const _TpVec64F v_neg_zero = v_setall_<_TpVec64F>(-0.0);
+
+    _TpVec64F _vx, _vy, sign_mask_sin, sign_mask_cos;
+    _TpVec64S emm2;
+
+    sign_mask_sin = v_lt(x, v_setzero_<_TpVec64F>());
+    _vx = v_abs(x);
+    _vy = v_mul(_vx, v_cephes_FOPI);
+
+    emm2 = v_expand_low(v_trunc(_vy));
+    emm2 = v_add(emm2, v_setall_<_TpVec64S>((int64)1));
+    emm2 = v_and(emm2, v_setall_<_TpVec64S>((int64)~1));
+    _vy = v_cvt_f64(emm2);
+
+    _TpVec64F poly_mask = v_reinterpret_as_f64(v_eq(v_and(emm2, v_setall_<_TpVec64S>((int64)2)), v_setall_<_TpVec64S>((int64)0)));
+
+    _vx = v_fma(_vy, v_minus_DP1, _vx);
+    _vx = v_fma(_vy, v_minus_DP2, _vx);
+    _vx = v_fma(_vy, v_minus_DP3, _vx);
+
+    sign_mask_sin = v_xor(sign_mask_sin, v_reinterpret_as_f64(v_eq(v_and(emm2, v_setall_<_TpVec64S>((int64)4)), v_setall_<_TpVec64S>((int64)0))));
+    sign_mask_cos = v_reinterpret_as_f64(v_eq(v_and(v_sub(emm2, v_setall_<_TpVec64S>((int64)2)), v_setall_<_TpVec64S>((int64)4)), v_setall_<_TpVec64S>((int64)0)));
+
+    _TpVec64F _vxx = v_mul(_vx, _vx);
+    _TpVec64F y1, y2;
+
+    y1 = v_fma(v_cos_C1, _vxx, v_cos_C2);
+    y1 = v_fma(y1, _vxx, v_cos_C3);
+    y1 = v_fma(y1, _vxx, v_cos_C4);
+    y1 = v_fma(y1, _vxx, v_cos_C5);
+    y1 = v_fma(y1, _vxx, v_cos_C6);
+    y1 = v_fma(y1, _vxx, v_setall_<_TpVec64F>(-0.5));
+    y1 = v_fma(y1, _vxx, v_setall_<_TpVec64F>(1.0));
+
+    y2 = v_fma(v_sin_C1, _vxx, v_sin_C2);
+    y2 = v_fma(y2, _vxx, v_sin_C3);
+    y2 = v_fma(y2, _vxx, v_sin_C4);
+    y2 = v_fma(y2, _vxx, v_sin_C5);
+    y2 = v_fma(y2, _vxx, v_sin_C6);
+    y2 = v_mul(y2, _vxx);
+    y2 = v_fma(y2, _vx, _vx);
+
+    ysin = v_select(poly_mask, y2, y1);
+    ycos = v_select(poly_mask, y1, y2);
+    ysin = v_select(sign_mask_sin, ysin, v_xor(v_neg_zero, ysin));
+    ycos = v_select(sign_mask_cos, v_xor(v_neg_zero, ycos), ycos);
+
+    // sincos(NAN) -> NAN, sincos(±INF) -> NAN
+    _TpVec64F mask_inf = v_eq(_vx, v_reinterpret_as_f64(v_setall_<_TpVec64S>((int64)0x7ff0000000000000)));
+    _TpVec64F mask_nan = v_or(mask_inf, v_ne(x, x));
+    ysin = v_select(mask_nan, v_nan, ysin);
+    ycos = v_select(mask_nan, v_nan, ycos);
+}
+
+template<typename _TpVec64F, typename _TpVec64S>
+inline _TpVec64F v_sin_default_64f(const _TpVec64F &x) {
+    _TpVec64F ysin, ycos;
+    v_sincos_default_64f<_TpVec64F, _TpVec64S>(x, ysin, ycos);
+    return ysin;
+}
+
+template<typename _TpVec64F, typename _TpVec64S>
+inline _TpVec64F v_cos_default_64f(const _TpVec64F &x) {
+    _TpVec64F ysin, ycos;
+    v_sincos_default_64f<_TpVec64F, _TpVec64S>(x, ysin, ycos);
+    return ycos;
+}
+//! @}
+
+
+/* This implementation is derived from the approximation approach of Error Function (Erf) from PyTorch
+   https://github.com/pytorch/pytorch/blob/9c50ecc84b9a6e699a7f058891b889aafbf976c7/aten/src/ATen/cpu/vec/vec512/vec512_float.h#L189-L220
+*/
+
+//! @name Error Function
+//! @{
+template<typename _TpVec32F, typename _TpVec32S>
+inline _TpVec32F v_erf_default_32f(const _TpVec32F &v) {
+    const _TpVec32F coef0 = v_setall_<_TpVec32F>(0.3275911f),
+            coef1 = v_setall_<_TpVec32F>(1.061405429f),
+            coef2 = v_setall_<_TpVec32F>(-1.453152027f),
+            coef3 = v_setall_<_TpVec32F>(1.421413741f),
+            coef4 = v_setall_<_TpVec32F>(-0.284496736f),
+            coef5 = v_setall_<_TpVec32F>(0.254829592f),
+            ones = v_setall_<_TpVec32F>(1.0f),
+            neg_zeros = v_setall_<_TpVec32F>(-0.f);
+    _TpVec32F t = v_abs(v);
+    // sign(v)
+    _TpVec32F sign_mask = v_and(neg_zeros, v);
+
+    t = v_div(ones, v_fma(coef0, t, ones));
+    _TpVec32F r = v_fma(coef1, t, coef2);
+    r = v_fma(r, t, coef3);
+    r = v_fma(r, t, coef4);
+    r = v_fma(r, t, coef5);
+    // - v * v
+    _TpVec32F v2 = v_mul(v, v);
+    _TpVec32F mv2 = v_xor(neg_zeros, v2);
+    // - exp(- v * v)
+    _TpVec32F exp = v_exp_default_32f<_TpVec32F, _TpVec32S>(mv2);
+    _TpVec32F neg_exp = v_xor(neg_zeros, exp);
+    _TpVec32F res = v_mul(t, neg_exp);
+    res = v_fma(r, res, ones);
+    return v_xor(sign_mask, res);
+}
+//! @}
+
+#endif // OPENCV_HAL_INTRIN_MATH_HPP
diff --git a/3rdParty/opencv2/core/hal/intrin_msa.hpp b/3rdParty/opencv-4.12.0/opencv2/core/hal/intrin_msa.hpp
similarity index 91%
rename from 3rdParty/opencv2/core/hal/intrin_msa.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/hal/intrin_msa.hpp
index 4ac09ed404..98b753c42e 100644
--- a/3rdParty/opencv2/core/hal/intrin_msa.hpp
+++ b/3rdParty/opencv-4.12.0/opencv2/core/hal/intrin_msa.hpp
@@ -235,6 +235,8 @@ struct v_float64x2
 #define OPENCV_HAL_IMPL_MSA_INIT(_Tpv, _Tp, suffix) \
 inline v_##_Tpv v_setzero_##suffix() { return v_##_Tpv(msa_dupq_n_##suffix((_Tp)0)); } \
 inline v_##_Tpv v_setall_##suffix(_Tp v) { return v_##_Tpv(msa_dupq_n_##suffix(v)); } \
+template <> inline v_##_Tpv v_setzero_() { return v_setzero_##suffix(); } \
+template <> inline v_##_Tpv v_setall_(_Tp v) { return v_setall_##suffix(v); } \
 inline v_uint8x16 v_reinterpret_as_u8(const v_##_Tpv& v) { return v_uint8x16(MSA_TPV_REINTERPRET(v16u8, v.val)); } \
 inline v_int8x16 v_reinterpret_as_s8(const v_##_Tpv& v) { return v_int8x16(MSA_TPV_REINTERPRET(v16i8, v.val)); } \
 inline v_uint16x8 v_reinterpret_as_u16(const v_##_Tpv& v) { return v_uint16x8(MSA_TPV_REINTERPRET(v8u16, v.val)); } \
@@ -345,53 +347,46 @@ inline v_float32x4 v_matmuladd(const v_float32x4& v, const v_float32x4& m0,
 }
 
 #define OPENCV_HAL_IMPL_MSA_BIN_OP(bin_op, _Tpvec, intrin) \
-inline _Tpvec operator bin_op (const _Tpvec& a, const _Tpvec& b) \
+inline _Tpvec bin_op(const _Tpvec& a, const _Tpvec& b) \
 { \
     return _Tpvec(intrin(a.val, b.val)); \
-} \
-inline _Tpvec& operator bin_op##= (_Tpvec& a, const _Tpvec& b) \
-{ \
-    a.val = intrin(a.val, b.val); \
-    return a; \
 }
 
-OPENCV_HAL_IMPL_MSA_BIN_OP(+, v_uint8x16, msa_qaddq_u8)
-OPENCV_HAL_IMPL_MSA_BIN_OP(-, v_uint8x16, msa_qsubq_u8)
-OPENCV_HAL_IMPL_MSA_BIN_OP(+, v_int8x16, msa_qaddq_s8)
-OPENCV_HAL_IMPL_MSA_BIN_OP(-, v_int8x16, msa_qsubq_s8)
-OPENCV_HAL_IMPL_MSA_BIN_OP(+, v_uint16x8, msa_qaddq_u16)
-OPENCV_HAL_IMPL_MSA_BIN_OP(-, v_uint16x8, msa_qsubq_u16)
-OPENCV_HAL_IMPL_MSA_BIN_OP(+, v_int16x8, msa_qaddq_s16)
-OPENCV_HAL_IMPL_MSA_BIN_OP(-, v_int16x8, msa_qsubq_s16)
-OPENCV_HAL_IMPL_MSA_BIN_OP(+, v_int32x4, msa_addq_s32)
-OPENCV_HAL_IMPL_MSA_BIN_OP(-, v_int32x4, msa_subq_s32)
-OPENCV_HAL_IMPL_MSA_BIN_OP(*, v_int32x4, msa_mulq_s32)
-OPENCV_HAL_IMPL_MSA_BIN_OP(+, v_uint32x4, msa_addq_u32)
-OPENCV_HAL_IMPL_MSA_BIN_OP(-, v_uint32x4, msa_subq_u32)
-OPENCV_HAL_IMPL_MSA_BIN_OP(*, v_uint32x4, msa_mulq_u32)
-OPENCV_HAL_IMPL_MSA_BIN_OP(+, v_float32x4, msa_addq_f32)
-OPENCV_HAL_IMPL_MSA_BIN_OP(-, v_float32x4, msa_subq_f32)
-OPENCV_HAL_IMPL_MSA_BIN_OP(*, v_float32x4, msa_mulq_f32)
-OPENCV_HAL_IMPL_MSA_BIN_OP(+, v_int64x2, msa_addq_s64)
-OPENCV_HAL_IMPL_MSA_BIN_OP(-, v_int64x2, msa_subq_s64)
-OPENCV_HAL_IMPL_MSA_BIN_OP(+, v_uint64x2, msa_addq_u64)
-OPENCV_HAL_IMPL_MSA_BIN_OP(-, v_uint64x2, msa_subq_u64)
-OPENCV_HAL_IMPL_MSA_BIN_OP(/, v_float32x4, msa_divq_f32)
-OPENCV_HAL_IMPL_MSA_BIN_OP(+, v_float64x2, msa_addq_f64)
-OPENCV_HAL_IMPL_MSA_BIN_OP(-, v_float64x2, msa_subq_f64)
-OPENCV_HAL_IMPL_MSA_BIN_OP(*, v_float64x2, msa_mulq_f64)
-OPENCV_HAL_IMPL_MSA_BIN_OP(/, v_float64x2, msa_divq_f64)
+OPENCV_HAL_IMPL_MSA_BIN_OP(v_add, v_uint8x16, msa_qaddq_u8)
+OPENCV_HAL_IMPL_MSA_BIN_OP(v_sub, v_uint8x16, msa_qsubq_u8)
+OPENCV_HAL_IMPL_MSA_BIN_OP(v_add, v_int8x16, msa_qaddq_s8)
+OPENCV_HAL_IMPL_MSA_BIN_OP(v_sub, v_int8x16, msa_qsubq_s8)
+OPENCV_HAL_IMPL_MSA_BIN_OP(v_add, v_uint16x8, msa_qaddq_u16)
+OPENCV_HAL_IMPL_MSA_BIN_OP(v_sub, v_uint16x8, msa_qsubq_u16)
+OPENCV_HAL_IMPL_MSA_BIN_OP(v_add, v_int16x8, msa_qaddq_s16)
+OPENCV_HAL_IMPL_MSA_BIN_OP(v_sub, v_int16x8, msa_qsubq_s16)
+OPENCV_HAL_IMPL_MSA_BIN_OP(v_add, v_int32x4, msa_addq_s32)
+OPENCV_HAL_IMPL_MSA_BIN_OP(v_sub, v_int32x4, msa_subq_s32)
+OPENCV_HAL_IMPL_MSA_BIN_OP(v_mul, v_int32x4, msa_mulq_s32)
+OPENCV_HAL_IMPL_MSA_BIN_OP(v_add, v_uint32x4, msa_addq_u32)
+OPENCV_HAL_IMPL_MSA_BIN_OP(v_sub, v_uint32x4, msa_subq_u32)
+OPENCV_HAL_IMPL_MSA_BIN_OP(v_mul, v_uint32x4, msa_mulq_u32)
+OPENCV_HAL_IMPL_MSA_BIN_OP(v_add, v_float32x4, msa_addq_f32)
+OPENCV_HAL_IMPL_MSA_BIN_OP(v_sub, v_float32x4, msa_subq_f32)
+OPENCV_HAL_IMPL_MSA_BIN_OP(v_mul, v_float32x4, msa_mulq_f32)
+OPENCV_HAL_IMPL_MSA_BIN_OP(v_add, v_int64x2, msa_addq_s64)
+OPENCV_HAL_IMPL_MSA_BIN_OP(v_sub, v_int64x2, msa_subq_s64)
+OPENCV_HAL_IMPL_MSA_BIN_OP(v_add, v_uint64x2, msa_addq_u64)
+OPENCV_HAL_IMPL_MSA_BIN_OP(v_sub, v_uint64x2, msa_subq_u64)
+OPENCV_HAL_IMPL_MSA_BIN_OP(v_div, v_float32x4, msa_divq_f32)
+OPENCV_HAL_IMPL_MSA_BIN_OP(v_add, v_float64x2, msa_addq_f64)
+OPENCV_HAL_IMPL_MSA_BIN_OP(v_sub, v_float64x2, msa_subq_f64)
+OPENCV_HAL_IMPL_MSA_BIN_OP(v_mul, v_float64x2, msa_mulq_f64)
+OPENCV_HAL_IMPL_MSA_BIN_OP(v_div, v_float64x2, msa_divq_f64)
 
 // saturating multiply 8-bit, 16-bit
 #define OPENCV_HAL_IMPL_MSA_MUL_SAT(_Tpvec, _Tpwvec)         \
-inline _Tpvec operator * (const _Tpvec& a, const _Tpvec& b)  \
+inline _Tpvec v_mul(const _Tpvec& a, const _Tpvec& b)  \
 {                                                            \
     _Tpwvec c, d;                                            \
     v_mul_expand(a, b, c, d);                                \
     return v_pack(c, d);                                     \
-}                                                            \
-inline _Tpvec& operator *= (_Tpvec& a, const _Tpvec& b)      \
-{a = a * b; return a; }
+}
 
 OPENCV_HAL_IMPL_MSA_MUL_SAT(v_int8x16,  v_int16x8)
 OPENCV_HAL_IMPL_MSA_MUL_SAT(v_uint8x16, v_uint16x8)
@@ -546,13 +541,13 @@ inline v_int64x2 v_dotprod_expand(const v_int16x8& a, const v_int16x8& b)
     return v_int64x2(msa_hadd_s64(prod, prod));
 }
 inline v_int64x2 v_dotprod_expand(const v_int16x8& a, const v_int16x8& b, const v_int64x2& c)
-{ return v_dotprod_expand(a, b) + c; }
+{ return v_add(v_dotprod_expand(a, b), c); }
 
 // 32 >> 64f
 inline v_float64x2 v_dotprod_expand(const v_int32x4& a, const v_int32x4& b)
 { return v_cvt_f64(v_dotprod(a, b)); }
 inline v_float64x2 v_dotprod_expand(const v_int32x4& a, const v_int32x4& b, const v_float64x2& c)
-{ return v_dotprod_expand(a, b) + c; }
+{ return v_add(v_dotprod_expand(a, b), c); }
 
 
 //////// Fast Dot Product ////////
@@ -596,10 +591,10 @@ inline v_float64x2 v_dotprod_expand_fast(const v_int32x4& a, const v_int32x4& b,
 { return v_dotprod_expand(a, b, c); }
 
 #define OPENCV_HAL_IMPL_MSA_LOGIC_OP(_Tpvec, _Tpv, suffix) \
-OPENCV_HAL_IMPL_MSA_BIN_OP(&, _Tpvec, msa_andq_##suffix)   \
-OPENCV_HAL_IMPL_MSA_BIN_OP(|, _Tpvec, msa_orrq_##suffix)   \
-OPENCV_HAL_IMPL_MSA_BIN_OP(^, _Tpvec, msa_eorq_##suffix)   \
-inline _Tpvec operator ~ (const _Tpvec& a) \
+OPENCV_HAL_IMPL_MSA_BIN_OP(v_and, _Tpvec, msa_andq_##suffix)   \
+OPENCV_HAL_IMPL_MSA_BIN_OP(v_or, _Tpvec, msa_orrq_##suffix)    \
+OPENCV_HAL_IMPL_MSA_BIN_OP(v_xor, _Tpvec, msa_eorq_##suffix)   \
+inline _Tpvec v_not(const _Tpvec& a) \
 { \
     return _Tpvec(MSA_TPV_REINTERPRET(_Tpv, msa_mvnq_u8(MSA_TPV_REINTERPRET(v16u8, a.val)))); \
 }
@@ -614,21 +609,16 @@ OPENCV_HAL_IMPL_MSA_LOGIC_OP(v_uint64x2, v2u64, u64)
 OPENCV_HAL_IMPL_MSA_LOGIC_OP(v_int64x2, v2i64, s64)
 
 #define OPENCV_HAL_IMPL_MSA_FLT_BIT_OP(bin_op, intrin) \
-inline v_float32x4 operator bin_op (const v_float32x4& a, const v_float32x4& b) \
+inline v_float32x4 bin_op(const v_float32x4& a, const v_float32x4& b) \
 { \
     return v_float32x4(MSA_TPV_REINTERPRET(v4f32, intrin(MSA_TPV_REINTERPRET(v4i32, a.val), MSA_TPV_REINTERPRET(v4i32, b.val)))); \
-} \
-inline v_float32x4& operator bin_op##= (v_float32x4& a, const v_float32x4& b) \
-{ \
-    a.val = MSA_TPV_REINTERPRET(v4f32, intrin(MSA_TPV_REINTERPRET(v4i32, a.val), MSA_TPV_REINTERPRET(v4i32, b.val))); \
-    return a; \
 }
 
-OPENCV_HAL_IMPL_MSA_FLT_BIT_OP(&, msa_andq_s32)
-OPENCV_HAL_IMPL_MSA_FLT_BIT_OP(|, msa_orrq_s32)
-OPENCV_HAL_IMPL_MSA_FLT_BIT_OP(^, msa_eorq_s32)
+OPENCV_HAL_IMPL_MSA_FLT_BIT_OP(v_and, msa_andq_s32)
+OPENCV_HAL_IMPL_MSA_FLT_BIT_OP(v_or, msa_orrq_s32)
+OPENCV_HAL_IMPL_MSA_FLT_BIT_OP(v_xor, msa_eorq_s32)
 
-inline v_float32x4 operator ~ (const v_float32x4& a)
+inline v_float32x4 v_not(const v_float32x4& a)
 {
     return v_float32x4(MSA_TPV_REINTERPRET(v4f32, msa_mvnq_s32(MSA_TPV_REINTERPRET(v4i32, a.val))));
 }
@@ -659,21 +649,16 @@ OPENCV_HAL_IMPL_MSA_BASIC_FUNC(v_float64x2, v_sqrt, msa_sqrtq_f64)
 OPENCV_HAL_IMPL_MSA_BASIC_FUNC(v_float64x2, v_invsqrt, msa_rsqrtq_f64)
 
 #define OPENCV_HAL_IMPL_MSA_DBL_BIT_OP(bin_op, intrin) \
-inline v_float64x2 operator bin_op (const v_float64x2& a, const v_float64x2& b) \
+inline v_float64x2 bin_op(const v_float64x2& a, const v_float64x2& b) \
 { \
     return v_float64x2(MSA_TPV_REINTERPRET(v2f64, intrin(MSA_TPV_REINTERPRET(v2i64, a.val), MSA_TPV_REINTERPRET(v2i64, b.val)))); \
-} \
-inline v_float64x2& operator bin_op##= (v_float64x2& a, const v_float64x2& b) \
-{ \
-    a.val = MSA_TPV_REINTERPRET(v2f64, intrin(MSA_TPV_REINTERPRET(v2i64, a.val), MSA_TPV_REINTERPRET(v2i64, b.val))); \
-    return a; \
 }
 
-OPENCV_HAL_IMPL_MSA_DBL_BIT_OP(&, msa_andq_s64)
-OPENCV_HAL_IMPL_MSA_DBL_BIT_OP(|, msa_orrq_s64)
-OPENCV_HAL_IMPL_MSA_DBL_BIT_OP(^, msa_eorq_s64)
+OPENCV_HAL_IMPL_MSA_DBL_BIT_OP(v_and, msa_andq_s64)
+OPENCV_HAL_IMPL_MSA_DBL_BIT_OP(v_or, msa_orrq_s64)
+OPENCV_HAL_IMPL_MSA_DBL_BIT_OP(v_xor, msa_eorq_s64)
 
-inline v_float64x2 operator ~ (const v_float64x2& a)
+inline v_float64x2 v_not(const v_float64x2& a)
 {
     return v_float64x2(MSA_TPV_REINTERPRET(v2f64, msa_mvnq_s32(MSA_TPV_REINTERPRET(v4i32, a.val))));
 }
@@ -704,17 +689,17 @@ OPENCV_HAL_IMPL_MSA_BIN_FUNC(v_float64x2, v_min, msa_minq_f64)
 OPENCV_HAL_IMPL_MSA_BIN_FUNC(v_float64x2, v_max, msa_maxq_f64)
 
 #define OPENCV_HAL_IMPL_MSA_INT_CMP_OP(_Tpvec, _Tpv, suffix, not_suffix) \
-inline _Tpvec operator == (const _Tpvec& a, const _Tpvec& b) \
+inline _Tpvec v_eq(const _Tpvec& a, const _Tpvec& b) \
 { return _Tpvec(MSA_TPV_REINTERPRET(_Tpv, msa_ceqq_##suffix(a.val, b.val))); } \
-inline _Tpvec operator != (const _Tpvec& a, const _Tpvec& b) \
+inline _Tpvec v_ne(const _Tpvec& a, const _Tpvec& b) \
 { return _Tpvec(MSA_TPV_REINTERPRET(_Tpv, msa_mvnq_##not_suffix(msa_ceqq_##suffix(a.val, b.val)))); } \
-inline _Tpvec operator < (const _Tpvec& a, const _Tpvec& b) \
+inline _Tpvec v_lt(const _Tpvec& a, const _Tpvec& b) \
 { return _Tpvec(MSA_TPV_REINTERPRET(_Tpv, msa_cltq_##suffix(a.val, b.val))); } \
-inline _Tpvec operator > (const _Tpvec& a, const _Tpvec& b) \
+inline _Tpvec v_gt(const _Tpvec& a, const _Tpvec& b) \
 { return _Tpvec(MSA_TPV_REINTERPRET(_Tpv, msa_cgtq_##suffix(a.val, b.val))); } \
-inline _Tpvec operator <= (const _Tpvec& a, const _Tpvec& b) \
+inline _Tpvec v_le(const _Tpvec& a, const _Tpvec& b) \
 { return _Tpvec(MSA_TPV_REINTERPRET(_Tpv, msa_cleq_##suffix(a.val, b.val))); } \
-inline _Tpvec operator >= (const _Tpvec& a, const _Tpvec& b) \
+inline _Tpvec v_ge(const _Tpvec& a, const _Tpvec& b) \
 { return _Tpvec(MSA_TPV_REINTERPRET(_Tpv, msa_cgeq_##suffix(a.val, b.val))); }
 
 OPENCV_HAL_IMPL_MSA_INT_CMP_OP(v_uint8x16, v16u8, u8, u8)
@@ -821,9 +806,9 @@ inline v_float64x2 v_muladd(const v_float64x2& a, const v_float64x2& b, const v_
 
 // trade efficiency for convenience
 #define OPENCV_HAL_IMPL_MSA_SHIFT_OP(_Tpvec, suffix, _Tps, ssuffix) \
-inline _Tpvec operator << (const _Tpvec& a, int n) \
+inline _Tpvec v_shl(const _Tpvec& a, int n) \
 { return _Tpvec(msa_shlq_##suffix(a.val, msa_dupq_n_##ssuffix((_Tps)n))); } \
-inline _Tpvec operator >> (const _Tpvec& a, int n) \
+inline _Tpvec v_shr(const _Tpvec& a, int n) \
 { return _Tpvec(msa_shrq_##suffix(a.val, msa_dupq_n_##ssuffix((_Tps)n))); } \
 template<int n> inline _Tpvec v_shl(const _Tpvec& a) \
 { return _Tpvec(msa_shlq_n_##suffix(a.val, n)); } \
@@ -1838,7 +1823,7 @@ inline v_float32x4 v_broadcast_element(const v_float32x4& a)
 
 ////// FP16 support ///////
 #if CV_FP16
-inline v_float32x4 v_load_expand(const float16_t* ptr)
+inline v_float32x4 v_load_expand(const hfloat* ptr)
 {
 #ifndef msa_ld1_f16
     v4f16 v = (v4f16)msa_ld1_s16((const short*)ptr);
@@ -1848,7 +1833,7 @@ inline v_float32x4 v_load_expand(const float16_t* ptr)
     return v_float32x4(msa_cvt_f32_f16(v));
 }
 
-inline void v_pack_store(float16_t* ptr, const v_float32x4& v)
+inline void v_pack_store(hfloat* ptr, const v_float32x4& v)
 {
     v4f16 hv = msa_cvt_f16_f32(v.val);
 
@@ -1859,7 +1844,7 @@ inline void v_pack_store(float16_t* ptr, const v_float32x4& v)
 #endif
 }
 #else
-inline v_float32x4 v_load_expand(const float16_t* ptr)
+inline v_float32x4 v_load_expand(const hfloat* ptr)
 {
     float buf[4];
     for( int i = 0; i < 4; i++ )
@@ -1867,17 +1852,31 @@ inline v_float32x4 v_load_expand(const float16_t* ptr)
     return v_load(buf);
 }
 
-inline void v_pack_store(float16_t* ptr, const v_float32x4& v)
+inline void v_pack_store(hfloat* ptr, const v_float32x4& v)
 {
     float buf[4];
     v_store(buf, v);
     for( int i = 0; i < 4; i++ )
-        ptr[i] = (float16_t)buf[i];
+        ptr[i] = (hfloat)buf[i];
 }
 #endif
 
 inline void v_cleanup() {}
 
+#include "intrin_math.hpp"
+inline v_float32x4 v_exp(const v_float32x4& x) { return v_exp_default_32f<v_float32x4, v_int32x4>(x); }
+inline v_float32x4 v_log(const v_float32x4& x) { return v_log_default_32f<v_float32x4, v_int32x4>(x); }
+inline void v_sincos(const v_float32x4& x, v_float32x4& s, v_float32x4& c) { v_sincos_default_32f<v_float32x4, v_int32x4>(x, s, c); }
+inline v_float32x4 v_sin(const v_float32x4& x) { return v_sin_default_32f<v_float32x4, v_int32x4>(x); }
+inline v_float32x4 v_cos(const v_float32x4& x) { return v_cos_default_32f<v_float32x4, v_int32x4>(x); }
+inline v_float32x4 v_erf(const v_float32x4& x) { return v_erf_default_32f<v_float32x4, v_int32x4>(x); }
+
+inline v_float64x2 v_exp(const v_float64x2& x) { return v_exp_default_64f<v_float64x2, v_int64x2>(x); }
+inline v_float64x2 v_log(const v_float64x2& x) { return v_log_default_64f<v_float64x2, v_int64x2>(x); }
+inline void v_sincos(const v_float64x2& x, v_float64x2& s, v_float64x2& c) { v_sincos_default_64f<v_float64x2, v_int64x2>(x, s, c); }
+inline v_float64x2 v_sin(const v_float64x2& x) { return v_sin_default_64f<v_float64x2, v_int64x2>(x); }
+inline v_float64x2 v_cos(const v_float64x2& x) { return v_cos_default_64f<v_float64x2, v_int64x2>(x); }
+
 CV_CPU_OPTIMIZATION_HAL_NAMESPACE_END
 
 //! @endcond
diff --git a/3rdParty/opencv2/core/hal/intrin_neon.hpp b/3rdParty/opencv-4.12.0/opencv2/core/hal/intrin_neon.hpp
similarity index 86%
rename from 3rdParty/opencv2/core/hal/intrin_neon.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/hal/intrin_neon.hpp
index 17f60996c5..cf10e932a7 100644
--- a/3rdParty/opencv2/core/hal/intrin_neon.hpp
+++ b/3rdParty/opencv-4.12.0/opencv2/core/hal/intrin_neon.hpp
@@ -56,7 +56,7 @@ namespace cv
 CV_CPU_OPTIMIZATION_HAL_NAMESPACE_BEGIN
 
 #define CV_SIMD128 1
-#if defined(__aarch64__) || defined(_M_ARM64)
+#if defined(__aarch64__) || defined(_M_ARM64) || defined(_M_ARM64EC)
 #define CV_SIMD128_64F 1
 #else
 #define CV_SIMD128_64F 0
@@ -72,14 +72,12 @@ CV_CPU_OPTIMIZATION_HAL_NAMESPACE_BEGIN
 //
 // [1] https://developer.arm.com/documentation/101028/0012/13--Advanced-SIMD--Neon--intrinsics
 // [2] https://docs.microsoft.com/en-us/cpp/preprocessor/predefined-macros
-#if defined(__ARM_64BIT_STATE) || defined(_M_ARM64)
+#if defined(__ARM_64BIT_STATE) || defined(_M_ARM64) || defined(_M_ARM64EC)
 #define CV_NEON_AARCH64 1
 #else
 #define CV_NEON_AARCH64 0
 #endif
 
-// TODO
-#define CV_NEON_DOT 0
 
 //////////// Utils ////////////
 
@@ -133,13 +131,22 @@ OPENCV_HAL_IMPL_NEON_UTILS_SUFFIX_I64(int64x2,  int64x1,  s64)
 OPENCV_HAL_IMPL_NEON_UTILS_SUFFIX_F64(float64x2, float64x1,f64)
 #endif
 
+//////////// Compatibility layer ////////////
+template<typename T> struct VTraits {
+        static inline int vlanes() { return T::nlanes; }
+        enum { max_nlanes = T::nlanes, nlanes = T::nlanes };
+        using lane_type = typename T::lane_type;
+};
+
+template<typename T>
+inline typename VTraits<T>::lane_type v_get0(const T& v) \
+{ \
+    return v.get0(); \
+}
 //////////// Types ////////////
 
 struct v_uint8x16
 {
-    typedef uchar lane_type;
-    enum { nlanes = 16 };
-
     v_uint8x16() {}
     explicit v_uint8x16(uint8x16_t v) : val(v) {}
     v_uint8x16(uchar v0, uchar v1, uchar v2, uchar v3, uchar v4, uchar v5, uchar v6, uchar v7,
@@ -148,19 +155,22 @@ struct v_uint8x16
         uchar v[] = {v0, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15};
         val = vld1q_u8(v);
     }
+    uint8x16_t val;
+
+private:
+    friend struct VTraits<v_uint8x16>;
+    enum { nlanes = 16 };
+    typedef uchar lane_type;
+
+    friend typename VTraits<v_uint8x16>::lane_type v_get0<v_uint8x16>(const v_uint8x16& v);
     uchar get0() const
     {
         return vgetq_lane_u8(val, 0);
     }
-
-    uint8x16_t val;
 };
 
 struct v_int8x16
 {
-    typedef schar lane_type;
-    enum { nlanes = 16 };
-
     v_int8x16() {}
     explicit v_int8x16(int8x16_t v) : val(v) {}
     v_int8x16(schar v0, schar v1, schar v2, schar v3, schar v4, schar v5, schar v6, schar v7,
@@ -169,19 +179,22 @@ struct v_int8x16
         schar v[] = {v0, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15};
         val = vld1q_s8(v);
     }
+    int8x16_t val;
+
+private:
+    friend struct VTraits<v_int8x16>;
+    enum { nlanes = 16 };
+    typedef schar lane_type;
+
+    friend typename VTraits<v_int8x16>::lane_type v_get0<v_int8x16>(const v_int8x16& v);
     schar get0() const
     {
         return vgetq_lane_s8(val, 0);
     }
-
-    int8x16_t val;
 };
 
 struct v_uint16x8
 {
-    typedef ushort lane_type;
-    enum { nlanes = 8 };
-
     v_uint16x8() {}
     explicit v_uint16x8(uint16x8_t v) : val(v) {}
     v_uint16x8(ushort v0, ushort v1, ushort v2, ushort v3, ushort v4, ushort v5, ushort v6, ushort v7)
@@ -189,19 +202,22 @@ struct v_uint16x8
         ushort v[] = {v0, v1, v2, v3, v4, v5, v6, v7};
         val = vld1q_u16(v);
     }
+    uint16x8_t val;
+
+private:
+    friend struct VTraits<v_uint16x8>;
+    enum { nlanes = 8 };
+    typedef ushort lane_type;
+
+    friend typename VTraits<v_uint16x8>::lane_type v_get0<v_uint16x8>(const v_uint16x8& v);
     ushort get0() const
     {
         return vgetq_lane_u16(val, 0);
     }
-
-    uint16x8_t val;
 };
 
 struct v_int16x8
 {
-    typedef short lane_type;
-    enum { nlanes = 8 };
-
     v_int16x8() {}
     explicit v_int16x8(int16x8_t v) : val(v) {}
     v_int16x8(short v0, short v1, short v2, short v3, short v4, short v5, short v6, short v7)
@@ -209,19 +225,22 @@ struct v_int16x8
         short v[] = {v0, v1, v2, v3, v4, v5, v6, v7};
         val = vld1q_s16(v);
     }
+    int16x8_t val;
+
+private:
+    friend struct VTraits<v_int16x8>;
+    enum { nlanes = 8 };
+    typedef short lane_type;
+
+    friend typename VTraits<v_int16x8>::lane_type v_get0<v_int16x8>(const v_int16x8& v);
     short get0() const
     {
         return vgetq_lane_s16(val, 0);
     }
-
-    int16x8_t val;
 };
 
 struct v_uint32x4
 {
-    typedef unsigned lane_type;
-    enum { nlanes = 4 };
-
     v_uint32x4() {}
     explicit v_uint32x4(uint32x4_t v) : val(v) {}
     v_uint32x4(unsigned v0, unsigned v1, unsigned v2, unsigned v3)
@@ -229,19 +248,22 @@ struct v_uint32x4
         unsigned v[] = {v0, v1, v2, v3};
         val = vld1q_u32(v);
     }
+    uint32x4_t val;
+
+private:
+    friend struct VTraits<v_uint32x4>;
+    enum { nlanes = 4 };
+    typedef unsigned lane_type;
+
+    friend typename VTraits<v_uint32x4>::lane_type v_get0<v_uint32x4>(const v_uint32x4& v);
     unsigned get0() const
     {
         return vgetq_lane_u32(val, 0);
     }
-
-    uint32x4_t val;
 };
 
 struct v_int32x4
 {
-    typedef int lane_type;
-    enum { nlanes = 4 };
-
     v_int32x4() {}
     explicit v_int32x4(int32x4_t v) : val(v) {}
     v_int32x4(int v0, int v1, int v2, int v3)
@@ -249,18 +271,22 @@ struct v_int32x4
         int v[] = {v0, v1, v2, v3};
         val = vld1q_s32(v);
     }
+    int32x4_t val;
+
+private:
+    friend struct VTraits<v_int32x4>;
+    enum { nlanes = 4 };
+    typedef int lane_type;
+
+    friend typename VTraits<v_int32x4>::lane_type v_get0<v_int32x4>(const v_int32x4& v);
     int get0() const
     {
         return vgetq_lane_s32(val, 0);
     }
-    int32x4_t val;
 };
 
 struct v_float32x4
 {
-    typedef float lane_type;
-    enum { nlanes = 4 };
-
     v_float32x4() {}
     explicit v_float32x4(float32x4_t v) : val(v) {}
     v_float32x4(float v0, float v1, float v2, float v3)
@@ -268,18 +294,22 @@ struct v_float32x4
         float v[] = {v0, v1, v2, v3};
         val = vld1q_f32(v);
     }
+    float32x4_t val;
+
+private:
+    friend struct VTraits<v_float32x4>;
+    enum { nlanes = 4 };
+    typedef float lane_type;
+
+    friend typename VTraits<v_float32x4>::lane_type v_get0<v_float32x4>(const v_float32x4& v);
     float get0() const
     {
         return vgetq_lane_f32(val, 0);
     }
-    float32x4_t val;
 };
 
 struct v_uint64x2
 {
-    typedef uint64 lane_type;
-    enum { nlanes = 2 };
-
     v_uint64x2() {}
     explicit v_uint64x2(uint64x2_t v) : val(v) {}
     v_uint64x2(uint64 v0, uint64 v1)
@@ -287,18 +317,21 @@ struct v_uint64x2
         uint64 v[] = {v0, v1};
         val = vld1q_u64(v);
     }
+    uint64x2_t val;
+private:
+    friend struct VTraits<v_uint64x2>;
+    enum { nlanes = 2 };
+    typedef uint64 lane_type;
+
+    friend typename VTraits<v_uint64x2>::lane_type v_get0<v_uint64x2>(const v_uint64x2& v);
     uint64 get0() const
     {
         return vgetq_lane_u64(val, 0);
     }
-    uint64x2_t val;
 };
 
 struct v_int64x2
 {
-    typedef int64 lane_type;
-    enum { nlanes = 2 };
-
     v_int64x2() {}
     explicit v_int64x2(int64x2_t v) : val(v) {}
     v_int64x2(int64 v0, int64 v1)
@@ -306,19 +339,23 @@ struct v_int64x2
         int64 v[] = {v0, v1};
         val = vld1q_s64(v);
     }
+    int64x2_t val;
+
+private:
+    friend struct VTraits<v_int64x2>;
+    enum { nlanes = 2 };
+    typedef int64 lane_type;
+
+    friend typename VTraits<v_int64x2>::lane_type v_get0<v_int64x2>(const v_int64x2& v);
     int64 get0() const
     {
         return vgetq_lane_s64(val, 0);
     }
-    int64x2_t val;
 };
 
 #if CV_SIMD128_64F
 struct v_float64x2
 {
-    typedef double lane_type;
-    enum { nlanes = 2 };
-
     v_float64x2() {}
     explicit v_float64x2(float64x2_t v) : val(v) {}
     v_float64x2(double v0, double v1)
@@ -326,17 +363,26 @@ struct v_float64x2
         double v[] = {v0, v1};
         val = vld1q_f64(v);
     }
+
+    float64x2_t val;
+private:
+    friend struct VTraits<v_float64x2>;
+    enum { nlanes = 2 };
+    typedef double lane_type;
+
+    friend typename VTraits<v_float64x2>::lane_type v_get0<v_float64x2>(const v_float64x2& v);
     double get0() const
     {
         return vgetq_lane_f64(val, 0);
     }
-    float64x2_t val;
 };
 #endif
 
 #define OPENCV_HAL_IMPL_NEON_INIT(_Tpv, _Tp, suffix) \
 inline v_##_Tpv v_setzero_##suffix() { return v_##_Tpv(vdupq_n_##suffix((_Tp)0)); } \
 inline v_##_Tpv v_setall_##suffix(_Tp v) { return v_##_Tpv(vdupq_n_##suffix(v)); } \
+template <> inline v_##_Tpv v_setzero_() { return v_setzero_##suffix(); } \
+template <> inline v_##_Tpv v_setall_(_Tp v) { return v_setall_##suffix(v); } \
 inline _Tpv##_t vreinterpretq_##suffix##_##suffix(_Tpv##_t v) { return v; } \
 inline v_uint8x16 v_reinterpret_as_u8(const v_##_Tpv& v) { return v_uint8x16(vreinterpretq_u8_##suffix(v.val)); } \
 inline v_int8x16 v_reinterpret_as_s8(const v_##_Tpv& v) { return v_int8x16(vreinterpretq_s8_##suffix(v.val)); } \
@@ -462,71 +508,56 @@ inline v_float32x4 v_matmuladd(const v_float32x4& v, const v_float32x4& m0,
 }
 
 #define OPENCV_HAL_IMPL_NEON_BIN_OP(bin_op, _Tpvec, intrin) \
-inline _Tpvec operator bin_op (const _Tpvec& a, const _Tpvec& b) \
+inline _Tpvec bin_op (const _Tpvec& a, const _Tpvec& b) \
 { \
     return _Tpvec(intrin(a.val, b.val)); \
-} \
-inline _Tpvec& operator bin_op##= (_Tpvec& a, const _Tpvec& b) \
-{ \
-    a.val = intrin(a.val, b.val); \
-    return a; \
-}
-
-OPENCV_HAL_IMPL_NEON_BIN_OP(+, v_uint8x16, vqaddq_u8)
-OPENCV_HAL_IMPL_NEON_BIN_OP(-, v_uint8x16, vqsubq_u8)
-OPENCV_HAL_IMPL_NEON_BIN_OP(+, v_int8x16, vqaddq_s8)
-OPENCV_HAL_IMPL_NEON_BIN_OP(-, v_int8x16, vqsubq_s8)
-OPENCV_HAL_IMPL_NEON_BIN_OP(+, v_uint16x8, vqaddq_u16)
-OPENCV_HAL_IMPL_NEON_BIN_OP(-, v_uint16x8, vqsubq_u16)
-OPENCV_HAL_IMPL_NEON_BIN_OP(+, v_int16x8, vqaddq_s16)
-OPENCV_HAL_IMPL_NEON_BIN_OP(-, v_int16x8, vqsubq_s16)
-OPENCV_HAL_IMPL_NEON_BIN_OP(+, v_int32x4, vaddq_s32)
-OPENCV_HAL_IMPL_NEON_BIN_OP(-, v_int32x4, vsubq_s32)
-OPENCV_HAL_IMPL_NEON_BIN_OP(*, v_int32x4, vmulq_s32)
-OPENCV_HAL_IMPL_NEON_BIN_OP(+, v_uint32x4, vaddq_u32)
-OPENCV_HAL_IMPL_NEON_BIN_OP(-, v_uint32x4, vsubq_u32)
-OPENCV_HAL_IMPL_NEON_BIN_OP(*, v_uint32x4, vmulq_u32)
-OPENCV_HAL_IMPL_NEON_BIN_OP(+, v_float32x4, vaddq_f32)
-OPENCV_HAL_IMPL_NEON_BIN_OP(-, v_float32x4, vsubq_f32)
-OPENCV_HAL_IMPL_NEON_BIN_OP(*, v_float32x4, vmulq_f32)
-OPENCV_HAL_IMPL_NEON_BIN_OP(+, v_int64x2, vaddq_s64)
-OPENCV_HAL_IMPL_NEON_BIN_OP(-, v_int64x2, vsubq_s64)
-OPENCV_HAL_IMPL_NEON_BIN_OP(+, v_uint64x2, vaddq_u64)
-OPENCV_HAL_IMPL_NEON_BIN_OP(-, v_uint64x2, vsubq_u64)
+}
+
+OPENCV_HAL_IMPL_NEON_BIN_OP(v_add, v_uint8x16, vqaddq_u8)
+OPENCV_HAL_IMPL_NEON_BIN_OP(v_sub, v_uint8x16, vqsubq_u8)
+OPENCV_HAL_IMPL_NEON_BIN_OP(v_add, v_int8x16, vqaddq_s8)
+OPENCV_HAL_IMPL_NEON_BIN_OP(v_sub, v_int8x16, vqsubq_s8)
+OPENCV_HAL_IMPL_NEON_BIN_OP(v_add, v_uint16x8, vqaddq_u16)
+OPENCV_HAL_IMPL_NEON_BIN_OP(v_sub, v_uint16x8, vqsubq_u16)
+OPENCV_HAL_IMPL_NEON_BIN_OP(v_add, v_int16x8, vqaddq_s16)
+OPENCV_HAL_IMPL_NEON_BIN_OP(v_sub, v_int16x8, vqsubq_s16)
+OPENCV_HAL_IMPL_NEON_BIN_OP(v_add, v_int32x4, vaddq_s32)
+OPENCV_HAL_IMPL_NEON_BIN_OP(v_sub, v_int32x4, vsubq_s32)
+OPENCV_HAL_IMPL_NEON_BIN_OP(v_mul, v_int32x4, vmulq_s32)
+OPENCV_HAL_IMPL_NEON_BIN_OP(v_add, v_uint32x4, vaddq_u32)
+OPENCV_HAL_IMPL_NEON_BIN_OP(v_sub, v_uint32x4, vsubq_u32)
+OPENCV_HAL_IMPL_NEON_BIN_OP(v_mul, v_uint32x4, vmulq_u32)
+OPENCV_HAL_IMPL_NEON_BIN_OP(v_add, v_float32x4, vaddq_f32)
+OPENCV_HAL_IMPL_NEON_BIN_OP(v_sub, v_float32x4, vsubq_f32)
+OPENCV_HAL_IMPL_NEON_BIN_OP(v_mul, v_float32x4, vmulq_f32)
+OPENCV_HAL_IMPL_NEON_BIN_OP(v_add, v_int64x2, vaddq_s64)
+OPENCV_HAL_IMPL_NEON_BIN_OP(v_sub, v_int64x2, vsubq_s64)
+OPENCV_HAL_IMPL_NEON_BIN_OP(v_add, v_uint64x2, vaddq_u64)
+OPENCV_HAL_IMPL_NEON_BIN_OP(v_sub, v_uint64x2, vsubq_u64)
 #if CV_SIMD128_64F
-OPENCV_HAL_IMPL_NEON_BIN_OP(/, v_float32x4, vdivq_f32)
-OPENCV_HAL_IMPL_NEON_BIN_OP(+, v_float64x2, vaddq_f64)
-OPENCV_HAL_IMPL_NEON_BIN_OP(-, v_float64x2, vsubq_f64)
-OPENCV_HAL_IMPL_NEON_BIN_OP(*, v_float64x2, vmulq_f64)
-OPENCV_HAL_IMPL_NEON_BIN_OP(/, v_float64x2, vdivq_f64)
+OPENCV_HAL_IMPL_NEON_BIN_OP(v_div, v_float32x4, vdivq_f32)
+OPENCV_HAL_IMPL_NEON_BIN_OP(v_add, v_float64x2, vaddq_f64)
+OPENCV_HAL_IMPL_NEON_BIN_OP(v_sub, v_float64x2, vsubq_f64)
+OPENCV_HAL_IMPL_NEON_BIN_OP(v_mul, v_float64x2, vmulq_f64)
+OPENCV_HAL_IMPL_NEON_BIN_OP(v_div, v_float64x2, vdivq_f64)
 #else
-inline v_float32x4 operator / (const v_float32x4& a, const v_float32x4& b)
+inline v_float32x4 v_div (const v_float32x4& a, const v_float32x4& b)
 {
     float32x4_t reciprocal = vrecpeq_f32(b.val);
     reciprocal = vmulq_f32(vrecpsq_f32(b.val, reciprocal), reciprocal);
     reciprocal = vmulq_f32(vrecpsq_f32(b.val, reciprocal), reciprocal);
     return v_float32x4(vmulq_f32(a.val, reciprocal));
 }
-inline v_float32x4& operator /= (v_float32x4& a, const v_float32x4& b)
-{
-    float32x4_t reciprocal = vrecpeq_f32(b.val);
-    reciprocal = vmulq_f32(vrecpsq_f32(b.val, reciprocal), reciprocal);
-    reciprocal = vmulq_f32(vrecpsq_f32(b.val, reciprocal), reciprocal);
-    a.val = vmulq_f32(a.val, reciprocal);
-    return a;
-}
 #endif
 
 // saturating multiply 8-bit, 16-bit
 #define OPENCV_HAL_IMPL_NEON_MUL_SAT(_Tpvec, _Tpwvec)            \
-    inline _Tpvec operator * (const _Tpvec& a, const _Tpvec& b)  \
+    inline _Tpvec v_mul (const _Tpvec& a, const _Tpvec& b)  \
     {                                                            \
         _Tpwvec c, d;                                            \
         v_mul_expand(a, b, c, d);                                \
         return v_pack(c, d);                                     \
-    }                                                            \
-    inline _Tpvec& operator *= (_Tpvec& a, const _Tpvec& b)      \
-    { a = a * b; return a; }
+    }
 
 OPENCV_HAL_IMPL_NEON_MUL_SAT(v_int8x16,  v_int16x8)
 OPENCV_HAL_IMPL_NEON_MUL_SAT(v_uint8x16, v_uint16x8)
@@ -665,11 +696,22 @@ inline v_int64x2 v_dotprod(const v_int32x4& a, const v_int32x4& b, const v_int64
 }
 
 // 8 >> 32
+#ifdef CV_NEON_DOT
+#define OPENCV_HAL_IMPL_NEON_DOT_PRODUCT_OP(_Tpvec1, _Tpvec2, suffix) \
+inline _Tpvec1 v_dotprod_expand(const _Tpvec2& a, const _Tpvec2& b)   \
+{ \
+    return _Tpvec1(vdotq_##suffix(vdupq_n_##suffix(0), a.val, b.val));\
+} \
+inline _Tpvec1 v_dotprod_expand(const _Tpvec2& a, const _Tpvec2& b, const _Tpvec1& c) \
+{ \
+    return _Tpvec1(vdotq_##suffix(c.val, a.val, b.val)); \
+}
+
+OPENCV_HAL_IMPL_NEON_DOT_PRODUCT_OP(v_uint32x4, v_uint8x16, u32)
+OPENCV_HAL_IMPL_NEON_DOT_PRODUCT_OP(v_int32x4,  v_int8x16,  s32)
+#else
 inline v_uint32x4 v_dotprod_expand(const v_uint8x16& a, const v_uint8x16& b)
 {
-#if CV_NEON_DOT
-    return v_uint32x4(vdotq_u32(vdupq_n_u32(0), a.val, b.val));
-#else
     const uint8x16_t zero   = vreinterpretq_u8_u32(vdupq_n_u32(0));
     const uint8x16_t mask   = vreinterpretq_u8_u32(vdupq_n_u32(0x00FF00FF));
     const uint16x8_t zero32 = vreinterpretq_u16_u32(vdupq_n_u32(0));
@@ -685,23 +727,15 @@ inline v_uint32x4 v_dotprod_expand(const v_uint8x16& a, const v_uint8x16& b)
     uint32x4_t s1 = vaddq_u32(vshrq_n_u32(vreinterpretq_u32_u16(even), 16),
                               vshrq_n_u32(vreinterpretq_u32_u16(odd),  16));
     return v_uint32x4(vaddq_u32(s0, s1));
-#endif
 }
 inline v_uint32x4 v_dotprod_expand(const v_uint8x16& a, const v_uint8x16& b,
                                    const v_uint32x4& c)
 {
-#if CV_NEON_DOT
-    return v_uint32x4(vdotq_u32(c.val, a.val, b.val));
-#else
-    return v_dotprod_expand(a, b) + c;
-#endif
+    return v_add(v_dotprod_expand(a, b), c);
 }
 
 inline v_int32x4 v_dotprod_expand(const v_int8x16& a, const v_int8x16& b)
 {
-#if CV_NEON_DOT
-    return v_int32x4(vdotq_s32(vdupq_n_s32(0), a.val, b.val));
-#else
     int16x8_t p0  = vmull_s8(vget_low_s8(a.val), vget_low_s8(b.val));
     int16x8_t p1  = vmull_s8(vget_high_s8(a.val), vget_high_s8(b.val));
     int16x8_t uzp1, uzp2;
@@ -710,18 +744,13 @@ inline v_int32x4 v_dotprod_expand(const v_int8x16& a, const v_int8x16& b)
     int16x4_t uzpl1, uzpl2;
     _v128_unzip(vget_low_s16(sum), vget_high_s16(sum), uzpl1, uzpl2);
     return v_int32x4(vaddl_s16(uzpl1, uzpl2));
-#endif
 }
 inline v_int32x4 v_dotprod_expand(const v_int8x16& a, const v_int8x16& b,
                                   const v_int32x4& c)
 {
-#if CV_NEON_DOT
-    return v_int32x4(vdotq_s32(c.val, a.val, b.val));
-#else
-    return v_dotprod_expand(a, b) + c;
-#endif
+    return v_add(v_dotprod_expand(a, b), c);
 }
-
+#endif
 // 16 >> 64
 inline v_uint64x2 v_dotprod_expand(const v_uint16x8& a, const v_uint16x8& b)
 {
@@ -739,7 +768,7 @@ inline v_uint64x2 v_dotprod_expand(const v_uint16x8& a, const v_uint16x8& b)
     return v_uint64x2(vaddq_u64(s0, s1));
 }
 inline v_uint64x2 v_dotprod_expand(const v_uint16x8& a, const v_uint16x8& b, const v_uint64x2& c)
-{ return v_dotprod_expand(a, b) + c; }
+{ return v_add(v_dotprod_expand(a, b), c); }
 
 inline v_int64x2 v_dotprod_expand(const v_int16x8& a, const v_int16x8& b)
 {
@@ -756,7 +785,7 @@ inline v_int64x2 v_dotprod_expand(const v_int16x8& a, const v_int16x8& b)
 }
 inline v_int64x2 v_dotprod_expand(const v_int16x8& a, const v_int16x8& b,
                                   const v_int64x2& c)
-{ return v_dotprod_expand(a, b) + c; }
+{ return v_add(v_dotprod_expand(a, b), c); }
 
 // 32 >> 64f
 #if CV_SIMD128_64F
@@ -764,7 +793,7 @@ inline v_float64x2 v_dotprod_expand(const v_int32x4& a, const v_int32x4& b)
 { return v_cvt_f64(v_dotprod(a, b)); }
 inline v_float64x2 v_dotprod_expand(const v_int32x4& a,   const v_int32x4& b,
                                     const v_float64x2& c)
-{ return v_dotprod_expand(a, b) + c; }
+{ return v_add(v_dotprod_expand(a, b), c); }
 #endif
 
 //////// Fast Dot Product ////////
@@ -830,45 +859,44 @@ inline v_int64x2 v_dotprod_fast(const v_int32x4& a, const v_int32x4& b, const v_
 }
 
 // 8 >> 32
+#ifdef CV_NEON_DOT
+#define OPENCV_HAL_IMPL_NEON_DOT_PRODUCT_FAST_OP(_Tpvec1, _Tpvec2, suffix) \
+inline _Tpvec1 v_dotprod_expand_fast(const _Tpvec2& a, const _Tpvec2& b)   \
+{ \
+    return v_dotprod_expand(a, b); \
+} \
+inline _Tpvec1 v_dotprod_expand_fast(const _Tpvec2& a, const _Tpvec2& b, const _Tpvec1& c) \
+{ \
+    return v_dotprod_expand(a, b, c); \
+}
+
+OPENCV_HAL_IMPL_NEON_DOT_PRODUCT_FAST_OP(v_uint32x4, v_uint8x16, u32)
+OPENCV_HAL_IMPL_NEON_DOT_PRODUCT_FAST_OP(v_int32x4,  v_int8x16,  s32)
+#else
 inline v_uint32x4 v_dotprod_expand_fast(const v_uint8x16& a, const v_uint8x16& b)
 {
-#if CV_NEON_DOT
-    return v_uint32x4(vdotq_u32(vdupq_n_u32(0), a.val, b.val));
-#else
     uint16x8_t p0 = vmull_u8(vget_low_u8(a.val), vget_low_u8(b.val));
     uint16x8_t p1 = vmull_u8(vget_high_u8(a.val), vget_high_u8(b.val));
     uint32x4_t s0 = vaddl_u16(vget_low_u16(p0), vget_low_u16(p1));
     uint32x4_t s1 = vaddl_u16(vget_high_u16(p0), vget_high_u16(p1));
     return v_uint32x4(vaddq_u32(s0, s1));
-#endif
 }
 inline v_uint32x4 v_dotprod_expand_fast(const v_uint8x16& a, const v_uint8x16& b, const v_uint32x4& c)
 {
-#if CV_NEON_DOT
-    return v_uint32x4(vdotq_u32(c.val, a.val, b.val));
-#else
-    return v_dotprod_expand_fast(a, b) + c;
-#endif
+    return v_add(v_dotprod_expand_fast(a, b), c);
 }
 
 inline v_int32x4 v_dotprod_expand_fast(const v_int8x16& a, const v_int8x16& b)
 {
-#if CV_NEON_DOT
-    return v_int32x4(vdotq_s32(vdupq_n_s32(0), a.val, b.val));
-#else
     int16x8_t prod = vmull_s8(vget_low_s8(a.val), vget_low_s8(b.val));
     prod = vmlal_s8(prod, vget_high_s8(a.val), vget_high_s8(b.val));
     return v_int32x4(vaddl_s16(vget_low_s16(prod), vget_high_s16(prod)));
-#endif
 }
 inline v_int32x4 v_dotprod_expand_fast(const v_int8x16& a, const v_int8x16& b, const v_int32x4& c)
 {
-#if CV_NEON_DOT
-    return v_int32x4(vdotq_s32(c.val, a.val, b.val));
-#else
-    return v_dotprod_expand_fast(a, b) + c;
-#endif
+    return v_add(v_dotprod_expand_fast(a, b), c);
 }
+#endif
 
 // 16 >> 64
 inline v_uint64x2 v_dotprod_expand_fast(const v_uint16x8& a, const v_uint16x8& b)
@@ -880,7 +908,7 @@ inline v_uint64x2 v_dotprod_expand_fast(const v_uint16x8& a, const v_uint16x8& b
     return v_uint64x2(vaddq_u64(s0, s1));
 }
 inline v_uint64x2 v_dotprod_expand_fast(const v_uint16x8& a, const v_uint16x8& b, const v_uint64x2& c)
-{ return v_dotprod_expand_fast(a, b) + c; }
+{ return v_add(v_dotprod_expand_fast(a, b), c); }
 
 inline v_int64x2 v_dotprod_expand_fast(const v_int16x8& a, const v_int16x8& b)
 {
@@ -889,22 +917,22 @@ inline v_int64x2 v_dotprod_expand_fast(const v_int16x8& a, const v_int16x8& b)
     return v_int64x2(vaddl_s32(vget_low_s32(prod), vget_high_s32(prod)));
 }
 inline v_int64x2 v_dotprod_expand_fast(const v_int16x8& a, const v_int16x8& b, const v_int64x2& c)
-{ return v_dotprod_expand_fast(a, b) + c; }
+{ return v_add(v_dotprod_expand_fast(a, b), c); }
 
 // 32 >> 64f
 #if CV_SIMD128_64F
 inline v_float64x2 v_dotprod_expand_fast(const v_int32x4& a, const v_int32x4& b)
 { return v_cvt_f64(v_dotprod_fast(a, b)); }
 inline v_float64x2 v_dotprod_expand_fast(const v_int32x4& a, const v_int32x4& b, const v_float64x2& c)
-{ return v_dotprod_expand_fast(a, b) + c; }
+{ return v_add(v_dotprod_expand_fast(a, b), c); }
 #endif
 
 
 #define OPENCV_HAL_IMPL_NEON_LOGIC_OP(_Tpvec, suffix) \
-    OPENCV_HAL_IMPL_NEON_BIN_OP(&, _Tpvec, vandq_##suffix) \
-    OPENCV_HAL_IMPL_NEON_BIN_OP(|, _Tpvec, vorrq_##suffix) \
-    OPENCV_HAL_IMPL_NEON_BIN_OP(^, _Tpvec, veorq_##suffix) \
-    inline _Tpvec operator ~ (const _Tpvec& a) \
+    OPENCV_HAL_IMPL_NEON_BIN_OP(v_and, _Tpvec, vandq_##suffix) \
+    OPENCV_HAL_IMPL_NEON_BIN_OP(v_or, _Tpvec, vorrq_##suffix) \
+    OPENCV_HAL_IMPL_NEON_BIN_OP(v_xor, _Tpvec, veorq_##suffix) \
+    inline _Tpvec v_not (const _Tpvec& a) \
     { \
         return _Tpvec(vreinterpretq_##suffix##_u8(vmvnq_u8(vreinterpretq_u8_##suffix(a.val)))); \
     }
@@ -919,21 +947,16 @@ OPENCV_HAL_IMPL_NEON_LOGIC_OP(v_uint64x2, u64)
 OPENCV_HAL_IMPL_NEON_LOGIC_OP(v_int64x2, s64)
 
 #define OPENCV_HAL_IMPL_NEON_FLT_BIT_OP(bin_op, intrin) \
-inline v_float32x4 operator bin_op (const v_float32x4& a, const v_float32x4& b) \
+inline v_float32x4 bin_op (const v_float32x4& a, const v_float32x4& b) \
 { \
     return v_float32x4(vreinterpretq_f32_s32(intrin(vreinterpretq_s32_f32(a.val), vreinterpretq_s32_f32(b.val)))); \
-} \
-inline v_float32x4& operator bin_op##= (v_float32x4& a, const v_float32x4& b) \
-{ \
-    a.val = vreinterpretq_f32_s32(intrin(vreinterpretq_s32_f32(a.val), vreinterpretq_s32_f32(b.val))); \
-    return a; \
 }
 
-OPENCV_HAL_IMPL_NEON_FLT_BIT_OP(&, vandq_s32)
-OPENCV_HAL_IMPL_NEON_FLT_BIT_OP(|, vorrq_s32)
-OPENCV_HAL_IMPL_NEON_FLT_BIT_OP(^, veorq_s32)
+OPENCV_HAL_IMPL_NEON_FLT_BIT_OP(v_and, vandq_s32)
+OPENCV_HAL_IMPL_NEON_FLT_BIT_OP(v_or, vorrq_s32)
+OPENCV_HAL_IMPL_NEON_FLT_BIT_OP(v_xor, veorq_s32)
 
-inline v_float32x4 operator ~ (const v_float32x4& a)
+inline v_float32x4 v_not (const v_float32x4& a)
 {
     return v_float32x4(vreinterpretq_f32_s32(vmvnq_s32(vreinterpretq_s32_f32(a.val))));
 }
@@ -947,7 +970,7 @@ inline v_float32x4 v_sqrt(const v_float32x4& x)
 inline v_float32x4 v_invsqrt(const v_float32x4& x)
 {
     v_float32x4 one = v_setall_f32(1.0f);
-    return one / v_sqrt(x);
+    return v_div(one, v_sqrt(x));
 }
 #else
 inline v_float32x4 v_sqrt(const v_float32x4& x)
@@ -980,21 +1003,16 @@ inline v_float32x4 v_abs(v_float32x4 x)
 
 #if CV_SIMD128_64F
 #define OPENCV_HAL_IMPL_NEON_DBL_BIT_OP(bin_op, intrin) \
-inline v_float64x2 operator bin_op (const v_float64x2& a, const v_float64x2& b) \
+inline v_float64x2 bin_op (const v_float64x2& a, const v_float64x2& b) \
 { \
     return v_float64x2(vreinterpretq_f64_s64(intrin(vreinterpretq_s64_f64(a.val), vreinterpretq_s64_f64(b.val)))); \
-} \
-inline v_float64x2& operator bin_op##= (v_float64x2& a, const v_float64x2& b) \
-{ \
-    a.val = vreinterpretq_f64_s64(intrin(vreinterpretq_s64_f64(a.val), vreinterpretq_s64_f64(b.val))); \
-    return a; \
 }
 
-OPENCV_HAL_IMPL_NEON_DBL_BIT_OP(&, vandq_s64)
-OPENCV_HAL_IMPL_NEON_DBL_BIT_OP(|, vorrq_s64)
-OPENCV_HAL_IMPL_NEON_DBL_BIT_OP(^, veorq_s64)
+OPENCV_HAL_IMPL_NEON_DBL_BIT_OP(v_and, vandq_s64)
+OPENCV_HAL_IMPL_NEON_DBL_BIT_OP(v_or, vorrq_s64)
+OPENCV_HAL_IMPL_NEON_DBL_BIT_OP(v_xor, veorq_s64)
 
-inline v_float64x2 operator ~ (const v_float64x2& a)
+inline v_float64x2 v_not (const v_float64x2& a)
 {
     return v_float64x2(vreinterpretq_f64_s32(vmvnq_s32(vreinterpretq_s32_f64(a.val))));
 }
@@ -1007,7 +1025,7 @@ inline v_float64x2 v_sqrt(const v_float64x2& x)
 inline v_float64x2 v_invsqrt(const v_float64x2& x)
 {
     v_float64x2 one = v_setall_f64(1.0f);
-    return one / v_sqrt(x);
+    return v_div(one, v_sqrt(x));
 }
 
 inline v_float64x2 v_abs(v_float64x2 x)
@@ -1041,30 +1059,18 @@ OPENCV_HAL_IMPL_NEON_BIN_FUNC(v_float64x2, v_min, vminq_f64)
 OPENCV_HAL_IMPL_NEON_BIN_FUNC(v_float64x2, v_max, vmaxq_f64)
 #endif
 
-#if CV_SIMD128_64F
-inline int64x2_t vmvnq_s64(int64x2_t a)
-{
-    int64x2_t vx = vreinterpretq_s64_u32(vdupq_n_u32(0xFFFFFFFF));
-    return veorq_s64(a, vx);
-}
-inline uint64x2_t vmvnq_u64(uint64x2_t a)
-{
-    uint64x2_t vx = vreinterpretq_u64_u32(vdupq_n_u32(0xFFFFFFFF));
-    return veorq_u64(a, vx);
-}
-#endif
 #define OPENCV_HAL_IMPL_NEON_INT_CMP_OP(_Tpvec, cast, suffix, not_suffix) \
-inline _Tpvec operator == (const _Tpvec& a, const _Tpvec& b) \
+inline _Tpvec v_eq (const _Tpvec& a, const _Tpvec& b) \
 { return _Tpvec(cast(vceqq_##suffix(a.val, b.val))); } \
-inline _Tpvec operator != (const _Tpvec& a, const _Tpvec& b) \
+inline _Tpvec v_ne (const _Tpvec& a, const _Tpvec& b) \
 { return _Tpvec(cast(vmvnq_##not_suffix(vceqq_##suffix(a.val, b.val)))); } \
-inline _Tpvec operator < (const _Tpvec& a, const _Tpvec& b) \
+inline _Tpvec v_lt (const _Tpvec& a, const _Tpvec& b) \
 { return _Tpvec(cast(vcltq_##suffix(a.val, b.val))); } \
-inline _Tpvec operator > (const _Tpvec& a, const _Tpvec& b) \
+inline _Tpvec v_gt (const _Tpvec& a, const _Tpvec& b) \
 { return _Tpvec(cast(vcgtq_##suffix(a.val, b.val))); } \
-inline _Tpvec operator <= (const _Tpvec& a, const _Tpvec& b) \
+inline _Tpvec v_le (const _Tpvec& a, const _Tpvec& b) \
 { return _Tpvec(cast(vcleq_##suffix(a.val, b.val))); } \
-inline _Tpvec operator >= (const _Tpvec& a, const _Tpvec& b) \
+inline _Tpvec v_ge (const _Tpvec& a, const _Tpvec& b) \
 { return _Tpvec(cast(vcgeq_##suffix(a.val, b.val))); }
 
 OPENCV_HAL_IMPL_NEON_INT_CMP_OP(v_uint8x16, OPENCV_HAL_NOP, u8, u8)
@@ -1074,9 +1080,47 @@ OPENCV_HAL_IMPL_NEON_INT_CMP_OP(v_int16x8, vreinterpretq_s16_u16, s16, u16)
 OPENCV_HAL_IMPL_NEON_INT_CMP_OP(v_uint32x4, OPENCV_HAL_NOP, u32, u32)
 OPENCV_HAL_IMPL_NEON_INT_CMP_OP(v_int32x4, vreinterpretq_s32_u32, s32, u32)
 OPENCV_HAL_IMPL_NEON_INT_CMP_OP(v_float32x4, vreinterpretq_f32_u32, f32, u32)
+#if defined(__aarch64__) || defined(_M_ARM64) || defined(_M_ARM64EC)
+static inline uint64x2_t vmvnq_u64(uint64x2_t a)
+{
+    uint64x2_t vx = vreinterpretq_u64_u32(vdupq_n_u32(0xFFFFFFFF));
+    return veorq_u64(a, vx);
+}
+//OPENCV_HAL_IMPL_NEON_INT_CMP_OP(v_uint64x2, OPENCV_HAL_NOP, u64, u64)
+//OPENCV_HAL_IMPL_NEON_INT_CMP_OP(v_int64x2, vreinterpretq_s64_u64, s64, u64)
+static inline v_uint64x2 v_eq (const v_uint64x2& a, const v_uint64x2& b)
+{ return v_uint64x2(vceqq_u64(a.val, b.val)); }
+static inline v_uint64x2 v_ne (const v_uint64x2& a, const v_uint64x2& b)
+{ return v_uint64x2(vmvnq_u64(vceqq_u64(a.val, b.val))); }
+static inline v_int64x2 v_eq (const v_int64x2& a, const v_int64x2& b)
+{ return v_int64x2(vreinterpretq_s64_u64(vceqq_s64(a.val, b.val))); }
+static inline v_int64x2 v_ne (const v_int64x2& a, const v_int64x2& b)
+{ return v_int64x2(vreinterpretq_s64_u64(vmvnq_u64(vceqq_s64(a.val, b.val)))); }
+#else
+static inline v_uint64x2 v_eq (const v_uint64x2& a, const v_uint64x2& b)
+{
+    uint32x4_t cmp = vceqq_u32(vreinterpretq_u32_u64(a.val), vreinterpretq_u32_u64(b.val));
+    uint32x4_t swapped = vrev64q_u32(cmp);
+    return v_uint64x2(vreinterpretq_u64_u32(vandq_u32(cmp, swapped)));
+}
+static inline v_uint64x2 v_ne (const v_uint64x2& a, const v_uint64x2& b)
+{
+    uint32x4_t cmp = vceqq_u32(vreinterpretq_u32_u64(a.val), vreinterpretq_u32_u64(b.val));
+    uint32x4_t swapped = vrev64q_u32(cmp);
+    uint64x2_t v_eq = vreinterpretq_u64_u32(vandq_u32(cmp, swapped));
+    uint64x2_t vx = vreinterpretq_u64_u32(vdupq_n_u32(0xFFFFFFFF));
+    return v_uint64x2(veorq_u64(v_eq, vx));
+}
+static inline v_int64x2 v_eq (const v_int64x2& a, const v_int64x2& b)
+{
+    return v_reinterpret_as_s64(v_eq(v_reinterpret_as_u64(a), v_reinterpret_as_u64(b)));
+}
+static inline v_int64x2 v_ne (const v_int64x2& a, const v_int64x2& b)
+{
+    return v_reinterpret_as_s64(v_ne(v_reinterpret_as_u64(a), v_reinterpret_as_u64(b)));
+}
+#endif
 #if CV_SIMD128_64F
-OPENCV_HAL_IMPL_NEON_INT_CMP_OP(v_uint64x2, OPENCV_HAL_NOP, u64, u64)
-OPENCV_HAL_IMPL_NEON_INT_CMP_OP(v_int64x2, vreinterpretq_s64_u64, s64, u64)
 OPENCV_HAL_IMPL_NEON_INT_CMP_OP(v_float64x2, vreinterpretq_f64_u64, f64, u64)
 #endif
 
@@ -1186,9 +1230,9 @@ inline v_float64x2 v_muladd(const v_float64x2& a, const v_float64x2& b, const v_
 
 // trade efficiency for convenience
 #define OPENCV_HAL_IMPL_NEON_SHIFT_OP(_Tpvec, suffix, _Tps, ssuffix) \
-inline _Tpvec operator << (const _Tpvec& a, int n) \
+inline _Tpvec v_shl (const _Tpvec& a, int n) \
 { return _Tpvec(vshlq_##suffix(a.val, vdupq_n_##ssuffix((_Tps)n))); } \
-inline _Tpvec operator >> (const _Tpvec& a, int n) \
+inline _Tpvec v_shr (const _Tpvec& a, int n) \
 { return _Tpvec(vshlq_##suffix(a.val, vdupq_n_##ssuffix((_Tps)-n))); } \
 template<int n> inline _Tpvec v_shl(const _Tpvec& a) \
 { return _Tpvec(vshlq_n_##suffix(a.val, n)); } \
@@ -1210,13 +1254,13 @@ OPENCV_HAL_IMPL_NEON_SHIFT_OP(v_int64x2, s64, int64, s64)
 template<int n> inline _Tpvec v_rotate_right(const _Tpvec& a) \
 { return _Tpvec(vextq_##suffix(a.val, vdupq_n_##suffix(0), n)); } \
 template<int n> inline _Tpvec v_rotate_left(const _Tpvec& a) \
-{ return _Tpvec(vextq_##suffix(vdupq_n_##suffix(0), a.val, _Tpvec::nlanes - n)); } \
+{ return _Tpvec(vextq_##suffix(vdupq_n_##suffix(0), a.val, VTraits<_Tpvec>::nlanes - n)); } \
 template<> inline _Tpvec v_rotate_left<0>(const _Tpvec& a) \
 { return a; } \
 template<int n> inline _Tpvec v_rotate_right(const _Tpvec& a, const _Tpvec& b) \
 { return _Tpvec(vextq_##suffix(a.val, b.val, n)); } \
 template<int n> inline _Tpvec v_rotate_left(const _Tpvec& a, const _Tpvec& b) \
-{ return _Tpvec(vextq_##suffix(b.val, a.val, _Tpvec::nlanes - n)); } \
+{ return _Tpvec(vextq_##suffix(b.val, a.val, VTraits<_Tpvec>::nlanes - n)); } \
 template<> inline _Tpvec v_rotate_left<0>(const _Tpvec& a, const _Tpvec& b) \
 { CV_UNUSED(b); return a; }
 
@@ -1600,7 +1644,7 @@ inline int v_signmask(const v_uint64x2& a)
 #if CV_NEON_AARCH64
     const int64x2_t signPosition = {0,1};
     uint64x2_t v0 = vshlq_u64(vshrq_n_u64(a.val, 63), signPosition);
-    uint64_t t0 = vaddvq_u64(v0);
+    int t0 = (int)vaddvq_u64(v0);
     return t0;
 #else // #if CV_NEON_AARCH64
     int64x1_t m0 = vdup_n_s64(0);
@@ -1778,7 +1822,7 @@ inline v_int32x4 v_load_expand_q(const schar* ptr)
     return v_int32x4(vmovl_s16(v1));
 }
 
-#if defined(__aarch64__) || defined(_M_ARM64)
+#if defined(__aarch64__) || defined(_M_ARM64) || defined(_M_ARM64EC)
 #define OPENCV_HAL_IMPL_NEON_UNPACKS(_Tpvec, suffix) \
 inline void v_zip(const v_##_Tpvec& a0, const v_##_Tpvec& a1, v_##_Tpvec& b0, v_##_Tpvec& b1) \
 { \
@@ -1948,11 +1992,9 @@ inline v_int32x4 v_round(const v_float32x4& a)
 #else
 inline v_int32x4 v_round(const v_float32x4& a)
 {
-    static const int32x4_t v_sign = vdupq_n_s32(1 << 31),
-        v_05 = vreinterpretq_s32_f32(vdupq_n_f32(0.5f));
-
-    int32x4_t v_addition = vorrq_s32(v_05, vandq_s32(v_sign, vreinterpretq_s32_f32(a.val)));
-    return v_int32x4(vcvtq_s32_f32(vaddq_f32(a.val, vreinterpretq_f32_s32(v_addition))));
+    // See https://github.com/opencv/opencv/pull/24271#issuecomment-1867318007
+    float32x4_t delta = vdupq_n_f32(12582912.0f);
+    return v_int32x4(vcvtq_s32_f32(vsubq_f32(vaddq_f32(a.val, delta), delta)));
 }
 #endif
 inline v_int32x4 v_floor(const v_float32x4& a)
@@ -1976,12 +2018,12 @@ inline v_int32x4 v_trunc(const v_float32x4& a)
 inline v_int32x4 v_round(const v_float64x2& a)
 {
     static const int32x2_t zero = vdup_n_s32(0);
-    return v_int32x4(vcombine_s32(vmovn_s64(vcvtaq_s64_f64(a.val)), zero));
+    return v_int32x4(vcombine_s32(vmovn_s64(vcvtnq_s64_f64(a.val)), zero));
 }
 
 inline v_int32x4 v_round(const v_float64x2& a, const v_float64x2& b)
 {
-    return v_int32x4(vcombine_s32(vmovn_s64(vcvtaq_s64_f64(a.val)), vmovn_s64(vcvtaq_s64_f64(b.val))));
+    return v_int32x4(vcombine_s32(vmovn_s64(vcvtnq_s64_f64(a.val)), vmovn_s64(vcvtnq_s64_f64(b.val))));
 }
 
 inline v_int32x4 v_floor(const v_float64x2& a)
@@ -2565,7 +2607,7 @@ inline void v_lut_deinterleave(const double* tab, const v_int32x4& idxvec, v_flo
 
 ////// FP16 support ///////
 #if CV_FP16
-inline v_float32x4 v_load_expand(const float16_t* ptr)
+inline v_float32x4 v_load_expand(const hfloat* ptr)
 {
     float16x4_t v =
     #ifndef vld1_f16 // APPLE compiler defines vld1_f16 as macro
@@ -2576,7 +2618,7 @@ inline v_float32x4 v_load_expand(const float16_t* ptr)
     return v_float32x4(vcvt_f32_f16(v));
 }
 
-inline void v_pack_store(float16_t* ptr, const v_float32x4& v)
+inline void v_pack_store(hfloat* ptr, const v_float32x4& v)
 {
     float16x4_t hv = vcvt_f16_f32(v.val);
 
@@ -2587,7 +2629,7 @@ inline void v_pack_store(float16_t* ptr, const v_float32x4& v)
     #endif
 }
 #else
-inline v_float32x4 v_load_expand(const float16_t* ptr)
+inline v_float32x4 v_load_expand(const hfloat* ptr)
 {
     const int N = 4;
     float buf[N];
@@ -2595,17 +2637,39 @@ inline v_float32x4 v_load_expand(const float16_t* ptr)
     return v_load(buf);
 }
 
-inline void v_pack_store(float16_t* ptr, const v_float32x4& v)
+inline void v_pack_store(hfloat* ptr, const v_float32x4& v)
 {
     const int N = 4;
     float buf[N];
     v_store(buf, v);
-    for( int i = 0; i < N; i++ ) ptr[i] = float16_t(buf[i]);
+    for( int i = 0; i < N; i++ ) ptr[i] = hfloat(buf[i]);
 }
 #endif
 
 inline void v_cleanup() {}
 
+#include "intrin_math.hpp"
+#if defined(CV_SIMD_FP16) && CV_SIMD_FP16
+inline v_float16x8 v_exp(const v_float16x8& x) { return v_exp_default_16f<v_float16x8, v_int16x8>(x); }
+inline v_float16x8 v_log(const v_float16x8& x) { return v_log_default_16f<v_float16x8, v_int16x8>(x); }
+inline void v_sincos(const v_float16x8& x, v_float16x8& s, v_float16x8& c) { v_sincos_default_16f<v_float16x8, v_int16x8>(x, s, c); }
+inline v_float16x8 v_sin(const v_float16x8& x) { return v_sin_default_16f<v_float16x8, v_int16x8>(x); }
+inline v_float16x8 v_cos(const v_float16x8& x) { return v_cos_default_16f<v_float16x8, v_int16x8>(x); }
+#endif
+inline v_float32x4 v_exp(const v_float32x4& x) { return v_exp_default_32f<v_float32x4, v_int32x4>(x); }
+inline v_float32x4 v_log(const v_float32x4& x) { return v_log_default_32f<v_float32x4, v_int32x4>(x); }
+inline void v_sincos(const v_float32x4& x, v_float32x4& s, v_float32x4& c) { v_sincos_default_32f<v_float32x4, v_int32x4>(x, s, c); }
+inline v_float32x4 v_sin(const v_float32x4& x) { return v_sin_default_32f<v_float32x4, v_int32x4>(x); }
+inline v_float32x4 v_cos(const v_float32x4& x) { return v_cos_default_32f<v_float32x4, v_int32x4>(x); }
+inline v_float32x4 v_erf(const v_float32x4& x) { return v_erf_default_32f<v_float32x4, v_int32x4>(x); }
+#if CV_SIMD128_64F
+inline v_float64x2 v_exp(const v_float64x2& x) { return v_exp_default_64f<v_float64x2, v_int64x2>(x); }
+inline v_float64x2 v_log(const v_float64x2& x) { return v_log_default_64f<v_float64x2, v_int64x2>(x); }
+inline void v_sincos(const v_float64x2& x, v_float64x2& s, v_float64x2& c) { v_sincos_default_64f<v_float64x2, v_int64x2>(x, s, c); }
+inline v_float64x2 v_sin(const v_float64x2& x) { return v_sin_default_64f<v_float64x2, v_int64x2>(x); }
+inline v_float64x2 v_cos(const v_float64x2& x) { return v_cos_default_64f<v_float64x2, v_int64x2>(x); }
+#endif
+
 CV_CPU_OPTIMIZATION_HAL_NAMESPACE_END
 
 //! @endcond
diff --git a/3rdParty/opencv-4.12.0/opencv2/core/hal/intrin_rvv071.hpp b/3rdParty/opencv-4.12.0/opencv2/core/hal/intrin_rvv071.hpp
new file mode 100644
index 0000000000..bcd2662082
--- /dev/null
+++ b/3rdParty/opencv-4.12.0/opencv2/core/hal/intrin_rvv071.hpp
@@ -0,0 +1,2888 @@
+// This file is part of OpenCV project.
+// It is subject to the license terms in the LICENSE file found in the top-level directory
+// of this distribution and at http://opencv.org/license.html
+
+// Copyright (C) 2015, PingTouGe Semiconductor Co., Ltd., all rights reserved.
+
+#ifndef OPENCV_HAL_INTRIN_RISCVV_HPP
+#define OPENCV_HAL_INTRIN_RISCVV_HPP
+
+#include <float.h>
+#include <algorithm>
+#include "opencv2/core/utility.hpp"
+
+namespace cv
+{
+
+//! @cond IGNORED
+
+CV_CPU_OPTIMIZATION_HAL_NAMESPACE_BEGIN
+
+#define CV_SIMD128 1
+#define CV_SIMD128_64F 1
+//////////// Types ////////////
+struct v_uint8x16
+{
+    typedef uchar lane_type;
+    enum { nlanes = 16 };
+
+    v_uint8x16() {}
+    explicit v_uint8x16(vuint8m1_t v) : val(v) {}
+    v_uint8x16(uchar v0, uchar v1, uchar v2, uchar v3, uchar v4, uchar v5, uchar v6, uchar v7,
+               uchar v8, uchar v9, uchar v10, uchar v11, uchar v12, uchar v13, uchar v14, uchar v15)
+    {
+        uchar v[] = {v0, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15};
+        val = (vuint8m1_t)vle8_v_u8m1((unsigned char*)v, 16);
+    }
+    uchar get0() const
+    {
+        return vmv_x_s_u8m1_u8(val);
+    }
+
+    vuint8m1_t val;
+};
+
+struct v_int8x16
+{
+    typedef schar lane_type;
+    enum { nlanes = 16 };
+
+    v_int8x16() {}
+    explicit v_int8x16(vint8m1_t v) : val(v) {}
+    v_int8x16(schar v0, schar v1, schar v2, schar v3, schar v4, schar v5, schar v6, schar v7,
+               schar v8, schar v9, schar v10, schar v11, schar v12, schar v13, schar v14, schar v15)
+    {
+        schar v[] = {v0, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15};
+        val = (vint8m1_t)vle8_v_i8m1((schar*)v, 16);
+    }
+    schar get0() const
+    {
+        return vmv_x_s_i8m1_i8(val);
+    }
+
+    vint8m1_t val;
+};
+
+struct v_uint16x8
+{
+    typedef ushort lane_type;
+    enum { nlanes = 8 };
+
+    v_uint16x8() {}
+    explicit v_uint16x8(vuint16m1_t v) : val(v) {}
+    v_uint16x8(ushort v0, ushort v1, ushort v2, ushort v3, ushort v4, ushort v5, ushort v6, ushort v7)
+    {
+        ushort v[] = {v0, v1, v2, v3, v4, v5, v6, v7};
+        val = (vuint16m1_t)vle16_v_u16m1((unsigned short*)v, 8);
+    }
+    ushort get0() const
+    {
+        return vmv_x_s_u16m1_u16(val);
+    }
+
+    vuint16m1_t val;
+};
+
+struct v_int16x8
+{
+    typedef short lane_type;
+    enum { nlanes = 8 };
+
+    v_int16x8() {}
+    explicit v_int16x8(vint16m1_t v) : val(v) {}
+    v_int16x8(short v0, short v1, short v2, short v3, short v4, short v5, short v6, short v7)
+    {
+        short v[] = {v0, v1, v2, v3, v4, v5, v6, v7};
+        val = (vint16m1_t)vle16_v_i16m1((signed short*)v, 8);
+    }
+    short get0() const
+    {
+        return vmv_x_s_i16m1_i16(val);
+    }
+
+    vint16m1_t val;
+};
+
+struct v_uint32x4
+{
+    typedef unsigned lane_type;
+    enum { nlanes = 4 };
+
+    v_uint32x4() {}
+    explicit v_uint32x4(vuint32m1_t v) : val(v) {}
+    v_uint32x4(unsigned v0, unsigned v1, unsigned v2, unsigned v3)
+    {
+        unsigned v[] = {v0, v1, v2, v3};
+        val = (vuint32m1_t)vle32_v_u32m1((unsigned int*)v, 4);
+    }
+    unsigned get0() const
+    {
+        return vmv_x_s_u32m1_u32(val);
+    }
+
+    vuint32m1_t val;
+};
+
+struct v_int32x4
+{
+    typedef int lane_type;
+    enum { nlanes = 4 };
+
+    v_int32x4() {}
+    explicit v_int32x4(vint32m1_t v) : val(v) {}
+    v_int32x4(int v0, int v1, int v2, int v3)
+    {
+        int v[] = {v0, v1, v2, v3};
+        val = (vint32m1_t)vle32_v_i32m1((signed int*)v, 4);
+    }
+    int get0() const
+    {
+        return vmv_x_s_i32m1_i32(val);
+    }
+    vint32m1_t val;
+};
+
+struct v_float32x4
+{
+    typedef float lane_type;
+    enum { nlanes = 4 };
+
+    v_float32x4() {}
+    explicit v_float32x4(vfloat32m1_t v) : val(v) {}
+    v_float32x4(float v0, float v1, float v2, float v3)
+    {
+        float v[] = {v0, v1, v2, v3};
+        val = (vfloat32m1_t)vle32_v_f32m1((float*)v, 4);
+    }
+    float get0() const
+    {
+        return vfmv_f_s_f32m1_f32(val);
+    }
+    vfloat32m1_t val;
+};
+
+struct v_uint64x2
+{
+    typedef uint64 lane_type;
+    enum { nlanes = 2 };
+
+    v_uint64x2() {}
+    explicit v_uint64x2(vuint64m1_t v) : val(v) {}
+    v_uint64x2(uint64 v0, uint64 v1)
+    {
+        uint64 v[] = {v0, v1};
+        val = (vuint64m1_t)vle64_v_u64m1((unsigned long*)v, 2);
+    }
+    uint64 get0() const
+    {
+        return vmv_x_s_u64m1_u64(val);
+    }
+    vuint64m1_t val;
+};
+
+struct v_int64x2
+{
+    typedef int64 lane_type;
+    enum { nlanes = 2 };
+
+    v_int64x2() {}
+    explicit v_int64x2(vint64m1_t v) : val(v) {}
+    v_int64x2(int64 v0, int64 v1)
+    {
+        int64 v[] = {v0, v1};
+        val = (vint64m1_t)vle64_v_i64m1((long*)v, 2);
+    }
+    int64 get0() const
+    {
+        return vmv_x_s_i64m1_i64(val);
+    }
+    vint64m1_t val;
+};
+
+struct v_float64x2
+{
+    typedef double lane_type;
+    enum { nlanes = 2 };
+
+    v_float64x2() {}
+    explicit v_float64x2(vfloat64m1_t v) : val(v) {}
+    v_float64x2(double v0, double v1)
+    {
+        double v[] = {v0, v1};
+        val = (vfloat64m1_t)vle64_v_f64m1((double*)v, 2);
+    }
+    double get0() const
+    {
+        return vfmv_f_s_f64m1_f64(val);
+    }
+    vfloat64m1_t val;
+};
+/*
+#define OPENCV_HAL_IMPL_RISCVV_INIT(_Tpv, _Tp, suffix) \
+inline _Tp##m1_t vreinterpret_v_##suffix##m1_##suffix##m1(_Tp##m1_t v) { return v; } \
+inline v_uint8x16 v_reinterpret_as_u8(const v_##_Tpv& v) { return v_uint8x16((vuint8m1_t)(v.val)); } \
+inline v_int8x16 v_reinterpret_as_s8(const v_##_Tpv& v) { return v_int8x16((vint8m1_t)(v.val)); } \
+inline v_uint16x8 v_reinterpret_as_u16(const v_##_Tpv& v) { return v_uint16x8((vuint16m1_t)(v.val)); } \
+inline v_int16x8 v_reinterpret_as_s16(const v_##_Tpv& v) { return v_int16x8(vreinterpret_v_i8m1_i16m1(v.val)); } \
+inline v_uint32x4 v_reinterpret_as_u32(const v_##_Tpv& v) { return v_uint32x4((vuint32m1_t)(v.val)); } \
+inline v_int32x4 v_reinterpret_as_s32(const v_##_Tpv& v) { return v_int32x4((vint32m1_t)(v.val)); } \
+inline v_uint64x2 v_reinterpret_as_u64(const v_##_Tpv& v) { return v_uint64x2((vuint64m1_t)(v.val)); } \
+inline v_int64x2 v_reinterpret_as_s64(const v_##_Tpv& v) { return v_int64x2((vint64m1_t)(v.val)); } \
+inline v_float32x4 v_reinterpret_as_f32(const v_##_Tpv& v) { return v_float32x4((vfloat32m1_t)(v.val)); }\
+inline v_float64x2 v_reinterpret_as_f64(const v_##_Tpv& v) { return v_float64x2((vfloat64m1_t)(v.val)); }
+
+
+OPENCV_HAL_IMPL_RISCVV_INIT(uint8x16, vuint8, u8)
+OPENCV_HAL_IMPL_RISCVV_INIT(int8x16, vint8, i8)
+OPENCV_HAL_IMPL_RISCVV_INIT(uint16x8, vuint16, u16)
+OPENCV_HAL_IMPL_RISCVV_INIT(int16x8, vint16, i16)
+OPENCV_HAL_IMPL_RISCVV_INIT(uint32x4, vuint32, u32)
+OPENCV_HAL_IMPL_RISCVV_INIT(int32x4, vint32, i32)
+OPENCV_HAL_IMPL_RISCVV_INIT(uint64x2, vuint64, u64)
+OPENCV_HAL_IMPL_RISCVV_INIT(int64x2, vint64, i64)
+OPENCV_HAL_IMPL_RISCVV_INIT(float64x2, vfloat64, f64)
+OPENCV_HAL_IMPL_RISCVV_INIT(float32x4, vfloat32, f32)
+*/
+inline v_uint8x16 v_reinterpret_as_u8(const v_uint8x16& v) { return v_uint8x16(v.val); }
+inline v_int8x16 v_reinterpret_as_s8(const v_uint8x16& v) { return v_int8x16(vreinterpret_v_u8m1_i8m1(v.val)); }
+inline v_uint16x8 v_reinterpret_as_u16(const v_uint8x16& v) { return v_uint16x8(vreinterpret_v_u8m1_u16m1(v.val)); }
+inline v_int16x8 v_reinterpret_as_s16(const v_uint8x16& v) { return v_int16x8(vreinterpret_v_u16m1_i16m1(vreinterpret_v_u8m1_u16m1(v.val))); }
+inline v_uint32x4 v_reinterpret_as_u32(const v_uint8x16& v) { return v_uint32x4(vreinterpret_v_u8m1_u32m1(v.val)); }
+inline v_int32x4 v_reinterpret_as_s32(const v_uint8x16& v) { return v_int32x4(vreinterpret_v_u32m1_i32m1(vreinterpret_v_u8m1_u32m1(v.val))); }
+inline v_uint64x2 v_reinterpret_as_u64(const v_uint8x16& v) { return v_uint64x2(vreinterpret_v_u8m1_u64m1(v.val)); }
+inline v_int64x2 v_reinterpret_as_s64(const v_uint8x16& v) { return v_int64x2(vreinterpret_v_u64m1_i64m1(vreinterpret_v_u8m1_u64m1(v.val))); }
+inline v_float32x4 v_reinterpret_as_f32(const v_uint8x16& v) { return v_float32x4(vreinterpret_v_u32m1_f32m1(vreinterpret_v_u8m1_u32m1(v.val))); }
+inline v_float64x2 v_reinterpret_as_f64(const v_uint8x16& v) { return v_float64x2(vreinterpret_v_u64m1_f64m1(vreinterpret_v_u8m1_u64m1(v.val))); }
+
+inline v_uint8x16 v_reinterpret_as_u8(const v_int8x16& v) { return v_uint8x16(vreinterpret_v_i8m1_u8m1(v.val)); }
+inline v_int8x16 v_reinterpret_as_s8(const v_int8x16& v) { return v_int8x16(v.val); }
+inline v_uint16x8 v_reinterpret_as_u16(const v_int8x16& v) { return v_uint16x8(vreinterpret_v_u8m1_u16m1(vreinterpret_v_i8m1_u8m1(v.val))); }
+inline v_int16x8 v_reinterpret_as_s16(const v_int8x16& v) { return v_int16x8(vreinterpret_v_i8m1_i16m1(v.val)); }
+inline v_uint32x4 v_reinterpret_as_u32(const v_int8x16& v) { return v_uint32x4(vreinterpret_v_u8m1_u32m1(vreinterpret_v_i8m1_u8m1(v.val))); }
+inline v_int32x4 v_reinterpret_as_s32(const v_int8x16& v) { return v_int32x4(vreinterpret_v_i8m1_i32m1(v.val)); }
+inline v_uint64x2 v_reinterpret_as_u64(const v_int8x16& v) { return v_uint64x2(vreinterpret_v_u8m1_u64m1(vreinterpret_v_i8m1_u8m1(v.val))); }
+inline v_int64x2 v_reinterpret_as_s64(const v_int8x16& v) { return v_int64x2(vreinterpret_v_i8m1_i64m1(v.val)); }
+inline v_float32x4 v_reinterpret_as_f32(const v_int8x16& v) { return v_float32x4(vreinterpret_v_i32m1_f32m1(vreinterpret_v_i8m1_i32m1(v.val))); }
+inline v_float64x2 v_reinterpret_as_f64(const v_int8x16& v) { return v_float64x2(vreinterpret_v_i64m1_f64m1(vreinterpret_v_i8m1_i64m1(v.val))); }
+
+inline v_uint8x16 v_reinterpret_as_u8(const v_uint16x8& v) { return v_uint8x16(vreinterpret_v_u16m1_u8m1(v.val)); }
+inline v_int8x16 v_reinterpret_as_s8(const v_uint16x8& v) { return v_int8x16(vreinterpret_v_i16m1_i8m1(vreinterpret_v_u16m1_i16m1(v.val))); }
+inline v_uint16x8 v_reinterpret_as_u16(const v_uint16x8& v) { return v_uint16x8(v.val); }
+inline v_int16x8 v_reinterpret_as_s16(const v_uint16x8& v) { return v_int16x8(vreinterpret_v_u16m1_i16m1(v.val)); }
+inline v_uint32x4 v_reinterpret_as_u32(const v_uint16x8& v) { return v_uint32x4(vreinterpret_v_u16m1_u32m1(v.val)); }
+inline v_int32x4 v_reinterpret_as_s32(const v_uint16x8& v) { return v_int32x4(vreinterpret_v_u32m1_i32m1(vreinterpret_v_u16m1_u32m1(v.val))); }
+inline v_uint64x2 v_reinterpret_as_u64(const v_uint16x8& v) { return v_uint64x2(vreinterpret_v_u16m1_u64m1(v.val)); }
+inline v_int64x2 v_reinterpret_as_s64(const v_uint16x8& v) { return v_int64x2(vreinterpret_v_u64m1_i64m1(vreinterpret_v_u16m1_u64m1(v.val))); }
+inline v_float32x4 v_reinterpret_as_f32(const v_uint16x8& v) { return v_float32x4(vreinterpret_v_u32m1_f32m1(vreinterpret_v_u16m1_u32m1(v.val))); }
+inline v_float64x2 v_reinterpret_as_f64(const v_uint16x8& v) { return v_float64x2(vreinterpret_v_u64m1_f64m1(vreinterpret_v_u16m1_u64m1(v.val))); }
+
+inline v_uint8x16 v_reinterpret_as_u8(const v_int16x8& v) { return v_uint8x16(vreinterpret_v_i8m1_u8m1(vreinterpret_v_i16m1_i8m1(v.val))); }
+inline v_int8x16 v_reinterpret_as_s8(const v_int16x8& v) { return v_int8x16(vreinterpret_v_i16m1_i8m1(v.val)); }
+inline v_uint16x8 v_reinterpret_as_u16(const v_int16x8& v) { return v_uint16x8(vreinterpret_v_i16m1_u16m1(v.val)); }
+inline v_int16x8 v_reinterpret_as_s16(const v_int16x8& v) { return v_int16x8(v.val); }
+inline v_uint32x4 v_reinterpret_as_u32(const v_int16x8& v) { return v_uint32x4(vreinterpret_v_u16m1_u32m1(vreinterpret_v_i16m1_u16m1(v.val))); }
+inline v_int32x4 v_reinterpret_as_s32(const v_int16x8& v) { return v_int32x4(vreinterpret_v_i16m1_i32m1(v.val)); }
+inline v_uint64x2 v_reinterpret_as_u64(const v_int16x8& v) { return v_uint64x2(vreinterpret_v_u16m1_u64m1(vreinterpret_v_i16m1_u16m1(v.val))); }
+inline v_int64x2 v_reinterpret_as_s64(const v_int16x8& v) { return v_int64x2(vreinterpret_v_i16m1_i64m1(v.val)); }
+inline v_float32x4 v_reinterpret_as_f32(const v_int16x8& v) { return v_float32x4(vreinterpret_v_i32m1_f32m1(vreinterpret_v_i16m1_i32m1(v.val))); }
+inline v_float64x2 v_reinterpret_as_f64(const v_int16x8& v) { return v_float64x2(vreinterpret_v_i64m1_f64m1(vreinterpret_v_i16m1_i64m1(v.val))); }
+
+inline v_uint8x16 v_reinterpret_as_u8(const v_uint32x4& v) { return v_uint8x16(vreinterpret_v_u32m1_u8m1(v.val)); }
+inline v_int8x16 v_reinterpret_as_s8(const v_uint32x4& v) { return v_int8x16(vreinterpret_v_i32m1_i8m1(vreinterpret_v_u32m1_i32m1(v.val))); }
+inline v_uint16x8 v_reinterpret_as_u16(const v_uint32x4& v) { return v_uint16x8(vreinterpret_v_u32m1_u16m1(v.val)); }
+inline v_int16x8 v_reinterpret_as_s16(const v_uint32x4& v) { return v_int16x8(vreinterpret_v_i32m1_i16m1(vreinterpret_v_u32m1_i32m1(v.val))); }
+inline v_uint32x4 v_reinterpret_as_u32(const v_uint32x4& v) { return v_uint32x4(v.val); }
+inline v_int32x4 v_reinterpret_as_s32(const v_uint32x4& v) { return v_int32x4(vreinterpret_v_u32m1_i32m1(v.val)); }
+inline v_uint64x2 v_reinterpret_as_u64(const v_uint32x4& v) { return v_uint64x2(vreinterpret_v_u32m1_u64m1(v.val)); }
+inline v_int64x2 v_reinterpret_as_s64(const v_uint32x4& v) { return v_int64x2(vreinterpret_v_u64m1_i64m1(vreinterpret_v_u32m1_u64m1(v.val))); }
+inline v_float32x4 v_reinterpret_as_f32(const v_uint32x4& v) { return v_float32x4(vreinterpret_v_u32m1_f32m1(v.val)); }
+inline v_float64x2 v_reinterpret_as_f64(const v_uint32x4& v) { return v_float64x2(vreinterpret_v_u64m1_f64m1(vreinterpret_v_u32m1_u64m1(v.val))); }
+
+inline v_uint8x16 v_reinterpret_as_u8(const v_int32x4& v) { return v_uint8x16(vreinterpret_v_i8m1_u8m1(vreinterpret_v_i32m1_i8m1(v.val))); }
+inline v_int8x16 v_reinterpret_as_s8(const v_int32x4& v) { return v_int8x16(vreinterpret_v_i32m1_i8m1(v.val)); }
+inline v_uint16x8 v_reinterpret_as_u16(const v_int32x4& v) { return v_uint16x8(vreinterpret_v_u32m1_u16m1(vreinterpret_v_i32m1_u32m1(v.val))); }
+inline v_int16x8 v_reinterpret_as_s16(const v_int32x4& v) { return v_int16x8(vreinterpret_v_i32m1_i16m1(v.val)); }
+inline v_uint32x4 v_reinterpret_as_u32(const v_int32x4& v) { return v_uint32x4(vreinterpret_v_i32m1_u32m1(v.val)); }
+inline v_int32x4 v_reinterpret_as_s32(const v_int32x4& v) { return v_int32x4(v.val); }
+inline v_uint64x2 v_reinterpret_as_u64(const v_int32x4& v) { return v_uint64x2(vreinterpret_v_u32m1_u64m1(vreinterpret_v_i32m1_u32m1(v.val))); }
+inline v_int64x2 v_reinterpret_as_s64(const v_int32x4& v) { return v_int64x2(vreinterpret_v_i32m1_i64m1(v.val)); }
+inline v_float32x4 v_reinterpret_as_f32(const v_int32x4& v) { return v_float32x4(vreinterpret_v_i32m1_f32m1(v.val)); }
+inline v_float64x2 v_reinterpret_as_f64(const v_int32x4& v) { return v_float64x2(vreinterpret_v_i64m1_f64m1(vreinterpret_v_i32m1_i64m1(v.val))); }
+
+inline v_uint8x16 v_reinterpret_as_u8(const v_uint64x2& v) { return v_uint8x16(vreinterpret_v_u64m1_u8m1(v.val)); }
+inline v_int8x16 v_reinterpret_as_s8(const v_uint64x2& v) { return v_int8x16(vreinterpret_v_i64m1_i8m1(vreinterpret_v_u64m1_i64m1(v.val))); }
+inline v_uint16x8 v_reinterpret_as_u16(const v_uint64x2& v) { return v_uint16x8(vreinterpret_v_u64m1_u16m1(v.val)); }
+inline v_int16x8 v_reinterpret_as_s16(const v_uint64x2& v) { return v_int16x8(vreinterpret_v_i64m1_i16m1(vreinterpret_v_u64m1_i64m1(v.val))); }
+inline v_uint32x4 v_reinterpret_as_u32(const v_uint64x2& v) { return v_uint32x4(vreinterpret_v_u64m1_u32m1(v.val)); }
+inline v_int32x4 v_reinterpret_as_s32(const v_uint64x2& v) { return v_int32x4(vreinterpret_v_i64m1_i32m1(vreinterpret_v_u64m1_i64m1(v.val))); }
+inline v_uint64x2 v_reinterpret_as_u64(const v_uint64x2& v) { return v_uint64x2(v.val); }
+inline v_int64x2 v_reinterpret_as_s64(const v_uint64x2& v) { return v_int64x2(vreinterpret_v_u64m1_i64m1(v.val)); }
+inline v_float32x4 v_reinterpret_as_f32(const v_uint64x2& v) { return v_float32x4(vreinterpret_v_u32m1_f32m1(vreinterpret_v_u64m1_u32m1(v.val))); }
+inline v_float64x2 v_reinterpret_as_f64(const v_uint64x2& v) { return v_float64x2(vreinterpret_v_u64m1_f64m1(v.val)); }
+
+inline v_uint8x16 v_reinterpret_as_u8(const v_int64x2& v) { return v_uint8x16(vreinterpret_v_i8m1_u8m1(vreinterpret_v_i64m1_i8m1(v.val))); }
+inline v_int8x16 v_reinterpret_as_s8(const v_int64x2& v) { return v_int8x16(vreinterpret_v_i64m1_i8m1(v.val)); }
+inline v_uint16x8 v_reinterpret_as_u16(const v_int64x2& v) { return v_uint16x8(vreinterpret_v_u64m1_u16m1(vreinterpret_v_i64m1_u64m1(v.val))); }
+inline v_int16x8 v_reinterpret_as_s16(const v_int64x2& v) { return v_int16x8(vreinterpret_v_i64m1_i16m1(v.val)); }
+inline v_uint32x4 v_reinterpret_as_u32(const v_int64x2& v) { return v_uint32x4(vreinterpret_v_u64m1_u32m1(vreinterpret_v_i64m1_u64m1(v.val))); }
+inline v_int32x4 v_reinterpret_as_s32(const v_int64x2& v) { return v_int32x4(vreinterpret_v_i64m1_i32m1(v.val)); }
+inline v_uint64x2 v_reinterpret_as_u64(const v_int64x2& v) { return v_uint64x2(vreinterpret_v_i64m1_u64m1(v.val)); }
+inline v_int64x2 v_reinterpret_as_s64(const v_int64x2& v) { return v_int64x2(v.val); }
+inline v_float32x4 v_reinterpret_as_f32(const v_int64x2& v) { return v_float32x4(vreinterpret_v_i32m1_f32m1(vreinterpret_v_i64m1_i32m1(v.val))); }
+inline v_float64x2 v_reinterpret_as_f64(const v_int64x2& v) { return v_float64x2(vreinterpret_v_i64m1_f64m1(v.val)); }
+
+inline v_uint8x16 v_reinterpret_as_u8(const v_float32x4& v) { return v_uint8x16(vreinterpret_v_u32m1_u8m1(vreinterpret_v_f32m1_u32m1(v.val))); }
+inline v_int8x16 v_reinterpret_as_s8(const v_float32x4& v) { return v_int8x16(vreinterpret_v_i32m1_i8m1(vreinterpret_v_f32m1_i32m1(v.val))); }
+inline v_uint16x8 v_reinterpret_as_u16(const v_float32x4& v) { return v_uint16x8(vreinterpret_v_u32m1_u16m1(vreinterpret_v_f32m1_u32m1(v.val))); }
+inline v_int16x8 v_reinterpret_as_s16(const v_float32x4& v) { return v_int16x8(vreinterpret_v_i32m1_i16m1(vreinterpret_v_f32m1_i32m1(v.val))); }
+inline v_uint32x4 v_reinterpret_as_u32(const v_float32x4& v) { return v_uint32x4(vreinterpret_v_f32m1_u32m1(v.val)); }
+inline v_int32x4 v_reinterpret_as_s32(const v_float32x4& v) { return v_int32x4(vreinterpret_v_f32m1_i32m1(v.val)); }
+inline v_uint64x2 v_reinterpret_as_u64(const v_float32x4& v) { return v_uint64x2(vreinterpret_v_u32m1_u64m1(vreinterpret_v_f32m1_u32m1(v.val))); }
+inline v_int64x2 v_reinterpret_as_s64(const v_float32x4& v) { return v_int64x2(vreinterpret_v_i32m1_i64m1(vreinterpret_v_f32m1_i32m1(v.val))); }
+inline v_float32x4 v_reinterpret_as_f32(const v_float32x4& v) { return v_float32x4(v.val); }
+inline v_float64x2 v_reinterpret_as_f64(const v_float32x4& v) { return v_float64x2(vreinterpret_v_i64m1_f64m1(vreinterpret_v_i32m1_i64m1(vreinterpret_v_f32m1_i32m1(v.val)))); }
+
+inline v_uint8x16 v_reinterpret_as_u8(const v_float64x2& v) { return v_uint8x16(vreinterpret_v_u64m1_u8m1(vreinterpret_v_f64m1_u64m1(v.val))); }
+inline v_int8x16 v_reinterpret_as_s8(const v_float64x2& v) { return v_int8x16(vreinterpret_v_i64m1_i8m1(vreinterpret_v_f64m1_i64m1(v.val))); }
+inline v_uint16x8 v_reinterpret_as_u16(const v_float64x2& v) { return v_uint16x8(vreinterpret_v_u64m1_u16m1(vreinterpret_v_f64m1_u64m1(v.val))); }
+inline v_int16x8 v_reinterpret_as_s16(const v_float64x2& v) { return v_int16x8(vreinterpret_v_i64m1_i16m1(vreinterpret_v_f64m1_i64m1(v.val))); }
+inline v_uint32x4 v_reinterpret_as_u32(const v_float64x2& v) { return v_uint32x4(vreinterpret_v_u64m1_u32m1(vreinterpret_v_f64m1_u64m1(v.val))); }
+inline v_int32x4 v_reinterpret_as_s32(const v_float64x2& v) { return v_int32x4(vreinterpret_v_i64m1_i32m1(vreinterpret_v_f64m1_i64m1(v.val))); }
+inline v_uint64x2 v_reinterpret_as_u64(const v_float64x2& v) { return v_uint64x2(vreinterpret_v_f64m1_u64m1(v.val)); }
+inline v_int64x2 v_reinterpret_as_s64(const v_float64x2& v) { return v_int64x2(vreinterpret_v_f64m1_i64m1(v.val)); }
+inline v_float32x4 v_reinterpret_as_f32(const v_float64x2& v) { return v_float32x4(vreinterpret_v_i32m1_f32m1(vreinterpret_v_i64m1_i32m1(vreinterpret_v_f64m1_i64m1(v.val)))); }
+inline v_float64x2 v_reinterpret_as_f64(const v_float64x2& v) { return v_float64x2(v.val); }
+
+#define OPENCV_HAL_IMPL_RISCVV_INIT_SET(__Tp, _Tp, suffix, len, num) \
+inline v_##_Tp##x##num v_setzero_##suffix() { return v_##_Tp##x##num(vmv_v_x_##len##m1(0, num)); }     \
+inline v_##_Tp##x##num v_setall_##suffix(__Tp v) { return v_##_Tp##x##num(vmv_v_x_##len##m1(v, num)); } \
+template <> inline v_##_Tp##x##num v_setzero_() { return v_setzero_##suffix(); }          \
+template <> inline v_##_Tp##x##num v_setall_(__Tp v) { return v_setall_##suffix(v); }
+
+OPENCV_HAL_IMPL_RISCVV_INIT_SET(uchar, uint8, u8, u8, 16)
+OPENCV_HAL_IMPL_RISCVV_INIT_SET(schar, int8, s8, i8, 16)
+OPENCV_HAL_IMPL_RISCVV_INIT_SET(ushort, uint16, u16, u16, 8)
+OPENCV_HAL_IMPL_RISCVV_INIT_SET(short, int16, s16, i16, 8)
+OPENCV_HAL_IMPL_RISCVV_INIT_SET(unsigned int, uint32, u32, u32, 4)
+OPENCV_HAL_IMPL_RISCVV_INIT_SET(int, int32, s32, i32, 4)
+OPENCV_HAL_IMPL_RISCVV_INIT_SET(unsigned long, uint64, u64, u64, 2)
+OPENCV_HAL_IMPL_RISCVV_INIT_SET(long, int64, s64, i64, 2)
+inline v_float32x4 v_setzero_f32() { return v_float32x4(vfmv_v_f_f32m1(0, 4)); }
+inline v_float32x4 v_setall_f32(float v) { return v_float32x4(vfmv_v_f_f32m1(v, 4)); }
+
+inline v_float64x2 v_setzero_f64() { return v_float64x2(vfmv_v_f_f64m1(0, 2)); }
+inline v_float64x2 v_setall_f64(double v) { return v_float64x2(vfmv_v_f_f64m1(v, 2)); }
+
+template <> inline v_float32x4 v_setzero_() { return v_setzero_f32(); }
+template <> inline v_float32x4 v_setall_(float v) { return v_setall_f32(v); }
+
+template <> inline v_float64x2 v_setzero_() { return v_setzero_f64(); }
+template <> inline v_float64x2 v_setall_(double v) { return v_setall_f64(v); }
+
+#define OPENCV_HAL_IMPL_RISCVV_BIN_OP(bin_op, _Tpvec, intrin) \
+inline _Tpvec bin_op(const _Tpvec& a, const _Tpvec& b) \
+{ \
+    return _Tpvec(intrin(a.val, b.val)); \
+}
+
+#define OPENCV_HAL_IMPL_RISCVV_BIN_OPN(bin_op, _Tpvec, intrin, num) \
+inline _Tpvec bin_op(const _Tpvec& a, const _Tpvec& b) \
+{ \
+    return _Tpvec(intrin(a.val, b.val, num)); \
+}
+
+OPENCV_HAL_IMPL_RISCVV_BIN_OPN(v_add, v_uint8x16, vsaddu_vv_u8m1, 16)
+OPENCV_HAL_IMPL_RISCVV_BIN_OPN(v_sub, v_uint8x16, vssubu_vv_u8m1, 16)
+OPENCV_HAL_IMPL_RISCVV_BIN_OPN(v_add, v_int8x16, vsadd_vv_i8m1, 16)
+OPENCV_HAL_IMPL_RISCVV_BIN_OPN(v_sub, v_int8x16, vssub_vv_i8m1, 16)
+OPENCV_HAL_IMPL_RISCVV_BIN_OPN(v_add, v_uint16x8, vsaddu_vv_u16m1, 8)
+OPENCV_HAL_IMPL_RISCVV_BIN_OPN(v_sub, v_uint16x8, vssubu_vv_u16m1, 8)
+OPENCV_HAL_IMPL_RISCVV_BIN_OPN(v_add, v_int16x8, vsadd_vv_i16m1, 8)
+OPENCV_HAL_IMPL_RISCVV_BIN_OPN(v_sub, v_int16x8, vssub_vv_i16m1, 8)
+OPENCV_HAL_IMPL_RISCVV_BIN_OPN(v_add, v_int32x4, vadd_vv_i32m1, 4)
+OPENCV_HAL_IMPL_RISCVV_BIN_OPN(v_sub, v_int32x4, vsub_vv_i32m1, 4)
+OPENCV_HAL_IMPL_RISCVV_BIN_OPN(v_mul, v_int32x4, vmul_vv_i32m1, 4)
+OPENCV_HAL_IMPL_RISCVV_BIN_OPN(v_add, v_uint32x4, vadd_vv_u32m1, 4)
+OPENCV_HAL_IMPL_RISCVV_BIN_OPN(v_sub, v_uint32x4, vsub_vv_u32m1, 4)
+OPENCV_HAL_IMPL_RISCVV_BIN_OPN(v_mul, v_uint32x4, vmul_vv_u32m1, 4)
+OPENCV_HAL_IMPL_RISCVV_BIN_OPN(v_add, v_int64x2, vadd_vv_i64m1, 2)
+OPENCV_HAL_IMPL_RISCVV_BIN_OPN(v_sub, v_int64x2, vsub_vv_i64m1, 2)
+OPENCV_HAL_IMPL_RISCVV_BIN_OPN(v_add, v_uint64x2, vadd_vv_u64m1, 2)
+OPENCV_HAL_IMPL_RISCVV_BIN_OPN(v_sub, v_uint64x2, vsub_vv_u64m1, 2)
+OPENCV_HAL_IMPL_RISCVV_BIN_OPN(v_add, v_float32x4, vfadd_vv_f32m1, 4)
+OPENCV_HAL_IMPL_RISCVV_BIN_OPN(v_sub, v_float32x4, vfsub_vv_f32m1, 4)
+OPENCV_HAL_IMPL_RISCVV_BIN_OPN(v_mul, v_float32x4, vfmul_vv_f32m1, 4)
+inline v_float32x4 v_div(const v_float32x4& a, const v_float32x4& b)
+{
+    return v_float32x4(vfdiv_vv_f32m1(a.val, b.val, 4));
+}
+
+OPENCV_HAL_IMPL_RISCVV_BIN_OPN(v_add, v_float64x2, vfadd_vv_f64m1, 2)
+OPENCV_HAL_IMPL_RISCVV_BIN_OPN(v_sub, v_float64x2, vfsub_vv_f64m1, 2)
+OPENCV_HAL_IMPL_RISCVV_BIN_OPN(v_mul, v_float64x2, vfmul_vv_f64m1, 2)
+inline v_float64x2 v_div(const v_float64x2& a, const v_float64x2& b)
+{
+    return v_float64x2(vfdiv_vv_f64m1(a.val, b.val, 2));
+}
+// TODO: exp, log, sin, cos
+
+#define OPENCV_HAL_IMPL_RISCVV_BIN_FUNC(_Tpvec, func, intrin) \
+inline _Tpvec func(const _Tpvec& a, const _Tpvec& b) \
+{ \
+    return _Tpvec(intrin(a.val, b.val)); \
+}
+
+#define OPENCV_HAL_IMPL_RISCVV_BINN_FUNC(_Tpvec, func, intrin, num) \
+inline _Tpvec func(const _Tpvec& a, const _Tpvec& b) \
+{ \
+    return _Tpvec(intrin(a.val, b.val, num)); \
+}
+OPENCV_HAL_IMPL_RISCVV_BINN_FUNC(v_uint8x16, v_min, vminu_vv_u8m1, 16)
+OPENCV_HAL_IMPL_RISCVV_BINN_FUNC(v_uint8x16, v_max, vmaxu_vv_u8m1, 16)
+OPENCV_HAL_IMPL_RISCVV_BINN_FUNC(v_int8x16, v_min, vmin_vv_i8m1, 16)
+OPENCV_HAL_IMPL_RISCVV_BINN_FUNC(v_int8x16, v_max, vmax_vv_i8m1, 16)
+OPENCV_HAL_IMPL_RISCVV_BINN_FUNC(v_uint16x8, v_min, vminu_vv_u16m1, 8)
+OPENCV_HAL_IMPL_RISCVV_BINN_FUNC(v_uint16x8, v_max, vmaxu_vv_u16m1, 8)
+OPENCV_HAL_IMPL_RISCVV_BINN_FUNC(v_int16x8, v_min, vmin_vv_i16m1, 8)
+OPENCV_HAL_IMPL_RISCVV_BINN_FUNC(v_int16x8, v_max, vmax_vv_i16m1, 8)
+OPENCV_HAL_IMPL_RISCVV_BINN_FUNC(v_uint32x4, v_min, vminu_vv_u32m1, 4)
+OPENCV_HAL_IMPL_RISCVV_BINN_FUNC(v_uint32x4, v_max, vmaxu_vv_u32m1, 4)
+OPENCV_HAL_IMPL_RISCVV_BINN_FUNC(v_int32x4, v_min, vmin_vv_i32m1, 4)
+OPENCV_HAL_IMPL_RISCVV_BINN_FUNC(v_int32x4, v_max, vmax_vv_i32m1, 4)
+OPENCV_HAL_IMPL_RISCVV_BINN_FUNC(v_float32x4, v_min, vfmin_vv_f32m1, 4)
+OPENCV_HAL_IMPL_RISCVV_BINN_FUNC(v_float32x4, v_max, vfmax_vv_f32m1, 4)
+OPENCV_HAL_IMPL_RISCVV_BINN_FUNC(v_float64x2, v_min, vfmin_vv_f64m1, 2)
+OPENCV_HAL_IMPL_RISCVV_BINN_FUNC(v_float64x2, v_max, vfmax_vv_f64m1, 2)
+
+inline v_float32x4 v_sqrt(const v_float32x4& x)
+{
+    return v_float32x4(vfsqrt_v_f32m1(x.val, 4));
+}
+
+inline v_float32x4 v_invsqrt(const v_float32x4& x)
+{
+    return v_float32x4(vfrdiv_vf_f32m1(vfsqrt_v_f32m1(x.val, 4), 1, 4));
+}
+
+inline v_float32x4 v_magnitude(const v_float32x4& a, const v_float32x4& b)
+{
+    v_float32x4 x(vfmacc_vv_f32m1(vfmul_vv_f32m1(a.val, a.val, 4), b.val, b.val, 4));
+    return v_sqrt(x);
+}
+
+inline v_float32x4 v_sqr_magnitude(const v_float32x4& a, const v_float32x4& b)
+{
+    return v_float32x4(vfmacc_vv_f32m1(vfmul_vv_f32m1(a.val, a.val, 4), b.val, b.val, 4));
+}
+
+inline v_float32x4 v_fma(const v_float32x4& a, const v_float32x4& b, const v_float32x4& c)
+{
+    return v_float32x4(vfmadd_vv_f32m1(a.val, b.val, c.val, 4));
+}
+
+inline v_int32x4 v_fma(const v_int32x4& a, const v_int32x4& b, const v_int32x4& c)
+{
+    return v_int32x4(vmadd_vv_i32m1(a.val, b.val, c.val, 4));
+}
+
+inline v_float32x4 v_muladd(const v_float32x4& a, const v_float32x4& b, const v_float32x4& c)
+{
+    return v_fma(a, b, c);
+}
+
+inline v_int32x4 v_muladd(const v_int32x4& a, const v_int32x4& b, const v_int32x4& c)
+{
+    return v_fma(a, b, c);
+}
+
+inline v_float32x4 v_matmul(const v_float32x4& v, const v_float32x4& m0,
+                            const v_float32x4& m1, const v_float32x4& m2,
+                            const v_float32x4& m3)
+{
+    vfloat32m1_t res = vfmul_vv_f32m1(m0.val, vrgather_vx_f32m1(v.val, 0, 4), 4);//vmuli_f32(m0.val, v.val, 0);
+    res = vfmacc_vv_f32m1(res, vrgather_vx_f32m1(v.val, 1, 4), m1.val, 4);//vmulai_f32(res, m1.val, v.val, 1);
+    res = vfmacc_vv_f32m1(res, vrgather_vx_f32m1(v.val, 2, 4), m2.val, 4);//vmulai_f32(res, m1.val, v.val, 1);
+    res = vfmacc_vv_f32m1(res, vrgather_vx_f32m1(v.val, 3, 4), m3.val, 4);//vmulai_f32(res, m1.val, v.val, 1);
+    return v_float32x4(res);
+}
+
+inline v_float32x4 v_matmuladd(const v_float32x4& v, const v_float32x4& m0,
+                               const v_float32x4& m1, const v_float32x4& m2,
+                               const v_float32x4& a)
+{
+    vfloat32m1_t res = vfmul_vv_f32m1(m0.val, vrgather_vx_f32m1(v.val, 0, 4), 4);//vmuli_f32(m0.val, v.val, 0);
+    res = vfmacc_vv_f32m1(res, vrgather_vx_f32m1(v.val, 1, 4), m1.val, 4);//vmulai_f32(res, m1.val, v.val, 1);
+    res = vfmacc_vv_f32m1(res, vrgather_vx_f32m1(v.val, 2, 4), m2.val, 4);//vmulai_f32(res, m1.val, v.val, 1);
+    res = vfadd_vv_f32m1(res, a.val, 4);//vmulai_f32(res, m1.val, v.val, 1);
+    return v_float32x4(res);
+}
+
+inline v_float64x2 v_sqrt(const v_float64x2& x)
+{
+    return v_float64x2(vfsqrt_v_f64m1(x.val, 2));
+}
+
+inline v_float64x2 v_invsqrt(const v_float64x2& x)
+{
+    return v_float64x2(vfrdiv_vf_f64m1(vfsqrt_v_f64m1(x.val, 2), 1, 2));
+}
+
+inline v_float64x2 v_magnitude(const v_float64x2& a, const v_float64x2& b)
+{
+    v_float64x2 x(vfmacc_vv_f64m1(vfmul_vv_f64m1(a.val, a.val, 2), b.val, b.val, 2));
+    return v_sqrt(x);
+}
+
+inline v_float64x2 v_sqr_magnitude(const v_float64x2& a, const v_float64x2& b)
+{
+    return v_float64x2(vfmacc_vv_f64m1(vfmul_vv_f64m1(a.val, a.val, 2), b.val, b.val, 2));
+}
+
+inline v_float64x2 v_fma(const v_float64x2& a, const v_float64x2& b, const v_float64x2& c)
+{
+    return v_float64x2(vfmadd_vv_f64m1(a.val, b.val, c.val, 2));
+}
+
+inline v_float64x2 v_muladd(const v_float64x2& a, const v_float64x2& b, const v_float64x2& c)
+{
+    return v_fma(a, b, c);
+}
+
+#define OPENCV_HAL_IMPL_RISCVV_LOGIC_OPN(_Tpvec, suffix, num) \
+    OPENCV_HAL_IMPL_RISCVV_BIN_OPN(v_and, _Tpvec, vand_vv_##suffix, num) \
+    OPENCV_HAL_IMPL_RISCVV_BIN_OPN(v_or, _Tpvec, vor_vv_##suffix, num)   \
+    OPENCV_HAL_IMPL_RISCVV_BIN_OPN(v_xor, _Tpvec, vxor_vv_##suffix, num) \
+    inline _Tpvec v_not(const _Tpvec & a) \
+    { \
+        return _Tpvec(vnot_v_##suffix(a.val, num)); \
+    }
+
+OPENCV_HAL_IMPL_RISCVV_LOGIC_OPN(v_uint8x16, u8m1, 16)
+OPENCV_HAL_IMPL_RISCVV_LOGIC_OPN(v_uint16x8, u16m1, 8)
+OPENCV_HAL_IMPL_RISCVV_LOGIC_OPN(v_uint32x4, u32m1, 4)
+OPENCV_HAL_IMPL_RISCVV_LOGIC_OPN(v_uint64x2, u64m1, 2)
+OPENCV_HAL_IMPL_RISCVV_LOGIC_OPN(v_int8x16,  i8m1, 16)
+OPENCV_HAL_IMPL_RISCVV_LOGIC_OPN(v_int16x8,  i16m1, 8)
+OPENCV_HAL_IMPL_RISCVV_LOGIC_OPN(v_int32x4,  i32m1, 4)
+OPENCV_HAL_IMPL_RISCVV_LOGIC_OPN(v_int64x2,  i64m1, 2)
+
+#define OPENCV_HAL_IMPL_RISCVV_FLT_BIT_OP(bin_op, intrin) \
+inline v_float32x4 bin_op(const v_float32x4& a, const v_float32x4& b) \
+{ \
+    return v_float32x4(vreinterpret_v_i32m1_f32m1(intrin(vreinterpret_v_f32m1_i32m1(a.val), vreinterpret_v_f32m1_i32m1(b.val), 4))); \
+}
+
+OPENCV_HAL_IMPL_RISCVV_FLT_BIT_OP(v_and, vand_vv_i32m1)
+OPENCV_HAL_IMPL_RISCVV_FLT_BIT_OP(v_or, vor_vv_i32m1)
+OPENCV_HAL_IMPL_RISCVV_FLT_BIT_OP(v_xor, vxor_vv_i32m1)
+
+inline v_float32x4 v_not(const v_float32x4& a)
+{
+    return v_float32x4(vreinterpret_v_i32m1_f32m1(vnot_v_i32m1(vreinterpret_v_f32m1_i32m1(a.val), 4)));
+}
+
+#define OPENCV_HAL_IMPL_RISCVV_FLT_64BIT_OP(bin_op, intrin) \
+inline v_float64x2 bin_op(const v_float64x2& a, const v_float64x2& b) \
+{ \
+    return v_float64x2(vreinterpret_v_i64m1_f64m1(intrin(vreinterpret_v_f64m1_i64m1(a.val), vreinterpret_v_f64m1_i64m1(b.val), 2))); \
+}
+
+OPENCV_HAL_IMPL_RISCVV_FLT_64BIT_OP(v_and, vand_vv_i64m1)
+OPENCV_HAL_IMPL_RISCVV_FLT_64BIT_OP(v_or, vor_vv_i64m1)
+OPENCV_HAL_IMPL_RISCVV_FLT_64BIT_OP(v_xor, vxor_vv_i64m1)
+
+inline v_float64x2 v_not(const v_float64x2& a)
+{
+    return v_float64x2(vreinterpret_v_i64m1_f64m1(vnot_v_i64m1(vreinterpret_v_f64m1_i64m1(a.val), 2)));
+}
+inline v_int16x8 v_mul_hi(const v_int16x8& a, const v_int16x8& b)
+{
+    return v_int16x8(vmulh_vv_i16m1(a.val, b.val, 8));
+}
+inline v_uint16x8 v_mul_hi(const v_uint16x8& a, const v_uint16x8& b)
+{
+    return v_uint16x8(vmulhu_vv_u16m1(a.val, b.val, 8));
+}
+
+//#define OPENCV_HAL_IMPL_RISCVV_ABS(_Tpuvec, _Tpsvec, usuffix, ssuffix) \
+//inline _Tpuvec v_abs(const _Tpsvec& a) {    \
+//    E##xm1_t mask=vmflt_vf_e32xm1_f32m1(x.val, 0.0, 4);
+
+//OPENCV_HAL_IMPL_RISCVV_ABS(v_uint8x16, v_int8x16, u8, s8)
+//OPENCV_HAL_IMPL_RISCVV_ABS(v_uint16x8, v_int16x8, u16, s16)
+//OPENCV_HAL_IMPL_RISCVV_ABS(v_uint32x4, v_int32x4, u32, s32)
+
+inline v_uint32x4 v_abs(v_int32x4 x)
+{
+    vbool32_t mask=vmslt_vx_i32m1_b32(x.val, 0, 4);
+    return v_uint32x4(vreinterpret_v_i32m1_u32m1(vrsub_vx_i32m1_m(mask, x.val, x.val, 0, 4)));
+}
+
+inline v_uint16x8 v_abs(v_int16x8 x)
+{
+    vbool16_t mask=vmslt_vx_i16m1_b16(x.val, 0, 8);
+    return v_uint16x8(vreinterpret_v_i16m1_u16m1(vrsub_vx_i16m1_m(mask, x.val, x.val, 0, 8)));
+}
+
+inline v_uint8x16 v_abs(v_int8x16 x)
+{
+    vbool8_t mask=vmslt_vx_i8m1_b8(x.val, 0, 16);
+    return v_uint8x16(vreinterpret_v_i8m1_u8m1(vrsub_vx_i8m1_m(mask, x.val, x.val, 0, 16)));
+}
+
+inline v_float32x4 v_abs(v_float32x4 x)
+{
+    return (v_float32x4)vfsgnjx_vv_f32m1(x.val, x.val, 4);
+}
+
+inline v_float64x2 v_abs(v_float64x2 x)
+{
+    return (v_float64x2)vfsgnjx_vv_f64m1(x.val, x.val, 2);
+}
+
+inline v_float32x4 v_absdiff(const v_float32x4& a, const v_float32x4& b)
+{
+    vfloat32m1_t ret = vfsub_vv_f32m1(a.val, b.val, 4);
+    return (v_float32x4)vfsgnjx_vv_f32m1(ret, ret, 4);
+}
+
+inline v_float64x2 v_absdiff(const v_float64x2& a, const v_float64x2& b)
+{
+    vfloat64m1_t ret = vfsub_vv_f64m1(a.val, b.val, 2);
+    return (v_float64x2)vfsgnjx_vv_f64m1(ret, ret, 2);
+}
+
+#define OPENCV_HAL_IMPL_RISCVV_ABSDIFF_U(bit, num) \
+inline v_uint##bit##x##num v_absdiff(v_uint##bit##x##num a, v_uint##bit##x##num b){    \
+    vuint##bit##m1_t vmax = vmaxu_vv_u##bit##m1(a.val, b.val, num);    \
+    vuint##bit##m1_t vmin = vminu_vv_u##bit##m1(a.val, b.val, num);    \
+    return v_uint##bit##x##num(vsub_vv_u##bit##m1(vmax, vmin, num));\
+}
+
+OPENCV_HAL_IMPL_RISCVV_ABSDIFF_U(8, 16)
+OPENCV_HAL_IMPL_RISCVV_ABSDIFF_U(16, 8)
+OPENCV_HAL_IMPL_RISCVV_ABSDIFF_U(32, 4)
+
+/** Saturating absolute difference **/
+inline v_int8x16 v_absdiffs(v_int8x16 a, v_int8x16 b){
+    vint8m1_t vmax = vmax_vv_i8m1(a.val, b.val, 16);
+    vint8m1_t vmin = vmin_vv_i8m1(a.val, b.val, 16);
+    return v_int8x16(vssub_vv_i8m1(vmax, vmin, 16));
+}
+inline v_int16x8 v_absdiffs(v_int16x8 a, v_int16x8 b){
+    vint16m1_t vmax = vmax_vv_i16m1(a.val, b.val, 8);
+    vint16m1_t vmin = vmin_vv_i16m1(a.val, b.val, 8);
+    return v_int16x8(vssub_vv_i16m1(vmax, vmin, 8));
+}
+
+#define OPENCV_HAL_IMPL_RISCVV_ABSDIFF(_Tpvec, _Tpv, num) \
+inline v_uint##_Tpvec v_absdiff(v_int##_Tpvec a, v_int##_Tpvec b){    \
+     vint##_Tpv##_t max = vmax_vv_i##_Tpv(a.val, b.val, num);\
+     vint##_Tpv##_t min = vmin_vv_i##_Tpv(a.val, b.val, num);\
+    return v_uint##_Tpvec(vreinterpret_v_i##_Tpv##_u##_Tpv(vsub_vv_i##_Tpv(max, min, num)));    \
+}
+
+OPENCV_HAL_IMPL_RISCVV_ABSDIFF(8x16, 8m1, 16)
+OPENCV_HAL_IMPL_RISCVV_ABSDIFF(16x8, 16m1, 8)
+OPENCV_HAL_IMPL_RISCVV_ABSDIFF(32x4, 32m1, 4)
+
+//  Multiply and expand
+inline void v_mul_expand(const v_int8x16& a, const v_int8x16& b,
+                         v_int16x8& c, v_int16x8& d)
+{
+    vint16m2_t res = vundefined_i16m2();
+    res = vwmul_vv_i16m2(a.val, b.val, 16);
+    c.val = vget_v_i16m2_i16m1(res, 0);
+    d.val = vget_v_i16m2_i16m1(res, 1);
+}
+
+inline void v_mul_expand(const v_uint8x16& a, const v_uint8x16& b,
+                         v_uint16x8& c, v_uint16x8& d)
+{
+    vuint16m2_t res = vundefined_u16m2();
+    res = vwmulu_vv_u16m2(a.val, b.val, 16);
+    c.val = vget_v_u16m2_u16m1(res, 0);
+    d.val = vget_v_u16m2_u16m1(res, 1);
+}
+
+inline void v_mul_expand(const v_int16x8& a, const v_int16x8& b,
+                         v_int32x4& c, v_int32x4& d)
+{
+    vint32m2_t res = vundefined_i32m2();
+    res = vwmul_vv_i32m2(a.val, b.val, 8);
+    c.val = vget_v_i32m2_i32m1(res, 0);
+    d.val = vget_v_i32m2_i32m1(res, 1);
+}
+
+inline void v_mul_expand(const v_uint16x8& a, const v_uint16x8& b,
+                         v_uint32x4& c, v_uint32x4& d)
+{
+    vuint32m2_t res = vundefined_u32m2();
+    res = vwmulu_vv_u32m2(a.val, b.val, 8);
+    c.val = vget_v_u32m2_u32m1(res, 0);
+    d.val = vget_v_u32m2_u32m1(res, 1);
+}
+
+inline void v_mul_expand(const v_int32x4& a, const v_int32x4& b,
+                         v_int64x2& c, v_int64x2& d)
+{
+    vint64m2_t res = vundefined_i64m2();
+    res = vwmul_vv_i64m2(a.val, b.val, 4);
+    c.val = vget_v_i64m2_i64m1(res, 0);
+    d.val = vget_v_i64m2_i64m1(res, 1);
+}
+
+inline void v_mul_expand(const v_uint32x4& a, const v_uint32x4& b,
+                         v_uint64x2& c, v_uint64x2& d)
+{
+    vuint64m2_t res = vundefined_u64m2();
+    res = vwmulu_vv_u64m2(a.val, b.val, 4);
+    c.val = vget_v_u64m2_u64m1(res, 0);
+    d.val = vget_v_u64m2_u64m1(res, 1);
+}
+
+OPENCV_HAL_IMPL_RISCVV_BINN_FUNC(v_uint8x16, v_add_wrap, vadd_vv_u8m1, 16)
+OPENCV_HAL_IMPL_RISCVV_BINN_FUNC(v_int8x16, v_add_wrap, vadd_vv_i8m1, 16)
+OPENCV_HAL_IMPL_RISCVV_BINN_FUNC(v_uint16x8, v_add_wrap, vadd_vv_u16m1, 8)
+OPENCV_HAL_IMPL_RISCVV_BINN_FUNC(v_int16x8, v_add_wrap, vadd_vv_i16m1, 8)
+OPENCV_HAL_IMPL_RISCVV_BINN_FUNC(v_uint8x16, v_sub_wrap, vsub_vv_u8m1, 16)
+OPENCV_HAL_IMPL_RISCVV_BINN_FUNC(v_int8x16, v_sub_wrap, vsub_vv_i8m1, 16)
+OPENCV_HAL_IMPL_RISCVV_BINN_FUNC(v_uint16x8, v_sub_wrap, vsub_vv_u16m1, 8)
+OPENCV_HAL_IMPL_RISCVV_BINN_FUNC(v_int16x8, v_sub_wrap, vsub_vv_i16m1, 8)
+OPENCV_HAL_IMPL_RISCVV_BINN_FUNC(v_uint8x16, v_mul_wrap, vmul_vv_u8m1, 16)
+OPENCV_HAL_IMPL_RISCVV_BINN_FUNC(v_int8x16, v_mul_wrap, vmul_vv_i8m1, 16)
+OPENCV_HAL_IMPL_RISCVV_BINN_FUNC(v_uint16x8, v_mul_wrap, vmul_vv_u16m1, 8)
+OPENCV_HAL_IMPL_RISCVV_BINN_FUNC(v_int16x8, v_mul_wrap, vmul_vv_i16m1, 8)
+//////// Dot Product ////////
+// 16 >> 32
+inline v_int32x4 v_dotprod(const v_int16x8& a, const v_int16x8& b)
+{
+    vuint32m2_t vindex = vundefined_u32m2();
+    vuint32m1_t vindex0 = vid_v_u32m1(4);
+    vindex0 = vsll_vx_u32m1(vindex0, 1, 4);
+    vindex = vset_v_u32m1_u32m2(vindex, 0, vindex0);
+    vindex = vset_v_u32m1_u32m2(vindex, 1, vadd_vx_u32m1(vindex0, 1, 4));
+    vint32m2_t res = vundefined_i32m2();
+    res = vwmul_vv_i32m2(a.val, b.val, 8);
+    res = vrgather_vv_i32m2(res, vindex, 8);
+    return v_int32x4(vadd_vv_i32m1(vget_v_i32m2_i32m1(res, 0), vget_v_i32m2_i32m1(res, 1), 4));
+}
+inline v_int32x4 v_dotprod(const v_int16x8& a, const v_int16x8& b, const v_int32x4& c)
+{
+    vuint32m2_t vindex = vundefined_u32m2();
+    vuint32m1_t vindex0 = vid_v_u32m1(4);
+    vindex0 = vsll_vx_u32m1(vindex0, 1, 4);
+    vindex = vset_v_u32m1_u32m2(vindex, 0, vindex0);
+    vindex = vset_v_u32m1_u32m2(vindex, 1, vadd_vx_u32m1(vindex0, 1, 4));
+    vint32m2_t res = vundefined_i32m2();
+    res = vwmul_vv_i32m2(a.val, b.val, 8);
+    res = vrgather_vv_i32m2(res, vindex, 8);
+    return v_int32x4(vadd_vv_i32m1(vadd_vv_i32m1(vget_v_i32m2_i32m1(res, 0),vget_v_i32m2_i32m1(res, 1), 4), c.val, 4));
+}
+
+// 32 >> 64
+inline v_int64x2 v_dotprod(const v_int32x4& a, const v_int32x4& b)
+{
+    vuint64m2_t vindex = vundefined_u64m2();
+    vuint64m1_t vindex0 = vid_v_u64m1(2);
+    vindex0 = vsll_vx_u64m1(vindex0, 1, 2);
+    vindex = vset_v_u64m1_u64m2(vindex, 0, vindex0);
+    vindex = vset_v_u64m1_u64m2(vindex, 1, vadd_vx_u64m1(vindex0, 1, 2));
+    vint64m2_t res = vundefined_i64m2();
+    res = vwmul_vv_i64m2(a.val, b.val, 4);
+    res = vrgather_vv_i64m2(res, vindex, 4);
+    return v_int64x2(vadd_vv_i64m1(vget_v_i64m2_i64m1(res, 0), vget_v_i64m2_i64m1(res, 1), 2));
+}
+inline v_int64x2 v_dotprod(const v_int32x4& a, const v_int32x4& b, const v_int64x2& c)
+{
+    vuint64m2_t vindex = vundefined_u64m2();
+    vuint64m1_t vindex0 = vid_v_u64m1(2);
+    vindex0 = vsll_vx_u64m1(vindex0, 1, 2);
+    vindex = vset_v_u64m1_u64m2(vindex, 0, vindex0);
+    vindex = vset_v_u64m1_u64m2(vindex, 1, vadd_vx_u64m1(vindex0, 1, 2));
+    vint64m2_t res = vundefined_i64m2();
+    res = vwmul_vv_i64m2(a.val, b.val, 4);
+    res = vrgather_vv_i64m2(res, vindex, 4);
+    return v_int64x2(vadd_vv_i64m1(vadd_vv_i64m1(vget_v_i64m2_i64m1(res, 0), vget_v_i64m2_i64m1(res, 1), 2), c.val, 2));
+}
+
+// 8 >> 32
+inline v_uint32x4 v_dotprod_expand(const v_uint8x16& a, const v_uint8x16& b)
+{
+    vuint32m4_t vindex32 = vundefined_u32m4();
+    vuint32m1_t vindex0 = vid_v_u32m1(4);
+    vindex0 = vsll_vx_u32m1(vindex0, 2, 4);
+    vindex32 = vset_v_u32m1_u32m4(vindex32, 0, vindex0);
+    vindex32 = vset_v_u32m1_u32m4(vindex32, 1, vadd_vx_u32m1(vindex0, 1, 4));
+    vindex32 = vset_v_u32m1_u32m4(vindex32, 2, vadd_vx_u32m1(vindex0, 2, 4));
+    vindex32 = vset_v_u32m1_u32m4(vindex32, 3, vadd_vx_u32m1(vindex0, 3, 4));
+    vuint16m2_t vindex = vnsrl_wx_u16m2(vindex32, 0, 16);
+    vuint16m2_t v1 = vundefined_u16m2();
+    vuint32m2_t v2 = vundefined_u32m2();
+    v1 = vwmulu_vv_u16m2(a.val, b.val, 16);
+    v1 = vrgather_vv_u16m2(v1, vindex, 16);
+    v2 = vwaddu_vv_u32m2(vget_v_u16m2_u16m1(v1, 0), vget_v_u16m2_u16m1(v1, 1), 8);
+    return v_uint32x4(vadd_vv_u32m1(vget_v_u32m2_u32m1(v2, 0), vget_v_u32m2_u32m1(v2, 1), 4));
+}
+
+inline v_uint32x4 v_dotprod_expand(const v_uint8x16& a, const v_uint8x16& b,
+                                   const v_uint32x4& c)
+{
+    vuint32m4_t vindex32 = vundefined_u32m4();
+    vuint32m1_t vindex0 = vid_v_u32m1(4);
+    vindex0 = vsll_vx_u32m1(vindex0, 2, 4);
+    vindex32 = vset_v_u32m1_u32m4(vindex32, 0, vindex0);
+    vindex32 = vset_v_u32m1_u32m4(vindex32, 1, vadd_vx_u32m1(vindex0, 1, 4));
+    vindex32 = vset_v_u32m1_u32m4(vindex32, 2, vadd_vx_u32m1(vindex0, 2, 4));
+    vindex32 = vset_v_u32m1_u32m4(vindex32, 3, vadd_vx_u32m1(vindex0, 3, 4));
+    vuint16m2_t vindex = vnsrl_wx_u16m2(vindex32, 0, 16);
+    vuint16m2_t v1 = vundefined_u16m2();
+    vuint32m2_t v2 = vundefined_u32m2();
+    v1 = vwmulu_vv_u16m2(a.val, b.val, 16);
+    v1 = vrgather_vv_u16m2(v1, vindex, 16);
+    v2 = vwaddu_vv_u32m2(vget_v_u16m2_u16m1(v1, 0), vget_v_u16m2_u16m1(v1, 1), 8);
+    return v_uint32x4(vadd_vv_u32m1(vadd_vv_u32m1(vget_v_u32m2_u32m1(v2, 0), vget_v_u32m2_u32m1(v2, 1), 4), c.val, 4));
+}
+
+inline v_int32x4 v_dotprod_expand(const v_int8x16& a, const v_int8x16& b)
+{
+    vuint32m4_t vindex32 = vundefined_u32m4();
+    vuint32m1_t vindex0 = vid_v_u32m1(4);
+    vindex0 = vsll_vx_u32m1(vindex0, 2, 4);
+    vindex32 = vset_v_u32m1_u32m4(vindex32, 0, vindex0);
+    vindex32 = vset_v_u32m1_u32m4(vindex32, 1, vadd_vx_u32m1(vindex0, 1, 4));
+    vindex32 = vset_v_u32m1_u32m4(vindex32, 2, vadd_vx_u32m1(vindex0, 2, 4));
+    vindex32 = vset_v_u32m1_u32m4(vindex32, 3, vadd_vx_u32m1(vindex0, 3, 4));
+    vuint16m2_t vindex = vnsrl_wx_u16m2(vindex32, 0, 16);
+    vint16m2_t v1 = vundefined_i16m2();
+    vint32m2_t v2 = vundefined_i32m2();
+    v1 = vwmul_vv_i16m2(a.val, b.val, 16);
+    v1 = vrgather_vv_i16m2(v1, vindex, 16);
+    v2 = vwadd_vv_i32m2(vget_v_i16m2_i16m1(v1, 0), vget_v_i16m2_i16m1(v1, 1), 8);
+    return v_int32x4(vadd_vv_i32m1(vget_v_i32m2_i32m1(v2, 0), vget_v_i32m2_i32m1(v2, 1), 4));
+}
+
+inline v_int32x4 v_dotprod_expand(const v_int8x16& a, const v_int8x16& b,
+                                   const v_int32x4& c)
+{
+    vuint32m4_t vindex32 = vundefined_u32m4();
+    vuint32m1_t vindex0 = vid_v_u32m1(4);
+    vindex0 = vsll_vx_u32m1(vindex0, 2, 4);
+    vindex32 = vset_v_u32m1_u32m4(vindex32, 0, vindex0);
+    vindex32 = vset_v_u32m1_u32m4(vindex32, 1, vadd_vx_u32m1(vindex0, 1, 4));
+    vindex32 = vset_v_u32m1_u32m4(vindex32, 2, vadd_vx_u32m1(vindex0, 2, 4));
+    vindex32 = vset_v_u32m1_u32m4(vindex32, 3, vadd_vx_u32m1(vindex0, 3, 4));
+    vuint16m2_t vindex = vnsrl_wx_u16m2(vindex32, 0, 16);
+    vint16m2_t v1 = vundefined_i16m2();
+    vint32m2_t v2 = vundefined_i32m2();
+    v1 = vwmul_vv_i16m2(a.val, b.val, 16);
+    v1 = vrgather_vv_i16m2(v1, vindex, 16);
+    v2 = vwadd_vv_i32m2(vget_v_i16m2_i16m1(v1, 0), vget_v_i16m2_i16m1(v1, 1), 8);
+    return v_int32x4(vadd_vv_i32m1(vadd_vv_i32m1(vget_v_i32m2_i32m1(v2, 0), vget_v_i32m2_i32m1(v2, 1), 4), c.val, 4));
+}
+
+inline v_uint64x2 v_dotprod_expand(const v_uint16x8& a, const v_uint16x8& b)
+{
+    vuint64m4_t vindex64 = vundefined_u64m4();
+    vuint64m1_t vindex0 = vid_v_u64m1(2);
+    vindex0 = vsll_vx_u64m1(vindex0, 2, 2);
+    vindex64 = vset_v_u64m1_u64m4(vindex64, 0, vindex0);
+    vindex64 = vset_v_u64m1_u64m4(vindex64, 1, vadd_vx_u64m1(vindex0, 1, 2));
+    vindex64 = vset_v_u64m1_u64m4(vindex64, 2, vadd_vx_u64m1(vindex0, 2, 2));
+    vindex64 = vset_v_u64m1_u64m4(vindex64, 3, vadd_vx_u64m1(vindex0, 3, 2));
+    vuint32m2_t vindex = vnsrl_wx_u32m2(vindex64, 0, 8);
+    vuint32m2_t v1 = vundefined_u32m2();
+    vuint64m2_t v2 = vundefined_u64m2();
+    v1 = vwmulu_vv_u32m2(a.val, b.val, 8);
+    v1 = vrgather_vv_u32m2(v1, vindex, 8);
+    v2 = vwaddu_vv_u64m2(vget_v_u32m2_u32m1(v1, 0), vget_v_u32m2_u32m1(v1, 1), 4);
+    return v_uint64x2(vadd_vv_u64m1(vget_v_u64m2_u64m1(v2, 0), vget_v_u64m2_u64m1(v2, 1), 2));
+}
+
+inline v_uint64x2 v_dotprod_expand(const v_uint16x8& a, const v_uint16x8& b,
+                                   const v_uint64x2& c)
+{
+    vuint64m4_t vindex64 = vundefined_u64m4();
+    vuint64m1_t vindex0 = vid_v_u64m1(2);
+    vindex0 = vsll_vx_u64m1(vindex0, 2, 2);
+    vindex64 = vset_v_u64m1_u64m4(vindex64, 0, vindex0);
+    vindex64 = vset_v_u64m1_u64m4(vindex64, 1, vadd_vx_u64m1(vindex0, 1, 2));
+    vindex64 = vset_v_u64m1_u64m4(vindex64, 2, vadd_vx_u64m1(vindex0, 2, 2));
+    vindex64 = vset_v_u64m1_u64m4(vindex64, 3, vadd_vx_u64m1(vindex0, 3, 2));
+    vuint32m2_t vindex = vnsrl_wx_u32m2(vindex64, 0, 8);
+    vuint32m2_t v1 = vundefined_u32m2();
+    vuint64m2_t v2 = vundefined_u64m2();
+    v1 = vwmulu_vv_u32m2(a.val, b.val, 8);
+    v1 = vrgather_vv_u32m2(v1, vindex, 8);
+    v2 = vwaddu_vv_u64m2(vget_v_u32m2_u32m1(v1, 0), vget_v_u32m2_u32m1(v1, 1), 4);
+    return v_uint64x2(vadd_vv_u64m1(vadd_vv_u64m1(vget_v_u64m2_u64m1(v2, 0), vget_v_u64m2_u64m1(v2, 1), 2), c.val, 2));
+}
+
+inline v_int64x2 v_dotprod_expand(const v_int16x8& a, const v_int16x8& b)
+{
+    vuint64m4_t vindex64 = vundefined_u64m4();
+    vuint64m1_t vindex0 = vid_v_u64m1(2);
+    vindex0 = vsll_vx_u64m1(vindex0, 2, 2);
+    vindex64 = vset_v_u64m1_u64m4(vindex64, 0, vindex0);
+    vindex64 = vset_v_u64m1_u64m4(vindex64, 1, vadd_vx_u64m1(vindex0, 1, 2));
+    vindex64 = vset_v_u64m1_u64m4(vindex64, 2, vadd_vx_u64m1(vindex0, 2, 2));
+    vindex64 = vset_v_u64m1_u64m4(vindex64, 3, vadd_vx_u64m1(vindex0, 3, 2));
+    vuint32m2_t vindex = vnsrl_wx_u32m2(vindex64, 0, 8);
+    vint32m2_t v1 = vundefined_i32m2();
+    vint64m2_t v2 = vundefined_i64m2();
+    v1 = vwmul_vv_i32m2(a.val, b.val, 8);
+    v1 = vrgather_vv_i32m2(v1, vindex, 8);
+    v2 = vwadd_vv_i64m2(vget_v_i32m2_i32m1(v1, 0), vget_v_i32m2_i32m1(v1, 1), 4);
+    return v_int64x2(vadd_vv_i64m1(vget_v_i64m2_i64m1(v2, 0), vget_v_i64m2_i64m1(v2, 1), 2));
+}
+
+inline v_int64x2 v_dotprod_expand(const v_int16x8& a, const v_int16x8& b,
+                                   const v_int64x2& c)
+{
+    vuint64m4_t vindex64 = vundefined_u64m4();
+    vuint64m1_t vindex0 = vid_v_u64m1(2);
+    vindex0 = vsll_vx_u64m1(vindex0, 2, 2);
+    vindex64 = vset_v_u64m1_u64m4(vindex64, 0, vindex0);
+    vindex64 = vset_v_u64m1_u64m4(vindex64, 1, vadd_vx_u64m1(vindex0, 1, 2));
+    vindex64 = vset_v_u64m1_u64m4(vindex64, 2, vadd_vx_u64m1(vindex0, 2, 2));
+    vindex64 = vset_v_u64m1_u64m4(vindex64, 3, vadd_vx_u64m1(vindex0, 3, 2));
+    vuint32m2_t vindex = vnsrl_wx_u32m2(vindex64, 0, 8);
+    vint32m2_t v1 = vundefined_i32m2();
+    vint64m2_t v2 = vundefined_i64m2();
+    v1 = vwmul_vv_i32m2(a.val, b.val, 8);
+    v1 = vrgather_vv_i32m2(v1, vindex, 8);
+    v2 = vwadd_vv_i64m2(vget_v_i32m2_i32m1(v1, 0), vget_v_i32m2_i32m1(v1, 1), 4);
+    return v_int64x2(vadd_vv_i64m1(vadd_vv_i64m1(vget_v_i64m2_i64m1(v2, 0), vget_v_i64m2_i64m1(v2, 1), 2), c.val, 2));
+}
+
+//////// Fast Dot Product ////////
+// 16 >> 32
+inline v_int32x4 v_dotprod_fast(const v_int16x8& a, const v_int16x8& b)
+{
+    vint32m2_t v1 = vundefined_i32m2();
+    v1 = vwmul_vv_i32m2(a.val, b.val, 8);
+    return v_int32x4(vadd_vv_i32m1(vget_v_i32m2_i32m1(v1, 0), vget_v_i32m2_i32m1(v1, 1), 4));
+}
+
+inline v_int32x4 v_dotprod_fast(const v_int16x8& a, const v_int16x8& b, const v_int32x4& c)
+{
+    vint32m2_t v1 = vundefined_i32m2();
+    v1 = vwmul_vv_i32m2(a.val, b.val, 8);
+    return v_int32x4(vadd_vv_i32m1(vadd_vv_i32m1(vget_v_i32m2_i32m1(v1, 0), vget_v_i32m2_i32m1(v1, 1), 4), c.val, 4));
+}
+
+// 32 >> 64
+inline v_int64x2 v_dotprod_fast(const v_int32x4& a, const v_int32x4& b)
+{
+    vint64m2_t v1 = vundefined_i64m2();
+    v1 = vwmul_vv_i64m2(a.val, b.val, 4);
+    return v_int64x2(vadd_vv_i64m1(vget_v_i64m2_i64m1(v1, 0), vget_v_i64m2_i64m1(v1, 1), 2));
+}
+inline v_int64x2 v_dotprod_fast(const v_int32x4& a, const v_int32x4& b, const v_int64x2& c)
+{
+    vint64m2_t v1 = vundefined_i64m2();
+    v1 = vwmul_vv_i64m2(a.val, b.val, 8);
+    return v_int64x2(vadd_vv_i64m1(vadd_vv_i64m1(vget_v_i64m2_i64m1(v1, 0), vget_v_i64m2_i64m1(v1, 1), 4), c.val, 4));
+}
+
+// 8 >> 32
+inline v_uint32x4 v_dotprod_expand_fast(const v_uint8x16& a, const v_uint8x16& b)
+{
+    vuint16m2_t v1 = vundefined_u16m2();
+    vuint32m2_t v2 = vundefined_u32m2();
+    v1 = vwmulu_vv_u16m2(a.val, b.val, 16);
+    v2 = vwaddu_vv_u32m2(vget_v_u16m2_u16m1(v1, 0), vget_v_u16m2_u16m1(v1, 1), 8);
+    return v_uint32x4(vadd_vv_u32m1(vget_v_u32m2_u32m1(v2, 0), vget_v_u32m2_u32m1(v2, 1), 4));
+}
+
+inline v_uint32x4 v_dotprod_expand_fast(const v_uint8x16& a, const v_uint8x16& b, const v_uint32x4& c)
+{
+    vuint16m2_t v1 = vundefined_u16m2();
+    vuint32m2_t v2 = vundefined_u32m2();
+    v1 = vwmulu_vv_u16m2(a.val, b.val, 16);
+    v2 = vwaddu_vv_u32m2(vget_v_u16m2_u16m1(v1, 0), vget_v_u16m2_u16m1(v1, 1), 8);
+    return v_uint32x4(vadd_vv_u32m1(vadd_vv_u32m1(vget_v_u32m2_u32m1(v2, 0), vget_v_u32m2_u32m1(v2, 1), 4), c.val, 4));
+}
+
+inline v_int32x4 v_dotprod_expand_fast(const v_int8x16& a, const v_int8x16& b)
+{
+    vint16m2_t v1 = vundefined_i16m2();
+    vint32m2_t v2 = vundefined_i32m2();
+    v1 = vwmul_vv_i16m2(a.val, b.val, 16);
+    v2 = vwadd_vv_i32m2(vget_v_i16m2_i16m1(v1, 0), vget_v_i16m2_i16m1(v1, 1), 8);
+    return v_int32x4(vadd_vv_i32m1(vget_v_i32m2_i32m1(v2, 0), vget_v_i32m2_i32m1(v2, 1), 4));
+}
+inline v_int32x4 v_dotprod_expand_fast(const v_int8x16& a, const v_int8x16& b, const v_int32x4& c)
+{
+    vint16m2_t v1 = vundefined_i16m2();
+    vint32m2_t v2 = vundefined_i32m2();
+    v1 = vwmul_vv_i16m2(a.val, b.val, 16);
+    v2 = vwadd_vv_i32m2(vget_v_i16m2_i16m1(v1, 0), vget_v_i16m2_i16m1(v1, 1), 8);
+    return v_int32x4(vadd_vv_i32m1(vadd_vv_i32m1(vget_v_i32m2_i32m1(v2, 0), vget_v_i32m2_i32m1(v2, 1), 4), c.val, 4));
+}
+
+// 16 >> 64
+inline v_uint64x2 v_dotprod_expand_fast(const v_uint16x8& a, const v_uint16x8& b)
+{
+    vuint32m2_t v1 = vundefined_u32m2();
+    vuint64m2_t v2 = vundefined_u64m2();
+    v1 = vwmulu_vv_u32m2(a.val, b.val, 8);
+    v2 = vwaddu_vv_u64m2(vget_v_u32m2_u32m1(v1, 0), vget_v_u32m2_u32m1(v1, 1), 4);
+    return v_uint64x2(vadd_vv_u64m1(vget_v_u64m2_u64m1(v2, 0), vget_v_u64m2_u64m1(v2, 1), 2));
+}
+inline v_uint64x2 v_dotprod_expand_fast(const v_uint16x8& a, const v_uint16x8& b, const v_uint64x2& c)
+{
+    vuint32m2_t v1 = vundefined_u32m2();
+    vuint64m2_t v2 = vundefined_u64m2();
+    v1 = vwmulu_vv_u32m2(a.val, b.val, 8);
+    v2 = vwaddu_vv_u64m2(vget_v_u32m2_u32m1(v1, 0), vget_v_u32m2_u32m1(v1, 1), 4);
+    return v_uint64x2(vadd_vv_u64m1(vadd_vv_u64m1(vget_v_u64m2_u64m1(v2, 0), vget_v_u64m2_u64m1(v2, 1), 2), c.val, 2));
+}
+
+inline v_int64x2 v_dotprod_expand_fast(const v_int16x8& a, const v_int16x8& b)
+{
+    vint32m2_t v1 = vundefined_i32m2();
+    vint64m2_t v2 = vundefined_i64m2();
+    v1 = vwmul_vv_i32m2(a.val, b.val, 8);
+    v2 = vwadd_vv_i64m2(vget_v_i32m2_i32m1(v1, 0), vget_v_i32m2_i32m1(v1, 1), 4);
+    return v_int64x2(vadd_vv_i64m1(vget_v_i64m2_i64m1(v2, 0), vget_v_i64m2_i64m1(v2, 1), 2));
+}
+inline v_int64x2 v_dotprod_expand_fast(const v_int16x8& a, const v_int16x8& b, const v_int64x2& c)
+{
+    vint32m2_t v1 = vundefined_i32m2();
+    vint64m2_t v2 = vundefined_i64m2();
+    v1 = vwmul_vv_i32m2(a.val, b.val, 8);
+    v2 = vwadd_vv_i64m2(vget_v_i32m2_i32m1(v1, 0), vget_v_i32m2_i32m1(v1, 1), 4);
+    return v_int64x2(vadd_vv_i64m1(vadd_vv_i64m1(vget_v_i64m2_i64m1(v2, 0), vget_v_i64m2_i64m1(v2, 1), 2), c.val, 2));
+}
+
+
+#define OPENCV_HAL_IMPL_RISCVV_REDUCE_OP_W(_Tpvec, _Tpvec2, len, scalartype, func, intrin, num) \
+inline scalartype v_reduce_##func(const v_##_Tpvec##x##num& a) \
+{\
+    v##_Tpvec2##m1_t val = vmv_v_x_##len##m1(0, num); \
+    val = intrin(val, a.val, val, num);    \
+    return vmv_x_s_##len##m1_##len(val);    \
+}
+
+
+#define OPENCV_HAL_IMPL_RISCVV_REDUCE_OP_(_Tpvec, _Tpvec2, scalartype, func, funcu, num, scalerfunc) \
+inline scalartype v_reduce_##func(const v_##_Tpvec##x##num& a) \
+{\
+    v##_Tpvec##m1_t val = vundefined_##_Tpvec2##m1(); \
+    val = v##funcu##_vs_##_Tpvec2##m1_##_Tpvec2##m1(val, a.val, a.val, num);    \
+    return scalerfunc(val);    \
+}
+OPENCV_HAL_IMPL_RISCVV_REDUCE_OP_W(int8, int16, i16, int, sum, vwredsum_vs_i8m1_i16m1, 16)
+OPENCV_HAL_IMPL_RISCVV_REDUCE_OP_W(int16, int32, i32, int, sum, vwredsum_vs_i16m1_i32m1, 8)
+OPENCV_HAL_IMPL_RISCVV_REDUCE_OP_W(int32, int64, i64, int, sum, vwredsum_vs_i32m1_i64m1, 4)
+OPENCV_HAL_IMPL_RISCVV_REDUCE_OP_W(uint8, uint16, u16, unsigned, sum, vwredsumu_vs_u8m1_u16m1, 16)
+OPENCV_HAL_IMPL_RISCVV_REDUCE_OP_W(uint16, uint32, u32, unsigned, sum, vwredsumu_vs_u16m1_u32m1, 8)
+OPENCV_HAL_IMPL_RISCVV_REDUCE_OP_W(uint32, uint64, u64, unsigned, sum, vwredsumu_vs_u32m1_u64m1, 4)
+inline float v_reduce_sum(const v_float32x4& a) \
+{\
+    vfloat32m1_t val = vfmv_v_f_f32m1(0.0, 4); \
+    val = vfredosum_vs_f32m1_f32m1(val, a.val, val, 4);    \
+    return vfmv_f_s_f32m1_f32(val);    \
+}
+inline double v_reduce_sum(const v_float64x2& a) \
+{\
+    vfloat64m1_t val = vfmv_v_f_f64m1(0.0, 2); \
+    val = vfredosum_vs_f64m1_f64m1(val, a.val, val, 2);    \
+    return vfmv_f_s_f64m1_f64(val);    \
+}
+inline uint64 v_reduce_sum(const v_uint64x2& a)
+{ vuint64m1_t res = vundefined_u64m1(); return vmv_x_s_u64m1_u64(vredsum_vs_u64m1_u64m1(res, a.val, vmv_v_x_u64m1(0, 2), 2)); }
+
+inline int64 v_reduce_sum(const v_int64x2& a)
+{ vint64m1_t res = vundefined_i64m1(); return vmv_x_s_i64m1_i64(vredsum_vs_i64m1_i64m1(res, a.val, vmv_v_x_i64m1(0, 2), 2)); }
+
+#define OPENCV_HAL_IMPL_RISCVV_REDUCE_OP(func)    \
+OPENCV_HAL_IMPL_RISCVV_REDUCE_OP_(int8,  i8, int, func, red##func, 16, vmv_x_s_i8m1_i8)    \
+OPENCV_HAL_IMPL_RISCVV_REDUCE_OP_(int16, i16, int, func, red##func, 8, vmv_x_s_i16m1_i16)    \
+OPENCV_HAL_IMPL_RISCVV_REDUCE_OP_(int32, i32, int, func, red##func, 4, vmv_x_s_i32m1_i32)    \
+OPENCV_HAL_IMPL_RISCVV_REDUCE_OP_(int64, i64, int, func, red##func, 2, vmv_x_s_i64m1_i64)    \
+OPENCV_HAL_IMPL_RISCVV_REDUCE_OP_(uint8,  u8, unsigned, func, red##func##u, 16, vmv_x_s_u8m1_u8)    \
+OPENCV_HAL_IMPL_RISCVV_REDUCE_OP_(uint16, u16, unsigned, func, red##func##u, 8, vmv_x_s_u16m1_u16)    \
+OPENCV_HAL_IMPL_RISCVV_REDUCE_OP_(uint32, u32, unsigned, func, red##func##u, 4, vmv_x_s_u32m1_u32)    \
+OPENCV_HAL_IMPL_RISCVV_REDUCE_OP_(float32, f32, float, func, fred##func, 4, vfmv_f_s_f32m1_f32)
+OPENCV_HAL_IMPL_RISCVV_REDUCE_OP(max)
+OPENCV_HAL_IMPL_RISCVV_REDUCE_OP(min)
+
+inline v_float32x4 v_reduce_sum4(const v_float32x4& a, const v_float32x4& b,
+                                 const v_float32x4& c, const v_float32x4& d)
+{
+    vfloat32m1_t a0 = vfmv_v_f_f32m1(0.0, 4);
+    vfloat32m1_t b0 = vfmv_v_f_f32m1(0.0, 4);
+    vfloat32m1_t c0 = vfmv_v_f_f32m1(0.0, 4);
+    vfloat32m1_t d0 = vfmv_v_f_f32m1(0.0, 4);
+    a0 = vfredosum_vs_f32m1_f32m1(a0, a.val, a0, 4);
+    b0 = vfredosum_vs_f32m1_f32m1(b0, b.val, b0, 4);
+    c0 = vfredosum_vs_f32m1_f32m1(c0, c.val, c0, 4);
+    d0 = vfredosum_vs_f32m1_f32m1(d0, d.val, d0, 4);
+    vfloat32m1_t res;
+    res = vslideup_vx_f32m1(a0, b0, 1, 4);
+    res = vslideup_vx_f32m1(res, c0, 2, 4);
+    res = vslideup_vx_f32m1(res, d0, 3, 4);
+    return v_float32x4(res);
+}
+
+inline float v_reduce_sad(const v_float32x4& a, const v_float32x4& b)
+{
+    vfloat32m1_t a0 = vfmv_v_f_f32m1(0.0, 4);
+    vfloat32m1_t x = vfsub_vv_f32m1(a.val, b.val, 4);
+    vbool32_t mask=vmflt_vf_f32m1_b32(x, 0, 4);
+    vfloat32m1_t val = vfrsub_vf_f32m1_m(mask, x, x, 0, 4);
+    a0 = vfredosum_vs_f32m1_f32m1(a0, val, a0, 4);
+    return vfmv_f_s_f32m1_f32(a0);
+}
+
+#define OPENCV_HAL_IMPL_RISCVV_REDUCE_SAD(_Tpvec, _Tpvec2) \
+inline unsigned v_reduce_sad(const _Tpvec& a, const _Tpvec&b){    \
+    _Tpvec2 x = v_absdiff(a, b);    \
+    return v_reduce_sum(x);    \
+}
+
+OPENCV_HAL_IMPL_RISCVV_REDUCE_SAD(v_int8x16, v_uint8x16)
+OPENCV_HAL_IMPL_RISCVV_REDUCE_SAD(v_uint8x16, v_uint8x16)
+OPENCV_HAL_IMPL_RISCVV_REDUCE_SAD(v_int16x8, v_uint16x8)
+OPENCV_HAL_IMPL_RISCVV_REDUCE_SAD(v_uint16x8, v_uint16x8)
+OPENCV_HAL_IMPL_RISCVV_REDUCE_SAD(v_int32x4, v_uint32x4)
+OPENCV_HAL_IMPL_RISCVV_REDUCE_SAD(v_uint32x4, v_uint32x4)
+
+#define OPENCV_HAL_IMPL_RISCVV_INT_CMP_OP(_Tpvec, _Tp, _T, num, uv) \
+inline _Tpvec v_eq(const _Tpvec& a, const _Tpvec& b) \
+{ \
+    vbool##_T##_t mask = vmseq_vv_##_Tp##_b##_T(a.val, b.val, num);    \
+    return _Tpvec(vmerge_vxm_##_Tp(mask, vmv_v_x_##_Tp(0, num), -1, num));    \
+} \
+inline _Tpvec v_ne(const _Tpvec& a, const _Tpvec& b) \
+{ \
+    vbool##_T##_t mask = vmsne_vv_##_Tp##_b##_T(a.val, b.val, num);    \
+    return _Tpvec(vmerge_vxm_##_Tp(mask, vmv_v_x_##_Tp(0, num), -1, num));    \
+} \
+inline _Tpvec v_lt(const _Tpvec& a, const _Tpvec& b) \
+{ \
+    vbool##_T##_t mask = vmslt##uv##_Tp##_b##_T(a.val, b.val, num);    \
+    return _Tpvec(vmerge_vxm_##_Tp(mask, vmv_v_x_##_Tp(0, num), -1, num));    \
+} \
+inline _Tpvec v_gt(const _Tpvec& a, const _Tpvec& b) \
+{ \
+    vbool##_T##_t mask = vmslt##uv##_Tp##_b##_T(b.val, a.val, num);    \
+    return _Tpvec(vmerge_vxm_##_Tp(mask, vmv_v_x_##_Tp(0, num), -1, num));    \
+} \
+inline _Tpvec v_le(const _Tpvec& a, const _Tpvec& b) \
+{ \
+    vbool##_T##_t mask = vmsle##uv##_Tp##_b##_T(a.val, b.val, num);    \
+    return _Tpvec(vmerge_vxm_##_Tp(mask, vmv_v_x_##_Tp(0, num), -1, num));    \
+} \
+inline _Tpvec v_ge(const _Tpvec& a, const _Tpvec& b) \
+{ \
+    vbool##_T##_t mask = vmsle##uv##_Tp##_b##_T(b.val, a.val, num);    \
+    return _Tpvec(vmerge_vxm_##_Tp(mask, vmv_v_x_##_Tp(0, num), -1, num));    \
+} \
+
+OPENCV_HAL_IMPL_RISCVV_INT_CMP_OP(v_int8x16, i8m1,  8, 16, _vv_)
+OPENCV_HAL_IMPL_RISCVV_INT_CMP_OP(v_int16x8, i16m1, 16, 8, _vv_)
+OPENCV_HAL_IMPL_RISCVV_INT_CMP_OP(v_int32x4, i32m1, 32, 4, _vv_)
+OPENCV_HAL_IMPL_RISCVV_INT_CMP_OP(v_int64x2, i64m1, 64, 2, _vv_)
+OPENCV_HAL_IMPL_RISCVV_INT_CMP_OP(v_uint8x16, u8m1, 8, 16, u_vv_)
+OPENCV_HAL_IMPL_RISCVV_INT_CMP_OP(v_uint16x8, u16m1, 16, 8, u_vv_)
+OPENCV_HAL_IMPL_RISCVV_INT_CMP_OP(v_uint32x4, u32m1, 32, 4, u_vv_)
+OPENCV_HAL_IMPL_RISCVV_INT_CMP_OP(v_uint64x2, u64m1, 64, 2, u_vv_)
+
+//TODO: ==
+inline v_float32x4 v_eq(const v_float32x4& a, const v_float32x4& b)
+{
+    vbool32_t mask = vmfeq_vv_f32m1_b32(a.val, b.val, 4);
+    vint32m1_t res = vmerge_vxm_i32m1(mask, vmv_v_x_i32m1(0.0, 4), -1, 4);
+    return v_float32x4(vreinterpret_v_i32m1_f32m1(res));
+}
+inline v_float32x4 v_ne(const v_float32x4& a, const v_float32x4& b)
+{
+    vbool32_t mask = vmfne_vv_f32m1_b32(a.val, b.val, 4);
+    vint32m1_t res = vmerge_vxm_i32m1(mask, vmv_v_x_i32m1(0.0, 4), -1, 4);
+    return v_float32x4(vreinterpret_v_i32m1_f32m1(res));
+}
+inline v_float32x4 v_lt(const v_float32x4& a, const v_float32x4& b)
+{
+    vbool32_t mask = vmflt_vv_f32m1_b32(a.val, b.val, 4);
+    vint32m1_t res = vmerge_vxm_i32m1(mask, vmv_v_x_i32m1(0.0, 4), -1, 4);
+    return v_float32x4(vreinterpret_v_i32m1_f32m1(res));
+}
+inline v_float32x4 v_le(const v_float32x4& a, const v_float32x4& b)
+{
+    vbool32_t mask = vmfle_vv_f32m1_b32(a.val, b.val, 4);
+    vint32m1_t res = vmerge_vxm_i32m1(mask, vmv_v_x_i32m1(0.0, 4), -1, 4);
+    return v_float32x4(vreinterpret_v_i32m1_f32m1(res));
+}
+inline v_float32x4 v_gt(const v_float32x4& a, const v_float32x4& b)
+{
+    vbool32_t mask = vmfgt_vv_f32m1_b32(a.val, b.val, 4);
+    vint32m1_t res = vmerge_vxm_i32m1(mask, vmv_v_x_i32m1(0.0, 4), -1, 4);
+    return v_float32x4(vreinterpret_v_i32m1_f32m1(res));
+}
+inline v_float32x4 v_ge(const v_float32x4& a, const v_float32x4& b)
+{
+    vbool32_t mask = vmfge_vv_f32m1_b32(a.val, b.val, 4);
+    vint32m1_t res = vmerge_vxm_i32m1(mask, vmv_v_x_i32m1(0.0, 4), -1, 4);
+    return v_float32x4(vreinterpret_v_i32m1_f32m1(res));
+}/**/
+inline v_float32x4 v_not_nan(const v_float32x4& a)
+{
+    vbool32_t mask = vmfeq_vv_f32m1_b32(a.val, a.val, 4);
+    vint32m1_t res = vmerge_vxm_i32m1(mask, vmv_v_x_i32m1(0.0, 4), -1, 4);
+    return v_float32x4(vreinterpret_v_i32m1_f32m1(res));
+}
+
+//TODO: ==
+inline v_float64x2 v_eq(const v_float64x2& a, const v_float64x2& b)
+{
+    vbool64_t mask = vmfeq_vv_f64m1_b64(a.val, b.val, 2);
+    vint64m1_t res = vmerge_vxm_i64m1(mask, vmv_v_x_i64m1(0.0, 2), -1, 2);
+    return v_float64x2(vreinterpret_v_i64m1_f64m1(res));
+}
+inline v_float64x2 v_ne(const v_float64x2& a, const v_float64x2& b)
+{
+    vbool64_t mask = vmfne_vv_f64m1_b64(a.val, b.val, 2);
+    vint64m1_t res = vmerge_vxm_i64m1(mask, vmv_v_x_i64m1(0.0, 2), -1, 2);
+    return v_float64x2(vreinterpret_v_i64m1_f64m1(res));
+}
+inline v_float64x2 v_lt(const v_float64x2& a, const v_float64x2& b)
+{
+    vbool64_t mask = vmflt_vv_f64m1_b64(a.val, b.val, 2);
+    vint64m1_t res = vmerge_vxm_i64m1(mask, vmv_v_x_i64m1(0.0, 2), -1, 2);
+    return v_float64x2(vreinterpret_v_i64m1_f64m1(res));
+}
+inline v_float64x2 v_le(const v_float64x2& a, const v_float64x2& b)
+{
+    vbool64_t mask = vmfle_vv_f64m1_b64(a.val, b.val, 2);
+    vint64m1_t res = vmerge_vxm_i64m1(mask, vmv_v_x_i64m1(0.0, 2), -1, 2);
+    return v_float64x2(vreinterpret_v_i64m1_f64m1(res));
+}
+inline v_float64x2 v_gt(const v_float64x2& a, const v_float64x2& b)
+{
+    vbool64_t mask = vmfgt_vv_f64m1_b64(a.val, b.val, 2);
+    vint64m1_t res = vmerge_vxm_i64m1(mask, vmv_v_x_i64m1(0.0, 2), -1, 2);
+    return v_float64x2(vreinterpret_v_i64m1_f64m1(res));
+}
+inline v_float64x2 v_ge(const v_float64x2& a, const v_float64x2& b)
+{
+    vbool64_t mask = vmfge_vv_f64m1_b64(a.val, b.val, 2);
+    vint64m1_t res = vmerge_vxm_i64m1(mask, vmv_v_x_i64m1(0.0, 2), -1, 2);
+    return v_float64x2(vreinterpret_v_i64m1_f64m1(res));
+}/**/
+inline v_float64x2 v_not_nan(const v_float64x2& a)
+{
+    vbool64_t mask = vmfeq_vv_f64m1_b64(a.val, a.val, 2);
+    vint64m1_t res = vmerge_vxm_i64m1(mask, vmv_v_x_i64m1(0.0, 2), -1, 2);
+    return v_float64x2(vreinterpret_v_i64m1_f64m1(res));
+}
+#define OPENCV_HAL_IMPL_RISCVV_TRANSPOSE4x4(_Tp, _T) \
+inline void v_transpose4x4(const v_##_Tp##32x4& a0, const v_##_Tp##32x4& a1, \
+                         const v_##_Tp##32x4& a2, const v_##_Tp##32x4& a3, \
+                         v_##_Tp##32x4& b0, v_##_Tp##32x4& b1, \
+                         v_##_Tp##32x4& b2, v_##_Tp##32x4& b3) \
+{ \
+    vuint32m4_t vindex = vundefined_u32m4(); \
+    vuint32m1_t vindex0 = vid_v_u32m1(4); \
+    vindex0 = vsll_vx_u32m1(vindex0, 2, 4); \
+    vindex = vset_v_u32m1_u32m4(vindex, 0, vindex0); \
+    vindex = vset_v_u32m1_u32m4(vindex, 1, vadd_vx_u32m1(vindex0, 1, 4)); \
+    vindex = vset_v_u32m1_u32m4(vindex, 2, vadd_vx_u32m1(vindex0, 2, 4)); \
+    vindex = vset_v_u32m1_u32m4(vindex, 3, vadd_vx_u32m1(vindex0, 3, 4)); \
+    v##_Tp##32m4_t val = vundefined_##_T##m4();    \
+    val = vset_v_##_T##m1_##_T##m4(val, 0, a0.val);    \
+    val = vset_v_##_T##m1_##_T##m4(val, 1, a1.val);    \
+    val = vset_v_##_T##m1_##_T##m4(val, 2, a2.val);    \
+    val = vset_v_##_T##m1_##_T##m4(val, 3, a3.val);   \
+    val = vrgather_vv_##_T##m4(val, vindex, 16);    \
+    b0.val = vget_v_##_T##m4_##_T##m1(val, 0);   \
+    b1.val = vget_v_##_T##m4_##_T##m1(val, 1);   \
+    b2.val = vget_v_##_T##m4_##_T##m1(val, 2);   \
+    b3.val = vget_v_##_T##m4_##_T##m1(val, 3);   \
+}
+OPENCV_HAL_IMPL_RISCVV_TRANSPOSE4x4(uint, u32)
+OPENCV_HAL_IMPL_RISCVV_TRANSPOSE4x4(int, i32)
+OPENCV_HAL_IMPL_RISCVV_TRANSPOSE4x4(float, f32)
+
+
+#define OPENCV_HAL_IMPL_RISCVV_SHIFT_LEFT(_Tpvec, suffix, _T, num) \
+inline _Tpvec v_shl(const _Tpvec& a, int n) \
+{ return _Tpvec((vsll_vx_##_T##m1(a.val, n, num))); } \
+template<int n> inline _Tpvec v_shl(const _Tpvec& a) \
+{ return _Tpvec((vsll_vx_##_T##m1(a.val, n, num))); }
+
+#define OPENCV_HAL_IMPL_RISCVV_SHIFT_RIGHT(_Tpvec, suffix, _T, num, intric) \
+inline _Tpvec v_shr(const _Tpvec& a, int n) \
+{ return _Tpvec((v##intric##_vx_##_T##m1(a.val, n, num))); } \
+template<int n> inline _Tpvec v_shr(const _Tpvec& a) \
+{ return _Tpvec((v##intric##_vx_##_T##m1(a.val, n, num))); }\
+template<int n> inline _Tpvec v_rshr(const _Tpvec& a) \
+{ return _Tpvec((v##intric##_vx_##_T##m1(vadd_vx_##_T##m1(a.val, 1<<(n-1), num), n, num))); }
+
+// trade efficiency for convenience
+#define OPENCV_HAL_IMPL_RISCVV_SHIFT_OP(suffix, _T, num, intrin) \
+OPENCV_HAL_IMPL_RISCVV_SHIFT_LEFT(v_##suffix##x##num, suffix, _T, num) \
+OPENCV_HAL_IMPL_RISCVV_SHIFT_RIGHT(v_##suffix##x##num, suffix, _T, num, intrin)
+
+OPENCV_HAL_IMPL_RISCVV_SHIFT_OP(uint8, u8, 16, srl)
+OPENCV_HAL_IMPL_RISCVV_SHIFT_OP(uint16, u16, 8, srl)
+OPENCV_HAL_IMPL_RISCVV_SHIFT_OP(uint32, u32, 4, srl)
+OPENCV_HAL_IMPL_RISCVV_SHIFT_OP(uint64, u64, 2, srl)
+OPENCV_HAL_IMPL_RISCVV_SHIFT_OP(int8, i8, 16, sra)
+OPENCV_HAL_IMPL_RISCVV_SHIFT_OP(int16, i16, 8, sra)
+OPENCV_HAL_IMPL_RISCVV_SHIFT_OP(int32, i32, 4, sra)
+OPENCV_HAL_IMPL_RISCVV_SHIFT_OP(int64, i64, 2, sra)
+
+#if 0
+#define VUP4(n) {0, 1, 2, 3}
+#define VUP8(n) {0, 1, 2, 3, 4, 5, 6, 7}
+#define VUP16(n) {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15}
+#define VUP2(n) {0, 1}
+#endif
+#define OPENCV_HAL_IMPL_RISCVV_ROTATE_OP(_Tpvec, suffix, _T, num, num2, vmv, len) \
+template<int n> inline _Tpvec v_rotate_left(const _Tpvec& a) \
+{    \
+    suffix##m1_t tmp = vmv##_##_T##m1(0, num);\
+        tmp = vslideup_vx_##_T##m1_m(vmset_m_##len(num), tmp, a.val, n, num);\
+        return _Tpvec(tmp);\
+} \
+template<int n> inline _Tpvec v_rotate_right(const _Tpvec& a) \
+{     \
+        suffix##m1_t res = vundefined_##_T##m1(); \
+        return _Tpvec(vslidedown_vx_##_T##m1(res, a.val, n, num));\
+} \
+template<> inline _Tpvec v_rotate_left<0>(const _Tpvec& a) \
+{ return a; } \
+template<int n> inline _Tpvec v_rotate_right(const _Tpvec& a, const _Tpvec& b) \
+{ \
+    suffix##m2_t tmp = vundefined_##_T##m2();    \
+    suffix##m2_t res = vundefined_##_T##m2();    \
+    tmp = vset_v_##_T##m1_##_T##m2(tmp, 0, a.val);          \
+    tmp = vset_v_##_T##m1_##_T##m2(tmp, 1, b.val);          \
+        res = vslidedown_vx_##_T##m2(res, tmp, n, num2);\
+        return _Tpvec(vget_v_##_T##m2_##_T##m1(res, 0));\
+} \
+template<int n> inline _Tpvec v_rotate_left(const _Tpvec& a, const _Tpvec& b) \
+{ \
+    suffix##m2_t tmp = vundefined_##_T##m2();    \
+    suffix##m2_t res = vundefined_##_T##m2();    \
+    tmp = vset_v_##_T##m1_##_T##m2(tmp, 0, b.val);    \
+    tmp = vset_v_##_T##m1_##_T##m2(tmp, 1, a.val);    \
+        res = vslideup_vx_##_T##m2(res, tmp, n, num2);\
+        return _Tpvec(vget_v_##_T##m2_##_T##m1(res, 1));\
+} \
+template<> inline _Tpvec v_rotate_left<0>(const _Tpvec& a, const _Tpvec& b) \
+{ \
+    CV_UNUSED(b); return a; \
+}
+
+OPENCV_HAL_IMPL_RISCVV_ROTATE_OP(v_uint8x16, vuint8, u8, 16, 32, vmv_v_x, b8)
+OPENCV_HAL_IMPL_RISCVV_ROTATE_OP(v_int8x16, vint8, i8, 16, 32, vmv_v_x, b8)
+OPENCV_HAL_IMPL_RISCVV_ROTATE_OP(v_uint16x8, vuint16, u16, 8, 16, vmv_v_x, b16)
+OPENCV_HAL_IMPL_RISCVV_ROTATE_OP(v_int16x8, vint16, i16, 8, 16, vmv_v_x, b16)
+OPENCV_HAL_IMPL_RISCVV_ROTATE_OP(v_uint32x4, vuint32, u32, 4, 8, vmv_v_x, b32)
+OPENCV_HAL_IMPL_RISCVV_ROTATE_OP(v_int32x4, vint32, i32, 4, 8, vmv_v_x, b32)
+OPENCV_HAL_IMPL_RISCVV_ROTATE_OP(v_uint64x2, vuint64, u64, 2, 4, vmv_v_x, b64)
+OPENCV_HAL_IMPL_RISCVV_ROTATE_OP(v_int64x2, vint64, i64, 2, 4, vmv_v_x, b64)
+OPENCV_HAL_IMPL_RISCVV_ROTATE_OP(v_float32x4, vfloat32, f32, 4, 8, vfmv_v_f, b32)
+OPENCV_HAL_IMPL_RISCVV_ROTATE_OP(v_float64x2, vfloat64, f64, 2, 4, vfmv_v_f, b64)
+
+#if 1
+#define vreinterpret_v_i8m1_i8m1
+#define vreinterpret_v_u8m1_u8m1
+#define OPENCV_HAL_IMPL_RISCVV_LOADSTORE_OP(_Tpvec, _Tp, _Tp2, len, hnum, num, elemsize, ldst_len, ldst_type) \
+inline _Tpvec v_load_halves(const _Tp* ptr0, const _Tp* ptr1) \
+{ \
+  _Tp2##_t res = vundefined_##len(); \
+  _Tp2##_t res1 = vundefined_##len(); \
+  res = vreinterpret_v_##ldst_len##_##len(vle8_v_##ldst_len((ldst_type *)ptr0, 8)); \
+  res1 = vreinterpret_v_##ldst_len##_##len(vle8_v_##ldst_len((ldst_type *)ptr1, 8)); \
+  res = vslideup_vx_##len(res, res1, hnum, num); \
+  return _Tpvec(res); } \
+inline _Tpvec v_load_low(const _Tp* ptr) \
+{ return _Tpvec(vreinterpret_v_##ldst_len##_##len(vle8_v_##ldst_len((ldst_type *)ptr, 8))); }\
+inline _Tpvec v_load_aligned(const _Tp* ptr) \
+{ return _Tpvec(vreinterpret_v_##ldst_len##_##len(vle8_v_##ldst_len((ldst_type *)ptr, 16))); } \
+inline _Tpvec v_load(const _Tp* ptr) \
+{ return _Tpvec(vle##elemsize##_v_##len(ptr, num)); } \
+inline void v_store_low(_Tp* ptr, const _Tpvec& a) \
+{ vse8_v_##ldst_len((ldst_type *)ptr, vreinterpret_v_##len##_##ldst_len(a.val), 8);}\
+inline void v_store_high(_Tp* ptr, const _Tpvec& a) \
+{ \
+  _Tp2##_t a0 = vundefined_##len(); \
+  a0 = vslidedown_vx_##len(a0, a.val, hnum, num);    \
+  vse8_v_##ldst_len((ldst_type *)ptr, vreinterpret_v_##len##_##ldst_len(a0), 8);}\
+inline void v_store(_Tp* ptr, const _Tpvec& a) \
+{ vse##elemsize##_v_##len(ptr, a.val, num); } \
+inline void v_store_aligned(_Tp* ptr, const _Tpvec& a) \
+{ vse8_v_##ldst_len((ldst_type *)ptr, vreinterpret_v_##len##_##ldst_len(a.val), 16); } \
+inline void v_store_aligned_nocache(_Tp* ptr, const _Tpvec& a) \
+{ vse8_v_##ldst_len((ldst_type *)ptr, vreinterpret_v_##len##_##ldst_len(a.val), 16); } \
+inline void v_store(_Tp* ptr, const _Tpvec& a, hal::StoreMode /*mode*/) \
+{ vse8_v_##ldst_len((ldst_type *)ptr, vreinterpret_v_##len##_##ldst_len(a.val), 16); }
+
+OPENCV_HAL_IMPL_RISCVV_LOADSTORE_OP(v_uint8x16, uchar, vuint8m1, u8m1, 8, 16, 8, u8m1, uchar)
+OPENCV_HAL_IMPL_RISCVV_LOADSTORE_OP(v_int8x16,  schar, vint8m1, i8m1, 8, 16, 8, i8m1, schar)
+OPENCV_HAL_IMPL_RISCVV_LOADSTORE_OP(v_uint16x8, ushort, vuint16m1, u16m1, 4, 8, 16, u8m1, uchar)
+OPENCV_HAL_IMPL_RISCVV_LOADSTORE_OP(v_int16x8,  short,  vint16m1, i16m1, 4, 8, 16, i8m1, schar)
+OPENCV_HAL_IMPL_RISCVV_LOADSTORE_OP(v_uint32x4, unsigned, vuint32m1, u32m1, 2, 4, 32, u8m1, uchar)
+OPENCV_HAL_IMPL_RISCVV_LOADSTORE_OP(v_int32x4,  int,     vint32m1, i32m1, 2, 4, 32, i8m1, schar)
+OPENCV_HAL_IMPL_RISCVV_LOADSTORE_OP(v_uint64x2, unsigned long, vuint64m1, u64m1, 1, 2, 64, u8m1, uchar)
+OPENCV_HAL_IMPL_RISCVV_LOADSTORE_OP(v_int64x2,  long,     vint64m1, i64m1, 1, 2, 64, i8m1, schar)
+
+#define OPENCV_HAL_IMPL_RISCVV_LOADSTORE_FLOAT_OP(_Tpvec, _Tp, _Tp2, len, hnum, num, elemsize) \
+inline _Tpvec v_load_halves(const _Tp* ptr0, const _Tp* ptr1) \
+{ \
+  _Tp2##_t res = vundefined_##len(); \
+  _Tp2##_t res1 = vundefined_##len(); \
+  res = vreinterpret_v_u##elemsize##m1_##len(vreinterpret_v_u8m1_u##elemsize##m1(vle8_v_u8m1((uchar *)ptr0, 8))); \
+  res1 = vreinterpret_v_u##elemsize##m1_##len(vreinterpret_v_u8m1_u##elemsize##m1(vle8_v_u8m1((uchar *)ptr1, 8))); \
+  res = vslideup_vx_##len(res, res1, hnum, num); \
+  return _Tpvec(res); } \
+inline _Tpvec v_load_low(const _Tp* ptr) \
+{ return _Tpvec(vreinterpret_v_u##elemsize##m1_##len(vreinterpret_v_u8m1_u##elemsize##m1(vle8_v_u8m1((uchar *)ptr, 8)))); }\
+inline _Tpvec v_load_aligned(const _Tp* ptr) \
+{ return _Tpvec(vreinterpret_v_u##elemsize##m1_##len(vreinterpret_v_u8m1_u##elemsize##m1(vle8_v_u8m1((uchar *)ptr, 16)))); } \
+inline _Tpvec v_load(const _Tp* ptr) \
+{ return _Tpvec(vle##elemsize##_v_##len(ptr, num)); } \
+inline void v_store_low(_Tp* ptr, const _Tpvec& a) \
+{ vse8_v_u8m1((uchar *)ptr, vreinterpret_v_u##elemsize##m1_u8m1(vreinterpret_v_##len##_u##elemsize##m1(a.val)), 8);}\
+inline void v_store_high(_Tp* ptr, const _Tpvec& a) \
+{ \
+  _Tp2##_t a0 = vundefined_##len(); \
+  a0 = vslidedown_vx_##len(a0, a.val, hnum, num);    \
+  vse8_v_u8m1((uchar *)ptr, vreinterpret_v_u##elemsize##m1_u8m1(vreinterpret_v_##len##_u##elemsize##m1(a0)), 8);}\
+inline void v_store(_Tp* ptr, const _Tpvec& a) \
+{ vse##elemsize##_v_##len(ptr, a.val, num); } \
+inline void v_store_aligned(_Tp* ptr, const _Tpvec& a) \
+{ vse8_v_u8m1((uchar *)ptr, vreinterpret_v_u##elemsize##m1_u8m1(vreinterpret_v_##len##_u##elemsize##m1(a.val)), 16); } \
+inline void v_store_aligned_nocache(_Tp* ptr, const _Tpvec& a) \
+{ vse8_v_u8m1((uchar *)ptr, vreinterpret_v_u##elemsize##m1_u8m1(vreinterpret_v_##len##_u##elemsize##m1(a.val)), 16); } \
+inline void v_store(_Tp* ptr, const _Tpvec& a, hal::StoreMode /*mode*/) \
+{ vse8_v_u8m1((uchar *)ptr, vreinterpret_v_u##elemsize##m1_u8m1(vreinterpret_v_##len##_u##elemsize##m1(a.val)), 16); }
+OPENCV_HAL_IMPL_RISCVV_LOADSTORE_FLOAT_OP(v_float32x4, float, vfloat32m1, f32m1, 2, 4, 32)
+OPENCV_HAL_IMPL_RISCVV_LOADSTORE_FLOAT_OP(v_float64x2, double, vfloat64m1, f64m1, 1, 2, 64)
+
+#else
+
+#define OPENCV_HAL_IMPL_RISCVV_LOADSTORE_OP(_Tpvec, _Tp, _Tp2, len, hnum, num, elemsize) \
+inline _Tpvec v_load_halves(const _Tp* ptr0, const _Tp* ptr1) \
+{ \
+  _Tp2##_t res, res1; \
+  res = vle##elemsize##_v_##len(ptr0, hnum); \
+  res1 = vle##elemsize##_v_##len(ptr1, hnum); \
+  res = vslideup_vx_##len(res, res1, hnum, num); \
+  return _Tpvec(res); } \
+inline _Tpvec v_load_low(const _Tp* ptr) \
+{ return _Tpvec(vle##elemsize##_v_##len(ptr, hnum)); }\
+inline _Tpvec v_load_aligned(const _Tp* ptr) \
+{ return _Tpvec(vle##elemsize##_v_##len(ptr, num)); } \
+inline _Tpvec v_load(const _Tp* ptr) \
+{ return _Tpvec((_Tp2##_t)vle##elemsize##_v_##len((const _Tp *)ptr, num)); } \
+inline void v_store_low(_Tp* ptr, const _Tpvec& a) \
+{ vse##elemsize##_v_##len(ptr, a.val, hnum);}\
+inline void v_store_high(_Tp* ptr, const _Tpvec& a) \
+{ \
+  _Tp2##_t a0; \
+  a0 = vslidedown_vx_##len(a0, a.val, hnum, num);    \
+  vse##elemsize##_v_##len(ptr, a0, hnum);}\
+inline void v_store(_Tp* ptr, const _Tpvec& a) \
+{ vse##elemsize##_v_##len(ptr, a.val, num); } \
+inline void v_store_aligned(_Tp* ptr, const _Tpvec& a) \
+{ vse##elemsize##_v_##len(ptr, a.val, num); } \
+inline void v_store_aligned_nocache(_Tp* ptr, const _Tpvec& a) \
+{ vse##elemsize##_v_##len(ptr, a.val, num); } \
+inline void v_store(_Tp* ptr, const _Tpvec& a, hal::StoreMode /*mode*/) \
+{ vse##elemsize##_v_##len(ptr, a.val, num); }
+
+OPENCV_HAL_IMPL_RISCVV_LOADSTORE_OP(v_uint8x16, uchar, vuint8m1, u8m1, 8, 16, 8)
+OPENCV_HAL_IMPL_RISCVV_LOADSTORE_OP(v_int8x16,  schar, vint8m1, i8m1, 8, 16, 8)
+OPENCV_HAL_IMPL_RISCVV_LOADSTORE_OP(v_uint16x8, ushort, vuint16m1, u16m1, 4, 8, 16)
+OPENCV_HAL_IMPL_RISCVV_LOADSTORE_OP(v_int16x8,  short,  vint16m1, i16m1, 4, 8, 16)
+OPENCV_HAL_IMPL_RISCVV_LOADSTORE_OP(v_uint32x4, unsigned, vuint32m1, u32m1, 2, 4, 32)
+OPENCV_HAL_IMPL_RISCVV_LOADSTORE_OP(v_int32x4,  int,     vint32m1, i32m1, 2, 4, 32)
+OPENCV_HAL_IMPL_RISCVV_LOADSTORE_OP(v_uint64x2, unsigned long, vuint64m1, u64m1, 1, 2, 64)
+OPENCV_HAL_IMPL_RISCVV_LOADSTORE_OP(v_int64x2,  long,     vint64m1, i64m1, 1, 2, 64)
+OPENCV_HAL_IMPL_RISCVV_LOADSTORE_OP(v_float32x4, float, vfloat32m1, f32m1, 2, 4, 32)
+OPENCV_HAL_IMPL_RISCVV_LOADSTORE_OP(v_float64x2, double, vfloat64m1, f64m1, 1, 2, 64)
+
+#endif
+
+////////////// Lookup table access ////////////////////
+
+inline v_int8x16 v_lut(const schar* tab, const int* idx)
+{
+#if 0
+    schar CV_DECL_ALIGNED(32) elems[16] =
+    {
+        tab[idx[ 0]],
+        tab[idx[ 1]],
+        tab[idx[ 2]],
+        tab[idx[ 3]],
+        tab[idx[ 4]],
+        tab[idx[ 5]],
+        tab[idx[ 6]],
+        tab[idx[ 7]],
+        tab[idx[ 8]],
+        tab[idx[ 9]],
+        tab[idx[10]],
+        tab[idx[11]],
+        tab[idx[12]],
+        tab[idx[13]],
+        tab[idx[14]],
+        tab[idx[15]]
+    };
+    return v_int8x16(vle8_v_i8m1(elems, 16));
+#else
+#if __riscv_v == 7000
+    return v_int8x16(vnclip_wx_i8m1(vnclip_wx_i16m2(vlxb_v_i32m4((const int *)tab, vle32_v_u32m4((unsigned int *)idx, 16), 16), 0, 16), 0, 16));
+#else
+    return v_int8x16(vloxei32_v_i8m1(tab, vle32_v_u32m4((unsigned int *)idx, 16), 16));
+#endif
+#endif
+}
+
+inline v_int8x16 v_lut_pairs(const schar* tab, const int* idx){
+#if 0
+    schar CV_DECL_ALIGNED(32) elems[16] =
+    {
+        tab[idx[0]],
+        tab[idx[0] + 1],
+        tab[idx[1]],
+        tab[idx[1] + 1],
+        tab[idx[2]],
+        tab[idx[2] + 1],
+        tab[idx[3]],
+        tab[idx[3] + 1],
+        tab[idx[4]],
+        tab[idx[4] + 1],
+        tab[idx[5]],
+        tab[idx[5] + 1],
+        tab[idx[6]],
+        tab[idx[6] + 1],
+        tab[idx[7]],
+        tab[idx[7] + 1]
+    };
+    return v_int8x16(vle8_v_i8m1(elems, 16));
+#else
+    vuint32m4_t seq, index;
+    vuint32m4_t vidx = vle32_v_u32m4((unsigned int *)idx, 8);
+    seq = vid_v_u32m4(16);
+    index = vsrl_vx_u32m4(seq, 1, 16);
+    vidx = vrgather_vv_u32m4(vidx, index, 16);
+    index = vadd_vv_u32m4(vand_vx_u32m4(seq, 1, 16), vidx, 16);
+#if __riscv_v == 7000
+    return v_int8x16(vnclip_wx_i8m1(vnclip_wx_i16m2(vlxb_v_i32m4((const int *)tab, index, 16), 0, 16), 0, 16));
+#else
+    return v_int8x16(vloxei32_v_i8m1(tab, index, 16));
+#endif
+#endif
+}
+inline v_int8x16 v_lut_quads(const schar* tab, const int* idx)
+{
+#if 0
+    schar CV_DECL_ALIGNED(32) elems[16] =
+    {
+        tab[idx[0]],
+        tab[idx[0] + 1],
+        tab[idx[0] + 2],
+        tab[idx[0] + 3],
+        tab[idx[1]],
+        tab[idx[1] + 1],
+        tab[idx[1] + 2],
+        tab[idx[1] + 3],
+        tab[idx[2]],
+        tab[idx[2] + 1],
+        tab[idx[2] + 2],
+        tab[idx[2] + 3],
+        tab[idx[3]],
+        tab[idx[3] + 1],
+        tab[idx[3] + 2],
+        tab[idx[3] + 3]
+    };
+    return v_int8x16(vle8_v_i8m1(elems, 16));
+#else
+    vuint32m4_t seq, index;
+    vuint32m4_t vidx = vle32_v_u32m4((unsigned int *)idx, 4);
+    seq = vid_v_u32m4(16);
+    index = vsrl_vx_u32m4(seq, 2, 16);
+    vidx = vrgather_vv_u32m4(vidx, index, 16);
+    seq = vset_v_u32m1_u32m4(seq, 1, vget_v_u32m4_u32m1(seq, 0));
+    seq = vset_v_u32m1_u32m4(seq, 2, vget_v_u32m4_u32m1(seq, 0));
+    seq = vset_v_u32m1_u32m4(seq, 3, vget_v_u32m4_u32m1(seq, 0));
+    index = vadd_vv_u32m4(seq, vidx, 16);
+#if __riscv_v == 7000
+    return v_int8x16(vnclip_wx_i8m1(vnclip_wx_i16m2(vlxb_v_i32m4((const int *)tab, index, 16), 0, 16), 0, 16));
+#else
+    return v_int8x16(vloxei32_v_i8m1(tab, index, 16));
+#endif
+#endif
+}
+
+inline v_uint8x16 v_lut(const uchar* tab, const int* idx) { return v_reinterpret_as_u8(v_lut((schar*)tab, idx)); }
+inline v_uint8x16 v_lut_pairs(const uchar* tab, const int* idx) { return v_reinterpret_as_u8(v_lut_pairs((schar*)tab, idx)); }
+inline v_uint8x16 v_lut_quads(const uchar* tab, const int* idx) { return v_reinterpret_as_u8(v_lut_quads((schar*)tab, idx)); }
+
+inline v_int16x8 v_lut(const short* tab, const int* idx)
+{
+#if 0
+    short CV_DECL_ALIGNED(32) elems[8] =
+    {
+        tab[idx[0]],
+        tab[idx[1]],
+        tab[idx[2]],
+        tab[idx[3]],
+        tab[idx[4]],
+        tab[idx[5]],
+        tab[idx[6]],
+        tab[idx[7]]
+    };
+    return v_int16x8(vle16_v_i16m1(elems, 8));
+#else
+#if __riscv_v == 7000
+    return v_int16x8(vnclip_wx_i16m1(vlxh_v_i32m2((const int *)tab, vsll_vx_u32m2(vle32_v_u32m2((unsigned int *)idx, 8), 1, 8), 8), 0, 8));
+#else
+    return v_int16x8(vloxei32_v_i16m1(tab, vsll_vx_u32m2(vle32_v_u32m2((unsigned int *)idx, 8), 1, 8), 8));
+#endif
+#endif
+}
+inline v_int16x8 v_lut_pairs(const short* tab, const int* idx)
+{
+#if 0
+    short CV_DECL_ALIGNED(32) elems[8] =
+    {
+        tab[idx[0]],
+        tab[idx[0] + 1],
+        tab[idx[1]],
+        tab[idx[1] + 1],
+        tab[idx[2]],
+        tab[idx[2] + 1],
+        tab[idx[3]],
+        tab[idx[3] + 1]
+    };
+    return v_int16x8(vle16_v_i16m1(elems, 8));
+#else
+    vuint32m2_t seq, index;
+    vuint32m2_t vidx = vle32_v_u32m2((unsigned int *)idx, 4);
+    seq = vid_v_u32m2(8);
+    index = vsrl_vx_u32m2(seq, 1, 8);
+    vidx = vrgather_vv_u32m2(vidx, index, 8);
+    index = vsll_vx_u32m2(vadd_vv_u32m2(vand_vx_u32m2(seq, 1, 8), vidx, 8), 1, 8);
+#if __riscv_v == 7000
+    return v_int16x8(vnclip_wx_i16m1(vlxh_v_i32m2((const int *)tab, index, 8), 0, 8));
+#else
+    return v_int16x8(vloxei32_v_i16m1(tab, index, 8));
+#endif
+#endif
+}
+inline v_int16x8 v_lut_quads(const short* tab, const int* idx)
+{
+#if 0
+    short CV_DECL_ALIGNED(32) elems[8] =
+    {
+        tab[idx[0]],
+        tab[idx[0] + 1],
+        tab[idx[0] + 2],
+        tab[idx[0] + 3],
+        tab[idx[1]],
+        tab[idx[1] + 1],
+        tab[idx[1] + 2],
+        tab[idx[1] + 3]
+    };
+    return v_int16x8(vle16_v_i16m1(elems, 8));
+#else
+    vuint32m2_t seq, index;
+    vuint32m2_t vidx = vle32_v_u32m2((unsigned int *)idx, 2);
+    seq = vid_v_u32m2(8);
+    index = vsrl_vx_u32m2(seq, 2, 8);
+    vidx = vrgather_vv_u32m2(vidx, index, 8);
+    seq = vset_v_u32m1_u32m2(seq, 1, vget_v_u32m2_u32m1(seq, 0));
+    index = vsll_vx_u32m2(vadd_vv_u32m2(seq, vidx, 8), 1, 8);
+#if __riscv_v == 7000
+    return v_int16x8(vnclip_wx_i16m1(vlxh_v_i32m2((const int *)tab, index, 8), 0, 8));
+#else
+    return v_int16x8(vloxei32_v_i16m1(tab, index, 8));
+#endif
+#endif
+}
+inline v_uint16x8 v_lut(const ushort* tab, const int* idx) { return v_reinterpret_as_u16(v_lut((short*)tab, idx)); }
+inline v_uint16x8 v_lut_pairs(const ushort* tab, const int* idx) { return v_reinterpret_as_u16(v_lut_pairs((short*)tab, idx)); }
+inline v_uint16x8 v_lut_quads(const ushort* tab, const int* idx) { return v_reinterpret_as_u16(v_lut_quads((short*)tab, idx)); }
+
+inline v_int32x4 v_lut(const int* tab, const int* idx)
+{
+#if 0
+    int CV_DECL_ALIGNED(32) elems[4] =
+    {
+        tab[idx[0]],
+        tab[idx[1]],
+        tab[idx[2]],
+        tab[idx[3]]
+    };
+    return v_int32x4(vle32_v_i32m1(elems, 4));
+#else
+    return v_int32x4(vloxei32_v_i32m1(tab, vsll_vx_u32m1(vle32_v_u32m1((unsigned int *)idx, 4), 2, 4), 4));
+#endif
+}
+inline v_int32x4 v_lut_pairs(const int* tab, const int* idx)
+{
+#if 0
+    int CV_DECL_ALIGNED(32) elems[4] =
+    {
+        tab[idx[0]],
+        tab[idx[0] + 1],
+        tab[idx[1]],
+        tab[idx[1] + 1]
+    };
+    return v_int32x4(vle32_v_i32m1(elems, 4));
+#else
+    vuint32m1_t seq, index;
+    vuint32m1_t vidx = vle32_v_u32m1((unsigned int *)idx, 2);
+    seq = vid_v_u32m1(4);
+    index = vsrl_vx_u32m1(seq, 1, 4);
+    vidx = vrgather_vv_u32m1(vidx, index, 4);
+    index = vsll_vx_u32m1(vadd_vv_u32m1(vand_vx_u32m1(seq, 1, 4), vidx, 4), 2, 4);
+    return v_int32x4(vloxei32_v_i32m1(tab, index, 4));
+#endif
+}
+inline v_int32x4 v_lut_quads(const int* tab, const int* idx)
+{
+    return v_int32x4(vle32_v_i32m1(tab+idx[0], 4));
+}
+inline v_uint32x4 v_lut(const unsigned* tab, const int* idx) { return v_reinterpret_as_u32(v_lut((int*)tab, idx)); }
+inline v_uint32x4 v_lut_pairs(const unsigned* tab, const int* idx) { return v_reinterpret_as_u32(v_lut_pairs((int*)tab, idx)); }
+inline v_uint32x4 v_lut_quads(const unsigned* tab, const int* idx) { return v_reinterpret_as_u32(v_lut_quads((int*)tab, idx)); }
+
+inline v_int64x2 v_lut(const int64_t* tab, const int* idx)
+{
+    //vint64m1_t res = {tab[idx[0]], tab[idx[1]]};
+    return v_int64x2(vloxei64_v_i64m1(tab, vsll_vx_u64m1(vget_v_u64m2_u64m1(vwaddu_vx_u64m2(vle32_v_u32m1((uint32_t*)idx, 2), 0, 2), 0), 3, 2), 2));
+}
+inline v_int64x2 v_lut_pairs(const int64_t* tab, const int* idx)
+{
+    return v_int64x2(vle64_v_i64m1(tab+idx[0], 2));
+}
+
+inline v_uint64x2 v_lut(const uint64_t* tab, const int* idx)
+{
+    //vuint64m1_t res = {tab[idx[0]], tab[idx[1]]};
+    return v_uint64x2(vloxei64_v_u64m1(tab, vsll_vx_u64m1(vget_v_u64m2_u64m1(vwaddu_vx_u64m2(vle32_v_u32m1((uint32_t*)idx, 2), 0, 2), 0), 3, 2), 2));
+}
+inline v_uint64x2 v_lut_pairs(const uint64_t* tab, const int* idx)
+{
+    return v_uint64x2(vle64_v_u64m1(tab+idx[0], 2));
+}
+
+inline v_float32x4 v_lut(const float* tab, const int* idx)
+{
+#if 0
+    float CV_DECL_ALIGNED(32) elems[4] =
+    {
+        tab[idx[0]],
+        tab[idx[1]],
+        tab[idx[2]],
+        tab[idx[3]]
+    };
+    return v_float32x4(vle32_v_f32m1(elems, 4));
+#else
+    return v_float32x4(vloxei32_v_f32m1(tab, vsll_vx_u32m1(vle32_v_u32m1((unsigned int *)idx, 4), 2, 4), 4));
+#endif
+}
+inline v_float32x4 v_lut_pairs(const float* tab, const int* idx)
+{
+#if 0
+    float CV_DECL_ALIGNED(32) elems[4] =
+    {
+        tab[idx[0]],
+        tab[idx[0]+1],
+        tab[idx[1]],
+        tab[idx[1]+1]
+    };
+    return v_float32x4(vle32_v_f32m1(elems, 4));
+#else
+    vuint32m1_t seq, index;
+    vuint32m1_t vidx = vle32_v_u32m1((unsigned int *)idx, 2);
+    seq = vid_v_u32m1(4);
+    index = vsrl_vx_u32m1(seq, 1, 4);
+    vidx = vrgather_vv_u32m1(vidx, index, 4);
+    index = vsll_vx_u32m1(vadd_vv_u32m1(vand_vx_u32m1(seq, 1, 4), vidx, 4), 2, 4);
+    return v_float32x4(vloxei32_v_f32m1(tab, index, 4));
+#endif
+}
+inline v_float32x4 v_lut_quads(const float* tab, const int* idx)
+{
+    return v_float32x4(vle32_v_f32m1(tab + idx[0], 4));
+}
+inline v_float64x2 v_lut(const double* tab, const int* idx)
+{
+    //vfloat64m1_t res = {tab[idx[0]], tab[idx[1]]};
+    return v_float64x2(vloxei64_v_f64m1(tab, vsll_vx_u64m1(vget_v_u64m2_u64m1(vwaddu_vx_u64m2(vle32_v_u32m1((uint32_t*)idx, 2), 0, 2), 0), 3, 2), 2));
+}
+inline v_float64x2 v_lut_pairs(const double* tab, const int* idx)
+{
+    return v_float64x2(vle64_v_f64m1(tab+idx[0], 2));
+}
+
+inline v_int32x4 v_lut(const int* tab, const v_int32x4& idxvec)
+{
+    /*int CV_DECL_ALIGNED(32) elems[4] =
+    {
+        tab[idxvec.val[0]],
+        tab[idxvec.val[1]],
+        tab[idxvec.val[2]],
+        tab[idxvec.val[3]]
+    };*/
+    return v_int32x4(vloxei32_v_i32m1(tab, vsll_vx_u32m1(vreinterpret_v_i32m1_u32m1(idxvec.val), 2, 4), 4));
+}
+
+inline v_uint32x4 v_lut(const unsigned* tab, const v_int32x4& idxvec)
+{
+    /*unsigned CV_DECL_ALIGNED(32) elems[4] =
+    {
+        tab[idxvec.val[0]],
+        tab[idxvec.val[1]],
+        tab[idxvec.val[2]],
+        tab[idxvec.val[3]]
+    };*/
+    return v_uint32x4(vloxei32_v_u32m1(tab, vsll_vx_u32m1(vreinterpret_v_i32m1_u32m1(idxvec.val), 2, 4), 4));
+}
+
+inline v_float32x4 v_lut(const float* tab, const v_int32x4& idxvec)
+{
+    /*float CV_DECL_ALIGNED(32) elems[4] =
+    {
+        tab[idxvec.val[0]],
+        tab[idxvec.val[1]],
+        tab[idxvec.val[2]],
+        tab[idxvec.val[3]]
+    };*/
+    return v_float32x4(vloxei32_v_f32m1(tab, vsll_vx_u32m1(vreinterpret_v_i32m1_u32m1(idxvec.val), 2, 4), 4));
+}
+inline v_float64x2 v_lut(const double* tab, const v_int32x4& idxvec)
+{
+    //vfloat64m1_t res = {tab[idxvec.val[0]], tab[idxvec.val[1]]};
+    return v_float64x2(vloxei64_v_f64m1(tab, vsll_vx_u64m1(vreinterpret_v_i64m1_u64m1(vget_v_i64m2_i64m1(vwadd_vx_i64m2(idxvec.val, 0, 2), 0)), 3, 2), 2));
+}
+inline void v_lut_deinterleave(const float* tab, const v_int32x4& idxvec, v_float32x4& x, v_float32x4& y)
+{
+    vint32m1_t index = vmul_vx_i32m1(idxvec.val, 4, 4);
+    //vint32m1_t index_y = vadd_vx_i32m1(index_x, 4, 4);
+
+    //x.val = vlxe_v_f32m1(tab, index_x, 4);
+    //y.val = vlxe_v_f32m1(tab, index_y, 4);
+    vloxseg2ei32_v_f32m1(&x.val, &y.val, tab, vreinterpret_v_i32m1_u32m1(index), 4);
+}
+
+inline void v_lut_deinterleave(const double* tab, const v_int32x4& idxvec, v_float64x2& x, v_float64x2& y)
+{
+    int CV_DECL_ALIGNED(32) idx[4];
+    v_store_aligned(idx, idxvec);
+
+    x = v_float64x2(tab[idx[0]], tab[idx[1]]);
+    y = v_float64x2(tab[idx[0]+1], tab[idx[1]+1]);
+}
+
+#define OPENCV_HAL_IMPL_RISCVV_PACKS(_Tp, _Tp2, _T2, num2, _T1, num, intrin, shr, _Type, elemsize) \
+inline v_##_Tp##x##num v_pack(const v_##_Tp2##x##num2& a, const v_##_Tp2##x##num2& b) \
+{ \
+    v##_Tp2##m2_t  tmp = vundefined_##_T2##m2();    \
+    tmp = vset_v_##_T2##m1_##_T2##m2(tmp, 0, a.val);    \
+    tmp = vset_v_##_T2##m1_##_T2##m2(tmp, 1, b.val);    \
+    return v_##_Tp##x##num(shr##_##_T1##m1(tmp, 0, num)); \
+}\
+template<int n> inline \
+v_##_Tp##x##num v_rshr_pack(const v_##_Tp2##x##num2& a, const v_##_Tp2##x##num2& b) \
+{ \
+    v##_Tp2##m2_t  tmp = vundefined_##_T2##m2();    \
+    tmp = vset_v_##_T2##m1_##_T2##m2(tmp, 0, a.val);    \
+    tmp = vset_v_##_T2##m1_##_T2##m2(tmp, 1, b.val);    \
+    return v_##_Tp##x##num(intrin##_##_T1##m1(tmp, n, num)); \
+}\
+inline void v_pack_store(_Type* ptr, const v_##_Tp2##x##num2& a) \
+{ \
+    v##_Tp2##m2_t tmp = vundefined_##_T2##m2();    \
+    tmp = vset_v_##_T2##m1_##_T2##m2(tmp, 0, a.val);    \
+    tmp = vset_v_##_T2##m1_##_T2##m2(tmp, 1, vmv_v_x_##_T2##m1(0, num2));    \
+    asm("" ::: "memory");                                       \
+    vse##elemsize##_v_##_T1##m1(ptr, shr##_##_T1##m1(tmp, 0, num), num2); \
+}\
+template<int n> inline \
+void v_rshr_pack_store(_Type* ptr, const v_##_Tp2##x##num2& a) \
+{ \
+    v##_Tp2##m2_t tmp = vundefined_##_T2##m2();    \
+    tmp = vset_v_##_T2##m1_##_T2##m2(tmp, 0, a.val);    \
+    tmp = vset_v_##_T2##m1_##_T2##m2(tmp, 1, vmv_v_x_##_T2##m1(0, num2));    \
+    vse##elemsize##_v_##_T1##m1(ptr, intrin##_##_T1##m1(tmp, n, num), num2); \
+}
+OPENCV_HAL_IMPL_RISCVV_PACKS(int8, int16, i16, 8, i8, 16, vnclip_wx, vnclip_wx, signed char, 8)
+OPENCV_HAL_IMPL_RISCVV_PACKS(int16, int32, i32, 4, i16, 8, vnclip_wx, vnclip_wx, signed short, 16)
+OPENCV_HAL_IMPL_RISCVV_PACKS(int32, int64, i64, 2, i32, 4, vnclip_wx, vnsra_wx, int, 32)
+OPENCV_HAL_IMPL_RISCVV_PACKS(uint8, uint16, u16, 8, u8, 16, vnclipu_wx, vnclipu_wx, unsigned char, 8)
+OPENCV_HAL_IMPL_RISCVV_PACKS(uint16, uint32, u32, 4, u16, 8, vnclipu_wx, vnclipu_wx, unsigned short, 16)
+OPENCV_HAL_IMPL_RISCVV_PACKS(uint32, uint64, u64, 2, u32, 4, vnclipu_wx, vnsrl_wx, unsigned int, 32)
+
+// pack boolean
+inline v_uint8x16 v_pack_b(const v_uint16x8& a, const v_uint16x8& b)
+{
+    vuint16m2_t tmp = vundefined_u16m2();    \
+    tmp = vset_v_u16m1_u16m2(tmp, 0, a.val);    \
+    tmp = vset_v_u16m1_u16m2(tmp, 1, b.val);    \
+    return v_uint8x16(vnsrl_wx_u8m1(tmp, 0, 16));
+}
+
+inline v_uint8x16 v_pack_b(const v_uint32x4& a, const v_uint32x4& b,
+                           const v_uint32x4& c, const v_uint32x4& d)
+{
+    vuint32m4_t vabcd = vundefined_u32m4();    \
+    vuint16m2_t v16 = vundefined_u16m2();    \
+    vabcd = vset_v_u32m1_u32m4(vabcd, 0, a.val);    \
+    vabcd = vset_v_u32m1_u32m4(vabcd, 1, b.val);    \
+    vabcd = vset_v_u32m1_u32m4(vabcd, 2, c.val);    \
+    vabcd = vset_v_u32m1_u32m4(vabcd, 3, d.val);    \
+    v16 = vnsrl_wx_u16m2(vabcd, 0, 16);
+    return v_uint8x16(vnsrl_wx_u8m1(v16, 0, 16));
+}
+
+inline v_uint8x16 v_pack_b(const v_uint64x2& a, const v_uint64x2& b, const v_uint64x2& c,
+                           const v_uint64x2& d, const v_uint64x2& e, const v_uint64x2& f,
+                           const v_uint64x2& g, const v_uint64x2& h)
+{
+    vuint64m8_t v64 = vundefined_u64m8();    \
+    vuint32m4_t v32 = vundefined_u32m4();    \
+    vuint16m2_t v16 = vundefined_u16m2();    \
+    v64 = vset_v_u64m1_u64m8(v64, 0, a.val);    \
+    v64 = vset_v_u64m1_u64m8(v64, 1, b.val);    \
+    v64 = vset_v_u64m1_u64m8(v64, 2, c.val);    \
+    v64 = vset_v_u64m1_u64m8(v64, 3, d.val);    \
+    v64 = vset_v_u64m1_u64m8(v64, 4, e.val);    \
+    v64 = vset_v_u64m1_u64m8(v64, 5, f.val);    \
+    v64 = vset_v_u64m1_u64m8(v64, 6, g.val);    \
+    v64 = vset_v_u64m1_u64m8(v64, 7, h.val);    \
+    v32 = vnsrl_wx_u32m4(v64, 0, 16);
+    v16 = vnsrl_wx_u16m2(v32, 0, 16);
+    return v_uint8x16(vnsrl_wx_u8m1(v16, 0, 16));
+}
+
+//inline v_uint8x16 v_pack_u(const v_int16x8& a, const v_int16x8& b) \
+//{ \
+//    int16xm2_u tmp;    \
+//    tmp.m1[0] = (vint16m1_t)a.val;    \
+//    tmp.m1[1] = (vint16m1_t)b.val;    \
+//    e8xm1_t mask = (e8xm1_t)vmsge_vx_e16xm2_i16m2(tmp.v, 0, 16);\
+//    return v_uint8x16(vnclipuvi_mask_u8m1_u16m2(vmv_v_x_u8m1(0, 16), (vuint16m2_t)tmp.v, 0, mask, 16));
+//}
+
+#define OPENCV_HAL_IMPL_RISCVV_PACK_U(tp1, num1, tp2, num2, _Tp) \
+inline v_uint##tp1##x##num1 v_pack_u(const v_int##tp2##x##num2& a, const v_int##tp2##x##num2& b) \
+{ \
+    vint##tp2##m2_t tmp = vundefined_##i##tp2##m2();    \
+    tmp = vset_v_##i##tp2##m1_##i##tp2##m2(tmp, 0, a.val);    \
+    tmp = vset_v_##i##tp2##m1_##i##tp2##m2(tmp, 1, b.val);    \
+    vint##tp2##m2_t val = vmax_vx_i##tp2##m2(tmp, 0, num1);\
+    return v_uint##tp1##x##num1(vnclipu_wx_u##tp1##m1(vreinterpret_v_i##tp2##m2_u##tp2##m2(val), 0, num1));    \
+} \
+inline void v_pack_u_store(_Tp* ptr, const v_int##tp2##x##num2& a) \
+{ \
+    vint##tp2##m2_t tmp = vundefined_##i##tp2##m2();    \
+    tmp = vset_v_##i##tp2##m1_##i##tp2##m2(tmp, 0, a.val);    \
+    vint##tp2##m2_t val = vmax_vx_i##tp2##m2(tmp, 0, num1);\
+    return vse##tp1##_v_u##tp1##m1(ptr, vnclipu_wx_u##tp1##m1(vreinterpret_v_i##tp2##m2_u##tp2##m2(val), 0, num1), num2);    \
+} \
+template<int n> inline \
+v_uint##tp1##x##num1 v_rshr_pack_u(const v_int##tp2##x##num2& a, const v_int##tp2##x##num2& b) \
+{ \
+    vint##tp2##m2_t tmp = vundefined_##i##tp2##m2();    \
+    tmp = vset_v_##i##tp2##m1_##i##tp2##m2(tmp, 0, a.val);    \
+    tmp = vset_v_##i##tp2##m1_##i##tp2##m2(tmp, 1, b.val);    \
+    vint##tp2##m2_t val = vmax_vx_i##tp2##m2(tmp, 0, num1);\
+    return v_uint##tp1##x##num1(vnclipu_wx_u##tp1##m1(vreinterpret_v_i##tp2##m2_u##tp2##m2(val), n, num1));    \
+} \
+template<int n> inline \
+void v_rshr_pack_u_store(_Tp* ptr, const v_int##tp2##x##num2& a) \
+{ \
+    vint##tp2##m2_t tmp = vundefined_##i##tp2##m2();    \
+    tmp = vset_v_##i##tp2##m1_##i##tp2##m2(tmp, 0, a.val);    \
+    vint##tp2##m2_t val_ = vmax_vx_i##tp2##m2(tmp, 0, num1);\
+    vuint##tp1##m1_t val = vnclipu_wx_u##tp1##m1(vreinterpret_v_i##tp2##m2_u##tp2##m2(val_), n, num1);    \
+    return vse##tp1##_v_u##tp1##m1(ptr, val, num2);\
+}
+OPENCV_HAL_IMPL_RISCVV_PACK_U(8, 16, 16, 8, unsigned char )
+OPENCV_HAL_IMPL_RISCVV_PACK_U(16, 8, 32, 4, unsigned short)
+
+
+// saturating multiply 8-bit, 16-bit
+#define OPENCV_HAL_IMPL_RISCVV_MUL_SAT(_Tpvec, num, mul, cvt)   \
+    inline _Tpvec v_mul(const _Tpvec& a, const _Tpvec& b)       \
+    {                                                           \
+        auto res = mul(a.val, b.val, num);                      \
+        return _Tpvec(cvt(res, 0, num));                        \
+    }
+
+OPENCV_HAL_IMPL_RISCVV_MUL_SAT(v_int8x16,  16, vwmul_vv_i16m2, vnclip_wx_i8m1)
+OPENCV_HAL_IMPL_RISCVV_MUL_SAT(v_uint8x16, 16, vwmulu_vv_u16m2, vnclipu_wx_u8m1)
+OPENCV_HAL_IMPL_RISCVV_MUL_SAT(v_int16x8,  32, vwmul_vv_i32m2, vnclip_wx_i16m1)
+OPENCV_HAL_IMPL_RISCVV_MUL_SAT(v_uint16x8, 32, vwmulu_vv_u32m2, vnclipu_wx_u16m1)
+
+
+static const signed char popCountTable[256] =
+{
+    0, 1, 1, 2, 1, 2, 2, 3, 1, 2, 2, 3, 2, 3, 3, 4,
+    1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5,
+    1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5,
+    2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6,
+    1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5,
+    2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6,
+    2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6,
+    3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, 7,
+    1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5,
+    2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6,
+    2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6,
+    3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, 7,
+    2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6,
+    3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, 7,
+    3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, 7,
+    4, 5, 5, 6, 5, 6, 6, 7, 5, 6, 6, 7, 6, 7, 7, 8,
+};
+
+inline vuint8m1_t vcnt_u8(vuint8m1_t val){
+#if __riscv_v == 7000
+    vuint8m1_t v0 = vand_vx_u8m1(val, 1, 16);
+    return vadd_vv_u8m1(vloxei8_v_u8m1((unsigned char*)popCountTable, vsrl_vx_u8m1(val, 1, 16), 16), v0, 16);
+#else
+    return vloxei8_v_u8m1((unsigned char*)popCountTable, val, 16);
+#endif
+}
+
+inline v_uint8x16
+v_popcount(const v_uint8x16& a)
+{
+    return v_uint8x16(vcnt_u8(a.val));
+}
+
+inline v_uint8x16
+v_popcount(const v_int8x16& a)
+{
+    return v_uint8x16(vcnt_u8(vreinterpret_v_i8m1_u8m1(a.val)));
+}
+
+inline v_uint16x8
+v_popcount(const v_uint16x8& a)
+{
+    vuint8m1_t tmp = vcnt_u8(vreinterpret_v_u16m1_u8m1(a.val));
+    vuint8m1_t seq = vid_v_u8m1(8);
+    vuint8m1_t index = vsll_vx_u8m1(seq, 1, 8);
+    return v_uint16x8(vget_v_u16m2_u16m1(vwaddu_vv_u16m2(vrgather_vv_u8m1(tmp, index, 8), vrgather_vv_u8m1(tmp, vadd_vx_u8m1(index, 1, 8), 8), 8), 0));
+}
+
+inline v_uint16x8
+v_popcount(const v_int16x8& a)
+{
+    vuint8m1_t tmp = vcnt_u8(vreinterpret_v_i8m1_u8m1(vreinterpret_v_i16m1_i8m1(a.val)));
+    vuint8m1_t seq = vid_v_u8m1(8);
+    vuint8m1_t index = vsll_vx_u8m1(seq, 1, 8);
+    return v_uint16x8(vget_v_u16m2_u16m1(vwaddu_vv_u16m2(vrgather_vv_u8m1(tmp, index, 8), vrgather_vv_u8m1(tmp, vadd_vx_u8m1(index, 1, 8), 8), 8), 0));
+}
+
+inline v_uint32x4
+v_popcount(const v_uint32x4& a)
+{
+    vuint8m1_t tmp = vcnt_u8(vreinterpret_v_u32m1_u8m1(a.val));
+    vuint8m1_t seq = vid_v_u8m1(8);
+    vuint8m1_t index = vsll_vx_u8m1(seq, 1, 8);
+    vuint8m1_t sum = vadd_vv_u8m1(vrgather_vv_u8m1(tmp, index, 8), vrgather_vv_u8m1(tmp, vadd_vx_u8m1(index, 1, 8), 8), 8);
+    return v_uint32x4(vget_v_u32m4_u32m1(vwaddu_vx_u32m4(vwaddu_vv_u16m2(vrgather_vv_u8m1(sum, index, 4), vrgather_vv_u8m1(sum, vadd_vx_u8m1(index, 1, 4), 4), 4), 0, 4), 0));
+}
+
+inline v_uint32x4
+v_popcount(const v_int32x4& a)
+{
+    vuint8m1_t tmp = vcnt_u8(vreinterpret_v_i8m1_u8m1(vreinterpret_v_i32m1_i8m1(a.val)));
+    vuint8m1_t seq = vid_v_u8m1(8);
+    vuint8m1_t index = vsll_vx_u8m1(seq, 1, 8);
+    vuint8m1_t sum = vadd_vv_u8m1(vrgather_vv_u8m1(tmp, index, 8), vrgather_vv_u8m1(tmp, vadd_vx_u8m1(index, 1, 8), 8), 8);
+    return v_uint32x4(vget_v_u32m4_u32m1(vwaddu_vx_u32m4(vwaddu_vv_u16m2(vrgather_vv_u8m1(sum, index, 4), vrgather_vv_u8m1(sum, vadd_vx_u8m1(index, 1, 4), 4), 4), 0, 4), 0));
+}
+
+inline v_uint64x2
+v_popcount(const v_uint64x2& a)
+{
+    vuint8m1_t tmp = vcnt_u8(vreinterpret_v_u64m1_u8m1(a.val));
+    vuint16m2_t tmp16 = vwaddu_vx_u16m2(tmp, 0, 16);
+    vuint16m1_t res1 = vundefined_u16m1();
+    vuint16m1_t res2 = vundefined_u16m1();
+    res1 = vredsum_vs_u16m1_u16m1(res1, vget_v_u16m2_u16m1(tmp16, 0), vmv_v_x_u16m1(0, 8), 8);
+    res2 = vredsum_vs_u16m1_u16m1(res2, vget_v_u16m2_u16m1(tmp16, 1), vmv_v_x_u16m1(0, 8), 8);
+    return v_uint64x2((unsigned long)vmv_x_s_u16m1_u16(res1), (unsigned long)vmv_x_s_u16m1_u16(res2));
+}
+
+inline v_uint64x2
+v_popcount(const v_int64x2& a)
+{
+    vuint8m1_t tmp = vcnt_u8(vreinterpret_v_i8m1_u8m1(vreinterpret_v_i64m1_i8m1(a.val)));
+    vuint16m2_t tmp16 = vwaddu_vx_u16m2(tmp, 0, 16);
+    vuint16m1_t res1 = vundefined_u16m1(), res2 = vundefined_u16m1();
+    res1 = vredsum_vs_u16m1_u16m1(res1, vget_v_u16m2_u16m1(tmp16, 0), vmv_v_x_u16m1(0, 8), 8);
+    res2 = vredsum_vs_u16m1_u16m1(res2, vget_v_u16m2_u16m1(tmp16, 1), vmv_v_x_u16m1(0, 8), 8);
+    return v_uint64x2((unsigned long)vmv_x_s_u16m1_u16(res1), (unsigned long)vmv_x_s_u16m1_u16(res2));
+}
+
+#define SMASK 1, 2, 4, 8, 16, 32, 64, 128
+inline int v_signmask(const v_uint8x16& a)
+{
+    vuint16m1_t res = vundefined_u16m1();
+    vuint8m1_t id = vid_v_u8m1(16);
+    vuint16m2_t num = vsll_vv_u16m2(vmv_v_x_u16m2(1, 16), vwaddu_vx_u16m2(id, 0, 16), 16);
+    vuint8m1_t t0  = vsrl_vx_u8m1(a.val, 7, 16);
+    vbool8_t mask = vmseq_vx_u8m1_b8(t0, 1, 16);
+    res = vredsum_vs_u16m2_u16m1_m(mask, res, num, vmv_v_x_u16m1(0, 8), 16);
+    return vmv_x_s_u16m1_u16(res);
+}
+inline int v_signmask(const v_int8x16& a)
+{
+    vuint16m1_t res = vundefined_u16m1();
+    vuint8m1_t id = vid_v_u8m1(16);
+    vuint16m2_t num = vsll_vv_u16m2(vmv_v_x_u16m2(1, 16), vwaddu_vx_u16m2(id, 0, 16), 16);
+    vbool8_t mask = vmslt_vx_i8m1_b8(a.val, 0, 16);
+    res = vredsum_vs_u16m2_u16m1_m(mask, res, num, vmv_v_x_u16m1(0, 8), 16);
+    return vmv_x_s_u16m1_u16(res);
+}
+
+inline int v_signmask(const v_int16x8& a)
+{
+    vuint16m1_t res = vundefined_u16m1();
+    vuint16m1_t id = vid_v_u16m1(8);
+    vuint16m1_t num = vsll_vv_u16m1(vmv_v_x_u16m1(1, 8), id, 8);
+    vbool16_t mask = vmslt_vx_i16m1_b16(a.val, 0, 8);
+    res = vredsum_vs_u16m1_u16m1_m(mask, res, num, vmv_v_x_u16m1(0, 8), 16);
+    return vmv_x_s_u16m1_u16(res);
+}
+inline int v_signmask(const v_uint16x8& a)
+{
+    vuint16m1_t res = vundefined_u16m1();
+    vuint16m1_t id = vid_v_u16m1(8);
+    vuint16m1_t num = vsll_vv_u16m1(vmv_v_x_u16m1(1, 8), id, 8);
+    vuint16m1_t t0  = vsrl_vx_u16m1(a.val, 15, 8);
+    vbool16_t mask = vmseq_vx_u16m1_b16(t0, 1, 8);
+    res = vredsum_vs_u16m1_u16m1_m(mask, res, num, vmv_v_x_u16m1(0, 8), 8);
+    return vmv_x_s_u16m1_u16(res);
+}
+inline int v_signmask(const v_int32x4& a)
+{
+    vuint32m1_t res = vundefined_u32m1();
+    vuint32m1_t id = vid_v_u32m1(4);
+    vuint32m1_t num = vsll_vv_u32m1(vmv_v_x_u32m1(1, 4), id, 4);
+    vbool32_t mask = vmslt_vx_i32m1_b32(a.val, 0, 4);
+    res = vredsum_vs_u32m1_u32m1_m(mask, res, num, vmv_v_x_u32m1(0, 4), 4);
+    return vmv_x_s_u32m1_u32(res);
+}
+inline int v_signmask(const v_uint32x4& a)
+{
+    vuint32m1_t res = vundefined_u32m1();
+    vuint32m1_t id = vid_v_u32m1(4);
+    vuint32m1_t num = vsll_vv_u32m1(vmv_v_x_u32m1(1, 4), id, 4);
+    vuint32m1_t t0  = vsrl_vx_u32m1(a.val, 31, 4);
+    vbool32_t mask = vmseq_vx_u32m1_b32(t0, 1, 4);
+    res = vredsum_vs_u32m1_u32m1_m(mask, res, num, vmv_v_x_u32m1(0, 4), 4);
+    return vmv_x_s_u32m1_u32(res);
+}
+inline int v_signmask(const v_uint64x2& a)
+{
+    vuint64m1_t res = vundefined_u64m1();
+    vuint64m1_t id = vid_v_u64m1(2);
+    vuint64m1_t num = vsll_vv_u64m1(vmv_v_x_u64m1(1, 2), id, 2);
+    vuint64m1_t t0  = vsrl_vx_u64m1(a.val, 63, 2);
+    vbool64_t mask = vmseq_vx_u64m1_b64(t0, 1, 2);
+    res = vredsum_vs_u64m1_u64m1_m(mask, res, num, vmv_v_x_u64m1(0, 2), 2);
+    return vmv_x_s_u64m1_u64(res);
+}
+inline int v_signmask(const v_int64x2& a)
+{ return v_signmask(v_reinterpret_as_u64(a)); }
+inline int v_signmask(const v_float64x2& a)
+{ return v_signmask(v_reinterpret_as_u64(a)); }
+inline int v_signmask(const v_float32x4& a)
+{
+    return v_signmask(v_reinterpret_as_u32(a));
+    /*
+    vuint32m1_t res;
+    vuint32m1_t id = vid_v_u32m1(4);
+    vuint32m1_t num = vsll_vv_u32m1(vmv_v_x_u32m1(1, 4), id, 4);
+    vbool32_t mask = vmflt_vf_f32m1_b32(a.val, 0, 4);
+    res = vredsum_vs_u32m1_u32m1_m(mask, res, num, vmv_v_x_u32m1(0, 4), 4);
+    return vmv_x_s_u32m1_u32(res);*/
+}
+
+inline int v_scan_forward(const v_int8x16& a) {
+int val = v_signmask(a);
+if(val==0) return 0;
+else return trailingZeros32(val); }
+inline int v_scan_forward(const v_uint8x16& a) {
+int val = v_signmask(a);
+if(val==0) return 0;
+else return trailingZeros32(val); }
+inline int v_scan_forward(const v_int16x8& a) {
+int val = v_signmask(a);
+if(val==0) return 0;
+else return trailingZeros32(val); }
+inline int v_scan_forward(const v_uint16x8& a) {
+int val = v_signmask(a);
+if(val==0) return 0;
+else return trailingZeros32(val); }
+inline int v_scan_forward(const v_int32x4& a) {
+int val = v_signmask(a);
+if(val==0) return 0;
+else return trailingZeros32(val); }
+inline int v_scan_forward(const v_uint32x4& a) {
+int val = v_signmask(a);
+if(val==0) return 0;
+else return trailingZeros32(val); }
+inline int v_scan_forward(const v_float32x4& a) {
+int val = v_signmask(a);
+if(val==0) return 0;
+else return trailingZeros32(val); }
+inline int v_scan_forward(const v_int64x2& a) {
+int val = v_signmask(a);
+if(val==0) return 0;
+else return trailingZeros32(val); }
+inline int v_scan_forward(const v_uint64x2& a) {
+int val = v_signmask(a);
+if(val==0) return 0;
+else return trailingZeros32(val); }
+
+#define OPENCV_HAL_IMPL_RISCVV_CHECK_ALLANY(_Tpvec, suffix, _T, shift, num, mask_b) \
+inline bool v_check_all(const v_##_Tpvec& a) \
+{ \
+    suffix##m1_t v0 = vsrl_vx_##_T(vnot_v_##_T(a.val, num), shift, num); \
+    return (vcpop_m_##mask_b(vmseq_vx_##_T##_##mask_b(v0, 1, num), num)) == 0; \
+} \
+inline bool v_check_any(const v_##_Tpvec& a) \
+{ \
+    suffix##m1_t v0 = vsrl_vx_##_T(a.val, shift, num); \
+    return (vcpop_m_##mask_b(vmseq_vx_##_T##_##mask_b(v0, 1, num), num)) != 0; \
+}
+
+OPENCV_HAL_IMPL_RISCVV_CHECK_ALLANY(uint8x16, vuint8,  u8m1, 7, 16, b8)
+OPENCV_HAL_IMPL_RISCVV_CHECK_ALLANY(uint16x8, vuint16, u16m1, 15, 8, b16)
+OPENCV_HAL_IMPL_RISCVV_CHECK_ALLANY(uint32x4, vuint32, u32m1, 31, 4, b32)
+OPENCV_HAL_IMPL_RISCVV_CHECK_ALLANY(uint64x2, vuint64, u64m1, 63, 2, b64)
+
+inline bool v_check_all(const v_int8x16& a)
+{ return v_check_all(v_reinterpret_as_u8(a)); }
+inline bool v_check_all(const v_int16x8& a)
+{ return v_check_all(v_reinterpret_as_u16(a)); }
+inline bool v_check_all(const v_int32x4& a)
+{ return v_check_all(v_reinterpret_as_u32(a)); }
+inline bool v_check_all(const v_float32x4& a)
+{ return v_check_all(v_reinterpret_as_u32(a)); }
+inline bool v_check_all(const v_int64x2& a)
+{ return v_check_all(v_reinterpret_as_u64(a)); }
+inline bool v_check_all(const v_float64x2& a)
+{ return v_check_all(v_reinterpret_as_u64(a)); }
+
+inline bool v_check_any(const v_int8x16& a)
+{ return v_check_any(v_reinterpret_as_u8(a)); }
+inline bool v_check_any(const v_int16x8& a)
+{ return v_check_any(v_reinterpret_as_u16(a)); }
+inline bool v_check_any(const v_int32x4& a)
+{ return v_check_any(v_reinterpret_as_u32(a)); }
+inline bool v_check_any(const v_float32x4& a)
+{ return v_check_any(v_reinterpret_as_u32(a)); }
+inline bool v_check_any(const v_int64x2& a)
+{ return v_check_any(v_reinterpret_as_u64(a)); }
+inline bool v_check_any(const v_float64x2& a)
+{ return v_check_any(v_reinterpret_as_u64(a)); }
+
+#define OPENCV_HAL_IMPL_RISCVV_SELECT(_Tpvec, suffix, _Tpvec2, num, mask_func) \
+inline _Tpvec v_select(const _Tpvec& mask, const _Tpvec& a, const _Tpvec& b) \
+{ \
+    return _Tpvec(vmerge_vvm_##suffix(mask_func(mask.val, 0, num), b.val, a.val, num)); \
+}
+
+OPENCV_HAL_IMPL_RISCVV_SELECT(v_int8x16,  i8m1, vbool8_t, 16, vmsne_vx_i8m1_b8)
+OPENCV_HAL_IMPL_RISCVV_SELECT(v_int16x8,  i16m1, vbool16_t, 8, vmsne_vx_i16m1_b16)
+OPENCV_HAL_IMPL_RISCVV_SELECT(v_int32x4,  i32m1, vbool32_t, 4, vmsne_vx_i32m1_b32)
+OPENCV_HAL_IMPL_RISCVV_SELECT(v_uint8x16, u8m1, vbool8_t, 16, vmsne_vx_u8m1_b8)
+OPENCV_HAL_IMPL_RISCVV_SELECT(v_uint16x8, u16m1, vbool16_t, 8, vmsne_vx_u16m1_b16)
+OPENCV_HAL_IMPL_RISCVV_SELECT(v_uint32x4, u32m1, vbool32_t, 4, vmsne_vx_u32m1_b32)
+inline v_float32x4 v_select(const v_float32x4& mask, const v_float32x4& a, const v_float32x4& b)
+{
+    return v_float32x4(vmerge_vvm_f32m1(vmfne_vf_f32m1_b32(mask.val, 0, 4), b.val, a.val, 4));
+}
+inline v_float64x2 v_select(const v_float64x2& mask, const v_float64x2& a, const v_float64x2& b)
+{
+    return v_float64x2(vmerge_vvm_f64m1(vmfne_vf_f64m1_b64(mask.val, 0, 2), b.val, a.val, 2));
+}
+
+#define OPENCV_HAL_IMPL_RISCVV_EXPAND(add, _Tpvec, _Tpwvec, _Tp, _Tp1, num1, _Tp2, num2, _T1, _T2, num3) \
+inline void v_expand(const _Tpvec& a, v_##_Tpwvec& b0, v_##_Tpwvec& b1) \
+{ \
+    _T1##_t b = vw##add##_vx_##_Tp2##m2(a.val, 0, num1);    \
+    b0.val = vget_v_##_Tp2##m2_##_Tp2##m1(b, 0);  \
+    b1.val = vget_v_##_Tp2##m2_##_Tp2##m1(b, 1);  \
+} \
+inline v_##_Tpwvec v_expand_low(const _Tpvec& a) \
+{ \
+    _T1##_t b = vw##add##_vx_##_Tp2##m2(a.val, 0, num2);    \
+    return v_##_Tpwvec(vget_v_##_Tp2##m2_##_Tp2##m1(b, 0)); \
+} \
+inline v_##_Tpwvec v_expand_high(const _Tpvec& a) \
+{ \
+    _T1##_t b = vw##add##_vx_##_Tp2##m2(a.val, 0, num1);    \
+    return v_##_Tpwvec(vget_v_##_Tp2##m2_##_Tp2##m1(b, 1)); \
+} \
+inline v_##_Tpwvec v_load_expand(const _Tp* ptr) \
+{ \
+    _T2##_t val = vle##num3##_v_##_Tp1(ptr, num2);    \
+    _T1##_t b = vw##add##_vx_##_Tp2##m2(val, 0, num2);    \
+    return v_##_Tpwvec(vget_v_##_Tp2##m2_##_Tp2##m1(b, 0)); \
+}
+
+OPENCV_HAL_IMPL_RISCVV_EXPAND(addu, v_uint8x16, uint16x8, uchar, u8m1, 16, u16, 8, vuint16m2, vuint8m1, 8)
+OPENCV_HAL_IMPL_RISCVV_EXPAND(addu, v_uint16x8, uint32x4, ushort,  u16m1, 8, u32, 4, vuint32m2, vuint16m1, 16)
+OPENCV_HAL_IMPL_RISCVV_EXPAND(addu, v_uint32x4, uint64x2, uint,  u32m1, 4, u64, 2, vuint64m2, vuint32m1, 32)
+OPENCV_HAL_IMPL_RISCVV_EXPAND(add, v_int8x16, int16x8, schar,  i8m1, 16, i16, 8, vint16m2, vint8m1, 8)
+OPENCV_HAL_IMPL_RISCVV_EXPAND(add, v_int16x8, int32x4, short,  i16m1, 8, i32, 4, vint32m2, vint16m1, 16)
+OPENCV_HAL_IMPL_RISCVV_EXPAND(add, v_int32x4, int64x2, int,  i32m1, 4, i64, 2, vint64m2, vint32m1, 32)
+
+inline v_uint32x4 v_load_expand_q(const uchar* ptr)
+{
+    vuint16m2_t b = vundefined_u16m2();
+    vuint32m2_t c = vundefined_u32m2();
+    vuint8m1_t val = vle8_v_u8m1(ptr, 4);    \
+    b = vwaddu_vv_u16m2(val, vmv_v_x_u8m1(0, 4), 4);    \
+    c = vwaddu_vv_u32m2(vget_v_u16m2_u16m1(b, 0), vmv_v_x_u16m1(0, 4), 4);    \
+    return v_uint32x4(vget_v_u32m2_u32m1(c, 0));
+}
+
+inline v_int32x4 v_load_expand_q(const schar* ptr)
+{
+    vint16m2_t b = vundefined_i16m2();
+    vint32m2_t c = vundefined_i32m2();
+    vint8m1_t val = vle8_v_i8m1(ptr, 4);    \
+    b = vwadd_vv_i16m2(val, vmv_v_x_i8m1(0, 4), 4);    \
+    c = vwadd_vv_i32m2(vget_v_i16m2_i16m1(b, 0), vmv_v_x_i16m1(0, 4), 4);    \
+    return v_int32x4(vget_v_i32m2_i32m1(c, 0));
+}
+#define VITL_16 {0x11011000, 0x13031202, 0x15051404, 0x17071606, 0x19091808, 0x1B0B1A0A, 0x1D0D1C0C, 0x1F0F1E0E}
+#define VITL_8 {0x00080000, 0x00090001, 0x000A0002, 0x000B0003, 0x000C0004, 0x000D0005, 0x000E0006, 0x000F0007}
+#define VITL_4 {0x00000000, 0x00000004, 0x00000001, 0x00000005, 0x00000002, 0x00000006, 0x00000003, 0x00000007}
+#define VITL_2 {0, 0, 2, 0, 1, 0, 3, 0}
+
+#define OPENCV_HAL_IMPL_RISCVV_UNPACKS(_Tpvec, _Tp, _T, _UTp, _UT, num, num2, len, numh, refunc) \
+inline void v_zip(const v_##_Tpvec& a0, const v_##_Tpvec& a1, v_##_Tpvec& b0, v_##_Tpvec& b1) \
+{ \
+    v##_Tp##m2_t tmp = vundefined_##_T##m2();\
+    tmp = vset_v_##_T##m1_##_T##m2(tmp, 0, a0.val); \
+    tmp = vset_v_##_T##m1_##_T##m2(tmp, 1, a1.val); \
+    unsigned mdata[] = VITL_##num; \
+    vuint32m2_t mask = vle32_v_u32m2(mdata, 8);    \
+    tmp = (v##_Tp##m2_t)vrgather_vv_##_T##m2((v##_Tp##m2_t)tmp, refunc(mask), num2);    \
+    b0.val = vget_v_##_T##m2_##_T##m1(tmp, 0); \
+    b1.val = vget_v_##_T##m2_##_T##m1(tmp, 1); \
+} \
+inline v_##_Tpvec v_combine_low(const v_##_Tpvec& a, const v_##_Tpvec& b) \
+{ \
+    v##_Tp##m1_t b0 = vslideup_vx_##_T##m1_m(vmset_m_##len(num), a.val, b.val, numh, num);    \
+    return v_##_Tpvec(b0);\
+} \
+inline v_##_Tpvec v_combine_high(const v_##_Tpvec& a, const v_##_Tpvec& b) \
+{ \
+    v##_Tp##m1_t b0 = vundefined_##_T##m1(); \
+    v##_Tp##m1_t a0 = vundefined_##_T##m1(); \
+    v##_Tp##m1_t b1 = vundefined_##_T##m1(); \
+    b0 = vslidedown_vx_##_T##m1(b0, b.val, numh, num);    \
+    a0 = vslidedown_vx_##_T##m1(a0, a.val, numh, num);    \
+    b1 = vslideup_vx_##_T##m1_m(vmset_m_##len(num), a0, b0, numh, num);    \
+    return v_##_Tpvec(b1);\
+} \
+inline void v_recombine(const v_##_Tpvec& a, const v_##_Tpvec& b, v_##_Tpvec& c, v_##_Tpvec& d) \
+{ \
+    v##_Tp##m1_t b0 = vundefined_##_T##m1(); \
+    v##_Tp##m1_t a0 = vundefined_##_T##m1(); \
+    c.val = vslideup_vx_##_T##m1_m(vmset_m_##len(num), a.val, b.val, numh, num);    \
+    b0 = vslidedown_vx_##_T##m1(b0, b.val, numh, num);    \
+    a0 = vslidedown_vx_##_T##m1(a0, a.val, numh, num);    \
+    d.val = vslideup_vx_##_T##m1_m(vmset_m_##len(num), a0, b0, numh, num);    \
+}
+
+OPENCV_HAL_IMPL_RISCVV_UNPACKS(uint8x16, uint8, u8, uint8, u8, 16, 32, b8, 8, vreinterpret_v_u32m2_u8m2)
+OPENCV_HAL_IMPL_RISCVV_UNPACKS(int8x16, int8, i8, uint8, u8, 16, 32, b8, 8, vreinterpret_v_u32m2_u8m2)
+OPENCV_HAL_IMPL_RISCVV_UNPACKS(uint16x8, uint16, u16, uint16, u16, 8, 16, b16, 4, vreinterpret_v_u32m2_u16m2)
+OPENCV_HAL_IMPL_RISCVV_UNPACKS(int16x8, int16, i16, uint16, u16, 8, 16, b16, 4, vreinterpret_v_u32m2_u16m2)
+OPENCV_HAL_IMPL_RISCVV_UNPACKS(uint32x4, uint32, u32, uint32, u32, 4, 8, b32, 2,)
+OPENCV_HAL_IMPL_RISCVV_UNPACKS(int32x4, int32, i32, uint32, u32, 4, 8, b32, 2,)
+OPENCV_HAL_IMPL_RISCVV_UNPACKS(float32x4, float32, f32, uint32, u32, 4, 8, b32, 2,)
+OPENCV_HAL_IMPL_RISCVV_UNPACKS(float64x2, float64, f64, uint64, u64, 2, 4, b64, 1, vreinterpret_v_u32m2_u64m2)
+
+inline v_uint8x16 v_reverse(const v_uint8x16 &a)
+{
+    return v_uint8x16(vrgather_vv_u8m1(a.val, vrsub_vx_u8m1(vid_v_u8m1(16), 15, 16), 16));
+}
+inline v_int8x16 v_reverse(const v_int8x16 &a)
+{
+    return v_int8x16(vrgather_vv_i8m1(a.val, vrsub_vx_u8m1(vid_v_u8m1(16), 15, 16), 16));
+}
+
+inline v_uint16x8 v_reverse(const v_uint16x8 &a)
+{
+    return v_uint16x8(vrgather_vv_u16m1(a.val, vrsub_vx_u16m1(vid_v_u16m1(8), 7, 8), 8));
+}
+
+inline v_int16x8 v_reverse(const v_int16x8 &a)
+{
+    return v_int16x8(vrgather_vv_i16m1(a.val, vrsub_vx_u16m1(vid_v_u16m1(8), 7, 8), 8));
+}
+inline v_uint32x4 v_reverse(const v_uint32x4 &a)
+{
+    return v_uint32x4(vrgather_vv_u32m1(a.val, vrsub_vx_u32m1(vid_v_u32m1(4), 3, 4), 4));
+}
+
+inline v_int32x4 v_reverse(const v_int32x4 &a)
+{
+    return v_int32x4(vrgather_vv_i32m1(a.val, vrsub_vx_u32m1(vid_v_u32m1(4), 3, 4), 4));
+}
+
+inline v_float32x4 v_reverse(const v_float32x4 &a)
+{ return v_reinterpret_as_f32(v_reverse(v_reinterpret_as_u32(a))); }
+
+inline v_uint64x2 v_reverse(const v_uint64x2 &a)
+{
+    return v_uint64x2(vrgather_vv_u64m1(a.val, vrsub_vx_u64m1(vid_v_u64m1(2), 1, 2), 2));
+}
+
+inline v_int64x2 v_reverse(const v_int64x2 &a)
+{
+    return v_int64x2(vrgather_vv_i64m1(a.val, vrsub_vx_u64m1(vid_v_u64m1(2), 1, 2), 2));
+}
+
+inline v_float64x2 v_reverse(const v_float64x2 &a)
+{
+    return v_float64x2(vrgather_vv_f64m1(a.val, vrsub_vx_u64m1(vid_v_u64m1(2), 1, 2), 2));
+}
+
+#define OPENCV_HAL_IMPL_RISCVV_EXTRACT(_Tpvec, suffix, size) \
+template <int n> \
+inline _Tpvec v_extract(const _Tpvec& a, const _Tpvec& b) \
+{ return v_rotate_right<n>(a, b);}
+OPENCV_HAL_IMPL_RISCVV_EXTRACT(v_uint8x16, u8, 0)
+OPENCV_HAL_IMPL_RISCVV_EXTRACT(v_int8x16, s8, 0)
+OPENCV_HAL_IMPL_RISCVV_EXTRACT(v_uint16x8, u16, 1)
+OPENCV_HAL_IMPL_RISCVV_EXTRACT(v_int16x8, s16, 1)
+OPENCV_HAL_IMPL_RISCVV_EXTRACT(v_uint32x4, u32, 2)
+OPENCV_HAL_IMPL_RISCVV_EXTRACT(v_int32x4, s32, 2)
+OPENCV_HAL_IMPL_RISCVV_EXTRACT(v_uint64x2, u64, 3)
+OPENCV_HAL_IMPL_RISCVV_EXTRACT(v_int64x2, s64, 3)
+OPENCV_HAL_IMPL_RISCVV_EXTRACT(v_float32x4, f32, 2)
+OPENCV_HAL_IMPL_RISCVV_EXTRACT(v_float64x2, f64, 3)
+
+
+#define OPENCV_HAL_IMPL_RISCVV_EXTRACT_N(_Tpvec, _Tp, suffix, vtype, _vtype, num, mvfunc) \
+template<int i> inline _Tp v_extract_n(_Tpvec v) { vtype tmp = vundefined_##_vtype(); return mvfunc(vslidedown_vx_##_vtype(tmp, v.val, i, num)); }
+
+OPENCV_HAL_IMPL_RISCVV_EXTRACT_N(v_uint8x16, uchar, u8, vuint8m1_t, u8m1, 16, vmv_x_s_u8m1_u8)
+OPENCV_HAL_IMPL_RISCVV_EXTRACT_N(v_int8x16, schar, s8, vint8m1_t, i8m1, 16, vmv_x_s_i8m1_i8)
+OPENCV_HAL_IMPL_RISCVV_EXTRACT_N(v_uint16x8, ushort, u16, vuint16m1_t, u16m1, 8, vmv_x_s_u16m1_u16)
+OPENCV_HAL_IMPL_RISCVV_EXTRACT_N(v_int16x8, short, s16, vint16m1_t, i16m1, 8, vmv_x_s_i16m1_i16)
+OPENCV_HAL_IMPL_RISCVV_EXTRACT_N(v_uint32x4, uint, u32, vuint32m1_t, u32m1, 4, vmv_x_s_u32m1_u32)
+OPENCV_HAL_IMPL_RISCVV_EXTRACT_N(v_int32x4, int, s32, vint32m1_t, i32m1, 4, vmv_x_s_i32m1_i32)
+OPENCV_HAL_IMPL_RISCVV_EXTRACT_N(v_uint64x2, uint64, u64, vuint64m1_t, u64m1, 2, vmv_x_s_u64m1_u64)
+OPENCV_HAL_IMPL_RISCVV_EXTRACT_N(v_int64x2, int64, s64, vint64m1_t, i64m1, 2, vmv_x_s_i64m1_i64)
+OPENCV_HAL_IMPL_RISCVV_EXTRACT_N(v_float32x4, float, f32, vfloat32m1_t, f32m1, 4, vfmv_f_s_f32m1_f32)
+OPENCV_HAL_IMPL_RISCVV_EXTRACT_N(v_float64x2, double, f64, vfloat64m1_t, f64m1, 2, vfmv_f_s_f64m1_f64)
+
+#define OPENCV_HAL_IMPL_RISCVV_BROADCAST(_Tpvec, _Tp, num) \
+template<int i> inline _Tpvec v_broadcast_element(_Tpvec v) { return _Tpvec(vrgather_vx_##_Tp##m1(v.val, i, num)); }
+
+OPENCV_HAL_IMPL_RISCVV_BROADCAST(v_uint8x16, u8, 16)
+OPENCV_HAL_IMPL_RISCVV_BROADCAST(v_int8x16, i8, 16)
+OPENCV_HAL_IMPL_RISCVV_BROADCAST(v_uint16x8, u16, 8)
+OPENCV_HAL_IMPL_RISCVV_BROADCAST(v_int16x8, i16, 8)
+OPENCV_HAL_IMPL_RISCVV_BROADCAST(v_uint32x4, u32, 4)
+OPENCV_HAL_IMPL_RISCVV_BROADCAST(v_int32x4, i32, 4)
+OPENCV_HAL_IMPL_RISCVV_BROADCAST(v_uint64x2, u64, 2)
+OPENCV_HAL_IMPL_RISCVV_BROADCAST(v_int64x2, i64, 2)
+OPENCV_HAL_IMPL_RISCVV_BROADCAST(v_float32x4, f32, 4)
+
+inline void __builtin_riscv_fsrm(int val)
+{
+    asm("csrw frm, %0\n\t"
+        :
+        :"r"(val));
+    return;
+}
+
+inline void barrier1(void *arg) {
+  __asm__ __volatile__("" : : "r" (arg) : "memory");
+}
+
+inline v_int32x4 v_round(const v_float32x4& a)
+{
+    __builtin_riscv_fsrm(0);
+    vint32m1_t nan = vand_vx_i32m1(vreinterpret_v_f32m1_i32m1(a.val), 0x7f800000, 4);
+    barrier1(&nan);
+    vbool32_t mask = vmsne_vx_i32m1_b32(nan, 0x7f800000, 4);
+    vint32m1_t val = vfcvt_x_f_v_i32m1_m(mask, vmv_v_x_i32m1(0, 4), a.val, 4);
+    __builtin_riscv_fsrm(0);
+    return v_int32x4(val);
+}
+inline v_int32x4 v_floor(const v_float32x4& a)
+{
+    __builtin_riscv_fsrm(2);
+    vint32m1_t nan = vand_vx_i32m1(vreinterpret_v_f32m1_i32m1(a.val), 0x7f800000, 4);
+    barrier1(&nan);
+    vbool32_t mask = vmsne_vx_i32m1_b32(nan, 0x7f800000, 4);
+    vint32m1_t val = vfcvt_x_f_v_i32m1_m(mask, vmv_v_x_i32m1(0, 4), a.val, 4);
+    __builtin_riscv_fsrm(0);
+    return v_int32x4(val);
+}
+
+inline v_int32x4 v_ceil(const v_float32x4& a)
+{
+    __builtin_riscv_fsrm(3);
+    vint32m1_t nan = vand_vx_i32m1(vreinterpret_v_f32m1_i32m1(a.val), 0x7f800000, 4);
+    barrier1(&nan);
+    vbool32_t mask = vmsne_vx_i32m1_b32(nan, 0x7f800000, 4);
+    vint32m1_t val = vfcvt_x_f_v_i32m1_m(mask, vmv_v_x_i32m1(0, 4), a.val, 4);
+    __builtin_riscv_fsrm(0);
+    return v_int32x4(val);
+}
+
+inline v_int32x4 v_trunc(const v_float32x4& a)
+{
+    __builtin_riscv_fsrm(1);
+    vint32m1_t nan = vand_vx_i32m1(vreinterpret_v_f32m1_i32m1(a.val), 0x7f800000, 4);
+    barrier1(&nan);
+    vbool32_t mask = vmsne_vx_i32m1_b32(nan, 0x7f800000, 4);
+    vint32m1_t val = vfcvt_x_f_v_i32m1_m(mask, vmv_v_x_i32m1(0, 4), a.val, 4);
+    __builtin_riscv_fsrm(0);
+    return v_int32x4(val);
+}
+
+inline v_int32x4 v_round(const v_float64x2& a)
+{
+    __builtin_riscv_fsrm(0);
+    vfloat64m2_t _val = vundefined_f64m2();
+    _val = vset_v_f64m1_f64m2(_val, 0, a.val);
+    //_val = vset_f64m2(_val, 1, a.val);
+    _val = vset_v_f64m1_f64m2(_val, 1, vfmv_v_f_f64m1(0, 2));
+    barrier1(&_val);
+    vint32m1_t val = vfncvt_x_f_w_i32m1(_val, 4);
+    __builtin_riscv_fsrm(0);
+    return v_int32x4(val);
+}
+inline v_int32x4 v_round(const v_float64x2& a, const v_float64x2& b)
+{
+    __builtin_riscv_fsrm(0);
+    vfloat64m2_t _val = vundefined_f64m2();
+    _val = vset_v_f64m1_f64m2(_val, 0, a.val);
+    _val = vset_v_f64m1_f64m2(_val, 1, b.val);
+    barrier1(&_val);
+    vint32m1_t val = vfncvt_x_f_w_i32m1(_val, 4);
+    __builtin_riscv_fsrm(0);
+    return v_int32x4(val);
+}
+inline v_int32x4 v_floor(const v_float64x2& a)
+{
+    __builtin_riscv_fsrm(2);
+    vfloat64m2_t _val = vundefined_f64m2();
+    _val = vset_v_f64m1_f64m2(_val, 0, a.val);
+    vfloat32m1_t aval = vfncvt_f_f_w_f32m1(_val, 2);
+    vint32m1_t nan = vand_vx_i32m1(vreinterpret_v_f32m1_i32m1(aval), 0x7f800000, 4);
+    barrier1(&nan);
+    vbool32_t mask = vmsne_vx_i32m1_b32(nan, 0x7f800000, 4);
+    vint32m1_t val = vfcvt_x_f_v_i32m1_m(mask, vmv_v_x_i32m1(0, 4), aval, 4);
+    __builtin_riscv_fsrm(0);
+    return v_int32x4(val);
+}
+
+inline v_int32x4 v_ceil(const v_float64x2& a)
+{
+    __builtin_riscv_fsrm(3);
+    vfloat64m2_t _val = vundefined_f64m2();
+    _val = vset_v_f64m1_f64m2(_val, 0, a.val);
+    vfloat32m1_t aval = vfncvt_f_f_w_f32m1(_val, 2);
+    vint32m1_t nan = vand_vx_i32m1(vreinterpret_v_f32m1_i32m1(aval), 0x7f800000, 4);
+    barrier1(&nan);
+    vbool32_t mask = vmsne_vx_i32m1_b32(nan, 0x7f800000, 4);
+    vint32m1_t val = vfcvt_x_f_v_i32m1_m(mask, vmv_v_x_i32m1(0, 4), aval, 4);
+    __builtin_riscv_fsrm(0);
+    return v_int32x4(val);
+}
+
+inline v_int32x4 v_trunc(const v_float64x2& a)
+{
+    __builtin_riscv_fsrm(1);
+    vfloat64m2_t _val = vundefined_f64m2();
+    _val = vset_v_f64m1_f64m2(_val, 0, a.val);
+    vfloat32m1_t aval = vfncvt_f_f_w_f32m1(_val, 2);
+    vint32m1_t nan = vand_vx_i32m1(vreinterpret_v_f32m1_i32m1(aval), 0x7f800000, 4);
+    barrier1(&nan);
+    vbool32_t mask = vmsne_vx_i32m1_b32(nan, 0x7f800000, 4);
+    vint32m1_t val = vfcvt_x_f_v_i32m1_m(mask, vmv_v_x_i32m1(0, 4), aval, 4);
+    __builtin_riscv_fsrm(0);
+    return v_int32x4(val);
+}
+
+#define OPENCV_HAL_IMPL_RISCVV_LOAD_DEINTERLEAVED(intrin, _Tpvec, num, _Tp, _T, elemsize)    \
+inline void v_load_deinterleave(const _Tp* ptr, v_##_Tpvec##x##num& a, v_##_Tpvec##x##num& b) \
+{ \
+    intrin##2e##elemsize##_v_##_T##m1(&a.val, &b.val, ptr, num); \
+} \
+inline void v_load_deinterleave(const _Tp* ptr, v_##_Tpvec##x##num& a, v_##_Tpvec##x##num& b, v_##_Tpvec##x##num& c) \
+{ \
+    intrin##3e##elemsize##_v_##_T##m1(&a.val, &b.val, &c.val, ptr, num); \
+}\
+inline void v_load_deinterleave(const _Tp* ptr, v_##_Tpvec##x##num& a, v_##_Tpvec##x##num& b, \
+                                v_##_Tpvec##x##num& c, v_##_Tpvec##x##num& d) \
+{ \
+    intrin##4e##elemsize##_v_##_T##m1(&a.val, &b.val, &c.val, &d.val, ptr, num); \
+} \
+
+#define OPENCV_HAL_IMPL_RISCVV_STORE_INTERLEAVED(intrin, _Tpvec, num, _Tp, _T, elemsize)    \
+inline void v_store_interleave( _Tp* ptr, const v_##_Tpvec##x##num& a, const v_##_Tpvec##x##num& b, \
+                                hal::StoreMode /*mode*/=hal::STORE_UNALIGNED) \
+{ \
+    intrin##2e##elemsize##_v_##_T##m1(ptr, a.val, b.val, num); \
+} \
+inline void v_store_interleave( _Tp* ptr, const v_##_Tpvec##x##num& a, const v_##_Tpvec##x##num& b, \
+                                const v_##_Tpvec##x##num& c, hal::StoreMode /*mode*/=hal::STORE_UNALIGNED) \
+{ \
+    intrin##3e##elemsize##_v_##_T##m1(ptr, a.val, b.val, c.val, num); \
+} \
+inline void v_store_interleave( _Tp* ptr, const v_##_Tpvec##x##num& a, const v_##_Tpvec##x##num& b, \
+                                const v_##_Tpvec##x##num& c, const v_##_Tpvec##x##num& d, \
+                                hal::StoreMode /*mode*/=hal::STORE_UNALIGNED ) \
+{ \
+    intrin##4e##elemsize##_v_##_T##m1(ptr, a.val, b.val, c.val, d.val, num); \
+}
+
+#define OPENCV_HAL_IMPL_RISCVV_INTERLEAVED(_Tpvec, _Tp, num, ld, st, _T, elemsize) \
+OPENCV_HAL_IMPL_RISCVV_LOAD_DEINTERLEAVED(ld, _Tpvec, num, _Tp, _T, elemsize)    \
+OPENCV_HAL_IMPL_RISCVV_STORE_INTERLEAVED(st, _Tpvec, num, _Tp, _T, elemsize)
+
+//OPENCV_HAL_IMPL_RISCVV_INTERLEAVED(uint8, uchar, )
+OPENCV_HAL_IMPL_RISCVV_INTERLEAVED(int8, schar, 16, vlseg, vsseg, i8, 8)
+OPENCV_HAL_IMPL_RISCVV_INTERLEAVED(int16, short, 8, vlseg, vsseg, i16, 16)
+OPENCV_HAL_IMPL_RISCVV_INTERLEAVED(int32, int, 4, vlseg, vsseg, i32, 32)
+
+OPENCV_HAL_IMPL_RISCVV_INTERLEAVED(uint8, unsigned char, 16, vlseg, vsseg, u8, 8)
+OPENCV_HAL_IMPL_RISCVV_INTERLEAVED(uint16, unsigned short, 8, vlseg, vsseg, u16, 16)
+OPENCV_HAL_IMPL_RISCVV_INTERLEAVED(uint32, unsigned int, 4, vlseg, vsseg, u32, 32)
+
+#define OPENCV_HAL_IMPL_RISCVV_INTERLEAVED_(_Tpvec, _Tp, num, _T, _esize) \
+inline void v_load_deinterleave(const _Tp* ptr, v_##_Tpvec##x##num& a, v_##_Tpvec##x##num& b) \
+{ vlseg2e##_esize##_v_##_T##m1(&a.val, &b.val, ptr, num);} \
+inline void v_load_deinterleave(const _Tp* ptr, v_##_Tpvec##x##num& a, v_##_Tpvec##x##num& b, v_##_Tpvec##x##num& c) \
+{ vlseg3e##_esize##_v_##_T##m1(&a.val, &b.val, &c.val, ptr, num);}\
+inline void v_load_deinterleave(const _Tp* ptr, v_##_Tpvec##x##num& a, v_##_Tpvec##x##num& b, \
+                                v_##_Tpvec##x##num& c, v_##_Tpvec##x##num& d) \
+{ vlseg4e##_esize##_v_##_T##m1(&a.val, &b.val, &c.val, &d.val, ptr, num);} \
+inline void v_store_interleave( _Tp* ptr, const v_##_Tpvec##x##num& a, const v_##_Tpvec##x##num& b, \
+                                hal::StoreMode /*mode*/=hal::STORE_UNALIGNED) \
+{ vsseg2e##_esize##_v_##_T##m1(ptr, a.val, b.val, num);} \
+inline void v_store_interleave( _Tp* ptr, const v_##_Tpvec##x##num& a, const v_##_Tpvec##x##num& b, \
+                                const v_##_Tpvec##x##num& c, hal::StoreMode /*mode*/=hal::STORE_UNALIGNED) \
+{ vsseg3e##_esize##_v_##_T##m1(ptr, a.val, b.val, c.val, num);} \
+inline void v_store_interleave( _Tp* ptr, const v_##_Tpvec##x##num& a, const v_##_Tpvec##x##num& b, \
+                                const v_##_Tpvec##x##num& c, const v_##_Tpvec##x##num& d, \
+                                hal::StoreMode /*mode*/=hal::STORE_UNALIGNED ) \
+{ vsseg4e##_esize##_v_##_T##m1(ptr, a.val, b.val, c.val, d.val, num);}
+
+OPENCV_HAL_IMPL_RISCVV_INTERLEAVED_(float32, float, 4, f32, 32)
+OPENCV_HAL_IMPL_RISCVV_INTERLEAVED_(float64, double, 2, f64, 64)
+
+OPENCV_HAL_IMPL_RISCVV_INTERLEAVED_(uint64, unsigned long, 2, u64, 64)
+OPENCV_HAL_IMPL_RISCVV_INTERLEAVED_(int64, long, 2, i64, 64)
+
+inline v_float32x4 v_cvt_f32(const v_int32x4& a)
+{
+    return v_float32x4(vfcvt_f_x_v_f32m1(a.val, 4));
+}
+
+#if CV_SIMD128_64F
+inline v_float32x4 v_cvt_f32(const v_float64x2& a)
+{
+    vfloat64m2_t _val = vundefined_f64m2();
+    _val = vset_v_f64m1_f64m2(_val, 0, a.val);
+    vfloat32m1_t aval = vfncvt_f_f_w_f32m1(_val, 2);
+    return v_float32x4(aval);
+}
+
+inline v_float32x4 v_cvt_f32(const v_float64x2& a, const v_float64x2& b)
+{
+    vfloat64m2_t _val = vundefined_f64m2();
+    _val = vset_v_f64m1_f64m2(_val, 0, a.val);
+    _val = vset_v_f64m1_f64m2(_val, 1, b.val);
+    vfloat32m1_t aval = vfncvt_f_f_w_f32m1(_val, 4);
+    return v_float32x4(aval);
+}
+
+inline v_float64x2 v_cvt_f64(const v_int32x4& a)
+{
+    vfloat32m1_t val = vfcvt_f_x_v_f32m1(a.val, 4);
+    vfloat64m2_t _val = vfwcvt_f_f_v_f64m2(val, 4);
+    return v_float64x2(vget_v_f64m2_f64m1(_val, 0));
+}
+
+inline v_float64x2 v_cvt_f64_high(const v_int32x4& a)
+{
+    vfloat32m1_t val = vfcvt_f_x_v_f32m1(a.val, 4);
+    vfloat64m2_t _val = vfwcvt_f_f_v_f64m2(val, 4);
+    return v_float64x2(vget_v_f64m2_f64m1(_val, 1));
+}
+
+inline v_float64x2 v_cvt_f64(const v_float32x4& a)
+{
+    vfloat64m2_t _val  = vfwcvt_f_f_v_f64m2(a.val, 4);
+    return v_float64x2(vget_v_f64m2_f64m1(_val, 0));
+}
+
+inline v_float64x2 v_cvt_f64_high(const v_float32x4& a)
+{
+    vfloat64m2_t _val  = vfwcvt_f_f_v_f64m2(a.val, 4);
+    return v_float64x2(vget_v_f64m2_f64m1(_val, 1));
+}
+
+inline v_float64x2 v_cvt_f64(const v_int64x2& a)
+{
+    return v_float64x2(vfcvt_f_x_v_f64m1(a.val, 2));
+}
+
+#endif
+inline v_int8x16 v_interleave_pairs(const v_int8x16& vec)
+{
+    uint64 mdata[2] = {0x0705060403010200, 0x0F0D0E0C0B090A08};
+    vuint64m1_t m0 = vle64_v_u64m1(mdata, 2);
+    return v_int8x16(vrgather_vv_i8m1(vec.val, vreinterpret_v_u64m1_u8m1(m0), 16));
+}
+inline v_uint8x16 v_interleave_pairs(const v_uint8x16& vec)
+{
+    return v_reinterpret_as_u8(v_interleave_pairs(v_reinterpret_as_s8(vec)));
+}
+
+inline v_int8x16 v_interleave_quads(const v_int8x16& vec)
+{
+    uint64 mdata[2] = {0x0703060205010400, 0x0F0B0E0A0D090C08};
+    vuint64m1_t m0 = vle64_v_u64m1(mdata, 2);
+    return v_int8x16(vrgather_vv_i8m1(vec.val, vreinterpret_v_u64m1_u8m1(m0), 16));
+}
+inline v_uint8x16 v_interleave_quads(const v_uint8x16& vec)
+{
+    return v_reinterpret_as_u8(v_interleave_quads(v_reinterpret_as_s8(vec)));
+}
+
+inline v_int16x8 v_interleave_pairs(const v_int16x8& vec)
+{
+    uint64 mdata[2] = {0x0706030205040100, 0x0F0E0B0A0D0C0908};
+    vuint64m1_t m0 = vle64_v_u64m1(mdata, 2);
+    return v_int16x8(vreinterpret_v_i8m1_i16m1(vreinterpret_v_u8m1_i8m1(vrgather_vv_u8m1(vreinterpret_v_i8m1_u8m1(vreinterpret_v_i16m1_i8m1(vec.val)), vreinterpret_v_u64m1_u8m1(m0), 16))));
+}
+inline v_uint16x8 v_interleave_pairs(const v_uint16x8& vec) { return v_reinterpret_as_u16(v_interleave_pairs(v_reinterpret_as_s16(vec))); }
+inline v_int16x8 v_interleave_quads(const v_int16x8& vec)
+{
+    uint64 mdata[2] = {0x0B0A030209080100, 0x0F0E07060D0C0504};
+    vuint64m1_t m0 = vle64_v_u64m1(mdata, 2);
+    return v_int16x8(vreinterpret_v_i8m1_i16m1(vreinterpret_v_u8m1_i8m1(vrgather_vv_u8m1(vreinterpret_v_i8m1_u8m1(vreinterpret_v_i16m1_i8m1(vec.val)), vreinterpret_v_u64m1_u8m1(m0), 16))));
+}
+inline v_uint16x8 v_interleave_quads(const v_uint16x8& vec) { return v_reinterpret_as_u16(v_interleave_quads(v_reinterpret_as_s16(vec))); }
+
+inline v_int32x4 v_interleave_pairs(const v_int32x4& vec)
+{
+    uint64 mdata[2] = {0x0B0A090803020100, 0x0F0E0D0C07060504};
+    vuint64m1_t m0 = vle64_v_u64m1(mdata, 2);
+    return v_int32x4(vreinterpret_v_i8m1_i32m1(vreinterpret_v_u8m1_i8m1(vrgather_vv_u8m1(vreinterpret_v_i8m1_u8m1(vreinterpret_v_i32m1_i8m1(vec.val)), vreinterpret_v_u64m1_u8m1(m0), 16))));
+}
+inline v_uint32x4 v_interleave_pairs(const v_uint32x4& vec) { return v_reinterpret_as_u32(v_interleave_pairs(v_reinterpret_as_s32(vec))); }
+inline v_float32x4 v_interleave_pairs(const v_float32x4& vec) { return v_reinterpret_as_f32(v_interleave_pairs(v_reinterpret_as_s32(vec))); }
+inline v_int8x16 v_pack_triplets(const v_int8x16& vec)
+{
+    uint64 mdata[2] = {0x0908060504020100, 0xFFFFFFFF0E0D0C0A};
+    vuint64m1_t m0 = vle64_v_u64m1(mdata, 2);
+    return v_int8x16(vreinterpret_v_u8m1_i8m1(vrgather_vv_u8m1(vreinterpret_v_i8m1_u8m1(vec.val), vreinterpret_v_u64m1_u8m1(m0), 16)));
+}
+inline v_uint8x16 v_pack_triplets(const v_uint8x16& vec) { return v_reinterpret_as_u8(v_pack_triplets(v_reinterpret_as_s8(vec))); }
+
+inline v_int16x8 v_pack_triplets(const v_int16x8& vec)
+{
+    uint64 mdata[2] = {0x0908050403020100, 0xFFFFFFFF0D0C0B0A};
+    vuint64m1_t m0 = vle64_v_u64m1(mdata, 2);
+    return v_int16x8(vreinterpret_v_i8m1_i16m1(vreinterpret_v_u8m1_i8m1(vrgather_vv_u8m1(vreinterpret_v_i8m1_u8m1(vreinterpret_v_i16m1_i8m1(vec.val)), vreinterpret_v_u64m1_u8m1(m0), 16))));
+}
+inline v_uint16x8 v_pack_triplets(const v_uint16x8& vec) { return v_reinterpret_as_u16(v_pack_triplets(v_reinterpret_as_s16(vec))); }
+
+inline v_int32x4 v_pack_triplets(const v_int32x4& vec) { return vec; }
+inline v_uint32x4 v_pack_triplets(const v_uint32x4& vec) { return vec; }
+inline v_float32x4 v_pack_triplets(const v_float32x4& vec) { return vec; }
+
+#if CV_SIMD128_64F
+inline v_float64x2 v_dotprod_expand(const v_int32x4& a, const v_int32x4& b)
+{ return v_cvt_f64(v_dotprod(a, b)); }
+inline v_float64x2 v_dotprod_expand(const v_int32x4& a,   const v_int32x4& b,
+                                    const v_float64x2& c)
+{ return v_add(v_dotprod_expand(a, b), c); }
+inline v_float64x2 v_dotprod_expand_fast(const v_int32x4& a, const v_int32x4& b)
+{
+    vint64m2_t v1 = vwmul_vv_i64m2(a.val, b.val, 4);
+    vfloat64m1_t res = vfcvt_f_x_v_f64m1(vadd_vv_i64m1(vget_v_i64m2_i64m1(v1, 0), vget_v_i64m2_i64m1(v1, 1), 2), 2);
+    return v_float64x2(res);
+}
+inline v_float64x2 v_dotprod_expand_fast(const v_int32x4& a, const v_int32x4& b, const v_float64x2& c)
+{ v_float64x2 res = v_dotprod_expand_fast(a, b);
+  return v_add(res, c); }
+#endif
+////// FP16 support ///////
+#if __riscv_v == 7000
+inline v_float32x4 v_load_expand(const hfloat* ptr)
+{
+    vfloat16m1_t v = vle16_v_f16m1((__fp16*)ptr, 4);
+    vfloat32m2_t v32 = vfwcvt_f_f_v_f32m2(v, 4);
+    return v_float32x4(vget_v_f32m2_f32m1(v32, 0));
+}
+
+inline void v_pack_store(hfloat* ptr, const v_float32x4& v)
+{
+    vfloat32m2_t v32 = vundefined_f32m2();
+    v32 = vset_v_f32m1_f32m2(v32, 0, v.val);
+    vfloat16m1_t hv = vfncvt_f_f_w_f16m1(v32, 4);
+    vse16_v_f16m1((__fp16*)ptr, hv, 4);
+}
+#else
+inline v_float32x4 v_load_expand(const hfloat* ptr)
+{
+    vfloat16mf2_t v = vle16_v_f16mf2((__fp16*)ptr, 4);
+    vfloat32m1_t v32 = vfwcvt_f_f_v_f32m1(v, 4);
+    return v_float32x4(v32);
+}
+
+inline void v_pack_store(hfloat* ptr, const v_float32x4& v)
+{
+    //vfloat32m2_t v32 = vundefined_f32m2();
+    //v32 = vset_f32m2(v32, 0, v.val);
+    vfloat16mf2_t hv = vfncvt_f_f_w_f16mf2(v.val, 4);
+    vse16_v_f16mf2((__fp16*)ptr, hv, 4);
+}
+#endif
+
+inline void v_cleanup() {}
+
+#include "intrin_math.hpp"
+inline v_float32x4 v_exp(const v_float32x4& x) { return v_exp_default_32f<v_float32x4, v_int32x4>(x); }
+inline v_float32x4 v_log(const v_float32x4& x) { return v_log_default_32f<v_float32x4, v_int32x4>(x); }
+inline void v_sincos(const v_float32x4& x, v_float32x4& s, v_float32x4& c) { v_sincos_default_32f<v_float32x4, v_int32x4>(x, s, c); }
+inline v_float32x4 v_sin(const v_float32x4& x) { return v_sin_default_32f<v_float32x4, v_int32x4>(x); }
+inline v_float32x4 v_cos(const v_float32x4& x) { return v_cos_default_32f<v_float32x4, v_int32x4>(x); }
+inline v_float32x4 v_erf(const v_float32x4& x) { return v_erf_default_32f<v_float32x4, v_int32x4>(x); }
+
+inline v_float64x2 v_exp(const v_float64x2& x) { return v_exp_default_64f<v_float64x2, v_int64x2>(x); }
+inline v_float64x2 v_log(const v_float64x2& x) { return v_log_default_64f<v_float64x2, v_int64x2>(x); }
+inline void v_sincos(const v_float64x2& x, v_float64x2& s, v_float64x2& c) { v_sincos_default_64f<v_float64x2, v_int64x2>(x, s, c); }
+inline v_float64x2 v_sin(const v_float64x2& x) { return v_sin_default_64f<v_float64x2, v_int64x2>(x); }
+inline v_float64x2 v_cos(const v_float64x2& x) { return v_cos_default_64f<v_float64x2, v_int64x2>(x); }
+
+CV_CPU_OPTIMIZATION_HAL_NAMESPACE_END
+
+//! @endcond
+
+}
+#endif
diff --git a/3rdParty/opencv-4.12.0/opencv2/core/hal/intrin_rvv_scalable.hpp b/3rdParty/opencv-4.12.0/opencv2/core/hal/intrin_rvv_scalable.hpp
new file mode 100644
index 0000000000..16edd6e9a4
--- /dev/null
+++ b/3rdParty/opencv-4.12.0/opencv2/core/hal/intrin_rvv_scalable.hpp
@@ -0,0 +1,2194 @@
+// This file is part of OpenCV project.
+// It is subject to the license terms in the LICENSE file found in the top-level directory
+// of this distribution and at http://opencv.org/license.html.
+
+// The original implementation is contributed by HAN Liutong.
+// Copyright (C) 2022, Institute of Software, Chinese Academy of Sciences.
+
+#ifndef OPENCV_HAL_INTRIN_RVV_SCALABLE_HPP
+#define OPENCV_HAL_INTRIN_RVV_SCALABLE_HPP
+
+#include <array>
+#include <opencv2/core/check.hpp>
+
+#if defined(__GNUC__) && !defined(__clang__)
+// FIXIT: eliminate massive warnigs from templates
+// GCC from 'rvv-next': riscv64-unknown-linux-gnu-g++ (g42df3464463) 12.0.1 20220505 (prerelease)
+// doesn't work: #pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wignored-attributes"
+#endif
+
+#ifndef CV_RVV_MAX_VLEN
+#define CV_RVV_MAX_VLEN 1024
+#endif
+
+namespace cv
+{
+
+//! @cond IGNORED
+
+CV_CPU_OPTIMIZATION_HAL_NAMESPACE_BEGIN
+
+#define CV_SIMD_SCALABLE 1
+#define CV_SIMD_SCALABLE_64F 1
+
+using v_uint8 = vuint8m2_t;
+using v_int8 = vint8m2_t;
+using v_uint16 = vuint16m2_t;
+using v_int16 = vint16m2_t;
+using v_uint32 = vuint32m2_t;
+using v_int32 = vint32m2_t;
+using v_uint64 = vuint64m2_t;
+using v_int64 = vint64m2_t;
+
+using v_float32 = vfloat32m2_t;
+#if CV_SIMD_SCALABLE_64F
+using v_float64 = vfloat64m2_t;
+#endif
+
+using uchar = unsigned char;
+using schar = signed char;
+using ushort = unsigned short;
+using uint = unsigned int;
+using uint64 = unsigned long int;
+using int64 = long int;
+
+
+template <class T>
+struct VTraits;
+
+#define OPENCV_HAL_IMPL_RVV_TRAITS(REG, TYP, SUF, SZ) \
+template <> \
+struct VTraits<REG> \
+{ \
+    static inline int vlanes() { return __riscv_vsetvlmax_##SUF(); } \
+    using lane_type = TYP; \
+    static const int max_nlanes = CV_RVV_MAX_VLEN/SZ*2; \
+};
+// `max_nlanes` is multiplied by 2 because of using LMUL=2 (m2)
+
+OPENCV_HAL_IMPL_RVV_TRAITS(vint8m1_t, int8_t, e8m1, 8)
+OPENCV_HAL_IMPL_RVV_TRAITS(vint8m2_t, int8_t, e8m2, 8)
+OPENCV_HAL_IMPL_RVV_TRAITS(vint8m4_t, int8_t, e8m4, 8)
+OPENCV_HAL_IMPL_RVV_TRAITS(vint8m8_t, int8_t, e8m8, 8)
+OPENCV_HAL_IMPL_RVV_TRAITS(vuint8m1_t, uint8_t, e8m1, 8)
+OPENCV_HAL_IMPL_RVV_TRAITS(vuint8m2_t, uint8_t, e8m2, 8)
+OPENCV_HAL_IMPL_RVV_TRAITS(vuint8m4_t, uint8_t, e8m4, 8)
+OPENCV_HAL_IMPL_RVV_TRAITS(vuint8m8_t, uint8_t, e8m8, 8)
+
+OPENCV_HAL_IMPL_RVV_TRAITS(vint16m1_t, int16_t, e16m1, 16)
+OPENCV_HAL_IMPL_RVV_TRAITS(vint16m2_t, int16_t, e16m2, 16)
+OPENCV_HAL_IMPL_RVV_TRAITS(vint16m4_t, int16_t, e16m4, 16)
+OPENCV_HAL_IMPL_RVV_TRAITS(vint16m8_t, int16_t, e16m8, 16)
+OPENCV_HAL_IMPL_RVV_TRAITS(vuint16m1_t, uint16_t, e16m1, 16)
+OPENCV_HAL_IMPL_RVV_TRAITS(vuint16m2_t, uint16_t, e16m2, 16)
+OPENCV_HAL_IMPL_RVV_TRAITS(vuint16m4_t, uint16_t, e16m4, 16)
+OPENCV_HAL_IMPL_RVV_TRAITS(vuint16m8_t, uint16_t, e16m8, 16)
+
+OPENCV_HAL_IMPL_RVV_TRAITS(vint32m1_t, int32_t, e32m1, 32)
+OPENCV_HAL_IMPL_RVV_TRAITS(vint32m2_t, int32_t, e32m2, 32)
+OPENCV_HAL_IMPL_RVV_TRAITS(vint32m4_t, int32_t, e32m4, 32)
+OPENCV_HAL_IMPL_RVV_TRAITS(vint32m8_t, int32_t, e32m8, 32)
+OPENCV_HAL_IMPL_RVV_TRAITS(vuint32m1_t, uint32_t, e32m1, 32)
+OPENCV_HAL_IMPL_RVV_TRAITS(vuint32m2_t, uint32_t, e32m2, 32)
+OPENCV_HAL_IMPL_RVV_TRAITS(vuint32m4_t, uint32_t, e32m4, 32)
+OPENCV_HAL_IMPL_RVV_TRAITS(vuint32m8_t, uint32_t, e32m8, 32)
+
+OPENCV_HAL_IMPL_RVV_TRAITS(vint64m1_t, int64_t, e64m1, 64)
+OPENCV_HAL_IMPL_RVV_TRAITS(vint64m2_t, int64_t, e64m2, 64)
+OPENCV_HAL_IMPL_RVV_TRAITS(vint64m4_t, int64_t, e64m4, 64)
+OPENCV_HAL_IMPL_RVV_TRAITS(vint64m8_t, int64_t, e64m8, 64)
+OPENCV_HAL_IMPL_RVV_TRAITS(vuint64m1_t, uint64_t, e64m1, 64)
+OPENCV_HAL_IMPL_RVV_TRAITS(vuint64m2_t, uint64_t, e64m2, 64)
+OPENCV_HAL_IMPL_RVV_TRAITS(vuint64m4_t, uint64_t, e64m4, 64)
+OPENCV_HAL_IMPL_RVV_TRAITS(vuint64m8_t, uint64_t, e64m8, 64)
+
+OPENCV_HAL_IMPL_RVV_TRAITS(vfloat32m1_t, float, e32m1, 32)
+OPENCV_HAL_IMPL_RVV_TRAITS(vfloat32m2_t, float, e32m2, 32)
+OPENCV_HAL_IMPL_RVV_TRAITS(vfloat32m4_t, float, e32m4, 32)
+OPENCV_HAL_IMPL_RVV_TRAITS(vfloat32m8_t, float, e32m8, 32)
+
+#if CV_SIMD_SCALABLE_64F
+OPENCV_HAL_IMPL_RVV_TRAITS(vfloat64m1_t, double, e64m1, 64)
+OPENCV_HAL_IMPL_RVV_TRAITS(vfloat64m2_t, double, e64m2, 64)
+OPENCV_HAL_IMPL_RVV_TRAITS(vfloat64m4_t, double, e64m4, 64)
+OPENCV_HAL_IMPL_RVV_TRAITS(vfloat64m8_t, double, e64m8, 64)
+#endif
+
+
+// LLVM/Clang defines "overloaded intrinsics" e.g. 'vand(op1, op2)'
+// GCC does not have these functions, so we need to implement them manually
+// We implement only selected subset required to build current state of the code
+// Included inside namespace cv::
+// #ifndef __riscv_v_intrinsic_overloading
+// #include "intrin_rvv_compat_overloaded.hpp"
+// #endif // __riscv_v_intrinsic_overloading
+
+
+//////////// get0 ////////////
+#define OPENCV_HAL_IMPL_RVV_GRT0_INT(_Tpvec, _Tp) \
+inline _Tp v_get0(const v_##_Tpvec& v) \
+{ \
+    return __riscv_vmv_x(v); \
+}
+
+OPENCV_HAL_IMPL_RVV_GRT0_INT(uint8, uchar)
+OPENCV_HAL_IMPL_RVV_GRT0_INT(int8, schar)
+OPENCV_HAL_IMPL_RVV_GRT0_INT(uint16, ushort)
+OPENCV_HAL_IMPL_RVV_GRT0_INT(int16, short)
+OPENCV_HAL_IMPL_RVV_GRT0_INT(uint32, unsigned)
+OPENCV_HAL_IMPL_RVV_GRT0_INT(int32, int)
+OPENCV_HAL_IMPL_RVV_GRT0_INT(uint64, uint64)
+OPENCV_HAL_IMPL_RVV_GRT0_INT(int64, int64)
+
+inline float v_get0(const v_float32& v) \
+{ \
+    return __riscv_vfmv_f(v); \
+}
+#if CV_SIMD_SCALABLE_64F
+inline double v_get0(const v_float64& v) \
+{ \
+    return __riscv_vfmv_f(v); \
+}
+#endif
+
+//////////// Initial ////////////
+
+#define OPENCV_HAL_IMPL_RVV_INIT_INTEGER(_Tpvec, _Tp, suffix1, suffix2, vl) \
+inline v_##_Tpvec v_setzero_##suffix1() \
+{ \
+    return __riscv_vmv_v_x_##suffix2##m2(0, vl); \
+} \
+inline v_##_Tpvec v_setall_##suffix1(_Tp v) \
+{ \
+    return __riscv_vmv_v_x_##suffix2##m2(v, vl); \
+} \
+template <> inline v_##_Tpvec v_setzero_() \
+{ \
+    return v_setzero_##suffix1(); \
+} \
+template <> inline v_##_Tpvec v_setall_(_Tp v) \
+{ \
+    return v_setall_##suffix1(v); \
+}
+
+OPENCV_HAL_IMPL_RVV_INIT_INTEGER(uint8, uchar, u8, u8, VTraits<v_int8>::vlanes())
+OPENCV_HAL_IMPL_RVV_INIT_INTEGER(int8, schar, s8, i8, VTraits<v_int8>::vlanes())
+OPENCV_HAL_IMPL_RVV_INIT_INTEGER(uint16, ushort, u16, u16, VTraits<v_uint16>::vlanes())
+OPENCV_HAL_IMPL_RVV_INIT_INTEGER(int16, short, s16, i16, VTraits<v_int16>::vlanes())
+OPENCV_HAL_IMPL_RVV_INIT_INTEGER(uint32, uint, u32, u32, VTraits<v_uint32>::vlanes())
+OPENCV_HAL_IMPL_RVV_INIT_INTEGER(int32, int, s32, i32, VTraits<v_int32>::vlanes())
+OPENCV_HAL_IMPL_RVV_INIT_INTEGER(uint64, uint64, u64, u64, VTraits<v_uint64>::vlanes())
+OPENCV_HAL_IMPL_RVV_INIT_INTEGER(int64, int64, s64, i64, VTraits<v_int64>::vlanes())
+
+#define OPENCV_HAL_IMPL_RVV_INIT_FP(_Tpv, _Tp, suffix, vl) \
+inline v_##_Tpv v_setzero_##suffix() \
+{ \
+    return __riscv_vfmv_v_f_##suffix##m2(0, vl); \
+} \
+inline v_##_Tpv v_setall_##suffix(_Tp v) \
+{ \
+    return __riscv_vfmv_v_f_##suffix##m2(v, vl); \
+} \
+template <> inline v_##_Tpv v_setzero_() \
+{ \
+    return v_setzero_##suffix(); \
+} \
+template <> inline v_##_Tpv v_setall_(_Tp v) \
+{ \
+    return v_setall_##suffix(v); \
+}
+
+OPENCV_HAL_IMPL_RVV_INIT_FP(float32, float, f32, VTraits<v_float32>::vlanes())
+#if CV_SIMD_SCALABLE_64F
+OPENCV_HAL_IMPL_RVV_INIT_FP(float64, double, f64, VTraits<v_float64>::vlanes())
+#endif
+
+//////////// Reinterpret ////////////
+#define OPENCV_HAL_IMPL_RVV_NOTHING_REINTERPRET(_Tpvec1, suffix1) \
+inline v_##_Tpvec1 v_reinterpret_as_##suffix1(const v_##_Tpvec1& v) \
+{ \
+    return v;\
+}
+OPENCV_HAL_IMPL_RVV_NOTHING_REINTERPRET(uint8, u8)
+OPENCV_HAL_IMPL_RVV_NOTHING_REINTERPRET(uint16, u16)
+OPENCV_HAL_IMPL_RVV_NOTHING_REINTERPRET(uint32, u32)
+OPENCV_HAL_IMPL_RVV_NOTHING_REINTERPRET(uint64, u64)
+OPENCV_HAL_IMPL_RVV_NOTHING_REINTERPRET(int8, s8)
+OPENCV_HAL_IMPL_RVV_NOTHING_REINTERPRET(int16, s16)
+OPENCV_HAL_IMPL_RVV_NOTHING_REINTERPRET(int32, s32)
+OPENCV_HAL_IMPL_RVV_NOTHING_REINTERPRET(int64, s64)
+OPENCV_HAL_IMPL_RVV_NOTHING_REINTERPRET(float32, f32)
+#if CV_SIMD_SCALABLE_64F
+OPENCV_HAL_IMPL_RVV_NOTHING_REINTERPRET(float64, f64)
+#endif
+// TODO: can be simplified by using overloaded RV intrinsic
+#define OPENCV_HAL_IMPL_RVV_NATIVE_REINTERPRET(_Tpvec1, _Tpvec2, suffix1, suffix2, nsuffix1, nsuffix2) \
+inline v_##_Tpvec1 v_reinterpret_as_##suffix1(const v_##_Tpvec2& v) \
+{ \
+    return v_##_Tpvec1(__riscv_vreinterpret_v_##nsuffix2##m2_##nsuffix1##m2(v));\
+} \
+inline v_##_Tpvec2 v_reinterpret_as_##suffix2(const v_##_Tpvec1& v) \
+{ \
+    return v_##_Tpvec2(__riscv_vreinterpret_v_##nsuffix1##m2_##nsuffix2##m2(v));\
+}
+
+OPENCV_HAL_IMPL_RVV_NATIVE_REINTERPRET(uint8, int8, u8, s8, u8, i8)
+OPENCV_HAL_IMPL_RVV_NATIVE_REINTERPRET(uint16, int16, u16, s16, u16, i16)
+OPENCV_HAL_IMPL_RVV_NATIVE_REINTERPRET(uint32, int32, u32, s32, u32, i32)
+OPENCV_HAL_IMPL_RVV_NATIVE_REINTERPRET(uint32, float32, u32, f32, u32, f32)
+OPENCV_HAL_IMPL_RVV_NATIVE_REINTERPRET(int32, float32, s32, f32, i32, f32)
+OPENCV_HAL_IMPL_RVV_NATIVE_REINTERPRET(uint64, int64, u64, s64, u64, i64)
+#if CV_SIMD_SCALABLE_64F
+OPENCV_HAL_IMPL_RVV_NATIVE_REINTERPRET(uint64, float64, u64, f64, u64, f64)
+OPENCV_HAL_IMPL_RVV_NATIVE_REINTERPRET(int64, float64, s64, f64, i64, f64)
+#endif
+OPENCV_HAL_IMPL_RVV_NATIVE_REINTERPRET(uint8, uint16, u8, u16, u8, u16)
+OPENCV_HAL_IMPL_RVV_NATIVE_REINTERPRET(uint8, uint32, u8, u32, u8, u32)
+OPENCV_HAL_IMPL_RVV_NATIVE_REINTERPRET(uint8, uint64, u8, u64, u8, u64)
+OPENCV_HAL_IMPL_RVV_NATIVE_REINTERPRET(uint16, uint32, u16, u32, u16, u32)
+OPENCV_HAL_IMPL_RVV_NATIVE_REINTERPRET(uint16, uint64, u16, u64, u16, u64)
+OPENCV_HAL_IMPL_RVV_NATIVE_REINTERPRET(uint32, uint64, u32, u64, u32, u64)
+OPENCV_HAL_IMPL_RVV_NATIVE_REINTERPRET(int8, int16, s8, s16, i8, i16)
+OPENCV_HAL_IMPL_RVV_NATIVE_REINTERPRET(int8, int32, s8, s32, i8, i32)
+OPENCV_HAL_IMPL_RVV_NATIVE_REINTERPRET(int8, int64, s8, s64, i8, i64)
+OPENCV_HAL_IMPL_RVV_NATIVE_REINTERPRET(int16, int32, s16, s32, i16, i32)
+OPENCV_HAL_IMPL_RVV_NATIVE_REINTERPRET(int16, int64, s16, s64, i16, i64)
+OPENCV_HAL_IMPL_RVV_NATIVE_REINTERPRET(int32, int64, s32, s64, i32, i64)
+
+
+#define OPENCV_HAL_IMPL_RVV_TWO_TIMES_REINTERPRET(_Tpvec1, _Tpvec2, suffix1, suffix2, nsuffix1, nsuffix2, width1, width2) \
+inline v_##_Tpvec1 v_reinterpret_as_##suffix1(const v_##_Tpvec2& v) \
+{ \
+    return __riscv_vreinterpret_v_##nsuffix1##width2##m2_##nsuffix1##width1##m2(__riscv_vreinterpret_v_##nsuffix2##width2##m2_##nsuffix1##width2##m2(v));\
+} \
+inline v_##_Tpvec2 v_reinterpret_as_##suffix2(const v_##_Tpvec1& v) \
+{ \
+    return __riscv_vreinterpret_v_##nsuffix1##width2##m2_##nsuffix2##width2##m2(__riscv_vreinterpret_v_##nsuffix1##width1##m2_##nsuffix1##width2##m2(v));\
+}
+
+OPENCV_HAL_IMPL_RVV_TWO_TIMES_REINTERPRET(uint8, int16, u8, s16, u, i, 8, 16)
+OPENCV_HAL_IMPL_RVV_TWO_TIMES_REINTERPRET(uint8, int32, u8, s32, u, i, 8, 32)
+OPENCV_HAL_IMPL_RVV_TWO_TIMES_REINTERPRET(uint8, int64, u8, s64, u, i, 8, 64)
+OPENCV_HAL_IMPL_RVV_TWO_TIMES_REINTERPRET(uint16, int8, u16, s8, u, i, 16, 8)
+OPENCV_HAL_IMPL_RVV_TWO_TIMES_REINTERPRET(uint16, int32, u16, s32, u, i, 16, 32)
+OPENCV_HAL_IMPL_RVV_TWO_TIMES_REINTERPRET(uint16, int64, u16, s64, u, i, 16, 64)
+OPENCV_HAL_IMPL_RVV_TWO_TIMES_REINTERPRET(uint32, int8, u32, s8, u, i, 32, 8)
+OPENCV_HAL_IMPL_RVV_TWO_TIMES_REINTERPRET(uint32, int16, u32, s16, u, i, 32, 16)
+OPENCV_HAL_IMPL_RVV_TWO_TIMES_REINTERPRET(uint32, int64, u32, s64, u, i, 32, 64)
+OPENCV_HAL_IMPL_RVV_TWO_TIMES_REINTERPRET(uint64, int8, u64, s8, u, i, 64, 8)
+OPENCV_HAL_IMPL_RVV_TWO_TIMES_REINTERPRET(uint64, int16, u64, s16, u, i, 64, 16)
+OPENCV_HAL_IMPL_RVV_TWO_TIMES_REINTERPRET(uint64, int32, u64, s32, u, i, 64, 32)
+OPENCV_HAL_IMPL_RVV_TWO_TIMES_REINTERPRET(uint8, float32, u8, f32, u, f, 8, 32)
+OPENCV_HAL_IMPL_RVV_TWO_TIMES_REINTERPRET(uint16, float32, u16, f32, u, f, 16, 32)
+OPENCV_HAL_IMPL_RVV_TWO_TIMES_REINTERPRET(uint64, float32, u64, f32, u, f, 64, 32)
+OPENCV_HAL_IMPL_RVV_TWO_TIMES_REINTERPRET(int8, float32, s8, f32, i, f, 8, 32)
+OPENCV_HAL_IMPL_RVV_TWO_TIMES_REINTERPRET(int16, float32, s16, f32, i, f, 16, 32)
+OPENCV_HAL_IMPL_RVV_TWO_TIMES_REINTERPRET(int64, float32, s64, f32, i, f, 64, 32)
+#if CV_SIMD_SCALABLE_64F
+OPENCV_HAL_IMPL_RVV_TWO_TIMES_REINTERPRET(uint8, float64, u8, f64, u, f, 8, 64)
+OPENCV_HAL_IMPL_RVV_TWO_TIMES_REINTERPRET(uint16, float64, u16, f64, u, f, 16, 64)
+OPENCV_HAL_IMPL_RVV_TWO_TIMES_REINTERPRET(uint32, float64, u32, f64, u, f, 32, 64)
+OPENCV_HAL_IMPL_RVV_TWO_TIMES_REINTERPRET(int8, float64, s8, f64, i, f, 8, 64)
+OPENCV_HAL_IMPL_RVV_TWO_TIMES_REINTERPRET(int16, float64, s16, f64, i, f, 16, 64)
+OPENCV_HAL_IMPL_RVV_TWO_TIMES_REINTERPRET(int32, float64, s32, f64, i, f, 32, 64)
+// Three times reinterpret
+inline v_float32 v_reinterpret_as_f32(const v_float64& v) \
+{ \
+    return __riscv_vreinterpret_v_u32m2_f32m2(__riscv_vreinterpret_v_u64m2_u32m2(__riscv_vreinterpret_v_f64m2_u64m2(v)));\
+}
+
+inline v_float64 v_reinterpret_as_f64(const v_float32& v) \
+{ \
+    return __riscv_vreinterpret_v_u64m2_f64m2(__riscv_vreinterpret_v_u32m2_u64m2(__riscv_vreinterpret_v_f32m2_u32m2(v)));\
+}
+#endif
+
+//////////// Extract //////////////
+
+#define OPENCV_HAL_IMPL_RVV_EXTRACT_INTEGER(_Tpvec, _Tp, vl) \
+template <int s = 0> \
+inline _Tpvec v_extract(const _Tpvec& a, const _Tpvec& b, int i = s) \
+{ \
+    return __riscv_vslideup(__riscv_vslidedown(a, i, vl), b, VTraits<_Tpvec>::vlanes() - i, vl); \
+} \
+template<int s = 0> inline _Tp v_extract_n(_Tpvec v, int i = s) \
+{ \
+    return __riscv_vmv_x(__riscv_vslidedown(v, i, vl)); \
+}
+
+OPENCV_HAL_IMPL_RVV_EXTRACT_INTEGER(v_uint8, uchar, VTraits<v_uint8>::vlanes())
+OPENCV_HAL_IMPL_RVV_EXTRACT_INTEGER(v_int8, schar, VTraits<v_int8>::vlanes())
+OPENCV_HAL_IMPL_RVV_EXTRACT_INTEGER(v_uint16, ushort, VTraits<v_uint16>::vlanes())
+OPENCV_HAL_IMPL_RVV_EXTRACT_INTEGER(v_int16, short, VTraits<v_int16>::vlanes())
+OPENCV_HAL_IMPL_RVV_EXTRACT_INTEGER(v_uint32, unsigned int, VTraits<v_uint32>::vlanes())
+OPENCV_HAL_IMPL_RVV_EXTRACT_INTEGER(v_int32, int, VTraits<v_int32>::vlanes())
+OPENCV_HAL_IMPL_RVV_EXTRACT_INTEGER(v_uint64, uint64, VTraits<v_uint64>::vlanes())
+OPENCV_HAL_IMPL_RVV_EXTRACT_INTEGER(v_int64, int64, VTraits<v_int64>::vlanes())
+
+#define OPENCV_HAL_IMPL_RVV_EXTRACT_FP(_Tpvec, _Tp, vl) \
+template <int s = 0> \
+inline _Tpvec v_extract(const _Tpvec& a, const _Tpvec& b, int i = s) \
+{ \
+    return __riscv_vslideup(__riscv_vslidedown(a, i, vl), b, VTraits<_Tpvec>::vlanes() - i, vl); \
+} \
+template<int s = 0> inline _Tp v_extract_n(_Tpvec v, int i = s) \
+{ \
+    return __riscv_vfmv_f(__riscv_vslidedown(v, i, vl)); \
+}
+
+OPENCV_HAL_IMPL_RVV_EXTRACT_FP(v_float32, float, VTraits<v_float32>::vlanes())
+#if CV_SIMD_SCALABLE_64F
+OPENCV_HAL_IMPL_RVV_EXTRACT_FP(v_float64, double, VTraits<v_float64>::vlanes())
+#endif
+
+#define OPENCV_HAL_IMPL_RVV_EXTRACT(_Tpvec, _Tp, vl) \
+inline _Tp v_extract_highest(_Tpvec v) \
+{ \
+    return v_extract_n(v, vl-1); \
+}
+
+OPENCV_HAL_IMPL_RVV_EXTRACT(v_uint8, uchar, VTraits<v_uint8>::vlanes())
+OPENCV_HAL_IMPL_RVV_EXTRACT(v_int8, schar, VTraits<v_int8>::vlanes())
+OPENCV_HAL_IMPL_RVV_EXTRACT(v_uint16, ushort, VTraits<v_uint16>::vlanes())
+OPENCV_HAL_IMPL_RVV_EXTRACT(v_int16, short, VTraits<v_int16>::vlanes())
+OPENCV_HAL_IMPL_RVV_EXTRACT(v_uint32, unsigned int, VTraits<v_uint32>::vlanes())
+OPENCV_HAL_IMPL_RVV_EXTRACT(v_int32, int, VTraits<v_int32>::vlanes())
+OPENCV_HAL_IMPL_RVV_EXTRACT(v_uint64, uint64, VTraits<v_uint64>::vlanes())
+OPENCV_HAL_IMPL_RVV_EXTRACT(v_int64, int64, VTraits<v_int64>::vlanes())
+OPENCV_HAL_IMPL_RVV_EXTRACT(v_float32, float, VTraits<v_float32>::vlanes())
+#if CV_SIMD_SCALABLE_64F
+OPENCV_HAL_IMPL_RVV_EXTRACT(v_float64, double, VTraits<v_float64>::vlanes())
+#endif
+
+
+////////////// Load/Store //////////////
+#define OPENCV_HAL_IMPL_RVV_LOADSTORE_OP(_Tpvec, _nTpvec, _Tp, hvl, vl, width, suffix) \
+inline _Tpvec v_load(const _Tp* ptr) \
+{ \
+    return __riscv_vle##width##_v_##suffix##m2(ptr, vl); \
+} \
+inline _Tpvec v_load_aligned(const _Tp* ptr) \
+{ \
+    return __riscv_vle##width##_v_##suffix##m2(ptr, vl); \
+} \
+inline void v_store(_Tp* ptr, const _Tpvec& a, hal::StoreMode /*mode*/) \
+{ \
+    __riscv_vse##width##_v_##suffix##m2(ptr, a, vl); \
+} \
+inline _Tpvec v_load_low(const _Tp* ptr) \
+{ \
+    return __riscv_vle##width##_v_##suffix##m2(ptr, hvl); \
+} \
+inline _Tpvec v_load_halves(const _Tp* ptr0, const _Tp* ptr1) \
+{ \
+    return __riscv_vslideup(__riscv_vle##width##_v_##suffix##m2(ptr0, hvl), __riscv_vle##width##_v_##suffix##m2(ptr1, hvl), hvl, vl); \
+} \
+inline void v_store(_Tp* ptr, const _Tpvec& a) \
+{ \
+    __riscv_vse##width(ptr, a, vl); \
+} \
+inline void v_store_aligned(_Tp* ptr, const _Tpvec& a) \
+{ \
+    __riscv_vse##width(ptr, a, vl); \
+} \
+inline void v_store_aligned_nocache(_Tp* ptr, const _Tpvec& a) \
+{ \
+    __riscv_vse##width(ptr, a, vl); \
+} \
+inline void v_store_low(_Tp* ptr, const _Tpvec& a) \
+{ \
+    __riscv_vse##width(ptr, a, hvl); \
+} \
+inline void v_store_high(_Tp* ptr, const _Tpvec& a) \
+{ \
+    __riscv_vse##width(ptr, __riscv_vslidedown_vx_##suffix##m2(a, hvl, vl), hvl); \
+} \
+template<typename... Targs> \
+_Tpvec v_load_##suffix(Targs... nScalars) \
+{ \
+    return v_load({nScalars...}); \
+}
+
+
+OPENCV_HAL_IMPL_RVV_LOADSTORE_OP(v_uint8, vuint8m2_t, uchar, VTraits<v_uint8>::vlanes() / 2, VTraits<v_uint8>::vlanes(), 8, u8)
+OPENCV_HAL_IMPL_RVV_LOADSTORE_OP(v_int8, vint8m2_t, schar, VTraits<v_int8>::vlanes() / 2, VTraits<v_int8>::vlanes(), 8, i8)
+OPENCV_HAL_IMPL_RVV_LOADSTORE_OP(v_uint16, vuint16m2_t, ushort, VTraits<v_uint16>::vlanes() / 2, VTraits<v_uint16>::vlanes(), 16, u16)
+OPENCV_HAL_IMPL_RVV_LOADSTORE_OP(v_int16, vint16m2_t, short, VTraits<v_int16>::vlanes() / 2, VTraits<v_int16>::vlanes(), 16, i16)
+OPENCV_HAL_IMPL_RVV_LOADSTORE_OP(v_uint32, vuint32m2_t, unsigned int, VTraits<v_uint32>::vlanes() / 2, VTraits<v_uint32>::vlanes(), 32, u32)
+OPENCV_HAL_IMPL_RVV_LOADSTORE_OP(v_int32, vint32m2_t, int, VTraits<v_int32>::vlanes() / 2, VTraits<v_int32>::vlanes(), 32, i32)
+OPENCV_HAL_IMPL_RVV_LOADSTORE_OP(v_uint64, vuint64m2_t, uint64, VTraits<v_uint64>::vlanes() / 2, VTraits<v_uint64>::vlanes(), 64, u64)
+OPENCV_HAL_IMPL_RVV_LOADSTORE_OP(v_int64, vint64m2_t, int64, VTraits<v_int64>::vlanes() / 2, VTraits<v_int64>::vlanes(), 64, i64)
+OPENCV_HAL_IMPL_RVV_LOADSTORE_OP(v_float32, vfloat32m2_t, float, VTraits<v_float32>::vlanes() /2 , VTraits<v_float32>::vlanes(), 32, f32)
+
+#if CV_SIMD_SCALABLE_64F
+OPENCV_HAL_IMPL_RVV_LOADSTORE_OP(v_float64, vfloat64m2_t, double, VTraits<v_float64>::vlanes() / 2, VTraits<v_float64>::vlanes(), 64, f64)
+#endif
+
+////////////// Lookup table access ////////////////////
+#define OPENCV_HAL_IMPL_RVV_LUT(_Tpvec, _Tp, suffix) \
+inline _Tpvec v_lut(const _Tp* tab, const int* idx) \
+{ \
+    auto vidx = __riscv_vmul(__riscv_vreinterpret_u32##suffix(__riscv_vle32_v_i32##suffix(idx, VTraits<_Tpvec>::vlanes())), sizeof(_Tp), VTraits<_Tpvec>::vlanes()); \
+    return __riscv_vloxei32(tab, vidx, VTraits<_Tpvec>::vlanes()); \
+}
+OPENCV_HAL_IMPL_RVV_LUT(v_int8, schar, m8)
+OPENCV_HAL_IMPL_RVV_LUT(v_int16, short, m4)
+OPENCV_HAL_IMPL_RVV_LUT(v_int32, int, m2)
+OPENCV_HAL_IMPL_RVV_LUT(v_int64, int64_t, m1)
+OPENCV_HAL_IMPL_RVV_LUT(v_float32, float, m2)
+#if CV_SIMD_SCALABLE_64F
+OPENCV_HAL_IMPL_RVV_LUT(v_float64, double, m1)
+#endif
+
+#define OPENCV_HAL_IMPL_RVV_LUT_PAIRS(_Tpvec, _Tp, suffix1, suffix2, v_trunc) \
+inline _Tpvec v_lut_pairs(const _Tp* tab, const int* idx) \
+{ \
+    auto v0 = __riscv_vle32_v_u32##suffix1((unsigned*)idx, VTraits<_Tpvec>::vlanes()/2); \
+    auto v1 = __riscv_vadd(v0, 1, VTraits<_Tpvec>::vlanes()/2); \
+    auto w0 = __riscv_vwcvtu_x(v0, VTraits<_Tpvec>::vlanes()/2); \
+    auto w1 = __riscv_vwcvtu_x(v1, VTraits<_Tpvec>::vlanes()/2); \
+    auto sh1 = __riscv_vslide1up(v_trunc(__riscv_vreinterpret_u32##suffix2(w1)),0, VTraits<_Tpvec>::vlanes()); \
+    auto vid = __riscv_vor(sh1, v_trunc(__riscv_vreinterpret_u32##suffix2(w0)), VTraits<_Tpvec>::vlanes()); \
+    auto vidx = __riscv_vmul(vid, sizeof(_Tp), VTraits<_Tpvec>::vlanes()); \
+    return __riscv_vloxei32(tab, vidx, VTraits<_Tpvec>::vlanes()); \
+}
+OPENCV_HAL_IMPL_RVV_LUT_PAIRS(v_int8, schar, m4, m8, OPENCV_HAL_NOP)
+OPENCV_HAL_IMPL_RVV_LUT_PAIRS(v_int16, short, m2, m4, OPENCV_HAL_NOP)
+OPENCV_HAL_IMPL_RVV_LUT_PAIRS(v_int32, int, m1, m2, OPENCV_HAL_NOP)
+OPENCV_HAL_IMPL_RVV_LUT_PAIRS(v_float32, float, m1, m2, OPENCV_HAL_NOP)
+OPENCV_HAL_IMPL_RVV_LUT_PAIRS(v_int64, int64_t, m1, m2, __riscv_vlmul_trunc_u32m1)
+#if CV_SIMD_SCALABLE_64F
+OPENCV_HAL_IMPL_RVV_LUT_PAIRS(v_float64, double, m1, m2, __riscv_vlmul_trunc_u32m1)
+#endif
+
+
+#define OPENCV_HAL_IMPL_RVV_LUT_QUADS(_Tpvec, _Tp, suffix0, suffix1, suffix2, v_trunc) \
+inline _Tpvec v_lut_quads(const _Tp* tab, const int* idx) \
+{ \
+    auto v0 = __riscv_vle32_v_u32##suffix0((unsigned*)idx, VTraits<_Tpvec>::vlanes()/4); \
+    auto v1 = __riscv_vadd(v0, 1, VTraits<_Tpvec>::vlanes()/4); \
+    auto v2 = __riscv_vadd(v0, 2, VTraits<_Tpvec>::vlanes()/4); \
+    auto v3 = __riscv_vadd(v0, 3, VTraits<_Tpvec>::vlanes()/4); \
+    auto w0 = __riscv_vwcvtu_x(v0, VTraits<_Tpvec>::vlanes()/4); \
+    auto w1 = __riscv_vwcvtu_x(v1, VTraits<_Tpvec>::vlanes()/4); \
+    auto w2 = __riscv_vwcvtu_x(v2, VTraits<_Tpvec>::vlanes()/4); \
+    auto w3 = __riscv_vwcvtu_x(v3, VTraits<_Tpvec>::vlanes()/4); \
+    auto sh2 = __riscv_vslide1up(__riscv_vreinterpret_u32##suffix1(w2),0, VTraits<_Tpvec>::vlanes()/2); \
+    auto sh3 = __riscv_vslide1up(__riscv_vreinterpret_u32##suffix1(w3),0, VTraits<_Tpvec>::vlanes()/2); \
+    auto vid0 = __riscv_vor(sh2, __riscv_vreinterpret_u32##suffix1(w0), VTraits<_Tpvec>::vlanes()/2); \
+    auto vid1 = __riscv_vor(sh3, __riscv_vreinterpret_u32##suffix1(w1), VTraits<_Tpvec>::vlanes()/2); \
+    auto wid0 = __riscv_vwcvtu_x(v_trunc(vid0), VTraits<_Tpvec>::vlanes()/2); \
+    auto wid1 = __riscv_vwcvtu_x(v_trunc(vid1), VTraits<_Tpvec>::vlanes()/2); \
+    auto shwid1 = __riscv_vslide1up(__riscv_vreinterpret_u32##suffix2(wid1),0, VTraits<_Tpvec>::vlanes()); \
+    auto vid = __riscv_vor(shwid1, __riscv_vreinterpret_u32##suffix2(wid0), VTraits<_Tpvec>::vlanes()); \
+    auto vidx = __riscv_vmul(vid, sizeof(_Tp), VTraits<_Tpvec>::vlanes()); \
+    return __riscv_vloxei32(tab, vidx, VTraits<_Tpvec>::vlanes()); \
+}
+OPENCV_HAL_IMPL_RVV_LUT_QUADS(v_int8, schar, m2, m4, m8, OPENCV_HAL_NOP)
+OPENCV_HAL_IMPL_RVV_LUT_QUADS(v_int16, short, m1 , m2, m4, OPENCV_HAL_NOP)
+OPENCV_HAL_IMPL_RVV_LUT_QUADS(v_int32, int, m1, m2, m2, __riscv_vlmul_trunc_u32m1)
+OPENCV_HAL_IMPL_RVV_LUT_QUADS(v_float32, float, m1, m2, m2, __riscv_vlmul_trunc_u32m1)
+
+#define OPENCV_HAL_IMPL_RVV_LUT_VEC(_Tpvec, _Tp) \
+inline _Tpvec v_lut(const _Tp* tab, const v_int32& vidx) \
+{ \
+    v_uint32 vidx_ = __riscv_vmul(__riscv_vreinterpret_u32m2(vidx), sizeof(_Tp), VTraits<v_int32>::vlanes()); \
+    return __riscv_vloxei32(tab, vidx_, VTraits<_Tpvec>::vlanes()); \
+}
+OPENCV_HAL_IMPL_RVV_LUT_VEC(v_float32, float)
+OPENCV_HAL_IMPL_RVV_LUT_VEC(v_int32, int)
+OPENCV_HAL_IMPL_RVV_LUT_VEC(v_uint32, unsigned)
+
+#if CV_SIMD_SCALABLE_64F
+inline v_float64 v_lut(const double* tab, const v_int32& vidx) \
+{ \
+    vuint32m1_t vidx_ = __riscv_vmul(__riscv_vlmul_trunc_u32m1(__riscv_vreinterpret_u32m2(vidx)), sizeof(double), VTraits<v_float64>::vlanes()); \
+    return __riscv_vloxei32(tab, vidx_, VTraits<v_float64>::vlanes()); \
+}
+#endif
+
+
+// Strangely, __riscv_vluxseg2ei32 is slower (tested on Muse-Pi and CanMV K230)
+#define OPENCV_HAL_IMPL_RVV_LUT_DEINTERLEAVE(_Tpvec, _Tp, suffix) \
+inline void v_lut_deinterleave(const _Tp* tab, const v_int32& vidx, _Tpvec& vx, _Tpvec& vy) \
+{ \
+    v_uint32 vidx_ = __riscv_vmul(__riscv_vreinterpret_u32m2(vidx), sizeof(_Tp), VTraits<v_int32>::vlanes()); \
+    vx = __riscv_vluxei32(tab, vidx_, VTraits<_Tpvec>::vlanes()); \
+    vy = __riscv_vluxei32(tab, __riscv_vadd(vidx_, sizeof(_Tp), VTraits<v_int32>::vlanes()), VTraits<_Tpvec>::vlanes()); \
+}
+OPENCV_HAL_IMPL_RVV_LUT_DEINTERLEAVE(v_float32, float, f32)
+OPENCV_HAL_IMPL_RVV_LUT_DEINTERLEAVE(v_int32, int, i32)
+OPENCV_HAL_IMPL_RVV_LUT_DEINTERLEAVE(v_uint32, unsigned, u32)
+
+#if CV_SIMD_SCALABLE_64F
+inline void v_lut_deinterleave(const double* tab, const v_int32& vidx, v_float64& vx, v_float64& vy) \
+{ \
+    vuint32m1_t vidx_ = __riscv_vmul(__riscv_vlmul_trunc_u32m1(__riscv_vreinterpret_u32m2(vidx)), sizeof(double), VTraits<v_float64>::vlanes()); \
+    vx = __riscv_vluxei32(tab, vidx_, VTraits<v_float64>::vlanes()); \
+    vy = __riscv_vluxei32(tab, __riscv_vadd(vidx_, sizeof(double), VTraits<v_int32>::vlanes()), VTraits<v_float64>::vlanes()); \
+}
+#endif
+
+
+inline v_uint8 v_lut(const uchar* tab, const int* idx) { return v_reinterpret_as_u8(v_lut((schar*)tab, idx)); }
+inline v_uint8 v_lut_pairs(const uchar* tab, const int* idx) { return v_reinterpret_as_u8(v_lut_pairs((schar*)tab, idx)); }
+inline v_uint8 v_lut_quads(const uchar* tab, const int* idx) { return v_reinterpret_as_u8(v_lut_quads((schar*)tab, idx)); }
+inline v_uint16 v_lut(const ushort* tab, const int* idx) { return v_reinterpret_as_u16(v_lut((short*)tab, idx)); }
+inline v_uint16 v_lut_pairs(const ushort* tab, const int* idx) { return v_reinterpret_as_u16(v_lut_pairs((short*)tab, idx)); }
+inline v_uint16 v_lut_quads(const ushort* tab, const int* idx) { return v_reinterpret_as_u16(v_lut_quads((short*)tab, idx)); }
+inline v_uint32 v_lut(const unsigned* tab, const int* idx) { return v_reinterpret_as_u32(v_lut((int*)tab, idx)); }
+inline v_uint32 v_lut_pairs(const unsigned* tab, const int* idx) { return v_reinterpret_as_u32(v_lut_pairs((int*)tab, idx)); }
+inline v_uint32 v_lut_quads(const unsigned* tab, const int* idx) { return v_reinterpret_as_u32(v_lut_quads((int*)tab, idx)); }
+inline v_uint64 v_lut(const uint64* tab, const int* idx) { return v_reinterpret_as_u64(v_lut((const int64_t *)tab, idx)); }
+inline v_uint64 v_lut_pairs(const uint64* tab, const int* idx) { return v_reinterpret_as_u64(v_lut_pairs((const int64_t *)tab, idx)); }
+
+////////////// Pack boolean ////////////////////
+inline v_uint8 v_pack_b(const v_uint16& a, const v_uint16& b)
+{
+    return __riscv_vnsrl(__riscv_vset(__riscv_vlmul_ext_v_u16m2_u16m4(a),1,b), 0, VTraits<v_uint8>::vlanes());
+}
+
+inline v_uint8 v_pack_b(const v_uint32& a, const v_uint32& b,
+                           const v_uint32& c, const v_uint32& d)
+{
+
+    return __riscv_vnsrl(__riscv_vnsrl(__riscv_vset(__riscv_vset(__riscv_vset(__riscv_vlmul_ext_u32m8(a),1,b),2,c),3,d), 0, VTraits<v_uint8>::vlanes()), 0, VTraits<v_uint8>::vlanes());
+}
+
+inline v_uint8 v_pack_b(const v_uint64& a, const v_uint64& b, const v_uint64& c,
+                           const v_uint64& d, const v_uint64& e, const v_uint64& f,
+                           const v_uint64& g, const v_uint64& h)
+{
+    vuint8m1_t t0 = __riscv_vnsrl(__riscv_vnsrl(__riscv_vnsrl(__riscv_vset(__riscv_vset(__riscv_vset(__riscv_vlmul_ext_u64m8(a),1,b),2,c),3,d), 0, VTraits<v_uint8>::vlanes()), 0, VTraits<v_uint8>::vlanes()), 0, VTraits<v_uint8>::vlanes());
+    vuint8m1_t t1 = __riscv_vnsrl(__riscv_vnsrl(__riscv_vnsrl(__riscv_vset(__riscv_vset(__riscv_vset(__riscv_vlmul_ext_u64m8(e),1,f),2,g),3,h), 0, VTraits<v_uint8>::vlanes()), 0, VTraits<v_uint8>::vlanes()), 0, VTraits<v_uint8>::vlanes());
+
+    return __riscv_vset(__riscv_vlmul_ext_u8m2(t0), 1, t1);
+}
+
+////////////// Arithmetics //////////////
+#define OPENCV_HAL_IMPL_RVV_BIN_OP(_Tpvec, ocv_intrin, rvv_intrin) \
+inline _Tpvec v_##ocv_intrin(const _Tpvec& a, const _Tpvec& b) \
+{ \
+    return rvv_intrin(a, b, VTraits<_Tpvec>::vlanes()); \
+}
+
+OPENCV_HAL_IMPL_RVV_BIN_OP(v_uint8, add, __riscv_vsaddu)
+OPENCV_HAL_IMPL_RVV_BIN_OP(v_uint8, sub, __riscv_vssubu)
+OPENCV_HAL_IMPL_RVV_BIN_OP(v_int8, add, __riscv_vsadd)
+OPENCV_HAL_IMPL_RVV_BIN_OP(v_int8, sub, __riscv_vssub)
+OPENCV_HAL_IMPL_RVV_BIN_OP(v_uint16, add, __riscv_vsaddu)
+OPENCV_HAL_IMPL_RVV_BIN_OP(v_uint16, sub, __riscv_vssubu)
+OPENCV_HAL_IMPL_RVV_BIN_OP(v_int16, add, __riscv_vsadd)
+OPENCV_HAL_IMPL_RVV_BIN_OP(v_int16, sub, __riscv_vssub)
+OPENCV_HAL_IMPL_RVV_BIN_OP(v_uint32, add, __riscv_vadd)
+OPENCV_HAL_IMPL_RVV_BIN_OP(v_uint32, sub, __riscv_vsub)
+OPENCV_HAL_IMPL_RVV_BIN_OP(v_uint32, mul, __riscv_vmul)
+OPENCV_HAL_IMPL_RVV_BIN_OP(v_int32, add, __riscv_vadd)
+OPENCV_HAL_IMPL_RVV_BIN_OP(v_int32, sub, __riscv_vsub)
+OPENCV_HAL_IMPL_RVV_BIN_OP(v_int32, mul, __riscv_vmul)
+OPENCV_HAL_IMPL_RVV_BIN_OP(v_float32, add, __riscv_vfadd)
+OPENCV_HAL_IMPL_RVV_BIN_OP(v_float32, sub, __riscv_vfsub)
+OPENCV_HAL_IMPL_RVV_BIN_OP(v_float32, mul, __riscv_vfmul)
+OPENCV_HAL_IMPL_RVV_BIN_OP(v_float32, div, __riscv_vfdiv)
+OPENCV_HAL_IMPL_RVV_BIN_OP(v_uint64, add, __riscv_vadd)
+OPENCV_HAL_IMPL_RVV_BIN_OP(v_uint64, sub, __riscv_vsub)
+OPENCV_HAL_IMPL_RVV_BIN_OP(v_int64, add, __riscv_vadd)
+OPENCV_HAL_IMPL_RVV_BIN_OP(v_int64, sub, __riscv_vsub)
+
+#if CV_SIMD_SCALABLE_64F
+OPENCV_HAL_IMPL_RVV_BIN_OP(v_float64, add, __riscv_vfadd)
+OPENCV_HAL_IMPL_RVV_BIN_OP(v_float64, sub, __riscv_vfsub)
+OPENCV_HAL_IMPL_RVV_BIN_OP(v_float64, mul, __riscv_vfmul)
+OPENCV_HAL_IMPL_RVV_BIN_OP(v_float64, div, __riscv_vfdiv)
+#endif
+
+#define OPENCV_HAL_IMPL_RVV_BIN_MADD(_Tpvec, rvv_add) \
+template<typename... Args> \
+inline _Tpvec v_add(const _Tpvec& f1, const _Tpvec& f2, const Args&... vf) { \
+    return v_add(rvv_add(f1, f2, VTraits<_Tpvec>::vlanes()), vf...); \
+}
+#define OPENCV_HAL_IMPL_RVV_BIN_MMUL(_Tpvec, rvv_mul) \
+template<typename... Args> \
+inline _Tpvec v_mul(const _Tpvec& f1, const _Tpvec& f2, const Args&... vf) { \
+    return v_mul(rvv_mul(f1, f2, VTraits<_Tpvec>::vlanes()), vf...); \
+}
+OPENCV_HAL_IMPL_RVV_BIN_MADD(v_uint8, __riscv_vsaddu)
+OPENCV_HAL_IMPL_RVV_BIN_MADD(v_int8, __riscv_vsadd)
+OPENCV_HAL_IMPL_RVV_BIN_MADD(v_uint16, __riscv_vsaddu)
+OPENCV_HAL_IMPL_RVV_BIN_MADD(v_int16, __riscv_vsadd)
+OPENCV_HAL_IMPL_RVV_BIN_MADD(v_uint32, __riscv_vadd)
+OPENCV_HAL_IMPL_RVV_BIN_MADD(v_int32, __riscv_vadd)
+OPENCV_HAL_IMPL_RVV_BIN_MADD(v_float32, __riscv_vfadd)
+OPENCV_HAL_IMPL_RVV_BIN_MADD(v_uint64, __riscv_vadd)
+OPENCV_HAL_IMPL_RVV_BIN_MADD(v_int64, __riscv_vadd)
+
+OPENCV_HAL_IMPL_RVV_BIN_MMUL(v_uint32, __riscv_vmul)
+OPENCV_HAL_IMPL_RVV_BIN_MMUL(v_int32, __riscv_vmul)
+OPENCV_HAL_IMPL_RVV_BIN_MMUL(v_float32, __riscv_vfmul)
+#if CV_SIMD_SCALABLE_64F
+OPENCV_HAL_IMPL_RVV_BIN_MADD(v_float64, __riscv_vfadd)
+OPENCV_HAL_IMPL_RVV_BIN_MMUL(v_float64, __riscv_vfmul)
+#endif
+
+#define OPENCV_HAL_IMPL_RVV_MUL_EXPAND(_Tpvec, _Tpwvec, _TpwvecM2, suffix, wmul) \
+inline void v_mul_expand(const _Tpvec& a, const _Tpvec& b, _Tpwvec& c, _Tpwvec& d) \
+{ \
+    _TpwvecM2 temp = wmul(a, b, VTraits<_Tpvec>::vlanes()); \
+    c = __riscv_vget_##suffix##m2(temp, 0); \
+    d = __riscv_vget_##suffix##m2(temp, 1); \
+}
+
+OPENCV_HAL_IMPL_RVV_MUL_EXPAND(v_uint8, v_uint16, vuint16m4_t, u16, __riscv_vwmulu)
+OPENCV_HAL_IMPL_RVV_MUL_EXPAND(v_int8, v_int16, vint16m4_t, i16, __riscv_vwmul)
+OPENCV_HAL_IMPL_RVV_MUL_EXPAND(v_uint16, v_uint32, vuint32m4_t, u32, __riscv_vwmulu)
+OPENCV_HAL_IMPL_RVV_MUL_EXPAND(v_int16, v_int32, vint32m4_t, i32, __riscv_vwmul)
+OPENCV_HAL_IMPL_RVV_MUL_EXPAND(v_uint32, v_uint64, vuint64m4_t, u64, __riscv_vwmulu)
+
+inline v_int16 v_mul_hi(const v_int16& a, const v_int16& b)
+{
+    return __riscv_vmulh(a, b, VTraits<v_int16>::vlanes());
+}
+inline v_uint16 v_mul_hi(const v_uint16& a, const v_uint16& b)
+{
+    return __riscv_vmulhu(a, b, VTraits<v_uint16>::vlanes());
+}
+
+////////////// Arithmetics (wrap)//////////////
+OPENCV_HAL_IMPL_RVV_BIN_OP(v_uint8, add_wrap, __riscv_vadd)
+OPENCV_HAL_IMPL_RVV_BIN_OP(v_int8, add_wrap, __riscv_vadd)
+OPENCV_HAL_IMPL_RVV_BIN_OP(v_uint16, add_wrap, __riscv_vadd)
+OPENCV_HAL_IMPL_RVV_BIN_OP(v_int16, add_wrap, __riscv_vadd)
+OPENCV_HAL_IMPL_RVV_BIN_OP(v_uint8, sub_wrap, __riscv_vsub)
+OPENCV_HAL_IMPL_RVV_BIN_OP(v_int8, sub_wrap, __riscv_vsub)
+OPENCV_HAL_IMPL_RVV_BIN_OP(v_uint16, sub_wrap, __riscv_vsub)
+OPENCV_HAL_IMPL_RVV_BIN_OP(v_int16, sub_wrap, __riscv_vsub)
+OPENCV_HAL_IMPL_RVV_BIN_OP(v_uint8, mul_wrap, __riscv_vmul)
+OPENCV_HAL_IMPL_RVV_BIN_OP(v_int8, mul_wrap, __riscv_vmul)
+OPENCV_HAL_IMPL_RVV_BIN_OP(v_uint16, mul_wrap, __riscv_vmul)
+OPENCV_HAL_IMPL_RVV_BIN_OP(v_int16, mul_wrap, __riscv_vmul)
+
+//////// Saturating Multiply ////////
+#define OPENCV_HAL_IMPL_RVV_MUL_SAT(_Tpvec, _clip, _wmul) \
+inline _Tpvec v_mul(const _Tpvec& a, const _Tpvec& b) \
+{ \
+    return _clip(_wmul(a, b, VTraits<_Tpvec>::vlanes()), 0, 0, VTraits<_Tpvec>::vlanes()); \
+} \
+template<typename... Args> \
+inline _Tpvec v_mul(const _Tpvec& a1, const _Tpvec& a2, const Args&... va) { \
+    return v_mul(_clip(_wmul(a1, a2, VTraits<_Tpvec>::vlanes()), 0, 0, VTraits<_Tpvec>::vlanes()), va...); \
+}
+
+OPENCV_HAL_IMPL_RVV_MUL_SAT(v_uint8, __riscv_vnclipu, __riscv_vwmulu)
+OPENCV_HAL_IMPL_RVV_MUL_SAT(v_int8, __riscv_vnclip, __riscv_vwmul)
+OPENCV_HAL_IMPL_RVV_MUL_SAT(v_uint16, __riscv_vnclipu, __riscv_vwmulu)
+OPENCV_HAL_IMPL_RVV_MUL_SAT(v_int16, __riscv_vnclip, __riscv_vwmul)
+
+////////////// Bitwise logic //////////////
+
+#define OPENCV_HAL_IMPL_RVV_LOGIC_OP(_Tpvec, vl) \
+inline _Tpvec v_and(const _Tpvec& a, const _Tpvec& b) \
+{ \
+    return __riscv_vand(a, b, vl); \
+} \
+inline _Tpvec v_or(const _Tpvec& a, const _Tpvec& b) \
+{ \
+    return __riscv_vor(a, b, vl); \
+} \
+inline _Tpvec v_xor(const _Tpvec& a, const _Tpvec& b) \
+{ \
+    return __riscv_vxor(a, b, vl); \
+} \
+inline _Tpvec v_not (const _Tpvec& a) \
+{ \
+    return __riscv_vnot(a, vl); \
+}
+
+OPENCV_HAL_IMPL_RVV_LOGIC_OP(v_uint8, VTraits<v_uint8>::vlanes())
+OPENCV_HAL_IMPL_RVV_LOGIC_OP(v_int8, VTraits<v_int8>::vlanes())
+OPENCV_HAL_IMPL_RVV_LOGIC_OP(v_uint16, VTraits<v_uint16>::vlanes())
+OPENCV_HAL_IMPL_RVV_LOGIC_OP(v_int16, VTraits<v_int16>::vlanes())
+OPENCV_HAL_IMPL_RVV_LOGIC_OP(v_uint32, VTraits<v_uint32>::vlanes())
+OPENCV_HAL_IMPL_RVV_LOGIC_OP(v_int32, VTraits<v_int32>::vlanes())
+OPENCV_HAL_IMPL_RVV_LOGIC_OP(v_uint64, VTraits<v_uint64>::vlanes())
+OPENCV_HAL_IMPL_RVV_LOGIC_OP(v_int64, VTraits<v_int64>::vlanes())
+
+#define OPENCV_HAL_IMPL_RVV_FLT_BIT_OP(intrin) \
+inline v_float32 intrin (const v_float32& a, const v_float32& b) \
+{ \
+    return __riscv_vreinterpret_f32m2(intrin(__riscv_vreinterpret_i32m2(a), __riscv_vreinterpret_i32m2(b))); \
+}
+OPENCV_HAL_IMPL_RVV_FLT_BIT_OP(v_and)
+OPENCV_HAL_IMPL_RVV_FLT_BIT_OP(v_or)
+OPENCV_HAL_IMPL_RVV_FLT_BIT_OP(v_xor)
+
+inline v_float32 v_not (const v_float32& a) \
+{ \
+    return __riscv_vreinterpret_f32m2(v_not(__riscv_vreinterpret_i32m2(a))); \
+}
+
+#if CV_SIMD_SCALABLE_64F
+#define OPENCV_HAL_IMPL_RVV_FLT64_BIT_OP(intrin) \
+inline v_float64 intrin (const v_float64& a, const v_float64& b) \
+{ \
+    return __riscv_vreinterpret_f64m2(intrin(__riscv_vreinterpret_i64m2(a), __riscv_vreinterpret_i64m2(b))); \
+}
+OPENCV_HAL_IMPL_RVV_FLT64_BIT_OP(v_and)
+OPENCV_HAL_IMPL_RVV_FLT64_BIT_OP(v_or)
+OPENCV_HAL_IMPL_RVV_FLT64_BIT_OP(v_xor)
+
+inline v_float64 v_not (const v_float64& a) \
+{ \
+    return __riscv_vreinterpret_f64m2(v_not(__riscv_vreinterpret_i64m2(a))); \
+}
+#endif
+
+
+////////////// Bitwise shifts //////////////
+/*  Usage
+1. v_shl<N>(vec);
+2. v_shl(vec, N); // instead of vec << N, when N is non-constant.
+*/
+
+#define OPENCV_HAL_IMPL_RVV_UNSIGNED_SHIFT_OP(_Tpvec, vl) \
+template<int s = 0> inline _Tpvec v_shl(const _Tpvec& a, int n = s) \
+{ \
+    return _Tpvec(__riscv_vsll(a, uint8_t(n), vl)); \
+} \
+template<int s = 0> inline _Tpvec v_shr(const _Tpvec& a, int n = s) \
+{ \
+    return _Tpvec(__riscv_vsrl(a, uint8_t(n), vl)); \
+}
+
+#define OPENCV_HAL_IMPL_RVV_SIGNED_SHIFT_OP(_Tpvec, vl) \
+template<int s = 0> inline _Tpvec v_shl(const _Tpvec& a, int n = s) \
+{ \
+    return _Tpvec(__riscv_vsll(a, uint8_t(n), vl)); \
+} \
+template<int s = 0> inline _Tpvec v_shr(const _Tpvec& a, int n = s) \
+{ \
+    return _Tpvec(__riscv_vsra(a, uint8_t(n), vl)); \
+}
+
+OPENCV_HAL_IMPL_RVV_UNSIGNED_SHIFT_OP(v_uint16, VTraits<v_uint16>::vlanes())
+OPENCV_HAL_IMPL_RVV_UNSIGNED_SHIFT_OP(v_uint32, VTraits<v_uint32>::vlanes())
+OPENCV_HAL_IMPL_RVV_UNSIGNED_SHIFT_OP(v_uint64, VTraits<v_uint64>::vlanes())
+OPENCV_HAL_IMPL_RVV_SIGNED_SHIFT_OP(v_int16, VTraits<v_int16>::vlanes())
+OPENCV_HAL_IMPL_RVV_SIGNED_SHIFT_OP(v_int32, VTraits<v_int32>::vlanes())
+OPENCV_HAL_IMPL_RVV_SIGNED_SHIFT_OP(v_int64, VTraits<v_int64>::vlanes())
+
+////////////// Comparison //////////////
+#define OPENCV_HAL_IMPL_RVV_INT_CMP_OP(_Tpvec, op, intrin, suffix) \
+inline _Tpvec v_##op(const _Tpvec& a, const _Tpvec& b) \
+{ \
+    size_t VLEN = VTraits<_Tpvec>::vlanes(); \
+    uint64_t ones = -1; \
+    return __riscv_vmerge(__riscv_vmv_v_x_##suffix##m2(0, VLEN), ones, intrin(a, b, VLEN), VLEN); \
+}
+
+#define OPENCV_HAL_IMPL_RVV_FLOAT_CMP_OP(_Tpvec, op, intrin, suffix) \
+inline _Tpvec v_##op (const _Tpvec& a, const _Tpvec& b) \
+{ \
+    size_t VLEN = VTraits<_Tpvec>::vlanes(); \
+    union { uint64_t u; VTraits<_Tpvec>::lane_type d; } ones; \
+    ones.u = -1; \
+    auto diff = intrin(a, b, VLEN); \
+    auto z = __riscv_vfmv_v_f_##suffix##m2(0, VLEN); \
+    auto res = __riscv_vfmerge(z, ones.d, diff, VLEN); \
+    return _Tpvec(res); \
+} //TODO
+
+#define OPENCV_HAL_IMPL_RVV_UNSIGNED_CMP(_Tpvec, suffix) \
+OPENCV_HAL_IMPL_RVV_INT_CMP_OP(_Tpvec, eq, __riscv_vmseq, suffix) \
+OPENCV_HAL_IMPL_RVV_INT_CMP_OP(_Tpvec, ne, __riscv_vmsne, suffix) \
+OPENCV_HAL_IMPL_RVV_INT_CMP_OP(_Tpvec, lt, __riscv_vmsltu, suffix) \
+OPENCV_HAL_IMPL_RVV_INT_CMP_OP(_Tpvec, gt, __riscv_vmsgtu, suffix) \
+OPENCV_HAL_IMPL_RVV_INT_CMP_OP(_Tpvec, le, __riscv_vmsleu, suffix) \
+OPENCV_HAL_IMPL_RVV_INT_CMP_OP(_Tpvec, ge, __riscv_vmsgeu, suffix)
+
+#define OPENCV_HAL_IMPL_RVV_SIGNED_CMP(_Tpvec, suffix) \
+OPENCV_HAL_IMPL_RVV_INT_CMP_OP(_Tpvec, eq, __riscv_vmseq, suffix) \
+OPENCV_HAL_IMPL_RVV_INT_CMP_OP(_Tpvec, ne, __riscv_vmsne, suffix) \
+OPENCV_HAL_IMPL_RVV_INT_CMP_OP(_Tpvec, lt, __riscv_vmslt, suffix) \
+OPENCV_HAL_IMPL_RVV_INT_CMP_OP(_Tpvec, gt, __riscv_vmsgt, suffix) \
+OPENCV_HAL_IMPL_RVV_INT_CMP_OP(_Tpvec, le, __riscv_vmsle, suffix) \
+OPENCV_HAL_IMPL_RVV_INT_CMP_OP(_Tpvec, ge, __riscv_vmsge, suffix)
+
+#define OPENCV_HAL_IMPL_RVV_FLOAT_CMP(_Tpvec, suffix) \
+OPENCV_HAL_IMPL_RVV_FLOAT_CMP_OP(_Tpvec, eq, __riscv_vmfeq, suffix) \
+OPENCV_HAL_IMPL_RVV_FLOAT_CMP_OP(_Tpvec, ne, __riscv_vmfne, suffix) \
+OPENCV_HAL_IMPL_RVV_FLOAT_CMP_OP(_Tpvec, lt, __riscv_vmflt, suffix) \
+OPENCV_HAL_IMPL_RVV_FLOAT_CMP_OP(_Tpvec, gt, __riscv_vmfgt, suffix) \
+OPENCV_HAL_IMPL_RVV_FLOAT_CMP_OP(_Tpvec, le, __riscv_vmfle, suffix) \
+OPENCV_HAL_IMPL_RVV_FLOAT_CMP_OP(_Tpvec, ge, __riscv_vmfge, suffix)
+
+
+OPENCV_HAL_IMPL_RVV_UNSIGNED_CMP(v_uint8, u8)
+OPENCV_HAL_IMPL_RVV_UNSIGNED_CMP(v_uint16, u16)
+OPENCV_HAL_IMPL_RVV_UNSIGNED_CMP(v_uint32, u32)
+OPENCV_HAL_IMPL_RVV_UNSIGNED_CMP(v_uint64, u64)
+OPENCV_HAL_IMPL_RVV_SIGNED_CMP(v_int8, i8)
+OPENCV_HAL_IMPL_RVV_SIGNED_CMP(v_int16, i16)
+OPENCV_HAL_IMPL_RVV_SIGNED_CMP(v_int32, i32)
+OPENCV_HAL_IMPL_RVV_SIGNED_CMP(v_int64, i64)
+OPENCV_HAL_IMPL_RVV_FLOAT_CMP(v_float32, f32)
+#if CV_SIMD_SCALABLE_64F
+OPENCV_HAL_IMPL_RVV_FLOAT_CMP(v_float64, f64)
+#endif
+
+inline v_float32 v_not_nan(const v_float32& a)
+{ return v_eq(a, a); }
+
+#if CV_SIMD_SCALABLE_64F
+inline v_float64 v_not_nan(const v_float64& a)
+{ return v_eq(a, a); }
+#endif
+
+////////////// Min/Max //////////////
+
+#define OPENCV_HAL_IMPL_RVV_BIN_FUNC(_Tpvec, func, intrin, vl) \
+inline _Tpvec func(const _Tpvec& a, const _Tpvec& b) \
+{ \
+    return intrin(a, b, vl); \
+}
+
+OPENCV_HAL_IMPL_RVV_BIN_FUNC(v_uint8, v_min, __riscv_vminu, VTraits<v_uint8>::vlanes())
+OPENCV_HAL_IMPL_RVV_BIN_FUNC(v_uint8, v_max, __riscv_vmaxu, VTraits<v_uint8>::vlanes())
+OPENCV_HAL_IMPL_RVV_BIN_FUNC(v_int8, v_min, __riscv_vmin, VTraits<v_int8>::vlanes())
+OPENCV_HAL_IMPL_RVV_BIN_FUNC(v_int8, v_max, __riscv_vmax, VTraits<v_int8>::vlanes())
+OPENCV_HAL_IMPL_RVV_BIN_FUNC(v_uint16, v_min, __riscv_vminu, VTraits<v_uint16>::vlanes())
+OPENCV_HAL_IMPL_RVV_BIN_FUNC(v_uint16, v_max, __riscv_vmaxu, VTraits<v_uint16>::vlanes())
+OPENCV_HAL_IMPL_RVV_BIN_FUNC(v_int16, v_min, __riscv_vmin, VTraits<v_int16>::vlanes())
+OPENCV_HAL_IMPL_RVV_BIN_FUNC(v_int16, v_max, __riscv_vmax, VTraits<v_int16>::vlanes())
+OPENCV_HAL_IMPL_RVV_BIN_FUNC(v_uint32, v_min, __riscv_vminu, VTraits<v_uint32>::vlanes())
+OPENCV_HAL_IMPL_RVV_BIN_FUNC(v_uint32, v_max, __riscv_vmaxu, VTraits<v_uint32>::vlanes())
+OPENCV_HAL_IMPL_RVV_BIN_FUNC(v_int32, v_min, __riscv_vmin, VTraits<v_int32>::vlanes())
+OPENCV_HAL_IMPL_RVV_BIN_FUNC(v_int32, v_max, __riscv_vmax, VTraits<v_int32>::vlanes())
+OPENCV_HAL_IMPL_RVV_BIN_FUNC(v_float32, v_min, __riscv_vfmin, VTraits<v_float32>::vlanes())
+OPENCV_HAL_IMPL_RVV_BIN_FUNC(v_float32, v_max, __riscv_vfmax, VTraits<v_float32>::vlanes())
+#if CV_SIMD_SCALABLE_64F
+OPENCV_HAL_IMPL_RVV_BIN_FUNC(v_float64, v_min, __riscv_vfmin, VTraits<v_float64>::vlanes())
+OPENCV_HAL_IMPL_RVV_BIN_FUNC(v_float64, v_max, __riscv_vfmax, VTraits<v_float64>::vlanes())
+#endif
+
+////////////// Transpose4x4 //////////////
+#define OPENCV_HAL_IMPL_RVV_ZIP4(_Tpvec, _wTpvec, suffix, convert2u, convert) \
+inline void v_zip4(const _Tpvec& a0, const _Tpvec& a1, _Tpvec& b0, _Tpvec& b1) { \
+    int vl = 4; \
+    _wTpvec temp = __riscv_vreinterpret_##suffix##m4(convert2u( \
+        __riscv_vor(__riscv_vzext_vf2(convert(a0), vl), \
+            __riscv_vreinterpret_u64m4(__riscv_vslide1up(__riscv_vreinterpret_u32m4(__riscv_vzext_vf2(convert(a1), vl)), 0, vl*2)), \
+            vl))); \
+    b0 = __riscv_vget_##suffix##m2(temp, 0); \
+    b1 = __riscv_vget_##suffix##m2(__riscv_vrgather(temp, __riscv_vadd(__riscv_vid_v_u32m4(vl), 4, vl)/*{4,5,6,7} */, vl) ,0); \
+}
+
+OPENCV_HAL_IMPL_RVV_ZIP4(v_uint32, vuint32m4_t, u32, OPENCV_HAL_NOP, OPENCV_HAL_NOP)
+OPENCV_HAL_IMPL_RVV_ZIP4(v_int32, vint32m4_t, i32, __riscv_vreinterpret_u32m4, __riscv_vreinterpret_u32m2)
+OPENCV_HAL_IMPL_RVV_ZIP4(v_float32, vfloat32m4_t, f32, __riscv_vreinterpret_u32m4, __riscv_vreinterpret_u32m2)
+
+
+#define OPENCV_HAL_IMPL_RVV_TRANSPOSE4x4(_Tpvec, suffix) \
+inline void v_transpose4x4(const _Tpvec& a0, const _Tpvec& a1, const _Tpvec& a2, const _Tpvec& a3, _Tpvec& b0, _Tpvec& b1, _Tpvec& b2, _Tpvec& b3) { \
+    _Tpvec t0,t1,t2,t3; \
+    v_zip4(a0, a2, t0, t2); \
+    v_zip4(a1, a3, t1, t3); \
+    v_zip4(t0, t1, b0, b1); \
+    v_zip4(t2, t3, b2, b3); \
+}
+
+OPENCV_HAL_IMPL_RVV_TRANSPOSE4x4(v_uint32, u32)
+OPENCV_HAL_IMPL_RVV_TRANSPOSE4x4(v_int32, i32)
+OPENCV_HAL_IMPL_RVV_TRANSPOSE4x4(v_float32, f32)
+
+////////////// Reduce //////////////
+
+#define OPENCV_HAL_IMPL_RVV_REDUCE_SUM(_Tpvec, _wTpvec, _nwTpvec, scalartype, wsuffix, vl, red) \
+inline scalartype v_reduce_sum(const _Tpvec& a)  \
+{ \
+    _nwTpvec zero = __riscv_vmv_v_x_##wsuffix##m1(0, vl); \
+    _nwTpvec res = __riscv_vmv_v_x_##wsuffix##m1(0, vl); \
+    res = __riscv_v##red(a, zero, vl); \
+    return (scalartype)__riscv_vmv_x(res); \
+}
+OPENCV_HAL_IMPL_RVV_REDUCE_SUM(v_uint8, v_uint16, vuint16m1_t, unsigned, u16, VTraits<v_uint8>::vlanes(), wredsumu)
+OPENCV_HAL_IMPL_RVV_REDUCE_SUM(v_int8, v_int16, vint16m1_t, int, i16, VTraits<v_int8>::vlanes(), wredsum)
+OPENCV_HAL_IMPL_RVV_REDUCE_SUM(v_uint16, v_uint32, vuint32m1_t, unsigned, u32, VTraits<v_uint16>::vlanes(), wredsumu)
+OPENCV_HAL_IMPL_RVV_REDUCE_SUM(v_int16, v_int32, vint32m1_t, int, i32, VTraits<v_int16>::vlanes(), wredsum)
+OPENCV_HAL_IMPL_RVV_REDUCE_SUM(v_uint32, v_uint64, vuint64m1_t, unsigned, u64, VTraits<v_uint32>::vlanes(), wredsumu)
+OPENCV_HAL_IMPL_RVV_REDUCE_SUM(v_int32, v_int64, vint64m1_t, int, i64, VTraits<v_int32>::vlanes(), wredsum)
+OPENCV_HAL_IMPL_RVV_REDUCE_SUM(v_uint64, v_uint64, vuint64m1_t, uint64, u64, VTraits<v_uint64>::vlanes(), redsum)
+OPENCV_HAL_IMPL_RVV_REDUCE_SUM(v_int64, v_int64, vint64m1_t, int64, i64, VTraits<v_int64>::vlanes(), redsum)
+
+
+#define OPENCV_HAL_IMPL_RVV_REDUCE_SUM_FP(_Tpvec, _wTpvec, _nwTpvec, scalartype, wsuffix, vl) \
+inline scalartype v_reduce_sum(const _Tpvec& a)  \
+{ \
+    _nwTpvec zero = __riscv_vfmv_v_f_##wsuffix##m1(0, vl); \
+    _nwTpvec res = __riscv_vfmv_v_f_##wsuffix##m1(0, vl); \
+    res = __riscv_vfredusum(a, zero, vl); \
+    return (scalartype)__riscv_vfmv_f(res); \
+}
+OPENCV_HAL_IMPL_RVV_REDUCE_SUM_FP(v_float32, v_float32, vfloat32m1_t, float, f32, VTraits<v_float32>::vlanes())
+#if CV_SIMD_SCALABLE_64F
+OPENCV_HAL_IMPL_RVV_REDUCE_SUM_FP(v_float64, v_float64, vfloat64m1_t, float, f64, VTraits<v_float64>::vlanes())
+#endif
+
+#define OPENCV_HAL_IMPL_RVV_REDUCE(_Tpvec, _nTpvec, func, scalartype, suffix, vl, red) \
+inline scalartype v_reduce_##func(const _Tpvec& a)  \
+{ \
+    _nTpvec narrowM1 = __riscv_vlmul_trunc_##suffix##m1(a); \
+    return (scalartype)__riscv_vmv_x(__riscv_v##red(a, narrowM1, vl)); \
+}
+
+#define OPENCV_HAL_IMPL_RVV_REDUCE_FP(_Tpvec, _nTpvec, func, scalartype, suffix, vl, red) \
+inline scalartype v_reduce_##func(const _Tpvec& a)  \
+{ \
+    _nTpvec narrowM1 = __riscv_vlmul_trunc_##suffix##m1(a); \
+    return (scalartype)__riscv_vfmv_f(__riscv_v##red(a, narrowM1, vl)); \
+}
+
+OPENCV_HAL_IMPL_RVV_REDUCE(v_uint8, vuint8m1_t, min, uchar, u8, VTraits<v_uint8>::vlanes(), redminu)
+OPENCV_HAL_IMPL_RVV_REDUCE(v_int8, vint8m1_t, min, schar, i8, VTraits<v_int8>::vlanes(), redmin)
+OPENCV_HAL_IMPL_RVV_REDUCE(v_uint16, vuint16m1_t, min, ushort, u16, VTraits<v_uint16>::vlanes(), redminu)
+OPENCV_HAL_IMPL_RVV_REDUCE(v_int16, vint16m1_t, min, short, i16, VTraits<v_int16>::vlanes(), redmin)
+OPENCV_HAL_IMPL_RVV_REDUCE(v_uint32, vuint32m1_t, min, unsigned, u32, VTraits<v_uint32>::vlanes(), redminu)
+OPENCV_HAL_IMPL_RVV_REDUCE(v_int32, vint32m1_t, min, int, i32, VTraits<v_int32>::vlanes(), redmin)
+OPENCV_HAL_IMPL_RVV_REDUCE_FP(v_float32, vfloat32m1_t, min, float, f32, VTraits<v_float32>::vlanes(), fredmin)
+OPENCV_HAL_IMPL_RVV_REDUCE(v_uint8,  vuint8m1_t, max, uchar, u8, VTraits<v_uint8>::vlanes(), redmaxu)
+OPENCV_HAL_IMPL_RVV_REDUCE(v_int8,  vint8m1_t, max, schar, i8, VTraits<v_int8>::vlanes(), redmax)
+OPENCV_HAL_IMPL_RVV_REDUCE(v_uint16,  vuint16m1_t, max, ushort, u16, VTraits<v_uint16>::vlanes(), redmaxu)
+OPENCV_HAL_IMPL_RVV_REDUCE(v_int16,  vint16m1_t, max, short, i16, VTraits<v_int16>::vlanes(), redmax)
+OPENCV_HAL_IMPL_RVV_REDUCE(v_uint32,  vuint32m1_t, max, unsigned, u32, VTraits<v_uint32>::vlanes(), redmaxu)
+OPENCV_HAL_IMPL_RVV_REDUCE(v_int32,  vint32m1_t, max, int, i32, VTraits<v_int32>::vlanes(), redmax)
+OPENCV_HAL_IMPL_RVV_REDUCE_FP(v_float32,  vfloat32m1_t, max, float, f32, VTraits<v_float32>::vlanes(), fredmax)
+
+inline v_float32 v_reduce_sum4(const v_float32& a, const v_float32& b,
+                                 const v_float32& c, const v_float32& d)
+{
+    // 0000 1111 2222 3333 ....
+    vuint64m4_t vid1 = __riscv_vid_v_u64m4(VTraits<vuint32m2_t>::vlanes());
+    vuint16m4_t t1 = __riscv_vreinterpret_u16m4(vid1);
+    vuint16m4_t t2 = __riscv_vslide1up(t1, 0, VTraits<vuint8m2_t>::vlanes());
+    vuint16m4_t t3 = __riscv_vslide1up(t2, 0, VTraits<vuint8m2_t>::vlanes());
+    vuint16m4_t t4 = __riscv_vslide1up(t3, 0, VTraits<vuint8m2_t>::vlanes());
+    t1 = __riscv_vor(
+        __riscv_vor(t1, t2, VTraits<vuint8m2_t>::vlanes()),
+        __riscv_vor(t3, t4, VTraits<vuint8m2_t>::vlanes()),
+        VTraits<vuint8m2_t>::vlanes()
+    );
+
+    // index for transpose4X4
+    vuint16m4_t vidx0 = __riscv_vmul(t1, 12, VTraits<vuint8m2_t>::vlanes());
+    vidx0 = __riscv_vadd(vidx0, __riscv_vid_v_u16m4(VTraits<vuint8m2_t>::vlanes()), VTraits<vuint8m2_t>::vlanes());
+    vuint16m4_t vidx1 = __riscv_vadd(vidx0, 4, VTraits<vuint8m2_t>::vlanes());
+    vuint16m4_t vidx2 = __riscv_vadd(vidx0, 8, VTraits<vuint8m2_t>::vlanes());
+    vuint16m4_t vidx3 = __riscv_vadd(vidx0, 12, VTraits<vuint8m2_t>::vlanes());
+
+    // zip
+    vuint32m4_t tempA = __riscv_vreinterpret_u32m4( \
+        __riscv_vor(__riscv_vzext_vf2(__riscv_vreinterpret_u32m2(a), VTraits<vuint16m2_t>::vlanes()), \
+            __riscv_vreinterpret_u64m4(__riscv_vslide1up(__riscv_vreinterpret_u32m4(__riscv_vzext_vf2(__riscv_vreinterpret_u32m2(c), VTraits<vuint16m2_t>::vlanes())), 0, VTraits<vuint16m2_t>::vlanes())), \
+            VTraits<vuint32m2_t>::vlanes())); \
+    vuint32m4_t tempB = __riscv_vreinterpret_u32m4( \
+        __riscv_vor(__riscv_vzext_vf2(__riscv_vreinterpret_u32m2(b), VTraits<vuint16m2_t>::vlanes()), \
+            __riscv_vreinterpret_u64m4(__riscv_vslide1up(__riscv_vreinterpret_u32m4(__riscv_vzext_vf2(__riscv_vreinterpret_u32m2(d), VTraits<vuint16m2_t>::vlanes())), 0, VTraits<vuint16m2_t>::vlanes())), \
+            VTraits<vuint32m2_t>::vlanes())); \
+    vfloat32m8_t temp = __riscv_vreinterpret_f32m8(__riscv_vreinterpret_u32m8( \
+        __riscv_vor(__riscv_vzext_vf2(tempA, VTraits<vuint8m2_t>::vlanes()), \
+            __riscv_vreinterpret_u64m8(__riscv_vslide1up(__riscv_vreinterpret_u32m8(__riscv_vzext_vf2(tempB, VTraits<vuint8m2_t>::vlanes())), 0, VTraits<vuint8m2_t>::vlanes())), \
+            VTraits<vuint16m2_t>::vlanes())));
+
+    // transpose
+    vfloat32m2_t b0 = __riscv_vlmul_trunc_f32m2(__riscv_vrgatherei16(temp, vidx0, VTraits<vuint8m2_t>::vlanes()));
+    vfloat32m2_t b1 = __riscv_vlmul_trunc_f32m2(__riscv_vrgatherei16(temp, vidx1, VTraits<vuint8m2_t>::vlanes()));
+    vfloat32m2_t b2 = __riscv_vlmul_trunc_f32m2(__riscv_vrgatherei16(temp, vidx2, VTraits<vuint8m2_t>::vlanes()));
+    vfloat32m2_t b3 = __riscv_vlmul_trunc_f32m2(__riscv_vrgatherei16(temp, vidx3, VTraits<vuint8m2_t>::vlanes()));
+
+    // vector add
+    v_float32 res = __riscv_vfadd(
+        __riscv_vfadd(b0, b1, VTraits<vfloat32m2_t>::vlanes()),
+        __riscv_vfadd(b2, b3, VTraits<vfloat32m2_t>::vlanes()),
+        VTraits<vfloat32m2_t>::vlanes()
+    );
+    return res;
+}
+
+////////////// Square-Root //////////////
+
+inline v_float32 v_sqrt(const v_float32& x)
+{
+    return __riscv_vfsqrt(x, VTraits<v_float32>::vlanes());
+}
+
+inline v_float32 v_invsqrt(const v_float32& x)
+{
+    v_float32 one = v_setall_f32(1.0f);
+    return v_div(one, v_sqrt(x));
+}
+
+#if CV_SIMD_SCALABLE_64F
+inline v_float64 v_sqrt(const v_float64& x)
+{
+    return __riscv_vfsqrt(x, VTraits<v_float64>::vlanes());
+}
+
+inline v_float64 v_invsqrt(const v_float64& x)
+{
+    v_float64 one = v_setall_f64(1.0f);
+    return v_div(one, v_sqrt(x));
+}
+#endif
+
+inline v_float32 v_magnitude(const v_float32& a, const v_float32& b)
+{
+    v_float32 x = __riscv_vfmacc(__riscv_vfmul(a, a, VTraits<v_float32>::vlanes()), b, b, VTraits<v_float32>::vlanes());
+    return v_sqrt(x);
+}
+
+inline v_float32 v_sqr_magnitude(const v_float32& a, const v_float32& b)
+{
+    return v_float32(__riscv_vfmacc(__riscv_vfmul(a, a, VTraits<v_float32>::vlanes()), b, b, VTraits<v_float32>::vlanes()));
+}
+
+#if CV_SIMD_SCALABLE_64F
+inline v_float64 v_magnitude(const v_float64& a, const v_float64& b)
+{
+    v_float64 x = __riscv_vfmacc(__riscv_vfmul(a, a, VTraits<v_float64>::vlanes()), b, b, VTraits<v_float64>::vlanes());
+    return v_sqrt(x);
+}
+
+inline v_float64 v_sqr_magnitude(const v_float64& a, const v_float64& b)
+{
+    return __riscv_vfmacc(__riscv_vfmul(a, a, VTraits<v_float64>::vlanes()), b, b, VTraits<v_float64>::vlanes());
+}
+#endif
+
+////////////// Multiply-Add //////////////
+
+inline v_float32 v_fma(const v_float32& a, const v_float32& b, const v_float32& c)
+{
+    return __riscv_vfmacc(c, a, b, VTraits<v_float32>::vlanes());
+}
+inline v_int32 v_fma(const v_int32& a, const v_int32& b, const v_int32& c)
+{
+    return __riscv_vmacc(c, a, b, VTraits<v_float32>::vlanes());
+}
+
+inline v_float32 v_muladd(const v_float32& a, const v_float32& b, const v_float32& c)
+{
+    return v_fma(a, b, c);
+}
+
+inline v_int32 v_muladd(const v_int32& a, const v_int32& b, const v_int32& c)
+{
+    return v_fma(a, b, c);
+}
+
+#if CV_SIMD_SCALABLE_64F
+inline v_float64 v_fma(const v_float64& a, const v_float64& b, const v_float64& c)
+{
+    return __riscv_vfmacc_vv_f64m2(c, a, b, VTraits<v_float64>::vlanes());
+}
+
+inline v_float64 v_muladd(const v_float64& a, const v_float64& b, const v_float64& c)
+{
+    return v_fma(a, b, c);
+}
+#endif
+
+////////////// Check all/any //////////////
+
+#define OPENCV_HAL_IMPL_RVV_CHECK_ALLANY(_Tpvec, vl) \
+inline bool v_check_all(const _Tpvec& a) \
+{ \
+    return (int)__riscv_vcpop(__riscv_vmslt(a, 0, vl), vl) == vl; \
+} \
+inline bool v_check_any(const _Tpvec& a) \
+{ \
+    return (int)__riscv_vcpop(__riscv_vmslt(a, 0, vl), vl) != 0; \
+}
+
+OPENCV_HAL_IMPL_RVV_CHECK_ALLANY(v_int8, VTraits<v_int8>::vlanes())
+OPENCV_HAL_IMPL_RVV_CHECK_ALLANY(v_int16, VTraits<v_int16>::vlanes())
+OPENCV_HAL_IMPL_RVV_CHECK_ALLANY(v_int32, VTraits<v_int32>::vlanes())
+OPENCV_HAL_IMPL_RVV_CHECK_ALLANY(v_int64, VTraits<v_int64>::vlanes())
+
+
+inline bool v_check_all(const v_uint8& a)
+{ return v_check_all(v_reinterpret_as_s8(a)); }
+inline bool v_check_any(const v_uint8& a)
+{ return v_check_any(v_reinterpret_as_s8(a)); }
+
+inline bool v_check_all(const v_uint16& a)
+{ return v_check_all(v_reinterpret_as_s16(a)); }
+inline bool v_check_any(const v_uint16& a)
+{ return v_check_any(v_reinterpret_as_s16(a)); }
+
+inline bool v_check_all(const v_uint32& a)
+{ return v_check_all(v_reinterpret_as_s32(a)); }
+inline bool v_check_any(const v_uint32& a)
+{ return v_check_any(v_reinterpret_as_s32(a)); }
+
+inline bool v_check_all(const v_float32& a)
+{ return v_check_all(v_reinterpret_as_s32(a)); }
+inline bool v_check_any(const v_float32& a)
+{ return v_check_any(v_reinterpret_as_s32(a)); }
+
+inline bool v_check_all(const v_uint64& a)
+{ return v_check_all(v_reinterpret_as_s64(a)); }
+inline bool v_check_any(const v_uint64& a)
+{ return v_check_any(v_reinterpret_as_s64(a)); }
+
+#if CV_SIMD_SCALABLE_64F
+inline bool v_check_all(const v_float64& a)
+{ return v_check_all(v_reinterpret_as_s64(a)); }
+inline bool v_check_any(const v_float64& a)
+{ return v_check_any(v_reinterpret_as_s64(a)); }
+#endif
+
+////////////// abs //////////////
+
+#define OPENCV_HAL_IMPL_RVV_ABSDIFF(_Tpvec, abs) \
+inline _Tpvec v_##abs(const _Tpvec& a, const _Tpvec& b) \
+{ \
+    return v_sub(v_max(a, b), v_min(a, b)); \
+}
+
+OPENCV_HAL_IMPL_RVV_ABSDIFF(v_uint8, absdiff)
+OPENCV_HAL_IMPL_RVV_ABSDIFF(v_uint16, absdiff)
+OPENCV_HAL_IMPL_RVV_ABSDIFF(v_uint32, absdiff)
+OPENCV_HAL_IMPL_RVV_ABSDIFF(v_float32, absdiff)
+#if CV_SIMD_SCALABLE_64F
+OPENCV_HAL_IMPL_RVV_ABSDIFF(v_float64, absdiff)
+#endif
+OPENCV_HAL_IMPL_RVV_ABSDIFF(v_int8, absdiffs)
+OPENCV_HAL_IMPL_RVV_ABSDIFF(v_int16, absdiffs)
+
+#define OPENCV_HAL_IMPL_RVV_ABSDIFF_S(_Tpvec, _rTpvec, width) \
+inline _rTpvec v_absdiff(const _Tpvec& a, const _Tpvec& b) \
+{ \
+    return __riscv_vnclipu(__riscv_vreinterpret_u##width##m4(__riscv_vwsub_vv(v_max(a, b), v_min(a, b), VTraits<_Tpvec>::vlanes())), 0, 0, VTraits<_Tpvec>::vlanes()); \
+}
+
+OPENCV_HAL_IMPL_RVV_ABSDIFF_S(v_int8, v_uint8, 16)
+OPENCV_HAL_IMPL_RVV_ABSDIFF_S(v_int16, v_uint16, 32)
+OPENCV_HAL_IMPL_RVV_ABSDIFF_S(v_int32, v_uint32, 64)
+
+#define OPENCV_HAL_IMPL_RVV_ABS(_Tprvec, _Tpvec, suffix) \
+inline _Tprvec v_abs(const _Tpvec& a) \
+{ \
+    return v_absdiff(a, v_setzero_##suffix()); \
+}
+
+OPENCV_HAL_IMPL_RVV_ABS(v_uint8, v_int8, s8)
+OPENCV_HAL_IMPL_RVV_ABS(v_uint16, v_int16, s16)
+OPENCV_HAL_IMPL_RVV_ABS(v_uint32, v_int32, s32)
+OPENCV_HAL_IMPL_RVV_ABS(v_float32, v_float32, f32)
+#if CV_SIMD_SCALABLE_64F
+OPENCV_HAL_IMPL_RVV_ABS(v_float64, v_float64, f64)
+#endif
+
+
+#define OPENCV_HAL_IMPL_RVV_REDUCE_SAD(_Tpvec, scalartype) \
+inline scalartype v_reduce_sad(const _Tpvec& a, const _Tpvec& b) \
+{ \
+    return v_reduce_sum(v_absdiff(a, b)); \
+}
+
+OPENCV_HAL_IMPL_RVV_REDUCE_SAD(v_uint8, unsigned)
+OPENCV_HAL_IMPL_RVV_REDUCE_SAD(v_int8, unsigned)
+OPENCV_HAL_IMPL_RVV_REDUCE_SAD(v_uint16, unsigned)
+OPENCV_HAL_IMPL_RVV_REDUCE_SAD(v_int16, unsigned)
+OPENCV_HAL_IMPL_RVV_REDUCE_SAD(v_uint32, unsigned)
+OPENCV_HAL_IMPL_RVV_REDUCE_SAD(v_int32, unsigned)
+OPENCV_HAL_IMPL_RVV_REDUCE_SAD(v_float32, float)
+
+////////////// Select //////////////
+
+#define OPENCV_HAL_IMPL_RVV_SELECT(_Tpvec, vl) \
+inline _Tpvec v_select(const _Tpvec& mask, const _Tpvec& a, const _Tpvec& b) \
+{ \
+    return __riscv_vmerge(b, a, __riscv_vmsne(mask, 0, vl), vl); \
+}
+
+OPENCV_HAL_IMPL_RVV_SELECT(v_uint8, VTraits<v_uint8>::vlanes())
+OPENCV_HAL_IMPL_RVV_SELECT(v_uint16, VTraits<v_uint16>::vlanes())
+OPENCV_HAL_IMPL_RVV_SELECT(v_uint32, VTraits<v_uint32>::vlanes())
+OPENCV_HAL_IMPL_RVV_SELECT(v_int8, VTraits<v_int8>::vlanes())
+OPENCV_HAL_IMPL_RVV_SELECT(v_int16, VTraits<v_int16>::vlanes())
+OPENCV_HAL_IMPL_RVV_SELECT(v_int32, VTraits<v_int32>::vlanes())
+
+inline v_float32 v_select(const v_float32& mask, const v_float32& a, const v_float32& b) \
+{ \
+    return __riscv_vmerge(b, a, __riscv_vmfne(mask, 0, VTraits<v_float32>::vlanes()), VTraits<v_float32>::vlanes()); \
+}
+
+#if CV_SIMD_SCALABLE_64F
+inline v_float64 v_select(const v_float64& mask, const v_float64& a, const v_float64& b) \
+{ \
+    return __riscv_vmerge(b, a, __riscv_vmfne(mask, 0, VTraits<v_float64>::vlanes()), VTraits<v_float64>::vlanes()); \
+}
+#endif
+
+////////////// Rotate shift //////////////
+
+#define OPENCV_HAL_IMPL_RVV_ROTATE_INTEGER(_Tpvec, suffix, vl) \
+template<int n> inline _Tpvec v_rotate_right(const _Tpvec& a) \
+{ \
+    return __riscv_vslidedown(a, n, vl); \
+} \
+template<int n> inline _Tpvec v_rotate_left(const _Tpvec& a) \
+{ \
+    return __riscv_vslideup(__riscv_vmv_v_x_##suffix##m2(0, vl), a, n, vl); \
+} \
+template<> inline _Tpvec v_rotate_left<0>(const _Tpvec& a) \
+{ return a; } \
+template<int n> inline _Tpvec v_rotate_right(const _Tpvec& a, const _Tpvec& b) \
+{ \
+    return __riscv_vslideup(__riscv_vslidedown(a, n, vl), b, VTraits<_Tpvec>::vlanes() - n, vl); \
+} \
+template<int n> inline _Tpvec v_rotate_left(const _Tpvec& a, const _Tpvec& b) \
+{ \
+    return __riscv_vslideup(__riscv_vslidedown(b, VTraits<_Tpvec>::vlanes() - n, vl), a, n, vl); \
+} \
+template<> inline _Tpvec v_rotate_left<0>(const _Tpvec& a, const _Tpvec& b) \
+{ CV_UNUSED(b); return a; }
+
+OPENCV_HAL_IMPL_RVV_ROTATE_INTEGER(v_uint8, u8, VTraits<v_uint8>::vlanes())
+OPENCV_HAL_IMPL_RVV_ROTATE_INTEGER(v_int8, i8, VTraits<v_int8>::vlanes())
+OPENCV_HAL_IMPL_RVV_ROTATE_INTEGER(v_uint16, u16, VTraits<v_uint16>::vlanes())
+OPENCV_HAL_IMPL_RVV_ROTATE_INTEGER(v_int16, i16,  VTraits<v_int16>::vlanes())
+OPENCV_HAL_IMPL_RVV_ROTATE_INTEGER(v_uint32, u32, VTraits<v_uint32>::vlanes())
+OPENCV_HAL_IMPL_RVV_ROTATE_INTEGER(v_int32, i32, VTraits<v_int32>::vlanes())
+OPENCV_HAL_IMPL_RVV_ROTATE_INTEGER(v_uint64, u64, VTraits<v_uint64>::vlanes())
+OPENCV_HAL_IMPL_RVV_ROTATE_INTEGER(v_int64, i64, VTraits<v_int64>::vlanes())
+
+#define OPENCV_HAL_IMPL_RVV_ROTATE_FP(_Tpvec, suffix, vl) \
+template<int n> inline _Tpvec v_rotate_right(const _Tpvec& a) \
+{ \
+    return __riscv_vslidedown(a, n, vl); \
+} \
+template<int n> inline _Tpvec v_rotate_left(const _Tpvec& a) \
+{ \
+    return __riscv_vslideup(__riscv_vfmv_v_f_##suffix##m2(0, vl), a, n, vl); \
+} \
+template<> inline _Tpvec v_rotate_left<0>(const _Tpvec& a) \
+{ return a; } \
+template<int n> inline _Tpvec v_rotate_right(const _Tpvec& a, const _Tpvec& b) \
+{ \
+    return __riscv_vslideup(__riscv_vslidedown(a, n, vl), b, VTraits<_Tpvec>::vlanes() - n, vl); \
+} \
+template<int n> inline _Tpvec v_rotate_left(const _Tpvec& a, const _Tpvec& b) \
+{ \
+    return __riscv_vslideup(__riscv_vslidedown(b, VTraits<_Tpvec>::vlanes() - n, vl), a, n, vl); \
+} \
+template<> inline _Tpvec v_rotate_left<0>(const _Tpvec& a, const _Tpvec& b) \
+{ CV_UNUSED(b); return a; }
+
+OPENCV_HAL_IMPL_RVV_ROTATE_FP(v_float32, f32, VTraits<v_float32>::vlanes())
+#if CV_SIMD_SCALABLE_64F
+OPENCV_HAL_IMPL_RVV_ROTATE_FP(v_float64, f64,  VTraits<v_float64>::vlanes())
+#endif
+
+////////////// Convert to float //////////////
+inline v_float32 v_cvt_f32(const v_int32& a)
+{
+    return __riscv_vfcvt_f_x_v_f32m2(a, VTraits<v_float32>::vlanes());
+}
+
+#if CV_SIMD_SCALABLE_64F
+inline v_float32 v_cvt_f32(const v_float64& a)
+{
+    return __riscv_vfncvt_f(__riscv_vlmul_ext_f64m4(a), VTraits<v_float64>::vlanes());
+}
+
+inline v_float32 v_cvt_f32(const v_float64& a, const v_float64& b)
+{
+    return __riscv_vfncvt_f(__riscv_vset(__riscv_vlmul_ext_f64m4(a),1,b), VTraits<v_float32>::vlanes());
+}
+
+inline v_float64 v_cvt_f64(const v_int32& a)
+{
+    return __riscv_vget_f64m2(__riscv_vfwcvt_f(a, VTraits<v_int32>::vlanes()), 0);
+}
+
+inline v_float64 v_cvt_f64_high(const v_int32& a)
+{
+    return __riscv_vget_f64m2(__riscv_vfwcvt_f(a, VTraits<v_int32>::vlanes()), 1);
+}
+
+inline v_float64 v_cvt_f64(const v_float32& a)
+{
+    return __riscv_vget_f64m2(__riscv_vfwcvt_f(a, VTraits<v_float32>::vlanes()), 0);
+}
+
+inline v_float64 v_cvt_f64_high(const v_float32& a)
+{
+    return __riscv_vget_f64m2(__riscv_vfwcvt_f(a, VTraits<v_float32>::vlanes()), 1);
+}
+
+inline v_float64 v_cvt_f64(const v_int64& a)
+{
+    return __riscv_vfcvt_f(a, VTraits<v_int64>::vlanes());
+}
+#endif
+
+//////////// Broadcast //////////////
+
+#define OPENCV_HAL_IMPL_RVV_BROADCAST(_Tpvec, suffix) \
+template<int s = 0> inline _Tpvec v_broadcast_element(_Tpvec v, int i = s) \
+{ \
+    return v_setall_##suffix(v_extract_n(v, i)); \
+} \
+inline _Tpvec v_broadcast_highest(_Tpvec v) \
+{ \
+    return v_setall_##suffix(v_extract_n(v, VTraits<_Tpvec>::vlanes()-1)); \
+}
+
+OPENCV_HAL_IMPL_RVV_BROADCAST(v_uint32, u32)
+OPENCV_HAL_IMPL_RVV_BROADCAST(v_int32, s32)
+OPENCV_HAL_IMPL_RVV_BROADCAST(v_float32, f32)
+
+
+////////////// Reverse //////////////
+#define OPENCV_HAL_IMPL_RVV_REVERSE(_Tpvec, width) \
+inline _Tpvec v_reverse(const _Tpvec& a)  \
+{ \
+    vuint##width##m2_t vidx = __riscv_vrsub(__riscv_vid_v_u##width##m2(VTraits<_Tpvec>::vlanes()), VTraits<_Tpvec>::vlanes()-1, VTraits<_Tpvec>::vlanes()); \
+    return __riscv_vrgather(a, vidx, VTraits<_Tpvec>::vlanes()); \
+}
+OPENCV_HAL_IMPL_RVV_REVERSE(v_uint8, 8)
+OPENCV_HAL_IMPL_RVV_REVERSE(v_int8, 8)
+OPENCV_HAL_IMPL_RVV_REVERSE(v_uint16, 16)
+OPENCV_HAL_IMPL_RVV_REVERSE(v_int16, 16)
+OPENCV_HAL_IMPL_RVV_REVERSE(v_uint32, 32)
+OPENCV_HAL_IMPL_RVV_REVERSE(v_int32, 32)
+OPENCV_HAL_IMPL_RVV_REVERSE(v_float32, 32)
+OPENCV_HAL_IMPL_RVV_REVERSE(v_uint64, 64)
+OPENCV_HAL_IMPL_RVV_REVERSE(v_int64, 64)
+#if CV_SIMD_SCALABLE_64F
+OPENCV_HAL_IMPL_RVV_REVERSE(v_float64, 64)
+#endif
+
+//////////// Value reordering ////////////
+
+#define OPENCV_HAL_IMPL_RVV_EXPAND(_Tp, _Tpwvec, _Tpwvec_m2, _Tpvec, width, suffix, suffix2, cvt) \
+inline void v_expand(const _Tpvec& a, _Tpwvec& b0, _Tpwvec& b1) \
+{ \
+    _Tpwvec_m2 temp = cvt(a, VTraits<_Tpvec>::vlanes()); \
+    b0 = __riscv_vget_##suffix##m2(temp, 0); \
+    b1 = __riscv_vget_##suffix##m2(temp, 1); \
+} \
+inline _Tpwvec v_expand_low(const _Tpvec& a) \
+{ \
+    _Tpwvec_m2 temp = cvt(a, VTraits<_Tpvec>::vlanes()); \
+    return __riscv_vget_##suffix##m2(temp, 0); \
+} \
+inline _Tpwvec v_expand_high(const _Tpvec& a) \
+{ \
+    _Tpwvec_m2 temp = cvt(a, VTraits<_Tpvec>::vlanes()); \
+    return __riscv_vget_##suffix##m2(temp, 1); \
+} \
+inline _Tpwvec v_load_expand(const _Tp* ptr) \
+{ \
+    return cvt(__riscv_vle##width##_v_##suffix2##m1(ptr, VTraits<_Tpvec>::vlanes()), VTraits<_Tpvec>::vlanes()); \
+}
+
+OPENCV_HAL_IMPL_RVV_EXPAND(uchar, v_uint16, vuint16m4_t, v_uint8, 8, u16, u8, __riscv_vwcvtu_x)
+OPENCV_HAL_IMPL_RVV_EXPAND(schar, v_int16, vint16m4_t, v_int8, 8, i16, i8, __riscv_vwcvt_x)
+OPENCV_HAL_IMPL_RVV_EXPAND(ushort, v_uint32, vuint32m4_t, v_uint16, 16, u32, u16, __riscv_vwcvtu_x)
+OPENCV_HAL_IMPL_RVV_EXPAND(short, v_int32, vint32m4_t, v_int16, 16, i32, i16, __riscv_vwcvt_x)
+OPENCV_HAL_IMPL_RVV_EXPAND(uint, v_uint64, vuint64m4_t, v_uint32, 32, u64, u32, __riscv_vwcvtu_x)
+OPENCV_HAL_IMPL_RVV_EXPAND(int, v_int64, vint64m4_t, v_int32, 32, i64, i32, __riscv_vwcvt_x)
+
+inline v_uint32 v_load_expand_q(const uchar* ptr)
+{
+    return __riscv_vwcvtu_x(__riscv_vwcvtu_x(__riscv_vle8_v_u8mf2(ptr, VTraits<v_uint32>::vlanes()), VTraits<v_uint32>::vlanes()), VTraits<v_uint32>::vlanes());
+}
+
+inline v_int32 v_load_expand_q(const schar* ptr)
+{
+    return __riscv_vwcvt_x(__riscv_vwcvt_x(__riscv_vle8_v_i8mf2(ptr, VTraits<v_int32>::vlanes()), VTraits<v_int32>::vlanes()), VTraits<v_int32>::vlanes());
+}
+
+#define OPENCV_HAL_IMPL_RVV_PACK(_Tpvec, _Tp, _wTpvec, hwidth, hsuffix, suffix, rshr, shr) \
+inline _Tpvec v_pack(const _wTpvec& a, const _wTpvec& b) \
+{ \
+    return shr(__riscv_vset(__riscv_vlmul_ext_##suffix##m4(a), 1, b), 0, 0, VTraits<_Tpvec>::vlanes()); \
+} \
+inline void v_pack_store(_Tp* ptr, const _wTpvec& a) \
+{ \
+    __riscv_vse##hwidth##_v_##hsuffix##m1(ptr, shr(a, 0, 0, VTraits<_Tpvec>::vlanes()), VTraits<_wTpvec>::vlanes()); \
+} \
+template<int n = 0> inline \
+_Tpvec v_rshr_pack(const _wTpvec& a, const _wTpvec& b, int N = n) \
+{ \
+    return rshr(__riscv_vset(__riscv_vlmul_ext_##suffix##m4(a), 1, b), N, 0, VTraits<_Tpvec>::vlanes()); \
+} \
+template<int n = 0> inline \
+void v_rshr_pack_store(_Tp* ptr, const _wTpvec& a, int N = n) \
+{ \
+    __riscv_vse##hwidth##_v_##hsuffix##m1(ptr, rshr(a, N, 0, VTraits<_Tpvec>::vlanes()), VTraits<_wTpvec>::vlanes()); \
+}
+
+#define OPENCV_HAL_IMPL_RVV_PACK_32(_Tpvec, _Tp, _wTpvec, hwidth, hsuffix, suffix, rshr, shr) \
+inline _Tpvec v_pack(const _wTpvec& a, const _wTpvec& b) \
+{ \
+    return shr(__riscv_vset(__riscv_vlmul_ext_##suffix##m4(a), 1, b), 0, VTraits<_Tpvec>::vlanes()); \
+} \
+inline void v_pack_store(_Tp* ptr, const _wTpvec& a) \
+{ \
+    __riscv_vse##hwidth##_v_##hsuffix##m1(ptr, shr(a, 0, VTraits<_Tpvec>::vlanes()), VTraits<_wTpvec>::vlanes()); \
+} \
+template<int n = 0> inline \
+_Tpvec v_rshr_pack(const _wTpvec& a, const _wTpvec& b, int N = n) \
+{ \
+    return rshr(__riscv_vset(__riscv_vlmul_ext_##suffix##m4(a), 1, b), N, 0, VTraits<_Tpvec>::vlanes()); \
+} \
+template<int n = 0> inline \
+void v_rshr_pack_store(_Tp* ptr, const _wTpvec& a, int N = n) \
+{ \
+    __riscv_vse##hwidth##_v_##hsuffix##m1(ptr, rshr(a, N, 0, VTraits<_Tpvec>::vlanes()), VTraits<_wTpvec>::vlanes()); \
+}
+
+OPENCV_HAL_IMPL_RVV_PACK(v_uint8, uchar, v_uint16, 8, u8, u16, __riscv_vnclipu, __riscv_vnclipu)
+OPENCV_HAL_IMPL_RVV_PACK(v_int8, schar, v_int16, 8,  i8, i16, __riscv_vnclip, __riscv_vnclip)
+OPENCV_HAL_IMPL_RVV_PACK(v_uint16, ushort, v_uint32, 16, u16, u32, __riscv_vnclipu, __riscv_vnclipu)
+OPENCV_HAL_IMPL_RVV_PACK(v_int16, short, v_int32, 16, i16, i32, __riscv_vnclip, __riscv_vnclip)
+OPENCV_HAL_IMPL_RVV_PACK_32(v_uint32, unsigned, v_uint64, 32, u32, u64, __riscv_vnclipu, __riscv_vnsrl)
+OPENCV_HAL_IMPL_RVV_PACK_32(v_int32, int, v_int64, 32, i32, i64, __riscv_vnclip, __riscv_vnsra)
+
+#define OPENCV_HAL_IMPL_RVV_PACK_U(_Tpvec, _Tp, _wTpvec, _wTp, hwidth, width, hsuffix, suffix, cast, hvl, vl) \
+inline _Tpvec v_pack_u(const _wTpvec& a, const _wTpvec& b) \
+{ \
+    return __riscv_vnclipu(cast(__riscv_vmax(__riscv_vset(__riscv_vlmul_ext_##suffix##m4(a), 1, b), 0, vl)), 0, 0, vl); \
+} \
+inline void v_pack_u_store(_Tp* ptr, const _wTpvec& a) \
+{ \
+    __riscv_vse##hwidth##_v_##hsuffix##m1(ptr, __riscv_vnclipu(__riscv_vreinterpret_u##width##m2(__riscv_vmax(a, 0, vl)), 0, 0, vl), hvl); \
+} \
+template<int N = 0> inline \
+_Tpvec v_rshr_pack_u(const _wTpvec& a, const _wTpvec& b, int n = N) \
+{ \
+    return __riscv_vnclipu(cast(__riscv_vmax(__riscv_vset(__riscv_vlmul_ext_##suffix##m4(a), 1, b), 0, vl)), n, 0, vl); \
+} \
+template<int N = 0> inline \
+void v_rshr_pack_u_store(_Tp* ptr, const _wTpvec& a, int n = N) \
+{ \
+    __riscv_vse##hwidth##_v_##hsuffix##m1(ptr, __riscv_vnclipu(__riscv_vreinterpret_u##width##m2(__riscv_vmax(a, 0, vl)), n, 0, vl), hvl); \
+}
+
+OPENCV_HAL_IMPL_RVV_PACK_U(v_uint8, uchar, v_int16, short, 8, 16, u8, i16, __riscv_vreinterpret_v_i16m4_u16m4, VTraits<v_int16>::vlanes(), VTraits<v_uint8>::vlanes())
+OPENCV_HAL_IMPL_RVV_PACK_U(v_uint16, ushort, v_int32, int, 16, 32, u16, i32,  __riscv_vreinterpret_v_i32m4_u32m4, VTraits<v_int32>::vlanes(), VTraits<v_uint16>::vlanes())
+
+
+/* void v_zip(const _Tpvec& a0, const _Tpvec& a1, _Tpvec& b0, _Tpvec& b1)
+  a0 = {A1 A2 A3 A4}
+  a1 = {B1 B2 B3 B4}
+---------------
+  {A1 B1 A2 B2} and {A3 B3 A4 B4}
+*/
+
+#define OPENCV_HAL_IMPL_RVV_ZIP(_Tpvec, _wTpvec, suffix, width, width2, convert2um2, convert2um1) \
+inline void v_zip(const _Tpvec& a0, const _Tpvec& a1, _Tpvec& b0, _Tpvec& b1) { \
+    _wTpvec temp = __riscv_vreinterpret_##suffix##m4(convert2um2( \
+        __riscv_vor(__riscv_vzext_vf2(convert2um1(a0), VTraits<_Tpvec>::vlanes()*2), \
+            __riscv_vreinterpret_u##width2##m4(__riscv_vslide1up(__riscv_vreinterpret_u##width##m4(__riscv_vzext_vf2(convert2um1(a1), VTraits<_Tpvec>::vlanes()*2)), 0, VTraits<_Tpvec>::vlanes()*2)), \
+            VTraits<_Tpvec>::vlanes()))); \
+    b0 = __riscv_vget_##suffix##m2(temp, 0); \
+    b1 = __riscv_vget_##suffix##m2(temp, 1); \
+}
+OPENCV_HAL_IMPL_RVV_ZIP(v_uint8, vuint8m4_t, u8, 8, 16, OPENCV_HAL_NOP, OPENCV_HAL_NOP)
+OPENCV_HAL_IMPL_RVV_ZIP(v_int8, vint8m4_t, i8, 8, 16, __riscv_vreinterpret_u8m4, __riscv_vreinterpret_u8m2)
+OPENCV_HAL_IMPL_RVV_ZIP(v_uint16, vuint16m4_t, u16, 16, 32, OPENCV_HAL_NOP, OPENCV_HAL_NOP)
+OPENCV_HAL_IMPL_RVV_ZIP(v_int16, vint16m4_t, i16, 16, 32, __riscv_vreinterpret_u16m4, __riscv_vreinterpret_u16m2)
+OPENCV_HAL_IMPL_RVV_ZIP(v_uint32, vuint32m4_t, u32, 32, 64, OPENCV_HAL_NOP, OPENCV_HAL_NOP)
+OPENCV_HAL_IMPL_RVV_ZIP(v_int32, vint32m4_t, i32, 32, 64, __riscv_vreinterpret_u32m4, __riscv_vreinterpret_u32m2)
+OPENCV_HAL_IMPL_RVV_ZIP(v_float32, vfloat32m4_t, f32, 32, 64, __riscv_vreinterpret_u32m4, __riscv_vreinterpret_u32m2)
+
+#if CV_SIMD_SCALABLE_64F
+inline void v_zip(const v_float64& a0, const v_float64& a1, v_float64& b0, v_float64& b1) { \
+    vuint16mf2_t idx0 = __riscv_vid_v_u16mf2(VTraits<v_float64>::vlanes());
+    vuint16mf2_t idx1 = __riscv_vadd(idx0, VTraits<v_float64>::vlanes(), VTraits<v_float64>::vlanes());
+    vuint16m1_t idx = __riscv_vreinterpret_u16m1(( \
+        __riscv_vor(__riscv_vzext_vf2(idx0, VTraits<v_float64>::vlanes()), \
+            __riscv_vreinterpret_u32m1(__riscv_vslide1up(__riscv_vreinterpret_u16m1(__riscv_vzext_vf2(idx1, VTraits<v_float64>::vlanes())), 0, VTraits<v_uint32>::vlanes())), \
+            VTraits<v_uint32>::vlanes())));
+#if 0
+    vfloat64m4_t temp = __riscv_vcreate_v_f64m2_f64m4(a0, a1);
+#else // TODO: clean up when RVV Intrinsic is frozen.
+    vfloat64m4_t temp = __riscv_vlmul_ext_f64m4(a0);
+    temp = __riscv_vset(temp, 1, a1);
+#endif
+    temp = __riscv_vrgatherei16(temp, idx, VTraits<v_float64>::vlanes()*2);
+    b0 = __riscv_vget_f64m2(temp, 0); \
+    b1 = __riscv_vget_f64m2(temp, 1); \
+}
+#endif
+
+#define OPENCV_HAL_IMPL_RVV_UNPACKS(_Tpvec, width) \
+inline _Tpvec v_combine_low(const _Tpvec& a, const _Tpvec& b) \
+{ \
+    return __riscv_vslideup(a, b, VTraits<_Tpvec>::vlanes()/2, VTraits<_Tpvec>::vlanes());\
+} \
+inline _Tpvec v_combine_high(const _Tpvec& a, const _Tpvec& b) \
+{ \
+    return __riscv_vslideup( \
+            __riscv_vslidedown(a, VTraits<_Tpvec>::vlanes()/2, VTraits<_Tpvec>::vlanes()), \
+            __riscv_vslidedown(b, VTraits<_Tpvec>::vlanes()/2, VTraits<_Tpvec>::vlanes()), \
+            VTraits<_Tpvec>::vlanes()/2, \
+            VTraits<_Tpvec>::vlanes()); \
+} \
+inline void v_recombine(const _Tpvec& a, const _Tpvec& b, _Tpvec& c, _Tpvec& d) \
+{ \
+    c = v_combine_low(a, b); \
+    d = v_combine_high(a, b); \
+}
+
+OPENCV_HAL_IMPL_RVV_UNPACKS(v_uint8, 8)
+OPENCV_HAL_IMPL_RVV_UNPACKS(v_int8, 8)
+OPENCV_HAL_IMPL_RVV_UNPACKS(v_uint16, 16)
+OPENCV_HAL_IMPL_RVV_UNPACKS(v_int16, 16)
+OPENCV_HAL_IMPL_RVV_UNPACKS(v_uint32, 32)
+OPENCV_HAL_IMPL_RVV_UNPACKS(v_int32, 32)
+OPENCV_HAL_IMPL_RVV_UNPACKS(v_float32, 32)
+#if CV_SIMD_SCALABLE_64F
+OPENCV_HAL_IMPL_RVV_UNPACKS(v_float64, 64)
+#endif
+
+#define OPENCV_HAL_IMPL_RVV_INTERLEAVED(_Tpvec, _Tp, suffix, width, hwidth, vl) \
+inline void v_load_deinterleave(const _Tp* ptr, v_##_Tpvec& a, v_##_Tpvec& b) \
+{ \
+    a = __riscv_vlse##width##_v_##suffix##m2(ptr  , sizeof(_Tp)*2, VTraits<v_##_Tpvec>::vlanes()); \
+    b = __riscv_vlse##width##_v_##suffix##m2(ptr+1, sizeof(_Tp)*2, VTraits<v_##_Tpvec>::vlanes()); \
+}\
+inline void v_load_deinterleave(const _Tp* ptr, v_##_Tpvec& a, v_##_Tpvec& b, v_##_Tpvec& c) \
+{ \
+    a = __riscv_vlse##width##_v_##suffix##m2(ptr  , sizeof(_Tp)*3, VTraits<v_##_Tpvec>::vlanes()); \
+    b = __riscv_vlse##width##_v_##suffix##m2(ptr+1, sizeof(_Tp)*3, VTraits<v_##_Tpvec>::vlanes()); \
+    c = __riscv_vlse##width##_v_##suffix##m2(ptr+2, sizeof(_Tp)*3, VTraits<v_##_Tpvec>::vlanes()); \
+} \
+inline void v_load_deinterleave(const _Tp* ptr, v_##_Tpvec& a, v_##_Tpvec& b, \
+                                v_##_Tpvec& c, v_##_Tpvec& d) \
+{ \
+    \
+    a = __riscv_vlse##width##_v_##suffix##m2(ptr  , sizeof(_Tp)*4, VTraits<v_##_Tpvec>::vlanes()); \
+    b = __riscv_vlse##width##_v_##suffix##m2(ptr+1, sizeof(_Tp)*4, VTraits<v_##_Tpvec>::vlanes()); \
+    c = __riscv_vlse##width##_v_##suffix##m2(ptr+2, sizeof(_Tp)*4, VTraits<v_##_Tpvec>::vlanes()); \
+    d = __riscv_vlse##width##_v_##suffix##m2(ptr+3, sizeof(_Tp)*4, VTraits<v_##_Tpvec>::vlanes()); \
+} \
+inline void v_store_interleave( _Tp* ptr, const v_##_Tpvec& a, const v_##_Tpvec& b, \
+                                hal::StoreMode /*mode*/=hal::STORE_UNALIGNED) \
+{ \
+    __riscv_vsse##width(ptr, sizeof(_Tp)*2, a, VTraits<v_##_Tpvec>::vlanes()); \
+    __riscv_vsse##width(ptr+1, sizeof(_Tp)*2, b, VTraits<v_##_Tpvec>::vlanes()); \
+} \
+inline void v_store_interleave( _Tp* ptr, const v_##_Tpvec& a, const v_##_Tpvec& b, \
+                                const v_##_Tpvec& c, hal::StoreMode /*mode*/=hal::STORE_UNALIGNED) \
+{ \
+    __riscv_vsse##width(ptr, sizeof(_Tp)*3, a, VTraits<v_##_Tpvec>::vlanes()); \
+    __riscv_vsse##width(ptr+1, sizeof(_Tp)*3, b, VTraits<v_##_Tpvec>::vlanes()); \
+    __riscv_vsse##width(ptr+2, sizeof(_Tp)*3, c, VTraits<v_##_Tpvec>::vlanes()); \
+} \
+inline void v_store_interleave( _Tp* ptr, const v_##_Tpvec& a, const v_##_Tpvec& b, \
+                                const v_##_Tpvec& c, const v_##_Tpvec& d, \
+                                hal::StoreMode /*mode*/=hal::STORE_UNALIGNED ) \
+{ \
+    __riscv_vsse##width(ptr, sizeof(_Tp)*4, a, VTraits<v_##_Tpvec>::vlanes()); \
+    __riscv_vsse##width(ptr+1, sizeof(_Tp)*4, b, VTraits<v_##_Tpvec>::vlanes()); \
+    __riscv_vsse##width(ptr+2, sizeof(_Tp)*4, c, VTraits<v_##_Tpvec>::vlanes()); \
+    __riscv_vsse##width(ptr+3, sizeof(_Tp)*4, d, VTraits<v_##_Tpvec>::vlanes()); \
+}
+
+OPENCV_HAL_IMPL_RVV_INTERLEAVED(uint8, uchar, u8, 8, 4, VTraits<v_uint8>::vlanes())
+OPENCV_HAL_IMPL_RVV_INTERLEAVED(int8, schar, i8, 8, 4, VTraits<v_int8>::vlanes())
+OPENCV_HAL_IMPL_RVV_INTERLEAVED(uint16, ushort, u16, 16, 8, VTraits<v_uint16>::vlanes())
+OPENCV_HAL_IMPL_RVV_INTERLEAVED(int16, short, i16, 16, 8, VTraits<v_int16>::vlanes())
+OPENCV_HAL_IMPL_RVV_INTERLEAVED(uint32, unsigned, u32, 32, 16, VTraits<v_uint32>::vlanes())
+OPENCV_HAL_IMPL_RVV_INTERLEAVED(int32, int, i32, 32, 16, VTraits<v_int32>::vlanes())
+OPENCV_HAL_IMPL_RVV_INTERLEAVED(float32, float, f32, 32, 16, VTraits<v_float32>::vlanes())
+OPENCV_HAL_IMPL_RVV_INTERLEAVED(uint64, uint64, u64, 64, 32, VTraits<v_uint64>::vlanes())
+OPENCV_HAL_IMPL_RVV_INTERLEAVED(int64, int64, i64, 64, 32, VTraits<v_int64>::vlanes())
+#if CV_SIMD_SCALABLE_64F
+OPENCV_HAL_IMPL_RVV_INTERLEAVED(float64, double, f64, 64, 32, VTraits<v_float64>::vlanes())
+#endif
+
+static std::array<uint64_t, 32> idx_interleave_pairs = { \
+    0x0705060403010200, 0x0f0d0e0c0b090a08, 0x1715161413111210, 0x1f1d1e1c1b191a18, \
+    0x2725262423212220, 0x2f2d2e2c2b292a28, 0x3735363433313230, 0x3f3d3e3c3b393a38, \
+    0x4745464443414240, 0x4f4d4e4c4b494a48, 0x5755565453515250, 0x5f5d5e5c5b595a58, \
+    0x6765666463616260, 0x6f6d6e6c6b696a68, 0x7775767473717270, 0x7f7d7e7c7b797a78, \
+    0x8785868483818280, 0x8f8d8e8c8b898a88, 0x9795969493919290, 0x9f9d9e9c9b999a98, \
+    0xa7a5a6a4a3a1a2a0, 0xafadaeacaba9aaa8, 0xb7b5b6b4b3b1b2b0, 0xbfbdbebcbbb9bab8, \
+    0xc7c5c6c4c3c1c2c0, 0xcfcdcecccbc9cac8, 0xd7d5d6d4d3d1d2d0, 0xdfdddedcdbd9dad8, \
+    0xe7e5e6e4e3e1e2e0, 0xefedeeecebe9eae8, 0xf7f5f6f4f3f1f2f0, 0xfffdfefcfbf9faf8};
+
+static std::array<uint64_t, 32> idx_interleave_quads = { \
+    0x0703060205010400, 0x0f0b0e0a0d090c08, 0x1713161215111410, 0x1f1b1e1a1d191c18, \
+    0x2723262225212420, 0x2f2b2e2a2d292c28, 0x3733363235313430, 0x3f3b3e3a3d393c38, \
+    0x4743464245414440, 0x4f4b4e4a4d494c48, 0x5753565255515450, 0x5f5b5e5a5d595c58, \
+    0x6763666265616460, 0x6f6b6e6a6d696c68, 0x7773767275717470, 0x7f7b7e7a7d797c78, \
+    0x8783868285818480, 0x8f8b8e8a8d898c88, 0x9793969295919490, 0x9f9b9e9a9d999c98, \
+    0xa7a3a6a2a5a1a4a0, 0xafabaeaaada9aca8, 0xb7b3b6b2b5b1b4b0, 0xbfbbbebabdb9bcb8, \
+    0xc7c3c6c2c5c1c4c0, 0xcfcbcecacdc9ccc8, 0xd7d3d6d2d5d1d4d0, 0xdfdbdedaddd9dcd8, \
+    0xe7e3e6e2e5e1e4e0, 0xefebeeeaede9ece8, 0xf7f3f6f2f5f1f4f0, 0xfffbfefafdf9fcf8};
+
+#define OPENCV_HAL_IMPL_RVV_INTERLEAVED_PQ_NOEXPEND(_Tpvec, func) \
+inline _Tpvec v_interleave_##func(const _Tpvec& vec) { \
+    CV_CheckLE(VTraits<_Tpvec>::vlanes(), VTraits<_Tpvec>::max_nlanes, "RVV implementation only supports VLEN in the range [128, 1024]"); \
+    vuint8m2_t vidx = __riscv_vundefined_u8m2();\
+    vidx = __riscv_vreinterpret_u8m2(__riscv_vle64_v_u64m2(idx_interleave_##func.data(), idx_interleave_##func.size())); \
+    return __riscv_vrgather(vec, vidx, VTraits<v_uint8>::vlanes()); \
+}
+OPENCV_HAL_IMPL_RVV_INTERLEAVED_PQ_NOEXPEND(v_uint8, pairs)
+OPENCV_HAL_IMPL_RVV_INTERLEAVED_PQ_NOEXPEND(v_int8, pairs)
+OPENCV_HAL_IMPL_RVV_INTERLEAVED_PQ_NOEXPEND(v_uint8, quads)
+OPENCV_HAL_IMPL_RVV_INTERLEAVED_PQ_NOEXPEND(v_int8, quads)
+
+#define OPENCV_HAL_IMPL_RVV_INTERLEAVED_PQ(_Tpvec, width, vzext_vfx, func) \
+inline _Tpvec v_interleave_##func(const _Tpvec& vec) { \
+    CV_CheckLE(VTraits<_Tpvec>::vlanes(), VTraits<_Tpvec>::max_nlanes, "RVV implementation only supports VLEN in the range [128, 1024]"); \
+    vuint##width##m2_t vidx = __riscv_vundefined_u##width##m2();\
+    vidx = __riscv_vget_u##width##m2(vzext_vfx(__riscv_vreinterpret_u8m2(__riscv_vle64_v_u64m2(idx_interleave_##func.data(), idx_interleave_##func.size())), VTraits<v_uint8>::vlanes()), 0); \
+    return __riscv_vrgather(vec, vidx, VTraits<_Tpvec>::vlanes()); \
+}
+
+OPENCV_HAL_IMPL_RVV_INTERLEAVED_PQ(v_uint16, 16, __riscv_vzext_vf2, pairs)
+OPENCV_HAL_IMPL_RVV_INTERLEAVED_PQ(v_int16, 16, __riscv_vzext_vf2, pairs)
+OPENCV_HAL_IMPL_RVV_INTERLEAVED_PQ(v_uint32, 32, __riscv_vzext_vf4, pairs)
+OPENCV_HAL_IMPL_RVV_INTERLEAVED_PQ(v_int32, 32, __riscv_vzext_vf4, pairs)
+OPENCV_HAL_IMPL_RVV_INTERLEAVED_PQ(v_float32, 32, __riscv_vzext_vf4, pairs)
+
+OPENCV_HAL_IMPL_RVV_INTERLEAVED_PQ(v_uint16, 16, __riscv_vzext_vf2, quads)
+OPENCV_HAL_IMPL_RVV_INTERLEAVED_PQ(v_int16, 16, __riscv_vzext_vf2, quads)
+OPENCV_HAL_IMPL_RVV_INTERLEAVED_PQ(v_uint32, 32, __riscv_vzext_vf4, quads)
+OPENCV_HAL_IMPL_RVV_INTERLEAVED_PQ(v_int32, 32, __riscv_vzext_vf4, quads)
+OPENCV_HAL_IMPL_RVV_INTERLEAVED_PQ(v_float32, 32, __riscv_vzext_vf4, quads)
+
+//////////// PopCount //////////
+static const unsigned char popCountTable[256] =
+{
+    0, 1, 1, 2, 1, 2, 2, 3, 1, 2, 2, 3, 2, 3, 3, 4,
+    1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5,
+    1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5,
+    2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6,
+    1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5,
+    2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6,
+    2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6,
+    3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, 7,
+    1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5,
+    2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6,
+    2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6,
+    3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, 7,
+    2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6,
+    3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, 7,
+    3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, 7,
+    4, 5, 5, 6, 5, 6, 6, 7, 5, 6, 6, 7, 6, 7, 7, 8,
+};
+#define OPENCV_HAL_IMPL_RVV_HADD(_Tpvec, _Tpvec2, _Tm2, width, width2, suffix, add) \
+static inline _Tpvec2 v_hadd(_Tpvec a) { \
+    vuint##width2##m2_t oneX2 = __riscv_vmv_v_x_u##width2##m2(1, VTraits<v_uint##width2>::vlanes()); \
+    vuint##width##m2_t one = __riscv_vreinterpret_u##width##m2(oneX2); \
+    _Tm2 res = add(a, __riscv_vslide1down(a, 0, VTraits<v_uint##width>::vlanes()), VTraits<v_uint##width>::vlanes()); \
+    return __riscv_vget_##suffix##m2(__riscv_vcompress(res, __riscv_vmseq(one, 1, VTraits<v_uint##width>::vlanes()), VTraits<v_uint##width>::vlanes()), 0); \
+}
+OPENCV_HAL_IMPL_RVV_HADD(v_uint8, v_uint16, vuint16m4_t, 8, 16, u16, __riscv_vwaddu_vv)
+OPENCV_HAL_IMPL_RVV_HADD(v_uint16, v_uint32, vuint32m4_t, 16, 32, u32, __riscv_vwaddu_vv)
+OPENCV_HAL_IMPL_RVV_HADD(v_uint32, v_uint64, vuint64m4_t, 32, 64, u64, __riscv_vwaddu_vv)
+OPENCV_HAL_IMPL_RVV_HADD(v_int8, v_int16, vint16m4_t, 8, 16, i16, __riscv_vwadd_vv)
+OPENCV_HAL_IMPL_RVV_HADD(v_int16, v_int32, vint32m4_t, 16, 32, i32, __riscv_vwadd_vv)
+OPENCV_HAL_IMPL_RVV_HADD(v_int32, v_int64, vint64m4_t, 32, 64, i64, __riscv_vwadd_vv)
+
+OPENCV_HAL_IMPL_RVV_HADD(vint32m4_t, v_int32, vint32m4_t, 16, 32, i32, __riscv_vadd)
+OPENCV_HAL_IMPL_RVV_HADD(vint64m4_t, v_int64, vint64m4_t, 32, 64, i64, __riscv_vadd)
+
+inline v_uint8 v_popcount(const v_uint8& a)
+{
+    return __riscv_vloxei8(popCountTable, a, VTraits<v_uint8>::vlanes());
+}
+inline v_uint16 v_popcount(const v_uint16& a)
+{
+    return v_hadd(v_popcount(__riscv_vreinterpret_u8m2(a)));
+}
+inline v_uint32 v_popcount(const v_uint32& a)
+{
+    return v_hadd(v_hadd(v_popcount(__riscv_vreinterpret_u8m2(a))));
+}
+inline v_uint64 v_popcount(const v_uint64& a)
+{
+    return v_hadd(v_hadd(v_hadd(v_popcount(__riscv_vreinterpret_u8m2(a)))));
+}
+
+inline v_uint8 v_popcount(const v_int8& a)
+{
+    return v_popcount(__riscv_vreinterpret_u8m2(a));\
+}
+inline v_uint16 v_popcount(const v_int16& a)
+{
+    return v_popcount(__riscv_vreinterpret_u16m2(a));\
+}
+inline v_uint32 v_popcount(const v_int32& a)
+{
+    return v_popcount(__riscv_vreinterpret_u32m2(a));\
+}
+inline v_uint64 v_popcount(const v_int64& a)
+{
+    return v_popcount(__riscv_vreinterpret_u64m2(a));
+}
+
+
+//////////// SignMask ////////////
+#define OPENCV_HAL_IMPL_RVV_SIGNMASK_OP(_Tpvec) \
+inline int v_signmask(const _Tpvec& a) \
+{ \
+    uint8_t ans[4] = {0}; \
+    __riscv_vsm(ans, __riscv_vmslt(a, 0, VTraits<_Tpvec>::vlanes()), VTraits<_Tpvec>::vlanes()); \
+    return *(reinterpret_cast<int*>(ans)) & (((__int128_t)1 << VTraits<_Tpvec>::vlanes()) - 1); \
+} \
+inline int v_scan_forward(const _Tpvec& a) \
+{ \
+    return (int)__riscv_vfirst(__riscv_vmslt(a, 0, VTraits<_Tpvec>::vlanes()), VTraits<_Tpvec>::vlanes()); \
+}
+
+OPENCV_HAL_IMPL_RVV_SIGNMASK_OP(v_int8)
+OPENCV_HAL_IMPL_RVV_SIGNMASK_OP(v_int16)
+OPENCV_HAL_IMPL_RVV_SIGNMASK_OP(v_int32)
+OPENCV_HAL_IMPL_RVV_SIGNMASK_OP(v_int64)
+
+inline int64 v_signmask(const v_uint8& a)
+{ return v_signmask(v_reinterpret_as_s8(a)); }
+inline int64 v_signmask(const v_uint16& a)
+{ return v_signmask(v_reinterpret_as_s16(a)); }
+inline int v_signmask(const v_uint32& a)
+{ return v_signmask(v_reinterpret_as_s32(a)); }
+inline int v_signmask(const v_float32& a)
+{ return v_signmask(v_reinterpret_as_s32(a)); }
+inline int v_signmask(const v_uint64& a)
+{ return v_signmask(v_reinterpret_as_s64(a)); }
+#if CV_SIMD_SCALABLE_64F
+inline int v_signmask(const v_float64& a)
+{ return v_signmask(v_reinterpret_as_s64(a)); }
+#endif
+
+//////////// Scan forward ////////////
+inline int v_scan_forward(const v_uint8& a)
+{ return v_scan_forward(v_reinterpret_as_s8(a)); }
+inline int v_scan_forward(const v_uint16& a)
+{ return v_scan_forward(v_reinterpret_as_s16(a)); }
+inline int v_scan_forward(const v_uint32& a)
+{ return v_scan_forward(v_reinterpret_as_s32(a)); }
+inline int v_scan_forward(const v_float32& a)
+{ return v_scan_forward(v_reinterpret_as_s32(a)); }
+inline int v_scan_forward(const v_uint64& a)
+{ return v_scan_forward(v_reinterpret_as_s64(a)); }
+#if CV_SIMD_SCALABLE_64F
+inline int v_scan_forward(const v_float64& a)
+{ return v_scan_forward(v_reinterpret_as_s64(a)); }
+#endif
+
+//////////// Pack triplets ////////////
+// {A0, A1, A2, A3, B0, B1, B2, B3, C0 ...} --> {A0, A1, A2, B0, B1, B2, C0 ...}
+// mask: {0,0,0,1, ...} -> {T,T,T,F, ...}
+#define OPENCV_HAL_IMPL_RVV_PACK_TRIPLETS(_Tpvec, v_trunc) \
+inline _Tpvec v_pack_triplets(const _Tpvec& vec) { \
+    size_t vl = VTraits<v_uint8>::vlanes(); \
+    vuint32m2_t one = __riscv_vmv_v_x_u32m2(1, VTraits<v_uint32>::vlanes()); \
+    vuint8m2_t zero = __riscv_vmv_v_x_u8m2(0, vl); \
+    vuint8m2_t mask = __riscv_vreinterpret_u8m2(one); \
+    return __riscv_vcompress(vec, __riscv_vmseq(v_trunc(__riscv_vslideup(zero, mask, 3, vl)), 0, vl), VTraits<_Tpvec>::vlanes()); \
+}
+
+OPENCV_HAL_IMPL_RVV_PACK_TRIPLETS(v_uint8, OPENCV_HAL_NOP)
+OPENCV_HAL_IMPL_RVV_PACK_TRIPLETS(v_int8, OPENCV_HAL_NOP)
+OPENCV_HAL_IMPL_RVV_PACK_TRIPLETS(v_uint16, __riscv_vlmul_trunc_u8m1)
+OPENCV_HAL_IMPL_RVV_PACK_TRIPLETS(v_int16, __riscv_vlmul_trunc_u8m1)
+OPENCV_HAL_IMPL_RVV_PACK_TRIPLETS(v_uint32, __riscv_vlmul_trunc_u8mf2)
+OPENCV_HAL_IMPL_RVV_PACK_TRIPLETS(v_int32, __riscv_vlmul_trunc_u8mf2)
+OPENCV_HAL_IMPL_RVV_PACK_TRIPLETS(v_float32, __riscv_vlmul_trunc_u8mf2)
+OPENCV_HAL_IMPL_RVV_PACK_TRIPLETS(v_uint64, __riscv_vlmul_trunc_u8mf4)
+OPENCV_HAL_IMPL_RVV_PACK_TRIPLETS(v_int64, __riscv_vlmul_trunc_u8mf4)
+#if CV_SIMD_SCALABLE_64F
+OPENCV_HAL_IMPL_RVV_PACK_TRIPLETS(v_float64, __riscv_vlmul_trunc_u8mf4)
+#endif
+
+
+////// FP16 support ///////
+
+#if defined(__riscv_zfh) && __riscv_zfh
+inline v_float32 v_load_expand(const hfloat* ptr)
+{
+    return __riscv_vfwcvt_f(__riscv_vle16_v_f16m1((_Float16*)ptr, VTraits<v_float32>::vlanes()) ,VTraits<v_float32>::vlanes());;
+}
+
+inline void v_pack_store(hfloat* ptr, const v_float32& v)
+{
+    __riscv_vse16_v_f16m1((_Float16*)ptr, __riscv_vfncvt_f_f_w_f16m1(v, VTraits<v_float32>::vlanes()), VTraits<v_float32>::vlanes());
+}
+#else
+inline v_float32 v_load_expand(const hfloat* ptr)
+{
+    float buf[VTraits<v_float32>::max_nlanes];
+    for( int i = 0; i < VTraits<v_float32>::vlanes(); i++ ) buf[i] = (float)ptr[i];
+    return v_load(buf);
+}
+
+inline void v_pack_store(hfloat* ptr, const v_float32& v)
+{
+    float buf[VTraits<v_float32>::max_nlanes];
+    v_store(buf, v);
+    for( int i = 0; i < VTraits<v_float32>::vlanes(); i++ ) ptr[i] = hfloat(buf[i]);
+}
+#endif
+////////////// Rounding //////////////
+inline v_int32 v_round(const v_float32& a)
+{
+    // return vfcvt_x(vfadd(a, 1e-6, VTraits<v_float32>::vlanes()), VTraits<v_float32>::vlanes());
+    return __riscv_vfcvt_x(a, VTraits<v_float32>::vlanes());
+}
+
+inline v_int32 v_floor(const v_float32& a)
+{
+    return __riscv_vfcvt_x(__riscv_vfsub(a, 0.5f - 1e-5, VTraits<v_float32>::vlanes()), VTraits<v_float32>::vlanes());
+    // return vfcvt_x(a, VTraits<v_float32>::vlanes());
+}
+
+inline v_int32 v_ceil(const v_float32& a)
+{
+    return __riscv_vfcvt_x(__riscv_vfadd(a, 0.5f - 1e-5, VTraits<v_float32>::vlanes()), VTraits<v_float32>::vlanes());
+}
+
+inline v_int32 v_trunc(const v_float32& a)
+{
+    return __riscv_vfcvt_rtz_x(a, VTraits<v_float32>::vlanes());
+}
+#if CV_SIMD_SCALABLE_64F
+inline v_int32 v_round(const v_float64& a)
+{
+    return __riscv_vfncvt_x(__riscv_vlmul_ext_f64m4(a), VTraits<v_float32>::vlanes());
+}
+
+inline v_int32 v_round(const v_float64& a, const v_float64& b)
+{
+    // return vfncvt_x(vset(vlmul_ext_f64m2(vfadd(a, 1e-6, VTraits<v_float64>::vlanes())), 1, b), VTraits<v_float32>::vlanes());
+    // Fix https://github.com/opencv/opencv/issues/24746
+    return __riscv_vfncvt_x(__riscv_vset(__riscv_vlmul_ext_f64m4(a), 1, b), VTraits<v_float32>::vlanes());
+}
+
+inline v_int32 v_floor(const v_float64& a)
+{
+    return __riscv_vfncvt_x(__riscv_vlmul_ext_f64m4(__riscv_vfsub(a, 0.5f - 1e-6, VTraits<v_float64>::vlanes())), VTraits<v_float32>::vlanes());
+}
+
+inline v_int32 v_ceil(const v_float64& a)
+{
+    return __riscv_vfncvt_x(__riscv_vlmul_ext_f64m4(__riscv_vfadd(a, 0.5f - 1e-6, VTraits<v_float64>::vlanes())), VTraits<v_float32>::vlanes());
+}
+
+inline v_int32 v_trunc(const v_float64& a)
+{
+    return __riscv_vfncvt_rtz_x(__riscv_vlmul_ext_f64m4(a), VTraits<v_float32>::vlanes());
+}
+#endif
+
+//////// Dot Product ////////
+
+// 16 >> 32
+inline v_int32 v_dotprod(const v_int16& a, const v_int16& b)
+{
+    vint32m4_t temp1 = __riscv_vwmul(a, b, VTraits<v_int16>::vlanes());
+    return v_hadd(temp1);
+}
+
+inline v_int32 v_dotprod(const v_int16& a, const v_int16& b, const v_int32& c)
+{
+    vint32m4_t temp1 = __riscv_vwmul(a, b, VTraits<v_int16>::vlanes());
+    return __riscv_vadd(v_hadd(temp1), c, VTraits<v_int32>::vlanes());
+}
+
+// 32 >> 64
+inline v_int64 v_dotprod(const v_int32& a, const v_int32& b)
+{
+    vuint64m2_t one64 = __riscv_vmv_v_x_u64m2(1, VTraits<v_uint64>::vlanes()); \
+    vuint32m2_t one32 = __riscv_vreinterpret_u32m2(one64); \
+    vbool16_t mask = __riscv_vmseq(one32, 1, VTraits<v_uint32>::vlanes()); \
+    vint64m4_t temp1 = __riscv_vwmul(a, b, VTraits<v_int32>::vlanes()); \
+    vint64m4_t temp2 = __riscv_vslide1down(temp1, 0, VTraits<v_int32>::vlanes());
+    vint64m4_t res = __riscv_vadd(temp1, temp2, VTraits<v_int32>::vlanes());
+    res = __riscv_vcompress(res, mask, VTraits<v_int32>::vlanes()); \
+    return __riscv_vlmul_trunc_i64m2(res); \
+}
+inline v_int64 v_dotprod(const v_int32& a, const v_int32& b, const v_int64& c)
+{
+    vuint64m2_t one64 = __riscv_vmv_v_x_u64m2(1, VTraits<v_uint64>::vlanes()); \
+    vuint32m2_t one32 = __riscv_vreinterpret_u32m2(one64); \
+    vbool16_t mask = __riscv_vmseq(one32, 1, VTraits<v_uint32>::vlanes()); \
+    vint64m4_t temp1 = __riscv_vwmul(a, b, VTraits<v_int32>::vlanes()); \
+    vint64m4_t temp2 = __riscv_vslide1down(temp1, 0, VTraits<v_int32>::vlanes());
+    vint64m4_t res = __riscv_vadd(temp1, temp2, VTraits<v_int32>::vlanes());
+    res = __riscv_vcompress(res, mask, VTraits<v_int32>::vlanes()); \
+    return __riscv_vadd(__riscv_vlmul_trunc_i64m2(res), c, VTraits<v_int64>::vlanes()); \
+}
+
+// 8 >> 32
+inline v_uint32 v_dotprod_expand(const v_uint8& a, const v_uint8& b)
+{
+    vuint32m2_t one32 = __riscv_vmv_v_x_u32m2(1, VTraits<v_uint32>::vlanes()); \
+    vuint8m2_t one8 = __riscv_vreinterpret_u8m2(one32); \
+    vbool4_t mask = __riscv_vmseq(one8, 1, VTraits<v_uint8>::vlanes()); \
+    vuint16m4_t t0 = __riscv_vwmulu(a, b, VTraits<v_uint8>::vlanes()); \
+    vuint16m4_t t1= __riscv_vslide1down(t0, 0, VTraits<v_uint8>::vlanes());
+    vuint16m4_t t2= __riscv_vslide1down(t1, 0, VTraits<v_uint8>::vlanes());
+    vuint16m4_t t3= __riscv_vslide1down(t2, 0, VTraits<v_uint8>::vlanes());
+    vuint32m8_t res = __riscv_vadd(__riscv_vwaddu_vv(t2, t3, VTraits<v_uint8>::vlanes()), __riscv_vwaddu_vv(t0, t1, VTraits<v_uint8>::vlanes()), VTraits<v_uint8>::vlanes());
+    res = __riscv_vcompress(res, mask, VTraits<v_uint8>::vlanes()); \
+    return __riscv_vlmul_trunc_u32m2(res);
+}
+
+inline v_uint32 v_dotprod_expand(const v_uint8& a, const v_uint8& b,
+                                  const v_uint32& c)
+{
+    vuint32m2_t one32 = __riscv_vmv_v_x_u32m2(1, VTraits<v_uint32>::vlanes()); \
+    vuint8m2_t one8 = __riscv_vreinterpret_u8m2(one32); \
+    vbool4_t mask = __riscv_vmseq(one8, 1, VTraits<v_uint8>::vlanes()); \
+    vuint16m4_t t0 = __riscv_vwmulu(a, b, VTraits<v_uint8>::vlanes()); \
+    vuint16m4_t t1= __riscv_vslide1down(t0, 0, VTraits<v_uint8>::vlanes());
+    vuint16m4_t t2= __riscv_vslide1down(t1, 0, VTraits<v_uint8>::vlanes());
+    vuint16m4_t t3= __riscv_vslide1down(t2, 0, VTraits<v_uint8>::vlanes());
+    vuint32m8_t res = __riscv_vadd(__riscv_vwaddu_vv(t2, t3, VTraits<v_uint8>::vlanes()), __riscv_vwaddu_vv(t0, t1, VTraits<v_uint8>::vlanes()), VTraits<v_uint8>::vlanes());
+    res = __riscv_vcompress(res, mask, VTraits<v_uint8>::vlanes()); \
+    return __riscv_vadd(__riscv_vlmul_trunc_u32m2(res), c, VTraits<v_uint8>::vlanes());
+}
+
+inline v_int32 v_dotprod_expand(const v_int8& a, const v_int8& b)
+{
+    vuint32m2_t one32 = __riscv_vmv_v_x_u32m2(1, VTraits<v_uint32>::vlanes()); \
+    vuint8m2_t one8 = __riscv_vreinterpret_u8m2(one32); \
+    vbool4_t mask = __riscv_vmseq(one8, 1, VTraits<v_uint8>::vlanes()); \
+    vint16m4_t t0 = __riscv_vwmul(a, b, VTraits<v_int8>::vlanes()); \
+    vint16m4_t t1= __riscv_vslide1down(t0, 0, VTraits<v_int8>::vlanes());
+    vint16m4_t t2= __riscv_vslide1down(t1, 0, VTraits<v_int8>::vlanes());
+    vint16m4_t t3= __riscv_vslide1down(t2, 0, VTraits<v_int8>::vlanes());
+    vint32m8_t res = __riscv_vadd(__riscv_vwadd_vv(t2, t3, VTraits<v_int8>::vlanes()), __riscv_vwadd_vv(t0, t1, VTraits<v_int8>::vlanes()), VTraits<v_int8>::vlanes());
+    res = __riscv_vcompress(res, mask, VTraits<v_int8>::vlanes()); \
+    return __riscv_vlmul_trunc_i32m2(res);
+}
+
+inline v_int32 v_dotprod_expand(const v_int8& a, const v_int8& b,
+                                  const v_int32& c)
+{
+    vuint32m2_t one32 = __riscv_vmv_v_x_u32m2(1, VTraits<v_uint32>::vlanes()); \
+    vuint8m2_t one8 = __riscv_vreinterpret_u8m2(one32); \
+    vbool4_t mask = __riscv_vmseq(one8, 1, VTraits<v_uint8>::vlanes()); \
+    vint16m4_t t0 = __riscv_vwmul(a, b, VTraits<v_int8>::vlanes()); \
+    vint16m4_t t1= __riscv_vslide1down(t0, 0, VTraits<v_int8>::vlanes());
+    vint16m4_t t2= __riscv_vslide1down(t1, 0, VTraits<v_int8>::vlanes());
+    vint16m4_t t3= __riscv_vslide1down(t2, 0, VTraits<v_int8>::vlanes());
+    vint32m8_t res = __riscv_vadd(__riscv_vwadd_vv(t2, t3, VTraits<v_int8>::vlanes()), __riscv_vwadd_vv(t0, t1, VTraits<v_int8>::vlanes()), VTraits<v_int8>::vlanes());
+    res = __riscv_vcompress(res, mask, VTraits<v_int8>::vlanes()); \
+    return __riscv_vadd(__riscv_vlmul_trunc_i32m2(res), c, VTraits<v_int8>::vlanes());
+}
+
+
+// // 16 >> 64
+inline v_uint64 v_dotprod_expand(const v_uint16& a, const v_uint16& b)
+{
+    vuint64m2_t one64 = __riscv_vmv_v_x_u64m2(1, VTraits<v_uint64>::vlanes()); \
+    vuint16m2_t one16 = __riscv_vreinterpret_u16m2(one64); \
+    vbool8_t mask = __riscv_vmseq(one16, 1, VTraits<v_uint16>::vlanes()); \
+    vuint32m4_t t0 = __riscv_vwmulu(a, b, VTraits<v_uint16>::vlanes()); \
+    vuint32m4_t t1= __riscv_vslide1down(t0, 0, VTraits<v_uint16>::vlanes());
+    vuint32m4_t t2= __riscv_vslide1down(t1, 0, VTraits<v_uint16>::vlanes());
+    vuint32m4_t t3= __riscv_vslide1down(t2, 0, VTraits<v_uint16>::vlanes());
+    vuint64m8_t res = __riscv_vadd(__riscv_vwaddu_vv(t2, t3, VTraits<v_uint16>::vlanes()), __riscv_vwaddu_vv(t0, t1, VTraits<v_uint16>::vlanes()), VTraits<v_uint16>::vlanes());
+    res = __riscv_vcompress(res, mask, VTraits<v_uint16>::vlanes()); \
+    return __riscv_vlmul_trunc_u64m2(res);
+}
+inline v_uint64 v_dotprod_expand(const v_uint16& a, const v_uint16& b, const v_uint64& c)
+{
+    vuint64m2_t one64 = __riscv_vmv_v_x_u64m2(1, VTraits<v_uint64>::vlanes()); \
+    vuint16m2_t one16 = __riscv_vreinterpret_u16m2(one64); \
+    vbool8_t mask = __riscv_vmseq(one16, 1, VTraits<v_uint16>::vlanes()); \
+    vuint32m4_t t0 = __riscv_vwmulu(a, b, VTraits<v_uint16>::vlanes()); \
+    vuint32m4_t t1= __riscv_vslide1down(t0, 0, VTraits<v_uint16>::vlanes());
+    vuint32m4_t t2= __riscv_vslide1down(t1, 0, VTraits<v_uint16>::vlanes());
+    vuint32m4_t t3= __riscv_vslide1down(t2, 0, VTraits<v_uint16>::vlanes());
+    vuint64m8_t res = __riscv_vadd(__riscv_vwaddu_vv(t2, t3, VTraits<v_uint16>::vlanes()), __riscv_vwaddu_vv(t0, t1, VTraits<v_uint16>::vlanes()), VTraits<v_uint16>::vlanes());
+    res = __riscv_vcompress(res, mask, VTraits<v_uint16>::vlanes()); \
+    return __riscv_vadd(__riscv_vlmul_trunc_u64m2(res), c, VTraits<v_uint16>::vlanes());
+}
+
+inline v_int64 v_dotprod_expand(const v_int16& a, const v_int16& b)
+{
+    vuint64m2_t one64 = __riscv_vmv_v_x_u64m2(1, VTraits<v_uint64>::vlanes()); \
+    vuint16m2_t one16 = __riscv_vreinterpret_u16m2(one64); \
+    vbool8_t mask = __riscv_vmseq(one16, 1, VTraits<v_uint16>::vlanes()); \
+    vint32m4_t t0 = __riscv_vwmul(a, b, VTraits<v_int16>::vlanes()); \
+    vint32m4_t t1= __riscv_vslide1down(t0, 0, VTraits<v_int16>::vlanes());
+    vint32m4_t t2= __riscv_vslide1down(t1, 0, VTraits<v_int16>::vlanes());
+    vint32m4_t t3= __riscv_vslide1down(t2, 0, VTraits<v_int16>::vlanes());
+    vint64m8_t res = __riscv_vadd(__riscv_vwadd_vv(t2, t3, VTraits<v_int16>::vlanes()), __riscv_vwadd_vv(t0, t1, VTraits<v_int16>::vlanes()), VTraits<v_int16>::vlanes());
+    res = __riscv_vcompress(res, mask, VTraits<v_int16>::vlanes()); \
+    return __riscv_vlmul_trunc_i64m2(res);
+}
+inline v_int64 v_dotprod_expand(const v_int16& a, const v_int16& b,
+                                  const v_int64& c)
+{
+    vuint64m2_t one64 = __riscv_vmv_v_x_u64m2(1, VTraits<v_uint64>::vlanes()); \
+    vuint16m2_t one16 = __riscv_vreinterpret_u16m2(one64); \
+    vbool8_t mask = __riscv_vmseq(one16, 1, VTraits<v_uint16>::vlanes()); \
+    vint32m4_t t0 = __riscv_vwmul(a, b, VTraits<v_int16>::vlanes()); \
+    vint32m4_t t1= __riscv_vslide1down(t0, 0, VTraits<v_int16>::vlanes());
+    vint32m4_t t2= __riscv_vslide1down(t1, 0, VTraits<v_int16>::vlanes());
+    vint32m4_t t3= __riscv_vslide1down(t2, 0, VTraits<v_int16>::vlanes());
+    vint64m8_t res = __riscv_vadd(__riscv_vwadd_vv(t2, t3, VTraits<v_int16>::vlanes()), __riscv_vwadd_vv(t0, t1, VTraits<v_int16>::vlanes()), VTraits<v_int16>::vlanes());
+    res = __riscv_vcompress(res, mask, VTraits<v_int16>::vlanes()); \
+    return __riscv_vadd(__riscv_vlmul_trunc_i64m2(res), c, VTraits<v_int16>::vlanes());
+}
+
+// // 32 >> 64f
+#if CV_SIMD_SCALABLE_64F
+inline v_float64 v_dotprod_expand(const v_int32& a, const v_int32& b)
+{ return v_cvt_f64(v_dotprod(a, b)); }
+inline v_float64 v_dotprod_expand(const v_int32& a,   const v_int32& b,
+                                    const v_float64& c)
+{ return v_add(v_dotprod_expand(a, b) , c); }
+#endif
+
+//////// Fast Dot Product ////////
+// 16 >> 32
+inline v_int32 v_dotprod_fast(const v_int16& a, const v_int16& b)
+{
+    vint32m1_t zero = __riscv_vmv_v_x_i32m1(0, VTraits<vint32m1_t>::vlanes());
+    return __riscv_vset(__riscv_vmv_v_x_i32m2(0, VTraits<v_int32>::vlanes()), 0, __riscv_vredsum_tu(zero, __riscv_vwmul(a, b, VTraits<v_int16>::vlanes()), zero,  VTraits<v_int16>::vlanes()));
+}
+inline v_int32 v_dotprod_fast(const v_int16& a, const v_int16& b, const v_int32& c)
+{
+    vint32m1_t zero = __riscv_vmv_v_x_i32m1(0, VTraits<vint32m1_t>::vlanes());
+    return  __riscv_vadd(c, __riscv_vset(__riscv_vmv_v_x_i32m2(0, VTraits<v_int32>::vlanes()), 0, __riscv_vredsum_tu(zero, __riscv_vwmul(a, b, VTraits<v_int16>::vlanes()), zero,  VTraits<v_int16>::vlanes())), VTraits<v_int32>::vlanes());
+}
+
+// 32 >> 64
+inline v_int64 v_dotprod_fast(const v_int32& a, const v_int32& b)
+{
+    vint64m1_t zero = __riscv_vmv_v_x_i64m1(0, VTraits<vint64m1_t>::vlanes());
+    return __riscv_vset(__riscv_vmv_v_x_i64m2(0, VTraits<v_int64>::vlanes()), 0, __riscv_vredsum_tu(zero, __riscv_vwmul(a, b, VTraits<v_int32>::vlanes()), zero,  VTraits<v_int32>::vlanes()));
+}
+inline v_int64 v_dotprod_fast(const v_int32& a, const v_int32& b, const v_int64& c)
+{
+    vint64m1_t zero = __riscv_vmv_v_x_i64m1(0, VTraits<vint64m1_t>::vlanes());
+    return  __riscv_vadd(c, __riscv_vset(__riscv_vmv_v_x_i64m2(0, VTraits<v_int64>::vlanes()), 0, __riscv_vredsum_tu(zero, __riscv_vwmul(a, b, VTraits<v_int32>::vlanes()), zero,  VTraits<v_int32>::vlanes())), VTraits<v_int64>::vlanes());
+}
+
+
+// 8 >> 32
+inline v_uint32 v_dotprod_expand_fast(const v_uint8& a, const v_uint8& b)
+{
+    vuint32m1_t zero = __riscv_vmv_v_x_u32m1(0, VTraits<vuint32m1_t>::vlanes());
+    auto res = __riscv_vwredsumu_tu(zero, __riscv_vwmulu(a, b, VTraits<v_uint8>::vlanes()), zero,   VTraits<v_uint8>::vlanes());
+    return __riscv_vset(__riscv_vmv_v_x_u32m2(0, VTraits<v_uint32>::vlanes()), 0, res);
+}
+inline v_uint32 v_dotprod_expand_fast(const v_uint8& a, const v_uint8& b, const v_uint32& c)
+{
+    vuint32m1_t zero = __riscv_vmv_v_x_u32m1(0, VTraits<vuint32m1_t>::vlanes());
+    auto res = __riscv_vwredsumu_tu(zero, __riscv_vwmulu(a, b, VTraits<v_uint8>::vlanes()), zero,   VTraits<v_uint8>::vlanes());
+    return __riscv_vadd(c, __riscv_vset(__riscv_vmv_v_x_u32m2(0, VTraits<v_uint32>::vlanes()), 0, res), VTraits<v_uint32>::vlanes());
+}
+inline v_int32 v_dotprod_expand_fast(const v_int8& a, const v_int8& b)
+{
+    vint32m1_t zero = __riscv_vmv_v_x_i32m1(0, VTraits<vint32m1_t>::vlanes());
+    return __riscv_vset(__riscv_vmv_v_x_i32m2(0, VTraits<v_uint32>::vlanes()), 0, __riscv_vwredsum_tu(zero,  __riscv_vwmul(a, b, VTraits<v_int8>::vlanes()), zero,  VTraits<v_int8>::vlanes()));
+}
+inline v_int32 v_dotprod_expand_fast(const v_int8& a, const v_int8& b, const v_int32& c)
+{
+    vint32m1_t zero = __riscv_vmv_v_x_i32m1(0, VTraits<vint32m1_t>::vlanes());
+    return __riscv_vadd(c, __riscv_vset(__riscv_vmv_v_x_i32m2(0, VTraits<v_uint32>::vlanes()), 0, __riscv_vwredsum_tu(zero, __riscv_vwmul(a, b, VTraits<v_int8>::vlanes()), zero,  VTraits<v_int8>::vlanes())), VTraits<v_int32>::vlanes());
+}
+
+// 16 >> 64
+inline v_uint64 v_dotprod_expand_fast(const v_uint16& a, const v_uint16& b)
+{
+    vuint64m1_t zero = __riscv_vmv_v_x_u64m1(0, VTraits<vuint64m1_t>::vlanes());
+    return __riscv_vset(__riscv_vmv_v_x_u64m2(0, VTraits<v_uint64>::vlanes()), 0, __riscv_vwredsumu_tu(zero,  __riscv_vwmulu(a, b, VTraits<v_uint16>::vlanes()), zero,  VTraits<v_uint16>::vlanes()));
+}
+inline v_uint64 v_dotprod_expand_fast(const v_uint16& a, const v_uint16& b, const v_uint64& c)
+{
+    vuint64m1_t zero = __riscv_vmv_v_x_u64m1(0, VTraits<vuint64m1_t>::vlanes());
+    return __riscv_vadd(c, __riscv_vset(__riscv_vmv_v_x_u64m2(0, VTraits<v_uint64>::vlanes()), 0, __riscv_vwredsumu_tu(zero,  __riscv_vwmulu(a, b, VTraits<v_uint16>::vlanes()), zero,  VTraits<v_uint16>::vlanes())), VTraits<v_uint64>::vlanes());
+}
+inline v_int64 v_dotprod_expand_fast(const v_int16& a, const v_int16& b)
+{
+    vint64m1_t zero = __riscv_vmv_v_x_i64m1(0, VTraits<vint64m1_t>::vlanes());
+    return __riscv_vset(__riscv_vmv_v_x_i64m2(0, VTraits<v_int64>::vlanes()), 0, __riscv_vwredsum_tu(zero,  __riscv_vwmul(a, b, VTraits<v_int16>::vlanes()), zero,  VTraits<v_int16>::vlanes()));
+}
+inline v_int64 v_dotprod_expand_fast(const v_int16& a, const v_int16& b, const v_int64& c)
+{
+    vint64m1_t zero = __riscv_vmv_v_x_i64m1(0, VTraits<vint64m1_t>::vlanes());
+    return __riscv_vadd(c, __riscv_vset(__riscv_vmv_v_x_i64m2(0, VTraits<v_int64>::vlanes()), 0, __riscv_vwredsum_tu(zero,  __riscv_vwmul(a, b, VTraits<v_int16>::vlanes()), zero,  VTraits<v_int16>::vlanes())), VTraits<v_int64>::vlanes());
+}
+
+// 32 >> 64f
+#if CV_SIMD_SCALABLE_64F
+inline v_float64 v_dotprod_expand_fast(const v_int32& a, const v_int32& b)
+{
+    vfloat64m1_t zero = __riscv_vfmv_v_f_f64m1(0, VTraits<vuint64m1_t>::vlanes());
+    auto prod_i64 = __riscv_vwmul(a, b, VTraits<v_int32>::vlanes());
+    // Convert to f64 before reduction to avoid overflow: #27003
+    auto prod_f64 = __riscv_vfcvt_f(prod_i64, VTraits<v_int32>::vlanes());
+    return __riscv_vset( // Needs v_float64 (vfloat64m2_t) here.
+        v_setall_f64(0.0f), // zero_f64m2
+        0,
+        __riscv_vfredusum_tu(zero, prod_f64, zero, VTraits<v_int32>::vlanes())
+    );
+}
+inline v_float64 v_dotprod_expand_fast(const v_int32& a, const v_int32& b, const v_float64& c)
+{ return v_add(v_dotprod_expand_fast(a, b) , c); }
+#endif
+
+// TODO: only 128 bit now.
+inline v_float32 v_matmul(const v_float32& v, const v_float32& mat0,
+                            const v_float32& mat1, const v_float32& mat2,
+                            const v_float32& mat3)
+{
+    vfloat32m2_t res;
+    res = __riscv_vfmul_vf_f32m2(mat0, v_extract_n(v, 0), VTraits<v_float32>::vlanes());
+    res = __riscv_vfmacc_vf_f32m2(res, v_extract_n(v, 1), mat1, VTraits<v_float32>::vlanes());
+    res = __riscv_vfmacc_vf_f32m2(res, v_extract_n(v, 2), mat2, VTraits<v_float32>::vlanes());
+    res = __riscv_vfmacc_vf_f32m2(res, v_extract_n(v, 3), mat3, VTraits<v_float32>::vlanes());
+    return res;
+}
+
+// TODO: only 128 bit now.
+inline v_float32 v_matmuladd(const v_float32& v, const v_float32& mat0,
+                               const v_float32& mat1, const v_float32& mat2,
+                               const v_float32& a)
+{
+    vfloat32m2_t res = __riscv_vfmul_vf_f32m2(mat0, v_extract_n(v,0), VTraits<v_float32>::vlanes());
+    res = __riscv_vfmacc_vf_f32m2(res, v_extract_n(v,1), mat1, VTraits<v_float32>::vlanes());
+    res = __riscv_vfmacc_vf_f32m2(res, v_extract_n(v,2), mat2, VTraits<v_float32>::vlanes());
+    return __riscv_vfadd(res, a, VTraits<v_float32>::vlanes());
+}
+
+inline void v_cleanup() {}
+
+#include "intrin_math.hpp"
+inline v_float32 v_exp(const v_float32& x) { return v_exp_default_32f<v_float32, v_int32>(x); }
+inline v_float32 v_log(const v_float32& x) { return v_log_default_32f<v_float32, v_int32>(x); }
+inline void v_sincos(const v_float32& x, v_float32& s, v_float32& c) { v_sincos_default_32f<v_float32, v_int32>(x, s, c); }
+inline v_float32 v_sin(const v_float32& x) { return v_sin_default_32f<v_float32, v_int32>(x); }
+inline v_float32 v_cos(const v_float32& x) { return v_cos_default_32f<v_float32, v_int32>(x); }
+inline v_float32 v_erf(const v_float32& x) { return v_erf_default_32f<v_float32, v_int32>(x); }
+
+inline v_float64 v_exp(const v_float64& x) { return v_exp_default_64f<v_float64, v_int64>(x); }
+inline v_float64 v_log(const v_float64& x) { return v_log_default_64f<v_float64, v_int64>(x); }
+inline void v_sincos(const v_float64& x, v_float64& s, v_float64& c) { v_sincos_default_64f<v_float64, v_int64>(x, s, c); }
+inline v_float64 v_sin(const v_float64& x) { return v_sin_default_64f<v_float64, v_int64>(x); }
+inline v_float64 v_cos(const v_float64& x) { return v_cos_default_64f<v_float64, v_int64>(x); }
+
+CV_CPU_OPTIMIZATION_HAL_NAMESPACE_END
+
+//! @endcond
+
+} //namespace cv
+
+#endif //OPENCV_HAL_INTRIN_RVV_SCALABLE_HPP
diff --git a/3rdParty/opencv2/core/hal/intrin_sse.hpp b/3rdParty/opencv-4.12.0/opencv2/core/hal/intrin_sse.hpp
similarity index 92%
rename from 3rdParty/opencv2/core/hal/intrin_sse.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/hal/intrin_sse.hpp
index f323d54b13..88ce25737b 100644
--- a/3rdParty/opencv2/core/hal/intrin_sse.hpp
+++ b/3rdParty/opencv-4.12.0/opencv2/core/hal/intrin_sse.hpp
@@ -347,6 +347,8 @@ namespace hal_sse_internal
 #define OPENCV_HAL_IMPL_SSE_INITVEC(_Tpvec, _Tp, suffix, zsuffix, ssuffix, _Tps, cast) \
 inline _Tpvec v_setzero_##suffix() { return _Tpvec(_mm_setzero_##zsuffix()); } \
 inline _Tpvec v_setall_##suffix(_Tp v) { return _Tpvec(_mm_set1_##ssuffix((_Tps)v)); } \
+template <> inline _Tpvec v_setzero_() { return v_setzero_##suffix(); } \
+template <> inline _Tpvec v_setall_(_Tp v) { return v_setall_##suffix(v); } \
 template<typename _Tpvec0> inline _Tpvec v_reinterpret_as_##suffix(const _Tpvec0& a) \
 { return _Tpvec(cast(a.val)); }
 
@@ -364,6 +366,11 @@ inline v_int64x2 v_setzero_s64() { return v_int64x2(_mm_setzero_si128()); }
 inline v_uint64x2 v_setall_u64(uint64 val) { return v_uint64x2(val, val); }
 inline v_int64x2 v_setall_s64(int64 val) { return v_int64x2(val, val); }
 
+template <> inline v_uint64x2 v_setzero_() { return v_setzero_u64(); }
+template <> inline v_int64x2 v_setzero_() { return v_setzero_s64(); }
+template <> inline v_uint64x2 v_setall_(uint64 val) { return v_setall_u64(val); }
+template <> inline v_int64x2 v_setall_(int64 val) { return v_setall_s64(val); }
+
 template<typename _Tpvec> inline
 v_uint64x2 v_reinterpret_as_u64(const _Tpvec& a) { return v_uint64x2(a.val); }
 template<typename _Tpvec> inline
@@ -735,53 +742,46 @@ inline v_float32x4 v_matmuladd(const v_float32x4& v, const v_float32x4& m0,
 }
 
 #define OPENCV_HAL_IMPL_SSE_BIN_OP(bin_op, _Tpvec, intrin) \
-    inline _Tpvec operator bin_op (const _Tpvec& a, const _Tpvec& b) \
+    inline _Tpvec bin_op(const _Tpvec& a, const _Tpvec& b) \
     { \
         return _Tpvec(intrin(a.val, b.val)); \
-    } \
-    inline _Tpvec& operator bin_op##= (_Tpvec& a, const _Tpvec& b) \
-    { \
-        a.val = intrin(a.val, b.val); \
-        return a; \
-    }
-
-OPENCV_HAL_IMPL_SSE_BIN_OP(+, v_uint8x16, _mm_adds_epu8)
-OPENCV_HAL_IMPL_SSE_BIN_OP(-, v_uint8x16, _mm_subs_epu8)
-OPENCV_HAL_IMPL_SSE_BIN_OP(+, v_int8x16, _mm_adds_epi8)
-OPENCV_HAL_IMPL_SSE_BIN_OP(-, v_int8x16, _mm_subs_epi8)
-OPENCV_HAL_IMPL_SSE_BIN_OP(+, v_uint16x8, _mm_adds_epu16)
-OPENCV_HAL_IMPL_SSE_BIN_OP(-, v_uint16x8, _mm_subs_epu16)
-OPENCV_HAL_IMPL_SSE_BIN_OP(+, v_int16x8, _mm_adds_epi16)
-OPENCV_HAL_IMPL_SSE_BIN_OP(-, v_int16x8, _mm_subs_epi16)
-OPENCV_HAL_IMPL_SSE_BIN_OP(+, v_uint32x4, _mm_add_epi32)
-OPENCV_HAL_IMPL_SSE_BIN_OP(-, v_uint32x4, _mm_sub_epi32)
-OPENCV_HAL_IMPL_SSE_BIN_OP(*, v_uint32x4, _v128_mullo_epi32)
-OPENCV_HAL_IMPL_SSE_BIN_OP(+, v_int32x4, _mm_add_epi32)
-OPENCV_HAL_IMPL_SSE_BIN_OP(-, v_int32x4, _mm_sub_epi32)
-OPENCV_HAL_IMPL_SSE_BIN_OP(*, v_int32x4, _v128_mullo_epi32)
-OPENCV_HAL_IMPL_SSE_BIN_OP(+, v_float32x4, _mm_add_ps)
-OPENCV_HAL_IMPL_SSE_BIN_OP(-, v_float32x4, _mm_sub_ps)
-OPENCV_HAL_IMPL_SSE_BIN_OP(*, v_float32x4, _mm_mul_ps)
-OPENCV_HAL_IMPL_SSE_BIN_OP(/, v_float32x4, _mm_div_ps)
-OPENCV_HAL_IMPL_SSE_BIN_OP(+, v_float64x2, _mm_add_pd)
-OPENCV_HAL_IMPL_SSE_BIN_OP(-, v_float64x2, _mm_sub_pd)
-OPENCV_HAL_IMPL_SSE_BIN_OP(*, v_float64x2, _mm_mul_pd)
-OPENCV_HAL_IMPL_SSE_BIN_OP(/, v_float64x2, _mm_div_pd)
-OPENCV_HAL_IMPL_SSE_BIN_OP(+, v_uint64x2, _mm_add_epi64)
-OPENCV_HAL_IMPL_SSE_BIN_OP(-, v_uint64x2, _mm_sub_epi64)
-OPENCV_HAL_IMPL_SSE_BIN_OP(+, v_int64x2, _mm_add_epi64)
-OPENCV_HAL_IMPL_SSE_BIN_OP(-, v_int64x2, _mm_sub_epi64)
+    }
+
+OPENCV_HAL_IMPL_SSE_BIN_OP(v_add, v_uint8x16, _mm_adds_epu8)
+OPENCV_HAL_IMPL_SSE_BIN_OP(v_sub, v_uint8x16, _mm_subs_epu8)
+OPENCV_HAL_IMPL_SSE_BIN_OP(v_add, v_int8x16, _mm_adds_epi8)
+OPENCV_HAL_IMPL_SSE_BIN_OP(v_sub, v_int8x16, _mm_subs_epi8)
+OPENCV_HAL_IMPL_SSE_BIN_OP(v_add, v_uint16x8, _mm_adds_epu16)
+OPENCV_HAL_IMPL_SSE_BIN_OP(v_sub, v_uint16x8, _mm_subs_epu16)
+OPENCV_HAL_IMPL_SSE_BIN_OP(v_add, v_int16x8, _mm_adds_epi16)
+OPENCV_HAL_IMPL_SSE_BIN_OP(v_sub, v_int16x8, _mm_subs_epi16)
+OPENCV_HAL_IMPL_SSE_BIN_OP(v_add, v_uint32x4, _mm_add_epi32)
+OPENCV_HAL_IMPL_SSE_BIN_OP(v_sub, v_uint32x4, _mm_sub_epi32)
+OPENCV_HAL_IMPL_SSE_BIN_OP(v_mul, v_uint32x4, _v128_mullo_epi32)
+OPENCV_HAL_IMPL_SSE_BIN_OP(v_add, v_int32x4, _mm_add_epi32)
+OPENCV_HAL_IMPL_SSE_BIN_OP(v_sub, v_int32x4, _mm_sub_epi32)
+OPENCV_HAL_IMPL_SSE_BIN_OP(v_mul, v_int32x4, _v128_mullo_epi32)
+OPENCV_HAL_IMPL_SSE_BIN_OP(v_add, v_float32x4, _mm_add_ps)
+OPENCV_HAL_IMPL_SSE_BIN_OP(v_sub, v_float32x4, _mm_sub_ps)
+OPENCV_HAL_IMPL_SSE_BIN_OP(v_mul, v_float32x4, _mm_mul_ps)
+OPENCV_HAL_IMPL_SSE_BIN_OP(v_div, v_float32x4, _mm_div_ps)
+OPENCV_HAL_IMPL_SSE_BIN_OP(v_add, v_float64x2, _mm_add_pd)
+OPENCV_HAL_IMPL_SSE_BIN_OP(v_sub, v_float64x2, _mm_sub_pd)
+OPENCV_HAL_IMPL_SSE_BIN_OP(v_mul, v_float64x2, _mm_mul_pd)
+OPENCV_HAL_IMPL_SSE_BIN_OP(v_div, v_float64x2, _mm_div_pd)
+OPENCV_HAL_IMPL_SSE_BIN_OP(v_add, v_uint64x2, _mm_add_epi64)
+OPENCV_HAL_IMPL_SSE_BIN_OP(v_sub, v_uint64x2, _mm_sub_epi64)
+OPENCV_HAL_IMPL_SSE_BIN_OP(v_add, v_int64x2, _mm_add_epi64)
+OPENCV_HAL_IMPL_SSE_BIN_OP(v_sub, v_int64x2, _mm_sub_epi64)
 
 // saturating multiply 8-bit, 16-bit
 #define OPENCV_HAL_IMPL_SSE_MUL_SAT(_Tpvec, _Tpwvec)             \
-    inline _Tpvec operator * (const _Tpvec& a, const _Tpvec& b)  \
+    inline _Tpvec v_mul(const _Tpvec& a, const _Tpvec& b)        \
     {                                                            \
         _Tpwvec c, d;                                            \
         v_mul_expand(a, b, c, d);                                \
         return v_pack(c, d);                                     \
-    }                                                            \
-    inline _Tpvec& operator *= (_Tpvec& a, const _Tpvec& b)      \
-    { a = a * b; return a; }
+    }
 
 OPENCV_HAL_IMPL_SSE_MUL_SAT(v_uint8x16, v_uint16x8)
 OPENCV_HAL_IMPL_SSE_MUL_SAT(v_int8x16,  v_int16x8)
@@ -845,7 +845,7 @@ inline v_uint16x8 v_mul_hi(const v_uint16x8& a, const v_uint16x8& b) { return v_
 inline v_int32x4 v_dotprod(const v_int16x8& a, const v_int16x8& b)
 { return v_int32x4(_mm_madd_epi16(a.val, b.val)); }
 inline v_int32x4 v_dotprod(const v_int16x8& a, const v_int16x8& b, const v_int32x4& c)
-{ return v_dotprod(a, b) + c; }
+{ return v_add(v_dotprod(a, b), c); }
 
 // 32 >> 64
 inline v_int64x2 v_dotprod(const v_int32x4& a, const v_int32x4& b)
@@ -872,7 +872,7 @@ inline v_int64x2 v_dotprod(const v_int32x4& a, const v_int32x4& b)
 #endif
 }
 inline v_int64x2 v_dotprod(const v_int32x4& a, const v_int32x4& b, const v_int64x2& c)
-{ return v_dotprod(a, b) + c; }
+{ return v_add(v_dotprod(a, b), c); }
 
 // 8 >> 32
 inline v_uint32x4 v_dotprod_expand(const v_uint8x16& a, const v_uint8x16& b)
@@ -886,7 +886,7 @@ inline v_uint32x4 v_dotprod_expand(const v_uint8x16& a, const v_uint8x16& b)
     return v_uint32x4(_mm_add_epi32(p0, p1));
 }
 inline v_uint32x4 v_dotprod_expand(const v_uint8x16& a, const v_uint8x16& b, const v_uint32x4& c)
-{ return v_dotprod_expand(a, b) + c; }
+{ return v_add(v_dotprod_expand(a, b), c); }
 
 inline v_int32x4 v_dotprod_expand(const v_int8x16& a, const v_int8x16& b)
 {
@@ -899,7 +899,7 @@ inline v_int32x4 v_dotprod_expand(const v_int8x16& a, const v_int8x16& b)
     return v_int32x4(_mm_add_epi32(p0, p1));
 }
 inline v_int32x4 v_dotprod_expand(const v_int8x16& a, const v_int8x16& b, const v_int32x4& c)
-{ return v_dotprod_expand(a, b) + c; }
+{ return v_add(v_dotprod_expand(a, b), c); }
 
 // 16 >> 64
 inline v_uint64x2 v_dotprod_expand(const v_uint16x8& a, const v_uint16x8& b)
@@ -911,14 +911,14 @@ inline v_uint64x2 v_dotprod_expand(const v_uint16x8& a, const v_uint16x8& b)
     v_expand(c, c0, c1);
     v_expand(d, d0, d1);
 
-    c0 += c1; d0 += d1;
+    c0 = v_add(c0, c1); d0 = v_add(d0, d1);
     return v_uint64x2(_mm_add_epi64(
         _mm_unpacklo_epi64(c0.val, d0.val),
         _mm_unpackhi_epi64(c0.val, d0.val)
     ));
 }
 inline v_uint64x2 v_dotprod_expand(const v_uint16x8& a, const v_uint16x8& b, const v_uint64x2& c)
-{ return v_dotprod_expand(a, b) + c; }
+{ return v_add(v_dotprod_expand(a, b), c); }
 
 inline v_int64x2 v_dotprod_expand(const v_int16x8& a, const v_int16x8& b)
 {
@@ -931,7 +931,7 @@ inline v_int64x2 v_dotprod_expand(const v_int16x8& a, const v_int16x8& b)
     ));
 }
 inline v_int64x2 v_dotprod_expand(const v_int16x8& a, const v_int16x8& b, const v_int64x2& c)
-{ return v_dotprod_expand(a, b) + c; }
+{ return v_add(v_dotprod_expand(a, b), c); }
 
 // 32 >> 64f
 inline v_float64x2 v_dotprod_expand(const v_int32x4& a, const v_int32x4& b)
@@ -939,8 +939,8 @@ inline v_float64x2 v_dotprod_expand(const v_int32x4& a, const v_int32x4& b)
 #if CV_SSE4_1
     return v_cvt_f64(v_dotprod(a, b));
 #else
-    v_float64x2 c = v_cvt_f64(a) * v_cvt_f64(b);
-    v_float64x2 d = v_cvt_f64_high(a) * v_cvt_f64_high(b);
+    v_float64x2 c = v_mul(v_cvt_f64(a), v_cvt_f64(b));
+    v_float64x2 d = v_mul(v_cvt_f64_high(a), v_cvt_f64_high(b));
 
     return v_float64x2(_mm_add_pd(
         _mm_unpacklo_pd(c.val, d.val),
@@ -949,7 +949,7 @@ inline v_float64x2 v_dotprod_expand(const v_int32x4& a, const v_int32x4& b)
 #endif
 }
 inline v_float64x2 v_dotprod_expand(const v_int32x4& a, const v_int32x4& b, const v_float64x2& c)
-{ return v_dotprod_expand(a, b) + c; }
+{ return v_add(v_dotprod_expand(a, b), c); }
 
 //////// Fast Dot Product ////////
 
@@ -957,13 +957,13 @@ inline v_float64x2 v_dotprod_expand(const v_int32x4& a, const v_int32x4& b, cons
 inline v_int32x4 v_dotprod_fast(const v_int16x8& a, const v_int16x8& b)
 { return v_dotprod(a, b); }
 inline v_int32x4 v_dotprod_fast(const v_int16x8& a, const v_int16x8& b, const v_int32x4& c)
-{ return v_dotprod(a, b) + c; }
+{ return v_add(v_dotprod(a, b), c); }
 
 // 32 >> 64
 inline v_int64x2 v_dotprod_fast(const v_int32x4& a, const v_int32x4& b)
 { return v_dotprod(a, b); }
 inline v_int64x2 v_dotprod_fast(const v_int32x4& a, const v_int32x4& b, const v_int64x2& c)
-{ return v_dotprod_fast(a, b) + c; }
+{ return v_add(v_dotprod_fast(a, b), c); }
 
 // 8 >> 32
 inline v_uint32x4 v_dotprod_expand_fast(const v_uint8x16& a, const v_uint8x16& b)
@@ -977,7 +977,7 @@ inline v_uint32x4 v_dotprod_expand_fast(const v_uint8x16& a, const v_uint8x16& b
     return v_uint32x4(_mm_add_epi32(p0, p1));
 }
 inline v_uint32x4 v_dotprod_expand_fast(const v_uint8x16& a, const v_uint8x16& b, const v_uint32x4& c)
-{ return v_dotprod_expand_fast(a, b) + c; }
+{ return v_add(v_dotprod_expand_fast(a, b), c); }
 
 inline v_int32x4 v_dotprod_expand_fast(const v_int8x16& a, const v_int8x16& b)
 {
@@ -994,7 +994,7 @@ inline v_int32x4 v_dotprod_expand_fast(const v_int8x16& a, const v_int8x16& b)
 #endif
 }
 inline v_int32x4 v_dotprod_expand_fast(const v_int8x16& a, const v_int8x16& b, const v_int32x4& c)
-{ return v_dotprod_expand_fast(a, b) + c; }
+{ return v_add(v_dotprod_expand_fast(a, b), c); }
 
 // 16 >> 64
 inline v_uint64x2 v_dotprod_expand_fast(const v_uint16x8& a, const v_uint16x8& b)
@@ -1006,34 +1006,34 @@ inline v_uint64x2 v_dotprod_expand_fast(const v_uint16x8& a, const v_uint16x8& b
     v_expand(c, c0, c1);
     v_expand(d, d0, d1);
 
-    c0 += c1; d0 += d1;
-    return c0 + d0;
+    c0 = v_add(c0, c1); d0 = v_add(d0, d1);
+    return v_add(c0, d0);
 }
 inline v_uint64x2 v_dotprod_expand_fast(const v_uint16x8& a, const v_uint16x8& b, const v_uint64x2& c)
-{ return v_dotprod_expand_fast(a, b) + c; }
+{ return v_add(v_dotprod_expand_fast(a, b), c); }
 
 inline v_int64x2 v_dotprod_expand_fast(const v_int16x8& a, const v_int16x8& b)
 {
     v_int32x4 prod = v_dotprod(a, b);
     v_int64x2 c, d;
     v_expand(prod, c, d);
-    return c + d;
+    return v_add(c, d);
 }
 inline v_int64x2 v_dotprod_expand_fast(const v_int16x8& a, const v_int16x8& b, const v_int64x2& c)
-{ return v_dotprod_expand_fast(a, b) + c; }
+{ return v_add(v_dotprod_expand_fast(a, b), c); }
 
 // 32 >> 64f
 v_float64x2 v_fma(const v_float64x2& a, const v_float64x2& b, const v_float64x2& c);
 inline v_float64x2 v_dotprod_expand_fast(const v_int32x4& a, const v_int32x4& b)
-{ return v_fma(v_cvt_f64(a), v_cvt_f64(b), v_cvt_f64_high(a) * v_cvt_f64_high(b)); }
+{ return v_fma(v_cvt_f64(a), v_cvt_f64(b), v_mul(v_cvt_f64_high(a), v_cvt_f64_high(b))); }
 inline v_float64x2 v_dotprod_expand_fast(const v_int32x4& a,   const v_int32x4& b, const v_float64x2& c)
 { return v_fma(v_cvt_f64(a), v_cvt_f64(b), v_fma(v_cvt_f64_high(a), v_cvt_f64_high(b), c)); }
 
 #define OPENCV_HAL_IMPL_SSE_LOGIC_OP(_Tpvec, suffix, not_const) \
-    OPENCV_HAL_IMPL_SSE_BIN_OP(&, _Tpvec, _mm_and_##suffix) \
-    OPENCV_HAL_IMPL_SSE_BIN_OP(|, _Tpvec, _mm_or_##suffix) \
-    OPENCV_HAL_IMPL_SSE_BIN_OP(^, _Tpvec, _mm_xor_##suffix) \
-    inline _Tpvec operator ~ (const _Tpvec& a) \
+    OPENCV_HAL_IMPL_SSE_BIN_OP(v_and, _Tpvec, _mm_and_##suffix) \
+    OPENCV_HAL_IMPL_SSE_BIN_OP(v_or, _Tpvec, _mm_or_##suffix)   \
+    OPENCV_HAL_IMPL_SSE_BIN_OP(v_xor, _Tpvec, _mm_xor_##suffix) \
+    inline _Tpvec v_not(const _Tpvec& a) \
     { \
         return _Tpvec(_mm_xor_##suffix(a.val, not_const)); \
     }
@@ -1182,58 +1182,58 @@ inline v_int32x4 v_max(const v_int32x4& a, const v_int32x4& b)
 }
 
 #define OPENCV_HAL_IMPL_SSE_INT_CMP_OP(_Tpuvec, _Tpsvec, suffix, sbit) \
-inline _Tpuvec operator == (const _Tpuvec& a, const _Tpuvec& b) \
+inline _Tpuvec v_eq(const _Tpuvec& a, const _Tpuvec& b) \
 { return _Tpuvec(_mm_cmpeq_##suffix(a.val, b.val)); } \
-inline _Tpuvec operator != (const _Tpuvec& a, const _Tpuvec& b) \
+inline _Tpuvec v_ne(const _Tpuvec& a, const _Tpuvec& b) \
 { \
     __m128i not_mask = _mm_set1_epi32(-1); \
     return _Tpuvec(_mm_xor_si128(_mm_cmpeq_##suffix(a.val, b.val), not_mask)); \
 } \
-inline _Tpsvec operator == (const _Tpsvec& a, const _Tpsvec& b) \
+inline _Tpsvec v_eq(const _Tpsvec& a, const _Tpsvec& b) \
 { return _Tpsvec(_mm_cmpeq_##suffix(a.val, b.val)); } \
-inline _Tpsvec operator != (const _Tpsvec& a, const _Tpsvec& b) \
+inline _Tpsvec v_ne(const _Tpsvec& a, const _Tpsvec& b) \
 { \
     __m128i not_mask = _mm_set1_epi32(-1); \
     return _Tpsvec(_mm_xor_si128(_mm_cmpeq_##suffix(a.val, b.val), not_mask)); \
 } \
-inline _Tpuvec operator < (const _Tpuvec& a, const _Tpuvec& b) \
+inline _Tpuvec v_lt(const _Tpuvec& a, const _Tpuvec& b) \
 { \
     __m128i smask = _mm_set1_##suffix(sbit); \
     return _Tpuvec(_mm_cmpgt_##suffix(_mm_xor_si128(b.val, smask), _mm_xor_si128(a.val, smask))); \
 } \
-inline _Tpuvec operator > (const _Tpuvec& a, const _Tpuvec& b) \
+inline _Tpuvec v_gt(const _Tpuvec& a, const _Tpuvec& b) \
 { \
     __m128i smask = _mm_set1_##suffix(sbit); \
     return _Tpuvec(_mm_cmpgt_##suffix(_mm_xor_si128(a.val, smask), _mm_xor_si128(b.val, smask))); \
 } \
-inline _Tpuvec operator <= (const _Tpuvec& a, const _Tpuvec& b) \
+inline _Tpuvec v_le(const _Tpuvec& a, const _Tpuvec& b) \
 { \
     __m128i smask = _mm_set1_##suffix(sbit); \
     __m128i not_mask = _mm_set1_epi32(-1); \
     __m128i res = _mm_cmpgt_##suffix(_mm_xor_si128(a.val, smask), _mm_xor_si128(b.val, smask)); \
     return _Tpuvec(_mm_xor_si128(res, not_mask)); \
 } \
-inline _Tpuvec operator >= (const _Tpuvec& a, const _Tpuvec& b) \
+inline _Tpuvec v_ge(const _Tpuvec& a, const _Tpuvec& b) \
 { \
     __m128i smask = _mm_set1_##suffix(sbit); \
     __m128i not_mask = _mm_set1_epi32(-1); \
     __m128i res = _mm_cmpgt_##suffix(_mm_xor_si128(b.val, smask), _mm_xor_si128(a.val, smask)); \
     return _Tpuvec(_mm_xor_si128(res, not_mask)); \
 } \
-inline _Tpsvec operator < (const _Tpsvec& a, const _Tpsvec& b) \
+inline _Tpsvec v_lt(const _Tpsvec& a, const _Tpsvec& b) \
 { \
     return _Tpsvec(_mm_cmpgt_##suffix(b.val, a.val)); \
 } \
-inline _Tpsvec operator > (const _Tpsvec& a, const _Tpsvec& b) \
+inline _Tpsvec v_gt(const _Tpsvec& a, const _Tpsvec& b) \
 { \
     return _Tpsvec(_mm_cmpgt_##suffix(a.val, b.val)); \
 } \
-inline _Tpsvec operator <= (const _Tpsvec& a, const _Tpsvec& b) \
+inline _Tpsvec v_le(const _Tpsvec& a, const _Tpsvec& b) \
 { \
     __m128i not_mask = _mm_set1_epi32(-1); \
     return _Tpsvec(_mm_xor_si128(_mm_cmpgt_##suffix(a.val, b.val), not_mask)); \
 } \
-inline _Tpsvec operator >= (const _Tpsvec& a, const _Tpsvec& b) \
+inline _Tpsvec v_ge(const _Tpsvec& a, const _Tpsvec& b) \
 { \
     __m128i not_mask = _mm_set1_epi32(-1); \
     return _Tpsvec(_mm_xor_si128(_mm_cmpgt_##suffix(b.val, a.val), not_mask)); \
@@ -1244,17 +1244,17 @@ OPENCV_HAL_IMPL_SSE_INT_CMP_OP(v_uint16x8, v_int16x8, epi16, (short)-32768)
 OPENCV_HAL_IMPL_SSE_INT_CMP_OP(v_uint32x4, v_int32x4, epi32, (int)0x80000000)
 
 #define OPENCV_HAL_IMPL_SSE_FLT_CMP_OP(_Tpvec, suffix) \
-inline _Tpvec operator == (const _Tpvec& a, const _Tpvec& b) \
+inline _Tpvec v_eq(const _Tpvec& a, const _Tpvec& b) \
 { return _Tpvec(_mm_cmpeq_##suffix(a.val, b.val)); } \
-inline _Tpvec operator != (const _Tpvec& a, const _Tpvec& b) \
+inline _Tpvec v_ne(const _Tpvec& a, const _Tpvec& b) \
 { return _Tpvec(_mm_cmpneq_##suffix(a.val, b.val)); } \
-inline _Tpvec operator < (const _Tpvec& a, const _Tpvec& b) \
+inline _Tpvec v_lt(const _Tpvec& a, const _Tpvec& b) \
 { return _Tpvec(_mm_cmplt_##suffix(a.val, b.val)); } \
-inline _Tpvec operator > (const _Tpvec& a, const _Tpvec& b) \
+inline _Tpvec v_gt(const _Tpvec& a, const _Tpvec& b) \
 { return _Tpvec(_mm_cmpgt_##suffix(a.val, b.val)); } \
-inline _Tpvec operator <= (const _Tpvec& a, const _Tpvec& b) \
+inline _Tpvec v_le(const _Tpvec& a, const _Tpvec& b) \
 { return _Tpvec(_mm_cmple_##suffix(a.val, b.val)); } \
-inline _Tpvec operator >= (const _Tpvec& a, const _Tpvec& b) \
+inline _Tpvec v_ge(const _Tpvec& a, const _Tpvec& b) \
 { return _Tpvec(_mm_cmpge_##suffix(a.val, b.val)); }
 
 OPENCV_HAL_IMPL_SSE_FLT_CMP_OP(v_float32x4, ps)
@@ -1262,17 +1262,17 @@ OPENCV_HAL_IMPL_SSE_FLT_CMP_OP(v_float64x2, pd)
 
 #if CV_SSE4_1
 #define OPENCV_HAL_IMPL_SSE_64BIT_CMP_OP(_Tpvec) \
-inline _Tpvec operator == (const _Tpvec& a, const _Tpvec& b) \
+inline _Tpvec v_eq (const _Tpvec& a, const _Tpvec& b) \
 { return _Tpvec(_mm_cmpeq_epi64(a.val, b.val)); } \
-inline _Tpvec operator != (const _Tpvec& a, const _Tpvec& b) \
-{ return ~(a == b); }
+inline _Tpvec v_ne (const _Tpvec& a, const _Tpvec& b) \
+{ return v_not(v_eq(a, b)); }
 #else
 #define OPENCV_HAL_IMPL_SSE_64BIT_CMP_OP(_Tpvec) \
-inline _Tpvec operator == (const _Tpvec& a, const _Tpvec& b) \
+inline _Tpvec v_eq(const _Tpvec& a, const _Tpvec& b) \
 { __m128i cmp = _mm_cmpeq_epi32(a.val, b.val); \
   return _Tpvec(_mm_and_si128(cmp, _mm_shuffle_epi32(cmp, _MM_SHUFFLE(2, 3, 0, 1)))); } \
-inline _Tpvec operator != (const _Tpvec& a, const _Tpvec& b) \
-{ return ~(a == b); }
+inline _Tpvec v_ne(const _Tpvec& a, const _Tpvec& b) \
+{ return v_not(v_eq(a, b)); }
 #endif
 
 OPENCV_HAL_IMPL_SSE_64BIT_CMP_OP(v_uint64x2)
@@ -1311,17 +1311,17 @@ inline v_int8x16 v_mul_wrap(const v_int8x16& a, const v_int8x16& b)
 /** Absolute difference **/
 
 inline v_uint8x16 v_absdiff(const v_uint8x16& a, const v_uint8x16& b)
-{ return v_add_wrap(a - b,  b - a); }
+{ return v_add_wrap(v_sub(a, b),  v_sub(b, a)); }
 inline v_uint16x8 v_absdiff(const v_uint16x8& a, const v_uint16x8& b)
-{ return v_add_wrap(a - b,  b - a); }
+{ return v_add_wrap(v_sub(a, b),  v_sub(b, a)); }
 inline v_uint32x4 v_absdiff(const v_uint32x4& a, const v_uint32x4& b)
-{ return v_max(a, b) - v_min(a, b); }
+{ return v_sub(v_max(a, b), v_min(a, b)); }
 
 inline v_uint8x16 v_absdiff(const v_int8x16& a, const v_int8x16& b)
 {
     v_int8x16 d = v_sub_wrap(a, b);
-    v_int8x16 m = a < b;
-    return v_reinterpret_as_u8(v_sub_wrap(d ^ m, m));
+    v_int8x16 m = v_lt(a, b);
+    return v_reinterpret_as_u8(v_sub_wrap(v_xor(d, m), m));
 }
 inline v_uint16x8 v_absdiff(const v_int16x8& a, const v_int16x8& b)
 {
@@ -1329,25 +1329,25 @@ inline v_uint16x8 v_absdiff(const v_int16x8& a, const v_int16x8& b)
 }
 inline v_uint32x4 v_absdiff(const v_int32x4& a, const v_int32x4& b)
 {
-    v_int32x4 d = a - b;
-    v_int32x4 m = a < b;
-    return v_reinterpret_as_u32((d ^ m) - m);
+    v_int32x4 d = v_sub(a, b);
+    v_int32x4 m = v_lt(a, b);
+    return v_reinterpret_as_u32(v_sub(v_xor(d, m), m));
 }
 
 /** Saturating absolute difference **/
 inline v_int8x16 v_absdiffs(const v_int8x16& a, const v_int8x16& b)
 {
-    v_int8x16 d = a - b;
-    v_int8x16 m = a < b;
-    return (d ^ m) - m;
+    v_int8x16 d = v_sub(a, b);
+    v_int8x16 m = v_lt(a, b);
+    return v_sub(v_xor(d, m), m);
  }
 inline v_int16x8 v_absdiffs(const v_int16x8& a, const v_int16x8& b)
-{ return v_max(a, b) - v_min(a, b); }
+{ return v_sub(v_max(a, b), v_min(a, b)); }
 
 
 inline v_int32x4 v_fma(const v_int32x4& a, const v_int32x4& b, const v_int32x4& c)
 {
-    return a * b + c;
+    return v_add(v_mul(a, b), c);
 }
 
 inline v_int32x4 v_muladd(const v_int32x4& a, const v_int32x4& b, const v_int32x4& c)
@@ -1381,12 +1381,12 @@ inline _Tpvec v_absdiff(const _Tpvec& a, const _Tpvec& b) \
 } \
 inline _Tpvec v_magnitude(const _Tpvec& a, const _Tpvec& b) \
 { \
-    _Tpvec res = v_fma(a, a, b*b); \
+    _Tpvec res = v_fma(a, a, v_mul(b, b)); \
     return _Tpvec(_mm_sqrt_##suffix(res.val)); \
 } \
 inline _Tpvec v_sqr_magnitude(const _Tpvec& a, const _Tpvec& b) \
 { \
-    return v_fma(a, a, b*b); \
+    return v_fma(a, a, v_mul(b, b)); \
 } \
 inline _Tpvec v_muladd(const _Tpvec& a, const _Tpvec& b, const _Tpvec& c) \
 { \
@@ -1397,19 +1397,19 @@ OPENCV_HAL_IMPL_SSE_MISC_FLT_OP(v_float32x4, float, __m128, ps, _mm_set1_epi32((
 OPENCV_HAL_IMPL_SSE_MISC_FLT_OP(v_float64x2, double, __m128d, pd, _mm_srli_epi64(_mm_set1_epi32(-1), 1))
 
 #define OPENCV_HAL_IMPL_SSE_SHIFT_OP(_Tpuvec, _Tpsvec, suffix, srai) \
-inline _Tpuvec operator << (const _Tpuvec& a, int imm) \
+inline _Tpuvec v_shl(const _Tpuvec& a, int imm) \
 { \
     return _Tpuvec(_mm_slli_##suffix(a.val, imm)); \
 } \
-inline _Tpsvec operator << (const _Tpsvec& a, int imm) \
+inline _Tpsvec v_shl(const _Tpsvec& a, int imm) \
 { \
     return _Tpsvec(_mm_slli_##suffix(a.val, imm)); \
 } \
-inline _Tpuvec operator >> (const _Tpuvec& a, int imm) \
+inline _Tpuvec v_shr(const _Tpuvec& a, int imm) \
 { \
     return _Tpuvec(_mm_srli_##suffix(a.val, imm)); \
 } \
-inline _Tpsvec operator >> (const _Tpsvec& a, int imm) \
+inline _Tpsvec v_shr(const _Tpsvec& a, int imm) \
 { \
     return _Tpsvec(srai(a.val, imm)); \
 } \
@@ -1711,9 +1711,9 @@ OPENCV_HAL_IMPL_SSE_REDUCE_OP_4_SUM(v_int32x4, int, __m128i, epi32, OPENCV_HAL_N
 OPENCV_HAL_IMPL_SSE_REDUCE_OP_4_SUM(v_float32x4, float, __m128, ps, _mm_castps_si128, _mm_castsi128_ps, ss_f32)
 
 inline int v_reduce_sum(const v_int16x8& a)
-{ return v_reduce_sum(v_expand_low(a) + v_expand_high(a)); }
+{ return v_reduce_sum(v_add(v_expand_low(a), v_expand_high(a))); }
 inline unsigned v_reduce_sum(const v_uint16x8& a)
-{ return v_reduce_sum(v_expand_low(a) + v_expand_high(a)); }
+{ return v_reduce_sum(v_add(v_expand_low(a), v_expand_high(a))); }
 
 inline uint64 v_reduce_sum(const v_uint64x2& a)
 {
@@ -1770,13 +1770,13 @@ inline unsigned v_reduce_sad(const v_uint16x8& a, const v_uint16x8& b)
 {
     v_uint32x4 l, h;
     v_expand(v_absdiff(a, b), l, h);
-    return v_reduce_sum(l + h);
+    return v_reduce_sum(v_add(l, h));
 }
 inline unsigned v_reduce_sad(const v_int16x8& a, const v_int16x8& b)
 {
     v_uint32x4 l, h;
     v_expand(v_absdiff(a, b), l, h);
-    return v_reduce_sum(l + h);
+    return v_reduce_sum(v_add(l, h));
 }
 inline unsigned v_reduce_sad(const v_uint32x4& a, const v_uint32x4& b)
 {
@@ -1805,15 +1805,15 @@ inline v_uint8x16 v_popcount(const v_uint8x16& a)
 inline v_uint16x8 v_popcount(const v_uint16x8& a)
 {
     v_uint8x16 p = v_popcount(v_reinterpret_as_u8(a));
-    p += v_rotate_right<1>(p);
-    return v_reinterpret_as_u16(p) & v_setall_u16(0x00ff);
+    p = v_add(p, v_rotate_right<1>(p));
+    return v_and(v_reinterpret_as_u16(p), v_setall_u16(0x00ff));
 }
 inline v_uint32x4 v_popcount(const v_uint32x4& a)
 {
     v_uint8x16 p = v_popcount(v_reinterpret_as_u8(a));
-    p += v_rotate_right<1>(p);
-    p += v_rotate_right<2>(p);
-    return v_reinterpret_as_u32(p) & v_setall_u32(0x000000ff);
+    p = v_add(p, v_rotate_right<1>(p));
+    p = v_add(p, v_rotate_right<2>(p));
+    return v_and(v_reinterpret_as_u32(p), v_setall_u32(0x000000ff));
 }
 inline v_uint64x2 v_popcount(const v_uint64x2& a)
 {
@@ -1921,11 +1921,12 @@ OPENCV_HAL_IMPL_SSE_EXPAND(v_int16x8,  v_int32x4,   short,    _v128_cvtepi16_epi
 OPENCV_HAL_IMPL_SSE_EXPAND(v_uint32x4, v_uint64x2,  unsigned, _v128_cvtepu32_epi64)
 OPENCV_HAL_IMPL_SSE_EXPAND(v_int32x4,  v_int64x2,   int,      _v128_cvtepi32_epi64)
 
-#define OPENCV_HAL_IMPL_SSE_EXPAND_Q(_Tpvec, _Tp, intrin)  \
-    inline _Tpvec v_load_expand_q(const _Tp* ptr)          \
-    {                                                      \
-        __m128i a = _mm_cvtsi32_si128(*(const int*)ptr);   \
-        return _Tpvec(intrin(a));                          \
+#define OPENCV_HAL_IMPL_SSE_EXPAND_Q(_Tpvec, _Tp, intrin)          \
+    inline _Tpvec v_load_expand_q(const _Tp* ptr)                  \
+    {                                                              \
+        typedef int CV_DECL_ALIGNED(1) unaligned_int;              \
+        __m128i a = _mm_cvtsi32_si128(*(const unaligned_int*)ptr); \
+        return _Tpvec(intrin(a));                                  \
     }
 
 OPENCV_HAL_IMPL_SSE_EXPAND_Q(v_uint32x4, uchar, _v128_cvtepu8_epi32)
@@ -3406,7 +3407,7 @@ inline v_float32x4 v_broadcast_element(const v_float32x4& v)
 
 ////////////// FP16 support ///////////////////////////
 
-inline v_float32x4 v_load_expand(const float16_t* ptr)
+inline v_float32x4 v_load_expand(const hfloat* ptr)
 {
 #if CV_FP16
     return v_float32x4(_mm_cvtph_ps(_mm_loadu_si128((const __m128i*)ptr)));
@@ -3426,7 +3427,7 @@ inline v_float32x4 v_load_expand(const float16_t* ptr)
 #endif
 }
 
-inline void v_pack_store(float16_t* ptr, const v_float32x4& v)
+inline void v_pack_store(hfloat* ptr, const v_float32x4& v)
 {
 #if CV_FP16
     __m128i fp16_value = _mm_cvtps_ph(v.val, 0);
@@ -3458,6 +3459,21 @@ inline void v_pack_store(float16_t* ptr, const v_float32x4& v)
 
 inline void v_cleanup() {}
 
+#include "intrin_math.hpp"
+inline v_float32x4 v_exp(const v_float32x4& x) { return v_exp_default_32f<v_float32x4, v_int32x4>(x); }
+inline v_float32x4 v_log(const v_float32x4& x) { return v_log_default_32f<v_float32x4, v_int32x4>(x); }
+inline void v_sincos(const v_float32x4& x, v_float32x4& s, v_float32x4& c) { v_sincos_default_32f<v_float32x4, v_int32x4>(x, s, c); }
+inline v_float32x4 v_sin(const v_float32x4& x) { return v_sin_default_32f<v_float32x4, v_int32x4>(x); }
+inline v_float32x4 v_cos(const v_float32x4& x) { return v_cos_default_32f<v_float32x4, v_int32x4>(x); }
+inline v_float32x4 v_erf(const v_float32x4& x) { return v_erf_default_32f<v_float32x4, v_int32x4>(x); }
+
+inline v_float64x2 v_exp(const v_float64x2& x) { return v_exp_default_64f<v_float64x2, v_int64x2>(x); }
+inline v_float64x2 v_log(const v_float64x2& x) { return v_log_default_64f<v_float64x2, v_int64x2>(x); }
+inline void v_sincos(const v_float64x2& x, v_float64x2& s, v_float64x2& c) { v_sincos_default_64f<v_float64x2, v_int64x2>(x, s, c); }
+inline v_float64x2 v_sin(const v_float64x2& x) { return v_sin_default_64f<v_float64x2, v_int64x2>(x); }
+inline v_float64x2 v_cos(const v_float64x2& x) { return v_cos_default_64f<v_float64x2, v_int64x2>(x); }
+
+
 CV_CPU_OPTIMIZATION_HAL_NAMESPACE_END
 
 //! @endcond
diff --git a/3rdParty/opencv2/core/hal/intrin_sse_em.hpp b/3rdParty/opencv-4.12.0/opencv2/core/hal/intrin_sse_em.hpp
similarity index 100%
rename from 3rdParty/opencv2/core/hal/intrin_sse_em.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/hal/intrin_sse_em.hpp
diff --git a/3rdParty/opencv2/core/hal/intrin_vsx.hpp b/3rdParty/opencv-4.12.0/opencv2/core/hal/intrin_vsx.hpp
similarity index 91%
rename from 3rdParty/opencv2/core/hal/intrin_vsx.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/hal/intrin_vsx.hpp
index e3f4468ca3..c4c2058ffd 100644
--- a/3rdParty/opencv2/core/hal/intrin_vsx.hpp
+++ b/3rdParty/opencv-4.12.0/opencv2/core/hal/intrin_vsx.hpp
@@ -261,6 +261,8 @@ OPENCV_HAL_IMPL_VSX_EXTRACT_N(v_float64x2, double)
 #define OPENCV_HAL_IMPL_VSX_INITVEC(_Tpvec, _Tp, suffix, cast)                        \
 inline _Tpvec v_setzero_##suffix() { return _Tpvec(vec_splats((_Tp)0)); }             \
 inline _Tpvec v_setall_##suffix(_Tp v) { return _Tpvec(vec_splats((_Tp)v));}          \
+template <> inline _Tpvec v_setzero_() { return v_setzero_##suffix(); }               \
+template <> inline _Tpvec v_setall_(_Tp v) { return v_setall_##suffix(v); }       \
 template<typename _Tpvec0> inline _Tpvec v_reinterpret_as_##suffix(const _Tpvec0 &a)  \
 { return _Tpvec((cast)a.val); }
 
@@ -513,48 +515,44 @@ inline void v_recombine(const _Tpvec& a, const _Tpvec& b, _Tpvec& c, _Tpvec& d)
 /* Element-wise binary and unary operations */
 /** Arithmetics **/
 #define OPENCV_HAL_IMPL_VSX_BIN_OP(bin_op, _Tpvec, intrin)       \
-inline _Tpvec operator bin_op (const _Tpvec& a, const _Tpvec& b) \
-{ return _Tpvec(intrin(a.val, b.val)); }                         \
-inline _Tpvec& operator bin_op##= (_Tpvec& a, const _Tpvec& b)   \
-{ a.val = intrin(a.val, b.val); return a; }
-
-OPENCV_HAL_IMPL_VSX_BIN_OP(+, v_uint8x16, vec_adds)
-OPENCV_HAL_IMPL_VSX_BIN_OP(-, v_uint8x16, vec_subs)
-OPENCV_HAL_IMPL_VSX_BIN_OP(+, v_int8x16,  vec_adds)
-OPENCV_HAL_IMPL_VSX_BIN_OP(-, v_int8x16, vec_subs)
-OPENCV_HAL_IMPL_VSX_BIN_OP(+, v_uint16x8, vec_adds)
-OPENCV_HAL_IMPL_VSX_BIN_OP(-, v_uint16x8, vec_subs)
-OPENCV_HAL_IMPL_VSX_BIN_OP(+, v_int16x8, vec_adds)
-OPENCV_HAL_IMPL_VSX_BIN_OP(-, v_int16x8, vec_subs)
-OPENCV_HAL_IMPL_VSX_BIN_OP(+, v_uint32x4, vec_add)
-OPENCV_HAL_IMPL_VSX_BIN_OP(-, v_uint32x4, vec_sub)
-OPENCV_HAL_IMPL_VSX_BIN_OP(*, v_uint32x4, vec_mul)
-OPENCV_HAL_IMPL_VSX_BIN_OP(+, v_int32x4, vec_add)
-OPENCV_HAL_IMPL_VSX_BIN_OP(-, v_int32x4, vec_sub)
-OPENCV_HAL_IMPL_VSX_BIN_OP(*, v_int32x4, vec_mul)
-OPENCV_HAL_IMPL_VSX_BIN_OP(+, v_float32x4, vec_add)
-OPENCV_HAL_IMPL_VSX_BIN_OP(-, v_float32x4, vec_sub)
-OPENCV_HAL_IMPL_VSX_BIN_OP(*, v_float32x4, vec_mul)
-OPENCV_HAL_IMPL_VSX_BIN_OP(/, v_float32x4, vec_div)
-OPENCV_HAL_IMPL_VSX_BIN_OP(+, v_float64x2, vec_add)
-OPENCV_HAL_IMPL_VSX_BIN_OP(-, v_float64x2, vec_sub)
-OPENCV_HAL_IMPL_VSX_BIN_OP(*, v_float64x2, vec_mul)
-OPENCV_HAL_IMPL_VSX_BIN_OP(/, v_float64x2, vec_div)
-OPENCV_HAL_IMPL_VSX_BIN_OP(+, v_uint64x2, vec_add)
-OPENCV_HAL_IMPL_VSX_BIN_OP(-, v_uint64x2, vec_sub)
-OPENCV_HAL_IMPL_VSX_BIN_OP(+, v_int64x2, vec_add)
-OPENCV_HAL_IMPL_VSX_BIN_OP(-, v_int64x2, vec_sub)
+inline _Tpvec bin_op(const _Tpvec& a, const _Tpvec& b) \
+{ return _Tpvec(intrin(a.val, b.val)); }
+
+OPENCV_HAL_IMPL_VSX_BIN_OP(v_add, v_uint8x16, vec_adds)
+OPENCV_HAL_IMPL_VSX_BIN_OP(v_sub, v_uint8x16, vec_subs)
+OPENCV_HAL_IMPL_VSX_BIN_OP(v_add, v_int8x16,  vec_adds)
+OPENCV_HAL_IMPL_VSX_BIN_OP(v_sub, v_int8x16, vec_subs)
+OPENCV_HAL_IMPL_VSX_BIN_OP(v_add, v_uint16x8, vec_adds)
+OPENCV_HAL_IMPL_VSX_BIN_OP(v_sub, v_uint16x8, vec_subs)
+OPENCV_HAL_IMPL_VSX_BIN_OP(v_add, v_int16x8, vec_adds)
+OPENCV_HAL_IMPL_VSX_BIN_OP(v_sub, v_int16x8, vec_subs)
+OPENCV_HAL_IMPL_VSX_BIN_OP(v_add, v_uint32x4, vec_add)
+OPENCV_HAL_IMPL_VSX_BIN_OP(v_sub, v_uint32x4, vec_sub)
+OPENCV_HAL_IMPL_VSX_BIN_OP(v_mul, v_uint32x4, vec_mul)
+OPENCV_HAL_IMPL_VSX_BIN_OP(v_add, v_int32x4, vec_add)
+OPENCV_HAL_IMPL_VSX_BIN_OP(v_sub, v_int32x4, vec_sub)
+OPENCV_HAL_IMPL_VSX_BIN_OP(v_mul, v_int32x4, vec_mul)
+OPENCV_HAL_IMPL_VSX_BIN_OP(v_add, v_float32x4, vec_add)
+OPENCV_HAL_IMPL_VSX_BIN_OP(v_sub, v_float32x4, vec_sub)
+OPENCV_HAL_IMPL_VSX_BIN_OP(v_mul, v_float32x4, vec_mul)
+OPENCV_HAL_IMPL_VSX_BIN_OP(v_div, v_float32x4, vec_div)
+OPENCV_HAL_IMPL_VSX_BIN_OP(v_add, v_float64x2, vec_add)
+OPENCV_HAL_IMPL_VSX_BIN_OP(v_sub, v_float64x2, vec_sub)
+OPENCV_HAL_IMPL_VSX_BIN_OP(v_mul, v_float64x2, vec_mul)
+OPENCV_HAL_IMPL_VSX_BIN_OP(v_div, v_float64x2, vec_div)
+OPENCV_HAL_IMPL_VSX_BIN_OP(v_add, v_uint64x2, vec_add)
+OPENCV_HAL_IMPL_VSX_BIN_OP(v_sub, v_uint64x2, vec_sub)
+OPENCV_HAL_IMPL_VSX_BIN_OP(v_add, v_int64x2, vec_add)
+OPENCV_HAL_IMPL_VSX_BIN_OP(v_sub, v_int64x2, vec_sub)
 
 // saturating multiply
 #define OPENCV_HAL_IMPL_VSX_MUL_SAT(_Tpvec, _Tpwvec)             \
-    inline _Tpvec operator * (const _Tpvec& a, const _Tpvec& b)  \
+    inline _Tpvec v_mul(const _Tpvec& a, const _Tpvec& b)        \
     {                                                            \
         _Tpwvec c, d;                                            \
         v_mul_expand(a, b, c, d);                                \
         return v_pack(c, d);                                     \
-    }                                                            \
-    inline _Tpvec& operator *= (_Tpvec& a, const _Tpvec& b)      \
-    { a = a * b; return a; }
+    }
 
 OPENCV_HAL_IMPL_VSX_MUL_SAT(v_int8x16,  v_int16x8)
 OPENCV_HAL_IMPL_VSX_MUL_SAT(v_uint8x16, v_uint16x8)
@@ -596,9 +594,9 @@ OPENCV_HAL_IMPL_VSX_BIN_FUNC(v_mul_wrap, vec_mul)
 
 /** Bitwise shifts **/
 #define OPENCV_HAL_IMPL_VSX_SHIFT_OP(_Tpvec, shr, splfunc)   \
-inline _Tpvec operator << (const _Tpvec& a, int imm)         \
+inline _Tpvec v_shl(const _Tpvec& a, int imm)                \
 { return _Tpvec(vec_sl(a.val, splfunc(imm))); }              \
-inline _Tpvec operator >> (const _Tpvec& a, int imm)         \
+inline _Tpvec v_shr(const _Tpvec& a, int imm)                \
 { return _Tpvec(shr(a.val, splfunc(imm))); }                 \
 template<int imm> inline _Tpvec v_shl(const _Tpvec& a)       \
 { return _Tpvec(vec_sl(a.val, splfunc(imm))); }              \
@@ -617,10 +615,10 @@ OPENCV_HAL_IMPL_VSX_SHIFT_OP(v_int64x2, vec_sra, vec_udword2_sp)
 
 /** Bitwise logic **/
 #define OPENCV_HAL_IMPL_VSX_LOGIC_OP(_Tpvec)    \
-OPENCV_HAL_IMPL_VSX_BIN_OP(&, _Tpvec, vec_and)  \
-OPENCV_HAL_IMPL_VSX_BIN_OP(|, _Tpvec, vec_or)   \
-OPENCV_HAL_IMPL_VSX_BIN_OP(^, _Tpvec, vec_xor)  \
-inline _Tpvec operator ~ (const _Tpvec& a)      \
+OPENCV_HAL_IMPL_VSX_BIN_OP(v_and, _Tpvec, vec_and)  \
+OPENCV_HAL_IMPL_VSX_BIN_OP(v_or, _Tpvec, vec_or)    \
+OPENCV_HAL_IMPL_VSX_BIN_OP(v_xor, _Tpvec, vec_xor)  \
+inline _Tpvec v_not(const _Tpvec& a)                \
 { return _Tpvec(vec_not(a.val)); }
 
 OPENCV_HAL_IMPL_VSX_LOGIC_OP(v_uint8x16)
@@ -650,17 +648,17 @@ OPENCV_HAL_IMPL_VSX_SELECT(v_float64x2, vec_bdword2_c)
 
 /** Comparison **/
 #define OPENCV_HAL_IMPL_VSX_INT_CMP_OP(_Tpvec)                 \
-inline _Tpvec operator == (const _Tpvec& a, const _Tpvec& b)   \
+inline _Tpvec v_eq(const _Tpvec& a, const _Tpvec& b)           \
 { return _Tpvec(vec_cmpeq(a.val, b.val)); }                    \
-inline _Tpvec operator != (const _Tpvec& a, const _Tpvec& b)   \
+inline _Tpvec v_ne(const _Tpvec& a, const _Tpvec& b)           \
 { return _Tpvec(vec_cmpne(a.val, b.val)); }                    \
-inline _Tpvec operator < (const _Tpvec& a, const _Tpvec& b)    \
+inline _Tpvec v_lt(const _Tpvec& a, const _Tpvec& b)           \
 { return _Tpvec(vec_cmplt(a.val, b.val)); }                    \
-inline _Tpvec operator > (const _Tpvec& a, const _Tpvec& b)    \
+inline _Tpvec v_gt(const _Tpvec& a, const _Tpvec& b)           \
 { return _Tpvec(vec_cmpgt(a.val, b.val)); }                    \
-inline _Tpvec operator <= (const _Tpvec& a, const _Tpvec& b)   \
+inline _Tpvec v_le(const _Tpvec& a, const _Tpvec& b)           \
 { return _Tpvec(vec_cmple(a.val, b.val)); }                    \
-inline _Tpvec operator >= (const _Tpvec& a, const _Tpvec& b)   \
+inline _Tpvec v_ge(const _Tpvec& a, const _Tpvec& b)           \
 { return _Tpvec(vec_cmpge(a.val, b.val)); }
 
 OPENCV_HAL_IMPL_VSX_INT_CMP_OP(v_uint8x16)
@@ -1060,7 +1058,7 @@ OPENCV_HAL_IMPL_VSX_MULADD(v_float32x4)
 OPENCV_HAL_IMPL_VSX_MULADD(v_float64x2)
 
 inline v_int32x4 v_muladd(const v_int32x4& a, const v_int32x4& b, const v_int32x4& c)
-{ return a * b + c; }
+{ return v_add(v_mul(a,  b), c); }
 
 // TODO: exp, log, sin, cos
 
@@ -1089,12 +1087,12 @@ inline v_uint8x16 v_absdiff(const v_int8x16& a, const v_int8x16& b)
 inline v_uint16x8 v_absdiff(const v_int16x8& a, const v_int16x8& b)
 { return v_reinterpret_as_u16(v_sub_wrap(v_max(a, b), v_min(a, b))); }
 inline v_uint32x4 v_absdiff(const v_int32x4& a, const v_int32x4& b)
-{ return v_reinterpret_as_u32(v_max(a, b) - v_min(a, b)); }
+{ return v_reinterpret_as_u32(v_sub(v_max(a, b), v_min(a, b))); }
 
 inline v_float32x4 v_absdiff(const v_float32x4& a, const v_float32x4& b)
-{ return v_abs(a - b); }
+{ return v_abs(v_sub(a, b)); }
 inline v_float64x2 v_absdiff(const v_float64x2& a, const v_float64x2& b)
-{ return v_abs(a - b); }
+{ return v_abs(v_sub(a, b)); }
 
 /** Absolute difference for signed integers **/
 inline v_int8x16 v_absdiffs(const v_int8x16& a, const v_int8x16& b)
@@ -1361,7 +1359,7 @@ inline v_float32x4 v_pack_triplets(const v_float32x4& vec)
 
 /////// FP16 support ////////
 
-inline v_float32x4 v_load_expand(const float16_t* ptr)
+inline v_float32x4 v_load_expand(const hfloat* ptr)
 {
     vec_ushort8 vf16 = vec_ld_l8((const ushort*)ptr);
 #if CV_VSX3 && defined(vec_extract_fp_from_shorth)
@@ -1388,7 +1386,7 @@ inline v_float32x4 v_load_expand(const float16_t* ptr)
 #endif
 }
 
-inline void v_pack_store(float16_t* ptr, const v_float32x4& v)
+inline void v_pack_store(hfloat* ptr, const v_float32x4& v)
 {
 // fixme: Is there any builtin op or intrinsic that cover "xvcvsphp"?
 #if CV_VSX3 && !defined(CV_COMPILER_VSX_BROKEN_ASM)
@@ -1442,7 +1440,7 @@ inline v_int64x2 v_dotprod(const v_int32x4& a, const v_int32x4& b)
     return v_int64x2(vec_add(even, odd));
 }
 inline v_int64x2 v_dotprod(const v_int32x4& a, const v_int32x4& b, const v_int64x2& c)
-{ return v_dotprod(a, b) + c; }
+{ return v_add(v_dotprod(a, b), c); }
 
 // 8 >> 32
 inline v_uint32x4 v_dotprod_expand(const v_uint8x16& a, const v_uint8x16& b, const v_uint32x4& c)
@@ -1485,7 +1483,7 @@ inline v_uint64x2 v_dotprod_expand(const v_uint16x8& a, const v_uint16x8& b)
     return v_uint64x2(vec_add(s0, s1));
 }
 inline v_uint64x2 v_dotprod_expand(const v_uint16x8& a, const v_uint16x8& b, const v_uint64x2& c)
-{ return v_dotprod_expand(a, b) + c; }
+{ return v_add(v_dotprod_expand(a, b), c); }
 
 inline v_int64x2 v_dotprod_expand(const v_int16x8& a, const v_int16x8& b)
 {
@@ -1495,13 +1493,13 @@ inline v_int64x2 v_dotprod_expand(const v_int16x8& a, const v_int16x8& b)
     return v_int64x2(vec_add(vec_mergeh(c.val, d.val), vec_mergel(c.val, d.val)));
 }
 inline v_int64x2 v_dotprod_expand(const v_int16x8& a, const v_int16x8& b, const v_int64x2& c)
-{ return v_dotprod_expand(a, b) + c; }
+{ return v_add(v_dotprod_expand(a, b), c); }
 
 // 32 >> 64f
 inline v_float64x2 v_dotprod_expand(const v_int32x4& a, const v_int32x4& b)
 { return v_cvt_f64(v_dotprod(a, b)); }
 inline v_float64x2 v_dotprod_expand(const v_int32x4& a, const v_int32x4& b, const v_float64x2& c)
-{ return v_dotprod_expand(a, b) + c; }
+{ return v_add(v_dotprod_expand(a, b), c); }
 
 //////// Fast Dot Product ////////
 
@@ -1509,7 +1507,7 @@ inline v_float64x2 v_dotprod_expand(const v_int32x4& a, const v_int32x4& b, cons
 inline v_int32x4 v_dotprod_fast(const v_int16x8& a, const v_int16x8& b)
 { return v_dotprod(a, b); }
 inline v_int32x4 v_dotprod_fast(const v_int16x8& a, const v_int16x8& b, const v_int32x4& c)
-{ return v_int32x4(vec_msum(a.val, b.val, vec_int4_z)) + c; }
+{ return v_add(v_int32x4(vec_msum(a.val, b.val, vec_int4_z)), c); }
 // 32 >> 64
 inline v_int64x2 v_dotprod_fast(const v_int32x4& a, const v_int32x4& b)
 { return v_dotprod(a, b); }
@@ -1520,7 +1518,7 @@ inline v_int64x2 v_dotprod_fast(const v_int32x4& a, const v_int32x4& b, const v_
 inline v_uint32x4 v_dotprod_expand_fast(const v_uint8x16& a, const v_uint8x16& b)
 { return v_dotprod_expand(a, b); }
 inline v_uint32x4 v_dotprod_expand_fast(const v_uint8x16& a, const v_uint8x16& b, const v_uint32x4& c)
-{ return v_uint32x4(vec_msum(a.val, b.val, vec_uint4_z)) + c; }
+{ return v_add(v_uint32x4(vec_msum(a.val, b.val, vec_uint4_z)), c); }
 
 inline v_int32x4 v_dotprod_expand_fast(const v_int8x16& a, const v_int8x16& b)
 {
@@ -1531,7 +1529,7 @@ inline v_int32x4 v_dotprod_expand_fast(const v_int8x16& a, const v_int8x16& b)
     return v_int32x4(vec_msum(a0, b0, vec_msum(a1, b1, vec_int4_z)));
 }
 inline v_int32x4 v_dotprod_expand_fast(const v_int8x16& a, const v_int8x16& b, const v_int32x4& c)
-{ return v_dotprod_expand_fast(a, b) + c; }
+{ return v_add(v_dotprod_expand_fast(a, b), c); }
 
 // 16 >> 64
 inline v_uint64x2 v_dotprod_expand_fast(const v_uint16x8& a, const v_uint16x8& b)
@@ -1544,10 +1542,10 @@ inline v_int64x2 v_dotprod_expand_fast(const v_int16x8& a, const v_int16x8& b)
     v_int32x4 prod = v_dotprod(a, b);
     v_int64x2 c, d;
     v_expand(prod, c, d);
-    return c + d;
+    return v_add(c, d);
 }
 inline v_int64x2 v_dotprod_expand_fast(const v_int16x8& a, const v_int16x8& b, const v_int64x2& c)
-{ return v_dotprod_expand_fast(a, b) + c; }
+{ return v_add(v_dotprod_expand_fast(a, b), c); }
 
 // 32 >> 64f
 inline v_float64x2 v_dotprod_expand_fast(const v_int32x4& a, const v_int32x4& b)
@@ -1598,6 +1596,19 @@ template<int i, typename Tvec>
 inline Tvec v_broadcast_element(const Tvec& v)
 { return Tvec(vec_splat(v.val, i)); }
 
+#include "intrin_math.hpp"
+inline v_float32x4 v_exp(const v_float32x4& x) { return v_exp_default_32f<v_float32x4, v_int32x4>(x); }
+inline v_float32x4 v_log(const v_float32x4& x) { return v_log_default_32f<v_float32x4, v_int32x4>(x); }
+inline void v_sincos(const v_float32x4& x, v_float32x4& s, v_float32x4& c) { v_sincos_default_32f<v_float32x4, v_int32x4>(x, s, c); }
+inline v_float32x4 v_sin(const v_float32x4& x) { return v_sin_default_32f<v_float32x4, v_int32x4>(x); }
+inline v_float32x4 v_cos(const v_float32x4& x) { return v_cos_default_32f<v_float32x4, v_int32x4>(x); }
+inline v_float32x4 v_erf(const v_float32x4& x) { return v_erf_default_32f<v_float32x4, v_int32x4>(x); }
+
+inline v_float64x2 v_exp(const v_float64x2& x) { return v_exp_default_64f<v_float64x2, v_int64x2>(x); }
+inline v_float64x2 v_log(const v_float64x2& x) { return v_log_default_64f<v_float64x2, v_int64x2>(x); }
+inline void v_sincos(const v_float64x2& x, v_float64x2& s, v_float64x2& c) { v_sincos_default_64f<v_float64x2, v_int64x2>(x, s, c); }
+inline v_float64x2 v_sin(const v_float64x2& x) { return v_sin_default_64f<v_float64x2, v_int64x2>(x); }
+inline v_float64x2 v_cos(const v_float64x2& x) { return v_cos_default_64f<v_float64x2, v_int64x2>(x); }
 
 CV_CPU_OPTIMIZATION_HAL_NAMESPACE_END
 
diff --git a/3rdParty/opencv2/core/hal/intrin_wasm.hpp b/3rdParty/opencv-4.12.0/opencv2/core/hal/intrin_wasm.hpp
similarity index 83%
rename from 3rdParty/opencv2/core/hal/intrin_wasm.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/hal/intrin_wasm.hpp
index a7d1176f97..d8d27edb3a 100644
--- a/3rdParty/opencv2/core/hal/intrin_wasm.hpp
+++ b/3rdParty/opencv-4.12.0/opencv2/core/hal/intrin_wasm.hpp
@@ -10,6 +10,16 @@
 #include <algorithm>
 #include "opencv2/core/saturate.hpp"
 
+
+// Emscripten v2.0.13 (latest officially supported, as of 07/30/2024):
+// __EMSCRIPTEN_major__, __EMSCRIPTEN_minor__ and __EMSCRIPTEN_tiny__ are defined via commandline in
+// https://github.com/emscripten-core/emscripten/blob/1690a5802cd1241adc9714fb7fa2f633d38860dc/tools/shared.py#L506-L515
+//
+// See https://github.com/opencv/opencv/pull/25909
+#ifndef __EMSCRIPTEN_major__
+#include <emscripten/version.h>
+#endif
+
 #define CV_SIMD128 1
 #define CV_SIMD128_64F 0 // Now all implementation of f64 use fallback, so disable it.
 #define CV_SIMD128_FP16 0
@@ -294,35 +304,35 @@ static const unsigned char popCountTable[] =
 }  // namespace
 
 static v128_t wasm_unpacklo_i8x16(v128_t a, v128_t b) {
-    return wasm_v8x16_shuffle(a, b, 0,16,1,17,2,18,3,19,4,20,5,21,6,22,7,23);
+    return wasm_i8x16_shuffle(a, b, 0,16,1,17,2,18,3,19,4,20,5,21,6,22,7,23);
 }
 
 static v128_t wasm_unpacklo_i16x8(v128_t a, v128_t b) {
-    return wasm_v8x16_shuffle(a, b, 0,1,16,17,2,3,18,19,4,5,20,21,6,7,22,23);
+    return wasm_i8x16_shuffle(a, b, 0,1,16,17,2,3,18,19,4,5,20,21,6,7,22,23);
 }
 
 static v128_t wasm_unpacklo_i32x4(v128_t a, v128_t b) {
-    return wasm_v8x16_shuffle(a, b, 0,1,2,3,16,17,18,19,4,5,6,7,20,21,22,23);
+    return wasm_i8x16_shuffle(a, b, 0,1,2,3,16,17,18,19,4,5,6,7,20,21,22,23);
 }
 
 static v128_t wasm_unpacklo_i64x2(v128_t a, v128_t b) {
-    return wasm_v8x16_shuffle(a, b, 0,1,2,3,4,5,6,7,16,17,18,19,20,21,22,23);
+    return wasm_i8x16_shuffle(a, b, 0,1,2,3,4,5,6,7,16,17,18,19,20,21,22,23);
 }
 
 static v128_t wasm_unpackhi_i8x16(v128_t a, v128_t b) {
-    return wasm_v8x16_shuffle(a, b, 8,24,9,25,10,26,11,27,12,28,13,29,14,30,15,31);
+    return wasm_i8x16_shuffle(a, b, 8,24,9,25,10,26,11,27,12,28,13,29,14,30,15,31);
 }
 
 static v128_t wasm_unpackhi_i16x8(v128_t a, v128_t b) {
-    return wasm_v8x16_shuffle(a, b, 8,9,24,25,10,11,26,27,12,13,28,29,14,15,30,31);
+    return wasm_i8x16_shuffle(a, b, 8,9,24,25,10,11,26,27,12,13,28,29,14,15,30,31);
 }
 
 static v128_t wasm_unpackhi_i32x4(v128_t a, v128_t b) {
-    return wasm_v8x16_shuffle(a, b, 8,9,10,11,24,25,26,27,12,13,14,15,28,29,30,31);
+    return wasm_i8x16_shuffle(a, b, 8,9,10,11,24,25,26,27,12,13,14,15,28,29,30,31);
 }
 
 static v128_t wasm_unpackhi_i64x2(v128_t a, v128_t b) {
-    return wasm_v8x16_shuffle(a, b, 8,9,10,11,12,13,14,15,24,25,26,27,28,29,30,31);
+    return wasm_i8x16_shuffle(a, b, 8,9,10,11,12,13,14,15,24,25,26,27,28,29,30,31);
 }
 
 /** Convert **/
@@ -391,6 +401,8 @@ inline v128_t v128_cvti32x4_i64x2_high(const v128_t& a)
 #define OPENCV_HAL_IMPL_WASM_INITVEC(_Tpvec, _Tp, suffix, zsuffix, _Tps) \
 inline _Tpvec v_setzero_##suffix() { return _Tpvec(wasm_##zsuffix##_splat((_Tps)0)); } \
 inline _Tpvec v_setall_##suffix(_Tp v) { return _Tpvec(wasm_##zsuffix##_splat((_Tps)v)); } \
+template <> inline _Tpvec v_setzero_() { return v_setzero_##suffix(); } \
+template <> inline _Tpvec v_setall_(_Tp v) { return v_setall_##suffix(v); } \
 template<typename _Tpvec0> inline _Tpvec v_reinterpret_as_##suffix(const _Tpvec0& a) \
 { return _Tpvec(a.val); }
 
@@ -411,7 +423,7 @@ inline v_uint8x16 v_pack(const v_uint16x8& a, const v_uint16x8& b)
     v128_t maxval = wasm_i16x8_splat(255);
     v128_t a1 = wasm_v128_bitselect(maxval, a.val, wasm_u16x8_gt(a.val, maxval));
     v128_t b1 = wasm_v128_bitselect(maxval, b.val, wasm_u16x8_gt(b.val, maxval));
-    return v_uint8x16(wasm_v8x16_shuffle(a1, b1, 0,2,4,6,8,10,12,14,16,18,20,22,24,26,28,30));
+    return v_uint8x16(wasm_i8x16_shuffle(a1, b1, 0,2,4,6,8,10,12,14,16,18,20,22,24,26,28,30));
 }
 inline v_int8x16 v_pack(const v_int16x8& a, const v_int16x8& b)
 {
@@ -421,14 +433,14 @@ inline v_int8x16 v_pack(const v_int16x8& a, const v_int16x8& b)
     v128_t b1 = wasm_v128_bitselect(maxval, b.val, wasm_i16x8_gt(b.val, maxval));
     v128_t a2 = wasm_v128_bitselect(minval, a1, wasm_i16x8_lt(a1, minval));
     v128_t b2 = wasm_v128_bitselect(minval, b1, wasm_i16x8_lt(b1, minval));
-    return v_int8x16(wasm_v8x16_shuffle(a2, b2, 0,2,4,6,8,10,12,14,16,18,20,22,24,26,28,30));
+    return v_int8x16(wasm_i8x16_shuffle(a2, b2, 0,2,4,6,8,10,12,14,16,18,20,22,24,26,28,30));
 }
 inline v_uint16x8 v_pack(const v_uint32x4& a, const v_uint32x4& b)
 {
     v128_t maxval = wasm_i32x4_splat(65535);
     v128_t a1 = wasm_v128_bitselect(maxval, a.val, wasm_u32x4_gt(a.val, maxval));
     v128_t b1 = wasm_v128_bitselect(maxval, b.val, wasm_u32x4_gt(b.val, maxval));
-    return v_uint16x8(wasm_v8x16_shuffle(a1, b1, 0,1,4,5,8,9,12,13,16,17,20,21,24,25,28,29));
+    return v_uint16x8(wasm_i8x16_shuffle(a1, b1, 0,1,4,5,8,9,12,13,16,17,20,21,24,25,28,29));
 }
 inline v_int16x8 v_pack(const v_int32x4& a, const v_int32x4& b)
 {
@@ -438,15 +450,15 @@ inline v_int16x8 v_pack(const v_int32x4& a, const v_int32x4& b)
     v128_t b1 = wasm_v128_bitselect(maxval, b.val, wasm_i32x4_gt(b.val, maxval));
     v128_t a2 = wasm_v128_bitselect(minval, a1, wasm_i32x4_lt(a1, minval));
     v128_t b2 = wasm_v128_bitselect(minval, b1, wasm_i32x4_lt(b1, minval));
-    return v_int16x8(wasm_v8x16_shuffle(a2, b2, 0,1,4,5,8,9,12,13,16,17,20,21,24,25,28,29));
+    return v_int16x8(wasm_i8x16_shuffle(a2, b2, 0,1,4,5,8,9,12,13,16,17,20,21,24,25,28,29));
 }
 inline v_uint32x4 v_pack(const v_uint64x2& a, const v_uint64x2& b)
 {
-    return v_uint32x4(wasm_v8x16_shuffle(a.val, b.val, 0,1,2,3,8,9,10,11,16,17,18,19,24,25,26,27));
+    return v_uint32x4(wasm_i8x16_shuffle(a.val, b.val, 0,1,2,3,8,9,10,11,16,17,18,19,24,25,26,27));
 }
 inline v_int32x4 v_pack(const v_int64x2& a, const v_int64x2& b)
 {
-    return v_int32x4(wasm_v8x16_shuffle(a.val, b.val, 0,1,2,3,8,9,10,11,16,17,18,19,24,25,26,27));
+    return v_int32x4(wasm_i8x16_shuffle(a.val, b.val, 0,1,2,3,8,9,10,11,16,17,18,19,24,25,26,27));
 }
 inline v_uint8x16 v_pack_u(const v_int16x8& a, const v_int16x8& b)
 {
@@ -456,7 +468,7 @@ inline v_uint8x16 v_pack_u(const v_int16x8& a, const v_int16x8& b)
     v128_t b1 = wasm_v128_bitselect(maxval, b.val, wasm_i16x8_gt(b.val, maxval));
     v128_t a2 = wasm_v128_bitselect(minval, a1, wasm_i16x8_lt(a1, minval));
     v128_t b2 = wasm_v128_bitselect(minval, b1, wasm_i16x8_lt(b1, minval));
-    return v_uint8x16(wasm_v8x16_shuffle(a2, b2, 0,2,4,6,8,10,12,14,16,18,20,22,24,26,28,30));
+    return v_uint8x16(wasm_i8x16_shuffle(a2, b2, 0,2,4,6,8,10,12,14,16,18,20,22,24,26,28,30));
 }
 inline v_uint16x8 v_pack_u(const v_int32x4& a, const v_int32x4& b)
 {
@@ -466,7 +478,7 @@ inline v_uint16x8 v_pack_u(const v_int32x4& a, const v_int32x4& b)
     v128_t b1 = wasm_v128_bitselect(maxval, b.val, wasm_i32x4_gt(b.val, maxval));
     v128_t a2 = wasm_v128_bitselect(minval, a1, wasm_i32x4_lt(a1, minval));
     v128_t b2 = wasm_v128_bitselect(minval, b1, wasm_i32x4_lt(b1, minval));
-    return v_uint16x8(wasm_v8x16_shuffle(a2, b2, 0,1,4,5,8,9,12,13,16,17,20,21,24,25,28,29));
+    return v_uint16x8(wasm_i8x16_shuffle(a2, b2, 0,1,4,5,8,9,12,13,16,17,20,21,24,25,28,29));
 }
 
 template<int n>
@@ -478,7 +490,7 @@ inline v_uint8x16 v_rshr_pack(const v_uint16x8& a, const v_uint16x8& b)
     v128_t maxval = wasm_i16x8_splat(255);
     v128_t a2 = wasm_v128_bitselect(maxval, a1, wasm_u16x8_gt(a1, maxval));
     v128_t b2 = wasm_v128_bitselect(maxval, b1, wasm_u16x8_gt(b1, maxval));
-    return v_uint8x16(wasm_v8x16_shuffle(a2, b2, 0,2,4,6,8,10,12,14,16,18,20,22,24,26,28,30));
+    return v_uint8x16(wasm_i8x16_shuffle(a2, b2, 0,2,4,6,8,10,12,14,16,18,20,22,24,26,28,30));
 }
 template<int n>
 inline v_int8x16 v_rshr_pack(const v_int16x8& a, const v_int16x8& b)
@@ -492,7 +504,7 @@ inline v_int8x16 v_rshr_pack(const v_int16x8& a, const v_int16x8& b)
     v128_t b2 = wasm_v128_bitselect(maxval, b1, wasm_i16x8_gt(b1, maxval));
     v128_t a3 = wasm_v128_bitselect(minval, a2, wasm_i16x8_lt(a1, minval));
     v128_t b3 = wasm_v128_bitselect(minval, b2, wasm_i16x8_lt(b1, minval));
-    return v_int8x16(wasm_v8x16_shuffle(a3, b3, 0,2,4,6,8,10,12,14,16,18,20,22,24,26,28,30));
+    return v_int8x16(wasm_i8x16_shuffle(a3, b3, 0,2,4,6,8,10,12,14,16,18,20,22,24,26,28,30));
 }
 template<int n>
 inline v_uint16x8 v_rshr_pack(const v_uint32x4& a, const v_uint32x4& b)
@@ -503,7 +515,7 @@ inline v_uint16x8 v_rshr_pack(const v_uint32x4& a, const v_uint32x4& b)
     v128_t maxval = wasm_i32x4_splat(65535);
     v128_t a2 = wasm_v128_bitselect(maxval, a1, wasm_u32x4_gt(a1, maxval));
     v128_t b2 = wasm_v128_bitselect(maxval, b1, wasm_u32x4_gt(b1, maxval));
-    return v_uint16x8(wasm_v8x16_shuffle(a2, b2, 0,1,4,5,8,9,12,13,16,17,20,21,24,25,28,29));
+    return v_uint16x8(wasm_i8x16_shuffle(a2, b2, 0,1,4,5,8,9,12,13,16,17,20,21,24,25,28,29));
 }
 template<int n>
 inline v_int16x8 v_rshr_pack(const v_int32x4& a, const v_int32x4& b)
@@ -517,7 +529,7 @@ inline v_int16x8 v_rshr_pack(const v_int32x4& a, const v_int32x4& b)
     v128_t b2 = wasm_v128_bitselect(maxval, b1, wasm_i32x4_gt(b1, maxval));
     v128_t a3 = wasm_v128_bitselect(minval, a2, wasm_i32x4_lt(a1, minval));
     v128_t b3 = wasm_v128_bitselect(minval, b2, wasm_i32x4_lt(b1, minval));
-    return v_int16x8(wasm_v8x16_shuffle(a3, b3, 0,1,4,5,8,9,12,13,16,17,20,21,24,25,28,29));
+    return v_int16x8(wasm_i8x16_shuffle(a3, b3, 0,1,4,5,8,9,12,13,16,17,20,21,24,25,28,29));
 }
 template<int n>
 inline v_uint32x4 v_rshr_pack(const v_uint64x2& a, const v_uint64x2& b)
@@ -525,7 +537,7 @@ inline v_uint32x4 v_rshr_pack(const v_uint64x2& a, const v_uint64x2& b)
     v128_t delta = wasm_i64x2_splat(((int64)1 << (n-1)));
     v128_t a1 = wasm_u64x2_shr(wasm_i64x2_add(a.val, delta), n);
     v128_t b1 = wasm_u64x2_shr(wasm_i64x2_add(b.val, delta), n);
-    return v_uint32x4(wasm_v8x16_shuffle(a1, b1, 0,1,2,3,8,9,10,11,16,17,18,19,24,25,26,27));
+    return v_uint32x4(wasm_i8x16_shuffle(a1, b1, 0,1,2,3,8,9,10,11,16,17,18,19,24,25,26,27));
 }
 template<int n>
 inline v_int32x4 v_rshr_pack(const v_int64x2& a, const v_int64x2& b)
@@ -533,7 +545,7 @@ inline v_int32x4 v_rshr_pack(const v_int64x2& a, const v_int64x2& b)
     v128_t delta = wasm_i64x2_splat(((int64)1 << (n-1)));
     v128_t a1 = wasm_i64x2_shr(wasm_i64x2_add(a.val, delta), n);
     v128_t b1 = wasm_i64x2_shr(wasm_i64x2_add(b.val, delta), n);
-    return v_int32x4(wasm_v8x16_shuffle(a1, b1, 0,1,2,3,8,9,10,11,16,17,18,19,24,25,26,27));
+    return v_int32x4(wasm_i8x16_shuffle(a1, b1, 0,1,2,3,8,9,10,11,16,17,18,19,24,25,26,27));
 }
 template<int n>
 inline v_uint8x16 v_rshr_pack_u(const v_int16x8& a, const v_int16x8& b)
@@ -547,7 +559,7 @@ inline v_uint8x16 v_rshr_pack_u(const v_int16x8& a, const v_int16x8& b)
     v128_t b2 = wasm_v128_bitselect(maxval, b1, wasm_i16x8_gt(b1, maxval));
     v128_t a3 = wasm_v128_bitselect(minval, a2, wasm_i16x8_lt(a1, minval));
     v128_t b3 = wasm_v128_bitselect(minval, b2, wasm_i16x8_lt(b1, minval));
-    return v_uint8x16(wasm_v8x16_shuffle(a3, b3, 0,2,4,6,8,10,12,14,16,18,20,22,24,26,28,30));
+    return v_uint8x16(wasm_i8x16_shuffle(a3, b3, 0,2,4,6,8,10,12,14,16,18,20,22,24,26,28,30));
 }
 template<int n>
 inline v_uint16x8 v_rshr_pack_u(const v_int32x4& a, const v_int32x4& b)
@@ -561,14 +573,14 @@ inline v_uint16x8 v_rshr_pack_u(const v_int32x4& a, const v_int32x4& b)
     v128_t b2 = wasm_v128_bitselect(maxval, b1, wasm_i32x4_gt(b1, maxval));
     v128_t a3 = wasm_v128_bitselect(minval, a2, wasm_i32x4_lt(a1, minval));
     v128_t b3 = wasm_v128_bitselect(minval, b2, wasm_i32x4_lt(b1, minval));
-    return v_uint16x8(wasm_v8x16_shuffle(a3, b3, 0,1,4,5,8,9,12,13,16,17,20,21,24,25,28,29));
+    return v_uint16x8(wasm_i8x16_shuffle(a3, b3, 0,1,4,5,8,9,12,13,16,17,20,21,24,25,28,29));
 }
 
 inline void v_pack_store(uchar* ptr, const v_uint16x8& a)
 {
     v128_t maxval = wasm_i16x8_splat(255);
     v128_t a1 = wasm_v128_bitselect(maxval, a.val, wasm_u16x8_gt(a.val, maxval));
-    v128_t r = wasm_v8x16_shuffle(a1, a1, 0,2,4,6,8,10,12,14,0,2,4,6,8,10,12,14);
+    v128_t r = wasm_i8x16_shuffle(a1, a1, 0,2,4,6,8,10,12,14,0,2,4,6,8,10,12,14);
     uchar t_ptr[16];
     wasm_v128_store(t_ptr, r);
     for (int i=0; i<8; ++i) {
@@ -581,7 +593,7 @@ inline void v_pack_store(schar* ptr, const v_int16x8& a)
     v128_t minval = wasm_i16x8_splat(-128);
     v128_t a1 = wasm_v128_bitselect(maxval, a.val, wasm_i16x8_gt(a.val, maxval));
     v128_t a2 = wasm_v128_bitselect(minval, a1, wasm_i16x8_lt(a1, minval));
-    v128_t r = wasm_v8x16_shuffle(a2, a2, 0,2,4,6,8,10,12,14,0,2,4,6,8,10,12,14);
+    v128_t r = wasm_i8x16_shuffle(a2, a2, 0,2,4,6,8,10,12,14,0,2,4,6,8,10,12,14);
     schar t_ptr[16];
     wasm_v128_store(t_ptr, r);
     for (int i=0; i<8; ++i) {
@@ -592,7 +604,7 @@ inline void v_pack_store(ushort* ptr, const v_uint32x4& a)
 {
     v128_t maxval = wasm_i32x4_splat(65535);
     v128_t a1 = wasm_v128_bitselect(maxval, a.val, wasm_u32x4_gt(a.val, maxval));
-    v128_t r = wasm_v8x16_shuffle(a1, a1, 0,1,4,5,8,9,12,13,0,1,4,5,8,9,12,13);
+    v128_t r = wasm_i8x16_shuffle(a1, a1, 0,1,4,5,8,9,12,13,0,1,4,5,8,9,12,13);
     ushort t_ptr[8];
     wasm_v128_store(t_ptr, r);
     for (int i=0; i<4; ++i) {
@@ -605,7 +617,7 @@ inline void v_pack_store(short* ptr, const v_int32x4& a)
     v128_t minval = wasm_i32x4_splat(-32768);
     v128_t a1 = wasm_v128_bitselect(maxval, a.val, wasm_i32x4_gt(a.val, maxval));
     v128_t a2 = wasm_v128_bitselect(minval, a1, wasm_i32x4_lt(a1, minval));
-    v128_t r = wasm_v8x16_shuffle(a2, a2, 0,1,4,5,8,9,12,13,0,1,4,5,8,9,12,13);
+    v128_t r = wasm_i8x16_shuffle(a2, a2, 0,1,4,5,8,9,12,13,0,1,4,5,8,9,12,13);
     short t_ptr[8];
     wasm_v128_store(t_ptr, r);
     for (int i=0; i<4; ++i) {
@@ -614,7 +626,7 @@ inline void v_pack_store(short* ptr, const v_int32x4& a)
 }
 inline void v_pack_store(unsigned* ptr, const v_uint64x2& a)
 {
-    v128_t r = wasm_v8x16_shuffle(a.val, a.val, 0,1,2,3,8,9,10,11,0,1,2,3,8,9,10,11);
+    v128_t r = wasm_i8x16_shuffle(a.val, a.val, 0,1,2,3,8,9,10,11,0,1,2,3,8,9,10,11);
     unsigned t_ptr[4];
     wasm_v128_store(t_ptr, r);
     for (int i=0; i<2; ++i) {
@@ -623,7 +635,7 @@ inline void v_pack_store(unsigned* ptr, const v_uint64x2& a)
 }
 inline void v_pack_store(int* ptr, const v_int64x2& a)
 {
-    v128_t r = wasm_v8x16_shuffle(a.val, a.val, 0,1,2,3,8,9,10,11,0,1,2,3,8,9,10,11);
+    v128_t r = wasm_i8x16_shuffle(a.val, a.val, 0,1,2,3,8,9,10,11,0,1,2,3,8,9,10,11);
     int t_ptr[4];
     wasm_v128_store(t_ptr, r);
     for (int i=0; i<2; ++i) {
@@ -636,7 +648,7 @@ inline void v_pack_u_store(uchar* ptr, const v_int16x8& a)
     v128_t minval = wasm_i16x8_splat(0);
     v128_t a1 = wasm_v128_bitselect(maxval, a.val, wasm_i16x8_gt(a.val, maxval));
     v128_t a2 = wasm_v128_bitselect(minval, a1, wasm_i16x8_lt(a1, minval));
-    v128_t r = wasm_v8x16_shuffle(a2, a2, 0,2,4,6,8,10,12,14,0,2,4,6,8,10,12,14);
+    v128_t r = wasm_i8x16_shuffle(a2, a2, 0,2,4,6,8,10,12,14,0,2,4,6,8,10,12,14);
     uchar t_ptr[16];
     wasm_v128_store(t_ptr, r);
     for (int i=0; i<8; ++i) {
@@ -649,7 +661,7 @@ inline void v_pack_u_store(ushort* ptr, const v_int32x4& a)
     v128_t minval = wasm_i32x4_splat(0);
     v128_t a1 = wasm_v128_bitselect(maxval, a.val, wasm_i32x4_gt(a.val, maxval));
     v128_t a2 = wasm_v128_bitselect(minval, a1, wasm_i32x4_lt(a1, minval));
-    v128_t r = wasm_v8x16_shuffle(a2, a2, 0,1,4,5,8,9,12,13,0,1,4,5,8,9,12,13);
+    v128_t r = wasm_i8x16_shuffle(a2, a2, 0,1,4,5,8,9,12,13,0,1,4,5,8,9,12,13);
     ushort t_ptr[8];
     wasm_v128_store(t_ptr, r);
     for (int i=0; i<4; ++i) {
@@ -664,7 +676,7 @@ inline void v_rshr_pack_store(uchar* ptr, const v_uint16x8& a)
     v128_t a1 = wasm_u16x8_shr(wasm_i16x8_add(a.val, delta), n);
     v128_t maxval = wasm_i16x8_splat(255);
     v128_t a2 = wasm_v128_bitselect(maxval, a1, wasm_u16x8_gt(a1, maxval));
-    v128_t r = wasm_v8x16_shuffle(a2, a2, 0,2,4,6,8,10,12,14,0,2,4,6,8,10,12,14);
+    v128_t r = wasm_i8x16_shuffle(a2, a2, 0,2,4,6,8,10,12,14,0,2,4,6,8,10,12,14);
     uchar t_ptr[16];
     wasm_v128_store(t_ptr, r);
     for (int i=0; i<8; ++i) {
@@ -680,7 +692,7 @@ inline void v_rshr_pack_store(schar* ptr, const v_int16x8& a)
     v128_t minval = wasm_i16x8_splat(-128);
     v128_t a2 = wasm_v128_bitselect(maxval, a1, wasm_i16x8_gt(a1, maxval));
     v128_t a3 = wasm_v128_bitselect(minval, a2, wasm_i16x8_lt(a1, minval));
-    v128_t r = wasm_v8x16_shuffle(a3, a3, 0,2,4,6,8,10,12,14,0,2,4,6,8,10,12,14);
+    v128_t r = wasm_i8x16_shuffle(a3, a3, 0,2,4,6,8,10,12,14,0,2,4,6,8,10,12,14);
     schar t_ptr[16];
     wasm_v128_store(t_ptr, r);
     for (int i=0; i<8; ++i) {
@@ -694,7 +706,7 @@ inline void v_rshr_pack_store(ushort* ptr, const v_uint32x4& a)
     v128_t a1 = wasm_u32x4_shr(wasm_i32x4_add(a.val, delta), n);
     v128_t maxval = wasm_i32x4_splat(65535);
     v128_t a2 = wasm_v128_bitselect(maxval, a1, wasm_u32x4_gt(a1, maxval));
-    v128_t r = wasm_v8x16_shuffle(a2, a2, 0,1,4,5,8,9,12,13,0,1,4,5,8,9,12,13);
+    v128_t r = wasm_i8x16_shuffle(a2, a2, 0,1,4,5,8,9,12,13,0,1,4,5,8,9,12,13);
     ushort t_ptr[8];
     wasm_v128_store(t_ptr, r);
     for (int i=0; i<4; ++i) {
@@ -710,7 +722,7 @@ inline void v_rshr_pack_store(short* ptr, const v_int32x4& a)
     v128_t minval = wasm_i32x4_splat(-32768);
     v128_t a2 = wasm_v128_bitselect(maxval, a1, wasm_i32x4_gt(a1, maxval));
     v128_t a3 = wasm_v128_bitselect(minval, a2, wasm_i32x4_lt(a1, minval));
-    v128_t r = wasm_v8x16_shuffle(a3, a3, 0,1,4,5,8,9,12,13,0,1,4,5,8,9,12,13);
+    v128_t r = wasm_i8x16_shuffle(a3, a3, 0,1,4,5,8,9,12,13,0,1,4,5,8,9,12,13);
     short t_ptr[8];
     wasm_v128_store(t_ptr, r);
     for (int i=0; i<4; ++i) {
@@ -722,7 +734,7 @@ inline void v_rshr_pack_store(unsigned* ptr, const v_uint64x2& a)
 {
     v128_t delta = wasm_i64x2_splat(((int64)1 << (n-1)));
     v128_t a1 = wasm_u64x2_shr(wasm_i64x2_add(a.val, delta), n);
-    v128_t r = wasm_v8x16_shuffle(a1, a1, 0,1,2,3,8,9,10,11,0,1,2,3,8,9,10,11);
+    v128_t r = wasm_i8x16_shuffle(a1, a1, 0,1,2,3,8,9,10,11,0,1,2,3,8,9,10,11);
     unsigned t_ptr[4];
     wasm_v128_store(t_ptr, r);
     for (int i=0; i<2; ++i) {
@@ -734,7 +746,7 @@ inline void v_rshr_pack_store(int* ptr, const v_int64x2& a)
 {
     v128_t delta = wasm_i64x2_splat(((int64)1 << (n-1)));
     v128_t a1 = wasm_i64x2_shr(wasm_i64x2_add(a.val, delta), n);
-    v128_t r = wasm_v8x16_shuffle(a1, a1, 0,1,2,3,8,9,10,11,0,1,2,3,8,9,10,11);
+    v128_t r = wasm_i8x16_shuffle(a1, a1, 0,1,2,3,8,9,10,11,0,1,2,3,8,9,10,11);
     int t_ptr[4];
     wasm_v128_store(t_ptr, r);
     for (int i=0; i<2; ++i) {
@@ -750,7 +762,7 @@ inline void v_rshr_pack_u_store(uchar* ptr, const v_int16x8& a)
     v128_t minval = wasm_i16x8_splat(0);
     v128_t a2 = wasm_v128_bitselect(maxval, a1, wasm_i16x8_gt(a1, maxval));
     v128_t a3 = wasm_v128_bitselect(minval, a2, wasm_i16x8_lt(a1, minval));
-    v128_t r = wasm_v8x16_shuffle(a3, a3, 0,2,4,6,8,10,12,14,0,2,4,6,8,10,12,14);
+    v128_t r = wasm_i8x16_shuffle(a3, a3, 0,2,4,6,8,10,12,14,0,2,4,6,8,10,12,14);
     uchar t_ptr[16];
     wasm_v128_store(t_ptr, r);
     for (int i=0; i<8; ++i) {
@@ -766,7 +778,7 @@ inline void v_rshr_pack_u_store(ushort* ptr, const v_int32x4& a)
     v128_t minval = wasm_i32x4_splat(0);
     v128_t a2 = wasm_v128_bitselect(maxval, a1, wasm_i32x4_gt(a1, maxval));
     v128_t a3 = wasm_v128_bitselect(minval, a2, wasm_i32x4_lt(a1, minval));
-    v128_t r = wasm_v8x16_shuffle(a3, a3, 0,1,4,5,8,9,12,13,0,1,4,5,8,9,12,13);
+    v128_t r = wasm_i8x16_shuffle(a3, a3, 0,1,4,5,8,9,12,13,0,1,4,5,8,9,12,13);
     ushort t_ptr[8];
     wasm_v128_store(t_ptr, r);
     for (int i=0; i<4; ++i) {
@@ -779,7 +791,7 @@ inline v_uint8x16 v_pack_b(const v_uint16x8& a, const v_uint16x8& b)
     v128_t maxval = wasm_i16x8_splat(255);
     v128_t a1 = wasm_v128_bitselect(maxval, a.val, wasm_u16x8_gt(a.val, maxval));
     v128_t b1 = wasm_v128_bitselect(maxval, b.val, wasm_u16x8_gt(b.val, maxval));
-    return v_uint8x16(wasm_v8x16_shuffle(a1, b1, 0,2,4,6,8,10,12,14,16,18,20,22,24,26,28,30));
+    return v_uint8x16(wasm_i8x16_shuffle(a1, b1, 0,2,4,6,8,10,12,14,16,18,20,22,24,26,28,30));
 }
 
 inline v_uint8x16 v_pack_b(const v_uint32x4& a, const v_uint32x4& b,
@@ -790,9 +802,9 @@ inline v_uint8x16 v_pack_b(const v_uint32x4& a, const v_uint32x4& b,
     v128_t b1 = wasm_v128_bitselect(maxval, b.val, wasm_u32x4_gt(b.val, maxval));
     v128_t c1 = wasm_v128_bitselect(maxval, c.val, wasm_u32x4_gt(c.val, maxval));
     v128_t d1 = wasm_v128_bitselect(maxval, d.val, wasm_u32x4_gt(d.val, maxval));
-    v128_t ab = wasm_v8x16_shuffle(a1, b1, 0,4,8,12,16,20,24,28,0,4,8,12,16,20,24,28);
-    v128_t cd = wasm_v8x16_shuffle(c1, d1, 0,4,8,12,16,20,24,28,0,4,8,12,16,20,24,28);
-    return v_uint8x16(wasm_v8x16_shuffle(ab, cd, 0,1,2,3,4,5,6,7,16,17,18,19,20,21,22,23));
+    v128_t ab = wasm_i8x16_shuffle(a1, b1, 0,4,8,12,16,20,24,28,0,4,8,12,16,20,24,28);
+    v128_t cd = wasm_i8x16_shuffle(c1, d1, 0,4,8,12,16,20,24,28,0,4,8,12,16,20,24,28);
+    return v_uint8x16(wasm_i8x16_shuffle(ab, cd, 0,1,2,3,4,5,6,7,16,17,18,19,20,21,22,23));
 }
 
 inline v_uint8x16 v_pack_b(const v_uint64x2& a, const v_uint64x2& b, const v_uint64x2& c,
@@ -808,13 +820,13 @@ inline v_uint8x16 v_pack_b(const v_uint64x2& a, const v_uint64x2& b, const v_uin
     v128_t f1 = wasm_v128_bitselect(maxval, f.val, ((__u64x2)(f.val) > (__u64x2)maxval));
     v128_t g1 = wasm_v128_bitselect(maxval, g.val, ((__u64x2)(g.val) > (__u64x2)maxval));
     v128_t h1 = wasm_v128_bitselect(maxval, h.val, ((__u64x2)(h.val) > (__u64x2)maxval));
-    v128_t ab = wasm_v8x16_shuffle(a1, b1, 0,8,16,24,0,8,16,24,0,8,16,24,0,8,16,24);
-    v128_t cd = wasm_v8x16_shuffle(c1, d1, 0,8,16,24,0,8,16,24,0,8,16,24,0,8,16,24);
-    v128_t ef = wasm_v8x16_shuffle(e1, f1, 0,8,16,24,0,8,16,24,0,8,16,24,0,8,16,24);
-    v128_t gh = wasm_v8x16_shuffle(g1, h1, 0,8,16,24,0,8,16,24,0,8,16,24,0,8,16,24);
-    v128_t abcd = wasm_v8x16_shuffle(ab, cd, 0,1,2,3,16,17,18,19,0,1,2,3,16,17,18,19);
-    v128_t efgh = wasm_v8x16_shuffle(ef, gh, 0,1,2,3,16,17,18,19,0,1,2,3,16,17,18,19);
-    return v_uint8x16(wasm_v8x16_shuffle(abcd, efgh, 0,1,2,3,4,5,6,7,16,17,18,19,20,21,22,23));
+    v128_t ab = wasm_i8x16_shuffle(a1, b1, 0,8,16,24,0,8,16,24,0,8,16,24,0,8,16,24);
+    v128_t cd = wasm_i8x16_shuffle(c1, d1, 0,8,16,24,0,8,16,24,0,8,16,24,0,8,16,24);
+    v128_t ef = wasm_i8x16_shuffle(e1, f1, 0,8,16,24,0,8,16,24,0,8,16,24,0,8,16,24);
+    v128_t gh = wasm_i8x16_shuffle(g1, h1, 0,8,16,24,0,8,16,24,0,8,16,24,0,8,16,24);
+    v128_t abcd = wasm_i8x16_shuffle(ab, cd, 0,1,2,3,16,17,18,19,0,1,2,3,16,17,18,19);
+    v128_t efgh = wasm_i8x16_shuffle(ef, gh, 0,1,2,3,16,17,18,19,0,1,2,3,16,17,18,19);
+    return v_uint8x16(wasm_i8x16_shuffle(abcd, efgh, 0,1,2,3,4,5,6,7,16,17,18,19,20,21,22,23));
 }
 
 inline v_float32x4 v_matmul(const v_float32x4& v, const v_float32x4& m0,
@@ -848,53 +860,46 @@ inline v_float32x4 v_matmuladd(const v_float32x4& v, const v_float32x4& m0,
 }
 
 #define OPENCV_HAL_IMPL_WASM_BIN_OP(bin_op, _Tpvec, intrin) \
-inline _Tpvec operator bin_op (const _Tpvec& a, const _Tpvec& b) \
+inline _Tpvec bin_op(const _Tpvec& a, const _Tpvec& b) \
 { \
     return _Tpvec(intrin(a.val, b.val)); \
-} \
-inline _Tpvec& operator bin_op##= (_Tpvec& a, const _Tpvec& b) \
-{ \
-    a.val = intrin(a.val, b.val); \
-    return a; \
-}
-
-OPENCV_HAL_IMPL_WASM_BIN_OP(+, v_uint8x16, wasm_u8x16_add_saturate)
-OPENCV_HAL_IMPL_WASM_BIN_OP(-, v_uint8x16, wasm_u8x16_sub_saturate)
-OPENCV_HAL_IMPL_WASM_BIN_OP(+, v_int8x16, wasm_i8x16_add_saturate)
-OPENCV_HAL_IMPL_WASM_BIN_OP(-, v_int8x16, wasm_i8x16_sub_saturate)
-OPENCV_HAL_IMPL_WASM_BIN_OP(+, v_uint16x8, wasm_u16x8_add_saturate)
-OPENCV_HAL_IMPL_WASM_BIN_OP(-, v_uint16x8, wasm_u16x8_sub_saturate)
-OPENCV_HAL_IMPL_WASM_BIN_OP(+, v_int16x8, wasm_i16x8_add_saturate)
-OPENCV_HAL_IMPL_WASM_BIN_OP(-, v_int16x8, wasm_i16x8_sub_saturate)
-OPENCV_HAL_IMPL_WASM_BIN_OP(+, v_uint32x4, wasm_i32x4_add)
-OPENCV_HAL_IMPL_WASM_BIN_OP(-, v_uint32x4, wasm_i32x4_sub)
-OPENCV_HAL_IMPL_WASM_BIN_OP(*, v_uint32x4, wasm_i32x4_mul)
-OPENCV_HAL_IMPL_WASM_BIN_OP(+, v_int32x4, wasm_i32x4_add)
-OPENCV_HAL_IMPL_WASM_BIN_OP(-, v_int32x4, wasm_i32x4_sub)
-OPENCV_HAL_IMPL_WASM_BIN_OP(*, v_int32x4, wasm_i32x4_mul)
-OPENCV_HAL_IMPL_WASM_BIN_OP(+, v_float32x4, wasm_f32x4_add)
-OPENCV_HAL_IMPL_WASM_BIN_OP(-, v_float32x4, wasm_f32x4_sub)
-OPENCV_HAL_IMPL_WASM_BIN_OP(*, v_float32x4, wasm_f32x4_mul)
-OPENCV_HAL_IMPL_WASM_BIN_OP(/, v_float32x4, wasm_f32x4_div)
-OPENCV_HAL_IMPL_WASM_BIN_OP(+, v_uint64x2, wasm_i64x2_add)
-OPENCV_HAL_IMPL_WASM_BIN_OP(-, v_uint64x2, wasm_i64x2_sub)
-OPENCV_HAL_IMPL_WASM_BIN_OP(+, v_int64x2, wasm_i64x2_add)
-OPENCV_HAL_IMPL_WASM_BIN_OP(-, v_int64x2, wasm_i64x2_sub)
-OPENCV_HAL_IMPL_WASM_BIN_OP(+, v_float64x2, wasm_f64x2_add)
-OPENCV_HAL_IMPL_WASM_BIN_OP(-, v_float64x2, wasm_f64x2_sub)
-OPENCV_HAL_IMPL_WASM_BIN_OP(*, v_float64x2, wasm_f64x2_mul)
-OPENCV_HAL_IMPL_WASM_BIN_OP(/, v_float64x2, wasm_f64x2_div)
+}
+
+OPENCV_HAL_IMPL_WASM_BIN_OP(v_add, v_uint8x16, wasm_u8x16_add_saturate)
+OPENCV_HAL_IMPL_WASM_BIN_OP(v_sub, v_uint8x16, wasm_u8x16_sub_saturate)
+OPENCV_HAL_IMPL_WASM_BIN_OP(v_add, v_int8x16, wasm_i8x16_add_saturate)
+OPENCV_HAL_IMPL_WASM_BIN_OP(v_sub, v_int8x16, wasm_i8x16_sub_saturate)
+OPENCV_HAL_IMPL_WASM_BIN_OP(v_add, v_uint16x8, wasm_u16x8_add_saturate)
+OPENCV_HAL_IMPL_WASM_BIN_OP(v_sub, v_uint16x8, wasm_u16x8_sub_saturate)
+OPENCV_HAL_IMPL_WASM_BIN_OP(v_add, v_int16x8, wasm_i16x8_add_saturate)
+OPENCV_HAL_IMPL_WASM_BIN_OP(v_sub, v_int16x8, wasm_i16x8_sub_saturate)
+OPENCV_HAL_IMPL_WASM_BIN_OP(v_add, v_uint32x4, wasm_i32x4_add)
+OPENCV_HAL_IMPL_WASM_BIN_OP(v_sub, v_uint32x4, wasm_i32x4_sub)
+OPENCV_HAL_IMPL_WASM_BIN_OP(v_mul, v_uint32x4, wasm_i32x4_mul)
+OPENCV_HAL_IMPL_WASM_BIN_OP(v_add, v_int32x4, wasm_i32x4_add)
+OPENCV_HAL_IMPL_WASM_BIN_OP(v_sub, v_int32x4, wasm_i32x4_sub)
+OPENCV_HAL_IMPL_WASM_BIN_OP(v_mul, v_int32x4, wasm_i32x4_mul)
+OPENCV_HAL_IMPL_WASM_BIN_OP(v_add, v_float32x4, wasm_f32x4_add)
+OPENCV_HAL_IMPL_WASM_BIN_OP(v_sub, v_float32x4, wasm_f32x4_sub)
+OPENCV_HAL_IMPL_WASM_BIN_OP(v_mul, v_float32x4, wasm_f32x4_mul)
+OPENCV_HAL_IMPL_WASM_BIN_OP(v_div, v_float32x4, wasm_f32x4_div)
+OPENCV_HAL_IMPL_WASM_BIN_OP(v_add, v_uint64x2, wasm_i64x2_add)
+OPENCV_HAL_IMPL_WASM_BIN_OP(v_sub, v_uint64x2, wasm_i64x2_sub)
+OPENCV_HAL_IMPL_WASM_BIN_OP(v_add, v_int64x2, wasm_i64x2_add)
+OPENCV_HAL_IMPL_WASM_BIN_OP(v_sub, v_int64x2, wasm_i64x2_sub)
+OPENCV_HAL_IMPL_WASM_BIN_OP(v_add, v_float64x2, wasm_f64x2_add)
+OPENCV_HAL_IMPL_WASM_BIN_OP(v_sub, v_float64x2, wasm_f64x2_sub)
+OPENCV_HAL_IMPL_WASM_BIN_OP(v_mul, v_float64x2, wasm_f64x2_mul)
+OPENCV_HAL_IMPL_WASM_BIN_OP(v_div, v_float64x2, wasm_f64x2_div)
 
 // saturating multiply 8-bit, 16-bit
 #define OPENCV_HAL_IMPL_WASM_MUL_SAT(_Tpvec, _Tpwvec)        \
-inline _Tpvec operator * (const _Tpvec& a, const _Tpvec& b)  \
+inline _Tpvec v_mul(const _Tpvec& a, const _Tpvec& b)        \
 {                                                            \
     _Tpwvec c, d;                                            \
     v_mul_expand(a, b, c, d);                                \
     return v_pack(c, d);                                     \
-}                                                            \
-inline _Tpvec& operator *= (_Tpvec& a, const _Tpvec& b)      \
-{ a = a * b; return a; }
+}
 
 OPENCV_HAL_IMPL_WASM_MUL_SAT(v_uint8x16, v_uint16x8)
 OPENCV_HAL_IMPL_WASM_MUL_SAT(v_int8x16,  v_int16x8)
@@ -959,7 +964,7 @@ inline v_int16x8 v_mul_hi(const v_int16x8& a, const v_int16x8& b)
     v_expand(b, b0, b1);
     v128_t c = wasm_i32x4_mul(a0.val, b0.val);
     v128_t d = wasm_i32x4_mul(a1.val, b1.val);
-    return v_int16x8(wasm_v8x16_shuffle(c, d, 2,3,6,7,10,11,14,15,18,19,22,23,26,27,30,31));
+    return v_int16x8(wasm_i8x16_shuffle(c, d, 2,3,6,7,10,11,14,15,18,19,22,23,26,27,30,31));
 }
 inline v_uint16x8 v_mul_hi(const v_uint16x8& a, const v_uint16x8& b)
 {
@@ -968,7 +973,7 @@ inline v_uint16x8 v_mul_hi(const v_uint16x8& a, const v_uint16x8& b)
     v_expand(b, b0, b1);
     v128_t c = wasm_i32x4_mul(a0.val, b0.val);
     v128_t d = wasm_i32x4_mul(a1.val, b1.val);
-    return v_uint16x8(wasm_v8x16_shuffle(c, d, 2,3,6,7,10,11,14,15,18,19,22,23,26,27,30,31));
+    return v_uint16x8(wasm_i8x16_shuffle(c, d, 2,3,6,7,10,11,14,15,18,19,22,23,26,27,30,31));
 }
 
 //////// Dot Product ////////
@@ -985,7 +990,7 @@ inline v_int32x4 v_dotprod(const v_int16x8& a, const v_int16x8& b)
 }
 
 inline v_int32x4 v_dotprod(const v_int16x8& a, const v_int16x8& b, const v_int32x4& c)
-{ return v_dotprod(a, b) + c; }
+{ return v_add(v_dotprod(a, b), c); }
 
 inline v_int64x2 v_dotprod(const v_int32x4& a, const v_int32x4& b)
 {
@@ -999,7 +1004,7 @@ inline v_int64x2 v_dotprod(const v_int32x4& a, const v_int32x4& b)
 }
 inline v_int64x2 v_dotprod(const v_int32x4& a, const v_int32x4& b, const v_int64x2& c)
 {
-    return v_dotprod(a, b) + c;
+    return v_add(v_dotprod(a, b), c);
 }
 
 // 8 >> 32
@@ -1009,13 +1014,13 @@ inline v_uint32x4 v_dotprod_expand(const v_uint8x16& a, const v_uint8x16& b)
     v128_t a1 = wasm_u16x8_shr(a.val, 8);
     v128_t b0 = wasm_u16x8_shr(wasm_i16x8_shl(b.val, 8), 8);
     v128_t b1 = wasm_u16x8_shr(b.val, 8);
-    return v_uint32x4((
-        v_dotprod(v_int16x8(a0), v_int16x8(b0)) +
-        v_dotprod(v_int16x8(a1), v_int16x8(b1))).val
+    return v_uint32x4((v_add(
+        v_dotprod(v_int16x8(a0), v_int16x8(b0)),
+        v_dotprod(v_int16x8(a1), v_int16x8(b1)))).val
     );
 }
 inline v_uint32x4 v_dotprod_expand(const v_uint8x16& a, const v_uint8x16& b, const v_uint32x4& c)
-{ return v_dotprod_expand(a, b) + c; }
+{ return v_add(v_dotprod_expand(a, b), c); }
 
 inline v_int32x4 v_dotprod_expand(const v_int8x16& a, const v_int8x16& b)
 {
@@ -1023,13 +1028,13 @@ inline v_int32x4 v_dotprod_expand(const v_int8x16& a, const v_int8x16& b)
     v128_t a1 = wasm_i16x8_shr(a.val, 8);
     v128_t b0 = wasm_i16x8_shr(wasm_i16x8_shl(b.val, 8), 8);
     v128_t b1 = wasm_i16x8_shr(b.val, 8);
-    return v_int32x4(
-        v_dotprod(v_int16x8(a0), v_int16x8(b0)) +
+    return v_int32x4(v_add(
+        v_dotprod(v_int16x8(a0), v_int16x8(b0)),
         v_dotprod(v_int16x8(a1), v_int16x8(b1))
-    );
+    ));
 }
 inline v_int32x4 v_dotprod_expand(const v_int8x16& a, const v_int8x16& b, const v_int32x4& c)
-{ return v_dotprod_expand(a, b) + c; }
+{ return v_add(v_dotprod_expand(a, b), c); }
 
 // 16 >> 64
 inline v_uint64x2 v_dotprod_expand(const v_uint16x8& a, const v_uint16x8& b)
@@ -1038,13 +1043,13 @@ inline v_uint64x2 v_dotprod_expand(const v_uint16x8& a, const v_uint16x8& b)
     v128_t a1 = wasm_u32x4_shr(a.val, 16);
     v128_t b0 = wasm_u32x4_shr(wasm_i32x4_shl(b.val, 16), 16);
     v128_t b1 = wasm_u32x4_shr(b.val, 16);
-    return v_uint64x2((
-        v_dotprod(v_int32x4(a0), v_int32x4(b0)) +
+    return v_uint64x2((v_add(
+        v_dotprod(v_int32x4(a0), v_int32x4(b0)),
         v_dotprod(v_int32x4(a1), v_int32x4(b1))).val
-    );
+    ));
 }
 inline v_uint64x2 v_dotprod_expand(const v_uint16x8& a, const v_uint16x8& b, const v_uint64x2& c)
-{ return v_dotprod_expand(a, b) + c; }
+{ return v_add(v_dotprod_expand(a, b), c); }
 
 inline v_int64x2 v_dotprod_expand(const v_int16x8& a, const v_int16x8& b)
 {
@@ -1052,20 +1057,20 @@ inline v_int64x2 v_dotprod_expand(const v_int16x8& a, const v_int16x8& b)
     v128_t a1 = wasm_i32x4_shr(a.val, 16);
     v128_t b0 = wasm_i32x4_shr(wasm_i32x4_shl(b.val, 16), 16);
     v128_t b1 = wasm_i32x4_shr(b.val, 16);
-    return v_int64x2((
-        v_dotprod(v_int32x4(a0), v_int32x4(b0)) +
+    return v_int64x2((v_add(
+        v_dotprod(v_int32x4(a0), v_int32x4(b0)),
         v_dotprod(v_int32x4(a1), v_int32x4(b1)))
-    );
+    ));
 }
 
 inline v_int64x2 v_dotprod_expand(const v_int16x8& a, const v_int16x8& b, const v_int64x2& c)
-{ return v_dotprod_expand(a, b) + c; }
+{ return v_add(v_dotprod_expand(a, b), c); }
 
 // 32 >> 64f
 inline v_float64x2 v_dotprod_expand(const v_int32x4& a, const v_int32x4& b)
 { return v_cvt_f64(v_dotprod(a, b)); }
 inline v_float64x2 v_dotprod_expand(const v_int32x4& a, const v_int32x4& b, const v_float64x2& c)
-{ return v_dotprod_expand(a, b) + c; }
+{ return v_add(v_dotprod_expand(a, b), c); }
 
 //////// Fast Dot Product ////////
 
@@ -1108,10 +1113,10 @@ inline v_float64x2 v_dotprod_expand_fast(const v_int32x4& a, const v_int32x4& b,
 { return v_dotprod_expand(a, b, c); }
 
 #define OPENCV_HAL_IMPL_WASM_LOGIC_OP(_Tpvec) \
-OPENCV_HAL_IMPL_WASM_BIN_OP(&, _Tpvec, wasm_v128_and) \
-OPENCV_HAL_IMPL_WASM_BIN_OP(|, _Tpvec, wasm_v128_or) \
-OPENCV_HAL_IMPL_WASM_BIN_OP(^, _Tpvec, wasm_v128_xor) \
-inline _Tpvec operator ~ (const _Tpvec& a) \
+OPENCV_HAL_IMPL_WASM_BIN_OP(v_and, _Tpvec, wasm_v128_and) \
+OPENCV_HAL_IMPL_WASM_BIN_OP(v_or, _Tpvec, wasm_v128_or)   \
+OPENCV_HAL_IMPL_WASM_BIN_OP(v_xor, _Tpvec, wasm_v128_xor) \
+inline _Tpvec v_not(const _Tpvec& a) \
 { \
     return _Tpvec(wasm_v128_not(a.val)); \
 }
@@ -1214,17 +1219,17 @@ OPENCV_HAL_IMPL_WASM_MINMAX_U_INIT_FUNC(v_uint16x8, i16x8, (short)0x8000)
 OPENCV_HAL_IMPL_WASM_MINMAX_U_INIT_FUNC(v_uint32x4, i32x4, (int)0x80000000)
 
 #define OPENCV_HAL_IMPL_WASM_INIT_CMP_OP(_Tpvec, suffix, esuffix) \
-inline _Tpvec operator == (const _Tpvec& a, const _Tpvec& b) \
+inline _Tpvec v_eq(const _Tpvec& a, const _Tpvec& b)  \
 { return _Tpvec(wasm_##esuffix##_eq(a.val, b.val)); } \
-inline _Tpvec operator != (const _Tpvec& a, const _Tpvec& b) \
+inline _Tpvec v_ne(const _Tpvec& a, const _Tpvec& b)  \
 { return _Tpvec(wasm_##esuffix##_ne(a.val, b.val)); } \
-inline _Tpvec operator < (const _Tpvec& a, const _Tpvec& b) \
+inline _Tpvec v_lt(const _Tpvec& a, const _Tpvec& b) \
 { return _Tpvec(wasm_##suffix##_lt(a.val, b.val)); } \
-inline _Tpvec operator > (const _Tpvec& a, const _Tpvec& b) \
+inline _Tpvec v_gt(const _Tpvec& a, const _Tpvec& b) \
 { return _Tpvec(wasm_##suffix##_gt(a.val, b.val)); } \
-inline _Tpvec operator <= (const _Tpvec& a, const _Tpvec& b) \
+inline _Tpvec v_le(const _Tpvec& a, const _Tpvec& b) \
 { return _Tpvec(wasm_##suffix##_le(a.val, b.val)); } \
-inline _Tpvec operator >= (const _Tpvec& a, const _Tpvec& b) \
+inline _Tpvec v_ge(const _Tpvec& a, const _Tpvec& b) \
 { return _Tpvec(wasm_##suffix##_ge(a.val, b.val)); }
 
 OPENCV_HAL_IMPL_WASM_INIT_CMP_OP(v_uint8x16, u8x16, i8x16)
@@ -1237,10 +1242,10 @@ OPENCV_HAL_IMPL_WASM_INIT_CMP_OP(v_float32x4, f32x4, f32x4)
 OPENCV_HAL_IMPL_WASM_INIT_CMP_OP(v_float64x2, f64x2, f64x2)
 
 #define OPENCV_HAL_IMPL_WASM_64BIT_CMP_OP(_Tpvec, cast) \
-inline _Tpvec operator == (const _Tpvec& a, const _Tpvec& b) \
-{ return cast(v_reinterpret_as_f64(a) == v_reinterpret_as_f64(b)); } \
-inline _Tpvec operator != (const _Tpvec& a, const _Tpvec& b) \
-{ return cast(v_reinterpret_as_f64(a) != v_reinterpret_as_f64(b)); }
+inline _Tpvec v_eq(const _Tpvec& a, const _Tpvec& b) \
+{ return cast(v_eq(v_reinterpret_as_f64(a), v_reinterpret_as_f64(b))); } \
+inline _Tpvec v_ne(const _Tpvec& a, const _Tpvec& b) \
+{ return cast(v_ne(v_reinterpret_as_f64(a), v_reinterpret_as_f64(b))); }
 
 OPENCV_HAL_IMPL_WASM_64BIT_CMP_OP(v_uint64x2, v_reinterpret_as_u64)
 OPENCV_HAL_IMPL_WASM_64BIT_CMP_OP(v_int64x2, v_reinterpret_as_s64)
@@ -1298,17 +1303,17 @@ OPENCV_HAL_IMPL_WASM_BIN_FUNC(v_int16x8, v_mul_wrap, wasm_i16x8_mul)
 /** Absolute difference **/
 
 inline v_uint8x16 v_absdiff(const v_uint8x16& a, const v_uint8x16& b)
-{ return v_add_wrap(a - b,  b - a); }
+{ return v_add_wrap(v_sub(a, b), v_sub(b, a)); }
 inline v_uint16x8 v_absdiff(const v_uint16x8& a, const v_uint16x8& b)
-{ return v_add_wrap(a - b,  b - a); }
+{ return v_add_wrap(v_sub(a, b), v_sub(b, a)); }
 inline v_uint32x4 v_absdiff(const v_uint32x4& a, const v_uint32x4& b)
-{ return v_max(a, b) - v_min(a, b); }
+{ return v_sub(v_max(a, b), v_min(a, b)); }
 
 inline v_uint8x16 v_absdiff(const v_int8x16& a, const v_int8x16& b)
 {
     v_int8x16 d = v_sub_wrap(a, b);
-    v_int8x16 m = a < b;
-    return v_reinterpret_as_u8(v_sub_wrap(d ^ m, m));
+    v_int8x16 m = v_lt(a, b);
+    return v_reinterpret_as_u8(v_sub_wrap(v_xor(d, m), m));
 }
 inline v_uint16x8 v_absdiff(const v_int16x8& a, const v_int16x8& b)
 {
@@ -1316,25 +1321,25 @@ inline v_uint16x8 v_absdiff(const v_int16x8& a, const v_int16x8& b)
 }
 inline v_uint32x4 v_absdiff(const v_int32x4& a, const v_int32x4& b)
 {
-    v_int32x4 d = a - b;
-    v_int32x4 m = a < b;
-    return v_reinterpret_as_u32((d ^ m) - m);
+    v_int32x4 d = v_sub(a, b);
+    v_int32x4 m = v_lt(a, b);
+    return v_reinterpret_as_u32(v_sub(v_xor(d, m), m));
 }
 
 /** Saturating absolute difference **/
 inline v_int8x16 v_absdiffs(const v_int8x16& a, const v_int8x16& b)
 {
-    v_int8x16 d = a - b;
-    v_int8x16 m = a < b;
-    return (d ^ m) - m;
+    v_int8x16 d = v_sub(a, b);
+    v_int8x16 m = v_lt(a, b);
+    return v_sub(v_xor(d, m), m);
  }
 inline v_int16x8 v_absdiffs(const v_int16x8& a, const v_int16x8& b)
-{ return v_max(a, b) - v_min(a, b); }
+{ return v_sub(v_max(a, b), v_min(a, b)); }
 
 
 inline v_int32x4 v_fma(const v_int32x4& a, const v_int32x4& b, const v_int32x4& c)
 {
-    return a * b + c;
+    return v_add(v_mul(a, b), c);
 }
 
 inline v_int32x4 v_muladd(const v_int32x4& a, const v_int32x4& b, const v_int32x4& c)
@@ -1344,12 +1349,12 @@ inline v_int32x4 v_muladd(const v_int32x4& a, const v_int32x4& b, const v_int32x
 
 inline v_float32x4 v_fma(const v_float32x4& a, const v_float32x4& b, const v_float32x4& c)
 {
-    return a * b + c;
+    return v_add(v_mul(a, b), c);
 }
 
 inline v_float64x2 v_fma(const v_float64x2& a, const v_float64x2& b, const v_float64x2& c)
 {
-    return a * b + c;
+    return v_add(v_mul(a, b), c);
 }
 
 inline v_float32x4 v_absdiff(const v_float32x4& a, const v_float32x4& b)
@@ -1385,19 +1390,19 @@ OPENCV_HAL_IMPL_WASM_MISC_FLT_OP(v_float32x4, f32x4)
 OPENCV_HAL_IMPL_WASM_MISC_FLT_OP(v_float64x2, f64x2)
 
 #define OPENCV_HAL_IMPL_WASM_SHIFT_OP(_Tpuvec, _Tpsvec, suffix, ssuffix) \
-inline _Tpuvec operator << (const _Tpuvec& a, int imm) \
+inline _Tpuvec v_shl(const _Tpuvec& a, int imm) \
 { \
     return _Tpuvec(wasm_##suffix##_shl(a.val, imm)); \
 } \
-inline _Tpsvec operator << (const _Tpsvec& a, int imm) \
+inline _Tpsvec v_shl(const _Tpsvec& a, int imm) \
 { \
     return _Tpsvec(wasm_##suffix##_shl(a.val, imm)); \
 } \
-inline _Tpuvec operator >> (const _Tpuvec& a, int imm) \
+inline _Tpuvec v_shr(const _Tpuvec& a, int imm) \
 { \
     return _Tpuvec(wasm_##ssuffix##_shr(a.val, imm)); \
 } \
-inline _Tpsvec operator >> (const _Tpsvec& a, int imm) \
+inline _Tpsvec v_shr(const _Tpsvec& a, int imm) \
 { \
     return _Tpsvec(wasm_##suffix##_shr(a.val, imm)); \
 } \
@@ -1466,7 +1471,7 @@ namespace hal_wasm_internal
         inline v128_t operator()(const v128_t& a, const v128_t& b) const
         {
             enum { imm2 = (sizeof(v128_t) - imm) };
-            return wasm_v8x16_shuffle(a, b,
+            return wasm_i8x16_shuffle(a, b,
                                       imm, imm+1, imm+2, imm+3,
                                       imm+4, imm+5, imm+6, imm+7,
                                       imm+8, imm+9, imm+10, imm+11,
@@ -1577,19 +1582,19 @@ OPENCV_HAL_IMPL_WASM_LOADSTORE_INT_OP(v_float64x2, double)
 
 /** Reverse **/
 inline v_uint8x16 v_reverse(const v_uint8x16 &a)
-{ return v_uint8x16(wasm_v8x16_shuffle(a.val, a.val, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0)); }
+{ return v_uint8x16(wasm_i8x16_shuffle(a.val, a.val, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0)); }
 
 inline v_int8x16 v_reverse(const v_int8x16 &a)
 { return v_reinterpret_as_s8(v_reverse(v_reinterpret_as_u8(a))); }
 
 inline v_uint16x8 v_reverse(const v_uint16x8 &a)
-{ return v_uint16x8(wasm_v8x16_shuffle(a.val, a.val, 14, 15, 12, 13, 10, 11, 8, 9, 6, 7, 4, 5, 2, 3, 0, 1)); }
+{ return v_uint16x8(wasm_i8x16_shuffle(a.val, a.val, 14, 15, 12, 13, 10, 11, 8, 9, 6, 7, 4, 5, 2, 3, 0, 1)); }
 
 inline v_int16x8 v_reverse(const v_int16x8 &a)
 { return v_reinterpret_as_s16(v_reverse(v_reinterpret_as_u16(a))); }
 
 inline v_uint32x4 v_reverse(const v_uint32x4 &a)
-{ return v_uint32x4(wasm_v8x16_shuffle(a.val, a.val, 12, 13, 14, 15, 8, 9, 10, 11, 4, 5, 6, 7, 0, 1, 2, 3)); }
+{ return v_uint32x4(wasm_i8x16_shuffle(a.val, a.val, 12, 13, 14, 15, 8, 9, 10, 11, 4, 5, 6, 7, 0, 1, 2, 3)); }
 
 inline v_int32x4 v_reverse(const v_int32x4 &a)
 { return v_reinterpret_as_s32(v_reverse(v_reinterpret_as_u32(a))); }
@@ -1598,7 +1603,7 @@ inline v_float32x4 v_reverse(const v_float32x4 &a)
 { return v_reinterpret_as_f32(v_reverse(v_reinterpret_as_u32(a))); }
 
 inline v_uint64x2 v_reverse(const v_uint64x2 &a)
-{ return v_uint64x2(wasm_v8x16_shuffle(a.val, a.val, 8, 9, 10, 11, 12, 13, 14, 15, 0, 1, 2, 3, 4, 5, 6, 7)); }
+{ return v_uint64x2(wasm_i8x16_shuffle(a.val, a.val, 8, 9, 10, 11, 12, 13, 14, 15, 0, 1, 2, 3, 4, 5, 6, 7)); }
 
 inline v_int64x2 v_reverse(const v_int64x2 &a)
 { return v_reinterpret_as_s64(v_reverse(v_reinterpret_as_u64(a))); }
@@ -1611,8 +1616,8 @@ inline v_float64x2 v_reverse(const v_float64x2 &a)
 inline scalartype v_reduce_sum(const _Tpvec& a) \
 { \
     regtype val = a.val; \
-    val = wasm_##suffix##_add(val, wasm_v8x16_shuffle(val, val, 8,9,10,11,12,13,14,15,0,1,2,3,4,5,6,7)); \
-    val = wasm_##suffix##_add(val, wasm_v8x16_shuffle(val, val, 4,5,6,7,8,9,10,11,12,13,14,15,0,1,2,3)); \
+    val = wasm_##suffix##_add(val, wasm_i8x16_shuffle(val, val, 8,9,10,11,12,13,14,15,0,1,2,3,4,5,6,7)); \
+    val = wasm_##suffix##_add(val, wasm_i8x16_shuffle(val, val, 4,5,6,7,8,9,10,11,12,13,14,15,0,1,2,3)); \
     return (scalartype)wasm_##esuffix##_extract_lane(val, 0); \
 }
 
@@ -1644,7 +1649,7 @@ OPENCV_HAL_IMPL_FALLBACK_REDUCE_OP_SUM(v_int16x8, int)
 inline scalartype v_reduce_sum(const _Tpvec& a) \
 { \
     regtype val = a.val; \
-    val = wasm_##suffix##_add(val, wasm_v8x16_shuffle(val, val, 8,9,10,11,12,13,14,15,0,1,2,3,4,5,6,7)); \
+    val = wasm_##suffix##_add(val, wasm_i8x16_shuffle(val, val, 8,9,10,11,12,13,14,15,0,1,2,3,4,5,6,7)); \
     return (scalartype)wasm_##esuffix##_extract_lane(val, 0); \
 }
 OPENCV_HAL_IMPL_WASM_REDUCE_OP_2_SUM(v_uint64x2, uint64, v128_t, i64x2, i64x2)
@@ -1693,7 +1698,7 @@ inline unsigned v_reduce_sad(const v_uint8x16& a, const v_uint8x16& b)
     v_expand(v_absdiff(a, b), l16, h16);
     v_expand(l16, l16_l32, l16_h32);
     v_expand(h16, h16_l32, h16_h32);
-    return v_reduce_sum(l16_l32+l16_h32+h16_l32+h16_h32);
+    return v_reduce_sum(v_add(v_add(l16_l32, l16_h32), v_add(h16_l32, h16_h32)));
 }
 inline unsigned v_reduce_sad(const v_int8x16& a, const v_int8x16& b)
 {
@@ -1702,19 +1707,19 @@ inline unsigned v_reduce_sad(const v_int8x16& a, const v_int8x16& b)
     v_expand(v_absdiff(a, b), l16, h16);
     v_expand(l16, l16_l32, l16_h32);
     v_expand(h16, h16_l32, h16_h32);
-    return v_reduce_sum(l16_l32+l16_h32+h16_l32+h16_h32);
+    return v_reduce_sum(v_add(v_add(l16_l32, l16_h32), v_add(h16_l32, h16_h32)));
 }
 inline unsigned v_reduce_sad(const v_uint16x8& a, const v_uint16x8& b)
 {
     v_uint32x4 l, h;
     v_expand(v_absdiff(a, b), l, h);
-    return v_reduce_sum(l + h);
+    return v_reduce_sum(v_add(l, h));
 }
 inline unsigned v_reduce_sad(const v_int16x8& a, const v_int16x8& b)
 {
     v_uint32x4 l, h;
     v_expand(v_absdiff(a, b), l, h);
-    return v_reduce_sum(l + h);
+    return v_reduce_sum(v_add(l, h));
 }
 inline unsigned v_reduce_sad(const v_uint32x4& a, const v_uint32x4& b)
 {
@@ -1743,15 +1748,15 @@ inline v_uint8x16 v_popcount(const v_uint8x16& a)
 inline v_uint16x8 v_popcount(const v_uint16x8& a)
 {
     v_uint8x16 p = v_popcount(v_reinterpret_as_u8(a));
-    p += v_rotate_right<1>(p);
-    return v_reinterpret_as_u16(p) & v_setall_u16(0x00ff);
+    p = v_add(p, v_rotate_right<1>(p));
+    return v_and(v_reinterpret_as_u16(p), v_setall_u16(0x00ff));
 }
 inline v_uint32x4 v_popcount(const v_uint32x4& a)
 {
     v_uint8x16 p = v_popcount(v_reinterpret_as_u8(a));
-    p += v_rotate_right<1>(p);
-    p += v_rotate_right<2>(p);
-    return v_reinterpret_as_u32(p) & v_setall_u32(0x000000ff);
+    p = v_add(p, v_rotate_right<1>(p));
+    p = v_add(p, v_rotate_right<2>(p));
+    return v_and(v_reinterpret_as_u32(p), v_setall_u32(0x000000ff));
 }
 inline v_uint64x2 v_popcount(const v_uint64x2& a)
 {
@@ -1991,8 +1996,8 @@ inline void v_load_deinterleave(const uchar* ptr, v_uint8x16& a, v_uint8x16& b)
     v128_t t00 = wasm_v128_load(ptr);
     v128_t t01 = wasm_v128_load(ptr + 16);
 
-    a.val = wasm_v8x16_shuffle(t00, t01, 0,2,4,6,8,10,12,14,16,18,20,22,24,26,28,30);
-    b.val = wasm_v8x16_shuffle(t00, t01, 1,3,5,7,9,11,13,15,17,19,21,23,25,27,29,31);
+    a.val = wasm_i8x16_shuffle(t00, t01, 0,2,4,6,8,10,12,14,16,18,20,22,24,26,28,30);
+    b.val = wasm_i8x16_shuffle(t00, t01, 1,3,5,7,9,11,13,15,17,19,21,23,25,27,29,31);
 }
 
 inline void v_load_deinterleave(const uchar* ptr, v_uint8x16& a, v_uint8x16& b, v_uint8x16& c)
@@ -2001,13 +2006,13 @@ inline void v_load_deinterleave(const uchar* ptr, v_uint8x16& a, v_uint8x16& b,
     v128_t t01 = wasm_v128_load(ptr + 16);
     v128_t t02 = wasm_v128_load(ptr + 32);
 
-    v128_t t10 = wasm_v8x16_shuffle(t00, t01, 0,3,6,9,12,15,18,21,24,27,30,1,2,4,5,7);
-    v128_t t11 = wasm_v8x16_shuffle(t00, t01, 1,4,7,10,13,16,19,22,25,28,31,0,2,3,5,6);
-    v128_t t12 = wasm_v8x16_shuffle(t00, t01, 2,5,8,11,14,17,20,23,26,29,0,1,3,4,6,7);
+    v128_t t10 = wasm_i8x16_shuffle(t00, t01, 0,3,6,9,12,15,18,21,24,27,30,1,2,4,5,7);
+    v128_t t11 = wasm_i8x16_shuffle(t00, t01, 1,4,7,10,13,16,19,22,25,28,31,0,2,3,5,6);
+    v128_t t12 = wasm_i8x16_shuffle(t00, t01, 2,5,8,11,14,17,20,23,26,29,0,1,3,4,6,7);
 
-    a.val = wasm_v8x16_shuffle(t10, t02, 0,1,2,3,4,5,6,7,8,9,10,17,20,23,26,29);
-    b.val = wasm_v8x16_shuffle(t11, t02, 0,1,2,3,4,5,6,7,8,9,10,18,21,24,27,30);
-    c.val = wasm_v8x16_shuffle(t12, t02, 0,1,2,3,4,5,6,7,8,9,16,19,22,25,28,31);
+    a.val = wasm_i8x16_shuffle(t10, t02, 0,1,2,3,4,5,6,7,8,9,10,17,20,23,26,29);
+    b.val = wasm_i8x16_shuffle(t11, t02, 0,1,2,3,4,5,6,7,8,9,10,18,21,24,27,30);
+    c.val = wasm_i8x16_shuffle(t12, t02, 0,1,2,3,4,5,6,7,8,9,16,19,22,25,28,31);
 }
 
 inline void v_load_deinterleave(const uchar* ptr, v_uint8x16& a, v_uint8x16& b, v_uint8x16& c, v_uint8x16& d)
@@ -2017,15 +2022,15 @@ inline void v_load_deinterleave(const uchar* ptr, v_uint8x16& a, v_uint8x16& b,
     v128_t u2 = wasm_v128_load(ptr + 32); // a8 b8 c8 d8 ...
     v128_t u3 = wasm_v128_load(ptr + 48); // a12 b12 c12 d12 ...
 
-    v128_t v0 = wasm_v8x16_shuffle(u0, u1, 0,4,8,12,16,20,24,28,1,5,9,13,17,21,25,29);
-    v128_t v1 = wasm_v8x16_shuffle(u2, u3, 0,4,8,12,16,20,24,28,1,5,9,13,17,21,25,29);
-    v128_t v2 = wasm_v8x16_shuffle(u0, u1, 2,6,10,14,18,22,26,30,3,7,11,15,19,23,27,31);
-    v128_t v3 = wasm_v8x16_shuffle(u2, u3, 2,6,10,14,18,22,26,30,3,7,11,15,19,23,27,31);
+    v128_t v0 = wasm_i8x16_shuffle(u0, u1, 0,4,8,12,16,20,24,28,1,5,9,13,17,21,25,29);
+    v128_t v1 = wasm_i8x16_shuffle(u2, u3, 0,4,8,12,16,20,24,28,1,5,9,13,17,21,25,29);
+    v128_t v2 = wasm_i8x16_shuffle(u0, u1, 2,6,10,14,18,22,26,30,3,7,11,15,19,23,27,31);
+    v128_t v3 = wasm_i8x16_shuffle(u2, u3, 2,6,10,14,18,22,26,30,3,7,11,15,19,23,27,31);
 
-    a.val = wasm_v8x16_shuffle(v0, v1, 0,1,2,3,4,5,6,7,16,17,18,19,20,21,22,23);
-    b.val = wasm_v8x16_shuffle(v0, v1, 8,9,10,11,12,13,14,15,24,25,26,27,28,29,30,31);
-    c.val = wasm_v8x16_shuffle(v2, v3, 0,1,2,3,4,5,6,7,16,17,18,19,20,21,22,23);
-    d.val = wasm_v8x16_shuffle(v2, v3, 8,9,10,11,12,13,14,15,24,25,26,27,28,29,30,31);
+    a.val = wasm_i8x16_shuffle(v0, v1, 0,1,2,3,4,5,6,7,16,17,18,19,20,21,22,23);
+    b.val = wasm_i8x16_shuffle(v0, v1, 8,9,10,11,12,13,14,15,24,25,26,27,28,29,30,31);
+    c.val = wasm_i8x16_shuffle(v2, v3, 0,1,2,3,4,5,6,7,16,17,18,19,20,21,22,23);
+    d.val = wasm_i8x16_shuffle(v2, v3, 8,9,10,11,12,13,14,15,24,25,26,27,28,29,30,31);
 }
 
 inline void v_load_deinterleave(const ushort* ptr, v_uint16x8& a, v_uint16x8& b)
@@ -2033,8 +2038,8 @@ inline void v_load_deinterleave(const ushort* ptr, v_uint16x8& a, v_uint16x8& b)
     v128_t v0 = wasm_v128_load(ptr);     // a0 b0 a1 b1 a2 b2 a3 b3
     v128_t v1 = wasm_v128_load(ptr + 8); // a4 b4 a5 b5 a6 b6 a7 b7
 
-    a.val = wasm_v8x16_shuffle(v0, v1, 0,1,4,5,8,9,12,13,16,17,20,21,24,25,28,29); // a0 a1 a2 a3 a4 a5 a6 a7
-    b.val = wasm_v8x16_shuffle(v0, v1, 2,3,6,7,10,11,14,15,18,19,22,23,26,27,30,31); // b0 b1 ab b3 b4 b5 b6 b7
+    a.val = wasm_i8x16_shuffle(v0, v1, 0,1,4,5,8,9,12,13,16,17,20,21,24,25,28,29); // a0 a1 a2 a3 a4 a5 a6 a7
+    b.val = wasm_i8x16_shuffle(v0, v1, 2,3,6,7,10,11,14,15,18,19,22,23,26,27,30,31); // b0 b1 ab b3 b4 b5 b6 b7
 }
 
 inline void v_load_deinterleave(const ushort* ptr, v_uint16x8& a, v_uint16x8& b, v_uint16x8& c)
@@ -2043,13 +2048,13 @@ inline void v_load_deinterleave(const ushort* ptr, v_uint16x8& a, v_uint16x8& b,
     v128_t t01 = wasm_v128_load(ptr + 8);    // c2 a3 b3 c3 a4 b4 c4 a5
     v128_t t02 = wasm_v128_load(ptr + 16);  // b5 c5 a6 b6 c6 a7 b7 c7
 
-    v128_t t10 = wasm_v8x16_shuffle(t00, t01, 0,1,6,7,12,13,18,19,24,25,30,31,2,3,4,5);
-    v128_t t11 = wasm_v8x16_shuffle(t00, t01, 2,3,8,9,14,15,20,21,26,27,0,1,4,5,6,7);
-    v128_t t12 = wasm_v8x16_shuffle(t00, t01, 4,5,10,11,16,17,22,23,28,29,0,1,2,3,6,7);
+    v128_t t10 = wasm_i8x16_shuffle(t00, t01, 0,1,6,7,12,13,18,19,24,25,30,31,2,3,4,5);
+    v128_t t11 = wasm_i8x16_shuffle(t00, t01, 2,3,8,9,14,15,20,21,26,27,0,1,4,5,6,7);
+    v128_t t12 = wasm_i8x16_shuffle(t00, t01, 4,5,10,11,16,17,22,23,28,29,0,1,2,3,6,7);
 
-    a.val = wasm_v8x16_shuffle(t10, t02, 0,1,2,3,4,5,6,7,8,9,10,11,20,21,26,27);
-    b.val = wasm_v8x16_shuffle(t11, t02, 0,1,2,3,4,5,6,7,8,9,16,17,22,23,28,29);
-    c.val = wasm_v8x16_shuffle(t12, t02, 0,1,2,3,4,5,6,7,8,9,18,19,24,25,30,31);
+    a.val = wasm_i8x16_shuffle(t10, t02, 0,1,2,3,4,5,6,7,8,9,10,11,20,21,26,27);
+    b.val = wasm_i8x16_shuffle(t11, t02, 0,1,2,3,4,5,6,7,8,9,16,17,22,23,28,29);
+    c.val = wasm_i8x16_shuffle(t12, t02, 0,1,2,3,4,5,6,7,8,9,18,19,24,25,30,31);
 }
 
 inline void v_load_deinterleave(const ushort* ptr, v_uint16x8& a, v_uint16x8& b, v_uint16x8& c, v_uint16x8& d)
@@ -2059,15 +2064,15 @@ inline void v_load_deinterleave(const ushort* ptr, v_uint16x8& a, v_uint16x8& b,
     v128_t u2 = wasm_v128_load(ptr + 16); // a4 b4 c4 d4 ...
     v128_t u3 = wasm_v128_load(ptr + 24); // a6 b6 c6 d6 ...
 
-    v128_t v0 = wasm_v8x16_shuffle(u0, u1, 0,1,8,9,16,17,24,25,2,3,10,11,18,19,26,27); // a0 a1 a2 a3 b0 b1 b2 b3
-    v128_t v1 = wasm_v8x16_shuffle(u2, u3, 0,1,8,9,16,17,24,25,2,3,10,11,18,19,26,27); // a4 a5 a6 a7 b4 b5 b6 b7
-    v128_t v2 = wasm_v8x16_shuffle(u0, u1, 4,5,12,13,20,21,28,29,6,7,14,15,22,23,30,31); // c0 c1 c2 c3 d0 d1 d2 d3
-    v128_t v3 = wasm_v8x16_shuffle(u2, u3, 4,5,12,13,20,21,28,29,6,7,14,15,22,23,30,31); // c4 c5 c6 c7 d4 d5 d6 d7
+    v128_t v0 = wasm_i8x16_shuffle(u0, u1, 0,1,8,9,16,17,24,25,2,3,10,11,18,19,26,27); // a0 a1 a2 a3 b0 b1 b2 b3
+    v128_t v1 = wasm_i8x16_shuffle(u2, u3, 0,1,8,9,16,17,24,25,2,3,10,11,18,19,26,27); // a4 a5 a6 a7 b4 b5 b6 b7
+    v128_t v2 = wasm_i8x16_shuffle(u0, u1, 4,5,12,13,20,21,28,29,6,7,14,15,22,23,30,31); // c0 c1 c2 c3 d0 d1 d2 d3
+    v128_t v3 = wasm_i8x16_shuffle(u2, u3, 4,5,12,13,20,21,28,29,6,7,14,15,22,23,30,31); // c4 c5 c6 c7 d4 d5 d6 d7
 
-    a.val = wasm_v8x16_shuffle(v0, v1, 0,1,2,3,4,5,6,7,16,17,18,19,20,21,22,23);
-    b.val = wasm_v8x16_shuffle(v0, v1, 8,9,10,11,12,13,14,15,24,25,26,27,28,29,30,31);
-    c.val = wasm_v8x16_shuffle(v2, v3, 0,1,2,3,4,5,6,7,16,17,18,19,20,21,22,23);
-    d.val = wasm_v8x16_shuffle(v2, v3, 8,9,10,11,12,13,14,15,24,25,26,27,28,29,30,31);
+    a.val = wasm_i8x16_shuffle(v0, v1, 0,1,2,3,4,5,6,7,16,17,18,19,20,21,22,23);
+    b.val = wasm_i8x16_shuffle(v0, v1, 8,9,10,11,12,13,14,15,24,25,26,27,28,29,30,31);
+    c.val = wasm_i8x16_shuffle(v2, v3, 0,1,2,3,4,5,6,7,16,17,18,19,20,21,22,23);
+    d.val = wasm_i8x16_shuffle(v2, v3, 8,9,10,11,12,13,14,15,24,25,26,27,28,29,30,31);
 }
 
 inline void v_load_deinterleave(const unsigned* ptr, v_uint32x4& a, v_uint32x4& b)
@@ -2075,8 +2080,8 @@ inline void v_load_deinterleave(const unsigned* ptr, v_uint32x4& a, v_uint32x4&
     v128_t v0 = wasm_v128_load(ptr);     // a0 b0 a1 b1
     v128_t v1 = wasm_v128_load(ptr + 4); // a2 b2 a3 b3
 
-    a.val = wasm_v8x16_shuffle(v0, v1, 0,1,2,3,8,9,10,11,16,17,18,19,24,25,26,27); // a0 a1 a2 a3
-    b.val = wasm_v8x16_shuffle(v0, v1, 4,5,6,7,12,13,14,15,20,21,22,23,28,29,30,31); // b0 b1 b2 b3
+    a.val = wasm_i8x16_shuffle(v0, v1, 0,1,2,3,8,9,10,11,16,17,18,19,24,25,26,27); // a0 a1 a2 a3
+    b.val = wasm_i8x16_shuffle(v0, v1, 4,5,6,7,12,13,14,15,20,21,22,23,28,29,30,31); // b0 b1 b2 b3
 }
 
 inline void v_load_deinterleave(const unsigned* ptr, v_uint32x4& a, v_uint32x4& b, v_uint32x4& c)
@@ -2085,13 +2090,13 @@ inline void v_load_deinterleave(const unsigned* ptr, v_uint32x4& a, v_uint32x4&
     v128_t t01 = wasm_v128_load(ptr + 4);     // b2 c2 a3 b3
     v128_t t02 = wasm_v128_load(ptr + 8);    // c3 a4 b4 c4
 
-    v128_t t10 = wasm_v8x16_shuffle(t00, t01, 0,1,2,3,12,13,14,15,24,25,26,27,4,5,6,7);
-    v128_t t11 = wasm_v8x16_shuffle(t00, t01, 4,5,6,7,16,17,18,19,28,29,30,31,0,1,2,3);
-    v128_t t12 = wasm_v8x16_shuffle(t00, t01, 8,9,10,11,20,21,22,23,0,1,2,3,4,5,6,7);
+    v128_t t10 = wasm_i8x16_shuffle(t00, t01, 0,1,2,3,12,13,14,15,24,25,26,27,4,5,6,7);
+    v128_t t11 = wasm_i8x16_shuffle(t00, t01, 4,5,6,7,16,17,18,19,28,29,30,31,0,1,2,3);
+    v128_t t12 = wasm_i8x16_shuffle(t00, t01, 8,9,10,11,20,21,22,23,0,1,2,3,4,5,6,7);
 
-    a.val = wasm_v8x16_shuffle(t10, t02, 0,1,2,3,4,5,6,7,8,9,10,11,20,21,22,23);
-    b.val = wasm_v8x16_shuffle(t11, t02, 0,1,2,3,4,5,6,7,8,9,10,11,24,25,26,27);
-    c.val = wasm_v8x16_shuffle(t12, t02, 0,1,2,3,4,5,6,7,16,17,18,19,28,29,30,31);
+    a.val = wasm_i8x16_shuffle(t10, t02, 0,1,2,3,4,5,6,7,8,9,10,11,20,21,22,23);
+    b.val = wasm_i8x16_shuffle(t11, t02, 0,1,2,3,4,5,6,7,8,9,10,11,24,25,26,27);
+    c.val = wasm_i8x16_shuffle(t12, t02, 0,1,2,3,4,5,6,7,16,17,18,19,28,29,30,31);
 }
 
 inline void v_load_deinterleave(const unsigned* ptr, v_uint32x4& a, v_uint32x4& b, v_uint32x4& c, v_uint32x4& d)
@@ -2109,8 +2114,8 @@ inline void v_load_deinterleave(const float* ptr, v_float32x4& a, v_float32x4& b
     v128_t v0 = wasm_v128_load(ptr);       // a0 b0 a1 b1
     v128_t v1 = wasm_v128_load((ptr + 4)); // a2 b2 a3 b3
 
-    a.val = wasm_v8x16_shuffle(v0, v1, 0,1,2,3,8,9,10,11,16,17,18,19,24,25,26,27); // a0 a1 a2 a3
-    b.val = wasm_v8x16_shuffle(v0, v1, 4,5,6,7,12,13,14,15,20,21,22,23,28,29,30,31); // b0 b1 b2 b3
+    a.val = wasm_i8x16_shuffle(v0, v1, 0,1,2,3,8,9,10,11,16,17,18,19,24,25,26,27); // a0 a1 a2 a3
+    b.val = wasm_i8x16_shuffle(v0, v1, 4,5,6,7,12,13,14,15,20,21,22,23,28,29,30,31); // b0 b1 b2 b3
 }
 
 inline void v_load_deinterleave(const float* ptr, v_float32x4& a, v_float32x4& b, v_float32x4& c)
@@ -2119,13 +2124,13 @@ inline void v_load_deinterleave(const float* ptr, v_float32x4& a, v_float32x4& b
     v128_t t01 = wasm_v128_load(ptr + 4);     // b2 c2 a3 b3
     v128_t t02 = wasm_v128_load(ptr + 8);    // c3 a4 b4 c4
 
-    v128_t t10 = wasm_v8x16_shuffle(t00, t01, 0,1,2,3,12,13,14,15,24,25,26,27,4,5,6,7);
-    v128_t t11 = wasm_v8x16_shuffle(t00, t01, 4,5,6,7,16,17,18,19,28,29,30,31,0,1,2,3);
-    v128_t t12 = wasm_v8x16_shuffle(t00, t01, 8,9,10,11,20,21,22,23,0,1,2,3,4,5,6,7);
+    v128_t t10 = wasm_i8x16_shuffle(t00, t01, 0,1,2,3,12,13,14,15,24,25,26,27,4,5,6,7);
+    v128_t t11 = wasm_i8x16_shuffle(t00, t01, 4,5,6,7,16,17,18,19,28,29,30,31,0,1,2,3);
+    v128_t t12 = wasm_i8x16_shuffle(t00, t01, 8,9,10,11,20,21,22,23,0,1,2,3,4,5,6,7);
 
-    a.val = wasm_v8x16_shuffle(t10, t02, 0,1,2,3,4,5,6,7,8,9,10,11,20,21,22,23);
-    b.val = wasm_v8x16_shuffle(t11, t02, 0,1,2,3,4,5,6,7,8,9,10,11,24,25,26,27);
-    c.val = wasm_v8x16_shuffle(t12, t02, 0,1,2,3,4,5,6,7,16,17,18,19,28,29,30,31);
+    a.val = wasm_i8x16_shuffle(t10, t02, 0,1,2,3,4,5,6,7,8,9,10,11,20,21,22,23);
+    b.val = wasm_i8x16_shuffle(t11, t02, 0,1,2,3,4,5,6,7,8,9,10,11,24,25,26,27);
+    c.val = wasm_i8x16_shuffle(t12, t02, 0,1,2,3,4,5,6,7,16,17,18,19,28,29,30,31);
 }
 
 inline void v_load_deinterleave(const float* ptr, v_float32x4& a, v_float32x4& b, v_float32x4& c, v_float32x4& d)
@@ -2153,9 +2158,9 @@ inline void v_load_deinterleave(const uint64 *ptr, v_uint64x2& a, v_uint64x2& b,
     v128_t t1 = wasm_v128_load(ptr + 2); // c0, a1
     v128_t t2 = wasm_v128_load(ptr + 4); // b1, c1
 
-    a.val = wasm_v8x16_shuffle(t0, t1, 0,1,2,3,4,5,6,7,24,25,26,27,28,29,30,31);
-    b.val = wasm_v8x16_shuffle(t0, t2, 8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23);
-    c.val = wasm_v8x16_shuffle(t1, t2, 0,1,2,3,4,5,6,7,24,25,26,27,28,29,30,31);
+    a.val = wasm_i8x16_shuffle(t0, t1, 0,1,2,3,4,5,6,7,24,25,26,27,28,29,30,31);
+    b.val = wasm_i8x16_shuffle(t0, t2, 8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23);
+    c.val = wasm_i8x16_shuffle(t1, t2, 0,1,2,3,4,5,6,7,24,25,26,27,28,29,30,31);
 }
 
 inline void v_load_deinterleave(const uint64 *ptr, v_uint64x2& a,
@@ -2187,13 +2192,13 @@ inline void v_store_interleave( uchar* ptr, const v_uint8x16& a, const v_uint8x1
 inline void v_store_interleave( uchar* ptr, const v_uint8x16& a, const v_uint8x16& b,
                                 const v_uint8x16& c, hal::StoreMode /*mode*/ = hal::STORE_UNALIGNED)
 {
-    v128_t t00 = wasm_v8x16_shuffle(a.val, b.val, 0,16,0,1,17,0,2,18,0,3,19,0,4,20,0,5);
-    v128_t t01 = wasm_v8x16_shuffle(a.val, b.val, 21,0,6,22,0,7,23,0,8,24,0,9,25,0,10,26);
-    v128_t t02 = wasm_v8x16_shuffle(a.val, b.val, 0,11,27,0,12,28,0,13,29,0,14,30,0,15,31,0);
+    v128_t t00 = wasm_i8x16_shuffle(a.val, b.val, 0,16,0,1,17,0,2,18,0,3,19,0,4,20,0,5);
+    v128_t t01 = wasm_i8x16_shuffle(a.val, b.val, 21,0,6,22,0,7,23,0,8,24,0,9,25,0,10,26);
+    v128_t t02 = wasm_i8x16_shuffle(a.val, b.val, 0,11,27,0,12,28,0,13,29,0,14,30,0,15,31,0);
 
-    v128_t t10 = wasm_v8x16_shuffle(t00, c.val, 0,1,16,3,4,17,6,7,18,9,10,19,12,13,20,15);
-    v128_t t11 = wasm_v8x16_shuffle(t01, c.val, 0,21,2,3,22,5,6,23,8,9,24,11,12,25,14,15);
-    v128_t t12 = wasm_v8x16_shuffle(t02, c.val, 26,1,2,27,4,5,28,7,8,29,10,11,30,13,14,31);
+    v128_t t10 = wasm_i8x16_shuffle(t00, c.val, 0,1,16,3,4,17,6,7,18,9,10,19,12,13,20,15);
+    v128_t t11 = wasm_i8x16_shuffle(t01, c.val, 0,21,2,3,22,5,6,23,8,9,24,11,12,25,14,15);
+    v128_t t12 = wasm_i8x16_shuffle(t02, c.val, 26,1,2,27,4,5,28,7,8,29,10,11,30,13,14,31);
 
     wasm_v128_store(ptr, t10);
     wasm_v128_store(ptr + 16, t11);
@@ -2238,13 +2243,13 @@ inline void v_store_interleave( ushort* ptr, const v_uint16x8& a,
                                 const v_uint16x8& b, const v_uint16x8& c,
                                 hal::StoreMode /*mode*/ = hal::STORE_UNALIGNED)
 {
-    v128_t t00 = wasm_v8x16_shuffle(a.val, b.val, 0,1,16,17,0,0,2,3,18,19,0,0,4,5,20,21);
-    v128_t t01 = wasm_v8x16_shuffle(a.val, b.val, 0,0,6,7,22,23,0,0,8,9,24,25,0,0,10,11);
-    v128_t t02 = wasm_v8x16_shuffle(a.val, b.val, 26,27,0,0,12,13,28,29,0,0,14,15,30,31,0,0);
+    v128_t t00 = wasm_i8x16_shuffle(a.val, b.val, 0,1,16,17,0,0,2,3,18,19,0,0,4,5,20,21);
+    v128_t t01 = wasm_i8x16_shuffle(a.val, b.val, 0,0,6,7,22,23,0,0,8,9,24,25,0,0,10,11);
+    v128_t t02 = wasm_i8x16_shuffle(a.val, b.val, 26,27,0,0,12,13,28,29,0,0,14,15,30,31,0,0);
 
-    v128_t t10 = wasm_v8x16_shuffle(t00, c.val, 0,1,2,3,16,17,6,7,8,9,18,19,12,13,14,15);
-    v128_t t11 = wasm_v8x16_shuffle(t01, c.val, 20,21,2,3,4,5,22,23,8,9,10,11,24,25,14,15);
-    v128_t t12 = wasm_v8x16_shuffle(t02, c.val, 0,1,26,27,4,5,6,7,28,29,10,11,12,13,30,31);
+    v128_t t10 = wasm_i8x16_shuffle(t00, c.val, 0,1,2,3,16,17,6,7,8,9,18,19,12,13,14,15);
+    v128_t t11 = wasm_i8x16_shuffle(t01, c.val, 20,21,2,3,4,5,22,23,8,9,10,11,24,25,14,15);
+    v128_t t12 = wasm_i8x16_shuffle(t02, c.val, 0,1,26,27,4,5,6,7,28,29,10,11,12,13,30,31);
 
     wasm_v128_store(ptr, t10);
     wasm_v128_store(ptr + 8, t11);
@@ -2288,13 +2293,13 @@ inline void v_store_interleave( unsigned* ptr, const v_uint32x4& a, const v_uint
 inline void v_store_interleave( unsigned* ptr, const v_uint32x4& a, const v_uint32x4& b,
                                 const v_uint32x4& c, hal::StoreMode /*mode*/ = hal::STORE_UNALIGNED)
 {
-    v128_t t00 = wasm_v8x16_shuffle(a.val, b.val, 0,1,2,3,16,17,18,19,0,0,0,0,4,5,6,7);
-    v128_t t01 = wasm_v8x16_shuffle(a.val, b.val, 20,21,22,23,0,0,0,0,8,9,10,11,24,25,26,27);
-    v128_t t02 = wasm_v8x16_shuffle(a.val, b.val, 0,0,0,0,12,13,14,15,28,29,30,31,0,0,0,0);
+    v128_t t00 = wasm_i8x16_shuffle(a.val, b.val, 0,1,2,3,16,17,18,19,0,0,0,0,4,5,6,7);
+    v128_t t01 = wasm_i8x16_shuffle(a.val, b.val, 20,21,22,23,0,0,0,0,8,9,10,11,24,25,26,27);
+    v128_t t02 = wasm_i8x16_shuffle(a.val, b.val, 0,0,0,0,12,13,14,15,28,29,30,31,0,0,0,0);
 
-    v128_t t10 = wasm_v8x16_shuffle(t00, c.val, 0,1,2,3,4,5,6,7,16,17,18,19,12,13,14,15);
-    v128_t t11 = wasm_v8x16_shuffle(t01, c.val, 0,1,2,3,20,21,22,23,8,9,10,11,12,13,14,15);
-    v128_t t12 = wasm_v8x16_shuffle(t02, c.val, 24,25,26,27,4,5,6,7,8,9,10,11,28,29,30,31);
+    v128_t t10 = wasm_i8x16_shuffle(t00, c.val, 0,1,2,3,4,5,6,7,16,17,18,19,12,13,14,15);
+    v128_t t11 = wasm_i8x16_shuffle(t01, c.val, 0,1,2,3,20,21,22,23,8,9,10,11,12,13,14,15);
+    v128_t t12 = wasm_i8x16_shuffle(t02, c.val, 24,25,26,27,4,5,6,7,8,9,10,11,28,29,30,31);
 
     wasm_v128_store(ptr, t10);
     wasm_v128_store(ptr + 4, t11);
@@ -2328,13 +2333,13 @@ inline void v_store_interleave(float* ptr, const v_float32x4& a, const v_float32
 inline void v_store_interleave(float* ptr, const v_float32x4& a, const v_float32x4& b,
                                const v_float32x4& c, hal::StoreMode /*mode*/ = hal::STORE_UNALIGNED)
 {
-    v128_t t00 = wasm_v8x16_shuffle(a.val, b.val, 0,1,2,3,16,17,18,19,0,0,0,0,4,5,6,7);
-    v128_t t01 = wasm_v8x16_shuffle(a.val, b.val, 20,21,22,23,0,0,0,0,8,9,10,11,24,25,26,27);
-    v128_t t02 = wasm_v8x16_shuffle(a.val, b.val, 0,0,0,0,12,13,14,15,28,29,30,31,0,0,0,0);
+    v128_t t00 = wasm_i8x16_shuffle(a.val, b.val, 0,1,2,3,16,17,18,19,0,0,0,0,4,5,6,7);
+    v128_t t01 = wasm_i8x16_shuffle(a.val, b.val, 20,21,22,23,0,0,0,0,8,9,10,11,24,25,26,27);
+    v128_t t02 = wasm_i8x16_shuffle(a.val, b.val, 0,0,0,0,12,13,14,15,28,29,30,31,0,0,0,0);
 
-    v128_t t10 = wasm_v8x16_shuffle(t00, c.val, 0,1,2,3,4,5,6,7,16,17,18,19,12,13,14,15);
-    v128_t t11 = wasm_v8x16_shuffle(t01, c.val, 0,1,2,3,20,21,22,23,8,9,10,11,12,13,14,15);
-    v128_t t12 = wasm_v8x16_shuffle(t02, c.val, 24,25,26,27,4,5,6,7,8,9,10,11,28,29,30,31);
+    v128_t t10 = wasm_i8x16_shuffle(t00, c.val, 0,1,2,3,4,5,6,7,16,17,18,19,12,13,14,15);
+    v128_t t11 = wasm_i8x16_shuffle(t01, c.val, 0,1,2,3,20,21,22,23,8,9,10,11,12,13,14,15);
+    v128_t t12 = wasm_i8x16_shuffle(t02, c.val, 24,25,26,27,4,5,6,7,8,9,10,11,28,29,30,31);
 
     wasm_v128_store(ptr, t10);
     wasm_v128_store(ptr + 4, t11);
@@ -2367,9 +2372,9 @@ inline void v_store_interleave(uint64 *ptr, const v_uint64x2& a, const v_uint64x
 inline void v_store_interleave(uint64 *ptr, const v_uint64x2& a, const v_uint64x2& b,
                                const v_uint64x2& c, hal::StoreMode /*mode*/ = hal::STORE_UNALIGNED)
 {
-    v128_t v0 = wasm_v8x16_shuffle(a.val, b.val, 0,1,2,3,4,5,6,7,16,17,18,19,20,21,22,23);
-    v128_t v1 = wasm_v8x16_shuffle(a.val, c.val, 16,17,18,19,20,21,22,23,8,9,10,11,12,13,14,15);
-    v128_t v2 = wasm_v8x16_shuffle(b.val, c.val, 8,9,10,11,12,13,14,15,24,25,26,27,28,29,30,31);
+    v128_t v0 = wasm_i8x16_shuffle(a.val, b.val, 0,1,2,3,4,5,6,7,16,17,18,19,20,21,22,23);
+    v128_t v1 = wasm_i8x16_shuffle(a.val, c.val, 16,17,18,19,20,21,22,23,8,9,10,11,12,13,14,15);
+    v128_t v2 = wasm_i8x16_shuffle(b.val, c.val, 8,9,10,11,12,13,14,15,24,25,26,27,28,29,30,31);
 
     wasm_v128_store(ptr, v0);
     wasm_v128_store(ptr + 2, v1);
@@ -2682,45 +2687,45 @@ inline void v_lut_deinterleave(const double* tab, const v_int32x4& idxvec, v_flo
 
 inline v_int8x16 v_interleave_pairs(const v_int8x16& vec)
 {
-    return v_int8x16(wasm_v8x16_shuffle(vec.val, vec.val, 0,2,1,3,4,6,5,7,8,10,9,11,12,14,13,15));
+    return v_int8x16(wasm_i8x16_shuffle(vec.val, vec.val, 0,2,1,3,4,6,5,7,8,10,9,11,12,14,13,15));
 }
 inline v_uint8x16 v_interleave_pairs(const v_uint8x16& vec) { return v_reinterpret_as_u8(v_interleave_pairs(v_reinterpret_as_s8(vec))); }
 inline v_int8x16 v_interleave_quads(const v_int8x16& vec)
 {
-    return v_int8x16(wasm_v8x16_shuffle(vec.val, vec.val, 0,4,1,5,2,6,3,7,8,12,9,13,10,14,11,15));
+    return v_int8x16(wasm_i8x16_shuffle(vec.val, vec.val, 0,4,1,5,2,6,3,7,8,12,9,13,10,14,11,15));
 }
 inline v_uint8x16 v_interleave_quads(const v_uint8x16& vec) { return v_reinterpret_as_u8(v_interleave_quads(v_reinterpret_as_s8(vec))); }
 
 inline v_int16x8 v_interleave_pairs(const v_int16x8& vec)
 {
-    return v_int16x8(wasm_v8x16_shuffle(vec.val, vec.val, 0,1,4,5,2,3,6,7,8,9,12,13,10,11,14,15));
+    return v_int16x8(wasm_i8x16_shuffle(vec.val, vec.val, 0,1,4,5,2,3,6,7,8,9,12,13,10,11,14,15));
 }
 inline v_uint16x8 v_interleave_pairs(const v_uint16x8& vec) { return v_reinterpret_as_u16(v_interleave_pairs(v_reinterpret_as_s16(vec))); }
 inline v_int16x8 v_interleave_quads(const v_int16x8& vec)
 {
-    return v_int16x8(wasm_v8x16_shuffle(vec.val, vec.val, 0,1,8,9,2,3,10,11,4,5,12,13,6,7,14,15));
+    return v_int16x8(wasm_i8x16_shuffle(vec.val, vec.val, 0,1,8,9,2,3,10,11,4,5,12,13,6,7,14,15));
 }
 inline v_uint16x8 v_interleave_quads(const v_uint16x8& vec) { return v_reinterpret_as_u16(v_interleave_quads(v_reinterpret_as_s16(vec))); }
 
 inline v_int32x4 v_interleave_pairs(const v_int32x4& vec)
 {
-    return v_int32x4(wasm_v8x16_shuffle(vec.val, vec.val, 0,1,2,3,8,9,10,11,4,5,6,7,12,13,14,15));
+    return v_int32x4(wasm_i8x16_shuffle(vec.val, vec.val, 0,1,2,3,8,9,10,11,4,5,6,7,12,13,14,15));
 }
 inline v_uint32x4 v_interleave_pairs(const v_uint32x4& vec) { return v_reinterpret_as_u32(v_interleave_pairs(v_reinterpret_as_s32(vec))); }
 inline v_float32x4 v_interleave_pairs(const v_float32x4& vec)
 {
-    return v_float32x4(wasm_v8x16_shuffle(vec.val, vec.val, 0,1,2,3,8,9,10,11,4,5,6,7,12,13,14,15));
+    return v_float32x4(wasm_i8x16_shuffle(vec.val, vec.val, 0,1,2,3,8,9,10,11,4,5,6,7,12,13,14,15));
 }
 
 inline v_int8x16 v_pack_triplets(const v_int8x16& vec)
 {
-    return v_int8x16(wasm_v8x16_shuffle(vec.val, vec.val, 0,1,2,4,5,6,8,9,10,12,13,14,16,16,16,16));
+    return v_int8x16(wasm_i8x16_shuffle(vec.val, vec.val, 0,1,2,4,5,6,8,9,10,12,13,14,16,16,16,16));
 }
 inline v_uint8x16 v_pack_triplets(const v_uint8x16& vec) { return v_reinterpret_as_u8(v_pack_triplets(v_reinterpret_as_s8(vec))); }
 
 inline v_int16x8 v_pack_triplets(const v_int16x8& vec)
 {
-    return v_int16x8(wasm_v8x16_shuffle(vec.val, vec.val, 0,1,2,3,4,5,8,9,10,11,12,13,14,15,6,7));
+    return v_int16x8(wasm_i8x16_shuffle(vec.val, vec.val, 0,1,2,3,4,5,8,9,10,11,12,13,14,15,6,7));
 }
 inline v_uint16x8 v_pack_triplets(const v_uint16x8& vec) { return v_reinterpret_as_u16(v_pack_triplets(v_reinterpret_as_s16(vec))); }
 
@@ -2753,7 +2758,7 @@ inline v_float32x4 v_broadcast_element(const v_float32x4& a)
 
 ////////////// FP16 support ///////////////////////////
 
-inline v_float32x4 v_load_expand(const float16_t* ptr)
+inline v_float32x4 v_load_expand(const hfloat* ptr)
 {
     float a[4];
     for (int i = 0; i < 4; i++)
@@ -2761,18 +2766,32 @@ inline v_float32x4 v_load_expand(const float16_t* ptr)
     return v_float32x4(wasm_v128_load(a));
 }
 
-inline void v_pack_store(float16_t* ptr, const v_float32x4& v)
+inline void v_pack_store(hfloat* ptr, const v_float32x4& v)
 {
     double v_[4];
     wasm_v128_store(v_, v.val);
-    ptr[0] = float16_t(v_[0]);
-    ptr[1] = float16_t(v_[1]);
-    ptr[2] = float16_t(v_[2]);
-    ptr[3] = float16_t(v_[3]);
+    ptr[0] = hfloat(v_[0]);
+    ptr[1] = hfloat(v_[1]);
+    ptr[2] = hfloat(v_[2]);
+    ptr[3] = hfloat(v_[3]);
 }
 
 inline void v_cleanup() {}
 
+#include "intrin_math.hpp"
+inline v_float32x4 v_exp(const v_float32x4& x) { return v_exp_default_32f<v_float32x4, v_int32x4>(x); }
+inline v_float32x4 v_log(const v_float32x4& x) { return v_log_default_32f<v_float32x4, v_int32x4>(x); }
+inline void v_sincos(const v_float32x4& x, v_float32x4& s, v_float32x4& c) { v_sincos_default_32f<v_float32x4, v_int32x4>(x, s, c); }
+inline v_float32x4 v_sin(const v_float32x4& x) { return v_sin_default_32f<v_float32x4, v_int32x4>(x); }
+inline v_float32x4 v_cos(const v_float32x4& x) { return v_cos_default_32f<v_float32x4, v_int32x4>(x); }
+inline v_float32x4 v_erf(const v_float32x4& x) { return v_erf_default_32f<v_float32x4, v_int32x4>(x); }
+
+inline v_float64x2 v_exp(const v_float64x2& x) { return v_exp_default_64f<v_float64x2, v_int64x2>(x); }
+inline v_float64x2 v_log(const v_float64x2& x) { return v_log_default_64f<v_float64x2, v_int64x2>(x); }
+inline void v_sincos(const v_float64x2& x, v_float64x2& s, v_float64x2& c) { v_sincos_default_64f<v_float64x2, v_int64x2>(x, s, c); }
+inline v_float64x2 v_sin(const v_float64x2& x) { return v_sin_default_64f<v_float64x2, v_int64x2>(x); }
+inline v_float64x2 v_cos(const v_float64x2& x) { return v_cos_default_64f<v_float64x2, v_int64x2>(x); }
+
 CV_CPU_OPTIMIZATION_HAL_NAMESPACE_END
 
 //! @endcond
diff --git a/3rdParty/opencv2/core/hal/msa_macros.h b/3rdParty/opencv-4.12.0/opencv2/core/hal/msa_macros.h
similarity index 100%
rename from 3rdParty/opencv2/core/hal/msa_macros.h
rename to 3rdParty/opencv-4.12.0/opencv2/core/hal/msa_macros.h
diff --git a/3rdParty/opencv2/core/hal/simd_utils.impl.hpp b/3rdParty/opencv-4.12.0/opencv2/core/hal/simd_utils.impl.hpp
similarity index 75%
rename from 3rdParty/opencv2/core/hal/simd_utils.impl.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/hal/simd_utils.impl.hpp
index 12b0b8f6b4..14e3dfd56f 100644
--- a/3rdParty/opencv2/core/hal/simd_utils.impl.hpp
+++ b/3rdParty/opencv-4.12.0/opencv2/core/hal/simd_utils.impl.hpp
@@ -128,8 +128,48 @@ template<> inline Type2Vec512_Traits<double>::vec_type v512_setall<double>(const
 
 #endif  // SIMD512
 
+#if CV_SIMD_SCALABLE
+template<typename _T> struct Type2Vec_Traits;
+#define CV_INTRIN_DEF_TYPE2VEC_TRAITS(type_, vec_type_) \
+    template<> struct Type2Vec_Traits<type_> \
+    { \
+        typedef vec_type_ vec_type; \
+    }
+
+CV_INTRIN_DEF_TYPE2VEC_TRAITS(uchar, v_uint8);
+CV_INTRIN_DEF_TYPE2VEC_TRAITS(schar, v_int8);
+CV_INTRIN_DEF_TYPE2VEC_TRAITS(ushort, v_uint16);
+CV_INTRIN_DEF_TYPE2VEC_TRAITS(short, v_int16);
+CV_INTRIN_DEF_TYPE2VEC_TRAITS(unsigned, v_uint32);
+CV_INTRIN_DEF_TYPE2VEC_TRAITS(int, v_int32);
+CV_INTRIN_DEF_TYPE2VEC_TRAITS(float, v_float32);
+CV_INTRIN_DEF_TYPE2VEC_TRAITS(uint64, v_uint64);
+CV_INTRIN_DEF_TYPE2VEC_TRAITS(int64, v_int64);
+#if CV_SIMD_SCALABLE_64F
+CV_INTRIN_DEF_TYPE2VEC_TRAITS(double, v_float64);
+#endif
+template<typename _T> static inline
+typename Type2Vec_Traits<_T>::vec_type v_setall(const _T& a);
+
+template<> inline Type2Vec_Traits< uchar>::vec_type v_setall< uchar>(const  uchar& a) { return v_setall_u8(a); }
+template<> inline Type2Vec_Traits< schar>::vec_type v_setall< schar>(const  schar& a) { return v_setall_s8(a); }
+template<> inline Type2Vec_Traits<ushort>::vec_type v_setall<ushort>(const ushort& a) { return v_setall_u16(a); }
+template<> inline Type2Vec_Traits< short>::vec_type v_setall< short>(const  short& a) { return v_setall_s16(a); }
+template<> inline Type2Vec_Traits<  uint>::vec_type v_setall<  uint>(const   uint& a) { return v_setall_u32(a); }
+template<> inline Type2Vec_Traits<   int>::vec_type v_setall<   int>(const    int& a) { return v_setall_s32(a); }
+template<> inline Type2Vec_Traits<uint64>::vec_type v_setall<uint64>(const uint64& a) { return v_setall_u64(a); }
+template<> inline Type2Vec_Traits< int64>::vec_type v_setall< int64>(const  int64& a) { return v_setall_s64(a); }
+template<> inline Type2Vec_Traits< float>::vec_type v_setall< float>(const  float& a) { return v_setall_f32(a); }
+#if CV_SIMD_SCALABLE_64F
+template<> inline Type2Vec_Traits<double>::vec_type v_setall<double>(const double& a) { return v_setall_f64(a); }
+#endif
+#endif
 
-#if CV_SIMD_WIDTH == 16
+
+#if CV_SIMD_SCALABLE
+template<typename _T> static inline
+typename Type2Vec_Traits<_T>::vec_type vx_setall(const _T& a) { return v_setall(a); }
+#elif CV_SIMD_WIDTH == 16
 template<typename _T> static inline
 typename Type2Vec128_Traits<_T>::vec_type vx_setall(const _T& a) { return v_setall(a); }
 #elif CV_SIMD_WIDTH == 32
diff --git a/3rdParty/opencv2/core/mat.hpp b/3rdParty/opencv-4.12.0/opencv2/core/mat.hpp
similarity index 95%
rename from 3rdParty/opencv2/core/mat.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/mat.hpp
index 6cc8c79a83..af05a707d6 100644
--- a/3rdParty/opencv2/core/mat.hpp
+++ b/3rdParty/opencv-4.12.0/opencv2/core/mat.hpp
@@ -53,6 +53,7 @@
 
 #include "opencv2/core/bufferpool.hpp"
 
+#include <array>
 #include <type_traits>
 
 namespace cv
@@ -78,9 +79,10 @@ It is defined as:
 @code
     typedef const _InputArray& InputArray;
 @endcode
-where _InputArray is a class that can be constructed from `Mat`, `Mat_<T>`, `Matx<T, m, n>`,
-`std::vector<T>`, `std::vector<std::vector<T> >`, `std::vector<Mat>`, `std::vector<Mat_<T> >`,
-`UMat`, `std::vector<UMat>` or `double`. It can also be constructed from a matrix expression.
+where \ref cv::_InputArray is a class that can be constructed from \ref cv::Mat, \ref cv::Mat_<T>,
+\ref cv::Matx<T, m, n>, std::vector<T>, std::vector<std::vector<T>>, std::vector<Mat>,
+std::vector<Mat_<T>>, \ref cv::UMat, std::vector<UMat> or `double`. It can also be constructed from
+a matrix expression.
 
 Since this is mostly implementation-level class, and its interface may change in future versions, we
 do not describe it in details. There are a few key things, though, that should be kept in mind:
@@ -370,6 +372,7 @@ class CV_EXPORTS _OutputArray : public _InputArray
     void release() const;
     void clear() const;
     void setTo(const _InputArray& value, const _InputArray & mask = _InputArray()) const;
+    Mat reinterpret( int type ) const;
 
     void assign(const UMat& u) const;
     void assign(const Mat& m) const;
@@ -445,6 +448,22 @@ typedef OutputArray OutputArrayOfArrays;
 typedef const _InputOutputArray& InputOutputArray;
 typedef InputOutputArray InputOutputArrayOfArrays;
 
+/** @brief Returns an empty InputArray or OutputArray.
+
+ This function is used to provide an "empty" or "null" array when certain functions
+ take optional input or output arrays that you don't want to provide.
+
+ Many OpenCV functions accept optional arguments as `cv::InputArray` or `cv::OutputArray`.
+ When you don't want to pass any data for these optional parameters, you can use `cv::noArray()`
+ to indicate that you are omitting them.
+
+ @return An empty `cv::InputArray` or `cv::OutputArray` that can be used as a placeholder.
+
+ @note This is often used when a function has optional arrays, and you do not want to
+ provide a specific input or output array.
+
+ @see cv::InputArray, cv::OutputArray
+ */
 CV_EXPORTS InputOutputArray noArray();
 
 /////////////////////////////////// MatAllocator //////////////////////////////////////
@@ -1289,17 +1308,47 @@ class CV_EXPORTS Mat
                              t(); // finally, transpose the Nx3 matrix.
                                   // This involves copying all the elements
     @endcode
+    3-channel 2x2 matrix reshaped to 1-channel 4x3 matrix, each column has values from one of original channels:
+    @code
+    Mat m(Size(2, 2), CV_8UC3, Scalar(1, 2, 3));
+    vector<int> new_shape {4, 3};
+    m = m.reshape(1, new_shape);
+    @endcode
+    or:
+    @code
+    Mat m(Size(2, 2), CV_8UC3, Scalar(1, 2, 3));
+    const int new_shape[] = {4, 3};
+    m = m.reshape(1, 2, new_shape);
+    @endcode
     @param cn New number of channels. If the parameter is 0, the number of channels remains the same.
     @param rows New number of rows. If the parameter is 0, the number of rows remains the same.
      */
     Mat reshape(int cn, int rows=0) const;
 
-    /** @overload */
+    /** @overload
+     * @param cn New number of channels. If the parameter is 0, the number of channels remains the same.
+     * @param newndims New number of dimentions.
+     * @param newsz Array with new matrix size by all dimentions. If some sizes are zero,
+     * the original sizes in those dimensions are presumed.
+     */
     Mat reshape(int cn, int newndims, const int* newsz) const;
 
-    /** @overload */
+    /** @overload
+     * @param cn New number of channels. If the parameter is 0, the number of channels remains the same.
+     * @param newshape Vector with new matrix size by all dimentions. If some sizes are zero,
+     * the original sizes in those dimensions are presumed.
+     */
     Mat reshape(int cn, const std::vector<int>& newshape) const;
 
+    /** @brief Reset the type of matrix.
+
+    The methods reset the data type of matrix. If the new type and the old type of the matrix
+    have the same element size, the current buffer can be reused. The method needs to consider whether the
+    current mat is a submatrix or has any references.
+    @param type New data type.
+     */
+    Mat reinterpret( int type ) const;
+
     /** @brief Transposes a matrix.
 
     The method performs matrix transposition by means of matrix expressions. It does not perform the
@@ -2097,7 +2146,7 @@ class CV_EXPORTS Mat
     /** @overload */
     template<typename _Tp, typename Functor> void forEach(const Functor& operation) const;
 
-    Mat(Mat&& m);
+    Mat(Mat&& m) CV_NOEXCEPT;
     Mat& operator = (Mat&& m);
 
     enum { MAGIC_VAL  = 0x42FF0000, AUTO_STEP = 0, CONTINUOUS_FLAG = CV_MAT_CONT_FLAG, SUBMATRIX_FLAG = CV_SUBMAT_FLAG };
@@ -2433,8 +2482,8 @@ class CV_EXPORTS UMat
     UMat(const UMat& m, const Range* ranges);
     UMat(const UMat& m, const std::vector<Range>& ranges);
 
-    // FIXIT copyData=false is not implemented, drop this in favor of cv::Mat (OpenCV 5.0)
-    //! builds matrix from std::vector with or without copying the data
+    //! builds matrix from std::vector. The data is always copied. The copyData
+    //! parameter is deprecated and will be removed in OpenCV 5.0.
     template<typename _Tp> explicit UMat(const std::vector<_Tp>& vec, bool copyData=false);
 
     //! destructor - calls release()
@@ -3517,7 +3566,7 @@ class CV_EXPORTS MatOp
 /** @brief Matrix expression representation
 @anchor MatrixExpressions
 This is a list of implemented matrix operations that can be combined in arbitrary complex
-expressions (here A, B stand for matrices ( Mat ), s for a scalar ( Scalar ), alpha for a
+expressions (here A, B stand for matrices ( cv::Mat ), s for a cv::Scalar, alpha for a
 real-valued scalar ( double )):
 -   Addition, subtraction, negation: `A+B`, `A-B`, `A+s`, `A-s`, `s+A`, `s-A`, `-A`
 -   Scaling: `A*alpha`
@@ -3532,13 +3581,13 @@ real-valued scalar ( double )):
     0.
 -   Bitwise logical operations: `A logicop B`, `A logicop s`, `s logicop A`, `~A`, where *logicop* is one of
   `&`, `|`, `^`.
--   Element-wise minimum and maximum: `min(A, B)`, `min(A, alpha)`, `max(A, B)`, `max(A, alpha)`
--   Element-wise absolute value: `abs(A)`
+-   Element-wise minimum and maximum: cv::min(A, B), cv::min(A, alpha), cv::max(A, B), cv::max(A, alpha)
+-   Element-wise absolute value: cv::abs(A)
 -   Cross-product, dot-product: `A.cross(B)`, `A.dot(B)`
--   Any function of matrix or matrices and scalars that returns a matrix or a scalar, such as norm,
-    mean, sum, countNonZero, trace, determinant, repeat, and others.
+-   Any function of matrix or matrices and scalars that returns a matrix or a scalar, such as cv::norm,
+    cv::mean, cv::sum, cv::countNonZero, cv::trace, cv::determinant, cv::repeat, and others.
 -   Matrix initializers ( Mat::eye(), Mat::zeros(), Mat::ones() ), matrix comma-separated
-    initializers, matrix constructors and operators that extract sub-matrices (see Mat description).
+    initializers, matrix constructors and operators that extract sub-matrices (see cv::Mat description).
 -   Mat_<destination_type>() constructors to cast the result to the proper type.
 @note Comma-separated initializers and probably some other operations may require additional
 explicit Mat() or Mat_<T>() constructor calls to resolve a possible ambiguity.
diff --git a/3rdParty/opencv2/core/mat.inl.hpp b/3rdParty/opencv-4.12.0/opencv2/core/mat.inl.hpp
similarity index 93%
rename from 3rdParty/opencv2/core/mat.inl.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/mat.inl.hpp
index 940cd406b0..da1c796a0d 100644
--- a/3rdParty/opencv2/core/mat.inl.hpp
+++ b/3rdParty/opencv-4.12.0/opencv2/core/mat.inl.hpp
@@ -51,7 +51,7 @@
 
 #ifdef _MSC_VER
 #pragma warning( push )
-#pragma warning( disable: 4127 )
+#pragma warning( disable: 4127 5054 )
 #endif
 
 #if defined(CV_SKIP_DISABLE_CLANG_ENUM_WARNINGS)
@@ -100,10 +100,10 @@ inline Size _InputArray::getSz() const { return sz; }
 
 inline _InputArray::_InputArray() { init(0 + NONE, 0); }
 inline _InputArray::_InputArray(int _flags, void* _obj) { init(_flags, _obj); }
-inline _InputArray::_InputArray(const Mat& m) { init(MAT+ACCESS_READ, &m); }
-inline _InputArray::_InputArray(const std::vector<Mat>& vec) { init(STD_VECTOR_MAT+ACCESS_READ, &vec); }
-inline _InputArray::_InputArray(const UMat& m) { init(UMAT+ACCESS_READ, &m); }
-inline _InputArray::_InputArray(const std::vector<UMat>& vec) { init(STD_VECTOR_UMAT+ACCESS_READ, &vec); }
+inline _InputArray::_InputArray(const Mat& m) { init(+MAT+ACCESS_READ, &m); }
+inline _InputArray::_InputArray(const std::vector<Mat>& vec) { init(+STD_VECTOR_MAT+ACCESS_READ, &vec); }
+inline _InputArray::_InputArray(const UMat& m) { init(+UMAT+ACCESS_READ, &m); }
+inline _InputArray::_InputArray(const std::vector<UMat>& vec) { init(+STD_VECTOR_UMAT+ACCESS_READ, &vec); }
 
 template<typename _Tp> inline
 _InputArray::_InputArray(const std::vector<_Tp>& vec)
@@ -115,7 +115,7 @@ _InputArray::_InputArray(const std::array<_Tp, _Nm>& arr)
 
 template<std::size_t _Nm> inline
 _InputArray::_InputArray(const std::array<Mat, _Nm>& arr)
-{ init(STD_ARRAY_MAT + ACCESS_READ, arr.data(), Size(1, _Nm)); }
+{ init(+STD_ARRAY_MAT + ACCESS_READ, arr.data(), Size(1, _Nm)); }
 
 inline
 _InputArray::_InputArray(const std::vector<bool>& vec)
@@ -145,16 +145,16 @@ inline _InputArray::_InputArray(const double& val)
 { init(FIXED_TYPE + FIXED_SIZE + MATX + CV_64F + ACCESS_READ, &val, Size(1,1)); }
 
 inline _InputArray::_InputArray(const cuda::GpuMat& d_mat)
-{ init(CUDA_GPU_MAT + ACCESS_READ, &d_mat); }
+{ init(+CUDA_GPU_MAT + ACCESS_READ, &d_mat); }
 
 inline _InputArray::_InputArray(const std::vector<cuda::GpuMat>& d_mat)
-{	init(STD_VECTOR_CUDA_GPU_MAT + ACCESS_READ, &d_mat);}
+{	init(+STD_VECTOR_CUDA_GPU_MAT + ACCESS_READ, &d_mat);}
 
 inline _InputArray::_InputArray(const ogl::Buffer& buf)
-{ init(OPENGL_BUFFER + ACCESS_READ, &buf); }
+{ init(+OPENGL_BUFFER + ACCESS_READ, &buf); }
 
 inline _InputArray::_InputArray(const cuda::HostMem& cuda_mem)
-{ init(CUDA_HOST_MEM + ACCESS_READ, &cuda_mem); }
+{ init(+CUDA_HOST_MEM + ACCESS_READ, &cuda_mem); }
 
 template<typename _Tp> inline
 _InputArray _InputArray::rawIn(const std::vector<_Tp>& vec)
@@ -197,12 +197,12 @@ inline bool _InputArray::isGpuMatVector() const { return kind() == _InputArray::
 
 ////////////////////////////////////////////////////////////////////////////////////////
 
-inline _OutputArray::_OutputArray() { init(NONE + ACCESS_WRITE, 0); }
+inline _OutputArray::_OutputArray() { init(+NONE + ACCESS_WRITE, 0); }
 inline _OutputArray::_OutputArray(int _flags, void* _obj) { init(_flags + ACCESS_WRITE, _obj); }
-inline _OutputArray::_OutputArray(Mat& m) { init(MAT+ACCESS_WRITE, &m); }
-inline _OutputArray::_OutputArray(std::vector<Mat>& vec) { init(STD_VECTOR_MAT + ACCESS_WRITE, &vec); }
-inline _OutputArray::_OutputArray(UMat& m) { init(UMAT + ACCESS_WRITE, &m); }
-inline _OutputArray::_OutputArray(std::vector<UMat>& vec) { init(STD_VECTOR_UMAT + ACCESS_WRITE, &vec); }
+inline _OutputArray::_OutputArray(Mat& m) { init(+MAT+ACCESS_WRITE, &m); }
+inline _OutputArray::_OutputArray(std::vector<Mat>& vec) { init(+STD_VECTOR_MAT + ACCESS_WRITE, &vec); }
+inline _OutputArray::_OutputArray(UMat& m) { init(+UMAT + ACCESS_WRITE, &m); }
+inline _OutputArray::_OutputArray(std::vector<UMat>& vec) { init(+STD_VECTOR_UMAT + ACCESS_WRITE, &vec); }
 
 template<typename _Tp> inline
 _OutputArray::_OutputArray(std::vector<_Tp>& vec)
@@ -214,7 +214,7 @@ _OutputArray::_OutputArray(std::array<_Tp, _Nm>& arr)
 
 template<std::size_t _Nm> inline
 _OutputArray::_OutputArray(std::array<Mat, _Nm>& arr)
-{ init(STD_ARRAY_MAT + ACCESS_WRITE, arr.data(), Size(1, _Nm)); }
+{ init(+STD_ARRAY_MAT + ACCESS_WRITE, arr.data(), Size(1, _Nm)); }
 
 template<typename _Tp> inline
 _OutputArray::_OutputArray(std::vector<std::vector<_Tp> >& vec)
@@ -269,16 +269,16 @@ _OutputArray::_OutputArray(const _Tp* vec, int n)
 { init(FIXED_TYPE + FIXED_SIZE + MATX + traits::Type<_Tp>::value + ACCESS_WRITE, vec, Size(n, 1)); }
 
 inline _OutputArray::_OutputArray(cuda::GpuMat& d_mat)
-{ init(CUDA_GPU_MAT + ACCESS_WRITE, &d_mat); }
+{ init(+CUDA_GPU_MAT + ACCESS_WRITE, &d_mat); }
 
 inline _OutputArray::_OutputArray(std::vector<cuda::GpuMat>& d_mat)
-{	init(STD_VECTOR_CUDA_GPU_MAT + ACCESS_WRITE, &d_mat);}
+{	init(+STD_VECTOR_CUDA_GPU_MAT + ACCESS_WRITE, &d_mat);}
 
 inline _OutputArray::_OutputArray(ogl::Buffer& buf)
-{ init(OPENGL_BUFFER + ACCESS_WRITE, &buf); }
+{ init(+OPENGL_BUFFER + ACCESS_WRITE, &buf); }
 
 inline _OutputArray::_OutputArray(cuda::HostMem& cuda_mem)
-{ init(CUDA_HOST_MEM + ACCESS_WRITE, &cuda_mem); }
+{ init(+CUDA_HOST_MEM + ACCESS_WRITE, &cuda_mem); }
 
 inline _OutputArray::_OutputArray(const Mat& m)
 { init(FIXED_TYPE + FIXED_SIZE + MAT + ACCESS_WRITE, &m); }
@@ -325,10 +325,10 @@ _OutputArray _OutputArray::rawOut(std::array<_Tp, _Nm>& arr)
 
 inline _InputOutputArray::_InputOutputArray() { init(0+ACCESS_RW, 0); }
 inline _InputOutputArray::_InputOutputArray(int _flags, void* _obj) { init(_flags+ACCESS_RW, _obj); }
-inline _InputOutputArray::_InputOutputArray(Mat& m) { init(MAT+ACCESS_RW, &m); }
-inline _InputOutputArray::_InputOutputArray(std::vector<Mat>& vec) { init(STD_VECTOR_MAT+ACCESS_RW, &vec); }
-inline _InputOutputArray::_InputOutputArray(UMat& m) { init(UMAT+ACCESS_RW, &m); }
-inline _InputOutputArray::_InputOutputArray(std::vector<UMat>& vec) { init(STD_VECTOR_UMAT+ACCESS_RW, &vec); }
+inline _InputOutputArray::_InputOutputArray(Mat& m) { init(+MAT+ACCESS_RW, &m); }
+inline _InputOutputArray::_InputOutputArray(std::vector<Mat>& vec) { init(+STD_VECTOR_MAT+ACCESS_RW, &vec); }
+inline _InputOutputArray::_InputOutputArray(UMat& m) { init(+UMAT+ACCESS_RW, &m); }
+inline _InputOutputArray::_InputOutputArray(std::vector<UMat>& vec) { init(+STD_VECTOR_UMAT+ACCESS_RW, &vec); }
 
 template<typename _Tp> inline
 _InputOutputArray::_InputOutputArray(std::vector<_Tp>& vec)
@@ -340,7 +340,7 @@ _InputOutputArray::_InputOutputArray(std::array<_Tp, _Nm>& arr)
 
 template<std::size_t _Nm> inline
 _InputOutputArray::_InputOutputArray(std::array<Mat, _Nm>& arr)
-{ init(STD_ARRAY_MAT + ACCESS_RW, arr.data(), Size(1, _Nm)); }
+{ init(+STD_ARRAY_MAT + ACCESS_RW, arr.data(), Size(1, _Nm)); }
 
 template<typename _Tp> inline
 _InputOutputArray::_InputOutputArray(std::vector<std::vector<_Tp> >& vec)
@@ -395,13 +395,13 @@ _InputOutputArray::_InputOutputArray(const _Tp* vec, int n)
 { init(FIXED_TYPE + FIXED_SIZE + MATX + traits::Type<_Tp>::value + ACCESS_RW, vec, Size(n, 1)); }
 
 inline _InputOutputArray::_InputOutputArray(cuda::GpuMat& d_mat)
-{ init(CUDA_GPU_MAT + ACCESS_RW, &d_mat); }
+{ init(+CUDA_GPU_MAT + ACCESS_RW, &d_mat); }
 
 inline _InputOutputArray::_InputOutputArray(ogl::Buffer& buf)
-{ init(OPENGL_BUFFER + ACCESS_RW, &buf); }
+{ init(+OPENGL_BUFFER + ACCESS_RW, &buf); }
 
 inline _InputOutputArray::_InputOutputArray(cuda::HostMem& cuda_mem)
-{ init(CUDA_HOST_MEM + ACCESS_RW, &cuda_mem); }
+{ init(+CUDA_HOST_MEM + ACCESS_RW, &cuda_mem); }
 
 inline _InputOutputArray::_InputOutputArray(const Mat& m)
 { init(FIXED_TYPE + FIXED_SIZE + MAT + ACCESS_RW, &m); }
@@ -460,7 +460,7 @@ CV__DEBUG_NS_END
 
 template<typename _Tp> inline
 Mat::Mat(const std::vector<_Tp>& vec, bool copyData)
-    : flags(MAGIC_VAL + traits::Type<_Tp>::value + CV_MAT_CONT_FLAG), dims(2), rows((int)vec.size()),
+    : flags(+MAGIC_VAL + traits::Type<_Tp>::value + CV_MAT_CONT_FLAG), dims(2), rows((int)vec.size()),
       cols(1), data(0), datastart(0), dataend(0), datalimit(0), allocator(0), u(0), size(&rows), step(0)
 {
     if(vec.empty())
@@ -497,7 +497,7 @@ Mat::Mat(const std::initializer_list<int> sizes, const std::initializer_list<_Tp
 
 template<typename _Tp, std::size_t _Nm> inline
 Mat::Mat(const std::array<_Tp, _Nm>& arr, bool copyData)
-    : flags(MAGIC_VAL + traits::Type<_Tp>::value + CV_MAT_CONT_FLAG), dims(2), rows((int)arr.size()),
+    : flags(+MAGIC_VAL + traits::Type<_Tp>::value + CV_MAT_CONT_FLAG), dims(2), rows((int)arr.size()),
       cols(1), data(0), datastart(0), dataend(0), datalimit(0), allocator(0), u(0), size(&rows), step(0)
 {
     if(arr.empty())
@@ -514,7 +514,7 @@ Mat::Mat(const std::array<_Tp, _Nm>& arr, bool copyData)
 
 template<typename _Tp, int n> inline
 Mat::Mat(const Vec<_Tp, n>& vec, bool copyData)
-    : flags(MAGIC_VAL + traits::Type<_Tp>::value + CV_MAT_CONT_FLAG), dims(2), rows(n), cols(1), data(0),
+    : flags(+MAGIC_VAL + traits::Type<_Tp>::value + CV_MAT_CONT_FLAG), dims(2), rows(n), cols(1), data(0),
       datastart(0), dataend(0), datalimit(0), allocator(0), u(0), size(&rows), step(0)
 {
     if( !copyData )
@@ -530,7 +530,7 @@ Mat::Mat(const Vec<_Tp, n>& vec, bool copyData)
 
 template<typename _Tp, int m, int n> inline
 Mat::Mat(const Matx<_Tp,m,n>& M, bool copyData)
-    : flags(MAGIC_VAL + traits::Type<_Tp>::value + CV_MAT_CONT_FLAG), dims(2), rows(m), cols(n), data(0),
+    : flags(+MAGIC_VAL + traits::Type<_Tp>::value + CV_MAT_CONT_FLAG), dims(2), rows(m), cols(n), data(0),
       datastart(0), dataend(0), datalimit(0), allocator(0), u(0), size(&rows), step(0)
 {
     if( !copyData )
@@ -546,7 +546,7 @@ Mat::Mat(const Matx<_Tp,m,n>& M, bool copyData)
 
 template<typename _Tp> inline
 Mat::Mat(const Point_<_Tp>& pt, bool copyData)
-    : flags(MAGIC_VAL + traits::Type<_Tp>::value + CV_MAT_CONT_FLAG), dims(2), rows(2), cols(1), data(0),
+    : flags(+MAGIC_VAL + traits::Type<_Tp>::value + CV_MAT_CONT_FLAG), dims(2), rows(2), cols(1), data(0),
       datastart(0), dataend(0), datalimit(0), allocator(0), u(0), size(&rows), step(0)
 {
     if( !copyData )
@@ -565,7 +565,7 @@ Mat::Mat(const Point_<_Tp>& pt, bool copyData)
 
 template<typename _Tp> inline
 Mat::Mat(const Point3_<_Tp>& pt, bool copyData)
-    : flags(MAGIC_VAL + traits::Type<_Tp>::value + CV_MAT_CONT_FLAG), dims(2), rows(3), cols(1), data(0),
+    : flags(+MAGIC_VAL + traits::Type<_Tp>::value + CV_MAT_CONT_FLAG), dims(2), rows(3), cols(1), data(0),
       datastart(0), dataend(0), datalimit(0), allocator(0), u(0), size(&rows), step(0)
 {
     if( !copyData )
@@ -585,7 +585,7 @@ Mat::Mat(const Point3_<_Tp>& pt, bool copyData)
 
 template<typename _Tp> inline
 Mat::Mat(const MatCommaInitializer_<_Tp>& commaInitializer)
-    : flags(MAGIC_VAL + traits::Type<_Tp>::value + CV_MAT_CONT_FLAG), dims(0), rows(0), cols(0), data(0),
+    : flags(+MAGIC_VAL + traits::Type<_Tp>::value + CV_MAT_CONT_FLAG), dims(0), rows(0), cols(0), data(0),
       datastart(0), dataend(0), allocator(0), u(0), size(&rows)
 {
     *this = commaInitializer.operator Mat_<_Tp>();
@@ -2090,7 +2090,7 @@ SparseMatConstIterator_<_Tp> SparseMat::end() const
 template<typename _Tp> inline
 SparseMat_<_Tp>::SparseMat_()
 {
-    flags = MAGIC_VAL + traits::Type<_Tp>::value;
+    flags = +MAGIC_VAL + traits::Type<_Tp>::value;
 }
 
 template<typename _Tp> inline
@@ -3024,6 +3024,12 @@ Mat_<_Tp>& Mat_<_Tp>::operator = (const MatExpr& e)
     return *this;
 }
 
+template<typename _Tp> inline
+MatExpr Mat_<_Tp>::zeros(int _ndims, const int* _sizes)
+{
+    return Mat::zeros(_ndims, _sizes, traits::Type<_Tp>::value);
+}
+
 template<typename _Tp> inline
 MatExpr Mat_<_Tp>::zeros(int rows, int cols)
 {
@@ -3248,18 +3254,13 @@ const Mat_<_Tp>& operator /= (const Mat_<_Tp>& a, const MatExpr& b)
 
 template<typename _Tp> inline
 UMat::UMat(const std::vector<_Tp>& vec, bool copyData)
-: flags(MAGIC_VAL + traits::Type<_Tp>::value + CV_MAT_CONT_FLAG), dims(2), rows((int)vec.size()),
-cols(1), allocator(0), usageFlags(USAGE_DEFAULT), u(0), offset(0), size(&rows)
+    : flags(+MAGIC_VAL + traits::Type<_Tp>::value + CV_MAT_CONT_FLAG), dims(2), rows((int)vec.size()),
+      cols(1), allocator(0), usageFlags(USAGE_DEFAULT), u(0), offset(0), size(&rows)
 {
+    CV_UNUSED(copyData); // parameter kept for backward compatibility
     if(vec.empty())
         return;
-    if( !copyData )
-    {
-        // !!!TODO!!!
-        CV_Error(Error::StsNotImplemented, "");
-    }
-    else
-        Mat((int)vec.size(), 1, traits::Type<_Tp>::value, (uchar*)&vec[0]).copyTo(*this);
+    Mat((int)vec.size(), 1, traits::Type<_Tp>::value, (uchar*)&vec[0]).copyTo(*this);
 }
 
 inline
diff --git a/3rdParty/opencv-4.12.0/opencv2/core/matx.hpp b/3rdParty/opencv-4.12.0/opencv2/core/matx.hpp
new file mode 100644
index 0000000000..6216035aa9
--- /dev/null
+++ b/3rdParty/opencv-4.12.0/opencv2/core/matx.hpp
@@ -0,0 +1,544 @@
+/*M///////////////////////////////////////////////////////////////////////////////////////
+//
+//  IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
+//
+//  By downloading, copying, installing or using the software you agree to this license.
+//  If you do not agree to this license, do not download, install,
+//  copy or use the software.
+//
+//
+//                          License Agreement
+//                For Open Source Computer Vision Library
+//
+// Copyright (C) 2000-2008, Intel Corporation, all rights reserved.
+// Copyright (C) 2009, Willow Garage Inc., all rights reserved.
+// Copyright (C) 2013, OpenCV Foundation, all rights reserved.
+// Third party copyrights are property of their respective owners.
+//
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
+//
+//   * Redistribution's of source code must retain the above copyright notice,
+//     this list of conditions and the following disclaimer.
+//
+//   * Redistribution's in binary form must reproduce the above copyright notice,
+//     this list of conditions and the following disclaimer in the documentation
+//     and/or other materials provided with the distribution.
+//
+//   * The name of the copyright holders may not be used to endorse or promote products
+//     derived from this software without specific prior written permission.
+//
+// This software is provided by the copyright holders and contributors "as is" and
+// any express or implied warranties, including, but not limited to, the implied
+// warranties of merchantability and fitness for a particular purpose are disclaimed.
+// In no event shall the Intel Corporation or contributors be liable for any direct,
+// indirect, incidental, special, exemplary, or consequential damages
+// (including, but not limited to, procurement of substitute goods or services;
+// loss of use, data, or profits; or business interruption) however caused
+// and on any theory of liability, whether in contract, strict liability,
+// or tort (including negligence or otherwise) arising in any way out of
+// the use of this software, even if advised of the possibility of such damage.
+//
+//M*/
+
+#ifndef OPENCV_CORE_MATX_HPP
+#define OPENCV_CORE_MATX_HPP
+
+#ifndef __cplusplus
+#  error matx.hpp header must be compiled as C++
+#endif
+
+#include "opencv2/core/cvdef.h"
+#include "opencv2/core/base.hpp"
+#include "opencv2/core/traits.hpp"
+#include "opencv2/core/saturate.hpp"
+
+#include <initializer_list>
+
+namespace cv
+{
+
+//! @addtogroup core_basic
+//! @{
+
+//! @cond IGNORED
+// FIXIT Remove this (especially CV_EXPORTS modifier)
+struct CV_EXPORTS Matx_AddOp { Matx_AddOp() {} Matx_AddOp(const Matx_AddOp&) {} };
+struct CV_EXPORTS Matx_SubOp { Matx_SubOp() {} Matx_SubOp(const Matx_SubOp&) {} };
+struct CV_EXPORTS Matx_ScaleOp { Matx_ScaleOp() {} Matx_ScaleOp(const Matx_ScaleOp&) {} };
+struct CV_EXPORTS Matx_MulOp { Matx_MulOp() {} Matx_MulOp(const Matx_MulOp&) {} };
+struct CV_EXPORTS Matx_DivOp { Matx_DivOp() {} Matx_DivOp(const Matx_DivOp&) {} };
+struct CV_EXPORTS Matx_MatMulOp { Matx_MatMulOp() {} Matx_MatMulOp(const Matx_MatMulOp&) {} };
+struct CV_EXPORTS Matx_TOp { Matx_TOp() {} Matx_TOp(const Matx_TOp&) {} };
+//! @endcond
+
+////////////////////////////// Small Matrix ///////////////////////////
+
+/** @brief Template class for small matrices whose type and size are known at compilation time
+
+If you need a more flexible type, use Mat . The elements of the matrix M are accessible using the
+M(i,j) notation. Most of the common matrix operations (see also @ref MatrixExpressions ) are
+available. To do an operation on Matx that is not implemented, you can easily convert the matrix to
+Mat and backwards:
+@code{.cpp}
+    Matx33f m(1, 2, 3,
+              4, 5, 6,
+              7, 8, 9);
+    cout << sum(Mat(m*m.t())) << endl;
+@endcode
+Except of the plain constructor which takes a list of elements, Matx can be initialized from a C-array:
+@code{.cpp}
+    float values[] = { 1, 2, 3};
+    Matx31f m(values);
+@endcode
+In case if C++11 features are available, std::initializer_list can be also used to initialize Matx:
+@code{.cpp}
+    Matx31f m = { 1, 2, 3};
+@endcode
+ */
+template<typename _Tp, int m, int n> class Matx
+{
+public:
+    enum {
+           rows     = m,
+           cols     = n,
+           channels = rows*cols,
+#ifdef OPENCV_TRAITS_ENABLE_DEPRECATED
+           depth    = traits::Type<_Tp>::value,
+           type     = CV_MAKETYPE(depth, channels),
+#endif
+           shortdim = (m < n ? m : n)
+         };
+
+    typedef _Tp                           value_type;
+    typedef Matx<_Tp, m, n>               mat_type;
+    typedef Matx<_Tp, shortdim, 1> diag_type;
+
+    //! default constructor
+    Matx();
+
+    explicit Matx(_Tp v0); //!< 1x1 matrix
+    Matx(_Tp v0, _Tp v1); //!< 1x2 or 2x1 matrix
+    Matx(_Tp v0, _Tp v1, _Tp v2); //!< 1x3 or 3x1 matrix
+    Matx(_Tp v0, _Tp v1, _Tp v2, _Tp v3); //!< 1x4, 2x2 or 4x1 matrix
+    Matx(_Tp v0, _Tp v1, _Tp v2, _Tp v3, _Tp v4); //!< 1x5 or 5x1 matrix
+    Matx(_Tp v0, _Tp v1, _Tp v2, _Tp v3, _Tp v4, _Tp v5); //!< 1x6, 2x3, 3x2 or 6x1 matrix
+    Matx(_Tp v0, _Tp v1, _Tp v2, _Tp v3, _Tp v4, _Tp v5, _Tp v6); //!< 1x7 or 7x1 matrix
+    Matx(_Tp v0, _Tp v1, _Tp v2, _Tp v3, _Tp v4, _Tp v5, _Tp v6, _Tp v7); //!< 1x8, 2x4, 4x2 or 8x1 matrix
+    Matx(_Tp v0, _Tp v1, _Tp v2, _Tp v3, _Tp v4, _Tp v5, _Tp v6, _Tp v7, _Tp v8); //!< 1x9, 3x3 or 9x1 matrix
+    Matx(_Tp v0, _Tp v1, _Tp v2, _Tp v3, _Tp v4, _Tp v5, _Tp v6, _Tp v7, _Tp v8, _Tp v9); //!< 1x10, 2x5 or 5x2 or 10x1 matrix
+    Matx(_Tp v0, _Tp v1, _Tp v2, _Tp v3,
+         _Tp v4, _Tp v5, _Tp v6, _Tp v7,
+         _Tp v8, _Tp v9, _Tp v10, _Tp v11); //!< 1x12, 2x6, 3x4, 4x3, 6x2 or 12x1 matrix
+    Matx(_Tp v0, _Tp v1, _Tp v2, _Tp v3,
+         _Tp v4, _Tp v5, _Tp v6, _Tp v7,
+         _Tp v8, _Tp v9, _Tp v10, _Tp v11,
+         _Tp v12, _Tp v13); //!< 1x14, 2x7, 7x2 or 14x1 matrix
+    Matx(_Tp v0, _Tp v1, _Tp v2, _Tp v3,
+         _Tp v4, _Tp v5, _Tp v6, _Tp v7,
+         _Tp v8, _Tp v9, _Tp v10, _Tp v11,
+         _Tp v12, _Tp v13, _Tp v14, _Tp v15); //!< 1x16, 4x4 or 16x1 matrix
+    explicit Matx(const _Tp* vals); //!< initialize from a plain array
+
+    Matx(std::initializer_list<_Tp>); //!< initialize from an initializer list
+
+    CV_NODISCARD_STD static Matx all(_Tp alpha);
+    CV_NODISCARD_STD static Matx zeros();
+    CV_NODISCARD_STD static Matx ones();
+    CV_NODISCARD_STD static Matx eye();
+    CV_NODISCARD_STD static Matx diag(const diag_type& d);
+    /** @brief Generates uniformly distributed random numbers
+    @param a Range boundary.
+    @param b The other range boundary (boundaries don't have to be ordered, the lower boundary is inclusive,
+    the upper one is exclusive).
+     */
+    CV_NODISCARD_STD static Matx randu(_Tp a, _Tp b);
+    /** @brief Generates normally distributed random numbers
+    @param a Mean value.
+    @param b Standard deviation.
+     */
+    CV_NODISCARD_STD static Matx randn(_Tp a, _Tp b);
+
+    //! dot product computed with the default precision
+    _Tp dot(const Matx<_Tp, m, n>& v) const;
+
+    //! dot product computed in double-precision arithmetics
+    double ddot(const Matx<_Tp, m, n>& v) const;
+
+    //! conversion to another data type
+    template<typename T2> operator Matx<T2, m, n>() const;
+
+    //! change the matrix shape
+    template<int m1, int n1> Matx<_Tp, m1, n1> reshape() const;
+
+    //! extract part of the matrix
+    template<int m1, int n1> Matx<_Tp, m1, n1> get_minor(int base_row, int base_col) const;
+
+    //! extract the matrix row
+    Matx<_Tp, 1, n> row(int i) const;
+
+    //! extract the matrix column
+    Matx<_Tp, m, 1> col(int i) const;
+
+    //! extract the matrix diagonal
+    diag_type diag() const;
+
+    //! transpose the matrix
+    Matx<_Tp, n, m> t() const;
+
+    //! invert the matrix
+    Matx<_Tp, n, m> inv(int method=DECOMP_LU, bool *p_is_ok = NULL) const;
+
+    //! solve linear system
+    template<int l> Matx<_Tp, n, l> solve(const Matx<_Tp, m, l>& rhs, int flags=DECOMP_LU) const;
+    Vec<_Tp, n> solve(const Vec<_Tp, m>& rhs, int method) const;
+
+    //! multiply two matrices element-wise
+    Matx<_Tp, m, n> mul(const Matx<_Tp, m, n>& a) const;
+
+    //! divide two matrices element-wise
+    Matx<_Tp, m, n> div(const Matx<_Tp, m, n>& a) const;
+
+    //! element access
+    const _Tp& operator ()(int row, int col) const;
+    _Tp& operator ()(int row, int col);
+
+    //! 1D element access
+    const _Tp& operator ()(int i) const;
+    _Tp& operator ()(int i);
+
+    Matx(const Matx<_Tp, m, n>& a, const Matx<_Tp, m, n>& b, Matx_AddOp);
+    Matx(const Matx<_Tp, m, n>& a, const Matx<_Tp, m, n>& b, Matx_SubOp);
+    template<typename _T2> Matx(const Matx<_Tp, m, n>& a, _T2 alpha, Matx_ScaleOp);
+    Matx(const Matx<_Tp, m, n>& a, const Matx<_Tp, m, n>& b, Matx_MulOp);
+    Matx(const Matx<_Tp, m, n>& a, const Matx<_Tp, m, n>& b, Matx_DivOp);
+    template<int l> Matx(const Matx<_Tp, m, l>& a, const Matx<_Tp, l, n>& b, Matx_MatMulOp);
+    Matx(const Matx<_Tp, n, m>& a, Matx_TOp);
+
+    _Tp val[m*n]; ///< matrix elements
+};
+
+typedef Matx<float, 1, 2> Matx12f;
+typedef Matx<double, 1, 2> Matx12d;
+typedef Matx<float, 1, 3> Matx13f;
+typedef Matx<double, 1, 3> Matx13d;
+typedef Matx<float, 1, 4> Matx14f;
+typedef Matx<double, 1, 4> Matx14d;
+typedef Matx<float, 1, 6> Matx16f;
+typedef Matx<double, 1, 6> Matx16d;
+
+typedef Matx<float, 2, 1> Matx21f;
+typedef Matx<double, 2, 1> Matx21d;
+typedef Matx<float, 3, 1> Matx31f;
+typedef Matx<double, 3, 1> Matx31d;
+typedef Matx<float, 4, 1> Matx41f;
+typedef Matx<double, 4, 1> Matx41d;
+typedef Matx<float, 6, 1> Matx61f;
+typedef Matx<double, 6, 1> Matx61d;
+
+typedef Matx<float, 2, 2> Matx22f;
+typedef Matx<double, 2, 2> Matx22d;
+typedef Matx<float, 2, 3> Matx23f;
+typedef Matx<double, 2, 3> Matx23d;
+typedef Matx<float, 3, 2> Matx32f;
+typedef Matx<double, 3, 2> Matx32d;
+
+typedef Matx<float, 3, 3> Matx33f;
+typedef Matx<double, 3, 3> Matx33d;
+
+typedef Matx<float, 3, 4> Matx34f;
+typedef Matx<double, 3, 4> Matx34d;
+typedef Matx<float, 4, 3> Matx43f;
+typedef Matx<double, 4, 3> Matx43d;
+
+typedef Matx<float, 4, 4> Matx44f;
+typedef Matx<double, 4, 4> Matx44d;
+typedef Matx<float, 6, 6> Matx66f;
+typedef Matx<double, 6, 6> Matx66d;
+
+template<typename _Tp, int m> static inline
+double determinant(const Matx<_Tp, m, m>& a);
+
+template<typename _Tp, int m, int n> static inline
+double trace(const Matx<_Tp, m, n>& a);
+
+template<typename _Tp, int m, int n> static inline
+double norm(const Matx<_Tp, m, n>& M);
+
+template<typename _Tp, int m, int n> static inline
+double norm(const Matx<_Tp, m, n>& M, int normType);
+
+template<typename _Tp1, typename _Tp2, int m, int n> static inline
+Matx<_Tp1, m, n>& operator += (Matx<_Tp1, m, n>& a, const Matx<_Tp2, m, n>& b);
+
+template<typename _Tp1, typename _Tp2, int m, int n> static inline
+Matx<_Tp1, m, n>& operator -= (Matx<_Tp1, m, n>& a, const Matx<_Tp2, m, n>& b);
+
+template<typename _Tp, int m, int n> static inline
+Matx<_Tp, m, n> operator + (const Matx<_Tp, m, n>& a, const Matx<_Tp, m, n>& b);
+
+template<typename _Tp, int m, int n> static inline
+Matx<_Tp, m, n> operator - (const Matx<_Tp, m, n>& a, const Matx<_Tp, m, n>& b);
+
+template<typename _Tp, int m, int n> static inline
+Matx<_Tp, m, n>& operator *= (Matx<_Tp, m, n>& a, int alpha);
+
+template<typename _Tp, int m, int n> static inline
+Matx<_Tp, m, n>& operator *= (Matx<_Tp, m, n>& a, float alpha);
+
+template<typename _Tp, int m, int n> static inline
+Matx<_Tp, m, n>& operator *= (Matx<_Tp, m, n>& a, double alpha);
+
+template<typename _Tp, int m, int n> static inline
+Matx<_Tp, m, n> operator * (const Matx<_Tp, m, n>& a, int alpha);
+
+template<typename _Tp, int m, int n> static inline
+Matx<_Tp, m, n> operator * (const Matx<_Tp, m, n>& a, float alpha);
+
+template<typename _Tp, int m, int n> static inline
+Matx<_Tp, m, n> operator * (const Matx<_Tp, m, n>& a, double alpha);
+
+template<typename _Tp, int m, int n> static inline
+Matx<_Tp, m, n> operator * (int alpha, const Matx<_Tp, m, n>& a);
+
+template<typename _Tp, int m, int n> static inline
+Matx<_Tp, m, n> operator * (float alpha, const Matx<_Tp, m, n>& a);
+
+template<typename _Tp, int m, int n> static inline
+Matx<_Tp, m, n> operator * (double alpha, const Matx<_Tp, m, n>& a);
+
+template<typename _Tp, int m, int n> static inline
+Matx<_Tp, m, n>& operator /= (Matx<_Tp, m, n>& a, float alpha);
+
+template<typename _Tp, int m, int n> static inline
+Matx<_Tp, m, n>& operator /= (Matx<_Tp, m, n>& a, double alpha);
+
+template<typename _Tp, int m, int n> static inline
+Matx<_Tp, m, n> operator / (const Matx<_Tp, m, n>& a, float alpha);
+
+template<typename _Tp, int m, int n> static inline
+Matx<_Tp, m, n> operator / (const Matx<_Tp, m, n>& a, double alpha);
+
+template<typename _Tp, int m, int n> static inline
+Matx<_Tp, m, n> operator - (const Matx<_Tp, m, n>& a);
+
+template<typename _Tp, int m, int n, int l> static inline
+Matx<_Tp, m, n> operator * (const Matx<_Tp, m, l>& a, const Matx<_Tp, l, n>& b);
+
+template<typename _Tp, int m, int n> static inline
+Vec<_Tp, m> operator * (const Matx<_Tp, m, n>& a, const Vec<_Tp, n>& b);
+
+template<typename _Tp, int m, int n> static inline
+bool operator == (const Matx<_Tp, m, n>& a, const Matx<_Tp, m, n>& b);
+
+template<typename _Tp, int m, int n> static inline
+bool operator != (const Matx<_Tp, m, n>& a, const Matx<_Tp, m, n>& b);
+
+
+/////////////////////// Vec (used as element of multi-channel images /////////////////////
+
+/** @brief Template class for short numerical vectors, a partial case of Matx
+
+This template class represents short numerical vectors (of 1, 2, 3, 4 ... elements) on which you
+can perform basic arithmetical operations, access individual elements using [] operator etc. The
+vectors are allocated on stack, as opposite to std::valarray, std::vector, cv::Mat etc., which
+elements are dynamically allocated in the heap.
+
+The template takes 2 parameters:
+@tparam _Tp element type
+@tparam cn the number of elements
+
+In addition to the universal notation like Vec<float, 3>, you can use shorter aliases
+for the most popular specialized variants of Vec, e.g. Vec3f ~ Vec<float, 3>.
+
+It is possible to convert Vec\<T,2\> to/from Point_, Vec\<T,3\> to/from Point3_ , and Vec\<T,4\>
+to CvScalar or Scalar_. Use operator[] to access the elements of Vec.
+
+All the expected vector operations are also implemented:
+-   v1 = v2 + v3
+-   v1 = v2 - v3
+-   v1 = v2 \* scale
+-   v1 = scale \* v2
+-   v1 = -v2
+-   v1 += v2 and other augmenting operations
+-   v1 == v2, v1 != v2
+-   norm(v1) (euclidean norm)
+The Vec class is commonly used to describe pixel types of multi-channel arrays. See Mat for details.
+*/
+template<typename _Tp, int cn> class Vec : public Matx<_Tp, cn, 1>
+{
+public:
+    typedef _Tp value_type;
+    enum {
+           channels = cn,
+#ifdef OPENCV_TRAITS_ENABLE_DEPRECATED
+           depth    = Matx<_Tp, cn, 1>::depth,
+           type     = CV_MAKETYPE(depth, channels),
+#endif
+           _dummy_enum_finalizer = 0
+         };
+
+    //! default constructor
+    Vec();
+
+    Vec(_Tp v0); //!< 1-element vector constructor
+    Vec(_Tp v0, _Tp v1); //!< 2-element vector constructor
+    Vec(_Tp v0, _Tp v1, _Tp v2); //!< 3-element vector constructor
+    Vec(_Tp v0, _Tp v1, _Tp v2, _Tp v3); //!< 4-element vector constructor
+    Vec(_Tp v0, _Tp v1, _Tp v2, _Tp v3, _Tp v4); //!< 5-element vector constructor
+    Vec(_Tp v0, _Tp v1, _Tp v2, _Tp v3, _Tp v4, _Tp v5); //!< 6-element vector constructor
+    Vec(_Tp v0, _Tp v1, _Tp v2, _Tp v3, _Tp v4, _Tp v5, _Tp v6); //!< 7-element vector constructor
+    Vec(_Tp v0, _Tp v1, _Tp v2, _Tp v3, _Tp v4, _Tp v5, _Tp v6, _Tp v7); //!< 8-element vector constructor
+    Vec(_Tp v0, _Tp v1, _Tp v2, _Tp v3, _Tp v4, _Tp v5, _Tp v6, _Tp v7, _Tp v8); //!< 9-element vector constructor
+    Vec(_Tp v0, _Tp v1, _Tp v2, _Tp v3, _Tp v4, _Tp v5, _Tp v6, _Tp v7, _Tp v8, _Tp v9); //!< 10-element vector constructor
+    Vec(_Tp v0, _Tp v1, _Tp v2, _Tp v3, _Tp v4, _Tp v5, _Tp v6, _Tp v7, _Tp v8, _Tp v9, _Tp v10, _Tp v11, _Tp v12, _Tp v13); //!< 14-element vector constructor
+    explicit Vec(const _Tp* values);
+
+    Vec(std::initializer_list<_Tp>);
+
+    Vec(const Vec<_Tp, cn>& v);
+
+    static Vec all(_Tp alpha);
+    static Vec ones();
+    static Vec randn(_Tp a, _Tp b);
+    static Vec randu(_Tp a, _Tp b);
+    static Vec zeros();
+    static Vec diag(_Tp alpha) = delete;
+    static Vec eye() = delete;
+
+    //! per-element multiplication
+    Vec mul(const Vec<_Tp, cn>& v) const;
+
+    //! conjugation (makes sense for complex numbers and quaternions)
+    Vec conj() const;
+
+    /*!
+      cross product of the two 3D vectors.
+
+      For other dimensionalities the exception is raised
+    */
+    Vec cross(const Vec& v) const;
+    //! conversion to another data type
+    template<typename T2> operator Vec<T2, cn>() const;
+
+    /*! element access */
+    const _Tp& operator [](int i) const;
+    _Tp& operator[](int i);
+    const _Tp& operator ()(int i) const;
+    _Tp& operator ()(int i);
+
+    Vec<_Tp, cn>& operator=(const Vec<_Tp, cn>& rhs) = default;
+
+    Vec(const Matx<_Tp, cn, 1>& a, const Matx<_Tp, cn, 1>& b, Matx_AddOp);
+    Vec(const Matx<_Tp, cn, 1>& a, const Matx<_Tp, cn, 1>& b, Matx_SubOp);
+    template<typename _T2> Vec(const Matx<_Tp, cn, 1>& a, _T2 alpha, Matx_ScaleOp);
+};
+
+/** @name Shorter aliases for the most popular specializations of Vec<T,n>
+  @{
+*/
+typedef Vec<uchar, 2> Vec2b;
+typedef Vec<uchar, 3> Vec3b;
+typedef Vec<uchar, 4> Vec4b;
+
+typedef Vec<short, 2> Vec2s;
+typedef Vec<short, 3> Vec3s;
+typedef Vec<short, 4> Vec4s;
+
+typedef Vec<ushort, 2> Vec2w;
+typedef Vec<ushort, 3> Vec3w;
+typedef Vec<ushort, 4> Vec4w;
+
+typedef Vec<int, 2> Vec2i;
+typedef Vec<int, 3> Vec3i;
+typedef Vec<int, 4> Vec4i;
+typedef Vec<int, 6> Vec6i;
+typedef Vec<int, 8> Vec8i;
+
+typedef Vec<float, 2> Vec2f;
+typedef Vec<float, 3> Vec3f;
+typedef Vec<float, 4> Vec4f;
+typedef Vec<float, 6> Vec6f;
+
+typedef Vec<double, 2> Vec2d;
+typedef Vec<double, 3> Vec3d;
+typedef Vec<double, 4> Vec4d;
+typedef Vec<double, 6> Vec6d;
+/** @} */
+
+template<typename _Tp, int cn> inline
+Vec<_Tp, cn> normalize(const Vec<_Tp, cn>& v);
+
+template<typename _Tp1, typename _Tp2, int cn> static inline
+Vec<_Tp1, cn>& operator += (Vec<_Tp1, cn>& a, const Vec<_Tp2, cn>& b);
+
+template<typename _Tp1, typename _Tp2, int cn> static inline
+Vec<_Tp1, cn>& operator -= (Vec<_Tp1, cn>& a, const Vec<_Tp2, cn>& b);
+
+template<typename _Tp, int cn> static inline
+Vec<_Tp, cn> operator + (const Vec<_Tp, cn>& a, const Vec<_Tp, cn>& b);
+
+template<typename _Tp, int cn> static inline
+Vec<_Tp, cn> operator - (const Vec<_Tp, cn>& a, const Vec<_Tp, cn>& b);
+
+template<typename _Tp, int cn> static inline
+Vec<_Tp, cn>& operator *= (Vec<_Tp, cn>& a, int alpha);
+
+template<typename _Tp, int cn> static inline
+Vec<_Tp, cn>& operator *= (Vec<_Tp, cn>& a, float alpha);
+
+template<typename _Tp, int cn> static inline
+Vec<_Tp, cn>& operator *= (Vec<_Tp, cn>& a, double alpha);
+
+template<typename _Tp, int cn> static inline
+Vec<_Tp, cn>& operator /= (Vec<_Tp, cn>& a, int alpha);
+
+template<typename _Tp, int cn> static inline
+Vec<_Tp, cn>& operator /= (Vec<_Tp, cn>& a, float alpha);
+
+template<typename _Tp, int cn> static inline
+Vec<_Tp, cn>& operator /= (Vec<_Tp, cn>& a, double alpha);
+
+template<typename _Tp, int cn> static inline
+Vec<_Tp, cn> operator * (const Vec<_Tp, cn>& a, int alpha);
+
+template<typename _Tp, int cn> static inline
+Vec<_Tp, cn> operator * (int alpha, const Vec<_Tp, cn>& a);
+
+template<typename _Tp, int cn> static inline
+Vec<_Tp, cn> operator * (const Vec<_Tp, cn>& a, float alpha);
+
+template<typename _Tp, int cn> static inline
+Vec<_Tp, cn> operator * (float alpha, const Vec<_Tp, cn>& a);
+
+template<typename _Tp, int cn> static inline
+Vec<_Tp, cn> operator * (const Vec<_Tp, cn>& a, double alpha);
+
+template<typename _Tp, int cn> static inline
+Vec<_Tp, cn> operator * (double alpha, const Vec<_Tp, cn>& a);
+
+template<typename _Tp, int cn> static inline
+Vec<_Tp, cn> operator / (const Vec<_Tp, cn>& a, int alpha);
+
+template<typename _Tp, int cn> static inline
+Vec<_Tp, cn> operator / (const Vec<_Tp, cn>& a, float alpha);
+
+template<typename _Tp, int cn> static inline
+Vec<_Tp, cn> operator / (const Vec<_Tp, cn>& a, double alpha);
+
+template<typename _Tp, int cn> static inline
+Vec<_Tp, cn> operator - (const Vec<_Tp, cn>& a);
+
+template<typename _Tp> inline
+Vec<_Tp, 4> operator * (const Vec<_Tp, 4>& v1, const Vec<_Tp, 4>& v2);
+
+template<typename _Tp> inline
+Vec<_Tp, 4>& operator *= (Vec<_Tp, 4>& v1, const Vec<_Tp, 4>& v2);
+
+//! @} core_basic
+
+} // cv
+
+#include "opencv2/core/matx.inl.hpp"
+
+#endif // OPENCV_CORE_MATX_HPP
diff --git a/3rdParty/opencv-4.12.0/opencv2/core/matx.inl.hpp b/3rdParty/opencv-4.12.0/opencv2/core/matx.inl.hpp
new file mode 100644
index 0000000000..8b5b28087d
--- /dev/null
+++ b/3rdParty/opencv-4.12.0/opencv2/core/matx.inl.hpp
@@ -0,0 +1,1115 @@
+// This file is part of OpenCV project.
+// It is subject to the license terms in the LICENSE file found in the top-level directory
+// of this distribution and at http://opencv.org/license.html.
+
+#ifndef OPENCV_CORE_MATX_INL_HPP
+#define OPENCV_CORE_MATX_INL_HPP
+
+#ifndef __cplusplus
+#  error matx.inl.hpp header must be compiled as C++
+#endif
+
+#include "opencv2/core/matx.hpp"
+
+namespace cv
+{
+
+//==============================================================================
+// Helpers
+
+namespace internal
+{
+
+template<typename _Tp, int m> struct Matx_DetOp
+{
+    double operator ()(const Matx<_Tp, m, m>& a) const
+    {
+        Matx<_Tp, m, m> temp = a;
+        double p = LU(temp.val, m*sizeof(_Tp), m, 0, 0, 0);
+        if( p == 0 )
+            return p;
+        for( int i = 0; i < m; i++ )
+            p *= temp(i, i);
+        return p;
+    }
+};
+
+template<typename _Tp> struct Matx_DetOp<_Tp, 1>
+{
+    double operator ()(const Matx<_Tp, 1, 1>& a) const
+    {
+        return a(0,0);
+    }
+};
+
+template<typename _Tp> struct Matx_DetOp<_Tp, 2>
+{
+    double operator ()(const Matx<_Tp, 2, 2>& a) const
+    {
+        return a(0,0)*a(1,1) - a(0,1)*a(1,0);
+    }
+};
+
+template<typename _Tp> struct Matx_DetOp<_Tp, 3>
+{
+    double operator ()(const Matx<_Tp, 3, 3>& a) const
+    {
+        return a(0,0)*(a(1,1)*a(2,2) - a(2,1)*a(1,2)) -
+            a(0,1)*(a(1,0)*a(2,2) - a(2,0)*a(1,2)) +
+            a(0,2)*(a(1,0)*a(2,1) - a(2,0)*a(1,1));
+    }
+};
+
+template<typename _Tp> Vec<_Tp, 2> inline conjugate(const Vec<_Tp, 2>& v)
+{
+    return Vec<_Tp, 2>(v[0], -v[1]);
+}
+
+template<typename _Tp> Vec<_Tp, 4> inline conjugate(const Vec<_Tp, 4>& v)
+{
+    return Vec<_Tp, 4>(v[0], -v[1], -v[2], -v[3]);
+}
+
+} // internal::
+
+
+//==============================================================================
+// Matx
+
+template<typename _Tp, int m, int n> class DataType< Matx<_Tp, m, n> >
+{
+public:
+    typedef Matx<_Tp, m, n>                               value_type;
+    typedef Matx<typename DataType<_Tp>::work_type, m, n> work_type;
+    typedef _Tp                                           channel_type;
+    typedef value_type                                    vec_type;
+
+    enum { generic_type = 0,
+           channels     = m * n,
+           fmt          = traits::SafeFmt<channel_type>::fmt + ((channels - 1) << 8)
+#ifdef OPENCV_TRAITS_ENABLE_DEPRECATED
+           ,depth        = DataType<channel_type>::depth
+           ,type         = CV_MAKETYPE(depth, channels)
+#endif
+         };
+};
+
+
+namespace traits {
+template<typename _Tp, int m, int n>
+struct Depth< Matx<_Tp, m, n> > { enum { value = Depth<_Tp>::value }; };
+template<typename _Tp, int m, int n>
+struct Type< Matx<_Tp, m, n> > { enum { value = CV_MAKETYPE(Depth<_Tp>::value, n*m) }; };
+} // namespace
+
+
+//! @brief  Comma-separated Matrix Initializer
+template<typename _Tp, int m, int n> class MatxCommaInitializer
+{
+public:
+    MatxCommaInitializer(Matx<_Tp, m, n>* _mtx);
+    template<typename T2> MatxCommaInitializer<_Tp, m, n>& operator , (T2 val);
+    Matx<_Tp, m, n> operator *() const;
+
+    Matx<_Tp, m, n>* dst;
+    int idx;
+};
+
+template<typename _Tp, typename _T2, int m, int n> static inline
+MatxCommaInitializer<_Tp, m, n> operator << (const Matx<_Tp, m, n>& mtx, _T2 val)
+{
+    MatxCommaInitializer<_Tp, m, n> commaInitializer((Matx<_Tp, m, n>*)&mtx);
+    return (commaInitializer, val);
+}
+
+template<typename _Tp, int m, int n> inline
+MatxCommaInitializer<_Tp, m, n>::MatxCommaInitializer(Matx<_Tp, m, n>* _mtx)
+    : dst(_mtx), idx(0)
+{}
+
+template<typename _Tp, int m, int n> template<typename _T2> inline
+MatxCommaInitializer<_Tp, m, n>& MatxCommaInitializer<_Tp, m, n>::operator , (_T2 value)
+{
+    CV_DbgAssert( idx < m*n );
+    dst->val[idx++] = saturate_cast<_Tp>(value);
+    return *this;
+}
+
+template<typename _Tp, int m, int n> inline
+Matx<_Tp, m, n> MatxCommaInitializer<_Tp, m, n>::operator *() const
+{
+    CV_DbgAssert( idx == n*m );
+    return *dst;
+}
+
+////////////////////////////////// Matx Implementation ///////////////////////////////////
+
+template<typename _Tp, int m, int n> inline
+Matx<_Tp, m, n>::Matx()
+{
+    for(int i = 0; i < channels; i++) val[i] = _Tp(0);
+}
+
+template<typename _Tp, int m, int n> inline
+Matx<_Tp, m, n>::Matx(_Tp v0)
+{
+    val[0] = v0;
+    for(int i = 1; i < channels; i++) val[i] = _Tp(0);
+}
+
+template<typename _Tp, int m, int n> inline
+Matx<_Tp, m, n>::Matx(_Tp v0, _Tp v1)
+{
+    CV_StaticAssert(channels >= 2, "Matx should have at least 2 elements.");
+    val[0] = v0; val[1] = v1;
+    for(int i = 2; i < channels; i++) val[i] = _Tp(0);
+}
+
+template<typename _Tp, int m, int n> inline
+Matx<_Tp, m, n>::Matx(_Tp v0, _Tp v1, _Tp v2)
+{
+    CV_StaticAssert(channels >= 3, "Matx should have at least 3 elements.");
+    val[0] = v0; val[1] = v1; val[2] = v2;
+    for(int i = 3; i < channels; i++) val[i] = _Tp(0);
+}
+
+template<typename _Tp, int m, int n> inline
+Matx<_Tp, m, n>::Matx(_Tp v0, _Tp v1, _Tp v2, _Tp v3)
+{
+    CV_StaticAssert(channels >= 4, "Matx should have at least 4 elements.");
+    val[0] = v0; val[1] = v1; val[2] = v2; val[3] = v3;
+    for(int i = 4; i < channels; i++) val[i] = _Tp(0);
+}
+
+template<typename _Tp, int m, int n> inline
+Matx<_Tp, m, n>::Matx(_Tp v0, _Tp v1, _Tp v2, _Tp v3, _Tp v4)
+{
+    CV_StaticAssert(channels >= 5, "Matx should have at least 5 elements.");
+    val[0] = v0; val[1] = v1; val[2] = v2; val[3] = v3; val[4] = v4;
+    for(int i = 5; i < channels; i++) val[i] = _Tp(0);
+}
+
+template<typename _Tp, int m, int n> inline
+Matx<_Tp, m, n>::Matx(_Tp v0, _Tp v1, _Tp v2, _Tp v3, _Tp v4, _Tp v5)
+{
+    CV_StaticAssert(channels >= 6, "Matx should have at least 6 elements.");
+    val[0] = v0; val[1] = v1; val[2] = v2; val[3] = v3;
+    val[4] = v4; val[5] = v5;
+    for(int i = 6; i < channels; i++) val[i] = _Tp(0);
+}
+
+template<typename _Tp, int m, int n> inline
+Matx<_Tp, m, n>::Matx(_Tp v0, _Tp v1, _Tp v2, _Tp v3, _Tp v4, _Tp v5, _Tp v6)
+{
+    CV_StaticAssert(channels >= 7, "Matx should have at least 7 elements.");
+    val[0] = v0; val[1] = v1; val[2] = v2; val[3] = v3;
+    val[4] = v4; val[5] = v5; val[6] = v6;
+    for(int i = 7; i < channels; i++) val[i] = _Tp(0);
+}
+
+template<typename _Tp, int m, int n> inline
+Matx<_Tp, m, n>::Matx(_Tp v0, _Tp v1, _Tp v2, _Tp v3, _Tp v4, _Tp v5, _Tp v6, _Tp v7)
+{
+    CV_StaticAssert(channels >= 8, "Matx should have at least 8 elements.");
+    val[0] = v0; val[1] = v1; val[2] = v2; val[3] = v3;
+    val[4] = v4; val[5] = v5; val[6] = v6; val[7] = v7;
+    for(int i = 8; i < channels; i++) val[i] = _Tp(0);
+}
+
+template<typename _Tp, int m, int n> inline
+Matx<_Tp, m, n>::Matx(_Tp v0, _Tp v1, _Tp v2, _Tp v3, _Tp v4, _Tp v5, _Tp v6, _Tp v7, _Tp v8)
+{
+    CV_StaticAssert(channels >= 9, "Matx should have at least 9 elements.");
+    val[0] = v0; val[1] = v1; val[2] = v2; val[3] = v3;
+    val[4] = v4; val[5] = v5; val[6] = v6; val[7] = v7;
+    val[8] = v8;
+    for(int i = 9; i < channels; i++) val[i] = _Tp(0);
+}
+
+template<typename _Tp, int m, int n> inline
+Matx<_Tp, m, n>::Matx(_Tp v0, _Tp v1, _Tp v2, _Tp v3, _Tp v4, _Tp v5, _Tp v6, _Tp v7, _Tp v8, _Tp v9)
+{
+    CV_StaticAssert(channels >= 10, "Matx should have at least 10 elements.");
+    val[0] = v0; val[1] = v1; val[2] = v2; val[3] = v3;
+    val[4] = v4; val[5] = v5; val[6] = v6; val[7] = v7;
+    val[8] = v8; val[9] = v9;
+    for(int i = 10; i < channels; i++) val[i] = _Tp(0);
+}
+
+
+template<typename _Tp, int m, int n> inline
+Matx<_Tp,m,n>::Matx(_Tp v0, _Tp v1, _Tp v2, _Tp v3, _Tp v4, _Tp v5, _Tp v6, _Tp v7, _Tp v8, _Tp v9, _Tp v10, _Tp v11)
+{
+    CV_StaticAssert(channels >= 12, "Matx should have at least 12 elements.");
+    val[0] = v0; val[1] = v1; val[2] = v2; val[3] = v3;
+    val[4] = v4; val[5] = v5; val[6] = v6; val[7] = v7;
+    val[8] = v8; val[9] = v9; val[10] = v10; val[11] = v11;
+    for(int i = 12; i < channels; i++) val[i] = _Tp(0);
+}
+
+template<typename _Tp, int m, int n> inline
+Matx<_Tp,m,n>::Matx(_Tp v0, _Tp v1, _Tp v2, _Tp v3, _Tp v4, _Tp v5, _Tp v6, _Tp v7, _Tp v8, _Tp v9, _Tp v10, _Tp v11, _Tp v12, _Tp v13)
+{
+    CV_StaticAssert(channels >= 14, "Matx should have at least 14 elements.");
+    val[0] = v0; val[1] = v1; val[2] = v2; val[3] = v3;
+    val[4] = v4; val[5] = v5; val[6] = v6; val[7] = v7;
+    val[8] = v8; val[9] = v9; val[10] = v10; val[11] = v11;
+    val[12] = v12; val[13] = v13;
+    for (int i = 14; i < channels; i++) val[i] = _Tp(0);
+}
+
+
+template<typename _Tp, int m, int n> inline
+Matx<_Tp,m,n>::Matx(_Tp v0, _Tp v1, _Tp v2, _Tp v3, _Tp v4, _Tp v5, _Tp v6, _Tp v7, _Tp v8, _Tp v9, _Tp v10, _Tp v11, _Tp v12, _Tp v13, _Tp v14, _Tp v15)
+{
+    CV_StaticAssert(channels >= 16, "Matx should have at least 16 elements.");
+    val[0] = v0; val[1] = v1; val[2] = v2; val[3] = v3;
+    val[4] = v4; val[5] = v5; val[6] = v6; val[7] = v7;
+    val[8] = v8; val[9] = v9; val[10] = v10; val[11] = v11;
+    val[12] = v12; val[13] = v13; val[14] = v14; val[15] = v15;
+    for(int i = 16; i < channels; i++) val[i] = _Tp(0);
+}
+
+// WARNING: unreachable code using Ninja
+#if defined _MSC_VER && _MSC_VER >= 1920
+#pragma warning(push)
+#pragma warning(disable: 4702)
+#endif
+template<typename _Tp, int m, int n> inline
+Matx<_Tp, m, n>::Matx(const _Tp* values)
+{
+    for( int i = 0; i < channels; i++ ) val[i] = values[i];
+}
+#if defined _MSC_VER && _MSC_VER >= 1920
+#pragma warning(pop)
+#endif
+
+template<typename _Tp, int m, int n> inline
+Matx<_Tp, m, n>::Matx(std::initializer_list<_Tp> list)
+{
+    CV_DbgAssert(list.size() == channels);
+    int i = 0;
+    for(const auto& elem : list)
+    {
+        val[i++] = elem;
+    }
+}
+
+template<typename _Tp, int m, int n> inline
+Matx<_Tp, m, n> Matx<_Tp, m, n>::all(_Tp alpha)
+{
+    Matx<_Tp, m, n> M;
+    for( int i = 0; i < m*n; i++ ) M.val[i] = alpha;
+    return M;
+}
+
+template<typename _Tp, int m, int n> inline
+Matx<_Tp,m,n> Matx<_Tp,m,n>::zeros()
+{
+    return all(0);
+}
+
+template<typename _Tp, int m, int n> inline
+Matx<_Tp,m,n> Matx<_Tp,m,n>::ones()
+{
+    return all(1);
+}
+
+template<typename _Tp, int m, int n> inline
+Matx<_Tp,m,n> Matx<_Tp,m,n>::eye()
+{
+    Matx<_Tp,m,n> M;
+    for(int i = 0; i < shortdim; i++)
+        M(i,i) = 1;
+    return M;
+}
+
+template<typename _Tp, int m, int n> inline
+_Tp Matx<_Tp, m, n>::dot(const Matx<_Tp, m, n>& M) const
+{
+    _Tp s = 0;
+    for( int i = 0; i < channels; i++ ) s += val[i]*M.val[i];
+    return s;
+}
+
+template<typename _Tp, int m, int n> inline
+double Matx<_Tp, m, n>::ddot(const Matx<_Tp, m, n>& M) const
+{
+    double s = 0;
+    for( int i = 0; i < channels; i++ ) s += (double)val[i]*M.val[i];
+    return s;
+}
+
+template<typename _Tp, int m, int n> inline
+Matx<_Tp,m,n> Matx<_Tp,m,n>::diag(const typename Matx<_Tp,m,n>::diag_type& d)
+{
+    Matx<_Tp,m,n> M;
+    for(int i = 0; i < shortdim; i++)
+        M(i,i) = d(i, 0);
+    return M;
+}
+
+template<typename _Tp, int m, int n> template<typename T2>
+inline Matx<_Tp, m, n>::operator Matx<T2, m, n>() const
+{
+    Matx<T2, m, n> M;
+    for( int i = 0; i < m*n; i++ ) M.val[i] = saturate_cast<T2>(val[i]);
+    return M;
+}
+
+template<typename _Tp, int m, int n> template<int m1, int n1> inline
+Matx<_Tp, m1, n1> Matx<_Tp, m, n>::reshape() const
+{
+    CV_StaticAssert(m1*n1 == m*n, "Input and destination matrices must have the same number of elements");
+    return (const Matx<_Tp, m1, n1>&)*this;
+}
+
+template<typename _Tp, int m, int n>
+template<int m1, int n1> inline
+Matx<_Tp, m1, n1> Matx<_Tp, m, n>::get_minor(int base_row, int base_col) const
+{
+    CV_DbgAssert(0 <= base_row && base_row+m1 <= m && 0 <= base_col && base_col+n1 <= n);
+    Matx<_Tp, m1, n1> s;
+    for( int di = 0; di < m1; di++ )
+        for( int dj = 0; dj < n1; dj++ )
+            s(di, dj) = (*this)(base_row+di, base_col+dj);
+    return s;
+}
+
+template<typename _Tp, int m, int n> inline
+Matx<_Tp, 1, n> Matx<_Tp, m, n>::row(int i) const
+{
+    CV_DbgAssert((unsigned)i < (unsigned)m);
+    return Matx<_Tp, 1, n>(&val[i*n]);
+}
+
+template<typename _Tp, int m, int n> inline
+Matx<_Tp, m, 1> Matx<_Tp, m, n>::col(int j) const
+{
+    CV_DbgAssert((unsigned)j < (unsigned)n);
+    Matx<_Tp, m, 1> v;
+    for( int i = 0; i < m; i++ )
+        v.val[i] = val[i*n + j];
+    return v;
+}
+
+template<typename _Tp, int m, int n> inline
+typename Matx<_Tp, m, n>::diag_type Matx<_Tp, m, n>::diag() const
+{
+    diag_type d;
+    for( int i = 0; i < shortdim; i++ )
+        d.val[i] = val[i*n + i];
+    return d;
+}
+
+template<typename _Tp, int m, int n> inline
+const _Tp& Matx<_Tp, m, n>::operator()(int row_idx, int col_idx) const
+{
+    CV_DbgAssert( (unsigned)row_idx < (unsigned)m && (unsigned)col_idx < (unsigned)n );
+    return this->val[row_idx*n + col_idx];
+}
+
+template<typename _Tp, int m, int n> inline
+_Tp& Matx<_Tp, m, n>::operator ()(int row_idx, int col_idx)
+{
+    CV_DbgAssert( (unsigned)row_idx < (unsigned)m && (unsigned)col_idx < (unsigned)n );
+    return val[row_idx*n + col_idx];
+}
+
+template<typename _Tp, int m, int n> inline
+const _Tp& Matx<_Tp, m, n>::operator ()(int i) const
+{
+    CV_StaticAssert(m == 1 || n == 1, "Single index indexation requires matrix to be a column or a row");
+    CV_DbgAssert( (unsigned)i < (unsigned)(m+n-1) );
+    return val[i];
+}
+
+template<typename _Tp, int m, int n> inline
+_Tp& Matx<_Tp, m, n>::operator ()(int i)
+{
+    CV_StaticAssert(m == 1 || n == 1, "Single index indexation requires matrix to be a column or a row");
+    CV_DbgAssert( (unsigned)i < (unsigned)(m+n-1) );
+    return val[i];
+}
+
+template<typename _Tp, int m, int n> inline
+Matx<_Tp,m,n>::Matx(const Matx<_Tp, m, n>& a, const Matx<_Tp, m, n>& b, Matx_AddOp)
+{
+    for( int i = 0; i < channels; i++ )
+        val[i] = saturate_cast<_Tp>(a.val[i] + b.val[i]);
+}
+
+template<typename _Tp, int m, int n> inline
+Matx<_Tp,m,n>::Matx(const Matx<_Tp, m, n>& a, const Matx<_Tp, m, n>& b, Matx_SubOp)
+{
+    for( int i = 0; i < channels; i++ )
+        val[i] = saturate_cast<_Tp>(a.val[i] - b.val[i]);
+}
+
+template<typename _Tp, int m, int n> template<typename _T2> inline
+Matx<_Tp,m,n>::Matx(const Matx<_Tp, m, n>& a, _T2 alpha, Matx_ScaleOp)
+{
+    for( int i = 0; i < channels; i++ )
+        val[i] = saturate_cast<_Tp>(a.val[i] * alpha);
+}
+
+template<typename _Tp, int m, int n> inline
+Matx<_Tp,m,n>::Matx(const Matx<_Tp, m, n>& a, const Matx<_Tp, m, n>& b, Matx_MulOp)
+{
+    for( int i = 0; i < channels; i++ )
+        val[i] = saturate_cast<_Tp>(a.val[i] * b.val[i]);
+}
+
+template<typename _Tp, int m, int n> inline
+Matx<_Tp,m,n>::Matx(const Matx<_Tp, m, n>& a, const Matx<_Tp, m, n>& b, Matx_DivOp)
+{
+    for( int i = 0; i < channels; i++ )
+        val[i] = saturate_cast<_Tp>(a.val[i] / b.val[i]);
+}
+
+template<typename _Tp, int m, int n> template<int l> inline
+Matx<_Tp,m,n>::Matx(const Matx<_Tp, m, l>& a, const Matx<_Tp, l, n>& b, Matx_MatMulOp)
+{
+    for( int i = 0; i < m; i++ )
+        for( int j = 0; j < n; j++ )
+        {
+            _Tp s = 0;
+            for( int k = 0; k < l; k++ )
+                s += a(i, k) * b(k, j);
+            val[i*n + j] = s;
+        }
+}
+
+template<typename _Tp, int m, int n> inline
+Matx<_Tp,m,n>::Matx(const Matx<_Tp, n, m>& a, Matx_TOp)
+{
+    for( int i = 0; i < m; i++ )
+        for( int j = 0; j < n; j++ )
+            val[i*n + j] = a(j, i);
+}
+
+template<typename _Tp, int m, int n> inline
+Matx<_Tp, m, n> Matx<_Tp, m, n>::mul(const Matx<_Tp, m, n>& a) const
+{
+    return Matx<_Tp, m, n>(*this, a, Matx_MulOp());
+}
+
+template<typename _Tp, int m, int n> inline
+Matx<_Tp, m, n> Matx<_Tp, m, n>::div(const Matx<_Tp, m, n>& a) const
+{
+    return Matx<_Tp, m, n>(*this, a, Matx_DivOp());
+}
+
+template<typename _Tp, int m, int n> inline
+Matx<_Tp, n, m> Matx<_Tp, m, n>::t() const
+{
+    return Matx<_Tp, n, m>(*this, Matx_TOp());
+}
+
+template<typename _Tp, int m, int n> inline
+Vec<_Tp, n> Matx<_Tp, m, n>::solve(const Vec<_Tp, m>& rhs, int method) const
+{
+    Matx<_Tp, n, 1> x = solve((const Matx<_Tp, m, 1>&)(rhs), method);
+    return (Vec<_Tp, n>&)(x);
+}
+
+template<typename _Tp, int m> static inline
+double determinant(const Matx<_Tp, m, m>& a)
+{
+    return cv::internal::Matx_DetOp<_Tp, m>()(a);
+}
+
+template<typename _Tp, int m, int n> static inline
+double trace(const Matx<_Tp, m, n>& a)
+{
+    _Tp s = 0;
+    for( int i = 0; i < std::min(m, n); i++ )
+        s += a(i,i);
+    return s;
+}
+
+template<typename _Tp, int m, int n> static inline
+double norm(const Matx<_Tp, m, n>& M)
+{
+    return std::sqrt(normL2Sqr<_Tp, double>(M.val, m*n));
+}
+
+template<typename _Tp, int m, int n> static inline
+double norm(const Matx<_Tp, m, n>& M, int normType)
+{
+    switch(normType) {
+    case NORM_INF:
+        return (double)normInf<_Tp, typename DataType<_Tp>::work_type>(M.val, m*n);
+    case NORM_L1:
+        return (double)normL1<_Tp, typename DataType<_Tp>::work_type>(M.val, m*n);
+    case NORM_L2SQR:
+        return (double)normL2Sqr<_Tp, typename DataType<_Tp>::work_type>(M.val, m*n);
+    default:
+    case NORM_L2:
+        return std::sqrt((double)normL2Sqr<_Tp, typename DataType<_Tp>::work_type>(M.val, m*n));
+    }
+}
+
+template<typename _Tp1, typename _Tp2, int m, int n> static inline
+Matx<_Tp1, m, n>& operator += (Matx<_Tp1, m, n>& a, const Matx<_Tp2, m, n>& b)
+{
+    for( int i = 0; i < m*n; i++ )
+        a.val[i] = saturate_cast<_Tp1>(a.val[i] + b.val[i]);
+    return a;
+}
+
+template<typename _Tp1, typename _Tp2, int m, int n> static inline
+Matx<_Tp1, m, n>& operator -= (Matx<_Tp1, m, n>& a, const Matx<_Tp2, m, n>& b)
+{
+    for( int i = 0; i < m*n; i++ )
+        a.val[i] = saturate_cast<_Tp1>(a.val[i] - b.val[i]);
+    return a;
+}
+
+template<typename _Tp, int m, int n> static inline
+Matx<_Tp, m, n> operator + (const Matx<_Tp, m, n>& a, const Matx<_Tp, m, n>& b)
+{
+    return Matx<_Tp, m, n>(a, b, Matx_AddOp());
+}
+
+template<typename _Tp, int m, int n> static inline
+Matx<_Tp, m, n> operator - (const Matx<_Tp, m, n>& a, const Matx<_Tp, m, n>& b)
+{
+    return Matx<_Tp, m, n>(a, b, Matx_SubOp());
+}
+
+template<typename _Tp, int m, int n> static inline
+Matx<_Tp, m, n>& operator *= (Matx<_Tp, m, n>& a, int alpha)
+{
+    for( int i = 0; i < m*n; i++ )
+        a.val[i] = saturate_cast<_Tp>(a.val[i] * alpha);
+    return a;
+}
+
+template<typename _Tp, int m, int n> static inline
+Matx<_Tp, m, n>& operator *= (Matx<_Tp, m, n>& a, float alpha)
+{
+    for( int i = 0; i < m*n; i++ )
+        a.val[i] = saturate_cast<_Tp>(a.val[i] * alpha);
+    return a;
+}
+
+template<typename _Tp, int m, int n> static inline
+Matx<_Tp, m, n>& operator *= (Matx<_Tp, m, n>& a, double alpha)
+{
+    for( int i = 0; i < m*n; i++ )
+        a.val[i] = saturate_cast<_Tp>(a.val[i] * alpha);
+    return a;
+}
+
+template<typename _Tp, int m, int n> static inline
+Matx<_Tp, m, n> operator * (const Matx<_Tp, m, n>& a, int alpha)
+{
+    return Matx<_Tp, m, n>(a, alpha, Matx_ScaleOp());
+}
+
+template<typename _Tp, int m, int n> static inline
+Matx<_Tp, m, n> operator * (const Matx<_Tp, m, n>& a, float alpha)
+{
+    return Matx<_Tp, m, n>(a, alpha, Matx_ScaleOp());
+}
+
+template<typename _Tp, int m, int n> static inline
+Matx<_Tp, m, n> operator * (const Matx<_Tp, m, n>& a, double alpha)
+{
+    return Matx<_Tp, m, n>(a, alpha, Matx_ScaleOp());
+}
+
+template<typename _Tp, int m, int n> static inline
+Matx<_Tp, m, n> operator * (int alpha, const Matx<_Tp, m, n>& a)
+{
+    return Matx<_Tp, m, n>(a, alpha, Matx_ScaleOp());
+}
+
+template<typename _Tp, int m, int n> static inline
+Matx<_Tp, m, n> operator * (float alpha, const Matx<_Tp, m, n>& a)
+{
+    return Matx<_Tp, m, n>(a, alpha, Matx_ScaleOp());
+}
+
+template<typename _Tp, int m, int n> static inline
+Matx<_Tp, m, n> operator * (double alpha, const Matx<_Tp, m, n>& a)
+{
+    return Matx<_Tp, m, n>(a, alpha, Matx_ScaleOp());
+}
+
+template<typename _Tp, int m, int n> static inline
+Matx<_Tp, m, n>& operator /= (Matx<_Tp, m, n>& a, float alpha)
+{
+    for( int i = 0; i < m*n; i++ )
+        a.val[i] = a.val[i] / alpha;
+    return a;
+}
+
+template<typename _Tp, int m, int n> static inline
+Matx<_Tp, m, n>& operator /= (Matx<_Tp, m, n>& a, double alpha)
+{
+    for( int i = 0; i < m*n; i++ )
+        a.val[i] = a.val[i] / alpha;
+    return a;
+}
+
+template<typename _Tp, int m, int n> static inline
+Matx<_Tp, m, n> operator / (const Matx<_Tp, m, n>& a, float alpha)
+{
+    return Matx<_Tp, m, n>(a, 1.f/alpha, Matx_ScaleOp());
+}
+
+template<typename _Tp, int m, int n> static inline
+Matx<_Tp, m, n> operator / (const Matx<_Tp, m, n>& a, double alpha)
+{
+    return Matx<_Tp, m, n>(a, 1./alpha, Matx_ScaleOp());
+}
+
+template<typename _Tp, int m, int n> static inline
+Matx<_Tp, m, n> operator - (const Matx<_Tp, m, n>& a)
+{
+    return Matx<_Tp, m, n>(a, -1, Matx_ScaleOp());
+}
+
+template<typename _Tp, int m, int n, int l> static inline
+Matx<_Tp, m, n> operator * (const Matx<_Tp, m, l>& a, const Matx<_Tp, l, n>& b)
+{
+    return Matx<_Tp, m, n>(a, b, Matx_MatMulOp());
+}
+
+template<typename _Tp, int m, int n> static inline
+Vec<_Tp, m> operator * (const Matx<_Tp, m, n>& a, const Vec<_Tp, n>& b)
+{
+    Matx<_Tp, m, 1> c(a, b, Matx_MatMulOp());
+    return (const Vec<_Tp, m>&)(c);
+}
+
+template<typename _Tp, int m, int n> static inline
+bool operator == (const Matx<_Tp, m, n>& a, const Matx<_Tp, m, n>& b)
+{
+    for( int i = 0; i < m*n; i++ )
+        if( a.val[i] != b.val[i] ) return false;
+    return true;
+}
+
+template<typename _Tp, int m, int n> static inline
+bool operator != (const Matx<_Tp, m, n>& a, const Matx<_Tp, m, n>& b)
+{
+    return !(a == b);
+}
+
+//==============================================================================
+// Vec
+
+template<typename _Tp, int cn> class DataType< Vec<_Tp, cn> >
+{
+public:
+    typedef Vec<_Tp, cn>                               value_type;
+    typedef Vec<typename DataType<_Tp>::work_type, cn> work_type;
+    typedef _Tp                                        channel_type;
+    typedef value_type                                 vec_type;
+
+    enum { generic_type = 0,
+           channels     = cn,
+           fmt          = DataType<channel_type>::fmt + ((channels - 1) << 8),
+#ifdef OPENCV_TRAITS_ENABLE_DEPRECATED
+           depth        = DataType<channel_type>::depth,
+           type         = CV_MAKETYPE(depth, channels),
+#endif
+           _dummy_enum_finalizer = 0
+         };
+};
+
+namespace traits {
+template<typename _Tp, int cn>
+struct Depth< Vec<_Tp, cn> > { enum { value = Depth<_Tp>::value }; };
+template<typename _Tp, int cn>
+struct Type< Vec<_Tp, cn> > { enum { value = CV_MAKETYPE(Depth<_Tp>::value, cn) }; };
+} // namespace
+
+/** @brief  Comma-separated Vec Initializer
+*/
+template<typename _Tp, int m> class VecCommaInitializer : public MatxCommaInitializer<_Tp, m, 1>
+{
+public:
+    VecCommaInitializer(Vec<_Tp, m>* _vec);
+    template<typename T2> VecCommaInitializer<_Tp, m>& operator , (T2 val);
+    Vec<_Tp, m> operator *() const;
+};
+
+template<typename _Tp, typename _T2, int cn> static inline
+VecCommaInitializer<_Tp, cn> operator << (const Vec<_Tp, cn>& vec, _T2 val)
+{
+    VecCommaInitializer<_Tp, cn> commaInitializer((Vec<_Tp, cn>*)&vec);
+    return (commaInitializer, val);
+}
+
+template<typename _Tp, int cn> inline
+VecCommaInitializer<_Tp, cn>::VecCommaInitializer(Vec<_Tp, cn>* _vec)
+    : MatxCommaInitializer<_Tp, cn, 1>(_vec)
+{}
+
+template<typename _Tp, int cn> template<typename _T2> inline
+VecCommaInitializer<_Tp, cn>& VecCommaInitializer<_Tp, cn>::operator , (_T2 value)
+{
+    CV_DbgAssert( this->idx < cn );
+    this->dst->val[this->idx++] = saturate_cast<_Tp>(value);
+    return *this;
+}
+
+template<typename _Tp, int cn> inline
+Vec<_Tp, cn> VecCommaInitializer<_Tp, cn>::operator *() const
+{
+    CV_DbgAssert( this->idx == cn );
+    return *this->dst;
+}
+
+
+template<typename _Tp, int cn> inline
+Vec<_Tp, cn>::Vec() {}
+
+template<typename _Tp, int cn> inline
+Vec<_Tp, cn>::Vec(_Tp v0)
+    : Matx<_Tp, cn, 1>(v0) {}
+
+template<typename _Tp, int cn> inline
+Vec<_Tp, cn>::Vec(_Tp v0, _Tp v1)
+    : Matx<_Tp, cn, 1>(v0, v1) {}
+
+template<typename _Tp, int cn> inline
+Vec<_Tp, cn>::Vec(_Tp v0, _Tp v1, _Tp v2)
+    : Matx<_Tp, cn, 1>(v0, v1, v2) {}
+
+template<typename _Tp, int cn> inline
+Vec<_Tp, cn>::Vec(_Tp v0, _Tp v1, _Tp v2, _Tp v3)
+    : Matx<_Tp, cn, 1>(v0, v1, v2, v3) {}
+
+template<typename _Tp, int cn> inline
+Vec<_Tp, cn>::Vec(_Tp v0, _Tp v1, _Tp v2, _Tp v3, _Tp v4)
+    : Matx<_Tp, cn, 1>(v0, v1, v2, v3, v4) {}
+
+template<typename _Tp, int cn> inline
+Vec<_Tp, cn>::Vec(_Tp v0, _Tp v1, _Tp v2, _Tp v3, _Tp v4, _Tp v5)
+    : Matx<_Tp, cn, 1>(v0, v1, v2, v3, v4, v5) {}
+
+template<typename _Tp, int cn> inline
+Vec<_Tp, cn>::Vec(_Tp v0, _Tp v1, _Tp v2, _Tp v3, _Tp v4, _Tp v5, _Tp v6)
+    : Matx<_Tp, cn, 1>(v0, v1, v2, v3, v4, v5, v6) {}
+
+template<typename _Tp, int cn> inline
+Vec<_Tp, cn>::Vec(_Tp v0, _Tp v1, _Tp v2, _Tp v3, _Tp v4, _Tp v5, _Tp v6, _Tp v7)
+    : Matx<_Tp, cn, 1>(v0, v1, v2, v3, v4, v5, v6, v7) {}
+
+template<typename _Tp, int cn> inline
+Vec<_Tp, cn>::Vec(_Tp v0, _Tp v1, _Tp v2, _Tp v3, _Tp v4, _Tp v5, _Tp v6, _Tp v7, _Tp v8)
+    : Matx<_Tp, cn, 1>(v0, v1, v2, v3, v4, v5, v6, v7, v8) {}
+
+template<typename _Tp, int cn> inline
+Vec<_Tp, cn>::Vec(_Tp v0, _Tp v1, _Tp v2, _Tp v3, _Tp v4, _Tp v5, _Tp v6, _Tp v7, _Tp v8, _Tp v9)
+    : Matx<_Tp, cn, 1>(v0, v1, v2, v3, v4, v5, v6, v7, v8, v9) {}
+
+template<typename _Tp, int cn> inline
+Vec<_Tp, cn>::Vec(_Tp v0, _Tp v1, _Tp v2, _Tp v3, _Tp v4, _Tp v5, _Tp v6, _Tp v7, _Tp v8, _Tp v9, _Tp v10, _Tp v11, _Tp v12, _Tp v13)
+    : Matx<_Tp, cn, 1>(v0, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13) {}
+
+template<typename _Tp, int cn> inline
+Vec<_Tp, cn>::Vec(const _Tp* values)
+    : Matx<_Tp, cn, 1>(values) {}
+
+template<typename _Tp, int cn> inline
+Vec<_Tp, cn>::Vec(std::initializer_list<_Tp> list)
+    : Matx<_Tp, cn, 1>(list) {}
+
+template<typename _Tp, int cn> inline
+Vec<_Tp, cn>::Vec(const Vec<_Tp, cn>& m)
+    : Matx<_Tp, cn, 1>(m.val) {}
+
+template<typename _Tp, int cn> inline
+Vec<_Tp, cn>::Vec(const Matx<_Tp, cn, 1>& a, const Matx<_Tp, cn, 1>& b, Matx_AddOp op)
+    : Matx<_Tp, cn, 1>(a, b, op) {}
+
+template<typename _Tp, int cn> inline
+Vec<_Tp, cn>::Vec(const Matx<_Tp, cn, 1>& a, const Matx<_Tp, cn, 1>& b, Matx_SubOp op)
+    : Matx<_Tp, cn, 1>(a, b, op) {}
+
+template<typename _Tp, int cn> template<typename _T2> inline
+Vec<_Tp, cn>::Vec(const Matx<_Tp, cn, 1>& a, _T2 alpha, Matx_ScaleOp op)
+    : Matx<_Tp, cn, 1>(a, alpha, op) {}
+
+template<typename _Tp, int cn> inline
+Vec<_Tp, cn> Vec<_Tp, cn>::all(_Tp alpha)
+{
+    Vec v;
+    for( int i = 0; i < cn; i++ ) v.val[i] = alpha;
+    return v;
+}
+
+template<typename _Tp, int cn> inline
+Vec<_Tp, cn> Vec<_Tp, cn>::ones()
+{
+    return Vec::all(1);
+}
+
+template<typename _Tp, int cn> inline
+Vec<_Tp, cn> Vec<_Tp, cn>::zeros()
+{
+    return Vec::all(0);
+}
+
+template<typename _Tp, int cn> inline
+Vec<_Tp, cn> Vec<_Tp, cn>::mul(const Vec<_Tp, cn>& v) const
+{
+    Vec<_Tp, cn> w;
+    for( int i = 0; i < cn; i++ ) w.val[i] = saturate_cast<_Tp>(this->val[i]*v.val[i]);
+    return w;
+}
+
+template<> inline
+Vec<float, 2> Vec<float, 2>::conj() const
+{
+    return cv::internal::conjugate(*this);
+}
+
+template<> inline
+Vec<double, 2> Vec<double, 2>::conj() const
+{
+    return cv::internal::conjugate(*this);
+}
+
+template<> inline
+Vec<float, 4> Vec<float, 4>::conj() const
+{
+    return cv::internal::conjugate(*this);
+}
+
+template<> inline
+Vec<double, 4> Vec<double, 4>::conj() const
+{
+    return cv::internal::conjugate(*this);
+}
+
+template<typename _Tp, int cn> inline
+Vec<_Tp, cn> Vec<_Tp, cn>::cross(const Vec<_Tp, cn>&) const
+{
+    CV_StaticAssert(cn == 3, "for arbitrary-size vector there is no cross-product defined");
+    return Vec<_Tp, cn>();
+}
+
+template<> inline
+Vec<float, 3> Vec<float, 3>::cross(const Vec<float, 3>& v) const
+{
+    return Vec<float,3>(this->val[1]*v.val[2] - this->val[2]*v.val[1],
+                     this->val[2]*v.val[0] - this->val[0]*v.val[2],
+                     this->val[0]*v.val[1] - this->val[1]*v.val[0]);
+}
+
+template<> inline
+Vec<double, 3> Vec<double, 3>::cross(const Vec<double, 3>& v) const
+{
+    return Vec<double,3>(this->val[1]*v.val[2] - this->val[2]*v.val[1],
+                     this->val[2]*v.val[0] - this->val[0]*v.val[2],
+                     this->val[0]*v.val[1] - this->val[1]*v.val[0]);
+}
+
+template<typename _Tp, int cn> template<typename T2> inline
+Vec<_Tp, cn>::operator Vec<T2, cn>() const
+{
+    Vec<T2, cn> v;
+    for( int i = 0; i < cn; i++ ) v.val[i] = saturate_cast<T2>(this->val[i]);
+    return v;
+}
+
+template<typename _Tp, int cn> inline
+const _Tp& Vec<_Tp, cn>::operator [](int i) const
+{
+    CV_DbgAssert( (unsigned)i < (unsigned)cn );
+    return this->val[i];
+}
+
+template<typename _Tp, int cn> inline
+_Tp& Vec<_Tp, cn>::operator [](int i)
+{
+    CV_DbgAssert( (unsigned)i < (unsigned)cn );
+    return this->val[i];
+}
+
+template<typename _Tp, int cn> inline
+const _Tp& Vec<_Tp, cn>::operator ()(int i) const
+{
+    CV_DbgAssert( (unsigned)i < (unsigned)cn );
+    return this->val[i];
+}
+
+template<typename _Tp, int cn> inline
+_Tp& Vec<_Tp, cn>::operator ()(int i)
+{
+    CV_DbgAssert( (unsigned)i < (unsigned)cn );
+    return this->val[i];
+}
+
+template<typename _Tp, int cn> inline
+Vec<_Tp, cn> normalize(const Vec<_Tp, cn>& v)
+{
+    double nv = norm(v);
+    return v * (nv ? 1./nv : 0.);
+}
+
+template<typename _Tp1, typename _Tp2, int cn> static inline
+Vec<_Tp1, cn>& operator += (Vec<_Tp1, cn>& a, const Vec<_Tp2, cn>& b)
+{
+    for( int i = 0; i < cn; i++ )
+        a.val[i] = saturate_cast<_Tp1>(a.val[i] + b.val[i]);
+    return a;
+}
+
+template<typename _Tp1, typename _Tp2, int cn> static inline
+Vec<_Tp1, cn>& operator -= (Vec<_Tp1, cn>& a, const Vec<_Tp2, cn>& b)
+{
+    for( int i = 0; i < cn; i++ )
+        a.val[i] = saturate_cast<_Tp1>(a.val[i] - b.val[i]);
+    return a;
+}
+
+template<typename _Tp, int cn> static inline
+Vec<_Tp, cn> operator + (const Vec<_Tp, cn>& a, const Vec<_Tp, cn>& b)
+{
+    return Vec<_Tp, cn>(a, b, Matx_AddOp());
+}
+
+template<typename _Tp, int cn> static inline
+Vec<_Tp, cn> operator - (const Vec<_Tp, cn>& a, const Vec<_Tp, cn>& b)
+{
+    return Vec<_Tp, cn>(a, b, Matx_SubOp());
+}
+
+template<typename _Tp, int cn> static inline
+Vec<_Tp, cn>& operator *= (Vec<_Tp, cn>& a, int alpha)
+{
+    for( int i = 0; i < cn; i++ )
+        a[i] = saturate_cast<_Tp>(a[i]*alpha);
+    return a;
+}
+
+template<typename _Tp, int cn> static inline
+Vec<_Tp, cn>& operator *= (Vec<_Tp, cn>& a, float alpha)
+{
+    for( int i = 0; i < cn; i++ )
+        a[i] = saturate_cast<_Tp>(a[i]*alpha);
+    return a;
+}
+
+template<typename _Tp, int cn> static inline
+Vec<_Tp, cn>& operator *= (Vec<_Tp, cn>& a, double alpha)
+{
+    for( int i = 0; i < cn; i++ )
+        a[i] = saturate_cast<_Tp>(a[i]*alpha);
+    return a;
+}
+
+template<typename _Tp, int cn> static inline
+Vec<_Tp, cn>& operator /= (Vec<_Tp, cn>& a, int alpha)
+{
+    double ialpha = 1./alpha;
+    for( int i = 0; i < cn; i++ )
+        a[i] = saturate_cast<_Tp>(a[i]*ialpha);
+    return a;
+}
+
+template<typename _Tp, int cn> static inline
+Vec<_Tp, cn>& operator /= (Vec<_Tp, cn>& a, float alpha)
+{
+    float ialpha = 1.f/alpha;
+    for( int i = 0; i < cn; i++ )
+        a[i] = saturate_cast<_Tp>(a[i]*ialpha);
+    return a;
+}
+
+template<typename _Tp, int cn> static inline
+Vec<_Tp, cn>& operator /= (Vec<_Tp, cn>& a, double alpha)
+{
+    double ialpha = 1./alpha;
+    for( int i = 0; i < cn; i++ )
+        a[i] = saturate_cast<_Tp>(a[i]*ialpha);
+    return a;
+}
+
+template<typename _Tp, int cn> static inline
+Vec<_Tp, cn> operator * (const Vec<_Tp, cn>& a, int alpha)
+{
+    return Vec<_Tp, cn>(a, alpha, Matx_ScaleOp());
+}
+
+template<typename _Tp, int cn> static inline
+Vec<_Tp, cn> operator * (int alpha, const Vec<_Tp, cn>& a)
+{
+    return Vec<_Tp, cn>(a, alpha, Matx_ScaleOp());
+}
+
+template<typename _Tp, int cn> static inline
+Vec<_Tp, cn> operator * (const Vec<_Tp, cn>& a, float alpha)
+{
+    return Vec<_Tp, cn>(a, alpha, Matx_ScaleOp());
+}
+
+template<typename _Tp, int cn> static inline
+Vec<_Tp, cn> operator * (float alpha, const Vec<_Tp, cn>& a)
+{
+    return Vec<_Tp, cn>(a, alpha, Matx_ScaleOp());
+}
+
+template<typename _Tp, int cn> static inline
+Vec<_Tp, cn> operator * (const Vec<_Tp, cn>& a, double alpha)
+{
+    return Vec<_Tp, cn>(a, alpha, Matx_ScaleOp());
+}
+
+template<typename _Tp, int cn> static inline
+Vec<_Tp, cn> operator * (double alpha, const Vec<_Tp, cn>& a)
+{
+    return Vec<_Tp, cn>(a, alpha, Matx_ScaleOp());
+}
+
+template<typename _Tp, int cn> static inline
+Vec<_Tp, cn> operator / (const Vec<_Tp, cn>& a, int alpha)
+{
+    return Vec<_Tp, cn>(a, 1./alpha, Matx_ScaleOp());
+}
+
+template<typename _Tp, int cn> static inline
+Vec<_Tp, cn> operator / (const Vec<_Tp, cn>& a, float alpha)
+{
+    return Vec<_Tp, cn>(a, 1.f/alpha, Matx_ScaleOp());
+}
+
+template<typename _Tp, int cn> static inline
+Vec<_Tp, cn> operator / (const Vec<_Tp, cn>& a, double alpha)
+{
+    return Vec<_Tp, cn>(a, 1./alpha, Matx_ScaleOp());
+}
+
+template<typename _Tp, int cn> static inline
+Vec<_Tp, cn> operator - (const Vec<_Tp, cn>& a)
+{
+    Vec<_Tp,cn> t;
+    for( int i = 0; i < cn; i++ ) t.val[i] = saturate_cast<_Tp>(-a.val[i]);
+    return t;
+}
+
+template<typename _Tp> inline Vec<_Tp, 4> operator * (const Vec<_Tp, 4>& v1, const Vec<_Tp, 4>& v2)
+{
+    return Vec<_Tp, 4>(saturate_cast<_Tp>(v1[0]*v2[0] - v1[1]*v2[1] - v1[2]*v2[2] - v1[3]*v2[3]),
+                       saturate_cast<_Tp>(v1[0]*v2[1] + v1[1]*v2[0] + v1[2]*v2[3] - v1[3]*v2[2]),
+                       saturate_cast<_Tp>(v1[0]*v2[2] - v1[1]*v2[3] + v1[2]*v2[0] + v1[3]*v2[1]),
+                       saturate_cast<_Tp>(v1[0]*v2[3] + v1[1]*v2[2] - v1[2]*v2[1] + v1[3]*v2[0]));
+}
+
+template<typename _Tp> inline Vec<_Tp, 4>& operator *= (Vec<_Tp, 4>& v1, const Vec<_Tp, 4>& v2)
+{
+    v1 = v1 * v2;
+    return v1;
+}
+
+} // cv::
+
+#endif // OPENCV_CORE_MATX_INL_HPP
diff --git a/3rdParty/opencv2/core/neon_utils.hpp b/3rdParty/opencv-4.12.0/opencv2/core/neon_utils.hpp
similarity index 100%
rename from 3rdParty/opencv2/core/neon_utils.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/neon_utils.hpp
diff --git a/3rdParty/opencv2/core/ocl.hpp b/3rdParty/opencv-4.12.0/opencv2/core/ocl.hpp
similarity index 96%
rename from 3rdParty/opencv2/core/ocl.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/ocl.hpp
index bb243937b9..ab561691d8 100644
--- a/3rdParty/opencv2/core/ocl.hpp
+++ b/3rdParty/opencv-4.12.0/opencv2/core/ocl.hpp
@@ -127,6 +127,11 @@ class CV_EXPORTS_W_SIMPLE Device
     CV_WRAP int singleFPConfig() const;
     CV_WRAP int halfFPConfig() const;
 
+    /// true if 'cl_khr_fp64' extension is available
+    CV_WRAP bool hasFP64() const;
+    /// true if 'cl_khr_fp16' extension is available
+    CV_WRAP bool hasFP16() const;
+
     CV_WRAP bool endianLittle() const;
     CV_WRAP bool errorCorrectionSupport() const;
 
@@ -697,7 +702,8 @@ class CV_EXPORTS PlatformInfo
     Impl* p;
 };
 
-CV_EXPORTS const char* convertTypeStr(int sdepth, int ddepth, int cn, char* buf);
+CV_EXPORTS CV_DEPRECATED const char* convertTypeStr(int sdepth, int ddepth, int cn, char* buf);
+CV_EXPORTS const char* convertTypeStr(int sdepth, int ddepth, int cn, char* buf, size_t buf_size);
 CV_EXPORTS const char* typeToStr(int t);
 CV_EXPORTS const char* memopTypeToStr(int t);
 CV_EXPORTS const char* vecopTypeToStr(int t);
@@ -778,7 +784,7 @@ class CV_EXPORTS Timer
     void start();
     void stop();
 
-    uint64 durationNS() const; //< duration in nanoseconds
+    uint64 durationNS() const; ///< duration in nanoseconds
 
 protected:
     struct Impl;
diff --git a/3rdParty/opencv2/core/ocl_genbase.hpp b/3rdParty/opencv-4.12.0/opencv2/core/ocl_genbase.hpp
similarity index 100%
rename from 3rdParty/opencv2/core/ocl_genbase.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/ocl_genbase.hpp
diff --git a/3rdParty/opencv2/core/opencl/ocl_defs.hpp b/3rdParty/opencv-4.12.0/opencv2/core/opencl/ocl_defs.hpp
similarity index 100%
rename from 3rdParty/opencv2/core/opencl/ocl_defs.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/opencl/ocl_defs.hpp
diff --git a/3rdParty/opencv2/core/opencl/opencl_info.hpp b/3rdParty/opencv-4.12.0/opencv2/core/opencl/opencl_info.hpp
similarity index 95%
rename from 3rdParty/opencv2/core/opencl/opencl_info.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/opencl/opencl_info.hpp
index 3baf301fcd..06c5f9b94d 100644
--- a/3rdParty/opencv2/core/opencl/opencl_info.hpp
+++ b/3rdParty/opencv-4.12.0/opencv2/core/opencl/opencl_info.hpp
@@ -3,6 +3,7 @@
 // of this distribution and at http://opencv.org/license.html.
 
 #include <iostream>
+#include <sstream>
 
 #include <opencv2/core.hpp>
 #include <opencv2/core/ocl.hpp>
@@ -140,13 +141,13 @@ static void dumpOpenCLInformation()
         DUMP_MESSAGE_STDOUT("    Max memory allocation size = " << maxMemAllocSizeStr);
         DUMP_CONFIG_PROPERTY("cv_ocl_current_maxMemAllocSize", device.maxMemAllocSize());
 
-        const char* doubleSupportStr = device.doubleFPConfig() > 0 ? "Yes" : "No";
+        const char* doubleSupportStr = device.hasFP64() ? "Yes" : "No";
         DUMP_MESSAGE_STDOUT("    Double support = " << doubleSupportStr);
-        DUMP_CONFIG_PROPERTY("cv_ocl_current_haveDoubleSupport", device.doubleFPConfig() > 0);
+        DUMP_CONFIG_PROPERTY("cv_ocl_current_haveDoubleSupport", device.hasFP64());
 
-        const char* halfSupportStr = device.halfFPConfig() > 0 ? "Yes" : "No";
+        const char* halfSupportStr = device.hasFP16() ? "Yes" : "No";
         DUMP_MESSAGE_STDOUT("    Half support = " << halfSupportStr);
-        DUMP_CONFIG_PROPERTY("cv_ocl_current_haveHalfSupport", device.halfFPConfig() > 0);
+        DUMP_CONFIG_PROPERTY("cv_ocl_current_haveHalfSupport", device.hasFP16());
 
         const char* isUnifiedMemoryStr = device.hostUnifiedMemory() ? "Yes" : "No";
         DUMP_MESSAGE_STDOUT("    Host unified memory = " << isUnifiedMemoryStr);
diff --git a/3rdParty/opencv2/core/opencl/opencl_svm.hpp b/3rdParty/opencv-4.12.0/opencv2/core/opencl/opencl_svm.hpp
similarity index 100%
rename from 3rdParty/opencv2/core/opencl/opencl_svm.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/opencl/opencl_svm.hpp
diff --git a/3rdParty/opencv2/core/opencl/runtime/autogenerated/opencl_clblas.hpp b/3rdParty/opencv-4.12.0/opencv2/core/opencl/runtime/autogenerated/opencl_clblas.hpp
similarity index 100%
rename from 3rdParty/opencv2/core/opencl/runtime/autogenerated/opencl_clblas.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/opencl/runtime/autogenerated/opencl_clblas.hpp
diff --git a/3rdParty/opencv2/core/opencl/runtime/autogenerated/opencl_clfft.hpp b/3rdParty/opencv-4.12.0/opencv2/core/opencl/runtime/autogenerated/opencl_clfft.hpp
similarity index 100%
rename from 3rdParty/opencv2/core/opencl/runtime/autogenerated/opencl_clfft.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/opencl/runtime/autogenerated/opencl_clfft.hpp
diff --git a/3rdParty/opencv2/core/opencl/runtime/autogenerated/opencl_core.hpp b/3rdParty/opencv-4.12.0/opencv2/core/opencl/runtime/autogenerated/opencl_core.hpp
similarity index 100%
rename from 3rdParty/opencv2/core/opencl/runtime/autogenerated/opencl_core.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/opencl/runtime/autogenerated/opencl_core.hpp
diff --git a/3rdParty/opencv2/core/opencl/runtime/autogenerated/opencl_core_wrappers.hpp b/3rdParty/opencv-4.12.0/opencv2/core/opencl/runtime/autogenerated/opencl_core_wrappers.hpp
similarity index 100%
rename from 3rdParty/opencv2/core/opencl/runtime/autogenerated/opencl_core_wrappers.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/opencl/runtime/autogenerated/opencl_core_wrappers.hpp
diff --git a/3rdParty/opencv2/core/opencl/runtime/autogenerated/opencl_gl.hpp b/3rdParty/opencv-4.12.0/opencv2/core/opencl/runtime/autogenerated/opencl_gl.hpp
similarity index 100%
rename from 3rdParty/opencv2/core/opencl/runtime/autogenerated/opencl_gl.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/opencl/runtime/autogenerated/opencl_gl.hpp
diff --git a/3rdParty/opencv2/core/opencl/runtime/autogenerated/opencl_gl_wrappers.hpp b/3rdParty/opencv-4.12.0/opencv2/core/opencl/runtime/autogenerated/opencl_gl_wrappers.hpp
similarity index 100%
rename from 3rdParty/opencv2/core/opencl/runtime/autogenerated/opencl_gl_wrappers.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/opencl/runtime/autogenerated/opencl_gl_wrappers.hpp
diff --git a/3rdParty/opencv2/core/opencl/runtime/opencl_clblas.hpp b/3rdParty/opencv-4.12.0/opencv2/core/opencl/runtime/opencl_clblas.hpp
similarity index 100%
rename from 3rdParty/opencv2/core/opencl/runtime/opencl_clblas.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/opencl/runtime/opencl_clblas.hpp
diff --git a/3rdParty/opencv2/core/opencl/runtime/opencl_clfft.hpp b/3rdParty/opencv-4.12.0/opencv2/core/opencl/runtime/opencl_clfft.hpp
similarity index 100%
rename from 3rdParty/opencv2/core/opencl/runtime/opencl_clfft.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/opencl/runtime/opencl_clfft.hpp
diff --git a/3rdParty/opencv2/core/opencl/runtime/opencl_core.hpp b/3rdParty/opencv-4.12.0/opencv2/core/opencl/runtime/opencl_core.hpp
similarity index 100%
rename from 3rdParty/opencv2/core/opencl/runtime/opencl_core.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/opencl/runtime/opencl_core.hpp
diff --git a/3rdParty/opencv2/core/opencl/runtime/opencl_core_wrappers.hpp b/3rdParty/opencv-4.12.0/opencv2/core/opencl/runtime/opencl_core_wrappers.hpp
similarity index 100%
rename from 3rdParty/opencv2/core/opencl/runtime/opencl_core_wrappers.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/opencl/runtime/opencl_core_wrappers.hpp
diff --git a/3rdParty/opencv2/core/opencl/runtime/opencl_gl.hpp b/3rdParty/opencv-4.12.0/opencv2/core/opencl/runtime/opencl_gl.hpp
similarity index 100%
rename from 3rdParty/opencv2/core/opencl/runtime/opencl_gl.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/opencl/runtime/opencl_gl.hpp
diff --git a/3rdParty/opencv2/core/opencl/runtime/opencl_gl_wrappers.hpp b/3rdParty/opencv-4.12.0/opencv2/core/opencl/runtime/opencl_gl_wrappers.hpp
similarity index 100%
rename from 3rdParty/opencv2/core/opencl/runtime/opencl_gl_wrappers.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/opencl/runtime/opencl_gl_wrappers.hpp
diff --git a/3rdParty/opencv2/core/opencl/runtime/opencl_svm_20.hpp b/3rdParty/opencv-4.12.0/opencv2/core/opencl/runtime/opencl_svm_20.hpp
similarity index 100%
rename from 3rdParty/opencv2/core/opencl/runtime/opencl_svm_20.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/opencl/runtime/opencl_svm_20.hpp
diff --git a/3rdParty/opencv2/core/opencl/runtime/opencl_svm_definitions.hpp b/3rdParty/opencv-4.12.0/opencv2/core/opencl/runtime/opencl_svm_definitions.hpp
similarity index 100%
rename from 3rdParty/opencv2/core/opencl/runtime/opencl_svm_definitions.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/opencl/runtime/opencl_svm_definitions.hpp
diff --git a/3rdParty/opencv2/core/opencl/runtime/opencl_svm_hsa_extension.hpp b/3rdParty/opencv-4.12.0/opencv2/core/opencl/runtime/opencl_svm_hsa_extension.hpp
similarity index 100%
rename from 3rdParty/opencv2/core/opencl/runtime/opencl_svm_hsa_extension.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/opencl/runtime/opencl_svm_hsa_extension.hpp
diff --git a/3rdParty/opencv2/core/opengl.hpp b/3rdParty/opencv-4.12.0/opencv2/core/opengl.hpp
similarity index 95%
rename from 3rdParty/opencv2/core/opengl.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/opengl.hpp
index 1902fc9bae..72387bd824 100644
--- a/3rdParty/opencv2/core/opengl.hpp
+++ b/3rdParty/opencv-4.12.0/opencv2/core/opengl.hpp
@@ -57,7 +57,7 @@ This section describes OpenGL interoperability.
 
 To enable OpenGL support, configure OpenCV using CMake with WITH_OPENGL=ON . Currently OpenGL is
 supported only with WIN32, GTK and Qt backends on Windows and Linux (MacOS and Android are not
-supported). For GTK backend gtkglext-1.0 library is required.
+supported). For GTK-2.0 backend gtkglext-1.0 library is required.
 
 To use OpenGL functionality you should first create OpenGL context (window or frame buffer). You can
 do this with namedWindow function or with other OpenGL toolkit (GLUT, for example).
@@ -703,10 +703,18 @@ cv::ogl::Texture2D::Format cv::ogl::Texture2D::format() const
 
 ///////
 
+// WARNING: unreachable code using Ninja
+#if defined _MSC_VER && _MSC_VER >= 1920
+#pragma warning(push)
+#pragma warning(disable: 4702)
+#endif
 inline
 cv::ogl::Arrays::Arrays() : size_(0)
 {
 }
+#if defined _MSC_VER && _MSC_VER >= 1920
+#pragma warning(pop)
+#endif
 
 inline
 int cv::ogl::Arrays::size() const
diff --git a/3rdParty/opencv2/core/operations.hpp b/3rdParty/opencv-4.12.0/opencv2/core/operations.hpp
similarity index 95%
rename from 3rdParty/opencv2/core/operations.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/operations.hpp
index 56f7ffe40c..f754b6f01b 100644
--- a/3rdParty/opencv2/core/operations.hpp
+++ b/3rdParty/opencv-4.12.0/opencv2/core/operations.hpp
@@ -61,10 +61,10 @@
 #  define CV_FORMAT_PRINTF(A, B)
 #endif
 
-//! @cond IGNORED
-
 namespace cv
 {
+//! @cond IGNORED
+
 
 ////////////////////////////// Matx methods depending on core API /////////////////////////////
 
@@ -424,26 +424,6 @@ template<typename _Tp> static inline _Tp randu()
   return (_Tp)theRNG();
 }
 
-///////////////////////////////// Formatted string generation /////////////////////////////////
-
-/** @brief Returns a text string formatted using the printf-like expression.
-
-The function acts like sprintf but forms and returns an STL string. It can be used to form an error
-message in the Exception constructor.
-@param fmt printf-compatible formatting specifiers.
-
-**Note**:
-|Type|Specifier|
-|-|-|
-|`const char*`|`%s`|
-|`char`|`%c`|
-|`float` / `double`|`%f`,`%g`|
-|`int`, `long`, `long long`|`%d`, `%ld`, ``%lld`|
-|`unsigned`, `unsigned long`, `unsigned long long`|`%u`, `%lu`, `%llu`|
-|`uint64` -> `uintmax_t`, `int64` -> `intmax_t`|`%ju`, `%jd`|
-|`size_t`|`%zu`|
- */
-CV_EXPORTS String format( const char* fmt, ... ) CV_FORMAT_PRINTF(1, 2);
 
 ///////////////////////////////// Formatted output of cv::Mat /////////////////////////////////
 
@@ -496,6 +476,28 @@ int print(const Matx<_Tp, m, n>& matx, FILE* stream = stdout)
 
 //! @endcond
 
+///////////////////////////////// Formatted string generation /////////////////////////////////
+
+/** @brief Returns a text string formatted using the printf-like expression.
+
+The function acts like sprintf but forms and returns an STL string. It can be used to form an error
+message in the Exception constructor.
+@param fmt printf-compatible formatting specifiers.
+
+**Note**:
+|Type|Specifier|
+|-|-|
+|`const char*`|`%s`|
+|`char`|`%c`|
+|`float` / `double`|`%f`,`%g`|
+|`int`, `long`, `long long`|`%d`, `%ld`, ``%lld`|
+|`unsigned`, `unsigned long`, `unsigned long long`|`%u`, `%lu`, `%llu`|
+|`uint64` -> `uintmax_t`, `int64` -> `intmax_t`|`%ju`, `%jd`|
+|`size_t`|`%zu`|
+@ingroup core_utils
+ */
+CV_EXPORTS String format(const char* fmt, ...) CV_FORMAT_PRINTF(1, 2);
+
 /****************************************************************************************\
 *                                  Auxiliary algorithms                                  *
 \****************************************************************************************/
@@ -506,7 +508,7 @@ The generic function partition implements an \f$O(N^2)\f$ algorithm for splittin
 into one or more equivalency classes, as described in
 <http://en.wikipedia.org/wiki/Disjoint-set_data_structure> . The function returns the number of
 equivalency classes.
-@param _vec Set of elements stored as a vector.
+@param vec Set of elements stored as a vector.
 @param labels Output vector of labels. It contains as many elements as vec. Each label labels[i] is
 a 0-based cluster index of `vec[i]`.
 @param predicate Equivalence predicate (pointer to a boolean function of two arguments or an
@@ -516,11 +518,11 @@ may or may not be in the same class.
 @ingroup core_cluster
 */
 template<typename _Tp, class _EqPredicate> int
-partition( const std::vector<_Tp>& _vec, std::vector<int>& labels,
+partition( const std::vector<_Tp>& vec, std::vector<int>& labels,
           _EqPredicate predicate=_EqPredicate())
 {
-    int i, j, N = (int)_vec.size();
-    const _Tp* vec = &_vec[0];
+    int i, j, N = (int)vec.size();
+    const _Tp* _vec = &vec[0];
 
     const int PARENT=0;
     const int RANK=1;
@@ -546,7 +548,7 @@ partition( const std::vector<_Tp>& _vec, std::vector<int>& labels,
 
         for( j = 0; j < N; j++ )
         {
-            if( i == j || !predicate(vec[i], vec[j]))
+            if( i == j || !predicate(_vec[i], _vec[j]))
                 continue;
             int root2 = j;
 
diff --git a/3rdParty/opencv2/core/optim.hpp b/3rdParty/opencv-4.12.0/opencv2/core/optim.hpp
similarity index 96%
rename from 3rdParty/opencv2/core/optim.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/optim.hpp
index 6770cc1b9e..6dfb59e81e 100644
--- a/3rdParty/opencv2/core/optim.hpp
+++ b/3rdParty/opencv-4.12.0/opencv2/core/optim.hpp
@@ -256,6 +256,7 @@ class CV_EXPORTS ConjGradSolver : public MinProblemSolver
 //! return codes for cv::solveLP() function
 enum SolveLPResult
 {
+    SOLVELP_LOST   = -3, //!< problem is feasible, but solver lost solution due to floating-point arithmetic errors
     SOLVELP_UNBOUNDED    = -2, //!< problem is unbounded (target function can achieve arbitrary high values)
     SOLVELP_UNFEASIBLE    = -1, //!< problem is unfeasible (there are no points that satisfy all the constraints imposed)
     SOLVELP_SINGLE    = 0, //!< there is only one maximum for target function
@@ -291,8 +292,12 @@ in the latter case it is understood to correspond to \f$c^T\f$.
 and the remaining to \f$A\f$. It should contain 32- or 64-bit floating point numbers.
 @param z The solution will be returned here as a column-vector - it corresponds to \f$c\f$ in the
 formulation above. It will contain 64-bit floating point numbers.
+@param constr_eps allowed numeric disparity for constraints
 @return One of cv::SolveLPResult
  */
+CV_EXPORTS_W int solveLP(InputArray Func, InputArray Constr, OutputArray z, double constr_eps);
+
+/** @overload */
 CV_EXPORTS_W int solveLP(InputArray Func, InputArray Constr, OutputArray z);
 
 //! @}
diff --git a/3rdParty/opencv2/core/ovx.hpp b/3rdParty/opencv-4.12.0/opencv2/core/ovx.hpp
similarity index 100%
rename from 3rdParty/opencv2/core/ovx.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/ovx.hpp
diff --git a/3rdParty/opencv2/core/parallel/backend/parallel_for.openmp.hpp b/3rdParty/opencv-4.12.0/opencv2/core/parallel/backend/parallel_for.openmp.hpp
similarity index 100%
rename from 3rdParty/opencv2/core/parallel/backend/parallel_for.openmp.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/parallel/backend/parallel_for.openmp.hpp
diff --git a/3rdParty/opencv2/core/parallel/backend/parallel_for.tbb.hpp b/3rdParty/opencv-4.12.0/opencv2/core/parallel/backend/parallel_for.tbb.hpp
similarity index 100%
rename from 3rdParty/opencv2/core/parallel/backend/parallel_for.tbb.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/parallel/backend/parallel_for.tbb.hpp
diff --git a/3rdParty/opencv2/core/parallel/parallel_backend.hpp b/3rdParty/opencv-4.12.0/opencv2/core/parallel/parallel_backend.hpp
similarity index 100%
rename from 3rdParty/opencv2/core/parallel/parallel_backend.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/parallel/parallel_backend.hpp
diff --git a/3rdParty/opencv2/core/persistence.hpp b/3rdParty/opencv-4.12.0/opencv2/core/persistence.hpp
similarity index 92%
rename from 3rdParty/opencv2/core/persistence.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/persistence.hpp
index dbd1225989..cac3755aae 100644
--- a/3rdParty/opencv2/core/persistence.hpp
+++ b/3rdParty/opencv-4.12.0/opencv2/core/persistence.hpp
@@ -53,50 +53,6 @@
 #  error persistence.hpp header must be compiled as C++
 #endif
 
-//! @addtogroup core_c
-//! @{
-
-/** @brief "black box" representation of the file storage associated with a file on disk.
-
-Several functions that are described below take CvFileStorage\* as inputs and allow the user to
-save or to load hierarchical collections that consist of scalar values, standard CXCore objects
-(such as matrices, sequences, graphs), and user-defined objects.
-
-OpenCV can read and write data in XML (<http://www.w3c.org/XML>), YAML (<http://www.yaml.org>) or
-JSON (<http://www.json.org/>) formats. Below is an example of 3x3 floating-point identity matrix A,
-stored in XML and YAML files
-using CXCore functions:
-XML:
-@code{.xml}
-    <?xml version="1.0">
-    <opencv_storage>
-    <A type_id="opencv-matrix">
-      <rows>3</rows>
-      <cols>3</cols>
-      <dt>f</dt>
-      <data>1. 0. 0. 0. 1. 0. 0. 0. 1.</data>
-    </A>
-    </opencv_storage>
-@endcode
-YAML:
-@code{.yaml}
-    %YAML:1.0
-    A: !!opencv-matrix
-      rows: 3
-      cols: 3
-      dt: f
-      data: [ 1., 0., 0., 0., 1., 0., 0., 0., 1.]
-@endcode
-As it can be seen from the examples, XML uses nested tags to represent hierarchy, while YAML uses
-indentation for that purpose (similar to the Python programming language).
-
-The same functions can read and write data in both formats; the particular format is determined by
-the extension of the opened file, ".xml" for XML files, ".yml" or ".yaml" for YAML and ".json" for
-JSON.
- */
-
-//! @} core_c
-
 #include "opencv2/core/types.hpp"
 #include "opencv2/core/mat.hpp"
 
@@ -283,13 +239,14 @@ element is a structure of 2 integers, followed by a single-precision floating-po
 equivalent notations of the above specification are `iif`, `2i1f` and so forth. Other examples: `u`
 means that the array consists of bytes, and `2d` means the array consists of pairs of doubles.
 
-@see @ref samples/cpp/filestorage.cpp
+@see @ref samples/cpp/tutorial_code/core/file_input_output/file_input_output.cpp
 */
 
 //! @{
 
-/** @example samples/cpp/filestorage.cpp
+/** @example samples/cpp/tutorial_code/core/file_input_output/file_input_output.cpp
 A complete example using the FileStorage interface
+Check @ref tutorial_file_input_output_with_xml_yml "the corresponding tutorial" for more details
 */
 
 ////////////////////////// XML & YAML I/O //////////////////////////
@@ -322,10 +279,10 @@ class CV_EXPORTS_W FileStorage
     };
     enum State
     {
-        UNDEFINED      = 0,
-        VALUE_EXPECTED = 1,
-        NAME_EXPECTED  = 2,
-        INSIDE_MAP     = 4
+        UNDEFINED      = 0,  //!< Initial or uninitialized state.
+        VALUE_EXPECTED = 1,  //!< Expecting a value in the current position.
+        NAME_EXPECTED  = 2,  //!< Expecting a key/name in the current position.
+        INSIDE_MAP     = 4   //!< Indicates being inside a map (a set of key-value pairs).
     };
 
     /** @brief The constructors.
@@ -408,6 +365,8 @@ class CV_EXPORTS_W FileStorage
      */
     CV_WRAP void write(const String& name, int val);
     /// @overload
+    CV_WRAP void write(const String& name, int64_t val);
+    /// @overload
     CV_WRAP void write(const String& name, double val);
     /// @overload
     CV_WRAP void write(const String& name, const String& val);
@@ -573,6 +532,8 @@ class CV_EXPORTS_W_SIMPLE FileNode
     CV_WRAP size_t rawSize() const;
     //! returns the node content as an integer. If the node stores floating-point number, it is rounded.
     operator int() const;
+    //! returns the node content as a signed 64bit integer. If the node stores floating-point number, it is rounded.
+    operator int64_t() const;
     //! returns the node content as float
     operator float() const;
     //! returns the node content as double
@@ -696,10 +657,8 @@ class CV_EXPORTS FileNodeIterator
 
 /////////////////// XML & YAML I/O implementation //////////////////
 
-//! @relates cv::FileStorage
-//! @{
-
 CV_EXPORTS void write( FileStorage& fs, const String& name, int value );
+CV_EXPORTS void write( FileStorage& fs, const String& name, int64_t value );
 CV_EXPORTS void write( FileStorage& fs, const String& name, float value );
 CV_EXPORTS void write( FileStorage& fs, const String& name, double value );
 CV_EXPORTS void write( FileStorage& fs, const String& name, const String& value );
@@ -711,16 +670,13 @@ CV_EXPORTS void write( FileStorage& fs, const String& name, const std::vector<DM
 #endif
 
 CV_EXPORTS void writeScalar( FileStorage& fs, int value );
+CV_EXPORTS void writeScalar( FileStorage& fs, int64_t value );
 CV_EXPORTS void writeScalar( FileStorage& fs, float value );
 CV_EXPORTS void writeScalar( FileStorage& fs, double value );
 CV_EXPORTS void writeScalar( FileStorage& fs, const String& value );
 
-//! @}
-
-//! @relates cv::FileNode
-//! @{
-
 CV_EXPORTS void read(const FileNode& node, int& value, int default_value);
+CV_EXPORTS void read(const FileNode& node, int64_t& value, int64_t default_value);
 CV_EXPORTS void read(const FileNode& node, float& value, float default_value);
 CV_EXPORTS void read(const FileNode& node, double& value, double default_value);
 CV_EXPORTS void read(const FileNode& node, std::string& value, const std::string& default_value);
@@ -796,10 +752,7 @@ static inline void read(const FileNode& node, Range& value, const Range& default
     value.start = temp.x; value.end = temp.y;
 }
 
-//! @}
-
 /** @brief Writes string to a file storage.
-@relates cv::FileStorage
  */
 CV_EXPORTS FileStorage& operator << (FileStorage& fs, const String& str);
 
@@ -884,9 +837,6 @@ namespace internal
 
 //! @endcond
 
-//! @relates cv::FileStorage
-//! @{
-
 template<typename _Tp> static inline
 void write(FileStorage& fs, const _Tp& value)
 {
@@ -1118,10 +1068,6 @@ static inline void write(FileStorage& fs, const std::vector<DMatch>& vec)
 }
 #endif
 
-//! @} FileStorage
-
-//! @relates cv::FileNode
-//! @{
 
 static inline
 void read(const FileNode& node, bool& value, bool default_value)
@@ -1208,11 +1154,6 @@ void read( const FileNode& node, std::vector<DMatch>& vec, const std::vector<DMa
         read(node, vec);
 }
 
-//! @} FileNode
-
-//! @relates cv::FileStorage
-//! @{
-
 /** @brief Writes data to a file storage.
  */
 template<typename _Tp> static inline
@@ -1244,11 +1185,6 @@ FileStorage& operator << (FileStorage& fs, char* value)
     return (fs << String(value));
 }
 
-//! @} FileStorage
-
-//! @relates cv::FileNodeIterator
-//! @{
-
 /** @brief Reads data from a file storage.
  */
 template<typename _Tp> static inline
@@ -1268,11 +1204,6 @@ FileNodeIterator& operator >> (FileNodeIterator& it, std::vector<_Tp>& vec)
     return it;
 }
 
-//! @} FileNodeIterator
-
-//! @relates cv::FileNode
-//! @{
-
 /** @brief Reads data from a file storage.
  */
 template<typename _Tp> static inline
@@ -1323,11 +1254,6 @@ void operator >> (const FileNode& n, DMatch& m)
     it >> m.queryIdx >> m.trainIdx >> m.imgIdx >> m.distance;
 }
 
-//! @} FileNode
-
-//! @relates cv::FileNodeIterator
-//! @{
-
 CV_EXPORTS bool operator == (const FileNodeIterator& it1, const FileNodeIterator& it2);
 CV_EXPORTS bool operator != (const FileNodeIterator& it1, const FileNodeIterator& it2);
 
@@ -1343,8 +1269,6 @@ bool operator < (const FileNodeIterator& it1, const FileNodeIterator& it2)
     return it1.remaining() > it2.remaining();
 }
 
-//! @} FileNodeIterator
-
 } // cv
 
 #endif // OPENCV_CORE_PERSISTENCE_HPP
diff --git a/3rdParty/opencv2/core/quaternion.hpp b/3rdParty/opencv-4.12.0/opencv2/core/quaternion.hpp
similarity index 96%
rename from 3rdParty/opencv2/core/quaternion.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/quaternion.hpp
index ce0165a48a..ab96ce2bae 100644
--- a/3rdParty/opencv2/core/quaternion.hpp
+++ b/3rdParty/opencv-4.12.0/opencv2/core/quaternion.hpp
@@ -31,7 +31,7 @@
 #include <iostream>
 namespace cv
 {
-//! @addtogroup core
+//! @addtogroup core_quaternion
 //! @{
 
 //! Unit quaternion flag
@@ -77,9 +77,9 @@ class QuatEnum
      * For intrinsic rotations in the order of X-Y-Z, the rotation matrix R can be calculated by:\f[R =X(\theta_1) Y(\theta_2) Z(\theta_3) \f]
      * For extrinsic rotations in the order of X-Y-Z, the rotation matrix R can be calculated by:\f[R =Z({\theta_3}) Y({\theta_2}) X({\theta_1})\f]
      * where
-     * \f[X({\theta})={\begin{bmatrix}1&0&0\\0&\cos {\theta_1} &-\sin {\theta_1} \\0&\sin {\theta_1} &\cos {\theta_1} \\\end{bmatrix}},
-     * Y({\theta})={\begin{bmatrix}\cos \theta_{2}&0&\sin \theta_{2}\\0&1 &0 \\\ -sin \theta_2& 0&\cos \theta_{2} \\\end{bmatrix}},
-     * Z({\theta})={\begin{bmatrix}\cos\theta_{3} &-\sin \theta_3&0\\\sin \theta_3 &\cos \theta_3 &0\\0&0&1\\\end{bmatrix}}.
+     * \f[X({\theta_1})={\begin{bmatrix}1&0&0\\0&\cos {\theta_1} &-\sin {\theta_1} \\0&\sin {\theta_1} &\cos {\theta_1} \\\end{bmatrix}},
+     * Y({\theta_2})={\begin{bmatrix}\cos \theta_{2}&0&\sin \theta_{2}\\0&1 &0 \\\ -sin \theta_2& 0&\cos \theta_{2} \\\end{bmatrix}},
+     * Z({\theta_3})={\begin{bmatrix}\cos\theta_{3} &-\sin \theta_3&0\\\sin \theta_3 &\cos \theta_3 &0\\0&0&1\\\end{bmatrix}}.
      * \f]
      *
      * The function is designed according to this set of conventions:
diff --git a/3rdParty/opencv2/core/quaternion.inl.hpp b/3rdParty/opencv-4.12.0/opencv2/core/quaternion.inl.hpp
similarity index 96%
rename from 3rdParty/opencv2/core/quaternion.inl.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/quaternion.inl.hpp
index 0c3a5e1264..9d5a6d86f1 100644
--- a/3rdParty/opencv2/core/quaternion.inl.hpp
+++ b/3rdParty/opencv-4.12.0/opencv2/core/quaternion.inl.hpp
@@ -28,7 +28,7 @@
 #define OPENCV_CORE_QUATERNION_INL_HPP
 
 #ifndef OPENCV_CORE_QUATERNION_HPP
-#erorr This is not a standalone header. Include quaternion.hpp instead.
+#error This is not a standalone header. Include quaternion.hpp instead.
 #endif
 
 //@cond IGNORE
@@ -745,8 +745,8 @@ Quat<T> Quat<T>::lerp(const Quat<T> &q0, const Quat<T> &q1, const T t)
 template <typename T>
 Quat<T> Quat<T>::slerp(const Quat<T> &q0, const Quat<T> &q1, const T t, QuatAssumeType assumeUnit, bool directChange)
 {
-    Quatd v0(q0);
-    Quatd v1(q1);
+    Quat<T> v0(q0);
+    Quat<T> v1(q1);
     if (!assumeUnit)
     {
         v0 = v0.normalize();
@@ -754,7 +754,7 @@ Quat<T> Quat<T>::slerp(const Quat<T> &q0, const Quat<T> &q1, const T t, QuatAssu
     }
     T cosTheta = v0.dot(v1);
     constexpr T DOT_THRESHOLD = 0.995;
-    if (cosTheta > DOT_THRESHOLD)
+    if (std::abs(cosTheta) > DOT_THRESHOLD)
     {
         return nlerp(v0, v1, t, QUAT_ASSUME_UNIT);
     }
@@ -843,7 +843,7 @@ Quat<T> Quat<T>::interPoint(const Quat<T> &q0, const Quat<T> &q1,
 template <typename T>
 Quat<T> Quat<T>::spline(const Quat<T> &q0, const Quat<T> &q1, const Quat<T> &q2, const Quat<T> &q3, const T t, QuatAssumeType assumeUnit)
 {
-    Quatd v0(q0), v1(q1), v2(q2), v3(q3);
+    Quat<T> v0(q0), v1(q1), v2(q2), v3(q3);
     if (!assumeUnit)
     {
         v0 = v0.normalize();
diff --git a/3rdParty/opencv2/core/saturate.hpp b/3rdParty/opencv-4.12.0/opencv2/core/saturate.hpp
similarity index 89%
rename from 3rdParty/opencv2/core/saturate.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/saturate.hpp
index 28ff2774b0..04951d42f2 100644
--- a/3rdParty/opencv2/core/saturate.hpp
+++ b/3rdParty/opencv-4.12.0/opencv2/core/saturate.hpp
@@ -46,6 +46,7 @@
 #define OPENCV_CORE_SATURATE_HPP
 
 #include "opencv2/core/cvdef.h"
+#include <climits>
 #include "opencv2/core/fast_math.hpp"
 
 namespace cv
@@ -157,20 +158,20 @@ template<> inline uint64 saturate_cast<uint64>(int64 v)      { return (uint64)st
 template<> inline int64 saturate_cast<int64>(uint64 v)       { return (int64)std::min(v, (uint64)LLONG_MAX); }
 
 /** @overload */
-template<typename _Tp> static inline _Tp saturate_cast(float16_t v) { return saturate_cast<_Tp>((float)v); }
+template<typename _Tp> static inline _Tp saturate_cast(hfloat v) { return saturate_cast<_Tp>((float)v); }
 
 // in theory, we could use a LUT for 8u/8s->16f conversion,
 // but with hardware support for FP32->FP16 conversion the current approach is preferable
-template<> inline float16_t saturate_cast<float16_t>(uchar v)   { return float16_t((float)v); }
-template<> inline float16_t saturate_cast<float16_t>(schar v)   { return float16_t((float)v); }
-template<> inline float16_t saturate_cast<float16_t>(ushort v)  { return float16_t((float)v); }
-template<> inline float16_t saturate_cast<float16_t>(short v)   { return float16_t((float)v); }
-template<> inline float16_t saturate_cast<float16_t>(unsigned v){ return float16_t((float)v); }
-template<> inline float16_t saturate_cast<float16_t>(int v)     { return float16_t((float)v); }
-template<> inline float16_t saturate_cast<float16_t>(uint64 v)  { return float16_t((float)v); }
-template<> inline float16_t saturate_cast<float16_t>(int64 v)   { return float16_t((float)v); }
-template<> inline float16_t saturate_cast<float16_t>(float v)   { return float16_t(v); }
-template<> inline float16_t saturate_cast<float16_t>(double v)  { return float16_t((float)v); }
+template<> inline hfloat saturate_cast<hfloat>(uchar v)   { return hfloat((float)v); }
+template<> inline hfloat saturate_cast<hfloat>(schar v)   { return hfloat((float)v); }
+template<> inline hfloat saturate_cast<hfloat>(ushort v)  { return hfloat((float)v); }
+template<> inline hfloat saturate_cast<hfloat>(short v)   { return hfloat((float)v); }
+template<> inline hfloat saturate_cast<hfloat>(unsigned v){ return hfloat((float)v); }
+template<> inline hfloat saturate_cast<hfloat>(int v)     { return hfloat((float)v); }
+template<> inline hfloat saturate_cast<hfloat>(uint64 v)  { return hfloat((float)v); }
+template<> inline hfloat saturate_cast<hfloat>(int64 v)   { return hfloat((float)v); }
+template<> inline hfloat saturate_cast<hfloat>(float v)   { return hfloat(v); }
+template<> inline hfloat saturate_cast<hfloat>(double v)  { return hfloat((float)v); }
 
 //! @}
 
diff --git a/3rdParty/opencv2/core/simd_intrinsics.hpp b/3rdParty/opencv-4.12.0/opencv2/core/simd_intrinsics.hpp
similarity index 100%
rename from 3rdParty/opencv2/core/simd_intrinsics.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/simd_intrinsics.hpp
diff --git a/3rdParty/opencv2/core/softfloat.hpp b/3rdParty/opencv-4.12.0/opencv2/core/softfloat.hpp
similarity index 100%
rename from 3rdParty/opencv2/core/softfloat.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/softfloat.hpp
diff --git a/3rdParty/opencv2/core/sse_utils.hpp b/3rdParty/opencv-4.12.0/opencv2/core/sse_utils.hpp
similarity index 100%
rename from 3rdParty/opencv2/core/sse_utils.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/sse_utils.hpp
diff --git a/3rdParty/opencv2/core/traits.hpp b/3rdParty/opencv-4.12.0/opencv2/core/traits.hpp
similarity index 95%
rename from 3rdParty/opencv2/core/traits.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/traits.hpp
index e206528df0..d17dc4e508 100644
--- a/3rdParty/opencv2/core/traits.hpp
+++ b/3rdParty/opencv-4.12.0/opencv2/core/traits.hpp
@@ -261,10 +261,10 @@ template<> class DataType<double>
          };
 };
 
-template<> class DataType<float16_t>
+template<> class DataType<hfloat>
 {
 public:
-    typedef float16_t   value_type;
+    typedef hfloat   value_type;
     typedef float       work_type;
     typedef value_type  channel_type;
     typedef value_type  vec_type;
@@ -347,7 +347,7 @@ template<> class TypeDepth<CV_64F>
 template<> class TypeDepth<CV_16F>
 {
     enum { depth = CV_16F };
-    typedef float16_t value_type;
+    typedef hfloat value_type;
 };
 
 #endif
diff --git a/3rdParty/opencv-4.12.0/opencv2/core/types.hpp b/3rdParty/opencv-4.12.0/opencv2/core/types.hpp
new file mode 100644
index 0000000000..fc9ed18820
--- /dev/null
+++ b/3rdParty/opencv-4.12.0/opencv2/core/types.hpp
@@ -0,0 +1,2487 @@
+/*M///////////////////////////////////////////////////////////////////////////////////////
+//
+//  IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
+//
+//  By downloading, copying, installing or using the software you agree to this license.
+//  If you do not agree to this license, do not download, install,
+//  copy or use the software.
+//
+//
+//                          License Agreement
+//                For Open Source Computer Vision Library
+//
+// Copyright (C) 2000-2008, Intel Corporation, all rights reserved.
+// Copyright (C) 2009, Willow Garage Inc., all rights reserved.
+// Copyright (C) 2013, OpenCV Foundation, all rights reserved.
+// Third party copyrights are property of their respective owners.
+//
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
+//
+//   * Redistribution's of source code must retain the above copyright notice,
+//     this list of conditions and the following disclaimer.
+//
+//   * Redistribution's in binary form must reproduce the above copyright notice,
+//     this list of conditions and the following disclaimer in the documentation
+//     and/or other materials provided with the distribution.
+//
+//   * The name of the copyright holders may not be used to endorse or promote products
+//     derived from this software without specific prior written permission.
+//
+// This software is provided by the copyright holders and contributors "as is" and
+// any express or implied warranties, including, but not limited to, the implied
+// warranties of merchantability and fitness for a particular purpose are disclaimed.
+// In no event shall the Intel Corporation or contributors be liable for any direct,
+// indirect, incidental, special, exemplary, or consequential damages
+// (including, but not limited to, procurement of substitute goods or services;
+// loss of use, data, or profits; or business interruption) however caused
+// and on any theory of liability, whether in contract, strict liability,
+// or tort (including negligence or otherwise) arising in any way out of
+// the use of this software, even if advised of the possibility of such damage.
+//
+//M*/
+
+#ifndef OPENCV_CORE_TYPES_HPP
+#define OPENCV_CORE_TYPES_HPP
+
+#ifndef __cplusplus
+#  error types.hpp header must be compiled as C++
+#endif
+
+#include <climits>
+#include <cfloat>
+#include <vector>
+#include <limits>
+
+#include "opencv2/core/cvdef.h"
+#include "opencv2/core/cvstd.hpp"
+#include "opencv2/core/matx.hpp"
+
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable: 4459)  // declaration of '...' hides global declaration
+#endif
+
+namespace cv
+{
+
+//! @addtogroup core_basic
+//! @{
+
+//////////////////////////////// Complex //////////////////////////////
+
+/** @brief  A complex number class.
+
+  The template class is similar and compatible with std::complex, however it provides slightly
+  more convenient access to the real and imaginary parts using through the simple field access, as opposite
+  to std::complex::real() and std::complex::imag().
+*/
+template<typename _Tp> class Complex
+{
+public:
+
+    //! default constructor
+    Complex();
+    Complex( _Tp _re, _Tp _im = 0 );
+
+    //! conversion to another data type
+    template<typename T2> operator Complex<T2>() const;
+    //! conjugation
+    Complex conj() const;
+
+    _Tp re, im; ///< the real and the imaginary parts
+};
+
+typedef Complex<float> Complexf;
+typedef Complex<double> Complexd;
+
+template<typename _Tp> class DataType< Complex<_Tp> >
+{
+public:
+    typedef Complex<_Tp> value_type;
+    typedef value_type   work_type;
+    typedef _Tp          channel_type;
+
+    enum { generic_type = 0,
+           channels     = 2,
+           fmt          = DataType<channel_type>::fmt + ((channels - 1) << 8)
+#ifdef OPENCV_TRAITS_ENABLE_DEPRECATED
+           ,depth        = DataType<channel_type>::depth
+           ,type         = CV_MAKETYPE(depth, channels)
+#endif
+    };
+
+    typedef Vec<channel_type, channels> vec_type;
+};
+
+namespace traits {
+template<typename _Tp>
+struct Depth< Complex<_Tp> > { enum { value = Depth<_Tp>::value }; };
+template<typename _Tp>
+struct Type< Complex<_Tp> > { enum { value = CV_MAKETYPE(Depth<_Tp>::value, 2) }; };
+} // namespace
+
+
+//////////////////////////////// Point_ ////////////////////////////////
+
+/** @brief Template class for 2D points specified by its coordinates `x` and `y`.
+
+An instance of the class is interchangeable with C structures, CvPoint and CvPoint2D32f . There is
+also a cast operator to convert point coordinates to the specified type. The conversion from
+floating-point coordinates to integer coordinates is done by rounding. Commonly, the conversion
+uses this operation for each of the coordinates. Besides the class members listed in the
+declaration above, the following operations on points are implemented:
+@code
+    pt1 = pt2 + pt3;
+    pt1 = pt2 - pt3;
+    pt1 = pt2 * a;
+    pt1 = a * pt2;
+    pt1 = pt2 / a;
+    pt1 += pt2;
+    pt1 -= pt2;
+    pt1 *= a;
+    pt1 /= a;
+    double value = norm(pt); // L2 norm
+    pt1 == pt2;
+    pt1 != pt2;
+@endcode
+For your convenience, the following type aliases are defined:
+@code
+    typedef Point_<int> Point2i;
+    typedef Point2i Point;
+    typedef Point_<float> Point2f;
+    typedef Point_<double> Point2d;
+@endcode
+Example:
+@code
+    Point2f a(0.3f, 0.f), b(0.f, 0.4f);
+    Point pt = (a + b)*10.f;
+    cout << pt.x << ", " << pt.y << endl;
+@endcode
+*/
+template<typename _Tp> class Point_
+{
+public:
+    typedef _Tp value_type;
+
+    //! default constructor
+    Point_();
+    Point_(_Tp _x, _Tp _y);
+#if (defined(__GNUC__) && __GNUC__ < 5) && !defined(__clang__)  // GCC 4.x bug. Details: https://github.com/opencv/opencv/pull/20837
+    Point_(const Point_& pt);
+    Point_(Point_&& pt) CV_NOEXCEPT = default;
+#elif OPENCV_ABI_COMPATIBILITY < 500
+    Point_(const Point_& pt) = default;
+    Point_(Point_&& pt) CV_NOEXCEPT = default;
+#endif
+    Point_(const Size_<_Tp>& sz);
+    Point_(const Vec<_Tp, 2>& v);
+
+#if (defined(__GNUC__) && __GNUC__ < 5) && !defined(__clang__)  // GCC 4.x bug. Details: https://github.com/opencv/opencv/pull/20837
+    Point_& operator = (const Point_& pt);
+    Point_& operator = (Point_&& pt) CV_NOEXCEPT = default;
+#elif OPENCV_ABI_COMPATIBILITY < 500
+    Point_& operator = (const Point_& pt) = default;
+    Point_& operator = (Point_&& pt) CV_NOEXCEPT = default;
+#endif
+    //! conversion to another data type
+    template<typename _Tp2> operator Point_<_Tp2>() const;
+
+    //! conversion to the old-style C structures
+    operator Vec<_Tp, 2>() const;
+
+    //! dot product
+    _Tp dot(const Point_& pt) const;
+    //! dot product computed in double-precision arithmetics
+    double ddot(const Point_& pt) const;
+    //! cross-product
+    double cross(const Point_& pt) const;
+    //! checks whether the point is inside the specified rectangle
+    bool inside(const Rect_<_Tp>& r) const;
+    _Tp x; //!< x coordinate of the point
+    _Tp y; //!< y coordinate of the point
+};
+
+typedef Point_<int> Point2i;
+typedef Point_<int64> Point2l;
+typedef Point_<float> Point2f;
+typedef Point_<double> Point2d;
+typedef Point2i Point;
+
+template<typename _Tp> class DataType< Point_<_Tp> >
+{
+public:
+    typedef Point_<_Tp>                               value_type;
+    typedef Point_<typename DataType<_Tp>::work_type> work_type;
+    typedef _Tp                                       channel_type;
+
+    enum { generic_type = 0,
+           channels     = 2,
+           fmt          = traits::SafeFmt<channel_type>::fmt + ((channels - 1) << 8)
+#ifdef OPENCV_TRAITS_ENABLE_DEPRECATED
+           ,depth        = DataType<channel_type>::depth
+           ,type         = CV_MAKETYPE(depth, channels)
+#endif
+         };
+
+    typedef Vec<channel_type, channels> vec_type;
+};
+
+namespace traits {
+template<typename _Tp>
+struct Depth< Point_<_Tp> > { enum { value = Depth<_Tp>::value }; };
+template<typename _Tp>
+struct Type< Point_<_Tp> > { enum { value = CV_MAKETYPE(Depth<_Tp>::value, 2) }; };
+} // namespace
+
+
+//////////////////////////////// Point3_ ////////////////////////////////
+
+/** @brief Template class for 3D points specified by its coordinates `x`, `y` and `z`.
+
+An instance of the class is interchangeable with the C structure CvPoint2D32f . Similarly to
+Point_ , the coordinates of 3D points can be converted to another type. The vector arithmetic and
+comparison operations are also supported.
+
+The following Point3_\<\> aliases are available:
+@code
+    typedef Point3_<int> Point3i;
+    typedef Point3_<float> Point3f;
+    typedef Point3_<double> Point3d;
+@endcode
+@see cv::Point3i, cv::Point3f and cv::Point3d
+*/
+template<typename _Tp> class Point3_
+{
+public:
+    typedef _Tp value_type;
+
+    //! default constructor
+    Point3_();
+    Point3_(_Tp _x, _Tp _y, _Tp _z);
+#if OPENCV_ABI_COMPATIBILITY < 500
+    Point3_(const Point3_& pt) = default;
+    Point3_(Point3_&& pt) CV_NOEXCEPT = default;
+#endif
+    explicit Point3_(const Point_<_Tp>& pt);
+    Point3_(const Vec<_Tp, 3>& v);
+
+#if OPENCV_ABI_COMPATIBILITY < 500
+    Point3_& operator = (const Point3_& pt) = default;
+    Point3_& operator = (Point3_&& pt) CV_NOEXCEPT = default;
+#endif
+    //! conversion to another data type
+    template<typename _Tp2> operator Point3_<_Tp2>() const;
+    //! conversion to cv::Vec<>
+    operator Vec<_Tp, 3>() const;
+
+    //! dot product
+    _Tp dot(const Point3_& pt) const;
+    //! dot product computed in double-precision arithmetics
+    double ddot(const Point3_& pt) const;
+    //! cross product of the 2 3D points
+    Point3_ cross(const Point3_& pt) const;
+    _Tp x; //!< x coordinate of the 3D point
+    _Tp y; //!< y coordinate of the 3D point
+    _Tp z; //!< z coordinate of the 3D point
+};
+
+typedef Point3_<int> Point3i;
+typedef Point3_<float> Point3f;
+typedef Point3_<double> Point3d;
+
+template<typename _Tp> class DataType< Point3_<_Tp> >
+{
+public:
+    typedef Point3_<_Tp>                               value_type;
+    typedef Point3_<typename DataType<_Tp>::work_type> work_type;
+    typedef _Tp                                        channel_type;
+
+    enum { generic_type = 0,
+           channels     = 3,
+           fmt          = traits::SafeFmt<channel_type>::fmt + ((channels - 1) << 8)
+#ifdef OPENCV_TRAITS_ENABLE_DEPRECATED
+           ,depth        = DataType<channel_type>::depth
+           ,type         = CV_MAKETYPE(depth, channels)
+#endif
+         };
+
+    typedef Vec<channel_type, channels> vec_type;
+};
+
+namespace traits {
+template<typename _Tp>
+struct Depth< Point3_<_Tp> > { enum { value = Depth<_Tp>::value }; };
+template<typename _Tp>
+struct Type< Point3_<_Tp> > { enum { value = CV_MAKETYPE(Depth<_Tp>::value, 3) }; };
+} // namespace
+
+//////////////////////////////// Size_ ////////////////////////////////
+
+/** @brief Template class for specifying the size of an image or rectangle.
+
+The class includes two members called width and height. The structure can be converted to and from
+the old OpenCV structures CvSize and CvSize2D32f . The same set of arithmetic and comparison
+operations as for Point_ is available.
+
+OpenCV defines the following Size_\<\> aliases:
+@code
+    typedef Size_<int> Size2i;
+    typedef Size2i Size;
+    typedef Size_<float> Size2f;
+@endcode
+*/
+template<typename _Tp> class Size_
+{
+public:
+    typedef _Tp value_type;
+
+    //! default constructor
+    Size_();
+    Size_(_Tp _width, _Tp _height);
+#if OPENCV_ABI_COMPATIBILITY < 500
+    Size_(const Size_& sz) = default;
+    Size_(Size_&& sz) CV_NOEXCEPT = default;
+#endif
+    Size_(const Point_<_Tp>& pt);
+
+#if OPENCV_ABI_COMPATIBILITY < 500
+    Size_& operator = (const Size_& sz) = default;
+    Size_& operator = (Size_&& sz) CV_NOEXCEPT = default;
+#endif
+    //! the area (width*height)
+    _Tp area() const;
+    //! aspect ratio (width/height)
+    double aspectRatio() const;
+    //! true if empty
+    bool empty() const;
+
+    //! conversion of another data type.
+    template<typename _Tp2> operator Size_<_Tp2>() const;
+
+    _Tp width; //!< the width
+    _Tp height; //!< the height
+};
+
+typedef Size_<int> Size2i;
+typedef Size_<int64> Size2l;
+typedef Size_<float> Size2f;
+typedef Size_<double> Size2d;
+typedef Size2i Size;
+
+template<typename _Tp> class DataType< Size_<_Tp> >
+{
+public:
+    typedef Size_<_Tp>                               value_type;
+    typedef Size_<typename DataType<_Tp>::work_type> work_type;
+    typedef _Tp                                      channel_type;
+
+    enum { generic_type = 0,
+           channels     = 2,
+           fmt          = DataType<channel_type>::fmt + ((channels - 1) << 8)
+#ifdef OPENCV_TRAITS_ENABLE_DEPRECATED
+           ,depth        = DataType<channel_type>::depth
+           ,type         = CV_MAKETYPE(depth, channels)
+#endif
+         };
+
+    typedef Vec<channel_type, channels> vec_type;
+};
+
+namespace traits {
+template<typename _Tp>
+struct Depth< Size_<_Tp> > { enum { value = Depth<_Tp>::value }; };
+template<typename _Tp>
+struct Type< Size_<_Tp> > { enum { value = CV_MAKETYPE(Depth<_Tp>::value, 2) }; };
+} // namespace
+
+//////////////////////////////// Rect_ ////////////////////////////////
+
+/** @brief Template class for 2D rectangles
+
+described by the following parameters:
+-   Coordinates of the top-left corner. This is a default interpretation of Rect_::x and Rect_::y
+    in OpenCV. Though, in your algorithms you may count x and y from the bottom-left corner.
+-   Rectangle width and height.
+
+OpenCV typically assumes that the top and left boundary of the rectangle are inclusive, while the
+right and bottom boundaries are not. For example, the method Rect_::contains returns true if
+
+\f[x  \leq pt.x < x+width,
+      y  \leq pt.y < y+height\f]
+
+Virtually every loop over an image ROI in OpenCV (where ROI is specified by Rect_\<int\> ) is
+implemented as:
+@code
+    for(int y = roi.y; y < roi.y + roi.height; y++)
+        for(int x = roi.x; x < roi.x + roi.width; x++)
+        {
+            // ...
+        }
+@endcode
+In addition to the class members, the following operations on rectangles are implemented:
+-   \f$\texttt{rect} = \texttt{rect} \pm \texttt{point}\f$ (shifting a rectangle by a certain offset)
+-   \f$\texttt{rect} = \texttt{rect} \pm \texttt{size}\f$ (expanding or shrinking a rectangle by a
+    certain amount)
+-   rect += point, rect -= point, rect += size, rect -= size (augmenting operations)
+-   rect = rect1 & rect2 (rectangle intersection)
+-   rect = rect1 | rect2 (minimum area rectangle containing rect1 and rect2 )
+-   rect &= rect1, rect |= rect1 (and the corresponding augmenting operations)
+-   rect == rect1, rect != rect1 (rectangle comparison)
+
+This is an example how the partial ordering on rectangles can be established (rect1 \f$\subseteq\f$
+rect2):
+@code
+    template<typename _Tp> inline bool
+    operator <= (const Rect_<_Tp>& r1, const Rect_<_Tp>& r2)
+    {
+        return (r1 & r2) == r1;
+    }
+@endcode
+For your convenience, the Rect_\<\> alias is available: cv::Rect
+*/
+template<typename _Tp> class Rect_
+{
+public:
+    typedef _Tp value_type;
+
+    //! default constructor
+    Rect_();
+    Rect_(_Tp _x, _Tp _y, _Tp _width, _Tp _height);
+#if OPENCV_ABI_COMPATIBILITY < 500
+    Rect_(const Rect_& r) = default;
+    Rect_(Rect_&& r) CV_NOEXCEPT = default;
+#endif
+    Rect_(const Point_<_Tp>& org, const Size_<_Tp>& sz);
+    Rect_(const Point_<_Tp>& pt1, const Point_<_Tp>& pt2);
+
+#if OPENCV_ABI_COMPATIBILITY < 500
+    Rect_& operator = (const Rect_& r) = default;
+    Rect_& operator = (Rect_&& r) CV_NOEXCEPT = default;
+#endif
+    //! the top-left corner
+    Point_<_Tp> tl() const;
+    //! the bottom-right corner
+    Point_<_Tp> br() const;
+
+    //! size (width, height) of the rectangle
+    Size_<_Tp> size() const;
+    //! area (width*height) of the rectangle
+    _Tp area() const;
+    //! true if empty
+    bool empty() const;
+
+    //! conversion to another data type
+    template<typename _Tp2> operator Rect_<_Tp2>() const;
+
+    //! checks whether the rectangle contains the point
+    /*! @warning After OpenCV 4.11.0, when calling Rect.contains() with cv::Point2f / cv::Point2d point, point should not convert/round to int.
+     * ```
+     * Rect_<int> r(0,0,500,500); Point_<float> pt(250.0f, 499.9f);
+     * r.contains(pt) returns false.(OpenCV 4.10.0 or before)
+     * r.contains(pt) returns true. (OpenCV 4.11.0 or later)
+     * ```
+     */
+    template<typename _Tp2> inline bool contains(const Point_<_Tp2>& pt) const;
+
+    _Tp x; //!< x coordinate of the top-left corner
+    _Tp y; //!< y coordinate of the top-left corner
+    _Tp width; //!< width of the rectangle
+    _Tp height; //!< height of the rectangle
+};
+
+typedef Rect_<int> Rect2i;
+typedef Rect_<float> Rect2f;
+typedef Rect_<double> Rect2d;
+typedef Rect2i Rect;
+
+template<typename _Tp> class DataType< Rect_<_Tp> >
+{
+public:
+    typedef Rect_<_Tp>                               value_type;
+    typedef Rect_<typename DataType<_Tp>::work_type> work_type;
+    typedef _Tp                                      channel_type;
+
+    enum { generic_type = 0,
+           channels     = 4,
+           fmt          = traits::SafeFmt<channel_type>::fmt + ((channels - 1) << 8)
+#ifdef OPENCV_TRAITS_ENABLE_DEPRECATED
+           ,depth        = DataType<channel_type>::depth
+           ,type         = CV_MAKETYPE(depth, channels)
+#endif
+         };
+
+    typedef Vec<channel_type, channels> vec_type;
+};
+
+namespace traits {
+template<typename _Tp>
+struct Depth< Rect_<_Tp> > { enum { value = Depth<_Tp>::value }; };
+template<typename _Tp>
+struct Type< Rect_<_Tp> > { enum { value = CV_MAKETYPE(Depth<_Tp>::value, 4) }; };
+} // namespace
+
+///////////////////////////// RotatedRect /////////////////////////////
+
+/** @brief The class represents rotated (i.e. not up-right) rectangles on a plane.
+
+Each rectangle is specified by the center point (mass center), length of each side (represented by
+#Size2f structure) and the rotation angle in degrees.
+
+The sample below demonstrates how to use RotatedRect:
+@snippet snippets/core_various.cpp RotatedRect_demo
+![image](pics/rotatedrect.png)
+
+@sa CamShift, fitEllipse, minAreaRect, CvBox2D
+*/
+class CV_EXPORTS_W_SIMPLE RotatedRect
+{
+public:
+    //! default constructor
+    CV_WRAP RotatedRect();
+    /** full constructor
+    @param center The rectangle mass center.
+    @param size Width and height of the rectangle.
+    @param angle The rotation angle in a clockwise direction. When the angle is 0, 90, 180, 270 etc.,
+    the rectangle becomes an up-right rectangle.
+    */
+    CV_WRAP RotatedRect(const Point2f& center, const Size2f& size, float angle);
+    /**
+    Any 3 end points of the RotatedRect. They must be given in order (either clockwise or
+    anticlockwise).
+     */
+    CV_WRAP RotatedRect(const Point2f& point1, const Point2f& point2, const Point2f& point3);
+
+    /** returns 4 vertices of the rotated rectangle
+    @param pts The points array for storing rectangle vertices. The order is _bottomLeft_, _topLeft_, topRight, bottomRight.
+    @note _Bottom_, _Top_, _Left_ and _Right_ sides refer to the original rectangle (angle is 0),
+    so after 180 degree rotation _bottomLeft_ point will be located at the top right corner of the
+    rectangle.
+    */
+    void points(Point2f pts[]) const;
+
+    CV_WRAP void points(CV_OUT std::vector<Point2f>& pts) const;
+
+    //! returns the minimal up-right integer rectangle containing the rotated rectangle
+    CV_WRAP Rect boundingRect() const;
+    //! returns the minimal (exact) floating point rectangle containing the rotated rectangle, not intended for use with images
+    CV_WRAP Rect2f boundingRect2f() const;
+    //! returns the rectangle mass center
+    CV_PROP_RW Point2f center;
+    //! returns width and height of the rectangle
+    CV_PROP_RW Size2f size;
+    //! returns the rotation angle. When the angle is 0, 90, 180, 270 etc., the rectangle becomes an up-right rectangle.
+    CV_PROP_RW float angle;
+};
+
+template<> class DataType< RotatedRect >
+{
+public:
+    typedef RotatedRect  value_type;
+    typedef value_type   work_type;
+    typedef float        channel_type;
+
+    enum { generic_type = 0,
+           channels     = (int)sizeof(value_type)/sizeof(channel_type), // 5
+           fmt          = traits::SafeFmt<channel_type>::fmt + ((channels - 1) << 8)
+#ifdef OPENCV_TRAITS_ENABLE_DEPRECATED
+           ,depth        = DataType<channel_type>::depth
+           ,type         = CV_MAKETYPE(depth, channels)
+#endif
+         };
+
+    typedef Vec<channel_type, channels> vec_type;
+};
+
+namespace traits {
+template<>
+struct Depth< RotatedRect > { enum { value = Depth<float>::value }; };
+template<>
+struct Type< RotatedRect > { enum { value = CV_MAKETYPE(Depth<float>::value, (int)sizeof(RotatedRect)/sizeof(float)) }; };
+} // namespace
+
+
+//////////////////////////////// Range /////////////////////////////////
+
+/** @brief Template class specifying a continuous subsequence (slice) of a sequence.
+
+The class is used to specify a row or a column span in a matrix ( Mat ) and for many other purposes.
+Range(a,b) is basically the same as a:b in Matlab or a..b in Python. As in Python, start is an
+inclusive left boundary of the range and end is an exclusive right boundary of the range. Such a
+half-opened interval is usually denoted as \f$[start,end)\f$ .
+
+The static method Range::all() returns a special variable that means "the whole sequence" or "the
+whole range", just like " : " in Matlab or " ... " in Python. All the methods and functions in
+OpenCV that take Range support this special Range::all() value. But, of course, in case of your own
+custom processing, you will probably have to check and handle it explicitly:
+@code
+    void my_function(..., const Range& r, ....)
+    {
+        if(r == Range::all()) {
+            // process all the data
+        }
+        else {
+            // process [r.start, r.end)
+        }
+    }
+@endcode
+*/
+class CV_EXPORTS Range
+{
+public:
+    Range();
+    Range(int _start, int _end);
+    int size() const;
+    bool empty() const;
+    static Range all();
+
+    int start, end;
+};
+
+template<> class DataType<Range>
+{
+public:
+    typedef Range      value_type;
+    typedef value_type work_type;
+    typedef int        channel_type;
+
+    enum { generic_type = 0,
+           channels     = 2,
+           fmt          = traits::SafeFmt<channel_type>::fmt + ((channels - 1) << 8)
+#ifdef OPENCV_TRAITS_ENABLE_DEPRECATED
+           ,depth        = DataType<channel_type>::depth
+           ,type         = CV_MAKETYPE(depth, channels)
+#endif
+         };
+
+    typedef Vec<channel_type, channels> vec_type;
+};
+
+namespace traits {
+template<>
+struct Depth< Range > { enum { value = Depth<int>::value }; };
+template<>
+struct Type< Range > { enum { value = CV_MAKETYPE(Depth<int>::value, 2) }; };
+} // namespace
+
+
+//////////////////////////////// Scalar_ ///////////////////////////////
+
+/** @brief Template class for a 4-element vector derived from Vec.
+
+Being derived from Vec\<_Tp, 4\> , Scalar\_ and Scalar can be used just as typical 4-element
+vectors. In addition, they can be converted to/from CvScalar . The type Scalar is widely used in
+OpenCV to pass pixel values.
+*/
+template<typename _Tp> class Scalar_ : public Vec<_Tp, 4>
+{
+public:
+    //! default constructor
+    Scalar_();
+    Scalar_(_Tp v0, _Tp v1, _Tp v2=0, _Tp v3=0);
+    Scalar_(_Tp v0);
+
+    Scalar_(const Scalar_& s);
+    Scalar_(Scalar_&& s) CV_NOEXCEPT;
+
+    Scalar_& operator=(const Scalar_& s);
+    Scalar_& operator=(Scalar_&& s) CV_NOEXCEPT;
+
+    template<typename _Tp2, int cn>
+    Scalar_(const Vec<_Tp2, cn>& v);
+
+    //! returns a scalar with all elements set to v0
+    static Scalar_<_Tp> all(_Tp v0);
+
+    //! conversion to another data type
+    template<typename T2> operator Scalar_<T2>() const;
+
+    //! per-element product
+    Scalar_<_Tp> mul(const Scalar_<_Tp>& a, double scale=1 ) const;
+
+    //! returns (v0, -v1, -v2, -v3)
+    Scalar_<_Tp> conj() const;
+
+    //! returns true iff v1 == v2 == v3 == 0
+    bool isReal() const;
+};
+
+typedef Scalar_<double> Scalar;
+
+template<typename _Tp> class DataType< Scalar_<_Tp> >
+{
+public:
+    typedef Scalar_<_Tp>                               value_type;
+    typedef Scalar_<typename DataType<_Tp>::work_type> work_type;
+    typedef _Tp                                        channel_type;
+
+    enum { generic_type = 0,
+           channels     = 4,
+           fmt          = traits::SafeFmt<channel_type>::fmt + ((channels - 1) << 8)
+#ifdef OPENCV_TRAITS_ENABLE_DEPRECATED
+           ,depth        = DataType<channel_type>::depth
+           ,type         = CV_MAKETYPE(depth, channels)
+#endif
+         };
+
+    typedef Vec<channel_type, channels> vec_type;
+};
+
+namespace traits {
+template<typename _Tp>
+struct Depth< Scalar_<_Tp> > { enum { value = Depth<_Tp>::value }; };
+template<typename _Tp>
+struct Type< Scalar_<_Tp> > { enum { value = CV_MAKETYPE(Depth<_Tp>::value, 4) }; };
+} // namespace
+
+
+/////////////////////////////// KeyPoint ////////////////////////////////
+
+/** @brief Data structure for salient point detectors.
+
+The class instance stores a keypoint, i.e. a point feature found by one of many available keypoint
+detectors, such as Harris corner detector, #FAST, %StarDetector, %SURF, %SIFT etc.
+
+The keypoint is characterized by the 2D position, scale (proportional to the diameter of the
+neighborhood that needs to be taken into account), orientation and some other parameters. The
+keypoint neighborhood is then analyzed by another algorithm that builds a descriptor (usually
+represented as a feature vector). The keypoints representing the same object in different images
+can then be matched using %KDTree or another method.
+*/
+class CV_EXPORTS_W_SIMPLE KeyPoint
+{
+public:
+    //! the default constructor
+    CV_WRAP KeyPoint();
+    /**
+    @param pt x & y coordinates of the keypoint
+    @param size keypoint diameter
+    @param angle keypoint orientation
+    @param response keypoint detector response on the keypoint (that is, strength of the keypoint)
+    @param octave pyramid octave in which the keypoint has been detected
+    @param class_id object id
+     */
+    KeyPoint(Point2f pt, float size, float angle=-1, float response=0, int octave=0, int class_id=-1);
+    /**
+    @param x x-coordinate of the keypoint
+    @param y y-coordinate of the keypoint
+    @param size keypoint diameter
+    @param angle keypoint orientation
+    @param response keypoint detector response on the keypoint (that is, strength of the keypoint)
+    @param octave pyramid octave in which the keypoint has been detected
+    @param class_id object id
+     */
+    CV_WRAP KeyPoint(float x, float y, float size, float angle=-1, float response=0, int octave=0, int class_id=-1);
+
+    size_t hash() const;
+
+    /**
+    This method converts vector of keypoints to vector of points or the reverse, where each keypoint is
+    assigned the same size and the same orientation.
+
+    @param keypoints Keypoints obtained from any feature detection algorithm like SIFT/SURF/ORB
+    @param points2f Array of (x,y) coordinates of each keypoint
+    @param keypointIndexes Array of indexes of keypoints to be converted to points. (Acts like a mask to
+    convert only specified keypoints)
+    */
+    CV_WRAP static void convert(const std::vector<KeyPoint>& keypoints,
+                                CV_OUT std::vector<Point2f>& points2f,
+                                const std::vector<int>& keypointIndexes=std::vector<int>());
+    /** @overload
+    @param points2f Array of (x,y) coordinates of each keypoint
+    @param keypoints Keypoints obtained from any feature detection algorithm like SIFT/SURF/ORB
+    @param size keypoint diameter
+    @param response keypoint detector response on the keypoint (that is, strength of the keypoint)
+    @param octave pyramid octave in which the keypoint has been detected
+    @param class_id object id
+    */
+    CV_WRAP static void convert(const std::vector<Point2f>& points2f,
+                                CV_OUT std::vector<KeyPoint>& keypoints,
+                                float size=1, float response=1, int octave=0, int class_id=-1);
+
+    /**
+    This method computes overlap for pair of keypoints. Overlap is the ratio between area of keypoint
+    regions' intersection and area of keypoint regions' union (considering keypoint region as circle).
+    If they don't overlap, we get zero. If they coincide at same location with same size, we get 1.
+    @param kp1 First keypoint
+    @param kp2 Second keypoint
+    */
+    CV_WRAP static float overlap(const KeyPoint& kp1, const KeyPoint& kp2);
+
+    CV_PROP_RW Point2f pt; //!< coordinates of the keypoints
+    CV_PROP_RW float size; //!< diameter of the meaningful keypoint neighborhood
+    CV_PROP_RW float angle; //!< computed orientation of the keypoint (-1 if not applicable);
+                            //!< it's in [0,360) degrees and measured relative to
+                            //!< image coordinate system, ie in clockwise.
+    CV_PROP_RW float response; //!< the response by which the most strong keypoints have been selected. Can be used for the further sorting or subsampling
+    CV_PROP_RW int octave; //!< octave (pyramid layer) from which the keypoint has been extracted
+    CV_PROP_RW int class_id; //!< object class (if the keypoints need to be clustered by an object they belong to)
+};
+
+#ifdef OPENCV_TRAITS_ENABLE_DEPRECATED
+template<> class DataType<KeyPoint>
+{
+public:
+    typedef KeyPoint      value_type;
+    typedef float         work_type;
+    typedef float         channel_type;
+
+    enum { generic_type = 0,
+           depth        = DataType<channel_type>::depth,
+           channels     = (int)(sizeof(value_type)/sizeof(channel_type)), // 7
+           fmt          = DataType<channel_type>::fmt + ((channels - 1) << 8),
+           type         = CV_MAKETYPE(depth, channels)
+         };
+
+    typedef Vec<channel_type, channels> vec_type;
+};
+#endif
+
+
+//////////////////////////////// DMatch /////////////////////////////////
+
+/** @brief Class for matching keypoint descriptors
+
+query descriptor index, train descriptor index, train image index, and distance between
+descriptors.
+*/
+class CV_EXPORTS_W_SIMPLE DMatch
+{
+public:
+    CV_WRAP DMatch();
+    CV_WRAP DMatch(int _queryIdx, int _trainIdx, float _distance);
+    CV_WRAP DMatch(int _queryIdx, int _trainIdx, int _imgIdx, float _distance);
+
+    CV_PROP_RW int queryIdx; //!< query descriptor index
+    CV_PROP_RW int trainIdx; //!< train descriptor index
+    CV_PROP_RW int imgIdx;   //!< train image index
+
+    CV_PROP_RW float distance;
+
+    // less is better
+    bool operator<(const DMatch &m) const;
+};
+
+#ifdef OPENCV_TRAITS_ENABLE_DEPRECATED
+template<> class DataType<DMatch>
+{
+public:
+    typedef DMatch      value_type;
+    typedef int         work_type;
+    typedef int         channel_type;
+
+    enum { generic_type = 0,
+           depth        = DataType<channel_type>::depth,
+           channels     = (int)(sizeof(value_type)/sizeof(channel_type)), // 4
+           fmt          = DataType<channel_type>::fmt + ((channels - 1) << 8),
+           type         = CV_MAKETYPE(depth, channels)
+         };
+
+    typedef Vec<channel_type, channels> vec_type;
+};
+#endif
+
+
+///////////////////////////// TermCriteria //////////////////////////////
+
+/** @brief The class defining termination criteria for iterative algorithms.
+
+You can initialize it by default constructor and then override any parameters, or the structure may
+be fully initialized using the advanced variant of the constructor.
+*/
+class CV_EXPORTS TermCriteria
+{
+public:
+    /**
+      Criteria type, can be one of: COUNT, EPS or COUNT + EPS
+    */
+    enum Type
+    {
+        COUNT=1, //!< the maximum number of iterations or elements to compute
+        MAX_ITER=COUNT, //!< ditto
+        EPS=2 //!< the desired accuracy or change in parameters at which the iterative algorithm stops
+    };
+
+    //! default constructor
+    TermCriteria();
+    /**
+    @param type The type of termination criteria, one of TermCriteria::Type
+    @param maxCount The maximum number of iterations or elements to compute.
+    @param epsilon The desired accuracy or change in parameters at which the iterative algorithm stops.
+    */
+    TermCriteria(int type, int maxCount, double epsilon);
+
+    inline bool isValid() const
+    {
+        const bool isCount = (type & COUNT) && maxCount > 0;
+        const bool isEps = (type & EPS) && !cvIsNaN(epsilon);
+        return isCount || isEps;
+    }
+
+    int type; //!< the type of termination criteria: COUNT, EPS or COUNT + EPS
+    int maxCount; //!< the maximum number of iterations/elements
+    double epsilon; //!< the desired accuracy
+};
+
+
+//! @} core_basic
+
+///////////////////////// raster image moments //////////////////////////
+
+//! @addtogroup imgproc_shape
+//! @{
+
+/** @brief struct returned by cv::moments
+
+The spatial moments \f$\texttt{Moments::m}_{ji}\f$ are computed as:
+
+\f[\texttt{m} _{ji}= \sum _{x,y}  \left ( \texttt{array} (x,y)  \cdot x^j  \cdot y^i \right )\f]
+
+The central moments \f$\texttt{Moments::mu}_{ji}\f$ are computed as:
+
+\f[\texttt{mu} _{ji}= \sum _{x,y}  \left ( \texttt{array} (x,y)  \cdot (x -  \bar{x} )^j  \cdot (y -  \bar{y} )^i \right )\f]
+
+where \f$(\bar{x}, \bar{y})\f$ is the mass center:
+
+\f[\bar{x} = \frac{\texttt{m}_{10}}{\texttt{m}_{00}} , \; \bar{y} = \frac{\texttt{m}_{01}}{\texttt{m}_{00}}\f]
+
+The normalized central moments \f$\texttt{Moments::nu}_{ij}\f$ are computed as:
+
+\f[\texttt{nu} _{ji}= \frac{\texttt{mu}_{ji}}{\texttt{m}_{00}^{(i+j)/2+1}} .\f]
+
+@note
+\f$\texttt{mu}_{00}=\texttt{m}_{00}\f$, \f$\texttt{nu}_{00}=1\f$
+\f$\texttt{nu}_{10}=\texttt{mu}_{10}=\texttt{mu}_{01}=\texttt{mu}_{10}=0\f$ , hence the values are not
+stored.
+
+The moments of a contour are defined in the same way but computed using the Green's formula (see
+<http://en.wikipedia.org/wiki/Green_theorem>). So, due to a limited raster resolution, the moments
+computed for a contour are slightly different from the moments computed for the same rasterized
+contour.
+
+@note
+Since the contour moments are computed using Green formula, you may get seemingly odd results for
+contours with self-intersections, e.g. a zero area (m00) for butterfly-shaped contours.
+ */
+class CV_EXPORTS_W_MAP Moments
+{
+public:
+    //! the default constructor
+    Moments();
+    //! the full constructor
+    Moments(double m00, double m10, double m01, double m20, double m11,
+            double m02, double m30, double m21, double m12, double m03 );
+    ////! the conversion from CvMoments
+    //Moments( const CvMoments& moments );
+    ////! the conversion to CvMoments
+    //operator CvMoments() const;
+
+    //! @name spatial moments
+    //! @{
+    CV_PROP_RW double  m00, m10, m01, m20, m11, m02, m30, m21, m12, m03;
+    //! @}
+
+    //! @name central moments
+    //! @{
+    CV_PROP_RW double  mu20, mu11, mu02, mu30, mu21, mu12, mu03;
+    //! @}
+
+    //! @name central normalized moments
+    //! @{
+    CV_PROP_RW double  nu20, nu11, nu02, nu30, nu21, nu12, nu03;
+    //! @}
+};
+
+template<> class DataType<Moments>
+{
+public:
+    typedef Moments     value_type;
+    typedef double      work_type;
+    typedef double      channel_type;
+
+    enum { generic_type = 0,
+           channels     = (int)(sizeof(value_type)/sizeof(channel_type)), // 24
+           fmt          = DataType<channel_type>::fmt + ((channels - 1) << 8)
+#ifdef OPENCV_TRAITS_ENABLE_DEPRECATED
+           ,depth        = DataType<channel_type>::depth
+           ,type         = CV_MAKETYPE(depth, channels)
+#endif
+         };
+
+    typedef Vec<channel_type, channels> vec_type;
+};
+
+namespace traits {
+template<>
+struct Depth< Moments > { enum { value = Depth<double>::value }; };
+template<>
+struct Type< Moments > { enum { value = CV_MAKETYPE(Depth<double>::value, (int)(sizeof(Moments)/sizeof(double))) }; };
+} // namespace
+
+//! @} imgproc_shape
+
+//! @cond IGNORED
+
+/////////////////////////////////////////////////////////////////////////
+///////////////////////////// Implementation ////////////////////////////
+/////////////////////////////////////////////////////////////////////////
+
+//////////////////////////////// Complex ////////////////////////////////
+
+template<typename _Tp> inline
+Complex<_Tp>::Complex()
+    : re(0), im(0) {}
+
+template<typename _Tp> inline
+Complex<_Tp>::Complex( _Tp _re, _Tp _im )
+    : re(_re), im(_im) {}
+
+template<typename _Tp> template<typename T2> inline
+Complex<_Tp>::operator Complex<T2>() const
+{
+    return Complex<T2>(saturate_cast<T2>(re), saturate_cast<T2>(im));
+}
+
+template<typename _Tp> inline
+Complex<_Tp> Complex<_Tp>::conj() const
+{
+    return Complex<_Tp>(re, -im);
+}
+
+
+template<typename _Tp> static inline
+bool operator == (const Complex<_Tp>& a, const Complex<_Tp>& b)
+{
+    return a.re == b.re && a.im == b.im;
+}
+
+template<typename _Tp> static inline
+bool operator != (const Complex<_Tp>& a, const Complex<_Tp>& b)
+{
+    return a.re != b.re || a.im != b.im;
+}
+
+template<typename _Tp> static inline
+Complex<_Tp> operator + (const Complex<_Tp>& a, const Complex<_Tp>& b)
+{
+    return Complex<_Tp>( a.re + b.re, a.im + b.im );
+}
+
+template<typename _Tp> static inline
+Complex<_Tp>& operator += (Complex<_Tp>& a, const Complex<_Tp>& b)
+{
+    a.re += b.re; a.im += b.im;
+    return a;
+}
+
+template<typename _Tp> static inline
+Complex<_Tp> operator - (const Complex<_Tp>& a, const Complex<_Tp>& b)
+{
+    return Complex<_Tp>( a.re - b.re, a.im - b.im );
+}
+
+template<typename _Tp> static inline
+Complex<_Tp>& operator -= (Complex<_Tp>& a, const Complex<_Tp>& b)
+{
+    a.re -= b.re; a.im -= b.im;
+    return a;
+}
+
+template<typename _Tp> static inline
+Complex<_Tp> operator - (const Complex<_Tp>& a)
+{
+    return Complex<_Tp>(-a.re, -a.im);
+}
+
+template<typename _Tp> static inline
+Complex<_Tp> operator * (const Complex<_Tp>& a, const Complex<_Tp>& b)
+{
+    return Complex<_Tp>( a.re*b.re - a.im*b.im, a.re*b.im + a.im*b.re );
+}
+
+template<typename _Tp> static inline
+Complex<_Tp> operator * (const Complex<_Tp>& a, _Tp b)
+{
+    return Complex<_Tp>( a.re*b, a.im*b );
+}
+
+template<typename _Tp> static inline
+Complex<_Tp> operator * (_Tp b, const Complex<_Tp>& a)
+{
+    return Complex<_Tp>( a.re*b, a.im*b );
+}
+
+template<typename _Tp> static inline
+Complex<_Tp> operator + (const Complex<_Tp>& a, _Tp b)
+{
+    return Complex<_Tp>( a.re + b, a.im );
+}
+
+template<typename _Tp> static inline
+Complex<_Tp> operator - (const Complex<_Tp>& a, _Tp b)
+{ return Complex<_Tp>( a.re - b, a.im ); }
+
+template<typename _Tp> static inline
+Complex<_Tp> operator + (_Tp b, const Complex<_Tp>& a)
+{
+    return Complex<_Tp>( a.re + b, a.im );
+}
+
+template<typename _Tp> static inline
+Complex<_Tp> operator - (_Tp b, const Complex<_Tp>& a)
+{
+    return Complex<_Tp>( b - a.re, -a.im );
+}
+
+template<typename _Tp> static inline
+Complex<_Tp>& operator += (Complex<_Tp>& a, _Tp b)
+{
+    a.re += b; return a;
+}
+
+template<typename _Tp> static inline
+Complex<_Tp>& operator -= (Complex<_Tp>& a, _Tp b)
+{
+    a.re -= b; return a;
+}
+
+template<typename _Tp> static inline
+Complex<_Tp>& operator *= (Complex<_Tp>& a, _Tp b)
+{
+    a.re *= b; a.im *= b; return a;
+}
+
+template<typename _Tp> static inline
+double abs(const Complex<_Tp>& a)
+{
+    return std::sqrt( (double)a.re*a.re + (double)a.im*a.im);
+}
+
+template<typename _Tp> static inline
+Complex<_Tp> operator / (const Complex<_Tp>& a, const Complex<_Tp>& b)
+{
+    double t = 1./((double)b.re*b.re + (double)b.im*b.im);
+    return Complex<_Tp>( (_Tp)((a.re*b.re + a.im*b.im)*t),
+                        (_Tp)((-a.re*b.im + a.im*b.re)*t) );
+}
+
+template<typename _Tp> static inline
+Complex<_Tp>& operator /= (Complex<_Tp>& a, const Complex<_Tp>& b)
+{
+    a = a / b;
+    return a;
+}
+
+template<typename _Tp> static inline
+Complex<_Tp> operator / (const Complex<_Tp>& a, _Tp b)
+{
+    _Tp t = (_Tp)1/b;
+    return Complex<_Tp>( a.re*t, a.im*t );
+}
+
+template<typename _Tp> static inline
+Complex<_Tp> operator / (_Tp b, const Complex<_Tp>& a)
+{
+    return Complex<_Tp>(b)/a;
+}
+
+template<typename _Tp> static inline
+Complex<_Tp> operator /= (const Complex<_Tp>& a, _Tp b)
+{
+    _Tp t = (_Tp)1/b;
+    a.re *= t; a.im *= t; return a;
+}
+
+
+
+//////////////////////////////// 2D Point ///////////////////////////////
+
+template<typename _Tp> inline
+Point_<_Tp>::Point_()
+    : x(0), y(0) {}
+
+template<typename _Tp> inline
+Point_<_Tp>::Point_(_Tp _x, _Tp _y)
+    : x(_x), y(_y) {}
+
+#if (defined(__GNUC__) && __GNUC__ < 5) && !defined(__clang__)  // GCC 4.x bug. Details: https://github.com/opencv/opencv/pull/20837
+template<typename _Tp> inline
+Point_<_Tp>::Point_(const Point_& pt)
+    : x(pt.x), y(pt.y) {}
+#endif
+
+template<typename _Tp> inline
+Point_<_Tp>::Point_(const Size_<_Tp>& sz)
+    : x(sz.width), y(sz.height) {}
+
+template<typename _Tp> inline
+Point_<_Tp>::Point_(const Vec<_Tp,2>& v)
+    : x(v[0]), y(v[1]) {}
+
+#if (defined(__GNUC__) && __GNUC__ < 5) && !defined(__clang__)  // GCC 4.x bug. Details: https://github.com/opencv/opencv/pull/20837
+template<typename _Tp> inline
+Point_<_Tp>& Point_<_Tp>::operator = (const Point_& pt)
+{
+    x = pt.x; y = pt.y;
+    return *this;
+}
+#endif
+
+template<typename _Tp> template<typename _Tp2> inline
+Point_<_Tp>::operator Point_<_Tp2>() const
+{
+    return Point_<_Tp2>(saturate_cast<_Tp2>(x), saturate_cast<_Tp2>(y));
+}
+
+template<typename _Tp> inline
+Point_<_Tp>::operator Vec<_Tp, 2>() const
+{
+    return Vec<_Tp, 2>(x, y);
+}
+
+template<typename _Tp> inline
+_Tp Point_<_Tp>::dot(const Point_& pt) const
+{
+    return saturate_cast<_Tp>(x*pt.x + y*pt.y);
+}
+
+template<typename _Tp> inline
+double Point_<_Tp>::ddot(const Point_& pt) const
+{
+    return (double)x*(double)(pt.x) + (double)y*(double)(pt.y);
+}
+
+template<typename _Tp> inline
+double Point_<_Tp>::cross(const Point_& pt) const
+{
+    return (double)x*pt.y - (double)y*pt.x;
+}
+
+template<typename _Tp> inline bool
+Point_<_Tp>::inside( const Rect_<_Tp>& r ) const
+{
+    return r.contains(*this);
+}
+
+
+template<typename _Tp> static inline
+Point_<_Tp>& operator += (Point_<_Tp>& a, const Point_<_Tp>& b)
+{
+    a.x += b.x;
+    a.y += b.y;
+    return a;
+}
+
+template<typename _Tp> static inline
+Point_<_Tp>& operator -= (Point_<_Tp>& a, const Point_<_Tp>& b)
+{
+    a.x -= b.x;
+    a.y -= b.y;
+    return a;
+}
+
+template<typename _Tp> static inline
+Point_<_Tp>& operator *= (Point_<_Tp>& a, int b)
+{
+    a.x = saturate_cast<_Tp>(a.x * b);
+    a.y = saturate_cast<_Tp>(a.y * b);
+    return a;
+}
+
+template<typename _Tp> static inline
+Point_<_Tp>& operator *= (Point_<_Tp>& a, float b)
+{
+    a.x = saturate_cast<_Tp>(a.x * b);
+    a.y = saturate_cast<_Tp>(a.y * b);
+    return a;
+}
+
+template<typename _Tp> static inline
+Point_<_Tp>& operator *= (Point_<_Tp>& a, double b)
+{
+    a.x = saturate_cast<_Tp>(a.x * b);
+    a.y = saturate_cast<_Tp>(a.y * b);
+    return a;
+}
+
+template<typename _Tp> static inline
+Point_<_Tp>& operator /= (Point_<_Tp>& a, int b)
+{
+    a.x = saturate_cast<_Tp>(a.x / b);
+    a.y = saturate_cast<_Tp>(a.y / b);
+    return a;
+}
+
+template<typename _Tp> static inline
+Point_<_Tp>& operator /= (Point_<_Tp>& a, float b)
+{
+    a.x = saturate_cast<_Tp>(a.x / b);
+    a.y = saturate_cast<_Tp>(a.y / b);
+    return a;
+}
+
+template<typename _Tp> static inline
+Point_<_Tp>& operator /= (Point_<_Tp>& a, double b)
+{
+    a.x = saturate_cast<_Tp>(a.x / b);
+    a.y = saturate_cast<_Tp>(a.y / b);
+    return a;
+}
+
+template<typename _Tp> static inline
+double norm(const Point_<_Tp>& pt)
+{
+    return std::sqrt((double)pt.x*pt.x + (double)pt.y*pt.y);
+}
+
+template<typename _Tp> static inline
+bool operator == (const Point_<_Tp>& a, const Point_<_Tp>& b)
+{
+    return a.x == b.x && a.y == b.y;
+}
+
+template<typename _Tp> static inline
+bool operator != (const Point_<_Tp>& a, const Point_<_Tp>& b)
+{
+    return a.x != b.x || a.y != b.y;
+}
+
+template<typename _Tp> static inline
+Point_<_Tp> operator + (const Point_<_Tp>& a, const Point_<_Tp>& b)
+{
+    return Point_<_Tp>( saturate_cast<_Tp>(a.x + b.x), saturate_cast<_Tp>(a.y + b.y) );
+}
+
+template<typename _Tp> static inline
+Point_<_Tp> operator - (const Point_<_Tp>& a, const Point_<_Tp>& b)
+{
+    return Point_<_Tp>( saturate_cast<_Tp>(a.x - b.x), saturate_cast<_Tp>(a.y - b.y) );
+}
+
+template<typename _Tp> static inline
+Point_<_Tp> operator - (const Point_<_Tp>& a)
+{
+    return Point_<_Tp>( saturate_cast<_Tp>(-a.x), saturate_cast<_Tp>(-a.y) );
+}
+
+template<typename _Tp> static inline
+Point_<_Tp> operator * (const Point_<_Tp>& a, int b)
+{
+    return Point_<_Tp>( saturate_cast<_Tp>(a.x*b), saturate_cast<_Tp>(a.y*b) );
+}
+
+template<typename _Tp> static inline
+Point_<_Tp> operator * (int a, const Point_<_Tp>& b)
+{
+    return Point_<_Tp>( saturate_cast<_Tp>(b.x*a), saturate_cast<_Tp>(b.y*a) );
+}
+
+template<typename _Tp> static inline
+Point_<_Tp> operator * (const Point_<_Tp>& a, float b)
+{
+    return Point_<_Tp>( saturate_cast<_Tp>(a.x*b), saturate_cast<_Tp>(a.y*b) );
+}
+
+template<typename _Tp> static inline
+Point_<_Tp> operator * (float a, const Point_<_Tp>& b)
+{
+    return Point_<_Tp>( saturate_cast<_Tp>(b.x*a), saturate_cast<_Tp>(b.y*a) );
+}
+
+template<typename _Tp> static inline
+Point_<_Tp> operator * (const Point_<_Tp>& a, double b)
+{
+    return Point_<_Tp>( saturate_cast<_Tp>(a.x*b), saturate_cast<_Tp>(a.y*b) );
+}
+
+template<typename _Tp> static inline
+Point_<_Tp> operator * (double a, const Point_<_Tp>& b)
+{
+    return Point_<_Tp>( saturate_cast<_Tp>(b.x*a), saturate_cast<_Tp>(b.y*a) );
+}
+
+template<typename _Tp> static inline
+Point_<_Tp> operator * (const Matx<_Tp, 2, 2>& a, const Point_<_Tp>& b)
+{
+    Matx<_Tp, 2, 1> tmp = a * Vec<_Tp,2>(b.x, b.y);
+    return Point_<_Tp>(tmp.val[0], tmp.val[1]);
+}
+
+template<typename _Tp> static inline
+Point3_<_Tp> operator * (const Matx<_Tp, 3, 3>& a, const Point_<_Tp>& b)
+{
+    Matx<_Tp, 3, 1> tmp = a * Vec<_Tp,3>(b.x, b.y, 1);
+    return Point3_<_Tp>(tmp.val[0], tmp.val[1], tmp.val[2]);
+}
+
+template<typename _Tp> static inline
+Point_<_Tp> operator / (const Point_<_Tp>& a, int b)
+{
+    Point_<_Tp> tmp(a);
+    tmp /= b;
+    return tmp;
+}
+
+template<typename _Tp> static inline
+Point_<_Tp> operator / (const Point_<_Tp>& a, float b)
+{
+    Point_<_Tp> tmp(a);
+    tmp /= b;
+    return tmp;
+}
+
+template<typename _Tp> static inline
+Point_<_Tp> operator / (const Point_<_Tp>& a, double b)
+{
+    Point_<_Tp> tmp(a);
+    tmp /= b;
+    return tmp;
+}
+
+
+template<typename _AccTp> static inline _AccTp normL2Sqr(const Point_<int>& pt);
+template<typename _AccTp> static inline _AccTp normL2Sqr(const Point_<int64>& pt);
+template<typename _AccTp> static inline _AccTp normL2Sqr(const Point_<float>& pt);
+template<typename _AccTp> static inline _AccTp normL2Sqr(const Point_<double>& pt);
+
+template<> inline int normL2Sqr<int>(const Point_<int>& pt) { return pt.dot(pt); }
+template<> inline int64 normL2Sqr<int64>(const Point_<int64>& pt) { return pt.dot(pt); }
+template<> inline float normL2Sqr<float>(const Point_<float>& pt) { return pt.dot(pt); }
+template<> inline double normL2Sqr<double>(const Point_<int>& pt) { return pt.dot(pt); }
+
+template<> inline double normL2Sqr<double>(const Point_<float>& pt) { return pt.ddot(pt); }
+template<> inline double normL2Sqr<double>(const Point_<double>& pt) { return pt.ddot(pt); }
+
+
+
+//////////////////////////////// 3D Point ///////////////////////////////
+
+template<typename _Tp> inline
+Point3_<_Tp>::Point3_()
+    : x(0), y(0), z(0) {}
+
+template<typename _Tp> inline
+Point3_<_Tp>::Point3_(_Tp _x, _Tp _y, _Tp _z)
+    : x(_x), y(_y), z(_z) {}
+
+template<typename _Tp> inline
+Point3_<_Tp>::Point3_(const Point_<_Tp>& pt)
+    : x(pt.x), y(pt.y), z(_Tp()) {}
+
+template<typename _Tp> inline
+Point3_<_Tp>::Point3_(const Vec<_Tp, 3>& v)
+    : x(v[0]), y(v[1]), z(v[2]) {}
+
+template<typename _Tp> template<typename _Tp2> inline
+Point3_<_Tp>::operator Point3_<_Tp2>() const
+{
+    return Point3_<_Tp2>(saturate_cast<_Tp2>(x), saturate_cast<_Tp2>(y), saturate_cast<_Tp2>(z));
+}
+
+template<typename _Tp> inline
+Point3_<_Tp>::operator Vec<_Tp, 3>() const
+{
+    return Vec<_Tp, 3>(x, y, z);
+}
+
+template<typename _Tp> inline
+_Tp Point3_<_Tp>::dot(const Point3_& pt) const
+{
+    return saturate_cast<_Tp>(x*pt.x + y*pt.y + z*pt.z);
+}
+
+template<typename _Tp> inline
+double Point3_<_Tp>::ddot(const Point3_& pt) const
+{
+    return (double)x*pt.x + (double)y*pt.y + (double)z*pt.z;
+}
+
+template<typename _Tp> inline
+Point3_<_Tp> Point3_<_Tp>::cross(const Point3_<_Tp>& pt) const
+{
+    return Point3_<_Tp>(y*pt.z - z*pt.y, z*pt.x - x*pt.z, x*pt.y - y*pt.x);
+}
+
+
+template<typename _Tp> static inline
+Point3_<_Tp>& operator += (Point3_<_Tp>& a, const Point3_<_Tp>& b)
+{
+    a.x += b.x;
+    a.y += b.y;
+    a.z += b.z;
+    return a;
+}
+
+template<typename _Tp> static inline
+Point3_<_Tp>& operator -= (Point3_<_Tp>& a, const Point3_<_Tp>& b)
+{
+    a.x -= b.x;
+    a.y -= b.y;
+    a.z -= b.z;
+    return a;
+}
+
+template<typename _Tp> static inline
+Point3_<_Tp>& operator *= (Point3_<_Tp>& a, int b)
+{
+    a.x = saturate_cast<_Tp>(a.x * b);
+    a.y = saturate_cast<_Tp>(a.y * b);
+    a.z = saturate_cast<_Tp>(a.z * b);
+    return a;
+}
+
+template<typename _Tp> static inline
+Point3_<_Tp>& operator *= (Point3_<_Tp>& a, float b)
+{
+    a.x = saturate_cast<_Tp>(a.x * b);
+    a.y = saturate_cast<_Tp>(a.y * b);
+    a.z = saturate_cast<_Tp>(a.z * b);
+    return a;
+}
+
+template<typename _Tp> static inline
+Point3_<_Tp>& operator *= (Point3_<_Tp>& a, double b)
+{
+    a.x = saturate_cast<_Tp>(a.x * b);
+    a.y = saturate_cast<_Tp>(a.y * b);
+    a.z = saturate_cast<_Tp>(a.z * b);
+    return a;
+}
+
+template<typename _Tp> static inline
+Point3_<_Tp>& operator /= (Point3_<_Tp>& a, int b)
+{
+    a.x = saturate_cast<_Tp>(a.x / b);
+    a.y = saturate_cast<_Tp>(a.y / b);
+    a.z = saturate_cast<_Tp>(a.z / b);
+    return a;
+}
+
+template<typename _Tp> static inline
+Point3_<_Tp>& operator /= (Point3_<_Tp>& a, float b)
+{
+    a.x = saturate_cast<_Tp>(a.x / b);
+    a.y = saturate_cast<_Tp>(a.y / b);
+    a.z = saturate_cast<_Tp>(a.z / b);
+    return a;
+}
+
+template<typename _Tp> static inline
+Point3_<_Tp>& operator /= (Point3_<_Tp>& a, double b)
+{
+    a.x = saturate_cast<_Tp>(a.x / b);
+    a.y = saturate_cast<_Tp>(a.y / b);
+    a.z = saturate_cast<_Tp>(a.z / b);
+    return a;
+}
+
+template<typename _Tp> static inline
+double norm(const Point3_<_Tp>& pt)
+{
+    return std::sqrt((double)pt.x*pt.x + (double)pt.y*pt.y + (double)pt.z*pt.z);
+}
+
+template<typename _Tp> static inline
+bool operator == (const Point3_<_Tp>& a, const Point3_<_Tp>& b)
+{
+    return a.x == b.x && a.y == b.y && a.z == b.z;
+}
+
+template<typename _Tp> static inline
+bool operator != (const Point3_<_Tp>& a, const Point3_<_Tp>& b)
+{
+    return a.x != b.x || a.y != b.y || a.z != b.z;
+}
+
+template<typename _Tp> static inline
+Point3_<_Tp> operator + (const Point3_<_Tp>& a, const Point3_<_Tp>& b)
+{
+    return Point3_<_Tp>( saturate_cast<_Tp>(a.x + b.x), saturate_cast<_Tp>(a.y + b.y), saturate_cast<_Tp>(a.z + b.z));
+}
+
+template<typename _Tp> static inline
+Point3_<_Tp> operator - (const Point3_<_Tp>& a, const Point3_<_Tp>& b)
+{
+    return Point3_<_Tp>( saturate_cast<_Tp>(a.x - b.x), saturate_cast<_Tp>(a.y - b.y), saturate_cast<_Tp>(a.z - b.z));
+}
+
+template<typename _Tp> static inline
+Point3_<_Tp> operator - (const Point3_<_Tp>& a)
+{
+    return Point3_<_Tp>( saturate_cast<_Tp>(-a.x), saturate_cast<_Tp>(-a.y), saturate_cast<_Tp>(-a.z) );
+}
+
+template<typename _Tp> static inline
+Point3_<_Tp> operator * (const Point3_<_Tp>& a, int b)
+{
+    return Point3_<_Tp>( saturate_cast<_Tp>(a.x*b), saturate_cast<_Tp>(a.y*b), saturate_cast<_Tp>(a.z*b) );
+}
+
+template<typename _Tp> static inline
+Point3_<_Tp> operator * (int a, const Point3_<_Tp>& b)
+{
+    return Point3_<_Tp>( saturate_cast<_Tp>(b.x * a), saturate_cast<_Tp>(b.y * a), saturate_cast<_Tp>(b.z * a) );
+}
+
+template<typename _Tp> static inline
+Point3_<_Tp> operator * (const Point3_<_Tp>& a, float b)
+{
+    return Point3_<_Tp>( saturate_cast<_Tp>(a.x * b), saturate_cast<_Tp>(a.y * b), saturate_cast<_Tp>(a.z * b) );
+}
+
+template<typename _Tp> static inline
+Point3_<_Tp> operator * (float a, const Point3_<_Tp>& b)
+{
+    return Point3_<_Tp>( saturate_cast<_Tp>(b.x * a), saturate_cast<_Tp>(b.y * a), saturate_cast<_Tp>(b.z * a) );
+}
+
+template<typename _Tp> static inline
+Point3_<_Tp> operator * (const Point3_<_Tp>& a, double b)
+{
+    return Point3_<_Tp>( saturate_cast<_Tp>(a.x * b), saturate_cast<_Tp>(a.y * b), saturate_cast<_Tp>(a.z * b) );
+}
+
+template<typename _Tp> static inline
+Point3_<_Tp> operator * (double a, const Point3_<_Tp>& b)
+{
+    return Point3_<_Tp>( saturate_cast<_Tp>(b.x * a), saturate_cast<_Tp>(b.y * a), saturate_cast<_Tp>(b.z * a) );
+}
+
+template<typename _Tp> static inline
+Point3_<_Tp> operator * (const Matx<_Tp, 3, 3>& a, const Point3_<_Tp>& b)
+{
+    Matx<_Tp, 3, 1> tmp = a * Vec<_Tp,3>(b.x, b.y, b.z);
+    return Point3_<_Tp>(tmp.val[0], tmp.val[1], tmp.val[2]);
+}
+
+template<typename _Tp> static inline
+Matx<_Tp, 4, 1> operator * (const Matx<_Tp, 4, 4>& a, const Point3_<_Tp>& b)
+{
+    return a * Matx<_Tp, 4, 1>(b.x, b.y, b.z, 1);
+}
+
+template<typename _Tp> static inline
+Point3_<_Tp> operator / (const Point3_<_Tp>& a, int b)
+{
+    Point3_<_Tp> tmp(a);
+    tmp /= b;
+    return tmp;
+}
+
+template<typename _Tp> static inline
+Point3_<_Tp> operator / (const Point3_<_Tp>& a, float b)
+{
+    Point3_<_Tp> tmp(a);
+    tmp /= b;
+    return tmp;
+}
+
+template<typename _Tp> static inline
+Point3_<_Tp> operator / (const Point3_<_Tp>& a, double b)
+{
+    Point3_<_Tp> tmp(a);
+    tmp /= b;
+    return tmp;
+}
+
+
+
+////////////////////////////////// Size /////////////////////////////////
+
+template<typename _Tp> inline
+Size_<_Tp>::Size_()
+    : width(0), height(0) {}
+
+template<typename _Tp> inline
+Size_<_Tp>::Size_(_Tp _width, _Tp _height)
+    : width(_width), height(_height) {}
+
+template<typename _Tp> inline
+Size_<_Tp>::Size_(const Point_<_Tp>& pt)
+    : width(pt.x), height(pt.y) {}
+
+template<typename _Tp> template<typename _Tp2> inline
+Size_<_Tp>::operator Size_<_Tp2>() const
+{
+    return Size_<_Tp2>(saturate_cast<_Tp2>(width), saturate_cast<_Tp2>(height));
+}
+
+template<typename _Tp> inline
+_Tp Size_<_Tp>::area() const
+{
+    const _Tp result = width * height;
+    CV_DbgAssert(!std::numeric_limits<_Tp>::is_integer
+        || width == 0 || result / width == height); // make sure the result fits in the return value
+    return result;
+}
+
+template<typename _Tp> inline
+double Size_<_Tp>::aspectRatio() const
+{
+    return width / static_cast<double>(height);
+}
+
+template<typename _Tp> inline
+bool Size_<_Tp>::empty() const
+{
+    return width <= 0 || height <= 0;
+}
+
+
+template<typename _Tp> static inline
+Size_<_Tp>& operator *= (Size_<_Tp>& a, _Tp b)
+{
+    a.width *= b;
+    a.height *= b;
+    return a;
+}
+
+template<typename _Tp> static inline
+Size_<_Tp> operator * (const Size_<_Tp>& a, _Tp b)
+{
+    Size_<_Tp> tmp(a);
+    tmp *= b;
+    return tmp;
+}
+
+template<typename _Tp> static inline
+Size_<_Tp>& operator /= (Size_<_Tp>& a, _Tp b)
+{
+    a.width /= b;
+    a.height /= b;
+    return a;
+}
+
+template<typename _Tp> static inline
+Size_<_Tp> operator / (const Size_<_Tp>& a, _Tp b)
+{
+    Size_<_Tp> tmp(a);
+    tmp /= b;
+    return tmp;
+}
+
+template<typename _Tp> static inline
+Size_<_Tp>& operator += (Size_<_Tp>& a, const Size_<_Tp>& b)
+{
+    a.width += b.width;
+    a.height += b.height;
+    return a;
+}
+
+template<typename _Tp> static inline
+Size_<_Tp> operator + (const Size_<_Tp>& a, const Size_<_Tp>& b)
+{
+    Size_<_Tp> tmp(a);
+    tmp += b;
+    return tmp;
+}
+
+template<typename _Tp> static inline
+Size_<_Tp>& operator -= (Size_<_Tp>& a, const Size_<_Tp>& b)
+{
+    a.width -= b.width;
+    a.height -= b.height;
+    return a;
+}
+
+template<typename _Tp> static inline
+Size_<_Tp> operator - (const Size_<_Tp>& a, const Size_<_Tp>& b)
+{
+    Size_<_Tp> tmp(a);
+    tmp -= b;
+    return tmp;
+}
+
+template<typename _Tp> static inline
+bool operator == (const Size_<_Tp>& a, const Size_<_Tp>& b)
+{
+    return a.width == b.width && a.height == b.height;
+}
+
+template<typename _Tp> static inline
+bool operator != (const Size_<_Tp>& a, const Size_<_Tp>& b)
+{
+    return !(a == b);
+}
+
+
+
+////////////////////////////////// Rect /////////////////////////////////
+
+template<typename _Tp> inline
+Rect_<_Tp>::Rect_()
+    : x(0), y(0), width(0), height(0) {}
+
+template<typename _Tp> inline
+Rect_<_Tp>::Rect_(_Tp _x, _Tp _y, _Tp _width, _Tp _height)
+    : x(_x), y(_y), width(_width), height(_height) {}
+
+template<typename _Tp> inline
+Rect_<_Tp>::Rect_(const Point_<_Tp>& org, const Size_<_Tp>& sz)
+    : x(org.x), y(org.y), width(sz.width), height(sz.height) {}
+
+template<typename _Tp> inline
+Rect_<_Tp>::Rect_(const Point_<_Tp>& pt1, const Point_<_Tp>& pt2)
+{
+    x = std::min(pt1.x, pt2.x);
+    y = std::min(pt1.y, pt2.y);
+    width = std::max(pt1.x, pt2.x) - x;
+    height = std::max(pt1.y, pt2.y) - y;
+}
+
+template<typename _Tp> inline
+Point_<_Tp> Rect_<_Tp>::tl() const
+{
+    return Point_<_Tp>(x,y);
+}
+
+template<typename _Tp> inline
+Point_<_Tp> Rect_<_Tp>::br() const
+{
+    return Point_<_Tp>(x + width, y + height);
+}
+
+template<typename _Tp> inline
+Size_<_Tp> Rect_<_Tp>::size() const
+{
+    return Size_<_Tp>(width, height);
+}
+
+template<typename _Tp> inline
+_Tp Rect_<_Tp>::area() const
+{
+    const _Tp result = width * height;
+    CV_DbgAssert(!std::numeric_limits<_Tp>::is_integer
+        || width == 0 || result / width == height); // make sure the result fits in the return value
+    return result;
+}
+
+template<typename _Tp> inline
+bool Rect_<_Tp>::empty() const
+{
+    return width <= 0 || height <= 0;
+}
+
+template<typename _Tp> template<typename _Tp2> inline
+Rect_<_Tp>::operator Rect_<_Tp2>() const
+{
+    return Rect_<_Tp2>(saturate_cast<_Tp2>(x), saturate_cast<_Tp2>(y), saturate_cast<_Tp2>(width), saturate_cast<_Tp2>(height));
+}
+
+template<typename _Tp> template<typename _Tp2> inline
+bool Rect_<_Tp>::contains(const Point_<_Tp2>& pt) const
+{
+    return x <= pt.x && pt.x < x + width && y <= pt.y && pt.y < y + height;
+}
+// See https://github.com/opencv/opencv/issues/26016
+template<> template<> inline
+bool Rect_<int>::contains(const Point_<double>& pt) const
+{
+    // std::numeric_limits<int>::digits is 31.
+    // std::numeric_limits<double>::digits is 53.
+    // So conversion int->double does not lead to accuracy errors.
+    const Rect_<double> _rect(static_cast<double>(x), static_cast<double>(y), static_cast<double>(width), static_cast<double>(height));
+    return _rect.contains(pt);
+}
+template<> template<> inline
+bool Rect_<int>::contains(const Point_<float>& _pt) const
+{
+    // std::numeric_limits<float>::digits is 24.
+    // std::numeric_limits<double>::digits is 53.
+    // So conversion float->double does not lead to accuracy errors.
+    return contains(Point_<double>(static_cast<double>(_pt.x), static_cast<double>(_pt.y)));
+}
+
+template<typename _Tp> static inline
+Rect_<_Tp>& operator += ( Rect_<_Tp>& a, const Point_<_Tp>& b )
+{
+    a.x += b.x;
+    a.y += b.y;
+    return a;
+}
+
+template<typename _Tp> static inline
+Rect_<_Tp>& operator -= ( Rect_<_Tp>& a, const Point_<_Tp>& b )
+{
+    a.x -= b.x;
+    a.y -= b.y;
+    return a;
+}
+
+template<typename _Tp> static inline
+Rect_<_Tp>& operator += ( Rect_<_Tp>& a, const Size_<_Tp>& b )
+{
+    a.width += b.width;
+    a.height += b.height;
+    return a;
+}
+
+template<typename _Tp> static inline
+Rect_<_Tp>& operator -= ( Rect_<_Tp>& a, const Size_<_Tp>& b )
+{
+    const _Tp width = a.width - b.width;
+    const _Tp height = a.height - b.height;
+    CV_DbgAssert(width >= 0 && height >= 0);
+    a.width = width;
+    a.height = height;
+    return a;
+}
+
+template<typename _Tp> static inline
+Rect_<_Tp>& operator &= ( Rect_<_Tp>& a, const Rect_<_Tp>& b )
+{
+    if (a.empty() || b.empty()) {
+        a = Rect();
+        return a;
+    }
+    const Rect_<_Tp>& Rx_min = (a.x < b.x) ? a : b;
+    const Rect_<_Tp>& Rx_max = (a.x < b.x) ? b : a;
+    const Rect_<_Tp>& Ry_min = (a.y < b.y) ? a : b;
+    const Rect_<_Tp>& Ry_max = (a.y < b.y) ? b : a;
+    // Looking at the formula below, we will compute Rx_min.width - (Rx_max.x - Rx_min.x)
+    // but we want to avoid overflows. Rx_min.width >= 0 and (Rx_max.x - Rx_min.x) >= 0
+    // by definition so the difference does not overflow. The only thing that can overflow
+    // is (Rx_max.x - Rx_min.x). And it can only overflow if Rx_min.x < 0.
+    // Let us first deal with the following case.
+    if ((Rx_min.x < 0 && Rx_min.x + Rx_min.width < Rx_max.x) ||
+        (Ry_min.y < 0 && Ry_min.y + Ry_min.height < Ry_max.y)) {
+        a = Rect();
+        return a;
+    }
+    // We now know that either Rx_min.x >= 0, or
+    // Rx_min.x < 0 && Rx_min.x + Rx_min.width >= Rx_max.x and therefore
+    // Rx_min.width >= (Rx_max.x - Rx_min.x) which means (Rx_max.x - Rx_min.x)
+    // is inferior to a valid int and therefore does not overflow.
+    a.width = std::min(Rx_min.width - (Rx_max.x - Rx_min.x), Rx_max.width);
+    a.height = std::min(Ry_min.height - (Ry_max.y - Ry_min.y), Ry_max.height);
+    a.x = Rx_max.x;
+    a.y = Ry_max.y;
+    if (a.empty())
+        a = Rect();
+    return a;
+}
+
+template<typename _Tp> static inline
+Rect_<_Tp>& operator |= ( Rect_<_Tp>& a, const Rect_<_Tp>& b )
+{
+    if (a.empty()) {
+        a = b;
+    }
+    else if (!b.empty()) {
+        _Tp x1 = std::min(a.x, b.x);
+        _Tp y1 = std::min(a.y, b.y);
+        a.width = std::max(a.x + a.width, b.x + b.width) - x1;
+        a.height = std::max(a.y + a.height, b.y + b.height) - y1;
+        a.x = x1;
+        a.y = y1;
+    }
+    return a;
+}
+
+template<typename _Tp> static inline
+bool operator == (const Rect_<_Tp>& a, const Rect_<_Tp>& b)
+{
+    return a.x == b.x && a.y == b.y && a.width == b.width && a.height == b.height;
+}
+
+template<typename _Tp> static inline
+bool operator != (const Rect_<_Tp>& a, const Rect_<_Tp>& b)
+{
+    return a.x != b.x || a.y != b.y || a.width != b.width || a.height != b.height;
+}
+
+template<typename _Tp> static inline
+Rect_<_Tp> operator + (const Rect_<_Tp>& a, const Point_<_Tp>& b)
+{
+    return Rect_<_Tp>( a.x + b.x, a.y + b.y, a.width, a.height );
+}
+
+template<typename _Tp> static inline
+Rect_<_Tp> operator - (const Rect_<_Tp>& a, const Point_<_Tp>& b)
+{
+    return Rect_<_Tp>( a.x - b.x, a.y - b.y, a.width, a.height );
+}
+
+template<typename _Tp> static inline
+Rect_<_Tp> operator + (const Rect_<_Tp>& a, const Size_<_Tp>& b)
+{
+    return Rect_<_Tp>( a.x, a.y, a.width + b.width, a.height + b.height );
+}
+
+template<typename _Tp> static inline
+Rect_<_Tp> operator - (const Rect_<_Tp>& a, const Size_<_Tp>& b)
+{
+    const _Tp width = a.width - b.width;
+    const _Tp height = a.height - b.height;
+    CV_DbgAssert(width >= 0 && height >= 0);
+    return Rect_<_Tp>( a.x, a.y, width, height );
+}
+
+template<typename _Tp> static inline
+Rect_<_Tp> operator & (const Rect_<_Tp>& a, const Rect_<_Tp>& b)
+{
+    Rect_<_Tp> c = a;
+    return c &= b;
+}
+
+template<typename _Tp> static inline
+Rect_<_Tp> operator | (const Rect_<_Tp>& a, const Rect_<_Tp>& b)
+{
+    Rect_<_Tp> c = a;
+    return c |= b;
+}
+
+/**
+ * @brief measure dissimilarity between two sample sets
+ *
+ * computes the complement of the Jaccard Index as described in <https://en.wikipedia.org/wiki/Jaccard_index>.
+ * For rectangles this reduces to computing the intersection over the union.
+ */
+template<typename _Tp> static inline
+double jaccardDistance(const Rect_<_Tp>& a, const Rect_<_Tp>& b) {
+    _Tp Aa = a.area();
+    _Tp Ab = b.area();
+
+    if ((Aa + Ab) <= std::numeric_limits<_Tp>::epsilon()) {
+        // jaccard_index = 1 -> distance = 0
+        return 0.0;
+    }
+
+    double Aab = (a & b).area();
+    // distance = 1 - jaccard_index
+    return 1.0 - Aab / (Aa + Ab - Aab);
+}
+
+/** @brief Finds out if there is any intersection between two rectangles
+ *
+ * mainly useful for language bindings
+ * @param a First rectangle
+ * @param b Second rectangle
+ * @return the area of the intersection
+ */
+CV_EXPORTS_W inline double rectangleIntersectionArea(const Rect2d& a, const Rect2d& b) { return (a & b).area(); }
+
+////////////////////////////// RotatedRect //////////////////////////////
+
+inline
+RotatedRect::RotatedRect()
+    : center(), size(), angle(0) {}
+
+inline
+RotatedRect::RotatedRect(const Point2f& _center, const Size2f& _size, float _angle)
+    : center(_center), size(_size), angle(_angle) {}
+
+///////////////////////////////// Range /////////////////////////////////
+
+inline
+Range::Range()
+    : start(0), end(0) {}
+
+inline
+Range::Range(int _start, int _end)
+    : start(_start), end(_end) {}
+
+inline
+int Range::size() const
+{
+    return end - start;
+}
+
+inline
+bool Range::empty() const
+{
+    return start == end;
+}
+
+inline
+Range Range::all()
+{
+    return Range(INT_MIN, INT_MAX);
+}
+
+
+static inline
+bool operator == (const Range& r1, const Range& r2)
+{
+    return r1.start == r2.start && r1.end == r2.end;
+}
+
+static inline
+bool operator != (const Range& r1, const Range& r2)
+{
+    return !(r1 == r2);
+}
+
+static inline
+bool operator !(const Range& r)
+{
+    return r.start == r.end;
+}
+
+static inline
+Range operator & (const Range& r1, const Range& r2)
+{
+    Range r(std::max(r1.start, r2.start), std::min(r1.end, r2.end));
+    r.end = std::max(r.end, r.start);
+    return r;
+}
+
+static inline
+Range& operator &= (Range& r1, const Range& r2)
+{
+    r1 = r1 & r2;
+    return r1;
+}
+
+static inline
+Range operator + (const Range& r1, int delta)
+{
+    return Range(r1.start + delta, r1.end + delta);
+}
+
+static inline
+Range operator + (int delta, const Range& r1)
+{
+    return Range(r1.start + delta, r1.end + delta);
+}
+
+static inline
+Range operator - (const Range& r1, int delta)
+{
+    return r1 + (-delta);
+}
+
+
+
+///////////////////////////////// Scalar ////////////////////////////////
+
+template<typename _Tp> inline
+Scalar_<_Tp>::Scalar_()
+{
+    this->val[0] = this->val[1] = this->val[2] = this->val[3] = 0;
+}
+
+template<typename _Tp> inline
+Scalar_<_Tp>::Scalar_(_Tp v0, _Tp v1, _Tp v2, _Tp v3)
+{
+    this->val[0] = v0;
+    this->val[1] = v1;
+    this->val[2] = v2;
+    this->val[3] = v3;
+}
+
+template<typename _Tp> inline
+Scalar_<_Tp>::Scalar_(const Scalar_<_Tp>& s) : Vec<_Tp, 4>(s) {
+}
+
+template<typename _Tp> inline
+Scalar_<_Tp>::Scalar_(Scalar_<_Tp>&& s) CV_NOEXCEPT {
+    this->val[0] = std::move(s.val[0]);
+    this->val[1] = std::move(s.val[1]);
+    this->val[2] = std::move(s.val[2]);
+    this->val[3] = std::move(s.val[3]);
+}
+
+template<typename _Tp> inline
+Scalar_<_Tp>& Scalar_<_Tp>::operator=(const Scalar_<_Tp>& s) {
+    this->val[0] = s.val[0];
+    this->val[1] = s.val[1];
+    this->val[2] = s.val[2];
+    this->val[3] = s.val[3];
+    return *this;
+}
+
+template<typename _Tp> inline
+Scalar_<_Tp>& Scalar_<_Tp>::operator=(Scalar_<_Tp>&& s) CV_NOEXCEPT {
+    this->val[0] = std::move(s.val[0]);
+    this->val[1] = std::move(s.val[1]);
+    this->val[2] = std::move(s.val[2]);
+    this->val[3] = std::move(s.val[3]);
+    return *this;
+}
+
+template<typename _Tp> template<typename _Tp2, int cn> inline
+Scalar_<_Tp>::Scalar_(const Vec<_Tp2, cn>& v)
+{
+    int i;
+    for( i = 0; i < (cn < 4 ? cn : 4); i++ )
+        this->val[i] = cv::saturate_cast<_Tp>(v.val[i]);
+    for( ; i < 4; i++ )
+        this->val[i] = 0;
+}
+
+template<typename _Tp> inline
+Scalar_<_Tp>::Scalar_(_Tp v0)
+{
+    this->val[0] = v0;
+    this->val[1] = this->val[2] = this->val[3] = 0;
+}
+
+template<typename _Tp> inline
+Scalar_<_Tp> Scalar_<_Tp>::all(_Tp v0)
+{
+    return Scalar_<_Tp>(v0, v0, v0, v0);
+}
+
+
+template<typename _Tp> inline
+Scalar_<_Tp> Scalar_<_Tp>::mul(const Scalar_<_Tp>& a, double scale ) const
+{
+    return Scalar_<_Tp>(saturate_cast<_Tp>(this->val[0] * a.val[0] * scale),
+                        saturate_cast<_Tp>(this->val[1] * a.val[1] * scale),
+                        saturate_cast<_Tp>(this->val[2] * a.val[2] * scale),
+                        saturate_cast<_Tp>(this->val[3] * a.val[3] * scale));
+}
+
+template<typename _Tp> inline
+Scalar_<_Tp> Scalar_<_Tp>::conj() const
+{
+    return Scalar_<_Tp>(saturate_cast<_Tp>( this->val[0]),
+                        saturate_cast<_Tp>(-this->val[1]),
+                        saturate_cast<_Tp>(-this->val[2]),
+                        saturate_cast<_Tp>(-this->val[3]));
+}
+
+template<typename _Tp> inline
+bool Scalar_<_Tp>::isReal() const
+{
+    return this->val[1] == 0 && this->val[2] == 0 && this->val[3] == 0;
+}
+
+
+template<typename _Tp> template<typename T2> inline
+Scalar_<_Tp>::operator Scalar_<T2>() const
+{
+    return Scalar_<T2>(saturate_cast<T2>(this->val[0]),
+                       saturate_cast<T2>(this->val[1]),
+                       saturate_cast<T2>(this->val[2]),
+                       saturate_cast<T2>(this->val[3]));
+}
+
+
+template<typename _Tp> static inline
+Scalar_<_Tp>& operator += (Scalar_<_Tp>& a, const Scalar_<_Tp>& b)
+{
+    a.val[0] += b.val[0];
+    a.val[1] += b.val[1];
+    a.val[2] += b.val[2];
+    a.val[3] += b.val[3];
+    return a;
+}
+
+template<typename _Tp> static inline
+Scalar_<_Tp>& operator -= (Scalar_<_Tp>& a, const Scalar_<_Tp>& b)
+{
+    a.val[0] -= b.val[0];
+    a.val[1] -= b.val[1];
+    a.val[2] -= b.val[2];
+    a.val[3] -= b.val[3];
+    return a;
+}
+
+template<typename _Tp> static inline
+Scalar_<_Tp>& operator *= ( Scalar_<_Tp>& a, _Tp v )
+{
+    a.val[0] *= v;
+    a.val[1] *= v;
+    a.val[2] *= v;
+    a.val[3] *= v;
+    return a;
+}
+
+template<typename _Tp> static inline
+bool operator == ( const Scalar_<_Tp>& a, const Scalar_<_Tp>& b )
+{
+    return a.val[0] == b.val[0] && a.val[1] == b.val[1] &&
+           a.val[2] == b.val[2] && a.val[3] == b.val[3];
+}
+
+template<typename _Tp> static inline
+bool operator != ( const Scalar_<_Tp>& a, const Scalar_<_Tp>& b )
+{
+    return a.val[0] != b.val[0] || a.val[1] != b.val[1] ||
+           a.val[2] != b.val[2] || a.val[3] != b.val[3];
+}
+
+template<typename _Tp> static inline
+Scalar_<_Tp> operator + (const Scalar_<_Tp>& a, const Scalar_<_Tp>& b)
+{
+    return Scalar_<_Tp>(a.val[0] + b.val[0],
+                        a.val[1] + b.val[1],
+                        a.val[2] + b.val[2],
+                        a.val[3] + b.val[3]);
+}
+
+template<typename _Tp> static inline
+Scalar_<_Tp> operator - (const Scalar_<_Tp>& a, const Scalar_<_Tp>& b)
+{
+    return Scalar_<_Tp>(saturate_cast<_Tp>(a.val[0] - b.val[0]),
+                        saturate_cast<_Tp>(a.val[1] - b.val[1]),
+                        saturate_cast<_Tp>(a.val[2] - b.val[2]),
+                        saturate_cast<_Tp>(a.val[3] - b.val[3]));
+}
+
+template<typename _Tp> static inline
+Scalar_<_Tp> operator * (const Scalar_<_Tp>& a, _Tp alpha)
+{
+    return Scalar_<_Tp>(a.val[0] * alpha,
+                        a.val[1] * alpha,
+                        a.val[2] * alpha,
+                        a.val[3] * alpha);
+}
+
+template<typename _Tp> static inline
+Scalar_<_Tp> operator * (_Tp alpha, const Scalar_<_Tp>& a)
+{
+    return a*alpha;
+}
+
+template<typename _Tp> static inline
+Scalar_<_Tp> operator - (const Scalar_<_Tp>& a)
+{
+    return Scalar_<_Tp>(saturate_cast<_Tp>(-a.val[0]),
+                        saturate_cast<_Tp>(-a.val[1]),
+                        saturate_cast<_Tp>(-a.val[2]),
+                        saturate_cast<_Tp>(-a.val[3]));
+}
+
+
+template<typename _Tp> static inline
+Scalar_<_Tp> operator * (const Scalar_<_Tp>& a, const Scalar_<_Tp>& b)
+{
+    return Scalar_<_Tp>(saturate_cast<_Tp>(a[0]*b[0] - a[1]*b[1] - a[2]*b[2] - a[3]*b[3]),
+                        saturate_cast<_Tp>(a[0]*b[1] + a[1]*b[0] + a[2]*b[3] - a[3]*b[2]),
+                        saturate_cast<_Tp>(a[0]*b[2] - a[1]*b[3] + a[2]*b[0] + a[3]*b[1]),
+                        saturate_cast<_Tp>(a[0]*b[3] + a[1]*b[2] - a[2]*b[1] + a[3]*b[0]));
+}
+
+template<typename _Tp> static inline
+Scalar_<_Tp>& operator *= (Scalar_<_Tp>& a, const Scalar_<_Tp>& b)
+{
+    a = a * b;
+    return a;
+}
+
+template<typename _Tp> static inline
+Scalar_<_Tp> operator / (const Scalar_<_Tp>& a, _Tp alpha)
+{
+    return Scalar_<_Tp>(a.val[0] / alpha,
+                        a.val[1] / alpha,
+                        a.val[2] / alpha,
+                        a.val[3] / alpha);
+}
+
+template<typename _Tp> static inline
+Scalar_<float> operator / (const Scalar_<float>& a, float alpha)
+{
+    float s = 1 / alpha;
+    return Scalar_<float>(a.val[0] * s, a.val[1] * s, a.val[2] * s, a.val[3] * s);
+}
+
+template<typename _Tp> static inline
+Scalar_<double> operator / (const Scalar_<double>& a, double alpha)
+{
+    double s = 1 / alpha;
+    return Scalar_<double>(a.val[0] * s, a.val[1] * s, a.val[2] * s, a.val[3] * s);
+}
+
+template<typename _Tp> static inline
+Scalar_<_Tp>& operator /= (Scalar_<_Tp>& a, _Tp alpha)
+{
+    a = a / alpha;
+    return a;
+}
+
+template<typename _Tp> static inline
+Scalar_<_Tp> operator / (_Tp a, const Scalar_<_Tp>& b)
+{
+    _Tp s = a / (b[0]*b[0] + b[1]*b[1] + b[2]*b[2] + b[3]*b[3]);
+    return b.conj() * s;
+}
+
+template<typename _Tp> static inline
+Scalar_<_Tp> operator / (const Scalar_<_Tp>& a, const Scalar_<_Tp>& b)
+{
+    return a * ((_Tp)1 / b);
+}
+
+template<typename _Tp> static inline
+Scalar_<_Tp>& operator /= (Scalar_<_Tp>& a, const Scalar_<_Tp>& b)
+{
+    a = a / b;
+    return a;
+}
+
+template<typename _Tp> static inline
+Scalar operator * (const Matx<_Tp, 4, 4>& a, const Scalar& b)
+{
+    Matx<double, 4, 1> c((Matx<double, 4, 4>)a, b, Matx_MatMulOp());
+    return reinterpret_cast<const Scalar&>(c);
+}
+
+template<> inline
+Scalar operator * (const Matx<double, 4, 4>& a, const Scalar& b)
+{
+    Matx<double, 4, 1> c(a, b, Matx_MatMulOp());
+    return reinterpret_cast<const Scalar&>(c);
+}
+
+
+
+//////////////////////////////// KeyPoint ///////////////////////////////
+
+inline
+KeyPoint::KeyPoint()
+    : pt(0,0), size(0), angle(-1), response(0), octave(0), class_id(-1) {}
+
+inline
+KeyPoint::KeyPoint(Point2f _pt, float _size, float _angle, float _response, int _octave, int _class_id)
+    : pt(_pt), size(_size), angle(_angle), response(_response), octave(_octave), class_id(_class_id) {}
+
+inline
+KeyPoint::KeyPoint(float x, float y, float _size, float _angle, float _response, int _octave, int _class_id)
+    : pt(x, y), size(_size), angle(_angle), response(_response), octave(_octave), class_id(_class_id) {}
+
+
+
+///////////////////////////////// DMatch ////////////////////////////////
+
+inline
+DMatch::DMatch()
+    : queryIdx(-1), trainIdx(-1), imgIdx(-1), distance(FLT_MAX) {}
+
+inline
+DMatch::DMatch(int _queryIdx, int _trainIdx, float _distance)
+    : queryIdx(_queryIdx), trainIdx(_trainIdx), imgIdx(-1), distance(_distance) {}
+
+inline
+DMatch::DMatch(int _queryIdx, int _trainIdx, int _imgIdx, float _distance)
+    : queryIdx(_queryIdx), trainIdx(_trainIdx), imgIdx(_imgIdx), distance(_distance) {}
+
+inline
+bool DMatch::operator < (const DMatch &m) const
+{
+    return distance < m.distance;
+}
+
+
+
+////////////////////////////// TermCriteria /////////////////////////////
+
+inline
+TermCriteria::TermCriteria()
+    : type(0), maxCount(0), epsilon(0) {}
+
+inline
+TermCriteria::TermCriteria(int _type, int _maxCount, double _epsilon)
+    : type(_type), maxCount(_maxCount), epsilon(_epsilon) {}
+
+//! @endcond
+
+} // cv
+
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
+#endif //OPENCV_CORE_TYPES_HPP
diff --git a/3rdParty/opencv-4.12.0/opencv2/core/types_c.h b/3rdParty/opencv-4.12.0/opencv2/core/types_c.h
new file mode 100644
index 0000000000..473062a53f
--- /dev/null
+++ b/3rdParty/opencv-4.12.0/opencv2/core/types_c.h
@@ -0,0 +1,2110 @@
+/*M///////////////////////////////////////////////////////////////////////////////////////
+//
+//  IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
+//
+//  By downloading, copying, installing or using the software you agree to this license.
+//  If you do not agree to this license, do not download, install,
+//  copy or use the software.
+//
+//
+//                          License Agreement
+//                For Open Source Computer Vision Library
+//
+// Copyright (C) 2000-2008, Intel Corporation, all rights reserved.
+// Copyright (C) 2009, Willow Garage Inc., all rights reserved.
+// Copyright (C) 2013, OpenCV Foundation, all rights reserved.
+// Third party copyrights are property of their respective owners.
+//
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
+//
+//   * Redistribution's of source code must retain the above copyright notice,
+//     this list of conditions and the following disclaimer.
+//
+//   * Redistribution's in binary form must reproduce the above copyright notice,
+//     this list of conditions and the following disclaimer in the documentation
+//     and/or other materials provided with the distribution.
+//
+//   * The name of the copyright holders may not be used to endorse or promote products
+//     derived from this software without specific prior written permission.
+//
+// This software is provided by the copyright holders and contributors "as is" and
+// any express or implied warranties, including, but not limited to, the implied
+// warranties of merchantability and fitness for a particular purpose are disclaimed.
+// In no event shall the Intel Corporation or contributors be liable for any direct,
+// indirect, incidental, special, exemplary, or consequential damages
+// (including, but not limited to, procurement of substitute goods or services;
+// loss of use, data, or profits; or business interruption) however caused
+// and on any theory of liability, whether in contract, strict liability,
+// or tort (including negligence or otherwise) arising in any way out of
+// the use of this software, even if advised of the possibility of such damage.
+//
+//M*/
+
+#ifndef OPENCV_CORE_TYPES_H
+#define OPENCV_CORE_TYPES_H
+
+#ifdef CV__ENABLE_C_API_CTORS  // invalid C API ctors (must be removed)
+#if defined(_WIN32) && !defined(CV__SKIP_MESSAGE_MALFORMED_C_API_CTORS)
+#error "C API ctors don't work on Win32: https://github.com/opencv/opencv/issues/15990"
+#endif
+#endif
+
+//#define CV__VALIDATE_UNUNITIALIZED_VARS 1  // C++11 & GCC only
+
+#ifdef __cplusplus
+
+#ifdef CV__VALIDATE_UNUNITIALIZED_VARS
+#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+#define CV_STRUCT_INITIALIZER {0,}
+#else
+#if defined(__GNUC__) && __GNUC__ == 4  // GCC 4.x warns on "= {}" initialization, fixed in GCC 5.0
+#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+#endif
+#define CV_STRUCT_INITIALIZER {}
+#endif
+
+#else
+#define CV_STRUCT_INITIALIZER {0}
+#endif
+
+
+#ifdef HAVE_IPL
+#  ifndef __IPL_H__
+#    if defined _WIN32
+#      include <ipl.h>
+#    else
+#      include <ipl/ipl.h>
+#    endif
+#  endif
+#elif defined __IPL_H__
+#  define HAVE_IPL
+#endif
+
+#include "opencv2/core/cvdef.h"
+
+#ifndef SKIP_INCLUDES
+#include <assert.h>
+#include <stdlib.h>
+#include <string.h>
+#include <float.h>
+#endif // SKIP_INCLUDES
+
+
+
+#ifndef CV_DEFAULT
+#  ifdef __cplusplus
+#    define CV_DEFAULT(val) = val
+#  else
+#    define CV_DEFAULT(val)
+#  endif
+#endif
+
+#ifndef CV_EXTERN_C_FUNCPTR
+#  ifdef __cplusplus
+#    define CV_EXTERN_C_FUNCPTR(x) extern "C" { typedef x; }
+#  else
+#    define CV_EXTERN_C_FUNCPTR(x) typedef x
+#  endif
+#endif
+
+#ifndef CVAPI
+#  define CVAPI(rettype) CV_EXTERN_C CV_EXPORTS rettype CV_CDECL
+#endif
+
+#ifndef CV_IMPL
+#  define CV_IMPL CV_EXTERN_C
+#endif
+
+#ifdef __cplusplus
+#  include "opencv2/core.hpp"
+#endif
+
+/** @addtogroup core_c
+    @{
+*/
+
+/** @brief This is the "metatype" used *only* as a function parameter.
+
+It denotes that the function accepts arrays of multiple types, such as IplImage*, CvMat* or even
+CvSeq* sometimes. The particular array type is determined at runtime by analyzing the first 4
+bytes of the header. In C++ interface the role of CvArr is played by InputArray and OutputArray.
+ */
+typedef void CvArr;
+
+typedef int CVStatus;
+
+/** @see cv::Error::Code */
+enum {
+ CV_StsOk=                       0,  /**< everything is ok                */
+ CV_StsBackTrace=               -1,  /**< pseudo error for back trace     */
+ CV_StsError=                   -2,  /**< unknown /unspecified error      */
+ CV_StsInternal=                -3,  /**< internal error (bad state)      */
+ CV_StsNoMem=                   -4,  /**< insufficient memory             */
+ CV_StsBadArg=                  -5,  /**< function arg/param is bad       */
+ CV_StsBadFunc=                 -6,  /**< unsupported function            */
+ CV_StsNoConv=                  -7,  /**< iter. didn't converge           */
+ CV_StsAutoTrace=               -8,  /**< tracing                         */
+ CV_HeaderIsNull=               -9,  /**< image header is NULL            */
+ CV_BadImageSize=              -10,  /**< image size is invalid           */
+ CV_BadOffset=                 -11,  /**< offset is invalid               */
+ CV_BadDataPtr=                -12,  /**/
+ CV_BadStep=                   -13,  /**< image step is wrong, this may happen for a non-continuous matrix */
+ CV_BadModelOrChSeq=           -14,  /**/
+ CV_BadNumChannels=            -15,  /**< bad number of channels, for example, some functions accept only single channel matrices */
+ CV_BadNumChannel1U=           -16,  /**/
+ CV_BadDepth=                  -17,  /**< input image depth is not supported by the function */
+ CV_BadAlphaChannel=           -18,  /**/
+ CV_BadOrder=                  -19,  /**< number of dimensions is out of range */
+ CV_BadOrigin=                 -20,  /**< incorrect input origin               */
+ CV_BadAlign=                  -21,  /**< incorrect input align                */
+ CV_BadCallBack=               -22,  /**/
+ CV_BadTileSize=               -23,  /**/
+ CV_BadCOI=                    -24,  /**< input COI is not supported           */
+ CV_BadROISize=                -25,  /**< incorrect input roi                  */
+ CV_MaskIsTiled=               -26,  /**/
+ CV_StsNullPtr=                -27,  /**< null pointer */
+ CV_StsVecLengthErr=           -28,  /**< incorrect vector length */
+ CV_StsFilterStructContentErr= -29,  /**< incorrect filter structure content */
+ CV_StsKernelStructContentErr= -30,  /**< incorrect transform kernel content */
+ CV_StsFilterOffsetErr=        -31,  /**< incorrect filter offset value */
+ CV_StsBadSize=                -201, /**< the input/output structure size is incorrect  */
+ CV_StsDivByZero=              -202, /**< division by zero */
+ CV_StsInplaceNotSupported=    -203, /**< in-place operation is not supported */
+ CV_StsObjectNotFound=         -204, /**< request can't be completed */
+ CV_StsUnmatchedFormats=       -205, /**< formats of input/output arrays differ */
+ CV_StsBadFlag=                -206, /**< flag is wrong or not supported */
+ CV_StsBadPoint=               -207, /**< bad CvPoint */
+ CV_StsBadMask=                -208, /**< bad format of mask (neither 8uC1 nor 8sC1)*/
+ CV_StsUnmatchedSizes=         -209, /**< sizes of input/output structures do not match */
+ CV_StsUnsupportedFormat=      -210, /**< the data format/type is not supported by the function*/
+ CV_StsOutOfRange=             -211, /**< some of parameters are out of range */
+ CV_StsParseError=             -212, /**< invalid syntax/structure of the parsed file */
+ CV_StsNotImplemented=         -213, /**< the requested function/feature is not implemented */
+ CV_StsBadMemBlock=            -214, /**< an allocated block has been corrupted */
+ CV_StsAssert=                 -215, /**< assertion failed   */
+ CV_GpuNotSupported=           -216, /**< no CUDA support    */
+ CV_GpuApiCallError=           -217, /**< GPU API call error */
+ CV_OpenGlNotSupported=        -218, /**< no OpenGL support  */
+ CV_OpenGlApiCallError=        -219, /**< OpenGL API call error */
+ CV_OpenCLApiCallError=        -220, /**< OpenCL API call error */
+ CV_OpenCLDoubleNotSupported=  -221,
+ CV_OpenCLInitError=           -222, /**< OpenCL initialization error */
+ CV_OpenCLNoAMDBlasFft=        -223
+};
+
+/****************************************************************************************\
+*                             Common macros and inline functions                         *
+\****************************************************************************************/
+
+/** absolute value without jumps */
+#ifndef __cplusplus
+#  define  CV_IABS(a)     (((a) ^ ((a) < 0 ? -1 : 0)) - ((a) < 0 ? -1 : 0))
+#else
+#  define  CV_IABS(a)     abs(a)
+#endif
+
+
+#define cvInvSqrt(value) ((float)(1./sqrt(value)))
+#define cvSqrt(value)  ((float)sqrt(value))
+
+
+/*************** Random number generation *******************/
+
+typedef uint64 CvRNG;
+
+#define CV_RNG_COEFF 4164903690U
+
+/** @brief Initializes a random number generator state.
+
+The function initializes a random number generator and returns the state. The pointer to the state
+can be then passed to the cvRandInt, cvRandReal and cvRandArr functions. In the current
+implementation a multiply-with-carry generator is used.
+@param seed 64-bit value used to initiate a random sequence
+@sa the C++ class RNG replaced CvRNG.
+ */
+CV_INLINE CvRNG cvRNG( int64 seed CV_DEFAULT(-1))
+{
+    CvRNG rng = seed ? (uint64)seed : (uint64)(int64)-1;
+    return rng;
+}
+
+/** @brief Returns a 32-bit unsigned integer and updates RNG.
+
+The function returns a uniformly-distributed random 32-bit unsigned integer and updates the RNG
+state. It is similar to the rand() function from the C runtime library, except that OpenCV functions
+always generates a 32-bit random number, regardless of the platform.
+@param rng CvRNG state initialized by cvRNG.
+ */
+CV_INLINE unsigned cvRandInt( CvRNG* rng )
+{
+    uint64 temp = *rng;
+    temp = (uint64)(unsigned)temp*CV_RNG_COEFF + (temp >> 32);
+    *rng = temp;
+    return (unsigned)temp;
+}
+
+/** @brief Returns a floating-point random number and updates RNG.
+
+The function returns a uniformly-distributed random floating-point number between 0 and 1 (1 is not
+included).
+@param rng RNG state initialized by cvRNG
+ */
+CV_INLINE double cvRandReal( CvRNG* rng )
+{
+    return cvRandInt(rng)*2.3283064365386962890625e-10 /* 2^-32 */;
+}
+
+/****************************************************************************************\
+*                                  Image type (IplImage)                                 *
+\****************************************************************************************/
+
+#ifndef HAVE_IPL
+
+/*
+ * The following definitions (until #endif)
+ * is an extract from IPL headers.
+ * Copyright (c) 1995 Intel Corporation.
+ */
+#define IPL_DEPTH_SIGN 0x80000000
+
+#define IPL_DEPTH_1U     1
+#define IPL_DEPTH_8U     8
+#define IPL_DEPTH_16U   16
+#define IPL_DEPTH_32F   32
+
+#define IPL_DEPTH_8S  (IPL_DEPTH_SIGN| 8)
+#define IPL_DEPTH_16S (IPL_DEPTH_SIGN|16)
+#define IPL_DEPTH_32S (IPL_DEPTH_SIGN|32)
+
+#define IPL_DATA_ORDER_PIXEL  0
+#define IPL_DATA_ORDER_PLANE  1
+
+#define IPL_ORIGIN_TL 0
+#define IPL_ORIGIN_BL 1
+
+#define IPL_ALIGN_4BYTES   4
+#define IPL_ALIGN_8BYTES   8
+#define IPL_ALIGN_16BYTES 16
+#define IPL_ALIGN_32BYTES 32
+
+#define IPL_ALIGN_DWORD   IPL_ALIGN_4BYTES
+#define IPL_ALIGN_QWORD   IPL_ALIGN_8BYTES
+
+#define IPL_BORDER_CONSTANT   0
+#define IPL_BORDER_REPLICATE  1
+#define IPL_BORDER_REFLECT    2
+#define IPL_BORDER_WRAP       3
+
+#ifdef __cplusplus
+typedef struct _IplImage IplImage;
+CV_EXPORTS _IplImage cvIplImage(const cv::Mat& m);
+#endif
+
+/** The IplImage is taken from the Intel Image Processing Library, in which the format is native. OpenCV
+only supports a subset of possible IplImage formats, as outlined in the parameter list above.
+
+In addition to the above restrictions, OpenCV handles ROIs differently. OpenCV functions require
+that the image size or ROI size of all source and destination images match exactly. On the other
+hand, the Intel Image Processing Library processes the area of intersection between the source and
+destination images (or ROIs), allowing them to vary independently.
+*/
+typedef struct
+_IplImage
+{
+    int  nSize;             /**< sizeof(IplImage) */
+    int  ID;                /**< version (=0)*/
+    int  nChannels;         /**< Most of OpenCV functions support 1,2,3 or 4 channels */
+    int  alphaChannel;      /**< Ignored by OpenCV */
+    int  depth;             /**< Pixel depth in bits: IPL_DEPTH_8U, IPL_DEPTH_8S, IPL_DEPTH_16S,
+                               IPL_DEPTH_32S, IPL_DEPTH_32F and IPL_DEPTH_64F are supported.  */
+    char colorModel[4];     /**< Ignored by OpenCV */
+    char channelSeq[4];     /**< ditto */
+    int  dataOrder;         /**< 0 - interleaved color channels, 1 - separate color channels.
+                               cvCreateImage can only create interleaved images */
+    int  origin;            /**< 0 - top-left origin,
+                               1 - bottom-left origin (Windows bitmaps style).  */
+    int  align;             /**< Alignment of image rows (4 or 8).
+                               OpenCV ignores it and uses widthStep instead.    */
+    int  width;             /**< Image width in pixels.                           */
+    int  height;            /**< Image height in pixels.                          */
+    struct _IplROI *roi;    /**< Image ROI. If NULL, the whole image is selected. */
+    struct _IplImage *maskROI;      /**< Must be NULL. */
+    void  *imageId;                 /**< "           " */
+    struct _IplTileInfo *tileInfo;  /**< "           " */
+    int  imageSize;         /**< Image data size in bytes
+                               (==image->height*image->widthStep
+                               in case of interleaved data)*/
+    char *imageData;        /**< Pointer to aligned image data.         */
+    int  widthStep;         /**< Size of aligned image row in bytes.    */
+    int  BorderMode[4];     /**< Ignored by OpenCV.                     */
+    int  BorderConst[4];    /**< Ditto.                                 */
+    char *imageDataOrigin;  /**< Pointer to very origin of image data
+                               (not necessarily aligned) -
+                               needed for correct deallocation */
+
+#if defined(CV__ENABLE_C_API_CTORS) && defined(__cplusplus)
+    _IplImage()
+    {
+        memset(this, 0, sizeof(*this));  // valid for POD structure
+        nSize = sizeof(IplImage);
+    }
+    _IplImage(const cv::Mat& m) { *this = cvIplImage(m); }
+#endif
+}
+IplImage;
+
+CV_INLINE IplImage cvIplImage()
+{
+#if !(defined(CV__ENABLE_C_API_CTORS) && defined(__cplusplus))
+    IplImage self = CV_STRUCT_INITIALIZER; self.nSize = sizeof(IplImage); return self;
+#else
+    return _IplImage();
+#endif
+}
+
+typedef struct _IplTileInfo IplTileInfo;
+
+typedef struct _IplROI
+{
+    int  coi; /**< 0 - no COI (all channels are selected), 1 - 0th channel is selected ...*/
+    int  xOffset;
+    int  yOffset;
+    int  width;
+    int  height;
+}
+IplROI;
+
+typedef struct _IplConvKernel
+{
+    int  nCols;
+    int  nRows;
+    int  anchorX;
+    int  anchorY;
+    int *values;
+    int  nShiftR;
+}
+IplConvKernel;
+
+typedef struct _IplConvKernelFP
+{
+    int  nCols;
+    int  nRows;
+    int  anchorX;
+    int  anchorY;
+    float *values;
+}
+IplConvKernelFP;
+
+#define IPL_IMAGE_HEADER 1
+#define IPL_IMAGE_DATA   2
+#define IPL_IMAGE_ROI    4
+
+#endif/*HAVE_IPL*/
+
+/** extra border mode */
+#define IPL_BORDER_REFLECT_101    4
+#define IPL_BORDER_TRANSPARENT    5
+
+#define IPL_IMAGE_MAGIC_VAL  ((int)sizeof(IplImage))
+#define CV_TYPE_NAME_IMAGE "opencv-image"
+
+#define CV_IS_IMAGE_HDR(img) \
+    ((img) != NULL && ((const IplImage*)(img))->nSize == sizeof(IplImage))
+
+#define CV_IS_IMAGE(img) \
+    (CV_IS_IMAGE_HDR(img) && ((IplImage*)img)->imageData != NULL)
+
+/** for storing double-precision
+   floating point data in IplImage's */
+#define IPL_DEPTH_64F  64
+
+/** get reference to pixel at (col,row),
+   for multi-channel images (col) should be multiplied by number of channels */
+#define CV_IMAGE_ELEM( image, elemtype, row, col )       \
+    (((elemtype*)((image)->imageData + (image)->widthStep*(row)))[(col)])
+
+/****************************************************************************************\
+*                                  Matrix type (CvMat)                                   *
+\****************************************************************************************/
+
+#define CV_AUTO_STEP  0x7fffffff
+#define CV_WHOLE_ARR  cvSlice( 0, 0x3fffffff )
+
+#define CV_MAGIC_MASK       0xFFFF0000
+#define CV_MAT_MAGIC_VAL    0x42420000
+#define CV_TYPE_NAME_MAT    "opencv-matrix"
+
+#ifdef __cplusplus
+typedef struct CvMat CvMat;
+CV_INLINE CvMat cvMat(const cv::Mat& m);
+#endif
+
+/** Matrix elements are stored row by row. Element (i, j) (i - 0-based row index, j - 0-based column
+index) of a matrix can be retrieved or modified using CV_MAT_ELEM macro:
+
+    uchar pixval = CV_MAT_ELEM(grayimg, uchar, i, j)
+    CV_MAT_ELEM(cameraMatrix, float, 0, 2) = image.width*0.5f;
+
+To access multiple-channel matrices, you can use
+CV_MAT_ELEM(matrix, type, i, j\*nchannels + channel_idx).
+
+@deprecated CvMat is now obsolete; consider using Mat instead.
+ */
+typedef struct CvMat
+{
+    int type;
+    int step;
+
+    /* for internal use only */
+    int* refcount;
+    int hdr_refcount;
+
+    union
+    {
+        uchar* ptr;
+        short* s;
+        int* i;
+        float* fl;
+        double* db;
+    } data;
+
+#ifdef __cplusplus
+    union
+    {
+        int rows;
+        int height;
+    };
+
+    union
+    {
+        int cols;
+        int width;
+    };
+#else
+    int rows;
+    int cols;
+#endif
+
+#if defined(CV__ENABLE_C_API_CTORS) && defined(__cplusplus)
+    CvMat() {}
+    CvMat(const cv::Mat& m) { *this = cvMat(m); }
+#endif
+}
+CvMat;
+
+
+#define CV_IS_MAT_HDR(mat) \
+    ((mat) != NULL && \
+    (((const CvMat*)(mat))->type & CV_MAGIC_MASK) == CV_MAT_MAGIC_VAL && \
+    ((const CvMat*)(mat))->cols > 0 && ((const CvMat*)(mat))->rows > 0)
+
+#define CV_IS_MAT_HDR_Z(mat) \
+    ((mat) != NULL && \
+    (((const CvMat*)(mat))->type & CV_MAGIC_MASK) == CV_MAT_MAGIC_VAL && \
+    ((const CvMat*)(mat))->cols >= 0 && ((const CvMat*)(mat))->rows >= 0)
+
+#define CV_IS_MAT(mat) \
+    (CV_IS_MAT_HDR(mat) && ((const CvMat*)(mat))->data.ptr != NULL)
+
+#define CV_IS_MASK_ARR(mat) \
+    (((mat)->type & (CV_MAT_TYPE_MASK & ~CV_8SC1)) == 0)
+
+#define CV_ARE_TYPES_EQ(mat1, mat2) \
+    ((((mat1)->type ^ (mat2)->type) & CV_MAT_TYPE_MASK) == 0)
+
+#define CV_ARE_CNS_EQ(mat1, mat2) \
+    ((((mat1)->type ^ (mat2)->type) & CV_MAT_CN_MASK) == 0)
+
+#define CV_ARE_DEPTHS_EQ(mat1, mat2) \
+    ((((mat1)->type ^ (mat2)->type) & CV_MAT_DEPTH_MASK) == 0)
+
+#define CV_ARE_SIZES_EQ(mat1, mat2) \
+    ((mat1)->rows == (mat2)->rows && (mat1)->cols == (mat2)->cols)
+
+#define CV_IS_MAT_CONST(mat)  \
+    (((mat)->rows|(mat)->cols) == 1)
+
+#define IPL2CV_DEPTH(depth) \
+    ((((CV_8U)+(CV_16U<<4)+(CV_32F<<8)+(CV_64F<<16)+(CV_8S<<20)+ \
+    (CV_16S<<24)+(CV_32S<<28)) >> ((((depth) & 0xF0) >> 2) + \
+    (((depth) & IPL_DEPTH_SIGN) ? 20 : 0))) & 15)
+
+/** Inline constructor. No data is allocated internally!!!
+ * (Use together with cvCreateData, or use cvCreateMat instead to
+ * get a matrix with allocated data):
+ */
+CV_INLINE CvMat cvMat( int rows, int cols, int type, void* data CV_DEFAULT(NULL))
+{
+    CvMat m;
+
+    assert( (unsigned)CV_MAT_DEPTH(type) <= CV_64F );
+    type = CV_MAT_TYPE(type);
+    m.type = CV_MAT_MAGIC_VAL | CV_MAT_CONT_FLAG | type;
+    m.cols = cols;
+    m.rows = rows;
+    m.step = m.cols*CV_ELEM_SIZE(type);
+    m.data.ptr = (uchar*)data;
+    m.refcount = NULL;
+    m.hdr_refcount = 0;
+
+    return m;
+}
+
+#ifdef __cplusplus
+
+CV_INLINE CvMat cvMat(const cv::Mat& m)
+{
+    CvMat self;
+    CV_DbgAssert(m.dims <= 2);
+    self = cvMat(m.rows, m.dims == 1 ? 1 : m.cols, m.type(), m.data);
+    self.step = (int)m.step[0];
+    self.type = (self.type & ~cv::Mat::CONTINUOUS_FLAG) | (m.flags & cv::Mat::CONTINUOUS_FLAG);
+    return self;
+}
+CV_INLINE CvMat cvMat()
+{
+#if !defined(CV__ENABLE_C_API_CTORS)
+    CvMat self = CV_STRUCT_INITIALIZER; return self;
+#else
+    return CvMat();
+#endif
+}
+CV_INLINE CvMat cvMat(const CvMat& m)
+{
+#if !defined(CV__ENABLE_C_API_CTORS)
+    CvMat self = CV_STRUCT_INITIALIZER; memcpy(&self, &m, sizeof(self)); return self;
+#else
+    return CvMat(m);
+#endif
+}
+
+#endif // __cplusplus
+
+
+#define CV_MAT_ELEM_PTR_FAST( mat, row, col, pix_size )  \
+    (assert( (unsigned)(row) < (unsigned)(mat).rows &&   \
+             (unsigned)(col) < (unsigned)(mat).cols ),   \
+     (mat).data.ptr + (size_t)(mat).step*(row) + (pix_size)*(col))
+
+#define CV_MAT_ELEM_PTR( mat, row, col )                 \
+    CV_MAT_ELEM_PTR_FAST( mat, row, col, CV_ELEM_SIZE((mat).type) )
+
+#define CV_MAT_ELEM( mat, elemtype, row, col )           \
+    (*(elemtype*)CV_MAT_ELEM_PTR_FAST( mat, row, col, sizeof(elemtype)))
+
+/** @brief Returns the particular element of single-channel floating-point matrix.
+
+The function is a fast replacement for cvGetReal2D in the case of single-channel floating-point
+matrices. It is faster because it is inline, it does fewer checks for array type and array element
+type, and it checks for the row and column ranges only in debug mode.
+@param mat Input matrix
+@param row The zero-based index of row
+@param col The zero-based index of column
+ */
+CV_INLINE  double  cvmGet( const CvMat* mat, int row, int col )
+{
+    int type;
+
+    type = CV_MAT_TYPE(mat->type);
+    assert( (unsigned)row < (unsigned)mat->rows &&
+            (unsigned)col < (unsigned)mat->cols );
+
+    if( type == CV_32FC1 )
+        return ((float*)(void*)(mat->data.ptr + (size_t)mat->step*row))[col];
+    else
+    {
+        assert( type == CV_64FC1 );
+        return ((double*)(void*)(mat->data.ptr + (size_t)mat->step*row))[col];
+    }
+}
+
+/** @brief Sets a specific element of a single-channel floating-point matrix.
+
+The function is a fast replacement for cvSetReal2D in the case of single-channel floating-point
+matrices. It is faster because it is inline, it does fewer checks for array type and array element
+type, and it checks for the row and column ranges only in debug mode.
+@param mat The matrix
+@param row The zero-based index of row
+@param col The zero-based index of column
+@param value The new value of the matrix element
+ */
+CV_INLINE  void  cvmSet( CvMat* mat, int row, int col, double value )
+{
+    int type;
+    type = CV_MAT_TYPE(mat->type);
+    assert( (unsigned)row < (unsigned)mat->rows &&
+            (unsigned)col < (unsigned)mat->cols );
+
+    if( type == CV_32FC1 )
+        ((float*)(void*)(mat->data.ptr + (size_t)mat->step*row))[col] = (float)value;
+    else
+    {
+        assert( type == CV_64FC1 );
+        ((double*)(void*)(mat->data.ptr + (size_t)mat->step*row))[col] = value;
+    }
+}
+
+
+CV_INLINE int cvIplDepth( int type )
+{
+    int depth = CV_MAT_DEPTH(type);
+    return CV_ELEM_SIZE1(depth)*8 | (depth == CV_8S || depth == CV_16S ||
+           depth == CV_32S ? IPL_DEPTH_SIGN : 0);
+}
+
+
+/****************************************************************************************\
+*                       Multi-dimensional dense array (CvMatND)                          *
+\****************************************************************************************/
+
+#define CV_MATND_MAGIC_VAL    0x42430000
+#define CV_TYPE_NAME_MATND    "opencv-nd-matrix"
+
+#ifdef __cplusplus
+typedef struct CvMatND CvMatND;
+CV_EXPORTS CvMatND cvMatND(const cv::Mat& m);
+#endif
+
+/**
+  @deprecated consider using cv::Mat instead
+  */
+typedef struct
+CvMatND
+{
+    int type;
+    int dims;
+
+    int* refcount;
+    int hdr_refcount;
+
+    union
+    {
+        uchar* ptr;
+        float* fl;
+        double* db;
+        int* i;
+        short* s;
+    } data;
+
+    struct
+    {
+        int size;
+        int step;
+    }
+    dim[CV_MAX_DIM];
+
+#if defined(CV__ENABLE_C_API_CTORS) && defined(__cplusplus)
+    CvMatND() {}
+    CvMatND(const cv::Mat& m) { *this = cvMatND(m); }
+#endif
+}
+CvMatND;
+
+
+CV_INLINE CvMatND cvMatND()
+{
+#if !(defined(CV__ENABLE_C_API_CTORS) && defined(__cplusplus))
+    CvMatND self = CV_STRUCT_INITIALIZER; return self;
+#else
+    return CvMatND();
+#endif
+}
+
+#define CV_IS_MATND_HDR(mat) \
+    ((mat) != NULL && (((const CvMatND*)(mat))->type & CV_MAGIC_MASK) == CV_MATND_MAGIC_VAL)
+
+#define CV_IS_MATND(mat) \
+    (CV_IS_MATND_HDR(mat) && ((const CvMatND*)(mat))->data.ptr != NULL)
+
+
+/****************************************************************************************\
+*                      Multi-dimensional sparse array (CvSparseMat)                      *
+\****************************************************************************************/
+
+#define CV_SPARSE_MAT_MAGIC_VAL    0x42440000
+#define CV_TYPE_NAME_SPARSE_MAT    "opencv-sparse-matrix"
+
+struct CvSet;
+
+typedef struct CvSparseMat
+{
+    int type;
+    int dims;
+    int* refcount;
+    int hdr_refcount;
+
+    struct CvSet* heap;
+    void** hashtable;
+    int hashsize;
+    int valoffset;
+    int idxoffset;
+    int size[CV_MAX_DIM];
+
+#ifdef __cplusplus
+    CV_EXPORTS void copyToSparseMat(cv::SparseMat& m) const;
+#endif
+}
+CvSparseMat;
+
+#ifdef __cplusplus
+CV_EXPORTS CvSparseMat* cvCreateSparseMat(const cv::SparseMat& m);
+#endif
+
+#define CV_IS_SPARSE_MAT_HDR(mat) \
+    ((mat) != NULL && \
+    (((const CvSparseMat*)(mat))->type & CV_MAGIC_MASK) == CV_SPARSE_MAT_MAGIC_VAL)
+
+#define CV_IS_SPARSE_MAT(mat) \
+    CV_IS_SPARSE_MAT_HDR(mat)
+
+/**************** iteration through a sparse array *****************/
+
+typedef struct CvSparseNode
+{
+    unsigned hashval;
+    struct CvSparseNode* next;
+}
+CvSparseNode;
+
+typedef struct CvSparseMatIterator
+{
+    CvSparseMat* mat;
+    CvSparseNode* node;
+    int curidx;
+}
+CvSparseMatIterator;
+
+#define CV_NODE_VAL(mat,node)   ((void*)((uchar*)(node) + (mat)->valoffset))
+#define CV_NODE_IDX(mat,node)   ((int*)((uchar*)(node) + (mat)->idxoffset))
+
+/****************************************************************************************\
+*                                         Histogram                                      *
+\****************************************************************************************/
+
+typedef int CvHistType;
+
+#define CV_HIST_MAGIC_VAL     0x42450000
+#define CV_HIST_UNIFORM_FLAG  (1 << 10)
+
+/** indicates whether bin ranges are set already or not */
+#define CV_HIST_RANGES_FLAG   (1 << 11)
+
+#define CV_HIST_ARRAY         0
+#define CV_HIST_SPARSE        1
+#define CV_HIST_TREE          CV_HIST_SPARSE
+
+/** should be used as a parameter only,
+   it turns to CV_HIST_UNIFORM_FLAG of hist->type */
+#define CV_HIST_UNIFORM       1
+
+typedef struct CvHistogram
+{
+    int     type;
+    CvArr*  bins;
+    float   thresh[CV_MAX_DIM][2];  /**< For uniform histograms.                      */
+    float** thresh2;                /**< For non-uniform histograms.                  */
+    CvMatND mat;                    /**< Embedded matrix header for array histograms. */
+}
+CvHistogram;
+
+#define CV_IS_HIST( hist ) \
+    ((hist) != NULL  && \
+     (((CvHistogram*)(hist))->type & CV_MAGIC_MASK) == CV_HIST_MAGIC_VAL && \
+     (hist)->bins != NULL)
+
+#define CV_IS_UNIFORM_HIST( hist ) \
+    (((hist)->type & CV_HIST_UNIFORM_FLAG) != 0)
+
+#define CV_IS_SPARSE_HIST( hist ) \
+    CV_IS_SPARSE_MAT((hist)->bins)
+
+#define CV_HIST_HAS_RANGES( hist ) \
+    (((hist)->type & CV_HIST_RANGES_FLAG) != 0)
+
+/****************************************************************************************\
+*                      Other supplementary data type definitions                         *
+\****************************************************************************************/
+
+/*************************************** CvRect *****************************************/
+/** @sa Rect_ */
+typedef struct CvRect
+{
+    int x;
+    int y;
+    int width;
+    int height;
+
+#ifdef CV__VALIDATE_UNUNITIALIZED_VARS
+    CvRect() __attribute__(( warning("Non-initialized variable") )) {};
+    template<typename _Tp> CvRect(const std::initializer_list<_Tp> list)
+    {
+        CV_Assert(list.size() == 0 || list.size() == 4);
+        x = y = width = height = 0;
+        if (list.size() == 4)
+        {
+            x = list.begin()[0]; y = list.begin()[1]; width = list.begin()[2]; height = list.begin()[3];
+        }
+    };
+#elif defined(CV__ENABLE_C_API_CTORS) && defined(__cplusplus)
+    CvRect(int _x = 0, int _y = 0, int w = 0, int h = 0): x(_x), y(_y), width(w), height(h) {}
+    template<typename _Tp>
+    CvRect(const cv::Rect_<_Tp>& r): x(cv::saturate_cast<int>(r.x)), y(cv::saturate_cast<int>(r.y)), width(cv::saturate_cast<int>(r.width)), height(cv::saturate_cast<int>(r.height)) {}
+#endif
+#ifdef __cplusplus
+    template<typename _Tp>
+    operator cv::Rect_<_Tp>() const { return cv::Rect_<_Tp>((_Tp)x, (_Tp)y, (_Tp)width, (_Tp)height); }
+#endif
+}
+CvRect;
+
+/** constructs CvRect structure. */
+CV_INLINE  CvRect  cvRect( int x, int y, int width, int height )
+{
+#if !(defined(CV__ENABLE_C_API_CTORS) && defined(__cplusplus))
+    CvRect r = {x, y, width, height};
+#else
+    CvRect r(x, y , width, height);
+#endif
+    return r;
+}
+#ifdef __cplusplus
+CV_INLINE CvRect cvRect(const cv::Rect& rc) { return cvRect(rc.x, rc.y, rc.width, rc.height); }
+#endif
+
+CV_INLINE  IplROI  cvRectToROI( CvRect rect, int coi )
+{
+    IplROI roi;
+    roi.xOffset = rect.x;
+    roi.yOffset = rect.y;
+    roi.width = rect.width;
+    roi.height = rect.height;
+    roi.coi = coi;
+
+    return roi;
+}
+
+
+CV_INLINE  CvRect  cvROIToRect( IplROI roi )
+{
+    return cvRect( roi.xOffset, roi.yOffset, roi.width, roi.height );
+}
+
+/*********************************** CvTermCriteria *************************************/
+
+#define CV_TERMCRIT_ITER    1
+#define CV_TERMCRIT_NUMBER  CV_TERMCRIT_ITER
+#define CV_TERMCRIT_EPS     2
+
+/** @sa TermCriteria
+ */
+typedef struct CvTermCriteria
+{
+    int    type;  /**< may be combination of
+                     CV_TERMCRIT_ITER
+                     CV_TERMCRIT_EPS */
+    int    max_iter;
+    double epsilon;
+#if defined(CV__ENABLE_C_API_CTORS) && defined(__cplusplus)
+    CvTermCriteria(int _type = 0, int _iter = 0, double _eps = 0) : type(_type), max_iter(_iter), epsilon(_eps)  {}
+    CvTermCriteria(const cv::TermCriteria& t) : type(t.type), max_iter(t.maxCount), epsilon(t.epsilon)  {}
+#endif
+#ifdef __cplusplus
+    operator cv::TermCriteria() const { return cv::TermCriteria(type, max_iter, epsilon); }
+#endif
+}
+CvTermCriteria;
+
+CV_INLINE  CvTermCriteria  cvTermCriteria( int type, int max_iter, double epsilon )
+{
+#if !(defined(CV__ENABLE_C_API_CTORS) && defined(__cplusplus))
+    CvTermCriteria t = { type, max_iter, (float)epsilon};
+#else
+    CvTermCriteria t(type, max_iter, epsilon);
+#endif
+    return t;
+}
+#ifdef __cplusplus
+CV_INLINE CvTermCriteria cvTermCriteria(const cv::TermCriteria& t) { return cvTermCriteria(t.type, t.maxCount, t.epsilon); }
+#endif
+
+
+/******************************* CvPoint and variants ***********************************/
+
+typedef struct CvPoint
+{
+    int x;
+    int y;
+
+#ifdef CV__VALIDATE_UNUNITIALIZED_VARS
+    CvPoint() __attribute__(( warning("Non-initialized variable") )) {}
+    template<typename _Tp> CvPoint(const std::initializer_list<_Tp> list)
+    {
+        CV_Assert(list.size() == 0 || list.size() == 2);
+        x = y = 0;
+        if (list.size() == 2)
+        {
+            x = list.begin()[0]; y = list.begin()[1];
+        }
+    };
+#elif defined(CV__ENABLE_C_API_CTORS) && defined(__cplusplus)
+    CvPoint(int _x = 0, int _y = 0): x(_x), y(_y) {}
+    template<typename _Tp>
+    CvPoint(const cv::Point_<_Tp>& pt): x((int)pt.x), y((int)pt.y) {}
+#endif
+#ifdef __cplusplus
+    template<typename _Tp>
+    operator cv::Point_<_Tp>() const { return cv::Point_<_Tp>(cv::saturate_cast<_Tp>(x), cv::saturate_cast<_Tp>(y)); }
+#endif
+}
+CvPoint;
+
+/** constructs CvPoint structure. */
+CV_INLINE  CvPoint  cvPoint( int x, int y )
+{
+#if !(defined(CV__ENABLE_C_API_CTORS) && defined(__cplusplus))
+    CvPoint p = {x, y};
+#else
+    CvPoint p(x, y);
+#endif
+    return p;
+}
+#ifdef __cplusplus
+CV_INLINE CvPoint cvPoint(const cv::Point& pt) { return cvPoint(pt.x, pt.y); }
+#endif
+
+typedef struct CvPoint2D32f
+{
+    float x;
+    float y;
+
+#ifdef CV__VALIDATE_UNUNITIALIZED_VARS
+    CvPoint2D32f() __attribute__(( warning("Non-initialized variable") )) {}
+    template<typename _Tp> CvPoint2D32f(const std::initializer_list<_Tp> list)
+    {
+        CV_Assert(list.size() == 0 || list.size() == 2);
+        x = y = 0;
+        if (list.size() == 2)
+        {
+            x = list.begin()[0]; y = list.begin()[1];
+        }
+    };
+#elif defined(CV__ENABLE_C_API_CTORS) && defined(__cplusplus)
+    CvPoint2D32f(float _x = 0, float _y = 0): x(_x), y(_y) {}
+    template<typename _Tp>
+    CvPoint2D32f(const cv::Point_<_Tp>& pt): x((float)pt.x), y((float)pt.y) {}
+#endif
+#ifdef __cplusplus
+    template<typename _Tp>
+    operator cv::Point_<_Tp>() const { return cv::Point_<_Tp>(cv::saturate_cast<_Tp>(x), cv::saturate_cast<_Tp>(y)); }
+#endif
+}
+CvPoint2D32f;
+
+/** constructs CvPoint2D32f structure. */
+CV_INLINE  CvPoint2D32f  cvPoint2D32f( double x, double y )
+{
+#if !(defined(CV__ENABLE_C_API_CTORS) && defined(__cplusplus))
+    CvPoint2D32f p = { (float)x, (float)y };
+#else
+    CvPoint2D32f p((float)x, (float)y);
+#endif
+    return p;
+}
+
+#ifdef __cplusplus
+template<typename _Tp>
+CvPoint2D32f cvPoint2D32f(const cv::Point_<_Tp>& pt)
+{
+#if !(defined(CV__ENABLE_C_API_CTORS) && defined(__cplusplus))
+    CvPoint2D32f p = { (float)pt.x, (float)pt.y };
+#else
+    CvPoint2D32f p((float)pt.x, (float)pt.y);
+#endif
+    return p;
+}
+#endif
+
+/** converts CvPoint to CvPoint2D32f. */
+CV_INLINE  CvPoint2D32f  cvPointTo32f( CvPoint point )
+{
+    return cvPoint2D32f( (float)point.x, (float)point.y );
+}
+
+/** converts CvPoint2D32f to CvPoint. */
+CV_INLINE  CvPoint  cvPointFrom32f( CvPoint2D32f point )
+{
+#if !(defined(CV__ENABLE_C_API_CTORS) && defined(__cplusplus))
+    CvPoint ipt = { cvRound(point.x), cvRound(point.y) };
+#else
+    CvPoint ipt(cvRound(point.x), cvRound(point.y));
+#endif
+    return ipt;
+}
+
+
+typedef struct CvPoint3D32f
+{
+    float x;
+    float y;
+    float z;
+
+#ifdef CV__VALIDATE_UNUNITIALIZED_VARS
+    CvPoint3D32f() __attribute__(( warning("Non-initialized variable") )) {}
+    template<typename _Tp> CvPoint3D32f(const std::initializer_list<_Tp> list)
+    {
+        CV_Assert(list.size() == 0 || list.size() == 3);
+        x = y = z = 0;
+        if (list.size() == 3)
+        {
+            x = list.begin()[0]; y = list.begin()[1]; z = list.begin()[2];
+        }
+    };
+#elif defined(CV__ENABLE_C_API_CTORS) && defined(__cplusplus)
+    CvPoint3D32f(float _x = 0, float _y = 0, float _z = 0): x(_x), y(_y), z(_z) {}
+    template<typename _Tp>
+    CvPoint3D32f(const cv::Point3_<_Tp>& pt): x((float)pt.x), y((float)pt.y), z((float)pt.z) {}
+#endif
+#ifdef __cplusplus
+    template<typename _Tp>
+    operator cv::Point3_<_Tp>() const { return cv::Point3_<_Tp>(cv::saturate_cast<_Tp>(x), cv::saturate_cast<_Tp>(y), cv::saturate_cast<_Tp>(z)); }
+#endif
+}
+CvPoint3D32f;
+
+/** constructs CvPoint3D32f structure. */
+CV_INLINE  CvPoint3D32f  cvPoint3D32f( double x, double y, double z )
+{
+#if !(defined(CV__ENABLE_C_API_CTORS) && defined(__cplusplus))
+    CvPoint3D32f p = { (float)x, (float)y, (float)z };
+#else
+    CvPoint3D32f p((float)x, (float)y, (float)z);
+#endif
+    return p;
+}
+
+#ifdef __cplusplus
+template<typename _Tp>
+CvPoint3D32f cvPoint3D32f(const cv::Point3_<_Tp>& pt)
+{
+#if !(defined(CV__ENABLE_C_API_CTORS) && defined(__cplusplus))
+    CvPoint3D32f p  = { (float)pt.x, (float)pt.y, (float)pt.z };
+#else
+    CvPoint3D32f p((float)pt.x, (float)pt.y, (float)pt.z);
+#endif
+    return p;
+}
+#endif
+
+
+typedef struct CvPoint2D64f
+{
+    double x;
+    double y;
+#ifdef CV__VALIDATE_UNUNITIALIZED_VARS
+    CvPoint2D64f() __attribute__(( warning("Non-initialized variable") )) {}
+    template<typename _Tp> CvPoint2D64f(const std::initializer_list<_Tp> list)
+    {
+        CV_Assert(list.size() == 0 || list.size() == 2);
+        x = y = 0;
+        if (list.size() == 2)
+        {
+            x = list.begin()[0]; y = list.begin()[1];
+        }
+    };
+#endif
+}
+CvPoint2D64f;
+
+/** constructs CvPoint2D64f structure.*/
+CV_INLINE  CvPoint2D64f  cvPoint2D64f( double x, double y )
+{
+    CvPoint2D64f p = { x, y };
+    return p;
+}
+
+
+typedef struct CvPoint3D64f
+{
+    double x;
+    double y;
+    double z;
+#ifdef CV__VALIDATE_UNUNITIALIZED_VARS
+    CvPoint3D64f() __attribute__(( warning("Non-initialized variable") )) {}
+    template<typename _Tp> CvPoint3D64f(const std::initializer_list<_Tp> list)
+    {
+        CV_Assert(list.size() == 0 || list.size() == 3);
+        x = y = z = 0;
+        if (list.size() == 3)
+        {
+            x = list.begin()[0]; y = list.begin()[1]; z = list.begin()[2];
+        }
+    };
+#endif
+}
+CvPoint3D64f;
+
+/** constructs CvPoint3D64f structure. */
+CV_INLINE  CvPoint3D64f  cvPoint3D64f( double x, double y, double z )
+{
+    CvPoint3D64f p = { x, y, z };
+    return p;
+}
+
+
+/******************************** CvSize's & CvBox **************************************/
+
+typedef struct CvSize
+{
+    int width;
+    int height;
+
+#ifdef CV__VALIDATE_UNUNITIALIZED_VARS
+    CvSize() __attribute__(( warning("Non-initialized variable") )) {}
+    template<typename _Tp> CvSize(const std::initializer_list<_Tp> list)
+    {
+        CV_Assert(list.size() == 0 || list.size() == 2);
+        width = 0; height = 0;
+        if (list.size() == 2)
+        {
+            width = list.begin()[0]; height = list.begin()[1];
+        }
+    };
+#elif defined(CV__ENABLE_C_API_CTORS) && defined(__cplusplus)
+    CvSize(int w = 0, int h = 0): width(w), height(h) {}
+    template<typename _Tp>
+    CvSize(const cv::Size_<_Tp>& sz): width(cv::saturate_cast<int>(sz.width)), height(cv::saturate_cast<int>(sz.height)) {}
+#endif
+#ifdef __cplusplus
+    template<typename _Tp>
+    operator cv::Size_<_Tp>() const { return cv::Size_<_Tp>(cv::saturate_cast<_Tp>(width), cv::saturate_cast<_Tp>(height)); }
+#endif
+}
+CvSize;
+
+/** constructs CvSize structure. */
+CV_INLINE  CvSize  cvSize( int width, int height )
+{
+#if !(defined(CV__ENABLE_C_API_CTORS) && defined(__cplusplus))
+    CvSize s = { width, height };
+#else
+    CvSize s(width, height);
+#endif
+    return s;
+}
+
+#ifdef __cplusplus
+CV_INLINE CvSize cvSize(const cv::Size& sz)
+{
+#if !(defined(CV__ENABLE_C_API_CTORS) && defined(__cplusplus))
+    CvSize s = { sz.width, sz.height };
+#else
+    CvSize s(sz.width, sz.height);
+#endif
+    return s;
+}
+#endif
+
+typedef struct CvSize2D32f
+{
+    float width;
+    float height;
+
+#ifdef CV__VALIDATE_UNUNITIALIZED_VARS
+    CvSize2D32f() __attribute__(( warning("Non-initialized variable") )) {}
+    template<typename _Tp> CvSize2D32f(const std::initializer_list<_Tp> list)
+    {
+        CV_Assert(list.size() == 0 || list.size() == 2);
+        width = 0; height = 0;
+        if (list.size() == 2)
+        {
+            width = list.begin()[0]; height = list.begin()[1];
+        }
+    };
+#elif defined(CV__ENABLE_C_API_CTORS) && defined(__cplusplus)
+    CvSize2D32f(float w = 0, float h = 0): width(w), height(h) {}
+    template<typename _Tp>
+    CvSize2D32f(const cv::Size_<_Tp>& sz): width(cv::saturate_cast<float>(sz.width)), height(cv::saturate_cast<float>(sz.height)) {}
+#endif
+#ifdef __cplusplus
+    template<typename _Tp>
+    operator cv::Size_<_Tp>() const { return cv::Size_<_Tp>(cv::saturate_cast<_Tp>(width), cv::saturate_cast<_Tp>(height)); }
+#endif
+}
+CvSize2D32f;
+
+/** constructs CvSize2D32f structure. */
+CV_INLINE  CvSize2D32f  cvSize2D32f( double width, double height )
+{
+#if !(defined(CV__ENABLE_C_API_CTORS) && defined(__cplusplus))
+    CvSize2D32f s = { (float)width, (float)height };
+#else
+    CvSize2D32f s((float)width, (float)height);
+#endif
+    return s;
+}
+#ifdef __cplusplus
+template<typename _Tp>
+CvSize2D32f cvSize2D32f(const cv::Size_<_Tp>& sz)
+{
+#if !(defined(CV__ENABLE_C_API_CTORS) && defined(__cplusplus))
+    CvSize2D32f s = { (float)sz.width, (float)sz.height };
+#else
+    CvSize2D32f s((float)sz.width, (float)sz.height);
+#endif
+    return s;
+}
+#endif
+
+/** @sa RotatedRect
+ */
+typedef struct CvBox2D
+{
+    CvPoint2D32f center;  /**< Center of the box.                          */
+    CvSize2D32f  size;    /**< Box width and length.                       */
+    float angle;          /**< Angle between the horizontal axis           */
+                          /**< and the first side (i.e. length) in degrees */
+
+#if defined(CV__ENABLE_C_API_CTORS) && defined(__cplusplus)
+    CvBox2D(CvPoint2D32f c = CvPoint2D32f(), CvSize2D32f s = CvSize2D32f(), float a = 0) : center(c), size(s), angle(a) {}
+    CvBox2D(const cv::RotatedRect& rr) : center(rr.center), size(rr.size), angle(rr.angle) {}
+#endif
+#ifdef __cplusplus
+    operator cv::RotatedRect() const { return cv::RotatedRect(center, size, angle); }
+#endif
+}
+CvBox2D;
+
+
+#ifdef __cplusplus
+CV_INLINE CvBox2D cvBox2D(CvPoint2D32f c = CvPoint2D32f(), CvSize2D32f s = CvSize2D32f(), float a = 0)
+{
+    CvBox2D self;
+    self.center = c;
+    self.size = s;
+    self.angle = a;
+    return self;
+}
+CV_INLINE CvBox2D cvBox2D(const cv::RotatedRect& rr)
+{
+    CvBox2D self;
+    self.center = cvPoint2D32f(rr.center);
+    self.size = cvSize2D32f(rr.size);
+    self.angle = rr.angle;
+    return self;
+}
+#endif
+
+
+/** Line iterator state: */
+typedef struct CvLineIterator
+{
+    /** Pointer to the current point: */
+    uchar* ptr;
+
+    /* Bresenham algorithm state: */
+    int  err;
+    int  plus_delta;
+    int  minus_delta;
+    int  plus_step;
+    int  minus_step;
+}
+CvLineIterator;
+
+
+
+/************************************* CvSlice ******************************************/
+#define CV_WHOLE_SEQ_END_INDEX 0x3fffffff
+#define CV_WHOLE_SEQ  cvSlice(0, CV_WHOLE_SEQ_END_INDEX)
+
+typedef struct CvSlice
+{
+    int  start_index, end_index;
+
+#ifdef CV__VALIDATE_UNUNITIALIZED_VARS
+    CvSlice() __attribute__(( warning("Non-initialized variable") )) {}
+    template<typename _Tp> CvSlice(const std::initializer_list<_Tp> list)
+    {
+        CV_Assert(list.size() == 0 || list.size() == 2);
+        start_index = end_index = 0;
+        if (list.size() == 2)
+        {
+            start_index = list.begin()[0]; end_index = list.begin()[1];
+        }
+    };
+#endif
+#if defined(CV__ENABLE_C_API_CTORS) && defined(__cplusplus) && !defined(__CUDACC__)
+    CvSlice(int start = 0, int end = 0) : start_index(start), end_index(end) {}
+    CvSlice(const cv::Range& r) { *this = (r.start != INT_MIN && r.end != INT_MAX) ? CvSlice(r.start, r.end) : CvSlice(0, CV_WHOLE_SEQ_END_INDEX); }
+    operator cv::Range() const { return (start_index == 0 && end_index == CV_WHOLE_SEQ_END_INDEX ) ? cv::Range::all() : cv::Range(start_index, end_index); }
+#endif
+}
+CvSlice;
+
+CV_INLINE  CvSlice  cvSlice( int start, int end )
+{
+#if !(defined(CV__ENABLE_C_API_CTORS) && defined(__cplusplus) && !defined(__CUDACC__))
+    CvSlice slice = { start, end };
+#else
+    CvSlice slice(start, end);
+#endif
+    return slice;
+}
+
+#if defined(__cplusplus)
+CV_INLINE  CvSlice  cvSlice(const cv::Range& r)
+{
+    CvSlice slice = (r.start != INT_MIN && r.end != INT_MAX) ? cvSlice(r.start, r.end) : cvSlice(0, CV_WHOLE_SEQ_END_INDEX);
+    return slice;
+}
+#endif
+
+
+/************************************* CvScalar *****************************************/
+/** @sa Scalar_
+ */
+typedef struct CvScalar
+{
+    double val[4];
+
+#ifdef CV__VALIDATE_UNUNITIALIZED_VARS
+    CvScalar() __attribute__(( warning("Non-initialized variable") )) {}
+    CvScalar(const std::initializer_list<double> list)
+    {
+        CV_Assert(list.size() == 0 || list.size() == 4);
+        val[0] = val[1] = val[2] = val[3] = 0;
+        if (list.size() == 4)
+        {
+            val[0] = list.begin()[0]; val[1] = list.begin()[1]; val[2] = list.begin()[2]; val[3] = list.begin()[3];
+        }
+    };
+#elif defined(CV__ENABLE_C_API_CTORS) && defined(__cplusplus)
+    CvScalar() {}
+    CvScalar(double d0, double d1 = 0, double d2 = 0, double d3 = 0) { val[0] = d0; val[1] = d1; val[2] = d2; val[3] = d3; }
+    template<typename _Tp>
+    CvScalar(const cv::Scalar_<_Tp>& s) { val[0] = s.val[0]; val[1] = s.val[1]; val[2] = s.val[2]; val[3] = s.val[3]; }
+    template<typename _Tp, int cn>
+    CvScalar(const cv::Vec<_Tp, cn>& v)
+    {
+        int i;
+        for( i = 0; i < (cn < 4 ? cn : 4); i++ ) val[i] = v.val[i];
+        for( ; i < 4; i++ ) val[i] = 0;
+    }
+#endif
+#ifdef __cplusplus
+    template<typename _Tp>
+    operator cv::Scalar_<_Tp>() const { return cv::Scalar_<_Tp>(cv::saturate_cast<_Tp>(val[0]), cv::saturate_cast<_Tp>(val[1]), cv::saturate_cast<_Tp>(val[2]), cv::saturate_cast<_Tp>(val[3])); }
+#endif
+}
+CvScalar;
+
+CV_INLINE  CvScalar  cvScalar( double val0, double val1 CV_DEFAULT(0),
+                               double val2 CV_DEFAULT(0), double val3 CV_DEFAULT(0))
+{
+#if !(defined(CV__ENABLE_C_API_CTORS) && defined(__cplusplus))
+    CvScalar scalar = CV_STRUCT_INITIALIZER;
+#else
+    CvScalar scalar;
+#endif
+    scalar.val[0] = val0; scalar.val[1] = val1;
+    scalar.val[2] = val2; scalar.val[3] = val3;
+    return scalar;
+}
+
+#ifdef __cplusplus
+CV_INLINE CvScalar cvScalar()
+{
+#if !(defined(CV__ENABLE_C_API_CTORS) && defined(__cplusplus))
+    CvScalar scalar = CV_STRUCT_INITIALIZER;
+#else
+    CvScalar scalar;
+#endif
+    scalar.val[0] = scalar.val[1] = scalar.val[2] = scalar.val[3] = 0;
+    return scalar;
+}
+CV_INLINE CvScalar cvScalar(const cv::Scalar& s)
+{
+#if !(defined(CV__ENABLE_C_API_CTORS) && defined(__cplusplus))
+    CvScalar scalar = CV_STRUCT_INITIALIZER;
+#else
+    CvScalar scalar;
+#endif
+    scalar.val[0] = s.val[0];
+    scalar.val[1] = s.val[1];
+    scalar.val[2] = s.val[2];
+    scalar.val[3] = s.val[3];
+    return scalar;
+}
+#endif
+
+CV_INLINE  CvScalar  cvRealScalar( double val0 )
+{
+#if !(defined(CV__ENABLE_C_API_CTORS) && defined(__cplusplus))
+    CvScalar scalar = CV_STRUCT_INITIALIZER;
+#else
+    CvScalar scalar;
+#endif
+    scalar.val[0] = val0;
+    scalar.val[1] = scalar.val[2] = scalar.val[3] = 0;
+    return scalar;
+}
+
+CV_INLINE  CvScalar  cvScalarAll( double val0123 )
+{
+#if !(defined(CV__ENABLE_C_API_CTORS) && defined(__cplusplus))
+    CvScalar scalar = CV_STRUCT_INITIALIZER;
+#else
+    CvScalar scalar;
+#endif
+    scalar.val[0] = val0123;
+    scalar.val[1] = val0123;
+    scalar.val[2] = val0123;
+    scalar.val[3] = val0123;
+    return scalar;
+}
+
+/****************************************************************************************\
+*                                   Dynamic Data structures                              *
+\****************************************************************************************/
+
+/******************************** Memory storage ****************************************/
+
+typedef struct CvMemBlock
+{
+    struct CvMemBlock*  prev;
+    struct CvMemBlock*  next;
+}
+CvMemBlock;
+
+#define CV_STORAGE_MAGIC_VAL    0x42890000
+
+typedef struct CvMemStorage
+{
+    int signature;
+    CvMemBlock* bottom;           /**< First allocated block.                   */
+    CvMemBlock* top;              /**< Current memory block - top of the stack. */
+    struct  CvMemStorage* parent; /**< We get new blocks from parent as needed. */
+    int block_size;               /**< Block size.                              */
+    int free_space;               /**< Remaining free space in current block.   */
+}
+CvMemStorage;
+
+#define CV_IS_STORAGE(storage)  \
+    ((storage) != NULL &&       \
+    (((CvMemStorage*)(storage))->signature & CV_MAGIC_MASK) == CV_STORAGE_MAGIC_VAL)
+
+
+typedef struct CvMemStoragePos
+{
+    CvMemBlock* top;
+    int free_space;
+}
+CvMemStoragePos;
+
+
+/*********************************** Sequence *******************************************/
+
+typedef struct CvSeqBlock
+{
+    struct CvSeqBlock*  prev; /**< Previous sequence block.                   */
+    struct CvSeqBlock*  next; /**< Next sequence block.                       */
+    int    start_index;       /**< Index of the first element in the block +  */
+                              /**< sequence->first->start_index.              */
+    int    count;             /**< Number of elements in the block.           */
+    schar* data;              /**< Pointer to the first element of the block. */
+}
+CvSeqBlock;
+
+
+#define CV_TREE_NODE_FIELDS(node_type)                               \
+    int       flags;             /**< Miscellaneous flags.     */      \
+    int       header_size;       /**< Size of sequence header. */      \
+    struct    node_type* h_prev; /**< Previous sequence.       */      \
+    struct    node_type* h_next; /**< Next sequence.           */      \
+    struct    node_type* v_prev; /**< 2nd previous sequence.   */      \
+    struct    node_type* v_next  /**< 2nd next sequence.       */
+
+/**
+   Read/Write sequence.
+   Elements can be dynamically inserted to or deleted from the sequence.
+*/
+#define CV_SEQUENCE_FIELDS()                                              \
+    CV_TREE_NODE_FIELDS(CvSeq);                                           \
+    int       total;          /**< Total number of elements.            */  \
+    int       elem_size;      /**< Size of sequence element in bytes.   */  \
+    schar*    block_max;      /**< Maximal bound of the last block.     */  \
+    schar*    ptr;            /**< Current write pointer.               */  \
+    int       delta_elems;    /**< Grow seq this many at a time.        */  \
+    CvMemStorage* storage;    /**< Where the seq is stored.             */  \
+    CvSeqBlock* free_blocks;  /**< Free blocks list.                    */  \
+    CvSeqBlock* first;        /**< Pointer to the first sequence block. */
+
+typedef struct CvSeq
+{
+    CV_SEQUENCE_FIELDS()
+}
+CvSeq;
+
+#define CV_TYPE_NAME_SEQ             "opencv-sequence"
+#define CV_TYPE_NAME_SEQ_TREE        "opencv-sequence-tree"
+
+/*************************************** Set ********************************************/
+/** @brief Set
+  Order is not preserved. There can be gaps between sequence elements.
+  After the element has been inserted it stays in the same place all the time.
+  The MSB(most-significant or sign bit) of the first field (flags) is 0 iff the element exists.
+*/
+#define CV_SET_ELEM_FIELDS(elem_type)   \
+    int  flags;                         \
+    struct elem_type* next_free;
+
+typedef struct CvSetElem
+{
+    CV_SET_ELEM_FIELDS(CvSetElem)
+}
+CvSetElem;
+
+#define CV_SET_FIELDS()      \
+    CV_SEQUENCE_FIELDS()     \
+    CvSetElem* free_elems;   \
+    int active_count;
+
+typedef struct CvSet
+{
+    CV_SET_FIELDS()
+}
+CvSet;
+
+
+#define CV_SET_ELEM_IDX_MASK   ((1 << 26) - 1)
+#define CV_SET_ELEM_FREE_FLAG  (1 << (sizeof(int)*8-1))
+
+/** Checks whether the element pointed by ptr belongs to a set or not */
+#define CV_IS_SET_ELEM( ptr )  (((CvSetElem*)(ptr))->flags >= 0)
+
+/************************************* Graph ********************************************/
+
+/** @name Graph
+
+We represent a graph as a set of vertices. Vertices contain their adjacency lists (more exactly,
+pointers to first incoming or outcoming edge (or 0 if isolated vertex)). Edges are stored in
+another set. There is a singly-linked list of incoming/outcoming edges for each vertex.
+
+Each edge consists of:
+
+- Two pointers to the starting and ending vertices (vtx[0] and vtx[1] respectively).
+
+    A graph may be oriented or not. In the latter case, edges between vertex i to vertex j are not
+distinguished during search operations.
+
+- Two pointers to next edges for the starting and ending vertices, where next[0] points to the
+next edge in the vtx[0] adjacency list and next[1] points to the next edge in the vtx[1]
+adjacency list.
+
+@see CvGraphEdge, CvGraphVtx, CvGraphVtx2D, CvGraph
+@{
+*/
+#define CV_GRAPH_EDGE_FIELDS()      \
+    int flags;                      \
+    float weight;                   \
+    struct CvGraphEdge* next[2];    \
+    struct CvGraphVtx* vtx[2];
+
+
+#define CV_GRAPH_VERTEX_FIELDS()    \
+    int flags;                      \
+    struct CvGraphEdge* first;
+
+
+typedef struct CvGraphEdge
+{
+    CV_GRAPH_EDGE_FIELDS()
+}
+CvGraphEdge;
+
+typedef struct CvGraphVtx
+{
+    CV_GRAPH_VERTEX_FIELDS()
+}
+CvGraphVtx;
+
+typedef struct CvGraphVtx2D
+{
+    CV_GRAPH_VERTEX_FIELDS()
+    CvPoint2D32f* ptr;
+}
+CvGraphVtx2D;
+
+/**
+   Graph is "derived" from the set (this is set a of vertices)
+   and includes another set (edges)
+*/
+#define  CV_GRAPH_FIELDS()   \
+    CV_SET_FIELDS()          \
+    CvSet* edges;
+
+typedef struct CvGraph
+{
+    CV_GRAPH_FIELDS()
+}
+CvGraph;
+
+#define CV_TYPE_NAME_GRAPH "opencv-graph"
+
+/** @} */
+
+/*********************************** Chain/Contour *************************************/
+
+typedef struct CvChain
+{
+    CV_SEQUENCE_FIELDS()
+    CvPoint  origin;
+}
+CvChain;
+
+#define CV_CONTOUR_FIELDS()  \
+    CV_SEQUENCE_FIELDS()     \
+    CvRect rect;             \
+    int color;               \
+    int reserved[3];
+
+typedef struct CvContour
+{
+    CV_CONTOUR_FIELDS()
+}
+CvContour;
+
+typedef CvContour CvPoint2DSeq;
+
+/****************************************************************************************\
+*                                    Sequence types                                      *
+\****************************************************************************************/
+
+#define CV_SEQ_MAGIC_VAL             0x42990000
+
+#define CV_IS_SEQ(seq) \
+    ((seq) != NULL && (((CvSeq*)(seq))->flags & CV_MAGIC_MASK) == CV_SEQ_MAGIC_VAL)
+
+#define CV_SET_MAGIC_VAL             0x42980000
+#define CV_IS_SET(set) \
+    ((set) != NULL && (((CvSeq*)(set))->flags & CV_MAGIC_MASK) == CV_SET_MAGIC_VAL)
+
+#define CV_SEQ_ELTYPE_BITS           12
+#define CV_SEQ_ELTYPE_MASK           ((1 << CV_SEQ_ELTYPE_BITS) - 1)
+
+#define CV_SEQ_ELTYPE_POINT          CV_32SC2  /**< (x,y) */
+#define CV_SEQ_ELTYPE_CODE           CV_8UC1   /**< freeman code: 0..7 */
+#define CV_SEQ_ELTYPE_GENERIC        0
+#define CV_SEQ_ELTYPE_PTR            CV_MAKE_TYPE(CV_8U, 8 /*sizeof(void*)*/)
+#define CV_SEQ_ELTYPE_PPOINT         CV_SEQ_ELTYPE_PTR  /**< &(x,y) */
+#define CV_SEQ_ELTYPE_INDEX          CV_32SC1  /**< #(x,y) */
+#define CV_SEQ_ELTYPE_GRAPH_EDGE     0  /**< &next_o, &next_d, &vtx_o, &vtx_d */
+#define CV_SEQ_ELTYPE_GRAPH_VERTEX   0  /**< first_edge, &(x,y) */
+#define CV_SEQ_ELTYPE_TRIAN_ATR      0  /**< vertex of the binary tree   */
+#define CV_SEQ_ELTYPE_CONNECTED_COMP 0  /**< connected component  */
+#define CV_SEQ_ELTYPE_POINT3D        CV_32FC3  /**< (x,y,z)  */
+
+#define CV_SEQ_KIND_BITS        2
+#define CV_SEQ_KIND_MASK        (((1 << CV_SEQ_KIND_BITS) - 1)<<CV_SEQ_ELTYPE_BITS)
+
+/** types of sequences */
+#define CV_SEQ_KIND_GENERIC     (0 << CV_SEQ_ELTYPE_BITS)
+#define CV_SEQ_KIND_CURVE       (1 << CV_SEQ_ELTYPE_BITS)
+#define CV_SEQ_KIND_BIN_TREE    (2 << CV_SEQ_ELTYPE_BITS)
+
+/** types of sparse sequences (sets) */
+#define CV_SEQ_KIND_GRAPH       (1 << CV_SEQ_ELTYPE_BITS)
+#define CV_SEQ_KIND_SUBDIV2D    (2 << CV_SEQ_ELTYPE_BITS)
+
+#define CV_SEQ_FLAG_SHIFT       (CV_SEQ_KIND_BITS + CV_SEQ_ELTYPE_BITS)
+
+/** flags for curves */
+#define CV_SEQ_FLAG_CLOSED     (1 << CV_SEQ_FLAG_SHIFT)
+#define CV_SEQ_FLAG_SIMPLE     (0 << CV_SEQ_FLAG_SHIFT)
+#define CV_SEQ_FLAG_CONVEX     (0 << CV_SEQ_FLAG_SHIFT)
+#define CV_SEQ_FLAG_HOLE       (2 << CV_SEQ_FLAG_SHIFT)
+
+/** flags for graphs */
+#define CV_GRAPH_FLAG_ORIENTED (1 << CV_SEQ_FLAG_SHIFT)
+
+#define CV_GRAPH               CV_SEQ_KIND_GRAPH
+#define CV_ORIENTED_GRAPH      (CV_SEQ_KIND_GRAPH|CV_GRAPH_FLAG_ORIENTED)
+
+/** point sets */
+#define CV_SEQ_POINT_SET       (CV_SEQ_KIND_GENERIC| CV_SEQ_ELTYPE_POINT)
+#define CV_SEQ_POINT3D_SET     (CV_SEQ_KIND_GENERIC| CV_SEQ_ELTYPE_POINT3D)
+#define CV_SEQ_POLYLINE        (CV_SEQ_KIND_CURVE  | CV_SEQ_ELTYPE_POINT)
+#define CV_SEQ_POLYGON         (CV_SEQ_FLAG_CLOSED | CV_SEQ_POLYLINE )
+#define CV_SEQ_CONTOUR         CV_SEQ_POLYGON
+#define CV_SEQ_SIMPLE_POLYGON  (CV_SEQ_FLAG_SIMPLE | CV_SEQ_POLYGON  )
+
+/** chain-coded curves */
+#define CV_SEQ_CHAIN           (CV_SEQ_KIND_CURVE  | CV_SEQ_ELTYPE_CODE)
+#define CV_SEQ_CHAIN_CONTOUR   (CV_SEQ_FLAG_CLOSED | CV_SEQ_CHAIN)
+
+/** binary tree for the contour */
+#define CV_SEQ_POLYGON_TREE    (CV_SEQ_KIND_BIN_TREE  | CV_SEQ_ELTYPE_TRIAN_ATR)
+
+/** sequence of the connected components */
+#define CV_SEQ_CONNECTED_COMP  (CV_SEQ_KIND_GENERIC  | CV_SEQ_ELTYPE_CONNECTED_COMP)
+
+/** sequence of the integer numbers */
+#define CV_SEQ_INDEX           (CV_SEQ_KIND_GENERIC  | CV_SEQ_ELTYPE_INDEX)
+
+#define CV_SEQ_ELTYPE( seq )   ((seq)->flags & CV_SEQ_ELTYPE_MASK)
+#define CV_SEQ_KIND( seq )     ((seq)->flags & CV_SEQ_KIND_MASK )
+
+/** flag checking */
+#define CV_IS_SEQ_INDEX( seq )      ((CV_SEQ_ELTYPE(seq) == CV_SEQ_ELTYPE_INDEX) && \
+                                     (CV_SEQ_KIND(seq) == CV_SEQ_KIND_GENERIC))
+
+#define CV_IS_SEQ_CURVE( seq )      (CV_SEQ_KIND(seq) == CV_SEQ_KIND_CURVE)
+#define CV_IS_SEQ_CLOSED( seq )     (((seq)->flags & CV_SEQ_FLAG_CLOSED) != 0)
+#define CV_IS_SEQ_CONVEX( seq )     0
+#define CV_IS_SEQ_HOLE( seq )       (((seq)->flags & CV_SEQ_FLAG_HOLE) != 0)
+#define CV_IS_SEQ_SIMPLE( seq )     1
+
+/** type checking macros */
+#define CV_IS_SEQ_POINT_SET( seq ) \
+    ((CV_SEQ_ELTYPE(seq) == CV_32SC2 || CV_SEQ_ELTYPE(seq) == CV_32FC2))
+
+#define CV_IS_SEQ_POINT_SUBSET( seq ) \
+    (CV_IS_SEQ_INDEX( seq ) || CV_SEQ_ELTYPE(seq) == CV_SEQ_ELTYPE_PPOINT)
+
+#define CV_IS_SEQ_POLYLINE( seq )   \
+    (CV_SEQ_KIND(seq) == CV_SEQ_KIND_CURVE && CV_IS_SEQ_POINT_SET(seq))
+
+#define CV_IS_SEQ_POLYGON( seq )   \
+    (CV_IS_SEQ_POLYLINE(seq) && CV_IS_SEQ_CLOSED(seq))
+
+#define CV_IS_SEQ_CHAIN( seq )   \
+    (CV_SEQ_KIND(seq) == CV_SEQ_KIND_CURVE && (seq)->elem_size == 1)
+
+#define CV_IS_SEQ_CONTOUR( seq )   \
+    (CV_IS_SEQ_CLOSED(seq) && (CV_IS_SEQ_POLYLINE(seq) || CV_IS_SEQ_CHAIN(seq)))
+
+#define CV_IS_SEQ_CHAIN_CONTOUR( seq ) \
+    (CV_IS_SEQ_CHAIN( seq ) && CV_IS_SEQ_CLOSED( seq ))
+
+#define CV_IS_SEQ_POLYGON_TREE( seq ) \
+    (CV_SEQ_ELTYPE (seq) ==  CV_SEQ_ELTYPE_TRIAN_ATR &&    \
+    CV_SEQ_KIND( seq ) ==  CV_SEQ_KIND_BIN_TREE )
+
+#define CV_IS_GRAPH( seq )    \
+    (CV_IS_SET(seq) && CV_SEQ_KIND((CvSet*)(seq)) == CV_SEQ_KIND_GRAPH)
+
+#define CV_IS_GRAPH_ORIENTED( seq )   \
+    (((seq)->flags & CV_GRAPH_FLAG_ORIENTED) != 0)
+
+#define CV_IS_SUBDIV2D( seq )  \
+    (CV_IS_SET(seq) && CV_SEQ_KIND((CvSet*)(seq)) == CV_SEQ_KIND_SUBDIV2D)
+
+/****************************************************************************************/
+/*                            Sequence writer & reader                                  */
+/****************************************************************************************/
+
+#define CV_SEQ_WRITER_FIELDS()                                     \
+    int          header_size;                                      \
+    CvSeq*       seq;        /**< the sequence written */            \
+    CvSeqBlock*  block;      /**< current block */                   \
+    schar*       ptr;        /**< pointer to free space */           \
+    schar*       block_min;  /**< pointer to the beginning of block*/\
+    schar*       block_max;  /**< pointer to the end of block */
+
+typedef struct CvSeqWriter
+{
+    CV_SEQ_WRITER_FIELDS()
+}
+CvSeqWriter;
+
+
+#define CV_SEQ_READER_FIELDS()                                      \
+    int          header_size;                                       \
+    CvSeq*       seq;        /**< sequence, beign read */             \
+    CvSeqBlock*  block;      /**< current block */                    \
+    schar*       ptr;        /**< pointer to element be read next */  \
+    schar*       block_min;  /**< pointer to the beginning of block */\
+    schar*       block_max;  /**< pointer to the end of block */      \
+    int          delta_index;/**< = seq->first->start_index   */      \
+    schar*       prev_elem;  /**< pointer to previous element */
+
+typedef struct CvSeqReader
+{
+    CV_SEQ_READER_FIELDS()
+}
+CvSeqReader;
+
+/****************************************************************************************/
+/*                                Operations on sequences                               */
+/****************************************************************************************/
+
+#define  CV_SEQ_ELEM( seq, elem_type, index )                    \
+/** assert gives some guarantee that <seq> parameter is valid */  \
+(   assert(sizeof((seq)->first[0]) == sizeof(CvSeqBlock) &&      \
+    (seq)->elem_size == sizeof(elem_type)),                      \
+    (elem_type*)((seq)->first && (unsigned)index <               \
+    (unsigned)((seq)->first->count) ?                            \
+    (seq)->first->data + (index) * sizeof(elem_type) :           \
+    cvGetSeqElem( (CvSeq*)(seq), (index) )))
+#define CV_GET_SEQ_ELEM( elem_type, seq, index ) CV_SEQ_ELEM( (seq), elem_type, (index) )
+
+/** Add element to sequence: */
+#define CV_WRITE_SEQ_ELEM_VAR( elem_ptr, writer )     \
+{                                                     \
+    if( (writer).ptr >= (writer).block_max )          \
+    {                                                 \
+        cvCreateSeqBlock( &writer);                   \
+    }                                                 \
+    memcpy((writer).ptr, elem_ptr, (writer).seq->elem_size);\
+    (writer).ptr += (writer).seq->elem_size;          \
+}
+
+#define CV_WRITE_SEQ_ELEM( elem, writer )             \
+{                                                     \
+    assert( (writer).seq->elem_size == sizeof(elem)); \
+    if( (writer).ptr >= (writer).block_max )          \
+    {                                                 \
+        cvCreateSeqBlock( &writer);                   \
+    }                                                 \
+    assert( (writer).ptr <= (writer).block_max - sizeof(elem));\
+    memcpy((writer).ptr, &(elem), sizeof(elem));      \
+    (writer).ptr += sizeof(elem);                     \
+}
+
+
+/** Move reader position forward: */
+#define CV_NEXT_SEQ_ELEM( elem_size, reader )                 \
+{                                                             \
+    if( ((reader).ptr += (elem_size)) >= (reader).block_max ) \
+    {                                                         \
+        cvChangeSeqBlock( &(reader), 1 );                     \
+    }                                                         \
+}
+
+
+/** Move reader position backward: */
+#define CV_PREV_SEQ_ELEM( elem_size, reader )                \
+{                                                            \
+    if( ((reader).ptr -= (elem_size)) < (reader).block_min ) \
+    {                                                        \
+        cvChangeSeqBlock( &(reader), -1 );                   \
+    }                                                        \
+}
+
+/** Read element and move read position forward: */
+#define CV_READ_SEQ_ELEM( elem, reader )                       \
+{                                                              \
+    assert( (reader).seq->elem_size == sizeof(elem));          \
+    memcpy( &(elem), (reader).ptr, sizeof((elem)));            \
+    CV_NEXT_SEQ_ELEM( sizeof(elem), reader )                   \
+}
+
+/** Read element and move read position backward: */
+#define CV_REV_READ_SEQ_ELEM( elem, reader )                     \
+{                                                                \
+    assert( (reader).seq->elem_size == sizeof(elem));            \
+    memcpy(&(elem), (reader).ptr, sizeof((elem)));               \
+    CV_PREV_SEQ_ELEM( sizeof(elem), reader )                     \
+}
+
+
+#define CV_READ_CHAIN_POINT( _pt, reader )                              \
+{                                                                       \
+    (_pt) = (reader).pt;                                                \
+    if( (reader).ptr )                                                  \
+    {                                                                   \
+        CV_READ_SEQ_ELEM( (reader).code, (reader));                     \
+        assert( ((reader).code & ~7) == 0 );                            \
+        (reader).pt.x += (reader).deltas[(int)(reader).code][0];        \
+        (reader).pt.y += (reader).deltas[(int)(reader).code][1];        \
+    }                                                                   \
+}
+
+#define CV_CURRENT_POINT( reader )  (*((CvPoint*)((reader).ptr)))
+#define CV_PREV_POINT( reader )     (*((CvPoint*)((reader).prev_elem)))
+
+#define CV_READ_EDGE( pt1, pt2, reader )               \
+{                                                      \
+    assert( sizeof(pt1) == sizeof(CvPoint) &&          \
+            sizeof(pt2) == sizeof(CvPoint) &&          \
+            reader.seq->elem_size == sizeof(CvPoint)); \
+    (pt1) = CV_PREV_POINT( reader );                   \
+    (pt2) = CV_CURRENT_POINT( reader );                \
+    (reader).prev_elem = (reader).ptr;                 \
+    CV_NEXT_SEQ_ELEM( sizeof(CvPoint), (reader));      \
+}
+
+/************ Graph macros ************/
+
+/** Return next graph edge for given vertex: */
+#define  CV_NEXT_GRAPH_EDGE( edge, vertex )                              \
+     (assert((edge)->vtx[0] == (vertex) || (edge)->vtx[1] == (vertex)),  \
+      (edge)->next[(edge)->vtx[1] == (vertex)])
+
+
+
+/****************************************************************************************\
+*             Data structures for persistence (a.k.a serialization) functionality        *
+\****************************************************************************************/
+
+#if 0
+
+/** "black box" file storage */
+typedef struct CvFileStorage CvFileStorage;
+
+/** Storage flags: */
+#define CV_STORAGE_READ          0
+#define CV_STORAGE_WRITE         1
+#define CV_STORAGE_WRITE_TEXT    CV_STORAGE_WRITE
+#define CV_STORAGE_WRITE_BINARY  CV_STORAGE_WRITE
+#define CV_STORAGE_APPEND        2
+#define CV_STORAGE_MEMORY        4
+#define CV_STORAGE_FORMAT_MASK   (7<<3)
+#define CV_STORAGE_FORMAT_AUTO   0
+#define CV_STORAGE_FORMAT_XML    8
+#define CV_STORAGE_FORMAT_YAML  16
+#define CV_STORAGE_FORMAT_JSON  24
+#define CV_STORAGE_BASE64       64
+#define CV_STORAGE_WRITE_BASE64  (CV_STORAGE_BASE64 | CV_STORAGE_WRITE)
+
+/** @brief List of attributes. :
+
+In the current implementation, attributes are used to pass extra parameters when writing user
+objects (see cvWrite). XML attributes inside tags are not supported, aside from the object type
+specification (type_id attribute).
+@see cvAttrList, cvAttrValue
+ */
+typedef struct CvAttrList
+{
+    const char** attr;         /**< NULL-terminated array of (attribute_name,attribute_value) pairs. */
+    struct CvAttrList* next;   /**< Pointer to next chunk of the attributes list.                    */
+}
+CvAttrList;
+
+/** initializes CvAttrList structure */
+CV_INLINE CvAttrList cvAttrList( const char** attr CV_DEFAULT(NULL),
+                                 CvAttrList* next CV_DEFAULT(NULL) )
+{
+    CvAttrList l;
+    l.attr = attr;
+    l.next = next;
+
+    return l;
+}
+
+struct CvTypeInfo;
+
+#define CV_NODE_NONE        0
+#define CV_NODE_INT         1
+#define CV_NODE_INTEGER     CV_NODE_INT
+#define CV_NODE_REAL        2
+#define CV_NODE_FLOAT       CV_NODE_REAL
+#define CV_NODE_STR         3
+#define CV_NODE_STRING      CV_NODE_STR
+#define CV_NODE_REF         4 /**< not used */
+#define CV_NODE_SEQ         5
+#define CV_NODE_MAP         6
+#define CV_NODE_TYPE_MASK   7
+
+#define CV_NODE_TYPE(flags)  ((flags) & CV_NODE_TYPE_MASK)
+
+/** file node flags */
+#define CV_NODE_FLOW        8 /**<Used only for writing structures in YAML format. */
+#define CV_NODE_USER        16
+#define CV_NODE_EMPTY       32
+#define CV_NODE_NAMED       64
+
+#define CV_NODE_IS_INT(flags)        (CV_NODE_TYPE(flags) == CV_NODE_INT)
+#define CV_NODE_IS_REAL(flags)       (CV_NODE_TYPE(flags) == CV_NODE_REAL)
+#define CV_NODE_IS_STRING(flags)     (CV_NODE_TYPE(flags) == CV_NODE_STRING)
+#define CV_NODE_IS_SEQ(flags)        (CV_NODE_TYPE(flags) == CV_NODE_SEQ)
+#define CV_NODE_IS_MAP(flags)        (CV_NODE_TYPE(flags) == CV_NODE_MAP)
+#define CV_NODE_IS_COLLECTION(flags) (CV_NODE_TYPE(flags) >= CV_NODE_SEQ)
+#define CV_NODE_IS_FLOW(flags)       (((flags) & CV_NODE_FLOW) != 0)
+#define CV_NODE_IS_EMPTY(flags)      (((flags) & CV_NODE_EMPTY) != 0)
+#define CV_NODE_IS_USER(flags)       (((flags) & CV_NODE_USER) != 0)
+#define CV_NODE_HAS_NAME(flags)      (((flags) & CV_NODE_NAMED) != 0)
+
+#define CV_NODE_SEQ_SIMPLE 256
+#define CV_NODE_SEQ_IS_SIMPLE(seq) (((seq)->flags & CV_NODE_SEQ_SIMPLE) != 0)
+
+typedef struct CvString
+{
+    int len;
+    char* ptr;
+}
+CvString;
+
+/** All the keys (names) of elements in the read file storage
+   are stored in the hash to speed up the lookup operations: */
+typedef struct CvStringHashNode
+{
+    unsigned hashval;
+    CvString str;
+    struct CvStringHashNode* next;
+}
+CvStringHashNode;
+
+typedef struct CvGenericHash CvFileNodeHash;
+
+/** Basic element of the file storage - scalar or collection: */
+typedef struct CvFileNode
+{
+    int tag;
+    struct CvTypeInfo* info; /**< type information
+            (only for user-defined object, for others it is 0) */
+    union
+    {
+        double f; /**< scalar floating-point number */
+        int i;    /**< scalar integer number */
+        CvString str; /**< text string */
+        CvSeq* seq; /**< sequence (ordered collection of file nodes) */
+        CvFileNodeHash* map; /**< map (collection of named file nodes) */
+    } data;
+}
+CvFileNode;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+typedef int (CV_CDECL *CvIsInstanceFunc)( const void* struct_ptr );
+typedef void (CV_CDECL *CvReleaseFunc)( void** struct_dblptr );
+typedef void* (CV_CDECL *CvReadFunc)( CvFileStorage* storage, CvFileNode* node );
+typedef void (CV_CDECL *CvWriteFunc)( CvFileStorage* storage, const char* name,
+                                      const void* struct_ptr, CvAttrList attributes );
+typedef void* (CV_CDECL *CvCloneFunc)( const void* struct_ptr );
+#ifdef __cplusplus
+}
+#endif
+
+/** @brief Type information
+
+The structure contains information about one of the standard or user-defined types. Instances of the
+type may or may not contain a pointer to the corresponding CvTypeInfo structure. In any case, there
+is a way to find the type info structure for a given object using the cvTypeOf function.
+Alternatively, type info can be found by type name using cvFindType, which is used when an object
+is read from file storage. The user can register a new type with cvRegisterType that adds the type
+information structure into the beginning of the type list. Thus, it is possible to create
+specialized types from generic standard types and override the basic methods.
+ */
+typedef struct CvTypeInfo
+{
+    int flags; /**< not used */
+    int header_size; /**< sizeof(CvTypeInfo) */
+    struct CvTypeInfo* prev; /**< previous registered type in the list */
+    struct CvTypeInfo* next; /**< next registered type in the list */
+    const char* type_name; /**< type name, written to file storage */
+    CvIsInstanceFunc is_instance; /**< checks if the passed object belongs to the type */
+    CvReleaseFunc release; /**< releases object (memory etc.) */
+    CvReadFunc read; /**< reads object from file storage */
+    CvWriteFunc write; /**< writes object to file storage */
+    CvCloneFunc clone; /**< creates a copy of the object */
+}
+CvTypeInfo;
+#endif
+
+/** @} */
+
+#endif /*OPENCV_CORE_TYPES_H*/
+
+/* End of file. */
diff --git a/3rdParty/opencv2/core/utility.hpp b/3rdParty/opencv-4.12.0/opencv2/core/utility.hpp
similarity index 89%
rename from 3rdParty/opencv2/core/utility.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/utility.hpp
index e7395cb30c..985d20dcb4 100644
--- a/3rdParty/opencv2/core/utility.hpp
+++ b/3rdParty/opencv-4.12.0/opencv2/core/utility.hpp
@@ -176,14 +176,45 @@ extern "C" typedef int (*ErrorCallback)( int status, const char* func_name,
 */
 CV_EXPORTS ErrorCallback redirectError( ErrorCallback errCallback, void* userdata=0, void** prevUserdata=0);
 
+/** @brief Generates a unique temporary file name.
+
+This function generates a full, unique file path for a temporary file,
+which can be used to create temporary files for various purposes.
+
+@param suffix (optional) The desired file extension or suffix for the temporary file (e.g., ".png", ".txt").
+If no suffix is provided (suffix = 0), the file will not have a specific extension.
+
+@return cv::String A full unique path for the temporary file.
+
+@note
+- The function does not create the file, it only generates the name.
+- The file name is unique for the system session.
+- Works cross-platform (Windows, Linux, macOS).
+ */
 CV_EXPORTS String tempfile( const char* suffix = 0);
+
+/** @brief Searches for files matching the specified pattern in a directory.
+
+This function searches for files that match a given pattern (e.g., `*.jpg`)
+in the specified directory. The search can be limited to the directory itself
+or be recursive, including subdirectories.
+
+@param pattern The file search pattern, which can include wildcards like `*`
+(for matching multiple characters) or `?` (for matching a single character).
+
+@param result  Output vector where the file paths matching the search
+pattern will be stored.
+@param recursive (optional) Boolean flag indicating whether to search
+subdirectories recursively. If true, the search will include all subdirectories.
+The default value is `false`.
+ */
 CV_EXPORTS void glob(String pattern, std::vector<String>& result, bool recursive = false);
 
-/** @brief OpenCV will try to set the number of threads for the next parallel region.
+/** @brief OpenCV will try to set the number of threads for subsequent parallel regions.
 
-If threads == 0, OpenCV will disable threading optimizations and run all it's functions
-sequentially. Passing threads \< 0 will reset threads number to system default. This function must
-be called outside of parallel region.
+If threads == 1, OpenCV will disable threading optimizations and run all it's functions
+sequentially. Passing threads \< 0 will reset threads number to system default.
+The function is not thread-safe. It must not be called in parallel region or concurrent threads.
 
 OpenCV will try to run its functions with specified threads number, but some behaviour differs from
 framework:
@@ -309,11 +340,12 @@ class CV_EXPORTS_W TickMeter
     //! stops counting ticks.
     CV_WRAP void stop()
     {
-        int64 time = cv::getTickCount();
+        const int64 time = cv::getTickCount();
         if (startTime == 0)
             return;
         ++counter;
-        sumTime += (time - startTime);
+        lastTime = time - startTime;
+        sumTime += lastTime;
         startTime = 0;
     }
 
@@ -336,11 +368,35 @@ class CV_EXPORTS_W TickMeter
     }
 
     //! returns passed time in seconds.
-    CV_WRAP double getTimeSec()   const
+    CV_WRAP double getTimeSec() const
     {
         return (double)getTimeTicks() / getTickFrequency();
     }
 
+    //! returns counted ticks of the last iteration.
+    CV_WRAP int64 getLastTimeTicks() const
+    {
+        return lastTime;
+    }
+
+    //! returns passed time of the last iteration in microseconds.
+    CV_WRAP double getLastTimeMicro() const
+    {
+        return getLastTimeMilli()*1e3;
+    }
+
+    //! returns passed time of the last iteration in milliseconds.
+    CV_WRAP double getLastTimeMilli() const
+    {
+        return getLastTimeSec()*1e3;
+    }
+
+    //! returns passed time of the last iteration in seconds.
+    CV_WRAP double getLastTimeSec() const
+    {
+        return (double)getLastTimeTicks() / getTickFrequency();
+    }
+
     //! returns internal counter value.
     CV_WRAP int64 getCounter() const
     {
@@ -373,15 +429,17 @@ class CV_EXPORTS_W TickMeter
     //! resets internal values.
     CV_WRAP void reset()
     {
-        startTime = 0;
-        sumTime = 0;
         counter = 0;
+        sumTime = 0;
+        startTime = 0;
+        lastTime = 0;
     }
 
 private:
     int64 counter;
     int64 sumTime;
     int64 startTime;
+    int64 lastTime;
 };
 
 /** @brief output operator
@@ -544,6 +602,18 @@ bool isAligned(const void* p1, const void* p2, const void* p3, const void* p4)
     return isAligned<N>(((size_t)p1)|((size_t)p2)|((size_t)p3)|((size_t)p4));
 }
 
+/*! @brief Flags that allow to midify some functions behavior. Used as set of flags.
+*/
+enum AlgorithmHint {
+    ALGO_HINT_DEFAULT = 0, //!< Default algorithm behaviour defined during OpenCV build
+    ALGO_HINT_ACCURATE = 1, //!< Use generic portable implementation
+    ALGO_HINT_APPROX = 2, //!< Allow alternative approximations to get faster implementation. Behaviour and result depends on a platform
+};
+
+/*! @brief Returns AlgorithmHint defined during OpenCV compilation. Defines #ALGO_HINT_DEFAULT behavior.
+ */
+CV_EXPORTS_W AlgorithmHint getDefaultAlgorithmHint();
+
 /** @brief Enables or disables the optimized code.
 
 The function can be used to dynamically turn on and off optimized dispatched code (code that uses SSE4.2, AVX/AVX2,
@@ -773,7 +843,7 @@ The sample below demonstrates how to use CommandLineParser:
 The keys parameter is a string containing several blocks, each one is enclosed in curly braces and
 describes one argument. Each argument contains three parts separated by the `|` symbol:
 
--# argument names is a space-separated list of option synonyms (to mark argument as positional, prefix it with the `@` symbol)
+-# argument names is a list of option synonyms separated by standard space characters ' ' (to mark argument as positional, prefix it with the `@` symbol)
 -# default value will be used if the argument was not provided (can be empty)
 -# help message (can be empty)
 
@@ -796,6 +866,8 @@ For example:
 Note that there are no default values for `help` and `timestamp` so we can check their presence using the `has()` method.
 Arguments with default values are considered to be always present. Use the `get()` method in these cases to check their
 actual value instead.
+Note that whitespace characters other than standard spaces are considered part of the string.
+Additionally, leading and trailing standard spaces around the help messages are ignored.
 
 String keys like `get<String>("@image1")` return the empty string `""` by default - even with an empty default value.
 Use the special `<none>` default value to enforce that the returned string must not be empty. (like in `get<String>("@image2")`)
diff --git a/3rdParty/opencv2/core/utils/allocator_stats.hpp b/3rdParty/opencv-4.12.0/opencv2/core/utils/allocator_stats.hpp
similarity index 100%
rename from 3rdParty/opencv2/core/utils/allocator_stats.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/utils/allocator_stats.hpp
diff --git a/3rdParty/opencv-4.12.0/opencv2/core/utils/allocator_stats.impl.hpp b/3rdParty/opencv-4.12.0/opencv2/core/utils/allocator_stats.impl.hpp
new file mode 100644
index 0000000000..99ceabc547
--- /dev/null
+++ b/3rdParty/opencv-4.12.0/opencv2/core/utils/allocator_stats.impl.hpp
@@ -0,0 +1,106 @@
+// This file is part of OpenCV project.
+// It is subject to the license terms in the LICENSE file found in the top-level directory
+// of this distribution and at http://opencv.org/license.html.
+
+#ifndef OPENCV_CORE_ALLOCATOR_STATS_IMPL_HPP
+#define OPENCV_CORE_ALLOCATOR_STATS_IMPL_HPP
+
+#include "./allocator_stats.hpp"
+
+//#define OPENCV_DISABLE_ALLOCATOR_STATS
+
+#include <atomic>
+
+#ifndef OPENCV_ALLOCATOR_STATS_COUNTER_TYPE
+#if defined(__GNUC__) && (\
+        (defined(__SIZEOF_POINTER__) && __SIZEOF_POINTER__ == 4) || \
+        (defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4) && !defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_8)) \
+    )
+#define OPENCV_ALLOCATOR_STATS_COUNTER_TYPE int
+#endif
+#endif
+
+#ifndef OPENCV_ALLOCATOR_STATS_COUNTER_TYPE
+#define OPENCV_ALLOCATOR_STATS_COUNTER_TYPE long long
+#endif
+
+namespace cv { namespace utils {
+
+#ifdef CV__ALLOCATOR_STATS_LOG
+namespace {
+#endif
+
+class AllocatorStatistics : public AllocatorStatisticsInterface
+{
+#ifdef OPENCV_DISABLE_ALLOCATOR_STATS
+
+public:
+    AllocatorStatistics() {}
+    ~AllocatorStatistics() CV_OVERRIDE {}
+
+    uint64_t getCurrentUsage() const CV_OVERRIDE { return 0; }
+    uint64_t getTotalUsage() const CV_OVERRIDE { return 0; }
+    uint64_t getNumberOfAllocations() const CV_OVERRIDE { return 0; }
+    uint64_t getPeakUsage() const CV_OVERRIDE { return 0; }
+
+    /** set peak usage = current usage */
+    void resetPeakUsage() CV_OVERRIDE {};
+
+    void onAllocate(size_t /*sz*/) {}
+    void onFree(size_t /*sz*/) {}
+
+#else
+
+protected:
+    typedef OPENCV_ALLOCATOR_STATS_COUNTER_TYPE counter_t;
+    std::atomic<counter_t> curr, total, total_allocs, peak;
+public:
+    AllocatorStatistics() {}
+    ~AllocatorStatistics() CV_OVERRIDE {}
+
+    uint64_t getCurrentUsage() const CV_OVERRIDE { return (uint64_t)curr.load(); }
+    uint64_t getTotalUsage() const CV_OVERRIDE { return (uint64_t)total.load(); }
+    uint64_t getNumberOfAllocations() const CV_OVERRIDE { return (uint64_t)total_allocs.load(); }
+    uint64_t getPeakUsage() const CV_OVERRIDE { return (uint64_t)peak.load(); }
+
+    /** set peak usage = current usage */
+    void resetPeakUsage() CV_OVERRIDE { peak.store(curr.load()); }
+
+    // Controller interface
+    void onAllocate(size_t sz)
+    {
+#ifdef CV__ALLOCATOR_STATS_LOG
+        CV__ALLOCATOR_STATS_LOG(cv::format("allocate: %lld (curr=%lld)", (long long int)sz, (long long int)curr.load()));
+#endif
+
+        counter_t new_curr = curr.fetch_add((counter_t)sz) + (counter_t)sz;
+
+        // peak = std::max((uint64_t)peak, new_curr);
+        auto prev_peak = peak.load();
+        while (prev_peak < new_curr)
+        {
+            if (peak.compare_exchange_weak(prev_peak, new_curr))
+                break;
+        }
+        // end of peak = max(...)
+
+        total += (counter_t)sz;
+        total_allocs++;
+    }
+    void onFree(size_t sz)
+    {
+#ifdef CV__ALLOCATOR_STATS_LOG
+        CV__ALLOCATOR_STATS_LOG(cv::format("free: %lld (curr=%lld)", (long long int)sz, (long long int)curr.load()));
+#endif
+        curr -= (counter_t)sz;
+    }
+#endif // OPENCV_DISABLE_ALLOCATOR_STATS
+};
+
+#ifdef CV__ALLOCATOR_STATS_LOG
+} // namespace
+#endif
+
+}} // namespace
+
+#endif // OPENCV_CORE_ALLOCATOR_STATS_IMPL_HPP
diff --git a/3rdParty/opencv2/core/utils/filesystem.hpp b/3rdParty/opencv-4.12.0/opencv2/core/utils/filesystem.hpp
similarity index 95%
rename from 3rdParty/opencv2/core/utils/filesystem.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/utils/filesystem.hpp
index 54f691b4c4..93bc33aefd 100644
--- a/3rdParty/opencv2/core/utils/filesystem.hpp
+++ b/3rdParty/opencv-4.12.0/opencv2/core/utils/filesystem.hpp
@@ -62,7 +62,7 @@ CV_EXPORTS void glob_relative(const cv::String& directory, const cv::String& pat
 CV_EXPORTS bool createDirectory(const cv::String& path);
 CV_EXPORTS bool createDirectories(const cv::String& path);
 
-#ifdef __OPENCV_BUILD
+#if defined(__OPENCV_BUILD) || defined(BUILD_PLUGIN)
 // TODO
 //CV_EXPORTS cv::String getTempDirectory();
 
diff --git a/3rdParty/opencv2/core/utils/fp_control_utils.hpp b/3rdParty/opencv-4.12.0/opencv2/core/utils/fp_control_utils.hpp
similarity index 100%
rename from 3rdParty/opencv2/core/utils/fp_control_utils.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/utils/fp_control_utils.hpp
diff --git a/3rdParty/opencv2/core/utils/instrumentation.hpp b/3rdParty/opencv-4.12.0/opencv2/core/utils/instrumentation.hpp
similarity index 100%
rename from 3rdParty/opencv2/core/utils/instrumentation.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/utils/instrumentation.hpp
diff --git a/3rdParty/opencv2/core/utils/logger.defines.hpp b/3rdParty/opencv-4.12.0/opencv2/core/utils/logger.defines.hpp
similarity index 100%
rename from 3rdParty/opencv2/core/utils/logger.defines.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/utils/logger.defines.hpp
diff --git a/3rdParty/opencv2/core/utils/logger.hpp b/3rdParty/opencv-4.12.0/opencv2/core/utils/logger.hpp
similarity index 79%
rename from 3rdParty/opencv2/core/utils/logger.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/utils/logger.hpp
index 5fc5fb74ae..f1f98fb2cc 100644
--- a/3rdParty/opencv2/core/utils/logger.hpp
+++ b/3rdParty/opencv-4.12.0/opencv2/core/utils/logger.hpp
@@ -43,6 +43,44 @@ CV_EXPORTS void writeLogMessage(LogLevel logLevel, const char* message);
 /** Write log message */
 CV_EXPORTS void writeLogMessageEx(LogLevel logLevel, const char* tag, const char* file, int line, const char* func, const char* message);
 
+/**
+ * @brief Function pointer type for writeLogMessage. Used by replaceWriteLogMessage.
+ */
+typedef void (*WriteLogMessageFuncType)(LogLevel, const char*);
+
+/**
+ * @brief Function pointer type for writeLogMessageEx. Used by replaceWriteLogMessageEx.
+ */
+typedef void (*WriteLogMessageExFuncType)(LogLevel, const char*, const char*, int, const char*, const char*);
+
+/**
+ * @brief Replaces the OpenCV writeLogMessage function with a user-defined function.
+ * @note The user-defined function must have the same signature as writeLogMessage.
+ * @note The user-defined function must accept arguments that can be potentially null.
+ * @note The user-defined function must be thread-safe, as OpenCV logging may be called
+ *       from multiple threads.
+ * @note The user-defined function must not perform any action that can trigger
+ *       deadlocks or infinite loop. Many OpenCV functions are not re-entrant.
+ * @note Once replaced, logs will not go through the OpenCV writeLogMessage function.
+ * @note To restore, call this function with a nullptr.
+ */
+CV_EXPORTS void replaceWriteLogMessage(WriteLogMessageFuncType f);
+
+/**
+ * @brief Replaces the OpenCV writeLogMessageEx function with a user-defined function.
+ * @note The user-defined function must have the same signature as writeLogMessage.
+ * @note The user-defined function must accept arguments that can be potentially null.
+ * @note The user-defined function must be thread-safe, as OpenCV logging may be called
+ *       from multiple threads.
+ * @note The user-defined function must not perform any action that can trigger
+ *       deadlocks or infinite loop. Many OpenCV functions are not re-entrant.
+ * @note Once replaced, logs will not go through any of the OpenCV logging functions
+ *       such as writeLogMessage or writeLogMessageEx, until their respective restore
+ *       methods are called.
+ * @note To restore, call this function with a nullptr.
+ */
+CV_EXPORTS void replaceWriteLogMessageEx(WriteLogMessageExFuncType f);
+
 } // namespace
 
 struct LogTagAuto
diff --git a/3rdParty/opencv2/core/utils/logtag.hpp b/3rdParty/opencv-4.12.0/opencv2/core/utils/logtag.hpp
similarity index 100%
rename from 3rdParty/opencv2/core/utils/logtag.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/utils/logtag.hpp
diff --git a/3rdParty/opencv2/core/utils/tls.hpp b/3rdParty/opencv-4.12.0/opencv2/core/utils/tls.hpp
similarity index 100%
rename from 3rdParty/opencv2/core/utils/tls.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/utils/tls.hpp
diff --git a/3rdParty/opencv2/core/utils/trace.hpp b/3rdParty/opencv-4.12.0/opencv2/core/utils/trace.hpp
similarity index 86%
rename from 3rdParty/opencv2/core/utils/trace.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/utils/trace.hpp
index 3f3d372f3e..74d1256c9f 100644
--- a/3rdParty/opencv2/core/utils/trace.hpp
+++ b/3rdParty/opencv-4.12.0/opencv2/core/utils/trace.hpp
@@ -70,11 +70,11 @@ class CV_EXPORTS Region
     struct LocationExtraData;
     struct LocationStaticStorage
     {
-        LocationExtraData** ppExtra;   //< implementation specific data
-        const char* name;              //< region name (function name or other custom name)
-        const char* filename;          //< source code filename
-        int line;                      //< source code line
-        int flags;                     //< flags (implementation code path: Plain, IPP, OpenCL)
+        LocationExtraData** ppExtra;   ///< implementation specific data
+        const char* name;              ///< region name (function name or other custom name)
+        const char* filename;          ///< source code filename
+        int line;                      ///< source code line
+        int flags;                     ///< flags (implementation code path: Plain, IPP, OpenCL)
     };
 
     Region(const LocationStaticStorage& location);
@@ -100,18 +100,18 @@ class CV_EXPORTS Region
 
 //! Specify region flags
 enum RegionLocationFlag {
-    REGION_FLAG_FUNCTION = (1 << 0),             //< region is function (=1) / nested named region (=0)
-    REGION_FLAG_APP_CODE = (1 << 1),             //< region is Application code (=1) / OpenCV library code (=0)
-    REGION_FLAG_SKIP_NESTED = (1 << 2),          //< avoid processing of nested regions
+    REGION_FLAG_FUNCTION = (1 << 0),             ///< region is function (=1) / nested named region (=0)
+    REGION_FLAG_APP_CODE = (1 << 1),             ///< region is Application code (=1) / OpenCV library code (=0)
+    REGION_FLAG_SKIP_NESTED = (1 << 2),          ///< avoid processing of nested regions
 
-    REGION_FLAG_IMPL_IPP = (1 << 16),            //< region is part of IPP code path
-    REGION_FLAG_IMPL_OPENCL = (2 << 16),         //< region is part of OpenCL code path
-    REGION_FLAG_IMPL_OPENVX = (3 << 16),         //< region is part of OpenVX code path
+    REGION_FLAG_IMPL_IPP = (1 << 16),            ///< region is part of IPP code path
+    REGION_FLAG_IMPL_OPENCL = (2 << 16),         ///< region is part of OpenCL code path
+    REGION_FLAG_IMPL_OPENVX = (3 << 16),         ///< region is part of OpenVX code path
 
     REGION_FLAG_IMPL_MASK = (15 << 16),
 
     REGION_FLAG_REGION_FORCE = (1 << 30),
-    REGION_FLAG_REGION_NEXT = (1 << 31),         //< close previous region (see #CV_TRACE_REGION_NEXT macro)
+    REGION_FLAG_REGION_NEXT = (1 << 31),         ///< close previous region (see #CV_TRACE_REGION_NEXT macro)
 
     ENUM_REGION_FLAG_FORCE_INT = INT_MAX
 };
diff --git a/3rdParty/opencv2/core/va_intel.hpp b/3rdParty/opencv-4.12.0/opencv2/core/va_intel.hpp
similarity index 100%
rename from 3rdParty/opencv2/core/va_intel.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/va_intel.hpp
diff --git a/3rdParty/opencv-4.12.0/opencv2/core/version.hpp b/3rdParty/opencv-4.12.0/opencv2/core/version.hpp
new file mode 100644
index 0000000000..9bb91f9ea5
--- /dev/null
+++ b/3rdParty/opencv-4.12.0/opencv2/core/version.hpp
@@ -0,0 +1,26 @@
+// This file is part of OpenCV project.
+// It is subject to the license terms in the LICENSE file found in the top-level directory
+// of this distribution and at http://opencv.org/license.html.
+
+#ifndef OPENCV_VERSION_HPP
+#define OPENCV_VERSION_HPP
+
+#define CV_VERSION_MAJOR    4
+#define CV_VERSION_MINOR    12
+#define CV_VERSION_REVISION 0
+#define CV_VERSION_STATUS   ""
+
+#define CVAUX_STR_EXP(__A)  #__A
+#define CVAUX_STR(__A)      CVAUX_STR_EXP(__A)
+
+#define CVAUX_STRW_EXP(__A)  L ## #__A
+#define CVAUX_STRW(__A)      CVAUX_STRW_EXP(__A)
+
+#define CV_VERSION          CVAUX_STR(CV_VERSION_MAJOR) "." CVAUX_STR(CV_VERSION_MINOR) "." CVAUX_STR(CV_VERSION_REVISION) CV_VERSION_STATUS
+
+/* old  style version constants*/
+#define CV_MAJOR_VERSION    CV_VERSION_MAJOR
+#define CV_MINOR_VERSION    CV_VERSION_MINOR
+#define CV_SUBMINOR_VERSION CV_VERSION_REVISION
+
+#endif // OPENCV_VERSION_HPP
diff --git a/3rdParty/opencv2/core/vsx_utils.hpp b/3rdParty/opencv-4.12.0/opencv2/core/vsx_utils.hpp
similarity index 97%
rename from 3rdParty/opencv2/core/vsx_utils.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/core/vsx_utils.hpp
index c285c7edf2..f801bc20cb 100644
--- a/3rdParty/opencv2/core/vsx_utils.hpp
+++ b/3rdParty/opencv-4.12.0/opencv2/core/vsx_utils.hpp
@@ -257,8 +257,8 @@ VSX_IMPL_1VRG(vec_udword2, vec_udword2, vpopcntd, vec_popcntu)
 VSX_IMPL_1VRG(vec_udword2, vec_dword2,  vpopcntd, vec_popcntu)
 
 // converts between single and double-precision
-VSX_REDIRECT_1RG(vec_float4,  vec_double2, vec_cvfo, __builtin_vsx_xvcvdpsp)
-VSX_REDIRECT_1RG(vec_double2, vec_float4,  vec_cvfo, __builtin_vsx_xvcvspdp)
+VSX_REDIRECT_1RG(vec_float4,  vec_double2, vec_cvfo, vec_floate)
+VSX_REDIRECT_1RG(vec_double2, vec_float4,  vec_cvfo, vec_doubleo)
 
 // converts word and doubleword to double-precision
 #undef vec_ctd
@@ -399,10 +399,6 @@ VSX_REDIRECT_1RG(vec_ushort8, vec_ushort8, vec_popcntu, vec_popcnt)
 VSX_REDIRECT_1RG(vec_uint4,   vec_uint4,   vec_popcntu, vec_popcnt)
 VSX_REDIRECT_1RG(vec_udword2, vec_udword2, vec_popcntu, vec_popcnt)
 
-// converts between single and double precision
-VSX_REDIRECT_1RG(vec_float4,  vec_double2, vec_cvfo, __builtin_vsx_xvcvdpsp)
-VSX_REDIRECT_1RG(vec_double2, vec_float4,  vec_cvfo, __builtin_vsx_xvcvspdp)
-
 // converts word and doubleword to double-precision
 #ifdef vec_ctd
 #   undef vec_ctd
diff --git a/3rdParty/opencv2/cvconfig.h b/3rdParty/opencv-4.12.0/opencv2/cvconfig.h
similarity index 90%
rename from 3rdParty/opencv2/cvconfig.h
rename to 3rdParty/opencv-4.12.0/opencv2/cvconfig.h
index 6efd5e856f..e1b1ee82bb 100644
--- a/3rdParty/opencv2/cvconfig.h
+++ b/3rdParty/opencv-4.12.0/opencv2/cvconfig.h
@@ -72,11 +72,14 @@
 #define HAVE_OPENJPEG
 /* #undef HAVE_JASPER */
 
+/* AVIF codec */
+/* #undef HAVE_AVIF */
+
 /* IJG JPEG codec */
 #define HAVE_JPEG
 
-/* libpng/png.h needs to be included */
-/* #undef HAVE_LIBPNG_PNG_H */
+/* JPEG XL codec */
+/* #undef HAVE_JPEGXL */
 
 /* GDCM DICOM codec */
 /* #undef HAVE_GDCM */
@@ -106,6 +109,9 @@
 /* PNG codec */
 #define HAVE_PNG
 
+/* PNG codec */
+/* #undef HAVE_SPNG */
+
 /* Posix threads (pthreads) */
 /* #undef HAVE_PTHREAD */
 
@@ -144,6 +150,6 @@
 #define OPENCV_TRACE
 
 /* Library QR-code decoding */
-#define HAVE_QUIRC
+/* #undef HAVE_QUIRC */
 
 #endif // OPENCV_CVCONFIG_H_INCLUDED
diff --git a/3rdParty/opencv2/dnn.hpp b/3rdParty/opencv-4.12.0/opencv2/dnn.hpp
similarity index 100%
rename from 3rdParty/opencv2/dnn.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/dnn.hpp
diff --git a/3rdParty/opencv2/dnn/all_layers.hpp b/3rdParty/opencv-4.12.0/opencv2/dnn/all_layers.hpp
similarity index 81%
rename from 3rdParty/opencv2/dnn/all_layers.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/dnn/all_layers.hpp
index e3f0c3df97..0475bac230 100644
--- a/3rdParty/opencv2/dnn/all_layers.hpp
+++ b/3rdParty/opencv-4.12.0/opencv2/dnn/all_layers.hpp
@@ -241,6 +241,39 @@ CV__DNN_INLINE_NS_BEGIN
 
     };
 
+    /** @brief This function performs array summation based
+    * on the Einstein summation convention. The function
+    * allows for concise expressions of various mathematical
+    * operations using subscripts.
+    *
+    * By default, the labels are placed in alphabetical
+    * order at the end of the output.
+    * For example:
+    * if `c = einsum("i,j", a, b)`, then `c[i,j] == a[i]*b[j]`.
+    * However, if `c = einsum("j,i", a, b)`, then `c[i,j] = a[j]*b[i]`.
+    * Alternatively, you can control the output order or prevent
+    * an axis from being summed/force an axis to be summed
+    * by providing indices for the output.
+    * For example:
+    * `diag(a)`         -> `einsum("ii->i", a)`
+    * `sum(a, axis=0)`  -> `einsum("i...->", a)`
+    * Subscripts at the beginning and end may be specified
+    * by putting an ellipsis "..." in the middle.
+    * For instance, the function `einsum("i...i", a)` takes
+    * the diagonal of the first and last dimensions of
+    * the operand, and `einsum("ij...,jk...->ik...")` performs
+    * the matrix product using the first two indices
+    * of each operand instead of the last two.
+    * When there is only one operand, no axes being summed,
+    *  and no output parameter, this function returns
+    * a view into the operand instead of creating a copy.
+     */
+    class CV_EXPORTS EinsumLayer : public Layer
+    {
+    public:
+        static Ptr<EinsumLayer> create(const LayerParams& params);
+    };
+
     class CV_EXPORTS BaseConvolutionLayer : public Layer
     {
     public:
@@ -256,6 +289,9 @@ CV__DNN_INLINE_NS_BEGIN
     {
     public:
         static Ptr<BaseConvolutionLayer> create(const LayerParams& params);
+        bool fusedActivation = false;
+        bool fusedAdd = false;
+        bool useWinograd = true; // Flag whether to use Winograd to speed up 3x3 convolution.
     };
 
     class CV_EXPORTS ConvolutionLayerInt8 : public BaseConvolutionLayer
@@ -263,6 +299,11 @@ CV__DNN_INLINE_NS_BEGIN
     public:
         int input_zp, output_zp;
         float input_sc, output_sc;
+
+        // quantization type flag. The perChannel default is true, that means it contains the parameters
+        // of per-Channel quantization. Otherwise, that means this layer contains per-Tensor quantized parameters.
+        bool per_channel;
+        bool useWinograd = false; // Flag whether to use Winograd to speed up 3x3 convolution.
         static Ptr<BaseConvolutionLayer> create(const LayerParams& params);
     };
 
@@ -294,6 +335,30 @@ CV__DNN_INLINE_NS_BEGIN
         static Ptr<ArgLayer> create(const LayerParams& params);
     };
 
+    /** @brief Gather layer
+     */
+    class CV_EXPORTS GatherLayer : public Layer
+    {
+    public:
+        static Ptr<GatherLayer> create(const LayerParams& params);
+    };
+
+    /** @brief GatherElements layer
+    * GatherElements takes two inputs data and indices of the same rank r >= 1 and an optional attribute axis and works such that:
+    *   output[i][j][k] = data[index[i][j][k]][j][k] if axis = 0 and r = 3
+    *   output[i][j][k] = data[i][index[i][j][k]][k] if axis = 1 and r = 3
+    *   output[i][j][k] = data[i][j][index[i][j][k]] if axis = 2 and r = 3
+    *
+    * Gather, on the other hand, takes a data tensor of rank r >= 1, and indices tensor of rank q, and works such that:
+    *   it gathers the enteries along axis dimension of the input data indexed by indices and concatenates them in an output tensor of rank q + (r - 1)
+    *   e.g. If axis = 0, let k = indices[i_{0}, ..., i_{q-1}] then output[i_{0}, ..., i_{q-1}, j_{0}, ..., j_{r-2}] = input[k , j_{0}, ..., j_{r-2}]:
+     **/
+    class CV_EXPORTS GatherElementsLayer : public Layer
+    {
+    public:
+        static Ptr<GatherElementsLayer> create(const LayerParams& params);
+    };
+
     class CV_EXPORTS PoolingLayer : public Layer
     {
     public:
@@ -329,17 +394,9 @@ CV__DNN_INLINE_NS_BEGIN
     class CV_EXPORTS ReduceLayer : public Layer
     {
     public:
-        int reduceType;
-        std::vector<size_t> reduceDims;
         static Ptr<ReduceLayer> create(const LayerParams& params);
     };
 
-    class CV_EXPORTS ReduceLayerInt8 : public ReduceLayer
-    {
-    public:
-        static Ptr<ReduceLayerInt8> create(const LayerParams& params);
-    };
-
     class CV_EXPORTS SoftmaxLayer : public Layer
     {
     public:
@@ -356,6 +413,10 @@ CV__DNN_INLINE_NS_BEGIN
         static Ptr<SoftmaxLayerInt8> create(const LayerParams& params);
     };
 
+    /**
+     * `InnerProduct`, `MatMul` and `Gemm` operations are all implemented by Fully Connected Layer.
+     * Parameter `is_matmul` is used to distinguish `MatMul` and `Gemm` from `InnerProduct`.
+     */
     class CV_EXPORTS InnerProductLayer : public Layer
     {
     public:
@@ -368,6 +429,10 @@ CV__DNN_INLINE_NS_BEGIN
     public:
         int input_zp, output_zp;
         float input_sc, output_sc;
+
+        // quantization type flag. The perChannel default is true, that means it contains the parameters
+        // of per-Channel quantization. Otherwise, that means this layer contains per-Tensor quantized parameters.
+        bool per_channel;
         static Ptr<InnerProductLayerInt8> create(const LayerParams& params);
     };
 
@@ -400,16 +465,16 @@ CV__DNN_INLINE_NS_BEGIN
     class CV_EXPORTS QuantizeLayer : public Layer
     {
     public:
-        float scale;
-        int zeropoint;
+        std::vector<float> scales;
+        std::vector<int> zeropoints;
         static Ptr<QuantizeLayer> create(const LayerParams &params);
     };
 
     class CV_EXPORTS DequantizeLayer : public Layer
     {
     public:
-        float scale;
-        int zeropoint;
+        std::vector<float> scales;
+        std::vector<int> zeropoints;
         static Ptr<DequantizeLayer> create(const LayerParams &params);
     };
 
@@ -539,11 +604,11 @@ CV__DNN_INLINE_NS_BEGIN
     {
     public:
         virtual void forwardSlice(const float* src, float* dst, int len,
-                                  size_t outPlaneSize, int cn0, int cn1) const {};
+                                  size_t outPlaneSize, int cn0, int cn1) const {}
         virtual void forwardSlice(const int* src, const int* lut, int* dst, int len,
-                                  size_t outPlaneSize, int cn0, int cn1) const {};
+                                  size_t outPlaneSize, int cn0, int cn1) const {}
         virtual void forwardSlice(const int8_t* src, const int8_t* lut, int8_t* dst, int len,
-                                  size_t outPlaneSize, int cn0, int cn1) const {};
+                                  size_t outPlaneSize, int cn0, int cn1) const {}
     };
 
     class CV_EXPORTS ReLULayer : public ActivationLayer
@@ -780,6 +845,18 @@ CV__DNN_INLINE_NS_BEGIN
         static Ptr<SeluLayer> create(const LayerParams &params);
     };
 
+    class CV_EXPORTS GeluLayer : public ActivationLayer
+    {
+    public:
+        static Ptr<GeluLayer> create(const LayerParams &params);
+    };
+
+    class CV_EXPORTS GeluApproximationLayer : public ActivationLayer
+    {
+    public:
+        static Ptr<GeluApproximationLayer> create(const LayerParams &params);
+    };
+
     class CV_EXPORTS ThresholdedReluLayer : public ActivationLayer
     {
     public:
@@ -841,6 +918,12 @@ CV__DNN_INLINE_NS_BEGIN
         static Ptr<EltwiseLayerInt8> create(const LayerParams &params);
     };
 
+    class CV_EXPORTS NaryEltwiseLayer : public Layer
+    {
+    public:
+        static Ptr<NaryEltwiseLayer> create(const LayerParams &params);
+    };
+
     class CV_EXPORTS BatchNormLayer : public ActivationLayer
     {
     public:
@@ -1039,6 +1122,88 @@ CV__DNN_INLINE_NS_BEGIN
         static Ptr<CumSumLayer> create(const LayerParams& params);
     };
 
+    class CV_EXPORTS ScatterLayer : public Layer
+    {
+    public:
+        static Ptr<ScatterLayer> create(const LayerParams& params);
+    };
+
+    class CV_EXPORTS ScatterNDLayer : public Layer
+    {
+    public:
+        static Ptr<ScatterNDLayer> create(const LayerParams& params);
+    };
+
+    class CV_EXPORTS TileLayer : public Layer
+    {
+    public:
+        static Ptr<TileLayer> create(const LayerParams& params);
+    };
+
+    class CV_EXPORTS LayerNormLayer : public Layer
+    {
+    public:
+        CV_DEPRECATED_EXTERNAL bool hasBias; // Deprecated, preserve for compatibility
+        int axis;
+        float epsilon;
+
+        static Ptr<LayerNormLayer> create(const LayerParams& params);
+    };
+
+    class CV_EXPORTS GemmLayer : public Layer {
+    public:
+        bool trans_a;
+        bool trans_b;
+        float alpha;
+        float beta;
+
+        static Ptr<GemmLayer> create(const LayerParams& params);
+    };
+
+    class CV_EXPORTS MatMulLayer : public Layer {
+     public:
+        static Ptr<MatMulLayer> create(const LayerParams &params);
+    };
+
+    class CV_EXPORTS ExpandLayer : public Layer
+    {
+    public:
+        static Ptr<ExpandLayer> create(const LayerParams &params);
+    };
+
+    class CV_EXPORTS InstanceNormLayer : public Layer {
+    public:
+        float epsilon;
+
+        static Ptr<InstanceNormLayer> create(const LayerParams &params);
+    };
+
+    class CV_EXPORTS AttentionLayer : public Layer {
+     public:
+        static Ptr<AttentionLayer> create(const LayerParams &params);
+    };
+
+    class CV_EXPORTS GroupNormLayer : public Layer {
+    public:
+        static Ptr<GroupNormLayer> create(const LayerParams &params);
+    };
+
+    class CV_EXPORTS DepthToSpaceLayer : public Layer {
+    public:
+        static Ptr<DepthToSpaceLayer> create(const LayerParams &params);
+    };
+
+    class CV_EXPORTS SpaceToDepthLayer : public Layer {
+    public:
+        static Ptr<SpaceToDepthLayer> create(const LayerParams &params);
+    };
+
+    class CV_EXPORTS TopKLayer : public Layer
+    {
+    public:
+        static Ptr<TopKLayer> create(const LayerParams& params);
+    };
+
 //! @}
 //! @}
 CV__DNN_INLINE_NS_END
diff --git a/3rdParty/opencv2/dnn/dict.hpp b/3rdParty/opencv-4.12.0/opencv2/dnn/dict.hpp
similarity index 100%
rename from 3rdParty/opencv2/dnn/dict.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/dnn/dict.hpp
diff --git a/3rdParty/opencv2/dnn/dnn.hpp b/3rdParty/opencv-4.12.0/opencv2/dnn/dnn.hpp
similarity index 83%
rename from 3rdParty/opencv2/dnn/dnn.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/dnn/dnn.hpp
index 7132f64e9c..3e9427f589 100644
--- a/3rdParty/opencv2/dnn/dnn.hpp
+++ b/3rdParty/opencv-4.12.0/opencv2/dnn/dnn.hpp
@@ -52,6 +52,11 @@
 
 namespace cv {
 namespace dnn {
+
+namespace accessor {
+class DnnNetAccessor;  // forward declaration
+}
+
 CV__DNN_INLINE_NS_BEGIN
 //! @addtogroup dnn
 //! @{
@@ -64,21 +69,22 @@ CV__DNN_INLINE_NS_BEGIN
      */
     enum Backend
     {
-        //! DNN_BACKEND_DEFAULT equals to DNN_BACKEND_INFERENCE_ENGINE if
-        //! OpenCV is built with Intel's Inference Engine library or
-        //! DNN_BACKEND_OPENCV otherwise.
+        //! DNN_BACKEND_DEFAULT equals to OPENCV_DNN_BACKEND_DEFAULT, which can be defined using CMake or a configuration parameter
         DNN_BACKEND_DEFAULT = 0,
         DNN_BACKEND_HALIDE,
-        DNN_BACKEND_INFERENCE_ENGINE,            //!< Intel's Inference Engine computational backend
-                                                 //!< @sa setInferenceEngineBackendType
+        DNN_BACKEND_INFERENCE_ENGINE,            //!< Intel OpenVINO computational backend, supported targets: CPU, OPENCL, OPENCL_FP16, MYRIAD, HDDL, NPU
+                                                 //!< @note Tutorial how to build OpenCV with OpenVINO: @ref tutorial_dnn_openvino
         DNN_BACKEND_OPENCV,
         DNN_BACKEND_VKCOM,
         DNN_BACKEND_CUDA,
         DNN_BACKEND_WEBNN,
         DNN_BACKEND_TIMVX,
-#ifdef __OPENCV_BUILD
+        DNN_BACKEND_CANN,
+#if defined(__OPENCV_BUILD) || defined(BUILD_PLUGIN)
+#if !defined(OPENCV_BINDING_PARSER)
         DNN_BACKEND_INFERENCE_ENGINE_NGRAPH = 1000000,     // internal - use DNN_BACKEND_INFERENCE_ENGINE + setInferenceEngineBackendType()
         DNN_BACKEND_INFERENCE_ENGINE_NN_BUILDER_2019,      // internal - use DNN_BACKEND_INFERENCE_ENGINE + setInferenceEngineBackendType()
+#endif
 #endif
     };
 
@@ -98,6 +104,22 @@ CV__DNN_INLINE_NS_BEGIN
         DNN_TARGET_CUDA_FP16,
         DNN_TARGET_HDDL,
         DNN_TARGET_NPU,
+        DNN_TARGET_CPU_FP16, // Only the ARM platform is supported. Low precision computing, accelerate model inference.
+    };
+
+    /**
+     * @brief Enum of data layout for model inference.
+     * @see Image2BlobParams
+     */
+    enum DataLayout
+    {
+        DNN_LAYOUT_UNKNOWN = 0,
+        DNN_LAYOUT_ND = 1,        //!< OpenCV data layout for 2D data.
+        DNN_LAYOUT_NCHW = 2,      //!< OpenCV data layout for 4D data.
+        DNN_LAYOUT_NCDHW = 3,      //!< OpenCV data layout for 5D data.
+        DNN_LAYOUT_NHWC = 4,      //!< Tensorflow-like data layout for 4D data.
+        DNN_LAYOUT_NDHWC = 5,      //!< Tensorflow-like data layout for 5D data.
+        DNN_LAYOUT_PLANAR = 6,     //!< Tensorflow-like data layout, it should only be used at tf or tflite model parsing.
     };
 
     CV_EXPORTS std::vector< std::pair<Backend, Target> > getAvailableBackends();
@@ -192,7 +214,7 @@ CV__DNN_INLINE_NS_BEGIN
 
     /** @brief This interface class allows to build new Layers - are building blocks of networks.
      *
-     * Each class, derived from Layer, must implement allocate() methods to declare own outputs and forward() to compute outputs.
+     * Each class, derived from Layer, must implement forward() method to compute outputs.
      * Also before using the new layer into networks you must register your layer by using one of @ref dnnLayerFactory "LayerFactory" macros.
      */
     class CV_EXPORTS_W Layer : public Algorithm
@@ -207,7 +229,7 @@ CV__DNN_INLINE_NS_BEGIN
          *  @param[in]  input  vector of already allocated input blobs
          *  @param[out] output vector of already allocated output blobs
          *
-         * If this method is called after network has allocated all memory for input and output blobs
+         * This method is called after network has allocated all memory for input and output blobs
          * and before inferencing.
          */
         CV_DEPRECATED_EXTERNAL
@@ -217,7 +239,7 @@ CV__DNN_INLINE_NS_BEGIN
          *  @param[in]  inputs  vector of already allocated input blobs
          *  @param[out] outputs vector of already allocated output blobs
          *
-         * If this method is called after network has allocated all memory for input and output blobs
+         * This method is called after network has allocated all memory for input and output blobs
          * and before inferencing.
          */
         CV_WRAP virtual void finalize(InputArrayOfArrays inputs, OutputArrayOfArrays outputs);
@@ -306,7 +328,7 @@ CV__DNN_INLINE_NS_BEGIN
 
         virtual Ptr<BackendNode> initNgraph(const std::vector<Ptr<BackendWrapper> > &inputs, const std::vector<Ptr<BackendNode> >& nodes);
 
-        virtual Ptr<BackendNode> initVkCom(const std::vector<Ptr<BackendWrapper> > &inputs);
+        virtual Ptr<BackendNode> initVkCom(const std::vector<Ptr<BackendWrapper> > &inputs, std::vector<Ptr<BackendWrapper> > &outputs);
 
         virtual Ptr<BackendNode> initWebnn(const std::vector<Ptr<BackendWrapper> > &inputs, const std::vector<Ptr<BackendNode> >& nodes);
 
@@ -336,6 +358,17 @@ CV__DNN_INLINE_NS_BEGIN
                                            const std::vector<Ptr<BackendWrapper> > &outputsWrapper,
                                            bool isLast);
 
+        /**
+         * @brief Returns a CANN backend node
+         *
+         * @param   inputs   input tensors of CANN operator
+         * @param   outputs  output tensors of CANN operator
+         * @param   nodes           nodes of input tensors
+         */
+        virtual Ptr<BackendNode> initCann(const std::vector<Ptr<BackendWrapper> > &inputs,
+                                          const std::vector<Ptr<BackendWrapper> > &outputs,
+                                          const std::vector<Ptr<BackendNode> >& nodes);
+
        /**
         * @brief Automatic Halide scheduling based on layer hyper-parameters.
         * @param[in] node Backend node with Halide functions.
@@ -451,7 +484,7 @@ CV__DNN_INLINE_NS_BEGIN
          *  Networks imported from Intel's Model Optimizer are launched in Intel's Inference Engine
          *  backend.
          */
-        CV_WRAP static Net readFromModelOptimizer(const String& xml, const String& bin);
+        CV_WRAP static Net readFromModelOptimizer(CV_WRAP_FILE_PATH const String& xml, CV_WRAP_FILE_PATH const String& bin);
 
         /** @brief Create a network from Intel's Model Optimizer in-memory buffers with intermediate representation (IR).
          *  @param[in] bufferModelConfig buffer with model's configuration.
@@ -484,7 +517,15 @@ CV__DNN_INLINE_NS_BEGIN
          *  @param path   path to output file with .dot extension
          *  @see dump()
          */
-        CV_WRAP void dumpToFile(const String& path);
+        CV_WRAP void dumpToFile(CV_WRAP_FILE_PATH const String& path);
+        /** @brief Dump net structure, hyperparameters, backend, target and fusion to pbtxt file
+         *  @param path   path to output file with .pbtxt extension
+         *
+         *  Use Netron (https://netron.app) to open the target file to visualize the model.
+         *  Call method after setInput(). To see correct backend, target and fusion run after forward().
+        */
+        CV_WRAP void dumpToPbtxt(CV_WRAP_FILE_PATH const String& path);
+
         /** @brief Adds new layer to the net.
          *  @param name   unique name of the adding layer.
          *  @param type   typename of the adding layer (type must be registered in LayerRegister).
@@ -492,7 +533,7 @@ CV__DNN_INLINE_NS_BEGIN
          *  @param params parameters which will be used to initialize the creating layer.
          *  @returns unique identifier of created layer, or -1 if a failure will happen.
          */
-        int addLayer(const String &name, const String &type, const int &dtype, LayerParams &params);
+        CV_WRAP int addLayer(const String &name, const String &type, const int &dtype, LayerParams &params);
 
         /** @overload Datatype of output blobs set to default CV_32F */
         int addLayer(const String &name, const String &type, LayerParams &params);
@@ -500,7 +541,7 @@ CV__DNN_INLINE_NS_BEGIN
         /** @brief Adds new layer and connects its first input to the first output of previously added layer.
          *  @see addLayer()
          */
-        int addLayerToPrev(const String &name, const String &type, const int &dtype, LayerParams &params);
+        CV_WRAP int addLayerToPrev(const String &name, const String &type, const int &dtype, LayerParams &params);
 
         /** @overload */
         int addLayerToPrev(const String &name, const String &type, LayerParams &params);
@@ -565,7 +606,7 @@ CV__DNN_INLINE_NS_BEGIN
          *
          *  @returns index of bound layer (the same as layerId or newly created)
          */
-        int registerOutput(const std::string& outputName, int layerId, int outputPort);
+        CV_WRAP int registerOutput(const std::string& outputName, int layerId, int outputPort);
 
         /** @brief Sets outputs names of the network input pseudo layer.
          *
@@ -601,13 +642,13 @@ CV__DNN_INLINE_NS_BEGIN
          *  @param outputName name for layer which output is needed to get
          *  @details If @p outputName is empty, runs forward pass for the whole network.
          */
-        CV_WRAP void forward(OutputArrayOfArrays outputBlobs, const String& outputName = String());
+        CV_WRAP void forward(CV_ND OutputArrayOfArrays outputBlobs, const String& outputName = String());
 
         /** @brief Runs forward pass to compute outputs of layers listed in @p outBlobNames.
          *  @param outputBlobs contains blobs for first outputs of specified layers.
          *  @param outBlobNames names for layers which outputs are needed to get
          */
-        CV_WRAP void forward(OutputArrayOfArrays outputBlobs,
+        CV_WRAP void forward(CV_ND OutputArrayOfArrays outputBlobs,
                              const std::vector<String>& outBlobNames);
 
         /** @brief Runs forward pass to compute outputs of layers listed in @p outBlobNames.
@@ -621,8 +662,10 @@ CV__DNN_INLINE_NS_BEGIN
          *  @param calibData Calibration data to compute the quantization parameters.
          *  @param inputsDtype Datatype of quantized net's inputs. Can be CV_32F or CV_8S.
          *  @param outputsDtype Datatype of quantized net's outputs. Can be CV_32F or CV_8S.
+         *  @param perChannel Quantization granularity of quantized Net. The default is true, that means quantize model
+         *  in per-channel way (channel-wise). Set it false to quantize model in per-tensor way (or tensor-wise).
          */
-        CV_WRAP Net quantize(InputArrayOfArrays calibData, int inputsDtype, int outputsDtype);
+        CV_WRAP Net quantize(InputArrayOfArrays calibData, int inputsDtype, int outputsDtype, bool perChannel=true);
 
         /** @brief Returns input scale and zeropoint for a quantized Net.
          *  @param scales output parameter for returning input scales.
@@ -651,9 +694,6 @@ CV__DNN_INLINE_NS_BEGIN
          * @brief Ask network to use specific computation backend where it supported.
          * @param[in] backendId backend identifier.
          * @see Backend
-         *
-         * If OpenCV is compiled with Intel's Inference Engine library, DNN_BACKEND_DEFAULT
-         * means DNN_BACKEND_INFERENCE_ENGINE. Otherwise it equals to DNN_BACKEND_OPENCV.
          */
         CV_WRAP void setPreferableBackend(int backendId);
 
@@ -687,7 +727,7 @@ CV__DNN_INLINE_NS_BEGIN
          *  as:
          * \f[input(n,c,h,w) = scalefactor \times (blob(n,c,h,w) - mean_c)\f]
          */
-        CV_WRAP void setInput(InputArray blob, const String& name = "",
+        CV_WRAP void setInput(CV_ND InputArray blob, const String& name = "",
                               double scalefactor = 1.0, const Scalar& mean = Scalar());
 
         /** @brief Sets the new value for the learned param of the layer.
@@ -698,8 +738,8 @@ CV__DNN_INLINE_NS_BEGIN
          *  @note If shape of the new blob differs from the previous shape,
          *  then the following forward pass may fail.
         */
-        CV_WRAP void setParam(int layer, int numParam, const Mat &blob);
-        CV_WRAP inline void setParam(const String& layerName, int numParam, const Mat &blob) { return setParam(getLayerId(layerName), numParam, blob); }
+        CV_WRAP void setParam(int layer, int numParam, CV_ND const Mat &blob);
+        CV_WRAP inline void setParam(const String& layerName, int numParam, CV_ND const Mat &blob) { return setParam(getLayerId(layerName), numParam, blob); }
 
         /** @brief Returns parameter blob of the layer.
          *  @param layer name or id of the layer.
@@ -828,6 +868,12 @@ CV__DNN_INLINE_NS_BEGIN
          */
         CV_WRAP void enableFusion(bool fusion);
 
+        /** @brief Enables or disables the Winograd compute branch. The Winograd compute branch can speed up
+         * 3x3 Convolution at a small loss of accuracy.
+        * @param useWinograd true to enable the Winograd compute branch. The default is true.
+        */
+        CV_WRAP void enableWinograd(bool useWinograd);
+
         /** @brief Returns overall time for inference and timings (in ticks) for layers.
          *
          * Indexes in returned vector correspond to layers ids. Some layers can be fused with others,
@@ -838,8 +884,12 @@ CV__DNN_INLINE_NS_BEGIN
          */
         CV_WRAP int64 getPerfProfile(CV_OUT std::vector<double>& timings);
 
-    private:
+
         struct Impl;
+        inline Impl* getImpl() const { return impl.get(); }
+        inline Impl& getImplRef() const { CV_DbgAssert(impl); return *impl.get(); }
+        friend class accessor::DnnNetAccessor;
+    protected:
         Ptr<Impl> impl;
     };
 
@@ -847,9 +897,8 @@ CV__DNN_INLINE_NS_BEGIN
     *  @param cfgFile      path to the .cfg file with text description of the network architecture.
     *  @param darknetModel path to the .weights file with learned network.
     *  @returns Network object that ready to do forward, throw an exception in failure cases.
-    *  @returns Net object.
     */
-    CV_EXPORTS_W Net readNetFromDarknet(const String &cfgFile, const String &darknetModel = String());
+    CV_EXPORTS_W Net readNetFromDarknet(CV_WRAP_FILE_PATH const String &cfgFile, CV_WRAP_FILE_PATH const String &darknetModel = String());
 
     /** @brief Reads a network model stored in <a href="https://pjreddie.com/darknet/">Darknet</a> model files.
      *  @param bufferCfg   A buffer contains a content of .cfg file with text description of the network architecture.
@@ -874,7 +923,7 @@ CV__DNN_INLINE_NS_BEGIN
       * @param caffeModel path to the .caffemodel file with learned network.
       * @returns Net object.
       */
-    CV_EXPORTS_W Net readNetFromCaffe(const String &prototxt, const String &caffeModel = String());
+    CV_EXPORTS_W Net readNetFromCaffe(CV_WRAP_FILE_PATH const String &prototxt, CV_WRAP_FILE_PATH const String &caffeModel = String());
 
     /** @brief Reads a network model stored in Caffe model in memory.
       * @param bufferProto buffer containing the content of the .prototxt file
@@ -903,7 +952,7 @@ CV__DNN_INLINE_NS_BEGIN
       *               let us make it more flexible.
       * @returns Net object.
       */
-    CV_EXPORTS_W Net readNetFromTensorflow(const String &model, const String &config = String());
+    CV_EXPORTS_W Net readNetFromTensorflow(CV_WRAP_FILE_PATH const String &model, CV_WRAP_FILE_PATH const String &config = String());
 
     /** @brief Reads a network model stored in <a href="https://www.tensorflow.org/">TensorFlow</a> framework's format.
       * @param bufferModel buffer containing the content of the pb file
@@ -924,6 +973,26 @@ CV__DNN_INLINE_NS_BEGIN
     CV_EXPORTS Net readNetFromTensorflow(const char *bufferModel, size_t lenModel,
                                          const char *bufferConfig = NULL, size_t lenConfig = 0);
 
+    /** @brief Reads a network model stored in <a href="https://www.tensorflow.org/lite">TFLite</a> framework's format.
+      * @param model  path to the .tflite file with binary flatbuffers description of the network architecture
+      * @returns Net object.
+      */
+    CV_EXPORTS_W Net readNetFromTFLite(CV_WRAP_FILE_PATH const String &model);
+
+    /** @brief Reads a network model stored in <a href="https://www.tensorflow.org/lite">TFLite</a> framework's format.
+      * @param bufferModel buffer containing the content of the tflite file
+      * @returns Net object.
+      */
+    CV_EXPORTS_W Net readNetFromTFLite(const std::vector<uchar>& bufferModel);
+
+    /** @brief Reads a network model stored in <a href="https://www.tensorflow.org/lite">TFLite</a> framework's format.
+      * @details This is an overloaded member function, provided for convenience.
+      * It differs from the above function only in what argument(s) it accepts.
+      * @param bufferModel buffer containing the content of the tflite file
+      * @param lenModel length of bufferModel
+      */
+    CV_EXPORTS Net readNetFromTFLite(const char *bufferModel, size_t lenModel);
+
     /**
      *  @brief Reads a network model stored in <a href="http://torch.ch">Torch7</a> framework's format.
      *  @param model    path to the file, dumped from Torch by using torch.save() function.
@@ -950,7 +1019,7 @@ CV__DNN_INLINE_NS_BEGIN
      *
      * Also some equivalents of these classes from cunn, cudnn, and fbcunn may be successfully imported.
      */
-     CV_EXPORTS_W Net readNetFromTorch(const String &model, bool isBinary = true, bool evaluate = true);
+     CV_EXPORTS_W Net readNetFromTorch(CV_WRAP_FILE_PATH const String &model, bool isBinary = true, bool evaluate = true);
 
      /**
       * @brief Read deep learning network represented in one of the supported formats.
@@ -960,14 +1029,14 @@ CV__DNN_INLINE_NS_BEGIN
       *                  * `*.pb` (TensorFlow, https://www.tensorflow.org/)
       *                  * `*.t7` | `*.net` (Torch, http://torch.ch/)
       *                  * `*.weights` (Darknet, https://pjreddie.com/darknet/)
-      *                  * `*.bin` (DLDT, https://software.intel.com/openvino-toolkit)
+      *                  * `*.bin` | `*.onnx` (OpenVINO, https://software.intel.com/openvino-toolkit)
       *                  * `*.onnx` (ONNX, https://onnx.ai/)
       * @param[in] config Text file contains network configuration. It could be a
       *                   file with the following extensions:
       *                  * `*.prototxt` (Caffe, http://caffe.berkeleyvision.org/)
       *                  * `*.pbtxt` (TensorFlow, https://www.tensorflow.org/)
       *                  * `*.cfg` (Darknet, https://pjreddie.com/darknet/)
-      *                  * `*.xml` (DLDT, https://software.intel.com/openvino-toolkit)
+      *                  * `*.xml` (OpenVINO, https://software.intel.com/openvino-toolkit)
       * @param[in] framework Explicit framework name tag to determine a format.
       * @returns Net object.
       *
@@ -976,7 +1045,7 @@ CV__DNN_INLINE_NS_BEGIN
       * @ref readNetFromTorch or @ref readNetFromDarknet. An order of @p model and @p config
       * arguments does not matter.
       */
-     CV_EXPORTS_W Net readNet(const String& model, const String& config = "", const String& framework = "");
+     CV_EXPORTS_W Net readNet(CV_WRAP_FILE_PATH const String& model, CV_WRAP_FILE_PATH const String& config = "", const String& framework = "");
 
      /**
       * @brief Read deep learning network represented in one of the supported formats.
@@ -1003,7 +1072,7 @@ CV__DNN_INLINE_NS_BEGIN
      *  backend.
      */
     CV_EXPORTS_W
-    Net readNetFromModelOptimizer(const String &xml, const String &bin);
+    Net readNetFromModelOptimizer(CV_WRAP_FILE_PATH const String &xml, CV_WRAP_FILE_PATH const String &bin = "");
 
     /** @brief Load a network from Intel's Model Optimizer intermediate representation.
      *  @param[in] bufferModelConfig Buffer contains XML configuration with network's topology.
@@ -1032,7 +1101,7 @@ CV__DNN_INLINE_NS_BEGIN
      *  @param onnxFile path to the .onnx file with text description of the network architecture.
      *  @returns Network object that ready to do forward, throw an exception in failure cases.
      */
-    CV_EXPORTS_W Net readNetFromONNX(const String &onnxFile);
+    CV_EXPORTS_W Net readNetFromONNX(CV_WRAP_FILE_PATH const String &onnxFile);
 
     /** @brief Reads a network model from <a href="https://onnx.ai/">ONNX</a>
      *         in-memory buffer.
@@ -1055,15 +1124,15 @@ CV__DNN_INLINE_NS_BEGIN
      *  @param path to the .pb file with input tensor.
      *  @returns Mat.
      */
-    CV_EXPORTS_W Mat readTensorFromONNX(const String& path);
+    CV_EXPORTS_W Mat readTensorFromONNX(CV_WRAP_FILE_PATH const String& path);
 
     /** @brief Creates 4-dimensional blob from image. Optionally resizes and crops @p image from center,
      *  subtract @p mean values, scales values by @p scalefactor, swap Blue and Red channels.
      *  @param image input image (with 1-, 3- or 4-channels).
+     *  @param scalefactor multiplier for @p images values.
      *  @param size spatial size for output image
      *  @param mean scalar with mean values which are subtracted from channels. Values are intended
      *  to be in (mean-R, mean-G, mean-B) order if @p image has BGR ordering and @p swapRB is true.
-     *  @param scalefactor multiplier for @p image values.
      *  @param swapRB flag which indicates that swap first and last channels
      *  in 3-channel image is necessary.
      *  @param crop flag which indicates whether image will be cropped after resize or not
@@ -1072,6 +1141,9 @@ CV__DNN_INLINE_NS_BEGIN
      *  dimension in @p size and another one is equal or larger. Then, crop from the center is performed.
      *  If @p crop is false, direct resize without cropping and preserving aspect ratio is performed.
      *  @returns 4-dimensional Mat with NCHW dimensions order.
+     *
+     * @note
+     * The order and usage of `scalefactor` and `mean` are (input - mean) * scalefactor.
      */
     CV_EXPORTS_W Mat blobFromImage(InputArray image, double scalefactor=1.0, const Size& size = Size(),
                                    const Scalar& mean = Scalar(), bool swapRB=false, bool crop=false,
@@ -1102,6 +1174,9 @@ CV__DNN_INLINE_NS_BEGIN
      *  dimension in @p size and another one is equal or larger. Then, crop from the center is performed.
      *  If @p crop is false, direct resize without cropping and preserving aspect ratio is performed.
      *  @returns 4-dimensional Mat with NCHW dimensions order.
+     *
+     * @note
+     * The order and usage of `scalefactor` and `mean` are (input - mean) * scalefactor.
      */
     CV_EXPORTS_W Mat blobFromImages(InputArrayOfArrays images, double scalefactor=1.0,
                                     Size size = Size(), const Scalar& mean = Scalar(), bool swapRB=false, bool crop=false,
@@ -1116,6 +1191,89 @@ CV__DNN_INLINE_NS_BEGIN
                                    const Scalar& mean = Scalar(), bool swapRB=false, bool crop=false,
                                    int ddepth=CV_32F);
 
+    /**
+     * @brief Enum of image processing mode.
+     * To facilitate the specialization pre-processing requirements of the dnn model.
+     * For example, the `letter box` often used in the Yolo series of models.
+     * @see Image2BlobParams
+     */
+    enum ImagePaddingMode
+    {
+        DNN_PMODE_NULL = 0,        // !< Default. Resize to required input size without extra processing.
+        DNN_PMODE_CROP_CENTER = 1, // !< Image will be cropped after resize.
+        DNN_PMODE_LETTERBOX = 2,   // !< Resize image to the desired size while preserving the aspect ratio of original image.
+    };
+
+    /** @brief Processing params of image to blob.
+     *
+     * It includes all possible image processing operations and corresponding parameters.
+     *
+     * @see blobFromImageWithParams
+     *
+     * @note
+     * The order and usage of `scalefactor` and `mean` are (input - mean) * scalefactor.
+     * The order and usage of `scalefactor`, `size`, `mean`, `swapRB`, and `ddepth` are consistent
+     * with the function of @ref blobFromImage.
+    */
+    struct CV_EXPORTS_W_SIMPLE Image2BlobParams
+    {
+        CV_WRAP Image2BlobParams();
+        CV_WRAP Image2BlobParams(const Scalar& scalefactor, const Size& size = Size(), const Scalar& mean = Scalar(),
+                            bool swapRB = false, int ddepth = CV_32F, dnn::DataLayout datalayout = DNN_LAYOUT_NCHW,
+                            ImagePaddingMode mode = dnn::DNN_PMODE_NULL, Scalar borderValue = 0.0);
+
+        CV_PROP_RW Scalar scalefactor; //!< scalefactor multiplier for input image values.
+        CV_PROP_RW Size size;    //!< Spatial size for output image.
+        CV_PROP_RW Scalar mean;  //!< Scalar with mean values which are subtracted from channels.
+        CV_PROP_RW bool swapRB;  //!< Flag which indicates that swap first and last channels
+        CV_PROP_RW int ddepth;   //!< Depth of output blob. Choose CV_32F or CV_8U.
+        CV_PROP_RW dnn::DataLayout datalayout; //!< Order of output dimensions. Choose DNN_LAYOUT_NCHW or DNN_LAYOUT_NHWC.
+        CV_PROP_RW dnn::ImagePaddingMode paddingmode;   //!< Image padding mode. @see ImagePaddingMode.
+        CV_PROP_RW Scalar borderValue;   //!< Value used in padding mode for padding.
+
+        /** @brief Get rectangle coordinates in original image system from rectangle in blob coordinates.
+         *  @param rBlob rect in blob coordinates.
+         *  @param size original input image size.
+         *  @returns rectangle in original image coordinates.
+         */
+        CV_WRAP Rect blobRectToImageRect(const Rect &rBlob, const Size &size);
+
+        /** @brief Get rectangle coordinates in original image system from rectangle in blob coordinates.
+         *  @param rBlob rect in blob coordinates.
+         *  @param rImg result rect in image coordinates.
+         *  @param size original input image size.
+         */
+        CV_WRAP void blobRectsToImageRects(const std::vector<Rect> &rBlob, CV_OUT std::vector<Rect>& rImg, const Size& size);
+    };
+
+    /** @brief Creates 4-dimensional blob from image with given params.
+     *
+     *  @details This function is an extension of @ref blobFromImage to meet more image preprocess needs.
+     *  Given input image and preprocessing parameters, and function outputs the blob.
+     *
+     *  @param image input image (all with 1-, 3- or 4-channels).
+     *  @param param struct of Image2BlobParams, contains all parameters needed by processing of image to blob.
+     *  @return 4-dimensional Mat.
+     */
+    CV_EXPORTS_W Mat blobFromImageWithParams(InputArray image, const Image2BlobParams& param = Image2BlobParams());
+
+    /** @overload */
+    CV_EXPORTS_W void blobFromImageWithParams(InputArray image, OutputArray blob, const Image2BlobParams& param = Image2BlobParams());
+
+    /** @brief Creates 4-dimensional blob from series of images with given params.
+     *
+     *  @details This function is an extension of @ref blobFromImages to meet more image preprocess needs.
+     *  Given input image and preprocessing parameters, and function outputs the blob.
+     *
+     *  @param images input image (all with 1-, 3- or 4-channels).
+     *  @param param struct of Image2BlobParams, contains all parameters needed by processing of image to blob.
+     *  @returns 4-dimensional Mat.
+     */
+    CV_EXPORTS_W Mat blobFromImagesWithParams(InputArrayOfArrays images, const Image2BlobParams& param = Image2BlobParams());
+
+    /** @overload */
+    CV_EXPORTS_W void blobFromImagesWithParams(InputArrayOfArrays images, OutputArray blob, const Image2BlobParams& param = Image2BlobParams());
+
     /** @brief Parse a 4D blob and output the images it contains as 2D arrays through a simpler data structure
      *  (std::vector<cv::Mat>).
      *  @param[in] blob_ 4 dimensional array (images, channels, height, width) in floating point precision (CV_32F) from
@@ -1139,7 +1297,7 @@ CV__DNN_INLINE_NS_BEGIN
      *       is taken from NVidia's Caffe fork: https://github.com/NVIDIA/caffe.
      *       So the resulting model may be used there.
      */
-    CV_EXPORTS_W void shrinkCaffeModel(const String& src, const String& dst,
+    CV_EXPORTS_W void shrinkCaffeModel(CV_WRAP_FILE_PATH const String& src, CV_WRAP_FILE_PATH const String& dst,
                                        const std::vector<String>& layersTypes = std::vector<String>());
 
     /** @brief Create a text representation for a binary network stored in protocol buffer format.
@@ -1148,7 +1306,7 @@ CV__DNN_INLINE_NS_BEGIN
      *
      *  @note To reduce output file size, trained weights are not included.
      */
-    CV_EXPORTS_W void writeTextGraph(const String& model, const String& output);
+    CV_EXPORTS_W void writeTextGraph(CV_WRAP_FILE_PATH const String& model, CV_WRAP_FILE_PATH const String& output);
 
     /** @brief Performs non maximum suppression given boxes and corresponding scores.
 
@@ -1175,6 +1333,27 @@ CV__DNN_INLINE_NS_BEGIN
                              CV_OUT std::vector<int>& indices,
                              const float eta = 1.f, const int top_k = 0);
 
+    /** @brief Performs batched non maximum suppression on given boxes and corresponding scores across different classes.
+
+     * @param bboxes a set of bounding boxes to apply NMS.
+     * @param scores a set of corresponding confidences.
+     * @param class_ids a set of corresponding class ids. Ids are integer and usually start from 0.
+     * @param score_threshold a threshold used to filter boxes by score.
+     * @param nms_threshold a threshold used in non maximum suppression.
+     * @param indices the kept indices of bboxes after NMS.
+     * @param eta a coefficient in adaptive threshold formula: \f$nms\_threshold_{i+1}=eta\cdot nms\_threshold_i\f$.
+     * @param top_k if `>0`, keep at most @p top_k picked indices.
+     */
+    CV_EXPORTS void NMSBoxesBatched(const std::vector<Rect>& bboxes, const std::vector<float>& scores, const std::vector<int>& class_ids,
+                                    const float score_threshold, const float nms_threshold,
+                                    CV_OUT std::vector<int>& indices,
+                                    const float eta = 1.f, const int top_k = 0);
+
+    CV_EXPORTS_W void NMSBoxesBatched(const std::vector<Rect2d>& bboxes, const std::vector<float>& scores, const std::vector<int>& class_ids,
+                                      const float score_threshold, const float nms_threshold,
+                                      CV_OUT std::vector<int>& indices,
+                                      const float eta = 1.f, const int top_k = 0);
+
     /**
      * @brief Enum of Soft NMS methods.
      * @see softNMSBoxes
@@ -1232,7 +1411,7 @@ CV__DNN_INLINE_NS_BEGIN
           * @param[in] model Binary file contains trained weights.
           * @param[in] config Text file contains network configuration.
           */
-         CV_WRAP Model(const String& model, const String& config = "");
+         CV_WRAP Model(CV_WRAP_FILE_PATH const String& model, CV_WRAP_FILE_PATH const String& config = "");
 
          /**
           * @brief Create model from deep learning network.
@@ -1261,7 +1440,7 @@ CV__DNN_INLINE_NS_BEGIN
          /** @brief Set scalefactor value for frame.
           *  @param[in] scale Multiplier for frame values.
          */
-         CV_WRAP Model& setInputScale(double scale);
+         CV_WRAP Model& setInputScale(const Scalar& scale);
 
          /** @brief Set flag crop for frame.
           *  @param[in] crop Flag which indicates whether image will be cropped after resize or not.
@@ -1273,6 +1452,11 @@ CV__DNN_INLINE_NS_BEGIN
          */
          CV_WRAP Model& setInputSwapRB(bool swapRB);
 
+         /** @brief Set output names for frame.
+          *  @param[in] outNames Names for output layers.
+         */
+         CV_WRAP Model& setOutputNames(const std::vector<String>& outNames);
+
          /** @brief Set preprocessing parameters for frame.
          *  @param[in] size New input size.
          *  @param[in] mean Scalar with mean values which are subtracted from channels.
@@ -1302,6 +1486,9 @@ CV__DNN_INLINE_NS_BEGIN
          /// @sa Net::setPreferableTarget
          CV_WRAP Model& setPreferableTarget(dnn::Target targetId);
 
+         /// @sa Net::enableWinograd
+         CV_WRAP Model& enableWinograd(bool useWinograd);
+
          CV_DEPRECATED_EXTERNAL
          operator Net&() const { return getNetwork_(); }
 
@@ -1334,7 +1521,7 @@ CV__DNN_INLINE_NS_BEGIN
           * @param[in] model Binary file contains trained weights.
           * @param[in] config Text file contains network configuration.
           */
-          CV_WRAP ClassificationModel(const String& model, const String& config = "");
+          CV_WRAP ClassificationModel(CV_WRAP_FILE_PATH const String& model, CV_WRAP_FILE_PATH const String& config = "");
 
          /**
           * @brief Create model from deep learning network.
@@ -1384,7 +1571,7 @@ CV__DNN_INLINE_NS_BEGIN
           * @param[in] model Binary file contains trained weights.
           * @param[in] config Text file contains network configuration.
           */
-          CV_WRAP KeypointsModel(const String& model, const String& config = "");
+          CV_WRAP KeypointsModel(CV_WRAP_FILE_PATH const String& model, CV_WRAP_FILE_PATH const String& config = "");
 
          /**
           * @brief Create model from deep learning network.
@@ -1416,7 +1603,7 @@ CV__DNN_INLINE_NS_BEGIN
           * @param[in] model Binary file contains trained weights.
           * @param[in] config Text file contains network configuration.
           */
-          CV_WRAP SegmentationModel(const String& model, const String& config = "");
+          CV_WRAP SegmentationModel(CV_WRAP_FILE_PATH const String& model, CV_WRAP_FILE_PATH const String& config = "");
 
          /**
           * @brief Create model from deep learning network.
@@ -1447,7 +1634,7 @@ CV__DNN_INLINE_NS_BEGIN
           * @param[in] model Binary file contains trained weights.
           * @param[in] config Text file contains network configuration.
           */
-         CV_WRAP DetectionModel(const String& model, const String& config = "");
+         CV_WRAP DetectionModel(CV_WRAP_FILE_PATH const String& model, CV_WRAP_FILE_PATH const String& config = "");
 
          /**
           * @brief Create model from deep learning network.
@@ -1513,7 +1700,7 @@ class CV_EXPORTS_W_SIMPLE TextRecognitionModel : public Model
      * @param[in] config Text file contains network configuration
      */
     CV_WRAP inline
-    TextRecognitionModel(const std::string& model, const std::string& config = "")
+    TextRecognitionModel(CV_WRAP_FILE_PATH const std::string& model, CV_WRAP_FILE_PATH const std::string& config = "")
         : TextRecognitionModel(readNet(model, config)) { /* nothing */ }
 
     /**
@@ -1668,7 +1855,7 @@ class CV_EXPORTS_W_SIMPLE TextDetectionModel_EAST : public TextDetectionModel
      * @param[in] config Text file contains network configuration.
      */
     CV_WRAP inline
-    TextDetectionModel_EAST(const std::string& model, const std::string& config = "")
+    TextDetectionModel_EAST(CV_WRAP_FILE_PATH const std::string& model, CV_WRAP_FILE_PATH const std::string& config = "")
         : TextDetectionModel_EAST(readNet(model, config)) { /* nothing */ }
 
     /**
@@ -1729,7 +1916,7 @@ class CV_EXPORTS_W_SIMPLE TextDetectionModel_DB : public TextDetectionModel
      * @param[in] config Text file contains network configuration.
      */
     CV_WRAP inline
-    TextDetectionModel_DB(const std::string& model, const std::string& config = "")
+    TextDetectionModel_DB(CV_WRAP_FILE_PATH const std::string& model, CV_WRAP_FILE_PATH const std::string& config = "")
         : TextDetectionModel_DB(readNet(model, config)) { /* nothing */ }
 
     CV_WRAP TextDetectionModel_DB& setBinaryThreshold(float binaryThreshold);
diff --git a/3rdParty/opencv2/dnn/dnn.inl.hpp b/3rdParty/opencv-4.12.0/opencv2/dnn/dnn.inl.hpp
similarity index 100%
rename from 3rdParty/opencv2/dnn/dnn.inl.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/dnn/dnn.inl.hpp
diff --git a/3rdParty/opencv2/dnn/layer.details.hpp b/3rdParty/opencv-4.12.0/opencv2/dnn/layer.details.hpp
similarity index 100%
rename from 3rdParty/opencv2/dnn/layer.details.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/dnn/layer.details.hpp
diff --git a/3rdParty/opencv2/dnn/layer.hpp b/3rdParty/opencv-4.12.0/opencv2/dnn/layer.hpp
similarity index 100%
rename from 3rdParty/opencv2/dnn/layer.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/dnn/layer.hpp
diff --git a/3rdParty/opencv2/dnn/shape_utils.hpp b/3rdParty/opencv-4.12.0/opencv2/dnn/shape_utils.hpp
similarity index 87%
rename from 3rdParty/opencv2/dnn/shape_utils.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/dnn/shape_utils.hpp
index a436bed307..5391017440 100644
--- a/3rdParty/opencv2/dnn/shape_utils.hpp
+++ b/3rdParty/opencv-4.12.0/opencv2/dnn/shape_utils.hpp
@@ -43,7 +43,7 @@
 #define OPENCV_DNN_DNN_SHAPE_UTILS_HPP
 
 #include <opencv2/dnn/dnn.hpp>
-#include <opencv2/core/types_c.h>  // CV_MAX_DIM
+#include <opencv2/core/cvdef.h>  // CV_MAX_DIM
 #include <iostream>
 #include <ostream>
 #include <sstream>
@@ -160,22 +160,49 @@ static inline MatShape shape(int a0, int a1=-1, int a2=-1, int a3=-1)
 
 static inline int total(const MatShape& shape, int start = -1, int end = -1)
 {
-    if (start == -1) start = 0;
-    if (end == -1) end = (int)shape.size();
-
     if (shape.empty())
         return 0;
 
+    int dims = (int)shape.size();
+
+    if (start == -1) start = 0;
+    if (end == -1) end = dims;
+
+    CV_CheckLE(0, start, "");
+    CV_CheckLE(start, end, "");
+    CV_CheckLE(end, dims, "");
+
     int elems = 1;
-    CV_Assert(start <= (int)shape.size() && end <= (int)shape.size() &&
-              start <= end);
-    for(int i = start; i < end; i++)
+    for (int i = start; i < end; i++)
     {
         elems *= shape[i];
     }
     return elems;
 }
 
+// TODO: rename to countDimsElements()
+static inline int total(const Mat& mat, int start = -1, int end = -1)
+{
+    if (mat.empty())
+        return 0;
+
+    int dims = mat.dims;
+
+    if (start == -1) start = 0;
+    if (end == -1) end = dims;
+
+    CV_CheckLE(0, start, "");
+    CV_CheckLE(start, end, "");
+    CV_CheckLE(end, dims, "");
+
+    int elems = 1;
+    for (int i = start; i < end; i++)
+    {
+        elems *= mat.size[i];
+    }
+    return elems;
+}
+
 static inline MatShape concat(const MatShape& a, const MatShape& b)
 {
     MatShape c = a;
diff --git a/3rdParty/opencv2/dnn/utils/debug_utils.hpp b/3rdParty/opencv-4.12.0/opencv2/dnn/utils/debug_utils.hpp
similarity index 100%
rename from 3rdParty/opencv2/dnn/utils/debug_utils.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/dnn/utils/debug_utils.hpp
diff --git a/3rdParty/opencv2/dnn/utils/inference_engine.hpp b/3rdParty/opencv-4.12.0/opencv2/dnn/utils/inference_engine.hpp
similarity index 100%
rename from 3rdParty/opencv2/dnn/utils/inference_engine.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/dnn/utils/inference_engine.hpp
diff --git a/3rdParty/opencv-4.12.0/opencv2/dnn/version.hpp b/3rdParty/opencv-4.12.0/opencv2/dnn/version.hpp
new file mode 100644
index 0000000000..2a6b496bc6
--- /dev/null
+++ b/3rdParty/opencv-4.12.0/opencv2/dnn/version.hpp
@@ -0,0 +1,21 @@
+// This file is part of OpenCV project.
+// It is subject to the license terms in the LICENSE file found in the top-level directory
+// of this distribution and at http://opencv.org/license.html.
+
+#ifndef OPENCV_DNN_VERSION_HPP
+#define OPENCV_DNN_VERSION_HPP
+
+/// Use with major OpenCV version only.
+#define OPENCV_DNN_API_VERSION 20250619
+
+#if !defined CV_DOXYGEN && !defined CV_STATIC_ANALYSIS && !defined CV_DNN_DONT_ADD_INLINE_NS
+#define CV__DNN_INLINE_NS __CV_CAT(dnn4_v, OPENCV_DNN_API_VERSION)
+#define CV__DNN_INLINE_NS_BEGIN namespace CV__DNN_INLINE_NS {
+#define CV__DNN_INLINE_NS_END }
+namespace cv { namespace dnn { namespace CV__DNN_INLINE_NS { } using namespace CV__DNN_INLINE_NS; }}
+#else
+#define CV__DNN_INLINE_NS_BEGIN
+#define CV__DNN_INLINE_NS_END
+#endif
+
+#endif  // OPENCV_DNN_VERSION_HPP
diff --git a/3rdParty/opencv2/features2d.hpp b/3rdParty/opencv-4.12.0/opencv2/features2d.hpp
similarity index 91%
rename from 3rdParty/opencv2/features2d.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/features2d.hpp
index 4b21d8ea5c..43dcd02ee3 100644
--- a/3rdParty/opencv2/features2d.hpp
+++ b/3rdParty/opencv-4.12.0/opencv2/features2d.hpp
@@ -56,15 +56,15 @@
     @defgroup features2d_main Feature Detection and Description
     @defgroup features2d_match Descriptor Matchers
 
-Matchers of keypoint descriptors in OpenCV have wrappers with a common interface that enables you to
-easily switch between different algorithms solving the same problem. This section is devoted to
-matching descriptors that are represented as vectors in a multidimensional space. All objects that
-implement vector descriptor matchers inherit the DescriptorMatcher interface.
+    Matchers of keypoint descriptors in OpenCV have wrappers with a common interface that enables
+    you to easily switch between different algorithms solving the same problem. This section is
+    devoted to matching descriptors that are represented as vectors in a multidimensional space.
+    All objects that implement vector descriptor matchers inherit the DescriptorMatcher interface.
 
     @defgroup features2d_draw Drawing Function of Keypoints and Matches
     @defgroup features2d_category Object Categorization
 
-This section describes approaches based on local 2D features and used to categorize objects.
+    This section describes approaches based on local 2D features and used to categorize objects.
 
     @defgroup feature2d_hal Hardware Acceleration Layer
     @{
@@ -107,6 +107,10 @@ class CV_EXPORTS KeyPointsFilter
      * Remove keypoints from some image by mask for pixels of this image.
      */
     static void runByPixelsMask( std::vector<KeyPoint>& keypoints, const Mat& mask );
+    /*
+     * Remove objects from some image and a vector of points by mask for pixels of this image
+     */
+    static void runByPixelsMask2VectorPoint(std::vector<KeyPoint> &keypoints, std::vector<std::vector<Point> > &removeFrom, const Mat &mask);
     /*
      * Remove duplicated keypoints.
      */
@@ -212,7 +216,10 @@ class CV_EXPORTS_W Feature2D : public virtual Algorithm
     CV_WRAP virtual String getDefaultName() const CV_OVERRIDE;
 
     // see corresponding cv::Algorithm method
-    CV_WRAP inline void write(const Ptr<FileStorage>& fs, const String& name = String()) const { Algorithm::write(fs, name); }
+    CV_WRAP inline void write(FileStorage& fs, const String& name) const { Algorithm::write(fs, name); }
+#if CV_VERSION_MAJOR < 5
+    inline void write(const Ptr<FileStorage>& fs, const String& name) const { CV_Assert(fs); Algorithm::write(*fs, name); }
+#endif
 };
 
 /** Feature detectors in OpenCV have wrappers with a common interface that enables you to easily switch
@@ -279,10 +286,14 @@ class CV_EXPORTS_W SIFT : public Feature2D
 
     @param sigma The sigma of the Gaussian applied to the input image at the octave \#0. If your image
     is captured with a weak camera with soft lenses, you might want to reduce the number.
+
+    @param enable_precise_upscale Whether to enable precise upscaling in the scale pyramid, which maps
+    index \f$\texttt{x}\f$ to \f$\texttt{2x}\f$. This prevents localization bias. The option
+    is disabled by default.
     */
     CV_WRAP static Ptr<SIFT> create(int nfeatures = 0, int nOctaveLayers = 3,
         double contrastThreshold = 0.04, double edgeThreshold = 10,
-        double sigma = 1.6);
+        double sigma = 1.6, bool enable_precise_upscale = false);
 
     /** @brief Create SIFT with specified descriptorType.
     @param nfeatures The number of best features to retain. The features are ranked by their scores
@@ -306,12 +317,31 @@ class CV_EXPORTS_W SIFT : public Feature2D
     is captured with a weak camera with soft lenses, you might want to reduce the number.
 
     @param descriptorType The type of descriptors. Only CV_32F and CV_8U are supported.
+
+    @param enable_precise_upscale Whether to enable precise upscaling in the scale pyramid, which maps
+    index \f$\texttt{x}\f$ to \f$\texttt{2x}\f$. This prevents localization bias. The option
+    is disabled by default.
     */
     CV_WRAP static Ptr<SIFT> create(int nfeatures, int nOctaveLayers,
         double contrastThreshold, double edgeThreshold,
-        double sigma, int descriptorType);
+        double sigma, int descriptorType, bool enable_precise_upscale = false);
 
     CV_WRAP virtual String getDefaultName() const CV_OVERRIDE;
+
+    CV_WRAP virtual void setNFeatures(int maxFeatures) = 0;
+    CV_WRAP virtual int getNFeatures() const = 0;
+
+    CV_WRAP virtual void setNOctaveLayers(int nOctaveLayers) = 0;
+    CV_WRAP virtual int getNOctaveLayers() const = 0;
+
+    CV_WRAP virtual void setContrastThreshold(double contrastThreshold) = 0;
+    CV_WRAP virtual double getContrastThreshold() const = 0;
+
+    CV_WRAP virtual void setEdgeThreshold(double edgeThreshold) = 0;
+    CV_WRAP virtual double getEdgeThreshold() const = 0;
+
+    CV_WRAP virtual void setSigma(double sigma) = 0;
+    CV_WRAP virtual double getSigma() const = 0;
 };
 
 typedef SIFT SiftFeatureDetector;
@@ -367,14 +397,20 @@ class CV_EXPORTS_W BRISK : public Feature2D
     /** @brief Set detection threshold.
     @param threshold AGAST detection threshold score.
     */
-    CV_WRAP virtual void setThreshold(int threshold) { CV_UNUSED(threshold); return; }
-    CV_WRAP virtual int getThreshold() const { return -1; }
+    CV_WRAP virtual void setThreshold(int threshold) = 0;
+    CV_WRAP virtual int getThreshold() const = 0;
 
     /** @brief Set detection octaves.
     @param octaves detection octaves. Use 0 to do single scale.
     */
-    CV_WRAP virtual void setOctaves(int octaves) { CV_UNUSED(octaves); return; }
-    CV_WRAP virtual int getOctaves() const { return -1; }
+    CV_WRAP virtual void setOctaves(int octaves) = 0;
+    CV_WRAP virtual int getOctaves() const = 0;
+    /** @brief Set detection patternScale.
+    @param patternScale apply this scale to the pattern used for sampling the neighbourhood of a
+    keypoint.
+    */
+    CV_WRAP virtual void setPatternScale(float patternScale) = 0;
+    CV_WRAP virtual float getPatternScale() const = 0;
 };
 
 /** @brief Class implementing the ORB (*oriented BRIEF*) keypoint detector and descriptor extractor
@@ -507,15 +543,30 @@ class CV_EXPORTS_W MSER : public Feature2D
     CV_WRAP virtual void setMaxArea(int maxArea) = 0;
     CV_WRAP virtual int getMaxArea() const = 0;
 
+    CV_WRAP virtual void setMaxVariation(double maxVariation) = 0;
+    CV_WRAP virtual double getMaxVariation() const = 0;
+
+    CV_WRAP virtual void setMinDiversity(double minDiversity) = 0;
+    CV_WRAP virtual double getMinDiversity() const = 0;
+
+    CV_WRAP virtual void setMaxEvolution(int maxEvolution) = 0;
+    CV_WRAP virtual int getMaxEvolution() const = 0;
+
+    CV_WRAP virtual void setAreaThreshold(double areaThreshold) = 0;
+    CV_WRAP virtual double getAreaThreshold() const = 0;
+
+    CV_WRAP virtual void setMinMargin(double min_margin) = 0;
+    CV_WRAP virtual double getMinMargin() const = 0;
+
+    CV_WRAP virtual void setEdgeBlurSize(int edge_blur_size) = 0;
+    CV_WRAP virtual int getEdgeBlurSize() const = 0;
+
     CV_WRAP virtual void setPass2Only(bool f) = 0;
     CV_WRAP virtual bool getPass2Only() const = 0;
+
     CV_WRAP virtual String getDefaultName() const CV_OVERRIDE;
 };
 
-//! @} features2d_main
-
-//! @addtogroup features2d_main
-//! @{
 
 /** @brief Wrapping class for feature detection using the FAST method. :
  */
@@ -572,10 +623,6 @@ detection, use cv.FAST.detect() method.
 CV_EXPORTS void FAST( InputArray image, CV_OUT std::vector<KeyPoint>& keypoints,
                       int threshold, bool nonmaxSuppression, FastFeatureDetector::DetectorType type );
 
-//! @} features2d_main
-
-//! @addtogroup features2d_main
-//! @{
 
 /** @brief Wrapping class for feature detection using the AGAST method. :
  */
@@ -653,6 +700,9 @@ class CV_EXPORTS_W GFTTDetector : public Feature2D
     CV_WRAP virtual void setBlockSize(int blockSize) = 0;
     CV_WRAP virtual int getBlockSize() const = 0;
 
+    CV_WRAP virtual void setGradientSize(int gradientSize_) = 0;
+    CV_WRAP virtual int getGradientSize() = 0;
+
     CV_WRAP virtual void setHarrisDetector(bool val) = 0;
     CV_WRAP virtual bool getHarrisDetector() const = 0;
 
@@ -719,19 +769,22 @@ class CV_EXPORTS_W SimpleBlobDetector : public Feature2D
       CV_PROP_RW bool filterByConvexity;
       CV_PROP_RW float minConvexity, maxConvexity;
 
+      CV_PROP_RW bool collectContours;
+
       void read( const FileNode& fn );
       void write( FileStorage& fs ) const;
   };
 
   CV_WRAP static Ptr<SimpleBlobDetector>
     create(const SimpleBlobDetector::Params &parameters = SimpleBlobDetector::Params());
+
+  CV_WRAP virtual void setParams(const SimpleBlobDetector::Params& params ) = 0;
+  CV_WRAP virtual SimpleBlobDetector::Params getParams() const = 0;
+
   CV_WRAP virtual String getDefaultName() const CV_OVERRIDE;
+  CV_WRAP virtual const std::vector<std::vector<cv::Point> >& getBlobContours() const;
 };
 
-//! @} features2d_main
-
-//! @addtogroup features2d_main
-//! @{
 
 /** @brief Class implementing the KAZE keypoint detector and descriptor extractor, described in @cite ABD12 .
 
@@ -824,11 +877,15 @@ class CV_EXPORTS_W AKAZE : public Feature2D
     @param nOctaveLayers Default number of sublevels per scale level
     @param diffusivity Diffusivity type. DIFF_PM_G1, DIFF_PM_G2, DIFF_WEICKERT or
     DIFF_CHARBONNIER
+    @param max_points Maximum amount of returned points. In case if image contains
+    more features, then the features with highest response are returned.
+    Negative value means no limitation.
      */
     CV_WRAP static Ptr<AKAZE> create(AKAZE::DescriptorType descriptor_type = AKAZE::DESCRIPTOR_MLDB,
                                      int descriptor_size = 0, int descriptor_channels = 3,
                                      float threshold = 0.001f, int nOctaves = 4,
-                                     int nOctaveLayers = 4, KAZE::DiffusivityType diffusivity = KAZE::DIFF_PM_G2);
+                                     int nOctaveLayers = 4, KAZE::DiffusivityType diffusivity = KAZE::DIFF_PM_G2,
+                                     int max_points = -1);
 
     CV_WRAP virtual void setDescriptorType(AKAZE::DescriptorType dtype) = 0;
     CV_WRAP virtual AKAZE::DescriptorType getDescriptorType() const = 0;
@@ -851,9 +908,11 @@ class CV_EXPORTS_W AKAZE : public Feature2D
     CV_WRAP virtual void setDiffusivity(KAZE::DiffusivityType diff) = 0;
     CV_WRAP virtual KAZE::DiffusivityType getDiffusivity() const = 0;
     CV_WRAP virtual String getDefaultName() const CV_OVERRIDE;
+
+    CV_WRAP virtual void setMaxPoints(int max_points) = 0;
+    CV_WRAP virtual int getMaxPoints() const = 0;
 };
 
-//! @} features2d_main
 
 /****************************************************************************************\
 *                                      Distance                                          *
@@ -918,6 +977,8 @@ struct L1
     }
 };
 
+//! @} features2d_main
+
 /****************************************************************************************\
 *                                  DescriptorMatcher                                     *
 \****************************************************************************************/
@@ -1124,7 +1185,10 @@ class CV_EXPORTS_W DescriptorMatcher : public Algorithm
 
 
     // see corresponding cv::Algorithm method
-    CV_WRAP inline void write(const Ptr<FileStorage>& fs, const String& name = String()) const { Algorithm::write(fs, name); }
+    CV_WRAP inline void write(FileStorage& fs, const String& name) const { Algorithm::write(fs, name); }
+#if CV_VERSION_MAJOR < 5
+    inline void write(const Ptr<FileStorage>& fs, const String& name) const { CV_Assert(fs); Algorithm::write(*fs, name); }
+#endif
 
 protected:
     /**
@@ -1356,6 +1420,9 @@ CV_EXPORTS_AS(drawMatchesKnn) void drawMatches( InputArray img1, const std::vect
 *   Functions to evaluate the feature detectors and [generic] descriptor extractors      *
 \****************************************************************************************/
 
+//! @addtogroup features2d_main
+//! @{
+
 CV_EXPORTS void evaluateFeatureDetector( const Mat& img1, const Mat& img2, const Mat& H1to2,
                                          std::vector<KeyPoint>* keypoints1, std::vector<KeyPoint>* keypoints2,
                                          float& repeatability, int& correspCount,
@@ -1368,6 +1435,8 @@ CV_EXPORTS void computeRecallPrecisionCurve( const std::vector<std::vector<DMatc
 CV_EXPORTS float getRecall( const std::vector<Point2f>& recallPrecisionCurve, float l_precision );
 CV_EXPORTS int getNearestPoint( const std::vector<Point2f>& recallPrecisionCurve, float l_precision );
 
+//! @}
+
 /****************************************************************************************\
 *                                     Bag of visual words                                *
 \****************************************************************************************/
@@ -1469,8 +1538,8 @@ class CV_EXPORTS_W BOWImgDescriptorExtractor
     @param dmatcher Descriptor matcher that is used to find the nearest word of the trained vocabulary
     for each keypoint descriptor of the image.
      */
-    CV_WRAP BOWImgDescriptorExtractor( const Ptr<DescriptorExtractor>& dextractor,
-                               const Ptr<DescriptorMatcher>& dmatcher );
+    CV_WRAP BOWImgDescriptorExtractor( const Ptr<Feature2D>& dextractor,
+                                       const Ptr<DescriptorMatcher>& dmatcher );
     /** @overload */
     BOWImgDescriptorExtractor( const Ptr<DescriptorMatcher>& dmatcher );
     virtual ~BOWImgDescriptorExtractor();
@@ -1528,8 +1597,6 @@ class CV_EXPORTS_W BOWImgDescriptorExtractor
 
 //! @} features2d_category
 
-//! @} features2d
-
 } /* namespace cv */
 
 #endif
diff --git a/3rdParty/opencv2/features2d/features2d.hpp b/3rdParty/opencv-4.12.0/opencv2/features2d/features2d.hpp
similarity index 100%
rename from 3rdParty/opencv2/features2d/features2d.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/features2d/features2d.hpp
diff --git a/3rdParty/opencv2/features2d/hal/interface.h b/3rdParty/opencv-4.12.0/opencv2/features2d/hal/interface.h
similarity index 100%
rename from 3rdParty/opencv2/features2d/hal/interface.h
rename to 3rdParty/opencv-4.12.0/opencv2/features2d/hal/interface.h
diff --git a/3rdParty/opencv2/flann.hpp b/3rdParty/opencv-4.12.0/opencv2/flann.hpp
similarity index 100%
rename from 3rdParty/opencv2/flann.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/flann.hpp
diff --git a/3rdParty/opencv2/flann/all_indices.h b/3rdParty/opencv-4.12.0/opencv2/flann/all_indices.h
similarity index 100%
rename from 3rdParty/opencv2/flann/all_indices.h
rename to 3rdParty/opencv-4.12.0/opencv2/flann/all_indices.h
diff --git a/3rdParty/opencv2/flann/allocator.h b/3rdParty/opencv-4.12.0/opencv2/flann/allocator.h
similarity index 100%
rename from 3rdParty/opencv2/flann/allocator.h
rename to 3rdParty/opencv-4.12.0/opencv2/flann/allocator.h
diff --git a/3rdParty/opencv2/flann/any.h b/3rdParty/opencv-4.12.0/opencv2/flann/any.h
similarity index 87%
rename from 3rdParty/opencv2/flann/any.h
rename to 3rdParty/opencv-4.12.0/opencv2/flann/any.h
index 4166553a3d..bc7df1039c 100644
--- a/3rdParty/opencv2/flann/any.h
+++ b/3rdParty/opencv-4.12.0/opencv2/flann/any.h
@@ -19,16 +19,39 @@
 #include <ostream>
 #include <typeinfo>
 
+#include "opencv2/core/cvdef.h"
+#include "opencv2/core/utility.hpp"
+
 namespace cvflann
 {
 
 namespace anyimpl
 {
 
-struct bad_any_cast
+struct bad_any_cast : public std::exception
 {
+    bad_any_cast() = default;
+
+    bad_any_cast(const char* src, const char* dst)
+        : message_(cv::format("cvflann::bad_any_cast(from %s to %s)", src, dst)) {}
+
+
+    const char* what() const noexcept override
+    {
+        return message_.c_str();
+    }
+
+private:
+    std::string message_{"cvflann::bad_any_cast"};
 };
 
+#ifndef CV_THROW_IF_TYPE_MISMATCH
+#define CV_THROW_IF_TYPE_MISMATCH(src_type_info, dst_type_info) \
+    if ((src_type_info) != (dst_type_info)) \
+        throw cvflann::anyimpl::bad_any_cast((src_type_info).name(), \
+                                             (dst_type_info).name())
+#endif
+
 struct empty_any
 {
 };
@@ -271,7 +294,7 @@ struct any
     template<typename T>
     T& cast()
     {
-        if (policy->type() != typeid(T)) throw anyimpl::bad_any_cast();
+        CV_THROW_IF_TYPE_MISMATCH(policy->type(), typeid(T));
         T* r = reinterpret_cast<T*>(policy->get_value(&object));
         return *r;
     }
@@ -280,7 +303,7 @@ struct any
     template<typename T>
     const T& cast() const
     {
-        if (policy->type() != typeid(T)) throw anyimpl::bad_any_cast();
+        CV_THROW_IF_TYPE_MISMATCH(policy->type(), typeid(T));
         const T* r = reinterpret_cast<const T*>(policy->get_value(&object));
         return *r;
     }
diff --git a/3rdParty/opencv2/flann/autotuned_index.h b/3rdParty/opencv-4.12.0/opencv2/flann/autotuned_index.h
similarity index 96%
rename from 3rdParty/opencv2/flann/autotuned_index.h
rename to 3rdParty/opencv-4.12.0/opencv2/flann/autotuned_index.h
index 32a0ab0852..1457a90beb 100644
--- a/3rdParty/opencv2/flann/autotuned_index.h
+++ b/3rdParty/opencv-4.12.0/opencv2/flann/autotuned_index.h
@@ -54,7 +54,7 @@ NNIndex<Distance>* create_index_by_type(const Matrix<typename Distance::ElementT
 
 struct AutotunedIndexParams : public IndexParams
 {
-    AutotunedIndexParams(float target_precision = 0.8, float build_weight = 0.01, float memory_weight = 0, float sample_fraction = 0.1)
+    AutotunedIndexParams(float target_precision = 0.8f, float build_weight = 0.01f, float memory_weight = 0.f, float sample_fraction = 0.1f)
     {
         (*this)["algorithm"] = FLANN_INDEX_AUTOTUNED;
         // precision desired (used for autotuning, -1 otherwise)
diff --git a/3rdParty/opencv2/flann/composite_index.h b/3rdParty/opencv-4.12.0/opencv2/flann/composite_index.h
similarity index 95%
rename from 3rdParty/opencv2/flann/composite_index.h
rename to 3rdParty/opencv-4.12.0/opencv2/flann/composite_index.h
index d69eeecca2..6f2d3690e6 100644
--- a/3rdParty/opencv2/flann/composite_index.h
+++ b/3rdParty/opencv-4.12.0/opencv2/flann/composite_index.h
@@ -46,7 +46,7 @@ namespace cvflann
 struct CompositeIndexParams : public IndexParams
 {
     CompositeIndexParams(int trees = 4, int branching = 32, int iterations = 11,
-                         flann_centers_init_t centers_init = FLANN_CENTERS_RANDOM, float cb_index = 0.2 )
+                         flann_centers_init_t centers_init = FLANN_CENTERS_RANDOM, float cb_index = 0.2f )
     {
         (*this)["algorithm"] = FLANN_INDEX_KMEANS;
         // number of randomized trees to use (for kdtree)
@@ -80,7 +80,6 @@ class CompositeIndex : public NNIndex<Distance>
      * @param inputData dataset containing the points to index
      * @param params Index parameters
      * @param d Distance functor
-     * @return
      */
     CompositeIndex(const Matrix<ElementType>& inputData, const IndexParams& params = CompositeIndexParams(),
                    Distance d = Distance()) : index_params_(params)
diff --git a/3rdParty/opencv2/flann/config.h b/3rdParty/opencv-4.12.0/opencv2/flann/config.h
similarity index 100%
rename from 3rdParty/opencv2/flann/config.h
rename to 3rdParty/opencv-4.12.0/opencv2/flann/config.h
diff --git a/3rdParty/opencv2/flann/defines.h b/3rdParty/opencv-4.12.0/opencv2/flann/defines.h
similarity index 100%
rename from 3rdParty/opencv2/flann/defines.h
rename to 3rdParty/opencv-4.12.0/opencv2/flann/defines.h
diff --git a/3rdParty/opencv2/flann/dist.h b/3rdParty/opencv-4.12.0/opencv2/flann/dist.h
similarity index 96%
rename from 3rdParty/opencv2/flann/dist.h
rename to 3rdParty/opencv-4.12.0/opencv2/flann/dist.h
index 3d97f2a7bc..c43745cec6 100644
--- a/3rdParty/opencv2/flann/dist.h
+++ b/3rdParty/opencv-4.12.0/opencv2/flann/dist.h
@@ -1,4 +1,4 @@
-/***********************************************************************
+/***********************************************************************
  * Software License Agreement (BSD License)
  *
  * Copyright 2008-2009  Marius Muja (mariusm@cs.ubc.ca). All rights reserved.
@@ -45,11 +45,11 @@ typedef unsigned __int64 uint64_t;
 
 #include "defines.h"
 
-#if defined _WIN32 && (defined(_M_ARM) || defined(_M_ARM64))
+#if defined _WIN32 && (defined(_M_ARM) || defined(_M_ARM64) || defined(_M_ARM64EC))
 # include <Intrin.h>
 #endif
 
-#if defined(__ARM_NEON__) && !defined(__CUDACC__)
+#if defined(__ARM_NEON) && !defined(__CUDACC__)
 # include "arm_neon.h"
 #endif
 
@@ -559,7 +559,7 @@ struct Hamming
     ResultType operator()(const Iterator1 a, const Iterator2 b, size_t size, ResultType /*worst_dist*/ = -1) const
     {
         ResultType result = 0;
-#if defined(__ARM_NEON__) && !defined(__CUDACC__)
+#if defined(__ARM_NEON) && !defined(__CUDACC__)
         {
             const unsigned char* a2 = reinterpret_cast<const unsigned char*> (a);
             const unsigned char* b2 = reinterpret_cast<const unsigned char*> (b);
@@ -611,7 +611,7 @@ struct Hamming
     {
         (void)b;
         ResultType result = 0;
-#if defined(__ARM_NEON__) && !defined(__CUDACC__)
+#if defined(__ARM_NEON) && !defined(__CUDACC__)
         {
             const unsigned char* a2 = reinterpret_cast<const unsigned char*> (a);
             uint32x4_t bits = vmovq_n_u32(0);
diff --git a/3rdParty/opencv2/flann/dummy.h b/3rdParty/opencv-4.12.0/opencv2/flann/dummy.h
similarity index 100%
rename from 3rdParty/opencv2/flann/dummy.h
rename to 3rdParty/opencv-4.12.0/opencv2/flann/dummy.h
diff --git a/3rdParty/opencv2/flann/dynamic_bitset.h b/3rdParty/opencv-4.12.0/opencv2/flann/dynamic_bitset.h
similarity index 95%
rename from 3rdParty/opencv2/flann/dynamic_bitset.h
rename to 3rdParty/opencv-4.12.0/opencv2/flann/dynamic_bitset.h
index 849f95a4d8..a3f0be6fa8 100644
--- a/3rdParty/opencv2/flann/dynamic_bitset.h
+++ b/3rdParty/opencv-4.12.0/opencv2/flann/dynamic_bitset.h
@@ -97,7 +97,6 @@ class DynamicBitset
     }
 
     /** @brief set one bit to 0
-     * @param index
      */
     void reset(size_t index)
     {
@@ -108,7 +107,6 @@ class DynamicBitset
      * This function is useful when resetting a given set of bits so that the
      * whole bitset ends up being 0: if that's the case, we don't care about setting
      * other bits to 0
-     * @param index
      */
     void reset_block(size_t index)
     {
@@ -116,7 +114,6 @@ class DynamicBitset
     }
 
     /** resize the bitset so that it contains at least sz bits
-     * @param sz
      */
     void resize(size_t sz)
     {
diff --git a/3rdParty/opencv2/flann/flann.hpp b/3rdParty/opencv-4.12.0/opencv2/flann/flann.hpp
similarity index 100%
rename from 3rdParty/opencv2/flann/flann.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/flann/flann.hpp
diff --git a/3rdParty/opencv2/flann/flann_base.hpp b/3rdParty/opencv-4.12.0/opencv2/flann/flann_base.hpp
similarity index 94%
rename from 3rdParty/opencv2/flann/flann_base.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/flann/flann_base.hpp
index 2cd1f2b0e1..a516dfa26e 100644
--- a/3rdParty/opencv2/flann/flann_base.hpp
+++ b/3rdParty/opencv-4.12.0/opencv2/flann/flann_base.hpp
@@ -45,6 +45,21 @@
 
 namespace cvflann
 {
+class FILEScopeGuard {
+
+public:
+    explicit FILEScopeGuard(FILE* file) {
+        file_ = file;
+    };
+
+    ~FILEScopeGuard() {
+        fclose(file_);
+    };
+
+private:
+    FILE* file_;
+};
+
 
 /**
  * Sets the log level used for all flann functions
@@ -69,7 +84,6 @@ struct SavedIndexParams : public IndexParams
     }
 };
 
-
 template<typename Distance>
 NNIndex<Distance>* load_saved_index(const Matrix<typename Distance::ElementType>& dataset, const cv::String& filename, Distance distance)
 {
@@ -79,13 +93,13 @@ NNIndex<Distance>* load_saved_index(const Matrix<typename Distance::ElementType>
     if (fin == NULL) {
         return NULL;
     }
+    FILEScopeGuard fscgd(fin);
+
     IndexHeader header = load_header(fin);
     if (header.data_type != Datatype<ElementType>::type()) {
-        fclose(fin);
         FLANN_THROW(cv::Error::StsError, "Datatype of saved index is different than of the one to be created.");
     }
     if ((size_t(header.rows) != dataset.rows)||(size_t(header.cols) != dataset.cols)) {
-        fclose(fin);
         FLANN_THROW(cv::Error::StsError, "The index saved belongs to a different dataset");
     }
 
@@ -93,7 +107,6 @@ NNIndex<Distance>* load_saved_index(const Matrix<typename Distance::ElementType>
     params["algorithm"] = header.index_type;
     NNIndex<Distance>* nnIndex = create_index_by_type<Distance>(dataset, params, distance);
     nnIndex->loadIndex(fin);
-    fclose(fin);
 
     return nnIndex;
 }
@@ -107,7 +120,7 @@ class Index : public NNIndex<Distance>
     typedef typename Distance::ResultType DistanceType;
 
     Index(const Matrix<ElementType>& features, const IndexParams& params, Distance distance = Distance() )
-        : index_params_(params)
+        :index_params_(params)
     {
         flann_algorithm_t index_type = get_param<flann_algorithm_t>(params,"algorithm");
         loaded_ = false;
diff --git a/3rdParty/opencv2/flann/general.h b/3rdParty/opencv-4.12.0/opencv2/flann/general.h
similarity index 95%
rename from 3rdParty/opencv2/flann/general.h
rename to 3rdParty/opencv-4.12.0/opencv2/flann/general.h
index 2dcaf4d073..eeb07e41f9 100644
--- a/3rdParty/opencv2/flann/general.h
+++ b/3rdParty/opencv-4.12.0/opencv2/flann/general.h
@@ -31,6 +31,8 @@
 #ifndef OPENCV_FLANN_GENERAL_H_
 #define OPENCV_FLANN_GENERAL_H_
 
+#include "opencv2/core/version.hpp"
+
 #if CV_VERSION_MAJOR <= 4
 
 //! @cond IGNORED
diff --git a/3rdParty/opencv2/flann/ground_truth.h b/3rdParty/opencv-4.12.0/opencv2/flann/ground_truth.h
similarity index 100%
rename from 3rdParty/opencv2/flann/ground_truth.h
rename to 3rdParty/opencv-4.12.0/opencv2/flann/ground_truth.h
diff --git a/3rdParty/opencv2/flann/heap.h b/3rdParty/opencv-4.12.0/opencv2/flann/heap.h
similarity index 100%
rename from 3rdParty/opencv2/flann/heap.h
rename to 3rdParty/opencv-4.12.0/opencv2/flann/heap.h
diff --git a/3rdParty/opencv2/flann/hierarchical_clustering_index.h b/3rdParty/opencv-4.12.0/opencv2/flann/hierarchical_clustering_index.h
similarity index 100%
rename from 3rdParty/opencv2/flann/hierarchical_clustering_index.h
rename to 3rdParty/opencv-4.12.0/opencv2/flann/hierarchical_clustering_index.h
diff --git a/3rdParty/opencv2/flann/index_testing.h b/3rdParty/opencv-4.12.0/opencv2/flann/index_testing.h
similarity index 100%
rename from 3rdParty/opencv2/flann/index_testing.h
rename to 3rdParty/opencv-4.12.0/opencv2/flann/index_testing.h
diff --git a/3rdParty/opencv2/flann/kdtree_index.h b/3rdParty/opencv-4.12.0/opencv2/flann/kdtree_index.h
similarity index 100%
rename from 3rdParty/opencv2/flann/kdtree_index.h
rename to 3rdParty/opencv-4.12.0/opencv2/flann/kdtree_index.h
diff --git a/3rdParty/opencv2/flann/kdtree_single_index.h b/3rdParty/opencv-4.12.0/opencv2/flann/kdtree_single_index.h
similarity index 100%
rename from 3rdParty/opencv2/flann/kdtree_single_index.h
rename to 3rdParty/opencv-4.12.0/opencv2/flann/kdtree_single_index.h
diff --git a/3rdParty/opencv2/flann/kmeans_index.h b/3rdParty/opencv-4.12.0/opencv2/flann/kmeans_index.h
similarity index 97%
rename from 3rdParty/opencv2/flann/kmeans_index.h
rename to 3rdParty/opencv-4.12.0/opencv2/flann/kmeans_index.h
index 77aa7c2564..121885ad07 100644
--- a/3rdParty/opencv2/flann/kmeans_index.h
+++ b/3rdParty/opencv-4.12.0/opencv2/flann/kmeans_index.h
@@ -62,7 +62,7 @@ struct KMeansIndexParams : public IndexParams
 {
     KMeansIndexParams(int branching = 32, int iterations = 11,
                       flann_centers_init_t centers_init = FLANN_CENTERS_RANDOM,
-                      float cb_index = 0.2, int trees = 1 )
+                      float cb_index = 0.2f, int trees = 1 )
     {
         (*this)["algorithm"] = FLANN_INDEX_KMEANS;
         // branching factor
diff --git a/3rdParty/opencv2/flann/linear_index.h b/3rdParty/opencv-4.12.0/opencv2/flann/linear_index.h
similarity index 100%
rename from 3rdParty/opencv2/flann/linear_index.h
rename to 3rdParty/opencv-4.12.0/opencv2/flann/linear_index.h
diff --git a/3rdParty/opencv2/flann/logger.h b/3rdParty/opencv-4.12.0/opencv2/flann/logger.h
similarity index 96%
rename from 3rdParty/opencv2/flann/logger.h
rename to 3rdParty/opencv-4.12.0/opencv2/flann/logger.h
index afb62b3f6a..7708dfa2b8 100644
--- a/3rdParty/opencv2/flann/logger.h
+++ b/3rdParty/opencv-4.12.0/opencv2/flann/logger.h
@@ -101,7 +101,6 @@ class Logger
      * Print log message
      * @param level Log level
      * @param fmt Message format
-     * @return
      */
     static int log(int level, const char* fmt, ...)
     {
diff --git a/3rdParty/opencv2/flann/lsh_index.h b/3rdParty/opencv-4.12.0/opencv2/flann/lsh_index.h
similarity index 100%
rename from 3rdParty/opencv2/flann/lsh_index.h
rename to 3rdParty/opencv-4.12.0/opencv2/flann/lsh_index.h
diff --git a/3rdParty/opencv2/flann/lsh_table.h b/3rdParty/opencv-4.12.0/opencv2/flann/lsh_table.h
similarity index 96%
rename from 3rdParty/opencv2/flann/lsh_table.h
rename to 3rdParty/opencv-4.12.0/opencv2/flann/lsh_table.h
index 989c5f98a2..9c72d11d52 100644
--- a/3rdParty/opencv2/flann/lsh_table.h
+++ b/3rdParty/opencv-4.12.0/opencv2/flann/lsh_table.h
@@ -214,8 +214,6 @@ class LshTable
     }
 
     /** Get a bucket given the key
-     * @param key
-     * @return
      */
     inline const Bucket* getBucketFromKey(BucketKey key) const
     {
@@ -253,7 +251,6 @@ class LshTable
     }
 
     /** Get statistics about the table
-     * @return
      */
     LshStats getStats() const;
 
@@ -427,7 +424,7 @@ inline size_t LshTable<unsigned char>::getKey(const unsigned char* feature) cons
         size_t mask_block = mask_[i / sizeof(size_t)];
         while (mask_block) {
             // Get the lowest set bit in the mask block
-            size_t lowest_bit = mask_block & (-(ptrdiff_t)mask_block);
+            size_t lowest_bit = mask_block & ~(mask_block - 1);
             // Add it to the current subsignature if necessary
             subsignature += (feature_block & lowest_bit) ? bit_index : 0;
             // Reset the bit in the mask block
diff --git a/3rdParty/opencv2/flann/matrix.h b/3rdParty/opencv-4.12.0/opencv2/flann/matrix.h
similarity index 94%
rename from 3rdParty/opencv2/flann/matrix.h
rename to 3rdParty/opencv-4.12.0/opencv2/flann/matrix.h
index 82799cedf1..5dc326d63e 100644
--- a/3rdParty/opencv2/flann/matrix.h
+++ b/3rdParty/opencv-4.12.0/opencv2/flann/matrix.h
@@ -35,6 +35,9 @@
 
 #include <stdio.h>
 
+#include "opencv2/core/cvdef.h"
+#include "opencv2/flann/defines.h"
+
 namespace cvflann
 {
 
diff --git a/3rdParty/opencv2/flann/miniflann.hpp b/3rdParty/opencv-4.12.0/opencv2/flann/miniflann.hpp
similarity index 100%
rename from 3rdParty/opencv2/flann/miniflann.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/flann/miniflann.hpp
diff --git a/3rdParty/opencv2/flann/nn_index.h b/3rdParty/opencv-4.12.0/opencv2/flann/nn_index.h
similarity index 100%
rename from 3rdParty/opencv2/flann/nn_index.h
rename to 3rdParty/opencv-4.12.0/opencv2/flann/nn_index.h
diff --git a/3rdParty/opencv2/flann/object_factory.h b/3rdParty/opencv-4.12.0/opencv2/flann/object_factory.h
similarity index 100%
rename from 3rdParty/opencv2/flann/object_factory.h
rename to 3rdParty/opencv-4.12.0/opencv2/flann/object_factory.h
diff --git a/3rdParty/opencv2/flann/params.h b/3rdParty/opencv-4.12.0/opencv2/flann/params.h
similarity index 83%
rename from 3rdParty/opencv2/flann/params.h
rename to 3rdParty/opencv-4.12.0/opencv2/flann/params.h
index f868ddfd87..04aac83a42 100644
--- a/3rdParty/opencv2/flann/params.h
+++ b/3rdParty/opencv-4.12.0/opencv2/flann/params.h
@@ -72,11 +72,16 @@ struct SearchParams : public IndexParams
 
 
 template<typename T>
-T get_param(const IndexParams& params, cv::String name, const T& default_value)
+T get_param(const IndexParams& params, const cv::String& name, const T& default_value)
 {
     IndexParams::const_iterator it = params.find(name);
     if (it != params.end()) {
-        return it->second.cast<T>();
+        try {
+            return it->second.cast<T>();
+        } catch (const std::exception& e) {
+            CV_Error_(cv::Error::StsBadArg,
+                      ("FLANN '%s' param type mismatch: %s", name.c_str(), e.what()));
+        }
     }
     else {
         return default_value;
@@ -84,11 +89,16 @@ T get_param(const IndexParams& params, cv::String name, const T& default_value)
 }
 
 template<typename T>
-T get_param(const IndexParams& params, cv::String name)
+T get_param(const IndexParams& params, const cv::String& name)
 {
     IndexParams::const_iterator it = params.find(name);
     if (it != params.end()) {
-        return it->second.cast<T>();
+        try {
+            return it->second.cast<T>();
+        } catch (const std::exception& e) {
+            CV_Error_(cv::Error::StsBadArg,
+                      ("FLANN '%s' param type mismatch: %s", name.c_str(), e.what()));
+        }
     }
     else {
         FLANN_THROW(cv::Error::StsBadArg, cv::String("Missing parameter '")+name+cv::String("' in the parameters given"));
diff --git a/3rdParty/opencv2/flann/random.h b/3rdParty/opencv-4.12.0/opencv2/flann/random.h
similarity index 95%
rename from 3rdParty/opencv2/flann/random.h
rename to 3rdParty/opencv-4.12.0/opencv2/flann/random.h
index 11ceb7646d..4ad50c43a0 100644
--- a/3rdParty/opencv2/flann/random.h
+++ b/3rdParty/opencv-4.12.0/opencv2/flann/random.h
@@ -106,7 +106,6 @@ class UniqueRandom
     /**
      * Constructor.
      * @param n Size of the interval from which to generate
-     * @return
      */
     UniqueRandom(int n)
     {
diff --git a/3rdParty/opencv2/flann/result_set.h b/3rdParty/opencv-4.12.0/opencv2/flann/result_set.h
similarity index 96%
rename from 3rdParty/opencv2/flann/result_set.h
rename to 3rdParty/opencv-4.12.0/opencv2/flann/result_set.h
index 0ff569923a..08f711c694 100644
--- a/3rdParty/opencv2/flann/result_set.h
+++ b/3rdParty/opencv-4.12.0/opencv2/flann/result_set.h
@@ -40,6 +40,9 @@
 #include <set>
 #include <vector>
 
+#include "opencv2/core/base.hpp"
+#include "opencv2/core/cvdef.h"
+
 namespace cvflann
 {
 
@@ -357,7 +360,6 @@ class UniqueResultSet : public ResultSet<DistanceType>
     }
 
     /** The number of neighbors in the set
-     * @return
      */
     size_t size() const
     {
@@ -366,7 +368,6 @@ class UniqueResultSet : public ResultSet<DistanceType>
 
     /** The distance of the furthest neighbor
      * If we don't have enough neighbors, it returns the max possible value
-     * @return
      */
     inline DistanceType worstDist() const CV_OVERRIDE
     {
@@ -487,7 +488,6 @@ class RadiusUniqueResultSet : public UniqueResultSet<DistanceType>
 
     /** The distance of the furthest neighbor
      * If we don't have enough neighbors, it returns the max possible value
-     * @return
      */
     inline DistanceType worstDist() const CV_OVERRIDE
     {
diff --git a/3rdParty/opencv2/flann/sampling.h b/3rdParty/opencv-4.12.0/opencv2/flann/sampling.h
similarity index 100%
rename from 3rdParty/opencv2/flann/sampling.h
rename to 3rdParty/opencv-4.12.0/opencv2/flann/sampling.h
diff --git a/3rdParty/opencv2/flann/saving.h b/3rdParty/opencv-4.12.0/opencv2/flann/saving.h
similarity index 100%
rename from 3rdParty/opencv2/flann/saving.h
rename to 3rdParty/opencv-4.12.0/opencv2/flann/saving.h
diff --git a/3rdParty/opencv2/flann/simplex_downhill.h b/3rdParty/opencv-4.12.0/opencv2/flann/simplex_downhill.h
similarity index 100%
rename from 3rdParty/opencv2/flann/simplex_downhill.h
rename to 3rdParty/opencv-4.12.0/opencv2/flann/simplex_downhill.h
diff --git a/3rdParty/opencv2/flann/timer.h b/3rdParty/opencv-4.12.0/opencv2/flann/timer.h
similarity index 100%
rename from 3rdParty/opencv2/flann/timer.h
rename to 3rdParty/opencv-4.12.0/opencv2/flann/timer.h
diff --git a/3rdParty/opencv2/gapi.hpp b/3rdParty/opencv-4.12.0/opencv2/gapi.hpp
similarity index 94%
rename from 3rdParty/opencv2/gapi.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/gapi.hpp
index 277f234e92..fa36a92a38 100644
--- a/3rdParty/opencv2/gapi.hpp
+++ b/3rdParty/opencv-4.12.0/opencv2/gapi.hpp
@@ -10,7 +10,7 @@
 
 #include <memory>
 
-/** \defgroup gapi G-API framework
+/** \defgroup gapi_ref G-API framework
 @{
     @defgroup gapi_main_classes G-API Main Classes
     @defgroup gapi_data_objects G-API Data Types
diff --git a/3rdParty/opencv-4.12.0/opencv2/gapi/core.hpp b/3rdParty/opencv-4.12.0/opencv2/gapi/core.hpp
new file mode 100644
index 0000000000..370e4ccf86
--- /dev/null
+++ b/3rdParty/opencv-4.12.0/opencv2/gapi/core.hpp
@@ -0,0 +1,1911 @@
+// This file is part of OpenCV project.
+// It is subject to the license terms in the LICENSE file found in the top-level directory
+// of this distribution and at http://opencv.org/license.html.
+//
+// Copyright (C) 2018-2020 Intel Corporation
+
+
+#ifndef OPENCV_GAPI_CORE_HPP
+#define OPENCV_GAPI_CORE_HPP
+
+#include <math.h>
+#include <utility> // std::tuple
+
+#include <opencv2/imgproc.hpp>
+#include <opencv2/gapi/imgproc.hpp>
+
+#include <opencv2/gapi/gmat.hpp>
+#include <opencv2/gapi/gscalar.hpp>
+#include <opencv2/gapi/gkernel.hpp>
+#include <opencv2/gapi/streaming/format.hpp>
+
+/** \defgroup gapi_core G-API Core functionality
+@{
+    @defgroup gapi_math Graph API: Math operations
+    @defgroup gapi_pixelwise Graph API: Pixelwise operations
+    @defgroup gapi_matrixop Graph API: Operations on matrices
+    @defgroup gapi_transform Graph API: Image and channel composition functions
+@}
+ */
+
+namespace cv { namespace gapi {
+/**
+ * @brief This namespace contains G-API Operation Types for OpenCV
+ * Core module functionality.
+ */
+namespace core {
+    using GResize = cv::gapi::imgproc::GResize;
+    using GResizeP = cv::gapi::imgproc::GResizeP;
+
+    using GMat2 = std::tuple<GMat,GMat>;
+    using GMat3 = std::tuple<GMat,GMat,GMat>; // FIXME: how to avoid this?
+    using GMat4 = std::tuple<GMat,GMat,GMat,GMat>;
+    using GMatScalar  = std::tuple<GMat, GScalar>;
+
+    G_TYPED_KERNEL(GAdd, <GMat(GMat, GMat, int)>, "org.opencv.core.math.add") {
+        static GMatDesc outMeta(GMatDesc a, GMatDesc b, int ddepth) {
+            if (ddepth == -1)
+            {
+                // OpenCV: When the input arrays in add/subtract/multiply/divide
+                // functions have different depths, the output array depth must be
+                // explicitly specified!
+                // See artim_op() @ arithm.cpp
+                GAPI_Assert(a.chan == b.chan);
+                GAPI_Assert(a.depth == b.depth);
+                return a;
+            }
+            return a.withDepth(ddepth);
+        }
+    };
+
+    G_TYPED_KERNEL(GAddC, <GMat(GMat, GScalar, int)>, "org.opencv.core.math.addC") {
+        static GMatDesc outMeta(GMatDesc a, GScalarDesc, int ddepth) {
+            GAPI_Assert(a.chan <= 4);
+            return a.withDepth(ddepth);
+        }
+    };
+
+    G_TYPED_KERNEL(GSub, <GMat(GMat, GMat, int)>, "org.opencv.core.math.sub") {
+        static GMatDesc outMeta(GMatDesc a, GMatDesc b, int ddepth) {
+            if (ddepth == -1)
+            {
+                // This macro should select a larger data depth from a and b
+                // considering the number of channels in the same
+                // FIXME!!! Clarify if it is valid for sub()
+                GAPI_Assert(a.chan == b.chan);
+                ddepth = std::max(a.depth, b.depth);
+            }
+            return a.withDepth(ddepth);
+        }
+    };
+
+    G_TYPED_KERNEL(GSubC, <GMat(GMat, GScalar, int)>, "org.opencv.core.math.subC") {
+        static GMatDesc outMeta(GMatDesc a, GScalarDesc, int ddepth) {
+            return a.withDepth(ddepth);
+        }
+    };
+
+    G_TYPED_KERNEL(GSubRC,<GMat(GScalar, GMat, int)>, "org.opencv.core.math.subRC") {
+        static GMatDesc outMeta(GScalarDesc, GMatDesc b, int ddepth) {
+            return b.withDepth(ddepth);
+        }
+    };
+
+    G_TYPED_KERNEL(GMul, <GMat(GMat, GMat, double, int)>, "org.opencv.core.math.mul") {
+        static GMatDesc outMeta(GMatDesc a, GMatDesc, double, int ddepth) {
+            return a.withDepth(ddepth);
+        }
+    };
+
+    G_TYPED_KERNEL(GMulCOld, <GMat(GMat, double, int)>, "org.opencv.core.math.mulCOld") {
+        static GMatDesc outMeta(GMatDesc a, double, int ddepth) {
+            return a.withDepth(ddepth);
+        }
+    };
+
+    G_TYPED_KERNEL(GMulC, <GMat(GMat, GScalar, int)>, "org.opencv.core.math.mulC") {
+        static GMatDesc outMeta(GMatDesc a, GScalarDesc, int ddepth) {
+            return a.withDepth(ddepth);
+        }
+    };
+
+    G_TYPED_KERNEL(GMulS, <GMat(GMat, GScalar)>, "org.opencv.core.math.muls") {
+        static GMatDesc outMeta(GMatDesc a, GScalarDesc) {
+            return a;
+        }
+    }; // FIXME: Merge with MulC
+
+    G_TYPED_KERNEL(GDiv, <GMat(GMat, GMat, double, int)>, "org.opencv.core.math.div") {
+        static GMatDesc outMeta(GMatDesc a, GMatDesc b, double, int ddepth) {
+            if (ddepth == -1)
+            {
+                GAPI_Assert(a.depth == b.depth);
+                return b;
+            }
+            return a.withDepth(ddepth);
+        }
+    };
+
+    G_TYPED_KERNEL(GDivC, <GMat(GMat, GScalar, double, int)>, "org.opencv.core.math.divC") {
+        static GMatDesc outMeta(GMatDesc a, GScalarDesc, double, int ddepth) {
+            return a.withDepth(ddepth);
+        }
+    };
+
+    G_TYPED_KERNEL(GDivRC, <GMat(GScalar, GMat, double, int)>, "org.opencv.core.math.divRC") {
+        static GMatDesc outMeta(GScalarDesc, GMatDesc b, double, int ddepth) {
+            return b.withDepth(ddepth);
+        }
+    };
+
+    G_TYPED_KERNEL(GMean, <GScalar(GMat)>, "org.opencv.core.math.mean") {
+        static GScalarDesc outMeta(GMatDesc) {
+            return empty_scalar_desc();
+        }
+    };
+
+    G_TYPED_KERNEL_M(GPolarToCart, <GMat2(GMat, GMat, bool)>, "org.opencv.core.math.polarToCart") {
+        static std::tuple<GMatDesc, GMatDesc> outMeta(GMatDesc, GMatDesc a, bool) {
+            return std::make_tuple(a, a);
+        }
+    };
+
+    G_TYPED_KERNEL_M(GCartToPolar, <GMat2(GMat, GMat, bool)>, "org.opencv.core.math.cartToPolar") {
+        static std::tuple<GMatDesc, GMatDesc> outMeta(GMatDesc x, GMatDesc, bool) {
+            return std::make_tuple(x, x);
+        }
+    };
+
+    G_TYPED_KERNEL(GPhase, <GMat(GMat, GMat, bool)>, "org.opencv.core.math.phase") {
+        static GMatDesc outMeta(const GMatDesc &inx, const GMatDesc &, bool) {
+            return inx;
+        }
+    };
+
+    G_TYPED_KERNEL(GMask, <GMat(GMat,GMat)>, "org.opencv.core.pixelwise.mask") {
+        static GMatDesc outMeta(GMatDesc in, GMatDesc) {
+            return in;
+        }
+    };
+
+    G_TYPED_KERNEL(GCmpGT, <GMat(GMat, GMat)>, "org.opencv.core.pixelwise.compare.cmpGT") {
+        static GMatDesc outMeta(GMatDesc a, GMatDesc) {
+            return a.withDepth(CV_8U);
+        }
+    };
+
+    G_TYPED_KERNEL(GCmpGE, <GMat(GMat, GMat)>, "org.opencv.core.pixelwise.compare.cmpGE") {
+        static GMatDesc outMeta(GMatDesc a, GMatDesc) {
+            return a.withDepth(CV_8U);
+        }
+    };
+
+    G_TYPED_KERNEL(GCmpLE, <GMat(GMat, GMat)>, "org.opencv.core.pixelwise.compare.cmpLE") {
+        static GMatDesc outMeta(GMatDesc a, GMatDesc) {
+            return a.withDepth(CV_8U);
+        }
+    };
+
+    G_TYPED_KERNEL(GCmpLT, <GMat(GMat, GMat)>, "org.opencv.core.pixelwise.compare.cmpLT") {
+        static GMatDesc outMeta(GMatDesc a, GMatDesc) {
+            return a.withDepth(CV_8U);
+        }
+    };
+
+    G_TYPED_KERNEL(GCmpEQ, <GMat(GMat, GMat)>, "org.opencv.core.pixelwise.compare.cmpEQ") {
+        static GMatDesc outMeta(GMatDesc a, GMatDesc) {
+            return a.withDepth(CV_8U);
+        }
+    };
+
+    G_TYPED_KERNEL(GCmpNE, <GMat(GMat, GMat)>, "org.opencv.core.pixelwise.compare.cmpNE") {
+        static GMatDesc outMeta(GMatDesc a, GMatDesc) {
+            return a.withDepth(CV_8U);
+        }
+    };
+
+    G_TYPED_KERNEL(GCmpGTScalar, <GMat(GMat, GScalar)>, "org.opencv.core.pixelwise.compare.cmpGTScalar") {
+        static GMatDesc outMeta(GMatDesc a, GScalarDesc) {
+            return a.withDepth(CV_8U);
+        }
+    };
+
+    G_TYPED_KERNEL(GCmpGEScalar, <GMat(GMat, GScalar)>, "org.opencv.core.pixelwise.compare.cmpGEScalar") {
+        static GMatDesc outMeta(GMatDesc a, GScalarDesc) {
+            return a.withDepth(CV_8U);
+        }
+    };
+
+    G_TYPED_KERNEL(GCmpLEScalar, <GMat(GMat, GScalar)>, "org.opencv.core.pixelwise.compare.cmpLEScalar") {
+        static GMatDesc outMeta(GMatDesc a, GScalarDesc) {
+            return a.withDepth(CV_8U);
+        }
+    };
+
+    G_TYPED_KERNEL(GCmpLTScalar, <GMat(GMat, GScalar)>, "org.opencv.core.pixelwise.compare.cmpLTScalar") {
+    static GMatDesc outMeta(GMatDesc a, GScalarDesc) {
+            return a.withDepth(CV_8U);
+        }
+    };
+
+    G_TYPED_KERNEL(GCmpEQScalar, <GMat(GMat, GScalar)>, "org.opencv.core.pixelwise.compare.cmpEQScalar") {
+        static GMatDesc outMeta(GMatDesc a, GScalarDesc) {
+            return a.withDepth(CV_8U);
+        }
+    };
+
+    G_TYPED_KERNEL(GCmpNEScalar, <GMat(GMat, GScalar)>, "org.opencv.core.pixelwise.compare.cmpNEScalar") {
+        static GMatDesc outMeta(GMatDesc a, GScalarDesc) {
+            return a.withDepth(CV_8U);
+        }
+    };
+
+    G_TYPED_KERNEL(GAnd, <GMat(GMat, GMat)>, "org.opencv.core.pixelwise.bitwise_and") {
+        static GMatDesc outMeta(GMatDesc a, GMatDesc) {
+            return a;
+        }
+    };
+
+    G_TYPED_KERNEL(GAndS, <GMat(GMat, GScalar)>, "org.opencv.core.pixelwise.bitwise_andS") {
+        static GMatDesc outMeta(GMatDesc a, GScalarDesc) {
+            return a;
+        }
+    };
+
+    G_TYPED_KERNEL(GOr, <GMat(GMat, GMat)>, "org.opencv.core.pixelwise.bitwise_or") {
+        static GMatDesc outMeta(GMatDesc a, GMatDesc) {
+            return a;
+        }
+    };
+
+    G_TYPED_KERNEL(GOrS, <GMat(GMat, GScalar)>, "org.opencv.core.pixelwise.bitwise_orS") {
+        static GMatDesc outMeta(GMatDesc a, GScalarDesc) {
+            return a;
+        }
+    };
+
+    G_TYPED_KERNEL(GXor, <GMat(GMat, GMat)>, "org.opencv.core.pixelwise.bitwise_xor") {
+        static GMatDesc outMeta(GMatDesc a, GMatDesc) {
+            return a;
+        }
+    };
+
+    G_TYPED_KERNEL(GXorS, <GMat(GMat, GScalar)>, "org.opencv.core.pixelwise.bitwise_xorS") {
+        static GMatDesc outMeta(GMatDesc a, GScalarDesc) {
+            return a;
+        }
+    };
+
+    G_TYPED_KERNEL(GNot, <GMat(GMat)>, "org.opencv.core.pixelwise.bitwise_not") {
+        static GMatDesc outMeta(GMatDesc a) {
+            return a;
+        }
+    };
+
+    G_TYPED_KERNEL(GSelect, <GMat(GMat, GMat, GMat)>, "org.opencv.core.pixelwise.select") {
+        static GMatDesc outMeta(GMatDesc a, GMatDesc, GMatDesc) {
+            return a;
+        }
+    };
+
+    G_TYPED_KERNEL(GMin, <GMat(GMat, GMat)>, "org.opencv.core.matrixop.min") {
+        static GMatDesc outMeta(GMatDesc a, GMatDesc) {
+            return a;
+        }
+    };
+
+    G_TYPED_KERNEL(GMax, <GMat(GMat, GMat)>, "org.opencv.core.matrixop.max") {
+        static GMatDesc outMeta(GMatDesc a, GMatDesc) {
+            return a;
+        }
+    };
+
+    G_TYPED_KERNEL(GAbsDiff, <GMat(GMat, GMat)>, "org.opencv.core.matrixop.absdiff") {
+        static GMatDesc outMeta(GMatDesc a, GMatDesc) {
+            return a;
+        }
+    };
+
+    G_TYPED_KERNEL(GAbsDiffC, <GMat(GMat,GScalar)>, "org.opencv.core.matrixop.absdiffC") {
+        static GMatDesc outMeta(const GMatDesc& a, const GScalarDesc&) {
+            return a;
+        }
+    };
+
+    G_TYPED_KERNEL(GSum, <GScalar(GMat)>, "org.opencv.core.matrixop.sum") {
+        static GScalarDesc outMeta(GMatDesc) {
+            return empty_scalar_desc();
+        }
+    };
+
+    G_TYPED_KERNEL(GCountNonZero, <GOpaque<int>(GMat)>, "org.opencv.core.matrixop.countNonZero") {
+        static GOpaqueDesc outMeta(GMatDesc in) {
+            GAPI_Assert(in.chan == 1);
+            return empty_gopaque_desc();
+        }
+    };
+
+    G_TYPED_KERNEL(GAddW, <GMat(GMat, double, GMat, double, double, int)>, "org.opencv.core.matrixop.addweighted") {
+        static GMatDesc outMeta(GMatDesc a, double, GMatDesc b, double, double, int ddepth) {
+            if (ddepth == -1)
+            {
+                // OpenCV: When the input arrays in add/subtract/multiply/divide
+                // functions have different depths, the output array depth must be
+                // explicitly specified!
+                // See artim_op() @ arithm.cpp
+                GAPI_Assert(a.chan == b.chan);
+                GAPI_Assert(a.depth == b.depth);
+                return a;
+            }
+            return a.withDepth(ddepth);
+        }
+    };
+
+    G_TYPED_KERNEL(GNormL1, <GScalar(GMat)>, "org.opencv.core.matrixop.norml1") {
+        static GScalarDesc outMeta(GMatDesc) {
+            return empty_scalar_desc();
+        }
+    };
+
+    G_TYPED_KERNEL(GNormL2, <GScalar(GMat)>, "org.opencv.core.matrixop.norml2") {
+        static GScalarDesc outMeta(GMatDesc) {
+            return empty_scalar_desc();
+        }
+    };
+
+    G_TYPED_KERNEL(GNormInf, <GScalar(GMat)>, "org.opencv.core.matrixop.norminf") {
+        static GScalarDesc outMeta(GMatDesc) {
+            return empty_scalar_desc();
+        }
+    };
+
+    G_TYPED_KERNEL_M(GIntegral, <GMat2(GMat, int, int)>, "org.opencv.core.matrixop.integral") {
+        static std::tuple<GMatDesc, GMatDesc> outMeta(GMatDesc in, int sd, int sqd) {
+            return std::make_tuple(in.withSizeDelta(1,1).withDepth(sd),
+                                   in.withSizeDelta(1,1).withDepth(sqd));
+        }
+    };
+
+    G_TYPED_KERNEL(GThreshold, <GMat(GMat, GScalar, GScalar, int)>, "org.opencv.core.matrixop.threshold") {
+        static GMatDesc outMeta(GMatDesc in, GScalarDesc, GScalarDesc, int) {
+            return in;
+        }
+    };
+
+
+    G_TYPED_KERNEL_M(GThresholdOT, <GMatScalar(GMat, GScalar, int)>, "org.opencv.core.matrixop.thresholdOT") {
+        static std::tuple<GMatDesc,GScalarDesc> outMeta(GMatDesc in, GScalarDesc, int) {
+            return std::make_tuple(in, empty_scalar_desc());
+        }
+    };
+
+    G_TYPED_KERNEL(GInRange, <GMat(GMat, GScalar, GScalar)>, "org.opencv.core.matrixop.inrange") {
+        static GMatDesc outMeta(GMatDesc in, GScalarDesc, GScalarDesc) {
+            return in.withType(CV_8U, 1);
+        }
+    };
+
+    G_TYPED_KERNEL_M(GSplit3, <GMat3(GMat)>, "org.opencv.core.transform.split3") {
+        static std::tuple<GMatDesc, GMatDesc, GMatDesc> outMeta(GMatDesc in) {
+            const auto out_depth = in.depth;
+            const auto out_desc  = in.withType(out_depth, 1);
+            return std::make_tuple(out_desc, out_desc, out_desc);
+        }
+    };
+
+    G_TYPED_KERNEL_M(GSplit4, <GMat4(GMat)>,"org.opencv.core.transform.split4") {
+        static std::tuple<GMatDesc, GMatDesc, GMatDesc, GMatDesc> outMeta(GMatDesc in) {
+            const auto out_depth = in.depth;
+            const auto out_desc = in.withType(out_depth, 1);
+            return std::make_tuple(out_desc, out_desc, out_desc, out_desc);
+        }
+    };
+
+    G_TYPED_KERNEL(GMerge3, <GMat(GMat,GMat,GMat)>, "org.opencv.core.transform.merge3") {
+        static GMatDesc outMeta(GMatDesc in, GMatDesc, GMatDesc) {
+            // Preserve depth and add channel component
+            return in.withType(in.depth, 3);
+        }
+    };
+
+    G_TYPED_KERNEL(GMerge4, <GMat(GMat,GMat,GMat,GMat)>, "org.opencv.core.transform.merge4") {
+        static GMatDesc outMeta(GMatDesc in, GMatDesc, GMatDesc, GMatDesc) {
+            // Preserve depth and add channel component
+            return in.withType(in.depth, 4);
+        }
+    };
+
+    G_TYPED_KERNEL(GRemap, <GMat(GMat, Mat, Mat, int, int, Scalar)>, "org.opencv.core.transform.remap") {
+        static GMatDesc outMeta(GMatDesc in, Mat m1, Mat, int, int, Scalar) {
+            return in.withSize(m1.size());
+        }
+    };
+
+    G_TYPED_KERNEL(GFlip, <GMat(GMat, int)>, "org.opencv.core.transform.flip") {
+        static GMatDesc outMeta(GMatDesc in, int) {
+            return in;
+        }
+    };
+
+    // TODO: eliminate the need in this kernel (streaming)
+    G_TYPED_KERNEL(GCrop, <GMat(GMat, Rect)>, "org.opencv.core.transform.crop") {
+        static GMatDesc outMeta(GMatDesc in, Rect rc) {
+            return in.withSize(Size(rc.width, rc.height));
+        }
+    };
+
+    G_TYPED_KERNEL(GConcatHor, <GMat(GMat, GMat)>, "org.opencv.imgproc.transform.concatHor") {
+        static GMatDesc outMeta(GMatDesc l, GMatDesc r) {
+            return l.withSizeDelta(+r.size.width, 0);
+        }
+    };
+
+    G_TYPED_KERNEL(GConcatVert, <GMat(GMat, GMat)>, "org.opencv.imgproc.transform.concatVert") {
+        static GMatDesc outMeta(GMatDesc t, GMatDesc b) {
+            return t.withSizeDelta(0, +b.size.height);
+        }
+    };
+
+    G_TYPED_KERNEL(GLUT, <GMat(GMat, Mat)>, "org.opencv.core.transform.LUT") {
+        static GMatDesc outMeta(GMatDesc in, Mat) {
+            return in;
+        }
+    };
+
+    G_TYPED_KERNEL(GConvertTo, <GMat(GMat, int, double, double)>, "org.opencv.core.transform.convertTo") {
+        static GMatDesc outMeta(GMatDesc in, int rdepth, double, double) {
+            return rdepth < 0 ? in : in.withDepth(rdepth);
+        }
+    };
+
+    G_TYPED_KERNEL(GSqrt, <GMat(GMat)>, "org.opencv.core.math.sqrt") {
+        static GMatDesc outMeta(GMatDesc in) {
+            return in;
+        }
+    };
+
+    G_TYPED_KERNEL(GNormalize, <GMat(GMat, double, double, int, int)>, "org.opencv.core.normalize") {
+        static GMatDesc outMeta(GMatDesc in, double, double, int, int ddepth) {
+            // unlike opencv doesn't have a mask as a parameter
+            return (ddepth < 0 ? in : in.withDepth(ddepth));
+        }
+    };
+
+    G_TYPED_KERNEL(GWarpPerspective, <GMat(GMat, const Mat&, Size, int, int, const cv::Scalar&)>, "org.opencv.core.warpPerspective") {
+        static GMatDesc outMeta(GMatDesc in, const Mat&, Size dsize, int, int borderMode, const cv::Scalar&) {
+            GAPI_Assert((borderMode == cv::BORDER_CONSTANT || borderMode == cv::BORDER_REPLICATE) &&
+                        "cv::gapi::warpPerspective supports only cv::BORDER_CONSTANT and cv::BORDER_REPLICATE border modes");
+            return in.withType(in.depth, in.chan).withSize(dsize);
+        }
+    };
+
+    G_TYPED_KERNEL(GWarpAffine, <GMat(GMat, const Mat&, Size, int, int, const cv::Scalar&)>, "org.opencv.core.warpAffine") {
+        static GMatDesc outMeta(GMatDesc in, const Mat&, Size dsize, int, int border_mode, const cv::Scalar&) {
+            GAPI_Assert(border_mode != cv::BORDER_TRANSPARENT &&
+                        "cv::BORDER_TRANSPARENT mode is not supported in cv::gapi::warpAffine");
+            return in.withType(in.depth, in.chan).withSize(dsize);
+        }
+    };
+
+    G_TYPED_KERNEL(
+        GKMeansND,
+        <std::tuple<GOpaque<double>,GMat,GMat>(GMat,int,GMat,TermCriteria,int,KmeansFlags)>,
+        "org.opencv.core.kmeansND") {
+
+        static std::tuple<GOpaqueDesc,GMatDesc,GMatDesc>
+        outMeta(const GMatDesc& in, int K, const GMatDesc& bestLabels, const TermCriteria&, int,
+                KmeansFlags flags) {
+            GAPI_Assert(in.depth == CV_32F);
+            std::vector<int> amount_n_dim = detail::checkVector(in);
+            int amount = amount_n_dim[0], dim = amount_n_dim[1];
+            if (amount == -1)   // Mat with height != 1, width != 1, channels != 1 given
+            {                   // which means that kmeans will consider the following:
+                amount = in.size.height;
+                dim    = in.size.width * in.chan;
+            }
+            // kmeans sets these labels' sizes when no bestLabels given:
+            GMatDesc out_labels(CV_32S, 1, Size{1, amount});
+            // kmeans always sets these centers' sizes:
+            GMatDesc centers   (CV_32F, 1, Size{dim, K});
+            if (flags & KMEANS_USE_INITIAL_LABELS)
+            {
+                GAPI_Assert(bestLabels.depth == CV_32S);
+                int labels_amount = detail::checkVector(bestLabels, 1u);
+                GAPI_Assert(labels_amount == amount);
+                out_labels = bestLabels;  // kmeans preserves bestLabels' sizes if given
+            }
+            return std::make_tuple(empty_gopaque_desc(), out_labels, centers);
+        }
+    };
+
+    G_TYPED_KERNEL(
+        GKMeansNDNoInit,
+        <std::tuple<GOpaque<double>,GMat,GMat>(GMat,int,TermCriteria,int,KmeansFlags)>,
+        "org.opencv.core.kmeansNDNoInit") {
+
+        static std::tuple<GOpaqueDesc,GMatDesc,GMatDesc>
+        outMeta(const GMatDesc& in, int K, const TermCriteria&, int, KmeansFlags flags) {
+            GAPI_Assert( !(flags & KMEANS_USE_INITIAL_LABELS) );
+            GAPI_Assert(in.depth == CV_32F);
+            std::vector<int> amount_n_dim = detail::checkVector(in);
+            int amount = amount_n_dim[0], dim = amount_n_dim[1];
+            if (amount == -1) // Mat with height != 1, width != 1, channels != 1 given
+            {                   // which means that kmeans will consider the following:
+                amount = in.size.height;
+                dim    = in.size.width * in.chan;
+            }
+            GMatDesc out_labels(CV_32S, 1, Size{1, amount});
+            GMatDesc centers   (CV_32F, 1, Size{dim, K});
+            return std::make_tuple(empty_gopaque_desc(), out_labels, centers);
+        }
+    };
+
+    G_TYPED_KERNEL(GKMeans2D, <std::tuple<GOpaque<double>,GArray<int>,GArray<Point2f>>
+                               (GArray<Point2f>,int,GArray<int>,TermCriteria,int,KmeansFlags)>,
+                   "org.opencv.core.kmeans2D") {
+        static std::tuple<GOpaqueDesc,GArrayDesc,GArrayDesc>
+        outMeta(const GArrayDesc&,int,const GArrayDesc&,const TermCriteria&,int,KmeansFlags) {
+            return std::make_tuple(empty_gopaque_desc(), empty_array_desc(), empty_array_desc());
+        }
+    };
+
+    G_TYPED_KERNEL(GKMeans3D, <std::tuple<GOpaque<double>,GArray<int>,GArray<Point3f>>
+                               (GArray<Point3f>,int,GArray<int>,TermCriteria,int,KmeansFlags)>,
+                   "org.opencv.core.kmeans3D") {
+        static std::tuple<GOpaqueDesc,GArrayDesc,GArrayDesc>
+        outMeta(const GArrayDesc&,int,const GArrayDesc&,const TermCriteria&,int,KmeansFlags) {
+            return std::make_tuple(empty_gopaque_desc(), empty_array_desc(), empty_array_desc());
+        }
+    };
+
+    G_TYPED_KERNEL(GTranspose, <GMat(GMat)>, "org.opencv.core.transpose") {
+        static GMatDesc outMeta(GMatDesc in) {
+            return in.withSize({in.size.height, in.size.width});
+        }
+    };
+} // namespace core
+
+namespace streaming {
+
+// Operations for Streaming (declared in this header for convenience)
+G_TYPED_KERNEL(GSize, <GOpaque<Size>(GMat)>, "org.opencv.streaming.size") {
+    static GOpaqueDesc outMeta(const GMatDesc&) {
+        return empty_gopaque_desc();
+    }
+};
+
+G_TYPED_KERNEL(GSizeR, <GOpaque<Size>(GOpaque<Rect>)>, "org.opencv.streaming.sizeR") {
+    static GOpaqueDesc outMeta(const GOpaqueDesc&) {
+        return empty_gopaque_desc();
+    }
+};
+
+G_TYPED_KERNEL(GSizeMF, <GOpaque<Size>(GFrame)>, "org.opencv.streaming.sizeMF") {
+    static GOpaqueDesc outMeta(const GFrameDesc&) {
+        return empty_gopaque_desc();
+    }
+};
+} // namespace streaming
+
+//! @addtogroup gapi_math
+//! @{
+
+/** @brief Calculates the per-element sum of two matrices.
+
+The function add calculates sum of two matrices of the same size and the same number of channels:
+\f[\texttt{dst}(I) =  \texttt{saturate} ( \texttt{src1}(I) +  \texttt{src2}(I)) \quad \texttt{if mask}(I) \ne0\f]
+
+The function can be replaced with matrix expressions:
+    \f[\texttt{dst} =  \texttt{src1} + \texttt{src2}\f]
+
+The input matrices and the output matrix can all have the same or different depths. For example, you
+can add a 16-bit unsigned matrix to a 8-bit signed matrix and store the sum as a 32-bit
+floating-point matrix. Depth of the output matrix is determined by the ddepth parameter.
+If src1.depth() == src2.depth(), ddepth can be set to the default -1. In this case, the output matrix will have
+the same depth as the input matrices.
+
+Supported matrix data types are @ref CV_8UC1, @ref CV_8UC3, @ref CV_16UC1, @ref CV_16SC1, @ref CV_32FC1.
+
+@note Function textual ID is "org.opencv.core.math.add"
+@param src1 first input matrix.
+@param src2 second input matrix.
+@param ddepth optional depth of the output matrix.
+@sa sub, addWeighted
+*/
+GAPI_EXPORTS_W GMat add(const GMat& src1, const GMat& src2, int ddepth = -1);
+
+/** @brief Calculates the per-element sum of matrix and given scalar.
+
+The function addC adds a given scalar value to each element of given matrix.
+The function can be replaced with matrix expressions:
+
+    \f[\texttt{dst} =  \texttt{src1} + \texttt{c}\f]
+
+Depth of the output matrix is determined by the ddepth parameter.
+If ddepth is set to default -1, the depth of output matrix will be the same as the depth of input matrix.
+The matrices can be single or multi channel. Output matrix must have the same size and number of channels as the input matrix.
+
+Supported matrix data types are @ref CV_8UC1, @ref CV_8UC3, @ref CV_16UC1, @ref CV_16SC1, @ref CV_32FC1.
+
+@note Function textual ID is "org.opencv.core.math.addC"
+@param src1 first input matrix.
+@param c scalar value to be added.
+@param ddepth optional depth of the output matrix.
+@sa sub, addWeighted
+*/
+GAPI_EXPORTS_W GMat addC(const GMat& src1, const GScalar& c, int ddepth = -1);
+//! @overload
+GAPI_EXPORTS_W GMat addC(const GScalar& c, const GMat& src1, int ddepth = -1);
+
+/** @brief Calculates the per-element difference between two matrices.
+
+The function sub calculates difference between two matrices, when both matrices have the same size and the same number of
+channels:
+    \f[\texttt{dst}(I) =   \texttt{src1}(I) -  \texttt{src2}(I)\f]
+
+The function can be replaced with matrix expressions:
+\f[\texttt{dst} =   \texttt{src1} -  \texttt{src2}\f]
+
+The input matrices and the output matrix can all have the same or different depths. For example, you
+can subtract two 8-bit unsigned matrices store the result as a 16-bit signed matrix.
+Depth of the output matrix is determined by the ddepth parameter.
+If src1.depth() == src2.depth(), ddepth can be set to the default -1. In this case, the output matrix will have
+the same depth as the input matrices. The matrices can be single or multi channel.
+
+Supported matrix data types are @ref CV_8UC1, @ref CV_8UC3, @ref CV_16UC1, @ref CV_16SC1, @ref CV_32FC1.
+
+@note Function textual ID is "org.opencv.core.math.sub"
+@param src1 first input matrix.
+@param src2 second input matrix.
+@param ddepth optional depth of the output matrix.
+@sa  add, addC
+  */
+GAPI_EXPORTS_W GMat sub(const GMat& src1, const GMat& src2, int ddepth = -1);
+
+/** @brief Calculates the per-element difference between matrix and given scalar.
+
+The function can be replaced with matrix expressions:
+    \f[\texttt{dst} =  \texttt{src} - \texttt{c}\f]
+
+Depth of the output matrix is determined by the ddepth parameter.
+If ddepth is set to default -1, the depth of output matrix will be the same as the depth of input matrix.
+The matrices can be single or multi channel. Output matrix must have the same size as src.
+
+Supported matrix data types are @ref CV_8UC1, @ref CV_8UC3, @ref CV_16UC1, @ref CV_16SC1, @ref CV_32FC1.
+
+@note Function textual ID is "org.opencv.core.math.subC"
+@param src first input matrix.
+@param c scalar value to subtracted.
+@param ddepth optional depth of the output matrix.
+@sa  add, addC, subRC
+  */
+GAPI_EXPORTS_W GMat subC(const GMat& src, const GScalar& c, int ddepth = -1);
+
+/** @brief Calculates the per-element difference between given scalar and the matrix.
+
+The function can be replaced with matrix expressions:
+    \f[\texttt{dst} =  \texttt{c} - \texttt{src}\f]
+
+Depth of the output matrix is determined by the ddepth parameter.
+If ddepth is set to default -1, the depth of output matrix will be the same as the depth of input matrix.
+The matrices can be single or multi channel. Output matrix must have the same size as src.
+
+Supported matrix data types are @ref CV_8UC1, @ref CV_8UC3, @ref CV_16UC1, @ref CV_16SC1, @ref CV_32FC1.
+
+@note Function textual ID is "org.opencv.core.math.subRC"
+@param c scalar value to subtract from.
+@param src input matrix to be subtracted.
+@param ddepth optional depth of the output matrix.
+@sa  add, addC, subC
+  */
+GAPI_EXPORTS_W GMat subRC(const GScalar& c, const GMat& src, int ddepth = -1);
+
+/** @brief Calculates the per-element scaled product of two matrices.
+
+The function mul calculates the per-element product of two matrices:
+
+\f[\texttt{dst} (I)= \texttt{saturate} ( \texttt{scale} \cdot \texttt{src1} (I)  \cdot \texttt{src2} (I))\f]
+
+If src1.depth() == src2.depth(), ddepth can be set to the default -1. In this case, the output matrix will have
+the same depth as the input matrices. The matrices can be single or multi channel.
+Output matrix must have the same size as input matrices.
+
+Supported matrix data types are @ref CV_8UC1, @ref CV_8UC3, @ref CV_16UC1, @ref CV_16SC1, @ref CV_32FC1.
+
+@note Function textual ID is "org.opencv.core.math.mul"
+@param src1 first input matrix.
+@param src2 second input matrix of the same size and the same depth as src1.
+@param scale optional scale factor.
+@param ddepth optional depth of the output matrix.
+@sa add, sub, div, addWeighted
+*/
+GAPI_EXPORTS_W GMat mul(const GMat& src1, const GMat& src2, double scale = 1.0, int ddepth = -1);
+
+/** @brief Multiplies matrix by scalar.
+
+The function mulC multiplies each element of matrix src by given scalar value:
+
+\f[\texttt{dst} (I)= \texttt{saturate} (  \texttt{src1} (I)  \cdot \texttt{multiplier} )\f]
+
+The matrices can be single or multi channel. Output matrix must have the same size as src.
+
+Supported matrix data types are @ref CV_8UC1, @ref CV_8UC3, @ref CV_16UC1, @ref CV_16SC1, @ref CV_32FC1.
+
+@note Function textual ID is "org.opencv.core.math.mulC"
+@param src input matrix.
+@param multiplier factor to be multiplied.
+@param ddepth optional depth of the output matrix. If -1, the depth of output matrix will be the same as input matrix depth.
+@sa add, sub, div, addWeighted
+*/
+GAPI_EXPORTS_W GMat mulC(const GMat& src, double multiplier, int ddepth = -1);
+//! @overload
+GAPI_EXPORTS_W GMat mulC(const GMat& src, const GScalar& multiplier, int ddepth = -1);   // FIXME: merge with mulc
+//! @overload
+GAPI_EXPORTS_W GMat mulC(const GScalar& multiplier, const GMat& src, int ddepth = -1);   // FIXME: merge with mulc
+
+/** @brief Performs per-element division of two matrices.
+
+The function divides one matrix by another:
+\f[\texttt{dst(I) = saturate(src1(I)*scale/src2(I))}\f]
+
+For integer types when src2(I) is zero, dst(I) will also be zero.
+Floating point case returns Inf/NaN (according to IEEE).
+
+Different channels of
+multi-channel matrices are processed independently.
+The matrices can be single or multi channel. Output matrix must have the same size and depth as src.
+
+Supported matrix data types are @ref CV_8UC1, @ref CV_8UC3, @ref CV_16UC1, @ref CV_16SC1, @ref CV_32FC1.
+
+@note Function textual ID is "org.opencv.core.math.div"
+@param src1 first input matrix.
+@param src2 second input matrix of the same size and depth as src1.
+@param scale scalar factor.
+@param ddepth optional depth of the output matrix; you can only pass -1 when src1.depth() == src2.depth().
+@sa  mul, add, sub
+*/
+GAPI_EXPORTS_W GMat div(const GMat& src1, const GMat& src2, double scale, int ddepth = -1);
+
+/** @brief Divides matrix by scalar.
+
+The function divC divides each element of matrix src by given scalar value:
+
+\f[\texttt{dst(I) = saturate(src(I)*scale/divisor)}\f]
+
+When divisor is zero, dst(I) will also be zero. Different channels of
+multi-channel matrices are processed independently.
+The matrices can be single or multi channel. Output matrix must have the same size and depth as src.
+
+Supported matrix data types are @ref CV_8UC1, @ref CV_8UC3, @ref CV_16UC1, @ref CV_16SC1, @ref CV_32FC1.
+
+@note Function textual ID is "org.opencv.core.math.divC"
+@param src input matrix.
+@param divisor number to be divided by.
+@param ddepth optional depth of the output matrix. If -1, the depth of output matrix will be the same as input matrix depth.
+@param scale scale factor.
+@sa add, sub, div, addWeighted
+*/
+GAPI_EXPORTS_W GMat divC(const GMat& src, const GScalar& divisor, double scale, int ddepth = -1);
+
+/** @brief Divides scalar by matrix.
+
+The function divRC divides given scalar by each element of matrix src and keep the division result in new matrix of the same size and type as src:
+
+\f[\texttt{dst(I) = saturate(divident*scale/src(I))}\f]
+
+When src(I) is zero, dst(I) will also be zero. Different channels of
+multi-channel matrices are processed independently.
+The matrices can be single or multi channel. Output matrix must have the same size and depth as src.
+
+Supported matrix data types are @ref CV_8UC1, @ref CV_8UC3, @ref CV_16UC1, @ref CV_16SC1, @ref CV_32FC1.
+
+@note Function textual ID is "org.opencv.core.math.divRC"
+@param src input matrix.
+@param divident number to be divided.
+@param ddepth optional depth of the output matrix. If -1, the depth of output matrix will be the same as input matrix depth.
+@param scale scale factor
+@sa add, sub, div, addWeighted
+*/
+GAPI_EXPORTS_W GMat divRC(const GScalar& divident, const GMat& src, double scale, int ddepth = -1);
+
+/** @brief Applies a mask to a matrix.
+
+The function mask set value from given matrix if the corresponding pixel value in mask matrix set to true,
+and set the matrix value to 0 otherwise.
+
+Supported src matrix data types are @ref CV_8UC1, @ref CV_16SC1, @ref CV_16UC1. Supported mask data type is @ref CV_8UC1.
+
+@note Function textual ID is "org.opencv.core.math.mask"
+@param src input matrix.
+@param mask input mask matrix.
+*/
+GAPI_EXPORTS_W GMat mask(const GMat& src, const GMat& mask);
+
+/** @brief Calculates an average (mean) of matrix elements.
+
+The function mean calculates the mean value M of matrix elements,
+independently for each channel, and return it.
+
+Supported matrix data types are @ref CV_8UC1, @ref CV_8UC3, @ref CV_16UC1, @ref CV_16SC1, @ref CV_32FC1.
+
+@note Function textual ID is "org.opencv.core.math.mean"
+@param src input matrix.
+@sa  countNonZero, min, max
+*/
+GAPI_EXPORTS_W GScalar mean(const GMat& src);
+
+/** @brief Calculates x and y coordinates of 2D vectors from their magnitude and angle.
+
+The function polarToCart calculates the Cartesian coordinates of each 2D
+vector represented by the corresponding elements of magnitude and angle:
+\f[\begin{array}{l} \texttt{x} (I) =  \texttt{magnitude} (I) \cos ( \texttt{angle} (I)) \\ \texttt{y} (I) =  \texttt{magnitude} (I) \sin ( \texttt{angle} (I)) \\ \end{array}\f]
+
+The relative accuracy of the estimated coordinates is about 1e-6.
+
+First output is a matrix of x-coordinates of 2D vectors.
+Second output is a matrix of y-coordinates of 2D vectors.
+Both output must have the same size and depth as input matrices.
+
+@note Function textual ID is "org.opencv.core.math.polarToCart"
+
+@param magnitude input floating-point @ref CV_32FC1 matrix (1xN) of magnitudes of 2D vectors;
+@param angle input floating-point @ref CV_32FC1 matrix (1xN) of angles of 2D vectors.
+@param angleInDegrees when true, the input angles are measured in
+degrees, otherwise, they are measured in radians.
+@sa cartToPolar, exp, log, pow, sqrt
+*/
+GAPI_EXPORTS_W std::tuple<GMat, GMat> polarToCart(const GMat& magnitude, const GMat& angle,
+                                                  bool angleInDegrees = false);
+
+/** @brief Calculates the magnitude and angle of 2D vectors.
+
+The function cartToPolar calculates either the magnitude, angle, or both
+for every 2D vector (x(I),y(I)):
+\f[\begin{array}{l} \texttt{magnitude} (I)= \sqrt{\texttt{x}(I)^2+\texttt{y}(I)^2} , \\ \texttt{angle} (I)= \texttt{atan2} ( \texttt{y} (I), \texttt{x} (I))[ \cdot180 / \pi ] \end{array}\f]
+
+The angles are calculated with accuracy about 0.3 degrees. For the point
+(0,0), the angle is set to 0.
+
+First output is a matrix of magnitudes of the same size and depth as input x.
+Second output is a matrix of angles that has the same size and depth as
+x; the angles are measured in radians (from 0 to 2\*Pi) or in degrees (0 to 360 degrees).
+
+@note Function textual ID is "org.opencv.core.math.cartToPolar"
+
+@param x matrix of @ref CV_32FC1 x-coordinates.
+@param y array of @ref CV_32FC1 y-coordinates.
+@param angleInDegrees a flag, indicating whether the angles are measured
+in radians (which is by default), or in degrees.
+@sa polarToCart
+*/
+GAPI_EXPORTS_W std::tuple<GMat, GMat> cartToPolar(const GMat& x, const GMat& y,
+                                                  bool angleInDegrees = false);
+
+/** @brief Calculates the rotation angle of 2D vectors.
+
+The function cv::phase calculates the rotation angle of each 2D vector that
+is formed from the corresponding elements of x and y :
+\f[\texttt{angle} (I) =  \texttt{atan2} ( \texttt{y} (I), \texttt{x} (I))\f]
+
+The angle estimation accuracy is about 0.3 degrees. When x(I)=y(I)=0 ,
+the corresponding angle(I) is set to 0.
+@param x input floating-point array of x-coordinates of 2D vectors.
+@param y input array of y-coordinates of 2D vectors; it must have the
+same size and the same type as x.
+@param angleInDegrees when true, the function calculates the angle in
+degrees, otherwise, they are measured in radians.
+@return array of vector angles; it has the same size and same type as x.
+*/
+GAPI_EXPORTS_W GMat phase(const GMat& x, const GMat &y, bool angleInDegrees = false);
+
+/** @brief Calculates a square root of array elements.
+
+The function cv::gapi::sqrt calculates a square root of each input array element.
+In case of multi-channel arrays, each channel is processed
+independently. The accuracy is approximately the same as of the built-in
+std::sqrt .
+@param src input floating-point array.
+@return output array of the same size and type as src.
+*/
+GAPI_EXPORTS_W GMat sqrt(const GMat &src);
+
+//! @} gapi_math
+//!
+//! @addtogroup gapi_pixelwise
+//! @{
+
+/** @brief Performs the per-element comparison of two matrices checking if elements from first matrix are greater compare to elements in second.
+
+The function compares elements of two matrices src1 and src2 of the same size:
+    \f[\texttt{dst} (I) =  \texttt{src1} (I)  > \texttt{src2} (I)\f]
+
+When the comparison result is true, the corresponding element of output
+array is set to 255. The comparison operations can be replaced with the
+equivalent matrix expressions:
+\f[\texttt{dst} =   \texttt{src1} > \texttt{src2}\f]
+
+Output matrix of depth @ref CV_8U must have the same size and the same number of channels as
+    the input matrices/matrix.
+
+Supported input matrix data types are @ref CV_8UC1, @ref CV_16UC1, @ref CV_16SC1, @ref CV_32FC1.
+
+@note Function textual ID is "org.opencv.core.pixelwise.compare.cmpGT"
+@param src1 first input matrix.
+@param src2 second input matrix/scalar of the same depth as first input matrix.
+@sa min, max, threshold, cmpLE, cmpGE, cmpLT
+*/
+GAPI_EXPORTS_W GMat cmpGT(const GMat& src1, const GMat& src2);
+/** @overload
+@note Function textual ID is "org.opencv.core.pixelwise.compare.cmpGTScalar"
+*/
+GAPI_EXPORTS_W GMat cmpGT(const GMat& src1, const GScalar& src2);
+
+/** @brief Performs the per-element comparison of two matrices checking if elements from first matrix are less than elements in second.
+
+The function compares elements of two matrices src1 and src2 of the same size:
+    \f[\texttt{dst} (I) =  \texttt{src1} (I)  < \texttt{src2} (I)\f]
+
+When the comparison result is true, the corresponding element of output
+array is set to 255. The comparison operations can be replaced with the
+equivalent matrix expressions:
+    \f[\texttt{dst} =   \texttt{src1} < \texttt{src2}\f]
+
+Output matrix of depth @ref CV_8U must have the same size and the same number of channels as
+    the input matrices/matrix.
+
+Supported input matrix data types are @ref CV_8UC1, @ref CV_8UC3, @ref CV_16UC1, @ref CV_16SC1, @ref CV_32FC1.
+
+@note Function textual ID is "org.opencv.core.pixelwise.compare.cmpLT"
+@param src1 first input matrix.
+@param src2 second input matrix/scalar of the same depth as first input matrix.
+@sa min, max, threshold, cmpLE, cmpGE, cmpGT
+*/
+GAPI_EXPORTS_W GMat cmpLT(const GMat& src1, const GMat& src2);
+/** @overload
+@note Function textual ID is "org.opencv.core.pixelwise.compare.cmpLTScalar"
+*/
+GAPI_EXPORTS_W GMat cmpLT(const GMat& src1, const GScalar& src2);
+
+/** @brief Performs the per-element comparison of two matrices checking if elements from first matrix are greater or equal compare to elements in second.
+
+The function compares elements of two matrices src1 and src2 of the same size:
+    \f[\texttt{dst} (I) =  \texttt{src1} (I)  >= \texttt{src2} (I)\f]
+
+When the comparison result is true, the corresponding element of output
+array is set to 255. The comparison operations can be replaced with the
+equivalent matrix expressions:
+    \f[\texttt{dst} =   \texttt{src1} >= \texttt{src2}\f]
+
+Output matrix of depth @ref CV_8U must have the same size and the same number of channels as
+    the input matrices.
+
+Supported input matrix data types are @ref CV_8UC1, @ref CV_8UC3, @ref CV_16UC1, @ref CV_16SC1, @ref CV_32FC1.
+
+@note Function textual ID is "org.opencv.core.pixelwise.compare.cmpGE"
+@param src1 first input matrix.
+@param src2 second input matrix/scalar of the same depth as first input matrix.
+@sa min, max, threshold, cmpLE, cmpGT, cmpLT
+*/
+GAPI_EXPORTS_W GMat cmpGE(const GMat& src1, const GMat& src2);
+/** @overload
+@note Function textual ID is "org.opencv.core.pixelwise.compare.cmpLGEcalar"
+*/
+GAPI_EXPORTS_W GMat cmpGE(const GMat& src1, const GScalar& src2);
+
+/** @brief Performs the per-element comparison of two matrices checking if elements from first matrix are less or equal compare to elements in second.
+
+The function compares elements of two matrices src1 and src2 of the same size:
+    \f[\texttt{dst} (I) =  \texttt{src1} (I)  <=  \texttt{src2} (I)\f]
+
+When the comparison result is true, the corresponding element of output
+array is set to 255. The comparison operations can be replaced with the
+equivalent matrix expressions:
+    \f[\texttt{dst} =   \texttt{src1} <= \texttt{src2}\f]
+
+Output matrix of depth @ref CV_8U must have the same size and the same number of channels as
+    the input matrices.
+
+Supported input matrix data types are @ref CV_8UC1, @ref CV_8UC3, @ref CV_16UC1, @ref CV_16SC1, @ref CV_32FC1.
+
+@note Function textual ID is "org.opencv.core.pixelwise.compare.cmpLE"
+@param src1 first input matrix.
+@param src2 second input matrix/scalar of the same depth as first input matrix.
+@sa min, max, threshold, cmpGT, cmpGE, cmpLT
+*/
+GAPI_EXPORTS_W GMat cmpLE(const GMat& src1, const GMat& src2);
+/** @overload
+@note Function textual ID is "org.opencv.core.pixelwise.compare.cmpLEScalar"
+*/
+GAPI_EXPORTS_W GMat cmpLE(const GMat& src1, const GScalar& src2);
+
+/** @brief Performs the per-element comparison of two matrices checking if elements from first matrix are equal to elements in second.
+
+The function compares elements of two matrices src1 and src2 of the same size:
+    \f[\texttt{dst} (I) =  \texttt{src1} (I)  ==  \texttt{src2} (I)\f]
+
+When the comparison result is true, the corresponding element of output
+array is set to 255. The comparison operations can be replaced with the
+equivalent matrix expressions:
+    \f[\texttt{dst} =   \texttt{src1} == \texttt{src2}\f]
+
+Output matrix of depth @ref CV_8U must have the same size and the same number of channels as
+    the input matrices.
+
+Supported input matrix data types are @ref CV_8UC1, @ref CV_8UC3, @ref CV_16UC1, @ref CV_16SC1, @ref CV_32FC1.
+
+@note Function textual ID is "org.opencv.core.pixelwise.compare.cmpEQ"
+@param src1 first input matrix.
+@param src2 second input matrix/scalar of the same depth as first input matrix.
+@sa min, max, threshold, cmpNE
+*/
+GAPI_EXPORTS_W GMat cmpEQ(const GMat& src1, const GMat& src2);
+/** @overload
+@note Function textual ID is "org.opencv.core.pixelwise.compare.cmpEQScalar"
+*/
+GAPI_EXPORTS_W GMat cmpEQ(const GMat& src1, const GScalar& src2);
+
+/** @brief Performs the per-element comparison of two matrices checking if elements from first matrix are not equal to elements in second.
+
+The function compares elements of two matrices src1 and src2 of the same size:
+    \f[\texttt{dst} (I) =  \texttt{src1} (I)  !=  \texttt{src2} (I)\f]
+
+When the comparison result is true, the corresponding element of output
+array is set to 255. The comparison operations can be replaced with the
+equivalent matrix expressions:
+    \f[\texttt{dst} =   \texttt{src1} != \texttt{src2}\f]
+
+Output matrix of depth @ref CV_8U must have the same size and the same number of channels as
+    the input matrices.
+
+Supported input matrix data types are @ref CV_8UC1, @ref CV_8UC3, @ref CV_16UC1, @ref CV_16SC1, @ref CV_32FC1.
+
+@note Function textual ID is "org.opencv.core.pixelwise.compare.cmpNE"
+@param src1 first input matrix.
+@param src2 second input matrix/scalar of the same depth as first input matrix.
+@sa min, max, threshold, cmpEQ
+*/
+GAPI_EXPORTS_W GMat cmpNE(const GMat& src1, const GMat& src2);
+/** @overload
+@note Function textual ID is "org.opencv.core.pixelwise.compare.cmpNEScalar"
+*/
+GAPI_EXPORTS_W GMat cmpNE(const GMat& src1, const GScalar& src2);
+
+/** @brief computes bitwise conjunction of the two matrixes (src1 & src2)
+Calculates the per-element bit-wise logical conjunction of two matrices of the same size.
+
+In case of floating-point matrices, their machine-specific bit
+representations (usually IEEE754-compliant) are used for the operation.
+In case of multi-channel matrices, each channel is processed
+independently. Output matrix must have the same size and depth as the input
+matrices.
+
+Supported matrix data types are @ref CV_8UC1, @ref CV_8UC3, @ref CV_16UC1, @ref CV_16SC1, @ref CV_32FC1.
+
+@note Function textual ID is "org.opencv.core.pixelwise.bitwise_and"
+
+@param src1 first input matrix.
+@param src2 second input matrix.
+*/
+GAPI_EXPORTS_W GMat bitwise_and(const GMat& src1, const GMat& src2);
+/** @overload
+@note Function textual ID is "org.opencv.core.pixelwise.bitwise_andS"
+@param src1 first input matrix.
+@param src2 scalar, which will be per-lemenetly conjuncted with elements of src1.
+*/
+GAPI_EXPORTS_W GMat bitwise_and(const GMat& src1, const GScalar& src2);
+
+/** @brief computes bitwise disjunction of the two matrixes (src1 | src2)
+Calculates the per-element bit-wise logical disjunction of two matrices of the same size.
+
+In case of floating-point matrices, their machine-specific bit
+representations (usually IEEE754-compliant) are used for the operation.
+In case of multi-channel matrices, each channel is processed
+independently. Output matrix must have the same size and depth as the input
+matrices.
+
+Supported matrix data types are @ref CV_8UC1, @ref CV_8UC3, @ref CV_16UC1, @ref CV_16SC1, @ref CV_32FC1.
+
+@note Function textual ID is "org.opencv.core.pixelwise.bitwise_or"
+
+@param src1 first input matrix.
+@param src2 second input matrix.
+*/
+GAPI_EXPORTS_W GMat bitwise_or(const GMat& src1, const GMat& src2);
+/** @overload
+@note Function textual ID is "org.opencv.core.pixelwise.bitwise_orS"
+@param src1 first input matrix.
+@param src2 scalar, which will be per-lemenetly disjuncted with elements of src1.
+*/
+GAPI_EXPORTS_W GMat bitwise_or(const GMat& src1, const GScalar& src2);
+
+
+/** @brief computes bitwise logical "exclusive or" of the two matrixes (src1 ^ src2)
+Calculates the per-element bit-wise logical "exclusive or" of two matrices of the same size.
+
+In case of floating-point matrices, their machine-specific bit
+representations (usually IEEE754-compliant) are used for the operation.
+In case of multi-channel matrices, each channel is processed
+independently. Output matrix must have the same size and depth as the input
+matrices.
+
+Supported matrix data types are @ref CV_8UC1, @ref CV_8UC3, @ref CV_16UC1, @ref CV_16SC1, @ref CV_32FC1.
+
+@note Function textual ID is "org.opencv.core.pixelwise.bitwise_xor"
+
+@param src1 first input matrix.
+@param src2 second input matrix.
+*/
+GAPI_EXPORTS_W GMat bitwise_xor(const GMat& src1, const GMat& src2);
+/** @overload
+@note Function textual ID is "org.opencv.core.pixelwise.bitwise_xorS"
+@param src1 first input matrix.
+@param src2 scalar, for which per-lemenet "logical or" operation on elements of src1 will be performed.
+*/
+GAPI_EXPORTS_W GMat bitwise_xor(const GMat& src1, const GScalar& src2);
+
+
+/** @brief Inverts every bit of an array.
+
+The function bitwise_not calculates per-element bit-wise inversion of the input
+matrix:
+\f[\texttt{dst} (I) =  \neg \texttt{src} (I)\f]
+
+In case of floating-point matrices, their machine-specific bit
+representations (usually IEEE754-compliant) are used for the operation.
+In case of multi-channel matrices, each channel is processed
+independently. Output matrix must have the same size and depth as the input
+matrix.
+
+Supported matrix data types are @ref CV_8UC1, @ref CV_8UC3, @ref CV_16UC1, @ref CV_16SC1, @ref CV_32FC1.
+
+@note Function textual ID is "org.opencv.core.pixelwise.bitwise_not"
+
+@param src input matrix.
+*/
+GAPI_EXPORTS_W GMat bitwise_not(const GMat& src);
+
+/** @brief Select values from either first or second of input matrices by given mask.
+The function set to the output matrix either the value from the first input matrix if corresponding value of mask matrix is 255,
+ or value from the second input matrix (if value of mask matrix set to 0).
+
+Input mask matrix must be of @ref CV_8UC1 type, two other inout matrices and output matrix should be of the same type. The size should
+be the same for all input and output matrices.
+Supported input matrix data types are @ref CV_8UC1, @ref CV_8UC3, @ref CV_16UC1, @ref CV_16SC1, @ref CV_32FC1.
+
+@note Function textual ID is "org.opencv.core.pixelwise.select"
+
+@param src1 first input matrix.
+@param src2 second input matrix.
+@param mask mask input matrix.
+*/
+GAPI_EXPORTS_W GMat select(const GMat& src1, const GMat& src2, const GMat& mask);
+
+//! @} gapi_pixelwise
+
+
+//! @addtogroup gapi_matrixop
+//! @{
+/** @brief Calculates per-element minimum of two matrices.
+
+The function min calculates the per-element minimum of two matrices of the same size, number of channels and depth:
+\f[\texttt{dst} (I)= \min ( \texttt{src1} (I), \texttt{src2} (I))\f]
+    where I is a multi-dimensional index of matrix elements. In case of
+    multi-channel matrices, each channel is processed independently.
+Output matrix must be of the same size and depth as src1.
+
+Supported input matrix data types are @ref CV_8UC1, @ref CV_8UC3, @ref CV_16UC1, @ref CV_16SC1, @ref CV_32FC1.
+
+@note Function textual ID is "org.opencv.core.matrixop.min"
+@param src1 first input matrix.
+@param src2 second input matrix of the same size and depth as src1.
+@sa max, cmpEQ, cmpLT, cmpLE
+*/
+GAPI_EXPORTS_W GMat min(const GMat& src1, const GMat& src2);
+
+/** @brief Calculates per-element maximum of two matrices.
+
+The function max calculates the per-element maximum of two matrices of the same size, number of channels and depth:
+\f[\texttt{dst} (I)= \max ( \texttt{src1} (I), \texttt{src2} (I))\f]
+    where I is a multi-dimensional index of matrix elements. In case of
+    multi-channel matrices, each channel is processed independently.
+Output matrix must be of the same size and depth as src1.
+
+Supported matrix data types are @ref CV_8UC1, @ref CV_8UC3, @ref CV_16UC1, @ref CV_16SC1, @ref CV_32FC1.
+
+@note Function textual ID is "org.opencv.core.matrixop.max"
+@param src1 first input matrix.
+@param src2 second input matrix of the same size and depth as src1.
+@sa min, compare, cmpEQ, cmpGT, cmpGE
+*/
+GAPI_EXPORTS_W GMat max(const GMat& src1, const GMat& src2);
+
+/** @brief Calculates the per-element absolute difference between two matrices.
+
+The function absDiff calculates absolute difference between two matrices of the same size and depth:
+    \f[\texttt{dst}(I) =  \texttt{saturate} (| \texttt{src1}(I) -  \texttt{src2}(I)|)\f]
+    where I is a multi-dimensional index of matrix elements. In case of
+    multi-channel matrices, each channel is processed independently.
+Output matrix must have the same size and depth as input matrices.
+
+Supported matrix data types are @ref CV_8UC1, @ref CV_8UC3, @ref CV_16UC1, @ref CV_16SC1, @ref CV_32FC1.
+
+@note Function textual ID is "org.opencv.core.matrixop.absdiff"
+@param src1 first input matrix.
+@param src2 second input matrix.
+@sa abs
+*/
+GAPI_EXPORTS_W GMat absDiff(const GMat& src1, const GMat& src2);
+
+/** @brief Calculates absolute value of matrix elements.
+
+The function abs calculates absolute difference between matrix elements and given scalar value:
+    \f[\texttt{dst}(I) =  \texttt{saturate} (| \texttt{src1}(I) -  \texttt{matC}(I)|)\f]
+    where matC is constructed from given scalar c and has the same sizes and depth as input matrix src.
+
+Output matrix must be of the same size and depth as src.
+
+Supported matrix data types are @ref CV_8UC1, @ref CV_8UC3, @ref CV_16UC1, @ref CV_16SC1, @ref CV_32FC1.
+
+@note Function textual ID is "org.opencv.core.matrixop.absdiffC"
+@param src input matrix.
+@param c scalar to be subtracted.
+@sa min, max
+*/
+GAPI_EXPORTS_W GMat absDiffC(const GMat& src, const GScalar& c);
+
+/** @brief Calculates sum of all matrix elements.
+
+The function sum calculates sum of all matrix elements, independently for each channel.
+
+Supported matrix data types are @ref CV_8UC1, @ref CV_8UC3, @ref CV_16UC1, @ref CV_16SC1, @ref CV_32FC1.
+
+@note Function textual ID is "org.opencv.core.matrixop.sum"
+@param src input matrix.
+@sa countNonZero, mean, min, max
+*/
+GAPI_EXPORTS_W GScalar sum(const GMat& src);
+
+/** @brief Counts non-zero array elements.
+
+The function returns the number of non-zero elements in src :
+\f[\sum _{I: \; \texttt{src} (I) \ne0 } 1\f]
+
+Supported matrix data types are @ref CV_8UC1, @ref CV_16UC1, @ref CV_16SC1, @ref CV_32FC1.
+
+@note Function textual ID is "org.opencv.core.matrixop.countNonZero"
+@param src input single-channel matrix.
+@sa  mean, min, max
+*/
+GAPI_EXPORTS_W GOpaque<int> countNonZero(const GMat& src);
+
+/** @brief Calculates the weighted sum of two matrices.
+
+The function addWeighted calculates the weighted sum of two matrices as follows:
+\f[\texttt{dst} (I)= \texttt{saturate} ( \texttt{src1} (I)* \texttt{alpha} +  \texttt{src2} (I)* \texttt{beta} +  \texttt{gamma} )\f]
+where I is a multi-dimensional index of array elements. In case of multi-channel matrices, each
+channel is processed independently.
+
+The function can be replaced with a matrix expression:
+    \f[\texttt{dst}(I) =  \texttt{alpha} * \texttt{src1}(I) - \texttt{beta} * \texttt{src2}(I) + \texttt{gamma} \f]
+
+Supported matrix data types are @ref CV_8UC1, @ref CV_8UC3, @ref CV_16UC1, @ref CV_16SC1, @ref CV_32FC1.
+
+@note Function textual ID is "org.opencv.core.matrixop.addweighted"
+@param src1 first input matrix.
+@param alpha weight of the first matrix elements.
+@param src2 second input matrix of the same size and channel number as src1.
+@param beta weight of the second matrix elements.
+@param gamma scalar added to each sum.
+@param ddepth optional depth of the output matrix.
+@sa  add, sub
+*/
+GAPI_EXPORTS_W GMat addWeighted(const GMat& src1, double alpha, const GMat& src2, double beta, double gamma, int ddepth = -1);
+
+/** @brief Calculates the  absolute L1 norm of a matrix.
+
+This version of normL1 calculates the absolute L1 norm of src.
+
+As example for one array consider the function \f$r(x)= \begin{pmatrix} x \\ 1-x \end{pmatrix}, x \in [-1;1]\f$.
+The \f$ L_{1} \f$ norm for the sample value \f$r(-1) = \begin{pmatrix} -1 \\ 2 \end{pmatrix}\f$
+is calculated as follows
+\f{align*}
+    \| r(-1) \|_{L_1} &= |-1| + |2| = 3 \\
+\f}
+and for \f$r(0.5) = \begin{pmatrix} 0.5 \\ 0.5 \end{pmatrix}\f$ the calculation is
+\f{align*}
+    \| r(0.5) \|_{L_1} &= |0.5| + |0.5| = 1 \\
+\f}
+
+Supported matrix data types are @ref CV_8UC1, @ref CV_8UC3, @ref CV_16UC1, @ref CV_16SC1, @ref CV_32FC1.
+
+@note Function textual ID is "org.opencv.core.matrixop.norml1"
+@param src input matrix.
+@sa normL2, normInf
+*/
+GAPI_EXPORTS_W GScalar normL1(const GMat& src);
+
+/** @brief Calculates the absolute L2 norm of a matrix.
+
+This version of normL2 calculates the absolute L2 norm of src.
+
+As example for one array consider the function \f$r(x)= \begin{pmatrix} x \\ 1-x \end{pmatrix}, x \in [-1;1]\f$.
+The \f$ L_{2} \f$  norm for the sample value \f$r(-1) = \begin{pmatrix} -1 \\ 2 \end{pmatrix}\f$
+is calculated as follows
+\f{align*}
+    \| r(-1) \|_{L_2} &= \sqrt{(-1)^{2} + (2)^{2}} = \sqrt{5} \\
+\f}
+and for \f$r(0.5) = \begin{pmatrix} 0.5 \\ 0.5 \end{pmatrix}\f$ the calculation is
+\f{align*}
+    \| r(0.5) \|_{L_2} &= \sqrt{(0.5)^{2} + (0.5)^{2}} = \sqrt{0.5} \\
+\f}
+
+Supported matrix data types are @ref CV_8UC1, @ref CV_8UC3, @ref CV_16UC1, @ref CV_16SC1, @ref CV_32FC1.
+@note Function textual ID is "org.opencv.core.matrixop.norml2"
+@param src input matrix.
+@sa normL1, normInf
+*/
+GAPI_EXPORTS_W GScalar normL2(const GMat& src);
+
+/** @brief Calculates the absolute infinite norm of a matrix.
+
+This version of normInf calculates the absolute infinite norm of src.
+
+As example for one array consider the function \f$r(x)= \begin{pmatrix} x \\ 1-x \end{pmatrix}, x \in [-1;1]\f$.
+The \f$ L_{\infty} \f$ norm for the sample value \f$r(-1) = \begin{pmatrix} -1 \\ 2 \end{pmatrix}\f$
+is calculated as follows
+\f{align*}
+    \| r(-1) \|_{L_\infty} &= \max(|-1|,|2|) = 2
+\f}
+and for \f$r(0.5) = \begin{pmatrix} 0.5 \\ 0.5 \end{pmatrix}\f$ the calculation is
+\f{align*}
+    \| r(0.5) \|_{L_\infty} &= \max(|0.5|,|0.5|) = 0.5.
+\f}
+
+Supported matrix data types are @ref CV_8UC1, @ref CV_8UC3, @ref CV_16UC1, @ref CV_16SC1, @ref CV_32FC1.
+
+@note Function textual ID is "org.opencv.core.matrixop.norminf"
+@param src input matrix.
+@sa normL1, normL2
+*/
+GAPI_EXPORTS_W GScalar normInf(const GMat& src);
+
+/** @brief Calculates the integral of an image.
+
+The function calculates one or more integral images for the source image as follows:
+
+\f[\texttt{sum} (X,Y) =  \sum _{x<X,y<Y}  \texttt{image} (x,y)\f]
+
+\f[\texttt{sqsum} (X,Y) =  \sum _{x<X,y<Y}  \texttt{image} (x,y)^2\f]
+
+The function return integral image as \f$(W+1)\times (H+1)\f$ , 32-bit integer or floating-point (32f or 64f) and
+ integral image for squared pixel values; it is \f$(W+1)\times (H+)\f$, double-precision floating-point (64f) array.
+
+@note Function textual ID is "org.opencv.core.matrixop.integral"
+
+@param src input image.
+@param sdepth desired depth of the integral and the tilted integral images, CV_32S, CV_32F, or
+CV_64F.
+@param sqdepth desired depth of the integral image of squared pixel values, CV_32F or CV_64F.
+ */
+GAPI_EXPORTS_W std::tuple<GMat, GMat> integral(const GMat& src, int sdepth = -1, int sqdepth = -1);
+
+/** @brief Applies a fixed-level threshold to each matrix element.
+
+The function applies fixed-level thresholding to a single- or multiple-channel matrix.
+The function is typically used to get a bi-level (binary) image out of a grayscale image ( cmp functions could be also used for
+this purpose) or for removing a noise, that is, filtering out pixels with too small or too large
+values. There are several types of thresholding supported by the function. They are determined by
+type parameter.
+
+Also, the special values cv::THRESH_OTSU or cv::THRESH_TRIANGLE may be combined with one of the
+above values. In these cases, the function determines the optimal threshold value using the Otsu's
+or Triangle algorithm and uses it instead of the specified thresh . The function returns the
+computed threshold value in addititon to thresholded matrix.
+The Otsu's and Triangle methods are implemented only for 8-bit matrices.
+
+Input image should be single channel only in case of cv::THRESH_OTSU or cv::THRESH_TRIANGLE flags.
+Output matrix must be of the same size and depth as src.
+
+@note Function textual ID is "org.opencv.core.matrixop.threshold"
+
+@param src input matrix (@ref CV_8UC1, @ref CV_8UC3, or @ref CV_32FC1).
+@param thresh threshold value.
+@param maxval maximum value to use with the cv::THRESH_BINARY and cv::THRESH_BINARY_INV thresholding
+types.
+@param type thresholding type (see the cv::ThresholdTypes).
+
+@sa min, max, cmpGT, cmpLE, cmpGE, cmpLT
+ */
+GAPI_EXPORTS_W GMat threshold(const GMat& src, const GScalar& thresh, const GScalar& maxval, int type);
+/** @overload
+This function applicable for all threshold types except cv::THRESH_OTSU and cv::THRESH_TRIANGLE
+@note Function textual ID is "org.opencv.core.matrixop.thresholdOT"
+*/
+GAPI_EXPORTS_W std::tuple<GMat, GScalar> threshold(const GMat& src, const GScalar& maxval, int type);
+
+/** @brief Applies a range-level threshold to each matrix element.
+
+The function applies range-level thresholding to a single- or multiple-channel matrix.
+It sets output pixel value to OxFF if the corresponding pixel value of input matrix is in specified range,or 0 otherwise.
+
+Input and output matrices must be CV_8UC1.
+
+@note Function textual ID is "org.opencv.core.matrixop.inRange"
+
+@param src input matrix (CV_8UC1).
+@param threshLow lower boundary value.
+@param threshUp upper boundary value.
+
+@sa threshold
+ */
+GAPI_EXPORTS_W GMat inRange(const GMat& src, const GScalar& threshLow, const GScalar& threshUp);
+
+//! @} gapi_matrixop
+
+//! @addtogroup gapi_transform
+//! @{
+/** @brief Creates one 4-channel matrix out of 4 single-channel ones.
+
+The function merges several matrices to make a single multi-channel matrix. That is, each
+element of the output matrix will be a concatenation of the elements of the input matrices, where
+elements of i-th input matrix are treated as mv[i].channels()-element vectors.
+Output matrix must be of @ref CV_8UC4 type.
+
+The function split4 does the reverse operation.
+
+@note
+ - Function textual ID is "org.opencv.core.transform.merge4"
+
+@param src1 first input @ref CV_8UC1 matrix to be merged.
+@param src2 second input @ref CV_8UC1 matrix to be merged.
+@param src3 third input @ref CV_8UC1 matrix to be merged.
+@param src4 fourth input @ref CV_8UC1 matrix to be merged.
+@sa merge3, split4, split3
+*/
+GAPI_EXPORTS_W GMat merge4(const GMat& src1, const GMat& src2, const GMat& src3, const GMat& src4);
+
+/** @brief Creates one 3-channel matrix out of 3 single-channel ones.
+
+The function merges several matrices to make a single multi-channel matrix. That is, each
+element of the output matrix will be a concatenation of the elements of the input matrices, where
+elements of i-th input matrix are treated as mv[i].channels()-element vectors.
+Output matrix must be of @ref CV_8UC3 type.
+
+The function split3 does the reverse operation.
+
+@note
+ - Function textual ID is "org.opencv.core.transform.merge3"
+
+@param src1 first input @ref CV_8UC1 matrix to be merged.
+@param src2 second input @ref CV_8UC1 matrix to be merged.
+@param src3 third input @ref CV_8UC1 matrix to be merged.
+@sa merge4, split4, split3
+*/
+GAPI_EXPORTS_W GMat merge3(const GMat& src1, const GMat& src2, const GMat& src3);
+
+/** @brief Divides a 4-channel matrix into 4 single-channel matrices.
+
+The function splits a 4-channel matrix into 4 single-channel matrices:
+\f[\texttt{mv} [c](I) =  \texttt{src} (I)_c\f]
+
+All output matrices must be of @ref CV_8UC1 type.
+
+The function merge4 does the reverse operation.
+
+@note
+ - Function textual ID is "org.opencv.core.transform.split4"
+
+@param src input @ref CV_8UC4 matrix.
+@sa split3, merge3, merge4
+*/
+GAPI_EXPORTS_W std::tuple<GMat, GMat, GMat,GMat> split4(const GMat& src);
+
+/** @brief Divides a 3-channel matrix into 3 single-channel matrices.
+
+The function splits a 3-channel matrix into 3 single-channel matrices:
+\f[\texttt{mv} [c](I) =  \texttt{src} (I)_c\f]
+
+All output matrices must be of @ref CV_8UC1 type.
+
+The function merge3 does the reverse operation.
+
+@note
+ - Function textual ID is "org.opencv.core.transform.split3"
+
+@param src input @ref CV_8UC3 matrix.
+@sa split4, merge3, merge4
+*/
+GAPI_EXPORTS_W std::tuple<GMat, GMat, GMat> split3(const GMat& src);
+
+/** @brief Applies a generic geometrical transformation to an image.
+
+The function remap transforms the source image using the specified map:
+
+\f[\texttt{dst} (x,y) =  \texttt{src} (map_x(x,y),map_y(x,y))\f]
+
+where values of pixels with non-integer coordinates are computed using one of available
+interpolation methods. \f$map_x\f$ and \f$map_y\f$ can be encoded as separate floating-point maps
+in \f$map_1\f$ and \f$map_2\f$ respectively, or interleaved floating-point maps of \f$(x,y)\f$ in
+\f$map_1\f$, or fixed-point maps created by using convertMaps. The reason you might want to
+convert from floating to fixed-point representations of a map is that they can yield much faster
+(\~2x) remapping operations. In the converted case, \f$map_1\f$ contains pairs (cvFloor(x),
+cvFloor(y)) and \f$map_2\f$ contains indices in a table of interpolation coefficients.
+Output image must be of the same size and depth as input one.
+
+@note
+ - Function textual ID is "org.opencv.core.transform.remap"
+ - Due to current implementation limitations the size of an input and output images should be less than 32767x32767.
+
+@param src Source image.
+@param map1 The first map of either (x,y) points or just x values having the type CV_16SC2,
+CV_32FC1, or CV_32FC2.
+@param map2 The second map of y values having the type CV_16UC1, CV_32FC1, or none (empty map
+if map1 is (x,y) points), respectively.
+@param interpolation Interpolation method (see cv::InterpolationFlags). The methods #INTER_AREA
+and #INTER_LINEAR_EXACT are not supported by this function.
+@param borderMode Pixel extrapolation method (see cv::BorderTypes). When
+borderMode=BORDER_TRANSPARENT, it means that the pixels in the destination image that
+corresponds to the "outliers" in the source image are not modified by the function.
+@param borderValue Value used in case of a constant border. By default, it is 0.
+ */
+GAPI_EXPORTS_W GMat remap(const GMat& src, const Mat& map1, const Mat& map2,
+                          int interpolation, int borderMode = BORDER_CONSTANT,
+                          const Scalar& borderValue = Scalar());
+
+/** @brief Flips a 2D matrix around vertical, horizontal, or both axes.
+
+The function flips the matrix in one of three different ways (row
+and column indices are 0-based):
+\f[\texttt{dst} _{ij} =
+\left\{
+\begin{array}{l l}
+\texttt{src} _{\texttt{src.rows}-i-1,j} & if\;  \texttt{flipCode} = 0 \\
+\texttt{src} _{i, \texttt{src.cols} -j-1} & if\;  \texttt{flipCode} > 0 \\
+\texttt{src} _{ \texttt{src.rows} -i-1, \texttt{src.cols} -j-1} & if\; \texttt{flipCode} < 0 \\
+\end{array}
+\right.\f]
+The example scenarios of using the function are the following:
+*   Vertical flipping of the image (flipCode == 0) to switch between
+    top-left and bottom-left image origin. This is a typical operation
+    in video processing on Microsoft Windows\* OS.
+*   Horizontal flipping of the image with the subsequent horizontal
+    shift and absolute difference calculation to check for a
+    vertical-axis symmetry (flipCode \> 0).
+*   Simultaneous horizontal and vertical flipping of the image with
+    the subsequent shift and absolute difference calculation to check
+    for a central symmetry (flipCode \< 0).
+*   Reversing the order of point arrays (flipCode \> 0 or
+    flipCode == 0).
+Output image must be of the same depth as input one, size should be correct for given flipCode.
+
+@note Function textual ID is "org.opencv.core.transform.flip"
+
+@param src input matrix.
+@param flipCode a flag to specify how to flip the array; 0 means
+flipping around the x-axis and positive value (for example, 1) means
+flipping around y-axis. Negative value (for example, -1) means flipping
+around both axes.
+@sa remap
+*/
+GAPI_EXPORTS_W GMat flip(const GMat& src, int flipCode);
+
+/** @brief Crops a 2D matrix.
+
+The function crops the matrix by given cv::Rect.
+
+Output matrix must be of the same depth as input one, size is specified by given rect size.
+
+@note Function textual ID is "org.opencv.core.transform.crop"
+
+@param src input matrix.
+@param rect a rect to crop a matrix to
+@sa resize
+*/
+GAPI_EXPORTS_W GMat crop(const GMat& src, const Rect& rect);
+
+/** @brief Applies horizontal concatenation to given matrices.
+
+The function horizontally concatenates two GMat matrices (with the same number of rows).
+@code{.cpp}
+    GMat A = { 1, 4,
+               2, 5,
+               3, 6 };
+    GMat B = { 7, 10,
+               8, 11,
+               9, 12 };
+
+    GMat C = gapi::concatHor(A, B);
+    //C:
+    //[1, 4, 7, 10;
+    // 2, 5, 8, 11;
+    // 3, 6, 9, 12]
+@endcode
+Output matrix must the same number of rows and depth as the src1 and src2, and the sum of cols of the src1 and src2.
+Supported matrix data types are @ref CV_8UC1, @ref CV_8UC3, @ref CV_16UC1, @ref CV_16SC1, @ref CV_32FC1.
+
+@note Function textual ID is "org.opencv.imgproc.transform.concatHor"
+
+@param src1 first input matrix to be considered for horizontal concatenation.
+@param src2 second input matrix to be considered for horizontal concatenation.
+@sa concatVert
+*/
+GAPI_EXPORTS_W GMat concatHor(const GMat& src1, const GMat& src2);
+
+/** @overload
+The function horizontally concatenates given number of GMat matrices (with the same number of columns).
+Output matrix must the same number of columns and depth as the input matrices, and the sum of rows of input matrices.
+
+@param v vector of input matrices to be concatenated horizontally.
+*/
+GAPI_EXPORTS_W GMat concatHor(const std::vector<GMat> &v);
+
+/** @brief Applies vertical concatenation to given matrices.
+
+The function vertically concatenates two GMat matrices (with the same number of cols).
+ @code{.cpp}
+    GMat A = { 1, 7,
+               2, 8,
+               3, 9 };
+    GMat B = { 4, 10,
+               5, 11,
+               6, 12 };
+
+    GMat C = gapi::concatVert(A, B);
+    //C:
+    //[1, 7;
+    // 2, 8;
+    // 3, 9;
+    // 4, 10;
+    // 5, 11;
+    // 6, 12]
+ @endcode
+
+Output matrix must the same number of cols and depth as the src1 and src2, and the sum of rows of the src1 and src2.
+Supported matrix data types are @ref CV_8UC1, @ref CV_8UC3, @ref CV_16UC1, @ref CV_16SC1, @ref CV_32FC1.
+
+@note Function textual ID is "org.opencv.imgproc.transform.concatVert"
+
+@param src1 first input matrix to be considered for vertical concatenation.
+@param src2 second input matrix to be considered for vertical concatenation.
+@sa concatHor
+*/
+GAPI_EXPORTS_W GMat concatVert(const GMat& src1, const GMat& src2);
+
+/** @overload
+The function vertically concatenates given number of GMat matrices (with the same number of columns).
+Output matrix must the same number of columns and depth as the input matrices, and the sum of rows of input matrices.
+
+@param v vector of input matrices to be concatenated vertically.
+*/
+GAPI_EXPORTS_W GMat concatVert(const std::vector<GMat> &v);
+
+
+/** @brief Performs a look-up table transform of a matrix.
+
+The function LUT fills the output matrix with values from the look-up table. Indices of the entries
+are taken from the input matrix. That is, the function processes each element of src as follows:
+\f[\texttt{dst} (I)  \leftarrow \texttt{lut(src(I))}\f]
+
+Supported matrix data types are @ref CV_8UC1.
+Output is a matrix of the same size and number of channels as src, and the same depth as lut.
+
+@note Function textual ID is "org.opencv.core.transform.LUT"
+
+@param src input matrix of 8-bit elements.
+@param lut look-up table of 256 elements; in case of multi-channel input array, the table should
+either have a single channel (in this case the same table is used for all channels) or the same
+number of channels as in the input matrix.
+*/
+GAPI_EXPORTS_W GMat LUT(const GMat& src, const Mat& lut);
+
+/** @brief Converts a matrix to another data depth with optional scaling.
+
+The method converts source pixel values to the target data depth. saturate_cast\<\> is applied at
+the end to avoid possible overflows:
+
+\f[m(x,y) = saturate \_ cast<rType>( \alpha (*this)(x,y) +  \beta )\f]
+Output matrix must be of the same size as input one.
+
+@note Function textual ID is "org.opencv.core.transform.convertTo"
+@param src input matrix to be converted from.
+@param rdepth desired output matrix depth or, rather, the depth since the number of channels are the
+same as the input has; if rdepth is negative, the output matrix will have the same depth as the input.
+@param alpha optional scale factor.
+@param beta optional delta added to the scaled values.
+ */
+GAPI_EXPORTS_W GMat convertTo(const GMat& src, int rdepth, double alpha=1, double beta=0);
+
+/** @brief Normalizes the norm or value range of an array.
+
+The function normalizes scale and shift the input array elements so that
+\f[\| \texttt{dst} \| _{L_p}= \texttt{alpha}\f]
+(where p=Inf, 1 or 2) when normType=NORM_INF, NORM_L1, or NORM_L2, respectively; or so that
+\f[\min _I  \texttt{dst} (I)= \texttt{alpha} , \, \, \max _I  \texttt{dst} (I)= \texttt{beta}\f]
+when normType=NORM_MINMAX (for dense arrays only).
+
+@note Function textual ID is "org.opencv.core.normalize"
+
+@param src input array.
+@param alpha norm value to normalize to or the lower range boundary in case of the range
+normalization.
+@param beta upper range boundary in case of the range normalization; it is not used for the norm
+normalization.
+@param norm_type normalization type (see cv::NormTypes).
+@param ddepth when negative, the output array has the same type as src; otherwise, it has the same
+number of channels as src and the depth =ddepth.
+@sa norm, Mat::convertTo
+*/
+GAPI_EXPORTS_W GMat normalize(const GMat& src, double alpha, double beta,
+                              int norm_type, int ddepth = -1);
+
+/** @brief Applies a perspective transformation to an image.
+
+The function warpPerspective transforms the source image using the specified matrix:
+
+\f[\texttt{dst} (x,y) =  \texttt{src} \left ( \frac{M_{11} x + M_{12} y + M_{13}}{M_{31} x + M_{32} y + M_{33}} ,
+     \frac{M_{21} x + M_{22} y + M_{23}}{M_{31} x + M_{32} y + M_{33}} \right )\f]
+
+when the flag #WARP_INVERSE_MAP is set. Otherwise, the transformation is first inverted with invert
+and then put in the formula above instead of M. The function cannot operate in-place.
+
+@param src input image.
+@param M \f$3\times 3\f$ transformation matrix.
+@param dsize size of the output image.
+@param flags combination of interpolation methods (#INTER_LINEAR or #INTER_NEAREST) and the
+optional flag #WARP_INVERSE_MAP, that sets M as the inverse transformation (
+\f$\texttt{dst}\rightarrow\texttt{src}\f$ ).
+@param borderMode pixel extrapolation method (#BORDER_CONSTANT or #BORDER_REPLICATE).
+@param borderValue value used in case of a constant border; by default, it equals 0.
+
+@sa  warpAffine, resize, remap, getRectSubPix, perspectiveTransform
+ */
+GAPI_EXPORTS_W GMat warpPerspective(const GMat& src, const Mat& M, const Size& dsize, int flags = cv::INTER_LINEAR,
+                                    int borderMode = cv::BORDER_CONSTANT, const Scalar& borderValue = Scalar());
+
+/** @brief Applies an affine transformation to an image.
+
+The function warpAffine transforms the source image using the specified matrix:
+
+\f[\texttt{dst} (x,y) =  \texttt{src} ( \texttt{M} _{11} x +  \texttt{M} _{12} y +  \texttt{M} _{13}, \texttt{M} _{21} x +  \texttt{M} _{22} y +  \texttt{M} _{23})\f]
+
+when the flag #WARP_INVERSE_MAP is set. Otherwise, the transformation is first inverted
+with #invertAffineTransform and then put in the formula above instead of M. The function cannot
+operate in-place.
+
+@param src input image.
+@param M \f$2\times 3\f$ transformation matrix.
+@param dsize size of the output image.
+@param flags combination of interpolation methods (see #InterpolationFlags) and the optional
+flag #WARP_INVERSE_MAP that means that M is the inverse transformation (
+\f$\texttt{dst}\rightarrow\texttt{src}\f$ ).
+@param borderMode pixel extrapolation method (see #BorderTypes);
+borderMode=#BORDER_TRANSPARENT isn't supported
+@param borderValue value used in case of a constant border; by default, it is 0.
+
+@sa  warpPerspective, resize, remap, getRectSubPix, transform
+ */
+GAPI_EXPORTS_W GMat warpAffine(const GMat& src, const Mat& M, const Size& dsize, int flags = cv::INTER_LINEAR,
+                               int borderMode = cv::BORDER_CONSTANT, const Scalar& borderValue = Scalar());
+//! @} gapi_transform
+
+/** @brief Finds centers of clusters and groups input samples around the clusters.
+
+The function kmeans implements a k-means algorithm that finds the centers of K clusters
+and groups the input samples around the clusters. As an output, \f$\texttt{bestLabels}_i\f$
+contains a 0-based cluster index for the \f$i^{th}\f$ sample.
+
+@note
+ - Function textual ID is "org.opencv.core.kmeansND"
+ - In case of an N-dimentional points' set given, input GMat can have the following traits:
+2 dimensions, a single row or column if there are N channels,
+or N columns if there is a single channel. Mat should have @ref CV_32F depth.
+ - Although, if GMat with height != 1, width != 1, channels != 1 given as data, n-dimensional
+samples are considered given in amount of A, where A = height, n = width * channels.
+ - In case of GMat given as data:
+     - the output labels are returned as 1-channel GMat with sizes
+width = 1, height = A, where A is samples amount, or width = bestLabels.width,
+height = bestLabels.height if bestLabels given;
+     - the cluster centers are returned as 1-channel GMat with sizes
+width = n, height = K, where n is samples' dimentionality and K is clusters' amount.
+ - As one of possible usages, if you want to control the initial labels for each attempt
+by yourself, you can utilize just the core of the function. To do that, set the number
+of attempts to 1, initialize labels each time using a custom algorithm, pass them with the
+( flags = #KMEANS_USE_INITIAL_LABELS ) flag, and then choose the best (most-compact) clustering.
+
+@param data Data for clustering. An array of N-Dimensional points with float coordinates is needed.
+Function can take GArray<Point2f>, GArray<Point3f> for 2D and 3D cases or GMat for any
+dimentionality and channels.
+@param K Number of clusters to split the set by.
+@param bestLabels Optional input integer array that can store the supposed initial cluster indices
+for every sample. Used when ( flags = #KMEANS_USE_INITIAL_LABELS ) flag is set.
+@param criteria The algorithm termination criteria, that is, the maximum number of iterations
+and/or the desired accuracy. The accuracy is specified as criteria.epsilon. As soon as each of
+the cluster centers moves by less than criteria.epsilon on some iteration, the algorithm stops.
+@param attempts Flag to specify the number of times the algorithm is executed using different
+initial labellings. The algorithm returns the labels that yield the best compactness (see the first
+function return value).
+@param flags Flag that can take values of cv::KmeansFlags .
+
+@return
+ - Compactness measure that is computed as
+\f[\sum _i  \| \texttt{samples} _i -  \texttt{centers} _{ \texttt{labels} _i} \| ^2\f]
+after every attempt. The best (minimum) value is chosen and the corresponding labels and the
+compactness value are returned by the function.
+ - Integer array that stores the cluster indices for every sample.
+ - Array of the cluster centers.
+*/
+GAPI_EXPORTS_W std::tuple<GOpaque<double>,GMat,GMat>
+kmeans(const GMat& data, const int K, const GMat& bestLabels,
+       const TermCriteria& criteria, const int attempts, const KmeansFlags flags);
+
+/** @overload
+@note
+ - Function textual ID is "org.opencv.core.kmeansNDNoInit"
+ - #KMEANS_USE_INITIAL_LABELS flag must not be set while using this overload.
+ */
+GAPI_EXPORTS_W std::tuple<GOpaque<double>,GMat,GMat>
+kmeans(const GMat& data, const int K, const TermCriteria& criteria, const int attempts,
+       const KmeansFlags flags);
+
+/** @overload
+@note Function textual ID is "org.opencv.core.kmeans2D"
+ */
+GAPI_EXPORTS_W std::tuple<GOpaque<double>,GArray<int>,GArray<Point2f>>
+kmeans(const GArray<Point2f>& data, const int K, const GArray<int>& bestLabels,
+       const TermCriteria& criteria, const int attempts, const KmeansFlags flags);
+
+/** @overload
+@note Function textual ID is "org.opencv.core.kmeans3D"
+ */
+GAPI_EXPORTS_W std::tuple<GOpaque<double>,GArray<int>,GArray<Point3f>>
+kmeans(const GArray<Point3f>& data, const int K, const GArray<int>& bestLabels,
+       const TermCriteria& criteria, const int attempts, const KmeansFlags flags);
+
+
+/** @brief Transposes a matrix.
+
+The function transposes the matrix:
+\f[\texttt{dst} (i,j) =  \texttt{src} (j,i)\f]
+
+@note
+ - Function textual ID is "org.opencv.core.transpose"
+ - No complex conjugation is done in case of a complex matrix. It should be done separately if needed.
+
+@param src input array.
+*/
+GAPI_EXPORTS_W GMat transpose(const GMat& src);
+
+
+namespace streaming {
+/** @brief Gets dimensions from Mat.
+
+@note Function textual ID is "org.opencv.streaming.size"
+
+@param src Input tensor
+@return Size (tensor dimensions).
+*/
+GAPI_EXPORTS_W GOpaque<Size> size(const GMat& src);
+
+/** @overload
+Gets dimensions from rectangle.
+
+@note Function textual ID is "org.opencv.streaming.sizeR"
+
+@param r Input rectangle.
+@return Size (rectangle dimensions).
+*/
+GAPI_EXPORTS_W GOpaque<Size> size(const GOpaque<Rect>& r);
+
+/** @brief Gets dimensions from MediaFrame.
+
+@note Function textual ID is "org.opencv.streaming.sizeMF"
+
+@param src Input frame
+@return Size (frame dimensions).
+*/
+GAPI_EXPORTS_W GOpaque<Size> size(const GFrame& src);
+} //namespace streaming
+} //namespace gapi
+} //namespace cv
+
+#endif //OPENCV_GAPI_CORE_HPP
diff --git a/3rdParty/opencv2/gapi/cpu/core.hpp b/3rdParty/opencv-4.12.0/opencv2/gapi/cpu/core.hpp
similarity index 100%
rename from 3rdParty/opencv2/gapi/cpu/core.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/gapi/cpu/core.hpp
diff --git a/3rdParty/opencv2/gapi/cpu/gcpukernel.hpp b/3rdParty/opencv-4.12.0/opencv2/gapi/cpu/gcpukernel.hpp
similarity index 96%
rename from 3rdParty/opencv2/gapi/cpu/gcpukernel.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/gapi/cpu/gcpukernel.hpp
index e81198a7a5..86071bf7c4 100644
--- a/3rdParty/opencv2/gapi/cpu/gcpukernel.hpp
+++ b/3rdParty/opencv-4.12.0/opencv2/gapi/cpu/gcpukernel.hpp
@@ -8,9 +8,9 @@
 #ifndef OPENCV_GAPI_GCPUKERNEL_HPP
 #define OPENCV_GAPI_GCPUKERNEL_HPP
 
-#ifdef _MSC_VER
-#pragma warning(disable: 4702)  // "Unreachable code"
-// on postprocess(...) call inside OCVCallHelper
+#if defined _MSC_VER
+#pragma warning(push)
+#pragma warning(disable: 4702)  // "Unreachable code" on postprocess(...) call inside OCVCallHelper
 #endif
 
 #include <functional>
@@ -535,4 +535,8 @@ gapi::cpu::GOCVFunctor gapi::cpu::ocv_kernel(const Callable& c)
 
 } // namespace cv
 
+#if defined _MSC_VER
+#pragma warning(pop)
+#endif
+
 #endif // OPENCV_GAPI_GCPUKERNEL_HPP
diff --git a/3rdParty/opencv2/gapi/cpu/imgproc.hpp b/3rdParty/opencv-4.12.0/opencv2/gapi/cpu/imgproc.hpp
similarity index 100%
rename from 3rdParty/opencv2/gapi/cpu/imgproc.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/gapi/cpu/imgproc.hpp
diff --git a/3rdParty/opencv-4.12.0/opencv2/gapi/cpu/ot.hpp b/3rdParty/opencv-4.12.0/opencv2/gapi/cpu/ot.hpp
new file mode 100644
index 0000000000..047e935716
--- /dev/null
+++ b/3rdParty/opencv-4.12.0/opencv2/gapi/cpu/ot.hpp
@@ -0,0 +1,29 @@
+// This file is part of OpenCV project.
+// It is subject to the license terms in the LICENSE file found in the top-level directory
+// of this distribution and at http://opencv.org/license.html.
+//
+// Copyright (C) 2018 Intel Corporation
+
+
+#ifndef OPENCV_GAPI_CPU_OT_API_HPP
+#define OPENCV_GAPI_CPU_OT_API_HPP
+
+#include <opencv2/core/cvdef.h>     // GAPI_EXPORTS
+#include <opencv2/gapi/gkernel.hpp> // GKernelPackage
+
+namespace cv {
+namespace gapi {
+/**
+ * @brief This namespace contains G-API Operation Types for
+ * VAS Object Tracking module functionality.
+ */
+namespace ot {
+namespace cpu {
+GAPI_EXPORTS_W GKernelPackage kernels();
+} // namespace cpu
+} // namespace ot
+} // namespace gapi
+} // namespace cv
+
+
+#endif // OPENCV_GAPI_CPU_OT_API_HPP
diff --git a/3rdParty/opencv2/gapi/cpu/stereo.hpp b/3rdParty/opencv-4.12.0/opencv2/gapi/cpu/stereo.hpp
similarity index 100%
rename from 3rdParty/opencv2/gapi/cpu/stereo.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/gapi/cpu/stereo.hpp
diff --git a/3rdParty/opencv2/gapi/cpu/video.hpp b/3rdParty/opencv-4.12.0/opencv2/gapi/cpu/video.hpp
similarity index 100%
rename from 3rdParty/opencv2/gapi/cpu/video.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/gapi/cpu/video.hpp
diff --git a/3rdParty/opencv2/gapi/fluid/core.hpp b/3rdParty/opencv-4.12.0/opencv2/gapi/fluid/core.hpp
similarity index 100%
rename from 3rdParty/opencv2/gapi/fluid/core.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/gapi/fluid/core.hpp
diff --git a/3rdParty/opencv2/gapi/fluid/gfluidbuffer.hpp b/3rdParty/opencv-4.12.0/opencv2/gapi/fluid/gfluidbuffer.hpp
similarity index 100%
rename from 3rdParty/opencv2/gapi/fluid/gfluidbuffer.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/gapi/fluid/gfluidbuffer.hpp
diff --git a/3rdParty/opencv2/gapi/fluid/gfluidkernel.hpp b/3rdParty/opencv-4.12.0/opencv2/gapi/fluid/gfluidkernel.hpp
similarity index 96%
rename from 3rdParty/opencv2/gapi/fluid/gfluidkernel.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/gapi/fluid/gfluidkernel.hpp
index cc5341575b..87d42a6fc5 100644
--- a/3rdParty/opencv2/gapi/fluid/gfluidkernel.hpp
+++ b/3rdParty/opencv-4.12.0/opencv2/gapi/fluid/gfluidkernel.hpp
@@ -248,11 +248,11 @@ struct scratch_helper<false, Impl, Ins...>
                           const cv::GArgs     &,
                           gapi::fluid::Buffer &)
     {
-        GAPI_Assert(false);
+        GAPI_Error("InternalError");
     }
     static void help_reset(gapi::fluid::Buffer &)
     {
-        GAPI_Assert(false);
+        GAPI_Error("InternalError");
     }
 };
 
diff --git a/3rdParty/opencv-4.12.0/opencv2/gapi/fluid/imgproc.hpp b/3rdParty/opencv-4.12.0/opencv2/gapi/fluid/imgproc.hpp
new file mode 100644
index 0000000000..31fc2446dc
--- /dev/null
+++ b/3rdParty/opencv-4.12.0/opencv2/gapi/fluid/imgproc.hpp
@@ -0,0 +1,20 @@
+// This file is part of OpenCV project.
+// It is subject to the license terms in the LICENSE file found in the top-level directory
+// of this distribution and at http://opencv.org/license.html.
+//
+// Copyright (C) 2018 Intel Corporation
+
+
+#ifndef OPENCV_GAPI_FLUID_IMGPROC_HPP
+#define OPENCV_GAPI_FLUID_IMGPROC_HPP
+
+#include <opencv2/gapi/gkernel.hpp> // GKernelPackage
+#include <opencv2/gapi/own/exports.hpp> // GAPI_EXPORTS
+
+namespace cv { namespace gapi { namespace imgproc { namespace fluid {
+
+GAPI_EXPORTS_W GKernelPackage kernels();
+
+}}}}
+
+#endif // OPENCV_GAPI_FLUID_IMGPROC_HPP
diff --git a/3rdParty/opencv2/gapi/garg.hpp b/3rdParty/opencv-4.12.0/opencv2/gapi/garg.hpp
similarity index 96%
rename from 3rdParty/opencv2/gapi/garg.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/gapi/garg.hpp
index 063f4bc994..3c06d851f0 100644
--- a/3rdParty/opencv2/gapi/garg.hpp
+++ b/3rdParty/opencv-4.12.0/opencv2/gapi/garg.hpp
@@ -241,6 +241,7 @@ namespace gapi
  *
  * @brief G-API functions and classes for serialization and deserialization.
  */
+
 /** @brief Wraps deserialized output GRunArgs to GRunArgsP which can be used by GCompiled.
  *
  * Since it's impossible to get modifiable output arguments from deserialization
@@ -254,6 +255,7 @@ namespace gapi
  * @see deserialize
  */
 GAPI_EXPORTS cv::GRunArgsP bind(cv::GRunArgs &out_args);
+
 /** @brief Wraps output GRunArgsP available during graph execution to GRunArgs which can be serialized.
  *
  * GRunArgsP is pointer-to-value, so to be serialized they need to be binded to real values
diff --git a/3rdParty/opencv2/gapi/garray.hpp b/3rdParty/opencv-4.12.0/opencv2/gapi/garray.hpp
similarity index 96%
rename from 3rdParty/opencv2/gapi/garray.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/gapi/garray.hpp
index 81693715f2..f04ca521d8 100644
--- a/3rdParty/opencv2/gapi/garray.hpp
+++ b/3rdParty/opencv-4.12.0/opencv2/gapi/garray.hpp
@@ -102,17 +102,17 @@ namespace detail
         GAPI_Assert(m_hint != nullptr);
         using U = typename std::decay<T>::type;
         return dynamic_cast<TypeHint<U>*>(m_hint.get()) != nullptr;
-    };
+    }
 
     template <typename T>
     void GArrayU::specifyType(){
         m_hint.reset(new TypeHint<typename std::decay<T>::type>);
-    };
+    }
 
     template <typename T>
     void GArrayU::storeKind(){
         setKind(cv::detail::GOpaqueTraits<T>::kind);
-    };
+    }
 
     // This class represents a typed STL vector reference.
     // Depending on origins, this reference may be either "just a" reference to
@@ -177,7 +177,7 @@ namespace detail
             {
                 util::get<rw_own_t>(m_ref).clear();
             }
-            else GAPI_Assert(false); // shouldn't be called in *EXT modes
+            else GAPI_Error("InternalError"); // shouldn't be called in *EXT modes
         }
 
         // Obtain a WRITE reference to underlying object
diff --git a/3rdParty/opencv2/gapi/gasync_context.hpp b/3rdParty/opencv-4.12.0/opencv2/gapi/gasync_context.hpp
similarity index 100%
rename from 3rdParty/opencv2/gapi/gasync_context.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/gapi/gasync_context.hpp
diff --git a/3rdParty/opencv2/gapi/gcall.hpp b/3rdParty/opencv-4.12.0/opencv2/gapi/gcall.hpp
similarity index 100%
rename from 3rdParty/opencv2/gapi/gcall.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/gapi/gcall.hpp
diff --git a/3rdParty/opencv2/gapi/gcommon.hpp b/3rdParty/opencv-4.12.0/opencv2/gapi/gcommon.hpp
similarity index 89%
rename from 3rdParty/opencv2/gapi/gcommon.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/gapi/gcommon.hpp
index 9503e1e8e6..97bd9cb2dc 100644
--- a/3rdParty/opencv2/gapi/gcommon.hpp
+++ b/3rdParty/opencv-4.12.0/opencv2/gapi/gcommon.hpp
@@ -51,6 +51,7 @@ namespace detail
         CV_STRING,     // std::string user G-API data
         CV_POINT,      // cv::Point user G-API data
         CV_POINT2F,    // cv::Point2f user G-API data
+        CV_POINT3F,    // cv::Point3f user G-API data
         CV_SIZE,       // cv::Size user G-API data
         CV_RECT,       // cv::Rect user G-API data
         CV_SCALAR,     // cv::Scalar user G-API data
@@ -72,16 +73,17 @@ namespace detail
     template<> struct GOpaqueTraits<cv::Scalar>  { static constexpr const OpaqueKind kind = OpaqueKind::CV_SCALAR; };
     template<> struct GOpaqueTraits<cv::Point>   { static constexpr const OpaqueKind kind = OpaqueKind::CV_POINT; };
     template<> struct GOpaqueTraits<cv::Point2f> { static constexpr const OpaqueKind kind = OpaqueKind::CV_POINT2F; };
+    template<> struct GOpaqueTraits<cv::Point3f> { static constexpr const OpaqueKind kind = OpaqueKind::CV_POINT3F; };
     template<> struct GOpaqueTraits<cv::Mat>     { static constexpr const OpaqueKind kind = OpaqueKind::CV_MAT; };
     template<> struct GOpaqueTraits<cv::Rect>    { static constexpr const OpaqueKind kind = OpaqueKind::CV_RECT; };
     template<> struct GOpaqueTraits<cv::GMat>    { static constexpr const OpaqueKind kind = OpaqueKind::CV_MAT; };
     template<> struct GOpaqueTraits<cv::gapi::wip::draw::Prim>
                                                  { static constexpr const OpaqueKind kind = OpaqueKind::CV_DRAW_PRIM; };
     using GOpaqueTraitsArrayTypes = std::tuple<int, double, float, uint64_t, bool, std::string, cv::Size, cv::Scalar, cv::Point, cv::Point2f,
-                                               cv::Mat, cv::Rect, cv::gapi::wip::draw::Prim>;
+                                               cv::Point3f, cv::Mat, cv::Rect, cv::gapi::wip::draw::Prim>;
     // GOpaque is not supporting cv::Mat and cv::Scalar since there are GScalar and GMat types
-    using GOpaqueTraitsOpaqueTypes = std::tuple<int, double, float, uint64_t, bool, std::string, cv::Size, cv::Point, cv::Point2f, cv::Rect,
-                                                cv::gapi::wip::draw::Prim>;
+    using GOpaqueTraitsOpaqueTypes = std::tuple<int, double, float, uint64_t, bool, std::string, cv::Size, cv::Point, cv::Point2f, cv::Point3f,
+                                                cv::Rect, cv::gapi::wip::draw::Prim>;
 } // namespace detail
 
 // This definition is here because it is reused by both public(?) and internal
@@ -247,6 +249,8 @@ template<typename T> struct wrap_serialize
 } // namespace s11n
 } // namespace gapi
 
+/** @} gapi_compile_args */
+
 /**
  * @brief Ask G-API to dump compiled graph in Graphviz format under
  * the given file name.
@@ -259,7 +263,20 @@ struct graph_dump_path
 {
     std::string m_dump_path;
 };
-/** @} */
+
+/**
+ * @brief Ask G-API to use threaded executor when cv::GComputation
+ * is compiled via cv::GComputation::compile method.
+ *
+ * Specifies a number of threads that should be used by executor.
+ */
+struct GAPI_EXPORTS use_threaded_executor
+{
+    use_threaded_executor();
+    explicit use_threaded_executor(const uint32_t nthreads);
+
+    uint32_t num_threads;
+};
 
 namespace detail
 {
@@ -267,6 +284,11 @@ namespace detail
     {
         static const char* tag() { return "gapi.graph_dump_path"; }
     };
+
+    template<> struct CompileArgTag<cv::use_threaded_executor>
+    {
+        static const char* tag() { return "gapi.threaded_executor"; }
+    };
 }
 
 } // namespace cv
diff --git a/3rdParty/opencv2/gapi/gcompiled.hpp b/3rdParty/opencv-4.12.0/opencv2/gapi/gcompiled.hpp
similarity index 100%
rename from 3rdParty/opencv2/gapi/gcompiled.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/gapi/gcompiled.hpp
diff --git a/3rdParty/opencv2/gapi/gcompiled_async.hpp b/3rdParty/opencv-4.12.0/opencv2/gapi/gcompiled_async.hpp
similarity index 100%
rename from 3rdParty/opencv2/gapi/gcompiled_async.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/gapi/gcompiled_async.hpp
diff --git a/3rdParty/opencv2/gapi/gcompoundkernel.hpp b/3rdParty/opencv-4.12.0/opencv2/gapi/gcompoundkernel.hpp
similarity index 100%
rename from 3rdParty/opencv2/gapi/gcompoundkernel.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/gapi/gcompoundkernel.hpp
diff --git a/3rdParty/opencv2/gapi/gcomputation.hpp b/3rdParty/opencv-4.12.0/opencv2/gapi/gcomputation.hpp
similarity index 97%
rename from 3rdParty/opencv2/gapi/gcomputation.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/gapi/gcomputation.hpp
index a06475908d..4803c7d999 100644
--- a/3rdParty/opencv2/gapi/gcomputation.hpp
+++ b/3rdParty/opencv-4.12.0/opencv2/gapi/gcomputation.hpp
@@ -50,6 +50,7 @@ namespace s11n {
  *
  * @brief G-API classes for constructed and compiled graphs.
  */
+
 /**
  * @brief GComputation class represents a captured computation
  * graph. GComputation objects form boundaries for expression code
diff --git a/3rdParty/opencv2/gapi/gcomputation_async.hpp b/3rdParty/opencv-4.12.0/opencv2/gapi/gcomputation_async.hpp
similarity index 100%
rename from 3rdParty/opencv2/gapi/gcomputation_async.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/gapi/gcomputation_async.hpp
diff --git a/3rdParty/opencv2/gapi/gframe.hpp b/3rdParty/opencv-4.12.0/opencv2/gapi/gframe.hpp
similarity index 100%
rename from 3rdParty/opencv2/gapi/gframe.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/gapi/gframe.hpp
diff --git a/3rdParty/opencv2/gapi/gkernel.hpp b/3rdParty/opencv-4.12.0/opencv2/gapi/gkernel.hpp
similarity index 95%
rename from 3rdParty/opencv2/gapi/gkernel.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/gapi/gkernel.hpp
index 6e418d921f..2cfd0fb877 100644
--- a/3rdParty/opencv2/gapi/gkernel.hpp
+++ b/3rdParty/opencv-4.12.0/opencv2/gapi/gkernel.hpp
@@ -51,6 +51,7 @@ struct GAPI_EXPORTS GKernel
     GShapes     outShapes;  // types (shapes) kernel's outputs
     GKinds      inKinds;    // kinds of kernel's inputs (fixme: below)
     GCtors      outCtors;   // captured constructors for template output types
+    GKinds      outKinds;   // kinds of kernel's outputs (fixme: below)
 };
 // TODO: It's questionable if inKinds should really be here. Instead,
 // this information could come from meta.
@@ -227,7 +228,8 @@ class GKernelTypeM<K, std::function<std::tuple<R...>(Args...)> >
                               , &K::getOutMeta
                               , {detail::GTypeTraits<R>::shape...}
                               , {detail::GTypeTraits<Args>::op_kind...}
-                              , {detail::GObtainCtor<R>::get()...}});
+                              , {detail::GObtainCtor<R>::get()...}
+                              , {detail::GTypeTraits<R>::op_kind...}});
         call.pass(args...); // TODO: std::forward() here?
         return yield(call, typename detail::MkSeq<sizeof...(R)>::type());
     }
@@ -251,7 +253,8 @@ class GKernelType<K, std::function<R(Args...)> >
                               , &K::getOutMeta
                               , {detail::GTypeTraits<R>::shape}
                               , {detail::GTypeTraits<Args>::op_kind...}
-                              , {detail::GObtainCtor<R>::get()}});
+                              , {detail::GObtainCtor<R>::get()}
+                              , {detail::GTypeTraits<R>::op_kind}});
         call.pass(args...);
         return detail::Yield<R>::yield(call, 0);
     }
@@ -414,8 +417,8 @@ namespace cv {
     class GAPI_EXPORTS_W_SIMPLE GKernelPackage;
 
 namespace gapi {
-    GAPI_EXPORTS cv::GKernelPackage combine(const cv::GKernelPackage  &lhs,
-                                            const cv::GKernelPackage  &rhs);
+    GAPI_EXPORTS_W cv::GKernelPackage combine(const cv::GKernelPackage  &lhs,
+                                              const cv::GKernelPackage  &rhs);
 
     /// @private
     class GFunctor
@@ -427,7 +430,7 @@ namespace gapi {
 
         virtual ~GFunctor() = default;
     protected:
-        GFunctor(const char* id) : m_id(id) { };
+        GFunctor(const char* id) : m_id(id) { }
     private:
         const char* m_id;
     };
@@ -513,7 +516,7 @@ namespace gapi {
          *
          * @return a number of kernels in the package
          */
-        std::size_t size() const;
+        GAPI_WRAP std::size_t size() const;
 
         /**
          * @brief Returns vector of transformations included in the package
@@ -689,7 +692,7 @@ namespace gapi {
         int unused[] = { 0, (pkg.include<KK>(), 0)... };
         cv::util::suppress_unused_warning(unused);
         return pkg;
-    };
+    }
 
     template<typename... FF>
     GKernelPackage kernels(FF&... functors)
@@ -698,7 +701,7 @@ namespace gapi {
         int unused[] = { 0, (pkg.include(functors), 0)... };
         cv::util::suppress_unused_warning(unused);
         return pkg;
-    };
+    }
 
     /** @} */
 
@@ -717,6 +720,8 @@ namespace gapi {
     {
         return combine(a, combine(b, rest...));
     }
+    // NB(DM): Variadic-arg version in Python may require the same
+    // approach as used in GComputation::compile/apply.
 
     /** \addtogroup gapi_compile_args
      * @{
diff --git a/3rdParty/opencv2/gapi/gmat.hpp b/3rdParty/opencv-4.12.0/opencv2/gapi/gmat.hpp
similarity index 91%
rename from 3rdParty/opencv2/gapi/gmat.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/gapi/gmat.hpp
index 77bdd27b4e..27ac65e78f 100644
--- a/3rdParty/opencv2/gapi/gmat.hpp
+++ b/3rdParty/opencv-4.12.0/opencv2/gapi/gmat.hpp
@@ -48,6 +48,7 @@ struct GOrigin;
  *    `cv::GOpaque<T>`   | T
  *    cv::GFrame         | cv::MediaFrame
  */
+
 /**
  * @brief GMat class represents image or tensor data in the
  * graph.
@@ -76,6 +77,18 @@ class GAPI_EXPORTS_W_SIMPLE GMat
      */
     GAPI_WRAP GMat();                       // Empty constructor
 
+    /**
+     * @brief Constructs a value-initialized GMat
+     *
+     * GMat may be associated with a buffer at graph construction time.
+     * It is useful when some operation has a Mat input which doesn't
+     * change during the program execution, and is set only once.
+     * In this case, there's no need to declare such GMat as graph input.
+     *
+     * @param m a cv::Mat buffer to associate with this GMat object.
+     */
+    GAPI_WRAP explicit GMat(cv::Mat m);     // Value-initialization constructor
+
     /// @private
     GMat(const GNode &n, std::size_t out);  // Operation result constructor
     /// @private
diff --git a/3rdParty/opencv2/gapi/gmetaarg.hpp b/3rdParty/opencv-4.12.0/opencv2/gapi/gmetaarg.hpp
similarity index 100%
rename from 3rdParty/opencv2/gapi/gmetaarg.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/gapi/gmetaarg.hpp
diff --git a/3rdParty/opencv2/gapi/gopaque.hpp b/3rdParty/opencv-4.12.0/opencv2/gapi/gopaque.hpp
similarity index 96%
rename from 3rdParty/opencv2/gapi/gopaque.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/gapi/gopaque.hpp
index 387f05a245..207556f0b7 100644
--- a/3rdParty/opencv2/gapi/gopaque.hpp
+++ b/3rdParty/opencv-4.12.0/opencv2/gapi/gopaque.hpp
@@ -98,18 +98,18 @@ namespace detail
         GAPI_Assert(m_hint != nullptr);
         using U = util::decay_t<T>;
         return dynamic_cast<TypeHint<U>*>(m_hint.get()) != nullptr;
-    };
+    }
 
     template <typename T>
     void GOpaqueU::specifyType(){
         m_hint.reset(new TypeHint<util::decay_t<T>>);
-    };
+    }
 
     template <typename T>
     void GOpaqueU::storeKind(){
         // FIXME: Add assert here on cv::Mat and cv::Scalar?
         setKind(cv::detail::GOpaqueTraits<T>::kind);
-    };
+    }
 
     // This class represents a typed object reference.
     // Depending on origins, this reference may be either "just a" reference to
@@ -171,7 +171,7 @@ namespace detail
             {
                 util::get<rw_own_t>(m_ref) = {};
             }
-            else GAPI_Assert(false); // shouldn't be called in *EXT modes
+            else GAPI_Error("InternalError"); // shouldn't be called in *EXT modes
         }
 
         // Obtain a WRITE reference to underlying object
diff --git a/3rdParty/opencv2/gapi/gproto.hpp b/3rdParty/opencv-4.12.0/opencv2/gapi/gproto.hpp
similarity index 100%
rename from 3rdParty/opencv2/gapi/gproto.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/gapi/gproto.hpp
diff --git a/3rdParty/opencv2/gapi/gpu/core.hpp b/3rdParty/opencv-4.12.0/opencv2/gapi/gpu/core.hpp
similarity index 100%
rename from 3rdParty/opencv2/gapi/gpu/core.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/gapi/gpu/core.hpp
diff --git a/3rdParty/opencv2/gapi/gpu/ggpukernel.hpp b/3rdParty/opencv-4.12.0/opencv2/gapi/gpu/ggpukernel.hpp
similarity index 100%
rename from 3rdParty/opencv2/gapi/gpu/ggpukernel.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/gapi/gpu/ggpukernel.hpp
diff --git a/3rdParty/opencv2/gapi/gpu/imgproc.hpp b/3rdParty/opencv-4.12.0/opencv2/gapi/gpu/imgproc.hpp
similarity index 100%
rename from 3rdParty/opencv2/gapi/gpu/imgproc.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/gapi/gpu/imgproc.hpp
diff --git a/3rdParty/opencv2/gapi/gscalar.hpp b/3rdParty/opencv-4.12.0/opencv2/gapi/gscalar.hpp
similarity index 87%
rename from 3rdParty/opencv2/gapi/gscalar.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/gapi/gscalar.hpp
index 7697b10548..03a70dfc32 100644
--- a/3rdParty/opencv2/gapi/gscalar.hpp
+++ b/3rdParty/opencv-4.12.0/opencv2/gapi/gscalar.hpp
@@ -54,12 +54,11 @@ class GAPI_EXPORTS_W_SIMPLE GScalar
     /**
      * @brief Constructs a value-initialized GScalar
      *
-     * In contrast with GMat (which can be either an explicit graph input
-     * or a result of some operation), GScalars may have their values
-     * be associated at graph construction time. It is useful when
-     * some operation has a GScalar input which doesn't change during
-     * the program execution, and is set only once. In this case,
-     * there is no need to declare such GScalar as a graph input.
+     * GScalars may have their values be associated at graph
+     * construction time. It is useful when some operation has a
+     * GScalar input which doesn't change during the program
+     * execution, and is set only once. In this case, there is no need
+     * to declare such GScalar as a graph input.
      *
      * @note The value of GScalar may be overwritten by assigning some
      * other GScalar to the object using `operator=` -- on the
@@ -67,6 +66,7 @@ class GAPI_EXPORTS_W_SIMPLE GScalar
      *
      * @param s a cv::Scalar value to associate with this GScalar object.
      */
+    GAPI_WRAP
     explicit GScalar(const cv::Scalar& s);
 
     /**
diff --git a/3rdParty/opencv2/gapi/gstreaming.hpp b/3rdParty/opencv-4.12.0/opencv2/gapi/gstreaming.hpp
similarity index 96%
rename from 3rdParty/opencv2/gapi/gstreaming.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/gapi/gstreaming.hpp
index 002967f5fb..8d4e15aa99 100644
--- a/3rdParty/opencv2/gapi/gstreaming.hpp
+++ b/3rdParty/opencv-4.12.0/opencv2/gapi/gstreaming.hpp
@@ -388,7 +388,6 @@ class GAPI_EXPORTS_W_SIMPLE GStreamingCompiled
     /// @private
     std::shared_ptr<Priv> m_priv;
 };
-/** @} */
 
 namespace gapi {
 
@@ -409,11 +408,10 @@ namespace streaming {
 struct GAPI_EXPORTS_W_SIMPLE queue_capacity
 {
     GAPI_WRAP
-    explicit queue_capacity(size_t cap = 1) : capacity(cap) { };
+    explicit queue_capacity(size_t cap = 1) : capacity(cap) { }
     GAPI_PROP_RW
     size_t capacity;
 };
-/** @} */
 } // namespace streaming
 } // namespace gapi
 
@@ -425,6 +423,8 @@ template<> struct CompileArgTag<cv::gapi::streaming::queue_capacity>
 };
 }
 
+/** @} gapi_main_classes */
+
 }
 
 #endif // OPENCV_GAPI_GSTREAMING_COMPILED_HPP
diff --git a/3rdParty/opencv2/gapi/gtransform.hpp b/3rdParty/opencv-4.12.0/opencv2/gapi/gtransform.hpp
similarity index 95%
rename from 3rdParty/opencv2/gapi/gtransform.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/gapi/gtransform.hpp
index bc9e509eb1..ae904d8164 100644
--- a/3rdParty/opencv2/gapi/gtransform.hpp
+++ b/3rdParty/opencv-4.12.0/opencv2/gapi/gtransform.hpp
@@ -91,7 +91,7 @@ class GTransformImpl<K, std::function<R(Args...)>> : public cv::detail::TransHel
     {                                                           \
     struct G_DESCR_HELPER_CLASS(Class)                          \
     {                                                           \
-        static constexpr const char *descr() { return Descr; }; \
+        static constexpr const char *descr() { return Descr; }  \
     };                                                          \
     }
 
diff --git a/3rdParty/opencv2/gapi/gtype_traits.hpp b/3rdParty/opencv-4.12.0/opencv2/gapi/gtype_traits.hpp
similarity index 95%
rename from 3rdParty/opencv2/gapi/gtype_traits.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/gapi/gtype_traits.hpp
index 35e99c9282..cbf5f8f417 100644
--- a/3rdParty/opencv2/gapi/gtype_traits.hpp
+++ b/3rdParty/opencv-4.12.0/opencv2/gapi/gtype_traits.hpp
@@ -141,8 +141,10 @@ namespace detail
     template<typename U> struct GTypeOf<std::vector<U> >       { using type = cv::GArray<U>; };
     template<typename U> struct GTypeOf                        { using type = cv::GOpaque<U>;};
     template<>           struct GTypeOf<cv::MediaFrame>        { using type = cv::GFrame;    };
-    // FIXME: This is not quite correct since IStreamSource may produce not only Mat but also Scalar
-    // and vector data. TODO: Extend the type dispatching on these types too.
+
+    // FIXME: This is not quite correct since IStreamSource may
+    // produce not only Mat but also MediaFrame, Scalar and vector
+    // data. TODO: Extend the type dispatching on these types too.
     template<>           struct GTypeOf<cv::gapi::wip::IStreamSource::Ptr> { using type = cv::GMat;};
     template<class T> using g_type_of_t = typename GTypeOf<T>::type;
 
@@ -229,10 +231,10 @@ template<typename T> struct GObtainCtor {
     static HostCtor get() { return HostCtor{}; }
 };
 template<typename T> struct GObtainCtor<GArray<T> > {
-    static HostCtor get() { return HostCtor{ConstructVec{&GArray<T>::VCtor}}; };
+    static HostCtor get() { return HostCtor{ConstructVec{&GArray<T>::VCtor}}; }
 };
 template<typename T> struct GObtainCtor<GOpaque<T> > {
-    static HostCtor get() { return HostCtor{ConstructOpaque{&GOpaque<T>::Ctor}}; };
+    static HostCtor get() { return HostCtor{ConstructOpaque{&GOpaque<T>::Ctor}}; }
 };
 } // namespace detail
 } // namespace cv
diff --git a/3rdParty/opencv2/gapi/gtyped.hpp b/3rdParty/opencv-4.12.0/opencv2/gapi/gtyped.hpp
similarity index 96%
rename from 3rdParty/opencv2/gapi/gtyped.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/gapi/gtyped.hpp
index 655be1748d..0bd1cdf7a9 100644
--- a/3rdParty/opencv2/gapi/gtyped.hpp
+++ b/3rdParty/opencv-4.12.0/opencv2/gapi/gtyped.hpp
@@ -40,7 +40,7 @@ namespace detail
     //workaround for MSVC 19.0 bug
     template <typename T>
     auto make_default()->decltype(T{}) {return {};}
-}; // detail
+} // detail
 
 /**
  * @brief This class is a typed wrapper over a regular GComputation.
diff --git a/3rdParty/opencv-4.12.0/opencv2/gapi/imgproc.hpp b/3rdParty/opencv-4.12.0/opencv2/gapi/imgproc.hpp
new file mode 100644
index 0000000000..67a34fbbc9
--- /dev/null
+++ b/3rdParty/opencv-4.12.0/opencv2/gapi/imgproc.hpp
@@ -0,0 +1,1769 @@
+// This file is part of OpenCV project.
+// It is subject to the license terms in the LICENSE file found in the top-level directory
+// of this distribution and at http://opencv.org/license.html.
+//
+// Copyright (C) 2018-2020 Intel Corporation
+
+
+#ifndef OPENCV_GAPI_IMGPROC_HPP
+#define OPENCV_GAPI_IMGPROC_HPP
+
+#include <opencv2/imgproc.hpp>
+
+#include <utility> // std::tuple
+
+#include <opencv2/gapi/gkernel.hpp>
+#include <opencv2/gapi/gmat.hpp>
+#include <opencv2/gapi/gscalar.hpp>
+
+
+/** \defgroup gapi_imgproc G-API Image processing functionality
+@{
+    @defgroup gapi_filters Graph API: Image filters
+    @defgroup gapi_colorconvert Graph API: Converting image from one color space to another
+    @defgroup gapi_feature Graph API: Image Feature Detection
+    @defgroup gapi_shape Graph API: Image Structural Analysis and Shape Descriptors
+    @defgroup gapi_transform Graph API: Image and channel composition functions
+@}
+ */
+
+namespace {
+void validateFindingContoursMeta(const int depth, const int chan, const int mode)
+{
+    GAPI_Assert(chan == 1);
+    switch (mode)
+    {
+    case cv::RETR_CCOMP:
+        GAPI_Assert(depth == CV_8U || depth == CV_32S);
+        break;
+    case cv::RETR_FLOODFILL:
+        GAPI_Assert(depth == CV_32S);
+        break;
+    default:
+        GAPI_Assert(depth == CV_8U);
+        break;
+    }
+}
+} // anonymous namespace
+
+namespace cv { namespace gapi {
+
+/**
+ * @brief This namespace contains G-API Operation Types for OpenCV
+ * ImgProc module functionality.
+ */
+namespace imgproc {
+    using GMat2 = std::tuple<GMat,GMat>;
+    using GMat3 = std::tuple<GMat,GMat,GMat>; // FIXME: how to avoid this?
+    using GFindContoursOutput = std::tuple<GArray<GArray<Point>>,GArray<Vec4i>>;
+
+    G_TYPED_KERNEL(GFilter2D, <GMat(GMat,int,Mat,Point,Scalar,int,Scalar)>, "org.opencv.imgproc.filters.filter2D") {
+        static GMatDesc outMeta(GMatDesc in, int ddepth, Mat, Point, Scalar, int, Scalar) {
+            return in.withDepth(ddepth);
+        }
+    };
+
+    G_TYPED_KERNEL(GSepFilter, <GMat(GMat,int,Mat,Mat,Point,Scalar,int,Scalar)>, "org.opencv.imgproc.filters.sepfilter") {
+        static GMatDesc outMeta(GMatDesc in, int ddepth, Mat, Mat, Point, Scalar, int, Scalar) {
+            return in.withDepth(ddepth);
+        }
+    };
+
+    G_TYPED_KERNEL(GBoxFilter, <GMat(GMat,int,Size,Point,bool,int,Scalar)>, "org.opencv.imgproc.filters.boxfilter") {
+        static GMatDesc outMeta(GMatDesc in, int ddepth, Size, Point, bool, int, Scalar) {
+            return in.withDepth(ddepth);
+        }
+    };
+
+    G_TYPED_KERNEL(GBlur, <GMat(GMat,Size,Point,int,Scalar)>, "org.opencv.imgproc.filters.blur") {
+        static GMatDesc outMeta(GMatDesc in, Size, Point, int, Scalar) {
+            return in;
+        }
+    };
+
+    G_TYPED_KERNEL(GGaussBlur, <GMat(GMat,Size,double,double,int,Scalar)>, "org.opencv.imgproc.filters.gaussianBlur") {
+        static GMatDesc outMeta(GMatDesc in, Size, double, double, int, Scalar) {
+            return in;
+        }
+    };
+
+    G_TYPED_KERNEL(GMedianBlur, <GMat(GMat,int)>, "org.opencv.imgproc.filters.medianBlur") {
+        static GMatDesc outMeta(GMatDesc in, int) {
+            return in;
+        }
+    };
+
+    G_TYPED_KERNEL(GErode, <GMat(GMat,Mat,Point,int,int,Scalar)>, "org.opencv.imgproc.filters.erode") {
+        static GMatDesc outMeta(GMatDesc in, Mat, Point, int, int, Scalar) {
+            return in;
+        }
+    };
+
+    G_TYPED_KERNEL(GDilate, <GMat(GMat,Mat,Point,int,int,Scalar)>, "org.opencv.imgproc.filters.dilate") {
+        static GMatDesc outMeta(GMatDesc in, Mat, Point, int, int, Scalar) {
+            return in;
+        }
+    };
+
+    G_TYPED_KERNEL(GMorphologyEx, <GMat(GMat,MorphTypes,Mat,Point,int,BorderTypes,Scalar)>,
+                   "org.opencv.imgproc.filters.morphologyEx") {
+        static GMatDesc outMeta(const GMatDesc &in, MorphTypes, Mat, Point, int,
+                                BorderTypes, Scalar) {
+            return in;
+        }
+    };
+
+    G_TYPED_KERNEL(GSobel, <GMat(GMat,int,int,int,int,double,double,int,Scalar)>, "org.opencv.imgproc.filters.sobel") {
+        static GMatDesc outMeta(GMatDesc in, int ddepth, int, int, int, double, double, int, Scalar) {
+            return in.withDepth(ddepth);
+        }
+    };
+
+    G_TYPED_KERNEL_M(GSobelXY, <GMat2(GMat,int,int,int,double,double,int,Scalar)>, "org.opencv.imgproc.filters.sobelxy") {
+        static std::tuple<GMatDesc, GMatDesc> outMeta(GMatDesc in, int ddepth, int, int, double, double, int, Scalar) {
+            return std::make_tuple(in.withDepth(ddepth), in.withDepth(ddepth));
+        }
+    };
+
+    G_TYPED_KERNEL(GLaplacian, <GMat(GMat,int, int, double, double, int)>,
+                   "org.opencv.imgproc.filters.laplacian") {
+        static GMatDesc outMeta(GMatDesc in, int ddepth, int, double, double, int) {
+            return in.withDepth(ddepth);
+        }
+    };
+
+    G_TYPED_KERNEL(GBilateralFilter, <GMat(GMat,int, double, double, int)>,
+                   "org.opencv.imgproc.filters.bilateralfilter") {
+        static GMatDesc outMeta(GMatDesc in, int, double, double, int) {
+            return in;
+        }
+    };
+
+    G_TYPED_KERNEL(GEqHist, <GMat(GMat)>, "org.opencv.imgproc.equalizeHist") {
+        static GMatDesc outMeta(GMatDesc in) {
+            return in.withType(CV_8U, 1);
+        }
+    };
+
+    G_TYPED_KERNEL(GCanny, <GMat(GMat,double,double,int,bool)>, "org.opencv.imgproc.feature.canny") {
+        static GMatDesc outMeta(GMatDesc in, double, double, int, bool) {
+            return in.withType(CV_8U, 1);
+        }
+    };
+
+    G_TYPED_KERNEL(GGoodFeatures,
+                   <cv::GArray<cv::Point2f>(GMat,int,double,double,Mat,int,bool,double)>,
+                   "org.opencv.imgproc.feature.goodFeaturesToTrack") {
+        static GArrayDesc outMeta(GMatDesc, int, double, double, const Mat&, int, bool, double) {
+            return empty_array_desc();
+        }
+    };
+
+    using RetrMode = RetrievalModes;
+    using ContMethod = ContourApproximationModes;
+    G_TYPED_KERNEL(GFindContours, <GArray<GArray<Point>>(GMat,RetrMode,ContMethod,GOpaque<Point>)>,
+                   "org.opencv.imgproc.shape.findContours")
+    {
+        static GArrayDesc outMeta(GMatDesc in, RetrMode mode, ContMethod, GOpaqueDesc)
+        {
+            validateFindingContoursMeta(in.depth, in.chan, mode);
+            return empty_array_desc();
+        }
+    };
+
+    // FIXME oc: make default value offset = Point()
+    G_TYPED_KERNEL(GFindContoursNoOffset, <GArray<GArray<Point>>(GMat,RetrMode,ContMethod)>,
+                   "org.opencv.imgproc.shape.findContoursNoOffset")
+    {
+        static GArrayDesc outMeta(GMatDesc in, RetrMode mode, ContMethod)
+        {
+            validateFindingContoursMeta(in.depth, in.chan, mode);
+            return empty_array_desc();
+        }
+    };
+
+    G_TYPED_KERNEL(GFindContoursH,<GFindContoursOutput(GMat,RetrMode,ContMethod,GOpaque<Point>)>,
+                   "org.opencv.imgproc.shape.findContoursH")
+    {
+        static std::tuple<GArrayDesc,GArrayDesc>
+        outMeta(GMatDesc in, RetrMode mode, ContMethod, GOpaqueDesc)
+        {
+            validateFindingContoursMeta(in.depth, in.chan, mode);
+            return std::make_tuple(empty_array_desc(), empty_array_desc());
+        }
+    };
+
+    // FIXME oc: make default value offset = Point()
+    G_TYPED_KERNEL(GFindContoursHNoOffset,<GFindContoursOutput(GMat,RetrMode,ContMethod)>,
+                   "org.opencv.imgproc.shape.findContoursHNoOffset")
+    {
+        static std::tuple<GArrayDesc,GArrayDesc>
+        outMeta(GMatDesc in, RetrMode mode, ContMethod)
+        {
+            validateFindingContoursMeta(in.depth, in.chan, mode);
+            return std::make_tuple(empty_array_desc(), empty_array_desc());
+        }
+    };
+
+    G_TYPED_KERNEL(GBoundingRectMat, <GOpaque<Rect>(GMat)>,
+                   "org.opencv.imgproc.shape.boundingRectMat") {
+        static GOpaqueDesc outMeta(GMatDesc in) {
+            if (in.depth == CV_8U)
+            {
+                GAPI_Assert(in.chan == 1);
+            }
+            else
+            {
+                GAPI_Assert (in.depth == CV_32S || in.depth == CV_32F);
+                int amount = detail::checkVector(in, 2u);
+                GAPI_Assert(amount != -1 &&
+                            "Input Mat can't be described as vector of 2-dimentional points");
+            }
+            return empty_gopaque_desc();
+        }
+    };
+
+    G_TYPED_KERNEL(GBoundingRectVector32S, <GOpaque<Rect>(GArray<Point2i>)>,
+                   "org.opencv.imgproc.shape.boundingRectVector32S") {
+        static GOpaqueDesc outMeta(GArrayDesc) {
+            return empty_gopaque_desc();
+        }
+    };
+
+    G_TYPED_KERNEL(GBoundingRectVector32F, <GOpaque<Rect>(GArray<Point2f>)>,
+                   "org.opencv.imgproc.shape.boundingRectVector32F") {
+        static GOpaqueDesc outMeta(GArrayDesc) {
+            return empty_gopaque_desc();
+        }
+    };
+
+    G_TYPED_KERNEL(GFitLine2DMat, <GOpaque<Vec4f>(GMat,DistanceTypes,double,double,double)>,
+                   "org.opencv.imgproc.shape.fitLine2DMat") {
+        static GOpaqueDesc outMeta(GMatDesc in,DistanceTypes,double,double,double) {
+            int amount = detail::checkVector(in, 2u);
+            GAPI_Assert(amount != -1 &&
+                        "Input Mat can't be described as vector of 2-dimentional points");
+            return empty_gopaque_desc();
+        }
+    };
+
+    G_TYPED_KERNEL(GFitLine2DVector32S,
+                   <GOpaque<Vec4f>(GArray<Point2i>,DistanceTypes,double,double,double)>,
+                   "org.opencv.imgproc.shape.fitLine2DVector32S") {
+        static GOpaqueDesc outMeta(GArrayDesc,DistanceTypes,double,double,double) {
+            return empty_gopaque_desc();
+        }
+    };
+
+    G_TYPED_KERNEL(GFitLine2DVector32F,
+                   <GOpaque<Vec4f>(GArray<Point2f>,DistanceTypes,double,double,double)>,
+                   "org.opencv.imgproc.shape.fitLine2DVector32F") {
+        static GOpaqueDesc outMeta(GArrayDesc,DistanceTypes,double,double,double) {
+            return empty_gopaque_desc();
+        }
+    };
+
+    G_TYPED_KERNEL(GFitLine2DVector64F,
+                   <GOpaque<Vec4f>(GArray<Point2d>,DistanceTypes,double,double,double)>,
+                   "org.opencv.imgproc.shape.fitLine2DVector64F") {
+        static GOpaqueDesc outMeta(GArrayDesc,DistanceTypes,double,double,double) {
+            return empty_gopaque_desc();
+        }
+    };
+
+    G_TYPED_KERNEL(GFitLine3DMat, <GOpaque<Vec6f>(GMat,DistanceTypes,double,double,double)>,
+                   "org.opencv.imgproc.shape.fitLine3DMat") {
+        static GOpaqueDesc outMeta(GMatDesc in,int,double,double,double) {
+            int amount = detail::checkVector(in, 3u);
+            GAPI_Assert(amount != -1 &&
+                        "Input Mat can't be described as vector of 3-dimentional points");
+            return empty_gopaque_desc();
+        }
+    };
+
+    G_TYPED_KERNEL(GFitLine3DVector32S,
+                   <GOpaque<Vec6f>(GArray<Point3i>,DistanceTypes,double,double,double)>,
+                   "org.opencv.imgproc.shape.fitLine3DVector32S") {
+        static GOpaqueDesc outMeta(GArrayDesc,DistanceTypes,double,double,double) {
+            return empty_gopaque_desc();
+        }
+    };
+
+    G_TYPED_KERNEL(GFitLine3DVector32F,
+                   <GOpaque<Vec6f>(GArray<Point3f>,DistanceTypes,double,double,double)>,
+                   "org.opencv.imgproc.shape.fitLine3DVector32F") {
+        static GOpaqueDesc outMeta(GArrayDesc,DistanceTypes,double,double,double) {
+            return empty_gopaque_desc();
+        }
+    };
+
+    G_TYPED_KERNEL(GFitLine3DVector64F,
+                   <GOpaque<Vec6f>(GArray<Point3d>,DistanceTypes,double,double,double)>,
+                   "org.opencv.imgproc.shape.fitLine3DVector64F") {
+        static GOpaqueDesc outMeta(GArrayDesc,DistanceTypes,double,double,double) {
+            return empty_gopaque_desc();
+        }
+    };
+
+    G_TYPED_KERNEL(GBGR2RGB, <GMat(GMat)>, "org.opencv.imgproc.colorconvert.bgr2rgb") {
+        static GMatDesc outMeta(GMatDesc in) {
+            return in; // type still remains CV_8UC3;
+        }
+    };
+
+    G_TYPED_KERNEL(GRGB2YUV, <GMat(GMat)>, "org.opencv.imgproc.colorconvert.rgb2yuv") {
+        static GMatDesc outMeta(GMatDesc in) {
+            return in; // type still remains CV_8UC3;
+        }
+    };
+
+    G_TYPED_KERNEL(GYUV2RGB, <GMat(GMat)>, "org.opencv.imgproc.colorconvert.yuv2rgb") {
+        static GMatDesc outMeta(GMatDesc in) {
+            return in; // type still remains CV_8UC3;
+        }
+    };
+
+    G_TYPED_KERNEL(GBGR2I420, <GMat(GMat)>, "org.opencv.imgproc.colorconvert.bgr2i420") {
+        static GMatDesc outMeta(GMatDesc in) {
+            GAPI_Assert(in.depth == CV_8U);
+            GAPI_Assert(in.chan == 3);
+            GAPI_Assert(in.size.height % 2 == 0);
+            return in.withType(in.depth, 1).withSize(Size(in.size.width, in.size.height * 3 / 2));
+        }
+    };
+
+    G_TYPED_KERNEL(GRGB2I420, <GMat(GMat)>, "org.opencv.imgproc.colorconvert.rgb2i420") {
+        static GMatDesc outMeta(GMatDesc in) {
+            GAPI_Assert(in.depth == CV_8U);
+            GAPI_Assert(in.chan == 3);
+            GAPI_Assert(in.size.height % 2 == 0);
+            return in.withType(in.depth, 1).withSize(Size(in.size.width, in.size.height * 3 / 2));
+        }
+    };
+
+    G_TYPED_KERNEL(GI4202BGR, <GMat(GMat)>, "org.opencv.imgproc.colorconvert.i4202bgr") {
+        static GMatDesc outMeta(GMatDesc in) {
+            GAPI_Assert(in.depth == CV_8U);
+            GAPI_Assert(in.chan == 1);
+            GAPI_Assert(in.size.height % 3 == 0);
+            return in.withType(in.depth, 3).withSize(Size(in.size.width, in.size.height * 2 / 3));
+        }
+    };
+
+    G_TYPED_KERNEL(GI4202RGB, <GMat(GMat)>, "org.opencv.imgproc.colorconvert.i4202rgb") {
+        static GMatDesc outMeta(GMatDesc in) {
+            GAPI_Assert(in.depth == CV_8U);
+            GAPI_Assert(in.chan == 1);
+            GAPI_Assert(in.size.height % 3 == 0);
+            return in.withType(in.depth, 3).withSize(Size(in.size.width, in.size.height * 2 / 3));
+        }
+    };
+
+    G_TYPED_KERNEL(GNV12toRGB, <GMat(GMat, GMat)>, "org.opencv.imgproc.colorconvert.nv12torgb") {
+        static GMatDesc outMeta(GMatDesc in_y, GMatDesc in_uv) {
+            GAPI_Assert(in_y.chan == 1);
+            GAPI_Assert(in_uv.chan == 2);
+            GAPI_Assert(in_y.depth == CV_8U);
+            GAPI_Assert(in_uv.depth == CV_8U);
+            // UV size should be aligned with Y
+            GAPI_Assert(in_y.size.width == 2 * in_uv.size.width);
+            GAPI_Assert(in_y.size.height == 2 * in_uv.size.height);
+            return in_y.withType(CV_8U, 3); // type will be CV_8UC3;
+        }
+    };
+
+    G_TYPED_KERNEL(GNV12toBGR, <GMat(GMat, GMat)>, "org.opencv.imgproc.colorconvert.nv12tobgr") {
+        static GMatDesc outMeta(GMatDesc in_y, GMatDesc in_uv) {
+            GAPI_Assert(in_y.chan == 1);
+            GAPI_Assert(in_uv.chan == 2);
+            GAPI_Assert(in_y.depth == CV_8U);
+            GAPI_Assert(in_uv.depth == CV_8U);
+            // UV size should be aligned with Y
+            GAPI_Assert(in_y.size.width == 2 * in_uv.size.width);
+            GAPI_Assert(in_y.size.height == 2 * in_uv.size.height);
+            return in_y.withType(CV_8U, 3); // type will be CV_8UC3;
+        }
+    };
+
+    G_TYPED_KERNEL(GRGB2Lab, <GMat(GMat)>, "org.opencv.imgproc.colorconvert.rgb2lab") {
+        static GMatDesc outMeta(GMatDesc in) {
+            return in; // type still remains CV_8UC3;
+        }
+    };
+
+    G_TYPED_KERNEL(GBGR2LUV, <GMat(GMat)>, "org.opencv.imgproc.colorconvert.bgr2luv") {
+        static GMatDesc outMeta(GMatDesc in) {
+            return in; // type still remains CV_8UC3;
+        }
+    };
+
+    G_TYPED_KERNEL(GLUV2BGR, <GMat(GMat)>, "org.opencv.imgproc.colorconvert.luv2bgr") {
+        static GMatDesc outMeta(GMatDesc in) {
+            return in; // type still remains CV_8UC3;
+        }
+    };
+
+    G_TYPED_KERNEL(GYUV2BGR, <GMat(GMat)>, "org.opencv.imgproc.colorconvert.yuv2bgr") {
+        static GMatDesc outMeta(GMatDesc in) {
+            return in; // type still remains CV_8UC3;
+        }
+    };
+
+    G_TYPED_KERNEL(GBGR2YUV, <GMat(GMat)>, "org.opencv.imgproc.colorconvert.bgr2yuv") {
+        static GMatDesc outMeta(GMatDesc in) {
+            return in; // type still remains CV_8UC3;
+        }
+    };
+
+    G_TYPED_KERNEL(GRGB2Gray, <GMat(GMat)>, "org.opencv.imgproc.colorconvert.rgb2gray") {
+        static GMatDesc outMeta(GMatDesc in) {
+            return in.withType(CV_8U, 1);
+        }
+    };
+
+    G_TYPED_KERNEL(GRGB2GrayCustom, <GMat(GMat,float,float,float)>, "org.opencv.imgproc.colorconvert.rgb2graycustom") {
+        static GMatDesc outMeta(GMatDesc in, float, float, float) {
+            return in.withType(CV_8U, 1);
+        }
+    };
+
+    G_TYPED_KERNEL(GBGR2Gray, <GMat(GMat)>, "org.opencv.imgproc.colorconvert.bgr2gray") {
+        static GMatDesc outMeta(GMatDesc in) {
+            return in.withType(CV_8U, 1);
+        }
+    };
+
+    G_TYPED_KERNEL(GBayerGR2RGB, <cv::GMat(cv::GMat)>, "org.opencv.imgproc.colorconvert.bayergr2rgb") {
+        static cv::GMatDesc outMeta(cv::GMatDesc in) {
+            return in.withType(CV_8U, 3);
+        }
+    };
+
+    G_TYPED_KERNEL(GRGB2HSV, <cv::GMat(cv::GMat)>, "org.opencv.imgproc.colorconvert.rgb2hsv") {
+        static cv::GMatDesc outMeta(cv::GMatDesc in) {
+            return in;
+        }
+    };
+
+    G_TYPED_KERNEL(GRGB2YUV422, <cv::GMat(cv::GMat)>, "org.opencv.imgproc.colorconvert.rgb2yuv422") {
+        static cv::GMatDesc outMeta(cv::GMatDesc in) {
+            GAPI_Assert(in.depth == CV_8U);
+            GAPI_Assert(in.chan == 3);
+            return in.withType(in.depth, 2);
+        }
+    };
+
+    G_TYPED_KERNEL(GNV12toRGBp, <GMatP(GMat,GMat)>, "org.opencv.imgproc.colorconvert.nv12torgbp") {
+        static GMatDesc outMeta(GMatDesc inY, GMatDesc inUV) {
+            GAPI_Assert(inY.depth == CV_8U);
+            GAPI_Assert(inUV.depth == CV_8U);
+            GAPI_Assert(inY.chan == 1);
+            GAPI_Assert(inY.planar == false);
+            GAPI_Assert(inUV.chan == 2);
+            GAPI_Assert(inUV.planar == false);
+            GAPI_Assert(inY.size.width  == 2 * inUV.size.width);
+            GAPI_Assert(inY.size.height == 2 * inUV.size.height);
+            return inY.withType(CV_8U, 3).asPlanar();
+        }
+    };
+
+    G_TYPED_KERNEL(GNV12toGray, <GMat(GMat,GMat)>, "org.opencv.imgproc.colorconvert.nv12togray") {
+        static GMatDesc outMeta(GMatDesc inY, GMatDesc inUV) {
+            GAPI_Assert(inY.depth   == CV_8U);
+            GAPI_Assert(inUV.depth  == CV_8U);
+            GAPI_Assert(inY.chan    == 1);
+            GAPI_Assert(inY.planar  == false);
+            GAPI_Assert(inUV.chan   == 2);
+            GAPI_Assert(inUV.planar == false);
+
+            GAPI_Assert(inY.size.width  == 2 * inUV.size.width);
+            GAPI_Assert(inY.size.height == 2 * inUV.size.height);
+            return inY.withType(CV_8U, 1);
+        }
+    };
+
+    G_TYPED_KERNEL(GNV12toBGRp, <GMatP(GMat,GMat)>, "org.opencv.imgproc.colorconvert.nv12tobgrp") {
+        static GMatDesc outMeta(GMatDesc inY, GMatDesc inUV) {
+            GAPI_Assert(inY.depth == CV_8U);
+            GAPI_Assert(inUV.depth == CV_8U);
+            GAPI_Assert(inY.chan == 1);
+            GAPI_Assert(inY.planar == false);
+            GAPI_Assert(inUV.chan == 2);
+            GAPI_Assert(inUV.planar == false);
+            GAPI_Assert(inY.size.width  == 2 * inUV.size.width);
+            GAPI_Assert(inY.size.height == 2 * inUV.size.height);
+            return inY.withType(CV_8U, 3).asPlanar();
+        }
+    };
+
+    G_TYPED_KERNEL(GResize, <GMat(GMat,Size,double,double,int)>, "org.opencv.imgproc.transform.resize") {
+        static GMatDesc outMeta(GMatDesc in, Size sz, double fx, double fy, int /*interp*/) {
+            if (sz.width != 0 && sz.height != 0)
+            {
+                return in.withSize(sz);
+            }
+            else
+            {
+                int outSz_w = saturate_cast<int>(in.size.width  * fx);
+                int outSz_h = saturate_cast<int>(in.size.height * fy);
+                GAPI_Assert(outSz_w > 0 && outSz_h > 0);
+                return in.withSize(Size(outSz_w, outSz_h));
+            }
+        }
+    };
+
+    G_TYPED_KERNEL(GResizeP, <GMatP(GMatP,Size,int)>, "org.opencv.imgproc.transform.resizeP") {
+        static GMatDesc outMeta(GMatDesc in, Size sz, int interp) {
+            GAPI_Assert(in.depth == CV_8U);
+            GAPI_Assert(in.chan == 3);
+            GAPI_Assert(in.planar);
+            GAPI_Assert(interp == cv::INTER_LINEAR);
+            return in.withSize(sz);
+        }
+    };
+
+} //namespace imgproc
+
+//! @addtogroup gapi_filters
+//! @{
+/** @brief Applies a separable linear filter to a matrix(image).
+
+The function applies a separable linear filter to the matrix. That is, first, every row of src is
+filtered with the 1D kernel kernelX. Then, every column of the result is filtered with the 1D
+kernel kernelY. The final result is returned.
+
+Supported matrix data types are @ref CV_8UC1, @ref CV_8UC3, @ref CV_16UC1, @ref CV_16SC1, @ref CV_32FC1.
+Output image must have the same type, size, and number of channels as the input image.
+@note
+ - In case of floating-point computation, rounding to nearest even is procedeed
+if hardware supports it (if not - to nearest value).
+ - Function textual ID is "org.opencv.imgproc.filters.sepfilter"
+@param src Source image.
+@param ddepth desired depth of the destination image (the following combinations of src.depth() and ddepth are supported:
+
+        src.depth() = CV_8U, ddepth = -1/CV_16S/CV_32F/CV_64F
+        src.depth() = CV_16U/CV_16S, ddepth = -1/CV_32F/CV_64F
+        src.depth() = CV_32F, ddepth = -1/CV_32F/CV_64F
+        src.depth() = CV_64F, ddepth = -1/CV_64F
+
+when ddepth=-1, the output image will have the same depth as the source)
+@param kernelX Coefficients for filtering each row.
+@param kernelY Coefficients for filtering each column.
+@param anchor Anchor position within the kernel. The default value \f$(-1,-1)\f$ means that the anchor
+is at the kernel center.
+@param delta Value added to the filtered results before storing them.
+@param borderType Pixel extrapolation method, see cv::BorderTypes
+@param borderValue border value in case of constant border type
+@sa  boxFilter, gaussianBlur, medianBlur
+ */
+GAPI_EXPORTS_W GMat sepFilter(const GMat& src, int ddepth, const Mat& kernelX, const Mat& kernelY, const Point& anchor /*FIXME: = Point(-1,-1)*/,
+                              const Scalar& delta /*FIXME = GScalar(0)*/, int borderType = BORDER_DEFAULT,
+                              const Scalar& borderValue = Scalar(0));
+
+/** @brief Convolves an image with the kernel.
+
+The function applies an arbitrary linear filter to an image. When
+the aperture is partially outside the image, the function interpolates outlier pixel values
+according to the specified border mode.
+
+The function does actually compute correlation, not the convolution:
+
+\f[\texttt{dst} (x,y) =  \sum _{ \substack{0\leq x' < \texttt{kernel.cols}\\{0\leq y' < \texttt{kernel.rows}}}}  \texttt{kernel} (x',y')* \texttt{src} (x+x'- \texttt{anchor.x} ,y+y'- \texttt{anchor.y} )\f]
+
+That is, the kernel is not mirrored around the anchor point. If you need a real convolution, flip
+the kernel using flip and set the new anchor to `(kernel.cols - anchor.x - 1, kernel.rows -
+anchor.y - 1)`.
+
+Supported matrix data types are @ref CV_8UC1, @ref CV_8UC3, @ref CV_16UC1, @ref CV_16SC1, @ref CV_32FC1.
+Output image must have the same size and number of channels an input image.
+@note
+ - Rounding to nearest even is procedeed if hardware supports it, if not - to nearest.
+ - Function textual ID is "org.opencv.imgproc.filters.filter2D"
+
+@param src input image.
+@param ddepth desired depth of the destination image
+@param kernel convolution kernel (or rather a correlation kernel), a single-channel floating point
+matrix; if you want to apply different kernels to different channels, split the image into
+separate color planes using split and process them individually.
+@param anchor anchor of the kernel that indicates the relative position of a filtered point within
+the kernel; the anchor should lie within the kernel; default value (-1,-1) means that the anchor
+is at the kernel center.
+@param delta optional value added to the filtered pixels before storing them in dst.
+@param borderType pixel extrapolation method, see cv::BorderTypes
+@param borderValue border value in case of constant border type
+@sa  sepFilter
+ */
+GAPI_EXPORTS_W GMat filter2D(const GMat& src, int ddepth, const Mat& kernel, const Point& anchor = Point(-1,-1), const Scalar& delta = Scalar(0),
+                             int borderType = BORDER_DEFAULT, const Scalar& borderValue = Scalar(0));
+
+
+/** @brief Blurs an image using the box filter.
+
+The function smooths an image using the kernel:
+
+\f[\texttt{K} =  \alpha \begin{bmatrix} 1 & 1 & 1 &  \cdots & 1 & 1  \\ 1 & 1 & 1 &  \cdots & 1 & 1  \\ \hdotsfor{6} \\ 1 & 1 & 1 &  \cdots & 1 & 1 \end{bmatrix}\f]
+
+where
+
+\f[\alpha = \begin{cases} \frac{1}{\texttt{ksize.width*ksize.height}} & \texttt{when } \texttt{normalize=true}  \\1 & \texttt{otherwise} \end{cases}\f]
+
+Unnormalized box filter is useful for computing various integral characteristics over each pixel
+neighborhood, such as covariance matrices of image derivatives (used in dense optical flow
+algorithms, and so on). If you need to compute pixel sums over variable-size windows, use cv::integral.
+
+Supported input matrix data types are @ref CV_8UC1, @ref CV_8UC3, @ref CV_16UC1, @ref CV_16SC1, @ref CV_32FC1.
+Output image must have the same type, size, and number of channels as the input image.
+@note
+ - Rounding to nearest even is procedeed if hardware supports it, if not - to nearest.
+ - Function textual ID is "org.opencv.imgproc.filters.boxfilter"
+
+@param src Source image.
+@param dtype the output image depth (-1 to set the input image data type).
+@param ksize blurring kernel size.
+@param anchor Anchor position within the kernel. The default value \f$(-1,-1)\f$ means that the anchor
+is at the kernel center.
+@param normalize flag, specifying whether the kernel is normalized by its area or not.
+@param borderType Pixel extrapolation method, see cv::BorderTypes
+@param borderValue border value in case of constant border type
+@sa  sepFilter, gaussianBlur, medianBlur, integral
+ */
+GAPI_EXPORTS_W GMat boxFilter(const GMat& src, int dtype, const Size& ksize, const Point& anchor = Point(-1,-1),
+                              bool normalize = true, int borderType = BORDER_DEFAULT,
+                              const Scalar& borderValue = Scalar(0));
+
+/** @brief Blurs an image using the normalized box filter.
+
+The function smooths an image using the kernel:
+
+\f[\texttt{K} =  \frac{1}{\texttt{ksize.width*ksize.height}} \begin{bmatrix} 1 & 1 & 1 &  \cdots & 1 & 1  \\ 1 & 1 & 1 &  \cdots & 1 & 1  \\ \hdotsfor{6} \\ 1 & 1 & 1 &  \cdots & 1 & 1  \\ \end{bmatrix}\f]
+
+The call `blur(src, ksize, anchor, borderType)` is equivalent to `boxFilter(src, src.type(), ksize, anchor,
+true, borderType)`.
+
+Supported input matrix data types are @ref CV_8UC1, @ref CV_8UC3, @ref CV_16UC1, @ref CV_16SC1, @ref CV_32FC1.
+Output image must have the same type, size, and number of channels as the input image.
+@note
+ - Rounding to nearest even is procedeed if hardware supports it, if not - to nearest.
+ - Function textual ID is "org.opencv.imgproc.filters.blur"
+
+@param src Source image.
+@param ksize blurring kernel size.
+@param anchor anchor point; default value Point(-1,-1) means that the anchor is at the kernel
+center.
+@param borderType border mode used to extrapolate pixels outside of the image, see cv::BorderTypes
+@param borderValue border value in case of constant border type
+@sa  boxFilter, bilateralFilter, GaussianBlur, medianBlur
+ */
+GAPI_EXPORTS_W GMat blur(const GMat& src, const Size& ksize, const Point& anchor = Point(-1,-1),
+                         int borderType = BORDER_DEFAULT, const Scalar& borderValue = Scalar(0));
+
+
+//GAPI_EXPORTS_W void blur( InputArray src, OutputArray dst,
+ //                       Size ksize, Point anchor = Point(-1,-1),
+ //                       int borderType = BORDER_DEFAULT );
+
+
+/** @brief Blurs an image using a Gaussian filter.
+
+The function filter2Ds the source image with the specified Gaussian kernel.
+Output image must have the same type and number of channels an input image.
+
+Supported input matrix data types are @ref CV_8UC1, @ref CV_8UC3, @ref CV_16UC1, @ref CV_16SC1, @ref CV_32FC1.
+Output image must have the same type, size, and number of channels as the input image.
+@note
+ - Rounding to nearest even is procedeed if hardware supports it, if not - to nearest.
+ - Function textual ID is "org.opencv.imgproc.filters.gaussianBlur"
+
+@param src input image;
+@param ksize Gaussian kernel size. ksize.width and ksize.height can differ but they both must be
+positive and odd. Or, they can be zero's and then they are computed from sigma.
+@param sigmaX Gaussian kernel standard deviation in X direction.
+@param sigmaY Gaussian kernel standard deviation in Y direction; if sigmaY is zero, it is set to be
+equal to sigmaX, if both sigmas are zeros, they are computed from ksize.width and ksize.height,
+respectively (see cv::getGaussianKernel for details); to fully control the result regardless of
+possible future modifications of all this semantics, it is recommended to specify all of ksize,
+sigmaX, and sigmaY.
+@param borderType pixel extrapolation method, see cv::BorderTypes
+@param borderValue border value in case of constant border type
+@sa  sepFilter, boxFilter, medianBlur
+ */
+GAPI_EXPORTS_W GMat gaussianBlur(const GMat& src, const Size& ksize, double sigmaX, double sigmaY = 0,
+                                 int borderType = BORDER_DEFAULT, const Scalar& borderValue = Scalar(0));
+
+/** @brief Blurs an image using the median filter.
+
+The function smoothes an image using the median filter with the \f$\texttt{ksize} \times
+\texttt{ksize}\f$ aperture. Each channel of a multi-channel image is processed independently.
+Output image must have the same type, size, and number of channels as the input image.
+@note
+ - Rounding to nearest even is procedeed if hardware supports it, if not - to nearest.
+The median filter uses cv::BORDER_REPLICATE internally to cope with border pixels, see cv::BorderTypes
+ - Function textual ID is "org.opencv.imgproc.filters.medianBlur"
+
+@param src input matrix (image)
+@param ksize aperture linear size; it must be odd and greater than 1, for example: 3, 5, 7 ...
+@sa  boxFilter, gaussianBlur
+ */
+GAPI_EXPORTS_W GMat medianBlur(const GMat& src, int ksize);
+
+/** @brief Erodes an image by using a specific structuring element.
+
+The function erodes the source image using the specified structuring element that determines the
+shape of a pixel neighborhood over which the minimum is taken:
+
+\f[\texttt{dst} (x,y) =  \min _{(x',y'):  \, \texttt{element} (x',y') \ne0 } \texttt{src} (x+x',y+y')\f]
+
+Erosion can be applied several (iterations) times. In case of multi-channel images, each channel is processed independently.
+Supported input matrix data types are @ref CV_8UC1, @ref CV_8UC3, @ref CV_16UC1, @ref CV_16SC1, and @ref CV_32FC1.
+Output image must have the same type, size, and number of channels as the input image.
+@note
+ - Rounding to nearest even is procedeed if hardware supports it, if not - to nearest.
+ - Function textual ID is "org.opencv.imgproc.filters.erode"
+
+@param src input image
+@param kernel structuring element used for erosion; if `element=Mat()`, a `3 x 3` rectangular
+structuring element is used. Kernel can be created using getStructuringElement.
+@param anchor position of the anchor within the element; default value (-1, -1) means that the
+anchor is at the element center.
+@param iterations number of times erosion is applied.
+@param borderType pixel extrapolation method, see cv::BorderTypes
+@param borderValue border value in case of a constant border
+@sa  dilate, morphologyEx
+ */
+GAPI_EXPORTS_W GMat erode(const GMat& src, const Mat& kernel, const Point& anchor = Point(-1,-1), int iterations = 1,
+                          int borderType = BORDER_CONSTANT,
+                          const  Scalar& borderValue = morphologyDefaultBorderValue());
+
+/** @brief Erodes an image by using 3 by 3 rectangular structuring element.
+
+The function erodes the source image using the rectangular structuring element with rectangle center as an anchor.
+Erosion can be applied several (iterations) times. In case of multi-channel images, each channel is processed independently.
+Supported input matrix data types are @ref CV_8UC1, @ref CV_8UC3, @ref CV_16UC1, @ref CV_16SC1, and @ref CV_32FC1.
+Output image must have the same type, size, and number of channels as the input image.
+@note
+ - Rounding to nearest even is procedeed if hardware supports it, if not - to nearest.
+ - Function textual ID is "org.opencv.imgproc.filters.erode"
+
+@param src input image
+@param iterations number of times erosion is applied.
+@param borderType pixel extrapolation method, see cv::BorderTypes
+@param borderValue border value in case of a constant border
+@sa  erode, dilate3x3
+ */
+GAPI_EXPORTS_W GMat erode3x3(const GMat& src, int iterations = 1,
+                             int borderType = BORDER_CONSTANT,
+                             const  Scalar& borderValue = morphologyDefaultBorderValue());
+
+/** @brief Dilates an image by using a specific structuring element.
+
+The function dilates the source image using the specified structuring element that determines the
+shape of a pixel neighborhood over which the maximum is taken:
+\f[\texttt{dst} (x,y) =  \max _{(x',y'):  \, \texttt{element} (x',y') \ne0 } \texttt{src} (x+x',y+y')\f]
+
+Dilation can be applied several (iterations) times. In case of multi-channel images, each channel is processed independently.
+Supported input matrix data types are @ref CV_8UC1, @ref CV_8UC3, @ref CV_16UC1, @ref CV_16SC1, and @ref CV_32FC1.
+Output image must have the same type, size, and number of channels as the input image.
+@note
+ - Rounding to nearest even is procedeed if hardware supports it, if not - to nearest.
+ - Function textual ID is "org.opencv.imgproc.filters.dilate"
+
+@param src input image.
+@param kernel structuring element used for dilation; if elemenat=Mat(), a 3 x 3 rectangular
+structuring element is used. Kernel can be created using getStructuringElement
+@param anchor position of the anchor within the element; default value (-1, -1) means that the
+anchor is at the element center.
+@param iterations number of times dilation is applied.
+@param borderType pixel extrapolation method, see cv::BorderTypes
+@param borderValue border value in case of a constant border
+@sa  erode, morphologyEx, getStructuringElement
+ */
+GAPI_EXPORTS_W GMat dilate(const GMat& src, const Mat& kernel, const Point& anchor = Point(-1,-1), int iterations = 1,
+                           int borderType = BORDER_CONSTANT,
+                           const  Scalar& borderValue = morphologyDefaultBorderValue());
+
+/** @brief Dilates an image by using 3 by 3 rectangular structuring element.
+
+The function dilates the source image using the specified structuring element that determines the
+shape of a pixel neighborhood over which the maximum is taken:
+\f[\texttt{dst} (x,y) =  \max _{(x',y'):  \, \texttt{element} (x',y') \ne0 } \texttt{src} (x+x',y+y')\f]
+
+Dilation can be applied several (iterations) times. In case of multi-channel images, each channel is processed independently.
+Supported input matrix data types are @ref CV_8UC1, @ref CV_8UC3, @ref CV_16UC1, @ref CV_16SC1, and @ref CV_32FC1.
+Output image must have the same type, size, and number of channels as the input image.
+@note
+ - Rounding to nearest even is procedeed if hardware supports it, if not - to nearest.
+ - Function textual ID is "org.opencv.imgproc.filters.dilate"
+
+@param src input image.
+@param iterations number of times dilation is applied.
+@param borderType pixel extrapolation method, see cv::BorderTypes
+@param borderValue border value in case of a constant border
+@sa  dilate, erode3x3
+ */
+
+GAPI_EXPORTS_W GMat dilate3x3(const GMat& src, int iterations = 1,
+                              int borderType = BORDER_CONSTANT,
+                              const  Scalar& borderValue = morphologyDefaultBorderValue());
+
+/** @brief Performs advanced morphological transformations.
+
+The function can perform advanced morphological transformations using an erosion and dilation as
+basic operations.
+
+Any of the operations can be done in-place. In case of multi-channel images, each channel is
+processed independently.
+
+@note
+ - Function textual ID is "org.opencv.imgproc.filters.morphologyEx"
+ - The number of iterations is the number of times erosion or dilatation operation will be
+applied. For instance, an opening operation (#MORPH_OPEN) with two iterations is equivalent to
+apply successively: erode -> erode -> dilate -> dilate
+(and not erode -> dilate -> erode -> dilate).
+
+@param src Input image.
+@param op Type of a morphological operation, see #MorphTypes
+@param kernel Structuring element. It can be created using #getStructuringElement.
+@param anchor Anchor position within the element. Both negative values mean that the anchor is at
+the kernel center.
+@param iterations Number of times erosion and dilation are applied.
+@param borderType Pixel extrapolation method, see #BorderTypes. #BORDER_WRAP is not supported.
+@param borderValue Border value in case of a constant border. The default value has a special
+meaning.
+@sa  dilate, erode, getStructuringElement
+ */
+GAPI_EXPORTS_W GMat morphologyEx(const GMat &src, const MorphTypes op, const Mat &kernel,
+                                 const Point       &anchor      = Point(-1,-1),
+                                 const int          iterations  = 1,
+                                 const BorderTypes  borderType  = BORDER_CONSTANT,
+                                 const Scalar      &borderValue = morphologyDefaultBorderValue());
+
+/** @brief Calculates the first, second, third, or mixed image derivatives using an extended Sobel operator.
+
+In all cases except one, the \f$\texttt{ksize} \times \texttt{ksize}\f$ separable kernel is used to
+calculate the derivative. When \f$\texttt{ksize = 1}\f$, the \f$3 \times 1\f$ or \f$1 \times 3\f$
+kernel is used (that is, no Gaussian smoothing is done). `ksize = 1` can only be used for the first
+or the second x- or y- derivatives.
+
+There is also the special value `ksize = FILTER_SCHARR (-1)` that corresponds to the \f$3\times3\f$ Scharr
+filter that may give more accurate results than the \f$3\times3\f$ Sobel. The Scharr aperture is
+
+\f[\vecthreethree{-3}{0}{3}{-10}{0}{10}{-3}{0}{3}\f]
+
+for the x-derivative, or transposed for the y-derivative.
+
+The function calculates an image derivative by convolving the image with the appropriate kernel:
+
+\f[\texttt{dst} =  \frac{\partial^{xorder+yorder} \texttt{src}}{\partial x^{xorder} \partial y^{yorder}}\f]
+
+The Sobel operators combine Gaussian smoothing and differentiation, so the result is more or less
+resistant to the noise. Most often, the function is called with ( xorder = 1, yorder = 0, ksize = 3)
+or ( xorder = 0, yorder = 1, ksize = 3) to calculate the first x- or y- image derivative. The first
+case corresponds to a kernel of:
+
+\f[\vecthreethree{-1}{0}{1}{-2}{0}{2}{-1}{0}{1}\f]
+
+The second case corresponds to a kernel of:
+
+\f[\vecthreethree{-1}{-2}{-1}{0}{0}{0}{1}{2}{1}\f]
+
+@note
+ - Rounding to nearest even is procedeed if hardware supports it, if not - to nearest.
+ - Function textual ID is "org.opencv.imgproc.filters.sobel"
+
+@param src input image.
+@param ddepth output image depth, see @ref filter_depths "combinations"; in the case of
+    8-bit input images it will result in truncated derivatives.
+@param dx order of the derivative x.
+@param dy order of the derivative y.
+@param ksize size of the extended Sobel kernel; it must be odd.
+@param scale optional scale factor for the computed derivative values; by default, no scaling is
+applied (see cv::getDerivKernels for details).
+@param delta optional delta value that is added to the results prior to storing them in dst.
+@param borderType pixel extrapolation method, see cv::BorderTypes
+@param borderValue border value in case of constant border type
+@sa filter2D, gaussianBlur, cartToPolar
+ */
+GAPI_EXPORTS_W GMat Sobel(const GMat& src, int ddepth, int dx, int dy, int ksize = 3,
+                          double scale = 1, double delta = 0,
+                          int borderType = BORDER_DEFAULT,
+                          const Scalar& borderValue = Scalar(0));
+
+/** @brief Calculates the first, second, third, or mixed image derivatives using an extended Sobel operator.
+
+In all cases except one, the \f$\texttt{ksize} \times \texttt{ksize}\f$ separable kernel is used to
+calculate the derivative. When \f$\texttt{ksize = 1}\f$, the \f$3 \times 1\f$ or \f$1 \times 3\f$
+kernel is used (that is, no Gaussian smoothing is done). `ksize = 1` can only be used for the first
+or the second x- or y- derivatives.
+
+There is also the special value `ksize = FILTER_SCHARR (-1)` that corresponds to the \f$3\times3\f$ Scharr
+filter that may give more accurate results than the \f$3\times3\f$ Sobel. The Scharr aperture is
+
+\f[\vecthreethree{-3}{0}{3}{-10}{0}{10}{-3}{0}{3}\f]
+
+for the x-derivative, or transposed for the y-derivative.
+
+The function calculates an image derivative by convolving the image with the appropriate kernel:
+
+\f[\texttt{dst} =  \frac{\partial^{xorder+yorder} \texttt{src}}{\partial x^{xorder} \partial y^{yorder}}\f]
+
+The Sobel operators combine Gaussian smoothing and differentiation, so the result is more or less
+resistant to the noise. Most often, the function is called with ( xorder = 1, yorder = 0, ksize = 3)
+or ( xorder = 0, yorder = 1, ksize = 3) to calculate the first x- or y- image derivative. The first
+case corresponds to a kernel of:
+
+\f[\vecthreethree{-1}{0}{1}{-2}{0}{2}{-1}{0}{1}\f]
+
+The second case corresponds to a kernel of:
+
+\f[\vecthreethree{-1}{-2}{-1}{0}{0}{0}{1}{2}{1}\f]
+
+@note
+ - First returned matrix correspons to dx derivative while the second one to dy.
+ - Rounding to nearest even is procedeed if hardware supports it, if not - to nearest.
+ - Function textual ID is "org.opencv.imgproc.filters.sobelxy"
+
+@param src input image.
+@param ddepth output image depth, see @ref filter_depths "combinations"; in the case of
+    8-bit input images it will result in truncated derivatives.
+@param order order of the derivatives.
+@param ksize size of the extended Sobel kernel; it must be odd.
+@param scale optional scale factor for the computed derivative values; by default, no scaling is
+applied (see cv::getDerivKernels for details).
+@param delta optional delta value that is added to the results prior to storing them in dst.
+@param borderType pixel extrapolation method, see cv::BorderTypes
+@param borderValue border value in case of constant border type
+@sa filter2D, gaussianBlur, cartToPolar
+ */
+GAPI_EXPORTS_W std::tuple<GMat, GMat> SobelXY(const GMat& src, int ddepth, int order, int ksize = 3,
+                                              double scale = 1, double delta = 0,
+                                              int borderType = BORDER_DEFAULT,
+                                              const Scalar& borderValue = Scalar(0));
+
+/** @brief Calculates the Laplacian of an image.
+
+The function calculates the Laplacian of the source image by adding up the second x and y
+derivatives calculated using the Sobel operator:
+
+\f[\texttt{dst} =  \Delta \texttt{src} =  \frac{\partial^2 \texttt{src}}{\partial x^2} +  \frac{\partial^2 \texttt{src}}{\partial y^2}\f]
+
+This is done when `ksize > 1`. When `ksize == 1`, the Laplacian is computed by filtering the image
+with the following \f$3 \times 3\f$ aperture:
+
+\f[\vecthreethree {0}{1}{0}{1}{-4}{1}{0}{1}{0}\f]
+
+@note Function textual ID is "org.opencv.imgproc.filters.laplacian"
+
+@param src Source image.
+@param ddepth Desired depth of the destination image.
+@param ksize Aperture size used to compute the second-derivative filters. See #getDerivKernels for
+details. The size must be positive and odd.
+@param scale Optional scale factor for the computed Laplacian values. By default, no scaling is
+applied. See #getDerivKernels for details.
+@param delta Optional delta value that is added to the results prior to storing them in dst .
+@param borderType Pixel extrapolation method, see #BorderTypes. #BORDER_WRAP is not supported.
+@return Destination image of the same size and the same number of channels as src.
+@sa  Sobel, Scharr
+ */
+GAPI_EXPORTS_W GMat Laplacian(const GMat& src, int ddepth, int ksize = 1,
+                              double scale = 1, double delta = 0, int borderType = BORDER_DEFAULT);
+
+/** @brief Applies the bilateral filter to an image.
+
+The function applies bilateral filtering to the input image, as described in
+http://www.dai.ed.ac.uk/CVonline/LOCAL_COPIES/MANDUCHI1/Bilateral_Filtering.html
+bilateralFilter can reduce unwanted noise very well while keeping edges fairly sharp. However, it is
+very slow compared to most filters.
+
+_Sigma values_: For simplicity, you can set the 2 sigma values to be the same. If they are small (\<
+10), the filter will not have much effect, whereas if they are large (\> 150), they will have a very
+strong effect, making the image look "cartoonish".
+
+_Filter size_: Large filters (d \> 5) are very slow, so it is recommended to use d=5 for real-time
+applications, and perhaps d=9 for offline applications that need heavy noise filtering.
+
+This filter does not work inplace.
+
+@note Function textual ID is "org.opencv.imgproc.filters.bilateralfilter"
+
+@param src Source 8-bit or floating-point, 1-channel or 3-channel image.
+@param d Diameter of each pixel neighborhood that is used during filtering. If it is non-positive,
+it is computed from sigmaSpace.
+@param sigmaColor Filter sigma in the color space. A larger value of the parameter means that
+farther colors within the pixel neighborhood (see sigmaSpace) will be mixed together, resulting
+in larger areas of semi-equal color.
+@param sigmaSpace Filter sigma in the coordinate space. A larger value of the parameter means that
+farther pixels will influence each other as long as their colors are close enough (see sigmaColor
+). When d\>0, it specifies the neighborhood size regardless of sigmaSpace. Otherwise, d is
+proportional to sigmaSpace.
+@param borderType border mode used to extrapolate pixels outside of the image, see #BorderTypes
+@return Destination image of the same size and type as src.
+ */
+GAPI_EXPORTS_W GMat bilateralFilter(const GMat& src, int d, double sigmaColor, double sigmaSpace,
+                                    int borderType = BORDER_DEFAULT);
+
+//! @} gapi_filters
+
+//! @addtogroup gapi_feature
+//! @{
+/** @brief Finds edges in an image using the Canny algorithm.
+
+The function finds edges in the input image and marks them in the output map edges using the
+Canny algorithm. The smallest value between threshold1 and threshold2 is used for edge linking. The
+largest value is used to find initial segments of strong edges. See
+<http://en.wikipedia.org/wiki/Canny_edge_detector>
+
+@note Function textual ID is "org.opencv.imgproc.feature.canny"
+
+@param image 8-bit input image.
+@param threshold1 first threshold for the hysteresis procedure.
+@param threshold2 second threshold for the hysteresis procedure.
+@param apertureSize aperture size for the Sobel operator.
+@param L2gradient a flag, indicating whether a more accurate \f$L_2\f$ norm
+\f$=\sqrt{(dI/dx)^2 + (dI/dy)^2}\f$ should be used to calculate the image gradient magnitude (
+L2gradient=true ), or whether the default \f$L_1\f$ norm \f$=|dI/dx|+|dI/dy|\f$ is enough (
+L2gradient=false ).
+ */
+GAPI_EXPORTS_W GMat Canny(const GMat& image, double threshold1, double threshold2,
+                          int apertureSize = 3, bool L2gradient = false);
+
+/** @brief Determines strong corners on an image.
+
+The function finds the most prominent corners in the image or in the specified image region, as
+described in @cite Shi94
+
+-   Function calculates the corner quality measure at every source image pixel using the
+    #cornerMinEigenVal or #cornerHarris .
+-   Function performs a non-maximum suppression (the local maximums in *3 x 3* neighborhood are
+    retained).
+-   The corners with the minimal eigenvalue less than
+    \f$\texttt{qualityLevel} \cdot \max_{x,y} qualityMeasureMap(x,y)\f$ are rejected.
+-   The remaining corners are sorted by the quality measure in the descending order.
+-   Function throws away each corner for which there is a stronger corner at a distance less than
+    maxDistance.
+
+The function can be used to initialize a point-based tracker of an object.
+
+@note
+ - If the function is called with different values A and B of the parameter qualityLevel , and
+A \> B, the vector of returned corners with qualityLevel=A will be the prefix of the output vector
+with qualityLevel=B .
+ - Function textual ID is "org.opencv.imgproc.feature.goodFeaturesToTrack"
+
+@param image Input 8-bit or floating-point 32-bit, single-channel image.
+@param maxCorners Maximum number of corners to return. If there are more corners than are found,
+the strongest of them is returned. `maxCorners <= 0` implies that no limit on the maximum is set
+and all detected corners are returned.
+@param qualityLevel Parameter characterizing the minimal accepted quality of image corners. The
+parameter value is multiplied by the best corner quality measure, which is the minimal eigenvalue
+(see #cornerMinEigenVal ) or the Harris function response (see #cornerHarris ). The corners with the
+quality measure less than the product are rejected. For example, if the best corner has the
+quality measure = 1500, and the qualityLevel=0.01 , then all the corners with the quality measure
+less than 15 are rejected.
+@param minDistance Minimum possible Euclidean distance between the returned corners.
+@param mask Optional region of interest. If the image is not empty (it needs to have the type
+CV_8UC1 and the same size as image ), it specifies the region in which the corners are detected.
+@param blockSize Size of an average block for computing a derivative covariation matrix over each
+pixel neighborhood. See cornerEigenValsAndVecs .
+@param useHarrisDetector Parameter indicating whether to use a Harris detector (see #cornerHarris)
+or #cornerMinEigenVal.
+@param k Free parameter of the Harris detector.
+
+@return vector of detected corners.
+ */
+GAPI_EXPORTS_W GArray<Point2f> goodFeaturesToTrack(const GMat   &image,
+                                                         int    maxCorners,
+                                                         double qualityLevel,
+                                                         double minDistance,
+                                                   const Mat    &mask = Mat(),
+                                                         int    blockSize = 3,
+                                                         bool   useHarrisDetector = false,
+                                                         double k = 0.04);
+
+/** @brief Equalizes the histogram of a grayscale image.
+
+//! @} gapi_feature
+
+The function equalizes the histogram of the input image using the following algorithm:
+
+- Calculate the histogram \f$H\f$ for src .
+- Normalize the histogram so that the sum of histogram bins is 255.
+- Compute the integral of the histogram:
+\f[H'_i =  \sum _{0  \le j < i} H(j)\f]
+- Transform the image using \f$H'\f$ as a look-up table: \f$\texttt{dst}(x,y) = H'(\texttt{src}(x,y))\f$
+
+The algorithm normalizes the brightness and increases the contrast of the image.
+@note
+ - The returned image is of the same size and type as input.
+ - Function textual ID is "org.opencv.imgproc.equalizeHist"
+
+@param src Source 8-bit single channel image.
+ */
+GAPI_EXPORTS_W GMat equalizeHist(const GMat& src);
+
+//! @addtogroup gapi_shape
+//! @{
+/** @brief Finds contours in a binary image.
+
+The function retrieves contours from the binary image using the algorithm @cite Suzuki85 .
+The contours are a useful tool for shape analysis and object detection and recognition.
+See squares.cpp in the OpenCV sample directory.
+
+@note Function textual ID is "org.opencv.imgproc.shape.findContours"
+
+@param src Input gray-scale image @ref CV_8UC1. Non-zero pixels are treated as 1's. Zero
+pixels remain 0's, so the image is treated as binary . You can use #compare, #inRange, #threshold ,
+#adaptiveThreshold, #Canny, and others to create a binary image out of a grayscale or color one.
+If mode equals to #RETR_CCOMP, the input can also be a 32-bit integer
+image of labels ( @ref CV_32SC1 ). If #RETR_FLOODFILL then @ref CV_32SC1 is supported only.
+@param mode Contour retrieval mode, see #RetrievalModes
+@param method Contour approximation method, see #ContourApproximationModes
+@param offset Optional offset by which every contour point is shifted. This is useful if the
+contours are extracted from the image ROI and then they should be analyzed in the whole image
+context.
+
+@return GArray of detected contours. Each contour is stored as a GArray of points.
+ */
+GAPI_EXPORTS GArray<GArray<Point>>
+findContours(const GMat &src, const RetrievalModes mode, const ContourApproximationModes method,
+             const GOpaque<Point> &offset);
+
+// FIXME oc: make default value offset = Point()
+/** @overload
+@note Function textual ID is "org.opencv.imgproc.shape.findContoursNoOffset"
+ */
+GAPI_EXPORTS GArray<GArray<Point>>
+findContours(const GMat &src, const RetrievalModes mode, const ContourApproximationModes method);
+
+/** @brief Finds contours and their hierarchy in a binary image.
+
+The function retrieves contours from the binary image using the algorithm @cite Suzuki85
+and calculates their hierarchy.
+The contours are a useful tool for shape analysis and object detection and recognition.
+See squares.cpp in the OpenCV sample directory.
+
+@note Function textual ID is "org.opencv.imgproc.shape.findContoursH"
+
+@param src Input gray-scale image @ref CV_8UC1. Non-zero pixels are treated as 1's. Zero
+pixels remain 0's, so the image is treated as binary . You can use #compare, #inRange, #threshold ,
+#adaptiveThreshold, #Canny, and others to create a binary image out of a grayscale or color one.
+If mode equals to #RETR_CCOMP, the input can also be a 32-bit integer
+image of labels ( @ref CV_32SC1 ). If #RETR_FLOODFILL -- @ref CV_32SC1 supports only.
+@param mode Contour retrieval mode, see #RetrievalModes
+@param method Contour approximation method, see #ContourApproximationModes
+@param offset Optional offset by which every contour point is shifted. This is useful if the
+contours are extracted from the image ROI and then they should be analyzed in the whole image
+context.
+
+@return
+ - GArray of detected contours. Each contour is stored as a GArray of points.
+ - Optional output GArray of cv::Vec4i, containing information about the image topology.
+It has as many elements as the number of contours. For each i-th contour contours[i], the elements
+hierarchy[i][0] , hierarchy[i][1] , hierarchy[i][2] , and hierarchy[i][3] are set to 0-based
+indices in contours of the next and previous contours at the same hierarchical level, the first
+child contour and the parent contour, respectively. If for the contour i there are no next,
+previous, parent, or nested contours, the corresponding elements of hierarchy[i] will be negative.
+ */
+GAPI_EXPORTS std::tuple<GArray<GArray<Point>>,GArray<Vec4i>>
+findContoursH(const GMat &src, const RetrievalModes mode, const ContourApproximationModes method,
+              const GOpaque<Point> &offset);
+
+// FIXME oc: make default value offset = Point()
+/** @overload
+@note Function textual ID is "org.opencv.imgproc.shape.findContoursHNoOffset"
+ */
+GAPI_EXPORTS std::tuple<GArray<GArray<Point>>,GArray<Vec4i>>
+findContoursH(const GMat &src, const RetrievalModes mode, const ContourApproximationModes method);
+
+/** @brief Calculates the up-right bounding rectangle of a point set or non-zero pixels
+of gray-scale image.
+
+The function calculates and returns the minimal up-right bounding rectangle for the specified
+point set or non-zero pixels of gray-scale image.
+
+@note
+ - Function textual ID is "org.opencv.imgproc.shape.boundingRectMat"
+ - In case of a 2D points' set given, Mat should be 2-dimensional, have a single row or column
+if there are 2 channels, or have 2 columns if there is a single channel. Mat should have either
+@ref CV_32S or @ref CV_32F depth
+
+@param src Input gray-scale image @ref CV_8UC1; or input set of @ref CV_32S or @ref CV_32F
+2D points stored in Mat.
+ */
+GAPI_EXPORTS_W GOpaque<Rect> boundingRect(const GMat& src);
+
+/** @overload
+
+Calculates the up-right bounding rectangle of a point set.
+
+@note Function textual ID is "org.opencv.imgproc.shape.boundingRectVector32S"
+
+@param src Input 2D point set, stored in std::vector<cv::Point2i>.
+ */
+GAPI_EXPORTS_W GOpaque<Rect> boundingRect(const GArray<Point2i>& src);
+
+/** @overload
+
+Calculates the up-right bounding rectangle of a point set.
+
+@note Function textual ID is "org.opencv.imgproc.shape.boundingRectVector32F"
+
+@param src Input 2D point set, stored in std::vector<cv::Point2f>.
+ */
+GAPI_EXPORTS_W GOpaque<Rect> boundingRect(const GArray<Point2f>& src);
+
+/** @brief Fits a line to a 2D point set.
+
+The function fits a line to a 2D point set by minimizing \f$\sum_i \rho(r_i)\f$ where
+\f$r_i\f$ is a distance between the \f$i^{th}\f$ point, the line and \f$\rho(r)\f$ is a distance
+function, one of the following:
+-  DIST_L2
+\f[\rho (r) = r^2/2  \quad \text{(the simplest and the fastest least-squares method)}\f]
+- DIST_L1
+\f[\rho (r) = r\f]
+- DIST_L12
+\f[\rho (r) = 2  \cdot ( \sqrt{1 + \frac{r^2}{2}} - 1)\f]
+- DIST_FAIR
+\f[\rho \left (r \right ) = C^2  \cdot \left (  \frac{r}{C} -  \log{\left(1 + \frac{r}{C}\right)} \right )  \quad \text{where} \quad C=1.3998\f]
+- DIST_WELSCH
+\f[\rho \left (r \right ) =  \frac{C^2}{2} \cdot \left ( 1 -  \exp{\left(-\left(\frac{r}{C}\right)^2\right)} \right )  \quad \text{where} \quad C=2.9846\f]
+- DIST_HUBER
+\f[\rho (r) =  \fork{r^2/2}{if \(r < C\)}{C \cdot (r-C/2)}{otherwise} \quad \text{where} \quad C=1.345\f]
+
+The algorithm is based on the M-estimator ( <http://en.wikipedia.org/wiki/M-estimator> ) technique
+that iteratively fits the line using the weighted least-squares algorithm. After each iteration the
+weights \f$w_i\f$ are adjusted to be inversely proportional to \f$\rho(r_i)\f$ .
+
+@note
+ - Function textual ID is "org.opencv.imgproc.shape.fitLine2DMat"
+ - In case of an N-dimentional points' set given, Mat should be 2-dimensional, have a single row
+or column if there are N channels, or have N columns if there is a single channel.
+
+@param src Input set of 2D points stored in one of possible containers: Mat,
+std::vector<cv::Point2i>, std::vector<cv::Point2f>, std::vector<cv::Point2d>.
+@param distType Distance used by the M-estimator, see #DistanceTypes. @ref DIST_USER
+and @ref DIST_C are not supported.
+@param param Numerical parameter ( C ) for some types of distances. If it is 0, an optimal value
+is chosen.
+@param reps Sufficient accuracy for the radius (distance between the coordinate origin and the
+line). 1.0 would be a good default value for reps. If it is 0, a default value is chosen.
+@param aeps Sufficient accuracy for the angle. 0.01 would be a good default value for aeps.
+If it is 0, a default value is chosen.
+
+@return Output line parameters: a vector of 4 elements (like Vec4f) - (vx, vy, x0, y0),
+where (vx, vy) is a normalized vector collinear to the line and (x0, y0) is a point on the line.
+ */
+GAPI_EXPORTS GOpaque<Vec4f> fitLine2D(const GMat& src, const DistanceTypes distType,
+                                      const double param = 0., const double reps = 0.,
+                                      const double aeps = 0.);
+
+/** @overload
+
+@note Function textual ID is "org.opencv.imgproc.shape.fitLine2DVector32S"
+
+ */
+GAPI_EXPORTS GOpaque<Vec4f> fitLine2D(const GArray<Point2i>& src, const DistanceTypes distType,
+                                      const double param = 0., const double reps = 0.,
+                                      const double aeps = 0.);
+
+/** @overload
+
+@note Function textual ID is "org.opencv.imgproc.shape.fitLine2DVector32F"
+
+ */
+GAPI_EXPORTS GOpaque<Vec4f> fitLine2D(const GArray<Point2f>& src, const DistanceTypes distType,
+                                      const double param = 0., const double reps = 0.,
+                                      const double aeps = 0.);
+
+/** @overload
+
+@note Function textual ID is "org.opencv.imgproc.shape.fitLine2DVector64F"
+
+ */
+GAPI_EXPORTS GOpaque<Vec4f> fitLine2D(const GArray<Point2d>& src, const DistanceTypes distType,
+                                      const double param = 0., const double reps = 0.,
+                                      const double aeps = 0.);
+
+/** @brief Fits a line to a 3D point set.
+
+The function fits a line to a 3D point set by minimizing \f$\sum_i \rho(r_i)\f$ where
+\f$r_i\f$ is a distance between the \f$i^{th}\f$ point, the line and \f$\rho(r)\f$ is a distance
+function, one of the following:
+-  DIST_L2
+\f[\rho (r) = r^2/2  \quad \text{(the simplest and the fastest least-squares method)}\f]
+- DIST_L1
+\f[\rho (r) = r\f]
+- DIST_L12
+\f[\rho (r) = 2  \cdot ( \sqrt{1 + \frac{r^2}{2}} - 1)\f]
+- DIST_FAIR
+\f[\rho \left (r \right ) = C^2  \cdot \left (  \frac{r}{C} -  \log{\left(1 + \frac{r}{C}\right)} \right )  \quad \text{where} \quad C=1.3998\f]
+- DIST_WELSCH
+\f[\rho \left (r \right ) =  \frac{C^2}{2} \cdot \left ( 1 -  \exp{\left(-\left(\frac{r}{C}\right)^2\right)} \right )  \quad \text{where} \quad C=2.9846\f]
+- DIST_HUBER
+\f[\rho (r) =  \fork{r^2/2}{if \(r < C\)}{C \cdot (r-C/2)}{otherwise} \quad \text{where} \quad C=1.345\f]
+
+The algorithm is based on the M-estimator ( <http://en.wikipedia.org/wiki/M-estimator> ) technique
+that iteratively fits the line using the weighted least-squares algorithm. After each iteration the
+weights \f$w_i\f$ are adjusted to be inversely proportional to \f$\rho(r_i)\f$ .
+
+@note
+ - Function textual ID is "org.opencv.imgproc.shape.fitLine3DMat"
+ - In case of an N-dimentional points' set given, Mat should be 2-dimensional, have a single row
+or column if there are N channels, or have N columns if there is a single channel.
+
+@param src Input set of 3D points stored in one of possible containers: Mat,
+std::vector<cv::Point3i>, std::vector<cv::Point3f>, std::vector<cv::Point3d>.
+@param distType Distance used by the M-estimator, see #DistanceTypes. @ref DIST_USER
+and @ref DIST_C are not supported.
+@param param Numerical parameter ( C ) for some types of distances. If it is 0, an optimal value
+is chosen.
+@param reps Sufficient accuracy for the radius (distance between the coordinate origin and the
+line). 1.0 would be a good default value for reps. If it is 0, a default value is chosen.
+@param aeps Sufficient accuracy for the angle. 0.01 would be a good default value for aeps.
+If it is 0, a default value is chosen.
+
+@return Output line parameters: a vector of 6 elements (like Vec6f) - (vx, vy, vz, x0, y0, z0),
+where (vx, vy, vz) is a normalized vector collinear to the line and (x0, y0, z0) is a point on
+the line.
+ */
+GAPI_EXPORTS GOpaque<Vec6f> fitLine3D(const GMat& src, const DistanceTypes distType,
+                                      const double param = 0., const double reps = 0.,
+                                      const double aeps = 0.);
+
+/** @overload
+
+@note Function textual ID is "org.opencv.imgproc.shape.fitLine3DVector32S"
+
+ */
+GAPI_EXPORTS GOpaque<Vec6f> fitLine3D(const GArray<Point3i>& src, const DistanceTypes distType,
+                                      const double param = 0., const double reps = 0.,
+                                      const double aeps = 0.);
+
+/** @overload
+
+@note Function textual ID is "org.opencv.imgproc.shape.fitLine3DVector32F"
+
+ */
+GAPI_EXPORTS GOpaque<Vec6f> fitLine3D(const GArray<Point3f>& src, const DistanceTypes distType,
+                                      const double param = 0., const double reps = 0.,
+                                      const double aeps = 0.);
+
+/** @overload
+
+@note Function textual ID is "org.opencv.imgproc.shape.fitLine3DVector64F"
+
+ */
+GAPI_EXPORTS GOpaque<Vec6f> fitLine3D(const GArray<Point3d>& src, const DistanceTypes distType,
+                                      const double param = 0., const double reps = 0.,
+                                      const double aeps = 0.);
+
+//! @} gapi_shape
+
+//! @addtogroup gapi_colorconvert
+//! @{
+/** @brief Converts an image from BGR color space to RGB color space.
+
+The function converts an input image from BGR color space to RGB.
+The conventional ranges for B, G, and R channel values are 0 to 255.
+
+Output image is 8-bit unsigned 3-channel image @ref CV_8UC3.
+
+@note Function textual ID is "org.opencv.imgproc.colorconvert.bgr2rgb"
+
+@param src input image: 8-bit unsigned 3-channel image @ref CV_8UC3.
+@sa RGB2BGR
+*/
+GAPI_EXPORTS_W GMat BGR2RGB(const GMat& src);
+
+/** @brief Converts an image from RGB color space to gray-scaled.
+
+The conventional ranges for R, G, and B channel values are 0 to 255.
+Resulting gray color value computed as
+\f[\texttt{dst} (I)= \texttt{0.299} * \texttt{src}(I).R + \texttt{0.587} * \texttt{src}(I).G  + \texttt{0.114} * \texttt{src}(I).B \f]
+
+@note Function textual ID is "org.opencv.imgproc.colorconvert.rgb2gray"
+
+@param src input image: 8-bit unsigned 3-channel image @ref CV_8UC1.
+@sa RGB2YUV
+ */
+GAPI_EXPORTS_W GMat RGB2Gray(const GMat& src);
+
+/** @overload
+Resulting gray color value computed as
+\f[\texttt{dst} (I)= \texttt{rY} * \texttt{src}(I).R + \texttt{gY} * \texttt{src}(I).G  + \texttt{bY} * \texttt{src}(I).B \f]
+
+@note Function textual ID is "org.opencv.imgproc.colorconvert.rgb2graycustom"
+
+@param src input image: 8-bit unsigned 3-channel image @ref CV_8UC1.
+@param rY float multiplier for R channel.
+@param gY float multiplier for G channel.
+@param bY float multiplier for B channel.
+@sa RGB2YUV
+ */
+GAPI_EXPORTS_W GMat RGB2Gray(const GMat& src, float rY, float gY, float bY);
+
+/** @brief Converts an image from BGR color space to gray-scaled.
+
+The conventional ranges for B, G, and R channel values are 0 to 255.
+Resulting gray color value computed as
+\f[\texttt{dst} (I)= \texttt{0.114} * \texttt{src}(I).B + \texttt{0.587} * \texttt{src}(I).G  + \texttt{0.299} * \texttt{src}(I).R \f]
+
+@note Function textual ID is "org.opencv.imgproc.colorconvert.bgr2gray"
+
+@param src input image: 8-bit unsigned 3-channel image @ref CV_8UC1.
+@sa BGR2LUV
+ */
+GAPI_EXPORTS_W GMat BGR2Gray(const GMat& src);
+
+/** @brief Converts an image from RGB color space to YUV color space.
+
+The function converts an input image from RGB color space to YUV.
+The conventional ranges for R, G, and B channel values are 0 to 255.
+
+In case of linear transformations, the range does not matter. But in case of a non-linear
+transformation, an input RGB image should be normalized to the proper value range to get the correct
+results, like here, at RGB \f$\rightarrow\f$ Y\*u\*v\* transformation.
+Output image must be 8-bit unsigned 3-channel image @ref CV_8UC3.
+
+@note Function textual ID is "org.opencv.imgproc.colorconvert.rgb2yuv"
+
+@param src input image: 8-bit unsigned 3-channel image @ref CV_8UC3.
+@sa YUV2RGB, RGB2Lab
+*/
+GAPI_EXPORTS_W GMat RGB2YUV(const GMat& src);
+
+/** @brief Converts an image from BGR color space to I420 color space.
+
+The function converts an input image from BGR color space to I420.
+The conventional ranges for R, G, and B channel values are 0 to 255.
+
+Output image must be 8-bit unsigned 1-channel image. @ref CV_8UC1.
+Width of I420 output image must be the same as width of input image.
+Height of I420 output image must be equal 3/2 from height of input image.
+
+@note Function textual ID is "org.opencv.imgproc.colorconvert.bgr2i420"
+
+@param src input image: 8-bit unsigned 3-channel image @ref CV_8UC3.
+@sa I4202BGR
+*/
+GAPI_EXPORTS_W GMat BGR2I420(const GMat& src);
+
+/** @brief Converts an image from RGB color space to I420 color space.
+
+The function converts an input image from RGB color space to I420.
+The conventional ranges for R, G, and B channel values are 0 to 255.
+
+Output image must be 8-bit unsigned 1-channel image. @ref CV_8UC1.
+Width of I420 output image must be the same as width of input image.
+Height of I420 output image must be equal 3/2 from height of input image.
+
+@note Function textual ID is "org.opencv.imgproc.colorconvert.rgb2i420"
+
+@param src input image: 8-bit unsigned 3-channel image @ref CV_8UC3.
+@sa I4202RGB
+*/
+GAPI_EXPORTS_W GMat RGB2I420(const GMat& src);
+
+/** @brief Converts an image from I420 color space to BGR color space.
+
+The function converts an input image from I420 color space to BGR.
+The conventional ranges for B, G, and R channel values are 0 to 255.
+
+Output image must be 8-bit unsigned 3-channel image. @ref CV_8UC3.
+Width of BGR output image must be the same as width of input image.
+Height of BGR output image must be equal 2/3 from height of input image.
+
+@note Function textual ID is "org.opencv.imgproc.colorconvert.i4202bgr"
+
+@param src input image: 8-bit unsigned 1-channel image @ref CV_8UC1.
+@sa BGR2I420
+*/
+GAPI_EXPORTS_W GMat I4202BGR(const GMat& src);
+
+/** @brief Converts an image from I420 color space to BGR color space.
+
+The function converts an input image from I420 color space to BGR.
+The conventional ranges for B, G, and R channel values are 0 to 255.
+
+Output image must be 8-bit unsigned 3-channel image. @ref CV_8UC3.
+Width of RGB output image must be the same as width of input image.
+Height of RGB output image must be equal 2/3 from height of input image.
+
+@note Function textual ID is "org.opencv.imgproc.colorconvert.i4202rgb"
+
+@param src input image: 8-bit unsigned 1-channel image @ref CV_8UC1.
+@sa RGB2I420
+*/
+GAPI_EXPORTS_W GMat I4202RGB(const GMat& src);
+
+/** @brief Converts an image from BGR color space to LUV color space.
+
+The function converts an input image from BGR color space to LUV.
+The conventional ranges for B, G, and R channel values are 0 to 255.
+
+Output image must be 8-bit unsigned 3-channel image @ref CV_8UC3.
+
+@note Function textual ID is "org.opencv.imgproc.colorconvert.bgr2luv"
+
+@param src input image: 8-bit unsigned 3-channel image @ref CV_8UC3.
+@sa RGB2Lab, RGB2LUV
+*/
+GAPI_EXPORTS_W GMat BGR2LUV(const GMat& src);
+
+/** @brief Converts an image from LUV color space to BGR color space.
+
+The function converts an input image from LUV color space to BGR.
+The conventional ranges for B, G, and R channel values are 0 to 255.
+
+Output image must be 8-bit unsigned 3-channel image @ref CV_8UC3.
+
+@note Function textual ID is "org.opencv.imgproc.colorconvert.luv2bgr"
+
+@param src input image: 8-bit unsigned 3-channel image @ref CV_8UC3.
+@sa BGR2LUV
+*/
+GAPI_EXPORTS_W GMat LUV2BGR(const GMat& src);
+
+/** @brief Converts an image from YUV color space to BGR color space.
+
+The function converts an input image from YUV color space to BGR.
+The conventional ranges for B, G, and R channel values are 0 to 255.
+
+Output image must be 8-bit unsigned 3-channel image @ref CV_8UC3.
+
+@note Function textual ID is "org.opencv.imgproc.colorconvert.yuv2bgr"
+
+@param src input image: 8-bit unsigned 3-channel image @ref CV_8UC3.
+@sa BGR2YUV
+*/
+GAPI_EXPORTS_W GMat YUV2BGR(const GMat& src);
+
+/** @brief Converts an image from BGR color space to YUV color space.
+
+The function converts an input image from BGR color space to YUV.
+The conventional ranges for B, G, and R channel values are 0 to 255.
+
+Output image must be 8-bit unsigned 3-channel image @ref CV_8UC3.
+
+@note Function textual ID is "org.opencv.imgproc.colorconvert.bgr2yuv"
+
+@param src input image: 8-bit unsigned 3-channel image @ref CV_8UC3.
+@sa YUV2BGR
+*/
+GAPI_EXPORTS_W GMat BGR2YUV(const GMat& src);
+
+/** @brief Converts an image from RGB color space to Lab color space.
+
+The function converts an input image from BGR color space to Lab.
+The conventional ranges for R, G, and B channel values are 0 to 255.
+
+Output image must be 8-bit unsigned 3-channel image @ref CV_8UC1.
+
+@note Function textual ID is "org.opencv.imgproc.colorconvert.rgb2lab"
+
+@param src input image: 8-bit unsigned 3-channel image @ref CV_8UC1.
+@sa RGB2YUV, RGB2LUV
+*/
+GAPI_EXPORTS_W GMat RGB2Lab(const GMat& src);
+
+/** @brief Converts an image from YUV color space to RGB.
+The function converts an input image from YUV color space to RGB.
+The conventional ranges for Y, U, and V channel values are 0 to 255.
+
+Output image must be 8-bit unsigned 3-channel image @ref CV_8UC3.
+
+@note Function textual ID is "org.opencv.imgproc.colorconvert.yuv2rgb"
+
+@param src input image: 8-bit unsigned 3-channel image @ref CV_8UC3.
+
+@sa RGB2Lab, RGB2YUV
+*/
+GAPI_EXPORTS_W GMat YUV2RGB(const GMat& src);
+
+/** @brief Converts an image from NV12 (YUV420p) color space to RGB.
+The function converts an input image from NV12 color space to RGB.
+The conventional ranges for Y, U, and V channel values are 0 to 255.
+
+Output image must be 8-bit unsigned 3-channel image @ref CV_8UC3.
+
+@note Function textual ID is "org.opencv.imgproc.colorconvert.nv12torgb"
+
+@param src_y input image: 8-bit unsigned 1-channel image @ref CV_8UC1.
+@param src_uv input image: 8-bit unsigned 2-channel image @ref CV_8UC2.
+
+@sa YUV2RGB, NV12toBGR
+*/
+GAPI_EXPORTS_W GMat NV12toRGB(const GMat& src_y, const GMat& src_uv);
+
+/** @brief Converts an image from NV12 (YUV420p) color space to gray-scaled.
+The function converts an input image from NV12 color space to gray-scaled.
+The conventional ranges for Y, U, and V channel values are 0 to 255.
+
+Output image must be 8-bit unsigned 1-channel image @ref CV_8UC1.
+
+@note Function textual ID is "org.opencv.imgproc.colorconvert.nv12togray"
+
+@param src_y input image: 8-bit unsigned 1-channel image @ref CV_8UC1.
+@param src_uv input image: 8-bit unsigned 2-channel image @ref CV_8UC2.
+
+@sa YUV2RGB, NV12toBGR
+*/
+GAPI_EXPORTS_W GMat NV12toGray(const GMat& src_y, const GMat& src_uv);
+
+/** @brief Converts an image from NV12 (YUV420p) color space to BGR.
+The function converts an input image from NV12 color space to RGB.
+The conventional ranges for Y, U, and V channel values are 0 to 255.
+
+Output image must be 8-bit unsigned 3-channel image @ref CV_8UC3.
+
+@note Function textual ID is "org.opencv.imgproc.colorconvert.nv12tobgr"
+
+@param src_y input image: 8-bit unsigned 1-channel image @ref CV_8UC1.
+@param src_uv input image: 8-bit unsigned 2-channel image @ref CV_8UC2.
+
+@sa YUV2BGR, NV12toRGB
+*/
+GAPI_EXPORTS_W GMat NV12toBGR(const GMat& src_y, const GMat& src_uv);
+
+/** @brief Converts an image from BayerGR color space to RGB.
+The function converts an input image from BayerGR color space to RGB.
+The conventional ranges for G, R, and B channel values are 0 to 255.
+
+Output image must be 8-bit unsigned 3-channel image @ref CV_8UC3.
+
+@note Function textual ID is "org.opencv.imgproc.colorconvert.bayergr2rgb"
+
+@param src_gr input image: 8-bit unsigned 1-channel image @ref CV_8UC1.
+
+@sa YUV2BGR, NV12toRGB
+*/
+GAPI_EXPORTS_W GMat BayerGR2RGB(const GMat& src_gr);
+
+/** @brief Converts an image from RGB color space to HSV.
+The function converts an input image from RGB color space to HSV.
+The conventional ranges for R, G, and B channel values are 0 to 255.
+
+Output image must be 8-bit unsigned 3-channel image @ref CV_8UC3.
+
+@note Function textual ID is "org.opencv.imgproc.colorconvert.rgb2hsv"
+
+@param src input image: 8-bit unsigned 3-channel image @ref CV_8UC3.
+
+@sa YUV2BGR, NV12toRGB
+*/
+GAPI_EXPORTS_W GMat RGB2HSV(const GMat& src);
+
+/** @brief Converts an image from RGB color space to YUV422.
+The function converts an input image from RGB color space to YUV422.
+The conventional ranges for R, G, and B channel values are 0 to 255.
+
+Output image must be 8-bit unsigned 2-channel image @ref CV_8UC2.
+
+@note Function textual ID is "org.opencv.imgproc.colorconvert.rgb2yuv422"
+
+@param src input image: 8-bit unsigned 3-channel image @ref CV_8UC3.
+
+@sa YUV2BGR, NV12toRGB
+*/
+GAPI_EXPORTS_W GMat RGB2YUV422(const GMat& src);
+
+/** @brief Converts an image from NV12 (YUV420p) color space to RGB.
+The function converts an input image from NV12 color space to RGB.
+The conventional ranges for Y, U, and V channel values are 0 to 255.
+
+Output image must be 8-bit unsigned planar 3-channel image @ref CV_8UC1.
+Planar image memory layout is three planes laying in the memory contiguously,
+so the image height should be plane_height*plane_number,
+image type is @ref CV_8UC1.
+
+@note Function textual ID is "org.opencv.imgproc.colorconvert.nv12torgbp"
+
+@param src_y input image: 8-bit unsigned 1-channel image @ref CV_8UC1.
+@param src_uv input image: 8-bit unsigned 2-channel image @ref CV_8UC2.
+
+@sa YUV2RGB, NV12toBGRp, NV12toRGB
+*/
+GAPI_EXPORTS GMatP NV12toRGBp(const GMat &src_y, const GMat &src_uv);
+
+/** @brief Converts an image from NV12 (YUV420p) color space to BGR.
+The function converts an input image from NV12 color space to BGR.
+The conventional ranges for Y, U, and V channel values are 0 to 255.
+
+Output image must be 8-bit unsigned planar 3-channel image @ref CV_8UC1.
+Planar image memory layout is three planes laying in the memory contiguously,
+so the image height should be plane_height*plane_number,
+image type is @ref CV_8UC1.
+
+@note Function textual ID is "org.opencv.imgproc.colorconvert.nv12torgbp"
+
+@param src_y input image: 8-bit unsigned 1-channel image @ref CV_8UC1.
+@param src_uv input image: 8-bit unsigned 2-channel image @ref CV_8UC2.
+
+@sa YUV2RGB, NV12toRGBp, NV12toBGR
+*/
+GAPI_EXPORTS GMatP NV12toBGRp(const GMat &src_y, const GMat &src_uv);
+
+//! @} gapi_colorconvert
+//! @addtogroup gapi_transform
+//! @{
+/** @brief Resizes an image.
+
+The function resizes the image src down to or up to the specified size.
+
+Output image size will have the size dsize (when dsize is non-zero) or the size computed from
+src.size(), fx, and fy; the depth of output is the same as of src.
+
+If you want to resize src so that it fits the pre-created dst,
+you may call the function as follows:
+@code
+    // explicitly specify dsize=dst.size(); fx and fy will be computed from that.
+    resize(src, dst, dst.size(), 0, 0, interpolation);
+@endcode
+If you want to decimate the image by factor of 2 in each direction, you can call the function this
+way:
+@code
+    // specify fx and fy and let the function compute the destination image size.
+    resize(src, dst, Size(), 0.5, 0.5, interpolation);
+@endcode
+To shrink an image, it will generally look best with cv::INTER_AREA interpolation, whereas to
+enlarge an image, it will generally look best with cv::INTER_CUBIC (slow) or cv::INTER_LINEAR
+(faster but still looks OK).
+
+@note Function textual ID is "org.opencv.imgproc.transform.resize"
+
+@param src input image.
+@param dsize output image size; if it equals zero, it is computed as:
+ \f[\texttt{dsize = Size(round(fx*src.cols), round(fy*src.rows))}\f]
+ Either dsize or both fx and fy must be non-zero.
+@param fx scale factor along the horizontal axis; when it equals 0, it is computed as
+\f[\texttt{(double)dsize.width/src.cols}\f]
+@param fy scale factor along the vertical axis; when it equals 0, it is computed as
+\f[\texttt{(double)dsize.height/src.rows}\f]
+@param interpolation interpolation method, see cv::InterpolationFlags
+
+@sa  warpAffine, warpPerspective, remap, resizeP
+ */
+GAPI_EXPORTS_W GMat resize(const GMat& src, const Size& dsize, double fx = 0, double fy = 0, int interpolation = INTER_LINEAR);
+
+/** @brief Resizes a planar image.
+
+The function resizes the image src down to or up to the specified size.
+Planar image memory layout is three planes laying in the memory contiguously,
+so the image height should be plane_height*plane_number, image type is @ref CV_8UC1.
+
+Output image size will have the size dsize, the depth of output is the same as of src.
+
+@note Function textual ID is "org.opencv.imgproc.transform.resizeP"
+
+@param src input image, must be of @ref CV_8UC1 type;
+@param dsize output image size;
+@param interpolation interpolation method, only cv::INTER_LINEAR is supported at the moment
+
+@sa  warpAffine, warpPerspective, remap, resize
+ */
+GAPI_EXPORTS GMatP resizeP(const GMatP& src, const Size& dsize, int interpolation = cv::INTER_LINEAR);
+
+//! @} gapi_transform
+} //namespace gapi
+} //namespace cv
+
+#endif // OPENCV_GAPI_IMGPROC_HPP
diff --git a/3rdParty/opencv2/gapi/infer.hpp b/3rdParty/opencv-4.12.0/opencv2/gapi/infer.hpp
similarity index 96%
rename from 3rdParty/opencv2/gapi/infer.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/gapi/infer.hpp
index 269c44dcd3..4aa2484f02 100644
--- a/3rdParty/opencv2/gapi/infer.hpp
+++ b/3rdParty/opencv-4.12.0/opencv2/gapi/infer.hpp
@@ -101,8 +101,10 @@ class GInferOutputsTyped
         if (it == m_priv->blobs.end()) {
             // FIXME: Avoid modifying GKernel
             auto shape = cv::detail::GTypeTraits<OutT>::shape;
+            auto kind  = cv::detail::GTypeTraits<OutT>::op_kind;
             m_priv->call->kernel().outShapes.push_back(shape);
             m_priv->call->kernel().outCtors.emplace_back(cv::detail::GObtainCtor<OutT>::get());
+            m_priv->call->kernel().outKinds.emplace_back(kind);
             auto out_idx = static_cast<int>(m_priv->blobs.size());
             it = m_priv->blobs.emplace(name,
                     cv::detail::Yield<OutT>::yield(*(m_priv->call), out_idx)).first;
@@ -175,6 +177,7 @@ std::shared_ptr<cv::GCall> makeCall(const std::string         &tag,
                 {}, // outShape will be filled later
                 std::move(kinds),
                 {}, // outCtors will be filled later
+                {}, // outKinds will be filled later
             });
 
     call->setArgs(std::move(args));
@@ -397,7 +400,7 @@ void inline unpackBlobs(const cv::GInferInputs::Map& blobs,
                 kinds.emplace_back(cv::detail::OpaqueKind::CV_UNKNOWN);
                 break;
             default:
-                GAPI_Assert(false);
+                GAPI_Error("InternalError");
         }
     }
 }
@@ -629,7 +632,7 @@ infer2(const std::string& tag,
                 kinds.emplace_back(cv::detail::OpaqueKind::CV_RECT);
                 break;
             default:
-                GAPI_Assert(false);
+                GAPI_Error("InternalError");
         }
     }
 
diff --git a/3rdParty/opencv2/gapi/infer/bindings_ie.hpp b/3rdParty/opencv-4.12.0/opencv2/gapi/infer/bindings_ie.hpp
similarity index 100%
rename from 3rdParty/opencv2/gapi/infer/bindings_ie.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/gapi/infer/bindings_ie.hpp
diff --git a/3rdParty/opencv-4.12.0/opencv2/gapi/infer/bindings_onnx.hpp b/3rdParty/opencv-4.12.0/opencv2/gapi/infer/bindings_onnx.hpp
new file mode 100644
index 0000000000..4fa0a8db64
--- /dev/null
+++ b/3rdParty/opencv-4.12.0/opencv2/gapi/infer/bindings_onnx.hpp
@@ -0,0 +1,74 @@
+// This file is part of OpenCV project.
+// It is subject to the license terms in the LICENSE file found in the top-level
+// directory of this distribution and at http://opencv.org/license.html.
+
+#ifndef OPENCV_GAPI_INFER_BINDINGS_ONNX_HPP
+#define OPENCV_GAPI_INFER_BINDINGS_ONNX_HPP
+
+#include <opencv2/gapi/gkernel.hpp>     // GKernelPackage
+#include <opencv2/gapi/infer/onnx.hpp>  // Params
+#include "opencv2/gapi/own/exports.hpp"  // GAPI_EXPORTS
+#include <opencv2/gapi/util/any.hpp>
+
+#include <string>
+
+namespace cv {
+namespace gapi {
+namespace onnx {
+
+// NB: Used by python wrapper
+// This class can be marked as SIMPLE, because it's implemented as pimpl
+class GAPI_EXPORTS_W_SIMPLE PyParams {
+public:
+    GAPI_WRAP
+    PyParams() = default;
+
+    GAPI_WRAP
+    PyParams(const std::string& tag, const std::string& model_path);
+
+    GAPI_WRAP
+    PyParams& cfgMeanStd(const std::string &layer_name,
+                         const cv::Scalar &m,
+                         const cv::Scalar &s);
+    GAPI_WRAP
+    PyParams& cfgNormalize(const std::string &layer_name, bool flag);
+
+    GAPI_WRAP
+    PyParams& cfgAddExecutionProvider(ep::OpenVINO ep);
+
+    GAPI_WRAP
+    PyParams& cfgAddExecutionProvider(ep::DirectML ep);
+
+    GAPI_WRAP
+    PyParams& cfgAddExecutionProvider(ep::CoreML ep);
+
+    GAPI_WRAP
+    PyParams& cfgAddExecutionProvider(ep::CUDA ep);
+
+    GAPI_WRAP
+    PyParams& cfgAddExecutionProvider(ep::TensorRT ep);
+
+    GAPI_WRAP
+    PyParams& cfgDisableMemPattern();
+
+    GAPI_WRAP
+    PyParams& cfgSessionOptions(const std::map<std::string, std::string>& options);
+
+    GAPI_WRAP
+    PyParams& cfgOptLevel(const int opt_level);
+
+    GBackend backend() const;
+    std::string tag() const;
+    cv::util::any params() const;
+
+private:
+    std::shared_ptr<Params<cv::gapi::Generic>> m_priv;
+};
+
+GAPI_EXPORTS_W PyParams params(const std::string& tag, const std::string& model_path);
+
+}  // namespace onnx
+}  // namespace gapi
+}  // namespace cv
+
+#endif  // OPENCV_GAPI_INFER_BINDINGS_ONNX_HPP
diff --git a/3rdParty/opencv-4.12.0/opencv2/gapi/infer/bindings_ov.hpp b/3rdParty/opencv-4.12.0/opencv2/gapi/infer/bindings_ov.hpp
new file mode 100644
index 0000000000..5cf371f1f2
--- /dev/null
+++ b/3rdParty/opencv-4.12.0/opencv2/gapi/infer/bindings_ov.hpp
@@ -0,0 +1,128 @@
+// This file is part of OpenCV project.
+// It is subject to the license terms in the LICENSE file found in the top-level directory
+// of this distribution and at http://opencv.org/license.html.
+//
+// Copyright (C) 2023 Intel Corporation
+
+#ifndef OPENCV_GAPI_INFER_BINDINGS_OV_HPP
+#define OPENCV_GAPI_INFER_BINDINGS_OV_HPP
+
+#include <opencv2/gapi/util/any.hpp>
+#include "opencv2/gapi/own/exports.hpp" // GAPI_EXPORTS
+#include <opencv2/gapi/gkernel.hpp>     // GKernelPackage
+#include <opencv2/gapi/infer/ov.hpp>    // Params
+
+#include <string>
+
+namespace cv {
+namespace gapi {
+namespace ov {
+
+// NB: Used by python wrapper
+// This class can be marked as SIMPLE, because it's implemented as pimpl
+class GAPI_EXPORTS_W_SIMPLE PyParams {
+public:
+    GAPI_WRAP
+    PyParams() = default;
+
+    GAPI_WRAP
+    PyParams(const std::string &tag,
+             const std::string &model_path,
+             const std::string &bin_path,
+             const std::string &device);
+
+    GAPI_WRAP
+    PyParams(const std::string &tag,
+             const std::string &blob_path,
+             const std::string &device);
+
+    GAPI_WRAP
+    PyParams& cfgPluginConfig(
+            const std::map<std::string, std::string> &config);
+
+    GAPI_WRAP
+    PyParams& cfgInputTensorLayout(std::string tensor_layout);
+
+    GAPI_WRAP
+    PyParams& cfgInputTensorLayout(
+            std::map<std::string, std::string> layout_map);
+
+    GAPI_WRAP
+    PyParams& cfgInputModelLayout(std::string tensor_layout);
+
+    GAPI_WRAP
+    PyParams& cfgInputModelLayout(
+            std::map<std::string, std::string> layout_map);
+
+    GAPI_WRAP
+    PyParams& cfgOutputTensorLayout(std::string tensor_layout);
+
+    GAPI_WRAP
+    PyParams& cfgOutputTensorLayout(
+            std::map<std::string, std::string> layout_map);
+
+    GAPI_WRAP
+    PyParams& cfgOutputModelLayout(std::string tensor_layout);
+
+    GAPI_WRAP
+    PyParams& cfgOutputModelLayout(
+            std::map<std::string, std::string> layout_map);
+
+    GAPI_WRAP
+    PyParams& cfgOutputTensorPrecision(int precision);
+
+    GAPI_WRAP
+    PyParams& cfgOutputTensorPrecision(
+            std::map<std::string, int> precision_map);
+
+    GAPI_WRAP
+    PyParams& cfgReshape(std::vector<size_t> new_shape);
+
+    GAPI_WRAP
+    PyParams& cfgReshape(
+            std::map<std::string, std::vector<size_t>> new_shape_map);
+
+    GAPI_WRAP
+    PyParams& cfgNumRequests(const size_t nireq);
+
+    GAPI_WRAP
+    PyParams& cfgMean(std::vector<float> mean_values);
+
+    GAPI_WRAP
+    PyParams& cfgMean(
+            std::map<std::string, std::vector<float>> mean_map);
+
+    GAPI_WRAP
+    PyParams& cfgScale(std::vector<float> scale_values);
+
+    GAPI_WRAP
+    PyParams& cfgScale(
+            std::map<std::string, std::vector<float>> scale_map);
+
+    GAPI_WRAP
+    PyParams& cfgResize(int interpolation);
+
+    GAPI_WRAP
+    PyParams& cfgResize(std::map<std::string, int> interpolation);
+
+    GBackend      backend() const;
+    std::string   tag()     const;
+    cv::util::any params()  const;
+
+private:
+    std::shared_ptr<Params<cv::gapi::Generic>> m_priv;
+};
+
+GAPI_EXPORTS_W PyParams params(const std::string &tag,
+                               const std::string &model_path,
+                               const std::string &weights,
+                               const std::string &device);
+
+GAPI_EXPORTS_W PyParams params(const std::string &tag,
+                               const std::string &bin_path,
+                               const std::string &device);
+} // namespace ov
+} // namespace gapi
+} // namespace cv
+
+#endif // OPENCV_GAPI_INFER_BINDINGS_OV_HPP
diff --git a/3rdParty/opencv-4.12.0/opencv2/gapi/infer/ie.hpp b/3rdParty/opencv-4.12.0/opencv2/gapi/infer/ie.hpp
new file mode 100644
index 0000000000..4552d2db34
--- /dev/null
+++ b/3rdParty/opencv-4.12.0/opencv2/gapi/infer/ie.hpp
@@ -0,0 +1,711 @@
+// This file is part of OpenCV project.
+// It is subject to the license terms in the LICENSE file found in the top-level directory
+// of this distribution and at http://opencv.org/license.html.
+//
+// Copyright (C) 2019-2023 Intel Corporation
+
+#ifndef OPENCV_GAPI_INFER_IE_HPP
+#define OPENCV_GAPI_INFER_IE_HPP
+
+#include <unordered_map>
+#include <unordered_set>
+#include <string>
+#include <array>
+#include <tuple> // tuple, tuple_size
+#include <map>
+
+#include <opencv2/gapi/opencv_includes.hpp>
+#include <opencv2/gapi/util/any.hpp>
+
+#include <opencv2/core/cvdef.h>     // GAPI_EXPORTS
+#include <opencv2/gapi/gkernel.hpp> // GKernelPackage
+#include <opencv2/gapi/infer.hpp>   // Generic
+#include <opencv2/gapi/streaming/onevpl/accel_types.hpp> // Preproc Dev & Ctx
+
+namespace cv {
+namespace gapi {
+// FIXME: introduce a new sub-namespace for NN?
+
+/**
+ * @brief This namespace contains G-API OpenVINO backend functions,
+ * structures, and symbols.
+ */
+namespace ie {
+
+GAPI_EXPORTS cv::gapi::GBackend backend();
+
+/**
+ * Specifies how G-API and IE should trait input data
+ *
+ * In OpenCV, the same cv::Mat is used to represent both
+ * image and tensor data. Sometimes those are hardly distinguishable,
+ * so this extra parameter is used to give G-API a hint.
+ *
+ * This hint controls how G-API reinterprets the data when converting
+ * it to IE Blob format (and which layout/etc is assigned to this data).
+ */
+enum class TraitAs: int
+{
+    TENSOR, //!< G-API traits an associated cv::Mat as a raw tensor and passes dimensions as-is
+    IMAGE   //!< G-API traits an associated cv::Mat as an image so creates an "image" blob (NCHW/NHWC, etc)
+};
+
+using IEConfig = std::map<std::string, std::string>;
+
+enum InferMode {Sync, Async};
+
+namespace detail {
+
+template <typename T>
+using AttrMap = std::map<std::string, T>;
+// NB: This type is used to hold in/out layers
+// attributes such as precision, layout, shape etc.
+//
+// User can provide attributes either:
+// 1. cv::util::monostate - No value specified explicitly.
+// 2. Attr - value specified explicitly that should be broadcasted to all layers.
+// 3. AttrMap[str->T] - map specifies value for particular layer.
+template <typename Attr>
+using LayerVariantAttr = cv::util::variant< cv::util::monostate
+                                          , AttrMap<Attr>
+                                          , Attr>;
+
+struct ParamDesc {
+    std::string model_path;
+    std::string weights_path;
+    std::string device_id;
+
+    std::vector<std::string> input_names;
+    std::vector<std::string> output_names;
+
+    using ConstInput = std::pair<cv::Mat, TraitAs>;
+    std::unordered_map<std::string, ConstInput> const_inputs;
+
+    std::size_t num_in;
+    std::size_t num_out;
+
+    enum class Kind {Load, Import};
+    Kind kind;
+    bool is_generic;
+    IEConfig config;
+
+    std::map<std::string, std::vector<std::size_t>> reshape_table;
+    std::unordered_set<std::string> layer_names_to_reshape;
+
+    // NB: Number of asyncrhonious infer requests
+    size_t nireq;
+
+    // NB: An optional config to setup RemoteContext for IE
+    cv::util::any context_config;
+
+    // NB: batch_size can't be equal to 1 by default, because some of models
+    // have 2D (Layout::NC) input and if the first dimension not equal to 1
+    // net.setBatchSize(1) will overwrite it.
+    cv::optional<size_t> batch_size;
+
+    cv::optional<cv::gapi::wip::onevpl::Device> vpl_preproc_device;
+    cv::optional<cv::gapi::wip::onevpl::Context> vpl_preproc_ctx;
+
+    InferMode mode;
+
+    using PrecisionT = int;
+    using PrecisionMapT = std::unordered_map<std::string, PrecisionT>;
+    // NB: This parameter can contain:
+    // 1. cv::util::monostate - Don't specify precision, but use default from IR/Blob.
+    // 2. PrecisionT (CV_8U, CV_32F, ...) - Specifies precision for all output layers.
+    // 3. PrecisionMapT ({{"layer0", CV_32F}, {"layer1", CV_16F}} - Specifies precision for certain output layer.
+    // cv::util::monostate is default value that means precision wasn't specified.
+    using PrecisionVariantT = cv::util::variant<cv::util::monostate,
+                                                PrecisionT,
+                                                PrecisionMapT>;
+
+    PrecisionVariantT output_precision;
+    LayerVariantAttr<std::string> input_layout;
+    LayerVariantAttr<std::string> output_layout;
+    LayerVariantAttr<int>         interpolation;
+};
+} // namespace detail
+
+// FIXME: this is probably a shared (reusable) thing
+template<typename Net>
+struct PortCfg {
+    using In = std::array
+        < std::string
+        , std::tuple_size<typename Net::InArgs>::value >;
+    using Out = std::array
+        < std::string
+        , std::tuple_size<typename Net::OutArgs>::value >;
+};
+
+/**
+ * @brief This structure provides functions
+ * that fill inference parameters for "OpenVINO Toolkit" model.
+ */
+template<typename Net> class Params {
+public:
+    /** @brief Class constructor.
+
+    Constructs Params based on model information and specifies default values for other
+    inference description parameters. Model is loaded and compiled using "OpenVINO Toolkit".
+
+    @param model Path to topology IR (.xml file).
+    @param weights Path to weights (.bin file).
+    @param device target device to use.
+    */
+    Params(const std::string &model,
+           const std::string &weights,
+           const std::string &device)
+        : desc{ model, weights, device, {}, {}, {}
+              , std::tuple_size<typename Net::InArgs>::value  // num_in
+              , std::tuple_size<typename Net::OutArgs>::value // num_out
+              , detail::ParamDesc::Kind::Load
+              , false
+              , {}
+              , {}
+              , {}
+              , 1u
+              , {}
+              , {}
+              , {}
+              , {}
+              , InferMode::Async
+              , {}
+              , {}
+              , {}
+              , {} } {
+    }
+
+    /** @overload
+    Use this constructor to work with pre-compiled network.
+    Model is imported from a pre-compiled blob.
+
+    @param model Path to model.
+    @param device target device to use.
+    */
+    Params(const std::string &model,
+           const std::string &device)
+        : desc{ model, {}, device, {}, {}, {}
+              , std::tuple_size<typename Net::InArgs>::value  // num_in
+              , std::tuple_size<typename Net::OutArgs>::value // num_out
+              , detail::ParamDesc::Kind::Import
+              , false
+              , {}
+              , {}
+              , {}
+              , 1u
+              , {}
+              , {}
+              , {}
+              , {}
+              , InferMode::Async
+              , {}
+              , {}
+              , {}
+              , {} } {
+    }
+
+    /** @brief Specifies sequence of network input layers names for inference.
+
+    The function is used to associate cv::gapi::infer<> inputs with the model inputs.
+    Number of names has to match the number of network inputs as defined in G_API_NET().
+    In case a network has only single input layer, there is no need to specify name manually.
+
+    @param layer_names std::array<std::string, N> where N is the number of inputs
+    as defined in the @ref G_API_NET. Contains names of input layers.
+    @return reference to this parameter structure.
+    */
+    Params<Net>& cfgInputLayers(const typename PortCfg<Net>::In &layer_names) {
+        desc.input_names.clear();
+        desc.input_names.reserve(layer_names.size());
+        std::copy(layer_names.begin(), layer_names.end(),
+                  std::back_inserter(desc.input_names));
+        return *this;
+    }
+
+    /** @brief Specifies sequence of network output layers names for inference.
+
+    The function is used to associate cv::gapi::infer<> outputs with the model outputs.
+    Number of names has to match the number of network outputs as defined in G_API_NET().
+    In case a network has only single output layer, there is no need to specify name manually.
+
+    @param layer_names std::array<std::string, N> where N is the number of outputs
+    as defined in the @ref G_API_NET. Contains names of output layers.
+    @return reference to this parameter structure.
+    */
+    Params<Net>& cfgOutputLayers(const typename PortCfg<Net>::Out &layer_names) {
+        desc.output_names.clear();
+        desc.output_names.reserve(layer_names.size());
+        std::copy(layer_names.begin(), layer_names.end(),
+                  std::back_inserter(desc.output_names));
+        return *this;
+    }
+
+    /** @brief Specifies a constant input.
+
+    The function is used to set a constant input. This input has to be
+    a preprocessed tensor if its type is TENSOR. Need to provide name of the
+    network layer which will receive provided data.
+
+    @param layer_name Name of network layer.
+    @param data cv::Mat that contains data which will be associated with network layer.
+    @param hint Input type @sa cv::gapi::ie::TraitAs.
+    @return reference to this parameter structure.
+    */
+    Params<Net>& constInput(const std::string &layer_name,
+                            const cv::Mat &data,
+                            TraitAs hint = TraitAs::TENSOR) {
+        desc.const_inputs[layer_name] = {data, hint};
+        return *this;
+    }
+
+    /** @brief Specifies OpenVINO plugin configuration.
+
+    The function is used to set configuration for OpenVINO plugin. Some parameters
+    can be different for each plugin. Please follow https://docs.openvinotoolkit.org/latest/index.html
+    to check information about specific plugin.
+
+    @param cfg Map of pairs: (config parameter name, config parameter value).
+    @return reference to this parameter structure.
+    */
+    Params& pluginConfig(const IEConfig& cfg) {
+        desc.config = cfg;
+        return *this;
+    }
+
+    /** @overload
+    Function with a rvalue parameter.
+
+    @param cfg rvalue map of pairs: (config parameter name, config parameter value).
+    @return reference to this parameter structure.
+    */
+    Params& pluginConfig(IEConfig&& cfg) {
+        desc.config = std::move(cfg);
+        return *this;
+    }
+
+    /** @brief Specifies configuration for RemoteContext in InferenceEngine.
+
+    When RemoteContext is configured the backend imports the networks using the context.
+    It also expects cv::MediaFrames to be actually remote, to operate with blobs via the context.
+
+    @param ctx_cfg cv::util::any value which holds InferenceEngine::ParamMap.
+    @return reference to this parameter structure.
+    */
+    Params& cfgContextParams(const cv::util::any& ctx_cfg) {
+        desc.context_config = ctx_cfg;
+        return *this;
+    }
+
+    /** @overload
+    Function with an rvalue parameter.
+
+    @param ctx_cfg cv::util::any value which holds InferenceEngine::ParamMap.
+    @return reference to this parameter structure.
+    */
+    Params& cfgContextParams(cv::util::any&& ctx_cfg) {
+        desc.context_config = std::move(ctx_cfg);
+        return *this;
+    }
+
+    /** @brief Specifies number of asynchronous inference requests.
+
+    @param nireq Number of inference asynchronous requests.
+    @return reference to this parameter structure.
+    */
+    Params& cfgNumRequests(size_t nireq) {
+        GAPI_Assert(nireq > 0 && "Number of infer requests must be greater than zero!");
+        desc.nireq = nireq;
+        return *this;
+    }
+
+    /** @brief Specifies new input shapes for the network inputs.
+
+    The function is used to specify new input shapes for the network inputs.
+    Follow https://docs.openvinotoolkit.org/latest/classInferenceEngine_1_1networkNetwork.html
+    for additional information.
+
+    @param reshape_table Map of pairs: name of corresponding data and its dimension.
+    @return reference to this parameter structure.
+    */
+    Params<Net>& cfgInputReshape(const std::map<std::string, std::vector<std::size_t>>& reshape_table) {
+        desc.reshape_table = reshape_table;
+        return *this;
+    }
+
+    /** @overload */
+    Params<Net>& cfgInputReshape(std::map<std::string, std::vector<std::size_t>>&& reshape_table) {
+        desc.reshape_table = std::move(reshape_table);
+        return *this;
+    }
+
+    /** @overload
+
+    @param layer_name Name of layer.
+    @param layer_dims New dimensions for this layer.
+    @return reference to this parameter structure.
+    */
+    Params<Net>& cfgInputReshape(const std::string& layer_name, const std::vector<size_t>& layer_dims) {
+        desc.reshape_table.emplace(layer_name, layer_dims);
+        return *this;
+    }
+
+    /** @overload */
+    Params<Net>& cfgInputReshape(std::string&& layer_name, std::vector<size_t>&& layer_dims) {
+        desc.reshape_table.emplace(layer_name, layer_dims);
+        return *this;
+    }
+
+    /** @overload
+
+    @param layer_names set of names of network layers that will be used for network reshape.
+    @return reference to this parameter structure.
+    */
+    Params<Net>& cfgInputReshape(const std::unordered_set<std::string>& layer_names) {
+        desc.layer_names_to_reshape = layer_names;
+        return *this;
+    }
+
+    /** @overload
+
+    @param layer_names rvalue set of the selected layers will be reshaped automatically
+    its input image size.
+    @return reference to this parameter structure.
+    */
+    Params<Net>& cfgInputReshape(std::unordered_set<std::string>&& layer_names) {
+        desc.layer_names_to_reshape = std::move(layer_names);
+        return *this;
+    }
+
+    /** @brief Specifies the inference batch size.
+
+    The function is used to specify inference batch size.
+    Follow https://docs.openvinotoolkit.org/latest/classInferenceEngine_1_1CNNNetwork.html#a8e9d19270a48aab50cb5b1c43eecb8e9 for additional information
+
+    @param size batch size which will be used.
+    @return reference to this parameter structure.
+    */
+    Params<Net>& cfgBatchSize(const size_t size) {
+        desc.batch_size = cv::util::make_optional(size);
+        return *this;
+    }
+
+    Params<Net>& cfgPreprocessingParams(const cv::gapi::wip::onevpl::Device &device,
+                                        const cv::gapi::wip::onevpl::Context &ctx) {
+        desc.vpl_preproc_device = cv::util::make_optional(device);
+        desc.vpl_preproc_ctx = cv::util::make_optional(ctx);
+        return *this;
+    }
+
+    /** @brief Specifies which api will be used to run inference.
+
+    The function is used to specify mode for OpenVINO inference.
+    OpenVINO has two options to run inference:
+    1. Asynchronous (using StartAsync: https://docs.openvino.ai/latest/classInferenceEngine_1_1InferRequest.html#doxid-class-inference-engine-1-1-infer-request-1a405293e8423d82a5b45f642a3bef0d24)
+    2. Synchronous (using Infer: https://docs.openvino.ai/latest/classInferenceEngine_1_1InferRequest.html#doxid-class-inference-engine-1-1-infer-request-1a3391ce30894abde730523e9ca9371ce8)
+    By default asynchronous mode is used.
+
+    @param mode Inference mode which will be used.
+    @return reference to this parameter structure.
+    */
+    Params<Net>& cfgInferMode(InferMode mode) {
+        desc.mode = mode;
+        return *this;
+    }
+
+    /** @brief Specifies the output precision for model.
+
+    The function is used to set an output precision for model.
+
+    @param precision Precision in OpenCV format (CV_8U, CV_32F, ...)
+    will be applied to all output layers.
+    @return reference to this parameter structure.
+    */
+    Params<Net>& cfgOutputPrecision(detail::ParamDesc::PrecisionT precision) {
+        desc.output_precision = precision;
+        return *this;
+    }
+
+    /** @overload
+
+    @param precision_map Map of pairs: name of corresponding output layer
+    and its precision in OpenCV format (CV_8U, CV_32F, ...)
+    @return reference to this parameter structure.
+    */
+    Params<Net>&
+    cfgOutputPrecision(detail::ParamDesc::PrecisionMapT precision_map) {
+        desc.output_precision = precision_map;
+        return *this;
+    }
+
+    /** @brief Specifies the input layout for model.
+
+    The function is used to set an input layout for model.
+
+    @param layout Layout in string representation ("NCHW", "NHWC", etc)
+    will be applied to all input layers.
+    @return reference to this parameter structure.
+    */
+    Params<Net>& cfgInputLayout(std::string layout) {
+        desc.input_layout = std::move(layout);
+        return *this;
+    }
+
+    /** @overload
+
+    @param layout_map Map of pairs: name of corresponding input layer
+    and its layout in string representation ("NCHW", "NHWC", etc)
+    @return reference to this parameter structure.
+    */
+    Params<Net>&
+    cfgInputLayout(detail::AttrMap<std::string> layout_map) {
+        desc.input_layout = std::move(layout_map);
+        return *this;
+    }
+
+    /** @brief Specifies the output layout for model.
+
+    The function is used to set an output layout for model.
+
+    @param layout Layout in string representation ("NCHW", "NHWC", etc)
+    will be applied to all output layers.
+    @return reference to this parameter structure.
+    */
+    Params<Net>& cfgOutputLayout(std::string layout) {
+        desc.output_layout = std::move(layout);
+        return *this;
+    }
+
+    /** @overload
+
+    @param layout_map Map of pairs: name of corresponding output layer
+    and its layout in string representation ("NCHW", "NHWC", etc)
+    @return reference to this parameter structure.
+    */
+    Params<Net>&
+    cfgOutputLayout(detail::AttrMap<std::string> layout_map) {
+        desc.output_layout = std::move(layout_map);
+        return *this;
+    }
+
+    /** @brief Specifies resize interpolation algorithm.
+     *
+    The function is used to configure resize preprocessing for input layer.
+
+    @param interpolation Resize interpolation algorithm.
+    Supported algorithms: #INTER_LINEAR, #INTER_AREA.
+    @return reference to this parameter structure.
+    */
+    Params<Net>& cfgResize(int interpolation) {
+        desc.interpolation = interpolation;
+        return *this;
+    }
+
+    /** @overload
+
+    @param interpolation Map of pairs: name of corresponding input layer
+    and its resize algorithm.
+    @return reference to this parameter structure.
+    */
+    Params<Net>& cfgResize(detail::AttrMap<int> interpolation) {
+        desc.interpolation = std::move(interpolation);
+        return *this;
+    }
+
+    // BEGIN(G-API's network parametrization API)
+    GBackend      backend()    const { return cv::gapi::ie::backend();  }
+    std::string   tag()        const { return Net::tag(); }
+    cv::util::any params()     const { return { desc }; }
+    // END(G-API's network parametrization API)
+
+protected:
+    detail::ParamDesc desc;
+};
+
+/*
+* @brief This structure provides functions for generic network type that
+* fill inference parameters.
+* @see struct Generic
+*/
+template<>
+class Params<cv::gapi::Generic> {
+public:
+    /** @brief Class constructor.
+
+    Constructs Params based on model information and sets default values for other
+    inference description parameters. Model is loaded and compiled using OpenVINO Toolkit.
+
+    @param tag string tag of the network for which these parameters are intended.
+    @param model path to topology IR (.xml file).
+    @param weights path to weights (.bin file).
+    @param device target device to use.
+    */
+    Params(const std::string &tag,
+           const std::string &model,
+           const std::string &weights,
+           const std::string &device)
+        : desc{ model, weights, device, {}, {}, {}, 0u, 0u,
+                detail::ParamDesc::Kind::Load, true, {}, {}, {}, 1u,
+                {}, {}, {}, {}, InferMode::Async, {}, {}, {}, {} },
+          m_tag(tag) {
+    }
+
+    /** @overload
+
+    This constructor for pre-compiled networks. Model is imported from pre-compiled
+    blob.
+
+    @param tag string tag of the network for which these parameters are intended.
+    @param model path to model.
+    @param device target device to use.
+    */
+    Params(const std::string &tag,
+           const std::string &model,
+           const std::string &device)
+        : desc{ model, {}, device, {}, {}, {}, 0u, 0u,
+                detail::ParamDesc::Kind::Import, true, {}, {}, {}, 1u,
+                {}, {}, {}, {}, InferMode::Async, {}, {}, {}, {} },
+          m_tag(tag) {
+    }
+
+    /** @see ie::Params::pluginConfig. */
+    Params& pluginConfig(const IEConfig& cfg) {
+        desc.config = cfg;
+        return *this;
+    }
+
+    /** @overload */
+    Params& pluginConfig(IEConfig&& cfg) {
+        desc.config = std::move(cfg);
+        return *this;
+    }
+
+    /** @see ie::Params::constInput. */
+    Params& constInput(const std::string &layer_name,
+                       const cv::Mat &data,
+                       TraitAs hint = TraitAs::TENSOR) {
+        desc.const_inputs[layer_name] = {data, hint};
+        return *this;
+    }
+
+    /** @see ie::Params::cfgNumRequests. */
+    Params& cfgNumRequests(size_t nireq) {
+        GAPI_Assert(nireq > 0 && "Number of infer requests must be greater than zero!");
+        desc.nireq = nireq;
+        return *this;
+    }
+
+    /** @see ie::Params::cfgInputReshape */
+    Params& cfgInputReshape(const std::map<std::string, std::vector<std::size_t>>&reshape_table) {
+        desc.reshape_table = reshape_table;
+        return *this;
+    }
+
+    /** @overload */
+    Params& cfgInputReshape(std::map<std::string, std::vector<std::size_t>> && reshape_table) {
+        desc.reshape_table = std::move(reshape_table);
+        return *this;
+    }
+
+    /** @overload */
+    Params& cfgInputReshape(std::string && layer_name, std::vector<size_t> && layer_dims) {
+        desc.reshape_table.emplace(layer_name, layer_dims);
+        return *this;
+    }
+
+    /** @overload */
+    Params& cfgInputReshape(const std::string & layer_name, const std::vector<size_t>&layer_dims) {
+        desc.reshape_table.emplace(layer_name, layer_dims);
+        return *this;
+    }
+
+    /** @overload */
+    Params& cfgInputReshape(std::unordered_set<std::string> && layer_names) {
+        desc.layer_names_to_reshape = std::move(layer_names);
+        return *this;
+    }
+
+    /** @overload */
+    Params& cfgInputReshape(const std::unordered_set<std::string>&layer_names) {
+        desc.layer_names_to_reshape = layer_names;
+        return *this;
+    }
+
+    /** @see ie::Params::cfgBatchSize */
+    Params& cfgBatchSize(const size_t size) {
+        desc.batch_size = cv::util::make_optional(size);
+        return *this;
+    }
+
+    /** @see ie::Params::cfgInferAPI */
+    Params& cfgInferMode(InferMode mode) {
+        desc.mode = mode;
+        return *this;
+    }
+
+    /** @see ie::Params::cfgOutputPrecision */
+    Params& cfgOutputPrecision(detail::ParamDesc::PrecisionT precision) {
+        desc.output_precision = precision;
+        return *this;
+    }
+
+    /** @overload */
+    Params&
+    cfgOutputPrecision(detail::ParamDesc::PrecisionMapT precision_map) {
+        desc.output_precision = precision_map;
+        return *this;
+    }
+
+    /** @see ie::Params::cfgInputLayout */
+    Params& cfgInputLayout(std::string layout) {
+        desc.input_layout = std::move(layout);
+        return *this;
+    }
+
+    /** @overload */
+    Params&
+    cfgInputLayout(detail::AttrMap<std::string> layout_map) {
+        desc.input_layout = std::move(layout_map);
+        return *this;
+    }
+
+    /** @see ie::Params::cfgOutputLayout */
+    Params& cfgOutputLayout(std::string layout) {
+        desc.output_layout = std::move(layout);
+        return *this;
+    }
+
+    /** @overload */
+    Params&
+    cfgOutputLayout(detail::AttrMap<std::string> layout_map) {
+        desc.output_layout = std::move(layout_map);
+        return *this;
+    }
+
+    /** @see ie::Params::cfgResize */
+    Params& cfgResize(int interpolation) {
+        desc.interpolation = interpolation;
+        return *this;
+    }
+
+    /** @overload */
+    Params& cfgResize(detail::AttrMap<int> interpolation) {
+        desc.interpolation = std::move(interpolation);
+        return *this;
+    }
+
+    // BEGIN(G-API's network parametrization API)
+    GBackend      backend()    const { return cv::gapi::ie::backend();  }
+    std::string   tag()        const { return m_tag; }
+    cv::util::any params()     const { return { desc }; }
+    // END(G-API's network parametrization API)
+
+protected:
+    detail::ParamDesc desc;
+    std::string m_tag;
+};
+
+} // namespace ie
+} // namespace gapi
+} // namespace cv
+
+#endif // OPENCV_GAPI_INFER_IE_HPP
diff --git a/3rdParty/opencv-4.12.0/opencv2/gapi/infer/onnx.hpp b/3rdParty/opencv-4.12.0/opencv2/gapi/infer/onnx.hpp
new file mode 100644
index 0000000000..9d93246da1
--- /dev/null
+++ b/3rdParty/opencv-4.12.0/opencv2/gapi/infer/onnx.hpp
@@ -0,0 +1,759 @@
+// This file is part of OpenCV project.
+// It is subject to the license terms in the LICENSE file found in the top-level directory
+// of this distribution and at http://opencv.org/license.html.
+//
+// Copyright (C) 2020-2021 Intel Corporation
+
+#ifndef OPENCV_GAPI_INFER_ONNX_HPP
+#define OPENCV_GAPI_INFER_ONNX_HPP
+
+#include <unordered_map>
+#include <string>
+#include <array>
+#include <tuple> // tuple, tuple_size
+#include <map>
+
+#include <opencv2/gapi/opencv_includes.hpp>
+#include <opencv2/gapi/util/any.hpp>
+#include <opencv2/gapi/util/optional.hpp>
+
+#include <opencv2/core/cvdef.h>     // GAPI_EXPORTS
+#include <opencv2/gapi/gkernel.hpp> // GKernelPackage
+#include <opencv2/gapi/infer.hpp>   // Generic
+
+namespace cv {
+namespace gapi {
+
+/**
+ * @brief This namespace contains G-API ONNX Runtime backend functions, structures, and symbols.
+ */
+namespace onnx {
+
+/**
+ * @brief This namespace contains Execution Providers structures for G-API ONNX Runtime backend.
+ */
+namespace ep {
+
+/**
+ * @brief This structure provides functions
+ * that fill inference options for ONNX CoreML Execution Provider.
+ * Please follow https://onnxruntime.ai/docs/execution-providers/CoreML-ExecutionProvider.html#coreml-execution-provider
+ */
+struct GAPI_EXPORTS_W_SIMPLE CoreML {
+    /** @brief Class constructor.
+
+    Constructs CoreML parameters.
+
+    */
+    GAPI_WRAP
+    CoreML() = default;
+
+    /** @brief Limit CoreML Execution Provider to run on CPU only.
+
+    This function is used to limit CoreML to run on CPU only.
+    Please follow: https://onnxruntime.ai/docs/execution-providers/CoreML-ExecutionProvider.html#coreml_flag_use_cpu_only
+
+    @return reference to this parameter structure.
+    */
+    GAPI_WRAP
+    CoreML& cfgUseCPUOnly() {
+        use_cpu_only = true;
+        return *this;
+    }
+
+    /** @brief Enable CoreML EP to run on a subgraph in the body of a control flow ONNX operator (i.e. a Loop, Scan or If operator).
+
+    This function is used to enable CoreML EP to run on
+    a subgraph of a control flow of ONNX operation.
+    Please follow: https://onnxruntime.ai/docs/execution-providers/CoreML-ExecutionProvider.html#coreml_flag_enable_on_subgraph
+
+    @return reference to this parameter structure.
+    */
+    GAPI_WRAP
+    CoreML& cfgEnableOnSubgraph() {
+        enable_on_subgraph = true;
+        return *this;
+    }
+
+    /** @brief Enable CoreML EP to run only on Apple Neural Engine.
+
+    This function is used to enable CoreML EP to run only on Apple Neural Engine.
+    Please follow: https://onnxruntime.ai/docs/execution-providers/CoreML-ExecutionProvider.html#coreml_flag_only_enable_device_with_ane
+
+    @return reference to this parameter structure.
+    */
+    GAPI_WRAP
+    CoreML& cfgEnableOnlyNeuralEngine() {
+        enable_only_ane = true;
+        return *this;
+    }
+
+    bool use_cpu_only = false;
+    bool enable_on_subgraph = false;
+    bool enable_only_ane = false;
+};
+
+/**
+ * @brief This structure provides functions
+ * that fill inference options for CUDA Execution Provider.
+ * Please follow https://onnxruntime.ai/docs/execution-providers/CUDA-ExecutionProvider.html#cuda-execution-provider
+ */
+struct GAPI_EXPORTS_W_SIMPLE CUDA {
+    // NB: Used from python.
+    /// @private -- Exclude this constructor from OpenCV documentation
+    GAPI_WRAP
+    CUDA() = default;
+
+    /** @brief Class constructor.
+
+    Constructs CUDA parameters based on device type information.
+
+    @param dev_id Target device id to use.
+    */
+    GAPI_WRAP
+    explicit CUDA(const int dev_id)
+        : device_id(dev_id) {
+    }
+
+    int device_id;
+};
+
+/**
+ * @brief This structure provides functions
+ * that fill inference options for TensorRT Execution Provider.
+ * Please follow https://onnxruntime.ai/docs/execution-providers/TensorRT-ExecutionProvider.html#tensorrt-execution-provider
+ */
+struct GAPI_EXPORTS_W_SIMPLE TensorRT {
+    // NB: Used from python.
+    /// @private -- Exclude this constructor from OpenCV documentation
+    GAPI_WRAP
+    TensorRT() = default;
+
+    /** @brief Class constructor.
+
+    Constructs TensorRT parameters based on device type information.
+
+    @param dev_id Target device id to use.
+    */
+    GAPI_WRAP
+    explicit TensorRT(const int dev_id)
+        : device_id(dev_id) {
+    }
+
+    int device_id;
+};
+
+/**
+ * @brief This structure provides functions
+ * that fill inference options for ONNX OpenVINO Execution Provider.
+ * Please follow https://onnxruntime.ai/docs/execution-providers/OpenVINO-ExecutionProvider.html#summary-of-options
+ */
+struct GAPI_EXPORTS_W_SIMPLE OpenVINO {
+    // NB: Used from python.
+    /// @private -- Exclude this constructor from OpenCV documentation
+    GAPI_WRAP
+    OpenVINO() = default;
+
+    /** @brief Class constructor.
+
+    Constructs OpenVINO parameters based on device type information.
+
+    @param dev_type Target device type to use. ("CPU", "GPU", "GPU.0" etc)
+    */
+    GAPI_WRAP
+    explicit OpenVINO(const std::string &dev_type)
+        : device_type(dev_type) {
+    }
+
+    /** @brief Class constructor.
+
+    Constructs OpenVINO parameters based on map of options passed.
+
+    * @param params A map of parameter names and their corresponding string values.
+    */
+    GAPI_WRAP
+    explicit OpenVINO(const std::map<std::string, std::string>& params)
+        : params_map(params) {
+    }
+
+    /** @brief Specifies OpenVINO Execution Provider cache dir.
+
+    This function is used to explicitly specify the path to save and load
+    the blobs enabling model caching feature.
+
+    @param dir Path to the directory what will be used as cache.
+    @return reference to this parameter structure.
+    */
+    GAPI_WRAP
+    OpenVINO& cfgCacheDir(const std::string &dir) {
+        if (!params_map.empty()) {
+            cv::util::throw_error(std::logic_error("ep::OpenVINO cannot be changed if"
+                                                   "created from the parameters map."));
+        }
+        cache_dir = dir;
+        return *this;
+    }
+
+    /** @brief Specifies OpenVINO Execution Provider number of threads.
+
+    This function is used to override the accelerator default value
+    of number of threads with this value at runtime.
+
+    @param nthreads Number of threads.
+    @return reference to this parameter structure.
+    */
+    GAPI_WRAP
+    OpenVINO& cfgNumThreads(size_t nthreads) {
+        if (!params_map.empty()) {
+            cv::util::throw_error(std::logic_error("ep::OpenVINO cannot be changed if"
+                                                   "created from the parameters map."));
+        }
+        num_of_threads = nthreads;
+        return *this;
+    }
+
+    /** @brief Enables OpenVINO Execution Provider opencl throttling.
+
+    This function is used to enable OpenCL queue throttling for GPU devices
+    (reduces CPU utilization when using GPU).
+
+    @return reference to this parameter structure.
+    */
+    GAPI_WRAP
+    OpenVINO& cfgEnableOpenCLThrottling() {
+        if (!params_map.empty()) {
+            cv::util::throw_error(std::logic_error("ep::OpenVINO cannot be changed if"
+                                                   "created from the parameters map."));
+        }
+        enable_opencl_throttling = true;
+        return *this;
+    }
+
+    /** @brief Enables OpenVINO Execution Provider dynamic shapes.
+
+    This function is used to enable OpenCL queue throttling for GPU devices
+    (reduces CPU utilization when using GPU).
+    This function is used to enable work with dynamic shaped models
+    whose shape will be set dynamically based on the infer input
+    image/data shape at run time in CPU.
+
+    @return reference to this parameter structure.
+    */
+    GAPI_WRAP
+    OpenVINO& cfgEnableDynamicShapes() {
+        if (!params_map.empty()) {
+            cv::util::throw_error(std::logic_error("ep::OpenVINO cannot be changed if"
+                                                   "created from the parameters map."));
+        }
+        enable_dynamic_shapes = true;
+        return *this;
+    }
+
+    std::string device_type;
+    std::string cache_dir;
+    size_t num_of_threads = 0;
+    bool enable_opencl_throttling = false;
+    bool enable_dynamic_shapes = false;
+    std::map<std::string, std::string> params_map;
+};
+
+/**
+ * @brief This structure provides functions
+ * that fill inference options for ONNX DirectML Execution Provider.
+ * Please follow https://onnxruntime.ai/docs/execution-providers/DirectML-ExecutionProvider.html#directml-execution-provider
+ */
+class GAPI_EXPORTS_W_SIMPLE DirectML {
+public:
+    // NB: Used from python.
+    /// @private -- Exclude this constructor from OpenCV documentation
+    GAPI_WRAP
+    DirectML() = default;
+
+    /** @brief Class constructor.
+
+    Constructs DirectML parameters based on device id.
+
+    @param device_id Target device id to use. ("0", "1", etc)
+    */
+    GAPI_WRAP
+    explicit DirectML(const int device_id) : ddesc(device_id) { };
+
+    /** @brief Class constructor.
+
+    Constructs DirectML parameters based on adapter name.
+
+    @param adapter_name Target adapter_name to use.
+    */
+    GAPI_WRAP
+    explicit DirectML(const std::string &adapter_name) : ddesc(adapter_name) { };
+
+    using DeviceDesc = cv::util::variant<int, std::string>;
+    DeviceDesc ddesc;
+};
+
+using EP = cv::util::variant< cv::util::monostate
+                            , OpenVINO
+                            , DirectML
+                            , CoreML
+                            , CUDA
+                            , TensorRT>;
+
+} // namespace ep
+
+GAPI_EXPORTS cv::gapi::GBackend backend();
+
+enum class TraitAs: int {
+    TENSOR, //!< G-API traits an associated cv::Mat as a raw tensor
+            // and passes dimensions as-is
+    IMAGE   //!< G-API traits an associated cv::Mat as an image so
+            // creates an "image" blob (NCHW/NHWC, etc)
+};
+
+using PostProc = std::function<void(const std::unordered_map<std::string, cv::Mat> &,
+                                          std::unordered_map<std::string, cv::Mat> &)>;
+
+namespace detail {
+/**
+* @brief This structure contains description of inference parameters
+* which is specific to ONNX models.
+*/
+struct ParamDesc {
+    std::string model_path; //!< Path to model.
+
+    // NB: nun_* may differ from topology's real input/output port numbers
+    // (e.g. topology's partial execution)
+    std::size_t num_in;  //!< How many inputs are defined in the operation
+    std::size_t num_out; //!< How many outputs are defined in the operation
+
+    // NB: Here order follows the `Net` API
+    std::vector<std::string> input_names; //!< Names of input network layers.
+    std::vector<std::string> output_names; //!< Names of output network layers.
+
+    using ConstInput = std::pair<cv::Mat, TraitAs>;
+    std::unordered_map<std::string, ConstInput> const_inputs; //!< Map with pair of name of network layer and ConstInput which will be associated with this.
+
+    std::vector<cv::Scalar> mean; //!< Mean values for preprocessing.
+    std::vector<cv::Scalar> stdev; //!< Standard deviation values for preprocessing.
+
+    std::vector<cv::GMatDesc> out_metas; //!< Out meta information about your output (type, dimension).
+    PostProc custom_post_proc; //!< Post processing function.
+
+    std::vector<bool> normalize; //!< Vector of bool values that enabled or disabled normalize of input data.
+
+    std::vector<std::string> names_to_remap; //!< Names of output layers that will be processed in PostProc function.
+
+    bool is_generic;
+
+    // TODO: Needs to modify the rest of ParamDesc accordingly to support
+    // both generic and non-generic options without duplication
+    // (as it was done for the OV IE backend)
+    // These values are pushed into the respective vector<> fields above
+    // when the generic infer parameters are unpacked (see GONNXBackendImpl::unpackKernel)
+    std::unordered_map<std::string, std::pair<cv::Scalar, cv::Scalar> > generic_mstd;
+    std::unordered_map<std::string, bool> generic_norm;
+
+    std::map<std::string, std::string> session_options;
+    std::vector<cv::gapi::onnx::ep::EP> execution_providers;
+    bool disable_mem_pattern;
+    cv::util::optional<int> opt_level;
+};
+} // namespace detail
+
+template<typename Net>
+struct PortCfg {
+    using In = std::array
+        < std::string
+        , std::tuple_size<typename Net::InArgs>::value >;
+    using Out = std::array
+        < std::string
+        , std::tuple_size<typename Net::OutArgs>::value >;
+    using NormCoefs = std::array
+        < cv::Scalar
+        , std::tuple_size<typename Net::InArgs>::value >;
+    using Normalize = std::array
+        < bool
+        , std::tuple_size<typename Net::InArgs>::value >;
+};
+
+/**
+ * Contains description of inference parameters and kit of functions that
+ * fill this parameters.
+ */
+template<typename Net> class Params {
+public:
+    /** @brief Class constructor.
+
+    Constructs Params based on model information and sets default values for other
+    inference description parameters.
+
+    @param model Path to model (.onnx file).
+    */
+    Params(const std::string &model) {
+        desc.model_path = model;
+        desc.num_in  = std::tuple_size<typename Net::InArgs>::value;
+        desc.num_out = std::tuple_size<typename Net::OutArgs>::value;
+        desc.is_generic = false;
+        desc.disable_mem_pattern = false;
+    }
+
+    /** @brief Specifies sequence of network input layers names for inference.
+
+    The function is used to associate data of graph inputs with input layers of
+    network topology. Number of names has to match the number of network inputs. If a network
+    has only one input layer, there is no need to call it as the layer is
+    associated with input automatically but this doesn't prevent you from
+    doing it yourself. Count of names has to match to number of network inputs.
+
+    @param layer_names std::array<std::string, N> where N is the number of inputs
+    as defined in the @ref G_API_NET. Contains names of input layers.
+    @return the reference on modified object.
+    */
+    Params<Net>& cfgInputLayers(const typename PortCfg<Net>::In &layer_names) {
+        desc.input_names.assign(layer_names.begin(), layer_names.end());
+        return *this;
+    }
+
+    /** @brief Specifies sequence of output layers names for inference.
+
+     The function is used to associate data of graph outputs with output layers of
+    network topology. If a network has only one output layer, there is no need to call it
+    as the layer is associated with output automatically but this doesn't prevent
+    you from doing it yourself. Count of names has to match to number of network
+    outputs or you can set your own output but for this case you have to
+    additionally use @ref cfgPostProc function.
+
+    @param layer_names std::array<std::string, N> where N is the number of outputs
+    as defined in the @ref G_API_NET. Contains names of output layers.
+    @return the reference on modified object.
+    */
+    Params<Net>& cfgOutputLayers(const typename PortCfg<Net>::Out &layer_names) {
+        desc.output_names.assign(layer_names.begin(), layer_names.end());
+        return *this;
+    }
+
+    /** @brief Sets a constant input.
+
+    The function is used to set constant input. This input has to be
+    a prepared tensor since preprocessing is disabled for this case. You should
+    provide name of network layer which will receive provided data.
+
+    @param layer_name Name of network layer.
+    @param data cv::Mat that contains data which will be associated with network layer.
+    @param hint Type of input (TENSOR).
+    @return the reference on modified object.
+    */
+    Params<Net>& constInput(const std::string &layer_name,
+                            const cv::Mat &data,
+                            TraitAs hint = TraitAs::TENSOR) {
+        desc.const_inputs[layer_name] = {data, hint};
+        return *this;
+    }
+
+    /** @brief Specifies mean value and standard deviation for preprocessing.
+
+    The function is used to set mean value and standard deviation for preprocessing
+    of input data.
+
+    @param m std::array<cv::Scalar, N> where N is the number of inputs
+    as defined in the @ref G_API_NET. Contains mean values.
+    @param s std::array<cv::Scalar, N> where N is the number of inputs
+    as defined in the @ref G_API_NET. Contains standard deviation values.
+    @return the reference on modified object.
+    */
+    Params<Net>& cfgMeanStd(const typename PortCfg<Net>::NormCoefs &m,
+                            const typename PortCfg<Net>::NormCoefs &s) {
+        desc.mean.assign(m.begin(), m.end());
+        desc.stdev.assign(s.begin(), s.end());
+        return *this;
+    }
+
+    /** @brief Configures graph output and provides the post processing function from user.
+
+    The function is used when you work with networks with dynamic outputs.
+    Since we can't know dimensions of inference result needs provide them for
+    construction of graph output. This dimensions can differ from inference result.
+    So you have to provide @ref PostProc function that gets information from inference
+    result and fill output which is constructed by dimensions from out_metas.
+
+    @param out_metas Out meta information about your output (type, dimension).
+    @param remap_function Post processing function, which has two parameters. First is onnx
+    result, second is graph output. Both parameters is std::map that contain pair of
+    layer's name and cv::Mat.
+    @return the reference on modified object.
+    */
+    Params<Net>& cfgPostProc(const std::vector<cv::GMatDesc> &out_metas,
+                             const PostProc &remap_function) {
+        desc.out_metas        = out_metas;
+        desc.custom_post_proc = remap_function;
+        return *this;
+    }
+
+    /** @overload
+    Function with a rvalue parameters.
+
+    @param out_metas rvalue out meta information about your output (type, dimension).
+    @param remap_function rvalue post processing function, which has two parameters. First is onnx
+    result, second is graph output. Both parameters is std::map that contain pair of
+    layer's name and cv::Mat.
+    @return the reference on modified object.
+    */
+    Params<Net>& cfgPostProc(std::vector<cv::GMatDesc> &&out_metas,
+                             PostProc &&remap_function) {
+        desc.out_metas        = std::move(out_metas);
+        desc.custom_post_proc = std::move(remap_function);
+        return *this;
+    }
+
+    /** @overload
+    The function has additional parameter names_to_remap. This parameter provides
+    information about output layers which will be used for inference and post
+    processing function.
+
+    @param out_metas Out meta information.
+    @param remap_function Post processing function.
+    @param names_to_remap Names of output layers. network's inference will
+    be done on these layers. Inference's result will be processed in post processing
+    function using these names.
+    @return the reference on modified object.
+    */
+    Params<Net>& cfgPostProc(const std::vector<cv::GMatDesc> &out_metas,
+                             const PostProc &remap_function,
+                             const std::vector<std::string> &names_to_remap) {
+        desc.out_metas        = out_metas;
+        desc.custom_post_proc = remap_function;
+        desc.names_to_remap   = names_to_remap;
+        return *this;
+    }
+
+    /** @overload
+    Function with a rvalue parameters and additional parameter names_to_remap.
+
+    @param out_metas rvalue out meta information.
+    @param remap_function rvalue post processing function.
+    @param names_to_remap rvalue names of output layers. network's inference will
+    be done on these layers. Inference's result will be processed in post processing
+    function using these names.
+    @return the reference on modified object.
+    */
+    Params<Net>& cfgPostProc(std::vector<cv::GMatDesc> &&out_metas,
+                             PostProc &&remap_function,
+                             std::vector<std::string> &&names_to_remap) {
+        desc.out_metas        = std::move(out_metas);
+        desc.custom_post_proc = std::move(remap_function);
+        desc.names_to_remap   = std::move(names_to_remap);
+        return *this;
+    }
+
+    /** @brief Specifies normalize parameter for preprocessing.
+
+    The function is used to set normalize parameter for preprocessing of input data.
+
+    @param normalizations std::array<cv::Scalar, N> where N is the number of inputs
+    as defined in the @ref G_API_NET. Сontains bool values that enabled or disabled
+    normalize of input data.
+    @return the reference on modified object.
+    */
+    Params<Net>& cfgNormalize(const typename PortCfg<Net>::Normalize &normalizations) {
+        desc.normalize.assign(normalizations.begin(), normalizations.end());
+        return *this;
+    }
+
+    /** @brief Adds execution provider for runtime.
+
+    The function is used to add ONNX Runtime OpenVINO Execution Provider options.
+
+    @param ep OpenVINO Execution Provider options.
+    @see cv::gapi::onnx::ep::OpenVINO.
+
+    @return the reference on modified object.
+    */
+    Params<Net>& cfgAddExecutionProvider(ep::OpenVINO&& ep) {
+        desc.execution_providers.emplace_back(std::move(ep));
+        return *this;
+    }
+
+    /** @brief Adds execution provider for runtime.
+
+    The function is used to add ONNX Runtime DirectML Execution Provider options.
+
+    @param ep DirectML Execution Provider options.
+    @see cv::gapi::onnx::ep::DirectML.
+
+    @return the reference on modified object.
+    */
+    Params<Net>& cfgAddExecutionProvider(ep::DirectML&& ep) {
+        desc.execution_providers.emplace_back(std::move(ep));
+        return *this;
+    }
+
+    /** @brief Adds execution provider for runtime.
+
+    The function is used to add ONNX Runtime CoreML Execution Provider options.
+
+    @param ep CoreML Execution Provider options.
+    @see cv::gapi::onnx::ep::CoreML.
+
+    @return the reference on modified object.
+    */
+    Params<Net>& cfgAddExecutionProvider(ep::CoreML&& ep) {
+        desc.execution_providers.emplace_back(std::move(ep));
+        return *this;
+    }
+
+    /** @brief Adds execution provider for runtime.
+
+    The function is used to add ONNX Runtime CUDA Execution Provider options.
+
+    @param ep CUDA Execution Provider options.
+    @see cv::gapi::onnx::ep::CUDA.
+
+    @return the reference on modified object.
+    */
+    Params<Net>& cfgAddExecutionProvider(ep::CUDA&& ep) {
+        desc.execution_providers.emplace_back(std::move(ep));
+        return *this;
+    }
+
+    /** @brief Adds execution provider for runtime.
+
+    The function is used to add ONNX Runtime TensorRT Execution Provider options.
+
+    @param ep TensorRT Execution Provider options.
+    @see cv::gapi::onnx::ep::TensorRT.
+
+    @return the reference on modified object.
+    */
+    Params<Net>& cfgAddExecutionProvider(ep::TensorRT&& ep) {
+        desc.execution_providers.emplace_back(std::move(ep));
+        return *this;
+    }
+
+    /** @brief Disables the memory pattern optimization.
+
+    @return the reference on modified object.
+    */
+    Params<Net>& cfgDisableMemPattern() {
+        desc.disable_mem_pattern = true;
+        return *this;
+    }
+
+    /** @brief Configures session options for ONNX Runtime.
+
+    This function is used to set various session options for the ONNX Runtime
+    session by accepting a map of key-value pairs.
+
+    @param options A map of session option to be applied to the ONNX Runtime session.
+    @return the reference on modified object.
+    */
+    Params<Net>& cfgSessionOptions(const std::map<std::string, std::string>& options) {
+        desc.session_options.insert(options.begin(), options.end());
+        return *this;
+    }
+
+    /** @brief Configures optimization level for ONNX Runtime.
+
+    @param opt_level [optimization level]: Valid values are 0 (disable), 1 (basic), 2 (extended), 99 (all).
+    Please see onnxruntime_c_api.h (enum GraphOptimizationLevel) for the full list of all optimization levels.
+    @return the reference on modified object.
+    */
+    Params<Net>& cfgOptLevel(const int opt_level) {
+        desc.opt_level = cv::util::make_optional(opt_level);
+        return *this;
+    }
+
+    // BEGIN(G-API's network parametrization API)
+    GBackend      backend() const { return cv::gapi::onnx::backend(); }
+    std::string   tag()     const { return Net::tag(); }
+    cv::util::any params()  const { return { desc }; }
+    // END(G-API's network parametrization API)
+
+protected:
+    detail::ParamDesc desc;
+};
+
+/*
+* @brief This structure provides functions for generic network type that
+* fill inference parameters.
+* @see struct Generic
+*/
+template<>
+class Params<cv::gapi::Generic> {
+public:
+    /** @brief Class constructor.
+
+    Constructs Params based on input information and sets default values for other
+    inference description parameters.
+
+    @param tag string tag of the network for which these parameters are intended.
+    @param model_path path to model file (.onnx file).
+    */
+    Params(const std::string& tag, const std::string& model_path)
+        : desc{ model_path, 0u, 0u, {}, {}, {}, {}, {}, {}, {}, {}, {}, true, {}, {}, {}, {}, false, {} }, m_tag(tag) {}
+
+    /** @see onnx::Params::cfgMeanStdDev. */
+    void cfgMeanStdDev(const std::string &layer,
+                       const cv::Scalar &m,
+                       const cv::Scalar &s) {
+        desc.generic_mstd[layer] = std::make_pair(m, s);
+    }
+
+    /** @see onnx::Params::cfgNormalize. */
+    void cfgNormalize(const std::string &layer, bool flag) {
+        desc.generic_norm[layer] = flag;
+    }
+
+    /** @see onnx::Params::cfgAddExecutionProvider. */
+    void cfgAddExecutionProvider(ep::OpenVINO&& ep) {
+        desc.execution_providers.emplace_back(std::move(ep));
+    }
+
+    /** @see onnx::Params::cfgAddExecutionProvider. */
+    void cfgAddExecutionProvider(ep::DirectML&& ep) {
+        desc.execution_providers.emplace_back(std::move(ep));
+    }
+
+    /** @see onnx::Params::cfgAddExecutionProvider. */
+    void cfgAddExecutionProvider(ep::CoreML&& ep) {
+        desc.execution_providers.emplace_back(std::move(ep));
+    }
+
+    /** @see onnx::Params::cfgAddExecutionProvider. */
+    void cfgAddExecutionProvider(ep::CUDA&& ep) {
+        desc.execution_providers.emplace_back(std::move(ep));
+    }
+
+    /** @see onnx::Params::cfgAddExecutionProvider. */
+    void cfgAddExecutionProvider(ep::TensorRT&& ep) {
+        desc.execution_providers.emplace_back(std::move(ep));
+    }
+
+    /** @see onnx::Params::cfgDisableMemPattern. */
+    void cfgDisableMemPattern() {
+        desc.disable_mem_pattern = true;
+    }
+
+    /** @see onnx::Params::cfgSessionOptions. */
+    void cfgSessionOptions(const std::map<std::string, std::string>& options) {
+        desc.session_options.insert(options.begin(), options.end());
+    }
+
+/** @see onnx::Params::cfgOptLevel. */
+    void cfgOptLevel(const int opt_level) {
+        desc.opt_level = cv::util::make_optional(opt_level);
+    }
+
+    // BEGIN(G-API's network parametrization API)
+    GBackend      backend() const { return cv::gapi::onnx::backend(); }
+    std::string   tag()     const { return m_tag; }
+    cv::util::any params()  const { return { desc }; }
+    // END(G-API's network parametrization API)
+protected:
+    detail::ParamDesc desc;
+    std::string m_tag;
+};
+
+} // namespace onnx
+} // namespace gapi
+} // namespace cv
+
+#endif // OPENCV_GAPI_INFER_HPP
diff --git a/3rdParty/opencv-4.12.0/opencv2/gapi/infer/ov.hpp b/3rdParty/opencv-4.12.0/opencv2/gapi/infer/ov.hpp
new file mode 100644
index 0000000000..9a3fc5659d
--- /dev/null
+++ b/3rdParty/opencv-4.12.0/opencv2/gapi/infer/ov.hpp
@@ -0,0 +1,709 @@
+// This file is part of OpenCV project.
+// It is subject to the license terms in the LICENSE file found in the top-level directory
+// of this distribution and at http://opencv.org/license.html.
+//
+// Copyright (C) 2023 Intel Corporation
+
+#ifndef OPENCV_GAPI_INFER_OV_HPP
+#define OPENCV_GAPI_INFER_OV_HPP
+
+#include <string>
+
+#include <opencv2/gapi/util/any.hpp>
+#include <opencv2/gapi/own/exports.hpp> // GAPI_EXPORTS
+#include <opencv2/gapi/gkernel.hpp>     // GKernelType[M], GBackend
+#include <opencv2/gapi/infer.hpp>       // Generic
+
+#include <map>
+
+namespace cv {
+namespace gapi {
+
+/**
+ * @brief This namespace contains G-API OpenVINO 2.0 backend functions,
+ * structures, and symbols.
+ */
+namespace ov {
+
+GAPI_EXPORTS cv::gapi::GBackend backend();
+
+namespace detail {
+
+template <typename T>
+using AttrMap = std::map<std::string, T>;
+// NB: This type is supposed to be used to hold in/out layers
+// attributes such as precision, layout, shape etc.
+//
+// User can provide attributes either:
+// 1. cv::util::monostate - No value specified explicitly.
+// 2. Attr - value specified explicitly that should be broadcasted to all layers.
+// 3. AttrMap[str->T] - map specifies value for particular layer.
+template <typename Attr>
+using LayerVariantAttr = cv::util::variant< cv::util::monostate
+                                          , AttrMap<Attr>
+                                          , Attr>;
+
+struct ParamDesc {
+    struct Model {
+
+        Model(const std::string &model_path_,
+              const std::string &bin_path_)
+            : model_path(model_path_), bin_path(bin_path_) {
+        }
+
+        std::string model_path;
+        std::string bin_path;
+
+        LayerVariantAttr<std::string> input_tensor_layout;
+        LayerVariantAttr<std::string> input_model_layout;
+        LayerVariantAttr<std::string> output_tensor_layout;
+        LayerVariantAttr<std::string> output_model_layout;
+        LayerVariantAttr<int>         output_tensor_precision;
+
+        LayerVariantAttr<std::vector<size_t>> new_shapes;
+
+        LayerVariantAttr<std::vector<float>> mean_values;
+        LayerVariantAttr<std::vector<float>> scale_values;
+
+        LayerVariantAttr<int> interpolation;
+    };
+
+    struct CompiledModel {
+        std::string blob_path;
+    };
+
+    using Kind = cv::util::variant<Model, CompiledModel>;
+
+    ParamDesc(Kind              &&kind_,
+              const std::string &device_,
+              const bool        is_generic_,
+              const size_t      num_in_,
+              const size_t      num_out_)
+        : kind(std::move(kind_)), device(device_),
+          is_generic(is_generic_),
+          num_in(num_in_), num_out(num_out_) {
+    }
+
+    Kind kind;
+
+    std::string device;
+    bool is_generic;
+
+    std::size_t num_in;
+    std::size_t num_out;
+
+    std::vector<std::string> input_names;
+    std::vector<std::string> output_names;
+
+    using PluginConfigT = std::map<std::string, std::string>;
+    PluginConfigT config;
+
+    size_t nireq = 1;
+};
+
+// NB: Just helper to avoid code duplication.
+static detail::ParamDesc::Model&
+getModelToSetAttrOrThrow(detail::ParamDesc::Kind  &kind,
+                         const std::string        &attr_name) {
+    if (cv::util::holds_alternative<detail::ParamDesc::CompiledModel>(kind)) {
+        cv::util::throw_error(
+                std::logic_error("Specifying " + attr_name + " isn't"
+                                 " possible for compiled model."));
+    }
+    GAPI_Assert(cv::util::holds_alternative<detail::ParamDesc::Model>(kind));
+    return cv::util::get<detail::ParamDesc::Model>(kind);
+}
+
+} // namespace detail
+
+/**
+ * @brief This structure provides functions
+ * that fill inference parameters for "OpenVINO Toolkit" model.
+ */
+template<typename Net> struct Params {
+public:
+    /** @brief Class constructor.
+
+    Constructs Params based on model information and specifies default values for other
+    inference description parameters. Model is loaded and compiled using "OpenVINO Toolkit".
+
+    @param model_path Path to a model.
+    @param bin_path Path to a data file.
+    For IR format (*.bin):
+    If path is empty, will try to read a bin file with the same name as xml.
+    If the bin file with the same name is not found, will load IR without weights.
+    For PDPD (*.pdmodel) and ONNX (*.onnx) formats bin_path isn't used.
+    @param device target device to use.
+    */
+    Params(const std::string &model_path,
+           const std::string &bin_path,
+           const std::string &device)
+        : m_desc( detail::ParamDesc::Kind{detail::ParamDesc::Model{model_path, bin_path}}
+                 , device
+                 , false /* is generic */
+                 , std::tuple_size<typename Net::InArgs>::value
+                 , std::tuple_size<typename Net::OutArgs>::value) {
+    }
+
+    /** @overload
+    Use this constructor to work with pre-compiled network.
+    Model is imported from a pre-compiled blob.
+
+    @param blob_path path to the compiled model (*.blob).
+    @param device target device to use.
+    */
+    Params(const std::string &blob_path,
+           const std::string &device)
+        : m_desc( detail::ParamDesc::Kind{detail::ParamDesc::CompiledModel{blob_path}}
+                 , device
+                 , false /* is generic */
+                 , std::tuple_size<typename Net::InArgs>::value
+                 , std::tuple_size<typename Net::OutArgs>::value) {
+    }
+
+    /** @brief Specifies sequence of network input layers names for inference.
+
+    The function is used to associate cv::gapi::infer<> inputs with the model inputs.
+    Number of names has to match the number of network inputs as defined in G_API_NET().
+    In case a network has only single input layer, there is no need to specify name manually.
+
+    @param layer_names std::array<std::string, N> where N is the number of inputs
+    as defined in the @ref G_API_NET. Contains names of input layers.
+    @return reference to this parameter structure.
+    */
+    Params<Net>& cfgInputLayers(const std::vector<std::string> &layer_names) {
+        m_desc.input_names = layer_names;
+        return *this;
+    }
+
+    /** @brief Specifies sequence of network output layers names for inference.
+
+    The function is used to associate cv::gapi::infer<> outputs with the model outputs.
+    Number of names has to match the number of network outputs as defined in G_API_NET().
+    In case a network has only single output layer, there is no need to specify name manually.
+
+    @param layer_names std::array<std::string, N> where N is the number of outputs
+    as defined in the @ref G_API_NET. Contains names of output layers.
+    @return reference to this parameter structure.
+    */
+    Params<Net>& cfgOutputLayers(const std::vector<std::string> &layer_names) {
+        m_desc.output_names = layer_names;
+        return *this;
+    }
+
+    /** @brief Specifies OpenVINO plugin configuration.
+
+    The function is used to set configuration for OpenVINO plugin. Some parameters
+    can be different for each plugin. Please follow https://docs.openvinotoolkit.org/latest/index.html
+    to check information about specific plugin.
+
+    @param config Map of pairs: (config parameter name, config parameter value).
+    @return reference to this parameter structure.
+    */
+    Params<Net>& cfgPluginConfig(const detail::ParamDesc::PluginConfigT &config) {
+        m_desc.config = config;
+        return *this;
+    }
+
+    /** @brief Specifies tensor layout for an input layer.
+
+    The function is used to set tensor layout for an input layer.
+
+    @param layout Tensor layout ("NCHW", "NWHC", etc)
+    will be applied to all input layers.
+    @return reference to this parameter structure.
+    */
+    Params<Net>& cfgInputTensorLayout(std::string layout) {
+        detail::getModelToSetAttrOrThrow(m_desc.kind, "input tensor layout")
+            .input_tensor_layout = std::move(layout);
+        return *this;
+    }
+
+    /** @overload
+    @param layout_map Map of pairs: name of corresponding input layer
+    and its tensor layout represented in std::string ("NCHW", "NHWC", etc)
+    @return reference to this parameter structure.
+    */
+    Params<Net>&
+    cfgInputTensorLayout(detail::AttrMap<std::string> layout_map) {
+        detail::getModelToSetAttrOrThrow(m_desc.kind, "input tensor layout")
+            .input_tensor_layout = std::move(layout_map);
+        return *this;
+    }
+
+    /** @brief Specifies model layout for an input layer.
+
+    The function is used to set model layout for an input layer.
+
+    @param layout Model layout ("NCHW", "NHWC", etc)
+    will be applied to all input layers.
+    @return reference to this parameter structure.
+    */
+    Params<Net>& cfgInputModelLayout(std::string layout) {
+        detail::getModelToSetAttrOrThrow(m_desc.kind, "input model layout")
+            .input_model_layout = std::move(layout);
+        return *this;
+    }
+
+    /** @overload
+    @param layout_map Map of pairs: name of corresponding input layer
+    and its model layout ("NCHW", "NHWC", etc)
+    @return reference to this parameter structure.
+    */
+    Params<Net>&
+    cfgInputModelLayout(detail::AttrMap<std::string> layout_map) {
+        detail::getModelToSetAttrOrThrow(m_desc.kind, "input model layout")
+            .input_model_layout = std::move(layout_map);
+        return *this;
+    }
+
+    /** @brief Specifies tensor layout for an output layer.
+
+    The function is used to set tensor layout for an output layer.
+
+    @param layout Tensor layout ("NCHW", "NWHC", etc)
+    will be applied to all output layers.
+    @return reference to this parameter structure.
+    */
+    Params<Net>& cfgOutputTensorLayout(std::string layout) {
+        detail::getModelToSetAttrOrThrow(m_desc.kind, "output tensor layout")
+            .output_tensor_layout = std::move(layout);
+        return *this;
+    }
+
+    /** @overload
+    @param layout_map Map of pairs: name of corresponding output layer
+    and its tensor layout represented in std::string ("NCHW", "NHWC", etc)
+    @return reference to this parameter structure.
+    */
+    Params<Net>&
+    cfgOutputTensorLayout(detail::AttrMap<std::string> layout_map) {
+        detail::getModelToSetAttrOrThrow(m_desc.kind, "output tensor layout")
+            .output_tensor_layout = std::move(layout_map);
+        return *this;
+    }
+
+    /** @brief Specifies model layout for an output layer.
+
+    The function is used to set model layout for an output layer.
+
+    @param layout Model layout ("NCHW", "NHWC", etc)
+    will be applied to all output layers.
+    @return reference to this parameter structure.
+    */
+    Params<Net>& cfgOutputModelLayout(std::string layout) {
+        detail::getModelToSetAttrOrThrow(m_desc.kind, "output model layout")
+            .output_model_layout = std::move(layout);
+        return *this;
+    }
+
+    /** @overload
+    @param layout_map Map of pairs: name of corresponding output layer
+    and its model layout ("NCHW", "NHWC", etc)
+    @return reference to this parameter structure.
+    */
+    Params<Net>&
+    cfgOutputModelLayout(detail::AttrMap<std::string> layout_map) {
+        detail::getModelToSetAttrOrThrow(m_desc.kind, "output model layout")
+            .output_model_layout = std::move(layout_map);
+        return *this;
+    }
+
+    /** @brief Specifies tensor precision for an output layer.
+
+    The function is used to set tensor precision for an output layer..
+
+    @param precision Precision in OpenCV format (CV_8U, CV_32F, ...)
+    will be applied to all output layers.
+    @return reference to this parameter structure.
+    */
+    Params<Net>& cfgOutputTensorPrecision(int precision) {
+        detail::getModelToSetAttrOrThrow(m_desc.kind, "output tensor precision")
+            .output_tensor_precision = precision;
+        return *this;
+    }
+
+    /** @overload
+
+    @param precision_map Map of pairs: name of corresponding output layer
+    and its precision in OpenCV format (CV_8U, CV_32F, ...)
+    @return reference to this parameter structure.
+    */
+    Params<Net>&
+    cfgOutputTensorPrecision(detail::AttrMap<int> precision_map) {
+        detail::getModelToSetAttrOrThrow(m_desc.kind, "output tensor precision")
+            .output_tensor_precision = std::move(precision_map);
+        return *this;
+    }
+
+    /** @brief Specifies the new shape for input layers.
+
+    The function is used to set new shape for input layers.
+
+    @param new_shape New shape will be applied to all input layers.
+    @return reference to this parameter structure.
+    */
+    Params<Net>&
+    cfgReshape(std::vector<size_t> new_shape) {
+        detail::getModelToSetAttrOrThrow(m_desc.kind, "reshape")
+            .new_shapes = std::move(new_shape);
+        return *this;
+    }
+
+    /** @overload
+
+    @param new_shape_map Map of pairs: name of corresponding output layer
+    and its new shape.
+    @return reference to this parameter structure.
+    */
+    Params<Net>&
+    cfgReshape(detail::AttrMap<std::vector<size_t>> new_shape_map) {
+        detail::getModelToSetAttrOrThrow(m_desc.kind, "reshape")
+            .new_shapes = std::move(new_shape_map);
+        return *this;
+    }
+
+    /** @brief Specifies number of asynchronous inference requests.
+
+    @param nireq Number of inference asynchronous requests.
+    @return reference to this parameter structure.
+    */
+    Params<Net>& cfgNumRequests(const size_t nireq) {
+        if (nireq == 0) {
+            cv::util::throw_error(
+                    std::logic_error("Number of inference requests"
+                                     " must be greater than zero."));
+        }
+        m_desc.nireq = nireq;
+        return *this;
+    }
+
+    /** @brief Specifies mean values for preprocessing.
+     *
+    The function is used to set mean values for input layer preprocessing.
+
+    @param mean_values Float vector contains mean values
+    @return reference to this parameter structure.
+    */
+    Params<Net>& cfgMean(std::vector<float> mean_values) {
+        detail::getModelToSetAttrOrThrow(m_desc.kind, "mean values")
+            .mean_values = std::move(mean_values);
+        return *this;
+    }
+
+    /** @overload
+
+    @param mean_map Map of pairs: name of corresponding input layer
+    and its mean values.
+    @return reference to this parameter structure.
+    */
+    Params<Net>& cfgMean(detail::AttrMap<std::vector<float>> mean_map) {
+        detail::getModelToSetAttrOrThrow(m_desc.kind, "mean values")
+            .mean_values = std::move(mean_map);
+        return *this;
+    }
+
+    /** @brief Specifies scale values for preprocessing.
+     *
+    The function is used to set scale values for input layer preprocessing.
+
+    @param scale_values Float vector contains scale values
+    @return reference to this parameter structure.
+    */
+    Params<Net>& cfgScale(std::vector<float> scale_values) {
+        detail::getModelToSetAttrOrThrow(m_desc.kind, "scale values")
+            .scale_values = std::move(scale_values);
+        return *this;
+    }
+
+    /** @overload
+
+    @param scale_map Map of pairs: name of corresponding input layer
+    and its mean values.
+    @return reference to this parameter structure.
+    */
+    Params<Net>& cfgScale(detail::AttrMap<std::vector<float>> scale_map) {
+        detail::getModelToSetAttrOrThrow(m_desc.kind, "scale values")
+            .scale_values = std::move(scale_map);
+        return *this;
+    }
+
+    /** @brief Specifies resize interpolation algorithm.
+     *
+    The function is used to configure resize preprocessing for input layer.
+
+    @param interpolation Resize interpolation algorithm.
+    Supported algorithms: #INTER_NEAREST, #INTER_LINEAR, #INTER_CUBIC.
+    @return reference to this parameter structure.
+    */
+    Params<Net>& cfgResize(int interpolation) {
+        detail::getModelToSetAttrOrThrow(m_desc.kind, "resize preprocessing")
+            .interpolation = std::move(interpolation);
+        return *this;
+    }
+
+    /** @overload
+
+    @param interpolation Map of pairs: name of corresponding input layer
+    and its resize algorithm.
+    @return reference to this parameter structure.
+    */
+    Params<Net>& cfgResize(detail::AttrMap<int> interpolation) {
+        detail::getModelToSetAttrOrThrow(m_desc.kind, "resize preprocessing")
+            .interpolation = std::move(interpolation);
+        return *this;
+    }
+
+    // BEGIN(G-API's network parametrization API)
+    GBackend      backend() const { return cv::gapi::ov::backend(); }
+    std::string   tag()     const { return Net::tag(); }
+    cv::util::any params()  const { return { m_desc }; }
+    // END(G-API's network parametrization API)
+
+protected:
+    detail::ParamDesc m_desc;
+};
+
+/*
+* @brief This structure provides functions for generic network type that
+* fill inference parameters.
+* @see struct Generic
+*/
+template<>
+class Params<cv::gapi::Generic> {
+public:
+    /** @brief Class constructor.
+
+    Constructs Params based on model information and specifies default values for other
+    inference description parameters. Model is loaded and compiled using "OpenVINO Toolkit".
+
+    @param tag string tag of the network for which these parameters are intended.
+    @param model_path Path to a model.
+    @param bin_path Path to a data file.
+    For IR format (*.bin):
+    If path is empty, will try to read a bin file with the same name as xml.
+    If the bin file with the same name is not found, will load IR without weights.
+    For PDPD (*.pdmodel) and ONNX (*.onnx) formats bin_path isn't used.
+    @param device target device to use.
+    */
+    Params(const std::string &tag,
+           const std::string &model_path,
+           const std::string &bin_path,
+           const std::string &device)
+        : m_tag(tag),
+          m_desc( detail::ParamDesc::Kind{detail::ParamDesc::Model{model_path, bin_path}}
+                , device
+                , true /* is generic */
+                , 0u
+                , 0u) {
+    }
+
+    /** @overload
+
+    This constructor for pre-compiled networks. Model is imported from pre-compiled
+    blob.
+
+    @param tag string tag of the network for which these parameters are intended.
+    @param blob_path path to the compiled model (*.blob).
+    @param device target device to use.
+    */
+    Params(const std::string &tag,
+           const std::string &blob_path,
+           const std::string &device)
+        : m_tag(tag),
+          m_desc( detail::ParamDesc::Kind{detail::ParamDesc::CompiledModel{blob_path}}
+                , device
+                , true /* is generic */
+                , 0u
+                , 0u) {
+    }
+
+    /** @see ov::Params::cfgPluginConfig. */
+    Params& cfgPluginConfig(const detail::ParamDesc::PluginConfigT &config) {
+        m_desc.config = config;
+        return *this;
+    }
+
+    /** @see ov::Params::cfgInputTensorLayout. */
+    Params& cfgInputTensorLayout(std::string layout) {
+        detail::getModelToSetAttrOrThrow(m_desc.kind, "input tensor layout")
+            .input_tensor_layout = std::move(layout);
+        return *this;
+    }
+
+    /** @overload */
+    Params&
+    cfgInputTensorLayout(detail::AttrMap<std::string> layout_map) {
+        detail::getModelToSetAttrOrThrow(m_desc.kind, "input tensor layout")
+            .input_tensor_layout = std::move(layout_map);
+        return *this;
+    }
+
+    /** @see ov::Params::cfgInputModelLayout. */
+    Params& cfgInputModelLayout(std::string layout) {
+        detail::getModelToSetAttrOrThrow(m_desc.kind, "input model layout")
+            .input_model_layout = std::move(layout);
+        return *this;
+    }
+
+    /** @overload */
+    Params&
+    cfgInputModelLayout(detail::AttrMap<std::string> layout_map) {
+        detail::getModelToSetAttrOrThrow(m_desc.kind, "input model layout")
+            .input_model_layout = std::move(layout_map);
+        return *this;
+    }
+
+    /** @see ov::Params::cfgOutputTensorLayout. */
+    Params& cfgOutputTensorLayout(std::string layout) {
+        detail::getModelToSetAttrOrThrow(m_desc.kind, "output tensor layout")
+            .output_tensor_layout = std::move(layout);
+        return *this;
+    }
+
+    /** @overload */
+    Params&
+    cfgOutputTensorLayout(detail::AttrMap<std::string> layout_map) {
+        detail::getModelToSetAttrOrThrow(m_desc.kind, "output tensor layout")
+            .output_tensor_layout = std::move(layout_map);
+        return *this;
+    }
+
+    /** @see ov::Params::cfgOutputModelLayout. */
+    Params& cfgOutputModelLayout(std::string layout) {
+        detail::getModelToSetAttrOrThrow(m_desc.kind, "output model layout")
+            .output_model_layout = std::move(layout);
+        return *this;
+    }
+
+    /** @overload */
+    Params&
+    cfgOutputModelLayout(detail::AttrMap<std::string> layout_map) {
+        detail::getModelToSetAttrOrThrow(m_desc.kind, "output model layout")
+            .output_model_layout = std::move(layout_map);
+        return *this;
+    }
+
+    /** @see ov::Params::cfgOutputTensorPrecision. */
+    Params& cfgOutputTensorPrecision(int precision) {
+        detail::getModelToSetAttrOrThrow(m_desc.kind, "output tensor precision")
+            .output_tensor_precision = precision;
+        return *this;
+    }
+
+    /** @overload */
+    Params&
+    cfgOutputTensorPrecision(detail::AttrMap<int> precision_map) {
+        detail::getModelToSetAttrOrThrow(m_desc.kind, "output tensor precision")
+            .output_tensor_precision = std::move(precision_map);
+        return *this;
+    }
+
+    /** @see ov::Params::cfgReshape. */
+    Params& cfgReshape(std::vector<size_t> new_shape) {
+        detail::getModelToSetAttrOrThrow(m_desc.kind, "reshape")
+            .new_shapes = std::move(new_shape);
+        return *this;
+    }
+
+    /** @overload */
+    Params&
+    cfgReshape(detail::AttrMap<std::vector<size_t>> new_shape_map) {
+        detail::getModelToSetAttrOrThrow(m_desc.kind, "reshape")
+            .new_shapes = std::move(new_shape_map);
+        return *this;
+    }
+
+    /** @see ov::Params::cfgNumRequests. */
+    Params& cfgNumRequests(const size_t nireq) {
+        if (nireq == 0) {
+            cv::util::throw_error(
+                    std::logic_error("Number of inference requests"
+                                     " must be greater than zero."));
+        }
+        m_desc.nireq = nireq;
+        return *this;
+    }
+
+    /** @see ov::Params::cfgMean. */
+    Params& cfgMean(std::vector<float> mean_values) {
+        detail::getModelToSetAttrOrThrow(m_desc.kind, "mean values")
+            .mean_values = std::move(mean_values);
+        return *this;
+    }
+
+    /** @overload */
+    Params& cfgMean(detail::AttrMap<std::vector<float>> mean_map) {
+        detail::getModelToSetAttrOrThrow(m_desc.kind, "mean values")
+            .mean_values = std::move(mean_map);
+        return *this;
+    }
+
+    /** @see ov::Params::cfgScale. */
+    Params& cfgScale(std::vector<float> scale_values) {
+        detail::getModelToSetAttrOrThrow(m_desc.kind, "scale values")
+            .scale_values = std::move(scale_values);
+        return *this;
+    }
+
+    /** @overload */
+    Params& cfgScale(detail::AttrMap<std::vector<float>> scale_map) {
+        detail::getModelToSetAttrOrThrow(m_desc.kind, "scale values")
+            .scale_values = std::move(scale_map);
+        return *this;
+    }
+
+    /** @see ov::Params::cfgResize. */
+    Params& cfgResize(int interpolation) {
+        detail::getModelToSetAttrOrThrow(m_desc.kind, "resize preprocessing")
+            .interpolation = std::move(interpolation);
+        return *this;
+    }
+
+    /** @overload */
+    Params& cfgResize(detail::AttrMap<int> interpolation) {
+        detail::getModelToSetAttrOrThrow(m_desc.kind, "resize preprocessing")
+            .interpolation = std::move(interpolation);
+        return *this;
+    }
+
+    // BEGIN(G-API's network parametrization API)
+    GBackend      backend() const { return cv::gapi::ov::backend(); }
+    std::string   tag()     const { return m_tag; }
+    cv::util::any params()  const { return { m_desc }; }
+    // END(G-API's network parametrization API)
+
+protected:
+    std::string m_tag;
+    detail::ParamDesc m_desc;
+};
+
+} // namespace ov
+
+namespace wip { namespace ov {
+/**
+ * @brief Ask G-API OpenVINO backend to run only inference of model provided.
+ *
+ * G-API OpenVINO backend will perform only the inference of the model provided
+ * without populating input and copying back output data.
+ * This mode is used to evaluate the pure inference performance of the model without
+ * taking into account the i/o data transfer.
+ */
+struct benchmark_mode { };
+
+} // namespace ov
+} // namespace wip
+
+} // namespace gapi
+
+namespace detail
+{
+    template<> struct CompileArgTag<cv::gapi::wip::ov::benchmark_mode>
+    {
+        static const char* tag() { return "gapi.wip.ov.benchmark_mode"; }
+    };
+}
+
+} // namespace cv
+
+#endif // OPENCV_GAPI_INFER_OV_HPP
diff --git a/3rdParty/opencv2/gapi/infer/parsers.hpp b/3rdParty/opencv-4.12.0/opencv2/gapi/infer/parsers.hpp
similarity index 100%
rename from 3rdParty/opencv2/gapi/infer/parsers.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/gapi/infer/parsers.hpp
diff --git a/3rdParty/opencv2/gapi/media.hpp b/3rdParty/opencv-4.12.0/opencv2/gapi/media.hpp
similarity index 94%
rename from 3rdParty/opencv2/gapi/media.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/gapi/media.hpp
index 621fc60f2d..c959832ef0 100644
--- a/3rdParty/opencv2/gapi/media.hpp
+++ b/3rdParty/opencv-4.12.0/opencv2/gapi/media.hpp
@@ -33,6 +33,7 @@ namespace cv {
  * @brief Extra G-API data structures used to pass input/output data
  * to the graph for processing.
  */
+
 /**
  * @brief cv::MediaFrame class represents an image/media frame
  * obtained from an external source.
@@ -242,11 +243,11 @@ class GAPI_EXPORTS MediaFrame::IAdapter {
     // The default implementation does nothing
     virtual cv::util::any blobParams() const;
     virtual void serialize(cv::gapi::s11n::IOStream&) {
-        GAPI_Assert(false && "Generic serialize method of MediaFrame::IAdapter does nothing by default. "
+        GAPI_Error("Generic serialize method of MediaFrame::IAdapter does nothing by default. "
                              "Please, implement it in derived class to properly serialize the object.");
     }
     virtual void deserialize(cv::gapi::s11n::IIStream&) {
-        GAPI_Assert(false && "Generic deserialize method of MediaFrame::IAdapter does nothing by default. "
+        GAPI_Error("Generic deserialize method of MediaFrame::IAdapter does nothing by default. "
                              "Please, implement it in derived class to properly deserialize the object.");
     }
 };
diff --git a/3rdParty/opencv2/gapi/oak/infer.hpp b/3rdParty/opencv-4.12.0/opencv2/gapi/oak/infer.hpp
similarity index 100%
rename from 3rdParty/opencv2/gapi/oak/infer.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/gapi/oak/infer.hpp
diff --git a/3rdParty/opencv2/gapi/oak/oak.hpp b/3rdParty/opencv-4.12.0/opencv2/gapi/oak/oak.hpp
similarity index 100%
rename from 3rdParty/opencv2/gapi/oak/oak.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/gapi/oak/oak.hpp
diff --git a/3rdParty/opencv2/gapi/ocl/core.hpp b/3rdParty/opencv-4.12.0/opencv2/gapi/ocl/core.hpp
similarity index 100%
rename from 3rdParty/opencv2/gapi/ocl/core.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/gapi/ocl/core.hpp
diff --git a/3rdParty/opencv2/gapi/ocl/goclkernel.hpp b/3rdParty/opencv-4.12.0/opencv2/gapi/ocl/goclkernel.hpp
similarity index 93%
rename from 3rdParty/opencv2/gapi/ocl/goclkernel.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/gapi/ocl/goclkernel.hpp
index 2233f474c3..5a0e04ac49 100644
--- a/3rdParty/opencv2/gapi/ocl/goclkernel.hpp
+++ b/3rdParty/opencv-4.12.0/opencv2/gapi/ocl/goclkernel.hpp
@@ -119,6 +119,10 @@ template<typename U> struct ocl_get_in<cv::GArray<U> >
 {
     static const std::vector<U>& get(GOCLContext &ctx, int idx) { return ctx.inArg<VectorRef>(idx).rref<U>(); }
 };
+template<> struct ocl_get_in<cv::GFrame>
+{
+    static cv::MediaFrame get(GOCLContext &ctx, int idx) { return ctx.inArg<cv::MediaFrame>(idx); }
+};
 template<typename U> struct ocl_get_in<cv::GOpaque<U> >
 {
     static const U& get(GOCLContext &ctx, int idx) { return ctx.inArg<OpaqueRef>(idx).rref<U>(); }
@@ -149,6 +153,10 @@ struct tracked_cv_umat{
     }
 };
 
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable: 4702)  // unreachable code
+#endif
 template<typename... Outputs>
 void postprocess_ocl(Outputs&... outs)
 {
@@ -162,6 +170,9 @@ void postprocess_ocl(Outputs&... outs)
     int dummy[] = { 0, (validate(&outs), 0)... };
     cv::util::suppress_unused_warning(dummy);
 }
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
 
 template<class T> struct ocl_get_out;
 template<> struct ocl_get_out<cv::GMat>
diff --git a/3rdParty/opencv2/gapi/ocl/imgproc.hpp b/3rdParty/opencv-4.12.0/opencv2/gapi/ocl/imgproc.hpp
similarity index 100%
rename from 3rdParty/opencv2/gapi/ocl/imgproc.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/gapi/ocl/imgproc.hpp
diff --git a/3rdParty/opencv2/gapi/opencv_includes.hpp b/3rdParty/opencv-4.12.0/opencv2/gapi/opencv_includes.hpp
similarity index 95%
rename from 3rdParty/opencv2/gapi/opencv_includes.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/gapi/opencv_includes.hpp
index 1b9199d7c0..57b8c857e8 100644
--- a/3rdParty/opencv2/gapi/opencv_includes.hpp
+++ b/3rdParty/opencv-4.12.0/opencv2/gapi/opencv_includes.hpp
@@ -31,6 +31,7 @@ namespace cv {
     using Size    = gapi::own::Size;
     using Point   = gapi::own::Point;
     using Point2f = gapi::own::Point2f;
+    using Point3f = gapi::own::Point3f;
     using Scalar  = gapi::own::Scalar;
     using Mat     = gapi::own::Mat;
 }  // namespace cv
diff --git a/3rdParty/opencv2/gapi/operators.hpp b/3rdParty/opencv-4.12.0/opencv2/gapi/operators.hpp
similarity index 100%
rename from 3rdParty/opencv2/gapi/operators.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/gapi/operators.hpp
diff --git a/3rdParty/opencv-4.12.0/opencv2/gapi/ot.hpp b/3rdParty/opencv-4.12.0/opencv2/gapi/ot.hpp
new file mode 100644
index 0000000000..1da0c18932
--- /dev/null
+++ b/3rdParty/opencv-4.12.0/opencv2/gapi/ot.hpp
@@ -0,0 +1,194 @@
+// This file is part of OpenCV project.
+// It is subject to the license terms in the LICENSE file found in the top-level directory
+// of this distribution and at http://opencv.org/license.html.
+//
+// Copyright (C) 2023 Intel Corporation
+
+#ifndef OPENCV_GAPI_OT_HPP
+#define OPENCV_GAPI_OT_HPP
+
+#include <opencv2/gapi.hpp>
+#include <opencv2/gapi/s11n.hpp>
+#include <opencv2/gapi/gkernel.hpp>
+
+namespace cv {
+namespace gapi {
+/**
+ * @brief This namespace contains G-API Operation Types for
+ * VAS Object Tracking module functionality.
+ */
+namespace ot {
+
+/**
+ * @enum TrackingStatus
+ *
+ * Tracking status twin for vas::ot::TrackingStatus
+ */
+enum TrackingStatus
+{
+    NEW = 0,     /**< The object is newly added. */
+    TRACKED,     /**< The object is being tracked. */
+    LOST         /**< The object gets lost now. The object can be tracked again
+                      by specifying detected object manually. */
+};
+
+struct GAPI_EXPORTS_W_SIMPLE ObjectTrackerParams
+{
+    /**
+     * Maximum number of trackable objects in a frame.
+     * Valid range: 1 <= max_num_objects. Or it can be -1 if there is no limitation
+     * of maximum number in X86. KMB/TBH has limitation up to 1024.
+     * Default value is -1 which means there is no limitation in X86. KMB/TBH is -1 means 200.
+     */
+    GAPI_PROP_RW int32_t max_num_objects = -1;
+
+    /**
+     * Input color format. Supports 0(BGR), 1(NV12), 2(BGRX) and 4(I420)
+     */
+    GAPI_PROP_RW int32_t input_image_format = 0;
+
+    /**
+     * Specifies whether tracker to use detection class for keeping id of an object.
+     * If it is true, new detection will be associated from previous tracking only when
+     * those two have same class.
+     * class id of an object is fixed across video frames.
+     * If it is false, new detection can be associated across different-class objects.
+     * In this case, the class id of an object may change across video frames depending on the tracker input.
+     * It is recommended to turn this option off when it is likely that detector confuses the class of object.
+     * For example, when detector confuses bicycle and motorbike. Turning this option off will increase
+     * the tracking reliability as tracker will ignore the class label of detector.
+     * @n
+     * Default value is true.
+     */
+    GAPI_PROP_RW bool tracking_per_class = true;
+
+    bool operator==(const ObjectTrackerParams& other) const
+    {
+        return max_num_objects == other.max_num_objects
+            && input_image_format == other.input_image_format
+            && tracking_per_class == other.tracking_per_class;
+    }
+};
+
+using GTrackedInfo = std::tuple<cv::GArray<cv::Rect>, cv::GArray<int32_t>, cv::GArray<uint64_t>, cv::GArray<int>>;
+
+G_API_OP(GTrackFromMat, <GTrackedInfo(cv::GMat, cv::GArray<cv::Rect>, cv::GArray<int32_t>, float)>, "com.intel.track_from_mat")
+{
+    static std::tuple<cv::GArrayDesc, cv::GArrayDesc,
+                      cv::GArrayDesc, cv::GArrayDesc> outMeta(cv::GMatDesc, cv::GArrayDesc, cv::GArrayDesc, float)
+    {
+        return std::make_tuple(cv::empty_array_desc(), cv::empty_array_desc(),
+                               cv::empty_array_desc(), cv::empty_array_desc());
+    }
+};
+
+G_API_OP(GTrackFromFrame, <GTrackedInfo(cv::GFrame, cv::GArray<cv::Rect>, cv::GArray<int32_t>, float)>, "com.intel.track_from_frame")
+{
+    static std::tuple<cv::GArrayDesc, cv::GArrayDesc,
+                      cv::GArrayDesc, cv::GArrayDesc> outMeta(cv::GFrameDesc, cv::GArrayDesc, cv::GArrayDesc, float)
+    {
+       return std::make_tuple(cv::empty_array_desc(), cv::empty_array_desc(),
+                              cv::empty_array_desc(), cv::empty_array_desc());
+    }
+};
+
+/**
+ * @brief   Tracks objects with video frames.
+ *          If a detected object is overlapped enough with one of tracked object, the tracked object's
+ *          informationis updated with the input detected object.
+ *          On the other hand, if a detected object is overlapped with none of tracked objects,
+ *          the detected object is newly added and ObjectTracker starts to track the object.
+ *          In zero term tracking type, ObjectTracker clears tracked objects in case that empty
+ *          list of detected objects is passed in.
+ *
+ * @param mat                       Input frame.
+ * @param detected_rects            Detected objects rectangles in the input frame.
+ * @param detected_class_labels     Detected objects class labels in the input frame.
+ * @param delta                     Frame_delta_t Delta time between two consecutive tracking in seconds.
+ *                                  The valid range is [0.005 ~ 0.5].
+ * @return                          Tracking results of target objects.
+ *                                  cv::GArray<cv::Rect>  Array of rectangles for tracked objects.
+ *                                  cv::GArray<int32_t>   Array of detected objects labels.
+ *                                  cv::GArray<uint64_t>  Array of tracking IDs for objects.
+ *                                                        Numbering sequence starts from 1.
+ *                                                        The value 0 means the tracking ID of this object has
+ *                                                        not been assigned.
+ *                                  cv::GArray<int>       Array of tracking statuses for objects.
+ */
+GAPI_EXPORTS_W std::tuple<cv::GArray<cv::Rect>,
+                          cv::GArray<int>,
+                          cv::GArray<uint64_t>,
+                          cv::GArray<int>>
+    track(const cv::GMat& mat,
+          const cv::GArray<cv::Rect>& detected_rects,
+          const cv::GArray<int>& detected_class_labels,
+          float delta);
+
+
+/**
+   @overload
+ * @brief   Tracks objects with video frames. Overload of track(...) for frame as GFrame.
+ *
+ * @param frame                     Input frame.
+ * @param detected_rects            Detected objects rectangles in the input frame.
+ * @param detected_class_labels     Detected objects class labels in the input frame.
+ * @param delta                     Frame_delta_t Delta time between two consecutive tracking in seconds.
+ *                                  The valid range is [0.005 ~ 0.5].
+ * @return                          Tracking results of target objects.
+ * @return                          Tracking results of target objects.
+ *                                  cv::GArray<cv::Rect>          Array of rectangles for tracked objects.
+ *                                  cv::GArray<int32_t>           Array of detected objects labels.
+ *                                  cv::GArray<uint64_t>          Array of tracking IDs for objects.
+ *                                                                Numbering sequence starts from 1.
+ *                                                                The value 0 means the tracking ID of this object has
+ *                                                                not been assigned.
+ *                                  cv::GArray<int>    Array of tracking statuses for objects.
+ */
+GAPI_EXPORTS_W std::tuple<cv::GArray<cv::Rect>,
+                         cv::GArray<int>,
+                         cv::GArray<uint64_t>,
+                         cv::GArray<int>>
+    track(const cv::GFrame& frame,
+          const cv::GArray<cv::Rect>& detected_rects,
+          const cv::GArray<int>& detected_class_labels,
+          float delta);
+} // namespace ot
+} // namespace gapi
+} // namespace cv
+
+// FIXME: move to a separate file?
+namespace cv
+{
+namespace detail
+{
+template<> struct CompileArgTag<cv::gapi::ot::ObjectTrackerParams>
+{
+    static const char* tag()
+    {
+        return "cv.gapi.ot.object_tracker_params";
+    }
+};
+} // namespace detail
+
+namespace gapi
+{
+namespace s11n
+{
+namespace detail
+{
+template<> struct S11N<cv::gapi::ot::ObjectTrackerParams> {
+    static void serialize(IOStream &os, const cv::gapi::ot::ObjectTrackerParams &p) {
+        os << p. max_num_objects << p.input_image_format << p.tracking_per_class;
+    }
+    static cv::gapi::ot::ObjectTrackerParams deserialize(IIStream &is) {
+        cv::gapi::ot::ObjectTrackerParams p;
+        is >> p. max_num_objects >> p.input_image_format >> p.tracking_per_class;
+        return p;
+    }
+};
+} // namespace detail
+} // namespace s11n
+} // namespace gapi
+} // namespace cv
+
+#endif // OPENCV_GAPI_OT_HPP
diff --git a/3rdParty/opencv2/gapi/own/assert.hpp b/3rdParty/opencv-4.12.0/opencv2/gapi/own/assert.hpp
similarity index 84%
rename from 3rdParty/opencv2/gapi/own/assert.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/gapi/own/assert.hpp
index bf171699ca..bc8d52cbfe 100644
--- a/3rdParty/opencv2/gapi/own/assert.hpp
+++ b/3rdParty/opencv-4.12.0/opencv2/gapi/own/assert.hpp
@@ -19,12 +19,14 @@
 #include <opencv2/core/base.hpp>
 #define GAPI_Assert CV_Assert
 
-#if defined _DEBUG || defined CV_STATIC_ANALYSIS
+#if !defined(NDEBUG) || defined(CV_STATIC_ANALYSIS)
 #  define GAPI_DbgAssert CV_DbgAssert
 #else
 #  define GAPI_DbgAssert(expr) GAPI_DbgAssertNoOp(expr)
 #endif
 
+#define GAPI_Error(msg) CV_Error(cv::Error::StsError, msg)
+
 #else
 #include <stdexcept>
 #include <sstream>
@@ -49,6 +51,10 @@ namespace detail
 #  define GAPI_DbgAssert(expr) GAPI_Assert(expr)
 #endif
 
+#define GAPI_Error(msg) { \
+    ::detail::assert_abort(msg, __LINE__, __FILE__, __func__); \
+}
+
 #endif // GAPI_STANDALONE
 
 #endif // OPENCV_GAPI_OWN_ASSERT_HPP
diff --git a/3rdParty/opencv2/gapi/own/convert.hpp b/3rdParty/opencv-4.12.0/opencv2/gapi/own/convert.hpp
similarity index 95%
rename from 3rdParty/opencv2/gapi/own/convert.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/gapi/own/convert.hpp
index e9997d1df0..2380a1bbed 100644
--- a/3rdParty/opencv2/gapi/own/convert.hpp
+++ b/3rdParty/opencv-4.12.0/opencv2/gapi/own/convert.hpp
@@ -31,7 +31,7 @@ namespace cv
         return (m.dims == 2)
             ?  cv::gapi::own::Mat{m.rows, m.cols, m.type(), m.data, m.step}
             :  cv::gapi::own::Mat{to_own<int>(m.size), m.type(), m.data};
-    };
+    }
 
 namespace gapi
 {
diff --git a/3rdParty/opencv2/gapi/own/cvdefs.hpp b/3rdParty/opencv-4.12.0/opencv2/gapi/own/cvdefs.hpp
similarity index 100%
rename from 3rdParty/opencv2/gapi/own/cvdefs.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/gapi/own/cvdefs.hpp
diff --git a/3rdParty/opencv2/gapi/own/exports.hpp b/3rdParty/opencv-4.12.0/opencv2/gapi/own/exports.hpp
similarity index 100%
rename from 3rdParty/opencv2/gapi/own/exports.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/gapi/own/exports.hpp
diff --git a/3rdParty/opencv2/gapi/own/mat.hpp b/3rdParty/opencv-4.12.0/opencv2/gapi/own/mat.hpp
similarity index 100%
rename from 3rdParty/opencv2/gapi/own/mat.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/gapi/own/mat.hpp
diff --git a/3rdParty/opencv2/gapi/own/saturate.hpp b/3rdParty/opencv-4.12.0/opencv2/gapi/own/saturate.hpp
similarity index 100%
rename from 3rdParty/opencv2/gapi/own/saturate.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/gapi/own/saturate.hpp
diff --git a/3rdParty/opencv2/gapi/own/scalar.hpp b/3rdParty/opencv-4.12.0/opencv2/gapi/own/scalar.hpp
similarity index 91%
rename from 3rdParty/opencv2/gapi/own/scalar.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/gapi/own/scalar.hpp
index abdda119ef..02da06ca7a 100644
--- a/3rdParty/opencv2/gapi/own/scalar.hpp
+++ b/3rdParty/opencv-4.12.0/opencv2/gapi/own/scalar.hpp
@@ -21,7 +21,7 @@ class GAPI_EXPORTS Scalar
 {
 public:
     Scalar() = default;
-    explicit Scalar(double v0) { val[0] = v0; };
+    explicit Scalar(double v0) { val[0] = v0; }
     Scalar(double v0, double v1, double v2 = 0, double v3 = 0)
         : val{v0, v1, v2, v3}
     {
diff --git a/3rdParty/opencv-4.12.0/opencv2/gapi/own/types.hpp b/3rdParty/opencv-4.12.0/opencv2/gapi/own/types.hpp
new file mode 100644
index 0000000000..ef01056db1
--- /dev/null
+++ b/3rdParty/opencv-4.12.0/opencv2/gapi/own/types.hpp
@@ -0,0 +1,162 @@
+// This file is part of OpenCV project.
+// It is subject to the license terms in the LICENSE file found in the top-level directory
+// of this distribution and at http://opencv.org/license.html.
+//
+// Copyright (C) 2018 Intel Corporation
+
+
+#ifndef OPENCV_GAPI_TYPES_HPP
+#define OPENCV_GAPI_TYPES_HPP
+
+#include <algorithm>              // std::max, std::min
+#include <ostream>
+
+namespace cv
+{
+namespace gapi
+{
+
+/**
+ * @brief This namespace contains G-API own data structures used in
+ * its standalone mode build.
+ */
+namespace own
+{
+
+class Point
+{
+public:
+    Point() = default;
+    Point(int _x, int _y) : x(_x),  y(_y) {}
+
+    int x = 0;
+    int y = 0;
+};
+
+class Point2f
+{
+public:
+    Point2f() = default;
+    Point2f(float _x, float _y) : x(_x),  y(_y) {}
+
+    float x = 0.f;
+    float y = 0.f;
+};
+
+class Point3f
+{
+public:
+    Point3f() = default;
+    Point3f(float _x, float _y, float _z) : x(_x),  y(_y), z(_z) {}
+
+    float x = 0.f;
+    float y = 0.f;
+    float z = 0.f;
+};
+
+class Rect
+{
+public:
+    Rect() = default;
+    Rect(int _x, int _y, int _width, int _height) : x(_x), y(_y),   width(_width),  height(_height) {}
+#if !defined(GAPI_STANDALONE)
+    Rect(const cv::Rect& other) : x(other.x), y(other.y), width(other.width), height(other.height) {}
+    inline Rect& operator=(const cv::Rect& other)
+    {
+        x = other.x;
+        y = other.x;
+        width  = other.width;
+        height = other.height;
+        return *this;
+    }
+#endif // !defined(GAPI_STANDALONE)
+
+    int x      = 0; //!< x coordinate of the top-left corner
+    int y      = 0; //!< y coordinate of the top-left corner
+    int width  = 0; //!< width of the rectangle
+    int height = 0; //!< height of the rectangle
+};
+
+inline bool operator==(const Rect& lhs, const Rect& rhs)
+{
+    return lhs.x == rhs.x && lhs.y == rhs.y && lhs.width == rhs.width && lhs.height == rhs.height;
+}
+
+inline bool operator!=(const Rect& lhs, const Rect& rhs)
+{
+    return !(lhs == rhs);
+}
+
+inline Rect& operator&=(Rect& lhs, const Rect& rhs)
+{
+    int x1 = std::max(lhs.x, rhs.x);
+    int y1 = std::max(lhs.y, rhs.y);
+    lhs.width  = std::min(lhs.x + lhs.width,  rhs.x + rhs.width) -  x1;
+    lhs.height = std::min(lhs.y + lhs.height, rhs.y + rhs.height) - y1;
+    lhs.x = x1;
+    lhs.y = y1;
+    if( lhs.width <= 0 || lhs.height <= 0 )
+        lhs = Rect();
+    return lhs;
+}
+
+inline Rect operator&(const Rect& lhs, const Rect& rhs)
+{
+    Rect result = lhs;
+    return result &= rhs;
+}
+
+inline std::ostream& operator<<(std::ostream& o, const Rect& rect)
+{
+    return o << "[" << rect.width << " x " << rect.height << " from (" << rect.x << ", " << rect.y << ")]";
+}
+
+class Size
+{
+public:
+    Size() = default;
+    Size(int _width, int _height) : width(_width),  height(_height) {}
+#if !defined(GAPI_STANDALONE)
+    Size(const cv::Size& other) : width(other.width), height(other.height) {}
+    inline Size& operator=(const cv::Size& rhs)
+    {
+        width  = rhs.width;
+        height = rhs.height;
+        return *this;
+    }
+#endif // !defined(GAPI_STANDALONE)
+
+    int width  = 0;
+    int height = 0;
+};
+
+inline Size& operator+=(Size& lhs, const Size& rhs)
+{
+    lhs.width  += rhs.width;
+    lhs.height += rhs.height;
+    return lhs;
+}
+
+inline bool operator==(const Size& lhs, const Size& rhs)
+{
+    return lhs.width == rhs.width && lhs.height == rhs.height;
+}
+
+inline bool operator!=(const Size& lhs, const Size& rhs)
+{
+    return !(lhs == rhs);
+}
+
+
+inline std::ostream& operator<<(std::ostream& o, const Size& s)
+{
+    o << "[" << s.width << " x " << s.height << "]";
+    return o;
+}
+
+struct VoidType {};
+} // namespace own
+} // namespace gapi
+} // namespace cv
+
+#endif // OPENCV_GAPI_TYPES_HPP
diff --git a/3rdParty/opencv2/gapi/plaidml/core.hpp b/3rdParty/opencv-4.12.0/opencv2/gapi/plaidml/core.hpp
similarity index 100%
rename from 3rdParty/opencv2/gapi/plaidml/core.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/gapi/plaidml/core.hpp
diff --git a/3rdParty/opencv2/gapi/plaidml/gplaidmlkernel.hpp b/3rdParty/opencv-4.12.0/opencv2/gapi/plaidml/gplaidmlkernel.hpp
similarity index 100%
rename from 3rdParty/opencv2/gapi/plaidml/gplaidmlkernel.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/gapi/plaidml/gplaidmlkernel.hpp
diff --git a/3rdParty/opencv2/gapi/plaidml/plaidml.hpp b/3rdParty/opencv-4.12.0/opencv2/gapi/plaidml/plaidml.hpp
similarity index 100%
rename from 3rdParty/opencv2/gapi/plaidml/plaidml.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/gapi/plaidml/plaidml.hpp
diff --git a/3rdParty/opencv2/gapi/python/python.hpp b/3rdParty/opencv-4.12.0/opencv2/gapi/python/python.hpp
similarity index 76%
rename from 3rdParty/opencv2/gapi/python/python.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/gapi/python/python.hpp
index b5659fa648..00d15f849c 100644
--- a/3rdParty/opencv2/gapi/python/python.hpp
+++ b/3rdParty/opencv-4.12.0/opencv2/gapi/python/python.hpp
@@ -31,19 +31,22 @@ struct GPythonContext
     const cv::GArgs      &ins;
     const cv::GMetaArgs  &in_metas;
     const cv::GTypesInfo &out_info;
+
+    cv::optional<cv::GArg> m_state;
 };
 
 using Impl = std::function<cv::GRunArgs(const GPythonContext&)>;
+using Setup = std::function<cv::GArg(const GMetaArgs&, const GArgs&)>;
 
 class GAPI_EXPORTS GPythonKernel
 {
 public:
     GPythonKernel() = default;
-    GPythonKernel(Impl run);
+    GPythonKernel(Impl run, Setup setup);
 
-    cv::GRunArgs operator()(const GPythonContext& ctx);
-private:
-    Impl m_run;
+    Impl  run;
+    Setup setup       = nullptr;
+    bool  is_stateful = false;
 };
 
 class GAPI_EXPORTS GPythonFunctor : public cv::gapi::GFunctor
@@ -51,7 +54,8 @@ class GAPI_EXPORTS GPythonFunctor : public cv::gapi::GFunctor
 public:
     using Meta = cv::GKernel::M;
 
-    GPythonFunctor(const char* id, const Meta &meta, const Impl& impl);
+    GPythonFunctor(const char* id, const Meta& meta, const Impl& impl,
+                   const Setup& setup = nullptr);
 
     GKernelImpl    impl()    const override;
     gapi::GBackend backend() const override;
diff --git a/3rdParty/opencv2/gapi/render.hpp b/3rdParty/opencv-4.12.0/opencv2/gapi/render.hpp
similarity index 100%
rename from 3rdParty/opencv2/gapi/render.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/gapi/render.hpp
diff --git a/3rdParty/opencv2/gapi/render/render.hpp b/3rdParty/opencv-4.12.0/opencv2/gapi/render/render.hpp
similarity index 100%
rename from 3rdParty/opencv2/gapi/render/render.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/gapi/render/render.hpp
diff --git a/3rdParty/opencv2/gapi/render/render_types.hpp b/3rdParty/opencv-4.12.0/opencv2/gapi/render/render_types.hpp
similarity index 100%
rename from 3rdParty/opencv2/gapi/render/render_types.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/gapi/render/render_types.hpp
diff --git a/3rdParty/opencv2/gapi/rmat.hpp b/3rdParty/opencv-4.12.0/opencv2/gapi/rmat.hpp
similarity index 94%
rename from 3rdParty/opencv2/gapi/rmat.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/gapi/rmat.hpp
index e3277b967c..12c700e455 100644
--- a/3rdParty/opencv2/gapi/rmat.hpp
+++ b/3rdParty/opencv-4.12.0/opencv2/gapi/rmat.hpp
@@ -112,11 +112,11 @@ class GAPI_EXPORTS RMat
         // is transferred to the device when the view is destroyed
         virtual View access(Access) = 0;
         virtual void serialize(cv::gapi::s11n::IOStream&) {
-            GAPI_Assert(false && "Generic serialize method of RMat::IAdapter does nothing by default. "
+            GAPI_Error("Generic serialize method of RMat::IAdapter does nothing by default. "
                                  "Please, implement it in derived class to properly serialize the object.");
         }
         virtual void deserialize(cv::gapi::s11n::IIStream&) {
-            GAPI_Assert(false && "Generic deserialize method of RMat::IAdapter does nothing by default. "
+            GAPI_Error("Generic deserialize method of RMat::IAdapter does nothing by default. "
                                  "Please, implement it in derived class to properly deserialize the object.");
         }
     };
diff --git a/3rdParty/opencv2/gapi/s11n.hpp b/3rdParty/opencv-4.12.0/opencv2/gapi/s11n.hpp
similarity index 94%
rename from 3rdParty/opencv2/gapi/s11n.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/gapi/s11n.hpp
index 7406fd3147..16c162e7f1 100644
--- a/3rdParty/opencv2/gapi/s11n.hpp
+++ b/3rdParty/opencv-4.12.0/opencv2/gapi/s11n.hpp
@@ -17,7 +17,8 @@
 #include <opencv2/gapi/util/util.hpp>
 
 // FIXME: caused by deserialize_runarg
-#if (defined _WIN32 || defined _WIN64) && defined _MSC_VER
+#if defined _MSC_VER
+#pragma warning(push)
 #pragma warning(disable: 4702)
 #endif
 
@@ -229,6 +230,9 @@ GAPI_EXPORTS IIStream& operator>> (IIStream& is,       cv::Point &pt);
 GAPI_EXPORTS IOStream& operator<< (IOStream& os, const cv::Point2f &pt);
 GAPI_EXPORTS IIStream& operator>> (IIStream& is,       cv::Point2f &pt);
 
+GAPI_EXPORTS IOStream& operator<< (IOStream& os, const cv::Point3f &pt);
+GAPI_EXPORTS IIStream& operator>> (IIStream& is,       cv::Point3f &pt);
+
 GAPI_EXPORTS IOStream& operator<< (IOStream& os, const cv::Size &sz);
 GAPI_EXPORTS IIStream& operator>> (IIStream& is,       cv::Size &sz);
 
@@ -332,8 +336,8 @@ IIStream& operator>> (IIStream& is, std::vector<T> &ts) {
 namespace detail {
 template<typename V>
 IOStream& put_v(IOStream&, const V&, std::size_t) {
-    GAPI_Assert(false && "variant>>: requested index is invalid");
-};
+    GAPI_Error("variant>>: requested index is invalid");
+}
 
 template<typename V, typename X, typename... Xs>
 IOStream& put_v(IOStream& os, const V& v, std::size_t x) {
@@ -344,7 +348,7 @@ IOStream& put_v(IOStream& os, const V& v, std::size_t x) {
 
 template<typename V>
 IIStream& get_v(IIStream&, V&, std::size_t, std::size_t) {
-    GAPI_Assert(false && "variant<<: requested index is invalid");
+    GAPI_Error("variant<<: requested index is invalid");
 }
 
 template<typename V, typename X, typename... Xs>
@@ -420,7 +424,7 @@ static GRunArg exec(cv::gapi::s11n::IIStream& is) {
 template<typename RA>
 struct deserialize_arg_with_adapter<RA, void> {
 static GRunArg exec(cv::gapi::s11n::IIStream&) {
-    GAPI_Assert(false && "No suitable adapter class found during RMat/MediaFrame deserialization. "
+    GAPI_Error("No suitable adapter class found during RMat/MediaFrame deserialization. "
                          "Please, make sure you've passed them in cv::gapi::deserialize() template");
     return GRunArg{};
 }
@@ -502,4 +506,8 @@ cv::GRunArgs getRunArgsWithAdapters(const std::vector<char> &bytes) {
 } // namespace gapi
 } // namespace cv
 
+#if defined _MSC_VER
+#pragma warning(pop)
+#endif
+
 #endif // OPENCV_GAPI_S11N_HPP
diff --git a/3rdParty/opencv-4.12.0/opencv2/gapi/s11n/base.hpp b/3rdParty/opencv-4.12.0/opencv2/gapi/s11n/base.hpp
new file mode 100644
index 0000000000..13e8110bfc
--- /dev/null
+++ b/3rdParty/opencv-4.12.0/opencv2/gapi/s11n/base.hpp
@@ -0,0 +1,80 @@
+// This file is part of OpenCV project.
+// It is subject to the license terms in the LICENSE file found in the top-level directory
+// of this distribution and at http://opencv.org/license.html.
+//
+// Copyright (C) 2020-2021 Intel Corporation
+
+#ifndef OPENCV_GAPI_S11N_BASE_HPP
+#define OPENCV_GAPI_S11N_BASE_HPP
+
+#include <opencv2/gapi/own/assert.hpp>
+#include <opencv2/gapi/own/exports.hpp>
+
+namespace cv {
+namespace gapi {
+
+/**
+ * @brief This namespace contains G-API serialization and
+ * deserialization functions and data structures.
+ */
+namespace s11n {
+struct IOStream;
+struct IIStream;
+
+namespace detail {
+
+//! @addtogroup gapi_serialization
+//! @{
+
+struct NotImplemented {
+};
+
+/** @brief This structure allows to implement serialization routines for custom types.
+ *
+ * The default S11N for custom types is not implemented.
+ *
+ * @note When providing an overloaded implementation for S11N with your type
+ * don't inherit it from NotImplemented structure.
+ *
+ * @note There are lots of overloaded >> and << operators for basic and OpenCV/G-API types
+ * which can be utilized when serializing a custom type.
+ *
+ * Example of usage:
+ * @snippet samples/cpp/tutorial_code/gapi/doc_snippets/api_ref_snippets.cpp S11N usage
+ *
+ */
+template<typename T>
+struct S11N: public NotImplemented {
+    /**
+     * @brief This function allows user to serialize their custom type.
+     *
+     * @note The default overload throws an exception if called. User need to
+     * properly overload the function to use it.
+     */
+    static void serialize(IOStream &, const T &) {
+        GAPI_Error("No serialization routine is provided!");
+    }
+    /**
+     * @brief This function allows user to deserialize their custom type.
+     *
+     * @note The default overload throws an exception if called. User need to
+     * properly overload the function to use it.
+     */
+    static T deserialize(IIStream &) {
+        GAPI_Error("No deserialization routine is provided!");
+    }
+};
+
+/// @private -- Exclude this struct from OpenCV documentation
+template<typename T> struct has_S11N_spec {
+    static constexpr bool value = !std::is_base_of<NotImplemented,
+                                        S11N<typename std::decay<T>::type>>::value;
+};
+//! @} gapi_serialization
+
+} // namespace detail
+} // namespace s11n
+} // namespace gapi
+} // namespace cv
+
+#endif // OPENCV_GAPI_S11N_BASE_HPP
diff --git a/3rdParty/opencv2/gapi/stereo.hpp b/3rdParty/opencv-4.12.0/opencv2/gapi/stereo.hpp
similarity index 95%
rename from 3rdParty/opencv2/gapi/stereo.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/gapi/stereo.hpp
index 5545974d52..fce9c37436 100644
--- a/3rdParty/opencv2/gapi/stereo.hpp
+++ b/3rdParty/opencv-4.12.0/opencv2/gapi/stereo.hpp
@@ -62,7 +62,7 @@ G_TYPED_KERNEL(GStereo, <GMat(GMat, GMat, const StereoOutputFormat)>, "org.openc
             case StereoOutputFormat::DISPARITY_FIXED16_12_4:
                 return left.withDepth(CV_16SC1);
             default:
-                GAPI_Assert(false && "Unknown output format!");
+                GAPI_Error("Unknown output format!");
         }
     }
 };
diff --git a/3rdParty/opencv2/gapi/streaming/cap.hpp b/3rdParty/opencv-4.12.0/opencv2/gapi/streaming/cap.hpp
similarity index 75%
rename from 3rdParty/opencv2/gapi/streaming/cap.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/gapi/streaming/cap.hpp
index ca5a9a24f8..6ceb395733 100644
--- a/3rdParty/opencv2/gapi/streaming/cap.hpp
+++ b/3rdParty/opencv-4.12.0/opencv2/gapi/streaming/cap.hpp
@@ -22,6 +22,7 @@
  * because of this file.
  */
 #include <chrono>
+#include <map>
 
 #include <opencv2/videoio.hpp>
 #include <opencv2/gapi/garg.hpp>
@@ -47,8 +48,16 @@ namespace wip {
 class GCaptureSource: public IStreamSource
 {
 public:
-    explicit GCaptureSource(int id) : cap(id) { prep(); }
-    explicit GCaptureSource(const std::string &path) : cap(path) { prep(); }
+    explicit GCaptureSource(int id, const std::map<int, double> &properties = {})
+        : cap(id) { prep(properties); }
+
+    explicit GCaptureSource(const std::string &path,
+                            const std::map<int, double> &properties = {})
+        : cap(path) { prep(properties); }
+
+    void set(int propid, double value) {
+        cap.set(propid, value);
+    }
 
     // TODO: Add more constructor overloads to make it
     // fully compatible with VideoCapture's interface.
@@ -59,15 +68,19 @@ class GCaptureSource: public IStreamSource
     bool first_pulled = false;
     int64_t counter = 0;
 
-    void prep()
+    void prep(const std::map<int, double> &properties)
     {
+        for (const auto &it : properties) {
+            cap.set(it.first, it.second);
+        }
+
         // Prepare first frame to report its meta to engine
         // when needed
         GAPI_Assert(first.empty());
         cv::Mat tmp;
         if (!cap.read(tmp))
         {
-            GAPI_Assert(false && "Couldn't grab the very first frame");
+            GAPI_Error("Couldn't grab the very first frame");
         }
         // NOTE: Some decode/media VideoCapture backends continue
         // owning the video buffer under cv::Mat so in order to
@@ -114,15 +127,19 @@ class GCaptureSource: public IStreamSource
 };
 
 // NB: Overload for using from python
-GAPI_EXPORTS_W cv::Ptr<IStreamSource> inline make_capture_src(const std::string& path)
+GAPI_EXPORTS_W cv::Ptr<IStreamSource>
+inline make_capture_src(const std::string& path,
+                        const std::map<int, double>& properties = {})
 {
-    return make_src<GCaptureSource>(path);
+    return make_src<GCaptureSource>(path, properties);
 }
 
 // NB: Overload for using from python
-GAPI_EXPORTS_W cv::Ptr<IStreamSource> inline make_capture_src(const int id)
+GAPI_EXPORTS_W cv::Ptr<IStreamSource>
+inline make_capture_src(const int id,
+                        const std::map<int, double>& properties = {})
 {
-    return make_src<GCaptureSource>(id);
+    return make_src<GCaptureSource>(id, properties);
 }
 
 } // namespace wip
diff --git a/3rdParty/opencv2/gapi/streaming/desync.hpp b/3rdParty/opencv-4.12.0/opencv2/gapi/streaming/desync.hpp
similarity index 94%
rename from 3rdParty/opencv2/gapi/streaming/desync.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/gapi/streaming/desync.hpp
index 37e0babdda..eebb9d8328 100644
--- a/3rdParty/opencv2/gapi/streaming/desync.hpp
+++ b/3rdParty/opencv-4.12.0/opencv2/gapi/streaming/desync.hpp
@@ -46,6 +46,7 @@ G desync(const G &g) {
         , {cv::detail::GTypeTraits<G>::shape}               // output Shape
         , {cv::detail::GTypeTraits<G>::op_kind}             // input data kinds
         , {cv::detail::GObtainCtor<G>::get()}               // output template ctors
+        , {cv::detail::GTypeTraits<G>::op_kind}             // output data kinds
     };
     cv::GCall call(std::move(k));
     call.pass(g);
diff --git a/3rdParty/opencv2/gapi/streaming/format.hpp b/3rdParty/opencv-4.12.0/opencv2/gapi/streaming/format.hpp
similarity index 100%
rename from 3rdParty/opencv2/gapi/streaming/format.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/gapi/streaming/format.hpp
diff --git a/3rdParty/opencv2/gapi/streaming/gstreamer/gstreamerpipeline.hpp b/3rdParty/opencv-4.12.0/opencv2/gapi/streaming/gstreamer/gstreamerpipeline.hpp
similarity index 100%
rename from 3rdParty/opencv2/gapi/streaming/gstreamer/gstreamerpipeline.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/gapi/streaming/gstreamer/gstreamerpipeline.hpp
diff --git a/3rdParty/opencv2/gapi/streaming/gstreamer/gstreamersource.hpp b/3rdParty/opencv-4.12.0/opencv2/gapi/streaming/gstreamer/gstreamersource.hpp
similarity index 100%
rename from 3rdParty/opencv2/gapi/streaming/gstreamer/gstreamersource.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/gapi/streaming/gstreamer/gstreamersource.hpp
diff --git a/3rdParty/opencv2/gapi/streaming/meta.hpp b/3rdParty/opencv-4.12.0/opencv2/gapi/streaming/meta.hpp
similarity index 94%
rename from 3rdParty/opencv2/gapi/streaming/meta.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/gapi/streaming/meta.hpp
index 6ea20d7a6d..5cae3b4938 100644
--- a/3rdParty/opencv2/gapi/streaming/meta.hpp
+++ b/3rdParty/opencv-4.12.0/opencv2/gapi/streaming/meta.hpp
@@ -50,6 +50,7 @@ cv::GOpaque<T> meta(G g, const std::string &tag) {
         , {cv::detail::GTypeTraits<O>::shape}    // output Shape
         , {cv::detail::GTypeTraits<G>::op_kind}  // input data kinds
         , {cv::detail::GObtainCtor<O>::get()}    // output template ctors
+        , {cv::detail::GTypeTraits<O>::op_kind}  // output data kind
     };
     cv::GCall call(std::move(k));
     call.pass(g);
diff --git a/3rdParty/opencv2/gapi/streaming/onevpl/accel_types.hpp b/3rdParty/opencv-4.12.0/opencv2/gapi/streaming/onevpl/accel_types.hpp
similarity index 86%
rename from 3rdParty/opencv2/gapi/streaming/onevpl/accel_types.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/gapi/streaming/onevpl/accel_types.hpp
index 9fa68eac73..0f850198b6 100644
--- a/3rdParty/opencv2/gapi/streaming/onevpl/accel_types.hpp
+++ b/3rdParty/opencv-4.12.0/opencv2/gapi/streaming/onevpl/accel_types.hpp
@@ -65,6 +65,9 @@ GAPI_EXPORTS Device create_dx11_device(Device::Ptr device_ptr,
                                        const std::string& device_name);
 GAPI_EXPORTS Context create_dx11_context(Context::Ptr ctx_ptr);
 
+GAPI_EXPORTS Device create_vaapi_device(Device::Ptr device_ptr,
+                                        const std::string& device_name);
+GAPI_EXPORTS Context create_vaapi_context(Context::Ptr ctx_ptr);
 } // namespace onevpl
 } // namespace wip
 } // namespace gapi
diff --git a/3rdParty/opencv2/gapi/streaming/onevpl/cfg_params.hpp b/3rdParty/opencv-4.12.0/opencv2/gapi/streaming/onevpl/cfg_params.hpp
similarity index 97%
rename from 3rdParty/opencv2/gapi/streaming/onevpl/cfg_params.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/gapi/streaming/onevpl/cfg_params.hpp
index 9f6f452a4a..b55f88e617 100644
--- a/3rdParty/opencv2/gapi/streaming/onevpl/cfg_params.hpp
+++ b/3rdParty/opencv-4.12.0/opencv2/gapi/streaming/onevpl/cfg_params.hpp
@@ -185,6 +185,8 @@ struct GAPI_EXPORTS CfgParam {
     const name_t& get_name() const;
     const value_t& get_value() const;
     bool is_major() const;
+    std::string to_string() const;
+
     bool operator==(const CfgParam& rhs) const;
     bool operator< (const CfgParam& rhs) const;
     bool operator!=(const CfgParam& rhs) const;
diff --git a/3rdParty/opencv2/gapi/streaming/onevpl/data_provider_interface.hpp b/3rdParty/opencv-4.12.0/opencv2/gapi/streaming/onevpl/data_provider_interface.hpp
similarity index 100%
rename from 3rdParty/opencv2/gapi/streaming/onevpl/data_provider_interface.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/gapi/streaming/onevpl/data_provider_interface.hpp
diff --git a/3rdParty/opencv-4.12.0/opencv2/gapi/streaming/onevpl/default.hpp b/3rdParty/opencv-4.12.0/opencv2/gapi/streaming/onevpl/default.hpp
new file mode 100644
index 0000000000..4bb099fb3c
--- /dev/null
+++ b/3rdParty/opencv-4.12.0/opencv2/gapi/streaming/onevpl/default.hpp
@@ -0,0 +1,29 @@
+// This file is part of OpenCV project.
+// It is subject to the license terms in the LICENSE file found in the top-level directory
+// of this distribution and at http://opencv.org/license.html.
+//
+// Copyright (C) 2022 Intel Corporation
+
+#ifndef OPENCV_GAPI_STREAMING_ONEVPL_UTILS_HPP
+#define OPENCV_GAPI_STREAMING_ONEVPL_UTILS_HPP
+
+#include <opencv2/gapi/own/exports.hpp> // GAPI_EXPORTS
+#include <opencv2/gapi/streaming/onevpl/cfg_params.hpp>
+#include <opencv2/gapi/streaming/onevpl/device_selector_interface.hpp>
+
+namespace cv {
+namespace gapi {
+namespace wip {
+namespace onevpl {
+
+/**
+ * @brief Provides default device selector based on config.
+ */
+GAPI_EXPORTS std::shared_ptr<IDeviceSelector> getDefaultDeviceSelector(const std::vector<CfgParam>& cfg_params);
+
+} // namespace onevpl
+} // namespace wip
+} // namespace gapi
+} // namespace cv
+
+#endif // OPENCV_GAPI_STREAMING_ONEVPL_UTILS_HPP
diff --git a/3rdParty/opencv2/gapi/streaming/onevpl/device_selector_interface.hpp b/3rdParty/opencv-4.12.0/opencv2/gapi/streaming/onevpl/device_selector_interface.hpp
similarity index 100%
rename from 3rdParty/opencv2/gapi/streaming/onevpl/device_selector_interface.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/gapi/streaming/onevpl/device_selector_interface.hpp
diff --git a/3rdParty/opencv2/gapi/streaming/onevpl/source.hpp b/3rdParty/opencv-4.12.0/opencv2/gapi/streaming/onevpl/source.hpp
similarity index 100%
rename from 3rdParty/opencv2/gapi/streaming/onevpl/source.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/gapi/streaming/onevpl/source.hpp
diff --git a/3rdParty/opencv-4.12.0/opencv2/gapi/streaming/queue_source.hpp b/3rdParty/opencv-4.12.0/opencv2/gapi/streaming/queue_source.hpp
new file mode 100644
index 0000000000..e01902fd7f
--- /dev/null
+++ b/3rdParty/opencv-4.12.0/opencv2/gapi/streaming/queue_source.hpp
@@ -0,0 +1,67 @@
+// This file is part of OpenCV project.
+// It is subject to the license terms in the LICENSE file found in the top-level directory
+// of this distribution and at http://opencv.org/license.html.
+//
+// Copyright (C) 2023 Intel Corporation
+
+#ifndef OPENCV_GAPI_STREAMING_QUEUE_SOURCE_HPP
+#define OPENCV_GAPI_STREAMING_QUEUE_SOURCE_HPP
+
+#include <memory>                      // shared_ptr
+#include <type_traits>                 // is_base_of
+
+#include <opencv2/gapi/garg.hpp>       // GRunArgs
+#include <opencv2/gapi/gmetaarg.hpp>   // GMetaArg + all descr_of
+#include <opencv2/gapi/streaming/source.hpp> // IStreamSource
+
+namespace cv {
+namespace gapi {
+namespace wip {
+struct Data; // fwd-declare to avoid circular? header dependencies
+
+class GAPI_EXPORTS QueueSourceBase: public cv::gapi::wip::IStreamSource {
+    class Priv;
+    std::shared_ptr<Priv> m_priv;
+    // FIXME: Need to understand how it works with IStreamSource's shared_from_this
+    // Can we avoid having too many shared_ptrs here?
+
+public:
+    explicit QueueSourceBase(const cv::GMetaArg &m);
+    void push(Data &&data);
+    virtual bool pull(Data &data) override;
+    virtual void halt() override;
+    virtual GMetaArg descr_of() const override;
+    virtual ~QueueSourceBase() = default;
+};
+
+/**
+ * @brief Queued streaming pipeline source.
+ *
+ */
+template<class T>
+class QueueSource final: public QueueSourceBase
+{
+public:
+    using Meta = decltype(cv::descr_of(T{}));
+    explicit QueueSource(Meta m) : QueueSourceBase(GMetaArg{m}) {
+    }
+    void push(T t) {
+        QueueSourceBase::push(Data{t});
+    }
+};
+
+class GAPI_EXPORTS QueueInput {
+    std::vector<std::shared_ptr<QueueSourceBase> > m_sources;
+
+public:
+    explicit QueueInput(const cv::GMetaArgs &args);
+
+    void push(cv::GRunArgs &&ins);
+    operator cv::GRunArgs();
+};
+
+} // namespace wip
+} // namespace gapi
+} // namespace cv
+
+#endif // OPENCV_GAPI_STREAMING_SOURCE_HPP
diff --git a/3rdParty/opencv2/gapi/streaming/source.hpp b/3rdParty/opencv-4.12.0/opencv2/gapi/streaming/source.hpp
similarity index 82%
rename from 3rdParty/opencv2/gapi/streaming/source.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/gapi/streaming/source.hpp
index 57869d76f1..9b02f03ffc 100644
--- a/3rdParty/opencv2/gapi/streaming/source.hpp
+++ b/3rdParty/opencv-4.12.0/opencv2/gapi/streaming/source.hpp
@@ -16,7 +16,7 @@
 namespace cv {
 namespace gapi {
 namespace wip {
-    struct Data; // "forward-declaration" of GRunArg
+struct Data; // forward-declaration of Data to avoid circular dependencies
 
 /**
  * @brief Abstract streaming pipeline source.
@@ -43,6 +43,11 @@ class IStreamSource: public std::enable_shared_from_this<IStreamSource>
     Ptr ptr() { return shared_from_this(); }
     virtual bool pull(Data &data) = 0;
     virtual GMetaArg descr_of() const = 0;
+    virtual void halt() {
+        // Do nothing by default to maintain compatibility with the existing sources...
+        // In fact needs to be decorated atop of the child classes to maintain the behavior
+        // FIXME: Make it mandatory in OpenCV 5.0
+    };
     virtual ~IStreamSource() = default;
 };
 
diff --git a/3rdParty/opencv2/gapi/streaming/sync.hpp b/3rdParty/opencv-4.12.0/opencv2/gapi/streaming/sync.hpp
similarity index 100%
rename from 3rdParty/opencv2/gapi/streaming/sync.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/gapi/streaming/sync.hpp
diff --git a/3rdParty/opencv2/gapi/util/any.hpp b/3rdParty/opencv-4.12.0/opencv2/gapi/util/any.hpp
similarity index 100%
rename from 3rdParty/opencv2/gapi/util/any.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/gapi/util/any.hpp
diff --git a/3rdParty/opencv2/gapi/util/compiler_hints.hpp b/3rdParty/opencv-4.12.0/opencv2/gapi/util/compiler_hints.hpp
similarity index 100%
rename from 3rdParty/opencv2/gapi/util/compiler_hints.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/gapi/util/compiler_hints.hpp
diff --git a/3rdParty/opencv2/gapi/util/copy_through_move.hpp b/3rdParty/opencv-4.12.0/opencv2/gapi/util/copy_through_move.hpp
similarity index 100%
rename from 3rdParty/opencv2/gapi/util/copy_through_move.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/gapi/util/copy_through_move.hpp
diff --git a/3rdParty/opencv2/gapi/util/optional.hpp b/3rdParty/opencv-4.12.0/opencv2/gapi/util/optional.hpp
similarity index 100%
rename from 3rdParty/opencv2/gapi/util/optional.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/gapi/util/optional.hpp
diff --git a/3rdParty/opencv2/gapi/util/throw.hpp b/3rdParty/opencv-4.12.0/opencv2/gapi/util/throw.hpp
similarity index 100%
rename from 3rdParty/opencv2/gapi/util/throw.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/gapi/util/throw.hpp
diff --git a/3rdParty/opencv2/gapi/util/type_traits.hpp b/3rdParty/opencv-4.12.0/opencv2/gapi/util/type_traits.hpp
similarity index 100%
rename from 3rdParty/opencv2/gapi/util/type_traits.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/gapi/util/type_traits.hpp
diff --git a/3rdParty/opencv2/gapi/util/util.hpp b/3rdParty/opencv-4.12.0/opencv2/gapi/util/util.hpp
similarity index 100%
rename from 3rdParty/opencv2/gapi/util/util.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/gapi/util/util.hpp
diff --git a/3rdParty/opencv2/gapi/util/variant.hpp b/3rdParty/opencv-4.12.0/opencv2/gapi/util/variant.hpp
similarity index 96%
rename from 3rdParty/opencv2/gapi/util/variant.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/gapi/util/variant.hpp
index 45d48c7ab7..8b68e79ec5 100644
--- a/3rdParty/opencv2/gapi/util/variant.hpp
+++ b/3rdParty/opencv-4.12.0/opencv2/gapi/util/variant.hpp
@@ -509,6 +509,11 @@ namespace util
         return v.index() == util::variant<Types...>::template index_of<T>();
     }
 
+#if defined(__GNUC__) && (__GNUC__ == 11 || __GNUC__ == 12)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+#endif
+
     template<typename... Us> bool operator==(const variant<Us...> &lhs,
                                              const variant<Us...> &rhs)
     {
@@ -524,6 +529,10 @@ namespace util
         return (eqs[lhs.index()])(lhs.memory, rhs.memory);
     }
 
+#if defined(__GNUC__) && (__GNUC__ == 11 || __GNUC__ == 12)
+#pragma GCC diagnostic pop
+#endif
+
     template<typename... Us> bool operator!=(const variant<Us...> &lhs,
                                              const variant<Us...> &rhs)
     {
diff --git a/3rdParty/opencv2/gapi/video.hpp b/3rdParty/opencv-4.12.0/opencv2/gapi/video.hpp
similarity index 100%
rename from 3rdParty/opencv2/gapi/video.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/gapi/video.hpp
diff --git a/3rdParty/opencv2/highgui.hpp b/3rdParty/opencv-4.12.0/opencv2/highgui.hpp
similarity index 86%
rename from 3rdParty/opencv2/highgui.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/highgui.hpp
index 0154df4ade..81437f4ef1 100644
--- a/3rdParty/opencv2/highgui.hpp
+++ b/3rdParty/opencv-4.12.0/opencv2/highgui.hpp
@@ -85,50 +85,8 @@ It provides easy interface to:
         created. Then, a new button is attached to it.
 
     See below the example used to generate the figure:
-    @code
-        int main(int argc, char *argv[])
-        {
-
-            int value = 50;
-            int value2 = 0;
-
-
-            namedWindow("main1",WINDOW_NORMAL);
-            namedWindow("main2",WINDOW_AUTOSIZE | WINDOW_GUI_NORMAL);
-            createTrackbar( "track1", "main1", &value, 255,  NULL);
-
-            String nameb1 = "button1";
-            String nameb2 = "button2";
-
-            createButton(nameb1,callbackButton,&nameb1,QT_CHECKBOX,1);
-            createButton(nameb2,callbackButton,NULL,QT_CHECKBOX,0);
-            createTrackbar( "track2", NULL, &value2, 255, NULL);
-            createButton("button5",callbackButton1,NULL,QT_RADIOBOX,0);
-            createButton("button6",callbackButton2,NULL,QT_RADIOBOX,1);
-
-            setMouseCallback( "main2",on_mouse,NULL );
-
-            Mat img1 = imread("files/flower.jpg");
-            VideoCapture video;
-            video.open("files/hockey.avi");
-
-            Mat img2,img3;
-
-            while( waitKey(33) != 27 )
-            {
-                img1.convertTo(img2,-1,1,value);
-                video >> img3;
-
-                imshow("main1",img2);
-                imshow("main2",img3);
-            }
-
-            destroyAllWindows();
-
-            return 0;
-        }
-    @endcode
 
+    @include highgui_qt.cpp
 
     @defgroup highgui_winrt WinRT support
 
@@ -139,36 +97,34 @@ It provides easy interface to:
 
     See below the example used to generate the figure:
     @code
-        void sample_app::MainPage::ShowWindow()
+    void sample_app::MainPage::ShowWindow()
+    {
+        static cv::String windowName("sample");
+        cv::winrt_initContainer(this->cvContainer);
+        cv::namedWindow(windowName); // not required
+
+        cv::Mat image = cv::imread("Assets/sample.jpg");
+        cv::Mat converted = cv::Mat(image.rows, image.cols, CV_8UC4);
+        cv::cvtColor(image, converted, COLOR_BGR2BGRA);
+        cv::imshow(windowName, converted); // this will create window if it hasn't been created before
+
+        int state = 42;
+        cv::TrackbarCallback callback = [](int pos, void* userdata)
         {
-            static cv::String windowName("sample");
-            cv::winrt_initContainer(this->cvContainer);
-            cv::namedWindow(windowName); // not required
-
-            cv::Mat image = cv::imread("Assets/sample.jpg");
-            cv::Mat converted = cv::Mat(image.rows, image.cols, CV_8UC4);
-            cv::cvtColor(image, converted, COLOR_BGR2BGRA);
-            cv::imshow(windowName, converted); // this will create window if it hasn't been created before
-
-            int state = 42;
-            cv::TrackbarCallback callback = [](int pos, void* userdata)
-            {
-                if (pos == 0) {
-                    cv::destroyWindow(windowName);
-                }
-            };
-            cv::TrackbarCallback callbackTwin = [](int pos, void* userdata)
-            {
-                if (pos >= 70) {
-                    cv::destroyAllWindows();
-                }
-            };
-            cv::createTrackbar("Sample trackbar", windowName, &state, 100, callback);
-            cv::createTrackbar("Twin brother", windowName, &state, 100, callbackTwin);
-        }
+            if (pos == 0) {
+                cv::destroyWindow(windowName);
+            }
+        };
+        cv::TrackbarCallback callbackTwin = [](int pos, void* userdata)
+        {
+            if (pos >= 70) {
+                cv::destroyAllWindows();
+            }
+        };
+        cv::createTrackbar("Sample trackbar", windowName, &state, 100, callback);
+        cv::createTrackbar("Twin brother", windowName, &state, 100, callbackTwin);
+    }
     @endcode
-
-    @defgroup highgui_c C API
 @}
 */
 
@@ -300,9 +256,7 @@ You can call cv::destroyWindow or cv::destroyAllWindows to close the window and
 memory usage. For a simple program, you do not really have to call these functions because all the
 resources and windows of the application are closed automatically by the operating system upon exit.
 
-@note
-
-Qt backend supports additional flags:
+@note Qt backend supports additional flags:
  -   **WINDOW_NORMAL or WINDOW_AUTOSIZE:** WINDOW_NORMAL enables you to resize the
      window, whereas WINDOW_AUTOSIZE adjusts automatically the window size to fit the
      displayed image (see imshow ), and you cannot change the window size manually.
@@ -331,13 +285,20 @@ The function destroyAllWindows destroys all of the opened HighGUI windows.
  */
 CV_EXPORTS_W void destroyAllWindows();
 
+
+/** @brief HighGUI backend used.
+
+The function returns HighGUI backend name used: could be COCOA, GTK2/3, QT, WAYLAND or WIN32.
+Returns empty string if there is no available UI backend.
+ */
+CV_EXPORTS_W const std::string currentUIFramework();
+
+
 CV_EXPORTS_W int startWindowThread();
 
 /** @brief Similar to #waitKey, but returns full key code.
 
-@note
-
-Key code is implementation specific and depends on used backend: QT/GTK/Win32/etc
+@note Key code is implementation specific and depends on used backend: QT/GTK/Win32/etc
 
 */
 CV_EXPORTS_W int waitKeyEx(int delay = 0);
@@ -404,11 +365,12 @@ For example, **waitKey(0)** will display the window infinitely until any keypres
 for image display). **waitKey(25)** will display a frame and wait approximately 25 ms for a key
 press (suitable for displaying a video frame-by-frame). To remove the window, use cv::destroyWindow.
 
-@note
-
-[__Windows Backend Only__] Pressing Ctrl+C will copy the image to the clipboard.
-
-[__Windows Backend Only__] Pressing Ctrl+S will show a dialog to save the image.
+@note [__Windows Backend Only__] Pressing Ctrl+C will copy the image to the clipboard. Pressing Ctrl+S will show a dialog to save the image.
+@note [__Wayland Backend Only__] Supoorting format is extended.
+-   If the image is 8-bit signed, the pixels are biased by 128. That is, the
+    value range [-128,127] is mapped to [0,255].
+-   If the image is 16-bit signed, the pixels are divided by 256 and biased by 128. That is, the
+    value range [-32768,32767] is mapped to [0,255].
 
 @param winname Name of the window.
 @param mat Image to be shown.
@@ -417,10 +379,8 @@ CV_EXPORTS_W void imshow(const String& winname, InputArray mat);
 
 /** @brief Resizes the window to the specified size
 
-@note
-
--   The specified window size is for the image area. Toolbars are not counted.
--   Only windows created without cv::WINDOW_AUTOSIZE flag can be resized.
+@note The specified window size is for the image area. Toolbars are not counted.
+Only windows created without cv::WINDOW_AUTOSIZE flag can be resized.
 
 @param winname Window name.
 @param width The new window width.
@@ -439,6 +399,8 @@ CV_EXPORTS_W void resizeWindow(const String& winname, const cv::Size& size);
 @param winname Name of the window.
 @param x The new x-coordinate of the window.
 @param y The new y-coordinate of the window.
+
+@note [__Wayland Backend Only__] This function is not supported by the Wayland protocol limitation.
  */
 CV_EXPORTS_W void moveWindow(const String& winname, int x, int y);
 
@@ -449,6 +411,8 @@ The function setWindowProperty enables changing properties of a window.
 @param winname Name of the window.
 @param prop_id Window property to edit. The supported operation flags are: (cv::WindowPropertyFlags)
 @param prop_value New value of the window property. The supported flags are: (cv::WindowFlags)
+
+@note [__Wayland Backend Only__] This function is not supported.
  */
 CV_EXPORTS_W void setWindowProperty(const String& winname, int prop_id, double prop_value);
 
@@ -466,6 +430,8 @@ The function getWindowProperty returns properties of a window.
 @param prop_id Window property to retrieve. The following operation flags are available: (cv::WindowPropertyFlags)
 
 @sa setWindowProperty
+
+@note [__Wayland Backend Only__] This function is not supported.
  */
 CV_EXPORTS_W double getWindowProperty(const String& winname, int prop_id);
 
@@ -476,6 +442,8 @@ The function getWindowImageRect returns the client screen coordinates, width and
 @param winname Name of the window.
 
 @sa resizeWindow moveWindow
+
+@note [__Wayland Backend Only__] This function is not supported by the Wayland protocol limitation.
  */
 CV_EXPORTS_W Rect getWindowImageRect(const String& winname);
 
@@ -502,9 +470,7 @@ For cv::EVENT_MOUSEWHEEL positive and negative values mean forward and backward
 respectively. For cv::EVENT_MOUSEHWHEEL, where available, positive and negative values mean right and
 left scrolling, respectively.
 
-@note
-
-Mouse-wheel events are currently supported only on Windows.
+@note Mouse-wheel events are currently supported only on Windows and Cocoa.
 
 @param flags The mouse callback flags parameter.
  */
@@ -520,16 +486,17 @@ Controls: use `space` or `enter` to finish selection, use key `c` to cancel sele
 @param showCrosshair if true crosshair of selection rectangle will be shown.
 @param fromCenter if true center of selection will match initial mouse position. In opposite case a corner of
 selection rectangle will correspont to the initial mouse position.
+@param printNotice if true a notice to select ROI or cancel selection will be printed in console.
 @return selected ROI or empty rect if selection canceled.
 
 @note The function sets it's own mouse callback for specified window using cv::setMouseCallback(windowName, ...).
 After finish of work an empty callback will be set for the used window.
  */
-CV_EXPORTS_W Rect selectROI(const String& windowName, InputArray img, bool showCrosshair = true, bool fromCenter = false);
+CV_EXPORTS_W Rect selectROI(const String& windowName, InputArray img, bool showCrosshair = true, bool fromCenter = false, bool printNotice = true);
 
 /** @overload
  */
-CV_EXPORTS_W Rect selectROI(InputArray img, bool showCrosshair = true, bool fromCenter = false);
+CV_EXPORTS_W Rect selectROI(InputArray img, bool showCrosshair = true, bool fromCenter = false, bool printNotice = true);
 
 /** @brief Allows users to select multiple ROIs on the given image.
 
@@ -543,12 +510,13 @@ use `esc` to terminate multiple ROI selection process.
 @param showCrosshair if true crosshair of selection rectangle will be shown.
 @param fromCenter if true center of selection will match initial mouse position. In opposite case a corner of
 selection rectangle will correspont to the initial mouse position.
+@param printNotice if true a notice to select ROI or cancel selection will be printed in console.
 
 @note The function sets it's own mouse callback for specified window using cv::setMouseCallback(windowName, ...).
 After finish of work an empty callback will be set for the used window.
  */
 CV_EXPORTS_W void selectROIs(const String& windowName, InputArray img,
-                             CV_OUT std::vector<Rect>& boundingBoxes, bool showCrosshair = true, bool fromCenter = false);
+                             CV_OUT std::vector<Rect>& boundingBoxes, bool showCrosshair = true, bool fromCenter = false, bool printNotice = true);
 
 /** @brief Creates a trackbar and attaches it to the specified window.
 
@@ -557,24 +525,26 @@ and range, assigns a variable value to be a position synchronized with the track
 the callback function onChange to be called on the trackbar position change. The created trackbar is
 displayed in the specified window winname.
 
-@note
-
-[__Qt Backend Only__] winname can be empty if the trackbar should be attached to the
+@note [__Qt Backend Only__] winname can be empty if the trackbar should be attached to the
 control panel.
 
 Clicking the label of each trackbar enables editing the trackbar values manually.
 
 @param trackbarname Name of the created trackbar.
-@param winname Name of the window that will be used as a parent of the created trackbar.
-@param value Optional pointer to an integer variable whose value reflects the position of the
-slider. Upon creation, the slider position is defined by this variable.
-@param count Maximal position of the slider. The minimal position is always 0.
-@param onChange Pointer to the function to be called every time the slider changes position. This
-function should be prototyped as void Foo(int,void\*); , where the first parameter is the trackbar
-position and the second parameter is the user data (see the next parameter). If the callback is
-the NULL pointer, no callbacks are called, but only value is updated.
-@param userdata User data that is passed as is to the callback. It can be used to handle trackbar
-events without using global variables.
+@param winname Name of the window that will contain the trackbar.
+@param value Pointer to the integer value that will be changed by the trackbar.
+Pass `nullptr` if the value pointer is not used. In this case, manually handle
+the trackbar position in the callback function.
+@param count Maximum position of the trackbar.
+@param onChange Pointer to the function to be called every time the slider changes position.
+This function should have the prototype void Foo(int, void\*);, where the first parameter is
+the trackbar position, and the second parameter is the user data (see the next parameter).
+If the callback is a nullptr, no callbacks are called, but the trackbar's value will still be
+updated automatically.
+@param userdata Optional user data that is passed to the callback.
+@note If the `value` pointer is `nullptr`, the trackbar position must be manually managed.
+Call the callback function manually with the desired initial value to avoid runtime warnings.
+@see \ref tutorial_trackbar
  */
 CV_EXPORTS int createTrackbar(const String& trackbarname, const String& winname,
                               int* value, int count,
@@ -585,9 +555,7 @@ CV_EXPORTS int createTrackbar(const String& trackbarname, const String& winname,
 
 The function returns the current position of the specified trackbar.
 
-@note
-
-[__Qt Backend Only__] winname can be empty if the trackbar is attached to the control
+@note [__Qt Backend Only__] winname can be empty if the trackbar is attached to the control
 panel.
 
 @param trackbarname Name of the trackbar.
@@ -599,9 +567,7 @@ CV_EXPORTS_W int getTrackbarPos(const String& trackbarname, const String& winnam
 
 The function sets the position of the specified trackbar in the specified window.
 
-@note
-
-[__Qt Backend Only__] winname can be empty if the trackbar is attached to the control
+@note [__Qt Backend Only__] winname can be empty if the trackbar is attached to the control
 panel.
 
 @param trackbarname Name of the trackbar.
@@ -614,9 +580,7 @@ CV_EXPORTS_W void setTrackbarPos(const String& trackbarname, const String& winna
 
 The function sets the maximum position of the specified trackbar in the specified window.
 
-@note
-
-[__Qt Backend Only__] winname can be empty if the trackbar is attached to the control
+@note [__Qt Backend Only__] winname can be empty if the trackbar is attached to the control
 panel.
 
 @param trackbarname Name of the trackbar.
@@ -629,9 +593,7 @@ CV_EXPORTS_W void setTrackbarMax(const String& trackbarname, const String& winna
 
 The function sets the minimum position of the specified trackbar in the specified window.
 
-@note
-
-[__Qt Backend Only__] winname can be empty if the trackbar is attached to the control
+@note [__Qt Backend Only__] winname can be empty if the trackbar is attached to the control
 panel.
 
 @param trackbarname Name of the trackbar.
diff --git a/3rdParty/opencv2/highgui/highgui.hpp b/3rdParty/opencv-4.12.0/opencv2/highgui/highgui.hpp
similarity index 100%
rename from 3rdParty/opencv2/highgui/highgui.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/highgui/highgui.hpp
diff --git a/3rdParty/opencv2/highgui/highgui_c.h b/3rdParty/opencv-4.12.0/opencv2/highgui/highgui_c.h
similarity index 100%
rename from 3rdParty/opencv2/highgui/highgui_c.h
rename to 3rdParty/opencv-4.12.0/opencv2/highgui/highgui_c.h
diff --git a/3rdParty/opencv-4.12.0/opencv2/imgcodecs.hpp b/3rdParty/opencv-4.12.0/opencv2/imgcodecs.hpp
new file mode 100644
index 0000000000..36cda34bcf
--- /dev/null
+++ b/3rdParty/opencv-4.12.0/opencv2/imgcodecs.hpp
@@ -0,0 +1,734 @@
+/*M///////////////////////////////////////////////////////////////////////////////////////
+//
+//  IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
+//
+//  By downloading, copying, installing or using the software you agree to this license.
+//  If you do not agree to this license, do not download, install,
+//  copy or use the software.
+//
+//
+//                          License Agreement
+//                For Open Source Computer Vision Library
+//
+// Copyright (C) 2000-2008, Intel Corporation, all rights reserved.
+// Copyright (C) 2009, Willow Garage Inc., all rights reserved.
+// Third party copyrights are property of their respective owners.
+//
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
+//
+//   * Redistribution's of source code must retain the above copyright notice,
+//     this list of conditions and the following disclaimer.
+//
+//   * Redistribution's in binary form must reproduce the above copyright notice,
+//     this list of conditions and the following disclaimer in the documentation
+//     and/or other materials provided with the distribution.
+//
+//   * The name of the copyright holders may not be used to endorse or promote products
+//     derived from this software without specific prior written permission.
+//
+// This software is provided by the copyright holders and contributors "as is" and
+// any express or implied warranties, including, but not limited to, the implied
+// warranties of merchantability and fitness for a particular purpose are disclaimed.
+// In no event shall the Intel Corporation or contributors be liable for any direct,
+// indirect, incidental, special, exemplary, or consequential damages
+// (including, but not limited to, procurement of substitute goods or services;
+// loss of use, data, or profits; or business interruption) however caused
+// and on any theory of liability, whether in contract, strict liability,
+// or tort (including negligence or otherwise) arising in any way out of
+// the use of this software, even if advised of the possibility of such damage.
+//
+//M*/
+
+#ifndef OPENCV_IMGCODECS_HPP
+#define OPENCV_IMGCODECS_HPP
+
+#include "opencv2/core.hpp"
+
+/**
+  @defgroup imgcodecs Image file reading and writing
+  @{
+    @defgroup imgcodecs_flags Flags used for image file reading and writing
+    @defgroup imgcodecs_ios iOS glue
+    @defgroup imgcodecs_macosx MacOS(OSX) glue
+  @}
+*/
+
+//////////////////////////////// image codec ////////////////////////////////
+namespace cv
+{
+
+//! @addtogroup imgcodecs
+//! @{
+
+//! @addtogroup imgcodecs_flags
+//! @{
+
+//! Imread flags
+//! @note IMREAD_COLOR_BGR (IMREAD_COLOR) and IMREAD_COLOR_RGB can not be set at the same time.
+enum ImreadModes {
+       IMREAD_UNCHANGED            = -1, //!< If set, return the loaded image as is (with alpha channel, otherwise it gets cropped). Ignore EXIF orientation.
+       IMREAD_GRAYSCALE            = 0,  //!< If set, always convert image to the single channel grayscale image (codec internal conversion).
+       IMREAD_COLOR_BGR            = 1,  //!< If set, always convert image to the 3 channel BGR color image.
+       IMREAD_COLOR                = 1,  //!< Same as IMREAD_COLOR_BGR.
+       IMREAD_ANYDEPTH             = 2,  //!< If set, return 16-bit/32-bit image when the input has the corresponding depth, otherwise convert it to 8-bit.
+       IMREAD_ANYCOLOR             = 4,  //!< If set, the image is read in any possible color format.
+       IMREAD_LOAD_GDAL            = 8,  //!< If set, use the gdal driver for loading the image.
+       IMREAD_REDUCED_GRAYSCALE_2  = 16, //!< If set, always convert image to the single channel grayscale image and the image size reduced 1/2.
+       IMREAD_REDUCED_COLOR_2      = 17, //!< If set, always convert image to the 3 channel BGR color image and the image size reduced 1/2.
+       IMREAD_REDUCED_GRAYSCALE_4  = 32, //!< If set, always convert image to the single channel grayscale image and the image size reduced 1/4.
+       IMREAD_REDUCED_COLOR_4      = 33, //!< If set, always convert image to the 3 channel BGR color image and the image size reduced 1/4.
+       IMREAD_REDUCED_GRAYSCALE_8  = 64, //!< If set, always convert image to the single channel grayscale image and the image size reduced 1/8.
+       IMREAD_REDUCED_COLOR_8      = 65, //!< If set, always convert image to the 3 channel BGR color image and the image size reduced 1/8.
+       IMREAD_IGNORE_ORIENTATION   = 128, //!< If set, do not rotate the image according to EXIF's orientation flag.
+       IMREAD_COLOR_RGB            = 256, //!< If set, always convert image to the 3 channel RGB color image.
+     };
+
+//! Imwrite flags
+enum ImwriteFlags {
+       IMWRITE_JPEG_QUALITY        = 1,  //!< For JPEG, it can be a quality from 0 to 100 (the higher is the better). Default value is 95.
+       IMWRITE_JPEG_PROGRESSIVE    = 2,  //!< Enable JPEG features, 0 or 1, default is False.
+       IMWRITE_JPEG_OPTIMIZE       = 3,  //!< Enable JPEG features, 0 or 1, default is False.
+       IMWRITE_JPEG_RST_INTERVAL   = 4,  //!< JPEG restart interval, 0 - 65535, default is 0 - no restart.
+       IMWRITE_JPEG_LUMA_QUALITY   = 5,  //!< Separate luma quality level, 0 - 100, default is -1 - don't use. If JPEG_LIB_VERSION < 70, Not supported.
+       IMWRITE_JPEG_CHROMA_QUALITY = 6,  //!< Separate chroma quality level, 0 - 100, default is -1 - don't use. If JPEG_LIB_VERSION < 70, Not supported.
+       IMWRITE_JPEG_SAMPLING_FACTOR = 7, //!< For JPEG, set sampling factor. See cv::ImwriteJPEGSamplingFactorParams.
+       IMWRITE_PNG_COMPRESSION     = 16, //!< For PNG, it can be the compression level from 0 to 9. A higher value means a smaller size and longer compression time. If specified, strategy is changed to IMWRITE_PNG_STRATEGY_DEFAULT (Z_DEFAULT_STRATEGY). Default value is 1 (best speed setting).
+       IMWRITE_PNG_STRATEGY        = 17, //!< One of cv::ImwritePNGFlags, default is IMWRITE_PNG_STRATEGY_RLE.
+       IMWRITE_PNG_BILEVEL         = 18, //!< Binary level PNG, 0 or 1, default is 0.
+       IMWRITE_PNG_FILTER          = 19, //!< One of cv::ImwritePNGFilterFlags, default is IMWRITE_PNG_FILTER_SUB.
+       IMWRITE_PXM_BINARY          = 32, //!< For PPM, PGM, or PBM, it can be a binary format flag, 0 or 1. Default value is 1.
+       IMWRITE_EXR_TYPE            = (3 << 4) + 0 /* 48 */, //!< override EXR storage type (FLOAT (FP32) is default)
+       IMWRITE_EXR_COMPRESSION     = (3 << 4) + 1 /* 49 */, //!< override EXR compression type (ZIP_COMPRESSION = 3 is default)
+       IMWRITE_EXR_DWA_COMPRESSION_LEVEL = (3 << 4) + 2 /* 50 */, //!< override EXR DWA compression level (45 is default)
+       IMWRITE_WEBP_QUALITY        = 64, //!< For WEBP, it can be a quality from 1 to 100 (the higher is the better). By default (without any parameter) and for quality above 100 the lossless compression is used.
+       IMWRITE_HDR_COMPRESSION     = (5 << 4) + 0 /* 80 */, //!< specify HDR compression
+       IMWRITE_PAM_TUPLETYPE       = 128,//!< For PAM, sets the TUPLETYPE field to the corresponding string value that is defined for the format
+       IMWRITE_TIFF_RESUNIT        = 256,//!< For TIFF, use to specify which DPI resolution unit to set; see libtiff documentation for valid values
+       IMWRITE_TIFF_XDPI           = 257,//!< For TIFF, use to specify the X direction DPI
+       IMWRITE_TIFF_YDPI           = 258,//!< For TIFF, use to specify the Y direction DPI
+       IMWRITE_TIFF_COMPRESSION    = 259,//!< For TIFF, use to specify the image compression scheme. See cv::ImwriteTiffCompressionFlags. Note, for images whose depth is CV_32F, only libtiff's SGILOG compression scheme is used. For other supported depths, the compression scheme can be specified by this flag; LZW compression is the default.
+       IMWRITE_TIFF_ROWSPERSTRIP   = 278,//!< For TIFF, use to specify the number of rows per strip.
+       IMWRITE_TIFF_PREDICTOR      = 317,//!< For TIFF, use to specify predictor. See cv::ImwriteTiffPredictorFlags.
+       IMWRITE_JPEG2000_COMPRESSION_X1000 = 272,//!< For JPEG2000, use to specify the target compression rate (multiplied by 1000). The value can be from 0 to 1000. Default is 1000.
+       IMWRITE_AVIF_QUALITY        = 512,//!< For AVIF, it can be a quality between 0 and 100 (the higher the better). Default is 95.
+       IMWRITE_AVIF_DEPTH          = 513,//!< For AVIF, it can be 8, 10 or 12. If >8, it is stored/read as CV_32F. Default is 8.
+       IMWRITE_AVIF_SPEED          = 514,//!< For AVIF, it is between 0 (slowest) and (fastest). Default is 9.
+       IMWRITE_JPEGXL_QUALITY      = 640,//!< For JPEG XL, it can be a quality from 0 to 100 (the higher is the better). Default value is 95. If set, distance parameter is re-calicurated from quality level automatically. This parameter request libjxl v0.10 or later.
+       IMWRITE_JPEGXL_EFFORT       = 641,//!< For JPEG XL, encoder effort/speed level without affecting decoding speed; it is between 1 (fastest) and 10 (slowest). Default is 7.
+       IMWRITE_JPEGXL_DISTANCE     = 642,//!< For JPEG XL, distance level for lossy compression: target max butteraugli distance, lower = higher quality, 0 = lossless; range: 0 .. 25. Default is 1.
+       IMWRITE_JPEGXL_DECODING_SPEED = 643,//!< For JPEG XL, decoding speed tier for the provided options; minimum is 0 (slowest to decode, best quality/density), and maximum is 4 (fastest to decode, at the cost of some quality/density). Default is 0.
+       IMWRITE_GIF_LOOP            = 1024, //!< Not functional since 4.12.0. Replaced by cv::Animation::loop_count.
+       IMWRITE_GIF_SPEED           = 1025, //!< Not functional since 4.12.0. Replaced by cv::Animation::durations.
+       IMWRITE_GIF_QUALITY         = 1026, //!< For GIF, it can be a quality from 1 to 8. Default is 2. See cv::ImwriteGifCompressionFlags.
+       IMWRITE_GIF_DITHER          = 1027, //!< For GIF, it can be a quality from -1(most dither) to 3(no dither). Default is 0.
+       IMWRITE_GIF_TRANSPARENCY    = 1028, //!< For GIF, the alpha channel lower than this will be set to transparent. Default is 1.
+       IMWRITE_GIF_COLORTABLE      = 1029  //!< For GIF, 0 means global color table is used, 1 means local color table is used. Default is 0.
+};
+
+enum ImwriteJPEGSamplingFactorParams {
+       IMWRITE_JPEG_SAMPLING_FACTOR_411 = 0x411111, //!< 4x1,1x1,1x1
+       IMWRITE_JPEG_SAMPLING_FACTOR_420 = 0x221111, //!< 2x2,1x1,1x1(Default)
+       IMWRITE_JPEG_SAMPLING_FACTOR_422 = 0x211111, //!< 2x1,1x1,1x1
+       IMWRITE_JPEG_SAMPLING_FACTOR_440 = 0x121111, //!< 1x2,1x1,1x1
+       IMWRITE_JPEG_SAMPLING_FACTOR_444 = 0x111111  //!< 1x1,1x1,1x1(No subsampling)
+     };
+
+enum ImwriteTiffCompressionFlags {
+        IMWRITE_TIFF_COMPRESSION_NONE = 1,            //!< dump mode
+        IMWRITE_TIFF_COMPRESSION_CCITTRLE = 2,        //!< CCITT modified Huffman RLE
+        IMWRITE_TIFF_COMPRESSION_CCITTFAX3 = 3,       //!< CCITT Group 3 fax encoding
+        IMWRITE_TIFF_COMPRESSION_CCITT_T4 = 3,        //!< CCITT T.4 (TIFF 6 name)
+        IMWRITE_TIFF_COMPRESSION_CCITTFAX4 = 4,       //!< CCITT Group 4 fax encoding
+        IMWRITE_TIFF_COMPRESSION_CCITT_T6 = 4,        //!< CCITT T.6 (TIFF 6 name)
+        IMWRITE_TIFF_COMPRESSION_LZW = 5,             //!< Lempel-Ziv  & Welch
+        IMWRITE_TIFF_COMPRESSION_OJPEG = 6,           //!< !6.0 JPEG
+        IMWRITE_TIFF_COMPRESSION_JPEG = 7,            //!< %JPEG DCT compression
+        IMWRITE_TIFF_COMPRESSION_T85 = 9,             //!< !TIFF/FX T.85 JBIG compression
+        IMWRITE_TIFF_COMPRESSION_T43 = 10,            //!< !TIFF/FX T.43 colour by layered JBIG compression
+        IMWRITE_TIFF_COMPRESSION_NEXT = 32766,        //!< NeXT 2-bit RLE
+        IMWRITE_TIFF_COMPRESSION_CCITTRLEW = 32771,   //!< #1 w/ word alignment
+        IMWRITE_TIFF_COMPRESSION_PACKBITS = 32773,    //!< Macintosh RLE
+        IMWRITE_TIFF_COMPRESSION_THUNDERSCAN = 32809, //!< ThunderScan RLE
+        IMWRITE_TIFF_COMPRESSION_IT8CTPAD = 32895,    //!< IT8 CT w/padding
+        IMWRITE_TIFF_COMPRESSION_IT8LW = 32896,       //!< IT8 Linework RLE
+        IMWRITE_TIFF_COMPRESSION_IT8MP = 32897,       //!< IT8 Monochrome picture
+        IMWRITE_TIFF_COMPRESSION_IT8BL = 32898,       //!< IT8 Binary line art
+        IMWRITE_TIFF_COMPRESSION_PIXARFILM = 32908,   //!< Pixar companded 10bit LZW
+        IMWRITE_TIFF_COMPRESSION_PIXARLOG = 32909,    //!< Pixar companded 11bit ZIP
+        IMWRITE_TIFF_COMPRESSION_DEFLATE = 32946,     //!< Deflate compression, legacy tag
+        IMWRITE_TIFF_COMPRESSION_ADOBE_DEFLATE = 8,   //!< Deflate compression, as recognized by Adobe
+        IMWRITE_TIFF_COMPRESSION_DCS = 32947,         //!< Kodak DCS encoding
+        IMWRITE_TIFF_COMPRESSION_JBIG = 34661,        //!< ISO JBIG
+        IMWRITE_TIFF_COMPRESSION_SGILOG = 34676,      //!< SGI Log Luminance RLE
+        IMWRITE_TIFF_COMPRESSION_SGILOG24 = 34677,    //!< SGI Log 24-bit packed
+        IMWRITE_TIFF_COMPRESSION_JP2000 = 34712,      //!< Leadtools JPEG2000
+        IMWRITE_TIFF_COMPRESSION_LERC = 34887,        //!< ESRI Lerc codec: https://github.com/Esri/lerc
+        IMWRITE_TIFF_COMPRESSION_LZMA = 34925,        //!< LZMA2
+        IMWRITE_TIFF_COMPRESSION_ZSTD = 50000,        //!< ZSTD: WARNING not registered in Adobe-maintained registry
+        IMWRITE_TIFF_COMPRESSION_WEBP = 50001,        //!< WEBP: WARNING not registered in Adobe-maintained registry
+        IMWRITE_TIFF_COMPRESSION_JXL = 50002          //!< JPEGXL: WARNING not registered in Adobe-maintained registry
+};
+
+enum ImwriteTiffPredictorFlags {
+        IMWRITE_TIFF_PREDICTOR_NONE = 1,              //!< no prediction scheme used
+        IMWRITE_TIFF_PREDICTOR_HORIZONTAL = 2,        //!< horizontal differencing
+        IMWRITE_TIFF_PREDICTOR_FLOATINGPOINT = 3      //!< floating point predictor
+
+};
+
+enum ImwriteEXRTypeFlags {
+       /*IMWRITE_EXR_TYPE_UNIT = 0, //!< not supported */
+       IMWRITE_EXR_TYPE_HALF   = 1, //!< store as HALF (FP16)
+       IMWRITE_EXR_TYPE_FLOAT  = 2  //!< store as FP32 (default)
+     };
+
+enum ImwriteEXRCompressionFlags {
+       IMWRITE_EXR_COMPRESSION_NO    = 0, //!< no compression
+       IMWRITE_EXR_COMPRESSION_RLE   = 1, //!< run length encoding
+       IMWRITE_EXR_COMPRESSION_ZIPS  = 2, //!< zlib compression, one scan line at a time
+       IMWRITE_EXR_COMPRESSION_ZIP   = 3, //!< zlib compression, in blocks of 16 scan lines
+       IMWRITE_EXR_COMPRESSION_PIZ   = 4, //!< piz-based wavelet compression
+       IMWRITE_EXR_COMPRESSION_PXR24 = 5, //!< lossy 24-bit float compression
+       IMWRITE_EXR_COMPRESSION_B44   = 6, //!< lossy 4-by-4 pixel block compression, fixed compression rate
+       IMWRITE_EXR_COMPRESSION_B44A  = 7, //!< lossy 4-by-4 pixel block compression, flat fields are compressed more
+       IMWRITE_EXR_COMPRESSION_DWAA  = 8, //!< lossy DCT based compression, in blocks of 32 scanlines. More efficient for partial buffer access. Supported since OpenEXR 2.2.0.
+       IMWRITE_EXR_COMPRESSION_DWAB  = 9, //!< lossy DCT based compression, in blocks of 256 scanlines. More efficient space wise and faster to decode full frames than DWAA_COMPRESSION. Supported since OpenEXR 2.2.0.
+     };
+
+//! Imwrite PNG specific flags used to tune the compression algorithm.
+/** These flags will be modify the way of PNG image compression and will be passed to the underlying zlib processing stage.
+
+-   The effect of IMWRITE_PNG_STRATEGY_FILTERED is to force more Huffman coding and less string matching; it is somewhat intermediate between IMWRITE_PNG_STRATEGY_DEFAULT and IMWRITE_PNG_STRATEGY_HUFFMAN_ONLY.
+-   IMWRITE_PNG_STRATEGY_RLE is designed to be almost as fast as IMWRITE_PNG_STRATEGY_HUFFMAN_ONLY, but give better compression for PNG image data.
+-   The strategy parameter only affects the compression ratio but not the correctness of the compressed output even if it is not set appropriately.
+-   IMWRITE_PNG_STRATEGY_FIXED prevents the use of dynamic Huffman codes, allowing for a simpler decoder for special applications.
+*/
+enum ImwritePNGFlags {
+       IMWRITE_PNG_STRATEGY_DEFAULT      = 0, //!< Use this value for normal data.
+       IMWRITE_PNG_STRATEGY_FILTERED     = 1, //!< Use this value for data produced by a filter (or predictor).Filtered data consists mostly of small values with a somewhat random distribution. In this case, the compression algorithm is tuned to compress them better.
+       IMWRITE_PNG_STRATEGY_HUFFMAN_ONLY = 2, //!< Use this value to force Huffman encoding only (no string match).
+       IMWRITE_PNG_STRATEGY_RLE          = 3, //!< Use this value to limit match distances to one (run-length encoding).
+       IMWRITE_PNG_STRATEGY_FIXED        = 4  //!< Using this value prevents the use of dynamic Huffman codes, allowing for a simpler decoder for special applications.
+     };
+
+//! Imwrite PNG specific values for IMWRITE_PNG_FILTER parameter key
+enum ImwritePNGFilterFlags {
+       IMWRITE_PNG_FILTER_NONE           = 8,   //!< Applies no filter to the PNG image (useful when you want to save the raw pixel data without any compression filter).
+       IMWRITE_PNG_FILTER_SUB            = 16,  //!< Applies the "sub" filter, which calculates the difference between the current byte and the previous byte in the row.
+       IMWRITE_PNG_FILTER_UP             = 32,  //!< applies the "up" filter, which calculates the difference between the current byte and the corresponding byte directly above it.
+       IMWRITE_PNG_FILTER_AVG            = 64,  //!< applies the "average" filter, which calculates the average of the byte to the left and the byte above.
+       IMWRITE_PNG_FILTER_PAETH          = 128, //!< applies the "Paeth" filter, a more complex filter that predicts the next pixel value based on neighboring pixels.
+       IMWRITE_PNG_FAST_FILTERS          = (IMWRITE_PNG_FILTER_NONE | IMWRITE_PNG_FILTER_SUB | IMWRITE_PNG_FILTER_UP), //!< This is a combination of IMWRITE_PNG_FILTER_NONE, IMWRITE_PNG_FILTER_SUB, and IMWRITE_PNG_FILTER_UP, typically used for faster compression.
+       IMWRITE_PNG_ALL_FILTERS           = (IMWRITE_PNG_FAST_FILTERS | IMWRITE_PNG_FILTER_AVG | IMWRITE_PNG_FILTER_PAETH) //!< This combines all available filters (NONE, SUB, UP, AVG, and PAETH), which will attempt to apply all of them for the best possible compression.
+     };
+
+//! Imwrite PAM specific tupletype flags used to define the 'TUPLETYPE' field of a PAM file.
+enum ImwritePAMFlags {
+       IMWRITE_PAM_FORMAT_NULL            = 0,
+       IMWRITE_PAM_FORMAT_BLACKANDWHITE   = 1,
+       IMWRITE_PAM_FORMAT_GRAYSCALE       = 2,
+       IMWRITE_PAM_FORMAT_GRAYSCALE_ALPHA = 3,
+       IMWRITE_PAM_FORMAT_RGB             = 4,
+       IMWRITE_PAM_FORMAT_RGB_ALPHA       = 5
+     };
+
+//! Imwrite HDR specific values for IMWRITE_HDR_COMPRESSION parameter key
+enum ImwriteHDRCompressionFlags {
+    IMWRITE_HDR_COMPRESSION_NONE = 0,
+    IMWRITE_HDR_COMPRESSION_RLE = 1
+};
+
+//! Imwrite GIF specific values for IMWRITE_GIF_QUALITY parameter key, if larger than 3, then its related to the size of the color table.
+enum ImwriteGIFCompressionFlags {
+    IMWRITE_GIF_FAST_NO_DITHER       = 1,
+    IMWRITE_GIF_FAST_FLOYD_DITHER    = 2,
+    IMWRITE_GIF_COLORTABLE_SIZE_8    = 3,
+    IMWRITE_GIF_COLORTABLE_SIZE_16   = 4,
+    IMWRITE_GIF_COLORTABLE_SIZE_32   = 5,
+    IMWRITE_GIF_COLORTABLE_SIZE_64   = 6,
+    IMWRITE_GIF_COLORTABLE_SIZE_128  = 7,
+    IMWRITE_GIF_COLORTABLE_SIZE_256  = 8
+};
+
+enum ImageMetadataType
+{
+    IMAGE_METADATA_UNKNOWN = -1,
+    IMAGE_METADATA_EXIF = 0,
+    IMAGE_METADATA_XMP = 1,
+    IMAGE_METADATA_ICCP = 2,
+    IMAGE_METADATA_MAX = 2
+};
+
+//! @} imgcodecs_flags
+
+/** @brief Represents an animation with multiple frames.
+The `Animation` struct is designed to store and manage data for animated sequences such as those from animated formats (e.g., GIF, AVIF, APNG, WebP).
+It provides support for looping, background color settings, frame timing, and frame storage.
+*/
+struct CV_EXPORTS_W_SIMPLE Animation
+{
+    //! Number of times the animation should loop. 0 means infinite looping.
+    /*! @note At some file format, when N is set, whether it is displayed N or N+1 times depends on the implementation of the user application. This loop times behaviour has not been documented clearly.
+     *  - (GIF) See https://issues.chromium.org/issues/40459899
+     *    And animated GIF with loop is extended with the Netscape Application Block(NAB), which it not a part of GIF89a specification. See https://en.wikipedia.org/wiki/GIF#Animated_GIF .
+     *  - (WebP) See https://issues.chromium.org/issues/41276895
+     */
+    CV_PROP_RW int loop_count;
+    //! Background color of the animation in BGRA format.
+    CV_PROP_RW Scalar bgcolor;
+    //! Duration for each frame in milliseconds.
+    /*! @note (GIF) Due to file format limitation
+     *  - Durations must be multiples of 10 milliseconds. Any provided value will be rounded down to the nearest 10ms (e.g., 88ms → 80ms).
+     *  - 0ms(or smaller than expected in user application) duration may cause undefined behavior, e.g. it is handled with default duration.
+     *  - Over 65535 * 10 milliseconds duration is not supported.
+     */
+    CV_PROP_RW std::vector<int> durations;
+    //! Vector of frames, where each Mat represents a single frame.
+    CV_PROP_RW std::vector<Mat> frames;
+    //! image that can be used for the format in addition to the animation or if animation is not supported in the reader (like in PNG).
+    CV_PROP_RW Mat still_image;
+
+    /** @brief Constructs an Animation object with optional loop count and background color.
+
+    @param loopCount An integer representing the number of times the animation should loop:
+    - `0` (default) indicates infinite looping, meaning the animation will replay continuously.
+    - Positive values denote finite repeat counts, allowing the animation to play a limited number of times.
+    - If a negative value or a value beyond the maximum of `0xffff` (65535) is provided, it is reset to `0`
+    (infinite looping) to maintain valid bounds.
+
+    @param bgColor A `Scalar` object representing the background color in BGR format:
+    - Defaults to `Scalar()`, indicating an empty color (usually transparent if supported).
+    - This background color provides a solid fill behind frames that have transparency, ensuring a consistent display appearance.
+    */
+    CV_WRAP Animation(int loopCount = 0, Scalar bgColor = Scalar());
+};
+
+/** @brief Loads an image from a file.
+
+@anchor imread
+
+The `imread` function loads an image from the specified file and returns OpenCV matrix. If the image cannot be
+read (because of a missing file, improper permissions, or unsupported/invalid format), the function
+returns an empty matrix.
+
+Currently, the following file formats are supported:
+
+-   Windows bitmaps - \*.bmp, \*.dib (always supported)
+-   GIF files - \*.gif (always supported)
+-   JPEG files - \*.jpeg, \*.jpg, \*.jpe (see the *Note* section)
+-   JPEG 2000 files - \*.jp2 (see the *Note* section)
+-   Portable Network Graphics - \*.png (see the *Note* section)
+-   WebP - \*.webp (see the *Note* section)
+-   AVIF - \*.avif (see the *Note* section)
+-   Portable image format - \*.pbm, \*.pgm, \*.ppm, \*.pxm, \*.pnm (always supported)
+-   PFM files - \*.pfm (see the *Note* section)
+-   Sun rasters - \*.sr, \*.ras (always supported)
+-   TIFF files - \*.tiff, \*.tif (see the *Note* section)
+-   OpenEXR Image files - \*.exr (see the *Note* section)
+-   Radiance HDR - \*.hdr, \*.pic (always supported)
+-   Raster and Vector geospatial data supported by GDAL (see the *Note* section)
+
+@note
+-   The function determines the type of an image by its content, not by the file extension.
+-   In the case of color images, the decoded images will have the channels stored in **B G R** order.
+-   When using IMREAD_GRAYSCALE, the codec's internal grayscale conversion will be used, if available.
+    Results may differ from the output of cvtColor().
+-   On Microsoft Windows\* and Mac OS\*, the codecs shipped with OpenCV (libjpeg, libpng, libtiff,
+    and libjasper) are used by default. So, OpenCV can always read JPEGs, PNGs, and TIFFs. On Mac OS,
+    there is also an option to use native Mac OS image readers. However, beware that currently these
+    native image loaders give images with different pixel values because of the color management embedded
+    into Mac OS.
+-   On Linux\*, BSD flavors, and other Unix-like open-source operating systems, OpenCV looks for
+    codecs supplied with the OS. Ensure the relevant packages are installed (including development
+    files, such as "libjpeg-dev" in Debian\* and Ubuntu\*) to get codec support, or turn
+    on the OPENCV_BUILD_3RDPARTY_LIBS flag in CMake.
+-   If the *WITH_GDAL* flag is set to true in CMake and @ref IMREAD_LOAD_GDAL is used to load the image,
+    the [GDAL](http://www.gdal.org) driver will be used to decode the image, supporting
+    [Raster](http://www.gdal.org/formats_list.html) and [Vector](http://www.gdal.org/ogr_formats.html) formats.
+-   If EXIF information is embedded in the image file, the EXIF orientation will be taken into account,
+    and thus the image will be rotated accordingly unless the flags @ref IMREAD_IGNORE_ORIENTATION
+    or @ref IMREAD_UNCHANGED are passed.
+-   Use the IMREAD_UNCHANGED flag to preserve the floating-point values from PFM images.
+-   By default, the number of pixels must be less than 2^30. This limit can be changed by setting
+    the environment variable `OPENCV_IO_MAX_IMAGE_PIXELS`. See @ref tutorial_env_reference.
+
+@param filename Name of the file to be loaded.
+@param flags Flag that can take values of `cv::ImreadModes`.
+*/
+CV_EXPORTS_W Mat imread( const String& filename, int flags = IMREAD_COLOR_BGR );
+
+/** @brief Loads an image from a file.
+
+This is an overloaded member function, provided for convenience. It differs from the above function only in what argument(s) it accepts and the return value.
+@param filename Name of file to be loaded.
+@param dst object in which the image will be loaded.
+@param flags Flag that can take values of cv::ImreadModes
+@note
+The image passing through the img parameter can be pre-allocated. The memory is reused if the shape and the type match with the load image.
+ */
+CV_EXPORTS_W void imread( const String& filename, OutputArray dst, int flags = IMREAD_COLOR_BGR );
+
+/** @brief Reads an image from a file together with associated metadata.
+
+The function imreadWithMetadata reads image from the specified file. It does the same thing as imread, but additionally reads metadata if the corresponding file contains any.
+@param filename Name of the file to be loaded.
+@param metadataTypes Output vector with types of metadata chucks returned in metadata, see ImageMetadataType.
+@param metadata Output vector of vectors or vector of matrices to store the retrieved metadata
+@param flags Flag that can take values of cv::ImreadModes
+*/
+CV_EXPORTS_W Mat imreadWithMetadata( const String& filename, CV_OUT std::vector<int>& metadataTypes,
+                                     OutputArrayOfArrays metadata, int flags = IMREAD_ANYCOLOR);
+
+/** @brief Loads a multi-page image from a file.
+
+The function imreadmulti loads a multi-page image from the specified file into a vector of Mat objects.
+@param filename Name of file to be loaded.
+@param mats A vector of Mat objects holding each page.
+@param flags Flag that can take values of cv::ImreadModes, default with cv::IMREAD_ANYCOLOR.
+@sa cv::imread
+*/
+CV_EXPORTS_W bool imreadmulti(const String& filename, CV_OUT std::vector<Mat>& mats, int flags = IMREAD_ANYCOLOR);
+
+/** @brief Loads images of a multi-page image from a file.
+
+The function imreadmulti loads a specified range from a multi-page image from the specified file into a vector of Mat objects.
+@param filename Name of file to be loaded.
+@param mats A vector of Mat objects holding each page.
+@param start Start index of the image to load
+@param count Count number of images to load
+@param flags Flag that can take values of cv::ImreadModes, default with cv::IMREAD_ANYCOLOR.
+@sa cv::imread
+*/
+CV_EXPORTS_W bool imreadmulti(const String& filename, CV_OUT std::vector<Mat>& mats, int start, int count, int flags = IMREAD_ANYCOLOR);
+
+/** @example samples/cpp/tutorial_code/imgcodecs/animations.cpp
+An example to show usage of cv::imreadanimation and cv::imwriteanimation functions.
+Check @ref tutorial_animations "the corresponding tutorial" for more details
+*/
+
+/** @brief Loads frames from an animated image file into an Animation structure.
+
+The function imreadanimation loads frames from an animated image file (e.g., GIF, AVIF, APNG, WEBP) into the provided Animation struct.
+
+@param filename A string containing the path to the file.
+@param animation A reference to an Animation structure where the loaded frames will be stored. It should be initialized before the function is called.
+@param start The index of the first frame to load. This is optional and defaults to 0.
+@param count The number of frames to load. This is optional and defaults to 32767.
+
+@return Returns true if the file was successfully loaded and frames were extracted; returns false otherwise.
+*/
+CV_EXPORTS_W bool imreadanimation(const String& filename, CV_OUT Animation& animation, int start = 0, int count = INT16_MAX);
+
+/** @brief Loads frames from an animated image buffer into an Animation structure.
+
+The function imdecodeanimation loads frames from an animated image buffer (e.g., GIF, AVIF, APNG, WEBP) into the provided Animation struct.
+
+@param buf A reference to an InputArray containing the image buffer.
+@param animation A reference to an Animation structure where the loaded frames will be stored. It should be initialized before the function is called.
+@param start The index of the first frame to load. This is optional and defaults to 0.
+@param count The number of frames to load. This is optional and defaults to 32767.
+
+@return Returns true if the buffer was successfully loaded and frames were extracted; returns false otherwise.
+*/
+CV_EXPORTS_W bool imdecodeanimation(InputArray buf, CV_OUT Animation& animation, int start = 0, int count = INT16_MAX);
+
+/** @brief Saves an Animation to a specified file.
+
+The function imwriteanimation saves the provided Animation data to the specified file in an animated format.
+Supported formats depend on the implementation and may include formats like GIF, AVIF, APNG, or WEBP.
+
+@param filename The name of the file where the animation will be saved. The file extension determines the format.
+@param animation A constant reference to an Animation struct containing the frames and metadata to be saved.
+@param params Optional format-specific parameters encoded as pairs (paramId_1, paramValue_1, paramId_2, paramValue_2, ...).
+These parameters are used to specify additional options for the encoding process. Refer to `cv::ImwriteFlags` for details on possible parameters.
+
+@return Returns true if the animation was successfully saved; returns false otherwise.
+*/
+CV_EXPORTS_W bool imwriteanimation(const String& filename, const Animation& animation, const std::vector<int>& params = std::vector<int>());
+
+/** @brief Encodes an Animation to a memory buffer.
+
+The function imencodeanimation encodes the provided Animation data into a memory
+buffer in an animated format. Supported formats depend on the implementation and
+may include formats like GIF, AVIF, APNG, or WEBP.
+
+@param ext The file extension that determines the format of the encoded data.
+@param animation A constant reference to an Animation struct containing the
+frames and metadata to be encoded.
+@param buf A reference to a vector of unsigned chars where the encoded data will
+be stored.
+@param params Optional format-specific parameters encoded as pairs (paramId_1,
+paramValue_1, paramId_2, paramValue_2, ...). These parameters are used to
+specify additional options for the encoding process. Refer to `cv::ImwriteFlags`
+for details on possible parameters.
+
+@return Returns true if the animation was successfully encoded; returns false otherwise.
+*/
+CV_EXPORTS_W bool imencodeanimation(const String& ext, const Animation& animation, CV_OUT std::vector<uchar>& buf, const std::vector<int>& params = std::vector<int>());
+
+/** @brief Returns the number of images inside the given file
+
+The function imcount returns the number of pages in a multi-page image (e.g. TIFF), the number of frames in an animation (e.g. AVIF), and 1 otherwise.
+If the image cannot be decoded, 0 is returned.
+@param filename Name of file to be loaded.
+@param flags Flag that can take values of cv::ImreadModes, default with cv::IMREAD_ANYCOLOR.
+@todo when cv::IMREAD_LOAD_GDAL flag used the return value will be 0 or 1 because OpenCV's GDAL decoder doesn't support multi-page reading yet.
+*/
+CV_EXPORTS_W size_t imcount(const String& filename, int flags = IMREAD_ANYCOLOR);
+
+/** @brief Saves an image to a specified file.
+
+The function imwrite saves the image to the specified file. The image format is chosen based on the
+filename extension (see cv::imread for the list of extensions). In general, only 8-bit unsigned (CV_8U)
+single-channel or 3-channel (with 'BGR' channel order) images
+can be saved using this function, with these exceptions:
+
+- With OpenEXR encoder, only 32-bit float (CV_32F) images can be saved.
+  - 8-bit unsigned (CV_8U) images are not supported.
+- With Radiance HDR encoder, non 64-bit float (CV_64F) images can be saved.
+  - All images will be converted to 32-bit float (CV_32F).
+- With JPEG 2000 encoder, 8-bit unsigned (CV_8U) and 16-bit unsigned (CV_16U) images can be saved.
+- With JPEG XL encoder, 8-bit unsigned (CV_8U), 16-bit unsigned (CV_16U) and 32-bit float(CV_32F) images can be saved.
+  - JPEG XL images with an alpha channel can be saved using this function.
+    To achieve this, create an 8-bit 4-channel (CV_8UC4) / 16-bit 4-channel (CV_16UC4) / 32-bit float 4-channel (CV_32FC4) BGRA image, ensuring the alpha channel is the last component.
+    Fully transparent pixels should have an alpha value of 0, while fully opaque pixels should have an alpha value of 255/65535/1.0.
+- With PAM encoder, 8-bit unsigned (CV_8U) and 16-bit unsigned (CV_16U) images can be saved.
+- With PNG encoder, 8-bit unsigned (CV_8U) and 16-bit unsigned (CV_16U) images can be saved.
+  - PNG images with an alpha channel can be saved using this function.
+    To achieve this, create an 8-bit 4-channel (CV_8UC4) / 16-bit 4-channel (CV_16UC4) BGRA image, ensuring the alpha channel is the last component.
+    Fully transparent pixels should have an alpha value of 0, while fully opaque pixels should have an alpha value of 255/65535(see the code sample below).
+- With PGM/PPM encoder, 8-bit unsigned (CV_8U) and 16-bit unsigned (CV_16U) images can be saved.
+- With TIFF encoder, 8-bit unsigned (CV_8U), 8-bit signed (CV_8S),
+                     16-bit unsigned (CV_16U), 16-bit signed (CV_16S),
+                     32-bit signed (CV_32S),
+                     32-bit float (CV_32F) and 64-bit float (CV_64F) images can be saved.
+  - Multiple images (vector of Mat) can be saved in TIFF format (see the code sample below).
+  - 32-bit float 3-channel (CV_32FC3) TIFF images will be saved
+    using the LogLuv high dynamic range encoding (4 bytes per pixel)
+- With GIF encoder, 8-bit unsigned (CV_8U) images can be saved.
+  - GIF images with an alpha channel can be saved using this function.
+    To achieve this, create an 8-bit 4-channel (CV_8UC4) BGRA image, ensuring the alpha channel is the last component.
+    Fully transparent pixels should have an alpha value of 0, while fully opaque pixels should have an alpha value of 255.
+  - 8-bit single-channel images (CV_8UC1) are not supported due to GIF's limitation to indexed color formats.
+
+If the image format is not supported, the image will be converted to 8-bit unsigned (CV_8U) and saved that way.
+
+If the format, depth or channel order is different, use
+Mat::convertTo and cv::cvtColor to convert it before saving. Or, use the universal FileStorage I/O
+functions to save the image to XML or YAML format.
+
+The sample below shows how to create a BGRA image, how to set custom compression parameters and save it to a PNG file.
+It also demonstrates how to save multiple images in a TIFF file:
+@include snippets/imgcodecs_imwrite.cpp
+@param filename Name of the file.
+@param img (Mat or vector of Mat) Image or Images to be saved.
+@param params Format-specific parameters encoded as pairs (paramId_1, paramValue_1, paramId_2, paramValue_2, ... .) see cv::ImwriteFlags
+*/
+CV_EXPORTS_W bool imwrite( const String& filename, InputArray img,
+              const std::vector<int>& params = std::vector<int>());
+
+/** @brief Saves an image to a specified file with metadata
+
+The function imwriteWithMetadata saves the image to the specified file. It does the same thing as imwrite, but additionally writes metadata if the corresponding format supports it.
+@param filename Name of the file. As with imwrite, image format is determined by the file extension.
+@param img (Mat or vector of Mat) Image or Images to be saved.
+@param metadataTypes Vector with types of metadata chucks stored in metadata to write, see ImageMetadataType.
+@param metadata Vector of vectors or vector of matrices with chunks of metadata to store into the file
+@param params Format-specific parameters encoded as pairs (paramId_1, paramValue_1, paramId_2, paramValue_2, ... .) see cv::ImwriteFlags
+*/
+CV_EXPORTS_W bool imwriteWithMetadata( const String& filename, InputArray img,
+                                       const std::vector<int>& metadataTypes,
+                                       InputArrayOfArrays& metadata,
+                                       const std::vector<int>& params = std::vector<int>());
+
+//! @brief multi-image overload for bindings
+CV_WRAP static inline
+bool imwritemulti(const String& filename, InputArrayOfArrays img,
+                  const std::vector<int>& params = std::vector<int>())
+{
+    return imwrite(filename, img, params);
+}
+
+/** @brief Reads an image from a buffer in memory.
+
+The function imdecode reads an image from the specified buffer in the memory. If the buffer is too short or
+contains invalid data, the function returns an empty matrix ( Mat::data==NULL ).
+
+See cv::imread for the list of supported formats and flags description.
+
+@note In the case of color images, the decoded images will have the channels stored in **B G R** order.
+@param buf Input array or vector of bytes.
+@param flags The same flags as in cv::imread, see cv::ImreadModes.
+*/
+CV_EXPORTS_W Mat imdecode( InputArray buf, int flags );
+
+/** @brief Reads an image from a buffer in memory together with associated metadata.
+
+The function imdecode reads an image from the specified buffer in the memory. If the buffer is too short or
+contains invalid data, the function returns an empty matrix ( Mat::data==NULL ).
+
+See cv::imread for the list of supported formats and flags description.
+
+@note In the case of color images, the decoded images will have the channels stored in **B G R** order.
+@param buf Input array or vector of bytes.
+@param metadataTypes Output vector with types of metadata chucks returned in metadata, see ImageMetadataType.
+@param metadata Output vector of vectors or vector of matrices to store the retrieved metadata
+@param flags The same flags as in cv::imread, see cv::ImreadModes.
+*/
+CV_EXPORTS_W Mat imdecodeWithMetadata( InputArray buf, CV_OUT std::vector<int>& metadataTypes,
+                                       OutputArrayOfArrays metadata, int flags = IMREAD_ANYCOLOR );
+
+/** @overload
+@param buf Input array or vector of bytes.
+@param flags The same flags as in cv::imread, see cv::ImreadModes.
+@param dst The optional output placeholder for the decoded matrix. It can save the image
+reallocations when the function is called repeatedly for images of the same size. In case of decoder
+failure the function returns empty cv::Mat object, but does not release user-provided dst buffer.
+*/
+CV_EXPORTS Mat imdecode( InputArray buf, int flags, Mat* dst);
+
+/** @brief Reads a multi-page image from a buffer in memory.
+
+The function imdecodemulti reads a multi-page image from the specified buffer in the memory. If the buffer is too short or
+contains invalid data, the function returns false.
+
+See cv::imreadmulti for the list of supported formats and flags description.
+
+@note In the case of color images, the decoded images will have the channels stored in **B G R** order.
+@param buf Input array or vector of bytes.
+@param flags The same flags as in cv::imread, see cv::ImreadModes.
+@param mats A vector of Mat objects holding each page, if more than one.
+@param range A continuous selection of pages.
+*/
+CV_EXPORTS_W bool imdecodemulti(InputArray buf, int flags, CV_OUT std::vector<Mat>& mats, const cv::Range& range = Range::all());
+
+/** @brief Encodes an image into a memory buffer.
+
+The function imencode compresses the image and stores it in the memory buffer that is resized to fit the
+result. See cv::imwrite for the list of supported formats and flags description.
+
+@param ext File extension that defines the output format. Must include a leading period.
+@param img Image to be compressed.
+@param buf Output buffer resized to fit the compressed image.
+@param params Format-specific parameters. See cv::imwrite and cv::ImwriteFlags.
+*/
+CV_EXPORTS_W bool imencode( const String& ext, InputArray img,
+                            CV_OUT std::vector<uchar>& buf,
+                            const std::vector<int>& params = std::vector<int>());
+
+/** @brief Encodes an image into a memory buffer.
+
+The function imencode compresses the image and stores it in the memory buffer that is resized to fit the
+result. See cv::imwrite for the list of supported formats and flags description.
+
+@param ext File extension that defines the output format. Must include a leading period.
+@param img Image to be compressed.
+@param metadataTypes Vector with types of metadata chucks stored in metadata to write, see ImageMetadataType.
+@param metadata Vector of vectors or vector of matrices with chunks of metadata to store into the file
+@param buf Output buffer resized to fit the compressed image.
+@param params Format-specific parameters. See cv::imwrite and cv::ImwriteFlags.
+*/
+CV_EXPORTS_W bool imencodeWithMetadata( const String& ext, InputArray img,
+                                        const std::vector<int>& metadataTypes,
+                                        InputArrayOfArrays metadata,
+                                        CV_OUT std::vector<uchar>& buf,
+                                        const std::vector<int>& params = std::vector<int>());
+
+/** @brief Encodes array of images into a memory buffer.
+
+The function is analog to cv::imencode for in-memory multi-page image compression.
+See cv::imwrite for the list of supported formats and flags description.
+
+@param ext File extension that defines the output format. Must include a leading period.
+@param imgs Vector of images to be written.
+@param buf Output buffer resized to fit the compressed data.
+@param params Format-specific parameters. See cv::imwrite and cv::ImwriteFlags.
+*/
+CV_EXPORTS_W bool imencodemulti( const String& ext, InputArrayOfArrays imgs,
+                                 CV_OUT std::vector<uchar>& buf,
+                                 const std::vector<int>& params = std::vector<int>());
+
+/** @brief Checks if the specified image file can be decoded by OpenCV.
+
+The function haveImageReader checks if OpenCV is capable of reading the specified file.
+This can be useful for verifying support for a given image format before attempting to load an image.
+
+@param filename The name of the file to be checked.
+@return true if an image reader for the specified file is available and the file can be opened, false otherwise.
+
+@note The function checks the availability of image codecs that are either built into OpenCV or dynamically loaded.
+It does not load the image codec implementation and decode data, but uses signature check.
+If the file cannot be opened or the format is unsupported, the function will return false.
+
+@sa cv::haveImageWriter, cv::imread, cv::imdecode
+*/
+CV_EXPORTS_W bool haveImageReader( const String& filename );
+
+/** @brief Checks if the specified image file or specified file extension can be encoded by OpenCV.
+
+The function haveImageWriter checks if OpenCV is capable of writing images with the specified file extension.
+This can be useful for verifying support for a given image format before attempting to save an image.
+
+@param filename The name of the file or the file extension (e.g., ".jpg", ".png").
+It is recommended to provide the file extension rather than the full file name.
+@return true if an image writer for the specified extension is available, false otherwise.
+
+@note The function checks the availability of image codecs that are either built into OpenCV or dynamically loaded.
+It does not check for the actual existence of the file but rather the ability to write files of the given type.
+
+@sa cv::haveImageReader, cv::imwrite, cv::imencode
+*/
+CV_EXPORTS_W bool haveImageWriter( const String& filename );
+
+/** @brief To read multi-page images on demand
+
+The ImageCollection class provides iterator API to read multi-page images on demand. Create iterator
+to the collection of the images and iterate over the collection. Decode the necessary page with operator*.
+
+The performance of page decoding is O(1) if collection is increment sequentially. If the user wants to access random page,
+then the time Complexity is O(n) because the collection has to be reinitialized every time in order to go to the correct page.
+However, the intermediate pages are not decoded during the process, so typically it's quite fast.
+This is required because multi-page codecs does not support going backwards.
+After decoding the one page, it is stored inside the collection cache. Hence, trying to get Mat object from already decoded page is O(1).
+If you need memory, you can use .releaseCache() method to release cached index.
+The space complexity is O(n) if all pages are decoded into memory. The user is able to decode and release images on demand.
+*/
+class CV_EXPORTS ImageCollection {
+public:
+    struct CV_EXPORTS iterator {
+        iterator(ImageCollection* col);
+        iterator(ImageCollection* col, int end);
+        Mat& operator*();
+        Mat* operator->();
+        iterator& operator++();
+        iterator operator++(int);
+        friend bool operator== (const iterator& a, const iterator& b) { return a.m_curr == b.m_curr; }
+        friend bool operator!= (const iterator& a, const iterator& b) { return a.m_curr != b.m_curr; }
+
+    private:
+        ImageCollection* m_pCollection;
+        int m_curr;
+    };
+
+    ImageCollection();
+    ImageCollection(const String& filename, int flags);
+    void init(const String& img, int flags);
+    size_t size() const;
+    const Mat& at(int index);
+    const Mat& operator[](int index);
+    void releaseCache(int index);
+    iterator begin();
+    iterator end();
+
+    class Impl;
+    Ptr<Impl> getImpl();
+protected:
+    Ptr<Impl> pImpl;
+};
+
+//! @} imgcodecs
+
+} // cv
+
+#endif //OPENCV_IMGCODECS_HPP
diff --git a/3rdParty/opencv2/imgcodecs/imgcodecs.hpp b/3rdParty/opencv-4.12.0/opencv2/imgcodecs/imgcodecs.hpp
similarity index 100%
rename from 3rdParty/opencv2/imgcodecs/imgcodecs.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/imgcodecs/imgcodecs.hpp
diff --git a/3rdParty/opencv2/imgcodecs/imgcodecs_c.h b/3rdParty/opencv-4.12.0/opencv2/imgcodecs/imgcodecs_c.h
similarity index 100%
rename from 3rdParty/opencv2/imgcodecs/imgcodecs_c.h
rename to 3rdParty/opencv-4.12.0/opencv2/imgcodecs/imgcodecs_c.h
diff --git a/3rdParty/opencv2/imgcodecs/ios.h b/3rdParty/opencv-4.12.0/opencv2/imgcodecs/ios.h
similarity index 100%
rename from 3rdParty/opencv2/imgcodecs/ios.h
rename to 3rdParty/opencv-4.12.0/opencv2/imgcodecs/ios.h
diff --git a/3rdParty/opencv2/imgcodecs/legacy/constants_c.h b/3rdParty/opencv-4.12.0/opencv2/imgcodecs/legacy/constants_c.h
similarity index 100%
rename from 3rdParty/opencv2/imgcodecs/legacy/constants_c.h
rename to 3rdParty/opencv-4.12.0/opencv2/imgcodecs/legacy/constants_c.h
diff --git a/3rdParty/opencv2/imgcodecs/macosx.h b/3rdParty/opencv-4.12.0/opencv2/imgcodecs/macosx.h
similarity index 100%
rename from 3rdParty/opencv2/imgcodecs/macosx.h
rename to 3rdParty/opencv-4.12.0/opencv2/imgcodecs/macosx.h
diff --git a/3rdParty/opencv-4.12.0/opencv2/imgproc.hpp b/3rdParty/opencv-4.12.0/opencv2/imgproc.hpp
new file mode 100644
index 0000000000..52f671341f
--- /dev/null
+++ b/3rdParty/opencv-4.12.0/opencv2/imgproc.hpp
@@ -0,0 +1,5157 @@
+/*M///////////////////////////////////////////////////////////////////////////////////////
+//
+//  IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
+//
+//  By downloading, copying, installing or using the software you agree to this license.
+//  If you do not agree to this license, do not download, install,
+//  copy or use the software.
+//
+//
+//                           License Agreement
+//                For Open Source Computer Vision Library
+//
+// Copyright (C) 2000-2008, Intel Corporation, all rights reserved.
+// Copyright (C) 2009, Willow Garage Inc., all rights reserved.
+// Third party copyrights are property of their respective owners.
+//
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
+//
+//   * Redistribution's of source code must retain the above copyright notice,
+//     this list of conditions and the following disclaimer.
+//
+//   * Redistribution's in binary form must reproduce the above copyright notice,
+//     this list of conditions and the following disclaimer in the documentation
+//     and/or other materials provided with the distribution.
+//
+//   * The name of the copyright holders may not be used to endorse or promote products
+//     derived from this software without specific prior written permission.
+//
+// This software is provided by the copyright holders and contributors "as is" and
+// any express or implied warranties, including, but not limited to, the implied
+// warranties of merchantability and fitness for a particular purpose are disclaimed.
+// In no event shall the Intel Corporation or contributors be liable for any direct,
+// indirect, incidental, special, exemplary, or consequential damages
+// (including, but not limited to, procurement of substitute goods or services;
+// loss of use, data, or profits; or business interruption) however caused
+// and on any theory of liability, whether in contract, strict liability,
+// or tort (including negligence or otherwise) arising in any way out of
+// the use of this software, even if advised of the possibility of such damage.
+//
+//M*/
+
+#ifndef OPENCV_IMGPROC_HPP
+#define OPENCV_IMGPROC_HPP
+
+#include "opencv2/core.hpp"
+
+/**
+@defgroup imgproc Image Processing
+
+This module offers a comprehensive suite of image processing functions, enabling tasks such as those listed above.
+
+@{
+    @defgroup imgproc_filter Image Filtering
+
+    Functions and classes described in this section are used to perform various linear or non-linear
+    filtering operations on 2D images (represented as Mat's). It means that for each pixel location
+    \f$(x,y)\f$ in the source image (normally, rectangular), its neighborhood is considered and used to
+    compute the response. In case of a linear filter, it is a weighted sum of pixel values. In case of
+    morphological operations, it is the minimum or maximum values, and so on. The computed response is
+    stored in the destination image at the same location \f$(x,y)\f$. It means that the output image
+    will be of the same size as the input image. Normally, the functions support multi-channel arrays,
+    in which case every channel is processed independently. Therefore, the output image will also have
+    the same number of channels as the input one.
+
+    Another common feature of the functions and classes described in this section is that, unlike
+    simple arithmetic functions, they need to extrapolate values of some non-existing pixels. For
+    example, if you want to smooth an image using a Gaussian \f$3 \times 3\f$ filter, then, when
+    processing the left-most pixels in each row, you need pixels to the left of them, that is, outside
+    of the image. You can let these pixels be the same as the left-most image pixels ("replicated
+    border" extrapolation method), or assume that all the non-existing pixels are zeros ("constant
+    border" extrapolation method), and so on. OpenCV enables you to specify the extrapolation method.
+    For details, see #BorderTypes
+
+    @anchor filter_depths
+    ### Depth combinations
+    Input depth (src.depth()) | Output depth (ddepth)
+    --------------------------|----------------------
+    CV_8U                     | -1/CV_16S/CV_32F/CV_64F
+    CV_16U/CV_16S             | -1/CV_32F/CV_64F
+    CV_32F                    | -1/CV_32F
+    CV_64F                    | -1/CV_64F
+
+    @note when ddepth=-1, the output image will have the same depth as the source.
+
+    @note if you need double floating-point accuracy and using single floating-point input data
+    (CV_32F input and CV_64F output depth combination), you can use @ref Mat.convertTo to convert
+    the input data to the desired precision.
+
+    @defgroup imgproc_transform Geometric Image Transformations
+
+    The functions in this section perform various geometrical transformations of 2D images. They do not
+    change the image content but deform the pixel grid and map this deformed grid to the destination
+    image. In fact, to avoid sampling artifacts, the mapping is done in the reverse order, from
+    destination to the source. That is, for each pixel \f$(x, y)\f$ of the destination image, the
+    functions compute coordinates of the corresponding "donor" pixel in the source image and copy the
+    pixel value:
+
+    \f[\texttt{dst} (x,y)= \texttt{src} (f_x(x,y), f_y(x,y))\f]
+
+    In case when you specify the forward mapping \f$\left<g_x, g_y\right>: \texttt{src} \rightarrow
+    \texttt{dst}\f$, the OpenCV functions first compute the corresponding inverse mapping
+    \f$\left<f_x, f_y\right>: \texttt{dst} \rightarrow \texttt{src}\f$ and then use the above formula.
+
+    The actual implementations of the geometrical transformations, from the most generic remap and to
+    the simplest and the fastest resize, need to solve two main problems with the above formula:
+
+    - Extrapolation of non-existing pixels. Similarly to the filtering functions described in the
+    previous section, for some \f$(x,y)\f$, either one of \f$f_x(x,y)\f$, or \f$f_y(x,y)\f$, or both
+    of them may fall outside of the image. In this case, an extrapolation method needs to be used.
+    OpenCV provides the same selection of extrapolation methods as in the filtering functions. In
+    addition, it provides the method #BORDER_TRANSPARENT. This means that the corresponding pixels in
+    the destination image will not be modified at all.
+
+    - Interpolation of pixel values. Usually \f$f_x(x,y)\f$ and \f$f_y(x,y)\f$ are floating-point
+    numbers. This means that \f$\left<f_x, f_y\right>\f$ can be either an affine or perspective
+    transformation, or radial lens distortion correction, and so on. So, a pixel value at fractional
+    coordinates needs to be retrieved. In the simplest case, the coordinates can be just rounded to the
+    nearest integer coordinates and the corresponding pixel can be used. This is called a
+    nearest-neighbor interpolation. However, a better result can be achieved by using more
+    sophisticated [interpolation methods](https://en.wikipedia.org/wiki/Multivariate_interpolation) ,
+    where a polynomial function is fit into some neighborhood of the computed pixel \f$(f_x(x,y),
+    f_y(x,y))\f$, and then the value of the polynomial at \f$(f_x(x,y), f_y(x,y))\f$ is taken as the
+    interpolated pixel value. In OpenCV, you can choose between several interpolation methods. See
+    #resize for details.
+
+    @note The geometrical transformations do not work with `CV_8S` or `CV_32S` images.
+
+    @defgroup imgproc_misc Miscellaneous Image Transformations
+    @defgroup imgproc_draw Drawing Functions
+
+    Drawing functions work with matrices/images of arbitrary depth. The boundaries of the shapes can be
+    rendered with antialiasing (implemented only for 8-bit images for now). All the functions include
+    the parameter color that uses an RGB value (that may be constructed with the Scalar constructor )
+    for color images and brightness for grayscale images. For color images, the channel ordering is
+    normally *Blue, Green, Red*. This is what imshow, imread, and imwrite expect. So, if you form a
+    color using the Scalar constructor, it should look like:
+
+    \f[\texttt{Scalar} (blue \_ component, green \_ component, red \_ component[, alpha \_ component])\f]
+
+    If you are using your own image rendering and I/O functions, you can use any channel ordering. The
+    drawing functions process each channel independently and do not depend on the channel order or even
+    on the used color space. The whole image can be converted from BGR to RGB or to a different color
+    space using cvtColor .
+
+    If a drawn figure is partially or completely outside the image, the drawing functions clip it. Also,
+    many drawing functions can handle pixel coordinates specified with sub-pixel accuracy. This means
+    that the coordinates can be passed as fixed-point numbers encoded as integers. The number of
+    fractional bits is specified by the shift parameter and the real point coordinates are calculated as
+    \f$\texttt{Point}(x,y)\rightarrow\texttt{Point2f}(x*2^{-shift},y*2^{-shift})\f$ . This feature is
+    especially effective when rendering antialiased shapes.
+
+    @note The functions do not support alpha-transparency when the target image is 4-channel. In this
+    case, the color[3] is simply copied to the repainted pixels. Thus, if you want to paint
+    semi-transparent shapes, you can paint them in a separate buffer and then blend it with the main
+    image.
+
+    @defgroup imgproc_color_conversions Color Space Conversions
+    @defgroup imgproc_colormap ColorMaps in OpenCV
+
+    The human perception isn't built for observing fine changes in grayscale images. Human eyes are more
+    sensitive to observing changes between colors, so you often need to recolor your grayscale images to
+    get a clue about them. OpenCV now comes with various colormaps to enhance the visualization in your
+    computer vision application.
+
+    In OpenCV you only need applyColorMap to apply a colormap on a given image. The following sample
+    code reads the path to an image from command line, applies a Jet colormap on it and shows the
+    result:
+
+    @include snippets/imgproc_applyColorMap.cpp
+
+    @see #ColormapTypes
+
+    @defgroup imgproc_subdiv2d Planar Subdivision
+
+    The Subdiv2D class described in this section is used to perform various planar subdivision on
+    a set of 2D points (represented as vector of Point2f). OpenCV subdivides a plane into triangles
+    using the Delaunay's algorithm, which corresponds to the dual graph of the Voronoi diagram.
+    In the figure below, the Delaunay's triangulation is marked with black lines and the Voronoi
+    diagram with red lines.
+
+    ![Delaunay triangulation (black) and Voronoi (red)](pics/delaunay_voronoi.png)
+
+    The subdivisions can be used for the 3D piece-wise transformation of a plane, morphing, fast
+    location of points on the plane, building special graphs (such as NNG,RNG), and so forth.
+
+    @defgroup imgproc_hist Histograms
+    @defgroup imgproc_shape Structural Analysis and Shape Descriptors
+    @defgroup imgproc_motion Motion Analysis and Object Tracking
+    @defgroup imgproc_feature Feature Detection
+    @defgroup imgproc_object Object Detection
+    @defgroup imgproc_segmentation Image Segmentation
+    @defgroup imgproc_hal Hardware Acceleration Layer
+    @{
+        @defgroup imgproc_hal_functions Functions
+        @defgroup imgproc_hal_interface Interface
+    @}
+  @}
+*/
+
+namespace cv
+{
+
+/** @addtogroup imgproc
+@{
+*/
+
+//! @addtogroup imgproc_filter
+//! @{
+
+enum SpecialFilter {
+    FILTER_SCHARR = -1
+};
+
+//! type of morphological operation
+enum MorphTypes{
+    MORPH_ERODE    = 0, //!< see #erode
+    MORPH_DILATE   = 1, //!< see #dilate
+    MORPH_OPEN     = 2, //!< an opening operation
+                        //!< \f[\texttt{dst} = \mathrm{open} ( \texttt{src} , \texttt{element} )= \mathrm{dilate} ( \mathrm{erode} ( \texttt{src} , \texttt{element} ))\f]
+    MORPH_CLOSE    = 3, //!< a closing operation
+                        //!< \f[\texttt{dst} = \mathrm{close} ( \texttt{src} , \texttt{element} )= \mathrm{erode} ( \mathrm{dilate} ( \texttt{src} , \texttt{element} ))\f]
+    MORPH_GRADIENT = 4, //!< a morphological gradient
+                        //!< \f[\texttt{dst} = \mathrm{morph\_grad} ( \texttt{src} , \texttt{element} )= \mathrm{dilate} ( \texttt{src} , \texttt{element} )- \mathrm{erode} ( \texttt{src} , \texttt{element} )\f]
+    MORPH_TOPHAT   = 5, //!< "top hat"
+                        //!< \f[\texttt{dst} = \mathrm{tophat} ( \texttt{src} , \texttt{element} )= \texttt{src} - \mathrm{open} ( \texttt{src} , \texttt{element} )\f]
+    MORPH_BLACKHAT = 6, //!< "black hat"
+                        //!< \f[\texttt{dst} = \mathrm{blackhat} ( \texttt{src} , \texttt{element} )= \mathrm{close} ( \texttt{src} , \texttt{element} )- \texttt{src}\f]
+    MORPH_HITMISS  = 7  //!< "hit or miss"
+                        //!<   .- Only supported for CV_8UC1 binary images. A tutorial can be found in the documentation
+};
+
+//! shape of the structuring element
+enum MorphShapes {
+    MORPH_RECT    = 0, //!< a rectangular structuring element:  \f[E_{ij}=1\f]
+    MORPH_CROSS   = 1, //!< a cross-shaped structuring element:
+                       //!< \f[E_{ij} = \begin{cases} 1 & \texttt{if } {i=\texttt{anchor.y } {or } {j=\texttt{anchor.x}}} \\0 & \texttt{otherwise} \end{cases}\f]
+    MORPH_ELLIPSE = 2, //!< an elliptic structuring element, that is, a filled ellipse inscribed
+                      //!< into the rectangle Rect(0, 0, esize.width, esize.height)
+    MORPH_DIAMOND = 3  //!< a diamond structuring element defined by Manhattan distance
+};
+
+//! @} imgproc_filter
+
+//! @addtogroup imgproc_transform
+//! @{
+
+//! interpolation algorithm
+enum InterpolationFlags{
+    /** nearest neighbor interpolation */
+    INTER_NEAREST        = 0,
+    /** bilinear interpolation */
+    INTER_LINEAR         = 1,
+    /** bicubic interpolation */
+    INTER_CUBIC          = 2,
+    /** resampling using pixel area relation. It may be a preferred method for image decimation, as
+    it gives moire'-free results. But when the image is zoomed, it is similar to the INTER_NEAREST
+    method. */
+    INTER_AREA           = 3,
+    /** Lanczos interpolation over 8x8 neighborhood */
+    INTER_LANCZOS4       = 4,
+    /** Bit exact bilinear interpolation */
+    INTER_LINEAR_EXACT = 5,
+    /** Bit exact nearest neighbor interpolation. This will produce same results as
+    the nearest neighbor method in PIL, scikit-image or Matlab. */
+    INTER_NEAREST_EXACT  = 6,
+    /** mask for interpolation codes */
+    INTER_MAX            = 7,
+    /** flag, fills all of the destination image pixels. If some of them correspond to outliers in the
+    source image, they are set to zero */
+    WARP_FILL_OUTLIERS   = 8,
+    /** flag, inverse transformation
+
+    For example, #linearPolar or #logPolar transforms:
+    - flag is __not__ set: \f$dst( \rho , \phi ) = src(x,y)\f$
+    - flag is set: \f$dst(x,y) = src( \rho , \phi )\f$
+    */
+    WARP_INVERSE_MAP     = 16,
+    WARP_RELATIVE_MAP    = 32
+};
+
+/** \brief Specify the polar mapping mode
+@sa warpPolar
+*/
+enum WarpPolarMode
+{
+    WARP_POLAR_LINEAR = 0, ///< Remaps an image to/from polar space.
+    WARP_POLAR_LOG = 256   ///< Remaps an image to/from semilog-polar space.
+};
+
+enum InterpolationMasks {
+       INTER_BITS      = 5,
+       INTER_BITS2     = INTER_BITS * 2,
+       INTER_TAB_SIZE  = 1 << INTER_BITS,
+       INTER_TAB_SIZE2 = INTER_TAB_SIZE * INTER_TAB_SIZE
+     };
+
+//! @} imgproc_transform
+
+//! @addtogroup imgproc_misc
+//! @{
+
+//! Distance types for Distance Transform and M-estimators
+//! @see distanceTransform, fitLine
+enum DistanceTypes {
+    DIST_USER    = -1,  //!< User defined distance
+    DIST_L1      = 1,   //!< distance = |x1-x2| + |y1-y2|
+    DIST_L2      = 2,   //!< the simple euclidean distance
+    DIST_C       = 3,   //!< distance = max(|x1-x2|,|y1-y2|)
+    DIST_L12     = 4,   //!< L1-L2 metric: distance = 2(sqrt(1+x*x/2) - 1))
+    DIST_FAIR    = 5,   //!< distance = c^2(|x|/c-log(1+|x|/c)), c = 1.3998
+    DIST_WELSCH  = 6,   //!< distance = c^2/2(1-exp(-(x/c)^2)), c = 2.9846
+    DIST_HUBER   = 7    //!< distance = |x|<c ? x^2/2 : c(|x|-c/2), c=1.345
+};
+
+//! Mask size for distance transform
+enum DistanceTransformMasks {
+    DIST_MASK_3       = 3, //!< mask=3
+    DIST_MASK_5       = 5, //!< mask=5
+    DIST_MASK_PRECISE = 0  //!<
+};
+
+//! type of the threshold operation
+//! ![threshold types](pics/threshold.png)
+enum ThresholdTypes {
+    THRESH_BINARY     = 0, //!< \f[\texttt{dst} (x,y) =  \fork{\texttt{maxval}}{if \(\texttt{src}(x,y) > \texttt{thresh}\)}{0}{otherwise}\f]
+    THRESH_BINARY_INV = 1, //!< \f[\texttt{dst} (x,y) =  \fork{0}{if \(\texttt{src}(x,y) > \texttt{thresh}\)}{\texttt{maxval}}{otherwise}\f]
+    THRESH_TRUNC      = 2, //!< \f[\texttt{dst} (x,y) =  \fork{\texttt{threshold}}{if \(\texttt{src}(x,y) > \texttt{thresh}\)}{\texttt{src}(x,y)}{otherwise}\f]
+    THRESH_TOZERO     = 3, //!< \f[\texttt{dst} (x,y) =  \fork{\texttt{src}(x,y)}{if \(\texttt{src}(x,y) > \texttt{thresh}\)}{0}{otherwise}\f]
+    THRESH_TOZERO_INV = 4, //!< \f[\texttt{dst} (x,y) =  \fork{0}{if \(\texttt{src}(x,y) > \texttt{thresh}\)}{\texttt{src}(x,y)}{otherwise}\f]
+    THRESH_MASK       = 7,
+    THRESH_OTSU       = 8, //!< flag, use Otsu algorithm to choose the optimal threshold value
+    THRESH_TRIANGLE   = 16, //!< flag, use Triangle algorithm to choose the optimal threshold value
+    THRESH_DRYRUN     = 128 //!< flag, compute threshold only (useful for OTSU/TRIANGLE) but does not actually run thresholding
+};
+
+//! adaptive threshold algorithm
+//! @see adaptiveThreshold
+enum AdaptiveThresholdTypes {
+    /** the threshold value \f$T(x,y)\f$ is a mean of the \f$\texttt{blockSize} \times
+    \texttt{blockSize}\f$ neighborhood of \f$(x, y)\f$ minus C */
+    ADAPTIVE_THRESH_MEAN_C     = 0,
+    /** the threshold value \f$T(x, y)\f$ is a weighted sum (cross-correlation with a Gaussian
+    window) of the \f$\texttt{blockSize} \times \texttt{blockSize}\f$ neighborhood of \f$(x, y)\f$
+    minus C . The default sigma (standard deviation) is used for the specified blockSize . See
+    #getGaussianKernel*/
+    ADAPTIVE_THRESH_GAUSSIAN_C = 1
+};
+
+//! class of the pixel in GrabCut algorithm
+enum GrabCutClasses {
+    GC_BGD    = 0,  //!< an obvious background pixels
+    GC_FGD    = 1,  //!< an obvious foreground (object) pixel
+    GC_PR_BGD = 2,  //!< a possible background pixel
+    GC_PR_FGD = 3   //!< a possible foreground pixel
+};
+
+//! GrabCut algorithm flags
+enum GrabCutModes {
+    /** The function initializes the state and the mask using the provided rectangle. After that it
+    runs iterCount iterations of the algorithm. */
+    GC_INIT_WITH_RECT  = 0,
+    /** The function initializes the state using the provided mask. Note that GC_INIT_WITH_RECT
+    and GC_INIT_WITH_MASK can be combined. Then, all the pixels outside of the ROI are
+    automatically initialized with GC_BGD .*/
+    GC_INIT_WITH_MASK  = 1,
+    /** The value means that the algorithm should just resume. */
+    GC_EVAL            = 2,
+    /** The value means that the algorithm should just run the grabCut algorithm (a single iteration) with the fixed model */
+    GC_EVAL_FREEZE_MODEL = 3
+};
+
+//! distanceTransform algorithm flags
+enum DistanceTransformLabelTypes {
+    /** each connected component of zeros in src (as well as all the non-zero pixels closest to the
+    connected component) will be assigned the same label */
+    DIST_LABEL_CCOMP = 0,
+    /** each zero pixel (and all the non-zero pixels closest to it) gets its own label. */
+    DIST_LABEL_PIXEL = 1
+};
+
+//! floodfill algorithm flags
+enum FloodFillFlags {
+    /** If set, the difference between the current pixel and seed pixel is considered. Otherwise,
+    the difference between neighbor pixels is considered (that is, the range is floating). */
+    FLOODFILL_FIXED_RANGE = 1 << 16,
+    /** If set, the function does not change the image ( newVal is ignored), and only fills the
+    mask with the value specified in bits 8-16 of flags as described above. This option only make
+    sense in function variants that have the mask parameter. */
+    FLOODFILL_MASK_ONLY   = 1 << 17
+};
+
+//! @} imgproc_misc
+
+//! @addtogroup imgproc_shape
+//! @{
+
+//! connected components statistics
+enum ConnectedComponentsTypes {
+    CC_STAT_LEFT   = 0, //!< The leftmost (x) coordinate which is the inclusive start of the bounding
+                        //!< box in the horizontal direction.
+    CC_STAT_TOP    = 1, //!< The topmost (y) coordinate which is the inclusive start of the bounding
+                        //!< box in the vertical direction.
+    CC_STAT_WIDTH  = 2, //!< The horizontal size of the bounding box
+    CC_STAT_HEIGHT = 3, //!< The vertical size of the bounding box
+    CC_STAT_AREA   = 4, //!< The total area (in pixels) of the connected component
+#ifndef CV_DOXYGEN
+    CC_STAT_MAX    = 5 //!< Max enumeration value. Used internally only for memory allocation
+#endif
+};
+
+//! connected components algorithm
+enum ConnectedComponentsAlgorithmsTypes {
+    CCL_DEFAULT   = -1, //!< Spaghetti @cite Bolelli2019 algorithm for 8-way connectivity, Spaghetti4C @cite Bolelli2021 algorithm for 4-way connectivity.
+    CCL_WU        = 0,  //!< SAUF @cite Wu2009 algorithm for 8-way connectivity, SAUF algorithm for 4-way connectivity. The parallel implementation described in @cite Bolelli2017 is available for SAUF.
+    CCL_GRANA     = 1,  //!< BBDT @cite Grana2010 algorithm for 8-way connectivity, SAUF algorithm for 4-way connectivity. The parallel implementation described in @cite Bolelli2017 is available for both BBDT and SAUF.
+    CCL_BOLELLI   = 2,  //!< Spaghetti @cite Bolelli2019 algorithm for 8-way connectivity, Spaghetti4C @cite Bolelli2021 algorithm for 4-way connectivity. The parallel implementation described in @cite Bolelli2017 is available for both Spaghetti and Spaghetti4C.
+    CCL_SAUF      = 3,  //!< Same as CCL_WU. It is preferable to use the flag with the name of the algorithm (CCL_SAUF) rather than the one with the name of the first author (CCL_WU).
+    CCL_BBDT      = 4,  //!< Same as CCL_GRANA. It is preferable to use the flag with the name of the algorithm (CCL_BBDT) rather than the one with the name of the first author (CCL_GRANA).
+    CCL_SPAGHETTI = 5,  //!< Same as CCL_BOLELLI. It is preferable to use the flag with the name of the algorithm (CCL_SPAGHETTI) rather than the one with the name of the first author (CCL_BOLELLI).
+};
+
+//! mode of the contour retrieval algorithm
+enum RetrievalModes {
+    /** retrieves only the extreme outer contours. It sets `hierarchy[i][2]=hierarchy[i][3]=-1` for
+    all the contours. */
+    RETR_EXTERNAL  = 0,
+    /** retrieves all of the contours without establishing any hierarchical relationships. */
+    RETR_LIST      = 1,
+    /** retrieves all of the contours and organizes them into a two-level hierarchy. At the top
+    level, there are external boundaries of the components. At the second level, there are
+    boundaries of the holes. If there is another contour inside a hole of a connected component, it
+    is still put at the top level. */
+    RETR_CCOMP     = 2,
+    /** retrieves all of the contours and reconstructs a full hierarchy of nested contours.*/
+    RETR_TREE      = 3,
+    RETR_FLOODFILL = 4 //!<
+};
+
+//! the contour approximation algorithm
+enum ContourApproximationModes {
+    /** stores absolutely all the contour points. That is, any 2 subsequent points (x1,y1) and
+    (x2,y2) of the contour will be either horizontal, vertical or diagonal neighbors, that is,
+    max(abs(x1-x2),abs(y2-y1))==1. */
+    CHAIN_APPROX_NONE      = 1,
+    /** compresses horizontal, vertical, and diagonal segments and leaves only their end points.
+    For example, an up-right rectangular contour is encoded with 4 points. */
+    CHAIN_APPROX_SIMPLE    = 2,
+    /** applies one of the flavors of the Teh-Chin chain approximation algorithm @cite TehChin89 */
+    CHAIN_APPROX_TC89_L1   = 3,
+    /** applies one of the flavors of the Teh-Chin chain approximation algorithm @cite TehChin89 */
+    CHAIN_APPROX_TC89_KCOS = 4
+};
+
+/** @brief Shape matching methods
+
+\f$A\f$ denotes object1,\f$B\f$ denotes object2
+
+\f$\begin{array}{l} m^A_i =  \mathrm{sign} (h^A_i)  \cdot \log{h^A_i} \\ m^B_i =  \mathrm{sign} (h^B_i)  \cdot \log{h^B_i} \end{array}\f$
+
+and \f$h^A_i, h^B_i\f$ are the Hu moments of \f$A\f$ and \f$B\f$ , respectively.
+*/
+enum ShapeMatchModes {
+    CONTOURS_MATCH_I1  =1, //!< \f[I_1(A,B) =  \sum _{i=1...7}  \left |  \frac{1}{m^A_i} -  \frac{1}{m^B_i} \right |\f]
+    CONTOURS_MATCH_I2  =2, //!< \f[I_2(A,B) =  \sum _{i=1...7}  \left | m^A_i - m^B_i  \right |\f]
+    CONTOURS_MATCH_I3  =3  //!< \f[I_3(A,B) =  \max _{i=1...7}  \frac{ \left| m^A_i - m^B_i \right| }{ \left| m^A_i \right| }\f]
+};
+
+//! @} imgproc_shape
+
+//! @addtogroup imgproc_feature
+//! @{
+
+//! Variants of a Hough transform
+enum HoughModes {
+
+    /** classical or standard Hough transform. Every line is represented by two floating-point
+    numbers \f$(\rho, \theta)\f$ , where \f$\rho\f$ is a distance between (0,0) point and the line,
+    and \f$\theta\f$ is the angle between x-axis and the normal to the line. Thus, the matrix must
+    be (the created sequence will be) of CV_32FC2 type */
+    HOUGH_STANDARD      = 0,
+    /** probabilistic Hough transform (more efficient in case if the picture contains a few long
+    linear segments). It returns line segments rather than the whole line. Each segment is
+    represented by starting and ending points, and the matrix must be (the created sequence will
+    be) of the CV_32SC4 type. */
+    HOUGH_PROBABILISTIC = 1,
+    /** multi-scale variant of the classical Hough transform. The lines are encoded the same way as
+    HOUGH_STANDARD. */
+    HOUGH_MULTI_SCALE   = 2,
+    HOUGH_GRADIENT      = 3, //!< basically *21HT*, described in @cite Yuen90
+    HOUGH_GRADIENT_ALT  = 4, //!< variation of HOUGH_GRADIENT to get better accuracy
+};
+
+//! Variants of Line Segment %Detector
+enum LineSegmentDetectorModes {
+    LSD_REFINE_NONE = 0, //!< No refinement applied
+    LSD_REFINE_STD  = 1, //!< Standard refinement is applied. E.g. breaking arches into smaller straighter line approximations.
+    LSD_REFINE_ADV  = 2  //!< Advanced refinement. Number of false alarms is calculated, lines are
+                         //!< refined through increase of precision, decrement in size, etc.
+};
+
+//! @} imgproc_feature
+
+/** Histogram comparison methods
+  @ingroup imgproc_hist
+*/
+enum HistCompMethods {
+    /** Correlation
+    \f[d(H_1,H_2) =  \frac{\sum_I (H_1(I) - \bar{H_1}) (H_2(I) - \bar{H_2})}{\sqrt{\sum_I(H_1(I) - \bar{H_1})^2 \sum_I(H_2(I) - \bar{H_2})^2}}\f]
+    where
+    \f[\bar{H_k} =  \frac{1}{N} \sum _J H_k(J)\f]
+    and \f$N\f$ is a total number of histogram bins. */
+    HISTCMP_CORREL        = 0,
+    /** Chi-Square
+    \f[d(H_1,H_2) =  \sum _I  \frac{\left(H_1(I)-H_2(I)\right)^2}{H_1(I)}\f] */
+    HISTCMP_CHISQR        = 1,
+    /** Intersection
+    \f[d(H_1,H_2) =  \sum _I  \min (H_1(I), H_2(I))\f] */
+    HISTCMP_INTERSECT     = 2,
+    /** Bhattacharyya distance
+    (In fact, OpenCV computes Hellinger distance, which is related to Bhattacharyya coefficient.)
+    \f[d(H_1,H_2) =  \sqrt{1 - \frac{1}{\sqrt{\bar{H_1} \bar{H_2} N^2}} \sum_I \sqrt{H_1(I) \cdot H_2(I)}}\f] */
+    HISTCMP_BHATTACHARYYA = 3,
+    HISTCMP_HELLINGER     = HISTCMP_BHATTACHARYYA, //!< Synonym for HISTCMP_BHATTACHARYYA
+    /** Alternative Chi-Square
+    \f[d(H_1,H_2) =  2 * \sum _I  \frac{\left(H_1(I)-H_2(I)\right)^2}{H_1(I)+H_2(I)}\f]
+    This alternative formula is regularly used for texture comparison. See e.g. @cite Puzicha1997 */
+    HISTCMP_CHISQR_ALT    = 4,
+    /** Kullback-Leibler divergence
+    \f[d(H_1,H_2) = \sum _I H_1(I) \log \left(\frac{H_1(I)}{H_2(I)}\right)\f] */
+    HISTCMP_KL_DIV        = 5
+};
+
+/** the color conversion codes
+@see @ref imgproc_color_conversions
+@ingroup imgproc_color_conversions
+ */
+enum ColorConversionCodes {
+    COLOR_BGR2BGRA     = 0, //!< add alpha channel to RGB or BGR image
+    COLOR_RGB2RGBA     = COLOR_BGR2BGRA,
+
+    COLOR_BGRA2BGR     = 1, //!< remove alpha channel from RGB or BGR image
+    COLOR_RGBA2RGB     = COLOR_BGRA2BGR,
+
+    COLOR_BGR2RGBA     = 2, //!< convert between RGB and BGR color spaces (with or without alpha channel)
+    COLOR_RGB2BGRA     = COLOR_BGR2RGBA,
+
+    COLOR_RGBA2BGR     = 3,
+    COLOR_BGRA2RGB     = COLOR_RGBA2BGR,
+
+    COLOR_BGR2RGB      = 4,
+    COLOR_RGB2BGR      = COLOR_BGR2RGB,
+
+    COLOR_BGRA2RGBA    = 5,
+    COLOR_RGBA2BGRA    = COLOR_BGRA2RGBA,
+
+    COLOR_BGR2GRAY     = 6, //!< convert between RGB/BGR and grayscale, @ref color_convert_rgb_gray "color conversions"
+    COLOR_RGB2GRAY     = 7,
+    COLOR_GRAY2BGR     = 8,
+    COLOR_GRAY2RGB     = COLOR_GRAY2BGR,
+    COLOR_GRAY2BGRA    = 9,
+    COLOR_GRAY2RGBA    = COLOR_GRAY2BGRA,
+    COLOR_BGRA2GRAY    = 10,
+    COLOR_RGBA2GRAY    = 11,
+
+    COLOR_BGR2BGR565   = 12, //!< convert between RGB/BGR and BGR565 (16-bit images)
+    COLOR_RGB2BGR565   = 13,
+    COLOR_BGR5652BGR   = 14,
+    COLOR_BGR5652RGB   = 15,
+    COLOR_BGRA2BGR565  = 16,
+    COLOR_RGBA2BGR565  = 17,
+    COLOR_BGR5652BGRA  = 18,
+    COLOR_BGR5652RGBA  = 19,
+
+    COLOR_GRAY2BGR565  = 20, //!< convert between grayscale to BGR565 (16-bit images)
+    COLOR_BGR5652GRAY  = 21,
+
+    COLOR_BGR2BGR555   = 22,  //!< convert between RGB/BGR and BGR555 (16-bit images)
+    COLOR_RGB2BGR555   = 23,
+    COLOR_BGR5552BGR   = 24,
+    COLOR_BGR5552RGB   = 25,
+    COLOR_BGRA2BGR555  = 26,
+    COLOR_RGBA2BGR555  = 27,
+    COLOR_BGR5552BGRA  = 28,
+    COLOR_BGR5552RGBA  = 29,
+
+    COLOR_GRAY2BGR555  = 30, //!< convert between grayscale and BGR555 (16-bit images)
+    COLOR_BGR5552GRAY  = 31,
+
+    COLOR_BGR2XYZ      = 32, //!< convert RGB/BGR to CIE XYZ, @ref color_convert_rgb_xyz "color conversions"
+    COLOR_RGB2XYZ      = 33,
+    COLOR_XYZ2BGR      = 34,
+    COLOR_XYZ2RGB      = 35,
+
+    COLOR_BGR2YCrCb    = 36, //!< convert RGB/BGR to luma-chroma (aka YCC), @ref color_convert_rgb_ycrcb "color conversions"
+    COLOR_RGB2YCrCb    = 37,
+    COLOR_YCrCb2BGR    = 38,
+    COLOR_YCrCb2RGB    = 39,
+
+    COLOR_BGR2HSV      = 40, //!< convert RGB/BGR to HSV (hue saturation value) with H range 0..180 if 8 bit image, @ref color_convert_rgb_hsv "color conversions"
+    COLOR_RGB2HSV      = 41,
+
+    COLOR_BGR2Lab      = 44, //!< convert RGB/BGR to CIE Lab, @ref color_convert_rgb_lab "color conversions"
+    COLOR_RGB2Lab      = 45,
+
+    COLOR_BGR2Luv      = 50, //!< convert RGB/BGR to CIE Luv, @ref color_convert_rgb_luv "color conversions"
+    COLOR_RGB2Luv      = 51,
+    COLOR_BGR2HLS      = 52, //!< convert RGB/BGR to HLS (hue lightness saturation) with H range 0..180 if 8 bit image, @ref color_convert_rgb_hls "color conversions"
+    COLOR_RGB2HLS      = 53,
+
+    COLOR_HSV2BGR      = 54, //!< backward conversions HSV to RGB/BGR with H range 0..180 if 8 bit image
+    COLOR_HSV2RGB      = 55,
+
+    COLOR_Lab2BGR      = 56,
+    COLOR_Lab2RGB      = 57,
+    COLOR_Luv2BGR      = 58,
+    COLOR_Luv2RGB      = 59,
+    COLOR_HLS2BGR      = 60, //!< backward conversions HLS to RGB/BGR with H range 0..180 if 8 bit image
+    COLOR_HLS2RGB      = 61,
+
+    COLOR_BGR2HSV_FULL = 66, //!< convert RGB/BGR to HSV (hue saturation value) with H range 0..255 if 8 bit image, @ref color_convert_rgb_hsv "color conversions"
+    COLOR_RGB2HSV_FULL = 67,
+    COLOR_BGR2HLS_FULL = 68, //!< convert RGB/BGR to HLS (hue lightness saturation) with H range 0..255 if 8 bit image, @ref color_convert_rgb_hls "color conversions"
+    COLOR_RGB2HLS_FULL = 69,
+
+    COLOR_HSV2BGR_FULL = 70, //!< backward conversions HSV to RGB/BGR with H range 0..255 if 8 bit image
+    COLOR_HSV2RGB_FULL = 71,
+    COLOR_HLS2BGR_FULL = 72, //!< backward conversions HLS to RGB/BGR with H range 0..255 if 8 bit image
+    COLOR_HLS2RGB_FULL = 73,
+
+    COLOR_LBGR2Lab     = 74,
+    COLOR_LRGB2Lab     = 75,
+    COLOR_LBGR2Luv     = 76,
+    COLOR_LRGB2Luv     = 77,
+
+    COLOR_Lab2LBGR     = 78,
+    COLOR_Lab2LRGB     = 79,
+    COLOR_Luv2LBGR     = 80,
+    COLOR_Luv2LRGB     = 81,
+
+    COLOR_BGR2YUV      = 82, //!< convert between RGB/BGR and YUV
+    COLOR_RGB2YUV      = 83,
+    COLOR_YUV2BGR      = 84,
+    COLOR_YUV2RGB      = 85,
+
+    COLOR_YUV2RGB_NV12  = 90, //!< convert between 4:2:0-subsampled YUV NV12 and RGB, two planes (in one or separate arrays): Y and U/V interleaved, see @ref color_convert_rgb_yuv_42x
+    COLOR_YUV2BGR_NV12  = 91, //!< convert between 4:2:0-subsampled YUV NV12 and BGR, two planes (in one or separate arrays): Y and U/V interleaved, see @ref color_convert_rgb_yuv_42x
+    COLOR_YUV2RGB_NV21  = 92, //!< convert between 4:2:0-subsampled YUV NV21 and RGB, two planes (in one or separate arrays): Y and V/U interleaved, see @ref color_convert_rgb_yuv_42x
+    COLOR_YUV2BGR_NV21  = 93, //!< convert between 4:2:0-subsampled YUV NV21 and BGR, two planes (in one or separate arrays): Y and V/U interleaved, see @ref color_convert_rgb_yuv_42x
+    COLOR_YUV420sp2RGB  = COLOR_YUV2RGB_NV21, //!< synonym to NV21
+    COLOR_YUV420sp2BGR  = COLOR_YUV2BGR_NV21, //!< synonym to NV21
+
+    COLOR_YUV2RGBA_NV12 = 94, //!< convert between 4:2:0-subsampled YUV NV12 and RGBA, two planes (in one or separate arrays): Y and U/V interleaved, see @ref color_convert_rgb_yuv_42x
+    COLOR_YUV2BGRA_NV12 = 95, //!< convert between 4:2:0-subsampled YUV NV12 and BGRA, two planes (in one or separate arrays): Y and U/V interleaved, see @ref color_convert_rgb_yuv_42x
+    COLOR_YUV2RGBA_NV21 = 96, //!< convert between 4:2:0-subsampled YUV NV21 and RGBA, two planes (in one or separate arrays): Y and V/U interleaved, see @ref color_convert_rgb_yuv_42x
+    COLOR_YUV2BGRA_NV21 = 97, //!< convert between 4:2:0-subsampled YUV NV21 and BGRA, two planes (in one or separate arrays): Y and V/U interleaved, see @ref color_convert_rgb_yuv_42x
+    COLOR_YUV420sp2RGBA = COLOR_YUV2RGBA_NV21, //!< synonym to NV21
+    COLOR_YUV420sp2BGRA = COLOR_YUV2BGRA_NV21, //!< synonym to NV21
+
+    COLOR_YUV2RGB_YV12  =  98, //!< convert between 4:2:0-subsampled YUV YV12 and RGB, three planes in one array: Y, V and U, see @ref color_convert_rgb_yuv_42x
+    COLOR_YUV2BGR_YV12  =  99, //!< convert between 4:2:0-subsampled YUV YV12 and BGR, three planes in one array: Y, V and U, see @ref color_convert_rgb_yuv_42x
+    COLOR_YUV2RGB_IYUV  = 100, //!< convert between 4:2:0-subsampled YUV IYUV and RGB, three planes in one array: Y, U and V, see @ref color_convert_rgb_yuv_42x
+    COLOR_YUV2BGR_IYUV  = 101, //!< convert between 4:2:0-subsampled YUV IYUV and BGR, three planes in one array: Y, U and V, see @ref color_convert_rgb_yuv_42x
+    COLOR_YUV2RGB_I420  = COLOR_YUV2RGB_IYUV, //!< synonym to IYUV
+    COLOR_YUV2BGR_I420  = COLOR_YUV2BGR_IYUV, //!< synonym to IYUV
+    COLOR_YUV420p2RGB   = COLOR_YUV2RGB_YV12, //!< synonym to YV12
+    COLOR_YUV420p2BGR   = COLOR_YUV2BGR_YV12, //!< synonym to YV12
+
+    COLOR_YUV2RGBA_YV12 = 102, //!< convert between 4:2:0-subsampled YUV YV12 and RGBA, three planes in one array: Y, V and U, see @ref color_convert_rgb_yuv_42x
+    COLOR_YUV2BGRA_YV12 = 103, //!< convert between 4:2:0-subsampled YUV YV12 and BGRA, three planes in one array: Y, V and U, see @ref color_convert_rgb_yuv_42x
+    COLOR_YUV2RGBA_IYUV = 104, //!< convert between 4:2:0-subsampled YUV YV12 and RGBA, three planes in one array: Y, U and V, see @ref color_convert_rgb_yuv_42x
+    COLOR_YUV2BGRA_IYUV = 105, //!< convert between 4:2:0-subsampled YUV YV12 and BGRA, three planes in one array: Y, U and V, see @ref color_convert_rgb_yuv_42x
+    COLOR_YUV2RGBA_I420 = COLOR_YUV2RGBA_IYUV, //!< synonym to IYUV
+    COLOR_YUV2BGRA_I420 = COLOR_YUV2BGRA_IYUV, //!< synonym to IYUV
+    COLOR_YUV420p2RGBA  = COLOR_YUV2RGBA_YV12, //!< synonym to YV12
+    COLOR_YUV420p2BGRA  = COLOR_YUV2BGRA_YV12, //!< synonym to YV12
+
+    COLOR_YUV2GRAY_420  = 106, //!< extract Y channel from YUV 4:2:0 image
+    COLOR_YUV2GRAY_NV21 = COLOR_YUV2GRAY_420, //!< synonym to COLOR_YUV2GRAY_420
+    COLOR_YUV2GRAY_NV12 = COLOR_YUV2GRAY_420, //!< synonym to COLOR_YUV2GRAY_420
+    COLOR_YUV2GRAY_YV12 = COLOR_YUV2GRAY_420, //!< synonym to COLOR_YUV2GRAY_420
+    COLOR_YUV2GRAY_IYUV = COLOR_YUV2GRAY_420, //!< synonym to COLOR_YUV2GRAY_420
+    COLOR_YUV2GRAY_I420 = COLOR_YUV2GRAY_420, //!< synonym to COLOR_YUV2GRAY_420
+    COLOR_YUV420sp2GRAY = COLOR_YUV2GRAY_420, //!< synonym to COLOR_YUV2GRAY_420
+    COLOR_YUV420p2GRAY  = COLOR_YUV2GRAY_420, //!< synonym to COLOR_YUV2GRAY_420
+
+    COLOR_YUV2RGB_UYVY = 107, //!< convert between YUV UYVY and RGB, YUV is 4:2:2-subsampled and interleaved as U/Y1/V/Y2, see @ref color_convert_rgb_yuv_42x
+    COLOR_YUV2BGR_UYVY = 108, //!< convert between YUV UYVY and BGR, YUV is 4:2:2-subsampled and interleaved as U/Y1/V/Y2, see @ref color_convert_rgb_yuv_42x
+    //COLOR_YUV2RGB_VYUY = 109, //!< convert between YUV VYUY and RGB, YUV is 4:2:2-subsampled and interleaved as V/Y1/U/Y2, see @ref color_convert_rgb_yuv_42x
+    //COLOR_YUV2BGR_VYUY = 110, //!< convert between YUV VYUY and BGR, YUV is 4:2:2-subsampled and interleaved as V/Y1/U/Y2, see @ref color_convert_rgb_yuv_42x
+    COLOR_YUV2RGB_Y422 = COLOR_YUV2RGB_UYVY, //!< synonym to UYVY
+    COLOR_YUV2BGR_Y422 = COLOR_YUV2BGR_UYVY, //!< synonym to UYVY
+    COLOR_YUV2RGB_UYNV = COLOR_YUV2RGB_UYVY, //!< synonym to UYVY
+    COLOR_YUV2BGR_UYNV = COLOR_YUV2BGR_UYVY, //!< synonym to UYVY
+
+    COLOR_YUV2RGBA_UYVY = 111, //!< convert between YUV UYVY and RGBA, YUV is 4:2:2-subsampled and interleaved as U/Y1/V/Y2, see @ref color_convert_rgb_yuv_42x
+    COLOR_YUV2BGRA_UYVY = 112, //!< convert between YUV UYVY and BGRA, YUV is 4:2:2-subsampled and interleaved as U/Y1/V/Y2, see @ref color_convert_rgb_yuv_42x
+    //COLOR_YUV2RGBA_VYUY = 113, //!< convert between YUV VYUY and RGBA, YUV is 4:2:2-subsampled and interleaved as V/Y1/U/Y2, see @ref color_convert_rgb_yuv_42x
+    //COLOR_YUV2BGRA_VYUY = 114, //!< convert between YUV VYUY and BGRA, YUV is 4:2:2-subsampled and interleaved as V/Y1/U/Y2, see @ref color_convert_rgb_yuv_42x
+    COLOR_YUV2RGBA_Y422 = COLOR_YUV2RGBA_UYVY, //!< synonym to UYVY
+    COLOR_YUV2BGRA_Y422 = COLOR_YUV2BGRA_UYVY, //!< synonym to UYVY
+    COLOR_YUV2RGBA_UYNV = COLOR_YUV2RGBA_UYVY, //!< synonym to UYVY
+    COLOR_YUV2BGRA_UYNV = COLOR_YUV2BGRA_UYVY, //!< synonym to UYVY
+
+    COLOR_YUV2RGB_YUY2 = 115, //!< convert between YUV YUY2 and RGB, YUV is 4:2:2-subsampled and interleaved as Y1/U/Y2/V, see @ref color_convert_rgb_yuv_42x
+    COLOR_YUV2BGR_YUY2 = 116, //!< convert between YUV YUY2 and BGR, YUV is 4:2:2-subsampled and interleaved as Y1/U/Y2/V, see @ref color_convert_rgb_yuv_42x
+    COLOR_YUV2RGB_YVYU = 117, //!< convert between YUV YVYU and RGB, YUV is 4:2:2-subsampled and interleaved as Y1/V/Y2/U, see @ref color_convert_rgb_yuv_42x
+    COLOR_YUV2BGR_YVYU = 118, //!< convert between YUV YVYU and BGR, YUV is 4:2:2-subsampled and interleaved as Y1/V/Y2/U, see @ref color_convert_rgb_yuv_42x
+    COLOR_YUV2RGB_YUYV = COLOR_YUV2RGB_YUY2, //!< synonym to YUY2
+    COLOR_YUV2BGR_YUYV = COLOR_YUV2BGR_YUY2, //!< synonym to YUY2
+    COLOR_YUV2RGB_YUNV = COLOR_YUV2RGB_YUY2, //!< synonym to YUY2
+    COLOR_YUV2BGR_YUNV = COLOR_YUV2BGR_YUY2, //!< synonym to YUY2
+
+    COLOR_YUV2RGBA_YUY2 = 119, //!< convert between YUV YUY2 and RGBA, YUV is 4:2:2-subsampled and interleaved as Y1/U/Y2/V, see @ref color_convert_rgb_yuv_42x
+    COLOR_YUV2BGRA_YUY2 = 120, //!< convert between YUV YUY2 and BGRA, YUV is 4:2:2-subsampled and interleaved as Y1/U/Y2/V, see @ref color_convert_rgb_yuv_42x
+    COLOR_YUV2RGBA_YVYU = 121, //!< convert between YUV YVYU and RGBA, YUV is 4:2:2-subsampled and interleaved as Y1/V/Y2/U, see @ref color_convert_rgb_yuv_42x
+    COLOR_YUV2BGRA_YVYU = 122, //!< convert between YUV YVYU and BGRA, YUV is 4:2:2-subsampled and interleaved as Y1/V/Y2/U, see @ref color_convert_rgb_yuv_42x
+    COLOR_YUV2RGBA_YUYV = COLOR_YUV2RGBA_YUY2, //!< synonym to YUY2
+    COLOR_YUV2BGRA_YUYV = COLOR_YUV2BGRA_YUY2, //!< synonym to YUY2
+    COLOR_YUV2RGBA_YUNV = COLOR_YUV2RGBA_YUY2, //!< synonym to YUY2
+    COLOR_YUV2BGRA_YUNV = COLOR_YUV2BGRA_YUY2, //!< synonym to YUY2
+
+    COLOR_YUV2GRAY_UYVY = 123, //!< extract Y channel from YUV 4:2:2 image
+    COLOR_YUV2GRAY_YUY2 = 124, //!< extract Y channel from YUV 4:2:2 image
+    //CV_YUV2GRAY_VYUY  = CV_YUV2GRAY_UYVY, //!< synonym to COLOR_YUV2GRAY_UYVY
+    COLOR_YUV2GRAY_Y422 = COLOR_YUV2GRAY_UYVY, //!< synonym to COLOR_YUV2GRAY_UYVY
+    COLOR_YUV2GRAY_UYNV = COLOR_YUV2GRAY_UYVY, //!< synonym to COLOR_YUV2GRAY_UYVY
+    COLOR_YUV2GRAY_YVYU = COLOR_YUV2GRAY_YUY2, //!< synonym to COLOR_YUV2GRAY_YUY2
+    COLOR_YUV2GRAY_YUYV = COLOR_YUV2GRAY_YUY2, //!< synonym to COLOR_YUV2GRAY_YUY2
+    COLOR_YUV2GRAY_YUNV = COLOR_YUV2GRAY_YUY2, //!< synonym to COLOR_YUV2GRAY_YUY2
+
+    //! alpha premultiplication
+    COLOR_RGBA2mRGBA    = 125,
+    COLOR_mRGBA2RGBA    = 126,
+
+    COLOR_RGB2YUV_I420  = 127, //!< convert between RGB and 4:2:0-subsampled YUV I420, three planes in one array: Y, U and V, see @ref color_convert_rgb_yuv_42x
+    COLOR_BGR2YUV_I420  = 128, //!< convert between BGR and 4:2:0-subsampled YUV I420, three planes in one array: Y, U and V, see @ref color_convert_rgb_yuv_42x
+    COLOR_RGB2YUV_IYUV  = COLOR_RGB2YUV_I420, //!< synonym to I420
+    COLOR_BGR2YUV_IYUV  = COLOR_BGR2YUV_I420, //!< synonym to I420
+
+    COLOR_RGBA2YUV_I420 = 129, //!< convert between RGBA and 4:2:0-subsampled YUV I420, three planes in one array: Y, U and V, see @ref color_convert_rgb_yuv_42x
+    COLOR_BGRA2YUV_I420 = 130, //!< convert between BGRA and 4:2:0-subsampled YUV I420, three planes in one array: Y, U and V, see @ref color_convert_rgb_yuv_42x
+    COLOR_RGBA2YUV_IYUV = COLOR_RGBA2YUV_I420, //!< synonym to I420
+    COLOR_BGRA2YUV_IYUV = COLOR_BGRA2YUV_I420, //!< synonym to I420
+    COLOR_RGB2YUV_YV12  = 131, //!< convert between RGB and 4:2:0-subsampled YUV YV12, three planes in one array: Y, V and U, see @ref color_convert_rgb_yuv_42x
+    COLOR_BGR2YUV_YV12  = 132, //!< convert between BGR and 4:2:0-subsampled YUV YV12, three planes in one array: Y, V and U, see @ref color_convert_rgb_yuv_42x
+    COLOR_RGBA2YUV_YV12 = 133, //!< convert between RGBA and 4:2:0-subsampled YUV YV12, three planes in one array: Y, V and U, see @ref color_convert_rgb_yuv_42x
+    COLOR_BGRA2YUV_YV12 = 134, //!< convert between BGRA and 4:2:0-subsampled YUV YV12, three planes in one array: Y, V and U, see @ref color_convert_rgb_yuv_42x
+
+    //! Demosaicing, see @ref color_convert_bayer "color conversions" for additional information
+    COLOR_BayerBG2BGR = 46, //!< equivalent to RGGB Bayer pattern
+    COLOR_BayerGB2BGR = 47, //!< equivalent to GRBG Bayer pattern
+    COLOR_BayerRG2BGR = 48, //!< equivalent to BGGR Bayer pattern
+    COLOR_BayerGR2BGR = 49, //!< equivalent to GBRG Bayer pattern
+
+    COLOR_BayerRGGB2BGR = COLOR_BayerBG2BGR,
+    COLOR_BayerGRBG2BGR = COLOR_BayerGB2BGR,
+    COLOR_BayerBGGR2BGR = COLOR_BayerRG2BGR,
+    COLOR_BayerGBRG2BGR = COLOR_BayerGR2BGR,
+
+    COLOR_BayerRGGB2RGB = COLOR_BayerBGGR2BGR,
+    COLOR_BayerGRBG2RGB = COLOR_BayerGBRG2BGR,
+    COLOR_BayerBGGR2RGB = COLOR_BayerRGGB2BGR,
+    COLOR_BayerGBRG2RGB = COLOR_BayerGRBG2BGR,
+
+    COLOR_BayerBG2RGB = COLOR_BayerRG2BGR, //!< equivalent to RGGB Bayer pattern
+    COLOR_BayerGB2RGB = COLOR_BayerGR2BGR, //!< equivalent to GRBG Bayer pattern
+    COLOR_BayerRG2RGB = COLOR_BayerBG2BGR, //!< equivalent to BGGR Bayer pattern
+    COLOR_BayerGR2RGB = COLOR_BayerGB2BGR, //!< equivalent to GBRG Bayer pattern
+
+    COLOR_BayerBG2GRAY = 86, //!< equivalent to RGGB Bayer pattern
+    COLOR_BayerGB2GRAY = 87, //!< equivalent to GRBG Bayer pattern
+    COLOR_BayerRG2GRAY = 88, //!< equivalent to BGGR Bayer pattern
+    COLOR_BayerGR2GRAY = 89, //!< equivalent to GBRG Bayer pattern
+
+    COLOR_BayerRGGB2GRAY = COLOR_BayerBG2GRAY,
+    COLOR_BayerGRBG2GRAY = COLOR_BayerGB2GRAY,
+    COLOR_BayerBGGR2GRAY = COLOR_BayerRG2GRAY,
+    COLOR_BayerGBRG2GRAY = COLOR_BayerGR2GRAY,
+
+    //! Demosaicing using Variable Number of Gradients
+    COLOR_BayerBG2BGR_VNG = 62, //!< equivalent to RGGB Bayer pattern
+    COLOR_BayerGB2BGR_VNG = 63, //!< equivalent to GRBG Bayer pattern
+    COLOR_BayerRG2BGR_VNG = 64, //!< equivalent to BGGR Bayer pattern
+    COLOR_BayerGR2BGR_VNG = 65, //!< equivalent to GBRG Bayer pattern
+
+    COLOR_BayerRGGB2BGR_VNG = COLOR_BayerBG2BGR_VNG,
+    COLOR_BayerGRBG2BGR_VNG = COLOR_BayerGB2BGR_VNG,
+    COLOR_BayerBGGR2BGR_VNG = COLOR_BayerRG2BGR_VNG,
+    COLOR_BayerGBRG2BGR_VNG = COLOR_BayerGR2BGR_VNG,
+
+    COLOR_BayerRGGB2RGB_VNG = COLOR_BayerBGGR2BGR_VNG,
+    COLOR_BayerGRBG2RGB_VNG = COLOR_BayerGBRG2BGR_VNG,
+    COLOR_BayerBGGR2RGB_VNG = COLOR_BayerRGGB2BGR_VNG,
+    COLOR_BayerGBRG2RGB_VNG = COLOR_BayerGRBG2BGR_VNG,
+
+    COLOR_BayerBG2RGB_VNG = COLOR_BayerRG2BGR_VNG, //!< equivalent to RGGB Bayer pattern
+    COLOR_BayerGB2RGB_VNG = COLOR_BayerGR2BGR_VNG, //!< equivalent to GRBG Bayer pattern
+    COLOR_BayerRG2RGB_VNG = COLOR_BayerBG2BGR_VNG, //!< equivalent to BGGR Bayer pattern
+    COLOR_BayerGR2RGB_VNG = COLOR_BayerGB2BGR_VNG, //!< equivalent to GBRG Bayer pattern
+
+    //! Edge-Aware Demosaicing
+    COLOR_BayerBG2BGR_EA  = 135, //!< equivalent to RGGB Bayer pattern
+    COLOR_BayerGB2BGR_EA  = 136, //!< equivalent to GRBG Bayer pattern
+    COLOR_BayerRG2BGR_EA  = 137, //!< equivalent to BGGR Bayer pattern
+    COLOR_BayerGR2BGR_EA  = 138, //!< equivalent to GBRG Bayer pattern
+
+    COLOR_BayerRGGB2BGR_EA  = COLOR_BayerBG2BGR_EA,
+    COLOR_BayerGRBG2BGR_EA  = COLOR_BayerGB2BGR_EA,
+    COLOR_BayerBGGR2BGR_EA  = COLOR_BayerRG2BGR_EA,
+    COLOR_BayerGBRG2BGR_EA  = COLOR_BayerGR2BGR_EA,
+
+    COLOR_BayerRGGB2RGB_EA  = COLOR_BayerBGGR2BGR_EA,
+    COLOR_BayerGRBG2RGB_EA  = COLOR_BayerGBRG2BGR_EA,
+    COLOR_BayerBGGR2RGB_EA  = COLOR_BayerRGGB2BGR_EA,
+    COLOR_BayerGBRG2RGB_EA  = COLOR_BayerGRBG2BGR_EA,
+
+    COLOR_BayerBG2RGB_EA  = COLOR_BayerRG2BGR_EA, //!< equivalent to RGGB Bayer pattern
+    COLOR_BayerGB2RGB_EA  = COLOR_BayerGR2BGR_EA, //!< equivalent to GRBG Bayer pattern
+    COLOR_BayerRG2RGB_EA  = COLOR_BayerBG2BGR_EA, //!< equivalent to BGGR Bayer pattern
+    COLOR_BayerGR2RGB_EA  = COLOR_BayerGB2BGR_EA, //!< equivalent to GBRG Bayer pattern
+
+    //! Demosaicing with alpha channel
+    COLOR_BayerBG2BGRA = 139, //!< equivalent to RGGB Bayer pattern
+    COLOR_BayerGB2BGRA = 140, //!< equivalent to GRBG Bayer pattern
+    COLOR_BayerRG2BGRA = 141, //!< equivalent to BGGR Bayer pattern
+    COLOR_BayerGR2BGRA = 142, //!< equivalent to GBRG Bayer pattern
+
+    COLOR_BayerRGGB2BGRA = COLOR_BayerBG2BGRA,
+    COLOR_BayerGRBG2BGRA = COLOR_BayerGB2BGRA,
+    COLOR_BayerBGGR2BGRA = COLOR_BayerRG2BGRA,
+    COLOR_BayerGBRG2BGRA = COLOR_BayerGR2BGRA,
+
+    COLOR_BayerRGGB2RGBA = COLOR_BayerBGGR2BGRA,
+    COLOR_BayerGRBG2RGBA = COLOR_BayerGBRG2BGRA,
+    COLOR_BayerBGGR2RGBA = COLOR_BayerRGGB2BGRA,
+    COLOR_BayerGBRG2RGBA = COLOR_BayerGRBG2BGRA,
+
+    COLOR_BayerBG2RGBA = COLOR_BayerRG2BGRA, //!< equivalent to RGGB Bayer pattern
+    COLOR_BayerGB2RGBA = COLOR_BayerGR2BGRA, //!< equivalent to GRBG Bayer pattern
+    COLOR_BayerRG2RGBA = COLOR_BayerBG2BGRA, //!< equivalent to BGGR Bayer pattern
+    COLOR_BayerGR2RGBA = COLOR_BayerGB2BGRA, //!< equivalent to GBRG Bayer pattern
+
+    COLOR_RGB2YUV_UYVY = 143, //!< convert between RGB and YUV UYVU, YUV is 4:2:2 and interleaved as U/Y1/V/Y2, see @ref color_convert_rgb_yuv_42x
+    COLOR_BGR2YUV_UYVY = 144, //!< convert between BGR and YUV UYVU, YUV is 4:2:2 and interleaved as U/Y1/V/Y2, see @ref color_convert_rgb_yuv_42x
+    COLOR_RGB2YUV_Y422 = COLOR_RGB2YUV_UYVY, //!< synonym to UYVY
+    COLOR_BGR2YUV_Y422 = COLOR_BGR2YUV_UYVY, //!< synonym to UYVY
+    COLOR_RGB2YUV_UYNV = COLOR_RGB2YUV_UYVY, //!< synonym to UYVY
+    COLOR_BGR2YUV_UYNV = COLOR_BGR2YUV_UYVY, //!< synonym to UYVY
+
+    COLOR_RGBA2YUV_UYVY = 145, //!< convert between RGBA and YUV UYVU, YUV is 4:2:2 and interleaved as U/Y1/V/Y2, see @ref color_convert_rgb_yuv_42x
+    COLOR_BGRA2YUV_UYVY = 146, //!< convert between BGRA and YUV UYVU, YUV is 4:2:2 and interleaved as U/Y1/V/Y2, see @ref color_convert_rgb_yuv_42x
+    COLOR_RGBA2YUV_Y422 = COLOR_RGBA2YUV_UYVY, //!< synonym to UYVY
+    COLOR_BGRA2YUV_Y422 = COLOR_BGRA2YUV_UYVY, //!< synonym to UYVY
+    COLOR_RGBA2YUV_UYNV = COLOR_RGBA2YUV_UYVY, //!< synonym to UYVY
+    COLOR_BGRA2YUV_UYNV = COLOR_BGRA2YUV_UYVY, //!< synonym to UYVY
+
+    COLOR_RGB2YUV_YUY2 = 147, //!< convert between RGB and YUV YUY2, YUV is 4:2:2 and interleaved as Y1/U/Y2/V, see @ref color_convert_rgb_yuv_42x
+    COLOR_BGR2YUV_YUY2 = 148, //!< convert between BGR and YUV YUY2, YUV is 4:2:2 and interleaved as Y1/U/Y2/V, see @ref color_convert_rgb_yuv_42x
+    COLOR_RGB2YUV_YVYU = 149, //!< convert between RGB and YUV YVYU, YUV is 4:2:2 and interleaved as Y1/V/Y2/U, see @ref color_convert_rgb_yuv_42x
+    COLOR_BGR2YUV_YVYU = 150, //!< convert between BGR and YUV YVYU, YUV is 4:2:2 and interleaved as Y1/V/Y2/U, see @ref color_convert_rgb_yuv_42x
+    COLOR_RGB2YUV_YUYV = COLOR_RGB2YUV_YUY2, //!< synonym to YUY2
+    COLOR_BGR2YUV_YUYV = COLOR_BGR2YUV_YUY2, //!< synonym to YUY2
+    COLOR_RGB2YUV_YUNV = COLOR_RGB2YUV_YUY2, //!< synonym to YUY2
+    COLOR_BGR2YUV_YUNV = COLOR_BGR2YUV_YUY2, //!< synonym to YUY2
+
+    COLOR_RGBA2YUV_YUY2 = 151, //!< convert between RGBA and YUV YUY2, YUV is 4:2:2 and interleaved as Y1/U/Y2/V, see @ref color_convert_rgb_yuv_42x
+    COLOR_BGRA2YUV_YUY2 = 152, //!< convert between BGRA and YUV YUY2, YUV is 4:2:2 and interleaved as Y1/U/Y2/V, see @ref color_convert_rgb_yuv_42x
+    COLOR_RGBA2YUV_YVYU = 153, //!< convert between RGBA and YUV YVYU, YUV is 4:2:2 and interleaved as Y1/V/Y2/U, see @ref color_convert_rgb_yuv_42x
+    COLOR_BGRA2YUV_YVYU = 154, //!< convert between BGRA and YUV YVYU, YUV is 4:2:2 and interleaved as Y1/V/Y2/U, see @ref color_convert_rgb_yuv_42x
+    COLOR_RGBA2YUV_YUYV = COLOR_RGBA2YUV_YUY2, //!< synonym to YUY2
+    COLOR_BGRA2YUV_YUYV = COLOR_BGRA2YUV_YUY2, //!< synonym to YUY2
+    COLOR_RGBA2YUV_YUNV = COLOR_RGBA2YUV_YUY2, //!< synonym to YUY2
+    COLOR_BGRA2YUV_YUNV = COLOR_BGRA2YUV_YUY2, //!< synonym to YUY2
+
+    COLOR_COLORCVT_MAX  = 155
+};
+
+//! @addtogroup imgproc_shape
+//! @{
+
+//! types of intersection between rectangles
+enum RectanglesIntersectTypes {
+    INTERSECT_NONE = 0, //!< No intersection
+    INTERSECT_PARTIAL  = 1, //!< There is a partial intersection
+    INTERSECT_FULL  = 2 //!< One of the rectangle is fully enclosed in the other
+};
+
+/** types of line
+@ingroup imgproc_draw
+*/
+enum LineTypes {
+    FILLED  = -1,
+    LINE_4  = 4, //!< 4-connected line
+    LINE_8  = 8, //!< 8-connected line
+    LINE_AA = 16 //!< antialiased line
+};
+
+/** Only a subset of Hershey fonts <https://en.wikipedia.org/wiki/Hershey_fonts> are supported
+@ingroup imgproc_draw
+*/
+enum HersheyFonts {
+    FONT_HERSHEY_SIMPLEX        = 0, //!< normal size sans-serif font
+    FONT_HERSHEY_PLAIN          = 1, //!< small size sans-serif font
+    FONT_HERSHEY_DUPLEX         = 2, //!< normal size sans-serif font (more complex than FONT_HERSHEY_SIMPLEX)
+    FONT_HERSHEY_COMPLEX        = 3, //!< normal size serif font
+    FONT_HERSHEY_TRIPLEX        = 4, //!< normal size serif font (more complex than FONT_HERSHEY_COMPLEX)
+    FONT_HERSHEY_COMPLEX_SMALL  = 5, //!< smaller version of FONT_HERSHEY_COMPLEX
+    FONT_HERSHEY_SCRIPT_SIMPLEX = 6, //!< hand-writing style font
+    FONT_HERSHEY_SCRIPT_COMPLEX = 7, //!< more complex variant of FONT_HERSHEY_SCRIPT_SIMPLEX
+    FONT_ITALIC                 = 16 //!< flag for italic font
+};
+
+/** Possible set of marker types used for the cv::drawMarker function
+@ingroup imgproc_draw
+*/
+enum MarkerTypes
+{
+    MARKER_CROSS = 0,           //!< A crosshair marker shape
+    MARKER_TILTED_CROSS = 1,    //!< A 45 degree tilted crosshair marker shape
+    MARKER_STAR = 2,            //!< A star marker shape, combination of cross and tilted cross
+    MARKER_DIAMOND = 3,         //!< A diamond marker shape
+    MARKER_SQUARE = 4,          //!< A square marker shape
+    MARKER_TRIANGLE_UP = 5,     //!< An upwards pointing triangle marker shape
+    MARKER_TRIANGLE_DOWN = 6    //!< A downwards pointing triangle marker shape
+};
+
+/** @brief finds arbitrary template in the grayscale image using Generalized Hough Transform
+*/
+class CV_EXPORTS_W GeneralizedHough : public Algorithm
+{
+public:
+    //! set template to search
+    CV_WRAP virtual void setTemplate(InputArray templ, Point templCenter = Point(-1, -1)) = 0;
+    CV_WRAP virtual void setTemplate(InputArray edges, InputArray dx, InputArray dy, Point templCenter = Point(-1, -1)) = 0;
+
+    //! find template on image
+    CV_WRAP virtual void detect(InputArray image, OutputArray positions, OutputArray votes = noArray()) = 0;
+    CV_WRAP virtual void detect(InputArray edges, InputArray dx, InputArray dy, OutputArray positions, OutputArray votes = noArray()) = 0;
+
+    //! Canny low threshold.
+    CV_WRAP virtual void setCannyLowThresh(int cannyLowThresh) = 0;
+    CV_WRAP virtual int getCannyLowThresh() const = 0;
+
+    //! Canny high threshold.
+    CV_WRAP virtual void setCannyHighThresh(int cannyHighThresh) = 0;
+    CV_WRAP virtual int getCannyHighThresh() const = 0;
+
+    //! Minimum distance between the centers of the detected objects.
+    CV_WRAP virtual void setMinDist(double minDist) = 0;
+    CV_WRAP virtual double getMinDist() const = 0;
+
+    //! Inverse ratio of the accumulator resolution to the image resolution.
+    CV_WRAP virtual void setDp(double dp) = 0;
+    CV_WRAP virtual double getDp() const = 0;
+
+    //! Maximal size of inner buffers.
+    CV_WRAP virtual void setMaxBufferSize(int maxBufferSize) = 0;
+    CV_WRAP virtual int getMaxBufferSize() const = 0;
+};
+
+/** @brief finds arbitrary template in the grayscale image using Generalized Hough Transform
+
+Detects position only without translation and rotation @cite Ballard1981 .
+*/
+class CV_EXPORTS_W GeneralizedHoughBallard : public GeneralizedHough
+{
+public:
+    //! R-Table levels.
+    CV_WRAP virtual void setLevels(int levels) = 0;
+    CV_WRAP virtual int getLevels() const = 0;
+
+    //! The accumulator threshold for the template centers at the detection stage. The smaller it is, the more false positions may be detected.
+    CV_WRAP virtual void setVotesThreshold(int votesThreshold) = 0;
+    CV_WRAP virtual int getVotesThreshold() const = 0;
+};
+
+/** @brief finds arbitrary template in the grayscale image using Generalized Hough Transform
+
+Detects position, translation and rotation @cite Guil1999 .
+*/
+class CV_EXPORTS_W GeneralizedHoughGuil : public GeneralizedHough
+{
+public:
+    //! Angle difference in degrees between two points in feature.
+    CV_WRAP virtual void setXi(double xi) = 0;
+    CV_WRAP virtual double getXi() const = 0;
+
+    //! Feature table levels.
+    CV_WRAP virtual void setLevels(int levels) = 0;
+    CV_WRAP virtual int getLevels() const = 0;
+
+    //! Maximal difference between angles that treated as equal.
+    CV_WRAP virtual void setAngleEpsilon(double angleEpsilon) = 0;
+    CV_WRAP virtual double getAngleEpsilon() const = 0;
+
+    //! Minimal rotation angle to detect in degrees.
+    CV_WRAP virtual void setMinAngle(double minAngle) = 0;
+    CV_WRAP virtual double getMinAngle() const = 0;
+
+    //! Maximal rotation angle to detect in degrees.
+    CV_WRAP virtual void setMaxAngle(double maxAngle) = 0;
+    CV_WRAP virtual double getMaxAngle() const = 0;
+
+    //! Angle step in degrees.
+    CV_WRAP virtual void setAngleStep(double angleStep) = 0;
+    CV_WRAP virtual double getAngleStep() const = 0;
+
+    //! Angle votes threshold.
+    CV_WRAP virtual void setAngleThresh(int angleThresh) = 0;
+    CV_WRAP virtual int getAngleThresh() const = 0;
+
+    //! Minimal scale to detect.
+    CV_WRAP virtual void setMinScale(double minScale) = 0;
+    CV_WRAP virtual double getMinScale() const = 0;
+
+    //! Maximal scale to detect.
+    CV_WRAP virtual void setMaxScale(double maxScale) = 0;
+    CV_WRAP virtual double getMaxScale() const = 0;
+
+    //! Scale step.
+    CV_WRAP virtual void setScaleStep(double scaleStep) = 0;
+    CV_WRAP virtual double getScaleStep() const = 0;
+
+    //! Scale votes threshold.
+    CV_WRAP virtual void setScaleThresh(int scaleThresh) = 0;
+    CV_WRAP virtual int getScaleThresh() const = 0;
+
+    //! Position votes threshold.
+    CV_WRAP virtual void setPosThresh(int posThresh) = 0;
+    CV_WRAP virtual int getPosThresh() const = 0;
+};
+
+//! @} imgproc_shape
+
+//! @addtogroup imgproc_hist
+//! @{
+
+/** @brief Base class for Contrast Limited Adaptive Histogram Equalization.
+*/
+class CV_EXPORTS_W CLAHE : public Algorithm
+{
+public:
+    /** @brief Equalizes the histogram of a grayscale image using Contrast Limited Adaptive Histogram Equalization.
+
+    @param src Source image of type CV_8UC1 or CV_16UC1.
+    @param dst Destination image.
+     */
+    CV_WRAP virtual void apply(InputArray src, OutputArray dst) = 0;
+
+    /** @brief Sets threshold for contrast limiting.
+
+    @param clipLimit threshold value.
+    */
+    CV_WRAP virtual void setClipLimit(double clipLimit) = 0;
+
+    //! Returns threshold value for contrast limiting.
+    CV_WRAP virtual double getClipLimit() const = 0;
+
+    /** @brief Sets size of grid for histogram equalization. Input image will be divided into
+    equally sized rectangular tiles.
+
+    @param tileGridSize defines the number of tiles in row and column.
+    */
+    CV_WRAP virtual void setTilesGridSize(Size tileGridSize) = 0;
+
+    //!@brief Returns Size defines the number of tiles in row and column.
+    CV_WRAP virtual Size getTilesGridSize() const = 0;
+
+    CV_WRAP virtual void collectGarbage() = 0;
+};
+
+//! @} imgproc_hist
+
+//! @addtogroup imgproc_subdiv2d
+//! @{
+
+class CV_EXPORTS_W Subdiv2D
+{
+public:
+    /** Subdiv2D point location cases */
+    enum { PTLOC_ERROR        = -2, //!< Point location error
+           PTLOC_OUTSIDE_RECT = -1, //!< Point outside the subdivision bounding rect
+           PTLOC_INSIDE       = 0, //!< Point inside some facet
+           PTLOC_VERTEX       = 1, //!< Point coincides with one of the subdivision vertices
+           PTLOC_ON_EDGE      = 2  //!< Point on some edge
+         };
+
+    /** Subdiv2D edge type navigation (see: getEdge()) */
+    enum { NEXT_AROUND_ORG   = 0x00,
+           NEXT_AROUND_DST   = 0x22,
+           PREV_AROUND_ORG   = 0x11,
+           PREV_AROUND_DST   = 0x33,
+           NEXT_AROUND_LEFT  = 0x13,
+           NEXT_AROUND_RIGHT = 0x31,
+           PREV_AROUND_LEFT  = 0x20,
+           PREV_AROUND_RIGHT = 0x02
+         };
+
+    /** creates an empty Subdiv2D object.
+    To create a new empty Delaunay subdivision you need to use the #initDelaunay function.
+     */
+    CV_WRAP Subdiv2D();
+
+    /** @overload
+
+    @param rect Rectangle that includes all of the 2D points that are to be added to the subdivision.
+
+    The function creates an empty Delaunay subdivision where 2D points can be added using the function
+    insert() . All of the points to be added must be within the specified rectangle, otherwise a runtime
+    error is raised.
+     */
+    CV_WRAP Subdiv2D(Rect rect);
+
+    /** @brief Creates a new empty Delaunay subdivision
+
+    @param rect Rectangle that includes all of the 2D points that are to be added to the subdivision.
+
+     */
+    CV_WRAP void initDelaunay(Rect rect);
+
+    /** @brief Insert a single point into a Delaunay triangulation.
+
+    @param pt Point to insert.
+
+    The function inserts a single point into a subdivision and modifies the subdivision topology
+    appropriately. If a point with the same coordinates exists already, no new point is added.
+    @returns the ID of the point.
+
+    @note If the point is outside of the triangulation specified rect a runtime error is raised.
+     */
+    CV_WRAP int insert(Point2f pt);
+
+    /** @brief Insert multiple points into a Delaunay triangulation.
+
+    @param ptvec Points to insert.
+
+    The function inserts a vector of points into a subdivision and modifies the subdivision topology
+    appropriately.
+     */
+    CV_WRAP void insert(const std::vector<Point2f>& ptvec);
+
+    /** @brief Returns the location of a point within a Delaunay triangulation.
+
+    @param pt Point to locate.
+    @param edge Output edge that the point belongs to or is located to the right of it.
+    @param vertex Optional output vertex the input point coincides with.
+
+    The function locates the input point within the subdivision and gives one of the triangle edges
+    or vertices.
+
+    @returns an integer which specify one of the following five cases for point location:
+    -  The point falls into some facet. The function returns #PTLOC_INSIDE and edge will contain one of
+       edges of the facet.
+    -  The point falls onto the edge. The function returns #PTLOC_ON_EDGE and edge will contain this edge.
+    -  The point coincides with one of the subdivision vertices. The function returns #PTLOC_VERTEX and
+       vertex will contain a pointer to the vertex.
+    -  The point is outside the subdivision reference rectangle. The function returns #PTLOC_OUTSIDE_RECT
+       and no pointers are filled.
+    -  One of input arguments is invalid. A runtime error is raised or, if silent or "parent" error
+       processing mode is selected, #PTLOC_ERROR is returned.
+     */
+    CV_WRAP int locate(Point2f pt, CV_OUT int& edge, CV_OUT int& vertex);
+
+    /** @brief Finds the subdivision vertex closest to the given point.
+
+    @param pt Input point.
+    @param nearestPt Output subdivision vertex point.
+
+    The function is another function that locates the input point within the subdivision. It finds the
+    subdivision vertex that is the closest to the input point. It is not necessarily one of vertices
+    of the facet containing the input point, though the facet (located using locate() ) is used as a
+    starting point.
+
+    @returns vertex ID.
+     */
+    CV_WRAP int findNearest(Point2f pt, CV_OUT Point2f* nearestPt = 0);
+
+    /** @brief Returns a list of all edges.
+
+    @param edgeList Output vector.
+
+    The function gives each edge as a 4 numbers vector, where each two are one of the edge
+    vertices. i.e. org_x = v[0], org_y = v[1], dst_x = v[2], dst_y = v[3].
+     */
+    CV_WRAP void getEdgeList(CV_OUT std::vector<Vec4f>& edgeList) const;
+
+    /** @brief Returns a list of the leading edge ID connected to each triangle.
+
+    @param leadingEdgeList Output vector.
+
+    The function gives one edge ID for each triangle.
+     */
+    CV_WRAP void getLeadingEdgeList(CV_OUT std::vector<int>& leadingEdgeList) const;
+
+    /** @brief Returns a list of all triangles.
+
+    @param triangleList Output vector.
+
+    The function gives each triangle as a 6 numbers vector, where each two are one of the triangle
+    vertices. i.e. p1_x = v[0], p1_y = v[1], p2_x = v[2], p2_y = v[3], p3_x = v[4], p3_y = v[5].
+     */
+    CV_WRAP void getTriangleList(CV_OUT std::vector<Vec6f>& triangleList) const;
+
+    /** @brief Returns a list of all Voronoi facets.
+
+    @param idx Vector of vertices IDs to consider. For all vertices you can pass empty vector.
+    @param facetList Output vector of the Voronoi facets.
+    @param facetCenters Output vector of the Voronoi facets center points.
+
+     */
+    CV_WRAP void getVoronoiFacetList(const std::vector<int>& idx, CV_OUT std::vector<std::vector<Point2f> >& facetList,
+                                     CV_OUT std::vector<Point2f>& facetCenters);
+
+    /** @brief Returns vertex location from vertex ID.
+
+    @param vertex vertex ID.
+    @param firstEdge Optional. The first edge ID which is connected to the vertex.
+    @returns vertex (x,y)
+
+     */
+    CV_WRAP Point2f getVertex(int vertex, CV_OUT int* firstEdge = 0) const;
+
+    /** @brief Returns one of the edges related to the given edge.
+
+    @param edge Subdivision edge ID.
+    @param nextEdgeType Parameter specifying which of the related edges to return.
+    The following values are possible:
+    -   NEXT_AROUND_ORG next around the edge origin ( eOnext on the picture below if e is the input edge)
+    -   NEXT_AROUND_DST next around the edge vertex ( eDnext )
+    -   PREV_AROUND_ORG previous around the edge origin (reversed eRnext )
+    -   PREV_AROUND_DST previous around the edge destination (reversed eLnext )
+    -   NEXT_AROUND_LEFT next around the left facet ( eLnext )
+    -   NEXT_AROUND_RIGHT next around the right facet ( eRnext )
+    -   PREV_AROUND_LEFT previous around the left facet (reversed eOnext )
+    -   PREV_AROUND_RIGHT previous around the right facet (reversed eDnext )
+
+    ![sample output](pics/quadedge.png)
+
+    @returns edge ID related to the input edge.
+     */
+    CV_WRAP int getEdge( int edge, int nextEdgeType ) const;
+
+    /** @brief Returns next edge around the edge origin.
+
+    @param edge Subdivision edge ID.
+
+    @returns an integer which is next edge ID around the edge origin: eOnext on the
+    picture above if e is the input edge).
+     */
+    CV_WRAP int nextEdge(int edge) const;
+
+    /** @brief Returns another edge of the same quad-edge.
+
+    @param edge Subdivision edge ID.
+    @param rotate Parameter specifying which of the edges of the same quad-edge as the input
+    one to return. The following values are possible:
+    -   0 - the input edge ( e on the picture below if e is the input edge)
+    -   1 - the rotated edge ( eRot )
+    -   2 - the reversed edge (reversed e (in green))
+    -   3 - the reversed rotated edge (reversed eRot (in green))
+
+    @returns one of the edges ID of the same quad-edge as the input edge.
+     */
+    CV_WRAP int rotateEdge(int edge, int rotate) const;
+    CV_WRAP int symEdge(int edge) const;
+
+    /** @brief Returns the edge origin.
+
+    @param edge Subdivision edge ID.
+    @param orgpt Output vertex location.
+
+    @returns vertex ID.
+     */
+    CV_WRAP int edgeOrg(int edge, CV_OUT Point2f* orgpt = 0) const;
+
+    /** @brief Returns the edge destination.
+
+    @param edge Subdivision edge ID.
+    @param dstpt Output vertex location.
+
+    @returns vertex ID.
+     */
+    CV_WRAP int edgeDst(int edge, CV_OUT Point2f* dstpt = 0) const;
+
+protected:
+    int newEdge();
+    void deleteEdge(int edge);
+    int newPoint(Point2f pt, bool isvirtual, int firstEdge = 0);
+    void deletePoint(int vtx);
+    void setEdgePoints( int edge, int orgPt, int dstPt );
+    void splice( int edgeA, int edgeB );
+    int connectEdges( int edgeA, int edgeB );
+    void swapEdges( int edge );
+    int isRightOf(Point2f pt, int edge) const;
+    void calcVoronoi();
+    void clearVoronoi();
+    void checkSubdiv() const;
+
+    struct CV_EXPORTS Vertex
+    {
+        Vertex();
+        Vertex(Point2f pt, bool isvirtual, int firstEdge=0);
+        bool isvirtual() const;
+        bool isfree() const;
+
+        int firstEdge;
+        int type;
+        Point2f pt;
+    };
+
+    struct CV_EXPORTS QuadEdge
+    {
+        QuadEdge();
+        QuadEdge(int edgeidx);
+        bool isfree() const;
+
+        int next[4];
+        int pt[4];
+    };
+
+    //! All of the vertices
+    std::vector<Vertex> vtx;
+    //! All of the edges
+    std::vector<QuadEdge> qedges;
+    int freeQEdge;
+    int freePoint;
+    bool validGeometry;
+
+    int recentEdge;
+    //! Top left corner of the bounding rect
+    Point2f topLeft;
+    //! Bottom right corner of the bounding rect
+    Point2f bottomRight;
+};
+
+//! @} imgproc_subdiv2d
+
+//! @addtogroup imgproc_feature
+//! @{
+
+/** @example samples/cpp/lsd_lines.cpp
+An example using the LineSegmentDetector
+\image html building_lsd.png "Sample output image" width=434 height=300
+*/
+
+/** @brief Line segment detector class
+
+following the algorithm described at @cite Rafael12 .
+
+@note Implementation has been removed from OpenCV version 3.4.6 to 3.4.15 and version 4.1.0 to 4.5.3 due original code license conflict.
+restored again after [Computation of a NFA](https://github.com/rafael-grompone-von-gioi/binomial_nfa) code published under the MIT license.
+*/
+class CV_EXPORTS_W LineSegmentDetector : public Algorithm
+{
+public:
+
+    /** @brief Finds lines in the input image.
+
+    This is the output of the default parameters of the algorithm on the above shown image.
+
+    ![image](pics/building_lsd.png)
+
+    @param image A grayscale (CV_8UC1) input image. If only a roi needs to be selected, use:
+    `lsd_ptr-\>detect(image(roi), lines, ...); lines += Scalar(roi.x, roi.y, roi.x, roi.y);`
+    @param lines A vector of Vec4f elements specifying the beginning and ending point of a line. Where
+    Vec4f is (x1, y1, x2, y2), point 1 is the start, point 2 - end. Returned lines are strictly
+    oriented depending on the gradient.
+    @param width Vector of widths of the regions, where the lines are found. E.g. Width of line.
+    @param prec Vector of precisions with which the lines are found.
+    @param nfa Vector containing number of false alarms in the line region, with precision of 10%. The
+    bigger the value, logarithmically better the detection.
+    - -1 corresponds to 10 mean false alarms
+    - 0 corresponds to 1 mean false alarm
+    - 1 corresponds to 0.1 mean false alarms
+    This vector will be calculated only when the objects type is #LSD_REFINE_ADV.
+    */
+    CV_WRAP virtual void detect(InputArray image, OutputArray lines,
+                        OutputArray width = noArray(), OutputArray prec = noArray(),
+                        OutputArray nfa = noArray()) = 0;
+
+    /** @brief Draws the line segments on a given image.
+    @param image The image, where the lines will be drawn. Should be bigger or equal to the image,
+    where the lines were found.
+    @param lines A vector of the lines that needed to be drawn.
+     */
+    CV_WRAP virtual void drawSegments(InputOutputArray image, InputArray lines) = 0;
+
+    /** @brief Draws two groups of lines in blue and red, counting the non overlapping (mismatching) pixels.
+
+    @param size The size of the image, where lines1 and lines2 were found.
+    @param lines1 The first group of lines that needs to be drawn. It is visualized in blue color.
+    @param lines2 The second group of lines. They visualized in red color.
+    @param image Optional image, where the lines will be drawn. The image should be color(3-channel)
+    in order for lines1 and lines2 to be drawn in the above mentioned colors.
+     */
+    CV_WRAP virtual int compareSegments(const Size& size, InputArray lines1, InputArray lines2, InputOutputArray image = noArray()) = 0;
+
+    virtual ~LineSegmentDetector() { }
+};
+
+/** @brief Creates a smart pointer to a LineSegmentDetector object and initializes it.
+
+The LineSegmentDetector algorithm is defined using the standard values. Only advanced users may want
+to edit those, as to tailor it for their own application.
+
+@param refine The way found lines will be refined, see #LineSegmentDetectorModes
+@param scale The scale of the image that will be used to find the lines. Range (0..1].
+@param sigma_scale Sigma for Gaussian filter. It is computed as sigma = sigma_scale/scale.
+@param quant Bound to the quantization error on the gradient norm.
+@param ang_th Gradient angle tolerance in degrees.
+@param log_eps Detection threshold: -log10(NFA) \> log_eps. Used only when advance refinement is chosen.
+@param density_th Minimal density of aligned region points in the enclosing rectangle.
+@param n_bins Number of bins in pseudo-ordering of gradient modulus.
+ */
+CV_EXPORTS_W Ptr<LineSegmentDetector> createLineSegmentDetector(
+    int refine = LSD_REFINE_STD, double scale = 0.8,
+    double sigma_scale = 0.6, double quant = 2.0, double ang_th = 22.5,
+    double log_eps = 0, double density_th = 0.7, int n_bins = 1024);
+
+//! @} imgproc_feature
+
+//! @addtogroup imgproc_filter
+//! @{
+
+/** @brief Returns Gaussian filter coefficients.
+
+The function computes and returns the \f$\texttt{ksize} \times 1\f$ matrix of Gaussian filter
+coefficients:
+
+\f[G_i= \alpha *e^{-(i-( \texttt{ksize} -1)/2)^2/(2* \texttt{sigma}^2)},\f]
+
+where \f$i=0..\texttt{ksize}-1\f$ and \f$\alpha\f$ is the scale factor chosen so that \f$\sum_i G_i=1\f$.
+
+Two of such generated kernels can be passed to sepFilter2D. Those functions automatically recognize
+smoothing kernels (a symmetrical kernel with sum of weights equal to 1) and handle them accordingly.
+You may also use the higher-level GaussianBlur.
+@param ksize Aperture size. It should be odd ( \f$\texttt{ksize} \mod 2 = 1\f$ ) and positive.
+@param sigma Gaussian standard deviation. If it is non-positive, it is computed from ksize as
+`sigma = 0.3*((ksize-1)*0.5 - 1) + 0.8`.
+@param ktype Type of filter coefficients. It can be CV_32F or CV_64F .
+@sa  sepFilter2D, getDerivKernels, getStructuringElement, GaussianBlur
+ */
+CV_EXPORTS_W Mat getGaussianKernel( int ksize, double sigma, int ktype = CV_64F );
+
+/** @brief Returns filter coefficients for computing spatial image derivatives.
+
+The function computes and returns the filter coefficients for spatial image derivatives. When
+`ksize=FILTER_SCHARR`, the Scharr \f$3 \times 3\f$ kernels are generated (see #Scharr). Otherwise, Sobel
+kernels are generated (see #Sobel). The filters are normally passed to #sepFilter2D or to
+
+@param kx Output matrix of row filter coefficients. It has the type ktype .
+@param ky Output matrix of column filter coefficients. It has the type ktype .
+@param dx Derivative order in respect of x.
+@param dy Derivative order in respect of y.
+@param ksize Aperture size. It can be FILTER_SCHARR, 1, 3, 5, or 7.
+@param normalize Flag indicating whether to normalize (scale down) the filter coefficients or not.
+Theoretically, the coefficients should have the denominator \f$=2^{ksize*2-dx-dy-2}\f$. If you are
+going to filter floating-point images, you are likely to use the normalized kernels. But if you
+compute derivatives of an 8-bit image, store the results in a 16-bit image, and wish to preserve
+all the fractional bits, you may want to set normalize=false .
+@param ktype Type of filter coefficients. It can be CV_32f or CV_64F .
+ */
+CV_EXPORTS_W void getDerivKernels( OutputArray kx, OutputArray ky,
+                                   int dx, int dy, int ksize,
+                                   bool normalize = false, int ktype = CV_32F );
+
+/** @brief Returns Gabor filter coefficients.
+
+For more details about gabor filter equations and parameters, see: [Gabor
+Filter](https://en.wikipedia.org/wiki/Gabor_filter).
+
+@param ksize Size of the filter returned.
+@param sigma Standard deviation of the gaussian envelope.
+@param theta Orientation of the normal to the parallel stripes of a Gabor function.
+@param lambd Wavelength of the sinusoidal factor.
+@param gamma Spatial aspect ratio.
+@param psi Phase offset.
+@param ktype Type of filter coefficients. It can be CV_32F or CV_64F .
+ */
+CV_EXPORTS_W Mat getGaborKernel( Size ksize, double sigma, double theta, double lambd,
+                                 double gamma, double psi = CV_PI*0.5, int ktype = CV_64F );
+
+//! returns "magic" border value for erosion and dilation. It is automatically transformed to Scalar::all(-DBL_MAX) for dilation.
+static inline Scalar morphologyDefaultBorderValue() { return Scalar::all(DBL_MAX); }
+
+/** @brief Returns a structuring element of the specified size and shape for morphological operations.
+
+The function constructs and returns the structuring element that can be further passed to #erode,
+#dilate or #morphologyEx. But you can also construct an arbitrary binary mask yourself and use it as
+the structuring element.
+
+@param shape Element shape that could be one of #MorphShapes
+@param ksize Size of the structuring element.
+@param anchor Anchor position within the element. The default value \f$(-1, -1)\f$ means that the
+anchor is at the center. Note that only the shape of a cross-shaped element depends on the anchor
+position. In other cases the anchor just regulates how much the result of the morphological
+operation is shifted.
+ */
+CV_EXPORTS_W Mat getStructuringElement(int shape, Size ksize, Point anchor = Point(-1,-1));
+
+/** @example samples/cpp/tutorial_code/ImgProc/Smoothing/Smoothing.cpp
+Sample code for simple filters
+![Sample screenshot](Smoothing_Tutorial_Result_Median_Filter.jpg)
+Check @ref tutorial_gausian_median_blur_bilateral_filter "the corresponding tutorial" for more details
+ */
+
+/** @brief Blurs an image using the median filter.
+
+The function smoothes an image using the median filter with the \f$\texttt{ksize} \times
+\texttt{ksize}\f$ aperture. Each channel of a multi-channel image is processed independently.
+In-place operation is supported.
+
+@note The median filter uses #BORDER_REPLICATE internally to cope with border pixels, see #BorderTypes
+
+@param src input 1-, 3-, or 4-channel image; when ksize is 3 or 5, the image depth should be
+CV_8U, CV_16U, or CV_32F, for larger aperture sizes, it can only be CV_8U.
+@param dst destination array of the same size and type as src.
+@param ksize aperture linear size; it must be odd and greater than 1, for example: 3, 5, 7 ...
+@sa  bilateralFilter, blur, boxFilter, GaussianBlur
+ */
+CV_EXPORTS_W void medianBlur( InputArray src, OutputArray dst, int ksize );
+
+/** @brief Blurs an image using a Gaussian filter.
+
+The function convolves the source image with the specified Gaussian kernel. In-place filtering is
+supported.
+
+@param src input image; the image can have any number of channels, which are processed
+independently, but the depth should be CV_8U, CV_16U, CV_16S, CV_32F or CV_64F.
+@param dst output image of the same size and type as src.
+@param ksize Gaussian kernel size. ksize.width and ksize.height can differ but they both must be
+positive and odd. Or, they can be zero's and then they are computed from sigma.
+@param sigmaX Gaussian kernel standard deviation in X direction.
+@param sigmaY Gaussian kernel standard deviation in Y direction; if sigmaY is zero, it is set to be
+equal to sigmaX, if both sigmas are zeros, they are computed from ksize.width and ksize.height,
+respectively (see #getGaussianKernel for details); to fully control the result regardless of
+possible future modifications of all this semantics, it is recommended to specify all of ksize,
+sigmaX, and sigmaY.
+@param borderType pixel extrapolation method, see #BorderTypes. #BORDER_WRAP is not supported.
+@param hint Implementation modfication flags. See #AlgorithmHint
+
+@sa  sepFilter2D, filter2D, blur, boxFilter, bilateralFilter, medianBlur
+ */
+CV_EXPORTS_W void GaussianBlur( InputArray src, OutputArray dst, Size ksize,
+                                double sigmaX, double sigmaY = 0,
+                                int borderType = BORDER_DEFAULT,
+                                AlgorithmHint hint = cv::ALGO_HINT_DEFAULT );
+
+/** @brief Applies the bilateral filter to an image.
+
+The function applies bilateral filtering to the input image, as described in
+https://homepages.inf.ed.ac.uk/rbf/CVonline/LOCAL_COPIES/MANDUCHI1/Bilateral_Filtering.html
+bilateralFilter can reduce unwanted noise very well while keeping edges fairly sharp. However, it is
+very slow compared to most filters.
+
+_Sigma values_: For simplicity, you can set the 2 sigma values to be the same. If they are small (\<
+10), the filter will not have much effect, whereas if they are large (\> 150), they will have a very
+strong effect, making the image look "cartoonish".
+
+_Filter size_: Large filters (d \> 5) are very slow, so it is recommended to use d=5 for real-time
+applications, and perhaps d=9 for offline applications that need heavy noise filtering.
+
+This filter does not work inplace.
+@param src Source 8-bit or floating-point, 1-channel or 3-channel image.
+@param dst Destination image of the same size and type as src .
+@param d Diameter of each pixel neighborhood that is used during filtering. If it is non-positive,
+it is computed from sigmaSpace.
+@param sigmaColor Filter sigma in the color space. A larger value of the parameter means that
+farther colors within the pixel neighborhood (see sigmaSpace) will be mixed together, resulting
+in larger areas of semi-equal color.
+@param sigmaSpace Filter sigma in the coordinate space. A larger value of the parameter means that
+farther pixels will influence each other as long as their colors are close enough (see sigmaColor
+). When d\>0, it specifies the neighborhood size regardless of sigmaSpace. Otherwise, d is
+proportional to sigmaSpace.
+@param borderType border mode used to extrapolate pixels outside of the image, see #BorderTypes
+ */
+CV_EXPORTS_W void bilateralFilter( InputArray src, OutputArray dst, int d,
+                                   double sigmaColor, double sigmaSpace,
+                                   int borderType = BORDER_DEFAULT );
+
+/** @brief Blurs an image using the box filter.
+
+The function smooths an image using the kernel:
+
+\f[\texttt{K} =  \alpha \begin{bmatrix} 1 & 1 & 1 &  \cdots & 1 & 1  \\ 1 & 1 & 1 &  \cdots & 1 & 1  \\ \hdotsfor{6} \\ 1 & 1 & 1 &  \cdots & 1 & 1 \end{bmatrix}\f]
+
+where
+
+\f[\alpha = \begin{cases} \frac{1}{\texttt{ksize.width*ksize.height}} & \texttt{when } \texttt{normalize=true}  \\1 & \texttt{otherwise}\end{cases}\f]
+
+Unnormalized box filter is useful for computing various integral characteristics over each pixel
+neighborhood, such as covariance matrices of image derivatives (used in dense optical flow
+algorithms, and so on). If you need to compute pixel sums over variable-size windows, use #integral.
+
+@param src input image.
+@param dst output image of the same size and type as src.
+@param ddepth the output image depth (-1 to use src.depth()).
+@param ksize blurring kernel size.
+@param anchor anchor point; default value Point(-1,-1) means that the anchor is at the kernel
+center.
+@param normalize flag, specifying whether the kernel is normalized by its area or not.
+@param borderType border mode used to extrapolate pixels outside of the image, see #BorderTypes. #BORDER_WRAP is not supported.
+@sa  blur, bilateralFilter, GaussianBlur, medianBlur, integral
+ */
+CV_EXPORTS_W void boxFilter( InputArray src, OutputArray dst, int ddepth,
+                             Size ksize, Point anchor = Point(-1,-1),
+                             bool normalize = true,
+                             int borderType = BORDER_DEFAULT );
+
+/** @brief Calculates the normalized sum of squares of the pixel values overlapping the filter.
+
+For every pixel \f$ (x, y) \f$ in the source image, the function calculates the sum of squares of those neighboring
+pixel values which overlap the filter placed over the pixel \f$ (x, y) \f$.
+
+The unnormalized square box filter can be useful in computing local image statistics such as the local
+variance and standard deviation around the neighborhood of a pixel.
+
+@param src input image
+@param dst output image of the same size and type as src
+@param ddepth the output image depth (-1 to use src.depth())
+@param ksize kernel size
+@param anchor kernel anchor point. The default value of Point(-1, -1) denotes that the anchor is at the kernel
+center.
+@param normalize flag, specifying whether the kernel is to be normalized by it's area or not.
+@param borderType border mode used to extrapolate pixels outside of the image, see #BorderTypes. #BORDER_WRAP is not supported.
+@sa boxFilter
+*/
+CV_EXPORTS_W void sqrBoxFilter( InputArray src, OutputArray dst, int ddepth,
+                                Size ksize, Point anchor = Point(-1, -1),
+                                bool normalize = true,
+                                int borderType = BORDER_DEFAULT );
+
+/** @brief Blurs an image using the normalized box filter.
+
+The function smooths an image using the kernel:
+
+\f[\texttt{K} =  \frac{1}{\texttt{ksize.width*ksize.height}} \begin{bmatrix} 1 & 1 & 1 &  \cdots & 1 & 1  \\ 1 & 1 & 1 &  \cdots & 1 & 1  \\ \hdotsfor{6} \\ 1 & 1 & 1 &  \cdots & 1 & 1  \\ \end{bmatrix}\f]
+
+The call `blur(src, dst, ksize, anchor, borderType)` is equivalent to `boxFilter(src, dst, src.type(), ksize,
+anchor, true, borderType)`.
+
+@param src input image; it can have any number of channels, which are processed independently, but
+the depth should be CV_8U, CV_16U, CV_16S, CV_32F or CV_64F.
+@param dst output image of the same size and type as src.
+@param ksize blurring kernel size.
+@param anchor anchor point; default value Point(-1,-1) means that the anchor is at the kernel
+center.
+@param borderType border mode used to extrapolate pixels outside of the image, see #BorderTypes. #BORDER_WRAP is not supported.
+@sa  boxFilter, bilateralFilter, GaussianBlur, medianBlur
+ */
+CV_EXPORTS_W void blur( InputArray src, OutputArray dst,
+                        Size ksize, Point anchor = Point(-1,-1),
+                        int borderType = BORDER_DEFAULT );
+
+/** @brief Blurs an image using the stackBlur.
+
+The function applies and stackBlur to an image.
+stackBlur can generate similar results as Gaussian blur, and the time consumption does not increase with the increase of kernel size.
+It creates a kind of moving stack of colors whilst scanning through the image. Thereby it just has to add one new block of color to the right side
+of the stack and remove the leftmost color. The remaining colors on the topmost layer of the stack are either added on or reduced by one,
+depending on if they are on the right or on the left side of the stack. The only supported borderType is BORDER_REPLICATE.
+Original paper was proposed by Mario Klingemann, which can be found https://underdestruction.com/2004/02/25/stackblur-2004.
+
+@param src input image. The number of channels can be arbitrary, but the depth should be one of
+CV_8U, CV_16U, CV_16S or CV_32F.
+@param dst output image of the same size and type as src.
+@param ksize stack-blurring kernel size. The ksize.width and ksize.height can differ but they both must be
+positive and odd.
+*/
+CV_EXPORTS_W void stackBlur(InputArray src, OutputArray dst, Size ksize);
+
+/** @brief Convolves an image with the kernel.
+
+The function applies an arbitrary linear filter to an image. In-place operation is supported. When
+the aperture is partially outside the image, the function interpolates outlier pixel values
+according to the specified border mode.
+
+The function does actually compute correlation, not the convolution:
+
+\f[\texttt{dst} (x,y) =  \sum _{ \substack{0\leq x' < \texttt{kernel.cols}\\{0\leq y' < \texttt{kernel.rows}}}}  \texttt{kernel} (x',y')* \texttt{src} (x+x'- \texttt{anchor.x} ,y+y'- \texttt{anchor.y} )\f]
+
+That is, the kernel is not mirrored around the anchor point. If you need a real convolution, flip
+the kernel using #flip and set the new anchor to `(kernel.cols - anchor.x - 1, kernel.rows -
+anchor.y - 1)`.
+
+The function uses the DFT-based algorithm in case of sufficiently large kernels (~`11 x 11` or
+larger) and the direct algorithm for small kernels.
+
+@param src input image.
+@param dst output image of the same size and the same number of channels as src.
+@param ddepth desired depth of the destination image, see @ref filter_depths "combinations"
+@param kernel convolution kernel (or rather a correlation kernel), a single-channel floating point
+matrix; if you want to apply different kernels to different channels, split the image into
+separate color planes using split and process them individually.
+@param anchor anchor of the kernel that indicates the relative position of a filtered point within
+the kernel; the anchor should lie within the kernel; default value (-1,-1) means that the anchor
+is at the kernel center.
+@param delta optional value added to the filtered pixels before storing them in dst.
+@param borderType pixel extrapolation method, see #BorderTypes. #BORDER_WRAP is not supported.
+@sa  sepFilter2D, dft, matchTemplate
+ */
+CV_EXPORTS_W void filter2D( InputArray src, OutputArray dst, int ddepth,
+                            InputArray kernel, Point anchor = Point(-1,-1),
+                            double delta = 0, int borderType = BORDER_DEFAULT );
+
+/** @brief Applies a separable linear filter to an image.
+
+The function applies a separable linear filter to the image. That is, first, every row of src is
+filtered with the 1D kernel kernelX. Then, every column of the result is filtered with the 1D
+kernel kernelY. The final result shifted by delta is stored in dst .
+
+@param src Source image.
+@param dst Destination image of the same size and the same number of channels as src .
+@param ddepth Destination image depth, see @ref filter_depths "combinations"
+@param kernelX Coefficients for filtering each row.
+@param kernelY Coefficients for filtering each column.
+@param anchor Anchor position within the kernel. The default value \f$(-1,-1)\f$ means that the anchor
+is at the kernel center.
+@param delta Value added to the filtered results before storing them.
+@param borderType Pixel extrapolation method, see #BorderTypes. #BORDER_WRAP is not supported.
+@sa  filter2D, Sobel, GaussianBlur, boxFilter, blur
+ */
+CV_EXPORTS_W void sepFilter2D( InputArray src, OutputArray dst, int ddepth,
+                               InputArray kernelX, InputArray kernelY,
+                               Point anchor = Point(-1,-1),
+                               double delta = 0, int borderType = BORDER_DEFAULT );
+
+/** @example samples/cpp/tutorial_code/ImgTrans/Sobel_Demo.cpp
+Sample code using Sobel and/or Scharr OpenCV functions to make a simple Edge Detector
+![Sample screenshot](Sobel_Derivatives_Tutorial_Result.jpg)
+Check @ref tutorial_sobel_derivatives "the corresponding tutorial" for more details
+*/
+
+/** @brief Calculates the first, second, third, or mixed image derivatives using an extended Sobel operator.
+
+In all cases except one, the \f$\texttt{ksize} \times \texttt{ksize}\f$ separable kernel is used to
+calculate the derivative. When \f$\texttt{ksize = 1}\f$, the \f$3 \times 1\f$ or \f$1 \times 3\f$
+kernel is used (that is, no Gaussian smoothing is done). `ksize = 1` can only be used for the first
+or the second x- or y- derivatives.
+
+There is also the special value `ksize = #FILTER_SCHARR (-1)` that corresponds to the \f$3\times3\f$ Scharr
+filter that may give more accurate results than the \f$3\times3\f$ Sobel. The Scharr aperture is
+
+\f[\vecthreethree{-3}{0}{3}{-10}{0}{10}{-3}{0}{3}\f]
+
+for the x-derivative, or transposed for the y-derivative.
+
+The function calculates an image derivative by convolving the image with the appropriate kernel:
+
+\f[\texttt{dst} =  \frac{\partial^{xorder+yorder} \texttt{src}}{\partial x^{xorder} \partial y^{yorder}}\f]
+
+The Sobel operators combine Gaussian smoothing and differentiation, so the result is more or less
+resistant to the noise. Most often, the function is called with ( xorder = 1, yorder = 0, ksize = 3)
+or ( xorder = 0, yorder = 1, ksize = 3) to calculate the first x- or y- image derivative. The first
+case corresponds to a kernel of:
+
+\f[\vecthreethree{-1}{0}{1}{-2}{0}{2}{-1}{0}{1}\f]
+
+The second case corresponds to a kernel of:
+
+\f[\vecthreethree{-1}{-2}{-1}{0}{0}{0}{1}{2}{1}\f]
+
+@param src input image.
+@param dst output image of the same size and the same number of channels as src .
+@param ddepth output image depth, see @ref filter_depths "combinations"; in the case of
+    8-bit input images it will result in truncated derivatives.
+@param dx order of the derivative x.
+@param dy order of the derivative y.
+@param ksize size of the extended Sobel kernel; it must be 1, 3, 5, or 7.
+@param scale optional scale factor for the computed derivative values; by default, no scaling is
+applied (see #getDerivKernels for details).
+@param delta optional delta value that is added to the results prior to storing them in dst.
+@param borderType pixel extrapolation method, see #BorderTypes. #BORDER_WRAP is not supported.
+@sa  Scharr, Laplacian, sepFilter2D, filter2D, GaussianBlur, cartToPolar
+ */
+CV_EXPORTS_W void Sobel( InputArray src, OutputArray dst, int ddepth,
+                         int dx, int dy, int ksize = 3,
+                         double scale = 1, double delta = 0,
+                         int borderType = BORDER_DEFAULT );
+
+/** @brief Calculates the first order image derivative in both x and y using a Sobel operator
+
+Equivalent to calling:
+
+@code
+Sobel( src, dx, CV_16SC1, 1, 0, 3 );
+Sobel( src, dy, CV_16SC1, 0, 1, 3 );
+@endcode
+
+@param src input image.
+@param dx output image with first-order derivative in x.
+@param dy output image with first-order derivative in y.
+@param ksize size of Sobel kernel. It must be 3.
+@param borderType pixel extrapolation method, see #BorderTypes.
+                  Only #BORDER_DEFAULT=#BORDER_REFLECT_101 and #BORDER_REPLICATE are supported.
+
+@sa Sobel
+ */
+
+CV_EXPORTS_W void spatialGradient( InputArray src, OutputArray dx,
+                                   OutputArray dy, int ksize = 3,
+                                   int borderType = BORDER_DEFAULT );
+
+/** @brief Calculates the first x- or y- image derivative using Scharr operator.
+
+The function computes the first x- or y- spatial image derivative using the Scharr operator. The
+call
+
+\f[\texttt{Scharr(src, dst, ddepth, dx, dy, scale, delta, borderType)}\f]
+
+is equivalent to
+
+\f[\texttt{Sobel(src, dst, ddepth, dx, dy, FILTER_SCHARR, scale, delta, borderType)} .\f]
+
+@param src input image.
+@param dst output image of the same size and the same number of channels as src.
+@param ddepth output image depth, see @ref filter_depths "combinations"
+@param dx order of the derivative x.
+@param dy order of the derivative y.
+@param scale optional scale factor for the computed derivative values; by default, no scaling is
+applied (see #getDerivKernels for details).
+@param delta optional delta value that is added to the results prior to storing them in dst.
+@param borderType pixel extrapolation method, see #BorderTypes. #BORDER_WRAP is not supported.
+@sa  cartToPolar
+ */
+CV_EXPORTS_W void Scharr( InputArray src, OutputArray dst, int ddepth,
+                          int dx, int dy, double scale = 1, double delta = 0,
+                          int borderType = BORDER_DEFAULT );
+
+/** @example samples/cpp/laplace.cpp
+An example using Laplace transformations for edge detection
+*/
+
+/** @brief Calculates the Laplacian of an image.
+
+The function calculates the Laplacian of the source image by adding up the second x and y
+derivatives calculated using the Sobel operator:
+
+\f[\texttt{dst} =  \Delta \texttt{src} =  \frac{\partial^2 \texttt{src}}{\partial x^2} +  \frac{\partial^2 \texttt{src}}{\partial y^2}\f]
+
+This is done when `ksize > 1`. When `ksize == 1`, the Laplacian is computed by filtering the image
+with the following \f$3 \times 3\f$ aperture:
+
+\f[\vecthreethree {0}{1}{0}{1}{-4}{1}{0}{1}{0}\f]
+
+@param src Source image.
+@param dst Destination image of the same size and the same number of channels as src .
+@param ddepth Desired depth of the destination image, see @ref filter_depths "combinations".
+@param ksize Aperture size used to compute the second-derivative filters. See #getDerivKernels for
+details. The size must be positive and odd.
+@param scale Optional scale factor for the computed Laplacian values. By default, no scaling is
+applied. See #getDerivKernels for details.
+@param delta Optional delta value that is added to the results prior to storing them in dst .
+@param borderType Pixel extrapolation method, see #BorderTypes. #BORDER_WRAP is not supported.
+@sa  Sobel, Scharr
+ */
+CV_EXPORTS_W void Laplacian( InputArray src, OutputArray dst, int ddepth,
+                             int ksize = 1, double scale = 1, double delta = 0,
+                             int borderType = BORDER_DEFAULT );
+
+//! @} imgproc_filter
+
+//! @addtogroup imgproc_feature
+//! @{
+
+/** @example samples/cpp/edge.cpp
+This program demonstrates usage of the Canny edge detector
+
+Check @ref tutorial_canny_detector "the corresponding tutorial" for more details
+*/
+
+/** @brief Finds edges in an image using the Canny algorithm @cite Canny86 .
+
+The function finds edges in the input image and marks them in the output map edges using the
+Canny algorithm. The smallest value between threshold1 and threshold2 is used for edge linking. The
+largest value is used to find initial segments of strong edges. See
+<https://en.wikipedia.org/wiki/Canny_edge_detector>
+
+@param image 8-bit input image.
+@param edges output edge map; single channels 8-bit image, which has the same size as image .
+@param threshold1 first threshold for the hysteresis procedure.
+@param threshold2 second threshold for the hysteresis procedure.
+@param apertureSize aperture size for the Sobel operator.
+@param L2gradient a flag, indicating whether a more accurate \f$L_2\f$ norm
+\f$=\sqrt{(dI/dx)^2 + (dI/dy)^2}\f$ should be used to calculate the image gradient magnitude (
+L2gradient=true ), or whether the default \f$L_1\f$ norm \f$=|dI/dx|+|dI/dy|\f$ is enough (
+L2gradient=false ).
+ */
+CV_EXPORTS_W void Canny( InputArray image, OutputArray edges,
+                         double threshold1, double threshold2,
+                         int apertureSize = 3, bool L2gradient = false );
+
+/** \overload
+
+Finds edges in an image using the Canny algorithm with custom image gradient.
+
+@param dx 16-bit x derivative of input image (CV_16SC1 or CV_16SC3).
+@param dy 16-bit y derivative of input image (same type as dx).
+@param edges output edge map; single channels 8-bit image, which has the same size as image .
+@param threshold1 first threshold for the hysteresis procedure.
+@param threshold2 second threshold for the hysteresis procedure.
+@param L2gradient a flag, indicating whether a more accurate \f$L_2\f$ norm
+\f$=\sqrt{(dI/dx)^2 + (dI/dy)^2}\f$ should be used to calculate the image gradient magnitude (
+L2gradient=true ), or whether the default \f$L_1\f$ norm \f$=|dI/dx|+|dI/dy|\f$ is enough (
+L2gradient=false ).
+ */
+CV_EXPORTS_W void Canny( InputArray dx, InputArray dy,
+                         OutputArray edges,
+                         double threshold1, double threshold2,
+                         bool L2gradient = false );
+
+/** @brief Calculates the minimal eigenvalue of gradient matrices for corner detection.
+
+The function is similar to cornerEigenValsAndVecs but it calculates and stores only the minimal
+eigenvalue of the covariance matrix of derivatives, that is, \f$\min(\lambda_1, \lambda_2)\f$ in terms
+of the formulae in the cornerEigenValsAndVecs description.
+
+@param src Input single-channel 8-bit or floating-point image.
+@param dst Image to store the minimal eigenvalues. It has the type CV_32FC1 and the same size as
+src .
+@param blockSize Neighborhood size (see the details on #cornerEigenValsAndVecs ).
+@param ksize Aperture parameter for the Sobel operator.
+@param borderType Pixel extrapolation method. See #BorderTypes. #BORDER_WRAP is not supported.
+ */
+CV_EXPORTS_W void cornerMinEigenVal( InputArray src, OutputArray dst,
+                                     int blockSize, int ksize = 3,
+                                     int borderType = BORDER_DEFAULT );
+
+/** @brief Harris corner detector.
+
+The function runs the Harris corner detector on the image. Similarly to cornerMinEigenVal and
+cornerEigenValsAndVecs , for each pixel \f$(x, y)\f$ it calculates a \f$2\times2\f$ gradient covariance
+matrix \f$M^{(x,y)}\f$ over a \f$\texttt{blockSize} \times \texttt{blockSize}\f$ neighborhood. Then, it
+computes the following characteristic:
+
+\f[\texttt{dst} (x,y) =  \mathrm{det} M^{(x,y)} - k  \cdot \left ( \mathrm{tr} M^{(x,y)} \right )^2\f]
+
+Corners in the image can be found as the local maxima of this response map.
+
+@param src Input single-channel 8-bit or floating-point image.
+@param dst Image to store the Harris detector responses. It has the type CV_32FC1 and the same
+size as src .
+@param blockSize Neighborhood size (see the details on #cornerEigenValsAndVecs ).
+@param ksize Aperture parameter for the Sobel operator.
+@param k Harris detector free parameter. See the formula above.
+@param borderType Pixel extrapolation method. See #BorderTypes. #BORDER_WRAP is not supported.
+ */
+CV_EXPORTS_W void cornerHarris( InputArray src, OutputArray dst, int blockSize,
+                                int ksize, double k,
+                                int borderType = BORDER_DEFAULT );
+
+/** @brief Calculates eigenvalues and eigenvectors of image blocks for corner detection.
+
+For every pixel \f$p\f$ , the function cornerEigenValsAndVecs considers a blockSize \f$\times\f$ blockSize
+neighborhood \f$S(p)\f$ . It calculates the covariation matrix of derivatives over the neighborhood as:
+
+\f[M =  \begin{bmatrix} \sum _{S(p)}(dI/dx)^2 &  \sum _{S(p)}dI/dx dI/dy  \\ \sum _{S(p)}dI/dx dI/dy &  \sum _{S(p)}(dI/dy)^2 \end{bmatrix}\f]
+
+where the derivatives are computed using the Sobel operator.
+
+After that, it finds eigenvectors and eigenvalues of \f$M\f$ and stores them in the destination image as
+\f$(\lambda_1, \lambda_2, x_1, y_1, x_2, y_2)\f$ where
+
+-   \f$\lambda_1, \lambda_2\f$ are the non-sorted eigenvalues of \f$M\f$
+-   \f$x_1, y_1\f$ are the eigenvectors corresponding to \f$\lambda_1\f$
+-   \f$x_2, y_2\f$ are the eigenvectors corresponding to \f$\lambda_2\f$
+
+The output of the function can be used for robust edge or corner detection.
+
+@param src Input single-channel 8-bit or floating-point image.
+@param dst Image to store the results. It has the same size as src and the type CV_32FC(6) .
+@param blockSize Neighborhood size (see details below).
+@param ksize Aperture parameter for the Sobel operator.
+@param borderType Pixel extrapolation method. See #BorderTypes. #BORDER_WRAP is not supported.
+
+@sa  cornerMinEigenVal, cornerHarris, preCornerDetect
+ */
+CV_EXPORTS_W void cornerEigenValsAndVecs( InputArray src, OutputArray dst,
+                                          int blockSize, int ksize,
+                                          int borderType = BORDER_DEFAULT );
+
+/** @brief Calculates a feature map for corner detection.
+
+The function calculates the complex spatial derivative-based function of the source image
+
+\f[\texttt{dst} = (D_x  \texttt{src} )^2  \cdot D_{yy}  \texttt{src} + (D_y  \texttt{src} )^2  \cdot D_{xx}  \texttt{src} - 2 D_x  \texttt{src} \cdot D_y  \texttt{src} \cdot D_{xy}  \texttt{src}\f]
+
+where \f$D_x\f$,\f$D_y\f$ are the first image derivatives, \f$D_{xx}\f$,\f$D_{yy}\f$ are the second image
+derivatives, and \f$D_{xy}\f$ is the mixed derivative.
+
+The corners can be found as local maximums of the functions, as shown below:
+@code
+    Mat corners, dilated_corners;
+    preCornerDetect(image, corners, 3);
+    // dilation with 3x3 rectangular structuring element
+    dilate(corners, dilated_corners, Mat(), 1);
+    Mat corner_mask = corners == dilated_corners;
+@endcode
+
+@param src Source single-channel 8-bit of floating-point image.
+@param dst Output image that has the type CV_32F and the same size as src .
+@param ksize %Aperture size of the Sobel .
+@param borderType Pixel extrapolation method. See #BorderTypes. #BORDER_WRAP is not supported.
+ */
+CV_EXPORTS_W void preCornerDetect( InputArray src, OutputArray dst, int ksize,
+                                   int borderType = BORDER_DEFAULT );
+
+/** @brief Refines the corner locations.
+
+The function iterates to find the sub-pixel accurate location of corners or radial saddle
+points as described in @cite forstner1987fast, and as shown on the figure below.
+
+![image](pics/cornersubpix.png)
+
+Sub-pixel accurate corner locator is based on the observation that every vector from the center \f$q\f$
+to a point \f$p\f$ located within a neighborhood of \f$q\f$ is orthogonal to the image gradient at \f$p\f$
+subject to image and measurement noise. Consider the expression:
+
+\f[\epsilon _i = {DI_{p_i}}^T  \cdot (q - p_i)\f]
+
+where \f${DI_{p_i}}\f$ is an image gradient at one of the points \f$p_i\f$ in a neighborhood of \f$q\f$ . The
+value of \f$q\f$ is to be found so that \f$\epsilon_i\f$ is minimized. A system of equations may be set up
+with \f$\epsilon_i\f$ set to zero:
+
+\f[\sum _i(DI_{p_i}  \cdot {DI_{p_i}}^T) \cdot q -  \sum _i(DI_{p_i}  \cdot {DI_{p_i}}^T  \cdot p_i)\f]
+
+where the gradients are summed within a neighborhood ("search window") of \f$q\f$ . Calling the first
+gradient term \f$G\f$ and the second gradient term \f$b\f$ gives:
+
+\f[q = G^{-1}  \cdot b\f]
+
+The algorithm sets the center of the neighborhood window at this new center \f$q\f$ and then iterates
+until the center stays within a set threshold.
+
+@param image Input single-channel, 8-bit or float image.
+@param corners Initial coordinates of the input corners and refined coordinates provided for
+output.
+@param winSize Half of the side length of the search window. For example, if winSize=Size(5,5) ,
+then a \f$(5*2+1) \times (5*2+1) = 11 \times 11\f$ search window is used.
+@param zeroZone Half of the size of the dead region in the middle of the search zone over which
+the summation in the formula below is not done. It is used sometimes to avoid possible
+singularities of the autocorrelation matrix. The value of (-1,-1) indicates that there is no such
+a size.
+@param criteria Criteria for termination of the iterative process of corner refinement. That is,
+the process of corner position refinement stops either after criteria.maxCount iterations or when
+the corner position moves by less than criteria.epsilon on some iteration.
+ */
+CV_EXPORTS_W void cornerSubPix( InputArray image, InputOutputArray corners,
+                                Size winSize, Size zeroZone,
+                                TermCriteria criteria );
+
+/** @brief Determines strong corners on an image.
+
+The function finds the most prominent corners in the image or in the specified image region, as
+described in @cite Shi94
+
+-   Function calculates the corner quality measure at every source image pixel using the
+    #cornerMinEigenVal or #cornerHarris .
+-   Function performs a non-maximum suppression (the local maximums in *3 x 3* neighborhood are
+    retained).
+-   The corners with the minimal eigenvalue less than
+    \f$\texttt{qualityLevel} \cdot \max_{x,y} qualityMeasureMap(x,y)\f$ are rejected.
+-   The remaining corners are sorted by the quality measure in the descending order.
+-   Function throws away each corner for which there is a stronger corner at a distance less than
+    maxDistance.
+
+The function can be used to initialize a point-based tracker of an object.
+
+@note If the function is called with different values A and B of the parameter qualityLevel , and
+A \> B, the vector of returned corners with qualityLevel=A will be the prefix of the output vector
+with qualityLevel=B .
+
+@param image Input 8-bit or floating-point 32-bit, single-channel image.
+@param corners Output vector of detected corners.
+@param maxCorners Maximum number of corners to return. If there are more corners than are found,
+the strongest of them is returned. `maxCorners <= 0` implies that no limit on the maximum is set
+and all detected corners are returned.
+@param qualityLevel Parameter characterizing the minimal accepted quality of image corners. The
+parameter value is multiplied by the best corner quality measure, which is the minimal eigenvalue
+(see #cornerMinEigenVal ) or the Harris function response (see #cornerHarris ). The corners with the
+quality measure less than the product are rejected. For example, if the best corner has the
+quality measure = 1500, and the qualityLevel=0.01 , then all the corners with the quality measure
+less than 15 are rejected.
+@param minDistance Minimum possible Euclidean distance between the returned corners.
+@param mask Optional region of interest. If the image is not empty (it needs to have the type
+CV_8UC1 and the same size as image ), it specifies the region in which the corners are detected.
+@param blockSize Size of an average block for computing a derivative covariation matrix over each
+pixel neighborhood. See cornerEigenValsAndVecs .
+@param useHarrisDetector Parameter indicating whether to use a Harris detector (see #cornerHarris)
+or #cornerMinEigenVal.
+@param k Free parameter of the Harris detector.
+
+@sa  cornerMinEigenVal, cornerHarris, calcOpticalFlowPyrLK, estimateRigidTransform,
+ */
+
+CV_EXPORTS_W void goodFeaturesToTrack( InputArray image, OutputArray corners,
+                                     int maxCorners, double qualityLevel, double minDistance,
+                                     InputArray mask = noArray(), int blockSize = 3,
+                                     bool useHarrisDetector = false, double k = 0.04 );
+
+CV_EXPORTS_W void goodFeaturesToTrack( InputArray image, OutputArray corners,
+                                     int maxCorners, double qualityLevel, double minDistance,
+                                     InputArray mask, int blockSize,
+                                     int gradientSize, bool useHarrisDetector = false,
+                                     double k = 0.04 );
+
+/** @brief Same as above, but returns also quality measure of the detected corners.
+
+@param image Input 8-bit or floating-point 32-bit, single-channel image.
+@param corners Output vector of detected corners.
+@param maxCorners Maximum number of corners to return. If there are more corners than are found,
+the strongest of them is returned. `maxCorners <= 0` implies that no limit on the maximum is set
+and all detected corners are returned.
+@param qualityLevel Parameter characterizing the minimal accepted quality of image corners. The
+parameter value is multiplied by the best corner quality measure, which is the minimal eigenvalue
+(see #cornerMinEigenVal ) or the Harris function response (see #cornerHarris ). The corners with the
+quality measure less than the product are rejected. For example, if the best corner has the
+quality measure = 1500, and the qualityLevel=0.01 , then all the corners with the quality measure
+less than 15 are rejected.
+@param minDistance Minimum possible Euclidean distance between the returned corners.
+@param mask Region of interest. If the image is not empty (it needs to have the type
+CV_8UC1 and the same size as image ), it specifies the region in which the corners are detected.
+@param cornersQuality Output vector of quality measure of the detected corners.
+@param blockSize Size of an average block for computing a derivative covariation matrix over each
+pixel neighborhood. See cornerEigenValsAndVecs .
+@param gradientSize Aperture parameter for the Sobel operator used for derivatives computation.
+See cornerEigenValsAndVecs .
+@param useHarrisDetector Parameter indicating whether to use a Harris detector (see #cornerHarris)
+or #cornerMinEigenVal.
+@param k Free parameter of the Harris detector.
+ */
+CV_EXPORTS CV_WRAP_AS(goodFeaturesToTrackWithQuality) void goodFeaturesToTrack(
+        InputArray image, OutputArray corners,
+        int maxCorners, double qualityLevel, double minDistance,
+        InputArray mask, OutputArray cornersQuality, int blockSize = 3,
+        int gradientSize = 3, bool useHarrisDetector = false, double k = 0.04);
+
+/** @example samples/cpp/tutorial_code/ImgTrans/houghlines.cpp
+An example using the Hough line detector
+![Sample input image](Hough_Lines_Tutorial_Original_Image.jpg) ![Output image](Hough_Lines_Tutorial_Result.jpg)
+*/
+
+/** @brief Finds lines in a binary image using the standard Hough transform.
+
+The function implements the standard or standard multi-scale Hough transform algorithm for line
+detection. See <https://homepages.inf.ed.ac.uk/rbf/HIPR2/hough.htm> for a good explanation of Hough
+transform.
+
+@param image 8-bit, single-channel binary source image. The image may be modified by the function.
+@param lines Output vector of lines. Each line is represented by a 2 or 3 element vector
+\f$(\rho, \theta)\f$ or \f$(\rho, \theta, \textrm{votes})\f$, where \f$\rho\f$ is the distance from
+the coordinate origin \f$(0,0)\f$ (top-left corner of the image), \f$\theta\f$ is the line rotation
+angle in radians ( \f$0 \sim \textrm{vertical line}, \pi/2 \sim \textrm{horizontal line}\f$ ), and
+\f$\textrm{votes}\f$ is the value of accumulator.
+@param rho Distance resolution of the accumulator in pixels.
+@param theta Angle resolution of the accumulator in radians.
+@param threshold %Accumulator threshold parameter. Only those lines are returned that get enough
+votes ( \f$>\texttt{threshold}\f$ ).
+@param srn For the multi-scale Hough transform, it is a divisor for the distance resolution rho.
+The coarse accumulator distance resolution is rho and the accurate accumulator resolution is
+rho/srn. If both srn=0 and stn=0, the classical Hough transform is used. Otherwise, both these
+parameters should be positive.
+@param stn For the multi-scale Hough transform, it is a divisor for the distance resolution theta.
+@param min_theta For standard and multi-scale Hough transform, minimum angle to check for lines.
+Must fall between 0 and max_theta.
+@param max_theta For standard and multi-scale Hough transform, an upper bound for the angle.
+Must fall between min_theta and CV_PI. The actual maximum angle in the accumulator may be slightly
+less than max_theta, depending on the parameters min_theta and theta.
+@param use_edgeval True if you want to use weighted Hough transform.
+ */
+CV_EXPORTS_W void HoughLines( InputArray image, OutputArray lines,
+                              double rho, double theta, int threshold,
+                              double srn = 0, double stn = 0,
+                              double min_theta = 0, double max_theta = CV_PI,
+                              bool use_edgeval = false );
+
+/** @brief Finds line segments in a binary image using the probabilistic Hough transform.
+
+The function implements the probabilistic Hough transform algorithm for line detection, described
+in @cite Matas00
+
+See the line detection example below:
+@include snippets/imgproc_HoughLinesP.cpp
+This is a sample picture the function parameters have been tuned for:
+
+![image](pics/building.jpg)
+
+And this is the output of the above program in case of the probabilistic Hough transform:
+
+![image](pics/houghp.png)
+
+@param image 8-bit, single-channel binary source image. The image may be modified by the function.
+@param lines Output vector of lines. Each line is represented by a 4-element vector
+\f$(x_1, y_1, x_2, y_2)\f$ , where \f$(x_1,y_1)\f$ and \f$(x_2, y_2)\f$ are the ending points of each detected
+line segment.
+@param rho Distance resolution of the accumulator in pixels.
+@param theta Angle resolution of the accumulator in radians.
+@param threshold %Accumulator threshold parameter. Only those lines are returned that get enough
+votes ( \f$>\texttt{threshold}\f$ ).
+@param minLineLength Minimum line length. Line segments shorter than that are rejected.
+@param maxLineGap Maximum allowed gap between points on the same line to link them.
+
+@sa LineSegmentDetector
+ */
+CV_EXPORTS_W void HoughLinesP( InputArray image, OutputArray lines,
+                               double rho, double theta, int threshold,
+                               double minLineLength = 0, double maxLineGap = 0 );
+
+/** @brief Finds lines in a set of points using the standard Hough transform.
+
+The function finds lines in a set of points using a modification of the Hough transform.
+@include snippets/imgproc_HoughLinesPointSet.cpp
+@param point Input vector of points. Each vector must be encoded as a Point vector \f$(x,y)\f$. Type must be CV_32FC2 or CV_32SC2.
+@param lines Output vector of found lines. Each vector is encoded as a vector<Vec3d> \f$(votes, rho, theta)\f$.
+The larger the value of 'votes', the higher the reliability of the Hough line.
+@param lines_max Max count of Hough lines.
+@param threshold %Accumulator threshold parameter. Only those lines are returned that get enough
+votes ( \f$>\texttt{threshold}\f$ ).
+@param min_rho Minimum value for \f$\rho\f$ for the accumulator (Note: \f$\rho\f$ can be negative. The absolute value \f$|\rho|\f$ is the distance of a line to the origin.).
+@param max_rho Maximum value for \f$\rho\f$ for the accumulator.
+@param rho_step Distance resolution of the accumulator.
+@param min_theta Minimum angle value of the accumulator in radians.
+@param max_theta Upper bound for the angle value of the accumulator in radians. The actual maximum
+angle may be slightly less than max_theta, depending on the parameters min_theta and theta_step.
+@param theta_step Angle resolution of the accumulator in radians.
+ */
+CV_EXPORTS_W void HoughLinesPointSet( InputArray point, OutputArray lines, int lines_max, int threshold,
+                                      double min_rho, double max_rho, double rho_step,
+                                      double min_theta, double max_theta, double theta_step );
+
+/** @example samples/cpp/tutorial_code/ImgTrans/houghcircles.cpp
+An example using the Hough circle detector
+*/
+
+/** @brief Finds circles in a grayscale image using the Hough transform.
+
+The function finds circles in a grayscale image using a modification of the Hough transform.
+
+Example: :
+@include snippets/imgproc_HoughLinesCircles.cpp
+
+@note Usually the function detects the centers of circles well. However, it may fail to find correct
+radii. You can assist to the function by specifying the radius range ( minRadius and maxRadius ) if
+you know it. Or, in the case of #HOUGH_GRADIENT method you may set maxRadius to a negative number
+to return centers only without radius search, and find the correct radius using an additional procedure.
+
+It also helps to smooth image a bit unless it's already soft. For example,
+GaussianBlur() with 7x7 kernel and 1.5x1.5 sigma or similar blurring may help.
+
+@param image 8-bit, single-channel, grayscale input image.
+@param circles Output vector of found circles. Each vector is encoded as  3 or 4 element
+floating-point vector \f$(x, y, radius)\f$ or \f$(x, y, radius, votes)\f$ .
+@param method Detection method, see #HoughModes. The available methods are #HOUGH_GRADIENT and #HOUGH_GRADIENT_ALT.
+@param dp Inverse ratio of the accumulator resolution to the image resolution. For example, if
+dp=1 , the accumulator has the same resolution as the input image. If dp=2 , the accumulator has
+half as big width and height. For #HOUGH_GRADIENT_ALT the recommended value is dp=1.5,
+unless some small very circles need to be detected.
+@param minDist Minimum distance between the centers of the detected circles. If the parameter is
+too small, multiple neighbor circles may be falsely detected in addition to a true one. If it is
+too large, some circles may be missed.
+@param param1 First method-specific parameter. In case of #HOUGH_GRADIENT and #HOUGH_GRADIENT_ALT,
+it is the higher threshold of the two passed to the Canny edge detector (the lower one is twice smaller).
+Note that #HOUGH_GRADIENT_ALT uses #Scharr algorithm to compute image derivatives, so the threshold value
+should normally be higher, such as 300 or normally exposed and contrasty images.
+@param param2 Second method-specific parameter. In case of #HOUGH_GRADIENT, it is the
+accumulator threshold for the circle centers at the detection stage. The smaller it is, the more
+false circles may be detected. Circles, corresponding to the larger accumulator values, will be
+returned first. In the case of #HOUGH_GRADIENT_ALT algorithm, this is the circle "perfectness" measure.
+The closer it to 1, the better shaped circles algorithm selects. In most cases 0.9 should be fine.
+If you want get better detection of small circles, you may decrease it to 0.85, 0.8 or even less.
+But then also try to limit the search range [minRadius, maxRadius] to avoid many false circles.
+@param minRadius Minimum circle radius.
+@param maxRadius Maximum circle radius. If <= 0, uses the maximum image dimension. If < 0, #HOUGH_GRADIENT returns
+centers without finding the radius. #HOUGH_GRADIENT_ALT always computes circle radiuses.
+
+@sa fitEllipse, minEnclosingCircle
+ */
+CV_EXPORTS_W void HoughCircles( InputArray image, OutputArray circles,
+                               int method, double dp, double minDist,
+                               double param1 = 100, double param2 = 100,
+                               int minRadius = 0, int maxRadius = 0 );
+
+//! @} imgproc_feature
+
+//! @addtogroup imgproc_filter
+//! @{
+
+/** @example samples/cpp/tutorial_code/ImgProc/Morphology_2.cpp
+Advanced morphology Transformations sample code
+![Sample screenshot](Morphology_2_Tutorial_Result.jpg)
+Check @ref tutorial_opening_closing_hats "the corresponding tutorial" for more details
+*/
+
+/** @brief Erodes an image by using a specific structuring element.
+
+The function erodes the source image using the specified structuring element that determines the
+shape of a pixel neighborhood over which the minimum is taken:
+
+\f[\texttt{dst} (x,y) =  \min _{(x',y'):  \, \texttt{element} (x',y') \ne0 } \texttt{src} (x+x',y+y')\f]
+
+The function supports the in-place mode. Erosion can be applied several ( iterations ) times. In
+case of multi-channel images, each channel is processed independently.
+
+@param src input image; the number of channels can be arbitrary, but the depth should be one of
+CV_8U, CV_16U, CV_16S, CV_32F or CV_64F.
+@param dst output image of the same size and type as src.
+@param kernel structuring element used for erosion; if `element=Mat()`, a `3 x 3` rectangular
+structuring element is used. Kernel can be created using #getStructuringElement.
+@param anchor position of the anchor within the element; default value (-1, -1) means that the
+anchor is at the element center.
+@param iterations number of times erosion is applied.
+@param borderType pixel extrapolation method, see #BorderTypes. #BORDER_WRAP is not supported.
+@param borderValue border value in case of a constant border
+@sa  dilate, morphologyEx, getStructuringElement
+ */
+CV_EXPORTS_W void erode( InputArray src, OutputArray dst, InputArray kernel,
+                         Point anchor = Point(-1,-1), int iterations = 1,
+                         int borderType = BORDER_CONSTANT,
+                         const Scalar& borderValue = morphologyDefaultBorderValue() );
+
+/** @example samples/cpp/tutorial_code/ImgProc/Morphology_1.cpp
+Erosion and Dilation sample code
+![Sample Screenshot-Erosion](Morphology_1_Tutorial_Erosion_Result.jpg)![Sample Screenshot-Dilation](Morphology_1_Tutorial_Dilation_Result.jpg)
+Check @ref tutorial_erosion_dilatation "the corresponding tutorial" for more details
+*/
+
+/** @brief Dilates an image by using a specific structuring element.
+
+The function dilates the source image using the specified structuring element that determines the
+shape of a pixel neighborhood over which the maximum is taken:
+\f[\texttt{dst} (x,y) =  \max _{(x',y'):  \, \texttt{element} (x',y') \ne0 } \texttt{src} (x+x',y+y')\f]
+
+The function supports the in-place mode. Dilation can be applied several ( iterations ) times. In
+case of multi-channel images, each channel is processed independently.
+
+@param src input image; the number of channels can be arbitrary, but the depth should be one of
+CV_8U, CV_16U, CV_16S, CV_32F or CV_64F.
+@param dst output image of the same size and type as src.
+@param kernel structuring element used for dilation; if element=Mat(), a 3 x 3 rectangular
+structuring element is used. Kernel can be created using #getStructuringElement
+@param anchor position of the anchor within the element; default value (-1, -1) means that the
+anchor is at the element center.
+@param iterations number of times dilation is applied.
+@param borderType pixel extrapolation method, see #BorderTypes. #BORDER_WRAP is not suported.
+@param borderValue border value in case of a constant border
+@sa  erode, morphologyEx, getStructuringElement
+ */
+CV_EXPORTS_W void dilate( InputArray src, OutputArray dst, InputArray kernel,
+                          Point anchor = Point(-1,-1), int iterations = 1,
+                          int borderType = BORDER_CONSTANT,
+                          const Scalar& borderValue = morphologyDefaultBorderValue() );
+
+/** @brief Performs advanced morphological transformations.
+
+The function cv::morphologyEx can perform advanced morphological transformations using an erosion and dilation as
+basic operations.
+
+Any of the operations can be done in-place. In case of multi-channel images, each channel is
+processed independently.
+
+@param src Source image. The number of channels can be arbitrary. The depth should be one of
+CV_8U, CV_16U, CV_16S, CV_32F or CV_64F.
+@param dst Destination image of the same size and type as source image.
+@param op Type of a morphological operation, see #MorphTypes
+@param kernel Structuring element. It can be created using #getStructuringElement.
+@param anchor Anchor position with the kernel. Negative values mean that the anchor is at the
+kernel center.
+@param iterations Number of times erosion and dilation are applied.
+@param borderType Pixel extrapolation method, see #BorderTypes. #BORDER_WRAP is not supported.
+@param borderValue Border value in case of a constant border. The default value has a special
+meaning.
+@sa  dilate, erode, getStructuringElement
+@note The number of iterations is the number of times erosion or dilatation operation will be applied.
+For instance, an opening operation (#MORPH_OPEN) with two iterations is equivalent to apply
+successively: erode -> erode -> dilate -> dilate (and not erode -> dilate -> erode -> dilate).
+ */
+CV_EXPORTS_W void morphologyEx( InputArray src, OutputArray dst,
+                                int op, InputArray kernel,
+                                Point anchor = Point(-1,-1), int iterations = 1,
+                                int borderType = BORDER_CONSTANT,
+                                const Scalar& borderValue = morphologyDefaultBorderValue() );
+
+//! @} imgproc_filter
+
+//! @addtogroup imgproc_transform
+//! @{
+
+/** @brief Resizes an image.
+
+The function resize resizes the image src down to or up to the specified size. Note that the
+initial dst type or size are not taken into account. Instead, the size and type are derived from
+the `src`,`dsize`,`fx`, and `fy`. If you want to resize src so that it fits the pre-created dst,
+you may call the function as follows:
+@code
+    // explicitly specify dsize=dst.size(); fx and fy will be computed from that.
+    resize(src, dst, dst.size(), 0, 0, interpolation);
+@endcode
+If you want to decimate the image by factor of 2 in each direction, you can call the function this
+way:
+@code
+    // specify fx and fy and let the function compute the destination image size.
+    resize(src, dst, Size(), 0.5, 0.5, interpolation);
+@endcode
+To shrink an image, it will generally look best with #INTER_AREA interpolation, whereas to
+enlarge an image, it will generally look best with #INTER_CUBIC (slow) or #INTER_LINEAR
+(faster but still looks OK).
+
+@param src input image.
+@param dst output image; it has the size dsize (when it is non-zero) or the size computed from
+src.size(), fx, and fy; the type of dst is the same as of src.
+@param dsize output image size; if it equals zero (`None` in Python), it is computed as:
+ \f[\texttt{dsize = Size(round(fx*src.cols), round(fy*src.rows))}\f]
+ Either dsize or both fx and fy must be non-zero.
+@param fx scale factor along the horizontal axis; when it equals 0, it is computed as
+\f[\texttt{(double)dsize.width/src.cols}\f]
+@param fy scale factor along the vertical axis; when it equals 0, it is computed as
+\f[\texttt{(double)dsize.height/src.rows}\f]
+@param interpolation interpolation method, see #InterpolationFlags
+
+@sa  warpAffine, warpPerspective, remap
+ */
+CV_EXPORTS_W void resize( InputArray src, OutputArray dst,
+                          Size dsize, double fx = 0, double fy = 0,
+                          int interpolation = INTER_LINEAR );
+
+/** @brief Applies an affine transformation to an image.
+
+The function warpAffine transforms the source image using the specified matrix:
+
+\f[\texttt{dst} (x,y) =  \texttt{src} ( \texttt{M} _{11} x +  \texttt{M} _{12} y +  \texttt{M} _{13}, \texttt{M} _{21} x +  \texttt{M} _{22} y +  \texttt{M} _{23})\f]
+
+when the flag #WARP_INVERSE_MAP is set. Otherwise, the transformation is first inverted
+with #invertAffineTransform and then put in the formula above instead of M. The function cannot
+operate in-place.
+
+@param src input image.
+@param dst output image that has the size dsize and the same type as src .
+@param M \f$2\times 3\f$ transformation matrix.
+@param dsize size of the output image.
+@param flags combination of interpolation methods (see #InterpolationFlags) and the optional
+flag #WARP_INVERSE_MAP that means that M is the inverse transformation (
+\f$\texttt{dst}\rightarrow\texttt{src}\f$ ).
+@param borderMode pixel extrapolation method (see #BorderTypes); when
+borderMode=#BORDER_TRANSPARENT, it means that the pixels in the destination image corresponding to
+the "outliers" in the source image are not modified by the function.
+@param borderValue value used in case of a constant border; by default, it is 0.
+
+@sa  warpPerspective, resize, remap, getRectSubPix, transform
+ */
+CV_EXPORTS_W void warpAffine( InputArray src, OutputArray dst,
+                              InputArray M, Size dsize,
+                              int flags = INTER_LINEAR,
+                              int borderMode = BORDER_CONSTANT,
+                              const Scalar& borderValue = Scalar());
+
+/** @example samples/cpp/warpPerspective_demo.cpp
+An example program shows using cv::getPerspectiveTransform and cv::warpPerspective for image warping
+*/
+
+/** @brief Applies a perspective transformation to an image.
+
+The function warpPerspective transforms the source image using the specified matrix:
+
+\f[\texttt{dst} (x,y) =  \texttt{src} \left ( \frac{M_{11} x + M_{12} y + M_{13}}{M_{31} x + M_{32} y + M_{33}} ,
+     \frac{M_{21} x + M_{22} y + M_{23}}{M_{31} x + M_{32} y + M_{33}} \right )\f]
+
+when the flag #WARP_INVERSE_MAP is set. Otherwise, the transformation is first inverted with invert
+and then put in the formula above instead of M. The function cannot operate in-place.
+
+@param src input image.
+@param dst output image that has the size dsize and the same type as src .
+@param M \f$3\times 3\f$ transformation matrix.
+@param dsize size of the output image.
+@param flags combination of interpolation methods (#INTER_LINEAR or #INTER_NEAREST) and the
+optional flag #WARP_INVERSE_MAP, that sets M as the inverse transformation (
+\f$\texttt{dst}\rightarrow\texttt{src}\f$ ).
+@param borderMode pixel extrapolation method (#BORDER_CONSTANT or #BORDER_REPLICATE).
+@param borderValue value used in case of a constant border; by default, it equals 0.
+
+@sa  warpAffine, resize, remap, getRectSubPix, perspectiveTransform
+ */
+CV_EXPORTS_W void warpPerspective( InputArray src, OutputArray dst,
+                                   InputArray M, Size dsize,
+                                   int flags = INTER_LINEAR,
+                                   int borderMode = BORDER_CONSTANT,
+                                   const Scalar& borderValue = Scalar());
+
+/** @brief Applies a generic geometrical transformation to an image.
+
+The function remap transforms the source image using the specified map:
+
+\f[\texttt{dst} (x,y) =  \texttt{src} (map_x(x,y),map_y(x,y))\f]
+
+with the WARP_RELATIVE_MAP flag :
+
+\f[\texttt{dst} (x,y) =  \texttt{src} (x+map_x(x,y),y+map_y(x,y))\f]
+
+where values of pixels with non-integer coordinates are computed using one of available
+interpolation methods. \f$map_x\f$ and \f$map_y\f$ can be encoded as separate floating-point maps
+in \f$map_1\f$ and \f$map_2\f$ respectively, or interleaved floating-point maps of \f$(x,y)\f$ in
+\f$map_1\f$, or fixed-point maps created by using #convertMaps. The reason you might want to
+convert from floating to fixed-point representations of a map is that they can yield much faster
+(\~2x) remapping operations. In the converted case, \f$map_1\f$ contains pairs (cvFloor(x),
+cvFloor(y)) and \f$map_2\f$ contains indices in a table of interpolation coefficients.
+
+This function cannot operate in-place.
+
+@param src Source image.
+@param dst Destination image. It has the same size as map1 and the same type as src .
+@param map1 The first map of either (x,y) points or just x values having the type CV_16SC2 ,
+CV_32FC1, or CV_32FC2. See #convertMaps for details on converting a floating point
+representation to fixed-point for speed.
+@param map2 The second map of y values having the type CV_16UC1, CV_32FC1, or none (empty map
+if map1 is (x,y) points), respectively.
+@param interpolation Interpolation method (see #InterpolationFlags). The methods #INTER_AREA
+#INTER_LINEAR_EXACT and #INTER_NEAREST_EXACT are not supported by this function.
+The extra flag WARP_RELATIVE_MAP can be ORed to the interpolation method
+(e.g. INTER_LINEAR | WARP_RELATIVE_MAP)
+@param borderMode Pixel extrapolation method (see #BorderTypes). When
+borderMode=#BORDER_TRANSPARENT, it means that the pixels in the destination image that
+corresponds to the "outliers" in the source image are not modified by the function.
+@param borderValue Value used in case of a constant border. By default, it is 0.
+@note
+Due to current implementation limitations the size of an input and output images should be less than 32767x32767.
+ */
+CV_EXPORTS_W void remap( InputArray src, OutputArray dst,
+                         InputArray map1, InputArray map2,
+                         int interpolation, int borderMode = BORDER_CONSTANT,
+                         const Scalar& borderValue = Scalar());
+
+/** @brief Converts image transformation maps from one representation to another.
+
+The function converts a pair of maps for remap from one representation to another. The following
+options ( (map1.type(), map2.type()) \f$\rightarrow\f$ (dstmap1.type(), dstmap2.type()) ) are
+supported:
+
+- \f$\texttt{(CV_32FC1, CV_32FC1)} \rightarrow \texttt{(CV_16SC2, CV_16UC1)}\f$. This is the
+most frequently used conversion operation, in which the original floating-point maps (see #remap)
+are converted to a more compact and much faster fixed-point representation. The first output array
+contains the rounded coordinates and the second array (created only when nninterpolation=false )
+contains indices in the interpolation tables.
+
+- \f$\texttt{(CV_32FC2)} \rightarrow \texttt{(CV_16SC2, CV_16UC1)}\f$. The same as above but
+the original maps are stored in one 2-channel matrix.
+
+- Reverse conversion. Obviously, the reconstructed floating-point maps will not be exactly the same
+as the originals.
+
+@param map1 The first input map of type CV_16SC2, CV_32FC1, or CV_32FC2 .
+@param map2 The second input map of type CV_16UC1, CV_32FC1, or none (empty matrix),
+respectively.
+@param dstmap1 The first output map that has the type dstmap1type and the same size as src .
+@param dstmap2 The second output map.
+@param dstmap1type Type of the first output map that should be CV_16SC2, CV_32FC1, or
+CV_32FC2 .
+@param nninterpolation Flag indicating whether the fixed-point maps are used for the
+nearest-neighbor or for a more complex interpolation.
+
+@sa  remap, undistort, initUndistortRectifyMap
+ */
+CV_EXPORTS_W void convertMaps( InputArray map1, InputArray map2,
+                               OutputArray dstmap1, OutputArray dstmap2,
+                               int dstmap1type, bool nninterpolation = false );
+
+/** @brief Calculates an affine matrix of 2D rotation.
+
+The function calculates the following matrix:
+
+\f[\begin{bmatrix} \alpha &  \beta & (1- \alpha )  \cdot \texttt{center.x} -  \beta \cdot \texttt{center.y} \\ - \beta &  \alpha &  \beta \cdot \texttt{center.x} + (1- \alpha )  \cdot \texttt{center.y} \end{bmatrix}\f]
+
+where
+
+\f[\begin{array}{l} \alpha =  \texttt{scale} \cdot \cos \texttt{angle} , \\ \beta =  \texttt{scale} \cdot \sin \texttt{angle} \end{array}\f]
+
+The transformation maps the rotation center to itself. If this is not the target, adjust the shift.
+
+@param center Center of the rotation in the source image.
+@param angle Rotation angle in degrees. Positive values mean counter-clockwise rotation (the
+coordinate origin is assumed to be the top-left corner).
+@param scale Isotropic scale factor.
+
+@sa  getAffineTransform, warpAffine, transform
+ */
+CV_EXPORTS_W Mat getRotationMatrix2D(Point2f center, double angle, double scale);
+
+/** @sa getRotationMatrix2D */
+CV_EXPORTS Matx23d getRotationMatrix2D_(Point2f center, double angle, double scale);
+
+inline
+Mat getRotationMatrix2D(Point2f center, double angle, double scale)
+{
+    return Mat(getRotationMatrix2D_(center, angle, scale), true);
+}
+
+/** @brief Calculates an affine transform from three pairs of the corresponding points.
+
+The function calculates the \f$2 \times 3\f$ matrix of an affine transform so that:
+
+\f[\begin{bmatrix} x'_i \\ y'_i \end{bmatrix} = \texttt{map_matrix} \cdot \begin{bmatrix} x_i \\ y_i \\ 1 \end{bmatrix}\f]
+
+where
+
+\f[dst(i)=(x'_i,y'_i), src(i)=(x_i, y_i), i=0,1,2\f]
+
+@param src Coordinates of triangle vertices in the source image.
+@param dst Coordinates of the corresponding triangle vertices in the destination image.
+
+@sa  warpAffine, transform
+ */
+CV_EXPORTS Mat getAffineTransform( const Point2f src[], const Point2f dst[] );
+
+/** @brief Inverts an affine transformation.
+
+The function computes an inverse affine transformation represented by \f$2 \times 3\f$ matrix M:
+
+\f[\begin{bmatrix} a_{11} & a_{12} & b_1  \\ a_{21} & a_{22} & b_2 \end{bmatrix}\f]
+
+The result is also a \f$2 \times 3\f$ matrix of the same type as M.
+
+@param M Original affine transformation.
+@param iM Output reverse affine transformation.
+ */
+CV_EXPORTS_W void invertAffineTransform( InputArray M, OutputArray iM );
+
+/** @brief Calculates a perspective transform from four pairs of the corresponding points.
+
+The function calculates the \f$3 \times 3\f$ matrix of a perspective transform so that:
+
+\f[\begin{bmatrix} t_i x'_i \\ t_i y'_i \\ t_i \end{bmatrix} = \texttt{map_matrix} \cdot \begin{bmatrix} x_i \\ y_i \\ 1 \end{bmatrix}\f]
+
+where
+
+\f[dst(i)=(x'_i,y'_i), src(i)=(x_i, y_i), i=0,1,2,3\f]
+
+@param src Coordinates of quadrangle vertices in the source image.
+@param dst Coordinates of the corresponding quadrangle vertices in the destination image.
+@param solveMethod method passed to cv::solve (#DecompTypes)
+
+@sa  findHomography, warpPerspective, perspectiveTransform
+ */
+CV_EXPORTS_W Mat getPerspectiveTransform(InputArray src, InputArray dst, int solveMethod = DECOMP_LU);
+
+/** @overload */
+CV_EXPORTS Mat getPerspectiveTransform(const Point2f src[], const Point2f dst[], int solveMethod = DECOMP_LU);
+
+
+CV_EXPORTS_W Mat getAffineTransform( InputArray src, InputArray dst );
+
+/** @brief Retrieves a pixel rectangle from an image with sub-pixel accuracy.
+
+The function getRectSubPix extracts pixels from src:
+
+\f[patch(x, y) = src(x +  \texttt{center.x} - ( \texttt{dst.cols} -1)*0.5, y +  \texttt{center.y} - ( \texttt{dst.rows} -1)*0.5)\f]
+
+where the values of the pixels at non-integer coordinates are retrieved using bilinear
+interpolation. Every channel of multi-channel images is processed independently. Also
+the image should be a single channel or three channel image. While the center of the
+rectangle must be inside the image, parts of the rectangle may be outside.
+
+@param image Source image.
+@param patchSize Size of the extracted patch.
+@param center Floating point coordinates of the center of the extracted rectangle within the
+source image. The center must be inside the image.
+@param patch Extracted patch that has the size patchSize and the same number of channels as src .
+@param patchType Depth of the extracted pixels. By default, they have the same depth as src .
+
+@sa  warpAffine, warpPerspective
+ */
+CV_EXPORTS_W void getRectSubPix( InputArray image, Size patchSize,
+                                 Point2f center, OutputArray patch, int patchType = -1 );
+
+/** @example samples/cpp/polar_transforms.cpp
+An example using the cv::linearPolar and cv::logPolar operations
+*/
+
+/** @brief Remaps an image to semilog-polar coordinates space.
+
+@deprecated This function produces same result as cv::warpPolar(src, dst, src.size(), center, maxRadius, flags+WARP_POLAR_LOG);
+
+@internal
+Transform the source image using the following transformation (See @ref polar_remaps_reference_image "Polar remaps reference image d)"):
+\f[\begin{array}{l}
+  dst( \rho , \phi ) = src(x,y) \\
+  dst.size() \leftarrow src.size()
+\end{array}\f]
+
+where
+\f[\begin{array}{l}
+  I = (dx,dy) = (x - center.x,y - center.y) \\
+  \rho = M \cdot log_e(\texttt{magnitude} (I)) ,\\
+  \phi = Kangle \cdot \texttt{angle} (I) \\
+\end{array}\f]
+
+and
+\f[\begin{array}{l}
+  M = src.cols / log_e(maxRadius) \\
+  Kangle = src.rows / 2\Pi \\
+\end{array}\f]
+
+The function emulates the human "foveal" vision and can be used for fast scale and
+rotation-invariant template matching, for object tracking and so forth.
+@param src Source image
+@param dst Destination image. It will have same size and type as src.
+@param center The transformation center; where the output precision is maximal
+@param M Magnitude scale parameter. It determines the radius of the bounding circle to transform too.
+@param flags A combination of interpolation methods, see #InterpolationFlags
+
+@note
+-   The function can not operate in-place.
+-   To calculate magnitude and angle in degrees #cartToPolar is used internally thus angles are measured from 0 to 360 with accuracy about 0.3 degrees.
+
+@sa cv::linearPolar
+@endinternal
+*/
+CV_EXPORTS_W void logPolar( InputArray src, OutputArray dst,
+                            Point2f center, double M, int flags );
+
+/** @brief Remaps an image to polar coordinates space.
+
+@deprecated This function produces same result as cv::warpPolar(src, dst, src.size(), center, maxRadius, flags)
+
+@internal
+Transform the source image using the following transformation (See @ref polar_remaps_reference_image "Polar remaps reference image c)"):
+\f[\begin{array}{l}
+  dst( \rho , \phi ) = src(x,y) \\
+  dst.size() \leftarrow src.size()
+\end{array}\f]
+
+where
+\f[\begin{array}{l}
+  I = (dx,dy) = (x - center.x,y - center.y) \\
+  \rho = Kmag \cdot \texttt{magnitude} (I) ,\\
+  \phi = angle \cdot \texttt{angle} (I)
+\end{array}\f]
+
+and
+\f[\begin{array}{l}
+  Kx = src.cols / maxRadius \\
+  Ky = src.rows / 2\Pi
+\end{array}\f]
+
+
+@param src Source image
+@param dst Destination image. It will have same size and type as src.
+@param center The transformation center;
+@param maxRadius The radius of the bounding circle to transform. It determines the inverse magnitude scale parameter too.
+@param flags A combination of interpolation methods, see #InterpolationFlags
+
+@note
+-   The function can not operate in-place.
+-   To calculate magnitude and angle in degrees #cartToPolar is used internally thus angles are measured from 0 to 360 with accuracy about 0.3 degrees.
+
+@sa cv::logPolar
+@endinternal
+*/
+CV_EXPORTS_W void linearPolar( InputArray src, OutputArray dst,
+                               Point2f center, double maxRadius, int flags );
+
+
+/** \brief Remaps an image to polar or semilog-polar coordinates space
+
+@anchor polar_remaps_reference_image
+![Polar remaps reference](pics/polar_remap_doc.png)
+
+Transform the source image using the following transformation:
+\f[
+dst(\rho , \phi ) = src(x,y)
+\f]
+
+where
+\f[
+\begin{array}{l}
+\vec{I} = (x - center.x, \;y - center.y) \\
+\phi = Kangle \cdot \texttt{angle} (\vec{I}) \\
+\rho = \left\{\begin{matrix}
+Klin \cdot \texttt{magnitude} (\vec{I}) & default \\
+Klog \cdot log_e(\texttt{magnitude} (\vec{I})) & if \; semilog \\
+\end{matrix}\right.
+\end{array}
+\f]
+
+and
+\f[
+\begin{array}{l}
+Kangle = dsize.height / 2\Pi \\
+Klin = dsize.width / maxRadius \\
+Klog = dsize.width / log_e(maxRadius) \\
+\end{array}
+\f]
+
+
+\par Linear vs semilog mapping
+
+Polar mapping can be linear or semi-log. Add one of #WarpPolarMode to `flags` to specify the polar mapping mode.
+
+Linear is the default mode.
+
+The semilog mapping emulates the human "foveal" vision that permit very high acuity on the line of sight (central vision)
+in contrast to peripheral vision where acuity is minor.
+
+\par Option on `dsize`:
+
+- if both values in `dsize <=0 ` (default),
+the destination image will have (almost) same area of source bounding circle:
+\f[\begin{array}{l}
+dsize.area  \leftarrow (maxRadius^2 \cdot \Pi) \\
+dsize.width = \texttt{cvRound}(maxRadius) \\
+dsize.height = \texttt{cvRound}(maxRadius \cdot \Pi) \\
+\end{array}\f]
+
+
+- if only `dsize.height <= 0`,
+the destination image area will be proportional to the bounding circle area but scaled by `Kx * Kx`:
+\f[\begin{array}{l}
+dsize.height = \texttt{cvRound}(dsize.width \cdot \Pi) \\
+\end{array}
+\f]
+
+- if both values in `dsize > 0 `,
+the destination image will have the given size therefore the area of the bounding circle will be scaled to `dsize`.
+
+
+\par Reverse mapping
+
+You can get reverse mapping adding #WARP_INVERSE_MAP to `flags`
+\snippet polar_transforms.cpp InverseMap
+
+In addiction, to calculate the original coordinate from a polar mapped coordinate \f$(rho, phi)->(x, y)\f$:
+\snippet polar_transforms.cpp InverseCoordinate
+
+@param src Source image.
+@param dst Destination image. It will have same type as src.
+@param dsize The destination image size (see description for valid options).
+@param center The transformation center.
+@param maxRadius The radius of the bounding circle to transform. It determines the inverse magnitude scale parameter too.
+@param flags A combination of interpolation methods, #InterpolationFlags + #WarpPolarMode.
+            - Add #WARP_POLAR_LINEAR to select linear polar mapping (default)
+            - Add #WARP_POLAR_LOG to select semilog polar mapping
+            - Add #WARP_INVERSE_MAP for reverse mapping.
+@note
+-  The function can not operate in-place.
+-  To calculate magnitude and angle in degrees #cartToPolar is used internally thus angles are measured from 0 to 360 with accuracy about 0.3 degrees.
+-  This function uses #remap. Due to current implementation limitations the size of an input and output images should be less than 32767x32767.
+
+@sa cv::remap
+*/
+CV_EXPORTS_W void warpPolar(InputArray src, OutputArray dst, Size dsize,
+                            Point2f center, double maxRadius, int flags);
+
+
+//! @} imgproc_transform
+
+//! @addtogroup imgproc_misc
+//! @{
+
+/** @brief Calculates the integral of an image.
+
+The function calculates one or more integral images for the source image as follows:
+
+\f[\texttt{sum} (X,Y) =  \sum _{x<X,y<Y}  \texttt{image} (x,y)\f]
+
+\f[\texttt{sqsum} (X,Y) =  \sum _{x<X,y<Y}  \texttt{image} (x,y)^2\f]
+
+\f[\texttt{tilted} (X,Y) =  \sum _{y<Y,abs(x-X+1) \leq Y-y-1}  \texttt{image} (x,y)\f]
+
+Using these integral images, you can calculate sum, mean, and standard deviation over a specific
+up-right or rotated rectangular region of the image in a constant time, for example:
+
+\f[\sum _{x_1 \leq x < x_2,  \, y_1  \leq y < y_2}  \texttt{image} (x,y) =  \texttt{sum} (x_2,y_2)- \texttt{sum} (x_1,y_2)- \texttt{sum} (x_2,y_1)+ \texttt{sum} (x_1,y_1)\f]
+
+It makes possible to do a fast blurring or fast block correlation with a variable window size, for
+example. In case of multi-channel images, sums for each channel are accumulated independently.
+
+As a practical example, the next figure shows the calculation of the integral of a straight
+rectangle Rect(4,4,3,2) and of a tilted rectangle Rect(5,1,2,3) . The selected pixels in the
+original image are shown, as well as the relative pixels in the integral images sum and tilted .
+
+![integral calculation example](pics/integral.png)
+
+@param src input image as \f$W \times H\f$, 8-bit or floating-point (32f or 64f).
+@param sum integral image as \f$(W+1)\times (H+1)\f$ , 32-bit integer or floating-point (32f or 64f).
+@param sqsum integral image for squared pixel values; it is \f$(W+1)\times (H+1)\f$, double-precision
+floating-point (64f) array.
+@param tilted integral for the image rotated by 45 degrees; it is \f$(W+1)\times (H+1)\f$ array with
+the same data type as sum.
+@param sdepth desired depth of the integral and the tilted integral images, CV_32S, CV_32F, or
+CV_64F.
+@param sqdepth desired depth of the integral image of squared pixel values, CV_32F or CV_64F.
+ */
+CV_EXPORTS_AS(integral3) void integral( InputArray src, OutputArray sum,
+                                        OutputArray sqsum, OutputArray tilted,
+                                        int sdepth = -1, int sqdepth = -1 );
+
+/** @overload */
+CV_EXPORTS_W void integral( InputArray src, OutputArray sum, int sdepth = -1 );
+
+/** @overload */
+CV_EXPORTS_AS(integral2) void integral( InputArray src, OutputArray sum,
+                                        OutputArray sqsum, int sdepth = -1, int sqdepth = -1 );
+
+//! @} imgproc_misc
+
+//! @addtogroup imgproc_motion
+//! @{
+
+/** @brief Adds an image to the accumulator image.
+
+The function adds src or some of its elements to dst :
+
+\f[\texttt{dst} (x,y)  \leftarrow \texttt{dst} (x,y) +  \texttt{src} (x,y)  \quad \text{if} \quad \texttt{mask} (x,y)  \ne 0\f]
+
+The function supports multi-channel images. Each channel is processed independently.
+
+The function cv::accumulate can be used, for example, to collect statistics of a scene background
+viewed by a still camera and for the further foreground-background segmentation.
+
+@param src Input image of type CV_8UC(n), CV_16UC(n), CV_32FC(n) or CV_64FC(n), where n is a positive integer.
+@param dst %Accumulator image with the same number of channels as input image, and a depth of CV_32F or CV_64F.
+@param mask Optional operation mask.
+
+@sa  accumulateSquare, accumulateProduct, accumulateWeighted
+ */
+CV_EXPORTS_W void accumulate( InputArray src, InputOutputArray dst,
+                              InputArray mask = noArray() );
+
+/** @brief Adds the square of a source image to the accumulator image.
+
+The function adds the input image src or its selected region, raised to a power of 2, to the
+accumulator dst :
+
+\f[\texttt{dst} (x,y)  \leftarrow \texttt{dst} (x,y) +  \texttt{src} (x,y)^2  \quad \text{if} \quad \texttt{mask} (x,y)  \ne 0\f]
+
+The function supports multi-channel images. Each channel is processed independently.
+
+@param src Input image as 1- or 3-channel, 8-bit or 32-bit floating point.
+@param dst %Accumulator image with the same number of channels as input image, 32-bit or 64-bit
+floating-point.
+@param mask Optional operation mask.
+
+@sa  accumulateSquare, accumulateProduct, accumulateWeighted
+ */
+CV_EXPORTS_W void accumulateSquare( InputArray src, InputOutputArray dst,
+                                    InputArray mask = noArray() );
+
+/** @brief Adds the per-element product of two input images to the accumulator image.
+
+The function adds the product of two images or their selected regions to the accumulator dst :
+
+\f[\texttt{dst} (x,y)  \leftarrow \texttt{dst} (x,y) +  \texttt{src1} (x,y)  \cdot \texttt{src2} (x,y)  \quad \text{if} \quad \texttt{mask} (x,y)  \ne 0\f]
+
+The function supports multi-channel images. Each channel is processed independently.
+
+@param src1 First input image, 1- or 3-channel, 8-bit or 32-bit floating point.
+@param src2 Second input image of the same type and the same size as src1 .
+@param dst %Accumulator image with the same number of channels as input images, 32-bit or 64-bit
+floating-point.
+@param mask Optional operation mask.
+
+@sa  accumulate, accumulateSquare, accumulateWeighted
+ */
+CV_EXPORTS_W void accumulateProduct( InputArray src1, InputArray src2,
+                                     InputOutputArray dst, InputArray mask=noArray() );
+
+/** @brief Updates a running average.
+
+The function calculates the weighted sum of the input image src and the accumulator dst so that dst
+becomes a running average of a frame sequence:
+
+\f[\texttt{dst} (x,y)  \leftarrow (1- \texttt{alpha} )  \cdot \texttt{dst} (x,y) +  \texttt{alpha} \cdot \texttt{src} (x,y)  \quad \text{if} \quad \texttt{mask} (x,y)  \ne 0\f]
+
+That is, alpha regulates the update speed (how fast the accumulator "forgets" about earlier images).
+The function supports multi-channel images. Each channel is processed independently.
+
+@param src Input image as 1- or 3-channel, 8-bit or 32-bit floating point.
+@param dst %Accumulator image with the same number of channels as input image, 32-bit or 64-bit
+floating-point.
+@param alpha Weight of the input image.
+@param mask Optional operation mask.
+
+@sa  accumulate, accumulateSquare, accumulateProduct
+ */
+CV_EXPORTS_W void accumulateWeighted( InputArray src, InputOutputArray dst,
+                                      double alpha, InputArray mask = noArray() );
+
+/** @brief The function is used to detect translational shifts that occur between two images.
+
+The operation takes advantage of the Fourier shift theorem for detecting the translational shift in
+the frequency domain. It can be used for fast image registration as well as motion estimation. For
+more information please see <https://en.wikipedia.org/wiki/Phase_correlation>
+
+Calculates the cross-power spectrum of two supplied source arrays. The arrays are padded if needed
+with getOptimalDFTSize.
+
+The function performs the following equations:
+- First it applies a Hanning window to each image to remove possible edge effects, if it's provided
+by user. See @ref createHanningWindow and <https://en.wikipedia.org/wiki/Hann_function>. This window may
+be cached until the array size changes to speed up processing time.
+- Next it computes the forward DFTs of each source array:
+\f[\mathbf{G}_a = \mathcal{F}\{src_1\}, \; \mathbf{G}_b = \mathcal{F}\{src_2\}\f]
+where \f$\mathcal{F}\f$ is the forward DFT.
+- It then computes the cross-power spectrum of each frequency domain array:
+\f[R = \frac{ \mathbf{G}_a \mathbf{G}_b^*}{|\mathbf{G}_a \mathbf{G}_b^*|}\f]
+- Next the cross-correlation is converted back into the time domain via the inverse DFT:
+\f[r = \mathcal{F}^{-1}\{R\}\f]
+- Finally, it computes the peak location and computes a 5x5 weighted centroid around the peak to
+achieve sub-pixel accuracy.
+\f[(\Delta x, \Delta y) = \texttt{weightedCentroid} \{\arg \max_{(x, y)}\{r\}\}\f]
+- If non-zero, the response parameter is computed as the sum of the elements of r within the 5x5
+centroid around the peak location. It is normalized to a maximum of 1 (meaning there is a single
+peak) and will be smaller when there are multiple peaks.
+
+@param src1 Source floating point array (CV_32FC1 or CV_64FC1)
+@param src2 Source floating point array (CV_32FC1 or CV_64FC1)
+@param window Floating point array with windowing coefficients to reduce edge effects (optional).
+@param response Signal power within the 5x5 centroid around the peak, between 0 and 1 (optional).
+@returns detected phase shift (sub-pixel) between the two arrays.
+
+@sa dft, getOptimalDFTSize, idft, mulSpectrums createHanningWindow
+ */
+CV_EXPORTS_W Point2d phaseCorrelate(InputArray src1, InputArray src2,
+                                    InputArray window = noArray(), CV_OUT double* response = 0);
+
+/** @brief This function computes a Hanning window coefficients in two dimensions.
+
+See (https://en.wikipedia.org/wiki/Hann_function) and (https://en.wikipedia.org/wiki/Window_function)
+for more information.
+
+An example is shown below:
+@code
+    // create hanning window of size 100x100 and type CV_32F
+    Mat hann;
+    createHanningWindow(hann, Size(100, 100), CV_32F);
+@endcode
+@param dst Destination array to place Hann coefficients in
+@param winSize The window size specifications (both width and height must be > 1)
+@param type Created array type
+ */
+CV_EXPORTS_W void createHanningWindow(OutputArray dst, Size winSize, int type);
+
+/** @brief Performs the per-element division of the first Fourier spectrum by the second Fourier spectrum.
+
+The function cv::divSpectrums performs the per-element division of the first array by the second array.
+The arrays are CCS-packed or complex matrices that are results of a real or complex Fourier transform.
+
+@param a first input array.
+@param b second input array of the same size and type as src1 .
+@param c output array of the same size and type as src1 .
+@param flags operation flags; currently, the only supported flag is cv::DFT_ROWS, which indicates that
+each row of src1 and src2 is an independent 1D Fourier spectrum. If you do not want to use this flag, then simply add a `0` as value.
+@param conjB optional flag that conjugates the second input array before the multiplication (true)
+or not (false).
+*/
+CV_EXPORTS_W void divSpectrums(InputArray a, InputArray b, OutputArray c,
+                               int flags, bool conjB = false);
+
+//! @} imgproc_motion
+
+//! @addtogroup imgproc_misc
+//! @{
+
+/** @brief Applies a fixed-level threshold to each array element.
+
+The function applies fixed-level thresholding to a multiple-channel array. The function is typically
+used to get a bi-level (binary) image out of a grayscale image ( #compare could be also used for
+this purpose) or for removing a noise, that is, filtering out pixels with too small or too large
+values. There are several types of thresholding supported by the function. They are determined by
+type parameter.
+
+Also, the special values #THRESH_OTSU or #THRESH_TRIANGLE may be combined with one of the
+above values. In these cases, the function determines the optimal threshold value using the Otsu's
+or Triangle algorithm and uses it instead of the specified thresh.
+
+@note Currently, the Otsu's method is implemented only for CV_8UC1 and CV_16UC1 images,
+and the Triangle's method is implemented only for CV_8UC1 images.
+
+@param src input array (multiple-channel, CV_8U, CV_16S, CV_16U, CV_32F or CV_64F).
+@param dst output array of the same size  and type and the same number of channels as src.
+@param thresh threshold value.
+@param maxval maximum value to use with the #THRESH_BINARY and #THRESH_BINARY_INV thresholding
+types.
+@param type thresholding type (see #ThresholdTypes).
+@return the computed threshold value if Otsu's or Triangle methods used.
+
+@sa  thresholdWithMask, adaptiveThreshold, findContours, compare, min, max
+ */
+CV_EXPORTS_W double threshold( InputArray src, OutputArray dst,
+                               double thresh, double maxval, int type );
+
+/** @brief Same as #threshold, but with an optional mask
+
+@note If the mask is empty, #thresholdWithMask is equivalent to #threshold.
+If the mask is not empty, dst *must* be of the same size and type as src, so that
+outliers pixels are left as-is
+
+@param src input array (multiple-channel, 8-bit or 32-bit floating point).
+@param dst output array of the same size  and type and the same number of channels as src.
+@param mask optional mask (same size as src, 8-bit).
+@param thresh threshold value.
+@param maxval maximum value to use with the #THRESH_BINARY and #THRESH_BINARY_INV thresholding
+types.
+@param type thresholding type (see #ThresholdTypes).
+@return the computed threshold value if Otsu's or Triangle methods used.
+
+@sa  threshold, adaptiveThreshold, findContours, compare, min, max
+*/
+CV_EXPORTS_W double thresholdWithMask( InputArray src, InputOutputArray dst, InputArray mask,
+                                       double thresh, double maxval, int type );
+
+/** @brief Applies an adaptive threshold to an array.
+
+The function transforms a grayscale image to a binary image according to the formulae:
+-   **THRESH_BINARY**
+    \f[dst(x,y) =  \fork{\texttt{maxValue}}{if \(src(x,y) > T(x,y)\)}{0}{otherwise}\f]
+-   **THRESH_BINARY_INV**
+    \f[dst(x,y) =  \fork{0}{if \(src(x,y) > T(x,y)\)}{\texttt{maxValue}}{otherwise}\f]
+where \f$T(x,y)\f$ is a threshold calculated individually for each pixel (see adaptiveMethod parameter).
+
+The function can process the image in-place.
+
+@param src Source 8-bit single-channel image.
+@param dst Destination image of the same size and the same type as src.
+@param maxValue Non-zero value assigned to the pixels for which the condition is satisfied
+@param adaptiveMethod Adaptive thresholding algorithm to use, see #AdaptiveThresholdTypes.
+The #BORDER_REPLICATE | #BORDER_ISOLATED is used to process boundaries.
+@param thresholdType Thresholding type that must be either #THRESH_BINARY or #THRESH_BINARY_INV,
+see #ThresholdTypes.
+@param blockSize Size of a pixel neighborhood that is used to calculate a threshold value for the
+pixel: 3, 5, 7, and so on.
+@param C Constant subtracted from the mean or weighted mean (see the details below). Normally, it
+is positive but may be zero or negative as well.
+
+@sa  threshold, blur, GaussianBlur
+ */
+CV_EXPORTS_W void adaptiveThreshold( InputArray src, OutputArray dst,
+                                     double maxValue, int adaptiveMethod,
+                                     int thresholdType, int blockSize, double C );
+
+//! @} imgproc_misc
+
+//! @addtogroup imgproc_filter
+//! @{
+
+/** @example samples/cpp/tutorial_code/ImgProc/Pyramids/Pyramids.cpp
+An example using pyrDown and pyrUp functions
+*/
+
+/** @brief Blurs an image and downsamples it.
+
+By default, size of the output image is computed as `Size((src.cols+1)/2, (src.rows+1)/2)`, but in
+any case, the following conditions should be satisfied:
+
+\f[\begin{array}{l} | \texttt{dstsize.width} *2-src.cols| \leq 2 \\ | \texttt{dstsize.height} *2-src.rows| \leq 2 \end{array}\f]
+
+The function performs the downsampling step of the Gaussian pyramid construction. First, it
+convolves the source image with the kernel:
+
+\f[\frac{1}{256} \begin{bmatrix} 1 & 4 & 6 & 4 & 1  \\ 4 & 16 & 24 & 16 & 4  \\ 6 & 24 & 36 & 24 & 6  \\ 4 & 16 & 24 & 16 & 4  \\ 1 & 4 & 6 & 4 & 1 \end{bmatrix}\f]
+
+Then, it downsamples the image by rejecting even rows and columns.
+
+@param src input image.
+@param dst output image; it has the specified size and the same type as src.
+@param dstsize size of the output image.
+@param borderType Pixel extrapolation method, see #BorderTypes (#BORDER_CONSTANT isn't supported)
+ */
+CV_EXPORTS_W void pyrDown( InputArray src, OutputArray dst,
+                           const Size& dstsize = Size(), int borderType = BORDER_DEFAULT );
+
+/** @brief Upsamples an image and then blurs it.
+
+By default, size of the output image is computed as `Size(src.cols\*2, (src.rows\*2)`, but in any
+case, the following conditions should be satisfied:
+
+\f[\begin{array}{l} | \texttt{dstsize.width} -src.cols*2| \leq  ( \texttt{dstsize.width}   \mod  2)  \\ | \texttt{dstsize.height} -src.rows*2| \leq  ( \texttt{dstsize.height}   \mod  2) \end{array}\f]
+
+The function performs the upsampling step of the Gaussian pyramid construction, though it can
+actually be used to construct the Laplacian pyramid. First, it upsamples the source image by
+injecting even zero rows and columns and then convolves the result with the same kernel as in
+pyrDown multiplied by 4.
+
+@param src input image.
+@param dst output image. It has the specified size and the same type as src .
+@param dstsize size of the output image.
+@param borderType Pixel extrapolation method, see #BorderTypes (only #BORDER_DEFAULT is supported)
+ */
+CV_EXPORTS_W void pyrUp( InputArray src, OutputArray dst,
+                         const Size& dstsize = Size(), int borderType = BORDER_DEFAULT );
+
+/** @brief Constructs the Gaussian pyramid for an image.
+
+The function constructs a vector of images and builds the Gaussian pyramid by recursively applying
+pyrDown to the previously built pyramid layers, starting from `dst[0]==src`.
+
+@param src Source image. Check pyrDown for the list of supported types.
+@param dst Destination vector of maxlevel+1 images of the same type as src. dst[0] will be the
+same as src. dst[1] is the next pyramid layer, a smoothed and down-sized src, and so on.
+@param maxlevel 0-based index of the last (the smallest) pyramid layer. It must be non-negative.
+@param borderType Pixel extrapolation method, see #BorderTypes (#BORDER_CONSTANT isn't supported)
+ */
+CV_EXPORTS void buildPyramid( InputArray src, OutputArrayOfArrays dst,
+                              int maxlevel, int borderType = BORDER_DEFAULT );
+
+//! @} imgproc_filter
+
+//! @addtogroup imgproc_hist
+//! @{
+
+/** @example samples/cpp/demhist.cpp
+An example for creating histograms of an image
+*/
+
+/** @brief Calculates a histogram of a set of arrays.
+
+The function cv::calcHist calculates the histogram of one or more arrays. The elements of a tuple used
+to increment a histogram bin are taken from the corresponding input arrays at the same location. The
+sample below shows how to compute a 2D Hue-Saturation histogram for a color image. :
+@include snippets/imgproc_calcHist.cpp
+
+@param images Source arrays. They all should have the same depth, CV_8U, CV_16U or CV_32F , and the same
+size. Each of them can have an arbitrary number of channels.
+@param nimages Number of source images.
+@param channels List of the dims channels used to compute the histogram. The first array channels
+are numerated from 0 to images[0].channels()-1 , the second array channels are counted from
+images[0].channels() to images[0].channels() + images[1].channels()-1, and so on.
+@param mask Optional mask. If the matrix is not empty, it must be an 8-bit array of the same size
+as images[i] . The non-zero mask elements mark the array elements counted in the histogram.
+@param hist Output histogram, which is a dense or sparse dims -dimensional array.
+@param dims Histogram dimensionality that must be positive and not greater than CV_MAX_DIMS
+(equal to 32 in the current OpenCV version).
+@param histSize Array of histogram sizes in each dimension.
+@param ranges Array of the dims arrays of the histogram bin boundaries in each dimension. When the
+histogram is uniform ( uniform =true), then for each dimension i it is enough to specify the lower
+(inclusive) boundary \f$L_0\f$ of the 0-th histogram bin and the upper (exclusive) boundary
+\f$U_{\texttt{histSize}[i]-1}\f$ for the last histogram bin histSize[i]-1 . That is, in case of a
+uniform histogram each of ranges[i] is an array of 2 elements. When the histogram is not uniform (
+uniform=false ), then each of ranges[i] contains histSize[i]+1 elements:
+\f$L_0, U_0=L_1, U_1=L_2, ..., U_{\texttt{histSize[i]}-2}=L_{\texttt{histSize[i]}-1}, U_{\texttt{histSize[i]}-1}\f$
+. The array elements, that are not between \f$L_0\f$ and \f$U_{\texttt{histSize[i]}-1}\f$ , are not
+counted in the histogram.
+@param uniform Flag indicating whether the histogram is uniform or not (see above).
+@param accumulate Accumulation flag. If it is set, the histogram is not cleared in the beginning
+when it is allocated. This feature enables you to compute a single histogram from several sets of
+arrays, or to update the histogram in time.
+*/
+CV_EXPORTS void calcHist( const Mat* images, int nimages,
+                          const int* channels, InputArray mask,
+                          OutputArray hist, int dims, const int* histSize,
+                          const float** ranges, bool uniform = true, bool accumulate = false );
+
+/** @overload
+
+this variant uses %SparseMat for output
+*/
+CV_EXPORTS void calcHist( const Mat* images, int nimages,
+                          const int* channels, InputArray mask,
+                          SparseMat& hist, int dims,
+                          const int* histSize, const float** ranges,
+                          bool uniform = true, bool accumulate = false );
+
+/** @overload
+
+this variant supports only uniform histograms.
+
+ranges argument is either empty vector or a flattened vector of histSize.size()*2 elements
+(histSize.size() element pairs). The first and second elements of each pair specify the lower and
+upper boundaries.
+*/
+CV_EXPORTS_W void calcHist( InputArrayOfArrays images,
+                            const std::vector<int>& channels,
+                            InputArray mask, OutputArray hist,
+                            const std::vector<int>& histSize,
+                            const std::vector<float>& ranges,
+                            bool accumulate = false );
+
+/** @brief Calculates the back projection of a histogram.
+
+The function cv::calcBackProject calculates the back project of the histogram. That is, similarly to
+#calcHist , at each location (x, y) the function collects the values from the selected channels
+in the input images and finds the corresponding histogram bin. But instead of incrementing it, the
+function reads the bin value, scales it by scale , and stores in backProject(x,y) . In terms of
+statistics, the function computes probability of each element value in respect with the empirical
+probability distribution represented by the histogram. See how, for example, you can find and track
+a bright-colored object in a scene:
+
+- Before tracking, show the object to the camera so that it covers almost the whole frame.
+Calculate a hue histogram. The histogram may have strong maximums, corresponding to the dominant
+colors in the object.
+
+- When tracking, calculate a back projection of a hue plane of each input video frame using that
+pre-computed histogram. Threshold the back projection to suppress weak colors. It may also make
+sense to suppress pixels with non-sufficient color saturation and too dark or too bright pixels.
+
+- Find connected components in the resulting picture and choose, for example, the largest
+component.
+
+This is an approximate algorithm of the CamShift color object tracker.
+
+@param images Source arrays. They all should have the same depth, CV_8U, CV_16U or CV_32F , and the same
+size. Each of them can have an arbitrary number of channels.
+@param nimages Number of source images.
+@param channels The list of channels used to compute the back projection. The number of channels
+must match the histogram dimensionality. The first array channels are numerated from 0 to
+images[0].channels()-1 , the second array channels are counted from images[0].channels() to
+images[0].channels() + images[1].channels()-1, and so on.
+@param hist Input histogram that can be dense or sparse.
+@param backProject Destination back projection array that is a single-channel array of the same
+size and depth as images[0] .
+@param ranges Array of arrays of the histogram bin boundaries in each dimension. See #calcHist .
+@param scale Optional scale factor for the output back projection.
+@param uniform Flag indicating whether the histogram is uniform or not (see #calcHist).
+
+@sa calcHist, compareHist
+ */
+CV_EXPORTS void calcBackProject( const Mat* images, int nimages,
+                                 const int* channels, InputArray hist,
+                                 OutputArray backProject, const float** ranges,
+                                 double scale = 1, bool uniform = true );
+
+/** @overload */
+CV_EXPORTS void calcBackProject( const Mat* images, int nimages,
+                                 const int* channels, const SparseMat& hist,
+                                 OutputArray backProject, const float** ranges,
+                                 double scale = 1, bool uniform = true );
+
+/** @overload */
+CV_EXPORTS_W void calcBackProject( InputArrayOfArrays images, const std::vector<int>& channels,
+                                   InputArray hist, OutputArray dst,
+                                   const std::vector<float>& ranges,
+                                   double scale );
+
+/** @brief Compares two histograms.
+
+The function cv::compareHist compares two dense or two sparse histograms using the specified method.
+
+The function returns \f$d(H_1, H_2)\f$ .
+
+While the function works well with 1-, 2-, 3-dimensional dense histograms, it may not be suitable
+for high-dimensional sparse histograms. In such histograms, because of aliasing and sampling
+problems, the coordinates of non-zero histogram bins can slightly shift. To compare such histograms
+or more general sparse configurations of weighted points, consider using the #EMD function.
+
+@param H1 First compared histogram.
+@param H2 Second compared histogram of the same size as H1 .
+@param method Comparison method, see #HistCompMethods
+ */
+CV_EXPORTS_W double compareHist( InputArray H1, InputArray H2, int method );
+
+/** @overload */
+CV_EXPORTS double compareHist( const SparseMat& H1, const SparseMat& H2, int method );
+
+/** @brief Equalizes the histogram of a grayscale image.
+
+The function equalizes the histogram of the input image using the following algorithm:
+
+- Calculate the histogram \f$H\f$ for src .
+- Normalize the histogram so that the sum of histogram bins is 255.
+- Compute the integral of the histogram:
+\f[H'_i =  \sum _{0  \le j < i} H(j)\f]
+- Transform the image using \f$H'\f$ as a look-up table: \f$\texttt{dst}(x,y) = H'(\texttt{src}(x,y))\f$
+
+The algorithm normalizes the brightness and increases the contrast of the image.
+
+@param src Source 8-bit single channel image.
+@param dst Destination image of the same size and type as src .
+ */
+CV_EXPORTS_W void equalizeHist( InputArray src, OutputArray dst );
+
+/** @brief Creates a smart pointer to a cv::CLAHE class and initializes it.
+
+@param clipLimit Threshold for contrast limiting.
+@param tileGridSize Size of grid for histogram equalization. Input image will be divided into
+equally sized rectangular tiles. tileGridSize defines the number of tiles in row and column.
+ */
+CV_EXPORTS_W Ptr<CLAHE> createCLAHE(double clipLimit = 40.0, Size tileGridSize = Size(8, 8));
+
+/** @brief Computes the "minimal work" distance between two weighted point configurations.
+
+The function computes the earth mover distance and/or a lower boundary of the distance between the
+two weighted point configurations. One of the applications described in @cite RubnerSept98,
+@cite Rubner2000 is multi-dimensional histogram comparison for image retrieval. EMD is a transportation
+problem that is solved using some modification of a simplex algorithm, thus the complexity is
+exponential in the worst case, though, on average it is much faster. In the case of a real metric
+the lower boundary can be calculated even faster (using linear-time algorithm) and it can be used
+to determine roughly whether the two signatures are far enough so that they cannot relate to the
+same object.
+
+@param signature1 First signature, a \f$\texttt{size1}\times \texttt{dims}+1\f$ floating-point matrix.
+Each row stores the point weight followed by the point coordinates. The matrix is allowed to have
+a single column (weights only) if the user-defined cost matrix is used. The weights must be
+non-negative and have at least one non-zero value.
+@param signature2 Second signature of the same format as signature1 , though the number of rows
+may be different. The total weights may be different. In this case an extra "dummy" point is added
+to either signature1 or signature2. The weights must be non-negative and have at least one non-zero
+value.
+@param distType Used metric. See #DistanceTypes.
+@param cost User-defined \f$\texttt{size1}\times \texttt{size2}\f$ cost matrix. Also, if a cost matrix
+is used, lower boundary lowerBound cannot be calculated because it needs a metric function.
+@param lowerBound Optional input/output parameter: lower boundary of a distance between the two
+signatures that is a distance between mass centers. The lower boundary may not be calculated if
+the user-defined cost matrix is used, the total weights of point configurations are not equal, or
+if the signatures consist of weights only (the signature matrices have a single column). You
+**must** initialize \*lowerBound . If the calculated distance between mass centers is greater or
+equal to \*lowerBound (it means that the signatures are far enough), the function does not
+calculate EMD. In any case \*lowerBound is set to the calculated distance between mass centers on
+return. Thus, if you want to calculate both distance between mass centers and EMD, \*lowerBound
+should be set to 0.
+@param flow Resultant \f$\texttt{size1} \times \texttt{size2}\f$ flow matrix: \f$\texttt{flow}_{i,j}\f$ is
+a flow from \f$i\f$ -th point of signature1 to \f$j\f$ -th point of signature2 .
+ */
+CV_EXPORTS float EMD( InputArray signature1, InputArray signature2,
+                      int distType, InputArray cost=noArray(),
+                      float* lowerBound = 0, OutputArray flow = noArray() );
+
+CV_EXPORTS_AS(EMD) float wrapperEMD( InputArray signature1, InputArray signature2,
+                      int distType, InputArray cost=noArray(),
+                      CV_IN_OUT Ptr<float> lowerBound = Ptr<float>(), OutputArray flow = noArray() );
+
+//! @} imgproc_hist
+
+//! @addtogroup imgproc_segmentation
+//! @{
+
+/** @example samples/cpp/watershed.cpp
+An example using the watershed algorithm
+*/
+
+/** @brief Performs a marker-based image segmentation using the watershed algorithm.
+
+The function implements one of the variants of watershed, non-parametric marker-based segmentation
+algorithm, described in @cite Meyer92 .
+
+Before passing the image to the function, you have to roughly outline the desired regions in the
+image markers with positive (\>0) indices. So, every region is represented as one or more connected
+components with the pixel values 1, 2, 3, and so on. Such markers can be retrieved from a binary
+mask using #findContours and #drawContours (see the watershed.cpp demo). The markers are "seeds" of
+the future image regions. All the other pixels in markers , whose relation to the outlined regions
+is not known and should be defined by the algorithm, should be set to 0's. In the function output,
+each pixel in markers is set to a value of the "seed" components or to -1 at boundaries between the
+regions.
+
+@note Any two neighbor connected components are not necessarily separated by a watershed boundary
+(-1's pixels); for example, they can touch each other in the initial marker image passed to the
+function.
+
+@param image Input 8-bit 3-channel image.
+@param markers Input/output 32-bit single-channel image (map) of markers. It should have the same
+size as image .
+
+@sa findContours
+ */
+CV_EXPORTS_W void watershed( InputArray image, InputOutputArray markers );
+
+//! @} imgproc_segmentation
+
+//! @addtogroup imgproc_filter
+//! @{
+
+/** @brief Performs initial step of meanshift segmentation of an image.
+
+The function implements the filtering stage of meanshift segmentation, that is, the output of the
+function is the filtered "posterized" image with color gradients and fine-grain texture flattened.
+At every pixel (X,Y) of the input image (or down-sized input image, see below) the function executes
+meanshift iterations, that is, the pixel (X,Y) neighborhood in the joint space-color hyperspace is
+considered:
+
+\f[(x,y): X- \texttt{sp} \le x  \le X+ \texttt{sp} , Y- \texttt{sp} \le y  \le Y+ \texttt{sp} , ||(R,G,B)-(r,g,b)||   \le \texttt{sr}\f]
+
+where (R,G,B) and (r,g,b) are the vectors of color components at (X,Y) and (x,y), respectively
+(though, the algorithm does not depend on the color space used, so any 3-component color space can
+be used instead). Over the neighborhood the average spatial value (X',Y') and average color vector
+(R',G',B') are found and they act as the neighborhood center on the next iteration:
+
+\f[(X,Y)~(X',Y'), (R,G,B)~(R',G',B').\f]
+
+After the iterations over, the color components of the initial pixel (that is, the pixel from where
+the iterations started) are set to the final value (average color at the last iteration):
+
+\f[I(X,Y) <- (R*,G*,B*)\f]
+
+When maxLevel \> 0, the gaussian pyramid of maxLevel+1 levels is built, and the above procedure is
+run on the smallest layer first. After that, the results are propagated to the larger layer and the
+iterations are run again only on those pixels where the layer colors differ by more than sr from the
+lower-resolution layer of the pyramid. That makes boundaries of color regions sharper. Note that the
+results will be actually different from the ones obtained by running the meanshift procedure on the
+whole original image (i.e. when maxLevel==0).
+
+@param src The source 8-bit, 3-channel image.
+@param dst The destination image of the same format and the same size as the source.
+@param sp The spatial window radius.
+@param sr The color window radius.
+@param maxLevel Maximum level of the pyramid for the segmentation.
+@param termcrit Termination criteria: when to stop meanshift iterations.
+ */
+CV_EXPORTS_W void pyrMeanShiftFiltering( InputArray src, OutputArray dst,
+                                         double sp, double sr, int maxLevel = 1,
+                                         TermCriteria termcrit=TermCriteria(TermCriteria::MAX_ITER+TermCriteria::EPS,5,1) );
+
+//! @}
+
+//! @addtogroup imgproc_segmentation
+//! @{
+
+/** @example samples/cpp/grabcut.cpp
+An example using the GrabCut algorithm
+![Sample Screenshot](grabcut_output1.jpg)
+*/
+
+/** @brief Runs the GrabCut algorithm.
+
+The function implements the [GrabCut image segmentation algorithm](https://en.wikipedia.org/wiki/GrabCut).
+
+@param img Input 8-bit 3-channel image.
+@param mask Input/output 8-bit single-channel mask. The mask is initialized by the function when
+mode is set to #GC_INIT_WITH_RECT. Its elements may have one of the #GrabCutClasses.
+@param rect ROI containing a segmented object. The pixels outside of the ROI are marked as
+"obvious background". The parameter is only used when mode==#GC_INIT_WITH_RECT .
+@param bgdModel Temporary array for the background model. Do not modify it while you are
+processing the same image.
+@param fgdModel Temporary arrays for the foreground model. Do not modify it while you are
+processing the same image.
+@param iterCount Number of iterations the algorithm should make before returning the result. Note
+that the result can be refined with further calls with mode==#GC_INIT_WITH_MASK or
+mode==GC_EVAL .
+@param mode Operation mode that could be one of the #GrabCutModes
+ */
+CV_EXPORTS_W void grabCut( InputArray img, InputOutputArray mask, Rect rect,
+                           InputOutputArray bgdModel, InputOutputArray fgdModel,
+                           int iterCount, int mode = GC_EVAL );
+
+//! @} imgproc_segmentation
+
+//! @addtogroup imgproc_misc
+//! @{
+
+/** @example samples/cpp/distrans.cpp
+An example on using the distance transform
+*/
+
+/** @brief Calculates the distance to the closest zero pixel for each pixel of the source image.
+
+The function cv::distanceTransform calculates the approximate or precise distance from every binary
+image pixel to the nearest zero pixel. For zero image pixels, the distance will obviously be zero.
+
+When maskSize == #DIST_MASK_PRECISE and distanceType == #DIST_L2 , the function runs the
+algorithm described in @cite Felzenszwalb04 . This algorithm is parallelized with the TBB library.
+
+In other cases, the algorithm @cite Borgefors86 is used. This means that for a pixel the function
+finds the shortest path to the nearest zero pixel consisting of basic shifts: horizontal, vertical,
+diagonal, or knight's move (the latest is available for a \f$5\times 5\f$ mask). The overall
+distance is calculated as a sum of these basic distances. Since the distance function should be
+symmetric, all of the horizontal and vertical shifts must have the same cost (denoted as a ), all
+the diagonal shifts must have the same cost (denoted as `b`), and all knight's moves must have the
+same cost (denoted as `c`). For the #DIST_C and #DIST_L1 types, the distance is calculated
+precisely, whereas for #DIST_L2 (Euclidean distance) the distance can be calculated only with a
+relative error (a \f$5\times 5\f$ mask gives more accurate results). For `a`,`b`, and `c`, OpenCV
+uses the values suggested in the original paper:
+- DIST_L1: `a = 1, b = 2`
+- DIST_L2:
+    - `3 x 3`: `a=0.955, b=1.3693`
+    - `5 x 5`: `a=1, b=1.4, c=2.1969`
+- DIST_C: `a = 1, b = 1`
+
+Typically, for a fast, coarse distance estimation #DIST_L2, a \f$3\times 3\f$ mask is used. For a
+more accurate distance estimation #DIST_L2, a \f$5\times 5\f$ mask or the precise algorithm is used.
+Note that both the precise and the approximate algorithms are linear on the number of pixels.
+
+This variant of the function does not only compute the minimum distance for each pixel \f$(x, y)\f$
+but also identifies the nearest connected component consisting of zero pixels
+(labelType==#DIST_LABEL_CCOMP) or the nearest zero pixel (labelType==#DIST_LABEL_PIXEL). Index of the
+component/pixel is stored in `labels(x, y)`. When labelType==#DIST_LABEL_CCOMP, the function
+automatically finds connected components of zero pixels in the input image and marks them with
+distinct labels. When labelType==#DIST_LABEL_PIXEL, the function scans through the input image and
+marks all the zero pixels with distinct labels.
+
+In this mode, the complexity is still linear. That is, the function provides a very fast way to
+compute the Voronoi diagram for a binary image. Currently, the second variant can use only the
+approximate distance transform algorithm, i.e. maskSize=#DIST_MASK_PRECISE is not supported
+yet.
+
+@param src 8-bit, single-channel (binary) source image.
+@param dst Output image with calculated distances. It is a 8-bit or 32-bit floating-point,
+single-channel image of the same size as src.
+@param labels Output 2D array of labels (the discrete Voronoi diagram). It has the type
+CV_32SC1 and the same size as src.
+@param distanceType Type of distance, see #DistanceTypes
+@param maskSize Size of the distance transform mask, see #DistanceTransformMasks.
+#DIST_MASK_PRECISE is not supported by this variant. In case of the #DIST_L1 or #DIST_C distance type,
+the parameter is forced to 3 because a \f$3\times 3\f$ mask gives the same result as \f$5\times
+5\f$ or any larger aperture.
+@param labelType Type of the label array to build, see #DistanceTransformLabelTypes.
+ */
+CV_EXPORTS_AS(distanceTransformWithLabels) void distanceTransform( InputArray src, OutputArray dst,
+                                     OutputArray labels, int distanceType, int maskSize,
+                                     int labelType = DIST_LABEL_CCOMP );
+
+/** @overload
+@param src 8-bit, single-channel (binary) source image.
+@param dst Output image with calculated distances. It is a 8-bit or 32-bit floating-point,
+single-channel image of the same size as src .
+@param distanceType Type of distance, see #DistanceTypes
+@param maskSize Size of the distance transform mask, see #DistanceTransformMasks. In case of the
+#DIST_L1 or #DIST_C distance type, the parameter is forced to 3 because a \f$3\times 3\f$ mask gives
+the same result as \f$5\times 5\f$ or any larger aperture.
+@param dstType Type of output image. It can be CV_8U or CV_32F. Type CV_8U can be used only for
+the first variant of the function and distanceType == #DIST_L1.
+*/
+CV_EXPORTS_W void distanceTransform( InputArray src, OutputArray dst,
+                                     int distanceType, int maskSize, int dstType=CV_32F);
+
+/** @brief Fills a connected component with the given color.
+
+The function cv::floodFill fills a connected component starting from the seed point with the specified
+color. The connectivity is determined by the color/brightness closeness of the neighbor pixels. The
+pixel at \f$(x,y)\f$ is considered to belong to the repainted domain if:
+
+- in case of a grayscale image and floating range
+\f[\texttt{src} (x',y')- \texttt{loDiff} \leq \texttt{src} (x,y)  \leq \texttt{src} (x',y')+ \texttt{upDiff}\f]
+
+
+- in case of a grayscale image and fixed range
+\f[\texttt{src} ( \texttt{seedPoint} .x, \texttt{seedPoint} .y)- \texttt{loDiff} \leq \texttt{src} (x,y)  \leq \texttt{src} ( \texttt{seedPoint} .x, \texttt{seedPoint} .y)+ \texttt{upDiff}\f]
+
+
+- in case of a color image and floating range
+\f[\texttt{src} (x',y')_r- \texttt{loDiff} _r \leq \texttt{src} (x,y)_r \leq \texttt{src} (x',y')_r+ \texttt{upDiff} _r,\f]
+\f[\texttt{src} (x',y')_g- \texttt{loDiff} _g \leq \texttt{src} (x,y)_g \leq \texttt{src} (x',y')_g+ \texttt{upDiff} _g\f]
+and
+\f[\texttt{src} (x',y')_b- \texttt{loDiff} _b \leq \texttt{src} (x,y)_b \leq \texttt{src} (x',y')_b+ \texttt{upDiff} _b\f]
+
+
+- in case of a color image and fixed range
+\f[\texttt{src} ( \texttt{seedPoint} .x, \texttt{seedPoint} .y)_r- \texttt{loDiff} _r \leq \texttt{src} (x,y)_r \leq \texttt{src} ( \texttt{seedPoint} .x, \texttt{seedPoint} .y)_r+ \texttt{upDiff} _r,\f]
+\f[\texttt{src} ( \texttt{seedPoint} .x, \texttt{seedPoint} .y)_g- \texttt{loDiff} _g \leq \texttt{src} (x,y)_g \leq \texttt{src} ( \texttt{seedPoint} .x, \texttt{seedPoint} .y)_g+ \texttt{upDiff} _g\f]
+and
+\f[\texttt{src} ( \texttt{seedPoint} .x, \texttt{seedPoint} .y)_b- \texttt{loDiff} _b \leq \texttt{src} (x,y)_b \leq \texttt{src} ( \texttt{seedPoint} .x, \texttt{seedPoint} .y)_b+ \texttt{upDiff} _b\f]
+
+
+where \f$src(x',y')\f$ is the value of one of pixel neighbors that is already known to belong to the
+component. That is, to be added to the connected component, a color/brightness of the pixel should
+be close enough to:
+- Color/brightness of one of its neighbors that already belong to the connected component in case
+of a floating range.
+- Color/brightness of the seed point in case of a fixed range.
+
+Use these functions to either mark a connected component with the specified color in-place, or build
+a mask and then extract the contour, or copy the region to another image, and so on.
+
+@param image Input/output 1- or 3-channel, 8-bit, or floating-point image. It is modified by the
+function unless the #FLOODFILL_MASK_ONLY flag is set in the second variant of the function. See
+the details below.
+@param mask Operation mask that should be a single-channel 8-bit image, 2 pixels wider and 2 pixels
+taller than image. If an empty Mat is passed it will be created automatically. Since this is both an
+input and output parameter, you must take responsibility of initializing it.
+Flood-filling cannot go across non-zero pixels in the input mask. For example,
+an edge detector output can be used as a mask to stop filling at edges. On output, pixels in the
+mask corresponding to filled pixels in the image are set to 1 or to the specified value in flags
+as described below. Additionally, the function fills the border of the mask with ones to simplify
+internal processing. It is therefore possible to use the same mask in multiple calls to the function
+to make sure the filled areas do not overlap.
+@param seedPoint Starting point.
+@param newVal New value of the repainted domain pixels.
+@param loDiff Maximal lower brightness/color difference between the currently observed pixel and
+one of its neighbors belonging to the component, or a seed pixel being added to the component.
+@param upDiff Maximal upper brightness/color difference between the currently observed pixel and
+one of its neighbors belonging to the component, or a seed pixel being added to the component.
+@param rect Optional output parameter set by the function to the minimum bounding rectangle of the
+repainted domain.
+@param flags Operation flags. The first 8 bits contain a connectivity value. The default value of
+4 means that only the four nearest neighbor pixels (those that share an edge) are considered. A
+connectivity value of 8 means that the eight nearest neighbor pixels (those that share a corner)
+will be considered. The next 8 bits (8-16) contain a value between 1 and 255 with which to fill
+the mask (the default value is 1). For example, 4 | ( 255 \<\< 8 ) will consider 4 nearest
+neighbours and fill the mask with a value of 255. The following additional options occupy higher
+bits and therefore may be further combined with the connectivity and mask fill values using
+bit-wise or (|), see #FloodFillFlags.
+
+@note Since the mask is larger than the filled image, a pixel \f$(x, y)\f$ in image corresponds to the
+pixel \f$(x+1, y+1)\f$ in the mask .
+
+@sa findContours
+ */
+CV_EXPORTS_W int floodFill( InputOutputArray image, InputOutputArray mask,
+                            Point seedPoint, Scalar newVal, CV_OUT Rect* rect=0,
+                            Scalar loDiff = Scalar(), Scalar upDiff = Scalar(),
+                            int flags = 4 );
+
+/** @example samples/cpp/ffilldemo.cpp
+An example using the FloodFill technique
+*/
+
+/** @overload
+
+variant without `mask` parameter
+*/
+CV_EXPORTS int floodFill( InputOutputArray image,
+                          Point seedPoint, Scalar newVal, CV_OUT Rect* rect = 0,
+                          Scalar loDiff = Scalar(), Scalar upDiff = Scalar(),
+                          int flags = 4 );
+
+//! Performs linear blending of two images:
+//! \f[ \texttt{dst}(i,j) = \texttt{weights1}(i,j)*\texttt{src1}(i,j) + \texttt{weights2}(i,j)*\texttt{src2}(i,j) \f]
+//! @param src1 It has a type of CV_8UC(n) or CV_32FC(n), where n is a positive integer.
+//! @param src2 It has the same type and size as src1.
+//! @param weights1 It has a type of CV_32FC1 and the same size with src1.
+//! @param weights2 It has a type of CV_32FC1 and the same size with src1.
+//! @param dst It is created if it does not have the same size and type with src1.
+CV_EXPORTS_W void blendLinear(InputArray src1, InputArray src2, InputArray weights1, InputArray weights2, OutputArray dst);
+
+//! @} imgproc_misc
+
+//! @addtogroup imgproc_color_conversions
+//! @{
+
+/** @brief Converts an image from one color space to another.
+
+The function converts an input image from one color space to another. In case of a transformation
+to-from RGB color space, the order of the channels should be specified explicitly (RGB or BGR). Note
+that the default color format in OpenCV is often referred to as RGB but it is actually BGR (the
+bytes are reversed). So the first byte in a standard (24-bit) color image will be an 8-bit Blue
+component, the second byte will be Green, and the third byte will be Red. The fourth, fifth, and
+sixth bytes would then be the second pixel (Blue, then Green, then Red), and so on.
+
+The conventional ranges for R, G, and B channel values are:
+-   0 to 255 for CV_8U images
+-   0 to 65535 for CV_16U images
+-   0 to 1 for CV_32F images
+
+In case of linear transformations, the range does not matter. But in case of a non-linear
+transformation, an input RGB image should be normalized to the proper value range to get the correct
+results, for example, for RGB \f$\rightarrow\f$ L\*u\*v\* transformation. For example, if you have a
+32-bit floating-point image directly converted from an 8-bit image without any scaling, then it will
+have the 0..255 value range instead of 0..1 assumed by the function. So, before calling #cvtColor ,
+you need first to scale the image down:
+@code
+    img *= 1./255;
+    cvtColor(img, img, COLOR_BGR2Luv);
+@endcode
+If you use #cvtColor with 8-bit images, the conversion will have some information lost. For many
+applications, this will not be noticeable but it is recommended to use 32-bit images in applications
+that need the full range of colors or that convert an image before an operation and then convert
+back.
+
+If conversion adds the alpha channel, its value will set to the maximum of corresponding channel
+range: 255 for CV_8U, 65535 for CV_16U, 1 for CV_32F.
+
+@param src input image: 8-bit unsigned, 16-bit unsigned ( CV_16UC... ), or single-precision
+floating-point.
+@param dst output image of the same size and depth as src.
+@param code color space conversion code (see #ColorConversionCodes).
+@param dstCn number of channels in the destination image; if the parameter is 0, the number of the
+channels is derived automatically from src and code.
+@param hint Implementation modfication flags. See #AlgorithmHint
+
+@see @ref imgproc_color_conversions
+ */
+CV_EXPORTS_W void cvtColor( InputArray src, OutputArray dst, int code, int dstCn = 0, AlgorithmHint hint = cv::ALGO_HINT_DEFAULT );
+
+/** @brief Converts an image from one color space to another where the source image is
+stored in two planes.
+
+This function only supports YUV420 to RGB conversion as of now.
+
+@param src1 8-bit image (#CV_8U) of the Y plane.
+@param src2 image containing interleaved U/V plane.
+@param dst output image.
+@param code Specifies the type of conversion. It can take any of the following values:
+- #COLOR_YUV2BGR_NV12
+- #COLOR_YUV2RGB_NV12
+- #COLOR_YUV2BGRA_NV12
+- #COLOR_YUV2RGBA_NV12
+- #COLOR_YUV2BGR_NV21
+- #COLOR_YUV2RGB_NV21
+- #COLOR_YUV2BGRA_NV21
+- #COLOR_YUV2RGBA_NV21
+@param hint Implementation modfication flags. See #AlgorithmHint
+*/
+CV_EXPORTS_W void cvtColorTwoPlane( InputArray src1, InputArray src2, OutputArray dst, int code, AlgorithmHint hint = cv::ALGO_HINT_DEFAULT );
+
+/** @brief main function for all demosaicing processes
+
+@param src input image: 8-bit unsigned or 16-bit unsigned.
+@param dst output image of the same size and depth as src.
+@param code Color space conversion code (see the description below).
+@param dstCn number of channels in the destination image; if the parameter is 0, the number of the
+channels is derived automatically from src and code.
+
+The function can do the following transformations:
+
+-   Demosaicing using bilinear interpolation
+
+    #COLOR_BayerBG2BGR , #COLOR_BayerGB2BGR , #COLOR_BayerRG2BGR , #COLOR_BayerGR2BGR
+
+    #COLOR_BayerBG2GRAY , #COLOR_BayerGB2GRAY , #COLOR_BayerRG2GRAY , #COLOR_BayerGR2GRAY
+
+-   Demosaicing using Variable Number of Gradients.
+
+    #COLOR_BayerBG2BGR_VNG , #COLOR_BayerGB2BGR_VNG , #COLOR_BayerRG2BGR_VNG , #COLOR_BayerGR2BGR_VNG
+
+-   Edge-Aware Demosaicing.
+
+    #COLOR_BayerBG2BGR_EA , #COLOR_BayerGB2BGR_EA , #COLOR_BayerRG2BGR_EA , #COLOR_BayerGR2BGR_EA
+
+-   Demosaicing with alpha channel
+
+    #COLOR_BayerBG2BGRA , #COLOR_BayerGB2BGRA , #COLOR_BayerRG2BGRA , #COLOR_BayerGR2BGRA
+
+@sa cvtColor
+*/
+CV_EXPORTS_W void demosaicing(InputArray src, OutputArray dst, int code, int dstCn = 0);
+
+//! @} imgproc_color_conversions
+
+//! @addtogroup imgproc_shape
+//! @{
+
+/** @brief Calculates all of the moments up to the third order of a polygon or rasterized shape.
+
+The function computes moments, up to the 3rd order, of a vector shape or a rasterized shape. The
+results are returned in the structure cv::Moments.
+
+@param array Single chanel raster image (CV_8U, CV_16U, CV_16S, CV_32F, CV_64F) or an array (
+\f$1 \times N\f$ or \f$N \times 1\f$ ) of 2D points (Point or Point2f).
+@param binaryImage If it is true, all non-zero image pixels are treated as 1's. The parameter is
+used for images only.
+@returns moments.
+
+@note Only applicable to contour moments calculations from Python bindings: Note that the numpy
+type for the input array should be either np.int32 or np.float32.
+
+@sa  contourArea, arcLength
+ */
+CV_EXPORTS_W Moments moments( InputArray array, bool binaryImage = false );
+
+/** @brief Calculates seven Hu invariants.
+
+The function calculates seven Hu invariants (introduced in @cite Hu62; see also
+<https://en.wikipedia.org/wiki/Image_moment>) defined as:
+
+\f[\begin{array}{l} hu[0]= \eta _{20}+ \eta _{02} \\ hu[1]=( \eta _{20}- \eta _{02})^{2}+4 \eta _{11}^{2} \\ hu[2]=( \eta _{30}-3 \eta _{12})^{2}+ (3 \eta _{21}- \eta _{03})^{2} \\ hu[3]=( \eta _{30}+ \eta _{12})^{2}+ ( \eta _{21}+ \eta _{03})^{2} \\ hu[4]=( \eta _{30}-3 \eta _{12})( \eta _{30}+ \eta _{12})[( \eta _{30}+ \eta _{12})^{2}-3( \eta _{21}+ \eta _{03})^{2}]+(3 \eta _{21}- \eta _{03})( \eta _{21}+ \eta _{03})[3( \eta _{30}+ \eta _{12})^{2}-( \eta _{21}+ \eta _{03})^{2}] \\ hu[5]=( \eta _{20}- \eta _{02})[( \eta _{30}+ \eta _{12})^{2}- ( \eta _{21}+ \eta _{03})^{2}]+4 \eta _{11}( \eta _{30}+ \eta _{12})( \eta _{21}+ \eta _{03}) \\ hu[6]=(3 \eta _{21}- \eta _{03})( \eta _{21}+ \eta _{03})[3( \eta _{30}+ \eta _{12})^{2}-( \eta _{21}+ \eta _{03})^{2}]-( \eta _{30}-3 \eta _{12})( \eta _{21}+ \eta _{03})[3( \eta _{30}+ \eta _{12})^{2}-( \eta _{21}+ \eta _{03})^{2}] \\ \end{array}\f]
+
+where \f$\eta_{ji}\f$ stands for \f$\texttt{Moments::nu}_{ji}\f$ .
+
+These values are proved to be invariants to the image scale, rotation, and reflection except the
+seventh one, whose sign is changed by reflection. This invariance is proved with the assumption of
+infinite image resolution. In case of raster images, the computed Hu invariants for the original and
+transformed images are a bit different.
+
+@param moments Input moments computed with moments .
+@param hu Output Hu invariants.
+
+@sa matchShapes
+ */
+CV_EXPORTS void HuMoments( const Moments& moments, double hu[7] );
+
+/** @overload */
+CV_EXPORTS_W void HuMoments( const Moments& m, OutputArray hu );
+
+//! @} imgproc_shape
+
+//! @addtogroup imgproc_object
+//! @{
+
+//! type of the template matching operation
+enum TemplateMatchModes {
+    TM_SQDIFF        = 0, /*!< \f[R(x,y)= \sum _{x',y'} (T(x',y')-I(x+x',y+y'))^2\f]
+                               with mask:
+                               \f[R(x,y)= \sum _{x',y'} \left( (T(x',y')-I(x+x',y+y')) \cdot
+                                  M(x',y') \right)^2\f] */
+    TM_SQDIFF_NORMED = 1, /*!< \f[R(x,y)= \frac{\sum_{x',y'} (T(x',y')-I(x+x',y+y'))^2}{\sqrt{\sum_{
+                                  x',y'}T(x',y')^2 \cdot \sum_{x',y'} I(x+x',y+y')^2}}\f]
+                               with mask:
+                               \f[R(x,y)= \frac{\sum _{x',y'} \left( (T(x',y')-I(x+x',y+y')) \cdot
+                                  M(x',y') \right)^2}{\sqrt{\sum_{x',y'} \left( T(x',y') \cdot
+                                  M(x',y') \right)^2 \cdot \sum_{x',y'} \left( I(x+x',y+y') \cdot
+                                  M(x',y') \right)^2}}\f] */
+    TM_CCORR         = 2, /*!< \f[R(x,y)= \sum _{x',y'} (T(x',y') \cdot I(x+x',y+y'))\f]
+                               with mask:
+                               \f[R(x,y)= \sum _{x',y'} (T(x',y') \cdot I(x+x',y+y') \cdot M(x',y')
+                                  ^2)\f] */
+    TM_CCORR_NORMED  = 3, /*!< \f[R(x,y)= \frac{\sum_{x',y'} (T(x',y') \cdot I(x+x',y+y'))}{\sqrt{
+                                  \sum_{x',y'}T(x',y')^2 \cdot \sum_{x',y'} I(x+x',y+y')^2}}\f]
+                               with mask:
+                               \f[R(x,y)= \frac{\sum_{x',y'} (T(x',y') \cdot I(x+x',y+y') \cdot
+                                  M(x',y')^2)}{\sqrt{\sum_{x',y'} \left( T(x',y') \cdot M(x',y')
+                                  \right)^2 \cdot \sum_{x',y'} \left( I(x+x',y+y') \cdot M(x',y')
+                                  \right)^2}}\f] */
+    TM_CCOEFF        = 4, /*!< \f[R(x,y)= \sum _{x',y'} (T'(x',y') \cdot I'(x+x',y+y'))\f]
+                               where
+                               \f[\begin{array}{l} T'(x',y')=T(x',y') - 1/(w \cdot h) \cdot \sum _{
+                                  x'',y''} T(x'',y'') \\ I'(x+x',y+y')=I(x+x',y+y') - 1/(w \cdot h)
+                                  \cdot \sum _{x'',y''} I(x+x'',y+y'') \end{array}\f]
+                               with mask:
+                               \f[\begin{array}{l} T'(x',y')=M(x',y') \cdot \left( T(x',y') -
+                                  \frac{1}{\sum _{x'',y''} M(x'',y'')} \cdot \sum _{x'',y''}
+                                  (T(x'',y'') \cdot M(x'',y'')) \right) \\ I'(x+x',y+y')=M(x',y')
+                                  \cdot \left( I(x+x',y+y') - \frac{1}{\sum _{x'',y''} M(x'',y'')}
+                                  \cdot \sum _{x'',y''} (I(x+x'',y+y'') \cdot M(x'',y'')) \right)
+                                  \end{array} \f] */
+    TM_CCOEFF_NORMED = 5  /*!< \f[R(x,y)= \frac{ \sum_{x',y'} (T'(x',y') \cdot I'(x+x',y+y')) }{
+                                  \sqrt{\sum_{x',y'}T'(x',y')^2 \cdot \sum_{x',y'} I'(x+x',y+y')^2}
+                                  }\f] */
+};
+
+/** @example samples/cpp/tutorial_code/Histograms_Matching/MatchTemplate_Demo.cpp
+An example using Template Matching algorithm
+*/
+
+/** @brief Compares a template against overlapped image regions.
+
+The function slides through image , compares the overlapped patches of size \f$w \times h\f$ against
+templ using the specified method and stores the comparison results in result . #TemplateMatchModes
+describes the formulae for the available comparison methods ( \f$I\f$ denotes image, \f$T\f$
+template, \f$R\f$ result, \f$M\f$ the optional mask ). The summation is done over template and/or
+the image patch: \f$x' = 0...w-1, y' = 0...h-1\f$
+
+After the function finishes the comparison, the best matches can be found as global minimums (when
+#TM_SQDIFF was used) or maximums (when #TM_CCORR or #TM_CCOEFF was used) using the
+#minMaxLoc function. In case of a color image, template summation in the numerator and each sum in
+the denominator is done over all of the channels and separate mean values are used for each channel.
+That is, the function can take a color template and a color image. The result will still be a
+single-channel image, which is easier to analyze.
+
+@param image Image where the search is running. It must be 8-bit or 32-bit floating-point.
+@param templ Searched template. It must be not greater than the source image and have the same
+data type.
+@param result Map of comparison results. It must be single-channel 32-bit floating-point. If image
+is \f$W \times H\f$ and templ is \f$w \times h\f$ , then result is \f$(W-w+1) \times (H-h+1)\f$ .
+@param method Parameter specifying the comparison method, see #TemplateMatchModes
+@param mask Optional mask. It must have the same size as templ. It must either have the same number
+            of channels as template or only one channel, which is then used for all template and
+            image channels. If the data type is #CV_8U, the mask is interpreted as a binary mask,
+            meaning only elements where mask is nonzero are used and are kept unchanged independent
+            of the actual mask value (weight equals 1). For data type #CV_32F, the mask values are
+            used as weights. The exact formulas are documented in #TemplateMatchModes.
+ */
+CV_EXPORTS_W void matchTemplate( InputArray image, InputArray templ,
+                                 OutputArray result, int method, InputArray mask = noArray() );
+
+//! @}
+
+//! @addtogroup imgproc_shape
+//! @{
+
+/** @example samples/cpp/connected_components.cpp
+This program demonstrates connected components and use of the trackbar
+*/
+
+/** @brief computes the connected components labeled image of boolean image
+
+image with 4 or 8 way connectivity - returns N, the total number of labels [0, N-1] where 0
+represents the background label. ltype specifies the output label image type, an important
+consideration based on the total number of labels or alternatively the total number of pixels in
+the source image. ccltype specifies the connected components labeling algorithm to use, currently
+Bolelli (Spaghetti) @cite Bolelli2019, Grana (BBDT) @cite Grana2010 and Wu's (SAUF) @cite Wu2009 algorithms
+are supported, see the #ConnectedComponentsAlgorithmsTypes for details. Note that SAUF algorithm forces
+a row major ordering of labels while Spaghetti and BBDT do not.
+This function uses parallel version of the algorithms if at least one allowed
+parallel framework is enabled and if the rows of the image are at least twice the number returned by #getNumberOfCPUs.
+
+@param image the 8-bit single-channel image to be labeled
+@param labels destination labeled image
+@param connectivity 8 or 4 for 8-way or 4-way connectivity respectively
+@param ltype output image label type. Currently CV_32S and CV_16U are supported.
+@param ccltype connected components algorithm type (see the #ConnectedComponentsAlgorithmsTypes).
+*/
+CV_EXPORTS_AS(connectedComponentsWithAlgorithm) int connectedComponents(InputArray image, OutputArray labels,
+                                                                        int connectivity, int ltype, int ccltype);
+
+
+/** @overload
+
+@param image the 8-bit single-channel image to be labeled
+@param labels destination labeled image
+@param connectivity 8 or 4 for 8-way or 4-way connectivity respectively
+@param ltype output image label type. Currently CV_32S and CV_16U are supported.
+*/
+CV_EXPORTS_W int connectedComponents(InputArray image, OutputArray labels,
+                                     int connectivity = 8, int ltype = CV_32S);
+
+
+/** @brief computes the connected components labeled image of boolean image and also produces a statistics output for each label
+
+image with 4 or 8 way connectivity - returns N, the total number of labels [0, N-1] where 0
+represents the background label. ltype specifies the output label image type, an important
+consideration based on the total number of labels or alternatively the total number of pixels in
+the source image. ccltype specifies the connected components labeling algorithm to use, currently
+Bolelli (Spaghetti) @cite Bolelli2019, Grana (BBDT) @cite Grana2010 and Wu's (SAUF) @cite Wu2009 algorithms
+are supported, see the #ConnectedComponentsAlgorithmsTypes for details. Note that SAUF algorithm forces
+a row major ordering of labels while Spaghetti and BBDT do not.
+This function uses parallel version of the algorithms (statistics included) if at least one allowed
+parallel framework is enabled and if the rows of the image are at least twice the number returned by #getNumberOfCPUs.
+
+@param image the 8-bit single-channel image to be labeled
+@param labels destination labeled image
+@param stats statistics output for each label, including the background label.
+Statistics are accessed via stats(label, COLUMN) where COLUMN is one of
+#ConnectedComponentsTypes, selecting the statistic. The data type is CV_32S.
+@param centroids centroid output for each label, including the background label. Centroids are
+accessed via centroids(label, 0) for x and centroids(label, 1) for y. The data type CV_64F.
+@param connectivity 8 or 4 for 8-way or 4-way connectivity respectively
+@param ltype output image label type. Currently CV_32S and CV_16U are supported.
+@param ccltype connected components algorithm type (see #ConnectedComponentsAlgorithmsTypes).
+*/
+CV_EXPORTS_AS(connectedComponentsWithStatsWithAlgorithm) int connectedComponentsWithStats(InputArray image, OutputArray labels,
+                                                                                          OutputArray stats, OutputArray centroids,
+                                                                                          int connectivity, int ltype, int ccltype);
+
+/** @overload
+@param image the 8-bit single-channel image to be labeled
+@param labels destination labeled image
+@param stats statistics output for each label, including the background label.
+Statistics are accessed via stats(label, COLUMN) where COLUMN is one of
+#ConnectedComponentsTypes, selecting the statistic. The data type is CV_32S.
+@param centroids centroid output for each label, including the background label. Centroids are
+accessed via centroids(label, 0) for x and centroids(label, 1) for y. The data type CV_64F.
+@param connectivity 8 or 4 for 8-way or 4-way connectivity respectively
+@param ltype output image label type. Currently CV_32S and CV_16U are supported.
+*/
+CV_EXPORTS_W int connectedComponentsWithStats(InputArray image, OutputArray labels,
+                                              OutputArray stats, OutputArray centroids,
+                                              int connectivity = 8, int ltype = CV_32S);
+
+
+/** @brief Finds contours in a binary image.
+
+The function retrieves contours from the binary image using the algorithm @cite Suzuki85 . The contours
+are a useful tool for shape analysis and object detection and recognition. See squares.cpp in the
+OpenCV sample directory.
+@note Since opencv 3.2 source image is not modified by this function.
+
+@param image Source, an 8-bit single-channel image. Non-zero pixels are treated as 1's. Zero
+pixels remain 0's, so the image is treated as binary . You can use #compare, #inRange, #threshold ,
+#adaptiveThreshold, #Canny, and others to create a binary image out of a grayscale or color one.
+If mode equals to #RETR_CCOMP or #RETR_FLOODFILL, the input can also be a 32-bit integer image of labels (CV_32SC1).
+@param contours Detected contours. Each contour is stored as a vector of points (e.g.
+std::vector<std::vector<cv::Point> >).
+@param hierarchy Optional output vector (e.g. std::vector<cv::Vec4i>), containing information about the image topology. It has
+as many elements as the number of contours. For each i-th contour contours[i], the elements
+hierarchy[i][0] , hierarchy[i][1] , hierarchy[i][2] , and hierarchy[i][3] are set to 0-based indices
+in contours of the next and previous contours at the same hierarchical level, the first child
+contour and the parent contour, respectively. If for the contour i there are no next, previous,
+parent, or nested contours, the corresponding elements of hierarchy[i] will be negative.
+@note In Python, hierarchy is nested inside a top level array. Use hierarchy[0][i] to access hierarchical elements of i-th contour.
+@param mode Contour retrieval mode, see #RetrievalModes
+@param method Contour approximation method, see #ContourApproximationModes
+@param offset Optional offset by which every contour point is shifted. This is useful if the
+contours are extracted from the image ROI and then they should be analyzed in the whole image
+context.
+ */
+CV_EXPORTS_W void findContours( InputArray image, OutputArrayOfArrays contours,
+                              OutputArray hierarchy, int mode,
+                              int method, Point offset = Point());
+
+/** @overload */
+CV_EXPORTS void findContours( InputArray image, OutputArrayOfArrays contours,
+                              int mode, int method, Point offset = Point());
+
+//! @brief Find contours using link runs algorithm
+//!
+//! This function implements an algorithm different from cv::findContours:
+//! - doesn't allocate temporary image internally, thus it has reduced memory consumption
+//! - supports CV_8UC1 images only
+//! - outputs 2-level hierarhy only (RETR_CCOMP mode)
+//! - doesn't support approximation change other than CHAIN_APPROX_SIMPLE
+//! In all other aspects this function is compatible with cv::findContours.
+CV_EXPORTS_W void findContoursLinkRuns(InputArray image, OutputArrayOfArrays contours, OutputArray hierarchy);
+
+//! @overload
+CV_EXPORTS_W void findContoursLinkRuns(InputArray image, OutputArrayOfArrays contours);
+
+/** @brief Approximates a polygonal curve(s) with the specified precision.
+
+The function cv::approxPolyDP approximates a curve or a polygon with another curve/polygon with less
+vertices so that the distance between them is less or equal to the specified precision. It uses the
+Douglas-Peucker algorithm <https://en.wikipedia.org/wiki/Ramer-Douglas-Peucker_algorithm>
+
+@param curve Input vector of a 2D point stored in std::vector or Mat
+@param approxCurve Result of the approximation. The type should match the type of the input curve.
+@param epsilon Parameter specifying the approximation accuracy. This is the maximum distance
+between the original curve and its approximation.
+@param closed If true, the approximated curve is closed (its first and last vertices are
+connected). Otherwise, it is not closed.
+ */
+CV_EXPORTS_W void approxPolyDP( InputArray curve,
+                                OutputArray approxCurve,
+                                double epsilon, bool closed );
+
+/** @brief Approximates a polygon with a convex hull with a specified accuracy and number of sides.
+
+The cv::approxPolyN function approximates a polygon with a convex hull
+so that the difference between the contour area of the original contour and the new polygon is minimal.
+It uses a greedy algorithm for contracting two vertices into one in such a way that the additional area is minimal.
+Straight lines formed by each edge of the convex contour are drawn and the areas of the resulting triangles are considered.
+Each vertex will lie either on the original contour or outside it.
+
+The algorithm based on the paper @cite LowIlie2003 .
+
+@param curve Input vector of a 2D points stored in std::vector or Mat, points must be float or integer.
+@param approxCurve Result of the approximation. The type is vector of a 2D point (Point2f or Point) in std::vector or Mat.
+@param nsides The parameter defines the number of sides of the result polygon.
+@param epsilon_percentage defines the percentage of the maximum of additional area.
+If it equals -1, it is not used. Otherwise algorighm stops if additional area is greater than contourArea(_curve) * percentage.
+If additional area exceeds the limit, algorithm returns as many vertices as there were at the moment the limit was exceeded.
+@param ensure_convex If it is true, algorithm creates a convex hull of input contour. Otherwise input vector should be convex.
+ */
+CV_EXPORTS_W void approxPolyN(InputArray curve, OutputArray approxCurve,
+                              int nsides, float epsilon_percentage = -1.0,
+                              bool ensure_convex = true);
+
+/** @brief Calculates a contour perimeter or a curve length.
+
+The function computes a curve length or a closed contour perimeter.
+
+@param curve Input vector of 2D points, stored in std::vector or Mat.
+@param closed Flag indicating whether the curve is closed or not.
+ */
+CV_EXPORTS_W double arcLength( InputArray curve, bool closed );
+
+/** @brief Calculates the up-right bounding rectangle of a point set or non-zero pixels of gray-scale image.
+
+The function calculates and returns the minimal up-right bounding rectangle for the specified point set or
+non-zero pixels of gray-scale image.
+
+@param array Input gray-scale image or 2D point set, stored in std::vector or Mat.
+ */
+CV_EXPORTS_W Rect boundingRect( InputArray array );
+
+/** @brief Calculates a contour area.
+
+The function computes a contour area. Similarly to moments , the area is computed using the Green
+formula. Thus, the returned area and the number of non-zero pixels, if you draw the contour using
+#drawContours or #fillPoly , can be different. Also, the function will most certainly give a wrong
+results for contours with self-intersections.
+
+Example:
+@code
+    vector<Point> contour;
+    contour.push_back(Point2f(0, 0));
+    contour.push_back(Point2f(10, 0));
+    contour.push_back(Point2f(10, 10));
+    contour.push_back(Point2f(5, 4));
+
+    double area0 = contourArea(contour);
+    vector<Point> approx;
+    approxPolyDP(contour, approx, 5, true);
+    double area1 = contourArea(approx);
+
+    cout << "area0 =" << area0 << endl <<
+            "area1 =" << area1 << endl <<
+            "approx poly vertices" << approx.size() << endl;
+@endcode
+@param contour Input vector of 2D points (contour vertices), stored in std::vector or Mat.
+@param oriented Oriented area flag. If it is true, the function returns a signed area value,
+depending on the contour orientation (clockwise or counter-clockwise). Using this feature you can
+determine orientation of a contour by taking the sign of an area. By default, the parameter is
+false, which means that the absolute value is returned.
+ */
+CV_EXPORTS_W double contourArea( InputArray contour, bool oriented = false );
+
+/** @brief Finds a rotated rectangle of the minimum area enclosing the input 2D point set.
+
+The function calculates and returns the minimum-area bounding rectangle (possibly rotated) for a
+specified point set. The angle of rotation represents the angle between the line connecting the starting
+and ending points (based on the clockwise order with greatest index for the corner with greatest \f$y\f$)
+and the horizontal axis. This angle always falls between \f$[-90, 0)\f$ because, if the object
+rotates more than a rect angle, the next edge is used to measure the angle. The starting and ending points change
+as the object rotates.Developer should keep in mind that the returned RotatedRect can contain negative
+indices when data is close to the containing Mat element boundary.
+
+@param points Input vector of 2D points, stored in std::vector\<\> or Mat
+ */
+CV_EXPORTS_W RotatedRect minAreaRect( InputArray points );
+
+/** @brief Finds the four vertices of a rotated rect. Useful to draw the rotated rectangle.
+
+The function finds the four vertices of a rotated rectangle. The four vertices are returned
+in clockwise order starting from the point with greatest \f$y\f$. If two points have the
+same \f$y\f$ coordinate the rightmost is the starting point. This function is useful to draw the
+rectangle. In C++, instead of using this function, you can directly use RotatedRect::points method. Please
+visit the @ref tutorial_bounding_rotated_ellipses "tutorial on Creating Bounding rotated boxes and ellipses for contours" for more information.
+
+@param box The input rotated rectangle. It may be the output of @ref minAreaRect.
+@param points The output array of four vertices of rectangles.
+ */
+CV_EXPORTS_W void boxPoints(RotatedRect box, OutputArray points);
+
+/** @brief Finds a circle of the minimum area enclosing a 2D point set.
+
+The function finds the minimal enclosing circle of a 2D point set using an iterative algorithm.
+
+@param points Input vector of 2D points, stored in std::vector\<\> or Mat
+@param center Output center of the circle.
+@param radius Output radius of the circle.
+ */
+CV_EXPORTS_W void minEnclosingCircle( InputArray points,
+                                      CV_OUT Point2f& center, CV_OUT float& radius );
+
+/** @example samples/cpp/minarea.cpp
+*/
+
+/** @brief Finds a triangle of minimum area enclosing a 2D point set and returns its area.
+
+The function finds a triangle of minimum area enclosing the given set of 2D points and returns its
+area. The output for a given 2D point set is shown in the image below. 2D points are depicted in
+*red* and the enclosing triangle in *yellow*.
+
+![Sample output of the minimum enclosing triangle function](pics/minenclosingtriangle.png)
+
+The implementation of the algorithm is based on O'Rourke's @cite ORourke86 and Klee and Laskowski's
+@cite KleeLaskowski85 papers. O'Rourke provides a \f$\theta(n)\f$ algorithm for finding the minimal
+enclosing triangle of a 2D convex polygon with n vertices. Since the #minEnclosingTriangle function
+takes a 2D point set as input an additional preprocessing step of computing the convex hull of the
+2D point set is required. The complexity of the #convexHull function is \f$O(n log(n))\f$ which is higher
+than \f$\theta(n)\f$. Thus the overall complexity of the function is \f$O(n log(n))\f$.
+
+@param points Input vector of 2D points with depth CV_32S or CV_32F, stored in std::vector\<\> or Mat
+@param triangle Output vector of three 2D points defining the vertices of the triangle. The depth
+of the OutputArray must be CV_32F.
+ */
+CV_EXPORTS_W double minEnclosingTriangle( InputArray points, CV_OUT OutputArray triangle );
+
+/** @brief Compares two shapes.
+
+The function compares two shapes. All three implemented methods use the Hu invariants (see #HuMoments)
+
+@param contour1 First contour or grayscale image.
+@param contour2 Second contour or grayscale image.
+@param method Comparison method, see #ShapeMatchModes
+@param parameter Method-specific parameter (not supported now).
+ */
+CV_EXPORTS_W double matchShapes( InputArray contour1, InputArray contour2,
+                                 int method, double parameter );
+
+/** @example samples/cpp/convexhull.cpp
+An example using the convexHull functionality
+*/
+
+/** @brief Finds the convex hull of a point set.
+
+The function cv::convexHull finds the convex hull of a 2D point set using the Sklansky's algorithm @cite Sklansky82
+that has *O(N logN)* complexity in the current implementation.
+
+@param points Input 2D point set, stored in std::vector or Mat.
+@param hull Output convex hull. It is either an integer vector of indices or vector of points. In
+the first case, the hull elements are 0-based indices of the convex hull points in the original
+array (since the set of convex hull points is a subset of the original point set). In the second
+case, hull elements are the convex hull points themselves.
+@param clockwise Orientation flag. If it is true, the output convex hull is oriented clockwise.
+Otherwise, it is oriented counter-clockwise. The assumed coordinate system has its X axis pointing
+to the right, and its Y axis pointing upwards.
+@param returnPoints Operation flag. In case of a matrix, when the flag is true, the function
+returns convex hull points. Otherwise, it returns indices of the convex hull points. When the
+output array is std::vector, the flag is ignored, and the output depends on the type of the
+vector: std::vector\<int\> implies returnPoints=false, std::vector\<Point\> implies
+returnPoints=true.
+
+@note `points` and `hull` should be different arrays, inplace processing isn't supported.
+
+Check @ref tutorial_hull "the corresponding tutorial" for more details.
+
+useful links:
+
+https://www.learnopencv.com/convex-hull-using-opencv-in-python-and-c/
+ */
+CV_EXPORTS_W void convexHull( InputArray points, OutputArray hull,
+                              bool clockwise = false, bool returnPoints = true );
+
+/** @brief Finds the convexity defects of a contour.
+
+The figure below displays convexity defects of a hand contour:
+
+![image](pics/defects.png)
+
+@param contour Input contour.
+@param convexhull Convex hull obtained using convexHull that should contain indices of the contour
+points that make the hull.
+@param convexityDefects The output vector of convexity defects. In C++ and the new Python/Java
+interface each convexity defect is represented as 4-element integer vector (a.k.a. #Vec4i):
+(start_index, end_index, farthest_pt_index, fixpt_depth), where indices are 0-based indices
+in the original contour of the convexity defect beginning, end and the farthest point, and
+fixpt_depth is fixed-point approximation (with 8 fractional bits) of the distance between the
+farthest contour point and the hull. That is, to get the floating-point value of the depth will be
+fixpt_depth/256.0.
+ */
+CV_EXPORTS_W void convexityDefects( InputArray contour, InputArray convexhull, OutputArray convexityDefects );
+
+/** @brief Tests a contour convexity.
+
+The function tests whether the input contour is convex or not. The contour must be simple, that is,
+without self-intersections. Otherwise, the function output is undefined.
+
+@param contour Input vector of 2D points, stored in std::vector\<\> or Mat
+ */
+CV_EXPORTS_W bool isContourConvex( InputArray contour );
+
+/** @example samples/cpp/intersectExample.cpp
+Examples of how intersectConvexConvex works
+*/
+
+/** @brief Finds intersection of two convex polygons
+
+@param p1 First polygon
+@param p2 Second polygon
+@param p12 Output polygon describing the intersecting area
+@param handleNested When true, an intersection is found if one of the polygons is fully enclosed in the other.
+When false, no intersection is found. If the polygons share a side or the vertex of one polygon lies on an edge
+of the other, they are not considered nested and an intersection will be found regardless of the value of handleNested.
+
+@returns Area of intersecting polygon. May be negative, if algorithm has not converged, e.g. non-convex input.
+
+@note intersectConvexConvex doesn't confirm that both polygons are convex and will return invalid results if they aren't.
+ */
+CV_EXPORTS_W float intersectConvexConvex( InputArray p1, InputArray p2,
+                                          OutputArray p12, bool handleNested = true );
+
+/** @example samples/cpp/fitellipse.cpp
+An example using the fitEllipse technique
+*/
+
+/** @brief Fits an ellipse around a set of 2D points.
+
+The function calculates the ellipse that fits (in a least-squares sense) a set of 2D points best of
+all. It returns the rotated rectangle in which the ellipse is inscribed. The first algorithm described by @cite Fitzgibbon95
+is used. Developer should keep in mind that it is possible that the returned
+ellipse/rotatedRect data contains negative indices, due to the data points being close to the
+border of the containing Mat element.
+
+@param points Input 2D point set, stored in std::vector\<\> or Mat
+
+@note Input point types are @ref Point2i or @ref Point2f and at least 5 points are required.
+@note @ref getClosestEllipsePoints function can be used to compute the ellipse fitting error.
+ */
+CV_EXPORTS_W RotatedRect fitEllipse( InputArray points );
+
+/** @brief Fits an ellipse around a set of 2D points.
+
+ The function calculates the ellipse that fits a set of 2D points.
+ It returns the rotated rectangle in which the ellipse is inscribed.
+ The Approximate Mean Square (AMS) proposed by @cite Taubin1991 is used.
+
+ For an ellipse, this basis set is \f$ \chi= \left(x^2, x y, y^2, x, y, 1\right) \f$,
+ which is a set of six free coefficients \f$ A^T=\left\{A_{\text{xx}},A_{\text{xy}},A_{\text{yy}},A_x,A_y,A_0\right\} \f$.
+ However, to specify an ellipse, all that is needed is five numbers; the major and minor axes lengths \f$ (a,b) \f$,
+ the position \f$ (x_0,y_0) \f$, and the orientation \f$ \theta \f$. This is because the basis set includes lines,
+ quadratics, parabolic and hyperbolic functions as well as elliptical functions as possible fits.
+ If the fit is found to be a parabolic or hyperbolic function then the standard #fitEllipse method is used.
+ The AMS method restricts the fit to parabolic, hyperbolic and elliptical curves
+ by imposing the condition that \f$ A^T ( D_x^T D_x  +   D_y^T D_y) A = 1 \f$ where
+ the matrices \f$ Dx \f$ and \f$ Dy \f$ are the partial derivatives of the design matrix \f$ D \f$ with
+ respect to x and y. The matrices are formed row by row applying the following to
+ each of the points in the set:
+ \f{align*}{
+ D(i,:)&=\left\{x_i^2, x_i y_i, y_i^2, x_i, y_i, 1\right\} &
+ D_x(i,:)&=\left\{2 x_i,y_i,0,1,0,0\right\} &
+ D_y(i,:)&=\left\{0,x_i,2 y_i,0,1,0\right\}
+ \f}
+ The AMS method minimizes the cost function
+ \f{equation*}{
+ \epsilon ^2=\frac{ A^T D^T D A }{ A^T (D_x^T D_x +  D_y^T D_y) A^T }
+ \f}
+
+ The minimum cost is found by solving the generalized eigenvalue problem.
+
+ \f{equation*}{
+ D^T D A = \lambda  \left( D_x^T D_x +  D_y^T D_y\right) A
+ \f}
+
+ @param points Input 2D point set, stored in std::vector\<\> or Mat
+
+ @note Input point types are @ref Point2i or @ref Point2f and at least 5 points are required.
+ @note @ref getClosestEllipsePoints function can be used to compute the ellipse fitting error.
+ */
+CV_EXPORTS_W RotatedRect fitEllipseAMS( InputArray points );
+
+
+/** @brief Fits an ellipse around a set of 2D points.
+
+ The function calculates the ellipse that fits a set of 2D points.
+ It returns the rotated rectangle in which the ellipse is inscribed.
+ The Direct least square (Direct) method by @cite oy1998NumericallySD is used.
+
+ For an ellipse, this basis set is \f$ \chi= \left(x^2, x y, y^2, x, y, 1\right) \f$,
+ which is a set of six free coefficients \f$ A^T=\left\{A_{\text{xx}},A_{\text{xy}},A_{\text{yy}},A_x,A_y,A_0\right\} \f$.
+ However, to specify an ellipse, all that is needed is five numbers; the major and minor axes lengths \f$ (a,b) \f$,
+ the position \f$ (x_0,y_0) \f$, and the orientation \f$ \theta \f$. This is because the basis set includes lines,
+ quadratics, parabolic and hyperbolic functions as well as elliptical functions as possible fits.
+ The Direct method confines the fit to ellipses by ensuring that \f$ 4 A_{xx} A_{yy}- A_{xy}^2 > 0 \f$.
+ The condition imposed is that \f$ 4 A_{xx} A_{yy}- A_{xy}^2=1 \f$ which satisfies the inequality
+ and as the coefficients can be arbitrarily scaled is not overly restrictive.
+
+ \f{equation*}{
+ \epsilon ^2= A^T D^T D A \quad \text{with} \quad A^T C A =1 \quad \text{and} \quad C=\left(\begin{matrix}
+ 0 & 0  & 2  & 0  & 0  &  0  \\
+ 0 & -1  & 0  & 0  & 0  &  0 \\
+ 2 & 0  & 0  & 0  & 0  &  0 \\
+ 0 & 0  & 0  & 0  & 0  &  0 \\
+ 0 & 0  & 0  & 0  & 0  &  0 \\
+ 0 & 0  & 0  & 0  & 0  &  0
+ \end{matrix} \right)
+ \f}
+
+ The minimum cost is found by solving the generalized eigenvalue problem.
+
+ \f{equation*}{
+ D^T D A = \lambda  \left( C\right) A
+ \f}
+
+ The system produces only one positive eigenvalue \f$ \lambda\f$ which is chosen as the solution
+ with its eigenvector \f$\mathbf{u}\f$. These are used to find the coefficients
+
+ \f{equation*}{
+ A = \sqrt{\frac{1}{\mathbf{u}^T C \mathbf{u}}}  \mathbf{u}
+ \f}
+ The scaling factor guarantees that  \f$A^T C A =1\f$.
+
+ @param points Input 2D point set, stored in std::vector\<\> or Mat
+
+ @note Input point types are @ref Point2i or @ref Point2f and at least 5 points are required.
+ @note @ref getClosestEllipsePoints function can be used to compute the ellipse fitting error.
+ */
+CV_EXPORTS_W RotatedRect fitEllipseDirect( InputArray points );
+
+/** @brief Compute for each 2d point the nearest 2d point located on a given ellipse.
+
+ The function computes the nearest 2d location on a given ellipse for a vector of 2d points and is based on @cite Chatfield2017 code.
+ This function can be used to compute for instance the ellipse fitting error.
+
+ @param ellipse_params Ellipse parameters
+ @param points Input 2d points
+ @param closest_pts For each 2d point, their corresponding closest 2d point located on a given ellipse
+
+ @note Input point types are @ref Point2i or @ref Point2f
+ @see fitEllipse, fitEllipseAMS, fitEllipseDirect
+ */
+CV_EXPORTS_W void getClosestEllipsePoints( const RotatedRect& ellipse_params, InputArray points, OutputArray closest_pts );
+
+/** @brief Fits a line to a 2D or 3D point set.
+
+The function fitLine fits a line to a 2D or 3D point set by minimizing \f$\sum_i \rho(r_i)\f$ where
+\f$r_i\f$ is a distance between the \f$i^{th}\f$ point, the line and \f$\rho(r)\f$ is a distance function, one
+of the following:
+-  DIST_L2
+\f[\rho (r) = r^2/2  \quad \text{(the simplest and the fastest least-squares method)}\f]
+- DIST_L1
+\f[\rho (r) = r\f]
+- DIST_L12
+\f[\rho (r) = 2  \cdot ( \sqrt{1 + \frac{r^2}{2}} - 1)\f]
+- DIST_FAIR
+\f[\rho \left (r \right ) = C^2  \cdot \left (  \frac{r}{C} -  \log{\left(1 + \frac{r}{C}\right)} \right )  \quad \text{where} \quad C=1.3998\f]
+- DIST_WELSCH
+\f[\rho \left (r \right ) =  \frac{C^2}{2} \cdot \left ( 1 -  \exp{\left(-\left(\frac{r}{C}\right)^2\right)} \right )  \quad \text{where} \quad C=2.9846\f]
+- DIST_HUBER
+\f[\rho (r) =  \fork{r^2/2}{if \(r < C\)}{C \cdot (r-C/2)}{otherwise} \quad \text{where} \quad C=1.345\f]
+
+The algorithm is based on the M-estimator ( <https://en.wikipedia.org/wiki/M-estimator> ) technique
+that iteratively fits the line using the weighted least-squares algorithm. After each iteration the
+weights \f$w_i\f$ are adjusted to be inversely proportional to \f$\rho(r_i)\f$ .
+
+@param points Input vector of 2D or 3D points, stored in std::vector\<\> or Mat.
+@param line Output line parameters. In case of 2D fitting, it should be a vector of 4 elements
+(like Vec4f) - (vx, vy, x0, y0), where (vx, vy) is a normalized vector collinear to the line and
+(x0, y0) is a point on the line. In case of 3D fitting, it should be a vector of 6 elements (like
+Vec6f) - (vx, vy, vz, x0, y0, z0), where (vx, vy, vz) is a normalized vector collinear to the line
+and (x0, y0, z0) is a point on the line.
+@param distType Distance used by the M-estimator, see #DistanceTypes
+@param param Numerical parameter ( C ) for some types of distances. If it is 0, an optimal value
+is chosen.
+@param reps Sufficient accuracy for the radius (distance between the coordinate origin and the line).
+@param aeps Sufficient accuracy for the angle. 0.01 would be a good default value for reps and aeps.
+ */
+CV_EXPORTS_W void fitLine( InputArray points, OutputArray line, int distType,
+                           double param, double reps, double aeps );
+
+/** @brief Performs a point-in-contour test.
+
+The function determines whether the point is inside a contour, outside, or lies on an edge (or
+coincides with a vertex). It returns positive (inside), negative (outside), or zero (on an edge)
+value, correspondingly. When measureDist=false , the return value is +1, -1, and 0, respectively.
+Otherwise, the return value is a signed distance between the point and the nearest contour edge.
+
+See below a sample output of the function where each image pixel is tested against the contour:
+
+![sample output](pics/pointpolygon.png)
+
+@param contour Input contour.
+@param pt Point tested against the contour.
+@param measureDist If true, the function estimates the signed distance from the point to the
+nearest contour edge. Otherwise, the function only checks if the point is inside a contour or not.
+ */
+CV_EXPORTS_W double pointPolygonTest( InputArray contour, Point2f pt, bool measureDist );
+
+/** @brief Finds out if there is any intersection between two rotated rectangles.
+
+If there is then the vertices of the intersecting region are returned as well.
+
+Below are some examples of intersection configurations. The hatched pattern indicates the
+intersecting region and the red vertices are returned by the function.
+
+![intersection examples](pics/intersection.png)
+
+@param rect1 First rectangle
+@param rect2 Second rectangle
+@param intersectingRegion The output array of the vertices of the intersecting region. It returns
+at most 8 vertices. Stored as std::vector\<cv::Point2f\> or cv::Mat as Mx1 of type CV_32FC2.
+@returns One of #RectanglesIntersectTypes
+ */
+CV_EXPORTS_W int rotatedRectangleIntersection( const RotatedRect& rect1, const RotatedRect& rect2, OutputArray intersectingRegion  );
+
+/** @brief Creates a smart pointer to a cv::GeneralizedHoughBallard class and initializes it.
+*/
+CV_EXPORTS_W Ptr<GeneralizedHoughBallard> createGeneralizedHoughBallard();
+
+/** @brief Creates a smart pointer to a cv::GeneralizedHoughGuil class and initializes it.
+*/
+CV_EXPORTS_W Ptr<GeneralizedHoughGuil> createGeneralizedHoughGuil();
+
+//! @} imgproc_shape
+
+//! @addtogroup imgproc_colormap
+//! @{
+
+//! GNU Octave/MATLAB equivalent colormaps
+enum ColormapTypes
+{
+    COLORMAP_AUTUMN = 0, //!< ![autumn](pics/colormaps/colorscale_autumn.jpg)
+    COLORMAP_BONE = 1, //!< ![bone](pics/colormaps/colorscale_bone.jpg)
+    COLORMAP_JET = 2, //!< ![jet](pics/colormaps/colorscale_jet.jpg)
+    COLORMAP_WINTER = 3, //!< ![winter](pics/colormaps/colorscale_winter.jpg)
+    COLORMAP_RAINBOW = 4, //!< ![rainbow](pics/colormaps/colorscale_rainbow.jpg)
+    COLORMAP_OCEAN = 5, //!< ![ocean](pics/colormaps/colorscale_ocean.jpg)
+    COLORMAP_SUMMER = 6, //!< ![summer](pics/colormaps/colorscale_summer.jpg)
+    COLORMAP_SPRING = 7, //!< ![spring](pics/colormaps/colorscale_spring.jpg)
+    COLORMAP_COOL = 8, //!< ![cool](pics/colormaps/colorscale_cool.jpg)
+    COLORMAP_HSV = 9, //!< ![HSV](pics/colormaps/colorscale_hsv.jpg)
+    COLORMAP_PINK = 10, //!< ![pink](pics/colormaps/colorscale_pink.jpg)
+    COLORMAP_HOT = 11, //!< ![hot](pics/colormaps/colorscale_hot.jpg)
+    COLORMAP_PARULA = 12, //!< ![parula](pics/colormaps/colorscale_parula.jpg)
+    COLORMAP_MAGMA = 13, //!< ![magma](pics/colormaps/colorscale_magma.jpg)
+    COLORMAP_INFERNO = 14, //!< ![inferno](pics/colormaps/colorscale_inferno.jpg)
+    COLORMAP_PLASMA = 15, //!< ![plasma](pics/colormaps/colorscale_plasma.jpg)
+    COLORMAP_VIRIDIS = 16, //!< ![viridis](pics/colormaps/colorscale_viridis.jpg)
+    COLORMAP_CIVIDIS = 17, //!< ![cividis](pics/colormaps/colorscale_cividis.jpg)
+    COLORMAP_TWILIGHT = 18, //!< ![twilight](pics/colormaps/colorscale_twilight.jpg)
+    COLORMAP_TWILIGHT_SHIFTED = 19, //!< ![twilight shifted](pics/colormaps/colorscale_twilight_shifted.jpg)
+    COLORMAP_TURBO = 20, //!< ![turbo](pics/colormaps/colorscale_turbo.jpg)
+    COLORMAP_DEEPGREEN = 21  //!< ![deepgreen](pics/colormaps/colorscale_deepgreen.jpg)
+};
+
+/** @example samples/cpp/falsecolor.cpp
+An example using applyColorMap function
+*/
+
+/** @brief Applies a GNU Octave/MATLAB equivalent colormap on a given image.
+
+@param src The source image, grayscale or colored of type CV_8UC1 or CV_8UC3. If CV_8UC3, then the CV_8UC1 image is generated internally using cv::COLOR_BGR2GRAY.
+@param dst The result is the colormapped source image. Note: Mat::create is called on dst.
+@param colormap The colormap to apply, see #ColormapTypes
+*/
+CV_EXPORTS_W void applyColorMap(InputArray src, OutputArray dst, int colormap);
+
+/** @brief Applies a user colormap on a given image.
+
+@param src The source image, grayscale or colored of type CV_8UC1 or CV_8UC3. If CV_8UC3, then the CV_8UC1 image is generated internally using cv::COLOR_BGR2GRAY.
+@param dst The result is the colormapped source image of the same number of channels as userColor. Note: Mat::create is called on dst.
+@param userColor The colormap to apply of type CV_8UC1 or CV_8UC3 and size 256
+*/
+CV_EXPORTS_W void applyColorMap(InputArray src, OutputArray dst, InputArray userColor);
+
+//! @} imgproc_colormap
+
+//! @addtogroup imgproc_draw
+//! @{
+
+
+/** OpenCV color channel order is BGR[A] */
+#define CV_RGB(r, g, b)  cv::Scalar((b), (g), (r), 0)
+
+/** @brief Draws a line segment connecting two points.
+
+The function line draws the line segment between pt1 and pt2 points in the image. The line is
+clipped by the image boundaries. For non-antialiased lines with integer coordinates, the 8-connected
+or 4-connected Bresenham algorithm is used. Thick lines are drawn with rounding endings. Antialiased
+lines are drawn using Gaussian filtering.
+
+@param img Image.
+@param pt1 First point of the line segment.
+@param pt2 Second point of the line segment.
+@param color Line color.
+@param thickness Line thickness.
+@param lineType Type of the line. See #LineTypes.
+@param shift Number of fractional bits in the point coordinates.
+ */
+CV_EXPORTS_W void line(InputOutputArray img, Point pt1, Point pt2, const Scalar& color,
+                     int thickness = 1, int lineType = LINE_8, int shift = 0);
+
+/** @brief Draws an arrow segment pointing from the first point to the second one.
+
+The function cv::arrowedLine draws an arrow between pt1 and pt2 points in the image. See also #line.
+
+@param img Image.
+@param pt1 The point the arrow starts from.
+@param pt2 The point the arrow points to.
+@param color Line color.
+@param thickness Line thickness.
+@param line_type Type of the line. See #LineTypes
+@param shift Number of fractional bits in the point coordinates.
+@param tipLength The length of the arrow tip in relation to the arrow length
+ */
+CV_EXPORTS_W void arrowedLine(InputOutputArray img, Point pt1, Point pt2, const Scalar& color,
+                     int thickness=1, int line_type=8, int shift=0, double tipLength=0.1);
+
+/** @brief Draws a simple, thick, or filled up-right rectangle.
+
+The function cv::rectangle draws a rectangle outline or a filled rectangle whose two opposite corners
+are pt1 and pt2.
+
+@param img Image.
+@param pt1 Vertex of the rectangle.
+@param pt2 Vertex of the rectangle opposite to pt1 .
+@param color Rectangle color or brightness (grayscale image).
+@param thickness Thickness of lines that make up the rectangle. Negative values, like #FILLED,
+mean that the function has to draw a filled rectangle.
+@param lineType Type of the line. See #LineTypes
+@param shift Number of fractional bits in the point coordinates.
+ */
+CV_EXPORTS_W void rectangle(InputOutputArray img, Point pt1, Point pt2,
+                          const Scalar& color, int thickness = 1,
+                          int lineType = LINE_8, int shift = 0);
+
+/** @overload
+
+use `rec` parameter as alternative specification of the drawn rectangle: `r.tl() and
+r.br()-Point(1,1)` are opposite corners
+*/
+CV_EXPORTS_W void rectangle(InputOutputArray img, Rect rec,
+                          const Scalar& color, int thickness = 1,
+                          int lineType = LINE_8, int shift = 0);
+
+/** @example samples/cpp/tutorial_code/ImgProc/basic_drawing/Drawing_2.cpp
+An example using drawing functions
+*/
+
+/** @brief Draws a circle.
+
+The function cv::circle draws a simple or filled circle with a given center and radius.
+@param img Image where the circle is drawn.
+@param center Center of the circle.
+@param radius Radius of the circle.
+@param color Circle color.
+@param thickness Thickness of the circle outline, if positive. Negative values, like #FILLED,
+mean that a filled circle is to be drawn.
+@param lineType Type of the circle boundary. See #LineTypes
+@param shift Number of fractional bits in the coordinates of the center and in the radius value.
+ */
+CV_EXPORTS_W void circle(InputOutputArray img, Point center, int radius,
+                       const Scalar& color, int thickness = 1,
+                       int lineType = LINE_8, int shift = 0);
+
+/** @brief Draws a simple or thick elliptic arc or fills an ellipse sector.
+
+The function cv::ellipse with more parameters draws an ellipse outline, a filled ellipse, an elliptic
+arc, or a filled ellipse sector. The drawing code uses general parametric form.
+A piecewise-linear curve is used to approximate the elliptic arc
+boundary. If you need more control of the ellipse rendering, you can retrieve the curve using
+#ellipse2Poly and then render it with #polylines or fill it with #fillPoly. If you use the first
+variant of the function and want to draw the whole ellipse, not an arc, pass `startAngle=0` and
+`endAngle=360`. If `startAngle` is greater than `endAngle`, they are swapped. The figure below explains
+the meaning of the parameters to draw the blue arc.
+
+![Parameters of Elliptic Arc](pics/ellipse.svg)
+
+@param img Image.
+@param center Center of the ellipse.
+@param axes Half of the size of the ellipse main axes.
+@param angle Ellipse rotation angle in degrees.
+@param startAngle Starting angle of the elliptic arc in degrees.
+@param endAngle Ending angle of the elliptic arc in degrees.
+@param color Ellipse color.
+@param thickness Thickness of the ellipse arc outline, if positive. Otherwise, this indicates that
+a filled ellipse sector is to be drawn.
+@param lineType Type of the ellipse boundary. See #LineTypes
+@param shift Number of fractional bits in the coordinates of the center and values of axes.
+ */
+CV_EXPORTS_W void ellipse(InputOutputArray img, Point center, Size axes,
+                        double angle, double startAngle, double endAngle,
+                        const Scalar& color, int thickness = 1,
+                        int lineType = LINE_8, int shift = 0);
+
+/** @overload
+@param img Image.
+@param box Alternative ellipse representation via RotatedRect. This means that the function draws
+an ellipse inscribed in the rotated rectangle.
+@param color Ellipse color.
+@param thickness Thickness of the ellipse arc outline, if positive. Otherwise, this indicates that
+a filled ellipse sector is to be drawn.
+@param lineType Type of the ellipse boundary. See #LineTypes
+*/
+CV_EXPORTS_W void ellipse(InputOutputArray img, const RotatedRect& box, const Scalar& color,
+                        int thickness = 1, int lineType = LINE_8);
+
+/* ----------------------------------------------------------------------------------------- */
+/* ADDING A SET OF PREDEFINED MARKERS WHICH COULD BE USED TO HIGHLIGHT POSITIONS IN AN IMAGE */
+/* ----------------------------------------------------------------------------------------- */
+
+/** @brief Draws a marker on a predefined position in an image.
+
+The function cv::drawMarker draws a marker on a given position in the image. For the moment several
+marker types are supported, see #MarkerTypes for more information.
+
+@param img Image.
+@param position The point where the crosshair is positioned.
+@param color Line color.
+@param markerType The specific type of marker you want to use, see #MarkerTypes
+@param thickness Line thickness.
+@param line_type Type of the line, See #LineTypes
+@param markerSize The length of the marker axis [default = 20 pixels]
+ */
+CV_EXPORTS_W void drawMarker(InputOutputArray img, Point position, const Scalar& color,
+                             int markerType = MARKER_CROSS, int markerSize=20, int thickness=1,
+                             int line_type=8);
+
+/* ----------------------------------------------------------------------------------------- */
+/* END OF MARKER SECTION */
+/* ----------------------------------------------------------------------------------------- */
+
+/** @brief Fills a convex polygon.
+
+The function cv::fillConvexPoly draws a filled convex polygon. This function is much faster than the
+function #fillPoly . It can fill not only convex polygons but any monotonic polygon without
+self-intersections, that is, a polygon whose contour intersects every horizontal line (scan line)
+twice at the most (though, its top-most and/or the bottom edge could be horizontal).
+
+@param img Image.
+@param points Polygon vertices.
+@param color Polygon color.
+@param lineType Type of the polygon boundaries. See #LineTypes
+@param shift Number of fractional bits in the vertex coordinates.
+ */
+CV_EXPORTS_W void fillConvexPoly(InputOutputArray img, InputArray points,
+                                 const Scalar& color, int lineType = LINE_8,
+                                 int shift = 0);
+
+/** @overload */
+CV_EXPORTS void fillConvexPoly(InputOutputArray img, const Point* pts, int npts,
+                               const Scalar& color, int lineType = LINE_8,
+                               int shift = 0);
+
+/** @example samples/cpp/tutorial_code/ImgProc/basic_drawing/Drawing_1.cpp
+An example using drawing functions
+Check @ref tutorial_random_generator_and_text "the corresponding tutorial" for more details
+*/
+
+/** @brief Fills the area bounded by one or more polygons.
+
+The function cv::fillPoly fills an area bounded by several polygonal contours. The function can fill
+complex areas, for example, areas with holes, contours with self-intersections (some of their
+parts), and so forth.
+
+@param img Image.
+@param pts Array of polygons where each polygon is represented as an array of points.
+@param color Polygon color.
+@param lineType Type of the polygon boundaries. See #LineTypes
+@param shift Number of fractional bits in the vertex coordinates.
+@param offset Optional offset of all points of the contours.
+ */
+CV_EXPORTS_W void fillPoly(InputOutputArray img, InputArrayOfArrays pts,
+                           const Scalar& color, int lineType = LINE_8, int shift = 0,
+                           Point offset = Point() );
+
+/** @overload */
+CV_EXPORTS void fillPoly(InputOutputArray img, const Point** pts,
+                         const int* npts, int ncontours,
+                         const Scalar& color, int lineType = LINE_8, int shift = 0,
+                         Point offset = Point() );
+
+/** @brief Draws several polygonal curves.
+
+@param img Image.
+@param pts Array of polygonal curves.
+@param isClosed Flag indicating whether the drawn polylines are closed or not. If they are closed,
+the function draws a line from the last vertex of each curve to its first vertex.
+@param color Polyline color.
+@param thickness Thickness of the polyline edges.
+@param lineType Type of the line segments. See #LineTypes
+@param shift Number of fractional bits in the vertex coordinates.
+
+The function cv::polylines draws one or more polygonal curves.
+ */
+CV_EXPORTS_W void polylines(InputOutputArray img, InputArrayOfArrays pts,
+                            bool isClosed, const Scalar& color,
+                            int thickness = 1, int lineType = LINE_8, int shift = 0 );
+
+/** @overload */
+CV_EXPORTS void polylines(InputOutputArray img, const Point* const* pts, const int* npts,
+                          int ncontours, bool isClosed, const Scalar& color,
+                          int thickness = 1, int lineType = LINE_8, int shift = 0 );
+
+/** @example samples/cpp/contours2.cpp
+An example program illustrates the use of cv::findContours and cv::drawContours
+\image html WindowsQtContoursOutput.png "Screenshot of the program"
+*/
+
+/** @example samples/cpp/segment_objects.cpp
+An example using drawContours to clean up a background segmentation result
+*/
+
+/** @brief Draws contours outlines or filled contours.
+
+The function draws contour outlines in the image if \f$\texttt{thickness} \ge 0\f$ or fills the area
+bounded by the contours if \f$\texttt{thickness}<0\f$ . The example below shows how to retrieve
+connected components from the binary image and label them: :
+@include snippets/imgproc_drawContours.cpp
+
+@param image Destination image.
+@param contours All the input contours. Each contour is stored as a point vector.
+@param contourIdx Parameter indicating a contour to draw. If it is negative, all the contours are drawn.
+@param color Color of the contours.
+@param thickness Thickness of lines the contours are drawn with. If it is negative (for example,
+thickness=#FILLED ), the contour interiors are drawn.
+@param lineType Line connectivity. See #LineTypes
+@param hierarchy Optional information about hierarchy. It is only needed if you want to draw only
+some of the contours (see maxLevel ).
+@param maxLevel Maximal level for drawn contours. If it is 0, only the specified contour is drawn.
+If it is 1, the function draws the contour(s) and all the nested contours. If it is 2, the function
+draws the contours, all the nested contours, all the nested-to-nested contours, and so on. This
+parameter is only taken into account when there is hierarchy available.
+@param offset Optional contour shift parameter. Shift all the drawn contours by the specified
+\f$\texttt{offset}=(dx,dy)\f$ .
+@note When thickness=#FILLED, the function is designed to handle connected components with holes correctly
+even when no hierarchy data is provided. This is done by analyzing all the outlines together
+using even-odd rule. This may give incorrect results if you have a joint collection of separately retrieved
+contours. In order to solve this problem, you need to call #drawContours separately for each sub-group
+of contours, or iterate over the collection using contourIdx parameter.
+ */
+CV_EXPORTS_W void drawContours( InputOutputArray image, InputArrayOfArrays contours,
+                              int contourIdx, const Scalar& color,
+                              int thickness = 1, int lineType = LINE_8,
+                              InputArray hierarchy = noArray(),
+                              int maxLevel = INT_MAX, Point offset = Point() );
+
+/** @brief Clips the line against the image rectangle.
+
+The function cv::clipLine calculates a part of the line segment that is entirely within the specified
+rectangle. It returns false if the line segment is completely outside the rectangle. Otherwise,
+it returns true .
+@param imgSize Image size. The image rectangle is Rect(0, 0, imgSize.width, imgSize.height) .
+@param pt1 First line point.
+@param pt2 Second line point.
+ */
+CV_EXPORTS bool clipLine(Size imgSize, CV_IN_OUT Point& pt1, CV_IN_OUT Point& pt2);
+
+/** @overload
+@param imgSize Image size. The image rectangle is Rect(0, 0, imgSize.width, imgSize.height) .
+@param pt1 First line point.
+@param pt2 Second line point.
+*/
+CV_EXPORTS bool clipLine(Size2l imgSize, CV_IN_OUT Point2l& pt1, CV_IN_OUT Point2l& pt2);
+
+/** @overload
+@param imgRect Image rectangle.
+@param pt1 First line point.
+@param pt2 Second line point.
+*/
+CV_EXPORTS_W bool clipLine(Rect imgRect, CV_OUT CV_IN_OUT Point& pt1, CV_OUT CV_IN_OUT Point& pt2);
+
+/** @brief Approximates an elliptic arc with a polyline.
+
+The function ellipse2Poly computes the vertices of a polyline that approximates the specified
+elliptic arc. It is used by #ellipse. If `arcStart` is greater than `arcEnd`, they are swapped.
+
+@param center Center of the arc.
+@param axes Half of the size of the ellipse main axes. See #ellipse for details.
+@param angle Rotation angle of the ellipse in degrees. See #ellipse for details.
+@param arcStart Starting angle of the elliptic arc in degrees.
+@param arcEnd Ending angle of the elliptic arc in degrees.
+@param delta Angle between the subsequent polyline vertices. It defines the approximation
+accuracy.
+@param pts Output vector of polyline vertices.
+ */
+CV_EXPORTS_W void ellipse2Poly( Point center, Size axes, int angle,
+                                int arcStart, int arcEnd, int delta,
+                                CV_OUT std::vector<Point>& pts );
+
+/** @overload
+@param center Center of the arc.
+@param axes Half of the size of the ellipse main axes. See #ellipse for details.
+@param angle Rotation angle of the ellipse in degrees. See #ellipse for details.
+@param arcStart Starting angle of the elliptic arc in degrees.
+@param arcEnd Ending angle of the elliptic arc in degrees.
+@param delta Angle between the subsequent polyline vertices. It defines the approximation accuracy.
+@param pts Output vector of polyline vertices.
+*/
+CV_EXPORTS void ellipse2Poly(Point2d center, Size2d axes, int angle,
+                             int arcStart, int arcEnd, int delta,
+                             CV_OUT std::vector<Point2d>& pts);
+
+/** @brief Draws a text string.
+
+The function cv::putText renders the specified text string in the image. Symbols that cannot be rendered
+using the specified font are replaced by question marks. See #getTextSize for a text rendering code
+example.
+
+The `fontScale` parameter is a scale factor that is multiplied by the base font size:
+- When scale > 1, the text is magnified.
+- When 0 < scale < 1, the text is minimized.
+- When scale < 0, the text is mirrored or reversed.
+
+@param img Image.
+@param text Text string to be drawn.
+@param org Bottom-left corner of the text string in the image.
+@param fontFace Font type, see #HersheyFonts.
+@param fontScale Font scale factor that is multiplied by the font-specific base size.
+@param color Text color.
+@param thickness Thickness of the lines used to draw a text.
+@param lineType Line type. See #LineTypes
+@param bottomLeftOrigin When true, the image data origin is at the bottom-left corner. Otherwise,
+it is at the top-left corner.
+ */
+CV_EXPORTS_W void putText( InputOutputArray img, const String& text, Point org,
+                         int fontFace, double fontScale, Scalar color,
+                         int thickness = 1, int lineType = LINE_8,
+                         bool bottomLeftOrigin = false );
+
+/** @brief Calculates the width and height of a text string.
+
+The function cv::getTextSize calculates and returns the size of a box that contains the specified text.
+That is, the following code renders some text, the tight box surrounding it, and the baseline: :
+@code
+    String text = "Funny text inside the box";
+    int fontFace = FONT_HERSHEY_SCRIPT_SIMPLEX;
+    double fontScale = 2;
+    int thickness = 3;
+
+    Mat img(600, 800, CV_8UC3, Scalar::all(0));
+
+    int baseline=0;
+    Size textSize = getTextSize(text, fontFace,
+                                fontScale, thickness, &baseline);
+    baseline += thickness;
+
+    // center the text
+    Point textOrg((img.cols - textSize.width)/2,
+                  (img.rows + textSize.height)/2);
+
+    // draw the box
+    rectangle(img, textOrg + Point(0, baseline),
+              textOrg + Point(textSize.width, -textSize.height),
+              Scalar(0,0,255));
+    // ... and the baseline first
+    line(img, textOrg + Point(0, thickness),
+         textOrg + Point(textSize.width, thickness),
+         Scalar(0, 0, 255));
+
+    // then put the text itself
+    putText(img, text, textOrg, fontFace, fontScale,
+            Scalar::all(255), thickness, 8);
+@endcode
+
+@param text Input text string.
+@param fontFace Font to use, see #HersheyFonts.
+@param fontScale Font scale factor that is multiplied by the font-specific base size.
+@param thickness Thickness of lines used to render the text. See #putText for details.
+@param[out] baseLine y-coordinate of the baseline relative to the bottom-most text
+point.
+@return The size of a box that contains the specified text.
+
+@see putText
+ */
+CV_EXPORTS_W Size getTextSize(const String& text, int fontFace,
+                            double fontScale, int thickness,
+                            CV_OUT int* baseLine);
+
+
+/** @brief Calculates the font-specific size to use to achieve a given height in pixels.
+
+@param fontFace Font to use, see cv::HersheyFonts.
+@param pixelHeight Pixel height to compute the fontScale for
+@param thickness Thickness of lines used to render the text.See putText for details.
+@return The fontSize to use for cv::putText
+
+@see cv::putText
+*/
+CV_EXPORTS_W double getFontScaleFromHeight(const int fontFace,
+                                           const int pixelHeight,
+                                           const int thickness = 1);
+
+/** @brief Class for iterating over all pixels on a raster line segment.
+
+The class LineIterator is used to get each pixel of a raster line connecting
+two specified points.
+It can be treated as a versatile implementation of the Bresenham algorithm
+where you can stop at each pixel and do some extra processing, for
+example, grab pixel values along the line or draw a line with an effect
+(for example, with XOR operation).
+
+The number of pixels along the line is stored in LineIterator::count.
+The method LineIterator::pos returns the current position in the image:
+
+@code{.cpp}
+// grabs pixels along the line (pt1, pt2)
+// from 8-bit 3-channel image to the buffer
+LineIterator it(img, pt1, pt2, 8);
+LineIterator it2 = it;
+vector<Vec3b> buf(it.count);
+
+for(int i = 0; i < it.count; i++, ++it)
+    buf[i] = *(const Vec3b*)*it;
+
+// alternative way of iterating through the line
+for(int i = 0; i < it2.count; i++, ++it2)
+{
+    Vec3b val = img.at<Vec3b>(it2.pos());
+    CV_Assert(buf[i] == val);
+}
+@endcode
+*/
+class CV_EXPORTS LineIterator
+{
+public:
+    /** @brief Initializes iterator object for the given line and image.
+
+    The returned iterator can be used to traverse all pixels on a line that
+    connects the given two points.
+    The line will be clipped on the image boundaries.
+
+    @param img Underlying image.
+    @param pt1 First endpoint of the line.
+    @param pt2 The other endpoint of the line.
+    @param connectivity Pixel connectivity of the iterator. Valid values are 4 (iterator can move
+    up, down, left and right) and 8 (iterator can also move diagonally).
+    @param leftToRight If true, the line is traversed from the leftmost endpoint to the rightmost
+    endpoint. Otherwise, the line is traversed from \p pt1 to \p pt2.
+    */
+    LineIterator( const Mat& img, Point pt1, Point pt2,
+                  int connectivity = 8, bool leftToRight = false )
+    {
+        init(&img, Rect(0, 0, img.cols, img.rows), pt1, pt2, connectivity, leftToRight);
+        ptmode = false;
+    }
+    LineIterator( Point pt1, Point pt2,
+                  int connectivity = 8, bool leftToRight = false )
+    {
+        init(0, Rect(std::min(pt1.x, pt2.x),
+                     std::min(pt1.y, pt2.y),
+                     std::max(pt1.x, pt2.x) - std::min(pt1.x, pt2.x) + 1,
+                     std::max(pt1.y, pt2.y) - std::min(pt1.y, pt2.y) + 1),
+             pt1, pt2, connectivity, leftToRight);
+        ptmode = true;
+    }
+    LineIterator( Size boundingAreaSize, Point pt1, Point pt2,
+                  int connectivity = 8, bool leftToRight = false )
+    {
+        init(0, Rect(0, 0, boundingAreaSize.width, boundingAreaSize.height),
+             pt1, pt2, connectivity, leftToRight);
+        ptmode = true;
+    }
+    LineIterator( Rect boundingAreaRect, Point pt1, Point pt2,
+                  int connectivity = 8, bool leftToRight = false )
+    {
+        init(0, boundingAreaRect, pt1, pt2, connectivity, leftToRight);
+        ptmode = true;
+    }
+    void init(const Mat* img, Rect boundingAreaRect, Point pt1, Point pt2, int connectivity, bool leftToRight);
+
+    /** @brief Returns pointer to the current pixel.
+    */
+    uchar* operator *();
+
+    /** @brief Moves iterator to the next pixel on the line.
+
+    This is the prefix version (++it).
+    */
+    LineIterator& operator ++();
+
+    /** @brief Moves iterator to the next pixel on the line.
+
+    This is the postfix version (it++).
+    */
+    LineIterator operator ++(int);
+
+    /** @brief Returns coordinates of the current pixel.
+    */
+    Point pos() const;
+
+    uchar* ptr;
+    const uchar* ptr0;
+    int step, elemSize;
+    int err, count;
+    int minusDelta, plusDelta;
+    int minusStep, plusStep;
+    int minusShift, plusShift;
+    Point p;
+    bool ptmode;
+};
+
+//! @cond IGNORED
+
+// === LineIterator implementation ===
+
+inline
+uchar* LineIterator::operator *()
+{
+    return ptmode ? 0 : ptr;
+}
+
+inline
+LineIterator& LineIterator::operator ++()
+{
+    int mask = err < 0 ? -1 : 0;
+    err += minusDelta + (plusDelta & mask);
+    if(!ptmode)
+    {
+        ptr += minusStep + (plusStep & mask);
+    }
+    else
+    {
+        p.x += minusShift + (plusShift & mask);
+        p.y += minusStep + (plusStep & mask);
+    }
+    return *this;
+}
+
+inline
+LineIterator LineIterator::operator ++(int)
+{
+    LineIterator it = *this;
+    ++(*this);
+    return it;
+}
+
+inline
+Point LineIterator::pos() const
+{
+    if(!ptmode)
+    {
+        size_t offset = (size_t)(ptr - ptr0);
+        int y = (int)(offset/step);
+        int x = (int)((offset - (size_t)y*step)/elemSize);
+        return Point(x, y);
+    }
+    return p;
+}
+
+//! @endcond
+
+//! @} imgproc_draw
+
+//! @} imgproc
+
+} // cv
+
+
+#include "./imgproc/segmentation.hpp"
+
+
+#endif
diff --git a/3rdParty/opencv-4.12.0/opencv2/imgproc/bindings.hpp b/3rdParty/opencv-4.12.0/opencv2/imgproc/bindings.hpp
new file mode 100644
index 0000000000..fff9807792
--- /dev/null
+++ b/3rdParty/opencv-4.12.0/opencv2/imgproc/bindings.hpp
@@ -0,0 +1,54 @@
+// This file is part of OpenCV project.
+// It is subject to the license terms in the LICENSE file found in the top-level directory
+// of this distribution and at http://opencv.org/license.html.
+
+#ifndef OPENCV_IMGPROC_BINDINGS_HPP
+#define OPENCV_IMGPROC_BINDINGS_HPP
+
+// This file contains special overloads for OpenCV bindings
+// No need to use these functions in C++ code.
+
+namespace cv {
+
+/** @brief Finds lines in a binary image using the standard Hough transform and get accumulator.
+ *
+ * @note This function is for bindings use only. Use original function in C++ code
+ *
+ * @sa HoughLines
+ */
+CV_WRAP static inline
+void HoughLinesWithAccumulator(
+        InputArray image, OutputArray lines,
+        double rho, double theta, int threshold,
+        double srn = 0, double stn = 0,
+        double min_theta = 0, double max_theta = CV_PI,
+        bool use_edgeval = false
+)
+{
+    std::vector<Vec3f> lines_acc;
+    HoughLines(image, lines_acc, rho, theta, threshold, srn, stn, min_theta, max_theta, use_edgeval);
+    Mat(lines_acc).copyTo(lines);
+}
+
+/** @brief Finds circles in a grayscale image using the Hough transform and get accumulator.
+ *
+ * @note This function is for bindings use only. Use original function in C++ code
+ *
+ * @sa HoughCircles
+ */
+CV_WRAP static inline
+void HoughCirclesWithAccumulator(
+        InputArray image, OutputArray circles,
+        int method, double dp, double minDist,
+        double param1 = 100, double param2 = 100,
+        int minRadius = 0, int maxRadius = 0
+)
+{
+    std::vector<Vec4f> circles_acc;
+    HoughCircles(image, circles_acc, method, dp, minDist, param1, param2, minRadius, maxRadius);
+    Mat(1, static_cast<int>(circles_acc.size()), CV_32FC4, &circles_acc.front()).copyTo(circles);
+}
+
+}  // namespace
+
+#endif  // OPENCV_IMGPROC_BINDINGS_HPP
diff --git a/3rdParty/opencv2/imgproc/detail/gcgraph.hpp b/3rdParty/opencv-4.12.0/opencv2/imgproc/detail/gcgraph.hpp
similarity index 100%
rename from 3rdParty/opencv2/imgproc/detail/gcgraph.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/imgproc/detail/gcgraph.hpp
diff --git a/3rdParty/opencv-4.12.0/opencv2/imgproc/detail/legacy.hpp b/3rdParty/opencv-4.12.0/opencv2/imgproc/detail/legacy.hpp
new file mode 100644
index 0000000000..9917c8f0f2
--- /dev/null
+++ b/3rdParty/opencv-4.12.0/opencv2/imgproc/detail/legacy.hpp
@@ -0,0 +1,38 @@
+// This file is part of OpenCV project.
+// It is subject to the license terms in the LICENSE file found in the top-level directory
+// of this distribution and at http://opencv.org/license.html
+
+#ifndef OPENCV_IMGPROC_DETAIL_LEGACY_HPP
+#define OPENCV_IMGPROC_DETAIL_LEGACY_HPP
+
+#include "opencv2/imgproc.hpp"
+
+namespace cv {
+
+#ifdef __OPENCV_BUILD
+
+CV_EXPORTS void findContours_legacy(InputArray _image,
+                                    OutputArrayOfArrays _contours,
+                                    OutputArray _hierarchy,
+                                    int mode,
+                                    int method,
+                                    Point offset = Point());
+CV_EXPORTS void findContours_legacy(InputArray image,
+                                    OutputArrayOfArrays contours,
+                                    int mode,
+                                    int method,
+                                    Point offset = Point());
+
+CV_EXPORTS float EMD_legacy( InputArray _signature1, InputArray _signature2,
+               int distType, InputArray _cost,
+               float* lowerBound, OutputArray _flow );
+
+CV_EXPORTS float wrapperEMD_legacy(InputArray _signature1, InputArray _signature2,
+               int distType, InputArray _cost,
+               Ptr<float> lowerBound, OutputArray _flow);
+
+#endif
+
+}  // namespace cv
+
+#endif  // OPENCV_IMGPROC_DETAIL_LEGACY_HPP
diff --git a/3rdParty/opencv-4.12.0/opencv2/imgproc/hal/hal.hpp b/3rdParty/opencv-4.12.0/opencv2/imgproc/hal/hal.hpp
new file mode 100644
index 0000000000..814b19ea7e
--- /dev/null
+++ b/3rdParty/opencv-4.12.0/opencv2/imgproc/hal/hal.hpp
@@ -0,0 +1,269 @@
+#ifndef CV_IMGPROC_HAL_HPP
+#define CV_IMGPROC_HAL_HPP
+
+#include "opencv2/core/cvdef.h"
+#include "opencv2/core/cvstd.hpp"
+#include "opencv2/core/utility.hpp"
+#include "opencv2/core/hal/interface.h"
+
+namespace cv { namespace hal {
+
+//! @addtogroup imgproc_hal_functions
+//! @{
+
+//---------------------------
+//! @cond IGNORED
+
+struct CV_EXPORTS Filter2D
+{
+    CV_DEPRECATED static Ptr<hal::Filter2D> create(uchar * , size_t , int ,
+                                     int , int ,
+                                     int , int ,
+                                     int , int ,
+                                     int , double ,
+                                     int , int ,
+                                     bool , bool );
+    virtual void apply(uchar * , size_t ,
+                       uchar * , size_t ,
+                       int , int ,
+                       int , int ,
+                       int , int ) = 0;
+    virtual ~Filter2D() {}
+};
+
+struct CV_EXPORTS SepFilter2D
+{
+    CV_DEPRECATED static Ptr<hal::SepFilter2D> create(int , int , int ,
+                                        uchar * , int ,
+                                        uchar * , int ,
+                                        int , int ,
+                                        double , int );
+    virtual void apply(uchar * , size_t ,
+                       uchar * , size_t ,
+                       int , int ,
+                       int , int ,
+                       int , int ) = 0;
+    virtual ~SepFilter2D() {}
+};
+
+
+struct CV_EXPORTS Morph
+{
+    CV_DEPRECATED static Ptr<hal::Morph> create(int , int , int , int , int ,
+                                    int , uchar * , size_t ,
+                                    int , int ,
+                                    int , int ,
+                                    int , const double *,
+                                    int , bool , bool );
+    virtual void apply(uchar * , size_t , uchar * , size_t , int , int ,
+                       int , int , int , int ,
+                       int , int , int , int ) = 0;
+    virtual ~Morph() {}
+};
+
+//! @endcond
+//---------------------------
+
+CV_EXPORTS void filter2D(int stype, int dtype, int kernel_type,
+                         uchar * src_data, size_t src_step,
+                         uchar * dst_data, size_t dst_step,
+                         int width, int height,
+                         int full_width, int full_height,
+                         int offset_x, int offset_y,
+                         uchar * kernel_data, size_t kernel_step,
+                         int kernel_width, int kernel_height,
+                         int anchor_x, int anchor_y,
+                         double delta, int borderType,
+                         bool isSubmatrix);
+
+CV_EXPORTS void sepFilter2D(int stype, int dtype, int ktype,
+                            uchar * src_data, size_t src_step,
+                            uchar * dst_data, size_t dst_step,
+                            int width, int height,
+                            int full_width, int full_height,
+                            int offset_x, int offset_y,
+                            uchar * kernelx_data, int kernelx_len,
+                            uchar * kernely_data, int kernely_len,
+                            int anchor_x, int anchor_y,
+                            double delta, int borderType);
+
+CV_EXPORTS void morph(int op, int src_type, int dst_type,
+                      uchar * src_data, size_t src_step,
+                      uchar * dst_data, size_t dst_step,
+                      int width, int height,
+                      int roi_width, int roi_height, int roi_x, int roi_y,
+                      int roi_width2, int roi_height2, int roi_x2, int roi_y2,
+                      int kernel_type, uchar * kernel_data, size_t kernel_step,
+                      int kernel_width, int kernel_height, int anchor_x, int anchor_y,
+                      int borderType, const double borderValue[4],
+                      int iterations, bool isSubmatrix);
+
+
+CV_EXPORTS void resize(int src_type,
+                       const uchar * src_data, size_t src_step, int src_width, int src_height,
+                       uchar * dst_data, size_t dst_step, int dst_width, int dst_height,
+                       double inv_scale_x, double inv_scale_y, int interpolation);
+
+CV_EXPORTS void warpAffine(int src_type,
+                           const uchar * src_data, size_t src_step, int src_width, int src_height,
+                           uchar * dst_data, size_t dst_step, int dst_width, int dst_height,
+                           const double M[6], int interpolation, int borderType, const double borderValue[4]);
+
+CV_EXPORTS void warpAffineBlocklineNN(int *adelta, int *bdelta, short* xy, int X0, int Y0, int bw);
+
+CV_EXPORTS void warpAffineBlockline(int *adelta, int *bdelta, short* xy, short* alpha, int X0, int Y0, int bw);
+
+CV_EXPORTS void warpPerspective(int src_type,
+                               const uchar * src_data, size_t src_step, int src_width, int src_height,
+                               uchar * dst_data, size_t dst_step, int dst_width, int dst_height,
+                               const double M[9], int interpolation, int borderType, const double borderValue[4]);
+
+CV_EXPORTS void warpPerspectiveBlocklineNN(const double *M, short* xy, double X0, double Y0, double W0, int bw);
+
+CV_EXPORTS void warpPerspectiveBlockline(const double *M, short* xy, short* alpha, double X0, double Y0, double W0, int bw);
+
+CV_EXPORTS void cvtBGRtoBGR(const uchar * src_data, size_t src_step,
+                            uchar * dst_data, size_t dst_step,
+                            int width, int height,
+                            int depth, int scn, int dcn, bool swapBlue);
+
+CV_EXPORTS void cvtBGRtoBGR5x5(const uchar * src_data, size_t src_step,
+                               uchar * dst_data, size_t dst_step,
+                               int width, int height,
+                               int scn, bool swapBlue, int greenBits);
+
+CV_EXPORTS void cvtBGR5x5toBGR(const uchar * src_data, size_t src_step,
+                               uchar * dst_data, size_t dst_step,
+                               int width, int height,
+                               int dcn, bool swapBlue, int greenBits);
+
+CV_EXPORTS void cvtBGRtoGray(const uchar * src_data, size_t src_step,
+                             uchar * dst_data, size_t dst_step,
+                             int width, int height,
+                             int depth, int scn, bool swapBlue);
+
+CV_EXPORTS void cvtGraytoBGR(const uchar * src_data, size_t src_step,
+                             uchar * dst_data, size_t dst_step,
+                             int width, int height,
+                             int depth, int dcn);
+
+CV_EXPORTS void cvtBGR5x5toGray(const uchar * src_data, size_t src_step,
+                                uchar * dst_data, size_t dst_step,
+                                int width, int height,
+                                int greenBits);
+
+CV_EXPORTS void cvtGraytoBGR5x5(const uchar * src_data, size_t src_step,
+                                uchar * dst_data, size_t dst_step,
+                                int width, int height,
+                                int greenBits);
+CV_EXPORTS void cvtBGRtoYUV(const uchar * src_data, size_t src_step,
+                            uchar * dst_data, size_t dst_step,
+                            int width, int height,
+                            int depth, int scn, bool swapBlue, bool isCbCr,
+                            AlgorithmHint hint = ALGO_HINT_DEFAULT);
+
+CV_EXPORTS void cvtYUVtoBGR(const uchar * src_data, size_t src_step,
+                            uchar * dst_data, size_t dst_step,
+                            int width, int height,
+                            int depth, int dcn, bool swapBlue, bool isCbCr,
+                            AlgorithmHint hint = ALGO_HINT_DEFAULT);
+
+CV_EXPORTS void cvtBGRtoXYZ(const uchar * src_data, size_t src_step,
+                            uchar * dst_data, size_t dst_step,
+                            int width, int height,
+                            int depth, int scn, bool swapBlue);
+
+CV_EXPORTS void cvtXYZtoBGR(const uchar * src_data, size_t src_step,
+                            uchar * dst_data, size_t dst_step,
+                            int width, int height,
+                            int depth, int dcn, bool swapBlue);
+
+CV_EXPORTS void cvtBGRtoHSV(const uchar * src_data, size_t src_step,
+                            uchar * dst_data, size_t dst_step,
+                            int width, int height,
+                            int depth, int scn, bool swapBlue, bool isFullRange, bool isHSV);
+
+CV_EXPORTS void cvtHSVtoBGR(const uchar * src_data, size_t src_step,
+                            uchar * dst_data, size_t dst_step,
+                            int width, int height,
+                            int depth, int dcn, bool swapBlue, bool isFullRange, bool isHSV);
+
+CV_EXPORTS void cvtBGRtoLab(const uchar * src_data, size_t src_step,
+                            uchar * dst_data, size_t dst_step,
+                            int width, int height,
+                            int depth, int scn, bool swapBlue, bool isLab, bool srgb);
+
+CV_EXPORTS void cvtLabtoBGR(const uchar * src_data, size_t src_step,
+                            uchar * dst_data, size_t dst_step,
+                            int width, int height,
+                            int depth, int dcn, bool swapBlue, bool isLab, bool srgb);
+
+CV_EXPORTS void cvtTwoPlaneYUVtoBGR(const uchar * src_data, size_t src_step,
+                                    uchar * dst_data, size_t dst_step,
+                                    int dst_width, int dst_height,
+                                    int dcn, bool swapBlue, int uIdx,
+                                    AlgorithmHint hint = ALGO_HINT_DEFAULT);
+
+//! Separate Y and UV planes
+CV_EXPORTS void cvtTwoPlaneYUVtoBGR(const uchar * y_data, const uchar * uv_data, size_t src_step,
+                                    uchar * dst_data, size_t dst_step,
+                                    int dst_width, int dst_height,
+                                    int dcn, bool swapBlue, int uIdx,
+                                    AlgorithmHint hint = ALGO_HINT_DEFAULT);
+
+CV_EXPORTS void cvtTwoPlaneYUVtoBGR(const uchar * y_data, size_t y_step, const uchar * uv_data, size_t uv_step,
+                                    uchar * dst_data, size_t dst_step,
+                                    int dst_width, int dst_height,
+                                    int dcn, bool swapBlue, int uIdx,
+                                    AlgorithmHint hint = ALGO_HINT_DEFAULT);
+
+CV_EXPORTS void cvtThreePlaneYUVtoBGR(const uchar * src_data, size_t src_step,
+                                      uchar * dst_data, size_t dst_step,
+                                      int dst_width, int dst_height,
+                                      int dcn, bool swapBlue, int uIdx,
+                                      AlgorithmHint hint = ALGO_HINT_DEFAULT);
+
+CV_EXPORTS void cvtBGRtoThreePlaneYUV(const uchar * src_data, size_t src_step,
+                                      uchar * dst_data, size_t dst_step,
+                                      int width, int height,
+                                      int scn, bool swapBlue, int uIdx,
+                                      AlgorithmHint hint = ALGO_HINT_DEFAULT);
+
+//! Separate Y and UV planes
+CV_EXPORTS void cvtBGRtoTwoPlaneYUV(const uchar * src_data, size_t src_step,
+                                    uchar * y_data, uchar * uv_data, size_t dst_step,
+                                    int width, int height,
+                                    int scn, bool swapBlue, int uIdx);
+
+CV_EXPORTS void cvtOnePlaneYUVtoBGR(const uchar * src_data, size_t src_step,
+                                    uchar * dst_data, size_t dst_step,
+                                    int width, int height,
+                                    int dcn, bool swapBlue, int uIdx, int ycn,
+                                    AlgorithmHint hint = ALGO_HINT_DEFAULT);
+
+CV_EXPORTS void cvtOnePlaneBGRtoYUV(const uchar * src_data, size_t src_step,
+                                    uchar * dst_data, size_t dst_step,
+                                    int width, int height,
+                                    int scn, bool swapBlue, int uIdx, int ycn,
+                                    AlgorithmHint hint = ALGO_HINT_DEFAULT);
+
+CV_EXPORTS void cvtRGBAtoMultipliedRGBA(const uchar * src_data, size_t src_step,
+                                        uchar * dst_data, size_t dst_step,
+                                        int width, int height);
+
+CV_EXPORTS void cvtMultipliedRGBAtoRGBA(const uchar * src_data, size_t src_step,
+                                        uchar * dst_data, size_t dst_step,
+                                        int width, int height);
+
+CV_EXPORTS void integral(int depth, int sdepth, int sqdepth,
+                         const uchar* src, size_t srcstep,
+                         uchar* sum, size_t sumstep,
+                         uchar* sqsum, size_t sqsumstep,
+                         uchar* tilted, size_t tstep,
+                         int width, int height, int cn);
+
+//! @}
+
+}}
+
+#endif // CV_IMGPROC_HAL_HPP
diff --git a/3rdParty/opencv2/imgproc/hal/interface.h b/3rdParty/opencv-4.12.0/opencv2/imgproc/hal/interface.h
similarity index 79%
rename from 3rdParty/opencv2/imgproc/hal/interface.h
rename to 3rdParty/opencv-4.12.0/opencv2/imgproc/hal/interface.h
index ddd7bb5681..29773aa34d 100644
--- a/3rdParty/opencv2/imgproc/hal/interface.h
+++ b/3rdParty/opencv-4.12.0/opencv2/imgproc/hal/interface.h
@@ -12,6 +12,12 @@
 #define CV_HAL_INTER_CUBIC 2
 #define CV_HAL_INTER_AREA 3
 #define CV_HAL_INTER_LANCZOS4 4
+#define CV_HAL_INTER_LINEAR_EXACT 5
+#define CV_HAL_INTER_NEAREST_EXACT 6
+#define CV_HAL_INTER_MAX 7
+#define CV_HAL_WARP_FILL_OUTLIERS 8
+#define CV_HAL_WARP_INVERSE_MAP 16
+#define CV_HAL_WARP_RELATIVE_MAP 32
 //! @}
 
 //! @name Morphology operations
diff --git a/3rdParty/opencv2/imgproc/imgproc.hpp b/3rdParty/opencv-4.12.0/opencv2/imgproc/imgproc.hpp
similarity index 100%
rename from 3rdParty/opencv2/imgproc/imgproc.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/imgproc/imgproc.hpp
diff --git a/3rdParty/opencv2/imgproc/imgproc_c.h b/3rdParty/opencv-4.12.0/opencv2/imgproc/imgproc_c.h
similarity index 96%
rename from 3rdParty/opencv2/imgproc/imgproc_c.h
rename to 3rdParty/opencv-4.12.0/opencv2/imgproc/imgproc_c.h
index 43918839ae..1dbb6d7059 100644
--- a/3rdParty/opencv2/imgproc/imgproc_c.h
+++ b/3rdParty/opencv-4.12.0/opencv2/imgproc/imgproc_c.h
@@ -209,13 +209,17 @@ CVAPI(void)  cvCvtColor( const CvArr* src, CvArr* dst, int code );
 CVAPI(void)  cvResize( const CvArr* src, CvArr* dst,
                        int interpolation CV_DEFAULT( CV_INTER_LINEAR ));
 
+#ifdef _MSC_VER
+#pragma warning( push )
+#pragma warning( disable: 5054 )
+#endif
 /** @brief Warps image with affine transform
 @note ::cvGetQuadrangleSubPix is similar to ::cvWarpAffine, but the outliers are extrapolated using
 replication border mode.
 @see cv::warpAffine
 */
 CVAPI(void)  cvWarpAffine( const CvArr* src, CvArr* dst, const CvMat* map_matrix,
-                           int flags CV_DEFAULT(CV_INTER_LINEAR+CV_WARP_FILL_OUTLIERS),
+                           int flags CV_DEFAULT(+CV_INTER_LINEAR+CV_WARP_FILL_OUTLIERS),
                            CvScalar fillval CV_DEFAULT(cvScalarAll(0)) );
 
 /** @brief Computes affine transform matrix for mapping src[i] to dst[i] (i=0,1,2)
@@ -235,7 +239,7 @@ CVAPI(CvMat*)  cv2DRotationMatrix( CvPoint2D32f center, double angle,
 @see cv::warpPerspective
 */
 CVAPI(void)  cvWarpPerspective( const CvArr* src, CvArr* dst, const CvMat* map_matrix,
-                                int flags CV_DEFAULT(CV_INTER_LINEAR+CV_WARP_FILL_OUTLIERS),
+                                int flags CV_DEFAULT(+CV_INTER_LINEAR+CV_WARP_FILL_OUTLIERS),
                                 CvScalar fillval CV_DEFAULT(cvScalarAll(0)) );
 
 /** @brief Computes perspective transform matrix for mapping src[i] to dst[i] (i=0,1,2,3)
@@ -250,7 +254,7 @@ CVAPI(CvMat*) cvGetPerspectiveTransform( const CvPoint2D32f* src,
 */
 CVAPI(void)  cvRemap( const CvArr* src, CvArr* dst,
                       const CvArr* mapx, const CvArr* mapy,
-                      int flags CV_DEFAULT(CV_INTER_LINEAR+CV_WARP_FILL_OUTLIERS),
+                      int flags CV_DEFAULT(+CV_INTER_LINEAR+CV_WARP_FILL_OUTLIERS),
                       CvScalar fillval CV_DEFAULT(cvScalarAll(0)) );
 
 /** @brief Converts mapx & mapy from floating-point to integer formats for cvRemap
@@ -264,14 +268,18 @@ CVAPI(void)  cvConvertMaps( const CvArr* mapx, const CvArr* mapy,
 */
 CVAPI(void)  cvLogPolar( const CvArr* src, CvArr* dst,
                          CvPoint2D32f center, double M,
-                         int flags CV_DEFAULT(CV_INTER_LINEAR+CV_WARP_FILL_OUTLIERS));
+                         int flags CV_DEFAULT(+CV_INTER_LINEAR+CV_WARP_FILL_OUTLIERS));
 
 /** Performs forward or inverse linear-polar image transform
 @see cv::warpPolar
 */
 CVAPI(void)  cvLinearPolar( const CvArr* src, CvArr* dst,
                          CvPoint2D32f center, double maxRadius,
-                         int flags CV_DEFAULT(CV_INTER_LINEAR+CV_WARP_FILL_OUTLIERS));
+                         int flags CV_DEFAULT(+CV_INTER_LINEAR+CV_WARP_FILL_OUTLIERS));
+
+#ifdef _MSC_VER
+#pragma warning( pop )
+#endif
 
 /** @brief Returns a structuring element of the specified size and shape for morphological operations.
 
diff --git a/3rdParty/opencv2/imgproc/segmentation.hpp b/3rdParty/opencv-4.12.0/opencv2/imgproc/segmentation.hpp
similarity index 95%
rename from 3rdParty/opencv2/imgproc/segmentation.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/imgproc/segmentation.hpp
index ad62a1b71a..916b0e3bbc 100644
--- a/3rdParty/opencv2/imgproc/segmentation.hpp
+++ b/3rdParty/opencv-4.12.0/opencv2/imgproc/segmentation.hpp
@@ -121,7 +121,7 @@ class CV_EXPORTS_W_SIMPLE IntelligentScissorsMB
      *
      * @param targetPt The target point
      * @param[out] contour The list of pixels which contains optimal path between the source and the target points of the image. Type is CV_32SC2 (compatible with `std::vector<Point>`)
-     * @param backward Flag to indicate reverse order of retrived pixels (use "true" value to fetch points from the target to the source point)
+     * @param backward Flag to indicate reverse order of retrieved pixels (use "true" value to fetch points from the target to the source point)
      */
     CV_WRAP void getContour(const Point& targetPt, OutputArray contour, bool backward = false) const;
 
diff --git a/3rdParty/opencv-4.12.0/opencv2/imgproc/types_c.h b/3rdParty/opencv-4.12.0/opencv2/imgproc/types_c.h
new file mode 100644
index 0000000000..873f4b1d24
--- /dev/null
+++ b/3rdParty/opencv-4.12.0/opencv2/imgproc/types_c.h
@@ -0,0 +1,663 @@
+/*M///////////////////////////////////////////////////////////////////////////////////////
+//
+//  IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
+//
+//  By downloading, copying, installing or using the software you agree to this license.
+//  If you do not agree to this license, do not download, install,
+//  copy or use the software.
+//
+//
+//                           License Agreement
+//                For Open Source Computer Vision Library
+//
+// Copyright (C) 2000-2008, Intel Corporation, all rights reserved.
+// Copyright (C) 2009, Willow Garage Inc., all rights reserved.
+// Third party copyrights are property of their respective owners.
+//
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
+//
+//   * Redistribution's of source code must retain the above copyright notice,
+//     this list of conditions and the following disclaimer.
+//
+//   * Redistribution's in binary form must reproduce the above copyright notice,
+//     this list of conditions and the following disclaimer in the documentation
+//     and/or other materials provided with the distribution.
+//
+//   * The name of the copyright holders may not be used to endorse or promote products
+//     derived from this software without specific prior written permission.
+//
+// This software is provided by the copyright holders and contributors "as is" and
+// any express or implied warranties, including, but not limited to, the implied
+// warranties of merchantability and fitness for a particular purpose are disclaimed.
+// In no event shall the Intel Corporation or contributors be liable for any direct,
+// indirect, incidental, special, exemplary, or consequential damages
+// (including, but not limited to, procurement of substitute goods or services;
+// loss of use, data, or profits; or business interruption) however caused
+// and on any theory of liability, whether in contract, strict liability,
+// or tort (including negligence or otherwise) arising in any way out of
+// the use of this software, even if advised of the possibility of such damage.
+//
+//M*/
+
+#ifndef OPENCV_IMGPROC_TYPES_C_H
+#define OPENCV_IMGPROC_TYPES_C_H
+
+#include "opencv2/core/core_c.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** @addtogroup imgproc_c
+  @{
+*/
+
+/** Connected component structure */
+typedef struct CvConnectedComp
+{
+    double area;    /**<area of the connected component  */
+    CvScalar value; /**<average color of the connected component */
+    CvRect rect;    /**<ROI of the component  */
+    CvSeq* contour; /**<optional component boundary
+                      (the contour might have child contours corresponding to the holes)*/
+}
+CvConnectedComp;
+
+/** Image smooth methods */
+enum SmoothMethod_c
+{
+    /** linear convolution with \f$\texttt{size1}\times\texttt{size2}\f$ box kernel (all 1's). If
+    you want to smooth different pixels with different-size box kernels, you can use the integral
+    image that is computed using integral */
+    CV_BLUR_NO_SCALE =0,
+    /** linear convolution with \f$\texttt{size1}\times\texttt{size2}\f$ box kernel (all
+    1's) with subsequent scaling by \f$1/(\texttt{size1}\cdot\texttt{size2})\f$ */
+    CV_BLUR  =1,
+    /** linear convolution with a \f$\texttt{size1}\times\texttt{size2}\f$ Gaussian kernel */
+    CV_GAUSSIAN  =2,
+    /** median filter with a \f$\texttt{size1}\times\texttt{size1}\f$ square aperture */
+    CV_MEDIAN =3,
+    /** bilateral filter with a \f$\texttt{size1}\times\texttt{size1}\f$ square aperture, color
+    sigma= sigma1 and spatial sigma= sigma2. If size1=0, the aperture square side is set to
+    cvRound(sigma2\*1.5)\*2+1. See cv::bilateralFilter */
+    CV_BILATERAL =4
+};
+
+/** Filters used in pyramid decomposition */
+enum
+{
+    CV_GAUSSIAN_5x5 = 7
+};
+
+/** Special filters */
+enum
+{
+    CV_SCHARR =-1,
+    CV_MAX_SOBEL_KSIZE =7
+};
+
+/** Constants for color conversion */
+enum
+{
+    CV_BGR2BGRA    =0,
+    CV_RGB2RGBA    =CV_BGR2BGRA,
+
+    CV_BGRA2BGR    =1,
+    CV_RGBA2RGB    =CV_BGRA2BGR,
+
+    CV_BGR2RGBA    =2,
+    CV_RGB2BGRA    =CV_BGR2RGBA,
+
+    CV_RGBA2BGR    =3,
+    CV_BGRA2RGB    =CV_RGBA2BGR,
+
+    CV_BGR2RGB     =4,
+    CV_RGB2BGR     =CV_BGR2RGB,
+
+    CV_BGRA2RGBA   =5,
+    CV_RGBA2BGRA   =CV_BGRA2RGBA,
+
+    CV_BGR2GRAY    =6,
+    CV_RGB2GRAY    =7,
+    CV_GRAY2BGR    =8,
+    CV_GRAY2RGB    =CV_GRAY2BGR,
+    CV_GRAY2BGRA   =9,
+    CV_GRAY2RGBA   =CV_GRAY2BGRA,
+    CV_BGRA2GRAY   =10,
+    CV_RGBA2GRAY   =11,
+
+    CV_BGR2BGR565  =12,
+    CV_RGB2BGR565  =13,
+    CV_BGR5652BGR  =14,
+    CV_BGR5652RGB  =15,
+    CV_BGRA2BGR565 =16,
+    CV_RGBA2BGR565 =17,
+    CV_BGR5652BGRA =18,
+    CV_BGR5652RGBA =19,
+
+    CV_GRAY2BGR565 =20,
+    CV_BGR5652GRAY =21,
+
+    CV_BGR2BGR555  =22,
+    CV_RGB2BGR555  =23,
+    CV_BGR5552BGR  =24,
+    CV_BGR5552RGB  =25,
+    CV_BGRA2BGR555 =26,
+    CV_RGBA2BGR555 =27,
+    CV_BGR5552BGRA =28,
+    CV_BGR5552RGBA =29,
+
+    CV_GRAY2BGR555 =30,
+    CV_BGR5552GRAY =31,
+
+    CV_BGR2XYZ     =32,
+    CV_RGB2XYZ     =33,
+    CV_XYZ2BGR     =34,
+    CV_XYZ2RGB     =35,
+
+    CV_BGR2YCrCb   =36,
+    CV_RGB2YCrCb   =37,
+    CV_YCrCb2BGR   =38,
+    CV_YCrCb2RGB   =39,
+
+    CV_BGR2HSV     =40,
+    CV_RGB2HSV     =41,
+
+    CV_BGR2Lab     =44,
+    CV_RGB2Lab     =45,
+
+    CV_BayerBG2BGR =46,
+    CV_BayerGB2BGR =47,
+    CV_BayerRG2BGR =48,
+    CV_BayerGR2BGR =49,
+
+    CV_BayerBG2RGB =CV_BayerRG2BGR,
+    CV_BayerGB2RGB =CV_BayerGR2BGR,
+    CV_BayerRG2RGB =CV_BayerBG2BGR,
+    CV_BayerGR2RGB =CV_BayerGB2BGR,
+
+    CV_BGR2Luv     =50,
+    CV_RGB2Luv     =51,
+    CV_BGR2HLS     =52,
+    CV_RGB2HLS     =53,
+
+    CV_HSV2BGR     =54,
+    CV_HSV2RGB     =55,
+
+    CV_Lab2BGR     =56,
+    CV_Lab2RGB     =57,
+    CV_Luv2BGR     =58,
+    CV_Luv2RGB     =59,
+    CV_HLS2BGR     =60,
+    CV_HLS2RGB     =61,
+
+    CV_BayerBG2BGR_VNG =62,
+    CV_BayerGB2BGR_VNG =63,
+    CV_BayerRG2BGR_VNG =64,
+    CV_BayerGR2BGR_VNG =65,
+
+    CV_BayerBG2RGB_VNG =CV_BayerRG2BGR_VNG,
+    CV_BayerGB2RGB_VNG =CV_BayerGR2BGR_VNG,
+    CV_BayerRG2RGB_VNG =CV_BayerBG2BGR_VNG,
+    CV_BayerGR2RGB_VNG =CV_BayerGB2BGR_VNG,
+
+    CV_BGR2HSV_FULL = 66,
+    CV_RGB2HSV_FULL = 67,
+    CV_BGR2HLS_FULL = 68,
+    CV_RGB2HLS_FULL = 69,
+
+    CV_HSV2BGR_FULL = 70,
+    CV_HSV2RGB_FULL = 71,
+    CV_HLS2BGR_FULL = 72,
+    CV_HLS2RGB_FULL = 73,
+
+    CV_LBGR2Lab     = 74,
+    CV_LRGB2Lab     = 75,
+    CV_LBGR2Luv     = 76,
+    CV_LRGB2Luv     = 77,
+
+    CV_Lab2LBGR     = 78,
+    CV_Lab2LRGB     = 79,
+    CV_Luv2LBGR     = 80,
+    CV_Luv2LRGB     = 81,
+
+    CV_BGR2YUV      = 82,
+    CV_RGB2YUV      = 83,
+    CV_YUV2BGR      = 84,
+    CV_YUV2RGB      = 85,
+
+    CV_BayerBG2GRAY = 86,
+    CV_BayerGB2GRAY = 87,
+    CV_BayerRG2GRAY = 88,
+    CV_BayerGR2GRAY = 89,
+
+    //YUV 4:2:0 formats family
+    CV_YUV2RGB_NV12 = 90,
+    CV_YUV2BGR_NV12 = 91,
+    CV_YUV2RGB_NV21 = 92,
+    CV_YUV2BGR_NV21 = 93,
+    CV_YUV420sp2RGB = CV_YUV2RGB_NV21,
+    CV_YUV420sp2BGR = CV_YUV2BGR_NV21,
+
+    CV_YUV2RGBA_NV12 = 94,
+    CV_YUV2BGRA_NV12 = 95,
+    CV_YUV2RGBA_NV21 = 96,
+    CV_YUV2BGRA_NV21 = 97,
+    CV_YUV420sp2RGBA = CV_YUV2RGBA_NV21,
+    CV_YUV420sp2BGRA = CV_YUV2BGRA_NV21,
+
+    CV_YUV2RGB_YV12 = 98,
+    CV_YUV2BGR_YV12 = 99,
+    CV_YUV2RGB_IYUV = 100,
+    CV_YUV2BGR_IYUV = 101,
+    CV_YUV2RGB_I420 = CV_YUV2RGB_IYUV,
+    CV_YUV2BGR_I420 = CV_YUV2BGR_IYUV,
+    CV_YUV420p2RGB = CV_YUV2RGB_YV12,
+    CV_YUV420p2BGR = CV_YUV2BGR_YV12,
+
+    CV_YUV2RGBA_YV12 = 102,
+    CV_YUV2BGRA_YV12 = 103,
+    CV_YUV2RGBA_IYUV = 104,
+    CV_YUV2BGRA_IYUV = 105,
+    CV_YUV2RGBA_I420 = CV_YUV2RGBA_IYUV,
+    CV_YUV2BGRA_I420 = CV_YUV2BGRA_IYUV,
+    CV_YUV420p2RGBA = CV_YUV2RGBA_YV12,
+    CV_YUV420p2BGRA = CV_YUV2BGRA_YV12,
+
+    CV_YUV2GRAY_420 = 106,
+    CV_YUV2GRAY_NV21 = CV_YUV2GRAY_420,
+    CV_YUV2GRAY_NV12 = CV_YUV2GRAY_420,
+    CV_YUV2GRAY_YV12 = CV_YUV2GRAY_420,
+    CV_YUV2GRAY_IYUV = CV_YUV2GRAY_420,
+    CV_YUV2GRAY_I420 = CV_YUV2GRAY_420,
+    CV_YUV420sp2GRAY = CV_YUV2GRAY_420,
+    CV_YUV420p2GRAY = CV_YUV2GRAY_420,
+
+    //YUV 4:2:2 formats family
+    CV_YUV2RGB_UYVY = 107,
+    CV_YUV2BGR_UYVY = 108,
+    //CV_YUV2RGB_VYUY = 109,
+    //CV_YUV2BGR_VYUY = 110,
+    CV_YUV2RGB_Y422 = CV_YUV2RGB_UYVY,
+    CV_YUV2BGR_Y422 = CV_YUV2BGR_UYVY,
+    CV_YUV2RGB_UYNV = CV_YUV2RGB_UYVY,
+    CV_YUV2BGR_UYNV = CV_YUV2BGR_UYVY,
+
+    CV_YUV2RGBA_UYVY = 111,
+    CV_YUV2BGRA_UYVY = 112,
+    //CV_YUV2RGBA_VYUY = 113,
+    //CV_YUV2BGRA_VYUY = 114,
+    CV_YUV2RGBA_Y422 = CV_YUV2RGBA_UYVY,
+    CV_YUV2BGRA_Y422 = CV_YUV2BGRA_UYVY,
+    CV_YUV2RGBA_UYNV = CV_YUV2RGBA_UYVY,
+    CV_YUV2BGRA_UYNV = CV_YUV2BGRA_UYVY,
+
+    CV_YUV2RGB_YUY2 = 115,
+    CV_YUV2BGR_YUY2 = 116,
+    CV_YUV2RGB_YVYU = 117,
+    CV_YUV2BGR_YVYU = 118,
+    CV_YUV2RGB_YUYV = CV_YUV2RGB_YUY2,
+    CV_YUV2BGR_YUYV = CV_YUV2BGR_YUY2,
+    CV_YUV2RGB_YUNV = CV_YUV2RGB_YUY2,
+    CV_YUV2BGR_YUNV = CV_YUV2BGR_YUY2,
+
+    CV_YUV2RGBA_YUY2 = 119,
+    CV_YUV2BGRA_YUY2 = 120,
+    CV_YUV2RGBA_YVYU = 121,
+    CV_YUV2BGRA_YVYU = 122,
+    CV_YUV2RGBA_YUYV = CV_YUV2RGBA_YUY2,
+    CV_YUV2BGRA_YUYV = CV_YUV2BGRA_YUY2,
+    CV_YUV2RGBA_YUNV = CV_YUV2RGBA_YUY2,
+    CV_YUV2BGRA_YUNV = CV_YUV2BGRA_YUY2,
+
+    CV_YUV2GRAY_UYVY = 123,
+    CV_YUV2GRAY_YUY2 = 124,
+    //CV_YUV2GRAY_VYUY = CV_YUV2GRAY_UYVY,
+    CV_YUV2GRAY_Y422 = CV_YUV2GRAY_UYVY,
+    CV_YUV2GRAY_UYNV = CV_YUV2GRAY_UYVY,
+    CV_YUV2GRAY_YVYU = CV_YUV2GRAY_YUY2,
+    CV_YUV2GRAY_YUYV = CV_YUV2GRAY_YUY2,
+    CV_YUV2GRAY_YUNV = CV_YUV2GRAY_YUY2,
+
+    // alpha premultiplication
+    CV_RGBA2mRGBA = 125,
+    CV_mRGBA2RGBA = 126,
+
+    CV_RGB2YUV_I420 = 127,
+    CV_BGR2YUV_I420 = 128,
+    CV_RGB2YUV_IYUV = CV_RGB2YUV_I420,
+    CV_BGR2YUV_IYUV = CV_BGR2YUV_I420,
+
+    CV_RGBA2YUV_I420 = 129,
+    CV_BGRA2YUV_I420 = 130,
+    CV_RGBA2YUV_IYUV = CV_RGBA2YUV_I420,
+    CV_BGRA2YUV_IYUV = CV_BGRA2YUV_I420,
+    CV_RGB2YUV_YV12  = 131,
+    CV_BGR2YUV_YV12  = 132,
+    CV_RGBA2YUV_YV12 = 133,
+    CV_BGRA2YUV_YV12 = 134,
+
+    // Edge-Aware Demosaicing
+    CV_BayerBG2BGR_EA = 135,
+    CV_BayerGB2BGR_EA = 136,
+    CV_BayerRG2BGR_EA = 137,
+    CV_BayerGR2BGR_EA = 138,
+
+    CV_BayerBG2RGB_EA = CV_BayerRG2BGR_EA,
+    CV_BayerGB2RGB_EA = CV_BayerGR2BGR_EA,
+    CV_BayerRG2RGB_EA = CV_BayerBG2BGR_EA,
+    CV_BayerGR2RGB_EA = CV_BayerGB2BGR_EA,
+
+    CV_BayerBG2BGRA =139,
+    CV_BayerGB2BGRA =140,
+    CV_BayerRG2BGRA =141,
+    CV_BayerGR2BGRA =142,
+
+    CV_BayerBG2RGBA =CV_BayerRG2BGRA,
+    CV_BayerGB2RGBA =CV_BayerGR2BGRA,
+    CV_BayerRG2RGBA =CV_BayerBG2BGRA,
+    CV_BayerGR2RGBA =CV_BayerGB2BGRA,
+
+    CV_COLORCVT_MAX  = 143
+};
+
+
+/** Sub-pixel interpolation methods */
+enum
+{
+    CV_INTER_NN        =0,
+    CV_INTER_LINEAR    =1,
+    CV_INTER_CUBIC     =2,
+    CV_INTER_AREA      =3,
+    CV_INTER_LANCZOS4  =4
+};
+
+/** ... and other image warping flags */
+enum
+{
+    CV_WARP_FILL_OUTLIERS = 8,
+    CV_WARP_INVERSE_MAP   = 16,
+    CV_WARP_RELATIVE_MAP  = 32
+};
+
+/** Shapes of a structuring element for morphological operations
+@see cv::MorphShapes, cv::getStructuringElement
+*/
+enum MorphShapes_c
+{
+    CV_SHAPE_RECT      =0,
+    CV_SHAPE_CROSS     =1,
+    CV_SHAPE_ELLIPSE   =2,
+    CV_SHAPE_DIAMOND   =3,
+    CV_SHAPE_CUSTOM    =100 //!< custom structuring element
+};
+
+/** Morphological operations */
+enum
+{
+    CV_MOP_ERODE        =0,
+    CV_MOP_DILATE       =1,
+    CV_MOP_OPEN         =2,
+    CV_MOP_CLOSE        =3,
+    CV_MOP_GRADIENT     =4,
+    CV_MOP_TOPHAT       =5,
+    CV_MOP_BLACKHAT     =6
+};
+
+/** Spatial and central moments */
+typedef struct CvMoments
+{
+    double  m00, m10, m01, m20, m11, m02, m30, m21, m12, m03; /**< spatial moments */
+    double  mu20, mu11, mu02, mu30, mu21, mu12, mu03; /**< central moments */
+    double  inv_sqrt_m00; /**< m00 != 0 ? 1/sqrt(m00) : 0 */
+
+#if defined(CV__ENABLE_C_API_CTORS) && defined(__cplusplus)
+    CvMoments(){}
+    CvMoments(const cv::Moments& m)
+    {
+        m00 = m.m00; m10 = m.m10; m01 = m.m01;
+        m20 = m.m20; m11 = m.m11; m02 = m.m02;
+        m30 = m.m30; m21 = m.m21; m12 = m.m12; m03 = m.m03;
+        mu20 = m.mu20; mu11 = m.mu11; mu02 = m.mu02;
+        mu30 = m.mu30; mu21 = m.mu21; mu12 = m.mu12; mu03 = m.mu03;
+        double am00 = std::abs(m.m00);
+        inv_sqrt_m00 = am00 > DBL_EPSILON ? 1./std::sqrt(am00) : 0;
+    }
+    operator cv::Moments() const
+    {
+        return cv::Moments(m00, m10, m01, m20, m11, m02, m30, m21, m12, m03);
+    }
+#endif
+}
+CvMoments;
+
+#ifdef __cplusplus
+} // extern "C"
+
+CV_INLINE CvMoments cvMoments()
+{
+#if !defined(CV__ENABLE_C_API_CTORS)
+    CvMoments self = CV_STRUCT_INITIALIZER; return self;
+#else
+    return CvMoments();
+#endif
+}
+
+CV_INLINE CvMoments cvMoments(const cv::Moments& m)
+{
+#if !defined(CV__ENABLE_C_API_CTORS)
+    double am00 = std::abs(m.m00);
+    CvMoments self = {
+        m.m00, m.m10, m.m01, m.m20, m.m11, m.m02, m.m30, m.m21, m.m12, m.m03,
+        m.mu20, m.mu11, m.mu02, m.mu30, m.mu21, m.mu12, m.mu03,
+        am00 > DBL_EPSILON ? 1./std::sqrt(am00) : 0
+    };
+    return self;
+#else
+    return CvMoments(m);
+#endif
+}
+
+extern "C" {
+#endif // __cplusplus
+
+/** Hu invariants */
+typedef struct CvHuMoments
+{
+    double hu1, hu2, hu3, hu4, hu5, hu6, hu7; /**< Hu invariants */
+}
+CvHuMoments;
+
+/** Template matching methods */
+enum
+{
+    CV_TM_SQDIFF        =0,
+    CV_TM_SQDIFF_NORMED =1,
+    CV_TM_CCORR         =2,
+    CV_TM_CCORR_NORMED  =3,
+    CV_TM_CCOEFF        =4,
+    CV_TM_CCOEFF_NORMED =5
+};
+
+typedef float (CV_CDECL * CvDistanceFunction)( const float* a, const float* b, void* user_param );
+
+/** Contour retrieval modes */
+enum
+{
+    CV_RETR_EXTERNAL=0,
+    CV_RETR_LIST=1,
+    CV_RETR_CCOMP=2,
+    CV_RETR_TREE=3,
+    CV_RETR_FLOODFILL=4
+};
+
+/** Contour approximation methods */
+enum
+{
+    CV_CHAIN_CODE=0,
+    CV_CHAIN_APPROX_NONE=1,
+    CV_CHAIN_APPROX_SIMPLE=2,
+    CV_CHAIN_APPROX_TC89_L1=3,
+    CV_CHAIN_APPROX_TC89_KCOS=4,
+    CV_LINK_RUNS=5
+};
+
+/*
+Internal structure that is used for sequential retrieving contours from the image.
+It supports both hierarchical and plane variants of Suzuki algorithm.
+*/
+typedef struct _CvContourScanner* CvContourScanner;
+
+/** Freeman chain reader state */
+typedef struct CvChainPtReader
+{
+    CV_SEQ_READER_FIELDS()
+    char      code;
+    CvPoint   pt;
+    schar     deltas[8][2];
+}
+CvChainPtReader;
+
+/** initializes 8-element array for fast access to 3x3 neighborhood of a pixel */
+#define  CV_INIT_3X3_DELTAS( deltas, step, nch )            \
+    ((deltas)[0] =  (nch),  (deltas)[1] = -(step) + (nch),  \
+     (deltas)[2] = -(step), (deltas)[3] = -(step) - (nch),  \
+     (deltas)[4] = -(nch),  (deltas)[5] =  (step) - (nch),  \
+     (deltas)[6] =  (step), (deltas)[7] =  (step) + (nch))
+
+
+/** Contour approximation algorithms */
+enum
+{
+    CV_POLY_APPROX_DP = 0
+};
+
+/** Shape matching methods */
+enum
+{
+    CV_CONTOURS_MATCH_I1  =1, //!< \f[I_1(A,B) =  \sum _{i=1...7}  \left |  \frac{1}{m^A_i} -  \frac{1}{m^B_i} \right |\f]
+    CV_CONTOURS_MATCH_I2  =2, //!< \f[I_2(A,B) =  \sum _{i=1...7}  \left | m^A_i - m^B_i  \right |\f]
+    CV_CONTOURS_MATCH_I3  =3  //!< \f[I_3(A,B) =  \max _{i=1...7}  \frac{ \left| m^A_i - m^B_i \right| }{ \left| m^A_i \right| }\f]
+};
+
+/** Shape orientation */
+enum
+{
+    CV_CLOCKWISE         =1,
+    CV_COUNTER_CLOCKWISE =2
+};
+
+
+/** Convexity defect */
+typedef struct CvConvexityDefect
+{
+    CvPoint* start; /**< point of the contour where the defect begins */
+    CvPoint* end; /**< point of the contour where the defect ends */
+    CvPoint* depth_point; /**< the farthest from the convex hull point within the defect */
+    float depth; /**< distance between the farthest point and the convex hull */
+} CvConvexityDefect;
+
+
+/** Histogram comparison methods */
+enum
+{
+    CV_COMP_CORREL        =0,
+    CV_COMP_CHISQR        =1,
+    CV_COMP_INTERSECT     =2,
+    CV_COMP_BHATTACHARYYA =3,
+    CV_COMP_HELLINGER     =CV_COMP_BHATTACHARYYA,
+    CV_COMP_CHISQR_ALT    =4,
+    CV_COMP_KL_DIV        =5
+};
+
+/** Mask size for distance transform */
+enum
+{
+    CV_DIST_MASK_3   =3,
+    CV_DIST_MASK_5   =5,
+    CV_DIST_MASK_PRECISE =0
+};
+
+/** Content of output label array: connected components or pixels */
+enum
+{
+  CV_DIST_LABEL_CCOMP = 0,
+  CV_DIST_LABEL_PIXEL = 1
+};
+
+/** Distance types for Distance Transform and M-estimators */
+enum
+{
+    CV_DIST_USER    =-1,  /**< User defined distance */
+    CV_DIST_L1      =1,   /**< distance = |x1-x2| + |y1-y2| */
+    CV_DIST_L2      =2,   /**< the simple euclidean distance */
+    CV_DIST_C       =3,   /**< distance = max(|x1-x2|,|y1-y2|) */
+    CV_DIST_L12     =4,   /**< L1-L2 metric: distance = 2(sqrt(1+x*x/2) - 1)) */
+    CV_DIST_FAIR    =5,   /**< distance = c^2(|x|/c-log(1+|x|/c)), c = 1.3998 */
+    CV_DIST_WELSCH  =6,   /**< distance = c^2/2(1-exp(-(x/c)^2)), c = 2.9846 */
+    CV_DIST_HUBER   =7    /**< distance = |x|<c ? x^2/2 : c(|x|-c/2), c=1.345 */
+};
+
+
+/** Threshold types */
+enum
+{
+    CV_THRESH_BINARY      =0,  /**< value = value > threshold ? max_value : 0       */
+    CV_THRESH_BINARY_INV  =1,  /**< value = value > threshold ? 0 : max_value       */
+    CV_THRESH_TRUNC       =2,  /**< value = value > threshold ? threshold : value   */
+    CV_THRESH_TOZERO      =3,  /**< value = value > threshold ? value : 0           */
+    CV_THRESH_TOZERO_INV  =4,  /**< value = value > threshold ? 0 : value           */
+    CV_THRESH_MASK        =7,
+    CV_THRESH_OTSU        =8, /**< use Otsu algorithm to choose the optimal threshold value;
+                                 combine the flag with one of the above CV_THRESH_* values */
+    CV_THRESH_TRIANGLE    =16,  /**< use Triangle algorithm to choose the optimal threshold value;
+                                 combine the flag with one of the above CV_THRESH_* values, but not
+                                 with CV_THRESH_OTSU */
+    CV_THRESH_DRYRUN      =128 /**< compute threshold only (useful for OTSU/TRIANGLE) but does not
+                                  actually run thresholding */
+};
+
+/** Adaptive threshold methods */
+enum
+{
+    CV_ADAPTIVE_THRESH_MEAN_C  =0,
+    CV_ADAPTIVE_THRESH_GAUSSIAN_C  =1
+};
+
+/** FloodFill flags */
+enum
+{
+    CV_FLOODFILL_FIXED_RANGE =(1 << 16),
+    CV_FLOODFILL_MASK_ONLY   =(1 << 17)
+};
+
+
+/** Canny edge detector flags */
+enum
+{
+    CV_CANNY_L2_GRADIENT  =(1 << 31)
+};
+
+/** Variants of a Hough transform */
+enum
+{
+    CV_HOUGH_STANDARD =0,
+    CV_HOUGH_PROBABILISTIC =1,
+    CV_HOUGH_MULTI_SCALE =2,
+    CV_HOUGH_GRADIENT =3
+};
+
+
+/* Fast search data structures  */
+struct CvFeatureTree;
+struct CvLSH;
+struct CvLSHOperations;
+
+/** @} */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/3rdParty/opencv2/ml.hpp b/3rdParty/opencv-4.12.0/opencv2/ml.hpp
similarity index 97%
rename from 3rdParty/opencv2/ml.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/ml.hpp
index 4e62c98dcc..e7a339809a 100644
--- a/3rdParty/opencv2/ml.hpp
+++ b/3rdParty/opencv-4.12.0/opencv2/ml.hpp
@@ -256,7 +256,7 @@ class CV_EXPORTS_W TrainData
 
     @param filename The input file name
     @param headerLineCount The number of lines in the beginning to skip; besides the header, the
-        function also skips empty lines and lines staring with `#`
+        function also skips empty lines and lines starting with `#`
     @param responseStartIdx Index of the first output variable. If -1, the function considers the
         last variable as the response
     @param responseEndIdx Index of the last output variable + 1. If -1, then there is single
diff --git a/3rdParty/opencv2/ml/ml.hpp b/3rdParty/opencv-4.12.0/opencv2/ml/ml.hpp
similarity index 100%
rename from 3rdParty/opencv2/ml/ml.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/ml/ml.hpp
diff --git a/3rdParty/opencv2/ml/ml.inl.hpp b/3rdParty/opencv-4.12.0/opencv2/ml/ml.inl.hpp
similarity index 100%
rename from 3rdParty/opencv2/ml/ml.inl.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/ml/ml.inl.hpp
diff --git a/3rdParty/opencv2/objdetect.hpp b/3rdParty/opencv-4.12.0/opencv2/objdetect.hpp
similarity index 77%
rename from 3rdParty/opencv2/objdetect.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/objdetect.hpp
index af43e430ae..4081ffa5a9 100644
--- a/3rdParty/opencv2/objdetect.hpp
+++ b/3rdParty/opencv-4.12.0/opencv2/objdetect.hpp
@@ -45,6 +45,8 @@
 #define OPENCV_OBJDETECT_HPP
 
 #include "opencv2/core.hpp"
+#include "opencv2/objdetect/aruco_detector.hpp"
+#include "opencv2/objdetect/graphical_code_detector.hpp"
 
 /**
 @defgroup objdetect Object Detection
@@ -52,59 +54,82 @@
 @{
     @defgroup objdetect_cascade_classifier Cascade Classifier for Object Detection
 
-The object detector described below has been initially proposed by Paul Viola @cite Viola01 and
-improved by Rainer Lienhart @cite Lienhart02 .
-
-First, a classifier (namely a *cascade of boosted classifiers working with haar-like features*) is
-trained with a few hundred sample views of a particular object (i.e., a face or a car), called
-positive examples, that are scaled to the same size (say, 20x20), and negative examples - arbitrary
-images of the same size.
-
-After a classifier is trained, it can be applied to a region of interest (of the same size as used
-during the training) in an input image. The classifier outputs a "1" if the region is likely to show
-the object (i.e., face/car), and "0" otherwise. To search for the object in the whole image one can
-move the search window across the image and check every location using the classifier. The
-classifier is designed so that it can be easily "resized" in order to be able to find the objects of
-interest at different sizes, which is more efficient than resizing the image itself. So, to find an
-object of an unknown size in the image the scan procedure should be done several times at different
-scales.
-
-The word "cascade" in the classifier name means that the resultant classifier consists of several
-simpler classifiers (*stages*) that are applied subsequently to a region of interest until at some
-stage the candidate is rejected or all the stages are passed. The word "boosted" means that the
-classifiers at every stage of the cascade are complex themselves and they are built out of basic
-classifiers using one of four different boosting techniques (weighted voting). Currently Discrete
-Adaboost, Real Adaboost, Gentle Adaboost and Logitboost are supported. The basic classifiers are
-decision-tree classifiers with at least 2 leaves. Haar-like features are the input to the basic
-classifiers, and are calculated as described below. The current algorithm uses the following
-Haar-like features:
-
-![image](pics/haarfeatures.png)
-
-The feature used in a particular classifier is specified by its shape (1a, 2b etc.), position within
-the region of interest and the scale (this scale is not the same as the scale used at the detection
-stage, though these two scales are multiplied). For example, in the case of the third line feature
-(2c) the response is calculated as the difference between the sum of image pixels under the
-rectangle covering the whole feature (including the two white stripes and the black stripe in the
-middle) and the sum of the image pixels under the black stripe multiplied by 3 in order to
-compensate for the differences in the size of areas. The sums of pixel values over a rectangular
-regions are calculated rapidly using integral images (see below and the integral description).
-
-Check @ref tutorial_cascade_classifier "the corresponding tutorial" for more details.
-
-The following reference is for the detection part only. There is a separate application called
-opencv_traincascade that can train a cascade of boosted classifiers from a set of samples.
-
-@note In the new C++ interface it is also possible to use LBP (local binary pattern) features in
-addition to Haar-like features. .. [Viola01] Paul Viola and Michael J. Jones. Rapid Object Detection
-using a Boosted Cascade of Simple Features. IEEE CVPR, 2001. The paper is available online at
-<https://github.com/SvHey/thesis/blob/master/Literature/ObjectDetection/violaJones_CVPR2001.pdf>
+    The object detector described below has been initially proposed by Paul Viola @cite Viola01 and
+    improved by Rainer Lienhart @cite Lienhart02 .
+
+    First, a classifier (namely a *cascade of boosted classifiers working with haar-like features*) is
+    trained with a few hundred sample views of a particular object (i.e., a face or a car), called
+    positive examples, that are scaled to the same size (say, 20x20), and negative examples - arbitrary
+    images of the same size.
+
+    After a classifier is trained, it can be applied to a region of interest (of the same size as used
+    during the training) in an input image. The classifier outputs a "1" if the region is likely to show
+    the object (i.e., face/car), and "0" otherwise. To search for the object in the whole image one can
+    move the search window across the image and check every location using the classifier. The
+    classifier is designed so that it can be easily "resized" in order to be able to find the objects of
+    interest at different sizes, which is more efficient than resizing the image itself. So, to find an
+    object of an unknown size in the image the scan procedure should be done several times at different
+    scales.
+
+    The word "cascade" in the classifier name means that the resultant classifier consists of several
+    simpler classifiers (*stages*) that are applied subsequently to a region of interest until at some
+    stage the candidate is rejected or all the stages are passed. The word "boosted" means that the
+    classifiers at every stage of the cascade are complex themselves and they are built out of basic
+    classifiers using one of four different boosting techniques (weighted voting). Currently Discrete
+    Adaboost, Real Adaboost, Gentle Adaboost and Logitboost are supported. The basic classifiers are
+    decision-tree classifiers with at least 2 leaves. Haar-like features are the input to the basic
+    classifiers, and are calculated as described below. The current algorithm uses the following
+    Haar-like features:
+
+    ![image](pics/haarfeatures.png)
+
+    The feature used in a particular classifier is specified by its shape (1a, 2b etc.), position within
+    the region of interest and the scale (this scale is not the same as the scale used at the detection
+    stage, though these two scales are multiplied). For example, in the case of the third line feature
+    (2c) the response is calculated as the difference between the sum of image pixels under the
+    rectangle covering the whole feature (including the two white stripes and the black stripe in the
+    middle) and the sum of the image pixels under the black stripe multiplied by 3 in order to
+    compensate for the differences in the size of areas. The sums of pixel values over a rectangular
+    regions are calculated rapidly using integral images (see below and the integral description).
+
+    Check @ref tutorial_cascade_classifier "the corresponding tutorial" for more details.
+
+    The following reference is for the detection part only. There is a separate application called
+    opencv_traincascade that can train a cascade of boosted classifiers from a set of samples.
+
+    @note In the new C++ interface it is also possible to use LBP (local binary pattern) features in
+    addition to Haar-like features. .. [Viola01] Paul Viola and Michael J. Jones. Rapid Object Detection
+    using a Boosted Cascade of Simple Features. IEEE CVPR, 2001. The paper is available online at
+    <https://github.com/SvHey/thesis/blob/master/Literature/ObjectDetection/violaJones_CVPR2001.pdf>
 
     @defgroup objdetect_hog HOG (Histogram of Oriented Gradients) descriptor and object detector
+    @defgroup objdetect_barcode Barcode detection and decoding
     @defgroup objdetect_qrcode QRCode detection and encoding
     @defgroup objdetect_dnn_face DNN-based face detection and recognition
-Check @ref tutorial_dnn_face "the corresponding tutorial" for more details.
+
+    Check @ref tutorial_dnn_face "the corresponding tutorial" for more details.
+
     @defgroup objdetect_common Common functions and classes
+    @defgroup objdetect_aruco ArUco markers and boards detection for robust camera pose estimation
+    @{
+        ArUco Marker Detection
+        Square fiducial markers (also known as Augmented Reality Markers) are useful for easy,
+        fast and robust camera pose estimation.
+
+        The main functionality of ArucoDetector class is detection of markers in an image. If the markers are grouped
+        as a board, then you can try to recover the missing markers with ArucoDetector::refineDetectedMarkers().
+        ArUco markers can also be used for advanced chessboard corner finding. To do this, group the markers in the
+        CharucoBoard and find the corners of the chessboard with the CharucoDetector::detectBoard().
+
+        The implementation is based on the ArUco Library by R. Muñoz-Salinas and S. Garrido-Jurado @cite Aruco2014.
+
+        Markers can also be detected based on the AprilTag 2 @cite wang2016iros fiducial detection method.
+
+        @sa @cite Aruco2014
+        This code has been originally developed by Sergio Garrido-Jurado as a project
+        for Google Summer of Code 2015 (GSoC 15).
+    @}
+
 @}
  */
 
@@ -704,22 +729,25 @@ class CV_EXPORTS_W QRCodeEncoder {
     };
 
     enum ECIEncodings {
-        ECI_UTF8 = 26
+        ECI_SHIFT_JIS = 20,
+        ECI_UTF8 = 26,
     };
 
-    /** @brief QR code encoder parameters.
-     @param version The optional version of QR code (by default - maximum possible depending on
-                    the length of the string).
-     @param correction_level The optional level of error correction (by default - the lowest).
-     @param mode The optional encoding mode - Numeric, Alphanumeric, Byte, Kanji, ECI or Structured Append.
-     @param structure_number The optional number of QR codes to generate in Structured Append mode.
-    */
+    /** @brief QR code encoder parameters. */
     struct CV_EXPORTS_W_SIMPLE Params
     {
         CV_WRAP Params();
+
+        //! The optional version of QR code (by default - maximum possible depending on the length of the string).
         CV_PROP_RW int version;
-        CV_PROP_RW CorrectionLevel correction_level;
-        CV_PROP_RW EncodeMode mode;
+
+        //! The optional level of error correction (by default - the lowest).
+        CV_PROP_RW QRCodeEncoder::CorrectionLevel correction_level;
+
+        //! The optional encoding mode - Numeric, Alphanumeric, Byte, Kanji, ECI or Structured Append.
+        CV_PROP_RW QRCodeEncoder::EncodeMode mode;
+
+        //! The optional number of QR codes to generate in Structured Append mode.
         CV_PROP_RW int structure_number;
     };
 
@@ -742,38 +770,27 @@ class CV_EXPORTS_W QRCodeEncoder {
     CV_WRAP virtual void encodeStructuredAppend(const String& encoded_info, OutputArrayOfArrays qrcodes) = 0;
 
 };
-
-class CV_EXPORTS_W QRCodeDetector
+class CV_EXPORTS_W_SIMPLE QRCodeDetector : public GraphicalCodeDetector
 {
 public:
     CV_WRAP QRCodeDetector();
-    ~QRCodeDetector();
 
     /** @brief sets the epsilon used during the horizontal scan of QR code stop marker detection.
      @param epsX Epsilon neighborhood, which allows you to determine the horizontal pattern
      of the scheme 1:1:3:1:1 according to QR code standard.
     */
-    CV_WRAP void setEpsX(double epsX);
+    CV_WRAP QRCodeDetector& setEpsX(double epsX);
     /** @brief sets the epsilon used during the vertical scan of QR code stop marker detection.
      @param epsY Epsilon neighborhood, which allows you to determine the vertical pattern
      of the scheme 1:1:3:1:1 according to QR code standard.
      */
-    CV_WRAP void setEpsY(double epsY);
-
-    /** @brief Detects QR code in image and returns the quadrangle containing the code.
-     @param img grayscale or color (BGR) image containing (or not) QR code.
-     @param points Output vector of vertices of the minimum-area quadrangle containing the code.
-     */
-    CV_WRAP bool detect(InputArray img, OutputArray points) const;
+    CV_WRAP QRCodeDetector& setEpsY(double epsY);
 
-    /** @brief Decodes QR code in image once it's found by the detect() method.
-
-     Returns UTF8-encoded output string or empty string if the code cannot be decoded.
-     @param img grayscale or color (BGR) image containing QR code.
-     @param points Quadrangle vertices found by detect() method (or some other algorithm).
-     @param straight_qrcode The optional output image containing rectified and binarized QR code
+    /** @brief use markers to improve the position of the corners of the QR code
+     *
+     * alignmentMarkers using by default
      */
-    CV_WRAP std::string decode(InputArray img, InputArray points, OutputArray straight_qrcode = noArray());
+    CV_WRAP QRCodeDetector& setUseAlignmentMarkers(bool useAlignmentMarkers);
 
     /** @brief Decodes QR code on a curved surface in image once it's found by the detect() method.
 
@@ -784,15 +801,6 @@ class CV_EXPORTS_W QRCodeDetector
      */
     CV_WRAP cv::String decodeCurved(InputArray img, InputArray points, OutputArray straight_qrcode = noArray());
 
-    /** @brief Both detects and decodes QR code
-
-     @param img grayscale or color (BGR) image containing QR code.
-     @param points optional output array of vertices of the found QR code quadrangle. Will be empty if not found.
-     @param straight_qrcode The optional output image containing rectified and binarized QR code
-     */
-    CV_WRAP std::string detectAndDecode(InputArray img, OutputArray points=noArray(),
-                                        OutputArray straight_qrcode = noArray());
-
     /** @brief Both detects and decodes QR code on a curved surface
 
      @param img grayscale or color (BGR) image containing QR code.
@@ -802,42 +810,64 @@ class CV_EXPORTS_W QRCodeDetector
     CV_WRAP std::string detectAndDecodeCurved(InputArray img, OutputArray points=noArray(),
                                               OutputArray straight_qrcode = noArray());
 
-    /** @brief Detects QR codes in image and returns the vector of the quadrangles containing the codes.
-     @param img grayscale or color (BGR) image containing (or not) QR codes.
-     @param points Output vector of vector of vertices of the minimum-area quadrangle containing the codes.
-     */
-    CV_WRAP
-    bool detectMulti(InputArray img, OutputArray points) const;
-
-    /** @brief Decodes QR codes in image once it's found by the detect() method.
-     @param img grayscale or color (BGR) image containing QR codes.
-     @param decoded_info UTF8-encoded output vector of string or empty vector of string if the codes cannot be decoded.
-     @param points vector of Quadrangle vertices found by detect() method (or some other algorithm).
-     @param straight_qrcode The optional output vector of images containing rectified and binarized QR codes
-     */
-    CV_WRAP
-    bool decodeMulti(
-            InputArray img, InputArray points,
-            CV_OUT std::vector<std::string>& decoded_info,
-            OutputArrayOfArrays straight_qrcode = noArray()
-    ) const;
-
-    /** @brief Both detects and decodes QR codes
-    @param img grayscale or color (BGR) image containing QR codes.
-    @param decoded_info UTF8-encoded output vector of string or empty vector of string if the codes cannot be decoded.
-    @param points optional output vector of vertices of the found QR code quadrangles. Will be empty if not found.
-    @param straight_qrcode The optional output vector of images containing rectified and binarized QR codes
-    */
-    CV_WRAP
-    bool detectAndDecodeMulti(
-            InputArray img, CV_OUT std::vector<std::string>& decoded_info,
-            OutputArray points = noArray(),
-            OutputArrayOfArrays straight_qrcode = noArray()
-    ) const;
+    /** @brief Returns a kind of encoding for the decoded info from the latest @ref decode or @ref detectAndDecode call
+    @param codeIdx an index of the previously decoded QR code.
+                   When @ref decode or @ref detectAndDecode is used, valid value is zero.
+                   For @ref decodeMulti or @ref detectAndDecodeMulti use indices corresponding to the output order.
+    */
+    CV_WRAP QRCodeEncoder::ECIEncodings getEncoding(int codeIdx = 0);
+};
 
-protected:
-    struct Impl;
-    Ptr<Impl> p;
+class CV_EXPORTS_W_SIMPLE QRCodeDetectorAruco : public GraphicalCodeDetector {
+public:
+    CV_WRAP QRCodeDetectorAruco();
+
+    struct CV_EXPORTS_W_SIMPLE Params {
+        CV_WRAP Params();
+
+        /** @brief The minimum allowed pixel size of a QR module in the smallest image in the image pyramid, default 4.f */
+        CV_PROP_RW float minModuleSizeInPyramid;
+
+        /** @brief The maximum allowed relative rotation for finder patterns in the same QR code, default pi/12 */
+        CV_PROP_RW float maxRotation;
+
+        /** @brief The maximum allowed relative mismatch in module sizes for finder patterns in the same QR code, default 1.75f */
+        CV_PROP_RW float maxModuleSizeMismatch;
+
+        /** @brief The maximum allowed module relative mismatch for timing pattern module, default 2.f
+         *
+         * If relative mismatch of timing pattern module more this value, penalty points will be added.
+         * If a lot of penalty points are added, QR code will be rejected. */
+        CV_PROP_RW float maxTimingPatternMismatch;
+
+        /** @brief The maximum allowed percentage of penalty points out of total pins in timing pattern, default 0.4f */
+        CV_PROP_RW float maxPenalties;
+
+        /** @brief The maximum allowed relative color mismatch in the timing pattern, default 0.2f*/
+        CV_PROP_RW float maxColorsMismatch;
+
+        /** @brief The algorithm find QR codes with almost minimum timing pattern score and minimum size, default 0.9f
+         *
+         * The QR code with the minimum "timing pattern score" and minimum "size" is selected as the best QR code.
+         * If for the current QR code "timing pattern score" * scaleTimingPatternScore < "previous timing pattern score" and "size" < "previous size", then
+         * current QR code set as the best QR code. */
+        CV_PROP_RW float scaleTimingPatternScore;
+    };
+
+    /** @brief QR code detector constructor for Aruco-based algorithm. See cv::QRCodeDetectorAruco::Params */
+    CV_WRAP explicit QRCodeDetectorAruco(const QRCodeDetectorAruco::Params& params);
+
+    /** @brief Detector parameters getter. See cv::QRCodeDetectorAruco::Params */
+    CV_WRAP const QRCodeDetectorAruco::Params& getDetectorParameters() const;
+
+    /** @brief Detector parameters setter. See cv::QRCodeDetectorAruco::Params */
+    CV_WRAP QRCodeDetectorAruco& setDetectorParameters(const QRCodeDetectorAruco::Params& params);
+
+    /** @brief Aruco detector parameters are used to search for the finder patterns. */
+    CV_WRAP const aruco::DetectorParameters& getArucoParameters() const;
+
+    /** @brief Aruco detector parameters are used to search for the finder patterns. */
+    CV_WRAP void setArucoParameters(const aruco::DetectorParameters& params);
 };
 
 //! @}
@@ -845,5 +875,7 @@ class CV_EXPORTS_W QRCodeDetector
 
 #include "opencv2/objdetect/detection_based_tracker.hpp"
 #include "opencv2/objdetect/face.hpp"
+#include "opencv2/objdetect/charuco_detector.hpp"
+#include "opencv2/objdetect/barcode.hpp"
 
 #endif
diff --git a/3rdParty/opencv-4.12.0/opencv2/objdetect/aruco_board.hpp b/3rdParty/opencv-4.12.0/opencv2/objdetect/aruco_board.hpp
new file mode 100644
index 0000000000..526a55e06c
--- /dev/null
+++ b/3rdParty/opencv-4.12.0/opencv2/objdetect/aruco_board.hpp
@@ -0,0 +1,199 @@
+// This file is part of OpenCV project.
+// It is subject to the license terms in the LICENSE file found in the top-level directory
+// of this distribution and at http://opencv.org/license.html
+#ifndef OPENCV_OBJDETECT_ARUCO_BOARD_HPP
+#define OPENCV_OBJDETECT_ARUCO_BOARD_HPP
+
+#include <opencv2/core.hpp>
+
+namespace cv {
+namespace aruco {
+//! @addtogroup objdetect_aruco
+//! @{
+
+class Dictionary;
+
+/** @brief Board of ArUco markers
+ *
+ * A board is a set of markers in the 3D space with a common coordinate system.
+ * The common form of a board of marker is a planar (2D) board, however any 3D layout can be used.
+ * A Board object is composed by:
+ * - The object points of the marker corners, i.e. their coordinates respect to the board system.
+ * - The dictionary which indicates the type of markers of the board
+ * - The identifier of all the markers in the board.
+ */
+class CV_EXPORTS_W_SIMPLE Board {
+public:
+    /** @brief Common Board constructor
+     *
+     * @param objPoints array of object points of all the marker corners in the board
+     * @param dictionary the dictionary of markers employed for this board
+     * @param ids vector of the identifiers of the markers in the board
+     */
+    CV_WRAP Board(InputArrayOfArrays objPoints, const Dictionary& dictionary, InputArray ids);
+
+    /** @brief return the Dictionary of markers employed for this board
+     */
+    CV_WRAP const Dictionary& getDictionary() const;
+
+    /** @brief return array of object points of all the marker corners in the board.
+     *
+     * Each marker include its 4 corners in this order:
+     * -   objPoints[i][0] - left-top point of i-th marker
+     * -   objPoints[i][1] - right-top point of i-th marker
+     * -   objPoints[i][2] - right-bottom point of i-th marker
+     * -   objPoints[i][3] - left-bottom point of i-th marker
+     *
+     * Markers are placed in a certain order - row by row, left to right in every row. For M markers, the size is Mx4.
+     */
+    CV_WRAP const std::vector<std::vector<Point3f> >& getObjPoints() const;
+
+    /** @brief vector of the identifiers of the markers in the board (should be the same size as objPoints)
+     * @return vector of the identifiers of the markers
+     */
+    CV_WRAP const std::vector<int>& getIds() const;
+
+    /** @brief get coordinate of the bottom right corner of the board, is set when calling the function create()
+     */
+    CV_WRAP const Point3f& getRightBottomCorner() const;
+
+    /** @brief Given a board configuration and a set of detected markers, returns the corresponding
+     * image points and object points, can be used in solvePnP()
+     *
+     * @param detectedCorners List of detected marker corners of the board.
+     * For cv::Board and cv::GridBoard the method expects std::vector<std::vector<Point2f>> or std::vector<Mat> with Aruco marker corners.
+     * For cv::CharucoBoard the method expects std::vector<Point2f> or Mat with ChAruco corners (chess board corners matched with Aruco markers).
+     *
+     * @param detectedIds List of identifiers for each marker or charuco corner.
+     * For any Board class the method expects std::vector<int> or Mat.
+     *
+     * @param objPoints Vector of marker points in the board coordinate space.
+     * For any Board class the method expects std::vector<cv::Point3f> objectPoints or cv::Mat
+     *
+     * @param imgPoints Vector of marker points in the image coordinate space.
+     * For any Board class the method expects std::vector<cv::Point2f> objectPoints or cv::Mat
+     *
+     * @sa solvePnP
+     */
+    CV_WRAP void matchImagePoints(InputArrayOfArrays detectedCorners, InputArray detectedIds,
+                                  OutputArray objPoints, OutputArray imgPoints) const;
+
+     /** @brief Draw a planar board
+     *
+     * @param outSize size of the output image in pixels.
+     * @param img output image with the board. The size of this image will be outSize
+     * and the board will be on the center, keeping the board proportions.
+     * @param marginSize minimum margins (in pixels) of the board in the output image
+     * @param borderBits width of the marker borders.
+     *
+     * This function return the image of the board, ready to be printed.
+     */
+    CV_WRAP void generateImage(Size outSize, OutputArray img, int marginSize = 0, int borderBits = 1) const;
+
+    CV_DEPRECATED_EXTERNAL  // avoid using in C++ code, will be moved to "protected" (need to fix bindings first)
+    Board();
+
+    struct Impl;
+protected:
+    Board(const Ptr<Impl>& impl);
+    Ptr<Impl> impl;
+};
+
+/** @brief Planar board with grid arrangement of markers
+ *
+ * More common type of board. All markers are placed in the same plane in a grid arrangement.
+ * The board image can be drawn using generateImage() method.
+ */
+class CV_EXPORTS_W_SIMPLE GridBoard : public Board {
+public:
+    /**
+     * @brief GridBoard constructor
+     *
+     * @param size number of markers in x and y directions
+     * @param markerLength marker side length (normally in meters)
+     * @param markerSeparation separation between two markers (same unit as markerLength)
+     * @param dictionary dictionary of markers indicating the type of markers
+     * @param ids set of marker ids in dictionary to use on board.
+     */
+    CV_WRAP GridBoard(const Size& size, float markerLength, float markerSeparation,
+                      const Dictionary &dictionary, InputArray ids = noArray());
+
+    CV_WRAP Size getGridSize() const;
+    CV_WRAP float getMarkerLength() const;
+    CV_WRAP float getMarkerSeparation() const;
+
+    CV_DEPRECATED_EXTERNAL  // avoid using in C++ code, will be moved to "protected" (need to fix bindings first)
+    GridBoard();
+};
+
+/**
+ * @brief ChArUco board is a planar chessboard where the markers are placed inside the white squares of a chessboard.
+ *
+ * The benefits of ChArUco boards is that they provide both, ArUco markers versatility and chessboard corner precision,
+ * which is important for calibration and pose estimation. The board image can be drawn using generateImage() method.
+ */
+class CV_EXPORTS_W_SIMPLE CharucoBoard : public Board {
+public:
+    /** @brief CharucoBoard constructor
+     *
+     * @param size number of chessboard squares in x and y directions
+     * @param squareLength squareLength chessboard square side length (normally in meters)
+     * @param markerLength marker side length (same unit than squareLength)
+     * @param dictionary dictionary of markers indicating the type of markers
+     * @param ids array of id used markers
+     * The first markers in the dictionary are used to fill the white chessboard squares.
+     */
+    CV_WRAP CharucoBoard(const Size& size, float squareLength, float markerLength,
+                         const Dictionary &dictionary, InputArray ids = noArray());
+
+    /** @brief set legacy chessboard pattern.
+     *
+     * Legacy setting creates chessboard patterns starting with a white box in the upper left corner
+     * if there is an even row count of chessboard boxes, otherwise it starts with a black box.
+     * This setting ensures compatibility to patterns created with OpenCV versions prior OpenCV 4.6.0.
+     * See https://github.com/opencv/opencv/issues/23152.
+     *
+     * Default value: false.
+     */
+    CV_WRAP void setLegacyPattern(bool legacyPattern);
+    CV_WRAP bool getLegacyPattern() const;
+
+    CV_WRAP Size getChessboardSize() const;
+    CV_WRAP float getSquareLength() const;
+    CV_WRAP float getMarkerLength() const;
+
+    /** @brief get CharucoBoard::chessboardCorners
+     */
+    CV_WRAP std::vector<Point3f> getChessboardCorners() const;
+
+    /** @brief get CharucoBoard::nearestMarkerIdx, for each charuco corner, nearest marker index in ids array
+     */
+    CV_PROP std::vector<std::vector<int> > getNearestMarkerIdx() const;
+
+    /** @brief get CharucoBoard::nearestMarkerCorners, for each charuco corner, nearest marker corner id of each marker
+     */
+    CV_PROP std::vector<std::vector<int> > getNearestMarkerCorners() const;
+
+    /** @brief check whether the ChArUco markers are collinear
+     *
+     * @param charucoIds list of identifiers for each corner in charucoCorners per frame.
+     * @return bool value, 1 (true) if detected corners form a line, 0 (false) if they do not.
+     * solvePnP, calibration functions will fail if the corners are collinear (true).
+     *
+     * The number of ids in charucoIDs should be <= the number of chessboard corners in the board.
+     * This functions checks whether the charuco corners are on a straight line (returns true, if so), or not (false).
+     * Axis parallel, as well as diagonal and other straight lines detected.  Degenerate cases:
+     * for number of charucoIDs <= 2,the function returns true.
+     */
+    CV_WRAP bool checkCharucoCornersCollinear(InputArray charucoIds) const;
+
+    CV_DEPRECATED_EXTERNAL  // avoid using in C++ code, will be moved to "protected" (need to fix bindings first)
+    CharucoBoard();
+};
+
+//! @}
+
+}
+}
+
+#endif
diff --git a/3rdParty/opencv-4.12.0/opencv2/objdetect/aruco_detector.hpp b/3rdParty/opencv-4.12.0/opencv2/objdetect/aruco_detector.hpp
new file mode 100644
index 0000000000..ad27e7921d
--- /dev/null
+++ b/3rdParty/opencv-4.12.0/opencv2/objdetect/aruco_detector.hpp
@@ -0,0 +1,462 @@
+// This file is part of OpenCV project.
+// It is subject to the license terms in the LICENSE file found in the top-level directory
+// of this distribution and at http://opencv.org/license.html
+#ifndef OPENCV_OBJDETECT_ARUCO_DETECTOR_HPP
+#define OPENCV_OBJDETECT_ARUCO_DETECTOR_HPP
+
+#include <opencv2/objdetect/aruco_dictionary.hpp>
+#include <opencv2/objdetect/aruco_board.hpp>
+
+namespace cv {
+namespace aruco {
+
+//! @addtogroup objdetect_aruco
+//! @{
+
+enum CornerRefineMethod{
+    CORNER_REFINE_NONE,     ///< Tag and corners detection based on the ArUco approach
+    CORNER_REFINE_SUBPIX,   ///< ArUco approach and refine the corners locations using corner subpixel accuracy
+    CORNER_REFINE_CONTOUR,  ///< ArUco approach and refine the corners locations using the contour-points line fitting
+    CORNER_REFINE_APRILTAG, ///< Tag and corners detection based on the AprilTag 2 approach @cite wang2016iros
+};
+
+/** @brief struct DetectorParameters is used by ArucoDetector
+ */
+struct CV_EXPORTS_W_SIMPLE DetectorParameters {
+    CV_WRAP DetectorParameters() {
+        adaptiveThreshWinSizeMin = 3;
+        adaptiveThreshWinSizeMax = 23;
+        adaptiveThreshWinSizeStep = 10;
+        adaptiveThreshConstant = 7;
+        minMarkerPerimeterRate = 0.03;
+        maxMarkerPerimeterRate = 4.;
+        polygonalApproxAccuracyRate = 0.03;
+        minCornerDistanceRate = 0.05;
+        minDistanceToBorder = 3;
+        minMarkerDistanceRate = 0.125;
+        cornerRefinementMethod = (int)CORNER_REFINE_NONE;
+        cornerRefinementWinSize = 5;
+        relativeCornerRefinmentWinSize = 0.3f;
+        cornerRefinementMaxIterations = 30;
+        cornerRefinementMinAccuracy = 0.1;
+        markerBorderBits = 1;
+        perspectiveRemovePixelPerCell = 4;
+        perspectiveRemoveIgnoredMarginPerCell = 0.13;
+        maxErroneousBitsInBorderRate = 0.35;
+        minOtsuStdDev = 5.0;
+        errorCorrectionRate = 0.6;
+        aprilTagQuadDecimate = 0.0;
+        aprilTagQuadSigma = 0.0;
+        aprilTagMinClusterPixels = 5;
+        aprilTagMaxNmaxima = 10;
+        aprilTagCriticalRad = (float)(10* CV_PI /180);
+        aprilTagMaxLineFitMse = 10.0;
+        aprilTagMinWhiteBlackDiff = 5;
+        aprilTagDeglitch = 0;
+        detectInvertedMarker = false;
+        useAruco3Detection = false;
+        minSideLengthCanonicalImg = 32;
+        minMarkerLengthRatioOriginalImg = 0.0;
+    }
+
+    /** @brief Read a new set of DetectorParameters from FileNode (use FileStorage.root()).
+     */
+    CV_WRAP bool readDetectorParameters(const FileNode& fn);
+
+    /** @brief Write a set of DetectorParameters to FileStorage
+     */
+    CV_WRAP bool writeDetectorParameters(FileStorage& fs, const String& name = String());
+
+    /// minimum window size for adaptive thresholding before finding contours (default 3).
+    CV_PROP_RW int adaptiveThreshWinSizeMin;
+
+    /// maximum window size for adaptive thresholding before finding contours (default 23).
+    CV_PROP_RW int adaptiveThreshWinSizeMax;
+
+    /// increments from adaptiveThreshWinSizeMin to adaptiveThreshWinSizeMax during the thresholding (default 10).
+    CV_PROP_RW int adaptiveThreshWinSizeStep;
+
+    /// constant for adaptive thresholding before finding contours (default 7)
+    CV_PROP_RW double adaptiveThreshConstant;
+
+    /** @brief determine minimum perimeter for marker contour to be detected.
+     *
+     * This is defined as a rate respect to the maximum dimension of the input image (default 0.03).
+     */
+    CV_PROP_RW double minMarkerPerimeterRate;
+
+    /** @brief determine maximum perimeter for marker contour to be detected.
+     *
+     * This is defined as a rate respect to the maximum dimension of the input image (default 4.0).
+     */
+    CV_PROP_RW double maxMarkerPerimeterRate;
+
+    /// minimum accuracy during the polygonal approximation process to determine which contours are squares. (default 0.03)
+    CV_PROP_RW double polygonalApproxAccuracyRate;
+
+    /// minimum distance between corners for detected markers relative to its perimeter (default 0.05)
+    CV_PROP_RW double minCornerDistanceRate;
+
+    /// minimum distance of any corner to the image border for detected markers (in pixels) (default 3)
+    CV_PROP_RW int minDistanceToBorder;
+
+    /** @brief minimum average distance between the corners of the two markers to be grouped (default 0.125).
+     *
+     * The rate is relative to the smaller perimeter of the two markers.
+     * Two markers are grouped if average distance between the corners of the two markers is less than
+     * min(MarkerPerimeter1, MarkerPerimeter2)*minMarkerDistanceRate.
+     *
+     * default value is 0.125 because 0.125*MarkerPerimeter = (MarkerPerimeter / 4) * 0.5 = half the side of the marker.
+     *
+     * @note default value was changed from 0.05 after 4.8.1 release, because the filtering algorithm has been changed.
+     * Now a few candidates from the same group can be added to the list of candidates if they are far from each other.
+     * @sa minGroupDistance.
+     */
+    CV_PROP_RW double minMarkerDistanceRate;
+
+    /** @brief minimum average distance between the corners of the two markers in group to add them to the list of candidates
+     *
+     * The average distance between the corners of the two markers is calculated relative to its module size (default 0.21).
+     */
+    CV_PROP_RW float minGroupDistance = 0.21f;
+
+    /** @brief default value CORNER_REFINE_NONE */
+    CV_PROP_RW int cornerRefinementMethod;
+
+    /** @brief maximum window size for the corner refinement process (in pixels) (default 5).
+     *
+     * The window size may decrease if the ArUco marker is too small, check relativeCornerRefinmentWinSize.
+     * The final window size is calculated as:
+     * min(cornerRefinementWinSize, averageArucoModuleSize*relativeCornerRefinmentWinSize),
+     * where averageArucoModuleSize is average module size of ArUco marker in pixels.
+     * (ArUco marker is composed of black and white modules)
+     */
+    CV_PROP_RW int cornerRefinementWinSize;
+
+    /** @brief Dynamic window size for corner refinement relative to Aruco module size (default 0.3).
+     *
+     * The final window size is calculated as:
+     * min(cornerRefinementWinSize, averageArucoModuleSize*relativeCornerRefinmentWinSize),
+     * where averageArucoModuleSize is average module size of ArUco marker in pixels.
+     * (ArUco marker is composed of black and white modules)
+     * In the case of markers located far from each other, it may be useful to increase the value of the parameter to 0.4-0.5.
+     * In the case of markers located close to each other, it may be useful to decrease the parameter value to 0.1-0.2.
+     */
+    CV_PROP_RW float relativeCornerRefinmentWinSize;
+
+    /// maximum number of iterations for stop criteria of the corner refinement process (default 30).
+    CV_PROP_RW int cornerRefinementMaxIterations;
+
+    /// minimum error for the stop cristeria of the corner refinement process (default: 0.1)
+    CV_PROP_RW double cornerRefinementMinAccuracy;
+
+    /// number of bits of the marker border, i.e. marker border width (default 1).
+    CV_PROP_RW int markerBorderBits;
+
+    /// number of bits (per dimension) for each cell of the marker when removing the perspective (default 4).
+    CV_PROP_RW int perspectiveRemovePixelPerCell;
+
+    /** @brief width of the margin of pixels on each cell not considered for the determination of the cell bit.
+     *
+     * Represents the rate respect to the total size of the cell, i.e. perspectiveRemovePixelPerCell (default 0.13)
+     */
+    CV_PROP_RW double perspectiveRemoveIgnoredMarginPerCell;
+
+    /** @brief  maximum number of accepted erroneous bits in the border (i.e. number of allowed white bits in the border).
+     *
+     * Represented as a rate respect to the total number of bits per marker (default 0.35).
+     */
+    CV_PROP_RW double maxErroneousBitsInBorderRate;
+
+    /** @brief minimun standard deviation in pixels values during the decodification step to apply Otsu
+     * thresholding (otherwise, all the bits are set to 0 or 1 depending on mean higher than 128 or not) (default 5.0)
+     */
+    CV_PROP_RW double minOtsuStdDev;
+
+    /// error correction rate respect to the maximun error correction capability for each dictionary (default 0.6).
+    CV_PROP_RW double errorCorrectionRate;
+
+    /** @brief April :: User-configurable parameters.
+     *
+     * Detection of quads can be done on a lower-resolution image, improving speed at a cost of
+     * pose accuracy and a slight decrease in detection rate. Decoding the binary payload is still
+     */
+    CV_PROP_RW float aprilTagQuadDecimate;
+
+    /// what Gaussian blur should be applied to the segmented image (used for quad detection?)
+    CV_PROP_RW float aprilTagQuadSigma;
+
+    // April :: Internal variables
+    /// reject quads containing too few pixels (default 5).
+    CV_PROP_RW int aprilTagMinClusterPixels;
+
+    /// how many corner candidates to consider when segmenting a group of pixels into a quad (default 10).
+    CV_PROP_RW int aprilTagMaxNmaxima;
+
+    /** @brief reject quads where pairs of edges have angles that are close to straight or close to 180 degrees.
+     *
+     * Zero means that no quads are rejected. (In radians) (default 10*PI/180)
+     */
+    CV_PROP_RW float aprilTagCriticalRad;
+
+    /// when fitting lines to the contours, what is the maximum mean squared error
+    CV_PROP_RW float aprilTagMaxLineFitMse;
+
+    /** @brief add an extra check that the white model must be (overall) brighter than the black model.
+     *
+     * When we build our model of black & white pixels, we add an extra check that the white model must be (overall)
+     * brighter than the black model. How much brighter? (in pixel values, [0,255]), (default 5)
+     */
+    CV_PROP_RW int aprilTagMinWhiteBlackDiff;
+
+    /// should the thresholded image be deglitched? Only useful for very noisy images (default 0).
+    CV_PROP_RW int aprilTagDeglitch;
+
+    /** @brief to check if there is a white marker.
+     *
+     * In order to generate a "white" marker just invert a normal marker by using a tilde, ~markerImage. (default false)
+     */
+    CV_PROP_RW bool detectInvertedMarker;
+
+    /** @brief enable the new and faster Aruco detection strategy.
+     *
+     * Proposed in the paper:
+     * Romero-Ramirez et al: Speeded up detection of squared fiducial markers (2018)
+     * https://www.researchgate.net/publication/325787310_Speeded_Up_Detection_of_Squared_Fiducial_Markers
+     */
+    CV_PROP_RW bool useAruco3Detection;
+
+    /// minimum side length of a marker in the canonical image. Latter is the binarized image in which contours are searched.
+    CV_PROP_RW int minSideLengthCanonicalImg;
+
+    /// range [0,1], eq (2) from paper. The parameter tau_i has a direct influence on the processing speed.
+    CV_PROP_RW float minMarkerLengthRatioOriginalImg;
+};
+
+/** @brief struct RefineParameters is used by ArucoDetector
+ */
+struct CV_EXPORTS_W_SIMPLE RefineParameters {
+    CV_WRAP RefineParameters(float minRepDistance = 10.f, float errorCorrectionRate = 3.f, bool checkAllOrders = true);
+
+
+    /** @brief Read a new set of RefineParameters from FileNode (use FileStorage.root()).
+     */
+    CV_WRAP bool readRefineParameters(const FileNode& fn);
+
+    /** @brief Write a set of RefineParameters to FileStorage
+     */
+    CV_WRAP bool writeRefineParameters(FileStorage& fs, const String& name = String());
+
+    /** @brief minRepDistance minimum distance between the corners of the rejected candidate and the reprojected marker
+    in order to consider it as a correspondence.
+     */
+    CV_PROP_RW float minRepDistance;
+
+    /** @brief errorCorrectionRate rate of allowed erroneous bits respect to the error correction capability of the used dictionary.
+     *
+     * -1 ignores the error correction step.
+     */
+    CV_PROP_RW float errorCorrectionRate;
+
+    /** @brief checkAllOrders consider the four posible corner orders in the rejectedCorners array.
+     *
+     * If it set to false, only the provided corner order is considered (default true).
+     */
+    CV_PROP_RW bool checkAllOrders;
+};
+
+/** @brief The main functionality of ArucoDetector class is detection of markers in an image with detectMarkers() method.
+ *
+ * After detecting some markers in the image, you can try to find undetected markers from this dictionary with
+ * refineDetectedMarkers() method.
+ *
+ * @see DetectorParameters, RefineParameters
+ */
+class CV_EXPORTS_W ArucoDetector : public Algorithm
+{
+public:
+    /** @brief Basic ArucoDetector constructor
+     *
+     * @param dictionary indicates the type of markers that will be searched
+     * @param detectorParams marker detection parameters
+     * @param refineParams marker refine detection parameters
+     */
+    CV_WRAP ArucoDetector(const Dictionary &dictionary = getPredefinedDictionary(cv::aruco::DICT_4X4_50),
+                          const DetectorParameters &detectorParams = DetectorParameters(),
+                          const RefineParameters& refineParams = RefineParameters());
+
+    /** @brief ArucoDetector constructor for multiple dictionaries
+     *
+     * @param dictionaries indicates the type of markers that will be searched. Empty dictionaries will throw an error.
+     * @param detectorParams marker detection parameters
+     * @param refineParams marker refine detection parameters
+     */
+    CV_WRAP ArucoDetector(const std::vector<Dictionary> &dictionaries,
+                          const DetectorParameters &detectorParams = DetectorParameters(),
+                          const RefineParameters& refineParams = RefineParameters());
+
+    /** @brief Basic marker detection
+     *
+     * @param image input image
+     * @param corners vector of detected marker corners. For each marker, its four corners
+     * are provided, (e.g std::vector<std::vector<cv::Point2f> > ). For N detected markers,
+     * the dimensions of this array is Nx4. The order of the corners is clockwise.
+     * @param ids vector of identifiers of the detected markers. The identifier is of type int
+     * (e.g. std::vector<int>). For N detected markers, the size of ids is also N.
+     * The identifiers have the same order than the markers in the imgPoints array.
+     * @param rejectedImgPoints contains the imgPoints of those squares whose inner code has not a
+     * correct codification. Useful for debugging purposes.
+     *
+     * Performs marker detection in the input image. Only markers included in the first specified dictionary
+     * are searched. For each detected marker, it returns the 2D position of its corner in the image
+     * and its corresponding identifier.
+     * Note that this function does not perform pose estimation.
+     * @note The function does not correct lens distortion or takes it into account. It's recommended to undistort
+     * input image with corresponding camera model, if camera parameters are known
+     * @sa undistort, estimatePoseSingleMarkers,  estimatePoseBoard
+     */
+    CV_WRAP void detectMarkers(InputArray image, OutputArrayOfArrays corners, OutputArray ids,
+                               OutputArrayOfArrays rejectedImgPoints = noArray()) const;
+
+    /** @brief Refine not detected markers based on the already detected and the board layout
+     *
+     * @param image input image
+     * @param board layout of markers in the board.
+     * @param detectedCorners vector of already detected marker corners.
+     * @param detectedIds vector of already detected marker identifiers.
+     * @param rejectedCorners vector of rejected candidates during the marker detection process.
+     * @param cameraMatrix optional input 3x3 floating-point camera matrix
+     * \f$A = \vecthreethree{f_x}{0}{c_x}{0}{f_y}{c_y}{0}{0}{1}\f$
+     * @param distCoeffs optional vector of distortion coefficients
+     * \f$(k_1, k_2, p_1, p_2[, k_3[, k_4, k_5, k_6],[s_1, s_2, s_3, s_4]])\f$ of 4, 5, 8 or 12 elements
+     * @param recoveredIdxs Optional array to returns the indexes of the recovered candidates in the
+     * original rejectedCorners array.
+     *
+     * This function tries to find markers that were not detected in the basic detecMarkers function.
+     * First, based on the current detected marker and the board layout, the function interpolates
+     * the position of the missing markers. Then it tries to find correspondence between the reprojected
+     * markers and the rejected candidates based on the minRepDistance and errorCorrectionRate parameters.
+     * If camera parameters and distortion coefficients are provided, missing markers are reprojected
+     * using projectPoint function. If not, missing marker projections are interpolated using global
+     * homography, and all the marker corners in the board must have the same Z coordinate.
+     * @note This function assumes that the board only contains markers from one dictionary, so only the
+     * first configured dictionary is used. It has to match the dictionary of the board to work properly.
+     */
+    CV_WRAP void refineDetectedMarkers(InputArray image, const Board &board,
+                                       InputOutputArrayOfArrays detectedCorners,
+                                       InputOutputArray detectedIds, InputOutputArrayOfArrays rejectedCorners,
+                                       InputArray cameraMatrix = noArray(), InputArray distCoeffs = noArray(),
+                                       OutputArray recoveredIdxs = noArray()) const;
+
+    /** @brief Basic marker detection
+     *
+     * @param image input image
+     * @param corners vector of detected marker corners. For each marker, its four corners
+     * are provided, (e.g std::vector<std::vector<cv::Point2f> > ). For N detected markers,
+     * the dimensions of this array is Nx4. The order of the corners is clockwise.
+     * @param ids vector of identifiers of the detected markers. The identifier is of type int
+     * (e.g. std::vector<int>). For N detected markers, the size of ids is also N.
+     * The identifiers have the same order than the markers in the imgPoints array.
+     * @param rejectedImgPoints contains the imgPoints of those squares whose inner code has not a
+     * correct codification. Useful for debugging purposes.
+     * @param dictIndices vector of dictionary indices for each detected marker. Use getDictionaries() to get the
+     * list of corresponding dictionaries.
+     *
+     * Performs marker detection in the input image. Only markers included in the specific dictionaries
+     * are searched. For each detected marker, it returns the 2D position of its corner in the image
+     * and its corresponding identifier.
+     * Note that this function does not perform pose estimation.
+     * @note The function does not correct lens distortion or takes it into account. It's recommended to undistort
+     * input image with corresponding camera model, if camera parameters are known
+     * @sa undistort, estimatePoseSingleMarkers,  estimatePoseBoard
+     */
+    CV_WRAP void detectMarkersMultiDict(InputArray image, OutputArrayOfArrays corners, OutputArray ids,
+                               OutputArrayOfArrays rejectedImgPoints = noArray(), OutputArray dictIndices = noArray()) const;
+
+    /** @brief Returns first dictionary from internal list used for marker detection.
+     *
+     * @return The first dictionary from the configured ArucoDetector.
+     */
+    CV_WRAP const Dictionary& getDictionary() const;
+
+    /** @brief Sets and replaces the first dictionary in internal list to be used for marker detection.
+     *
+     * @param dictionary The new dictionary that will replace the first dictionary in the internal list.
+     */
+    CV_WRAP void setDictionary(const Dictionary& dictionary);
+
+    /** @brief Returns all dictionaries currently used for marker detection as a vector.
+     *
+     * @return A std::vector<Dictionary> containing all dictionaries used by the ArucoDetector.
+     */
+    CV_WRAP std::vector<Dictionary> getDictionaries() const;
+
+    /** @brief Sets the entire collection of dictionaries to be used for marker detection, replacing any existing dictionaries.
+     *
+     * @param dictionaries A std::vector<Dictionary> containing the new set of dictionaries to be used.
+     *
+     * Configures the ArucoDetector to use the provided vector of dictionaries for marker detection.
+     * This method replaces any dictionaries that were previously set.
+     * @note Setting an empty vector of dictionaries will throw an error.
+     */
+    CV_WRAP void setDictionaries(const std::vector<Dictionary>& dictionaries);
+
+    CV_WRAP const DetectorParameters& getDetectorParameters() const;
+    CV_WRAP void setDetectorParameters(const DetectorParameters& detectorParameters);
+
+    CV_WRAP const RefineParameters& getRefineParameters() const;
+    CV_WRAP void setRefineParameters(const RefineParameters& refineParameters);
+
+    /** @brief Stores algorithm parameters in a file storage
+    */
+    virtual void write(FileStorage& fs) const override;
+
+    /** @brief simplified API for language bindings
+    */
+    CV_WRAP inline void write(FileStorage& fs, const String& name) { Algorithm::write(fs, name); }
+
+    /** @brief Reads algorithm parameters from a file storage
+    */
+    CV_WRAP virtual void read(const FileNode& fn) override;
+protected:
+    struct ArucoDetectorImpl;
+    Ptr<ArucoDetectorImpl> arucoDetectorImpl;
+};
+
+/** @brief Draw detected markers in image
+ *
+ * @param image input/output image. It must have 1 or 3 channels. The number of channels is not altered.
+ * @param corners positions of marker corners on input image.
+ * (e.g std::vector<std::vector<cv::Point2f> > ). For N detected markers, the dimensions of
+ * this array should be Nx4. The order of the corners should be clockwise.
+ * @param ids vector of identifiers for markers in markersCorners .
+ * Optional, if not provided, ids are not painted.
+ * @param borderColor color of marker borders. Rest of colors (text color and first corner color)
+ * are calculated based on this one to improve visualization.
+ *
+ * Given an array of detected marker corners and its corresponding ids, this functions draws
+ * the markers in the image. The marker borders are painted and the markers identifiers if provided.
+ * Useful for debugging purposes.
+ */
+CV_EXPORTS_W void drawDetectedMarkers(InputOutputArray image, InputArrayOfArrays corners,
+                                      InputArray ids = noArray(), Scalar borderColor = Scalar(0, 255, 0));
+
+/** @brief Generate a canonical marker image
+ *
+ * @param dictionary dictionary of markers indicating the type of markers
+ * @param id identifier of the marker that will be returned. It has to be a valid id in the specified dictionary.
+ * @param sidePixels size of the image in pixels
+ * @param img output image with the marker
+ * @param borderBits width of the marker border.
+ *
+ * This function returns a marker image in its canonical form (i.e. ready to be printed)
+ */
+CV_EXPORTS_W void generateImageMarker(const Dictionary &dictionary, int id, int sidePixels, OutputArray img,
+                                      int borderBits = 1);
+
+//! @}
+
+}
+}
+
+#endif
diff --git a/3rdParty/opencv-4.12.0/opencv2/objdetect/aruco_dictionary.hpp b/3rdParty/opencv-4.12.0/opencv2/objdetect/aruco_dictionary.hpp
new file mode 100644
index 0000000000..e6d0fb5f21
--- /dev/null
+++ b/3rdParty/opencv-4.12.0/opencv2/objdetect/aruco_dictionary.hpp
@@ -0,0 +1,155 @@
+// This file is part of OpenCV project.
+// It is subject to the license terms in the LICENSE file found in the top-level directory
+// of this distribution and at http://opencv.org/license.html
+#ifndef OPENCV_OBJDETECT_DICTIONARY_HPP
+#define OPENCV_OBJDETECT_DICTIONARY_HPP
+
+#include <opencv2/core.hpp>
+
+namespace cv {
+namespace aruco {
+
+//! @addtogroup objdetect_aruco
+//! @{
+
+
+/** @brief Dictionary is a set of unique ArUco markers of the same size
+ *
+ * `bytesList` storing as 2-dimensions Mat with 4-th channels (CV_8UC4 type was used) and contains the marker codewords where:
+ * - bytesList.rows is the dictionary size
+ * - each marker is encoded using `nbytes = ceil(markerSize*markerSize/8.)` bytes
+ * - each row contains all 4 rotations of the marker, so its length is `4*nbytes`
+ * - the byte order in the bytesList[i] row:
+ * `//bytes without rotation/bytes with rotation 1/bytes with rotation 2/bytes with rotation 3//`
+ * So `bytesList.ptr(i)[k*nbytes + j]` is the j-th byte of i-th marker, in its k-th rotation.
+ * @note Python bindings generate matrix with shape of bytesList `dictionary_size x nbytes x 4`,
+ * but it should be indexed like C++ version. Python example for j-th byte of i-th marker, in its k-th rotation:
+ * `aruco_dict.bytesList[id].ravel()[k*nbytes + j]`
+ */
+class CV_EXPORTS_W_SIMPLE Dictionary {
+
+    public:
+    CV_PROP_RW Mat bytesList;         ///< marker code information. See class description for more details
+    CV_PROP_RW int markerSize;        ///< number of bits per dimension
+    CV_PROP_RW int maxCorrectionBits; ///< maximum number of bits that can be corrected
+
+    CV_WRAP Dictionary();
+
+    /** @brief Basic ArUco dictionary constructor
+     *
+     * @param bytesList bits for all ArUco markers in dictionary see memory layout in the class description
+     * @param _markerSize ArUco marker size in units
+     * @param maxcorr maximum number of bits that can be corrected
+     */
+    CV_WRAP Dictionary(const Mat &bytesList, int _markerSize, int maxcorr = 0);
+
+    /** @brief Read a new dictionary from FileNode.
+     *
+     * Dictionary example in YAML format:\n
+     * nmarkers: 35\n
+     * markersize: 6\n
+     * maxCorrectionBits: 5\n
+     * marker_0: "101011111011111001001001101100000000"\n
+     * ...\n
+     * marker_34: "011111010000111011111110110101100101"
+     */
+    CV_WRAP bool readDictionary(const cv::FileNode& fn);
+
+    /** @brief Write a dictionary to FileStorage, format is the same as in readDictionary().
+     */
+    CV_WRAP void writeDictionary(FileStorage& fs, const String& name = String());
+
+    /** @brief Given a matrix of bits. Returns whether if marker is identified or not.
+     *
+     * Returns reference to the marker id in the dictionary (if any) and its rotation.
+     */
+    CV_WRAP bool identify(const Mat &onlyBits, CV_OUT int &idx, CV_OUT int &rotation, double maxCorrectionRate) const;
+
+    /** @brief Returns Hamming distance of the input bits to the specific id.
+     *
+     * If `allRotations` flag is set, the four posible marker rotations are considered
+     */
+    CV_WRAP int getDistanceToId(InputArray bits, int id, bool allRotations = true) const;
+
+
+    /** @brief Generate a canonical marker image
+     */
+    CV_WRAP void generateImageMarker(int id, int sidePixels, OutputArray _img, int borderBits = 1) const;
+
+
+    /** @brief Transform matrix of bits to list of bytes with 4 marker rotations
+      */
+    CV_WRAP static Mat getByteListFromBits(const Mat &bits);
+
+
+    /** @brief Transform list of bytes to matrix of bits
+      */
+    CV_WRAP static Mat getBitsFromByteList(const Mat &byteList, int markerSize);
+};
+
+
+
+
+/** @brief Predefined markers dictionaries/sets
+ *
+ * Each dictionary indicates the number of bits and the number of markers contained
+ * - DICT_ARUCO_ORIGINAL: standard ArUco Library Markers. 1024 markers, 5x5 bits, 0 minimum
+                          distance
+ */
+enum PredefinedDictionaryType {
+    DICT_4X4_50 = 0,        ///< 4x4 bits, minimum hamming distance between any two codes = 4, 50 codes
+    DICT_4X4_100,           ///< 4x4 bits, minimum hamming distance between any two codes = 3, 100 codes
+    DICT_4X4_250,           ///< 4x4 bits, minimum hamming distance between any two codes = 3, 250 codes
+    DICT_4X4_1000,          ///< 4x4 bits, minimum hamming distance between any two codes = 2, 1000 codes
+    DICT_5X5_50,            ///< 5x5 bits, minimum hamming distance between any two codes = 8, 50 codes
+    DICT_5X5_100,           ///< 5x5 bits, minimum hamming distance between any two codes = 7, 100 codes
+    DICT_5X5_250,           ///< 5x5 bits, minimum hamming distance between any two codes = 6, 250 codes
+    DICT_5X5_1000,          ///< 5x5 bits, minimum hamming distance between any two codes = 5, 1000 codes
+    DICT_6X6_50,            ///< 6x6 bits, minimum hamming distance between any two codes = 13, 50 codes
+    DICT_6X6_100,           ///< 6x6 bits, minimum hamming distance between any two codes = 12, 100 codes
+    DICT_6X6_250,           ///< 6x6 bits, minimum hamming distance between any two codes = 11, 250 codes
+    DICT_6X6_1000,          ///< 6x6 bits, minimum hamming distance between any two codes = 9, 1000 codes
+    DICT_7X7_50,            ///< 7x7 bits, minimum hamming distance between any two codes = 19, 50 codes
+    DICT_7X7_100,           ///< 7x7 bits, minimum hamming distance between any two codes = 18, 100 codes
+    DICT_7X7_250,           ///< 7x7 bits, minimum hamming distance between any two codes = 17, 250 codes
+    DICT_7X7_1000,          ///< 7x7 bits, minimum hamming distance between any two codes = 14, 1000 codes
+    DICT_ARUCO_ORIGINAL,    ///< 6x6 bits, minimum hamming distance between any two codes = 3, 1024 codes
+    DICT_APRILTAG_16h5,     ///< 4x4 bits, minimum hamming distance between any two codes = 5, 30 codes
+    DICT_APRILTAG_25h9,     ///< 5x5 bits, minimum hamming distance between any two codes = 9, 35 codes
+    DICT_APRILTAG_36h10,    ///< 6x6 bits, minimum hamming distance between any two codes = 10, 2320 codes
+    DICT_APRILTAG_36h11,     ///< 6x6 bits, minimum hamming distance between any two codes = 11, 587 codes
+    DICT_ARUCO_MIP_36h12     ///< 6x6 bits, minimum hamming distance between any two codes = 12, 250 codes
+};
+
+
+/** @brief Returns one of the predefined dictionaries defined in PredefinedDictionaryType
+  */
+CV_EXPORTS Dictionary getPredefinedDictionary(PredefinedDictionaryType name);
+
+
+/** @brief Returns one of the predefined dictionaries referenced by DICT_*.
+  */
+CV_EXPORTS_W Dictionary getPredefinedDictionary(int dict);
+
+/** @brief Extend base dictionary by new nMarkers
+  *
+  * @param nMarkers number of markers in the dictionary
+  * @param markerSize number of bits per dimension of each markers
+  * @param baseDictionary Include the markers in this dictionary at the beginning (optional)
+  * @param randomSeed a user supplied seed for theRNG()
+  *
+  * This function creates a new dictionary composed by nMarkers markers and each markers composed
+  * by markerSize x markerSize bits. If baseDictionary is provided, its markers are directly
+  * included and the rest are generated based on them. If the size of baseDictionary is higher
+  * than nMarkers, only the first nMarkers in baseDictionary are taken and no new marker is added.
+  */
+CV_EXPORTS_W Dictionary extendDictionary(int nMarkers, int markerSize, const Dictionary &baseDictionary = Dictionary(),
+                                         int randomSeed=0);
+
+
+
+//! @}
+}
+}
+
+#endif
diff --git a/3rdParty/opencv-4.12.0/opencv2/objdetect/barcode.hpp b/3rdParty/opencv-4.12.0/opencv2/objdetect/barcode.hpp
new file mode 100644
index 0000000000..e36259f286
--- /dev/null
+++ b/3rdParty/opencv-4.12.0/opencv2/objdetect/barcode.hpp
@@ -0,0 +1,111 @@
+// This file is part of OpenCV project.
+// It is subject to the license terms in the LICENSE file found in the top-level directory
+// of this distribution and at http://opencv.org/license.html.
+// Copyright (c) 2020-2021 darkliang wangberlinT Certseeds
+
+#ifndef OPENCV_OBJDETECT_BARCODE_HPP
+#define OPENCV_OBJDETECT_BARCODE_HPP
+
+#include <opencv2/core.hpp>
+#include <opencv2/objdetect/graphical_code_detector.hpp>
+
+namespace cv {
+namespace barcode {
+
+//! @addtogroup objdetect_barcode
+//! @{
+
+class CV_EXPORTS_W_SIMPLE BarcodeDetector : public cv::GraphicalCodeDetector
+{
+public:
+    /** @brief Initialize the BarcodeDetector.
+    */
+    CV_WRAP BarcodeDetector();
+    /** @brief Initialize the BarcodeDetector.
+     *
+     * Parameters allow to load _optional_ Super Resolution DNN model for better quality.
+     * @param prototxt_path prototxt file path for the super resolution model
+     * @param model_path model file path for the super resolution model
+     */
+    CV_WRAP BarcodeDetector(CV_WRAP_FILE_PATH const std::string &prototxt_path, CV_WRAP_FILE_PATH const std::string &model_path);
+    ~BarcodeDetector();
+
+    /** @brief Decodes barcode in image once it's found by the detect() method.
+     *
+     * @param img grayscale or color (BGR) image containing bar code.
+     * @param points vector of rotated rectangle vertices found by detect() method (or some other algorithm).
+     * For N detected barcodes, the dimensions of this array should be [N][4].
+     * Order of four points in vector<Point2f> is bottomLeft, topLeft, topRight, bottomRight.
+     * @param decoded_info UTF8-encoded output vector of string or empty vector of string if the codes cannot be decoded.
+     * @param decoded_type vector strings, specifies the type of these barcodes
+     * @return true if at least one valid barcode have been found
+     */
+    CV_WRAP bool decodeWithType(InputArray img,
+                             InputArray points,
+                             CV_OUT std::vector<std::string> &decoded_info,
+                             CV_OUT std::vector<std::string> &decoded_type) const;
+
+    /** @brief Both detects and decodes barcode
+
+     * @param img grayscale or color (BGR) image containing barcode.
+     * @param decoded_info UTF8-encoded output vector of string(s) or empty vector of string if the codes cannot be decoded.
+     * @param decoded_type vector of strings, specifies the type of these barcodes
+     * @param points optional output vector of vertices of the found  barcode rectangle. Will be empty if not found.
+     * @return true if at least one valid barcode have been found
+     */
+    CV_WRAP bool detectAndDecodeWithType(InputArray img,
+                                      CV_OUT std::vector<std::string> &decoded_info,
+                                      CV_OUT std::vector<std::string> &decoded_type,
+                                      OutputArray points = noArray()) const;
+
+    /** @brief Get detector downsampling threshold.
+     *
+     * @return detector downsampling threshold
+     */
+    CV_WRAP double getDownsamplingThreshold() const;
+
+    /** @brief Set detector downsampling threshold.
+     *
+     * By default, the detect method resizes the input image to this limit if the smallest image size is is greater than the threshold.
+     * Increasing this value can improve detection accuracy and the number of results at the expense of performance.
+     * Correlates with detector scales. Setting this to a large value will disable downsampling.
+     * @param thresh downsampling limit to apply (default 512)
+     * @see setDetectorScales
+     */
+    CV_WRAP BarcodeDetector& setDownsamplingThreshold(double thresh);
+
+    /** @brief Returns detector box filter sizes.
+     *
+     * @param sizes output parameter for returning the sizes.
+     */
+    CV_WRAP void getDetectorScales(CV_OUT std::vector<float>& sizes) const;
+
+    /** @brief Set detector box filter sizes.
+     *
+     * Adjusts the value and the number of box filters used in the detect step.
+     * The filter sizes directly correlate with the expected line widths for a barcode. Corresponds to expected barcode distance.
+     * If the downsampling limit is increased, filter sizes need to be adjusted in an inversely proportional way.
+     * @param sizes box filter sizes, relative to minimum dimension of the image (default [0.01, 0.03, 0.06, 0.08])
+     */
+    CV_WRAP BarcodeDetector& setDetectorScales(const std::vector<float>& sizes);
+
+    /** @brief Get detector gradient magnitude threshold.
+     *
+     * @return detector gradient magnitude threshold.
+     */
+    CV_WRAP double getGradientThreshold() const;
+
+    /** @brief Set detector gradient magnitude threshold.
+     *
+     * Sets the coherence threshold for detected bounding boxes.
+     * Increasing this value will generate a closer fitted bounding box width and can reduce false-positives.
+     * Values between 16 and 1024 generally work, while too high of a value will remove valid detections.
+     * @param thresh gradient magnitude threshold (default 64).
+     */
+    CV_WRAP BarcodeDetector& setGradientThreshold(double thresh);
+};
+//! @}
+
+}} // cv::barcode::
+
+#endif // OPENCV_OBJDETECT_BARCODE_HPP
diff --git a/3rdParty/opencv-4.12.0/opencv2/objdetect/charuco_detector.hpp b/3rdParty/opencv-4.12.0/opencv2/objdetect/charuco_detector.hpp
new file mode 100644
index 0000000000..969ae65bbb
--- /dev/null
+++ b/3rdParty/opencv-4.12.0/opencv2/objdetect/charuco_detector.hpp
@@ -0,0 +1,161 @@
+// This file is part of OpenCV project.
+// It is subject to the license terms in the LICENSE file found in the top-level directory
+// of this distribution and at http://opencv.org/license.html
+#ifndef OPENCV_OBJDETECT_CHARUCO_DETECTOR_HPP
+#define OPENCV_OBJDETECT_CHARUCO_DETECTOR_HPP
+
+#include "opencv2/objdetect/aruco_detector.hpp"
+
+namespace cv {
+namespace aruco {
+
+//! @addtogroup objdetect_aruco
+//! @{
+
+struct CV_EXPORTS_W_SIMPLE CharucoParameters {
+    CV_WRAP CharucoParameters() {
+        minMarkers = 2;
+        tryRefineMarkers = false;
+        checkMarkers = true;
+    }
+    /// cameraMatrix optional 3x3 floating-point camera matrix
+    CV_PROP_RW Mat cameraMatrix;
+
+    /// distCoeffs optional vector of distortion coefficients
+    CV_PROP_RW Mat distCoeffs;
+
+    /// minMarkers number of adjacent markers that must be detected to return a charuco corner, default = 2
+    CV_PROP_RW int minMarkers;
+
+    /// try to use refine board, default false
+    CV_PROP_RW bool tryRefineMarkers;
+
+    /// run check to verify that markers belong to the same board, default true
+    CV_PROP_RW bool checkMarkers;
+};
+
+class CV_EXPORTS_W CharucoDetector : public Algorithm {
+public:
+    /** @brief Basic CharucoDetector constructor
+     *
+     * @param board ChAruco board
+     * @param charucoParams charuco detection parameters
+     * @param detectorParams marker detection parameters
+     * @param refineParams marker refine detection parameters
+     */
+    CV_WRAP CharucoDetector(const CharucoBoard& board,
+                            const CharucoParameters& charucoParams = CharucoParameters(),
+                            const DetectorParameters &detectorParams = DetectorParameters(),
+                            const RefineParameters& refineParams = RefineParameters());
+
+    CV_WRAP const CharucoBoard& getBoard() const;
+    CV_WRAP void setBoard(const CharucoBoard& board);
+
+    CV_WRAP const CharucoParameters& getCharucoParameters() const;
+    CV_WRAP void setCharucoParameters(CharucoParameters& charucoParameters);
+
+    CV_WRAP const DetectorParameters& getDetectorParameters() const;
+    CV_WRAP void setDetectorParameters(const DetectorParameters& detectorParameters);
+
+    CV_WRAP const RefineParameters& getRefineParameters() const;
+    CV_WRAP void setRefineParameters(const RefineParameters& refineParameters);
+
+    /**
+     * @brief detect aruco markers and interpolate position of ChArUco board corners
+     * @param image input image necesary for corner refinement. Note that markers are not detected and
+     * should be sent in corners and ids parameters.
+     * @param charucoCorners interpolated chessboard corners.
+     * @param charucoIds interpolated chessboard corners identifiers.
+     * @param markerCorners vector of already detected markers corners. For each marker, its four
+     * corners are provided, (e.g std::vector<std::vector<cv::Point2f> > ). For N detected markers, the
+     * dimensions of this array should be Nx4. The order of the corners should be clockwise.
+     * If markerCorners and markerCorners are empty, the function detect aruco markers and ids.
+     * @param markerIds list of identifiers for each marker in corners.
+     *  If markerCorners and markerCorners are empty, the function detect aruco markers and ids.
+     *
+     * This function receives the detected markers and returns the 2D position of the chessboard corners
+     * from a ChArUco board using the detected Aruco markers.
+     *
+     * If markerCorners and markerCorners are empty, the detectMarkers() will run and detect aruco markers and ids.
+     *
+     * If camera parameters are provided, the process is based in an approximated pose estimation, else it is based on local homography.
+     * Only visible corners are returned. For each corner, its corresponding identifier is also returned in charucoIds.
+     * @sa findChessboardCorners
+     * @note After OpenCV 4.6.0, there was an incompatible change in the ChArUco pattern generation algorithm for even row counts.
+     * Use cv::aruco::CharucoBoard::setLegacyPattern() to ensure compatibility with patterns created using OpenCV versions prior to 4.6.0.
+     * For more information, see the issue: https://github.com/opencv/opencv/issues/23152
+     */
+    CV_WRAP void detectBoard(InputArray image, OutputArray charucoCorners, OutputArray charucoIds,
+                             InputOutputArrayOfArrays markerCorners = noArray(),
+                             InputOutputArray markerIds = noArray()) const;
+
+    /**
+     * @brief Detect ChArUco Diamond markers
+     *
+     * @param image input image necessary for corner subpixel.
+     * @param diamondCorners output list of detected diamond corners (4 corners per diamond). The order
+     * is the same than in marker corners: top left, top right, bottom right and bottom left. Similar
+     * format than the corners returned by detectMarkers (e.g std::vector<std::vector<cv::Point2f> > ).
+     * @param diamondIds ids of the diamonds in diamondCorners. The id of each diamond is in fact of
+     * type Vec4i, so each diamond has 4 ids, which are the ids of the aruco markers composing the
+     * diamond.
+     * @param markerCorners list of detected marker corners from detectMarkers function.
+     * If markerCorners and markerCorners are empty, the function detect aruco markers and ids.
+     * @param markerIds list of marker ids in markerCorners.
+     * If markerCorners and markerCorners are empty, the function detect aruco markers and ids.
+     *
+     * This function detects Diamond markers from the previous detected ArUco markers. The diamonds
+     * are returned in the diamondCorners and diamondIds parameters. If camera calibration parameters
+     * are provided, the diamond search is based on reprojection. If not, diamond search is based on
+     * homography. Homography is faster than reprojection, but less accurate.
+     */
+    CV_WRAP void detectDiamonds(InputArray image, OutputArrayOfArrays diamondCorners, OutputArray diamondIds,
+                                InputOutputArrayOfArrays markerCorners = noArray(),
+                                InputOutputArray markerIds = noArray()) const;
+protected:
+    struct CharucoDetectorImpl;
+    Ptr<CharucoDetectorImpl> charucoDetectorImpl;
+};
+
+/**
+ * @brief Draws a set of Charuco corners
+ * @param image input/output image. It must have 1 or 3 channels. The number of channels is not
+ * altered.
+ * @param charucoCorners vector of detected charuco corners
+ * @param charucoIds list of identifiers for each corner in charucoCorners
+ * @param cornerColor color of the square surrounding each corner
+ *
+ * This function draws a set of detected Charuco corners. If identifiers vector is provided, it also
+ * draws the id of each corner.
+ */
+CV_EXPORTS_W void drawDetectedCornersCharuco(InputOutputArray image, InputArray charucoCorners,
+                                             InputArray charucoIds = noArray(), Scalar cornerColor = Scalar(255, 0, 0));
+
+/**
+ * @brief Draw a set of detected ChArUco Diamond markers
+ *
+ * @param image input/output image. It must have 1 or 3 channels. The number of channels is not
+ * altered.
+ * @param diamondCorners positions of diamond corners in the same format returned by
+ * detectCharucoDiamond(). (e.g std::vector<std::vector<cv::Point2f> > ). For N detected markers,
+ * the dimensions of this array should be Nx4. The order of the corners should be clockwise.
+ * @param diamondIds vector of identifiers for diamonds in diamondCorners, in the same format
+ * returned by detectCharucoDiamond() (e.g. std::vector<Vec4i>).
+ * Optional, if not provided, ids are not painted.
+ * @param borderColor color of marker borders. Rest of colors (text color and first corner color)
+ * are calculated based on this one.
+ *
+ * Given an array of detected diamonds, this functions draws them in the image. The marker borders
+ * are painted and the markers identifiers if provided.
+ * Useful for debugging purposes.
+ */
+CV_EXPORTS_W void drawDetectedDiamonds(InputOutputArray image, InputArrayOfArrays diamondCorners,
+                                       InputArray diamondIds = noArray(),
+                                       Scalar borderColor = Scalar(0, 0, 255));
+
+//! @}
+
+}
+}
+
+#endif
diff --git a/3rdParty/opencv2/objdetect/detection_based_tracker.hpp b/3rdParty/opencv-4.12.0/opencv2/objdetect/detection_based_tracker.hpp
similarity index 96%
rename from 3rdParty/opencv2/objdetect/detection_based_tracker.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/objdetect/detection_based_tracker.hpp
index 3ba2cc8b46..8fe43c2c6b 100644
--- a/3rdParty/opencv2/objdetect/detection_based_tracker.hpp
+++ b/3rdParty/opencv-4.12.0/opencv2/objdetect/detection_based_tracker.hpp
@@ -192,7 +192,7 @@ class CV_EXPORTS DetectionBasedTracker
             {
                 lastPositions.push_back(rect);
                 id=getNextId();
-            };
+            }
 
             static int getNextId()
             {
diff --git a/3rdParty/opencv-4.12.0/opencv2/objdetect/face.hpp b/3rdParty/opencv-4.12.0/opencv2/objdetect/face.hpp
new file mode 100644
index 0000000000..3528d73bc6
--- /dev/null
+++ b/3rdParty/opencv-4.12.0/opencv2/objdetect/face.hpp
@@ -0,0 +1,179 @@
+// This file is part of OpenCV project.
+// It is subject to the license terms in the LICENSE file found in the top-level directory
+// of this distribution and at http://opencv.org/license.html.
+
+#ifndef OPENCV_OBJDETECT_FACE_HPP
+#define OPENCV_OBJDETECT_FACE_HPP
+
+#include <opencv2/core.hpp>
+
+namespace cv
+{
+
+//! @addtogroup objdetect_dnn_face
+//! @{
+
+/** @brief DNN-based face detector
+
+model download link: https://github.com/opencv/opencv_zoo/tree/master/models/face_detection_yunet
+ */
+class CV_EXPORTS_W FaceDetectorYN
+{
+public:
+    virtual ~FaceDetectorYN() {}
+
+    /** @brief Set the size for the network input, which overwrites the input size of creating model. Call this method when the size of input image does not match the input size when creating model
+     *
+     * @param input_size the size of the input image
+     */
+    CV_WRAP virtual void setInputSize(const Size& input_size) = 0;
+
+    CV_WRAP virtual Size getInputSize() = 0;
+
+    /** @brief Set the score threshold to filter out bounding boxes of score less than the given value
+     *
+     * @param score_threshold threshold for filtering out bounding boxes
+     */
+    CV_WRAP virtual void setScoreThreshold(float score_threshold) = 0;
+
+    CV_WRAP virtual float getScoreThreshold() = 0;
+
+    /** @brief Set the Non-maximum-suppression threshold to suppress bounding boxes that have IoU greater than the given value
+     *
+     * @param nms_threshold threshold for NMS operation
+     */
+    CV_WRAP virtual void setNMSThreshold(float nms_threshold) = 0;
+
+    CV_WRAP virtual float getNMSThreshold() = 0;
+
+    /** @brief Set the number of bounding boxes preserved before NMS
+     *
+     * @param top_k the number of bounding boxes to preserve from top rank based on score
+     */
+    CV_WRAP virtual void setTopK(int top_k) = 0;
+
+    CV_WRAP virtual int getTopK() = 0;
+
+    /** @brief Detects faces in the input image. Following is an example output.
+
+     * ![image](pics/lena-face-detection.jpg)
+
+     *  @param image an image to detect
+     *  @param faces detection results stored in a 2D cv::Mat of shape [num_faces, 15]
+     *  - 0-1: x, y of bbox top left corner
+     *  - 2-3: width, height of bbox
+     *  - 4-5: x, y of right eye (blue point in the example image)
+     *  - 6-7: x, y of left eye (red point in the example image)
+     *  - 8-9: x, y of nose tip (green point in the example image)
+     *  - 10-11: x, y of right corner of mouth (pink point in the example image)
+     *  - 12-13: x, y of left corner of mouth (yellow point in the example image)
+     *  - 14: face score
+     */
+    CV_WRAP virtual int detect(InputArray image, OutputArray faces) = 0;
+
+    /** @brief Creates an instance of face detector class with given parameters
+     *
+     *  @param model the path to the requested model
+     *  @param config the path to the config file for compability, which is not requested for ONNX models
+     *  @param input_size the size of the input image
+     *  @param score_threshold the threshold to filter out bounding boxes of score smaller than the given value
+     *  @param nms_threshold the threshold to suppress bounding boxes of IoU bigger than the given value
+     *  @param top_k keep top K bboxes before NMS
+     *  @param backend_id the id of backend
+     *  @param target_id the id of target device
+     */
+    CV_WRAP static Ptr<FaceDetectorYN> create(CV_WRAP_FILE_PATH const String& model,
+                                              CV_WRAP_FILE_PATH const String& config,
+                                              const Size& input_size,
+                                              float score_threshold = 0.9f,
+                                              float nms_threshold = 0.3f,
+                                              int top_k = 5000,
+                                              int backend_id = 0,
+                                              int target_id = 0);
+
+    /** @overload
+     *
+     *  @param framework Name of origin framework
+     *  @param bufferModel A buffer with a content of binary file with weights
+     *  @param bufferConfig A buffer with a content of text file contains network configuration
+     *  @param input_size the size of the input image
+     *  @param score_threshold the threshold to filter out bounding boxes of score smaller than the given value
+     *  @param nms_threshold the threshold to suppress bounding boxes of IoU bigger than the given value
+     *  @param top_k keep top K bboxes before NMS
+     *  @param backend_id the id of backend
+     *  @param target_id the id of target device
+     */
+    CV_WRAP static Ptr<FaceDetectorYN> create(const String& framework,
+                                              const std::vector<uchar>& bufferModel,
+                                              const std::vector<uchar>& bufferConfig,
+                                              const Size& input_size,
+                                              float score_threshold = 0.9f,
+                                              float nms_threshold = 0.3f,
+                                              int top_k = 5000,
+                                              int backend_id = 0,
+                                              int target_id = 0);
+
+};
+
+/** @brief DNN-based face recognizer
+
+model download link: https://github.com/opencv/opencv_zoo/tree/master/models/face_recognition_sface
+ */
+class CV_EXPORTS_W FaceRecognizerSF
+{
+public:
+    virtual ~FaceRecognizerSF() {}
+
+    /** @brief Definition of distance used for calculating the distance between two face features
+     */
+    enum DisType { FR_COSINE=0, FR_NORM_L2=1 };
+
+    /** @brief Aligns detected face with the source input image and crops it
+     *  @param src_img input image
+     *  @param face_box the detected face result from the input image
+     *  @param aligned_img output aligned image
+     */
+    CV_WRAP virtual void alignCrop(InputArray src_img, InputArray face_box, OutputArray aligned_img) const = 0;
+
+    /** @brief Extracts face feature from aligned image
+     *  @param aligned_img input aligned image
+     *  @param face_feature output face feature
+     */
+    CV_WRAP virtual void feature(InputArray aligned_img, OutputArray face_feature) = 0;
+
+    /** @brief Calculates the distance between two face features
+     *  @param face_feature1 the first input feature
+     *  @param face_feature2 the second input feature of the same size and the same type as face_feature1
+     *  @param dis_type defines how to calculate the distance between two face features with optional values "FR_COSINE" or "FR_NORM_L2"
+     */
+    CV_WRAP virtual double match(InputArray face_feature1, InputArray face_feature2, int dis_type = FaceRecognizerSF::FR_COSINE) const = 0;
+
+    /** @brief Creates an instance of this class with given parameters
+     *  @param model the path of the onnx model used for face recognition
+     *  @param config the path to the config file for compability, which is not requested for ONNX models
+     *  @param backend_id the id of backend
+     *  @param target_id the id of target device
+     */
+    CV_WRAP static Ptr<FaceRecognizerSF> create(CV_WRAP_FILE_PATH const String& model, CV_WRAP_FILE_PATH const String& config, int backend_id = 0, int target_id = 0);
+
+    /**
+     *  @brief Creates an instance of this class from a buffer containing the model weights and configuration.
+     *  @param framework Name of the framework (ONNX, etc.)
+     *  @param bufferModel A buffer containing the binary model weights.
+     *  @param bufferConfig A buffer containing the network configuration.
+     *  @param backend_id The id of the backend.
+     *  @param target_id The id of the target device.
+     *
+     *  @return A pointer to the created instance of FaceRecognizerSF.
+     */
+    CV_WRAP static Ptr<FaceRecognizerSF> create(const String& framework,
+                                                const std::vector<uchar>& bufferModel,
+                                                const std::vector<uchar>& bufferConfig,
+                                                int backend_id = 0,
+                                                int target_id = 0);
+};
+
+//! @}
+} // namespace cv
+
+#endif
diff --git a/3rdParty/opencv-4.12.0/opencv2/objdetect/graphical_code_detector.hpp b/3rdParty/opencv-4.12.0/opencv2/objdetect/graphical_code_detector.hpp
new file mode 100644
index 0000000000..f2a683cf7d
--- /dev/null
+++ b/3rdParty/opencv-4.12.0/opencv2/objdetect/graphical_code_detector.hpp
@@ -0,0 +1,96 @@
+// This file is part of OpenCV project.
+// It is subject to the license terms in the LICENSE file found in the top-level directory
+// of this distribution and at http://opencv.org/license.html
+#ifndef OPENCV_OBJDETECT_GRAPHICAL_CODE_DETECTOR_HPP
+#define OPENCV_OBJDETECT_GRAPHICAL_CODE_DETECTOR_HPP
+
+#include <opencv2/core.hpp>
+
+namespace cv {
+
+//! @addtogroup objdetect_common
+//! @{
+
+class CV_EXPORTS_W_SIMPLE GraphicalCodeDetector {
+public:
+    CV_DEPRECATED_EXTERNAL  // avoid using in C++ code, will be moved to "protected" (need to fix bindings first)
+    GraphicalCodeDetector();
+
+    GraphicalCodeDetector(const GraphicalCodeDetector&) = default;
+    GraphicalCodeDetector(GraphicalCodeDetector&&) = default;
+    GraphicalCodeDetector& operator=(const GraphicalCodeDetector&) = default;
+    GraphicalCodeDetector& operator=(GraphicalCodeDetector&&) = default;
+
+    /** @brief Detects graphical code in image and returns the quadrangle containing the code.
+     @param img grayscale or color (BGR) image containing (or not) graphical code.
+     @param points Output vector of vertices of the minimum-area quadrangle containing the code.
+     */
+    CV_WRAP bool detect(InputArray img, OutputArray points) const;
+
+    /** @brief Decodes graphical code in image once it's found by the detect() method.
+
+     Returns UTF8-encoded output string or empty string if the code cannot be decoded.
+     @param img grayscale or color (BGR) image containing graphical code.
+     @param points Quadrangle vertices found by detect() method (or some other algorithm).
+     @param straight_code The optional output image containing binarized code, will be empty if not found.
+     */
+    CV_WRAP std::string decode(InputArray img, InputArray points, OutputArray straight_code = noArray()) const;
+
+    /** @brief Both detects and decodes graphical code
+
+     @param img grayscale or color (BGR) image containing graphical code.
+     @param points optional output array of vertices of the found graphical code quadrangle, will be empty if not found.
+     @param straight_code The optional output image containing binarized code
+     */
+    CV_WRAP std::string detectAndDecode(InputArray img, OutputArray points = noArray(),
+                                        OutputArray straight_code = noArray()) const;
+
+
+    /** @brief Detects graphical codes in image and returns the vector of the quadrangles containing the codes.
+     @param img grayscale or color (BGR) image containing (or not) graphical codes.
+     @param points Output vector of vector of vertices of the minimum-area quadrangle containing the codes.
+     */
+    CV_WRAP bool detectMulti(InputArray img, OutputArray points) const;
+
+    /** @brief Decodes graphical codes in image once it's found by the detect() method.
+     @param img grayscale or color (BGR) image containing graphical codes.
+     @param decoded_info UTF8-encoded output vector of string or empty vector of string if the codes cannot be decoded.
+     @param points vector of Quadrangle vertices found by detect() method (or some other algorithm).
+     @param straight_code The optional output vector of images containing binarized codes
+     */
+    CV_WRAP bool decodeMulti(InputArray img, InputArray points, CV_OUT std::vector<std::string>& decoded_info,
+                             OutputArrayOfArrays straight_code = noArray()) const;
+
+    /** @brief Both detects and decodes graphical codes
+    @param img grayscale or color (BGR) image containing graphical codes.
+    @param decoded_info UTF8-encoded output vector of string or empty vector of string if the codes cannot be decoded.
+    @param points optional output vector of vertices of the found graphical code quadrangles. Will be empty if not found.
+    @param straight_code The optional vector of images containing binarized codes
+
+    - If there are QR codes encoded with a Structured Append mode on the image and all of them detected and decoded correctly,
+    method writes a full message to position corresponds to 0-th code in a sequence. The rest of QR codes from the same sequence
+    have empty string.
+    */
+    CV_WRAP bool detectAndDecodeMulti(InputArray img, CV_OUT std::vector<std::string>& decoded_info, OutputArray points = noArray(),
+                                      OutputArrayOfArrays straight_code = noArray()) const;
+
+#ifdef OPENCV_BINDINGS_PARSER
+    CV_WRAP_AS(detectAndDecodeBytes) NativeByteArray detectAndDecode(InputArray img, OutputArray points = noArray(),
+                                                                     OutputArray straight_code = noArray()) const;
+    CV_WRAP_AS(decodeBytes) NativeByteArray decode(InputArray img, InputArray points, OutputArray straight_code = noArray()) const;
+    CV_WRAP_AS(decodeBytesMulti) bool decodeMulti(InputArray img, InputArray points, CV_OUT std::vector<NativeByteArray>& decoded_info,
+                                                  OutputArrayOfArrays straight_code = noArray()) const;
+    CV_WRAP_AS(detectAndDecodeBytesMulti) bool detectAndDecodeMulti(InputArray img, CV_OUT std::vector<NativeByteArray>& decoded_info, OutputArray points = noArray(),
+                                                                    OutputArrayOfArrays straight_code = noArray()) const;
+#endif
+
+    struct Impl;
+protected:
+    Ptr<Impl> p;
+};
+
+//! @}
+
+}
+
+#endif
diff --git a/3rdParty/opencv2/objdetect/objdetect.hpp b/3rdParty/opencv-4.12.0/opencv2/objdetect/objdetect.hpp
similarity index 100%
rename from 3rdParty/opencv2/objdetect/objdetect.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/objdetect/objdetect.hpp
diff --git a/3rdParty/opencv2/opencv.hpp b/3rdParty/opencv-4.12.0/opencv2/opencv.hpp
similarity index 100%
rename from 3rdParty/opencv2/opencv.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/opencv.hpp
diff --git a/3rdParty/opencv2/opencv_modules.hpp b/3rdParty/opencv-4.12.0/opencv2/opencv_modules.hpp
similarity index 100%
rename from 3rdParty/opencv2/opencv_modules.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/opencv_modules.hpp
diff --git a/3rdParty/opencv2/photo.hpp b/3rdParty/opencv-4.12.0/opencv2/photo.hpp
similarity index 87%
rename from 3rdParty/opencv2/photo.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/photo.hpp
index b17b2550b1..66f00b7e90 100644
--- a/3rdParty/opencv2/photo.hpp
+++ b/3rdParty/opencv-4.12.0/opencv2/photo.hpp
@@ -55,30 +55,29 @@ This module includes photo processing algorithms
     @defgroup photo_denoise Denoising
     @defgroup photo_hdr HDR imaging
 
-This section describes high dynamic range imaging algorithms namely tonemapping, exposure alignment,
-camera calibration with multiple exposures and exposure fusion.
+    This section describes high dynamic range imaging algorithms namely tonemapping, exposure alignment,
+    camera calibration with multiple exposures and exposure fusion.
 
     @defgroup photo_decolor Contrast Preserving Decolorization
 
-Useful links:
+    Useful links:
 
-http://www.cse.cuhk.edu.hk/leojia/projects/color2gray/index.html
+    http://www.cse.cuhk.edu.hk/leojia/projects/color2gray/index.html
 
     @defgroup photo_clone Seamless Cloning
 
-Useful links:
+    Useful links:
 
-https://www.learnopencv.com/seamless-cloning-using-opencv-python-cpp
+    https://www.learnopencv.com/seamless-cloning-using-opencv-python-cpp
 
     @defgroup photo_render Non-Photorealistic Rendering
 
-Useful links:
+    Useful links:
 
-http://www.inf.ufrgs.br/~eslgastal/DomainTransform
+    http://www.inf.ufrgs.br/~eslgastal/DomainTransform
 
-https://www.learnopencv.com/non-photorealistic-rendering-using-opencv-python-c/
+    https://www.learnopencv.com/non-photorealistic-rendering-using-opencv-python-c/
 
-    @defgroup photo_c C API
 @}
   */
 
@@ -201,8 +200,8 @@ CV_EXPORTS_W void fastNlMeansDenoisingColored( InputArray src, OutputArray dst,
 
 /** @brief Modification of fastNlMeansDenoising function for images sequence where consecutive images have been
 captured in small period of time. For example video. This version of the function is for grayscale
-images or for manual manipulation with colorspaces. For more details see
-<http://citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.131.6394>
+images or for manual manipulation with colorspaces. See @cite Buades2005DenoisingIS for more details
+(open access [here](https://static.aminer.org/pdf/PDF/000/317/196/spatio_temporal_wiener_filtering_of_image_sequences_using_a_parametric.pdf)).
 
 @param srcImgs Input 8-bit 1-channel, 2-channel, 3-channel or
 4-channel images sequence. All images should have the same type and
@@ -210,7 +209,7 @@ size.
 @param imgToDenoiseIndex Target image to denoise index in srcImgs sequence
 @param temporalWindowSize Number of surrounding images to use for target image denoising. Should
 be odd. Images from imgToDenoiseIndex - temporalWindowSize / 2 to
-imgToDenoiseIndex - temporalWindowSize / 2 from srcImgs will be used to denoise
+imgToDenoiseIndex + temporalWindowSize / 2 from srcImgs will be used to denoise
 srcImgs[imgToDenoiseIndex] image.
 @param dst Output image with the same size and type as srcImgs images.
 @param templateWindowSize Size in pixels of the template patch that is used to compute weights.
@@ -228,8 +227,8 @@ CV_EXPORTS_W void fastNlMeansDenoisingMulti( InputArrayOfArrays srcImgs, OutputA
 
 /** @brief Modification of fastNlMeansDenoising function for images sequence where consecutive images have been
 captured in small period of time. For example video. This version of the function is for grayscale
-images or for manual manipulation with colorspaces. For more details see
-<http://citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.131.6394>
+images or for manual manipulation with colorspaces. See @cite Buades2005DenoisingIS for more details
+(open access [here](https://static.aminer.org/pdf/PDF/000/317/196/spatio_temporal_wiener_filtering_of_image_sequences_using_a_parametric.pdf)).
 
 @param srcImgs Input 8-bit or 16-bit (only with NORM_L1) 1-channel,
 2-channel, 3-channel or 4-channel images sequence. All images should
@@ -237,7 +236,7 @@ have the same type and size.
 @param imgToDenoiseIndex Target image to denoise index in srcImgs sequence
 @param temporalWindowSize Number of surrounding images to use for target image denoising. Should
 be odd. Images from imgToDenoiseIndex - temporalWindowSize / 2 to
-imgToDenoiseIndex - temporalWindowSize / 2 from srcImgs will be used to denoise
+imgToDenoiseIndex + temporalWindowSize / 2 from srcImgs will be used to denoise
 srcImgs[imgToDenoiseIndex] image.
 @param dst Output image with the same size and type as srcImgs images.
 @param templateWindowSize Size in pixels of the template patch that is used to compute weights.
@@ -264,7 +263,7 @@ size.
 @param imgToDenoiseIndex Target image to denoise index in srcImgs sequence
 @param temporalWindowSize Number of surrounding images to use for target image denoising. Should
 be odd. Images from imgToDenoiseIndex - temporalWindowSize / 2 to
-imgToDenoiseIndex - temporalWindowSize / 2 from srcImgs will be used to denoise
+imgToDenoiseIndex + temporalWindowSize / 2 from srcImgs will be used to denoise
 srcImgs[imgToDenoiseIndex] image.
 @param dst Output image with the same size and type as srcImgs images.
 @param templateWindowSize Size in pixels of the template patch that is used to compute weights.
@@ -709,33 +708,74 @@ CV_EXPORTS_W void decolor( InputArray src, OutputArray grayscale, OutputArray co
 //! @{
 
 
-//! seamlessClone algorithm flags
-enum
+//! Flags for the seamlessClone algorithm
+enum SeamlessCloneFlags
 {
-    /** The power of the method is fully expressed when inserting objects with complex outlines into a new background*/
+    /**
+    @brief Normal seamless cloning.
+    This method is ideal for inserting objects with complex outlines into a new background.
+    It preserves the original appearance and lighting of the inserted object, ensuring a natural blend.
+     */
     NORMAL_CLONE = 1,
-    /** The classic method, color-based selection and alpha masking might be time consuming and often leaves an undesirable
-    halo. Seamless cloning, even averaged with the original image, is not effective. Mixed seamless cloning based on a loose selection proves effective.*/
-    MIXED_CLONE  = 2,
-    /** Monochrome transfer allows the user to easily replace certain features of one object by alternative features.*/
-    MONOCHROME_TRANSFER = 3};
+
+    /**
+    @brief Mixed seamless cloning.
+    This method addresses cases where simple color-based selection or alpha masking is time-consuming
+    and may result in undesirable halos. By combining structure from the source and texture from the
+    destination, mixed seamless cloning is highly effective, even with loosely defined selections.
+     */
+    MIXED_CLONE = 2,
+
+    /**
+    @brief Monochrome transfer cloning.
+    This method allows users to replace specific features of an object, such as grayscale textures
+    or patterns, with alternative features. It is particularly useful for artistic effects or
+    targeted object modifications.
+     */
+    MONOCHROME_TRANSFER = 3,
+
+    /**
+    @brief Enhanced normal seamless cloning.
+    Similar to `NORMAL_CLONE`, but with an advanced approach to ROI (Region of Interest) calculation.
+    This mode processes a larger source region by considering the entire mask area instead of only
+    the bounding rectangle of non-zero pixels.
+     */
+    NORMAL_CLONE_WIDE = 9,
+
+    /**
+    @brief Enhanced mixed seamless cloning.
+    Similar to `MIXED_CLONE`, but with an advanced approach to ROI (Region of Interest) calculation.
+    This mode processes a larger source region by considering the entire mask area instead of only
+    the bounding rectangle of non-zero pixels.
+     */
+    MIXED_CLONE_WIDE = 10,
+
+    /**
+    @brief Enhanced monochrome transfer cloning.
+    Similar to `MONOCHROME_TRANSFER`, but with an advanced approach to ROI (Region of Interest) calculation.
+    This mode processes a larger source region by considering the entire mask area instead of only
+    the bounding rectangle of non-zero pixels.
+     */
+    MONOCHROME_TRANSFER_WIDE = 11
+};
 
 
 /** @example samples/cpp/tutorial_code/photo/seamless_cloning/cloning_demo.cpp
 An example using seamlessClone function
 */
-/** @brief Image editing tasks concern either global changes (color/intensity corrections, filters,
-deformations) or local changes concerned to a selection. Here we are interested in achieving local
-changes, ones that are restricted to a region manually selected (ROI), in a seamless and effortless
-manner. The extent of the changes ranges from slight distortions to complete replacement by novel
-content @cite PM03 .
-
-@param src Input 8-bit 3-channel image.
-@param dst Input 8-bit 3-channel image.
-@param mask Input 8-bit 1 or 3-channel image.
-@param p Point in dst image where object is placed.
-@param blend Output image with the same size and type as dst.
-@param flags Cloning method that could be cv::NORMAL_CLONE, cv::MIXED_CLONE or cv::MONOCHROME_TRANSFER
+/** @brief Performs seamless cloning to blend a region from a source image into a destination image.
+This function is designed for local image editing, allowing changes restricted to a region
+(manually selected as the ROI) to be applied effortlessly and seamlessly. These changes can
+range from slight distortions to complete replacement by novel content @cite PM03.
+
+@param src The source image (8-bit 3-channel), from which a region will be blended into the destination.
+@param dst The destination image (8-bit 3-channel), where the src image will be blended.
+@param mask A binary mask (8-bit, 1, 3, or 4-channel) specifying the region in the source image to blend.
+Non-zero pixels indicate the region to be blended. If an empty Mat is provided, a mask with
+all non-zero pixels is created internally.
+@param p The point where the center of the src image is placed in the dst image.
+@param blend The output image that stores the result of the seamless cloning. It has the same size and type as `dst`.
+@param flags Flags that control the type of cloning method, can take values of `cv::SeamlessCloneFlags`.
  */
 CV_EXPORTS_W void seamlessClone( InputArray src, InputArray dst, InputArray mask, Point p,
         OutputArray blend, int flags);
diff --git a/3rdParty/opencv-4.12.0/opencv2/photo/cuda.hpp b/3rdParty/opencv-4.12.0/opencv2/photo/cuda.hpp
new file mode 100644
index 0000000000..cb1dd9caff
--- /dev/null
+++ b/3rdParty/opencv-4.12.0/opencv2/photo/cuda.hpp
@@ -0,0 +1,157 @@
+/*M///////////////////////////////////////////////////////////////////////////////////////
+//
+//  IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
+//
+//  By downloading, copying, installing or using the software you agree to this license.
+//  If you do not agree to this license, do not download, install,
+//  copy or use the software.
+//
+//
+//                           License Agreement
+//                For Open Source Computer Vision Library
+//
+// Copyright (C) 2000-2008, Intel Corporation, all rights reserved.
+// Copyright (C) 2008-2012, Willow Garage Inc., all rights reserved.
+// Third party copyrights are property of their respective owners.
+//
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
+//
+//   * Redistribution's of source code must retain the above copyright notice,
+//     this list of conditions and the following disclaimer.
+//
+//   * Redistribution's in binary form must reproduce the above copyright notice,
+//     this list of conditions and the following disclaimer in the documentation
+//     and/or other materials provided with the distribution.
+//
+//   * The name of the copyright holders may not be used to endorse or promote products
+//     derived from this software without specific prior written permission.
+//
+// This software is provided by the copyright holders and contributors "as is" and
+// any express or implied warranties, including, but not limited to, the implied
+// warranties of merchantability and fitness for a particular purpose are disclaimed.
+// In no event shall the Intel Corporation or contributors be liable for any direct,
+// indirect, incidental, special, exemplary, or consequential damages
+// (including, but not limited to, procurement of substitute goods or services;
+// loss of use, data, or profits; or business interruption) however caused
+// and on any theory of liability, whether in contract, strict liability,
+// or tort (including negligence or otherwise) arising in any way out of
+// the use of this software, even if advised of the possibility of such damage.
+//
+//M*/
+
+#ifndef OPENCV_PHOTO_CUDA_HPP
+#define OPENCV_PHOTO_CUDA_HPP
+
+#include "opencv2/core/cuda.hpp"
+
+namespace cv { namespace cuda {
+
+//! @addtogroup photo_denoise
+//! @{
+
+/** @brief Performs pure non local means denoising without any simplification, and thus it is not fast.
+
+@param src Source image. Supports only CV_8UC1, CV_8UC2 and CV_8UC3.
+@param dst Destination image.
+@param h Filter sigma regulating filter strength for color.
+@param search_window Size of search window.
+@param block_size Size of block used for computing weights.
+@param borderMode Border type. See borderInterpolate for details. BORDER_REFLECT101 ,
+BORDER_REPLICATE , BORDER_CONSTANT , BORDER_REFLECT and BORDER_WRAP are supported for now.
+@param stream Stream for the asynchronous version.
+
+@sa
+   fastNlMeansDenoising
+ */
+CV_EXPORTS void nonLocalMeans(InputArray src, OutputArray dst,
+                            float h,
+                            int search_window = 21,
+                            int block_size = 7,
+                            int borderMode = BORDER_DEFAULT,
+                            Stream& stream = Stream::Null());
+CV_WRAP inline void nonLocalMeans(const GpuMat& src, CV_OUT GpuMat& dst,
+                            float h,
+                            int search_window = 21,
+                            int block_size = 7,
+                            int borderMode = BORDER_DEFAULT,
+                            Stream& stream = Stream::Null())
+{
+    nonLocalMeans(InputArray(src), OutputArray(dst), h, search_window, block_size, borderMode, stream);
+}
+
+/** @brief Perform image denoising using Non-local Means Denoising algorithm
+<http://www.ipol.im/pub/algo/bcm_non_local_means_denoising> with several computational
+optimizations. Noise expected to be a gaussian white noise
+
+@param src Input 8-bit 1-channel, 2-channel or 3-channel image.
+@param dst Output image with the same size and type as src .
+@param h Parameter regulating filter strength. Big h value perfectly removes noise but also
+removes image details, smaller h value preserves details but also preserves some noise
+@param search_window Size in pixels of the window that is used to compute weighted average for
+given pixel. Should be odd. Affect performance linearly: greater search_window - greater
+denoising time. Recommended value 21 pixels
+@param block_size Size in pixels of the template patch that is used to compute weights. Should be
+odd. Recommended value 7 pixels
+@param stream Stream for the asynchronous invocations.
+
+This function expected to be applied to grayscale images. For colored images look at
+FastNonLocalMeansDenoising::labMethod.
+
+@sa
+   fastNlMeansDenoising
+ */
+CV_EXPORTS void fastNlMeansDenoising(InputArray src, OutputArray dst,
+                                    float h,
+                                    int search_window = 21,
+                                    int block_size = 7,
+                                    Stream& stream = Stream::Null());
+CV_WRAP inline void fastNlMeansDenoising(const GpuMat& src, CV_OUT GpuMat& dst,
+                                    float h,
+                                    int search_window = 21,
+                                    int block_size = 7,
+                                    Stream& stream = Stream::Null())
+{
+    fastNlMeansDenoising(InputArray(src), OutputArray(dst), h, search_window, block_size, stream);
+}
+
+/** @brief Modification of fastNlMeansDenoising function for colored images
+
+@param src Input 8-bit 3-channel image.
+@param dst Output image with the same size and type as src .
+@param h_luminance Parameter regulating filter strength. Big h value perfectly removes noise but
+also removes image details, smaller h value preserves details but also preserves some noise
+@param photo_render float The same as h but for color components. For most images value equals 10 will be
+enough to remove colored noise and do not distort colors
+@param search_window Size in pixels of the window that is used to compute weighted average for
+given pixel. Should be odd. Affect performance linearly: greater search_window - greater
+denoising time. Recommended value 21 pixels
+@param block_size Size in pixels of the template patch that is used to compute weights. Should be
+odd. Recommended value 7 pixels
+@param stream Stream for the asynchronous invocations.
+
+The function converts image to CIELAB colorspace and then separately denoise L and AB components
+with given h parameters using FastNonLocalMeansDenoising::simpleMethod function.
+
+@sa
+   fastNlMeansDenoisingColored
+ */
+CV_EXPORTS void fastNlMeansDenoisingColored(InputArray src, OutputArray dst,
+                                            float h_luminance, float photo_render,
+                                            int search_window = 21,
+                                            int block_size = 7,
+                                            Stream& stream = Stream::Null());
+CV_WRAP inline void fastNlMeansDenoisingColored(const GpuMat& src, CV_OUT GpuMat& dst,
+                                            float h_luminance, float photo_render,
+                                            int search_window = 21,
+                                            int block_size = 7,
+                                            Stream& stream = Stream::Null())
+{
+    fastNlMeansDenoisingColored(InputArray(src), OutputArray(dst), h_luminance, photo_render, search_window, block_size, stream);
+}
+
+//! @} photo
+
+}} // namespace cv { namespace cuda {
+
+#endif /* OPENCV_PHOTO_CUDA_HPP */
diff --git a/3rdParty/opencv2/photo/legacy/constants_c.h b/3rdParty/opencv-4.12.0/opencv2/photo/legacy/constants_c.h
similarity index 100%
rename from 3rdParty/opencv2/photo/legacy/constants_c.h
rename to 3rdParty/opencv-4.12.0/opencv2/photo/legacy/constants_c.h
diff --git a/3rdParty/opencv2/photo/photo.hpp b/3rdParty/opencv-4.12.0/opencv2/photo/photo.hpp
similarity index 100%
rename from 3rdParty/opencv2/photo/photo.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/photo/photo.hpp
diff --git a/3rdParty/opencv2/stitching.hpp b/3rdParty/opencv-4.12.0/opencv2/stitching.hpp
similarity index 93%
rename from 3rdParty/opencv2/stitching.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/stitching.hpp
index 13622401ce..b38210d9d4 100644
--- a/3rdParty/opencv2/stitching.hpp
+++ b/3rdParty/opencv-4.12.0/opencv2/stitching.hpp
@@ -299,9 +299,22 @@ class CV_EXPORTS_W Stitcher
      */
     CV_WRAP Status stitch(InputArrayOfArrays images, InputArrayOfArrays masks, OutputArray pano);
 
-    std::vector<int> component() const { return indices_; }
-    std::vector<detail::CameraParams> cameras() const { return cameras_; }
+    /** @brief Returns indeces of input images used in panorama stitching
+     */
+    CV_WRAP std::vector<int> component() const { return indices_; }
+
+    /** Returns estimated camera parameters for all stitched images
+     */
+    CV_WRAP std::vector<cv::detail::CameraParams> cameras() const { return cameras_; }
     CV_WRAP double workScale() const { return work_scale_; }
+
+    /** @brief Return the mask of the panorama.
+
+    The mask is a 8U UMat with the values: 0xFF (white) for pixels filled by the input images,
+    0 (black) for unused pixels. It can be used as the mask for inpaint.
+
+    @return The mask.
+     */
     UMat resultMask() const { return result_mask_; }
 
 private:
diff --git a/3rdParty/opencv2/stitching/detail/autocalib.hpp b/3rdParty/opencv-4.12.0/opencv2/stitching/detail/autocalib.hpp
similarity index 100%
rename from 3rdParty/opencv2/stitching/detail/autocalib.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/stitching/detail/autocalib.hpp
diff --git a/3rdParty/opencv2/stitching/detail/blenders.hpp b/3rdParty/opencv-4.12.0/opencv2/stitching/detail/blenders.hpp
similarity index 100%
rename from 3rdParty/opencv2/stitching/detail/blenders.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/stitching/detail/blenders.hpp
diff --git a/3rdParty/opencv2/stitching/detail/camera.hpp b/3rdParty/opencv-4.12.0/opencv2/stitching/detail/camera.hpp
similarity index 100%
rename from 3rdParty/opencv2/stitching/detail/camera.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/stitching/detail/camera.hpp
diff --git a/3rdParty/opencv2/stitching/detail/exposure_compensate.hpp b/3rdParty/opencv-4.12.0/opencv2/stitching/detail/exposure_compensate.hpp
similarity index 95%
rename from 3rdParty/opencv2/stitching/detail/exposure_compensate.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/stitching/detail/exposure_compensate.hpp
index 0111e7980a..fb4eb71eb4 100644
--- a/3rdParty/opencv2/stitching/detail/exposure_compensate.hpp
+++ b/3rdParty/opencv-4.12.0/opencv2/stitching/detail/exposure_compensate.hpp
@@ -85,10 +85,10 @@ class CV_EXPORTS_W ExposureCompensator
     @param mask Image mask
         */
     CV_WRAP virtual void apply(int index, Point corner, InputOutputArray image, InputArray mask) = 0;
-    CV_WRAP virtual void getMatGains(CV_OUT std::vector<Mat>& ) {CV_Error(Error::StsInternal, "");};
-    CV_WRAP virtual void setMatGains(std::vector<Mat>& ) { CV_Error(Error::StsInternal, ""); };
-    CV_WRAP void setUpdateGain(bool b) { updateGain = b; };
-    CV_WRAP bool getUpdateGain() { return updateGain; };
+    CV_WRAP virtual void getMatGains(CV_OUT std::vector<Mat>& ) {CV_Error(Error::StsInternal, "");}
+    CV_WRAP virtual void setMatGains(std::vector<Mat>& ) { CV_Error(Error::StsInternal, ""); }
+    CV_WRAP void setUpdateGain(bool b) { updateGain = b; }
+    CV_WRAP bool getUpdateGain() { return updateGain; }
 protected :
     bool updateGain;
 };
@@ -101,8 +101,8 @@ class CV_EXPORTS_W NoExposureCompensator : public ExposureCompensator
     void feed(const std::vector<Point> &/*corners*/, const std::vector<UMat> &/*images*/,
               const std::vector<std::pair<UMat,uchar> > &/*masks*/) CV_OVERRIDE { }
     CV_WRAP void apply(int /*index*/, Point /*corner*/, InputOutputArray /*image*/, InputArray /*mask*/) CV_OVERRIDE { }
-    CV_WRAP void getMatGains(CV_OUT std::vector<Mat>& umv) CV_OVERRIDE { umv.clear(); return; };
-    CV_WRAP void setMatGains(std::vector<Mat>& umv) CV_OVERRIDE { umv.clear(); return; };
+    CV_WRAP void getMatGains(CV_OUT std::vector<Mat>& umv) CV_OVERRIDE { umv.clear(); return; }
+    CV_WRAP void setMatGains(std::vector<Mat>& umv) CV_OVERRIDE { umv.clear(); return; }
 };
 
 /** @brief Exposure compensator which tries to remove exposure related artifacts by adjusting image
diff --git a/3rdParty/opencv2/stitching/detail/matchers.hpp b/3rdParty/opencv-4.12.0/opencv2/stitching/detail/matchers.hpp
similarity index 85%
rename from 3rdParty/opencv2/stitching/detail/matchers.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/stitching/detail/matchers.hpp
index 32fdb490a8..44a623ae6c 100644
--- a/3rdParty/opencv2/stitching/detail/matchers.hpp
+++ b/3rdParty/opencv-4.12.0/opencv2/stitching/detail/matchers.hpp
@@ -61,7 +61,7 @@ struct CV_EXPORTS_W_SIMPLE ImageFeatures
     CV_PROP_RW Size img_size;
     CV_PROP_RW std::vector<KeyPoint> keypoints;
     CV_PROP_RW UMat descriptors;
-    CV_WRAP std::vector<KeyPoint> getKeypoints() { return keypoints; };
+    CV_WRAP std::vector<KeyPoint> getKeypoints() { return keypoints; }
 };
 /** @brief
 
@@ -109,8 +109,8 @@ struct CV_EXPORTS_W_SIMPLE MatchesInfo
     CV_PROP_RW int num_inliers;                    //!< Number of geometrically consistent matches
     CV_PROP_RW Mat H;                              //!< Estimated transformation
     CV_PROP_RW double confidence;                  //!< Confidence two images are from the same panorama
-    CV_WRAP std::vector<DMatch> getMatches() { return matches; };
-    CV_WRAP std::vector<uchar> getInliers() { return inliers_mask; };
+    CV_WRAP std::vector<DMatch> getMatches() { return matches; }
+    CV_WRAP std::vector<uchar> getInliers() { return inliers_mask; }
 };
 
 /** @brief Feature matchers base class. */
@@ -138,7 +138,7 @@ class CV_EXPORTS_W FeaturesMatcher
     @sa detail::MatchesInfo
     */
     CV_WRAP_AS(apply2) void operator ()(const std::vector<ImageFeatures> &features, CV_OUT std::vector<MatchesInfo> &pairwise_matches,
-                     const cv::UMat &mask = cv::UMat());
+                                        const cv::UMat &mask = cv::UMat()) { match(features, pairwise_matches, mask); }
 
     /** @return True, if it's possible to use the same matcher instance in parallel, false otherwise
     */
@@ -161,6 +161,16 @@ class CV_EXPORTS_W FeaturesMatcher
     virtual void match(const ImageFeatures &features1, const ImageFeatures &features2,
                        MatchesInfo& matches_info) = 0;
 
+    /** @brief This method implements logic to match features between arbitrary number of features.
+    By default this checks every pair of inputs in the input, but the behaviour can be changed by subclasses.
+
+    @param features vector of image features
+    @param pairwise_matches found matches
+    @param mask (optional) mask indicating which image pairs should be matched
+     */
+    virtual void match(const std::vector<ImageFeatures> &features, std::vector<MatchesInfo> &pairwise_matches,
+                       const cv::UMat &mask = cv::UMat());
+
     bool is_thread_safe_;
 };
 
@@ -180,19 +190,22 @@ class CV_EXPORTS_W BestOf2NearestMatcher : public FeaturesMatcher
     estimation used in the inliers classification step
     @param num_matches_thresh2 Minimum number of matches required for the 2D projective transform
     re-estimation on inliers
+    @param matches_confindece_thresh Matching confidence threshold to take the match into account.
+    The threshold was determined experimentally and set to 3 by default.
      */
     CV_WRAP BestOf2NearestMatcher(bool try_use_gpu = false, float match_conf = 0.3f, int num_matches_thresh1 = 6,
-                          int num_matches_thresh2 = 6);
+                          int num_matches_thresh2 = 6, double matches_confindece_thresh = 3.);
 
     CV_WRAP void collectGarbage() CV_OVERRIDE;
     CV_WRAP static Ptr<BestOf2NearestMatcher> create(bool try_use_gpu = false, float match_conf = 0.3f, int num_matches_thresh1 = 6,
-        int num_matches_thresh2 = 6);
+        int num_matches_thresh2 = 6, double matches_confindece_thresh = 3.);
 
 protected:
 
     void match(const ImageFeatures &features1, const ImageFeatures &features2, MatchesInfo &matches_info) CV_OVERRIDE;
     int num_matches_thresh1_;
     int num_matches_thresh2_;
+    double matches_confindece_thresh_;
     Ptr<FeaturesMatcher> impl_;
 };
 
@@ -202,11 +215,12 @@ class CV_EXPORTS_W BestOf2NearestRangeMatcher : public BestOf2NearestMatcher
     CV_WRAP BestOf2NearestRangeMatcher(int range_width = 5, bool try_use_gpu = false, float match_conf = 0.3f,
                             int num_matches_thresh1 = 6, int num_matches_thresh2 = 6);
 
-    void operator ()(const std::vector<ImageFeatures> &features, std::vector<MatchesInfo> &pairwise_matches,
-                     const cv::UMat &mask = cv::UMat());
-
-
 protected:
+    // indicate that we do not want to hide the base class match method with a different signature
+    using BestOf2NearestMatcher::match;
+    void match(const std::vector<ImageFeatures> &features, std::vector<MatchesInfo> &pairwise_matches,
+               const cv::UMat &mask = cv::UMat()) CV_OVERRIDE;
+
     int range_width_;
 };
 
diff --git a/3rdParty/opencv2/stitching/detail/motion_estimators.hpp b/3rdParty/opencv-4.12.0/opencv2/stitching/detail/motion_estimators.hpp
similarity index 96%
rename from 3rdParty/opencv2/stitching/detail/motion_estimators.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/stitching/detail/motion_estimators.hpp
index 07bd032c6f..00c61343a2 100644
--- a/3rdParty/opencv2/stitching/detail/motion_estimators.hpp
+++ b/3rdParty/opencv-4.12.0/opencv2/stitching/detail/motion_estimators.hpp
@@ -353,8 +353,8 @@ void CV_EXPORTS_W waveCorrect(CV_IN_OUT std::vector<Mat> &rmats, WaveCorrectKind
 // Auxiliary functions
 
 // Returns matches graph representation in DOT language
-String CV_EXPORTS_W matchesGraphAsString(std::vector<String> &pathes, std::vector<MatchesInfo> &pairwise_matches,
-                                            float conf_threshold);
+String CV_EXPORTS_W matchesGraphAsString(std::vector<String> &paths, std::vector<MatchesInfo> &pairwise_matches,
+                                         float conf_threshold);
 
 CV_EXPORTS_W std::vector<int>  leaveBiggestComponent(
         std::vector<ImageFeatures> &features,
diff --git a/3rdParty/opencv2/stitching/detail/seam_finders.hpp b/3rdParty/opencv-4.12.0/opencv2/stitching/detail/seam_finders.hpp
similarity index 96%
rename from 3rdParty/opencv2/stitching/detail/seam_finders.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/stitching/detail/seam_finders.hpp
index 1fa8324ce4..291b801ead 100644
--- a/3rdParty/opencv2/stitching/detail/seam_finders.hpp
+++ b/3rdParty/opencv-4.12.0/opencv2/stitching/detail/seam_finders.hpp
@@ -235,7 +235,7 @@ class CV_EXPORTS GraphCutSeamFinderBase
     enum CostType { COST_COLOR, COST_COLOR_GRAD };
 };
 
-/** @brief Minimum graph cut-based seam estimator. See details in @cite V03 .
+/** @brief Minimum graph cut-based seam estimator. See details in @cite Kwatra03 .
  */
 class CV_EXPORTS_W GraphCutSeamFinder : public GraphCutSeamFinderBase, public SeamFinder
 {
@@ -248,7 +248,7 @@ class CV_EXPORTS_W GraphCutSeamFinder : public GraphCutSeamFinderBase, public Se
     ~GraphCutSeamFinder();
 
     CV_WRAP void find(const std::vector<UMat> &src, const std::vector<Point> &corners,
-              std::vector<UMat> &masks) CV_OVERRIDE;
+                      CV_IN_OUT std::vector<UMat> &masks) CV_OVERRIDE;
 
 private:
     // To avoid GCGraph dependency
diff --git a/3rdParty/opencv2/stitching/detail/timelapsers.hpp b/3rdParty/opencv-4.12.0/opencv2/stitching/detail/timelapsers.hpp
similarity index 100%
rename from 3rdParty/opencv2/stitching/detail/timelapsers.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/stitching/detail/timelapsers.hpp
diff --git a/3rdParty/opencv2/stitching/detail/util.hpp b/3rdParty/opencv-4.12.0/opencv2/stitching/detail/util.hpp
similarity index 100%
rename from 3rdParty/opencv2/stitching/detail/util.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/stitching/detail/util.hpp
diff --git a/3rdParty/opencv2/stitching/detail/util_inl.hpp b/3rdParty/opencv-4.12.0/opencv2/stitching/detail/util_inl.hpp
similarity index 100%
rename from 3rdParty/opencv2/stitching/detail/util_inl.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/stitching/detail/util_inl.hpp
diff --git a/3rdParty/opencv-4.12.0/opencv2/stitching/detail/warpers.hpp b/3rdParty/opencv-4.12.0/opencv2/stitching/detail/warpers.hpp
new file mode 100644
index 0000000000..7dd16871e7
--- /dev/null
+++ b/3rdParty/opencv-4.12.0/opencv2/stitching/detail/warpers.hpp
@@ -0,0 +1,706 @@
+ /*M///////////////////////////////////////////////////////////////////////////////////////
+//
+//  IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
+//
+//  By downloading, copying, installing or using the software you agree to this license.
+//  If you do not agree to this license, do not download, install,
+//  copy or use the software.
+//
+//
+//                          License Agreement
+//                For Open Source Computer Vision Library
+//
+// Copyright (C) 2000-2008, Intel Corporation, all rights reserved.
+// Copyright (C) 2009, Willow Garage Inc., all rights reserved.
+// Third party copyrights are property of their respective owners.
+//
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
+//
+//   * Redistribution's of source code must retain the above copyright notice,
+//     this list of conditions and the following disclaimer.
+//
+//   * Redistribution's in binary form must reproduce the above copyright notice,
+//     this list of conditions and the following disclaimer in the documentation
+//     and/or other materials provided with the distribution.
+//
+//   * The name of the copyright holders may not be used to endorse or promote products
+//     derived from this software without specific prior written permission.
+//
+// This software is provided by the copyright holders and contributors "as is" and
+// any express or implied warranties, including, but not limited to, the implied
+// warranties of merchantability and fitness for a particular purpose are disclaimed.
+// In no event shall the Intel Corporation or contributors be liable for any direct,
+// indirect, incidental, special, exemplary, or consequential damages
+// (including, but not limited to, procurement of substitute goods or services;
+// loss of use, data, or profits; or business interruption) however caused
+// and on any theory of liability, whether in contract, strict liability,
+// or tort (including negligence or otherwise) arising in any way out of
+// the use of this software, even if advised of the possibility of such damage.
+//
+//M*/
+
+#ifndef OPENCV_STITCHING_WARPERS_HPP
+#define OPENCV_STITCHING_WARPERS_HPP
+
+#include "opencv2/core.hpp"
+#include "opencv2/core/cuda.hpp"
+#include "opencv2/imgproc.hpp"
+#include "opencv2/opencv_modules.hpp"
+
+namespace cv {
+namespace detail {
+
+//! @addtogroup stitching_warp
+//! @{
+
+/** @brief Rotation-only model image warper interface.
+ */
+class CV_EXPORTS RotationWarper
+{
+public:
+    virtual ~RotationWarper() {}
+
+    /** @brief Projects the image point.
+
+    @param pt Source point
+    @param K Camera intrinsic parameters
+    @param R Camera rotation matrix
+    @return Projected point
+     */
+    virtual Point2f warpPoint(const Point2f &pt, InputArray K, InputArray R) = 0;
+
+    /** @brief Projects the image point backward.
+
+    @param pt Projected point
+    @param K Camera intrinsic parameters
+    @param R Camera rotation matrix
+    @return Backward-projected point
+    */
+#if CV_VERSION_MAJOR == 4
+    virtual Point2f warpPointBackward(const Point2f& pt, InputArray K, InputArray R)
+    {
+        CV_UNUSED(pt); CV_UNUSED(K); CV_UNUSED(R);
+        CV_Error(Error::StsNotImplemented, "");
+    }
+#else
+    virtual Point2f warpPointBackward(const Point2f& pt, InputArray K, InputArray R) = 0;
+#endif
+
+    /** @brief Builds the projection maps according to the given camera data.
+
+    @param src_size Source image size
+    @param K Camera intrinsic parameters
+    @param R Camera rotation matrix
+    @param xmap Projection map for the x axis
+    @param ymap Projection map for the y axis
+    @return Projected image minimum bounding box
+     */
+    virtual Rect buildMaps(Size src_size, InputArray K, InputArray R, OutputArray xmap, OutputArray ymap) = 0;
+
+    /** @brief Projects the image.
+
+    @param src Source image
+    @param K Camera intrinsic parameters
+    @param R Camera rotation matrix
+    @param interp_mode Interpolation mode
+    @param border_mode Border extrapolation mode
+    @param dst Projected image
+    @return Project image top-left corner
+     */
+    virtual Point warp(InputArray src, InputArray K, InputArray R, int interp_mode, int border_mode,
+                       CV_OUT OutputArray dst) = 0;
+
+    /** @brief Projects the image backward.
+
+    @param src Projected image
+    @param K Camera intrinsic parameters
+    @param R Camera rotation matrix
+    @param interp_mode Interpolation mode
+    @param border_mode Border extrapolation mode
+    @param dst_size Backward-projected image size
+    @param dst Backward-projected image
+     */
+    virtual void warpBackward(InputArray src, InputArray K, InputArray R, int interp_mode, int border_mode,
+                              Size dst_size, CV_OUT OutputArray dst) = 0;
+
+    /**
+    @param src_size Source image bounding box
+    @param K Camera intrinsic parameters
+    @param R Camera rotation matrix
+    @return Projected image minimum bounding box
+     */
+    virtual Rect warpRoi(Size src_size, InputArray K, InputArray R) = 0;
+
+    virtual float getScale() const { return 1.f; }
+    virtual void setScale(float) {}
+};
+
+/** @brief Base class for warping logic implementation.
+ */
+struct CV_EXPORTS_W_SIMPLE ProjectorBase
+{
+    void setCameraParams(InputArray K = Mat::eye(3, 3, CV_32F),
+                         InputArray R = Mat::eye(3, 3, CV_32F),
+                         InputArray T = Mat::zeros(3, 1, CV_32F));
+
+    float scale;
+    float k[9];
+    float rinv[9];
+    float r_kinv[9];
+    float k_rinv[9];
+    float t[3];
+};
+
+/** @brief Base class for rotation-based warper using a detail::ProjectorBase_ derived class.
+ */
+template <class P>
+class CV_EXPORTS_TEMPLATE RotationWarperBase : public RotationWarper
+{
+public:
+    Point2f warpPoint(const Point2f &pt, InputArray K, InputArray R) CV_OVERRIDE;
+
+    Point2f warpPointBackward(const Point2f &pt, InputArray K, InputArray R) CV_OVERRIDE;
+
+    Rect buildMaps(Size src_size, InputArray K, InputArray R, OutputArray xmap, OutputArray ymap) CV_OVERRIDE;
+
+    Point warp(InputArray src, InputArray K, InputArray R, int interp_mode, int border_mode,
+               OutputArray dst) CV_OVERRIDE;
+
+    void warpBackward(InputArray src, InputArray K, InputArray R, int interp_mode, int border_mode,
+                      Size dst_size, OutputArray dst) CV_OVERRIDE;
+
+    Rect warpRoi(Size src_size, InputArray K, InputArray R) CV_OVERRIDE;
+
+    float getScale() const  CV_OVERRIDE{ return projector_.scale; }
+    void setScale(float val) CV_OVERRIDE { projector_.scale = val; }
+
+protected:
+
+    // Detects ROI of the destination image. It's correct for any projection.
+    virtual void detectResultRoi(Size src_size, Point &dst_tl, Point &dst_br);
+
+    // Detects ROI of the destination image by walking over image border.
+    // Correctness for any projection isn't guaranteed.
+    void detectResultRoiByBorder(Size src_size, Point &dst_tl, Point &dst_br);
+
+    P projector_;
+};
+
+
+struct CV_EXPORTS PlaneProjector : ProjectorBase
+{
+    void mapForward(float x, float y, float &u, float &v);
+    void mapBackward(float u, float v, float &x, float &y);
+};
+
+/** @brief Warper that maps an image onto the z = 1 plane.
+ */
+class CV_EXPORTS PlaneWarper : public RotationWarperBase<PlaneProjector>
+{
+public:
+    /** @brief Construct an instance of the plane warper class.
+
+    @param scale Projected image scale multiplier
+     */
+    PlaneWarper(float scale = 1.f) { projector_.scale = scale; }
+
+    Point2f warpPoint(const Point2f &pt, InputArray K, InputArray R) CV_OVERRIDE;
+    Point2f warpPoint(const Point2f &pt, InputArray K, InputArray R, InputArray T);
+
+    Point2f warpPointBackward(const Point2f& pt, InputArray K, InputArray R) CV_OVERRIDE;
+    Point2f warpPointBackward(const Point2f& pt, InputArray K, InputArray R, InputArray T);
+
+    virtual Rect buildMaps(Size src_size, InputArray K, InputArray R, InputArray T, CV_OUT OutputArray xmap, CV_OUT OutputArray ymap);
+    Rect buildMaps(Size src_size, InputArray K, InputArray R, CV_OUT OutputArray xmap, CV_OUT OutputArray ymap) CV_OVERRIDE;
+
+    Point warp(InputArray src, InputArray K, InputArray R,
+               int interp_mode, int border_mode, CV_OUT OutputArray dst) CV_OVERRIDE;
+    virtual Point warp(InputArray src, InputArray K, InputArray R, InputArray T, int interp_mode, int border_mode,
+        CV_OUT OutputArray dst);
+
+    Rect warpRoi(Size src_size, InputArray K, InputArray R) CV_OVERRIDE;
+    Rect warpRoi(Size src_size, InputArray K, InputArray R, InputArray T);
+
+protected:
+    void detectResultRoi(Size src_size, Point &dst_tl, Point &dst_br) CV_OVERRIDE;
+};
+
+
+/** @brief Affine warper that uses rotations and translations
+
+ Uses affine transformation in homogeneous coordinates to represent both rotation and
+ translation in camera rotation matrix.
+ */
+class CV_EXPORTS AffineWarper : public PlaneWarper
+{
+public:
+    /** @brief Construct an instance of the affine warper class.
+
+    @param scale Projected image scale multiplier
+     */
+    AffineWarper(float scale = 1.f) : PlaneWarper(scale) {}
+
+    /** @brief Projects the image point.
+
+    @param pt Source point
+    @param K Camera intrinsic parameters
+    @param H Camera extrinsic parameters
+    @return Projected point
+     */
+    Point2f warpPoint(const Point2f &pt, InputArray K, InputArray H) CV_OVERRIDE;
+
+    /** @brief Projects the image point backward.
+
+    @param pt Projected point
+    @param K Camera intrinsic parameters
+    @param H Camera extrinsic parameters
+    @return Backward-projected point
+    */
+    Point2f warpPointBackward(const Point2f &pt, InputArray K, InputArray H) CV_OVERRIDE;
+
+    /** @brief Builds the projection maps according to the given camera data.
+
+    @param src_size Source image size
+    @param K Camera intrinsic parameters
+    @param H Camera extrinsic parameters
+    @param xmap Projection map for the x axis
+    @param ymap Projection map for the y axis
+    @return Projected image minimum bounding box
+     */
+    Rect buildMaps(Size src_size, InputArray K, InputArray H, OutputArray xmap, OutputArray ymap) CV_OVERRIDE;
+
+    /** @brief Projects the image.
+
+    @param src Source image
+    @param K Camera intrinsic parameters
+    @param H Camera extrinsic parameters
+    @param interp_mode Interpolation mode
+    @param border_mode Border extrapolation mode
+    @param dst Projected image
+    @return Project image top-left corner
+     */
+    Point warp(InputArray src, InputArray K, InputArray H,
+               int interp_mode, int border_mode, OutputArray dst) CV_OVERRIDE;
+
+    /**
+    @param src_size Source image bounding box
+    @param K Camera intrinsic parameters
+    @param H Camera extrinsic parameters
+    @return Projected image minimum bounding box
+     */
+    Rect warpRoi(Size src_size, InputArray K, InputArray H) CV_OVERRIDE;
+
+protected:
+    /** @brief Extracts rotation and translation matrices from matrix H representing
+        affine transformation in homogeneous coordinates
+     */
+    void getRTfromHomogeneous(InputArray H, Mat &R, Mat &T);
+};
+
+
+struct CV_EXPORTS_W_SIMPLE SphericalProjector : ProjectorBase
+{
+    CV_WRAP void mapForward(float x, float y, float &u, float &v);
+    CV_WRAP void mapBackward(float u, float v, float &x, float &y);
+};
+
+
+/** @brief Warper that maps an image onto the unit sphere located at the origin.
+
+ Projects image onto unit sphere with origin at (0, 0, 0) and radius scale, measured in pixels.
+ A 360 panorama would therefore have a resulting width of 2 * scale * PI pixels.
+ Poles are located at (0, -1, 0) and (0, 1, 0) points.
+*/
+class CV_EXPORTS SphericalWarper : public RotationWarperBase<SphericalProjector>
+{
+public:
+    /** @brief Construct an instance of the spherical warper class.
+
+    @param scale Radius of the projected sphere, in pixels. An image spanning the
+                 whole sphere will have a width of 2 * scale * PI pixels.
+     */
+    SphericalWarper(float scale) { projector_.scale = scale; }
+
+    Rect buildMaps(Size src_size, InputArray K, InputArray R, OutputArray xmap, OutputArray ymap) CV_OVERRIDE;
+    Point warp(InputArray src, InputArray K, InputArray R, int interp_mode, int border_mode, OutputArray dst) CV_OVERRIDE;
+protected:
+    void detectResultRoi(Size src_size, Point &dst_tl, Point &dst_br) CV_OVERRIDE;
+};
+
+
+struct CV_EXPORTS CylindricalProjector : ProjectorBase
+{
+    void mapForward(float x, float y, float &u, float &v);
+    void mapBackward(float u, float v, float &x, float &y);
+};
+
+
+/** @brief Warper that maps an image onto the x\*x + z\*z = 1 cylinder.
+ */
+class CV_EXPORTS CylindricalWarper : public RotationWarperBase<CylindricalProjector>
+{
+public:
+    /** @brief Construct an instance of the cylindrical warper class.
+
+    @param scale Projected image scale multiplier
+     */
+    CylindricalWarper(float scale) { projector_.scale = scale; }
+
+    Rect buildMaps(Size src_size, InputArray K, InputArray R, OutputArray xmap, OutputArray ymap) CV_OVERRIDE;
+    Point warp(InputArray src, InputArray K, InputArray R, int interp_mode, int border_mode, OutputArray dst) CV_OVERRIDE;
+protected:
+    void detectResultRoi(Size src_size, Point &dst_tl, Point &dst_br) CV_OVERRIDE
+    {
+        RotationWarperBase<CylindricalProjector>::detectResultRoiByBorder(src_size, dst_tl, dst_br);
+    }
+};
+
+
+struct CV_EXPORTS FisheyeProjector : ProjectorBase
+{
+    void mapForward(float x, float y, float &u, float &v);
+    void mapBackward(float u, float v, float &x, float &y);
+};
+
+
+class CV_EXPORTS FisheyeWarper : public RotationWarperBase<FisheyeProjector>
+{
+public:
+    FisheyeWarper(float scale) { projector_.scale = scale; }
+};
+
+
+struct CV_EXPORTS StereographicProjector : ProjectorBase
+{
+    void mapForward(float x, float y, float &u, float &v);
+    void mapBackward(float u, float v, float &x, float &y);
+};
+
+
+class CV_EXPORTS StereographicWarper : public RotationWarperBase<StereographicProjector>
+{
+public:
+    StereographicWarper(float scale) { projector_.scale = scale; }
+};
+
+
+struct CV_EXPORTS CompressedRectilinearProjector : ProjectorBase
+{
+    float a, b;
+
+    void mapForward(float x, float y, float &u, float &v);
+    void mapBackward(float u, float v, float &x, float &y);
+};
+
+
+class CV_EXPORTS CompressedRectilinearWarper : public RotationWarperBase<CompressedRectilinearProjector>
+{
+public:
+    CompressedRectilinearWarper(float scale, float A = 1, float B = 1)
+    {
+        projector_.a = A;
+        projector_.b = B;
+        projector_.scale = scale;
+    }
+};
+
+
+struct CV_EXPORTS CompressedRectilinearPortraitProjector : ProjectorBase
+{
+    float a, b;
+
+    void mapForward(float x, float y, float &u, float &v);
+    void mapBackward(float u, float v, float &x, float &y);
+};
+
+
+class CV_EXPORTS CompressedRectilinearPortraitWarper : public RotationWarperBase<CompressedRectilinearPortraitProjector>
+{
+public:
+   CompressedRectilinearPortraitWarper(float scale, float A = 1, float B = 1)
+   {
+       projector_.a = A;
+       projector_.b = B;
+       projector_.scale = scale;
+   }
+};
+
+
+struct CV_EXPORTS PaniniProjector : ProjectorBase
+{
+    float a, b;
+
+    void mapForward(float x, float y, float &u, float &v);
+    void mapBackward(float u, float v, float &x, float &y);
+};
+
+
+class CV_EXPORTS PaniniWarper : public RotationWarperBase<PaniniProjector>
+{
+public:
+   PaniniWarper(float scale, float A = 1, float B = 1)
+   {
+       projector_.a = A;
+       projector_.b = B;
+       projector_.scale = scale;
+   }
+};
+
+
+struct CV_EXPORTS PaniniPortraitProjector : ProjectorBase
+{
+    float a, b;
+
+    void mapForward(float x, float y, float &u, float &v);
+    void mapBackward(float u, float v, float &x, float &y);
+};
+
+
+class CV_EXPORTS PaniniPortraitWarper : public RotationWarperBase<PaniniPortraitProjector>
+{
+public:
+   PaniniPortraitWarper(float scale, float A = 1, float B = 1)
+   {
+       projector_.a = A;
+       projector_.b = B;
+       projector_.scale = scale;
+   }
+
+};
+
+
+struct CV_EXPORTS MercatorProjector : ProjectorBase
+{
+    void mapForward(float x, float y, float &u, float &v);
+    void mapBackward(float u, float v, float &x, float &y);
+};
+
+
+class CV_EXPORTS MercatorWarper : public RotationWarperBase<MercatorProjector>
+{
+public:
+    MercatorWarper(float scale) { projector_.scale = scale; }
+};
+
+
+struct CV_EXPORTS TransverseMercatorProjector : ProjectorBase
+{
+    void mapForward(float x, float y, float &u, float &v);
+    void mapBackward(float u, float v, float &x, float &y);
+};
+
+
+class CV_EXPORTS TransverseMercatorWarper : public RotationWarperBase<TransverseMercatorProjector>
+{
+public:
+    TransverseMercatorWarper(float scale) { projector_.scale = scale; }
+};
+
+
+class CV_EXPORTS PlaneWarperGpu : public PlaneWarper
+{
+public:
+    PlaneWarperGpu(float scale = 1.f) : PlaneWarper(scale) {}
+
+// WARNING: unreachable code using Ninja
+#if defined _MSC_VER && _MSC_VER >= 1920
+#pragma warning(push)
+#pragma warning(disable: 4702)
+#endif
+    Rect buildMaps(Size src_size, InputArray K, InputArray R, OutputArray xmap, OutputArray ymap) CV_OVERRIDE
+    {
+        Rect result = buildMaps(src_size, K, R, d_xmap_, d_ymap_);
+        d_xmap_.download(xmap);
+        d_ymap_.download(ymap);
+        return result;
+    }
+
+    Rect buildMaps(Size src_size, InputArray K, InputArray R, InputArray T, OutputArray xmap, OutputArray ymap) CV_OVERRIDE
+    {
+        Rect result = buildMaps(src_size, K, R, T, d_xmap_, d_ymap_);
+        d_xmap_.download(xmap);
+        d_ymap_.download(ymap);
+        return result;
+    }
+
+    Point warp(InputArray src, InputArray K, InputArray R, int interp_mode, int border_mode,
+               OutputArray dst) CV_OVERRIDE
+    {
+        d_src_.upload(src);
+        Point result = warp(d_src_, K, R, interp_mode, border_mode, d_dst_);
+        d_dst_.download(dst);
+        return result;
+    }
+
+    Point warp(InputArray src, InputArray K, InputArray R, InputArray T, int interp_mode, int border_mode,
+               OutputArray dst) CV_OVERRIDE
+    {
+        d_src_.upload(src);
+        Point result = warp(d_src_, K, R, T, interp_mode, border_mode, d_dst_);
+        d_dst_.download(dst);
+        return result;
+    }
+#if defined _MSC_VER && _MSC_VER >= 1920
+#pragma warning(pop)
+#endif
+
+    Rect buildMaps(Size src_size, InputArray K, InputArray R, cuda::GpuMat & xmap, cuda::GpuMat & ymap);
+
+    Rect buildMaps(Size src_size, InputArray K, InputArray R, InputArray T, cuda::GpuMat & xmap, cuda::GpuMat & ymap);
+
+    Point warp(const cuda::GpuMat & src, InputArray K, InputArray R, int interp_mode, int border_mode,
+               cuda::GpuMat & dst);
+
+    Point warp(const cuda::GpuMat & src, InputArray K, InputArray R, InputArray T, int interp_mode, int border_mode,
+               cuda::GpuMat & dst);
+
+private:
+    cuda::GpuMat d_xmap_, d_ymap_, d_src_, d_dst_;
+};
+
+
+class CV_EXPORTS SphericalWarperGpu : public SphericalWarper
+{
+public:
+    SphericalWarperGpu(float scale) : SphericalWarper(scale) {}
+
+// WARNING: unreachable code using Ninja
+#if defined _MSC_VER && _MSC_VER >= 1920
+#pragma warning(push)
+#pragma warning(disable: 4702)
+#endif
+    Rect buildMaps(Size src_size, InputArray K, InputArray R, OutputArray xmap, OutputArray ymap) CV_OVERRIDE
+    {
+        Rect result = buildMaps(src_size, K, R, d_xmap_, d_ymap_);
+        d_xmap_.download(xmap);
+        d_ymap_.download(ymap);
+        return result;
+    }
+
+    Point warp(InputArray src, InputArray K, InputArray R, int interp_mode, int border_mode,
+               OutputArray dst) CV_OVERRIDE
+    {
+        d_src_.upload(src);
+        Point result = warp(d_src_, K, R, interp_mode, border_mode, d_dst_);
+        d_dst_.download(dst);
+        return result;
+    }
+#if defined _MSC_VER && _MSC_VER >= 1920
+#pragma warning(pop)
+#endif
+
+    Rect buildMaps(Size src_size, InputArray K, InputArray R, cuda::GpuMat & xmap, cuda::GpuMat & ymap);
+
+    Point warp(const cuda::GpuMat & src, InputArray K, InputArray R, int interp_mode, int border_mode,
+               cuda::GpuMat & dst);
+
+private:
+    cuda::GpuMat d_xmap_, d_ymap_, d_src_, d_dst_;
+};
+
+
+class CV_EXPORTS CylindricalWarperGpu : public CylindricalWarper
+{
+public:
+    CylindricalWarperGpu(float scale) : CylindricalWarper(scale) {}
+
+// WARNING: unreachable code using Ninja
+#if defined _MSC_VER && _MSC_VER >= 1920
+#pragma warning(push)
+#pragma warning(disable: 4702)
+#endif
+    Rect buildMaps(Size src_size, InputArray K, InputArray R, OutputArray xmap, OutputArray ymap) CV_OVERRIDE
+    {
+        Rect result = buildMaps(src_size, K, R, d_xmap_, d_ymap_);
+        d_xmap_.download(xmap);
+        d_ymap_.download(ymap);
+        return result;
+    }
+
+    Point warp(InputArray src, InputArray K, InputArray R, int interp_mode, int border_mode,
+               OutputArray dst) CV_OVERRIDE
+    {
+        d_src_.upload(src);
+        Point result = warp(d_src_, K, R, interp_mode, border_mode, d_dst_);
+        d_dst_.download(dst);
+        return result;
+    }
+#if defined _MSC_VER && _MSC_VER >= 1920
+#pragma warning(pop)
+#endif
+
+    Rect buildMaps(Size src_size, InputArray K, InputArray R, cuda::GpuMat & xmap, cuda::GpuMat & ymap);
+
+    Point warp(const cuda::GpuMat & src, InputArray K, InputArray R, int interp_mode, int border_mode,
+               cuda::GpuMat & dst);
+
+private:
+    cuda::GpuMat d_xmap_, d_ymap_, d_src_, d_dst_;
+};
+
+
+struct CV_EXPORTS SphericalPortraitProjector : ProjectorBase
+{
+    void mapForward(float x, float y, float &u, float &v);
+    void mapBackward(float u, float v, float &x, float &y);
+};
+
+
+// Projects image onto unit sphere with origin at (0, 0, 0).
+// Poles are located NOT at (0, -1, 0) and (0, 1, 0) points, BUT at (1, 0, 0) and (-1, 0, 0) points.
+class CV_EXPORTS SphericalPortraitWarper : public RotationWarperBase<SphericalPortraitProjector>
+{
+public:
+    SphericalPortraitWarper(float scale) { projector_.scale = scale; }
+
+protected:
+    void detectResultRoi(Size src_size, Point &dst_tl, Point &dst_br) CV_OVERRIDE;
+};
+
+struct CV_EXPORTS CylindricalPortraitProjector : ProjectorBase
+{
+    void mapForward(float x, float y, float &u, float &v);
+    void mapBackward(float u, float v, float &x, float &y);
+};
+
+
+class CV_EXPORTS CylindricalPortraitWarper : public RotationWarperBase<CylindricalPortraitProjector>
+{
+public:
+    CylindricalPortraitWarper(float scale) { projector_.scale = scale; }
+
+protected:
+    void detectResultRoi(Size src_size, Point &dst_tl, Point &dst_br) CV_OVERRIDE
+    {
+        RotationWarperBase<CylindricalPortraitProjector>::detectResultRoiByBorder(src_size, dst_tl, dst_br);
+    }
+};
+
+struct CV_EXPORTS PlanePortraitProjector : ProjectorBase
+{
+    void mapForward(float x, float y, float &u, float &v);
+    void mapBackward(float u, float v, float &x, float &y);
+};
+
+
+class CV_EXPORTS PlanePortraitWarper : public RotationWarperBase<PlanePortraitProjector>
+{
+public:
+    PlanePortraitWarper(float scale) { projector_.scale = scale; }
+
+protected:
+    void detectResultRoi(Size src_size, Point &dst_tl, Point &dst_br) CV_OVERRIDE
+    {
+        RotationWarperBase<PlanePortraitProjector>::detectResultRoiByBorder(src_size, dst_tl, dst_br);
+    }
+};
+
+//! @} stitching_warp
+
+} // namespace detail
+} // namespace cv
+
+#include "warpers_inl.hpp"
+
+#endif // OPENCV_STITCHING_WARPERS_HPP
diff --git a/3rdParty/opencv2/stitching/detail/warpers_inl.hpp b/3rdParty/opencv-4.12.0/opencv2/stitching/detail/warpers_inl.hpp
similarity index 100%
rename from 3rdParty/opencv2/stitching/detail/warpers_inl.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/stitching/detail/warpers_inl.hpp
diff --git a/3rdParty/opencv-4.12.0/opencv2/stitching/warpers.hpp b/3rdParty/opencv-4.12.0/opencv2/stitching/warpers.hpp
new file mode 100644
index 0000000000..34ef44e8f1
--- /dev/null
+++ b/3rdParty/opencv-4.12.0/opencv2/stitching/warpers.hpp
@@ -0,0 +1,277 @@
+/*M///////////////////////////////////////////////////////////////////////////////////////
+//
+//  IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
+//
+//  By downloading, copying, installing or using the software you agree to this license.
+//  If you do not agree to this license, do not download, install,
+//  copy or use the software.
+//
+//
+//                          License Agreement
+//                For Open Source Computer Vision Library
+//
+// Copyright (C) 2000-2008, Intel Corporation, all rights reserved.
+// Copyright (C) 2009, Willow Garage Inc., all rights reserved.
+// Third party copyrights are property of their respective owners.
+//
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
+//
+//   * Redistribution's of source code must retain the above copyright notice,
+//     this list of conditions and the following disclaimer.
+//
+//   * Redistribution's in binary form must reproduce the above copyright notice,
+//     this list of conditions and the following disclaimer in the documentation
+//     and/or other materials provided with the distribution.
+//
+//   * The name of the copyright holders may not be used to endorse or promote products
+//     derived from this software without specific prior written permission.
+//
+// This software is provided by the copyright holders and contributors "as is" and
+// any express or implied warranties, including, but not limited to, the implied
+// warranties of merchantability and fitness for a particular purpose are disclaimed.
+// In no event shall the Intel Corporation or contributors be liable for any direct,
+// indirect, incidental, special, exemplary, or consequential damages
+// (including, but not limited to, procurement of substitute goods or services;
+// loss of use, data, or profits; or business interruption) however caused
+// and on any theory of liability, whether in contract, strict liability,
+// or tort (including negligence or otherwise) arising in any way out of
+// the use of this software, even if advised of the possibility of such damage.
+//
+//M*/
+
+#ifndef OPENCV_STITCHING_WARPER_CREATORS_HPP
+#define OPENCV_STITCHING_WARPER_CREATORS_HPP
+
+#include "opencv2/stitching/detail/warpers.hpp"
+#include <string>
+
+namespace cv {
+    class CV_EXPORTS_W PyRotationWarper
+    {
+        Ptr<detail::RotationWarper> rw;
+
+    public:
+        CV_WRAP PyRotationWarper(String type, float scale);
+        CV_WRAP PyRotationWarper() {}
+        ~PyRotationWarper() {}
+
+        /** @brief Projects the image point.
+
+        @param pt Source point
+        @param K Camera intrinsic parameters
+        @param R Camera rotation matrix
+        @return Projected point
+        */
+        CV_WRAP Point2f warpPoint(const Point2f &pt, InputArray K, InputArray R);
+
+        /** @brief Projects the image point backward.
+
+        @param pt Projected point
+        @param K Camera intrinsic parameters
+        @param R Camera rotation matrix
+        @return Backward-projected point
+        */
+#if CV_VERSION_MAJOR == 4
+        CV_WRAP Point2f warpPointBackward(const Point2f& pt, InputArray K, InputArray R)
+        {
+            CV_UNUSED(pt); CV_UNUSED(K); CV_UNUSED(R);
+            CV_Error(Error::StsNotImplemented, "");
+        }
+#else
+        CV_WRAP Point2f warpPointBackward(const Point2f &pt, InputArray K, InputArray R);
+#endif
+        /** @brief Builds the projection maps according to the given camera data.
+
+        @param src_size Source image size
+        @param K Camera intrinsic parameters
+        @param R Camera rotation matrix
+        @param xmap Projection map for the x axis
+        @param ymap Projection map for the y axis
+        @return Projected image minimum bounding box
+        */
+        CV_WRAP Rect buildMaps(Size src_size, InputArray K, InputArray R, OutputArray xmap, OutputArray ymap);
+
+        /** @brief Projects the image.
+
+        @param src Source image
+        @param K Camera intrinsic parameters
+        @param R Camera rotation matrix
+        @param interp_mode Interpolation mode
+        @param border_mode Border extrapolation mode
+        @param dst Projected image
+        @return Project image top-left corner
+        */
+        CV_WRAP Point warp(InputArray src, InputArray K, InputArray R, int interp_mode, int border_mode,
+            CV_OUT OutputArray dst);
+
+        /** @brief Projects the image backward.
+
+        @param src Projected image
+        @param K Camera intrinsic parameters
+        @param R Camera rotation matrix
+        @param interp_mode Interpolation mode
+        @param border_mode Border extrapolation mode
+        @param dst_size Backward-projected image size
+        @param dst Backward-projected image
+        */
+        CV_WRAP void warpBackward(InputArray src, InputArray K, InputArray R, int interp_mode, int border_mode,
+            Size dst_size, CV_OUT OutputArray dst);
+
+        /**
+        @param src_size Source image bounding box
+        @param K Camera intrinsic parameters
+        @param R Camera rotation matrix
+        @return Projected image minimum bounding box
+        */
+        CV_WRAP Rect warpRoi(Size src_size, InputArray K, InputArray R);
+
+        CV_WRAP float getScale() const { return 1.f; }
+        CV_WRAP void setScale(float) {}
+    };
+
+//! @addtogroup stitching_warp
+//! @{
+
+/** @brief Image warper factories base class.
+ */
+
+class CV_EXPORTS_W WarperCreator
+{
+public:
+    CV_WRAP virtual ~WarperCreator() {}
+    virtual Ptr<detail::RotationWarper> create(float scale) const = 0;
+};
+
+
+/** @brief Plane warper factory class.
+  @sa detail::PlaneWarper
+ */
+class CV_EXPORTS  PlaneWarper : public WarperCreator
+{
+public:
+    Ptr<detail::RotationWarper> create(float scale) const CV_OVERRIDE { return makePtr<detail::PlaneWarper>(scale); }
+};
+
+/** @brief Affine warper factory class.
+  @sa detail::AffineWarper
+ */
+class CV_EXPORTS  AffineWarper : public WarperCreator
+{
+public:
+    Ptr<detail::RotationWarper> create(float scale) const CV_OVERRIDE { return makePtr<detail::AffineWarper>(scale); }
+};
+
+/** @brief Cylindrical warper factory class.
+@sa detail::CylindricalWarper
+*/
+class CV_EXPORTS CylindricalWarper: public WarperCreator
+{
+public:
+    Ptr<detail::RotationWarper> create(float scale) const CV_OVERRIDE { return makePtr<detail::CylindricalWarper>(scale); }
+};
+
+/** @brief Spherical warper factory class */
+class CV_EXPORTS SphericalWarper: public WarperCreator
+{
+public:
+    Ptr<detail::RotationWarper> create(float scale) const CV_OVERRIDE { return makePtr<detail::SphericalWarper>(scale); }
+};
+
+class CV_EXPORTS FisheyeWarper : public WarperCreator
+{
+public:
+    Ptr<detail::RotationWarper> create(float scale) const CV_OVERRIDE { return makePtr<detail::FisheyeWarper>(scale); }
+};
+
+class CV_EXPORTS StereographicWarper: public WarperCreator
+{
+public:
+    Ptr<detail::RotationWarper> create(float scale) const CV_OVERRIDE { return makePtr<detail::StereographicWarper>(scale); }
+};
+
+class CV_EXPORTS CompressedRectilinearWarper: public WarperCreator
+{
+    float a, b;
+public:
+    CompressedRectilinearWarper(float A = 1, float B = 1)
+    {
+        a = A; b = B;
+    }
+    Ptr<detail::RotationWarper> create(float scale) const CV_OVERRIDE { return makePtr<detail::CompressedRectilinearWarper>(scale, a, b); }
+};
+
+class CV_EXPORTS CompressedRectilinearPortraitWarper: public WarperCreator
+{
+    float a, b;
+public:
+    CompressedRectilinearPortraitWarper(float A = 1, float B = 1)
+    {
+        a = A; b = B;
+    }
+    Ptr<detail::RotationWarper> create(float scale) const CV_OVERRIDE { return makePtr<detail::CompressedRectilinearPortraitWarper>(scale, a, b); }
+};
+
+class CV_EXPORTS PaniniWarper: public WarperCreator
+{
+    float a, b;
+public:
+    PaniniWarper(float A = 1, float B = 1)
+    {
+        a = A; b = B;
+    }
+    Ptr<detail::RotationWarper> create(float scale) const CV_OVERRIDE { return makePtr<detail::PaniniWarper>(scale, a, b); }
+};
+
+class CV_EXPORTS PaniniPortraitWarper: public WarperCreator
+{
+    float a, b;
+public:
+    PaniniPortraitWarper(float A = 1, float B = 1)
+    {
+        a = A; b = B;
+    }
+    Ptr<detail::RotationWarper> create(float scale) const CV_OVERRIDE { return makePtr<detail::PaniniPortraitWarper>(scale, a, b); }
+};
+
+class CV_EXPORTS MercatorWarper: public WarperCreator
+{
+public:
+    Ptr<detail::RotationWarper> create(float scale) const CV_OVERRIDE { return makePtr<detail::MercatorWarper>(scale); }
+};
+
+class CV_EXPORTS TransverseMercatorWarper: public WarperCreator
+{
+public:
+    Ptr<detail::RotationWarper> create(float scale) const CV_OVERRIDE { return makePtr<detail::TransverseMercatorWarper>(scale); }
+};
+
+
+
+#ifdef HAVE_OPENCV_CUDAWARPING
+class PlaneWarperGpu: public WarperCreator
+{
+public:
+    Ptr<detail::RotationWarper> create(float scale) const CV_OVERRIDE { return makePtr<detail::PlaneWarperGpu>(scale); }
+};
+
+
+class CylindricalWarperGpu: public WarperCreator
+{
+public:
+    Ptr<detail::RotationWarper> create(float scale) const CV_OVERRIDE { return makePtr<detail::CylindricalWarperGpu>(scale); }
+};
+
+
+class SphericalWarperGpu: public WarperCreator
+{
+public:
+    Ptr<detail::RotationWarper> create(float scale) const CV_OVERRIDE { return makePtr<detail::SphericalWarperGpu>(scale); }
+};
+#endif
+
+//! @} stitching_warp
+
+} // namespace cv
+
+#endif // OPENCV_STITCHING_WARPER_CREATORS_HPP
diff --git a/3rdParty/opencv2/video.hpp b/3rdParty/opencv-4.12.0/opencv2/video.hpp
similarity index 96%
rename from 3rdParty/opencv2/video.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/video.hpp
index dce51f6a23..8ce49bc284 100644
--- a/3rdParty/opencv2/video.hpp
+++ b/3rdParty/opencv-4.12.0/opencv2/video.hpp
@@ -49,7 +49,6 @@
   @{
     @defgroup video_motion Motion Analysis
     @defgroup video_track Object Tracking
-    @defgroup video_c C API
   @}
 */
 
diff --git a/3rdParty/opencv2/video/background_segm.hpp b/3rdParty/opencv-4.12.0/opencv2/video/background_segm.hpp
similarity index 100%
rename from 3rdParty/opencv2/video/background_segm.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/video/background_segm.hpp
diff --git a/3rdParty/opencv2/video/detail/tracking.detail.hpp b/3rdParty/opencv-4.12.0/opencv2/video/detail/tracking.detail.hpp
similarity index 96%
rename from 3rdParty/opencv2/video/detail/tracking.detail.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/video/detail/tracking.detail.hpp
index 9883a061c3..eb954d6a16 100644
--- a/3rdParty/opencv2/video/detail/tracking.detail.hpp
+++ b/3rdParty/opencv-4.12.0/opencv2/video/detail/tracking.detail.hpp
@@ -171,7 +171,7 @@ width, height, orientation, etc.
 class CV_EXPORTS TrackerTargetState
 {
 public:
-    virtual ~TrackerTargetState() {};
+    virtual ~TrackerTargetState() {}
     /** @brief Get the position
     * @return The position
     */
diff --git a/3rdParty/opencv2/video/legacy/constants_c.h b/3rdParty/opencv-4.12.0/opencv2/video/legacy/constants_c.h
similarity index 100%
rename from 3rdParty/opencv2/video/legacy/constants_c.h
rename to 3rdParty/opencv-4.12.0/opencv2/video/legacy/constants_c.h
diff --git a/3rdParty/opencv2/video/tracking.hpp b/3rdParty/opencv-4.12.0/opencv2/video/tracking.hpp
similarity index 87%
rename from 3rdParty/opencv2/video/tracking.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/video/tracking.hpp
index 8363f44ec7..e832fcfbf5 100644
--- a/3rdParty/opencv2/video/tracking.hpp
+++ b/3rdParty/opencv-4.12.0/opencv2/video/tracking.hpp
@@ -46,6 +46,9 @@
 
 #include "opencv2/core.hpp"
 #include "opencv2/imgproc.hpp"
+#ifdef HAVE_OPENCV_DNN
+# include "opencv2/dnn.hpp"
+#endif
 
 namespace cv
 {
@@ -166,7 +169,7 @@ performance boost.
 The function implements a sparse iterative version of the Lucas-Kanade optical flow in pyramids. See
 @cite Bouguet00 . The function is parallelized with the TBB library.
 
-@note
+@note Some examples:
 
 -   An example using the Lucas-Kanade optical flow algorithm can be found at
     opencv_source_code/samples/cpp/lkdemo.cpp
@@ -213,7 +216,7 @@ The function finds an optical flow for each prev pixel using the @cite Farneback
 
 \f[\texttt{prev} (y,x)  \sim \texttt{next} ( y + \texttt{flow} (y,x)[1],  x + \texttt{flow} (y,x)[0])\f]
 
-@note
+@note Some examples:
 
 -   An example using the optical flow algorithm described by Gunnar Farneback can be found at
     opencv_source_code/samples/cpp/fback.cpp
@@ -564,6 +567,12 @@ class CV_EXPORTS_W VariationalRefinement : public DenseOpticalFlow
     /** @copybrief getGamma @see getGamma */
     CV_WRAP virtual void setGamma(float val) = 0;
 
+    /** @brief Norm value shift for robust penalizer
+    @see setEpsilon */
+    CV_WRAP virtual float getEpsilon() const = 0;
+    /** @copybrief getEpsilon @see getEpsilon */
+    CV_WRAP virtual void setEpsilon(float val) = 0;
+
     /** @brief Creates an instance of VariationalRefinement
     */
     CV_WRAP static Ptr<VariationalRefinement> create();
@@ -645,6 +654,12 @@ class CV_EXPORTS_W DISOpticalFlow : public DenseOpticalFlow
     /** @copybrief getVariationalRefinementGamma @see getVariationalRefinementGamma */
     CV_WRAP virtual void setVariationalRefinementGamma(float val) = 0;
 
+    /** @brief Norm value shift for robust penalizer
+    @see setVariationalRefinementEpsilon */
+    CV_WRAP virtual float getVariationalRefinementEpsilon() const = 0;
+    /** @copybrief getVariationalRefinementEpsilon @see getVariationalRefinementEpsilon */
+    CV_WRAP virtual void setVariationalRefinementEpsilon(float val) = 0;
+
 
     /** @brief Whether to use mean-normalization of patches when computing patch distance. It is turned on
         by default as it typically provides a noticeable quality boost because of increased robustness to
@@ -814,6 +829,13 @@ class CV_EXPORTS_W TrackerGOTURN : public Tracker
     static CV_WRAP
     Ptr<TrackerGOTURN> create(const TrackerGOTURN::Params& parameters = TrackerGOTURN::Params());
 
+#ifdef HAVE_OPENCV_DNN
+    /** @brief Constructor
+    @param model pre-loaded GOTURN model
+    */
+    static CV_WRAP Ptr<TrackerGOTURN> create(const dnn::Net& model);
+#endif
+
     //void init(InputArray image, const Rect& boundingBox) CV_OVERRIDE;
     //bool update(InputArray image, CV_OUT Rect& boundingBox) CV_OVERRIDE;
 };
@@ -841,6 +863,16 @@ class CV_EXPORTS_W TrackerDaSiamRPN : public Tracker
     static CV_WRAP
     Ptr<TrackerDaSiamRPN> create(const TrackerDaSiamRPN::Params& parameters = TrackerDaSiamRPN::Params());
 
+#ifdef HAVE_OPENCV_DNN
+    /** @brief Constructor
+     *  @param siam_rpn pre-loaded SiamRPN model
+     *  @param kernel_cls1 pre-loaded CLS model
+     *  @param kernel_r1 pre-loaded R1 model
+     */
+    static CV_WRAP
+    Ptr<TrackerDaSiamRPN> create(const dnn::Net& siam_rpn, const dnn::Net& kernel_cls1, const dnn::Net& kernel_r1);
+#endif
+
     /** @brief Return tracking score
     */
     CV_WRAP virtual float getTrackingScore() = 0;
@@ -849,6 +881,102 @@ class CV_EXPORTS_W TrackerDaSiamRPN : public Tracker
     //bool update(InputArray image, CV_OUT Rect& boundingBox) CV_OVERRIDE;
 };
 
+/** @brief the Nano tracker is a super lightweight dnn-based general object tracking.
+ *
+ *  Nano tracker is much faster and extremely lightweight due to special model structure, the whole model size is about 1.9 MB.
+ *  Nano tracker needs two models: one for feature extraction (backbone) and the another for localization (neckhead).
+ *  Model download link: https://github.com/HonglinChu/SiamTrackers/tree/master/NanoTrack/models/nanotrackv2
+ *  Original repo is here: https://github.com/HonglinChu/NanoTrack
+ *  Author: HongLinChu, 1628464345@qq.com
+ */
+class CV_EXPORTS_W TrackerNano : public Tracker
+{
+protected:
+    TrackerNano();  // use ::create()
+public:
+    virtual ~TrackerNano() CV_OVERRIDE;
+
+    struct CV_EXPORTS_W_SIMPLE Params
+    {
+        CV_WRAP Params();
+        CV_PROP_RW std::string backbone;
+        CV_PROP_RW std::string neckhead;
+        CV_PROP_RW int backend;
+        CV_PROP_RW int target;
+    };
+
+    /** @brief Constructor
+    @param parameters NanoTrack parameters TrackerNano::Params
+    */
+    static CV_WRAP
+    Ptr<TrackerNano> create(const TrackerNano::Params& parameters = TrackerNano::Params());
+
+#ifdef HAVE_OPENCV_DNN
+    /** @brief Constructor
+     *  @param backbone pre-loaded backbone model
+     *  @param neckhead pre-loaded neckhead model
+     */
+    static CV_WRAP
+    Ptr<TrackerNano> create(const dnn::Net& backbone, const dnn::Net& neckhead);
+#endif
+
+    /** @brief Return tracking score
+    */
+    CV_WRAP virtual float getTrackingScore() = 0;
+
+    //void init(InputArray image, const Rect& boundingBox) CV_OVERRIDE;
+    //bool update(InputArray image, CV_OUT Rect& boundingBox) CV_OVERRIDE;
+};
+
+/** @brief the VIT tracker is a super lightweight dnn-based general object tracking.
+ *
+ *  VIT tracker is much faster and extremely lightweight due to special model structure, the model file is about 767KB.
+ *  Model download link: https://github.com/opencv/opencv_zoo/tree/main/models/object_tracking_vittrack
+ *  Author: PengyuLiu, 1872918507@qq.com
+ */
+class CV_EXPORTS_W TrackerVit : public Tracker
+{
+protected:
+    TrackerVit();  // use ::create()
+public:
+    virtual ~TrackerVit() CV_OVERRIDE;
+
+    struct CV_EXPORTS_W_SIMPLE Params
+    {
+        CV_WRAP Params();
+        CV_PROP_RW std::string net;
+        CV_PROP_RW int backend;
+        CV_PROP_RW int target;
+        CV_PROP_RW Scalar meanvalue;
+        CV_PROP_RW Scalar stdvalue;
+        CV_PROP_RW float tracking_score_threshold;
+    };
+
+    /** @brief Constructor
+    @param parameters vit tracker parameters TrackerVit::Params
+    */
+    static CV_WRAP
+    Ptr<TrackerVit> create(const TrackerVit::Params& parameters = TrackerVit::Params());
+
+#ifdef HAVE_OPENCV_DNN
+    /** @brief Constructor
+     *  @param model pre-loaded DNN model
+     *  @param meanvalue mean value for image preprocessing
+     *  @param stdvalue std value for image preprocessing
+     *  @param tracking_score_threshold threshold for tracking score
+     */
+    static CV_WRAP
+    Ptr<TrackerVit> create(const dnn::Net& model, Scalar meanvalue = Scalar(0.485, 0.456, 0.406),
+                           Scalar stdvalue = Scalar(0.229, 0.224, 0.225), float tracking_score_threshold = 0.20f);
+#endif
+
+    /** @brief Return tracking score
+    */
+    CV_WRAP virtual float getTrackingScore() = 0;
+
+    // void init(InputArray image, const Rect& boundingBox) CV_OVERRIDE;
+    // bool update(InputArray image, CV_OUT Rect& boundingBox) CV_OVERRIDE;
+};
 
 //! @} video_track
 
diff --git a/3rdParty/opencv2/video/video.hpp b/3rdParty/opencv-4.12.0/opencv2/video/video.hpp
similarity index 100%
rename from 3rdParty/opencv2/video/video.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/video/video.hpp
diff --git a/3rdParty/opencv2/videoio.hpp b/3rdParty/opencv-4.12.0/opencv2/videoio.hpp
similarity index 85%
rename from 3rdParty/opencv2/videoio.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/videoio.hpp
index e57ee7c285..e2e617ed51 100644
--- a/3rdParty/opencv2/videoio.hpp
+++ b/3rdParty/opencv-4.12.0/opencv2/videoio.hpp
@@ -84,8 +84,13 @@ namespace cv
 Select preferred API for a capture object.
 To be used in the VideoCapture::VideoCapture() constructor or VideoCapture::open()
 
-@note Backends are available only if they have been built with your OpenCV binaries.
+@note
+-   Backends are available only if they have been built with your OpenCV binaries.
 See @ref videoio_overview for more information.
+-   Microsoft Media Foundation backend tries to use hardware accelerated transformations
+if possible. Environment flag "OPENCV_VIDEOIO_MSMF_ENABLE_HW_TRANSFORMS" set to 0
+disables it and may improve initialization time. More details:
+https://learn.microsoft.com/en-us/windows/win32/medfound/mf-readwrite-enable-hardware-transforms
 */
 enum VideoCaptureAPIs {
        CAP_ANY          = 0,            //!< Auto detect == 0
@@ -103,11 +108,11 @@ enum VideoCaptureAPIs {
        CAP_PVAPI        = 800,          //!< PvAPI, Prosilica GigE SDK
        CAP_OPENNI       = 900,          //!< OpenNI (for Kinect)
        CAP_OPENNI_ASUS  = 910,          //!< OpenNI (for Asus Xtion)
-       CAP_ANDROID      = 1000,         //!< Android - not used
+       CAP_ANDROID      = 1000,         //!< MediaNDK (API Level 21+) and NDK Camera (API level 24+) for Android
        CAP_XIAPI        = 1100,         //!< XIMEA Camera API
        CAP_AVFOUNDATION = 1200,         //!< AVFoundation framework for iOS (OS X Lion will have the same API)
        CAP_GIGANETIX    = 1300,         //!< Smartek Giganetix GigEVisionSDK
-       CAP_MSMF         = 1400,         //!< Microsoft Media Foundation (via videoInput)
+       CAP_MSMF         = 1400,         //!< Microsoft Media Foundation (via videoInput). See platform specific notes above.
        CAP_WINRT        = 1410,         //!< Microsoft Windows Runtime using Media Foundation
        CAP_INTELPERC    = 1500,         //!< RealSense (former Intel Perceptual Computing SDK)
        CAP_REALSENSE    = 1500,         //!< Synonym for CAP_INTELPERC
@@ -123,8 +128,10 @@ enum VideoCaptureAPIs {
        CAP_INTEL_MFX    = 2300,         //!< Intel MediaSDK
        CAP_XINE         = 2400,         //!< XINE engine (Linux)
        CAP_UEYE         = 2500,         //!< uEye Camera API
+       CAP_OBSENSOR     = 2600,         //!< For Orbbec 3D-Sensor device/module (Astra+, Femto, Astra2, Gemini2, Gemini2L, Gemini2XL, Gemini330, Femto Mega) attention: Astra2 cameras currently only support Windows and Linux kernel versions no higher than 4.15, and higher versions of Linux kernel may have exceptions.
      };
 
+
 /** @brief cv::VideoCapture generic properties identifier.
 
  Reading / writing properties involves many layers. Some unexpected result might happens along this chain.
@@ -133,7 +140,7 @@ enum VideoCaptureAPIs {
 */
 enum VideoCaptureProperties {
        CAP_PROP_POS_MSEC       =0, //!< Current position of the video file in milliseconds.
-       CAP_PROP_POS_FRAMES     =1, //!< 0-based index of the frame to be decoded/captured next.
+       CAP_PROP_POS_FRAMES     =1, //!< 0-based index of the frame to be decoded/captured next. When the index i is set in RAW mode (CAP_PROP_FORMAT == -1) this will seek to the key frame k, where k <= i.
        CAP_PROP_POS_AVI_RATIO  =2, //!< Relative position of the video file: 0=start of the film, 1=end of the film.
        CAP_PROP_FRAME_WIDTH    =3, //!< Width of the frames in the video stream.
        CAP_PROP_FRAME_HEIGHT   =4, //!< Height of the frames in the video stream.
@@ -161,7 +168,7 @@ enum VideoCaptureProperties {
        CAP_PROP_TRIGGER       =24,
        CAP_PROP_TRIGGER_DELAY =25,
        CAP_PROP_WHITE_BALANCE_RED_V =26,
-       CAP_PROP_ZOOM          =27,
+       CAP_PROP_ZOOM          =27, //!< Android: May switch physical cameras/lenses. Factor and range are hardware-dependent.
        CAP_PROP_FOCUS         =28,
        CAP_PROP_GUID          =29,
        CAP_PROP_ISO_SPEED     =30,
@@ -181,14 +188,14 @@ enum VideoCaptureProperties {
        CAP_PROP_WB_TEMPERATURE=45, //!< white-balance color temperature
        CAP_PROP_CODEC_PIXEL_FORMAT =46,    //!< (read-only) codec's pixel format. 4-character code - see VideoWriter::fourcc . Subset of [AV_PIX_FMT_*](https://github.com/FFmpeg/FFmpeg/blob/master/libavcodec/raw.c) or -1 if unknown
        CAP_PROP_BITRATE       =47, //!< (read-only) Video bitrate in kbits/s
-       CAP_PROP_ORIENTATION_META=48, //!< (read-only) Frame rotation defined by stream meta (applicable for FFmpeg back-end only)
-       CAP_PROP_ORIENTATION_AUTO=49, //!< if true - rotates output frames of CvCapture considering video file's metadata  (applicable for FFmpeg back-end only) (https://github.com/opencv/opencv/issues/15499)
+       CAP_PROP_ORIENTATION_META=48, //!< (read-only) Frame rotation defined by stream meta (applicable for FFmpeg and AVFoundation back-ends only)
+       CAP_PROP_ORIENTATION_AUTO=49, //!< if true - rotates output frames of CvCapture considering video file's metadata  (applicable for FFmpeg and AVFoundation back-ends only) (https://github.com/opencv/opencv/issues/15499)
        CAP_PROP_HW_ACCELERATION=50, //!< (**open-only**) Hardware acceleration type (see #VideoAccelerationType). Setting supported only via `params` parameter in cv::VideoCapture constructor / .open() method. Default value is backend-specific.
        CAP_PROP_HW_DEVICE      =51, //!< (**open-only**) Hardware device index (select GPU if multiple available). Device enumeration is acceleration type specific.
        CAP_PROP_HW_ACCELERATION_USE_OPENCL=52, //!< (**open-only**) If non-zero, create new OpenCL context and bind it to current thread. The OpenCL context created with Video Acceleration context attached it (if not attached yet) for optimized GPU data copy between HW accelerated decoder and cv::UMat.
-       CAP_PROP_OPEN_TIMEOUT_MSEC=53, //!< (**open-only**) timeout in milliseconds for opening a video capture (applicable for FFmpeg back-end only)
-       CAP_PROP_READ_TIMEOUT_MSEC=54, //!< (**open-only**) timeout in milliseconds for reading from a video capture (applicable for FFmpeg back-end only)
-       CAP_PROP_STREAM_OPEN_TIME_USEC =55, //<! (read-only) time in microseconds since Jan 1 1970 when stream was opened. Applicable for FFmpeg backend only. Useful for RTSP and other live streams
+       CAP_PROP_OPEN_TIMEOUT_MSEC=53, //!< (**open-only**) timeout in milliseconds for opening a video capture (applicable for FFmpeg and GStreamer back-ends only)
+       CAP_PROP_READ_TIMEOUT_MSEC=54, //!< (**open-only**) timeout in milliseconds for reading from a video capture (applicable for FFmpeg and GStreamer back-ends only)
+       CAP_PROP_STREAM_OPEN_TIME_USEC =55, //!< (read-only) time in microseconds since Jan 1 1970 when stream was opened. Applicable for FFmpeg backend only. Useful for RTSP and other live streams
        CAP_PROP_VIDEO_TOTAL_CHANNELS = 56, //!< (read-only) Number of video channels
        CAP_PROP_VIDEO_STREAM = 57, //!< (**open-only**) Specify video stream, 0-based index. Use -1 to disable video stream from file or IP cameras. Default value is 0.
        CAP_PROP_AUDIO_STREAM = 58, //!< (**open-only**) Specify stream in multi-language media files, -1 - disable audio processing or microphone. Default value is -1.
@@ -202,6 +209,10 @@ enum VideoCaptureProperties {
        CAP_PROP_AUDIO_SYNCHRONIZE = 66, //!< (open, read) Enables audio synchronization.
        CAP_PROP_LRF_HAS_KEY_FRAME = 67, //!< FFmpeg back-end only - Indicates whether the Last Raw Frame (LRF), output from VideoCapture::read() when VideoCapture is initialized with VideoCapture::open(CAP_FFMPEG, {CAP_PROP_FORMAT, -1}) or VideoCapture::set(CAP_PROP_FORMAT,-1) is called before the first call to VideoCapture::read(), contains encoded data for a key frame.
        CAP_PROP_CODEC_EXTRADATA_INDEX = 68, //!< Positive index indicates that returning extra data is supported by the video back end.  This can be retrieved as cap.retrieve(data, <returned index>).  E.g. When reading from a h264 encoded RTSP stream, the FFmpeg backend could return the SPS and/or PPS if available (if sent in reply to a DESCRIBE request), from calls to cap.retrieve(data, <returned index>).
+       CAP_PROP_FRAME_TYPE = 69, //!< (read-only) FFmpeg back-end only - Frame type ascii code (73 = 'I', 80 = 'P', 66 = 'B' or 63 = '?' if unknown) of the most recently read frame.
+       CAP_PROP_N_THREADS = 70, //!< (**open-only**) Set the maximum number of threads to use. Use 0 to use as many threads as CPU cores (applicable for FFmpeg back-end only).
+       CAP_PROP_PTS = 71, //!<  (read-only) FFmpeg back-end only - presentation timestamp of the most recently read frame using the FPS time base.  e.g. fps = 25, VideoCapture::get(\ref CAP_PROP_PTS) = 3, presentation time = 3/25 seconds.
+       CAP_PROP_DTS_DELAY = 72, //!<  (read-only) FFmpeg back-end only - maximum difference between presentation (pts) and decompression timestamps (dts) using FPS time base.  e.g. delay is maximum when frame_num = 0, if true, VideoCapture::get(\ref CAP_PROP_PTS) = 0 and VideoCapture::get(\ref CAP_PROP_DTS_DELAY) = 2, dts = -2.  Non zero values usually imply the stream is encoded using B-frames which are not decoded in presentation order.
 #ifndef CV_DOXYGEN
        CV__CAP_PROP_LATEST
 #endif
@@ -216,10 +227,15 @@ enum VideoWriterProperties {
   VIDEOWRITER_PROP_NSTRIPES = 3,   //!< Number of stripes for parallel encoding. -1 for auto detection.
   VIDEOWRITER_PROP_IS_COLOR = 4,   //!< If it is not zero, the encoder will expect and encode color frames, otherwise it
                                    //!< will work with grayscale frames.
-  VIDEOWRITER_PROP_DEPTH = 5,      //!< Defaults to CV_8U.
+  VIDEOWRITER_PROP_DEPTH = 5,      //!< Defaults to \ref CV_8U.
   VIDEOWRITER_PROP_HW_ACCELERATION = 6, //!< (**open-only**) Hardware acceleration type (see #VideoAccelerationType). Setting supported only via `params` parameter in VideoWriter constructor / .open() method. Default value is backend-specific.
   VIDEOWRITER_PROP_HW_DEVICE       = 7, //!< (**open-only**) Hardware device index (select GPU if multiple available). Device enumeration is acceleration type specific.
   VIDEOWRITER_PROP_HW_ACCELERATION_USE_OPENCL= 8, //!< (**open-only**) If non-zero, create new OpenCL context and bind it to current thread. The OpenCL context created with Video Acceleration context attached it (if not attached yet) for optimized GPU data copy between cv::UMat and HW accelerated encoder.
+  VIDEOWRITER_PROP_RAW_VIDEO = 9, //!< (**open-only**) Set to non-zero to enable encapsulation of an encoded raw video stream. Each raw encoded video frame should be passed to VideoWriter::write() as single row or column of a \ref CV_8UC1 Mat. \note If the key frame interval is not 1 then it must be manually specified by the user. This can either be performed during initialization passing \ref VIDEOWRITER_PROP_KEY_INTERVAL as one of the extra encoder params  to \ref VideoWriter::VideoWriter(const String &, int, double, const Size &, const std::vector< int > &params) or afterwards by setting the \ref VIDEOWRITER_PROP_KEY_FLAG with \ref VideoWriter::set() before writing each frame. FFMpeg backend only.
+  VIDEOWRITER_PROP_KEY_INTERVAL = 10, //!< (**open-only**) Set the key frame interval using raw video encapsulation (\ref VIDEOWRITER_PROP_RAW_VIDEO != 0). Defaults to 1 when not set. FFmpeg back-end only.
+  VIDEOWRITER_PROP_KEY_FLAG = 11, //!< Set to non-zero to signal that the following frames are key frames or zero if not, when encapsulating raw video (\ref VIDEOWRITER_PROP_RAW_VIDEO != 0). FFmpeg back-end only.
+  VIDEOWRITER_PROP_PTS = 12, //!< Specifies the frame presentation timestamp for each frame using the FPS time base. This property is **only** necessary when encapsulating **externally** encoded video where the decoding order differs from the presentation order, such as in GOP patterns with bi-directional B-frames. The value should be provided by your external encoder and for video sources with fixed frame rates it is equivalent to dividing the current frame's presentation time (\ref CAP_PROP_POS_MSEC) by the frame duration (1000.0 / VideoCapture::get(\ref CAP_PROP_FPS)). It can be queried from the resulting encapsulated video file using VideoCapture::get(\ref CAP_PROP_PTS). FFmpeg back-end only.
+  VIDEOWRITER_PROP_DTS_DELAY = 13, //!< Specifies the maximum difference between presentation (pts) and decompression timestamps (dts) using the FPS time base. This property is necessary **only** when encapsulating **externally** encoded video where the decoding order differs from the presentation order, such as in GOP patterns with bi-directional B-frames. The value should be calculated based on the specific GOP pattern used during encoding. For example, in a GOP with presentation order IBP and decoding order IPB, this value would be 1, as the B-frame is the second frame presented but the third to be decoded. It can be queried from the resulting encapsulated video file using VideoCapture::get(\ref CAP_PROP_DTS_DELAY). Non-zero values usually imply the stream is encoded using B-frames. FFmpeg back-end only.
 #ifndef CV_DOXYGEN
   CV__VIDEOWRITER_PROP_LATEST
 #endif
@@ -302,16 +318,23 @@ enum { CAP_PROP_OPENNI_OUTPUT_MODE       = 100,
        CAP_PROP_OPENNI2_MIRROR           = 111
      };
 
+#ifdef _MSC_VER
+#pragma warning( push )
+#pragma warning( disable: 5054 )
+#endif
 //! OpenNI shortcuts
-enum { CAP_OPENNI_IMAGE_GENERATOR_PRESENT         = CAP_OPENNI_IMAGE_GENERATOR + CAP_PROP_OPENNI_GENERATOR_PRESENT,
-       CAP_OPENNI_IMAGE_GENERATOR_OUTPUT_MODE     = CAP_OPENNI_IMAGE_GENERATOR + CAP_PROP_OPENNI_OUTPUT_MODE,
-       CAP_OPENNI_DEPTH_GENERATOR_PRESENT         = CAP_OPENNI_DEPTH_GENERATOR + CAP_PROP_OPENNI_GENERATOR_PRESENT,
-       CAP_OPENNI_DEPTH_GENERATOR_BASELINE        = CAP_OPENNI_DEPTH_GENERATOR + CAP_PROP_OPENNI_BASELINE,
-       CAP_OPENNI_DEPTH_GENERATOR_FOCAL_LENGTH    = CAP_OPENNI_DEPTH_GENERATOR + CAP_PROP_OPENNI_FOCAL_LENGTH,
-       CAP_OPENNI_DEPTH_GENERATOR_REGISTRATION    = CAP_OPENNI_DEPTH_GENERATOR + CAP_PROP_OPENNI_REGISTRATION,
-       CAP_OPENNI_DEPTH_GENERATOR_REGISTRATION_ON = CAP_OPENNI_DEPTH_GENERATOR_REGISTRATION,
-       CAP_OPENNI_IR_GENERATOR_PRESENT            = CAP_OPENNI_IR_GENERATOR + CAP_PROP_OPENNI_GENERATOR_PRESENT,
+enum { CAP_OPENNI_IMAGE_GENERATOR_PRESENT         = +CAP_OPENNI_IMAGE_GENERATOR + CAP_PROP_OPENNI_GENERATOR_PRESENT,
+       CAP_OPENNI_IMAGE_GENERATOR_OUTPUT_MODE     = +CAP_OPENNI_IMAGE_GENERATOR + CAP_PROP_OPENNI_OUTPUT_MODE,
+       CAP_OPENNI_DEPTH_GENERATOR_PRESENT         = +CAP_OPENNI_DEPTH_GENERATOR + CAP_PROP_OPENNI_GENERATOR_PRESENT,
+       CAP_OPENNI_DEPTH_GENERATOR_BASELINE        = +CAP_OPENNI_DEPTH_GENERATOR + CAP_PROP_OPENNI_BASELINE,
+       CAP_OPENNI_DEPTH_GENERATOR_FOCAL_LENGTH    = +CAP_OPENNI_DEPTH_GENERATOR + CAP_PROP_OPENNI_FOCAL_LENGTH,
+       CAP_OPENNI_DEPTH_GENERATOR_REGISTRATION    = +CAP_OPENNI_DEPTH_GENERATOR + CAP_PROP_OPENNI_REGISTRATION,
+       CAP_OPENNI_DEPTH_GENERATOR_REGISTRATION_ON =  CAP_OPENNI_DEPTH_GENERATOR_REGISTRATION,
+       CAP_OPENNI_IR_GENERATOR_PRESENT            = +CAP_OPENNI_IR_GENERATOR + CAP_PROP_OPENNI_GENERATOR_PRESENT
      };
+#ifdef _MSC_VER
+#pragma warning( pop )
+#endif
 
 //! OpenNI data given from depth generator
 enum { CAP_OPENNI_DEPTH_MAP         = 0, //!< Depth values in mm (CV_16UC1)
@@ -557,6 +580,18 @@ enum { CAP_PROP_ARAVIS_AUTOTRIGGER                              = 600 //!< Autom
 
 //! @} ARAVIS
 
+
+/** @name Android
+    @{
+*/
+
+//! Properties of cameras available through NDK Camera API backend
+enum { CAP_PROP_ANDROID_DEVICE_TORCH = 8001,
+     };
+
+//! @} Android
+
+
 /** @name AVFoundation framework for iOS
     @{
 */
@@ -653,8 +688,62 @@ enum { CAP_PROP_IMAGES_BASE = 18000,
 
 //! @} Images
 
+/** @name OBSENSOR (for Orbbec 3D-Sensor device/module )
+    @{
+*/
+//! OBSENSOR data given from image generator
+enum VideoCaptureOBSensorDataType{
+    CAP_OBSENSOR_DEPTH_MAP = 0, //!< Depth values in mm (CV_16UC1)
+    CAP_OBSENSOR_BGR_IMAGE = 1, //!< Data given from BGR stream generator
+    CAP_OBSENSOR_IR_IMAGE = 2   //!< Data given from IR stream generator(CV_16UC1)
+};
+
+//! OBSENSOR stream generator
+enum VideoCaptureOBSensorGenerators{
+    CAP_OBSENSOR_DEPTH_GENERATOR = 1 << 29,
+    CAP_OBSENSOR_IMAGE_GENERATOR = 1 << 28,
+    CAP_OBSENSOR_IR_GENERATOR    = 1 << 27,
+    CAP_OBSENSOR_GENERATORS_MASK = CAP_OBSENSOR_DEPTH_GENERATOR + CAP_OBSENSOR_IMAGE_GENERATOR + CAP_OBSENSOR_IR_GENERATOR
+};
+
+//!OBSENSOR properties
+enum VideoCaptureOBSensorProperties{
+    // INTRINSIC
+    CAP_PROP_OBSENSOR_INTRINSIC_FX=26001,
+    CAP_PROP_OBSENSOR_INTRINSIC_FY=26002,
+    CAP_PROP_OBSENSOR_INTRINSIC_CX=26003,
+    CAP_PROP_OBSENSOR_INTRINSIC_CY=26004,
+};
+
+//! @} OBSENSOR
+
 //! @} videoio_flags_others
 
+/** @brief Read data stream interface
+ */
+class CV_EXPORTS_W IStreamReader
+{
+public:
+    virtual ~IStreamReader();
+
+    /** @brief Read bytes from stream
+     *
+     * @param buffer already allocated buffer of at least @p size bytes
+     * @param size maximum number of bytes to read
+     *
+     * @return actual number of read bytes
+     */
+    CV_WRAP virtual long long read(char* buffer, long long size) = 0;
+
+    /** @brief Sets the stream position
+     *
+     * @param offset Seek offset
+     * @param origin SEEK_SET / SEEK_END / SEEK_CUR
+     *
+     * @see fseek
+     */
+    CV_WRAP virtual long long seek(long long offset, int origin) = 0;
+};
 
 class IVideoCapture;
 //! @cond IGNORED
@@ -734,6 +823,14 @@ class CV_EXPORTS_W VideoCapture
     */
     CV_WRAP explicit VideoCapture(int index, int apiPreference, const std::vector<int>& params);
 
+    /** @overload
+    @brief Opens a video using data stream.
+
+    The `params` parameter allows to specify extra parameters encoded as pairs `(paramId_1, paramValue_1, paramId_2, paramValue_2, ...)`.
+    See cv::VideoCaptureProperties
+    */
+    CV_WRAP VideoCapture(const Ptr<IStreamReader>& source, int apiPreference, const std::vector<int>& params);
+
     /** @brief Default destructor
 
     The method first calls VideoCapture::release to close the already opened file or camera.
@@ -788,6 +885,19 @@ class CV_EXPORTS_W VideoCapture
     */
     CV_WRAP virtual bool open(int index, int apiPreference, const std::vector<int>& params);
 
+    /** @brief Opens a video using data stream.
+
+    @overload
+
+    The `params` parameter allows to specify extra parameters encoded as pairs `(paramId_1, paramValue_1, paramId_2, paramValue_2, ...)`.
+    See cv::VideoCaptureProperties
+
+    @return `true` if the file has been successfully opened
+
+    The method first calls VideoCapture::release to close the already opened file or camera.
+     */
+    CV_WRAP virtual bool open(const Ptr<IStreamReader>& source, int apiPreference, const std::vector<int>& params);
+
     /** @brief Returns true if video capturing has been initialized already.
 
     If the previous call to VideoCapture constructor or VideoCapture::open() succeeded, the method returns
@@ -912,7 +1022,7 @@ class CV_EXPORTS_W VideoCapture
     CV_WRAP void setExceptionMode(bool enable) { throwOnFail = enable; }
 
     /// query if exception mode is active
-    CV_WRAP bool getExceptionMode() { return throwOnFail; }
+    CV_WRAP bool getExceptionMode() const { return throwOnFail; }
 
 
     /** @brief Wait for ready frames from VideoCapture.
@@ -929,7 +1039,7 @@ class CV_EXPORTS_W VideoCapture
 
     After this call use VideoCapture::retrieve() to decode and fetch frame data.
     */
-    static /*CV_WRAP*/
+    CV_WRAP static
     bool waitAny(
             const std::vector<VideoCapture>& streams,
             CV_OUT std::vector<int>& readyIndex,
@@ -972,9 +1082,11 @@ class CV_EXPORTS_W VideoWriter
     /** @overload
     @param filename Name of the output video file.
     @param fourcc 4-character code of codec used to compress the frames. For example,
-    VideoWriter::fourcc('P','I','M','1') is a MPEG-1 codec, VideoWriter::fourcc('M','J','P','G') is a
-    motion-jpeg codec etc. List of codes can be obtained at [Video Codecs by
-    FOURCC](http://www.fourcc.org/codecs.php) page. FFMPEG backend with MP4 container natively uses
+    VideoWriter::fourcc('P','I','M','1') is a MPEG-1 codec, VideoWriter::fourcc('M','J','P','G')
+    is a motion-jpeg codec etc. List of codes can be obtained at
+    [MSDN](https://docs.microsoft.com/en-us/windows/win32/medfound/video-fourccs) page
+    or with this [page](https://fourcc.org/codecs.php)
+    of the fourcc site for a more complete list). FFMPEG backend with MP4 container natively uses
     other values as fourcc code: see [ObjectType](http://mp4ra.org/#/codecs),
     so you may receive a warning message from OpenCV about fourcc code conversion.
     @param fps Framerate of the created video stream.
@@ -989,6 +1101,9 @@ class CV_EXPORTS_W VideoWriter
     - Most codecs are lossy. If you want lossless video file you need to use a lossless codecs
       (eg. FFMPEG FFV1, Huffman HFYU, Lagarith LAGS, etc...)
     - If FFMPEG is enabled, using `codec=0; fps=0;` you can create an uncompressed (raw) video file.
+    - If FFMPEG is used, we allow frames of odd width or height, but in this case we truncate
+      the rightmost column/the bottom row. Probably, this should be handled more elegantly,
+      but some internal functions inside FFMPEG swscale require even width/height.
     */
     CV_WRAP VideoWriter(const String& filename, int fourcc, double fps,
                 Size frameSize, bool isColor = true);
diff --git a/3rdParty/opencv2/videoio/legacy/constants_c.h b/3rdParty/opencv-4.12.0/opencv2/videoio/legacy/constants_c.h
similarity index 96%
rename from 3rdParty/opencv2/videoio/legacy/constants_c.h
rename to 3rdParty/opencv-4.12.0/opencv2/videoio/legacy/constants_c.h
index b78aaca065..191cfed7d9 100644
--- a/3rdParty/opencv2/videoio/legacy/constants_c.h
+++ b/3rdParty/opencv-4.12.0/opencv2/videoio/legacy/constants_c.h
@@ -5,6 +5,8 @@
 #ifndef OPENCV_VIDEOIO_LEGACY_CONSTANTS_H
 #define OPENCV_VIDEOIO_LEGACY_CONSTANTS_H
 
+#include "opencv2/core/cvdef.h"
+
 enum
 {
     CV_CAP_ANY      =0,     // autodetect
@@ -410,22 +412,6 @@ enum
     CV_CAP_PROP_VIEWFINDER                = 17010  // Enter liveview mode.
 };
 
-//! Macro to construct the fourcc code of the codec. Same as CV_FOURCC()
-#define CV_FOURCC_MACRO(c1, c2, c3, c4) (((c1) & 255) + (((c2) & 255) << 8) + (((c3) & 255) << 16) + (((c4) & 255) << 24))
-
-/** @brief Constructs the fourcc code of the codec function
-
-Simply call it with 4 chars fourcc code like `CV_FOURCC('I', 'Y', 'U', 'V')`
-
-List of codes can be obtained at [Video Codecs by FOURCC](http://www.fourcc.org/codecs.php) page.
-FFMPEG backend with MP4 container natively uses other values as fourcc code:
-see [ObjectType](http://mp4ra.org/#/codecs).
-*/
-CV_INLINE int CV_FOURCC(char c1, char c2, char c3, char c4)
-{
-    return CV_FOURCC_MACRO(c1, c2, c3, c4);
-}
-
 //! (Windows only) Open Codec Selection Dialog
 #define CV_FOURCC_PROMPT -1
 //! (Linux only) Use default codec for specified filename
diff --git a/3rdParty/opencv2/videoio/registry.hpp b/3rdParty/opencv-4.12.0/opencv2/videoio/registry.hpp
similarity index 83%
rename from 3rdParty/opencv2/videoio/registry.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/videoio/registry.hpp
index 1d5b3a1d03..a60d0e87bc 100644
--- a/3rdParty/opencv2/videoio/registry.hpp
+++ b/3rdParty/opencv-4.12.0/opencv2/videoio/registry.hpp
@@ -35,6 +35,9 @@ CV_EXPORTS_W std::vector<VideoCaptureAPIs> getCameraBackends();
 /** @brief Returns list of available backends which works via `cv::VideoCapture(filename)` */
 CV_EXPORTS_W std::vector<VideoCaptureAPIs> getStreamBackends();
 
+/** @brief Returns list of available backends which works via `cv::VideoCapture(buffer)` */
+CV_EXPORTS_W std::vector<VideoCaptureAPIs> getStreamBufferedBackends();
+
 /** @brief Returns list of available backends which works via `cv::VideoWriter()` */
 CV_EXPORTS_W std::vector<VideoCaptureAPIs> getWriterBackends();
 
@@ -58,6 +61,13 @@ CV_EXPORTS_W std::string getStreamBackendPluginVersion(
     CV_OUT int& version_API
 );
 
+/** @brief Returns description and ABI/API version of videoio plugin's buffer capture interface */
+CV_EXPORTS_W std::string getStreamBufferedBackendPluginVersion(
+    VideoCaptureAPIs api,
+    CV_OUT int& version_ABI,
+    CV_OUT int& version_API
+);
+
 /** @brief Returns description and ABI/API version of videoio plugin's writer interface */
 CV_EXPORTS_W std::string getWriterBackendPluginVersion(
     VideoCaptureAPIs api,
diff --git a/3rdParty/opencv2/videoio/videoio.hpp b/3rdParty/opencv-4.12.0/opencv2/videoio/videoio.hpp
similarity index 100%
rename from 3rdParty/opencv2/videoio/videoio.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/videoio/videoio.hpp
diff --git a/3rdParty/opencv2/videoio/videoio_c.h b/3rdParty/opencv-4.12.0/opencv2/videoio/videoio_c.h
similarity index 100%
rename from 3rdParty/opencv2/videoio/videoio_c.h
rename to 3rdParty/opencv-4.12.0/opencv2/videoio/videoio_c.h
diff --git a/3rdParty/opencv2/world.hpp b/3rdParty/opencv-4.12.0/opencv2/world.hpp
similarity index 100%
rename from 3rdParty/opencv2/world.hpp
rename to 3rdParty/opencv-4.12.0/opencv2/world.hpp
diff --git a/3rdParty/opencv2/README.md b/3rdParty/opencv2/README.md
deleted file mode 100644
index 6f908e05a1..0000000000
--- a/3rdParty/opencv2/README.md
+++ /dev/null
@@ -1 +0,0 @@
-These includes are taken from [OpenCV 4.6.0](https://github.com/opencv/opencv).
diff --git a/3rdParty/opencv2/core.hpp b/3rdParty/opencv2/core.hpp
deleted file mode 100644
index 69d03236b3..0000000000
--- a/3rdParty/opencv2/core.hpp
+++ /dev/null
@@ -1,3354 +0,0 @@
-/*M///////////////////////////////////////////////////////////////////////////////////////
-//
-//  IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
-//
-//  By downloading, copying, installing or using the software you agree to this license.
-//  If you do not agree to this license, do not download, install,
-//  copy or use the software.
-//
-//
-//                           License Agreement
-//                For Open Source Computer Vision Library
-//
-// Copyright (C) 2000-2015, Intel Corporation, all rights reserved.
-// Copyright (C) 2009-2011, Willow Garage Inc., all rights reserved.
-// Copyright (C) 2015, OpenCV Foundation, all rights reserved.
-// Copyright (C) 2015, Itseez Inc., all rights reserved.
-// Third party copyrights are property of their respective owners.
-//
-// Redistribution and use in source and binary forms, with or without modification,
-// are permitted provided that the following conditions are met:
-//
-//   * Redistribution's of source code must retain the above copyright notice,
-//     this list of conditions and the following disclaimer.
-//
-//   * Redistribution's in binary form must reproduce the above copyright notice,
-//     this list of conditions and the following disclaimer in the documentation
-//     and/or other materials provided with the distribution.
-//
-//   * The name of the copyright holders may not be used to endorse or promote products
-//     derived from this software without specific prior written permission.
-//
-// This software is provided by the copyright holders and contributors "as is" and
-// any express or implied warranties, including, but not limited to, the implied
-// warranties of merchantability and fitness for a particular purpose are disclaimed.
-// In no event shall the Intel Corporation or contributors be liable for any direct,
-// indirect, incidental, special, exemplary, or consequential damages
-// (including, but not limited to, procurement of substitute goods or services;
-// loss of use, data, or profits; or business interruption) however caused
-// and on any theory of liability, whether in contract, strict liability,
-// or tort (including negligence or otherwise) arising in any way out of
-// the use of this software, even if advised of the possibility of such damage.
-//
-//M*/
-
-#ifndef OPENCV_CORE_HPP
-#define OPENCV_CORE_HPP
-
-#ifndef __cplusplus
-#  error core.hpp header must be compiled as C++
-#endif
-
-#include "opencv2/core/cvdef.h"
-#include "opencv2/core/base.hpp"
-#include "opencv2/core/cvstd.hpp"
-#include "opencv2/core/traits.hpp"
-#include "opencv2/core/matx.hpp"
-#include "opencv2/core/types.hpp"
-#include "opencv2/core/mat.hpp"
-#include "opencv2/core/persistence.hpp"
-
-/**
-@defgroup core Core functionality
-@{
-    @defgroup core_basic Basic structures
-    @defgroup core_c C structures and operations
-    @{
-        @defgroup core_c_glue Connections with C++
-    @}
-    @defgroup core_array Operations on arrays
-    @defgroup core_async Asynchronous API
-    @defgroup core_xml XML/YAML Persistence
-    @defgroup core_cluster Clustering
-    @defgroup core_utils Utility and system functions and macros
-    @{
-        @defgroup core_logging Logging facilities
-        @defgroup core_utils_sse SSE utilities
-        @defgroup core_utils_neon NEON utilities
-        @defgroup core_utils_vsx VSX utilities
-        @defgroup core_utils_softfloat Softfloat support
-        @defgroup core_utils_samples Utility functions for OpenCV samples
-    @}
-    @defgroup core_opengl OpenGL interoperability
-    @defgroup core_ipp Intel IPP Asynchronous C/C++ Converters
-    @defgroup core_optim Optimization Algorithms
-    @defgroup core_directx DirectX interoperability
-    @defgroup core_eigen Eigen support
-    @defgroup core_opencl OpenCL support
-    @defgroup core_va_intel Intel VA-API/OpenCL (CL-VA) interoperability
-    @defgroup core_hal Hardware Acceleration Layer
-    @{
-        @defgroup core_hal_functions Functions
-        @defgroup core_hal_interface Interface
-        @defgroup core_hal_intrin Universal intrinsics
-        @{
-            @defgroup core_hal_intrin_impl Private implementation helpers
-        @}
-        @defgroup core_lowlevel_api Low-level API for external libraries / plugins
-    @}
-    @defgroup core_parallel Parallel Processing
-    @{
-        @defgroup core_parallel_backend Parallel backends API
-    @}
-@}
- */
-
-namespace cv {
-
-//! @addtogroup core_utils
-//! @{
-
-/*! @brief Class passed to an error.
-
-This class encapsulates all or almost all necessary
-information about the error happened in the program. The exception is
-usually constructed and thrown implicitly via CV_Error and CV_Error_ macros.
-@see error
- */
-class CV_EXPORTS Exception : public std::exception
-{
-public:
-    /*!
-     Default constructor
-     */
-    Exception();
-    /*!
-     Full constructor. Normally the constructor is not called explicitly.
-     Instead, the macros CV_Error(), CV_Error_() and CV_Assert() are used.
-    */
-    Exception(int _code, const String& _err, const String& _func, const String& _file, int _line);
-    virtual ~Exception() throw();
-
-    /*!
-     \return the error description and the context as a text string.
-    */
-    virtual const char *what() const throw() CV_OVERRIDE;
-    void formatMessage();
-
-    String msg; ///< the formatted error message
-
-    int code; ///< error code @see CVStatus
-    String err; ///< error description
-    String func; ///< function name. Available only when the compiler supports getting it
-    String file; ///< source file name where the error has occurred
-    int line; ///< line number in the source file where the error has occurred
-};
-
-/*! @brief Signals an error and raises the exception.
-
-By default the function prints information about the error to stderr,
-then it either stops if cv::setBreakOnError() had been called before or raises the exception.
-It is possible to alternate error processing by using #redirectError().
-@param exc the exception raisen.
-@deprecated drop this version
- */
-CV_EXPORTS CV_NORETURN void error(const Exception& exc);
-
-enum SortFlags { SORT_EVERY_ROW    = 0, //!< each matrix row is sorted independently
-                 SORT_EVERY_COLUMN = 1, //!< each matrix column is sorted
-                                        //!< independently; this flag and the previous one are
-                                        //!< mutually exclusive.
-                 SORT_ASCENDING    = 0, //!< each matrix row is sorted in the ascending
-                                        //!< order.
-                 SORT_DESCENDING   = 16 //!< each matrix row is sorted in the
-                                        //!< descending order; this flag and the previous one are also
-                                        //!< mutually exclusive.
-               };
-
-//! @} core_utils
-
-//! @addtogroup core
-//! @{
-
-//! Covariation flags
-enum CovarFlags {
-    /** The output covariance matrix is calculated as:
-       \f[\texttt{scale}   \cdot  [  \texttt{vects}  [0]-  \texttt{mean}  , \texttt{vects}  [1]-  \texttt{mean}  ,...]^T  \cdot  [ \texttt{vects}  [0]- \texttt{mean}  , \texttt{vects}  [1]- \texttt{mean}  ,...],\f]
-       The covariance matrix will be nsamples x nsamples. Such an unusual covariance matrix is used
-       for fast PCA of a set of very large vectors (see, for example, the EigenFaces technique for
-       face recognition). Eigenvalues of this "scrambled" matrix match the eigenvalues of the true
-       covariance matrix. The "true" eigenvectors can be easily calculated from the eigenvectors of
-       the "scrambled" covariance matrix. */
-    COVAR_SCRAMBLED = 0,
-    /**The output covariance matrix is calculated as:
-        \f[\texttt{scale}   \cdot  [  \texttt{vects}  [0]-  \texttt{mean}  , \texttt{vects}  [1]-  \texttt{mean}  ,...]  \cdot  [ \texttt{vects}  [0]- \texttt{mean}  , \texttt{vects}  [1]- \texttt{mean}  ,...]^T,\f]
-        covar will be a square matrix of the same size as the total number of elements in each input
-        vector. One and only one of #COVAR_SCRAMBLED and #COVAR_NORMAL must be specified.*/
-    COVAR_NORMAL    = 1,
-    /** If the flag is specified, the function does not calculate mean from
-        the input vectors but, instead, uses the passed mean vector. This is useful if mean has been
-        pre-calculated or known in advance, or if the covariance matrix is calculated by parts. In
-        this case, mean is not a mean vector of the input sub-set of vectors but rather the mean
-        vector of the whole set.*/
-    COVAR_USE_AVG   = 2,
-    /** If the flag is specified, the covariance matrix is scaled. In the
-        "normal" mode, scale is 1./nsamples . In the "scrambled" mode, scale is the reciprocal of the
-        total number of elements in each input vector. By default (if the flag is not specified), the
-        covariance matrix is not scaled ( scale=1 ).*/
-    COVAR_SCALE     = 4,
-    /** If the flag is
-        specified, all the input vectors are stored as rows of the samples matrix. mean should be a
-        single-row vector in this case.*/
-    COVAR_ROWS      = 8,
-    /** If the flag is
-        specified, all the input vectors are stored as columns of the samples matrix. mean should be a
-        single-column vector in this case.*/
-    COVAR_COLS      = 16
-};
-
-//! @addtogroup core_cluster
-//!  @{
-
-//! k-Means flags
-enum KmeansFlags {
-    /** Select random initial centers in each attempt.*/
-    KMEANS_RANDOM_CENTERS     = 0,
-    /** Use kmeans++ center initialization by Arthur and Vassilvitskii [Arthur2007].*/
-    KMEANS_PP_CENTERS         = 2,
-    /** During the first (and possibly the only) attempt, use the
-        user-supplied labels instead of computing them from the initial centers. For the second and
-        further attempts, use the random or semi-random centers. Use one of KMEANS_\*_CENTERS flag
-        to specify the exact method.*/
-    KMEANS_USE_INITIAL_LABELS = 1
-};
-
-//! @} core_cluster
-
-//! @addtogroup core_array
-//! @{
-
-enum ReduceTypes { REDUCE_SUM = 0, //!< the output is the sum of all rows/columns of the matrix.
-                   REDUCE_AVG = 1, //!< the output is the mean vector of all rows/columns of the matrix.
-                   REDUCE_MAX = 2, //!< the output is the maximum (column/row-wise) of all rows/columns of the matrix.
-                   REDUCE_MIN = 3  //!< the output is the minimum (column/row-wise) of all rows/columns of the matrix.
-                 };
-
-//! @} core_array
-
-/** @brief Swaps two matrices
-*/
-CV_EXPORTS void swap(Mat& a, Mat& b);
-/** @overload */
-CV_EXPORTS void swap( UMat& a, UMat& b );
-
-//! @} core
-
-//! @addtogroup core_array
-//! @{
-
-/** @brief Computes the source location of an extrapolated pixel.
-
-The function computes and returns the coordinate of a donor pixel corresponding to the specified
-extrapolated pixel when using the specified extrapolation border mode. For example, if you use
-cv::BORDER_WRAP mode in the horizontal direction, cv::BORDER_REFLECT_101 in the vertical direction and
-want to compute value of the "virtual" pixel Point(-5, 100) in a floating-point image img , it
-looks like:
-@code{.cpp}
-    float val = img.at<float>(borderInterpolate(100, img.rows, cv::BORDER_REFLECT_101),
-                              borderInterpolate(-5, img.cols, cv::BORDER_WRAP));
-@endcode
-Normally, the function is not called directly. It is used inside filtering functions and also in
-copyMakeBorder.
-@param p 0-based coordinate of the extrapolated pixel along one of the axes, likely \<0 or \>= len
-@param len Length of the array along the corresponding axis.
-@param borderType Border type, one of the #BorderTypes, except for #BORDER_TRANSPARENT and
-#BORDER_ISOLATED . When borderType==#BORDER_CONSTANT , the function always returns -1, regardless
-of p and len.
-
-@sa copyMakeBorder
-*/
-CV_EXPORTS_W int borderInterpolate(int p, int len, int borderType);
-
-/** @example samples/cpp/tutorial_code/ImgTrans/copyMakeBorder_demo.cpp
-An example using copyMakeBorder function.
-Check @ref tutorial_copyMakeBorder "the corresponding tutorial" for more details
-*/
-
-/** @brief Forms a border around an image.
-
-The function copies the source image into the middle of the destination image. The areas to the
-left, to the right, above and below the copied source image will be filled with extrapolated
-pixels. This is not what filtering functions based on it do (they extrapolate pixels on-fly), but
-what other more complex functions, including your own, may do to simplify image boundary handling.
-
-The function supports the mode when src is already in the middle of dst . In this case, the
-function does not copy src itself but simply constructs the border, for example:
-
-@code{.cpp}
-    // let border be the same in all directions
-    int border=2;
-    // constructs a larger image to fit both the image and the border
-    Mat gray_buf(rgb.rows + border*2, rgb.cols + border*2, rgb.depth());
-    // select the middle part of it w/o copying data
-    Mat gray(gray_canvas, Rect(border, border, rgb.cols, rgb.rows));
-    // convert image from RGB to grayscale
-    cvtColor(rgb, gray, COLOR_RGB2GRAY);
-    // form a border in-place
-    copyMakeBorder(gray, gray_buf, border, border,
-                   border, border, BORDER_REPLICATE);
-    // now do some custom filtering ...
-    ...
-@endcode
-@note When the source image is a part (ROI) of a bigger image, the function will try to use the
-pixels outside of the ROI to form a border. To disable this feature and always do extrapolation, as
-if src was not a ROI, use borderType | #BORDER_ISOLATED.
-
-@param src Source image.
-@param dst Destination image of the same type as src and the size Size(src.cols+left+right,
-src.rows+top+bottom) .
-@param top the top pixels
-@param bottom the bottom pixels
-@param left the left pixels
-@param right Parameter specifying how many pixels in each direction from the source image rectangle
-to extrapolate. For example, top=1, bottom=1, left=1, right=1 mean that 1 pixel-wide border needs
-to be built.
-@param borderType Border type. See borderInterpolate for details.
-@param value Border value if borderType==BORDER_CONSTANT .
-
-@sa  borderInterpolate
-*/
-CV_EXPORTS_W void copyMakeBorder(InputArray src, OutputArray dst,
-                                 int top, int bottom, int left, int right,
-                                 int borderType, const Scalar& value = Scalar() );
-
-/** @brief Calculates the per-element sum of two arrays or an array and a scalar.
-
-The function add calculates:
-- Sum of two arrays when both input arrays have the same size and the same number of channels:
-\f[\texttt{dst}(I) =  \texttt{saturate} ( \texttt{src1}(I) +  \texttt{src2}(I)) \quad \texttt{if mask}(I) \ne0\f]
-- Sum of an array and a scalar when src2 is constructed from Scalar or has the same number of
-elements as `src1.channels()`:
-\f[\texttt{dst}(I) =  \texttt{saturate} ( \texttt{src1}(I) +  \texttt{src2} ) \quad \texttt{if mask}(I) \ne0\f]
-- Sum of a scalar and an array when src1 is constructed from Scalar or has the same number of
-elements as `src2.channels()`:
-\f[\texttt{dst}(I) =  \texttt{saturate} ( \texttt{src1} +  \texttt{src2}(I) ) \quad \texttt{if mask}(I) \ne0\f]
-where `I` is a multi-dimensional index of array elements. In case of multi-channel arrays, each
-channel is processed independently.
-
-The first function in the list above can be replaced with matrix expressions:
-@code{.cpp}
-    dst = src1 + src2;
-    dst += src1; // equivalent to add(dst, src1, dst);
-@endcode
-The input arrays and the output array can all have the same or different depths. For example, you
-can add a 16-bit unsigned array to a 8-bit signed array and store the sum as a 32-bit
-floating-point array. Depth of the output array is determined by the dtype parameter. In the second
-and third cases above, as well as in the first case, when src1.depth() == src2.depth(), dtype can
-be set to the default -1. In this case, the output array will have the same depth as the input
-array, be it src1, src2 or both.
-@note Saturation is not applied when the output array has the depth CV_32S. You may even get
-result of an incorrect sign in the case of overflow.
-@param src1 first input array or a scalar.
-@param src2 second input array or a scalar.
-@param dst output array that has the same size and number of channels as the input array(s); the
-depth is defined by dtype or src1/src2.
-@param mask optional operation mask - 8-bit single channel array, that specifies elements of the
-output array to be changed.
-@param dtype optional depth of the output array (see the discussion below).
-@sa subtract, addWeighted, scaleAdd, Mat::convertTo
-*/
-CV_EXPORTS_W void add(InputArray src1, InputArray src2, OutputArray dst,
-                      InputArray mask = noArray(), int dtype = -1);
-
-/** @brief Calculates the per-element difference between two arrays or array and a scalar.
-
-The function subtract calculates:
-- Difference between two arrays, when both input arrays have the same size and the same number of
-channels:
-    \f[\texttt{dst}(I) =  \texttt{saturate} ( \texttt{src1}(I) -  \texttt{src2}(I)) \quad \texttt{if mask}(I) \ne0\f]
-- Difference between an array and a scalar, when src2 is constructed from Scalar or has the same
-number of elements as `src1.channels()`:
-    \f[\texttt{dst}(I) =  \texttt{saturate} ( \texttt{src1}(I) -  \texttt{src2} ) \quad \texttt{if mask}(I) \ne0\f]
-- Difference between a scalar and an array, when src1 is constructed from Scalar or has the same
-number of elements as `src2.channels()`:
-    \f[\texttt{dst}(I) =  \texttt{saturate} ( \texttt{src1} -  \texttt{src2}(I) ) \quad \texttt{if mask}(I) \ne0\f]
-- The reverse difference between a scalar and an array in the case of `SubRS`:
-    \f[\texttt{dst}(I) =  \texttt{saturate} ( \texttt{src2} -  \texttt{src1}(I) ) \quad \texttt{if mask}(I) \ne0\f]
-where I is a multi-dimensional index of array elements. In case of multi-channel arrays, each
-channel is processed independently.
-
-The first function in the list above can be replaced with matrix expressions:
-@code{.cpp}
-    dst = src1 - src2;
-    dst -= src1; // equivalent to subtract(dst, src1, dst);
-@endcode
-The input arrays and the output array can all have the same or different depths. For example, you
-can subtract to 8-bit unsigned arrays and store the difference in a 16-bit signed array. Depth of
-the output array is determined by dtype parameter. In the second and third cases above, as well as
-in the first case, when src1.depth() == src2.depth(), dtype can be set to the default -1. In this
-case the output array will have the same depth as the input array, be it src1, src2 or both.
-@note Saturation is not applied when the output array has the depth CV_32S. You may even get
-result of an incorrect sign in the case of overflow.
-@param src1 first input array or a scalar.
-@param src2 second input array or a scalar.
-@param dst output array of the same size and the same number of channels as the input array.
-@param mask optional operation mask; this is an 8-bit single channel array that specifies elements
-of the output array to be changed.
-@param dtype optional depth of the output array
-@sa  add, addWeighted, scaleAdd, Mat::convertTo
-  */
-CV_EXPORTS_W void subtract(InputArray src1, InputArray src2, OutputArray dst,
-                           InputArray mask = noArray(), int dtype = -1);
-
-
-/** @brief Calculates the per-element scaled product of two arrays.
-
-The function multiply calculates the per-element product of two arrays:
-
-\f[\texttt{dst} (I)= \texttt{saturate} ( \texttt{scale} \cdot \texttt{src1} (I)  \cdot \texttt{src2} (I))\f]
-
-There is also a @ref MatrixExpressions -friendly variant of the first function. See Mat::mul .
-
-For a not-per-element matrix product, see gemm .
-
-@note Saturation is not applied when the output array has the depth
-CV_32S. You may even get result of an incorrect sign in the case of
-overflow.
-@param src1 first input array.
-@param src2 second input array of the same size and the same type as src1.
-@param dst output array of the same size and type as src1.
-@param scale optional scale factor.
-@param dtype optional depth of the output array
-@sa add, subtract, divide, scaleAdd, addWeighted, accumulate, accumulateProduct, accumulateSquare,
-Mat::convertTo
-*/
-CV_EXPORTS_W void multiply(InputArray src1, InputArray src2,
-                           OutputArray dst, double scale = 1, int dtype = -1);
-
-/** @brief Performs per-element division of two arrays or a scalar by an array.
-
-The function cv::divide divides one array by another:
-\f[\texttt{dst(I) = saturate(src1(I)*scale/src2(I))}\f]
-or a scalar by an array when there is no src1 :
-\f[\texttt{dst(I) = saturate(scale/src2(I))}\f]
-
-Different channels of multi-channel arrays are processed independently.
-
-For integer types when src2(I) is zero, dst(I) will also be zero.
-
-@note In case of floating point data there is no special defined behavior for zero src2(I) values.
-Regular floating-point division is used.
-Expect correct IEEE-754 behaviour for floating-point data (with NaN, Inf result values).
-
-@note Saturation is not applied when the output array has the depth CV_32S. You may even get
-result of an incorrect sign in the case of overflow.
-@param src1 first input array.
-@param src2 second input array of the same size and type as src1.
-@param scale scalar factor.
-@param dst output array of the same size and type as src2.
-@param dtype optional depth of the output array; if -1, dst will have depth src2.depth(), but in
-case of an array-by-array division, you can only pass -1 when src1.depth()==src2.depth().
-@sa  multiply, add, subtract
-*/
-CV_EXPORTS_W void divide(InputArray src1, InputArray src2, OutputArray dst,
-                         double scale = 1, int dtype = -1);
-
-/** @overload */
-CV_EXPORTS_W void divide(double scale, InputArray src2,
-                         OutputArray dst, int dtype = -1);
-
-/** @brief Calculates the sum of a scaled array and another array.
-
-The function scaleAdd is one of the classical primitive linear algebra operations, known as DAXPY
-or SAXPY in [BLAS](http://en.wikipedia.org/wiki/Basic_Linear_Algebra_Subprograms). It calculates
-the sum of a scaled array and another array:
-\f[\texttt{dst} (I)= \texttt{scale} \cdot \texttt{src1} (I) +  \texttt{src2} (I)\f]
-The function can also be emulated with a matrix expression, for example:
-@code{.cpp}
-    Mat A(3, 3, CV_64F);
-    ...
-    A.row(0) = A.row(1)*2 + A.row(2);
-@endcode
-@param src1 first input array.
-@param alpha scale factor for the first array.
-@param src2 second input array of the same size and type as src1.
-@param dst output array of the same size and type as src1.
-@sa add, addWeighted, subtract, Mat::dot, Mat::convertTo
-*/
-CV_EXPORTS_W void scaleAdd(InputArray src1, double alpha, InputArray src2, OutputArray dst);
-
-/** @example samples/cpp/tutorial_code/HighGUI/AddingImagesTrackbar.cpp
-Check @ref tutorial_trackbar "the corresponding tutorial" for more details
-*/
-
-/** @brief Calculates the weighted sum of two arrays.
-
-The function addWeighted calculates the weighted sum of two arrays as follows:
-\f[\texttt{dst} (I)= \texttt{saturate} ( \texttt{src1} (I)* \texttt{alpha} +  \texttt{src2} (I)* \texttt{beta} +  \texttt{gamma} )\f]
-where I is a multi-dimensional index of array elements. In case of multi-channel arrays, each
-channel is processed independently.
-The function can be replaced with a matrix expression:
-@code{.cpp}
-    dst = src1*alpha + src2*beta + gamma;
-@endcode
-@note Saturation is not applied when the output array has the depth CV_32S. You may even get
-result of an incorrect sign in the case of overflow.
-@param src1 first input array.
-@param alpha weight of the first array elements.
-@param src2 second input array of the same size and channel number as src1.
-@param beta weight of the second array elements.
-@param gamma scalar added to each sum.
-@param dst output array that has the same size and number of channels as the input arrays.
-@param dtype optional depth of the output array; when both input arrays have the same depth, dtype
-can be set to -1, which will be equivalent to src1.depth().
-@sa  add, subtract, scaleAdd, Mat::convertTo
-*/
-CV_EXPORTS_W void addWeighted(InputArray src1, double alpha, InputArray src2,
-                              double beta, double gamma, OutputArray dst, int dtype = -1);
-
-/** @brief Scales, calculates absolute values, and converts the result to 8-bit.
-
-On each element of the input array, the function convertScaleAbs
-performs three operations sequentially: scaling, taking an absolute
-value, conversion to an unsigned 8-bit type:
-\f[\texttt{dst} (I)= \texttt{saturate\_cast<uchar>} (| \texttt{src} (I)* \texttt{alpha} +  \texttt{beta} |)\f]
-In case of multi-channel arrays, the function processes each channel
-independently. When the output is not 8-bit, the operation can be
-emulated by calling the Mat::convertTo method (or by using matrix
-expressions) and then by calculating an absolute value of the result.
-For example:
-@code{.cpp}
-    Mat_<float> A(30,30);
-    randu(A, Scalar(-100), Scalar(100));
-    Mat_<float> B = A*5 + 3;
-    B = abs(B);
-    // Mat_<float> B = abs(A*5+3) will also do the job,
-    // but it will allocate a temporary matrix
-@endcode
-@param src input array.
-@param dst output array.
-@param alpha optional scale factor.
-@param beta optional delta added to the scaled values.
-@sa  Mat::convertTo, cv::abs(const Mat&)
-*/
-CV_EXPORTS_W void convertScaleAbs(InputArray src, OutputArray dst,
-                                  double alpha = 1, double beta = 0);
-
-/** @brief Converts an array to half precision floating number.
-
-This function converts FP32 (single precision floating point) from/to FP16 (half precision floating point). CV_16S format is used to represent FP16 data.
-There are two use modes (src -> dst): CV_32F -> CV_16S and CV_16S -> CV_32F. The input array has to have type of CV_32F or
-CV_16S to represent the bit depth. If the input array is neither of them, the function will raise an error.
-The format of half precision floating point is defined in IEEE 754-2008.
-
-@param src input array.
-@param dst output array.
-*/
-CV_EXPORTS_W void convertFp16(InputArray src, OutputArray dst);
-
-/** @brief Performs a look-up table transform of an array.
-
-The function LUT fills the output array with values from the look-up table. Indices of the entries
-are taken from the input array. That is, the function processes each element of src as follows:
-\f[\texttt{dst} (I)  \leftarrow \texttt{lut(src(I) + d)}\f]
-where
-\f[d =  \fork{0}{if \(\texttt{src}\) has depth \(\texttt{CV_8U}\)}{128}{if \(\texttt{src}\) has depth \(\texttt{CV_8S}\)}\f]
-@param src input array of 8-bit elements.
-@param lut look-up table of 256 elements; in case of multi-channel input array, the table should
-either have a single channel (in this case the same table is used for all channels) or the same
-number of channels as in the input array.
-@param dst output array of the same size and number of channels as src, and the same depth as lut.
-@sa  convertScaleAbs, Mat::convertTo
-*/
-CV_EXPORTS_W void LUT(InputArray src, InputArray lut, OutputArray dst);
-
-/** @brief Calculates the sum of array elements.
-
-The function cv::sum calculates and returns the sum of array elements,
-independently for each channel.
-@param src input array that must have from 1 to 4 channels.
-@sa  countNonZero, mean, meanStdDev, norm, minMaxLoc, reduce
-*/
-CV_EXPORTS_AS(sumElems) Scalar sum(InputArray src);
-
-/** @brief Counts non-zero array elements.
-
-The function returns the number of non-zero elements in src :
-\f[\sum _{I: \; \texttt{src} (I) \ne0 } 1\f]
-@param src single-channel array.
-@sa  mean, meanStdDev, norm, minMaxLoc, calcCovarMatrix
-*/
-CV_EXPORTS_W int countNonZero( InputArray src );
-
-/** @brief Returns the list of locations of non-zero pixels
-
-Given a binary matrix (likely returned from an operation such
-as threshold(), compare(), >, ==, etc, return all of
-the non-zero indices as a cv::Mat or std::vector<cv::Point> (x,y)
-For example:
-@code{.cpp}
-    cv::Mat binaryImage; // input, binary image
-    cv::Mat locations;   // output, locations of non-zero pixels
-    cv::findNonZero(binaryImage, locations);
-
-    // access pixel coordinates
-    Point pnt = locations.at<Point>(i);
-@endcode
-or
-@code{.cpp}
-    cv::Mat binaryImage; // input, binary image
-    vector<Point> locations;   // output, locations of non-zero pixels
-    cv::findNonZero(binaryImage, locations);
-
-    // access pixel coordinates
-    Point pnt = locations[i];
-@endcode
-@param src single-channel array
-@param idx the output array, type of cv::Mat or std::vector<Point>, corresponding to non-zero indices in the input
-*/
-CV_EXPORTS_W void findNonZero( InputArray src, OutputArray idx );
-
-/** @brief Calculates an average (mean) of array elements.
-
-The function cv::mean calculates the mean value M of array elements,
-independently for each channel, and return it:
-\f[\begin{array}{l} N =  \sum _{I: \; \texttt{mask} (I) \ne 0} 1 \\ M_c =  \left ( \sum _{I: \; \texttt{mask} (I) \ne 0}{ \texttt{mtx} (I)_c} \right )/N \end{array}\f]
-When all the mask elements are 0's, the function returns Scalar::all(0)
-@param src input array that should have from 1 to 4 channels so that the result can be stored in
-Scalar_ .
-@param mask optional operation mask.
-@sa  countNonZero, meanStdDev, norm, minMaxLoc
-*/
-CV_EXPORTS_W Scalar mean(InputArray src, InputArray mask = noArray());
-
-/** Calculates a mean and standard deviation of array elements.
-
-The function cv::meanStdDev calculates the mean and the standard deviation M
-of array elements independently for each channel and returns it via the
-output parameters:
-\f[\begin{array}{l} N =  \sum _{I, \texttt{mask} (I)  \ne 0} 1 \\ \texttt{mean} _c =  \frac{\sum_{ I: \; \texttt{mask}(I) \ne 0} \texttt{src} (I)_c}{N} \\ \texttt{stddev} _c =  \sqrt{\frac{\sum_{ I: \; \texttt{mask}(I) \ne 0} \left ( \texttt{src} (I)_c -  \texttt{mean} _c \right )^2}{N}} \end{array}\f]
-When all the mask elements are 0's, the function returns
-mean=stddev=Scalar::all(0).
-@note The calculated standard deviation is only the diagonal of the
-complete normalized covariance matrix. If the full matrix is needed, you
-can reshape the multi-channel array M x N to the single-channel array
-M\*N x mtx.channels() (only possible when the matrix is continuous) and
-then pass the matrix to calcCovarMatrix .
-@param src input array that should have from 1 to 4 channels so that the results can be stored in
-Scalar_ 's.
-@param mean output parameter: calculated mean value.
-@param stddev output parameter: calculated standard deviation.
-@param mask optional operation mask.
-@sa  countNonZero, mean, norm, minMaxLoc, calcCovarMatrix
-*/
-CV_EXPORTS_W void meanStdDev(InputArray src, OutputArray mean, OutputArray stddev,
-                             InputArray mask=noArray());
-
-/** @brief Calculates the  absolute norm of an array.
-
-This version of #norm calculates the absolute norm of src1. The type of norm to calculate is specified using #NormTypes.
-
-As example for one array consider the function \f$r(x)= \begin{pmatrix} x \\ 1-x \end{pmatrix}, x \in [-1;1]\f$.
-The \f$ L_{1}, L_{2} \f$ and \f$ L_{\infty} \f$ norm for the sample value \f$r(-1) = \begin{pmatrix} -1 \\ 2 \end{pmatrix}\f$
-is calculated as follows
-\f{align*}
-    \| r(-1) \|_{L_1} &= |-1| + |2| = 3 \\
-    \| r(-1) \|_{L_2} &= \sqrt{(-1)^{2} + (2)^{2}} = \sqrt{5} \\
-    \| r(-1) \|_{L_\infty} &= \max(|-1|,|2|) = 2
-\f}
-and for \f$r(0.5) = \begin{pmatrix} 0.5 \\ 0.5 \end{pmatrix}\f$ the calculation is
-\f{align*}
-    \| r(0.5) \|_{L_1} &= |0.5| + |0.5| = 1 \\
-    \| r(0.5) \|_{L_2} &= \sqrt{(0.5)^{2} + (0.5)^{2}} = \sqrt{0.5} \\
-    \| r(0.5) \|_{L_\infty} &= \max(|0.5|,|0.5|) = 0.5.
-\f}
-The following graphic shows all values for the three norm functions \f$\| r(x) \|_{L_1}, \| r(x) \|_{L_2}\f$ and \f$\| r(x) \|_{L_\infty}\f$.
-It is notable that the \f$ L_{1} \f$ norm forms the upper and the \f$ L_{\infty} \f$ norm forms the lower border for the example function \f$ r(x) \f$.
-![Graphs for the different norm functions from the above example](pics/NormTypes_OneArray_1-2-INF.png)
-
-When the mask parameter is specified and it is not empty, the norm is
-
-If normType is not specified, #NORM_L2 is used.
-calculated only over the region specified by the mask.
-
-Multi-channel input arrays are treated as single-channel arrays, that is,
-the results for all channels are combined.
-
-Hamming norms can only be calculated with CV_8U depth arrays.
-
-@param src1 first input array.
-@param normType type of the norm (see #NormTypes).
-@param mask optional operation mask; it must have the same size as src1 and CV_8UC1 type.
-*/
-CV_EXPORTS_W double norm(InputArray src1, int normType = NORM_L2, InputArray mask = noArray());
-
-/** @brief Calculates an absolute difference norm or a relative difference norm.
-
-This version of cv::norm calculates the absolute difference norm
-or the relative difference norm of arrays src1 and src2.
-The type of norm to calculate is specified using #NormTypes.
-
-@param src1 first input array.
-@param src2 second input array of the same size and the same type as src1.
-@param normType type of the norm (see #NormTypes).
-@param mask optional operation mask; it must have the same size as src1 and CV_8UC1 type.
-*/
-CV_EXPORTS_W double norm(InputArray src1, InputArray src2,
-                         int normType = NORM_L2, InputArray mask = noArray());
-/** @overload
-@param src first input array.
-@param normType type of the norm (see #NormTypes).
-*/
-CV_EXPORTS double norm( const SparseMat& src, int normType );
-
-/** @brief Computes the Peak Signal-to-Noise Ratio (PSNR) image quality metric.
-
-This function calculates the Peak Signal-to-Noise Ratio (PSNR) image quality metric in decibels (dB),
-between two input arrays src1 and src2. The arrays must have the same type.
-
-The PSNR is calculated as follows:
-
-\f[
-\texttt{PSNR} = 10 \cdot \log_{10}{\left( \frac{R^2}{MSE} \right) }
-\f]
-
-where R is the maximum integer value of depth (e.g. 255 in the case of CV_8U data)
-and MSE is the mean squared error between the two arrays.
-
-@param src1 first input array.
-@param src2 second input array of the same size as src1.
-@param R the maximum pixel value (255 by default)
-
-  */
-CV_EXPORTS_W double PSNR(InputArray src1, InputArray src2, double R=255.);
-
-/** @brief naive nearest neighbor finder
-
-see http://en.wikipedia.org/wiki/Nearest_neighbor_search
-@todo document
-  */
-CV_EXPORTS_W void batchDistance(InputArray src1, InputArray src2,
-                                OutputArray dist, int dtype, OutputArray nidx,
-                                int normType = NORM_L2, int K = 0,
-                                InputArray mask = noArray(), int update = 0,
-                                bool crosscheck = false);
-
-/** @brief Normalizes the norm or value range of an array.
-
-The function cv::normalize normalizes scale and shift the input array elements so that
-\f[\| \texttt{dst} \| _{L_p}= \texttt{alpha}\f]
-(where p=Inf, 1 or 2) when normType=NORM_INF, NORM_L1, or NORM_L2, respectively; or so that
-\f[\min _I  \texttt{dst} (I)= \texttt{alpha} , \, \, \max _I  \texttt{dst} (I)= \texttt{beta}\f]
-
-when normType=NORM_MINMAX (for dense arrays only). The optional mask specifies a sub-array to be
-normalized. This means that the norm or min-n-max are calculated over the sub-array, and then this
-sub-array is modified to be normalized. If you want to only use the mask to calculate the norm or
-min-max but modify the whole array, you can use norm and Mat::convertTo.
-
-In case of sparse matrices, only the non-zero values are analyzed and transformed. Because of this,
-the range transformation for sparse matrices is not allowed since it can shift the zero level.
-
-Possible usage with some positive example data:
-@code{.cpp}
-    vector<double> positiveData = { 2.0, 8.0, 10.0 };
-    vector<double> normalizedData_l1, normalizedData_l2, normalizedData_inf, normalizedData_minmax;
-
-    // Norm to probability (total count)
-    // sum(numbers) = 20.0
-    // 2.0      0.1     (2.0/20.0)
-    // 8.0      0.4     (8.0/20.0)
-    // 10.0     0.5     (10.0/20.0)
-    normalize(positiveData, normalizedData_l1, 1.0, 0.0, NORM_L1);
-
-    // Norm to unit vector: ||positiveData|| = 1.0
-    // 2.0      0.15
-    // 8.0      0.62
-    // 10.0     0.77
-    normalize(positiveData, normalizedData_l2, 1.0, 0.0, NORM_L2);
-
-    // Norm to max element
-    // 2.0      0.2     (2.0/10.0)
-    // 8.0      0.8     (8.0/10.0)
-    // 10.0     1.0     (10.0/10.0)
-    normalize(positiveData, normalizedData_inf, 1.0, 0.0, NORM_INF);
-
-    // Norm to range [0.0;1.0]
-    // 2.0      0.0     (shift to left border)
-    // 8.0      0.75    (6.0/8.0)
-    // 10.0     1.0     (shift to right border)
-    normalize(positiveData, normalizedData_minmax, 1.0, 0.0, NORM_MINMAX);
-@endcode
-
-@param src input array.
-@param dst output array of the same size as src .
-@param alpha norm value to normalize to or the lower range boundary in case of the range
-normalization.
-@param beta upper range boundary in case of the range normalization; it is not used for the norm
-normalization.
-@param norm_type normalization type (see cv::NormTypes).
-@param dtype when negative, the output array has the same type as src; otherwise, it has the same
-number of channels as src and the depth =CV_MAT_DEPTH(dtype).
-@param mask optional operation mask.
-@sa norm, Mat::convertTo, SparseMat::convertTo
-*/
-CV_EXPORTS_W void normalize( InputArray src, InputOutputArray dst, double alpha = 1, double beta = 0,
-                             int norm_type = NORM_L2, int dtype = -1, InputArray mask = noArray());
-
-/** @overload
-@param src input array.
-@param dst output array of the same size as src .
-@param alpha norm value to normalize to or the lower range boundary in case of the range
-normalization.
-@param normType normalization type (see cv::NormTypes).
-*/
-CV_EXPORTS void normalize( const SparseMat& src, SparseMat& dst, double alpha, int normType );
-
-/** @brief Finds the global minimum and maximum in an array.
-
-The function cv::minMaxLoc finds the minimum and maximum element values and their positions. The
-extremums are searched across the whole array or, if mask is not an empty array, in the specified
-array region.
-
-The function do not work with multi-channel arrays. If you need to find minimum or maximum
-elements across all the channels, use Mat::reshape first to reinterpret the array as
-single-channel. Or you may extract the particular channel using either extractImageCOI , or
-mixChannels , or split .
-@param src input single-channel array.
-@param minVal pointer to the returned minimum value; NULL is used if not required.
-@param maxVal pointer to the returned maximum value; NULL is used if not required.
-@param minLoc pointer to the returned minimum location (in 2D case); NULL is used if not required.
-@param maxLoc pointer to the returned maximum location (in 2D case); NULL is used if not required.
-@param mask optional mask used to select a sub-array.
-@sa max, min, reduceArgMin, reduceArgMax, compare, inRange, extractImageCOI, mixChannels, split, Mat::reshape
-*/
-CV_EXPORTS_W void minMaxLoc(InputArray src, CV_OUT double* minVal,
-                            CV_OUT double* maxVal = 0, CV_OUT Point* minLoc = 0,
-                            CV_OUT Point* maxLoc = 0, InputArray mask = noArray());
-
-/**
- * @brief Finds indices of min elements along provided axis
- *
- * @note
- *      - If input or output array is not continuous, this function will create an internal copy.
- *      - NaN handling is left unspecified, see patchNaNs().
- *      - The returned index is always in bounds of input matrix.
- *
- * @param src input single-channel array.
- * @param dst output array of type CV_32SC1 with the same dimensionality as src,
- * except for axis being reduced - it should be set to 1.
- * @param lastIndex whether to get the index of first or last occurrence of min.
- * @param axis axis to reduce along.
- * @sa reduceArgMax, minMaxLoc, min, max, compare, reduce
- */
-CV_EXPORTS_W void reduceArgMin(InputArray src, OutputArray dst, int axis, bool lastIndex = false);
-
-/**
- * @brief Finds indices of max elements along provided axis
- *
- * @note
- *      - If input or output array is not continuous, this function will create an internal copy.
- *      - NaN handling is left unspecified, see patchNaNs().
- *      - The returned index is always in bounds of input matrix.
- *
- * @param src input single-channel array.
- * @param dst output array of type CV_32SC1 with the same dimensionality as src,
- * except for axis being reduced - it should be set to 1.
- * @param lastIndex whether to get the index of first or last occurrence of max.
- * @param axis axis to reduce along.
- * @sa reduceArgMin, minMaxLoc, min, max, compare, reduce
- */
-CV_EXPORTS_W void reduceArgMax(InputArray src, OutputArray dst, int axis, bool lastIndex = false);
-
-/** @brief Finds the global minimum and maximum in an array
-
-The function cv::minMaxIdx finds the minimum and maximum element values and their positions. The
-extremums are searched across the whole array or, if mask is not an empty array, in the specified
-array region. The function does not work with multi-channel arrays. If you need to find minimum or
-maximum elements across all the channels, use Mat::reshape first to reinterpret the array as
-single-channel. Or you may extract the particular channel using either extractImageCOI , or
-mixChannels , or split . In case of a sparse matrix, the minimum is found among non-zero elements
-only.
-@note When minIdx is not NULL, it must have at least 2 elements (as well as maxIdx), even if src is
-a single-row or single-column matrix. In OpenCV (following MATLAB) each array has at least 2
-dimensions, i.e. single-column matrix is Mx1 matrix (and therefore minIdx/maxIdx will be
-(i1,0)/(i2,0)) and single-row matrix is 1xN matrix (and therefore minIdx/maxIdx will be
-(0,j1)/(0,j2)).
-@param src input single-channel array.
-@param minVal pointer to the returned minimum value; NULL is used if not required.
-@param maxVal pointer to the returned maximum value; NULL is used if not required.
-@param minIdx pointer to the returned minimum location (in nD case); NULL is used if not required;
-Otherwise, it must point to an array of src.dims elements, the coordinates of the minimum element
-in each dimension are stored there sequentially.
-@param maxIdx pointer to the returned maximum location (in nD case). NULL is used if not required.
-@param mask specified array region
-*/
-CV_EXPORTS void minMaxIdx(InputArray src, double* minVal, double* maxVal = 0,
-                          int* minIdx = 0, int* maxIdx = 0, InputArray mask = noArray());
-
-/** @overload
-@param a input single-channel array.
-@param minVal pointer to the returned minimum value; NULL is used if not required.
-@param maxVal pointer to the returned maximum value; NULL is used if not required.
-@param minIdx pointer to the returned minimum location (in nD case); NULL is used if not required;
-Otherwise, it must point to an array of src.dims elements, the coordinates of the minimum element
-in each dimension are stored there sequentially.
-@param maxIdx pointer to the returned maximum location (in nD case). NULL is used if not required.
-*/
-CV_EXPORTS void minMaxLoc(const SparseMat& a, double* minVal,
-                          double* maxVal, int* minIdx = 0, int* maxIdx = 0);
-
-/** @brief Reduces a matrix to a vector.
-
-The function #reduce reduces the matrix to a vector by treating the matrix rows/columns as a set of
-1D vectors and performing the specified operation on the vectors until a single row/column is
-obtained. For example, the function can be used to compute horizontal and vertical projections of a
-raster image. In case of #REDUCE_MAX and #REDUCE_MIN , the output image should have the same type as the source one.
-In case of #REDUCE_SUM and #REDUCE_AVG , the output may have a larger element bit-depth to preserve accuracy.
-And multi-channel arrays are also supported in these two reduction modes.
-
-The following code demonstrates its usage for a single channel matrix.
-@snippet snippets/core_reduce.cpp example
-
-And the following code demonstrates its usage for a two-channel matrix.
-@snippet snippets/core_reduce.cpp example2
-
-@param src input 2D matrix.
-@param dst output vector. Its size and type is defined by dim and dtype parameters.
-@param dim dimension index along which the matrix is reduced. 0 means that the matrix is reduced to
-a single row. 1 means that the matrix is reduced to a single column.
-@param rtype reduction operation that could be one of #ReduceTypes
-@param dtype when negative, the output vector will have the same type as the input matrix,
-otherwise, its type will be CV_MAKE_TYPE(CV_MAT_DEPTH(dtype), src.channels()).
-@sa repeat, reduceArgMin, reduceArgMax
-*/
-CV_EXPORTS_W void reduce(InputArray src, OutputArray dst, int dim, int rtype, int dtype = -1);
-
-/** @brief Creates one multi-channel array out of several single-channel ones.
-
-The function cv::merge merges several arrays to make a single multi-channel array. That is, each
-element of the output array will be a concatenation of the elements of the input arrays, where
-elements of i-th input array are treated as mv[i].channels()-element vectors.
-
-The function cv::split does the reverse operation. If you need to shuffle channels in some other
-advanced way, use cv::mixChannels.
-
-The following example shows how to merge 3 single channel matrices into a single 3-channel matrix.
-@snippet snippets/core_merge.cpp example
-
-@param mv input array of matrices to be merged; all the matrices in mv must have the same
-size and the same depth.
-@param count number of input matrices when mv is a plain C array; it must be greater than zero.
-@param dst output array of the same size and the same depth as mv[0]; The number of channels will
-be equal to the parameter count.
-@sa  mixChannels, split, Mat::reshape
-*/
-CV_EXPORTS void merge(const Mat* mv, size_t count, OutputArray dst);
-
-/** @overload
-@param mv input vector of matrices to be merged; all the matrices in mv must have the same
-size and the same depth.
-@param dst output array of the same size and the same depth as mv[0]; The number of channels will
-be the total number of channels in the matrix array.
-  */
-CV_EXPORTS_W void merge(InputArrayOfArrays mv, OutputArray dst);
-
-/** @brief Divides a multi-channel array into several single-channel arrays.
-
-The function cv::split splits a multi-channel array into separate single-channel arrays:
-\f[\texttt{mv} [c](I) =  \texttt{src} (I)_c\f]
-If you need to extract a single channel or do some other sophisticated channel permutation, use
-mixChannels .
-
-The following example demonstrates how to split a 3-channel matrix into 3 single channel matrices.
-@snippet snippets/core_split.cpp example
-
-@param src input multi-channel array.
-@param mvbegin output array; the number of arrays must match src.channels(); the arrays themselves are
-reallocated, if needed.
-@sa merge, mixChannels, cvtColor
-*/
-CV_EXPORTS void split(const Mat& src, Mat* mvbegin);
-
-/** @overload
-@param m input multi-channel array.
-@param mv output vector of arrays; the arrays themselves are reallocated, if needed.
-*/
-CV_EXPORTS_W void split(InputArray m, OutputArrayOfArrays mv);
-
-/** @brief Copies specified channels from input arrays to the specified channels of
-output arrays.
-
-The function cv::mixChannels provides an advanced mechanism for shuffling image channels.
-
-cv::split,cv::merge,cv::extractChannel,cv::insertChannel and some forms of cv::cvtColor are partial cases of cv::mixChannels.
-
-In the example below, the code splits a 4-channel BGRA image into a 3-channel BGR (with B and R
-channels swapped) and a separate alpha-channel image:
-@code{.cpp}
-    Mat bgra( 100, 100, CV_8UC4, Scalar(255,0,0,255) );
-    Mat bgr( bgra.rows, bgra.cols, CV_8UC3 );
-    Mat alpha( bgra.rows, bgra.cols, CV_8UC1 );
-
-    // forming an array of matrices is a quite efficient operation,
-    // because the matrix data is not copied, only the headers
-    Mat out[] = { bgr, alpha };
-    // bgra[0] -> bgr[2], bgra[1] -> bgr[1],
-    // bgra[2] -> bgr[0], bgra[3] -> alpha[0]
-    int from_to[] = { 0,2, 1,1, 2,0, 3,3 };
-    mixChannels( &bgra, 1, out, 2, from_to, 4 );
-@endcode
-@note Unlike many other new-style C++ functions in OpenCV (see the introduction section and
-Mat::create ), cv::mixChannels requires the output arrays to be pre-allocated before calling the
-function.
-@param src input array or vector of matrices; all of the matrices must have the same size and the
-same depth.
-@param nsrcs number of matrices in `src`.
-@param dst output array or vector of matrices; all the matrices **must be allocated**; their size and
-depth must be the same as in `src[0]`.
-@param ndsts number of matrices in `dst`.
-@param fromTo array of index pairs specifying which channels are copied and where; fromTo[k\*2] is
-a 0-based index of the input channel in src, fromTo[k\*2+1] is an index of the output channel in
-dst; the continuous channel numbering is used: the first input image channels are indexed from 0 to
-src[0].channels()-1, the second input image channels are indexed from src[0].channels() to
-src[0].channels() + src[1].channels()-1, and so on, the same scheme is used for the output image
-channels; as a special case, when fromTo[k\*2] is negative, the corresponding output channel is
-filled with zero .
-@param npairs number of index pairs in `fromTo`.
-@sa split, merge, extractChannel, insertChannel, cvtColor
-*/
-CV_EXPORTS void mixChannels(const Mat* src, size_t nsrcs, Mat* dst, size_t ndsts,
-                            const int* fromTo, size_t npairs);
-
-/** @overload
-@param src input array or vector of matrices; all of the matrices must have the same size and the
-same depth.
-@param dst output array or vector of matrices; all the matrices **must be allocated**; their size and
-depth must be the same as in src[0].
-@param fromTo array of index pairs specifying which channels are copied and where; fromTo[k\*2] is
-a 0-based index of the input channel in src, fromTo[k\*2+1] is an index of the output channel in
-dst; the continuous channel numbering is used: the first input image channels are indexed from 0 to
-src[0].channels()-1, the second input image channels are indexed from src[0].channels() to
-src[0].channels() + src[1].channels()-1, and so on, the same scheme is used for the output image
-channels; as a special case, when fromTo[k\*2] is negative, the corresponding output channel is
-filled with zero .
-@param npairs number of index pairs in fromTo.
-*/
-CV_EXPORTS void mixChannels(InputArrayOfArrays src, InputOutputArrayOfArrays dst,
-                            const int* fromTo, size_t npairs);
-
-/** @overload
-@param src input array or vector of matrices; all of the matrices must have the same size and the
-same depth.
-@param dst output array or vector of matrices; all the matrices **must be allocated**; their size and
-depth must be the same as in src[0].
-@param fromTo array of index pairs specifying which channels are copied and where; fromTo[k\*2] is
-a 0-based index of the input channel in src, fromTo[k\*2+1] is an index of the output channel in
-dst; the continuous channel numbering is used: the first input image channels are indexed from 0 to
-src[0].channels()-1, the second input image channels are indexed from src[0].channels() to
-src[0].channels() + src[1].channels()-1, and so on, the same scheme is used for the output image
-channels; as a special case, when fromTo[k\*2] is negative, the corresponding output channel is
-filled with zero .
-*/
-CV_EXPORTS_W void mixChannels(InputArrayOfArrays src, InputOutputArrayOfArrays dst,
-                              const std::vector<int>& fromTo);
-
-/** @brief Extracts a single channel from src (coi is 0-based index)
-@param src input array
-@param dst output array
-@param coi index of channel to extract
-@sa mixChannels, split
-*/
-CV_EXPORTS_W void extractChannel(InputArray src, OutputArray dst, int coi);
-
-/** @brief Inserts a single channel to dst (coi is 0-based index)
-@param src input array
-@param dst output array
-@param coi index of channel for insertion
-@sa mixChannels, merge
-*/
-CV_EXPORTS_W void insertChannel(InputArray src, InputOutputArray dst, int coi);
-
-/** @brief Flips a 2D array around vertical, horizontal, or both axes.
-
-The function cv::flip flips the array in one of three different ways (row
-and column indices are 0-based):
-\f[\texttt{dst} _{ij} =
-\left\{
-\begin{array}{l l}
-\texttt{src} _{\texttt{src.rows}-i-1,j} & if\;  \texttt{flipCode} = 0 \\
-\texttt{src} _{i, \texttt{src.cols} -j-1} & if\;  \texttt{flipCode} > 0 \\
-\texttt{src} _{ \texttt{src.rows} -i-1, \texttt{src.cols} -j-1} & if\; \texttt{flipCode} < 0 \\
-\end{array}
-\right.\f]
-The example scenarios of using the function are the following:
-*   Vertical flipping of the image (flipCode == 0) to switch between
-    top-left and bottom-left image origin. This is a typical operation
-    in video processing on Microsoft Windows\* OS.
-*   Horizontal flipping of the image with the subsequent horizontal
-    shift and absolute difference calculation to check for a
-    vertical-axis symmetry (flipCode \> 0).
-*   Simultaneous horizontal and vertical flipping of the image with
-    the subsequent shift and absolute difference calculation to check
-    for a central symmetry (flipCode \< 0).
-*   Reversing the order of point arrays (flipCode \> 0 or
-    flipCode == 0).
-@param src input array.
-@param dst output array of the same size and type as src.
-@param flipCode a flag to specify how to flip the array; 0 means
-flipping around the x-axis and positive value (for example, 1) means
-flipping around y-axis. Negative value (for example, -1) means flipping
-around both axes.
-@sa transpose , repeat , completeSymm
-*/
-CV_EXPORTS_W void flip(InputArray src, OutputArray dst, int flipCode);
-
-enum RotateFlags {
-    ROTATE_90_CLOCKWISE = 0, //!<Rotate 90 degrees clockwise
-    ROTATE_180 = 1, //!<Rotate 180 degrees clockwise
-    ROTATE_90_COUNTERCLOCKWISE = 2, //!<Rotate 270 degrees clockwise
-};
-/** @brief Rotates a 2D array in multiples of 90 degrees.
-The function cv::rotate rotates the array in one of three different ways:
-*   Rotate by 90 degrees clockwise (rotateCode = ROTATE_90_CLOCKWISE).
-*   Rotate by 180 degrees clockwise (rotateCode = ROTATE_180).
-*   Rotate by 270 degrees clockwise (rotateCode = ROTATE_90_COUNTERCLOCKWISE).
-@param src input array.
-@param dst output array of the same type as src.  The size is the same with ROTATE_180,
-and the rows and cols are switched for ROTATE_90_CLOCKWISE and ROTATE_90_COUNTERCLOCKWISE.
-@param rotateCode an enum to specify how to rotate the array; see the enum #RotateFlags
-@sa transpose , repeat , completeSymm, flip, RotateFlags
-*/
-CV_EXPORTS_W void rotate(InputArray src, OutputArray dst, int rotateCode);
-
-/** @brief Fills the output array with repeated copies of the input array.
-
-The function cv::repeat duplicates the input array one or more times along each of the two axes:
-\f[\texttt{dst} _{ij}= \texttt{src} _{i\mod src.rows, \; j\mod src.cols }\f]
-The second variant of the function is more convenient to use with @ref MatrixExpressions.
-@param src input array to replicate.
-@param ny Flag to specify how many times the `src` is repeated along the
-vertical axis.
-@param nx Flag to specify how many times the `src` is repeated along the
-horizontal axis.
-@param dst output array of the same type as `src`.
-@sa cv::reduce
-*/
-CV_EXPORTS_W void repeat(InputArray src, int ny, int nx, OutputArray dst);
-
-/** @overload
-@param src input array to replicate.
-@param ny Flag to specify how many times the `src` is repeated along the
-vertical axis.
-@param nx Flag to specify how many times the `src` is repeated along the
-horizontal axis.
-  */
-CV_EXPORTS Mat repeat(const Mat& src, int ny, int nx);
-
-/** @brief Applies horizontal concatenation to given matrices.
-
-The function horizontally concatenates two or more cv::Mat matrices (with the same number of rows).
-@code{.cpp}
-    cv::Mat matArray[] = { cv::Mat(4, 1, CV_8UC1, cv::Scalar(1)),
-                           cv::Mat(4, 1, CV_8UC1, cv::Scalar(2)),
-                           cv::Mat(4, 1, CV_8UC1, cv::Scalar(3)),};
-
-    cv::Mat out;
-    cv::hconcat( matArray, 3, out );
-    //out:
-    //[1, 2, 3;
-    // 1, 2, 3;
-    // 1, 2, 3;
-    // 1, 2, 3]
-@endcode
-@param src input array or vector of matrices. all of the matrices must have the same number of rows and the same depth.
-@param nsrc number of matrices in src.
-@param dst output array. It has the same number of rows and depth as the src, and the sum of cols of the src.
-@sa cv::vconcat(const Mat*, size_t, OutputArray), @sa cv::vconcat(InputArrayOfArrays, OutputArray) and @sa cv::vconcat(InputArray, InputArray, OutputArray)
-*/
-CV_EXPORTS void hconcat(const Mat* src, size_t nsrc, OutputArray dst);
-/** @overload
- @code{.cpp}
-    cv::Mat_<float> A = (cv::Mat_<float>(3, 2) << 1, 4,
-                                                  2, 5,
-                                                  3, 6);
-    cv::Mat_<float> B = (cv::Mat_<float>(3, 2) << 7, 10,
-                                                  8, 11,
-                                                  9, 12);
-
-    cv::Mat C;
-    cv::hconcat(A, B, C);
-    //C:
-    //[1, 4, 7, 10;
-    // 2, 5, 8, 11;
-    // 3, 6, 9, 12]
- @endcode
- @param src1 first input array to be considered for horizontal concatenation.
- @param src2 second input array to be considered for horizontal concatenation.
- @param dst output array. It has the same number of rows and depth as the src1 and src2, and the sum of cols of the src1 and src2.
- */
-CV_EXPORTS void hconcat(InputArray src1, InputArray src2, OutputArray dst);
-/** @overload
- @code{.cpp}
-    std::vector<cv::Mat> matrices = { cv::Mat(4, 1, CV_8UC1, cv::Scalar(1)),
-                                      cv::Mat(4, 1, CV_8UC1, cv::Scalar(2)),
-                                      cv::Mat(4, 1, CV_8UC1, cv::Scalar(3)),};
-
-    cv::Mat out;
-    cv::hconcat( matrices, out );
-    //out:
-    //[1, 2, 3;
-    // 1, 2, 3;
-    // 1, 2, 3;
-    // 1, 2, 3]
- @endcode
- @param src input array or vector of matrices. all of the matrices must have the same number of rows and the same depth.
- @param dst output array. It has the same number of rows and depth as the src, and the sum of cols of the src.
-same depth.
- */
-CV_EXPORTS_W void hconcat(InputArrayOfArrays src, OutputArray dst);
-
-/** @brief Applies vertical concatenation to given matrices.
-
-The function vertically concatenates two or more cv::Mat matrices (with the same number of cols).
-@code{.cpp}
-    cv::Mat matArray[] = { cv::Mat(1, 4, CV_8UC1, cv::Scalar(1)),
-                           cv::Mat(1, 4, CV_8UC1, cv::Scalar(2)),
-                           cv::Mat(1, 4, CV_8UC1, cv::Scalar(3)),};
-
-    cv::Mat out;
-    cv::vconcat( matArray, 3, out );
-    //out:
-    //[1,   1,   1,   1;
-    // 2,   2,   2,   2;
-    // 3,   3,   3,   3]
-@endcode
-@param src input array or vector of matrices. all of the matrices must have the same number of cols and the same depth.
-@param nsrc number of matrices in src.
-@param dst output array. It has the same number of cols and depth as the src, and the sum of rows of the src.
-@sa cv::hconcat(const Mat*, size_t, OutputArray), @sa cv::hconcat(InputArrayOfArrays, OutputArray) and @sa cv::hconcat(InputArray, InputArray, OutputArray)
-*/
-CV_EXPORTS void vconcat(const Mat* src, size_t nsrc, OutputArray dst);
-/** @overload
- @code{.cpp}
-    cv::Mat_<float> A = (cv::Mat_<float>(3, 2) << 1, 7,
-                                                  2, 8,
-                                                  3, 9);
-    cv::Mat_<float> B = (cv::Mat_<float>(3, 2) << 4, 10,
-                                                  5, 11,
-                                                  6, 12);
-
-    cv::Mat C;
-    cv::vconcat(A, B, C);
-    //C:
-    //[1, 7;
-    // 2, 8;
-    // 3, 9;
-    // 4, 10;
-    // 5, 11;
-    // 6, 12]
- @endcode
- @param src1 first input array to be considered for vertical concatenation.
- @param src2 second input array to be considered for vertical concatenation.
- @param dst output array. It has the same number of cols and depth as the src1 and src2, and the sum of rows of the src1 and src2.
- */
-CV_EXPORTS void vconcat(InputArray src1, InputArray src2, OutputArray dst);
-/** @overload
- @code{.cpp}
-    std::vector<cv::Mat> matrices = { cv::Mat(1, 4, CV_8UC1, cv::Scalar(1)),
-                                      cv::Mat(1, 4, CV_8UC1, cv::Scalar(2)),
-                                      cv::Mat(1, 4, CV_8UC1, cv::Scalar(3)),};
-
-    cv::Mat out;
-    cv::vconcat( matrices, out );
-    //out:
-    //[1,   1,   1,   1;
-    // 2,   2,   2,   2;
-    // 3,   3,   3,   3]
- @endcode
- @param src input array or vector of matrices. all of the matrices must have the same number of cols and the same depth
- @param dst output array. It has the same number of cols and depth as the src, and the sum of rows of the src.
-same depth.
- */
-CV_EXPORTS_W void vconcat(InputArrayOfArrays src, OutputArray dst);
-
-/** @brief computes bitwise conjunction of the two arrays (dst = src1 & src2)
-Calculates the per-element bit-wise conjunction of two arrays or an
-array and a scalar.
-
-The function cv::bitwise_and calculates the per-element bit-wise logical conjunction for:
-*   Two arrays when src1 and src2 have the same size:
-    \f[\texttt{dst} (I) =  \texttt{src1} (I)  \wedge \texttt{src2} (I) \quad \texttt{if mask} (I) \ne0\f]
-*   An array and a scalar when src2 is constructed from Scalar or has
-    the same number of elements as `src1.channels()`:
-    \f[\texttt{dst} (I) =  \texttt{src1} (I)  \wedge \texttt{src2} \quad \texttt{if mask} (I) \ne0\f]
-*   A scalar and an array when src1 is constructed from Scalar or has
-    the same number of elements as `src2.channels()`:
-    \f[\texttt{dst} (I) =  \texttt{src1}  \wedge \texttt{src2} (I) \quad \texttt{if mask} (I) \ne0\f]
-In case of floating-point arrays, their machine-specific bit
-representations (usually IEEE754-compliant) are used for the operation.
-In case of multi-channel arrays, each channel is processed
-independently. In the second and third cases above, the scalar is first
-converted to the array type.
-@param src1 first input array or a scalar.
-@param src2 second input array or a scalar.
-@param dst output array that has the same size and type as the input
-arrays.
-@param mask optional operation mask, 8-bit single channel array, that
-specifies elements of the output array to be changed.
-*/
-CV_EXPORTS_W void bitwise_and(InputArray src1, InputArray src2,
-                              OutputArray dst, InputArray mask = noArray());
-
-/** @brief Calculates the per-element bit-wise disjunction of two arrays or an
-array and a scalar.
-
-The function cv::bitwise_or calculates the per-element bit-wise logical disjunction for:
-*   Two arrays when src1 and src2 have the same size:
-    \f[\texttt{dst} (I) =  \texttt{src1} (I)  \vee \texttt{src2} (I) \quad \texttt{if mask} (I) \ne0\f]
-*   An array and a scalar when src2 is constructed from Scalar or has
-    the same number of elements as `src1.channels()`:
-    \f[\texttt{dst} (I) =  \texttt{src1} (I)  \vee \texttt{src2} \quad \texttt{if mask} (I) \ne0\f]
-*   A scalar and an array when src1 is constructed from Scalar or has
-    the same number of elements as `src2.channels()`:
-    \f[\texttt{dst} (I) =  \texttt{src1}  \vee \texttt{src2} (I) \quad \texttt{if mask} (I) \ne0\f]
-In case of floating-point arrays, their machine-specific bit
-representations (usually IEEE754-compliant) are used for the operation.
-In case of multi-channel arrays, each channel is processed
-independently. In the second and third cases above, the scalar is first
-converted to the array type.
-@param src1 first input array or a scalar.
-@param src2 second input array or a scalar.
-@param dst output array that has the same size and type as the input
-arrays.
-@param mask optional operation mask, 8-bit single channel array, that
-specifies elements of the output array to be changed.
-*/
-CV_EXPORTS_W void bitwise_or(InputArray src1, InputArray src2,
-                             OutputArray dst, InputArray mask = noArray());
-
-/** @brief Calculates the per-element bit-wise "exclusive or" operation on two
-arrays or an array and a scalar.
-
-The function cv::bitwise_xor calculates the per-element bit-wise logical "exclusive-or"
-operation for:
-*   Two arrays when src1 and src2 have the same size:
-    \f[\texttt{dst} (I) =  \texttt{src1} (I)  \oplus \texttt{src2} (I) \quad \texttt{if mask} (I) \ne0\f]
-*   An array and a scalar when src2 is constructed from Scalar or has
-    the same number of elements as `src1.channels()`:
-    \f[\texttt{dst} (I) =  \texttt{src1} (I)  \oplus \texttt{src2} \quad \texttt{if mask} (I) \ne0\f]
-*   A scalar and an array when src1 is constructed from Scalar or has
-    the same number of elements as `src2.channels()`:
-    \f[\texttt{dst} (I) =  \texttt{src1}  \oplus \texttt{src2} (I) \quad \texttt{if mask} (I) \ne0\f]
-In case of floating-point arrays, their machine-specific bit
-representations (usually IEEE754-compliant) are used for the operation.
-In case of multi-channel arrays, each channel is processed
-independently. In the 2nd and 3rd cases above, the scalar is first
-converted to the array type.
-@param src1 first input array or a scalar.
-@param src2 second input array or a scalar.
-@param dst output array that has the same size and type as the input
-arrays.
-@param mask optional operation mask, 8-bit single channel array, that
-specifies elements of the output array to be changed.
-*/
-CV_EXPORTS_W void bitwise_xor(InputArray src1, InputArray src2,
-                              OutputArray dst, InputArray mask = noArray());
-
-/** @brief  Inverts every bit of an array.
-
-The function cv::bitwise_not calculates per-element bit-wise inversion of the input
-array:
-\f[\texttt{dst} (I) =  \neg \texttt{src} (I)\f]
-In case of a floating-point input array, its machine-specific bit
-representation (usually IEEE754-compliant) is used for the operation. In
-case of multi-channel arrays, each channel is processed independently.
-@param src input array.
-@param dst output array that has the same size and type as the input
-array.
-@param mask optional operation mask, 8-bit single channel array, that
-specifies elements of the output array to be changed.
-*/
-CV_EXPORTS_W void bitwise_not(InputArray src, OutputArray dst,
-                              InputArray mask = noArray());
-
-/** @brief Calculates the per-element absolute difference between two arrays or between an array and a scalar.
-
-The function cv::absdiff calculates:
-*   Absolute difference between two arrays when they have the same
-    size and type:
-    \f[\texttt{dst}(I) =  \texttt{saturate} (| \texttt{src1}(I) -  \texttt{src2}(I)|)\f]
-*   Absolute difference between an array and a scalar when the second
-    array is constructed from Scalar or has as many elements as the
-    number of channels in `src1`:
-    \f[\texttt{dst}(I) =  \texttt{saturate} (| \texttt{src1}(I) -  \texttt{src2} |)\f]
-*   Absolute difference between a scalar and an array when the first
-    array is constructed from Scalar or has as many elements as the
-    number of channels in `src2`:
-    \f[\texttt{dst}(I) =  \texttt{saturate} (| \texttt{src1} -  \texttt{src2}(I) |)\f]
-    where I is a multi-dimensional index of array elements. In case of
-    multi-channel arrays, each channel is processed independently.
-@note Saturation is not applied when the arrays have the depth CV_32S.
-You may even get a negative value in the case of overflow.
-@param src1 first input array or a scalar.
-@param src2 second input array or a scalar.
-@param dst output array that has the same size and type as input arrays.
-@sa cv::abs(const Mat&)
-*/
-CV_EXPORTS_W void absdiff(InputArray src1, InputArray src2, OutputArray dst);
-
-/** @brief  This is an overloaded member function, provided for convenience (python)
-Copies the matrix to another one.
-When the operation mask is specified, if the Mat::create call shown above reallocates the matrix, the newly allocated matrix is initialized with all zeros before copying the data.
-@param src source matrix.
-@param dst Destination matrix. If it does not have a proper size or type before the operation, it is
-reallocated.
-@param mask Operation mask of the same size as \*this. Its non-zero elements indicate which matrix
-elements need to be copied. The mask has to be of type CV_8U and can have 1 or multiple channels.
-*/
-
-void CV_EXPORTS_W copyTo(InputArray src, OutputArray dst, InputArray mask);
-/** @brief  Checks if array elements lie between the elements of two other arrays.
-
-The function checks the range as follows:
--   For every element of a single-channel input array:
-    \f[\texttt{dst} (I)= \texttt{lowerb} (I)_0  \leq \texttt{src} (I)_0 \leq  \texttt{upperb} (I)_0\f]
--   For two-channel arrays:
-    \f[\texttt{dst} (I)= \texttt{lowerb} (I)_0  \leq \texttt{src} (I)_0 \leq  \texttt{upperb} (I)_0  \land \texttt{lowerb} (I)_1  \leq \texttt{src} (I)_1 \leq  \texttt{upperb} (I)_1\f]
--   and so forth.
-
-That is, dst (I) is set to 255 (all 1 -bits) if src (I) is within the
-specified 1D, 2D, 3D, ... box and 0 otherwise.
-
-When the lower and/or upper boundary parameters are scalars, the indexes
-(I) at lowerb and upperb in the above formulas should be omitted.
-@param src first input array.
-@param lowerb inclusive lower boundary array or a scalar.
-@param upperb inclusive upper boundary array or a scalar.
-@param dst output array of the same size as src and CV_8U type.
-*/
-CV_EXPORTS_W void inRange(InputArray src, InputArray lowerb,
-                          InputArray upperb, OutputArray dst);
-
-/** @brief Performs the per-element comparison of two arrays or an array and scalar value.
-
-The function compares:
-*   Elements of two arrays when src1 and src2 have the same size:
-    \f[\texttt{dst} (I) =  \texttt{src1} (I)  \,\texttt{cmpop}\, \texttt{src2} (I)\f]
-*   Elements of src1 with a scalar src2 when src2 is constructed from
-    Scalar or has a single element:
-    \f[\texttt{dst} (I) =  \texttt{src1}(I) \,\texttt{cmpop}\,  \texttt{src2}\f]
-*   src1 with elements of src2 when src1 is constructed from Scalar or
-    has a single element:
-    \f[\texttt{dst} (I) =  \texttt{src1}  \,\texttt{cmpop}\, \texttt{src2} (I)\f]
-When the comparison result is true, the corresponding element of output
-array is set to 255. The comparison operations can be replaced with the
-equivalent matrix expressions:
-@code{.cpp}
-    Mat dst1 = src1 >= src2;
-    Mat dst2 = src1 < 8;
-    ...
-@endcode
-@param src1 first input array or a scalar; when it is an array, it must have a single channel.
-@param src2 second input array or a scalar; when it is an array, it must have a single channel.
-@param dst output array of type ref CV_8U that has the same size and the same number of channels as
-    the input arrays.
-@param cmpop a flag, that specifies correspondence between the arrays (cv::CmpTypes)
-@sa checkRange, min, max, threshold
-*/
-CV_EXPORTS_W void compare(InputArray src1, InputArray src2, OutputArray dst, int cmpop);
-
-/** @brief Calculates per-element minimum of two arrays or an array and a scalar.
-
-The function cv::min calculates the per-element minimum of two arrays:
-\f[\texttt{dst} (I)= \min ( \texttt{src1} (I), \texttt{src2} (I))\f]
-or array and a scalar:
-\f[\texttt{dst} (I)= \min ( \texttt{src1} (I), \texttt{value} )\f]
-@param src1 first input array.
-@param src2 second input array of the same size and type as src1.
-@param dst output array of the same size and type as src1.
-@sa max, compare, inRange, minMaxLoc
-*/
-CV_EXPORTS_W void min(InputArray src1, InputArray src2, OutputArray dst);
-/** @overload
-needed to avoid conflicts with const _Tp& std::min(const _Tp&, const _Tp&, _Compare)
-*/
-CV_EXPORTS void min(const Mat& src1, const Mat& src2, Mat& dst);
-/** @overload
-needed to avoid conflicts with const _Tp& std::min(const _Tp&, const _Tp&, _Compare)
-*/
-CV_EXPORTS void min(const UMat& src1, const UMat& src2, UMat& dst);
-
-/** @brief Calculates per-element maximum of two arrays or an array and a scalar.
-
-The function cv::max calculates the per-element maximum of two arrays:
-\f[\texttt{dst} (I)= \max ( \texttt{src1} (I), \texttt{src2} (I))\f]
-or array and a scalar:
-\f[\texttt{dst} (I)= \max ( \texttt{src1} (I), \texttt{value} )\f]
-@param src1 first input array.
-@param src2 second input array of the same size and type as src1 .
-@param dst output array of the same size and type as src1.
-@sa  min, compare, inRange, minMaxLoc, @ref MatrixExpressions
-*/
-CV_EXPORTS_W void max(InputArray src1, InputArray src2, OutputArray dst);
-/** @overload
-needed to avoid conflicts with const _Tp& std::min(const _Tp&, const _Tp&, _Compare)
-*/
-CV_EXPORTS void max(const Mat& src1, const Mat& src2, Mat& dst);
-/** @overload
-needed to avoid conflicts with const _Tp& std::min(const _Tp&, const _Tp&, _Compare)
-*/
-CV_EXPORTS void max(const UMat& src1, const UMat& src2, UMat& dst);
-
-/** @brief Calculates a square root of array elements.
-
-The function cv::sqrt calculates a square root of each input array element.
-In case of multi-channel arrays, each channel is processed
-independently. The accuracy is approximately the same as of the built-in
-std::sqrt .
-@param src input floating-point array.
-@param dst output array of the same size and type as src.
-*/
-CV_EXPORTS_W void sqrt(InputArray src, OutputArray dst);
-
-/** @brief Raises every array element to a power.
-
-The function cv::pow raises every element of the input array to power :
-\f[\texttt{dst} (I) =  \fork{\texttt{src}(I)^{power}}{if \(\texttt{power}\) is integer}{|\texttt{src}(I)|^{power}}{otherwise}\f]
-
-So, for a non-integer power exponent, the absolute values of input array
-elements are used. However, it is possible to get true values for
-negative values using some extra operations. In the example below,
-computing the 5th root of array src shows:
-@code{.cpp}
-    Mat mask = src < 0;
-    pow(src, 1./5, dst);
-    subtract(Scalar::all(0), dst, dst, mask);
-@endcode
-For some values of power, such as integer values, 0.5 and -0.5,
-specialized faster algorithms are used.
-
-Special values (NaN, Inf) are not handled.
-@param src input array.
-@param power exponent of power.
-@param dst output array of the same size and type as src.
-@sa sqrt, exp, log, cartToPolar, polarToCart
-*/
-CV_EXPORTS_W void pow(InputArray src, double power, OutputArray dst);
-
-/** @brief Calculates the exponent of every array element.
-
-The function cv::exp calculates the exponent of every element of the input
-array:
-\f[\texttt{dst} [I] = e^{ src(I) }\f]
-
-The maximum relative error is about 7e-6 for single-precision input and
-less than 1e-10 for double-precision input. Currently, the function
-converts denormalized values to zeros on output. Special values (NaN,
-Inf) are not handled.
-@param src input array.
-@param dst output array of the same size and type as src.
-@sa log , cartToPolar , polarToCart , phase , pow , sqrt , magnitude
-*/
-CV_EXPORTS_W void exp(InputArray src, OutputArray dst);
-
-/** @brief Calculates the natural logarithm of every array element.
-
-The function cv::log calculates the natural logarithm of every element of the input array:
-\f[\texttt{dst} (I) =  \log (\texttt{src}(I)) \f]
-
-Output on zero, negative and special (NaN, Inf) values is undefined.
-
-@param src input array.
-@param dst output array of the same size and type as src .
-@sa exp, cartToPolar, polarToCart, phase, pow, sqrt, magnitude
-*/
-CV_EXPORTS_W void log(InputArray src, OutputArray dst);
-
-/** @brief Calculates x and y coordinates of 2D vectors from their magnitude and angle.
-
-The function cv::polarToCart calculates the Cartesian coordinates of each 2D
-vector represented by the corresponding elements of magnitude and angle:
-\f[\begin{array}{l} \texttt{x} (I) =  \texttt{magnitude} (I) \cos ( \texttt{angle} (I)) \\ \texttt{y} (I) =  \texttt{magnitude} (I) \sin ( \texttt{angle} (I)) \\ \end{array}\f]
-
-The relative accuracy of the estimated coordinates is about 1e-6.
-@param magnitude input floating-point array of magnitudes of 2D vectors;
-it can be an empty matrix (=Mat()), in this case, the function assumes
-that all the magnitudes are =1; if it is not empty, it must have the
-same size and type as angle.
-@param angle input floating-point array of angles of 2D vectors.
-@param x output array of x-coordinates of 2D vectors; it has the same
-size and type as angle.
-@param y output array of y-coordinates of 2D vectors; it has the same
-size and type as angle.
-@param angleInDegrees when true, the input angles are measured in
-degrees, otherwise, they are measured in radians.
-@sa cartToPolar, magnitude, phase, exp, log, pow, sqrt
-*/
-CV_EXPORTS_W void polarToCart(InputArray magnitude, InputArray angle,
-                              OutputArray x, OutputArray y, bool angleInDegrees = false);
-
-/** @brief Calculates the magnitude and angle of 2D vectors.
-
-The function cv::cartToPolar calculates either the magnitude, angle, or both
-for every 2D vector (x(I),y(I)):
-\f[\begin{array}{l} \texttt{magnitude} (I)= \sqrt{\texttt{x}(I)^2+\texttt{y}(I)^2} , \\ \texttt{angle} (I)= \texttt{atan2} ( \texttt{y} (I), \texttt{x} (I))[ \cdot180 / \pi ] \end{array}\f]
-
-The angles are calculated with accuracy about 0.3 degrees. For the point
-(0,0), the angle is set to 0.
-@param x array of x-coordinates; this must be a single-precision or
-double-precision floating-point array.
-@param y array of y-coordinates, that must have the same size and same type as x.
-@param magnitude output array of magnitudes of the same size and type as x.
-@param angle output array of angles that has the same size and type as
-x; the angles are measured in radians (from 0 to 2\*Pi) or in degrees (0 to 360 degrees).
-@param angleInDegrees a flag, indicating whether the angles are measured
-in radians (which is by default), or in degrees.
-@sa Sobel, Scharr
-*/
-CV_EXPORTS_W void cartToPolar(InputArray x, InputArray y,
-                              OutputArray magnitude, OutputArray angle,
-                              bool angleInDegrees = false);
-
-/** @brief Calculates the rotation angle of 2D vectors.
-
-The function cv::phase calculates the rotation angle of each 2D vector that
-is formed from the corresponding elements of x and y :
-\f[\texttt{angle} (I) =  \texttt{atan2} ( \texttt{y} (I), \texttt{x} (I))\f]
-
-The angle estimation accuracy is about 0.3 degrees. When x(I)=y(I)=0 ,
-the corresponding angle(I) is set to 0.
-@param x input floating-point array of x-coordinates of 2D vectors.
-@param y input array of y-coordinates of 2D vectors; it must have the
-same size and the same type as x.
-@param angle output array of vector angles; it has the same size and
-same type as x .
-@param angleInDegrees when true, the function calculates the angle in
-degrees, otherwise, they are measured in radians.
-*/
-CV_EXPORTS_W void phase(InputArray x, InputArray y, OutputArray angle,
-                        bool angleInDegrees = false);
-
-/** @brief Calculates the magnitude of 2D vectors.
-
-The function cv::magnitude calculates the magnitude of 2D vectors formed
-from the corresponding elements of x and y arrays:
-\f[\texttt{dst} (I) =  \sqrt{\texttt{x}(I)^2 + \texttt{y}(I)^2}\f]
-@param x floating-point array of x-coordinates of the vectors.
-@param y floating-point array of y-coordinates of the vectors; it must
-have the same size as x.
-@param magnitude output array of the same size and type as x.
-@sa cartToPolar, polarToCart, phase, sqrt
-*/
-CV_EXPORTS_W void magnitude(InputArray x, InputArray y, OutputArray magnitude);
-
-/** @brief Checks every element of an input array for invalid values.
-
-The function cv::checkRange checks that every array element is neither NaN nor infinite. When minVal \>
--DBL_MAX and maxVal \< DBL_MAX, the function also checks that each value is between minVal and
-maxVal. In case of multi-channel arrays, each channel is processed independently. If some values
-are out of range, position of the first outlier is stored in pos (when pos != NULL). Then, the
-function either returns false (when quiet=true) or throws an exception.
-@param a input array.
-@param quiet a flag, indicating whether the functions quietly return false when the array elements
-are out of range or they throw an exception.
-@param pos optional output parameter, when not NULL, must be a pointer to array of src.dims
-elements.
-@param minVal inclusive lower boundary of valid values range.
-@param maxVal exclusive upper boundary of valid values range.
-*/
-CV_EXPORTS_W bool checkRange(InputArray a, bool quiet = true, CV_OUT Point* pos = 0,
-                            double minVal = -DBL_MAX, double maxVal = DBL_MAX);
-
-/** @brief converts NaNs to the given number
-@param a input/output matrix (CV_32F type).
-@param val value to convert the NaNs
-*/
-CV_EXPORTS_W void patchNaNs(InputOutputArray a, double val = 0);
-
-/** @brief Performs generalized matrix multiplication.
-
-The function cv::gemm performs generalized matrix multiplication similar to the
-gemm functions in BLAS level 3. For example,
-`gemm(src1, src2, alpha, src3, beta, dst, GEMM_1_T + GEMM_3_T)`
-corresponds to
-\f[\texttt{dst} =  \texttt{alpha} \cdot \texttt{src1} ^T  \cdot \texttt{src2} +  \texttt{beta} \cdot \texttt{src3} ^T\f]
-
-In case of complex (two-channel) data, performed a complex matrix
-multiplication.
-
-The function can be replaced with a matrix expression. For example, the
-above call can be replaced with:
-@code{.cpp}
-    dst = alpha*src1.t()*src2 + beta*src3.t();
-@endcode
-@param src1 first multiplied input matrix that could be real(CV_32FC1,
-CV_64FC1) or complex(CV_32FC2, CV_64FC2).
-@param src2 second multiplied input matrix of the same type as src1.
-@param alpha weight of the matrix product.
-@param src3 third optional delta matrix added to the matrix product; it
-should have the same type as src1 and src2.
-@param beta weight of src3.
-@param dst output matrix; it has the proper size and the same type as
-input matrices.
-@param flags operation flags (cv::GemmFlags)
-@sa mulTransposed , transform
-*/
-CV_EXPORTS_W void gemm(InputArray src1, InputArray src2, double alpha,
-                       InputArray src3, double beta, OutputArray dst, int flags = 0);
-
-/** @brief Calculates the product of a matrix and its transposition.
-
-The function cv::mulTransposed calculates the product of src and its
-transposition:
-\f[\texttt{dst} = \texttt{scale} ( \texttt{src} - \texttt{delta} )^T ( \texttt{src} - \texttt{delta} )\f]
-if aTa=true , and
-\f[\texttt{dst} = \texttt{scale} ( \texttt{src} - \texttt{delta} ) ( \texttt{src} - \texttt{delta} )^T\f]
-otherwise. The function is used to calculate the covariance matrix. With
-zero delta, it can be used as a faster substitute for general matrix
-product A\*B when B=A'
-@param src input single-channel matrix. Note that unlike gemm, the
-function can multiply not only floating-point matrices.
-@param dst output square matrix.
-@param aTa Flag specifying the multiplication ordering. See the
-description below.
-@param delta Optional delta matrix subtracted from src before the
-multiplication. When the matrix is empty ( delta=noArray() ), it is
-assumed to be zero, that is, nothing is subtracted. If it has the same
-size as src , it is simply subtracted. Otherwise, it is "repeated" (see
-repeat ) to cover the full src and then subtracted. Type of the delta
-matrix, when it is not empty, must be the same as the type of created
-output matrix. See the dtype parameter description below.
-@param scale Optional scale factor for the matrix product.
-@param dtype Optional type of the output matrix. When it is negative,
-the output matrix will have the same type as src . Otherwise, it will be
-type=CV_MAT_DEPTH(dtype) that should be either CV_32F or CV_64F .
-@sa calcCovarMatrix, gemm, repeat, reduce
-*/
-CV_EXPORTS_W void mulTransposed( InputArray src, OutputArray dst, bool aTa,
-                                 InputArray delta = noArray(),
-                                 double scale = 1, int dtype = -1 );
-
-/** @brief Transposes a matrix.
-
-The function cv::transpose transposes the matrix src :
-\f[\texttt{dst} (i,j) =  \texttt{src} (j,i)\f]
-@note No complex conjugation is done in case of a complex matrix. It
-should be done separately if needed.
-@param src input array.
-@param dst output array of the same type as src.
-*/
-CV_EXPORTS_W void transpose(InputArray src, OutputArray dst);
-
-/** @brief Transpose for n-dimensional matrices.
- *
- * @note Input should be continuous single-channel matrix.
- * @param src input array.
- * @param order a permutation of [0,1,..,N-1] where N is the number of axes of src.
- * The i’th axis of dst will correspond to the axis numbered order[i] of the input.
- * @param dst output array of the same type as src.
- */
-CV_EXPORTS_W void transposeND(InputArray src, const std::vector<int>& order, OutputArray dst);
-
-/** @brief Performs the matrix transformation of every array element.
-
-The function cv::transform performs the matrix transformation of every
-element of the array src and stores the results in dst :
-\f[\texttt{dst} (I) =  \texttt{m} \cdot \texttt{src} (I)\f]
-(when m.cols=src.channels() ), or
-\f[\texttt{dst} (I) =  \texttt{m} \cdot [ \texttt{src} (I); 1]\f]
-(when m.cols=src.channels()+1 )
-
-Every element of the N -channel array src is interpreted as N -element
-vector that is transformed using the M x N or M x (N+1) matrix m to
-M-element vector - the corresponding element of the output array dst .
-
-The function may be used for geometrical transformation of
-N -dimensional points, arbitrary linear color space transformation (such
-as various kinds of RGB to YUV transforms), shuffling the image
-channels, and so forth.
-@param src input array that must have as many channels (1 to 4) as
-m.cols or m.cols-1.
-@param dst output array of the same size and depth as src; it has as
-many channels as m.rows.
-@param m transformation 2x2 or 2x3 floating-point matrix.
-@sa perspectiveTransform, getAffineTransform, estimateAffine2D, warpAffine, warpPerspective
-*/
-CV_EXPORTS_W void transform(InputArray src, OutputArray dst, InputArray m );
-
-/** @brief Performs the perspective matrix transformation of vectors.
-
-The function cv::perspectiveTransform transforms every element of src by
-treating it as a 2D or 3D vector, in the following way:
-\f[(x, y, z)  \rightarrow (x'/w, y'/w, z'/w)\f]
-where
-\f[(x', y', z', w') =  \texttt{mat} \cdot \begin{bmatrix} x & y & z & 1  \end{bmatrix}\f]
-and
-\f[w =  \fork{w'}{if \(w' \ne 0\)}{\infty}{otherwise}\f]
-
-Here a 3D vector transformation is shown. In case of a 2D vector
-transformation, the z component is omitted.
-
-@note The function transforms a sparse set of 2D or 3D vectors. If you
-want to transform an image using perspective transformation, use
-warpPerspective . If you have an inverse problem, that is, you want to
-compute the most probable perspective transformation out of several
-pairs of corresponding points, you can use getPerspectiveTransform or
-findHomography .
-@param src input two-channel or three-channel floating-point array; each
-element is a 2D/3D vector to be transformed.
-@param dst output array of the same size and type as src.
-@param m 3x3 or 4x4 floating-point transformation matrix.
-@sa  transform, warpPerspective, getPerspectiveTransform, findHomography
-*/
-CV_EXPORTS_W void perspectiveTransform(InputArray src, OutputArray dst, InputArray m );
-
-/** @brief Copies the lower or the upper half of a square matrix to its another half.
-
-The function cv::completeSymm copies the lower or the upper half of a square matrix to
-its another half. The matrix diagonal remains unchanged:
- - \f$\texttt{m}_{ij}=\texttt{m}_{ji}\f$ for \f$i > j\f$ if
-    lowerToUpper=false
- - \f$\texttt{m}_{ij}=\texttt{m}_{ji}\f$ for \f$i < j\f$ if
-    lowerToUpper=true
-
-@param m input-output floating-point square matrix.
-@param lowerToUpper operation flag; if true, the lower half is copied to
-the upper half. Otherwise, the upper half is copied to the lower half.
-@sa flip, transpose
-*/
-CV_EXPORTS_W void completeSymm(InputOutputArray m, bool lowerToUpper = false);
-
-/** @brief Initializes a scaled identity matrix.
-
-The function cv::setIdentity initializes a scaled identity matrix:
-\f[\texttt{mtx} (i,j)= \fork{\texttt{value}}{ if \(i=j\)}{0}{otherwise}\f]
-
-The function can also be emulated using the matrix initializers and the
-matrix expressions:
-@code
-    Mat A = Mat::eye(4, 3, CV_32F)*5;
-    // A will be set to [[5, 0, 0], [0, 5, 0], [0, 0, 5], [0, 0, 0]]
-@endcode
-@param mtx matrix to initialize (not necessarily square).
-@param s value to assign to diagonal elements.
-@sa Mat::zeros, Mat::ones, Mat::setTo, Mat::operator=
-*/
-CV_EXPORTS_W void setIdentity(InputOutputArray mtx, const Scalar& s = Scalar(1));
-
-/** @brief Returns the determinant of a square floating-point matrix.
-
-The function cv::determinant calculates and returns the determinant of the
-specified matrix. For small matrices ( mtx.cols=mtx.rows\<=3 ), the
-direct method is used. For larger matrices, the function uses LU
-factorization with partial pivoting.
-
-For symmetric positively-determined matrices, it is also possible to use
-eigen decomposition to calculate the determinant.
-@param mtx input matrix that must have CV_32FC1 or CV_64FC1 type and
-square size.
-@sa trace, invert, solve, eigen, @ref MatrixExpressions
-*/
-CV_EXPORTS_W double determinant(InputArray mtx);
-
-/** @brief Returns the trace of a matrix.
-
-The function cv::trace returns the sum of the diagonal elements of the
-matrix mtx .
-\f[\mathrm{tr} ( \texttt{mtx} ) =  \sum _i  \texttt{mtx} (i,i)\f]
-@param mtx input matrix.
-*/
-CV_EXPORTS_W Scalar trace(InputArray mtx);
-
-/** @brief Finds the inverse or pseudo-inverse of a matrix.
-
-The function cv::invert inverts the matrix src and stores the result in dst
-. When the matrix src is singular or non-square, the function calculates
-the pseudo-inverse matrix (the dst matrix) so that norm(src\*dst - I) is
-minimal, where I is an identity matrix.
-
-In case of the #DECOMP_LU method, the function returns non-zero value if
-the inverse has been successfully calculated and 0 if src is singular.
-
-In case of the #DECOMP_SVD method, the function returns the inverse
-condition number of src (the ratio of the smallest singular value to the
-largest singular value) and 0 if src is singular. The SVD method
-calculates a pseudo-inverse matrix if src is singular.
-
-Similarly to #DECOMP_LU, the method #DECOMP_CHOLESKY works only with
-non-singular square matrices that should also be symmetrical and
-positively defined. In this case, the function stores the inverted
-matrix in dst and returns non-zero. Otherwise, it returns 0.
-
-@param src input floating-point M x N matrix.
-@param dst output matrix of N x M size and the same type as src.
-@param flags inversion method (cv::DecompTypes)
-@sa solve, SVD
-*/
-CV_EXPORTS_W double invert(InputArray src, OutputArray dst, int flags = DECOMP_LU);
-
-/** @brief Solves one or more linear systems or least-squares problems.
-
-The function cv::solve solves a linear system or least-squares problem (the
-latter is possible with SVD or QR methods, or by specifying the flag
-#DECOMP_NORMAL ):
-\f[\texttt{dst} =  \arg \min _X \| \texttt{src1} \cdot \texttt{X} -  \texttt{src2} \|\f]
-
-If #DECOMP_LU or #DECOMP_CHOLESKY method is used, the function returns 1
-if src1 (or \f$\texttt{src1}^T\texttt{src1}\f$ ) is non-singular. Otherwise,
-it returns 0. In the latter case, dst is not valid. Other methods find a
-pseudo-solution in case of a singular left-hand side part.
-
-@note If you want to find a unity-norm solution of an under-defined
-singular system \f$\texttt{src1}\cdot\texttt{dst}=0\f$ , the function solve
-will not do the work. Use SVD::solveZ instead.
-
-@param src1 input matrix on the left-hand side of the system.
-@param src2 input matrix on the right-hand side of the system.
-@param dst output solution.
-@param flags solution (matrix inversion) method (#DecompTypes)
-@sa invert, SVD, eigen
-*/
-CV_EXPORTS_W bool solve(InputArray src1, InputArray src2,
-                        OutputArray dst, int flags = DECOMP_LU);
-
-/** @brief Sorts each row or each column of a matrix.
-
-The function cv::sort sorts each matrix row or each matrix column in
-ascending or descending order. So you should pass two operation flags to
-get desired behaviour. If you want to sort matrix rows or columns
-lexicographically, you can use STL std::sort generic function with the
-proper comparison predicate.
-
-@param src input single-channel array.
-@param dst output array of the same size and type as src.
-@param flags operation flags, a combination of #SortFlags
-@sa sortIdx, randShuffle
-*/
-CV_EXPORTS_W void sort(InputArray src, OutputArray dst, int flags);
-
-/** @brief Sorts each row or each column of a matrix.
-
-The function cv::sortIdx sorts each matrix row or each matrix column in the
-ascending or descending order. So you should pass two operation flags to
-get desired behaviour. Instead of reordering the elements themselves, it
-stores the indices of sorted elements in the output array. For example:
-@code
-    Mat A = Mat::eye(3,3,CV_32F), B;
-    sortIdx(A, B, SORT_EVERY_ROW + SORT_ASCENDING);
-    // B will probably contain
-    // (because of equal elements in A some permutations are possible):
-    // [[1, 2, 0], [0, 2, 1], [0, 1, 2]]
-@endcode
-@param src input single-channel array.
-@param dst output integer array of the same size as src.
-@param flags operation flags that could be a combination of cv::SortFlags
-@sa sort, randShuffle
-*/
-CV_EXPORTS_W void sortIdx(InputArray src, OutputArray dst, int flags);
-
-/** @brief Finds the real roots of a cubic equation.
-
-The function solveCubic finds the real roots of a cubic equation:
--   if coeffs is a 4-element vector:
-\f[\texttt{coeffs} [0] x^3 +  \texttt{coeffs} [1] x^2 +  \texttt{coeffs} [2] x +  \texttt{coeffs} [3] = 0\f]
--   if coeffs is a 3-element vector:
-\f[x^3 +  \texttt{coeffs} [0] x^2 +  \texttt{coeffs} [1] x +  \texttt{coeffs} [2] = 0\f]
-
-The roots are stored in the roots array.
-@param coeffs equation coefficients, an array of 3 or 4 elements.
-@param roots output array of real roots that has 1 or 3 elements.
-@return number of real roots. It can be 0, 1 or 2.
-*/
-CV_EXPORTS_W int solveCubic(InputArray coeffs, OutputArray roots);
-
-/** @brief Finds the real or complex roots of a polynomial equation.
-
-The function cv::solvePoly finds real and complex roots of a polynomial equation:
-\f[\texttt{coeffs} [n] x^{n} +  \texttt{coeffs} [n-1] x^{n-1} + ... +  \texttt{coeffs} [1] x +  \texttt{coeffs} [0] = 0\f]
-@param coeffs array of polynomial coefficients.
-@param roots output (complex) array of roots.
-@param maxIters maximum number of iterations the algorithm does.
-*/
-CV_EXPORTS_W double solvePoly(InputArray coeffs, OutputArray roots, int maxIters = 300);
-
-/** @brief Calculates eigenvalues and eigenvectors of a symmetric matrix.
-
-The function cv::eigen calculates just eigenvalues, or eigenvalues and eigenvectors of the symmetric
-matrix src:
-@code
-    src*eigenvectors.row(i).t() = eigenvalues.at<srcType>(i)*eigenvectors.row(i).t()
-@endcode
-
-@note Use cv::eigenNonSymmetric for calculation of real eigenvalues and eigenvectors of non-symmetric matrix.
-
-@param src input matrix that must have CV_32FC1 or CV_64FC1 type, square size and be symmetrical
-(src ^T^ == src).
-@param eigenvalues output vector of eigenvalues of the same type as src; the eigenvalues are stored
-in the descending order.
-@param eigenvectors output matrix of eigenvectors; it has the same size and type as src; the
-eigenvectors are stored as subsequent matrix rows, in the same order as the corresponding
-eigenvalues.
-@sa eigenNonSymmetric, completeSymm , PCA
-*/
-CV_EXPORTS_W bool eigen(InputArray src, OutputArray eigenvalues,
-                        OutputArray eigenvectors = noArray());
-
-/** @brief Calculates eigenvalues and eigenvectors of a non-symmetric matrix (real eigenvalues only).
-
-@note Assumes real eigenvalues.
-
-The function calculates eigenvalues and eigenvectors (optional) of the square matrix src:
-@code
-    src*eigenvectors.row(i).t() = eigenvalues.at<srcType>(i)*eigenvectors.row(i).t()
-@endcode
-
-@param src input matrix (CV_32FC1 or CV_64FC1 type).
-@param eigenvalues output vector of eigenvalues (type is the same type as src).
-@param eigenvectors output matrix of eigenvectors (type is the same type as src). The eigenvectors are stored as subsequent matrix rows, in the same order as the corresponding eigenvalues.
-@sa eigen
-*/
-CV_EXPORTS_W void eigenNonSymmetric(InputArray src, OutputArray eigenvalues,
-                                    OutputArray eigenvectors);
-
-/** @brief Calculates the covariance matrix of a set of vectors.
-
-The function cv::calcCovarMatrix calculates the covariance matrix and, optionally, the mean vector of
-the set of input vectors.
-@param samples samples stored as separate matrices
-@param nsamples number of samples
-@param covar output covariance matrix of the type ctype and square size.
-@param mean input or output (depending on the flags) array as the average value of the input vectors.
-@param flags operation flags as a combination of #CovarFlags
-@param ctype type of the matrixl; it equals 'CV_64F' by default.
-@sa PCA, mulTransposed, Mahalanobis
-@todo InputArrayOfArrays
-*/
-CV_EXPORTS void calcCovarMatrix( const Mat* samples, int nsamples, Mat& covar, Mat& mean,
-                                 int flags, int ctype = CV_64F);
-
-/** @overload
-@note use #COVAR_ROWS or #COVAR_COLS flag
-@param samples samples stored as rows/columns of a single matrix.
-@param covar output covariance matrix of the type ctype and square size.
-@param mean input or output (depending on the flags) array as the average value of the input vectors.
-@param flags operation flags as a combination of #CovarFlags
-@param ctype type of the matrixl; it equals 'CV_64F' by default.
-*/
-CV_EXPORTS_W void calcCovarMatrix( InputArray samples, OutputArray covar,
-                                   InputOutputArray mean, int flags, int ctype = CV_64F);
-
-/** wrap PCA::operator() */
-CV_EXPORTS_W void PCACompute(InputArray data, InputOutputArray mean,
-                             OutputArray eigenvectors, int maxComponents = 0);
-
-/** wrap PCA::operator() and add eigenvalues output parameter */
-CV_EXPORTS_AS(PCACompute2) void PCACompute(InputArray data, InputOutputArray mean,
-                                           OutputArray eigenvectors, OutputArray eigenvalues,
-                                           int maxComponents = 0);
-
-/** wrap PCA::operator() */
-CV_EXPORTS_W void PCACompute(InputArray data, InputOutputArray mean,
-                             OutputArray eigenvectors, double retainedVariance);
-
-/** wrap PCA::operator() and add eigenvalues output parameter */
-CV_EXPORTS_AS(PCACompute2) void PCACompute(InputArray data, InputOutputArray mean,
-                                           OutputArray eigenvectors, OutputArray eigenvalues,
-                                           double retainedVariance);
-
-/** wrap PCA::project */
-CV_EXPORTS_W void PCAProject(InputArray data, InputArray mean,
-                             InputArray eigenvectors, OutputArray result);
-
-/** wrap PCA::backProject */
-CV_EXPORTS_W void PCABackProject(InputArray data, InputArray mean,
-                                 InputArray eigenvectors, OutputArray result);
-
-/** wrap SVD::compute */
-CV_EXPORTS_W void SVDecomp( InputArray src, OutputArray w, OutputArray u, OutputArray vt, int flags = 0 );
-
-/** wrap SVD::backSubst */
-CV_EXPORTS_W void SVBackSubst( InputArray w, InputArray u, InputArray vt,
-                               InputArray rhs, OutputArray dst );
-
-/** @brief Calculates the Mahalanobis distance between two vectors.
-
-The function cv::Mahalanobis calculates and returns the weighted distance between two vectors:
-\f[d( \texttt{vec1} , \texttt{vec2} )= \sqrt{\sum_{i,j}{\texttt{icovar(i,j)}\cdot(\texttt{vec1}(I)-\texttt{vec2}(I))\cdot(\texttt{vec1(j)}-\texttt{vec2(j)})} }\f]
-The covariance matrix may be calculated using the #calcCovarMatrix function and then inverted using
-the invert function (preferably using the #DECOMP_SVD method, as the most accurate).
-@param v1 first 1D input vector.
-@param v2 second 1D input vector.
-@param icovar inverse covariance matrix.
-*/
-CV_EXPORTS_W double Mahalanobis(InputArray v1, InputArray v2, InputArray icovar);
-
-/** @brief Performs a forward or inverse Discrete Fourier transform of a 1D or 2D floating-point array.
-
-The function cv::dft performs one of the following:
--   Forward the Fourier transform of a 1D vector of N elements:
-    \f[Y = F^{(N)}  \cdot X,\f]
-    where \f$F^{(N)}_{jk}=\exp(-2\pi i j k/N)\f$ and \f$i=\sqrt{-1}\f$
--   Inverse the Fourier transform of a 1D vector of N elements:
-    \f[\begin{array}{l} X'=  \left (F^{(N)} \right )^{-1}  \cdot Y =  \left (F^{(N)} \right )^*  \cdot y  \\ X = (1/N)  \cdot X, \end{array}\f]
-    where \f$F^*=\left(\textrm{Re}(F^{(N)})-\textrm{Im}(F^{(N)})\right)^T\f$
--   Forward the 2D Fourier transform of a M x N matrix:
-    \f[Y = F^{(M)}  \cdot X  \cdot F^{(N)}\f]
--   Inverse the 2D Fourier transform of a M x N matrix:
-    \f[\begin{array}{l} X'=  \left (F^{(M)} \right )^*  \cdot Y  \cdot \left (F^{(N)} \right )^* \\ X =  \frac{1}{M \cdot N} \cdot X' \end{array}\f]
-
-In case of real (single-channel) data, the output spectrum of the forward Fourier transform or input
-spectrum of the inverse Fourier transform can be represented in a packed format called *CCS*
-(complex-conjugate-symmetrical). It was borrowed from IPL (Intel\* Image Processing Library). Here
-is how 2D *CCS* spectrum looks:
-\f[\begin{bmatrix} Re Y_{0,0} & Re Y_{0,1} & Im Y_{0,1} & Re Y_{0,2} & Im Y_{0,2} &  \cdots & Re Y_{0,N/2-1} & Im Y_{0,N/2-1} & Re Y_{0,N/2}  \\ Re Y_{1,0} & Re Y_{1,1} & Im Y_{1,1} & Re Y_{1,2} & Im Y_{1,2} &  \cdots & Re Y_{1,N/2-1} & Im Y_{1,N/2-1} & Re Y_{1,N/2}  \\ Im Y_{1,0} & Re Y_{2,1} & Im Y_{2,1} & Re Y_{2,2} & Im Y_{2,2} &  \cdots & Re Y_{2,N/2-1} & Im Y_{2,N/2-1} & Im Y_{1,N/2}  \\ \hdotsfor{9} \\ Re Y_{M/2-1,0} &  Re Y_{M-3,1}  & Im Y_{M-3,1} &  \hdotsfor{3} & Re Y_{M-3,N/2-1} & Im Y_{M-3,N/2-1}& Re Y_{M/2-1,N/2}  \\ Im Y_{M/2-1,0} &  Re Y_{M-2,1}  & Im Y_{M-2,1} &  \hdotsfor{3} & Re Y_{M-2,N/2-1} & Im Y_{M-2,N/2-1}& Im Y_{M/2-1,N/2}  \\ Re Y_{M/2,0}  &  Re Y_{M-1,1} &  Im Y_{M-1,1} &  \hdotsfor{3} & Re Y_{M-1,N/2-1} & Im Y_{M-1,N/2-1}& Re Y_{M/2,N/2} \end{bmatrix}\f]
-
-In case of 1D transform of a real vector, the output looks like the first row of the matrix above.
-
-So, the function chooses an operation mode depending on the flags and size of the input array:
--   If #DFT_ROWS is set or the input array has a single row or single column, the function
-    performs a 1D forward or inverse transform of each row of a matrix when #DFT_ROWS is set.
-    Otherwise, it performs a 2D transform.
--   If the input array is real and #DFT_INVERSE is not set, the function performs a forward 1D or
-    2D transform:
-    -   When #DFT_COMPLEX_OUTPUT is set, the output is a complex matrix of the same size as
-        input.
-    -   When #DFT_COMPLEX_OUTPUT is not set, the output is a real matrix of the same size as
-        input. In case of 2D transform, it uses the packed format as shown above. In case of a
-        single 1D transform, it looks like the first row of the matrix above. In case of
-        multiple 1D transforms (when using the #DFT_ROWS flag), each row of the output matrix
-        looks like the first row of the matrix above.
--   If the input array is complex and either #DFT_INVERSE or #DFT_REAL_OUTPUT are not set, the
-    output is a complex array of the same size as input. The function performs a forward or
-    inverse 1D or 2D transform of the whole input array or each row of the input array
-    independently, depending on the flags DFT_INVERSE and DFT_ROWS.
--   When #DFT_INVERSE is set and the input array is real, or it is complex but #DFT_REAL_OUTPUT
-    is set, the output is a real array of the same size as input. The function performs a 1D or 2D
-    inverse transformation of the whole input array or each individual row, depending on the flags
-    #DFT_INVERSE and #DFT_ROWS.
-
-If #DFT_SCALE is set, the scaling is done after the transformation.
-
-Unlike dct , the function supports arrays of arbitrary size. But only those arrays are processed
-efficiently, whose sizes can be factorized in a product of small prime numbers (2, 3, and 5 in the
-current implementation). Such an efficient DFT size can be calculated using the getOptimalDFTSize
-method.
-
-The sample below illustrates how to calculate a DFT-based convolution of two 2D real arrays:
-@code
-    void convolveDFT(InputArray A, InputArray B, OutputArray C)
-    {
-        // reallocate the output array if needed
-        C.create(abs(A.rows - B.rows)+1, abs(A.cols - B.cols)+1, A.type());
-        Size dftSize;
-        // calculate the size of DFT transform
-        dftSize.width = getOptimalDFTSize(A.cols + B.cols - 1);
-        dftSize.height = getOptimalDFTSize(A.rows + B.rows - 1);
-
-        // allocate temporary buffers and initialize them with 0's
-        Mat tempA(dftSize, A.type(), Scalar::all(0));
-        Mat tempB(dftSize, B.type(), Scalar::all(0));
-
-        // copy A and B to the top-left corners of tempA and tempB, respectively
-        Mat roiA(tempA, Rect(0,0,A.cols,A.rows));
-        A.copyTo(roiA);
-        Mat roiB(tempB, Rect(0,0,B.cols,B.rows));
-        B.copyTo(roiB);
-
-        // now transform the padded A & B in-place;
-        // use "nonzeroRows" hint for faster processing
-        dft(tempA, tempA, 0, A.rows);
-        dft(tempB, tempB, 0, B.rows);
-
-        // multiply the spectrums;
-        // the function handles packed spectrum representations well
-        mulSpectrums(tempA, tempB, tempA);
-
-        // transform the product back from the frequency domain.
-        // Even though all the result rows will be non-zero,
-        // you need only the first C.rows of them, and thus you
-        // pass nonzeroRows == C.rows
-        dft(tempA, tempA, DFT_INVERSE + DFT_SCALE, C.rows);
-
-        // now copy the result back to C.
-        tempA(Rect(0, 0, C.cols, C.rows)).copyTo(C);
-
-        // all the temporary buffers will be deallocated automatically
-    }
-@endcode
-To optimize this sample, consider the following approaches:
--   Since nonzeroRows != 0 is passed to the forward transform calls and since A and B are copied to
-    the top-left corners of tempA and tempB, respectively, it is not necessary to clear the whole
-    tempA and tempB. It is only necessary to clear the tempA.cols - A.cols ( tempB.cols - B.cols)
-    rightmost columns of the matrices.
--   This DFT-based convolution does not have to be applied to the whole big arrays, especially if B
-    is significantly smaller than A or vice versa. Instead, you can calculate convolution by parts.
-    To do this, you need to split the output array C into multiple tiles. For each tile, estimate
-    which parts of A and B are required to calculate convolution in this tile. If the tiles in C are
-    too small, the speed will decrease a lot because of repeated work. In the ultimate case, when
-    each tile in C is a single pixel, the algorithm becomes equivalent to the naive convolution
-    algorithm. If the tiles are too big, the temporary arrays tempA and tempB become too big and
-    there is also a slowdown because of bad cache locality. So, there is an optimal tile size
-    somewhere in the middle.
--   If different tiles in C can be calculated in parallel and, thus, the convolution is done by
-    parts, the loop can be threaded.
-
-All of the above improvements have been implemented in #matchTemplate and #filter2D . Therefore, by
-using them, you can get the performance even better than with the above theoretically optimal
-implementation. Though, those two functions actually calculate cross-correlation, not convolution,
-so you need to "flip" the second convolution operand B vertically and horizontally using flip .
-@note
--   An example using the discrete fourier transform can be found at
-    opencv_source_code/samples/cpp/dft.cpp
--   (Python) An example using the dft functionality to perform Wiener deconvolution can be found
-    at opencv_source/samples/python/deconvolution.py
--   (Python) An example rearranging the quadrants of a Fourier image can be found at
-    opencv_source/samples/python/dft.py
-@param src input array that could be real or complex.
-@param dst output array whose size and type depends on the flags .
-@param flags transformation flags, representing a combination of the #DftFlags
-@param nonzeroRows when the parameter is not zero, the function assumes that only the first
-nonzeroRows rows of the input array (#DFT_INVERSE is not set) or only the first nonzeroRows of the
-output array (#DFT_INVERSE is set) contain non-zeros, thus, the function can handle the rest of the
-rows more efficiently and save some time; this technique is very useful for calculating array
-cross-correlation or convolution using DFT.
-@sa dct , getOptimalDFTSize , mulSpectrums, filter2D , matchTemplate , flip , cartToPolar ,
-magnitude , phase
-*/
-CV_EXPORTS_W void dft(InputArray src, OutputArray dst, int flags = 0, int nonzeroRows = 0);
-
-/** @brief Calculates the inverse Discrete Fourier Transform of a 1D or 2D array.
-
-idft(src, dst, flags) is equivalent to dft(src, dst, flags | #DFT_INVERSE) .
-@note None of dft and idft scales the result by default. So, you should pass #DFT_SCALE to one of
-dft or idft explicitly to make these transforms mutually inverse.
-@sa dft, dct, idct, mulSpectrums, getOptimalDFTSize
-@param src input floating-point real or complex array.
-@param dst output array whose size and type depend on the flags.
-@param flags operation flags (see dft and #DftFlags).
-@param nonzeroRows number of dst rows to process; the rest of the rows have undefined content (see
-the convolution sample in dft description.
-*/
-CV_EXPORTS_W void idft(InputArray src, OutputArray dst, int flags = 0, int nonzeroRows = 0);
-
-/** @brief Performs a forward or inverse discrete Cosine transform of 1D or 2D array.
-
-The function cv::dct performs a forward or inverse discrete Cosine transform (DCT) of a 1D or 2D
-floating-point array:
--   Forward Cosine transform of a 1D vector of N elements:
-    \f[Y = C^{(N)}  \cdot X\f]
-    where
-    \f[C^{(N)}_{jk}= \sqrt{\alpha_j/N} \cos \left ( \frac{\pi(2k+1)j}{2N} \right )\f]
-    and
-    \f$\alpha_0=1\f$, \f$\alpha_j=2\f$ for *j \> 0*.
--   Inverse Cosine transform of a 1D vector of N elements:
-    \f[X =  \left (C^{(N)} \right )^{-1}  \cdot Y =  \left (C^{(N)} \right )^T  \cdot Y\f]
-    (since \f$C^{(N)}\f$ is an orthogonal matrix, \f$C^{(N)} \cdot \left(C^{(N)}\right)^T = I\f$ )
--   Forward 2D Cosine transform of M x N matrix:
-    \f[Y = C^{(N)}  \cdot X  \cdot \left (C^{(N)} \right )^T\f]
--   Inverse 2D Cosine transform of M x N matrix:
-    \f[X =  \left (C^{(N)} \right )^T  \cdot X  \cdot C^{(N)}\f]
-
-The function chooses the mode of operation by looking at the flags and size of the input array:
--   If (flags & #DCT_INVERSE) == 0 , the function does a forward 1D or 2D transform. Otherwise, it
-    is an inverse 1D or 2D transform.
--   If (flags & #DCT_ROWS) != 0 , the function performs a 1D transform of each row.
--   If the array is a single column or a single row, the function performs a 1D transform.
--   If none of the above is true, the function performs a 2D transform.
-
-@note Currently dct supports even-size arrays (2, 4, 6 ...). For data analysis and approximation, you
-can pad the array when necessary.
-Also, the function performance depends very much, and not monotonically, on the array size (see
-getOptimalDFTSize ). In the current implementation DCT of a vector of size N is calculated via DFT
-of a vector of size N/2 . Thus, the optimal DCT size N1 \>= N can be calculated as:
-@code
-    size_t getOptimalDCTSize(size_t N) { return 2*getOptimalDFTSize((N+1)/2); }
-    N1 = getOptimalDCTSize(N);
-@endcode
-@param src input floating-point array.
-@param dst output array of the same size and type as src .
-@param flags transformation flags as a combination of cv::DftFlags (DCT_*)
-@sa dft , getOptimalDFTSize , idct
-*/
-CV_EXPORTS_W void dct(InputArray src, OutputArray dst, int flags = 0);
-
-/** @brief Calculates the inverse Discrete Cosine Transform of a 1D or 2D array.
-
-idct(src, dst, flags) is equivalent to dct(src, dst, flags | DCT_INVERSE).
-@param src input floating-point single-channel array.
-@param dst output array of the same size and type as src.
-@param flags operation flags.
-@sa  dct, dft, idft, getOptimalDFTSize
-*/
-CV_EXPORTS_W void idct(InputArray src, OutputArray dst, int flags = 0);
-
-/** @brief Performs the per-element multiplication of two Fourier spectrums.
-
-The function cv::mulSpectrums performs the per-element multiplication of the two CCS-packed or complex
-matrices that are results of a real or complex Fourier transform.
-
-The function, together with dft and idft , may be used to calculate convolution (pass conjB=false )
-or correlation (pass conjB=true ) of two arrays rapidly. When the arrays are complex, they are
-simply multiplied (per element) with an optional conjugation of the second-array elements. When the
-arrays are real, they are assumed to be CCS-packed (see dft for details).
-@param a first input array.
-@param b second input array of the same size and type as src1 .
-@param c output array of the same size and type as src1 .
-@param flags operation flags; currently, the only supported flag is cv::DFT_ROWS, which indicates that
-each row of src1 and src2 is an independent 1D Fourier spectrum. If you do not want to use this flag, then simply add a `0` as value.
-@param conjB optional flag that conjugates the second input array before the multiplication (true)
-or not (false).
-*/
-CV_EXPORTS_W void mulSpectrums(InputArray a, InputArray b, OutputArray c,
-                               int flags, bool conjB = false);
-
-/** @brief Returns the optimal DFT size for a given vector size.
-
-DFT performance is not a monotonic function of a vector size. Therefore, when you calculate
-convolution of two arrays or perform the spectral analysis of an array, it usually makes sense to
-pad the input data with zeros to get a bit larger array that can be transformed much faster than the
-original one. Arrays whose size is a power-of-two (2, 4, 8, 16, 32, ...) are the fastest to process.
-Though, the arrays whose size is a product of 2's, 3's, and 5's (for example, 300 = 5\*5\*3\*2\*2)
-are also processed quite efficiently.
-
-The function cv::getOptimalDFTSize returns the minimum number N that is greater than or equal to vecsize
-so that the DFT of a vector of size N can be processed efficiently. In the current implementation N
-= 2 ^p^ \* 3 ^q^ \* 5 ^r^ for some integer p, q, r.
-
-The function returns a negative number if vecsize is too large (very close to INT_MAX ).
-
-While the function cannot be used directly to estimate the optimal vector size for DCT transform
-(since the current DCT implementation supports only even-size vectors), it can be easily processed
-as getOptimalDFTSize((vecsize+1)/2)\*2.
-@param vecsize vector size.
-@sa dft , dct , idft , idct , mulSpectrums
-*/
-CV_EXPORTS_W int getOptimalDFTSize(int vecsize);
-
-/** @brief Returns the default random number generator.
-
-The function cv::theRNG returns the default random number generator. For each thread, there is a
-separate random number generator, so you can use the function safely in multi-thread environments.
-If you just need to get a single random number using this generator or initialize an array, you can
-use randu or randn instead. But if you are going to generate many random numbers inside a loop, it
-is much faster to use this function to retrieve the generator and then use RNG::operator _Tp() .
-@sa RNG, randu, randn
-*/
-CV_EXPORTS RNG& theRNG();
-
-/** @brief Sets state of default random number generator.
-
-The function cv::setRNGSeed sets state of default random number generator to custom value.
-@param seed new state for default random number generator
-@sa RNG, randu, randn
-*/
-CV_EXPORTS_W void setRNGSeed(int seed);
-
-/** @brief Generates a single uniformly-distributed random number or an array of random numbers.
-
-Non-template variant of the function fills the matrix dst with uniformly-distributed
-random numbers from the specified range:
-\f[\texttt{low} _c  \leq \texttt{dst} (I)_c <  \texttt{high} _c\f]
-@param dst output array of random numbers; the array must be pre-allocated.
-@param low inclusive lower boundary of the generated random numbers.
-@param high exclusive upper boundary of the generated random numbers.
-@sa RNG, randn, theRNG
-*/
-CV_EXPORTS_W void randu(InputOutputArray dst, InputArray low, InputArray high);
-
-/** @brief Fills the array with normally distributed random numbers.
-
-The function cv::randn fills the matrix dst with normally distributed random numbers with the specified
-mean vector and the standard deviation matrix. The generated random numbers are clipped to fit the
-value range of the output array data type.
-@param dst output array of random numbers; the array must be pre-allocated and have 1 to 4 channels.
-@param mean mean value (expectation) of the generated random numbers.
-@param stddev standard deviation of the generated random numbers; it can be either a vector (in
-which case a diagonal standard deviation matrix is assumed) or a square matrix.
-@sa RNG, randu
-*/
-CV_EXPORTS_W void randn(InputOutputArray dst, InputArray mean, InputArray stddev);
-
-/** @brief Shuffles the array elements randomly.
-
-The function cv::randShuffle shuffles the specified 1D array by randomly choosing pairs of elements and
-swapping them. The number of such swap operations will be dst.rows\*dst.cols\*iterFactor .
-@param dst input/output numerical 1D array.
-@param iterFactor scale factor that determines the number of random swap operations (see the details
-below).
-@param rng optional random number generator used for shuffling; if it is zero, theRNG () is used
-instead.
-@sa RNG, sort
-*/
-CV_EXPORTS_W void randShuffle(InputOutputArray dst, double iterFactor = 1., RNG* rng = 0);
-
-/** @brief Principal Component Analysis
-
-The class is used to calculate a special basis for a set of vectors. The
-basis will consist of eigenvectors of the covariance matrix calculated
-from the input set of vectors. The class %PCA can also transform
-vectors to/from the new coordinate space defined by the basis. Usually,
-in this new coordinate system, each vector from the original set (and
-any linear combination of such vectors) can be quite accurately
-approximated by taking its first few components, corresponding to the
-eigenvectors of the largest eigenvalues of the covariance matrix.
-Geometrically it means that you calculate a projection of the vector to
-a subspace formed by a few eigenvectors corresponding to the dominant
-eigenvalues of the covariance matrix. And usually such a projection is
-very close to the original vector. So, you can represent the original
-vector from a high-dimensional space with a much shorter vector
-consisting of the projected vector's coordinates in the subspace. Such a
-transformation is also known as Karhunen-Loeve Transform, or KLT.
-See http://en.wikipedia.org/wiki/Principal_component_analysis
-
-The sample below is the function that takes two matrices. The first
-function stores a set of vectors (a row per vector) that is used to
-calculate PCA. The second function stores another "test" set of vectors
-(a row per vector). First, these vectors are compressed with PCA, then
-reconstructed back, and then the reconstruction error norm is computed
-and printed for each vector. :
-
-@code{.cpp}
-using namespace cv;
-
-PCA compressPCA(const Mat& pcaset, int maxComponents,
-                const Mat& testset, Mat& compressed)
-{
-    PCA pca(pcaset, // pass the data
-            Mat(), // we do not have a pre-computed mean vector,
-                   // so let the PCA engine to compute it
-            PCA::DATA_AS_ROW, // indicate that the vectors
-                                // are stored as matrix rows
-                                // (use PCA::DATA_AS_COL if the vectors are
-                                // the matrix columns)
-            maxComponents // specify, how many principal components to retain
-            );
-    // if there is no test data, just return the computed basis, ready-to-use
-    if( !testset.data )
-        return pca;
-    CV_Assert( testset.cols == pcaset.cols );
-
-    compressed.create(testset.rows, maxComponents, testset.type());
-
-    Mat reconstructed;
-    for( int i = 0; i < testset.rows; i++ )
-    {
-        Mat vec = testset.row(i), coeffs = compressed.row(i), reconstructed;
-        // compress the vector, the result will be stored
-        // in the i-th row of the output matrix
-        pca.project(vec, coeffs);
-        // and then reconstruct it
-        pca.backProject(coeffs, reconstructed);
-        // and measure the error
-        printf("%d. diff = %g\n", i, norm(vec, reconstructed, NORM_L2));
-    }
-    return pca;
-}
-@endcode
-@sa calcCovarMatrix, mulTransposed, SVD, dft, dct
-*/
-class CV_EXPORTS PCA
-{
-public:
-    enum Flags { DATA_AS_ROW = 0, //!< indicates that the input samples are stored as matrix rows
-                 DATA_AS_COL = 1, //!< indicates that the input samples are stored as matrix columns
-                 USE_AVG     = 2  //!
-               };
-
-    /** @brief default constructor
-
-    The default constructor initializes an empty %PCA structure. The other
-    constructors initialize the structure and call PCA::operator()().
-    */
-    PCA();
-
-    /** @overload
-    @param data input samples stored as matrix rows or matrix columns.
-    @param mean optional mean value; if the matrix is empty (@c noArray()),
-    the mean is computed from the data.
-    @param flags operation flags; currently the parameter is only used to
-    specify the data layout (PCA::Flags)
-    @param maxComponents maximum number of components that %PCA should
-    retain; by default, all the components are retained.
-    */
-    PCA(InputArray data, InputArray mean, int flags, int maxComponents = 0);
-
-    /** @overload
-    @param data input samples stored as matrix rows or matrix columns.
-    @param mean optional mean value; if the matrix is empty (noArray()),
-    the mean is computed from the data.
-    @param flags operation flags; currently the parameter is only used to
-    specify the data layout (PCA::Flags)
-    @param retainedVariance Percentage of variance that PCA should retain.
-    Using this parameter will let the PCA decided how many components to
-    retain but it will always keep at least 2.
-    */
-    PCA(InputArray data, InputArray mean, int flags, double retainedVariance);
-
-    /** @brief performs %PCA
-
-    The operator performs %PCA of the supplied dataset. It is safe to reuse
-    the same PCA structure for multiple datasets. That is, if the structure
-    has been previously used with another dataset, the existing internal
-    data is reclaimed and the new @ref eigenvalues, @ref eigenvectors and @ref
-    mean are allocated and computed.
-
-    The computed @ref eigenvalues are sorted from the largest to the smallest and
-    the corresponding @ref eigenvectors are stored as eigenvectors rows.
-
-    @param data input samples stored as the matrix rows or as the matrix
-    columns.
-    @param mean optional mean value; if the matrix is empty (noArray()),
-    the mean is computed from the data.
-    @param flags operation flags; currently the parameter is only used to
-    specify the data layout. (Flags)
-    @param maxComponents maximum number of components that PCA should
-    retain; by default, all the components are retained.
-    */
-    PCA& operator()(InputArray data, InputArray mean, int flags, int maxComponents = 0);
-
-    /** @overload
-    @param data input samples stored as the matrix rows or as the matrix
-    columns.
-    @param mean optional mean value; if the matrix is empty (noArray()),
-    the mean is computed from the data.
-    @param flags operation flags; currently the parameter is only used to
-    specify the data layout. (PCA::Flags)
-    @param retainedVariance Percentage of variance that %PCA should retain.
-    Using this parameter will let the %PCA decided how many components to
-    retain but it will always keep at least 2.
-     */
-    PCA& operator()(InputArray data, InputArray mean, int flags, double retainedVariance);
-
-    /** @brief Projects vector(s) to the principal component subspace.
-
-    The methods project one or more vectors to the principal component
-    subspace, where each vector projection is represented by coefficients in
-    the principal component basis. The first form of the method returns the
-    matrix that the second form writes to the result. So the first form can
-    be used as a part of expression while the second form can be more
-    efficient in a processing loop.
-    @param vec input vector(s); must have the same dimensionality and the
-    same layout as the input data used at %PCA phase, that is, if
-    DATA_AS_ROW are specified, then `vec.cols==data.cols`
-    (vector dimensionality) and `vec.rows` is the number of vectors to
-    project, and the same is true for the PCA::DATA_AS_COL case.
-    */
-    Mat project(InputArray vec) const;
-
-    /** @overload
-    @param vec input vector(s); must have the same dimensionality and the
-    same layout as the input data used at PCA phase, that is, if
-    DATA_AS_ROW are specified, then `vec.cols==data.cols`
-    (vector dimensionality) and `vec.rows` is the number of vectors to
-    project, and the same is true for the PCA::DATA_AS_COL case.
-    @param result output vectors; in case of PCA::DATA_AS_COL, the
-    output matrix has as many columns as the number of input vectors, this
-    means that `result.cols==vec.cols` and the number of rows match the
-    number of principal components (for example, `maxComponents` parameter
-    passed to the constructor).
-     */
-    void project(InputArray vec, OutputArray result) const;
-
-    /** @brief Reconstructs vectors from their PC projections.
-
-    The methods are inverse operations to PCA::project. They take PC
-    coordinates of projected vectors and reconstruct the original vectors.
-    Unless all the principal components have been retained, the
-    reconstructed vectors are different from the originals. But typically,
-    the difference is small if the number of components is large enough (but
-    still much smaller than the original vector dimensionality). As a
-    result, PCA is used.
-    @param vec coordinates of the vectors in the principal component
-    subspace, the layout and size are the same as of PCA::project output
-    vectors.
-     */
-    Mat backProject(InputArray vec) const;
-
-    /** @overload
-    @param vec coordinates of the vectors in the principal component
-    subspace, the layout and size are the same as of PCA::project output
-    vectors.
-    @param result reconstructed vectors; the layout and size are the same as
-    of PCA::project input vectors.
-     */
-    void backProject(InputArray vec, OutputArray result) const;
-
-    /** @brief write PCA objects
-
-    Writes @ref eigenvalues @ref eigenvectors and @ref mean to specified FileStorage
-     */
-    void write(FileStorage& fs) const;
-
-    /** @brief load PCA objects
-
-    Loads @ref eigenvalues @ref eigenvectors and @ref mean from specified FileNode
-     */
-    void read(const FileNode& fn);
-
-    Mat eigenvectors; //!< eigenvectors of the covariation matrix
-    Mat eigenvalues; //!< eigenvalues of the covariation matrix
-    Mat mean; //!< mean value subtracted before the projection and added after the back projection
-};
-
-/** @example samples/cpp/pca.cpp
-An example using %PCA for dimensionality reduction while maintaining an amount of variance
-*/
-
-/** @example samples/cpp/tutorial_code/ml/introduction_to_pca/introduction_to_pca.cpp
-Check @ref tutorial_introduction_to_pca "the corresponding tutorial" for more details
-*/
-
-/**
-@brief Linear Discriminant Analysis
-@todo document this class
-*/
-class CV_EXPORTS LDA
-{
-public:
-    /** @brief constructor
-    Initializes a LDA with num_components (default 0).
-    */
-    explicit LDA(int num_components = 0);
-
-    /** Initializes and performs a Discriminant Analysis with Fisher's
-     Optimization Criterion on given data in src and corresponding labels
-     in labels. If 0 (or less) number of components are given, they are
-     automatically determined for given data in computation.
-    */
-    LDA(InputArrayOfArrays src, InputArray labels, int num_components = 0);
-
-    /** Serializes this object to a given filename.
-      */
-    void save(const String& filename) const;
-
-    /** Deserializes this object from a given filename.
-      */
-    void load(const String& filename);
-
-    /** Serializes this object to a given cv::FileStorage.
-      */
-    void save(FileStorage& fs) const;
-
-    /** Deserializes this object from a given cv::FileStorage.
-      */
-    void load(const FileStorage& node);
-
-    /** destructor
-      */
-    ~LDA();
-
-    /** Compute the discriminants for data in src (row aligned) and labels.
-      */
-    void compute(InputArrayOfArrays src, InputArray labels);
-
-    /** Projects samples into the LDA subspace.
-        src may be one or more row aligned samples.
-      */
-    Mat project(InputArray src);
-
-    /** Reconstructs projections from the LDA subspace.
-        src may be one or more row aligned projections.
-      */
-    Mat reconstruct(InputArray src);
-
-    /** Returns the eigenvectors of this LDA.
-      */
-    Mat eigenvectors() const { return _eigenvectors; }
-
-    /** Returns the eigenvalues of this LDA.
-      */
-    Mat eigenvalues() const { return _eigenvalues; }
-
-    static Mat subspaceProject(InputArray W, InputArray mean, InputArray src);
-    static Mat subspaceReconstruct(InputArray W, InputArray mean, InputArray src);
-
-protected:
-    int _num_components;
-    Mat _eigenvectors;
-    Mat _eigenvalues;
-    void lda(InputArrayOfArrays src, InputArray labels);
-};
-
-/** @brief Singular Value Decomposition
-
-Class for computing Singular Value Decomposition of a floating-point
-matrix. The Singular Value Decomposition is used to solve least-square
-problems, under-determined linear systems, invert matrices, compute
-condition numbers, and so on.
-
-If you want to compute a condition number of a matrix or an absolute value of
-its determinant, you do not need `u` and `vt`. You can pass
-flags=SVD::NO_UV|... . Another flag SVD::FULL_UV indicates that full-size u
-and vt must be computed, which is not necessary most of the time.
-
-@sa invert, solve, eigen, determinant
-*/
-class CV_EXPORTS SVD
-{
-public:
-    enum Flags {
-        /** allow the algorithm to modify the decomposed matrix; it can save space and speed up
-            processing. currently ignored. */
-        MODIFY_A = 1,
-        /** indicates that only a vector of singular values `w` is to be processed, while u and vt
-            will be set to empty matrices */
-        NO_UV    = 2,
-        /** when the matrix is not square, by default the algorithm produces u and vt matrices of
-            sufficiently large size for the further A reconstruction; if, however, FULL_UV flag is
-            specified, u and vt will be full-size square orthogonal matrices.*/
-        FULL_UV  = 4
-    };
-
-    /** @brief the default constructor
-
-    initializes an empty SVD structure
-      */
-    SVD();
-
-    /** @overload
-    initializes an empty SVD structure and then calls SVD::operator()
-    @param src decomposed matrix. The depth has to be CV_32F or CV_64F.
-    @param flags operation flags (SVD::Flags)
-      */
-    SVD( InputArray src, int flags = 0 );
-
-    /** @brief the operator that performs SVD. The previously allocated u, w and vt are released.
-
-    The operator performs the singular value decomposition of the supplied
-    matrix. The u,`vt` , and the vector of singular values w are stored in
-    the structure. The same SVD structure can be reused many times with
-    different matrices. Each time, if needed, the previous u,`vt` , and w
-    are reclaimed and the new matrices are created, which is all handled by
-    Mat::create.
-    @param src decomposed matrix. The depth has to be CV_32F or CV_64F.
-    @param flags operation flags (SVD::Flags)
-      */
-    SVD& operator ()( InputArray src, int flags = 0 );
-
-    /** @brief decomposes matrix and stores the results to user-provided matrices
-
-    The methods/functions perform SVD of matrix. Unlike SVD::SVD constructor
-    and SVD::operator(), they store the results to the user-provided
-    matrices:
-
-    @code{.cpp}
-    Mat A, w, u, vt;
-    SVD::compute(A, w, u, vt);
-    @endcode
-
-    @param src decomposed matrix. The depth has to be CV_32F or CV_64F.
-    @param w calculated singular values
-    @param u calculated left singular vectors
-    @param vt transposed matrix of right singular vectors
-    @param flags operation flags - see SVD::Flags.
-      */
-    static void compute( InputArray src, OutputArray w,
-                         OutputArray u, OutputArray vt, int flags = 0 );
-
-    /** @overload
-    computes singular values of a matrix
-    @param src decomposed matrix. The depth has to be CV_32F or CV_64F.
-    @param w calculated singular values
-    @param flags operation flags - see SVD::Flags.
-      */
-    static void compute( InputArray src, OutputArray w, int flags = 0 );
-
-    /** @brief performs back substitution
-      */
-    static void backSubst( InputArray w, InputArray u,
-                           InputArray vt, InputArray rhs,
-                           OutputArray dst );
-
-    /** @brief solves an under-determined singular linear system
-
-    The method finds a unit-length solution x of a singular linear system
-    A\*x = 0. Depending on the rank of A, there can be no solutions, a
-    single solution or an infinite number of solutions. In general, the
-    algorithm solves the following problem:
-    \f[dst =  \arg \min _{x:  \| x \| =1}  \| src  \cdot x  \|\f]
-    @param src left-hand-side matrix.
-    @param dst found solution.
-      */
-    static void solveZ( InputArray src, OutputArray dst );
-
-    /** @brief performs a singular value back substitution.
-
-    The method calculates a back substitution for the specified right-hand
-    side:
-
-    \f[\texttt{x} =  \texttt{vt} ^T  \cdot diag( \texttt{w} )^{-1}  \cdot \texttt{u} ^T  \cdot \texttt{rhs} \sim \texttt{A} ^{-1}  \cdot \texttt{rhs}\f]
-
-    Using this technique you can either get a very accurate solution of the
-    convenient linear system, or the best (in the least-squares terms)
-    pseudo-solution of an overdetermined linear system.
-
-    @param rhs right-hand side of a linear system (u\*w\*v')\*dst = rhs to
-    be solved, where A has been previously decomposed.
-
-    @param dst found solution of the system.
-
-    @note Explicit SVD with the further back substitution only makes sense
-    if you need to solve many linear systems with the same left-hand side
-    (for example, src ). If all you need is to solve a single system
-    (possibly with multiple rhs immediately available), simply call solve
-    add pass #DECOMP_SVD there. It does absolutely the same thing.
-      */
-    void backSubst( InputArray rhs, OutputArray dst ) const;
-
-    /** @todo document */
-    template<typename _Tp, int m, int n, int nm> static
-    void compute( const Matx<_Tp, m, n>& a, Matx<_Tp, nm, 1>& w, Matx<_Tp, m, nm>& u, Matx<_Tp, n, nm>& vt );
-
-    /** @todo document */
-    template<typename _Tp, int m, int n, int nm> static
-    void compute( const Matx<_Tp, m, n>& a, Matx<_Tp, nm, 1>& w );
-
-    /** @todo document */
-    template<typename _Tp, int m, int n, int nm, int nb> static
-    void backSubst( const Matx<_Tp, nm, 1>& w, const Matx<_Tp, m, nm>& u, const Matx<_Tp, n, nm>& vt, const Matx<_Tp, m, nb>& rhs, Matx<_Tp, n, nb>& dst );
-
-    Mat u, w, vt;
-};
-
-/** @brief Random Number Generator
-
-Random number generator. It encapsulates the state (currently, a 64-bit
-integer) and has methods to return scalar random values and to fill
-arrays with random values. Currently it supports uniform and Gaussian
-(normal) distributions. The generator uses Multiply-With-Carry
-algorithm, introduced by G. Marsaglia (
-<http://en.wikipedia.org/wiki/Multiply-with-carry> ).
-Gaussian-distribution random numbers are generated using the Ziggurat
-algorithm ( <http://en.wikipedia.org/wiki/Ziggurat_algorithm> ),
-introduced by G. Marsaglia and W. W. Tsang.
-*/
-class CV_EXPORTS RNG
-{
-public:
-    enum { UNIFORM = 0,
-           NORMAL  = 1
-         };
-
-    /** @brief constructor
-
-    These are the RNG constructors. The first form sets the state to some
-    pre-defined value, equal to 2\*\*32-1 in the current implementation. The
-    second form sets the state to the specified value. If you passed state=0
-    , the constructor uses the above default value instead to avoid the
-    singular random number sequence, consisting of all zeros.
-    */
-    RNG();
-    /** @overload
-    @param state 64-bit value used to initialize the RNG.
-    */
-    RNG(uint64 state);
-    /**The method updates the state using the MWC algorithm and returns the
-    next 32-bit random number.*/
-    unsigned next();
-
-    /**Each of the methods updates the state using the MWC algorithm and
-    returns the next random number of the specified type. In case of integer
-    types, the returned number is from the available value range for the
-    specified type. In case of floating-point types, the returned value is
-    from [0,1) range.
-    */
-    operator uchar();
-    /** @overload */
-    operator schar();
-    /** @overload */
-    operator ushort();
-    /** @overload */
-    operator short();
-    /** @overload */
-    operator unsigned();
-    /** @overload */
-    operator int();
-    /** @overload */
-    operator float();
-    /** @overload */
-    operator double();
-
-    /** @brief returns a random integer sampled uniformly from [0, N).
-
-    The methods transform the state using the MWC algorithm and return the
-    next random number. The first form is equivalent to RNG::next . The
-    second form returns the random number modulo N , which means that the
-    result is in the range [0, N) .
-    */
-    unsigned operator ()();
-    /** @overload
-    @param N upper non-inclusive boundary of the returned random number.
-    */
-    unsigned operator ()(unsigned N);
-
-    /** @brief returns uniformly distributed integer random number from [a,b) range
-
-    The methods transform the state using the MWC algorithm and return the
-    next uniformly-distributed random number of the specified type, deduced
-    from the input parameter type, from the range [a, b) . There is a nuance
-    illustrated by the following sample:
-
-    @code{.cpp}
-    RNG rng;
-
-    // always produces 0
-    double a = rng.uniform(0, 1);
-
-    // produces double from [0, 1)
-    double a1 = rng.uniform((double)0, (double)1);
-
-    // produces float from [0, 1)
-    float b = rng.uniform(0.f, 1.f);
-
-    // produces double from [0, 1)
-    double c = rng.uniform(0., 1.);
-
-    // may cause compiler error because of ambiguity:
-    //  RNG::uniform(0, (int)0.999999)? or RNG::uniform((double)0, 0.99999)?
-    double d = rng.uniform(0, 0.999999);
-    @endcode
-
-    The compiler does not take into account the type of the variable to
-    which you assign the result of RNG::uniform . The only thing that
-    matters to the compiler is the type of a and b parameters. So, if you
-    want a floating-point random number, but the range boundaries are
-    integer numbers, either put dots in the end, if they are constants, or
-    use explicit type cast operators, as in the a1 initialization above.
-    @param a lower inclusive boundary of the returned random number.
-    @param b upper non-inclusive boundary of the returned random number.
-    */
-    int uniform(int a, int b);
-    /** @overload */
-    float uniform(float a, float b);
-    /** @overload */
-    double uniform(double a, double b);
-
-    /** @brief Fills arrays with random numbers.
-
-    @param mat 2D or N-dimensional matrix; currently matrices with more than
-    4 channels are not supported by the methods, use Mat::reshape as a
-    possible workaround.
-    @param distType distribution type, RNG::UNIFORM or RNG::NORMAL.
-    @param a first distribution parameter; in case of the uniform
-    distribution, this is an inclusive lower boundary, in case of the normal
-    distribution, this is a mean value.
-    @param b second distribution parameter; in case of the uniform
-    distribution, this is a non-inclusive upper boundary, in case of the
-    normal distribution, this is a standard deviation (diagonal of the
-    standard deviation matrix or the full standard deviation matrix).
-    @param saturateRange pre-saturation flag; for uniform distribution only;
-    if true, the method will first convert a and b to the acceptable value
-    range (according to the mat datatype) and then will generate uniformly
-    distributed random numbers within the range [saturate(a), saturate(b)),
-    if saturateRange=false, the method will generate uniformly distributed
-    random numbers in the original range [a, b) and then will saturate them,
-    it means, for example, that
-    <tt>theRNG().fill(mat_8u, RNG::UNIFORM, -DBL_MAX, DBL_MAX)</tt> will likely
-    produce array mostly filled with 0's and 255's, since the range (0, 255)
-    is significantly smaller than [-DBL_MAX, DBL_MAX).
-
-    Each of the methods fills the matrix with the random values from the
-    specified distribution. As the new numbers are generated, the RNG state
-    is updated accordingly. In case of multiple-channel images, every
-    channel is filled independently, which means that RNG cannot generate
-    samples from the multi-dimensional Gaussian distribution with
-    non-diagonal covariance matrix directly. To do that, the method
-    generates samples from multi-dimensional standard Gaussian distribution
-    with zero mean and identity covariation matrix, and then transforms them
-    using transform to get samples from the specified Gaussian distribution.
-    */
-    void fill( InputOutputArray mat, int distType, InputArray a, InputArray b, bool saturateRange = false );
-
-    /** @brief Returns the next random number sampled from the Gaussian distribution
-    @param sigma standard deviation of the distribution.
-
-    The method transforms the state using the MWC algorithm and returns the
-    next random number from the Gaussian distribution N(0,sigma) . That is,
-    the mean value of the returned random numbers is zero and the standard
-    deviation is the specified sigma .
-    */
-    double gaussian(double sigma);
-
-    uint64 state;
-
-    bool operator ==(const RNG& other) const;
-};
-
-/** @brief Mersenne Twister random number generator
-
-Inspired by http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/MT2002/CODES/mt19937ar.c
-@todo document
-*/
-class CV_EXPORTS RNG_MT19937
-{
-public:
-    RNG_MT19937();
-    RNG_MT19937(unsigned s);
-    void seed(unsigned s);
-
-    unsigned next();
-
-    operator int();
-    operator unsigned();
-    operator float();
-    operator double();
-
-    unsigned operator ()(unsigned N);
-    unsigned operator ()();
-
-    /** @brief returns uniformly distributed integer random number from [a,b) range*/
-    int uniform(int a, int b);
-    /** @brief returns uniformly distributed floating-point random number from [a,b) range*/
-    float uniform(float a, float b);
-    /** @brief returns uniformly distributed double-precision floating-point random number from [a,b) range*/
-    double uniform(double a, double b);
-
-private:
-    enum PeriodParameters {N = 624, M = 397};
-    unsigned state[N];
-    int mti;
-};
-
-//! @} core_array
-
-//! @addtogroup core_cluster
-//!  @{
-
-/** @example samples/cpp/kmeans.cpp
-An example on K-means clustering
-*/
-
-/** @brief Finds centers of clusters and groups input samples around the clusters.
-
-The function kmeans implements a k-means algorithm that finds the centers of cluster_count clusters
-and groups the input samples around the clusters. As an output, \f$\texttt{bestLabels}_i\f$ contains a
-0-based cluster index for the sample stored in the \f$i^{th}\f$ row of the samples matrix.
-
-@note
--   (Python) An example on K-means clustering can be found at
-    opencv_source_code/samples/python/kmeans.py
-@param data Data for clustering. An array of N-Dimensional points with float coordinates is needed.
-Examples of this array can be:
--   Mat points(count, 2, CV_32F);
--   Mat points(count, 1, CV_32FC2);
--   Mat points(1, count, CV_32FC2);
--   std::vector\<cv::Point2f\> points(sampleCount);
-@param K Number of clusters to split the set by.
-@param bestLabels Input/output integer array that stores the cluster indices for every sample.
-@param criteria The algorithm termination criteria, that is, the maximum number of iterations and/or
-the desired accuracy. The accuracy is specified as criteria.epsilon. As soon as each of the cluster
-centers moves by less than criteria.epsilon on some iteration, the algorithm stops.
-@param attempts Flag to specify the number of times the algorithm is executed using different
-initial labellings. The algorithm returns the labels that yield the best compactness (see the last
-function parameter).
-@param flags Flag that can take values of cv::KmeansFlags
-@param centers Output matrix of the cluster centers, one row per each cluster center.
-@return The function returns the compactness measure that is computed as
-\f[\sum _i  \| \texttt{samples} _i -  \texttt{centers} _{ \texttt{labels} _i} \| ^2\f]
-after every attempt. The best (minimum) value is chosen and the corresponding labels and the
-compactness value are returned by the function. Basically, you can use only the core of the
-function, set the number of attempts to 1, initialize labels each time using a custom algorithm,
-pass them with the ( flags = #KMEANS_USE_INITIAL_LABELS ) flag, and then choose the best
-(most-compact) clustering.
-*/
-CV_EXPORTS_W double kmeans( InputArray data, int K, InputOutputArray bestLabels,
-                            TermCriteria criteria, int attempts,
-                            int flags, OutputArray centers = noArray() );
-
-//! @} core_cluster
-
-//! @addtogroup core_basic
-//! @{
-
-/////////////////////////////// Formatted output of cv::Mat ///////////////////////////
-
-/** @todo document */
-class CV_EXPORTS Formatted
-{
-public:
-    virtual const char* next() = 0;
-    virtual void reset() = 0;
-    virtual ~Formatted();
-};
-
-/** @todo document */
-class CV_EXPORTS Formatter
-{
-public:
-    enum FormatType {
-           FMT_DEFAULT = 0,
-           FMT_MATLAB  = 1,
-           FMT_CSV     = 2,
-           FMT_PYTHON  = 3,
-           FMT_NUMPY   = 4,
-           FMT_C       = 5
-         };
-
-    virtual ~Formatter();
-
-    virtual Ptr<Formatted> format(const Mat& mtx) const = 0;
-
-    virtual void set16fPrecision(int p = 4) = 0;
-    virtual void set32fPrecision(int p = 8) = 0;
-    virtual void set64fPrecision(int p = 16) = 0;
-    virtual void setMultiline(bool ml = true) = 0;
-
-    static Ptr<Formatter> get(Formatter::FormatType fmt = FMT_DEFAULT);
-
-};
-
-static inline
-String& operator << (String& out, Ptr<Formatted> fmtd)
-{
-    fmtd->reset();
-    for(const char* str = fmtd->next(); str; str = fmtd->next())
-        out += cv::String(str);
-    return out;
-}
-
-static inline
-String& operator << (String& out, const Mat& mtx)
-{
-    return out << Formatter::get()->format(mtx);
-}
-
-//////////////////////////////////////// Algorithm ////////////////////////////////////
-
-class CV_EXPORTS Algorithm;
-
-template<typename _Tp, typename _EnumTp = void> struct ParamType {};
-
-
-/** @brief This is a base class for all more or less complex algorithms in OpenCV
-
-especially for classes of algorithms, for which there can be multiple implementations. The examples
-are stereo correspondence (for which there are algorithms like block matching, semi-global block
-matching, graph-cut etc.), background subtraction (which can be done using mixture-of-gaussians
-models, codebook-based algorithm etc.), optical flow (block matching, Lucas-Kanade, Horn-Schunck
-etc.).
-
-Here is example of SimpleBlobDetector use in your application via Algorithm interface:
-@snippet snippets/core_various.cpp Algorithm
-*/
-class CV_EXPORTS_W Algorithm
-{
-public:
-    Algorithm();
-    virtual ~Algorithm();
-
-    /** @brief Clears the algorithm state
-    */
-    CV_WRAP virtual void clear() {}
-
-    /** @brief Stores algorithm parameters in a file storage
-    */
-    virtual void write(FileStorage& fs) const { CV_UNUSED(fs); }
-
-    /** @brief simplified API for language bindings
-    * @overload
-    */
-    CV_WRAP void write(const Ptr<FileStorage>& fs, const String& name = String()) const;
-
-    /** @brief Reads algorithm parameters from a file storage
-    */
-    CV_WRAP virtual void read(const FileNode& fn) { CV_UNUSED(fn); }
-
-    /** @brief Returns true if the Algorithm is empty (e.g. in the very beginning or after unsuccessful read
-    */
-    CV_WRAP virtual bool empty() const { return false; }
-
-    /** @brief Reads algorithm from the file node
-
-    This is static template method of Algorithm. It's usage is following (in the case of SVM):
-    @code
-    cv::FileStorage fsRead("example.xml", FileStorage::READ);
-    Ptr<SVM> svm = Algorithm::read<SVM>(fsRead.root());
-    @endcode
-    In order to make this method work, the derived class must overwrite Algorithm::read(const
-    FileNode& fn) and also have static create() method without parameters
-    (or with all the optional parameters)
-    */
-    template<typename _Tp> static Ptr<_Tp> read(const FileNode& fn)
-    {
-        Ptr<_Tp> obj = _Tp::create();
-        obj->read(fn);
-        return !obj->empty() ? obj : Ptr<_Tp>();
-    }
-
-    /** @brief Loads algorithm from the file
-
-    @param filename Name of the file to read.
-    @param objname The optional name of the node to read (if empty, the first top-level node will be used)
-
-    This is static template method of Algorithm. It's usage is following (in the case of SVM):
-    @code
-    Ptr<SVM> svm = Algorithm::load<SVM>("my_svm_model.xml");
-    @endcode
-    In order to make this method work, the derived class must overwrite Algorithm::read(const
-    FileNode& fn).
-    */
-    template<typename _Tp> static Ptr<_Tp> load(const String& filename, const String& objname=String())
-    {
-        FileStorage fs(filename, FileStorage::READ);
-        CV_Assert(fs.isOpened());
-        FileNode fn = objname.empty() ? fs.getFirstTopLevelNode() : fs[objname];
-        if (fn.empty()) return Ptr<_Tp>();
-        Ptr<_Tp> obj = _Tp::create();
-        obj->read(fn);
-        return !obj->empty() ? obj : Ptr<_Tp>();
-    }
-
-    /** @brief Loads algorithm from a String
-
-    @param strModel The string variable containing the model you want to load.
-    @param objname The optional name of the node to read (if empty, the first top-level node will be used)
-
-    This is static template method of Algorithm. It's usage is following (in the case of SVM):
-    @code
-    Ptr<SVM> svm = Algorithm::loadFromString<SVM>(myStringModel);
-    @endcode
-    */
-    template<typename _Tp> static Ptr<_Tp> loadFromString(const String& strModel, const String& objname=String())
-    {
-        FileStorage fs(strModel, FileStorage::READ + FileStorage::MEMORY);
-        FileNode fn = objname.empty() ? fs.getFirstTopLevelNode() : fs[objname];
-        Ptr<_Tp> obj = _Tp::create();
-        obj->read(fn);
-        return !obj->empty() ? obj : Ptr<_Tp>();
-    }
-
-    /** Saves the algorithm to a file.
-    In order to make this method work, the derived class must implement Algorithm::write(FileStorage& fs). */
-    CV_WRAP virtual void save(const String& filename) const;
-
-    /** Returns the algorithm string identifier.
-    This string is used as top level xml/yml node tag when the object is saved to a file or string. */
-    CV_WRAP virtual String getDefaultName() const;
-
-protected:
-    void writeFormat(FileStorage& fs) const;
-};
-
-enum struct Param {
-    INT=0, BOOLEAN=1, REAL=2, STRING=3, MAT=4, MAT_VECTOR=5, ALGORITHM=6, FLOAT=7,
-    UNSIGNED_INT=8, UINT64=9, UCHAR=11, SCALAR=12
-};
-
-
-
-template<> struct ParamType<bool>
-{
-    typedef bool const_param_type;
-    typedef bool member_type;
-
-    static const Param type = Param::BOOLEAN;
-};
-
-template<> struct ParamType<int>
-{
-    typedef int const_param_type;
-    typedef int member_type;
-
-    static const Param type = Param::INT;
-};
-
-template<> struct ParamType<double>
-{
-    typedef double const_param_type;
-    typedef double member_type;
-
-    static const Param type = Param::REAL;
-};
-
-template<> struct ParamType<String>
-{
-    typedef const String& const_param_type;
-    typedef String member_type;
-
-    static const Param type = Param::STRING;
-};
-
-template<> struct ParamType<Mat>
-{
-    typedef const Mat& const_param_type;
-    typedef Mat member_type;
-
-    static const Param type = Param::MAT;
-};
-
-template<> struct ParamType<std::vector<Mat> >
-{
-    typedef const std::vector<Mat>& const_param_type;
-    typedef std::vector<Mat> member_type;
-
-    static const Param type = Param::MAT_VECTOR;
-};
-
-template<> struct ParamType<Algorithm>
-{
-    typedef const Ptr<Algorithm>& const_param_type;
-    typedef Ptr<Algorithm> member_type;
-
-    static const Param type = Param::ALGORITHM;
-};
-
-template<> struct ParamType<float>
-{
-    typedef float const_param_type;
-    typedef float member_type;
-
-    static const Param type = Param::FLOAT;
-};
-
-template<> struct ParamType<unsigned>
-{
-    typedef unsigned const_param_type;
-    typedef unsigned member_type;
-
-    static const Param type = Param::UNSIGNED_INT;
-};
-
-template<> struct ParamType<uint64>
-{
-    typedef uint64 const_param_type;
-    typedef uint64 member_type;
-
-    static const Param type = Param::UINT64;
-};
-
-template<> struct ParamType<uchar>
-{
-    typedef uchar const_param_type;
-    typedef uchar member_type;
-
-    static const Param type = Param::UCHAR;
-};
-
-template<> struct ParamType<Scalar>
-{
-    typedef const Scalar& const_param_type;
-    typedef Scalar member_type;
-
-    static const Param type = Param::SCALAR;
-};
-
-template<typename _Tp>
-struct ParamType<_Tp, typename std::enable_if< std::is_enum<_Tp>::value >::type>
-{
-    typedef typename std::underlying_type<_Tp>::type const_param_type;
-    typedef typename std::underlying_type<_Tp>::type member_type;
-
-    static const Param type = Param::INT;
-};
-
-//! @} core_basic
-
-} //namespace cv
-
-#include "opencv2/core/operations.hpp"
-#include "opencv2/core/cvstd.inl.hpp"
-#include "opencv2/core/utility.hpp"
-#include "opencv2/core/optim.hpp"
-#include "opencv2/core/ovx.hpp"
-
-#endif /*OPENCV_CORE_HPP*/
diff --git a/3rdParty/opencv2/core/base.hpp b/3rdParty/opencv2/core/base.hpp
deleted file mode 100644
index 64c6c05144..0000000000
--- a/3rdParty/opencv2/core/base.hpp
+++ /dev/null
@@ -1,664 +0,0 @@
-/*M///////////////////////////////////////////////////////////////////////////////////////
-//
-//  IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
-//
-//  By downloading, copying, installing or using the software you agree to this license.
-//  If you do not agree to this license, do not download, install,
-//  copy or use the software.
-//
-//
-//                          License Agreement
-//                For Open Source Computer Vision Library
-//
-// Copyright (C) 2000-2008, Intel Corporation, all rights reserved.
-// Copyright (C) 2009, Willow Garage Inc., all rights reserved.
-// Copyright (C) 2013, OpenCV Foundation, all rights reserved.
-// Copyright (C) 2014, Itseez Inc., all rights reserved.
-// Third party copyrights are property of their respective owners.
-//
-// Redistribution and use in source and binary forms, with or without modification,
-// are permitted provided that the following conditions are met:
-//
-//   * Redistribution's of source code must retain the above copyright notice,
-//     this list of conditions and the following disclaimer.
-//
-//   * Redistribution's in binary form must reproduce the above copyright notice,
-//     this list of conditions and the following disclaimer in the documentation
-//     and/or other materials provided with the distribution.
-//
-//   * The name of the copyright holders may not be used to endorse or promote products
-//     derived from this software without specific prior written permission.
-//
-// This software is provided by the copyright holders and contributors "as is" and
-// any express or implied warranties, including, but not limited to, the implied
-// warranties of merchantability and fitness for a particular purpose are disclaimed.
-// In no event shall the Intel Corporation or contributors be liable for any direct,
-// indirect, incidental, special, exemplary, or consequential damages
-// (including, but not limited to, procurement of substitute goods or services;
-// loss of use, data, or profits; or business interruption) however caused
-// and on any theory of liability, whether in contract, strict liability,
-// or tort (including negligence or otherwise) arising in any way out of
-// the use of this software, even if advised of the possibility of such damage.
-//
-//M*/
-
-#ifndef OPENCV_CORE_BASE_HPP
-#define OPENCV_CORE_BASE_HPP
-
-#ifndef __cplusplus
-#  error base.hpp header must be compiled as C++
-#endif
-
-#include "opencv2/opencv_modules.hpp"
-
-#include <climits>
-#include <algorithm>
-
-#include "opencv2/core/cvdef.h"
-#include "opencv2/core/cvstd.hpp"
-
-namespace cv
-{
-
-//! @addtogroup core_utils
-//! @{
-
-namespace Error {
-//! error codes
-enum Code {
-    StsOk=                       0,  //!< everything is ok
-    StsBackTrace=               -1,  //!< pseudo error for back trace
-    StsError=                   -2,  //!< unknown /unspecified error
-    StsInternal=                -3,  //!< internal error (bad state)
-    StsNoMem=                   -4,  //!< insufficient memory
-    StsBadArg=                  -5,  //!< function arg/param is bad
-    StsBadFunc=                 -6,  //!< unsupported function
-    StsNoConv=                  -7,  //!< iteration didn't converge
-    StsAutoTrace=               -8,  //!< tracing
-    HeaderIsNull=               -9,  //!< image header is NULL
-    BadImageSize=              -10,  //!< image size is invalid
-    BadOffset=                 -11,  //!< offset is invalid
-    BadDataPtr=                -12,  //!<
-    BadStep=                   -13,  //!< image step is wrong, this may happen for a non-continuous matrix.
-    BadModelOrChSeq=           -14,  //!<
-    BadNumChannels=            -15,  //!< bad number of channels, for example, some functions accept only single channel matrices.
-    BadNumChannel1U=           -16,  //!<
-    BadDepth=                  -17,  //!< input image depth is not supported by the function
-    BadAlphaChannel=           -18,  //!<
-    BadOrder=                  -19,  //!< number of dimensions is out of range
-    BadOrigin=                 -20,  //!< incorrect input origin
-    BadAlign=                  -21,  //!< incorrect input align
-    BadCallBack=               -22,  //!<
-    BadTileSize=               -23,  //!<
-    BadCOI=                    -24,  //!< input COI is not supported
-    BadROISize=                -25,  //!< incorrect input roi
-    MaskIsTiled=               -26,  //!<
-    StsNullPtr=                -27,  //!< null pointer
-    StsVecLengthErr=           -28,  //!< incorrect vector length
-    StsFilterStructContentErr= -29,  //!< incorrect filter structure content
-    StsKernelStructContentErr= -30,  //!< incorrect transform kernel content
-    StsFilterOffsetErr=        -31,  //!< incorrect filter offset value
-    StsBadSize=                -201, //!< the input/output structure size is incorrect
-    StsDivByZero=              -202, //!< division by zero
-    StsInplaceNotSupported=    -203, //!< in-place operation is not supported
-    StsObjectNotFound=         -204, //!< request can't be completed
-    StsUnmatchedFormats=       -205, //!< formats of input/output arrays differ
-    StsBadFlag=                -206, //!< flag is wrong or not supported
-    StsBadPoint=               -207, //!< bad CvPoint
-    StsBadMask=                -208, //!< bad format of mask (neither 8uC1 nor 8sC1)
-    StsUnmatchedSizes=         -209, //!< sizes of input/output structures do not match
-    StsUnsupportedFormat=      -210, //!< the data format/type is not supported by the function
-    StsOutOfRange=             -211, //!< some of parameters are out of range
-    StsParseError=             -212, //!< invalid syntax/structure of the parsed file
-    StsNotImplemented=         -213, //!< the requested function/feature is not implemented
-    StsBadMemBlock=            -214, //!< an allocated block has been corrupted
-    StsAssert=                 -215, //!< assertion failed
-    GpuNotSupported=           -216, //!< no CUDA support
-    GpuApiCallError=           -217, //!< GPU API call error
-    OpenGlNotSupported=        -218, //!< no OpenGL support
-    OpenGlApiCallError=        -219, //!< OpenGL API call error
-    OpenCLApiCallError=        -220, //!< OpenCL API call error
-    OpenCLDoubleNotSupported=  -221,
-    OpenCLInitError=           -222, //!< OpenCL initialization error
-    OpenCLNoAMDBlasFft=        -223
-};
-} //Error
-
-//! @} core_utils
-
-//! @addtogroup core_array
-//! @{
-
-//! matrix decomposition types
-enum DecompTypes {
-    /** Gaussian elimination with the optimal pivot element chosen. */
-    DECOMP_LU       = 0,
-    /** singular value decomposition (SVD) method; the system can be over-defined and/or the matrix
-    src1 can be singular */
-    DECOMP_SVD      = 1,
-    /** eigenvalue decomposition; the matrix src1 must be symmetrical */
-    DECOMP_EIG      = 2,
-    /** Cholesky \f$LL^T\f$ factorization; the matrix src1 must be symmetrical and positively
-    defined */
-    DECOMP_CHOLESKY = 3,
-    /** QR factorization; the system can be over-defined and/or the matrix src1 can be singular */
-    DECOMP_QR       = 4,
-    /** while all the previous flags are mutually exclusive, this flag can be used together with
-    any of the previous; it means that the normal equations
-    \f$\texttt{src1}^T\cdot\texttt{src1}\cdot\texttt{dst}=\texttt{src1}^T\texttt{src2}\f$ are
-    solved instead of the original system
-    \f$\texttt{src1}\cdot\texttt{dst}=\texttt{src2}\f$ */
-    DECOMP_NORMAL   = 16
-};
-
-/** norm types
-
-src1 and src2 denote input arrays.
-*/
-
-enum NormTypes {
-                /**
-                \f[
-                norm =  \forkthree
-                {\|\texttt{src1}\|_{L_{\infty}} =  \max _I | \texttt{src1} (I)|}{if  \(\texttt{normType} = \texttt{NORM_INF}\) }
-                {\|\texttt{src1}-\texttt{src2}\|_{L_{\infty}} =  \max _I | \texttt{src1} (I) -  \texttt{src2} (I)|}{if  \(\texttt{normType} = \texttt{NORM_INF}\) }
-                {\frac{\|\texttt{src1}-\texttt{src2}\|_{L_{\infty}}    }{\|\texttt{src2}\|_{L_{\infty}} }}{if  \(\texttt{normType} = \texttt{NORM_RELATIVE | NORM_INF}\) }
-                \f]
-                */
-                NORM_INF       = 1,
-                /**
-                \f[
-                norm =  \forkthree
-                {\| \texttt{src1} \| _{L_1} =  \sum _I | \texttt{src1} (I)|}{if  \(\texttt{normType} = \texttt{NORM_L1}\)}
-                { \| \texttt{src1} - \texttt{src2} \| _{L_1} =  \sum _I | \texttt{src1} (I) -  \texttt{src2} (I)|}{if  \(\texttt{normType} = \texttt{NORM_L1}\) }
-                { \frac{\|\texttt{src1}-\texttt{src2}\|_{L_1} }{\|\texttt{src2}\|_{L_1}} }{if  \(\texttt{normType} = \texttt{NORM_RELATIVE | NORM_L1}\) }
-                \f]*/
-                 NORM_L1        = 2,
-                 /**
-                 \f[
-                 norm =  \forkthree
-                 { \| \texttt{src1} \| _{L_2} =  \sqrt{\sum_I \texttt{src1}(I)^2} }{if  \(\texttt{normType} = \texttt{NORM_L2}\) }
-                 { \| \texttt{src1} - \texttt{src2} \| _{L_2} =  \sqrt{\sum_I (\texttt{src1}(I) - \texttt{src2}(I))^2} }{if  \(\texttt{normType} = \texttt{NORM_L2}\) }
-                 { \frac{\|\texttt{src1}-\texttt{src2}\|_{L_2} }{\|\texttt{src2}\|_{L_2}} }{if  \(\texttt{normType} = \texttt{NORM_RELATIVE | NORM_L2}\) }
-                 \f]
-                 */
-                 NORM_L2        = 4,
-                 /**
-                 \f[
-                 norm =  \forkthree
-                 { \| \texttt{src1} \| _{L_2} ^{2} = \sum_I \texttt{src1}(I)^2} {if  \(\texttt{normType} = \texttt{NORM_L2SQR}\)}
-                 { \| \texttt{src1} - \texttt{src2} \| _{L_2} ^{2} =  \sum_I (\texttt{src1}(I) - \texttt{src2}(I))^2 }{if  \(\texttt{normType} = \texttt{NORM_L2SQR}\) }
-                 { \left(\frac{\|\texttt{src1}-\texttt{src2}\|_{L_2} }{\|\texttt{src2}\|_{L_2}}\right)^2 }{if  \(\texttt{normType} = \texttt{NORM_RELATIVE | NORM_L2SQR}\) }
-                 \f]
-                 */
-                 NORM_L2SQR     = 5,
-                 /**
-                 In the case of one input array, calculates the Hamming distance of the array from zero,
-                 In the case of two input arrays, calculates the Hamming distance between the arrays.
-                 */
-                 NORM_HAMMING   = 6,
-                 /**
-                 Similar to NORM_HAMMING, but in the calculation, each two bits of the input sequence will
-                 be added and treated as a single bit to be used in the same calculation as NORM_HAMMING.
-                 */
-                 NORM_HAMMING2  = 7,
-                 NORM_TYPE_MASK = 7, //!< bit-mask which can be used to separate norm type from norm flags
-                 NORM_RELATIVE  = 8, //!< flag
-                 NORM_MINMAX    = 32 //!< flag
-               };
-
-//! comparison types
-enum CmpTypes { CMP_EQ = 0, //!< src1 is equal to src2.
-                CMP_GT = 1, //!< src1 is greater than src2.
-                CMP_GE = 2, //!< src1 is greater than or equal to src2.
-                CMP_LT = 3, //!< src1 is less than src2.
-                CMP_LE = 4, //!< src1 is less than or equal to src2.
-                CMP_NE = 5  //!< src1 is unequal to src2.
-              };
-
-//! generalized matrix multiplication flags
-enum GemmFlags { GEMM_1_T = 1, //!< transposes src1
-                 GEMM_2_T = 2, //!< transposes src2
-                 GEMM_3_T = 4 //!< transposes src3
-               };
-
-enum DftFlags {
-    /** performs an inverse 1D or 2D transform instead of the default forward
-        transform. */
-    DFT_INVERSE        = 1,
-    /** scales the result: divide it by the number of array elements. Normally, it is
-        combined with DFT_INVERSE. */
-    DFT_SCALE          = 2,
-    /** performs a forward or inverse transform of every individual row of the input
-        matrix; this flag enables you to transform multiple vectors simultaneously and can be used to
-        decrease the overhead (which is sometimes several times larger than the processing itself) to
-        perform 3D and higher-dimensional transformations and so forth.*/
-    DFT_ROWS           = 4,
-    /** performs a forward transformation of 1D or 2D real array; the result,
-        though being a complex array, has complex-conjugate symmetry (*CCS*, see the function
-        description below for details), and such an array can be packed into a real array of the same
-        size as input, which is the fastest option and which is what the function does by default;
-        however, you may wish to get a full complex array (for simpler spectrum analysis, and so on) -
-        pass the flag to enable the function to produce a full-size complex output array. */
-    DFT_COMPLEX_OUTPUT = 16,
-    /** performs an inverse transformation of a 1D or 2D complex array; the
-        result is normally a complex array of the same size, however, if the input array has
-        conjugate-complex symmetry (for example, it is a result of forward transformation with
-        DFT_COMPLEX_OUTPUT flag), the output is a real array; while the function itself does not
-        check whether the input is symmetrical or not, you can pass the flag and then the function
-        will assume the symmetry and produce the real output array (note that when the input is packed
-        into a real array and inverse transformation is executed, the function treats the input as a
-        packed complex-conjugate symmetrical array, and the output will also be a real array). */
-    DFT_REAL_OUTPUT    = 32,
-    /** specifies that input is complex input. If this flag is set, the input must have 2 channels.
-        On the other hand, for backwards compatibility reason, if input has 2 channels, input is
-        already considered complex. */
-    DFT_COMPLEX_INPUT  = 64,
-    /** performs an inverse 1D or 2D transform instead of the default forward transform. */
-    DCT_INVERSE        = DFT_INVERSE,
-    /** performs a forward or inverse transform of every individual row of the input
-        matrix. This flag enables you to transform multiple vectors simultaneously and can be used to
-        decrease the overhead (which is sometimes several times larger than the processing itself) to
-        perform 3D and higher-dimensional transforms and so forth.*/
-    DCT_ROWS           = DFT_ROWS
-};
-
-//! Various border types, image boundaries are denoted with `|`
-//! @see borderInterpolate, copyMakeBorder
-enum BorderTypes {
-    BORDER_CONSTANT    = 0, //!< `iiiiii|abcdefgh|iiiiiii`  with some specified `i`
-    BORDER_REPLICATE   = 1, //!< `aaaaaa|abcdefgh|hhhhhhh`
-    BORDER_REFLECT     = 2, //!< `fedcba|abcdefgh|hgfedcb`
-    BORDER_WRAP        = 3, //!< `cdefgh|abcdefgh|abcdefg`
-    BORDER_REFLECT_101 = 4, //!< `gfedcb|abcdefgh|gfedcba`
-    BORDER_TRANSPARENT = 5, //!< `uvwxyz|abcdefgh|ijklmno`
-
-    BORDER_REFLECT101  = BORDER_REFLECT_101, //!< same as BORDER_REFLECT_101
-    BORDER_DEFAULT     = BORDER_REFLECT_101, //!< same as BORDER_REFLECT_101
-    BORDER_ISOLATED    = 16 //!< do not look outside of ROI
-};
-
-//! @} core_array
-
-//! @addtogroup core_utils
-//! @{
-
-/*! @brief Signals an error and raises the exception.
-
-By default the function prints information about the error to stderr,
-then it either stops if setBreakOnError() had been called before or raises the exception.
-It is possible to alternate error processing by using redirectError().
-@param _code - error code (Error::Code)
-@param _err - error description
-@param _func - function name. Available only when the compiler supports getting it
-@param _file - source file name where the error has occurred
-@param _line - line number in the source file where the error has occurred
-@see CV_Error, CV_Error_, CV_Assert, CV_DbgAssert
- */
-CV_EXPORTS CV_NORETURN void error(int _code, const String& _err, const char* _func, const char* _file, int _line);
-
-#ifdef CV_STATIC_ANALYSIS
-
-// In practice, some macro are not processed correctly (noreturn is not detected).
-// We need to use simplified definition for them.
-#define CV_Error(code, msg) do { (void)(code); (void)(msg); abort(); } while (0)
-#define CV_Error_(code, args) do { (void)(code); (void)(cv::format args); abort(); } while (0)
-#define CV_Assert( expr ) do { if (!(expr)) abort(); } while (0)
-
-#else // CV_STATIC_ANALYSIS
-
-/** @brief Call the error handler.
-
-Currently, the error handler prints the error code and the error message to the standard
-error stream `stderr`. In the Debug configuration, it then provokes memory access violation, so that
-the execution stack and all the parameters can be analyzed by the debugger. In the Release
-configuration, the exception is thrown.
-
-@param code one of Error::Code
-@param msg error message
-*/
-#define CV_Error( code, msg ) cv::error( code, msg, CV_Func, __FILE__, __LINE__ )
-
-/**  @brief Call the error handler.
-
-This macro can be used to construct an error message on-fly to include some dynamic information,
-for example:
-@code
-    // note the extra parentheses around the formatted text message
-    CV_Error_(Error::StsOutOfRange,
-    ("the value at (%d, %d)=%g is out of range", badPt.x, badPt.y, badValue));
-@endcode
-@param code one of Error::Code
-@param args printf-like formatted error message in parentheses
-*/
-#define CV_Error_( code, args ) cv::error( code, cv::format args, CV_Func, __FILE__, __LINE__ )
-
-/** @brief Checks a condition at runtime and throws exception if it fails
-
-The macros CV_Assert (and CV_DbgAssert(expr)) evaluate the specified expression. If it is 0, the macros
-raise an error (see cv::error). The macro CV_Assert checks the condition in both Debug and Release
-configurations while CV_DbgAssert is only retained in the Debug configuration.
-*/
-#define CV_Assert( expr ) do { if(!!(expr)) ; else cv::error( cv::Error::StsAssert, #expr, CV_Func, __FILE__, __LINE__ ); } while(0)
-
-#endif // CV_STATIC_ANALYSIS
-
-//! @cond IGNORED
-#if !defined(__OPENCV_BUILD)  // TODO: backward compatibility only
-#ifndef CV_ErrorNoReturn
-#define CV_ErrorNoReturn CV_Error
-#endif
-#ifndef CV_ErrorNoReturn_
-#define CV_ErrorNoReturn_ CV_Error_
-#endif
-#endif
-
-#define CV_Assert_1 CV_Assert
-#define CV_Assert_2( expr, ... ) CV_Assert_1(expr); __CV_EXPAND(CV_Assert_1( __VA_ARGS__ ))
-#define CV_Assert_3( expr, ... ) CV_Assert_1(expr); __CV_EXPAND(CV_Assert_2( __VA_ARGS__ ))
-#define CV_Assert_4( expr, ... ) CV_Assert_1(expr); __CV_EXPAND(CV_Assert_3( __VA_ARGS__ ))
-#define CV_Assert_5( expr, ... ) CV_Assert_1(expr); __CV_EXPAND(CV_Assert_4( __VA_ARGS__ ))
-#define CV_Assert_6( expr, ... ) CV_Assert_1(expr); __CV_EXPAND(CV_Assert_5( __VA_ARGS__ ))
-#define CV_Assert_7( expr, ... ) CV_Assert_1(expr); __CV_EXPAND(CV_Assert_6( __VA_ARGS__ ))
-#define CV_Assert_8( expr, ... ) CV_Assert_1(expr); __CV_EXPAND(CV_Assert_7( __VA_ARGS__ ))
-#define CV_Assert_9( expr, ... ) CV_Assert_1(expr); __CV_EXPAND(CV_Assert_8( __VA_ARGS__ ))
-#define CV_Assert_10( expr, ... ) CV_Assert_1(expr); __CV_EXPAND(CV_Assert_9( __VA_ARGS__ ))
-
-#define CV_Assert_N(...) do { __CV_EXPAND(__CV_CAT(CV_Assert_, __CV_VA_NUM_ARGS(__VA_ARGS__)) (__VA_ARGS__)); } while(0)
-
-//! @endcond
-
-#if defined _DEBUG || defined CV_STATIC_ANALYSIS
-#  define CV_DbgAssert(expr) CV_Assert(expr)
-#else
-/** replaced with CV_Assert(expr) in Debug configuration */
-#  define CV_DbgAssert(expr)
-#endif
-
-/*
- * Hamming distance functor - counts the bit differences between two strings - useful for the Brief descriptor
- * bit count of A exclusive XOR'ed with B
- */
-struct CV_EXPORTS Hamming
-{
-    static const NormTypes normType = NORM_HAMMING;
-    typedef unsigned char ValueType;
-    typedef int ResultType;
-
-    /** this will count the bits in a ^ b
-     */
-    ResultType operator()( const unsigned char* a, const unsigned char* b, int size ) const;
-};
-
-typedef Hamming HammingLUT;
-
-/////////////////////////////////// inline norms ////////////////////////////////////
-
-template<typename _Tp> inline _Tp cv_abs(_Tp x) { return std::abs(x); }
-inline int cv_abs(uchar x) { return x; }
-inline int cv_abs(schar x) { return std::abs(x); }
-inline int cv_abs(ushort x) { return x; }
-inline int cv_abs(short x) { return std::abs(x); }
-
-template<typename _Tp, typename _AccTp> static inline
-_AccTp normL2Sqr(const _Tp* a, int n)
-{
-    _AccTp s = 0;
-    int i=0;
-#if CV_ENABLE_UNROLLED
-    for( ; i <= n - 4; i += 4 )
-    {
-        _AccTp v0 = a[i], v1 = a[i+1], v2 = a[i+2], v3 = a[i+3];
-        s += v0*v0 + v1*v1 + v2*v2 + v3*v3;
-    }
-#endif
-    for( ; i < n; i++ )
-    {
-        _AccTp v = a[i];
-        s += v*v;
-    }
-    return s;
-}
-
-template<typename _Tp, typename _AccTp> static inline
-_AccTp normL1(const _Tp* a, int n)
-{
-    _AccTp s = 0;
-    int i = 0;
-#if CV_ENABLE_UNROLLED
-    for(; i <= n - 4; i += 4 )
-    {
-        s += (_AccTp)cv_abs(a[i]) + (_AccTp)cv_abs(a[i+1]) +
-            (_AccTp)cv_abs(a[i+2]) + (_AccTp)cv_abs(a[i+3]);
-    }
-#endif
-    for( ; i < n; i++ )
-        s += cv_abs(a[i]);
-    return s;
-}
-
-template<typename _Tp, typename _AccTp> static inline
-_AccTp normInf(const _Tp* a, int n)
-{
-    _AccTp s = 0;
-    for( int i = 0; i < n; i++ )
-        s = std::max(s, (_AccTp)cv_abs(a[i]));
-    return s;
-}
-
-template<typename _Tp, typename _AccTp> static inline
-_AccTp normL2Sqr(const _Tp* a, const _Tp* b, int n)
-{
-    _AccTp s = 0;
-    int i= 0;
-#if CV_ENABLE_UNROLLED
-    for(; i <= n - 4; i += 4 )
-    {
-        _AccTp v0 = _AccTp(a[i] - b[i]), v1 = _AccTp(a[i+1] - b[i+1]), v2 = _AccTp(a[i+2] - b[i+2]), v3 = _AccTp(a[i+3] - b[i+3]);
-        s += v0*v0 + v1*v1 + v2*v2 + v3*v3;
-    }
-#endif
-    for( ; i < n; i++ )
-    {
-        _AccTp v = _AccTp(a[i] - b[i]);
-        s += v*v;
-    }
-    return s;
-}
-
-static inline float normL2Sqr(const float* a, const float* b, int n)
-{
-    float s = 0.f;
-    for( int i = 0; i < n; i++ )
-    {
-        float v = a[i] - b[i];
-        s += v*v;
-    }
-    return s;
-}
-
-template<typename _Tp, typename _AccTp> static inline
-_AccTp normL1(const _Tp* a, const _Tp* b, int n)
-{
-    _AccTp s = 0;
-    int i= 0;
-#if CV_ENABLE_UNROLLED
-    for(; i <= n - 4; i += 4 )
-    {
-        _AccTp v0 = _AccTp(a[i] - b[i]), v1 = _AccTp(a[i+1] - b[i+1]), v2 = _AccTp(a[i+2] - b[i+2]), v3 = _AccTp(a[i+3] - b[i+3]);
-        s += std::abs(v0) + std::abs(v1) + std::abs(v2) + std::abs(v3);
-    }
-#endif
-    for( ; i < n; i++ )
-    {
-        _AccTp v = _AccTp(a[i] - b[i]);
-        s += std::abs(v);
-    }
-    return s;
-}
-
-inline float normL1(const float* a, const float* b, int n)
-{
-    float s = 0.f;
-    for( int i = 0; i < n; i++ )
-    {
-        s += std::abs(a[i] - b[i]);
-    }
-    return s;
-}
-
-inline int normL1(const uchar* a, const uchar* b, int n)
-{
-    int s = 0;
-    for( int i = 0; i < n; i++ )
-    {
-        s += std::abs(a[i] - b[i]);
-    }
-    return s;
-}
-
-template<typename _Tp, typename _AccTp> static inline
-_AccTp normInf(const _Tp* a, const _Tp* b, int n)
-{
-    _AccTp s = 0;
-    for( int i = 0; i < n; i++ )
-    {
-        _AccTp v0 = a[i] - b[i];
-        s = std::max(s, std::abs(v0));
-    }
-    return s;
-}
-
-/** @brief Computes the cube root of an argument.
-
- The function cubeRoot computes \f$\sqrt[3]{\texttt{val}}\f$. Negative arguments are handled correctly.
- NaN and Inf are not handled. The accuracy approaches the maximum possible accuracy for
- single-precision data.
- @param val A function argument.
- */
-CV_EXPORTS_W float cubeRoot(float val);
-
-/** @overload
-
-cubeRoot with argument of `double` type calls `std::cbrt(double)`
-*/
-static inline
-double cubeRoot(double val)
-{
-    return std::cbrt(val);
-}
-
-/** @brief Calculates the angle of a 2D vector in degrees.
-
- The function fastAtan2 calculates the full-range angle of an input 2D vector. The angle is measured
- in degrees and varies from 0 to 360 degrees. The accuracy is about 0.3 degrees.
- @param x x-coordinate of the vector.
- @param y y-coordinate of the vector.
- */
-CV_EXPORTS_W float fastAtan2(float y, float x);
-
-/** proxy for hal::LU */
-CV_EXPORTS int LU(float* A, size_t astep, int m, float* b, size_t bstep, int n);
-/** proxy for hal::LU */
-CV_EXPORTS int LU(double* A, size_t astep, int m, double* b, size_t bstep, int n);
-/** proxy for hal::Cholesky */
-CV_EXPORTS bool Cholesky(float* A, size_t astep, int m, float* b, size_t bstep, int n);
-/** proxy for hal::Cholesky */
-CV_EXPORTS bool Cholesky(double* A, size_t astep, int m, double* b, size_t bstep, int n);
-
-////////////////// forward declarations for important OpenCV types //////////////////
-
-//! @cond IGNORED
-
-template<typename _Tp, int cn> class Vec;
-template<typename _Tp, int m, int n> class Matx;
-
-template<typename _Tp> class Complex;
-template<typename _Tp> class Point_;
-template<typename _Tp> class Point3_;
-template<typename _Tp> class Size_;
-template<typename _Tp> class Rect_;
-template<typename _Tp> class Scalar_;
-
-class CV_EXPORTS RotatedRect;
-class CV_EXPORTS Range;
-class CV_EXPORTS TermCriteria;
-class CV_EXPORTS KeyPoint;
-class CV_EXPORTS DMatch;
-class CV_EXPORTS RNG;
-
-class CV_EXPORTS Mat;
-class CV_EXPORTS MatExpr;
-
-class CV_EXPORTS UMat;
-
-class CV_EXPORTS SparseMat;
-typedef Mat MatND;
-
-template<typename _Tp> class Mat_;
-template<typename _Tp> class SparseMat_;
-
-class CV_EXPORTS MatConstIterator;
-class CV_EXPORTS SparseMatIterator;
-class CV_EXPORTS SparseMatConstIterator;
-template<typename _Tp> class MatIterator_;
-template<typename _Tp> class MatConstIterator_;
-template<typename _Tp> class SparseMatIterator_;
-template<typename _Tp> class SparseMatConstIterator_;
-
-namespace ogl
-{
-    class CV_EXPORTS Buffer;
-    class CV_EXPORTS Texture2D;
-    class CV_EXPORTS Arrays;
-}
-
-namespace cuda
-{
-    class CV_EXPORTS GpuMat;
-    class CV_EXPORTS HostMem;
-    class CV_EXPORTS Stream;
-    class CV_EXPORTS Event;
-}
-
-namespace cudev
-{
-    template <typename _Tp> class GpuMat_;
-}
-
-namespace ipp
-{
-CV_EXPORTS   unsigned long long getIppFeatures();
-CV_EXPORTS   void setIppStatus(int status, const char * const funcname = NULL, const char * const filename = NULL,
-                             int line = 0);
-CV_EXPORTS   int getIppStatus();
-CV_EXPORTS   String getIppErrorLocation();
-CV_EXPORTS_W bool   useIPP();
-CV_EXPORTS_W void   setUseIPP(bool flag);
-CV_EXPORTS_W String getIppVersion();
-
-// IPP Not-Exact mode. This function may force use of IPP then both IPP and OpenCV provide proper results
-// but have internal accuracy differences which have too much direct or indirect impact on accuracy tests.
-CV_EXPORTS_W bool useIPP_NotExact();
-CV_EXPORTS_W void setUseIPP_NotExact(bool flag);
-#ifndef DISABLE_OPENCV_3_COMPATIBILITY
-static inline bool useIPP_NE() { return useIPP_NotExact(); }
-static inline void setUseIPP_NE(bool flag) { setUseIPP_NotExact(flag); }
-#endif
-
-} // ipp
-
-//! @endcond
-
-//! @} core_utils
-
-
-
-
-} // cv
-
-#include "opencv2/core/neon_utils.hpp"
-#include "opencv2/core/vsx_utils.hpp"
-#include "opencv2/core/check.hpp"
-
-#endif //OPENCV_CORE_BASE_HPP
diff --git a/3rdParty/opencv2/core/cuda.hpp b/3rdParty/opencv2/core/cuda.hpp
deleted file mode 100644
index f1119db17b..0000000000
--- a/3rdParty/opencv2/core/cuda.hpp
+++ /dev/null
@@ -1,1271 +0,0 @@
-/*M///////////////////////////////////////////////////////////////////////////////////////
-//
-//  IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
-//
-//  By downloading, copying, installing or using the software you agree to this license.
-//  If you do not agree to this license, do not download, install,
-//  copy or use the software.
-//
-//
-//                          License Agreement
-//                For Open Source Computer Vision Library
-//
-// Copyright (C) 2000-2008, Intel Corporation, all rights reserved.
-// Copyright (C) 2009, Willow Garage Inc., all rights reserved.
-// Copyright (C) 2013, OpenCV Foundation, all rights reserved.
-// Third party copyrights are property of their respective owners.
-//
-// Redistribution and use in source and binary forms, with or without modification,
-// are permitted provided that the following conditions are met:
-//
-//   * Redistribution's of source code must retain the above copyright notice,
-//     this list of conditions and the following disclaimer.
-//
-//   * Redistribution's in binary form must reproduce the above copyright notice,
-//     this list of conditions and the following disclaimer in the documentation
-//     and/or other materials provided with the distribution.
-//
-//   * The name of the copyright holders may not be used to endorse or promote products
-//     derived from this software without specific prior written permission.
-//
-// This software is provided by the copyright holders and contributors "as is" and
-// any express or implied warranties, including, but not limited to, the implied
-// warranties of merchantability and fitness for a particular purpose are disclaimed.
-// In no event shall the Intel Corporation or contributors be liable for any direct,
-// indirect, incidental, special, exemplary, or consequential damages
-// (including, but not limited to, procurement of substitute goods or services;
-// loss of use, data, or profits; or business interruption) however caused
-// and on any theory of liability, whether in contract, strict liability,
-// or tort (including negligence or otherwise) arising in any way out of
-// the use of this software, even if advised of the possibility of such damage.
-//
-//M*/
-
-#ifndef OPENCV_CORE_CUDA_HPP
-#define OPENCV_CORE_CUDA_HPP
-
-#ifndef __cplusplus
-#  error cuda.hpp header must be compiled as C++
-#endif
-
-#include "opencv2/core.hpp"
-#include "opencv2/core/cuda_types.hpp"
-
-/**
-  @defgroup cuda CUDA-accelerated Computer Vision
-  @{
-    @defgroup cudacore Core part
-    @{
-      @defgroup cudacore_init Initialization and Information
-      @defgroup cudacore_struct Data Structures
-    @}
-  @}
- */
-
-namespace cv { namespace cuda {
-
-//! @addtogroup cudacore_struct
-//! @{
-
-//===================================================================================
-// GpuMat
-//===================================================================================
-
-/** @brief Base storage class for GPU memory with reference counting.
-
-Its interface matches the Mat interface with the following limitations:
-
--   no arbitrary dimensions support (only 2D)
--   no functions that return references to their data (because references on GPU are not valid for
-    CPU)
--   no expression templates technique support
-
-Beware that the latter limitation may lead to overloaded matrix operators that cause memory
-allocations. The GpuMat class is convertible to cuda::PtrStepSz and cuda::PtrStep so it can be
-passed directly to the kernel.
-
-@note In contrast with Mat, in most cases GpuMat::isContinuous() == false . This means that rows are
-aligned to a size depending on the hardware. Single-row GpuMat is always a continuous matrix.
-
-@note You are not recommended to leave static or global GpuMat variables allocated, that is, to rely
-on its destructor. The destruction order of such variables and CUDA context is undefined. GPU memory
-release function returns error if the CUDA context has been destroyed before.
-
-Some member functions are described as a "Blocking Call" while some are described as a
-"Non-Blocking Call". Blocking functions are synchronous to host. It is guaranteed that the GPU
-operation is finished when the function returns. However, non-blocking functions are asynchronous to
-host. Those functions may return even if the GPU operation is not finished.
-
-Compared to their blocking counterpart, non-blocking functions accept Stream as an additional
-argument. If a non-default stream is passed, the GPU operation may overlap with operations in other
-streams.
-
-@sa Mat
- */
-class CV_EXPORTS_W GpuMat
-{
-public:
-    class CV_EXPORTS_W Allocator
-    {
-    public:
-        virtual ~Allocator() {}
-
-        // allocator must fill data, step and refcount fields
-        virtual bool allocate(GpuMat* mat, int rows, int cols, size_t elemSize) = 0;
-        virtual void free(GpuMat* mat) = 0;
-    };
-
-    //! default allocator
-    CV_WRAP static GpuMat::Allocator* defaultAllocator();
-    CV_WRAP static void setDefaultAllocator(GpuMat::Allocator* allocator);
-
-    //! default constructor
-    CV_WRAP explicit GpuMat(GpuMat::Allocator* allocator = GpuMat::defaultAllocator());
-
-    //! constructs GpuMat of the specified size and type
-    CV_WRAP GpuMat(int rows, int cols, int type, GpuMat::Allocator* allocator = GpuMat::defaultAllocator());
-    CV_WRAP GpuMat(Size size, int type, GpuMat::Allocator* allocator = GpuMat::defaultAllocator());
-
-    //! constructs GpuMat and fills it with the specified value _s
-    CV_WRAP GpuMat(int rows, int cols, int type, Scalar s, GpuMat::Allocator* allocator = GpuMat::defaultAllocator());
-    CV_WRAP GpuMat(Size size, int type, Scalar s, GpuMat::Allocator* allocator = GpuMat::defaultAllocator());
-
-    //! copy constructor
-    CV_WRAP GpuMat(const GpuMat& m);
-
-    //! constructor for GpuMat headers pointing to user-allocated data
-    GpuMat(int rows, int cols, int type, void* data, size_t step = Mat::AUTO_STEP);
-    GpuMat(Size size, int type, void* data, size_t step = Mat::AUTO_STEP);
-
-    //! creates a GpuMat header for a part of the bigger matrix
-    CV_WRAP GpuMat(const GpuMat& m, Range rowRange, Range colRange);
-    CV_WRAP GpuMat(const GpuMat& m, Rect roi);
-
-    //! builds GpuMat from host memory (Blocking call)
-    CV_WRAP explicit GpuMat(InputArray arr, GpuMat::Allocator* allocator = GpuMat::defaultAllocator());
-
-    //! destructor - calls release()
-    ~GpuMat();
-
-    //! assignment operators
-    GpuMat& operator =(const GpuMat& m);
-
-    //! allocates new GpuMat data unless the GpuMat already has specified size and type
-    CV_WRAP void create(int rows, int cols, int type);
-    CV_WRAP void create(Size size, int type);
-
-    //! decreases reference counter, deallocate the data when reference counter reaches 0
-    CV_WRAP void release();
-
-    //! swaps with other smart pointer
-    CV_WRAP void swap(GpuMat& mat);
-
-    /** @brief Performs data upload to GpuMat (Blocking call)
-
-    This function copies data from host memory to device memory. As being a blocking call, it is
-    guaranteed that the copy operation is finished when this function returns.
-    */
-    CV_WRAP void upload(InputArray arr);
-
-    /** @brief Performs data upload to GpuMat (Non-Blocking call)
-
-    This function copies data from host memory to device memory. As being a non-blocking call, this
-    function may return even if the copy operation is not finished.
-
-    The copy operation may be overlapped with operations in other non-default streams if \p stream is
-    not the default stream and \p dst is HostMem allocated with HostMem::PAGE_LOCKED option.
-    */
-    CV_WRAP void upload(InputArray arr, Stream& stream);
-
-    /** @brief Performs data download from GpuMat (Blocking call)
-
-    This function copies data from device memory to host memory. As being a blocking call, it is
-    guaranteed that the copy operation is finished when this function returns.
-    */
-    CV_WRAP void download(OutputArray dst) const;
-
-    /** @brief Performs data download from GpuMat (Non-Blocking call)
-
-    This function copies data from device memory to host memory. As being a non-blocking call, this
-    function may return even if the copy operation is not finished.
-
-    The copy operation may be overlapped with operations in other non-default streams if \p stream is
-    not the default stream and \p dst is HostMem allocated with HostMem::PAGE_LOCKED option.
-    */
-    CV_WRAP void download(OutputArray dst, Stream& stream) const;
-
-    //! returns deep copy of the GpuMat, i.e. the data is copied
-    CV_WRAP GpuMat clone() const;
-
-    //! copies the GpuMat content to device memory (Blocking call)
-    CV_WRAP void copyTo(OutputArray dst) const;
-
-    //! copies the GpuMat content to device memory (Non-Blocking call)
-    CV_WRAP void copyTo(OutputArray dst, Stream& stream) const;
-
-    //! copies those GpuMat elements to "m" that are marked with non-zero mask elements (Blocking call)
-    CV_WRAP void copyTo(OutputArray dst, InputArray mask) const;
-
-    //! copies those GpuMat elements to "m" that are marked with non-zero mask elements (Non-Blocking call)
-    CV_WRAP void copyTo(OutputArray dst, InputArray mask, Stream& stream) const;
-
-    //! sets some of the GpuMat elements to s (Blocking call)
-    CV_WRAP GpuMat& setTo(Scalar s);
-
-    //! sets some of the GpuMat elements to s (Non-Blocking call)
-    CV_WRAP GpuMat& setTo(Scalar s, Stream& stream);
-
-    //! sets some of the GpuMat elements to s, according to the mask (Blocking call)
-    CV_WRAP GpuMat& setTo(Scalar s, InputArray mask);
-
-    //! sets some of the GpuMat elements to s, according to the mask (Non-Blocking call)
-    CV_WRAP GpuMat& setTo(Scalar s, InputArray mask, Stream& stream);
-
-    //! converts GpuMat to another datatype (Blocking call)
-    CV_WRAP void convertTo(OutputArray dst, int rtype) const;
-
-    //! converts GpuMat to another datatype (Non-Blocking call)
-    CV_WRAP void convertTo(OutputArray dst, int rtype, Stream& stream) const;
-
-    //! converts GpuMat to another datatype with scaling (Blocking call)
-    CV_WRAP void convertTo(OutputArray dst, int rtype, double alpha, double beta = 0.0) const;
-
-    //! converts GpuMat to another datatype with scaling (Non-Blocking call)
-    CV_WRAP void convertTo(OutputArray dst, int rtype, double alpha, Stream& stream) const;
-
-    //! converts GpuMat to another datatype with scaling (Non-Blocking call)
-    CV_WRAP void convertTo(OutputArray dst, int rtype, double alpha, double beta, Stream& stream) const;
-
-    CV_WRAP void assignTo(GpuMat& m, int type = -1) const;
-
-    //! returns pointer to y-th row
-    uchar* ptr(int y = 0);
-    const uchar* ptr(int y = 0) const;
-
-    //! template version of the above method
-    template<typename _Tp> _Tp* ptr(int y = 0);
-    template<typename _Tp> const _Tp* ptr(int y = 0) const;
-
-    template <typename _Tp> operator PtrStepSz<_Tp>() const;
-    template <typename _Tp> operator PtrStep<_Tp>() const;
-
-    //! returns a new GpuMat header for the specified row
-    CV_WRAP GpuMat row(int y) const;
-
-    //! returns a new GpuMat header for the specified column
-    CV_WRAP GpuMat col(int x) const;
-
-    //! ... for the specified row span
-    CV_WRAP GpuMat rowRange(int startrow, int endrow) const;
-    CV_WRAP GpuMat rowRange(Range r) const;
-
-    //! ... for the specified column span
-    CV_WRAP GpuMat colRange(int startcol, int endcol) const;
-    CV_WRAP GpuMat colRange(Range r) const;
-
-    //! extracts a rectangular sub-GpuMat (this is a generalized form of row, rowRange etc.)
-    GpuMat operator ()(Range rowRange, Range colRange) const;
-    GpuMat operator ()(Rect roi) const;
-
-    //! creates alternative GpuMat header for the same data, with different
-    //! number of channels and/or different number of rows
-    CV_WRAP GpuMat reshape(int cn, int rows = 0) const;
-
-    //! locates GpuMat header within a parent GpuMat
-    CV_WRAP void locateROI(Size& wholeSize, Point& ofs) const;
-
-    //! moves/resizes the current GpuMat ROI inside the parent GpuMat
-    CV_WRAP GpuMat& adjustROI(int dtop, int dbottom, int dleft, int dright);
-
-    //! returns true iff the GpuMat data is continuous
-    //! (i.e. when there are no gaps between successive rows)
-    CV_WRAP bool isContinuous() const;
-
-    //! returns element size in bytes
-    CV_WRAP size_t elemSize() const;
-
-    //! returns the size of element channel in bytes
-    CV_WRAP size_t elemSize1() const;
-
-    //! returns element type
-    CV_WRAP int type() const;
-
-    //! returns element type
-    CV_WRAP int depth() const;
-
-    //! returns number of channels
-    CV_WRAP int channels() const;
-
-    //! returns step/elemSize1()
-    CV_WRAP size_t step1() const;
-
-    //! returns GpuMat size : width == number of columns, height == number of rows
-    CV_WRAP Size size() const;
-
-    //! returns true if GpuMat data is NULL
-    CV_WRAP bool empty() const;
-
-    // returns pointer to cuda memory
-    CV_WRAP void* cudaPtr() const;
-
-    //! internal use method: updates the continuity flag
-    CV_WRAP void updateContinuityFlag();
-
-    /*! includes several bit-fields:
-    - the magic signature
-    - continuity flag
-    - depth
-    - number of channels
-    */
-    int flags;
-
-    //! the number of rows and columns
-    int rows, cols;
-
-    //! a distance between successive rows in bytes; includes the gap if any
-    CV_PROP size_t step;
-
-    //! pointer to the data
-    uchar* data;
-
-    //! pointer to the reference counter;
-    //! when GpuMat points to user-allocated data, the pointer is NULL
-    int* refcount;
-
-    //! helper fields used in locateROI and adjustROI
-    uchar* datastart;
-    const uchar* dataend;
-
-    //! allocator
-    Allocator* allocator;
-};
-
-struct CV_EXPORTS_W GpuData
-{
-    explicit GpuData(size_t _size);
-     ~GpuData();
-
-    GpuData(const GpuData&) = delete;
-    GpuData& operator=(const GpuData&) = delete;
-
-    GpuData(GpuData&&) = delete;
-    GpuData& operator=(GpuData&&) = delete;
-
-    uchar* data;
-    size_t size;
-};
-
-class CV_EXPORTS_W GpuMatND
-{
-public:
-    using SizeArray = std::vector<int>;
-    using StepArray = std::vector<size_t>;
-    using IndexArray = std::vector<int>;
-
-    //! destructor
-    ~GpuMatND();
-
-    //! default constructor
-    GpuMatND();
-
-    /** @overload
-    @param size Array of integers specifying an n-dimensional array shape.
-    @param type Array type. Use CV_8UC1, ..., CV_16FC4 to create 1-4 channel matrices, or
-    CV_8UC(n), ..., CV_64FC(n) to create multi-channel (up to CV_CN_MAX channels) matrices.
-    */
-    GpuMatND(SizeArray size, int type);
-
-    /** @overload
-    @param size Array of integers specifying an n-dimensional array shape.
-    @param type Array type. Use CV_8UC1, ..., CV_16FC4 to create 1-4 channel matrices, or
-    CV_8UC(n), ..., CV_64FC(n) to create multi-channel (up to CV_CN_MAX channels) matrices.
-    @param data Pointer to the user data. Matrix constructors that take data and step parameters do not
-    allocate matrix data. Instead, they just initialize the matrix header that points to the specified
-    data, which means that no data is copied. This operation is very efficient and can be used to
-    process external data using OpenCV functions. The external data is not automatically deallocated, so
-    you should take care of it.
-    @param step Array of _size.size()-1 steps in case of a multi-dimensional array (the last step is always
-    set to the element size). If not specified, the matrix is assumed to be continuous.
-    */
-    GpuMatND(SizeArray size, int type, void* data, StepArray step = StepArray());
-
-    /** @brief Allocates GPU memory.
-    Suppose there is some GPU memory already allocated. In that case, this method may choose to reuse that
-    GPU memory under the specific condition: it must be of the same size and type, not externally allocated,
-    the GPU memory is continuous(i.e., isContinuous() is true), and is not a sub-matrix of another GpuMatND
-    (i.e., isSubmatrix() is false). In other words, this method guarantees that the GPU memory allocated by
-    this method is always continuous and is not a sub-region of another GpuMatND.
-    */
-    void create(SizeArray size, int type);
-
-    void release();
-
-    void swap(GpuMatND& m) noexcept;
-
-    /** @brief Creates a full copy of the array and the underlying data.
-    The method creates a full copy of the array. It mimics the behavior of Mat::clone(), i.e.
-    the original step is not taken into account. So, the array copy is a continuous array
-    occupying total()\*elemSize() bytes.
-    */
-    GpuMatND clone() const;
-
-    /** @overload
-    This overload is non-blocking, so it may return even if the copy operation is not finished.
-    */
-    GpuMatND clone(Stream& stream) const;
-
-    /** @brief Extracts a sub-matrix.
-    The operator makes a new header for the specified sub-array of \*this.
-    The operator is an O(1) operation, that is, no matrix data is copied.
-    @param ranges Array of selected ranges along each dimension.
-    */
-    GpuMatND operator()(const std::vector<Range>& ranges) const;
-
-    /** @brief Creates a GpuMat header for a 2D plane part of an n-dim matrix.
-    @note The returned GpuMat is constructed with the constructor for user-allocated data.
-    That is, It does not perform reference counting.
-    @note This function does not increment this GpuMatND's reference counter.
-    */
-    GpuMat createGpuMatHeader(IndexArray idx, Range rowRange, Range colRange) const;
-
-    /** @overload
-    Creates a GpuMat header if this GpuMatND is effectively 2D.
-    @note The returned GpuMat is constructed with the constructor for user-allocated data.
-    That is, It does not perform reference counting.
-    @note This function does not increment this GpuMatND's reference counter.
-    */
-    GpuMat createGpuMatHeader() const;
-
-    /** @brief Extracts a 2D plane part of an n-dim matrix.
-    It differs from createGpuMatHeader(IndexArray, Range, Range) in that it clones a part of this
-    GpuMatND to the returned GpuMat.
-    @note This operator does not increment this GpuMatND's reference counter;
-    */
-    GpuMat operator()(IndexArray idx, Range rowRange, Range colRange) const;
-
-    /** @brief Extracts a 2D plane part of an n-dim matrix if this GpuMatND is effectively 2D.
-    It differs from createGpuMatHeader() in that it clones a part of this GpuMatND.
-    @note This operator does not increment this GpuMatND's reference counter;
-    */
-    operator GpuMat() const;
-
-    GpuMatND(const GpuMatND&) = default;
-    GpuMatND& operator=(const GpuMatND&) = default;
-
-#if defined(__GNUC__) && __GNUC__ < 5
-    // error: function '...' defaulted on its first declaration with an exception-specification
-    // that differs from the implicit declaration '...'
-
-    GpuMatND(GpuMatND&&) = default;
-    GpuMatND& operator=(GpuMatND&&) = default;
-#else
-    GpuMatND(GpuMatND&&) noexcept = default;
-    GpuMatND& operator=(GpuMatND&&) noexcept = default;
-#endif
-
-    void upload(InputArray src);
-    void upload(InputArray src, Stream& stream);
-    void download(OutputArray dst) const;
-    void download(OutputArray dst, Stream& stream) const;
-
-    //! returns true iff the GpuMatND data is continuous
-    //! (i.e. when there are no gaps between successive rows)
-    bool isContinuous() const;
-
-    //! returns true if the matrix is a sub-matrix of another matrix
-    bool isSubmatrix() const;
-
-    //! returns element size in bytes
-    size_t elemSize() const;
-
-    //! returns the size of element channel in bytes
-    size_t elemSize1() const;
-
-    //! returns true if data is null
-    bool empty() const;
-
-    //! returns true if not empty and points to external(user-allocated) gpu memory
-    bool external() const;
-
-    //! returns pointer to the first byte of the GPU memory
-    uchar* getDevicePtr() const;
-
-    //! returns the total number of array elements
-    size_t total() const;
-
-    //! returns the size of underlying memory in bytes
-    size_t totalMemSize() const;
-
-    //! returns element type
-    int type() const;
-
-private:
-    //! internal use
-    void setFields(SizeArray size, int type, StepArray step = StepArray());
-
-public:
-    /*! includes several bit-fields:
-    - the magic signature
-    - continuity flag
-    - depth
-    - number of channels
-    */
-    int flags;
-
-    //! matrix dimensionality
-    int dims;
-
-    //! shape of this array
-    SizeArray size;
-
-    /*! step values
-    Their semantics is identical to the semantics of step for Mat.
-    */
-    StepArray step;
-
-private:
-    /*! internal use
-    If this GpuMatND holds external memory, this is empty.
-    */
-    std::shared_ptr<GpuData> data_;
-
-    /*! internal use
-    If this GpuMatND manages memory with reference counting, this value is
-    always equal to data_->data. If this GpuMatND holds external memory,
-    data_ is empty and data points to the external memory.
-    */
-    uchar* data;
-
-    /*! internal use
-    If this GpuMatND is a sub-matrix of a larger matrix, this value is the
-    difference of the first byte between the sub-matrix and the whole matrix.
-    */
-    size_t offset;
-};
-
-/** @brief Creates a continuous matrix.
-
-@param rows Row count.
-@param cols Column count.
-@param type Type of the matrix.
-@param arr Destination matrix. This parameter changes only if it has a proper type and area (
-\f$\texttt{rows} \times \texttt{cols}\f$ ).
-
-Matrix is called continuous if its elements are stored continuously, that is, without gaps at the
-end of each row.
- */
-CV_EXPORTS_W void createContinuous(int rows, int cols, int type, OutputArray arr);
-
-/** @brief Ensures that the size of a matrix is big enough and the matrix has a proper type.
-
-@param rows Minimum desired number of rows.
-@param cols Minimum desired number of columns.
-@param type Desired matrix type.
-@param arr Destination matrix.
-
-The function does not reallocate memory if the matrix has proper attributes already.
- */
-CV_EXPORTS_W void ensureSizeIsEnough(int rows, int cols, int type, OutputArray arr);
-
-/** @brief BufferPool for use with CUDA streams
-
-BufferPool utilizes Stream's allocator to create new buffers for GpuMat's. It is
-only useful when enabled with #setBufferPoolUsage.
-
-@code
-    setBufferPoolUsage(true);
-@endcode
-
-@note #setBufferPoolUsage must be called \em before any Stream declaration.
-
-Users may specify custom allocator for Stream and may implement their own stream based
-functions utilizing the same underlying GPU memory management.
-
-If custom allocator is not specified, BufferPool utilizes StackAllocator by
-default. StackAllocator allocates a chunk of GPU device memory beforehand,
-and when GpuMat is declared later on, it is given the pre-allocated memory.
-This kind of strategy reduces the number of calls for memory allocating APIs
-such as cudaMalloc or cudaMallocPitch.
-
-Below is an example that utilizes BufferPool with StackAllocator:
-
-@code
-    #include <opencv2/opencv.hpp>
-
-    using namespace cv;
-    using namespace cv::cuda
-
-    int main()
-    {
-        setBufferPoolUsage(true);                               // Tell OpenCV that we are going to utilize BufferPool
-        setBufferPoolConfig(getDevice(), 1024 * 1024 * 64, 2);  // Allocate 64 MB, 2 stacks (default is 10 MB, 5 stacks)
-
-        Stream stream1, stream2;                                // Each stream uses 1 stack
-        BufferPool pool1(stream1), pool2(stream2);
-
-        GpuMat d_src1 = pool1.getBuffer(4096, 4096, CV_8UC1);   // 16MB
-        GpuMat d_dst1 = pool1.getBuffer(4096, 4096, CV_8UC3);   // 48MB, pool1 is now full
-
-        GpuMat d_src2 = pool2.getBuffer(1024, 1024, CV_8UC1);   // 1MB
-        GpuMat d_dst2 = pool2.getBuffer(1024, 1024, CV_8UC3);   // 3MB
-
-        cvtColor(d_src1, d_dst1, CV_GRAY2BGR, 0, stream1);
-        cvtColor(d_src2, d_dst2, CV_GRAY2BGR, 0, stream2);
-    }
-@endcode
-
-If we allocate another GpuMat on pool1 in the above example, it will be carried out by
-the DefaultAllocator since the stack for pool1 is full.
-
-@code
-    GpuMat d_add1 = pool1.getBuffer(1024, 1024, CV_8UC1);   // Stack for pool1 is full, memory is allocated with DefaultAllocator
-@endcode
-
-If a third stream is declared in the above example, allocating with #getBuffer
-within that stream will also be carried out by the DefaultAllocator because we've run out of
-stacks.
-
-@code
-    Stream stream3;                                         // Only 2 stacks were allocated, we've run out of stacks
-    BufferPool pool3(stream3);
-    GpuMat d_src3 = pool3.getBuffer(1024, 1024, CV_8UC1);   // Memory is allocated with DefaultAllocator
-@endcode
-
-@warning When utilizing StackAllocator, deallocation order is important.
-
-Just like a stack, deallocation must be done in LIFO order. Below is an example of
-erroneous usage that violates LIFO rule. If OpenCV is compiled in Debug mode, this
-sample code will emit CV_Assert error.
-
-@code
-    int main()
-    {
-        setBufferPoolUsage(true);                               // Tell OpenCV that we are going to utilize BufferPool
-        Stream stream;                                          // A default size (10 MB) stack is allocated to this stream
-        BufferPool pool(stream);
-
-        GpuMat mat1 = pool.getBuffer(1024, 1024, CV_8UC1);      // Allocate mat1 (1MB)
-        GpuMat mat2 = pool.getBuffer(1024, 1024, CV_8UC1);      // Allocate mat2 (1MB)
-
-        mat1.release();                                         // erroneous usage : mat2 must be deallocated before mat1
-    }
-@endcode
-
-Since C++ local variables are destroyed in the reverse order of construction,
-the code sample below satisfies the LIFO rule. Local GpuMat's are deallocated
-and the corresponding memory is automatically returned to the pool for later usage.
-
-@code
-    int main()
-    {
-        setBufferPoolUsage(true);                               // Tell OpenCV that we are going to utilize BufferPool
-        setBufferPoolConfig(getDevice(), 1024 * 1024 * 64, 2);  // Allocate 64 MB, 2 stacks (default is 10 MB, 5 stacks)
-
-        Stream stream1, stream2;                                // Each stream uses 1 stack
-        BufferPool pool1(stream1), pool2(stream2);
-
-        for (int i = 0; i < 10; i++)
-        {
-            GpuMat d_src1 = pool1.getBuffer(4096, 4096, CV_8UC1);   // 16MB
-            GpuMat d_dst1 = pool1.getBuffer(4096, 4096, CV_8UC3);   // 48MB, pool1 is now full
-
-            GpuMat d_src2 = pool2.getBuffer(1024, 1024, CV_8UC1);   // 1MB
-            GpuMat d_dst2 = pool2.getBuffer(1024, 1024, CV_8UC3);   // 3MB
-
-            d_src1.setTo(Scalar(i), stream1);
-            d_src2.setTo(Scalar(i), stream2);
-
-            cvtColor(d_src1, d_dst1, CV_GRAY2BGR, 0, stream1);
-            cvtColor(d_src2, d_dst2, CV_GRAY2BGR, 0, stream2);
-                                                                    // The order of destruction of the local variables is:
-                                                                    //   d_dst2 => d_src2 => d_dst1 => d_src1
-                                                                    // LIFO rule is satisfied, this code runs without error
-        }
-    }
-@endcode
- */
-class CV_EXPORTS_W BufferPool
-{
-public:
-
-    //! Gets the BufferPool for the given stream.
-    CV_WRAP explicit BufferPool(Stream& stream);
-
-    //! Allocates a new GpuMat of given size and type.
-    CV_WRAP GpuMat getBuffer(int rows, int cols, int type);
-
-    //! Allocates a new GpuMat of given size and type.
-    CV_WRAP GpuMat getBuffer(Size size, int type) { return getBuffer(size.height, size.width, type); }
-
-    //! Returns the allocator associated with the stream.
-    CV_WRAP Ptr<GpuMat::Allocator> getAllocator() const { return allocator_; }
-
-private:
-    Ptr<GpuMat::Allocator> allocator_;
-};
-
-//! BufferPool management (must be called before Stream creation)
-CV_EXPORTS_W void setBufferPoolUsage(bool on);
-CV_EXPORTS_W void setBufferPoolConfig(int deviceId, size_t stackSize, int stackCount);
-
-//===================================================================================
-// HostMem
-//===================================================================================
-
-/** @brief Class with reference counting wrapping special memory type allocation functions from CUDA.
-
-Its interface is also Mat-like but with additional memory type parameters.
-
--   **PAGE_LOCKED** sets a page locked memory type used commonly for fast and asynchronous
-    uploading/downloading data from/to GPU.
--   **SHARED** specifies a zero copy memory allocation that enables mapping the host memory to GPU
-    address space, if supported.
--   **WRITE_COMBINED** sets the write combined buffer that is not cached by CPU. Such buffers are
-    used to supply GPU with data when GPU only reads it. The advantage is a better CPU cache
-    utilization.
-
-@note Allocation size of such memory types is usually limited. For more details, see *CUDA 2.2
-Pinned Memory APIs* document or *CUDA C Programming Guide*.
- */
-class CV_EXPORTS_W HostMem
-{
-public:
-    enum AllocType { PAGE_LOCKED = 1, SHARED = 2, WRITE_COMBINED = 4 };
-
-    static MatAllocator* getAllocator(HostMem::AllocType alloc_type = HostMem::AllocType::PAGE_LOCKED);
-
-    CV_WRAP explicit HostMem(HostMem::AllocType alloc_type = HostMem::AllocType::PAGE_LOCKED);
-
-    HostMem(const HostMem& m);
-
-    CV_WRAP HostMem(int rows, int cols, int type, HostMem::AllocType alloc_type = HostMem::AllocType::PAGE_LOCKED);
-    CV_WRAP HostMem(Size size, int type, HostMem::AllocType alloc_type = HostMem::AllocType::PAGE_LOCKED);
-
-    //! creates from host memory with coping data
-    CV_WRAP explicit HostMem(InputArray arr, HostMem::AllocType alloc_type = HostMem::AllocType::PAGE_LOCKED);
-
-    ~HostMem();
-
-    HostMem& operator =(const HostMem& m);
-
-    //! swaps with other smart pointer
-    CV_WRAP void swap(HostMem& b);
-
-    //! returns deep copy of the matrix, i.e. the data is copied
-    CV_WRAP HostMem clone() const;
-
-    //! allocates new matrix data unless the matrix already has specified size and type.
-    CV_WRAP void create(int rows, int cols, int type);
-    void create(Size size, int type);
-
-    //! creates alternative HostMem header for the same data, with different
-    //! number of channels and/or different number of rows
-    CV_WRAP HostMem reshape(int cn, int rows = 0) const;
-
-    //! decrements reference counter and released memory if needed.
-    void release();
-
-    //! returns matrix header with disabled reference counting for HostMem data.
-    CV_WRAP Mat createMatHeader() const;
-
-    /** @brief Maps CPU memory to GPU address space and creates the cuda::GpuMat header without reference counting
-    for it.
-
-    This can be done only if memory was allocated with the SHARED flag and if it is supported by the
-    hardware. Laptops often share video and CPU memory, so address spaces can be mapped, which
-    eliminates an extra copy.
-     */
-    GpuMat createGpuMatHeader() const;
-
-    // Please see cv::Mat for descriptions
-    CV_WRAP bool isContinuous() const;
-    CV_WRAP size_t elemSize() const;
-    CV_WRAP size_t elemSize1() const;
-    CV_WRAP int type() const;
-    CV_WRAP int depth() const;
-    CV_WRAP int channels() const;
-    CV_WRAP size_t step1() const;
-    CV_WRAP Size size() const;
-    CV_WRAP bool empty() const;
-
-    // Please see cv::Mat for descriptions
-    int flags;
-    int rows, cols;
-    CV_PROP size_t step;
-
-    uchar* data;
-    int* refcount;
-
-    uchar* datastart;
-    const uchar* dataend;
-
-    AllocType alloc_type;
-};
-
-/** @brief Page-locks the memory of matrix and maps it for the device(s).
-
-@param m Input matrix.
- */
-CV_EXPORTS_W void registerPageLocked(Mat& m);
-
-/** @brief Unmaps the memory of matrix and makes it pageable again.
-
-@param m Input matrix.
- */
-CV_EXPORTS_W void unregisterPageLocked(Mat& m);
-
-//===================================================================================
-// Stream
-//===================================================================================
-
-/** @brief This class encapsulates a queue of asynchronous calls.
-
-@note Currently, you may face problems if an operation is enqueued twice with different data. Some
-functions use the constant GPU memory, and next call may update the memory before the previous one
-has been finished. But calling different operations asynchronously is safe because each operation
-has its own constant buffer. Memory copy/upload/download/set operations to the buffers you hold are
-also safe.
-
-@note The Stream class is not thread-safe. Please use different Stream objects for different CPU threads.
-
-@code
-void thread1()
-{
-    cv::cuda::Stream stream1;
-    cv::cuda::func1(..., stream1);
-}
-
-void thread2()
-{
-    cv::cuda::Stream stream2;
-    cv::cuda::func2(..., stream2);
-}
-@endcode
-
-@note By default all CUDA routines are launched in Stream::Null() object, if the stream is not specified by user.
-In multi-threading environment the stream objects must be passed explicitly (see previous note).
- */
-class CV_EXPORTS_W Stream
-{
-    typedef void (Stream::*bool_type)() const;
-    void this_type_does_not_support_comparisons() const {}
-
-public:
-    typedef void (*StreamCallback)(int status, void* userData);
-
-    //! creates a new asynchronous stream
-    CV_WRAP Stream();
-
-    //! creates a new asynchronous stream with custom allocator
-    CV_WRAP Stream(const Ptr<GpuMat::Allocator>& allocator);
-
-    /** @brief creates a new Stream using the cudaFlags argument to determine the behaviors of the stream
-
-    @note The cudaFlags parameter is passed to the underlying api cudaStreamCreateWithFlags() and
-    supports the same parameter values.
-    @code
-        // creates an OpenCV cuda::Stream that manages an asynchronous, non-blocking,
-        // non-default CUDA stream
-        cv::cuda::Stream cvStream(cudaStreamNonBlocking);
-    @endcode
-     */
-    CV_WRAP Stream(const size_t cudaFlags);
-
-    /** @brief Returns true if the current stream queue is finished. Otherwise, it returns false.
-    */
-    CV_WRAP bool queryIfComplete() const;
-
-    /** @brief Blocks the current CPU thread until all operations in the stream are complete.
-    */
-    CV_WRAP void waitForCompletion();
-
-    /** @brief Makes a compute stream wait on an event.
-    */
-    CV_WRAP void waitEvent(const Event& event);
-
-    /** @brief Adds a callback to be called on the host after all currently enqueued items in the stream have
-    completed.
-
-    @note Callbacks must not make any CUDA API calls. Callbacks must not perform any synchronization
-    that may depend on outstanding device work or other callbacks that are not mandated to run earlier.
-    Callbacks without a mandated order (in independent streams) execute in undefined order and may be
-    serialized.
-     */
-    void enqueueHostCallback(StreamCallback callback, void* userData);
-
-    //! return Stream object for default CUDA stream
-    CV_WRAP static Stream& Null();
-
-    //! returns true if stream object is not default (!= 0)
-    operator bool_type() const;
-
-    //! return Pointer to CUDA stream
-    CV_WRAP void* cudaPtr() const;
-
-    class Impl;
-
-private:
-    Ptr<Impl> impl_;
-    Stream(const Ptr<Impl>& impl);
-
-    friend struct StreamAccessor;
-    friend class BufferPool;
-    friend class DefaultDeviceInitializer;
-};
-
-class CV_EXPORTS_W Event
-{
-public:
-    enum CreateFlags
-    {
-        DEFAULT        = 0x00,  /**< Default event flag */
-        BLOCKING_SYNC  = 0x01,  /**< Event uses blocking synchronization */
-        DISABLE_TIMING = 0x02,  /**< Event will not record timing data */
-        INTERPROCESS   = 0x04   /**< Event is suitable for interprocess use. DisableTiming must be set */
-    };
-
-    CV_WRAP explicit Event(const Event::CreateFlags flags = Event::CreateFlags::DEFAULT);
-
-    //! records an event
-    CV_WRAP void record(Stream& stream = Stream::Null());
-
-    //! queries an event's status
-    CV_WRAP bool queryIfComplete() const;
-
-    //! waits for an event to complete
-    CV_WRAP void waitForCompletion();
-
-    //! computes the elapsed time between events
-    CV_WRAP static float elapsedTime(const Event& start, const Event& end);
-
-    class Impl;
-
-private:
-    Ptr<Impl> impl_;
-    Event(const Ptr<Impl>& impl);
-
-    friend struct EventAccessor;
-};
-CV_ENUM_FLAGS(Event::CreateFlags)
-
-//! @} cudacore_struct
-
-//===================================================================================
-// Initialization & Info
-//===================================================================================
-
-//! @addtogroup cudacore_init
-//! @{
-
-/** @brief Returns the number of installed CUDA-enabled devices.
-
-Use this function before any other CUDA functions calls. If OpenCV is compiled without CUDA support,
-this function returns 0. If the CUDA driver is not installed, or is incompatible, this function
-returns -1.
- */
-CV_EXPORTS_W int getCudaEnabledDeviceCount();
-
-/** @brief Sets a device and initializes it for the current thread.
-
-@param device System index of a CUDA device starting with 0.
-
-If the call of this function is omitted, a default device is initialized at the fist CUDA usage.
- */
-CV_EXPORTS_W void setDevice(int device);
-
-/** @brief Returns the current device index set by cuda::setDevice or initialized by default.
- */
-CV_EXPORTS_W int getDevice();
-
-/** @brief Explicitly destroys and cleans up all resources associated with the current device in the current
-process.
-
-Any subsequent API call to this device will reinitialize the device.
- */
-CV_EXPORTS_W void resetDevice();
-
-/** @brief Enumeration providing CUDA computing features.
- */
-enum FeatureSet
-{
-    FEATURE_SET_COMPUTE_10 = 10,
-    FEATURE_SET_COMPUTE_11 = 11,
-    FEATURE_SET_COMPUTE_12 = 12,
-    FEATURE_SET_COMPUTE_13 = 13,
-    FEATURE_SET_COMPUTE_20 = 20,
-    FEATURE_SET_COMPUTE_21 = 21,
-    FEATURE_SET_COMPUTE_30 = 30,
-    FEATURE_SET_COMPUTE_32 = 32,
-    FEATURE_SET_COMPUTE_35 = 35,
-    FEATURE_SET_COMPUTE_50 = 50,
-
-    GLOBAL_ATOMICS = FEATURE_SET_COMPUTE_11,
-    SHARED_ATOMICS = FEATURE_SET_COMPUTE_12,
-    NATIVE_DOUBLE = FEATURE_SET_COMPUTE_13,
-    WARP_SHUFFLE_FUNCTIONS = FEATURE_SET_COMPUTE_30,
-    DYNAMIC_PARALLELISM = FEATURE_SET_COMPUTE_35
-};
-
-//! checks whether current device supports the given feature
-CV_EXPORTS bool deviceSupports(FeatureSet feature_set);
-
-/** @brief Class providing a set of static methods to check what NVIDIA\* card architecture the CUDA module was
-built for.
-
-According to the CUDA C Programming Guide Version 3.2: "PTX code produced for some specific compute
-capability can always be compiled to binary code of greater or equal compute capability".
- */
-class CV_EXPORTS_W TargetArchs
-{
-public:
-    /** @brief The following method checks whether the module was built with the support of the given feature:
-
-    @param feature_set Features to be checked. See :ocvcuda::FeatureSet.
-     */
-    static bool builtWith(FeatureSet feature_set);
-
-    /** @brief There is a set of methods to check whether the module contains intermediate (PTX) or binary CUDA
-    code for the given architecture(s):
-
-    @param major Major compute capability version.
-    @param minor Minor compute capability version.
-     */
-    CV_WRAP static bool has(int major, int minor);
-    CV_WRAP static bool hasPtx(int major, int minor);
-    CV_WRAP static bool hasBin(int major, int minor);
-
-    CV_WRAP static bool hasEqualOrLessPtx(int major, int minor);
-    CV_WRAP static bool hasEqualOrGreater(int major, int minor);
-    CV_WRAP static bool hasEqualOrGreaterPtx(int major, int minor);
-    CV_WRAP static bool hasEqualOrGreaterBin(int major, int minor);
-};
-
-/** @brief Class providing functionality for querying the specified GPU properties.
- */
-class CV_EXPORTS_W DeviceInfo
-{
-public:
-    //! creates DeviceInfo object for the current GPU
-    CV_WRAP DeviceInfo();
-
-    /** @brief The constructors.
-
-    @param device_id System index of the CUDA device starting with 0.
-
-    Constructs the DeviceInfo object for the specified device. If device_id parameter is missed, it
-    constructs an object for the current device.
-     */
-    CV_WRAP DeviceInfo(int device_id);
-
-    /** @brief Returns system index of the CUDA device starting with 0.
-    */
-    CV_WRAP int deviceID() const;
-
-    //! ASCII string identifying device
-    const char* name() const;
-
-    //! global memory available on device in bytes
-    CV_WRAP size_t totalGlobalMem() const;
-
-    //! shared memory available per block in bytes
-    CV_WRAP size_t sharedMemPerBlock() const;
-
-    //! 32-bit registers available per block
-    CV_WRAP int regsPerBlock() const;
-
-    //! warp size in threads
-    CV_WRAP int warpSize() const;
-
-    //! maximum pitch in bytes allowed by memory copies
-    CV_WRAP size_t memPitch() const;
-
-    //! maximum number of threads per block
-    CV_WRAP int maxThreadsPerBlock() const;
-
-    //! maximum size of each dimension of a block
-    CV_WRAP Vec3i maxThreadsDim() const;
-
-    //! maximum size of each dimension of a grid
-    CV_WRAP Vec3i maxGridSize() const;
-
-    //! clock frequency in kilohertz
-    CV_WRAP int clockRate() const;
-
-    //! constant memory available on device in bytes
-    CV_WRAP size_t totalConstMem() const;
-
-    //! major compute capability
-    CV_WRAP int majorVersion() const;
-
-    //! minor compute capability
-    CV_WRAP int minorVersion() const;
-
-    //! alignment requirement for textures
-    CV_WRAP size_t textureAlignment() const;
-
-    //! pitch alignment requirement for texture references bound to pitched memory
-    CV_WRAP size_t texturePitchAlignment() const;
-
-    //! number of multiprocessors on device
-    CV_WRAP int multiProcessorCount() const;
-
-    //! specified whether there is a run time limit on kernels
-    CV_WRAP bool kernelExecTimeoutEnabled() const;
-
-    //! device is integrated as opposed to discrete
-    CV_WRAP bool integrated() const;
-
-    //! device can map host memory with cudaHostAlloc/cudaHostGetDevicePointer
-    CV_WRAP bool canMapHostMemory() const;
-
-    enum ComputeMode
-    {
-        ComputeModeDefault,         /**< default compute mode (Multiple threads can use cudaSetDevice with this device) */
-        ComputeModeExclusive,       /**< compute-exclusive-thread mode (Only one thread in one process will be able to use cudaSetDevice with this device) */
-        ComputeModeProhibited,      /**< compute-prohibited mode (No threads can use cudaSetDevice with this device) */
-        ComputeModeExclusiveProcess /**< compute-exclusive-process mode (Many threads in one process will be able to use cudaSetDevice with this device) */
-    };
-
-    //! compute mode
-    CV_WRAP DeviceInfo::ComputeMode computeMode() const;
-
-    //! maximum 1D texture size
-    CV_WRAP int maxTexture1D() const;
-
-    //! maximum 1D mipmapped texture size
-    CV_WRAP int maxTexture1DMipmap() const;
-
-    //! maximum size for 1D textures bound to linear memory
-    CV_WRAP int maxTexture1DLinear() const;
-
-    //! maximum 2D texture dimensions
-    CV_WRAP Vec2i maxTexture2D() const;
-
-    //! maximum 2D mipmapped texture dimensions
-    CV_WRAP Vec2i maxTexture2DMipmap() const;
-
-    //! maximum dimensions (width, height, pitch) for 2D textures bound to pitched memory
-    CV_WRAP Vec3i maxTexture2DLinear() const;
-
-    //! maximum 2D texture dimensions if texture gather operations have to be performed
-    CV_WRAP Vec2i maxTexture2DGather() const;
-
-    //! maximum 3D texture dimensions
-    CV_WRAP Vec3i maxTexture3D() const;
-
-    //! maximum Cubemap texture dimensions
-    CV_WRAP int maxTextureCubemap() const;
-
-    //! maximum 1D layered texture dimensions
-    CV_WRAP Vec2i maxTexture1DLayered() const;
-
-    //! maximum 2D layered texture dimensions
-    CV_WRAP Vec3i maxTexture2DLayered() const;
-
-    //! maximum Cubemap layered texture dimensions
-    CV_WRAP Vec2i maxTextureCubemapLayered() const;
-
-    //! maximum 1D surface size
-    CV_WRAP int maxSurface1D() const;
-
-    //! maximum 2D surface dimensions
-    CV_WRAP Vec2i maxSurface2D() const;
-
-    //! maximum 3D surface dimensions
-    CV_WRAP Vec3i maxSurface3D() const;
-
-    //! maximum 1D layered surface dimensions
-    CV_WRAP Vec2i maxSurface1DLayered() const;
-
-    //! maximum 2D layered surface dimensions
-    CV_WRAP Vec3i maxSurface2DLayered() const;
-
-    //! maximum Cubemap surface dimensions
-    CV_WRAP int maxSurfaceCubemap() const;
-
-    //! maximum Cubemap layered surface dimensions
-    CV_WRAP Vec2i maxSurfaceCubemapLayered() const;
-
-    //! alignment requirements for surfaces
-    CV_WRAP size_t surfaceAlignment() const;
-
-    //! device can possibly execute multiple kernels concurrently
-    CV_WRAP bool concurrentKernels() const;
-
-    //! device has ECC support enabled
-    CV_WRAP bool ECCEnabled() const;
-
-    //! PCI bus ID of the device
-    CV_WRAP int pciBusID() const;
-
-    //! PCI device ID of the device
-    CV_WRAP int pciDeviceID() const;
-
-    //! PCI domain ID of the device
-    CV_WRAP int pciDomainID() const;
-
-    //! true if device is a Tesla device using TCC driver, false otherwise
-    CV_WRAP bool tccDriver() const;
-
-    //! number of asynchronous engines
-    CV_WRAP int asyncEngineCount() const;
-
-    //! device shares a unified address space with the host
-    CV_WRAP bool unifiedAddressing() const;
-
-    //! peak memory clock frequency in kilohertz
-    CV_WRAP int memoryClockRate() const;
-
-    //! global memory bus width in bits
-    CV_WRAP int memoryBusWidth() const;
-
-    //! size of L2 cache in bytes
-    CV_WRAP int l2CacheSize() const;
-
-    //! maximum resident threads per multiprocessor
-    CV_WRAP int maxThreadsPerMultiProcessor() const;
-
-    //! gets free and total device memory
-    CV_WRAP void queryMemory(size_t& totalMemory, size_t& freeMemory) const;
-    CV_WRAP size_t freeMemory() const;
-    CV_WRAP size_t totalMemory() const;
-
-    /** @brief Provides information on CUDA feature support.
-
-    @param feature_set Features to be checked. See cuda::FeatureSet.
-
-    This function returns true if the device has the specified CUDA feature. Otherwise, it returns false
-     */
-    bool supports(FeatureSet feature_set) const;
-
-    /** @brief Checks the CUDA module and device compatibility.
-
-    This function returns true if the CUDA module can be run on the specified device. Otherwise, it
-    returns false .
-     */
-    CV_WRAP bool isCompatible() const;
-
-private:
-    int device_id_;
-};
-
-CV_EXPORTS_W void printCudaDeviceInfo(int device);
-CV_EXPORTS_W void printShortCudaDeviceInfo(int device);
-
-/** @brief Converts an array to half precision floating number.
-
-@param _src input array.
-@param _dst output array.
-@param stream Stream for the asynchronous version.
-@sa convertFp16
-*/
-CV_EXPORTS void convertFp16(InputArray _src, OutputArray _dst, Stream& stream = Stream::Null());
-
-//! @} cudacore_init
-
-}} // namespace cv { namespace cuda {
-
-
-#include "opencv2/core/cuda.inl.hpp"
-
-#endif /* OPENCV_CORE_CUDA_HPP */
diff --git a/3rdParty/opencv2/core/cuda/detail/reduce.hpp b/3rdParty/opencv2/core/cuda/detail/reduce.hpp
deleted file mode 100644
index 1bcb81ee76..0000000000
--- a/3rdParty/opencv2/core/cuda/detail/reduce.hpp
+++ /dev/null
@@ -1,365 +0,0 @@
-/*M///////////////////////////////////////////////////////////////////////////////////////
-//
-//  IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
-//
-//  By downloading, copying, installing or using the software you agree to this license.
-//  If you do not agree to this license, do not download, install,
-//  copy or use the software.
-//
-//
-//                           License Agreement
-//                For Open Source Computer Vision Library
-//
-// Copyright (C) 2000-2008, Intel Corporation, all rights reserved.
-// Copyright (C) 2009, Willow Garage Inc., all rights reserved.
-// Third party copyrights are property of their respective owners.
-//
-// Redistribution and use in source and binary forms, with or without modification,
-// are permitted provided that the following conditions are met:
-//
-//   * Redistribution's of source code must retain the above copyright notice,
-//     this list of conditions and the following disclaimer.
-//
-//   * Redistribution's in binary form must reproduce the above copyright notice,
-//     this list of conditions and the following disclaimer in the documentation
-//     and/or other materials provided with the distribution.
-//
-//   * The name of the copyright holders may not be used to endorse or promote products
-//     derived from this software without specific prior written permission.
-//
-// This software is provided by the copyright holders and contributors "as is" and
-// any express or implied warranties, including, but not limited to, the implied
-// warranties of merchantability and fitness for a particular purpose are disclaimed.
-// In no event shall the Intel Corporation or contributors be liable for any direct,
-// indirect, incidental, special, exemplary, or consequential damages
-// (including, but not limited to, procurement of substitute goods or services;
-// loss of use, data, or profits; or business interruption) however caused
-// and on any theory of liability, whether in contract, strict liability,
-// or tort (including negligence or otherwise) arising in any way out of
-// the use of this software, even if advised of the possibility of such damage.
-//
-//M*/
-
-#ifndef OPENCV_CUDA_REDUCE_DETAIL_HPP
-#define OPENCV_CUDA_REDUCE_DETAIL_HPP
-
-#include <thrust/tuple.h>
-#include "../warp.hpp"
-#include "../warp_shuffle.hpp"
-
-//! @cond IGNORED
-
-namespace cv { namespace cuda { namespace device
-{
-    namespace reduce_detail
-    {
-        template <typename T> struct GetType;
-        template <typename T> struct GetType<T*>
-        {
-            typedef T type;
-        };
-        template <typename T> struct GetType<volatile T*>
-        {
-            typedef T type;
-        };
-        template <typename T> struct GetType<T&>
-        {
-            typedef T type;
-        };
-
-        template <unsigned int I, unsigned int N>
-        struct For
-        {
-            template <class PointerTuple, class ValTuple>
-            static __device__ void loadToSmem(const PointerTuple& smem, const ValTuple& val, unsigned int tid)
-            {
-                thrust::get<I>(smem)[tid] = thrust::get<I>(val);
-
-                For<I + 1, N>::loadToSmem(smem, val, tid);
-            }
-            template <class PointerTuple, class ValTuple>
-            static __device__ void loadFromSmem(const PointerTuple& smem, const ValTuple& val, unsigned int tid)
-            {
-                thrust::get<I>(val) = thrust::get<I>(smem)[tid];
-
-                For<I + 1, N>::loadFromSmem(smem, val, tid);
-            }
-
-            template <class PointerTuple, class ValTuple, class OpTuple>
-            static __device__ void merge(const PointerTuple& smem, const ValTuple& val, unsigned int tid, unsigned int delta, const OpTuple& op)
-            {
-                typename GetType<typename thrust::tuple_element<I, PointerTuple>::type>::type reg = thrust::get<I>(smem)[tid + delta];
-                thrust::get<I>(smem)[tid] = thrust::get<I>(val) = thrust::get<I>(op)(thrust::get<I>(val), reg);
-
-                For<I + 1, N>::merge(smem, val, tid, delta, op);
-            }
-            template <class ValTuple, class OpTuple>
-            static __device__ void mergeShfl(const ValTuple& val, unsigned int delta, unsigned int width, const OpTuple& op)
-            {
-                typename GetType<typename thrust::tuple_element<I, ValTuple>::type>::type reg = shfl_down(thrust::get<I>(val), delta, width);
-                thrust::get<I>(val) = thrust::get<I>(op)(thrust::get<I>(val), reg);
-
-                For<I + 1, N>::mergeShfl(val, delta, width, op);
-            }
-        };
-        template <unsigned int N>
-        struct For<N, N>
-        {
-            template <class PointerTuple, class ValTuple>
-            static __device__ void loadToSmem(const PointerTuple&, const ValTuple&, unsigned int)
-            {
-            }
-            template <class PointerTuple, class ValTuple>
-            static __device__ void loadFromSmem(const PointerTuple&, const ValTuple&, unsigned int)
-            {
-            }
-
-            template <class PointerTuple, class ValTuple, class OpTuple>
-            static __device__ void merge(const PointerTuple&, const ValTuple&, unsigned int, unsigned int, const OpTuple&)
-            {
-            }
-            template <class ValTuple, class OpTuple>
-            static __device__ void mergeShfl(const ValTuple&, unsigned int, unsigned int, const OpTuple&)
-            {
-            }
-        };
-
-        template <typename T>
-        __device__ __forceinline__ void loadToSmem(volatile T* smem, T& val, unsigned int tid)
-        {
-            smem[tid] = val;
-        }
-        template <typename T>
-        __device__ __forceinline__ void loadFromSmem(volatile T* smem, T& val, unsigned int tid)
-        {
-            val = smem[tid];
-        }
-        template <typename P0, typename P1, typename P2, typename P3, typename P4, typename P5, typename P6, typename P7, typename P8, typename P9,
-                  typename R0, typename R1, typename R2, typename R3, typename R4, typename R5, typename R6, typename R7, typename R8, typename R9>
-        __device__ __forceinline__ void loadToSmem(const thrust::tuple<P0, P1, P2, P3, P4, P5, P6, P7, P8, P9>& smem,
-                                                       const thrust::tuple<R0, R1, R2, R3, R4, R5, R6, R7, R8, R9>& val,
-                                                       unsigned int tid)
-        {
-            For<0, thrust::tuple_size<thrust::tuple<P0, P1, P2, P3, P4, P5, P6, P7, P8, P9> >::value>::loadToSmem(smem, val, tid);
-        }
-        template <typename P0, typename P1, typename P2, typename P3, typename P4, typename P5, typename P6, typename P7, typename P8, typename P9,
-                  typename R0, typename R1, typename R2, typename R3, typename R4, typename R5, typename R6, typename R7, typename R8, typename R9>
-        __device__ __forceinline__ void loadFromSmem(const thrust::tuple<P0, P1, P2, P3, P4, P5, P6, P7, P8, P9>& smem,
-                                                         const thrust::tuple<R0, R1, R2, R3, R4, R5, R6, R7, R8, R9>& val,
-                                                         unsigned int tid)
-        {
-            For<0, thrust::tuple_size<thrust::tuple<P0, P1, P2, P3, P4, P5, P6, P7, P8, P9> >::value>::loadFromSmem(smem, val, tid);
-        }
-
-        template <typename T, class Op>
-        __device__ __forceinline__ void merge(volatile T* smem, T& val, unsigned int tid, unsigned int delta, const Op& op)
-        {
-            T reg = smem[tid + delta];
-            smem[tid] = val = op(val, reg);
-        }
-        template <typename T, class Op>
-        __device__ __forceinline__ void mergeShfl(T& val, unsigned int delta, unsigned int width, const Op& op)
-        {
-            T reg = shfl_down(val, delta, width);
-            val = op(val, reg);
-        }
-        template <typename P0, typename P1, typename P2, typename P3, typename P4, typename P5, typename P6, typename P7, typename P8, typename P9,
-                  typename R0, typename R1, typename R2, typename R3, typename R4, typename R5, typename R6, typename R7, typename R8, typename R9,
-                  class Op0, class Op1, class Op2, class Op3, class Op4, class Op5, class Op6, class Op7, class Op8, class Op9>
-        __device__ __forceinline__ void merge(const thrust::tuple<P0, P1, P2, P3, P4, P5, P6, P7, P8, P9>& smem,
-                                              const thrust::tuple<R0, R1, R2, R3, R4, R5, R6, R7, R8, R9>& val,
-                                              unsigned int tid,
-                                              unsigned int delta,
-                                              const thrust::tuple<Op0, Op1, Op2, Op3, Op4, Op5, Op6, Op7, Op8, Op9>& op)
-        {
-            For<0, thrust::tuple_size<thrust::tuple<P0, P1, P2, P3, P4, P5, P6, P7, P8, P9> >::value>::merge(smem, val, tid, delta, op);
-        }
-        template <typename R0, typename R1, typename R2, typename R3, typename R4, typename R5, typename R6, typename R7, typename R8, typename R9,
-                  class Op0, class Op1, class Op2, class Op3, class Op4, class Op5, class Op6, class Op7, class Op8, class Op9>
-        __device__ __forceinline__ void mergeShfl(const thrust::tuple<R0, R1, R2, R3, R4, R5, R6, R7, R8, R9>& val,
-                                                  unsigned int delta,
-                                                  unsigned int width,
-                                                  const thrust::tuple<Op0, Op1, Op2, Op3, Op4, Op5, Op6, Op7, Op8, Op9>& op)
-        {
-            For<0, thrust::tuple_size<thrust::tuple<R0, R1, R2, R3, R4, R5, R6, R7, R8, R9> >::value>::mergeShfl(val, delta, width, op);
-        }
-
-        template <unsigned int N> struct Generic
-        {
-            template <typename Pointer, typename Reference, class Op>
-            static __device__ void reduce(Pointer smem, Reference val, unsigned int tid, Op op)
-            {
-                loadToSmem(smem, val, tid);
-                if (N >= 32)
-                    __syncthreads();
-
-                if (N >= 2048)
-                {
-                    if (tid < 1024)
-                        merge(smem, val, tid, 1024, op);
-
-                    __syncthreads();
-                }
-                if (N >= 1024)
-                {
-                    if (tid < 512)
-                        merge(smem, val, tid, 512, op);
-
-                    __syncthreads();
-                }
-                if (N >= 512)
-                {
-                    if (tid < 256)
-                        merge(smem, val, tid, 256, op);
-
-                    __syncthreads();
-                }
-                if (N >= 256)
-                {
-                    if (tid < 128)
-                        merge(smem, val, tid, 128, op);
-
-                    __syncthreads();
-                }
-                if (N >= 128)
-                {
-                    if (tid < 64)
-                        merge(smem, val, tid, 64, op);
-
-                    __syncthreads();
-                }
-                if (N >= 64)
-                {
-                    if (tid < 32)
-                        merge(smem, val, tid, 32, op);
-                }
-
-                if (tid < 16)
-                {
-                    merge(smem, val, tid, 16, op);
-                    merge(smem, val, tid, 8, op);
-                    merge(smem, val, tid, 4, op);
-                    merge(smem, val, tid, 2, op);
-                    merge(smem, val, tid, 1, op);
-                }
-            }
-        };
-
-        template <unsigned int I, typename Pointer, typename Reference, class Op>
-        struct Unroll
-        {
-            static __device__ void loopShfl(Reference val, Op op, unsigned int N)
-            {
-                mergeShfl(val, I, N, op);
-                Unroll<I / 2, Pointer, Reference, Op>::loopShfl(val, op, N);
-            }
-            static __device__ void loop(Pointer smem, Reference val, unsigned int tid, Op op)
-            {
-                merge(smem, val, tid, I, op);
-                Unroll<I / 2, Pointer, Reference, Op>::loop(smem, val, tid, op);
-            }
-        };
-        template <typename Pointer, typename Reference, class Op>
-        struct Unroll<0, Pointer, Reference, Op>
-        {
-            static __device__ void loopShfl(Reference, Op, unsigned int)
-            {
-            }
-            static __device__ void loop(Pointer, Reference, unsigned int, Op)
-            {
-            }
-        };
-
-        template <unsigned int N> struct WarpOptimized
-        {
-            template <typename Pointer, typename Reference, class Op>
-            static __device__ void reduce(Pointer smem, Reference val, unsigned int tid, Op op)
-            {
-            #if defined __CUDA_ARCH__ && __CUDA_ARCH__ >= 300
-                CV_UNUSED(smem);
-                CV_UNUSED(tid);
-
-                Unroll<N / 2, Pointer, Reference, Op>::loopShfl(val, op, N);
-            #else
-                loadToSmem(smem, val, tid);
-
-                if (tid < N / 2)
-                    Unroll<N / 2, Pointer, Reference, Op>::loop(smem, val, tid, op);
-            #endif
-            }
-        };
-
-        template <unsigned int N> struct GenericOptimized32
-        {
-            enum { M = N / 32 };
-
-            template <typename Pointer, typename Reference, class Op>
-            static __device__ void reduce(Pointer smem, Reference val, unsigned int tid, Op op)
-            {
-                const unsigned int laneId = Warp::laneId();
-
-            #if defined __CUDA_ARCH__ && __CUDA_ARCH__ >= 300
-                Unroll<16, Pointer, Reference, Op>::loopShfl(val, op, warpSize);
-
-                if (laneId == 0)
-                    loadToSmem(smem, val, tid / 32);
-            #else
-                loadToSmem(smem, val, tid);
-
-                if (laneId < 16)
-                    Unroll<16, Pointer, Reference, Op>::loop(smem, val, tid, op);
-
-                __syncthreads();
-
-                if (laneId == 0)
-                    loadToSmem(smem, val, tid / 32);
-            #endif
-
-                __syncthreads();
-
-                loadFromSmem(smem, val, tid);
-
-                if (tid < 32)
-                {
-                #if defined __CUDA_ARCH__ && __CUDA_ARCH__ >= 300
-                    Unroll<M / 2, Pointer, Reference, Op>::loopShfl(val, op, M);
-                #else
-                    Unroll<M / 2, Pointer, Reference, Op>::loop(smem, val, tid, op);
-                #endif
-                }
-            }
-        };
-
-        template <bool val, class T1, class T2> struct StaticIf;
-        template <class T1, class T2> struct StaticIf<true, T1, T2>
-        {
-            typedef T1 type;
-        };
-        template <class T1, class T2> struct StaticIf<false, T1, T2>
-        {
-            typedef T2 type;
-        };
-
-        template <unsigned int N> struct IsPowerOf2
-        {
-            enum { value = ((N != 0) && !(N & (N - 1))) };
-        };
-
-        template <unsigned int N> struct Dispatcher
-        {
-            typedef typename StaticIf<
-                (N <= 32) && IsPowerOf2<N>::value,
-                WarpOptimized<N>,
-                typename StaticIf<
-                    (N <= 1024) && IsPowerOf2<N>::value,
-                    GenericOptimized32<N>,
-                    Generic<N>
-                >::type
-            >::type reductor;
-        };
-    }
-}}}
-
-//! @endcond
-
-#endif // OPENCV_CUDA_REDUCE_DETAIL_HPP
diff --git a/3rdParty/opencv2/core/cuda/reduce.hpp b/3rdParty/opencv2/core/cuda/reduce.hpp
deleted file mode 100644
index f164ef5bdd..0000000000
--- a/3rdParty/opencv2/core/cuda/reduce.hpp
+++ /dev/null
@@ -1,209 +0,0 @@
-/*M///////////////////////////////////////////////////////////////////////////////////////
-//
-//  IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
-//
-//  By downloading, copying, installing or using the software you agree to this license.
-//  If you do not agree to this license, do not download, install,
-//  copy or use the software.
-//
-//
-//                           License Agreement
-//                For Open Source Computer Vision Library
-//
-// Copyright (C) 2000-2008, Intel Corporation, all rights reserved.
-// Copyright (C) 2009, Willow Garage Inc., all rights reserved.
-// Third party copyrights are property of their respective owners.
-//
-// Redistribution and use in source and binary forms, with or without modification,
-// are permitted provided that the following conditions are met:
-//
-//   * Redistribution's of source code must retain the above copyright notice,
-//     this list of conditions and the following disclaimer.
-//
-//   * Redistribution's in binary form must reproduce the above copyright notice,
-//     this list of conditions and the following disclaimer in the documentation
-//     and/or other materials provided with the distribution.
-//
-//   * The name of the copyright holders may not be used to endorse or promote products
-//     derived from this software without specific prior written permission.
-//
-// This software is provided by the copyright holders and contributors "as is" and
-// any express or implied warranties, including, but not limited to, the implied
-// warranties of merchantability and fitness for a particular purpose are disclaimed.
-// In no event shall the Intel Corporation or contributors be liable for any direct,
-// indirect, incidental, special, exemplary, or consequential damages
-// (including, but not limited to, procurement of substitute goods or services;
-// loss of use, data, or profits; or business interruption) however caused
-// and on any theory of liability, whether in contract, strict liability,
-// or tort (including negligence or otherwise) arising in any way out of
-// the use of this software, even if advised of the possibility of such damage.
-//
-//M*/
-
-#ifndef OPENCV_CUDA_REDUCE_HPP
-#define OPENCV_CUDA_REDUCE_HPP
-
-#ifndef THRUST_DEBUG // eliminate -Wundef warning
-#define THRUST_DEBUG 0
-#endif
-
-#include <thrust/tuple.h>
-#include "detail/reduce.hpp"
-#include "detail/reduce_key_val.hpp"
-
-/** @file
- * @deprecated Use @ref cudev instead.
- */
-
-//! @cond IGNORED
-
-namespace cv { namespace cuda { namespace device
-{
-    template <int N, typename T, class Op>
-    __device__ __forceinline__ void reduce(volatile T* smem, T& val, unsigned int tid, const Op& op)
-    {
-        reduce_detail::Dispatcher<N>::reductor::template reduce<volatile T*, T&, const Op&>(smem, val, tid, op);
-    }
-    template <int N,
-              typename P0, typename P1, typename P2, typename P3, typename P4, typename P5, typename P6, typename P7, typename P8, typename P9,
-              typename R0, typename R1, typename R2, typename R3, typename R4, typename R5, typename R6, typename R7, typename R8, typename R9,
-              class Op0, class Op1, class Op2, class Op3, class Op4, class Op5, class Op6, class Op7, class Op8, class Op9>
-    __device__ __forceinline__ void reduce(const thrust::tuple<P0, P1, P2, P3, P4, P5, P6, P7, P8, P9>& smem,
-                                           const thrust::tuple<R0, R1, R2, R3, R4, R5, R6, R7, R8, R9>& val,
-                                           unsigned int tid,
-                                           const thrust::tuple<Op0, Op1, Op2, Op3, Op4, Op5, Op6, Op7, Op8, Op9>& op)
-    {
-        reduce_detail::Dispatcher<N>::reductor::template reduce<
-                const thrust::tuple<P0, P1, P2, P3, P4, P5, P6, P7, P8, P9>&,
-                const thrust::tuple<R0, R1, R2, R3, R4, R5, R6, R7, R8, R9>&,
-                const thrust::tuple<Op0, Op1, Op2, Op3, Op4, Op5, Op6, Op7, Op8, Op9>&>(smem, val, tid, op);
-    }
-
-    template <unsigned int N, typename K, typename V, class Cmp>
-    __device__ __forceinline__ void reduceKeyVal(volatile K* skeys, K& key, volatile V* svals, V& val, unsigned int tid, const Cmp& cmp)
-    {
-        reduce_key_val_detail::Dispatcher<N>::reductor::template reduce<volatile K*, K&, volatile V*, V&, const Cmp&>(skeys, key, svals, val, tid, cmp);
-    }
-    template <unsigned int N,
-              typename K,
-              typename VP0, typename VP1, typename VP2, typename VP3, typename VP4, typename VP5, typename VP6, typename VP7, typename VP8, typename VP9,
-              typename VR0, typename VR1, typename VR2, typename VR3, typename VR4, typename VR5, typename VR6, typename VR7, typename VR8, typename VR9,
-              class Cmp>
-    __device__ __forceinline__ void reduceKeyVal(volatile K* skeys, K& key,
-                                                 const thrust::tuple<VP0, VP1, VP2, VP3, VP4, VP5, VP6, VP7, VP8, VP9>& svals,
-                                                 const thrust::tuple<VR0, VR1, VR2, VR3, VR4, VR5, VR6, VR7, VR8, VR9>& val,
-                                                 unsigned int tid, const Cmp& cmp)
-    {
-        reduce_key_val_detail::Dispatcher<N>::reductor::template reduce<volatile K*, K&,
-                const thrust::tuple<VP0, VP1, VP2, VP3, VP4, VP5, VP6, VP7, VP8, VP9>&,
-                const thrust::tuple<VR0, VR1, VR2, VR3, VR4, VR5, VR6, VR7, VR8, VR9>&,
-                const Cmp&>(skeys, key, svals, val, tid, cmp);
-    }
-    template <unsigned int N,
-              typename KP0, typename KP1, typename KP2, typename KP3, typename KP4, typename KP5, typename KP6, typename KP7, typename KP8, typename KP9,
-              typename KR0, typename KR1, typename KR2, typename KR3, typename KR4, typename KR5, typename KR6, typename KR7, typename KR8, typename KR9,
-              typename VP0, typename VP1, typename VP2, typename VP3, typename VP4, typename VP5, typename VP6, typename VP7, typename VP8, typename VP9,
-              typename VR0, typename VR1, typename VR2, typename VR3, typename VR4, typename VR5, typename VR6, typename VR7, typename VR8, typename VR9,
-              class Cmp0, class Cmp1, class Cmp2, class Cmp3, class Cmp4, class Cmp5, class Cmp6, class Cmp7, class Cmp8, class Cmp9>
-    __device__ __forceinline__ void reduceKeyVal(const thrust::tuple<KP0, KP1, KP2, KP3, KP4, KP5, KP6, KP7, KP8, KP9>& skeys,
-                                                 const thrust::tuple<KR0, KR1, KR2, KR3, KR4, KR5, KR6, KR7, KR8, KR9>& key,
-                                                 const thrust::tuple<VP0, VP1, VP2, VP3, VP4, VP5, VP6, VP7, VP8, VP9>& svals,
-                                                 const thrust::tuple<VR0, VR1, VR2, VR3, VR4, VR5, VR6, VR7, VR8, VR9>& val,
-                                                 unsigned int tid,
-                                                 const thrust::tuple<Cmp0, Cmp1, Cmp2, Cmp3, Cmp4, Cmp5, Cmp6, Cmp7, Cmp8, Cmp9>& cmp)
-    {
-        reduce_key_val_detail::Dispatcher<N>::reductor::template reduce<
-                const thrust::tuple<KP0, KP1, KP2, KP3, KP4, KP5, KP6, KP7, KP8, KP9>&,
-                const thrust::tuple<KR0, KR1, KR2, KR3, KR4, KR5, KR6, KR7, KR8, KR9>&,
-                const thrust::tuple<VP0, VP1, VP2, VP3, VP4, VP5, VP6, VP7, VP8, VP9>&,
-                const thrust::tuple<VR0, VR1, VR2, VR3, VR4, VR5, VR6, VR7, VR8, VR9>&,
-                const thrust::tuple<Cmp0, Cmp1, Cmp2, Cmp3, Cmp4, Cmp5, Cmp6, Cmp7, Cmp8, Cmp9>&
-                >(skeys, key, svals, val, tid, cmp);
-    }
-
-    // smem_tuple
-
-    template <typename T0>
-    __device__ __forceinline__
-    thrust::tuple<volatile T0*>
-    smem_tuple(T0* t0)
-    {
-        return thrust::make_tuple((volatile T0*) t0);
-    }
-
-    template <typename T0, typename T1>
-    __device__ __forceinline__
-    thrust::tuple<volatile T0*, volatile T1*>
-    smem_tuple(T0* t0, T1* t1)
-    {
-        return thrust::make_tuple((volatile T0*) t0, (volatile T1*) t1);
-    }
-
-    template <typename T0, typename T1, typename T2>
-    __device__ __forceinline__
-    thrust::tuple<volatile T0*, volatile T1*, volatile T2*>
-    smem_tuple(T0* t0, T1* t1, T2* t2)
-    {
-        return thrust::make_tuple((volatile T0*) t0, (volatile T1*) t1, (volatile T2*) t2);
-    }
-
-    template <typename T0, typename T1, typename T2, typename T3>
-    __device__ __forceinline__
-    thrust::tuple<volatile T0*, volatile T1*, volatile T2*, volatile T3*>
-    smem_tuple(T0* t0, T1* t1, T2* t2, T3* t3)
-    {
-        return thrust::make_tuple((volatile T0*) t0, (volatile T1*) t1, (volatile T2*) t2, (volatile T3*) t3);
-    }
-
-    template <typename T0, typename T1, typename T2, typename T3, typename T4>
-    __device__ __forceinline__
-    thrust::tuple<volatile T0*, volatile T1*, volatile T2*, volatile T3*, volatile T4*>
-    smem_tuple(T0* t0, T1* t1, T2* t2, T3* t3, T4* t4)
-    {
-        return thrust::make_tuple((volatile T0*) t0, (volatile T1*) t1, (volatile T2*) t2, (volatile T3*) t3, (volatile T4*) t4);
-    }
-
-    template <typename T0, typename T1, typename T2, typename T3, typename T4, typename T5>
-    __device__ __forceinline__
-    thrust::tuple<volatile T0*, volatile T1*, volatile T2*, volatile T3*, volatile T4*, volatile T5*>
-    smem_tuple(T0* t0, T1* t1, T2* t2, T3* t3, T4* t4, T5* t5)
-    {
-        return thrust::make_tuple((volatile T0*) t0, (volatile T1*) t1, (volatile T2*) t2, (volatile T3*) t3, (volatile T4*) t4, (volatile T5*) t5);
-    }
-
-    template <typename T0, typename T1, typename T2, typename T3, typename T4, typename T5, typename T6>
-    __device__ __forceinline__
-    thrust::tuple<volatile T0*, volatile T1*, volatile T2*, volatile T3*, volatile T4*, volatile T5*, volatile T6*>
-    smem_tuple(T0* t0, T1* t1, T2* t2, T3* t3, T4* t4, T5* t5, T6* t6)
-    {
-        return thrust::make_tuple((volatile T0*) t0, (volatile T1*) t1, (volatile T2*) t2, (volatile T3*) t3, (volatile T4*) t4, (volatile T5*) t5, (volatile T6*) t6);
-    }
-
-    template <typename T0, typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7>
-    __device__ __forceinline__
-    thrust::tuple<volatile T0*, volatile T1*, volatile T2*, volatile T3*, volatile T4*, volatile T5*, volatile T6*, volatile T7*>
-    smem_tuple(T0* t0, T1* t1, T2* t2, T3* t3, T4* t4, T5* t5, T6* t6, T7* t7)
-    {
-        return thrust::make_tuple((volatile T0*) t0, (volatile T1*) t1, (volatile T2*) t2, (volatile T3*) t3, (volatile T4*) t4, (volatile T5*) t5, (volatile T6*) t6, (volatile T7*) t7);
-    }
-
-    template <typename T0, typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8>
-    __device__ __forceinline__
-    thrust::tuple<volatile T0*, volatile T1*, volatile T2*, volatile T3*, volatile T4*, volatile T5*, volatile T6*, volatile T7*, volatile T8*>
-    smem_tuple(T0* t0, T1* t1, T2* t2, T3* t3, T4* t4, T5* t5, T6* t6, T7* t7, T8* t8)
-    {
-        return thrust::make_tuple((volatile T0*) t0, (volatile T1*) t1, (volatile T2*) t2, (volatile T3*) t3, (volatile T4*) t4, (volatile T5*) t5, (volatile T6*) t6, (volatile T7*) t7, (volatile T8*) t8);
-    }
-
-    template <typename T0, typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8, typename T9>
-    __device__ __forceinline__
-    thrust::tuple<volatile T0*, volatile T1*, volatile T2*, volatile T3*, volatile T4*, volatile T5*, volatile T6*, volatile T7*, volatile T8*, volatile T9*>
-    smem_tuple(T0* t0, T1* t1, T2* t2, T3* t3, T4* t4, T5* t5, T6* t6, T7* t7, T8* t8, T9* t9)
-    {
-        return thrust::make_tuple((volatile T0*) t0, (volatile T1*) t1, (volatile T2*) t2, (volatile T3*) t3, (volatile T4*) t4, (volatile T5*) t5, (volatile T6*) t6, (volatile T7*) t7, (volatile T8*) t8, (volatile T9*) t9);
-    }
-}}}
-
-//! @endcond
-
-#endif // OPENCV_CUDA_REDUCE_HPP
diff --git a/3rdParty/opencv2/core/detail/exception_ptr.hpp b/3rdParty/opencv2/core/detail/exception_ptr.hpp
deleted file mode 100644
index d5996bb066..0000000000
--- a/3rdParty/opencv2/core/detail/exception_ptr.hpp
+++ /dev/null
@@ -1,27 +0,0 @@
-// This file is part of OpenCV project.
-// It is subject to the license terms in the LICENSE file found in the top-level directory
-// of this distribution and at http://opencv.org/license.html.
-
-#ifndef OPENCV_CORE_DETAILS_EXCEPTION_PTR_H
-#define OPENCV_CORE_DETAILS_EXCEPTION_PTR_H
-
-#ifndef CV__EXCEPTION_PTR
-#  if defined(__ANDROID__) && defined(ATOMIC_INT_LOCK_FREE) && ATOMIC_INT_LOCK_FREE < 2
-#    define CV__EXCEPTION_PTR 0  // Not supported, details: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58938
-#  elif defined(CV_CXX11)
-#    define CV__EXCEPTION_PTR 1
-#  elif defined(_MSC_VER)
-#    define CV__EXCEPTION_PTR (_MSC_VER >= 1600)
-#  elif defined(__clang__)
-#    define CV__EXCEPTION_PTR 0  // C++11 only (see above)
-#  elif defined(__GNUC__) && defined(__GXX_EXPERIMENTAL_CXX0X__)
-#    define CV__EXCEPTION_PTR (__GXX_EXPERIMENTAL_CXX0X__ > 0)
-#  endif
-#endif
-#ifndef CV__EXCEPTION_PTR
-#  define CV__EXCEPTION_PTR 0
-#elif CV__EXCEPTION_PTR
-#  include <exception>  // std::exception_ptr
-#endif
-
-#endif // OPENCV_CORE_DETAILS_EXCEPTION_PTR_H
diff --git a/3rdParty/opencv2/core/hal/hal.hpp b/3rdParty/opencv2/core/hal/hal.hpp
deleted file mode 100644
index cdc1286891..0000000000
--- a/3rdParty/opencv2/core/hal/hal.hpp
+++ /dev/null
@@ -1,256 +0,0 @@
-/*M///////////////////////////////////////////////////////////////////////////////////////
-//
-//  IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
-//
-//  By downloading, copying, installing or using the software you agree to this license.
-//  If you do not agree to this license, do not download, install,
-//  copy or use the software.
-//
-//
-//                          License Agreement
-//                For Open Source Computer Vision Library
-//
-// Copyright (C) 2000-2008, Intel Corporation, all rights reserved.
-// Copyright (C) 2009, Willow Garage Inc., all rights reserved.
-// Copyright (C) 2013, OpenCV Foundation, all rights reserved.
-// Copyright (C) 2015, Itseez Inc., all rights reserved.
-// Third party copyrights are property of their respective owners.
-//
-// Redistribution and use in source and binary forms, with or without modification,
-// are permitted provided that the following conditions are met:
-//
-//   * Redistribution's of source code must retain the above copyright notice,
-//     this list of conditions and the following disclaimer.
-//
-//   * Redistribution's in binary form must reproduce the above copyright notice,
-//     this list of conditions and the following disclaimer in the documentation
-//     and/or other materials provided with the distribution.
-//
-//   * The name of the copyright holders may not be used to endorse or promote products
-//     derived from this software without specific prior written permission.
-//
-// This software is provided by the copyright holders and contributors "as is" and
-// any express or implied warranties, including, but not limited to, the implied
-// warranties of merchantability and fitness for a particular purpose are disclaimed.
-// In no event shall the Intel Corporation or contributors be liable for any direct,
-// indirect, incidental, special, exemplary, or consequential damages
-// (including, but not limited to, procurement of substitute goods or services;
-// loss of use, data, or profits; or business interruption) however caused
-// and on any theory of liability, whether in contract, strict liability,
-// or tort (including negligence or otherwise) arising in any way out of
-// the use of this software, even if advised of the possibility of such damage.
-//
-//M*/
-
-#ifndef OPENCV_HAL_HPP
-#define OPENCV_HAL_HPP
-
-#include "opencv2/core/cvdef.h"
-#include "opencv2/core/cvstd.hpp"
-#include "opencv2/core/hal/interface.h"
-
-namespace cv { namespace hal {
-
-//! @addtogroup core_hal_functions
-//! @{
-
-CV_EXPORTS int normHamming(const uchar* a, int n);
-CV_EXPORTS int normHamming(const uchar* a, const uchar* b, int n);
-
-CV_EXPORTS int normHamming(const uchar* a, int n, int cellSize);
-CV_EXPORTS int normHamming(const uchar* a, const uchar* b, int n, int cellSize);
-
-CV_EXPORTS int LU32f(float* A, size_t astep, int m, float* b, size_t bstep, int n);
-CV_EXPORTS int LU64f(double* A, size_t astep, int m, double* b, size_t bstep, int n);
-CV_EXPORTS bool Cholesky32f(float* A, size_t astep, int m, float* b, size_t bstep, int n);
-CV_EXPORTS bool Cholesky64f(double* A, size_t astep, int m, double* b, size_t bstep, int n);
-CV_EXPORTS void SVD32f(float* At, size_t astep, float* W, float* U, size_t ustep, float* Vt, size_t vstep, int m, int n, int flags);
-CV_EXPORTS void SVD64f(double* At, size_t astep, double* W, double* U, size_t ustep, double* Vt, size_t vstep, int m, int n, int flags);
-CV_EXPORTS int QR32f(float* A, size_t astep, int m, int n, int k, float* b, size_t bstep, float* hFactors);
-CV_EXPORTS int QR64f(double* A, size_t astep, int m, int n, int k, double* b, size_t bstep, double* hFactors);
-
-CV_EXPORTS void gemm32f(const float* src1, size_t src1_step, const float* src2, size_t src2_step,
-                        float alpha, const float* src3, size_t src3_step, float beta, float* dst, size_t dst_step,
-                        int m_a, int n_a, int n_d, int flags);
-CV_EXPORTS void gemm64f(const double* src1, size_t src1_step, const double* src2, size_t src2_step,
-                        double alpha, const double* src3, size_t src3_step, double beta, double* dst, size_t dst_step,
-                        int m_a, int n_a, int n_d, int flags);
-CV_EXPORTS void gemm32fc(const float* src1, size_t src1_step, const float* src2, size_t src2_step,
-                        float alpha, const float* src3, size_t src3_step, float beta, float* dst, size_t dst_step,
-                        int m_a, int n_a, int n_d, int flags);
-CV_EXPORTS void gemm64fc(const double* src1, size_t src1_step, const double* src2, size_t src2_step,
-                        double alpha, const double* src3, size_t src3_step, double beta, double* dst, size_t dst_step,
-                        int m_a, int n_a, int n_d, int flags);
-
-CV_EXPORTS int normL1_(const uchar* a, const uchar* b, int n);
-CV_EXPORTS float normL1_(const float* a, const float* b, int n);
-CV_EXPORTS float normL2Sqr_(const float* a, const float* b, int n);
-
-CV_EXPORTS void exp32f(const float* src, float* dst, int n);
-CV_EXPORTS void exp64f(const double* src, double* dst, int n);
-CV_EXPORTS void log32f(const float* src, float* dst, int n);
-CV_EXPORTS void log64f(const double* src, double* dst, int n);
-
-CV_EXPORTS void fastAtan32f(const float* y, const float* x, float* dst, int n, bool angleInDegrees);
-CV_EXPORTS void fastAtan64f(const double* y, const double* x, double* dst, int n, bool angleInDegrees);
-CV_EXPORTS void magnitude32f(const float* x, const float* y, float* dst, int n);
-CV_EXPORTS void magnitude64f(const double* x, const double* y, double* dst, int n);
-CV_EXPORTS void sqrt32f(const float* src, float* dst, int len);
-CV_EXPORTS void sqrt64f(const double* src, double* dst, int len);
-CV_EXPORTS void invSqrt32f(const float* src, float* dst, int len);
-CV_EXPORTS void invSqrt64f(const double* src, double* dst, int len);
-
-CV_EXPORTS void split8u(const uchar* src, uchar** dst, int len, int cn );
-CV_EXPORTS void split16u(const ushort* src, ushort** dst, int len, int cn );
-CV_EXPORTS void split32s(const int* src, int** dst, int len, int cn );
-CV_EXPORTS void split64s(const int64* src, int64** dst, int len, int cn );
-
-CV_EXPORTS void merge8u(const uchar** src, uchar* dst, int len, int cn );
-CV_EXPORTS void merge16u(const ushort** src, ushort* dst, int len, int cn );
-CV_EXPORTS void merge32s(const int** src, int* dst, int len, int cn );
-CV_EXPORTS void merge64s(const int64** src, int64* dst, int len, int cn );
-
-CV_EXPORTS void add8u( const uchar* src1, size_t step1, const uchar* src2, size_t step2, uchar* dst, size_t step, int width, int height, void* );
-CV_EXPORTS void add8s( const schar* src1, size_t step1, const schar* src2, size_t step2, schar* dst, size_t step, int width, int height, void* );
-CV_EXPORTS void add16u( const ushort* src1, size_t step1, const ushort* src2, size_t step2, ushort* dst, size_t step, int width, int height, void* );
-CV_EXPORTS void add16s( const short* src1, size_t step1, const short* src2, size_t step2, short* dst, size_t step, int width, int height, void* );
-CV_EXPORTS void add32s( const int* src1, size_t step1, const int* src2, size_t step2, int* dst, size_t step, int width, int height, void* );
-CV_EXPORTS void add32f( const float* src1, size_t step1, const float* src2, size_t step2, float* dst, size_t step, int width, int height, void* );
-CV_EXPORTS void add64f( const double* src1, size_t step1, const double* src2, size_t step2, double* dst, size_t step, int width, int height, void* );
-
-CV_EXPORTS void sub8u( const uchar* src1, size_t step1, const uchar* src2, size_t step2, uchar* dst, size_t step, int width, int height, void* );
-CV_EXPORTS void sub8s( const schar* src1, size_t step1, const schar* src2, size_t step2, schar* dst, size_t step, int width, int height, void* );
-CV_EXPORTS void sub16u( const ushort* src1, size_t step1, const ushort* src2, size_t step2, ushort* dst, size_t step, int width, int height, void* );
-CV_EXPORTS void sub16s( const short* src1, size_t step1, const short* src2, size_t step2, short* dst, size_t step, int width, int height, void* );
-CV_EXPORTS void sub32s( const int* src1, size_t step1, const int* src2, size_t step2, int* dst, size_t step, int width, int height, void* );
-CV_EXPORTS void sub32f( const float* src1, size_t step1, const float* src2, size_t step2, float* dst, size_t step, int width, int height, void* );
-CV_EXPORTS void sub64f( const double* src1, size_t step1, const double* src2, size_t step2, double* dst, size_t step, int width, int height, void* );
-
-CV_EXPORTS void max8u( const uchar* src1, size_t step1, const uchar* src2, size_t step2, uchar* dst, size_t step, int width, int height, void* );
-CV_EXPORTS void max8s( const schar* src1, size_t step1, const schar* src2, size_t step2, schar* dst, size_t step, int width, int height, void* );
-CV_EXPORTS void max16u( const ushort* src1, size_t step1, const ushort* src2, size_t step2, ushort* dst, size_t step, int width, int height, void* );
-CV_EXPORTS void max16s( const short* src1, size_t step1, const short* src2, size_t step2, short* dst, size_t step, int width, int height, void* );
-CV_EXPORTS void max32s( const int* src1, size_t step1, const int* src2, size_t step2, int* dst, size_t step, int width, int height, void* );
-CV_EXPORTS void max32f( const float* src1, size_t step1, const float* src2, size_t step2, float* dst, size_t step, int width, int height, void* );
-CV_EXPORTS void max64f( const double* src1, size_t step1, const double* src2, size_t step2, double* dst, size_t step, int width, int height, void* );
-
-CV_EXPORTS void min8u( const uchar* src1, size_t step1, const uchar* src2, size_t step2, uchar* dst, size_t step, int width, int height, void* );
-CV_EXPORTS void min8s( const schar* src1, size_t step1, const schar* src2, size_t step2, schar* dst, size_t step, int width, int height, void* );
-CV_EXPORTS void min16u( const ushort* src1, size_t step1, const ushort* src2, size_t step2, ushort* dst, size_t step, int width, int height, void* );
-CV_EXPORTS void min16s( const short* src1, size_t step1, const short* src2, size_t step2, short* dst, size_t step, int width, int height, void* );
-CV_EXPORTS void min32s( const int* src1, size_t step1, const int* src2, size_t step2, int* dst, size_t step, int width, int height, void* );
-CV_EXPORTS void min32f( const float* src1, size_t step1, const float* src2, size_t step2, float* dst, size_t step, int width, int height, void* );
-CV_EXPORTS void min64f( const double* src1, size_t step1, const double* src2, size_t step2, double* dst, size_t step, int width, int height, void* );
-
-CV_EXPORTS void absdiff8u( const uchar* src1, size_t step1, const uchar* src2, size_t step2, uchar* dst, size_t step, int width, int height, void* );
-CV_EXPORTS void absdiff8s( const schar* src1, size_t step1, const schar* src2, size_t step2, schar* dst, size_t step, int width, int height, void* );
-CV_EXPORTS void absdiff16u( const ushort* src1, size_t step1, const ushort* src2, size_t step2, ushort* dst, size_t step, int width, int height, void* );
-CV_EXPORTS void absdiff16s( const short* src1, size_t step1, const short* src2, size_t step2, short* dst, size_t step, int width, int height, void* );
-CV_EXPORTS void absdiff32s( const int* src1, size_t step1, const int* src2, size_t step2, int* dst, size_t step, int width, int height, void* );
-CV_EXPORTS void absdiff32f( const float* src1, size_t step1, const float* src2, size_t step2, float* dst, size_t step, int width, int height, void* );
-CV_EXPORTS void absdiff64f( const double* src1, size_t step1, const double* src2, size_t step2, double* dst, size_t step, int width, int height, void* );
-
-CV_EXPORTS void and8u( const uchar* src1, size_t step1, const uchar* src2, size_t step2, uchar* dst, size_t step, int width, int height, void* );
-CV_EXPORTS void or8u( const uchar* src1, size_t step1, const uchar* src2, size_t step2, uchar* dst, size_t step, int width, int height, void* );
-CV_EXPORTS void xor8u( const uchar* src1, size_t step1, const uchar* src2, size_t step2, uchar* dst, size_t step, int width, int height, void* );
-CV_EXPORTS void not8u( const uchar* src1, size_t step1, const uchar* src2, size_t step2, uchar* dst, size_t step, int width, int height, void* );
-
-CV_EXPORTS void cmp8u(const uchar* src1, size_t step1, const uchar* src2, size_t step2, uchar* dst, size_t step, int width, int height, void* _cmpop);
-CV_EXPORTS void cmp8s(const schar* src1, size_t step1, const schar* src2, size_t step2, uchar* dst, size_t step, int width, int height, void* _cmpop);
-CV_EXPORTS void cmp16u(const ushort* src1, size_t step1, const ushort* src2, size_t step2, uchar* dst, size_t step, int width, int height, void* _cmpop);
-CV_EXPORTS void cmp16s(const short* src1, size_t step1, const short* src2, size_t step2, uchar* dst, size_t step, int width, int height, void* _cmpop);
-CV_EXPORTS void cmp32s(const int* src1, size_t step1, const int* src2, size_t step2, uchar* dst, size_t step, int width, int height, void* _cmpop);
-CV_EXPORTS void cmp32f(const float* src1, size_t step1, const float* src2, size_t step2, uchar* dst, size_t step, int width, int height, void* _cmpop);
-CV_EXPORTS void cmp64f(const double* src1, size_t step1, const double* src2, size_t step2, uchar* dst, size_t step, int width, int height, void* _cmpop);
-
-CV_EXPORTS void mul8u( const uchar* src1, size_t step1, const uchar* src2, size_t step2, uchar* dst, size_t step, int width, int height, void* scale);
-CV_EXPORTS void mul8s( const schar* src1, size_t step1, const schar* src2, size_t step2, schar* dst, size_t step, int width, int height, void* scale);
-CV_EXPORTS void mul16u( const ushort* src1, size_t step1, const ushort* src2, size_t step2, ushort* dst, size_t step, int width, int height, void* scale);
-CV_EXPORTS void mul16s( const short* src1, size_t step1, const short* src2, size_t step2, short* dst, size_t step, int width, int height, void* scale);
-CV_EXPORTS void mul32s( const int* src1, size_t step1, const int* src2, size_t step2, int* dst, size_t step, int width, int height, void* scale);
-CV_EXPORTS void mul32f( const float* src1, size_t step1, const float* src2, size_t step2, float* dst, size_t step, int width, int height, void* scale);
-CV_EXPORTS void mul64f( const double* src1, size_t step1, const double* src2, size_t step2, double* dst, size_t step, int width, int height, void* scale);
-
-CV_EXPORTS void div8u( const uchar* src1, size_t step1, const uchar* src2, size_t step2, uchar* dst, size_t step, int width, int height, void* scale);
-CV_EXPORTS void div8s( const schar* src1, size_t step1, const schar* src2, size_t step2, schar* dst, size_t step, int width, int height, void* scale);
-CV_EXPORTS void div16u( const ushort* src1, size_t step1, const ushort* src2, size_t step2, ushort* dst, size_t step, int width, int height, void* scale);
-CV_EXPORTS void div16s( const short* src1, size_t step1, const short* src2, size_t step2, short* dst, size_t step, int width, int height, void* scale);
-CV_EXPORTS void div32s( const int* src1, size_t step1, const int* src2, size_t step2, int* dst, size_t step, int width, int height, void* scale);
-CV_EXPORTS void div32f( const float* src1, size_t step1, const float* src2, size_t step2, float* dst, size_t step, int width, int height, void* scale);
-CV_EXPORTS void div64f( const double* src1, size_t step1, const double* src2, size_t step2, double* dst, size_t step, int width, int height, void* scale);
-
-CV_EXPORTS void recip8u( const uchar *, size_t, const uchar * src2, size_t step2, uchar* dst, size_t step, int width, int height, void* scale);
-CV_EXPORTS void recip8s( const schar *, size_t, const schar * src2, size_t step2, schar* dst, size_t step, int width, int height, void* scale);
-CV_EXPORTS void recip16u( const ushort *, size_t, const ushort * src2, size_t step2, ushort* dst, size_t step, int width, int height, void* scale);
-CV_EXPORTS void recip16s( const short *, size_t, const short * src2, size_t step2, short* dst, size_t step, int width, int height, void* scale);
-CV_EXPORTS void recip32s( const int *, size_t, const int * src2, size_t step2, int* dst, size_t step, int width, int height, void* scale);
-CV_EXPORTS void recip32f( const float *, size_t, const float * src2, size_t step2, float* dst, size_t step, int width, int height, void* scale);
-CV_EXPORTS void recip64f( const double *, size_t, const double * src2, size_t step2, double* dst, size_t step, int width, int height, void* scale);
-
-CV_EXPORTS void addWeighted8u( const uchar* src1, size_t step1, const uchar* src2, size_t step2, uchar* dst, size_t step, int width, int height, void* _scalars );
-CV_EXPORTS void addWeighted8s( const schar* src1, size_t step1, const schar* src2, size_t step2, schar* dst, size_t step, int width, int height, void* scalars );
-CV_EXPORTS void addWeighted16u( const ushort* src1, size_t step1, const ushort* src2, size_t step2, ushort* dst, size_t step, int width, int height, void* scalars );
-CV_EXPORTS void addWeighted16s( const short* src1, size_t step1, const short* src2, size_t step2, short* dst, size_t step, int width, int height, void* scalars );
-CV_EXPORTS void addWeighted32s( const int* src1, size_t step1, const int* src2, size_t step2, int* dst, size_t step, int width, int height, void* scalars );
-CV_EXPORTS void addWeighted32f( const float* src1, size_t step1, const float* src2, size_t step2, float* dst, size_t step, int width, int height, void* scalars );
-CV_EXPORTS void addWeighted64f( const double* src1, size_t step1, const double* src2, size_t step2, double* dst, size_t step, int width, int height, void* scalars );
-
-CV_EXPORTS void cvt16f32f( const float16_t* src, float* dst, int len );
-CV_EXPORTS void cvt32f16f( const float* src, float16_t* dst, int len );
-
-CV_EXPORTS void addRNGBias32f( float* arr, const float* scaleBiasPairs, int len );
-CV_EXPORTS void addRNGBias64f( double* arr, const double* scaleBiasPairs, int len );
-
-struct CV_EXPORTS DFT1D
-{
-    static Ptr<DFT1D> create(int len, int count, int depth, int flags, bool * useBuffer = 0);
-    virtual void apply(const uchar *src, uchar *dst) = 0;
-    virtual ~DFT1D() {}
-};
-
-struct CV_EXPORTS DFT2D
-{
-    static Ptr<DFT2D> create(int width, int height, int depth,
-                             int src_channels, int dst_channels,
-                             int flags, int nonzero_rows = 0);
-    virtual void apply(const uchar *src_data, size_t src_step, uchar *dst_data, size_t dst_step) = 0;
-    virtual ~DFT2D() {}
-};
-
-struct CV_EXPORTS DCT2D
-{
-    static Ptr<DCT2D> create(int width, int height, int depth, int flags);
-    virtual void apply(const uchar *src_data, size_t src_step, uchar *dst_data, size_t dst_step) = 0;
-    virtual ~DCT2D() {}
-};
-
-//! @} core_hal
-
-//=============================================================================
-// for binary compatibility with 3.0
-
-//! @cond IGNORED
-
-CV_EXPORTS int LU(float* A, size_t astep, int m, float* b, size_t bstep, int n);
-CV_EXPORTS int LU(double* A, size_t astep, int m, double* b, size_t bstep, int n);
-CV_EXPORTS bool Cholesky(float* A, size_t astep, int m, float* b, size_t bstep, int n);
-CV_EXPORTS bool Cholesky(double* A, size_t astep, int m, double* b, size_t bstep, int n);
-
-CV_EXPORTS void exp(const float* src, float* dst, int n);
-CV_EXPORTS void exp(const double* src, double* dst, int n);
-CV_EXPORTS void log(const float* src, float* dst, int n);
-CV_EXPORTS void log(const double* src, double* dst, int n);
-
-CV_EXPORTS void fastAtan2(const float* y, const float* x, float* dst, int n, bool angleInDegrees);
-CV_EXPORTS void magnitude(const float* x, const float* y, float* dst, int n);
-CV_EXPORTS void magnitude(const double* x, const double* y, double* dst, int n);
-CV_EXPORTS void sqrt(const float* src, float* dst, int len);
-CV_EXPORTS void sqrt(const double* src, double* dst, int len);
-CV_EXPORTS void invSqrt(const float* src, float* dst, int len);
-CV_EXPORTS void invSqrt(const double* src, double* dst, int len);
-
-//! @endcond
-
-}} //cv::hal
-
-#endif //OPENCV_HAL_HPP
diff --git a/3rdParty/opencv2/core/hal/intrin.hpp b/3rdParty/opencv2/core/hal/intrin.hpp
deleted file mode 100644
index 52563f44f6..0000000000
--- a/3rdParty/opencv2/core/hal/intrin.hpp
+++ /dev/null
@@ -1,706 +0,0 @@
-/*M///////////////////////////////////////////////////////////////////////////////////////
-//
-//  IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
-//
-//  By downloading, copying, installing or using the software you agree to this license.
-//  If you do not agree to this license, do not download, install,
-//  copy or use the software.
-//
-//
-//                          License Agreement
-//                For Open Source Computer Vision Library
-//
-// Copyright (C) 2000-2008, Intel Corporation, all rights reserved.
-// Copyright (C) 2009, Willow Garage Inc., all rights reserved.
-// Copyright (C) 2013, OpenCV Foundation, all rights reserved.
-// Copyright (C) 2015, Itseez Inc., all rights reserved.
-// Third party copyrights are property of their respective owners.
-//
-// Redistribution and use in source and binary forms, with or without modification,
-// are permitted provided that the following conditions are met:
-//
-//   * Redistribution's of source code must retain the above copyright notice,
-//     this list of conditions and the following disclaimer.
-//
-//   * Redistribution's in binary form must reproduce the above copyright notice,
-//     this list of conditions and the following disclaimer in the documentation
-//     and/or other materials provided with the distribution.
-//
-//   * The name of the copyright holders may not be used to endorse or promote products
-//     derived from this software without specific prior written permission.
-//
-// This software is provided by the copyright holders and contributors "as is" and
-// any express or implied warranties, including, but not limited to, the implied
-// warranties of merchantability and fitness for a particular purpose are disclaimed.
-// In no event shall the Intel Corporation or contributors be liable for any direct,
-// indirect, incidental, special, exemplary, or consequential damages
-// (including, but not limited to, procurement of substitute goods or services;
-// loss of use, data, or profits; or business interruption) however caused
-// and on any theory of liability, whether in contract, strict liability,
-// or tort (including negligence or otherwise) arising in any way out of
-// the use of this software, even if advised of the possibility of such damage.
-//
-//M*/
-
-#ifndef OPENCV_HAL_INTRIN_HPP
-#define OPENCV_HAL_INTRIN_HPP
-
-#include <cmath>
-#include <float.h>
-#include <stdlib.h>
-#include "opencv2/core/cvdef.h"
-
-#define OPENCV_HAL_ADD(a, b) ((a) + (b))
-#define OPENCV_HAL_AND(a, b) ((a) & (b))
-#define OPENCV_HAL_NOP(a) (a)
-#define OPENCV_HAL_1ST(a, b) (a)
-
-namespace {
-inline unsigned int trailingZeros32(unsigned int value) {
-#if defined(_MSC_VER)
-#if (_MSC_VER < 1700) || defined(_M_ARM) || defined(_M_ARM64)
-    unsigned long index = 0;
-    _BitScanForward(&index, value);
-    return (unsigned int)index;
-#elif defined(__clang__)
-    // clang-cl doesn't export _tzcnt_u32 for non BMI systems
-    return value ? __builtin_ctz(value) : 32;
-#else
-    return _tzcnt_u32(value);
-#endif
-#elif defined(__GNUC__) || defined(__GNUG__)
-    return __builtin_ctz(value);
-#elif defined(__ICC) || defined(__INTEL_COMPILER)
-    return _bit_scan_forward(value);
-#elif defined(__clang__)
-    return llvm.cttz.i32(value, true);
-#else
-    static const int MultiplyDeBruijnBitPosition[32] = {
-        0, 1, 28, 2, 29, 14, 24, 3, 30, 22, 20, 15, 25, 17, 4, 8,
-        31, 27, 13, 23, 21, 19, 16, 7, 26, 12, 18, 6, 11, 5, 10, 9 };
-    return MultiplyDeBruijnBitPosition[((uint32_t)((value & -value) * 0x077CB531U)) >> 27];
-#endif
-}
-}
-
-// unlike HAL API, which is in cv::hal,
-// we put intrinsics into cv namespace to make its
-// access from within opencv code more accessible
-namespace cv {
-
-namespace hal {
-
-enum StoreMode
-{
-    STORE_UNALIGNED = 0,
-    STORE_ALIGNED = 1,
-    STORE_ALIGNED_NOCACHE = 2
-};
-
-}
-
-// TODO FIXIT: Don't use "God" traits. Split on separate cases.
-template<typename _Tp> struct V_TypeTraits
-{
-};
-
-#define CV_INTRIN_DEF_TYPE_TRAITS(type, int_type_, uint_type_, abs_type_, w_type_, q_type_, sum_type_) \
-    template<> struct V_TypeTraits<type> \
-    { \
-        typedef type value_type; \
-        typedef int_type_ int_type; \
-        typedef abs_type_ abs_type; \
-        typedef uint_type_ uint_type; \
-        typedef w_type_ w_type; \
-        typedef q_type_ q_type; \
-        typedef sum_type_ sum_type; \
-    \
-        static inline int_type reinterpret_int(type x) \
-        { \
-            union { type l; int_type i; } v; \
-            v.l = x; \
-            return v.i; \
-        } \
-    \
-        static inline type reinterpret_from_int(int_type x) \
-        { \
-            union { type l; int_type i; } v; \
-            v.i = x; \
-            return v.l; \
-        } \
-    }
-
-#define CV_INTRIN_DEF_TYPE_TRAITS_NO_Q_TYPE(type, int_type_, uint_type_, abs_type_, w_type_, sum_type_) \
-    template<> struct V_TypeTraits<type> \
-    { \
-        typedef type value_type; \
-        typedef int_type_ int_type; \
-        typedef abs_type_ abs_type; \
-        typedef uint_type_ uint_type; \
-        typedef w_type_ w_type; \
-        typedef sum_type_ sum_type; \
-    \
-        static inline int_type reinterpret_int(type x) \
-        { \
-            union { type l; int_type i; } v; \
-            v.l = x; \
-            return v.i; \
-        } \
-    \
-        static inline type reinterpret_from_int(int_type x) \
-        { \
-            union { type l; int_type i; } v; \
-            v.i = x; \
-            return v.l; \
-        } \
-    }
-
-CV_INTRIN_DEF_TYPE_TRAITS(uchar, schar, uchar, uchar, ushort, unsigned, unsigned);
-CV_INTRIN_DEF_TYPE_TRAITS(schar, schar, uchar, uchar, short, int, int);
-CV_INTRIN_DEF_TYPE_TRAITS(ushort, short, ushort, ushort, unsigned, uint64, unsigned);
-CV_INTRIN_DEF_TYPE_TRAITS(short, short, ushort, ushort, int, int64, int);
-CV_INTRIN_DEF_TYPE_TRAITS_NO_Q_TYPE(unsigned, int, unsigned, unsigned, uint64, unsigned);
-CV_INTRIN_DEF_TYPE_TRAITS_NO_Q_TYPE(int, int, unsigned, unsigned, int64, int);
-CV_INTRIN_DEF_TYPE_TRAITS_NO_Q_TYPE(float, int, unsigned, float, double, float);
-CV_INTRIN_DEF_TYPE_TRAITS_NO_Q_TYPE(uint64, int64, uint64, uint64, void, uint64);
-CV_INTRIN_DEF_TYPE_TRAITS_NO_Q_TYPE(int64, int64, uint64, uint64, void, int64);
-CV_INTRIN_DEF_TYPE_TRAITS_NO_Q_TYPE(double, int64, uint64, double, void, double);
-
-#ifndef CV_DOXYGEN
-
-#ifndef CV_CPU_OPTIMIZATION_HAL_NAMESPACE
-#ifdef CV_FORCE_SIMD128_CPP
-    #define CV_CPU_OPTIMIZATION_HAL_NAMESPACE hal_EMULATOR_CPP
-    #define CV_CPU_OPTIMIZATION_HAL_NAMESPACE_BEGIN namespace hal_EMULATOR_CPP {
-    #define CV_CPU_OPTIMIZATION_HAL_NAMESPACE_END }
-#elif defined(CV_CPU_DISPATCH_MODE)
-    #define CV_CPU_OPTIMIZATION_HAL_NAMESPACE __CV_CAT(hal_, CV_CPU_DISPATCH_MODE)
-    #define CV_CPU_OPTIMIZATION_HAL_NAMESPACE_BEGIN namespace __CV_CAT(hal_, CV_CPU_DISPATCH_MODE) {
-    #define CV_CPU_OPTIMIZATION_HAL_NAMESPACE_END }
-#else
-    #define CV_CPU_OPTIMIZATION_HAL_NAMESPACE hal_baseline
-    #define CV_CPU_OPTIMIZATION_HAL_NAMESPACE_BEGIN namespace hal_baseline {
-    #define CV_CPU_OPTIMIZATION_HAL_NAMESPACE_END }
-#endif
-#endif // CV_CPU_OPTIMIZATION_HAL_NAMESPACE
-
-CV_CPU_OPTIMIZATION_HAL_NAMESPACE_BEGIN
-CV_CPU_OPTIMIZATION_HAL_NAMESPACE_END
-using namespace CV_CPU_OPTIMIZATION_HAL_NAMESPACE;
-#endif
-}
-
-#ifdef CV_DOXYGEN
-#   undef CV_AVX2
-#   undef CV_SSE2
-#   undef CV_NEON
-#   undef CV_VSX
-#   undef CV_FP16
-#   undef CV_MSA
-#   undef CV_RVV
-#endif
-
-#if (CV_SSE2 || CV_NEON || CV_VSX || CV_MSA || CV_WASM_SIMD || CV_RVV071 || CV_RVV) && !defined(CV_FORCE_SIMD128_CPP)
-#define CV__SIMD_FORWARD 128
-#include "opencv2/core/hal/intrin_forward.hpp"
-#endif
-
-#if CV_SSE2 && !defined(CV_FORCE_SIMD128_CPP)
-
-#include "opencv2/core/hal/intrin_sse_em.hpp"
-#include "opencv2/core/hal/intrin_sse.hpp"
-
-#elif CV_NEON && !defined(CV_FORCE_SIMD128_CPP)
-
-#include "opencv2/core/hal/intrin_neon.hpp"
-
-#elif CV_RVV071 && !defined(CV_FORCE_SIMD128_CPP)
-#define CV_SIMD128_CPP 0
-#include "opencv2/core/hal/intrin_rvv071.hpp"
-
-#elif CV_VSX && !defined(CV_FORCE_SIMD128_CPP)
-
-#include "opencv2/core/hal/intrin_vsx.hpp"
-
-#elif CV_MSA && !defined(CV_FORCE_SIMD128_CPP)
-
-#include "opencv2/core/hal/intrin_msa.hpp"
-
-#elif CV_WASM_SIMD && !defined(CV_FORCE_SIMD128_CPP)
-#include "opencv2/core/hal/intrin_wasm.hpp"
-
-#elif CV_RVV && !defined(CV_FORCE_SIMD128_CPP)
-#include "opencv2/core/hal/intrin_rvv.hpp"
-
-#else
-
-#include "opencv2/core/hal/intrin_cpp.hpp"
-
-#endif
-
-// AVX2 can be used together with SSE2, so
-// we define those two sets of intrinsics at once.
-// Most of the intrinsics do not conflict (the proper overloaded variant is
-// resolved by the argument types, e.g. v_float32x4 ~ SSE2, v_float32x8 ~ AVX2),
-// but some of AVX2 intrinsics get v256_ prefix instead of v_, e.g. v256_load() vs v_load().
-// Correspondingly, the wide intrinsics (which are mapped to the "widest"
-// available instruction set) will get vx_ prefix
-// (and will be mapped to v256_ counterparts) (e.g. vx_load() => v256_load())
-#if CV_AVX2
-
-#define CV__SIMD_FORWARD 256
-#include "opencv2/core/hal/intrin_forward.hpp"
-#include "opencv2/core/hal/intrin_avx.hpp"
-
-#endif
-
-// AVX512 can be used together with SSE2 and AVX2, so
-// we define those sets of intrinsics at once.
-// For some of AVX512 intrinsics get v512_ prefix instead of v_, e.g. v512_load() vs v_load().
-// Wide intrinsics will be mapped to v512_ counterparts in this case(e.g. vx_load() => v512_load())
-#if CV_AVX512_SKX
-
-#define CV__SIMD_FORWARD 512
-#include "opencv2/core/hal/intrin_forward.hpp"
-#include "opencv2/core/hal/intrin_avx512.hpp"
-
-#endif
-
-//! @cond IGNORED
-
-namespace cv {
-
-#ifndef CV_DOXYGEN
-CV_CPU_OPTIMIZATION_HAL_NAMESPACE_BEGIN
-#endif
-
-#ifndef CV_SIMD128
-#define CV_SIMD128 0
-#endif
-
-#ifndef CV_SIMD128_CPP
-#define CV_SIMD128_CPP 0
-#endif
-
-#ifndef CV_SIMD128_64F
-#define CV_SIMD128_64F 0
-#endif
-
-#ifndef CV_SIMD256
-#define CV_SIMD256 0
-#endif
-
-#ifndef CV_SIMD256_64F
-#define CV_SIMD256_64F 0
-#endif
-
-#ifndef CV_SIMD512
-#define CV_SIMD512 0
-#endif
-
-#ifndef CV_SIMD512_64F
-#define CV_SIMD512_64F 0
-#endif
-
-#ifndef CV_SIMD128_FP16
-#define CV_SIMD128_FP16 0
-#endif
-
-#ifndef CV_SIMD256_FP16
-#define CV_SIMD256_FP16 0
-#endif
-
-#ifndef CV_SIMD512_FP16
-#define CV_SIMD512_FP16 0
-#endif
-
-//==================================================================================================
-
-template<typename _Tp> struct V_RegTraits
-{
-};
-
-#define CV_DEF_REG_TRAITS(prefix, _reg, lane_type, suffix, _u_reg, _w_reg, _q_reg, _int_reg, _round_reg) \
-    template<> struct V_RegTraits<_reg> \
-    { \
-        typedef _reg reg; \
-        typedef _u_reg u_reg; \
-        typedef _w_reg w_reg; \
-        typedef _q_reg q_reg; \
-        typedef _int_reg int_reg; \
-        typedef _round_reg round_reg; \
-    }
-
-#if CV_SIMD128 || CV_SIMD128_CPP
-    CV_DEF_REG_TRAITS(v, v_uint8x16, uchar, u8, v_uint8x16, v_uint16x8, v_uint32x4, v_int8x16, void);
-    CV_DEF_REG_TRAITS(v, v_int8x16, schar, s8, v_uint8x16, v_int16x8, v_int32x4, v_int8x16, void);
-    CV_DEF_REG_TRAITS(v, v_uint16x8, ushort, u16, v_uint16x8, v_uint32x4, v_uint64x2, v_int16x8, void);
-    CV_DEF_REG_TRAITS(v, v_int16x8, short, s16, v_uint16x8, v_int32x4, v_int64x2, v_int16x8, void);
-    CV_DEF_REG_TRAITS(v, v_uint32x4, unsigned, u32, v_uint32x4, v_uint64x2, void, v_int32x4, void);
-    CV_DEF_REG_TRAITS(v, v_int32x4, int, s32, v_uint32x4, v_int64x2, void, v_int32x4, void);
-#if CV_SIMD128_64F || CV_SIMD128_CPP
-    CV_DEF_REG_TRAITS(v, v_float32x4, float, f32, v_float32x4, v_float64x2, void, v_int32x4, v_int32x4);
-#else
-    CV_DEF_REG_TRAITS(v, v_float32x4, float, f32, v_float32x4, void, void, v_int32x4, v_int32x4);
-#endif
-    CV_DEF_REG_TRAITS(v, v_uint64x2, uint64, u64, v_uint64x2, void, void, v_int64x2, void);
-    CV_DEF_REG_TRAITS(v, v_int64x2, int64, s64, v_uint64x2, void, void, v_int64x2, void);
-#if CV_SIMD128_64F
-    CV_DEF_REG_TRAITS(v, v_float64x2, double, f64, v_float64x2, void, void, v_int64x2, v_int32x4);
-#endif
-#endif
-
-#if CV_SIMD256
-    CV_DEF_REG_TRAITS(v256, v_uint8x32, uchar, u8, v_uint8x32, v_uint16x16, v_uint32x8, v_int8x32, void);
-    CV_DEF_REG_TRAITS(v256, v_int8x32, schar, s8, v_uint8x32, v_int16x16, v_int32x8, v_int8x32, void);
-    CV_DEF_REG_TRAITS(v256, v_uint16x16, ushort, u16, v_uint16x16, v_uint32x8, v_uint64x4, v_int16x16, void);
-    CV_DEF_REG_TRAITS(v256, v_int16x16, short, s16, v_uint16x16, v_int32x8, v_int64x4, v_int16x16, void);
-    CV_DEF_REG_TRAITS(v256, v_uint32x8, unsigned, u32, v_uint32x8, v_uint64x4, void, v_int32x8, void);
-    CV_DEF_REG_TRAITS(v256, v_int32x8, int, s32, v_uint32x8, v_int64x4, void, v_int32x8, void);
-    CV_DEF_REG_TRAITS(v256, v_float32x8, float, f32, v_float32x8, v_float64x4, void, v_int32x8, v_int32x8);
-    CV_DEF_REG_TRAITS(v256, v_uint64x4, uint64, u64, v_uint64x4, void, void, v_int64x4, void);
-    CV_DEF_REG_TRAITS(v256, v_int64x4, int64, s64, v_uint64x4, void, void, v_int64x4, void);
-    CV_DEF_REG_TRAITS(v256, v_float64x4, double, f64, v_float64x4, void, void, v_int64x4, v_int32x8);
-#endif
-
-#if CV_SIMD512
-    CV_DEF_REG_TRAITS(v512, v_uint8x64, uchar, u8, v_uint8x64, v_uint16x32, v_uint32x16, v_int8x64, void);
-    CV_DEF_REG_TRAITS(v512, v_int8x64, schar, s8, v_uint8x64, v_int16x32, v_int32x16, v_int8x64, void);
-    CV_DEF_REG_TRAITS(v512, v_uint16x32, ushort, u16, v_uint16x32, v_uint32x16, v_uint64x8, v_int16x32, void);
-    CV_DEF_REG_TRAITS(v512, v_int16x32, short, s16, v_uint16x32, v_int32x16, v_int64x8, v_int16x32, void);
-    CV_DEF_REG_TRAITS(v512, v_uint32x16, unsigned, u32, v_uint32x16, v_uint64x8, void, v_int32x16, void);
-    CV_DEF_REG_TRAITS(v512, v_int32x16, int, s32, v_uint32x16, v_int64x8, void, v_int32x16, void);
-    CV_DEF_REG_TRAITS(v512, v_float32x16, float, f32, v_float32x16, v_float64x8, void, v_int32x16, v_int32x16);
-    CV_DEF_REG_TRAITS(v512, v_uint64x8, uint64, u64, v_uint64x8, void, void, v_int64x8, void);
-    CV_DEF_REG_TRAITS(v512, v_int64x8, int64, s64, v_uint64x8, void, void, v_int64x8, void);
-    CV_DEF_REG_TRAITS(v512, v_float64x8, double, f64, v_float64x8, void, void, v_int64x8, v_int32x16);
-#endif
-//! @endcond
-
-#if CV_SIMD512 && (!defined(CV__SIMD_FORCE_WIDTH) || CV__SIMD_FORCE_WIDTH == 512)
-#define CV__SIMD_NAMESPACE simd512
-namespace CV__SIMD_NAMESPACE {
-    #define CV_SIMD 1
-    #define CV_SIMD_64F CV_SIMD512_64F
-    #define CV_SIMD_FP16 CV_SIMD512_FP16
-    #define CV_SIMD_WIDTH 64
-//! @addtogroup core_hal_intrin
-//! @{
-    //! @brief Maximum available vector register capacity 8-bit unsigned integer values
-    typedef v_uint8x64    v_uint8;
-    //! @brief Maximum available vector register capacity 8-bit signed integer values
-    typedef v_int8x64     v_int8;
-    //! @brief Maximum available vector register capacity 16-bit unsigned integer values
-    typedef v_uint16x32   v_uint16;
-    //! @brief Maximum available vector register capacity 16-bit signed integer values
-    typedef v_int16x32    v_int16;
-    //! @brief Maximum available vector register capacity 32-bit unsigned integer values
-    typedef v_uint32x16   v_uint32;
-    //! @brief Maximum available vector register capacity 32-bit signed integer values
-    typedef v_int32x16    v_int32;
-    //! @brief Maximum available vector register capacity 64-bit unsigned integer values
-    typedef v_uint64x8    v_uint64;
-    //! @brief Maximum available vector register capacity 64-bit signed integer values
-    typedef v_int64x8     v_int64;
-    //! @brief Maximum available vector register capacity 32-bit floating point values (single precision)
-    typedef v_float32x16  v_float32;
-    #if CV_SIMD512_64F
-    //! @brief Maximum available vector register capacity 64-bit floating point values (double precision)
-    typedef v_float64x8   v_float64;
-    #endif
-//! @}
-
-    #define VXPREFIX(func) v512##func
-} // namespace
-using namespace CV__SIMD_NAMESPACE;
-#elif CV_SIMD256 && (!defined(CV__SIMD_FORCE_WIDTH) || CV__SIMD_FORCE_WIDTH == 256)
-#define CV__SIMD_NAMESPACE simd256
-namespace CV__SIMD_NAMESPACE {
-    #define CV_SIMD 1
-    #define CV_SIMD_64F CV_SIMD256_64F
-    #define CV_SIMD_FP16 CV_SIMD256_FP16
-    #define CV_SIMD_WIDTH 32
-//! @addtogroup core_hal_intrin
-//! @{
-    //! @brief Maximum available vector register capacity 8-bit unsigned integer values
-    typedef v_uint8x32   v_uint8;
-    //! @brief Maximum available vector register capacity 8-bit signed integer values
-    typedef v_int8x32    v_int8;
-    //! @brief Maximum available vector register capacity 16-bit unsigned integer values
-    typedef v_uint16x16  v_uint16;
-    //! @brief Maximum available vector register capacity 16-bit signed integer values
-    typedef v_int16x16   v_int16;
-    //! @brief Maximum available vector register capacity 32-bit unsigned integer values
-    typedef v_uint32x8   v_uint32;
-    //! @brief Maximum available vector register capacity 32-bit signed integer values
-    typedef v_int32x8    v_int32;
-    //! @brief Maximum available vector register capacity 64-bit unsigned integer values
-    typedef v_uint64x4   v_uint64;
-    //! @brief Maximum available vector register capacity 64-bit signed integer values
-    typedef v_int64x4    v_int64;
-    //! @brief Maximum available vector register capacity 32-bit floating point values (single precision)
-    typedef v_float32x8  v_float32;
-    #if CV_SIMD256_64F
-    //! @brief Maximum available vector register capacity 64-bit floating point values (double precision)
-    typedef v_float64x4  v_float64;
-    #endif
-//! @}
-
-    #define VXPREFIX(func) v256##func
-} // namespace
-using namespace CV__SIMD_NAMESPACE;
-#elif (CV_SIMD128 || CV_SIMD128_CPP) && (!defined(CV__SIMD_FORCE_WIDTH) || CV__SIMD_FORCE_WIDTH == 128)
-#if defined CV_SIMD128_CPP
-#define CV__SIMD_NAMESPACE simd128_cpp
-#else
-#define CV__SIMD_NAMESPACE simd128
-#endif
-namespace CV__SIMD_NAMESPACE {
-    #define CV_SIMD CV_SIMD128
-    #define CV_SIMD_64F CV_SIMD128_64F
-    #define CV_SIMD_WIDTH 16
-//! @addtogroup core_hal_intrin
-//! @{
-    //! @brief Maximum available vector register capacity 8-bit unsigned integer values
-    typedef v_uint8x16  v_uint8;
-    //! @brief Maximum available vector register capacity 8-bit signed integer values
-    typedef v_int8x16   v_int8;
-    //! @brief Maximum available vector register capacity 16-bit unsigned integer values
-    typedef v_uint16x8  v_uint16;
-    //! @brief Maximum available vector register capacity 16-bit signed integer values
-    typedef v_int16x8   v_int16;
-    //! @brief Maximum available vector register capacity 32-bit unsigned integer values
-    typedef v_uint32x4  v_uint32;
-    //! @brief Maximum available vector register capacity 32-bit signed integer values
-    typedef v_int32x4   v_int32;
-    //! @brief Maximum available vector register capacity 64-bit unsigned integer values
-    typedef v_uint64x2  v_uint64;
-    //! @brief Maximum available vector register capacity 64-bit signed integer values
-    typedef v_int64x2   v_int64;
-    //! @brief Maximum available vector register capacity 32-bit floating point values (single precision)
-    typedef v_float32x4 v_float32;
-    #if CV_SIMD128_64F
-    //! @brief Maximum available vector register capacity 64-bit floating point values (double precision)
-    typedef v_float64x2 v_float64;
-    #endif
-//! @}
-
-    #define VXPREFIX(func) v##func
-} // namespace
-using namespace CV__SIMD_NAMESPACE;
-#endif
-
-namespace CV__SIMD_NAMESPACE {
-//! @addtogroup core_hal_intrin
-//! @{
-    //! @name Wide init with value
-    //! @{
-    //! @brief Create maximum available capacity vector with elements set to a specific value
-    inline v_uint8 vx_setall_u8(uchar v) { return VXPREFIX(_setall_u8)(v); }
-    inline v_int8 vx_setall_s8(schar v) { return VXPREFIX(_setall_s8)(v); }
-    inline v_uint16 vx_setall_u16(ushort v) { return VXPREFIX(_setall_u16)(v); }
-    inline v_int16 vx_setall_s16(short v) { return VXPREFIX(_setall_s16)(v); }
-    inline v_int32 vx_setall_s32(int v) { return VXPREFIX(_setall_s32)(v); }
-    inline v_uint32 vx_setall_u32(unsigned v) { return VXPREFIX(_setall_u32)(v); }
-    inline v_float32 vx_setall_f32(float v) { return VXPREFIX(_setall_f32)(v); }
-    inline v_int64 vx_setall_s64(int64 v) { return VXPREFIX(_setall_s64)(v); }
-    inline v_uint64 vx_setall_u64(uint64 v) { return VXPREFIX(_setall_u64)(v); }
-#if CV_SIMD_64F
-    inline v_float64 vx_setall_f64(double v) { return VXPREFIX(_setall_f64)(v); }
-#endif
-    //! @}
-
-    //! @name Wide init with zero
-    //! @{
-    //! @brief Create maximum available capacity vector with elements set to zero
-    inline v_uint8 vx_setzero_u8() { return VXPREFIX(_setzero_u8)(); }
-    inline v_int8 vx_setzero_s8() { return VXPREFIX(_setzero_s8)(); }
-    inline v_uint16 vx_setzero_u16() { return VXPREFIX(_setzero_u16)(); }
-    inline v_int16 vx_setzero_s16() { return VXPREFIX(_setzero_s16)(); }
-    inline v_int32 vx_setzero_s32() { return VXPREFIX(_setzero_s32)(); }
-    inline v_uint32 vx_setzero_u32() { return VXPREFIX(_setzero_u32)(); }
-    inline v_float32 vx_setzero_f32() { return VXPREFIX(_setzero_f32)(); }
-    inline v_int64 vx_setzero_s64() { return VXPREFIX(_setzero_s64)(); }
-    inline v_uint64 vx_setzero_u64() { return VXPREFIX(_setzero_u64)(); }
-#if CV_SIMD_64F
-    inline v_float64 vx_setzero_f64() { return VXPREFIX(_setzero_f64)(); }
-#endif
-    //! @}
-
-    //! @name Wide load from memory
-    //! @{
-    //! @brief Load maximum available capacity register contents from memory
-    inline v_uint8 vx_load(const uchar * ptr) { return VXPREFIX(_load)(ptr); }
-    inline v_int8 vx_load(const schar * ptr) { return VXPREFIX(_load)(ptr); }
-    inline v_uint16 vx_load(const ushort * ptr) { return VXPREFIX(_load)(ptr); }
-    inline v_int16 vx_load(const short * ptr) { return VXPREFIX(_load)(ptr); }
-    inline v_int32 vx_load(const int * ptr) { return VXPREFIX(_load)(ptr); }
-    inline v_uint32 vx_load(const unsigned * ptr) { return VXPREFIX(_load)(ptr); }
-    inline v_float32 vx_load(const float * ptr) { return VXPREFIX(_load)(ptr); }
-    inline v_int64 vx_load(const int64 * ptr) { return VXPREFIX(_load)(ptr); }
-    inline v_uint64 vx_load(const uint64 * ptr) { return VXPREFIX(_load)(ptr); }
-#if CV_SIMD_64F
-    inline v_float64 vx_load(const double * ptr) { return VXPREFIX(_load)(ptr); }
-#endif
-    //! @}
-
-    //! @name Wide load from memory(aligned)
-    //! @{
-    //! @brief Load maximum available capacity register contents from memory(aligned)
-    inline v_uint8 vx_load_aligned(const uchar * ptr) { return VXPREFIX(_load_aligned)(ptr); }
-    inline v_int8 vx_load_aligned(const schar * ptr) { return VXPREFIX(_load_aligned)(ptr); }
-    inline v_uint16 vx_load_aligned(const ushort * ptr) { return VXPREFIX(_load_aligned)(ptr); }
-    inline v_int16 vx_load_aligned(const short * ptr) { return VXPREFIX(_load_aligned)(ptr); }
-    inline v_int32 vx_load_aligned(const int * ptr) { return VXPREFIX(_load_aligned)(ptr); }
-    inline v_uint32 vx_load_aligned(const unsigned * ptr) { return VXPREFIX(_load_aligned)(ptr); }
-    inline v_float32 vx_load_aligned(const float * ptr) { return VXPREFIX(_load_aligned)(ptr); }
-    inline v_int64 vx_load_aligned(const int64 * ptr) { return VXPREFIX(_load_aligned)(ptr); }
-    inline v_uint64 vx_load_aligned(const uint64 * ptr) { return VXPREFIX(_load_aligned)(ptr); }
-#if CV_SIMD_64F
-    inline v_float64 vx_load_aligned(const double * ptr) { return VXPREFIX(_load_aligned)(ptr); }
-#endif
-    //! @}
-
-    //! @name Wide load lower half from memory
-    //! @{
-    //! @brief Load lower half of maximum available capacity register from memory
-    inline v_uint8 vx_load_low(const uchar * ptr) { return VXPREFIX(_load_low)(ptr); }
-    inline v_int8 vx_load_low(const schar * ptr) { return VXPREFIX(_load_low)(ptr); }
-    inline v_uint16 vx_load_low(const ushort * ptr) { return VXPREFIX(_load_low)(ptr); }
-    inline v_int16 vx_load_low(const short * ptr) { return VXPREFIX(_load_low)(ptr); }
-    inline v_int32 vx_load_low(const int * ptr) { return VXPREFIX(_load_low)(ptr); }
-    inline v_uint32 vx_load_low(const unsigned * ptr) { return VXPREFIX(_load_low)(ptr); }
-    inline v_float32 vx_load_low(const float * ptr) { return VXPREFIX(_load_low)(ptr); }
-    inline v_int64 vx_load_low(const int64 * ptr) { return VXPREFIX(_load_low)(ptr); }
-    inline v_uint64 vx_load_low(const uint64 * ptr) { return VXPREFIX(_load_low)(ptr); }
-#if CV_SIMD_64F
-    inline v_float64 vx_load_low(const double * ptr) { return VXPREFIX(_load_low)(ptr); }
-#endif
-    //! @}
-
-    //! @name Wide load halfs from memory
-    //! @{
-    //! @brief Load maximum available capacity register contents from two memory blocks
-    inline v_uint8 vx_load_halves(const uchar * ptr0, const uchar * ptr1) { return VXPREFIX(_load_halves)(ptr0, ptr1); }
-    inline v_int8 vx_load_halves(const schar * ptr0, const schar * ptr1) { return VXPREFIX(_load_halves)(ptr0, ptr1); }
-    inline v_uint16 vx_load_halves(const ushort * ptr0, const ushort * ptr1) { return VXPREFIX(_load_halves)(ptr0, ptr1); }
-    inline v_int16 vx_load_halves(const short * ptr0, const short * ptr1) { return VXPREFIX(_load_halves)(ptr0, ptr1); }
-    inline v_int32 vx_load_halves(const int * ptr0, const int * ptr1) { return VXPREFIX(_load_halves)(ptr0, ptr1); }
-    inline v_uint32 vx_load_halves(const unsigned * ptr0, const unsigned * ptr1) { return VXPREFIX(_load_halves)(ptr0, ptr1); }
-    inline v_float32 vx_load_halves(const float * ptr0, const float * ptr1) { return VXPREFIX(_load_halves)(ptr0, ptr1); }
-    inline v_int64 vx_load_halves(const int64 * ptr0, const int64 * ptr1) { return VXPREFIX(_load_halves)(ptr0, ptr1); }
-    inline v_uint64 vx_load_halves(const uint64 * ptr0, const uint64 * ptr1) { return VXPREFIX(_load_halves)(ptr0, ptr1); }
-#if CV_SIMD_64F
-    inline v_float64 vx_load_halves(const double * ptr0, const double * ptr1) { return VXPREFIX(_load_halves)(ptr0, ptr1); }
-#endif
-    //! @}
-
-    //! @name Wide LUT of elements
-    //! @{
-    //! @brief Load maximum available capacity register contents with array elements by provided indexes
-    inline v_uint8 vx_lut(const uchar * ptr, const int* idx) { return VXPREFIX(_lut)(ptr, idx); }
-    inline v_int8 vx_lut(const schar * ptr, const int* idx) { return VXPREFIX(_lut)(ptr, idx); }
-    inline v_uint16 vx_lut(const ushort * ptr, const int* idx) { return VXPREFIX(_lut)(ptr, idx); }
-    inline v_int16 vx_lut(const short* ptr, const int* idx) { return VXPREFIX(_lut)(ptr, idx); }
-    inline v_int32 vx_lut(const int* ptr, const int* idx) { return VXPREFIX(_lut)(ptr, idx); }
-    inline v_uint32 vx_lut(const unsigned* ptr, const int* idx) { return VXPREFIX(_lut)(ptr, idx); }
-    inline v_float32 vx_lut(const float* ptr, const int* idx) { return VXPREFIX(_lut)(ptr, idx); }
-    inline v_int64 vx_lut(const int64 * ptr, const int* idx) { return VXPREFIX(_lut)(ptr, idx); }
-    inline v_uint64 vx_lut(const uint64 * ptr, const int* idx) { return VXPREFIX(_lut)(ptr, idx); }
-#if CV_SIMD_64F
-    inline v_float64 vx_lut(const double* ptr, const int* idx) { return VXPREFIX(_lut)(ptr, idx); }
-#endif
-    //! @}
-
-    //! @name Wide LUT of element pairs
-    //! @{
-    //! @brief Load maximum available capacity register contents with array element pairs by provided indexes
-    inline v_uint8 vx_lut_pairs(const uchar * ptr, const int* idx) { return VXPREFIX(_lut_pairs)(ptr, idx); }
-    inline v_int8 vx_lut_pairs(const schar * ptr, const int* idx) { return VXPREFIX(_lut_pairs)(ptr, idx); }
-    inline v_uint16 vx_lut_pairs(const ushort * ptr, const int* idx) { return VXPREFIX(_lut_pairs)(ptr, idx); }
-    inline v_int16 vx_lut_pairs(const short* ptr, const int* idx) { return VXPREFIX(_lut_pairs)(ptr, idx); }
-    inline v_int32 vx_lut_pairs(const int* ptr, const int* idx) { return VXPREFIX(_lut_pairs)(ptr, idx); }
-    inline v_uint32 vx_lut_pairs(const unsigned* ptr, const int* idx) { return VXPREFIX(_lut_pairs)(ptr, idx); }
-    inline v_float32 vx_lut_pairs(const float* ptr, const int* idx) { return VXPREFIX(_lut_pairs)(ptr, idx); }
-    inline v_int64 vx_lut_pairs(const int64 * ptr, const int* idx) { return VXPREFIX(_lut_pairs)(ptr, idx); }
-    inline v_uint64 vx_lut_pairs(const uint64 * ptr, const int* idx) { return VXPREFIX(_lut_pairs)(ptr, idx); }
-#if CV_SIMD_64F
-    inline v_float64 vx_lut_pairs(const double* ptr, const int* idx) { return VXPREFIX(_lut_pairs)(ptr, idx); }
-#endif
-    //! @}
-
-    //! @name Wide LUT of element quads
-    //! @{
-    //! @brief Load maximum available capacity register contents with array element quads by provided indexes
-    inline v_uint8 vx_lut_quads(const uchar* ptr, const int* idx) { return VXPREFIX(_lut_quads)(ptr, idx); }
-    inline v_int8 vx_lut_quads(const schar* ptr, const int* idx) { return VXPREFIX(_lut_quads)(ptr, idx); }
-    inline v_uint16 vx_lut_quads(const ushort* ptr, const int* idx) { return VXPREFIX(_lut_quads)(ptr, idx); }
-    inline v_int16 vx_lut_quads(const short* ptr, const int* idx) { return VXPREFIX(_lut_quads)(ptr, idx); }
-    inline v_int32 vx_lut_quads(const int* ptr, const int* idx) { return VXPREFIX(_lut_quads)(ptr, idx); }
-    inline v_uint32 vx_lut_quads(const unsigned* ptr, const int* idx) { return VXPREFIX(_lut_quads)(ptr, idx); }
-    inline v_float32 vx_lut_quads(const float* ptr, const int* idx) { return VXPREFIX(_lut_quads)(ptr, idx); }
-    //! @}
-
-    //! @name Wide load with double expansion
-    //! @{
-    //! @brief Load maximum available capacity register contents from memory with double expand
-    inline v_uint16 vx_load_expand(const uchar * ptr) { return VXPREFIX(_load_expand)(ptr); }
-    inline v_int16 vx_load_expand(const schar * ptr) { return VXPREFIX(_load_expand)(ptr); }
-    inline v_uint32 vx_load_expand(const ushort * ptr) { return VXPREFIX(_load_expand)(ptr); }
-    inline v_int32 vx_load_expand(const short* ptr) { return VXPREFIX(_load_expand)(ptr); }
-    inline v_int64 vx_load_expand(const int* ptr) { return VXPREFIX(_load_expand)(ptr); }
-    inline v_uint64 vx_load_expand(const unsigned* ptr) { return VXPREFIX(_load_expand)(ptr); }
-    inline v_float32 vx_load_expand(const float16_t * ptr) { return VXPREFIX(_load_expand)(ptr); }
-    //! @}
-
-    //! @name Wide load with quad expansion
-    //! @{
-    //! @brief Load maximum available capacity register contents from memory with quad expand
-    inline v_uint32 vx_load_expand_q(const uchar * ptr) { return VXPREFIX(_load_expand_q)(ptr); }
-    inline v_int32 vx_load_expand_q(const schar * ptr) { return VXPREFIX(_load_expand_q)(ptr); }
-    //! @}
-
-    /** @brief SIMD processing state cleanup call */
-    inline void vx_cleanup() { VXPREFIX(_cleanup)(); }
-
-
-//! @cond IGNORED
-
-    // backward compatibility
-    template<typename _Tp, typename _Tvec> static inline
-    void vx_store(_Tp* dst, const _Tvec& v) { return v_store(dst, v); }
-    // backward compatibility
-    template<typename _Tp, typename _Tvec> static inline
-    void vx_store_aligned(_Tp* dst, const _Tvec& v) { return v_store_aligned(dst, v); }
-
-//! @endcond
-
-
-//! @}
-    #undef VXPREFIX
-} // namespace
-
-//! @cond IGNORED
-#ifndef CV_SIMD_64F
-#define CV_SIMD_64F 0
-#endif
-
-#ifndef CV_SIMD_FP16
-#define CV_SIMD_FP16 0  //!< Defined to 1 on native support of operations with float16x8_t / float16x16_t (SIMD256) types
-#endif
-
-#ifndef CV_SIMD
-#define CV_SIMD 0
-#endif
-
-#include "simd_utils.impl.hpp"
-
-#ifndef CV_DOXYGEN
-CV_CPU_OPTIMIZATION_HAL_NAMESPACE_END
-#endif
-
-} // cv::
-
-//! @endcond
-
-#endif
diff --git a/3rdParty/opencv2/core/hal/intrin_rvv.hpp b/3rdParty/opencv2/core/hal/intrin_rvv.hpp
deleted file mode 100644
index f5902e4f77..0000000000
--- a/3rdParty/opencv2/core/hal/intrin_rvv.hpp
+++ /dev/null
@@ -1,3320 +0,0 @@
-// This file is part of OpenCV project.
-// It is subject to the license terms in the LICENSE file found in the top-level directory
-// of this distribution and at http://opencv.org/license.html.
-
-// The original implementation has been contributed by Yin Zhang.
-// Copyright (C) 2020, Institute of Software, Chinese Academy of Sciences.
-
-#ifndef OPENCV_HAL_INTRIN_RVV_HPP
-#define OPENCV_HAL_INTRIN_RVV_HPP
-
-#include <algorithm>
-
-namespace cv
-{
-
-CV_CPU_OPTIMIZATION_HAL_NAMESPACE_BEGIN
-
-#define CV_SIMD128 1
-#define CV_SIMD128_64F 1
-
-//////////// Unsupported native intrinsics in C++ ////////////
-// The following types have been defined in clang, but not in GCC yet.
-#ifndef __clang__
-
-struct vuint8mf2_t
-{
-    uchar val[8] = {0};
-    vuint8mf2_t() {}
-    vuint8mf2_t(const uchar* ptr)
-    {
-        for (int i = 0; i < 8; ++i)
-        {
-            val[i] = ptr[i];
-        }
-    }
-};
-struct vint8mf2_t
-{
-    schar val[8] = {0};
-    vint8mf2_t() {}
-    vint8mf2_t(const schar* ptr)
-    {
-        for (int i = 0; i < 8; ++i)
-        {
-            val[i] = ptr[i];
-        }
-    }
-};
-struct vuint16mf2_t
-{
-    ushort val[4] = {0};
-    vuint16mf2_t() {}
-    vuint16mf2_t(const ushort* ptr)
-    {
-        for (int i = 0; i < 4; ++i)
-        {
-            val[i] = ptr[i];
-        }
-    }
-};
-struct vint16mf2_t
-{
-    short val[4] = {0};
-    vint16mf2_t() {}
-    vint16mf2_t(const short* ptr)
-    {
-        for (int i = 0; i < 4; ++i)
-        {
-            val[i] = ptr[i];
-        }
-    }
-};
-struct vuint32mf2_t
-{
-    unsigned val[2] = {0};
-    vuint32mf2_t() {}
-    vuint32mf2_t(const unsigned* ptr)
-    {
-        val[0] = ptr[0];
-        val[1] = ptr[1];
-    }
-};
-struct vint32mf2_t
-{
-    int val[2] = {0};
-    vint32mf2_t() {}
-    vint32mf2_t(const int* ptr)
-    {
-        val[0] = ptr[0];
-        val[1] = ptr[1];
-    }
-};
-struct vfloat32mf2_t
-{
-    float val[2] = {0};
-    vfloat32mf2_t() {}
-    vfloat32mf2_t(const float* ptr)
-    {
-        val[0] = ptr[0];
-        val[1] = ptr[1];
-    }
-};
-struct vuint64mf2_t
-{
-    uint64 val[1] = {0};
-    vuint64mf2_t() {}
-    vuint64mf2_t(const uint64* ptr)
-    {
-        val[0] = ptr[0];
-    }
-};
-struct vint64mf2_t
-{
-    int64 val[1] = {0};
-    vint64mf2_t() {}
-    vint64mf2_t(const int64* ptr)
-    {
-        val[0] = ptr[0];
-    }
-};
-struct vfloat64mf2_t
-{
-    double val[1] = {0};
-    vfloat64mf2_t() {}
-    vfloat64mf2_t(const double* ptr)
-    {
-        val[0] = ptr[0];
-    }
-};
-struct vuint8mf4_t
-{
-    uchar val[4] = {0};
-    vuint8mf4_t() {}
-    vuint8mf4_t(const uchar* ptr)
-    {
-        for (int i = 0; i < 4; ++i)
-        {
-            val[i] = ptr[i];
-        }
-    }
-};
-struct vint8mf4_t
-{
-    schar val[4] = {0};
-    vint8mf4_t() {}
-    vint8mf4_t(const schar* ptr)
-    {
-        for (int i = 0; i < 4; ++i)
-        {
-            val[i] = ptr[i];
-        }
-    }
-};
-
-#define OPENCV_HAL_IMPL_RVV_NATIVE_LOADSTORE_MF2(_Tpvec, _Tp, suffix, width, n) \
-inline _Tpvec vle##width##_v_##suffix##mf2(const _Tp* ptr, size_t vl) \
-{ \
-    CV_UNUSED(vl); \
-    return _Tpvec(ptr); \
-} \
-inline void vse##width##_v_##suffix##mf2(_Tp* ptr, _Tpvec v, size_t vl) \
-{ \
-    CV_UNUSED(vl); \
-    for (int i = 0; i < n; ++i) \
-    { \
-            ptr[i] = v.val[i]; \
-    } \
-}
-
-OPENCV_HAL_IMPL_RVV_NATIVE_LOADSTORE_MF2(vuint8mf2_t, uint8_t, u8, 8, 8)
-OPENCV_HAL_IMPL_RVV_NATIVE_LOADSTORE_MF2(vint8mf2_t, int8_t, i8, 8, 8)
-OPENCV_HAL_IMPL_RVV_NATIVE_LOADSTORE_MF2(vuint16mf2_t, uint16_t, u16, 16, 4)
-OPENCV_HAL_IMPL_RVV_NATIVE_LOADSTORE_MF2(vint16mf2_t, int16_t, i16, 16, 4)
-OPENCV_HAL_IMPL_RVV_NATIVE_LOADSTORE_MF2(vuint32mf2_t, uint32_t, u32, 32, 2)
-OPENCV_HAL_IMPL_RVV_NATIVE_LOADSTORE_MF2(vint32mf2_t, int32_t, i32, 32, 2)
-OPENCV_HAL_IMPL_RVV_NATIVE_LOADSTORE_MF2(vfloat32mf2_t, float32_t, f32, 32, 2)
-OPENCV_HAL_IMPL_RVV_NATIVE_LOADSTORE_MF2(vuint64mf2_t, uint64_t, u64, 64, 1)
-OPENCV_HAL_IMPL_RVV_NATIVE_LOADSTORE_MF2(vint64mf2_t, int64_t, i64, 64, 1)
-OPENCV_HAL_IMPL_RVV_NATIVE_LOADSTORE_MF2(vfloat64mf2_t, float64_t, f64, 64, 1)
-
-
-#define OPENCV_HAL_IMPL_RVV_NATIVE_WCVT(_Tpwvec, _Tpvec, _wTp, wcvt, suffix, width, n) \
-inline _Tpwvec wcvt (_Tpvec v, size_t vl) \
-{ \
-    _wTp tmp[n]; \
-    for (int i = 0; i < n; ++i) \
-    { \
-            tmp[i] = (_wTp)v.val[i]; \
-    } \
-    return vle##width##_v_##suffix##m1(tmp, vl); \
-}
-
-OPENCV_HAL_IMPL_RVV_NATIVE_WCVT(vuint16m1_t, vuint8mf2_t, ushort, vwcvtu_x_x_v_u16m1, u16, 16, 8)
-OPENCV_HAL_IMPL_RVV_NATIVE_WCVT(vint16m1_t, vint8mf2_t, short, vwcvt_x_x_v_i16m1, i16, 16, 8)
-OPENCV_HAL_IMPL_RVV_NATIVE_WCVT(vuint32m1_t, vuint16mf2_t, unsigned, vwcvtu_x_x_v_u32m1, u32, 32, 4)
-OPENCV_HAL_IMPL_RVV_NATIVE_WCVT(vint32m1_t, vint16mf2_t, int, vwcvt_x_x_v_i32m1, i32, 32, 4)
-OPENCV_HAL_IMPL_RVV_NATIVE_WCVT(vuint64m1_t, vuint32mf2_t, uint64, vwcvtu_x_x_v_u64m1, u64, 64, 2)
-OPENCV_HAL_IMPL_RVV_NATIVE_WCVT(vint64m1_t, vint32mf2_t, int64, vwcvt_x_x_v_i64m1, i64, 64, 2)
-
-inline vuint8mf4_t vle8_v_u8mf4 (const uint8_t *base, size_t vl)
-{
-    CV_UNUSED(vl);
-    return vuint8mf4_t(base);
-}
-inline vint8mf4_t vle8_v_i8mf4 (const int8_t *base, size_t vl)
-{
-    CV_UNUSED(vl);
-    return vint8mf4_t(base);
-}
-
-inline vuint16mf2_t vwcvtu_x_x_v_u16mf2 (vuint8mf4_t src, size_t vl)
-{
-    ushort tmp[4];
-    for (int i = 0; i < 4; ++i)
-    {
-            tmp[i] = (ushort)src.val[i];
-    }
-    return vle16_v_u16mf2(tmp, vl);
-}
-inline vint16mf2_t vwcvt_x_x_v_i16mf2 (vint8mf4_t src, size_t vl)
-{
-    short tmp[4];
-    for (int i = 0; i < 4; ++i)
-    {
-            tmp[i] = (short)src.val[i];
-    }
-    return vle16_v_i16mf2(tmp, vl);
-}
-#endif
-
-//////////// Types ////////////
-
-#ifndef __clang__
-struct v_uint8x16
-{
-    typedef uchar lane_type;
-    enum { nlanes = 16 };
-
-    v_uint8x16() {}
-    explicit v_uint8x16(vuint8m1_t v)
-    {
-        vse8_v_u8m1(val, v, nlanes);
-    }
-    v_uint8x16(uchar v0, uchar v1, uchar v2, uchar v3, uchar v4, uchar v5, uchar v6, uchar v7,
-               uchar v8, uchar v9, uchar v10, uchar v11, uchar v12, uchar v13, uchar v14, uchar v15)
-    {
-        uchar v[] = {v0, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15};
-        for (int i = 0; i < nlanes; ++i)
-        {
-            val[i] = v[i];
-        }
-    }
-    operator vuint8m1_t() const
-    {
-        return vle8_v_u8m1(val, nlanes);
-    }
-    uchar get0() const
-    {
-        return val[0];
-    }
-
-    uchar val[16];
-};
-
-struct v_int8x16
-{
-    typedef schar lane_type;
-    enum { nlanes = 16 };
-
-    v_int8x16() {}
-    explicit v_int8x16(vint8m1_t v)
-    {
-        vse8_v_i8m1(val, v, nlanes);
-    }
-    v_int8x16(schar v0, schar v1, schar v2, schar v3, schar v4, schar v5, schar v6, schar v7,
-               schar v8, schar v9, schar v10, schar v11, schar v12, schar v13, schar v14, schar v15)
-    {
-        schar v[] = {v0, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15};
-        for (int i = 0; i < nlanes; ++i)
-        {
-            val[i] = v[i];
-        }
-    }
-    operator vint8m1_t() const
-    {
-        return vle8_v_i8m1(val, nlanes);
-    }
-    schar get0() const
-    {
-        return val[0];
-    }
-
-    schar val[16];
-};
-
-struct v_uint16x8
-{
-    typedef ushort lane_type;
-    enum { nlanes = 8 };
-
-    v_uint16x8() {}
-    explicit v_uint16x8(vuint16m1_t v)
-    {
-        vse16_v_u16m1(val, v, nlanes);
-    }
-    v_uint16x8(ushort v0, ushort v1, ushort v2, ushort v3, ushort v4, ushort v5, ushort v6, ushort v7)
-    {
-        ushort v[] = {v0, v1, v2, v3, v4, v5, v6, v7};
-        for (int i = 0; i < nlanes; ++i)
-        {
-            val[i] = v[i];
-        }
-    }
-    operator vuint16m1_t() const
-    {
-        return vle16_v_u16m1(val, nlanes);
-    }
-    ushort get0() const
-    {
-        return val[0];
-    }
-
-    ushort val[8];
-};
-
-struct v_int16x8
-{
-    typedef short lane_type;
-    enum { nlanes = 8 };
-
-    v_int16x8() {}
-    explicit v_int16x8(vint16m1_t v)
-    {
-        vse16_v_i16m1(val, v, nlanes);
-    }
-    v_int16x8(short v0, short v1, short v2, short v3, short v4, short v5, short v6, short v7)
-    {
-        short v[] = {v0, v1, v2, v3, v4, v5, v6, v7};
-        for (int i = 0; i < nlanes; ++i)
-        {
-            val[i] = v[i];
-        }
-    }
-    operator vint16m1_t() const
-    {
-        return vle16_v_i16m1(val, nlanes);
-    }
-    short get0() const
-    {
-        return val[0];
-    }
-
-    short val[8];
-};
-
-struct v_uint32x4
-{
-    typedef unsigned lane_type;
-    enum { nlanes = 4 };
-
-    v_uint32x4() {}
-    explicit v_uint32x4(vuint32m1_t v)
-    {
-        vse32_v_u32m1(val, v, nlanes);
-    }
-    v_uint32x4(unsigned v0, unsigned v1, unsigned v2, unsigned v3)
-    {
-        unsigned v[] = {v0, v1, v2, v3};
-        for (int i = 0; i < nlanes; ++i)
-        {
-            val[i] = v[i];
-        }
-    }
-    operator vuint32m1_t() const
-    {
-        return vle32_v_u32m1(val, nlanes);
-    }
-    unsigned get0() const
-    {
-        return val[0];
-    }
-
-    unsigned val[4];
-};
-
-struct v_int32x4
-{
-    typedef int lane_type;
-    enum { nlanes = 4 };
-
-    v_int32x4() {}
-    explicit v_int32x4(vint32m1_t v)
-    {
-        vse32_v_i32m1(val, v, nlanes);
-    }
-    v_int32x4(int v0, int v1, int v2, int v3)
-    {
-        int v[] = {v0, v1, v2, v3};
-        for (int i = 0; i < nlanes; ++i)
-        {
-            val[i] = v[i];
-        }
-    }
-    operator vint32m1_t() const
-    {
-        return vle32_v_i32m1(val, nlanes);
-    }
-    int get0() const
-    {
-        return val[0];
-    }
-    int val[4];
-};
-
-struct v_float32x4
-{
-    typedef float lane_type;
-    enum { nlanes = 4 };
-
-    v_float32x4() {}
-    explicit v_float32x4(vfloat32m1_t v)
-    {
-        vse32_v_f32m1(val, v, nlanes);
-    }
-    v_float32x4(float v0, float v1, float v2, float v3)
-    {
-        float v[] = {v0, v1, v2, v3};
-        for (int i = 0; i < nlanes; ++i)
-        {
-            val[i] = v[i];
-        }
-    }
-    operator vfloat32m1_t() const
-    {
-        return vle32_v_f32m1(val, nlanes);
-    }
-    float get0() const
-    {
-        return val[0];
-    }
-    float val[4];
-};
-
-struct v_uint64x2
-{
-    typedef uint64 lane_type;
-    enum { nlanes = 2 };
-
-    v_uint64x2() {}
-    explicit v_uint64x2(vuint64m1_t v)
-    {
-        vse64_v_u64m1(val, v, nlanes);
-    }
-    v_uint64x2(uint64 v0, uint64 v1)
-    {
-        uint64 v[] = {v0, v1};
-        for (int i = 0; i < nlanes; ++i)
-        {
-            val[i] = v[i];
-        }
-    }
-    operator vuint64m1_t() const
-    {
-        return vle64_v_u64m1(val, nlanes);
-    }
-    uint64 get0() const
-    {
-        return val[0];
-    }
-
-    uint64 val[2];
-};
-
-struct v_int64x2
-{
-    typedef int64 lane_type;
-    enum { nlanes = 2 };
-
-    v_int64x2() {}
-    explicit v_int64x2(vint64m1_t v)
-    {
-        vse64_v_i64m1(val, v, nlanes);
-    }
-    v_int64x2(int64 v0, int64 v1)
-    {
-        int64 v[] = {v0, v1};
-        for (int i = 0; i < nlanes; ++i)
-        {
-            val[i] = v[i];
-        }
-    }
-    operator vint64m1_t() const
-    {
-        return vle64_v_i64m1(val, nlanes);
-    }
-    int64 get0() const
-    {
-        return val[0];
-    }
-
-    int64 val[2];
-};
-
-#if CV_SIMD128_64F
-struct v_float64x2
-{
-    typedef double lane_type;
-    enum { nlanes = 2 };
-
-    v_float64x2() {}
-    explicit v_float64x2(vfloat64m1_t v)
-    {
-        vse64_v_f64m1(val, v, nlanes);
-    }
-    v_float64x2(double v0, double v1)
-    {
-        double v[] = {v0, v1};
-        for (int i = 0; i < nlanes; ++i)
-        {
-            val[i] = v[i];
-        }
-    }
-    operator vfloat64m1_t() const
-    {
-        return vle64_v_f64m1(val, nlanes);
-    }
-    double get0() const
-    {
-        return val[0];
-    }
-
-    double val[2];
-};
-#endif
-#else
-struct v_uint8x16
-{
-    typedef uchar lane_type;
-    enum { nlanes = 16 };
-
-    v_uint8x16() {}
-    explicit v_uint8x16(vuint8m1_t v)
-    {
-        *pval = v;
-    }
-    v_uint8x16(uchar v0, uchar v1, uchar v2, uchar v3, uchar v4, uchar v5, uchar v6, uchar v7,
-               uchar v8, uchar v9, uchar v10, uchar v11, uchar v12, uchar v13, uchar v14, uchar v15)
-    {
-        uchar v[] = {v0, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15};
-        *pval = vle8_v_u8m1(v, nlanes);
-    }
-    operator vuint8m1_t() const
-    {
-        return *pval;
-    }
-    uchar get0() const
-    {
-        return vmv_x(*pval);
-    }
-    inline v_uint8x16& operator=(const v_uint8x16& vec) {
-        *pval = *(vec.pval);
-        return *this;
-    }
-    inline v_uint8x16(const v_uint8x16& vec) {
-        *pval = *(vec.pval);
-    }
-    uchar val[16];
-    vuint8m1_t* pval = (vuint8m1_t*)val;
-};
-
-struct v_int8x16
-{
-    typedef schar lane_type;
-    enum { nlanes = 16 };
-
-    v_int8x16() {}
-    explicit v_int8x16(vint8m1_t v)
-    {
-        *pval = v;
-    }
-    v_int8x16(schar v0, schar v1, schar v2, schar v3, schar v4, schar v5, schar v6, schar v7,
-               schar v8, schar v9, schar v10, schar v11, schar v12, schar v13, schar v14, schar v15)
-    {
-        schar v[] = {v0, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15};
-        *pval = vle8_v_i8m1(v, nlanes);
-    }
-    operator vint8m1_t() const
-    {
-        return *pval;
-    }
-    schar get0() const
-    {
-        return vmv_x(*pval);
-    }
-    inline v_int8x16& operator=(const v_int8x16& vec) {
-        *pval = *(vec.pval);
-        return *this;
-    }
-    inline v_int8x16(const v_int8x16& vec) {
-        *pval = *(vec.pval);
-    }
-    schar val[16];
-    vint8m1_t* pval = (vint8m1_t*)val;
-};
-
-struct v_uint16x8
-{
-    typedef ushort lane_type;
-    enum { nlanes = 8 };
-
-    v_uint16x8() {}
-    explicit v_uint16x8(vuint16m1_t v)
-    {
-        *pval = v;
-    }
-    v_uint16x8(ushort v0, ushort v1, ushort v2, ushort v3, ushort v4, ushort v5, ushort v6, ushort v7)
-    {
-        ushort v[] = {v0, v1, v2, v3, v4, v5, v6, v7};
-        *pval = vle16_v_u16m1(v, nlanes);
-    }
-    operator vuint16m1_t() const
-    {
-        return *pval;
-    }
-    ushort get0() const
-    {
-        return vmv_x(*pval);
-    }
-
-    inline v_uint16x8& operator=(const v_uint16x8& vec) {
-        *pval = *(vec.pval);
-        return *this;
-    }
-    inline v_uint16x8(const v_uint16x8& vec) {
-        *pval = *(vec.pval);
-    }
-    ushort val[8];
-    vuint16m1_t* pval = (vuint16m1_t*)val;
-};
-
-struct v_int16x8
-{
-    typedef short lane_type;
-    enum { nlanes = 8 };
-
-    v_int16x8() {}
-    explicit v_int16x8(vint16m1_t v)
-    {
-        *pval = v;
-    }
-    v_int16x8(short v0, short v1, short v2, short v3, short v4, short v5, short v6, short v7)
-    {
-        short v[] = {v0, v1, v2, v3, v4, v5, v6, v7};
-        *pval = vle16_v_i16m1(v, nlanes);
-    }
-    operator vint16m1_t() const
-    {
-        return *pval;
-    }
-    short get0() const
-    {
-        return vmv_x(*pval);
-    }
-
-    inline v_int16x8& operator=(const v_int16x8& vec) {
-        *pval = *(vec.pval);
-        return *this;
-    }
-    inline v_int16x8(const v_int16x8& vec) {
-        *pval = *(vec.pval);
-    }
-    short val[8];
-    vint16m1_t* pval = (vint16m1_t*)val;
-};
-
-struct v_uint32x4
-{
-    typedef unsigned lane_type;
-    enum { nlanes = 4 };
-
-    v_uint32x4() {}
-    explicit v_uint32x4(vuint32m1_t v)
-    {
-        *pval = v;
-    }
-    v_uint32x4(unsigned v0, unsigned v1, unsigned v2, unsigned v3)
-    {
-        unsigned v[] = {v0, v1, v2, v3};
-        *pval = vle32_v_u32m1(v, nlanes);
-    }
-    operator vuint32m1_t() const
-    {
-        return *pval;
-    }
-    unsigned get0() const
-    {
-        return vmv_x(*pval);
-    }
-
-    inline v_uint32x4& operator=(const v_uint32x4& vec) {
-        *pval = *(vec.pval);
-        return *this;
-    }
-    inline v_uint32x4(const v_uint32x4& vec) {
-        *pval = *(vec.pval);
-    }
-    unsigned val[4];
-    vuint32m1_t* pval = (vuint32m1_t*)val;
-};
-
-struct v_int32x4
-{
-    typedef int lane_type;
-    enum { nlanes = 4 };
-
-    v_int32x4() {}
-    explicit v_int32x4(vint32m1_t v)
-    {
-        *pval = v;
-    }
-    v_int32x4(int v0, int v1, int v2, int v3)
-    {
-        int v[] = {v0, v1, v2, v3};
-        *pval = vle32_v_i32m1(v, nlanes);
-    }
-    operator vint32m1_t() const
-    {
-        return *pval;
-    }
-    int get0() const
-    {
-        return vmv_x(*pval);
-    }
-
-    inline v_int32x4& operator=(const v_int32x4& vec) {
-        *pval = *(vec.pval);
-        return *this;
-    }
-    inline v_int32x4(const v_int32x4& vec) {
-        *pval = *(vec.pval);
-    }
-    int val[4];
-    vint32m1_t* pval = (vint32m1_t*)val;
-};
-
-struct v_float32x4
-{
-    typedef float lane_type;
-    enum { nlanes = 4 };
-
-    v_float32x4() {}
-    explicit v_float32x4(vfloat32m1_t v)
-    {
-        *pval = v;
-    }
-    v_float32x4(float v0, float v1, float v2, float v3)
-    {
-        float v[] = {v0, v1, v2, v3};
-        *pval = vle32_v_f32m1(v, nlanes);
-    }
-    operator vfloat32m1_t() const
-    {
-        return *pval;
-    }
-    float get0() const
-    {
-        return vfmv_f(*pval);
-    }
-    inline v_float32x4& operator=(const v_float32x4& vec) {
-        *pval = *(vec.pval);
-        return *this;
-    }
-    inline v_float32x4(const v_float32x4& vec) {
-        *pval = *(vec.pval);
-    }
-    float val[4];
-    vfloat32m1_t* pval = (vfloat32m1_t*)val;
-};
-
-struct v_uint64x2
-{
-    typedef uint64 lane_type;
-    enum { nlanes = 2 };
-
-    v_uint64x2() {}
-    explicit v_uint64x2(vuint64m1_t v)
-    {
-        *pval = v;
-    }
-    v_uint64x2(uint64 v0, uint64 v1)
-    {
-        uint64 v[] = {v0, v1};
-        *pval = vle64_v_u64m1(v, nlanes);
-    }
-    operator vuint64m1_t() const
-    {
-        return *pval;
-    }
-    uint64 get0() const
-    {
-        return vmv_x(*pval);
-    }
-
-    inline v_uint64x2& operator=(const v_uint64x2& vec) {
-        *pval = *(vec.pval);
-        return *this;
-    }
-    inline v_uint64x2(const v_uint64x2& vec) {
-        *pval = *(vec.pval);
-    }
-    uint64 val[2];
-    vuint64m1_t* pval = (vuint64m1_t*)val;
-};
-
-struct v_int64x2
-{
-    typedef int64 lane_type;
-    enum { nlanes = 2 };
-
-    v_int64x2() {}
-    explicit v_int64x2(vint64m1_t v)
-    {
-        *pval = v;
-    }
-    v_int64x2(int64 v0, int64 v1)
-    {
-        int64 v[] = {v0, v1};
-        *pval = vle64_v_i64m1(v, nlanes);
-    }
-    operator vint64m1_t() const
-    {
-        return *pval;
-    }
-    int64 get0() const
-    {
-        return vmv_x(*pval);
-    }
-
-    inline v_int64x2& operator=(const v_int64x2& vec) {
-        *pval = *(vec.pval);
-        return *this;
-    }
-    inline v_int64x2(const v_int64x2& vec) {
-        *pval = *(vec.pval);
-    }
-    int64 val[2];
-    vint64m1_t* pval = (vint64m1_t*)val;
-};
-
-#if CV_SIMD128_64F
-struct v_float64x2
-{
-    typedef double lane_type;
-    enum { nlanes = 2 };
-
-    v_float64x2() {}
-    explicit v_float64x2(vfloat64m1_t v)
-    {
-        *pval = v;
-    }
-    v_float64x2(double v0, double v1)
-    {
-        double v[] = {v0, v1};
-        *pval = vle64_v_f64m1(v, nlanes);
-    }
-    operator vfloat64m1_t() const
-    {
-        return *pval;
-    }
-    double get0() const
-    {
-        return vfmv_f(*pval);
-    }
-
-    inline v_float64x2& operator=(const v_float64x2& vec) {
-        *pval = *(vec.pval);
-        return *this;
-    }
-    inline v_float64x2(const v_float64x2& vec) {
-        *pval = *(vec.pval);
-    }
-    double val[2];
-    vfloat64m1_t* pval = (vfloat64m1_t*)val;
-};
-#endif // CV_SIMD128_64F
-#endif // __clang__
-
-//////////// Initial ////////////
-
-#define OPENCV_HAL_IMPL_RVV_INIT_INTEGER(_Tpvec, _Tp, suffix1, suffix2, vl) \
-inline v_##_Tpvec v_setzero_##suffix1() \
-{ \
-    return v_##_Tpvec(vmv_v_x_##suffix2##m1(0, vl)); \
-} \
-inline v_##_Tpvec v_setall_##suffix1(_Tp v) \
-{ \
-    return v_##_Tpvec(vmv_v_x_##suffix2##m1(v, vl)); \
-}
-
-OPENCV_HAL_IMPL_RVV_INIT_INTEGER(uint8x16, uchar, u8, u8, 16)
-OPENCV_HAL_IMPL_RVV_INIT_INTEGER(int8x16, schar, s8, i8, 16)
-OPENCV_HAL_IMPL_RVV_INIT_INTEGER(uint16x8, ushort, u16, u16, 8)
-OPENCV_HAL_IMPL_RVV_INIT_INTEGER(int16x8, short, s16, i16, 8)
-OPENCV_HAL_IMPL_RVV_INIT_INTEGER(uint32x4, unsigned, u32, u32, 4)
-OPENCV_HAL_IMPL_RVV_INIT_INTEGER(int32x4, int, s32, i32, 4)
-OPENCV_HAL_IMPL_RVV_INIT_INTEGER(uint64x2, uint64, u64, u64, 2)
-OPENCV_HAL_IMPL_RVV_INIT_INTEGER(int64x2, int64, s64, i64, 2)
-
-#define OPENCV_HAL_IMPL_RVV_INIT_FP(_Tpv, _Tp, suffix, vl) \
-inline v_##_Tpv v_setzero_##suffix() \
-{ \
-    return v_##_Tpv(vfmv_v_f_##suffix##m1(0, vl)); \
-} \
-inline v_##_Tpv v_setall_##suffix(_Tp v) \
-{ \
-    return v_##_Tpv(vfmv_v_f_##suffix##m1(v, vl)); \
-}
-
-OPENCV_HAL_IMPL_RVV_INIT_FP(float32x4, float, f32, 4)
-#if CV_SIMD128_64F
-OPENCV_HAL_IMPL_RVV_INIT_FP(float64x2, double, f64, 2)
-#endif
-
-//////////// Reinterpret ////////////
-
-#define OPENCV_HAL_IMPL_RVV_SELF_REINTERPRET(_Tpvec, suffix) \
-inline v_##_Tpvec v_reinterpret_as_##suffix(const v_##_Tpvec& v) { return v; }
-
-OPENCV_HAL_IMPL_RVV_SELF_REINTERPRET(uint8x16, u8)
-OPENCV_HAL_IMPL_RVV_SELF_REINTERPRET(int8x16, s8)
-OPENCV_HAL_IMPL_RVV_SELF_REINTERPRET(uint16x8, u16)
-OPENCV_HAL_IMPL_RVV_SELF_REINTERPRET(int16x8, s16)
-OPENCV_HAL_IMPL_RVV_SELF_REINTERPRET(uint32x4, u32)
-OPENCV_HAL_IMPL_RVV_SELF_REINTERPRET(int32x4, s32)
-OPENCV_HAL_IMPL_RVV_SELF_REINTERPRET(float32x4, f32)
-OPENCV_HAL_IMPL_RVV_SELF_REINTERPRET(uint64x2, u64)
-OPENCV_HAL_IMPL_RVV_SELF_REINTERPRET(int64x2, s64)
-#if CV_SIMD128_64F
-OPENCV_HAL_IMPL_RVV_SELF_REINTERPRET(float64x2, f64)
-#endif
-
-#define OPENCV_HAL_IMPL_RVV_NATIVE_REINTERPRET(_Tpvec1, _Tpvec2, suffix1, suffix2, nsuffix1, nsuffix2) \
-inline v_##_Tpvec1 v_reinterpret_as_##suffix1(const v_##_Tpvec2& v) \
-{ \
-    return v_##_Tpvec1(vreinterpret_v_##nsuffix2##m1_##nsuffix1##m1(v));\
-} \
-inline v_##_Tpvec2 v_reinterpret_as_##suffix2(const v_##_Tpvec1& v) \
-{ \
-    return v_##_Tpvec2(vreinterpret_v_##nsuffix1##m1_##nsuffix2##m1(v));\
-}
-
-OPENCV_HAL_IMPL_RVV_NATIVE_REINTERPRET(uint8x16, int8x16, u8, s8, u8, i8)
-OPENCV_HAL_IMPL_RVV_NATIVE_REINTERPRET(uint16x8, int16x8, u16, s16, u16, i16)
-OPENCV_HAL_IMPL_RVV_NATIVE_REINTERPRET(uint32x4, int32x4, u32, s32, u32, i32)
-OPENCV_HAL_IMPL_RVV_NATIVE_REINTERPRET(uint32x4, float32x4, u32, f32, u32, f32)
-OPENCV_HAL_IMPL_RVV_NATIVE_REINTERPRET(int32x4, float32x4, s32, f32, i32, f32)
-OPENCV_HAL_IMPL_RVV_NATIVE_REINTERPRET(uint64x2, int64x2, u64, s64, u64, i64)
-#if CV_SIMD128_64F
-OPENCV_HAL_IMPL_RVV_NATIVE_REINTERPRET(uint64x2, float64x2, u64, f64, u64, f64)
-OPENCV_HAL_IMPL_RVV_NATIVE_REINTERPRET(int64x2, float64x2, s64, f64, i64, f64)
-#endif
-OPENCV_HAL_IMPL_RVV_NATIVE_REINTERPRET(uint8x16, uint16x8, u8, u16, u8, u16)
-OPENCV_HAL_IMPL_RVV_NATIVE_REINTERPRET(uint8x16, uint32x4, u8, u32, u8, u32)
-OPENCV_HAL_IMPL_RVV_NATIVE_REINTERPRET(uint8x16, uint64x2, u8, u64, u8, u64)
-OPENCV_HAL_IMPL_RVV_NATIVE_REINTERPRET(uint16x8, uint32x4, u16, u32, u16, u32)
-OPENCV_HAL_IMPL_RVV_NATIVE_REINTERPRET(uint16x8, uint64x2, u16, u64, u16, u64)
-OPENCV_HAL_IMPL_RVV_NATIVE_REINTERPRET(uint32x4, uint64x2, u32, u64, u32, u64)
-OPENCV_HAL_IMPL_RVV_NATIVE_REINTERPRET(int8x16, int16x8, s8, s16, i8, i16)
-OPENCV_HAL_IMPL_RVV_NATIVE_REINTERPRET(int8x16, int32x4, s8, s32, i8, i32)
-OPENCV_HAL_IMPL_RVV_NATIVE_REINTERPRET(int8x16, int64x2, s8, s64, i8, i64)
-OPENCV_HAL_IMPL_RVV_NATIVE_REINTERPRET(int16x8, int32x4, s16, s32, i16, i32)
-OPENCV_HAL_IMPL_RVV_NATIVE_REINTERPRET(int16x8, int64x2, s16, s64, i16, i64)
-OPENCV_HAL_IMPL_RVV_NATIVE_REINTERPRET(int32x4, int64x2, s32, s64, i32, i64)
-
-
-#define OPENCV_HAL_IMPL_RVV_TWO_TIMES_REINTERPRET(_Tpvec1, _Tpvec2, suffix1, suffix2, nsuffix1, nsuffix2, width1, width2) \
-inline v_##_Tpvec1 v_reinterpret_as_##suffix1(const v_##_Tpvec2& v) \
-{ \
-    return v_##_Tpvec1(vreinterpret_v_##nsuffix1##width2##m1_##nsuffix1##width1##m1(vreinterpret_v_##nsuffix2##width2##m1_##nsuffix1##width2##m1(v)));\
-} \
-inline v_##_Tpvec2 v_reinterpret_as_##suffix2(const v_##_Tpvec1& v) \
-{ \
-    return v_##_Tpvec2(vreinterpret_v_##nsuffix1##width2##m1_##nsuffix2##width2##m1(vreinterpret_v_##nsuffix1##width1##m1_##nsuffix1##width2##m1(v)));\
-}
-
-OPENCV_HAL_IMPL_RVV_TWO_TIMES_REINTERPRET(uint8x16, int16x8, u8, s16, u, i, 8, 16)
-OPENCV_HAL_IMPL_RVV_TWO_TIMES_REINTERPRET(uint8x16, int32x4, u8, s32, u, i, 8, 32)
-OPENCV_HAL_IMPL_RVV_TWO_TIMES_REINTERPRET(uint8x16, int64x2, u8, s64, u, i, 8, 64)
-OPENCV_HAL_IMPL_RVV_TWO_TIMES_REINTERPRET(uint16x8, int8x16, u16, s8, u, i, 16, 8)
-OPENCV_HAL_IMPL_RVV_TWO_TIMES_REINTERPRET(uint16x8, int32x4, u16, s32, u, i, 16, 32)
-OPENCV_HAL_IMPL_RVV_TWO_TIMES_REINTERPRET(uint16x8, int64x2, u16, s64, u, i, 16, 64)
-OPENCV_HAL_IMPL_RVV_TWO_TIMES_REINTERPRET(uint32x4, int8x16, u32, s8, u, i, 32, 8)
-OPENCV_HAL_IMPL_RVV_TWO_TIMES_REINTERPRET(uint32x4, int16x8, u32, s16, u, i, 32, 16)
-OPENCV_HAL_IMPL_RVV_TWO_TIMES_REINTERPRET(uint32x4, int64x2, u32, s64, u, i, 32, 64)
-OPENCV_HAL_IMPL_RVV_TWO_TIMES_REINTERPRET(uint64x2, int8x16, u64, s8, u, i, 64, 8)
-OPENCV_HAL_IMPL_RVV_TWO_TIMES_REINTERPRET(uint64x2, int16x8, u64, s16, u, i, 64, 16)
-OPENCV_HAL_IMPL_RVV_TWO_TIMES_REINTERPRET(uint64x2, int32x4, u64, s32, u, i, 64, 32)
-OPENCV_HAL_IMPL_RVV_TWO_TIMES_REINTERPRET(uint8x16, float32x4, u8, f32, u, f, 8, 32)
-OPENCV_HAL_IMPL_RVV_TWO_TIMES_REINTERPRET(uint16x8, float32x4, u16, f32, u, f, 16, 32)
-OPENCV_HAL_IMPL_RVV_TWO_TIMES_REINTERPRET(uint64x2, float32x4, u64, f32, u, f, 64, 32)
-OPENCV_HAL_IMPL_RVV_TWO_TIMES_REINTERPRET(int8x16, float32x4, s8, f32, i, f, 8, 32)
-OPENCV_HAL_IMPL_RVV_TWO_TIMES_REINTERPRET(int16x8, float32x4, s16, f32, i, f, 16, 32)
-OPENCV_HAL_IMPL_RVV_TWO_TIMES_REINTERPRET(int64x2, float32x4, s64, f32, i, f, 64, 32)
-OPENCV_HAL_IMPL_RVV_TWO_TIMES_REINTERPRET(uint8x16, float64x2, u8, f64, u, f, 8, 64)
-OPENCV_HAL_IMPL_RVV_TWO_TIMES_REINTERPRET(uint16x8, float64x2, u16, f64, u, f, 16, 64)
-OPENCV_HAL_IMPL_RVV_TWO_TIMES_REINTERPRET(uint32x4, float64x2, u32, f64, u, f, 32, 64)
-OPENCV_HAL_IMPL_RVV_TWO_TIMES_REINTERPRET(int8x16, float64x2, s8, f64, i, f, 8, 64)
-OPENCV_HAL_IMPL_RVV_TWO_TIMES_REINTERPRET(int16x8, float64x2, s16, f64, i, f, 16, 64)
-OPENCV_HAL_IMPL_RVV_TWO_TIMES_REINTERPRET(int32x4, float64x2, s32, f64, i, f, 32, 64)
-
-// Three times reinterpret
-inline v_float32x4 v_reinterpret_as_f32(const v_float64x2& v) \
-{ \
-    return v_float32x4(vreinterpret_v_u32m1_f32m1(vreinterpret_v_u64m1_u32m1(vreinterpret_v_f64m1_u64m1(v))));\
-} \
-inline v_float64x2 v_reinterpret_as_f64(const v_float32x4& v) \
-{ \
-    return v_float64x2(vreinterpret_v_u64m1_f64m1(vreinterpret_v_u32m1_u64m1(vreinterpret_v_f32m1_u32m1(v))));\
-}
-
-////////////// Extract //////////////
-
-#define OPENCV_HAL_IMPL_RVV_EXTRACT_INTEGER(_Tpvec, _Tp, suffix, vmv, vl) \
-template <int s> \
-inline _Tpvec v_extract(const _Tpvec& a, const _Tpvec& b) \
-{ \
-    return _Tpvec(vslideup_vx_##suffix##m1(vslidedown_vx_##suffix##m1(vmv_v_x_##suffix##m1(0, vl), a, s, vl), b, _Tpvec::nlanes - s, vl)); \
-} \
-template<int i> inline _Tp v_extract_n(_Tpvec v) \
-{ \
-    return _Tp(vmv(vslidedown_vx_##suffix##m1(vmv_v_x_##suffix##m1(0, vl), v, i, vl))); \
-}
-
-
-OPENCV_HAL_IMPL_RVV_EXTRACT_INTEGER(v_uint8x16, uchar, u8, vmv_x_s_u8m1_u8, 16)
-OPENCV_HAL_IMPL_RVV_EXTRACT_INTEGER(v_int8x16, schar, i8, vmv_x_s_i8m1_i8, 16)
-OPENCV_HAL_IMPL_RVV_EXTRACT_INTEGER(v_uint16x8, ushort, u16, vmv_x_s_u16m1_u16, 8)
-OPENCV_HAL_IMPL_RVV_EXTRACT_INTEGER(v_int16x8, short, i16, vmv_x_s_i16m1_i16, 8)
-OPENCV_HAL_IMPL_RVV_EXTRACT_INTEGER(v_uint32x4, uint, u32, vmv_x_s_u32m1_u32, 4)
-OPENCV_HAL_IMPL_RVV_EXTRACT_INTEGER(v_int32x4, int, i32, vmv_x_s_i32m1_i32, 4)
-OPENCV_HAL_IMPL_RVV_EXTRACT_INTEGER(v_uint64x2, uint64, u64, vmv_x_s_u64m1_u64, 2)
-OPENCV_HAL_IMPL_RVV_EXTRACT_INTEGER(v_int64x2, int64, i64, vmv_x_s_i64m1_i64, 2)
-
-#define OPENCV_HAL_IMPL_RVV_EXTRACT_FP(_Tpvec, _Tp, suffix, vmv, vl) \
-template <int s> \
-inline _Tpvec v_extract(const _Tpvec& a, const _Tpvec& b) \
-{ \
-    return _Tpvec(vslideup_vx_##suffix##m1(vslidedown_vx_##suffix##m1(vfmv_v_f_##suffix##m1(0, vl), a, s, vl), b, _Tpvec::nlanes - s, vl)); \
-} \
-template<int i> inline _Tp v_extract_n(_Tpvec v) \
-{ \
-    return _Tp(vmv(vslidedown_vx_##suffix##m1(vfmv_v_f_##suffix##m1(0, vl), v, i, vl))); \
-}
-
-OPENCV_HAL_IMPL_RVV_EXTRACT_FP(v_float32x4, float, f32, vfmv_f_s_f32m1_f32, 4)
-#if CV_SIMD128_64F
-OPENCV_HAL_IMPL_RVV_EXTRACT_FP(v_float64x2, double, f64, vfmv_f_s_f64m1_f64, 2)
-#endif
-
-////////////// Load/Store //////////////
-
-#define OPENCV_HAL_IMPL_RVV_LOADSTORE_OP(_Tpvec, _nTpvec, _Tp, hvl, vl, width, suffix, vmv) \
-inline _Tpvec v_load(const _Tp* ptr) \
-{ \
-    return _Tpvec(vle##width##_v_##suffix##m1(ptr, vl)); \
-} \
-inline _Tpvec v_load_aligned(const _Tp* ptr) \
-{ \
-    return _Tpvec(vle##width##_v_##suffix##m1(ptr, vl)); \
-} \
-inline _Tpvec v_load_low(const _Tp* ptr) \
-{ \
-    _Tpvec res = _Tpvec(vle##width##_v_##suffix##m1(ptr, hvl)); \
-    return res; \
-} \
-inline void v_store(_Tp* ptr, const _Tpvec& a) \
-{ \
-    vse##width##_v_##suffix##m1(ptr, a, vl); \
-} \
-inline void v_store_aligned(_Tp* ptr, const _Tpvec& a) \
-{ \
-    vse##width##_v_##suffix##m1(ptr, a, vl); \
-} \
-inline void v_store_aligned_nocache(_Tp* ptr, const _Tpvec& a) \
-{ \
-    vse##width##_v_##suffix##m1(ptr, a, vl); \
-} \
-inline void v_store(_Tp* ptr, const _Tpvec& a, hal::StoreMode /*mode*/) \
-{ \
-    vse##width##_v_##suffix##m1(ptr, a, vl); \
-} \
-inline void v_store_low(_Tp* ptr, const _Tpvec& a) \
-{ \
-    vse##width##_v_##suffix##m1(ptr, a, hvl); \
-} \
-inline void v_store_high(_Tp* ptr, const _Tpvec& a) \
-{ \
-    vse##width##_v_##suffix##m1(ptr, vslidedown_vx_##suffix##m1(vmv(0, vl), a, hvl, vl), hvl); \
-}
-
-OPENCV_HAL_IMPL_RVV_LOADSTORE_OP(v_uint8x16, vuint8m1_t, uchar, 8, 16, 8, u8, vmv_v_x_u8m1)
-OPENCV_HAL_IMPL_RVV_LOADSTORE_OP(v_int8x16, vint8m1_t, schar, 8, 16, 8, i8, vmv_v_x_i8m1)
-OPENCV_HAL_IMPL_RVV_LOADSTORE_OP(v_uint16x8, vuint16m1_t, ushort, 4, 8, 16, u16, vmv_v_x_u16m1)
-OPENCV_HAL_IMPL_RVV_LOADSTORE_OP(v_int16x8, vint16m1_t, short, 4, 8, 16, i16, vmv_v_x_i16m1)
-OPENCV_HAL_IMPL_RVV_LOADSTORE_OP(v_uint32x4, vuint32m1_t, unsigned, 2, 4, 32, u32, vmv_v_x_u32m1)
-OPENCV_HAL_IMPL_RVV_LOADSTORE_OP(v_int32x4, vint32m1_t, int, 2, 4, 32, i32, vmv_v_x_i32m1)
-OPENCV_HAL_IMPL_RVV_LOADSTORE_OP(v_uint64x2, vuint64m1_t, uint64, 1, 2, 64, u64, vmv_v_x_u64m1)
-OPENCV_HAL_IMPL_RVV_LOADSTORE_OP(v_int64x2, vint64m1_t, int64, 1, 2, 64, i64, vmv_v_x_i64m1)
-OPENCV_HAL_IMPL_RVV_LOADSTORE_OP(v_float32x4, vfloat32m1_t, float, 2, 4, 32, f32, vfmv_v_f_f32m1)
-#if CV_SIMD128_64F
-OPENCV_HAL_IMPL_RVV_LOADSTORE_OP(v_float64x2, vfloat64m1_t, double, 1, 2, 64, f64, vfmv_v_f_f64m1)
-#endif
-
-inline v_int8x16 v_load_halves(const schar* ptr0, const schar* ptr1)
-{
-    schar elems[16] =
-    {
-        ptr0[0], ptr0[1], ptr0[2], ptr0[3], ptr0[4], ptr0[5], ptr0[6], ptr0[7],
-        ptr1[0], ptr1[1], ptr1[2], ptr1[3], ptr1[4], ptr1[5], ptr1[6], ptr1[7]
-    };
-    return v_int8x16(vle8_v_i8m1(elems, 16));
-}
-inline v_uint8x16 v_load_halves(const uchar* ptr0, const uchar* ptr1) { return v_reinterpret_as_u8(v_load_halves((schar*)ptr0, (schar*)ptr1)); }
-
-inline v_int16x8 v_load_halves(const short* ptr0, const short* ptr1)
-{
-    short elems[8] =
-    {
-        ptr0[0], ptr0[1], ptr0[2], ptr0[3], ptr1[0], ptr1[1], ptr1[2], ptr1[3]
-    };
-    return v_int16x8(vle16_v_i16m1(elems, 8));
-}
-inline v_uint16x8 v_load_halves(const ushort* ptr0, const ushort* ptr1) { return v_reinterpret_as_u16(v_load_halves((short*)ptr0, (short*)ptr1)); }
-
-inline v_int32x4 v_load_halves(const int* ptr0, const int* ptr1)
-{
-    int elems[4] =
-    {
-        ptr0[0], ptr0[1], ptr1[0], ptr1[1]
-    };
-    return v_int32x4(vle32_v_i32m1(elems, 4));
-}
-inline v_float32x4 v_load_halves(const float* ptr0, const float* ptr1)
-{
-    float elems[4] =
-    {
-        ptr0[0], ptr0[1], ptr1[0], ptr1[1]
-    };
-    return v_float32x4(vle32_v_f32m1(elems, 4));
-}
-inline v_uint32x4 v_load_halves(const unsigned* ptr0, const unsigned* ptr1) { return v_reinterpret_as_u32(v_load_halves((int*)ptr0, (int*)ptr1)); }
-
-inline v_int64x2 v_load_halves(const int64* ptr0, const int64* ptr1)
-{
-    int64 elems[2] =
-    {
-        ptr0[0], ptr1[0]
-    };
-    return v_int64x2(vle64_v_i64m1(elems, 2));
-}
-inline v_uint64x2 v_load_halves(const uint64* ptr0, const uint64* ptr1) { return v_reinterpret_as_u64(v_load_halves((int64*)ptr0, (int64*)ptr1)); }
-
-#if CV_SIMD128_64F
-inline v_float64x2 v_load_halves(const double* ptr0, const double* ptr1)
-{
-    double elems[2] =
-    {
-        ptr0[0], ptr1[0]
-    };
-    return v_float64x2(vle64_v_f64m1(elems, 2));
-}
-#endif
-
-
-////////////// Lookup table access ////////////////////
-
-inline v_int8x16 v_lut(const schar* tab, const int* idx)
-{
-    schar elems[16] =
-    {
-        tab[idx[ 0]],
-        tab[idx[ 1]],
-        tab[idx[ 2]],
-        tab[idx[ 3]],
-        tab[idx[ 4]],
-        tab[idx[ 5]],
-        tab[idx[ 6]],
-        tab[idx[ 7]],
-        tab[idx[ 8]],
-        tab[idx[ 9]],
-        tab[idx[10]],
-        tab[idx[11]],
-        tab[idx[12]],
-        tab[idx[13]],
-        tab[idx[14]],
-        tab[idx[15]]
-    };
-    return v_int8x16(vle8_v_i8m1(elems, 16));
-}
-inline v_int8x16 v_lut_pairs(const schar* tab, const int* idx)
-{
-    schar elems[16] =
-    {
-        tab[idx[0]],
-        tab[idx[0] + 1],
-        tab[idx[1]],
-        tab[idx[1] + 1],
-        tab[idx[2]],
-        tab[idx[2] + 1],
-        tab[idx[3]],
-        tab[idx[3] + 1],
-        tab[idx[4]],
-        tab[idx[4] + 1],
-        tab[idx[5]],
-        tab[idx[5] + 1],
-        tab[idx[6]],
-        tab[idx[6] + 1],
-        tab[idx[7]],
-        tab[idx[7] + 1]
-    };
-    return v_int8x16(vle8_v_i8m1(elems, 16));
-}
-inline v_int8x16 v_lut_quads(const schar* tab, const int* idx)
-{
-    schar elems[16] =
-    {
-        tab[idx[0]],
-        tab[idx[0] + 1],
-        tab[idx[0] + 2],
-        tab[idx[0] + 3],
-        tab[idx[1]],
-        tab[idx[1] + 1],
-        tab[idx[1] + 2],
-        tab[idx[1] + 3],
-        tab[idx[2]],
-        tab[idx[2] + 1],
-        tab[idx[2] + 2],
-        tab[idx[2] + 3],
-        tab[idx[3]],
-        tab[idx[3] + 1],
-        tab[idx[3] + 2],
-        tab[idx[3] + 3]
-    };
-    return v_int8x16(vle8_v_i8m1(elems, 16));
-}
-inline v_uint8x16 v_lut(const uchar* tab, const int* idx) { return v_reinterpret_as_u8(v_lut((schar*)tab, idx)); }
-inline v_uint8x16 v_lut_pairs(const uchar* tab, const int* idx) { return v_reinterpret_as_u8(v_lut_pairs((schar*)tab, idx)); }
-inline v_uint8x16 v_lut_quads(const uchar* tab, const int* idx) { return v_reinterpret_as_u8(v_lut_quads((schar*)tab, idx)); }
-
-inline v_int16x8 v_lut(const short* tab, const int* idx)
-{
-    short elems[8] =
-    {
-        tab[idx[0]],
-        tab[idx[1]],
-        tab[idx[2]],
-        tab[idx[3]],
-        tab[idx[4]],
-        tab[idx[5]],
-        tab[idx[6]],
-        tab[idx[7]]
-    };
-    return v_int16x8(vle16_v_i16m1(elems, 8));
-}
-inline v_int16x8 v_lut_pairs(const short* tab, const int* idx)
-{
-    short elems[8] =
-    {
-        tab[idx[0]],
-        tab[idx[0] + 1],
-        tab[idx[1]],
-        tab[idx[1] + 1],
-        tab[idx[2]],
-        tab[idx[2] + 1],
-        tab[idx[3]],
-        tab[idx[3] + 1]
-    };
-    return v_int16x8(vle16_v_i16m1(elems, 8));
-}
-inline v_int16x8 v_lut_quads(const short* tab, const int* idx)
-{
-    short elems[8] =
-    {
-        tab[idx[0]],
-        tab[idx[0] + 1],
-        tab[idx[0] + 2],
-        tab[idx[0] + 3],
-        tab[idx[1]],
-        tab[idx[1] + 1],
-        tab[idx[1] + 2],
-        tab[idx[1] + 3]
-    };
-    return v_int16x8(vle16_v_i16m1(elems, 8));
-}
-inline v_uint16x8 v_lut(const ushort* tab, const int* idx) { return v_reinterpret_as_u16(v_lut((short*)tab, idx)); }
-inline v_uint16x8 v_lut_pairs(const ushort* tab, const int* idx) { return v_reinterpret_as_u16(v_lut_pairs((short*)tab, idx)); }
-inline v_uint16x8 v_lut_quads(const ushort* tab, const int* idx) { return v_reinterpret_as_u16(v_lut_quads((short*)tab, idx)); }
-
-inline v_int32x4 v_lut(const int* tab, const int* idx)
-{
-    int elems[4] =
-    {
-        tab[idx[0]],
-        tab[idx[1]],
-        tab[idx[2]],
-        tab[idx[3]]
-    };
-    return v_int32x4(vle32_v_i32m1(elems, 4));
-}
-inline v_int32x4 v_lut_pairs(const int* tab, const int* idx)
-{
-    int elems[4] =
-    {
-        tab[idx[0]],
-        tab[idx[0] + 1],
-        tab[idx[1]],
-        tab[idx[1] + 1]
-    };
-    return v_int32x4(vle32_v_i32m1(elems, 4));
-}
-inline v_int32x4 v_lut_quads(const int* tab, const int* idx)
-{
-    return v_int32x4(vle32_v_i32m1(tab + idx[0], 4));
-}
-
-inline v_uint32x4 v_lut(const unsigned* tab, const int* idx) { return v_reinterpret_as_u32(v_lut((int*)tab, idx)); }
-inline v_uint32x4 v_lut_pairs(const unsigned* tab, const int* idx) { return v_reinterpret_as_u32(v_lut_pairs((int*)tab, idx)); }
-inline v_uint32x4 v_lut_quads(const unsigned* tab, const int* idx) { return v_reinterpret_as_u32(v_lut_quads((int*)tab, idx)); }
-
-inline v_int64x2 v_lut(const int64_t* tab, const int* idx)
-{
-    int64_t elems[2] =
-    {
-        tab[idx[0]],
-        tab[idx[1]]
-    };
-    return v_int64x2(vle64_v_i64m1(elems, 2));
-}
-inline v_int64x2 v_lut_pairs(const int64* tab, const int* idx)
-{
-    return v_int64x2(vle64_v_i64m1(tab + idx[0], 2));
-}
-inline v_uint64x2 v_lut(const uint64* tab, const int* idx) { return v_reinterpret_as_u64(v_lut((const int64_t *)tab, idx)); }
-inline v_uint64x2 v_lut_pairs(const uint64* tab, const int* idx) { return v_reinterpret_as_u64(v_lut_pairs((const int64_t *)tab, idx)); }
-
-inline v_float32x4 v_lut(const float* tab, const int* idx)
-{
-    float elems[4] =
-    {
-        tab[idx[0]],
-        tab[idx[1]],
-        tab[idx[2]],
-        tab[idx[3]]
-    };
-    return v_float32x4(vle32_v_f32m1(elems, 4));
-}
-inline v_float32x4 v_lut_pairs(const float* tab, const int* idx)
-{
-    float elems[4] =
-    {
-        tab[idx[0]],
-        tab[idx[0] + 1],
-        tab[idx[1]],
-        tab[idx[1] + 1]
-    };
-    return v_float32x4(vle32_v_f32m1(elems, 4));
-}
-inline v_float32x4 v_lut_quads(const float* tab, const int* idx)
-{
-    return v_float32x4(vle32_v_f32m1(tab + idx[0], 4));
-}
-
-inline v_int32x4 v_lut(const int* tab, const v_int32x4& idxvec)
-{
-    int elems[4] =
-    {
-        tab[v_extract_n<0>(idxvec)],
-        tab[v_extract_n<1>(idxvec)],
-        tab[v_extract_n<2>(idxvec)],
-        tab[v_extract_n<3>(idxvec)]
-    };
-    return v_int32x4(vle32_v_i32m1(elems, 4));
-}
-
-inline v_uint32x4 v_lut(const unsigned* tab, const v_int32x4& idxvec)
-{
-    unsigned elems[4] =
-    {
-        tab[v_extract_n<0>(idxvec)],
-        tab[v_extract_n<1>(idxvec)],
-        tab[v_extract_n<2>(idxvec)],
-        tab[v_extract_n<3>(idxvec)]
-    };
-    return v_uint32x4(vle32_v_u32m1(elems, 4));
-}
-
-inline v_float32x4 v_lut(const float* tab, const v_int32x4& idxvec)
-{
-    float elems[4] =
-    {
-        tab[v_extract_n<0>(idxvec)],
-        tab[v_extract_n<1>(idxvec)],
-        tab[v_extract_n<2>(idxvec)],
-        tab[v_extract_n<3>(idxvec)]
-    };
-    return v_float32x4(vle32_v_f32m1(elems, 4));
-}
-
-inline void v_lut_deinterleave(const float* tab, const v_int32x4& idxvec, v_float32x4& x, v_float32x4& y)
-{
-    int idx[4];
-    v_store_aligned(idx, idxvec);
-
-    x = v_float32x4(tab[idx[0]], tab[idx[1]], tab[idx[2]], tab[idx[3]]);
-    y = v_float32x4(tab[idx[0]+1], tab[idx[1]+1], tab[idx[2]+1], tab[idx[3]+1]);
-}
-
-#if CV_SIMD128_64F
-inline v_float64x2 v_lut(const double* tab, const int* idx)
-{
-    double elems[2] =
-    {
-        tab[idx[0]],
-        tab[idx[1]]
-    };
-    return v_float64x2(vle64_v_f64m1(elems, 2));
-}
-
-inline v_float64x2 v_lut_pairs(const double* tab, const int* idx)
-{
-    return v_float64x2(vle64_v_f64m1(tab + idx[0], 2));
-}
-
-inline v_float64x2 v_lut(const double* tab, const v_int32x4& idxvec)
-{
-    double elems[2] =
-    {
-        tab[v_extract_n<0>(idxvec)],
-        tab[v_extract_n<1>(idxvec)]
-    };
-    return v_float64x2(vle64_v_f64m1(elems, 2));
-}
-
-inline void v_lut_deinterleave(const double* tab, const v_int32x4& idxvec, v_float64x2& x, v_float64x2& y)
-{
-    int idx[4] = {0};
-    v_store_aligned(idx, idxvec);
-
-    x = v_float64x2(tab[idx[0]], tab[idx[1]]);
-    y = v_float64x2(tab[idx[0]+1], tab[idx[1]+1]);
-}
-#endif
-
-////////////// Pack boolean ////////////////////
-
-inline v_uint8x16 v_pack_b(const v_uint16x8& a, const v_uint16x8& b)
-{
-    ushort ptr[16] = {0};
-    v_store(ptr, a);
-    v_store(ptr + 8, b);
-    return v_uint8x16(vnsrl_wx_u8m1(vle16_v_u16m2(ptr, 16), 0, 16));
-}
-
-inline v_uint8x16 v_pack_b(const v_uint32x4& a, const v_uint32x4& b,
-                           const v_uint32x4& c, const v_uint32x4& d)
-{
-    unsigned ptr[16] = {0};
-    v_store(ptr, a);
-    v_store(ptr + 4, b);
-    v_store(ptr + 8, c);
-    v_store(ptr + 12, d);
-    return v_uint8x16(vnsrl_wx_u8m1(vnsrl_wx_u16m2(vle32_v_u32m4(ptr, 16), 0, 16), 0, 16));
-}
-
-inline v_uint8x16 v_pack_b(const v_uint64x2& a, const v_uint64x2& b, const v_uint64x2& c,
-                           const v_uint64x2& d, const v_uint64x2& e, const v_uint64x2& f,
-                           const v_uint64x2& g, const v_uint64x2& h)
-{
-    uint64 ptr[16] = {0};
-    v_store(ptr, a);
-    v_store(ptr + 2, b);
-    v_store(ptr + 4, c);
-    v_store(ptr + 6, d);
-    v_store(ptr + 8, e);
-    v_store(ptr + 10, f);
-    v_store(ptr + 12, g);
-    v_store(ptr + 14, h);
-    return v_uint8x16(vnsrl_wx_u8m1(vnsrl_wx_u16m2(vnsrl_wx_u32m4(vle64_v_u64m8(ptr, 16), 0, 16), 0, 16), 0, 16));
-}
-
-////////////// Arithmetics //////////////
-#define OPENCV_HAL_IMPL_RVV_BIN_OP(bin_op, _Tpvec, intrin, vl) \
-inline _Tpvec operator bin_op (const _Tpvec& a, const _Tpvec& b) \
-{ \
-    return _Tpvec(intrin(a, b, vl)); \
-} \
-inline _Tpvec& operator bin_op##= (_Tpvec& a, const _Tpvec& b) \
-{ \
-    a = _Tpvec(intrin(a, b, vl)); \
-    return a; \
-}
-
-OPENCV_HAL_IMPL_RVV_BIN_OP(+, v_uint8x16, vsaddu_vv_u8m1, 16)
-OPENCV_HAL_IMPL_RVV_BIN_OP(-, v_uint8x16, vssubu_vv_u8m1, 16)
-OPENCV_HAL_IMPL_RVV_BIN_OP(/, v_uint8x16, vdivu_vv_u8m1, 16)
-OPENCV_HAL_IMPL_RVV_BIN_OP(+, v_int8x16, vsadd_vv_i8m1, 16)
-OPENCV_HAL_IMPL_RVV_BIN_OP(-, v_int8x16, vssub_vv_i8m1, 16)
-OPENCV_HAL_IMPL_RVV_BIN_OP(/, v_int8x16, vdiv_vv_i8m1, 16)
-OPENCV_HAL_IMPL_RVV_BIN_OP(+, v_uint16x8, vsaddu_vv_u16m1, 8)
-OPENCV_HAL_IMPL_RVV_BIN_OP(-, v_uint16x8, vssubu_vv_u16m1, 8)
-OPENCV_HAL_IMPL_RVV_BIN_OP(/, v_uint16x8, vdivu_vv_u16m1, 8)
-OPENCV_HAL_IMPL_RVV_BIN_OP(+, v_int16x8, vsadd_vv_i16m1, 8)
-OPENCV_HAL_IMPL_RVV_BIN_OP(-, v_int16x8, vssub_vv_i16m1, 8)
-OPENCV_HAL_IMPL_RVV_BIN_OP(/, v_int16x8, vdiv_vv_i16m1, 8)
-OPENCV_HAL_IMPL_RVV_BIN_OP(+, v_uint32x4, vadd_vv_u32m1, 4)
-OPENCV_HAL_IMPL_RVV_BIN_OP(-, v_uint32x4, vsub_vv_u32m1, 4)
-OPENCV_HAL_IMPL_RVV_BIN_OP(*, v_uint32x4, vmul_vv_u32m1, 4)
-OPENCV_HAL_IMPL_RVV_BIN_OP(/, v_uint32x4, vdivu_vv_u32m1, 4)
-OPENCV_HAL_IMPL_RVV_BIN_OP(+, v_int32x4, vadd_vv_i32m1, 4)
-OPENCV_HAL_IMPL_RVV_BIN_OP(-, v_int32x4, vsub_vv_i32m1, 4)
-OPENCV_HAL_IMPL_RVV_BIN_OP(*, v_int32x4, vmul_vv_i32m1, 4)
-OPENCV_HAL_IMPL_RVV_BIN_OP(/, v_int32x4, vdiv_vv_i32m1, 4)
-OPENCV_HAL_IMPL_RVV_BIN_OP(+, v_float32x4, vfadd_vv_f32m1, 4)
-OPENCV_HAL_IMPL_RVV_BIN_OP(-, v_float32x4, vfsub_vv_f32m1, 4)
-OPENCV_HAL_IMPL_RVV_BIN_OP(*, v_float32x4, vfmul_vv_f32m1, 4)
-OPENCV_HAL_IMPL_RVV_BIN_OP(/, v_float32x4, vfdiv_vv_f32m1, 4)
-OPENCV_HAL_IMPL_RVV_BIN_OP(+, v_uint64x2, vadd_vv_u64m1, 2)
-OPENCV_HAL_IMPL_RVV_BIN_OP(-, v_uint64x2, vsub_vv_u64m1, 2)
-OPENCV_HAL_IMPL_RVV_BIN_OP(*, v_uint64x2, vmul_vv_u64m1, 2)
-OPENCV_HAL_IMPL_RVV_BIN_OP(/, v_uint64x2, vdivu_vv_u64m1, 2)
-OPENCV_HAL_IMPL_RVV_BIN_OP(+, v_int64x2, vadd_vv_i64m1, 2)
-OPENCV_HAL_IMPL_RVV_BIN_OP(-, v_int64x2, vsub_vv_i64m1, 2)
-OPENCV_HAL_IMPL_RVV_BIN_OP(*, v_int64x2, vmul_vv_i64m1, 2)
-OPENCV_HAL_IMPL_RVV_BIN_OP(/, v_int64x2, vdiv_vv_i64m1, 2)
-#if CV_SIMD128_64F
-OPENCV_HAL_IMPL_RVV_BIN_OP(+, v_float64x2, vfadd_vv_f64m1, 2)
-OPENCV_HAL_IMPL_RVV_BIN_OP(-, v_float64x2, vfsub_vv_f64m1, 2)
-OPENCV_HAL_IMPL_RVV_BIN_OP(*, v_float64x2, vfmul_vv_f64m1, 2)
-OPENCV_HAL_IMPL_RVV_BIN_OP(/, v_float64x2, vfdiv_vv_f64m1, 2)
-#endif
-
-
-////////////// Bitwise logic //////////////
-
-#define OPENCV_HAL_IMPL_RVV_LOGIC_OP(_Tpvec, suffix, vl) \
-OPENCV_HAL_IMPL_RVV_BIN_OP(&, _Tpvec, vand_vv_##suffix##m1, vl) \
-OPENCV_HAL_IMPL_RVV_BIN_OP(|, _Tpvec, vor_vv_##suffix##m1, vl) \
-OPENCV_HAL_IMPL_RVV_BIN_OP(^, _Tpvec, vxor_vv_##suffix##m1, vl) \
-inline _Tpvec operator ~ (const _Tpvec& a) \
-{ \
-    return _Tpvec(vnot_v_##suffix##m1(a, vl)); \
-}
-
-OPENCV_HAL_IMPL_RVV_LOGIC_OP(v_uint8x16, u8, 16)
-OPENCV_HAL_IMPL_RVV_LOGIC_OP(v_int8x16, i8, 16)
-OPENCV_HAL_IMPL_RVV_LOGIC_OP(v_uint16x8, u16, 8)
-OPENCV_HAL_IMPL_RVV_LOGIC_OP(v_int16x8, i16, 8)
-OPENCV_HAL_IMPL_RVV_LOGIC_OP(v_uint32x4, u32, 4)
-OPENCV_HAL_IMPL_RVV_LOGIC_OP(v_int32x4, i32, 4)
-OPENCV_HAL_IMPL_RVV_LOGIC_OP(v_uint64x2, u64, 2)
-OPENCV_HAL_IMPL_RVV_LOGIC_OP(v_int64x2, i64, 2)
-
-#define OPENCV_HAL_IMPL_RVV_FLT_BIT_OP(bin_op, intrin) \
-inline v_float32x4 operator bin_op (const v_float32x4& a, const v_float32x4& b) \
-{ \
-    return v_float32x4(vreinterpret_v_i32m1_f32m1(intrin(vreinterpret_v_f32m1_i32m1(a), vreinterpret_v_f32m1_i32m1(b), 4))); \
-} \
-inline v_float32x4& operator bin_op##= (v_float32x4& a, const v_float32x4& b) \
-{ \
-    a = v_float32x4(vreinterpret_v_i32m1_f32m1(intrin(vreinterpret_v_f32m1_i32m1(a), vreinterpret_v_f32m1_i32m1(b), 4))); \
-    return a; \
-}
-
-OPENCV_HAL_IMPL_RVV_FLT_BIT_OP(&, vand_vv_i32m1)
-OPENCV_HAL_IMPL_RVV_FLT_BIT_OP(|, vor_vv_i32m1)
-OPENCV_HAL_IMPL_RVV_FLT_BIT_OP(^, vxor_vv_i32m1)
-
-inline v_float32x4 operator ~ (const v_float32x4& a)
-{
-    return v_float32x4(vreinterpret_v_i32m1_f32m1(vnot_v_i32m1(vreinterpret_v_f32m1_i32m1(a), 4)));
-}
-
-#if CV_SIMD128_64F
-#define OPENCV_HAL_IMPL_RVV_FLT64_BIT_OP(bin_op, intrin) \
-inline v_float64x2 operator bin_op (const v_float64x2& a, const v_float64x2& b) \
-{ \
-    return v_float64x2(vreinterpret_v_i64m1_f64m1(intrin(vreinterpret_v_f64m1_i64m1(a), vreinterpret_v_f64m1_i64m1(b), 2))); \
-} \
-inline v_float64x2& operator bin_op##= (v_float64x2& a, const v_float64x2& b) \
-{ \
-    a = v_float64x2(vreinterpret_v_i64m1_f64m1(intrin(vreinterpret_v_f64m1_i64m1(a), vreinterpret_v_f64m1_i64m1(b), 2))); \
-    return a; \
-}
-
-OPENCV_HAL_IMPL_RVV_FLT64_BIT_OP(&, vand_vv_i64m1)
-OPENCV_HAL_IMPL_RVV_FLT64_BIT_OP(|, vor_vv_i64m1)
-OPENCV_HAL_IMPL_RVV_FLT64_BIT_OP(^, vxor_vv_i64m1)
-
-inline v_float64x2 operator ~ (const v_float64x2& a)
-{
-    return v_float64x2(vreinterpret_v_i64m1_f64m1(vnot_v_i64m1(vreinterpret_v_f64m1_i64m1(a), 2)));
-}
-#endif
-
-////////////// Bitwise shifts //////////////
-
-#define OPENCV_HAL_IMPL_RVV_UNSIGNED_SHIFT_OP(_Tpvec, suffix, vl) \
-inline _Tpvec operator << (const _Tpvec& a, int n) \
-{ \
-    return _Tpvec(vsll_vx_##suffix##m1(a, uint8_t(n), vl)); \
-} \
-inline _Tpvec operator >> (const _Tpvec& a, int n) \
-{ \
-    return _Tpvec(vsrl_vx_##suffix##m1(a, uint8_t(n), vl)); \
-} \
-template<int n> inline _Tpvec v_shl(const _Tpvec& a) \
-{ \
-    return _Tpvec(vsll_vx_##suffix##m1(a, uint8_t(n), vl)); \
-} \
-template<int n> inline _Tpvec v_shr(const _Tpvec& a) \
-{ \
-    return _Tpvec(vsrl_vx_##suffix##m1(a, uint8_t(n), vl)); \
-}
-
-#define OPENCV_HAL_IMPL_RVV_SIGNED_SHIFT_OP(_Tpvec, suffix, vl) \
-inline _Tpvec operator << (const _Tpvec& a, int n) \
-{ \
-    return _Tpvec(vsll_vx_##suffix##m1(a, uint8_t(n), vl)); \
-} \
-inline _Tpvec operator >> (const _Tpvec& a, int n) \
-{ \
-    return _Tpvec(vsra_vx_##suffix##m1(a, uint8_t(n), vl)); \
-} \
-template<int n> inline _Tpvec v_shl(const _Tpvec& a) \
-{ \
-    return _Tpvec(vsll_vx_##suffix##m1(a, uint8_t(n), vl)); \
-} \
-template<int n> inline _Tpvec v_shr(const _Tpvec& a) \
-{ \
-    return _Tpvec(vsra_vx_##suffix##m1(a, uint8_t(n), vl)); \
-}
-
-OPENCV_HAL_IMPL_RVV_UNSIGNED_SHIFT_OP(v_uint8x16, u8, 16)
-OPENCV_HAL_IMPL_RVV_UNSIGNED_SHIFT_OP(v_uint16x8, u16, 8)
-OPENCV_HAL_IMPL_RVV_UNSIGNED_SHIFT_OP(v_uint32x4, u32, 4)
-OPENCV_HAL_IMPL_RVV_UNSIGNED_SHIFT_OP(v_uint64x2, u64, 2)
-OPENCV_HAL_IMPL_RVV_SIGNED_SHIFT_OP(v_int8x16, i8, 16)
-OPENCV_HAL_IMPL_RVV_SIGNED_SHIFT_OP(v_int16x8, i16, 8)
-OPENCV_HAL_IMPL_RVV_SIGNED_SHIFT_OP(v_int32x4, i32, 4)
-OPENCV_HAL_IMPL_RVV_SIGNED_SHIFT_OP(v_int64x2, i64, 2)
-
-
-////////////// Comparison //////////////
-
-#define OPENCV_HAL_IMPL_RVV_INT_CMP_OP(_Tpvec, op, intrin, suffix, vl) \
-inline _Tpvec operator op (const _Tpvec& a, const _Tpvec& b) \
-{ \
-    uint64_t ones = -1; \
-    return _Tpvec(vmerge_vxm_##suffix##m1(intrin(a, b, vl), vmv_v_x_##suffix##m1(0, vl), ones, vl)); \
-}
-
-#define OPENCV_HAL_IMPL_RVV_FLOAT_CMP_OP(_Tpvec, op, intrin, suffix, vl) \
-inline _Tpvec operator op (const _Tpvec& a, const _Tpvec& b) \
-{ \
-    union { uint64 u; double d; } ones; ones.u = -1; \
-    return _Tpvec(vfmerge_vfm_##suffix##m1(intrin(a, b, vl), vfmv_v_f_##suffix##m1(0, vl), ones.d, vl)); \
-}
-
-#define OPENCV_HAL_IMPL_RVV_UNSIGNED_CMP(_Tpvec, suffix, width, vl) \
-OPENCV_HAL_IMPL_RVV_INT_CMP_OP(_Tpvec, ==, vmseq_vv_##suffix##m1_b##width, suffix, vl) \
-OPENCV_HAL_IMPL_RVV_INT_CMP_OP(_Tpvec, !=, vmsne_vv_##suffix##m1_b##width, suffix, vl) \
-OPENCV_HAL_IMPL_RVV_INT_CMP_OP(_Tpvec, <, vmsltu_vv_##suffix##m1_b##width, suffix, vl) \
-OPENCV_HAL_IMPL_RVV_INT_CMP_OP(_Tpvec, >, vmsgtu_vv_##suffix##m1_b##width, suffix, vl) \
-OPENCV_HAL_IMPL_RVV_INT_CMP_OP(_Tpvec, <=, vmsleu_vv_##suffix##m1_b##width, suffix, vl) \
-OPENCV_HAL_IMPL_RVV_INT_CMP_OP(_Tpvec, >=, vmsgeu_vv_##suffix##m1_b##width, suffix, vl)
-
-#define OPENCV_HAL_IMPL_RVV_SIGNED_CMP(_Tpvec, suffix, width, vl) \
-OPENCV_HAL_IMPL_RVV_INT_CMP_OP(_Tpvec, ==, vmseq_vv_##suffix##m1_b##width, suffix, vl) \
-OPENCV_HAL_IMPL_RVV_INT_CMP_OP(_Tpvec, !=, vmsne_vv_##suffix##m1_b##width, suffix, vl) \
-OPENCV_HAL_IMPL_RVV_INT_CMP_OP(_Tpvec, <, vmslt_vv_##suffix##m1_b##width, suffix, vl) \
-OPENCV_HAL_IMPL_RVV_INT_CMP_OP(_Tpvec, >, vmsgt_vv_##suffix##m1_b##width, suffix, vl) \
-OPENCV_HAL_IMPL_RVV_INT_CMP_OP(_Tpvec, <=, vmsle_vv_##suffix##m1_b##width, suffix, vl) \
-OPENCV_HAL_IMPL_RVV_INT_CMP_OP(_Tpvec, >=, vmsge_vv_##suffix##m1_b##width, suffix, vl)
-
-#define OPENCV_HAL_IMPL_RVV_FLOAT_CMP(_Tpvec, suffix, width, vl) \
-OPENCV_HAL_IMPL_RVV_FLOAT_CMP_OP(_Tpvec, ==, vmfeq_vv_##suffix##m1_b##width, suffix, vl) \
-OPENCV_HAL_IMPL_RVV_FLOAT_CMP_OP(_Tpvec, !=, vmfne_vv_##suffix##m1_b##width, suffix, vl) \
-OPENCV_HAL_IMPL_RVV_FLOAT_CMP_OP(_Tpvec, <, vmflt_vv_##suffix##m1_b##width, suffix, vl) \
-OPENCV_HAL_IMPL_RVV_FLOAT_CMP_OP(_Tpvec, >, vmfgt_vv_##suffix##m1_b##width, suffix, vl) \
-OPENCV_HAL_IMPL_RVV_FLOAT_CMP_OP(_Tpvec, <=, vmfle_vv_##suffix##m1_b##width, suffix, vl) \
-OPENCV_HAL_IMPL_RVV_FLOAT_CMP_OP(_Tpvec, >=, vmfge_vv_##suffix##m1_b##width, suffix, vl)
-
-
-OPENCV_HAL_IMPL_RVV_UNSIGNED_CMP(v_uint8x16, u8, 8, 16)
-OPENCV_HAL_IMPL_RVV_UNSIGNED_CMP(v_uint16x8, u16, 16, 8)
-OPENCV_HAL_IMPL_RVV_UNSIGNED_CMP(v_uint32x4, u32, 32, 4)
-OPENCV_HAL_IMPL_RVV_UNSIGNED_CMP(v_uint64x2, u64, 64, 2)
-OPENCV_HAL_IMPL_RVV_SIGNED_CMP(v_int8x16, i8, 8, 16)
-OPENCV_HAL_IMPL_RVV_SIGNED_CMP(v_int16x8, i16, 16, 8)
-OPENCV_HAL_IMPL_RVV_SIGNED_CMP(v_int32x4, i32, 32, 4)
-OPENCV_HAL_IMPL_RVV_SIGNED_CMP(v_int64x2, i64, 64, 2)
-OPENCV_HAL_IMPL_RVV_FLOAT_CMP(v_float32x4, f32, 32, 4)
-#if CV_SIMD128_64F
-OPENCV_HAL_IMPL_RVV_FLOAT_CMP(v_float64x2, f64, 64, 2)
-#endif
-
-inline v_float32x4 v_not_nan(const v_float32x4& a)
-{ return a == a; }
-
-#if CV_SIMD128_64F
-inline v_float64x2 v_not_nan(const v_float64x2& a)
-{ return a == a; }
-#endif
-
-////////////// Min/Max //////////////
-
-#define OPENCV_HAL_IMPL_RVV_BIN_FUNC(_Tpvec, func, intrin, vl) \
-inline _Tpvec func(const _Tpvec& a, const _Tpvec& b) \
-{ \
-    return _Tpvec(intrin(a, b, vl)); \
-}
-
-OPENCV_HAL_IMPL_RVV_BIN_FUNC(v_uint8x16, v_min, vminu_vv_u8m1, 16)
-OPENCV_HAL_IMPL_RVV_BIN_FUNC(v_uint8x16, v_max, vmaxu_vv_u8m1, 16)
-OPENCV_HAL_IMPL_RVV_BIN_FUNC(v_int8x16, v_min, vmin_vv_i8m1, 16)
-OPENCV_HAL_IMPL_RVV_BIN_FUNC(v_int8x16, v_max, vmax_vv_i8m1, 16)
-OPENCV_HAL_IMPL_RVV_BIN_FUNC(v_uint16x8, v_min, vminu_vv_u16m1, 8)
-OPENCV_HAL_IMPL_RVV_BIN_FUNC(v_uint16x8, v_max, vmaxu_vv_u16m1, 8)
-OPENCV_HAL_IMPL_RVV_BIN_FUNC(v_int16x8, v_min, vmin_vv_i16m1, 8)
-OPENCV_HAL_IMPL_RVV_BIN_FUNC(v_int16x8, v_max, vmax_vv_i16m1, 8)
-OPENCV_HAL_IMPL_RVV_BIN_FUNC(v_uint32x4, v_min, vminu_vv_u32m1, 4)
-OPENCV_HAL_IMPL_RVV_BIN_FUNC(v_uint32x4, v_max, vmaxu_vv_u32m1, 4)
-OPENCV_HAL_IMPL_RVV_BIN_FUNC(v_int32x4, v_min, vmin_vv_i32m1, 4)
-OPENCV_HAL_IMPL_RVV_BIN_FUNC(v_int32x4, v_max, vmax_vv_i32m1, 4)
-OPENCV_HAL_IMPL_RVV_BIN_FUNC(v_float32x4, v_min, vfmin_vv_f32m1, 4)
-OPENCV_HAL_IMPL_RVV_BIN_FUNC(v_float32x4, v_max, vfmax_vv_f32m1, 4)
-OPENCV_HAL_IMPL_RVV_BIN_FUNC(v_uint64x2, v_min, vminu_vv_u64m1, 2)
-OPENCV_HAL_IMPL_RVV_BIN_FUNC(v_uint64x2, v_max, vmaxu_vv_u64m1, 2)
-OPENCV_HAL_IMPL_RVV_BIN_FUNC(v_int64x2, v_min, vmin_vv_i64m1, 2)
-OPENCV_HAL_IMPL_RVV_BIN_FUNC(v_int64x2, v_max, vmax_vv_i64m1, 2)
-#if CV_SIMD128_64F
-OPENCV_HAL_IMPL_RVV_BIN_FUNC(v_float64x2, v_min, vfmin_vv_f64m1, 2)
-OPENCV_HAL_IMPL_RVV_BIN_FUNC(v_float64x2, v_max, vfmax_vv_f64m1, 2)
-#endif
-
-////////////// Arithmetics wrap //////////////
-
-OPENCV_HAL_IMPL_RVV_BIN_FUNC(v_uint8x16, v_add_wrap, vadd_vv_u8m1, 16)
-OPENCV_HAL_IMPL_RVV_BIN_FUNC(v_int8x16, v_add_wrap, vadd_vv_i8m1, 16)
-OPENCV_HAL_IMPL_RVV_BIN_FUNC(v_uint16x8, v_add_wrap, vadd_vv_u16m1, 8)
-OPENCV_HAL_IMPL_RVV_BIN_FUNC(v_int16x8, v_add_wrap, vadd_vv_i16m1, 8)
-OPENCV_HAL_IMPL_RVV_BIN_FUNC(v_uint8x16, v_sub_wrap, vsub_vv_u8m1, 16)
-OPENCV_HAL_IMPL_RVV_BIN_FUNC(v_int8x16, v_sub_wrap, vsub_vv_i8m1, 16)
-OPENCV_HAL_IMPL_RVV_BIN_FUNC(v_uint16x8, v_sub_wrap, vsub_vv_u16m1, 8)
-OPENCV_HAL_IMPL_RVV_BIN_FUNC(v_int16x8, v_sub_wrap, vsub_vv_i16m1, 8)
-OPENCV_HAL_IMPL_RVV_BIN_FUNC(v_uint8x16, v_mul_wrap, vmul_vv_u8m1, 16)
-OPENCV_HAL_IMPL_RVV_BIN_FUNC(v_int8x16, v_mul_wrap, vmul_vv_i8m1, 16)
-OPENCV_HAL_IMPL_RVV_BIN_FUNC(v_uint16x8, v_mul_wrap, vmul_vv_u16m1, 8)
-OPENCV_HAL_IMPL_RVV_BIN_FUNC(v_int16x8, v_mul_wrap, vmul_vv_i16m1, 8)
-
-////////////// Reduce //////////////
-
-#define OPENCV_HAL_IMPL_RVV_REDUCE_SUM(_Tpvec, _wTpvec, _nwTpvec, scalartype, suffix, wsuffix, vl, red) \
-inline scalartype v_reduce_sum(const _Tpvec& a)  \
-{ \
-    _nwTpvec zero = vmv_v_x_##wsuffix##m1(0, vl); \
-    _nwTpvec res = vmv_v_x_##wsuffix##m1(0, vl); \
-    res = v##red##_vs_##suffix##m1_##wsuffix##m1(res, a, zero, vl); \
-    return (scalartype)(_wTpvec(res).get0()); \
-}
-
-OPENCV_HAL_IMPL_RVV_REDUCE_SUM(v_uint8x16, v_uint16x8, vuint16m1_t, unsigned, u8, u16, 16, wredsumu)
-OPENCV_HAL_IMPL_RVV_REDUCE_SUM(v_int8x16, v_int16x8, vint16m1_t, int, i8, i16, 16, wredsum)
-OPENCV_HAL_IMPL_RVV_REDUCE_SUM(v_uint16x8, v_uint32x4, vuint32m1_t, unsigned, u16, u32, 8, wredsumu)
-OPENCV_HAL_IMPL_RVV_REDUCE_SUM(v_int16x8, v_int32x4, vint32m1_t, int, i16, i32, 8, wredsum)
-OPENCV_HAL_IMPL_RVV_REDUCE_SUM(v_uint32x4, v_uint64x2, vuint64m1_t, unsigned, u32, u64, 4, wredsumu)
-OPENCV_HAL_IMPL_RVV_REDUCE_SUM(v_int32x4, v_int64x2, vint64m1_t, int, i32, i64, 4, wredsum)
-OPENCV_HAL_IMPL_RVV_REDUCE_SUM(v_uint64x2, v_uint64x2, vuint64m1_t, uint64, u64, u64, 2, redsum)
-OPENCV_HAL_IMPL_RVV_REDUCE_SUM(v_int64x2, v_int64x2, vint64m1_t, int64, i64, i64, 2, redsum)
-
-#define OPENCV_HAL_IMPL_RVV_REDUCE_SUM_FP(_Tpvec, _wTpvec, _nwTpvec, scalartype, suffix, wsuffix, vl, red) \
-inline scalartype v_reduce_sum(const _Tpvec& a)  \
-{ \
-    _nwTpvec zero = vfmv_v_f_##wsuffix##m1(0, vl); \
-    _nwTpvec res = vfmv_v_f_##wsuffix##m1(0, vl); \
-    res = v##red##_vs_##suffix##m1_##wsuffix##m1(res, a, zero, vl); \
-    return (scalartype)(_wTpvec(res).get0()); \
-}
-
-// vfredsum for float has renamed to fredosum, also updated in GNU.
-OPENCV_HAL_IMPL_RVV_REDUCE_SUM_FP(v_float32x4, v_float32x4, vfloat32m1_t, float, f32, f32, 4, fredosum)
-#if CV_SIMD128_64F
-OPENCV_HAL_IMPL_RVV_REDUCE_SUM_FP(v_float64x2, v_float64x2, vfloat64m1_t, double, f64, f64, 2, fredosum)
-#endif
-
-
-#define OPENCV_HAL_IMPL_RVV_REDUCE(_Tpvec, func, scalartype, suffix, vl, red) \
-inline scalartype v_reduce_##func(const _Tpvec& a)  \
-{ \
-    _Tpvec res = _Tpvec(v##red##_vs_##suffix##m1_##suffix##m1(a, a, a, vl)); \
-    return scalartype(res.get0()); \
-}
-
-OPENCV_HAL_IMPL_RVV_REDUCE(v_uint8x16, min, uchar, u8, 16, redminu)
-OPENCV_HAL_IMPL_RVV_REDUCE(v_int8x16, min, schar, i8, 16, redmin)
-OPENCV_HAL_IMPL_RVV_REDUCE(v_uint16x8, min, ushort, u16, 8, redminu)
-OPENCV_HAL_IMPL_RVV_REDUCE(v_int16x8, min, short, i16, 8, redmin)
-OPENCV_HAL_IMPL_RVV_REDUCE(v_uint32x4, min, unsigned, u32, 4, redminu)
-OPENCV_HAL_IMPL_RVV_REDUCE(v_int32x4, min, int, i32, 4, redmin)
-OPENCV_HAL_IMPL_RVV_REDUCE(v_float32x4, min, float, f32, 4, fredmin)
-OPENCV_HAL_IMPL_RVV_REDUCE(v_uint8x16, max, uchar, u8, 16, redmaxu)
-OPENCV_HAL_IMPL_RVV_REDUCE(v_int8x16, max, schar, i8, 16, redmax)
-OPENCV_HAL_IMPL_RVV_REDUCE(v_uint16x8, max, ushort, u16, 8, redmaxu)
-OPENCV_HAL_IMPL_RVV_REDUCE(v_int16x8, max, short, i16, 8, redmax)
-OPENCV_HAL_IMPL_RVV_REDUCE(v_uint32x4, max, unsigned, u32, 4, redmaxu)
-OPENCV_HAL_IMPL_RVV_REDUCE(v_int32x4, max, int, i32, 4, redmax)
-OPENCV_HAL_IMPL_RVV_REDUCE(v_float32x4, max, float, f32, 4, fredmax)
-
-
-inline v_float32x4 v_reduce_sum4(const v_float32x4& a, const v_float32x4& b,
-                                 const v_float32x4& c, const v_float32x4& d)
-{
-    float elems[4] =
-    {
-        v_reduce_sum(a),
-        v_reduce_sum(b),
-        v_reduce_sum(c),
-        v_reduce_sum(d)
-    };
-    return v_float32x4(vle32_v_f32m1(elems, 4));
-}
-
-////////////// Square-Root //////////////
-
-inline v_float32x4 v_sqrt(const v_float32x4& x)
-{
-    return v_float32x4(vfsqrt_v_f32m1(x, 4));
-}
-
-inline v_float32x4 v_invsqrt(const v_float32x4& x)
-{
-    v_float32x4 one = v_setall_f32(1.0f);
-    return one / v_sqrt(x);
-}
-
-#if CV_SIMD128_64F
-inline v_float64x2 v_sqrt(const v_float64x2& x)
-{
-    return v_float64x2(vfsqrt_v_f64m1(x, 4));
-}
-
-inline v_float64x2 v_invsqrt(const v_float64x2& x)
-{
-    v_float64x2 one = v_setall_f64(1.0f);
-    return one / v_sqrt(x);
-}
-#endif
-
-inline v_float32x4 v_magnitude(const v_float32x4& a, const v_float32x4& b)
-{
-    v_float32x4 x(vfmacc_vv_f32m1(vfmul_vv_f32m1(a, a, 4), b, b, 4));
-    return v_sqrt(x);
-}
-
-inline v_float32x4 v_sqr_magnitude(const v_float32x4& a, const v_float32x4& b)
-{
-    return v_float32x4(vfmacc_vv_f32m1(vfmul_vv_f32m1(a, a, 4), b, b, 4));
-}
-
-#if CV_SIMD128_64F
-inline v_float64x2 v_magnitude(const v_float64x2& a, const v_float64x2& b)
-{
-    v_float64x2 x(vfmacc_vv_f64m1(vfmul_vv_f64m1(a, a, 2), b, b, 2));
-    return v_sqrt(x);
-}
-
-inline v_float64x2 v_sqr_magnitude(const v_float64x2& a, const v_float64x2& b)
-{
-    return v_float64x2(vfmacc_vv_f64m1(vfmul_vv_f64m1(a, a, 2), b, b, 2));
-}
-#endif
-
-////////////// Multiply-Add //////////////
-
-inline v_float32x4 v_fma(const v_float32x4& a, const v_float32x4& b, const v_float32x4& c)
-{
-    return v_float32x4(vfmacc_vv_f32m1(c, a, b, 4));
-}
-inline v_int32x4 v_fma(const v_int32x4& a, const v_int32x4& b, const v_int32x4& c)
-{
-    return v_int32x4(vmacc_vv_i32m1(c, a, b, 4));
-}
-
-inline v_float32x4 v_muladd(const v_float32x4& a, const v_float32x4& b, const v_float32x4& c)
-{
-    return v_fma(a, b, c);
-}
-
-inline v_int32x4 v_muladd(const v_int32x4& a, const v_int32x4& b, const v_int32x4& c)
-{
-    return v_fma(a, b, c);
-}
-
-#if CV_SIMD128_64F
-inline v_float64x2 v_fma(const v_float64x2& a, const v_float64x2& b, const v_float64x2& c)
-{
-    return v_float64x2(vfmacc_vv_f64m1(c, a, b, 2));
-}
-
-inline v_float64x2 v_muladd(const v_float64x2& a, const v_float64x2& b, const v_float64x2& c)
-{
-    return v_fma(a, b, c);
-}
-#endif
-
-////////////// Check all/any //////////////
-
-// use overloaded vcpop in clang, no casting like (vuint64m1_t) is needed.
-#ifndef __clang__
-#define OPENCV_HAL_IMPL_RVV_CHECK_ALLANY(_Tpvec, suffix, shift, vl) \
-inline bool v_check_all(const _Tpvec& a) \
-{ \
-    v_uint64x2 v = v_uint64x2((vuint64m1_t)vsrl_vx_##suffix##m1(vnot_v_##suffix##m1(a, vl), shift, vl)); \
-    return (v.val[0] | v.val[1]) == 0; \
-} \
-inline bool v_check_any(const _Tpvec& a) \
-{ \
-    v_uint64x2 v = v_uint64x2((vuint64m1_t)vsrl_vx_##suffix##m1(a, shift, vl)); \
-    return (v.val[0] | v.val[1]) != 0; \
-}
-
-OPENCV_HAL_IMPL_RVV_CHECK_ALLANY(v_uint8x16, u8, 7, 16)
-OPENCV_HAL_IMPL_RVV_CHECK_ALLANY(v_uint16x8, u16, 15, 8)
-OPENCV_HAL_IMPL_RVV_CHECK_ALLANY(v_uint32x4, u32, 31, 4)
-OPENCV_HAL_IMPL_RVV_CHECK_ALLANY(v_uint64x2, u64, 63, 2)
-
-
-inline bool v_check_all(const v_int8x16& a)
-{ return v_check_all(v_reinterpret_as_u8(a)); }
-inline bool v_check_any(const v_int8x16& a)
-{ return v_check_any(v_reinterpret_as_u8(a)); }
-
-inline bool v_check_all(const v_int16x8& a)
-{ return v_check_all(v_reinterpret_as_u16(a)); }
-inline bool v_check_any(const v_int16x8& a)
-{ return v_check_any(v_reinterpret_as_u16(a)); }
-
-inline bool v_check_all(const v_int32x4& a)
-{ return v_check_all(v_reinterpret_as_u32(a)); }
-inline bool v_check_any(const v_int32x4& a)
-{ return v_check_any(v_reinterpret_as_u32(a)); }
-
-inline bool v_check_all(const v_float32x4& a)
-{ return v_check_all(v_reinterpret_as_u32(a)); }
-inline bool v_check_any(const v_float32x4& a)
-{ return v_check_any(v_reinterpret_as_u32(a)); }
-
-inline bool v_check_all(const v_int64x2& a)
-{ return v_check_all(v_reinterpret_as_u64(a)); }
-inline bool v_check_any(const v_int64x2& a)
-{ return v_check_any(v_reinterpret_as_u64(a)); }
-
-#if CV_SIMD128_64F
-inline bool v_check_all(const v_float64x2& a)
-{ return v_check_all(v_reinterpret_as_u64(a)); }
-inline bool v_check_any(const v_float64x2& a)
-{ return v_check_any(v_reinterpret_as_u64(a)); }
-#endif
-#else
-#define OPENCV_HAL_IMPL_RVV_CHECK_ALLANY(_Tpvec, vl) \
-inline bool v_check_all(const _Tpvec& a) \
-{ \
-    return vcpop(vmslt(a, 0, vl), vl) == vl; \
-} \
-inline bool v_check_any(const _Tpvec& a) \
-{ \
-    return vcpop(vmslt(a, 0, vl), vl) != 0; \
-}
-
-OPENCV_HAL_IMPL_RVV_CHECK_ALLANY(v_int8x16, 16)
-OPENCV_HAL_IMPL_RVV_CHECK_ALLANY(v_int16x8, 8)
-OPENCV_HAL_IMPL_RVV_CHECK_ALLANY(v_int32x4, 4)
-OPENCV_HAL_IMPL_RVV_CHECK_ALLANY(v_int64x2, 2)
-
-
-inline bool v_check_all(const v_uint8x16& a)
-{ return v_check_all(v_reinterpret_as_s8(a)); }
-inline bool v_check_any(const v_uint8x16& a)
-{ return v_check_any(v_reinterpret_as_s8(a)); }
-
-inline bool v_check_all(const v_uint16x8& a)
-{ return v_check_all(v_reinterpret_as_s16(a)); }
-inline bool v_check_any(const v_uint16x8& a)
-{ return v_check_any(v_reinterpret_as_s16(a)); }
-
-inline bool v_check_all(const v_uint32x4& a)
-{ return v_check_all(v_reinterpret_as_s32(a)); }
-inline bool v_check_any(const v_uint32x4& a)
-{ return v_check_any(v_reinterpret_as_s32(a)); }
-
-inline bool v_check_all(const v_float32x4& a)
-{ return v_check_all(v_reinterpret_as_s32(a)); }
-inline bool v_check_any(const v_float32x4& a)
-{ return v_check_any(v_reinterpret_as_s32(a)); }
-
-inline bool v_check_all(const v_uint64x2& a)
-{ return v_check_all(v_reinterpret_as_s64(a)); }
-inline bool v_check_any(const v_uint64x2& a)
-{ return v_check_any(v_reinterpret_as_s64(a)); }
-
-#if CV_SIMD128_64F
-inline bool v_check_all(const v_float64x2& a)
-{ return v_check_all(v_reinterpret_as_s64(a)); }
-inline bool v_check_any(const v_float64x2& a)
-{ return v_check_any(v_reinterpret_as_s64(a)); }
-#endif
-#endif
-////////////// abs //////////////
-
-#define OPENCV_HAL_IMPL_RVV_ABSDIFF(_Tpvec, abs) \
-inline _Tpvec v_##abs(const _Tpvec& a, const _Tpvec& b) \
-{ \
-    return v_max(a, b) - v_min(a, b); \
-}
-
-OPENCV_HAL_IMPL_RVV_ABSDIFF(v_uint8x16, absdiff)
-OPENCV_HAL_IMPL_RVV_ABSDIFF(v_uint16x8, absdiff)
-OPENCV_HAL_IMPL_RVV_ABSDIFF(v_uint32x4, absdiff)
-OPENCV_HAL_IMPL_RVV_ABSDIFF(v_float32x4, absdiff)
-#if CV_SIMD128_64F
-OPENCV_HAL_IMPL_RVV_ABSDIFF(v_float64x2, absdiff)
-#endif
-OPENCV_HAL_IMPL_RVV_ABSDIFF(v_int8x16, absdiffs)
-OPENCV_HAL_IMPL_RVV_ABSDIFF(v_int16x8, absdiffs)
-
-// use reinterpret instead of c-style casting.
-#ifndef __clang__
-#define OPENCV_HAL_IMPL_RVV_ABSDIFF_S(_Tpvec, _rTpvec, _nwTpvec, sub, rshr, vl) \
-inline _rTpvec v_absdiff(const _Tpvec& a, const _Tpvec& b) \
-{ \
-    return _rTpvec(rshr((_nwTpvec)sub(v_max(a, b), v_min(a, b), vl), 0, vl)); \
-}
-
-OPENCV_HAL_IMPL_RVV_ABSDIFF_S(v_int8x16, v_uint8x16, vuint16m2_t, vwsub_vv_i16m2, vnclipu_wx_u8m1, 16)
-OPENCV_HAL_IMPL_RVV_ABSDIFF_S(v_int16x8, v_uint16x8, vuint32m2_t, vwsub_vv_i32m2, vnclipu_wx_u16m1, 8)
-OPENCV_HAL_IMPL_RVV_ABSDIFF_S(v_int32x4, v_uint32x4, vuint64m2_t, vwsub_vv_i64m2, vnclipu_wx_u32m1, 4)
-#else
-#define OPENCV_HAL_IMPL_RVV_ABSDIFF_S(_Tpvec, _rTpvec, _nwTpvec, sub, rshr, width, vl) \
-inline _rTpvec v_absdiff(const _Tpvec& a, const _Tpvec& b) \
-{ \
-    return _rTpvec(rshr(vreinterpret_u##width##m2(sub(v_max(a, b), v_min(a, b), vl)), 0, vl)); \
-}
-
-OPENCV_HAL_IMPL_RVV_ABSDIFF_S(v_int8x16, v_uint8x16, vuint16m2_t, vwsub_vv_i16m2, vnclipu_wx_u8m1, 16, 16)
-OPENCV_HAL_IMPL_RVV_ABSDIFF_S(v_int16x8, v_uint16x8, vuint32m2_t, vwsub_vv_i32m2, vnclipu_wx_u16m1, 32, 8)
-OPENCV_HAL_IMPL_RVV_ABSDIFF_S(v_int32x4, v_uint32x4, vuint64m2_t, vwsub_vv_i64m2, vnclipu_wx_u32m1, 64, 4)
-#endif
-#define OPENCV_HAL_IMPL_RVV_ABS(_Tprvec, _Tpvec, suffix) \
-inline _Tprvec v_abs(const _Tpvec& a) \
-{ \
-    return v_absdiff(a, v_setzero_##suffix()); \
-}
-
-OPENCV_HAL_IMPL_RVV_ABS(v_uint8x16, v_int8x16, s8)
-OPENCV_HAL_IMPL_RVV_ABS(v_uint16x8, v_int16x8, s16)
-OPENCV_HAL_IMPL_RVV_ABS(v_uint32x4, v_int32x4, s32)
-OPENCV_HAL_IMPL_RVV_ABS(v_float32x4, v_float32x4, f32)
-#if CV_SIMD128_64F
-OPENCV_HAL_IMPL_RVV_ABS(v_float64x2, v_float64x2, f64)
-#endif
-
-
-#define OPENCV_HAL_IMPL_RVV_REDUCE_SAD(_Tpvec, scalartype) \
-inline scalartype v_reduce_sad(const _Tpvec& a, const _Tpvec& b) \
-{ \
-    return v_reduce_sum(v_absdiff(a, b)); \
-}
-
-OPENCV_HAL_IMPL_RVV_REDUCE_SAD(v_uint8x16, unsigned)
-OPENCV_HAL_IMPL_RVV_REDUCE_SAD(v_int8x16, unsigned)
-OPENCV_HAL_IMPL_RVV_REDUCE_SAD(v_uint16x8, unsigned)
-OPENCV_HAL_IMPL_RVV_REDUCE_SAD(v_int16x8, unsigned)
-OPENCV_HAL_IMPL_RVV_REDUCE_SAD(v_uint32x4, unsigned)
-OPENCV_HAL_IMPL_RVV_REDUCE_SAD(v_int32x4, unsigned)
-OPENCV_HAL_IMPL_RVV_REDUCE_SAD(v_float32x4, float)
-
-////////////// Select //////////////
-
-#define OPENCV_HAL_IMPL_RVV_SELECT(_Tpvec, merge, ne, vl) \
-inline _Tpvec v_select(const _Tpvec& mask, const _Tpvec& a, const _Tpvec& b) \
-{ \
-    return _Tpvec(merge(ne(mask, 0, vl), b, a, vl)); \
-}
-
-OPENCV_HAL_IMPL_RVV_SELECT(v_uint8x16, vmerge_vvm_u8m1, vmsne_vx_u8m1_b8, 16)
-OPENCV_HAL_IMPL_RVV_SELECT(v_int8x16, vmerge_vvm_i8m1, vmsne_vx_i8m1_b8, 16)
-OPENCV_HAL_IMPL_RVV_SELECT(v_uint16x8, vmerge_vvm_u16m1, vmsne_vx_u16m1_b16, 8)
-OPENCV_HAL_IMPL_RVV_SELECT(v_int16x8, vmerge_vvm_i16m1, vmsne_vx_i16m1_b16, 8)
-OPENCV_HAL_IMPL_RVV_SELECT(v_uint32x4, vmerge_vvm_u32m1, vmsne_vx_u32m1_b32, 4)
-OPENCV_HAL_IMPL_RVV_SELECT(v_int32x4, vmerge_vvm_i32m1, vmsne_vx_i32m1_b32, 4)
-OPENCV_HAL_IMPL_RVV_SELECT(v_float32x4, vmerge_vvm_f32m1, vmfne_vf_f32m1_b32, 4)
-#if CV_SIMD128_64F
-OPENCV_HAL_IMPL_RVV_SELECT(v_float64x2, vmerge_vvm_f64m1, vmfne_vf_f64m1_b64, 2)
-#endif
-
-////////////// Rotate shift //////////////
-
-#define OPENCV_HAL_IMPL_RVV_ROTATE_INTEGER(_Tpvec, suffix, vl) \
-template<int n> inline _Tpvec v_rotate_right(const _Tpvec& a) \
-{ \
-    return _Tpvec(vslidedown_vx_##suffix##m1(vmv_v_x_##suffix##m1(0, vl), a, n, vl)); \
-} \
-template<int n> inline _Tpvec v_rotate_left(const _Tpvec& a) \
-{ \
-    return _Tpvec(vslideup_vx_##suffix##m1(vmv_v_x_##suffix##m1(0, vl), a, n, vl)); \
-} \
-template<> inline _Tpvec v_rotate_left<0>(const _Tpvec& a) \
-{ return a; } \
-template<int n> inline _Tpvec v_rotate_right(const _Tpvec& a, const _Tpvec& b) \
-{ \
-    return _Tpvec(vslideup_vx_##suffix##m1(vslidedown_vx_##suffix##m1(vmv_v_x_##suffix##m1(0, vl), a, n, vl), b, _Tpvec::nlanes - n, vl)); \
-} \
-template<int n> inline _Tpvec v_rotate_left(const _Tpvec& a, const _Tpvec& b) \
-{ \
-    return _Tpvec(vslideup_vx_##suffix##m1(vslidedown_vx_##suffix##m1(vmv_v_x_##suffix##m1(0, vl), b, _Tpvec::nlanes - n, vl), a, n, vl)); \
-} \
-template<> inline _Tpvec v_rotate_left<0>(const _Tpvec& a, const _Tpvec& b) \
-{ CV_UNUSED(b); return a; }
-
-OPENCV_HAL_IMPL_RVV_ROTATE_INTEGER(v_uint8x16, u8, 16)
-OPENCV_HAL_IMPL_RVV_ROTATE_INTEGER(v_int8x16, i8, 16)
-OPENCV_HAL_IMPL_RVV_ROTATE_INTEGER(v_uint16x8, u16, 8)
-OPENCV_HAL_IMPL_RVV_ROTATE_INTEGER(v_int16x8, i16, 8)
-OPENCV_HAL_IMPL_RVV_ROTATE_INTEGER(v_uint32x4, u32, 4)
-OPENCV_HAL_IMPL_RVV_ROTATE_INTEGER(v_int32x4, i32, 4)
-OPENCV_HAL_IMPL_RVV_ROTATE_INTEGER(v_uint64x2, u64, 2)
-OPENCV_HAL_IMPL_RVV_ROTATE_INTEGER(v_int64x2, i64, 2)
-
-#define OPENCV_HAL_IMPL_RVV_ROTATE_FP(_Tpvec, suffix, vl) \
-template<int n> inline _Tpvec v_rotate_right(const _Tpvec& a) \
-{ \
-    return _Tpvec(vslidedown_vx_##suffix##m1(vfmv_v_f_##suffix##m1(0, vl), a, n, vl)); \
-} \
-template<int n> inline _Tpvec v_rotate_left(const _Tpvec& a) \
-{ \
-    return _Tpvec(vslideup_vx_##suffix##m1(vfmv_v_f_##suffix##m1(0, vl), a, n, vl)); \
-} \
-template<> inline _Tpvec v_rotate_left<0>(const _Tpvec& a) \
-{ return a; } \
-template<int n> inline _Tpvec v_rotate_right(const _Tpvec& a, const _Tpvec& b) \
-{ \
-    return _Tpvec(vslideup_vx_##suffix##m1(vslidedown_vx_##suffix##m1(vfmv_v_f_##suffix##m1(0, vl), a, n, vl), b, _Tpvec::nlanes - n, vl)); \
-} \
-template<int n> inline _Tpvec v_rotate_left(const _Tpvec& a, const _Tpvec& b) \
-{ \
-    return _Tpvec(vslideup_vx_##suffix##m1(vslidedown_vx_##suffix##m1(vfmv_v_f_##suffix##m1(0, vl), b, _Tpvec::nlanes - n, vl), a, n, vl)); \
-} \
-template<> inline _Tpvec v_rotate_left<0>(const _Tpvec& a, const _Tpvec& b) \
-{ CV_UNUSED(b); return a; }
-
-OPENCV_HAL_IMPL_RVV_ROTATE_FP(v_float32x4, f32, 4)
-#if CV_SIMD128_64F
-OPENCV_HAL_IMPL_RVV_ROTATE_FP(v_float64x2, f64, 2)
-#endif
-
-////////////// Convert to float //////////////
-
-inline v_float32x4 v_cvt_f32(const v_int32x4& a)
-{
-    return v_float32x4(vfcvt_f_x_v_f32m1(a, 4));
-}
-
-#if CV_SIMD128_64F
-#ifndef __clang__
-inline v_float32x4 v_cvt_f32(const v_float64x2& a)
-{
-    double arr[4] = {a.val[0], a.val[1], 0, 0};
-    vfloat64m2_t tmp = vle64_v_f64m2(arr, 4);
-    return v_float32x4(vfncvt_f_f_w_f32m1(tmp, 4));
-}
-
-inline v_float32x4 v_cvt_f32(const v_float64x2& a, const v_float64x2& b)
-{
-    double arr[4] = {a.val[0], a.val[1], b.val[0], b.val[1]};
-    vfloat64m2_t tmp = vle64_v_f64m2(arr, 4);
-    return v_float32x4(vfncvt_f_f_w_f32m1(tmp, 4));
-}
-#else
-inline v_float32x4 v_cvt_f32(const v_float64x2& a)
-{
-    vfloat64m2_t zero = vfmv_v_f_f64m2(0, 4);
-    return v_float32x4(vfncvt_f_f_w_f32m1(vset_v_f64m1_f64m2(zero, 0, a), 4));
-}
-inline v_float32x4 v_cvt_f32(const v_float64x2& a, const v_float64x2& b)
-{
-    vfloat64m2_t dst = vlmul_ext_v_f64m1_f64m2(a);
-    return v_float32x4(vfncvt_f_f_w_f32m1(vset_v_f64m1_f64m2(dst, 1, b), 4));
-}
-#endif
-
-inline v_float64x2 v_cvt_f64(const v_int32x4& a)
-{
-    double ptr[4] = {0};
-    vse64_v_f64m2(ptr, vfwcvt_f_x_v_f64m2(a, 4), 4);
-    double elems[2] =
-    {
-        ptr[0], ptr[1]
-    };
-    return v_float64x2(vle64_v_f64m1(elems, 2));
-}
-
-inline v_float64x2 v_cvt_f64_high(const v_int32x4& a)
-{
-    double ptr[4] = {0};
-    vse64_v_f64m2(ptr, vfwcvt_f_x_v_f64m2(a, 4), 4);
-    double elems[2] =
-    {
-        ptr[2], ptr[3]
-    };
-    return v_float64x2(vle64_v_f64m1(elems, 2));
-}
-
-inline v_float64x2 v_cvt_f64(const v_float32x4& a)
-{
-    double ptr[4] = {0};
-    vse64_v_f64m2(ptr, vfwcvt_f_f_v_f64m2(a, 4), 4);
-    double elems[2] =
-    {
-        ptr[0], ptr[1]
-    };
-    return v_float64x2(vle64_v_f64m1(elems, 2));
-}
-
-inline v_float64x2 v_cvt_f64_high(const v_float32x4& a)
-{
-    double ptr[4] = {0};
-    vse64_v_f64m2(ptr, vfwcvt_f_f_v_f64m2(a, 4), 4);
-    double elems[2] =
-    {
-        ptr[2], ptr[3]
-    };
-    return v_float64x2(vle64_v_f64m1(elems, 2));
-}
-
-inline v_float64x2 v_cvt_f64(const v_int64x2& a)
-{
-    return v_float64x2(vfcvt_f_x_v_f64m1(a, 2));
-}
-#endif
-
-////////////// Broadcast //////////////
-
-#define OPENCV_HAL_IMPL_RVV_BROADCAST(_Tpvec, suffix) \
-template<int i> inline _Tpvec v_broadcast_element(_Tpvec v) \
-{ \
-    return v_setall_##suffix(v_extract_n<i>(v)); \
-}
-
-OPENCV_HAL_IMPL_RVV_BROADCAST(v_uint8x16, u8)
-OPENCV_HAL_IMPL_RVV_BROADCAST(v_int8x16, s8)
-OPENCV_HAL_IMPL_RVV_BROADCAST(v_uint16x8, u16)
-OPENCV_HAL_IMPL_RVV_BROADCAST(v_int16x8, s16)
-OPENCV_HAL_IMPL_RVV_BROADCAST(v_uint32x4, u32)
-OPENCV_HAL_IMPL_RVV_BROADCAST(v_int32x4, s32)
-OPENCV_HAL_IMPL_RVV_BROADCAST(v_uint64x2, u64)
-OPENCV_HAL_IMPL_RVV_BROADCAST(v_int64x2, s64)
-OPENCV_HAL_IMPL_RVV_BROADCAST(v_float32x4, f32)
-#if CV_SIMD128_64F
-OPENCV_HAL_IMPL_RVV_BROADCAST(v_float64x2, f64)
-#endif
-
-////////////// Transpose4x4 //////////////
-
-#define OPENCV_HAL_IMPL_RVV_TRANSPOSE4x4(_Tpvec, _Tp, suffix) \
-inline void v_transpose4x4(const v_##_Tpvec& a0, const v_##_Tpvec& a1, \
-                         const v_##_Tpvec& a2, const v_##_Tpvec& a3, \
-                         v_##_Tpvec& b0, v_##_Tpvec& b1, \
-                         v_##_Tpvec& b2, v_##_Tpvec& b3) \
-{ \
-    _Tp elems0[4] = \
-    { \
-        v_extract_n<0>(a0), \
-        v_extract_n<0>(a1), \
-        v_extract_n<0>(a2), \
-        v_extract_n<0>(a3) \
-    }; \
-    b0 = v_load(elems0); \
-    _Tp elems1[4] = \
-    { \
-        v_extract_n<1>(a0), \
-        v_extract_n<1>(a1), \
-        v_extract_n<1>(a2), \
-        v_extract_n<1>(a3) \
-    }; \
-    b1 = v_load(elems1); \
-    _Tp elems2[4] = \
-    { \
-        v_extract_n<2>(a0), \
-        v_extract_n<2>(a1), \
-        v_extract_n<2>(a2), \
-        v_extract_n<2>(a3) \
-    }; \
-    b2 = v_load(elems2); \
-    _Tp elems3[4] = \
-    { \
-        v_extract_n<3>(a0), \
-        v_extract_n<3>(a1), \
-        v_extract_n<3>(a2), \
-        v_extract_n<3>(a3) \
-    }; \
-    b3 = v_load(elems3); \
-}
-
-OPENCV_HAL_IMPL_RVV_TRANSPOSE4x4(uint32x4, unsigned, u32)
-OPENCV_HAL_IMPL_RVV_TRANSPOSE4x4(int32x4, int, i32)
-OPENCV_HAL_IMPL_RVV_TRANSPOSE4x4(float32x4, float, f32)
-
-////////////// Reverse //////////////
-
-#define OPENCV_HAL_IMPL_RVV_REVERSE(_Tpvec, _Tp, suffix) \
-inline _Tpvec v_reverse(const _Tpvec& a)  \
-{ \
-    _Tp ptr[_Tpvec::nlanes] = {0}; \
-    _Tp ptra[_Tpvec::nlanes] = {0}; \
-    v_store(ptra, a); \
-    for (int i = 0; i < _Tpvec::nlanes; i++) \
-    { \
-        ptr[i] = ptra[_Tpvec::nlanes-i-1]; \
-    } \
-    return v_load(ptr); \
-}
-
-OPENCV_HAL_IMPL_RVV_REVERSE(v_uint8x16, uchar, u8)
-OPENCV_HAL_IMPL_RVV_REVERSE(v_int8x16, schar, i8)
-OPENCV_HAL_IMPL_RVV_REVERSE(v_uint16x8, ushort, u16)
-OPENCV_HAL_IMPL_RVV_REVERSE(v_int16x8, short, i16)
-OPENCV_HAL_IMPL_RVV_REVERSE(v_uint32x4, unsigned, u32)
-OPENCV_HAL_IMPL_RVV_REVERSE(v_int32x4, int, i32)
-OPENCV_HAL_IMPL_RVV_REVERSE(v_float32x4, float, f32)
-OPENCV_HAL_IMPL_RVV_REVERSE(v_uint64x2, uint64, u64)
-OPENCV_HAL_IMPL_RVV_REVERSE(v_int64x2, int64, i64)
-#if CV_SIMD128_64F
-OPENCV_HAL_IMPL_RVV_REVERSE(v_float64x2, double, f64)
-#endif
-
-//////////// Value reordering ////////////
-
-#define OPENCV_HAL_IMPL_RVV_EXPAND(_Tpwvec, _Tp, _Tpvec, width, suffix, wcvt, vl) \
-inline void v_expand(const _Tpvec& a, _Tpwvec& b0, _Tpwvec& b1) \
-{ \
-    _Tp lptr[_Tpvec::nlanes/2] = {0}; \
-    _Tp hptr[_Tpvec::nlanes/2] = {0}; \
-    v_store_low(lptr, a); \
-    v_store_high(hptr, a); \
-    b0 = _Tpwvec(wcvt(vle##width##_v_##suffix##mf2(lptr, vl), vl)); \
-    b1 = _Tpwvec(wcvt(vle##width##_v_##suffix##mf2(hptr, vl), vl)); \
-} \
-inline _Tpwvec v_expand_low(const _Tpvec& a) \
-{ \
-    _Tp lptr[_Tpvec::nlanes/2] = {0}; \
-    v_store_low(lptr, a); \
-    return _Tpwvec(wcvt(vle##width##_v_##suffix##mf2(lptr, vl), vl)); \
-} \
-inline _Tpwvec v_expand_high(const _Tpvec& a) \
-{ \
-    _Tp hptr[_Tpvec::nlanes/2] = {0}; \
-    v_store_high(hptr, a); \
-    return _Tpwvec(wcvt(vle##width##_v_##suffix##mf2(hptr, vl), vl)); \
-} \
-inline _Tpwvec v_load_expand(const _Tp* ptr) \
-{ \
-    return _Tpwvec(wcvt(vle##width##_v_##suffix##mf2(ptr, vl), vl)); \
-}
-
-OPENCV_HAL_IMPL_RVV_EXPAND(v_uint16x8, uchar, v_uint8x16, 8, u8, vwcvtu_x_x_v_u16m1, 8)
-OPENCV_HAL_IMPL_RVV_EXPAND(v_int16x8, schar, v_int8x16, 8, i8, vwcvt_x_x_v_i16m1, 8)
-OPENCV_HAL_IMPL_RVV_EXPAND(v_uint32x4, ushort, v_uint16x8, 16, u16, vwcvtu_x_x_v_u32m1, 4)
-OPENCV_HAL_IMPL_RVV_EXPAND(v_int32x4, short, v_int16x8, 16, i16, vwcvt_x_x_v_i32m1, 4)
-OPENCV_HAL_IMPL_RVV_EXPAND(v_uint64x2, uint, v_uint32x4, 32, u32, vwcvtu_x_x_v_u64m1, 2)
-OPENCV_HAL_IMPL_RVV_EXPAND(v_int64x2, int, v_int32x4, 32, i32, vwcvt_x_x_v_i64m1, 2)
-
-inline v_uint32x4 v_load_expand_q(const uchar* ptr)
-{
-    return v_uint32x4(vwcvtu_x_x_v_u32m1(vwcvtu_x_x_v_u16mf2(vle8_v_u8mf4(ptr, 4), 4), 4));
-}
-
-inline v_int32x4 v_load_expand_q(const schar* ptr)
-{
-    return v_int32x4(vwcvt_x_x_v_i32m1(vwcvt_x_x_v_i16mf2(vle8_v_i8mf4(ptr, 4), 4), 4));
-}
-
-
-#define OPENCV_HAL_IMPL_RVV_PACK(_Tpvec, _Tp, _wTpvec, _wTp, hwidth, width, hsuffix, suffix, rshr, shr, hvl, vl) \
-inline _Tpvec v_pack(const _wTpvec& a, const _wTpvec& b) \
-{ \
-    _wTp arr[_Tpvec::nlanes] = {0}; \
-    v_store(arr, a); \
-    v_store(arr + _wTpvec::nlanes, b); \
-    return _Tpvec(shr(vle##width##_v_##suffix##m2(arr, vl), 0, vl)); \
-} \
-inline void v_pack_store(_Tp* ptr, const _wTpvec& a) \
-{ \
-    _wTp arr[_Tpvec::nlanes] = {0}; \
-    v_store(arr, a); \
-    v_store(arr + _wTpvec::nlanes, _wTpvec(vmv_v_x_##suffix##m1(0, hvl))); \
-    vse##hwidth##_v_##hsuffix##m1(ptr, shr(vle##width##_v_##suffix##m2(arr, vl), 0, vl), hvl); \
-} \
-template<int n> inline \
-_Tpvec v_rshr_pack(const _wTpvec& a, const _wTpvec& b) \
-{ \
-    _wTp arr[_Tpvec::nlanes] = {0}; \
-    v_store(arr, a); \
-    v_store(arr + _wTpvec::nlanes, b); \
-    return _Tpvec(rshr(vle##width##_v_##suffix##m2(arr, vl), n, vl)); \
-} \
-template<int n> inline \
-void v_rshr_pack_store(_Tp* ptr, const _wTpvec& a) \
-{ \
-    _wTp arr[_Tpvec::nlanes] = {0}; \
-    v_store(arr, a); \
-    v_store(arr + _wTpvec::nlanes, _wTpvec(vmv_v_x_##suffix##m1(0, hvl))); \
-    vse##hwidth##_v_##hsuffix##m1(ptr, _Tpvec(rshr(vle##width##_v_##suffix##m2(arr, vl), n, vl)), hvl); \
-}
-
-OPENCV_HAL_IMPL_RVV_PACK(v_uint8x16, uchar, v_uint16x8, ushort, 8, 16, u8, u16, vnclipu_wx_u8m1, vnclipu_wx_u8m1, 8, 16)
-OPENCV_HAL_IMPL_RVV_PACK(v_int8x16, schar, v_int16x8, short, 8, 16, i8, i16, vnclip_wx_i8m1, vnclip_wx_i8m1, 8, 16)
-OPENCV_HAL_IMPL_RVV_PACK(v_uint16x8, ushort, v_uint32x4, unsigned, 16, 32, u16, u32, vnclipu_wx_u16m1, vnclipu_wx_u16m1, 4, 8)
-OPENCV_HAL_IMPL_RVV_PACK(v_int16x8, short, v_int32x4, int, 16, 32, i16, i32, vnclip_wx_i16m1, vnclip_wx_i16m1, 4, 8)
-OPENCV_HAL_IMPL_RVV_PACK(v_uint32x4, unsigned, v_uint64x2, uint64, 32, 64, u32, u64, vnclipu_wx_u32m1, vnsrl_wx_u32m1, 2, 4)
-OPENCV_HAL_IMPL_RVV_PACK(v_int32x4, int, v_int64x2, int64, 32, 64, i32, i64, vnclip_wx_i32m1, vnsra_wx_i32m1, 2, 4)
-
-
-#define OPENCV_HAL_IMPL_RVV_PACK_U(_Tpvec, _Tp, _wTpvec, _wTp, hwidth, width, hsuffix, suffix, rshr, cast, hvl, vl) \
-inline _Tpvec v_pack_u(const _wTpvec& a, const _wTpvec& b) \
-{ \
-    _wTp arr[_Tpvec::nlanes] = {0}; \
-    v_store(arr, a); \
-    v_store(arr + _wTpvec::nlanes, b); \
-    return _Tpvec(rshr(cast(vmax_vx_##suffix##m2(vle##width##_v_##suffix##m2(arr, vl), 0, vl)), 0, vl)); \
-} \
-inline void v_pack_u_store(_Tp* ptr, const _wTpvec& a) \
-{ \
-    _wTp arr[_Tpvec::nlanes] = {0}; \
-    v_store(arr, a); \
-    v_store(arr + _wTpvec::nlanes, _wTpvec(vmv_v_x_##suffix##m1(0, hvl))); \
-    vse##hwidth##_v_##hsuffix##m1(ptr, rshr(cast(vmax_vx_##suffix##m2(vle##width##_v_##suffix##m2(arr, vl), 0, vl)), 0, vl), hvl); \
-} \
-template<int n> inline \
-_Tpvec v_rshr_pack_u(const _wTpvec& a, const _wTpvec& b) \
-{ \
-    _wTp arr[_Tpvec::nlanes] = {0}; \
-    v_store(arr, a); \
-    v_store(arr + _wTpvec::nlanes, b); \
-    return _Tpvec(rshr(cast(vmax_vx_##suffix##m2(vle##width##_v_##suffix##m2(arr, vl), 0, vl)), n, vl)); \
-} \
-template<int n> inline \
-void v_rshr_pack_u_store(_Tp* ptr, const _wTpvec& a) \
-{ \
-    _wTp arr[_Tpvec::nlanes] = {0}; \
-    v_store(arr, a); \
-    v_store(arr + _wTpvec::nlanes, _wTpvec(vmv_v_x_##suffix##m1(0, hvl))); \
-    v_store(ptr, _Tpvec(rshr(cast(vmax_vx_##suffix##m2(vle##width##_v_##suffix##m2(arr, vl), 0, vl)), n, vl))); \
-}
-
-OPENCV_HAL_IMPL_RVV_PACK_U(v_uint8x16, uchar, v_int16x8, short, 8, 16, u8, i16, vnclipu_wx_u8m1, vreinterpret_v_i16m2_u16m2, 8, 16)
-OPENCV_HAL_IMPL_RVV_PACK_U(v_uint16x8, ushort, v_int32x4, int, 16, 32, u16, i32, vnclipu_wx_u16m1, vreinterpret_v_i32m2_u32m2, 4, 8)
-
-
-#define OPENCV_HAL_IMPL_RVV_UNPACKS(_Tpvec, _Tp, suffix) \
-inline void v_zip(const v_##_Tpvec& a0, const v_##_Tpvec& a1, v_##_Tpvec& b0, v_##_Tpvec& b1) \
-{ \
-    _Tp ptra0[v_##_Tpvec::nlanes] = {0}; \
-    _Tp ptra1[v_##_Tpvec::nlanes] = {0}; \
-    _Tp ptrb0[v_##_Tpvec::nlanes] = {0}; \
-    _Tp ptrb1[v_##_Tpvec::nlanes] = {0}; \
-    v_store(ptra0, a0); \
-    v_store(ptra1, a1); \
-    int i; \
-    for( i = 0; i < v_##_Tpvec::nlanes/2; i++ ) \
-    { \
-        ptrb0[i*2] = ptra0[i]; \
-        ptrb0[i*2+1] = ptra1[i]; \
-    } \
-    for( ; i < v_##_Tpvec::nlanes; i++ ) \
-    { \
-        ptrb1[i*2-v_##_Tpvec::nlanes] = ptra0[i]; \
-        ptrb1[i*2-v_##_Tpvec::nlanes+1] = ptra1[i]; \
-    } \
-    b0 = v_load(ptrb0); \
-    b1 = v_load(ptrb1); \
-} \
-inline v_##_Tpvec v_combine_low(const v_##_Tpvec& a, const v_##_Tpvec& b) \
-{ \
-    _Tp ptra[v_##_Tpvec::nlanes/2] = {0}; \
-    _Tp ptrb[v_##_Tpvec::nlanes/2] = {0}; \
-    v_store_low(ptra, a); \
-    v_store_low(ptrb, b); \
-    return v_load_halves(ptra, ptrb); \
-} \
-inline v_##_Tpvec v_combine_high(const v_##_Tpvec& a, const v_##_Tpvec& b) \
-{ \
-    _Tp ptra[v_##_Tpvec::nlanes/2] = {0}; \
-    _Tp ptrb[v_##_Tpvec::nlanes/2] = {0}; \
-    v_store_high(ptra, a); \
-    v_store_high(ptrb, b); \
-    return v_load_halves(ptra, ptrb); \
-} \
-inline void v_recombine(const v_##_Tpvec& a, const v_##_Tpvec& b, v_##_Tpvec& c, v_##_Tpvec& d) \
-{ \
-    c = v_combine_low(a, b); \
-    d = v_combine_high(a, b); \
-}
-
-OPENCV_HAL_IMPL_RVV_UNPACKS(uint8x16, uchar, u8)
-OPENCV_HAL_IMPL_RVV_UNPACKS(int8x16, schar, i8)
-OPENCV_HAL_IMPL_RVV_UNPACKS(uint16x8, ushort, u16)
-OPENCV_HAL_IMPL_RVV_UNPACKS(int16x8, short, i16)
-OPENCV_HAL_IMPL_RVV_UNPACKS(uint32x4, unsigned, u32)
-OPENCV_HAL_IMPL_RVV_UNPACKS(int32x4, int, i32)
-OPENCV_HAL_IMPL_RVV_UNPACKS(float32x4, float, f32)
-#if CV_SIMD128_64F
-OPENCV_HAL_IMPL_RVV_UNPACKS(float64x2, double, f64)
-#endif
-
-
-#define OPENCV_HAL_IMPL_RVV_INTERLEAVED(_Tpvec, _Tp) \
-inline void v_load_deinterleave(const _Tp* ptr, v_##_Tpvec& a, v_##_Tpvec& b) \
-{ \
-    _Tp ptra[v_##_Tpvec::nlanes] = {0}; \
-    _Tp ptrb[v_##_Tpvec::nlanes] = {0}; \
-    int i, i2; \
-    for( i = i2 = 0; i < v_##_Tpvec::nlanes; i++, i2 += 2 ) \
-    { \
-        ptra[i] = ptr[i2]; \
-        ptrb[i] = ptr[i2+1]; \
-    } \
-    a = v_load(ptra); \
-    b = v_load(ptrb); \
-} \
-inline void v_load_deinterleave(const _Tp* ptr, v_##_Tpvec& a, v_##_Tpvec& b, v_##_Tpvec& c) \
-{ \
-    _Tp ptra[v_##_Tpvec::nlanes] = {0}; \
-    _Tp ptrb[v_##_Tpvec::nlanes] = {0}; \
-    _Tp ptrc[v_##_Tpvec::nlanes] = {0}; \
-    int i, i3; \
-    for( i = i3 = 0; i < v_##_Tpvec::nlanes; i++, i3 += 3 ) \
-    { \
-        ptra[i] = ptr[i3]; \
-        ptrb[i] = ptr[i3+1]; \
-        ptrc[i] = ptr[i3+2]; \
-    } \
-    a = v_load(ptra); \
-    b = v_load(ptrb); \
-    c = v_load(ptrc); \
-} \
-inline void v_load_deinterleave(const _Tp* ptr, v_##_Tpvec& a, v_##_Tpvec& b, \
-                                v_##_Tpvec& c, v_##_Tpvec& d) \
-{ \
-    _Tp ptra[v_##_Tpvec::nlanes] = {0}; \
-    _Tp ptrb[v_##_Tpvec::nlanes] = {0}; \
-    _Tp ptrc[v_##_Tpvec::nlanes] = {0}; \
-    _Tp ptrd[v_##_Tpvec::nlanes] = {0}; \
-    int i, i4; \
-    for( i = i4 = 0; i < v_##_Tpvec::nlanes; i++, i4 += 4 ) \
-    { \
-        ptra[i] = ptr[i4]; \
-        ptrb[i] = ptr[i4+1]; \
-        ptrc[i] = ptr[i4+2]; \
-        ptrd[i] = ptr[i4+3]; \
-    } \
-    a = v_load(ptra); \
-    b = v_load(ptrb); \
-    c = v_load(ptrc); \
-    d = v_load(ptrd); \
-} \
-inline void v_store_interleave( _Tp* ptr, const v_##_Tpvec& a, const v_##_Tpvec& b, \
-                                hal::StoreMode /*mode*/=hal::STORE_UNALIGNED) \
-{ \
-    int i, i2; \
-    _Tp ptra[v_##_Tpvec::nlanes] = {0}; \
-    _Tp ptrb[v_##_Tpvec::nlanes] = {0}; \
-    v_store(ptra, a); \
-    v_store(ptrb, b); \
-    for( i = i2 = 0; i < v_##_Tpvec::nlanes; i++, i2 += 2 ) \
-    { \
-        ptr[i2] = ptra[i]; \
-        ptr[i2+1] = ptrb[i]; \
-    } \
-} \
-inline void v_store_interleave( _Tp* ptr, const v_##_Tpvec& a, const v_##_Tpvec& b, \
-                                const v_##_Tpvec& c, hal::StoreMode /*mode*/=hal::STORE_UNALIGNED) \
-{ \
-    int i, i3; \
-    _Tp ptra[v_##_Tpvec::nlanes] = {0}; \
-    _Tp ptrb[v_##_Tpvec::nlanes] = {0}; \
-    _Tp ptrc[v_##_Tpvec::nlanes] = {0}; \
-    v_store(ptra, a); \
-    v_store(ptrb, b); \
-    v_store(ptrc, c); \
-    for( i = i3 = 0; i < v_##_Tpvec::nlanes; i++, i3 += 3 ) \
-    { \
-        ptr[i3] = ptra[i]; \
-        ptr[i3+1] = ptrb[i]; \
-        ptr[i3+2] = ptrc[i]; \
-    } \
-} \
-inline void v_store_interleave( _Tp* ptr, const v_##_Tpvec& a, const v_##_Tpvec& b, \
-                                const v_##_Tpvec& c, const v_##_Tpvec& d, \
-                                hal::StoreMode /*mode*/=hal::STORE_UNALIGNED ) \
-{ \
-    int i, i4; \
-    _Tp ptra[v_##_Tpvec::nlanes] = {0}; \
-    _Tp ptrb[v_##_Tpvec::nlanes] = {0}; \
-    _Tp ptrc[v_##_Tpvec::nlanes] = {0}; \
-    _Tp ptrd[v_##_Tpvec::nlanes] = {0}; \
-    v_store(ptra, a); \
-    v_store(ptrb, b); \
-    v_store(ptrc, c); \
-    v_store(ptrd, d); \
-    for( i = i4 = 0; i < v_##_Tpvec::nlanes; i++, i4 += 4 ) \
-    { \
-        ptr[i4] = ptra[i]; \
-        ptr[i4+1] = ptrb[i]; \
-        ptr[i4+2] = ptrc[i]; \
-        ptr[i4+3] = ptrd[i]; \
-    } \
-} \
-inline v_##_Tpvec v_interleave_pairs(const v_##_Tpvec& vec) \
-{ \
-    _Tp ptr[v_##_Tpvec::nlanes] = {0}; \
-    _Tp ptrvec[v_##_Tpvec::nlanes] = {0}; \
-    v_store(ptrvec, vec); \
-    for (int i = 0; i < v_##_Tpvec::nlanes/4; i++) \
-    { \
-        ptr[4*i  ] = ptrvec[4*i  ]; \
-        ptr[4*i+1] = ptrvec[4*i+2]; \
-        ptr[4*i+2] = ptrvec[4*i+1]; \
-        ptr[4*i+3] = ptrvec[4*i+3]; \
-    } \
-    return v_load(ptr); \
-} \
-inline v_##_Tpvec v_interleave_quads(const v_##_Tpvec& vec) \
-{ \
-    _Tp ptr[v_##_Tpvec::nlanes] = {0}; \
-    _Tp ptrvec[v_##_Tpvec::nlanes] = {0}; \
-    v_store(ptrvec, vec); \
-    for (int i = 0; i < v_##_Tpvec::nlanes/8; i++) \
-    { \
-        ptr[8*i  ] = ptrvec[4*i  ]; \
-        ptr[8*i+1] = ptrvec[4*i+4]; \
-        ptr[8*i+2] = ptrvec[4*i+1]; \
-        ptr[8*i+3] = ptrvec[4*i+5]; \
-        ptr[8*i+4] = ptrvec[4*i+2]; \
-        ptr[8*i+5] = ptrvec[4*i+6]; \
-        ptr[8*i+6] = ptrvec[4*i+3]; \
-        ptr[8*i+7] = ptrvec[4*i+7]; \
-    } \
-    return v_load(ptr); \
-}
-
-OPENCV_HAL_IMPL_RVV_INTERLEAVED(uint8x16, uchar)
-OPENCV_HAL_IMPL_RVV_INTERLEAVED(int8x16, schar)
-OPENCV_HAL_IMPL_RVV_INTERLEAVED(uint16x8, ushort)
-OPENCV_HAL_IMPL_RVV_INTERLEAVED(int16x8, short)
-OPENCV_HAL_IMPL_RVV_INTERLEAVED(uint32x4, unsigned)
-OPENCV_HAL_IMPL_RVV_INTERLEAVED(int32x4, int)
-OPENCV_HAL_IMPL_RVV_INTERLEAVED(float32x4, float)
-OPENCV_HAL_IMPL_RVV_INTERLEAVED(uint64x2, uint64)
-OPENCV_HAL_IMPL_RVV_INTERLEAVED(int64x2, int64)
-#if CV_SIMD128_64F
-OPENCV_HAL_IMPL_RVV_INTERLEAVED(float64x2, double)
-#endif
-
-//////////// PopCount ////////////
-
-static const unsigned char popCountTable[] =
-{
-    0, 1, 1, 2, 1, 2, 2, 3, 1, 2, 2, 3, 2, 3, 3, 4,
-    1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5,
-    1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5,
-    2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6,
-    1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5,
-    2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6,
-    2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6,
-    3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, 7,
-    1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5,
-    2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6,
-    2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6,
-    3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, 7,
-    2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6,
-    3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, 7,
-    3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, 7,
-    4, 5, 5, 6, 5, 6, 6, 7, 5, 6, 6, 7, 6, 7, 7, 8,
-};
-
-#define OPENCV_HAL_IMPL_RVV_POPCOUNT_OP(_rTpvec, _Tpvec, _rTp, _Tp, suffix) \
-inline _rTpvec v_popcount(const _Tpvec& a) \
-{ \
-    uchar ptra[16] = {0}; \
-    v_store(ptra, v_reinterpret_as_u8(a)); \
-    _rTp ptr[_Tpvec::nlanes] = {0}; \
-    v_store(ptr, v_setzero_##suffix()); \
-    for (int i = 0; i < _Tpvec::nlanes*(int)sizeof(_Tp); i++) \
-        ptr[i/sizeof(_Tp)] += popCountTable[ptra[i]]; \
-    return v_load(ptr); \
-}
-
-OPENCV_HAL_IMPL_RVV_POPCOUNT_OP(v_uint8x16, v_uint8x16, uchar, uchar, u8)
-OPENCV_HAL_IMPL_RVV_POPCOUNT_OP(v_uint8x16, v_int8x16, uchar, schar, u8)
-OPENCV_HAL_IMPL_RVV_POPCOUNT_OP(v_uint16x8, v_uint16x8, ushort, ushort, u16)
-OPENCV_HAL_IMPL_RVV_POPCOUNT_OP(v_uint16x8, v_int16x8, ushort, short, u16)
-OPENCV_HAL_IMPL_RVV_POPCOUNT_OP(v_uint32x4, v_uint32x4, unsigned, unsigned, u32)
-OPENCV_HAL_IMPL_RVV_POPCOUNT_OP(v_uint32x4, v_int32x4, unsigned, int, u32)
-OPENCV_HAL_IMPL_RVV_POPCOUNT_OP(v_uint64x2, v_uint64x2, uint64, uint64, u64)
-OPENCV_HAL_IMPL_RVV_POPCOUNT_OP(v_uint64x2, v_int64x2, uint64, int64, u64)
-
-//////////// SignMask ////////////
-
-#ifndef __clang__
-#define OPENCV_HAL_IMPL_RVV_SIGNMASK_OP(_Tpvec, _Tp, suffix, vl, shift) \
-inline int v_signmask(const _Tpvec& a) \
-{ \
-    int mask = 0; \
-    _Tpvec tmp = _Tpvec(vsrl_vx_##suffix##m1(a, shift, vl)); \
-    for( int i = 0; i < _Tpvec::nlanes; i++ ) \
-        mask |= (int)(tmp.val[i]) << i; \
-    return mask; \
-}
-
-OPENCV_HAL_IMPL_RVV_SIGNMASK_OP(v_uint8x16, uchar, u8, 16, 7)
-OPENCV_HAL_IMPL_RVV_SIGNMASK_OP(v_uint16x8, ushort, u16, 8, 15)
-OPENCV_HAL_IMPL_RVV_SIGNMASK_OP(v_uint32x4, unsigned, u32, 4, 31)
-OPENCV_HAL_IMPL_RVV_SIGNMASK_OP(v_uint64x2, uint64, u64, 2, 63)
-
-inline int v_signmask(const v_int8x16& a)
-{ return v_signmask(v_reinterpret_as_u8(a)); }
-inline int v_signmask(const v_int16x8& a)
-{ return v_signmask(v_reinterpret_as_u16(a)); }
-inline int v_signmask(const v_int32x4& a)
-{ return v_signmask(v_reinterpret_as_u32(a)); }
-inline int v_signmask(const v_float32x4& a)
-{ return v_signmask(v_reinterpret_as_u32(a)); }
-inline int v_signmask(const v_int64x2& a)
-{ return v_signmask(v_reinterpret_as_u64(a)); }
-#if CV_SIMD128_64F
-inline int v_signmask(const v_float64x2& a)
-{ return v_signmask(v_reinterpret_as_u64(a)); }
-#endif
-
-#else
-#define OPENCV_HAL_IMPL_RVV_SIGNMASK_OP(_Tpvec, width, vl) \
-inline int v_signmask(const _Tpvec& a) \
-{ \
-    uint8_t ans[16] = {0};\
-    vsm(ans, vmslt(a, 0, vl), vl);\
-    return reinterpret_cast<int*>(ans)[0];\
-}
-
-OPENCV_HAL_IMPL_RVV_SIGNMASK_OP(v_int8x16, 8, 16)
-OPENCV_HAL_IMPL_RVV_SIGNMASK_OP(v_int16x8, 16, 8)
-OPENCV_HAL_IMPL_RVV_SIGNMASK_OP(v_int32x4, 32, 4)
-OPENCV_HAL_IMPL_RVV_SIGNMASK_OP(v_int64x2, 64, 2)
-
-inline int v_signmask(const v_uint8x16& a)
-{ return v_signmask(v_reinterpret_as_s8(a)); }
-inline int v_signmask(const v_uint16x8& a)
-{ return v_signmask(v_reinterpret_as_s16(a)); }
-inline int v_signmask(const v_uint32x4& a)
-{ return v_signmask(v_reinterpret_as_s32(a)); }
-inline int v_signmask(const v_float32x4& a)
-{ return v_signmask(v_reinterpret_as_s32(a)); }
-inline int v_signmask(const v_uint64x2& a)
-{ return v_signmask(v_reinterpret_as_s64(a)); }
-#if CV_SIMD128_64F
-inline int v_signmask(const v_float64x2& a)
-{ return v_signmask(v_reinterpret_as_s64(a)); }
-#endif
-
-#endif
-
-//////////// Scan forward ////////////
-
-#define OPENCV_HAL_IMPL_RVV_SCAN_FORWOARD_OP(_Tpvec, _Tp, suffix) \
-inline int v_scan_forward(const _Tpvec& a) \
-{ \
-    _Tp ptr[_Tpvec::nlanes] = {0}; \
-    v_store(ptr, v_reinterpret_as_##suffix(a)); \
-    for (int i = 0; i < _Tpvec::nlanes; i++) \
-        if(int(ptr[i]) < 0) \
-            return i; \
-    return 0; \
-}
-
-OPENCV_HAL_IMPL_RVV_SCAN_FORWOARD_OP(v_uint8x16, uchar, u8)
-OPENCV_HAL_IMPL_RVV_SCAN_FORWOARD_OP(v_int8x16, schar, s8)
-OPENCV_HAL_IMPL_RVV_SCAN_FORWOARD_OP(v_uint16x8, ushort, u16)
-OPENCV_HAL_IMPL_RVV_SCAN_FORWOARD_OP(v_int16x8, short, s16)
-OPENCV_HAL_IMPL_RVV_SCAN_FORWOARD_OP(v_uint32x4, unsigned, u32)
-OPENCV_HAL_IMPL_RVV_SCAN_FORWOARD_OP(v_int32x4, int, s32)
-OPENCV_HAL_IMPL_RVV_SCAN_FORWOARD_OP(v_float32x4, float, f32)
-OPENCV_HAL_IMPL_RVV_SCAN_FORWOARD_OP(v_uint64x2, uint64, u64)
-OPENCV_HAL_IMPL_RVV_SCAN_FORWOARD_OP(v_int64x2, int64, s64)
-#if CV_SIMD128_64F
-OPENCV_HAL_IMPL_RVV_SCAN_FORWOARD_OP(v_float64x2, double, f64)
-#endif
-
-//////////// Pack triplets ////////////
-
-// use reinterpret instead of c-style casting.
-#ifndef __clang__
-inline v_int8x16 v_pack_triplets(const v_int8x16& vec)
-{
-    uint64 ptr[2] = {0x0908060504020100, 0xFFFFFFFF0E0D0C0A};
-    return v_int8x16((vint8m1_t)vrgather_vv_u8m1((vuint8m1_t)vint8m1_t(vec), (vuint8m1_t)vle64_v_u64m1(ptr, 2), 16));
-}
-inline v_uint8x16 v_pack_triplets(const v_uint8x16& vec)
-{
-    return v_reinterpret_as_u8(v_pack_triplets(v_reinterpret_as_s8(vec)));
-}
-
-inline v_int16x8 v_pack_triplets(const v_int16x8& vec)
-{
-    uint64 ptr[2] = {0x0908060504020100, 0xFFFFFFFF0E0D0C0A};
-    return v_int16x8((vint16m1_t)vrgather_vv_u8m1((vuint8m1_t)vint16m1_t(vec), (vuint8m1_t)vle64_v_u64m1(ptr, 2), 16));
-}
-inline v_uint16x8 v_pack_triplets(const v_uint16x8& vec)
-{
-    return v_reinterpret_as_u16(v_pack_triplets(v_reinterpret_as_s16(vec)));
-}
-
-inline v_int32x4 v_pack_triplets(const v_int32x4& vec) { return vec; }
-inline v_uint32x4 v_pack_triplets(const v_uint32x4& vec) { return vec; }
-inline v_float32x4 v_pack_triplets(const v_float32x4& vec) { return vec; }
-
-#else
-
-inline v_int8x16 v_pack_triplets(const v_int8x16& vec)
-{
-    uint64 ptr[2] = {0x0908060504020100, 0xFFFFFFFF0E0D0C0A};
-    return v_int8x16(vreinterpret_i8m1(vrgather_vv_u8m1(v_reinterpret_as_u8(vec), vreinterpret_u8m1(vle64_v_u64m1(ptr, 2)), 16)));
-}
-inline v_uint8x16 v_pack_triplets(const v_uint8x16& vec)
-{
-    return v_reinterpret_as_u8(v_pack_triplets(v_reinterpret_as_s8(vec)));
-}
-
-inline v_int16x8 v_pack_triplets(const v_int16x8& vec)
-{
-    uint64 ptr[2] = {0x0908060504020100, 0xFFFFFFFF0E0D0C0A};
-    return v_int16x8(v_reinterpret_as_s16(v_uint8x16(vrgather_vv_u8m1(v_reinterpret_as_u8(vec), vreinterpret_u8m1(vle64_v_u64m1(ptr, 2)), 16))));
-}
-inline v_uint16x8 v_pack_triplets(const v_uint16x8& vec)
-{
-    return v_reinterpret_as_u16(v_pack_triplets(v_reinterpret_as_s16(vec)));
-}
-
-inline v_int32x4 v_pack_triplets(const v_int32x4& vec) { return vec; }
-inline v_uint32x4 v_pack_triplets(const v_uint32x4& vec) { return vec; }
-inline v_float32x4 v_pack_triplets(const v_float32x4& vec) { return vec; }
-
-#endif
-
-////// FP16 support ///////
-
-#if CV_FP16
-inline v_float32x4 v_load_expand(const float16_t* ptr)
-{
-    return v_float32x4(vfwcvt_f_f_v_f32m1(vle16_v_f16mf2(ptr, 4), 4));
-}
-
-inline void v_pack_store(float16_t* ptr, const v_float32x4& v)
-{
-    vse16_v_f16mf2(ptr, vfncvt_f_f_w_f16mf2(v, 4), 4);
-}
-#else
-inline v_float32x4 v_load_expand(const float16_t* ptr)
-{
-    const int N = 4;
-    float buf[N];
-    for( int i = 0; i < N; i++ ) buf[i] = (float)ptr[i];
-    return v_load(buf);
-}
-
-inline void v_pack_store(float16_t* ptr, const v_float32x4& v)
-{
-    const int N = 4;
-    float buf[N];
-    v_store(buf, v);
-    for( int i = 0; i < N; i++ ) ptr[i] = float16_t(buf[i]);
-}
-#endif
-
-////////////// Rounding //////////////
-
-inline v_int32x4 v_round(const v_float32x4& a)
-{
-    return v_int32x4(vfcvt_x_f_v_i32m1(a, 4));
-}
-
-inline v_int32x4 v_floor(const v_float32x4& a)
-{
-    v_float32x4 ZP5 = v_setall_f32(0.5f);
-    v_float32x4 t = a - ZP5;
-    return v_int32x4(vfcvt_x_f_v_i32m1(t, 4));
-}
-
-inline v_int32x4 v_ceil(const v_float32x4& a)
-{
-    v_float32x4 ZP5 = v_setall_f32(0.5f);
-    v_float32x4 t = a + ZP5;
-    return v_int32x4(vfcvt_x_f_v_i32m1(t, 4));
-}
-
-inline v_int32x4 v_trunc(const v_float32x4& a)
-{
-    return v_int32x4(vfcvt_rtz_x_f_v_i32m1(a, 4));
-}
-#if CV_SIMD128_64F
-#ifndef __clang__
-inline v_int32x4 v_round(const v_float64x2& a)
-{
-    double arr[4] = {a.val[0], a.val[1], 0, 0};
-    vfloat64m2_t tmp = vle64_v_f64m2(arr, 4);
-    return v_int32x4(vfncvt_x_f_w_i32m1(tmp, 4));
-}
-
-inline v_int32x4 v_round(const v_float64x2& a, const v_float64x2& b)
-{
-    double arr[4] = {a.val[0], a.val[1], b.val[0], b.val[1]};
-    vfloat64m2_t tmp = vle64_v_f64m2(arr, 4);
-    return v_int32x4(vfncvt_x_f_w_i32m1(tmp, 4));
-}
-
-inline v_int32x4 v_floor(const v_float64x2& a)
-{
-    double arr[4] = {a.val[0]-0.5f, a.val[1]-0.5f, 0, 0};
-    vfloat64m2_t tmp = vle64_v_f64m2(arr, 4);
-    return v_int32x4(vfncvt_x_f_w_i32m1(tmp, 4));
-}
-
-inline v_int32x4 v_ceil(const v_float64x2& a)
-{
-    double arr[4] = {a.val[0]+0.5f, a.val[1]+0.5f, 0, 0};
-    vfloat64m2_t tmp = vle64_v_f64m2(arr, 4);
-    return v_int32x4(vfncvt_x_f_w_i32m1(tmp, 4));
-}
-
-inline v_int32x4 v_trunc(const v_float64x2& a)
-{
-    double arr[4] = {a.val[0], a.val[1], 0, 0};
-    vfloat64m2_t tmp = vle64_v_f64m2(arr, 4);
-    return v_int32x4(vfncvt_rtz_x_f_w_i32m1(tmp, 4));
-}
-
-#else
-inline v_int32x4 v_round(const v_float64x2& a)
-{
-    vfloat64m2_t zero = vfmv_v_f_f64m2(0, 4);
-    return v_int32x4(vfncvt_x_f_w_i32m1(vset_v_f64m1_f64m2(zero, 0, a), 4));
-}
-
-inline v_int32x4 v_round(const v_float64x2& a, const v_float64x2& b)
-{
-    vfloat64m2_t dst = vlmul_ext_v_f64m1_f64m2(a);
-    return v_int32x4(vfncvt_x_f_w_i32m1(vset_v_f64m1_f64m2(dst, 1, b), 4));
-}
-
-inline v_int32x4 v_floor(const v_float64x2& a)
-{
-    vfloat64m2_t dst = vfmv_v_f_f64m2(0, 4);
-    dst = vset_v_f64m1_f64m2(dst, 0, a);
-    dst = vfsub_vf_f64m2(dst, 0.5, 2);
-    return v_int32x4(vfncvt_x_f_w_i32m1(dst, 4));
-}
-
-inline v_int32x4 v_ceil(const v_float64x2& a)
-{
-    vfloat64m2_t dst = vfmv_v_f_f64m2(0, 4);
-    dst = vset_v_f64m1_f64m2(dst, 0, a);
-    dst = vfadd_vf_f64m2(dst, 0.5, 2);
-    return v_int32x4(vfncvt_x_f_w_i32m1(dst, 4));
-}
-
-inline v_int32x4 v_trunc(const v_float64x2& a)
-{
-    vfloat64m2_t zero = vfmv_v_f_f64m2(0, 4);
-    return v_int32x4(vfncvt_rtz_x_f_w_i32m1(vset_v_f64m1_f64m2(zero, 0, a), 4));
-}
-#endif
-#endif
-
-
-//////// Dot Product ////////
-
-// 16 >> 32
-inline v_int32x4 v_dotprod(const v_int16x8& a, const v_int16x8& b)
-{
-    int ptr[8] = {0};
-    v_int32x4 t1, t2;
-    vse32_v_i32m2(ptr, vwmul_vv_i32m2(a, b, 8), 8);
-    v_load_deinterleave(ptr, t1, t2);
-    return t1 + t2;
-}
-inline v_int32x4 v_dotprod(const v_int16x8& a, const v_int16x8& b, const v_int32x4& c)
-{
-    int ptr[8] = {0};
-    v_int32x4 t1, t2;
-    vse32_v_i32m2(ptr, vwmul_vv_i32m2(a, b, 8), 8);
-    v_load_deinterleave(ptr, t1, t2);
-    return t1 + t2 + c;
-}
-
-// 32 >> 64
-inline v_int64x2 v_dotprod(const v_int32x4& a, const v_int32x4& b)
-{
-    int64 ptr[4] = {0};
-    v_int64x2 t1, t2;
-    vse64_v_i64m2(ptr, vwmul_vv_i64m2(a, b, 4), 4);
-    v_load_deinterleave(ptr, t1, t2);
-    return t1 + t2;
-}
-inline v_int64x2 v_dotprod(const v_int32x4& a, const v_int32x4& b, const v_int64x2& c)
-{
-    int64 ptr[4] = {0};
-    v_int64x2 t1, t2;
-    vse64_v_i64m2(ptr, vwmul_vv_i64m2(a, b, 4), 4);
-    v_load_deinterleave(ptr, t1, t2);
-    return t1 + t2 + c;
-}
-
-// 8 >> 32
-inline v_uint32x4 v_dotprod_expand(const v_uint8x16& a, const v_uint8x16& b)
-{
-    unsigned ptr[16] = {0};
-    v_uint32x4 t1, t2, t3, t4;
-    vse32_v_u32m4(ptr, vwcvtu_x_x_v_u32m4(vwmulu_vv_u16m2(a, b, 16), 16), 16);
-    v_load_deinterleave(ptr, t1, t2, t3, t4);
-    return t1 + t2 + t3 + t4;
-}
-inline v_uint32x4 v_dotprod_expand(const v_uint8x16& a, const v_uint8x16& b,
-                                   const v_uint32x4& c)
-{
-    unsigned ptr[16] = {0};
-    v_uint32x4 t1, t2, t3, t4;
-    vse32_v_u32m4(ptr, vwcvtu_x_x_v_u32m4(vwmulu_vv_u16m2(a, b, 16), 16), 16);
-    v_load_deinterleave(ptr, t1, t2, t3, t4);
-    return t1 + t2 + t3 + t4 + c;
-}
-
-inline v_int32x4 v_dotprod_expand(const v_int8x16& a, const v_int8x16& b)
-{
-    int ptr[16] = {0};
-    v_int32x4 t1, t2, t3, t4;
-    vse32_v_i32m4(ptr, vwcvt_x_x_v_i32m4(vwmul_vv_i16m2(a, b, 16), 16), 16);
-    v_load_deinterleave(ptr, t1, t2, t3, t4);
-    return t1 + t2 + t3 + t4;
-}
-inline v_int32x4 v_dotprod_expand(const v_int8x16& a, const v_int8x16& b,
-                                  const v_int32x4& c)
-{
-    int ptr[16] = {0};
-    v_int32x4 t1, t2, t3, t4;
-    vse32_v_i32m4(ptr, vwcvt_x_x_v_i32m4(vwmul_vv_i16m2(a, b, 16), 16), 16);
-    v_load_deinterleave(ptr, t1, t2, t3, t4);
-    return t1 + t2 + t3 + t4 + c;
-}
-
-// 16 >> 64
-inline v_uint64x2 v_dotprod_expand(const v_uint16x8& a, const v_uint16x8& b)
-{
-    uint64 ptr[8] = {0};
-    v_uint64x2 t1, t2, t3, t4;
-    vse64_v_u64m4(ptr, vwcvtu_x_x_v_u64m4(vwmulu_vv_u32m2(a, b, 8), 8), 8);
-    v_load_deinterleave(ptr, t1, t2, t3, t4);
-    return t1 + t2 + t3 + t4;
-}
-inline v_uint64x2 v_dotprod_expand(const v_uint16x8& a, const v_uint16x8& b, const v_uint64x2& c)
-{
-    uint64 ptr[8] = {0};
-    v_uint64x2 t1, t2, t3, t4;
-    vse64_v_u64m4(ptr, vwcvtu_x_x_v_u64m4(vwmulu_vv_u32m2(a, b, 8), 8), 8);
-    v_load_deinterleave(ptr, t1, t2, t3, t4);
-    return t1 + t2 + t3 + t4 + c;
-}
-
-inline v_int64x2 v_dotprod_expand(const v_int16x8& a, const v_int16x8& b)
-{
-    int64 ptr[8] = {0};
-    v_int64x2 t1, t2, t3, t4;
-    vse64_v_i64m4(ptr, vwcvt_x_x_v_i64m4(vwmul_vv_i32m2(a, b, 8), 8), 8);
-    v_load_deinterleave(ptr, t1, t2, t3, t4);
-    return t1 + t2 + t3 + t4;
-}
-inline v_int64x2 v_dotprod_expand(const v_int16x8& a, const v_int16x8& b,
-                                  const v_int64x2& c)
-{
-    int64 ptr[8] = {0};
-    v_int64x2 t1, t2, t3, t4;
-    vse64_v_i64m4(ptr, vwcvt_x_x_v_i64m4(vwmul_vv_i32m2(a, b, 8), 8), 8);
-    v_load_deinterleave(ptr, t1, t2, t3, t4);
-    return t1 + t2 + t3 + t4 + c;
-}
-
-// 32 >> 64f
-#if CV_SIMD128_64F
-inline v_float64x2 v_dotprod_expand(const v_int32x4& a, const v_int32x4& b)
-{ return v_cvt_f64(v_dotprod(a, b)); }
-inline v_float64x2 v_dotprod_expand(const v_int32x4& a,   const v_int32x4& b,
-                                    const v_float64x2& c)
-{ return v_dotprod_expand(a, b) + c; }
-#endif
-
-//////// Fast Dot Product ////////
-
-// 16 >> 32
-inline v_int32x4 v_dotprod_fast(const v_int16x8& a, const v_int16x8& b)
-{
-    int ptr[8] = {0};
-    vse32_v_i32m2(ptr, vwmul_vv_i32m2(a, b, 8), 8);
-    v_int32x4 t1 = v_load(ptr);
-    v_int32x4 t2 = v_load(ptr+4);
-    return t1 + t2;
-}
-inline v_int32x4 v_dotprod_fast(const v_int16x8& a, const v_int16x8& b, const v_int32x4& c)
-{
-    int ptr[8] = {0};
-    vse32_v_i32m2(ptr, vwmul_vv_i32m2(a, b, 8), 8);
-    v_int32x4 t1 = v_load(ptr);
-    v_int32x4 t2 = v_load(ptr+4);
-    return t1 + t2 + c;
-}
-
-// 32 >> 64
-inline v_int64x2 v_dotprod_fast(const v_int32x4& a, const v_int32x4& b)
-{
-    int64 ptr[4] = {0};
-    vse64_v_i64m2(ptr, vwmul_vv_i64m2(a, b, 4), 4);
-    v_int64x2 t1 = v_load(ptr);
-    v_int64x2 t2 = v_load(ptr+2);
-    return t1 + t2;
-}
-inline v_int64x2 v_dotprod_fast(const v_int32x4& a, const v_int32x4& b, const v_int64x2& c)
-{
-    int64 ptr[4] = {0};
-    vse64_v_i64m2(ptr, vwmul_vv_i64m2(a, b, 4), 4);
-    v_int64x2 t1 = v_load(ptr);
-    v_int64x2 t2 = v_load(ptr+2);
-    return t1 + t2 + c;
-}
-
-
-// 8 >> 32
-inline v_uint32x4 v_dotprod_expand_fast(const v_uint8x16& a, const v_uint8x16& b)
-{
-    unsigned ptr[16] = {0};
-    vse32_v_u32m4(ptr, vwcvtu_x_x_v_u32m4(vwmulu_vv_u16m2(a, b, 16), 16), 16);
-    v_uint32x4 t1 = v_load(ptr);
-    v_uint32x4 t2 = v_load(ptr+4);
-    v_uint32x4 t3 = v_load(ptr+8);
-    v_uint32x4 t4 = v_load(ptr+12);
-    return t1 + t2 + t3 + t4;
-}
-inline v_uint32x4 v_dotprod_expand_fast(const v_uint8x16& a, const v_uint8x16& b, const v_uint32x4& c)
-{
-    unsigned ptr[16] = {0};
-    vse32_v_u32m4(ptr, vwcvtu_x_x_v_u32m4(vwmulu_vv_u16m2(a, b, 16), 16), 16);
-    v_uint32x4 t1 = v_load(ptr);
-    v_uint32x4 t2 = v_load(ptr+4);
-    v_uint32x4 t3 = v_load(ptr+8);
-    v_uint32x4 t4 = v_load(ptr+12);
-    return t1 + t2 + t3 + t4 + c;
-}
-inline v_int32x4 v_dotprod_expand_fast(const v_int8x16& a, const v_int8x16& b)
-{
-    int ptr[16] = {0};
-    vse32_v_i32m4(ptr, vwcvt_x_x_v_i32m4(vwmul_vv_i16m2(a, b, 16), 16), 16);
-    v_int32x4 t1 = v_load(ptr);
-    v_int32x4 t2 = v_load(ptr+4);
-    v_int32x4 t3 = v_load(ptr+8);
-    v_int32x4 t4 = v_load(ptr+12);
-    return t1 + t2 + t3 + t4;
-}
-inline v_int32x4 v_dotprod_expand_fast(const v_int8x16& a, const v_int8x16& b, const v_int32x4& c)
-{
-    int ptr[16] = {0};
-    vse32_v_i32m4(ptr, vwcvt_x_x_v_i32m4(vwmul_vv_i16m2(a, b, 16), 16), 16);
-    v_int32x4 t1 = v_load(ptr);
-    v_int32x4 t2 = v_load(ptr+4);
-    v_int32x4 t3 = v_load(ptr+8);
-    v_int32x4 t4 = v_load(ptr+12);
-    return t1 + t2 + t3 + t4 + c;
-}
-
-// 16 >> 64
-inline v_uint64x2 v_dotprod_expand_fast(const v_uint16x8& a, const v_uint16x8& b)
-{
-    uint64 ptr[8] = {0};
-    vse64_v_u64m4(ptr, vwcvtu_x_x_v_u64m4(vwmulu_vv_u32m2(a, b, 8), 8), 8);
-    v_uint64x2 t1 = v_load(ptr);
-    v_uint64x2 t2 = v_load(ptr+2);
-    v_uint64x2 t3 = v_load(ptr+4);
-    v_uint64x2 t4 = v_load(ptr+6);
-    return t1 + t2 + t3 + t4;
-}
-inline v_uint64x2 v_dotprod_expand_fast(const v_uint16x8& a, const v_uint16x8& b, const v_uint64x2& c)
-{
-    uint64 ptr[8] = {0};
-    vse64_v_u64m4(ptr, vwcvtu_x_x_v_u64m4(vwmulu_vv_u32m2(a, b, 8), 8), 8);
-    v_uint64x2 t1 = v_load(ptr);
-    v_uint64x2 t2 = v_load(ptr+2);
-    v_uint64x2 t3 = v_load(ptr+4);
-    v_uint64x2 t4 = v_load(ptr+6);
-    return t1 + t2 + t3 + t4 + c;
-}
-inline v_int64x2 v_dotprod_expand_fast(const v_int16x8& a, const v_int16x8& b)
-{
-    int64 ptr[8] = {0};
-    vse64_v_i64m4(ptr, vwcvt_x_x_v_i64m4(vwmul_vv_i32m2(a, b, 8), 8), 8);
-    v_int64x2 t1 = v_load(ptr);
-    v_int64x2 t2 = v_load(ptr+2);
-    v_int64x2 t3 = v_load(ptr+4);
-    v_int64x2 t4 = v_load(ptr+6);
-    return t1 + t2 + t3 + t4;
-}
-inline v_int64x2 v_dotprod_expand_fast(const v_int16x8& a, const v_int16x8& b, const v_int64x2& c)
-{
-    int64 ptr[8] = {0};
-    vse64_v_i64m4(ptr, vwcvt_x_x_v_i64m4(vwmul_vv_i32m2(a, b, 8), 8), 8);
-    v_int64x2 t1 = v_load(ptr);
-    v_int64x2 t2 = v_load(ptr+2);
-    v_int64x2 t3 = v_load(ptr+4);
-    v_int64x2 t4 = v_load(ptr+6);
-    return t1 + t2 + t3 + t4 + c;
-}
-
-// 32 >> 64f
-#if CV_SIMD128_64F
-inline v_float64x2 v_dotprod_expand_fast(const v_int32x4& a, const v_int32x4& b)
-{ return v_cvt_f64(v_dotprod_fast(a, b)); }
-inline v_float64x2 v_dotprod_expand_fast(const v_int32x4& a, const v_int32x4& b, const v_float64x2& c)
-{ return v_dotprod_expand_fast(a, b) + c; }
-#endif
-
-
-inline v_float32x4 v_matmul(const v_float32x4& v, const v_float32x4& m0,
-                            const v_float32x4& m1, const v_float32x4& m2,
-                            const v_float32x4& m3)
-{
-    vfloat32m1_t res = vfmul_vf_f32m1(m0, v_extract_n<0>(v), 4);
-    res = vfmacc_vf_f32m1(res, v_extract_n<1>(v), m1, 4);
-    res = vfmacc_vf_f32m1(res, v_extract_n<2>(v), m2, 4);
-    res = vfmacc_vf_f32m1(res, v_extract_n<3>(v), m3, 4);
-    return v_float32x4(res);
-}
-
-inline v_float32x4 v_matmuladd(const v_float32x4& v, const v_float32x4& m0,
-                               const v_float32x4& m1, const v_float32x4& m2,
-                               const v_float32x4& a)
-{
-    vfloat32m1_t res = vfmul_vf_f32m1(m0, v_extract_n<0>(v), 4);
-    res = vfmacc_vf_f32m1(res, v_extract_n<1>(v), m1, 4);
-    res = vfmacc_vf_f32m1(res, v_extract_n<2>(v), m2, 4);
-    return v_float32x4(res) + a;
-}
-
-#define OPENCV_HAL_IMPL_RVV_MUL_EXPAND(_Tpvec, _Tpwvec, _Tpw, suffix, wmul, width, vl, hvl) \
-inline void v_mul_expand(const _Tpvec& a, const _Tpvec& b, _Tpwvec& c, _Tpwvec& d) \
-{ \
-    _Tpw ptr[_Tpwvec::nlanes*2] = {0}; \
-    vse##width##_v_##suffix##m2(ptr, wmul(a, b, vl), vl); \
-    c = _Tpwvec(vle##width##_v_##suffix##m1(ptr, hvl)); \
-    d = _Tpwvec(vle##width##_v_##suffix##m1(ptr+_Tpwvec::nlanes, hvl)); \
-}
-
-OPENCV_HAL_IMPL_RVV_MUL_EXPAND(v_uint8x16, v_uint16x8, ushort, u16, vwmulu_vv_u16m2, 16, 16, 8)
-OPENCV_HAL_IMPL_RVV_MUL_EXPAND(v_int8x16, v_int16x8, short, i16, vwmul_vv_i16m2, 16, 16, 8)
-OPENCV_HAL_IMPL_RVV_MUL_EXPAND(v_uint16x8, v_uint32x4, unsigned, u32, vwmulu_vv_u32m2, 32, 8, 4)
-OPENCV_HAL_IMPL_RVV_MUL_EXPAND(v_int16x8, v_int32x4, int, i32, vwmul_vv_i32m2, 32, 8, 4)
-OPENCV_HAL_IMPL_RVV_MUL_EXPAND(v_uint32x4, v_uint64x2, uint64, u64, vwmulu_vv_u64m2, 64, 4, 2)
-
-
-inline v_int16x8 v_mul_hi(const v_int16x8& a, const v_int16x8& b)
-{
-    return v_int16x8(vnsra_wx_i16m1(vwmul_vv_i32m2(a, b, 8), 16, 8));
-}
-inline v_uint16x8 v_mul_hi(const v_uint16x8& a, const v_uint16x8& b)
-{
-    return v_uint16x8(vnsrl_wx_u16m1(vwmulu_vv_u32m2(a, b, 8), 16, 8));
-}
-
-
-//////// Saturating Multiply ////////
-
-#define OPENCV_HAL_IMPL_RVV_MUL_SAT(_Tpvec, _wTpvec) \
-inline _Tpvec operator * (const _Tpvec& a, const _Tpvec& b) \
-{ \
-    _wTpvec c, d; \
-    v_mul_expand(a, b, c, d); \
-    return v_pack(c, d); \
-} \
-inline _Tpvec& operator *= (_Tpvec& a, const _Tpvec& b) \
-{ \
-    a = a * b; \
-    return a; \
-}
-
-OPENCV_HAL_IMPL_RVV_MUL_SAT(v_uint8x16, v_uint16x8)
-OPENCV_HAL_IMPL_RVV_MUL_SAT(v_int8x16, v_int16x8)
-OPENCV_HAL_IMPL_RVV_MUL_SAT(v_uint16x8, v_uint32x4)
-OPENCV_HAL_IMPL_RVV_MUL_SAT(v_int16x8, v_int32x4)
-
-
-inline void v_cleanup() {}
-
-CV_CPU_OPTIMIZATION_HAL_NAMESPACE_END
-
-
-}
-
-#endif
diff --git a/3rdParty/opencv2/core/hal/intrin_rvv071.hpp b/3rdParty/opencv2/core/hal/intrin_rvv071.hpp
deleted file mode 100644
index d4f3751dd7..0000000000
--- a/3rdParty/opencv2/core/hal/intrin_rvv071.hpp
+++ /dev/null
@@ -1,2545 +0,0 @@
-// This file is part of OpenCV project.
-// It is subject to the license terms in the LICENSE file found in the top-level directory
-// of this distribution and at http://opencv.org/license.html
-
-// Copyright (C) 2015, PingTouGe Semiconductor Co., Ltd., all rights reserved.
-
-#ifndef OPENCV_HAL_INTRIN_RISCVV_HPP
-#define OPENCV_HAL_INTRIN_RISCVV_HPP
-
-#include <float.h>
-#include <algorithm>
-#include "opencv2/core/utility.hpp"
-
-namespace cv
-{
-
-//! @cond IGNORED
-
-CV_CPU_OPTIMIZATION_HAL_NAMESPACE_BEGIN
-
-#define CV_SIMD128 1
-#define CV_SIMD128_64F 1
-//////////// Types ////////////
-struct v_uint8x16
-{
-    typedef uchar lane_type;
-    enum { nlanes = 16 };
-
-    v_uint8x16() {}
-    explicit v_uint8x16(vuint8m1_t v) : val(v) {}
-    v_uint8x16(uchar v0, uchar v1, uchar v2, uchar v3, uchar v4, uchar v5, uchar v6, uchar v7,
-               uchar v8, uchar v9, uchar v10, uchar v11, uchar v12, uchar v13, uchar v14, uchar v15)
-    {
-        uchar v[] = {v0, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15};
-        val = (vuint8m1_t)vle_v_u8m1((unsigned char*)v, 16);
-    }
-    uchar get0() const
-    {
-        return vmv_x_s_u8m1_u8(val, 16);
-    }
-
-    vuint8m1_t val;
-};
-
-struct v_int8x16
-{
-    typedef schar lane_type;
-    enum { nlanes = 16 };
-
-    v_int8x16() {}
-    explicit v_int8x16(vint8m1_t v) : val(v) {}
-    v_int8x16(schar v0, schar v1, schar v2, schar v3, schar v4, schar v5, schar v6, schar v7,
-               schar v8, schar v9, schar v10, schar v11, schar v12, schar v13, schar v14, schar v15)
-    {
-        schar v[] = {v0, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15};
-        val = (vint8m1_t)vle_v_i8m1((schar*)v, 16);
-    }
-    schar get0() const
-    {
-        return vmv_x_s_i8m1_i8(val, 16);
-    }
-
-    vint8m1_t val;
-};
-
-struct v_uint16x8
-{
-    typedef ushort lane_type;
-    enum { nlanes = 8 };
-
-    v_uint16x8() {}
-    explicit v_uint16x8(vuint16m1_t v) : val(v) {}
-    v_uint16x8(ushort v0, ushort v1, ushort v2, ushort v3, ushort v4, ushort v5, ushort v6, ushort v7)
-    {
-        ushort v[] = {v0, v1, v2, v3, v4, v5, v6, v7};
-        val = (vuint16m1_t)vle_v_u16m1((unsigned short*)v, 8);
-    }
-    ushort get0() const
-    {
-        return vmv_x_s_u16m1_u16(val, 8);
-    }
-
-    vuint16m1_t val;
-};
-
-struct v_int16x8
-{
-    typedef short lane_type;
-    enum { nlanes = 8 };
-
-    v_int16x8() {}
-    explicit v_int16x8(vint16m1_t v) : val(v) {}
-    v_int16x8(short v0, short v1, short v2, short v3, short v4, short v5, short v6, short v7)
-    {
-        short v[] = {v0, v1, v2, v3, v4, v5, v6, v7};
-        val = (vint16m1_t)vle_v_i16m1((signed short*)v, 8);
-    }
-    short get0() const
-    {
-        return vmv_x_s_i16m1_i16(val, 8);
-    }
-
-    vint16m1_t val;
-};
-
-struct v_uint32x4
-{
-    typedef unsigned lane_type;
-    enum { nlanes = 4 };
-
-    v_uint32x4() {}
-    explicit v_uint32x4(vuint32m1_t v) : val(v) {}
-    v_uint32x4(unsigned v0, unsigned v1, unsigned v2, unsigned v3)
-    {
-        unsigned v[] = {v0, v1, v2, v3};
-        val = (vuint32m1_t)vle_v_u32m1((unsigned int*)v, 4);
-    }
-    unsigned get0() const
-    {
-        return vmv_x_s_u32m1_u32(val, 4);
-    }
-
-    vuint32m1_t val;
-};
-
-struct v_int32x4
-{
-    typedef int lane_type;
-    enum { nlanes = 4 };
-
-    v_int32x4() {}
-    explicit v_int32x4(vint32m1_t v) : val(v) {}
-    v_int32x4(int v0, int v1, int v2, int v3)
-    {
-        int v[] = {v0, v1, v2, v3};
-        val = (vint32m1_t)vle_v_i32m1((signed int*)v, 4);
-    }
-    int get0() const
-    {
-        return vmv_x_s_i32m1_i32(val, 4);
-    }
-    vint32m1_t val;
-};
-
-struct v_float32x4
-{
-    typedef float lane_type;
-    enum { nlanes = 4 };
-
-    v_float32x4() {}
-    explicit v_float32x4(vfloat32m1_t v) : val(v) {}
-    v_float32x4(float v0, float v1, float v2, float v3)
-    {
-        float v[] = {v0, v1, v2, v3};
-        val = (vfloat32m1_t)vle_v_f32m1((float*)v, 4);
-    }
-    float get0() const
-    {
-        return vfmv_f_s_f32m1_f32(val, 4);
-    }
-    vfloat32m1_t val;
-};
-
-struct v_uint64x2
-{
-    typedef uint64 lane_type;
-    enum { nlanes = 2 };
-
-    v_uint64x2() {}
-    explicit v_uint64x2(vuint64m1_t v) : val(v) {}
-    v_uint64x2(uint64 v0, uint64 v1)
-    {
-        uint64 v[] = {v0, v1};
-        val = (vuint64m1_t)vle_v_u64m1((unsigned long*)v, 2);
-    }
-    uint64 get0() const
-    {
-        return vmv_x_s_u64m1_u64(val, 2);
-    }
-    vuint64m1_t val;
-};
-
-struct v_int64x2
-{
-    typedef int64 lane_type;
-    enum { nlanes = 2 };
-
-    v_int64x2() {}
-    explicit v_int64x2(vint64m1_t v) : val(v) {}
-    v_int64x2(int64 v0, int64 v1)
-    {
-        int64 v[] = {v0, v1};
-        val = (vint64m1_t)vle_v_i64m1((long*)v, 2);
-    }
-    int64 get0() const
-    {
-        return vmv_x_s_i64m1_i64(val, 2);
-    }
-    vint64m1_t val;
-};
-
-struct v_float64x2
-{
-    typedef double lane_type;
-    enum { nlanes = 2 };
-
-    v_float64x2() {}
-    explicit v_float64x2(vfloat64m1_t v) : val(v) {}
-    v_float64x2(double v0, double v1)
-    {
-        double v[] = {v0, v1};
-        val = (vfloat64m1_t)vle_v_f64m1((double*)v, 2);
-    }
-    double get0() const
-    {
-        return vfmv_f_s_f64m1_f64(val, 2);
-    }
-    vfloat64m1_t val;
-};
-
-#define OPENCV_HAL_IMPL_RISCVV_INIT(_Tpv, _Tp, suffix) \
-inline _Tp##m1_t vreinterpretq_##suffix##_##suffix(_Tp##m1_t v) { return v; } \
-inline v_uint8x16 v_reinterpret_as_u8(const v_##_Tpv& v) { return v_uint8x16((vuint8m1_t)(v.val)); } \
-inline v_int8x16 v_reinterpret_as_s8(const v_##_Tpv& v) { return v_int8x16((vint8m1_t)(v.val)); } \
-inline v_uint16x8 v_reinterpret_as_u16(const v_##_Tpv& v) { return v_uint16x8((vuint16m1_t)(v.val)); } \
-inline v_int16x8 v_reinterpret_as_s16(const v_##_Tpv& v) { return v_int16x8((vint16m1_t)(v.val)); } \
-inline v_uint32x4 v_reinterpret_as_u32(const v_##_Tpv& v) { return v_uint32x4((vuint32m1_t)(v.val)); } \
-inline v_int32x4 v_reinterpret_as_s32(const v_##_Tpv& v) { return v_int32x4((vint32m1_t)(v.val)); } \
-inline v_uint64x2 v_reinterpret_as_u64(const v_##_Tpv& v) { return v_uint64x2((vuint64m1_t)(v.val)); } \
-inline v_int64x2 v_reinterpret_as_s64(const v_##_Tpv& v) { return v_int64x2((vint64m1_t)(v.val)); } \
-inline v_float32x4 v_reinterpret_as_f32(const v_##_Tpv& v) { return v_float32x4((vfloat32m1_t)(v.val)); }\
-inline v_float64x2 v_reinterpret_as_f64(const v_##_Tpv& v) { return v_float64x2((vfloat64m1_t)(v.val)); }
-
-
-OPENCV_HAL_IMPL_RISCVV_INIT(uint8x16, vuint8, u8)
-OPENCV_HAL_IMPL_RISCVV_INIT(int8x16, vint8, s8)
-OPENCV_HAL_IMPL_RISCVV_INIT(uint16x8, vuint16, u16)
-OPENCV_HAL_IMPL_RISCVV_INIT(int16x8, vint16, s16)
-OPENCV_HAL_IMPL_RISCVV_INIT(uint32x4, vuint32, u32)
-OPENCV_HAL_IMPL_RISCVV_INIT(int32x4, vint32, s32)
-OPENCV_HAL_IMPL_RISCVV_INIT(uint64x2, vuint64, u64)
-OPENCV_HAL_IMPL_RISCVV_INIT(int64x2, vint64, s64)
-OPENCV_HAL_IMPL_RISCVV_INIT(float64x2, vfloat64, f64)
-OPENCV_HAL_IMPL_RISCVV_INIT(float32x4, vfloat32, f32)
-#define OPENCV_HAL_IMPL_RISCVV_INIT_SET(__Tp, _Tp, suffix, len, num) \
-inline v_##_Tp##x##num v_setzero_##suffix() { return v_##_Tp##x##num((v##_Tp##m1_t){0}); }     \
-inline v_##_Tp##x##num v_setall_##suffix(__Tp v) { return v_##_Tp##x##num(vmv_v_x_##len##m1(v, num)); }
-
-OPENCV_HAL_IMPL_RISCVV_INIT_SET(uchar, uint8, u8, u8, 16)
-OPENCV_HAL_IMPL_RISCVV_INIT_SET(char, int8, s8, i8, 16)
-OPENCV_HAL_IMPL_RISCVV_INIT_SET(ushort, uint16, u16, u16, 8)
-OPENCV_HAL_IMPL_RISCVV_INIT_SET(short, int16, s16, i16, 8)
-OPENCV_HAL_IMPL_RISCVV_INIT_SET(unsigned int, uint32, u32, u32, 4)
-OPENCV_HAL_IMPL_RISCVV_INIT_SET(int, int32, s32, i32, 4)
-OPENCV_HAL_IMPL_RISCVV_INIT_SET(unsigned long, uint64, u64, u64, 2)
-OPENCV_HAL_IMPL_RISCVV_INIT_SET(long, int64, s64, i64, 2)
-inline v_float32x4 v_setzero_f32() { return v_float32x4((vfloat32m1_t){0}); }
-inline v_float32x4 v_setall_f32(float v) { return v_float32x4(vfmv_v_f_f32m1(v, 4)); }
-
-inline v_float64x2 v_setzero_f64() { return v_float64x2(vfmv_v_f_f64m1(0, 2)); }
-inline v_float64x2 v_setall_f64(double v) { return v_float64x2(vfmv_v_f_f64m1(v, 2)); }
-
-
-#define OPENCV_HAL_IMPL_RISCVV_BIN_OP(bin_op, _Tpvec, intrin) \
-inline _Tpvec operator bin_op (const _Tpvec& a, const _Tpvec& b) \
-{ \
-    return _Tpvec(intrin(a.val, b.val)); \
-} \
-inline _Tpvec& operator bin_op##= (_Tpvec& a, const _Tpvec& b) \
-{ \
-    a.val = intrin(a.val, b.val); \
-    return a; \
-}
-
-#define OPENCV_HAL_IMPL_RISCVV_BIN_OPN(bin_op, _Tpvec, intrin, num) \
-inline _Tpvec operator bin_op (const _Tpvec& a, const _Tpvec& b) \
-{ \
-    return _Tpvec(intrin(a.val, b.val, num)); \
-} \
-inline _Tpvec& operator bin_op##= (_Tpvec& a, const _Tpvec& b) \
-{ \
-    a.val = intrin(a.val, b.val, num); \
-    return a; \
-}
-
-OPENCV_HAL_IMPL_RISCVV_BIN_OPN(+, v_uint8x16, vsaddu_vv_u8m1, 16)
-OPENCV_HAL_IMPL_RISCVV_BIN_OPN(-, v_uint8x16, vssubu_vv_u8m1, 16)
-OPENCV_HAL_IMPL_RISCVV_BIN_OPN(+, v_int8x16, vsadd_vv_i8m1, 16)
-OPENCV_HAL_IMPL_RISCVV_BIN_OPN(-, v_int8x16, vssub_vv_i8m1, 16)
-OPENCV_HAL_IMPL_RISCVV_BIN_OPN(+, v_uint16x8, vsaddu_vv_u16m1, 8)
-OPENCV_HAL_IMPL_RISCVV_BIN_OPN(-, v_uint16x8, vssubu_vv_u16m1, 8)
-OPENCV_HAL_IMPL_RISCVV_BIN_OPN(+, v_int16x8, vsadd_vv_i16m1, 8)
-OPENCV_HAL_IMPL_RISCVV_BIN_OPN(-, v_int16x8, vssub_vv_i16m1, 8)
-OPENCV_HAL_IMPL_RISCVV_BIN_OPN(+, v_int32x4, vsadd_vv_i32m1, 4)
-OPENCV_HAL_IMPL_RISCVV_BIN_OPN(-, v_int32x4, vssub_vv_i32m1, 4)
-OPENCV_HAL_IMPL_RISCVV_BIN_OPN(*, v_int32x4, vmul_vv_i32m1, 4)
-OPENCV_HAL_IMPL_RISCVV_BIN_OPN(+, v_uint32x4, vadd_vv_u32m1, 4)
-OPENCV_HAL_IMPL_RISCVV_BIN_OPN(-, v_uint32x4, vsub_vv_u32m1, 4)
-OPENCV_HAL_IMPL_RISCVV_BIN_OPN(*, v_uint32x4, vmul_vv_u32m1, 4)
-OPENCV_HAL_IMPL_RISCVV_BIN_OPN(+, v_int64x2, vsadd_vv_i64m1, 2)
-OPENCV_HAL_IMPL_RISCVV_BIN_OPN(-, v_int64x2, vssub_vv_i64m1, 2)
-OPENCV_HAL_IMPL_RISCVV_BIN_OPN(+, v_uint64x2, vadd_vv_u64m1, 2)
-OPENCV_HAL_IMPL_RISCVV_BIN_OPN(-, v_uint64x2, vsub_vv_u64m1, 2)
-OPENCV_HAL_IMPL_RISCVV_BIN_OPN(+, v_float32x4, vfadd_vv_f32m1, 4)
-OPENCV_HAL_IMPL_RISCVV_BIN_OPN(-, v_float32x4, vfsub_vv_f32m1, 4)
-OPENCV_HAL_IMPL_RISCVV_BIN_OPN(*, v_float32x4, vfmul_vv_f32m1, 4)
-inline v_float32x4 operator / (const v_float32x4& a, const v_float32x4& b)
-{
-    return v_float32x4(vfdiv_vv_f32m1(a.val, b.val, 4));
-}
-inline v_float32x4& operator /= (v_float32x4& a, const v_float32x4& b)
-{
-    a.val = vfdiv_vv_f32m1(a.val, b.val, 4);
-    return a;
-}
-
-OPENCV_HAL_IMPL_RISCVV_BIN_OPN(+, v_float64x2, vfadd_vv_f64m1, 2)
-OPENCV_HAL_IMPL_RISCVV_BIN_OPN(-, v_float64x2, vfsub_vv_f64m1, 2)
-OPENCV_HAL_IMPL_RISCVV_BIN_OPN(*, v_float64x2, vfmul_vv_f64m1, 2)
-inline v_float64x2 operator / (const v_float64x2& a, const v_float64x2& b)
-{
-    return v_float64x2(vfdiv_vv_f64m1(a.val, b.val, 2));
-}
-inline v_float64x2& operator /= (v_float64x2& a, const v_float64x2& b)
-{
-    a.val = vfdiv_vv_f64m1(a.val, b.val, 2);
-    return a;
-}
-// TODO: exp, log, sin, cos
-
-#define OPENCV_HAL_IMPL_RISCVV_BIN_FUNC(_Tpvec, func, intrin) \
-inline _Tpvec func(const _Tpvec& a, const _Tpvec& b) \
-{ \
-    return _Tpvec(intrin(a.val, b.val)); \
-}
-
-#define OPENCV_HAL_IMPL_RISCVV_BINN_FUNC(_Tpvec, func, intrin, num) \
-inline _Tpvec func(const _Tpvec& a, const _Tpvec& b) \
-{ \
-    return _Tpvec(intrin(a.val, b.val, num)); \
-}
-OPENCV_HAL_IMPL_RISCVV_BINN_FUNC(v_uint8x16, v_min, vminu_vv_u8m1, 16)
-OPENCV_HAL_IMPL_RISCVV_BINN_FUNC(v_uint8x16, v_max, vmaxu_vv_u8m1, 16)
-OPENCV_HAL_IMPL_RISCVV_BINN_FUNC(v_int8x16, v_min, vmin_vv_i8m1, 16)
-OPENCV_HAL_IMPL_RISCVV_BINN_FUNC(v_int8x16, v_max, vmax_vv_i8m1, 16)
-OPENCV_HAL_IMPL_RISCVV_BINN_FUNC(v_uint16x8, v_min, vminu_vv_u16m1, 8)
-OPENCV_HAL_IMPL_RISCVV_BINN_FUNC(v_uint16x8, v_max, vmaxu_vv_u16m1, 8)
-OPENCV_HAL_IMPL_RISCVV_BINN_FUNC(v_int16x8, v_min, vmin_vv_i16m1, 8)
-OPENCV_HAL_IMPL_RISCVV_BINN_FUNC(v_int16x8, v_max, vmax_vv_i16m1, 8)
-OPENCV_HAL_IMPL_RISCVV_BINN_FUNC(v_uint32x4, v_min, vminu_vv_u32m1, 4)
-OPENCV_HAL_IMPL_RISCVV_BINN_FUNC(v_uint32x4, v_max, vmaxu_vv_u32m1, 4)
-OPENCV_HAL_IMPL_RISCVV_BINN_FUNC(v_int32x4, v_min, vmin_vv_i32m1, 4)
-OPENCV_HAL_IMPL_RISCVV_BINN_FUNC(v_int32x4, v_max, vmax_vv_i32m1, 4)
-OPENCV_HAL_IMPL_RISCVV_BINN_FUNC(v_float32x4, v_min, vfmin_vv_f32m1, 4)
-OPENCV_HAL_IMPL_RISCVV_BINN_FUNC(v_float32x4, v_max, vfmax_vv_f32m1, 4)
-OPENCV_HAL_IMPL_RISCVV_BINN_FUNC(v_float64x2, v_min, vfmin_vv_f64m1, 2)
-OPENCV_HAL_IMPL_RISCVV_BINN_FUNC(v_float64x2, v_max, vfmax_vv_f64m1, 2)
-
-inline v_float32x4 v_sqrt(const v_float32x4& x)
-{
-    return v_float32x4(vfsqrt_v_f32m1(x.val, 4));
-}
-
-inline v_float32x4 v_invsqrt(const v_float32x4& x)
-{
-    return v_float32x4(vfrdiv_vf_f32m1(vfsqrt_v_f32m1(x.val, 4), 1, 4));
-}
-
-inline v_float32x4 v_magnitude(const v_float32x4& a, const v_float32x4& b)
-{
-    v_float32x4 x(vfmacc_vv_f32m1(vfmul_vv_f32m1(a.val, a.val, 4), b.val, b.val, 4));
-    return v_sqrt(x);
-}
-
-inline v_float32x4 v_sqr_magnitude(const v_float32x4& a, const v_float32x4& b)
-{
-    return v_float32x4(vfmacc_vv_f32m1(vfmul_vv_f32m1(a.val, a.val, 4), b.val, b.val, 4));
-}
-
-inline v_float32x4 v_fma(const v_float32x4& a, const v_float32x4& b, const v_float32x4& c)
-{
-    return v_float32x4(vfmacc_vv_f32m1(c.val, a.val, b.val, 4));
-}
-
-inline v_int32x4 v_fma(const v_int32x4& a, const v_int32x4& b, const v_int32x4& c)
-{
-    return v_int32x4(vmacc_vv_i32m1(c.val, a.val, b.val, 4));
-}
-
-inline v_float32x4 v_muladd(const v_float32x4& a, const v_float32x4& b, const v_float32x4& c)
-{
-    return v_fma(a, b, c);
-}
-
-inline v_int32x4 v_muladd(const v_int32x4& a, const v_int32x4& b, const v_int32x4& c)
-{
-    return v_fma(a, b, c);
-}
-
-inline v_float32x4 v_matmul(const v_float32x4& v, const v_float32x4& m0,
-                            const v_float32x4& m1, const v_float32x4& m2,
-                            const v_float32x4& m3)
-{
-    vfloat32m1_t res = vfmul_vf_f32m1(m0.val, v.val[0], 4);//vmuli_f32(m0.val, v.val, 0);
-    res = vfmacc_vf_f32m1(res, v.val[1], m1.val, 4);//vmulai_f32(res, m1.val, v.val, 1);
-    res = vfmacc_vf_f32m1(res, v.val[2], m2.val, 4);//vmulai_f32(res, m1.val, v.val, 1);
-    res = vfmacc_vf_f32m1(res, v.val[3], m3.val, 4);//vmulai_f32(res, m1.val, v.val, 1);
-    return v_float32x4(res);
-}
-
-inline v_float32x4 v_matmuladd(const v_float32x4& v, const v_float32x4& m0,
-                               const v_float32x4& m1, const v_float32x4& m2,
-                               const v_float32x4& a)
-{
-    vfloat32m1_t res = vfmul_vf_f32m1(m0.val, v.val[0], 4);//vmuli_f32(m0.val, v.val, 0);
-    res = vfmacc_vf_f32m1(res, v.val[1], m1.val, 4);//vmulai_f32(res, m1.val, v.val, 1);
-    res = vfmacc_vf_f32m1(res, v.val[2], m2.val, 4);//vmulai_f32(res, m1.val, v.val, 1);
-    res = vfadd_vv_f32m1(res, a.val, 4);//vmulai_f32(res, m1.val, v.val, 1);
-    return v_float32x4(res);
-}
-
-inline v_float64x2 v_sqrt(const v_float64x2& x)
-{
-    return v_float64x2(vfsqrt_v_f64m1(x.val, 2));
-}
-
-inline v_float64x2 v_invsqrt(const v_float64x2& x)
-{
-    return v_float64x2(vfrdiv_vf_f64m1(vfsqrt_v_f64m1(x.val, 2), 1, 2));
-}
-
-inline v_float64x2 v_magnitude(const v_float64x2& a, const v_float64x2& b)
-{
-    v_float64x2 x(vfmacc_vv_f64m1(vfmul_vv_f64m1(a.val, a.val, 2), b.val, b.val, 2));
-    return v_sqrt(x);
-}
-
-inline v_float64x2 v_sqr_magnitude(const v_float64x2& a, const v_float64x2& b)
-{
-    return v_float64x2(vfmacc_vv_f64m1(vfmul_vv_f64m1(a.val, a.val, 2), b.val, b.val, 2));
-}
-
-inline v_float64x2 v_fma(const v_float64x2& a, const v_float64x2& b, const v_float64x2& c)
-{
-    return v_float64x2(vfmacc_vv_f64m1(c.val, a.val, b.val, 2));
-}
-
-inline v_float64x2 v_muladd(const v_float64x2& a, const v_float64x2& b, const v_float64x2& c)
-{
-    return v_fma(a, b, c);
-}
-
-#define OPENCV_HAL_IMPL_RISCVV_LOGIC_OPN(_Tpvec, suffix, num) \
-    OPENCV_HAL_IMPL_RISCVV_BIN_OPN(&, _Tpvec, vand_vv_##suffix, num) \
-    OPENCV_HAL_IMPL_RISCVV_BIN_OPN(|, _Tpvec, vor_vv_##suffix, num) \
-    OPENCV_HAL_IMPL_RISCVV_BIN_OPN(^, _Tpvec, vxor_vv_##suffix, num) \
-    inline _Tpvec operator ~ (const _Tpvec & a) \
-    { \
-        return _Tpvec(vnot_v_##suffix(a.val, num)); \
-    }
-
-OPENCV_HAL_IMPL_RISCVV_LOGIC_OPN(v_uint8x16, u8m1, 16)
-OPENCV_HAL_IMPL_RISCVV_LOGIC_OPN(v_uint16x8, u16m1, 8)
-OPENCV_HAL_IMPL_RISCVV_LOGIC_OPN(v_uint32x4, u32m1, 4)
-OPENCV_HAL_IMPL_RISCVV_LOGIC_OPN(v_uint64x2, u64m1, 2)
-OPENCV_HAL_IMPL_RISCVV_LOGIC_OPN(v_int8x16,  i8m1, 16)
-OPENCV_HAL_IMPL_RISCVV_LOGIC_OPN(v_int16x8,  i16m1, 8)
-OPENCV_HAL_IMPL_RISCVV_LOGIC_OPN(v_int32x4,  i32m1, 4)
-OPENCV_HAL_IMPL_RISCVV_LOGIC_OPN(v_int64x2,  i64m1, 2)
-
-#define OPENCV_HAL_IMPL_RISCVV_FLT_BIT_OP(bin_op, intrin) \
-inline v_float32x4 operator bin_op (const v_float32x4& a, const v_float32x4& b) \
-{ \
-    return v_float32x4(vfloat32m1_t(intrin(vint32m1_t(a.val), vint32m1_t(b.val), 4))); \
-} \
-inline v_float32x4& operator bin_op##= (v_float32x4& a, const v_float32x4& b) \
-{ \
-    a.val = vfloat32m1_t(intrin(vint32m1_t(a.val), vint32m1_t(b.val), 4)); \
-    return a; \
-}
-
-OPENCV_HAL_IMPL_RISCVV_FLT_BIT_OP(&, vand_vv_i32m1)
-OPENCV_HAL_IMPL_RISCVV_FLT_BIT_OP(|, vor_vv_i32m1)
-OPENCV_HAL_IMPL_RISCVV_FLT_BIT_OP(^, vxor_vv_i32m1)
-
-inline v_float32x4 operator ~ (const v_float32x4& a)
-{
-    return v_float32x4((vfloat32m1_t)(vnot_v_i32m1((vint32m1_t)(a.val), 4)));
-}
-
-#define OPENCV_HAL_IMPL_RISCVV_FLT_64BIT_OP(bin_op, intrin) \
-inline v_float64x2 operator bin_op (const v_float64x2& a, const v_float64x2& b) \
-{ \
-    return v_float64x2(vfloat64m1_t(intrin(vint64m1_t(a.val), vint64m1_t(b.val), 2))); \
-} \
-inline v_float64x2& operator bin_op##= (v_float64x2& a, const v_float64x2& b) \
-{ \
-    a.val = vfloat64m1_t(intrin(vint64m1_t(a.val), vint64m1_t(b.val), 2)); \
-    return a; \
-}
-
-OPENCV_HAL_IMPL_RISCVV_FLT_64BIT_OP(&, vand_vv_i64m1)
-OPENCV_HAL_IMPL_RISCVV_FLT_64BIT_OP(|, vor_vv_i64m1)
-OPENCV_HAL_IMPL_RISCVV_FLT_64BIT_OP(^, vxor_vv_i64m1)
-
-inline v_float64x2 operator ~ (const v_float64x2& a)
-{
-    return v_float64x2((vfloat64m1_t)(vnot_v_i64m1((vint64m1_t)(a.val), 2)));
-}
-inline v_int16x8 v_mul_hi(const v_int16x8& a, const v_int16x8& b)
-{
-    return v_int16x8(vmulh_vv_i16m1(a.val, b.val, 8));
-}
-inline v_uint16x8 v_mul_hi(const v_uint16x8& a, const v_uint16x8& b)
-{
-    return v_uint16x8(vmulhu_vv_u16m1(a.val, b.val, 8));
-}
-
-//#define OPENCV_HAL_IMPL_RISCVV_ABS(_Tpuvec, _Tpsvec, usuffix, ssuffix) \
-//inline _Tpuvec v_abs(const _Tpsvec& a) {    \
-//    E##xm1_t mask=vmflt_vf_e32xm1_f32m1(x.val, 0.0, 4);
-
-//OPENCV_HAL_IMPL_RISCVV_ABS(v_uint8x16, v_int8x16, u8, s8)
-//OPENCV_HAL_IMPL_RISCVV_ABS(v_uint16x8, v_int16x8, u16, s16)
-//OPENCV_HAL_IMPL_RISCVV_ABS(v_uint32x4, v_int32x4, u32, s32)
-
-inline v_uint32x4 v_abs(v_int32x4 x)
-{
-    vbool32_t mask=vmslt_vx_i32m1_b32(x.val, 0, 4);
-    return v_uint32x4((vuint32m1_t)vrsub_vx_i32m1_m(mask, x.val, x.val, 0, 4));
-}
-
-inline v_uint16x8 v_abs(v_int16x8 x)
-{
-    vbool16_t mask=vmslt_vx_i16m1_b16(x.val, 0, 8);
-    return v_uint16x8((vuint16m1_t)vrsub_vx_i16m1_m(mask, x.val, x.val, 0, 8));
-}
-
-inline v_uint8x16 v_abs(v_int8x16 x)
-{
-    vbool8_t mask=vmslt_vx_i8m1_b8(x.val, 0, 16);
-    return v_uint8x16((vuint8m1_t)vrsub_vx_i8m1_m(mask, x.val, x.val, 0, 16));
-}
-
-inline v_float32x4 v_abs(v_float32x4 x)
-{
-    return (v_float32x4)vfsgnjx_vv_f32m1(x.val, x.val, 4);
-}
-
-inline v_float64x2 v_abs(v_float64x2 x)
-{
-    return (v_float64x2)vfsgnjx_vv_f64m1(x.val, x.val, 2);
-}
-
-inline v_float32x4 v_absdiff(const v_float32x4& a, const v_float32x4& b)
-{
-    vfloat32m1_t ret = vfsub_vv_f32m1(a.val, b.val, 4);
-    return (v_float32x4)vfsgnjx_vv_f32m1(ret, ret, 4);
-}
-
-inline v_float64x2 v_absdiff(const v_float64x2& a, const v_float64x2& b)
-{
-    vfloat64m1_t ret = vfsub_vv_f64m1(a.val, b.val, 2);
-    return (v_float64x2)vfsgnjx_vv_f64m1(ret, ret, 2);
-}
-
-#define OPENCV_HAL_IMPL_RISCVV_ABSDIFF_U(bit, num) \
-inline v_uint##bit##x##num v_absdiff(v_uint##bit##x##num a, v_uint##bit##x##num b){    \
-    vuint##bit##m1_t vmax = vmaxu_vv_u##bit##m1(a.val, b.val, num);    \
-    vuint##bit##m1_t vmin = vminu_vv_u##bit##m1(a.val, b.val, num);    \
-    return v_uint##bit##x##num(vsub_vv_u##bit##m1(vmax, vmin, num));\
-}
-
-OPENCV_HAL_IMPL_RISCVV_ABSDIFF_U(8, 16)
-OPENCV_HAL_IMPL_RISCVV_ABSDIFF_U(16, 8)
-OPENCV_HAL_IMPL_RISCVV_ABSDIFF_U(32, 4)
-
-/** Saturating absolute difference **/
-inline v_int8x16 v_absdiffs(v_int8x16 a, v_int8x16 b){
-    vint8m1_t vmax = vmax_vv_i8m1(a.val, b.val, 16);
-    vint8m1_t vmin = vmin_vv_i8m1(a.val, b.val, 16);
-    return v_int8x16(vssub_vv_i8m1(vmax, vmin, 16));
-}
-inline v_int16x8 v_absdiffs(v_int16x8 a, v_int16x8 b){
-    vint16m1_t vmax = vmax_vv_i16m1(a.val, b.val, 8);
-    vint16m1_t vmin = vmin_vv_i16m1(a.val, b.val, 8);
-    return v_int16x8(vssub_vv_i16m1(vmax, vmin, 8));
-}
-
-#define OPENCV_HAL_IMPL_RISCVV_ABSDIFF(_Tpvec, _Tpv, num) \
-inline v_uint##_Tpvec v_absdiff(v_int##_Tpvec a, v_int##_Tpvec b){    \
-     vint##_Tpv##_t max = vmax_vv_i##_Tpv(a.val, b.val, num);\
-     vint##_Tpv##_t min = vmin_vv_i##_Tpv(a.val, b.val, num);\
-    return v_uint##_Tpvec((vuint##_Tpv##_t)vsub_vv_i##_Tpv(max, min, num));    \
-}
-
-OPENCV_HAL_IMPL_RISCVV_ABSDIFF(8x16, 8m1, 16)
-OPENCV_HAL_IMPL_RISCVV_ABSDIFF(16x8, 16m1, 8)
-OPENCV_HAL_IMPL_RISCVV_ABSDIFF(32x4, 32m1, 4)
-
-//  Multiply and expand
-inline void v_mul_expand(const v_int8x16& a, const v_int8x16& b,
-                         v_int16x8& c, v_int16x8& d)
-{
-    vint16m2_t res = vundefined_i16m2();
-    res = vwmul_vv_i16m2(a.val, b.val, 16);
-    c.val = vget_i16m2_i16m1(res, 0);
-    d.val = vget_i16m2_i16m1(res, 1);
-}
-
-inline void v_mul_expand(const v_uint8x16& a, const v_uint8x16& b,
-                         v_uint16x8& c, v_uint16x8& d)
-{
-    vuint16m2_t res = vundefined_u16m2();
-    res = vwmulu_vv_u16m2(a.val, b.val, 16);
-    c.val = vget_u16m2_u16m1(res, 0);
-    d.val = vget_u16m2_u16m1(res, 1);
-}
-
-inline void v_mul_expand(const v_int16x8& a, const v_int16x8& b,
-                         v_int32x4& c, v_int32x4& d)
-{
-    vint32m2_t res = vundefined_i32m2();
-    res = vwmul_vv_i32m2(a.val, b.val, 8);
-    c.val = vget_i32m2_i32m1(res, 0);
-    d.val = vget_i32m2_i32m1(res, 1);
-}
-
-inline void v_mul_expand(const v_uint16x8& a, const v_uint16x8& b,
-                         v_uint32x4& c, v_uint32x4& d)
-{
-    vuint32m2_t res = vundefined_u32m2();
-    res = vwmulu_vv_u32m2(a.val, b.val, 8);
-    c.val = vget_u32m2_u32m1(res, 0);
-    d.val = vget_u32m2_u32m1(res, 1);
-}
-
-inline void v_mul_expand(const v_int32x4& a, const v_int32x4& b,
-                         v_int64x2& c, v_int64x2& d)
-{
-    vint64m2_t res = vundefined_i64m2();
-    res = vwmul_vv_i64m2(a.val, b.val, 4);
-    c.val = vget_i64m2_i64m1(res, 0);
-    d.val = vget_i64m2_i64m1(res, 1);
-}
-
-inline void v_mul_expand(const v_uint32x4& a, const v_uint32x4& b,
-                         v_uint64x2& c, v_uint64x2& d)
-{
-    vuint64m2_t res = vundefined_u64m2();
-    res = vwmulu_vv_u64m2(a.val, b.val, 4);
-    c.val = vget_u64m2_u64m1(res, 0);
-    d.val = vget_u64m2_u64m1(res, 1);
-}
-
-OPENCV_HAL_IMPL_RISCVV_BINN_FUNC(v_uint8x16, v_add_wrap, vadd_vv_u8m1, 16)
-OPENCV_HAL_IMPL_RISCVV_BINN_FUNC(v_int8x16, v_add_wrap, vadd_vv_i8m1, 16)
-OPENCV_HAL_IMPL_RISCVV_BINN_FUNC(v_uint16x8, v_add_wrap, vadd_vv_u16m1, 8)
-OPENCV_HAL_IMPL_RISCVV_BINN_FUNC(v_int16x8, v_add_wrap, vadd_vv_i16m1, 8)
-OPENCV_HAL_IMPL_RISCVV_BINN_FUNC(v_uint8x16, v_sub_wrap, vsub_vv_u8m1, 16)
-OPENCV_HAL_IMPL_RISCVV_BINN_FUNC(v_int8x16, v_sub_wrap, vsub_vv_i8m1, 16)
-OPENCV_HAL_IMPL_RISCVV_BINN_FUNC(v_uint16x8, v_sub_wrap, vsub_vv_u16m1, 8)
-OPENCV_HAL_IMPL_RISCVV_BINN_FUNC(v_int16x8, v_sub_wrap, vsub_vv_i16m1, 8)
-OPENCV_HAL_IMPL_RISCVV_BINN_FUNC(v_uint8x16, v_mul_wrap, vmul_vv_u8m1, 16)
-OPENCV_HAL_IMPL_RISCVV_BINN_FUNC(v_int8x16, v_mul_wrap, vmul_vv_i8m1, 16)
-OPENCV_HAL_IMPL_RISCVV_BINN_FUNC(v_uint16x8, v_mul_wrap, vmul_vv_u16m1, 8)
-OPENCV_HAL_IMPL_RISCVV_BINN_FUNC(v_int16x8, v_mul_wrap, vmul_vv_i16m1, 8)
-//////// Dot Product ////////
-// 16 >> 32
-inline v_int32x4 v_dotprod(const v_int16x8& a, const v_int16x8& b)
-{
-    vint32m2_t res = vundefined_i32m2();
-    res = vwmul_vv_i32m2(a.val, b.val, 8);
-    res = vrgather_vv_i32m2(res, (vuint32m2_t){0, 2, 4, 6, 1, 3, 5, 7}, 8);
-    return v_int32x4(vadd_vv_i32m1(vget_i32m2_i32m1(res, 0), vget_i32m2_i32m1(res, 1), 4));
-}
-inline v_int32x4 v_dotprod(const v_int16x8& a, const v_int16x8& b, const v_int32x4& c)
-{
-    vint32m2_t res = vundefined_i32m2();
-    res = vwmul_vv_i32m2(a.val, b.val, 8);
-    res = vrgather_vv_i32m2(res, (vuint32m2_t){0, 2, 4, 6, 1, 3, 5, 7}, 8);
-    return v_int32x4(vadd_vv_i32m1(vadd_vv_i32m1(vget_i32m2_i32m1(res, 0),vget_i32m2_i32m1(res, 1), 4), c.val, 4));
-}
-
-// 32 >> 64
-inline v_int64x2 v_dotprod(const v_int32x4& a, const v_int32x4& b)
-{
-    vint64m2_t res = vundefined_i64m2();
-    res = vwmul_vv_i64m2(a.val, b.val, 4);
-    res = vrgather_vv_i64m2(res, (vuint64m2_t){0, 2, 1, 3}, 4);
-    return v_int64x2(vadd_vv_i64m1(vget_i64m2_i64m1(res, 0), vget_i64m2_i64m1(res, 1), 2));
-}
-inline v_int64x2 v_dotprod(const v_int32x4& a, const v_int32x4& b, const v_int64x2& c)
-{
-    vint64m2_t res = vundefined_i64m2();
-    res = vwmul_vv_i64m2(a.val, b.val, 4);
-    res = vrgather_vv_i64m2(res, (vuint64m2_t){0, 2, 1, 3}, 4);
-    return v_int64x2(vadd_vv_i64m1(vadd_vv_i64m1(vget_i64m2_i64m1(res, 0), vget_i64m2_i64m1(res, 1), 2), c.val, 2));
-}
-
-// 8 >> 32
-inline v_uint32x4 v_dotprod_expand(const v_uint8x16& a, const v_uint8x16& b)
-{
-    vuint16m2_t v1 = vundefined_u16m2();
-    vuint32m2_t v2 = vundefined_u32m2();
-    v1 = vwmulu_vv_u16m2(a.val, b.val, 16);
-    v1 = vrgather_vv_u16m2(v1, (vuint16m2_t){0, 4, 8, 12, 1, 5, 9, 13, 2, 6, 10, 14, 3, 7, 11, 15}, 16);
-    v2 = vwaddu_vv_u32m2(vget_u16m2_u16m1(v1, 0), vget_u16m2_u16m1(v1, 1), 8);
-    return v_uint32x4(vadd_vv_u32m1(vget_u32m2_u32m1(v2, 0), vget_u32m2_u32m1(v2, 1), 4));
-}
-
-inline v_uint32x4 v_dotprod_expand(const v_uint8x16& a, const v_uint8x16& b,
-                                   const v_uint32x4& c)
-{
-    vuint16m2_t v1 = vundefined_u16m2();
-    vuint32m2_t v2 = vundefined_u32m2();
-    v1 = vwmulu_vv_u16m2(a.val, b.val, 16);
-    v1 = vrgather_vv_u16m2(v1, (vuint16m2_t){0, 4, 8, 12, 1, 5, 9, 13, 2, 6, 10, 14, 3, 7, 11, 15}, 16);
-    v2 = vwaddu_vv_u32m2(vget_u16m2_u16m1(v1, 0), vget_u16m2_u16m1(v1, 1), 8);
-    return v_uint32x4(vadd_vv_u32m1(vadd_vv_u32m1(vget_u32m2_u32m1(v2, 0), vget_u32m2_u32m1(v2, 1), 4), c.val, 4));
-}
-
-inline v_int32x4 v_dotprod_expand(const v_int8x16& a, const v_int8x16& b)
-{
-    vint16m2_t v1 = vundefined_i16m2();
-    vint32m2_t v2 = vundefined_i32m2();
-    v1 = vwmul_vv_i16m2(a.val, b.val, 16);
-    v1 = vrgather_vv_i16m2(v1, (vuint16m2_t){0, 4, 8, 12, 1, 5, 9, 13, 2, 6, 10, 14, 3, 7, 11, 15}, 16);
-    v2 = vwadd_vv_i32m2(vget_i16m2_i16m1(v1, 0), vget_i16m2_i16m1(v1, 1), 8);
-    return v_int32x4(vadd_vv_i32m1(vget_i32m2_i32m1(v2, 0), vget_i32m2_i32m1(v2, 1), 4));
-}
-
-inline v_int32x4 v_dotprod_expand(const v_int8x16& a, const v_int8x16& b,
-                                   const v_int32x4& c)
-{
-    vint16m2_t v1 = vundefined_i16m2();
-    vint32m2_t v2 = vundefined_i32m2();
-    v1 = vwmul_vv_i16m2(a.val, b.val, 16);
-    v1 = vrgather_vv_i16m2(v1, (vuint16m2_t){0, 4, 8, 12, 1, 5, 9, 13, 2, 6, 10, 14, 3, 7, 11, 15}, 16);
-    v2 = vwadd_vv_i32m2(vget_i16m2_i16m1(v1, 0), vget_i16m2_i16m1(v1, 1), 8);
-    return v_int32x4(vadd_vv_i32m1(vadd_vv_i32m1(vget_i32m2_i32m1(v2, 0), vget_i32m2_i32m1(v2, 1), 4), c.val, 4));
-}
-
-inline v_uint64x2 v_dotprod_expand(const v_uint16x8& a, const v_uint16x8& b)
-{
-    vuint32m2_t v1 = vundefined_u32m2();
-    vuint64m2_t v2 = vundefined_u64m2();
-    v1 = vwmulu_vv_u32m2(a.val, b.val, 8);
-    v1 = vrgather_vv_u32m2(v1, (vuint32m2_t){0, 4, 1, 5, 2, 6, 3, 7}, 8);
-    v2 = vwaddu_vv_u64m2(vget_u32m2_u32m1(v1, 0), vget_u32m2_u32m1(v1, 1), 4);
-    return v_uint64x2(vadd_vv_u64m1(vget_u64m2_u64m1(v2, 0), vget_u64m2_u64m1(v2, 1), 2));
-}
-
-inline v_uint64x2 v_dotprod_expand(const v_uint16x8& a, const v_uint16x8& b,
-                                   const v_uint64x2& c)
-{
-    vuint32m2_t v1 = vundefined_u32m2();
-    vuint64m2_t v2 = vundefined_u64m2();
-    v1 = vwmulu_vv_u32m2(a.val, b.val, 8);
-    v1 = vrgather_vv_u32m2(v1, (vuint32m2_t){0, 4, 1, 5, 2, 6, 3, 7}, 8);
-    v2 = vwaddu_vv_u64m2(vget_u32m2_u32m1(v1, 0), vget_u32m2_u32m1(v1, 1), 4);
-    return v_uint64x2(vadd_vv_u64m1(vadd_vv_u64m1(vget_u64m2_u64m1(v2, 0), vget_u64m2_u64m1(v2, 1), 2), c.val, 2));
-}
-
-inline v_int64x2 v_dotprod_expand(const v_int16x8& a, const v_int16x8& b)
-{
-    vint32m2_t v1 = vundefined_i32m2();
-    vint64m2_t v2 = vundefined_i64m2();
-    v1 = vwmul_vv_i32m2(a.val, b.val, 8);
-    v1 = vrgather_vv_i32m2(v1, (vuint32m2_t){0, 4, 1, 5, 2, 6, 3, 7}, 8);
-    v2 = vwadd_vv_i64m2(vget_i32m2_i32m1(v1, 0), vget_i32m2_i32m1(v1, 1), 4);
-    return v_int64x2(vadd_vv_i64m1(vget_i64m2_i64m1(v2, 0), vget_i64m2_i64m1(v2, 1), 2));
-}
-
-inline v_int64x2 v_dotprod_expand(const v_int16x8& a, const v_int16x8& b,
-                                   const v_int64x2& c)
-{
-    vint32m2_t v1 = vundefined_i32m2();
-    vint64m2_t v2 = vundefined_i64m2();
-    v1 = vwmul_vv_i32m2(a.val, b.val, 8);
-    v1 = vrgather_vv_i32m2(v1, (vuint32m2_t){0, 4, 1, 5, 2, 6, 3, 7}, 8);
-    v2 = vwadd_vv_i64m2(vget_i32m2_i32m1(v1, 0), vget_i32m2_i32m1(v1, 1), 4);
-    return v_int64x2(vadd_vv_i64m1(vadd_vv_i64m1(vget_i64m2_i64m1(v2, 0), vget_i64m2_i64m1(v2, 1), 2), c.val, 2));
-}
-
-//////// Fast Dot Product ////////
-// 16 >> 32
-inline v_int32x4 v_dotprod_fast(const v_int16x8& a, const v_int16x8& b)
-{
-    vint32m2_t v1 = vundefined_i32m2();
-    v1 = vwmul_vv_i32m2(a.val, b.val, 8);
-    return v_int32x4(vadd_vv_i32m1(vget_i32m2_i32m1(v1, 0), vget_i32m2_i32m1(v1, 1), 4));
-}
-
-inline v_int32x4 v_dotprod_fast(const v_int16x8& a, const v_int16x8& b, const v_int32x4& c)
-{
-    vint32m2_t v1 = vundefined_i32m2();
-    v1 = vwmul_vv_i32m2(a.val, b.val, 8);
-    return v_int32x4(vadd_vv_i32m1(vadd_vv_i32m1(vget_i32m2_i32m1(v1, 0), vget_i32m2_i32m1(v1, 1), 4), c.val, 4));
-}
-
-// 32 >> 64
-inline v_int64x2 v_dotprod_fast(const v_int32x4& a, const v_int32x4& b)
-{
-    vint64m2_t v1 = vundefined_i64m2();
-    v1 = vwmul_vv_i64m2(a.val, b.val, 4);
-    return v_int64x2(vadd_vv_i64m1(vget_i64m2_i64m1(v1, 0), vget_i64m2_i64m1(v1, 1), 2));
-}
-inline v_int64x2 v_dotprod_fast(const v_int32x4& a, const v_int32x4& b, const v_int64x2& c)
-{
-    vint64m2_t v1 = vundefined_i64m2();
-    v1 = vwmul_vv_i64m2(a.val, b.val, 8);
-    return v_int64x2(vadd_vv_i64m1(vadd_vv_i64m1(vget_i64m2_i64m1(v1, 0), vget_i64m2_i64m1(v1, 1), 4), c.val, 4));
-}
-
-// 8 >> 32
-inline v_uint32x4 v_dotprod_expand_fast(const v_uint8x16& a, const v_uint8x16& b)
-{
-    vuint16m2_t v1 = vundefined_u16m2();
-    vuint32m2_t v2 = vundefined_u32m2();
-    v1 = vwmulu_vv_u16m2(a.val, b.val, 16);
-    v2 = vwaddu_vv_u32m2(vget_u16m2_u16m1(v1, 0), vget_u16m2_u16m1(v1, 1), 8);
-    return v_uint32x4(vadd_vv_u32m1(vget_u32m2_u32m1(v2, 0), vget_u32m2_u32m1(v2, 1), 4));
-}
-
-inline v_uint32x4 v_dotprod_expand_fast(const v_uint8x16& a, const v_uint8x16& b, const v_uint32x4& c)
-{
-    vuint16m2_t v1 = vundefined_u16m2();
-    vuint32m2_t v2 = vundefined_u32m2();
-    v1 = vwmulu_vv_u16m2(a.val, b.val, 16);
-    v2 = vwaddu_vv_u32m2(vget_u16m2_u16m1(v1, 0), vget_u16m2_u16m1(v1, 1), 8);
-    return v_uint32x4(vadd_vv_u32m1(vadd_vv_u32m1(vget_u32m2_u32m1(v2, 0), vget_u32m2_u32m1(v2, 1), 4), c.val, 4));
-}
-
-inline v_int32x4 v_dotprod_expand_fast(const v_int8x16& a, const v_int8x16& b)
-{
-    vint16m2_t v1 = vundefined_i16m2();
-    vint32m2_t v2 = vundefined_i32m2();
-    v1 = vwmul_vv_i16m2(a.val, b.val, 16);
-    v2 = vwadd_vv_i32m2(vget_i16m2_i16m1(v1, 0), vget_i16m2_i16m1(v1, 1), 8);
-    return v_int32x4(vadd_vv_i32m1(vget_i32m2_i32m1(v2, 0), vget_i32m2_i32m1(v2, 1), 4));
-}
-inline v_int32x4 v_dotprod_expand_fast(const v_int8x16& a, const v_int8x16& b, const v_int32x4& c)
-{
-    vint16m2_t v1 = vundefined_i16m2();
-    vint32m2_t v2 = vundefined_i32m2();
-    v1 = vwmul_vv_i16m2(a.val, b.val, 16);
-    v2 = vwadd_vv_i32m2(vget_i16m2_i16m1(v1, 0), vget_i16m2_i16m1(v1, 1), 8);
-    return v_int32x4(vadd_vv_i32m1(vadd_vv_i32m1(vget_i32m2_i32m1(v2, 0), vget_i32m2_i32m1(v2, 1), 4), c.val, 4));
-}
-
-// 16 >> 64
-inline v_uint64x2 v_dotprod_expand_fast(const v_uint16x8& a, const v_uint16x8& b)
-{
-    vuint32m2_t v1 = vundefined_u32m2();
-    vuint64m2_t v2 = vundefined_u64m2();
-    v1 = vwmulu_vv_u32m2(a.val, b.val, 8);
-    v2 = vwaddu_vv_u64m2(vget_u32m2_u32m1(v1, 0), vget_u32m2_u32m1(v1, 1), 4);
-    return v_uint64x2(vadd_vv_u64m1(vget_u64m2_u64m1(v2, 0), vget_u64m2_u64m1(v2, 1), 2));
-}
-inline v_uint64x2 v_dotprod_expand_fast(const v_uint16x8& a, const v_uint16x8& b, const v_uint64x2& c)
-{
-    vuint32m2_t v1 = vundefined_u32m2();
-    vuint64m2_t v2 = vundefined_u64m2();
-    v1 = vwmulu_vv_u32m2(a.val, b.val, 8);
-    v2 = vwaddu_vv_u64m2(vget_u32m2_u32m1(v1, 0), vget_u32m2_u32m1(v1, 1), 4);
-    return v_uint64x2(vadd_vv_u64m1(vadd_vv_u64m1(vget_u64m2_u64m1(v2, 0), vget_u64m2_u64m1(v2, 1), 2), c.val, 2));
-}
-
-inline v_int64x2 v_dotprod_expand_fast(const v_int16x8& a, const v_int16x8& b)
-{
-    vint32m2_t v1 = vundefined_i32m2();
-    vint64m2_t v2 = vundefined_i64m2();
-    v1 = vwmul_vv_i32m2(a.val, b.val, 8);
-    v2 = vwadd_vv_i64m2(vget_i32m2_i32m1(v1, 0), vget_i32m2_i32m1(v1, 1), 4);
-    return v_int64x2(vadd_vv_i64m1(vget_i64m2_i64m1(v2, 0), vget_i64m2_i64m1(v2, 1), 2));
-}
-inline v_int64x2 v_dotprod_expand_fast(const v_int16x8& a, const v_int16x8& b, const v_int64x2& c)
-{
-    vint32m2_t v1 = vundefined_i32m2();
-    vint64m2_t v2 = vundefined_i64m2();
-    v1 = vwmul_vv_i32m2(a.val, b.val, 8);
-    v2 = vwadd_vv_i64m2(vget_i32m2_i32m1(v1, 0), vget_i32m2_i32m1(v1, 1), 4);
-    return v_int64x2(vadd_vv_i64m1(vadd_vv_i64m1(vget_i64m2_i64m1(v2, 0), vget_i64m2_i64m1(v2, 1), 2), c.val, 2));
-}
-
-
-#define OPENCV_HAL_IMPL_RISCVV_REDUCE_OP_W(_Tpvec, _Tpvec2, len, scalartype, func, intrin, num) \
-inline scalartype v_reduce_##func(const v_##_Tpvec##x##num& a) \
-{\
-    v##_Tpvec2##m1_t val = vmv_v_x_##len##m1(0, num); \
-    val = intrin(val, a.val, val, num);    \
-    return vmv_x_s_##len##m1_##len(val, num);    \
-}
-
-
-#define OPENCV_HAL_IMPL_RISCVV_REDUCE_OP_(_Tpvec, _Tpvec2, scalartype, func, funcu, num) \
-inline scalartype v_reduce_##func(const v_##_Tpvec##x##num& a) \
-{\
-    v##_Tpvec##m1_t val = (v##_Tpvec##m1_t)vmv_v_x_i8m1(0, num); \
-    val = v##funcu##_vs_##_Tpvec2##m1_##_Tpvec2##m1(val, a.val, a.val, num);    \
-    return val[0];    \
-}
-OPENCV_HAL_IMPL_RISCVV_REDUCE_OP_W(int8, int16, i16, int, sum, vwredsum_vs_i8m1_i16m1, 16)
-OPENCV_HAL_IMPL_RISCVV_REDUCE_OP_W(int16, int32, i32, int, sum, vwredsum_vs_i16m1_i32m1, 8)
-OPENCV_HAL_IMPL_RISCVV_REDUCE_OP_W(int32, int64, i64, int, sum, vwredsum_vs_i32m1_i64m1, 4)
-OPENCV_HAL_IMPL_RISCVV_REDUCE_OP_W(uint8, uint16, u16, unsigned, sum, vwredsumu_vs_u8m1_u16m1, 16)
-OPENCV_HAL_IMPL_RISCVV_REDUCE_OP_W(uint16, uint32, u32, unsigned, sum, vwredsumu_vs_u16m1_u32m1, 8)
-OPENCV_HAL_IMPL_RISCVV_REDUCE_OP_W(uint32, uint64, u64, unsigned, sum, vwredsumu_vs_u32m1_u64m1, 4)
-inline float v_reduce_sum(const v_float32x4& a) \
-{\
-    vfloat32m1_t val = vfmv_v_f_f32m1(0.0, 4); \
-    val = vfredsum_vs_f32m1_f32m1(val, a.val, val, 4);    \
-    return vfmv_f_s_f32m1_f32(val, 4);    \
-}
-inline double v_reduce_sum(const v_float64x2& a) \
-{\
-    vfloat64m1_t val = vfmv_v_f_f64m1(0.0, 2); \
-    val = vfredsum_vs_f64m1_f64m1(val, a.val, val, 2);    \
-    return vfmv_f_s_f64m1_f64(val, 2);    \
-}
-inline uint64 v_reduce_sum(const v_uint64x2& a)
-{ return vext_x_v_u64m1_u64((vuint64m1_t)a.val, 0, 2)+vext_x_v_u64m1_u64((vuint64m1_t)a.val, 1, 2); }
-
-inline int64 v_reduce_sum(const v_int64x2& a)
-{ return vext_x_v_i64m1_i64((vint64m1_t)a.val, 0, 2)+vext_x_v_i64m1_i64((vint64m1_t)a.val, 1, 2); }
-
-#define OPENCV_HAL_IMPL_RISCVV_REDUCE_OP(func)    \
-OPENCV_HAL_IMPL_RISCVV_REDUCE_OP_(int8,  i8, int, func, red##func, 16)    \
-OPENCV_HAL_IMPL_RISCVV_REDUCE_OP_(int16, i16, int, func, red##func, 8)    \
-OPENCV_HAL_IMPL_RISCVV_REDUCE_OP_(int32, i32, int, func, red##func, 4)    \
-OPENCV_HAL_IMPL_RISCVV_REDUCE_OP_(int64, i64, int, func, red##func, 2)    \
-OPENCV_HAL_IMPL_RISCVV_REDUCE_OP_(uint8,  u8, unsigned, func, red##func##u, 16)    \
-OPENCV_HAL_IMPL_RISCVV_REDUCE_OP_(uint16, u16, unsigned, func, red##func##u, 8)    \
-OPENCV_HAL_IMPL_RISCVV_REDUCE_OP_(uint32, u32, unsigned, func, red##func##u, 4)    \
-OPENCV_HAL_IMPL_RISCVV_REDUCE_OP_(float32, f32, float, func, fred##func, 4)
-OPENCV_HAL_IMPL_RISCVV_REDUCE_OP(max)
-OPENCV_HAL_IMPL_RISCVV_REDUCE_OP(min)
-
-inline v_float32x4 v_reduce_sum4(const v_float32x4& a, const v_float32x4& b,
-                                 const v_float32x4& c, const v_float32x4& d)
-{
-    vfloat32m1_t a0 = vfmv_v_f_f32m1(0.0, 4);
-    vfloat32m1_t b0 = vfmv_v_f_f32m1(0.0, 4);
-    vfloat32m1_t c0 = vfmv_v_f_f32m1(0.0, 4);
-    vfloat32m1_t d0 = vfmv_v_f_f32m1(0.0, 4);
-    a0 = vfredsum_vs_f32m1_f32m1(a0, a.val, a0, 4);
-    b0 = vfredsum_vs_f32m1_f32m1(b0, b.val, b0, 4);
-    c0 = vfredsum_vs_f32m1_f32m1(c0, c.val, c0, 4);
-    d0 = vfredsum_vs_f32m1_f32m1(d0, d.val, d0, 4);
-    return v_float32x4(a0[0], b0[0], c0[0], d0[0]);
-}
-
-inline float v_reduce_sad(const v_float32x4& a, const v_float32x4& b)
-{
-    vfloat32m1_t a0 = vfmv_v_f_f32m1(0.0, 4);
-    vfloat32m1_t x = vfsub_vv_f32m1(a.val, b.val, 4);
-    vbool32_t mask=vmflt_vf_f32m1_b32(x, 0, 4);
-    vfloat32m1_t val = vfrsub_vf_f32m1_m(mask, x, x, 0, 4);
-    a0 = vfredsum_vs_f32m1_f32m1(a0, val, a0, 4);
-    return a0[0];
-}
-
-#define OPENCV_HAL_IMPL_RISCVV_REDUCE_SAD(_Tpvec, _Tpvec2) \
-inline unsigned v_reduce_sad(const _Tpvec& a, const _Tpvec&b){    \
-    _Tpvec2 x = v_absdiff(a, b);    \
-    return v_reduce_sum(x);    \
-}
-
-OPENCV_HAL_IMPL_RISCVV_REDUCE_SAD(v_int8x16, v_uint8x16)
-OPENCV_HAL_IMPL_RISCVV_REDUCE_SAD(v_uint8x16, v_uint8x16)
-OPENCV_HAL_IMPL_RISCVV_REDUCE_SAD(v_int16x8, v_uint16x8)
-OPENCV_HAL_IMPL_RISCVV_REDUCE_SAD(v_uint16x8, v_uint16x8)
-OPENCV_HAL_IMPL_RISCVV_REDUCE_SAD(v_int32x4, v_uint32x4)
-OPENCV_HAL_IMPL_RISCVV_REDUCE_SAD(v_uint32x4, v_uint32x4)
-
-#define OPENCV_HAL_IMPL_RISCVV_INT_CMP_OP(_Tpvec, _Tp, _T, num, uv) \
-inline _Tpvec operator == (const _Tpvec& a, const _Tpvec& b) \
-{ \
-    vbool##_T##_t mask = vmseq_vv_##_Tp##_b##_T(a.val, b.val, num);    \
-    return _Tpvec(vmerge_vxm_##_Tp(mask, vmv_v_x_##_Tp(0, num), -1, num));    \
-} \
-inline _Tpvec operator != (const _Tpvec& a, const _Tpvec& b) \
-{ \
-    vbool##_T##_t mask = vmsne_vv_##_Tp##_b##_T(a.val, b.val, num);    \
-    return _Tpvec(vmerge_vxm_##_Tp(mask, vmv_v_x_##_Tp(0, num), -1, num));    \
-} \
-inline _Tpvec operator < (const _Tpvec& a, const _Tpvec& b) \
-{ \
-    vbool##_T##_t mask = vmslt##uv##_Tp##_b##_T(a.val, b.val, num);    \
-    return _Tpvec(vmerge_vxm_##_Tp(mask, vmv_v_x_##_Tp(0, num), -1, num));    \
-} \
-inline _Tpvec operator > (const _Tpvec& a, const _Tpvec& b) \
-{ \
-    vbool##_T##_t mask = vmslt##uv##_Tp##_b##_T(b.val, a.val, num);    \
-    return _Tpvec(vmerge_vxm_##_Tp(mask, vmv_v_x_##_Tp(0, num), -1, num));    \
-} \
-inline _Tpvec operator <= (const _Tpvec& a, const _Tpvec& b) \
-{ \
-    vbool##_T##_t mask = vmsle##uv##_Tp##_b##_T(a.val, b.val, num);    \
-    return _Tpvec(vmerge_vxm_##_Tp(mask, vmv_v_x_##_Tp(0, num), -1, num));    \
-} \
-inline _Tpvec operator >= (const _Tpvec& a, const _Tpvec& b) \
-{ \
-    vbool##_T##_t mask = vmsle##uv##_Tp##_b##_T(b.val, a.val, num);    \
-    return _Tpvec(vmerge_vxm_##_Tp(mask, vmv_v_x_##_Tp(0, num), -1, num));    \
-} \
-
-OPENCV_HAL_IMPL_RISCVV_INT_CMP_OP(v_int8x16, i8m1,  8, 16, _vv_)
-OPENCV_HAL_IMPL_RISCVV_INT_CMP_OP(v_int16x8, i16m1, 16, 8, _vv_)
-OPENCV_HAL_IMPL_RISCVV_INT_CMP_OP(v_int32x4, i32m1, 32, 4, _vv_)
-OPENCV_HAL_IMPL_RISCVV_INT_CMP_OP(v_int64x2, i64m1, 64, 2, _vv_)
-OPENCV_HAL_IMPL_RISCVV_INT_CMP_OP(v_uint8x16, u8m1, 8, 16, u_vv_)
-OPENCV_HAL_IMPL_RISCVV_INT_CMP_OP(v_uint16x8, u16m1, 16, 8, u_vv_)
-OPENCV_HAL_IMPL_RISCVV_INT_CMP_OP(v_uint32x4, u32m1, 32, 4, u_vv_)
-OPENCV_HAL_IMPL_RISCVV_INT_CMP_OP(v_uint64x2, u64m1, 64, 2, u_vv_)
-
-//TODO: ==
-inline v_float32x4 operator == (const v_float32x4& a, const v_float32x4& b)
-{
-    vbool32_t mask = vmfeq_vv_f32m1_b32(a.val, b.val, 4);
-    vint32m1_t res = vmerge_vxm_i32m1(mask, vmv_v_x_i32m1(0.0, 4), -1, 4);
-    return v_float32x4((vfloat32m1_t)res);
-}
-inline v_float32x4 operator != (const v_float32x4& a, const v_float32x4& b)
-{
-    vbool32_t mask = vmfne_vv_f32m1_b32(a.val, b.val, 4);
-    vint32m1_t res = vmerge_vxm_i32m1(mask, vmv_v_x_i32m1(0.0, 4), -1, 4);
-    return v_float32x4((vfloat32m1_t)res);
-}
-inline v_float32x4 operator < (const v_float32x4& a, const v_float32x4& b)
-{
-    vbool32_t mask = vmflt_vv_f32m1_b32(a.val, b.val, 4);
-    vint32m1_t res = vmerge_vxm_i32m1(mask, vmv_v_x_i32m1(0.0, 4), -1, 4);
-    return v_float32x4((vfloat32m1_t)res);
-}
-inline v_float32x4 operator <= (const v_float32x4& a, const v_float32x4& b)
-{
-    vbool32_t mask = vmfle_vv_f32m1_b32(a.val, b.val, 4);
-    vint32m1_t res = vmerge_vxm_i32m1(mask, vmv_v_x_i32m1(0.0, 4), -1, 4);
-    return v_float32x4((vfloat32m1_t)res);
-}
-inline v_float32x4 operator > (const v_float32x4& a, const v_float32x4& b)
-{
-    vbool32_t mask = vmfgt_vv_f32m1_b32(a.val, b.val, 4);
-    vint32m1_t res = vmerge_vxm_i32m1(mask, vmv_v_x_i32m1(0.0, 4), -1, 4);
-    return v_float32x4((vfloat32m1_t)res);
-}
-inline v_float32x4 operator >= (const v_float32x4& a, const v_float32x4& b)
-{
-    vbool32_t mask = vmfge_vv_f32m1_b32(a.val, b.val, 4);
-    vint32m1_t res = vmerge_vxm_i32m1(mask, vmv_v_x_i32m1(0.0, 4), -1, 4);
-    return v_float32x4((vfloat32m1_t)res);
-}
-inline v_float32x4 v_not_nan(const v_float32x4& a)
-{
-    vbool32_t mask = vmford_vv_f32m1_b32(a.val, a.val, 4);
-    vint32m1_t res = vmerge_vxm_i32m1(mask, vmv_v_x_i32m1(0.0, 4), -1, 4);
-    return v_float32x4((vfloat32m1_t)res);
-}
-
-//TODO: ==
-inline v_float64x2 operator == (const v_float64x2& a, const v_float64x2& b)
-{
-    vbool64_t mask = vmfeq_vv_f64m1_b64(a.val, b.val, 2);
-    vint64m1_t res = vmerge_vxm_i64m1(mask, vmv_v_x_i64m1(0.0, 2), -1, 2);
-    return v_float64x2((vfloat64m1_t)res);
-}
-inline v_float64x2 operator != (const v_float64x2& a, const v_float64x2& b)
-{
-    vbool64_t mask = vmfne_vv_f64m1_b64(a.val, b.val, 2);
-    vint64m1_t res = vmerge_vxm_i64m1(mask, vmv_v_x_i64m1(0.0, 2), -1, 2);
-    return v_float64x2((vfloat64m1_t)res);
-}
-inline v_float64x2 operator < (const v_float64x2& a, const v_float64x2& b)
-{
-    vbool64_t mask = vmflt_vv_f64m1_b64(a.val, b.val, 2);
-    vint64m1_t res = vmerge_vxm_i64m1(mask, vmv_v_x_i64m1(0.0, 2), -1, 2);
-    return v_float64x2((vfloat64m1_t)res);
-}
-inline v_float64x2 operator <= (const v_float64x2& a, const v_float64x2& b)
-{
-    vbool64_t mask = vmfle_vv_f64m1_b64(a.val, b.val, 2);
-    vint64m1_t res = vmerge_vxm_i64m1(mask, vmv_v_x_i64m1(0.0, 2), -1, 2);
-    return v_float64x2((vfloat64m1_t)res);
-}
-inline v_float64x2 operator > (const v_float64x2& a, const v_float64x2& b)
-{
-    vbool64_t mask = vmfgt_vv_f64m1_b64(a.val, b.val, 2);
-    vint64m1_t res = vmerge_vxm_i64m1(mask, vmv_v_x_i64m1(0.0, 2), -1, 2);
-    return v_float64x2((vfloat64m1_t)res);
-}
-inline v_float64x2 operator >= (const v_float64x2& a, const v_float64x2& b)
-{
-    vbool64_t mask = vmfge_vv_f64m1_b64(a.val, b.val, 2);
-    vint64m1_t res = vmerge_vxm_i64m1(mask, vmv_v_x_i64m1(0.0, 2), -1, 2);
-    return v_float64x2((vfloat64m1_t)res);
-}
-inline v_float64x2 v_not_nan(const v_float64x2& a)
-{
-    vbool64_t mask = vmford_vv_f64m1_b64(a.val, a.val, 2);
-    vint64m1_t res = vmerge_vxm_i64m1(mask, vmv_v_x_i64m1(0.0, 2), -1, 2);
-    return v_float64x2((vfloat64m1_t)res);
-}
-#define OPENCV_HAL_IMPL_RISCVV_TRANSPOSE4x4(_Tp, _T) \
-inline void v_transpose4x4(const v_##_Tp##32x4& a0, const v_##_Tp##32x4& a1, \
-                         const v_##_Tp##32x4& a2, const v_##_Tp##32x4& a3, \
-                         v_##_Tp##32x4& b0, v_##_Tp##32x4& b1, \
-                         v_##_Tp##32x4& b2, v_##_Tp##32x4& b3) \
-{ \
-    v##_Tp##32m4_t val = vundefined_##_T##m4();    \
-    val = vset_##_T##m4(val, 0, a0.val);    \
-    val = vset_##_T##m4(val, 1, a1.val);    \
-    val = vset_##_T##m4(val, 2, a2.val);    \
-    val = vset_##_T##m4(val, 3, a3.val);   \
-    val = vrgather_vv_##_T##m4(val, (vuint32m4_t){0, 4, 8, 12, 1, 5, 9, 13, 2, 6, 10, 14, 3, 7, 11, 15}, 16);    \
-    b0.val = vget_##_T##m4_##_T##m1(val, 0);   \
-    b1.val = vget_##_T##m4_##_T##m1(val, 1);   \
-    b2.val = vget_##_T##m4_##_T##m1(val, 2);   \
-    b3.val = vget_##_T##m4_##_T##m1(val, 3);   \
-}
-OPENCV_HAL_IMPL_RISCVV_TRANSPOSE4x4(uint, u32)
-OPENCV_HAL_IMPL_RISCVV_TRANSPOSE4x4(int, i32)
-OPENCV_HAL_IMPL_RISCVV_TRANSPOSE4x4(float, f32)
-
-
-#define OPENCV_HAL_IMPL_RISCVV_SHIFT_LEFT(_Tpvec, suffix, _T, num) \
-inline _Tpvec operator << (const _Tpvec& a, int n) \
-{ return _Tpvec((vsll_vx_##_T##m1(a.val, n, num))); } \
-template<int n> inline _Tpvec v_shl(const _Tpvec& a) \
-{ return _Tpvec((vsll_vx_##_T##m1(a.val, n, num))); }
-
-#define OPENCV_HAL_IMPL_RISCVV_SHIFT_RIGHT(_Tpvec, suffix, _T, num, intric) \
-inline _Tpvec operator >> (const _Tpvec& a, int n) \
-{ return _Tpvec((v##intric##_vx_##_T##m1(a.val, n, num))); } \
-template<int n> inline _Tpvec v_shr(const _Tpvec& a) \
-{ return _Tpvec((v##intric##_vx_##_T##m1(a.val, n, num))); }\
-template<int n> inline _Tpvec v_rshr(const _Tpvec& a) \
-{ return _Tpvec((v##intric##_vx_##_T##m1(vadd_vx_##_T##m1(a.val, 1<<(n-1), num), n, num))); }
-
-// trade efficiency for convenience
-#define OPENCV_HAL_IMPL_RISCVV_SHIFT_OP(suffix, _T, num, intrin) \
-OPENCV_HAL_IMPL_RISCVV_SHIFT_LEFT(v_##suffix##x##num, suffix, _T, num) \
-OPENCV_HAL_IMPL_RISCVV_SHIFT_RIGHT(v_##suffix##x##num, suffix, _T, num, intrin)
-
-OPENCV_HAL_IMPL_RISCVV_SHIFT_OP(uint8, u8, 16, srl)
-OPENCV_HAL_IMPL_RISCVV_SHIFT_OP(uint16, u16, 8, srl)
-OPENCV_HAL_IMPL_RISCVV_SHIFT_OP(uint32, u32, 4, srl)
-OPENCV_HAL_IMPL_RISCVV_SHIFT_OP(uint64, u64, 2, srl)
-OPENCV_HAL_IMPL_RISCVV_SHIFT_OP(int8, i8, 16, sra)
-OPENCV_HAL_IMPL_RISCVV_SHIFT_OP(int16, i16, 8, sra)
-OPENCV_HAL_IMPL_RISCVV_SHIFT_OP(int32, i32, 4, sra)
-OPENCV_HAL_IMPL_RISCVV_SHIFT_OP(int64, i64, 2, sra)
-
-#if 0
-#define VUP4(n) {0, 1, 2, 3}
-#define VUP8(n) {0, 1, 2, 3, 4, 5, 6, 7}
-#define VUP16(n) {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15}
-#define VUP2(n) {0, 1}
-#endif
-#define OPENCV_HAL_IMPL_RISCVV_ROTATE_OP(_Tpvec, suffix, _T, num, num2, vmv, len) \
-template<int n> inline _Tpvec v_rotate_left(const _Tpvec& a) \
-{    \
-    suffix##m1_t tmp = vmv##_##_T##m1(0, num);\
-        tmp = vslideup_vx_##_T##m1_m(vmset_m_##len(num), tmp, a.val, n, num);\
-        return _Tpvec(tmp);\
-} \
-template<int n> inline _Tpvec v_rotate_right(const _Tpvec& a) \
-{     \
-        return _Tpvec(vslidedown_vx_##_T##m1(a.val, n, num));\
-} \
-template<> inline _Tpvec v_rotate_left<0>(const _Tpvec& a) \
-{ return a; } \
-template<int n> inline _Tpvec v_rotate_right(const _Tpvec& a, const _Tpvec& b) \
-{ \
-    suffix##m2_t tmp = vundefined_##_T##m2();    \
-    tmp = vset_##_T##m2(tmp, 0, a.val);          \
-    tmp = vset_##_T##m2(tmp, 1, b.val);          \
-        tmp = vslidedown_vx_##_T##m2(tmp, n, num2);\
-        return _Tpvec(vget_##_T##m2_##_T##m1(tmp, 0));\
-} \
-template<int n> inline _Tpvec v_rotate_left(const _Tpvec& a, const _Tpvec& b) \
-{ \
-    suffix##m2_t tmp = vundefined_##_T##m2();    \
-    tmp = vset_##_T##m2(tmp, 0, b.val);    \
-    tmp = vset_##_T##m2(tmp, 1, a.val);    \
-        tmp = vslideup_vx_##_T##m2(tmp, n, num2);\
-        return _Tpvec(vget_##_T##m2_##_T##m1(tmp, 1));\
-} \
-template<> inline _Tpvec v_rotate_left<0>(const _Tpvec& a, const _Tpvec& b) \
-{ \
-    CV_UNUSED(b); return a; \
-}
-
-OPENCV_HAL_IMPL_RISCVV_ROTATE_OP(v_uint8x16, vuint8, u8, 16, 32, vmv_v_x, b8)
-OPENCV_HAL_IMPL_RISCVV_ROTATE_OP(v_int8x16, vint8, i8, 16, 32, vmv_v_x, b8)
-OPENCV_HAL_IMPL_RISCVV_ROTATE_OP(v_uint16x8, vuint16, u16, 8, 16, vmv_v_x, b16)
-OPENCV_HAL_IMPL_RISCVV_ROTATE_OP(v_int16x8, vint16, i16, 8, 16, vmv_v_x, b16)
-OPENCV_HAL_IMPL_RISCVV_ROTATE_OP(v_uint32x4, vuint32, u32, 4, 8, vmv_v_x, b32)
-OPENCV_HAL_IMPL_RISCVV_ROTATE_OP(v_int32x4, vint32, i32, 4, 8, vmv_v_x, b32)
-OPENCV_HAL_IMPL_RISCVV_ROTATE_OP(v_uint64x2, vuint64, u64, 2, 4, vmv_v_x, b64)
-OPENCV_HAL_IMPL_RISCVV_ROTATE_OP(v_int64x2, vint64, i64, 2, 4, vmv_v_x, b64)
-OPENCV_HAL_IMPL_RISCVV_ROTATE_OP(v_float32x4, vfloat32, f32, 4, 8, vfmv_v_f, b32)
-OPENCV_HAL_IMPL_RISCVV_ROTATE_OP(v_float64x2, vfloat64, f64, 2, 4, vfmv_v_f, b64)
-
-#define OPENCV_HAL_IMPL_RISCVV_LOADSTORE_OP(_Tpvec, _Tp, _Tp2, len, hnum, num) \
-inline _Tpvec v_load_halves(const _Tp* ptr0, const _Tp* ptr1) \
-{ \
-  typedef uint64 CV_DECL_ALIGNED(1) unaligned_uint64; \
-  vuint64m1_t tmp = {*(unaligned_uint64*)ptr0, *(unaligned_uint64*)ptr1};\
-    return _Tpvec(_Tp2##_t(tmp)); } \
-inline _Tpvec v_load_low(const _Tp* ptr) \
-{ return _Tpvec(vle_v_##len(ptr, hnum)); }\
-inline _Tpvec v_load_aligned(const _Tp* ptr) \
-{ return _Tpvec(vle_v_##len(ptr, num)); } \
-inline _Tpvec v_load(const _Tp* ptr) \
-{ return _Tpvec((_Tp2##_t)vle_v_##len((const _Tp *)ptr, num)); } \
-inline void v_store_low(_Tp* ptr, const _Tpvec& a) \
-{ vse_v_##len(ptr, a.val, hnum);}\
-inline void v_store_high(_Tp* ptr, const _Tpvec& a) \
-{ \
-  _Tp2##_t a0 = vslidedown_vx_##len(a.val, hnum, num);    \
-  vse_v_##len(ptr, a0, hnum);}\
-inline void v_store(_Tp* ptr, const _Tpvec& a) \
-{ vse_v_##len(ptr, a.val, num); } \
-inline void v_store_aligned(_Tp* ptr, const _Tpvec& a) \
-{ vse_v_##len(ptr, a.val, num); } \
-inline void v_store_aligned_nocache(_Tp* ptr, const _Tpvec& a) \
-{ vse_v_##len(ptr, a.val, num); } \
-inline void v_store(_Tp* ptr, const _Tpvec& a, hal::StoreMode /*mode*/) \
-{ vse_v_##len(ptr, a.val, num); }
-
-OPENCV_HAL_IMPL_RISCVV_LOADSTORE_OP(v_uint8x16, uchar, vuint8m1, u8m1, 8, 16)
-OPENCV_HAL_IMPL_RISCVV_LOADSTORE_OP(v_int8x16,  schar, vint8m1, i8m1, 8, 16)
-OPENCV_HAL_IMPL_RISCVV_LOADSTORE_OP(v_uint16x8, ushort, vuint16m1, u16m1, 4, 8)
-OPENCV_HAL_IMPL_RISCVV_LOADSTORE_OP(v_int16x8,  short,  vint16m1, i16m1, 4, 8)
-OPENCV_HAL_IMPL_RISCVV_LOADSTORE_OP(v_uint32x4, unsigned, vuint32m1, u32m1, 2, 4)
-OPENCV_HAL_IMPL_RISCVV_LOADSTORE_OP(v_int32x4,  int,     vint32m1, i32m1, 2, 4)
-OPENCV_HAL_IMPL_RISCVV_LOADSTORE_OP(v_uint64x2, unsigned long, vuint64m1, u64m1, 1, 2)
-OPENCV_HAL_IMPL_RISCVV_LOADSTORE_OP(v_int64x2,  long,     vint64m1, i64m1, 1, 2)
-OPENCV_HAL_IMPL_RISCVV_LOADSTORE_OP(v_float32x4, float, vfloat32m1, f32m1, 2, 4)
-OPENCV_HAL_IMPL_RISCVV_LOADSTORE_OP(v_float64x2, double, vfloat64m1, f64m1, 1, 2)
-
-
-////////////// Lookup table access ////////////////////
-
-inline v_int8x16 v_lut(const schar* tab, const int* idx)
-{
-#if 1
-    schar CV_DECL_ALIGNED(32) elems[16] =
-    {
-        tab[idx[ 0]],
-        tab[idx[ 1]],
-        tab[idx[ 2]],
-        tab[idx[ 3]],
-        tab[idx[ 4]],
-        tab[idx[ 5]],
-        tab[idx[ 6]],
-        tab[idx[ 7]],
-        tab[idx[ 8]],
-        tab[idx[ 9]],
-        tab[idx[10]],
-        tab[idx[11]],
-        tab[idx[12]],
-        tab[idx[13]],
-        tab[idx[14]],
-        tab[idx[15]]
-    };
-    return v_int8x16(vle_v_i8m1(elems, 16));
-#else
-    int32xm4_t index32 = vlev_int32xm4(idx, 16);
-    vint16m2_t index16 = vnsra_vx_i16m2_int32xm4(index32, 0, 16);
-    vint8m1_t index = vnsra_vx_i8m1_i16m2(index16, 0, 16);
-    return v_int8x16(vlxbv_i8m1(tab, index, 16));
-#endif
-}
-
-inline v_int8x16 v_lut_pairs(const schar* tab, const int* idx){
-    schar CV_DECL_ALIGNED(32) elems[16] =
-    {
-        tab[idx[0]],
-        tab[idx[0] + 1],
-        tab[idx[1]],
-        tab[idx[1] + 1],
-        tab[idx[2]],
-        tab[idx[2] + 1],
-        tab[idx[3]],
-        tab[idx[3] + 1],
-        tab[idx[4]],
-        tab[idx[4] + 1],
-        tab[idx[5]],
-        tab[idx[5] + 1],
-        tab[idx[6]],
-        tab[idx[6] + 1],
-        tab[idx[7]],
-        tab[idx[7] + 1]
-    };
-    return v_int8x16(vle_v_i8m1(elems, 16));
-}
-inline v_int8x16 v_lut_quads(const schar* tab, const int* idx)
-{
-    schar CV_DECL_ALIGNED(32) elems[16] =
-    {
-        tab[idx[0]],
-        tab[idx[0] + 1],
-        tab[idx[0] + 2],
-        tab[idx[0] + 3],
-        tab[idx[1]],
-        tab[idx[1] + 1],
-        tab[idx[1] + 2],
-        tab[idx[1] + 3],
-        tab[idx[2]],
-        tab[idx[2] + 1],
-        tab[idx[2] + 2],
-        tab[idx[2] + 3],
-        tab[idx[3]],
-        tab[idx[3] + 1],
-        tab[idx[3] + 2],
-        tab[idx[3] + 3]
-    };
-    return v_int8x16(vle_v_i8m1(elems, 16));
-}
-
-inline v_uint8x16 v_lut(const uchar* tab, const int* idx) { return v_reinterpret_as_u8(v_lut((schar*)tab, idx)); }
-inline v_uint8x16 v_lut_pairs(const uchar* tab, const int* idx) { return v_reinterpret_as_u8(v_lut_pairs((schar*)tab, idx)); }
-inline v_uint8x16 v_lut_quads(const uchar* tab, const int* idx) { return v_reinterpret_as_u8(v_lut_quads((schar*)tab, idx)); }
-
-inline v_int16x8 v_lut(const short* tab, const int* idx)
-{
-    short CV_DECL_ALIGNED(32) elems[8] =
-    {
-        tab[idx[0]],
-        tab[idx[1]],
-        tab[idx[2]],
-        tab[idx[3]],
-        tab[idx[4]],
-        tab[idx[5]],
-        tab[idx[6]],
-        tab[idx[7]]
-    };
-    return v_int16x8(vle_v_i16m1(elems, 8));
-}
-inline v_int16x8 v_lut_pairs(const short* tab, const int* idx)
-{
-    short CV_DECL_ALIGNED(32) elems[8] =
-    {
-        tab[idx[0]],
-        tab[idx[0] + 1],
-        tab[idx[1]],
-        tab[idx[1] + 1],
-        tab[idx[2]],
-        tab[idx[2] + 1],
-        tab[idx[3]],
-        tab[idx[3] + 1]
-    };
-    return v_int16x8(vle_v_i16m1(elems, 8));
-}
-inline v_int16x8 v_lut_quads(const short* tab, const int* idx)
-{
-    short CV_DECL_ALIGNED(32) elems[8] =
-    {
-        tab[idx[0]],
-        tab[idx[0] + 1],
-        tab[idx[0] + 2],
-        tab[idx[0] + 3],
-        tab[idx[1]],
-        tab[idx[1] + 1],
-        tab[idx[1] + 2],
-        tab[idx[1] + 3]
-    };
-    return v_int16x8(vle_v_i16m1(elems, 8));
-}
-inline v_uint16x8 v_lut(const ushort* tab, const int* idx) { return v_reinterpret_as_u16(v_lut((short*)tab, idx)); }
-inline v_uint16x8 v_lut_pairs(const ushort* tab, const int* idx) { return v_reinterpret_as_u16(v_lut_pairs((short*)tab, idx)); }
-inline v_uint16x8 v_lut_quads(const ushort* tab, const int* idx) { return v_reinterpret_as_u16(v_lut_quads((short*)tab, idx)); }
-
-inline v_int32x4 v_lut(const int* tab, const int* idx)
-{
-    int CV_DECL_ALIGNED(32) elems[4] =
-    {
-        tab[idx[0]],
-        tab[idx[1]],
-        tab[idx[2]],
-        tab[idx[3]]
-    };
-    return v_int32x4(vle_v_i32m1(elems, 4));
-}
-inline v_int32x4 v_lut_pairs(const int* tab, const int* idx)
-{
-    int CV_DECL_ALIGNED(32) elems[4] =
-    {
-        tab[idx[0]],
-        tab[idx[0] + 1],
-        tab[idx[1]],
-        tab[idx[1] + 1]
-    };
-    return v_int32x4(vle_v_i32m1(elems, 4));
-}
-inline v_int32x4 v_lut_quads(const int* tab, const int* idx)
-{
-    return v_int32x4(vle_v_i32m1(tab+idx[0], 4));
-}
-inline v_uint32x4 v_lut(const unsigned* tab, const int* idx) { return v_reinterpret_as_u32(v_lut((int*)tab, idx)); }
-inline v_uint32x4 v_lut_pairs(const unsigned* tab, const int* idx) { return v_reinterpret_as_u32(v_lut_pairs((int*)tab, idx)); }
-inline v_uint32x4 v_lut_quads(const unsigned* tab, const int* idx) { return v_reinterpret_as_u32(v_lut_quads((int*)tab, idx)); }
-
-inline v_int64x2 v_lut(const int64_t* tab, const int* idx)
-{
-    vint64m1_t res = {tab[idx[0]], tab[idx[1]]};
-    return v_int64x2(res);
-}
-inline v_int64x2 v_lut_pairs(const int64_t* tab, const int* idx)
-{
-    return v_int64x2(vle_v_i64m1(tab+idx[0], 2));
-}
-
-inline v_uint64x2 v_lut(const uint64_t* tab, const int* idx)
-{
-    vuint64m1_t res = {tab[idx[0]], tab[idx[1]]};
-    return v_uint64x2(res);
-}
-inline v_uint64x2 v_lut_pairs(const uint64_t* tab, const int* idx)
-{
-    return v_uint64x2(vle_v_u64m1(tab+idx[0], 2));
-}
-
-inline v_float32x4 v_lut(const float* tab, const int* idx)
-{
-    float CV_DECL_ALIGNED(32) elems[4] =
-    {
-        tab[idx[0]],
-        tab[idx[1]],
-        tab[idx[2]],
-        tab[idx[3]]
-    };
-    return v_float32x4(vle_v_f32m1(elems, 4));
-}
-inline v_float32x4 v_lut_pairs(const float* tab, const int* idx)
-{
-    float CV_DECL_ALIGNED(32) elems[4] =
-    {
-        tab[idx[0]],
-        tab[idx[0]+1],
-        tab[idx[1]],
-        tab[idx[1]+1]
-    };
-    return v_float32x4(vle_v_f32m1(elems, 4));
-}
-inline v_float32x4 v_lut_quads(const float* tab, const int* idx)
-{
-    return v_float32x4(vle_v_f32m1(tab + idx[0], 4));
-}
-inline v_float64x2 v_lut(const double* tab, const int* idx)
-{
-    vfloat64m1_t res = {tab[idx[0]], tab[idx[1]]};
-    return v_float64x2(res);
-}
-inline v_float64x2 v_lut_pairs(const double* tab, const int* idx)
-{
-    return v_float64x2(vle_v_f64m1(tab+idx[0], 2));
-}
-
-inline v_int32x4 v_lut(const int* tab, const v_int32x4& idxvec)
-{
-    int CV_DECL_ALIGNED(32) elems[4] =
-    {
-        tab[idxvec.val[0]],
-        tab[idxvec.val[1]],
-        tab[idxvec.val[2]],
-        tab[idxvec.val[3]]
-    };
-    return v_int32x4(vle_v_i32m1(elems, 4));
-}
-
-inline v_uint32x4 v_lut(const unsigned* tab, const v_int32x4& idxvec)
-{
-    unsigned CV_DECL_ALIGNED(32) elems[4] =
-    {
-        tab[idxvec.val[0]],
-        tab[idxvec.val[1]],
-        tab[idxvec.val[2]],
-        tab[idxvec.val[3]]
-    };
-    return v_uint32x4(vle_v_u32m1(elems, 4));
-}
-
-inline v_float32x4 v_lut(const float* tab, const v_int32x4& idxvec)
-{
-    float CV_DECL_ALIGNED(32) elems[4] =
-    {
-        tab[idxvec.val[0]],
-        tab[idxvec.val[1]],
-        tab[idxvec.val[2]],
-        tab[idxvec.val[3]]
-    };
-    return v_float32x4(vle_v_f32m1(elems, 4));
-}
-inline v_float64x2 v_lut(const double* tab, const v_int32x4& idxvec)
-{
-    vfloat64m1_t res = {tab[idxvec.val[0]], tab[idxvec.val[1]]};
-    return v_float64x2(res);
-}
-inline void v_lut_deinterleave(const float* tab, const v_int32x4& idxvec, v_float32x4& x, v_float32x4& y)
-{
-    vint32m1_t index_x = vmul_vx_i32m1(idxvec.val, 4, 4);
-    vint32m1_t index_y = vadd_vx_i32m1(index_x, 4, 4);
-
-    x.val = vlxe_v_f32m1(tab, index_x, 4);
-    y.val = vlxe_v_f32m1(tab, index_y, 4);
-}
-
-inline void v_lut_deinterleave(const double* tab, const v_int32x4& idxvec, v_float64x2& x, v_float64x2& y)
-{
-    int CV_DECL_ALIGNED(32) idx[4];
-    v_store_aligned(idx, idxvec);
-
-    x = v_float64x2(tab[idx[0]], tab[idx[1]]);
-    y = v_float64x2(tab[idx[0]+1], tab[idx[1]+1]);
-}
-
-#define OPENCV_HAL_IMPL_RISCVV_PACKS(_Tp, _Tp2, _T2, num2, _T1, num, intrin, shr, _Type) \
-inline v_##_Tp##x##num v_pack(const v_##_Tp2##x##num2& a, const v_##_Tp2##x##num2& b) \
-{ \
-    v##_Tp2##m2_t  tmp = vundefined_##_T2##m2();    \
-    tmp = vset_##_T2##m2(tmp, 0, a.val);    \
-    tmp = vset_##_T2##m2(tmp, 1, b.val);    \
-    return v_##_Tp##x##num(shr##_##_T1##m1(tmp, 0, num)); \
-}\
-template<int n> inline \
-v_##_Tp##x##num v_rshr_pack(const v_##_Tp2##x##num2& a, const v_##_Tp2##x##num2& b) \
-{ \
-    v##_Tp2##m2_t  tmp = vundefined_##_T2##m2();    \
-    tmp = vset_##_T2##m2(tmp, 0, a.val);    \
-    tmp = vset_##_T2##m2(tmp, 1, b.val);    \
-    return v_##_Tp##x##num(intrin##_##_T1##m1(tmp, n, num)); \
-}\
-inline void v_pack_store(_Type* ptr, const v_##_Tp2##x##num2& a) \
-{ \
-    v##_Tp2##m2_t tmp = vundefined_##_T2##m2();    \
-    tmp = vset_##_T2##m2(tmp, 0, a.val);    \
-    tmp = vset_##_T2##m2(tmp, 1, vmv_v_x_##_T2##m1(0, num2));    \
-    asm("" ::: "memory");                                       \
-    vse_v_##_T1##m1(ptr, shr##_##_T1##m1(tmp, 0, num), num2); \
-}\
-template<int n> inline \
-void v_rshr_pack_store(_Type* ptr, const v_##_Tp2##x##num2& a) \
-{ \
-    v##_Tp2##m2_t tmp = vundefined_##_T2##m2();    \
-    tmp = vset_##_T2##m2(tmp, 0, a.val);    \
-    tmp = vset_##_T2##m2(tmp, 1, vmv_v_x_##_T2##m1(0, num2));    \
-    vse_v_##_T1##m1(ptr, intrin##_##_T1##m1(tmp, n, num), num2); \
-}
-OPENCV_HAL_IMPL_RISCVV_PACKS(int8, int16, i16, 8, i8, 16, vnclip_vx, vnclip_vx, signed char)
-OPENCV_HAL_IMPL_RISCVV_PACKS(int16, int32, i32, 4, i16, 8, vnclip_vx, vnclip_vx, signed short)
-OPENCV_HAL_IMPL_RISCVV_PACKS(int32, int64, i64, 2, i32, 4, vnclip_vx, vnsra_vx, int)
-OPENCV_HAL_IMPL_RISCVV_PACKS(uint8, uint16, u16, 8, u8, 16, vnclipu_vx, vnclipu_vx, unsigned char)
-OPENCV_HAL_IMPL_RISCVV_PACKS(uint16, uint32, u32, 4, u16, 8, vnclipu_vx, vnclipu_vx, unsigned short)
-OPENCV_HAL_IMPL_RISCVV_PACKS(uint32, uint64, u64, 2, u32, 4, vnclipu_vx, vnsrl_vx, unsigned int)
-
-// pack boolean
-inline v_uint8x16 v_pack_b(const v_uint16x8& a, const v_uint16x8& b)
-{
-    vuint16m2_t tmp = vundefined_u16m2();    \
-    tmp = vset_u16m2(tmp, 0, a.val);    \
-    tmp = vset_u16m2(tmp, 1, b.val);    \
-    return v_uint8x16(vnsrl_vx_u8m1(tmp, 0, 16));
-}
-
-inline v_uint8x16 v_pack_b(const v_uint32x4& a, const v_uint32x4& b,
-                           const v_uint32x4& c, const v_uint32x4& d)
-{
-    vuint32m4_t vabcd = vundefined_u32m4();    \
-    vuint16m2_t v16 = vundefined_u16m2();    \
-    vabcd = vset_u32m4(vabcd, 0, a.val);    \
-    vabcd = vset_u32m4(vabcd, 1, b.val);    \
-    vabcd = vset_u32m4(vabcd, 2, c.val);    \
-    vabcd = vset_u32m4(vabcd, 3, d.val);    \
-    v16 = vnsrl_vx_u16m2(vabcd, 0, 16);
-    return v_uint8x16(vnsrl_vx_u8m1(v16, 0, 16));
-}
-
-inline v_uint8x16 v_pack_b(const v_uint64x2& a, const v_uint64x2& b, const v_uint64x2& c,
-                           const v_uint64x2& d, const v_uint64x2& e, const v_uint64x2& f,
-                           const v_uint64x2& g, const v_uint64x2& h)
-{
-    vuint64m8_t v64 = vundefined_u64m8();    \
-    vuint32m4_t v32 = vundefined_u32m4();    \
-    vuint16m2_t v16 = vundefined_u16m2();    \
-    v64 = vset_u64m8(v64, 0, a.val);    \
-    v64 = vset_u64m8(v64, 1, b.val);    \
-    v64 = vset_u64m8(v64, 2, c.val);    \
-    v64 = vset_u64m8(v64, 3, d.val);    \
-    v64 = vset_u64m8(v64, 4, e.val);    \
-    v64 = vset_u64m8(v64, 5, f.val);    \
-    v64 = vset_u64m8(v64, 6, g.val);    \
-    v64 = vset_u64m8(v64, 7, h.val);    \
-    v32 = vnsrl_vx_u32m4(v64, 0, 16);
-    v16 = vnsrl_vx_u16m2(v32, 0, 16);
-    return v_uint8x16(vnsrl_vx_u8m1(v16, 0, 16));
-}
-
-//inline v_uint8x16 v_pack_u(const v_int16x8& a, const v_int16x8& b) \
-//{ \
-//    int16xm2_u tmp;    \
-//    tmp.m1[0] = (vint16m1_t)a.val;    \
-//    tmp.m1[1] = (vint16m1_t)b.val;    \
-//    e8xm1_t mask = (e8xm1_t)vmsge_vx_e16xm2_i16m2(tmp.v, 0, 16);\
-//    return v_uint8x16(vnclipuvi_mask_u8m1_u16m2(vmv_v_x_u8m1(0, 16), (vuint16m2_t)tmp.v, 0, mask, 16));
-//}
-
-#define OPENCV_HAL_IMPL_RISCVV_PACK_U(tp1, num1, tp2, num2, _Tp) \
-inline v_uint##tp1##x##num1 v_pack_u(const v_int##tp2##x##num2& a, const v_int##tp2##x##num2& b) \
-{ \
-    vint##tp2##m2_t tmp = vundefined_##i##tp2##m2();    \
-    tmp = vset_##i##tp2##m2(tmp, 0, a.val);    \
-    tmp = vset_##i##tp2##m2(tmp, 1, b.val);    \
-    vint##tp2##m2_t val = vmax_vx_i##tp2##m2(tmp, 0, num1);\
-    return v_uint##tp1##x##num1(vnclipu_vx_u##tp1##m1((vuint##tp2##m2_t)val, 0, num1));    \
-} \
-inline void v_pack_u_store(_Tp* ptr, const v_int##tp2##x##num2& a) \
-{ \
-    vint##tp2##m2_t tmp = vundefined_##i##tp2##m2();    \
-    tmp = vset_##i##tp2##m2(tmp, 0, a.val);    \
-    vint##tp2##m2_t val = vmax_vx_i##tp2##m2(tmp, 0, num1);\
-    return vse_v_u##tp1##m1(ptr, vnclipu_vx_u##tp1##m1((vuint##tp2##m2_t)val, 0, num1), num2);    \
-} \
-template<int n> inline \
-v_uint##tp1##x##num1 v_rshr_pack_u(const v_int##tp2##x##num2& a, const v_int##tp2##x##num2& b) \
-{ \
-    vint##tp2##m2_t tmp = vundefined_##i##tp2##m2();    \
-    tmp = vset_##i##tp2##m2(tmp, 0, a.val);    \
-    tmp = vset_##i##tp2##m2(tmp, 1, b.val);    \
-    vint##tp2##m2_t val = vmax_vx_i##tp2##m2(tmp, 0, num1);\
-    return v_uint##tp1##x##num1(vnclipu_vx_u##tp1##m1((vuint##tp2##m2_t)val, n, num1));    \
-} \
-template<int n> inline \
-void v_rshr_pack_u_store(_Tp* ptr, const v_int##tp2##x##num2& a) \
-{ \
-    vint##tp2##m2_t tmp = vundefined_##i##tp2##m2();    \
-    tmp = vset_##i##tp2##m2(tmp, 0, a.val);    \
-    vint##tp2##m2_t val_ = vmax_vx_i##tp2##m2(tmp, 0, num1);\
-    vuint##tp1##m1_t val = vnclipu_vx_u##tp1##m1((vuint##tp2##m2_t)val_, n, num1);    \
-    return vse_v_u##tp1##m1(ptr, val, num2);\
-}
-OPENCV_HAL_IMPL_RISCVV_PACK_U(8, 16, 16, 8, unsigned char )
-OPENCV_HAL_IMPL_RISCVV_PACK_U(16, 8, 32, 4, unsigned short)
-
-#ifdef __GNUC__
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wuninitialized"
-#endif
-
-// saturating multiply 8-bit, 16-bit
-#define OPENCV_HAL_IMPL_RISCVV_MUL_SAT(_Tpvec, _Tpwvec)            \
-    inline _Tpvec operator * (const _Tpvec& a, const _Tpvec& b)  \
-    {                                                            \
-        _Tpwvec c, d;                                            \
-        v_mul_expand(a, b, c, d);                                \
-        return v_pack(c, d);                                     \
-    }                                                            \
-    inline _Tpvec& operator *= (_Tpvec& a, const _Tpvec& b)      \
-    { a = a * b; return a; }
-
-OPENCV_HAL_IMPL_RISCVV_MUL_SAT(v_int8x16,  v_int16x8)
-OPENCV_HAL_IMPL_RISCVV_MUL_SAT(v_uint8x16, v_uint16x8)
-OPENCV_HAL_IMPL_RISCVV_MUL_SAT(v_int16x8,  v_int32x4)
-OPENCV_HAL_IMPL_RISCVV_MUL_SAT(v_uint16x8, v_uint32x4)
-
-#ifdef __GNUC__
-#pragma GCC diagnostic pop
-#endif
-static const signed char popCountTable[256] =
-{
-    0, 1, 1, 2, 1, 2, 2, 3, 1, 2, 2, 3, 2, 3, 3, 4,
-    1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5,
-    1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5,
-    2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6,
-    1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5,
-    2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6,
-    2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6,
-    3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, 7,
-    1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5,
-    2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6,
-    2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6,
-    3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, 7,
-    2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6,
-    3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, 7,
-    3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, 7,
-    4, 5, 5, 6, 5, 6, 6, 7, 5, 6, 6, 7, 6, 7, 7, 8,
-};
-
-inline vuint8m1_t vcnt_u8(vuint8m1_t val){
-    vuint8m1_t v0 = val & 1;
-    return vlxe_v_u8m1((unsigned char*)popCountTable, val >> 1, 16)+v0;
-}
-
-inline v_uint8x16
-v_popcount(const v_uint8x16& a)
-{
-    return v_uint8x16(vcnt_u8(a.val));
-}
-
-inline v_uint8x16
-v_popcount(const v_int8x16& a)
-{
-    return v_uint8x16(vcnt_u8((vuint8m1_t)a.val));
-}
-
-inline v_uint16x8
-v_popcount(const v_uint16x8& a)
-{
-    vuint8m2_t tmp = vundefined_u8m2();
-    tmp = vset_u8m2(tmp, 0, vcnt_u8((vuint8m1_t)a.val));
-    vuint64m2_t mask = (vuint64m2_t){0x0E0C0A0806040200, 0, 0x0F0D0B0907050301, 0};
-    tmp = vrgather_vv_u8m2(tmp, (vuint8m2_t)mask, 32);    \
-    vuint16m2_t res = vwaddu_vv_u16m2(vget_u8m2_u8m1(tmp, 0), vget_u8m2_u8m1(tmp, 1), 8);
-    return v_uint16x8(vget_u16m2_u16m1(res, 0));
-}
-
-inline v_uint16x8
-v_popcount(const v_int16x8& a)
-{
-    vuint8m2_t tmp = vundefined_u8m2();
-    tmp = vset_u8m2(tmp, 0, vcnt_u8((vuint8m1_t)a.val));
-    vuint64m2_t mask = (vuint64m2_t){0x0E0C0A0806040200, 0, 0x0F0D0B0907050301, 0};
-    tmp = vrgather_vv_u8m2(tmp, (vuint8m2_t)mask, 32);    \
-    vuint16m2_t res = vwaddu_vv_u16m2(vget_u8m2_u8m1(tmp, 0), vget_u8m2_u8m1(tmp, 1), 8);
-    return v_uint16x8(vget_u16m2_u16m1(res, 0));
-}
-
-inline v_uint32x4
-v_popcount(const v_uint32x4& a)
-{
-    vuint8m2_t tmp = vundefined_u8m2();
-    tmp = vset_u8m2(tmp, 0, vcnt_u8((vuint8m1_t)a.val));
-    vuint64m2_t mask = (vuint64m2_t){0xFFFFFFFF0C080400, 0xFFFFFFFF0D090501,
-                     0xFFFFFFFF0E0A0602, 0xFFFFFFFF0F0B0703};
-    tmp = vrgather_vv_u8m2(tmp, (vuint8m2_t)mask, 32);    \
-    vuint16m2_t res_ = vwaddu_vv_u16m2(vget_u8m2_u8m1(tmp, 0), vget_u8m2_u8m1(tmp, 1), 16);
-    vuint32m2_t res  = vwaddu_vv_u32m2(vget_u16m2_u16m1(res_, 0), vget_u16m2_u16m1(res_, 1), 8);
-    return v_uint32x4(vget_u32m2_u32m1(res, 0));
-}
-
-inline v_uint32x4
-v_popcount(const v_int32x4& a)
-{
-    vuint8m2_t tmp = vundefined_u8m2();
-    tmp = vset_u8m2(tmp, 0, vcnt_u8((vuint8m1_t)a.val));
-    vuint64m2_t mask = (vuint64m2_t){0xFFFFFFFF0C080400, 0xFFFFFFFF0D090501,
-                     0xFFFFFFFF0E0A0602, 0xFFFFFFFF0F0B0703};
-    tmp = vrgather_vv_u8m2(tmp, (vuint8m2_t)mask, 32);    \
-    vuint16m2_t res_ = vwaddu_vv_u16m2(vget_u8m2_u8m1(tmp, 0), vget_u8m2_u8m1(tmp, 1), 16);
-    vuint32m2_t res  = vwaddu_vv_u32m2(vget_u16m2_u16m1(res_, 0), vget_u16m2_u16m1(res_, 1), 8);
-    return v_uint32x4(vget_u32m2_u32m1(res, 0));
-}
-
-inline v_uint64x2
-v_popcount(const v_uint64x2& a)
-{
-    vuint8m2_t tmp = vundefined_u8m2();
-    tmp = vset_u8m2(tmp, 0, vcnt_u8((vuint8m1_t)a.val));
-    vuint64m2_t mask = (vuint64m2_t){0x0706050403020100, 0x0000000000000000,
-                     0x0F0E0D0C0B0A0908, 0x0000000000000000};
-    tmp = vrgather_vv_u8m2(tmp, (vuint8m2_t)mask, 32);    \
-    vuint8m1_t zero = vmv_v_x_u8m1(0, 16);
-    vuint8m1_t res1 = zero;
-    vuint8m1_t res2 = zero;
-    res1 = vredsum_vs_u8m1_u8m1(res1, vget_u8m2_u8m1(tmp, 0), zero, 8);
-    res2 = vredsum_vs_u8m1_u8m1(res2, vget_u8m2_u8m1(tmp, 1), zero, 8);
-
-    return v_uint64x2((unsigned long)vmv_x_s_u8m1_u8(res1, 8), (unsigned long)vmv_x_s_u8m1_u8(res2, 8));
-}
-
-inline v_uint64x2
-v_popcount(const v_int64x2& a)
-{
-    vuint8m2_t tmp = vundefined_u8m2();
-    tmp = vset_u8m2(tmp, 0, vcnt_u8((vuint8m1_t)a.val));
-    vuint64m2_t mask = (vuint64m2_t){0x0706050403020100, 0x0000000000000000,
-                     0x0F0E0D0C0B0A0908, 0x0000000000000000};
-    tmp = vrgather_vv_u8m2(tmp, (vuint8m2_t)mask, 32);    \
-    vuint8m1_t zero = vmv_v_x_u8m1(0, 16);
-    vuint8m1_t res1 = zero;
-    vuint8m1_t res2 = zero;
-    res1 = vredsum_vs_u8m1_u8m1(res1, vget_u8m2_u8m1(tmp, 0), zero, 8);
-    res2 = vredsum_vs_u8m1_u8m1(res2, vget_u8m2_u8m1(tmp, 1), zero, 8);
-
-    return v_uint64x2((unsigned long)vmv_x_s_u8m1_u8(res1, 8), (unsigned long)vmv_x_s_u8m1_u8(res2, 8));
-}
-
-#define SMASK 1, 2, 4, 8, 16, 32, 64, 128
-inline int v_signmask(const v_uint8x16& a)
-{
-    vuint8m1_t t0  = vsrl_vx_u8m1(a.val, 7, 16);
-    vuint8m1_t m1  = (vuint8m1_t){SMASK, SMASK};
-    vuint16m2_t t1 = vwmulu_vv_u16m2(t0, m1, 16);
-    vuint32m1_t res = vmv_v_x_u32m1(0, 4);
-    vuint32m2_t t2 = vwmulu_vx_u32m2(vget_u16m2_u16m1(t1, 1), 256, 8);
-    res = vredsum_vs_u32m2_u32m1(res, t2, res, 8);
-    res = vwredsumu_vs_u16m1_u32m1(res, vget_u16m2_u16m1(t1, 0), res, 8);
-    return vmv_x_s_u32m1_u32(res, 8);
-}
-inline int v_signmask(const v_int8x16& a)
-{
-    vuint8m1_t t0 = vsrl_vx_u8m1((vuint8m1_t)a.val, 7, 16);
-    vuint8m1_t m1 = (vuint8m1_t){SMASK, SMASK};
-    vint16m2_t t1 = (vint16m2_t)vwmulu_vv_u16m2(t0, m1, 16);
-    vint32m1_t res = vmv_v_x_i32m1(0, 4);
-    vint32m2_t t2 = vwmul_vx_i32m2(vget_i16m2_i16m1(t1, 1), 256, 8);
-    res = vredsum_vs_i32m2_i32m1(res, t2, res, 8);
-    res = vwredsum_vs_i16m1_i32m1(res, vget_i16m2_i16m1(t1, 0), res, 8);
-    return vmv_x_s_i32m1_i32(res, 8);
-}
-
-inline int v_signmask(const v_int16x8& a)
-{
-    vint16m1_t t0 = (vint16m1_t)vsrl_vx_u16m1((vuint16m1_t)a.val, 15, 8);
-    vint16m1_t m1 = (vint16m1_t){SMASK};
-    vint16m1_t t1 = vmul_vv_i16m1(t0, m1, 8);
-    vint16m1_t res = vmv_v_x_i16m1(0, 8);
-    res = vredsum_vs_i16m1_i16m1(res, t1, res, 8);
-    return vmv_x_s_i16m1_i16(res, 8);
-}
-inline int v_signmask(const v_uint16x8& a)
-{
-    vint16m1_t t0 = (vint16m1_t)vsrl_vx_u16m1((vuint16m1_t)a.val, 15, 8);
-    vint16m1_t m1 = (vint16m1_t){SMASK};
-    vint16m1_t t1 = vmul_vv_i16m1(t0, m1, 8);
-    vint16m1_t res = vmv_v_x_i16m1(0, 8);
-    res = vredsum_vs_i16m1_i16m1(res, t1, res, 8);
-    return vmv_x_s_i16m1_i16(res, 8);
-}
-inline int v_signmask(const v_int32x4& a)
-{
-    vint32m1_t t0 = (vint32m1_t)vsrl_vx_u32m1((vuint32m1_t)a.val, 31, 4);
-    vint32m1_t m1 = (vint32m1_t){1, 2, 4, 8};
-    vint32m1_t res = vmv_v_x_i32m1(0, 4);
-    vint32m1_t t1 = vmul_vv_i32m1(t0, m1, 4);
-    res = vredsum_vs_i32m1_i32m1(res, t1, res, 4);
-    return vmv_x_s_i32m1_i32(res, 4);
-}
-inline int v_signmask(const v_uint32x4& a)
-{
-    vint32m1_t t0 = (vint32m1_t)vsrl_vx_u32m1(a.val, 31, 4);
-    vint32m1_t m1 = (vint32m1_t){1, 2, 4, 8};
-    vint32m1_t res = vmv_v_x_i32m1(0, 4);
-    vint32m1_t t1 = vmul_vv_i32m1(t0, m1, 4);
-    res = vredsum_vs_i32m1_i32m1(res, t1, res, 4);
-    return vmv_x_s_i32m1_i32(res, 4);
-}
-inline int v_signmask(const v_uint64x2& a)
-{
-    vuint64m1_t v0 = vsrl_vx_u64m1(a.val, 63, 2);
-    int res = (int)vext_x_v_u64m1_u64(v0, 0, 2) + ((int)vext_x_v_u64m1_u64(v0, 1, 2) << 1);
-    return res;
-}
-inline int v_signmask(const v_int64x2& a)
-{ return v_signmask(v_reinterpret_as_u64(a)); }
-inline int v_signmask(const v_float64x2& a)
-{ return v_signmask(v_reinterpret_as_u64(a)); }
-inline int v_signmask(const v_float32x4& a)
-{
-    vint32m1_t t0 = (vint32m1_t)vsrl_vx_u32m1((vuint32m1_t)a.val, 31, 4);
-    vint32m1_t m1 = (vint32m1_t){1, 2, 4, 8};
-    vint32m1_t res = vmv_v_x_i32m1(0, 4);
-    vint32m1_t t1 = vmul_vv_i32m1(t0, m1, 4);
-    res = vredsum_vs_i32m1_i32m1(res, t1, res, 4);
-    return vmv_x_s_i32m1_i32(res, 4);
-}
-
-inline int v_scan_forward(const v_int8x16& a) {
-int val = v_signmask(a);
-if(val==0) return 0;
-else return trailingZeros32(val); }
-inline int v_scan_forward(const v_uint8x16& a) {
-int val = v_signmask(a);
-if(val==0) return 0;
-else return trailingZeros32(val); }
-inline int v_scan_forward(const v_int16x8& a) {
-int val = v_signmask(a);
-if(val==0) return 0;
-else return trailingZeros32(val); }
-inline int v_scan_forward(const v_uint16x8& a) {
-int val = v_signmask(a);
-if(val==0) return 0;
-else return trailingZeros32(val); }
-inline int v_scan_forward(const v_int32x4& a) {
-int val = v_signmask(a);
-if(val==0) return 0;
-else return trailingZeros32(val); }
-inline int v_scan_forward(const v_uint32x4& a) {
-int val = v_signmask(a);
-if(val==0) return 0;
-else return trailingZeros32(val); }
-inline int v_scan_forward(const v_float32x4& a) {
-int val = v_signmask(a);
-if(val==0) return 0;
-else return trailingZeros32(val); }
-inline int v_scan_forward(const v_int64x2& a) {
-int val = v_signmask(a);
-if(val==0) return 0;
-else return trailingZeros32(val); }
-inline int v_scan_forward(const v_uint64x2& a) {
-int val = v_signmask(a);
-if(val==0) return 0;
-else return trailingZeros32(val); }
-
-#define OPENCV_HAL_IMPL_RISCVV_CHECK_ALLANY(_Tpvec, suffix, _T, shift, num) \
-inline bool v_check_all(const v_##_Tpvec& a) \
-{ \
-    suffix##m1_t v0 = vsrl_vx_##_T(vnot_v_##_T(a.val, num), shift, num); \
-    vuint64m1_t v1 = vuint64m1_t(v0); \
-    return (v1[0] | v1[1]) == 0; \
-} \
-inline bool v_check_any(const v_##_Tpvec& a) \
-{ \
-    suffix##m1_t v0 = vsrl_vx_##_T(a.val, shift, num); \
-    vuint64m1_t v1 = vuint64m1_t(v0); \
-    return (v1[0] | v1[1]) != 0; \
-}
-
-OPENCV_HAL_IMPL_RISCVV_CHECK_ALLANY(uint8x16, vuint8,  u8m1, 7, 16)
-OPENCV_HAL_IMPL_RISCVV_CHECK_ALLANY(uint16x8, vuint16, u16m1, 15, 8)
-OPENCV_HAL_IMPL_RISCVV_CHECK_ALLANY(uint32x4, vuint32, u32m1, 31, 4)
-OPENCV_HAL_IMPL_RISCVV_CHECK_ALLANY(uint64x2, vuint64, u64m1, 63, 2)
-
-inline bool v_check_all(const v_int8x16& a)
-{ return v_check_all(v_reinterpret_as_u8(a)); }
-inline bool v_check_all(const v_int16x8& a)
-{ return v_check_all(v_reinterpret_as_u16(a)); }
-inline bool v_check_all(const v_int32x4& a)
-{ return v_check_all(v_reinterpret_as_u32(a)); }
-inline bool v_check_all(const v_float32x4& a)
-{ return v_check_all(v_reinterpret_as_u32(a)); }
-inline bool v_check_all(const v_int64x2& a)
-{ return v_check_all(v_reinterpret_as_u64(a)); }
-inline bool v_check_all(const v_float64x2& a)
-{ return v_check_all(v_reinterpret_as_u64(a)); }
-
-inline bool v_check_any(const v_int8x16& a)
-{ return v_check_any(v_reinterpret_as_u8(a)); }
-inline bool v_check_any(const v_int16x8& a)
-{ return v_check_any(v_reinterpret_as_u16(a)); }
-inline bool v_check_any(const v_int32x4& a)
-{ return v_check_any(v_reinterpret_as_u32(a)); }
-inline bool v_check_any(const v_float32x4& a)
-{ return v_check_any(v_reinterpret_as_u32(a)); }
-inline bool v_check_any(const v_int64x2& a)
-{ return v_check_any(v_reinterpret_as_u64(a)); }
-inline bool v_check_any(const v_float64x2& a)
-{ return v_check_any(v_reinterpret_as_u64(a)); }
-
-#define OPENCV_HAL_IMPL_RISCVV_SELECT(_Tpvec, suffix, _Tpvec2, num) \
-inline _Tpvec v_select(const _Tpvec& mask, const _Tpvec& a, const _Tpvec& b) \
-{ \
-    return _Tpvec(vmerge_vvm_##suffix(_Tpvec2(mask.val), b.val, a.val, num)); \
-}
-
-OPENCV_HAL_IMPL_RISCVV_SELECT(v_int8x16,  i8m1, vbool8_t, 16)
-OPENCV_HAL_IMPL_RISCVV_SELECT(v_int16x8,  i16m1, vbool16_t, 8)
-OPENCV_HAL_IMPL_RISCVV_SELECT(v_int32x4,  i32m1, vbool32_t, 4)
-OPENCV_HAL_IMPL_RISCVV_SELECT(v_uint8x16, u8m1, vbool8_t, 16)
-OPENCV_HAL_IMPL_RISCVV_SELECT(v_uint16x8, u16m1, vbool16_t, 8)
-OPENCV_HAL_IMPL_RISCVV_SELECT(v_uint32x4, u32m1, vbool32_t, 4)
-inline v_float32x4 v_select(const v_float32x4& mask, const v_float32x4& a, const v_float32x4& b)
-{
-    return v_float32x4((vfloat32m1_t)vmerge_vvm_u32m1((vbool32_t)mask.val, (vuint32m1_t)b.val, (vuint32m1_t)a.val, 4));
-}
-inline v_float64x2 v_select(const v_float64x2& mask, const v_float64x2& a, const v_float64x2& b)
-{
-    return v_float64x2((vfloat64m1_t)vmerge_vvm_u64m1((vbool64_t)mask.val, (vuint64m1_t)b.val, (vuint64m1_t)a.val, 2));
-}
-
-#define OPENCV_HAL_IMPL_RISCVV_EXPAND(add, _Tpvec, _Tpwvec, _Tp, _Tp1, num1, _Tp2, num2, _T1, _T2) \
-inline void v_expand(const _Tpvec& a, v_##_Tpwvec& b0, v_##_Tpwvec& b1) \
-{ \
-    _T1##_t b = vw##add##_vv_##_Tp2##m2(a.val, vmv_v_x_##_Tp1(0, num1), num1);    \
-    b0.val = vget_##_Tp2##m2_##_Tp2##m1(b, 0);  \
-    b1.val = vget_##_Tp2##m2_##_Tp2##m1(b, 1);  \
-} \
-inline v_##_Tpwvec v_expand_low(const _Tpvec& a) \
-{ \
-    _T1##_t b = vw##add##_vv_##_Tp2##m2(a.val, vmv_v_x_##_Tp1(0, num2), num2);    \
-    return v_##_Tpwvec(vget_##_Tp2##m2_##_Tp2##m1(b, 0)); \
-} \
-inline v_##_Tpwvec v_expand_high(const _Tpvec& a) \
-{ \
-    _T1##_t b = vw##add##_vv_##_Tp2##m2(a.val, vmv_v_x_##_Tp1(0, num1), num1);    \
-    return v_##_Tpwvec(vget_##_Tp2##m2_##_Tp2##m1(b, 1)); \
-} \
-inline v_##_Tpwvec v_load_expand(const _Tp* ptr) \
-{ \
-    _T2##_t val = vle##_v_##_Tp1(ptr, num2);    \
-    _T1##_t b = vw##add##_vv_##_Tp2##m2(val, vmv_v_x_##_Tp1(0, num2), num2);    \
-    return v_##_Tpwvec(vget_##_Tp2##m2_##_Tp2##m1(b, 0)); \
-}
-
-OPENCV_HAL_IMPL_RISCVV_EXPAND(addu, v_uint8x16, uint16x8, uchar, u8m1, 16, u16, 8, vuint16m2, vuint8m1)
-OPENCV_HAL_IMPL_RISCVV_EXPAND(addu, v_uint16x8, uint32x4, ushort,  u16m1, 8, u32, 4, vuint32m2, vuint16m1)
-OPENCV_HAL_IMPL_RISCVV_EXPAND(addu, v_uint32x4, uint64x2, uint,  u32m1, 4, u64, 2, vuint64m2, vuint32m1)
-OPENCV_HAL_IMPL_RISCVV_EXPAND(add, v_int8x16, int16x8, schar,  i8m1, 16, i16, 8, vint16m2, vint8m1)
-OPENCV_HAL_IMPL_RISCVV_EXPAND(add, v_int16x8, int32x4, short,  i16m1, 8, i32, 4, vint32m2, vint16m1)
-OPENCV_HAL_IMPL_RISCVV_EXPAND(add, v_int32x4, int64x2, int,  i32m1, 4, i64, 2, vint64m2, vint32m1)
-
-inline v_uint32x4 v_load_expand_q(const uchar* ptr)
-{
-    vuint16m2_t b = vundefined_u16m2();
-    vuint32m2_t c = vundefined_u32m2();
-    vuint8m1_t val = vle_v_u8m1(ptr, 4);    \
-    b = vwaddu_vv_u16m2(val, vmv_v_x_u8m1(0, 4), 4);    \
-    c = vwaddu_vv_u32m2(vget_u16m2_u16m1(b, 0), vmv_v_x_u16m1(0, 4), 4);    \
-    return v_uint32x4(vget_u32m2_u32m1(c, 0));
-}
-
-inline v_int32x4 v_load_expand_q(const schar* ptr)
-{
-    vint16m2_t b = vundefined_i16m2();
-    vint32m2_t c = vundefined_i32m2();
-    vint8m1_t val = vle_v_i8m1(ptr, 4);    \
-    b = vwadd_vv_i16m2(val, vmv_v_x_i8m1(0, 4), 4);    \
-    c = vwadd_vv_i32m2(vget_i16m2_i16m1(b, 0), vmv_v_x_i16m1(0, 4), 4);    \
-    return v_int32x4(vget_i32m2_i32m1(c, 0));
-}
-#define VITL_16 (vuint64m2_t){0x1303120211011000, 0x1707160615051404, 0x1B0B1A0A19091808, 0x1F0F1E0E1D0D1C0C}
-#define VITL_8 (vuint64m2_t){0x0009000100080000, 0x000B0003000A0002, 0x000D0005000C0004, 0x000F0007000E0006}
-#define VITL_4 (vuint64m2_t){0x0000000400000000, 0x0000000500000001, 0x0000000600000002, 0x0000000700000003}
-#define VITL_2 (vuint64m2_t){0, 2, 1, 3}
-#define LOW_4  0x0000000100000000, 0x0000000500000004
-#define LOW_8  0x0003000200010000, 0x000B000A00090008
-#define LOW_16 0x0706050403020100, 0x1716151413121110
-#define HIGH_4  0x0000000300000002, 0x0000000700000006
-#define HIGH_8  0x0007000600050004, 0x000F000E000D000C
-#define HIGH_16 0x0F0E0D0C0B0A0908,  0x1F1E1D1C1B1A1918
-#define OPENCV_HAL_IMPL_RISCVV_UNPACKS(_Tpvec, _Tp, _T, _UTp, _UT, num, num2, len, numh) \
-inline void v_zip(const v_##_Tpvec& a0, const v_##_Tpvec& a1, v_##_Tpvec& b0, v_##_Tpvec& b1) \
-{ \
-    v##_Tp##m2_t tmp = vundefined_##_T##m2();\
-    tmp = vset_##_T##m2(tmp, 0, a0.val); \
-    tmp = vset_##_T##m2(tmp, 1, a1.val); \
-    vuint64m2_t mask = VITL_##num;    \
-    tmp = (v##_Tp##m2_t)vrgather_vv_##_T##m2((v##_Tp##m2_t)tmp, (v##_UTp##m2_t)mask, num2);    \
-    b0.val = vget_##_T##m2_##_T##m1(tmp, 0); \
-    b1.val = vget_##_T##m2_##_T##m1(tmp, 1); \
-} \
-inline v_##_Tpvec v_combine_low(const v_##_Tpvec& a, const v_##_Tpvec& b) \
-{ \
-    v##_Tp##m1_t b0 = vslideup_vx_##_T##m1_m(vmset_m_##len(num), a.val, b.val, numh, num);    \
-    return v_##_Tpvec(b0);\
-} \
-inline v_##_Tpvec v_combine_high(const v_##_Tpvec& a, const v_##_Tpvec& b) \
-{ \
-    v##_Tp##m1_t b0 = vslidedown_vx_##_T##m1(b.val, numh, num);    \
-    v##_Tp##m1_t a0 = vslidedown_vx_##_T##m1(a.val, numh, num);    \
-    v##_Tp##m1_t b1 = vslideup_vx_##_T##m1_m(vmset_m_##len(num), a0, b0, numh, num);    \
-    return v_##_Tpvec(b1);\
-} \
-inline void v_recombine(const v_##_Tpvec& a, const v_##_Tpvec& b, v_##_Tpvec& c, v_##_Tpvec& d) \
-{ \
-    c.val = vslideup_vx_##_T##m1_m(vmset_m_##len(num), a.val, b.val, numh, num);    \
-    v##_Tp##m1_t b0 = vslidedown_vx_##_T##m1(b.val, numh, num);    \
-    v##_Tp##m1_t a0 = vslidedown_vx_##_T##m1(a.val, numh, num);    \
-    d.val = vslideup_vx_##_T##m1_m(vmset_m_##len(num), a0, b0, numh, num);    \
-}
-
-OPENCV_HAL_IMPL_RISCVV_UNPACKS(uint8x16, uint8, u8, uint8, u8, 16, 32, b8, 8)
-OPENCV_HAL_IMPL_RISCVV_UNPACKS(int8x16, int8, i8, uint8, u8, 16, 32, b8, 8)
-OPENCV_HAL_IMPL_RISCVV_UNPACKS(uint16x8, uint16, u16, uint16, u16, 8, 16, b16, 4)
-OPENCV_HAL_IMPL_RISCVV_UNPACKS(int16x8, int16, i16, uint16, u16, 8, 16, b16, 4)
-OPENCV_HAL_IMPL_RISCVV_UNPACKS(uint32x4, uint32, u32, uint32, u32, 4, 8, b32, 2)
-OPENCV_HAL_IMPL_RISCVV_UNPACKS(int32x4, int32, i32, uint32, u32, 4, 8, b32, 2)
-OPENCV_HAL_IMPL_RISCVV_UNPACKS(float32x4, float32, f32, uint32, u32, 4, 8, b32, 2)
-OPENCV_HAL_IMPL_RISCVV_UNPACKS(float64x2, float64, f64, uint64, u64, 2, 4, b64, 1)
-
-inline v_uint8x16 v_reverse(const v_uint8x16 &a)
-{
-    vuint64m1_t mask = (vuint64m1_t){0x08090A0B0C0D0E0F, 0x0001020304050607};
-    return v_uint8x16(vrgather_vv_u8m1(a.val, (vuint8m1_t)mask, 16));
-}
-inline v_int8x16 v_reverse(const v_int8x16 &a)
-{
-    vint64m1_t mask = (vint64m1_t){0x08090A0B0C0D0E0F, 0x0001020304050607};
-    return v_int8x16(vrgather_vv_i8m1(a.val, (vuint8m1_t)mask, 16));
-}
-
-inline v_uint16x8 v_reverse(const v_uint16x8 &a)
-{
-    vuint64m1_t mask = (vuint64m1_t){0x0004000500060007, 0x000000100020003};
-    return v_uint16x8(vrgather_vv_u16m1(a.val, (vuint16m1_t)mask, 8));
-}
-
-inline v_int16x8 v_reverse(const v_int16x8 &a)
-{
-    vint64m1_t mask = (vint64m1_t){0x0004000500060007, 0x000000100020003};
-    return v_int16x8(vrgather_vv_i16m1(a.val, (vuint16m1_t)mask, 8));
-}
-inline v_uint32x4 v_reverse(const v_uint32x4 &a)
-{
-    return v_uint32x4(vrgather_vv_u32m1(a.val, (vuint32m1_t){3, 2, 1, 0}, 4));
-}
-
-inline v_int32x4 v_reverse(const v_int32x4 &a)
-{
-    return v_int32x4(vrgather_vv_i32m1(a.val, (vuint32m1_t){3, 2, 1, 0}, 4));
-}
-
-inline v_float32x4 v_reverse(const v_float32x4 &a)
-{ return v_reinterpret_as_f32(v_reverse(v_reinterpret_as_u32(a))); }
-
-inline v_uint64x2 v_reverse(const v_uint64x2 &a)
-{
-    return v_uint64x2(a.val[1], a.val[0]);
-}
-
-inline v_int64x2 v_reverse(const v_int64x2 &a)
-{
-    return v_int64x2(a.val[1], a.val[0]);
-}
-
-inline v_float64x2 v_reverse(const v_float64x2 &a)
-{
-    return v_float64x2(a.val[1], a.val[0]);
-}
-
-#define OPENCV_HAL_IMPL_RISCVV_EXTRACT(_Tpvec, suffix, size) \
-template <int n> \
-inline _Tpvec v_extract(const _Tpvec& a, const _Tpvec& b) \
-{ return v_rotate_right<n>(a, b);}
-OPENCV_HAL_IMPL_RISCVV_EXTRACT(v_uint8x16, u8, 0)
-OPENCV_HAL_IMPL_RISCVV_EXTRACT(v_int8x16, s8, 0)
-OPENCV_HAL_IMPL_RISCVV_EXTRACT(v_uint16x8, u16, 1)
-OPENCV_HAL_IMPL_RISCVV_EXTRACT(v_int16x8, s16, 1)
-OPENCV_HAL_IMPL_RISCVV_EXTRACT(v_uint32x4, u32, 2)
-OPENCV_HAL_IMPL_RISCVV_EXTRACT(v_int32x4, s32, 2)
-OPENCV_HAL_IMPL_RISCVV_EXTRACT(v_uint64x2, u64, 3)
-OPENCV_HAL_IMPL_RISCVV_EXTRACT(v_int64x2, s64, 3)
-OPENCV_HAL_IMPL_RISCVV_EXTRACT(v_float32x4, f32, 2)
-OPENCV_HAL_IMPL_RISCVV_EXTRACT(v_float64x2, f64, 3)
-
-
-#define OPENCV_HAL_IMPL_RISCVV_EXTRACT_N(_Tpvec, _Tp, suffix) \
-template<int i> inline _Tp v_extract_n(_Tpvec v) { return v.val[i]; }
-
-OPENCV_HAL_IMPL_RISCVV_EXTRACT_N(v_uint8x16, uchar, u8)
-OPENCV_HAL_IMPL_RISCVV_EXTRACT_N(v_int8x16, schar, s8)
-OPENCV_HAL_IMPL_RISCVV_EXTRACT_N(v_uint16x8, ushort, u16)
-OPENCV_HAL_IMPL_RISCVV_EXTRACT_N(v_int16x8, short, s16)
-OPENCV_HAL_IMPL_RISCVV_EXTRACT_N(v_uint32x4, uint, u32)
-OPENCV_HAL_IMPL_RISCVV_EXTRACT_N(v_int32x4, int, s32)
-OPENCV_HAL_IMPL_RISCVV_EXTRACT_N(v_uint64x2, uint64, u64)
-OPENCV_HAL_IMPL_RISCVV_EXTRACT_N(v_int64x2, int64, s64)
-OPENCV_HAL_IMPL_RISCVV_EXTRACT_N(v_float32x4, float, f32)
-OPENCV_HAL_IMPL_RISCVV_EXTRACT_N(v_float64x2, double, f64)
-
-#define OPENCV_HAL_IMPL_RISCVV_BROADCAST(_Tpvec, _Tp, num) \
-template<int i> inline _Tpvec v_broadcast_element(_Tpvec v) { return _Tpvec(vrgather_vx_##_Tp##m1(v.val, i, num)); }
-
-OPENCV_HAL_IMPL_RISCVV_BROADCAST(v_uint8x16, u8, 16)
-OPENCV_HAL_IMPL_RISCVV_BROADCAST(v_int8x16, i8, 16)
-OPENCV_HAL_IMPL_RISCVV_BROADCAST(v_uint16x8, u16, 8)
-OPENCV_HAL_IMPL_RISCVV_BROADCAST(v_int16x8, i16, 8)
-OPENCV_HAL_IMPL_RISCVV_BROADCAST(v_uint32x4, u32, 4)
-OPENCV_HAL_IMPL_RISCVV_BROADCAST(v_int32x4, i32, 4)
-OPENCV_HAL_IMPL_RISCVV_BROADCAST(v_uint64x2, u64, 2)
-OPENCV_HAL_IMPL_RISCVV_BROADCAST(v_int64x2, i64, 2)
-OPENCV_HAL_IMPL_RISCVV_BROADCAST(v_float32x4, f32, 4)
-inline v_int32x4 v_round(const v_float32x4& a)
-{
-    __builtin_riscv_fsrm(0);
-    vint32m1_t nan = vand_vx_i32m1((vint32m1_t)a.val, 0x7f800000, 4);
-    vbool32_t mask = vmsne_vx_i32m1_b32(nan, 0x7f800000, 4);
-    vint32m1_t val = vfcvt_x_f_v_i32m1_m(mask, vmv_v_x_i32m1(0, 4), a.val, 4);
-    __builtin_riscv_fsrm(0);
-    return v_int32x4(val);
-}
-inline v_int32x4 v_floor(const v_float32x4& a)
-{
-    __builtin_riscv_fsrm(2);
-    vint32m1_t nan = vand_vx_i32m1((vint32m1_t)a.val, 0x7f800000, 4);
-    vbool32_t mask = vmsne_vx_i32m1_b32(nan, 0x7f800000, 4);
-    vint32m1_t val = vfcvt_x_f_v_i32m1_m(mask, vmv_v_x_i32m1(0, 4), a.val, 4);
-    __builtin_riscv_fsrm(0);
-    return v_int32x4(val);
-}
-
-inline v_int32x4 v_ceil(const v_float32x4& a)
-{
-    __builtin_riscv_fsrm(3);
-    vint32m1_t nan = vand_vx_i32m1((vint32m1_t)a.val, 0x7f800000, 4);
-    vbool32_t mask = vmsne_vx_i32m1_b32(nan, 0x7f800000, 4);
-    vint32m1_t val = vfcvt_x_f_v_i32m1_m(mask, vmv_v_x_i32m1(0, 4), a.val, 4);
-    __builtin_riscv_fsrm(0);
-    return v_int32x4(val);
-}
-
-inline v_int32x4 v_trunc(const v_float32x4& a)
-{
-    __builtin_riscv_fsrm(1);
-    vint32m1_t nan = vand_vx_i32m1((vint32m1_t)a.val, 0x7f800000, 4);
-    vbool32_t mask = vmsne_vx_i32m1_b32(nan, 0x7f800000, 4);
-    vint32m1_t val = vfcvt_x_f_v_i32m1_m(mask, vmv_v_x_i32m1(0, 4), a.val, 4);
-    __builtin_riscv_fsrm(0);
-    return v_int32x4(val);
-}
-
-inline v_int32x4 v_round(const v_float64x2& a)
-{
-    __builtin_riscv_fsrm(0);
-    vfloat64m2_t _val = vundefined_f64m2();
-    _val = vset_f64m2(_val, 0, a.val);
-    //_val = vset_f64m2(_val, 1, a.val);
-    _val = vset_f64m2(_val, 1, vfmv_v_f_f64m1(0, 2));
-    vint32m1_t val = vfncvt_x_f_v_i32m1(_val, 4);
-    __builtin_riscv_fsrm(0);
-    return v_int32x4(val);
-}
-inline v_int32x4 v_round(const v_float64x2& a, const v_float64x2& b)
-{
-    __builtin_riscv_fsrm(0);
-    vfloat64m2_t _val = vundefined_f64m2();
-    _val = vset_f64m2(_val, 0, a.val);
-    _val = vset_f64m2(_val, 1, b.val);
-    vint32m1_t val = vfncvt_x_f_v_i32m1(_val, 4);
-    __builtin_riscv_fsrm(0);
-    return v_int32x4(val);
-}
-inline v_int32x4 v_floor(const v_float64x2& a)
-{
-    __builtin_riscv_fsrm(2);
-    vfloat64m2_t _val = vundefined_f64m2();
-    _val = vset_f64m2(_val, 0, a.val);
-    vfloat32m1_t aval = vfncvt_f_f_v_f32m1(_val, 2);
-
-    vint32m1_t nan = vand_vx_i32m1((vint32m1_t)aval, 0x7f800000, 4);
-    vbool32_t mask = vmsne_vx_i32m1_b32(nan, 0x7f800000, 4);
-    vint32m1_t val = vfcvt_x_f_v_i32m1_m(mask, vmv_v_x_i32m1(0, 4), aval, 4);
-    __builtin_riscv_fsrm(0);
-    return v_int32x4(val);
-}
-
-inline v_int32x4 v_ceil(const v_float64x2& a)
-{
-    __builtin_riscv_fsrm(3);
-    vfloat64m2_t _val = vundefined_f64m2();
-    _val = vset_f64m2(_val, 0, a.val);
-    vfloat32m1_t aval = vfncvt_f_f_v_f32m1(_val, 2);
-
-    vint32m1_t nan = vand_vx_i32m1((vint32m1_t)aval, 0x7f800000, 4);
-    vbool32_t mask = vmsne_vx_i32m1_b32(nan, 0x7f800000, 4);
-    vint32m1_t val = vfcvt_x_f_v_i32m1_m(mask, vmv_v_x_i32m1(0, 4), aval, 4);
-    __builtin_riscv_fsrm(0);
-    return v_int32x4(val);
-}
-
-inline v_int32x4 v_trunc(const v_float64x2& a)
-{
-    __builtin_riscv_fsrm(1);
-    vfloat64m2_t _val = vundefined_f64m2();
-    _val = vset_f64m2(_val, 0, a.val);
-    vfloat32m1_t aval = vfncvt_f_f_v_f32m1(_val, 2);
-
-    vint32m1_t nan = vand_vx_i32m1((vint32m1_t)aval, 0x7f800000, 4);
-    vbool32_t mask = vmsne_vx_i32m1_b32(nan, 0x7f800000, 4);
-    vint32m1_t val = vfcvt_x_f_v_i32m1_m(mask, vmv_v_x_i32m1(0, 4), aval, 4);
-    __builtin_riscv_fsrm(0);
-    return v_int32x4(val);
-}
-
-#define OPENCV_HAL_IMPL_RISCVV_LOAD_DEINTERLEAVED(intrin, _Tpvec, num, _Tp, _T)    \
-inline void v_load_deinterleave(const _Tp* ptr, v_##_Tpvec##x##num& a, v_##_Tpvec##x##num& b) \
-{ \
-    v##_Tpvec##m1x2_t ret = intrin##2e_v_##_T##m1x2(ptr, num);\
-    a.val = vget_##_T##m1x2_##_T##m1(ret, 0);  \
-    b.val = vget_##_T##m1x2_##_T##m1(ret, 1);  \
-} \
-inline void v_load_deinterleave(const _Tp* ptr, v_##_Tpvec##x##num& a, v_##_Tpvec##x##num& b, v_##_Tpvec##x##num& c) \
-{ \
-    v##_Tpvec##m1x3_t ret = intrin##3e_v_##_T##m1x3(ptr, num);\
-    a.val = vget_##_T##m1x3_##_T##m1(ret, 0);  \
-    b.val = vget_##_T##m1x3_##_T##m1(ret, 1);  \
-    c.val = vget_##_T##m1x3_##_T##m1(ret, 2);  \
-}\
-inline void v_load_deinterleave(const _Tp* ptr, v_##_Tpvec##x##num& a, v_##_Tpvec##x##num& b, \
-                                v_##_Tpvec##x##num& c, v_##_Tpvec##x##num& d) \
-{ \
-    v##_Tpvec##m1x4_t ret = intrin##4e_v_##_T##m1x4(ptr, num);\
-    a.val = vget_##_T##m1x4_##_T##m1(ret, 0);  \
-    b.val = vget_##_T##m1x4_##_T##m1(ret, 1);  \
-    c.val = vget_##_T##m1x4_##_T##m1(ret, 2);  \
-    d.val = vget_##_T##m1x4_##_T##m1(ret, 3);  \
-} \
-
-#define OPENCV_HAL_IMPL_RISCVV_STORE_INTERLEAVED(intrin, _Tpvec, num, _Tp, _T)    \
-inline void v_store_interleave( _Tp* ptr, const v_##_Tpvec##x##num& a, const v_##_Tpvec##x##num& b, \
-                                hal::StoreMode /*mode*/=hal::STORE_UNALIGNED) \
-{ \
-    v##_Tpvec##m1x2_t ret = vundefined_##_T##m1x2();      \
-    ret = vset_##_T##m1x2(ret, 0, a.val);  \
-    ret = vset_##_T##m1x2(ret, 1, b.val);  \
-    intrin##2e_v_##_T##m1x2(ptr, ret, num); \
-} \
-inline void v_store_interleave( _Tp* ptr, const v_##_Tpvec##x##num& a, const v_##_Tpvec##x##num& b, \
-                                const v_##_Tpvec##x##num& c, hal::StoreMode /*mode*/=hal::STORE_UNALIGNED) \
-{ \
-    v##_Tpvec##m1x3_t ret = vundefined_##_T##m1x3();       \
-    ret = vset_##_T##m1x3(ret, 0, a.val);  \
-    ret = vset_##_T##m1x3(ret, 1, b.val);  \
-    ret = vset_##_T##m1x3(ret, 2, c.val);  \
-    intrin##3e_v_##_T##m1x3(ptr, ret, num); \
-} \
-inline void v_store_interleave( _Tp* ptr, const v_##_Tpvec##x##num& a, const v_##_Tpvec##x##num& b, \
-                                const v_##_Tpvec##x##num& c, const v_##_Tpvec##x##num& d, \
-                                hal::StoreMode /*mode*/=hal::STORE_UNALIGNED ) \
-{ \
-    v##_Tpvec##m1x4_t ret = vundefined_##_T##m1x4();             \
-    ret = vset_##_T##m1x4(ret, 0, a.val);  \
-    ret = vset_##_T##m1x4(ret, 1, b.val);  \
-    ret = vset_##_T##m1x4(ret, 2, c.val);  \
-    ret = vset_##_T##m1x4(ret, 3, d.val);  \
-    intrin##4e_v_##_T##m1x4(ptr, ret, num); \
-}
-
-#define OPENCV_HAL_IMPL_RISCVV_INTERLEAVED(_Tpvec, _Tp, num, ld, st, _T) \
-OPENCV_HAL_IMPL_RISCVV_LOAD_DEINTERLEAVED(ld, _Tpvec, num, _Tp, _T)    \
-OPENCV_HAL_IMPL_RISCVV_STORE_INTERLEAVED(st, _Tpvec, num, _Tp, _T)
-
-//OPENCV_HAL_IMPL_RISCVV_INTERLEAVED(uint8, uchar, )
-OPENCV_HAL_IMPL_RISCVV_INTERLEAVED(int8, schar, 16, vlseg, vsseg, i8)
-OPENCV_HAL_IMPL_RISCVV_INTERLEAVED(int16, short, 8, vlseg, vsseg, i16)
-OPENCV_HAL_IMPL_RISCVV_INTERLEAVED(int32, int, 4, vlseg, vsseg, i32)
-
-OPENCV_HAL_IMPL_RISCVV_INTERLEAVED(uint8, unsigned char, 16, vlseg, vsseg, u8)
-OPENCV_HAL_IMPL_RISCVV_INTERLEAVED(uint16, unsigned short, 8, vlseg, vsseg, u16)
-OPENCV_HAL_IMPL_RISCVV_INTERLEAVED(uint32, unsigned int, 4, vlseg, vsseg, u32)
-
-#define OPENCV_HAL_IMPL_RISCVV_INTERLEAVED_(_Tpvec, _Tp, num, _T) \
-inline void v_load_deinterleave(const _Tp* ptr, v_##_Tpvec##x##num& a, v_##_Tpvec##x##num& b) \
-{ \
-    v##_Tpvec##m1x2_t ret = vlseg2e_v_##_T##m1x2(ptr, num); \
-    a.val = vget_##_T##m1x2_##_T##m1(ret, 0);  \
-    b.val = vget_##_T##m1x2_##_T##m1(ret, 1);  \
-} \
-inline void v_load_deinterleave(const _Tp* ptr, v_##_Tpvec##x##num& a, v_##_Tpvec##x##num& b, v_##_Tpvec##x##num& c) \
-{ \
-    v##_Tpvec##m1x3_t ret = vlseg3e_v_##_T##m1x3(ptr, num);    \
-    a.val = vget_##_T##m1x3_##_T##m1(ret, 0);  \
-    b.val = vget_##_T##m1x3_##_T##m1(ret, 1);  \
-    c.val = vget_##_T##m1x3_##_T##m1(ret, 2);  \
-}\
-inline void v_load_deinterleave(const _Tp* ptr, v_##_Tpvec##x##num& a, v_##_Tpvec##x##num& b, \
-                                v_##_Tpvec##x##num& c, v_##_Tpvec##x##num& d) \
-{ \
-    v##_Tpvec##m1x4_t ret = vlseg4e_v_##_T##m1x4(ptr, num);    \
-    a.val = vget_##_T##m1x4_##_T##m1(ret, 0);  \
-    b.val = vget_##_T##m1x4_##_T##m1(ret, 1);  \
-    c.val = vget_##_T##m1x4_##_T##m1(ret, 2);  \
-    d.val = vget_##_T##m1x4_##_T##m1(ret, 3);  \
-} \
-inline void v_store_interleave( _Tp* ptr, const v_##_Tpvec##x##num& a, const v_##_Tpvec##x##num& b, \
-                                hal::StoreMode /*mode*/=hal::STORE_UNALIGNED) \
-{ \
-    v##_Tpvec##m1x2_t ret = vundefined_##_T##m1x2();    \
-    ret = vset_##_T##m1x2(ret, 0, a.val);  \
-    ret = vset_##_T##m1x2(ret, 1, b.val);  \
-    vsseg2e_v_##_T##m1x2(ptr, ret, num);    \
-} \
-inline void v_store_interleave( _Tp* ptr, const v_##_Tpvec##x##num& a, const v_##_Tpvec##x##num& b, \
-                                const v_##_Tpvec##x##num& c, hal::StoreMode /*mode*/=hal::STORE_UNALIGNED) \
-{ \
-    v##_Tpvec##m1x3_t ret = vundefined_##_T##m1x3();    \
-    ret = vset_##_T##m1x3(ret, 0, a.val);  \
-    ret = vset_##_T##m1x3(ret, 1, b.val);  \
-    ret = vset_##_T##m1x3(ret, 2, c.val);  \
-    vsseg3e_v_##_T##m1x3(ptr, ret, num);    \
-} \
-inline void v_store_interleave( _Tp* ptr, const v_##_Tpvec##x##num& a, const v_##_Tpvec##x##num& b, \
-                                const v_##_Tpvec##x##num& c, const v_##_Tpvec##x##num& d, \
-                                hal::StoreMode /*mode*/=hal::STORE_UNALIGNED ) \
-{ \
-    v##_Tpvec##m1x4_t ret = vundefined_##_T##m1x4();    \
-    ret = vset_##_T##m1x4(ret, 0, a.val);  \
-    ret = vset_##_T##m1x4(ret, 1, b.val);  \
-    ret = vset_##_T##m1x4(ret, 2, c.val);  \
-    ret = vset_##_T##m1x4(ret, 3, d.val);  \
-    vsseg4e_v_##_T##m1x4(ptr, ret, num);    \
-}
-OPENCV_HAL_IMPL_RISCVV_INTERLEAVED_(float32, float, 4, f32)
-OPENCV_HAL_IMPL_RISCVV_INTERLEAVED_(float64, double, 2, f64)
-
-OPENCV_HAL_IMPL_RISCVV_INTERLEAVED_(uint64, unsigned long, 2, u64)
-OPENCV_HAL_IMPL_RISCVV_INTERLEAVED_(int64, long, 2, i64)
-
-inline v_float32x4 v_cvt_f32(const v_int32x4& a)
-{
-    return v_float32x4(vfcvt_f_x_v_f32m1(a.val, 4));
-}
-
-#if CV_SIMD128_64F
-inline v_float32x4 v_cvt_f32(const v_float64x2& a)
-{
-    vfloat64m2_t _val = vundefined_f64m2();
-    _val = vset_f64m2(_val, 0, a.val);
-    vfloat32m1_t aval = vfncvt_f_f_v_f32m1(_val, 2);
-    return v_float32x4(aval);
-}
-
-inline v_float32x4 v_cvt_f32(const v_float64x2& a, const v_float64x2& b)
-{
-    vfloat64m2_t _val = vundefined_f64m2();
-    _val = vset_f64m2(_val, 0, a.val);
-    _val = vset_f64m2(_val, 1, b.val);
-    vfloat32m1_t aval = vfncvt_f_f_v_f32m1(_val, 4);
-    return v_float32x4(aval);
-}
-
-inline v_float64x2 v_cvt_f64(const v_int32x4& a)
-{
-    vfloat32m1_t val = vfcvt_f_x_v_f32m1(a.val, 4);
-    vfloat64m2_t _val = vfwcvt_f_f_v_f64m2(val, 4);
-    return v_float64x2(vget_f64m2_f64m1(_val, 0));
-}
-
-inline v_float64x2 v_cvt_f64_high(const v_int32x4& a)
-{
-    vfloat32m1_t val = vfcvt_f_x_v_f32m1(a.val, 4);
-    vfloat64m2_t _val = vfwcvt_f_f_v_f64m2(val, 4);
-    return v_float64x2(vget_f64m2_f64m1(_val, 1));
-}
-
-inline v_float64x2 v_cvt_f64(const v_float32x4& a)
-{
-    vfloat64m2_t _val  = vfwcvt_f_f_v_f64m2(a.val, 4);
-    return v_float64x2(vget_f64m2_f64m1(_val, 0));
-}
-
-inline v_float64x2 v_cvt_f64_high(const v_float32x4& a)
-{
-    vfloat64m2_t _val  = vfwcvt_f_f_v_f64m2(a.val, 4);
-    return v_float64x2(vget_f64m2_f64m1(_val, 1));
-}
-
-inline v_float64x2 v_cvt_f64(const v_int64x2& a)
-{
-    return v_float64x2(vfcvt_f_x_v_f64m1(a.val, 2));
-}
-
-#endif
-inline v_int8x16 v_interleave_pairs(const v_int8x16& vec)
-{
-    vuint64m1_t m0 = {0x0705060403010200, 0x0F0D0E0C0B090A08};
-    return v_int8x16(vrgather_vv_i8m1(vec.val, (vuint8m1_t)m0, 16));
-}
-inline v_uint8x16 v_interleave_pairs(const v_uint8x16& vec)
-{
-    return v_reinterpret_as_u8(v_interleave_pairs(v_reinterpret_as_s8(vec)));
-}
-
-inline v_int8x16 v_interleave_quads(const v_int8x16& vec)
-{
-    vuint64m1_t m0 = {0x0703060205010400, 0x0F0B0E0A0D090C08};
-    return v_int8x16(vrgather_vv_i8m1(vec.val, (vuint8m1_t)m0, 16));
-}
-inline v_uint8x16 v_interleave_quads(const v_uint8x16& vec)
-{
-    return v_reinterpret_as_u8(v_interleave_quads(v_reinterpret_as_s8(vec)));
-}
-
-inline v_int16x8 v_interleave_pairs(const v_int16x8& vec)
-{
-    vuint64m1_t m0 = {0x0706030205040100, 0x0F0E0B0A0D0C0908};
-    return v_int16x8((vint16m1_t)vrgather_vv_u8m1((vuint8m1_t)vec.val, (vuint8m1_t)m0, 16));
-}
-inline v_uint16x8 v_interleave_pairs(const v_uint16x8& vec) { return v_reinterpret_as_u16(v_interleave_pairs(v_reinterpret_as_s16(vec))); }
-inline v_int16x8 v_interleave_quads(const v_int16x8& vec)
-{
-    vuint64m1_t m0 = {0x0B0A030209080100, 0x0F0E07060D0C0504};
-    return v_int16x8((vint16m1_t)vrgather_vv_u8m1((vuint8m1_t)(vec.val), (vuint8m1_t)m0, 16));
-}
-inline v_uint16x8 v_interleave_quads(const v_uint16x8& vec) { return v_reinterpret_as_u16(v_interleave_quads(v_reinterpret_as_s16(vec))); }
-
-inline v_int32x4 v_interleave_pairs(const v_int32x4& vec)
-{
-    vuint64m1_t m0 = {0x0B0A090803020100, 0x0F0E0D0C07060504};
-    return v_int32x4((vint32m1_t)vrgather_vv_u8m1((vuint8m1_t)(vec.val), (vuint8m1_t)m0, 16));
-}
-inline v_uint32x4 v_interleave_pairs(const v_uint32x4& vec) { return v_reinterpret_as_u32(v_interleave_pairs(v_reinterpret_as_s32(vec))); }
-inline v_float32x4 v_interleave_pairs(const v_float32x4& vec) { return v_reinterpret_as_f32(v_interleave_pairs(v_reinterpret_as_s32(vec))); }
-inline v_int8x16 v_pack_triplets(const v_int8x16& vec)
-{
-    vuint64m1_t m0 = {0x0908060504020100, 0xFFFFFFFF0E0D0C0A};
-    return v_int8x16((vint8m1_t)vrgather_vv_u8m1((vuint8m1_t)(vec.val), (vuint8m1_t)m0, 16));
-}
-inline v_uint8x16 v_pack_triplets(const v_uint8x16& vec) { return v_reinterpret_as_u8(v_pack_triplets(v_reinterpret_as_s8(vec))); }
-
-inline v_int16x8 v_pack_triplets(const v_int16x8& vec)
-{
-    vuint64m1_t m0 = {0x0908050403020100, 0xFFFFFFFF0D0C0B0A};
-    return v_int16x8((vint16m1_t)vrgather_vv_u8m1((vuint8m1_t)(vec.val), (vuint8m1_t)m0, 16));
-}
-inline v_uint16x8 v_pack_triplets(const v_uint16x8& vec) { return v_reinterpret_as_u16(v_pack_triplets(v_reinterpret_as_s16(vec))); }
-
-inline v_int32x4 v_pack_triplets(const v_int32x4& vec) { return vec; }
-inline v_uint32x4 v_pack_triplets(const v_uint32x4& vec) { return vec; }
-inline v_float32x4 v_pack_triplets(const v_float32x4& vec) { return vec; }
-
-#if CV_SIMD128_64F
-inline v_float64x2 v_dotprod_expand(const v_int32x4& a, const v_int32x4& b)
-{ return v_cvt_f64(v_dotprod(a, b)); }
-inline v_float64x2 v_dotprod_expand(const v_int32x4& a,   const v_int32x4& b,
-                                    const v_float64x2& c)
-{ return v_dotprod_expand(a, b) + c; }
-inline v_float64x2 v_dotprod_expand_fast(const v_int32x4& a, const v_int32x4& b)
-{
-    vint64m2_t v1 = vwmul_vv_i64m2(a.val, b.val, 4);
-    vfloat64m1_t res = vfcvt_f_x_v_f64m1(vadd_vv_i64m1(vget_i64m2_i64m1(v1, 0), vget_i64m2_i64m1(v1, 1), 2), 2);
-    return v_float64x2(res);
-}
-inline v_float64x2 v_dotprod_expand_fast(const v_int32x4& a, const v_int32x4& b, const v_float64x2& c)
-{ v_float64x2 res = v_dotprod_expand_fast(a, b);
-  return res + c; }
-#endif
-////// FP16 support ///////
-inline v_float32x4 v_load_expand(const float16_t* ptr)
-{
-    vfloat16m1_t v = vle_v_f16m1((__fp16*)ptr, 4);
-    vfloat32m2_t v32 = vfwcvt_f_f_v_f32m2(v, 4);
-    return v_float32x4(vget_f32m2_f32m1(v32, 0));
-}
-
-inline void v_pack_store(float16_t* ptr, const v_float32x4& v)
-{
-    vfloat32m2_t v32 = vundefined_f32m2();
-    v32 = vset_f32m2(v32, 0, v.val);
-    vfloat16m1_t hv = vfncvt_f_f_v_f16m1(v32, 4);
-    vse_v_f16m1((__fp16*)ptr, hv, 4);
-}
-
-
-inline void v_cleanup() {}
-
-CV_CPU_OPTIMIZATION_HAL_NAMESPACE_END
-
-//! @endcond
-
-}
-#endif
diff --git a/3rdParty/opencv2/core/matx.hpp b/3rdParty/opencv2/core/matx.hpp
deleted file mode 100644
index 5b3bef6938..0000000000
--- a/3rdParty/opencv2/core/matx.hpp
+++ /dev/null
@@ -1,1528 +0,0 @@
-/*M///////////////////////////////////////////////////////////////////////////////////////
-//
-//  IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
-//
-//  By downloading, copying, installing or using the software you agree to this license.
-//  If you do not agree to this license, do not download, install,
-//  copy or use the software.
-//
-//
-//                          License Agreement
-//                For Open Source Computer Vision Library
-//
-// Copyright (C) 2000-2008, Intel Corporation, all rights reserved.
-// Copyright (C) 2009, Willow Garage Inc., all rights reserved.
-// Copyright (C) 2013, OpenCV Foundation, all rights reserved.
-// Third party copyrights are property of their respective owners.
-//
-// Redistribution and use in source and binary forms, with or without modification,
-// are permitted provided that the following conditions are met:
-//
-//   * Redistribution's of source code must retain the above copyright notice,
-//     this list of conditions and the following disclaimer.
-//
-//   * Redistribution's in binary form must reproduce the above copyright notice,
-//     this list of conditions and the following disclaimer in the documentation
-//     and/or other materials provided with the distribution.
-//
-//   * The name of the copyright holders may not be used to endorse or promote products
-//     derived from this software without specific prior written permission.
-//
-// This software is provided by the copyright holders and contributors "as is" and
-// any express or implied warranties, including, but not limited to, the implied
-// warranties of merchantability and fitness for a particular purpose are disclaimed.
-// In no event shall the Intel Corporation or contributors be liable for any direct,
-// indirect, incidental, special, exemplary, or consequential damages
-// (including, but not limited to, procurement of substitute goods or services;
-// loss of use, data, or profits; or business interruption) however caused
-// and on any theory of liability, whether in contract, strict liability,
-// or tort (including negligence or otherwise) arising in any way out of
-// the use of this software, even if advised of the possibility of such damage.
-//
-//M*/
-
-#ifndef OPENCV_CORE_MATX_HPP
-#define OPENCV_CORE_MATX_HPP
-
-#ifndef __cplusplus
-#  error matx.hpp header must be compiled as C++
-#endif
-
-#include "opencv2/core/cvdef.h"
-#include "opencv2/core/base.hpp"
-#include "opencv2/core/traits.hpp"
-#include "opencv2/core/saturate.hpp"
-
-#include <initializer_list>
-
-namespace cv
-{
-
-//! @addtogroup core_basic
-//! @{
-
-////////////////////////////// Small Matrix ///////////////////////////
-
-//! @cond IGNORED
-// FIXIT Remove this (especially CV_EXPORTS modifier)
-struct CV_EXPORTS Matx_AddOp { Matx_AddOp() {} Matx_AddOp(const Matx_AddOp&) {} };
-struct CV_EXPORTS Matx_SubOp { Matx_SubOp() {} Matx_SubOp(const Matx_SubOp&) {} };
-struct CV_EXPORTS Matx_ScaleOp { Matx_ScaleOp() {} Matx_ScaleOp(const Matx_ScaleOp&) {} };
-struct CV_EXPORTS Matx_MulOp { Matx_MulOp() {} Matx_MulOp(const Matx_MulOp&) {} };
-struct CV_EXPORTS Matx_DivOp { Matx_DivOp() {} Matx_DivOp(const Matx_DivOp&) {} };
-struct CV_EXPORTS Matx_MatMulOp { Matx_MatMulOp() {} Matx_MatMulOp(const Matx_MatMulOp&) {} };
-struct CV_EXPORTS Matx_TOp { Matx_TOp() {} Matx_TOp(const Matx_TOp&) {} };
-//! @endcond
-
-/** @brief Template class for small matrices whose type and size are known at compilation time
-
-If you need a more flexible type, use Mat . The elements of the matrix M are accessible using the
-M(i,j) notation. Most of the common matrix operations (see also @ref MatrixExpressions ) are
-available. To do an operation on Matx that is not implemented, you can easily convert the matrix to
-Mat and backwards:
-@code{.cpp}
-    Matx33f m(1, 2, 3,
-              4, 5, 6,
-              7, 8, 9);
-    cout << sum(Mat(m*m.t())) << endl;
-@endcode
-Except of the plain constructor which takes a list of elements, Matx can be initialized from a C-array:
-@code{.cpp}
-    float values[] = { 1, 2, 3};
-    Matx31f m(values);
-@endcode
-In case if C++11 features are available, std::initializer_list can be also used to initialize Matx:
-@code{.cpp}
-    Matx31f m = { 1, 2, 3};
-@endcode
- */
-template<typename _Tp, int m, int n> class Matx
-{
-public:
-    enum {
-           rows     = m,
-           cols     = n,
-           channels = rows*cols,
-#ifdef OPENCV_TRAITS_ENABLE_DEPRECATED
-           depth    = traits::Type<_Tp>::value,
-           type     = CV_MAKETYPE(depth, channels),
-#endif
-           shortdim = (m < n ? m : n)
-         };
-
-    typedef _Tp                           value_type;
-    typedef Matx<_Tp, m, n>               mat_type;
-    typedef Matx<_Tp, shortdim, 1> diag_type;
-
-    //! default constructor
-    Matx();
-
-    explicit Matx(_Tp v0); //!< 1x1 matrix
-    Matx(_Tp v0, _Tp v1); //!< 1x2 or 2x1 matrix
-    Matx(_Tp v0, _Tp v1, _Tp v2); //!< 1x3 or 3x1 matrix
-    Matx(_Tp v0, _Tp v1, _Tp v2, _Tp v3); //!< 1x4, 2x2 or 4x1 matrix
-    Matx(_Tp v0, _Tp v1, _Tp v2, _Tp v3, _Tp v4); //!< 1x5 or 5x1 matrix
-    Matx(_Tp v0, _Tp v1, _Tp v2, _Tp v3, _Tp v4, _Tp v5); //!< 1x6, 2x3, 3x2 or 6x1 matrix
-    Matx(_Tp v0, _Tp v1, _Tp v2, _Tp v3, _Tp v4, _Tp v5, _Tp v6); //!< 1x7 or 7x1 matrix
-    Matx(_Tp v0, _Tp v1, _Tp v2, _Tp v3, _Tp v4, _Tp v5, _Tp v6, _Tp v7); //!< 1x8, 2x4, 4x2 or 8x1 matrix
-    Matx(_Tp v0, _Tp v1, _Tp v2, _Tp v3, _Tp v4, _Tp v5, _Tp v6, _Tp v7, _Tp v8); //!< 1x9, 3x3 or 9x1 matrix
-    Matx(_Tp v0, _Tp v1, _Tp v2, _Tp v3, _Tp v4, _Tp v5, _Tp v6, _Tp v7, _Tp v8, _Tp v9); //!< 1x10, 2x5 or 5x2 or 10x1 matrix
-    Matx(_Tp v0, _Tp v1, _Tp v2, _Tp v3,
-         _Tp v4, _Tp v5, _Tp v6, _Tp v7,
-         _Tp v8, _Tp v9, _Tp v10, _Tp v11); //!< 1x12, 2x6, 3x4, 4x3, 6x2 or 12x1 matrix
-    Matx(_Tp v0, _Tp v1, _Tp v2, _Tp v3,
-         _Tp v4, _Tp v5, _Tp v6, _Tp v7,
-         _Tp v8, _Tp v9, _Tp v10, _Tp v11,
-         _Tp v12, _Tp v13); //!< 1x14, 2x7, 7x2 or 14x1 matrix
-    Matx(_Tp v0, _Tp v1, _Tp v2, _Tp v3,
-         _Tp v4, _Tp v5, _Tp v6, _Tp v7,
-         _Tp v8, _Tp v9, _Tp v10, _Tp v11,
-         _Tp v12, _Tp v13, _Tp v14, _Tp v15); //!< 1x16, 4x4 or 16x1 matrix
-    explicit Matx(const _Tp* vals); //!< initialize from a plain array
-
-    Matx(std::initializer_list<_Tp>); //!< initialize from an initializer list
-
-    CV_NODISCARD_STD static Matx all(_Tp alpha);
-    CV_NODISCARD_STD static Matx zeros();
-    CV_NODISCARD_STD static Matx ones();
-    CV_NODISCARD_STD static Matx eye();
-    CV_NODISCARD_STD static Matx diag(const diag_type& d);
-    /** @brief Generates uniformly distributed random numbers
-    @param a Range boundary.
-    @param b The other range boundary (boundaries don't have to be ordered, the lower boundary is inclusive,
-    the upper one is exclusive).
-     */
-    CV_NODISCARD_STD static Matx randu(_Tp a, _Tp b);
-    /** @brief Generates normally distributed random numbers
-    @param a Mean value.
-    @param b Standard deviation.
-     */
-    CV_NODISCARD_STD static Matx randn(_Tp a, _Tp b);
-
-    //! dot product computed with the default precision
-    _Tp dot(const Matx<_Tp, m, n>& v) const;
-
-    //! dot product computed in double-precision arithmetics
-    double ddot(const Matx<_Tp, m, n>& v) const;
-
-    //! conversion to another data type
-    template<typename T2> operator Matx<T2, m, n>() const;
-
-    //! change the matrix shape
-    template<int m1, int n1> Matx<_Tp, m1, n1> reshape() const;
-
-    //! extract part of the matrix
-    template<int m1, int n1> Matx<_Tp, m1, n1> get_minor(int base_row, int base_col) const;
-
-    //! extract the matrix row
-    Matx<_Tp, 1, n> row(int i) const;
-
-    //! extract the matrix column
-    Matx<_Tp, m, 1> col(int i) const;
-
-    //! extract the matrix diagonal
-    diag_type diag() const;
-
-    //! transpose the matrix
-    Matx<_Tp, n, m> t() const;
-
-    //! invert the matrix
-    Matx<_Tp, n, m> inv(int method=DECOMP_LU, bool *p_is_ok = NULL) const;
-
-    //! solve linear system
-    template<int l> Matx<_Tp, n, l> solve(const Matx<_Tp, m, l>& rhs, int flags=DECOMP_LU) const;
-    Vec<_Tp, n> solve(const Vec<_Tp, m>& rhs, int method) const;
-
-    //! multiply two matrices element-wise
-    Matx<_Tp, m, n> mul(const Matx<_Tp, m, n>& a) const;
-
-    //! divide two matrices element-wise
-    Matx<_Tp, m, n> div(const Matx<_Tp, m, n>& a) const;
-
-    //! element access
-    const _Tp& operator ()(int row, int col) const;
-    _Tp& operator ()(int row, int col);
-
-    //! 1D element access
-    const _Tp& operator ()(int i) const;
-    _Tp& operator ()(int i);
-
-    Matx(const Matx<_Tp, m, n>& a, const Matx<_Tp, m, n>& b, Matx_AddOp);
-    Matx(const Matx<_Tp, m, n>& a, const Matx<_Tp, m, n>& b, Matx_SubOp);
-    template<typename _T2> Matx(const Matx<_Tp, m, n>& a, _T2 alpha, Matx_ScaleOp);
-    Matx(const Matx<_Tp, m, n>& a, const Matx<_Tp, m, n>& b, Matx_MulOp);
-    Matx(const Matx<_Tp, m, n>& a, const Matx<_Tp, m, n>& b, Matx_DivOp);
-    template<int l> Matx(const Matx<_Tp, m, l>& a, const Matx<_Tp, l, n>& b, Matx_MatMulOp);
-    Matx(const Matx<_Tp, n, m>& a, Matx_TOp);
-
-    _Tp val[m*n]; //< matrix elements
-};
-
-typedef Matx<float, 1, 2> Matx12f;
-typedef Matx<double, 1, 2> Matx12d;
-typedef Matx<float, 1, 3> Matx13f;
-typedef Matx<double, 1, 3> Matx13d;
-typedef Matx<float, 1, 4> Matx14f;
-typedef Matx<double, 1, 4> Matx14d;
-typedef Matx<float, 1, 6> Matx16f;
-typedef Matx<double, 1, 6> Matx16d;
-
-typedef Matx<float, 2, 1> Matx21f;
-typedef Matx<double, 2, 1> Matx21d;
-typedef Matx<float, 3, 1> Matx31f;
-typedef Matx<double, 3, 1> Matx31d;
-typedef Matx<float, 4, 1> Matx41f;
-typedef Matx<double, 4, 1> Matx41d;
-typedef Matx<float, 6, 1> Matx61f;
-typedef Matx<double, 6, 1> Matx61d;
-
-typedef Matx<float, 2, 2> Matx22f;
-typedef Matx<double, 2, 2> Matx22d;
-typedef Matx<float, 2, 3> Matx23f;
-typedef Matx<double, 2, 3> Matx23d;
-typedef Matx<float, 3, 2> Matx32f;
-typedef Matx<double, 3, 2> Matx32d;
-
-typedef Matx<float, 3, 3> Matx33f;
-typedef Matx<double, 3, 3> Matx33d;
-
-typedef Matx<float, 3, 4> Matx34f;
-typedef Matx<double, 3, 4> Matx34d;
-typedef Matx<float, 4, 3> Matx43f;
-typedef Matx<double, 4, 3> Matx43d;
-
-typedef Matx<float, 4, 4> Matx44f;
-typedef Matx<double, 4, 4> Matx44d;
-typedef Matx<float, 6, 6> Matx66f;
-typedef Matx<double, 6, 6> Matx66d;
-
-/*!
-  traits
-*/
-template<typename _Tp, int m, int n> class DataType< Matx<_Tp, m, n> >
-{
-public:
-    typedef Matx<_Tp, m, n>                               value_type;
-    typedef Matx<typename DataType<_Tp>::work_type, m, n> work_type;
-    typedef _Tp                                           channel_type;
-    typedef value_type                                    vec_type;
-
-    enum { generic_type = 0,
-           channels     = m * n,
-           fmt          = traits::SafeFmt<channel_type>::fmt + ((channels - 1) << 8)
-#ifdef OPENCV_TRAITS_ENABLE_DEPRECATED
-           ,depth        = DataType<channel_type>::depth
-           ,type         = CV_MAKETYPE(depth, channels)
-#endif
-         };
-};
-
-namespace traits {
-template<typename _Tp, int m, int n>
-struct Depth< Matx<_Tp, m, n> > { enum { value = Depth<_Tp>::value }; };
-template<typename _Tp, int m, int n>
-struct Type< Matx<_Tp, m, n> > { enum { value = CV_MAKETYPE(Depth<_Tp>::value, n*m) }; };
-} // namespace
-
-
-/** @brief  Comma-separated Matrix Initializer
-*/
-template<typename _Tp, int m, int n> class MatxCommaInitializer
-{
-public:
-    MatxCommaInitializer(Matx<_Tp, m, n>* _mtx);
-    template<typename T2> MatxCommaInitializer<_Tp, m, n>& operator , (T2 val);
-    Matx<_Tp, m, n> operator *() const;
-
-    Matx<_Tp, m, n>* dst;
-    int idx;
-};
-
-/*
- Utility methods
-*/
-template<typename _Tp, int m> static double determinant(const Matx<_Tp, m, m>& a);
-template<typename _Tp, int m, int n> static double trace(const Matx<_Tp, m, n>& a);
-template<typename _Tp, int m, int n> static double norm(const Matx<_Tp, m, n>& M);
-template<typename _Tp, int m, int n> static double norm(const Matx<_Tp, m, n>& M, int normType);
-
-
-
-/////////////////////// Vec (used as element of multi-channel images /////////////////////
-
-/** @brief Template class for short numerical vectors, a partial case of Matx
-
-This template class represents short numerical vectors (of 1, 2, 3, 4 ... elements) on which you
-can perform basic arithmetical operations, access individual elements using [] operator etc. The
-vectors are allocated on stack, as opposite to std::valarray, std::vector, cv::Mat etc., which
-elements are dynamically allocated in the heap.
-
-The template takes 2 parameters:
-@tparam _Tp element type
-@tparam cn the number of elements
-
-In addition to the universal notation like Vec<float, 3>, you can use shorter aliases
-for the most popular specialized variants of Vec, e.g. Vec3f ~ Vec<float, 3>.
-
-It is possible to convert Vec\<T,2\> to/from Point_, Vec\<T,3\> to/from Point3_ , and Vec\<T,4\>
-to CvScalar or Scalar_. Use operator[] to access the elements of Vec.
-
-All the expected vector operations are also implemented:
--   v1 = v2 + v3
--   v1 = v2 - v3
--   v1 = v2 \* scale
--   v1 = scale \* v2
--   v1 = -v2
--   v1 += v2 and other augmenting operations
--   v1 == v2, v1 != v2
--   norm(v1) (euclidean norm)
-The Vec class is commonly used to describe pixel types of multi-channel arrays. See Mat for details.
-*/
-template<typename _Tp, int cn> class Vec : public Matx<_Tp, cn, 1>
-{
-public:
-    typedef _Tp value_type;
-    enum {
-           channels = cn,
-#ifdef OPENCV_TRAITS_ENABLE_DEPRECATED
-           depth    = Matx<_Tp, cn, 1>::depth,
-           type     = CV_MAKETYPE(depth, channels),
-#endif
-           _dummy_enum_finalizer = 0
-         };
-
-    //! default constructor
-    Vec();
-
-    Vec(_Tp v0); //!< 1-element vector constructor
-    Vec(_Tp v0, _Tp v1); //!< 2-element vector constructor
-    Vec(_Tp v0, _Tp v1, _Tp v2); //!< 3-element vector constructor
-    Vec(_Tp v0, _Tp v1, _Tp v2, _Tp v3); //!< 4-element vector constructor
-    Vec(_Tp v0, _Tp v1, _Tp v2, _Tp v3, _Tp v4); //!< 5-element vector constructor
-    Vec(_Tp v0, _Tp v1, _Tp v2, _Tp v3, _Tp v4, _Tp v5); //!< 6-element vector constructor
-    Vec(_Tp v0, _Tp v1, _Tp v2, _Tp v3, _Tp v4, _Tp v5, _Tp v6); //!< 7-element vector constructor
-    Vec(_Tp v0, _Tp v1, _Tp v2, _Tp v3, _Tp v4, _Tp v5, _Tp v6, _Tp v7); //!< 8-element vector constructor
-    Vec(_Tp v0, _Tp v1, _Tp v2, _Tp v3, _Tp v4, _Tp v5, _Tp v6, _Tp v7, _Tp v8); //!< 9-element vector constructor
-    Vec(_Tp v0, _Tp v1, _Tp v2, _Tp v3, _Tp v4, _Tp v5, _Tp v6, _Tp v7, _Tp v8, _Tp v9); //!< 10-element vector constructor
-    Vec(_Tp v0, _Tp v1, _Tp v2, _Tp v3, _Tp v4, _Tp v5, _Tp v6, _Tp v7, _Tp v8, _Tp v9, _Tp v10, _Tp v11, _Tp v12, _Tp v13); //!< 14-element vector constructor
-    explicit Vec(const _Tp* values);
-
-    Vec(std::initializer_list<_Tp>);
-
-    Vec(const Vec<_Tp, cn>& v);
-
-    static Vec all(_Tp alpha);
-    static Vec ones();
-    static Vec randn(_Tp a, _Tp b);
-    static Vec randu(_Tp a, _Tp b);
-    static Vec zeros();
-#ifdef CV_CXX11
-    static Vec diag(_Tp alpha) = delete;
-    static Vec eye() = delete;
-#endif
-
-    //! per-element multiplication
-    Vec mul(const Vec<_Tp, cn>& v) const;
-
-    //! conjugation (makes sense for complex numbers and quaternions)
-    Vec conj() const;
-
-    /*!
-      cross product of the two 3D vectors.
-
-      For other dimensionalities the exception is raised
-    */
-    Vec cross(const Vec& v) const;
-    //! conversion to another data type
-    template<typename T2> operator Vec<T2, cn>() const;
-
-    /*! element access */
-    const _Tp& operator [](int i) const;
-    _Tp& operator[](int i);
-    const _Tp& operator ()(int i) const;
-    _Tp& operator ()(int i);
-
-#ifdef CV_CXX11
-    Vec<_Tp, cn>& operator=(const Vec<_Tp, cn>& rhs) = default;
-#endif
-
-    Vec(const Matx<_Tp, cn, 1>& a, const Matx<_Tp, cn, 1>& b, Matx_AddOp);
-    Vec(const Matx<_Tp, cn, 1>& a, const Matx<_Tp, cn, 1>& b, Matx_SubOp);
-    template<typename _T2> Vec(const Matx<_Tp, cn, 1>& a, _T2 alpha, Matx_ScaleOp);
-};
-
-/** @name Shorter aliases for the most popular specializations of Vec<T,n>
-  @{
-*/
-typedef Vec<uchar, 2> Vec2b;
-typedef Vec<uchar, 3> Vec3b;
-typedef Vec<uchar, 4> Vec4b;
-
-typedef Vec<short, 2> Vec2s;
-typedef Vec<short, 3> Vec3s;
-typedef Vec<short, 4> Vec4s;
-
-typedef Vec<ushort, 2> Vec2w;
-typedef Vec<ushort, 3> Vec3w;
-typedef Vec<ushort, 4> Vec4w;
-
-typedef Vec<int, 2> Vec2i;
-typedef Vec<int, 3> Vec3i;
-typedef Vec<int, 4> Vec4i;
-typedef Vec<int, 6> Vec6i;
-typedef Vec<int, 8> Vec8i;
-
-typedef Vec<float, 2> Vec2f;
-typedef Vec<float, 3> Vec3f;
-typedef Vec<float, 4> Vec4f;
-typedef Vec<float, 6> Vec6f;
-
-typedef Vec<double, 2> Vec2d;
-typedef Vec<double, 3> Vec3d;
-typedef Vec<double, 4> Vec4d;
-typedef Vec<double, 6> Vec6d;
-/** @} */
-
-/*!
-  traits
-*/
-template<typename _Tp, int cn> class DataType< Vec<_Tp, cn> >
-{
-public:
-    typedef Vec<_Tp, cn>                               value_type;
-    typedef Vec<typename DataType<_Tp>::work_type, cn> work_type;
-    typedef _Tp                                        channel_type;
-    typedef value_type                                 vec_type;
-
-    enum { generic_type = 0,
-           channels     = cn,
-           fmt          = DataType<channel_type>::fmt + ((channels - 1) << 8),
-#ifdef OPENCV_TRAITS_ENABLE_DEPRECATED
-           depth        = DataType<channel_type>::depth,
-           type         = CV_MAKETYPE(depth, channels),
-#endif
-           _dummy_enum_finalizer = 0
-         };
-};
-
-namespace traits {
-template<typename _Tp, int cn>
-struct Depth< Vec<_Tp, cn> > { enum { value = Depth<_Tp>::value }; };
-template<typename _Tp, int cn>
-struct Type< Vec<_Tp, cn> > { enum { value = CV_MAKETYPE(Depth<_Tp>::value, cn) }; };
-} // namespace
-
-
-/** @brief  Comma-separated Vec Initializer
-*/
-template<typename _Tp, int m> class VecCommaInitializer : public MatxCommaInitializer<_Tp, m, 1>
-{
-public:
-    VecCommaInitializer(Vec<_Tp, m>* _vec);
-    template<typename T2> VecCommaInitializer<_Tp, m>& operator , (T2 val);
-    Vec<_Tp, m> operator *() const;
-};
-
-template<typename _Tp, int cn> static Vec<_Tp, cn> normalize(const Vec<_Tp, cn>& v);
-
-//! @} core_basic
-
-//! @cond IGNORED
-
-///////////////////////////////////// helper classes /////////////////////////////////////
-namespace internal
-{
-
-template<typename _Tp, int m> struct Matx_DetOp
-{
-    double operator ()(const Matx<_Tp, m, m>& a) const
-    {
-        Matx<_Tp, m, m> temp = a;
-        double p = LU(temp.val, m*sizeof(_Tp), m, 0, 0, 0);
-        if( p == 0 )
-            return p;
-        for( int i = 0; i < m; i++ )
-            p *= temp(i, i);
-        return p;
-    }
-};
-
-template<typename _Tp> struct Matx_DetOp<_Tp, 1>
-{
-    double operator ()(const Matx<_Tp, 1, 1>& a) const
-    {
-        return a(0,0);
-    }
-};
-
-template<typename _Tp> struct Matx_DetOp<_Tp, 2>
-{
-    double operator ()(const Matx<_Tp, 2, 2>& a) const
-    {
-        return a(0,0)*a(1,1) - a(0,1)*a(1,0);
-    }
-};
-
-template<typename _Tp> struct Matx_DetOp<_Tp, 3>
-{
-    double operator ()(const Matx<_Tp, 3, 3>& a) const
-    {
-        return a(0,0)*(a(1,1)*a(2,2) - a(2,1)*a(1,2)) -
-            a(0,1)*(a(1,0)*a(2,2) - a(2,0)*a(1,2)) +
-            a(0,2)*(a(1,0)*a(2,1) - a(2,0)*a(1,1));
-    }
-};
-
-template<typename _Tp> Vec<_Tp, 2> inline conjugate(const Vec<_Tp, 2>& v)
-{
-    return Vec<_Tp, 2>(v[0], -v[1]);
-}
-
-template<typename _Tp> Vec<_Tp, 4> inline conjugate(const Vec<_Tp, 4>& v)
-{
-    return Vec<_Tp, 4>(v[0], -v[1], -v[2], -v[3]);
-}
-
-} // internal
-
-
-
-////////////////////////////////// Matx Implementation ///////////////////////////////////
-
-template<typename _Tp, int m, int n> inline
-Matx<_Tp, m, n>::Matx()
-{
-    for(int i = 0; i < channels; i++) val[i] = _Tp(0);
-}
-
-template<typename _Tp, int m, int n> inline
-Matx<_Tp, m, n>::Matx(_Tp v0)
-{
-    val[0] = v0;
-    for(int i = 1; i < channels; i++) val[i] = _Tp(0);
-}
-
-template<typename _Tp, int m, int n> inline
-Matx<_Tp, m, n>::Matx(_Tp v0, _Tp v1)
-{
-    CV_StaticAssert(channels >= 2, "Matx should have at least 2 elements.");
-    val[0] = v0; val[1] = v1;
-    for(int i = 2; i < channels; i++) val[i] = _Tp(0);
-}
-
-template<typename _Tp, int m, int n> inline
-Matx<_Tp, m, n>::Matx(_Tp v0, _Tp v1, _Tp v2)
-{
-    CV_StaticAssert(channels >= 3, "Matx should have at least 3 elements.");
-    val[0] = v0; val[1] = v1; val[2] = v2;
-    for(int i = 3; i < channels; i++) val[i] = _Tp(0);
-}
-
-template<typename _Tp, int m, int n> inline
-Matx<_Tp, m, n>::Matx(_Tp v0, _Tp v1, _Tp v2, _Tp v3)
-{
-    CV_StaticAssert(channels >= 4, "Matx should have at least 4 elements.");
-    val[0] = v0; val[1] = v1; val[2] = v2; val[3] = v3;
-    for(int i = 4; i < channels; i++) val[i] = _Tp(0);
-}
-
-template<typename _Tp, int m, int n> inline
-Matx<_Tp, m, n>::Matx(_Tp v0, _Tp v1, _Tp v2, _Tp v3, _Tp v4)
-{
-    CV_StaticAssert(channels >= 5, "Matx should have at least 5 elements.");
-    val[0] = v0; val[1] = v1; val[2] = v2; val[3] = v3; val[4] = v4;
-    for(int i = 5; i < channels; i++) val[i] = _Tp(0);
-}
-
-template<typename _Tp, int m, int n> inline
-Matx<_Tp, m, n>::Matx(_Tp v0, _Tp v1, _Tp v2, _Tp v3, _Tp v4, _Tp v5)
-{
-    CV_StaticAssert(channels >= 6, "Matx should have at least 6 elements.");
-    val[0] = v0; val[1] = v1; val[2] = v2; val[3] = v3;
-    val[4] = v4; val[5] = v5;
-    for(int i = 6; i < channels; i++) val[i] = _Tp(0);
-}
-
-template<typename _Tp, int m, int n> inline
-Matx<_Tp, m, n>::Matx(_Tp v0, _Tp v1, _Tp v2, _Tp v3, _Tp v4, _Tp v5, _Tp v6)
-{
-    CV_StaticAssert(channels >= 7, "Matx should have at least 7 elements.");
-    val[0] = v0; val[1] = v1; val[2] = v2; val[3] = v3;
-    val[4] = v4; val[5] = v5; val[6] = v6;
-    for(int i = 7; i < channels; i++) val[i] = _Tp(0);
-}
-
-template<typename _Tp, int m, int n> inline
-Matx<_Tp, m, n>::Matx(_Tp v0, _Tp v1, _Tp v2, _Tp v3, _Tp v4, _Tp v5, _Tp v6, _Tp v7)
-{
-    CV_StaticAssert(channels >= 8, "Matx should have at least 8 elements.");
-    val[0] = v0; val[1] = v1; val[2] = v2; val[3] = v3;
-    val[4] = v4; val[5] = v5; val[6] = v6; val[7] = v7;
-    for(int i = 8; i < channels; i++) val[i] = _Tp(0);
-}
-
-template<typename _Tp, int m, int n> inline
-Matx<_Tp, m, n>::Matx(_Tp v0, _Tp v1, _Tp v2, _Tp v3, _Tp v4, _Tp v5, _Tp v6, _Tp v7, _Tp v8)
-{
-    CV_StaticAssert(channels >= 9, "Matx should have at least 9 elements.");
-    val[0] = v0; val[1] = v1; val[2] = v2; val[3] = v3;
-    val[4] = v4; val[5] = v5; val[6] = v6; val[7] = v7;
-    val[8] = v8;
-    for(int i = 9; i < channels; i++) val[i] = _Tp(0);
-}
-
-template<typename _Tp, int m, int n> inline
-Matx<_Tp, m, n>::Matx(_Tp v0, _Tp v1, _Tp v2, _Tp v3, _Tp v4, _Tp v5, _Tp v6, _Tp v7, _Tp v8, _Tp v9)
-{
-    CV_StaticAssert(channels >= 10, "Matx should have at least 10 elements.");
-    val[0] = v0; val[1] = v1; val[2] = v2; val[3] = v3;
-    val[4] = v4; val[5] = v5; val[6] = v6; val[7] = v7;
-    val[8] = v8; val[9] = v9;
-    for(int i = 10; i < channels; i++) val[i] = _Tp(0);
-}
-
-
-template<typename _Tp, int m, int n> inline
-Matx<_Tp,m,n>::Matx(_Tp v0, _Tp v1, _Tp v2, _Tp v3, _Tp v4, _Tp v5, _Tp v6, _Tp v7, _Tp v8, _Tp v9, _Tp v10, _Tp v11)
-{
-    CV_StaticAssert(channels >= 12, "Matx should have at least 12 elements.");
-    val[0] = v0; val[1] = v1; val[2] = v2; val[3] = v3;
-    val[4] = v4; val[5] = v5; val[6] = v6; val[7] = v7;
-    val[8] = v8; val[9] = v9; val[10] = v10; val[11] = v11;
-    for(int i = 12; i < channels; i++) val[i] = _Tp(0);
-}
-
-template<typename _Tp, int m, int n> inline
-Matx<_Tp,m,n>::Matx(_Tp v0, _Tp v1, _Tp v2, _Tp v3, _Tp v4, _Tp v5, _Tp v6, _Tp v7, _Tp v8, _Tp v9, _Tp v10, _Tp v11, _Tp v12, _Tp v13)
-{
-    CV_StaticAssert(channels >= 14, "Matx should have at least 14 elements.");
-    val[0] = v0; val[1] = v1; val[2] = v2; val[3] = v3;
-    val[4] = v4; val[5] = v5; val[6] = v6; val[7] = v7;
-    val[8] = v8; val[9] = v9; val[10] = v10; val[11] = v11;
-    val[12] = v12; val[13] = v13;
-    for (int i = 14; i < channels; i++) val[i] = _Tp(0);
-}
-
-
-template<typename _Tp, int m, int n> inline
-Matx<_Tp,m,n>::Matx(_Tp v0, _Tp v1, _Tp v2, _Tp v3, _Tp v4, _Tp v5, _Tp v6, _Tp v7, _Tp v8, _Tp v9, _Tp v10, _Tp v11, _Tp v12, _Tp v13, _Tp v14, _Tp v15)
-{
-    CV_StaticAssert(channels >= 16, "Matx should have at least 16 elements.");
-    val[0] = v0; val[1] = v1; val[2] = v2; val[3] = v3;
-    val[4] = v4; val[5] = v5; val[6] = v6; val[7] = v7;
-    val[8] = v8; val[9] = v9; val[10] = v10; val[11] = v11;
-    val[12] = v12; val[13] = v13; val[14] = v14; val[15] = v15;
-    for(int i = 16; i < channels; i++) val[i] = _Tp(0);
-}
-
-template<typename _Tp, int m, int n> inline
-Matx<_Tp, m, n>::Matx(const _Tp* values)
-{
-    for( int i = 0; i < channels; i++ ) val[i] = values[i];
-}
-
-template<typename _Tp, int m, int n> inline
-Matx<_Tp, m, n>::Matx(std::initializer_list<_Tp> list)
-{
-    CV_DbgAssert(list.size() == channels);
-    int i = 0;
-    for(const auto& elem : list)
-    {
-        val[i++] = elem;
-    }
-}
-
-template<typename _Tp, int m, int n> inline
-Matx<_Tp, m, n> Matx<_Tp, m, n>::all(_Tp alpha)
-{
-    Matx<_Tp, m, n> M;
-    for( int i = 0; i < m*n; i++ ) M.val[i] = alpha;
-    return M;
-}
-
-template<typename _Tp, int m, int n> inline
-Matx<_Tp,m,n> Matx<_Tp,m,n>::zeros()
-{
-    return all(0);
-}
-
-template<typename _Tp, int m, int n> inline
-Matx<_Tp,m,n> Matx<_Tp,m,n>::ones()
-{
-    return all(1);
-}
-
-template<typename _Tp, int m, int n> inline
-Matx<_Tp,m,n> Matx<_Tp,m,n>::eye()
-{
-    Matx<_Tp,m,n> M;
-    for(int i = 0; i < shortdim; i++)
-        M(i,i) = 1;
-    return M;
-}
-
-template<typename _Tp, int m, int n> inline
-_Tp Matx<_Tp, m, n>::dot(const Matx<_Tp, m, n>& M) const
-{
-    _Tp s = 0;
-    for( int i = 0; i < channels; i++ ) s += val[i]*M.val[i];
-    return s;
-}
-
-template<typename _Tp, int m, int n> inline
-double Matx<_Tp, m, n>::ddot(const Matx<_Tp, m, n>& M) const
-{
-    double s = 0;
-    for( int i = 0; i < channels; i++ ) s += (double)val[i]*M.val[i];
-    return s;
-}
-
-template<typename _Tp, int m, int n> inline
-Matx<_Tp,m,n> Matx<_Tp,m,n>::diag(const typename Matx<_Tp,m,n>::diag_type& d)
-{
-    Matx<_Tp,m,n> M;
-    for(int i = 0; i < shortdim; i++)
-        M(i,i) = d(i, 0);
-    return M;
-}
-
-template<typename _Tp, int m, int n> template<typename T2>
-inline Matx<_Tp, m, n>::operator Matx<T2, m, n>() const
-{
-    Matx<T2, m, n> M;
-    for( int i = 0; i < m*n; i++ ) M.val[i] = saturate_cast<T2>(val[i]);
-    return M;
-}
-
-template<typename _Tp, int m, int n> template<int m1, int n1> inline
-Matx<_Tp, m1, n1> Matx<_Tp, m, n>::reshape() const
-{
-    CV_StaticAssert(m1*n1 == m*n, "Input and destnarion matrices must have the same number of elements");
-    return (const Matx<_Tp, m1, n1>&)*this;
-}
-
-template<typename _Tp, int m, int n>
-template<int m1, int n1> inline
-Matx<_Tp, m1, n1> Matx<_Tp, m, n>::get_minor(int base_row, int base_col) const
-{
-    CV_DbgAssert(0 <= base_row && base_row+m1 <= m && 0 <= base_col && base_col+n1 <= n);
-    Matx<_Tp, m1, n1> s;
-    for( int di = 0; di < m1; di++ )
-        for( int dj = 0; dj < n1; dj++ )
-            s(di, dj) = (*this)(base_row+di, base_col+dj);
-    return s;
-}
-
-template<typename _Tp, int m, int n> inline
-Matx<_Tp, 1, n> Matx<_Tp, m, n>::row(int i) const
-{
-    CV_DbgAssert((unsigned)i < (unsigned)m);
-    return Matx<_Tp, 1, n>(&val[i*n]);
-}
-
-template<typename _Tp, int m, int n> inline
-Matx<_Tp, m, 1> Matx<_Tp, m, n>::col(int j) const
-{
-    CV_DbgAssert((unsigned)j < (unsigned)n);
-    Matx<_Tp, m, 1> v;
-    for( int i = 0; i < m; i++ )
-        v.val[i] = val[i*n + j];
-    return v;
-}
-
-template<typename _Tp, int m, int n> inline
-typename Matx<_Tp, m, n>::diag_type Matx<_Tp, m, n>::diag() const
-{
-    diag_type d;
-    for( int i = 0; i < shortdim; i++ )
-        d.val[i] = val[i*n + i];
-    return d;
-}
-
-template<typename _Tp, int m, int n> inline
-const _Tp& Matx<_Tp, m, n>::operator()(int row_idx, int col_idx) const
-{
-    CV_DbgAssert( (unsigned)row_idx < (unsigned)m && (unsigned)col_idx < (unsigned)n );
-    return this->val[row_idx*n + col_idx];
-}
-
-template<typename _Tp, int m, int n> inline
-_Tp& Matx<_Tp, m, n>::operator ()(int row_idx, int col_idx)
-{
-    CV_DbgAssert( (unsigned)row_idx < (unsigned)m && (unsigned)col_idx < (unsigned)n );
-    return val[row_idx*n + col_idx];
-}
-
-template<typename _Tp, int m, int n> inline
-const _Tp& Matx<_Tp, m, n>::operator ()(int i) const
-{
-    CV_StaticAssert(m == 1 || n == 1, "Single index indexation requires matrix to be a column or a row");
-    CV_DbgAssert( (unsigned)i < (unsigned)(m+n-1) );
-    return val[i];
-}
-
-template<typename _Tp, int m, int n> inline
-_Tp& Matx<_Tp, m, n>::operator ()(int i)
-{
-    CV_StaticAssert(m == 1 || n == 1, "Single index indexation requires matrix to be a column or a row");
-    CV_DbgAssert( (unsigned)i < (unsigned)(m+n-1) );
-    return val[i];
-}
-
-template<typename _Tp, int m, int n> inline
-Matx<_Tp,m,n>::Matx(const Matx<_Tp, m, n>& a, const Matx<_Tp, m, n>& b, Matx_AddOp)
-{
-    for( int i = 0; i < channels; i++ )
-        val[i] = saturate_cast<_Tp>(a.val[i] + b.val[i]);
-}
-
-template<typename _Tp, int m, int n> inline
-Matx<_Tp,m,n>::Matx(const Matx<_Tp, m, n>& a, const Matx<_Tp, m, n>& b, Matx_SubOp)
-{
-    for( int i = 0; i < channels; i++ )
-        val[i] = saturate_cast<_Tp>(a.val[i] - b.val[i]);
-}
-
-template<typename _Tp, int m, int n> template<typename _T2> inline
-Matx<_Tp,m,n>::Matx(const Matx<_Tp, m, n>& a, _T2 alpha, Matx_ScaleOp)
-{
-    for( int i = 0; i < channels; i++ )
-        val[i] = saturate_cast<_Tp>(a.val[i] * alpha);
-}
-
-template<typename _Tp, int m, int n> inline
-Matx<_Tp,m,n>::Matx(const Matx<_Tp, m, n>& a, const Matx<_Tp, m, n>& b, Matx_MulOp)
-{
-    for( int i = 0; i < channels; i++ )
-        val[i] = saturate_cast<_Tp>(a.val[i] * b.val[i]);
-}
-
-template<typename _Tp, int m, int n> inline
-Matx<_Tp,m,n>::Matx(const Matx<_Tp, m, n>& a, const Matx<_Tp, m, n>& b, Matx_DivOp)
-{
-    for( int i = 0; i < channels; i++ )
-        val[i] = saturate_cast<_Tp>(a.val[i] / b.val[i]);
-}
-
-template<typename _Tp, int m, int n> template<int l> inline
-Matx<_Tp,m,n>::Matx(const Matx<_Tp, m, l>& a, const Matx<_Tp, l, n>& b, Matx_MatMulOp)
-{
-    for( int i = 0; i < m; i++ )
-        for( int j = 0; j < n; j++ )
-        {
-            _Tp s = 0;
-            for( int k = 0; k < l; k++ )
-                s += a(i, k) * b(k, j);
-            val[i*n + j] = s;
-        }
-}
-
-template<typename _Tp, int m, int n> inline
-Matx<_Tp,m,n>::Matx(const Matx<_Tp, n, m>& a, Matx_TOp)
-{
-    for( int i = 0; i < m; i++ )
-        for( int j = 0; j < n; j++ )
-            val[i*n + j] = a(j, i);
-}
-
-template<typename _Tp, int m, int n> inline
-Matx<_Tp, m, n> Matx<_Tp, m, n>::mul(const Matx<_Tp, m, n>& a) const
-{
-    return Matx<_Tp, m, n>(*this, a, Matx_MulOp());
-}
-
-template<typename _Tp, int m, int n> inline
-Matx<_Tp, m, n> Matx<_Tp, m, n>::div(const Matx<_Tp, m, n>& a) const
-{
-    return Matx<_Tp, m, n>(*this, a, Matx_DivOp());
-}
-
-template<typename _Tp, int m, int n> inline
-Matx<_Tp, n, m> Matx<_Tp, m, n>::t() const
-{
-    return Matx<_Tp, n, m>(*this, Matx_TOp());
-}
-
-template<typename _Tp, int m, int n> inline
-Vec<_Tp, n> Matx<_Tp, m, n>::solve(const Vec<_Tp, m>& rhs, int method) const
-{
-    Matx<_Tp, n, 1> x = solve((const Matx<_Tp, m, 1>&)(rhs), method);
-    return (Vec<_Tp, n>&)(x);
-}
-
-template<typename _Tp, int m> static inline
-double determinant(const Matx<_Tp, m, m>& a)
-{
-    return cv::internal::Matx_DetOp<_Tp, m>()(a);
-}
-
-template<typename _Tp, int m, int n> static inline
-double trace(const Matx<_Tp, m, n>& a)
-{
-    _Tp s = 0;
-    for( int i = 0; i < std::min(m, n); i++ )
-        s += a(i,i);
-    return s;
-}
-
-template<typename _Tp, int m, int n> static inline
-double norm(const Matx<_Tp, m, n>& M)
-{
-    return std::sqrt(normL2Sqr<_Tp, double>(M.val, m*n));
-}
-
-template<typename _Tp, int m, int n> static inline
-double norm(const Matx<_Tp, m, n>& M, int normType)
-{
-    switch(normType) {
-    case NORM_INF:
-        return (double)normInf<_Tp, typename DataType<_Tp>::work_type>(M.val, m*n);
-    case NORM_L1:
-        return (double)normL1<_Tp, typename DataType<_Tp>::work_type>(M.val, m*n);
-    case NORM_L2SQR:
-        return (double)normL2Sqr<_Tp, typename DataType<_Tp>::work_type>(M.val, m*n);
-    default:
-    case NORM_L2:
-        return std::sqrt((double)normL2Sqr<_Tp, typename DataType<_Tp>::work_type>(M.val, m*n));
-    }
-}
-
-
-
-//////////////////////////////// matx comma initializer //////////////////////////////////
-
-template<typename _Tp, typename _T2, int m, int n> static inline
-MatxCommaInitializer<_Tp, m, n> operator << (const Matx<_Tp, m, n>& mtx, _T2 val)
-{
-    MatxCommaInitializer<_Tp, m, n> commaInitializer((Matx<_Tp, m, n>*)&mtx);
-    return (commaInitializer, val);
-}
-
-template<typename _Tp, int m, int n> inline
-MatxCommaInitializer<_Tp, m, n>::MatxCommaInitializer(Matx<_Tp, m, n>* _mtx)
-    : dst(_mtx), idx(0)
-{}
-
-template<typename _Tp, int m, int n> template<typename _T2> inline
-MatxCommaInitializer<_Tp, m, n>& MatxCommaInitializer<_Tp, m, n>::operator , (_T2 value)
-{
-    CV_DbgAssert( idx < m*n );
-    dst->val[idx++] = saturate_cast<_Tp>(value);
-    return *this;
-}
-
-template<typename _Tp, int m, int n> inline
-Matx<_Tp, m, n> MatxCommaInitializer<_Tp, m, n>::operator *() const
-{
-    CV_DbgAssert( idx == n*m );
-    return *dst;
-}
-
-
-
-/////////////////////////////////// Vec Implementation ///////////////////////////////////
-
-template<typename _Tp, int cn> inline
-Vec<_Tp, cn>::Vec() {}
-
-template<typename _Tp, int cn> inline
-Vec<_Tp, cn>::Vec(_Tp v0)
-    : Matx<_Tp, cn, 1>(v0) {}
-
-template<typename _Tp, int cn> inline
-Vec<_Tp, cn>::Vec(_Tp v0, _Tp v1)
-    : Matx<_Tp, cn, 1>(v0, v1) {}
-
-template<typename _Tp, int cn> inline
-Vec<_Tp, cn>::Vec(_Tp v0, _Tp v1, _Tp v2)
-    : Matx<_Tp, cn, 1>(v0, v1, v2) {}
-
-template<typename _Tp, int cn> inline
-Vec<_Tp, cn>::Vec(_Tp v0, _Tp v1, _Tp v2, _Tp v3)
-    : Matx<_Tp, cn, 1>(v0, v1, v2, v3) {}
-
-template<typename _Tp, int cn> inline
-Vec<_Tp, cn>::Vec(_Tp v0, _Tp v1, _Tp v2, _Tp v3, _Tp v4)
-    : Matx<_Tp, cn, 1>(v0, v1, v2, v3, v4) {}
-
-template<typename _Tp, int cn> inline
-Vec<_Tp, cn>::Vec(_Tp v0, _Tp v1, _Tp v2, _Tp v3, _Tp v4, _Tp v5)
-    : Matx<_Tp, cn, 1>(v0, v1, v2, v3, v4, v5) {}
-
-template<typename _Tp, int cn> inline
-Vec<_Tp, cn>::Vec(_Tp v0, _Tp v1, _Tp v2, _Tp v3, _Tp v4, _Tp v5, _Tp v6)
-    : Matx<_Tp, cn, 1>(v0, v1, v2, v3, v4, v5, v6) {}
-
-template<typename _Tp, int cn> inline
-Vec<_Tp, cn>::Vec(_Tp v0, _Tp v1, _Tp v2, _Tp v3, _Tp v4, _Tp v5, _Tp v6, _Tp v7)
-    : Matx<_Tp, cn, 1>(v0, v1, v2, v3, v4, v5, v6, v7) {}
-
-template<typename _Tp, int cn> inline
-Vec<_Tp, cn>::Vec(_Tp v0, _Tp v1, _Tp v2, _Tp v3, _Tp v4, _Tp v5, _Tp v6, _Tp v7, _Tp v8)
-    : Matx<_Tp, cn, 1>(v0, v1, v2, v3, v4, v5, v6, v7, v8) {}
-
-template<typename _Tp, int cn> inline
-Vec<_Tp, cn>::Vec(_Tp v0, _Tp v1, _Tp v2, _Tp v3, _Tp v4, _Tp v5, _Tp v6, _Tp v7, _Tp v8, _Tp v9)
-    : Matx<_Tp, cn, 1>(v0, v1, v2, v3, v4, v5, v6, v7, v8, v9) {}
-
-template<typename _Tp, int cn> inline
-Vec<_Tp, cn>::Vec(_Tp v0, _Tp v1, _Tp v2, _Tp v3, _Tp v4, _Tp v5, _Tp v6, _Tp v7, _Tp v8, _Tp v9, _Tp v10, _Tp v11, _Tp v12, _Tp v13)
-    : Matx<_Tp, cn, 1>(v0, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13) {}
-
-template<typename _Tp, int cn> inline
-Vec<_Tp, cn>::Vec(const _Tp* values)
-    : Matx<_Tp, cn, 1>(values) {}
-
-template<typename _Tp, int cn> inline
-Vec<_Tp, cn>::Vec(std::initializer_list<_Tp> list)
-    : Matx<_Tp, cn, 1>(list) {}
-
-template<typename _Tp, int cn> inline
-Vec<_Tp, cn>::Vec(const Vec<_Tp, cn>& m)
-    : Matx<_Tp, cn, 1>(m.val) {}
-
-template<typename _Tp, int cn> inline
-Vec<_Tp, cn>::Vec(const Matx<_Tp, cn, 1>& a, const Matx<_Tp, cn, 1>& b, Matx_AddOp op)
-    : Matx<_Tp, cn, 1>(a, b, op) {}
-
-template<typename _Tp, int cn> inline
-Vec<_Tp, cn>::Vec(const Matx<_Tp, cn, 1>& a, const Matx<_Tp, cn, 1>& b, Matx_SubOp op)
-    : Matx<_Tp, cn, 1>(a, b, op) {}
-
-template<typename _Tp, int cn> template<typename _T2> inline
-Vec<_Tp, cn>::Vec(const Matx<_Tp, cn, 1>& a, _T2 alpha, Matx_ScaleOp op)
-    : Matx<_Tp, cn, 1>(a, alpha, op) {}
-
-template<typename _Tp, int cn> inline
-Vec<_Tp, cn> Vec<_Tp, cn>::all(_Tp alpha)
-{
-    Vec v;
-    for( int i = 0; i < cn; i++ ) v.val[i] = alpha;
-    return v;
-}
-
-template<typename _Tp, int cn> inline
-Vec<_Tp, cn> Vec<_Tp, cn>::ones()
-{
-    return Vec::all(1);
-}
-
-template<typename _Tp, int cn> inline
-Vec<_Tp, cn> Vec<_Tp, cn>::zeros()
-{
-    return Vec::all(0);
-}
-
-template<typename _Tp, int cn> inline
-Vec<_Tp, cn> Vec<_Tp, cn>::mul(const Vec<_Tp, cn>& v) const
-{
-    Vec<_Tp, cn> w;
-    for( int i = 0; i < cn; i++ ) w.val[i] = saturate_cast<_Tp>(this->val[i]*v.val[i]);
-    return w;
-}
-
-template<> inline
-Vec<float, 2> Vec<float, 2>::conj() const
-{
-    return cv::internal::conjugate(*this);
-}
-
-template<> inline
-Vec<double, 2> Vec<double, 2>::conj() const
-{
-    return cv::internal::conjugate(*this);
-}
-
-template<> inline
-Vec<float, 4> Vec<float, 4>::conj() const
-{
-    return cv::internal::conjugate(*this);
-}
-
-template<> inline
-Vec<double, 4> Vec<double, 4>::conj() const
-{
-    return cv::internal::conjugate(*this);
-}
-
-template<typename _Tp, int cn> inline
-Vec<_Tp, cn> Vec<_Tp, cn>::cross(const Vec<_Tp, cn>&) const
-{
-    CV_StaticAssert(cn == 3, "for arbitrary-size vector there is no cross-product defined");
-    return Vec<_Tp, cn>();
-}
-
-template<> inline
-Vec<float, 3> Vec<float, 3>::cross(const Vec<float, 3>& v) const
-{
-    return Vec<float,3>(this->val[1]*v.val[2] - this->val[2]*v.val[1],
-                     this->val[2]*v.val[0] - this->val[0]*v.val[2],
-                     this->val[0]*v.val[1] - this->val[1]*v.val[0]);
-}
-
-template<> inline
-Vec<double, 3> Vec<double, 3>::cross(const Vec<double, 3>& v) const
-{
-    return Vec<double,3>(this->val[1]*v.val[2] - this->val[2]*v.val[1],
-                     this->val[2]*v.val[0] - this->val[0]*v.val[2],
-                     this->val[0]*v.val[1] - this->val[1]*v.val[0]);
-}
-
-template<typename _Tp, int cn> template<typename T2> inline
-Vec<_Tp, cn>::operator Vec<T2, cn>() const
-{
-    Vec<T2, cn> v;
-    for( int i = 0; i < cn; i++ ) v.val[i] = saturate_cast<T2>(this->val[i]);
-    return v;
-}
-
-template<typename _Tp, int cn> inline
-const _Tp& Vec<_Tp, cn>::operator [](int i) const
-{
-    CV_DbgAssert( (unsigned)i < (unsigned)cn );
-    return this->val[i];
-}
-
-template<typename _Tp, int cn> inline
-_Tp& Vec<_Tp, cn>::operator [](int i)
-{
-    CV_DbgAssert( (unsigned)i < (unsigned)cn );
-    return this->val[i];
-}
-
-template<typename _Tp, int cn> inline
-const _Tp& Vec<_Tp, cn>::operator ()(int i) const
-{
-    CV_DbgAssert( (unsigned)i < (unsigned)cn );
-    return this->val[i];
-}
-
-template<typename _Tp, int cn> inline
-_Tp& Vec<_Tp, cn>::operator ()(int i)
-{
-    CV_DbgAssert( (unsigned)i < (unsigned)cn );
-    return this->val[i];
-}
-
-template<typename _Tp, int cn> inline
-Vec<_Tp, cn> normalize(const Vec<_Tp, cn>& v)
-{
-    double nv = norm(v);
-    return v * (nv ? 1./nv : 0.);
-}
-
-
-
-//////////////////////////////// vec comma initializer //////////////////////////////////
-
-
-template<typename _Tp, typename _T2, int cn> static inline
-VecCommaInitializer<_Tp, cn> operator << (const Vec<_Tp, cn>& vec, _T2 val)
-{
-    VecCommaInitializer<_Tp, cn> commaInitializer((Vec<_Tp, cn>*)&vec);
-    return (commaInitializer, val);
-}
-
-template<typename _Tp, int cn> inline
-VecCommaInitializer<_Tp, cn>::VecCommaInitializer(Vec<_Tp, cn>* _vec)
-    : MatxCommaInitializer<_Tp, cn, 1>(_vec)
-{}
-
-template<typename _Tp, int cn> template<typename _T2> inline
-VecCommaInitializer<_Tp, cn>& VecCommaInitializer<_Tp, cn>::operator , (_T2 value)
-{
-    CV_DbgAssert( this->idx < cn );
-    this->dst->val[this->idx++] = saturate_cast<_Tp>(value);
-    return *this;
-}
-
-template<typename _Tp, int cn> inline
-Vec<_Tp, cn> VecCommaInitializer<_Tp, cn>::operator *() const
-{
-    CV_DbgAssert( this->idx == cn );
-    return *this->dst;
-}
-
-//! @endcond
-
-///////////////////////////// Matx out-of-class operators ////////////////////////////////
-
-//! @relates cv::Matx
-//! @{
-
-template<typename _Tp1, typename _Tp2, int m, int n> static inline
-Matx<_Tp1, m, n>& operator += (Matx<_Tp1, m, n>& a, const Matx<_Tp2, m, n>& b)
-{
-    for( int i = 0; i < m*n; i++ )
-        a.val[i] = saturate_cast<_Tp1>(a.val[i] + b.val[i]);
-    return a;
-}
-
-template<typename _Tp1, typename _Tp2, int m, int n> static inline
-Matx<_Tp1, m, n>& operator -= (Matx<_Tp1, m, n>& a, const Matx<_Tp2, m, n>& b)
-{
-    for( int i = 0; i < m*n; i++ )
-        a.val[i] = saturate_cast<_Tp1>(a.val[i] - b.val[i]);
-    return a;
-}
-
-template<typename _Tp, int m, int n> static inline
-Matx<_Tp, m, n> operator + (const Matx<_Tp, m, n>& a, const Matx<_Tp, m, n>& b)
-{
-    return Matx<_Tp, m, n>(a, b, Matx_AddOp());
-}
-
-template<typename _Tp, int m, int n> static inline
-Matx<_Tp, m, n> operator - (const Matx<_Tp, m, n>& a, const Matx<_Tp, m, n>& b)
-{
-    return Matx<_Tp, m, n>(a, b, Matx_SubOp());
-}
-
-template<typename _Tp, int m, int n> static inline
-Matx<_Tp, m, n>& operator *= (Matx<_Tp, m, n>& a, int alpha)
-{
-    for( int i = 0; i < m*n; i++ )
-        a.val[i] = saturate_cast<_Tp>(a.val[i] * alpha);
-    return a;
-}
-
-template<typename _Tp, int m, int n> static inline
-Matx<_Tp, m, n>& operator *= (Matx<_Tp, m, n>& a, float alpha)
-{
-    for( int i = 0; i < m*n; i++ )
-        a.val[i] = saturate_cast<_Tp>(a.val[i] * alpha);
-    return a;
-}
-
-template<typename _Tp, int m, int n> static inline
-Matx<_Tp, m, n>& operator *= (Matx<_Tp, m, n>& a, double alpha)
-{
-    for( int i = 0; i < m*n; i++ )
-        a.val[i] = saturate_cast<_Tp>(a.val[i] * alpha);
-    return a;
-}
-
-template<typename _Tp, int m, int n> static inline
-Matx<_Tp, m, n> operator * (const Matx<_Tp, m, n>& a, int alpha)
-{
-    return Matx<_Tp, m, n>(a, alpha, Matx_ScaleOp());
-}
-
-template<typename _Tp, int m, int n> static inline
-Matx<_Tp, m, n> operator * (const Matx<_Tp, m, n>& a, float alpha)
-{
-    return Matx<_Tp, m, n>(a, alpha, Matx_ScaleOp());
-}
-
-template<typename _Tp, int m, int n> static inline
-Matx<_Tp, m, n> operator * (const Matx<_Tp, m, n>& a, double alpha)
-{
-    return Matx<_Tp, m, n>(a, alpha, Matx_ScaleOp());
-}
-
-template<typename _Tp, int m, int n> static inline
-Matx<_Tp, m, n> operator * (int alpha, const Matx<_Tp, m, n>& a)
-{
-    return Matx<_Tp, m, n>(a, alpha, Matx_ScaleOp());
-}
-
-template<typename _Tp, int m, int n> static inline
-Matx<_Tp, m, n> operator * (float alpha, const Matx<_Tp, m, n>& a)
-{
-    return Matx<_Tp, m, n>(a, alpha, Matx_ScaleOp());
-}
-
-template<typename _Tp, int m, int n> static inline
-Matx<_Tp, m, n> operator * (double alpha, const Matx<_Tp, m, n>& a)
-{
-    return Matx<_Tp, m, n>(a, alpha, Matx_ScaleOp());
-}
-
-template<typename _Tp, int m, int n> static inline
-Matx<_Tp, m, n>& operator /= (Matx<_Tp, m, n>& a, float alpha)
-{
-    for( int i = 0; i < m*n; i++ )
-        a.val[i] = a.val[i] / alpha;
-    return a;
-}
-
-template<typename _Tp, int m, int n> static inline
-Matx<_Tp, m, n>& operator /= (Matx<_Tp, m, n>& a, double alpha)
-{
-    for( int i = 0; i < m*n; i++ )
-        a.val[i] = a.val[i] / alpha;
-    return a;
-}
-
-template<typename _Tp, int m, int n> static inline
-Matx<_Tp, m, n> operator / (const Matx<_Tp, m, n>& a, float alpha)
-{
-    return Matx<_Tp, m, n>(a, 1.f/alpha, Matx_ScaleOp());
-}
-
-template<typename _Tp, int m, int n> static inline
-Matx<_Tp, m, n> operator / (const Matx<_Tp, m, n>& a, double alpha)
-{
-    return Matx<_Tp, m, n>(a, 1./alpha, Matx_ScaleOp());
-}
-
-template<typename _Tp, int m, int n> static inline
-Matx<_Tp, m, n> operator - (const Matx<_Tp, m, n>& a)
-{
-    return Matx<_Tp, m, n>(a, -1, Matx_ScaleOp());
-}
-
-template<typename _Tp, int m, int n, int l> static inline
-Matx<_Tp, m, n> operator * (const Matx<_Tp, m, l>& a, const Matx<_Tp, l, n>& b)
-{
-    return Matx<_Tp, m, n>(a, b, Matx_MatMulOp());
-}
-
-template<typename _Tp, int m, int n> static inline
-Vec<_Tp, m> operator * (const Matx<_Tp, m, n>& a, const Vec<_Tp, n>& b)
-{
-    Matx<_Tp, m, 1> c(a, b, Matx_MatMulOp());
-    return (const Vec<_Tp, m>&)(c);
-}
-
-template<typename _Tp, int m, int n> static inline
-bool operator == (const Matx<_Tp, m, n>& a, const Matx<_Tp, m, n>& b)
-{
-    for( int i = 0; i < m*n; i++ )
-        if( a.val[i] != b.val[i] ) return false;
-    return true;
-}
-
-template<typename _Tp, int m, int n> static inline
-bool operator != (const Matx<_Tp, m, n>& a, const Matx<_Tp, m, n>& b)
-{
-    return !(a == b);
-}
-
-//! @}
-
-////////////////////////////// Vec out-of-class operators ////////////////////////////////
-
-//! @relates cv::Vec
-//! @{
-
-template<typename _Tp1, typename _Tp2, int cn> static inline
-Vec<_Tp1, cn>& operator += (Vec<_Tp1, cn>& a, const Vec<_Tp2, cn>& b)
-{
-    for( int i = 0; i < cn; i++ )
-        a.val[i] = saturate_cast<_Tp1>(a.val[i] + b.val[i]);
-    return a;
-}
-
-template<typename _Tp1, typename _Tp2, int cn> static inline
-Vec<_Tp1, cn>& operator -= (Vec<_Tp1, cn>& a, const Vec<_Tp2, cn>& b)
-{
-    for( int i = 0; i < cn; i++ )
-        a.val[i] = saturate_cast<_Tp1>(a.val[i] - b.val[i]);
-    return a;
-}
-
-template<typename _Tp, int cn> static inline
-Vec<_Tp, cn> operator + (const Vec<_Tp, cn>& a, const Vec<_Tp, cn>& b)
-{
-    return Vec<_Tp, cn>(a, b, Matx_AddOp());
-}
-
-template<typename _Tp, int cn> static inline
-Vec<_Tp, cn> operator - (const Vec<_Tp, cn>& a, const Vec<_Tp, cn>& b)
-{
-    return Vec<_Tp, cn>(a, b, Matx_SubOp());
-}
-
-template<typename _Tp, int cn> static inline
-Vec<_Tp, cn>& operator *= (Vec<_Tp, cn>& a, int alpha)
-{
-    for( int i = 0; i < cn; i++ )
-        a[i] = saturate_cast<_Tp>(a[i]*alpha);
-    return a;
-}
-
-template<typename _Tp, int cn> static inline
-Vec<_Tp, cn>& operator *= (Vec<_Tp, cn>& a, float alpha)
-{
-    for( int i = 0; i < cn; i++ )
-        a[i] = saturate_cast<_Tp>(a[i]*alpha);
-    return a;
-}
-
-template<typename _Tp, int cn> static inline
-Vec<_Tp, cn>& operator *= (Vec<_Tp, cn>& a, double alpha)
-{
-    for( int i = 0; i < cn; i++ )
-        a[i] = saturate_cast<_Tp>(a[i]*alpha);
-    return a;
-}
-
-template<typename _Tp, int cn> static inline
-Vec<_Tp, cn>& operator /= (Vec<_Tp, cn>& a, int alpha)
-{
-    double ialpha = 1./alpha;
-    for( int i = 0; i < cn; i++ )
-        a[i] = saturate_cast<_Tp>(a[i]*ialpha);
-    return a;
-}
-
-template<typename _Tp, int cn> static inline
-Vec<_Tp, cn>& operator /= (Vec<_Tp, cn>& a, float alpha)
-{
-    float ialpha = 1.f/alpha;
-    for( int i = 0; i < cn; i++ )
-        a[i] = saturate_cast<_Tp>(a[i]*ialpha);
-    return a;
-}
-
-template<typename _Tp, int cn> static inline
-Vec<_Tp, cn>& operator /= (Vec<_Tp, cn>& a, double alpha)
-{
-    double ialpha = 1./alpha;
-    for( int i = 0; i < cn; i++ )
-        a[i] = saturate_cast<_Tp>(a[i]*ialpha);
-    return a;
-}
-
-template<typename _Tp, int cn> static inline
-Vec<_Tp, cn> operator * (const Vec<_Tp, cn>& a, int alpha)
-{
-    return Vec<_Tp, cn>(a, alpha, Matx_ScaleOp());
-}
-
-template<typename _Tp, int cn> static inline
-Vec<_Tp, cn> operator * (int alpha, const Vec<_Tp, cn>& a)
-{
-    return Vec<_Tp, cn>(a, alpha, Matx_ScaleOp());
-}
-
-template<typename _Tp, int cn> static inline
-Vec<_Tp, cn> operator * (const Vec<_Tp, cn>& a, float alpha)
-{
-    return Vec<_Tp, cn>(a, alpha, Matx_ScaleOp());
-}
-
-template<typename _Tp, int cn> static inline
-Vec<_Tp, cn> operator * (float alpha, const Vec<_Tp, cn>& a)
-{
-    return Vec<_Tp, cn>(a, alpha, Matx_ScaleOp());
-}
-
-template<typename _Tp, int cn> static inline
-Vec<_Tp, cn> operator * (const Vec<_Tp, cn>& a, double alpha)
-{
-    return Vec<_Tp, cn>(a, alpha, Matx_ScaleOp());
-}
-
-template<typename _Tp, int cn> static inline
-Vec<_Tp, cn> operator * (double alpha, const Vec<_Tp, cn>& a)
-{
-    return Vec<_Tp, cn>(a, alpha, Matx_ScaleOp());
-}
-
-template<typename _Tp, int cn> static inline
-Vec<_Tp, cn> operator / (const Vec<_Tp, cn>& a, int alpha)
-{
-    return Vec<_Tp, cn>(a, 1./alpha, Matx_ScaleOp());
-}
-
-template<typename _Tp, int cn> static inline
-Vec<_Tp, cn> operator / (const Vec<_Tp, cn>& a, float alpha)
-{
-    return Vec<_Tp, cn>(a, 1.f/alpha, Matx_ScaleOp());
-}
-
-template<typename _Tp, int cn> static inline
-Vec<_Tp, cn> operator / (const Vec<_Tp, cn>& a, double alpha)
-{
-    return Vec<_Tp, cn>(a, 1./alpha, Matx_ScaleOp());
-}
-
-template<typename _Tp, int cn> static inline
-Vec<_Tp, cn> operator - (const Vec<_Tp, cn>& a)
-{
-    Vec<_Tp,cn> t;
-    for( int i = 0; i < cn; i++ ) t.val[i] = saturate_cast<_Tp>(-a.val[i]);
-    return t;
-}
-
-template<typename _Tp> inline Vec<_Tp, 4> operator * (const Vec<_Tp, 4>& v1, const Vec<_Tp, 4>& v2)
-{
-    return Vec<_Tp, 4>(saturate_cast<_Tp>(v1[0]*v2[0] - v1[1]*v2[1] - v1[2]*v2[2] - v1[3]*v2[3]),
-                       saturate_cast<_Tp>(v1[0]*v2[1] + v1[1]*v2[0] + v1[2]*v2[3] - v1[3]*v2[2]),
-                       saturate_cast<_Tp>(v1[0]*v2[2] - v1[1]*v2[3] + v1[2]*v2[0] + v1[3]*v2[1]),
-                       saturate_cast<_Tp>(v1[0]*v2[3] + v1[1]*v2[2] - v1[2]*v2[1] + v1[3]*v2[0]));
-}
-
-template<typename _Tp> inline Vec<_Tp, 4>& operator *= (Vec<_Tp, 4>& v1, const Vec<_Tp, 4>& v2)
-{
-    v1 = v1 * v2;
-    return v1;
-}
-
-//! @}
-
-} // cv
-
-#endif // OPENCV_CORE_MATX_HPP
diff --git a/3rdParty/opencv2/core/types.hpp b/3rdParty/opencv2/core/types.hpp
deleted file mode 100644
index e16f9d4ee8..0000000000
--- a/3rdParty/opencv2/core/types.hpp
+++ /dev/null
@@ -1,2439 +0,0 @@
-/*M///////////////////////////////////////////////////////////////////////////////////////
-//
-//  IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
-//
-//  By downloading, copying, installing or using the software you agree to this license.
-//  If you do not agree to this license, do not download, install,
-//  copy or use the software.
-//
-//
-//                          License Agreement
-//                For Open Source Computer Vision Library
-//
-// Copyright (C) 2000-2008, Intel Corporation, all rights reserved.
-// Copyright (C) 2009, Willow Garage Inc., all rights reserved.
-// Copyright (C) 2013, OpenCV Foundation, all rights reserved.
-// Third party copyrights are property of their respective owners.
-//
-// Redistribution and use in source and binary forms, with or without modification,
-// are permitted provided that the following conditions are met:
-//
-//   * Redistribution's of source code must retain the above copyright notice,
-//     this list of conditions and the following disclaimer.
-//
-//   * Redistribution's in binary form must reproduce the above copyright notice,
-//     this list of conditions and the following disclaimer in the documentation
-//     and/or other materials provided with the distribution.
-//
-//   * The name of the copyright holders may not be used to endorse or promote products
-//     derived from this software without specific prior written permission.
-//
-// This software is provided by the copyright holders and contributors "as is" and
-// any express or implied warranties, including, but not limited to, the implied
-// warranties of merchantability and fitness for a particular purpose are disclaimed.
-// In no event shall the Intel Corporation or contributors be liable for any direct,
-// indirect, incidental, special, exemplary, or consequential damages
-// (including, but not limited to, procurement of substitute goods or services;
-// loss of use, data, or profits; or business interruption) however caused
-// and on any theory of liability, whether in contract, strict liability,
-// or tort (including negligence or otherwise) arising in any way out of
-// the use of this software, even if advised of the possibility of such damage.
-//
-//M*/
-
-#ifndef OPENCV_CORE_TYPES_HPP
-#define OPENCV_CORE_TYPES_HPP
-
-#ifndef __cplusplus
-#  error types.hpp header must be compiled as C++
-#endif
-
-#include <climits>
-#include <cfloat>
-#include <vector>
-#include <limits>
-
-#include "opencv2/core/cvdef.h"
-#include "opencv2/core/cvstd.hpp"
-#include "opencv2/core/matx.hpp"
-
-namespace cv
-{
-
-//! @addtogroup core_basic
-//! @{
-
-//////////////////////////////// Complex //////////////////////////////
-
-/** @brief  A complex number class.
-
-  The template class is similar and compatible with std::complex, however it provides slightly
-  more convenient access to the real and imaginary parts using through the simple field access, as opposite
-  to std::complex::real() and std::complex::imag().
-*/
-template<typename _Tp> class Complex
-{
-public:
-
-    //! default constructor
-    Complex();
-    Complex( _Tp _re, _Tp _im = 0 );
-
-    //! conversion to another data type
-    template<typename T2> operator Complex<T2>() const;
-    //! conjugation
-    Complex conj() const;
-
-    _Tp re, im; //< the real and the imaginary parts
-};
-
-typedef Complex<float> Complexf;
-typedef Complex<double> Complexd;
-
-template<typename _Tp> class DataType< Complex<_Tp> >
-{
-public:
-    typedef Complex<_Tp> value_type;
-    typedef value_type   work_type;
-    typedef _Tp          channel_type;
-
-    enum { generic_type = 0,
-           channels     = 2,
-           fmt          = DataType<channel_type>::fmt + ((channels - 1) << 8)
-#ifdef OPENCV_TRAITS_ENABLE_DEPRECATED
-           ,depth        = DataType<channel_type>::depth
-           ,type         = CV_MAKETYPE(depth, channels)
-#endif
-    };
-
-    typedef Vec<channel_type, channels> vec_type;
-};
-
-namespace traits {
-template<typename _Tp>
-struct Depth< Complex<_Tp> > { enum { value = Depth<_Tp>::value }; };
-template<typename _Tp>
-struct Type< Complex<_Tp> > { enum { value = CV_MAKETYPE(Depth<_Tp>::value, 2) }; };
-} // namespace
-
-
-//////////////////////////////// Point_ ////////////////////////////////
-
-/** @brief Template class for 2D points specified by its coordinates `x` and `y`.
-
-An instance of the class is interchangeable with C structures, CvPoint and CvPoint2D32f . There is
-also a cast operator to convert point coordinates to the specified type. The conversion from
-floating-point coordinates to integer coordinates is done by rounding. Commonly, the conversion
-uses this operation for each of the coordinates. Besides the class members listed in the
-declaration above, the following operations on points are implemented:
-@code
-    pt1 = pt2 + pt3;
-    pt1 = pt2 - pt3;
-    pt1 = pt2 * a;
-    pt1 = a * pt2;
-    pt1 = pt2 / a;
-    pt1 += pt2;
-    pt1 -= pt2;
-    pt1 *= a;
-    pt1 /= a;
-    double value = norm(pt); // L2 norm
-    pt1 == pt2;
-    pt1 != pt2;
-@endcode
-For your convenience, the following type aliases are defined:
-@code
-    typedef Point_<int> Point2i;
-    typedef Point2i Point;
-    typedef Point_<float> Point2f;
-    typedef Point_<double> Point2d;
-@endcode
-Example:
-@code
-    Point2f a(0.3f, 0.f), b(0.f, 0.4f);
-    Point pt = (a + b)*10.f;
-    cout << pt.x << ", " << pt.y << endl;
-@endcode
-*/
-template<typename _Tp> class Point_
-{
-public:
-    typedef _Tp value_type;
-
-    //! default constructor
-    Point_();
-    Point_(_Tp _x, _Tp _y);
-#if (defined(__GNUC__) && __GNUC__ < 5) && !defined(__clang__)  // GCC 4.x bug. Details: https://github.com/opencv/opencv/pull/20837
-    Point_(const Point_& pt);
-    Point_(Point_&& pt) CV_NOEXCEPT = default;
-#elif OPENCV_ABI_COMPATIBILITY < 500
-    Point_(const Point_& pt) = default;
-    Point_(Point_&& pt) CV_NOEXCEPT = default;
-#endif
-    Point_(const Size_<_Tp>& sz);
-    Point_(const Vec<_Tp, 2>& v);
-
-#if (defined(__GNUC__) && __GNUC__ < 5) && !defined(__clang__)  // GCC 4.x bug. Details: https://github.com/opencv/opencv/pull/20837
-    Point_& operator = (const Point_& pt);
-    Point_& operator = (Point_&& pt) CV_NOEXCEPT = default;
-#elif OPENCV_ABI_COMPATIBILITY < 500
-    Point_& operator = (const Point_& pt) = default;
-    Point_& operator = (Point_&& pt) CV_NOEXCEPT = default;
-#endif
-    //! conversion to another data type
-    template<typename _Tp2> operator Point_<_Tp2>() const;
-
-    //! conversion to the old-style C structures
-    operator Vec<_Tp, 2>() const;
-
-    //! dot product
-    _Tp dot(const Point_& pt) const;
-    //! dot product computed in double-precision arithmetics
-    double ddot(const Point_& pt) const;
-    //! cross-product
-    double cross(const Point_& pt) const;
-    //! checks whether the point is inside the specified rectangle
-    bool inside(const Rect_<_Tp>& r) const;
-    _Tp x; //!< x coordinate of the point
-    _Tp y; //!< y coordinate of the point
-};
-
-typedef Point_<int> Point2i;
-typedef Point_<int64> Point2l;
-typedef Point_<float> Point2f;
-typedef Point_<double> Point2d;
-typedef Point2i Point;
-
-template<typename _Tp> class DataType< Point_<_Tp> >
-{
-public:
-    typedef Point_<_Tp>                               value_type;
-    typedef Point_<typename DataType<_Tp>::work_type> work_type;
-    typedef _Tp                                       channel_type;
-
-    enum { generic_type = 0,
-           channels     = 2,
-           fmt          = traits::SafeFmt<channel_type>::fmt + ((channels - 1) << 8)
-#ifdef OPENCV_TRAITS_ENABLE_DEPRECATED
-           ,depth        = DataType<channel_type>::depth
-           ,type         = CV_MAKETYPE(depth, channels)
-#endif
-         };
-
-    typedef Vec<channel_type, channels> vec_type;
-};
-
-namespace traits {
-template<typename _Tp>
-struct Depth< Point_<_Tp> > { enum { value = Depth<_Tp>::value }; };
-template<typename _Tp>
-struct Type< Point_<_Tp> > { enum { value = CV_MAKETYPE(Depth<_Tp>::value, 2) }; };
-} // namespace
-
-
-//////////////////////////////// Point3_ ////////////////////////////////
-
-/** @brief Template class for 3D points specified by its coordinates `x`, `y` and `z`.
-
-An instance of the class is interchangeable with the C structure CvPoint2D32f . Similarly to
-Point_ , the coordinates of 3D points can be converted to another type. The vector arithmetic and
-comparison operations are also supported.
-
-The following Point3_\<\> aliases are available:
-@code
-    typedef Point3_<int> Point3i;
-    typedef Point3_<float> Point3f;
-    typedef Point3_<double> Point3d;
-@endcode
-@see cv::Point3i, cv::Point3f and cv::Point3d
-*/
-template<typename _Tp> class Point3_
-{
-public:
-    typedef _Tp value_type;
-
-    //! default constructor
-    Point3_();
-    Point3_(_Tp _x, _Tp _y, _Tp _z);
-#if OPENCV_ABI_COMPATIBILITY < 500
-    Point3_(const Point3_& pt) = default;
-    Point3_(Point3_&& pt) CV_NOEXCEPT = default;
-#endif
-    explicit Point3_(const Point_<_Tp>& pt);
-    Point3_(const Vec<_Tp, 3>& v);
-
-#if OPENCV_ABI_COMPATIBILITY < 500
-    Point3_& operator = (const Point3_& pt) = default;
-    Point3_& operator = (Point3_&& pt) CV_NOEXCEPT = default;
-#endif
-    //! conversion to another data type
-    template<typename _Tp2> operator Point3_<_Tp2>() const;
-    //! conversion to cv::Vec<>
-    operator Vec<_Tp, 3>() const;
-
-    //! dot product
-    _Tp dot(const Point3_& pt) const;
-    //! dot product computed in double-precision arithmetics
-    double ddot(const Point3_& pt) const;
-    //! cross product of the 2 3D points
-    Point3_ cross(const Point3_& pt) const;
-    _Tp x; //!< x coordinate of the 3D point
-    _Tp y; //!< y coordinate of the 3D point
-    _Tp z; //!< z coordinate of the 3D point
-};
-
-typedef Point3_<int> Point3i;
-typedef Point3_<float> Point3f;
-typedef Point3_<double> Point3d;
-
-template<typename _Tp> class DataType< Point3_<_Tp> >
-{
-public:
-    typedef Point3_<_Tp>                               value_type;
-    typedef Point3_<typename DataType<_Tp>::work_type> work_type;
-    typedef _Tp                                        channel_type;
-
-    enum { generic_type = 0,
-           channels     = 3,
-           fmt          = traits::SafeFmt<channel_type>::fmt + ((channels - 1) << 8)
-#ifdef OPENCV_TRAITS_ENABLE_DEPRECATED
-           ,depth        = DataType<channel_type>::depth
-           ,type         = CV_MAKETYPE(depth, channels)
-#endif
-         };
-
-    typedef Vec<channel_type, channels> vec_type;
-};
-
-namespace traits {
-template<typename _Tp>
-struct Depth< Point3_<_Tp> > { enum { value = Depth<_Tp>::value }; };
-template<typename _Tp>
-struct Type< Point3_<_Tp> > { enum { value = CV_MAKETYPE(Depth<_Tp>::value, 3) }; };
-} // namespace
-
-//////////////////////////////// Size_ ////////////////////////////////
-
-/** @brief Template class for specifying the size of an image or rectangle.
-
-The class includes two members called width and height. The structure can be converted to and from
-the old OpenCV structures CvSize and CvSize2D32f . The same set of arithmetic and comparison
-operations as for Point_ is available.
-
-OpenCV defines the following Size_\<\> aliases:
-@code
-    typedef Size_<int> Size2i;
-    typedef Size2i Size;
-    typedef Size_<float> Size2f;
-@endcode
-*/
-template<typename _Tp> class Size_
-{
-public:
-    typedef _Tp value_type;
-
-    //! default constructor
-    Size_();
-    Size_(_Tp _width, _Tp _height);
-#if OPENCV_ABI_COMPATIBILITY < 500
-    Size_(const Size_& sz) = default;
-    Size_(Size_&& sz) CV_NOEXCEPT = default;
-#endif
-    Size_(const Point_<_Tp>& pt);
-
-#if OPENCV_ABI_COMPATIBILITY < 500
-    Size_& operator = (const Size_& sz) = default;
-    Size_& operator = (Size_&& sz) CV_NOEXCEPT = default;
-#endif
-    //! the area (width*height)
-    _Tp area() const;
-    //! aspect ratio (width/height)
-    double aspectRatio() const;
-    //! true if empty
-    bool empty() const;
-
-    //! conversion of another data type.
-    template<typename _Tp2> operator Size_<_Tp2>() const;
-
-    _Tp width; //!< the width
-    _Tp height; //!< the height
-};
-
-typedef Size_<int> Size2i;
-typedef Size_<int64> Size2l;
-typedef Size_<float> Size2f;
-typedef Size_<double> Size2d;
-typedef Size2i Size;
-
-template<typename _Tp> class DataType< Size_<_Tp> >
-{
-public:
-    typedef Size_<_Tp>                               value_type;
-    typedef Size_<typename DataType<_Tp>::work_type> work_type;
-    typedef _Tp                                      channel_type;
-
-    enum { generic_type = 0,
-           channels     = 2,
-           fmt          = DataType<channel_type>::fmt + ((channels - 1) << 8)
-#ifdef OPENCV_TRAITS_ENABLE_DEPRECATED
-           ,depth        = DataType<channel_type>::depth
-           ,type         = CV_MAKETYPE(depth, channels)
-#endif
-         };
-
-    typedef Vec<channel_type, channels> vec_type;
-};
-
-namespace traits {
-template<typename _Tp>
-struct Depth< Size_<_Tp> > { enum { value = Depth<_Tp>::value }; };
-template<typename _Tp>
-struct Type< Size_<_Tp> > { enum { value = CV_MAKETYPE(Depth<_Tp>::value, 2) }; };
-} // namespace
-
-//////////////////////////////// Rect_ ////////////////////////////////
-
-/** @brief Template class for 2D rectangles
-
-described by the following parameters:
--   Coordinates of the top-left corner. This is a default interpretation of Rect_::x and Rect_::y
-    in OpenCV. Though, in your algorithms you may count x and y from the bottom-left corner.
--   Rectangle width and height.
-
-OpenCV typically assumes that the top and left boundary of the rectangle are inclusive, while the
-right and bottom boundaries are not. For example, the method Rect_::contains returns true if
-
-\f[x  \leq pt.x < x+width,
-      y  \leq pt.y < y+height\f]
-
-Virtually every loop over an image ROI in OpenCV (where ROI is specified by Rect_\<int\> ) is
-implemented as:
-@code
-    for(int y = roi.y; y < roi.y + roi.height; y++)
-        for(int x = roi.x; x < roi.x + roi.width; x++)
-        {
-            // ...
-        }
-@endcode
-In addition to the class members, the following operations on rectangles are implemented:
--   \f$\texttt{rect} = \texttt{rect} \pm \texttt{point}\f$ (shifting a rectangle by a certain offset)
--   \f$\texttt{rect} = \texttt{rect} \pm \texttt{size}\f$ (expanding or shrinking a rectangle by a
-    certain amount)
--   rect += point, rect -= point, rect += size, rect -= size (augmenting operations)
--   rect = rect1 & rect2 (rectangle intersection)
--   rect = rect1 | rect2 (minimum area rectangle containing rect1 and rect2 )
--   rect &= rect1, rect |= rect1 (and the corresponding augmenting operations)
--   rect == rect1, rect != rect1 (rectangle comparison)
-
-This is an example how the partial ordering on rectangles can be established (rect1 \f$\subseteq\f$
-rect2):
-@code
-    template<typename _Tp> inline bool
-    operator <= (const Rect_<_Tp>& r1, const Rect_<_Tp>& r2)
-    {
-        return (r1 & r2) == r1;
-    }
-@endcode
-For your convenience, the Rect_\<\> alias is available: cv::Rect
-*/
-template<typename _Tp> class Rect_
-{
-public:
-    typedef _Tp value_type;
-
-    //! default constructor
-    Rect_();
-    Rect_(_Tp _x, _Tp _y, _Tp _width, _Tp _height);
-#if OPENCV_ABI_COMPATIBILITY < 500
-    Rect_(const Rect_& r) = default;
-    Rect_(Rect_&& r) CV_NOEXCEPT = default;
-#endif
-    Rect_(const Point_<_Tp>& org, const Size_<_Tp>& sz);
-    Rect_(const Point_<_Tp>& pt1, const Point_<_Tp>& pt2);
-
-#if OPENCV_ABI_COMPATIBILITY < 500
-    Rect_& operator = (const Rect_& r) = default;
-    Rect_& operator = (Rect_&& r) CV_NOEXCEPT = default;
-#endif
-    //! the top-left corner
-    Point_<_Tp> tl() const;
-    //! the bottom-right corner
-    Point_<_Tp> br() const;
-
-    //! size (width, height) of the rectangle
-    Size_<_Tp> size() const;
-    //! area (width*height) of the rectangle
-    _Tp area() const;
-    //! true if empty
-    bool empty() const;
-
-    //! conversion to another data type
-    template<typename _Tp2> operator Rect_<_Tp2>() const;
-
-    //! checks whether the rectangle contains the point
-    bool contains(const Point_<_Tp>& pt) const;
-
-    _Tp x; //!< x coordinate of the top-left corner
-    _Tp y; //!< y coordinate of the top-left corner
-    _Tp width; //!< width of the rectangle
-    _Tp height; //!< height of the rectangle
-};
-
-typedef Rect_<int> Rect2i;
-typedef Rect_<float> Rect2f;
-typedef Rect_<double> Rect2d;
-typedef Rect2i Rect;
-
-template<typename _Tp> class DataType< Rect_<_Tp> >
-{
-public:
-    typedef Rect_<_Tp>                               value_type;
-    typedef Rect_<typename DataType<_Tp>::work_type> work_type;
-    typedef _Tp                                      channel_type;
-
-    enum { generic_type = 0,
-           channels     = 4,
-           fmt          = traits::SafeFmt<channel_type>::fmt + ((channels - 1) << 8)
-#ifdef OPENCV_TRAITS_ENABLE_DEPRECATED
-           ,depth        = DataType<channel_type>::depth
-           ,type         = CV_MAKETYPE(depth, channels)
-#endif
-         };
-
-    typedef Vec<channel_type, channels> vec_type;
-};
-
-namespace traits {
-template<typename _Tp>
-struct Depth< Rect_<_Tp> > { enum { value = Depth<_Tp>::value }; };
-template<typename _Tp>
-struct Type< Rect_<_Tp> > { enum { value = CV_MAKETYPE(Depth<_Tp>::value, 4) }; };
-} // namespace
-
-///////////////////////////// RotatedRect /////////////////////////////
-
-/** @brief The class represents rotated (i.e. not up-right) rectangles on a plane.
-
-Each rectangle is specified by the center point (mass center), length of each side (represented by
-#Size2f structure) and the rotation angle in degrees.
-
-The sample below demonstrates how to use RotatedRect:
-@snippet snippets/core_various.cpp RotatedRect_demo
-![image](pics/rotatedrect.png)
-
-@sa CamShift, fitEllipse, minAreaRect, CvBox2D
-*/
-class CV_EXPORTS RotatedRect
-{
-public:
-    //! default constructor
-    RotatedRect();
-    /** full constructor
-    @param center The rectangle mass center.
-    @param size Width and height of the rectangle.
-    @param angle The rotation angle in a clockwise direction. When the angle is 0, 90, 180, 270 etc.,
-    the rectangle becomes an up-right rectangle.
-    */
-    RotatedRect(const Point2f& center, const Size2f& size, float angle);
-    /**
-    Any 3 end points of the RotatedRect. They must be given in order (either clockwise or
-    anticlockwise).
-     */
-    RotatedRect(const Point2f& point1, const Point2f& point2, const Point2f& point3);
-
-    /** returns 4 vertices of the rectangle
-    @param pts The points array for storing rectangle vertices. The order is bottomLeft, topLeft, topRight, bottomRight.
-    */
-    void points(Point2f pts[]) const;
-    //! returns the minimal up-right integer rectangle containing the rotated rectangle
-    Rect boundingRect() const;
-    //! returns the minimal (exact) floating point rectangle containing the rotated rectangle, not intended for use with images
-    Rect_<float> boundingRect2f() const;
-    //! returns the rectangle mass center
-    Point2f center;
-    //! returns width and height of the rectangle
-    Size2f size;
-    //! returns the rotation angle. When the angle is 0, 90, 180, 270 etc., the rectangle becomes an up-right rectangle.
-    float angle;
-};
-
-template<> class DataType< RotatedRect >
-{
-public:
-    typedef RotatedRect  value_type;
-    typedef value_type   work_type;
-    typedef float        channel_type;
-
-    enum { generic_type = 0,
-           channels     = (int)sizeof(value_type)/sizeof(channel_type), // 5
-           fmt          = traits::SafeFmt<channel_type>::fmt + ((channels - 1) << 8)
-#ifdef OPENCV_TRAITS_ENABLE_DEPRECATED
-           ,depth        = DataType<channel_type>::depth
-           ,type         = CV_MAKETYPE(depth, channels)
-#endif
-         };
-
-    typedef Vec<channel_type, channels> vec_type;
-};
-
-namespace traits {
-template<>
-struct Depth< RotatedRect > { enum { value = Depth<float>::value }; };
-template<>
-struct Type< RotatedRect > { enum { value = CV_MAKETYPE(Depth<float>::value, (int)sizeof(RotatedRect)/sizeof(float)) }; };
-} // namespace
-
-
-//////////////////////////////// Range /////////////////////////////////
-
-/** @brief Template class specifying a continuous subsequence (slice) of a sequence.
-
-The class is used to specify a row or a column span in a matrix ( Mat ) and for many other purposes.
-Range(a,b) is basically the same as a:b in Matlab or a..b in Python. As in Python, start is an
-inclusive left boundary of the range and end is an exclusive right boundary of the range. Such a
-half-opened interval is usually denoted as \f$[start,end)\f$ .
-
-The static method Range::all() returns a special variable that means "the whole sequence" or "the
-whole range", just like " : " in Matlab or " ... " in Python. All the methods and functions in
-OpenCV that take Range support this special Range::all() value. But, of course, in case of your own
-custom processing, you will probably have to check and handle it explicitly:
-@code
-    void my_function(..., const Range& r, ....)
-    {
-        if(r == Range::all()) {
-            // process all the data
-        }
-        else {
-            // process [r.start, r.end)
-        }
-    }
-@endcode
-*/
-class CV_EXPORTS Range
-{
-public:
-    Range();
-    Range(int _start, int _end);
-    int size() const;
-    bool empty() const;
-    static Range all();
-
-    int start, end;
-};
-
-template<> class DataType<Range>
-{
-public:
-    typedef Range      value_type;
-    typedef value_type work_type;
-    typedef int        channel_type;
-
-    enum { generic_type = 0,
-           channels     = 2,
-           fmt          = traits::SafeFmt<channel_type>::fmt + ((channels - 1) << 8)
-#ifdef OPENCV_TRAITS_ENABLE_DEPRECATED
-           ,depth        = DataType<channel_type>::depth
-           ,type         = CV_MAKETYPE(depth, channels)
-#endif
-         };
-
-    typedef Vec<channel_type, channels> vec_type;
-};
-
-namespace traits {
-template<>
-struct Depth< Range > { enum { value = Depth<int>::value }; };
-template<>
-struct Type< Range > { enum { value = CV_MAKETYPE(Depth<int>::value, 2) }; };
-} // namespace
-
-
-//////////////////////////////// Scalar_ ///////////////////////////////
-
-/** @brief Template class for a 4-element vector derived from Vec.
-
-Being derived from Vec\<_Tp, 4\> , Scalar\_ and Scalar can be used just as typical 4-element
-vectors. In addition, they can be converted to/from CvScalar . The type Scalar is widely used in
-OpenCV to pass pixel values.
-*/
-template<typename _Tp> class Scalar_ : public Vec<_Tp, 4>
-{
-public:
-    //! default constructor
-    Scalar_();
-    Scalar_(_Tp v0, _Tp v1, _Tp v2=0, _Tp v3=0);
-    Scalar_(_Tp v0);
-
-    Scalar_(const Scalar_& s);
-    Scalar_(Scalar_&& s) CV_NOEXCEPT;
-
-    Scalar_& operator=(const Scalar_& s);
-    Scalar_& operator=(Scalar_&& s) CV_NOEXCEPT;
-
-    template<typename _Tp2, int cn>
-    Scalar_(const Vec<_Tp2, cn>& v);
-
-    //! returns a scalar with all elements set to v0
-    static Scalar_<_Tp> all(_Tp v0);
-
-    //! conversion to another data type
-    template<typename T2> operator Scalar_<T2>() const;
-
-    //! per-element product
-    Scalar_<_Tp> mul(const Scalar_<_Tp>& a, double scale=1 ) const;
-
-    //! returns (v0, -v1, -v2, -v3)
-    Scalar_<_Tp> conj() const;
-
-    //! returns true iff v1 == v2 == v3 == 0
-    bool isReal() const;
-};
-
-typedef Scalar_<double> Scalar;
-
-template<typename _Tp> class DataType< Scalar_<_Tp> >
-{
-public:
-    typedef Scalar_<_Tp>                               value_type;
-    typedef Scalar_<typename DataType<_Tp>::work_type> work_type;
-    typedef _Tp                                        channel_type;
-
-    enum { generic_type = 0,
-           channels     = 4,
-           fmt          = traits::SafeFmt<channel_type>::fmt + ((channels - 1) << 8)
-#ifdef OPENCV_TRAITS_ENABLE_DEPRECATED
-           ,depth        = DataType<channel_type>::depth
-           ,type         = CV_MAKETYPE(depth, channels)
-#endif
-         };
-
-    typedef Vec<channel_type, channels> vec_type;
-};
-
-namespace traits {
-template<typename _Tp>
-struct Depth< Scalar_<_Tp> > { enum { value = Depth<_Tp>::value }; };
-template<typename _Tp>
-struct Type< Scalar_<_Tp> > { enum { value = CV_MAKETYPE(Depth<_Tp>::value, 4) }; };
-} // namespace
-
-
-/////////////////////////////// KeyPoint ////////////////////////////////
-
-/** @brief Data structure for salient point detectors.
-
-The class instance stores a keypoint, i.e. a point feature found by one of many available keypoint
-detectors, such as Harris corner detector, #FAST, %StarDetector, %SURF, %SIFT etc.
-
-The keypoint is characterized by the 2D position, scale (proportional to the diameter of the
-neighborhood that needs to be taken into account), orientation and some other parameters. The
-keypoint neighborhood is then analyzed by another algorithm that builds a descriptor (usually
-represented as a feature vector). The keypoints representing the same object in different images
-can then be matched using %KDTree or another method.
-*/
-class CV_EXPORTS_W_SIMPLE KeyPoint
-{
-public:
-    //! the default constructor
-    CV_WRAP KeyPoint();
-    /**
-    @param pt x & y coordinates of the keypoint
-    @param size keypoint diameter
-    @param angle keypoint orientation
-    @param response keypoint detector response on the keypoint (that is, strength of the keypoint)
-    @param octave pyramid octave in which the keypoint has been detected
-    @param class_id object id
-     */
-    KeyPoint(Point2f pt, float size, float angle=-1, float response=0, int octave=0, int class_id=-1);
-    /**
-    @param x x-coordinate of the keypoint
-    @param y y-coordinate of the keypoint
-    @param size keypoint diameter
-    @param angle keypoint orientation
-    @param response keypoint detector response on the keypoint (that is, strength of the keypoint)
-    @param octave pyramid octave in which the keypoint has been detected
-    @param class_id object id
-     */
-    CV_WRAP KeyPoint(float x, float y, float size, float angle=-1, float response=0, int octave=0, int class_id=-1);
-
-    size_t hash() const;
-
-    /**
-    This method converts vector of keypoints to vector of points or the reverse, where each keypoint is
-    assigned the same size and the same orientation.
-
-    @param keypoints Keypoints obtained from any feature detection algorithm like SIFT/SURF/ORB
-    @param points2f Array of (x,y) coordinates of each keypoint
-    @param keypointIndexes Array of indexes of keypoints to be converted to points. (Acts like a mask to
-    convert only specified keypoints)
-    */
-    CV_WRAP static void convert(const std::vector<KeyPoint>& keypoints,
-                                CV_OUT std::vector<Point2f>& points2f,
-                                const std::vector<int>& keypointIndexes=std::vector<int>());
-    /** @overload
-    @param points2f Array of (x,y) coordinates of each keypoint
-    @param keypoints Keypoints obtained from any feature detection algorithm like SIFT/SURF/ORB
-    @param size keypoint diameter
-    @param response keypoint detector response on the keypoint (that is, strength of the keypoint)
-    @param octave pyramid octave in which the keypoint has been detected
-    @param class_id object id
-    */
-    CV_WRAP static void convert(const std::vector<Point2f>& points2f,
-                                CV_OUT std::vector<KeyPoint>& keypoints,
-                                float size=1, float response=1, int octave=0, int class_id=-1);
-
-    /**
-    This method computes overlap for pair of keypoints. Overlap is the ratio between area of keypoint
-    regions' intersection and area of keypoint regions' union (considering keypoint region as circle).
-    If they don't overlap, we get zero. If they coincide at same location with same size, we get 1.
-    @param kp1 First keypoint
-    @param kp2 Second keypoint
-    */
-    CV_WRAP static float overlap(const KeyPoint& kp1, const KeyPoint& kp2);
-
-    CV_PROP_RW Point2f pt; //!< coordinates of the keypoints
-    CV_PROP_RW float size; //!< diameter of the meaningful keypoint neighborhood
-    CV_PROP_RW float angle; //!< computed orientation of the keypoint (-1 if not applicable);
-                            //!< it's in [0,360) degrees and measured relative to
-                            //!< image coordinate system, ie in clockwise.
-    CV_PROP_RW float response; //!< the response by which the most strong keypoints have been selected. Can be used for the further sorting or subsampling
-    CV_PROP_RW int octave; //!< octave (pyramid layer) from which the keypoint has been extracted
-    CV_PROP_RW int class_id; //!< object class (if the keypoints need to be clustered by an object they belong to)
-};
-
-#ifdef OPENCV_TRAITS_ENABLE_DEPRECATED
-template<> class DataType<KeyPoint>
-{
-public:
-    typedef KeyPoint      value_type;
-    typedef float         work_type;
-    typedef float         channel_type;
-
-    enum { generic_type = 0,
-           depth        = DataType<channel_type>::depth,
-           channels     = (int)(sizeof(value_type)/sizeof(channel_type)), // 7
-           fmt          = DataType<channel_type>::fmt + ((channels - 1) << 8),
-           type         = CV_MAKETYPE(depth, channels)
-         };
-
-    typedef Vec<channel_type, channels> vec_type;
-};
-#endif
-
-
-//////////////////////////////// DMatch /////////////////////////////////
-
-/** @brief Class for matching keypoint descriptors
-
-query descriptor index, train descriptor index, train image index, and distance between
-descriptors.
-*/
-class CV_EXPORTS_W_SIMPLE DMatch
-{
-public:
-    CV_WRAP DMatch();
-    CV_WRAP DMatch(int _queryIdx, int _trainIdx, float _distance);
-    CV_WRAP DMatch(int _queryIdx, int _trainIdx, int _imgIdx, float _distance);
-
-    CV_PROP_RW int queryIdx; //!< query descriptor index
-    CV_PROP_RW int trainIdx; //!< train descriptor index
-    CV_PROP_RW int imgIdx;   //!< train image index
-
-    CV_PROP_RW float distance;
-
-    // less is better
-    bool operator<(const DMatch &m) const;
-};
-
-#ifdef OPENCV_TRAITS_ENABLE_DEPRECATED
-template<> class DataType<DMatch>
-{
-public:
-    typedef DMatch      value_type;
-    typedef int         work_type;
-    typedef int         channel_type;
-
-    enum { generic_type = 0,
-           depth        = DataType<channel_type>::depth,
-           channels     = (int)(sizeof(value_type)/sizeof(channel_type)), // 4
-           fmt          = DataType<channel_type>::fmt + ((channels - 1) << 8),
-           type         = CV_MAKETYPE(depth, channels)
-         };
-
-    typedef Vec<channel_type, channels> vec_type;
-};
-#endif
-
-
-///////////////////////////// TermCriteria //////////////////////////////
-
-/** @brief The class defining termination criteria for iterative algorithms.
-
-You can initialize it by default constructor and then override any parameters, or the structure may
-be fully initialized using the advanced variant of the constructor.
-*/
-class CV_EXPORTS TermCriteria
-{
-public:
-    /**
-      Criteria type, can be one of: COUNT, EPS or COUNT + EPS
-    */
-    enum Type
-    {
-        COUNT=1, //!< the maximum number of iterations or elements to compute
-        MAX_ITER=COUNT, //!< ditto
-        EPS=2 //!< the desired accuracy or change in parameters at which the iterative algorithm stops
-    };
-
-    //! default constructor
-    TermCriteria();
-    /**
-    @param type The type of termination criteria, one of TermCriteria::Type
-    @param maxCount The maximum number of iterations or elements to compute.
-    @param epsilon The desired accuracy or change in parameters at which the iterative algorithm stops.
-    */
-    TermCriteria(int type, int maxCount, double epsilon);
-
-    inline bool isValid() const
-    {
-        const bool isCount = (type & COUNT) && maxCount > 0;
-        const bool isEps = (type & EPS) && !cvIsNaN(epsilon);
-        return isCount || isEps;
-    }
-
-    int type; //!< the type of termination criteria: COUNT, EPS or COUNT + EPS
-    int maxCount; //!< the maximum number of iterations/elements
-    double epsilon; //!< the desired accuracy
-};
-
-
-//! @} core_basic
-
-///////////////////////// raster image moments //////////////////////////
-
-//! @addtogroup imgproc_shape
-//! @{
-
-/** @brief struct returned by cv::moments
-
-The spatial moments \f$\texttt{Moments::m}_{ji}\f$ are computed as:
-
-\f[\texttt{m} _{ji}= \sum _{x,y}  \left ( \texttt{array} (x,y)  \cdot x^j  \cdot y^i \right )\f]
-
-The central moments \f$\texttt{Moments::mu}_{ji}\f$ are computed as:
-
-\f[\texttt{mu} _{ji}= \sum _{x,y}  \left ( \texttt{array} (x,y)  \cdot (x -  \bar{x} )^j  \cdot (y -  \bar{y} )^i \right )\f]
-
-where \f$(\bar{x}, \bar{y})\f$ is the mass center:
-
-\f[\bar{x} = \frac{\texttt{m}_{10}}{\texttt{m}_{00}} , \; \bar{y} = \frac{\texttt{m}_{01}}{\texttt{m}_{00}}\f]
-
-The normalized central moments \f$\texttt{Moments::nu}_{ij}\f$ are computed as:
-
-\f[\texttt{nu} _{ji}= \frac{\texttt{mu}_{ji}}{\texttt{m}_{00}^{(i+j)/2+1}} .\f]
-
-@note
-\f$\texttt{mu}_{00}=\texttt{m}_{00}\f$, \f$\texttt{nu}_{00}=1\f$
-\f$\texttt{nu}_{10}=\texttt{mu}_{10}=\texttt{mu}_{01}=\texttt{mu}_{10}=0\f$ , hence the values are not
-stored.
-
-The moments of a contour are defined in the same way but computed using the Green's formula (see
-<http://en.wikipedia.org/wiki/Green_theorem>). So, due to a limited raster resolution, the moments
-computed for a contour are slightly different from the moments computed for the same rasterized
-contour.
-
-@note
-Since the contour moments are computed using Green formula, you may get seemingly odd results for
-contours with self-intersections, e.g. a zero area (m00) for butterfly-shaped contours.
- */
-class CV_EXPORTS_W_MAP Moments
-{
-public:
-    //! the default constructor
-    Moments();
-    //! the full constructor
-    Moments(double m00, double m10, double m01, double m20, double m11,
-            double m02, double m30, double m21, double m12, double m03 );
-    ////! the conversion from CvMoments
-    //Moments( const CvMoments& moments );
-    ////! the conversion to CvMoments
-    //operator CvMoments() const;
-
-    //! @name spatial moments
-    //! @{
-    CV_PROP_RW double  m00, m10, m01, m20, m11, m02, m30, m21, m12, m03;
-    //! @}
-
-    //! @name central moments
-    //! @{
-    CV_PROP_RW double  mu20, mu11, mu02, mu30, mu21, mu12, mu03;
-    //! @}
-
-    //! @name central normalized moments
-    //! @{
-    CV_PROP_RW double  nu20, nu11, nu02, nu30, nu21, nu12, nu03;
-    //! @}
-};
-
-template<> class DataType<Moments>
-{
-public:
-    typedef Moments     value_type;
-    typedef double      work_type;
-    typedef double      channel_type;
-
-    enum { generic_type = 0,
-           channels     = (int)(sizeof(value_type)/sizeof(channel_type)), // 24
-           fmt          = DataType<channel_type>::fmt + ((channels - 1) << 8)
-#ifdef OPENCV_TRAITS_ENABLE_DEPRECATED
-           ,depth        = DataType<channel_type>::depth
-           ,type         = CV_MAKETYPE(depth, channels)
-#endif
-         };
-
-    typedef Vec<channel_type, channels> vec_type;
-};
-
-namespace traits {
-template<>
-struct Depth< Moments > { enum { value = Depth<double>::value }; };
-template<>
-struct Type< Moments > { enum { value = CV_MAKETYPE(Depth<double>::value, (int)(sizeof(Moments)/sizeof(double))) }; };
-} // namespace
-
-//! @} imgproc_shape
-
-//! @cond IGNORED
-
-/////////////////////////////////////////////////////////////////////////
-///////////////////////////// Implementation ////////////////////////////
-/////////////////////////////////////////////////////////////////////////
-
-//////////////////////////////// Complex ////////////////////////////////
-
-template<typename _Tp> inline
-Complex<_Tp>::Complex()
-    : re(0), im(0) {}
-
-template<typename _Tp> inline
-Complex<_Tp>::Complex( _Tp _re, _Tp _im )
-    : re(_re), im(_im) {}
-
-template<typename _Tp> template<typename T2> inline
-Complex<_Tp>::operator Complex<T2>() const
-{
-    return Complex<T2>(saturate_cast<T2>(re), saturate_cast<T2>(im));
-}
-
-template<typename _Tp> inline
-Complex<_Tp> Complex<_Tp>::conj() const
-{
-    return Complex<_Tp>(re, -im);
-}
-
-
-template<typename _Tp> static inline
-bool operator == (const Complex<_Tp>& a, const Complex<_Tp>& b)
-{
-    return a.re == b.re && a.im == b.im;
-}
-
-template<typename _Tp> static inline
-bool operator != (const Complex<_Tp>& a, const Complex<_Tp>& b)
-{
-    return a.re != b.re || a.im != b.im;
-}
-
-template<typename _Tp> static inline
-Complex<_Tp> operator + (const Complex<_Tp>& a, const Complex<_Tp>& b)
-{
-    return Complex<_Tp>( a.re + b.re, a.im + b.im );
-}
-
-template<typename _Tp> static inline
-Complex<_Tp>& operator += (Complex<_Tp>& a, const Complex<_Tp>& b)
-{
-    a.re += b.re; a.im += b.im;
-    return a;
-}
-
-template<typename _Tp> static inline
-Complex<_Tp> operator - (const Complex<_Tp>& a, const Complex<_Tp>& b)
-{
-    return Complex<_Tp>( a.re - b.re, a.im - b.im );
-}
-
-template<typename _Tp> static inline
-Complex<_Tp>& operator -= (Complex<_Tp>& a, const Complex<_Tp>& b)
-{
-    a.re -= b.re; a.im -= b.im;
-    return a;
-}
-
-template<typename _Tp> static inline
-Complex<_Tp> operator - (const Complex<_Tp>& a)
-{
-    return Complex<_Tp>(-a.re, -a.im);
-}
-
-template<typename _Tp> static inline
-Complex<_Tp> operator * (const Complex<_Tp>& a, const Complex<_Tp>& b)
-{
-    return Complex<_Tp>( a.re*b.re - a.im*b.im, a.re*b.im + a.im*b.re );
-}
-
-template<typename _Tp> static inline
-Complex<_Tp> operator * (const Complex<_Tp>& a, _Tp b)
-{
-    return Complex<_Tp>( a.re*b, a.im*b );
-}
-
-template<typename _Tp> static inline
-Complex<_Tp> operator * (_Tp b, const Complex<_Tp>& a)
-{
-    return Complex<_Tp>( a.re*b, a.im*b );
-}
-
-template<typename _Tp> static inline
-Complex<_Tp> operator + (const Complex<_Tp>& a, _Tp b)
-{
-    return Complex<_Tp>( a.re + b, a.im );
-}
-
-template<typename _Tp> static inline
-Complex<_Tp> operator - (const Complex<_Tp>& a, _Tp b)
-{ return Complex<_Tp>( a.re - b, a.im ); }
-
-template<typename _Tp> static inline
-Complex<_Tp> operator + (_Tp b, const Complex<_Tp>& a)
-{
-    return Complex<_Tp>( a.re + b, a.im );
-}
-
-template<typename _Tp> static inline
-Complex<_Tp> operator - (_Tp b, const Complex<_Tp>& a)
-{
-    return Complex<_Tp>( b - a.re, -a.im );
-}
-
-template<typename _Tp> static inline
-Complex<_Tp>& operator += (Complex<_Tp>& a, _Tp b)
-{
-    a.re += b; return a;
-}
-
-template<typename _Tp> static inline
-Complex<_Tp>& operator -= (Complex<_Tp>& a, _Tp b)
-{
-    a.re -= b; return a;
-}
-
-template<typename _Tp> static inline
-Complex<_Tp>& operator *= (Complex<_Tp>& a, _Tp b)
-{
-    a.re *= b; a.im *= b; return a;
-}
-
-template<typename _Tp> static inline
-double abs(const Complex<_Tp>& a)
-{
-    return std::sqrt( (double)a.re*a.re + (double)a.im*a.im);
-}
-
-template<typename _Tp> static inline
-Complex<_Tp> operator / (const Complex<_Tp>& a, const Complex<_Tp>& b)
-{
-    double t = 1./((double)b.re*b.re + (double)b.im*b.im);
-    return Complex<_Tp>( (_Tp)((a.re*b.re + a.im*b.im)*t),
-                        (_Tp)((-a.re*b.im + a.im*b.re)*t) );
-}
-
-template<typename _Tp> static inline
-Complex<_Tp>& operator /= (Complex<_Tp>& a, const Complex<_Tp>& b)
-{
-    a = a / b;
-    return a;
-}
-
-template<typename _Tp> static inline
-Complex<_Tp> operator / (const Complex<_Tp>& a, _Tp b)
-{
-    _Tp t = (_Tp)1/b;
-    return Complex<_Tp>( a.re*t, a.im*t );
-}
-
-template<typename _Tp> static inline
-Complex<_Tp> operator / (_Tp b, const Complex<_Tp>& a)
-{
-    return Complex<_Tp>(b)/a;
-}
-
-template<typename _Tp> static inline
-Complex<_Tp> operator /= (const Complex<_Tp>& a, _Tp b)
-{
-    _Tp t = (_Tp)1/b;
-    a.re *= t; a.im *= t; return a;
-}
-
-
-
-//////////////////////////////// 2D Point ///////////////////////////////
-
-template<typename _Tp> inline
-Point_<_Tp>::Point_()
-    : x(0), y(0) {}
-
-template<typename _Tp> inline
-Point_<_Tp>::Point_(_Tp _x, _Tp _y)
-    : x(_x), y(_y) {}
-
-#if (defined(__GNUC__) && __GNUC__ < 5) && !defined(__clang__)  // GCC 4.x bug. Details: https://github.com/opencv/opencv/pull/20837
-template<typename _Tp> inline
-Point_<_Tp>::Point_(const Point_& pt)
-    : x(pt.x), y(pt.y) {}
-#endif
-
-template<typename _Tp> inline
-Point_<_Tp>::Point_(const Size_<_Tp>& sz)
-    : x(sz.width), y(sz.height) {}
-
-template<typename _Tp> inline
-Point_<_Tp>::Point_(const Vec<_Tp,2>& v)
-    : x(v[0]), y(v[1]) {}
-
-#if (defined(__GNUC__) && __GNUC__ < 5) && !defined(__clang__)  // GCC 4.x bug. Details: https://github.com/opencv/opencv/pull/20837
-template<typename _Tp> inline
-Point_<_Tp>& Point_<_Tp>::operator = (const Point_& pt)
-{
-    x = pt.x; y = pt.y;
-    return *this;
-}
-#endif
-
-template<typename _Tp> template<typename _Tp2> inline
-Point_<_Tp>::operator Point_<_Tp2>() const
-{
-    return Point_<_Tp2>(saturate_cast<_Tp2>(x), saturate_cast<_Tp2>(y));
-}
-
-template<typename _Tp> inline
-Point_<_Tp>::operator Vec<_Tp, 2>() const
-{
-    return Vec<_Tp, 2>(x, y);
-}
-
-template<typename _Tp> inline
-_Tp Point_<_Tp>::dot(const Point_& pt) const
-{
-    return saturate_cast<_Tp>(x*pt.x + y*pt.y);
-}
-
-template<typename _Tp> inline
-double Point_<_Tp>::ddot(const Point_& pt) const
-{
-    return (double)x*(double)(pt.x) + (double)y*(double)(pt.y);
-}
-
-template<typename _Tp> inline
-double Point_<_Tp>::cross(const Point_& pt) const
-{
-    return (double)x*pt.y - (double)y*pt.x;
-}
-
-template<typename _Tp> inline bool
-Point_<_Tp>::inside( const Rect_<_Tp>& r ) const
-{
-    return r.contains(*this);
-}
-
-
-template<typename _Tp> static inline
-Point_<_Tp>& operator += (Point_<_Tp>& a, const Point_<_Tp>& b)
-{
-    a.x += b.x;
-    a.y += b.y;
-    return a;
-}
-
-template<typename _Tp> static inline
-Point_<_Tp>& operator -= (Point_<_Tp>& a, const Point_<_Tp>& b)
-{
-    a.x -= b.x;
-    a.y -= b.y;
-    return a;
-}
-
-template<typename _Tp> static inline
-Point_<_Tp>& operator *= (Point_<_Tp>& a, int b)
-{
-    a.x = saturate_cast<_Tp>(a.x * b);
-    a.y = saturate_cast<_Tp>(a.y * b);
-    return a;
-}
-
-template<typename _Tp> static inline
-Point_<_Tp>& operator *= (Point_<_Tp>& a, float b)
-{
-    a.x = saturate_cast<_Tp>(a.x * b);
-    a.y = saturate_cast<_Tp>(a.y * b);
-    return a;
-}
-
-template<typename _Tp> static inline
-Point_<_Tp>& operator *= (Point_<_Tp>& a, double b)
-{
-    a.x = saturate_cast<_Tp>(a.x * b);
-    a.y = saturate_cast<_Tp>(a.y * b);
-    return a;
-}
-
-template<typename _Tp> static inline
-Point_<_Tp>& operator /= (Point_<_Tp>& a, int b)
-{
-    a.x = saturate_cast<_Tp>(a.x / b);
-    a.y = saturate_cast<_Tp>(a.y / b);
-    return a;
-}
-
-template<typename _Tp> static inline
-Point_<_Tp>& operator /= (Point_<_Tp>& a, float b)
-{
-    a.x = saturate_cast<_Tp>(a.x / b);
-    a.y = saturate_cast<_Tp>(a.y / b);
-    return a;
-}
-
-template<typename _Tp> static inline
-Point_<_Tp>& operator /= (Point_<_Tp>& a, double b)
-{
-    a.x = saturate_cast<_Tp>(a.x / b);
-    a.y = saturate_cast<_Tp>(a.y / b);
-    return a;
-}
-
-template<typename _Tp> static inline
-double norm(const Point_<_Tp>& pt)
-{
-    return std::sqrt((double)pt.x*pt.x + (double)pt.y*pt.y);
-}
-
-template<typename _Tp> static inline
-bool operator == (const Point_<_Tp>& a, const Point_<_Tp>& b)
-{
-    return a.x == b.x && a.y == b.y;
-}
-
-template<typename _Tp> static inline
-bool operator != (const Point_<_Tp>& a, const Point_<_Tp>& b)
-{
-    return a.x != b.x || a.y != b.y;
-}
-
-template<typename _Tp> static inline
-Point_<_Tp> operator + (const Point_<_Tp>& a, const Point_<_Tp>& b)
-{
-    return Point_<_Tp>( saturate_cast<_Tp>(a.x + b.x), saturate_cast<_Tp>(a.y + b.y) );
-}
-
-template<typename _Tp> static inline
-Point_<_Tp> operator - (const Point_<_Tp>& a, const Point_<_Tp>& b)
-{
-    return Point_<_Tp>( saturate_cast<_Tp>(a.x - b.x), saturate_cast<_Tp>(a.y - b.y) );
-}
-
-template<typename _Tp> static inline
-Point_<_Tp> operator - (const Point_<_Tp>& a)
-{
-    return Point_<_Tp>( saturate_cast<_Tp>(-a.x), saturate_cast<_Tp>(-a.y) );
-}
-
-template<typename _Tp> static inline
-Point_<_Tp> operator * (const Point_<_Tp>& a, int b)
-{
-    return Point_<_Tp>( saturate_cast<_Tp>(a.x*b), saturate_cast<_Tp>(a.y*b) );
-}
-
-template<typename _Tp> static inline
-Point_<_Tp> operator * (int a, const Point_<_Tp>& b)
-{
-    return Point_<_Tp>( saturate_cast<_Tp>(b.x*a), saturate_cast<_Tp>(b.y*a) );
-}
-
-template<typename _Tp> static inline
-Point_<_Tp> operator * (const Point_<_Tp>& a, float b)
-{
-    return Point_<_Tp>( saturate_cast<_Tp>(a.x*b), saturate_cast<_Tp>(a.y*b) );
-}
-
-template<typename _Tp> static inline
-Point_<_Tp> operator * (float a, const Point_<_Tp>& b)
-{
-    return Point_<_Tp>( saturate_cast<_Tp>(b.x*a), saturate_cast<_Tp>(b.y*a) );
-}
-
-template<typename _Tp> static inline
-Point_<_Tp> operator * (const Point_<_Tp>& a, double b)
-{
-    return Point_<_Tp>( saturate_cast<_Tp>(a.x*b), saturate_cast<_Tp>(a.y*b) );
-}
-
-template<typename _Tp> static inline
-Point_<_Tp> operator * (double a, const Point_<_Tp>& b)
-{
-    return Point_<_Tp>( saturate_cast<_Tp>(b.x*a), saturate_cast<_Tp>(b.y*a) );
-}
-
-template<typename _Tp> static inline
-Point_<_Tp> operator * (const Matx<_Tp, 2, 2>& a, const Point_<_Tp>& b)
-{
-    Matx<_Tp, 2, 1> tmp = a * Vec<_Tp,2>(b.x, b.y);
-    return Point_<_Tp>(tmp.val[0], tmp.val[1]);
-}
-
-template<typename _Tp> static inline
-Point3_<_Tp> operator * (const Matx<_Tp, 3, 3>& a, const Point_<_Tp>& b)
-{
-    Matx<_Tp, 3, 1> tmp = a * Vec<_Tp,3>(b.x, b.y, 1);
-    return Point3_<_Tp>(tmp.val[0], tmp.val[1], tmp.val[2]);
-}
-
-template<typename _Tp> static inline
-Point_<_Tp> operator / (const Point_<_Tp>& a, int b)
-{
-    Point_<_Tp> tmp(a);
-    tmp /= b;
-    return tmp;
-}
-
-template<typename _Tp> static inline
-Point_<_Tp> operator / (const Point_<_Tp>& a, float b)
-{
-    Point_<_Tp> tmp(a);
-    tmp /= b;
-    return tmp;
-}
-
-template<typename _Tp> static inline
-Point_<_Tp> operator / (const Point_<_Tp>& a, double b)
-{
-    Point_<_Tp> tmp(a);
-    tmp /= b;
-    return tmp;
-}
-
-
-template<typename _AccTp> static inline _AccTp normL2Sqr(const Point_<int>& pt);
-template<typename _AccTp> static inline _AccTp normL2Sqr(const Point_<int64>& pt);
-template<typename _AccTp> static inline _AccTp normL2Sqr(const Point_<float>& pt);
-template<typename _AccTp> static inline _AccTp normL2Sqr(const Point_<double>& pt);
-
-template<> inline int normL2Sqr<int>(const Point_<int>& pt) { return pt.dot(pt); }
-template<> inline int64 normL2Sqr<int64>(const Point_<int64>& pt) { return pt.dot(pt); }
-template<> inline float normL2Sqr<float>(const Point_<float>& pt) { return pt.dot(pt); }
-template<> inline double normL2Sqr<double>(const Point_<int>& pt) { return pt.dot(pt); }
-
-template<> inline double normL2Sqr<double>(const Point_<float>& pt) { return pt.ddot(pt); }
-template<> inline double normL2Sqr<double>(const Point_<double>& pt) { return pt.ddot(pt); }
-
-
-
-//////////////////////////////// 3D Point ///////////////////////////////
-
-template<typename _Tp> inline
-Point3_<_Tp>::Point3_()
-    : x(0), y(0), z(0) {}
-
-template<typename _Tp> inline
-Point3_<_Tp>::Point3_(_Tp _x, _Tp _y, _Tp _z)
-    : x(_x), y(_y), z(_z) {}
-
-template<typename _Tp> inline
-Point3_<_Tp>::Point3_(const Point_<_Tp>& pt)
-    : x(pt.x), y(pt.y), z(_Tp()) {}
-
-template<typename _Tp> inline
-Point3_<_Tp>::Point3_(const Vec<_Tp, 3>& v)
-    : x(v[0]), y(v[1]), z(v[2]) {}
-
-template<typename _Tp> template<typename _Tp2> inline
-Point3_<_Tp>::operator Point3_<_Tp2>() const
-{
-    return Point3_<_Tp2>(saturate_cast<_Tp2>(x), saturate_cast<_Tp2>(y), saturate_cast<_Tp2>(z));
-}
-
-template<typename _Tp> inline
-Point3_<_Tp>::operator Vec<_Tp, 3>() const
-{
-    return Vec<_Tp, 3>(x, y, z);
-}
-
-template<typename _Tp> inline
-_Tp Point3_<_Tp>::dot(const Point3_& pt) const
-{
-    return saturate_cast<_Tp>(x*pt.x + y*pt.y + z*pt.z);
-}
-
-template<typename _Tp> inline
-double Point3_<_Tp>::ddot(const Point3_& pt) const
-{
-    return (double)x*pt.x + (double)y*pt.y + (double)z*pt.z;
-}
-
-template<typename _Tp> inline
-Point3_<_Tp> Point3_<_Tp>::cross(const Point3_<_Tp>& pt) const
-{
-    return Point3_<_Tp>(y*pt.z - z*pt.y, z*pt.x - x*pt.z, x*pt.y - y*pt.x);
-}
-
-
-template<typename _Tp> static inline
-Point3_<_Tp>& operator += (Point3_<_Tp>& a, const Point3_<_Tp>& b)
-{
-    a.x += b.x;
-    a.y += b.y;
-    a.z += b.z;
-    return a;
-}
-
-template<typename _Tp> static inline
-Point3_<_Tp>& operator -= (Point3_<_Tp>& a, const Point3_<_Tp>& b)
-{
-    a.x -= b.x;
-    a.y -= b.y;
-    a.z -= b.z;
-    return a;
-}
-
-template<typename _Tp> static inline
-Point3_<_Tp>& operator *= (Point3_<_Tp>& a, int b)
-{
-    a.x = saturate_cast<_Tp>(a.x * b);
-    a.y = saturate_cast<_Tp>(a.y * b);
-    a.z = saturate_cast<_Tp>(a.z * b);
-    return a;
-}
-
-template<typename _Tp> static inline
-Point3_<_Tp>& operator *= (Point3_<_Tp>& a, float b)
-{
-    a.x = saturate_cast<_Tp>(a.x * b);
-    a.y = saturate_cast<_Tp>(a.y * b);
-    a.z = saturate_cast<_Tp>(a.z * b);
-    return a;
-}
-
-template<typename _Tp> static inline
-Point3_<_Tp>& operator *= (Point3_<_Tp>& a, double b)
-{
-    a.x = saturate_cast<_Tp>(a.x * b);
-    a.y = saturate_cast<_Tp>(a.y * b);
-    a.z = saturate_cast<_Tp>(a.z * b);
-    return a;
-}
-
-template<typename _Tp> static inline
-Point3_<_Tp>& operator /= (Point3_<_Tp>& a, int b)
-{
-    a.x = saturate_cast<_Tp>(a.x / b);
-    a.y = saturate_cast<_Tp>(a.y / b);
-    a.z = saturate_cast<_Tp>(a.z / b);
-    return a;
-}
-
-template<typename _Tp> static inline
-Point3_<_Tp>& operator /= (Point3_<_Tp>& a, float b)
-{
-    a.x = saturate_cast<_Tp>(a.x / b);
-    a.y = saturate_cast<_Tp>(a.y / b);
-    a.z = saturate_cast<_Tp>(a.z / b);
-    return a;
-}
-
-template<typename _Tp> static inline
-Point3_<_Tp>& operator /= (Point3_<_Tp>& a, double b)
-{
-    a.x = saturate_cast<_Tp>(a.x / b);
-    a.y = saturate_cast<_Tp>(a.y / b);
-    a.z = saturate_cast<_Tp>(a.z / b);
-    return a;
-}
-
-template<typename _Tp> static inline
-double norm(const Point3_<_Tp>& pt)
-{
-    return std::sqrt((double)pt.x*pt.x + (double)pt.y*pt.y + (double)pt.z*pt.z);
-}
-
-template<typename _Tp> static inline
-bool operator == (const Point3_<_Tp>& a, const Point3_<_Tp>& b)
-{
-    return a.x == b.x && a.y == b.y && a.z == b.z;
-}
-
-template<typename _Tp> static inline
-bool operator != (const Point3_<_Tp>& a, const Point3_<_Tp>& b)
-{
-    return a.x != b.x || a.y != b.y || a.z != b.z;
-}
-
-template<typename _Tp> static inline
-Point3_<_Tp> operator + (const Point3_<_Tp>& a, const Point3_<_Tp>& b)
-{
-    return Point3_<_Tp>( saturate_cast<_Tp>(a.x + b.x), saturate_cast<_Tp>(a.y + b.y), saturate_cast<_Tp>(a.z + b.z));
-}
-
-template<typename _Tp> static inline
-Point3_<_Tp> operator - (const Point3_<_Tp>& a, const Point3_<_Tp>& b)
-{
-    return Point3_<_Tp>( saturate_cast<_Tp>(a.x - b.x), saturate_cast<_Tp>(a.y - b.y), saturate_cast<_Tp>(a.z - b.z));
-}
-
-template<typename _Tp> static inline
-Point3_<_Tp> operator - (const Point3_<_Tp>& a)
-{
-    return Point3_<_Tp>( saturate_cast<_Tp>(-a.x), saturate_cast<_Tp>(-a.y), saturate_cast<_Tp>(-a.z) );
-}
-
-template<typename _Tp> static inline
-Point3_<_Tp> operator * (const Point3_<_Tp>& a, int b)
-{
-    return Point3_<_Tp>( saturate_cast<_Tp>(a.x*b), saturate_cast<_Tp>(a.y*b), saturate_cast<_Tp>(a.z*b) );
-}
-
-template<typename _Tp> static inline
-Point3_<_Tp> operator * (int a, const Point3_<_Tp>& b)
-{
-    return Point3_<_Tp>( saturate_cast<_Tp>(b.x * a), saturate_cast<_Tp>(b.y * a), saturate_cast<_Tp>(b.z * a) );
-}
-
-template<typename _Tp> static inline
-Point3_<_Tp> operator * (const Point3_<_Tp>& a, float b)
-{
-    return Point3_<_Tp>( saturate_cast<_Tp>(a.x * b), saturate_cast<_Tp>(a.y * b), saturate_cast<_Tp>(a.z * b) );
-}
-
-template<typename _Tp> static inline
-Point3_<_Tp> operator * (float a, const Point3_<_Tp>& b)
-{
-    return Point3_<_Tp>( saturate_cast<_Tp>(b.x * a), saturate_cast<_Tp>(b.y * a), saturate_cast<_Tp>(b.z * a) );
-}
-
-template<typename _Tp> static inline
-Point3_<_Tp> operator * (const Point3_<_Tp>& a, double b)
-{
-    return Point3_<_Tp>( saturate_cast<_Tp>(a.x * b), saturate_cast<_Tp>(a.y * b), saturate_cast<_Tp>(a.z * b) );
-}
-
-template<typename _Tp> static inline
-Point3_<_Tp> operator * (double a, const Point3_<_Tp>& b)
-{
-    return Point3_<_Tp>( saturate_cast<_Tp>(b.x * a), saturate_cast<_Tp>(b.y * a), saturate_cast<_Tp>(b.z * a) );
-}
-
-template<typename _Tp> static inline
-Point3_<_Tp> operator * (const Matx<_Tp, 3, 3>& a, const Point3_<_Tp>& b)
-{
-    Matx<_Tp, 3, 1> tmp = a * Vec<_Tp,3>(b.x, b.y, b.z);
-    return Point3_<_Tp>(tmp.val[0], tmp.val[1], tmp.val[2]);
-}
-
-template<typename _Tp> static inline
-Matx<_Tp, 4, 1> operator * (const Matx<_Tp, 4, 4>& a, const Point3_<_Tp>& b)
-{
-    return a * Matx<_Tp, 4, 1>(b.x, b.y, b.z, 1);
-}
-
-template<typename _Tp> static inline
-Point3_<_Tp> operator / (const Point3_<_Tp>& a, int b)
-{
-    Point3_<_Tp> tmp(a);
-    tmp /= b;
-    return tmp;
-}
-
-template<typename _Tp> static inline
-Point3_<_Tp> operator / (const Point3_<_Tp>& a, float b)
-{
-    Point3_<_Tp> tmp(a);
-    tmp /= b;
-    return tmp;
-}
-
-template<typename _Tp> static inline
-Point3_<_Tp> operator / (const Point3_<_Tp>& a, double b)
-{
-    Point3_<_Tp> tmp(a);
-    tmp /= b;
-    return tmp;
-}
-
-
-
-////////////////////////////////// Size /////////////////////////////////
-
-template<typename _Tp> inline
-Size_<_Tp>::Size_()
-    : width(0), height(0) {}
-
-template<typename _Tp> inline
-Size_<_Tp>::Size_(_Tp _width, _Tp _height)
-    : width(_width), height(_height) {}
-
-template<typename _Tp> inline
-Size_<_Tp>::Size_(const Point_<_Tp>& pt)
-    : width(pt.x), height(pt.y) {}
-
-template<typename _Tp> template<typename _Tp2> inline
-Size_<_Tp>::operator Size_<_Tp2>() const
-{
-    return Size_<_Tp2>(saturate_cast<_Tp2>(width), saturate_cast<_Tp2>(height));
-}
-
-template<typename _Tp> inline
-_Tp Size_<_Tp>::area() const
-{
-    const _Tp result = width * height;
-    CV_DbgAssert(!std::numeric_limits<_Tp>::is_integer
-        || width == 0 || result / width == height); // make sure the result fits in the return value
-    return result;
-}
-
-template<typename _Tp> inline
-double Size_<_Tp>::aspectRatio() const
-{
-    return width / static_cast<double>(height);
-}
-
-template<typename _Tp> inline
-bool Size_<_Tp>::empty() const
-{
-    return width <= 0 || height <= 0;
-}
-
-
-template<typename _Tp> static inline
-Size_<_Tp>& operator *= (Size_<_Tp>& a, _Tp b)
-{
-    a.width *= b;
-    a.height *= b;
-    return a;
-}
-
-template<typename _Tp> static inline
-Size_<_Tp> operator * (const Size_<_Tp>& a, _Tp b)
-{
-    Size_<_Tp> tmp(a);
-    tmp *= b;
-    return tmp;
-}
-
-template<typename _Tp> static inline
-Size_<_Tp>& operator /= (Size_<_Tp>& a, _Tp b)
-{
-    a.width /= b;
-    a.height /= b;
-    return a;
-}
-
-template<typename _Tp> static inline
-Size_<_Tp> operator / (const Size_<_Tp>& a, _Tp b)
-{
-    Size_<_Tp> tmp(a);
-    tmp /= b;
-    return tmp;
-}
-
-template<typename _Tp> static inline
-Size_<_Tp>& operator += (Size_<_Tp>& a, const Size_<_Tp>& b)
-{
-    a.width += b.width;
-    a.height += b.height;
-    return a;
-}
-
-template<typename _Tp> static inline
-Size_<_Tp> operator + (const Size_<_Tp>& a, const Size_<_Tp>& b)
-{
-    Size_<_Tp> tmp(a);
-    tmp += b;
-    return tmp;
-}
-
-template<typename _Tp> static inline
-Size_<_Tp>& operator -= (Size_<_Tp>& a, const Size_<_Tp>& b)
-{
-    a.width -= b.width;
-    a.height -= b.height;
-    return a;
-}
-
-template<typename _Tp> static inline
-Size_<_Tp> operator - (const Size_<_Tp>& a, const Size_<_Tp>& b)
-{
-    Size_<_Tp> tmp(a);
-    tmp -= b;
-    return tmp;
-}
-
-template<typename _Tp> static inline
-bool operator == (const Size_<_Tp>& a, const Size_<_Tp>& b)
-{
-    return a.width == b.width && a.height == b.height;
-}
-
-template<typename _Tp> static inline
-bool operator != (const Size_<_Tp>& a, const Size_<_Tp>& b)
-{
-    return !(a == b);
-}
-
-
-
-////////////////////////////////// Rect /////////////////////////////////
-
-template<typename _Tp> inline
-Rect_<_Tp>::Rect_()
-    : x(0), y(0), width(0), height(0) {}
-
-template<typename _Tp> inline
-Rect_<_Tp>::Rect_(_Tp _x, _Tp _y, _Tp _width, _Tp _height)
-    : x(_x), y(_y), width(_width), height(_height) {}
-
-template<typename _Tp> inline
-Rect_<_Tp>::Rect_(const Point_<_Tp>& org, const Size_<_Tp>& sz)
-    : x(org.x), y(org.y), width(sz.width), height(sz.height) {}
-
-template<typename _Tp> inline
-Rect_<_Tp>::Rect_(const Point_<_Tp>& pt1, const Point_<_Tp>& pt2)
-{
-    x = std::min(pt1.x, pt2.x);
-    y = std::min(pt1.y, pt2.y);
-    width = std::max(pt1.x, pt2.x) - x;
-    height = std::max(pt1.y, pt2.y) - y;
-}
-
-template<typename _Tp> inline
-Point_<_Tp> Rect_<_Tp>::tl() const
-{
-    return Point_<_Tp>(x,y);
-}
-
-template<typename _Tp> inline
-Point_<_Tp> Rect_<_Tp>::br() const
-{
-    return Point_<_Tp>(x + width, y + height);
-}
-
-template<typename _Tp> inline
-Size_<_Tp> Rect_<_Tp>::size() const
-{
-    return Size_<_Tp>(width, height);
-}
-
-template<typename _Tp> inline
-_Tp Rect_<_Tp>::area() const
-{
-    const _Tp result = width * height;
-    CV_DbgAssert(!std::numeric_limits<_Tp>::is_integer
-        || width == 0 || result / width == height); // make sure the result fits in the return value
-    return result;
-}
-
-template<typename _Tp> inline
-bool Rect_<_Tp>::empty() const
-{
-    return width <= 0 || height <= 0;
-}
-
-template<typename _Tp> template<typename _Tp2> inline
-Rect_<_Tp>::operator Rect_<_Tp2>() const
-{
-    return Rect_<_Tp2>(saturate_cast<_Tp2>(x), saturate_cast<_Tp2>(y), saturate_cast<_Tp2>(width), saturate_cast<_Tp2>(height));
-}
-
-template<typename _Tp> inline
-bool Rect_<_Tp>::contains(const Point_<_Tp>& pt) const
-{
-    return x <= pt.x && pt.x < x + width && y <= pt.y && pt.y < y + height;
-}
-
-
-template<typename _Tp> static inline
-Rect_<_Tp>& operator += ( Rect_<_Tp>& a, const Point_<_Tp>& b )
-{
-    a.x += b.x;
-    a.y += b.y;
-    return a;
-}
-
-template<typename _Tp> static inline
-Rect_<_Tp>& operator -= ( Rect_<_Tp>& a, const Point_<_Tp>& b )
-{
-    a.x -= b.x;
-    a.y -= b.y;
-    return a;
-}
-
-template<typename _Tp> static inline
-Rect_<_Tp>& operator += ( Rect_<_Tp>& a, const Size_<_Tp>& b )
-{
-    a.width += b.width;
-    a.height += b.height;
-    return a;
-}
-
-template<typename _Tp> static inline
-Rect_<_Tp>& operator -= ( Rect_<_Tp>& a, const Size_<_Tp>& b )
-{
-    const _Tp width = a.width - b.width;
-    const _Tp height = a.height - b.height;
-    CV_DbgAssert(width >= 0 && height >= 0);
-    a.width = width;
-    a.height = height;
-    return a;
-}
-
-template<typename _Tp> static inline
-Rect_<_Tp>& operator &= ( Rect_<_Tp>& a, const Rect_<_Tp>& b )
-{
-    if (a.empty() || b.empty()) {
-        a = Rect();
-        return a;
-    }
-    const Rect_<_Tp>& Rx_min = (a.x < b.x) ? a : b;
-    const Rect_<_Tp>& Rx_max = (a.x < b.x) ? b : a;
-    const Rect_<_Tp>& Ry_min = (a.y < b.y) ? a : b;
-    const Rect_<_Tp>& Ry_max = (a.y < b.y) ? b : a;
-    // Looking at the formula below, we will compute Rx_min.width - (Rx_max.x - Rx_min.x)
-    // but we want to avoid overflows. Rx_min.width >= 0 and (Rx_max.x - Rx_min.x) >= 0
-    // by definition so the difference does not overflow. The only thing that can overflow
-    // is (Rx_max.x - Rx_min.x). And it can only overflow if Rx_min.x < 0.
-    // Let us first deal with the following case.
-    if ((Rx_min.x < 0 && Rx_min.x + Rx_min.width < Rx_max.x) ||
-        (Ry_min.y < 0 && Ry_min.y + Ry_min.height < Ry_max.y)) {
-        a = Rect();
-        return a;
-    }
-    // We now know that either Rx_min.x >= 0, or
-    // Rx_min.x < 0 && Rx_min.x + Rx_min.width >= Rx_max.x and therefore
-    // Rx_min.width >= (Rx_max.x - Rx_min.x) which means (Rx_max.x - Rx_min.x)
-    // is inferior to a valid int and therefore does not overflow.
-    a.width = std::min(Rx_min.width - (Rx_max.x - Rx_min.x), Rx_max.width);
-    a.height = std::min(Ry_min.height - (Ry_max.y - Ry_min.y), Ry_max.height);
-    a.x = Rx_max.x;
-    a.y = Ry_max.y;
-    if (a.empty())
-        a = Rect();
-    return a;
-}
-
-template<typename _Tp> static inline
-Rect_<_Tp>& operator |= ( Rect_<_Tp>& a, const Rect_<_Tp>& b )
-{
-    if (a.empty()) {
-        a = b;
-    }
-    else if (!b.empty()) {
-        _Tp x1 = std::min(a.x, b.x);
-        _Tp y1 = std::min(a.y, b.y);
-        a.width = std::max(a.x + a.width, b.x + b.width) - x1;
-        a.height = std::max(a.y + a.height, b.y + b.height) - y1;
-        a.x = x1;
-        a.y = y1;
-    }
-    return a;
-}
-
-template<typename _Tp> static inline
-bool operator == (const Rect_<_Tp>& a, const Rect_<_Tp>& b)
-{
-    return a.x == b.x && a.y == b.y && a.width == b.width && a.height == b.height;
-}
-
-template<typename _Tp> static inline
-bool operator != (const Rect_<_Tp>& a, const Rect_<_Tp>& b)
-{
-    return a.x != b.x || a.y != b.y || a.width != b.width || a.height != b.height;
-}
-
-template<typename _Tp> static inline
-Rect_<_Tp> operator + (const Rect_<_Tp>& a, const Point_<_Tp>& b)
-{
-    return Rect_<_Tp>( a.x + b.x, a.y + b.y, a.width, a.height );
-}
-
-template<typename _Tp> static inline
-Rect_<_Tp> operator - (const Rect_<_Tp>& a, const Point_<_Tp>& b)
-{
-    return Rect_<_Tp>( a.x - b.x, a.y - b.y, a.width, a.height );
-}
-
-template<typename _Tp> static inline
-Rect_<_Tp> operator + (const Rect_<_Tp>& a, const Size_<_Tp>& b)
-{
-    return Rect_<_Tp>( a.x, a.y, a.width + b.width, a.height + b.height );
-}
-
-template<typename _Tp> static inline
-Rect_<_Tp> operator - (const Rect_<_Tp>& a, const Size_<_Tp>& b)
-{
-    const _Tp width = a.width - b.width;
-    const _Tp height = a.height - b.height;
-    CV_DbgAssert(width >= 0 && height >= 0);
-    return Rect_<_Tp>( a.x, a.y, width, height );
-}
-
-template<typename _Tp> static inline
-Rect_<_Tp> operator & (const Rect_<_Tp>& a, const Rect_<_Tp>& b)
-{
-    Rect_<_Tp> c = a;
-    return c &= b;
-}
-
-template<typename _Tp> static inline
-Rect_<_Tp> operator | (const Rect_<_Tp>& a, const Rect_<_Tp>& b)
-{
-    Rect_<_Tp> c = a;
-    return c |= b;
-}
-
-/**
- * @brief measure dissimilarity between two sample sets
- *
- * computes the complement of the Jaccard Index as described in <https://en.wikipedia.org/wiki/Jaccard_index>.
- * For rectangles this reduces to computing the intersection over the union.
- */
-template<typename _Tp> static inline
-double jaccardDistance(const Rect_<_Tp>& a, const Rect_<_Tp>& b) {
-    _Tp Aa = a.area();
-    _Tp Ab = b.area();
-
-    if ((Aa + Ab) <= std::numeric_limits<_Tp>::epsilon()) {
-        // jaccard_index = 1 -> distance = 0
-        return 0.0;
-    }
-
-    double Aab = (a & b).area();
-    // distance = 1 - jaccard_index
-    return 1.0 - Aab / (Aa + Ab - Aab);
-}
-
-////////////////////////////// RotatedRect //////////////////////////////
-
-inline
-RotatedRect::RotatedRect()
-    : center(), size(), angle(0) {}
-
-inline
-RotatedRect::RotatedRect(const Point2f& _center, const Size2f& _size, float _angle)
-    : center(_center), size(_size), angle(_angle) {}
-
-///////////////////////////////// Range /////////////////////////////////
-
-inline
-Range::Range()
-    : start(0), end(0) {}
-
-inline
-Range::Range(int _start, int _end)
-    : start(_start), end(_end) {}
-
-inline
-int Range::size() const
-{
-    return end - start;
-}
-
-inline
-bool Range::empty() const
-{
-    return start == end;
-}
-
-inline
-Range Range::all()
-{
-    return Range(INT_MIN, INT_MAX);
-}
-
-
-static inline
-bool operator == (const Range& r1, const Range& r2)
-{
-    return r1.start == r2.start && r1.end == r2.end;
-}
-
-static inline
-bool operator != (const Range& r1, const Range& r2)
-{
-    return !(r1 == r2);
-}
-
-static inline
-bool operator !(const Range& r)
-{
-    return r.start == r.end;
-}
-
-static inline
-Range operator & (const Range& r1, const Range& r2)
-{
-    Range r(std::max(r1.start, r2.start), std::min(r1.end, r2.end));
-    r.end = std::max(r.end, r.start);
-    return r;
-}
-
-static inline
-Range& operator &= (Range& r1, const Range& r2)
-{
-    r1 = r1 & r2;
-    return r1;
-}
-
-static inline
-Range operator + (const Range& r1, int delta)
-{
-    return Range(r1.start + delta, r1.end + delta);
-}
-
-static inline
-Range operator + (int delta, const Range& r1)
-{
-    return Range(r1.start + delta, r1.end + delta);
-}
-
-static inline
-Range operator - (const Range& r1, int delta)
-{
-    return r1 + (-delta);
-}
-
-
-
-///////////////////////////////// Scalar ////////////////////////////////
-
-template<typename _Tp> inline
-Scalar_<_Tp>::Scalar_()
-{
-    this->val[0] = this->val[1] = this->val[2] = this->val[3] = 0;
-}
-
-template<typename _Tp> inline
-Scalar_<_Tp>::Scalar_(_Tp v0, _Tp v1, _Tp v2, _Tp v3)
-{
-    this->val[0] = v0;
-    this->val[1] = v1;
-    this->val[2] = v2;
-    this->val[3] = v3;
-}
-
-template<typename _Tp> inline
-Scalar_<_Tp>::Scalar_(const Scalar_<_Tp>& s) : Vec<_Tp, 4>(s) {
-}
-
-template<typename _Tp> inline
-Scalar_<_Tp>::Scalar_(Scalar_<_Tp>&& s) CV_NOEXCEPT {
-    this->val[0] = std::move(s.val[0]);
-    this->val[1] = std::move(s.val[1]);
-    this->val[2] = std::move(s.val[2]);
-    this->val[3] = std::move(s.val[3]);
-}
-
-template<typename _Tp> inline
-Scalar_<_Tp>& Scalar_<_Tp>::operator=(const Scalar_<_Tp>& s) {
-    this->val[0] = s.val[0];
-    this->val[1] = s.val[1];
-    this->val[2] = s.val[2];
-    this->val[3] = s.val[3];
-    return *this;
-}
-
-template<typename _Tp> inline
-Scalar_<_Tp>& Scalar_<_Tp>::operator=(Scalar_<_Tp>&& s) CV_NOEXCEPT {
-    this->val[0] = std::move(s.val[0]);
-    this->val[1] = std::move(s.val[1]);
-    this->val[2] = std::move(s.val[2]);
-    this->val[3] = std::move(s.val[3]);
-    return *this;
-}
-
-template<typename _Tp> template<typename _Tp2, int cn> inline
-Scalar_<_Tp>::Scalar_(const Vec<_Tp2, cn>& v)
-{
-    int i;
-    for( i = 0; i < (cn < 4 ? cn : 4); i++ )
-        this->val[i] = cv::saturate_cast<_Tp>(v.val[i]);
-    for( ; i < 4; i++ )
-        this->val[i] = 0;
-}
-
-template<typename _Tp> inline
-Scalar_<_Tp>::Scalar_(_Tp v0)
-{
-    this->val[0] = v0;
-    this->val[1] = this->val[2] = this->val[3] = 0;
-}
-
-template<typename _Tp> inline
-Scalar_<_Tp> Scalar_<_Tp>::all(_Tp v0)
-{
-    return Scalar_<_Tp>(v0, v0, v0, v0);
-}
-
-
-template<typename _Tp> inline
-Scalar_<_Tp> Scalar_<_Tp>::mul(const Scalar_<_Tp>& a, double scale ) const
-{
-    return Scalar_<_Tp>(saturate_cast<_Tp>(this->val[0] * a.val[0] * scale),
-                        saturate_cast<_Tp>(this->val[1] * a.val[1] * scale),
-                        saturate_cast<_Tp>(this->val[2] * a.val[2] * scale),
-                        saturate_cast<_Tp>(this->val[3] * a.val[3] * scale));
-}
-
-template<typename _Tp> inline
-Scalar_<_Tp> Scalar_<_Tp>::conj() const
-{
-    return Scalar_<_Tp>(saturate_cast<_Tp>( this->val[0]),
-                        saturate_cast<_Tp>(-this->val[1]),
-                        saturate_cast<_Tp>(-this->val[2]),
-                        saturate_cast<_Tp>(-this->val[3]));
-}
-
-template<typename _Tp> inline
-bool Scalar_<_Tp>::isReal() const
-{
-    return this->val[1] == 0 && this->val[2] == 0 && this->val[3] == 0;
-}
-
-
-template<typename _Tp> template<typename T2> inline
-Scalar_<_Tp>::operator Scalar_<T2>() const
-{
-    return Scalar_<T2>(saturate_cast<T2>(this->val[0]),
-                       saturate_cast<T2>(this->val[1]),
-                       saturate_cast<T2>(this->val[2]),
-                       saturate_cast<T2>(this->val[3]));
-}
-
-
-template<typename _Tp> static inline
-Scalar_<_Tp>& operator += (Scalar_<_Tp>& a, const Scalar_<_Tp>& b)
-{
-    a.val[0] += b.val[0];
-    a.val[1] += b.val[1];
-    a.val[2] += b.val[2];
-    a.val[3] += b.val[3];
-    return a;
-}
-
-template<typename _Tp> static inline
-Scalar_<_Tp>& operator -= (Scalar_<_Tp>& a, const Scalar_<_Tp>& b)
-{
-    a.val[0] -= b.val[0];
-    a.val[1] -= b.val[1];
-    a.val[2] -= b.val[2];
-    a.val[3] -= b.val[3];
-    return a;
-}
-
-template<typename _Tp> static inline
-Scalar_<_Tp>& operator *= ( Scalar_<_Tp>& a, _Tp v )
-{
-    a.val[0] *= v;
-    a.val[1] *= v;
-    a.val[2] *= v;
-    a.val[3] *= v;
-    return a;
-}
-
-template<typename _Tp> static inline
-bool operator == ( const Scalar_<_Tp>& a, const Scalar_<_Tp>& b )
-{
-    return a.val[0] == b.val[0] && a.val[1] == b.val[1] &&
-           a.val[2] == b.val[2] && a.val[3] == b.val[3];
-}
-
-template<typename _Tp> static inline
-bool operator != ( const Scalar_<_Tp>& a, const Scalar_<_Tp>& b )
-{
-    return a.val[0] != b.val[0] || a.val[1] != b.val[1] ||
-           a.val[2] != b.val[2] || a.val[3] != b.val[3];
-}
-
-template<typename _Tp> static inline
-Scalar_<_Tp> operator + (const Scalar_<_Tp>& a, const Scalar_<_Tp>& b)
-{
-    return Scalar_<_Tp>(a.val[0] + b.val[0],
-                        a.val[1] + b.val[1],
-                        a.val[2] + b.val[2],
-                        a.val[3] + b.val[3]);
-}
-
-template<typename _Tp> static inline
-Scalar_<_Tp> operator - (const Scalar_<_Tp>& a, const Scalar_<_Tp>& b)
-{
-    return Scalar_<_Tp>(saturate_cast<_Tp>(a.val[0] - b.val[0]),
-                        saturate_cast<_Tp>(a.val[1] - b.val[1]),
-                        saturate_cast<_Tp>(a.val[2] - b.val[2]),
-                        saturate_cast<_Tp>(a.val[3] - b.val[3]));
-}
-
-template<typename _Tp> static inline
-Scalar_<_Tp> operator * (const Scalar_<_Tp>& a, _Tp alpha)
-{
-    return Scalar_<_Tp>(a.val[0] * alpha,
-                        a.val[1] * alpha,
-                        a.val[2] * alpha,
-                        a.val[3] * alpha);
-}
-
-template<typename _Tp> static inline
-Scalar_<_Tp> operator * (_Tp alpha, const Scalar_<_Tp>& a)
-{
-    return a*alpha;
-}
-
-template<typename _Tp> static inline
-Scalar_<_Tp> operator - (const Scalar_<_Tp>& a)
-{
-    return Scalar_<_Tp>(saturate_cast<_Tp>(-a.val[0]),
-                        saturate_cast<_Tp>(-a.val[1]),
-                        saturate_cast<_Tp>(-a.val[2]),
-                        saturate_cast<_Tp>(-a.val[3]));
-}
-
-
-template<typename _Tp> static inline
-Scalar_<_Tp> operator * (const Scalar_<_Tp>& a, const Scalar_<_Tp>& b)
-{
-    return Scalar_<_Tp>(saturate_cast<_Tp>(a[0]*b[0] - a[1]*b[1] - a[2]*b[2] - a[3]*b[3]),
-                        saturate_cast<_Tp>(a[0]*b[1] + a[1]*b[0] + a[2]*b[3] - a[3]*b[2]),
-                        saturate_cast<_Tp>(a[0]*b[2] - a[1]*b[3] + a[2]*b[0] + a[3]*b[1]),
-                        saturate_cast<_Tp>(a[0]*b[3] + a[1]*b[2] - a[2]*b[1] + a[3]*b[0]));
-}
-
-template<typename _Tp> static inline
-Scalar_<_Tp>& operator *= (Scalar_<_Tp>& a, const Scalar_<_Tp>& b)
-{
-    a = a * b;
-    return a;
-}
-
-template<typename _Tp> static inline
-Scalar_<_Tp> operator / (const Scalar_<_Tp>& a, _Tp alpha)
-{
-    return Scalar_<_Tp>(a.val[0] / alpha,
-                        a.val[1] / alpha,
-                        a.val[2] / alpha,
-                        a.val[3] / alpha);
-}
-
-template<typename _Tp> static inline
-Scalar_<float> operator / (const Scalar_<float>& a, float alpha)
-{
-    float s = 1 / alpha;
-    return Scalar_<float>(a.val[0] * s, a.val[1] * s, a.val[2] * s, a.val[3] * s);
-}
-
-template<typename _Tp> static inline
-Scalar_<double> operator / (const Scalar_<double>& a, double alpha)
-{
-    double s = 1 / alpha;
-    return Scalar_<double>(a.val[0] * s, a.val[1] * s, a.val[2] * s, a.val[3] * s);
-}
-
-template<typename _Tp> static inline
-Scalar_<_Tp>& operator /= (Scalar_<_Tp>& a, _Tp alpha)
-{
-    a = a / alpha;
-    return a;
-}
-
-template<typename _Tp> static inline
-Scalar_<_Tp> operator / (_Tp a, const Scalar_<_Tp>& b)
-{
-    _Tp s = a / (b[0]*b[0] + b[1]*b[1] + b[2]*b[2] + b[3]*b[3]);
-    return b.conj() * s;
-}
-
-template<typename _Tp> static inline
-Scalar_<_Tp> operator / (const Scalar_<_Tp>& a, const Scalar_<_Tp>& b)
-{
-    return a * ((_Tp)1 / b);
-}
-
-template<typename _Tp> static inline
-Scalar_<_Tp>& operator /= (Scalar_<_Tp>& a, const Scalar_<_Tp>& b)
-{
-    a = a / b;
-    return a;
-}
-
-template<typename _Tp> static inline
-Scalar operator * (const Matx<_Tp, 4, 4>& a, const Scalar& b)
-{
-    Matx<double, 4, 1> c((Matx<double, 4, 4>)a, b, Matx_MatMulOp());
-    return reinterpret_cast<const Scalar&>(c);
-}
-
-template<> inline
-Scalar operator * (const Matx<double, 4, 4>& a, const Scalar& b)
-{
-    Matx<double, 4, 1> c(a, b, Matx_MatMulOp());
-    return reinterpret_cast<const Scalar&>(c);
-}
-
-
-
-//////////////////////////////// KeyPoint ///////////////////////////////
-
-inline
-KeyPoint::KeyPoint()
-    : pt(0,0), size(0), angle(-1), response(0), octave(0), class_id(-1) {}
-
-inline
-KeyPoint::KeyPoint(Point2f _pt, float _size, float _angle, float _response, int _octave, int _class_id)
-    : pt(_pt), size(_size), angle(_angle), response(_response), octave(_octave), class_id(_class_id) {}
-
-inline
-KeyPoint::KeyPoint(float x, float y, float _size, float _angle, float _response, int _octave, int _class_id)
-    : pt(x, y), size(_size), angle(_angle), response(_response), octave(_octave), class_id(_class_id) {}
-
-
-
-///////////////////////////////// DMatch ////////////////////////////////
-
-inline
-DMatch::DMatch()
-    : queryIdx(-1), trainIdx(-1), imgIdx(-1), distance(FLT_MAX) {}
-
-inline
-DMatch::DMatch(int _queryIdx, int _trainIdx, float _distance)
-    : queryIdx(_queryIdx), trainIdx(_trainIdx), imgIdx(-1), distance(_distance) {}
-
-inline
-DMatch::DMatch(int _queryIdx, int _trainIdx, int _imgIdx, float _distance)
-    : queryIdx(_queryIdx), trainIdx(_trainIdx), imgIdx(_imgIdx), distance(_distance) {}
-
-inline
-bool DMatch::operator < (const DMatch &m) const
-{
-    return distance < m.distance;
-}
-
-
-
-////////////////////////////// TermCriteria /////////////////////////////
-
-inline
-TermCriteria::TermCriteria()
-    : type(0), maxCount(0), epsilon(0) {}
-
-inline
-TermCriteria::TermCriteria(int _type, int _maxCount, double _epsilon)
-    : type(_type), maxCount(_maxCount), epsilon(_epsilon) {}
-
-//! @endcond
-
-} // cv
-
-#endif //OPENCV_CORE_TYPES_HPP
diff --git a/3rdParty/opencv2/core/types_c.h b/3rdParty/opencv2/core/types_c.h
deleted file mode 100644
index 6a2d0c0fa6..0000000000
--- a/3rdParty/opencv2/core/types_c.h
+++ /dev/null
@@ -1,2126 +0,0 @@
-/*M///////////////////////////////////////////////////////////////////////////////////////
-//
-//  IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
-//
-//  By downloading, copying, installing or using the software you agree to this license.
-//  If you do not agree to this license, do not download, install,
-//  copy or use the software.
-//
-//
-//                          License Agreement
-//                For Open Source Computer Vision Library
-//
-// Copyright (C) 2000-2008, Intel Corporation, all rights reserved.
-// Copyright (C) 2009, Willow Garage Inc., all rights reserved.
-// Copyright (C) 2013, OpenCV Foundation, all rights reserved.
-// Third party copyrights are property of their respective owners.
-//
-// Redistribution and use in source and binary forms, with or without modification,
-// are permitted provided that the following conditions are met:
-//
-//   * Redistribution's of source code must retain the above copyright notice,
-//     this list of conditions and the following disclaimer.
-//
-//   * Redistribution's in binary form must reproduce the above copyright notice,
-//     this list of conditions and the following disclaimer in the documentation
-//     and/or other materials provided with the distribution.
-//
-//   * The name of the copyright holders may not be used to endorse or promote products
-//     derived from this software without specific prior written permission.
-//
-// This software is provided by the copyright holders and contributors "as is" and
-// any express or implied warranties, including, but not limited to, the implied
-// warranties of merchantability and fitness for a particular purpose are disclaimed.
-// In no event shall the Intel Corporation or contributors be liable for any direct,
-// indirect, incidental, special, exemplary, or consequential damages
-// (including, but not limited to, procurement of substitute goods or services;
-// loss of use, data, or profits; or business interruption) however caused
-// and on any theory of liability, whether in contract, strict liability,
-// or tort (including negligence or otherwise) arising in any way out of
-// the use of this software, even if advised of the possibility of such damage.
-//
-//M*/
-
-#ifndef OPENCV_CORE_TYPES_H
-#define OPENCV_CORE_TYPES_H
-
-#ifdef CV__ENABLE_C_API_CTORS  // invalid C API ctors (must be removed)
-#if defined(_WIN32) && !defined(CV__SKIP_MESSAGE_MALFORMED_C_API_CTORS)
-#error "C API ctors don't work on Win32: https://github.com/opencv/opencv/issues/15990"
-#endif
-#endif
-
-//#define CV__VALIDATE_UNUNITIALIZED_VARS 1  // C++11 & GCC only
-
-#ifdef __cplusplus
-
-#ifdef CV__VALIDATE_UNUNITIALIZED_VARS
-#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
-#define CV_STRUCT_INITIALIZER {0,}
-#else
-#if defined(__GNUC__) && __GNUC__ == 4  // GCC 4.x warns on "= {}" initialization, fixed in GCC 5.0
-#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
-#endif
-#define CV_STRUCT_INITIALIZER {}
-#endif
-
-#else
-#define CV_STRUCT_INITIALIZER {0}
-#endif
-
-
-#ifdef HAVE_IPL
-#  ifndef __IPL_H__
-#    if defined _WIN32
-#      include <ipl.h>
-#    else
-#      include <ipl/ipl.h>
-#    endif
-#  endif
-#elif defined __IPL_H__
-#  define HAVE_IPL
-#endif
-
-#include "opencv2/core/cvdef.h"
-
-#ifndef SKIP_INCLUDES
-#include <assert.h>
-#include <stdlib.h>
-#include <string.h>
-#include <float.h>
-#endif // SKIP_INCLUDES
-
-#if defined _WIN32
-#  define CV_CDECL __cdecl
-#  define CV_STDCALL __stdcall
-#else
-#  define CV_CDECL
-#  define CV_STDCALL
-#endif
-
-#ifndef CV_DEFAULT
-#  ifdef __cplusplus
-#    define CV_DEFAULT(val) = val
-#  else
-#    define CV_DEFAULT(val)
-#  endif
-#endif
-
-#ifndef CV_EXTERN_C_FUNCPTR
-#  ifdef __cplusplus
-#    define CV_EXTERN_C_FUNCPTR(x) extern "C" { typedef x; }
-#  else
-#    define CV_EXTERN_C_FUNCPTR(x) typedef x
-#  endif
-#endif
-
-#ifndef CVAPI
-#  define CVAPI(rettype) CV_EXTERN_C CV_EXPORTS rettype CV_CDECL
-#endif
-
-#ifndef CV_IMPL
-#  define CV_IMPL CV_EXTERN_C
-#endif
-
-#ifdef __cplusplus
-#  include "opencv2/core.hpp"
-#endif
-
-/** @addtogroup core_c
-    @{
-*/
-
-/** @brief This is the "metatype" used *only* as a function parameter.
-
-It denotes that the function accepts arrays of multiple types, such as IplImage*, CvMat* or even
-CvSeq* sometimes. The particular array type is determined at runtime by analyzing the first 4
-bytes of the header. In C++ interface the role of CvArr is played by InputArray and OutputArray.
- */
-typedef void CvArr;
-
-typedef int CVStatus;
-
-/** @see cv::Error::Code */
-enum {
- CV_StsOk=                       0,  /**< everything is ok                */
- CV_StsBackTrace=               -1,  /**< pseudo error for back trace     */
- CV_StsError=                   -2,  /**< unknown /unspecified error      */
- CV_StsInternal=                -3,  /**< internal error (bad state)      */
- CV_StsNoMem=                   -4,  /**< insufficient memory             */
- CV_StsBadArg=                  -5,  /**< function arg/param is bad       */
- CV_StsBadFunc=                 -6,  /**< unsupported function            */
- CV_StsNoConv=                  -7,  /**< iter. didn't converge           */
- CV_StsAutoTrace=               -8,  /**< tracing                         */
- CV_HeaderIsNull=               -9,  /**< image header is NULL            */
- CV_BadImageSize=              -10,  /**< image size is invalid           */
- CV_BadOffset=                 -11,  /**< offset is invalid               */
- CV_BadDataPtr=                -12,  /**/
- CV_BadStep=                   -13,  /**< image step is wrong, this may happen for a non-continuous matrix */
- CV_BadModelOrChSeq=           -14,  /**/
- CV_BadNumChannels=            -15,  /**< bad number of channels, for example, some functions accept only single channel matrices */
- CV_BadNumChannel1U=           -16,  /**/
- CV_BadDepth=                  -17,  /**< input image depth is not supported by the function */
- CV_BadAlphaChannel=           -18,  /**/
- CV_BadOrder=                  -19,  /**< number of dimensions is out of range */
- CV_BadOrigin=                 -20,  /**< incorrect input origin               */
- CV_BadAlign=                  -21,  /**< incorrect input align                */
- CV_BadCallBack=               -22,  /**/
- CV_BadTileSize=               -23,  /**/
- CV_BadCOI=                    -24,  /**< input COI is not supported           */
- CV_BadROISize=                -25,  /**< incorrect input roi                  */
- CV_MaskIsTiled=               -26,  /**/
- CV_StsNullPtr=                -27,  /**< null pointer */
- CV_StsVecLengthErr=           -28,  /**< incorrect vector length */
- CV_StsFilterStructContentErr= -29,  /**< incorrect filter structure content */
- CV_StsKernelStructContentErr= -30,  /**< incorrect transform kernel content */
- CV_StsFilterOffsetErr=        -31,  /**< incorrect filter offset value */
- CV_StsBadSize=                -201, /**< the input/output structure size is incorrect  */
- CV_StsDivByZero=              -202, /**< division by zero */
- CV_StsInplaceNotSupported=    -203, /**< in-place operation is not supported */
- CV_StsObjectNotFound=         -204, /**< request can't be completed */
- CV_StsUnmatchedFormats=       -205, /**< formats of input/output arrays differ */
- CV_StsBadFlag=                -206, /**< flag is wrong or not supported */
- CV_StsBadPoint=               -207, /**< bad CvPoint */
- CV_StsBadMask=                -208, /**< bad format of mask (neither 8uC1 nor 8sC1)*/
- CV_StsUnmatchedSizes=         -209, /**< sizes of input/output structures do not match */
- CV_StsUnsupportedFormat=      -210, /**< the data format/type is not supported by the function*/
- CV_StsOutOfRange=             -211, /**< some of parameters are out of range */
- CV_StsParseError=             -212, /**< invalid syntax/structure of the parsed file */
- CV_StsNotImplemented=         -213, /**< the requested function/feature is not implemented */
- CV_StsBadMemBlock=            -214, /**< an allocated block has been corrupted */
- CV_StsAssert=                 -215, /**< assertion failed   */
- CV_GpuNotSupported=           -216, /**< no CUDA support    */
- CV_GpuApiCallError=           -217, /**< GPU API call error */
- CV_OpenGlNotSupported=        -218, /**< no OpenGL support  */
- CV_OpenGlApiCallError=        -219, /**< OpenGL API call error */
- CV_OpenCLApiCallError=        -220, /**< OpenCL API call error */
- CV_OpenCLDoubleNotSupported=  -221,
- CV_OpenCLInitError=           -222, /**< OpenCL initialization error */
- CV_OpenCLNoAMDBlasFft=        -223
-};
-
-/****************************************************************************************\
-*                             Common macros and inline functions                         *
-\****************************************************************************************/
-
-#define CV_SWAP(a,b,t) ((t) = (a), (a) = (b), (b) = (t))
-
-/** min & max without jumps */
-#define  CV_IMIN(a, b)  ((a) ^ (((a)^(b)) & (((a) < (b)) - 1)))
-
-#define  CV_IMAX(a, b)  ((a) ^ (((a)^(b)) & (((a) > (b)) - 1)))
-
-/** absolute value without jumps */
-#ifndef __cplusplus
-#  define  CV_IABS(a)     (((a) ^ ((a) < 0 ? -1 : 0)) - ((a) < 0 ? -1 : 0))
-#else
-#  define  CV_IABS(a)     abs(a)
-#endif
-#define  CV_CMP(a,b)    (((a) > (b)) - ((a) < (b)))
-#define  CV_SIGN(a)     CV_CMP((a),0)
-
-#define cvInvSqrt(value) ((float)(1./sqrt(value)))
-#define cvSqrt(value)  ((float)sqrt(value))
-
-
-/*************** Random number generation *******************/
-
-typedef uint64 CvRNG;
-
-#define CV_RNG_COEFF 4164903690U
-
-/** @brief Initializes a random number generator state.
-
-The function initializes a random number generator and returns the state. The pointer to the state
-can be then passed to the cvRandInt, cvRandReal and cvRandArr functions. In the current
-implementation a multiply-with-carry generator is used.
-@param seed 64-bit value used to initiate a random sequence
-@sa the C++ class RNG replaced CvRNG.
- */
-CV_INLINE CvRNG cvRNG( int64 seed CV_DEFAULT(-1))
-{
-    CvRNG rng = seed ? (uint64)seed : (uint64)(int64)-1;
-    return rng;
-}
-
-/** @brief Returns a 32-bit unsigned integer and updates RNG.
-
-The function returns a uniformly-distributed random 32-bit unsigned integer and updates the RNG
-state. It is similar to the rand() function from the C runtime library, except that OpenCV functions
-always generates a 32-bit random number, regardless of the platform.
-@param rng CvRNG state initialized by cvRNG.
- */
-CV_INLINE unsigned cvRandInt( CvRNG* rng )
-{
-    uint64 temp = *rng;
-    temp = (uint64)(unsigned)temp*CV_RNG_COEFF + (temp >> 32);
-    *rng = temp;
-    return (unsigned)temp;
-}
-
-/** @brief Returns a floating-point random number and updates RNG.
-
-The function returns a uniformly-distributed random floating-point number between 0 and 1 (1 is not
-included).
-@param rng RNG state initialized by cvRNG
- */
-CV_INLINE double cvRandReal( CvRNG* rng )
-{
-    return cvRandInt(rng)*2.3283064365386962890625e-10 /* 2^-32 */;
-}
-
-/****************************************************************************************\
-*                                  Image type (IplImage)                                 *
-\****************************************************************************************/
-
-#ifndef HAVE_IPL
-
-/*
- * The following definitions (until #endif)
- * is an extract from IPL headers.
- * Copyright (c) 1995 Intel Corporation.
- */
-#define IPL_DEPTH_SIGN 0x80000000
-
-#define IPL_DEPTH_1U     1
-#define IPL_DEPTH_8U     8
-#define IPL_DEPTH_16U   16
-#define IPL_DEPTH_32F   32
-
-#define IPL_DEPTH_8S  (IPL_DEPTH_SIGN| 8)
-#define IPL_DEPTH_16S (IPL_DEPTH_SIGN|16)
-#define IPL_DEPTH_32S (IPL_DEPTH_SIGN|32)
-
-#define IPL_DATA_ORDER_PIXEL  0
-#define IPL_DATA_ORDER_PLANE  1
-
-#define IPL_ORIGIN_TL 0
-#define IPL_ORIGIN_BL 1
-
-#define IPL_ALIGN_4BYTES   4
-#define IPL_ALIGN_8BYTES   8
-#define IPL_ALIGN_16BYTES 16
-#define IPL_ALIGN_32BYTES 32
-
-#define IPL_ALIGN_DWORD   IPL_ALIGN_4BYTES
-#define IPL_ALIGN_QWORD   IPL_ALIGN_8BYTES
-
-#define IPL_BORDER_CONSTANT   0
-#define IPL_BORDER_REPLICATE  1
-#define IPL_BORDER_REFLECT    2
-#define IPL_BORDER_WRAP       3
-
-#ifdef __cplusplus
-typedef struct _IplImage IplImage;
-CV_EXPORTS _IplImage cvIplImage(const cv::Mat& m);
-#endif
-
-/** The IplImage is taken from the Intel Image Processing Library, in which the format is native. OpenCV
-only supports a subset of possible IplImage formats, as outlined in the parameter list above.
-
-In addition to the above restrictions, OpenCV handles ROIs differently. OpenCV functions require
-that the image size or ROI size of all source and destination images match exactly. On the other
-hand, the Intel Image Processing Library processes the area of intersection between the source and
-destination images (or ROIs), allowing them to vary independently.
-*/
-typedef struct
-_IplImage
-{
-    int  nSize;             /**< sizeof(IplImage) */
-    int  ID;                /**< version (=0)*/
-    int  nChannels;         /**< Most of OpenCV functions support 1,2,3 or 4 channels */
-    int  alphaChannel;      /**< Ignored by OpenCV */
-    int  depth;             /**< Pixel depth in bits: IPL_DEPTH_8U, IPL_DEPTH_8S, IPL_DEPTH_16S,
-                               IPL_DEPTH_32S, IPL_DEPTH_32F and IPL_DEPTH_64F are supported.  */
-    char colorModel[4];     /**< Ignored by OpenCV */
-    char channelSeq[4];     /**< ditto */
-    int  dataOrder;         /**< 0 - interleaved color channels, 1 - separate color channels.
-                               cvCreateImage can only create interleaved images */
-    int  origin;            /**< 0 - top-left origin,
-                               1 - bottom-left origin (Windows bitmaps style).  */
-    int  align;             /**< Alignment of image rows (4 or 8).
-                               OpenCV ignores it and uses widthStep instead.    */
-    int  width;             /**< Image width in pixels.                           */
-    int  height;            /**< Image height in pixels.                          */
-    struct _IplROI *roi;    /**< Image ROI. If NULL, the whole image is selected. */
-    struct _IplImage *maskROI;      /**< Must be NULL. */
-    void  *imageId;                 /**< "           " */
-    struct _IplTileInfo *tileInfo;  /**< "           " */
-    int  imageSize;         /**< Image data size in bytes
-                               (==image->height*image->widthStep
-                               in case of interleaved data)*/
-    char *imageData;        /**< Pointer to aligned image data.         */
-    int  widthStep;         /**< Size of aligned image row in bytes.    */
-    int  BorderMode[4];     /**< Ignored by OpenCV.                     */
-    int  BorderConst[4];    /**< Ditto.                                 */
-    char *imageDataOrigin;  /**< Pointer to very origin of image data
-                               (not necessarily aligned) -
-                               needed for correct deallocation */
-
-#if defined(CV__ENABLE_C_API_CTORS) && defined(__cplusplus)
-    _IplImage()
-    {
-        memset(this, 0, sizeof(*this));  // valid for POD structure
-        nSize = sizeof(IplImage);
-    }
-    _IplImage(const cv::Mat& m) { *this = cvIplImage(m); }
-#endif
-}
-IplImage;
-
-CV_INLINE IplImage cvIplImage()
-{
-#if !(defined(CV__ENABLE_C_API_CTORS) && defined(__cplusplus))
-    IplImage self = CV_STRUCT_INITIALIZER; self.nSize = sizeof(IplImage); return self;
-#else
-    return _IplImage();
-#endif
-}
-
-typedef struct _IplTileInfo IplTileInfo;
-
-typedef struct _IplROI
-{
-    int  coi; /**< 0 - no COI (all channels are selected), 1 - 0th channel is selected ...*/
-    int  xOffset;
-    int  yOffset;
-    int  width;
-    int  height;
-}
-IplROI;
-
-typedef struct _IplConvKernel
-{
-    int  nCols;
-    int  nRows;
-    int  anchorX;
-    int  anchorY;
-    int *values;
-    int  nShiftR;
-}
-IplConvKernel;
-
-typedef struct _IplConvKernelFP
-{
-    int  nCols;
-    int  nRows;
-    int  anchorX;
-    int  anchorY;
-    float *values;
-}
-IplConvKernelFP;
-
-#define IPL_IMAGE_HEADER 1
-#define IPL_IMAGE_DATA   2
-#define IPL_IMAGE_ROI    4
-
-#endif/*HAVE_IPL*/
-
-/** extra border mode */
-#define IPL_BORDER_REFLECT_101    4
-#define IPL_BORDER_TRANSPARENT    5
-
-#define IPL_IMAGE_MAGIC_VAL  ((int)sizeof(IplImage))
-#define CV_TYPE_NAME_IMAGE "opencv-image"
-
-#define CV_IS_IMAGE_HDR(img) \
-    ((img) != NULL && ((const IplImage*)(img))->nSize == sizeof(IplImage))
-
-#define CV_IS_IMAGE(img) \
-    (CV_IS_IMAGE_HDR(img) && ((IplImage*)img)->imageData != NULL)
-
-/** for storing double-precision
-   floating point data in IplImage's */
-#define IPL_DEPTH_64F  64
-
-/** get reference to pixel at (col,row),
-   for multi-channel images (col) should be multiplied by number of channels */
-#define CV_IMAGE_ELEM( image, elemtype, row, col )       \
-    (((elemtype*)((image)->imageData + (image)->widthStep*(row)))[(col)])
-
-/****************************************************************************************\
-*                                  Matrix type (CvMat)                                   *
-\****************************************************************************************/
-
-#define CV_AUTO_STEP  0x7fffffff
-#define CV_WHOLE_ARR  cvSlice( 0, 0x3fffffff )
-
-#define CV_MAGIC_MASK       0xFFFF0000
-#define CV_MAT_MAGIC_VAL    0x42420000
-#define CV_TYPE_NAME_MAT    "opencv-matrix"
-
-#ifdef __cplusplus
-typedef struct CvMat CvMat;
-CV_INLINE CvMat cvMat(const cv::Mat& m);
-#endif
-
-/** Matrix elements are stored row by row. Element (i, j) (i - 0-based row index, j - 0-based column
-index) of a matrix can be retrieved or modified using CV_MAT_ELEM macro:
-
-    uchar pixval = CV_MAT_ELEM(grayimg, uchar, i, j)
-    CV_MAT_ELEM(cameraMatrix, float, 0, 2) = image.width*0.5f;
-
-To access multiple-channel matrices, you can use
-CV_MAT_ELEM(matrix, type, i, j\*nchannels + channel_idx).
-
-@deprecated CvMat is now obsolete; consider using Mat instead.
- */
-typedef struct CvMat
-{
-    int type;
-    int step;
-
-    /* for internal use only */
-    int* refcount;
-    int hdr_refcount;
-
-    union
-    {
-        uchar* ptr;
-        short* s;
-        int* i;
-        float* fl;
-        double* db;
-    } data;
-
-#ifdef __cplusplus
-    union
-    {
-        int rows;
-        int height;
-    };
-
-    union
-    {
-        int cols;
-        int width;
-    };
-#else
-    int rows;
-    int cols;
-#endif
-
-#if defined(CV__ENABLE_C_API_CTORS) && defined(__cplusplus)
-    CvMat() {}
-    CvMat(const cv::Mat& m) { *this = cvMat(m); }
-#endif
-}
-CvMat;
-
-
-#define CV_IS_MAT_HDR(mat) \
-    ((mat) != NULL && \
-    (((const CvMat*)(mat))->type & CV_MAGIC_MASK) == CV_MAT_MAGIC_VAL && \
-    ((const CvMat*)(mat))->cols > 0 && ((const CvMat*)(mat))->rows > 0)
-
-#define CV_IS_MAT_HDR_Z(mat) \
-    ((mat) != NULL && \
-    (((const CvMat*)(mat))->type & CV_MAGIC_MASK) == CV_MAT_MAGIC_VAL && \
-    ((const CvMat*)(mat))->cols >= 0 && ((const CvMat*)(mat))->rows >= 0)
-
-#define CV_IS_MAT(mat) \
-    (CV_IS_MAT_HDR(mat) && ((const CvMat*)(mat))->data.ptr != NULL)
-
-#define CV_IS_MASK_ARR(mat) \
-    (((mat)->type & (CV_MAT_TYPE_MASK & ~CV_8SC1)) == 0)
-
-#define CV_ARE_TYPES_EQ(mat1, mat2) \
-    ((((mat1)->type ^ (mat2)->type) & CV_MAT_TYPE_MASK) == 0)
-
-#define CV_ARE_CNS_EQ(mat1, mat2) \
-    ((((mat1)->type ^ (mat2)->type) & CV_MAT_CN_MASK) == 0)
-
-#define CV_ARE_DEPTHS_EQ(mat1, mat2) \
-    ((((mat1)->type ^ (mat2)->type) & CV_MAT_DEPTH_MASK) == 0)
-
-#define CV_ARE_SIZES_EQ(mat1, mat2) \
-    ((mat1)->rows == (mat2)->rows && (mat1)->cols == (mat2)->cols)
-
-#define CV_IS_MAT_CONST(mat)  \
-    (((mat)->rows|(mat)->cols) == 1)
-
-#define IPL2CV_DEPTH(depth) \
-    ((((CV_8U)+(CV_16U<<4)+(CV_32F<<8)+(CV_64F<<16)+(CV_8S<<20)+ \
-    (CV_16S<<24)+(CV_32S<<28)) >> ((((depth) & 0xF0) >> 2) + \
-    (((depth) & IPL_DEPTH_SIGN) ? 20 : 0))) & 15)
-
-/** Inline constructor. No data is allocated internally!!!
- * (Use together with cvCreateData, or use cvCreateMat instead to
- * get a matrix with allocated data):
- */
-CV_INLINE CvMat cvMat( int rows, int cols, int type, void* data CV_DEFAULT(NULL))
-{
-    CvMat m;
-
-    assert( (unsigned)CV_MAT_DEPTH(type) <= CV_64F );
-    type = CV_MAT_TYPE(type);
-    m.type = CV_MAT_MAGIC_VAL | CV_MAT_CONT_FLAG | type;
-    m.cols = cols;
-    m.rows = rows;
-    m.step = m.cols*CV_ELEM_SIZE(type);
-    m.data.ptr = (uchar*)data;
-    m.refcount = NULL;
-    m.hdr_refcount = 0;
-
-    return m;
-}
-
-#ifdef __cplusplus
-
-CV_INLINE CvMat cvMat(const cv::Mat& m)
-{
-    CvMat self;
-    CV_DbgAssert(m.dims <= 2);
-    self = cvMat(m.rows, m.dims == 1 ? 1 : m.cols, m.type(), m.data);
-    self.step = (int)m.step[0];
-    self.type = (self.type & ~cv::Mat::CONTINUOUS_FLAG) | (m.flags & cv::Mat::CONTINUOUS_FLAG);
-    return self;
-}
-CV_INLINE CvMat cvMat()
-{
-#if !defined(CV__ENABLE_C_API_CTORS)
-    CvMat self = CV_STRUCT_INITIALIZER; return self;
-#else
-    return CvMat();
-#endif
-}
-CV_INLINE CvMat cvMat(const CvMat& m)
-{
-#if !defined(CV__ENABLE_C_API_CTORS)
-    CvMat self = CV_STRUCT_INITIALIZER; memcpy(&self, &m, sizeof(self)); return self;
-#else
-    return CvMat(m);
-#endif
-}
-
-#endif // __cplusplus
-
-
-#define CV_MAT_ELEM_PTR_FAST( mat, row, col, pix_size )  \
-    (assert( (unsigned)(row) < (unsigned)(mat).rows &&   \
-             (unsigned)(col) < (unsigned)(mat).cols ),   \
-     (mat).data.ptr + (size_t)(mat).step*(row) + (pix_size)*(col))
-
-#define CV_MAT_ELEM_PTR( mat, row, col )                 \
-    CV_MAT_ELEM_PTR_FAST( mat, row, col, CV_ELEM_SIZE((mat).type) )
-
-#define CV_MAT_ELEM( mat, elemtype, row, col )           \
-    (*(elemtype*)CV_MAT_ELEM_PTR_FAST( mat, row, col, sizeof(elemtype)))
-
-/** @brief Returns the particular element of single-channel floating-point matrix.
-
-The function is a fast replacement for cvGetReal2D in the case of single-channel floating-point
-matrices. It is faster because it is inline, it does fewer checks for array type and array element
-type, and it checks for the row and column ranges only in debug mode.
-@param mat Input matrix
-@param row The zero-based index of row
-@param col The zero-based index of column
- */
-CV_INLINE  double  cvmGet( const CvMat* mat, int row, int col )
-{
-    int type;
-
-    type = CV_MAT_TYPE(mat->type);
-    assert( (unsigned)row < (unsigned)mat->rows &&
-            (unsigned)col < (unsigned)mat->cols );
-
-    if( type == CV_32FC1 )
-        return ((float*)(void*)(mat->data.ptr + (size_t)mat->step*row))[col];
-    else
-    {
-        assert( type == CV_64FC1 );
-        return ((double*)(void*)(mat->data.ptr + (size_t)mat->step*row))[col];
-    }
-}
-
-/** @brief Sets a specific element of a single-channel floating-point matrix.
-
-The function is a fast replacement for cvSetReal2D in the case of single-channel floating-point
-matrices. It is faster because it is inline, it does fewer checks for array type and array element
-type, and it checks for the row and column ranges only in debug mode.
-@param mat The matrix
-@param row The zero-based index of row
-@param col The zero-based index of column
-@param value The new value of the matrix element
- */
-CV_INLINE  void  cvmSet( CvMat* mat, int row, int col, double value )
-{
-    int type;
-    type = CV_MAT_TYPE(mat->type);
-    assert( (unsigned)row < (unsigned)mat->rows &&
-            (unsigned)col < (unsigned)mat->cols );
-
-    if( type == CV_32FC1 )
-        ((float*)(void*)(mat->data.ptr + (size_t)mat->step*row))[col] = (float)value;
-    else
-    {
-        assert( type == CV_64FC1 );
-        ((double*)(void*)(mat->data.ptr + (size_t)mat->step*row))[col] = value;
-    }
-}
-
-
-CV_INLINE int cvIplDepth( int type )
-{
-    int depth = CV_MAT_DEPTH(type);
-    return CV_ELEM_SIZE1(depth)*8 | (depth == CV_8S || depth == CV_16S ||
-           depth == CV_32S ? IPL_DEPTH_SIGN : 0);
-}
-
-
-/****************************************************************************************\
-*                       Multi-dimensional dense array (CvMatND)                          *
-\****************************************************************************************/
-
-#define CV_MATND_MAGIC_VAL    0x42430000
-#define CV_TYPE_NAME_MATND    "opencv-nd-matrix"
-
-#define CV_MAX_DIM            32
-
-#ifdef __cplusplus
-typedef struct CvMatND CvMatND;
-CV_EXPORTS CvMatND cvMatND(const cv::Mat& m);
-#endif
-
-/**
-  @deprecated consider using cv::Mat instead
-  */
-typedef struct
-CvMatND
-{
-    int type;
-    int dims;
-
-    int* refcount;
-    int hdr_refcount;
-
-    union
-    {
-        uchar* ptr;
-        float* fl;
-        double* db;
-        int* i;
-        short* s;
-    } data;
-
-    struct
-    {
-        int size;
-        int step;
-    }
-    dim[CV_MAX_DIM];
-
-#if defined(CV__ENABLE_C_API_CTORS) && defined(__cplusplus)
-    CvMatND() {}
-    CvMatND(const cv::Mat& m) { *this = cvMatND(m); }
-#endif
-}
-CvMatND;
-
-
-CV_INLINE CvMatND cvMatND()
-{
-#if !(defined(CV__ENABLE_C_API_CTORS) && defined(__cplusplus))
-    CvMatND self = CV_STRUCT_INITIALIZER; return self;
-#else
-    return CvMatND();
-#endif
-}
-
-#define CV_IS_MATND_HDR(mat) \
-    ((mat) != NULL && (((const CvMatND*)(mat))->type & CV_MAGIC_MASK) == CV_MATND_MAGIC_VAL)
-
-#define CV_IS_MATND(mat) \
-    (CV_IS_MATND_HDR(mat) && ((const CvMatND*)(mat))->data.ptr != NULL)
-
-
-/****************************************************************************************\
-*                      Multi-dimensional sparse array (CvSparseMat)                      *
-\****************************************************************************************/
-
-#define CV_SPARSE_MAT_MAGIC_VAL    0x42440000
-#define CV_TYPE_NAME_SPARSE_MAT    "opencv-sparse-matrix"
-
-struct CvSet;
-
-typedef struct CvSparseMat
-{
-    int type;
-    int dims;
-    int* refcount;
-    int hdr_refcount;
-
-    struct CvSet* heap;
-    void** hashtable;
-    int hashsize;
-    int valoffset;
-    int idxoffset;
-    int size[CV_MAX_DIM];
-
-#ifdef __cplusplus
-    CV_EXPORTS void copyToSparseMat(cv::SparseMat& m) const;
-#endif
-}
-CvSparseMat;
-
-#ifdef __cplusplus
-CV_EXPORTS CvSparseMat* cvCreateSparseMat(const cv::SparseMat& m);
-#endif
-
-#define CV_IS_SPARSE_MAT_HDR(mat) \
-    ((mat) != NULL && \
-    (((const CvSparseMat*)(mat))->type & CV_MAGIC_MASK) == CV_SPARSE_MAT_MAGIC_VAL)
-
-#define CV_IS_SPARSE_MAT(mat) \
-    CV_IS_SPARSE_MAT_HDR(mat)
-
-/**************** iteration through a sparse array *****************/
-
-typedef struct CvSparseNode
-{
-    unsigned hashval;
-    struct CvSparseNode* next;
-}
-CvSparseNode;
-
-typedef struct CvSparseMatIterator
-{
-    CvSparseMat* mat;
-    CvSparseNode* node;
-    int curidx;
-}
-CvSparseMatIterator;
-
-#define CV_NODE_VAL(mat,node)   ((void*)((uchar*)(node) + (mat)->valoffset))
-#define CV_NODE_IDX(mat,node)   ((int*)((uchar*)(node) + (mat)->idxoffset))
-
-/****************************************************************************************\
-*                                         Histogram                                      *
-\****************************************************************************************/
-
-typedef int CvHistType;
-
-#define CV_HIST_MAGIC_VAL     0x42450000
-#define CV_HIST_UNIFORM_FLAG  (1 << 10)
-
-/** indicates whether bin ranges are set already or not */
-#define CV_HIST_RANGES_FLAG   (1 << 11)
-
-#define CV_HIST_ARRAY         0
-#define CV_HIST_SPARSE        1
-#define CV_HIST_TREE          CV_HIST_SPARSE
-
-/** should be used as a parameter only,
-   it turns to CV_HIST_UNIFORM_FLAG of hist->type */
-#define CV_HIST_UNIFORM       1
-
-typedef struct CvHistogram
-{
-    int     type;
-    CvArr*  bins;
-    float   thresh[CV_MAX_DIM][2];  /**< For uniform histograms.                      */
-    float** thresh2;                /**< For non-uniform histograms.                  */
-    CvMatND mat;                    /**< Embedded matrix header for array histograms. */
-}
-CvHistogram;
-
-#define CV_IS_HIST( hist ) \
-    ((hist) != NULL  && \
-     (((CvHistogram*)(hist))->type & CV_MAGIC_MASK) == CV_HIST_MAGIC_VAL && \
-     (hist)->bins != NULL)
-
-#define CV_IS_UNIFORM_HIST( hist ) \
-    (((hist)->type & CV_HIST_UNIFORM_FLAG) != 0)
-
-#define CV_IS_SPARSE_HIST( hist ) \
-    CV_IS_SPARSE_MAT((hist)->bins)
-
-#define CV_HIST_HAS_RANGES( hist ) \
-    (((hist)->type & CV_HIST_RANGES_FLAG) != 0)
-
-/****************************************************************************************\
-*                      Other supplementary data type definitions                         *
-\****************************************************************************************/
-
-/*************************************** CvRect *****************************************/
-/** @sa Rect_ */
-typedef struct CvRect
-{
-    int x;
-    int y;
-    int width;
-    int height;
-
-#ifdef CV__VALIDATE_UNUNITIALIZED_VARS
-    CvRect() __attribute__(( warning("Non-initialized variable") )) {};
-    template<typename _Tp> CvRect(const std::initializer_list<_Tp> list)
-    {
-        CV_Assert(list.size() == 0 || list.size() == 4);
-        x = y = width = height = 0;
-        if (list.size() == 4)
-        {
-            x = list.begin()[0]; y = list.begin()[1]; width = list.begin()[2]; height = list.begin()[3];
-        }
-    };
-#elif defined(CV__ENABLE_C_API_CTORS) && defined(__cplusplus)
-    CvRect(int _x = 0, int _y = 0, int w = 0, int h = 0): x(_x), y(_y), width(w), height(h) {}
-    template<typename _Tp>
-    CvRect(const cv::Rect_<_Tp>& r): x(cv::saturate_cast<int>(r.x)), y(cv::saturate_cast<int>(r.y)), width(cv::saturate_cast<int>(r.width)), height(cv::saturate_cast<int>(r.height)) {}
-#endif
-#ifdef __cplusplus
-    template<typename _Tp>
-    operator cv::Rect_<_Tp>() const { return cv::Rect_<_Tp>((_Tp)x, (_Tp)y, (_Tp)width, (_Tp)height); }
-#endif
-}
-CvRect;
-
-/** constructs CvRect structure. */
-CV_INLINE  CvRect  cvRect( int x, int y, int width, int height )
-{
-#if !(defined(CV__ENABLE_C_API_CTORS) && defined(__cplusplus))
-    CvRect r = {x, y, width, height};
-#else
-    CvRect r(x, y , width, height);
-#endif
-    return r;
-}
-#ifdef __cplusplus
-CV_INLINE CvRect cvRect(const cv::Rect& rc) { return cvRect(rc.x, rc.y, rc.width, rc.height); }
-#endif
-
-CV_INLINE  IplROI  cvRectToROI( CvRect rect, int coi )
-{
-    IplROI roi;
-    roi.xOffset = rect.x;
-    roi.yOffset = rect.y;
-    roi.width = rect.width;
-    roi.height = rect.height;
-    roi.coi = coi;
-
-    return roi;
-}
-
-
-CV_INLINE  CvRect  cvROIToRect( IplROI roi )
-{
-    return cvRect( roi.xOffset, roi.yOffset, roi.width, roi.height );
-}
-
-/*********************************** CvTermCriteria *************************************/
-
-#define CV_TERMCRIT_ITER    1
-#define CV_TERMCRIT_NUMBER  CV_TERMCRIT_ITER
-#define CV_TERMCRIT_EPS     2
-
-/** @sa TermCriteria
- */
-typedef struct CvTermCriteria
-{
-    int    type;  /**< may be combination of
-                     CV_TERMCRIT_ITER
-                     CV_TERMCRIT_EPS */
-    int    max_iter;
-    double epsilon;
-#if defined(CV__ENABLE_C_API_CTORS) && defined(__cplusplus)
-    CvTermCriteria(int _type = 0, int _iter = 0, double _eps = 0) : type(_type), max_iter(_iter), epsilon(_eps)  {}
-    CvTermCriteria(const cv::TermCriteria& t) : type(t.type), max_iter(t.maxCount), epsilon(t.epsilon)  {}
-#endif
-#ifdef __cplusplus
-    operator cv::TermCriteria() const { return cv::TermCriteria(type, max_iter, epsilon); }
-#endif
-}
-CvTermCriteria;
-
-CV_INLINE  CvTermCriteria  cvTermCriteria( int type, int max_iter, double epsilon )
-{
-#if !(defined(CV__ENABLE_C_API_CTORS) && defined(__cplusplus))
-    CvTermCriteria t = { type, max_iter, (float)epsilon};
-#else
-    CvTermCriteria t(type, max_iter, epsilon);
-#endif
-    return t;
-}
-#ifdef __cplusplus
-CV_INLINE CvTermCriteria cvTermCriteria(const cv::TermCriteria& t) { return cvTermCriteria(t.type, t.maxCount, t.epsilon); }
-#endif
-
-
-/******************************* CvPoint and variants ***********************************/
-
-typedef struct CvPoint
-{
-    int x;
-    int y;
-
-#ifdef CV__VALIDATE_UNUNITIALIZED_VARS
-    CvPoint() __attribute__(( warning("Non-initialized variable") )) {}
-    template<typename _Tp> CvPoint(const std::initializer_list<_Tp> list)
-    {
-        CV_Assert(list.size() == 0 || list.size() == 2);
-        x = y = 0;
-        if (list.size() == 2)
-        {
-            x = list.begin()[0]; y = list.begin()[1];
-        }
-    };
-#elif defined(CV__ENABLE_C_API_CTORS) && defined(__cplusplus)
-    CvPoint(int _x = 0, int _y = 0): x(_x), y(_y) {}
-    template<typename _Tp>
-    CvPoint(const cv::Point_<_Tp>& pt): x((int)pt.x), y((int)pt.y) {}
-#endif
-#ifdef __cplusplus
-    template<typename _Tp>
-    operator cv::Point_<_Tp>() const { return cv::Point_<_Tp>(cv::saturate_cast<_Tp>(x), cv::saturate_cast<_Tp>(y)); }
-#endif
-}
-CvPoint;
-
-/** constructs CvPoint structure. */
-CV_INLINE  CvPoint  cvPoint( int x, int y )
-{
-#if !(defined(CV__ENABLE_C_API_CTORS) && defined(__cplusplus))
-    CvPoint p = {x, y};
-#else
-    CvPoint p(x, y);
-#endif
-    return p;
-}
-#ifdef __cplusplus
-CV_INLINE CvPoint cvPoint(const cv::Point& pt) { return cvPoint(pt.x, pt.y); }
-#endif
-
-typedef struct CvPoint2D32f
-{
-    float x;
-    float y;
-
-#ifdef CV__VALIDATE_UNUNITIALIZED_VARS
-    CvPoint2D32f() __attribute__(( warning("Non-initialized variable") )) {}
-    template<typename _Tp> CvPoint2D32f(const std::initializer_list<_Tp> list)
-    {
-        CV_Assert(list.size() == 0 || list.size() == 2);
-        x = y = 0;
-        if (list.size() == 2)
-        {
-            x = list.begin()[0]; y = list.begin()[1];
-        }
-    };
-#elif defined(CV__ENABLE_C_API_CTORS) && defined(__cplusplus)
-    CvPoint2D32f(float _x = 0, float _y = 0): x(_x), y(_y) {}
-    template<typename _Tp>
-    CvPoint2D32f(const cv::Point_<_Tp>& pt): x((float)pt.x), y((float)pt.y) {}
-#endif
-#ifdef __cplusplus
-    template<typename _Tp>
-    operator cv::Point_<_Tp>() const { return cv::Point_<_Tp>(cv::saturate_cast<_Tp>(x), cv::saturate_cast<_Tp>(y)); }
-#endif
-}
-CvPoint2D32f;
-
-/** constructs CvPoint2D32f structure. */
-CV_INLINE  CvPoint2D32f  cvPoint2D32f( double x, double y )
-{
-#if !(defined(CV__ENABLE_C_API_CTORS) && defined(__cplusplus))
-    CvPoint2D32f p = { (float)x, (float)y };
-#else
-    CvPoint2D32f p((float)x, (float)y);
-#endif
-    return p;
-}
-
-#ifdef __cplusplus
-template<typename _Tp>
-CvPoint2D32f cvPoint2D32f(const cv::Point_<_Tp>& pt)
-{
-#if !(defined(CV__ENABLE_C_API_CTORS) && defined(__cplusplus))
-    CvPoint2D32f p = { (float)pt.x, (float)pt.y };
-#else
-    CvPoint2D32f p((float)pt.x, (float)pt.y);
-#endif
-    return p;
-}
-#endif
-
-/** converts CvPoint to CvPoint2D32f. */
-CV_INLINE  CvPoint2D32f  cvPointTo32f( CvPoint point )
-{
-    return cvPoint2D32f( (float)point.x, (float)point.y );
-}
-
-/** converts CvPoint2D32f to CvPoint. */
-CV_INLINE  CvPoint  cvPointFrom32f( CvPoint2D32f point )
-{
-#if !(defined(CV__ENABLE_C_API_CTORS) && defined(__cplusplus))
-    CvPoint ipt = { cvRound(point.x), cvRound(point.y) };
-#else
-    CvPoint ipt(cvRound(point.x), cvRound(point.y));
-#endif
-    return ipt;
-}
-
-
-typedef struct CvPoint3D32f
-{
-    float x;
-    float y;
-    float z;
-
-#ifdef CV__VALIDATE_UNUNITIALIZED_VARS
-    CvPoint3D32f() __attribute__(( warning("Non-initialized variable") )) {}
-    template<typename _Tp> CvPoint3D32f(const std::initializer_list<_Tp> list)
-    {
-        CV_Assert(list.size() == 0 || list.size() == 3);
-        x = y = z = 0;
-        if (list.size() == 3)
-        {
-            x = list.begin()[0]; y = list.begin()[1]; z = list.begin()[2];
-        }
-    };
-#elif defined(CV__ENABLE_C_API_CTORS) && defined(__cplusplus)
-    CvPoint3D32f(float _x = 0, float _y = 0, float _z = 0): x(_x), y(_y), z(_z) {}
-    template<typename _Tp>
-    CvPoint3D32f(const cv::Point3_<_Tp>& pt): x((float)pt.x), y((float)pt.y), z((float)pt.z) {}
-#endif
-#ifdef __cplusplus
-    template<typename _Tp>
-    operator cv::Point3_<_Tp>() const { return cv::Point3_<_Tp>(cv::saturate_cast<_Tp>(x), cv::saturate_cast<_Tp>(y), cv::saturate_cast<_Tp>(z)); }
-#endif
-}
-CvPoint3D32f;
-
-/** constructs CvPoint3D32f structure. */
-CV_INLINE  CvPoint3D32f  cvPoint3D32f( double x, double y, double z )
-{
-#if !(defined(CV__ENABLE_C_API_CTORS) && defined(__cplusplus))
-    CvPoint3D32f p = { (float)x, (float)y, (float)z };
-#else
-    CvPoint3D32f p((float)x, (float)y, (float)z);
-#endif
-    return p;
-}
-
-#ifdef __cplusplus
-template<typename _Tp>
-CvPoint3D32f cvPoint3D32f(const cv::Point3_<_Tp>& pt)
-{
-#if !(defined(CV__ENABLE_C_API_CTORS) && defined(__cplusplus))
-    CvPoint3D32f p  = { (float)pt.x, (float)pt.y, (float)pt.z };
-#else
-    CvPoint3D32f p((float)pt.x, (float)pt.y, (float)pt.z);
-#endif
-    return p;
-}
-#endif
-
-
-typedef struct CvPoint2D64f
-{
-    double x;
-    double y;
-#ifdef CV__VALIDATE_UNUNITIALIZED_VARS
-    CvPoint2D64f() __attribute__(( warning("Non-initialized variable") )) {}
-    template<typename _Tp> CvPoint2D64f(const std::initializer_list<_Tp> list)
-    {
-        CV_Assert(list.size() == 0 || list.size() == 2);
-        x = y = 0;
-        if (list.size() == 2)
-        {
-            x = list.begin()[0]; y = list.begin()[1];
-        }
-    };
-#endif
-}
-CvPoint2D64f;
-
-/** constructs CvPoint2D64f structure.*/
-CV_INLINE  CvPoint2D64f  cvPoint2D64f( double x, double y )
-{
-    CvPoint2D64f p = { x, y };
-    return p;
-}
-
-
-typedef struct CvPoint3D64f
-{
-    double x;
-    double y;
-    double z;
-#ifdef CV__VALIDATE_UNUNITIALIZED_VARS
-    CvPoint3D64f() __attribute__(( warning("Non-initialized variable") )) {}
-    template<typename _Tp> CvPoint3D64f(const std::initializer_list<_Tp> list)
-    {
-        CV_Assert(list.size() == 0 || list.size() == 3);
-        x = y = z = 0;
-        if (list.size() == 3)
-        {
-            x = list.begin()[0]; y = list.begin()[1]; z = list.begin()[2];
-        }
-    };
-#endif
-}
-CvPoint3D64f;
-
-/** constructs CvPoint3D64f structure. */
-CV_INLINE  CvPoint3D64f  cvPoint3D64f( double x, double y, double z )
-{
-    CvPoint3D64f p = { x, y, z };
-    return p;
-}
-
-
-/******************************** CvSize's & CvBox **************************************/
-
-typedef struct CvSize
-{
-    int width;
-    int height;
-
-#ifdef CV__VALIDATE_UNUNITIALIZED_VARS
-    CvSize() __attribute__(( warning("Non-initialized variable") )) {}
-    template<typename _Tp> CvSize(const std::initializer_list<_Tp> list)
-    {
-        CV_Assert(list.size() == 0 || list.size() == 2);
-        width = 0; height = 0;
-        if (list.size() == 2)
-        {
-            width = list.begin()[0]; height = list.begin()[1];
-        }
-    };
-#elif defined(CV__ENABLE_C_API_CTORS) && defined(__cplusplus)
-    CvSize(int w = 0, int h = 0): width(w), height(h) {}
-    template<typename _Tp>
-    CvSize(const cv::Size_<_Tp>& sz): width(cv::saturate_cast<int>(sz.width)), height(cv::saturate_cast<int>(sz.height)) {}
-#endif
-#ifdef __cplusplus
-    template<typename _Tp>
-    operator cv::Size_<_Tp>() const { return cv::Size_<_Tp>(cv::saturate_cast<_Tp>(width), cv::saturate_cast<_Tp>(height)); }
-#endif
-}
-CvSize;
-
-/** constructs CvSize structure. */
-CV_INLINE  CvSize  cvSize( int width, int height )
-{
-#if !(defined(CV__ENABLE_C_API_CTORS) && defined(__cplusplus))
-    CvSize s = { width, height };
-#else
-    CvSize s(width, height);
-#endif
-    return s;
-}
-
-#ifdef __cplusplus
-CV_INLINE CvSize cvSize(const cv::Size& sz)
-{
-#if !(defined(CV__ENABLE_C_API_CTORS) && defined(__cplusplus))
-    CvSize s = { sz.width, sz.height };
-#else
-    CvSize s(sz.width, sz.height);
-#endif
-    return s;
-}
-#endif
-
-typedef struct CvSize2D32f
-{
-    float width;
-    float height;
-
-#ifdef CV__VALIDATE_UNUNITIALIZED_VARS
-    CvSize2D32f() __attribute__(( warning("Non-initialized variable") )) {}
-    template<typename _Tp> CvSize2D32f(const std::initializer_list<_Tp> list)
-    {
-        CV_Assert(list.size() == 0 || list.size() == 2);
-        width = 0; height = 0;
-        if (list.size() == 2)
-        {
-            width = list.begin()[0]; height = list.begin()[1];
-        }
-    };
-#elif defined(CV__ENABLE_C_API_CTORS) && defined(__cplusplus)
-    CvSize2D32f(float w = 0, float h = 0): width(w), height(h) {}
-    template<typename _Tp>
-    CvSize2D32f(const cv::Size_<_Tp>& sz): width(cv::saturate_cast<float>(sz.width)), height(cv::saturate_cast<float>(sz.height)) {}
-#endif
-#ifdef __cplusplus
-    template<typename _Tp>
-    operator cv::Size_<_Tp>() const { return cv::Size_<_Tp>(cv::saturate_cast<_Tp>(width), cv::saturate_cast<_Tp>(height)); }
-#endif
-}
-CvSize2D32f;
-
-/** constructs CvSize2D32f structure. */
-CV_INLINE  CvSize2D32f  cvSize2D32f( double width, double height )
-{
-#if !(defined(CV__ENABLE_C_API_CTORS) && defined(__cplusplus))
-    CvSize2D32f s = { (float)width, (float)height };
-#else
-    CvSize2D32f s((float)width, (float)height);
-#endif
-    return s;
-}
-#ifdef __cplusplus
-template<typename _Tp>
-CvSize2D32f cvSize2D32f(const cv::Size_<_Tp>& sz)
-{
-#if !(defined(CV__ENABLE_C_API_CTORS) && defined(__cplusplus))
-    CvSize2D32f s = { (float)sz.width, (float)sz.height };
-#else
-    CvSize2D32f s((float)sz.width, (float)sz.height);
-#endif
-    return s;
-}
-#endif
-
-/** @sa RotatedRect
- */
-typedef struct CvBox2D
-{
-    CvPoint2D32f center;  /**< Center of the box.                          */
-    CvSize2D32f  size;    /**< Box width and length.                       */
-    float angle;          /**< Angle between the horizontal axis           */
-                          /**< and the first side (i.e. length) in degrees */
-
-#if defined(CV__ENABLE_C_API_CTORS) && defined(__cplusplus)
-    CvBox2D(CvPoint2D32f c = CvPoint2D32f(), CvSize2D32f s = CvSize2D32f(), float a = 0) : center(c), size(s), angle(a) {}
-    CvBox2D(const cv::RotatedRect& rr) : center(rr.center), size(rr.size), angle(rr.angle) {}
-#endif
-#ifdef __cplusplus
-    operator cv::RotatedRect() const { return cv::RotatedRect(center, size, angle); }
-#endif
-}
-CvBox2D;
-
-
-#ifdef __cplusplus
-CV_INLINE CvBox2D cvBox2D(CvPoint2D32f c = CvPoint2D32f(), CvSize2D32f s = CvSize2D32f(), float a = 0)
-{
-    CvBox2D self;
-    self.center = c;
-    self.size = s;
-    self.angle = a;
-    return self;
-}
-CV_INLINE CvBox2D cvBox2D(const cv::RotatedRect& rr)
-{
-    CvBox2D self;
-    self.center = cvPoint2D32f(rr.center);
-    self.size = cvSize2D32f(rr.size);
-    self.angle = rr.angle;
-    return self;
-}
-#endif
-
-
-/** Line iterator state: */
-typedef struct CvLineIterator
-{
-    /** Pointer to the current point: */
-    uchar* ptr;
-
-    /* Bresenham algorithm state: */
-    int  err;
-    int  plus_delta;
-    int  minus_delta;
-    int  plus_step;
-    int  minus_step;
-}
-CvLineIterator;
-
-
-
-/************************************* CvSlice ******************************************/
-#define CV_WHOLE_SEQ_END_INDEX 0x3fffffff
-#define CV_WHOLE_SEQ  cvSlice(0, CV_WHOLE_SEQ_END_INDEX)
-
-typedef struct CvSlice
-{
-    int  start_index, end_index;
-
-#ifdef CV__VALIDATE_UNUNITIALIZED_VARS
-    CvSlice() __attribute__(( warning("Non-initialized variable") )) {}
-    template<typename _Tp> CvSlice(const std::initializer_list<_Tp> list)
-    {
-        CV_Assert(list.size() == 0 || list.size() == 2);
-        start_index = end_index = 0;
-        if (list.size() == 2)
-        {
-            start_index = list.begin()[0]; end_index = list.begin()[1];
-        }
-    };
-#endif
-#if defined(CV__ENABLE_C_API_CTORS) && defined(__cplusplus) && !defined(__CUDACC__)
-    CvSlice(int start = 0, int end = 0) : start_index(start), end_index(end) {}
-    CvSlice(const cv::Range& r) { *this = (r.start != INT_MIN && r.end != INT_MAX) ? CvSlice(r.start, r.end) : CvSlice(0, CV_WHOLE_SEQ_END_INDEX); }
-    operator cv::Range() const { return (start_index == 0 && end_index == CV_WHOLE_SEQ_END_INDEX ) ? cv::Range::all() : cv::Range(start_index, end_index); }
-#endif
-}
-CvSlice;
-
-CV_INLINE  CvSlice  cvSlice( int start, int end )
-{
-#if !(defined(CV__ENABLE_C_API_CTORS) && defined(__cplusplus) && !defined(__CUDACC__))
-    CvSlice slice = { start, end };
-#else
-    CvSlice slice(start, end);
-#endif
-    return slice;
-}
-
-#if defined(__cplusplus)
-CV_INLINE  CvSlice  cvSlice(const cv::Range& r)
-{
-    CvSlice slice = (r.start != INT_MIN && r.end != INT_MAX) ? cvSlice(r.start, r.end) : cvSlice(0, CV_WHOLE_SEQ_END_INDEX);
-    return slice;
-}
-#endif
-
-
-/************************************* CvScalar *****************************************/
-/** @sa Scalar_
- */
-typedef struct CvScalar
-{
-    double val[4];
-
-#ifdef CV__VALIDATE_UNUNITIALIZED_VARS
-    CvScalar() __attribute__(( warning("Non-initialized variable") )) {}
-    CvScalar(const std::initializer_list<double> list)
-    {
-        CV_Assert(list.size() == 0 || list.size() == 4);
-        val[0] = val[1] = val[2] = val[3] = 0;
-        if (list.size() == 4)
-        {
-            val[0] = list.begin()[0]; val[1] = list.begin()[1]; val[2] = list.begin()[2]; val[3] = list.begin()[3];
-        }
-    };
-#elif defined(CV__ENABLE_C_API_CTORS) && defined(__cplusplus)
-    CvScalar() {}
-    CvScalar(double d0, double d1 = 0, double d2 = 0, double d3 = 0) { val[0] = d0; val[1] = d1; val[2] = d2; val[3] = d3; }
-    template<typename _Tp>
-    CvScalar(const cv::Scalar_<_Tp>& s) { val[0] = s.val[0]; val[1] = s.val[1]; val[2] = s.val[2]; val[3] = s.val[3]; }
-    template<typename _Tp, int cn>
-    CvScalar(const cv::Vec<_Tp, cn>& v)
-    {
-        int i;
-        for( i = 0; i < (cn < 4 ? cn : 4); i++ ) val[i] = v.val[i];
-        for( ; i < 4; i++ ) val[i] = 0;
-    }
-#endif
-#ifdef __cplusplus
-    template<typename _Tp>
-    operator cv::Scalar_<_Tp>() const { return cv::Scalar_<_Tp>(cv::saturate_cast<_Tp>(val[0]), cv::saturate_cast<_Tp>(val[1]), cv::saturate_cast<_Tp>(val[2]), cv::saturate_cast<_Tp>(val[3])); }
-#endif
-}
-CvScalar;
-
-CV_INLINE  CvScalar  cvScalar( double val0, double val1 CV_DEFAULT(0),
-                               double val2 CV_DEFAULT(0), double val3 CV_DEFAULT(0))
-{
-#if !(defined(CV__ENABLE_C_API_CTORS) && defined(__cplusplus))
-    CvScalar scalar = CV_STRUCT_INITIALIZER;
-#else
-    CvScalar scalar;
-#endif
-    scalar.val[0] = val0; scalar.val[1] = val1;
-    scalar.val[2] = val2; scalar.val[3] = val3;
-    return scalar;
-}
-
-#ifdef __cplusplus
-CV_INLINE CvScalar cvScalar()
-{
-#if !(defined(CV__ENABLE_C_API_CTORS) && defined(__cplusplus))
-    CvScalar scalar = CV_STRUCT_INITIALIZER;
-#else
-    CvScalar scalar;
-#endif
-    scalar.val[0] = scalar.val[1] = scalar.val[2] = scalar.val[3] = 0;
-    return scalar;
-}
-CV_INLINE CvScalar cvScalar(const cv::Scalar& s)
-{
-#if !(defined(CV__ENABLE_C_API_CTORS) && defined(__cplusplus))
-    CvScalar scalar = CV_STRUCT_INITIALIZER;
-#else
-    CvScalar scalar;
-#endif
-    scalar.val[0] = s.val[0];
-    scalar.val[1] = s.val[1];
-    scalar.val[2] = s.val[2];
-    scalar.val[3] = s.val[3];
-    return scalar;
-}
-#endif
-
-CV_INLINE  CvScalar  cvRealScalar( double val0 )
-{
-#if !(defined(CV__ENABLE_C_API_CTORS) && defined(__cplusplus))
-    CvScalar scalar = CV_STRUCT_INITIALIZER;
-#else
-    CvScalar scalar;
-#endif
-    scalar.val[0] = val0;
-    scalar.val[1] = scalar.val[2] = scalar.val[3] = 0;
-    return scalar;
-}
-
-CV_INLINE  CvScalar  cvScalarAll( double val0123 )
-{
-#if !(defined(CV__ENABLE_C_API_CTORS) && defined(__cplusplus))
-    CvScalar scalar = CV_STRUCT_INITIALIZER;
-#else
-    CvScalar scalar;
-#endif
-    scalar.val[0] = val0123;
-    scalar.val[1] = val0123;
-    scalar.val[2] = val0123;
-    scalar.val[3] = val0123;
-    return scalar;
-}
-
-/****************************************************************************************\
-*                                   Dynamic Data structures                              *
-\****************************************************************************************/
-
-/******************************** Memory storage ****************************************/
-
-typedef struct CvMemBlock
-{
-    struct CvMemBlock*  prev;
-    struct CvMemBlock*  next;
-}
-CvMemBlock;
-
-#define CV_STORAGE_MAGIC_VAL    0x42890000
-
-typedef struct CvMemStorage
-{
-    int signature;
-    CvMemBlock* bottom;           /**< First allocated block.                   */
-    CvMemBlock* top;              /**< Current memory block - top of the stack. */
-    struct  CvMemStorage* parent; /**< We get new blocks from parent as needed. */
-    int block_size;               /**< Block size.                              */
-    int free_space;               /**< Remaining free space in current block.   */
-}
-CvMemStorage;
-
-#define CV_IS_STORAGE(storage)  \
-    ((storage) != NULL &&       \
-    (((CvMemStorage*)(storage))->signature & CV_MAGIC_MASK) == CV_STORAGE_MAGIC_VAL)
-
-
-typedef struct CvMemStoragePos
-{
-    CvMemBlock* top;
-    int free_space;
-}
-CvMemStoragePos;
-
-
-/*********************************** Sequence *******************************************/
-
-typedef struct CvSeqBlock
-{
-    struct CvSeqBlock*  prev; /**< Previous sequence block.                   */
-    struct CvSeqBlock*  next; /**< Next sequence block.                       */
-    int    start_index;       /**< Index of the first element in the block +  */
-                              /**< sequence->first->start_index.              */
-    int    count;             /**< Number of elements in the block.           */
-    schar* data;              /**< Pointer to the first element of the block. */
-}
-CvSeqBlock;
-
-
-#define CV_TREE_NODE_FIELDS(node_type)                               \
-    int       flags;             /**< Miscellaneous flags.     */      \
-    int       header_size;       /**< Size of sequence header. */      \
-    struct    node_type* h_prev; /**< Previous sequence.       */      \
-    struct    node_type* h_next; /**< Next sequence.           */      \
-    struct    node_type* v_prev; /**< 2nd previous sequence.   */      \
-    struct    node_type* v_next  /**< 2nd next sequence.       */
-
-/**
-   Read/Write sequence.
-   Elements can be dynamically inserted to or deleted from the sequence.
-*/
-#define CV_SEQUENCE_FIELDS()                                              \
-    CV_TREE_NODE_FIELDS(CvSeq);                                           \
-    int       total;          /**< Total number of elements.            */  \
-    int       elem_size;      /**< Size of sequence element in bytes.   */  \
-    schar*    block_max;      /**< Maximal bound of the last block.     */  \
-    schar*    ptr;            /**< Current write pointer.               */  \
-    int       delta_elems;    /**< Grow seq this many at a time.        */  \
-    CvMemStorage* storage;    /**< Where the seq is stored.             */  \
-    CvSeqBlock* free_blocks;  /**< Free blocks list.                    */  \
-    CvSeqBlock* first;        /**< Pointer to the first sequence block. */
-
-typedef struct CvSeq
-{
-    CV_SEQUENCE_FIELDS()
-}
-CvSeq;
-
-#define CV_TYPE_NAME_SEQ             "opencv-sequence"
-#define CV_TYPE_NAME_SEQ_TREE        "opencv-sequence-tree"
-
-/*************************************** Set ********************************************/
-/** @brief Set
-  Order is not preserved. There can be gaps between sequence elements.
-  After the element has been inserted it stays in the same place all the time.
-  The MSB(most-significant or sign bit) of the first field (flags) is 0 iff the element exists.
-*/
-#define CV_SET_ELEM_FIELDS(elem_type)   \
-    int  flags;                         \
-    struct elem_type* next_free;
-
-typedef struct CvSetElem
-{
-    CV_SET_ELEM_FIELDS(CvSetElem)
-}
-CvSetElem;
-
-#define CV_SET_FIELDS()      \
-    CV_SEQUENCE_FIELDS()     \
-    CvSetElem* free_elems;   \
-    int active_count;
-
-typedef struct CvSet
-{
-    CV_SET_FIELDS()
-}
-CvSet;
-
-
-#define CV_SET_ELEM_IDX_MASK   ((1 << 26) - 1)
-#define CV_SET_ELEM_FREE_FLAG  (1 << (sizeof(int)*8-1))
-
-/** Checks whether the element pointed by ptr belongs to a set or not */
-#define CV_IS_SET_ELEM( ptr )  (((CvSetElem*)(ptr))->flags >= 0)
-
-/************************************* Graph ********************************************/
-
-/** @name Graph
-
-We represent a graph as a set of vertices. Vertices contain their adjacency lists (more exactly,
-pointers to first incoming or outcoming edge (or 0 if isolated vertex)). Edges are stored in
-another set. There is a singly-linked list of incoming/outcoming edges for each vertex.
-
-Each edge consists of:
-
-- Two pointers to the starting and ending vertices (vtx[0] and vtx[1] respectively).
-
-    A graph may be oriented or not. In the latter case, edges between vertex i to vertex j are not
-distinguished during search operations.
-
-- Two pointers to next edges for the starting and ending vertices, where next[0] points to the
-next edge in the vtx[0] adjacency list and next[1] points to the next edge in the vtx[1]
-adjacency list.
-
-@see CvGraphEdge, CvGraphVtx, CvGraphVtx2D, CvGraph
-@{
-*/
-#define CV_GRAPH_EDGE_FIELDS()      \
-    int flags;                      \
-    float weight;                   \
-    struct CvGraphEdge* next[2];    \
-    struct CvGraphVtx* vtx[2];
-
-
-#define CV_GRAPH_VERTEX_FIELDS()    \
-    int flags;                      \
-    struct CvGraphEdge* first;
-
-
-typedef struct CvGraphEdge
-{
-    CV_GRAPH_EDGE_FIELDS()
-}
-CvGraphEdge;
-
-typedef struct CvGraphVtx
-{
-    CV_GRAPH_VERTEX_FIELDS()
-}
-CvGraphVtx;
-
-typedef struct CvGraphVtx2D
-{
-    CV_GRAPH_VERTEX_FIELDS()
-    CvPoint2D32f* ptr;
-}
-CvGraphVtx2D;
-
-/**
-   Graph is "derived" from the set (this is set a of vertices)
-   and includes another set (edges)
-*/
-#define  CV_GRAPH_FIELDS()   \
-    CV_SET_FIELDS()          \
-    CvSet* edges;
-
-typedef struct CvGraph
-{
-    CV_GRAPH_FIELDS()
-}
-CvGraph;
-
-#define CV_TYPE_NAME_GRAPH "opencv-graph"
-
-/** @} */
-
-/*********************************** Chain/Contour *************************************/
-
-typedef struct CvChain
-{
-    CV_SEQUENCE_FIELDS()
-    CvPoint  origin;
-}
-CvChain;
-
-#define CV_CONTOUR_FIELDS()  \
-    CV_SEQUENCE_FIELDS()     \
-    CvRect rect;             \
-    int color;               \
-    int reserved[3];
-
-typedef struct CvContour
-{
-    CV_CONTOUR_FIELDS()
-}
-CvContour;
-
-typedef CvContour CvPoint2DSeq;
-
-/****************************************************************************************\
-*                                    Sequence types                                      *
-\****************************************************************************************/
-
-#define CV_SEQ_MAGIC_VAL             0x42990000
-
-#define CV_IS_SEQ(seq) \
-    ((seq) != NULL && (((CvSeq*)(seq))->flags & CV_MAGIC_MASK) == CV_SEQ_MAGIC_VAL)
-
-#define CV_SET_MAGIC_VAL             0x42980000
-#define CV_IS_SET(set) \
-    ((set) != NULL && (((CvSeq*)(set))->flags & CV_MAGIC_MASK) == CV_SET_MAGIC_VAL)
-
-#define CV_SEQ_ELTYPE_BITS           12
-#define CV_SEQ_ELTYPE_MASK           ((1 << CV_SEQ_ELTYPE_BITS) - 1)
-
-#define CV_SEQ_ELTYPE_POINT          CV_32SC2  /**< (x,y) */
-#define CV_SEQ_ELTYPE_CODE           CV_8UC1   /**< freeman code: 0..7 */
-#define CV_SEQ_ELTYPE_GENERIC        0
-#define CV_SEQ_ELTYPE_PTR            CV_MAKE_TYPE(CV_8U, 8 /*sizeof(void*)*/)
-#define CV_SEQ_ELTYPE_PPOINT         CV_SEQ_ELTYPE_PTR  /**< &(x,y) */
-#define CV_SEQ_ELTYPE_INDEX          CV_32SC1  /**< #(x,y) */
-#define CV_SEQ_ELTYPE_GRAPH_EDGE     0  /**< &next_o, &next_d, &vtx_o, &vtx_d */
-#define CV_SEQ_ELTYPE_GRAPH_VERTEX   0  /**< first_edge, &(x,y) */
-#define CV_SEQ_ELTYPE_TRIAN_ATR      0  /**< vertex of the binary tree   */
-#define CV_SEQ_ELTYPE_CONNECTED_COMP 0  /**< connected component  */
-#define CV_SEQ_ELTYPE_POINT3D        CV_32FC3  /**< (x,y,z)  */
-
-#define CV_SEQ_KIND_BITS        2
-#define CV_SEQ_KIND_MASK        (((1 << CV_SEQ_KIND_BITS) - 1)<<CV_SEQ_ELTYPE_BITS)
-
-/** types of sequences */
-#define CV_SEQ_KIND_GENERIC     (0 << CV_SEQ_ELTYPE_BITS)
-#define CV_SEQ_KIND_CURVE       (1 << CV_SEQ_ELTYPE_BITS)
-#define CV_SEQ_KIND_BIN_TREE    (2 << CV_SEQ_ELTYPE_BITS)
-
-/** types of sparse sequences (sets) */
-#define CV_SEQ_KIND_GRAPH       (1 << CV_SEQ_ELTYPE_BITS)
-#define CV_SEQ_KIND_SUBDIV2D    (2 << CV_SEQ_ELTYPE_BITS)
-
-#define CV_SEQ_FLAG_SHIFT       (CV_SEQ_KIND_BITS + CV_SEQ_ELTYPE_BITS)
-
-/** flags for curves */
-#define CV_SEQ_FLAG_CLOSED     (1 << CV_SEQ_FLAG_SHIFT)
-#define CV_SEQ_FLAG_SIMPLE     (0 << CV_SEQ_FLAG_SHIFT)
-#define CV_SEQ_FLAG_CONVEX     (0 << CV_SEQ_FLAG_SHIFT)
-#define CV_SEQ_FLAG_HOLE       (2 << CV_SEQ_FLAG_SHIFT)
-
-/** flags for graphs */
-#define CV_GRAPH_FLAG_ORIENTED (1 << CV_SEQ_FLAG_SHIFT)
-
-#define CV_GRAPH               CV_SEQ_KIND_GRAPH
-#define CV_ORIENTED_GRAPH      (CV_SEQ_KIND_GRAPH|CV_GRAPH_FLAG_ORIENTED)
-
-/** point sets */
-#define CV_SEQ_POINT_SET       (CV_SEQ_KIND_GENERIC| CV_SEQ_ELTYPE_POINT)
-#define CV_SEQ_POINT3D_SET     (CV_SEQ_KIND_GENERIC| CV_SEQ_ELTYPE_POINT3D)
-#define CV_SEQ_POLYLINE        (CV_SEQ_KIND_CURVE  | CV_SEQ_ELTYPE_POINT)
-#define CV_SEQ_POLYGON         (CV_SEQ_FLAG_CLOSED | CV_SEQ_POLYLINE )
-#define CV_SEQ_CONTOUR         CV_SEQ_POLYGON
-#define CV_SEQ_SIMPLE_POLYGON  (CV_SEQ_FLAG_SIMPLE | CV_SEQ_POLYGON  )
-
-/** chain-coded curves */
-#define CV_SEQ_CHAIN           (CV_SEQ_KIND_CURVE  | CV_SEQ_ELTYPE_CODE)
-#define CV_SEQ_CHAIN_CONTOUR   (CV_SEQ_FLAG_CLOSED | CV_SEQ_CHAIN)
-
-/** binary tree for the contour */
-#define CV_SEQ_POLYGON_TREE    (CV_SEQ_KIND_BIN_TREE  | CV_SEQ_ELTYPE_TRIAN_ATR)
-
-/** sequence of the connected components */
-#define CV_SEQ_CONNECTED_COMP  (CV_SEQ_KIND_GENERIC  | CV_SEQ_ELTYPE_CONNECTED_COMP)
-
-/** sequence of the integer numbers */
-#define CV_SEQ_INDEX           (CV_SEQ_KIND_GENERIC  | CV_SEQ_ELTYPE_INDEX)
-
-#define CV_SEQ_ELTYPE( seq )   ((seq)->flags & CV_SEQ_ELTYPE_MASK)
-#define CV_SEQ_KIND( seq )     ((seq)->flags & CV_SEQ_KIND_MASK )
-
-/** flag checking */
-#define CV_IS_SEQ_INDEX( seq )      ((CV_SEQ_ELTYPE(seq) == CV_SEQ_ELTYPE_INDEX) && \
-                                     (CV_SEQ_KIND(seq) == CV_SEQ_KIND_GENERIC))
-
-#define CV_IS_SEQ_CURVE( seq )      (CV_SEQ_KIND(seq) == CV_SEQ_KIND_CURVE)
-#define CV_IS_SEQ_CLOSED( seq )     (((seq)->flags & CV_SEQ_FLAG_CLOSED) != 0)
-#define CV_IS_SEQ_CONVEX( seq )     0
-#define CV_IS_SEQ_HOLE( seq )       (((seq)->flags & CV_SEQ_FLAG_HOLE) != 0)
-#define CV_IS_SEQ_SIMPLE( seq )     1
-
-/** type checking macros */
-#define CV_IS_SEQ_POINT_SET( seq ) \
-    ((CV_SEQ_ELTYPE(seq) == CV_32SC2 || CV_SEQ_ELTYPE(seq) == CV_32FC2))
-
-#define CV_IS_SEQ_POINT_SUBSET( seq ) \
-    (CV_IS_SEQ_INDEX( seq ) || CV_SEQ_ELTYPE(seq) == CV_SEQ_ELTYPE_PPOINT)
-
-#define CV_IS_SEQ_POLYLINE( seq )   \
-    (CV_SEQ_KIND(seq) == CV_SEQ_KIND_CURVE && CV_IS_SEQ_POINT_SET(seq))
-
-#define CV_IS_SEQ_POLYGON( seq )   \
-    (CV_IS_SEQ_POLYLINE(seq) && CV_IS_SEQ_CLOSED(seq))
-
-#define CV_IS_SEQ_CHAIN( seq )   \
-    (CV_SEQ_KIND(seq) == CV_SEQ_KIND_CURVE && (seq)->elem_size == 1)
-
-#define CV_IS_SEQ_CONTOUR( seq )   \
-    (CV_IS_SEQ_CLOSED(seq) && (CV_IS_SEQ_POLYLINE(seq) || CV_IS_SEQ_CHAIN(seq)))
-
-#define CV_IS_SEQ_CHAIN_CONTOUR( seq ) \
-    (CV_IS_SEQ_CHAIN( seq ) && CV_IS_SEQ_CLOSED( seq ))
-
-#define CV_IS_SEQ_POLYGON_TREE( seq ) \
-    (CV_SEQ_ELTYPE (seq) ==  CV_SEQ_ELTYPE_TRIAN_ATR &&    \
-    CV_SEQ_KIND( seq ) ==  CV_SEQ_KIND_BIN_TREE )
-
-#define CV_IS_GRAPH( seq )    \
-    (CV_IS_SET(seq) && CV_SEQ_KIND((CvSet*)(seq)) == CV_SEQ_KIND_GRAPH)
-
-#define CV_IS_GRAPH_ORIENTED( seq )   \
-    (((seq)->flags & CV_GRAPH_FLAG_ORIENTED) != 0)
-
-#define CV_IS_SUBDIV2D( seq )  \
-    (CV_IS_SET(seq) && CV_SEQ_KIND((CvSet*)(seq)) == CV_SEQ_KIND_SUBDIV2D)
-
-/****************************************************************************************/
-/*                            Sequence writer & reader                                  */
-/****************************************************************************************/
-
-#define CV_SEQ_WRITER_FIELDS()                                     \
-    int          header_size;                                      \
-    CvSeq*       seq;        /**< the sequence written */            \
-    CvSeqBlock*  block;      /**< current block */                   \
-    schar*       ptr;        /**< pointer to free space */           \
-    schar*       block_min;  /**< pointer to the beginning of block*/\
-    schar*       block_max;  /**< pointer to the end of block */
-
-typedef struct CvSeqWriter
-{
-    CV_SEQ_WRITER_FIELDS()
-}
-CvSeqWriter;
-
-
-#define CV_SEQ_READER_FIELDS()                                      \
-    int          header_size;                                       \
-    CvSeq*       seq;        /**< sequence, beign read */             \
-    CvSeqBlock*  block;      /**< current block */                    \
-    schar*       ptr;        /**< pointer to element be read next */  \
-    schar*       block_min;  /**< pointer to the beginning of block */\
-    schar*       block_max;  /**< pointer to the end of block */      \
-    int          delta_index;/**< = seq->first->start_index   */      \
-    schar*       prev_elem;  /**< pointer to previous element */
-
-typedef struct CvSeqReader
-{
-    CV_SEQ_READER_FIELDS()
-}
-CvSeqReader;
-
-/****************************************************************************************/
-/*                                Operations on sequences                               */
-/****************************************************************************************/
-
-#define  CV_SEQ_ELEM( seq, elem_type, index )                    \
-/** assert gives some guarantee that <seq> parameter is valid */  \
-(   assert(sizeof((seq)->first[0]) == sizeof(CvSeqBlock) &&      \
-    (seq)->elem_size == sizeof(elem_type)),                      \
-    (elem_type*)((seq)->first && (unsigned)index <               \
-    (unsigned)((seq)->first->count) ?                            \
-    (seq)->first->data + (index) * sizeof(elem_type) :           \
-    cvGetSeqElem( (CvSeq*)(seq), (index) )))
-#define CV_GET_SEQ_ELEM( elem_type, seq, index ) CV_SEQ_ELEM( (seq), elem_type, (index) )
-
-/** Add element to sequence: */
-#define CV_WRITE_SEQ_ELEM_VAR( elem_ptr, writer )     \
-{                                                     \
-    if( (writer).ptr >= (writer).block_max )          \
-    {                                                 \
-        cvCreateSeqBlock( &writer);                   \
-    }                                                 \
-    memcpy((writer).ptr, elem_ptr, (writer).seq->elem_size);\
-    (writer).ptr += (writer).seq->elem_size;          \
-}
-
-#define CV_WRITE_SEQ_ELEM( elem, writer )             \
-{                                                     \
-    assert( (writer).seq->elem_size == sizeof(elem)); \
-    if( (writer).ptr >= (writer).block_max )          \
-    {                                                 \
-        cvCreateSeqBlock( &writer);                   \
-    }                                                 \
-    assert( (writer).ptr <= (writer).block_max - sizeof(elem));\
-    memcpy((writer).ptr, &(elem), sizeof(elem));      \
-    (writer).ptr += sizeof(elem);                     \
-}
-
-
-/** Move reader position forward: */
-#define CV_NEXT_SEQ_ELEM( elem_size, reader )                 \
-{                                                             \
-    if( ((reader).ptr += (elem_size)) >= (reader).block_max ) \
-    {                                                         \
-        cvChangeSeqBlock( &(reader), 1 );                     \
-    }                                                         \
-}
-
-
-/** Move reader position backward: */
-#define CV_PREV_SEQ_ELEM( elem_size, reader )                \
-{                                                            \
-    if( ((reader).ptr -= (elem_size)) < (reader).block_min ) \
-    {                                                        \
-        cvChangeSeqBlock( &(reader), -1 );                   \
-    }                                                        \
-}
-
-/** Read element and move read position forward: */
-#define CV_READ_SEQ_ELEM( elem, reader )                       \
-{                                                              \
-    assert( (reader).seq->elem_size == sizeof(elem));          \
-    memcpy( &(elem), (reader).ptr, sizeof((elem)));            \
-    CV_NEXT_SEQ_ELEM( sizeof(elem), reader )                   \
-}
-
-/** Read element and move read position backward: */
-#define CV_REV_READ_SEQ_ELEM( elem, reader )                     \
-{                                                                \
-    assert( (reader).seq->elem_size == sizeof(elem));            \
-    memcpy(&(elem), (reader).ptr, sizeof((elem)));               \
-    CV_PREV_SEQ_ELEM( sizeof(elem), reader )                     \
-}
-
-
-#define CV_READ_CHAIN_POINT( _pt, reader )                              \
-{                                                                       \
-    (_pt) = (reader).pt;                                                \
-    if( (reader).ptr )                                                  \
-    {                                                                   \
-        CV_READ_SEQ_ELEM( (reader).code, (reader));                     \
-        assert( ((reader).code & ~7) == 0 );                            \
-        (reader).pt.x += (reader).deltas[(int)(reader).code][0];        \
-        (reader).pt.y += (reader).deltas[(int)(reader).code][1];        \
-    }                                                                   \
-}
-
-#define CV_CURRENT_POINT( reader )  (*((CvPoint*)((reader).ptr)))
-#define CV_PREV_POINT( reader )     (*((CvPoint*)((reader).prev_elem)))
-
-#define CV_READ_EDGE( pt1, pt2, reader )               \
-{                                                      \
-    assert( sizeof(pt1) == sizeof(CvPoint) &&          \
-            sizeof(pt2) == sizeof(CvPoint) &&          \
-            reader.seq->elem_size == sizeof(CvPoint)); \
-    (pt1) = CV_PREV_POINT( reader );                   \
-    (pt2) = CV_CURRENT_POINT( reader );                \
-    (reader).prev_elem = (reader).ptr;                 \
-    CV_NEXT_SEQ_ELEM( sizeof(CvPoint), (reader));      \
-}
-
-/************ Graph macros ************/
-
-/** Return next graph edge for given vertex: */
-#define  CV_NEXT_GRAPH_EDGE( edge, vertex )                              \
-     (assert((edge)->vtx[0] == (vertex) || (edge)->vtx[1] == (vertex)),  \
-      (edge)->next[(edge)->vtx[1] == (vertex)])
-
-
-
-/****************************************************************************************\
-*             Data structures for persistence (a.k.a serialization) functionality        *
-\****************************************************************************************/
-
-#if 0
-
-/** "black box" file storage */
-typedef struct CvFileStorage CvFileStorage;
-
-/** Storage flags: */
-#define CV_STORAGE_READ          0
-#define CV_STORAGE_WRITE         1
-#define CV_STORAGE_WRITE_TEXT    CV_STORAGE_WRITE
-#define CV_STORAGE_WRITE_BINARY  CV_STORAGE_WRITE
-#define CV_STORAGE_APPEND        2
-#define CV_STORAGE_MEMORY        4
-#define CV_STORAGE_FORMAT_MASK   (7<<3)
-#define CV_STORAGE_FORMAT_AUTO   0
-#define CV_STORAGE_FORMAT_XML    8
-#define CV_STORAGE_FORMAT_YAML  16
-#define CV_STORAGE_FORMAT_JSON  24
-#define CV_STORAGE_BASE64       64
-#define CV_STORAGE_WRITE_BASE64  (CV_STORAGE_BASE64 | CV_STORAGE_WRITE)
-
-/** @brief List of attributes. :
-
-In the current implementation, attributes are used to pass extra parameters when writing user
-objects (see cvWrite). XML attributes inside tags are not supported, aside from the object type
-specification (type_id attribute).
-@see cvAttrList, cvAttrValue
- */
-typedef struct CvAttrList
-{
-    const char** attr;         /**< NULL-terminated array of (attribute_name,attribute_value) pairs. */
-    struct CvAttrList* next;   /**< Pointer to next chunk of the attributes list.                    */
-}
-CvAttrList;
-
-/** initializes CvAttrList structure */
-CV_INLINE CvAttrList cvAttrList( const char** attr CV_DEFAULT(NULL),
-                                 CvAttrList* next CV_DEFAULT(NULL) )
-{
-    CvAttrList l;
-    l.attr = attr;
-    l.next = next;
-
-    return l;
-}
-
-struct CvTypeInfo;
-
-#define CV_NODE_NONE        0
-#define CV_NODE_INT         1
-#define CV_NODE_INTEGER     CV_NODE_INT
-#define CV_NODE_REAL        2
-#define CV_NODE_FLOAT       CV_NODE_REAL
-#define CV_NODE_STR         3
-#define CV_NODE_STRING      CV_NODE_STR
-#define CV_NODE_REF         4 /**< not used */
-#define CV_NODE_SEQ         5
-#define CV_NODE_MAP         6
-#define CV_NODE_TYPE_MASK   7
-
-#define CV_NODE_TYPE(flags)  ((flags) & CV_NODE_TYPE_MASK)
-
-/** file node flags */
-#define CV_NODE_FLOW        8 /**<Used only for writing structures in YAML format. */
-#define CV_NODE_USER        16
-#define CV_NODE_EMPTY       32
-#define CV_NODE_NAMED       64
-
-#define CV_NODE_IS_INT(flags)        (CV_NODE_TYPE(flags) == CV_NODE_INT)
-#define CV_NODE_IS_REAL(flags)       (CV_NODE_TYPE(flags) == CV_NODE_REAL)
-#define CV_NODE_IS_STRING(flags)     (CV_NODE_TYPE(flags) == CV_NODE_STRING)
-#define CV_NODE_IS_SEQ(flags)        (CV_NODE_TYPE(flags) == CV_NODE_SEQ)
-#define CV_NODE_IS_MAP(flags)        (CV_NODE_TYPE(flags) == CV_NODE_MAP)
-#define CV_NODE_IS_COLLECTION(flags) (CV_NODE_TYPE(flags) >= CV_NODE_SEQ)
-#define CV_NODE_IS_FLOW(flags)       (((flags) & CV_NODE_FLOW) != 0)
-#define CV_NODE_IS_EMPTY(flags)      (((flags) & CV_NODE_EMPTY) != 0)
-#define CV_NODE_IS_USER(flags)       (((flags) & CV_NODE_USER) != 0)
-#define CV_NODE_HAS_NAME(flags)      (((flags) & CV_NODE_NAMED) != 0)
-
-#define CV_NODE_SEQ_SIMPLE 256
-#define CV_NODE_SEQ_IS_SIMPLE(seq) (((seq)->flags & CV_NODE_SEQ_SIMPLE) != 0)
-
-typedef struct CvString
-{
-    int len;
-    char* ptr;
-}
-CvString;
-
-/** All the keys (names) of elements in the read file storage
-   are stored in the hash to speed up the lookup operations: */
-typedef struct CvStringHashNode
-{
-    unsigned hashval;
-    CvString str;
-    struct CvStringHashNode* next;
-}
-CvStringHashNode;
-
-typedef struct CvGenericHash CvFileNodeHash;
-
-/** Basic element of the file storage - scalar or collection: */
-typedef struct CvFileNode
-{
-    int tag;
-    struct CvTypeInfo* info; /**< type information
-            (only for user-defined object, for others it is 0) */
-    union
-    {
-        double f; /**< scalar floating-point number */
-        int i;    /**< scalar integer number */
-        CvString str; /**< text string */
-        CvSeq* seq; /**< sequence (ordered collection of file nodes) */
-        CvFileNodeHash* map; /**< map (collection of named file nodes) */
-    } data;
-}
-CvFileNode;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-typedef int (CV_CDECL *CvIsInstanceFunc)( const void* struct_ptr );
-typedef void (CV_CDECL *CvReleaseFunc)( void** struct_dblptr );
-typedef void* (CV_CDECL *CvReadFunc)( CvFileStorage* storage, CvFileNode* node );
-typedef void (CV_CDECL *CvWriteFunc)( CvFileStorage* storage, const char* name,
-                                      const void* struct_ptr, CvAttrList attributes );
-typedef void* (CV_CDECL *CvCloneFunc)( const void* struct_ptr );
-#ifdef __cplusplus
-}
-#endif
-
-/** @brief Type information
-
-The structure contains information about one of the standard or user-defined types. Instances of the
-type may or may not contain a pointer to the corresponding CvTypeInfo structure. In any case, there
-is a way to find the type info structure for a given object using the cvTypeOf function.
-Alternatively, type info can be found by type name using cvFindType, which is used when an object
-is read from file storage. The user can register a new type with cvRegisterType that adds the type
-information structure into the beginning of the type list. Thus, it is possible to create
-specialized types from generic standard types and override the basic methods.
- */
-typedef struct CvTypeInfo
-{
-    int flags; /**< not used */
-    int header_size; /**< sizeof(CvTypeInfo) */
-    struct CvTypeInfo* prev; /**< previous registered type in the list */
-    struct CvTypeInfo* next; /**< next registered type in the list */
-    const char* type_name; /**< type name, written to file storage */
-    CvIsInstanceFunc is_instance; /**< checks if the passed object belongs to the type */
-    CvReleaseFunc release; /**< releases object (memory etc.) */
-    CvReadFunc read; /**< reads object from file storage */
-    CvWriteFunc write; /**< writes object to file storage */
-    CvCloneFunc clone; /**< creates a copy of the object */
-}
-CvTypeInfo;
-#endif
-
-/** @} */
-
-#endif /*OPENCV_CORE_TYPES_H*/
-
-/* End of file. */
diff --git a/3rdParty/opencv2/core/utils/allocator_stats.impl.hpp b/3rdParty/opencv2/core/utils/allocator_stats.impl.hpp
deleted file mode 100644
index e2bb209626..0000000000
--- a/3rdParty/opencv2/core/utils/allocator_stats.impl.hpp
+++ /dev/null
@@ -1,158 +0,0 @@
-// This file is part of OpenCV project.
-// It is subject to the license terms in the LICENSE file found in the top-level directory
-// of this distribution and at http://opencv.org/license.html.
-
-#ifndef OPENCV_CORE_ALLOCATOR_STATS_IMPL_HPP
-#define OPENCV_CORE_ALLOCATOR_STATS_IMPL_HPP
-
-#include "./allocator_stats.hpp"
-
-//#define OPENCV_DISABLE_ALLOCATOR_STATS
-
-#ifdef CV_CXX11
-
-#include <atomic>
-
-#ifndef OPENCV_ALLOCATOR_STATS_COUNTER_TYPE
-#if defined(__GNUC__) && (\
-        (defined(__SIZEOF_POINTER__) && __SIZEOF_POINTER__ == 4) || \
-        (defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4) && !defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_8)) \
-    )
-#define OPENCV_ALLOCATOR_STATS_COUNTER_TYPE int
-#endif
-#endif
-
-#ifndef OPENCV_ALLOCATOR_STATS_COUNTER_TYPE
-#define OPENCV_ALLOCATOR_STATS_COUNTER_TYPE long long
-#endif
-
-#else  // CV_CXX11
-
-#ifndef OPENCV_ALLOCATOR_STATS_COUNTER_TYPE
-#define OPENCV_ALLOCATOR_STATS_COUNTER_TYPE int  // CV_XADD supports int only
-#endif
-
-#endif  // CV_CXX11
-
-namespace cv { namespace utils {
-
-#ifdef CV__ALLOCATOR_STATS_LOG
-namespace {
-#endif
-
-class AllocatorStatistics : public AllocatorStatisticsInterface
-{
-#ifdef OPENCV_DISABLE_ALLOCATOR_STATS
-
-public:
-    AllocatorStatistics() {}
-    ~AllocatorStatistics() CV_OVERRIDE {}
-
-    uint64_t getCurrentUsage() const CV_OVERRIDE { return 0; }
-    uint64_t getTotalUsage() const CV_OVERRIDE { return 0; }
-    uint64_t getNumberOfAllocations() const CV_OVERRIDE { return 0; }
-    uint64_t getPeakUsage() const CV_OVERRIDE { return 0; }
-
-    /** set peak usage = current usage */
-    void resetPeakUsage() CV_OVERRIDE {};
-
-    void onAllocate(size_t /*sz*/) {}
-    void onFree(size_t /*sz*/) {}
-
-#elif defined(CV_CXX11)
-
-protected:
-    typedef OPENCV_ALLOCATOR_STATS_COUNTER_TYPE counter_t;
-    std::atomic<counter_t> curr, total, total_allocs, peak;
-public:
-    AllocatorStatistics() {}
-    ~AllocatorStatistics() CV_OVERRIDE {}
-
-    uint64_t getCurrentUsage() const CV_OVERRIDE { return (uint64_t)curr.load(); }
-    uint64_t getTotalUsage() const CV_OVERRIDE { return (uint64_t)total.load(); }
-    uint64_t getNumberOfAllocations() const CV_OVERRIDE { return (uint64_t)total_allocs.load(); }
-    uint64_t getPeakUsage() const CV_OVERRIDE { return (uint64_t)peak.load(); }
-
-    /** set peak usage = current usage */
-    void resetPeakUsage() CV_OVERRIDE { peak.store(curr.load()); }
-
-    // Controller interface
-    void onAllocate(size_t sz)
-    {
-#ifdef CV__ALLOCATOR_STATS_LOG
-        CV__ALLOCATOR_STATS_LOG(cv::format("allocate: %lld (curr=%lld)", (long long int)sz, (long long int)curr.load()));
-#endif
-
-        counter_t new_curr = curr.fetch_add((counter_t)sz) + (counter_t)sz;
-
-        // peak = std::max((uint64_t)peak, new_curr);
-        auto prev_peak = peak.load();
-        while (prev_peak < new_curr)
-        {
-            if (peak.compare_exchange_weak(prev_peak, new_curr))
-                break;
-        }
-        // end of peak = max(...)
-
-        total += (counter_t)sz;
-        total_allocs++;
-    }
-    void onFree(size_t sz)
-    {
-#ifdef CV__ALLOCATOR_STATS_LOG
-        CV__ALLOCATOR_STATS_LOG(cv::format("free: %lld (curr=%lld)", (long long int)sz, (long long int)curr.load()));
-#endif
-        curr -= (counter_t)sz;
-    }
-
-#else  // non C++11
-
-protected:
-    typedef OPENCV_ALLOCATOR_STATS_COUNTER_TYPE counter_t;
-    volatile counter_t curr, total, total_allocs, peak;  // overflow is possible, CV_XADD operates with 'int' only
-public:
-    AllocatorStatistics()
-        : curr(0), total(0), total_allocs(0), peak(0)
-    {}
-    ~AllocatorStatistics() CV_OVERRIDE {}
-
-    uint64_t getCurrentUsage() const CV_OVERRIDE { return (uint64_t)curr; }
-    uint64_t getTotalUsage() const CV_OVERRIDE { return (uint64_t)total; }
-    uint64_t getNumberOfAllocations() const CV_OVERRIDE { return (uint64_t)total_allocs; }
-    uint64_t getPeakUsage() const CV_OVERRIDE { return (uint64_t)peak; }
-
-    void resetPeakUsage() CV_OVERRIDE { peak = curr; }
-
-    // Controller interface
-    void onAllocate(size_t sz)
-    {
-#ifdef CV__ALLOCATOR_STATS_LOG
-        CV__ALLOCATOR_STATS_LOG(cv::format("allocate: %lld (curr=%lld)", (long long int)sz, (long long int)curr));
-#endif
-
-        counter_t new_curr = (counter_t)CV_XADD(&curr, (counter_t)sz) + (counter_t)sz;
-
-        peak = std::max((counter_t)peak, new_curr);  // non-thread safe
-
-        //CV_XADD(&total, (uint64_t)sz);  // overflow with int, non-reliable...
-        total += sz;
-
-        CV_XADD(&total_allocs, (counter_t)1);
-    }
-    void onFree(size_t sz)
-    {
-#ifdef CV__ALLOCATOR_STATS_LOG
-        CV__ALLOCATOR_STATS_LOG(cv::format("free: %lld (curr=%lld)", (long long int)sz, (long long int)curr));
-#endif
-        CV_XADD(&curr, (counter_t)-sz);
-    }
-#endif
-};
-
-#ifdef CV__ALLOCATOR_STATS_LOG
-} // namespace
-#endif
-
-}} // namespace
-
-#endif // OPENCV_CORE_ALLOCATOR_STATS_IMPL_HPP
diff --git a/3rdParty/opencv2/core/version.hpp b/3rdParty/opencv2/core/version.hpp
deleted file mode 100644
index 727be984df..0000000000
--- a/3rdParty/opencv2/core/version.hpp
+++ /dev/null
@@ -1,26 +0,0 @@
-// This file is part of OpenCV project.
-// It is subject to the license terms in the LICENSE file found in the top-level directory
-// of this distribution and at http://opencv.org/license.html.
-
-#ifndef OPENCV_VERSION_HPP
-#define OPENCV_VERSION_HPP
-
-#define CV_VERSION_MAJOR    4
-#define CV_VERSION_MINOR    6
-#define CV_VERSION_REVISION 0
-#define CV_VERSION_STATUS   ""
-
-#define CVAUX_STR_EXP(__A)  #__A
-#define CVAUX_STR(__A)      CVAUX_STR_EXP(__A)
-
-#define CVAUX_STRW_EXP(__A)  L ## #__A
-#define CVAUX_STRW(__A)      CVAUX_STRW_EXP(__A)
-
-#define CV_VERSION          CVAUX_STR(CV_VERSION_MAJOR) "." CVAUX_STR(CV_VERSION_MINOR) "." CVAUX_STR(CV_VERSION_REVISION) CV_VERSION_STATUS
-
-/* old  style version constants*/
-#define CV_MAJOR_VERSION    CV_VERSION_MAJOR
-#define CV_MINOR_VERSION    CV_VERSION_MINOR
-#define CV_SUBMINOR_VERSION CV_VERSION_REVISION
-
-#endif // OPENCV_VERSION_HPP
diff --git a/3rdParty/opencv2/dnn/version.hpp b/3rdParty/opencv2/dnn/version.hpp
deleted file mode 100644
index 3bd04dd27e..0000000000
--- a/3rdParty/opencv2/dnn/version.hpp
+++ /dev/null
@@ -1,21 +0,0 @@
-// This file is part of OpenCV project.
-// It is subject to the license terms in the LICENSE file found in the top-level directory
-// of this distribution and at http://opencv.org/license.html.
-
-#ifndef OPENCV_DNN_VERSION_HPP
-#define OPENCV_DNN_VERSION_HPP
-
-/// Use with major OpenCV version only.
-#define OPENCV_DNN_API_VERSION 20220524
-
-#if !defined CV_DOXYGEN && !defined CV_STATIC_ANALYSIS && !defined CV_DNN_DONT_ADD_INLINE_NS
-#define CV__DNN_INLINE_NS __CV_CAT(dnn4_v, OPENCV_DNN_API_VERSION)
-#define CV__DNN_INLINE_NS_BEGIN namespace CV__DNN_INLINE_NS {
-#define CV__DNN_INLINE_NS_END }
-namespace cv { namespace dnn { namespace CV__DNN_INLINE_NS { } using namespace CV__DNN_INLINE_NS; }}
-#else
-#define CV__DNN_INLINE_NS_BEGIN
-#define CV__DNN_INLINE_NS_END
-#endif
-
-#endif  // OPENCV_DNN_VERSION_HPP
diff --git a/3rdParty/opencv2/flann/hdf5.h b/3rdParty/opencv2/flann/hdf5.h
deleted file mode 100644
index 08ad18e6f7..0000000000
--- a/3rdParty/opencv2/flann/hdf5.h
+++ /dev/null
@@ -1,235 +0,0 @@
-/***********************************************************************
- * Software License Agreement (BSD License)
- *
- * Copyright 2008-2009  Marius Muja (mariusm@cs.ubc.ca). All rights reserved.
- * Copyright 2008-2009  David G. Lowe (lowe@cs.ubc.ca). All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *************************************************************************/
-
-
-#ifndef OPENCV_FLANN_HDF5_H_
-#define OPENCV_FLANN_HDF5_H_
-
-//! @cond IGNORED
-
-#include <hdf5.h>
-
-#include "matrix.h"
-
-
-namespace cvflann
-{
-
-namespace
-{
-
-template<typename T>
-hid_t get_hdf5_type()
-{
-    throw FLANNException("Unsupported type for IO operations");
-}
-
-template<>
-hid_t get_hdf5_type<char>() { return H5T_NATIVE_CHAR; }
-template<>
-hid_t get_hdf5_type<unsigned char>() { return H5T_NATIVE_UCHAR; }
-template<>
-hid_t get_hdf5_type<short int>() { return H5T_NATIVE_SHORT; }
-template<>
-hid_t get_hdf5_type<unsigned short int>() { return H5T_NATIVE_USHORT; }
-template<>
-hid_t get_hdf5_type<int>() { return H5T_NATIVE_INT; }
-template<>
-hid_t get_hdf5_type<unsigned int>() { return H5T_NATIVE_UINT; }
-template<>
-hid_t get_hdf5_type<long>() { return H5T_NATIVE_LONG; }
-template<>
-hid_t get_hdf5_type<unsigned long>() { return H5T_NATIVE_ULONG; }
-template<>
-hid_t get_hdf5_type<float>() { return H5T_NATIVE_FLOAT; }
-template<>
-hid_t get_hdf5_type<double>() { return H5T_NATIVE_DOUBLE; }
-}
-
-
-#define CHECK_ERROR(x,y) if ((x)<0) throw FLANNException((y));
-
-template<typename T>
-void save_to_file(const cvflann::Matrix<T>& dataset, const String& filename, const String& name)
-{
-
-#if H5Eset_auto_vers == 2
-    H5Eset_auto( H5E_DEFAULT, NULL, NULL );
-#else
-    H5Eset_auto( NULL, NULL );
-#endif
-
-    herr_t status;
-    hid_t file_id;
-    file_id = H5Fopen(filename.c_str(), H5F_ACC_RDWR, H5P_DEFAULT);
-    if (file_id < 0) {
-        file_id = H5Fcreate(filename.c_str(), H5F_ACC_EXCL, H5P_DEFAULT, H5P_DEFAULT);
-    }
-    CHECK_ERROR(file_id,"Error creating hdf5 file.");
-
-    hsize_t     dimsf[2];              // dataset dimensions
-    dimsf[0] = dataset.rows;
-    dimsf[1] = dataset.cols;
-
-    hid_t space_id = H5Screate_simple(2, dimsf, NULL);
-    hid_t memspace_id = H5Screate_simple(2, dimsf, NULL);
-
-    hid_t dataset_id;
-#if H5Dcreate_vers == 2
-    dataset_id = H5Dcreate2(file_id, name.c_str(), get_hdf5_type<T>(), space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-#else
-    dataset_id = H5Dcreate(file_id, name.c_str(), get_hdf5_type<T>(), space_id, H5P_DEFAULT);
-#endif
-
-    if (dataset_id<0) {
-#if H5Dopen_vers == 2
-        dataset_id = H5Dopen2(file_id, name.c_str(), H5P_DEFAULT);
-#else
-        dataset_id = H5Dopen(file_id, name.c_str());
-#endif
-    }
-    CHECK_ERROR(dataset_id,"Error creating or opening dataset in file.");
-
-    status = H5Dwrite(dataset_id, get_hdf5_type<T>(), memspace_id, space_id, H5P_DEFAULT, dataset.data );
-    CHECK_ERROR(status, "Error writing to dataset");
-
-    H5Sclose(memspace_id);
-    H5Sclose(space_id);
-    H5Dclose(dataset_id);
-    H5Fclose(file_id);
-
-}
-
-
-template<typename T>
-void load_from_file(cvflann::Matrix<T>& dataset, const String& filename, const String& name)
-{
-    herr_t status;
-    hid_t file_id = H5Fopen(filename.c_str(), H5F_ACC_RDWR, H5P_DEFAULT);
-    CHECK_ERROR(file_id,"Error opening hdf5 file.");
-
-    hid_t dataset_id;
-#if H5Dopen_vers == 2
-    dataset_id = H5Dopen2(file_id, name.c_str(), H5P_DEFAULT);
-#else
-    dataset_id = H5Dopen(file_id, name.c_str());
-#endif
-    CHECK_ERROR(dataset_id,"Error opening dataset in file.");
-
-    hid_t space_id = H5Dget_space(dataset_id);
-
-    hsize_t dims_out[2];
-    H5Sget_simple_extent_dims(space_id, dims_out, NULL);
-
-    dataset = cvflann::Matrix<T>(new T[dims_out[0]*dims_out[1]], dims_out[0], dims_out[1]);
-
-    status = H5Dread(dataset_id, get_hdf5_type<T>(), H5S_ALL, H5S_ALL, H5P_DEFAULT, dataset[0]);
-    CHECK_ERROR(status, "Error reading dataset");
-
-    H5Sclose(space_id);
-    H5Dclose(dataset_id);
-    H5Fclose(file_id);
-}
-
-
-#ifdef HAVE_MPI
-
-namespace mpi
-{
-/**
- * Loads a the hyperslice corresponding to this processor from a hdf5 file.
- * @param flann_dataset Dataset where the data is loaded
- * @param filename HDF5 file name
- * @param name Name of dataset inside file
- */
-template<typename T>
-void load_from_file(cvflann::Matrix<T>& dataset, const String& filename, const String& name)
-{
-    MPI_Comm comm  = MPI_COMM_WORLD;
-    MPI_Info info  = MPI_INFO_NULL;
-
-    int mpi_size, mpi_rank;
-    MPI_Comm_size(comm, &mpi_size);
-    MPI_Comm_rank(comm, &mpi_rank);
-
-    herr_t status;
-
-    hid_t plist_id = H5Pcreate(H5P_FILE_ACCESS);
-    H5Pset_fapl_mpio(plist_id, comm, info);
-    hid_t file_id = H5Fopen(filename.c_str(), H5F_ACC_RDWR, plist_id);
-    CHECK_ERROR(file_id,"Error opening hdf5 file.");
-    H5Pclose(plist_id);
-    hid_t dataset_id;
-#if H5Dopen_vers == 2
-    dataset_id = H5Dopen2(file_id, name.c_str(), H5P_DEFAULT);
-#else
-    dataset_id = H5Dopen(file_id, name.c_str());
-#endif
-    CHECK_ERROR(dataset_id,"Error opening dataset in file.");
-
-    hid_t space_id = H5Dget_space(dataset_id);
-    hsize_t dims[2];
-    H5Sget_simple_extent_dims(space_id, dims, NULL);
-
-    hsize_t count[2];
-    hsize_t offset[2];
-
-    hsize_t item_cnt = dims[0]/mpi_size+(dims[0]%mpi_size==0 ? 0 : 1);
-    hsize_t cnt = (mpi_rank<mpi_size-1 ? item_cnt : dims[0]-item_cnt*(mpi_size-1));
-
-    count[0] = cnt;
-    count[1] = dims[1];
-    offset[0] = mpi_rank*item_cnt;
-    offset[1] = 0;
-
-    hid_t memspace_id = H5Screate_simple(2,count,NULL);
-
-    H5Sselect_hyperslab(space_id, H5S_SELECT_SET, offset, NULL, count, NULL);
-
-    dataset.rows = count[0];
-    dataset.cols = count[1];
-    dataset.data = new T[dataset.rows*dataset.cols];
-
-    plist_id = H5Pcreate(H5P_DATASET_XFER);
-    H5Pset_dxpl_mpio(plist_id, H5FD_MPIO_COLLECTIVE);
-    status = H5Dread(dataset_id, get_hdf5_type<T>(), memspace_id, space_id, plist_id, dataset.data);
-    CHECK_ERROR(status, "Error reading dataset");
-
-    H5Pclose(plist_id);
-    H5Sclose(space_id);
-    H5Sclose(memspace_id);
-    H5Dclose(dataset_id);
-    H5Fclose(file_id);
-}
-}
-#endif // HAVE_MPI
-} // namespace cvflann::mpi
-
-//! @endcond
-
-#endif /* OPENCV_FLANN_HDF5_H_ */
diff --git a/3rdParty/opencv2/gapi/core.hpp b/3rdParty/opencv2/gapi/core.hpp
deleted file mode 100644
index 44956b990c..0000000000
--- a/3rdParty/opencv2/gapi/core.hpp
+++ /dev/null
@@ -1,1911 +0,0 @@
-// This file is part of OpenCV project.
-// It is subject to the license terms in the LICENSE file found in the top-level directory
-// of this distribution and at http://opencv.org/license.html.
-//
-// Copyright (C) 2018-2020 Intel Corporation
-
-
-#ifndef OPENCV_GAPI_CORE_HPP
-#define OPENCV_GAPI_CORE_HPP
-
-#include <math.h>
-#include <utility> // std::tuple
-
-#include <opencv2/imgproc.hpp>
-#include <opencv2/gapi/imgproc.hpp>
-
-#include <opencv2/gapi/gmat.hpp>
-#include <opencv2/gapi/gscalar.hpp>
-#include <opencv2/gapi/gkernel.hpp>
-#include <opencv2/gapi/streaming/format.hpp>
-
-/** \defgroup gapi_core G-API Core functionality
-@{
-    @defgroup gapi_math Graph API: Math operations
-    @defgroup gapi_pixelwise Graph API: Pixelwise operations
-    @defgroup gapi_matrixop Graph API: Operations on matrices
-    @defgroup gapi_transform Graph API: Image and channel composition functions
-@}
- */
-
-namespace cv { namespace gapi {
-/**
- * @brief This namespace contains G-API Operation Types for OpenCV
- * Core module functionality.
- */
-namespace core {
-    using GResize = cv::gapi::imgproc::GResize;
-    using GResizeP = cv::gapi::imgproc::GResizeP;
-
-    using GMat2 = std::tuple<GMat,GMat>;
-    using GMat3 = std::tuple<GMat,GMat,GMat>; // FIXME: how to avoid this?
-    using GMat4 = std::tuple<GMat,GMat,GMat,GMat>;
-    using GMatScalar  = std::tuple<GMat, GScalar>;
-
-    G_TYPED_KERNEL(GAdd, <GMat(GMat, GMat, int)>, "org.opencv.core.math.add") {
-        static GMatDesc outMeta(GMatDesc a, GMatDesc b, int ddepth) {
-            if (ddepth == -1)
-            {
-                // OpenCV: When the input arrays in add/subtract/multiply/divide
-                // functions have different depths, the output array depth must be
-                // explicitly specified!
-                // See artim_op() @ arithm.cpp
-                GAPI_Assert(a.chan == b.chan);
-                GAPI_Assert(a.depth == b.depth);
-                return a;
-            }
-            return a.withDepth(ddepth);
-        }
-    };
-
-    G_TYPED_KERNEL(GAddC, <GMat(GMat, GScalar, int)>, "org.opencv.core.math.addC") {
-        static GMatDesc outMeta(GMatDesc a, GScalarDesc, int ddepth) {
-            GAPI_Assert(a.chan <= 4);
-            return a.withDepth(ddepth);
-        }
-    };
-
-    G_TYPED_KERNEL(GSub, <GMat(GMat, GMat, int)>, "org.opencv.core.math.sub") {
-        static GMatDesc outMeta(GMatDesc a, GMatDesc b, int ddepth) {
-            if (ddepth == -1)
-            {
-                // This macro should select a larger data depth from a and b
-                // considering the number of channels in the same
-                // FIXME!!! Clarify if it is valid for sub()
-                GAPI_Assert(a.chan == b.chan);
-                ddepth = std::max(a.depth, b.depth);
-            }
-            return a.withDepth(ddepth);
-        }
-    };
-
-    G_TYPED_KERNEL(GSubC, <GMat(GMat, GScalar, int)>, "org.opencv.core.math.subC") {
-        static GMatDesc outMeta(GMatDesc a, GScalarDesc, int ddepth) {
-            return a.withDepth(ddepth);
-        }
-    };
-
-    G_TYPED_KERNEL(GSubRC,<GMat(GScalar, GMat, int)>, "org.opencv.core.math.subRC") {
-        static GMatDesc outMeta(GScalarDesc, GMatDesc b, int ddepth) {
-            return b.withDepth(ddepth);
-        }
-    };
-
-    G_TYPED_KERNEL(GMul, <GMat(GMat, GMat, double, int)>, "org.opencv.core.math.mul") {
-        static GMatDesc outMeta(GMatDesc a, GMatDesc, double, int ddepth) {
-            return a.withDepth(ddepth);
-        }
-    };
-
-    G_TYPED_KERNEL(GMulCOld, <GMat(GMat, double, int)>, "org.opencv.core.math.mulCOld") {
-        static GMatDesc outMeta(GMatDesc a, double, int ddepth) {
-            return a.withDepth(ddepth);
-        }
-    };
-
-    G_TYPED_KERNEL(GMulC, <GMat(GMat, GScalar, int)>, "org.opencv.core.math.mulC") {
-        static GMatDesc outMeta(GMatDesc a, GScalarDesc, int ddepth) {
-            return a.withDepth(ddepth);
-        }
-    };
-
-    G_TYPED_KERNEL(GMulS, <GMat(GMat, GScalar)>, "org.opencv.core.math.muls") {
-        static GMatDesc outMeta(GMatDesc a, GScalarDesc) {
-            return a;
-        }
-    }; // FIXME: Merge with MulC
-
-    G_TYPED_KERNEL(GDiv, <GMat(GMat, GMat, double, int)>, "org.opencv.core.math.div") {
-        static GMatDesc outMeta(GMatDesc a, GMatDesc b, double, int ddepth) {
-            if (ddepth == -1)
-            {
-                GAPI_Assert(a.depth == b.depth);
-                return b;
-            }
-            return a.withDepth(ddepth);
-        }
-    };
-
-    G_TYPED_KERNEL(GDivC, <GMat(GMat, GScalar, double, int)>, "org.opencv.core.math.divC") {
-        static GMatDesc outMeta(GMatDesc a, GScalarDesc, double, int ddepth) {
-            return a.withDepth(ddepth);
-        }
-    };
-
-    G_TYPED_KERNEL(GDivRC, <GMat(GScalar, GMat, double, int)>, "org.opencv.core.math.divRC") {
-        static GMatDesc outMeta(GScalarDesc, GMatDesc b, double, int ddepth) {
-            return b.withDepth(ddepth);
-        }
-    };
-
-    G_TYPED_KERNEL(GMean, <GScalar(GMat)>, "org.opencv.core.math.mean") {
-        static GScalarDesc outMeta(GMatDesc) {
-            return empty_scalar_desc();
-        }
-    };
-
-    G_TYPED_KERNEL_M(GPolarToCart, <GMat2(GMat, GMat, bool)>, "org.opencv.core.math.polarToCart") {
-        static std::tuple<GMatDesc, GMatDesc> outMeta(GMatDesc, GMatDesc a, bool) {
-            return std::make_tuple(a, a);
-        }
-    };
-
-    G_TYPED_KERNEL_M(GCartToPolar, <GMat2(GMat, GMat, bool)>, "org.opencv.core.math.cartToPolar") {
-        static std::tuple<GMatDesc, GMatDesc> outMeta(GMatDesc x, GMatDesc, bool) {
-            return std::make_tuple(x, x);
-        }
-    };
-
-    G_TYPED_KERNEL(GPhase, <GMat(GMat, GMat, bool)>, "org.opencv.core.math.phase") {
-        static GMatDesc outMeta(const GMatDesc &inx, const GMatDesc &, bool) {
-            return inx;
-        }
-    };
-
-    G_TYPED_KERNEL(GMask, <GMat(GMat,GMat)>, "org.opencv.core.pixelwise.mask") {
-        static GMatDesc outMeta(GMatDesc in, GMatDesc) {
-            return in;
-        }
-    };
-
-    G_TYPED_KERNEL(GCmpGT, <GMat(GMat, GMat)>, "org.opencv.core.pixelwise.compare.cmpGT") {
-        static GMatDesc outMeta(GMatDesc a, GMatDesc) {
-            return a.withDepth(CV_8U);
-        }
-    };
-
-    G_TYPED_KERNEL(GCmpGE, <GMat(GMat, GMat)>, "org.opencv.core.pixelwise.compare.cmpGE") {
-        static GMatDesc outMeta(GMatDesc a, GMatDesc) {
-            return a.withDepth(CV_8U);
-        }
-    };
-
-    G_TYPED_KERNEL(GCmpLE, <GMat(GMat, GMat)>, "org.opencv.core.pixelwise.compare.cmpLE") {
-        static GMatDesc outMeta(GMatDesc a, GMatDesc) {
-            return a.withDepth(CV_8U);
-        }
-    };
-
-    G_TYPED_KERNEL(GCmpLT, <GMat(GMat, GMat)>, "org.opencv.core.pixelwise.compare.cmpLT") {
-        static GMatDesc outMeta(GMatDesc a, GMatDesc) {
-            return a.withDepth(CV_8U);
-        }
-    };
-
-    G_TYPED_KERNEL(GCmpEQ, <GMat(GMat, GMat)>, "org.opencv.core.pixelwise.compare.cmpEQ") {
-        static GMatDesc outMeta(GMatDesc a, GMatDesc) {
-            return a.withDepth(CV_8U);
-        }
-    };
-
-    G_TYPED_KERNEL(GCmpNE, <GMat(GMat, GMat)>, "org.opencv.core.pixelwise.compare.cmpNE") {
-        static GMatDesc outMeta(GMatDesc a, GMatDesc) {
-            return a.withDepth(CV_8U);
-        }
-    };
-
-    G_TYPED_KERNEL(GCmpGTScalar, <GMat(GMat, GScalar)>, "org.opencv.core.pixelwise.compare.cmpGTScalar") {
-        static GMatDesc outMeta(GMatDesc a, GScalarDesc) {
-            return a.withDepth(CV_8U);
-        }
-    };
-
-    G_TYPED_KERNEL(GCmpGEScalar, <GMat(GMat, GScalar)>, "org.opencv.core.pixelwise.compare.cmpGEScalar") {
-        static GMatDesc outMeta(GMatDesc a, GScalarDesc) {
-            return a.withDepth(CV_8U);
-        }
-    };
-
-    G_TYPED_KERNEL(GCmpLEScalar, <GMat(GMat, GScalar)>, "org.opencv.core.pixelwise.compare.cmpLEScalar") {
-        static GMatDesc outMeta(GMatDesc a, GScalarDesc) {
-            return a.withDepth(CV_8U);
-        }
-    };
-
-    G_TYPED_KERNEL(GCmpLTScalar, <GMat(GMat, GScalar)>, "org.opencv.core.pixelwise.compare.cmpLTScalar") {
-    static GMatDesc outMeta(GMatDesc a, GScalarDesc) {
-            return a.withDepth(CV_8U);
-        }
-    };
-
-    G_TYPED_KERNEL(GCmpEQScalar, <GMat(GMat, GScalar)>, "org.opencv.core.pixelwise.compare.cmpEQScalar") {
-        static GMatDesc outMeta(GMatDesc a, GScalarDesc) {
-            return a.withDepth(CV_8U);
-        }
-    };
-
-    G_TYPED_KERNEL(GCmpNEScalar, <GMat(GMat, GScalar)>, "org.opencv.core.pixelwise.compare.cmpNEScalar") {
-        static GMatDesc outMeta(GMatDesc a, GScalarDesc) {
-            return a.withDepth(CV_8U);
-        }
-    };
-
-    G_TYPED_KERNEL(GAnd, <GMat(GMat, GMat)>, "org.opencv.core.pixelwise.bitwise_and") {
-        static GMatDesc outMeta(GMatDesc a, GMatDesc) {
-            return a;
-        }
-    };
-
-    G_TYPED_KERNEL(GAndS, <GMat(GMat, GScalar)>, "org.opencv.core.pixelwise.bitwise_andS") {
-        static GMatDesc outMeta(GMatDesc a, GScalarDesc) {
-            return a;
-        }
-    };
-
-    G_TYPED_KERNEL(GOr, <GMat(GMat, GMat)>, "org.opencv.core.pixelwise.bitwise_or") {
-        static GMatDesc outMeta(GMatDesc a, GMatDesc) {
-            return a;
-        }
-    };
-
-    G_TYPED_KERNEL(GOrS, <GMat(GMat, GScalar)>, "org.opencv.core.pixelwise.bitwise_orS") {
-        static GMatDesc outMeta(GMatDesc a, GScalarDesc) {
-            return a;
-        }
-    };
-
-    G_TYPED_KERNEL(GXor, <GMat(GMat, GMat)>, "org.opencv.core.pixelwise.bitwise_xor") {
-        static GMatDesc outMeta(GMatDesc a, GMatDesc) {
-            return a;
-        }
-    };
-
-    G_TYPED_KERNEL(GXorS, <GMat(GMat, GScalar)>, "org.opencv.core.pixelwise.bitwise_xorS") {
-        static GMatDesc outMeta(GMatDesc a, GScalarDesc) {
-            return a;
-        }
-    };
-
-    G_TYPED_KERNEL(GNot, <GMat(GMat)>, "org.opencv.core.pixelwise.bitwise_not") {
-        static GMatDesc outMeta(GMatDesc a) {
-            return a;
-        }
-    };
-
-    G_TYPED_KERNEL(GSelect, <GMat(GMat, GMat, GMat)>, "org.opencv.core.pixelwise.select") {
-        static GMatDesc outMeta(GMatDesc a, GMatDesc, GMatDesc) {
-            return a;
-        }
-    };
-
-    G_TYPED_KERNEL(GMin, <GMat(GMat, GMat)>, "org.opencv.core.matrixop.min") {
-        static GMatDesc outMeta(GMatDesc a, GMatDesc) {
-            return a;
-        }
-    };
-
-    G_TYPED_KERNEL(GMax, <GMat(GMat, GMat)>, "org.opencv.core.matrixop.max") {
-        static GMatDesc outMeta(GMatDesc a, GMatDesc) {
-            return a;
-        }
-    };
-
-    G_TYPED_KERNEL(GAbsDiff, <GMat(GMat, GMat)>, "org.opencv.core.matrixop.absdiff") {
-        static GMatDesc outMeta(GMatDesc a, GMatDesc) {
-            return a;
-        }
-    };
-
-    G_TYPED_KERNEL(GAbsDiffC, <GMat(GMat,GScalar)>, "org.opencv.core.matrixop.absdiffC") {
-        static GMatDesc outMeta(const GMatDesc& a, const GScalarDesc&) {
-            return a;
-        }
-    };
-
-    G_TYPED_KERNEL(GSum, <GScalar(GMat)>, "org.opencv.core.matrixop.sum") {
-        static GScalarDesc outMeta(GMatDesc) {
-            return empty_scalar_desc();
-        }
-    };
-
-    G_TYPED_KERNEL(GCountNonZero, <GOpaque<int>(GMat)>, "org.opencv.core.matrixop.countNonZero") {
-        static GOpaqueDesc outMeta(GMatDesc in) {
-            GAPI_Assert(in.chan == 1);
-            return empty_gopaque_desc();
-        }
-    };
-
-    G_TYPED_KERNEL(GAddW, <GMat(GMat, double, GMat, double, double, int)>, "org.opencv.core.matrixop.addweighted") {
-        static GMatDesc outMeta(GMatDesc a, double, GMatDesc b, double, double, int ddepth) {
-            if (ddepth == -1)
-            {
-                // OpenCV: When the input arrays in add/subtract/multiply/divide
-                // functions have different depths, the output array depth must be
-                // explicitly specified!
-                // See artim_op() @ arithm.cpp
-                GAPI_Assert(a.chan == b.chan);
-                GAPI_Assert(a.depth == b.depth);
-                return a;
-            }
-            return a.withDepth(ddepth);
-        }
-    };
-
-    G_TYPED_KERNEL(GNormL1, <GScalar(GMat)>, "org.opencv.core.matrixop.norml1") {
-        static GScalarDesc outMeta(GMatDesc) {
-            return empty_scalar_desc();
-        }
-    };
-
-    G_TYPED_KERNEL(GNormL2, <GScalar(GMat)>, "org.opencv.core.matrixop.norml2") {
-        static GScalarDesc outMeta(GMatDesc) {
-            return empty_scalar_desc();
-        }
-    };
-
-    G_TYPED_KERNEL(GNormInf, <GScalar(GMat)>, "org.opencv.core.matrixop.norminf") {
-        static GScalarDesc outMeta(GMatDesc) {
-            return empty_scalar_desc();
-        }
-    };
-
-    G_TYPED_KERNEL_M(GIntegral, <GMat2(GMat, int, int)>, "org.opencv.core.matrixop.integral") {
-        static std::tuple<GMatDesc, GMatDesc> outMeta(GMatDesc in, int sd, int sqd) {
-            return std::make_tuple(in.withSizeDelta(1,1).withDepth(sd),
-                                   in.withSizeDelta(1,1).withDepth(sqd));
-        }
-    };
-
-    G_TYPED_KERNEL(GThreshold, <GMat(GMat, GScalar, GScalar, int)>, "org.opencv.core.matrixop.threshold") {
-        static GMatDesc outMeta(GMatDesc in, GScalarDesc, GScalarDesc, int) {
-            return in;
-        }
-    };
-
-
-    G_TYPED_KERNEL_M(GThresholdOT, <GMatScalar(GMat, GScalar, int)>, "org.opencv.core.matrixop.thresholdOT") {
-        static std::tuple<GMatDesc,GScalarDesc> outMeta(GMatDesc in, GScalarDesc, int) {
-            return std::make_tuple(in, empty_scalar_desc());
-        }
-    };
-
-    G_TYPED_KERNEL(GInRange, <GMat(GMat, GScalar, GScalar)>, "org.opencv.core.matrixop.inrange") {
-        static GMatDesc outMeta(GMatDesc in, GScalarDesc, GScalarDesc) {
-            return in.withType(CV_8U, 1);
-        }
-    };
-
-    G_TYPED_KERNEL_M(GSplit3, <GMat3(GMat)>, "org.opencv.core.transform.split3") {
-        static std::tuple<GMatDesc, GMatDesc, GMatDesc> outMeta(GMatDesc in) {
-            const auto out_depth = in.depth;
-            const auto out_desc  = in.withType(out_depth, 1);
-            return std::make_tuple(out_desc, out_desc, out_desc);
-        }
-    };
-
-    G_TYPED_KERNEL_M(GSplit4, <GMat4(GMat)>,"org.opencv.core.transform.split4") {
-        static std::tuple<GMatDesc, GMatDesc, GMatDesc, GMatDesc> outMeta(GMatDesc in) {
-            const auto out_depth = in.depth;
-            const auto out_desc = in.withType(out_depth, 1);
-            return std::make_tuple(out_desc, out_desc, out_desc, out_desc);
-        }
-    };
-
-    G_TYPED_KERNEL(GMerge3, <GMat(GMat,GMat,GMat)>, "org.opencv.core.transform.merge3") {
-        static GMatDesc outMeta(GMatDesc in, GMatDesc, GMatDesc) {
-            // Preserve depth and add channel component
-            return in.withType(in.depth, 3);
-        }
-    };
-
-    G_TYPED_KERNEL(GMerge4, <GMat(GMat,GMat,GMat,GMat)>, "org.opencv.core.transform.merge4") {
-        static GMatDesc outMeta(GMatDesc in, GMatDesc, GMatDesc, GMatDesc) {
-            // Preserve depth and add channel component
-            return in.withType(in.depth, 4);
-        }
-    };
-
-    G_TYPED_KERNEL(GRemap, <GMat(GMat, Mat, Mat, int, int, Scalar)>, "org.opencv.core.transform.remap") {
-        static GMatDesc outMeta(GMatDesc in, Mat m1, Mat, int, int, Scalar) {
-            return in.withSize(m1.size());
-        }
-    };
-
-    G_TYPED_KERNEL(GFlip, <GMat(GMat, int)>, "org.opencv.core.transform.flip") {
-        static GMatDesc outMeta(GMatDesc in, int) {
-            return in;
-        }
-    };
-
-    // TODO: eliminate the need in this kernel (streaming)
-    G_TYPED_KERNEL(GCrop, <GMat(GMat, Rect)>, "org.opencv.core.transform.crop") {
-        static GMatDesc outMeta(GMatDesc in, Rect rc) {
-            return in.withSize(Size(rc.width, rc.height));
-        }
-    };
-
-    G_TYPED_KERNEL(GConcatHor, <GMat(GMat, GMat)>, "org.opencv.imgproc.transform.concatHor") {
-        static GMatDesc outMeta(GMatDesc l, GMatDesc r) {
-            return l.withSizeDelta(+r.size.width, 0);
-        }
-    };
-
-    G_TYPED_KERNEL(GConcatVert, <GMat(GMat, GMat)>, "org.opencv.imgproc.transform.concatVert") {
-        static GMatDesc outMeta(GMatDesc t, GMatDesc b) {
-            return t.withSizeDelta(0, +b.size.height);
-        }
-    };
-
-    G_TYPED_KERNEL(GLUT, <GMat(GMat, Mat)>, "org.opencv.core.transform.LUT") {
-        static GMatDesc outMeta(GMatDesc in, Mat) {
-            return in;
-        }
-    };
-
-    G_TYPED_KERNEL(GConvertTo, <GMat(GMat, int, double, double)>, "org.opencv.core.transform.convertTo") {
-        static GMatDesc outMeta(GMatDesc in, int rdepth, double, double) {
-            return rdepth < 0 ? in : in.withDepth(rdepth);
-        }
-    };
-
-    G_TYPED_KERNEL(GSqrt, <GMat(GMat)>, "org.opencv.core.math.sqrt") {
-        static GMatDesc outMeta(GMatDesc in) {
-            return in;
-        }
-    };
-
-    G_TYPED_KERNEL(GNormalize, <GMat(GMat, double, double, int, int)>, "org.opencv.core.normalize") {
-        static GMatDesc outMeta(GMatDesc in, double, double, int, int ddepth) {
-            // unlike opencv doesn't have a mask as a parameter
-            return (ddepth < 0 ? in : in.withDepth(ddepth));
-        }
-    };
-
-    G_TYPED_KERNEL(GWarpPerspective, <GMat(GMat, const Mat&, Size, int, int, const cv::Scalar&)>, "org.opencv.core.warpPerspective") {
-        static GMatDesc outMeta(GMatDesc in, const Mat&, Size dsize, int, int borderMode, const cv::Scalar&) {
-            GAPI_Assert((borderMode == cv::BORDER_CONSTANT || borderMode == cv::BORDER_REPLICATE) &&
-                        "cv::gapi::warpPerspective supports only cv::BORDER_CONSTANT and cv::BORDER_REPLICATE border modes");
-            return in.withType(in.depth, in.chan).withSize(dsize);
-        }
-    };
-
-    G_TYPED_KERNEL(GWarpAffine, <GMat(GMat, const Mat&, Size, int, int, const cv::Scalar&)>, "org.opencv.core.warpAffine") {
-        static GMatDesc outMeta(GMatDesc in, const Mat&, Size dsize, int, int border_mode, const cv::Scalar&) {
-            GAPI_Assert(border_mode != cv::BORDER_TRANSPARENT &&
-                        "cv::BORDER_TRANSPARENT mode is not supported in cv::gapi::warpAffine");
-            return in.withType(in.depth, in.chan).withSize(dsize);
-        }
-    };
-
-    G_TYPED_KERNEL(
-        GKMeansND,
-        <std::tuple<GOpaque<double>,GMat,GMat>(GMat,int,GMat,TermCriteria,int,KmeansFlags)>,
-        "org.opencv.core.kmeansND") {
-
-        static std::tuple<GOpaqueDesc,GMatDesc,GMatDesc>
-        outMeta(const GMatDesc& in, int K, const GMatDesc& bestLabels, const TermCriteria&, int,
-                KmeansFlags flags) {
-            GAPI_Assert(in.depth == CV_32F);
-            std::vector<int> amount_n_dim = detail::checkVector(in);
-            int amount = amount_n_dim[0], dim = amount_n_dim[1];
-            if (amount == -1)   // Mat with height != 1, width != 1, channels != 1 given
-            {                   // which means that kmeans will consider the following:
-                amount = in.size.height;
-                dim    = in.size.width * in.chan;
-            }
-            // kmeans sets these labels' sizes when no bestLabels given:
-            GMatDesc out_labels(CV_32S, 1, Size{1, amount});
-            // kmeans always sets these centers' sizes:
-            GMatDesc centers   (CV_32F, 1, Size{dim, K});
-            if (flags & KMEANS_USE_INITIAL_LABELS)
-            {
-                GAPI_Assert(bestLabels.depth == CV_32S);
-                int labels_amount = detail::checkVector(bestLabels, 1u);
-                GAPI_Assert(labels_amount == amount);
-                out_labels = bestLabels;  // kmeans preserves bestLabels' sizes if given
-            }
-            return std::make_tuple(empty_gopaque_desc(), out_labels, centers);
-        }
-    };
-
-    G_TYPED_KERNEL(
-        GKMeansNDNoInit,
-        <std::tuple<GOpaque<double>,GMat,GMat>(GMat,int,TermCriteria,int,KmeansFlags)>,
-        "org.opencv.core.kmeansNDNoInit") {
-
-        static std::tuple<GOpaqueDesc,GMatDesc,GMatDesc>
-        outMeta(const GMatDesc& in, int K, const TermCriteria&, int, KmeansFlags flags) {
-            GAPI_Assert( !(flags & KMEANS_USE_INITIAL_LABELS) );
-            GAPI_Assert(in.depth == CV_32F);
-            std::vector<int> amount_n_dim = detail::checkVector(in);
-            int amount = amount_n_dim[0], dim = amount_n_dim[1];
-            if (amount == -1) // Mat with height != 1, width != 1, channels != 1 given
-            {                   // which means that kmeans will consider the following:
-                amount = in.size.height;
-                dim    = in.size.width * in.chan;
-            }
-            GMatDesc out_labels(CV_32S, 1, Size{1, amount});
-            GMatDesc centers   (CV_32F, 1, Size{dim, K});
-            return std::make_tuple(empty_gopaque_desc(), out_labels, centers);
-        }
-    };
-
-    G_TYPED_KERNEL(GKMeans2D, <std::tuple<GOpaque<double>,GArray<int>,GArray<Point2f>>
-                               (GArray<Point2f>,int,GArray<int>,TermCriteria,int,KmeansFlags)>,
-                   "org.opencv.core.kmeans2D") {
-        static std::tuple<GOpaqueDesc,GArrayDesc,GArrayDesc>
-        outMeta(const GArrayDesc&,int,const GArrayDesc&,const TermCriteria&,int,KmeansFlags) {
-            return std::make_tuple(empty_gopaque_desc(), empty_array_desc(), empty_array_desc());
-        }
-    };
-
-    G_TYPED_KERNEL(GKMeans3D, <std::tuple<GOpaque<double>,GArray<int>,GArray<Point3f>>
-                               (GArray<Point3f>,int,GArray<int>,TermCriteria,int,KmeansFlags)>,
-                   "org.opencv.core.kmeans3D") {
-        static std::tuple<GOpaqueDesc,GArrayDesc,GArrayDesc>
-        outMeta(const GArrayDesc&,int,const GArrayDesc&,const TermCriteria&,int,KmeansFlags) {
-            return std::make_tuple(empty_gopaque_desc(), empty_array_desc(), empty_array_desc());
-        }
-    };
-
-    G_TYPED_KERNEL(GTranspose, <GMat(GMat)>, "org.opencv.core.transpose") {
-        static GMatDesc outMeta(GMatDesc in) {
-            return in.withSize({in.size.height, in.size.width});
-        }
-    };
-} // namespace core
-
-namespace streaming {
-
-// Operations for Streaming (declared in this header for convenience)
-G_TYPED_KERNEL(GSize, <GOpaque<Size>(GMat)>, "org.opencv.streaming.size") {
-    static GOpaqueDesc outMeta(const GMatDesc&) {
-        return empty_gopaque_desc();
-    }
-};
-
-G_TYPED_KERNEL(GSizeR, <GOpaque<Size>(GOpaque<Rect>)>, "org.opencv.streaming.sizeR") {
-    static GOpaqueDesc outMeta(const GOpaqueDesc&) {
-        return empty_gopaque_desc();
-    }
-};
-
-G_TYPED_KERNEL(GSizeMF, <GOpaque<Size>(GFrame)>, "org.opencv.streaming.sizeMF") {
-    static GOpaqueDesc outMeta(const GFrameDesc&) {
-        return empty_gopaque_desc();
-    }
-};
-} // namespace streaming
-
-//! @addtogroup gapi_math
-//! @{
-
-/** @brief Calculates the per-element sum of two matrices.
-
-The function add calculates sum of two matrices of the same size and the same number of channels:
-\f[\texttt{dst}(I) =  \texttt{saturate} ( \texttt{src1}(I) +  \texttt{src2}(I)) \quad \texttt{if mask}(I) \ne0\f]
-
-The function can be replaced with matrix expressions:
-    \f[\texttt{dst} =  \texttt{src1} + \texttt{src2}\f]
-
-The input matrices and the output matrix can all have the same or different depths. For example, you
-can add a 16-bit unsigned matrix to a 8-bit signed matrix and store the sum as a 32-bit
-floating-point matrix. Depth of the output matrix is determined by the ddepth parameter.
-If src1.depth() == src2.depth(), ddepth can be set to the default -1. In this case, the output matrix will have
-the same depth as the input matrices.
-
-Supported matrix data types are @ref CV_8UC1, @ref CV_8UC3, @ref CV_16UC1, @ref CV_16SC1, @ref CV_32FC1.
-
-@note Function textual ID is "org.opencv.core.math.add"
-@param src1 first input matrix.
-@param src2 second input matrix.
-@param ddepth optional depth of the output matrix.
-@sa sub, addWeighted
-*/
-GAPI_EXPORTS_W GMat add(const GMat& src1, const GMat& src2, int ddepth = -1);
-
-/** @brief Calculates the per-element sum of matrix and given scalar.
-
-The function addC adds a given scalar value to each element of given matrix.
-The function can be replaced with matrix expressions:
-
-    \f[\texttt{dst} =  \texttt{src1} + \texttt{c}\f]
-
-Depth of the output matrix is determined by the ddepth parameter.
-If ddepth is set to default -1, the depth of output matrix will be the same as the depth of input matrix.
-The matrices can be single or multi channel. Output matrix must have the same size and number of channels as the input matrix.
-
-Supported matrix data types are @ref CV_8UC1, @ref CV_8UC3, @ref CV_16UC1, @ref CV_16SC1, @ref CV_32FC1.
-
-@note Function textual ID is "org.opencv.core.math.addC"
-@param src1 first input matrix.
-@param c scalar value to be added.
-@param ddepth optional depth of the output matrix.
-@sa sub, addWeighted
-*/
-GAPI_EXPORTS_W GMat addC(const GMat& src1, const GScalar& c, int ddepth = -1);
-//! @overload
-GAPI_EXPORTS GMat addC(const GScalar& c, const GMat& src1, int ddepth = -1);
-
-/** @brief Calculates the per-element difference between two matrices.
-
-The function sub calculates difference between two matrices, when both matrices have the same size and the same number of
-channels:
-    \f[\texttt{dst}(I) =   \texttt{src1}(I) -  \texttt{src2}(I)\f]
-
-The function can be replaced with matrix expressions:
-\f[\texttt{dst} =   \texttt{src1} -  \texttt{src2}\f]
-
-The input matrices and the output matrix can all have the same or different depths. For example, you
-can subtract two 8-bit unsigned matrices store the result as a 16-bit signed matrix.
-Depth of the output matrix is determined by the ddepth parameter.
-If src1.depth() == src2.depth(), ddepth can be set to the default -1. In this case, the output matrix will have
-the same depth as the input matrices. The matrices can be single or multi channel.
-
-Supported matrix data types are @ref CV_8UC1, @ref CV_8UC3, @ref CV_16UC1, @ref CV_16SC1, @ref CV_32FC1.
-
-@note Function textual ID is "org.opencv.core.math.sub"
-@param src1 first input matrix.
-@param src2 second input matrix.
-@param ddepth optional depth of the output matrix.
-@sa  add, addC
-  */
-GAPI_EXPORTS GMat sub(const GMat& src1, const GMat& src2, int ddepth = -1);
-
-/** @brief Calculates the per-element difference between matrix and given scalar.
-
-The function can be replaced with matrix expressions:
-    \f[\texttt{dst} =  \texttt{src} - \texttt{c}\f]
-
-Depth of the output matrix is determined by the ddepth parameter.
-If ddepth is set to default -1, the depth of output matrix will be the same as the depth of input matrix.
-The matrices can be single or multi channel. Output matrix must have the same size as src.
-
-Supported matrix data types are @ref CV_8UC1, @ref CV_8UC3, @ref CV_16UC1, @ref CV_16SC1, @ref CV_32FC1.
-
-@note Function textual ID is "org.opencv.core.math.subC"
-@param src first input matrix.
-@param c scalar value to subtracted.
-@param ddepth optional depth of the output matrix.
-@sa  add, addC, subRC
-  */
-GAPI_EXPORTS GMat subC(const GMat& src, const GScalar& c, int ddepth = -1);
-
-/** @brief Calculates the per-element difference between given scalar and the matrix.
-
-The function can be replaced with matrix expressions:
-    \f[\texttt{dst} =  \texttt{c} - \texttt{src}\f]
-
-Depth of the output matrix is determined by the ddepth parameter.
-If ddepth is set to default -1, the depth of output matrix will be the same as the depth of input matrix.
-The matrices can be single or multi channel. Output matrix must have the same size as src.
-
-Supported matrix data types are @ref CV_8UC1, @ref CV_8UC3, @ref CV_16UC1, @ref CV_16SC1, @ref CV_32FC1.
-
-@note Function textual ID is "org.opencv.core.math.subRC"
-@param c scalar value to subtract from.
-@param src input matrix to be subtracted.
-@param ddepth optional depth of the output matrix.
-@sa  add, addC, subC
-  */
-GAPI_EXPORTS GMat subRC(const GScalar& c, const GMat& src, int ddepth = -1);
-
-/** @brief Calculates the per-element scaled product of two matrices.
-
-The function mul calculates the per-element product of two matrices:
-
-\f[\texttt{dst} (I)= \texttt{saturate} ( \texttt{scale} \cdot \texttt{src1} (I)  \cdot \texttt{src2} (I))\f]
-
-If src1.depth() == src2.depth(), ddepth can be set to the default -1. In this case, the output matrix will have
-the same depth as the input matrices. The matrices can be single or multi channel.
-Output matrix must have the same size as input matrices.
-
-Supported matrix data types are @ref CV_8UC1, @ref CV_8UC3, @ref CV_16UC1, @ref CV_16SC1, @ref CV_32FC1.
-
-@note Function textual ID is "org.opencv.core.math.mul"
-@param src1 first input matrix.
-@param src2 second input matrix of the same size and the same depth as src1.
-@param scale optional scale factor.
-@param ddepth optional depth of the output matrix.
-@sa add, sub, div, addWeighted
-*/
-GAPI_EXPORTS GMat mul(const GMat& src1, const GMat& src2, double scale = 1.0, int ddepth = -1);
-
-/** @brief Multiplies matrix by scalar.
-
-The function mulC multiplies each element of matrix src by given scalar value:
-
-\f[\texttt{dst} (I)= \texttt{saturate} (  \texttt{src1} (I)  \cdot \texttt{multiplier} )\f]
-
-The matrices can be single or multi channel. Output matrix must have the same size as src.
-
-Supported matrix data types are @ref CV_8UC1, @ref CV_8UC3, @ref CV_16UC1, @ref CV_16SC1, @ref CV_32FC1.
-
-@note Function textual ID is "org.opencv.core.math.mulC"
-@param src input matrix.
-@param multiplier factor to be multiplied.
-@param ddepth optional depth of the output matrix. If -1, the depth of output matrix will be the same as input matrix depth.
-@sa add, sub, div, addWeighted
-*/
-GAPI_EXPORTS GMat mulC(const GMat& src, double multiplier, int ddepth = -1);
-//! @overload
-GAPI_EXPORTS GMat mulC(const GMat& src, const GScalar& multiplier, int ddepth = -1);   // FIXME: merge with mulc
-//! @overload
-GAPI_EXPORTS GMat mulC(const GScalar& multiplier, const GMat& src, int ddepth = -1);   // FIXME: merge with mulc
-
-/** @brief Performs per-element division of two matrices.
-
-The function divides one matrix by another:
-\f[\texttt{dst(I) = saturate(src1(I)*scale/src2(I))}\f]
-
-For integer types when src2(I) is zero, dst(I) will also be zero.
-Floating point case returns Inf/NaN (according to IEEE).
-
-Different channels of
-multi-channel matrices are processed independently.
-The matrices can be single or multi channel. Output matrix must have the same size and depth as src.
-
-Supported matrix data types are @ref CV_8UC1, @ref CV_8UC3, @ref CV_16UC1, @ref CV_16SC1, @ref CV_32FC1.
-
-@note Function textual ID is "org.opencv.core.math.div"
-@param src1 first input matrix.
-@param src2 second input matrix of the same size and depth as src1.
-@param scale scalar factor.
-@param ddepth optional depth of the output matrix; you can only pass -1 when src1.depth() == src2.depth().
-@sa  mul, add, sub
-*/
-GAPI_EXPORTS GMat div(const GMat& src1, const GMat& src2, double scale, int ddepth = -1);
-
-/** @brief Divides matrix by scalar.
-
-The function divC divides each element of matrix src by given scalar value:
-
-\f[\texttt{dst(I) = saturate(src(I)*scale/divisor)}\f]
-
-When divisor is zero, dst(I) will also be zero. Different channels of
-multi-channel matrices are processed independently.
-The matrices can be single or multi channel. Output matrix must have the same size and depth as src.
-
-Supported matrix data types are @ref CV_8UC1, @ref CV_8UC3, @ref CV_16UC1, @ref CV_16SC1, @ref CV_32FC1.
-
-@note Function textual ID is "org.opencv.core.math.divC"
-@param src input matrix.
-@param divisor number to be divided by.
-@param ddepth optional depth of the output matrix. If -1, the depth of output matrix will be the same as input matrix depth.
-@param scale scale factor.
-@sa add, sub, div, addWeighted
-*/
-GAPI_EXPORTS GMat divC(const GMat& src, const GScalar& divisor, double scale, int ddepth = -1);
-
-/** @brief Divides scalar by matrix.
-
-The function divRC divides given scalar by each element of matrix src and keep the division result in new matrix of the same size and type as src:
-
-\f[\texttt{dst(I) = saturate(divident*scale/src(I))}\f]
-
-When src(I) is zero, dst(I) will also be zero. Different channels of
-multi-channel matrices are processed independently.
-The matrices can be single or multi channel. Output matrix must have the same size and depth as src.
-
-Supported matrix data types are @ref CV_8UC1, @ref CV_8UC3, @ref CV_16UC1, @ref CV_16SC1, @ref CV_32FC1.
-
-@note Function textual ID is "org.opencv.core.math.divRC"
-@param src input matrix.
-@param divident number to be divided.
-@param ddepth optional depth of the output matrix. If -1, the depth of output matrix will be the same as input matrix depth.
-@param scale scale factor
-@sa add, sub, div, addWeighted
-*/
-GAPI_EXPORTS GMat divRC(const GScalar& divident, const GMat& src, double scale, int ddepth = -1);
-
-/** @brief Applies a mask to a matrix.
-
-The function mask set value from given matrix if the corresponding pixel value in mask matrix set to true,
-and set the matrix value to 0 otherwise.
-
-Supported src matrix data types are @ref CV_8UC1, @ref CV_16SC1, @ref CV_16UC1. Supported mask data type is @ref CV_8UC1.
-
-@note Function textual ID is "org.opencv.core.math.mask"
-@param src input matrix.
-@param mask input mask matrix.
-*/
-GAPI_EXPORTS GMat mask(const GMat& src, const GMat& mask);
-
-/** @brief Calculates an average (mean) of matrix elements.
-
-The function mean calculates the mean value M of matrix elements,
-independently for each channel, and return it.
-
-Supported matrix data types are @ref CV_8UC1, @ref CV_8UC3, @ref CV_16UC1, @ref CV_16SC1, @ref CV_32FC1.
-
-@note Function textual ID is "org.opencv.core.math.mean"
-@param src input matrix.
-@sa  countNonZero, min, max
-*/
-GAPI_EXPORTS_W GScalar mean(const GMat& src);
-
-/** @brief Calculates x and y coordinates of 2D vectors from their magnitude and angle.
-
-The function polarToCart calculates the Cartesian coordinates of each 2D
-vector represented by the corresponding elements of magnitude and angle:
-\f[\begin{array}{l} \texttt{x} (I) =  \texttt{magnitude} (I) \cos ( \texttt{angle} (I)) \\ \texttt{y} (I) =  \texttt{magnitude} (I) \sin ( \texttt{angle} (I)) \\ \end{array}\f]
-
-The relative accuracy of the estimated coordinates is about 1e-6.
-
-First output is a matrix of x-coordinates of 2D vectors.
-Second output is a matrix of y-coordinates of 2D vectors.
-Both output must have the same size and depth as input matrices.
-
-@note Function textual ID is "org.opencv.core.math.polarToCart"
-
-@param magnitude input floating-point @ref CV_32FC1 matrix (1xN) of magnitudes of 2D vectors;
-@param angle input floating-point @ref CV_32FC1 matrix (1xN) of angles of 2D vectors.
-@param angleInDegrees when true, the input angles are measured in
-degrees, otherwise, they are measured in radians.
-@sa cartToPolar, exp, log, pow, sqrt
-*/
-GAPI_EXPORTS std::tuple<GMat, GMat> polarToCart(const GMat& magnitude, const GMat& angle,
-                                              bool angleInDegrees = false);
-
-/** @brief Calculates the magnitude and angle of 2D vectors.
-
-The function cartToPolar calculates either the magnitude, angle, or both
-for every 2D vector (x(I),y(I)):
-\f[\begin{array}{l} \texttt{magnitude} (I)= \sqrt{\texttt{x}(I)^2+\texttt{y}(I)^2} , \\ \texttt{angle} (I)= \texttt{atan2} ( \texttt{y} (I), \texttt{x} (I))[ \cdot180 / \pi ] \end{array}\f]
-
-The angles are calculated with accuracy about 0.3 degrees. For the point
-(0,0), the angle is set to 0.
-
-First output is a matrix of magnitudes of the same size and depth as input x.
-Second output is a matrix of angles that has the same size and depth as
-x; the angles are measured in radians (from 0 to 2\*Pi) or in degrees (0 to 360 degrees).
-
-@note Function textual ID is "org.opencv.core.math.cartToPolar"
-
-@param x matrix of @ref CV_32FC1 x-coordinates.
-@param y array of @ref CV_32FC1 y-coordinates.
-@param angleInDegrees a flag, indicating whether the angles are measured
-in radians (which is by default), or in degrees.
-@sa polarToCart
-*/
-GAPI_EXPORTS std::tuple<GMat, GMat> cartToPolar(const GMat& x, const GMat& y,
-                                              bool angleInDegrees = false);
-
-/** @brief Calculates the rotation angle of 2D vectors.
-
-The function cv::phase calculates the rotation angle of each 2D vector that
-is formed from the corresponding elements of x and y :
-\f[\texttt{angle} (I) =  \texttt{atan2} ( \texttt{y} (I), \texttt{x} (I))\f]
-
-The angle estimation accuracy is about 0.3 degrees. When x(I)=y(I)=0 ,
-the corresponding angle(I) is set to 0.
-@param x input floating-point array of x-coordinates of 2D vectors.
-@param y input array of y-coordinates of 2D vectors; it must have the
-same size and the same type as x.
-@param angleInDegrees when true, the function calculates the angle in
-degrees, otherwise, they are measured in radians.
-@return array of vector angles; it has the same size and same type as x.
-*/
-GAPI_EXPORTS GMat phase(const GMat& x, const GMat &y, bool angleInDegrees = false);
-
-/** @brief Calculates a square root of array elements.
-
-The function cv::gapi::sqrt calculates a square root of each input array element.
-In case of multi-channel arrays, each channel is processed
-independently. The accuracy is approximately the same as of the built-in
-std::sqrt .
-@param src input floating-point array.
-@return output array of the same size and type as src.
-*/
-GAPI_EXPORTS GMat sqrt(const GMat &src);
-
-//! @} gapi_math
-//!
-//! @addtogroup gapi_pixelwise
-//! @{
-
-/** @brief Performs the per-element comparison of two matrices checking if elements from first matrix are greater compare to elements in second.
-
-The function compares elements of two matrices src1 and src2 of the same size:
-    \f[\texttt{dst} (I) =  \texttt{src1} (I)  > \texttt{src2} (I)\f]
-
-When the comparison result is true, the corresponding element of output
-array is set to 255. The comparison operations can be replaced with the
-equivalent matrix expressions:
-\f[\texttt{dst} =   \texttt{src1} > \texttt{src2}\f]
-
-Output matrix of depth @ref CV_8U must have the same size and the same number of channels as
-    the input matrices/matrix.
-
-Supported input matrix data types are @ref CV_8UC1, @ref CV_16UC1, @ref CV_16SC1, @ref CV_32FC1.
-
-@note Function textual ID is "org.opencv.core.pixelwise.compare.cmpGT"
-@param src1 first input matrix.
-@param src2 second input matrix/scalar of the same depth as first input matrix.
-@sa min, max, threshold, cmpLE, cmpGE, cmpLT
-*/
-GAPI_EXPORTS GMat cmpGT(const GMat& src1, const GMat& src2);
-/** @overload
-@note Function textual ID is "org.opencv.core.pixelwise.compare.cmpGTScalar"
-*/
-GAPI_EXPORTS GMat cmpGT(const GMat& src1, const GScalar& src2);
-
-/** @brief Performs the per-element comparison of two matrices checking if elements from first matrix are less than elements in second.
-
-The function compares elements of two matrices src1 and src2 of the same size:
-    \f[\texttt{dst} (I) =  \texttt{src1} (I)  < \texttt{src2} (I)\f]
-
-When the comparison result is true, the corresponding element of output
-array is set to 255. The comparison operations can be replaced with the
-equivalent matrix expressions:
-    \f[\texttt{dst} =   \texttt{src1} < \texttt{src2}\f]
-
-Output matrix of depth @ref CV_8U must have the same size and the same number of channels as
-    the input matrices/matrix.
-
-Supported input matrix data types are @ref CV_8UC1, @ref CV_8UC3, @ref CV_16UC1, @ref CV_16SC1, @ref CV_32FC1.
-
-@note Function textual ID is "org.opencv.core.pixelwise.compare.cmpLT"
-@param src1 first input matrix.
-@param src2 second input matrix/scalar of the same depth as first input matrix.
-@sa min, max, threshold, cmpLE, cmpGE, cmpGT
-*/
-GAPI_EXPORTS GMat cmpLT(const GMat& src1, const GMat& src2);
-/** @overload
-@note Function textual ID is "org.opencv.core.pixelwise.compare.cmpLTScalar"
-*/
-GAPI_EXPORTS GMat cmpLT(const GMat& src1, const GScalar& src2);
-
-/** @brief Performs the per-element comparison of two matrices checking if elements from first matrix are greater or equal compare to elements in second.
-
-The function compares elements of two matrices src1 and src2 of the same size:
-    \f[\texttt{dst} (I) =  \texttt{src1} (I)  >= \texttt{src2} (I)\f]
-
-When the comparison result is true, the corresponding element of output
-array is set to 255. The comparison operations can be replaced with the
-equivalent matrix expressions:
-    \f[\texttt{dst} =   \texttt{src1} >= \texttt{src2}\f]
-
-Output matrix of depth @ref CV_8U must have the same size and the same number of channels as
-    the input matrices.
-
-Supported input matrix data types are @ref CV_8UC1, @ref CV_8UC3, @ref CV_16UC1, @ref CV_16SC1, @ref CV_32FC1.
-
-@note Function textual ID is "org.opencv.core.pixelwise.compare.cmpGE"
-@param src1 first input matrix.
-@param src2 second input matrix/scalar of the same depth as first input matrix.
-@sa min, max, threshold, cmpLE, cmpGT, cmpLT
-*/
-GAPI_EXPORTS GMat cmpGE(const GMat& src1, const GMat& src2);
-/** @overload
-@note Function textual ID is "org.opencv.core.pixelwise.compare.cmpLGEcalar"
-*/
-GAPI_EXPORTS GMat cmpGE(const GMat& src1, const GScalar& src2);
-
-/** @brief Performs the per-element comparison of two matrices checking if elements from first matrix are less or equal compare to elements in second.
-
-The function compares elements of two matrices src1 and src2 of the same size:
-    \f[\texttt{dst} (I) =  \texttt{src1} (I)  <=  \texttt{src2} (I)\f]
-
-When the comparison result is true, the corresponding element of output
-array is set to 255. The comparison operations can be replaced with the
-equivalent matrix expressions:
-    \f[\texttt{dst} =   \texttt{src1} <= \texttt{src2}\f]
-
-Output matrix of depth @ref CV_8U must have the same size and the same number of channels as
-    the input matrices.
-
-Supported input matrix data types are @ref CV_8UC1, @ref CV_8UC3, @ref CV_16UC1, @ref CV_16SC1, @ref CV_32FC1.
-
-@note Function textual ID is "org.opencv.core.pixelwise.compare.cmpLE"
-@param src1 first input matrix.
-@param src2 second input matrix/scalar of the same depth as first input matrix.
-@sa min, max, threshold, cmpGT, cmpGE, cmpLT
-*/
-GAPI_EXPORTS GMat cmpLE(const GMat& src1, const GMat& src2);
-/** @overload
-@note Function textual ID is "org.opencv.core.pixelwise.compare.cmpLEScalar"
-*/
-GAPI_EXPORTS GMat cmpLE(const GMat& src1, const GScalar& src2);
-
-/** @brief Performs the per-element comparison of two matrices checking if elements from first matrix are equal to elements in second.
-
-The function compares elements of two matrices src1 and src2 of the same size:
-    \f[\texttt{dst} (I) =  \texttt{src1} (I)  ==  \texttt{src2} (I)\f]
-
-When the comparison result is true, the corresponding element of output
-array is set to 255. The comparison operations can be replaced with the
-equivalent matrix expressions:
-    \f[\texttt{dst} =   \texttt{src1} == \texttt{src2}\f]
-
-Output matrix of depth @ref CV_8U must have the same size and the same number of channels as
-    the input matrices.
-
-Supported input matrix data types are @ref CV_8UC1, @ref CV_8UC3, @ref CV_16UC1, @ref CV_16SC1, @ref CV_32FC1.
-
-@note Function textual ID is "org.opencv.core.pixelwise.compare.cmpEQ"
-@param src1 first input matrix.
-@param src2 second input matrix/scalar of the same depth as first input matrix.
-@sa min, max, threshold, cmpNE
-*/
-GAPI_EXPORTS GMat cmpEQ(const GMat& src1, const GMat& src2);
-/** @overload
-@note Function textual ID is "org.opencv.core.pixelwise.compare.cmpEQScalar"
-*/
-GAPI_EXPORTS GMat cmpEQ(const GMat& src1, const GScalar& src2);
-
-/** @brief Performs the per-element comparison of two matrices checking if elements from first matrix are not equal to elements in second.
-
-The function compares elements of two matrices src1 and src2 of the same size:
-    \f[\texttt{dst} (I) =  \texttt{src1} (I)  !=  \texttt{src2} (I)\f]
-
-When the comparison result is true, the corresponding element of output
-array is set to 255. The comparison operations can be replaced with the
-equivalent matrix expressions:
-    \f[\texttt{dst} =   \texttt{src1} != \texttt{src2}\f]
-
-Output matrix of depth @ref CV_8U must have the same size and the same number of channels as
-    the input matrices.
-
-Supported input matrix data types are @ref CV_8UC1, @ref CV_8UC3, @ref CV_16UC1, @ref CV_16SC1, @ref CV_32FC1.
-
-@note Function textual ID is "org.opencv.core.pixelwise.compare.cmpNE"
-@param src1 first input matrix.
-@param src2 second input matrix/scalar of the same depth as first input matrix.
-@sa min, max, threshold, cmpEQ
-*/
-GAPI_EXPORTS GMat cmpNE(const GMat& src1, const GMat& src2);
-/** @overload
-@note Function textual ID is "org.opencv.core.pixelwise.compare.cmpNEScalar"
-*/
-GAPI_EXPORTS GMat cmpNE(const GMat& src1, const GScalar& src2);
-
-/** @brief computes bitwise conjunction of the two matrixes (src1 & src2)
-Calculates the per-element bit-wise logical conjunction of two matrices of the same size.
-
-In case of floating-point matrices, their machine-specific bit
-representations (usually IEEE754-compliant) are used for the operation.
-In case of multi-channel matrices, each channel is processed
-independently. Output matrix must have the same size and depth as the input
-matrices.
-
-Supported matrix data types are @ref CV_8UC1, @ref CV_8UC3, @ref CV_16UC1, @ref CV_16SC1, @ref CV_32FC1.
-
-@note Function textual ID is "org.opencv.core.pixelwise.bitwise_and"
-
-@param src1 first input matrix.
-@param src2 second input matrix.
-*/
-GAPI_EXPORTS GMat bitwise_and(const GMat& src1, const GMat& src2);
-/** @overload
-@note Function textual ID is "org.opencv.core.pixelwise.bitwise_andS"
-@param src1 first input matrix.
-@param src2 scalar, which will be per-lemenetly conjuncted with elements of src1.
-*/
-GAPI_EXPORTS GMat bitwise_and(const GMat& src1, const GScalar& src2);
-
-/** @brief computes bitwise disjunction of the two matrixes (src1 | src2)
-Calculates the per-element bit-wise logical disjunction of two matrices of the same size.
-
-In case of floating-point matrices, their machine-specific bit
-representations (usually IEEE754-compliant) are used for the operation.
-In case of multi-channel matrices, each channel is processed
-independently. Output matrix must have the same size and depth as the input
-matrices.
-
-Supported matrix data types are @ref CV_8UC1, @ref CV_8UC3, @ref CV_16UC1, @ref CV_16SC1, @ref CV_32FC1.
-
-@note Function textual ID is "org.opencv.core.pixelwise.bitwise_or"
-
-@param src1 first input matrix.
-@param src2 second input matrix.
-*/
-GAPI_EXPORTS GMat bitwise_or(const GMat& src1, const GMat& src2);
-/** @overload
-@note Function textual ID is "org.opencv.core.pixelwise.bitwise_orS"
-@param src1 first input matrix.
-@param src2 scalar, which will be per-lemenetly disjuncted with elements of src1.
-*/
-GAPI_EXPORTS GMat bitwise_or(const GMat& src1, const GScalar& src2);
-
-
-/** @brief computes bitwise logical "exclusive or" of the two matrixes (src1 ^ src2)
-Calculates the per-element bit-wise logical "exclusive or" of two matrices of the same size.
-
-In case of floating-point matrices, their machine-specific bit
-representations (usually IEEE754-compliant) are used for the operation.
-In case of multi-channel matrices, each channel is processed
-independently. Output matrix must have the same size and depth as the input
-matrices.
-
-Supported matrix data types are @ref CV_8UC1, @ref CV_8UC3, @ref CV_16UC1, @ref CV_16SC1, @ref CV_32FC1.
-
-@note Function textual ID is "org.opencv.core.pixelwise.bitwise_xor"
-
-@param src1 first input matrix.
-@param src2 second input matrix.
-*/
-GAPI_EXPORTS GMat bitwise_xor(const GMat& src1, const GMat& src2);
-/** @overload
-@note Function textual ID is "org.opencv.core.pixelwise.bitwise_xorS"
-@param src1 first input matrix.
-@param src2 scalar, for which per-lemenet "logical or" operation on elements of src1 will be performed.
-*/
-GAPI_EXPORTS GMat bitwise_xor(const GMat& src1, const GScalar& src2);
-
-
-/** @brief Inverts every bit of an array.
-
-The function bitwise_not calculates per-element bit-wise inversion of the input
-matrix:
-\f[\texttt{dst} (I) =  \neg \texttt{src} (I)\f]
-
-In case of floating-point matrices, their machine-specific bit
-representations (usually IEEE754-compliant) are used for the operation.
-In case of multi-channel matrices, each channel is processed
-independently. Output matrix must have the same size and depth as the input
-matrix.
-
-Supported matrix data types are @ref CV_8UC1, @ref CV_8UC3, @ref CV_16UC1, @ref CV_16SC1, @ref CV_32FC1.
-
-@note Function textual ID is "org.opencv.core.pixelwise.bitwise_not"
-
-@param src input matrix.
-*/
-GAPI_EXPORTS GMat bitwise_not(const GMat& src);
-
-/** @brief Select values from either first or second of input matrices by given mask.
-The function set to the output matrix either the value from the first input matrix if corresponding value of mask matrix is 255,
- or value from the second input matrix (if value of mask matrix set to 0).
-
-Input mask matrix must be of @ref CV_8UC1 type, two other inout matrices and output matrix should be of the same type. The size should
-be the same for all input and output matrices.
-Supported input matrix data types are @ref CV_8UC1, @ref CV_8UC3, @ref CV_16UC1, @ref CV_16SC1, @ref CV_32FC1.
-
-@note Function textual ID is "org.opencv.core.pixelwise.select"
-
-@param src1 first input matrix.
-@param src2 second input matrix.
-@param mask mask input matrix.
-*/
-GAPI_EXPORTS GMat select(const GMat& src1, const GMat& src2, const GMat& mask);
-
-//! @} gapi_pixelwise
-
-
-//! @addtogroup gapi_matrixop
-//! @{
-/** @brief Calculates per-element minimum of two matrices.
-
-The function min calculates the per-element minimum of two matrices of the same size, number of channels and depth:
-\f[\texttt{dst} (I)= \min ( \texttt{src1} (I), \texttt{src2} (I))\f]
-    where I is a multi-dimensional index of matrix elements. In case of
-    multi-channel matrices, each channel is processed independently.
-Output matrix must be of the same size and depth as src1.
-
-Supported input matrix data types are @ref CV_8UC1, @ref CV_8UC3, @ref CV_16UC1, @ref CV_16SC1, @ref CV_32FC1.
-
-@note Function textual ID is "org.opencv.core.matrixop.min"
-@param src1 first input matrix.
-@param src2 second input matrix of the same size and depth as src1.
-@sa max, cmpEQ, cmpLT, cmpLE
-*/
-GAPI_EXPORTS GMat min(const GMat& src1, const GMat& src2);
-
-/** @brief Calculates per-element maximum of two matrices.
-
-The function max calculates the per-element maximum of two matrices of the same size, number of channels and depth:
-\f[\texttt{dst} (I)= \max ( \texttt{src1} (I), \texttt{src2} (I))\f]
-    where I is a multi-dimensional index of matrix elements. In case of
-    multi-channel matrices, each channel is processed independently.
-Output matrix must be of the same size and depth as src1.
-
-Supported matrix data types are @ref CV_8UC1, @ref CV_8UC3, @ref CV_16UC1, @ref CV_16SC1, @ref CV_32FC1.
-
-@note Function textual ID is "org.opencv.core.matrixop.max"
-@param src1 first input matrix.
-@param src2 second input matrix of the same size and depth as src1.
-@sa min, compare, cmpEQ, cmpGT, cmpGE
-*/
-GAPI_EXPORTS GMat max(const GMat& src1, const GMat& src2);
-
-/** @brief Calculates the per-element absolute difference between two matrices.
-
-The function absDiff calculates absolute difference between two matrices of the same size and depth:
-    \f[\texttt{dst}(I) =  \texttt{saturate} (| \texttt{src1}(I) -  \texttt{src2}(I)|)\f]
-    where I is a multi-dimensional index of matrix elements. In case of
-    multi-channel matrices, each channel is processed independently.
-Output matrix must have the same size and depth as input matrices.
-
-Supported matrix data types are @ref CV_8UC1, @ref CV_8UC3, @ref CV_16UC1, @ref CV_16SC1, @ref CV_32FC1.
-
-@note Function textual ID is "org.opencv.core.matrixop.absdiff"
-@param src1 first input matrix.
-@param src2 second input matrix.
-@sa abs
-*/
-GAPI_EXPORTS GMat absDiff(const GMat& src1, const GMat& src2);
-
-/** @brief Calculates absolute value of matrix elements.
-
-The function abs calculates absolute difference between matrix elements and given scalar value:
-    \f[\texttt{dst}(I) =  \texttt{saturate} (| \texttt{src1}(I) -  \texttt{matC}(I)|)\f]
-    where matC is constructed from given scalar c and has the same sizes and depth as input matrix src.
-
-Output matrix must be of the same size and depth as src.
-
-Supported matrix data types are @ref CV_8UC1, @ref CV_8UC3, @ref CV_16UC1, @ref CV_16SC1, @ref CV_32FC1.
-
-@note Function textual ID is "org.opencv.core.matrixop.absdiffC"
-@param src input matrix.
-@param c scalar to be subtracted.
-@sa min, max
-*/
-GAPI_EXPORTS GMat absDiffC(const GMat& src, const GScalar& c);
-
-/** @brief Calculates sum of all matrix elements.
-
-The function sum calculates sum of all matrix elements, independently for each channel.
-
-Supported matrix data types are @ref CV_8UC1, @ref CV_8UC3, @ref CV_16UC1, @ref CV_16SC1, @ref CV_32FC1.
-
-@note Function textual ID is "org.opencv.core.matrixop.sum"
-@param src input matrix.
-@sa countNonZero, mean, min, max
-*/
-GAPI_EXPORTS GScalar sum(const GMat& src);
-
-/** @brief Counts non-zero array elements.
-
-The function returns the number of non-zero elements in src :
-\f[\sum _{I: \; \texttt{src} (I) \ne0 } 1\f]
-
-Supported matrix data types are @ref CV_8UC1, @ref CV_16UC1, @ref CV_16SC1, @ref CV_32FC1.
-
-@note Function textual ID is "org.opencv.core.matrixop.countNonZero"
-@param src input single-channel matrix.
-@sa  mean, min, max
-*/
-GAPI_EXPORTS GOpaque<int> countNonZero(const GMat& src);
-
-/** @brief Calculates the weighted sum of two matrices.
-
-The function addWeighted calculates the weighted sum of two matrices as follows:
-\f[\texttt{dst} (I)= \texttt{saturate} ( \texttt{src1} (I)* \texttt{alpha} +  \texttt{src2} (I)* \texttt{beta} +  \texttt{gamma} )\f]
-where I is a multi-dimensional index of array elements. In case of multi-channel matrices, each
-channel is processed independently.
-
-The function can be replaced with a matrix expression:
-    \f[\texttt{dst}(I) =  \texttt{alpha} * \texttt{src1}(I) - \texttt{beta} * \texttt{src2}(I) + \texttt{gamma} \f]
-
-Supported matrix data types are @ref CV_8UC1, @ref CV_8UC3, @ref CV_16UC1, @ref CV_16SC1, @ref CV_32FC1.
-
-@note Function textual ID is "org.opencv.core.matrixop.addweighted"
-@param src1 first input matrix.
-@param alpha weight of the first matrix elements.
-@param src2 second input matrix of the same size and channel number as src1.
-@param beta weight of the second matrix elements.
-@param gamma scalar added to each sum.
-@param ddepth optional depth of the output matrix.
-@sa  add, sub
-*/
-GAPI_EXPORTS GMat addWeighted(const GMat& src1, double alpha, const GMat& src2, double beta, double gamma, int ddepth = -1);
-
-/** @brief Calculates the  absolute L1 norm of a matrix.
-
-This version of normL1 calculates the absolute L1 norm of src.
-
-As example for one array consider the function \f$r(x)= \begin{pmatrix} x \\ 1-x \end{pmatrix}, x \in [-1;1]\f$.
-The \f$ L_{1} \f$ norm for the sample value \f$r(-1) = \begin{pmatrix} -1 \\ 2 \end{pmatrix}\f$
-is calculated as follows
-\f{align*}
-    \| r(-1) \|_{L_1} &= |-1| + |2| = 3 \\
-\f}
-and for \f$r(0.5) = \begin{pmatrix} 0.5 \\ 0.5 \end{pmatrix}\f$ the calculation is
-\f{align*}
-    \| r(0.5) \|_{L_1} &= |0.5| + |0.5| = 1 \\
-\f}
-
-Supported matrix data types are @ref CV_8UC1, @ref CV_8UC3, @ref CV_16UC1, @ref CV_16SC1, @ref CV_32FC1.
-
-@note Function textual ID is "org.opencv.core.matrixop.norml1"
-@param src input matrix.
-@sa normL2, normInf
-*/
-GAPI_EXPORTS GScalar normL1(const GMat& src);
-
-/** @brief Calculates the absolute L2 norm of a matrix.
-
-This version of normL2 calculates the absolute L2 norm of src.
-
-As example for one array consider the function \f$r(x)= \begin{pmatrix} x \\ 1-x \end{pmatrix}, x \in [-1;1]\f$.
-The \f$ L_{2} \f$  norm for the sample value \f$r(-1) = \begin{pmatrix} -1 \\ 2 \end{pmatrix}\f$
-is calculated as follows
-\f{align*}
-    \| r(-1) \|_{L_2} &= \sqrt{(-1)^{2} + (2)^{2}} = \sqrt{5} \\
-\f}
-and for \f$r(0.5) = \begin{pmatrix} 0.5 \\ 0.5 \end{pmatrix}\f$ the calculation is
-\f{align*}
-    \| r(0.5) \|_{L_2} &= \sqrt{(0.5)^{2} + (0.5)^{2}} = \sqrt{0.5} \\
-\f}
-
-Supported matrix data types are @ref CV_8UC1, @ref CV_8UC3, @ref CV_16UC1, @ref CV_16SC1, @ref CV_32FC1.
-@note Function textual ID is "org.opencv.core.matrixop.norml2"
-@param src input matrix.
-@sa normL1, normInf
-*/
-GAPI_EXPORTS GScalar normL2(const GMat& src);
-
-/** @brief Calculates the absolute infinite norm of a matrix.
-
-This version of normInf calculates the absolute infinite norm of src.
-
-As example for one array consider the function \f$r(x)= \begin{pmatrix} x \\ 1-x \end{pmatrix}, x \in [-1;1]\f$.
-The \f$ L_{\infty} \f$ norm for the sample value \f$r(-1) = \begin{pmatrix} -1 \\ 2 \end{pmatrix}\f$
-is calculated as follows
-\f{align*}
-    \| r(-1) \|_{L_\infty} &= \max(|-1|,|2|) = 2
-\f}
-and for \f$r(0.5) = \begin{pmatrix} 0.5 \\ 0.5 \end{pmatrix}\f$ the calculation is
-\f{align*}
-    \| r(0.5) \|_{L_\infty} &= \max(|0.5|,|0.5|) = 0.5.
-\f}
-
-Supported matrix data types are @ref CV_8UC1, @ref CV_8UC3, @ref CV_16UC1, @ref CV_16SC1, @ref CV_32FC1.
-
-@note Function textual ID is "org.opencv.core.matrixop.norminf"
-@param src input matrix.
-@sa normL1, normL2
-*/
-GAPI_EXPORTS GScalar normInf(const GMat& src);
-
-/** @brief Calculates the integral of an image.
-
-The function calculates one or more integral images for the source image as follows:
-
-\f[\texttt{sum} (X,Y) =  \sum _{x<X,y<Y}  \texttt{image} (x,y)\f]
-
-\f[\texttt{sqsum} (X,Y) =  \sum _{x<X,y<Y}  \texttt{image} (x,y)^2\f]
-
-The function return integral image as \f$(W+1)\times (H+1)\f$ , 32-bit integer or floating-point (32f or 64f) and
- integral image for squared pixel values; it is \f$(W+1)\times (H+)\f$, double-precision floating-point (64f) array.
-
-@note Function textual ID is "org.opencv.core.matrixop.integral"
-
-@param src input image.
-@param sdepth desired depth of the integral and the tilted integral images, CV_32S, CV_32F, or
-CV_64F.
-@param sqdepth desired depth of the integral image of squared pixel values, CV_32F or CV_64F.
- */
-GAPI_EXPORTS std::tuple<GMat, GMat> integral(const GMat& src, int sdepth = -1, int sqdepth = -1);
-
-/** @brief Applies a fixed-level threshold to each matrix element.
-
-The function applies fixed-level thresholding to a single- or multiple-channel matrix.
-The function is typically used to get a bi-level (binary) image out of a grayscale image ( cmp functions could be also used for
-this purpose) or for removing a noise, that is, filtering out pixels with too small or too large
-values. There are several types of thresholding supported by the function. They are determined by
-type parameter.
-
-Also, the special values cv::THRESH_OTSU or cv::THRESH_TRIANGLE may be combined with one of the
-above values. In these cases, the function determines the optimal threshold value using the Otsu's
-or Triangle algorithm and uses it instead of the specified thresh . The function returns the
-computed threshold value in addititon to thresholded matrix.
-The Otsu's and Triangle methods are implemented only for 8-bit matrices.
-
-Input image should be single channel only in case of cv::THRESH_OTSU or cv::THRESH_TRIANGLE flags.
-Output matrix must be of the same size and depth as src.
-
-@note Function textual ID is "org.opencv.core.matrixop.threshold"
-
-@param src input matrix (@ref CV_8UC1, @ref CV_8UC3, or @ref CV_32FC1).
-@param thresh threshold value.
-@param maxval maximum value to use with the cv::THRESH_BINARY and cv::THRESH_BINARY_INV thresholding
-types.
-@param type thresholding type (see the cv::ThresholdTypes).
-
-@sa min, max, cmpGT, cmpLE, cmpGE, cmpLT
- */
-GAPI_EXPORTS GMat threshold(const GMat& src, const GScalar& thresh, const GScalar& maxval, int type);
-/** @overload
-This function applicable for all threshold types except CV_THRESH_OTSU and CV_THRESH_TRIANGLE
-@note Function textual ID is "org.opencv.core.matrixop.thresholdOT"
-*/
-GAPI_EXPORTS_W std::tuple<GMat, GScalar> threshold(const GMat& src, const GScalar& maxval, int type);
-
-/** @brief Applies a range-level threshold to each matrix element.
-
-The function applies range-level thresholding to a single- or multiple-channel matrix.
-It sets output pixel value to OxFF if the corresponding pixel value of input matrix is in specified range,or 0 otherwise.
-
-Input and output matrices must be CV_8UC1.
-
-@note Function textual ID is "org.opencv.core.matrixop.inRange"
-
-@param src input matrix (CV_8UC1).
-@param threshLow lower boundary value.
-@param threshUp upper boundary value.
-
-@sa threshold
- */
-GAPI_EXPORTS GMat inRange(const GMat& src, const GScalar& threshLow, const GScalar& threshUp);
-
-//! @} gapi_matrixop
-
-//! @addtogroup gapi_transform
-//! @{
-/** @brief Creates one 4-channel matrix out of 4 single-channel ones.
-
-The function merges several matrices to make a single multi-channel matrix. That is, each
-element of the output matrix will be a concatenation of the elements of the input matrices, where
-elements of i-th input matrix are treated as mv[i].channels()-element vectors.
-Output matrix must be of @ref CV_8UC4 type.
-
-The function split4 does the reverse operation.
-
-@note
- - Function textual ID is "org.opencv.core.transform.merge4"
-
-@param src1 first input @ref CV_8UC1 matrix to be merged.
-@param src2 second input @ref CV_8UC1 matrix to be merged.
-@param src3 third input @ref CV_8UC1 matrix to be merged.
-@param src4 fourth input @ref CV_8UC1 matrix to be merged.
-@sa merge3, split4, split3
-*/
-GAPI_EXPORTS GMat merge4(const GMat& src1, const GMat& src2, const GMat& src3, const GMat& src4);
-
-/** @brief Creates one 3-channel matrix out of 3 single-channel ones.
-
-The function merges several matrices to make a single multi-channel matrix. That is, each
-element of the output matrix will be a concatenation of the elements of the input matrices, where
-elements of i-th input matrix are treated as mv[i].channels()-element vectors.
-Output matrix must be of @ref CV_8UC3 type.
-
-The function split3 does the reverse operation.
-
-@note
- - Function textual ID is "org.opencv.core.transform.merge3"
-
-@param src1 first input @ref CV_8UC1 matrix to be merged.
-@param src2 second input @ref CV_8UC1 matrix to be merged.
-@param src3 third input @ref CV_8UC1 matrix to be merged.
-@sa merge4, split4, split3
-*/
-GAPI_EXPORTS GMat merge3(const GMat& src1, const GMat& src2, const GMat& src3);
-
-/** @brief Divides a 4-channel matrix into 4 single-channel matrices.
-
-The function splits a 4-channel matrix into 4 single-channel matrices:
-\f[\texttt{mv} [c](I) =  \texttt{src} (I)_c\f]
-
-All output matrices must be of @ref CV_8UC1 type.
-
-The function merge4 does the reverse operation.
-
-@note
- - Function textual ID is "org.opencv.core.transform.split4"
-
-@param src input @ref CV_8UC4 matrix.
-@sa split3, merge3, merge4
-*/
-GAPI_EXPORTS std::tuple<GMat, GMat, GMat,GMat> split4(const GMat& src);
-
-/** @brief Divides a 3-channel matrix into 3 single-channel matrices.
-
-The function splits a 3-channel matrix into 3 single-channel matrices:
-\f[\texttt{mv} [c](I) =  \texttt{src} (I)_c\f]
-
-All output matrices must be of @ref CV_8UC1 type.
-
-The function merge3 does the reverse operation.
-
-@note
- - Function textual ID is "org.opencv.core.transform.split3"
-
-@param src input @ref CV_8UC3 matrix.
-@sa split4, merge3, merge4
-*/
-GAPI_EXPORTS_W std::tuple<GMat, GMat, GMat> split3(const GMat& src);
-
-/** @brief Applies a generic geometrical transformation to an image.
-
-The function remap transforms the source image using the specified map:
-
-\f[\texttt{dst} (x,y) =  \texttt{src} (map_x(x,y),map_y(x,y))\f]
-
-where values of pixels with non-integer coordinates are computed using one of available
-interpolation methods. \f$map_x\f$ and \f$map_y\f$ can be encoded as separate floating-point maps
-in \f$map_1\f$ and \f$map_2\f$ respectively, or interleaved floating-point maps of \f$(x,y)\f$ in
-\f$map_1\f$, or fixed-point maps created by using convertMaps. The reason you might want to
-convert from floating to fixed-point representations of a map is that they can yield much faster
-(\~2x) remapping operations. In the converted case, \f$map_1\f$ contains pairs (cvFloor(x),
-cvFloor(y)) and \f$map_2\f$ contains indices in a table of interpolation coefficients.
-Output image must be of the same size and depth as input one.
-
-@note
- - Function textual ID is "org.opencv.core.transform.remap"
- - Due to current implementation limitations the size of an input and output images should be less than 32767x32767.
-
-@param src Source image.
-@param map1 The first map of either (x,y) points or just x values having the type CV_16SC2,
-CV_32FC1, or CV_32FC2.
-@param map2 The second map of y values having the type CV_16UC1, CV_32FC1, or none (empty map
-if map1 is (x,y) points), respectively.
-@param interpolation Interpolation method (see cv::InterpolationFlags). The methods #INTER_AREA
-and #INTER_LINEAR_EXACT are not supported by this function.
-@param borderMode Pixel extrapolation method (see cv::BorderTypes). When
-borderMode=BORDER_TRANSPARENT, it means that the pixels in the destination image that
-corresponds to the "outliers" in the source image are not modified by the function.
-@param borderValue Value used in case of a constant border. By default, it is 0.
- */
-GAPI_EXPORTS GMat remap(const GMat& src, const Mat& map1, const Mat& map2,
-                      int interpolation, int borderMode = BORDER_CONSTANT,
-                      const Scalar& borderValue = Scalar());
-
-/** @brief Flips a 2D matrix around vertical, horizontal, or both axes.
-
-The function flips the matrix in one of three different ways (row
-and column indices are 0-based):
-\f[\texttt{dst} _{ij} =
-\left\{
-\begin{array}{l l}
-\texttt{src} _{\texttt{src.rows}-i-1,j} & if\;  \texttt{flipCode} = 0 \\
-\texttt{src} _{i, \texttt{src.cols} -j-1} & if\;  \texttt{flipCode} > 0 \\
-\texttt{src} _{ \texttt{src.rows} -i-1, \texttt{src.cols} -j-1} & if\; \texttt{flipCode} < 0 \\
-\end{array}
-\right.\f]
-The example scenarios of using the function are the following:
-*   Vertical flipping of the image (flipCode == 0) to switch between
-    top-left and bottom-left image origin. This is a typical operation
-    in video processing on Microsoft Windows\* OS.
-*   Horizontal flipping of the image with the subsequent horizontal
-    shift and absolute difference calculation to check for a
-    vertical-axis symmetry (flipCode \> 0).
-*   Simultaneous horizontal and vertical flipping of the image with
-    the subsequent shift and absolute difference calculation to check
-    for a central symmetry (flipCode \< 0).
-*   Reversing the order of point arrays (flipCode \> 0 or
-    flipCode == 0).
-Output image must be of the same depth as input one, size should be correct for given flipCode.
-
-@note Function textual ID is "org.opencv.core.transform.flip"
-
-@param src input matrix.
-@param flipCode a flag to specify how to flip the array; 0 means
-flipping around the x-axis and positive value (for example, 1) means
-flipping around y-axis. Negative value (for example, -1) means flipping
-around both axes.
-@sa remap
-*/
-GAPI_EXPORTS GMat flip(const GMat& src, int flipCode);
-
-/** @brief Crops a 2D matrix.
-
-The function crops the matrix by given cv::Rect.
-
-Output matrix must be of the same depth as input one, size is specified by given rect size.
-
-@note Function textual ID is "org.opencv.core.transform.crop"
-
-@param src input matrix.
-@param rect a rect to crop a matrix to
-@sa resize
-*/
-GAPI_EXPORTS GMat crop(const GMat& src, const Rect& rect);
-
-/** @brief Applies horizontal concatenation to given matrices.
-
-The function horizontally concatenates two GMat matrices (with the same number of rows).
-@code{.cpp}
-    GMat A = { 1, 4,
-               2, 5,
-               3, 6 };
-    GMat B = { 7, 10,
-               8, 11,
-               9, 12 };
-
-    GMat C = gapi::concatHor(A, B);
-    //C:
-    //[1, 4, 7, 10;
-    // 2, 5, 8, 11;
-    // 3, 6, 9, 12]
-@endcode
-Output matrix must the same number of rows and depth as the src1 and src2, and the sum of cols of the src1 and src2.
-Supported matrix data types are @ref CV_8UC1, @ref CV_8UC3, @ref CV_16UC1, @ref CV_16SC1, @ref CV_32FC1.
-
-@note Function textual ID is "org.opencv.imgproc.transform.concatHor"
-
-@param src1 first input matrix to be considered for horizontal concatenation.
-@param src2 second input matrix to be considered for horizontal concatenation.
-@sa concatVert
-*/
-GAPI_EXPORTS GMat concatHor(const GMat& src1, const GMat& src2);
-
-/** @overload
-The function horizontally concatenates given number of GMat matrices (with the same number of columns).
-Output matrix must the same number of columns and depth as the input matrices, and the sum of rows of input matrices.
-
-@param v vector of input matrices to be concatenated horizontally.
-*/
-GAPI_EXPORTS GMat concatHor(const std::vector<GMat> &v);
-
-/** @brief Applies vertical concatenation to given matrices.
-
-The function vertically concatenates two GMat matrices (with the same number of cols).
- @code{.cpp}
-    GMat A = { 1, 7,
-               2, 8,
-               3, 9 };
-    GMat B = { 4, 10,
-               5, 11,
-               6, 12 };
-
-    GMat C = gapi::concatVert(A, B);
-    //C:
-    //[1, 7;
-    // 2, 8;
-    // 3, 9;
-    // 4, 10;
-    // 5, 11;
-    // 6, 12]
- @endcode
-
-Output matrix must the same number of cols and depth as the src1 and src2, and the sum of rows of the src1 and src2.
-Supported matrix data types are @ref CV_8UC1, @ref CV_8UC3, @ref CV_16UC1, @ref CV_16SC1, @ref CV_32FC1.
-
-@note Function textual ID is "org.opencv.imgproc.transform.concatVert"
-
-@param src1 first input matrix to be considered for vertical concatenation.
-@param src2 second input matrix to be considered for vertical concatenation.
-@sa concatHor
-*/
-GAPI_EXPORTS GMat concatVert(const GMat& src1, const GMat& src2);
-
-/** @overload
-The function vertically concatenates given number of GMat matrices (with the same number of columns).
-Output matrix must the same number of columns and depth as the input matrices, and the sum of rows of input matrices.
-
-@param v vector of input matrices to be concatenated vertically.
-*/
-GAPI_EXPORTS GMat concatVert(const std::vector<GMat> &v);
-
-
-/** @brief Performs a look-up table transform of a matrix.
-
-The function LUT fills the output matrix with values from the look-up table. Indices of the entries
-are taken from the input matrix. That is, the function processes each element of src as follows:
-\f[\texttt{dst} (I)  \leftarrow \texttt{lut(src(I))}\f]
-
-Supported matrix data types are @ref CV_8UC1.
-Output is a matrix of the same size and number of channels as src, and the same depth as lut.
-
-@note Function textual ID is "org.opencv.core.transform.LUT"
-
-@param src input matrix of 8-bit elements.
-@param lut look-up table of 256 elements; in case of multi-channel input array, the table should
-either have a single channel (in this case the same table is used for all channels) or the same
-number of channels as in the input matrix.
-*/
-GAPI_EXPORTS GMat LUT(const GMat& src, const Mat& lut);
-
-/** @brief Converts a matrix to another data depth with optional scaling.
-
-The method converts source pixel values to the target data depth. saturate_cast\<\> is applied at
-the end to avoid possible overflows:
-
-\f[m(x,y) = saturate \_ cast<rType>( \alpha (*this)(x,y) +  \beta )\f]
-Output matrix must be of the same size as input one.
-
-@note Function textual ID is "org.opencv.core.transform.convertTo"
-@param src input matrix to be converted from.
-@param rdepth desired output matrix depth or, rather, the depth since the number of channels are the
-same as the input has; if rdepth is negative, the output matrix will have the same depth as the input.
-@param alpha optional scale factor.
-@param beta optional delta added to the scaled values.
- */
-GAPI_EXPORTS GMat convertTo(const GMat& src, int rdepth, double alpha=1, double beta=0);
-
-/** @brief Normalizes the norm or value range of an array.
-
-The function normalizes scale and shift the input array elements so that
-\f[\| \texttt{dst} \| _{L_p}= \texttt{alpha}\f]
-(where p=Inf, 1 or 2) when normType=NORM_INF, NORM_L1, or NORM_L2, respectively; or so that
-\f[\min _I  \texttt{dst} (I)= \texttt{alpha} , \, \, \max _I  \texttt{dst} (I)= \texttt{beta}\f]
-when normType=NORM_MINMAX (for dense arrays only).
-
-@note Function textual ID is "org.opencv.core.normalize"
-
-@param src input array.
-@param alpha norm value to normalize to or the lower range boundary in case of the range
-normalization.
-@param beta upper range boundary in case of the range normalization; it is not used for the norm
-normalization.
-@param norm_type normalization type (see cv::NormTypes).
-@param ddepth when negative, the output array has the same type as src; otherwise, it has the same
-number of channels as src and the depth =ddepth.
-@sa norm, Mat::convertTo
-*/
-GAPI_EXPORTS GMat normalize(const GMat& src, double alpha, double beta,
-                            int norm_type, int ddepth = -1);
-
-/** @brief Applies a perspective transformation to an image.
-
-The function warpPerspective transforms the source image using the specified matrix:
-
-\f[\texttt{dst} (x,y) =  \texttt{src} \left ( \frac{M_{11} x + M_{12} y + M_{13}}{M_{31} x + M_{32} y + M_{33}} ,
-     \frac{M_{21} x + M_{22} y + M_{23}}{M_{31} x + M_{32} y + M_{33}} \right )\f]
-
-when the flag #WARP_INVERSE_MAP is set. Otherwise, the transformation is first inverted with invert
-and then put in the formula above instead of M. The function cannot operate in-place.
-
-@param src input image.
-@param M \f$3\times 3\f$ transformation matrix.
-@param dsize size of the output image.
-@param flags combination of interpolation methods (#INTER_LINEAR or #INTER_NEAREST) and the
-optional flag #WARP_INVERSE_MAP, that sets M as the inverse transformation (
-\f$\texttt{dst}\rightarrow\texttt{src}\f$ ).
-@param borderMode pixel extrapolation method (#BORDER_CONSTANT or #BORDER_REPLICATE).
-@param borderValue value used in case of a constant border; by default, it equals 0.
-
-@sa  warpAffine, resize, remap, getRectSubPix, perspectiveTransform
- */
-GAPI_EXPORTS GMat warpPerspective(const GMat& src, const Mat& M, const Size& dsize, int flags = cv::INTER_LINEAR,
-                                  int borderMode = cv::BORDER_CONSTANT, const Scalar& borderValue = Scalar());
-
-/** @brief Applies an affine transformation to an image.
-
-The function warpAffine transforms the source image using the specified matrix:
-
-\f[\texttt{dst} (x,y) =  \texttt{src} ( \texttt{M} _{11} x +  \texttt{M} _{12} y +  \texttt{M} _{13}, \texttt{M} _{21} x +  \texttt{M} _{22} y +  \texttt{M} _{23})\f]
-
-when the flag #WARP_INVERSE_MAP is set. Otherwise, the transformation is first inverted
-with #invertAffineTransform and then put in the formula above instead of M. The function cannot
-operate in-place.
-
-@param src input image.
-@param M \f$2\times 3\f$ transformation matrix.
-@param dsize size of the output image.
-@param flags combination of interpolation methods (see #InterpolationFlags) and the optional
-flag #WARP_INVERSE_MAP that means that M is the inverse transformation (
-\f$\texttt{dst}\rightarrow\texttt{src}\f$ ).
-@param borderMode pixel extrapolation method (see #BorderTypes);
-borderMode=#BORDER_TRANSPARENT isn't supported
-@param borderValue value used in case of a constant border; by default, it is 0.
-
-@sa  warpPerspective, resize, remap, getRectSubPix, transform
- */
-GAPI_EXPORTS GMat warpAffine(const GMat& src, const Mat& M, const Size& dsize, int flags = cv::INTER_LINEAR,
-                             int borderMode = cv::BORDER_CONSTANT, const Scalar& borderValue = Scalar());
-//! @} gapi_transform
-
-/** @brief Finds centers of clusters and groups input samples around the clusters.
-
-The function kmeans implements a k-means algorithm that finds the centers of K clusters
-and groups the input samples around the clusters. As an output, \f$\texttt{bestLabels}_i\f$
-contains a 0-based cluster index for the \f$i^{th}\f$ sample.
-
-@note
- - Function textual ID is "org.opencv.core.kmeansND"
- - In case of an N-dimentional points' set given, input GMat can have the following traits:
-2 dimensions, a single row or column if there are N channels,
-or N columns if there is a single channel. Mat should have @ref CV_32F depth.
- - Although, if GMat with height != 1, width != 1, channels != 1 given as data, n-dimensional
-samples are considered given in amount of A, where A = height, n = width * channels.
- - In case of GMat given as data:
-     - the output labels are returned as 1-channel GMat with sizes
-width = 1, height = A, where A is samples amount, or width = bestLabels.width,
-height = bestLabels.height if bestLabels given;
-     - the cluster centers are returned as 1-channel GMat with sizes
-width = n, height = K, where n is samples' dimentionality and K is clusters' amount.
- - As one of possible usages, if you want to control the initial labels for each attempt
-by yourself, you can utilize just the core of the function. To do that, set the number
-of attempts to 1, initialize labels each time using a custom algorithm, pass them with the
-( flags = #KMEANS_USE_INITIAL_LABELS ) flag, and then choose the best (most-compact) clustering.
-
-@param data Data for clustering. An array of N-Dimensional points with float coordinates is needed.
-Function can take GArray<Point2f>, GArray<Point3f> for 2D and 3D cases or GMat for any
-dimentionality and channels.
-@param K Number of clusters to split the set by.
-@param bestLabels Optional input integer array that can store the supposed initial cluster indices
-for every sample. Used when ( flags = #KMEANS_USE_INITIAL_LABELS ) flag is set.
-@param criteria The algorithm termination criteria, that is, the maximum number of iterations
-and/or the desired accuracy. The accuracy is specified as criteria.epsilon. As soon as each of
-the cluster centers moves by less than criteria.epsilon on some iteration, the algorithm stops.
-@param attempts Flag to specify the number of times the algorithm is executed using different
-initial labellings. The algorithm returns the labels that yield the best compactness (see the first
-function return value).
-@param flags Flag that can take values of cv::KmeansFlags .
-
-@return
- - Compactness measure that is computed as
-\f[\sum _i  \| \texttt{samples} _i -  \texttt{centers} _{ \texttt{labels} _i} \| ^2\f]
-after every attempt. The best (minimum) value is chosen and the corresponding labels and the
-compactness value are returned by the function.
- - Integer array that stores the cluster indices for every sample.
- - Array of the cluster centers.
-*/
-GAPI_EXPORTS std::tuple<GOpaque<double>,GMat,GMat>
-kmeans(const GMat& data, const int K, const GMat& bestLabels,
-       const TermCriteria& criteria, const int attempts, const KmeansFlags flags);
-
-/** @overload
-@note
- - Function textual ID is "org.opencv.core.kmeansNDNoInit"
- - #KMEANS_USE_INITIAL_LABELS flag must not be set while using this overload.
- */
-GAPI_EXPORTS_W std::tuple<GOpaque<double>,GMat,GMat>
-kmeans(const GMat& data, const int K, const TermCriteria& criteria, const int attempts,
-       const KmeansFlags flags);
-
-/** @overload
-@note Function textual ID is "org.opencv.core.kmeans2D"
- */
-GAPI_EXPORTS_W std::tuple<GOpaque<double>,GArray<int>,GArray<Point2f>>
-kmeans(const GArray<Point2f>& data, const int K, const GArray<int>& bestLabels,
-       const TermCriteria& criteria, const int attempts, const KmeansFlags flags);
-
-/** @overload
-@note Function textual ID is "org.opencv.core.kmeans3D"
- */
-GAPI_EXPORTS std::tuple<GOpaque<double>,GArray<int>,GArray<Point3f>>
-kmeans(const GArray<Point3f>& data, const int K, const GArray<int>& bestLabels,
-       const TermCriteria& criteria, const int attempts, const KmeansFlags flags);
-
-
-/** @brief Transposes a matrix.
-
-The function transposes the matrix:
-\f[\texttt{dst} (i,j) =  \texttt{src} (j,i)\f]
-
-@note
- - Function textual ID is "org.opencv.core.transpose"
- - No complex conjugation is done in case of a complex matrix. It should be done separately if needed.
-
-@param src input array.
-*/
-GAPI_EXPORTS GMat transpose(const GMat& src);
-
-
-namespace streaming {
-/** @brief Gets dimensions from Mat.
-
-@note Function textual ID is "org.opencv.streaming.size"
-
-@param src Input tensor
-@return Size (tensor dimensions).
-*/
-GAPI_EXPORTS_W GOpaque<Size> size(const GMat& src);
-
-/** @overload
-Gets dimensions from rectangle.
-
-@note Function textual ID is "org.opencv.streaming.sizeR"
-
-@param r Input rectangle.
-@return Size (rectangle dimensions).
-*/
-GAPI_EXPORTS_W GOpaque<Size> size(const GOpaque<Rect>& r);
-
-/** @brief Gets dimensions from MediaFrame.
-
-@note Function textual ID is "org.opencv.streaming.sizeMF"
-
-@param src Input frame
-@return Size (frame dimensions).
-*/
-GAPI_EXPORTS GOpaque<Size> size(const GFrame& src);
-} //namespace streaming
-} //namespace gapi
-} //namespace cv
-
-#endif //OPENCV_GAPI_CORE_HPP
diff --git a/3rdParty/opencv2/gapi/fluid/imgproc.hpp b/3rdParty/opencv2/gapi/fluid/imgproc.hpp
deleted file mode 100644
index 385390f1b4..0000000000
--- a/3rdParty/opencv2/gapi/fluid/imgproc.hpp
+++ /dev/null
@@ -1,20 +0,0 @@
-// This file is part of OpenCV project.
-// It is subject to the license terms in the LICENSE file found in the top-level directory
-// of this distribution and at http://opencv.org/license.html.
-//
-// Copyright (C) 2018 Intel Corporation
-
-
-#ifndef OPENCV_GAPI_FLUID_IMGPROC_HPP
-#define OPENCV_GAPI_FLUID_IMGPROC_HPP
-
-#include <opencv2/gapi/gkernel.hpp> // GKernelPackage
-#include <opencv2/gapi/own/exports.hpp> // GAPI_EXPORTS
-
-namespace cv { namespace gapi { namespace imgproc { namespace fluid {
-
-GAPI_EXPORTS GKernelPackage kernels();
-
-}}}}
-
-#endif // OPENCV_GAPI_FLUID_IMGPROC_HPP
diff --git a/3rdParty/opencv2/gapi/imgproc.hpp b/3rdParty/opencv2/gapi/imgproc.hpp
deleted file mode 100644
index 0a4a31e03d..0000000000
--- a/3rdParty/opencv2/gapi/imgproc.hpp
+++ /dev/null
@@ -1,1769 +0,0 @@
-// This file is part of OpenCV project.
-// It is subject to the license terms in the LICENSE file found in the top-level directory
-// of this distribution and at http://opencv.org/license.html.
-//
-// Copyright (C) 2018-2020 Intel Corporation
-
-
-#ifndef OPENCV_GAPI_IMGPROC_HPP
-#define OPENCV_GAPI_IMGPROC_HPP
-
-#include <opencv2/imgproc.hpp>
-
-#include <utility> // std::tuple
-
-#include <opencv2/gapi/gkernel.hpp>
-#include <opencv2/gapi/gmat.hpp>
-#include <opencv2/gapi/gscalar.hpp>
-
-
-/** \defgroup gapi_imgproc G-API Image processing functionality
-@{
-    @defgroup gapi_filters Graph API: Image filters
-    @defgroup gapi_colorconvert Graph API: Converting image from one color space to another
-    @defgroup gapi_feature Graph API: Image Feature Detection
-    @defgroup gapi_shape Graph API: Image Structural Analysis and Shape Descriptors
-    @defgroup gapi_transform Graph API: Image and channel composition functions
-@}
- */
-
-namespace {
-void validateFindingContoursMeta(const int depth, const int chan, const int mode)
-{
-    GAPI_Assert(chan == 1);
-    switch (mode)
-    {
-    case cv::RETR_CCOMP:
-        GAPI_Assert(depth == CV_8U || depth == CV_32S);
-        break;
-    case cv::RETR_FLOODFILL:
-        GAPI_Assert(depth == CV_32S);
-        break;
-    default:
-        GAPI_Assert(depth == CV_8U);
-        break;
-    }
-}
-} // anonymous namespace
-
-namespace cv { namespace gapi {
-
-/**
- * @brief This namespace contains G-API Operation Types for OpenCV
- * ImgProc module functionality.
- */
-namespace imgproc {
-    using GMat2 = std::tuple<GMat,GMat>;
-    using GMat3 = std::tuple<GMat,GMat,GMat>; // FIXME: how to avoid this?
-    using GFindContoursOutput = std::tuple<GArray<GArray<Point>>,GArray<Vec4i>>;
-
-    G_TYPED_KERNEL(GFilter2D, <GMat(GMat,int,Mat,Point,Scalar,int,Scalar)>, "org.opencv.imgproc.filters.filter2D") {
-        static GMatDesc outMeta(GMatDesc in, int ddepth, Mat, Point, Scalar, int, Scalar) {
-            return in.withDepth(ddepth);
-        }
-    };
-
-    G_TYPED_KERNEL(GSepFilter, <GMat(GMat,int,Mat,Mat,Point,Scalar,int,Scalar)>, "org.opencv.imgproc.filters.sepfilter") {
-        static GMatDesc outMeta(GMatDesc in, int ddepth, Mat, Mat, Point, Scalar, int, Scalar) {
-            return in.withDepth(ddepth);
-        }
-    };
-
-    G_TYPED_KERNEL(GBoxFilter, <GMat(GMat,int,Size,Point,bool,int,Scalar)>, "org.opencv.imgproc.filters.boxfilter") {
-        static GMatDesc outMeta(GMatDesc in, int ddepth, Size, Point, bool, int, Scalar) {
-            return in.withDepth(ddepth);
-        }
-    };
-
-    G_TYPED_KERNEL(GBlur, <GMat(GMat,Size,Point,int,Scalar)>, "org.opencv.imgproc.filters.blur") {
-        static GMatDesc outMeta(GMatDesc in, Size, Point, int, Scalar) {
-            return in;
-        }
-    };
-
-    G_TYPED_KERNEL(GGaussBlur, <GMat(GMat,Size,double,double,int,Scalar)>, "org.opencv.imgproc.filters.gaussianBlur") {
-        static GMatDesc outMeta(GMatDesc in, Size, double, double, int, Scalar) {
-            return in;
-        }
-    };
-
-    G_TYPED_KERNEL(GMedianBlur, <GMat(GMat,int)>, "org.opencv.imgproc.filters.medianBlur") {
-        static GMatDesc outMeta(GMatDesc in, int) {
-            return in;
-        }
-    };
-
-    G_TYPED_KERNEL(GErode, <GMat(GMat,Mat,Point,int,int,Scalar)>, "org.opencv.imgproc.filters.erode") {
-        static GMatDesc outMeta(GMatDesc in, Mat, Point, int, int, Scalar) {
-            return in;
-        }
-    };
-
-    G_TYPED_KERNEL(GDilate, <GMat(GMat,Mat,Point,int,int,Scalar)>, "org.opencv.imgproc.filters.dilate") {
-        static GMatDesc outMeta(GMatDesc in, Mat, Point, int, int, Scalar) {
-            return in;
-        }
-    };
-
-    G_TYPED_KERNEL(GMorphologyEx, <GMat(GMat,MorphTypes,Mat,Point,int,BorderTypes,Scalar)>,
-                   "org.opencv.imgproc.filters.morphologyEx") {
-        static GMatDesc outMeta(const GMatDesc &in, MorphTypes, Mat, Point, int,
-                                BorderTypes, Scalar) {
-            return in;
-        }
-    };
-
-    G_TYPED_KERNEL(GSobel, <GMat(GMat,int,int,int,int,double,double,int,Scalar)>, "org.opencv.imgproc.filters.sobel") {
-        static GMatDesc outMeta(GMatDesc in, int ddepth, int, int, int, double, double, int, Scalar) {
-            return in.withDepth(ddepth);
-        }
-    };
-
-    G_TYPED_KERNEL_M(GSobelXY, <GMat2(GMat,int,int,int,double,double,int,Scalar)>, "org.opencv.imgproc.filters.sobelxy") {
-        static std::tuple<GMatDesc, GMatDesc> outMeta(GMatDesc in, int ddepth, int, int, double, double, int, Scalar) {
-            return std::make_tuple(in.withDepth(ddepth), in.withDepth(ddepth));
-        }
-    };
-
-    G_TYPED_KERNEL(GLaplacian, <GMat(GMat,int, int, double, double, int)>,
-                   "org.opencv.imgproc.filters.laplacian") {
-        static GMatDesc outMeta(GMatDesc in, int ddepth, int, double, double, int) {
-            return in.withDepth(ddepth);
-        }
-    };
-
-    G_TYPED_KERNEL(GBilateralFilter, <GMat(GMat,int, double, double, int)>,
-                   "org.opencv.imgproc.filters.bilateralfilter") {
-        static GMatDesc outMeta(GMatDesc in, int, double, double, int) {
-            return in;
-        }
-    };
-
-    G_TYPED_KERNEL(GEqHist, <GMat(GMat)>, "org.opencv.imgproc.equalizeHist") {
-        static GMatDesc outMeta(GMatDesc in) {
-            return in.withType(CV_8U, 1);
-        }
-    };
-
-    G_TYPED_KERNEL(GCanny, <GMat(GMat,double,double,int,bool)>, "org.opencv.imgproc.feature.canny") {
-        static GMatDesc outMeta(GMatDesc in, double, double, int, bool) {
-            return in.withType(CV_8U, 1);
-        }
-    };
-
-    G_TYPED_KERNEL(GGoodFeatures,
-                   <cv::GArray<cv::Point2f>(GMat,int,double,double,Mat,int,bool,double)>,
-                   "org.opencv.imgproc.feature.goodFeaturesToTrack") {
-        static GArrayDesc outMeta(GMatDesc, int, double, double, const Mat&, int, bool, double) {
-            return empty_array_desc();
-        }
-    };
-
-    using RetrMode = RetrievalModes;
-    using ContMethod = ContourApproximationModes;
-    G_TYPED_KERNEL(GFindContours, <GArray<GArray<Point>>(GMat,RetrMode,ContMethod,GOpaque<Point>)>,
-                   "org.opencv.imgproc.shape.findContours")
-    {
-        static GArrayDesc outMeta(GMatDesc in, RetrMode mode, ContMethod, GOpaqueDesc)
-        {
-            validateFindingContoursMeta(in.depth, in.chan, mode);
-            return empty_array_desc();
-        }
-    };
-
-    // FIXME oc: make default value offset = Point()
-    G_TYPED_KERNEL(GFindContoursNoOffset, <GArray<GArray<Point>>(GMat,RetrMode,ContMethod)>,
-                   "org.opencv.imgproc.shape.findContoursNoOffset")
-    {
-        static GArrayDesc outMeta(GMatDesc in, RetrMode mode, ContMethod)
-        {
-            validateFindingContoursMeta(in.depth, in.chan, mode);
-            return empty_array_desc();
-        }
-    };
-
-    G_TYPED_KERNEL(GFindContoursH,<GFindContoursOutput(GMat,RetrMode,ContMethod,GOpaque<Point>)>,
-                   "org.opencv.imgproc.shape.findContoursH")
-    {
-        static std::tuple<GArrayDesc,GArrayDesc>
-        outMeta(GMatDesc in, RetrMode mode, ContMethod, GOpaqueDesc)
-        {
-            validateFindingContoursMeta(in.depth, in.chan, mode);
-            return std::make_tuple(empty_array_desc(), empty_array_desc());
-        }
-    };
-
-    // FIXME oc: make default value offset = Point()
-    G_TYPED_KERNEL(GFindContoursHNoOffset,<GFindContoursOutput(GMat,RetrMode,ContMethod)>,
-                   "org.opencv.imgproc.shape.findContoursHNoOffset")
-    {
-        static std::tuple<GArrayDesc,GArrayDesc>
-        outMeta(GMatDesc in, RetrMode mode, ContMethod)
-        {
-            validateFindingContoursMeta(in.depth, in.chan, mode);
-            return std::make_tuple(empty_array_desc(), empty_array_desc());
-        }
-    };
-
-    G_TYPED_KERNEL(GBoundingRectMat, <GOpaque<Rect>(GMat)>,
-                   "org.opencv.imgproc.shape.boundingRectMat") {
-        static GOpaqueDesc outMeta(GMatDesc in) {
-            if (in.depth == CV_8U)
-            {
-                GAPI_Assert(in.chan == 1);
-            }
-            else
-            {
-                GAPI_Assert (in.depth == CV_32S || in.depth == CV_32F);
-                int amount = detail::checkVector(in, 2u);
-                GAPI_Assert(amount != -1 &&
-                            "Input Mat can't be described as vector of 2-dimentional points");
-            }
-            return empty_gopaque_desc();
-        }
-    };
-
-    G_TYPED_KERNEL(GBoundingRectVector32S, <GOpaque<Rect>(GArray<Point2i>)>,
-                   "org.opencv.imgproc.shape.boundingRectVector32S") {
-        static GOpaqueDesc outMeta(GArrayDesc) {
-            return empty_gopaque_desc();
-        }
-    };
-
-    G_TYPED_KERNEL(GBoundingRectVector32F, <GOpaque<Rect>(GArray<Point2f>)>,
-                   "org.opencv.imgproc.shape.boundingRectVector32F") {
-        static GOpaqueDesc outMeta(GArrayDesc) {
-            return empty_gopaque_desc();
-        }
-    };
-
-    G_TYPED_KERNEL(GFitLine2DMat, <GOpaque<Vec4f>(GMat,DistanceTypes,double,double,double)>,
-                   "org.opencv.imgproc.shape.fitLine2DMat") {
-        static GOpaqueDesc outMeta(GMatDesc in,DistanceTypes,double,double,double) {
-            int amount = detail::checkVector(in, 2u);
-            GAPI_Assert(amount != -1 &&
-                        "Input Mat can't be described as vector of 2-dimentional points");
-            return empty_gopaque_desc();
-        }
-    };
-
-    G_TYPED_KERNEL(GFitLine2DVector32S,
-                   <GOpaque<Vec4f>(GArray<Point2i>,DistanceTypes,double,double,double)>,
-                   "org.opencv.imgproc.shape.fitLine2DVector32S") {
-        static GOpaqueDesc outMeta(GArrayDesc,DistanceTypes,double,double,double) {
-            return empty_gopaque_desc();
-        }
-    };
-
-    G_TYPED_KERNEL(GFitLine2DVector32F,
-                   <GOpaque<Vec4f>(GArray<Point2f>,DistanceTypes,double,double,double)>,
-                   "org.opencv.imgproc.shape.fitLine2DVector32F") {
-        static GOpaqueDesc outMeta(GArrayDesc,DistanceTypes,double,double,double) {
-            return empty_gopaque_desc();
-        }
-    };
-
-    G_TYPED_KERNEL(GFitLine2DVector64F,
-                   <GOpaque<Vec4f>(GArray<Point2d>,DistanceTypes,double,double,double)>,
-                   "org.opencv.imgproc.shape.fitLine2DVector64F") {
-        static GOpaqueDesc outMeta(GArrayDesc,DistanceTypes,double,double,double) {
-            return empty_gopaque_desc();
-        }
-    };
-
-    G_TYPED_KERNEL(GFitLine3DMat, <GOpaque<Vec6f>(GMat,DistanceTypes,double,double,double)>,
-                   "org.opencv.imgproc.shape.fitLine3DMat") {
-        static GOpaqueDesc outMeta(GMatDesc in,int,double,double,double) {
-            int amount = detail::checkVector(in, 3u);
-            GAPI_Assert(amount != -1 &&
-                        "Input Mat can't be described as vector of 3-dimentional points");
-            return empty_gopaque_desc();
-        }
-    };
-
-    G_TYPED_KERNEL(GFitLine3DVector32S,
-                   <GOpaque<Vec6f>(GArray<Point3i>,DistanceTypes,double,double,double)>,
-                   "org.opencv.imgproc.shape.fitLine3DVector32S") {
-        static GOpaqueDesc outMeta(GArrayDesc,DistanceTypes,double,double,double) {
-            return empty_gopaque_desc();
-        }
-    };
-
-    G_TYPED_KERNEL(GFitLine3DVector32F,
-                   <GOpaque<Vec6f>(GArray<Point3f>,DistanceTypes,double,double,double)>,
-                   "org.opencv.imgproc.shape.fitLine3DVector32F") {
-        static GOpaqueDesc outMeta(GArrayDesc,DistanceTypes,double,double,double) {
-            return empty_gopaque_desc();
-        }
-    };
-
-    G_TYPED_KERNEL(GFitLine3DVector64F,
-                   <GOpaque<Vec6f>(GArray<Point3d>,DistanceTypes,double,double,double)>,
-                   "org.opencv.imgproc.shape.fitLine3DVector64F") {
-        static GOpaqueDesc outMeta(GArrayDesc,DistanceTypes,double,double,double) {
-            return empty_gopaque_desc();
-        }
-    };
-
-    G_TYPED_KERNEL(GBGR2RGB, <GMat(GMat)>, "org.opencv.imgproc.colorconvert.bgr2rgb") {
-        static GMatDesc outMeta(GMatDesc in) {
-            return in; // type still remains CV_8UC3;
-        }
-    };
-
-    G_TYPED_KERNEL(GRGB2YUV, <GMat(GMat)>, "org.opencv.imgproc.colorconvert.rgb2yuv") {
-        static GMatDesc outMeta(GMatDesc in) {
-            return in; // type still remains CV_8UC3;
-        }
-    };
-
-    G_TYPED_KERNEL(GYUV2RGB, <GMat(GMat)>, "org.opencv.imgproc.colorconvert.yuv2rgb") {
-        static GMatDesc outMeta(GMatDesc in) {
-            return in; // type still remains CV_8UC3;
-        }
-    };
-
-    G_TYPED_KERNEL(GBGR2I420, <GMat(GMat)>, "org.opencv.imgproc.colorconvert.bgr2i420") {
-        static GMatDesc outMeta(GMatDesc in) {
-            GAPI_Assert(in.depth == CV_8U);
-            GAPI_Assert(in.chan == 3);
-            GAPI_Assert(in.size.height % 2 == 0);
-            return in.withType(in.depth, 1).withSize(Size(in.size.width, in.size.height * 3 / 2));
-        }
-    };
-
-    G_TYPED_KERNEL(GRGB2I420, <GMat(GMat)>, "org.opencv.imgproc.colorconvert.rgb2i420") {
-        static GMatDesc outMeta(GMatDesc in) {
-            GAPI_Assert(in.depth == CV_8U);
-            GAPI_Assert(in.chan == 3);
-            GAPI_Assert(in.size.height % 2 == 0);
-            return in.withType(in.depth, 1).withSize(Size(in.size.width, in.size.height * 3 / 2));
-        }
-    };
-
-    G_TYPED_KERNEL(GI4202BGR, <GMat(GMat)>, "org.opencv.imgproc.colorconvert.i4202bgr") {
-        static GMatDesc outMeta(GMatDesc in) {
-            GAPI_Assert(in.depth == CV_8U);
-            GAPI_Assert(in.chan == 1);
-            GAPI_Assert(in.size.height % 3 == 0);
-            return in.withType(in.depth, 3).withSize(Size(in.size.width, in.size.height * 2 / 3));
-        }
-    };
-
-    G_TYPED_KERNEL(GI4202RGB, <GMat(GMat)>, "org.opencv.imgproc.colorconvert.i4202rgb") {
-        static GMatDesc outMeta(GMatDesc in) {
-            GAPI_Assert(in.depth == CV_8U);
-            GAPI_Assert(in.chan == 1);
-            GAPI_Assert(in.size.height % 3 == 0);
-            return in.withType(in.depth, 3).withSize(Size(in.size.width, in.size.height * 2 / 3));
-        }
-    };
-
-    G_TYPED_KERNEL(GNV12toRGB, <GMat(GMat, GMat)>, "org.opencv.imgproc.colorconvert.nv12torgb") {
-        static GMatDesc outMeta(GMatDesc in_y, GMatDesc in_uv) {
-            GAPI_Assert(in_y.chan == 1);
-            GAPI_Assert(in_uv.chan == 2);
-            GAPI_Assert(in_y.depth == CV_8U);
-            GAPI_Assert(in_uv.depth == CV_8U);
-            // UV size should be aligned with Y
-            GAPI_Assert(in_y.size.width == 2 * in_uv.size.width);
-            GAPI_Assert(in_y.size.height == 2 * in_uv.size.height);
-            return in_y.withType(CV_8U, 3); // type will be CV_8UC3;
-        }
-    };
-
-    G_TYPED_KERNEL(GNV12toBGR, <GMat(GMat, GMat)>, "org.opencv.imgproc.colorconvert.nv12tobgr") {
-        static GMatDesc outMeta(GMatDesc in_y, GMatDesc in_uv) {
-            GAPI_Assert(in_y.chan == 1);
-            GAPI_Assert(in_uv.chan == 2);
-            GAPI_Assert(in_y.depth == CV_8U);
-            GAPI_Assert(in_uv.depth == CV_8U);
-            // UV size should be aligned with Y
-            GAPI_Assert(in_y.size.width == 2 * in_uv.size.width);
-            GAPI_Assert(in_y.size.height == 2 * in_uv.size.height);
-            return in_y.withType(CV_8U, 3); // type will be CV_8UC3;
-        }
-    };
-
-    G_TYPED_KERNEL(GRGB2Lab, <GMat(GMat)>, "org.opencv.imgproc.colorconvert.rgb2lab") {
-        static GMatDesc outMeta(GMatDesc in) {
-            return in; // type still remains CV_8UC3;
-        }
-    };
-
-    G_TYPED_KERNEL(GBGR2LUV, <GMat(GMat)>, "org.opencv.imgproc.colorconvert.bgr2luv") {
-        static GMatDesc outMeta(GMatDesc in) {
-            return in; // type still remains CV_8UC3;
-        }
-    };
-
-    G_TYPED_KERNEL(GLUV2BGR, <GMat(GMat)>, "org.opencv.imgproc.colorconvert.luv2bgr") {
-        static GMatDesc outMeta(GMatDesc in) {
-            return in; // type still remains CV_8UC3;
-        }
-    };
-
-    G_TYPED_KERNEL(GYUV2BGR, <GMat(GMat)>, "org.opencv.imgproc.colorconvert.yuv2bgr") {
-        static GMatDesc outMeta(GMatDesc in) {
-            return in; // type still remains CV_8UC3;
-        }
-    };
-
-    G_TYPED_KERNEL(GBGR2YUV, <GMat(GMat)>, "org.opencv.imgproc.colorconvert.bgr2yuv") {
-        static GMatDesc outMeta(GMatDesc in) {
-            return in; // type still remains CV_8UC3;
-        }
-    };
-
-    G_TYPED_KERNEL(GRGB2Gray, <GMat(GMat)>, "org.opencv.imgproc.colorconvert.rgb2gray") {
-        static GMatDesc outMeta(GMatDesc in) {
-            return in.withType(CV_8U, 1);
-        }
-    };
-
-    G_TYPED_KERNEL(GRGB2GrayCustom, <GMat(GMat,float,float,float)>, "org.opencv.imgproc.colorconvert.rgb2graycustom") {
-        static GMatDesc outMeta(GMatDesc in, float, float, float) {
-            return in.withType(CV_8U, 1);
-        }
-    };
-
-    G_TYPED_KERNEL(GBGR2Gray, <GMat(GMat)>, "org.opencv.imgproc.colorconvert.bgr2gray") {
-        static GMatDesc outMeta(GMatDesc in) {
-            return in.withType(CV_8U, 1);
-        }
-    };
-
-    G_TYPED_KERNEL(GBayerGR2RGB, <cv::GMat(cv::GMat)>, "org.opencv.imgproc.colorconvert.bayergr2rgb") {
-        static cv::GMatDesc outMeta(cv::GMatDesc in) {
-            return in.withType(CV_8U, 3);
-        }
-    };
-
-    G_TYPED_KERNEL(GRGB2HSV, <cv::GMat(cv::GMat)>, "org.opencv.imgproc.colorconvert.rgb2hsv") {
-        static cv::GMatDesc outMeta(cv::GMatDesc in) {
-            return in;
-        }
-    };
-
-    G_TYPED_KERNEL(GRGB2YUV422, <cv::GMat(cv::GMat)>, "org.opencv.imgproc.colorconvert.rgb2yuv422") {
-        static cv::GMatDesc outMeta(cv::GMatDesc in) {
-            GAPI_Assert(in.depth == CV_8U);
-            GAPI_Assert(in.chan == 3);
-            return in.withType(in.depth, 2);
-        }
-    };
-
-    G_TYPED_KERNEL(GNV12toRGBp, <GMatP(GMat,GMat)>, "org.opencv.imgproc.colorconvert.nv12torgbp") {
-        static GMatDesc outMeta(GMatDesc inY, GMatDesc inUV) {
-            GAPI_Assert(inY.depth == CV_8U);
-            GAPI_Assert(inUV.depth == CV_8U);
-            GAPI_Assert(inY.chan == 1);
-            GAPI_Assert(inY.planar == false);
-            GAPI_Assert(inUV.chan == 2);
-            GAPI_Assert(inUV.planar == false);
-            GAPI_Assert(inY.size.width  == 2 * inUV.size.width);
-            GAPI_Assert(inY.size.height == 2 * inUV.size.height);
-            return inY.withType(CV_8U, 3).asPlanar();
-        }
-    };
-
-    G_TYPED_KERNEL(GNV12toGray, <GMat(GMat,GMat)>, "org.opencv.imgproc.colorconvert.nv12togray") {
-        static GMatDesc outMeta(GMatDesc inY, GMatDesc inUV) {
-            GAPI_Assert(inY.depth   == CV_8U);
-            GAPI_Assert(inUV.depth  == CV_8U);
-            GAPI_Assert(inY.chan    == 1);
-            GAPI_Assert(inY.planar  == false);
-            GAPI_Assert(inUV.chan   == 2);
-            GAPI_Assert(inUV.planar == false);
-
-            GAPI_Assert(inY.size.width  == 2 * inUV.size.width);
-            GAPI_Assert(inY.size.height == 2 * inUV.size.height);
-            return inY.withType(CV_8U, 1);
-        }
-    };
-
-    G_TYPED_KERNEL(GNV12toBGRp, <GMatP(GMat,GMat)>, "org.opencv.imgproc.colorconvert.nv12tobgrp") {
-        static GMatDesc outMeta(GMatDesc inY, GMatDesc inUV) {
-            GAPI_Assert(inY.depth == CV_8U);
-            GAPI_Assert(inUV.depth == CV_8U);
-            GAPI_Assert(inY.chan == 1);
-            GAPI_Assert(inY.planar == false);
-            GAPI_Assert(inUV.chan == 2);
-            GAPI_Assert(inUV.planar == false);
-            GAPI_Assert(inY.size.width  == 2 * inUV.size.width);
-            GAPI_Assert(inY.size.height == 2 * inUV.size.height);
-            return inY.withType(CV_8U, 3).asPlanar();
-        }
-    };
-
-    G_TYPED_KERNEL(GResize, <GMat(GMat,Size,double,double,int)>, "org.opencv.imgproc.transform.resize") {
-        static GMatDesc outMeta(GMatDesc in, Size sz, double fx, double fy, int /*interp*/) {
-            if (sz.width != 0 && sz.height != 0)
-            {
-                return in.withSize(sz);
-            }
-            else
-            {
-                int outSz_w = saturate_cast<int>(in.size.width  * fx);
-                int outSz_h = saturate_cast<int>(in.size.height * fy);
-                GAPI_Assert(outSz_w > 0 && outSz_h > 0);
-                return in.withSize(Size(outSz_w, outSz_h));
-            }
-        }
-    };
-
-    G_TYPED_KERNEL(GResizeP, <GMatP(GMatP,Size,int)>, "org.opencv.imgproc.transform.resizeP") {
-        static GMatDesc outMeta(GMatDesc in, Size sz, int interp) {
-            GAPI_Assert(in.depth == CV_8U);
-            GAPI_Assert(in.chan == 3);
-            GAPI_Assert(in.planar);
-            GAPI_Assert(interp == cv::INTER_LINEAR);
-            return in.withSize(sz);
-        }
-    };
-
-} //namespace imgproc
-
-//! @addtogroup gapi_filters
-//! @{
-/** @brief Applies a separable linear filter to a matrix(image).
-
-The function applies a separable linear filter to the matrix. That is, first, every row of src is
-filtered with the 1D kernel kernelX. Then, every column of the result is filtered with the 1D
-kernel kernelY. The final result is returned.
-
-Supported matrix data types are @ref CV_8UC1, @ref CV_8UC3, @ref CV_16UC1, @ref CV_16SC1, @ref CV_32FC1.
-Output image must have the same type, size, and number of channels as the input image.
-@note
- - In case of floating-point computation, rounding to nearest even is procedeed
-if hardware supports it (if not - to nearest value).
- - Function textual ID is "org.opencv.imgproc.filters.sepfilter"
-@param src Source image.
-@param ddepth desired depth of the destination image (the following combinations of src.depth() and ddepth are supported:
-
-        src.depth() = CV_8U, ddepth = -1/CV_16S/CV_32F/CV_64F
-        src.depth() = CV_16U/CV_16S, ddepth = -1/CV_32F/CV_64F
-        src.depth() = CV_32F, ddepth = -1/CV_32F/CV_64F
-        src.depth() = CV_64F, ddepth = -1/CV_64F
-
-when ddepth=-1, the output image will have the same depth as the source)
-@param kernelX Coefficients for filtering each row.
-@param kernelY Coefficients for filtering each column.
-@param anchor Anchor position within the kernel. The default value \f$(-1,-1)\f$ means that the anchor
-is at the kernel center.
-@param delta Value added to the filtered results before storing them.
-@param borderType Pixel extrapolation method, see cv::BorderTypes
-@param borderValue border value in case of constant border type
-@sa  boxFilter, gaussianBlur, medianBlur
- */
-GAPI_EXPORTS GMat sepFilter(const GMat& src, int ddepth, const Mat& kernelX, const Mat& kernelY, const Point& anchor /*FIXME: = Point(-1,-1)*/,
-                            const Scalar& delta /*FIXME = GScalar(0)*/, int borderType = BORDER_DEFAULT,
-                            const Scalar& borderValue = Scalar(0));
-
-/** @brief Convolves an image with the kernel.
-
-The function applies an arbitrary linear filter to an image. When
-the aperture is partially outside the image, the function interpolates outlier pixel values
-according to the specified border mode.
-
-The function does actually compute correlation, not the convolution:
-
-\f[\texttt{dst} (x,y) =  \sum _{ \substack{0\leq x' < \texttt{kernel.cols}\\{0\leq y' < \texttt{kernel.rows}}}}  \texttt{kernel} (x',y')* \texttt{src} (x+x'- \texttt{anchor.x} ,y+y'- \texttt{anchor.y} )\f]
-
-That is, the kernel is not mirrored around the anchor point. If you need a real convolution, flip
-the kernel using flip and set the new anchor to `(kernel.cols - anchor.x - 1, kernel.rows -
-anchor.y - 1)`.
-
-Supported matrix data types are @ref CV_8UC1, @ref CV_8UC3, @ref CV_16UC1, @ref CV_16SC1, @ref CV_32FC1.
-Output image must have the same size and number of channels an input image.
-@note
- - Rounding to nearest even is procedeed if hardware supports it, if not - to nearest.
- - Function textual ID is "org.opencv.imgproc.filters.filter2D"
-
-@param src input image.
-@param ddepth desired depth of the destination image
-@param kernel convolution kernel (or rather a correlation kernel), a single-channel floating point
-matrix; if you want to apply different kernels to different channels, split the image into
-separate color planes using split and process them individually.
-@param anchor anchor of the kernel that indicates the relative position of a filtered point within
-the kernel; the anchor should lie within the kernel; default value (-1,-1) means that the anchor
-is at the kernel center.
-@param delta optional value added to the filtered pixels before storing them in dst.
-@param borderType pixel extrapolation method, see cv::BorderTypes
-@param borderValue border value in case of constant border type
-@sa  sepFilter
- */
-GAPI_EXPORTS GMat filter2D(const GMat& src, int ddepth, const Mat& kernel, const Point& anchor = Point(-1,-1), const Scalar& delta = Scalar(0),
-                           int borderType = BORDER_DEFAULT, const Scalar& borderValue = Scalar(0));
-
-
-/** @brief Blurs an image using the box filter.
-
-The function smooths an image using the kernel:
-
-\f[\texttt{K} =  \alpha \begin{bmatrix} 1 & 1 & 1 &  \cdots & 1 & 1  \\ 1 & 1 & 1 &  \cdots & 1 & 1  \\ \hdotsfor{6} \\ 1 & 1 & 1 &  \cdots & 1 & 1 \end{bmatrix}\f]
-
-where
-
-\f[\alpha = \begin{cases} \frac{1}{\texttt{ksize.width*ksize.height}} & \texttt{when } \texttt{normalize=true}  \\1 & \texttt{otherwise} \end{cases}\f]
-
-Unnormalized box filter is useful for computing various integral characteristics over each pixel
-neighborhood, such as covariance matrices of image derivatives (used in dense optical flow
-algorithms, and so on). If you need to compute pixel sums over variable-size windows, use cv::integral.
-
-Supported input matrix data types are @ref CV_8UC1, @ref CV_8UC3, @ref CV_16UC1, @ref CV_16SC1, @ref CV_32FC1.
-Output image must have the same type, size, and number of channels as the input image.
-@note
- - Rounding to nearest even is procedeed if hardware supports it, if not - to nearest.
- - Function textual ID is "org.opencv.imgproc.filters.boxfilter"
-
-@param src Source image.
-@param dtype the output image depth (-1 to set the input image data type).
-@param ksize blurring kernel size.
-@param anchor Anchor position within the kernel. The default value \f$(-1,-1)\f$ means that the anchor
-is at the kernel center.
-@param normalize flag, specifying whether the kernel is normalized by its area or not.
-@param borderType Pixel extrapolation method, see cv::BorderTypes
-@param borderValue border value in case of constant border type
-@sa  sepFilter, gaussianBlur, medianBlur, integral
- */
-GAPI_EXPORTS GMat boxFilter(const GMat& src, int dtype, const Size& ksize, const Point& anchor = Point(-1,-1),
-                            bool normalize = true, int borderType = BORDER_DEFAULT,
-                            const Scalar& borderValue = Scalar(0));
-
-/** @brief Blurs an image using the normalized box filter.
-
-The function smooths an image using the kernel:
-
-\f[\texttt{K} =  \frac{1}{\texttt{ksize.width*ksize.height}} \begin{bmatrix} 1 & 1 & 1 &  \cdots & 1 & 1  \\ 1 & 1 & 1 &  \cdots & 1 & 1  \\ \hdotsfor{6} \\ 1 & 1 & 1 &  \cdots & 1 & 1  \\ \end{bmatrix}\f]
-
-The call `blur(src, ksize, anchor, borderType)` is equivalent to `boxFilter(src, src.type(), ksize, anchor,
-true, borderType)`.
-
-Supported input matrix data types are @ref CV_8UC1, @ref CV_8UC3, @ref CV_16UC1, @ref CV_16SC1, @ref CV_32FC1.
-Output image must have the same type, size, and number of channels as the input image.
-@note
- - Rounding to nearest even is procedeed if hardware supports it, if not - to nearest.
- - Function textual ID is "org.opencv.imgproc.filters.blur"
-
-@param src Source image.
-@param ksize blurring kernel size.
-@param anchor anchor point; default value Point(-1,-1) means that the anchor is at the kernel
-center.
-@param borderType border mode used to extrapolate pixels outside of the image, see cv::BorderTypes
-@param borderValue border value in case of constant border type
-@sa  boxFilter, bilateralFilter, GaussianBlur, medianBlur
- */
-GAPI_EXPORTS GMat blur(const GMat& src, const Size& ksize, const Point& anchor = Point(-1,-1),
-                       int borderType = BORDER_DEFAULT, const Scalar& borderValue = Scalar(0));
-
-
-//GAPI_EXPORTS_W void blur( InputArray src, OutputArray dst,
- //                       Size ksize, Point anchor = Point(-1,-1),
- //                       int borderType = BORDER_DEFAULT );
-
-
-/** @brief Blurs an image using a Gaussian filter.
-
-The function filter2Ds the source image with the specified Gaussian kernel.
-Output image must have the same type and number of channels an input image.
-
-Supported input matrix data types are @ref CV_8UC1, @ref CV_8UC3, @ref CV_16UC1, @ref CV_16SC1, @ref CV_32FC1.
-Output image must have the same type, size, and number of channels as the input image.
-@note
- - Rounding to nearest even is procedeed if hardware supports it, if not - to nearest.
- - Function textual ID is "org.opencv.imgproc.filters.gaussianBlur"
-
-@param src input image;
-@param ksize Gaussian kernel size. ksize.width and ksize.height can differ but they both must be
-positive and odd. Or, they can be zero's and then they are computed from sigma.
-@param sigmaX Gaussian kernel standard deviation in X direction.
-@param sigmaY Gaussian kernel standard deviation in Y direction; if sigmaY is zero, it is set to be
-equal to sigmaX, if both sigmas are zeros, they are computed from ksize.width and ksize.height,
-respectively (see cv::getGaussianKernel for details); to fully control the result regardless of
-possible future modifications of all this semantics, it is recommended to specify all of ksize,
-sigmaX, and sigmaY.
-@param borderType pixel extrapolation method, see cv::BorderTypes
-@param borderValue border value in case of constant border type
-@sa  sepFilter, boxFilter, medianBlur
- */
-GAPI_EXPORTS GMat gaussianBlur(const GMat& src, const Size& ksize, double sigmaX, double sigmaY = 0,
-                               int borderType = BORDER_DEFAULT, const Scalar& borderValue = Scalar(0));
-
-/** @brief Blurs an image using the median filter.
-
-The function smoothes an image using the median filter with the \f$\texttt{ksize} \times
-\texttt{ksize}\f$ aperture. Each channel of a multi-channel image is processed independently.
-Output image must have the same type, size, and number of channels as the input image.
-@note
- - Rounding to nearest even is procedeed if hardware supports it, if not - to nearest.
-The median filter uses cv::BORDER_REPLICATE internally to cope with border pixels, see cv::BorderTypes
- - Function textual ID is "org.opencv.imgproc.filters.medianBlur"
-
-@param src input matrix (image)
-@param ksize aperture linear size; it must be odd and greater than 1, for example: 3, 5, 7 ...
-@sa  boxFilter, gaussianBlur
- */
-GAPI_EXPORTS_W GMat medianBlur(const GMat& src, int ksize);
-
-/** @brief Erodes an image by using a specific structuring element.
-
-The function erodes the source image using the specified structuring element that determines the
-shape of a pixel neighborhood over which the minimum is taken:
-
-\f[\texttt{dst} (x,y) =  \min _{(x',y'):  \, \texttt{element} (x',y') \ne0 } \texttt{src} (x+x',y+y')\f]
-
-Erosion can be applied several (iterations) times. In case of multi-channel images, each channel is processed independently.
-Supported input matrix data types are @ref CV_8UC1, @ref CV_8UC3, @ref CV_16UC1, @ref CV_16SC1, and @ref CV_32FC1.
-Output image must have the same type, size, and number of channels as the input image.
-@note
- - Rounding to nearest even is procedeed if hardware supports it, if not - to nearest.
- - Function textual ID is "org.opencv.imgproc.filters.erode"
-
-@param src input image
-@param kernel structuring element used for erosion; if `element=Mat()`, a `3 x 3` rectangular
-structuring element is used. Kernel can be created using getStructuringElement.
-@param anchor position of the anchor within the element; default value (-1, -1) means that the
-anchor is at the element center.
-@param iterations number of times erosion is applied.
-@param borderType pixel extrapolation method, see cv::BorderTypes
-@param borderValue border value in case of a constant border
-@sa  dilate, morphologyEx
- */
-GAPI_EXPORTS GMat erode(const GMat& src, const Mat& kernel, const Point& anchor = Point(-1,-1), int iterations = 1,
-                        int borderType = BORDER_CONSTANT,
-                        const  Scalar& borderValue = morphologyDefaultBorderValue());
-
-/** @brief Erodes an image by using 3 by 3 rectangular structuring element.
-
-The function erodes the source image using the rectangular structuring element with rectangle center as an anchor.
-Erosion can be applied several (iterations) times. In case of multi-channel images, each channel is processed independently.
-Supported input matrix data types are @ref CV_8UC1, @ref CV_8UC3, @ref CV_16UC1, @ref CV_16SC1, and @ref CV_32FC1.
-Output image must have the same type, size, and number of channels as the input image.
-@note
- - Rounding to nearest even is procedeed if hardware supports it, if not - to nearest.
- - Function textual ID is "org.opencv.imgproc.filters.erode"
-
-@param src input image
-@param iterations number of times erosion is applied.
-@param borderType pixel extrapolation method, see cv::BorderTypes
-@param borderValue border value in case of a constant border
-@sa  erode, dilate3x3
- */
-GAPI_EXPORTS GMat erode3x3(const GMat& src, int iterations = 1,
-                           int borderType = BORDER_CONSTANT,
-                           const  Scalar& borderValue = morphologyDefaultBorderValue());
-
-/** @brief Dilates an image by using a specific structuring element.
-
-The function dilates the source image using the specified structuring element that determines the
-shape of a pixel neighborhood over which the maximum is taken:
-\f[\texttt{dst} (x,y) =  \max _{(x',y'):  \, \texttt{element} (x',y') \ne0 } \texttt{src} (x+x',y+y')\f]
-
-Dilation can be applied several (iterations) times. In case of multi-channel images, each channel is processed independently.
-Supported input matrix data types are @ref CV_8UC1, @ref CV_8UC3, @ref CV_16UC1, @ref CV_16SC1, and @ref CV_32FC1.
-Output image must have the same type, size, and number of channels as the input image.
-@note
- - Rounding to nearest even is procedeed if hardware supports it, if not - to nearest.
- - Function textual ID is "org.opencv.imgproc.filters.dilate"
-
-@param src input image.
-@param kernel structuring element used for dilation; if elemenat=Mat(), a 3 x 3 rectangular
-structuring element is used. Kernel can be created using getStructuringElement
-@param anchor position of the anchor within the element; default value (-1, -1) means that the
-anchor is at the element center.
-@param iterations number of times dilation is applied.
-@param borderType pixel extrapolation method, see cv::BorderTypes
-@param borderValue border value in case of a constant border
-@sa  erode, morphologyEx, getStructuringElement
- */
-GAPI_EXPORTS GMat dilate(const GMat& src, const Mat& kernel, const Point& anchor = Point(-1,-1), int iterations = 1,
-                         int borderType = BORDER_CONSTANT,
-                         const  Scalar& borderValue = morphologyDefaultBorderValue());
-
-/** @brief Dilates an image by using 3 by 3 rectangular structuring element.
-
-The function dilates the source image using the specified structuring element that determines the
-shape of a pixel neighborhood over which the maximum is taken:
-\f[\texttt{dst} (x,y) =  \max _{(x',y'):  \, \texttt{element} (x',y') \ne0 } \texttt{src} (x+x',y+y')\f]
-
-Dilation can be applied several (iterations) times. In case of multi-channel images, each channel is processed independently.
-Supported input matrix data types are @ref CV_8UC1, @ref CV_8UC3, @ref CV_16UC1, @ref CV_16SC1, and @ref CV_32FC1.
-Output image must have the same type, size, and number of channels as the input image.
-@note
- - Rounding to nearest even is procedeed if hardware supports it, if not - to nearest.
- - Function textual ID is "org.opencv.imgproc.filters.dilate"
-
-@param src input image.
-@param iterations number of times dilation is applied.
-@param borderType pixel extrapolation method, see cv::BorderTypes
-@param borderValue border value in case of a constant border
-@sa  dilate, erode3x3
- */
-
-GAPI_EXPORTS GMat dilate3x3(const GMat& src, int iterations = 1,
-                            int borderType = BORDER_CONSTANT,
-                            const  Scalar& borderValue = morphologyDefaultBorderValue());
-
-/** @brief Performs advanced morphological transformations.
-
-The function can perform advanced morphological transformations using an erosion and dilation as
-basic operations.
-
-Any of the operations can be done in-place. In case of multi-channel images, each channel is
-processed independently.
-
-@note
- - Function textual ID is "org.opencv.imgproc.filters.morphologyEx"
- - The number of iterations is the number of times erosion or dilatation operation will be
-applied. For instance, an opening operation (#MORPH_OPEN) with two iterations is equivalent to
-apply successively: erode -> erode -> dilate -> dilate
-(and not erode -> dilate -> erode -> dilate).
-
-@param src Input image.
-@param op Type of a morphological operation, see #MorphTypes
-@param kernel Structuring element. It can be created using #getStructuringElement.
-@param anchor Anchor position within the element. Both negative values mean that the anchor is at
-the kernel center.
-@param iterations Number of times erosion and dilation are applied.
-@param borderType Pixel extrapolation method, see #BorderTypes. #BORDER_WRAP is not supported.
-@param borderValue Border value in case of a constant border. The default value has a special
-meaning.
-@sa  dilate, erode, getStructuringElement
- */
-GAPI_EXPORTS GMat morphologyEx(const GMat &src, const MorphTypes op, const Mat &kernel,
-                               const Point       &anchor      = Point(-1,-1),
-                               const int          iterations  = 1,
-                               const BorderTypes  borderType  = BORDER_CONSTANT,
-                               const Scalar      &borderValue = morphologyDefaultBorderValue());
-
-/** @brief Calculates the first, second, third, or mixed image derivatives using an extended Sobel operator.
-
-In all cases except one, the \f$\texttt{ksize} \times \texttt{ksize}\f$ separable kernel is used to
-calculate the derivative. When \f$\texttt{ksize = 1}\f$, the \f$3 \times 1\f$ or \f$1 \times 3\f$
-kernel is used (that is, no Gaussian smoothing is done). `ksize = 1` can only be used for the first
-or the second x- or y- derivatives.
-
-There is also the special value `ksize = FILTER_SCHARR (-1)` that corresponds to the \f$3\times3\f$ Scharr
-filter that may give more accurate results than the \f$3\times3\f$ Sobel. The Scharr aperture is
-
-\f[\vecthreethree{-3}{0}{3}{-10}{0}{10}{-3}{0}{3}\f]
-
-for the x-derivative, or transposed for the y-derivative.
-
-The function calculates an image derivative by convolving the image with the appropriate kernel:
-
-\f[\texttt{dst} =  \frac{\partial^{xorder+yorder} \texttt{src}}{\partial x^{xorder} \partial y^{yorder}}\f]
-
-The Sobel operators combine Gaussian smoothing and differentiation, so the result is more or less
-resistant to the noise. Most often, the function is called with ( xorder = 1, yorder = 0, ksize = 3)
-or ( xorder = 0, yorder = 1, ksize = 3) to calculate the first x- or y- image derivative. The first
-case corresponds to a kernel of:
-
-\f[\vecthreethree{-1}{0}{1}{-2}{0}{2}{-1}{0}{1}\f]
-
-The second case corresponds to a kernel of:
-
-\f[\vecthreethree{-1}{-2}{-1}{0}{0}{0}{1}{2}{1}\f]
-
-@note
- - Rounding to nearest even is procedeed if hardware supports it, if not - to nearest.
- - Function textual ID is "org.opencv.imgproc.filters.sobel"
-
-@param src input image.
-@param ddepth output image depth, see @ref filter_depths "combinations"; in the case of
-    8-bit input images it will result in truncated derivatives.
-@param dx order of the derivative x.
-@param dy order of the derivative y.
-@param ksize size of the extended Sobel kernel; it must be odd.
-@param scale optional scale factor for the computed derivative values; by default, no scaling is
-applied (see cv::getDerivKernels for details).
-@param delta optional delta value that is added to the results prior to storing them in dst.
-@param borderType pixel extrapolation method, see cv::BorderTypes
-@param borderValue border value in case of constant border type
-@sa filter2D, gaussianBlur, cartToPolar
- */
-GAPI_EXPORTS GMat Sobel(const GMat& src, int ddepth, int dx, int dy, int ksize = 3,
-                        double scale = 1, double delta = 0,
-                        int borderType = BORDER_DEFAULT,
-                        const Scalar& borderValue = Scalar(0));
-
-/** @brief Calculates the first, second, third, or mixed image derivatives using an extended Sobel operator.
-
-In all cases except one, the \f$\texttt{ksize} \times \texttt{ksize}\f$ separable kernel is used to
-calculate the derivative. When \f$\texttt{ksize = 1}\f$, the \f$3 \times 1\f$ or \f$1 \times 3\f$
-kernel is used (that is, no Gaussian smoothing is done). `ksize = 1` can only be used for the first
-or the second x- or y- derivatives.
-
-There is also the special value `ksize = FILTER_SCHARR (-1)` that corresponds to the \f$3\times3\f$ Scharr
-filter that may give more accurate results than the \f$3\times3\f$ Sobel. The Scharr aperture is
-
-\f[\vecthreethree{-3}{0}{3}{-10}{0}{10}{-3}{0}{3}\f]
-
-for the x-derivative, or transposed for the y-derivative.
-
-The function calculates an image derivative by convolving the image with the appropriate kernel:
-
-\f[\texttt{dst} =  \frac{\partial^{xorder+yorder} \texttt{src}}{\partial x^{xorder} \partial y^{yorder}}\f]
-
-The Sobel operators combine Gaussian smoothing and differentiation, so the result is more or less
-resistant to the noise. Most often, the function is called with ( xorder = 1, yorder = 0, ksize = 3)
-or ( xorder = 0, yorder = 1, ksize = 3) to calculate the first x- or y- image derivative. The first
-case corresponds to a kernel of:
-
-\f[\vecthreethree{-1}{0}{1}{-2}{0}{2}{-1}{0}{1}\f]
-
-The second case corresponds to a kernel of:
-
-\f[\vecthreethree{-1}{-2}{-1}{0}{0}{0}{1}{2}{1}\f]
-
-@note
- - First returned matrix correspons to dx derivative while the second one to dy.
- - Rounding to nearest even is procedeed if hardware supports it, if not - to nearest.
- - Function textual ID is "org.opencv.imgproc.filters.sobelxy"
-
-@param src input image.
-@param ddepth output image depth, see @ref filter_depths "combinations"; in the case of
-    8-bit input images it will result in truncated derivatives.
-@param order order of the derivatives.
-@param ksize size of the extended Sobel kernel; it must be odd.
-@param scale optional scale factor for the computed derivative values; by default, no scaling is
-applied (see cv::getDerivKernels for details).
-@param delta optional delta value that is added to the results prior to storing them in dst.
-@param borderType pixel extrapolation method, see cv::BorderTypes
-@param borderValue border value in case of constant border type
-@sa filter2D, gaussianBlur, cartToPolar
- */
-GAPI_EXPORTS std::tuple<GMat, GMat> SobelXY(const GMat& src, int ddepth, int order, int ksize = 3,
-                        double scale = 1, double delta = 0,
-                        int borderType = BORDER_DEFAULT,
-                        const Scalar& borderValue = Scalar(0));
-
-/** @brief Calculates the Laplacian of an image.
-
-The function calculates the Laplacian of the source image by adding up the second x and y
-derivatives calculated using the Sobel operator:
-
-\f[\texttt{dst} =  \Delta \texttt{src} =  \frac{\partial^2 \texttt{src}}{\partial x^2} +  \frac{\partial^2 \texttt{src}}{\partial y^2}\f]
-
-This is done when `ksize > 1`. When `ksize == 1`, the Laplacian is computed by filtering the image
-with the following \f$3 \times 3\f$ aperture:
-
-\f[\vecthreethree {0}{1}{0}{1}{-4}{1}{0}{1}{0}\f]
-
-@note Function textual ID is "org.opencv.imgproc.filters.laplacian"
-
-@param src Source image.
-@param ddepth Desired depth of the destination image.
-@param ksize Aperture size used to compute the second-derivative filters. See #getDerivKernels for
-details. The size must be positive and odd.
-@param scale Optional scale factor for the computed Laplacian values. By default, no scaling is
-applied. See #getDerivKernels for details.
-@param delta Optional delta value that is added to the results prior to storing them in dst .
-@param borderType Pixel extrapolation method, see #BorderTypes. #BORDER_WRAP is not supported.
-@return Destination image of the same size and the same number of channels as src.
-@sa  Sobel, Scharr
- */
-GAPI_EXPORTS GMat Laplacian(const GMat& src, int ddepth, int ksize = 1,
-                            double scale = 1, double delta = 0, int borderType = BORDER_DEFAULT);
-
-/** @brief Applies the bilateral filter to an image.
-
-The function applies bilateral filtering to the input image, as described in
-http://www.dai.ed.ac.uk/CVonline/LOCAL_COPIES/MANDUCHI1/Bilateral_Filtering.html
-bilateralFilter can reduce unwanted noise very well while keeping edges fairly sharp. However, it is
-very slow compared to most filters.
-
-_Sigma values_: For simplicity, you can set the 2 sigma values to be the same. If they are small (\<
-10), the filter will not have much effect, whereas if they are large (\> 150), they will have a very
-strong effect, making the image look "cartoonish".
-
-_Filter size_: Large filters (d \> 5) are very slow, so it is recommended to use d=5 for real-time
-applications, and perhaps d=9 for offline applications that need heavy noise filtering.
-
-This filter does not work inplace.
-
-@note Function textual ID is "org.opencv.imgproc.filters.bilateralfilter"
-
-@param src Source 8-bit or floating-point, 1-channel or 3-channel image.
-@param d Diameter of each pixel neighborhood that is used during filtering. If it is non-positive,
-it is computed from sigmaSpace.
-@param sigmaColor Filter sigma in the color space. A larger value of the parameter means that
-farther colors within the pixel neighborhood (see sigmaSpace) will be mixed together, resulting
-in larger areas of semi-equal color.
-@param sigmaSpace Filter sigma in the coordinate space. A larger value of the parameter means that
-farther pixels will influence each other as long as their colors are close enough (see sigmaColor
-). When d\>0, it specifies the neighborhood size regardless of sigmaSpace. Otherwise, d is
-proportional to sigmaSpace.
-@param borderType border mode used to extrapolate pixels outside of the image, see #BorderTypes
-@return Destination image of the same size and type as src.
- */
-GAPI_EXPORTS GMat bilateralFilter(const GMat& src, int d, double sigmaColor, double sigmaSpace,
-                                  int borderType = BORDER_DEFAULT);
-
-//! @} gapi_filters
-
-//! @addtogroup gapi_feature
-//! @{
-/** @brief Finds edges in an image using the Canny algorithm.
-
-The function finds edges in the input image and marks them in the output map edges using the
-Canny algorithm. The smallest value between threshold1 and threshold2 is used for edge linking. The
-largest value is used to find initial segments of strong edges. See
-<http://en.wikipedia.org/wiki/Canny_edge_detector>
-
-@note Function textual ID is "org.opencv.imgproc.feature.canny"
-
-@param image 8-bit input image.
-@param threshold1 first threshold for the hysteresis procedure.
-@param threshold2 second threshold for the hysteresis procedure.
-@param apertureSize aperture size for the Sobel operator.
-@param L2gradient a flag, indicating whether a more accurate \f$L_2\f$ norm
-\f$=\sqrt{(dI/dx)^2 + (dI/dy)^2}\f$ should be used to calculate the image gradient magnitude (
-L2gradient=true ), or whether the default \f$L_1\f$ norm \f$=|dI/dx|+|dI/dy|\f$ is enough (
-L2gradient=false ).
- */
-GAPI_EXPORTS GMat Canny(const GMat& image, double threshold1, double threshold2,
-                        int apertureSize = 3, bool L2gradient = false);
-
-/** @brief Determines strong corners on an image.
-
-The function finds the most prominent corners in the image or in the specified image region, as
-described in @cite Shi94
-
--   Function calculates the corner quality measure at every source image pixel using the
-    #cornerMinEigenVal or #cornerHarris .
--   Function performs a non-maximum suppression (the local maximums in *3 x 3* neighborhood are
-    retained).
--   The corners with the minimal eigenvalue less than
-    \f$\texttt{qualityLevel} \cdot \max_{x,y} qualityMeasureMap(x,y)\f$ are rejected.
--   The remaining corners are sorted by the quality measure in the descending order.
--   Function throws away each corner for which there is a stronger corner at a distance less than
-    maxDistance.
-
-The function can be used to initialize a point-based tracker of an object.
-
-@note
- - If the function is called with different values A and B of the parameter qualityLevel , and
-A \> B, the vector of returned corners with qualityLevel=A will be the prefix of the output vector
-with qualityLevel=B .
- - Function textual ID is "org.opencv.imgproc.feature.goodFeaturesToTrack"
-
-@param image Input 8-bit or floating-point 32-bit, single-channel image.
-@param maxCorners Maximum number of corners to return. If there are more corners than are found,
-the strongest of them is returned. `maxCorners <= 0` implies that no limit on the maximum is set
-and all detected corners are returned.
-@param qualityLevel Parameter characterizing the minimal accepted quality of image corners. The
-parameter value is multiplied by the best corner quality measure, which is the minimal eigenvalue
-(see #cornerMinEigenVal ) or the Harris function response (see #cornerHarris ). The corners with the
-quality measure less than the product are rejected. For example, if the best corner has the
-quality measure = 1500, and the qualityLevel=0.01 , then all the corners with the quality measure
-less than 15 are rejected.
-@param minDistance Minimum possible Euclidean distance between the returned corners.
-@param mask Optional region of interest. If the image is not empty (it needs to have the type
-CV_8UC1 and the same size as image ), it specifies the region in which the corners are detected.
-@param blockSize Size of an average block for computing a derivative covariation matrix over each
-pixel neighborhood. See cornerEigenValsAndVecs .
-@param useHarrisDetector Parameter indicating whether to use a Harris detector (see #cornerHarris)
-or #cornerMinEigenVal.
-@param k Free parameter of the Harris detector.
-
-@return vector of detected corners.
- */
-GAPI_EXPORTS_W GArray<Point2f> goodFeaturesToTrack(const GMat  &image,
-                                                       int    maxCorners,
-                                                       double qualityLevel,
-                                                       double minDistance,
-                                                 const Mat   &mask = Mat(),
-                                                       int    blockSize = 3,
-                                                       bool   useHarrisDetector = false,
-                                                       double k = 0.04);
-
-/** @brief Equalizes the histogram of a grayscale image.
-
-//! @} gapi_feature
-
-The function equalizes the histogram of the input image using the following algorithm:
-
-- Calculate the histogram \f$H\f$ for src .
-- Normalize the histogram so that the sum of histogram bins is 255.
-- Compute the integral of the histogram:
-\f[H'_i =  \sum _{0  \le j < i} H(j)\f]
-- Transform the image using \f$H'\f$ as a look-up table: \f$\texttt{dst}(x,y) = H'(\texttt{src}(x,y))\f$
-
-The algorithm normalizes the brightness and increases the contrast of the image.
-@note
- - The returned image is of the same size and type as input.
- - Function textual ID is "org.opencv.imgproc.equalizeHist"
-
-@param src Source 8-bit single channel image.
- */
-GAPI_EXPORTS GMat equalizeHist(const GMat& src);
-
-//! @addtogroup gapi_shape
-//! @{
-/** @brief Finds contours in a binary image.
-
-The function retrieves contours from the binary image using the algorithm @cite Suzuki85 .
-The contours are a useful tool for shape analysis and object detection and recognition.
-See squares.cpp in the OpenCV sample directory.
-
-@note Function textual ID is "org.opencv.imgproc.shape.findContours"
-
-@param src Input gray-scale image @ref CV_8UC1. Non-zero pixels are treated as 1's. Zero
-pixels remain 0's, so the image is treated as binary . You can use #compare, #inRange, #threshold ,
-#adaptiveThreshold, #Canny, and others to create a binary image out of a grayscale or color one.
-If mode equals to #RETR_CCOMP, the input can also be a 32-bit integer
-image of labels ( @ref CV_32SC1 ). If #RETR_FLOODFILL then @ref CV_32SC1 is supported only.
-@param mode Contour retrieval mode, see #RetrievalModes
-@param method Contour approximation method, see #ContourApproximationModes
-@param offset Optional offset by which every contour point is shifted. This is useful if the
-contours are extracted from the image ROI and then they should be analyzed in the whole image
-context.
-
-@return GArray of detected contours. Each contour is stored as a GArray of points.
- */
-GAPI_EXPORTS GArray<GArray<Point>>
-findContours(const GMat &src, const RetrievalModes mode, const ContourApproximationModes method,
-             const GOpaque<Point> &offset);
-
-// FIXME oc: make default value offset = Point()
-/** @overload
-@note Function textual ID is "org.opencv.imgproc.shape.findContoursNoOffset"
- */
-GAPI_EXPORTS GArray<GArray<Point>>
-findContours(const GMat &src, const RetrievalModes mode, const ContourApproximationModes method);
-
-/** @brief Finds contours and their hierarchy in a binary image.
-
-The function retrieves contours from the binary image using the algorithm @cite Suzuki85
-and calculates their hierarchy.
-The contours are a useful tool for shape analysis and object detection and recognition.
-See squares.cpp in the OpenCV sample directory.
-
-@note Function textual ID is "org.opencv.imgproc.shape.findContoursH"
-
-@param src Input gray-scale image @ref CV_8UC1. Non-zero pixels are treated as 1's. Zero
-pixels remain 0's, so the image is treated as binary . You can use #compare, #inRange, #threshold ,
-#adaptiveThreshold, #Canny, and others to create a binary image out of a grayscale or color one.
-If mode equals to #RETR_CCOMP, the input can also be a 32-bit integer
-image of labels ( @ref CV_32SC1 ). If #RETR_FLOODFILL -- @ref CV_32SC1 supports only.
-@param mode Contour retrieval mode, see #RetrievalModes
-@param method Contour approximation method, see #ContourApproximationModes
-@param offset Optional offset by which every contour point is shifted. This is useful if the
-contours are extracted from the image ROI and then they should be analyzed in the whole image
-context.
-
-@return
- - GArray of detected contours. Each contour is stored as a GArray of points.
- - Optional output GArray of cv::Vec4i, containing information about the image topology.
-It has as many elements as the number of contours. For each i-th contour contours[i], the elements
-hierarchy[i][0] , hierarchy[i][1] , hierarchy[i][2] , and hierarchy[i][3] are set to 0-based
-indices in contours of the next and previous contours at the same hierarchical level, the first
-child contour and the parent contour, respectively. If for the contour i there are no next,
-previous, parent, or nested contours, the corresponding elements of hierarchy[i] will be negative.
- */
-GAPI_EXPORTS std::tuple<GArray<GArray<Point>>,GArray<Vec4i>>
-findContoursH(const GMat &src, const RetrievalModes mode, const ContourApproximationModes method,
-              const GOpaque<Point> &offset);
-
-// FIXME oc: make default value offset = Point()
-/** @overload
-@note Function textual ID is "org.opencv.imgproc.shape.findContoursHNoOffset"
- */
-GAPI_EXPORTS std::tuple<GArray<GArray<Point>>,GArray<Vec4i>>
-findContoursH(const GMat &src, const RetrievalModes mode, const ContourApproximationModes method);
-
-/** @brief Calculates the up-right bounding rectangle of a point set or non-zero pixels
-of gray-scale image.
-
-The function calculates and returns the minimal up-right bounding rectangle for the specified
-point set or non-zero pixels of gray-scale image.
-
-@note
- - Function textual ID is "org.opencv.imgproc.shape.boundingRectMat"
- - In case of a 2D points' set given, Mat should be 2-dimensional, have a single row or column
-if there are 2 channels, or have 2 columns if there is a single channel. Mat should have either
-@ref CV_32S or @ref CV_32F depth
-
-@param src Input gray-scale image @ref CV_8UC1; or input set of @ref CV_32S or @ref CV_32F
-2D points stored in Mat.
- */
-GAPI_EXPORTS_W GOpaque<Rect> boundingRect(const GMat& src);
-
-/** @overload
-
-Calculates the up-right bounding rectangle of a point set.
-
-@note Function textual ID is "org.opencv.imgproc.shape.boundingRectVector32S"
-
-@param src Input 2D point set, stored in std::vector<cv::Point2i>.
- */
-GAPI_EXPORTS_W GOpaque<Rect> boundingRect(const GArray<Point2i>& src);
-
-/** @overload
-
-Calculates the up-right bounding rectangle of a point set.
-
-@note Function textual ID is "org.opencv.imgproc.shape.boundingRectVector32F"
-
-@param src Input 2D point set, stored in std::vector<cv::Point2f>.
- */
-GAPI_EXPORTS GOpaque<Rect> boundingRect(const GArray<Point2f>& src);
-
-/** @brief Fits a line to a 2D point set.
-
-The function fits a line to a 2D point set by minimizing \f$\sum_i \rho(r_i)\f$ where
-\f$r_i\f$ is a distance between the \f$i^{th}\f$ point, the line and \f$\rho(r)\f$ is a distance
-function, one of the following:
--  DIST_L2
-\f[\rho (r) = r^2/2  \quad \text{(the simplest and the fastest least-squares method)}\f]
-- DIST_L1
-\f[\rho (r) = r\f]
-- DIST_L12
-\f[\rho (r) = 2  \cdot ( \sqrt{1 + \frac{r^2}{2}} - 1)\f]
-- DIST_FAIR
-\f[\rho \left (r \right ) = C^2  \cdot \left (  \frac{r}{C} -  \log{\left(1 + \frac{r}{C}\right)} \right )  \quad \text{where} \quad C=1.3998\f]
-- DIST_WELSCH
-\f[\rho \left (r \right ) =  \frac{C^2}{2} \cdot \left ( 1 -  \exp{\left(-\left(\frac{r}{C}\right)^2\right)} \right )  \quad \text{where} \quad C=2.9846\f]
-- DIST_HUBER
-\f[\rho (r) =  \fork{r^2/2}{if \(r < C\)}{C \cdot (r-C/2)}{otherwise} \quad \text{where} \quad C=1.345\f]
-
-The algorithm is based on the M-estimator ( <http://en.wikipedia.org/wiki/M-estimator> ) technique
-that iteratively fits the line using the weighted least-squares algorithm. After each iteration the
-weights \f$w_i\f$ are adjusted to be inversely proportional to \f$\rho(r_i)\f$ .
-
-@note
- - Function textual ID is "org.opencv.imgproc.shape.fitLine2DMat"
- - In case of an N-dimentional points' set given, Mat should be 2-dimensional, have a single row
-or column if there are N channels, or have N columns if there is a single channel.
-
-@param src Input set of 2D points stored in one of possible containers: Mat,
-std::vector<cv::Point2i>, std::vector<cv::Point2f>, std::vector<cv::Point2d>.
-@param distType Distance used by the M-estimator, see #DistanceTypes. @ref DIST_USER
-and @ref DIST_C are not supported.
-@param param Numerical parameter ( C ) for some types of distances. If it is 0, an optimal value
-is chosen.
-@param reps Sufficient accuracy for the radius (distance between the coordinate origin and the
-line). 1.0 would be a good default value for reps. If it is 0, a default value is chosen.
-@param aeps Sufficient accuracy for the angle. 0.01 would be a good default value for aeps.
-If it is 0, a default value is chosen.
-
-@return Output line parameters: a vector of 4 elements (like Vec4f) - (vx, vy, x0, y0),
-where (vx, vy) is a normalized vector collinear to the line and (x0, y0) is a point on the line.
- */
-GAPI_EXPORTS GOpaque<Vec4f> fitLine2D(const GMat& src, const DistanceTypes distType,
-                                      const double param = 0., const double reps = 0.,
-                                      const double aeps = 0.);
-
-/** @overload
-
-@note Function textual ID is "org.opencv.imgproc.shape.fitLine2DVector32S"
-
- */
-GAPI_EXPORTS GOpaque<Vec4f> fitLine2D(const GArray<Point2i>& src, const DistanceTypes distType,
-                                      const double param = 0., const double reps = 0.,
-                                      const double aeps = 0.);
-
-/** @overload
-
-@note Function textual ID is "org.opencv.imgproc.shape.fitLine2DVector32F"
-
- */
-GAPI_EXPORTS GOpaque<Vec4f> fitLine2D(const GArray<Point2f>& src, const DistanceTypes distType,
-                                      const double param = 0., const double reps = 0.,
-                                      const double aeps = 0.);
-
-/** @overload
-
-@note Function textual ID is "org.opencv.imgproc.shape.fitLine2DVector64F"
-
- */
-GAPI_EXPORTS GOpaque<Vec4f> fitLine2D(const GArray<Point2d>& src, const DistanceTypes distType,
-                                      const double param = 0., const double reps = 0.,
-                                      const double aeps = 0.);
-
-/** @brief Fits a line to a 3D point set.
-
-The function fits a line to a 3D point set by minimizing \f$\sum_i \rho(r_i)\f$ where
-\f$r_i\f$ is a distance between the \f$i^{th}\f$ point, the line and \f$\rho(r)\f$ is a distance
-function, one of the following:
--  DIST_L2
-\f[\rho (r) = r^2/2  \quad \text{(the simplest and the fastest least-squares method)}\f]
-- DIST_L1
-\f[\rho (r) = r\f]
-- DIST_L12
-\f[\rho (r) = 2  \cdot ( \sqrt{1 + \frac{r^2}{2}} - 1)\f]
-- DIST_FAIR
-\f[\rho \left (r \right ) = C^2  \cdot \left (  \frac{r}{C} -  \log{\left(1 + \frac{r}{C}\right)} \right )  \quad \text{where} \quad C=1.3998\f]
-- DIST_WELSCH
-\f[\rho \left (r \right ) =  \frac{C^2}{2} \cdot \left ( 1 -  \exp{\left(-\left(\frac{r}{C}\right)^2\right)} \right )  \quad \text{where} \quad C=2.9846\f]
-- DIST_HUBER
-\f[\rho (r) =  \fork{r^2/2}{if \(r < C\)}{C \cdot (r-C/2)}{otherwise} \quad \text{where} \quad C=1.345\f]
-
-The algorithm is based on the M-estimator ( <http://en.wikipedia.org/wiki/M-estimator> ) technique
-that iteratively fits the line using the weighted least-squares algorithm. After each iteration the
-weights \f$w_i\f$ are adjusted to be inversely proportional to \f$\rho(r_i)\f$ .
-
-@note
- - Function textual ID is "org.opencv.imgproc.shape.fitLine3DMat"
- - In case of an N-dimentional points' set given, Mat should be 2-dimensional, have a single row
-or column if there are N channels, or have N columns if there is a single channel.
-
-@param src Input set of 3D points stored in one of possible containers: Mat,
-std::vector<cv::Point3i>, std::vector<cv::Point3f>, std::vector<cv::Point3d>.
-@param distType Distance used by the M-estimator, see #DistanceTypes. @ref DIST_USER
-and @ref DIST_C are not supported.
-@param param Numerical parameter ( C ) for some types of distances. If it is 0, an optimal value
-is chosen.
-@param reps Sufficient accuracy for the radius (distance between the coordinate origin and the
-line). 1.0 would be a good default value for reps. If it is 0, a default value is chosen.
-@param aeps Sufficient accuracy for the angle. 0.01 would be a good default value for aeps.
-If it is 0, a default value is chosen.
-
-@return Output line parameters: a vector of 6 elements (like Vec6f) - (vx, vy, vz, x0, y0, z0),
-where (vx, vy, vz) is a normalized vector collinear to the line and (x0, y0, z0) is a point on
-the line.
- */
-GAPI_EXPORTS GOpaque<Vec6f> fitLine3D(const GMat& src, const DistanceTypes distType,
-                                      const double param = 0., const double reps = 0.,
-                                      const double aeps = 0.);
-
-/** @overload
-
-@note Function textual ID is "org.opencv.imgproc.shape.fitLine3DVector32S"
-
- */
-GAPI_EXPORTS GOpaque<Vec6f> fitLine3D(const GArray<Point3i>& src, const DistanceTypes distType,
-                                      const double param = 0., const double reps = 0.,
-                                      const double aeps = 0.);
-
-/** @overload
-
-@note Function textual ID is "org.opencv.imgproc.shape.fitLine3DVector32F"
-
- */
-GAPI_EXPORTS GOpaque<Vec6f> fitLine3D(const GArray<Point3f>& src, const DistanceTypes distType,
-                                      const double param = 0., const double reps = 0.,
-                                      const double aeps = 0.);
-
-/** @overload
-
-@note Function textual ID is "org.opencv.imgproc.shape.fitLine3DVector64F"
-
- */
-GAPI_EXPORTS GOpaque<Vec6f> fitLine3D(const GArray<Point3d>& src, const DistanceTypes distType,
-                                      const double param = 0., const double reps = 0.,
-                                      const double aeps = 0.);
-
-//! @} gapi_shape
-
-//! @addtogroup gapi_colorconvert
-//! @{
-/** @brief Converts an image from BGR color space to RGB color space.
-
-The function converts an input image from BGR color space to RGB.
-The conventional ranges for B, G, and R channel values are 0 to 255.
-
-Output image is 8-bit unsigned 3-channel image @ref CV_8UC3.
-
-@note Function textual ID is "org.opencv.imgproc.colorconvert.bgr2rgb"
-
-@param src input image: 8-bit unsigned 3-channel image @ref CV_8UC3.
-@sa RGB2BGR
-*/
-GAPI_EXPORTS_W GMat BGR2RGB(const GMat& src);
-
-/** @brief Converts an image from RGB color space to gray-scaled.
-
-The conventional ranges for R, G, and B channel values are 0 to 255.
-Resulting gray color value computed as
-\f[\texttt{dst} (I)= \texttt{0.299} * \texttt{src}(I).R + \texttt{0.587} * \texttt{src}(I).G  + \texttt{0.114} * \texttt{src}(I).B \f]
-
-@note Function textual ID is "org.opencv.imgproc.colorconvert.rgb2gray"
-
-@param src input image: 8-bit unsigned 3-channel image @ref CV_8UC1.
-@sa RGB2YUV
- */
-GAPI_EXPORTS_W GMat RGB2Gray(const GMat& src);
-
-/** @overload
-Resulting gray color value computed as
-\f[\texttt{dst} (I)= \texttt{rY} * \texttt{src}(I).R + \texttt{gY} * \texttt{src}(I).G  + \texttt{bY} * \texttt{src}(I).B \f]
-
-@note Function textual ID is "org.opencv.imgproc.colorconvert.rgb2graycustom"
-
-@param src input image: 8-bit unsigned 3-channel image @ref CV_8UC1.
-@param rY float multiplier for R channel.
-@param gY float multiplier for G channel.
-@param bY float multiplier for B channel.
-@sa RGB2YUV
- */
-GAPI_EXPORTS GMat RGB2Gray(const GMat& src, float rY, float gY, float bY);
-
-/** @brief Converts an image from BGR color space to gray-scaled.
-
-The conventional ranges for B, G, and R channel values are 0 to 255.
-Resulting gray color value computed as
-\f[\texttt{dst} (I)= \texttt{0.114} * \texttt{src}(I).B + \texttt{0.587} * \texttt{src}(I).G  + \texttt{0.299} * \texttt{src}(I).R \f]
-
-@note Function textual ID is "org.opencv.imgproc.colorconvert.bgr2gray"
-
-@param src input image: 8-bit unsigned 3-channel image @ref CV_8UC1.
-@sa BGR2LUV
- */
-GAPI_EXPORTS GMat BGR2Gray(const GMat& src);
-
-/** @brief Converts an image from RGB color space to YUV color space.
-
-The function converts an input image from RGB color space to YUV.
-The conventional ranges for R, G, and B channel values are 0 to 255.
-
-In case of linear transformations, the range does not matter. But in case of a non-linear
-transformation, an input RGB image should be normalized to the proper value range to get the correct
-results, like here, at RGB \f$\rightarrow\f$ Y\*u\*v\* transformation.
-Output image must be 8-bit unsigned 3-channel image @ref CV_8UC3.
-
-@note Function textual ID is "org.opencv.imgproc.colorconvert.rgb2yuv"
-
-@param src input image: 8-bit unsigned 3-channel image @ref CV_8UC3.
-@sa YUV2RGB, RGB2Lab
-*/
-GAPI_EXPORTS GMat RGB2YUV(const GMat& src);
-
-/** @brief Converts an image from BGR color space to I420 color space.
-
-The function converts an input image from BGR color space to I420.
-The conventional ranges for R, G, and B channel values are 0 to 255.
-
-Output image must be 8-bit unsigned 1-channel image. @ref CV_8UC1.
-Width of I420 output image must be the same as width of input image.
-Height of I420 output image must be equal 3/2 from height of input image.
-
-@note Function textual ID is "org.opencv.imgproc.colorconvert.bgr2i420"
-
-@param src input image: 8-bit unsigned 3-channel image @ref CV_8UC3.
-@sa I4202BGR
-*/
-GAPI_EXPORTS GMat BGR2I420(const GMat& src);
-
-/** @brief Converts an image from RGB color space to I420 color space.
-
-The function converts an input image from RGB color space to I420.
-The conventional ranges for R, G, and B channel values are 0 to 255.
-
-Output image must be 8-bit unsigned 1-channel image. @ref CV_8UC1.
-Width of I420 output image must be the same as width of input image.
-Height of I420 output image must be equal 3/2 from height of input image.
-
-@note Function textual ID is "org.opencv.imgproc.colorconvert.rgb2i420"
-
-@param src input image: 8-bit unsigned 3-channel image @ref CV_8UC3.
-@sa I4202RGB
-*/
-GAPI_EXPORTS GMat RGB2I420(const GMat& src);
-
-/** @brief Converts an image from I420 color space to BGR color space.
-
-The function converts an input image from I420 color space to BGR.
-The conventional ranges for B, G, and R channel values are 0 to 255.
-
-Output image must be 8-bit unsigned 3-channel image. @ref CV_8UC3.
-Width of BGR output image must be the same as width of input image.
-Height of BGR output image must be equal 2/3 from height of input image.
-
-@note Function textual ID is "org.opencv.imgproc.colorconvert.i4202bgr"
-
-@param src input image: 8-bit unsigned 1-channel image @ref CV_8UC1.
-@sa BGR2I420
-*/
-GAPI_EXPORTS GMat I4202BGR(const GMat& src);
-
-/** @brief Converts an image from I420 color space to BGR color space.
-
-The function converts an input image from I420 color space to BGR.
-The conventional ranges for B, G, and R channel values are 0 to 255.
-
-Output image must be 8-bit unsigned 3-channel image. @ref CV_8UC3.
-Width of RGB output image must be the same as width of input image.
-Height of RGB output image must be equal 2/3 from height of input image.
-
-@note Function textual ID is "org.opencv.imgproc.colorconvert.i4202rgb"
-
-@param src input image: 8-bit unsigned 1-channel image @ref CV_8UC1.
-@sa RGB2I420
-*/
-GAPI_EXPORTS GMat I4202RGB(const GMat& src);
-
-/** @brief Converts an image from BGR color space to LUV color space.
-
-The function converts an input image from BGR color space to LUV.
-The conventional ranges for B, G, and R channel values are 0 to 255.
-
-Output image must be 8-bit unsigned 3-channel image @ref CV_8UC3.
-
-@note Function textual ID is "org.opencv.imgproc.colorconvert.bgr2luv"
-
-@param src input image: 8-bit unsigned 3-channel image @ref CV_8UC3.
-@sa RGB2Lab, RGB2LUV
-*/
-GAPI_EXPORTS GMat BGR2LUV(const GMat& src);
-
-/** @brief Converts an image from LUV color space to BGR color space.
-
-The function converts an input image from LUV color space to BGR.
-The conventional ranges for B, G, and R channel values are 0 to 255.
-
-Output image must be 8-bit unsigned 3-channel image @ref CV_8UC3.
-
-@note Function textual ID is "org.opencv.imgproc.colorconvert.luv2bgr"
-
-@param src input image: 8-bit unsigned 3-channel image @ref CV_8UC3.
-@sa BGR2LUV
-*/
-GAPI_EXPORTS GMat LUV2BGR(const GMat& src);
-
-/** @brief Converts an image from YUV color space to BGR color space.
-
-The function converts an input image from YUV color space to BGR.
-The conventional ranges for B, G, and R channel values are 0 to 255.
-
-Output image must be 8-bit unsigned 3-channel image @ref CV_8UC3.
-
-@note Function textual ID is "org.opencv.imgproc.colorconvert.yuv2bgr"
-
-@param src input image: 8-bit unsigned 3-channel image @ref CV_8UC3.
-@sa BGR2YUV
-*/
-GAPI_EXPORTS GMat YUV2BGR(const GMat& src);
-
-/** @brief Converts an image from BGR color space to YUV color space.
-
-The function converts an input image from BGR color space to YUV.
-The conventional ranges for B, G, and R channel values are 0 to 255.
-
-Output image must be 8-bit unsigned 3-channel image @ref CV_8UC3.
-
-@note Function textual ID is "org.opencv.imgproc.colorconvert.bgr2yuv"
-
-@param src input image: 8-bit unsigned 3-channel image @ref CV_8UC3.
-@sa YUV2BGR
-*/
-GAPI_EXPORTS GMat BGR2YUV(const GMat& src);
-
-/** @brief Converts an image from RGB color space to Lab color space.
-
-The function converts an input image from BGR color space to Lab.
-The conventional ranges for R, G, and B channel values are 0 to 255.
-
-Output image must be 8-bit unsigned 3-channel image @ref CV_8UC1.
-
-@note Function textual ID is "org.opencv.imgproc.colorconvert.rgb2lab"
-
-@param src input image: 8-bit unsigned 3-channel image @ref CV_8UC1.
-@sa RGB2YUV, RGB2LUV
-*/
-GAPI_EXPORTS GMat RGB2Lab(const GMat& src);
-
-/** @brief Converts an image from YUV color space to RGB.
-The function converts an input image from YUV color space to RGB.
-The conventional ranges for Y, U, and V channel values are 0 to 255.
-
-Output image must be 8-bit unsigned 3-channel image @ref CV_8UC3.
-
-@note Function textual ID is "org.opencv.imgproc.colorconvert.yuv2rgb"
-
-@param src input image: 8-bit unsigned 3-channel image @ref CV_8UC3.
-
-@sa RGB2Lab, RGB2YUV
-*/
-GAPI_EXPORTS GMat YUV2RGB(const GMat& src);
-
-/** @brief Converts an image from NV12 (YUV420p) color space to RGB.
-The function converts an input image from NV12 color space to RGB.
-The conventional ranges for Y, U, and V channel values are 0 to 255.
-
-Output image must be 8-bit unsigned 3-channel image @ref CV_8UC3.
-
-@note Function textual ID is "org.opencv.imgproc.colorconvert.nv12torgb"
-
-@param src_y input image: 8-bit unsigned 1-channel image @ref CV_8UC1.
-@param src_uv input image: 8-bit unsigned 2-channel image @ref CV_8UC2.
-
-@sa YUV2RGB, NV12toBGR
-*/
-GAPI_EXPORTS GMat NV12toRGB(const GMat& src_y, const GMat& src_uv);
-
-/** @brief Converts an image from NV12 (YUV420p) color space to gray-scaled.
-The function converts an input image from NV12 color space to gray-scaled.
-The conventional ranges for Y, U, and V channel values are 0 to 255.
-
-Output image must be 8-bit unsigned 1-channel image @ref CV_8UC1.
-
-@note Function textual ID is "org.opencv.imgproc.colorconvert.nv12togray"
-
-@param src_y input image: 8-bit unsigned 1-channel image @ref CV_8UC1.
-@param src_uv input image: 8-bit unsigned 2-channel image @ref CV_8UC2.
-
-@sa YUV2RGB, NV12toBGR
-*/
-GAPI_EXPORTS GMat NV12toGray(const GMat& src_y, const GMat& src_uv);
-
-/** @brief Converts an image from NV12 (YUV420p) color space to BGR.
-The function converts an input image from NV12 color space to RGB.
-The conventional ranges for Y, U, and V channel values are 0 to 255.
-
-Output image must be 8-bit unsigned 3-channel image @ref CV_8UC3.
-
-@note Function textual ID is "org.opencv.imgproc.colorconvert.nv12tobgr"
-
-@param src_y input image: 8-bit unsigned 1-channel image @ref CV_8UC1.
-@param src_uv input image: 8-bit unsigned 2-channel image @ref CV_8UC2.
-
-@sa YUV2BGR, NV12toRGB
-*/
-GAPI_EXPORTS GMat NV12toBGR(const GMat& src_y, const GMat& src_uv);
-
-/** @brief Converts an image from BayerGR color space to RGB.
-The function converts an input image from BayerGR color space to RGB.
-The conventional ranges for G, R, and B channel values are 0 to 255.
-
-Output image must be 8-bit unsigned 3-channel image @ref CV_8UC3.
-
-@note Function textual ID is "org.opencv.imgproc.colorconvert.bayergr2rgb"
-
-@param src_gr input image: 8-bit unsigned 1-channel image @ref CV_8UC1.
-
-@sa YUV2BGR, NV12toRGB
-*/
-GAPI_EXPORTS GMat BayerGR2RGB(const GMat& src_gr);
-
-/** @brief Converts an image from RGB color space to HSV.
-The function converts an input image from RGB color space to HSV.
-The conventional ranges for R, G, and B channel values are 0 to 255.
-
-Output image must be 8-bit unsigned 3-channel image @ref CV_8UC3.
-
-@note Function textual ID is "org.opencv.imgproc.colorconvert.rgb2hsv"
-
-@param src input image: 8-bit unsigned 3-channel image @ref CV_8UC3.
-
-@sa YUV2BGR, NV12toRGB
-*/
-GAPI_EXPORTS GMat RGB2HSV(const GMat& src);
-
-/** @brief Converts an image from RGB color space to YUV422.
-The function converts an input image from RGB color space to YUV422.
-The conventional ranges for R, G, and B channel values are 0 to 255.
-
-Output image must be 8-bit unsigned 2-channel image @ref CV_8UC2.
-
-@note Function textual ID is "org.opencv.imgproc.colorconvert.rgb2yuv422"
-
-@param src input image: 8-bit unsigned 3-channel image @ref CV_8UC3.
-
-@sa YUV2BGR, NV12toRGB
-*/
-GAPI_EXPORTS GMat RGB2YUV422(const GMat& src);
-
-/** @brief Converts an image from NV12 (YUV420p) color space to RGB.
-The function converts an input image from NV12 color space to RGB.
-The conventional ranges for Y, U, and V channel values are 0 to 255.
-
-Output image must be 8-bit unsigned planar 3-channel image @ref CV_8UC1.
-Planar image memory layout is three planes laying in the memory contiguously,
-so the image height should be plane_height*plane_number,
-image type is @ref CV_8UC1.
-
-@note Function textual ID is "org.opencv.imgproc.colorconvert.nv12torgbp"
-
-@param src_y input image: 8-bit unsigned 1-channel image @ref CV_8UC1.
-@param src_uv input image: 8-bit unsigned 2-channel image @ref CV_8UC2.
-
-@sa YUV2RGB, NV12toBGRp, NV12toRGB
-*/
-GAPI_EXPORTS GMatP NV12toRGBp(const GMat &src_y, const GMat &src_uv);
-
-/** @brief Converts an image from NV12 (YUV420p) color space to BGR.
-The function converts an input image from NV12 color space to BGR.
-The conventional ranges for Y, U, and V channel values are 0 to 255.
-
-Output image must be 8-bit unsigned planar 3-channel image @ref CV_8UC1.
-Planar image memory layout is three planes laying in the memory contiguously,
-so the image height should be plane_height*plane_number,
-image type is @ref CV_8UC1.
-
-@note Function textual ID is "org.opencv.imgproc.colorconvert.nv12torgbp"
-
-@param src_y input image: 8-bit unsigned 1-channel image @ref CV_8UC1.
-@param src_uv input image: 8-bit unsigned 2-channel image @ref CV_8UC2.
-
-@sa YUV2RGB, NV12toRGBp, NV12toBGR
-*/
-GAPI_EXPORTS GMatP NV12toBGRp(const GMat &src_y, const GMat &src_uv);
-
-//! @} gapi_colorconvert
-//! @addtogroup gapi_transform
-//! @{
-/** @brief Resizes an image.
-
-The function resizes the image src down to or up to the specified size.
-
-Output image size will have the size dsize (when dsize is non-zero) or the size computed from
-src.size(), fx, and fy; the depth of output is the same as of src.
-
-If you want to resize src so that it fits the pre-created dst,
-you may call the function as follows:
-@code
-    // explicitly specify dsize=dst.size(); fx and fy will be computed from that.
-    resize(src, dst, dst.size(), 0, 0, interpolation);
-@endcode
-If you want to decimate the image by factor of 2 in each direction, you can call the function this
-way:
-@code
-    // specify fx and fy and let the function compute the destination image size.
-    resize(src, dst, Size(), 0.5, 0.5, interpolation);
-@endcode
-To shrink an image, it will generally look best with cv::INTER_AREA interpolation, whereas to
-enlarge an image, it will generally look best with cv::INTER_CUBIC (slow) or cv::INTER_LINEAR
-(faster but still looks OK).
-
-@note Function textual ID is "org.opencv.imgproc.transform.resize"
-
-@param src input image.
-@param dsize output image size; if it equals zero, it is computed as:
- \f[\texttt{dsize = Size(round(fx*src.cols), round(fy*src.rows))}\f]
- Either dsize or both fx and fy must be non-zero.
-@param fx scale factor along the horizontal axis; when it equals 0, it is computed as
-\f[\texttt{(double)dsize.width/src.cols}\f]
-@param fy scale factor along the vertical axis; when it equals 0, it is computed as
-\f[\texttt{(double)dsize.height/src.rows}\f]
-@param interpolation interpolation method, see cv::InterpolationFlags
-
-@sa  warpAffine, warpPerspective, remap, resizeP
- */
-GAPI_EXPORTS_W GMat resize(const GMat& src, const Size& dsize, double fx = 0, double fy = 0, int interpolation = INTER_LINEAR);
-
-/** @brief Resizes a planar image.
-
-The function resizes the image src down to or up to the specified size.
-Planar image memory layout is three planes laying in the memory contiguously,
-so the image height should be plane_height*plane_number, image type is @ref CV_8UC1.
-
-Output image size will have the size dsize, the depth of output is the same as of src.
-
-@note Function textual ID is "org.opencv.imgproc.transform.resizeP"
-
-@param src input image, must be of @ref CV_8UC1 type;
-@param dsize output image size;
-@param interpolation interpolation method, only cv::INTER_LINEAR is supported at the moment
-
-@sa  warpAffine, warpPerspective, remap, resize
- */
-GAPI_EXPORTS GMatP resizeP(const GMatP& src, const Size& dsize, int interpolation = cv::INTER_LINEAR);
-
-//! @} gapi_transform
-} //namespace gapi
-} //namespace cv
-
-#endif // OPENCV_GAPI_IMGPROC_HPP
diff --git a/3rdParty/opencv2/gapi/infer/ie.hpp b/3rdParty/opencv2/gapi/infer/ie.hpp
deleted file mode 100644
index b5f7e14255..0000000000
--- a/3rdParty/opencv2/gapi/infer/ie.hpp
+++ /dev/null
@@ -1,494 +0,0 @@
-// This file is part of OpenCV project.
-// It is subject to the license terms in the LICENSE file found in the top-level directory
-// of this distribution and at http://opencv.org/license.html.
-//
-// Copyright (C) 2019-2021 Intel Corporation
-
-#ifndef OPENCV_GAPI_INFER_IE_HPP
-#define OPENCV_GAPI_INFER_IE_HPP
-
-#include <unordered_map>
-#include <unordered_set>
-#include <string>
-#include <array>
-#include <tuple> // tuple, tuple_size
-#include <map>
-
-#include <opencv2/gapi/opencv_includes.hpp>
-#include <opencv2/gapi/util/any.hpp>
-
-#include <opencv2/core/cvdef.h>     // GAPI_EXPORTS
-#include <opencv2/gapi/gkernel.hpp> // GKernelPackage
-#include <opencv2/gapi/infer.hpp>   // Generic
-#include <opencv2/gapi/streaming/onevpl/accel_types.hpp> // Preproc Dev & Ctx
-
-namespace cv {
-namespace gapi {
-// FIXME: introduce a new sub-namespace for NN?
-
-/**
- * @brief This namespace contains G-API OpenVINO backend functions,
- * structures, and symbols.
- */
-namespace ie {
-
-GAPI_EXPORTS cv::gapi::GBackend backend();
-
-/**
- * Specifies how G-API and IE should trait input data
- *
- * In OpenCV, the same cv::Mat is used to represent both
- * image and tensor data. Sometimes those are hardly distinguishable,
- * so this extra parameter is used to give G-API a hint.
- *
- * This hint controls how G-API reinterprets the data when converting
- * it to IE Blob format (and which layout/etc is assigned to this data).
- */
-enum class TraitAs: int
-{
-    TENSOR, //!< G-API traits an associated cv::Mat as a raw tensor and passes dimensions as-is
-    IMAGE   //!< G-API traits an associated cv::Mat as an image so creates an "image" blob (NCHW/NHWC, etc)
-};
-
-using IEConfig = std::map<std::string, std::string>;
-
-namespace detail {
-struct ParamDesc {
-    std::string model_path;
-    std::string weights_path;
-    std::string device_id;
-
-    std::vector<std::string> input_names;
-    std::vector<std::string> output_names;
-
-    using ConstInput = std::pair<cv::Mat, TraitAs>;
-    std::unordered_map<std::string, ConstInput> const_inputs;
-
-    std::size_t num_in;
-    std::size_t num_out;
-
-    enum class Kind {Load, Import};
-    Kind kind;
-    bool is_generic;
-    IEConfig config;
-
-    std::map<std::string, std::vector<std::size_t>> reshape_table;
-    std::unordered_set<std::string> layer_names_to_reshape;
-
-    // NB: Number of asyncrhonious infer requests
-    size_t nireq;
-
-    // NB: An optional config to setup RemoteContext for IE
-    cv::util::any context_config;
-
-    // NB: batch_size can't be equal to 1 by default, because some of models
-    // have 2D (Layout::NC) input and if the first dimension not equal to 1
-    // net.setBatchSize(1) will overwrite it.
-    cv::optional<size_t> batch_size;
-
-    cv::optional<cv::gapi::wip::onevpl::Device> vpl_preproc_device;
-    cv::optional<cv::gapi::wip::onevpl::Context> vpl_preproc_ctx;
-};
-} // namespace detail
-
-// FIXME: this is probably a shared (reusable) thing
-template<typename Net>
-struct PortCfg {
-    using In = std::array
-        < std::string
-        , std::tuple_size<typename Net::InArgs>::value >;
-    using Out = std::array
-        < std::string
-        , std::tuple_size<typename Net::OutArgs>::value >;
-};
-
-/**
- * @brief This structure provides functions
- * that fill inference parameters for "OpenVINO Toolkit" model.
- */
-template<typename Net> class Params {
-public:
-    /** @brief Class constructor.
-
-    Constructs Params based on model information and specifies default values for other
-    inference description parameters. Model is loaded and compiled using "OpenVINO Toolkit".
-
-    @param model Path to topology IR (.xml file).
-    @param weights Path to weights (.bin file).
-    @param device target device to use.
-    */
-    Params(const std::string &model,
-           const std::string &weights,
-           const std::string &device)
-        : desc{ model, weights, device, {}, {}, {}
-              , std::tuple_size<typename Net::InArgs>::value  // num_in
-              , std::tuple_size<typename Net::OutArgs>::value // num_out
-              , detail::ParamDesc::Kind::Load
-              , false
-              , {}
-              , {}
-              , {}
-              , 1u
-              , {}
-              , {}
-              , {}
-              , {}} {
-    };
-
-    /** @overload
-    Use this constructor to work with pre-compiled network.
-    Model is imported from a pre-compiled blob.
-
-    @param model Path to model.
-    @param device target device to use.
-    */
-    Params(const std::string &model,
-           const std::string &device)
-        : desc{ model, {}, device, {}, {}, {}
-              , std::tuple_size<typename Net::InArgs>::value  // num_in
-              , std::tuple_size<typename Net::OutArgs>::value // num_out
-              , detail::ParamDesc::Kind::Import
-              , false
-              , {}
-              , {}
-              , {}
-              , 1u
-              , {}
-              , {}
-              , {}
-              , {}} {
-    };
-
-    /** @brief Specifies sequence of network input layers names for inference.
-
-    The function is used to associate cv::gapi::infer<> inputs with the model inputs.
-    Number of names has to match the number of network inputs as defined in G_API_NET().
-    In case a network has only single input layer, there is no need to specify name manually.
-
-    @param layer_names std::array<std::string, N> where N is the number of inputs
-    as defined in the @ref G_API_NET. Contains names of input layers.
-    @return reference to this parameter structure.
-    */
-    Params<Net>& cfgInputLayers(const typename PortCfg<Net>::In &layer_names) {
-        desc.input_names.clear();
-        desc.input_names.reserve(layer_names.size());
-        std::copy(layer_names.begin(), layer_names.end(),
-                  std::back_inserter(desc.input_names));
-        return *this;
-    }
-
-    /** @brief Specifies sequence of network output layers names for inference.
-
-    The function is used to associate cv::gapi::infer<> outputs with the model outputs.
-    Number of names has to match the number of network outputs as defined in G_API_NET().
-    In case a network has only single output layer, there is no need to specify name manually.
-
-    @param layer_names std::array<std::string, N> where N is the number of outputs
-    as defined in the @ref G_API_NET. Contains names of output layers.
-    @return reference to this parameter structure.
-    */
-    Params<Net>& cfgOutputLayers(const typename PortCfg<Net>::Out &layer_names) {
-        desc.output_names.clear();
-        desc.output_names.reserve(layer_names.size());
-        std::copy(layer_names.begin(), layer_names.end(),
-                  std::back_inserter(desc.output_names));
-        return *this;
-    }
-
-    /** @brief Specifies a constant input.
-
-    The function is used to set a constant input. This input has to be
-    a preprocessed tensor if its type is TENSOR. Need to provide name of the
-    network layer which will receive provided data.
-
-    @param layer_name Name of network layer.
-    @param data cv::Mat that contains data which will be associated with network layer.
-    @param hint Input type @sa cv::gapi::ie::TraitAs.
-    @return reference to this parameter structure.
-    */
-    Params<Net>& constInput(const std::string &layer_name,
-                            const cv::Mat &data,
-                            TraitAs hint = TraitAs::TENSOR) {
-        desc.const_inputs[layer_name] = {data, hint};
-        return *this;
-    }
-
-    /** @brief Specifies OpenVINO plugin configuration.
-
-    The function is used to set configuration for OpenVINO plugin. Some parameters
-    can be different for each plugin. Please follow https://docs.openvinotoolkit.org/latest/index.html
-    to check information about specific plugin.
-
-    @param cfg Map of pairs: (config parameter name, config parameter value).
-    @return reference to this parameter structure.
-    */
-       Params& pluginConfig(const IEConfig& cfg) {
-        desc.config = cfg;
-        return *this;
-    }
-
-    /** @overload
-    Function with a rvalue parameter.
-
-    @param cfg rvalue map of pairs: (config parameter name, config parameter value).
-    @return reference to this parameter structure.
-    */
-    Params& pluginConfig(IEConfig&& cfg) {
-        desc.config = std::move(cfg);
-        return *this;
-    }
-
-    /** @brief Specifies configuration for RemoteContext in InferenceEngine.
-
-    When RemoteContext is configured the backend imports the networks using the context.
-    It also expects cv::MediaFrames to be actually remote, to operate with blobs via the context.
-
-    @param ctx_cfg cv::util::any value which holds InferenceEngine::ParamMap.
-    @return reference to this parameter structure.
-    */
-    Params& cfgContextParams(const cv::util::any& ctx_cfg) {
-        desc.context_config = ctx_cfg;
-        return *this;
-    }
-
-    /** @overload
-    Function with an rvalue parameter.
-
-    @param ctx_cfg cv::util::any value which holds InferenceEngine::ParamMap.
-    @return reference to this parameter structure.
-    */
-    Params& cfgContextParams(cv::util::any&& ctx_cfg) {
-        desc.context_config = std::move(ctx_cfg);
-        return *this;
-    }
-
-    /** @brief Specifies number of asynchronous inference requests.
-
-    @param nireq Number of inference asynchronous requests.
-    @return reference to this parameter structure.
-    */
-    Params& cfgNumRequests(size_t nireq) {
-        GAPI_Assert(nireq > 0 && "Number of infer requests must be greater than zero!");
-        desc.nireq = nireq;
-        return *this;
-    }
-
-    /** @brief Specifies new input shapes for the network inputs.
-
-    The function is used to specify new input shapes for the network inputs.
-    Follow https://docs.openvinotoolkit.org/latest/classInferenceEngine_1_1networkNetwork.html
-    for additional information.
-
-    @param reshape_table Map of pairs: name of corresponding data and its dimension.
-    @return reference to this parameter structure.
-    */
-    Params<Net>& cfgInputReshape(const std::map<std::string, std::vector<std::size_t>>& reshape_table) {
-        desc.reshape_table = reshape_table;
-        return *this;
-    }
-
-    /** @overload */
-    Params<Net>& cfgInputReshape(std::map<std::string, std::vector<std::size_t>>&& reshape_table) {
-        desc.reshape_table = std::move(reshape_table);
-        return *this;
-    }
-
-    /** @overload
-
-    @param layer_name Name of layer.
-    @param layer_dims New dimensions for this layer.
-    @return reference to this parameter structure.
-    */
-    Params<Net>& cfgInputReshape(const std::string& layer_name, const std::vector<size_t>& layer_dims) {
-        desc.reshape_table.emplace(layer_name, layer_dims);
-        return *this;
-    }
-
-    /** @overload */
-    Params<Net>& cfgInputReshape(std::string&& layer_name, std::vector<size_t>&& layer_dims) {
-        desc.reshape_table.emplace(layer_name, layer_dims);
-        return *this;
-    }
-
-    /** @overload
-
-    @param layer_names set of names of network layers that will be used for network reshape.
-    @return reference to this parameter structure.
-    */
-    Params<Net>& cfgInputReshape(const std::unordered_set<std::string>& layer_names) {
-        desc.layer_names_to_reshape = layer_names;
-        return *this;
-    }
-
-    /** @overload
-
-    @param layer_names rvalue set of the selected layers will be reshaped automatically
-    its input image size.
-    @return reference to this parameter structure.
-    */
-    Params<Net>& cfgInputReshape(std::unordered_set<std::string>&& layer_names) {
-        desc.layer_names_to_reshape = std::move(layer_names);
-        return *this;
-    }
-
-    /** @brief Specifies the inference batch size.
-
-    The function is used to specify inference batch size.
-    Follow https://docs.openvinotoolkit.org/latest/classInferenceEngine_1_1CNNNetwork.html#a8e9d19270a48aab50cb5b1c43eecb8e9 for additional information
-
-    @param size batch size which will be used.
-    @return reference to this parameter structure.
-    */
-    Params<Net>& cfgBatchSize(const size_t size) {
-        desc.batch_size = cv::util::make_optional(size);
-        return *this;
-    }
-
-    Params<Net>& cfgPreprocessingParams(const cv::gapi::wip::onevpl::Device &device,
-                                        const cv::gapi::wip::onevpl::Context &ctx) {
-        desc.vpl_preproc_device = cv::util::make_optional(device);
-        desc.vpl_preproc_ctx = cv::util::make_optional(ctx);
-        return *this;
-    }
-
-    // BEGIN(G-API's network parametrization API)
-    GBackend      backend()    const { return cv::gapi::ie::backend();  }
-    std::string   tag()        const { return Net::tag(); }
-    cv::util::any params()     const { return { desc }; }
-    // END(G-API's network parametrization API)
-
-protected:
-    detail::ParamDesc desc;
-};
-
-/*
-* @brief This structure provides functions for generic network type that
-* fill inference parameters.
-* @see struct Generic
-*/
-template<>
-class Params<cv::gapi::Generic> {
-public:
-    /** @brief Class constructor.
-
-    Constructs Params based on model information and sets default values for other
-    inference description parameters. Model is loaded and compiled using OpenVINO Toolkit.
-
-    @param tag string tag of the network for which these parameters are intended.
-    @param model path to topology IR (.xml file).
-    @param weights path to weights (.bin file).
-    @param device target device to use.
-    */
-    Params(const std::string &tag,
-           const std::string &model,
-           const std::string &weights,
-           const std::string &device)
-        : desc{ model, weights, device, {}, {}, {}, 0u, 0u,
-                detail::ParamDesc::Kind::Load, true, {}, {}, {}, 1u,
-                {}, {}, {}, {}},
-          m_tag(tag) {
-    };
-
-    /** @overload
-
-    This constructor for pre-compiled networks. Model is imported from pre-compiled
-    blob.
-
-    @param tag string tag of the network for which these parameters are intended.
-    @param model path to model.
-    @param device target device to use.
-    */
-    Params(const std::string &tag,
-           const std::string &model,
-           const std::string &device)
-        : desc{ model, {}, device, {}, {}, {}, 0u, 0u,
-                detail::ParamDesc::Kind::Import, true, {}, {}, {}, 1u,
-                {}, {}, {}, {}},
-          m_tag(tag) {
-    };
-
-    /** @see ie::Params::pluginConfig. */
-    Params& pluginConfig(const IEConfig& cfg) {
-        desc.config = cfg;
-        return *this;
-    }
-
-    /** @overload */
-    Params& pluginConfig(IEConfig&& cfg) {
-        desc.config = std::move(cfg);
-        return *this;
-    }
-
-    /** @see ie::Params::constInput. */
-    Params& constInput(const std::string &layer_name,
-                       const cv::Mat &data,
-                       TraitAs hint = TraitAs::TENSOR) {
-        desc.const_inputs[layer_name] = {data, hint};
-        return *this;
-    }
-
-    /** @see ie::Params::cfgNumRequests. */
-    Params& cfgNumRequests(size_t nireq) {
-        GAPI_Assert(nireq > 0 && "Number of infer requests must be greater than zero!");
-        desc.nireq = nireq;
-        return *this;
-    }
-
-    /** @see ie::Params::cfgInputReshape */
-    Params& cfgInputReshape(const std::map<std::string, std::vector<std::size_t>>&reshape_table) {
-        desc.reshape_table = reshape_table;
-        return *this;
-    }
-
-    /** @overload */
-    Params& cfgInputReshape(std::map<std::string, std::vector<std::size_t>> && reshape_table) {
-        desc.reshape_table = std::move(reshape_table);
-        return *this;
-    }
-
-    /** @overload */
-    Params& cfgInputReshape(std::string && layer_name, std::vector<size_t> && layer_dims) {
-        desc.reshape_table.emplace(layer_name, layer_dims);
-        return *this;
-    }
-
-    /** @overload */
-    Params& cfgInputReshape(const std::string & layer_name, const std::vector<size_t>&layer_dims) {
-        desc.reshape_table.emplace(layer_name, layer_dims);
-        return *this;
-    }
-
-    /** @overload */
-    Params& cfgInputReshape(std::unordered_set<std::string> && layer_names) {
-        desc.layer_names_to_reshape = std::move(layer_names);
-        return *this;
-    }
-
-    /** @overload */
-    Params& cfgInputReshape(const std::unordered_set<std::string>&layer_names) {
-        desc.layer_names_to_reshape = layer_names;
-        return *this;
-    }
-
-    /** @see ie::Params::cfgBatchSize */
-    Params& cfgBatchSize(const size_t size) {
-        desc.batch_size = cv::util::make_optional(size);
-        return *this;
-    }
-
-    // BEGIN(G-API's network parametrization API)
-    GBackend      backend()    const { return cv::gapi::ie::backend();  }
-    std::string   tag()        const { return m_tag; }
-    cv::util::any params()     const { return { desc }; }
-    // END(G-API's network parametrization API)
-
-protected:
-    detail::ParamDesc desc;
-    std::string m_tag;
-};
-
-} // namespace ie
-} // namespace gapi
-} // namespace cv
-
-#endif // OPENCV_GAPI_INFER_IE_HPP
diff --git a/3rdParty/opencv2/gapi/infer/onnx.hpp b/3rdParty/opencv2/gapi/infer/onnx.hpp
deleted file mode 100644
index ecdf187f38..0000000000
--- a/3rdParty/opencv2/gapi/infer/onnx.hpp
+++ /dev/null
@@ -1,284 +0,0 @@
-// This file is part of OpenCV project.
-// It is subject to the license terms in the LICENSE file found in the top-level directory
-// of this distribution and at http://opencv.org/license.html.
-//
-// Copyright (C) 2020-2021 Intel Corporation
-
-#ifndef OPENCV_GAPI_INFER_ONNX_HPP
-#define OPENCV_GAPI_INFER_ONNX_HPP
-
-#include <unordered_map>
-#include <string>
-#include <array>
-#include <tuple> // tuple, tuple_size
-
-#include <opencv2/gapi/opencv_includes.hpp>
-#include <opencv2/gapi/util/any.hpp>
-
-#include <opencv2/core/cvdef.h>     // GAPI_EXPORTS
-#include <opencv2/gapi/gkernel.hpp> // GKernelPackage
-
-namespace cv {
-namespace gapi {
-
-/**
- * @brief This namespace contains G-API ONNX Runtime backend functions, structures, and symbols.
- */
-namespace onnx {
-
-GAPI_EXPORTS cv::gapi::GBackend backend();
-
-enum class TraitAs: int {
-    TENSOR, //!< G-API traits an associated cv::Mat as a raw tensor
-            // and passes dimensions as-is
-    IMAGE   //!< G-API traits an associated cv::Mat as an image so
-            // creates an "image" blob (NCHW/NHWC, etc)
-};
-
-using PostProc = std::function<void(const std::unordered_map<std::string, cv::Mat> &,
-                                          std::unordered_map<std::string, cv::Mat> &)>;
-
-namespace detail {
-/**
-* @brief This structure contains description of inference parameters
-* which is specific to ONNX models.
-*/
-struct ParamDesc {
-    std::string model_path; //!< Path to model.
-
-    // NB: nun_* may differ from topology's real input/output port numbers
-    // (e.g. topology's partial execution)
-    std::size_t num_in;  //!< How many inputs are defined in the operation
-    std::size_t num_out; //!< How many outputs are defined in the operation
-
-    // NB: Here order follows the `Net` API
-    std::vector<std::string> input_names; //!< Names of input network layers.
-    std::vector<std::string> output_names; //!< Names of output network layers.
-
-    using ConstInput = std::pair<cv::Mat, TraitAs>;
-    std::unordered_map<std::string, ConstInput> const_inputs; //!< Map with pair of name of network layer and ConstInput which will be associated with this.
-
-    std::vector<cv::Scalar> mean; //!< Mean values for preprocessing.
-    std::vector<cv::Scalar> stdev; //!< Standard deviation values for preprocessing.
-
-    std::vector<cv::GMatDesc> out_metas; //!< Out meta information about your output (type, dimension).
-    PostProc custom_post_proc; //!< Post processing function.
-
-    std::vector<bool> normalize; //!< Vector of bool values that enabled or disabled normalize of input data.
-
-    std::vector<std::string> names_to_remap; //!< Names of output layers that will be processed in PostProc function.
-};
-} // namespace detail
-
-template<typename Net>
-struct PortCfg {
-    using In = std::array
-        < std::string
-        , std::tuple_size<typename Net::InArgs>::value >;
-    using Out = std::array
-        < std::string
-        , std::tuple_size<typename Net::OutArgs>::value >;
-    using NormCoefs = std::array
-        < cv::Scalar
-        , std::tuple_size<typename Net::InArgs>::value >;
-    using Normalize = std::array
-        < bool
-        , std::tuple_size<typename Net::InArgs>::value >;
-};
-
-/**
- * Contains description of inference parameters and kit of functions that
- * fill this parameters.
- */
-template<typename Net> class Params {
-public:
-    /** @brief Class constructor.
-
-    Constructs Params based on model information and sets default values for other
-    inference description parameters.
-
-    @param model Path to model (.onnx file).
-    */
-    Params(const std::string &model) {
-        desc.model_path = model;
-        desc.num_in  = std::tuple_size<typename Net::InArgs>::value;
-        desc.num_out = std::tuple_size<typename Net::OutArgs>::value;
-    };
-
-    /** @brief Specifies sequence of network input layers names for inference.
-
-    The function is used to associate data of graph inputs with input layers of
-    network topology. Number of names has to match the number of network inputs. If a network
-    has only one input layer, there is no need to call it as the layer is
-    associated with input automatically but this doesn't prevent you from
-    doing it yourself. Count of names has to match to number of network inputs.
-
-    @param layer_names std::array<std::string, N> where N is the number of inputs
-    as defined in the @ref G_API_NET. Contains names of input layers.
-    @return the reference on modified object.
-    */
-    Params<Net>& cfgInputLayers(const typename PortCfg<Net>::In &layer_names) {
-        desc.input_names.assign(layer_names.begin(), layer_names.end());
-        return *this;
-    }
-
-    /** @brief Specifies sequence of output layers names for inference.
-
-     The function is used to associate data of graph outputs with output layers of
-    network topology. If a network has only one output layer, there is no need to call it
-    as the layer is associated with output automatically but this doesn't prevent
-    you from doing it yourself. Count of names has to match to number of network
-    outputs or you can set your own output but for this case you have to
-    additionally use @ref cfgPostProc function.
-
-    @param layer_names std::array<std::string, N> where N is the number of outputs
-    as defined in the @ref G_API_NET. Contains names of output layers.
-    @return the reference on modified object.
-    */
-    Params<Net>& cfgOutputLayers(const typename PortCfg<Net>::Out &layer_names) {
-        desc.output_names.assign(layer_names.begin(), layer_names.end());
-        return *this;
-    }
-
-    /** @brief Sets a constant input.
-
-    The function is used to set constant input. This input has to be
-    a prepared tensor since preprocessing is disabled for this case. You should
-    provide name of network layer which will receive provided data.
-
-    @param layer_name Name of network layer.
-    @param data cv::Mat that contains data which will be associated with network layer.
-    @param hint Type of input (TENSOR).
-    @return the reference on modified object.
-    */
-    Params<Net>& constInput(const std::string &layer_name,
-                            const cv::Mat &data,
-                            TraitAs hint = TraitAs::TENSOR) {
-        desc.const_inputs[layer_name] = {data, hint};
-        return *this;
-    }
-
-    /** @brief Specifies mean value and standard deviation for preprocessing.
-
-    The function is used to set mean value and standard deviation for preprocessing
-    of input data.
-
-    @param m std::array<cv::Scalar, N> where N is the number of inputs
-    as defined in the @ref G_API_NET. Contains mean values.
-    @param s std::array<cv::Scalar, N> where N is the number of inputs
-    as defined in the @ref G_API_NET. Contains standard deviation values.
-    @return the reference on modified object.
-    */
-    Params<Net>& cfgMeanStd(const typename PortCfg<Net>::NormCoefs &m,
-                            const typename PortCfg<Net>::NormCoefs &s) {
-        desc.mean.assign(m.begin(), m.end());
-        desc.stdev.assign(s.begin(), s.end());
-        return *this;
-    }
-
-    /** @brief Configures graph output and provides the post processing function from user.
-
-    The function is used when you work with networks with dynamic outputs.
-    Since we can't know dimensions of inference result needs provide them for
-    construction of graph output. This dimensions can differ from inference result.
-    So you have to provide @ref PostProc function that gets information from inference
-    result and fill output which is constructed by dimensions from out_metas.
-
-    @param out_metas Out meta information about your output (type, dimension).
-    @param remap_function Post processing function, which has two parameters. First is onnx
-    result, second is graph output. Both parameters is std::map that contain pair of
-    layer's name and cv::Mat.
-    @return the reference on modified object.
-    */
-    Params<Net>& cfgPostProc(const std::vector<cv::GMatDesc> &out_metas,
-                             const PostProc &remap_function) {
-        desc.out_metas        = out_metas;
-        desc.custom_post_proc = remap_function;
-        return *this;
-    }
-
-    /** @overload
-    Function with a rvalue parameters.
-
-    @param out_metas rvalue out meta information about your output (type, dimension).
-    @param remap_function rvalue post processing function, which has two parameters. First is onnx
-    result, second is graph output. Both parameters is std::map that contain pair of
-    layer's name and cv::Mat.
-    @return the reference on modified object.
-    */
-    Params<Net>& cfgPostProc(std::vector<cv::GMatDesc> &&out_metas,
-                             PostProc &&remap_function) {
-        desc.out_metas        = std::move(out_metas);
-        desc.custom_post_proc = std::move(remap_function);
-        return *this;
-    }
-
-    /** @overload
-    The function has additional parameter names_to_remap. This parameter provides
-    information about output layers which will be used for inference and post
-    processing function.
-
-    @param out_metas Out meta information.
-    @param remap_function Post processing function.
-    @param names_to_remap Names of output layers. network's inference will
-    be done on these layers. Inference's result will be processed in post processing
-    function using these names.
-    @return the reference on modified object.
-    */
-    Params<Net>& cfgPostProc(const std::vector<cv::GMatDesc> &out_metas,
-                             const PostProc &remap_function,
-                             const std::vector<std::string> &names_to_remap) {
-        desc.out_metas        = out_metas;
-        desc.custom_post_proc = remap_function;
-        desc.names_to_remap   = names_to_remap;
-        return *this;
-    }
-
-    /** @overload
-    Function with a rvalue parameters and additional parameter names_to_remap.
-
-    @param out_metas rvalue out meta information.
-    @param remap_function rvalue post processing function.
-    @param names_to_remap rvalue names of output layers. network's inference will
-    be done on these layers. Inference's result will be processed in post processing
-    function using these names.
-    @return the reference on modified object.
-    */
-    Params<Net>& cfgPostProc(std::vector<cv::GMatDesc> &&out_metas,
-                             PostProc &&remap_function,
-                             std::vector<std::string> &&names_to_remap) {
-        desc.out_metas        = std::move(out_metas);
-        desc.custom_post_proc = std::move(remap_function);
-        desc.names_to_remap   = std::move(names_to_remap);
-        return *this;
-    }
-
-    /** @brief Specifies normalize parameter for preprocessing.
-
-    The function is used to set normalize parameter for preprocessing of input data.
-
-    @param normalizations std::array<cv::Scalar, N> where N is the number of inputs
-    as defined in the @ref G_API_NET. Сontains bool values that enabled or disabled
-    normalize of input data.
-    @return the reference on modified object.
-    */
-    Params<Net>& cfgNormalize(const typename PortCfg<Net>::Normalize &normalizations) {
-        desc.normalize.assign(normalizations.begin(), normalizations.end());
-        return *this;
-    }
-
-    // BEGIN(G-API's network parametrization API)
-    GBackend      backend() const { return cv::gapi::onnx::backend(); }
-    std::string   tag()     const { return Net::tag(); }
-    cv::util::any params()  const { return { desc }; }
-    // END(G-API's network parametrization API)
-
-protected:
-    detail::ParamDesc desc;
-};
-
-} // namespace onnx
-} // namespace gapi
-} // namespace cv
-
-#endif // OPENCV_GAPI_INFER_HPP
diff --git a/3rdParty/opencv2/gapi/own/types.hpp b/3rdParty/opencv2/gapi/own/types.hpp
deleted file mode 100644
index bfe956f836..0000000000
--- a/3rdParty/opencv2/gapi/own/types.hpp
+++ /dev/null
@@ -1,151 +0,0 @@
-// This file is part of OpenCV project.
-// It is subject to the license terms in the LICENSE file found in the top-level directory
-// of this distribution and at http://opencv.org/license.html.
-//
-// Copyright (C) 2018 Intel Corporation
-
-
-#ifndef OPENCV_GAPI_TYPES_HPP
-#define OPENCV_GAPI_TYPES_HPP
-
-#include <algorithm>              // std::max, std::min
-#include <ostream>
-
-namespace cv
-{
-namespace gapi
-{
-
-/**
- * @brief This namespace contains G-API own data structures used in
- * its standalone mode build.
- */
-namespace own
-{
-
-class Point
-{
-public:
-    Point() = default;
-    Point(int _x, int _y) : x(_x),  y(_y) {}
-
-    int x = 0;
-    int y = 0;
-};
-
-class Point2f
-{
-public:
-    Point2f() = default;
-    Point2f(float _x, float _y) : x(_x),  y(_y) {}
-
-    float x = 0.f;
-    float y = 0.f;
-};
-
-class Rect
-{
-public:
-    Rect() = default;
-    Rect(int _x, int _y, int _width, int _height) : x(_x), y(_y),   width(_width),  height(_height) {}
-#if !defined(GAPI_STANDALONE)
-    Rect(const cv::Rect& other) : x(other.x), y(other.y), width(other.width), height(other.height) {}
-    inline Rect& operator=(const cv::Rect& other)
-    {
-        x = other.x;
-        y = other.x;
-        width  = other.width;
-        height = other.height;
-        return *this;
-    }
-#endif // !defined(GAPI_STANDALONE)
-
-    int x      = 0; //!< x coordinate of the top-left corner
-    int y      = 0; //!< y coordinate of the top-left corner
-    int width  = 0; //!< width of the rectangle
-    int height = 0; //!< height of the rectangle
-};
-
-inline bool operator==(const Rect& lhs, const Rect& rhs)
-{
-    return lhs.x == rhs.x && lhs.y == rhs.y && lhs.width == rhs.width && lhs.height == rhs.height;
-}
-
-inline bool operator!=(const Rect& lhs, const Rect& rhs)
-{
-    return !(lhs == rhs);
-}
-
-inline Rect& operator&=(Rect& lhs, const Rect& rhs)
-{
-    int x1 = std::max(lhs.x, rhs.x);
-    int y1 = std::max(lhs.y, rhs.y);
-    lhs.width  = std::min(lhs.x + lhs.width,  rhs.x + rhs.width) -  x1;
-    lhs.height = std::min(lhs.y + lhs.height, rhs.y + rhs.height) - y1;
-    lhs.x = x1;
-    lhs.y = y1;
-    if( lhs.width <= 0 || lhs.height <= 0 )
-        lhs = Rect();
-    return lhs;
-}
-
-inline Rect operator&(const Rect& lhs, const Rect& rhs)
-{
-    Rect result = lhs;
-    return result &= rhs;
-}
-
-inline std::ostream& operator<<(std::ostream& o, const Rect& rect)
-{
-    return o << "[" << rect.width << " x " << rect.height << " from (" << rect.x << ", " << rect.y << ")]";
-}
-
-class Size
-{
-public:
-    Size() = default;
-    Size(int _width, int _height) : width(_width),  height(_height) {}
-#if !defined(GAPI_STANDALONE)
-    Size(const cv::Size& other) : width(other.width), height(other.height) {}
-    inline Size& operator=(const cv::Size& rhs)
-    {
-        width  = rhs.width;
-        height = rhs.height;
-        return *this;
-    }
-#endif // !defined(GAPI_STANDALONE)
-
-    int width  = 0;
-    int height = 0;
-};
-
-inline Size& operator+=(Size& lhs, const Size& rhs)
-{
-    lhs.width  += rhs.width;
-    lhs.height += rhs.height;
-    return lhs;
-}
-
-inline bool operator==(const Size& lhs, const Size& rhs)
-{
-    return lhs.width == rhs.width && lhs.height == rhs.height;
-}
-
-inline bool operator!=(const Size& lhs, const Size& rhs)
-{
-    return !(lhs == rhs);
-}
-
-
-inline std::ostream& operator<<(std::ostream& o, const Size& s)
-{
-    o << "[" << s.width << " x " << s.height << "]";
-    return o;
-}
-
-struct VoidType {};
-} // namespace own
-} // namespace gapi
-} // namespace cv
-
-#endif // OPENCV_GAPI_TYPES_HPP
diff --git a/3rdParty/opencv2/gapi/s11n/base.hpp b/3rdParty/opencv2/gapi/s11n/base.hpp
deleted file mode 100644
index 1387839481..0000000000
--- a/3rdParty/opencv2/gapi/s11n/base.hpp
+++ /dev/null
@@ -1,80 +0,0 @@
-// This file is part of OpenCV project.
-// It is subject to the license terms in the LICENSE file found in the top-level directory
-// of this distribution and at http://opencv.org/license.html.
-//
-// Copyright (C) 2020-2021 Intel Corporation
-
-#ifndef OPENCV_GAPI_S11N_BASE_HPP
-#define OPENCV_GAPI_S11N_BASE_HPP
-
-#include <opencv2/gapi/own/assert.hpp>
-#include <opencv2/gapi/own/exports.hpp>
-
-namespace cv {
-namespace gapi {
-
-/**
- * @brief This namespace contains G-API serialization and
- * deserialization functions and data structures.
- */
-namespace s11n {
-struct IOStream;
-struct IIStream;
-
-namespace detail {
-
-//! @addtogroup gapi_serialization
-//! @{
-
-struct NotImplemented {
-};
-
-/** @brief This structure allows to implement serialization routines for custom types.
- *
- * The default S11N for custom types is not implemented.
- *
- * @note When providing an overloaded implementation for S11N with your type
- * don't inherit it from NotImplemented structure.
- *
- * @note There are lots of overloaded >> and << operators for basic and OpenCV/G-API types
- * which can be utilized when serializing a custom type.
- *
- * Example of usage:
- * @snippet samples/cpp/tutorial_code/gapi/doc_snippets/api_ref_snippets.cpp S11N usage
- *
- */
-template<typename T>
-struct S11N: public NotImplemented {
-    /**
-     * @brief This function allows user to serialize their custom type.
-     *
-     * @note The default overload throws an exception if called. User need to
-     * properly overload the function to use it.
-     */
-    static void serialize(IOStream &, const T &) {
-        GAPI_Assert(false && "No serialization routine is provided!");
-    }
-    /**
-     * @brief This function allows user to deserialize their custom type.
-     *
-     * @note The default overload throws an exception if called. User need to
-     * properly overload the function to use it.
-     */
-    static T deserialize(IIStream &) {
-        GAPI_Assert(false && "No deserialization routine is provided!");
-    }
-};
-
-/// @private -- Exclude this struct from OpenCV documentation
-template<typename T> struct has_S11N_spec {
-    static constexpr bool value = !std::is_base_of<NotImplemented,
-                                        S11N<typename std::decay<T>::type>>::value;
-};
-//! @} gapi_serialization
-
-} // namespace detail
-} // namespace s11n
-} // namespace gapi
-} // namespace cv
-
-#endif // OPENCV_GAPI_S11N_BASE_HPP
diff --git a/3rdParty/opencv2/imgcodecs.hpp b/3rdParty/opencv2/imgcodecs.hpp
deleted file mode 100644
index 4a7b9521e5..0000000000
--- a/3rdParty/opencv2/imgcodecs.hpp
+++ /dev/null
@@ -1,330 +0,0 @@
-/*M///////////////////////////////////////////////////////////////////////////////////////
-//
-//  IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
-//
-//  By downloading, copying, installing or using the software you agree to this license.
-//  If you do not agree to this license, do not download, install,
-//  copy or use the software.
-//
-//
-//                          License Agreement
-//                For Open Source Computer Vision Library
-//
-// Copyright (C) 2000-2008, Intel Corporation, all rights reserved.
-// Copyright (C) 2009, Willow Garage Inc., all rights reserved.
-// Third party copyrights are property of their respective owners.
-//
-// Redistribution and use in source and binary forms, with or without modification,
-// are permitted provided that the following conditions are met:
-//
-//   * Redistribution's of source code must retain the above copyright notice,
-//     this list of conditions and the following disclaimer.
-//
-//   * Redistribution's in binary form must reproduce the above copyright notice,
-//     this list of conditions and the following disclaimer in the documentation
-//     and/or other materials provided with the distribution.
-//
-//   * The name of the copyright holders may not be used to endorse or promote products
-//     derived from this software without specific prior written permission.
-//
-// This software is provided by the copyright holders and contributors "as is" and
-// any express or implied warranties, including, but not limited to, the implied
-// warranties of merchantability and fitness for a particular purpose are disclaimed.
-// In no event shall the Intel Corporation or contributors be liable for any direct,
-// indirect, incidental, special, exemplary, or consequential damages
-// (including, but not limited to, procurement of substitute goods or services;
-// loss of use, data, or profits; or business interruption) however caused
-// and on any theory of liability, whether in contract, strict liability,
-// or tort (including negligence or otherwise) arising in any way out of
-// the use of this software, even if advised of the possibility of such damage.
-//
-//M*/
-
-#ifndef OPENCV_IMGCODECS_HPP
-#define OPENCV_IMGCODECS_HPP
-
-#include "opencv2/core.hpp"
-
-/**
-  @defgroup imgcodecs Image file reading and writing
-  @{
-    @defgroup imgcodecs_c C API
-    @defgroup imgcodecs_flags Flags used for image file reading and writing
-    @defgroup imgcodecs_ios iOS glue
-    @defgroup imgcodecs_macosx MacOS(OSX) glue
-  @}
-*/
-
-//////////////////////////////// image codec ////////////////////////////////
-namespace cv
-{
-
-//! @addtogroup imgcodecs
-//! @{
-
-//! @addtogroup imgcodecs_flags
-//! @{
-
-//! Imread flags
-enum ImreadModes {
-       IMREAD_UNCHANGED            = -1, //!< If set, return the loaded image as is (with alpha channel, otherwise it gets cropped). Ignore EXIF orientation.
-       IMREAD_GRAYSCALE            = 0,  //!< If set, always convert image to the single channel grayscale image (codec internal conversion).
-       IMREAD_COLOR                = 1,  //!< If set, always convert image to the 3 channel BGR color image.
-       IMREAD_ANYDEPTH             = 2,  //!< If set, return 16-bit/32-bit image when the input has the corresponding depth, otherwise convert it to 8-bit.
-       IMREAD_ANYCOLOR             = 4,  //!< If set, the image is read in any possible color format.
-       IMREAD_LOAD_GDAL            = 8,  //!< If set, use the gdal driver for loading the image.
-       IMREAD_REDUCED_GRAYSCALE_2  = 16, //!< If set, always convert image to the single channel grayscale image and the image size reduced 1/2.
-       IMREAD_REDUCED_COLOR_2      = 17, //!< If set, always convert image to the 3 channel BGR color image and the image size reduced 1/2.
-       IMREAD_REDUCED_GRAYSCALE_4  = 32, //!< If set, always convert image to the single channel grayscale image and the image size reduced 1/4.
-       IMREAD_REDUCED_COLOR_4      = 33, //!< If set, always convert image to the 3 channel BGR color image and the image size reduced 1/4.
-       IMREAD_REDUCED_GRAYSCALE_8  = 64, //!< If set, always convert image to the single channel grayscale image and the image size reduced 1/8.
-       IMREAD_REDUCED_COLOR_8      = 65, //!< If set, always convert image to the 3 channel BGR color image and the image size reduced 1/8.
-       IMREAD_IGNORE_ORIENTATION   = 128 //!< If set, do not rotate the image according to EXIF's orientation flag.
-     };
-
-//! Imwrite flags
-enum ImwriteFlags {
-       IMWRITE_JPEG_QUALITY        = 1,  //!< For JPEG, it can be a quality from 0 to 100 (the higher is the better). Default value is 95.
-       IMWRITE_JPEG_PROGRESSIVE    = 2,  //!< Enable JPEG features, 0 or 1, default is False.
-       IMWRITE_JPEG_OPTIMIZE       = 3,  //!< Enable JPEG features, 0 or 1, default is False.
-       IMWRITE_JPEG_RST_INTERVAL   = 4,  //!< JPEG restart interval, 0 - 65535, default is 0 - no restart.
-       IMWRITE_JPEG_LUMA_QUALITY   = 5,  //!< Separate luma quality level, 0 - 100, default is -1 - don't use.
-       IMWRITE_JPEG_CHROMA_QUALITY = 6,  //!< Separate chroma quality level, 0 - 100, default is -1 - don't use.
-       IMWRITE_PNG_COMPRESSION     = 16, //!< For PNG, it can be the compression level from 0 to 9. A higher value means a smaller size and longer compression time. If specified, strategy is changed to IMWRITE_PNG_STRATEGY_DEFAULT (Z_DEFAULT_STRATEGY). Default value is 1 (best speed setting).
-       IMWRITE_PNG_STRATEGY        = 17, //!< One of cv::ImwritePNGFlags, default is IMWRITE_PNG_STRATEGY_RLE.
-       IMWRITE_PNG_BILEVEL         = 18, //!< Binary level PNG, 0 or 1, default is 0.
-       IMWRITE_PXM_BINARY          = 32, //!< For PPM, PGM, or PBM, it can be a binary format flag, 0 or 1. Default value is 1.
-       IMWRITE_EXR_TYPE            = (3 << 4) + 0, /* 48 */ //!< override EXR storage type (FLOAT (FP32) is default)
-       IMWRITE_EXR_COMPRESSION     = (3 << 4) + 1, /* 49 */ //!< override EXR compression type (ZIP_COMPRESSION = 3 is default)
-       IMWRITE_WEBP_QUALITY        = 64, //!< For WEBP, it can be a quality from 1 to 100 (the higher is the better). By default (without any parameter) and for quality above 100 the lossless compression is used.
-       IMWRITE_PAM_TUPLETYPE       = 128,//!< For PAM, sets the TUPLETYPE field to the corresponding string value that is defined for the format
-       IMWRITE_TIFF_RESUNIT        = 256,//!< For TIFF, use to specify which DPI resolution unit to set; see libtiff documentation for valid values
-       IMWRITE_TIFF_XDPI           = 257,//!< For TIFF, use to specify the X direction DPI
-       IMWRITE_TIFF_YDPI           = 258,//!< For TIFF, use to specify the Y direction DPI
-       IMWRITE_TIFF_COMPRESSION    = 259,//!< For TIFF, use to specify the image compression scheme. See libtiff for integer constants corresponding to compression formats. Note, for images whose depth is CV_32F, only libtiff's SGILOG compression scheme is used. For other supported depths, the compression scheme can be specified by this flag; LZW compression is the default.
-       IMWRITE_JPEG2000_COMPRESSION_X1000 = 272 //!< For JPEG2000, use to specify the target compression rate (multiplied by 1000). The value can be from 0 to 1000. Default is 1000.
-     };
-
-enum ImwriteEXRTypeFlags {
-       /*IMWRITE_EXR_TYPE_UNIT = 0, //!< not supported */
-       IMWRITE_EXR_TYPE_HALF   = 1, //!< store as HALF (FP16)
-       IMWRITE_EXR_TYPE_FLOAT  = 2  //!< store as FP32 (default)
-     };
-
-enum ImwriteEXRCompressionFlags {
-       IMWRITE_EXR_COMPRESSION_NO    = 0, //!< no compression
-       IMWRITE_EXR_COMPRESSION_RLE   = 1, //!< run length encoding
-       IMWRITE_EXR_COMPRESSION_ZIPS  = 2, //!< zlib compression, one scan line at a time
-       IMWRITE_EXR_COMPRESSION_ZIP   = 3, //!< zlib compression, in blocks of 16 scan lines
-       IMWRITE_EXR_COMPRESSION_PIZ   = 4, //!< piz-based wavelet compression
-       IMWRITE_EXR_COMPRESSION_PXR24 = 5, //!< lossy 24-bit float compression
-       IMWRITE_EXR_COMPRESSION_B44   = 6, //!< lossy 4-by-4 pixel block compression, fixed compression rate
-       IMWRITE_EXR_COMPRESSION_B44A  = 7, //!< lossy 4-by-4 pixel block compression, flat fields are compressed more
-       IMWRITE_EXR_COMPRESSION_DWAA  = 8, //!< lossy DCT based compression, in blocks of 32 scanlines. More efficient for partial buffer access. Supported since OpenEXR 2.2.0.
-       IMWRITE_EXR_COMPRESSION_DWAB  = 9, //!< lossy DCT based compression, in blocks of 256 scanlines. More efficient space wise and faster to decode full frames than DWAA_COMPRESSION. Supported since OpenEXR 2.2.0.
-     };
-
-//! Imwrite PNG specific flags used to tune the compression algorithm.
-/** These flags will be modify the way of PNG image compression and will be passed to the underlying zlib processing stage.
-
--   The effect of IMWRITE_PNG_STRATEGY_FILTERED is to force more Huffman coding and less string matching; it is somewhat intermediate between IMWRITE_PNG_STRATEGY_DEFAULT and IMWRITE_PNG_STRATEGY_HUFFMAN_ONLY.
--   IMWRITE_PNG_STRATEGY_RLE is designed to be almost as fast as IMWRITE_PNG_STRATEGY_HUFFMAN_ONLY, but give better compression for PNG image data.
--   The strategy parameter only affects the compression ratio but not the correctness of the compressed output even if it is not set appropriately.
--   IMWRITE_PNG_STRATEGY_FIXED prevents the use of dynamic Huffman codes, allowing for a simpler decoder for special applications.
-*/
-enum ImwritePNGFlags {
-       IMWRITE_PNG_STRATEGY_DEFAULT      = 0, //!< Use this value for normal data.
-       IMWRITE_PNG_STRATEGY_FILTERED     = 1, //!< Use this value for data produced by a filter (or predictor).Filtered data consists mostly of small values with a somewhat random distribution. In this case, the compression algorithm is tuned to compress them better.
-       IMWRITE_PNG_STRATEGY_HUFFMAN_ONLY = 2, //!< Use this value to force Huffman encoding only (no string match).
-       IMWRITE_PNG_STRATEGY_RLE          = 3, //!< Use this value to limit match distances to one (run-length encoding).
-       IMWRITE_PNG_STRATEGY_FIXED        = 4  //!< Using this value prevents the use of dynamic Huffman codes, allowing for a simpler decoder for special applications.
-     };
-
-//! Imwrite PAM specific tupletype flags used to define the 'TUPLETYPE' field of a PAM file.
-enum ImwritePAMFlags {
-       IMWRITE_PAM_FORMAT_NULL            = 0,
-       IMWRITE_PAM_FORMAT_BLACKANDWHITE   = 1,
-       IMWRITE_PAM_FORMAT_GRAYSCALE       = 2,
-       IMWRITE_PAM_FORMAT_GRAYSCALE_ALPHA = 3,
-       IMWRITE_PAM_FORMAT_RGB             = 4,
-       IMWRITE_PAM_FORMAT_RGB_ALPHA       = 5
-     };
-
-//! @} imgcodecs_flags
-
-/** @brief Loads an image from a file.
-
-@anchor imread
-
-The function imread loads an image from the specified file and returns it. If the image cannot be
-read (because of missing file, improper permissions, unsupported or invalid format), the function
-returns an empty matrix ( Mat::data==NULL ).
-
-Currently, the following file formats are supported:
-
--   Windows bitmaps - \*.bmp, \*.dib (always supported)
--   JPEG files - \*.jpeg, \*.jpg, \*.jpe (see the *Note* section)
--   JPEG 2000 files - \*.jp2 (see the *Note* section)
--   Portable Network Graphics - \*.png (see the *Note* section)
--   WebP - \*.webp (see the *Note* section)
--   Portable image format - \*.pbm, \*.pgm, \*.ppm \*.pxm, \*.pnm (always supported)
--   PFM files - \*.pfm (see the *Note* section)
--   Sun rasters - \*.sr, \*.ras (always supported)
--   TIFF files - \*.tiff, \*.tif (see the *Note* section)
--   OpenEXR Image files - \*.exr (see the *Note* section)
--   Radiance HDR - \*.hdr, \*.pic (always supported)
--   Raster and Vector geospatial data supported by GDAL (see the *Note* section)
-
-@note
--   The function determines the type of an image by the content, not by the file extension.
--   In the case of color images, the decoded images will have the channels stored in **B G R** order.
--   When using IMREAD_GRAYSCALE, the codec's internal grayscale conversion will be used, if available.
-    Results may differ to the output of cvtColor()
--   On Microsoft Windows\* OS and MacOSX\*, the codecs shipped with an OpenCV image (libjpeg,
-    libpng, libtiff, and libjasper) are used by default. So, OpenCV can always read JPEGs, PNGs,
-    and TIFFs. On MacOSX, there is also an option to use native MacOSX image readers. But beware
-    that currently these native image loaders give images with different pixel values because of
-    the color management embedded into MacOSX.
--   On Linux\*, BSD flavors and other Unix-like open-source operating systems, OpenCV looks for
-    codecs supplied with an OS image. Install the relevant packages (do not forget the development
-    files, for example, "libjpeg-dev", in Debian\* and Ubuntu\*) to get the codec support or turn
-    on the OPENCV_BUILD_3RDPARTY_LIBS flag in CMake.
--   In the case you set *WITH_GDAL* flag to true in CMake and @ref IMREAD_LOAD_GDAL to load the image,
-    then the [GDAL](http://www.gdal.org) driver will be used in order to decode the image, supporting
-    the following formats: [Raster](http://www.gdal.org/formats_list.html),
-    [Vector](http://www.gdal.org/ogr_formats.html).
--   If EXIF information is embedded in the image file, the EXIF orientation will be taken into account
-    and thus the image will be rotated accordingly except if the flags @ref IMREAD_IGNORE_ORIENTATION
-    or @ref IMREAD_UNCHANGED are passed.
--   Use the IMREAD_UNCHANGED flag to keep the floating point values from PFM image.
--   By default number of pixels must be less than 2^30. Limit can be set using system
-    variable OPENCV_IO_MAX_IMAGE_PIXELS
-
-@param filename Name of file to be loaded.
-@param flags Flag that can take values of cv::ImreadModes
-*/
-CV_EXPORTS_W Mat imread( const String& filename, int flags = IMREAD_COLOR );
-
-/** @brief Loads a multi-page image from a file.
-
-The function imreadmulti loads a multi-page image from the specified file into a vector of Mat objects.
-@param filename Name of file to be loaded.
-@param mats A vector of Mat objects holding each page.
-@param flags Flag that can take values of cv::ImreadModes, default with cv::IMREAD_ANYCOLOR.
-@sa cv::imread
-*/
-CV_EXPORTS_W bool imreadmulti(const String& filename, CV_OUT std::vector<Mat>& mats, int flags = IMREAD_ANYCOLOR);
-
-/** @brief Loads a of images of a multi-page image from a file.
-
-The function imreadmulti loads a specified range from a multi-page image from the specified file into a vector of Mat objects.
-@param filename Name of file to be loaded.
-@param mats A vector of Mat objects holding each page.
-@param start Start index of the image to load
-@param count Count number of images to load
-@param flags Flag that can take values of cv::ImreadModes, default with cv::IMREAD_ANYCOLOR.
-@sa cv::imread
-*/
-CV_EXPORTS_W bool imreadmulti(const String& filename, CV_OUT std::vector<Mat>& mats, int start, int count, int flags = IMREAD_ANYCOLOR);
-
-/** @brief Returns the number of images inside the give file
-
-The function imcount will return the number of pages in a multi-page image, or 1 for single-page images
-@param filename Name of file to be loaded.
-@param flags Flag that can take values of cv::ImreadModes, default with cv::IMREAD_ANYCOLOR.
-*/
-CV_EXPORTS_W size_t imcount(const String& filename, int flags = IMREAD_ANYCOLOR);
-
-/** @brief Saves an image to a specified file.
-
-The function imwrite saves the image to the specified file. The image format is chosen based on the
-filename extension (see cv::imread for the list of extensions). In general, only 8-bit
-single-channel or 3-channel (with 'BGR' channel order) images
-can be saved using this function, with these exceptions:
-
-- 16-bit unsigned (CV_16U) images can be saved in the case of PNG, JPEG 2000, and TIFF formats
-- 32-bit float (CV_32F) images can be saved in PFM, TIFF, OpenEXR, and Radiance HDR formats;
-  3-channel (CV_32FC3) TIFF images will be saved using the LogLuv high dynamic range encoding
-  (4 bytes per pixel)
-- PNG images with an alpha channel can be saved using this function. To do this, create
-8-bit (or 16-bit) 4-channel image BGRA, where the alpha channel goes last. Fully transparent pixels
-should have alpha set to 0, fully opaque pixels should have alpha set to 255/65535 (see the code sample below).
-- Multiple images (vector of Mat) can be saved in TIFF format (see the code sample below).
-
-If the image format is not supported, the image will be converted to 8-bit unsigned (CV_8U) and saved that way.
-
-If the format, depth or channel order is different, use
-Mat::convertTo and cv::cvtColor to convert it before saving. Or, use the universal FileStorage I/O
-functions to save the image to XML or YAML format.
-
-The sample below shows how to create a BGRA image, how to set custom compression parameters and save it to a PNG file.
-It also demonstrates how to save multiple images in a TIFF file:
-@include snippets/imgcodecs_imwrite.cpp
-@param filename Name of the file.
-@param img (Mat or vector of Mat) Image or Images to be saved.
-@param params Format-specific parameters encoded as pairs (paramId_1, paramValue_1, paramId_2, paramValue_2, ... .) see cv::ImwriteFlags
-*/
-CV_EXPORTS_W bool imwrite( const String& filename, InputArray img,
-              const std::vector<int>& params = std::vector<int>());
-
-/// @overload multi-image overload for bindings
-CV_WRAP static inline
-bool imwritemulti(const String& filename, InputArrayOfArrays img,
-                  const std::vector<int>& params = std::vector<int>())
-{
-    return imwrite(filename, img, params);
-}
-
-/** @brief Reads an image from a buffer in memory.
-
-The function imdecode reads an image from the specified buffer in the memory. If the buffer is too short or
-contains invalid data, the function returns an empty matrix ( Mat::data==NULL ).
-
-See cv::imread for the list of supported formats and flags description.
-
-@note In the case of color images, the decoded images will have the channels stored in **B G R** order.
-@param buf Input array or vector of bytes.
-@param flags The same flags as in cv::imread, see cv::ImreadModes.
-*/
-CV_EXPORTS_W Mat imdecode( InputArray buf, int flags );
-
-/** @overload
-@param buf
-@param flags
-@param dst The optional output placeholder for the decoded matrix. It can save the image
-reallocations when the function is called repeatedly for images of the same size.
-*/
-CV_EXPORTS Mat imdecode( InputArray buf, int flags, Mat* dst);
-
-/** @brief Encodes an image into a memory buffer.
-
-The function imencode compresses the image and stores it in the memory buffer that is resized to fit the
-result. See cv::imwrite for the list of supported formats and flags description.
-
-@param ext File extension that defines the output format. Must include a leading period.
-@param img Image to be written.
-@param buf Output buffer resized to fit the compressed image.
-@param params Format-specific parameters. See cv::imwrite and cv::ImwriteFlags.
-*/
-CV_EXPORTS_W bool imencode( const String& ext, InputArray img,
-                            CV_OUT std::vector<uchar>& buf,
-                            const std::vector<int>& params = std::vector<int>());
-
-/** @brief Returns true if the specified image can be decoded by OpenCV
-
-@param filename File name of the image
-*/
-CV_EXPORTS_W bool haveImageReader( const String& filename );
-
-/** @brief Returns true if an image with the specified filename can be encoded by OpenCV
-
- @param filename File name of the image
- */
-CV_EXPORTS_W bool haveImageWriter( const String& filename );
-
-
-//! @} imgcodecs
-
-} // cv
-
-#endif //OPENCV_IMGCODECS_HPP
diff --git a/3rdParty/opencv2/imgproc.hpp b/3rdParty/opencv2/imgproc.hpp
deleted file mode 100644
index ead1274704..0000000000
--- a/3rdParty/opencv2/imgproc.hpp
+++ /dev/null
@@ -1,5005 +0,0 @@
-/*M///////////////////////////////////////////////////////////////////////////////////////
-//
-//  IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
-//
-//  By downloading, copying, installing or using the software you agree to this license.
-//  If you do not agree to this license, do not download, install,
-//  copy or use the software.
-//
-//
-//                           License Agreement
-//                For Open Source Computer Vision Library
-//
-// Copyright (C) 2000-2008, Intel Corporation, all rights reserved.
-// Copyright (C) 2009, Willow Garage Inc., all rights reserved.
-// Third party copyrights are property of their respective owners.
-//
-// Redistribution and use in source and binary forms, with or without modification,
-// are permitted provided that the following conditions are met:
-//
-//   * Redistribution's of source code must retain the above copyright notice,
-//     this list of conditions and the following disclaimer.
-//
-//   * Redistribution's in binary form must reproduce the above copyright notice,
-//     this list of conditions and the following disclaimer in the documentation
-//     and/or other materials provided with the distribution.
-//
-//   * The name of the copyright holders may not be used to endorse or promote products
-//     derived from this software without specific prior written permission.
-//
-// This software is provided by the copyright holders and contributors "as is" and
-// any express or implied warranties, including, but not limited to, the implied
-// warranties of merchantability and fitness for a particular purpose are disclaimed.
-// In no event shall the Intel Corporation or contributors be liable for any direct,
-// indirect, incidental, special, exemplary, or consequential damages
-// (including, but not limited to, procurement of substitute goods or services;
-// loss of use, data, or profits; or business interruption) however caused
-// and on any theory of liability, whether in contract, strict liability,
-// or tort (including negligence or otherwise) arising in any way out of
-// the use of this software, even if advised of the possibility of such damage.
-//
-//M*/
-
-#ifndef OPENCV_IMGPROC_HPP
-#define OPENCV_IMGPROC_HPP
-
-#include "opencv2/core.hpp"
-
-/**
-  @defgroup imgproc Image Processing
-
-This module includes image-processing functions.
-
-  @{
-    @defgroup imgproc_filter Image Filtering
-
-Functions and classes described in this section are used to perform various linear or non-linear
-filtering operations on 2D images (represented as Mat's). It means that for each pixel location
-\f$(x,y)\f$ in the source image (normally, rectangular), its neighborhood is considered and used to
-compute the response. In case of a linear filter, it is a weighted sum of pixel values. In case of
-morphological operations, it is the minimum or maximum values, and so on. The computed response is
-stored in the destination image at the same location \f$(x,y)\f$. It means that the output image
-will be of the same size as the input image. Normally, the functions support multi-channel arrays,
-in which case every channel is processed independently. Therefore, the output image will also have
-the same number of channels as the input one.
-
-Another common feature of the functions and classes described in this section is that, unlike
-simple arithmetic functions, they need to extrapolate values of some non-existing pixels. For
-example, if you want to smooth an image using a Gaussian \f$3 \times 3\f$ filter, then, when
-processing the left-most pixels in each row, you need pixels to the left of them, that is, outside
-of the image. You can let these pixels be the same as the left-most image pixels ("replicated
-border" extrapolation method), or assume that all the non-existing pixels are zeros ("constant
-border" extrapolation method), and so on. OpenCV enables you to specify the extrapolation method.
-For details, see #BorderTypes
-
-@anchor filter_depths
-### Depth combinations
-Input depth (src.depth()) | Output depth (ddepth)
---------------------------|----------------------
-CV_8U                     | -1/CV_16S/CV_32F/CV_64F
-CV_16U/CV_16S             | -1/CV_32F/CV_64F
-CV_32F                    | -1/CV_32F/CV_64F
-CV_64F                    | -1/CV_64F
-
-@note when ddepth=-1, the output image will have the same depth as the source.
-
-    @defgroup imgproc_transform Geometric Image Transformations
-
-The functions in this section perform various geometrical transformations of 2D images. They do not
-change the image content but deform the pixel grid and map this deformed grid to the destination
-image. In fact, to avoid sampling artifacts, the mapping is done in the reverse order, from
-destination to the source. That is, for each pixel \f$(x, y)\f$ of the destination image, the
-functions compute coordinates of the corresponding "donor" pixel in the source image and copy the
-pixel value:
-
-\f[\texttt{dst} (x,y)= \texttt{src} (f_x(x,y), f_y(x,y))\f]
-
-In case when you specify the forward mapping \f$\left<g_x, g_y\right>: \texttt{src} \rightarrow
-\texttt{dst}\f$, the OpenCV functions first compute the corresponding inverse mapping
-\f$\left<f_x, f_y\right>: \texttt{dst} \rightarrow \texttt{src}\f$ and then use the above formula.
-
-The actual implementations of the geometrical transformations, from the most generic remap and to
-the simplest and the fastest resize, need to solve two main problems with the above formula:
-
-- Extrapolation of non-existing pixels. Similarly to the filtering functions described in the
-previous section, for some \f$(x,y)\f$, either one of \f$f_x(x,y)\f$, or \f$f_y(x,y)\f$, or both
-of them may fall outside of the image. In this case, an extrapolation method needs to be used.
-OpenCV provides the same selection of extrapolation methods as in the filtering functions. In
-addition, it provides the method #BORDER_TRANSPARENT. This means that the corresponding pixels in
-the destination image will not be modified at all.
-
-- Interpolation of pixel values. Usually \f$f_x(x,y)\f$ and \f$f_y(x,y)\f$ are floating-point
-numbers. This means that \f$\left<f_x, f_y\right>\f$ can be either an affine or perspective
-transformation, or radial lens distortion correction, and so on. So, a pixel value at fractional
-coordinates needs to be retrieved. In the simplest case, the coordinates can be just rounded to the
-nearest integer coordinates and the corresponding pixel can be used. This is called a
-nearest-neighbor interpolation. However, a better result can be achieved by using more
-sophisticated [interpolation methods](http://en.wikipedia.org/wiki/Multivariate_interpolation) ,
-where a polynomial function is fit into some neighborhood of the computed pixel \f$(f_x(x,y),
-f_y(x,y))\f$, and then the value of the polynomial at \f$(f_x(x,y), f_y(x,y))\f$ is taken as the
-interpolated pixel value. In OpenCV, you can choose between several interpolation methods. See
-#resize for details.
-
-@note The geometrical transformations do not work with `CV_8S` or `CV_32S` images.
-
-    @defgroup imgproc_misc Miscellaneous Image Transformations
-    @defgroup imgproc_draw Drawing Functions
-
-Drawing functions work with matrices/images of arbitrary depth. The boundaries of the shapes can be
-rendered with antialiasing (implemented only for 8-bit images for now). All the functions include
-the parameter color that uses an RGB value (that may be constructed with the Scalar constructor )
-for color images and brightness for grayscale images. For color images, the channel ordering is
-normally *Blue, Green, Red*. This is what imshow, imread, and imwrite expect. So, if you form a
-color using the Scalar constructor, it should look like:
-
-\f[\texttt{Scalar} (blue \_ component, green \_ component, red \_ component[, alpha \_ component])\f]
-
-If you are using your own image rendering and I/O functions, you can use any channel ordering. The
-drawing functions process each channel independently and do not depend on the channel order or even
-on the used color space. The whole image can be converted from BGR to RGB or to a different color
-space using cvtColor .
-
-If a drawn figure is partially or completely outside the image, the drawing functions clip it. Also,
-many drawing functions can handle pixel coordinates specified with sub-pixel accuracy. This means
-that the coordinates can be passed as fixed-point numbers encoded as integers. The number of
-fractional bits is specified by the shift parameter and the real point coordinates are calculated as
-\f$\texttt{Point}(x,y)\rightarrow\texttt{Point2f}(x*2^{-shift},y*2^{-shift})\f$ . This feature is
-especially effective when rendering antialiased shapes.
-
-@note The functions do not support alpha-transparency when the target image is 4-channel. In this
-case, the color[3] is simply copied to the repainted pixels. Thus, if you want to paint
-semi-transparent shapes, you can paint them in a separate buffer and then blend it with the main
-image.
-
-    @defgroup imgproc_color_conversions Color Space Conversions
-    @defgroup imgproc_colormap ColorMaps in OpenCV
-
-The human perception isn't built for observing fine changes in grayscale images. Human eyes are more
-sensitive to observing changes between colors, so you often need to recolor your grayscale images to
-get a clue about them. OpenCV now comes with various colormaps to enhance the visualization in your
-computer vision application.
-
-In OpenCV you only need applyColorMap to apply a colormap on a given image. The following sample
-code reads the path to an image from command line, applies a Jet colormap on it and shows the
-result:
-
-@include snippets/imgproc_applyColorMap.cpp
-
-@see #ColormapTypes
-
-    @defgroup imgproc_subdiv2d Planar Subdivision
-
-The Subdiv2D class described in this section is used to perform various planar subdivision on
-a set of 2D points (represented as vector of Point2f). OpenCV subdivides a plane into triangles
-using the Delaunay's algorithm, which corresponds to the dual graph of the Voronoi diagram.
-In the figure below, the Delaunay's triangulation is marked with black lines and the Voronoi
-diagram with red lines.
-
-![Delaunay triangulation (black) and Voronoi (red)](pics/delaunay_voronoi.png)
-
-The subdivisions can be used for the 3D piece-wise transformation of a plane, morphing, fast
-location of points on the plane, building special graphs (such as NNG,RNG), and so forth.
-
-    @defgroup imgproc_hist Histograms
-    @defgroup imgproc_shape Structural Analysis and Shape Descriptors
-    @defgroup imgproc_motion Motion Analysis and Object Tracking
-    @defgroup imgproc_feature Feature Detection
-    @defgroup imgproc_object Object Detection
-    @defgroup imgproc_segmentation Image Segmentation
-    @defgroup imgproc_c C API
-    @defgroup imgproc_hal Hardware Acceleration Layer
-    @{
-        @defgroup imgproc_hal_functions Functions
-        @defgroup imgproc_hal_interface Interface
-    @}
-  @}
-*/
-
-namespace cv
-{
-
-/** @addtogroup imgproc
-@{
-*/
-
-//! @addtogroup imgproc_filter
-//! @{
-
-enum SpecialFilter {
-    FILTER_SCHARR = -1
-};
-
-//! type of morphological operation
-enum MorphTypes{
-    MORPH_ERODE    = 0, //!< see #erode
-    MORPH_DILATE   = 1, //!< see #dilate
-    MORPH_OPEN     = 2, //!< an opening operation
-                        //!< \f[\texttt{dst} = \mathrm{open} ( \texttt{src} , \texttt{element} )= \mathrm{dilate} ( \mathrm{erode} ( \texttt{src} , \texttt{element} ))\f]
-    MORPH_CLOSE    = 3, //!< a closing operation
-                        //!< \f[\texttt{dst} = \mathrm{close} ( \texttt{src} , \texttt{element} )= \mathrm{erode} ( \mathrm{dilate} ( \texttt{src} , \texttt{element} ))\f]
-    MORPH_GRADIENT = 4, //!< a morphological gradient
-                        //!< \f[\texttt{dst} = \mathrm{morph\_grad} ( \texttt{src} , \texttt{element} )= \mathrm{dilate} ( \texttt{src} , \texttt{element} )- \mathrm{erode} ( \texttt{src} , \texttt{element} )\f]
-    MORPH_TOPHAT   = 5, //!< "top hat"
-                        //!< \f[\texttt{dst} = \mathrm{tophat} ( \texttt{src} , \texttt{element} )= \texttt{src} - \mathrm{open} ( \texttt{src} , \texttt{element} )\f]
-    MORPH_BLACKHAT = 6, //!< "black hat"
-                        //!< \f[\texttt{dst} = \mathrm{blackhat} ( \texttt{src} , \texttt{element} )= \mathrm{close} ( \texttt{src} , \texttt{element} )- \texttt{src}\f]
-    MORPH_HITMISS  = 7  //!< "hit or miss"
-                        //!<   .- Only supported for CV_8UC1 binary images. A tutorial can be found in the documentation
-};
-
-//! shape of the structuring element
-enum MorphShapes {
-    MORPH_RECT    = 0, //!< a rectangular structuring element:  \f[E_{ij}=1\f]
-    MORPH_CROSS   = 1, //!< a cross-shaped structuring element:
-                       //!< \f[E_{ij} = \begin{cases} 1 & \texttt{if } {i=\texttt{anchor.y } {or } {j=\texttt{anchor.x}}} \\0 & \texttt{otherwise} \end{cases}\f]
-    MORPH_ELLIPSE = 2 //!< an elliptic structuring element, that is, a filled ellipse inscribed
-                      //!< into the rectangle Rect(0, 0, esize.width, 0.esize.height)
-};
-
-//! @} imgproc_filter
-
-//! @addtogroup imgproc_transform
-//! @{
-
-//! interpolation algorithm
-enum InterpolationFlags{
-    /** nearest neighbor interpolation */
-    INTER_NEAREST        = 0,
-    /** bilinear interpolation */
-    INTER_LINEAR         = 1,
-    /** bicubic interpolation */
-    INTER_CUBIC          = 2,
-    /** resampling using pixel area relation. It may be a preferred method for image decimation, as
-    it gives moire'-free results. But when the image is zoomed, it is similar to the INTER_NEAREST
-    method. */
-    INTER_AREA           = 3,
-    /** Lanczos interpolation over 8x8 neighborhood */
-    INTER_LANCZOS4       = 4,
-    /** Bit exact bilinear interpolation */
-    INTER_LINEAR_EXACT = 5,
-    /** Bit exact nearest neighbor interpolation. This will produce same results as
-    the nearest neighbor method in PIL, scikit-image or Matlab. */
-    INTER_NEAREST_EXACT  = 6,
-    /** mask for interpolation codes */
-    INTER_MAX            = 7,
-    /** flag, fills all of the destination image pixels. If some of them correspond to outliers in the
-    source image, they are set to zero */
-    WARP_FILL_OUTLIERS   = 8,
-    /** flag, inverse transformation
-
-    For example, #linearPolar or #logPolar transforms:
-    - flag is __not__ set: \f$dst( \rho , \phi ) = src(x,y)\f$
-    - flag is set: \f$dst(x,y) = src( \rho , \phi )\f$
-    */
-    WARP_INVERSE_MAP     = 16
-};
-
-/** \brief Specify the polar mapping mode
-@sa warpPolar
-*/
-enum WarpPolarMode
-{
-    WARP_POLAR_LINEAR = 0, ///< Remaps an image to/from polar space.
-    WARP_POLAR_LOG = 256   ///< Remaps an image to/from semilog-polar space.
-};
-
-enum InterpolationMasks {
-       INTER_BITS      = 5,
-       INTER_BITS2     = INTER_BITS * 2,
-       INTER_TAB_SIZE  = 1 << INTER_BITS,
-       INTER_TAB_SIZE2 = INTER_TAB_SIZE * INTER_TAB_SIZE
-     };
-
-//! @} imgproc_transform
-
-//! @addtogroup imgproc_misc
-//! @{
-
-//! Distance types for Distance Transform and M-estimators
-//! @see distanceTransform, fitLine
-enum DistanceTypes {
-    DIST_USER    = -1,  //!< User defined distance
-    DIST_L1      = 1,   //!< distance = |x1-x2| + |y1-y2|
-    DIST_L2      = 2,   //!< the simple euclidean distance
-    DIST_C       = 3,   //!< distance = max(|x1-x2|,|y1-y2|)
-    DIST_L12     = 4,   //!< L1-L2 metric: distance = 2(sqrt(1+x*x/2) - 1))
-    DIST_FAIR    = 5,   //!< distance = c^2(|x|/c-log(1+|x|/c)), c = 1.3998
-    DIST_WELSCH  = 6,   //!< distance = c^2/2(1-exp(-(x/c)^2)), c = 2.9846
-    DIST_HUBER   = 7    //!< distance = |x|<c ? x^2/2 : c(|x|-c/2), c=1.345
-};
-
-//! Mask size for distance transform
-enum DistanceTransformMasks {
-    DIST_MASK_3       = 3, //!< mask=3
-    DIST_MASK_5       = 5, //!< mask=5
-    DIST_MASK_PRECISE = 0  //!<
-};
-
-//! type of the threshold operation
-//! ![threshold types](pics/threshold.png)
-enum ThresholdTypes {
-    THRESH_BINARY     = 0, //!< \f[\texttt{dst} (x,y) =  \fork{\texttt{maxval}}{if \(\texttt{src}(x,y) > \texttt{thresh}\)}{0}{otherwise}\f]
-    THRESH_BINARY_INV = 1, //!< \f[\texttt{dst} (x,y) =  \fork{0}{if \(\texttt{src}(x,y) > \texttt{thresh}\)}{\texttt{maxval}}{otherwise}\f]
-    THRESH_TRUNC      = 2, //!< \f[\texttt{dst} (x,y) =  \fork{\texttt{threshold}}{if \(\texttt{src}(x,y) > \texttt{thresh}\)}{\texttt{src}(x,y)}{otherwise}\f]
-    THRESH_TOZERO     = 3, //!< \f[\texttt{dst} (x,y) =  \fork{\texttt{src}(x,y)}{if \(\texttt{src}(x,y) > \texttt{thresh}\)}{0}{otherwise}\f]
-    THRESH_TOZERO_INV = 4, //!< \f[\texttt{dst} (x,y) =  \fork{0}{if \(\texttt{src}(x,y) > \texttt{thresh}\)}{\texttt{src}(x,y)}{otherwise}\f]
-    THRESH_MASK       = 7,
-    THRESH_OTSU       = 8, //!< flag, use Otsu algorithm to choose the optimal threshold value
-    THRESH_TRIANGLE   = 16 //!< flag, use Triangle algorithm to choose the optimal threshold value
-};
-
-//! adaptive threshold algorithm
-//! @see adaptiveThreshold
-enum AdaptiveThresholdTypes {
-    /** the threshold value \f$T(x,y)\f$ is a mean of the \f$\texttt{blockSize} \times
-    \texttt{blockSize}\f$ neighborhood of \f$(x, y)\f$ minus C */
-    ADAPTIVE_THRESH_MEAN_C     = 0,
-    /** the threshold value \f$T(x, y)\f$ is a weighted sum (cross-correlation with a Gaussian
-    window) of the \f$\texttt{blockSize} \times \texttt{blockSize}\f$ neighborhood of \f$(x, y)\f$
-    minus C . The default sigma (standard deviation) is used for the specified blockSize . See
-    #getGaussianKernel*/
-    ADAPTIVE_THRESH_GAUSSIAN_C = 1
-};
-
-//! class of the pixel in GrabCut algorithm
-enum GrabCutClasses {
-    GC_BGD    = 0,  //!< an obvious background pixels
-    GC_FGD    = 1,  //!< an obvious foreground (object) pixel
-    GC_PR_BGD = 2,  //!< a possible background pixel
-    GC_PR_FGD = 3   //!< a possible foreground pixel
-};
-
-//! GrabCut algorithm flags
-enum GrabCutModes {
-    /** The function initializes the state and the mask using the provided rectangle. After that it
-    runs iterCount iterations of the algorithm. */
-    GC_INIT_WITH_RECT  = 0,
-    /** The function initializes the state using the provided mask. Note that GC_INIT_WITH_RECT
-    and GC_INIT_WITH_MASK can be combined. Then, all the pixels outside of the ROI are
-    automatically initialized with GC_BGD .*/
-    GC_INIT_WITH_MASK  = 1,
-    /** The value means that the algorithm should just resume. */
-    GC_EVAL            = 2,
-    /** The value means that the algorithm should just run the grabCut algorithm (a single iteration) with the fixed model */
-    GC_EVAL_FREEZE_MODEL = 3
-};
-
-//! distanceTransform algorithm flags
-enum DistanceTransformLabelTypes {
-    /** each connected component of zeros in src (as well as all the non-zero pixels closest to the
-    connected component) will be assigned the same label */
-    DIST_LABEL_CCOMP = 0,
-    /** each zero pixel (and all the non-zero pixels closest to it) gets its own label. */
-    DIST_LABEL_PIXEL = 1
-};
-
-//! floodfill algorithm flags
-enum FloodFillFlags {
-    /** If set, the difference between the current pixel and seed pixel is considered. Otherwise,
-    the difference between neighbor pixels is considered (that is, the range is floating). */
-    FLOODFILL_FIXED_RANGE = 1 << 16,
-    /** If set, the function does not change the image ( newVal is ignored), and only fills the
-    mask with the value specified in bits 8-16 of flags as described above. This option only make
-    sense in function variants that have the mask parameter. */
-    FLOODFILL_MASK_ONLY   = 1 << 17
-};
-
-//! @} imgproc_misc
-
-//! @addtogroup imgproc_shape
-//! @{
-
-//! connected components statistics
-enum ConnectedComponentsTypes {
-    CC_STAT_LEFT   = 0, //!< The leftmost (x) coordinate which is the inclusive start of the bounding
-                        //!< box in the horizontal direction.
-    CC_STAT_TOP    = 1, //!< The topmost (y) coordinate which is the inclusive start of the bounding
-                        //!< box in the vertical direction.
-    CC_STAT_WIDTH  = 2, //!< The horizontal size of the bounding box
-    CC_STAT_HEIGHT = 3, //!< The vertical size of the bounding box
-    CC_STAT_AREA   = 4, //!< The total area (in pixels) of the connected component
-#ifndef CV_DOXYGEN
-    CC_STAT_MAX    = 5 //!< Max enumeration value. Used internally only for memory allocation
-#endif
-};
-
-//! connected components algorithm
-enum ConnectedComponentsAlgorithmsTypes {
-    CCL_DEFAULT   = -1, //!< Spaghetti @cite Bolelli2019 algorithm for 8-way connectivity, Spaghetti4C @cite Bolelli2021 algorithm for 4-way connectivity.
-    CCL_WU        = 0,  //!< SAUF @cite Wu2009 algorithm for 8-way connectivity, SAUF algorithm for 4-way connectivity. The parallel implementation described in @cite Bolelli2017 is available for SAUF.
-    CCL_GRANA     = 1,  //!< BBDT @cite Grana2010 algorithm for 8-way connectivity, SAUF algorithm for 4-way connectivity. The parallel implementation described in @cite Bolelli2017 is available for both BBDT and SAUF.
-    CCL_BOLELLI   = 2,  //!< Spaghetti @cite Bolelli2019 algorithm for 8-way connectivity, Spaghetti4C @cite Bolelli2021 algorithm for 4-way connectivity. The parallel implementation described in @cite Bolelli2017 is available for both Spaghetti and Spaghetti4C.
-    CCL_SAUF      = 3,  //!< Same as CCL_WU. It is preferable to use the flag with the name of the algorithm (CCL_SAUF) rather than the one with the name of the first author (CCL_WU).
-    CCL_BBDT      = 4,  //!< Same as CCL_GRANA. It is preferable to use the flag with the name of the algorithm (CCL_BBDT) rather than the one with the name of the first author (CCL_GRANA).
-    CCL_SPAGHETTI = 5,  //!< Same as CCL_BOLELLI. It is preferable to use the flag with the name of the algorithm (CCL_SPAGHETTI) rather than the one with the name of the first author (CCL_BOLELLI).
-};
-
-//! mode of the contour retrieval algorithm
-enum RetrievalModes {
-    /** retrieves only the extreme outer contours. It sets `hierarchy[i][2]=hierarchy[i][3]=-1` for
-    all the contours. */
-    RETR_EXTERNAL  = 0,
-    /** retrieves all of the contours without establishing any hierarchical relationships. */
-    RETR_LIST      = 1,
-    /** retrieves all of the contours and organizes them into a two-level hierarchy. At the top
-    level, there are external boundaries of the components. At the second level, there are
-    boundaries of the holes. If there is another contour inside a hole of a connected component, it
-    is still put at the top level. */
-    RETR_CCOMP     = 2,
-    /** retrieves all of the contours and reconstructs a full hierarchy of nested contours.*/
-    RETR_TREE      = 3,
-    RETR_FLOODFILL = 4 //!<
-};
-
-//! the contour approximation algorithm
-enum ContourApproximationModes {
-    /** stores absolutely all the contour points. That is, any 2 subsequent points (x1,y1) and
-    (x2,y2) of the contour will be either horizontal, vertical or diagonal neighbors, that is,
-    max(abs(x1-x2),abs(y2-y1))==1. */
-    CHAIN_APPROX_NONE      = 1,
-    /** compresses horizontal, vertical, and diagonal segments and leaves only their end points.
-    For example, an up-right rectangular contour is encoded with 4 points. */
-    CHAIN_APPROX_SIMPLE    = 2,
-    /** applies one of the flavors of the Teh-Chin chain approximation algorithm @cite TehChin89 */
-    CHAIN_APPROX_TC89_L1   = 3,
-    /** applies one of the flavors of the Teh-Chin chain approximation algorithm @cite TehChin89 */
-    CHAIN_APPROX_TC89_KCOS = 4
-};
-
-/** @brief Shape matching methods
-
-\f$A\f$ denotes object1,\f$B\f$ denotes object2
-
-\f$\begin{array}{l} m^A_i =  \mathrm{sign} (h^A_i)  \cdot \log{h^A_i} \\ m^B_i =  \mathrm{sign} (h^B_i)  \cdot \log{h^B_i} \end{array}\f$
-
-and \f$h^A_i, h^B_i\f$ are the Hu moments of \f$A\f$ and \f$B\f$ , respectively.
-*/
-enum ShapeMatchModes {
-    CONTOURS_MATCH_I1  =1, //!< \f[I_1(A,B) =  \sum _{i=1...7}  \left |  \frac{1}{m^A_i} -  \frac{1}{m^B_i} \right |\f]
-    CONTOURS_MATCH_I2  =2, //!< \f[I_2(A,B) =  \sum _{i=1...7}  \left | m^A_i - m^B_i  \right |\f]
-    CONTOURS_MATCH_I3  =3  //!< \f[I_3(A,B) =  \max _{i=1...7}  \frac{ \left| m^A_i - m^B_i \right| }{ \left| m^A_i \right| }\f]
-};
-
-//! @} imgproc_shape
-
-//! @addtogroup imgproc_feature
-//! @{
-
-//! Variants of a Hough transform
-enum HoughModes {
-
-    /** classical or standard Hough transform. Every line is represented by two floating-point
-    numbers \f$(\rho, \theta)\f$ , where \f$\rho\f$ is a distance between (0,0) point and the line,
-    and \f$\theta\f$ is the angle between x-axis and the normal to the line. Thus, the matrix must
-    be (the created sequence will be) of CV_32FC2 type */
-    HOUGH_STANDARD      = 0,
-    /** probabilistic Hough transform (more efficient in case if the picture contains a few long
-    linear segments). It returns line segments rather than the whole line. Each segment is
-    represented by starting and ending points, and the matrix must be (the created sequence will
-    be) of the CV_32SC4 type. */
-    HOUGH_PROBABILISTIC = 1,
-    /** multi-scale variant of the classical Hough transform. The lines are encoded the same way as
-    HOUGH_STANDARD. */
-    HOUGH_MULTI_SCALE   = 2,
-    HOUGH_GRADIENT      = 3, //!< basically *21HT*, described in @cite Yuen90
-    HOUGH_GRADIENT_ALT  = 4, //!< variation of HOUGH_GRADIENT to get better accuracy
-};
-
-//! Variants of Line Segment %Detector
-enum LineSegmentDetectorModes {
-    LSD_REFINE_NONE = 0, //!< No refinement applied
-    LSD_REFINE_STD  = 1, //!< Standard refinement is applied. E.g. breaking arches into smaller straighter line approximations.
-    LSD_REFINE_ADV  = 2  //!< Advanced refinement. Number of false alarms is calculated, lines are
-                         //!< refined through increase of precision, decrement in size, etc.
-};
-
-//! @} imgproc_feature
-
-/** Histogram comparison methods
-  @ingroup imgproc_hist
-*/
-enum HistCompMethods {
-    /** Correlation
-    \f[d(H_1,H_2) =  \frac{\sum_I (H_1(I) - \bar{H_1}) (H_2(I) - \bar{H_2})}{\sqrt{\sum_I(H_1(I) - \bar{H_1})^2 \sum_I(H_2(I) - \bar{H_2})^2}}\f]
-    where
-    \f[\bar{H_k} =  \frac{1}{N} \sum _J H_k(J)\f]
-    and \f$N\f$ is a total number of histogram bins. */
-    HISTCMP_CORREL        = 0,
-    /** Chi-Square
-    \f[d(H_1,H_2) =  \sum _I  \frac{\left(H_1(I)-H_2(I)\right)^2}{H_1(I)}\f] */
-    HISTCMP_CHISQR        = 1,
-    /** Intersection
-    \f[d(H_1,H_2) =  \sum _I  \min (H_1(I), H_2(I))\f] */
-    HISTCMP_INTERSECT     = 2,
-    /** Bhattacharyya distance
-    (In fact, OpenCV computes Hellinger distance, which is related to Bhattacharyya coefficient.)
-    \f[d(H_1,H_2) =  \sqrt{1 - \frac{1}{\sqrt{\bar{H_1} \bar{H_2} N^2}} \sum_I \sqrt{H_1(I) \cdot H_2(I)}}\f] */
-    HISTCMP_BHATTACHARYYA = 3,
-    HISTCMP_HELLINGER     = HISTCMP_BHATTACHARYYA, //!< Synonym for HISTCMP_BHATTACHARYYA
-    /** Alternative Chi-Square
-    \f[d(H_1,H_2) =  2 * \sum _I  \frac{\left(H_1(I)-H_2(I)\right)^2}{H_1(I)+H_2(I)}\f]
-    This alternative formula is regularly used for texture comparison. See e.g. @cite Puzicha1997 */
-    HISTCMP_CHISQR_ALT    = 4,
-    /** Kullback-Leibler divergence
-    \f[d(H_1,H_2) = \sum _I H_1(I) \log \left(\frac{H_1(I)}{H_2(I)}\right)\f] */
-    HISTCMP_KL_DIV        = 5
-};
-
-/** the color conversion codes
-@see @ref imgproc_color_conversions
-@ingroup imgproc_color_conversions
- */
-enum ColorConversionCodes {
-    COLOR_BGR2BGRA     = 0, //!< add alpha channel to RGB or BGR image
-    COLOR_RGB2RGBA     = COLOR_BGR2BGRA,
-
-    COLOR_BGRA2BGR     = 1, //!< remove alpha channel from RGB or BGR image
-    COLOR_RGBA2RGB     = COLOR_BGRA2BGR,
-
-    COLOR_BGR2RGBA     = 2, //!< convert between RGB and BGR color spaces (with or without alpha channel)
-    COLOR_RGB2BGRA     = COLOR_BGR2RGBA,
-
-    COLOR_RGBA2BGR     = 3,
-    COLOR_BGRA2RGB     = COLOR_RGBA2BGR,
-
-    COLOR_BGR2RGB      = 4,
-    COLOR_RGB2BGR      = COLOR_BGR2RGB,
-
-    COLOR_BGRA2RGBA    = 5,
-    COLOR_RGBA2BGRA    = COLOR_BGRA2RGBA,
-
-    COLOR_BGR2GRAY     = 6, //!< convert between RGB/BGR and grayscale, @ref color_convert_rgb_gray "color conversions"
-    COLOR_RGB2GRAY     = 7,
-    COLOR_GRAY2BGR     = 8,
-    COLOR_GRAY2RGB     = COLOR_GRAY2BGR,
-    COLOR_GRAY2BGRA    = 9,
-    COLOR_GRAY2RGBA    = COLOR_GRAY2BGRA,
-    COLOR_BGRA2GRAY    = 10,
-    COLOR_RGBA2GRAY    = 11,
-
-    COLOR_BGR2BGR565   = 12, //!< convert between RGB/BGR and BGR565 (16-bit images)
-    COLOR_RGB2BGR565   = 13,
-    COLOR_BGR5652BGR   = 14,
-    COLOR_BGR5652RGB   = 15,
-    COLOR_BGRA2BGR565  = 16,
-    COLOR_RGBA2BGR565  = 17,
-    COLOR_BGR5652BGRA  = 18,
-    COLOR_BGR5652RGBA  = 19,
-
-    COLOR_GRAY2BGR565  = 20, //!< convert between grayscale to BGR565 (16-bit images)
-    COLOR_BGR5652GRAY  = 21,
-
-    COLOR_BGR2BGR555   = 22,  //!< convert between RGB/BGR and BGR555 (16-bit images)
-    COLOR_RGB2BGR555   = 23,
-    COLOR_BGR5552BGR   = 24,
-    COLOR_BGR5552RGB   = 25,
-    COLOR_BGRA2BGR555  = 26,
-    COLOR_RGBA2BGR555  = 27,
-    COLOR_BGR5552BGRA  = 28,
-    COLOR_BGR5552RGBA  = 29,
-
-    COLOR_GRAY2BGR555  = 30, //!< convert between grayscale and BGR555 (16-bit images)
-    COLOR_BGR5552GRAY  = 31,
-
-    COLOR_BGR2XYZ      = 32, //!< convert RGB/BGR to CIE XYZ, @ref color_convert_rgb_xyz "color conversions"
-    COLOR_RGB2XYZ      = 33,
-    COLOR_XYZ2BGR      = 34,
-    COLOR_XYZ2RGB      = 35,
-
-    COLOR_BGR2YCrCb    = 36, //!< convert RGB/BGR to luma-chroma (aka YCC), @ref color_convert_rgb_ycrcb "color conversions"
-    COLOR_RGB2YCrCb    = 37,
-    COLOR_YCrCb2BGR    = 38,
-    COLOR_YCrCb2RGB    = 39,
-
-    COLOR_BGR2HSV      = 40, //!< convert RGB/BGR to HSV (hue saturation value) with H range 0..180 if 8 bit image, @ref color_convert_rgb_hsv "color conversions"
-    COLOR_RGB2HSV      = 41,
-
-    COLOR_BGR2Lab      = 44, //!< convert RGB/BGR to CIE Lab, @ref color_convert_rgb_lab "color conversions"
-    COLOR_RGB2Lab      = 45,
-
-    COLOR_BGR2Luv      = 50, //!< convert RGB/BGR to CIE Luv, @ref color_convert_rgb_luv "color conversions"
-    COLOR_RGB2Luv      = 51,
-    COLOR_BGR2HLS      = 52, //!< convert RGB/BGR to HLS (hue lightness saturation) with H range 0..180 if 8 bit image, @ref color_convert_rgb_hls "color conversions"
-    COLOR_RGB2HLS      = 53,
-
-    COLOR_HSV2BGR      = 54, //!< backward conversions HSV to RGB/BGR with H range 0..180 if 8 bit image
-    COLOR_HSV2RGB      = 55,
-
-    COLOR_Lab2BGR      = 56,
-    COLOR_Lab2RGB      = 57,
-    COLOR_Luv2BGR      = 58,
-    COLOR_Luv2RGB      = 59,
-    COLOR_HLS2BGR      = 60, //!< backward conversions HLS to RGB/BGR with H range 0..180 if 8 bit image
-    COLOR_HLS2RGB      = 61,
-
-    COLOR_BGR2HSV_FULL = 66, //!< convert RGB/BGR to HSV (hue saturation value) with H range 0..255 if 8 bit image, @ref color_convert_rgb_hsv "color conversions"
-    COLOR_RGB2HSV_FULL = 67,
-    COLOR_BGR2HLS_FULL = 68, //!< convert RGB/BGR to HLS (hue lightness saturation) with H range 0..255 if 8 bit image, @ref color_convert_rgb_hls "color conversions"
-    COLOR_RGB2HLS_FULL = 69,
-
-    COLOR_HSV2BGR_FULL = 70, //!< backward conversions HSV to RGB/BGR with H range 0..255 if 8 bit image
-    COLOR_HSV2RGB_FULL = 71,
-    COLOR_HLS2BGR_FULL = 72, //!< backward conversions HLS to RGB/BGR with H range 0..255 if 8 bit image
-    COLOR_HLS2RGB_FULL = 73,
-
-    COLOR_LBGR2Lab     = 74,
-    COLOR_LRGB2Lab     = 75,
-    COLOR_LBGR2Luv     = 76,
-    COLOR_LRGB2Luv     = 77,
-
-    COLOR_Lab2LBGR     = 78,
-    COLOR_Lab2LRGB     = 79,
-    COLOR_Luv2LBGR     = 80,
-    COLOR_Luv2LRGB     = 81,
-
-    COLOR_BGR2YUV      = 82, //!< convert between RGB/BGR and YUV
-    COLOR_RGB2YUV      = 83,
-    COLOR_YUV2BGR      = 84,
-    COLOR_YUV2RGB      = 85,
-
-    //! YUV 4:2:0 family to RGB
-    COLOR_YUV2RGB_NV12  = 90,
-    COLOR_YUV2BGR_NV12  = 91,
-    COLOR_YUV2RGB_NV21  = 92,
-    COLOR_YUV2BGR_NV21  = 93,
-    COLOR_YUV420sp2RGB  = COLOR_YUV2RGB_NV21,
-    COLOR_YUV420sp2BGR  = COLOR_YUV2BGR_NV21,
-
-    COLOR_YUV2RGBA_NV12 = 94,
-    COLOR_YUV2BGRA_NV12 = 95,
-    COLOR_YUV2RGBA_NV21 = 96,
-    COLOR_YUV2BGRA_NV21 = 97,
-    COLOR_YUV420sp2RGBA = COLOR_YUV2RGBA_NV21,
-    COLOR_YUV420sp2BGRA = COLOR_YUV2BGRA_NV21,
-
-    COLOR_YUV2RGB_YV12  = 98,
-    COLOR_YUV2BGR_YV12  = 99,
-    COLOR_YUV2RGB_IYUV  = 100,
-    COLOR_YUV2BGR_IYUV  = 101,
-    COLOR_YUV2RGB_I420  = COLOR_YUV2RGB_IYUV,
-    COLOR_YUV2BGR_I420  = COLOR_YUV2BGR_IYUV,
-    COLOR_YUV420p2RGB   = COLOR_YUV2RGB_YV12,
-    COLOR_YUV420p2BGR   = COLOR_YUV2BGR_YV12,
-
-    COLOR_YUV2RGBA_YV12 = 102,
-    COLOR_YUV2BGRA_YV12 = 103,
-    COLOR_YUV2RGBA_IYUV = 104,
-    COLOR_YUV2BGRA_IYUV = 105,
-    COLOR_YUV2RGBA_I420 = COLOR_YUV2RGBA_IYUV,
-    COLOR_YUV2BGRA_I420 = COLOR_YUV2BGRA_IYUV,
-    COLOR_YUV420p2RGBA  = COLOR_YUV2RGBA_YV12,
-    COLOR_YUV420p2BGRA  = COLOR_YUV2BGRA_YV12,
-
-    COLOR_YUV2GRAY_420  = 106,
-    COLOR_YUV2GRAY_NV21 = COLOR_YUV2GRAY_420,
-    COLOR_YUV2GRAY_NV12 = COLOR_YUV2GRAY_420,
-    COLOR_YUV2GRAY_YV12 = COLOR_YUV2GRAY_420,
-    COLOR_YUV2GRAY_IYUV = COLOR_YUV2GRAY_420,
-    COLOR_YUV2GRAY_I420 = COLOR_YUV2GRAY_420,
-    COLOR_YUV420sp2GRAY = COLOR_YUV2GRAY_420,
-    COLOR_YUV420p2GRAY  = COLOR_YUV2GRAY_420,
-
-    //! YUV 4:2:2 family to RGB
-    COLOR_YUV2RGB_UYVY = 107,
-    COLOR_YUV2BGR_UYVY = 108,
-    //COLOR_YUV2RGB_VYUY = 109,
-    //COLOR_YUV2BGR_VYUY = 110,
-    COLOR_YUV2RGB_Y422 = COLOR_YUV2RGB_UYVY,
-    COLOR_YUV2BGR_Y422 = COLOR_YUV2BGR_UYVY,
-    COLOR_YUV2RGB_UYNV = COLOR_YUV2RGB_UYVY,
-    COLOR_YUV2BGR_UYNV = COLOR_YUV2BGR_UYVY,
-
-    COLOR_YUV2RGBA_UYVY = 111,
-    COLOR_YUV2BGRA_UYVY = 112,
-    //COLOR_YUV2RGBA_VYUY = 113,
-    //COLOR_YUV2BGRA_VYUY = 114,
-    COLOR_YUV2RGBA_Y422 = COLOR_YUV2RGBA_UYVY,
-    COLOR_YUV2BGRA_Y422 = COLOR_YUV2BGRA_UYVY,
-    COLOR_YUV2RGBA_UYNV = COLOR_YUV2RGBA_UYVY,
-    COLOR_YUV2BGRA_UYNV = COLOR_YUV2BGRA_UYVY,
-
-    COLOR_YUV2RGB_YUY2 = 115,
-    COLOR_YUV2BGR_YUY2 = 116,
-    COLOR_YUV2RGB_YVYU = 117,
-    COLOR_YUV2BGR_YVYU = 118,
-    COLOR_YUV2RGB_YUYV = COLOR_YUV2RGB_YUY2,
-    COLOR_YUV2BGR_YUYV = COLOR_YUV2BGR_YUY2,
-    COLOR_YUV2RGB_YUNV = COLOR_YUV2RGB_YUY2,
-    COLOR_YUV2BGR_YUNV = COLOR_YUV2BGR_YUY2,
-
-    COLOR_YUV2RGBA_YUY2 = 119,
-    COLOR_YUV2BGRA_YUY2 = 120,
-    COLOR_YUV2RGBA_YVYU = 121,
-    COLOR_YUV2BGRA_YVYU = 122,
-    COLOR_YUV2RGBA_YUYV = COLOR_YUV2RGBA_YUY2,
-    COLOR_YUV2BGRA_YUYV = COLOR_YUV2BGRA_YUY2,
-    COLOR_YUV2RGBA_YUNV = COLOR_YUV2RGBA_YUY2,
-    COLOR_YUV2BGRA_YUNV = COLOR_YUV2BGRA_YUY2,
-
-    COLOR_YUV2GRAY_UYVY = 123,
-    COLOR_YUV2GRAY_YUY2 = 124,
-    //CV_YUV2GRAY_VYUY    = CV_YUV2GRAY_UYVY,
-    COLOR_YUV2GRAY_Y422 = COLOR_YUV2GRAY_UYVY,
-    COLOR_YUV2GRAY_UYNV = COLOR_YUV2GRAY_UYVY,
-    COLOR_YUV2GRAY_YVYU = COLOR_YUV2GRAY_YUY2,
-    COLOR_YUV2GRAY_YUYV = COLOR_YUV2GRAY_YUY2,
-    COLOR_YUV2GRAY_YUNV = COLOR_YUV2GRAY_YUY2,
-
-    //! alpha premultiplication
-    COLOR_RGBA2mRGBA    = 125,
-    COLOR_mRGBA2RGBA    = 126,
-
-    //! RGB to YUV 4:2:0 family
-    COLOR_RGB2YUV_I420  = 127,
-    COLOR_BGR2YUV_I420  = 128,
-    COLOR_RGB2YUV_IYUV  = COLOR_RGB2YUV_I420,
-    COLOR_BGR2YUV_IYUV  = COLOR_BGR2YUV_I420,
-
-    COLOR_RGBA2YUV_I420 = 129,
-    COLOR_BGRA2YUV_I420 = 130,
-    COLOR_RGBA2YUV_IYUV = COLOR_RGBA2YUV_I420,
-    COLOR_BGRA2YUV_IYUV = COLOR_BGRA2YUV_I420,
-    COLOR_RGB2YUV_YV12  = 131,
-    COLOR_BGR2YUV_YV12  = 132,
-    COLOR_RGBA2YUV_YV12 = 133,
-    COLOR_BGRA2YUV_YV12 = 134,
-
-    //! Demosaicing, see @ref color_convert_bayer "color conversions" for additional information
-    COLOR_BayerBG2BGR = 46, //!< equivalent to RGGB Bayer pattern
-    COLOR_BayerGB2BGR = 47, //!< equivalent to GRBG Bayer pattern
-    COLOR_BayerRG2BGR = 48, //!< equivalent to BGGR Bayer pattern
-    COLOR_BayerGR2BGR = 49, //!< equivalent to GBRG Bayer pattern
-
-    COLOR_BayerRGGB2BGR = COLOR_BayerBG2BGR,
-    COLOR_BayerGRBG2BGR = COLOR_BayerGB2BGR,
-    COLOR_BayerBGGR2BGR = COLOR_BayerRG2BGR,
-    COLOR_BayerGBRG2BGR = COLOR_BayerGR2BGR,
-
-    COLOR_BayerRGGB2RGB = COLOR_BayerBGGR2BGR,
-    COLOR_BayerGRBG2RGB = COLOR_BayerGBRG2BGR,
-    COLOR_BayerBGGR2RGB = COLOR_BayerRGGB2BGR,
-    COLOR_BayerGBRG2RGB = COLOR_BayerGRBG2BGR,
-
-    COLOR_BayerBG2RGB = COLOR_BayerRG2BGR, //!< equivalent to RGGB Bayer pattern
-    COLOR_BayerGB2RGB = COLOR_BayerGR2BGR, //!< equivalent to GRBG Bayer pattern
-    COLOR_BayerRG2RGB = COLOR_BayerBG2BGR, //!< equivalent to BGGR Bayer pattern
-    COLOR_BayerGR2RGB = COLOR_BayerGB2BGR, //!< equivalent to GBRG Bayer pattern
-
-    COLOR_BayerBG2GRAY = 86, //!< equivalent to RGGB Bayer pattern
-    COLOR_BayerGB2GRAY = 87, //!< equivalent to GRBG Bayer pattern
-    COLOR_BayerRG2GRAY = 88, //!< equivalent to BGGR Bayer pattern
-    COLOR_BayerGR2GRAY = 89, //!< equivalent to GBRG Bayer pattern
-
-    COLOR_BayerRGGB2GRAY = COLOR_BayerBG2GRAY,
-    COLOR_BayerGRBG2GRAY = COLOR_BayerGB2GRAY,
-    COLOR_BayerBGGR2GRAY = COLOR_BayerRG2GRAY,
-    COLOR_BayerGBRG2GRAY = COLOR_BayerGR2GRAY,
-
-    //! Demosaicing using Variable Number of Gradients
-    COLOR_BayerBG2BGR_VNG = 62, //!< equivalent to RGGB Bayer pattern
-    COLOR_BayerGB2BGR_VNG = 63, //!< equivalent to GRBG Bayer pattern
-    COLOR_BayerRG2BGR_VNG = 64, //!< equivalent to BGGR Bayer pattern
-    COLOR_BayerGR2BGR_VNG = 65, //!< equivalent to GBRG Bayer pattern
-
-    COLOR_BayerRGGB2BGR_VNG = COLOR_BayerBG2BGR_VNG,
-    COLOR_BayerGRBG2BGR_VNG = COLOR_BayerGB2BGR_VNG,
-    COLOR_BayerBGGR2BGR_VNG = COLOR_BayerRG2BGR_VNG,
-    COLOR_BayerGBRG2BGR_VNG = COLOR_BayerGR2BGR_VNG,
-
-    COLOR_BayerRGGB2RGB_VNG = COLOR_BayerBGGR2BGR_VNG,
-    COLOR_BayerGRBG2RGB_VNG = COLOR_BayerGBRG2BGR_VNG,
-    COLOR_BayerBGGR2RGB_VNG = COLOR_BayerRGGB2BGR_VNG,
-    COLOR_BayerGBRG2RGB_VNG = COLOR_BayerGRBG2BGR_VNG,
-
-    COLOR_BayerBG2RGB_VNG = COLOR_BayerRG2BGR_VNG, //!< equivalent to RGGB Bayer pattern
-    COLOR_BayerGB2RGB_VNG = COLOR_BayerGR2BGR_VNG, //!< equivalent to GRBG Bayer pattern
-    COLOR_BayerRG2RGB_VNG = COLOR_BayerBG2BGR_VNG, //!< equivalent to BGGR Bayer pattern
-    COLOR_BayerGR2RGB_VNG = COLOR_BayerGB2BGR_VNG, //!< equivalent to GBRG Bayer pattern
-
-    //! Edge-Aware Demosaicing
-    COLOR_BayerBG2BGR_EA  = 135, //!< equivalent to RGGB Bayer pattern
-    COLOR_BayerGB2BGR_EA  = 136, //!< equivalent to GRBG Bayer pattern
-    COLOR_BayerRG2BGR_EA  = 137, //!< equivalent to BGGR Bayer pattern
-    COLOR_BayerGR2BGR_EA  = 138, //!< equivalent to GBRG Bayer pattern
-
-    COLOR_BayerRGGB2BGR_EA  = COLOR_BayerBG2BGR_EA,
-    COLOR_BayerGRBG2BGR_EA  = COLOR_BayerGB2BGR_EA,
-    COLOR_BayerBGGR2BGR_EA  = COLOR_BayerRG2BGR_EA,
-    COLOR_BayerGBRG2BGR_EA  = COLOR_BayerGR2BGR_EA,
-
-    COLOR_BayerRGGB2RGB_EA  = COLOR_BayerBGGR2BGR_EA,
-    COLOR_BayerGRBG2RGB_EA  = COLOR_BayerGBRG2BGR_EA,
-    COLOR_BayerBGGR2RGB_EA  = COLOR_BayerRGGB2BGR_EA,
-    COLOR_BayerGBRG2RGB_EA  = COLOR_BayerGRBG2BGR_EA,
-
-    COLOR_BayerBG2RGB_EA  = COLOR_BayerRG2BGR_EA, //!< equivalent to RGGB Bayer pattern
-    COLOR_BayerGB2RGB_EA  = COLOR_BayerGR2BGR_EA, //!< equivalent to GRBG Bayer pattern
-    COLOR_BayerRG2RGB_EA  = COLOR_BayerBG2BGR_EA, //!< equivalent to BGGR Bayer pattern
-    COLOR_BayerGR2RGB_EA  = COLOR_BayerGB2BGR_EA, //!< equivalent to GBRG Bayer pattern
-
-    //! Demosaicing with alpha channel
-    COLOR_BayerBG2BGRA = 139, //!< equivalent to RGGB Bayer pattern
-    COLOR_BayerGB2BGRA = 140, //!< equivalent to GRBG Bayer pattern
-    COLOR_BayerRG2BGRA = 141, //!< equivalent to BGGR Bayer pattern
-    COLOR_BayerGR2BGRA = 142, //!< equivalent to GBRG Bayer pattern
-
-    COLOR_BayerRGGB2BGRA = COLOR_BayerBG2BGRA,
-    COLOR_BayerGRBG2BGRA = COLOR_BayerGB2BGRA,
-    COLOR_BayerBGGR2BGRA = COLOR_BayerRG2BGRA,
-    COLOR_BayerGBRG2BGRA = COLOR_BayerGR2BGRA,
-
-    COLOR_BayerRGGB2RGBA = COLOR_BayerBGGR2BGRA,
-    COLOR_BayerGRBG2RGBA = COLOR_BayerGBRG2BGRA,
-    COLOR_BayerBGGR2RGBA = COLOR_BayerRGGB2BGRA,
-    COLOR_BayerGBRG2RGBA = COLOR_BayerGRBG2BGRA,
-
-    COLOR_BayerBG2RGBA = COLOR_BayerRG2BGRA, //!< equivalent to RGGB Bayer pattern
-    COLOR_BayerGB2RGBA = COLOR_BayerGR2BGRA, //!< equivalent to GRBG Bayer pattern
-    COLOR_BayerRG2RGBA = COLOR_BayerBG2BGRA, //!< equivalent to BGGR Bayer pattern
-    COLOR_BayerGR2RGBA = COLOR_BayerGB2BGRA, //!< equivalent to GBRG Bayer pattern
-
-    COLOR_COLORCVT_MAX  = 143
-};
-
-//! @addtogroup imgproc_shape
-//! @{
-
-//! types of intersection between rectangles
-enum RectanglesIntersectTypes {
-    INTERSECT_NONE = 0, //!< No intersection
-    INTERSECT_PARTIAL  = 1, //!< There is a partial intersection
-    INTERSECT_FULL  = 2 //!< One of the rectangle is fully enclosed in the other
-};
-
-/** types of line
-@ingroup imgproc_draw
-*/
-enum LineTypes {
-    FILLED  = -1,
-    LINE_4  = 4, //!< 4-connected line
-    LINE_8  = 8, //!< 8-connected line
-    LINE_AA = 16 //!< antialiased line
-};
-
-/** Only a subset of Hershey fonts <https://en.wikipedia.org/wiki/Hershey_fonts> are supported
-@ingroup imgproc_draw
-*/
-enum HersheyFonts {
-    FONT_HERSHEY_SIMPLEX        = 0, //!< normal size sans-serif font
-    FONT_HERSHEY_PLAIN          = 1, //!< small size sans-serif font
-    FONT_HERSHEY_DUPLEX         = 2, //!< normal size sans-serif font (more complex than FONT_HERSHEY_SIMPLEX)
-    FONT_HERSHEY_COMPLEX        = 3, //!< normal size serif font
-    FONT_HERSHEY_TRIPLEX        = 4, //!< normal size serif font (more complex than FONT_HERSHEY_COMPLEX)
-    FONT_HERSHEY_COMPLEX_SMALL  = 5, //!< smaller version of FONT_HERSHEY_COMPLEX
-    FONT_HERSHEY_SCRIPT_SIMPLEX = 6, //!< hand-writing style font
-    FONT_HERSHEY_SCRIPT_COMPLEX = 7, //!< more complex variant of FONT_HERSHEY_SCRIPT_SIMPLEX
-    FONT_ITALIC                 = 16 //!< flag for italic font
-};
-
-/** Possible set of marker types used for the cv::drawMarker function
-@ingroup imgproc_draw
-*/
-enum MarkerTypes
-{
-    MARKER_CROSS = 0,           //!< A crosshair marker shape
-    MARKER_TILTED_CROSS = 1,    //!< A 45 degree tilted crosshair marker shape
-    MARKER_STAR = 2,            //!< A star marker shape, combination of cross and tilted cross
-    MARKER_DIAMOND = 3,         //!< A diamond marker shape
-    MARKER_SQUARE = 4,          //!< A square marker shape
-    MARKER_TRIANGLE_UP = 5,     //!< An upwards pointing triangle marker shape
-    MARKER_TRIANGLE_DOWN = 6    //!< A downwards pointing triangle marker shape
-};
-
-/** @brief finds arbitrary template in the grayscale image using Generalized Hough Transform
-*/
-class CV_EXPORTS_W GeneralizedHough : public Algorithm
-{
-public:
-    //! set template to search
-    CV_WRAP virtual void setTemplate(InputArray templ, Point templCenter = Point(-1, -1)) = 0;
-    CV_WRAP virtual void setTemplate(InputArray edges, InputArray dx, InputArray dy, Point templCenter = Point(-1, -1)) = 0;
-
-    //! find template on image
-    CV_WRAP virtual void detect(InputArray image, OutputArray positions, OutputArray votes = noArray()) = 0;
-    CV_WRAP virtual void detect(InputArray edges, InputArray dx, InputArray dy, OutputArray positions, OutputArray votes = noArray()) = 0;
-
-    //! Canny low threshold.
-    CV_WRAP virtual void setCannyLowThresh(int cannyLowThresh) = 0;
-    CV_WRAP virtual int getCannyLowThresh() const = 0;
-
-    //! Canny high threshold.
-    CV_WRAP virtual void setCannyHighThresh(int cannyHighThresh) = 0;
-    CV_WRAP virtual int getCannyHighThresh() const = 0;
-
-    //! Minimum distance between the centers of the detected objects.
-    CV_WRAP virtual void setMinDist(double minDist) = 0;
-    CV_WRAP virtual double getMinDist() const = 0;
-
-    //! Inverse ratio of the accumulator resolution to the image resolution.
-    CV_WRAP virtual void setDp(double dp) = 0;
-    CV_WRAP virtual double getDp() const = 0;
-
-    //! Maximal size of inner buffers.
-    CV_WRAP virtual void setMaxBufferSize(int maxBufferSize) = 0;
-    CV_WRAP virtual int getMaxBufferSize() const = 0;
-};
-
-/** @brief finds arbitrary template in the grayscale image using Generalized Hough Transform
-
-Detects position only without translation and rotation @cite Ballard1981 .
-*/
-class CV_EXPORTS_W GeneralizedHoughBallard : public GeneralizedHough
-{
-public:
-    //! R-Table levels.
-    CV_WRAP virtual void setLevels(int levels) = 0;
-    CV_WRAP virtual int getLevels() const = 0;
-
-    //! The accumulator threshold for the template centers at the detection stage. The smaller it is, the more false positions may be detected.
-    CV_WRAP virtual void setVotesThreshold(int votesThreshold) = 0;
-    CV_WRAP virtual int getVotesThreshold() const = 0;
-};
-
-/** @brief finds arbitrary template in the grayscale image using Generalized Hough Transform
-
-Detects position, translation and rotation @cite Guil1999 .
-*/
-class CV_EXPORTS_W GeneralizedHoughGuil : public GeneralizedHough
-{
-public:
-    //! Angle difference in degrees between two points in feature.
-    CV_WRAP virtual void setXi(double xi) = 0;
-    CV_WRAP virtual double getXi() const = 0;
-
-    //! Feature table levels.
-    CV_WRAP virtual void setLevels(int levels) = 0;
-    CV_WRAP virtual int getLevels() const = 0;
-
-    //! Maximal difference between angles that treated as equal.
-    CV_WRAP virtual void setAngleEpsilon(double angleEpsilon) = 0;
-    CV_WRAP virtual double getAngleEpsilon() const = 0;
-
-    //! Minimal rotation angle to detect in degrees.
-    CV_WRAP virtual void setMinAngle(double minAngle) = 0;
-    CV_WRAP virtual double getMinAngle() const = 0;
-
-    //! Maximal rotation angle to detect in degrees.
-    CV_WRAP virtual void setMaxAngle(double maxAngle) = 0;
-    CV_WRAP virtual double getMaxAngle() const = 0;
-
-    //! Angle step in degrees.
-    CV_WRAP virtual void setAngleStep(double angleStep) = 0;
-    CV_WRAP virtual double getAngleStep() const = 0;
-
-    //! Angle votes threshold.
-    CV_WRAP virtual void setAngleThresh(int angleThresh) = 0;
-    CV_WRAP virtual int getAngleThresh() const = 0;
-
-    //! Minimal scale to detect.
-    CV_WRAP virtual void setMinScale(double minScale) = 0;
-    CV_WRAP virtual double getMinScale() const = 0;
-
-    //! Maximal scale to detect.
-    CV_WRAP virtual void setMaxScale(double maxScale) = 0;
-    CV_WRAP virtual double getMaxScale() const = 0;
-
-    //! Scale step.
-    CV_WRAP virtual void setScaleStep(double scaleStep) = 0;
-    CV_WRAP virtual double getScaleStep() const = 0;
-
-    //! Scale votes threshold.
-    CV_WRAP virtual void setScaleThresh(int scaleThresh) = 0;
-    CV_WRAP virtual int getScaleThresh() const = 0;
-
-    //! Position votes threshold.
-    CV_WRAP virtual void setPosThresh(int posThresh) = 0;
-    CV_WRAP virtual int getPosThresh() const = 0;
-};
-
-//! @} imgproc_shape
-
-//! @addtogroup imgproc_hist
-//! @{
-
-/** @brief Base class for Contrast Limited Adaptive Histogram Equalization.
-*/
-class CV_EXPORTS_W CLAHE : public Algorithm
-{
-public:
-    /** @brief Equalizes the histogram of a grayscale image using Contrast Limited Adaptive Histogram Equalization.
-
-    @param src Source image of type CV_8UC1 or CV_16UC1.
-    @param dst Destination image.
-     */
-    CV_WRAP virtual void apply(InputArray src, OutputArray dst) = 0;
-
-    /** @brief Sets threshold for contrast limiting.
-
-    @param clipLimit threshold value.
-    */
-    CV_WRAP virtual void setClipLimit(double clipLimit) = 0;
-
-    //! Returns threshold value for contrast limiting.
-    CV_WRAP virtual double getClipLimit() const = 0;
-
-    /** @brief Sets size of grid for histogram equalization. Input image will be divided into
-    equally sized rectangular tiles.
-
-    @param tileGridSize defines the number of tiles in row and column.
-    */
-    CV_WRAP virtual void setTilesGridSize(Size tileGridSize) = 0;
-
-    //!@brief Returns Size defines the number of tiles in row and column.
-    CV_WRAP virtual Size getTilesGridSize() const = 0;
-
-    CV_WRAP virtual void collectGarbage() = 0;
-};
-
-//! @} imgproc_hist
-
-//! @addtogroup imgproc_subdiv2d
-//! @{
-
-class CV_EXPORTS_W Subdiv2D
-{
-public:
-    /** Subdiv2D point location cases */
-    enum { PTLOC_ERROR        = -2, //!< Point location error
-           PTLOC_OUTSIDE_RECT = -1, //!< Point outside the subdivision bounding rect
-           PTLOC_INSIDE       = 0, //!< Point inside some facet
-           PTLOC_VERTEX       = 1, //!< Point coincides with one of the subdivision vertices
-           PTLOC_ON_EDGE      = 2  //!< Point on some edge
-         };
-
-    /** Subdiv2D edge type navigation (see: getEdge()) */
-    enum { NEXT_AROUND_ORG   = 0x00,
-           NEXT_AROUND_DST   = 0x22,
-           PREV_AROUND_ORG   = 0x11,
-           PREV_AROUND_DST   = 0x33,
-           NEXT_AROUND_LEFT  = 0x13,
-           NEXT_AROUND_RIGHT = 0x31,
-           PREV_AROUND_LEFT  = 0x20,
-           PREV_AROUND_RIGHT = 0x02
-         };
-
-    /** creates an empty Subdiv2D object.
-    To create a new empty Delaunay subdivision you need to use the #initDelaunay function.
-     */
-    CV_WRAP Subdiv2D();
-
-    /** @overload
-
-    @param rect Rectangle that includes all of the 2D points that are to be added to the subdivision.
-
-    The function creates an empty Delaunay subdivision where 2D points can be added using the function
-    insert() . All of the points to be added must be within the specified rectangle, otherwise a runtime
-    error is raised.
-     */
-    CV_WRAP Subdiv2D(Rect rect);
-
-    /** @brief Creates a new empty Delaunay subdivision
-
-    @param rect Rectangle that includes all of the 2D points that are to be added to the subdivision.
-
-     */
-    CV_WRAP void initDelaunay(Rect rect);
-
-    /** @brief Insert a single point into a Delaunay triangulation.
-
-    @param pt Point to insert.
-
-    The function inserts a single point into a subdivision and modifies the subdivision topology
-    appropriately. If a point with the same coordinates exists already, no new point is added.
-    @returns the ID of the point.
-
-    @note If the point is outside of the triangulation specified rect a runtime error is raised.
-     */
-    CV_WRAP int insert(Point2f pt);
-
-    /** @brief Insert multiple points into a Delaunay triangulation.
-
-    @param ptvec Points to insert.
-
-    The function inserts a vector of points into a subdivision and modifies the subdivision topology
-    appropriately.
-     */
-    CV_WRAP void insert(const std::vector<Point2f>& ptvec);
-
-    /** @brief Returns the location of a point within a Delaunay triangulation.
-
-    @param pt Point to locate.
-    @param edge Output edge that the point belongs to or is located to the right of it.
-    @param vertex Optional output vertex the input point coincides with.
-
-    The function locates the input point within the subdivision and gives one of the triangle edges
-    or vertices.
-
-    @returns an integer which specify one of the following five cases for point location:
-    -  The point falls into some facet. The function returns #PTLOC_INSIDE and edge will contain one of
-       edges of the facet.
-    -  The point falls onto the edge. The function returns #PTLOC_ON_EDGE and edge will contain this edge.
-    -  The point coincides with one of the subdivision vertices. The function returns #PTLOC_VERTEX and
-       vertex will contain a pointer to the vertex.
-    -  The point is outside the subdivision reference rectangle. The function returns #PTLOC_OUTSIDE_RECT
-       and no pointers are filled.
-    -  One of input arguments is invalid. A runtime error is raised or, if silent or "parent" error
-       processing mode is selected, #PTLOC_ERROR is returned.
-     */
-    CV_WRAP int locate(Point2f pt, CV_OUT int& edge, CV_OUT int& vertex);
-
-    /** @brief Finds the subdivision vertex closest to the given point.
-
-    @param pt Input point.
-    @param nearestPt Output subdivision vertex point.
-
-    The function is another function that locates the input point within the subdivision. It finds the
-    subdivision vertex that is the closest to the input point. It is not necessarily one of vertices
-    of the facet containing the input point, though the facet (located using locate() ) is used as a
-    starting point.
-
-    @returns vertex ID.
-     */
-    CV_WRAP int findNearest(Point2f pt, CV_OUT Point2f* nearestPt = 0);
-
-    /** @brief Returns a list of all edges.
-
-    @param edgeList Output vector.
-
-    The function gives each edge as a 4 numbers vector, where each two are one of the edge
-    vertices. i.e. org_x = v[0], org_y = v[1], dst_x = v[2], dst_y = v[3].
-     */
-    CV_WRAP void getEdgeList(CV_OUT std::vector<Vec4f>& edgeList) const;
-
-    /** @brief Returns a list of the leading edge ID connected to each triangle.
-
-    @param leadingEdgeList Output vector.
-
-    The function gives one edge ID for each triangle.
-     */
-    CV_WRAP void getLeadingEdgeList(CV_OUT std::vector<int>& leadingEdgeList) const;
-
-    /** @brief Returns a list of all triangles.
-
-    @param triangleList Output vector.
-
-    The function gives each triangle as a 6 numbers vector, where each two are one of the triangle
-    vertices. i.e. p1_x = v[0], p1_y = v[1], p2_x = v[2], p2_y = v[3], p3_x = v[4], p3_y = v[5].
-     */
-    CV_WRAP void getTriangleList(CV_OUT std::vector<Vec6f>& triangleList) const;
-
-    /** @brief Returns a list of all Voronoi facets.
-
-    @param idx Vector of vertices IDs to consider. For all vertices you can pass empty vector.
-    @param facetList Output vector of the Voronoi facets.
-    @param facetCenters Output vector of the Voronoi facets center points.
-
-     */
-    CV_WRAP void getVoronoiFacetList(const std::vector<int>& idx, CV_OUT std::vector<std::vector<Point2f> >& facetList,
-                                     CV_OUT std::vector<Point2f>& facetCenters);
-
-    /** @brief Returns vertex location from vertex ID.
-
-    @param vertex vertex ID.
-    @param firstEdge Optional. The first edge ID which is connected to the vertex.
-    @returns vertex (x,y)
-
-     */
-    CV_WRAP Point2f getVertex(int vertex, CV_OUT int* firstEdge = 0) const;
-
-    /** @brief Returns one of the edges related to the given edge.
-
-    @param edge Subdivision edge ID.
-    @param nextEdgeType Parameter specifying which of the related edges to return.
-    The following values are possible:
-    -   NEXT_AROUND_ORG next around the edge origin ( eOnext on the picture below if e is the input edge)
-    -   NEXT_AROUND_DST next around the edge vertex ( eDnext )
-    -   PREV_AROUND_ORG previous around the edge origin (reversed eRnext )
-    -   PREV_AROUND_DST previous around the edge destination (reversed eLnext )
-    -   NEXT_AROUND_LEFT next around the left facet ( eLnext )
-    -   NEXT_AROUND_RIGHT next around the right facet ( eRnext )
-    -   PREV_AROUND_LEFT previous around the left facet (reversed eOnext )
-    -   PREV_AROUND_RIGHT previous around the right facet (reversed eDnext )
-
-    ![sample output](pics/quadedge.png)
-
-    @returns edge ID related to the input edge.
-     */
-    CV_WRAP int getEdge( int edge, int nextEdgeType ) const;
-
-    /** @brief Returns next edge around the edge origin.
-
-    @param edge Subdivision edge ID.
-
-    @returns an integer which is next edge ID around the edge origin: eOnext on the
-    picture above if e is the input edge).
-     */
-    CV_WRAP int nextEdge(int edge) const;
-
-    /** @brief Returns another edge of the same quad-edge.
-
-    @param edge Subdivision edge ID.
-    @param rotate Parameter specifying which of the edges of the same quad-edge as the input
-    one to return. The following values are possible:
-    -   0 - the input edge ( e on the picture below if e is the input edge)
-    -   1 - the rotated edge ( eRot )
-    -   2 - the reversed edge (reversed e (in green))
-    -   3 - the reversed rotated edge (reversed eRot (in green))
-
-    @returns one of the edges ID of the same quad-edge as the input edge.
-     */
-    CV_WRAP int rotateEdge(int edge, int rotate) const;
-    CV_WRAP int symEdge(int edge) const;
-
-    /** @brief Returns the edge origin.
-
-    @param edge Subdivision edge ID.
-    @param orgpt Output vertex location.
-
-    @returns vertex ID.
-     */
-    CV_WRAP int edgeOrg(int edge, CV_OUT Point2f* orgpt = 0) const;
-
-    /** @brief Returns the edge destination.
-
-    @param edge Subdivision edge ID.
-    @param dstpt Output vertex location.
-
-    @returns vertex ID.
-     */
-    CV_WRAP int edgeDst(int edge, CV_OUT Point2f* dstpt = 0) const;
-
-protected:
-    int newEdge();
-    void deleteEdge(int edge);
-    int newPoint(Point2f pt, bool isvirtual, int firstEdge = 0);
-    void deletePoint(int vtx);
-    void setEdgePoints( int edge, int orgPt, int dstPt );
-    void splice( int edgeA, int edgeB );
-    int connectEdges( int edgeA, int edgeB );
-    void swapEdges( int edge );
-    int isRightOf(Point2f pt, int edge) const;
-    void calcVoronoi();
-    void clearVoronoi();
-    void checkSubdiv() const;
-
-    struct CV_EXPORTS Vertex
-    {
-        Vertex();
-        Vertex(Point2f pt, bool isvirtual, int firstEdge=0);
-        bool isvirtual() const;
-        bool isfree() const;
-
-        int firstEdge;
-        int type;
-        Point2f pt;
-    };
-
-    struct CV_EXPORTS QuadEdge
-    {
-        QuadEdge();
-        QuadEdge(int edgeidx);
-        bool isfree() const;
-
-        int next[4];
-        int pt[4];
-    };
-
-    //! All of the vertices
-    std::vector<Vertex> vtx;
-    //! All of the edges
-    std::vector<QuadEdge> qedges;
-    int freeQEdge;
-    int freePoint;
-    bool validGeometry;
-
-    int recentEdge;
-    //! Top left corner of the bounding rect
-    Point2f topLeft;
-    //! Bottom right corner of the bounding rect
-    Point2f bottomRight;
-};
-
-//! @} imgproc_subdiv2d
-
-//! @addtogroup imgproc_feature
-//! @{
-
-/** @example samples/cpp/lsd_lines.cpp
-An example using the LineSegmentDetector
-\image html building_lsd.png "Sample output image" width=434 height=300
-*/
-
-/** @brief Line segment detector class
-
-following the algorithm described at @cite Rafael12 .
-
-@note Implementation has been removed from OpenCV version 3.4.6 to 3.4.15 and version 4.1.0 to 4.5.3 due original code license conflict.
-restored again after [Computation of a NFA](https://github.com/rafael-grompone-von-gioi/binomial_nfa) code published under the MIT license.
-*/
-class CV_EXPORTS_W LineSegmentDetector : public Algorithm
-{
-public:
-
-    /** @brief Finds lines in the input image.
-
-    This is the output of the default parameters of the algorithm on the above shown image.
-
-    ![image](pics/building_lsd.png)
-
-    @param image A grayscale (CV_8UC1) input image. If only a roi needs to be selected, use:
-    `lsd_ptr-\>detect(image(roi), lines, ...); lines += Scalar(roi.x, roi.y, roi.x, roi.y);`
-    @param lines A vector of Vec4f elements specifying the beginning and ending point of a line. Where
-    Vec4f is (x1, y1, x2, y2), point 1 is the start, point 2 - end. Returned lines are strictly
-    oriented depending on the gradient.
-    @param width Vector of widths of the regions, where the lines are found. E.g. Width of line.
-    @param prec Vector of precisions with which the lines are found.
-    @param nfa Vector containing number of false alarms in the line region, with precision of 10%. The
-    bigger the value, logarithmically better the detection.
-    - -1 corresponds to 10 mean false alarms
-    - 0 corresponds to 1 mean false alarm
-    - 1 corresponds to 0.1 mean false alarms
-    This vector will be calculated only when the objects type is #LSD_REFINE_ADV.
-    */
-    CV_WRAP virtual void detect(InputArray image, OutputArray lines,
-                        OutputArray width = noArray(), OutputArray prec = noArray(),
-                        OutputArray nfa = noArray()) = 0;
-
-    /** @brief Draws the line segments on a given image.
-    @param image The image, where the lines will be drawn. Should be bigger or equal to the image,
-    where the lines were found.
-    @param lines A vector of the lines that needed to be drawn.
-     */
-    CV_WRAP virtual void drawSegments(InputOutputArray image, InputArray lines) = 0;
-
-    /** @brief Draws two groups of lines in blue and red, counting the non overlapping (mismatching) pixels.
-
-    @param size The size of the image, where lines1 and lines2 were found.
-    @param lines1 The first group of lines that needs to be drawn. It is visualized in blue color.
-    @param lines2 The second group of lines. They visualized in red color.
-    @param image Optional image, where the lines will be drawn. The image should be color(3-channel)
-    in order for lines1 and lines2 to be drawn in the above mentioned colors.
-     */
-    CV_WRAP virtual int compareSegments(const Size& size, InputArray lines1, InputArray lines2, InputOutputArray image = noArray()) = 0;
-
-    virtual ~LineSegmentDetector() { }
-};
-
-/** @brief Creates a smart pointer to a LineSegmentDetector object and initializes it.
-
-The LineSegmentDetector algorithm is defined using the standard values. Only advanced users may want
-to edit those, as to tailor it for their own application.
-
-@param refine The way found lines will be refined, see #LineSegmentDetectorModes
-@param scale The scale of the image that will be used to find the lines. Range (0..1].
-@param sigma_scale Sigma for Gaussian filter. It is computed as sigma = sigma_scale/scale.
-@param quant Bound to the quantization error on the gradient norm.
-@param ang_th Gradient angle tolerance in degrees.
-@param log_eps Detection threshold: -log10(NFA) \> log_eps. Used only when advance refinement is chosen.
-@param density_th Minimal density of aligned region points in the enclosing rectangle.
-@param n_bins Number of bins in pseudo-ordering of gradient modulus.
- */
-CV_EXPORTS_W Ptr<LineSegmentDetector> createLineSegmentDetector(
-    int refine = LSD_REFINE_STD, double scale = 0.8,
-    double sigma_scale = 0.6, double quant = 2.0, double ang_th = 22.5,
-    double log_eps = 0, double density_th = 0.7, int n_bins = 1024);
-
-//! @} imgproc_feature
-
-//! @addtogroup imgproc_filter
-//! @{
-
-/** @brief Returns Gaussian filter coefficients.
-
-The function computes and returns the \f$\texttt{ksize} \times 1\f$ matrix of Gaussian filter
-coefficients:
-
-\f[G_i= \alpha *e^{-(i-( \texttt{ksize} -1)/2)^2/(2* \texttt{sigma}^2)},\f]
-
-where \f$i=0..\texttt{ksize}-1\f$ and \f$\alpha\f$ is the scale factor chosen so that \f$\sum_i G_i=1\f$.
-
-Two of such generated kernels can be passed to sepFilter2D. Those functions automatically recognize
-smoothing kernels (a symmetrical kernel with sum of weights equal to 1) and handle them accordingly.
-You may also use the higher-level GaussianBlur.
-@param ksize Aperture size. It should be odd ( \f$\texttt{ksize} \mod 2 = 1\f$ ) and positive.
-@param sigma Gaussian standard deviation. If it is non-positive, it is computed from ksize as
-`sigma = 0.3*((ksize-1)*0.5 - 1) + 0.8`.
-@param ktype Type of filter coefficients. It can be CV_32F or CV_64F .
-@sa  sepFilter2D, getDerivKernels, getStructuringElement, GaussianBlur
- */
-CV_EXPORTS_W Mat getGaussianKernel( int ksize, double sigma, int ktype = CV_64F );
-
-/** @brief Returns filter coefficients for computing spatial image derivatives.
-
-The function computes and returns the filter coefficients for spatial image derivatives. When
-`ksize=FILTER_SCHARR`, the Scharr \f$3 \times 3\f$ kernels are generated (see #Scharr). Otherwise, Sobel
-kernels are generated (see #Sobel). The filters are normally passed to #sepFilter2D or to
-
-@param kx Output matrix of row filter coefficients. It has the type ktype .
-@param ky Output matrix of column filter coefficients. It has the type ktype .
-@param dx Derivative order in respect of x.
-@param dy Derivative order in respect of y.
-@param ksize Aperture size. It can be FILTER_SCHARR, 1, 3, 5, or 7.
-@param normalize Flag indicating whether to normalize (scale down) the filter coefficients or not.
-Theoretically, the coefficients should have the denominator \f$=2^{ksize*2-dx-dy-2}\f$. If you are
-going to filter floating-point images, you are likely to use the normalized kernels. But if you
-compute derivatives of an 8-bit image, store the results in a 16-bit image, and wish to preserve
-all the fractional bits, you may want to set normalize=false .
-@param ktype Type of filter coefficients. It can be CV_32f or CV_64F .
- */
-CV_EXPORTS_W void getDerivKernels( OutputArray kx, OutputArray ky,
-                                   int dx, int dy, int ksize,
-                                   bool normalize = false, int ktype = CV_32F );
-
-/** @brief Returns Gabor filter coefficients.
-
-For more details about gabor filter equations and parameters, see: [Gabor
-Filter](http://en.wikipedia.org/wiki/Gabor_filter).
-
-@param ksize Size of the filter returned.
-@param sigma Standard deviation of the gaussian envelope.
-@param theta Orientation of the normal to the parallel stripes of a Gabor function.
-@param lambd Wavelength of the sinusoidal factor.
-@param gamma Spatial aspect ratio.
-@param psi Phase offset.
-@param ktype Type of filter coefficients. It can be CV_32F or CV_64F .
- */
-CV_EXPORTS_W Mat getGaborKernel( Size ksize, double sigma, double theta, double lambd,
-                                 double gamma, double psi = CV_PI*0.5, int ktype = CV_64F );
-
-//! returns "magic" border value for erosion and dilation. It is automatically transformed to Scalar::all(-DBL_MAX) for dilation.
-static inline Scalar morphologyDefaultBorderValue() { return Scalar::all(DBL_MAX); }
-
-/** @brief Returns a structuring element of the specified size and shape for morphological operations.
-
-The function constructs and returns the structuring element that can be further passed to #erode,
-#dilate or #morphologyEx. But you can also construct an arbitrary binary mask yourself and use it as
-the structuring element.
-
-@param shape Element shape that could be one of #MorphShapes
-@param ksize Size of the structuring element.
-@param anchor Anchor position within the element. The default value \f$(-1, -1)\f$ means that the
-anchor is at the center. Note that only the shape of a cross-shaped element depends on the anchor
-position. In other cases the anchor just regulates how much the result of the morphological
-operation is shifted.
- */
-CV_EXPORTS_W Mat getStructuringElement(int shape, Size ksize, Point anchor = Point(-1,-1));
-
-/** @example samples/cpp/tutorial_code/ImgProc/Smoothing/Smoothing.cpp
-Sample code for simple filters
-![Sample screenshot](Smoothing_Tutorial_Result_Median_Filter.jpg)
-Check @ref tutorial_gausian_median_blur_bilateral_filter "the corresponding tutorial" for more details
- */
-
-/** @brief Blurs an image using the median filter.
-
-The function smoothes an image using the median filter with the \f$\texttt{ksize} \times
-\texttt{ksize}\f$ aperture. Each channel of a multi-channel image is processed independently.
-In-place operation is supported.
-
-@note The median filter uses #BORDER_REPLICATE internally to cope with border pixels, see #BorderTypes
-
-@param src input 1-, 3-, or 4-channel image; when ksize is 3 or 5, the image depth should be
-CV_8U, CV_16U, or CV_32F, for larger aperture sizes, it can only be CV_8U.
-@param dst destination array of the same size and type as src.
-@param ksize aperture linear size; it must be odd and greater than 1, for example: 3, 5, 7 ...
-@sa  bilateralFilter, blur, boxFilter, GaussianBlur
- */
-CV_EXPORTS_W void medianBlur( InputArray src, OutputArray dst, int ksize );
-
-/** @brief Blurs an image using a Gaussian filter.
-
-The function convolves the source image with the specified Gaussian kernel. In-place filtering is
-supported.
-
-@param src input image; the image can have any number of channels, which are processed
-independently, but the depth should be CV_8U, CV_16U, CV_16S, CV_32F or CV_64F.
-@param dst output image of the same size and type as src.
-@param ksize Gaussian kernel size. ksize.width and ksize.height can differ but they both must be
-positive and odd. Or, they can be zero's and then they are computed from sigma.
-@param sigmaX Gaussian kernel standard deviation in X direction.
-@param sigmaY Gaussian kernel standard deviation in Y direction; if sigmaY is zero, it is set to be
-equal to sigmaX, if both sigmas are zeros, they are computed from ksize.width and ksize.height,
-respectively (see #getGaussianKernel for details); to fully control the result regardless of
-possible future modifications of all this semantics, it is recommended to specify all of ksize,
-sigmaX, and sigmaY.
-@param borderType pixel extrapolation method, see #BorderTypes. #BORDER_WRAP is not supported.
-
-@sa  sepFilter2D, filter2D, blur, boxFilter, bilateralFilter, medianBlur
- */
-CV_EXPORTS_W void GaussianBlur( InputArray src, OutputArray dst, Size ksize,
-                                double sigmaX, double sigmaY = 0,
-                                int borderType = BORDER_DEFAULT );
-
-/** @brief Applies the bilateral filter to an image.
-
-The function applies bilateral filtering to the input image, as described in
-http://www.dai.ed.ac.uk/CVonline/LOCAL_COPIES/MANDUCHI1/Bilateral_Filtering.html
-bilateralFilter can reduce unwanted noise very well while keeping edges fairly sharp. However, it is
-very slow compared to most filters.
-
-_Sigma values_: For simplicity, you can set the 2 sigma values to be the same. If they are small (\<
-10), the filter will not have much effect, whereas if they are large (\> 150), they will have a very
-strong effect, making the image look "cartoonish".
-
-_Filter size_: Large filters (d \> 5) are very slow, so it is recommended to use d=5 for real-time
-applications, and perhaps d=9 for offline applications that need heavy noise filtering.
-
-This filter does not work inplace.
-@param src Source 8-bit or floating-point, 1-channel or 3-channel image.
-@param dst Destination image of the same size and type as src .
-@param d Diameter of each pixel neighborhood that is used during filtering. If it is non-positive,
-it is computed from sigmaSpace.
-@param sigmaColor Filter sigma in the color space. A larger value of the parameter means that
-farther colors within the pixel neighborhood (see sigmaSpace) will be mixed together, resulting
-in larger areas of semi-equal color.
-@param sigmaSpace Filter sigma in the coordinate space. A larger value of the parameter means that
-farther pixels will influence each other as long as their colors are close enough (see sigmaColor
-). When d\>0, it specifies the neighborhood size regardless of sigmaSpace. Otherwise, d is
-proportional to sigmaSpace.
-@param borderType border mode used to extrapolate pixels outside of the image, see #BorderTypes
- */
-CV_EXPORTS_W void bilateralFilter( InputArray src, OutputArray dst, int d,
-                                   double sigmaColor, double sigmaSpace,
-                                   int borderType = BORDER_DEFAULT );
-
-/** @brief Blurs an image using the box filter.
-
-The function smooths an image using the kernel:
-
-\f[\texttt{K} =  \alpha \begin{bmatrix} 1 & 1 & 1 &  \cdots & 1 & 1  \\ 1 & 1 & 1 &  \cdots & 1 & 1  \\ \hdotsfor{6} \\ 1 & 1 & 1 &  \cdots & 1 & 1 \end{bmatrix}\f]
-
-where
-
-\f[\alpha = \begin{cases} \frac{1}{\texttt{ksize.width*ksize.height}} & \texttt{when } \texttt{normalize=true}  \\1 & \texttt{otherwise}\end{cases}\f]
-
-Unnormalized box filter is useful for computing various integral characteristics over each pixel
-neighborhood, such as covariance matrices of image derivatives (used in dense optical flow
-algorithms, and so on). If you need to compute pixel sums over variable-size windows, use #integral.
-
-@param src input image.
-@param dst output image of the same size and type as src.
-@param ddepth the output image depth (-1 to use src.depth()).
-@param ksize blurring kernel size.
-@param anchor anchor point; default value Point(-1,-1) means that the anchor is at the kernel
-center.
-@param normalize flag, specifying whether the kernel is normalized by its area or not.
-@param borderType border mode used to extrapolate pixels outside of the image, see #BorderTypes. #BORDER_WRAP is not supported.
-@sa  blur, bilateralFilter, GaussianBlur, medianBlur, integral
- */
-CV_EXPORTS_W void boxFilter( InputArray src, OutputArray dst, int ddepth,
-                             Size ksize, Point anchor = Point(-1,-1),
-                             bool normalize = true,
-                             int borderType = BORDER_DEFAULT );
-
-/** @brief Calculates the normalized sum of squares of the pixel values overlapping the filter.
-
-For every pixel \f$ (x, y) \f$ in the source image, the function calculates the sum of squares of those neighboring
-pixel values which overlap the filter placed over the pixel \f$ (x, y) \f$.
-
-The unnormalized square box filter can be useful in computing local image statistics such as the local
-variance and standard deviation around the neighborhood of a pixel.
-
-@param src input image
-@param dst output image of the same size and type as src
-@param ddepth the output image depth (-1 to use src.depth())
-@param ksize kernel size
-@param anchor kernel anchor point. The default value of Point(-1, -1) denotes that the anchor is at the kernel
-center.
-@param normalize flag, specifying whether the kernel is to be normalized by it's area or not.
-@param borderType border mode used to extrapolate pixels outside of the image, see #BorderTypes. #BORDER_WRAP is not supported.
-@sa boxFilter
-*/
-CV_EXPORTS_W void sqrBoxFilter( InputArray src, OutputArray dst, int ddepth,
-                                Size ksize, Point anchor = Point(-1, -1),
-                                bool normalize = true,
-                                int borderType = BORDER_DEFAULT );
-
-/** @brief Blurs an image using the normalized box filter.
-
-The function smooths an image using the kernel:
-
-\f[\texttt{K} =  \frac{1}{\texttt{ksize.width*ksize.height}} \begin{bmatrix} 1 & 1 & 1 &  \cdots & 1 & 1  \\ 1 & 1 & 1 &  \cdots & 1 & 1  \\ \hdotsfor{6} \\ 1 & 1 & 1 &  \cdots & 1 & 1  \\ \end{bmatrix}\f]
-
-The call `blur(src, dst, ksize, anchor, borderType)` is equivalent to `boxFilter(src, dst, src.type(), ksize,
-anchor, true, borderType)`.
-
-@param src input image; it can have any number of channels, which are processed independently, but
-the depth should be CV_8U, CV_16U, CV_16S, CV_32F or CV_64F.
-@param dst output image of the same size and type as src.
-@param ksize blurring kernel size.
-@param anchor anchor point; default value Point(-1,-1) means that the anchor is at the kernel
-center.
-@param borderType border mode used to extrapolate pixels outside of the image, see #BorderTypes. #BORDER_WRAP is not supported.
-@sa  boxFilter, bilateralFilter, GaussianBlur, medianBlur
- */
-CV_EXPORTS_W void blur( InputArray src, OutputArray dst,
-                        Size ksize, Point anchor = Point(-1,-1),
-                        int borderType = BORDER_DEFAULT );
-
-/** @brief Convolves an image with the kernel.
-
-The function applies an arbitrary linear filter to an image. In-place operation is supported. When
-the aperture is partially outside the image, the function interpolates outlier pixel values
-according to the specified border mode.
-
-The function does actually compute correlation, not the convolution:
-
-\f[\texttt{dst} (x,y) =  \sum _{ \substack{0\leq x' < \texttt{kernel.cols}\\{0\leq y' < \texttt{kernel.rows}}}}  \texttt{kernel} (x',y')* \texttt{src} (x+x'- \texttt{anchor.x} ,y+y'- \texttt{anchor.y} )\f]
-
-That is, the kernel is not mirrored around the anchor point. If you need a real convolution, flip
-the kernel using #flip and set the new anchor to `(kernel.cols - anchor.x - 1, kernel.rows -
-anchor.y - 1)`.
-
-The function uses the DFT-based algorithm in case of sufficiently large kernels (~`11 x 11` or
-larger) and the direct algorithm for small kernels.
-
-@param src input image.
-@param dst output image of the same size and the same number of channels as src.
-@param ddepth desired depth of the destination image, see @ref filter_depths "combinations"
-@param kernel convolution kernel (or rather a correlation kernel), a single-channel floating point
-matrix; if you want to apply different kernels to different channels, split the image into
-separate color planes using split and process them individually.
-@param anchor anchor of the kernel that indicates the relative position of a filtered point within
-the kernel; the anchor should lie within the kernel; default value (-1,-1) means that the anchor
-is at the kernel center.
-@param delta optional value added to the filtered pixels before storing them in dst.
-@param borderType pixel extrapolation method, see #BorderTypes. #BORDER_WRAP is not supported.
-@sa  sepFilter2D, dft, matchTemplate
- */
-CV_EXPORTS_W void filter2D( InputArray src, OutputArray dst, int ddepth,
-                            InputArray kernel, Point anchor = Point(-1,-1),
-                            double delta = 0, int borderType = BORDER_DEFAULT );
-
-/** @brief Applies a separable linear filter to an image.
-
-The function applies a separable linear filter to the image. That is, first, every row of src is
-filtered with the 1D kernel kernelX. Then, every column of the result is filtered with the 1D
-kernel kernelY. The final result shifted by delta is stored in dst .
-
-@param src Source image.
-@param dst Destination image of the same size and the same number of channels as src .
-@param ddepth Destination image depth, see @ref filter_depths "combinations"
-@param kernelX Coefficients for filtering each row.
-@param kernelY Coefficients for filtering each column.
-@param anchor Anchor position within the kernel. The default value \f$(-1,-1)\f$ means that the anchor
-is at the kernel center.
-@param delta Value added to the filtered results before storing them.
-@param borderType Pixel extrapolation method, see #BorderTypes. #BORDER_WRAP is not supported.
-@sa  filter2D, Sobel, GaussianBlur, boxFilter, blur
- */
-CV_EXPORTS_W void sepFilter2D( InputArray src, OutputArray dst, int ddepth,
-                               InputArray kernelX, InputArray kernelY,
-                               Point anchor = Point(-1,-1),
-                               double delta = 0, int borderType = BORDER_DEFAULT );
-
-/** @example samples/cpp/tutorial_code/ImgTrans/Sobel_Demo.cpp
-Sample code using Sobel and/or Scharr OpenCV functions to make a simple Edge Detector
-![Sample screenshot](Sobel_Derivatives_Tutorial_Result.jpg)
-Check @ref tutorial_sobel_derivatives "the corresponding tutorial" for more details
-*/
-
-/** @brief Calculates the first, second, third, or mixed image derivatives using an extended Sobel operator.
-
-In all cases except one, the \f$\texttt{ksize} \times \texttt{ksize}\f$ separable kernel is used to
-calculate the derivative. When \f$\texttt{ksize = 1}\f$, the \f$3 \times 1\f$ or \f$1 \times 3\f$
-kernel is used (that is, no Gaussian smoothing is done). `ksize = 1` can only be used for the first
-or the second x- or y- derivatives.
-
-There is also the special value `ksize = #FILTER_SCHARR (-1)` that corresponds to the \f$3\times3\f$ Scharr
-filter that may give more accurate results than the \f$3\times3\f$ Sobel. The Scharr aperture is
-
-\f[\vecthreethree{-3}{0}{3}{-10}{0}{10}{-3}{0}{3}\f]
-
-for the x-derivative, or transposed for the y-derivative.
-
-The function calculates an image derivative by convolving the image with the appropriate kernel:
-
-\f[\texttt{dst} =  \frac{\partial^{xorder+yorder} \texttt{src}}{\partial x^{xorder} \partial y^{yorder}}\f]
-
-The Sobel operators combine Gaussian smoothing and differentiation, so the result is more or less
-resistant to the noise. Most often, the function is called with ( xorder = 1, yorder = 0, ksize = 3)
-or ( xorder = 0, yorder = 1, ksize = 3) to calculate the first x- or y- image derivative. The first
-case corresponds to a kernel of:
-
-\f[\vecthreethree{-1}{0}{1}{-2}{0}{2}{-1}{0}{1}\f]
-
-The second case corresponds to a kernel of:
-
-\f[\vecthreethree{-1}{-2}{-1}{0}{0}{0}{1}{2}{1}\f]
-
-@param src input image.
-@param dst output image of the same size and the same number of channels as src .
-@param ddepth output image depth, see @ref filter_depths "combinations"; in the case of
-    8-bit input images it will result in truncated derivatives.
-@param dx order of the derivative x.
-@param dy order of the derivative y.
-@param ksize size of the extended Sobel kernel; it must be 1, 3, 5, or 7.
-@param scale optional scale factor for the computed derivative values; by default, no scaling is
-applied (see #getDerivKernels for details).
-@param delta optional delta value that is added to the results prior to storing them in dst.
-@param borderType pixel extrapolation method, see #BorderTypes. #BORDER_WRAP is not supported.
-@sa  Scharr, Laplacian, sepFilter2D, filter2D, GaussianBlur, cartToPolar
- */
-CV_EXPORTS_W void Sobel( InputArray src, OutputArray dst, int ddepth,
-                         int dx, int dy, int ksize = 3,
-                         double scale = 1, double delta = 0,
-                         int borderType = BORDER_DEFAULT );
-
-/** @brief Calculates the first order image derivative in both x and y using a Sobel operator
-
-Equivalent to calling:
-
-@code
-Sobel( src, dx, CV_16SC1, 1, 0, 3 );
-Sobel( src, dy, CV_16SC1, 0, 1, 3 );
-@endcode
-
-@param src input image.
-@param dx output image with first-order derivative in x.
-@param dy output image with first-order derivative in y.
-@param ksize size of Sobel kernel. It must be 3.
-@param borderType pixel extrapolation method, see #BorderTypes.
-                  Only #BORDER_DEFAULT=#BORDER_REFLECT_101 and #BORDER_REPLICATE are supported.
-
-@sa Sobel
- */
-
-CV_EXPORTS_W void spatialGradient( InputArray src, OutputArray dx,
-                                   OutputArray dy, int ksize = 3,
-                                   int borderType = BORDER_DEFAULT );
-
-/** @brief Calculates the first x- or y- image derivative using Scharr operator.
-
-The function computes the first x- or y- spatial image derivative using the Scharr operator. The
-call
-
-\f[\texttt{Scharr(src, dst, ddepth, dx, dy, scale, delta, borderType)}\f]
-
-is equivalent to
-
-\f[\texttt{Sobel(src, dst, ddepth, dx, dy, FILTER_SCHARR, scale, delta, borderType)} .\f]
-
-@param src input image.
-@param dst output image of the same size and the same number of channels as src.
-@param ddepth output image depth, see @ref filter_depths "combinations"
-@param dx order of the derivative x.
-@param dy order of the derivative y.
-@param scale optional scale factor for the computed derivative values; by default, no scaling is
-applied (see #getDerivKernels for details).
-@param delta optional delta value that is added to the results prior to storing them in dst.
-@param borderType pixel extrapolation method, see #BorderTypes. #BORDER_WRAP is not supported.
-@sa  cartToPolar
- */
-CV_EXPORTS_W void Scharr( InputArray src, OutputArray dst, int ddepth,
-                          int dx, int dy, double scale = 1, double delta = 0,
-                          int borderType = BORDER_DEFAULT );
-
-/** @example samples/cpp/laplace.cpp
-An example using Laplace transformations for edge detection
-*/
-
-/** @brief Calculates the Laplacian of an image.
-
-The function calculates the Laplacian of the source image by adding up the second x and y
-derivatives calculated using the Sobel operator:
-
-\f[\texttt{dst} =  \Delta \texttt{src} =  \frac{\partial^2 \texttt{src}}{\partial x^2} +  \frac{\partial^2 \texttt{src}}{\partial y^2}\f]
-
-This is done when `ksize > 1`. When `ksize == 1`, the Laplacian is computed by filtering the image
-with the following \f$3 \times 3\f$ aperture:
-
-\f[\vecthreethree {0}{1}{0}{1}{-4}{1}{0}{1}{0}\f]
-
-@param src Source image.
-@param dst Destination image of the same size and the same number of channels as src .
-@param ddepth Desired depth of the destination image.
-@param ksize Aperture size used to compute the second-derivative filters. See #getDerivKernels for
-details. The size must be positive and odd.
-@param scale Optional scale factor for the computed Laplacian values. By default, no scaling is
-applied. See #getDerivKernels for details.
-@param delta Optional delta value that is added to the results prior to storing them in dst .
-@param borderType Pixel extrapolation method, see #BorderTypes. #BORDER_WRAP is not supported.
-@sa  Sobel, Scharr
- */
-CV_EXPORTS_W void Laplacian( InputArray src, OutputArray dst, int ddepth,
-                             int ksize = 1, double scale = 1, double delta = 0,
-                             int borderType = BORDER_DEFAULT );
-
-//! @} imgproc_filter
-
-//! @addtogroup imgproc_feature
-//! @{
-
-/** @example samples/cpp/edge.cpp
-This program demonstrates usage of the Canny edge detector
-
-Check @ref tutorial_canny_detector "the corresponding tutorial" for more details
-*/
-
-/** @brief Finds edges in an image using the Canny algorithm @cite Canny86 .
-
-The function finds edges in the input image and marks them in the output map edges using the
-Canny algorithm. The smallest value between threshold1 and threshold2 is used for edge linking. The
-largest value is used to find initial segments of strong edges. See
-<http://en.wikipedia.org/wiki/Canny_edge_detector>
-
-@param image 8-bit input image.
-@param edges output edge map; single channels 8-bit image, which has the same size as image .
-@param threshold1 first threshold for the hysteresis procedure.
-@param threshold2 second threshold for the hysteresis procedure.
-@param apertureSize aperture size for the Sobel operator.
-@param L2gradient a flag, indicating whether a more accurate \f$L_2\f$ norm
-\f$=\sqrt{(dI/dx)^2 + (dI/dy)^2}\f$ should be used to calculate the image gradient magnitude (
-L2gradient=true ), or whether the default \f$L_1\f$ norm \f$=|dI/dx|+|dI/dy|\f$ is enough (
-L2gradient=false ).
- */
-CV_EXPORTS_W void Canny( InputArray image, OutputArray edges,
-                         double threshold1, double threshold2,
-                         int apertureSize = 3, bool L2gradient = false );
-
-/** \overload
-
-Finds edges in an image using the Canny algorithm with custom image gradient.
-
-@param dx 16-bit x derivative of input image (CV_16SC1 or CV_16SC3).
-@param dy 16-bit y derivative of input image (same type as dx).
-@param edges output edge map; single channels 8-bit image, which has the same size as image .
-@param threshold1 first threshold for the hysteresis procedure.
-@param threshold2 second threshold for the hysteresis procedure.
-@param L2gradient a flag, indicating whether a more accurate \f$L_2\f$ norm
-\f$=\sqrt{(dI/dx)^2 + (dI/dy)^2}\f$ should be used to calculate the image gradient magnitude (
-L2gradient=true ), or whether the default \f$L_1\f$ norm \f$=|dI/dx|+|dI/dy|\f$ is enough (
-L2gradient=false ).
- */
-CV_EXPORTS_W void Canny( InputArray dx, InputArray dy,
-                         OutputArray edges,
-                         double threshold1, double threshold2,
-                         bool L2gradient = false );
-
-/** @brief Calculates the minimal eigenvalue of gradient matrices for corner detection.
-
-The function is similar to cornerEigenValsAndVecs but it calculates and stores only the minimal
-eigenvalue of the covariance matrix of derivatives, that is, \f$\min(\lambda_1, \lambda_2)\f$ in terms
-of the formulae in the cornerEigenValsAndVecs description.
-
-@param src Input single-channel 8-bit or floating-point image.
-@param dst Image to store the minimal eigenvalues. It has the type CV_32FC1 and the same size as
-src .
-@param blockSize Neighborhood size (see the details on #cornerEigenValsAndVecs ).
-@param ksize Aperture parameter for the Sobel operator.
-@param borderType Pixel extrapolation method. See #BorderTypes. #BORDER_WRAP is not supported.
- */
-CV_EXPORTS_W void cornerMinEigenVal( InputArray src, OutputArray dst,
-                                     int blockSize, int ksize = 3,
-                                     int borderType = BORDER_DEFAULT );
-
-/** @brief Harris corner detector.
-
-The function runs the Harris corner detector on the image. Similarly to cornerMinEigenVal and
-cornerEigenValsAndVecs , for each pixel \f$(x, y)\f$ it calculates a \f$2\times2\f$ gradient covariance
-matrix \f$M^{(x,y)}\f$ over a \f$\texttt{blockSize} \times \texttt{blockSize}\f$ neighborhood. Then, it
-computes the following characteristic:
-
-\f[\texttt{dst} (x,y) =  \mathrm{det} M^{(x,y)} - k  \cdot \left ( \mathrm{tr} M^{(x,y)} \right )^2\f]
-
-Corners in the image can be found as the local maxima of this response map.
-
-@param src Input single-channel 8-bit or floating-point image.
-@param dst Image to store the Harris detector responses. It has the type CV_32FC1 and the same
-size as src .
-@param blockSize Neighborhood size (see the details on #cornerEigenValsAndVecs ).
-@param ksize Aperture parameter for the Sobel operator.
-@param k Harris detector free parameter. See the formula above.
-@param borderType Pixel extrapolation method. See #BorderTypes. #BORDER_WRAP is not supported.
- */
-CV_EXPORTS_W void cornerHarris( InputArray src, OutputArray dst, int blockSize,
-                                int ksize, double k,
-                                int borderType = BORDER_DEFAULT );
-
-/** @brief Calculates eigenvalues and eigenvectors of image blocks for corner detection.
-
-For every pixel \f$p\f$ , the function cornerEigenValsAndVecs considers a blockSize \f$\times\f$ blockSize
-neighborhood \f$S(p)\f$ . It calculates the covariation matrix of derivatives over the neighborhood as:
-
-\f[M =  \begin{bmatrix} \sum _{S(p)}(dI/dx)^2 &  \sum _{S(p)}dI/dx dI/dy  \\ \sum _{S(p)}dI/dx dI/dy &  \sum _{S(p)}(dI/dy)^2 \end{bmatrix}\f]
-
-where the derivatives are computed using the Sobel operator.
-
-After that, it finds eigenvectors and eigenvalues of \f$M\f$ and stores them in the destination image as
-\f$(\lambda_1, \lambda_2, x_1, y_1, x_2, y_2)\f$ where
-
--   \f$\lambda_1, \lambda_2\f$ are the non-sorted eigenvalues of \f$M\f$
--   \f$x_1, y_1\f$ are the eigenvectors corresponding to \f$\lambda_1\f$
--   \f$x_2, y_2\f$ are the eigenvectors corresponding to \f$\lambda_2\f$
-
-The output of the function can be used for robust edge or corner detection.
-
-@param src Input single-channel 8-bit or floating-point image.
-@param dst Image to store the results. It has the same size as src and the type CV_32FC(6) .
-@param blockSize Neighborhood size (see details below).
-@param ksize Aperture parameter for the Sobel operator.
-@param borderType Pixel extrapolation method. See #BorderTypes. #BORDER_WRAP is not supported.
-
-@sa  cornerMinEigenVal, cornerHarris, preCornerDetect
- */
-CV_EXPORTS_W void cornerEigenValsAndVecs( InputArray src, OutputArray dst,
-                                          int blockSize, int ksize,
-                                          int borderType = BORDER_DEFAULT );
-
-/** @brief Calculates a feature map for corner detection.
-
-The function calculates the complex spatial derivative-based function of the source image
-
-\f[\texttt{dst} = (D_x  \texttt{src} )^2  \cdot D_{yy}  \texttt{src} + (D_y  \texttt{src} )^2  \cdot D_{xx}  \texttt{src} - 2 D_x  \texttt{src} \cdot D_y  \texttt{src} \cdot D_{xy}  \texttt{src}\f]
-
-where \f$D_x\f$,\f$D_y\f$ are the first image derivatives, \f$D_{xx}\f$,\f$D_{yy}\f$ are the second image
-derivatives, and \f$D_{xy}\f$ is the mixed derivative.
-
-The corners can be found as local maximums of the functions, as shown below:
-@code
-    Mat corners, dilated_corners;
-    preCornerDetect(image, corners, 3);
-    // dilation with 3x3 rectangular structuring element
-    dilate(corners, dilated_corners, Mat(), 1);
-    Mat corner_mask = corners == dilated_corners;
-@endcode
-
-@param src Source single-channel 8-bit of floating-point image.
-@param dst Output image that has the type CV_32F and the same size as src .
-@param ksize %Aperture size of the Sobel .
-@param borderType Pixel extrapolation method. See #BorderTypes. #BORDER_WRAP is not supported.
- */
-CV_EXPORTS_W void preCornerDetect( InputArray src, OutputArray dst, int ksize,
-                                   int borderType = BORDER_DEFAULT );
-
-/** @brief Refines the corner locations.
-
-The function iterates to find the sub-pixel accurate location of corners or radial saddle
-points as described in @cite forstner1987fast, and as shown on the figure below.
-
-![image](pics/cornersubpix.png)
-
-Sub-pixel accurate corner locator is based on the observation that every vector from the center \f$q\f$
-to a point \f$p\f$ located within a neighborhood of \f$q\f$ is orthogonal to the image gradient at \f$p\f$
-subject to image and measurement noise. Consider the expression:
-
-\f[\epsilon _i = {DI_{p_i}}^T  \cdot (q - p_i)\f]
-
-where \f${DI_{p_i}}\f$ is an image gradient at one of the points \f$p_i\f$ in a neighborhood of \f$q\f$ . The
-value of \f$q\f$ is to be found so that \f$\epsilon_i\f$ is minimized. A system of equations may be set up
-with \f$\epsilon_i\f$ set to zero:
-
-\f[\sum _i(DI_{p_i}  \cdot {DI_{p_i}}^T) \cdot q -  \sum _i(DI_{p_i}  \cdot {DI_{p_i}}^T  \cdot p_i)\f]
-
-where the gradients are summed within a neighborhood ("search window") of \f$q\f$ . Calling the first
-gradient term \f$G\f$ and the second gradient term \f$b\f$ gives:
-
-\f[q = G^{-1}  \cdot b\f]
-
-The algorithm sets the center of the neighborhood window at this new center \f$q\f$ and then iterates
-until the center stays within a set threshold.
-
-@param image Input single-channel, 8-bit or float image.
-@param corners Initial coordinates of the input corners and refined coordinates provided for
-output.
-@param winSize Half of the side length of the search window. For example, if winSize=Size(5,5) ,
-then a \f$(5*2+1) \times (5*2+1) = 11 \times 11\f$ search window is used.
-@param zeroZone Half of the size of the dead region in the middle of the search zone over which
-the summation in the formula below is not done. It is used sometimes to avoid possible
-singularities of the autocorrelation matrix. The value of (-1,-1) indicates that there is no such
-a size.
-@param criteria Criteria for termination of the iterative process of corner refinement. That is,
-the process of corner position refinement stops either after criteria.maxCount iterations or when
-the corner position moves by less than criteria.epsilon on some iteration.
- */
-CV_EXPORTS_W void cornerSubPix( InputArray image, InputOutputArray corners,
-                                Size winSize, Size zeroZone,
-                                TermCriteria criteria );
-
-/** @brief Determines strong corners on an image.
-
-The function finds the most prominent corners in the image or in the specified image region, as
-described in @cite Shi94
-
--   Function calculates the corner quality measure at every source image pixel using the
-    #cornerMinEigenVal or #cornerHarris .
--   Function performs a non-maximum suppression (the local maximums in *3 x 3* neighborhood are
-    retained).
--   The corners with the minimal eigenvalue less than
-    \f$\texttt{qualityLevel} \cdot \max_{x,y} qualityMeasureMap(x,y)\f$ are rejected.
--   The remaining corners are sorted by the quality measure in the descending order.
--   Function throws away each corner for which there is a stronger corner at a distance less than
-    maxDistance.
-
-The function can be used to initialize a point-based tracker of an object.
-
-@note If the function is called with different values A and B of the parameter qualityLevel , and
-A \> B, the vector of returned corners with qualityLevel=A will be the prefix of the output vector
-with qualityLevel=B .
-
-@param image Input 8-bit or floating-point 32-bit, single-channel image.
-@param corners Output vector of detected corners.
-@param maxCorners Maximum number of corners to return. If there are more corners than are found,
-the strongest of them is returned. `maxCorners <= 0` implies that no limit on the maximum is set
-and all detected corners are returned.
-@param qualityLevel Parameter characterizing the minimal accepted quality of image corners. The
-parameter value is multiplied by the best corner quality measure, which is the minimal eigenvalue
-(see #cornerMinEigenVal ) or the Harris function response (see #cornerHarris ). The corners with the
-quality measure less than the product are rejected. For example, if the best corner has the
-quality measure = 1500, and the qualityLevel=0.01 , then all the corners with the quality measure
-less than 15 are rejected.
-@param minDistance Minimum possible Euclidean distance between the returned corners.
-@param mask Optional region of interest. If the image is not empty (it needs to have the type
-CV_8UC1 and the same size as image ), it specifies the region in which the corners are detected.
-@param blockSize Size of an average block for computing a derivative covariation matrix over each
-pixel neighborhood. See cornerEigenValsAndVecs .
-@param useHarrisDetector Parameter indicating whether to use a Harris detector (see #cornerHarris)
-or #cornerMinEigenVal.
-@param k Free parameter of the Harris detector.
-
-@sa  cornerMinEigenVal, cornerHarris, calcOpticalFlowPyrLK, estimateRigidTransform,
- */
-
-CV_EXPORTS_W void goodFeaturesToTrack( InputArray image, OutputArray corners,
-                                     int maxCorners, double qualityLevel, double minDistance,
-                                     InputArray mask = noArray(), int blockSize = 3,
-                                     bool useHarrisDetector = false, double k = 0.04 );
-
-CV_EXPORTS_W void goodFeaturesToTrack( InputArray image, OutputArray corners,
-                                     int maxCorners, double qualityLevel, double minDistance,
-                                     InputArray mask, int blockSize,
-                                     int gradientSize, bool useHarrisDetector = false,
-                                     double k = 0.04 );
-
-/** @brief Same as above, but returns also quality measure of the detected corners.
-
-@param image Input 8-bit or floating-point 32-bit, single-channel image.
-@param corners Output vector of detected corners.
-@param maxCorners Maximum number of corners to return. If there are more corners than are found,
-the strongest of them is returned. `maxCorners <= 0` implies that no limit on the maximum is set
-and all detected corners are returned.
-@param qualityLevel Parameter characterizing the minimal accepted quality of image corners. The
-parameter value is multiplied by the best corner quality measure, which is the minimal eigenvalue
-(see #cornerMinEigenVal ) or the Harris function response (see #cornerHarris ). The corners with the
-quality measure less than the product are rejected. For example, if the best corner has the
-quality measure = 1500, and the qualityLevel=0.01 , then all the corners with the quality measure
-less than 15 are rejected.
-@param minDistance Minimum possible Euclidean distance between the returned corners.
-@param mask Region of interest. If the image is not empty (it needs to have the type
-CV_8UC1 and the same size as image ), it specifies the region in which the corners are detected.
-@param cornersQuality Output vector of quality measure of the detected corners.
-@param blockSize Size of an average block for computing a derivative covariation matrix over each
-pixel neighborhood. See cornerEigenValsAndVecs .
-@param gradientSize Aperture parameter for the Sobel operator used for derivatives computation.
-See cornerEigenValsAndVecs .
-@param useHarrisDetector Parameter indicating whether to use a Harris detector (see #cornerHarris)
-or #cornerMinEigenVal.
-@param k Free parameter of the Harris detector.
- */
-CV_EXPORTS CV_WRAP_AS(goodFeaturesToTrackWithQuality) void goodFeaturesToTrack(
-        InputArray image, OutputArray corners,
-        int maxCorners, double qualityLevel, double minDistance,
-        InputArray mask, OutputArray cornersQuality, int blockSize = 3,
-        int gradientSize = 3, bool useHarrisDetector = false, double k = 0.04);
-
-/** @example samples/cpp/tutorial_code/ImgTrans/houghlines.cpp
-An example using the Hough line detector
-![Sample input image](Hough_Lines_Tutorial_Original_Image.jpg) ![Output image](Hough_Lines_Tutorial_Result.jpg)
-*/
-
-/** @brief Finds lines in a binary image using the standard Hough transform.
-
-The function implements the standard or standard multi-scale Hough transform algorithm for line
-detection. See <http://homepages.inf.ed.ac.uk/rbf/HIPR2/hough.htm> for a good explanation of Hough
-transform.
-
-@param image 8-bit, single-channel binary source image. The image may be modified by the function.
-@param lines Output vector of lines. Each line is represented by a 2 or 3 element vector
-\f$(\rho, \theta)\f$ or \f$(\rho, \theta, \textrm{votes})\f$ . \f$\rho\f$ is the distance from the coordinate origin \f$(0,0)\f$ (top-left corner of
-the image). \f$\theta\f$ is the line rotation angle in radians (
-\f$0 \sim \textrm{vertical line}, \pi/2 \sim \textrm{horizontal line}\f$ ).
-\f$\textrm{votes}\f$ is the value of accumulator.
-@param rho Distance resolution of the accumulator in pixels.
-@param theta Angle resolution of the accumulator in radians.
-@param threshold Accumulator threshold parameter. Only those lines are returned that get enough
-votes ( \f$>\texttt{threshold}\f$ ).
-@param srn For the multi-scale Hough transform, it is a divisor for the distance resolution rho .
-The coarse accumulator distance resolution is rho and the accurate accumulator resolution is
-rho/srn . If both srn=0 and stn=0 , the classical Hough transform is used. Otherwise, both these
-parameters should be positive.
-@param stn For the multi-scale Hough transform, it is a divisor for the distance resolution theta.
-@param min_theta For standard and multi-scale Hough transform, minimum angle to check for lines.
-Must fall between 0 and max_theta.
-@param max_theta For standard and multi-scale Hough transform, maximum angle to check for lines.
-Must fall between min_theta and CV_PI.
- */
-CV_EXPORTS_W void HoughLines( InputArray image, OutputArray lines,
-                              double rho, double theta, int threshold,
-                              double srn = 0, double stn = 0,
-                              double min_theta = 0, double max_theta = CV_PI );
-
-/** @brief Finds line segments in a binary image using the probabilistic Hough transform.
-
-The function implements the probabilistic Hough transform algorithm for line detection, described
-in @cite Matas00
-
-See the line detection example below:
-@include snippets/imgproc_HoughLinesP.cpp
-This is a sample picture the function parameters have been tuned for:
-
-![image](pics/building.jpg)
-
-And this is the output of the above program in case of the probabilistic Hough transform:
-
-![image](pics/houghp.png)
-
-@param image 8-bit, single-channel binary source image. The image may be modified by the function.
-@param lines Output vector of lines. Each line is represented by a 4-element vector
-\f$(x_1, y_1, x_2, y_2)\f$ , where \f$(x_1,y_1)\f$ and \f$(x_2, y_2)\f$ are the ending points of each detected
-line segment.
-@param rho Distance resolution of the accumulator in pixels.
-@param theta Angle resolution of the accumulator in radians.
-@param threshold Accumulator threshold parameter. Only those lines are returned that get enough
-votes ( \f$>\texttt{threshold}\f$ ).
-@param minLineLength Minimum line length. Line segments shorter than that are rejected.
-@param maxLineGap Maximum allowed gap between points on the same line to link them.
-
-@sa LineSegmentDetector
- */
-CV_EXPORTS_W void HoughLinesP( InputArray image, OutputArray lines,
-                               double rho, double theta, int threshold,
-                               double minLineLength = 0, double maxLineGap = 0 );
-
-/** @brief Finds lines in a set of points using the standard Hough transform.
-
-The function finds lines in a set of points using a modification of the Hough transform.
-@include snippets/imgproc_HoughLinesPointSet.cpp
-@param point Input vector of points. Each vector must be encoded as a Point vector \f$(x,y)\f$. Type must be CV_32FC2 or CV_32SC2.
-@param lines Output vector of found lines. Each vector is encoded as a vector<Vec3d> \f$(votes, rho, theta)\f$.
-The larger the value of 'votes', the higher the reliability of the Hough line.
-@param lines_max Max count of Hough lines.
-@param threshold Accumulator threshold parameter. Only those lines are returned that get enough
-votes ( \f$>\texttt{threshold}\f$ ).
-@param min_rho Minimum value for \f$\rho\f$ for the accumulator (Note: \f$\rho\f$ can be negative. The absolute value \f$|\rho|\f$ is the distance of a line to the origin.).
-@param max_rho Maximum value for \f$\rho\f$ for the accumulator.
-@param rho_step Distance resolution of the accumulator.
-@param min_theta Minimum angle value of the accumulator in radians.
-@param max_theta Maximum angle value of the accumulator in radians.
-@param theta_step Angle resolution of the accumulator in radians.
- */
-CV_EXPORTS_W void HoughLinesPointSet( InputArray point, OutputArray lines, int lines_max, int threshold,
-                                      double min_rho, double max_rho, double rho_step,
-                                      double min_theta, double max_theta, double theta_step );
-
-/** @example samples/cpp/tutorial_code/ImgTrans/houghcircles.cpp
-An example using the Hough circle detector
-*/
-
-/** @brief Finds circles in a grayscale image using the Hough transform.
-
-The function finds circles in a grayscale image using a modification of the Hough transform.
-
-Example: :
-@include snippets/imgproc_HoughLinesCircles.cpp
-
-@note Usually the function detects the centers of circles well. However, it may fail to find correct
-radii. You can assist to the function by specifying the radius range ( minRadius and maxRadius ) if
-you know it. Or, in the case of #HOUGH_GRADIENT method you may set maxRadius to a negative number
-to return centers only without radius search, and find the correct radius using an additional procedure.
-
-It also helps to smooth image a bit unless it's already soft. For example,
-GaussianBlur() with 7x7 kernel and 1.5x1.5 sigma or similar blurring may help.
-
-@param image 8-bit, single-channel, grayscale input image.
-@param circles Output vector of found circles. Each vector is encoded as  3 or 4 element
-floating-point vector \f$(x, y, radius)\f$ or \f$(x, y, radius, votes)\f$ .
-@param method Detection method, see #HoughModes. The available methods are #HOUGH_GRADIENT and #HOUGH_GRADIENT_ALT.
-@param dp Inverse ratio of the accumulator resolution to the image resolution. For example, if
-dp=1 , the accumulator has the same resolution as the input image. If dp=2 , the accumulator has
-half as big width and height. For #HOUGH_GRADIENT_ALT the recommended value is dp=1.5,
-unless some small very circles need to be detected.
-@param minDist Minimum distance between the centers of the detected circles. If the parameter is
-too small, multiple neighbor circles may be falsely detected in addition to a true one. If it is
-too large, some circles may be missed.
-@param param1 First method-specific parameter. In case of #HOUGH_GRADIENT and #HOUGH_GRADIENT_ALT,
-it is the higher threshold of the two passed to the Canny edge detector (the lower one is twice smaller).
-Note that #HOUGH_GRADIENT_ALT uses #Scharr algorithm to compute image derivatives, so the threshold value
-shough normally be higher, such as 300 or normally exposed and contrasty images.
-@param param2 Second method-specific parameter. In case of #HOUGH_GRADIENT, it is the
-accumulator threshold for the circle centers at the detection stage. The smaller it is, the more
-false circles may be detected. Circles, corresponding to the larger accumulator values, will be
-returned first. In the case of #HOUGH_GRADIENT_ALT algorithm, this is the circle "perfectness" measure.
-The closer it to 1, the better shaped circles algorithm selects. In most cases 0.9 should be fine.
-If you want get better detection of small circles, you may decrease it to 0.85, 0.8 or even less.
-But then also try to limit the search range [minRadius, maxRadius] to avoid many false circles.
-@param minRadius Minimum circle radius.
-@param maxRadius Maximum circle radius. If <= 0, uses the maximum image dimension. If < 0, #HOUGH_GRADIENT returns
-centers without finding the radius. #HOUGH_GRADIENT_ALT always computes circle radiuses.
-
-@sa fitEllipse, minEnclosingCircle
- */
-CV_EXPORTS_W void HoughCircles( InputArray image, OutputArray circles,
-                               int method, double dp, double minDist,
-                               double param1 = 100, double param2 = 100,
-                               int minRadius = 0, int maxRadius = 0 );
-
-//! @} imgproc_feature
-
-//! @addtogroup imgproc_filter
-//! @{
-
-/** @example samples/cpp/tutorial_code/ImgProc/Morphology_2.cpp
-Advanced morphology Transformations sample code
-![Sample screenshot](Morphology_2_Tutorial_Result.jpg)
-Check @ref tutorial_opening_closing_hats "the corresponding tutorial" for more details
-*/
-
-/** @brief Erodes an image by using a specific structuring element.
-
-The function erodes the source image using the specified structuring element that determines the
-shape of a pixel neighborhood over which the minimum is taken:
-
-\f[\texttt{dst} (x,y) =  \min _{(x',y'):  \, \texttt{element} (x',y') \ne0 } \texttt{src} (x+x',y+y')\f]
-
-The function supports the in-place mode. Erosion can be applied several ( iterations ) times. In
-case of multi-channel images, each channel is processed independently.
-
-@param src input image; the number of channels can be arbitrary, but the depth should be one of
-CV_8U, CV_16U, CV_16S, CV_32F or CV_64F.
-@param dst output image of the same size and type as src.
-@param kernel structuring element used for erosion; if `element=Mat()`, a `3 x 3` rectangular
-structuring element is used. Kernel can be created using #getStructuringElement.
-@param anchor position of the anchor within the element; default value (-1, -1) means that the
-anchor is at the element center.
-@param iterations number of times erosion is applied.
-@param borderType pixel extrapolation method, see #BorderTypes. #BORDER_WRAP is not supported.
-@param borderValue border value in case of a constant border
-@sa  dilate, morphologyEx, getStructuringElement
- */
-CV_EXPORTS_W void erode( InputArray src, OutputArray dst, InputArray kernel,
-                         Point anchor = Point(-1,-1), int iterations = 1,
-                         int borderType = BORDER_CONSTANT,
-                         const Scalar& borderValue = morphologyDefaultBorderValue() );
-
-/** @example samples/cpp/tutorial_code/ImgProc/Morphology_1.cpp
-Erosion and Dilation sample code
-![Sample Screenshot-Erosion](Morphology_1_Tutorial_Erosion_Result.jpg)![Sample Screenshot-Dilation](Morphology_1_Tutorial_Dilation_Result.jpg)
-Check @ref tutorial_erosion_dilatation "the corresponding tutorial" for more details
-*/
-
-/** @brief Dilates an image by using a specific structuring element.
-
-The function dilates the source image using the specified structuring element that determines the
-shape of a pixel neighborhood over which the maximum is taken:
-\f[\texttt{dst} (x,y) =  \max _{(x',y'):  \, \texttt{element} (x',y') \ne0 } \texttt{src} (x+x',y+y')\f]
-
-The function supports the in-place mode. Dilation can be applied several ( iterations ) times. In
-case of multi-channel images, each channel is processed independently.
-
-@param src input image; the number of channels can be arbitrary, but the depth should be one of
-CV_8U, CV_16U, CV_16S, CV_32F or CV_64F.
-@param dst output image of the same size and type as src.
-@param kernel structuring element used for dilation; if elemenat=Mat(), a 3 x 3 rectangular
-structuring element is used. Kernel can be created using #getStructuringElement
-@param anchor position of the anchor within the element; default value (-1, -1) means that the
-anchor is at the element center.
-@param iterations number of times dilation is applied.
-@param borderType pixel extrapolation method, see #BorderTypes. #BORDER_WRAP is not suported.
-@param borderValue border value in case of a constant border
-@sa  erode, morphologyEx, getStructuringElement
- */
-CV_EXPORTS_W void dilate( InputArray src, OutputArray dst, InputArray kernel,
-                          Point anchor = Point(-1,-1), int iterations = 1,
-                          int borderType = BORDER_CONSTANT,
-                          const Scalar& borderValue = morphologyDefaultBorderValue() );
-
-/** @brief Performs advanced morphological transformations.
-
-The function cv::morphologyEx can perform advanced morphological transformations using an erosion and dilation as
-basic operations.
-
-Any of the operations can be done in-place. In case of multi-channel images, each channel is
-processed independently.
-
-@param src Source image. The number of channels can be arbitrary. The depth should be one of
-CV_8U, CV_16U, CV_16S, CV_32F or CV_64F.
-@param dst Destination image of the same size and type as source image.
-@param op Type of a morphological operation, see #MorphTypes
-@param kernel Structuring element. It can be created using #getStructuringElement.
-@param anchor Anchor position with the kernel. Negative values mean that the anchor is at the
-kernel center.
-@param iterations Number of times erosion and dilation are applied.
-@param borderType Pixel extrapolation method, see #BorderTypes. #BORDER_WRAP is not supported.
-@param borderValue Border value in case of a constant border. The default value has a special
-meaning.
-@sa  dilate, erode, getStructuringElement
-@note The number of iterations is the number of times erosion or dilatation operation will be applied.
-For instance, an opening operation (#MORPH_OPEN) with two iterations is equivalent to apply
-successively: erode -> erode -> dilate -> dilate (and not erode -> dilate -> erode -> dilate).
- */
-CV_EXPORTS_W void morphologyEx( InputArray src, OutputArray dst,
-                                int op, InputArray kernel,
-                                Point anchor = Point(-1,-1), int iterations = 1,
-                                int borderType = BORDER_CONSTANT,
-                                const Scalar& borderValue = morphologyDefaultBorderValue() );
-
-//! @} imgproc_filter
-
-//! @addtogroup imgproc_transform
-//! @{
-
-/** @brief Resizes an image.
-
-The function resize resizes the image src down to or up to the specified size. Note that the
-initial dst type or size are not taken into account. Instead, the size and type are derived from
-the `src`,`dsize`,`fx`, and `fy`. If you want to resize src so that it fits the pre-created dst,
-you may call the function as follows:
-@code
-    // explicitly specify dsize=dst.size(); fx and fy will be computed from that.
-    resize(src, dst, dst.size(), 0, 0, interpolation);
-@endcode
-If you want to decimate the image by factor of 2 in each direction, you can call the function this
-way:
-@code
-    // specify fx and fy and let the function compute the destination image size.
-    resize(src, dst, Size(), 0.5, 0.5, interpolation);
-@endcode
-To shrink an image, it will generally look best with #INTER_AREA interpolation, whereas to
-enlarge an image, it will generally look best with #INTER_CUBIC (slow) or #INTER_LINEAR
-(faster but still looks OK).
-
-@param src input image.
-@param dst output image; it has the size dsize (when it is non-zero) or the size computed from
-src.size(), fx, and fy; the type of dst is the same as of src.
-@param dsize output image size; if it equals zero (`None` in Python), it is computed as:
- \f[\texttt{dsize = Size(round(fx*src.cols), round(fy*src.rows))}\f]
- Either dsize or both fx and fy must be non-zero.
-@param fx scale factor along the horizontal axis; when it equals 0, it is computed as
-\f[\texttt{(double)dsize.width/src.cols}\f]
-@param fy scale factor along the vertical axis; when it equals 0, it is computed as
-\f[\texttt{(double)dsize.height/src.rows}\f]
-@param interpolation interpolation method, see #InterpolationFlags
-
-@sa  warpAffine, warpPerspective, remap
- */
-CV_EXPORTS_W void resize( InputArray src, OutputArray dst,
-                          Size dsize, double fx = 0, double fy = 0,
-                          int interpolation = INTER_LINEAR );
-
-/** @brief Applies an affine transformation to an image.
-
-The function warpAffine transforms the source image using the specified matrix:
-
-\f[\texttt{dst} (x,y) =  \texttt{src} ( \texttt{M} _{11} x +  \texttt{M} _{12} y +  \texttt{M} _{13}, \texttt{M} _{21} x +  \texttt{M} _{22} y +  \texttt{M} _{23})\f]
-
-when the flag #WARP_INVERSE_MAP is set. Otherwise, the transformation is first inverted
-with #invertAffineTransform and then put in the formula above instead of M. The function cannot
-operate in-place.
-
-@param src input image.
-@param dst output image that has the size dsize and the same type as src .
-@param M \f$2\times 3\f$ transformation matrix.
-@param dsize size of the output image.
-@param flags combination of interpolation methods (see #InterpolationFlags) and the optional
-flag #WARP_INVERSE_MAP that means that M is the inverse transformation (
-\f$\texttt{dst}\rightarrow\texttt{src}\f$ ).
-@param borderMode pixel extrapolation method (see #BorderTypes); when
-borderMode=#BORDER_TRANSPARENT, it means that the pixels in the destination image corresponding to
-the "outliers" in the source image are not modified by the function.
-@param borderValue value used in case of a constant border; by default, it is 0.
-
-@sa  warpPerspective, resize, remap, getRectSubPix, transform
- */
-CV_EXPORTS_W void warpAffine( InputArray src, OutputArray dst,
-                              InputArray M, Size dsize,
-                              int flags = INTER_LINEAR,
-                              int borderMode = BORDER_CONSTANT,
-                              const Scalar& borderValue = Scalar());
-
-/** @example samples/cpp/warpPerspective_demo.cpp
-An example program shows using cv::getPerspectiveTransform and cv::warpPerspective for image warping
-*/
-
-/** @brief Applies a perspective transformation to an image.
-
-The function warpPerspective transforms the source image using the specified matrix:
-
-\f[\texttt{dst} (x,y) =  \texttt{src} \left ( \frac{M_{11} x + M_{12} y + M_{13}}{M_{31} x + M_{32} y + M_{33}} ,
-     \frac{M_{21} x + M_{22} y + M_{23}}{M_{31} x + M_{32} y + M_{33}} \right )\f]
-
-when the flag #WARP_INVERSE_MAP is set. Otherwise, the transformation is first inverted with invert
-and then put in the formula above instead of M. The function cannot operate in-place.
-
-@param src input image.
-@param dst output image that has the size dsize and the same type as src .
-@param M \f$3\times 3\f$ transformation matrix.
-@param dsize size of the output image.
-@param flags combination of interpolation methods (#INTER_LINEAR or #INTER_NEAREST) and the
-optional flag #WARP_INVERSE_MAP, that sets M as the inverse transformation (
-\f$\texttt{dst}\rightarrow\texttt{src}\f$ ).
-@param borderMode pixel extrapolation method (#BORDER_CONSTANT or #BORDER_REPLICATE).
-@param borderValue value used in case of a constant border; by default, it equals 0.
-
-@sa  warpAffine, resize, remap, getRectSubPix, perspectiveTransform
- */
-CV_EXPORTS_W void warpPerspective( InputArray src, OutputArray dst,
-                                   InputArray M, Size dsize,
-                                   int flags = INTER_LINEAR,
-                                   int borderMode = BORDER_CONSTANT,
-                                   const Scalar& borderValue = Scalar());
-
-/** @brief Applies a generic geometrical transformation to an image.
-
-The function remap transforms the source image using the specified map:
-
-\f[\texttt{dst} (x,y) =  \texttt{src} (map_x(x,y),map_y(x,y))\f]
-
-where values of pixels with non-integer coordinates are computed using one of available
-interpolation methods. \f$map_x\f$ and \f$map_y\f$ can be encoded as separate floating-point maps
-in \f$map_1\f$ and \f$map_2\f$ respectively, or interleaved floating-point maps of \f$(x,y)\f$ in
-\f$map_1\f$, or fixed-point maps created by using #convertMaps. The reason you might want to
-convert from floating to fixed-point representations of a map is that they can yield much faster
-(\~2x) remapping operations. In the converted case, \f$map_1\f$ contains pairs (cvFloor(x),
-cvFloor(y)) and \f$map_2\f$ contains indices in a table of interpolation coefficients.
-
-This function cannot operate in-place.
-
-@param src Source image.
-@param dst Destination image. It has the same size as map1 and the same type as src .
-@param map1 The first map of either (x,y) points or just x values having the type CV_16SC2 ,
-CV_32FC1, or CV_32FC2. See #convertMaps for details on converting a floating point
-representation to fixed-point for speed.
-@param map2 The second map of y values having the type CV_16UC1, CV_32FC1, or none (empty map
-if map1 is (x,y) points), respectively.
-@param interpolation Interpolation method (see #InterpolationFlags). The methods #INTER_AREA
-and #INTER_LINEAR_EXACT are not supported by this function.
-@param borderMode Pixel extrapolation method (see #BorderTypes). When
-borderMode=#BORDER_TRANSPARENT, it means that the pixels in the destination image that
-corresponds to the "outliers" in the source image are not modified by the function.
-@param borderValue Value used in case of a constant border. By default, it is 0.
-@note
-Due to current implementation limitations the size of an input and output images should be less than 32767x32767.
- */
-CV_EXPORTS_W void remap( InputArray src, OutputArray dst,
-                         InputArray map1, InputArray map2,
-                         int interpolation, int borderMode = BORDER_CONSTANT,
-                         const Scalar& borderValue = Scalar());
-
-/** @brief Converts image transformation maps from one representation to another.
-
-The function converts a pair of maps for remap from one representation to another. The following
-options ( (map1.type(), map2.type()) \f$\rightarrow\f$ (dstmap1.type(), dstmap2.type()) ) are
-supported:
-
-- \f$\texttt{(CV_32FC1, CV_32FC1)} \rightarrow \texttt{(CV_16SC2, CV_16UC1)}\f$. This is the
-most frequently used conversion operation, in which the original floating-point maps (see #remap)
-are converted to a more compact and much faster fixed-point representation. The first output array
-contains the rounded coordinates and the second array (created only when nninterpolation=false )
-contains indices in the interpolation tables.
-
-- \f$\texttt{(CV_32FC2)} \rightarrow \texttt{(CV_16SC2, CV_16UC1)}\f$. The same as above but
-the original maps are stored in one 2-channel matrix.
-
-- Reverse conversion. Obviously, the reconstructed floating-point maps will not be exactly the same
-as the originals.
-
-@param map1 The first input map of type CV_16SC2, CV_32FC1, or CV_32FC2 .
-@param map2 The second input map of type CV_16UC1, CV_32FC1, or none (empty matrix),
-respectively.
-@param dstmap1 The first output map that has the type dstmap1type and the same size as src .
-@param dstmap2 The second output map.
-@param dstmap1type Type of the first output map that should be CV_16SC2, CV_32FC1, or
-CV_32FC2 .
-@param nninterpolation Flag indicating whether the fixed-point maps are used for the
-nearest-neighbor or for a more complex interpolation.
-
-@sa  remap, undistort, initUndistortRectifyMap
- */
-CV_EXPORTS_W void convertMaps( InputArray map1, InputArray map2,
-                               OutputArray dstmap1, OutputArray dstmap2,
-                               int dstmap1type, bool nninterpolation = false );
-
-/** @brief Calculates an affine matrix of 2D rotation.
-
-The function calculates the following matrix:
-
-\f[\begin{bmatrix} \alpha &  \beta & (1- \alpha )  \cdot \texttt{center.x} -  \beta \cdot \texttt{center.y} \\ - \beta &  \alpha &  \beta \cdot \texttt{center.x} + (1- \alpha )  \cdot \texttt{center.y} \end{bmatrix}\f]
-
-where
-
-\f[\begin{array}{l} \alpha =  \texttt{scale} \cdot \cos \texttt{angle} , \\ \beta =  \texttt{scale} \cdot \sin \texttt{angle} \end{array}\f]
-
-The transformation maps the rotation center to itself. If this is not the target, adjust the shift.
-
-@param center Center of the rotation in the source image.
-@param angle Rotation angle in degrees. Positive values mean counter-clockwise rotation (the
-coordinate origin is assumed to be the top-left corner).
-@param scale Isotropic scale factor.
-
-@sa  getAffineTransform, warpAffine, transform
- */
-CV_EXPORTS_W Mat getRotationMatrix2D(Point2f center, double angle, double scale);
-
-/** @sa getRotationMatrix2D */
-CV_EXPORTS Matx23d getRotationMatrix2D_(Point2f center, double angle, double scale);
-
-inline
-Mat getRotationMatrix2D(Point2f center, double angle, double scale)
-{
-    return Mat(getRotationMatrix2D_(center, angle, scale), true);
-}
-
-/** @brief Calculates an affine transform from three pairs of the corresponding points.
-
-The function calculates the \f$2 \times 3\f$ matrix of an affine transform so that:
-
-\f[\begin{bmatrix} x'_i \\ y'_i \end{bmatrix} = \texttt{map_matrix} \cdot \begin{bmatrix} x_i \\ y_i \\ 1 \end{bmatrix}\f]
-
-where
-
-\f[dst(i)=(x'_i,y'_i), src(i)=(x_i, y_i), i=0,1,2\f]
-
-@param src Coordinates of triangle vertices in the source image.
-@param dst Coordinates of the corresponding triangle vertices in the destination image.
-
-@sa  warpAffine, transform
- */
-CV_EXPORTS Mat getAffineTransform( const Point2f src[], const Point2f dst[] );
-
-/** @brief Inverts an affine transformation.
-
-The function computes an inverse affine transformation represented by \f$2 \times 3\f$ matrix M:
-
-\f[\begin{bmatrix} a_{11} & a_{12} & b_1  \\ a_{21} & a_{22} & b_2 \end{bmatrix}\f]
-
-The result is also a \f$2 \times 3\f$ matrix of the same type as M.
-
-@param M Original affine transformation.
-@param iM Output reverse affine transformation.
- */
-CV_EXPORTS_W void invertAffineTransform( InputArray M, OutputArray iM );
-
-/** @brief Calculates a perspective transform from four pairs of the corresponding points.
-
-The function calculates the \f$3 \times 3\f$ matrix of a perspective transform so that:
-
-\f[\begin{bmatrix} t_i x'_i \\ t_i y'_i \\ t_i \end{bmatrix} = \texttt{map_matrix} \cdot \begin{bmatrix} x_i \\ y_i \\ 1 \end{bmatrix}\f]
-
-where
-
-\f[dst(i)=(x'_i,y'_i), src(i)=(x_i, y_i), i=0,1,2,3\f]
-
-@param src Coordinates of quadrangle vertices in the source image.
-@param dst Coordinates of the corresponding quadrangle vertices in the destination image.
-@param solveMethod method passed to cv::solve (#DecompTypes)
-
-@sa  findHomography, warpPerspective, perspectiveTransform
- */
-CV_EXPORTS_W Mat getPerspectiveTransform(InputArray src, InputArray dst, int solveMethod = DECOMP_LU);
-
-/** @overload */
-CV_EXPORTS Mat getPerspectiveTransform(const Point2f src[], const Point2f dst[], int solveMethod = DECOMP_LU);
-
-
-CV_EXPORTS_W Mat getAffineTransform( InputArray src, InputArray dst );
-
-/** @brief Retrieves a pixel rectangle from an image with sub-pixel accuracy.
-
-The function getRectSubPix extracts pixels from src:
-
-\f[patch(x, y) = src(x +  \texttt{center.x} - ( \texttt{dst.cols} -1)*0.5, y +  \texttt{center.y} - ( \texttt{dst.rows} -1)*0.5)\f]
-
-where the values of the pixels at non-integer coordinates are retrieved using bilinear
-interpolation. Every channel of multi-channel images is processed independently. Also
-the image should be a single channel or three channel image. While the center of the
-rectangle must be inside the image, parts of the rectangle may be outside.
-
-@param image Source image.
-@param patchSize Size of the extracted patch.
-@param center Floating point coordinates of the center of the extracted rectangle within the
-source image. The center must be inside the image.
-@param patch Extracted patch that has the size patchSize and the same number of channels as src .
-@param patchType Depth of the extracted pixels. By default, they have the same depth as src .
-
-@sa  warpAffine, warpPerspective
- */
-CV_EXPORTS_W void getRectSubPix( InputArray image, Size patchSize,
-                                 Point2f center, OutputArray patch, int patchType = -1 );
-
-/** @example samples/cpp/polar_transforms.cpp
-An example using the cv::linearPolar and cv::logPolar operations
-*/
-
-/** @brief Remaps an image to semilog-polar coordinates space.
-
-@deprecated This function produces same result as cv::warpPolar(src, dst, src.size(), center, maxRadius, flags+WARP_POLAR_LOG);
-
-@internal
-Transform the source image using the following transformation (See @ref polar_remaps_reference_image "Polar remaps reference image d)"):
-\f[\begin{array}{l}
-  dst( \rho , \phi ) = src(x,y) \\
-  dst.size() \leftarrow src.size()
-\end{array}\f]
-
-where
-\f[\begin{array}{l}
-  I = (dx,dy) = (x - center.x,y - center.y) \\
-  \rho = M \cdot log_e(\texttt{magnitude} (I)) ,\\
-  \phi = Kangle \cdot \texttt{angle} (I) \\
-\end{array}\f]
-
-and
-\f[\begin{array}{l}
-  M = src.cols / log_e(maxRadius) \\
-  Kangle = src.rows / 2\Pi \\
-\end{array}\f]
-
-The function emulates the human "foveal" vision and can be used for fast scale and
-rotation-invariant template matching, for object tracking and so forth.
-@param src Source image
-@param dst Destination image. It will have same size and type as src.
-@param center The transformation center; where the output precision is maximal
-@param M Magnitude scale parameter. It determines the radius of the bounding circle to transform too.
-@param flags A combination of interpolation methods, see #InterpolationFlags
-
-@note
--   The function can not operate in-place.
--   To calculate magnitude and angle in degrees #cartToPolar is used internally thus angles are measured from 0 to 360 with accuracy about 0.3 degrees.
-
-@sa cv::linearPolar
-@endinternal
-*/
-CV_EXPORTS_W void logPolar( InputArray src, OutputArray dst,
-                            Point2f center, double M, int flags );
-
-/** @brief Remaps an image to polar coordinates space.
-
-@deprecated This function produces same result as cv::warpPolar(src, dst, src.size(), center, maxRadius, flags)
-
-@internal
-Transform the source image using the following transformation (See @ref polar_remaps_reference_image "Polar remaps reference image c)"):
-\f[\begin{array}{l}
-  dst( \rho , \phi ) = src(x,y) \\
-  dst.size() \leftarrow src.size()
-\end{array}\f]
-
-where
-\f[\begin{array}{l}
-  I = (dx,dy) = (x - center.x,y - center.y) \\
-  \rho = Kmag \cdot \texttt{magnitude} (I) ,\\
-  \phi = angle \cdot \texttt{angle} (I)
-\end{array}\f]
-
-and
-\f[\begin{array}{l}
-  Kx = src.cols / maxRadius \\
-  Ky = src.rows / 2\Pi
-\end{array}\f]
-
-
-@param src Source image
-@param dst Destination image. It will have same size and type as src.
-@param center The transformation center;
-@param maxRadius The radius of the bounding circle to transform. It determines the inverse magnitude scale parameter too.
-@param flags A combination of interpolation methods, see #InterpolationFlags
-
-@note
--   The function can not operate in-place.
--   To calculate magnitude and angle in degrees #cartToPolar is used internally thus angles are measured from 0 to 360 with accuracy about 0.3 degrees.
-
-@sa cv::logPolar
-@endinternal
-*/
-CV_EXPORTS_W void linearPolar( InputArray src, OutputArray dst,
-                               Point2f center, double maxRadius, int flags );
-
-
-/** \brief Remaps an image to polar or semilog-polar coordinates space
-
-@anchor polar_remaps_reference_image
-![Polar remaps reference](pics/polar_remap_doc.png)
-
-Transform the source image using the following transformation:
-\f[
-dst(\rho , \phi ) = src(x,y)
-\f]
-
-where
-\f[
-\begin{array}{l}
-\vec{I} = (x - center.x, \;y - center.y) \\
-\phi = Kangle \cdot \texttt{angle} (\vec{I}) \\
-\rho = \left\{\begin{matrix}
-Klin \cdot \texttt{magnitude} (\vec{I}) & default \\
-Klog \cdot log_e(\texttt{magnitude} (\vec{I})) & if \; semilog \\
-\end{matrix}\right.
-\end{array}
-\f]
-
-and
-\f[
-\begin{array}{l}
-Kangle = dsize.height / 2\Pi \\
-Klin = dsize.width / maxRadius \\
-Klog = dsize.width / log_e(maxRadius) \\
-\end{array}
-\f]
-
-
-\par Linear vs semilog mapping
-
-Polar mapping can be linear or semi-log. Add one of #WarpPolarMode to `flags` to specify the polar mapping mode.
-
-Linear is the default mode.
-
-The semilog mapping emulates the human "foveal" vision that permit very high acuity on the line of sight (central vision)
-in contrast to peripheral vision where acuity is minor.
-
-\par Option on `dsize`:
-
-- if both values in `dsize <=0 ` (default),
-the destination image will have (almost) same area of source bounding circle:
-\f[\begin{array}{l}
-dsize.area  \leftarrow (maxRadius^2 \cdot \Pi) \\
-dsize.width = \texttt{cvRound}(maxRadius) \\
-dsize.height = \texttt{cvRound}(maxRadius \cdot \Pi) \\
-\end{array}\f]
-
-
-- if only `dsize.height <= 0`,
-the destination image area will be proportional to the bounding circle area but scaled by `Kx * Kx`:
-\f[\begin{array}{l}
-dsize.height = \texttt{cvRound}(dsize.width \cdot \Pi) \\
-\end{array}
-\f]
-
-- if both values in `dsize > 0 `,
-the destination image will have the given size therefore the area of the bounding circle will be scaled to `dsize`.
-
-
-\par Reverse mapping
-
-You can get reverse mapping adding #WARP_INVERSE_MAP to `flags`
-\snippet polar_transforms.cpp InverseMap
-
-In addiction, to calculate the original coordinate from a polar mapped coordinate \f$(rho, phi)->(x, y)\f$:
-\snippet polar_transforms.cpp InverseCoordinate
-
-@param src Source image.
-@param dst Destination image. It will have same type as src.
-@param dsize The destination image size (see description for valid options).
-@param center The transformation center.
-@param maxRadius The radius of the bounding circle to transform. It determines the inverse magnitude scale parameter too.
-@param flags A combination of interpolation methods, #InterpolationFlags + #WarpPolarMode.
-            - Add #WARP_POLAR_LINEAR to select linear polar mapping (default)
-            - Add #WARP_POLAR_LOG to select semilog polar mapping
-            - Add #WARP_INVERSE_MAP for reverse mapping.
-@note
--  The function can not operate in-place.
--  To calculate magnitude and angle in degrees #cartToPolar is used internally thus angles are measured from 0 to 360 with accuracy about 0.3 degrees.
--  This function uses #remap. Due to current implementation limitations the size of an input and output images should be less than 32767x32767.
-
-@sa cv::remap
-*/
-CV_EXPORTS_W void warpPolar(InputArray src, OutputArray dst, Size dsize,
-                            Point2f center, double maxRadius, int flags);
-
-
-//! @} imgproc_transform
-
-//! @addtogroup imgproc_misc
-//! @{
-
-/** @brief Calculates the integral of an image.
-
-The function calculates one or more integral images for the source image as follows:
-
-\f[\texttt{sum} (X,Y) =  \sum _{x<X,y<Y}  \texttt{image} (x,y)\f]
-
-\f[\texttt{sqsum} (X,Y) =  \sum _{x<X,y<Y}  \texttt{image} (x,y)^2\f]
-
-\f[\texttt{tilted} (X,Y) =  \sum _{y<Y,abs(x-X+1) \leq Y-y-1}  \texttt{image} (x,y)\f]
-
-Using these integral images, you can calculate sum, mean, and standard deviation over a specific
-up-right or rotated rectangular region of the image in a constant time, for example:
-
-\f[\sum _{x_1 \leq x < x_2,  \, y_1  \leq y < y_2}  \texttt{image} (x,y) =  \texttt{sum} (x_2,y_2)- \texttt{sum} (x_1,y_2)- \texttt{sum} (x_2,y_1)+ \texttt{sum} (x_1,y_1)\f]
-
-It makes possible to do a fast blurring or fast block correlation with a variable window size, for
-example. In case of multi-channel images, sums for each channel are accumulated independently.
-
-As a practical example, the next figure shows the calculation of the integral of a straight
-rectangle Rect(3,3,3,2) and of a tilted rectangle Rect(5,1,2,3) . The selected pixels in the
-original image are shown, as well as the relative pixels in the integral images sum and tilted .
-
-![integral calculation example](pics/integral.png)
-
-@param src input image as \f$W \times H\f$, 8-bit or floating-point (32f or 64f).
-@param sum integral image as \f$(W+1)\times (H+1)\f$ , 32-bit integer or floating-point (32f or 64f).
-@param sqsum integral image for squared pixel values; it is \f$(W+1)\times (H+1)\f$, double-precision
-floating-point (64f) array.
-@param tilted integral for the image rotated by 45 degrees; it is \f$(W+1)\times (H+1)\f$ array with
-the same data type as sum.
-@param sdepth desired depth of the integral and the tilted integral images, CV_32S, CV_32F, or
-CV_64F.
-@param sqdepth desired depth of the integral image of squared pixel values, CV_32F or CV_64F.
- */
-CV_EXPORTS_AS(integral3) void integral( InputArray src, OutputArray sum,
-                                        OutputArray sqsum, OutputArray tilted,
-                                        int sdepth = -1, int sqdepth = -1 );
-
-/** @overload */
-CV_EXPORTS_W void integral( InputArray src, OutputArray sum, int sdepth = -1 );
-
-/** @overload */
-CV_EXPORTS_AS(integral2) void integral( InputArray src, OutputArray sum,
-                                        OutputArray sqsum, int sdepth = -1, int sqdepth = -1 );
-
-//! @} imgproc_misc
-
-//! @addtogroup imgproc_motion
-//! @{
-
-/** @brief Adds an image to the accumulator image.
-
-The function adds src or some of its elements to dst :
-
-\f[\texttt{dst} (x,y)  \leftarrow \texttt{dst} (x,y) +  \texttt{src} (x,y)  \quad \text{if} \quad \texttt{mask} (x,y)  \ne 0\f]
-
-The function supports multi-channel images. Each channel is processed independently.
-
-The function cv::accumulate can be used, for example, to collect statistics of a scene background
-viewed by a still camera and for the further foreground-background segmentation.
-
-@param src Input image of type CV_8UC(n), CV_16UC(n), CV_32FC(n) or CV_64FC(n), where n is a positive integer.
-@param dst %Accumulator image with the same number of channels as input image, and a depth of CV_32F or CV_64F.
-@param mask Optional operation mask.
-
-@sa  accumulateSquare, accumulateProduct, accumulateWeighted
- */
-CV_EXPORTS_W void accumulate( InputArray src, InputOutputArray dst,
-                              InputArray mask = noArray() );
-
-/** @brief Adds the square of a source image to the accumulator image.
-
-The function adds the input image src or its selected region, raised to a power of 2, to the
-accumulator dst :
-
-\f[\texttt{dst} (x,y)  \leftarrow \texttt{dst} (x,y) +  \texttt{src} (x,y)^2  \quad \text{if} \quad \texttt{mask} (x,y)  \ne 0\f]
-
-The function supports multi-channel images. Each channel is processed independently.
-
-@param src Input image as 1- or 3-channel, 8-bit or 32-bit floating point.
-@param dst %Accumulator image with the same number of channels as input image, 32-bit or 64-bit
-floating-point.
-@param mask Optional operation mask.
-
-@sa  accumulateSquare, accumulateProduct, accumulateWeighted
- */
-CV_EXPORTS_W void accumulateSquare( InputArray src, InputOutputArray dst,
-                                    InputArray mask = noArray() );
-
-/** @brief Adds the per-element product of two input images to the accumulator image.
-
-The function adds the product of two images or their selected regions to the accumulator dst :
-
-\f[\texttt{dst} (x,y)  \leftarrow \texttt{dst} (x,y) +  \texttt{src1} (x,y)  \cdot \texttt{src2} (x,y)  \quad \text{if} \quad \texttt{mask} (x,y)  \ne 0\f]
-
-The function supports multi-channel images. Each channel is processed independently.
-
-@param src1 First input image, 1- or 3-channel, 8-bit or 32-bit floating point.
-@param src2 Second input image of the same type and the same size as src1 .
-@param dst %Accumulator image with the same number of channels as input images, 32-bit or 64-bit
-floating-point.
-@param mask Optional operation mask.
-
-@sa  accumulate, accumulateSquare, accumulateWeighted
- */
-CV_EXPORTS_W void accumulateProduct( InputArray src1, InputArray src2,
-                                     InputOutputArray dst, InputArray mask=noArray() );
-
-/** @brief Updates a running average.
-
-The function calculates the weighted sum of the input image src and the accumulator dst so that dst
-becomes a running average of a frame sequence:
-
-\f[\texttt{dst} (x,y)  \leftarrow (1- \texttt{alpha} )  \cdot \texttt{dst} (x,y) +  \texttt{alpha} \cdot \texttt{src} (x,y)  \quad \text{if} \quad \texttt{mask} (x,y)  \ne 0\f]
-
-That is, alpha regulates the update speed (how fast the accumulator "forgets" about earlier images).
-The function supports multi-channel images. Each channel is processed independently.
-
-@param src Input image as 1- or 3-channel, 8-bit or 32-bit floating point.
-@param dst %Accumulator image with the same number of channels as input image, 32-bit or 64-bit
-floating-point.
-@param alpha Weight of the input image.
-@param mask Optional operation mask.
-
-@sa  accumulate, accumulateSquare, accumulateProduct
- */
-CV_EXPORTS_W void accumulateWeighted( InputArray src, InputOutputArray dst,
-                                      double alpha, InputArray mask = noArray() );
-
-/** @brief The function is used to detect translational shifts that occur between two images.
-
-The operation takes advantage of the Fourier shift theorem for detecting the translational shift in
-the frequency domain. It can be used for fast image registration as well as motion estimation. For
-more information please see <http://en.wikipedia.org/wiki/Phase_correlation>
-
-Calculates the cross-power spectrum of two supplied source arrays. The arrays are padded if needed
-with getOptimalDFTSize.
-
-The function performs the following equations:
-- First it applies a Hanning window (see <http://en.wikipedia.org/wiki/Hann_function>) to each
-image to remove possible edge effects. This window is cached until the array size changes to speed
-up processing time.
-- Next it computes the forward DFTs of each source array:
-\f[\mathbf{G}_a = \mathcal{F}\{src_1\}, \; \mathbf{G}_b = \mathcal{F}\{src_2\}\f]
-where \f$\mathcal{F}\f$ is the forward DFT.
-- It then computes the cross-power spectrum of each frequency domain array:
-\f[R = \frac{ \mathbf{G}_a \mathbf{G}_b^*}{|\mathbf{G}_a \mathbf{G}_b^*|}\f]
-- Next the cross-correlation is converted back into the time domain via the inverse DFT:
-\f[r = \mathcal{F}^{-1}\{R\}\f]
-- Finally, it computes the peak location and computes a 5x5 weighted centroid around the peak to
-achieve sub-pixel accuracy.
-\f[(\Delta x, \Delta y) = \texttt{weightedCentroid} \{\arg \max_{(x, y)}\{r\}\}\f]
-- If non-zero, the response parameter is computed as the sum of the elements of r within the 5x5
-centroid around the peak location. It is normalized to a maximum of 1 (meaning there is a single
-peak) and will be smaller when there are multiple peaks.
-
-@param src1 Source floating point array (CV_32FC1 or CV_64FC1)
-@param src2 Source floating point array (CV_32FC1 or CV_64FC1)
-@param window Floating point array with windowing coefficients to reduce edge effects (optional).
-@param response Signal power within the 5x5 centroid around the peak, between 0 and 1 (optional).
-@returns detected phase shift (sub-pixel) between the two arrays.
-
-@sa dft, getOptimalDFTSize, idft, mulSpectrums createHanningWindow
- */
-CV_EXPORTS_W Point2d phaseCorrelate(InputArray src1, InputArray src2,
-                                    InputArray window = noArray(), CV_OUT double* response = 0);
-
-/** @brief This function computes a Hanning window coefficients in two dimensions.
-
-See (http://en.wikipedia.org/wiki/Hann_function) and (http://en.wikipedia.org/wiki/Window_function)
-for more information.
-
-An example is shown below:
-@code
-    // create hanning window of size 100x100 and type CV_32F
-    Mat hann;
-    createHanningWindow(hann, Size(100, 100), CV_32F);
-@endcode
-@param dst Destination array to place Hann coefficients in
-@param winSize The window size specifications (both width and height must be > 1)
-@param type Created array type
- */
-CV_EXPORTS_W void createHanningWindow(OutputArray dst, Size winSize, int type);
-
-/** @brief Performs the per-element division of the first Fourier spectrum by the second Fourier spectrum.
-
-The function cv::divSpectrums performs the per-element division of the first array by the second array.
-The arrays are CCS-packed or complex matrices that are results of a real or complex Fourier transform.
-
-@param a first input array.
-@param b second input array of the same size and type as src1 .
-@param c output array of the same size and type as src1 .
-@param flags operation flags; currently, the only supported flag is cv::DFT_ROWS, which indicates that
-each row of src1 and src2 is an independent 1D Fourier spectrum. If you do not want to use this flag, then simply add a `0` as value.
-@param conjB optional flag that conjugates the second input array before the multiplication (true)
-or not (false).
-*/
-CV_EXPORTS_W void divSpectrums(InputArray a, InputArray b, OutputArray c,
-                               int flags, bool conjB = false);
-
-//! @} imgproc_motion
-
-//! @addtogroup imgproc_misc
-//! @{
-
-/** @brief Applies a fixed-level threshold to each array element.
-
-The function applies fixed-level thresholding to a multiple-channel array. The function is typically
-used to get a bi-level (binary) image out of a grayscale image ( #compare could be also used for
-this purpose) or for removing a noise, that is, filtering out pixels with too small or too large
-values. There are several types of thresholding supported by the function. They are determined by
-type parameter.
-
-Also, the special values #THRESH_OTSU or #THRESH_TRIANGLE may be combined with one of the
-above values. In these cases, the function determines the optimal threshold value using the Otsu's
-or Triangle algorithm and uses it instead of the specified thresh.
-
-@note Currently, the Otsu's and Triangle methods are implemented only for 8-bit single-channel images.
-
-@param src input array (multiple-channel, 8-bit or 32-bit floating point).
-@param dst output array of the same size  and type and the same number of channels as src.
-@param thresh threshold value.
-@param maxval maximum value to use with the #THRESH_BINARY and #THRESH_BINARY_INV thresholding
-types.
-@param type thresholding type (see #ThresholdTypes).
-@return the computed threshold value if Otsu's or Triangle methods used.
-
-@sa  adaptiveThreshold, findContours, compare, min, max
- */
-CV_EXPORTS_W double threshold( InputArray src, OutputArray dst,
-                               double thresh, double maxval, int type );
-
-
-/** @brief Applies an adaptive threshold to an array.
-
-The function transforms a grayscale image to a binary image according to the formulae:
--   **THRESH_BINARY**
-    \f[dst(x,y) =  \fork{\texttt{maxValue}}{if \(src(x,y) > T(x,y)\)}{0}{otherwise}\f]
--   **THRESH_BINARY_INV**
-    \f[dst(x,y) =  \fork{0}{if \(src(x,y) > T(x,y)\)}{\texttt{maxValue}}{otherwise}\f]
-where \f$T(x,y)\f$ is a threshold calculated individually for each pixel (see adaptiveMethod parameter).
-
-The function can process the image in-place.
-
-@param src Source 8-bit single-channel image.
-@param dst Destination image of the same size and the same type as src.
-@param maxValue Non-zero value assigned to the pixels for which the condition is satisfied
-@param adaptiveMethod Adaptive thresholding algorithm to use, see #AdaptiveThresholdTypes.
-The #BORDER_REPLICATE | #BORDER_ISOLATED is used to process boundaries.
-@param thresholdType Thresholding type that must be either #THRESH_BINARY or #THRESH_BINARY_INV,
-see #ThresholdTypes.
-@param blockSize Size of a pixel neighborhood that is used to calculate a threshold value for the
-pixel: 3, 5, 7, and so on.
-@param C Constant subtracted from the mean or weighted mean (see the details below). Normally, it
-is positive but may be zero or negative as well.
-
-@sa  threshold, blur, GaussianBlur
- */
-CV_EXPORTS_W void adaptiveThreshold( InputArray src, OutputArray dst,
-                                     double maxValue, int adaptiveMethod,
-                                     int thresholdType, int blockSize, double C );
-
-//! @} imgproc_misc
-
-//! @addtogroup imgproc_filter
-//! @{
-
-/** @example samples/cpp/tutorial_code/ImgProc/Pyramids/Pyramids.cpp
-An example using pyrDown and pyrUp functions
-*/
-
-/** @brief Blurs an image and downsamples it.
-
-By default, size of the output image is computed as `Size((src.cols+1)/2, (src.rows+1)/2)`, but in
-any case, the following conditions should be satisfied:
-
-\f[\begin{array}{l} | \texttt{dstsize.width} *2-src.cols| \leq 2 \\ | \texttt{dstsize.height} *2-src.rows| \leq 2 \end{array}\f]
-
-The function performs the downsampling step of the Gaussian pyramid construction. First, it
-convolves the source image with the kernel:
-
-\f[\frac{1}{256} \begin{bmatrix} 1 & 4 & 6 & 4 & 1  \\ 4 & 16 & 24 & 16 & 4  \\ 6 & 24 & 36 & 24 & 6  \\ 4 & 16 & 24 & 16 & 4  \\ 1 & 4 & 6 & 4 & 1 \end{bmatrix}\f]
-
-Then, it downsamples the image by rejecting even rows and columns.
-
-@param src input image.
-@param dst output image; it has the specified size and the same type as src.
-@param dstsize size of the output image.
-@param borderType Pixel extrapolation method, see #BorderTypes (#BORDER_CONSTANT isn't supported)
- */
-CV_EXPORTS_W void pyrDown( InputArray src, OutputArray dst,
-                           const Size& dstsize = Size(), int borderType = BORDER_DEFAULT );
-
-/** @brief Upsamples an image and then blurs it.
-
-By default, size of the output image is computed as `Size(src.cols\*2, (src.rows\*2)`, but in any
-case, the following conditions should be satisfied:
-
-\f[\begin{array}{l} | \texttt{dstsize.width} -src.cols*2| \leq  ( \texttt{dstsize.width}   \mod  2)  \\ | \texttt{dstsize.height} -src.rows*2| \leq  ( \texttt{dstsize.height}   \mod  2) \end{array}\f]
-
-The function performs the upsampling step of the Gaussian pyramid construction, though it can
-actually be used to construct the Laplacian pyramid. First, it upsamples the source image by
-injecting even zero rows and columns and then convolves the result with the same kernel as in
-pyrDown multiplied by 4.
-
-@param src input image.
-@param dst output image. It has the specified size and the same type as src .
-@param dstsize size of the output image.
-@param borderType Pixel extrapolation method, see #BorderTypes (only #BORDER_DEFAULT is supported)
- */
-CV_EXPORTS_W void pyrUp( InputArray src, OutputArray dst,
-                         const Size& dstsize = Size(), int borderType = BORDER_DEFAULT );
-
-/** @brief Constructs the Gaussian pyramid for an image.
-
-The function constructs a vector of images and builds the Gaussian pyramid by recursively applying
-pyrDown to the previously built pyramid layers, starting from `dst[0]==src`.
-
-@param src Source image. Check pyrDown for the list of supported types.
-@param dst Destination vector of maxlevel+1 images of the same type as src. dst[0] will be the
-same as src. dst[1] is the next pyramid layer, a smoothed and down-sized src, and so on.
-@param maxlevel 0-based index of the last (the smallest) pyramid layer. It must be non-negative.
-@param borderType Pixel extrapolation method, see #BorderTypes (#BORDER_CONSTANT isn't supported)
- */
-CV_EXPORTS void buildPyramid( InputArray src, OutputArrayOfArrays dst,
-                              int maxlevel, int borderType = BORDER_DEFAULT );
-
-//! @} imgproc_filter
-
-//! @addtogroup imgproc_hist
-//! @{
-
-/** @example samples/cpp/demhist.cpp
-An example for creating histograms of an image
-*/
-
-/** @brief Calculates a histogram of a set of arrays.
-
-The function cv::calcHist calculates the histogram of one or more arrays. The elements of a tuple used
-to increment a histogram bin are taken from the corresponding input arrays at the same location. The
-sample below shows how to compute a 2D Hue-Saturation histogram for a color image. :
-@include snippets/imgproc_calcHist.cpp
-
-@param images Source arrays. They all should have the same depth, CV_8U, CV_16U or CV_32F , and the same
-size. Each of them can have an arbitrary number of channels.
-@param nimages Number of source images.
-@param channels List of the dims channels used to compute the histogram. The first array channels
-are numerated from 0 to images[0].channels()-1 , the second array channels are counted from
-images[0].channels() to images[0].channels() + images[1].channels()-1, and so on.
-@param mask Optional mask. If the matrix is not empty, it must be an 8-bit array of the same size
-as images[i] . The non-zero mask elements mark the array elements counted in the histogram.
-@param hist Output histogram, which is a dense or sparse dims -dimensional array.
-@param dims Histogram dimensionality that must be positive and not greater than CV_MAX_DIMS
-(equal to 32 in the current OpenCV version).
-@param histSize Array of histogram sizes in each dimension.
-@param ranges Array of the dims arrays of the histogram bin boundaries in each dimension. When the
-histogram is uniform ( uniform =true), then for each dimension i it is enough to specify the lower
-(inclusive) boundary \f$L_0\f$ of the 0-th histogram bin and the upper (exclusive) boundary
-\f$U_{\texttt{histSize}[i]-1}\f$ for the last histogram bin histSize[i]-1 . That is, in case of a
-uniform histogram each of ranges[i] is an array of 2 elements. When the histogram is not uniform (
-uniform=false ), then each of ranges[i] contains histSize[i]+1 elements:
-\f$L_0, U_0=L_1, U_1=L_2, ..., U_{\texttt{histSize[i]}-2}=L_{\texttt{histSize[i]}-1}, U_{\texttt{histSize[i]}-1}\f$
-. The array elements, that are not between \f$L_0\f$ and \f$U_{\texttt{histSize[i]}-1}\f$ , are not
-counted in the histogram.
-@param uniform Flag indicating whether the histogram is uniform or not (see above).
-@param accumulate Accumulation flag. If it is set, the histogram is not cleared in the beginning
-when it is allocated. This feature enables you to compute a single histogram from several sets of
-arrays, or to update the histogram in time.
-*/
-CV_EXPORTS void calcHist( const Mat* images, int nimages,
-                          const int* channels, InputArray mask,
-                          OutputArray hist, int dims, const int* histSize,
-                          const float** ranges, bool uniform = true, bool accumulate = false );
-
-/** @overload
-
-this variant uses %SparseMat for output
-*/
-CV_EXPORTS void calcHist( const Mat* images, int nimages,
-                          const int* channels, InputArray mask,
-                          SparseMat& hist, int dims,
-                          const int* histSize, const float** ranges,
-                          bool uniform = true, bool accumulate = false );
-
-/** @overload */
-CV_EXPORTS_W void calcHist( InputArrayOfArrays images,
-                            const std::vector<int>& channels,
-                            InputArray mask, OutputArray hist,
-                            const std::vector<int>& histSize,
-                            const std::vector<float>& ranges,
-                            bool accumulate = false );
-
-/** @brief Calculates the back projection of a histogram.
-
-The function cv::calcBackProject calculates the back project of the histogram. That is, similarly to
-#calcHist , at each location (x, y) the function collects the values from the selected channels
-in the input images and finds the corresponding histogram bin. But instead of incrementing it, the
-function reads the bin value, scales it by scale , and stores in backProject(x,y) . In terms of
-statistics, the function computes probability of each element value in respect with the empirical
-probability distribution represented by the histogram. See how, for example, you can find and track
-a bright-colored object in a scene:
-
-- Before tracking, show the object to the camera so that it covers almost the whole frame.
-Calculate a hue histogram. The histogram may have strong maximums, corresponding to the dominant
-colors in the object.
-
-- When tracking, calculate a back projection of a hue plane of each input video frame using that
-pre-computed histogram. Threshold the back projection to suppress weak colors. It may also make
-sense to suppress pixels with non-sufficient color saturation and too dark or too bright pixels.
-
-- Find connected components in the resulting picture and choose, for example, the largest
-component.
-
-This is an approximate algorithm of the CamShift color object tracker.
-
-@param images Source arrays. They all should have the same depth, CV_8U, CV_16U or CV_32F , and the same
-size. Each of them can have an arbitrary number of channels.
-@param nimages Number of source images.
-@param channels The list of channels used to compute the back projection. The number of channels
-must match the histogram dimensionality. The first array channels are numerated from 0 to
-images[0].channels()-1 , the second array channels are counted from images[0].channels() to
-images[0].channels() + images[1].channels()-1, and so on.
-@param hist Input histogram that can be dense or sparse.
-@param backProject Destination back projection array that is a single-channel array of the same
-size and depth as images[0] .
-@param ranges Array of arrays of the histogram bin boundaries in each dimension. See #calcHist .
-@param scale Optional scale factor for the output back projection.
-@param uniform Flag indicating whether the histogram is uniform or not (see above).
-
-@sa calcHist, compareHist
- */
-CV_EXPORTS void calcBackProject( const Mat* images, int nimages,
-                                 const int* channels, InputArray hist,
-                                 OutputArray backProject, const float** ranges,
-                                 double scale = 1, bool uniform = true );
-
-/** @overload */
-CV_EXPORTS void calcBackProject( const Mat* images, int nimages,
-                                 const int* channels, const SparseMat& hist,
-                                 OutputArray backProject, const float** ranges,
-                                 double scale = 1, bool uniform = true );
-
-/** @overload */
-CV_EXPORTS_W void calcBackProject( InputArrayOfArrays images, const std::vector<int>& channels,
-                                   InputArray hist, OutputArray dst,
-                                   const std::vector<float>& ranges,
-                                   double scale );
-
-/** @brief Compares two histograms.
-
-The function cv::compareHist compares two dense or two sparse histograms using the specified method.
-
-The function returns \f$d(H_1, H_2)\f$ .
-
-While the function works well with 1-, 2-, 3-dimensional dense histograms, it may not be suitable
-for high-dimensional sparse histograms. In such histograms, because of aliasing and sampling
-problems, the coordinates of non-zero histogram bins can slightly shift. To compare such histograms
-or more general sparse configurations of weighted points, consider using the #EMD function.
-
-@param H1 First compared histogram.
-@param H2 Second compared histogram of the same size as H1 .
-@param method Comparison method, see #HistCompMethods
- */
-CV_EXPORTS_W double compareHist( InputArray H1, InputArray H2, int method );
-
-/** @overload */
-CV_EXPORTS double compareHist( const SparseMat& H1, const SparseMat& H2, int method );
-
-/** @brief Equalizes the histogram of a grayscale image.
-
-The function equalizes the histogram of the input image using the following algorithm:
-
-- Calculate the histogram \f$H\f$ for src .
-- Normalize the histogram so that the sum of histogram bins is 255.
-- Compute the integral of the histogram:
-\f[H'_i =  \sum _{0  \le j < i} H(j)\f]
-- Transform the image using \f$H'\f$ as a look-up table: \f$\texttt{dst}(x,y) = H'(\texttt{src}(x,y))\f$
-
-The algorithm normalizes the brightness and increases the contrast of the image.
-
-@param src Source 8-bit single channel image.
-@param dst Destination image of the same size and type as src .
- */
-CV_EXPORTS_W void equalizeHist( InputArray src, OutputArray dst );
-
-/** @brief Creates a smart pointer to a cv::CLAHE class and initializes it.
-
-@param clipLimit Threshold for contrast limiting.
-@param tileGridSize Size of grid for histogram equalization. Input image will be divided into
-equally sized rectangular tiles. tileGridSize defines the number of tiles in row and column.
- */
-CV_EXPORTS_W Ptr<CLAHE> createCLAHE(double clipLimit = 40.0, Size tileGridSize = Size(8, 8));
-
-/** @brief Computes the "minimal work" distance between two weighted point configurations.
-
-The function computes the earth mover distance and/or a lower boundary of the distance between the
-two weighted point configurations. One of the applications described in @cite RubnerSept98,
-@cite Rubner2000 is multi-dimensional histogram comparison for image retrieval. EMD is a transportation
-problem that is solved using some modification of a simplex algorithm, thus the complexity is
-exponential in the worst case, though, on average it is much faster. In the case of a real metric
-the lower boundary can be calculated even faster (using linear-time algorithm) and it can be used
-to determine roughly whether the two signatures are far enough so that they cannot relate to the
-same object.
-
-@param signature1 First signature, a \f$\texttt{size1}\times \texttt{dims}+1\f$ floating-point matrix.
-Each row stores the point weight followed by the point coordinates. The matrix is allowed to have
-a single column (weights only) if the user-defined cost matrix is used. The weights must be
-non-negative and have at least one non-zero value.
-@param signature2 Second signature of the same format as signature1 , though the number of rows
-may be different. The total weights may be different. In this case an extra "dummy" point is added
-to either signature1 or signature2. The weights must be non-negative and have at least one non-zero
-value.
-@param distType Used metric. See #DistanceTypes.
-@param cost User-defined \f$\texttt{size1}\times \texttt{size2}\f$ cost matrix. Also, if a cost matrix
-is used, lower boundary lowerBound cannot be calculated because it needs a metric function.
-@param lowerBound Optional input/output parameter: lower boundary of a distance between the two
-signatures that is a distance between mass centers. The lower boundary may not be calculated if
-the user-defined cost matrix is used, the total weights of point configurations are not equal, or
-if the signatures consist of weights only (the signature matrices have a single column). You
-**must** initialize \*lowerBound . If the calculated distance between mass centers is greater or
-equal to \*lowerBound (it means that the signatures are far enough), the function does not
-calculate EMD. In any case \*lowerBound is set to the calculated distance between mass centers on
-return. Thus, if you want to calculate both distance between mass centers and EMD, \*lowerBound
-should be set to 0.
-@param flow Resultant \f$\texttt{size1} \times \texttt{size2}\f$ flow matrix: \f$\texttt{flow}_{i,j}\f$ is
-a flow from \f$i\f$ -th point of signature1 to \f$j\f$ -th point of signature2 .
- */
-CV_EXPORTS float EMD( InputArray signature1, InputArray signature2,
-                      int distType, InputArray cost=noArray(),
-                      float* lowerBound = 0, OutputArray flow = noArray() );
-
-CV_EXPORTS_AS(EMD) float wrapperEMD( InputArray signature1, InputArray signature2,
-                      int distType, InputArray cost=noArray(),
-                      CV_IN_OUT Ptr<float> lowerBound = Ptr<float>(), OutputArray flow = noArray() );
-
-//! @} imgproc_hist
-
-//! @addtogroup imgproc_segmentation
-//! @{
-
-/** @example samples/cpp/watershed.cpp
-An example using the watershed algorithm
-*/
-
-/** @brief Performs a marker-based image segmentation using the watershed algorithm.
-
-The function implements one of the variants of watershed, non-parametric marker-based segmentation
-algorithm, described in @cite Meyer92 .
-
-Before passing the image to the function, you have to roughly outline the desired regions in the
-image markers with positive (\>0) indices. So, every region is represented as one or more connected
-components with the pixel values 1, 2, 3, and so on. Such markers can be retrieved from a binary
-mask using #findContours and #drawContours (see the watershed.cpp demo). The markers are "seeds" of
-the future image regions. All the other pixels in markers , whose relation to the outlined regions
-is not known and should be defined by the algorithm, should be set to 0's. In the function output,
-each pixel in markers is set to a value of the "seed" components or to -1 at boundaries between the
-regions.
-
-@note Any two neighbor connected components are not necessarily separated by a watershed boundary
-(-1's pixels); for example, they can touch each other in the initial marker image passed to the
-function.
-
-@param image Input 8-bit 3-channel image.
-@param markers Input/output 32-bit single-channel image (map) of markers. It should have the same
-size as image .
-
-@sa findContours
- */
-CV_EXPORTS_W void watershed( InputArray image, InputOutputArray markers );
-
-//! @} imgproc_segmentation
-
-//! @addtogroup imgproc_filter
-//! @{
-
-/** @brief Performs initial step of meanshift segmentation of an image.
-
-The function implements the filtering stage of meanshift segmentation, that is, the output of the
-function is the filtered "posterized" image with color gradients and fine-grain texture flattened.
-At every pixel (X,Y) of the input image (or down-sized input image, see below) the function executes
-meanshift iterations, that is, the pixel (X,Y) neighborhood in the joint space-color hyperspace is
-considered:
-
-\f[(x,y): X- \texttt{sp} \le x  \le X+ \texttt{sp} , Y- \texttt{sp} \le y  \le Y+ \texttt{sp} , ||(R,G,B)-(r,g,b)||   \le \texttt{sr}\f]
-
-where (R,G,B) and (r,g,b) are the vectors of color components at (X,Y) and (x,y), respectively
-(though, the algorithm does not depend on the color space used, so any 3-component color space can
-be used instead). Over the neighborhood the average spatial value (X',Y') and average color vector
-(R',G',B') are found and they act as the neighborhood center on the next iteration:
-
-\f[(X,Y)~(X',Y'), (R,G,B)~(R',G',B').\f]
-
-After the iterations over, the color components of the initial pixel (that is, the pixel from where
-the iterations started) are set to the final value (average color at the last iteration):
-
-\f[I(X,Y) <- (R*,G*,B*)\f]
-
-When maxLevel \> 0, the gaussian pyramid of maxLevel+1 levels is built, and the above procedure is
-run on the smallest layer first. After that, the results are propagated to the larger layer and the
-iterations are run again only on those pixels where the layer colors differ by more than sr from the
-lower-resolution layer of the pyramid. That makes boundaries of color regions sharper. Note that the
-results will be actually different from the ones obtained by running the meanshift procedure on the
-whole original image (i.e. when maxLevel==0).
-
-@param src The source 8-bit, 3-channel image.
-@param dst The destination image of the same format and the same size as the source.
-@param sp The spatial window radius.
-@param sr The color window radius.
-@param maxLevel Maximum level of the pyramid for the segmentation.
-@param termcrit Termination criteria: when to stop meanshift iterations.
- */
-CV_EXPORTS_W void pyrMeanShiftFiltering( InputArray src, OutputArray dst,
-                                         double sp, double sr, int maxLevel = 1,
-                                         TermCriteria termcrit=TermCriteria(TermCriteria::MAX_ITER+TermCriteria::EPS,5,1) );
-
-//! @}
-
-//! @addtogroup imgproc_segmentation
-//! @{
-
-/** @example samples/cpp/grabcut.cpp
-An example using the GrabCut algorithm
-![Sample Screenshot](grabcut_output1.jpg)
-*/
-
-/** @brief Runs the GrabCut algorithm.
-
-The function implements the [GrabCut image segmentation algorithm](http://en.wikipedia.org/wiki/GrabCut).
-
-@param img Input 8-bit 3-channel image.
-@param mask Input/output 8-bit single-channel mask. The mask is initialized by the function when
-mode is set to #GC_INIT_WITH_RECT. Its elements may have one of the #GrabCutClasses.
-@param rect ROI containing a segmented object. The pixels outside of the ROI are marked as
-"obvious background". The parameter is only used when mode==#GC_INIT_WITH_RECT .
-@param bgdModel Temporary array for the background model. Do not modify it while you are
-processing the same image.
-@param fgdModel Temporary arrays for the foreground model. Do not modify it while you are
-processing the same image.
-@param iterCount Number of iterations the algorithm should make before returning the result. Note
-that the result can be refined with further calls with mode==#GC_INIT_WITH_MASK or
-mode==GC_EVAL .
-@param mode Operation mode that could be one of the #GrabCutModes
- */
-CV_EXPORTS_W void grabCut( InputArray img, InputOutputArray mask, Rect rect,
-                           InputOutputArray bgdModel, InputOutputArray fgdModel,
-                           int iterCount, int mode = GC_EVAL );
-
-//! @} imgproc_segmentation
-
-//! @addtogroup imgproc_misc
-//! @{
-
-/** @example samples/cpp/distrans.cpp
-An example on using the distance transform
-*/
-
-/** @brief Calculates the distance to the closest zero pixel for each pixel of the source image.
-
-The function cv::distanceTransform calculates the approximate or precise distance from every binary
-image pixel to the nearest zero pixel. For zero image pixels, the distance will obviously be zero.
-
-When maskSize == #DIST_MASK_PRECISE and distanceType == #DIST_L2 , the function runs the
-algorithm described in @cite Felzenszwalb04 . This algorithm is parallelized with the TBB library.
-
-In other cases, the algorithm @cite Borgefors86 is used. This means that for a pixel the function
-finds the shortest path to the nearest zero pixel consisting of basic shifts: horizontal, vertical,
-diagonal, or knight's move (the latest is available for a \f$5\times 5\f$ mask). The overall
-distance is calculated as a sum of these basic distances. Since the distance function should be
-symmetric, all of the horizontal and vertical shifts must have the same cost (denoted as a ), all
-the diagonal shifts must have the same cost (denoted as `b`), and all knight's moves must have the
-same cost (denoted as `c`). For the #DIST_C and #DIST_L1 types, the distance is calculated
-precisely, whereas for #DIST_L2 (Euclidean distance) the distance can be calculated only with a
-relative error (a \f$5\times 5\f$ mask gives more accurate results). For `a`,`b`, and `c`, OpenCV
-uses the values suggested in the original paper:
-- DIST_L1: `a = 1, b = 2`
-- DIST_L2:
-    - `3 x 3`: `a=0.955, b=1.3693`
-    - `5 x 5`: `a=1, b=1.4, c=2.1969`
-- DIST_C: `a = 1, b = 1`
-
-Typically, for a fast, coarse distance estimation #DIST_L2, a \f$3\times 3\f$ mask is used. For a
-more accurate distance estimation #DIST_L2, a \f$5\times 5\f$ mask or the precise algorithm is used.
-Note that both the precise and the approximate algorithms are linear on the number of pixels.
-
-This variant of the function does not only compute the minimum distance for each pixel \f$(x, y)\f$
-but also identifies the nearest connected component consisting of zero pixels
-(labelType==#DIST_LABEL_CCOMP) or the nearest zero pixel (labelType==#DIST_LABEL_PIXEL). Index of the
-component/pixel is stored in `labels(x, y)`. When labelType==#DIST_LABEL_CCOMP, the function
-automatically finds connected components of zero pixels in the input image and marks them with
-distinct labels. When labelType==#DIST_LABEL_PIXEL, the function scans through the input image and
-marks all the zero pixels with distinct labels.
-
-In this mode, the complexity is still linear. That is, the function provides a very fast way to
-compute the Voronoi diagram for a binary image. Currently, the second variant can use only the
-approximate distance transform algorithm, i.e. maskSize=#DIST_MASK_PRECISE is not supported
-yet.
-
-@param src 8-bit, single-channel (binary) source image.
-@param dst Output image with calculated distances. It is a 8-bit or 32-bit floating-point,
-single-channel image of the same size as src.
-@param labels Output 2D array of labels (the discrete Voronoi diagram). It has the type
-CV_32SC1 and the same size as src.
-@param distanceType Type of distance, see #DistanceTypes
-@param maskSize Size of the distance transform mask, see #DistanceTransformMasks.
-#DIST_MASK_PRECISE is not supported by this variant. In case of the #DIST_L1 or #DIST_C distance type,
-the parameter is forced to 3 because a \f$3\times 3\f$ mask gives the same result as \f$5\times
-5\f$ or any larger aperture.
-@param labelType Type of the label array to build, see #DistanceTransformLabelTypes.
- */
-CV_EXPORTS_AS(distanceTransformWithLabels) void distanceTransform( InputArray src, OutputArray dst,
-                                     OutputArray labels, int distanceType, int maskSize,
-                                     int labelType = DIST_LABEL_CCOMP );
-
-/** @overload
-@param src 8-bit, single-channel (binary) source image.
-@param dst Output image with calculated distances. It is a 8-bit or 32-bit floating-point,
-single-channel image of the same size as src .
-@param distanceType Type of distance, see #DistanceTypes
-@param maskSize Size of the distance transform mask, see #DistanceTransformMasks. In case of the
-#DIST_L1 or #DIST_C distance type, the parameter is forced to 3 because a \f$3\times 3\f$ mask gives
-the same result as \f$5\times 5\f$ or any larger aperture.
-@param dstType Type of output image. It can be CV_8U or CV_32F. Type CV_8U can be used only for
-the first variant of the function and distanceType == #DIST_L1.
-*/
-CV_EXPORTS_W void distanceTransform( InputArray src, OutputArray dst,
-                                     int distanceType, int maskSize, int dstType=CV_32F);
-
-/** @brief Fills a connected component with the given color.
-
-The function cv::floodFill fills a connected component starting from the seed point with the specified
-color. The connectivity is determined by the color/brightness closeness of the neighbor pixels. The
-pixel at \f$(x,y)\f$ is considered to belong to the repainted domain if:
-
-- in case of a grayscale image and floating range
-\f[\texttt{src} (x',y')- \texttt{loDiff} \leq \texttt{src} (x,y)  \leq \texttt{src} (x',y')+ \texttt{upDiff}\f]
-
-
-- in case of a grayscale image and fixed range
-\f[\texttt{src} ( \texttt{seedPoint} .x, \texttt{seedPoint} .y)- \texttt{loDiff} \leq \texttt{src} (x,y)  \leq \texttt{src} ( \texttt{seedPoint} .x, \texttt{seedPoint} .y)+ \texttt{upDiff}\f]
-
-
-- in case of a color image and floating range
-\f[\texttt{src} (x',y')_r- \texttt{loDiff} _r \leq \texttt{src} (x,y)_r \leq \texttt{src} (x',y')_r+ \texttt{upDiff} _r,\f]
-\f[\texttt{src} (x',y')_g- \texttt{loDiff} _g \leq \texttt{src} (x,y)_g \leq \texttt{src} (x',y')_g+ \texttt{upDiff} _g\f]
-and
-\f[\texttt{src} (x',y')_b- \texttt{loDiff} _b \leq \texttt{src} (x,y)_b \leq \texttt{src} (x',y')_b+ \texttt{upDiff} _b\f]
-
-
-- in case of a color image and fixed range
-\f[\texttt{src} ( \texttt{seedPoint} .x, \texttt{seedPoint} .y)_r- \texttt{loDiff} _r \leq \texttt{src} (x,y)_r \leq \texttt{src} ( \texttt{seedPoint} .x, \texttt{seedPoint} .y)_r+ \texttt{upDiff} _r,\f]
-\f[\texttt{src} ( \texttt{seedPoint} .x, \texttt{seedPoint} .y)_g- \texttt{loDiff} _g \leq \texttt{src} (x,y)_g \leq \texttt{src} ( \texttt{seedPoint} .x, \texttt{seedPoint} .y)_g+ \texttt{upDiff} _g\f]
-and
-\f[\texttt{src} ( \texttt{seedPoint} .x, \texttt{seedPoint} .y)_b- \texttt{loDiff} _b \leq \texttt{src} (x,y)_b \leq \texttt{src} ( \texttt{seedPoint} .x, \texttt{seedPoint} .y)_b+ \texttt{upDiff} _b\f]
-
-
-where \f$src(x',y')\f$ is the value of one of pixel neighbors that is already known to belong to the
-component. That is, to be added to the connected component, a color/brightness of the pixel should
-be close enough to:
-- Color/brightness of one of its neighbors that already belong to the connected component in case
-of a floating range.
-- Color/brightness of the seed point in case of a fixed range.
-
-Use these functions to either mark a connected component with the specified color in-place, or build
-a mask and then extract the contour, or copy the region to another image, and so on.
-
-@param image Input/output 1- or 3-channel, 8-bit, or floating-point image. It is modified by the
-function unless the #FLOODFILL_MASK_ONLY flag is set in the second variant of the function. See
-the details below.
-@param mask Operation mask that should be a single-channel 8-bit image, 2 pixels wider and 2 pixels
-taller than image. If an empty Mat is passed it will be created automatically. Since this is both an
-input and output parameter, you must take responsibility of initializing it.
-Flood-filling cannot go across non-zero pixels in the input mask. For example,
-an edge detector output can be used as a mask to stop filling at edges. On output, pixels in the
-mask corresponding to filled pixels in the image are set to 1 or to the specified value in flags
-as described below. Additionally, the function fills the border of the mask with ones to simplify
-internal processing. It is therefore possible to use the same mask in multiple calls to the function
-to make sure the filled areas do not overlap.
-@param seedPoint Starting point.
-@param newVal New value of the repainted domain pixels.
-@param loDiff Maximal lower brightness/color difference between the currently observed pixel and
-one of its neighbors belonging to the component, or a seed pixel being added to the component.
-@param upDiff Maximal upper brightness/color difference between the currently observed pixel and
-one of its neighbors belonging to the component, or a seed pixel being added to the component.
-@param rect Optional output parameter set by the function to the minimum bounding rectangle of the
-repainted domain.
-@param flags Operation flags. The first 8 bits contain a connectivity value. The default value of
-4 means that only the four nearest neighbor pixels (those that share an edge) are considered. A
-connectivity value of 8 means that the eight nearest neighbor pixels (those that share a corner)
-will be considered. The next 8 bits (8-16) contain a value between 1 and 255 with which to fill
-the mask (the default value is 1). For example, 4 | ( 255 \<\< 8 ) will consider 4 nearest
-neighbours and fill the mask with a value of 255. The following additional options occupy higher
-bits and therefore may be further combined with the connectivity and mask fill values using
-bit-wise or (|), see #FloodFillFlags.
-
-@note Since the mask is larger than the filled image, a pixel \f$(x, y)\f$ in image corresponds to the
-pixel \f$(x+1, y+1)\f$ in the mask .
-
-@sa findContours
- */
-CV_EXPORTS_W int floodFill( InputOutputArray image, InputOutputArray mask,
-                            Point seedPoint, Scalar newVal, CV_OUT Rect* rect=0,
-                            Scalar loDiff = Scalar(), Scalar upDiff = Scalar(),
-                            int flags = 4 );
-
-/** @example samples/cpp/ffilldemo.cpp
-An example using the FloodFill technique
-*/
-
-/** @overload
-
-variant without `mask` parameter
-*/
-CV_EXPORTS int floodFill( InputOutputArray image,
-                          Point seedPoint, Scalar newVal, CV_OUT Rect* rect = 0,
-                          Scalar loDiff = Scalar(), Scalar upDiff = Scalar(),
-                          int flags = 4 );
-
-//! Performs linear blending of two images:
-//! \f[ \texttt{dst}(i,j) = \texttt{weights1}(i,j)*\texttt{src1}(i,j) + \texttt{weights2}(i,j)*\texttt{src2}(i,j) \f]
-//! @param src1 It has a type of CV_8UC(n) or CV_32FC(n), where n is a positive integer.
-//! @param src2 It has the same type and size as src1.
-//! @param weights1 It has a type of CV_32FC1 and the same size with src1.
-//! @param weights2 It has a type of CV_32FC1 and the same size with src1.
-//! @param dst It is created if it does not have the same size and type with src1.
-CV_EXPORTS_W void blendLinear(InputArray src1, InputArray src2, InputArray weights1, InputArray weights2, OutputArray dst);
-
-//! @} imgproc_misc
-
-//! @addtogroup imgproc_color_conversions
-//! @{
-
-/** @brief Converts an image from one color space to another.
-
-The function converts an input image from one color space to another. In case of a transformation
-to-from RGB color space, the order of the channels should be specified explicitly (RGB or BGR). Note
-that the default color format in OpenCV is often referred to as RGB but it is actually BGR (the
-bytes are reversed). So the first byte in a standard (24-bit) color image will be an 8-bit Blue
-component, the second byte will be Green, and the third byte will be Red. The fourth, fifth, and
-sixth bytes would then be the second pixel (Blue, then Green, then Red), and so on.
-
-The conventional ranges for R, G, and B channel values are:
--   0 to 255 for CV_8U images
--   0 to 65535 for CV_16U images
--   0 to 1 for CV_32F images
-
-In case of linear transformations, the range does not matter. But in case of a non-linear
-transformation, an input RGB image should be normalized to the proper value range to get the correct
-results, for example, for RGB \f$\rightarrow\f$ L\*u\*v\* transformation. For example, if you have a
-32-bit floating-point image directly converted from an 8-bit image without any scaling, then it will
-have the 0..255 value range instead of 0..1 assumed by the function. So, before calling #cvtColor ,
-you need first to scale the image down:
-@code
-    img *= 1./255;
-    cvtColor(img, img, COLOR_BGR2Luv);
-@endcode
-If you use #cvtColor with 8-bit images, the conversion will have some information lost. For many
-applications, this will not be noticeable but it is recommended to use 32-bit images in applications
-that need the full range of colors or that convert an image before an operation and then convert
-back.
-
-If conversion adds the alpha channel, its value will set to the maximum of corresponding channel
-range: 255 for CV_8U, 65535 for CV_16U, 1 for CV_32F.
-
-@param src input image: 8-bit unsigned, 16-bit unsigned ( CV_16UC... ), or single-precision
-floating-point.
-@param dst output image of the same size and depth as src.
-@param code color space conversion code (see #ColorConversionCodes).
-@param dstCn number of channels in the destination image; if the parameter is 0, the number of the
-channels is derived automatically from src and code.
-
-@see @ref imgproc_color_conversions
- */
-CV_EXPORTS_W void cvtColor( InputArray src, OutputArray dst, int code, int dstCn = 0 );
-
-/** @brief Converts an image from one color space to another where the source image is
-stored in two planes.
-
-This function only supports YUV420 to RGB conversion as of now.
-
-@param src1: 8-bit image (#CV_8U) of the Y plane.
-@param src2: image containing interleaved U/V plane.
-@param dst: output image.
-@param code: Specifies the type of conversion. It can take any of the following values:
-- #COLOR_YUV2BGR_NV12
-- #COLOR_YUV2RGB_NV12
-- #COLOR_YUV2BGRA_NV12
-- #COLOR_YUV2RGBA_NV12
-- #COLOR_YUV2BGR_NV21
-- #COLOR_YUV2RGB_NV21
-- #COLOR_YUV2BGRA_NV21
-- #COLOR_YUV2RGBA_NV21
-*/
-CV_EXPORTS_W void cvtColorTwoPlane( InputArray src1, InputArray src2, OutputArray dst, int code );
-
-/** @brief main function for all demosaicing processes
-
-@param src input image: 8-bit unsigned or 16-bit unsigned.
-@param dst output image of the same size and depth as src.
-@param code Color space conversion code (see the description below).
-@param dstCn number of channels in the destination image; if the parameter is 0, the number of the
-channels is derived automatically from src and code.
-
-The function can do the following transformations:
-
--   Demosaicing using bilinear interpolation
-
-    #COLOR_BayerBG2BGR , #COLOR_BayerGB2BGR , #COLOR_BayerRG2BGR , #COLOR_BayerGR2BGR
-
-    #COLOR_BayerBG2GRAY , #COLOR_BayerGB2GRAY , #COLOR_BayerRG2GRAY , #COLOR_BayerGR2GRAY
-
--   Demosaicing using Variable Number of Gradients.
-
-    #COLOR_BayerBG2BGR_VNG , #COLOR_BayerGB2BGR_VNG , #COLOR_BayerRG2BGR_VNG , #COLOR_BayerGR2BGR_VNG
-
--   Edge-Aware Demosaicing.
-
-    #COLOR_BayerBG2BGR_EA , #COLOR_BayerGB2BGR_EA , #COLOR_BayerRG2BGR_EA , #COLOR_BayerGR2BGR_EA
-
--   Demosaicing with alpha channel
-
-    #COLOR_BayerBG2BGRA , #COLOR_BayerGB2BGRA , #COLOR_BayerRG2BGRA , #COLOR_BayerGR2BGRA
-
-@sa cvtColor
-*/
-CV_EXPORTS_W void demosaicing(InputArray src, OutputArray dst, int code, int dstCn = 0);
-
-//! @} imgproc_color_conversions
-
-//! @addtogroup imgproc_shape
-//! @{
-
-/** @brief Calculates all of the moments up to the third order of a polygon or rasterized shape.
-
-The function computes moments, up to the 3rd order, of a vector shape or a rasterized shape. The
-results are returned in the structure cv::Moments.
-
-@param array Raster image (single-channel, 8-bit or floating-point 2D array) or an array (
-\f$1 \times N\f$ or \f$N \times 1\f$ ) of 2D points (Point or Point2f ).
-@param binaryImage If it is true, all non-zero image pixels are treated as 1's. The parameter is
-used for images only.
-@returns moments.
-
-@note Only applicable to contour moments calculations from Python bindings: Note that the numpy
-type for the input array should be either np.int32 or np.float32.
-
-@sa  contourArea, arcLength
- */
-CV_EXPORTS_W Moments moments( InputArray array, bool binaryImage = false );
-
-/** @brief Calculates seven Hu invariants.
-
-The function calculates seven Hu invariants (introduced in @cite Hu62; see also
-<http://en.wikipedia.org/wiki/Image_moment>) defined as:
-
-\f[\begin{array}{l} hu[0]= \eta _{20}+ \eta _{02} \\ hu[1]=( \eta _{20}- \eta _{02})^{2}+4 \eta _{11}^{2} \\ hu[2]=( \eta _{30}-3 \eta _{12})^{2}+ (3 \eta _{21}- \eta _{03})^{2} \\ hu[3]=( \eta _{30}+ \eta _{12})^{2}+ ( \eta _{21}+ \eta _{03})^{2} \\ hu[4]=( \eta _{30}-3 \eta _{12})( \eta _{30}+ \eta _{12})[( \eta _{30}+ \eta _{12})^{2}-3( \eta _{21}+ \eta _{03})^{2}]+(3 \eta _{21}- \eta _{03})( \eta _{21}+ \eta _{03})[3( \eta _{30}+ \eta _{12})^{2}-( \eta _{21}+ \eta _{03})^{2}] \\ hu[5]=( \eta _{20}- \eta _{02})[( \eta _{30}+ \eta _{12})^{2}- ( \eta _{21}+ \eta _{03})^{2}]+4 \eta _{11}( \eta _{30}+ \eta _{12})( \eta _{21}+ \eta _{03}) \\ hu[6]=(3 \eta _{21}- \eta _{03})( \eta _{21}+ \eta _{03})[3( \eta _{30}+ \eta _{12})^{2}-( \eta _{21}+ \eta _{03})^{2}]-( \eta _{30}-3 \eta _{12})( \eta _{21}+ \eta _{03})[3( \eta _{30}+ \eta _{12})^{2}-( \eta _{21}+ \eta _{03})^{2}] \\ \end{array}\f]
-
-where \f$\eta_{ji}\f$ stands for \f$\texttt{Moments::nu}_{ji}\f$ .
-
-These values are proved to be invariants to the image scale, rotation, and reflection except the
-seventh one, whose sign is changed by reflection. This invariance is proved with the assumption of
-infinite image resolution. In case of raster images, the computed Hu invariants for the original and
-transformed images are a bit different.
-
-@param moments Input moments computed with moments .
-@param hu Output Hu invariants.
-
-@sa matchShapes
- */
-CV_EXPORTS void HuMoments( const Moments& moments, double hu[7] );
-
-/** @overload */
-CV_EXPORTS_W void HuMoments( const Moments& m, OutputArray hu );
-
-//! @} imgproc_shape
-
-//! @addtogroup imgproc_object
-//! @{
-
-//! type of the template matching operation
-enum TemplateMatchModes {
-    TM_SQDIFF        = 0, /*!< \f[R(x,y)= \sum _{x',y'} (T(x',y')-I(x+x',y+y'))^2\f]
-                               with mask:
-                               \f[R(x,y)= \sum _{x',y'} \left( (T(x',y')-I(x+x',y+y')) \cdot
-                                  M(x',y') \right)^2\f] */
-    TM_SQDIFF_NORMED = 1, /*!< \f[R(x,y)= \frac{\sum_{x',y'} (T(x',y')-I(x+x',y+y'))^2}{\sqrt{\sum_{
-                                  x',y'}T(x',y')^2 \cdot \sum_{x',y'} I(x+x',y+y')^2}}\f]
-                               with mask:
-                               \f[R(x,y)= \frac{\sum _{x',y'} \left( (T(x',y')-I(x+x',y+y')) \cdot
-                                  M(x',y') \right)^2}{\sqrt{\sum_{x',y'} \left( T(x',y') \cdot
-                                  M(x',y') \right)^2 \cdot \sum_{x',y'} \left( I(x+x',y+y') \cdot
-                                  M(x',y') \right)^2}}\f] */
-    TM_CCORR         = 2, /*!< \f[R(x,y)= \sum _{x',y'} (T(x',y') \cdot I(x+x',y+y'))\f]
-                               with mask:
-                               \f[R(x,y)= \sum _{x',y'} (T(x',y') \cdot I(x+x',y+y') \cdot M(x',y')
-                                  ^2)\f] */
-    TM_CCORR_NORMED  = 3, /*!< \f[R(x,y)= \frac{\sum_{x',y'} (T(x',y') \cdot I(x+x',y+y'))}{\sqrt{
-                                  \sum_{x',y'}T(x',y')^2 \cdot \sum_{x',y'} I(x+x',y+y')^2}}\f]
-                               with mask:
-                               \f[R(x,y)= \frac{\sum_{x',y'} (T(x',y') \cdot I(x+x',y+y') \cdot
-                                  M(x',y')^2)}{\sqrt{\sum_{x',y'} \left( T(x',y') \cdot M(x',y')
-                                  \right)^2 \cdot \sum_{x',y'} \left( I(x+x',y+y') \cdot M(x',y')
-                                  \right)^2}}\f] */
-    TM_CCOEFF        = 4, /*!< \f[R(x,y)= \sum _{x',y'} (T'(x',y') \cdot I'(x+x',y+y'))\f]
-                               where
-                               \f[\begin{array}{l} T'(x',y')=T(x',y') - 1/(w \cdot h) \cdot \sum _{
-                                  x'',y''} T(x'',y'') \\ I'(x+x',y+y')=I(x+x',y+y') - 1/(w \cdot h)
-                                  \cdot \sum _{x'',y''} I(x+x'',y+y'') \end{array}\f]
-                               with mask:
-                               \f[\begin{array}{l} T'(x',y')=M(x',y') \cdot \left( T(x',y') -
-                                  \frac{1}{\sum _{x'',y''} M(x'',y'')} \cdot \sum _{x'',y''}
-                                  (T(x'',y'') \cdot M(x'',y'')) \right) \\ I'(x+x',y+y')=M(x',y')
-                                  \cdot \left( I(x+x',y+y') - \frac{1}{\sum _{x'',y''} M(x'',y'')}
-                                  \cdot \sum _{x'',y''} (I(x+x'',y+y'') \cdot M(x'',y'')) \right)
-                                  \end{array} \f] */
-    TM_CCOEFF_NORMED = 5  /*!< \f[R(x,y)= \frac{ \sum_{x',y'} (T'(x',y') \cdot I'(x+x',y+y')) }{
-                                  \sqrt{\sum_{x',y'}T'(x',y')^2 \cdot \sum_{x',y'} I'(x+x',y+y')^2}
-                                  }\f] */
-};
-
-/** @example samples/cpp/tutorial_code/Histograms_Matching/MatchTemplate_Demo.cpp
-An example using Template Matching algorithm
-*/
-
-/** @brief Compares a template against overlapped image regions.
-
-The function slides through image , compares the overlapped patches of size \f$w \times h\f$ against
-templ using the specified method and stores the comparison results in result . #TemplateMatchModes
-describes the formulae for the available comparison methods ( \f$I\f$ denotes image, \f$T\f$
-template, \f$R\f$ result, \f$M\f$ the optional mask ). The summation is done over template and/or
-the image patch: \f$x' = 0...w-1, y' = 0...h-1\f$
-
-After the function finishes the comparison, the best matches can be found as global minimums (when
-#TM_SQDIFF was used) or maximums (when #TM_CCORR or #TM_CCOEFF was used) using the
-#minMaxLoc function. In case of a color image, template summation in the numerator and each sum in
-the denominator is done over all of the channels and separate mean values are used for each channel.
-That is, the function can take a color template and a color image. The result will still be a
-single-channel image, which is easier to analyze.
-
-@param image Image where the search is running. It must be 8-bit or 32-bit floating-point.
-@param templ Searched template. It must be not greater than the source image and have the same
-data type.
-@param result Map of comparison results. It must be single-channel 32-bit floating-point. If image
-is \f$W \times H\f$ and templ is \f$w \times h\f$ , then result is \f$(W-w+1) \times (H-h+1)\f$ .
-@param method Parameter specifying the comparison method, see #TemplateMatchModes
-@param mask Optional mask. It must have the same size as templ. It must either have the same number
-            of channels as template or only one channel, which is then used for all template and
-            image channels. If the data type is #CV_8U, the mask is interpreted as a binary mask,
-            meaning only elements where mask is nonzero are used and are kept unchanged independent
-            of the actual mask value (weight equals 1). For data tpye #CV_32F, the mask values are
-            used as weights. The exact formulas are documented in #TemplateMatchModes.
- */
-CV_EXPORTS_W void matchTemplate( InputArray image, InputArray templ,
-                                 OutputArray result, int method, InputArray mask = noArray() );
-
-//! @}
-
-//! @addtogroup imgproc_shape
-//! @{
-
-/** @example samples/cpp/connected_components.cpp
-This program demonstrates connected components and use of the trackbar
-*/
-
-/** @brief computes the connected components labeled image of boolean image
-
-image with 4 or 8 way connectivity - returns N, the total number of labels [0, N-1] where 0
-represents the background label. ltype specifies the output label image type, an important
-consideration based on the total number of labels or alternatively the total number of pixels in
-the source image. ccltype specifies the connected components labeling algorithm to use, currently
-Bolelli (Spaghetti) @cite Bolelli2019, Grana (BBDT) @cite Grana2010 and Wu's (SAUF) @cite Wu2009 algorithms
-are supported, see the #ConnectedComponentsAlgorithmsTypes for details. Note that SAUF algorithm forces
-a row major ordering of labels while Spaghetti and BBDT do not.
-This function uses parallel version of the algorithms if at least one allowed
-parallel framework is enabled and if the rows of the image are at least twice the number returned by #getNumberOfCPUs.
-
-@param image the 8-bit single-channel image to be labeled
-@param labels destination labeled image
-@param connectivity 8 or 4 for 8-way or 4-way connectivity respectively
-@param ltype output image label type. Currently CV_32S and CV_16U are supported.
-@param ccltype connected components algorithm type (see the #ConnectedComponentsAlgorithmsTypes).
-*/
-CV_EXPORTS_AS(connectedComponentsWithAlgorithm) int connectedComponents(InputArray image, OutputArray labels,
-                                                                        int connectivity, int ltype, int ccltype);
-
-
-/** @overload
-
-@param image the 8-bit single-channel image to be labeled
-@param labels destination labeled image
-@param connectivity 8 or 4 for 8-way or 4-way connectivity respectively
-@param ltype output image label type. Currently CV_32S and CV_16U are supported.
-*/
-CV_EXPORTS_W int connectedComponents(InputArray image, OutputArray labels,
-                                     int connectivity = 8, int ltype = CV_32S);
-
-
-/** @brief computes the connected components labeled image of boolean image and also produces a statistics output for each label
-
-image with 4 or 8 way connectivity - returns N, the total number of labels [0, N-1] where 0
-represents the background label. ltype specifies the output label image type, an important
-consideration based on the total number of labels or alternatively the total number of pixels in
-the source image. ccltype specifies the connected components labeling algorithm to use, currently
-Bolelli (Spaghetti) @cite Bolelli2019, Grana (BBDT) @cite Grana2010 and Wu's (SAUF) @cite Wu2009 algorithms
-are supported, see the #ConnectedComponentsAlgorithmsTypes for details. Note that SAUF algorithm forces
-a row major ordering of labels while Spaghetti and BBDT do not.
-This function uses parallel version of the algorithms (statistics included) if at least one allowed
-parallel framework is enabled and if the rows of the image are at least twice the number returned by #getNumberOfCPUs.
-
-@param image the 8-bit single-channel image to be labeled
-@param labels destination labeled image
-@param stats statistics output for each label, including the background label.
-Statistics are accessed via stats(label, COLUMN) where COLUMN is one of
-#ConnectedComponentsTypes, selecting the statistic. The data type is CV_32S.
-@param centroids centroid output for each label, including the background label. Centroids are
-accessed via centroids(label, 0) for x and centroids(label, 1) for y. The data type CV_64F.
-@param connectivity 8 or 4 for 8-way or 4-way connectivity respectively
-@param ltype output image label type. Currently CV_32S and CV_16U are supported.
-@param ccltype connected components algorithm type (see #ConnectedComponentsAlgorithmsTypes).
-*/
-CV_EXPORTS_AS(connectedComponentsWithStatsWithAlgorithm) int connectedComponentsWithStats(InputArray image, OutputArray labels,
-                                                                                          OutputArray stats, OutputArray centroids,
-                                                                                          int connectivity, int ltype, int ccltype);
-
-/** @overload
-@param image the 8-bit single-channel image to be labeled
-@param labels destination labeled image
-@param stats statistics output for each label, including the background label.
-Statistics are accessed via stats(label, COLUMN) where COLUMN is one of
-#ConnectedComponentsTypes, selecting the statistic. The data type is CV_32S.
-@param centroids centroid output for each label, including the background label. Centroids are
-accessed via centroids(label, 0) for x and centroids(label, 1) for y. The data type CV_64F.
-@param connectivity 8 or 4 for 8-way or 4-way connectivity respectively
-@param ltype output image label type. Currently CV_32S and CV_16U are supported.
-*/
-CV_EXPORTS_W int connectedComponentsWithStats(InputArray image, OutputArray labels,
-                                              OutputArray stats, OutputArray centroids,
-                                              int connectivity = 8, int ltype = CV_32S);
-
-
-/** @brief Finds contours in a binary image.
-
-The function retrieves contours from the binary image using the algorithm @cite Suzuki85 . The contours
-are a useful tool for shape analysis and object detection and recognition. See squares.cpp in the
-OpenCV sample directory.
-@note Since opencv 3.2 source image is not modified by this function.
-
-@param image Source, an 8-bit single-channel image. Non-zero pixels are treated as 1's. Zero
-pixels remain 0's, so the image is treated as binary . You can use #compare, #inRange, #threshold ,
-#adaptiveThreshold, #Canny, and others to create a binary image out of a grayscale or color one.
-If mode equals to #RETR_CCOMP or #RETR_FLOODFILL, the input can also be a 32-bit integer image of labels (CV_32SC1).
-@param contours Detected contours. Each contour is stored as a vector of points (e.g.
-std::vector<std::vector<cv::Point> >).
-@param hierarchy Optional output vector (e.g. std::vector<cv::Vec4i>), containing information about the image topology. It has
-as many elements as the number of contours. For each i-th contour contours[i], the elements
-hierarchy[i][0] , hierarchy[i][1] , hierarchy[i][2] , and hierarchy[i][3] are set to 0-based indices
-in contours of the next and previous contours at the same hierarchical level, the first child
-contour and the parent contour, respectively. If for the contour i there are no next, previous,
-parent, or nested contours, the corresponding elements of hierarchy[i] will be negative.
-@note In Python, hierarchy is nested inside a top level array. Use hierarchy[0][i] to access hierarchical elements of i-th contour.
-@param mode Contour retrieval mode, see #RetrievalModes
-@param method Contour approximation method, see #ContourApproximationModes
-@param offset Optional offset by which every contour point is shifted. This is useful if the
-contours are extracted from the image ROI and then they should be analyzed in the whole image
-context.
- */
-CV_EXPORTS_W void findContours( InputArray image, OutputArrayOfArrays contours,
-                              OutputArray hierarchy, int mode,
-                              int method, Point offset = Point());
-
-/** @overload */
-CV_EXPORTS void findContours( InputArray image, OutputArrayOfArrays contours,
-                              int mode, int method, Point offset = Point());
-
-/** @example samples/cpp/squares.cpp
-A program using pyramid scaling, Canny, contours and contour simplification to find
-squares in a list of images (pic1-6.png). Returns sequence of squares detected on the image.
-*/
-
-/** @example samples/tapi/squares.cpp
-A program using pyramid scaling, Canny, contours and contour simplification to find
-squares in the input image.
-*/
-
-/** @brief Approximates a polygonal curve(s) with the specified precision.
-
-The function cv::approxPolyDP approximates a curve or a polygon with another curve/polygon with less
-vertices so that the distance between them is less or equal to the specified precision. It uses the
-Douglas-Peucker algorithm <http://en.wikipedia.org/wiki/Ramer-Douglas-Peucker_algorithm>
-
-@param curve Input vector of a 2D point stored in std::vector or Mat
-@param approxCurve Result of the approximation. The type should match the type of the input curve.
-@param epsilon Parameter specifying the approximation accuracy. This is the maximum distance
-between the original curve and its approximation.
-@param closed If true, the approximated curve is closed (its first and last vertices are
-connected). Otherwise, it is not closed.
- */
-CV_EXPORTS_W void approxPolyDP( InputArray curve,
-                                OutputArray approxCurve,
-                                double epsilon, bool closed );
-
-/** @brief Calculates a contour perimeter or a curve length.
-
-The function computes a curve length or a closed contour perimeter.
-
-@param curve Input vector of 2D points, stored in std::vector or Mat.
-@param closed Flag indicating whether the curve is closed or not.
- */
-CV_EXPORTS_W double arcLength( InputArray curve, bool closed );
-
-/** @brief Calculates the up-right bounding rectangle of a point set or non-zero pixels of gray-scale image.
-
-The function calculates and returns the minimal up-right bounding rectangle for the specified point set or
-non-zero pixels of gray-scale image.
-
-@param array Input gray-scale image or 2D point set, stored in std::vector or Mat.
- */
-CV_EXPORTS_W Rect boundingRect( InputArray array );
-
-/** @brief Calculates a contour area.
-
-The function computes a contour area. Similarly to moments , the area is computed using the Green
-formula. Thus, the returned area and the number of non-zero pixels, if you draw the contour using
-#drawContours or #fillPoly , can be different. Also, the function will most certainly give a wrong
-results for contours with self-intersections.
-
-Example:
-@code
-    vector<Point> contour;
-    contour.push_back(Point2f(0, 0));
-    contour.push_back(Point2f(10, 0));
-    contour.push_back(Point2f(10, 10));
-    contour.push_back(Point2f(5, 4));
-
-    double area0 = contourArea(contour);
-    vector<Point> approx;
-    approxPolyDP(contour, approx, 5, true);
-    double area1 = contourArea(approx);
-
-    cout << "area0 =" << area0 << endl <<
-            "area1 =" << area1 << endl <<
-            "approx poly vertices" << approx.size() << endl;
-@endcode
-@param contour Input vector of 2D points (contour vertices), stored in std::vector or Mat.
-@param oriented Oriented area flag. If it is true, the function returns a signed area value,
-depending on the contour orientation (clockwise or counter-clockwise). Using this feature you can
-determine orientation of a contour by taking the sign of an area. By default, the parameter is
-false, which means that the absolute value is returned.
- */
-CV_EXPORTS_W double contourArea( InputArray contour, bool oriented = false );
-
-/** @brief Finds a rotated rectangle of the minimum area enclosing the input 2D point set.
-
-The function calculates and returns the minimum-area bounding rectangle (possibly rotated) for a
-specified point set. Developer should keep in mind that the returned RotatedRect can contain negative
-indices when data is close to the containing Mat element boundary.
-
-@param points Input vector of 2D points, stored in std::vector\<\> or Mat
- */
-CV_EXPORTS_W RotatedRect minAreaRect( InputArray points );
-
-/** @brief Finds the four vertices of a rotated rect. Useful to draw the rotated rectangle.
-
-The function finds the four vertices of a rotated rectangle. This function is useful to draw the
-rectangle. In C++, instead of using this function, you can directly use RotatedRect::points method. Please
-visit the @ref tutorial_bounding_rotated_ellipses "tutorial on Creating Bounding rotated boxes and ellipses for contours" for more information.
-
-@param box The input rotated rectangle. It may be the output of
-@param points The output array of four vertices of rectangles.
- */
-CV_EXPORTS_W void boxPoints(RotatedRect box, OutputArray points);
-
-/** @brief Finds a circle of the minimum area enclosing a 2D point set.
-
-The function finds the minimal enclosing circle of a 2D point set using an iterative algorithm.
-
-@param points Input vector of 2D points, stored in std::vector\<\> or Mat
-@param center Output center of the circle.
-@param radius Output radius of the circle.
- */
-CV_EXPORTS_W void minEnclosingCircle( InputArray points,
-                                      CV_OUT Point2f& center, CV_OUT float& radius );
-
-/** @example samples/cpp/minarea.cpp
-*/
-
-/** @brief Finds a triangle of minimum area enclosing a 2D point set and returns its area.
-
-The function finds a triangle of minimum area enclosing the given set of 2D points and returns its
-area. The output for a given 2D point set is shown in the image below. 2D points are depicted in
-*red* and the enclosing triangle in *yellow*.
-
-![Sample output of the minimum enclosing triangle function](pics/minenclosingtriangle.png)
-
-The implementation of the algorithm is based on O'Rourke's @cite ORourke86 and Klee and Laskowski's
-@cite KleeLaskowski85 papers. O'Rourke provides a \f$\theta(n)\f$ algorithm for finding the minimal
-enclosing triangle of a 2D convex polygon with n vertices. Since the #minEnclosingTriangle function
-takes a 2D point set as input an additional preprocessing step of computing the convex hull of the
-2D point set is required. The complexity of the #convexHull function is \f$O(n log(n))\f$ which is higher
-than \f$\theta(n)\f$. Thus the overall complexity of the function is \f$O(n log(n))\f$.
-
-@param points Input vector of 2D points with depth CV_32S or CV_32F, stored in std::vector\<\> or Mat
-@param triangle Output vector of three 2D points defining the vertices of the triangle. The depth
-of the OutputArray must be CV_32F.
- */
-CV_EXPORTS_W double minEnclosingTriangle( InputArray points, CV_OUT OutputArray triangle );
-
-/** @brief Compares two shapes.
-
-The function compares two shapes. All three implemented methods use the Hu invariants (see #HuMoments)
-
-@param contour1 First contour or grayscale image.
-@param contour2 Second contour or grayscale image.
-@param method Comparison method, see #ShapeMatchModes
-@param parameter Method-specific parameter (not supported now).
- */
-CV_EXPORTS_W double matchShapes( InputArray contour1, InputArray contour2,
-                                 int method, double parameter );
-
-/** @example samples/cpp/convexhull.cpp
-An example using the convexHull functionality
-*/
-
-/** @brief Finds the convex hull of a point set.
-
-The function cv::convexHull finds the convex hull of a 2D point set using the Sklansky's algorithm @cite Sklansky82
-that has *O(N logN)* complexity in the current implementation.
-
-@param points Input 2D point set, stored in std::vector or Mat.
-@param hull Output convex hull. It is either an integer vector of indices or vector of points. In
-the first case, the hull elements are 0-based indices of the convex hull points in the original
-array (since the set of convex hull points is a subset of the original point set). In the second
-case, hull elements are the convex hull points themselves.
-@param clockwise Orientation flag. If it is true, the output convex hull is oriented clockwise.
-Otherwise, it is oriented counter-clockwise. The assumed coordinate system has its X axis pointing
-to the right, and its Y axis pointing upwards.
-@param returnPoints Operation flag. In case of a matrix, when the flag is true, the function
-returns convex hull points. Otherwise, it returns indices of the convex hull points. When the
-output array is std::vector, the flag is ignored, and the output depends on the type of the
-vector: std::vector\<int\> implies returnPoints=false, std::vector\<Point\> implies
-returnPoints=true.
-
-@note `points` and `hull` should be different arrays, inplace processing isn't supported.
-
-Check @ref tutorial_hull "the corresponding tutorial" for more details.
-
-useful links:
-
-https://www.learnopencv.com/convex-hull-using-opencv-in-python-and-c/
- */
-CV_EXPORTS_W void convexHull( InputArray points, OutputArray hull,
-                              bool clockwise = false, bool returnPoints = true );
-
-/** @brief Finds the convexity defects of a contour.
-
-The figure below displays convexity defects of a hand contour:
-
-![image](pics/defects.png)
-
-@param contour Input contour.
-@param convexhull Convex hull obtained using convexHull that should contain indices of the contour
-points that make the hull.
-@param convexityDefects The output vector of convexity defects. In C++ and the new Python/Java
-interface each convexity defect is represented as 4-element integer vector (a.k.a. #Vec4i):
-(start_index, end_index, farthest_pt_index, fixpt_depth), where indices are 0-based indices
-in the original contour of the convexity defect beginning, end and the farthest point, and
-fixpt_depth is fixed-point approximation (with 8 fractional bits) of the distance between the
-farthest contour point and the hull. That is, to get the floating-point value of the depth will be
-fixpt_depth/256.0.
- */
-CV_EXPORTS_W void convexityDefects( InputArray contour, InputArray convexhull, OutputArray convexityDefects );
-
-/** @brief Tests a contour convexity.
-
-The function tests whether the input contour is convex or not. The contour must be simple, that is,
-without self-intersections. Otherwise, the function output is undefined.
-
-@param contour Input vector of 2D points, stored in std::vector\<\> or Mat
- */
-CV_EXPORTS_W bool isContourConvex( InputArray contour );
-
-/** @example samples/cpp/intersectExample.cpp
-Examples of how intersectConvexConvex works
-*/
-
-/** @brief Finds intersection of two convex polygons
-
-@param p1 First polygon
-@param p2 Second polygon
-@param p12 Output polygon describing the intersecting area
-@param handleNested When true, an intersection is found if one of the polygons is fully enclosed in the other.
-When false, no intersection is found. If the polygons share a side or the vertex of one polygon lies on an edge
-of the other, they are not considered nested and an intersection will be found regardless of the value of handleNested.
-
-@returns Absolute value of area of intersecting polygon
-
-@note intersectConvexConvex doesn't confirm that both polygons are convex and will return invalid results if they aren't.
- */
-CV_EXPORTS_W float intersectConvexConvex( InputArray p1, InputArray p2,
-                                          OutputArray p12, bool handleNested = true );
-
-/** @example samples/cpp/fitellipse.cpp
-An example using the fitEllipse technique
-*/
-
-/** @brief Fits an ellipse around a set of 2D points.
-
-The function calculates the ellipse that fits (in a least-squares sense) a set of 2D points best of
-all. It returns the rotated rectangle in which the ellipse is inscribed. The first algorithm described by @cite Fitzgibbon95
-is used. Developer should keep in mind that it is possible that the returned
-ellipse/rotatedRect data contains negative indices, due to the data points being close to the
-border of the containing Mat element.
-
-@param points Input 2D point set, stored in std::vector\<\> or Mat
- */
-CV_EXPORTS_W RotatedRect fitEllipse( InputArray points );
-
-/** @brief Fits an ellipse around a set of 2D points.
-
- The function calculates the ellipse that fits a set of 2D points.
- It returns the rotated rectangle in which the ellipse is inscribed.
- The Approximate Mean Square (AMS) proposed by @cite Taubin1991 is used.
-
- For an ellipse, this basis set is \f$ \chi= \left(x^2, x y, y^2, x, y, 1\right) \f$,
- which is a set of six free coefficients \f$ A^T=\left\{A_{\text{xx}},A_{\text{xy}},A_{\text{yy}},A_x,A_y,A_0\right\} \f$.
- However, to specify an ellipse, all that is needed is five numbers; the major and minor axes lengths \f$ (a,b) \f$,
- the position \f$ (x_0,y_0) \f$, and the orientation \f$ \theta \f$. This is because the basis set includes lines,
- quadratics, parabolic and hyperbolic functions as well as elliptical functions as possible fits.
- If the fit is found to be a parabolic or hyperbolic function then the standard #fitEllipse method is used.
- The AMS method restricts the fit to parabolic, hyperbolic and elliptical curves
- by imposing the condition that \f$ A^T ( D_x^T D_x  +   D_y^T D_y) A = 1 \f$ where
- the matrices \f$ Dx \f$ and \f$ Dy \f$ are the partial derivatives of the design matrix \f$ D \f$ with
- respect to x and y. The matrices are formed row by row applying the following to
- each of the points in the set:
- \f{align*}{
- D(i,:)&=\left\{x_i^2, x_i y_i, y_i^2, x_i, y_i, 1\right\} &
- D_x(i,:)&=\left\{2 x_i,y_i,0,1,0,0\right\} &
- D_y(i,:)&=\left\{0,x_i,2 y_i,0,1,0\right\}
- \f}
- The AMS method minimizes the cost function
- \f{equation*}{
- \epsilon ^2=\frac{ A^T D^T D A }{ A^T (D_x^T D_x +  D_y^T D_y) A^T }
- \f}
-
- The minimum cost is found by solving the generalized eigenvalue problem.
-
- \f{equation*}{
- D^T D A = \lambda  \left( D_x^T D_x +  D_y^T D_y\right) A
- \f}
-
- @param points Input 2D point set, stored in std::vector\<\> or Mat
- */
-CV_EXPORTS_W RotatedRect fitEllipseAMS( InputArray points );
-
-
-/** @brief Fits an ellipse around a set of 2D points.
-
- The function calculates the ellipse that fits a set of 2D points.
- It returns the rotated rectangle in which the ellipse is inscribed.
- The Direct least square (Direct) method by @cite Fitzgibbon1999 is used.
-
- For an ellipse, this basis set is \f$ \chi= \left(x^2, x y, y^2, x, y, 1\right) \f$,
- which is a set of six free coefficients \f$ A^T=\left\{A_{\text{xx}},A_{\text{xy}},A_{\text{yy}},A_x,A_y,A_0\right\} \f$.
- However, to specify an ellipse, all that is needed is five numbers; the major and minor axes lengths \f$ (a,b) \f$,
- the position \f$ (x_0,y_0) \f$, and the orientation \f$ \theta \f$. This is because the basis set includes lines,
- quadratics, parabolic and hyperbolic functions as well as elliptical functions as possible fits.
- The Direct method confines the fit to ellipses by ensuring that \f$ 4 A_{xx} A_{yy}- A_{xy}^2 > 0 \f$.
- The condition imposed is that \f$ 4 A_{xx} A_{yy}- A_{xy}^2=1 \f$ which satisfies the inequality
- and as the coefficients can be arbitrarily scaled is not overly restrictive.
-
- \f{equation*}{
- \epsilon ^2= A^T D^T D A \quad \text{with} \quad A^T C A =1 \quad \text{and} \quad C=\left(\begin{matrix}
- 0 & 0  & 2  & 0  & 0  &  0  \\
- 0 & -1  & 0  & 0  & 0  &  0 \\
- 2 & 0  & 0  & 0  & 0  &  0 \\
- 0 & 0  & 0  & 0  & 0  &  0 \\
- 0 & 0  & 0  & 0  & 0  &  0 \\
- 0 & 0  & 0  & 0  & 0  &  0
- \end{matrix} \right)
- \f}
-
- The minimum cost is found by solving the generalized eigenvalue problem.
-
- \f{equation*}{
- D^T D A = \lambda  \left( C\right) A
- \f}
-
- The system produces only one positive eigenvalue \f$ \lambda\f$ which is chosen as the solution
- with its eigenvector \f$\mathbf{u}\f$. These are used to find the coefficients
-
- \f{equation*}{
- A = \sqrt{\frac{1}{\mathbf{u}^T C \mathbf{u}}}  \mathbf{u}
- \f}
- The scaling factor guarantees that  \f$A^T C A =1\f$.
-
- @param points Input 2D point set, stored in std::vector\<\> or Mat
- */
-CV_EXPORTS_W RotatedRect fitEllipseDirect( InputArray points );
-
-/** @brief Fits a line to a 2D or 3D point set.
-
-The function fitLine fits a line to a 2D or 3D point set by minimizing \f$\sum_i \rho(r_i)\f$ where
-\f$r_i\f$ is a distance between the \f$i^{th}\f$ point, the line and \f$\rho(r)\f$ is a distance function, one
-of the following:
--  DIST_L2
-\f[\rho (r) = r^2/2  \quad \text{(the simplest and the fastest least-squares method)}\f]
-- DIST_L1
-\f[\rho (r) = r\f]
-- DIST_L12
-\f[\rho (r) = 2  \cdot ( \sqrt{1 + \frac{r^2}{2}} - 1)\f]
-- DIST_FAIR
-\f[\rho \left (r \right ) = C^2  \cdot \left (  \frac{r}{C} -  \log{\left(1 + \frac{r}{C}\right)} \right )  \quad \text{where} \quad C=1.3998\f]
-- DIST_WELSCH
-\f[\rho \left (r \right ) =  \frac{C^2}{2} \cdot \left ( 1 -  \exp{\left(-\left(\frac{r}{C}\right)^2\right)} \right )  \quad \text{where} \quad C=2.9846\f]
-- DIST_HUBER
-\f[\rho (r) =  \fork{r^2/2}{if \(r < C\)}{C \cdot (r-C/2)}{otherwise} \quad \text{where} \quad C=1.345\f]
-
-The algorithm is based on the M-estimator ( <http://en.wikipedia.org/wiki/M-estimator> ) technique
-that iteratively fits the line using the weighted least-squares algorithm. After each iteration the
-weights \f$w_i\f$ are adjusted to be inversely proportional to \f$\rho(r_i)\f$ .
-
-@param points Input vector of 2D or 3D points, stored in std::vector\<\> or Mat.
-@param line Output line parameters. In case of 2D fitting, it should be a vector of 4 elements
-(like Vec4f) - (vx, vy, x0, y0), where (vx, vy) is a normalized vector collinear to the line and
-(x0, y0) is a point on the line. In case of 3D fitting, it should be a vector of 6 elements (like
-Vec6f) - (vx, vy, vz, x0, y0, z0), where (vx, vy, vz) is a normalized vector collinear to the line
-and (x0, y0, z0) is a point on the line.
-@param distType Distance used by the M-estimator, see #DistanceTypes
-@param param Numerical parameter ( C ) for some types of distances. If it is 0, an optimal value
-is chosen.
-@param reps Sufficient accuracy for the radius (distance between the coordinate origin and the line).
-@param aeps Sufficient accuracy for the angle. 0.01 would be a good default value for reps and aeps.
- */
-CV_EXPORTS_W void fitLine( InputArray points, OutputArray line, int distType,
-                           double param, double reps, double aeps );
-
-/** @brief Performs a point-in-contour test.
-
-The function determines whether the point is inside a contour, outside, or lies on an edge (or
-coincides with a vertex). It returns positive (inside), negative (outside), or zero (on an edge)
-value, correspondingly. When measureDist=false , the return value is +1, -1, and 0, respectively.
-Otherwise, the return value is a signed distance between the point and the nearest contour edge.
-
-See below a sample output of the function where each image pixel is tested against the contour:
-
-![sample output](pics/pointpolygon.png)
-
-@param contour Input contour.
-@param pt Point tested against the contour.
-@param measureDist If true, the function estimates the signed distance from the point to the
-nearest contour edge. Otherwise, the function only checks if the point is inside a contour or not.
- */
-CV_EXPORTS_W double pointPolygonTest( InputArray contour, Point2f pt, bool measureDist );
-
-/** @brief Finds out if there is any intersection between two rotated rectangles.
-
-If there is then the vertices of the intersecting region are returned as well.
-
-Below are some examples of intersection configurations. The hatched pattern indicates the
-intersecting region and the red vertices are returned by the function.
-
-![intersection examples](pics/intersection.png)
-
-@param rect1 First rectangle
-@param rect2 Second rectangle
-@param intersectingRegion The output array of the vertices of the intersecting region. It returns
-at most 8 vertices. Stored as std::vector\<cv::Point2f\> or cv::Mat as Mx1 of type CV_32FC2.
-@returns One of #RectanglesIntersectTypes
- */
-CV_EXPORTS_W int rotatedRectangleIntersection( const RotatedRect& rect1, const RotatedRect& rect2, OutputArray intersectingRegion  );
-
-/** @brief Creates a smart pointer to a cv::GeneralizedHoughBallard class and initializes it.
-*/
-CV_EXPORTS_W Ptr<GeneralizedHoughBallard> createGeneralizedHoughBallard();
-
-/** @brief Creates a smart pointer to a cv::GeneralizedHoughGuil class and initializes it.
-*/
-CV_EXPORTS_W Ptr<GeneralizedHoughGuil> createGeneralizedHoughGuil();
-
-//! @} imgproc_shape
-
-//! @addtogroup imgproc_colormap
-//! @{
-
-//! GNU Octave/MATLAB equivalent colormaps
-enum ColormapTypes
-{
-    COLORMAP_AUTUMN = 0, //!< ![autumn](pics/colormaps/colorscale_autumn.jpg)
-    COLORMAP_BONE = 1, //!< ![bone](pics/colormaps/colorscale_bone.jpg)
-    COLORMAP_JET = 2, //!< ![jet](pics/colormaps/colorscale_jet.jpg)
-    COLORMAP_WINTER = 3, //!< ![winter](pics/colormaps/colorscale_winter.jpg)
-    COLORMAP_RAINBOW = 4, //!< ![rainbow](pics/colormaps/colorscale_rainbow.jpg)
-    COLORMAP_OCEAN = 5, //!< ![ocean](pics/colormaps/colorscale_ocean.jpg)
-    COLORMAP_SUMMER = 6, //!< ![summer](pics/colormaps/colorscale_summer.jpg)
-    COLORMAP_SPRING = 7, //!< ![spring](pics/colormaps/colorscale_spring.jpg)
-    COLORMAP_COOL = 8, //!< ![cool](pics/colormaps/colorscale_cool.jpg)
-    COLORMAP_HSV = 9, //!< ![HSV](pics/colormaps/colorscale_hsv.jpg)
-    COLORMAP_PINK = 10, //!< ![pink](pics/colormaps/colorscale_pink.jpg)
-    COLORMAP_HOT = 11, //!< ![hot](pics/colormaps/colorscale_hot.jpg)
-    COLORMAP_PARULA = 12, //!< ![parula](pics/colormaps/colorscale_parula.jpg)
-    COLORMAP_MAGMA = 13, //!< ![magma](pics/colormaps/colorscale_magma.jpg)
-    COLORMAP_INFERNO = 14, //!< ![inferno](pics/colormaps/colorscale_inferno.jpg)
-    COLORMAP_PLASMA = 15, //!< ![plasma](pics/colormaps/colorscale_plasma.jpg)
-    COLORMAP_VIRIDIS = 16, //!< ![viridis](pics/colormaps/colorscale_viridis.jpg)
-    COLORMAP_CIVIDIS = 17, //!< ![cividis](pics/colormaps/colorscale_cividis.jpg)
-    COLORMAP_TWILIGHT = 18, //!< ![twilight](pics/colormaps/colorscale_twilight.jpg)
-    COLORMAP_TWILIGHT_SHIFTED = 19, //!< ![twilight shifted](pics/colormaps/colorscale_twilight_shifted.jpg)
-    COLORMAP_TURBO = 20, //!< ![turbo](pics/colormaps/colorscale_turbo.jpg)
-    COLORMAP_DEEPGREEN = 21  //!< ![deepgreen](pics/colormaps/colorscale_deepgreen.jpg)
-};
-
-/** @example samples/cpp/falsecolor.cpp
-An example using applyColorMap function
-*/
-
-/** @brief Applies a GNU Octave/MATLAB equivalent colormap on a given image.
-
-@param src The source image, grayscale or colored of type CV_8UC1 or CV_8UC3.
-@param dst The result is the colormapped source image. Note: Mat::create is called on dst.
-@param colormap The colormap to apply, see #ColormapTypes
-*/
-CV_EXPORTS_W void applyColorMap(InputArray src, OutputArray dst, int colormap);
-
-/** @brief Applies a user colormap on a given image.
-
-@param src The source image, grayscale or colored of type CV_8UC1 or CV_8UC3.
-@param dst The result is the colormapped source image. Note: Mat::create is called on dst.
-@param userColor The colormap to apply of type CV_8UC1 or CV_8UC3 and size 256
-*/
-CV_EXPORTS_W void applyColorMap(InputArray src, OutputArray dst, InputArray userColor);
-
-//! @} imgproc_colormap
-
-//! @addtogroup imgproc_draw
-//! @{
-
-
-/** OpenCV color channel order is BGR[A] */
-#define CV_RGB(r, g, b)  cv::Scalar((b), (g), (r), 0)
-
-/** @brief Draws a line segment connecting two points.
-
-The function line draws the line segment between pt1 and pt2 points in the image. The line is
-clipped by the image boundaries. For non-antialiased lines with integer coordinates, the 8-connected
-or 4-connected Bresenham algorithm is used. Thick lines are drawn with rounding endings. Antialiased
-lines are drawn using Gaussian filtering.
-
-@param img Image.
-@param pt1 First point of the line segment.
-@param pt2 Second point of the line segment.
-@param color Line color.
-@param thickness Line thickness.
-@param lineType Type of the line. See #LineTypes.
-@param shift Number of fractional bits in the point coordinates.
- */
-CV_EXPORTS_W void line(InputOutputArray img, Point pt1, Point pt2, const Scalar& color,
-                     int thickness = 1, int lineType = LINE_8, int shift = 0);
-
-/** @brief Draws an arrow segment pointing from the first point to the second one.
-
-The function cv::arrowedLine draws an arrow between pt1 and pt2 points in the image. See also #line.
-
-@param img Image.
-@param pt1 The point the arrow starts from.
-@param pt2 The point the arrow points to.
-@param color Line color.
-@param thickness Line thickness.
-@param line_type Type of the line. See #LineTypes
-@param shift Number of fractional bits in the point coordinates.
-@param tipLength The length of the arrow tip in relation to the arrow length
- */
-CV_EXPORTS_W void arrowedLine(InputOutputArray img, Point pt1, Point pt2, const Scalar& color,
-                     int thickness=1, int line_type=8, int shift=0, double tipLength=0.1);
-
-/** @brief Draws a simple, thick, or filled up-right rectangle.
-
-The function cv::rectangle draws a rectangle outline or a filled rectangle whose two opposite corners
-are pt1 and pt2.
-
-@param img Image.
-@param pt1 Vertex of the rectangle.
-@param pt2 Vertex of the rectangle opposite to pt1 .
-@param color Rectangle color or brightness (grayscale image).
-@param thickness Thickness of lines that make up the rectangle. Negative values, like #FILLED,
-mean that the function has to draw a filled rectangle.
-@param lineType Type of the line. See #LineTypes
-@param shift Number of fractional bits in the point coordinates.
- */
-CV_EXPORTS_W void rectangle(InputOutputArray img, Point pt1, Point pt2,
-                          const Scalar& color, int thickness = 1,
-                          int lineType = LINE_8, int shift = 0);
-
-/** @overload
-
-use `rec` parameter as alternative specification of the drawn rectangle: `r.tl() and
-r.br()-Point(1,1)` are opposite corners
-*/
-CV_EXPORTS_W void rectangle(InputOutputArray img, Rect rec,
-                          const Scalar& color, int thickness = 1,
-                          int lineType = LINE_8, int shift = 0);
-
-/** @example samples/cpp/tutorial_code/ImgProc/basic_drawing/Drawing_2.cpp
-An example using drawing functions
-*/
-
-/** @brief Draws a circle.
-
-The function cv::circle draws a simple or filled circle with a given center and radius.
-@param img Image where the circle is drawn.
-@param center Center of the circle.
-@param radius Radius of the circle.
-@param color Circle color.
-@param thickness Thickness of the circle outline, if positive. Negative values, like #FILLED,
-mean that a filled circle is to be drawn.
-@param lineType Type of the circle boundary. See #LineTypes
-@param shift Number of fractional bits in the coordinates of the center and in the radius value.
- */
-CV_EXPORTS_W void circle(InputOutputArray img, Point center, int radius,
-                       const Scalar& color, int thickness = 1,
-                       int lineType = LINE_8, int shift = 0);
-
-/** @brief Draws a simple or thick elliptic arc or fills an ellipse sector.
-
-The function cv::ellipse with more parameters draws an ellipse outline, a filled ellipse, an elliptic
-arc, or a filled ellipse sector. The drawing code uses general parametric form.
-A piecewise-linear curve is used to approximate the elliptic arc
-boundary. If you need more control of the ellipse rendering, you can retrieve the curve using
-#ellipse2Poly and then render it with #polylines or fill it with #fillPoly. If you use the first
-variant of the function and want to draw the whole ellipse, not an arc, pass `startAngle=0` and
-`endAngle=360`. If `startAngle` is greater than `endAngle`, they are swapped. The figure below explains
-the meaning of the parameters to draw the blue arc.
-
-![Parameters of Elliptic Arc](pics/ellipse.svg)
-
-@param img Image.
-@param center Center of the ellipse.
-@param axes Half of the size of the ellipse main axes.
-@param angle Ellipse rotation angle in degrees.
-@param startAngle Starting angle of the elliptic arc in degrees.
-@param endAngle Ending angle of the elliptic arc in degrees.
-@param color Ellipse color.
-@param thickness Thickness of the ellipse arc outline, if positive. Otherwise, this indicates that
-a filled ellipse sector is to be drawn.
-@param lineType Type of the ellipse boundary. See #LineTypes
-@param shift Number of fractional bits in the coordinates of the center and values of axes.
- */
-CV_EXPORTS_W void ellipse(InputOutputArray img, Point center, Size axes,
-                        double angle, double startAngle, double endAngle,
-                        const Scalar& color, int thickness = 1,
-                        int lineType = LINE_8, int shift = 0);
-
-/** @overload
-@param img Image.
-@param box Alternative ellipse representation via RotatedRect. This means that the function draws
-an ellipse inscribed in the rotated rectangle.
-@param color Ellipse color.
-@param thickness Thickness of the ellipse arc outline, if positive. Otherwise, this indicates that
-a filled ellipse sector is to be drawn.
-@param lineType Type of the ellipse boundary. See #LineTypes
-*/
-CV_EXPORTS_W void ellipse(InputOutputArray img, const RotatedRect& box, const Scalar& color,
-                        int thickness = 1, int lineType = LINE_8);
-
-/* ----------------------------------------------------------------------------------------- */
-/* ADDING A SET OF PREDEFINED MARKERS WHICH COULD BE USED TO HIGHLIGHT POSITIONS IN AN IMAGE */
-/* ----------------------------------------------------------------------------------------- */
-
-/** @brief Draws a marker on a predefined position in an image.
-
-The function cv::drawMarker draws a marker on a given position in the image. For the moment several
-marker types are supported, see #MarkerTypes for more information.
-
-@param img Image.
-@param position The point where the crosshair is positioned.
-@param color Line color.
-@param markerType The specific type of marker you want to use, see #MarkerTypes
-@param thickness Line thickness.
-@param line_type Type of the line, See #LineTypes
-@param markerSize The length of the marker axis [default = 20 pixels]
- */
-CV_EXPORTS_W void drawMarker(InputOutputArray img, Point position, const Scalar& color,
-                             int markerType = MARKER_CROSS, int markerSize=20, int thickness=1,
-                             int line_type=8);
-
-/* ----------------------------------------------------------------------------------------- */
-/* END OF MARKER SECTION */
-/* ----------------------------------------------------------------------------------------- */
-
-/** @brief Fills a convex polygon.
-
-The function cv::fillConvexPoly draws a filled convex polygon. This function is much faster than the
-function #fillPoly . It can fill not only convex polygons but any monotonic polygon without
-self-intersections, that is, a polygon whose contour intersects every horizontal line (scan line)
-twice at the most (though, its top-most and/or the bottom edge could be horizontal).
-
-@param img Image.
-@param points Polygon vertices.
-@param color Polygon color.
-@param lineType Type of the polygon boundaries. See #LineTypes
-@param shift Number of fractional bits in the vertex coordinates.
- */
-CV_EXPORTS_W void fillConvexPoly(InputOutputArray img, InputArray points,
-                                 const Scalar& color, int lineType = LINE_8,
-                                 int shift = 0);
-
-/** @overload */
-CV_EXPORTS void fillConvexPoly(InputOutputArray img, const Point* pts, int npts,
-                               const Scalar& color, int lineType = LINE_8,
-                               int shift = 0);
-
-/** @example samples/cpp/tutorial_code/ImgProc/basic_drawing/Drawing_1.cpp
-An example using drawing functions
-Check @ref tutorial_random_generator_and_text "the corresponding tutorial" for more details
-*/
-
-/** @brief Fills the area bounded by one or more polygons.
-
-The function cv::fillPoly fills an area bounded by several polygonal contours. The function can fill
-complex areas, for example, areas with holes, contours with self-intersections (some of their
-parts), and so forth.
-
-@param img Image.
-@param pts Array of polygons where each polygon is represented as an array of points.
-@param color Polygon color.
-@param lineType Type of the polygon boundaries. See #LineTypes
-@param shift Number of fractional bits in the vertex coordinates.
-@param offset Optional offset of all points of the contours.
- */
-CV_EXPORTS_W void fillPoly(InputOutputArray img, InputArrayOfArrays pts,
-                           const Scalar& color, int lineType = LINE_8, int shift = 0,
-                           Point offset = Point() );
-
-/** @overload */
-CV_EXPORTS void fillPoly(InputOutputArray img, const Point** pts,
-                         const int* npts, int ncontours,
-                         const Scalar& color, int lineType = LINE_8, int shift = 0,
-                         Point offset = Point() );
-
-/** @brief Draws several polygonal curves.
-
-@param img Image.
-@param pts Array of polygonal curves.
-@param isClosed Flag indicating whether the drawn polylines are closed or not. If they are closed,
-the function draws a line from the last vertex of each curve to its first vertex.
-@param color Polyline color.
-@param thickness Thickness of the polyline edges.
-@param lineType Type of the line segments. See #LineTypes
-@param shift Number of fractional bits in the vertex coordinates.
-
-The function cv::polylines draws one or more polygonal curves.
- */
-CV_EXPORTS_W void polylines(InputOutputArray img, InputArrayOfArrays pts,
-                            bool isClosed, const Scalar& color,
-                            int thickness = 1, int lineType = LINE_8, int shift = 0 );
-
-/** @overload */
-CV_EXPORTS void polylines(InputOutputArray img, const Point* const* pts, const int* npts,
-                          int ncontours, bool isClosed, const Scalar& color,
-                          int thickness = 1, int lineType = LINE_8, int shift = 0 );
-
-/** @example samples/cpp/contours2.cpp
-An example program illustrates the use of cv::findContours and cv::drawContours
-\image html WindowsQtContoursOutput.png "Screenshot of the program"
-*/
-
-/** @example samples/cpp/segment_objects.cpp
-An example using drawContours to clean up a background segmentation result
-*/
-
-/** @brief Draws contours outlines or filled contours.
-
-The function draws contour outlines in the image if \f$\texttt{thickness} \ge 0\f$ or fills the area
-bounded by the contours if \f$\texttt{thickness}<0\f$ . The example below shows how to retrieve
-connected components from the binary image and label them: :
-@include snippets/imgproc_drawContours.cpp
-
-@param image Destination image.
-@param contours All the input contours. Each contour is stored as a point vector.
-@param contourIdx Parameter indicating a contour to draw. If it is negative, all the contours are drawn.
-@param color Color of the contours.
-@param thickness Thickness of lines the contours are drawn with. If it is negative (for example,
-thickness=#FILLED ), the contour interiors are drawn.
-@param lineType Line connectivity. See #LineTypes
-@param hierarchy Optional information about hierarchy. It is only needed if you want to draw only
-some of the contours (see maxLevel ).
-@param maxLevel Maximal level for drawn contours. If it is 0, only the specified contour is drawn.
-If it is 1, the function draws the contour(s) and all the nested contours. If it is 2, the function
-draws the contours, all the nested contours, all the nested-to-nested contours, and so on. This
-parameter is only taken into account when there is hierarchy available.
-@param offset Optional contour shift parameter. Shift all the drawn contours by the specified
-\f$\texttt{offset}=(dx,dy)\f$ .
-@note When thickness=#FILLED, the function is designed to handle connected components with holes correctly
-even when no hierarchy data is provided. This is done by analyzing all the outlines together
-using even-odd rule. This may give incorrect results if you have a joint collection of separately retrieved
-contours. In order to solve this problem, you need to call #drawContours separately for each sub-group
-of contours, or iterate over the collection using contourIdx parameter.
- */
-CV_EXPORTS_W void drawContours( InputOutputArray image, InputArrayOfArrays contours,
-                              int contourIdx, const Scalar& color,
-                              int thickness = 1, int lineType = LINE_8,
-                              InputArray hierarchy = noArray(),
-                              int maxLevel = INT_MAX, Point offset = Point() );
-
-/** @brief Clips the line against the image rectangle.
-
-The function cv::clipLine calculates a part of the line segment that is entirely within the specified
-rectangle. It returns false if the line segment is completely outside the rectangle. Otherwise,
-it returns true .
-@param imgSize Image size. The image rectangle is Rect(0, 0, imgSize.width, imgSize.height) .
-@param pt1 First line point.
-@param pt2 Second line point.
- */
-CV_EXPORTS bool clipLine(Size imgSize, CV_IN_OUT Point& pt1, CV_IN_OUT Point& pt2);
-
-/** @overload
-@param imgSize Image size. The image rectangle is Rect(0, 0, imgSize.width, imgSize.height) .
-@param pt1 First line point.
-@param pt2 Second line point.
-*/
-CV_EXPORTS bool clipLine(Size2l imgSize, CV_IN_OUT Point2l& pt1, CV_IN_OUT Point2l& pt2);
-
-/** @overload
-@param imgRect Image rectangle.
-@param pt1 First line point.
-@param pt2 Second line point.
-*/
-CV_EXPORTS_W bool clipLine(Rect imgRect, CV_OUT CV_IN_OUT Point& pt1, CV_OUT CV_IN_OUT Point& pt2);
-
-/** @brief Approximates an elliptic arc with a polyline.
-
-The function ellipse2Poly computes the vertices of a polyline that approximates the specified
-elliptic arc. It is used by #ellipse. If `arcStart` is greater than `arcEnd`, they are swapped.
-
-@param center Center of the arc.
-@param axes Half of the size of the ellipse main axes. See #ellipse for details.
-@param angle Rotation angle of the ellipse in degrees. See #ellipse for details.
-@param arcStart Starting angle of the elliptic arc in degrees.
-@param arcEnd Ending angle of the elliptic arc in degrees.
-@param delta Angle between the subsequent polyline vertices. It defines the approximation
-accuracy.
-@param pts Output vector of polyline vertices.
- */
-CV_EXPORTS_W void ellipse2Poly( Point center, Size axes, int angle,
-                                int arcStart, int arcEnd, int delta,
-                                CV_OUT std::vector<Point>& pts );
-
-/** @overload
-@param center Center of the arc.
-@param axes Half of the size of the ellipse main axes. See #ellipse for details.
-@param angle Rotation angle of the ellipse in degrees. See #ellipse for details.
-@param arcStart Starting angle of the elliptic arc in degrees.
-@param arcEnd Ending angle of the elliptic arc in degrees.
-@param delta Angle between the subsequent polyline vertices. It defines the approximation accuracy.
-@param pts Output vector of polyline vertices.
-*/
-CV_EXPORTS void ellipse2Poly(Point2d center, Size2d axes, int angle,
-                             int arcStart, int arcEnd, int delta,
-                             CV_OUT std::vector<Point2d>& pts);
-
-/** @brief Draws a text string.
-
-The function cv::putText renders the specified text string in the image. Symbols that cannot be rendered
-using the specified font are replaced by question marks. See #getTextSize for a text rendering code
-example.
-
-@param img Image.
-@param text Text string to be drawn.
-@param org Bottom-left corner of the text string in the image.
-@param fontFace Font type, see #HersheyFonts.
-@param fontScale Font scale factor that is multiplied by the font-specific base size.
-@param color Text color.
-@param thickness Thickness of the lines used to draw a text.
-@param lineType Line type. See #LineTypes
-@param bottomLeftOrigin When true, the image data origin is at the bottom-left corner. Otherwise,
-it is at the top-left corner.
- */
-CV_EXPORTS_W void putText( InputOutputArray img, const String& text, Point org,
-                         int fontFace, double fontScale, Scalar color,
-                         int thickness = 1, int lineType = LINE_8,
-                         bool bottomLeftOrigin = false );
-
-/** @brief Calculates the width and height of a text string.
-
-The function cv::getTextSize calculates and returns the size of a box that contains the specified text.
-That is, the following code renders some text, the tight box surrounding it, and the baseline: :
-@code
-    String text = "Funny text inside the box";
-    int fontFace = FONT_HERSHEY_SCRIPT_SIMPLEX;
-    double fontScale = 2;
-    int thickness = 3;
-
-    Mat img(600, 800, CV_8UC3, Scalar::all(0));
-
-    int baseline=0;
-    Size textSize = getTextSize(text, fontFace,
-                                fontScale, thickness, &baseline);
-    baseline += thickness;
-
-    // center the text
-    Point textOrg((img.cols - textSize.width)/2,
-                  (img.rows + textSize.height)/2);
-
-    // draw the box
-    rectangle(img, textOrg + Point(0, baseline),
-              textOrg + Point(textSize.width, -textSize.height),
-              Scalar(0,0,255));
-    // ... and the baseline first
-    line(img, textOrg + Point(0, thickness),
-         textOrg + Point(textSize.width, thickness),
-         Scalar(0, 0, 255));
-
-    // then put the text itself
-    putText(img, text, textOrg, fontFace, fontScale,
-            Scalar::all(255), thickness, 8);
-@endcode
-
-@param text Input text string.
-@param fontFace Font to use, see #HersheyFonts.
-@param fontScale Font scale factor that is multiplied by the font-specific base size.
-@param thickness Thickness of lines used to render the text. See #putText for details.
-@param[out] baseLine y-coordinate of the baseline relative to the bottom-most text
-point.
-@return The size of a box that contains the specified text.
-
-@see putText
- */
-CV_EXPORTS_W Size getTextSize(const String& text, int fontFace,
-                            double fontScale, int thickness,
-                            CV_OUT int* baseLine);
-
-
-/** @brief Calculates the font-specific size to use to achieve a given height in pixels.
-
-@param fontFace Font to use, see cv::HersheyFonts.
-@param pixelHeight Pixel height to compute the fontScale for
-@param thickness Thickness of lines used to render the text.See putText for details.
-@return The fontSize to use for cv::putText
-
-@see cv::putText
-*/
-CV_EXPORTS_W double getFontScaleFromHeight(const int fontFace,
-                                           const int pixelHeight,
-                                           const int thickness = 1);
-
-/** @brief Class for iterating over all pixels on a raster line segment.
-
-The class LineIterator is used to get each pixel of a raster line connecting
-two specified points.
-It can be treated as a versatile implementation of the Bresenham algorithm
-where you can stop at each pixel and do some extra processing, for
-example, grab pixel values along the line or draw a line with an effect
-(for example, with XOR operation).
-
-The number of pixels along the line is stored in LineIterator::count.
-The method LineIterator::pos returns the current position in the image:
-
-@code{.cpp}
-// grabs pixels along the line (pt1, pt2)
-// from 8-bit 3-channel image to the buffer
-LineIterator it(img, pt1, pt2, 8);
-LineIterator it2 = it;
-vector<Vec3b> buf(it.count);
-
-for(int i = 0; i < it.count; i++, ++it)
-    buf[i] = *(const Vec3b*)*it;
-
-// alternative way of iterating through the line
-for(int i = 0; i < it2.count; i++, ++it2)
-{
-    Vec3b val = img.at<Vec3b>(it2.pos());
-    CV_Assert(buf[i] == val);
-}
-@endcode
-*/
-class CV_EXPORTS LineIterator
-{
-public:
-    /** @brief Initializes iterator object for the given line and image.
-
-    The returned iterator can be used to traverse all pixels on a line that
-    connects the given two points.
-    The line will be clipped on the image boundaries.
-
-    @param img Underlying image.
-    @param pt1 First endpoint of the line.
-    @param pt2 The other endpoint of the line.
-    @param connectivity Pixel connectivity of the iterator. Valid values are 4 (iterator can move
-    up, down, left and right) and 8 (iterator can also move diagonally).
-    @param leftToRight If true, the line is traversed from the leftmost endpoint to the rightmost
-    endpoint. Otherwise, the line is traversed from \p pt1 to \p pt2.
-    */
-    LineIterator( const Mat& img, Point pt1, Point pt2,
-                  int connectivity = 8, bool leftToRight = false )
-    {
-        init(&img, Rect(0, 0, img.cols, img.rows), pt1, pt2, connectivity, leftToRight);
-        ptmode = false;
-    }
-    LineIterator( Point pt1, Point pt2,
-                  int connectivity = 8, bool leftToRight = false )
-    {
-        init(0, Rect(std::min(pt1.x, pt2.x),
-                     std::min(pt1.y, pt2.y),
-                     std::max(pt1.x, pt2.x) - std::min(pt1.x, pt2.x) + 1,
-                     std::max(pt1.y, pt2.y) - std::min(pt1.y, pt2.y) + 1),
-             pt1, pt2, connectivity, leftToRight);
-        ptmode = true;
-    }
-    LineIterator( Size boundingAreaSize, Point pt1, Point pt2,
-                  int connectivity = 8, bool leftToRight = false )
-    {
-        init(0, Rect(0, 0, boundingAreaSize.width, boundingAreaSize.height),
-             pt1, pt2, connectivity, leftToRight);
-        ptmode = true;
-    }
-    LineIterator( Rect boundingAreaRect, Point pt1, Point pt2,
-                  int connectivity = 8, bool leftToRight = false )
-    {
-        init(0, boundingAreaRect, pt1, pt2, connectivity, leftToRight);
-        ptmode = true;
-    }
-    void init(const Mat* img, Rect boundingAreaRect, Point pt1, Point pt2, int connectivity, bool leftToRight);
-
-    /** @brief Returns pointer to the current pixel.
-    */
-    uchar* operator *();
-
-    /** @brief Moves iterator to the next pixel on the line.
-
-    This is the prefix version (++it).
-    */
-    LineIterator& operator ++();
-
-    /** @brief Moves iterator to the next pixel on the line.
-
-    This is the postfix version (it++).
-    */
-    LineIterator operator ++(int);
-
-    /** @brief Returns coordinates of the current pixel.
-    */
-    Point pos() const;
-
-    uchar* ptr;
-    const uchar* ptr0;
-    int step, elemSize;
-    int err, count;
-    int minusDelta, plusDelta;
-    int minusStep, plusStep;
-    int minusShift, plusShift;
-    Point p;
-    bool ptmode;
-};
-
-//! @cond IGNORED
-
-// === LineIterator implementation ===
-
-inline
-uchar* LineIterator::operator *()
-{
-    return ptmode ? 0 : ptr;
-}
-
-inline
-LineIterator& LineIterator::operator ++()
-{
-    int mask = err < 0 ? -1 : 0;
-    err += minusDelta + (plusDelta & mask);
-    if(!ptmode)
-    {
-        ptr += minusStep + (plusStep & mask);
-    }
-    else
-    {
-        p.x += minusShift + (plusShift & mask);
-        p.y += minusStep + (plusStep & mask);
-    }
-    return *this;
-}
-
-inline
-LineIterator LineIterator::operator ++(int)
-{
-    LineIterator it = *this;
-    ++(*this);
-    return it;
-}
-
-inline
-Point LineIterator::pos() const
-{
-    if(!ptmode)
-    {
-        size_t offset = (size_t)(ptr - ptr0);
-        int y = (int)(offset/step);
-        int x = (int)((offset - (size_t)y*step)/elemSize);
-        return Point(x, y);
-    }
-    return p;
-}
-
-//! @endcond
-
-//! @} imgproc_draw
-
-//! @} imgproc
-
-} // cv
-
-
-#include "./imgproc/segmentation.hpp"
-
-
-#endif
diff --git a/3rdParty/opencv2/imgproc/bindings.hpp b/3rdParty/opencv2/imgproc/bindings.hpp
deleted file mode 100644
index b0dd395112..0000000000
--- a/3rdParty/opencv2/imgproc/bindings.hpp
+++ /dev/null
@@ -1,34 +0,0 @@
-// This file is part of OpenCV project.
-// It is subject to the license terms in the LICENSE file found in the top-level directory
-// of this distribution and at http://opencv.org/license.html.
-
-#ifndef OPENCV_IMGPROC_BINDINGS_HPP
-#define OPENCV_IMGPROC_BINDINGS_HPP
-
-// This file contains special overloads for OpenCV bindings
-// No need to use these functions in C++ code.
-
-namespace cv {
-
-/** @brief Finds lines in a binary image using the standard Hough transform and get accumulator.
- *
- * @note This function is for bindings use only. Use original function in C++ code
- *
- * @sa HoughLines
- */
-CV_WRAP static inline
-void HoughLinesWithAccumulator(
-        InputArray image, OutputArray lines,
-        double rho, double theta, int threshold,
-        double srn = 0, double stn = 0,
-        double min_theta = 0, double max_theta = CV_PI
-)
-{
-    std::vector<Vec3f> lines_acc;
-    HoughLines(image, lines_acc, rho, theta, threshold, srn, stn, min_theta, max_theta);
-    Mat(lines_acc).copyTo(lines);
-}
-
-}  // namespace
-
-#endif  // OPENCV_IMGPROC_BINDINGS_HPP
diff --git a/3rdParty/opencv2/imgproc/hal/hal.hpp b/3rdParty/opencv2/imgproc/hal/hal.hpp
deleted file mode 100644
index 033428f5ae..0000000000
--- a/3rdParty/opencv2/imgproc/hal/hal.hpp
+++ /dev/null
@@ -1,246 +0,0 @@
-#ifndef CV_IMGPROC_HAL_HPP
-#define CV_IMGPROC_HAL_HPP
-
-#include "opencv2/core/cvdef.h"
-#include "opencv2/core/cvstd.hpp"
-#include "opencv2/core/hal/interface.h"
-
-namespace cv { namespace hal {
-
-//! @addtogroup imgproc_hal_functions
-//! @{
-
-//---------------------------
-//! @cond IGNORED
-
-struct CV_EXPORTS Filter2D
-{
-    CV_DEPRECATED static Ptr<hal::Filter2D> create(uchar * , size_t , int ,
-                                     int , int ,
-                                     int , int ,
-                                     int , int ,
-                                     int , double ,
-                                     int , int ,
-                                     bool , bool );
-    virtual void apply(uchar * , size_t ,
-                       uchar * , size_t ,
-                       int , int ,
-                       int , int ,
-                       int , int ) = 0;
-    virtual ~Filter2D() {}
-};
-
-struct CV_EXPORTS SepFilter2D
-{
-    CV_DEPRECATED static Ptr<hal::SepFilter2D> create(int , int , int ,
-                                        uchar * , int ,
-                                        uchar * , int ,
-                                        int , int ,
-                                        double , int );
-    virtual void apply(uchar * , size_t ,
-                       uchar * , size_t ,
-                       int , int ,
-                       int , int ,
-                       int , int ) = 0;
-    virtual ~SepFilter2D() {}
-};
-
-
-struct CV_EXPORTS Morph
-{
-    CV_DEPRECATED static Ptr<hal::Morph> create(int , int , int , int , int ,
-                                    int , uchar * , size_t ,
-                                    int , int ,
-                                    int , int ,
-                                    int , const double *,
-                                    int , bool , bool );
-    virtual void apply(uchar * , size_t , uchar * , size_t , int , int ,
-                       int , int , int , int ,
-                       int , int , int , int ) = 0;
-    virtual ~Morph() {}
-};
-
-//! @endcond
-//---------------------------
-
-CV_EXPORTS void filter2D(int stype, int dtype, int kernel_type,
-                         uchar * src_data, size_t src_step,
-                         uchar * dst_data, size_t dst_step,
-                         int width, int height,
-                         int full_width, int full_height,
-                         int offset_x, int offset_y,
-                         uchar * kernel_data, size_t kernel_step,
-                         int kernel_width, int kernel_height,
-                         int anchor_x, int anchor_y,
-                         double delta, int borderType,
-                         bool isSubmatrix);
-
-CV_EXPORTS void sepFilter2D(int stype, int dtype, int ktype,
-                            uchar * src_data, size_t src_step,
-                            uchar * dst_data, size_t dst_step,
-                            int width, int height,
-                            int full_width, int full_height,
-                            int offset_x, int offset_y,
-                            uchar * kernelx_data, int kernelx_len,
-                            uchar * kernely_data, int kernely_len,
-                            int anchor_x, int anchor_y,
-                            double delta, int borderType);
-
-CV_EXPORTS void morph(int op, int src_type, int dst_type,
-                      uchar * src_data, size_t src_step,
-                      uchar * dst_data, size_t dst_step,
-                      int width, int height,
-                      int roi_width, int roi_height, int roi_x, int roi_y,
-                      int roi_width2, int roi_height2, int roi_x2, int roi_y2,
-                      int kernel_type, uchar * kernel_data, size_t kernel_step,
-                      int kernel_width, int kernel_height, int anchor_x, int anchor_y,
-                      int borderType, const double borderValue[4],
-                      int iterations, bool isSubmatrix);
-
-
-CV_EXPORTS void resize(int src_type,
-                       const uchar * src_data, size_t src_step, int src_width, int src_height,
-                       uchar * dst_data, size_t dst_step, int dst_width, int dst_height,
-                       double inv_scale_x, double inv_scale_y, int interpolation);
-
-CV_EXPORTS void warpAffine(int src_type,
-                           const uchar * src_data, size_t src_step, int src_width, int src_height,
-                           uchar * dst_data, size_t dst_step, int dst_width, int dst_height,
-                           const double M[6], int interpolation, int borderType, const double borderValue[4]);
-
-CV_EXPORTS void warpPerspective(int src_type,
-                               const uchar * src_data, size_t src_step, int src_width, int src_height,
-                               uchar * dst_data, size_t dst_step, int dst_width, int dst_height,
-                               const double M[9], int interpolation, int borderType, const double borderValue[4]);
-
-CV_EXPORTS void cvtBGRtoBGR(const uchar * src_data, size_t src_step,
-                            uchar * dst_data, size_t dst_step,
-                            int width, int height,
-                            int depth, int scn, int dcn, bool swapBlue);
-
-CV_EXPORTS void cvtBGRtoBGR5x5(const uchar * src_data, size_t src_step,
-                               uchar * dst_data, size_t dst_step,
-                               int width, int height,
-                               int scn, bool swapBlue, int greenBits);
-
-CV_EXPORTS void cvtBGR5x5toBGR(const uchar * src_data, size_t src_step,
-                               uchar * dst_data, size_t dst_step,
-                               int width, int height,
-                               int dcn, bool swapBlue, int greenBits);
-
-CV_EXPORTS void cvtBGRtoGray(const uchar * src_data, size_t src_step,
-                             uchar * dst_data, size_t dst_step,
-                             int width, int height,
-                             int depth, int scn, bool swapBlue);
-
-CV_EXPORTS void cvtGraytoBGR(const uchar * src_data, size_t src_step,
-                             uchar * dst_data, size_t dst_step,
-                             int width, int height,
-                             int depth, int dcn);
-
-CV_EXPORTS void cvtBGR5x5toGray(const uchar * src_data, size_t src_step,
-                                uchar * dst_data, size_t dst_step,
-                                int width, int height,
-                                int greenBits);
-
-CV_EXPORTS void cvtGraytoBGR5x5(const uchar * src_data, size_t src_step,
-                                uchar * dst_data, size_t dst_step,
-                                int width, int height,
-                                int greenBits);
-CV_EXPORTS void cvtBGRtoYUV(const uchar * src_data, size_t src_step,
-                            uchar * dst_data, size_t dst_step,
-                            int width, int height,
-                            int depth, int scn, bool swapBlue, bool isCbCr);
-
-CV_EXPORTS void cvtYUVtoBGR(const uchar * src_data, size_t src_step,
-                            uchar * dst_data, size_t dst_step,
-                            int width, int height,
-                            int depth, int dcn, bool swapBlue, bool isCbCr);
-
-CV_EXPORTS void cvtBGRtoXYZ(const uchar * src_data, size_t src_step,
-                            uchar * dst_data, size_t dst_step,
-                            int width, int height,
-                            int depth, int scn, bool swapBlue);
-
-CV_EXPORTS void cvtXYZtoBGR(const uchar * src_data, size_t src_step,
-                            uchar * dst_data, size_t dst_step,
-                            int width, int height,
-                            int depth, int dcn, bool swapBlue);
-
-CV_EXPORTS void cvtBGRtoHSV(const uchar * src_data, size_t src_step,
-                            uchar * dst_data, size_t dst_step,
-                            int width, int height,
-                            int depth, int scn, bool swapBlue, bool isFullRange, bool isHSV);
-
-CV_EXPORTS void cvtHSVtoBGR(const uchar * src_data, size_t src_step,
-                            uchar * dst_data, size_t dst_step,
-                            int width, int height,
-                            int depth, int dcn, bool swapBlue, bool isFullRange, bool isHSV);
-
-CV_EXPORTS void cvtBGRtoLab(const uchar * src_data, size_t src_step,
-                            uchar * dst_data, size_t dst_step,
-                            int width, int height,
-                            int depth, int scn, bool swapBlue, bool isLab, bool srgb);
-
-CV_EXPORTS void cvtLabtoBGR(const uchar * src_data, size_t src_step,
-                            uchar * dst_data, size_t dst_step,
-                            int width, int height,
-                            int depth, int dcn, bool swapBlue, bool isLab, bool srgb);
-
-CV_EXPORTS void cvtTwoPlaneYUVtoBGR(const uchar * src_data, size_t src_step,
-                                    uchar * dst_data, size_t dst_step,
-                                    int dst_width, int dst_height,
-                                    int dcn, bool swapBlue, int uIdx);
-
-//! Separate Y and UV planes
-CV_EXPORTS void cvtTwoPlaneYUVtoBGR(const uchar * y_data, const uchar * uv_data, size_t src_step,
-                                    uchar * dst_data, size_t dst_step,
-                                    int dst_width, int dst_height,
-                                    int dcn, bool swapBlue, int uIdx);
-
-CV_EXPORTS void cvtTwoPlaneYUVtoBGR(const uchar * y_data, size_t y_step, const uchar * uv_data, size_t uv_step,
-                                    uchar * dst_data, size_t dst_step,
-                                    int dst_width, int dst_height,
-                                    int dcn, bool swapBlue, int uIdx);
-
-CV_EXPORTS void cvtThreePlaneYUVtoBGR(const uchar * src_data, size_t src_step,
-                                      uchar * dst_data, size_t dst_step,
-                                      int dst_width, int dst_height,
-                                      int dcn, bool swapBlue, int uIdx);
-
-CV_EXPORTS void cvtBGRtoThreePlaneYUV(const uchar * src_data, size_t src_step,
-                                      uchar * dst_data, size_t dst_step,
-                                      int width, int height,
-                                      int scn, bool swapBlue, int uIdx);
-
-//! Separate Y and UV planes
-CV_EXPORTS void cvtBGRtoTwoPlaneYUV(const uchar * src_data, size_t src_step,
-                                    uchar * y_data, uchar * uv_data, size_t dst_step,
-                                    int width, int height,
-                                    int scn, bool swapBlue, int uIdx);
-
-CV_EXPORTS void cvtOnePlaneYUVtoBGR(const uchar * src_data, size_t src_step,
-                                    uchar * dst_data, size_t dst_step,
-                                    int width, int height,
-                                    int dcn, bool swapBlue, int uIdx, int ycn);
-
-CV_EXPORTS void cvtRGBAtoMultipliedRGBA(const uchar * src_data, size_t src_step,
-                                        uchar * dst_data, size_t dst_step,
-                                        int width, int height);
-
-CV_EXPORTS void cvtMultipliedRGBAtoRGBA(const uchar * src_data, size_t src_step,
-                                        uchar * dst_data, size_t dst_step,
-                                        int width, int height);
-
-CV_EXPORTS void integral(int depth, int sdepth, int sqdepth,
-                         const uchar* src, size_t srcstep,
-                         uchar* sum, size_t sumstep,
-                         uchar* sqsum, size_t sqsumstep,
-                         uchar* tilted, size_t tstep,
-                         int width, int height, int cn);
-
-//! @}
-
-}}
-
-#endif // CV_IMGPROC_HAL_HPP
diff --git a/3rdParty/opencv2/imgproc/types_c.h b/3rdParty/opencv2/imgproc/types_c.h
deleted file mode 100644
index 2982885df3..0000000000
--- a/3rdParty/opencv2/imgproc/types_c.h
+++ /dev/null
@@ -1,659 +0,0 @@
-/*M///////////////////////////////////////////////////////////////////////////////////////
-//
-//  IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
-//
-//  By downloading, copying, installing or using the software you agree to this license.
-//  If you do not agree to this license, do not download, install,
-//  copy or use the software.
-//
-//
-//                           License Agreement
-//                For Open Source Computer Vision Library
-//
-// Copyright (C) 2000-2008, Intel Corporation, all rights reserved.
-// Copyright (C) 2009, Willow Garage Inc., all rights reserved.
-// Third party copyrights are property of their respective owners.
-//
-// Redistribution and use in source and binary forms, with or without modification,
-// are permitted provided that the following conditions are met:
-//
-//   * Redistribution's of source code must retain the above copyright notice,
-//     this list of conditions and the following disclaimer.
-//
-//   * Redistribution's in binary form must reproduce the above copyright notice,
-//     this list of conditions and the following disclaimer in the documentation
-//     and/or other materials provided with the distribution.
-//
-//   * The name of the copyright holders may not be used to endorse or promote products
-//     derived from this software without specific prior written permission.
-//
-// This software is provided by the copyright holders and contributors "as is" and
-// any express or implied warranties, including, but not limited to, the implied
-// warranties of merchantability and fitness for a particular purpose are disclaimed.
-// In no event shall the Intel Corporation or contributors be liable for any direct,
-// indirect, incidental, special, exemplary, or consequential damages
-// (including, but not limited to, procurement of substitute goods or services;
-// loss of use, data, or profits; or business interruption) however caused
-// and on any theory of liability, whether in contract, strict liability,
-// or tort (including negligence or otherwise) arising in any way out of
-// the use of this software, even if advised of the possibility of such damage.
-//
-//M*/
-
-#ifndef OPENCV_IMGPROC_TYPES_C_H
-#define OPENCV_IMGPROC_TYPES_C_H
-
-#include "opencv2/core/core_c.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** @addtogroup imgproc_c
-  @{
-*/
-
-/** Connected component structure */
-typedef struct CvConnectedComp
-{
-    double area;    /**<area of the connected component  */
-    CvScalar value; /**<average color of the connected component */
-    CvRect rect;    /**<ROI of the component  */
-    CvSeq* contour; /**<optional component boundary
-                      (the contour might have child contours corresponding to the holes)*/
-}
-CvConnectedComp;
-
-/** Image smooth methods */
-enum SmoothMethod_c
-{
-    /** linear convolution with \f$\texttt{size1}\times\texttt{size2}\f$ box kernel (all 1's). If
-    you want to smooth different pixels with different-size box kernels, you can use the integral
-    image that is computed using integral */
-    CV_BLUR_NO_SCALE =0,
-    /** linear convolution with \f$\texttt{size1}\times\texttt{size2}\f$ box kernel (all
-    1's) with subsequent scaling by \f$1/(\texttt{size1}\cdot\texttt{size2})\f$ */
-    CV_BLUR  =1,
-    /** linear convolution with a \f$\texttt{size1}\times\texttt{size2}\f$ Gaussian kernel */
-    CV_GAUSSIAN  =2,
-    /** median filter with a \f$\texttt{size1}\times\texttt{size1}\f$ square aperture */
-    CV_MEDIAN =3,
-    /** bilateral filter with a \f$\texttt{size1}\times\texttt{size1}\f$ square aperture, color
-    sigma= sigma1 and spatial sigma= sigma2. If size1=0, the aperture square side is set to
-    cvRound(sigma2\*1.5)\*2+1. See cv::bilateralFilter */
-    CV_BILATERAL =4
-};
-
-/** Filters used in pyramid decomposition */
-enum
-{
-    CV_GAUSSIAN_5x5 = 7
-};
-
-/** Special filters */
-enum
-{
-    CV_SCHARR =-1,
-    CV_MAX_SOBEL_KSIZE =7
-};
-
-/** Constants for color conversion */
-enum
-{
-    CV_BGR2BGRA    =0,
-    CV_RGB2RGBA    =CV_BGR2BGRA,
-
-    CV_BGRA2BGR    =1,
-    CV_RGBA2RGB    =CV_BGRA2BGR,
-
-    CV_BGR2RGBA    =2,
-    CV_RGB2BGRA    =CV_BGR2RGBA,
-
-    CV_RGBA2BGR    =3,
-    CV_BGRA2RGB    =CV_RGBA2BGR,
-
-    CV_BGR2RGB     =4,
-    CV_RGB2BGR     =CV_BGR2RGB,
-
-    CV_BGRA2RGBA   =5,
-    CV_RGBA2BGRA   =CV_BGRA2RGBA,
-
-    CV_BGR2GRAY    =6,
-    CV_RGB2GRAY    =7,
-    CV_GRAY2BGR    =8,
-    CV_GRAY2RGB    =CV_GRAY2BGR,
-    CV_GRAY2BGRA   =9,
-    CV_GRAY2RGBA   =CV_GRAY2BGRA,
-    CV_BGRA2GRAY   =10,
-    CV_RGBA2GRAY   =11,
-
-    CV_BGR2BGR565  =12,
-    CV_RGB2BGR565  =13,
-    CV_BGR5652BGR  =14,
-    CV_BGR5652RGB  =15,
-    CV_BGRA2BGR565 =16,
-    CV_RGBA2BGR565 =17,
-    CV_BGR5652BGRA =18,
-    CV_BGR5652RGBA =19,
-
-    CV_GRAY2BGR565 =20,
-    CV_BGR5652GRAY =21,
-
-    CV_BGR2BGR555  =22,
-    CV_RGB2BGR555  =23,
-    CV_BGR5552BGR  =24,
-    CV_BGR5552RGB  =25,
-    CV_BGRA2BGR555 =26,
-    CV_RGBA2BGR555 =27,
-    CV_BGR5552BGRA =28,
-    CV_BGR5552RGBA =29,
-
-    CV_GRAY2BGR555 =30,
-    CV_BGR5552GRAY =31,
-
-    CV_BGR2XYZ     =32,
-    CV_RGB2XYZ     =33,
-    CV_XYZ2BGR     =34,
-    CV_XYZ2RGB     =35,
-
-    CV_BGR2YCrCb   =36,
-    CV_RGB2YCrCb   =37,
-    CV_YCrCb2BGR   =38,
-    CV_YCrCb2RGB   =39,
-
-    CV_BGR2HSV     =40,
-    CV_RGB2HSV     =41,
-
-    CV_BGR2Lab     =44,
-    CV_RGB2Lab     =45,
-
-    CV_BayerBG2BGR =46,
-    CV_BayerGB2BGR =47,
-    CV_BayerRG2BGR =48,
-    CV_BayerGR2BGR =49,
-
-    CV_BayerBG2RGB =CV_BayerRG2BGR,
-    CV_BayerGB2RGB =CV_BayerGR2BGR,
-    CV_BayerRG2RGB =CV_BayerBG2BGR,
-    CV_BayerGR2RGB =CV_BayerGB2BGR,
-
-    CV_BGR2Luv     =50,
-    CV_RGB2Luv     =51,
-    CV_BGR2HLS     =52,
-    CV_RGB2HLS     =53,
-
-    CV_HSV2BGR     =54,
-    CV_HSV2RGB     =55,
-
-    CV_Lab2BGR     =56,
-    CV_Lab2RGB     =57,
-    CV_Luv2BGR     =58,
-    CV_Luv2RGB     =59,
-    CV_HLS2BGR     =60,
-    CV_HLS2RGB     =61,
-
-    CV_BayerBG2BGR_VNG =62,
-    CV_BayerGB2BGR_VNG =63,
-    CV_BayerRG2BGR_VNG =64,
-    CV_BayerGR2BGR_VNG =65,
-
-    CV_BayerBG2RGB_VNG =CV_BayerRG2BGR_VNG,
-    CV_BayerGB2RGB_VNG =CV_BayerGR2BGR_VNG,
-    CV_BayerRG2RGB_VNG =CV_BayerBG2BGR_VNG,
-    CV_BayerGR2RGB_VNG =CV_BayerGB2BGR_VNG,
-
-    CV_BGR2HSV_FULL = 66,
-    CV_RGB2HSV_FULL = 67,
-    CV_BGR2HLS_FULL = 68,
-    CV_RGB2HLS_FULL = 69,
-
-    CV_HSV2BGR_FULL = 70,
-    CV_HSV2RGB_FULL = 71,
-    CV_HLS2BGR_FULL = 72,
-    CV_HLS2RGB_FULL = 73,
-
-    CV_LBGR2Lab     = 74,
-    CV_LRGB2Lab     = 75,
-    CV_LBGR2Luv     = 76,
-    CV_LRGB2Luv     = 77,
-
-    CV_Lab2LBGR     = 78,
-    CV_Lab2LRGB     = 79,
-    CV_Luv2LBGR     = 80,
-    CV_Luv2LRGB     = 81,
-
-    CV_BGR2YUV      = 82,
-    CV_RGB2YUV      = 83,
-    CV_YUV2BGR      = 84,
-    CV_YUV2RGB      = 85,
-
-    CV_BayerBG2GRAY = 86,
-    CV_BayerGB2GRAY = 87,
-    CV_BayerRG2GRAY = 88,
-    CV_BayerGR2GRAY = 89,
-
-    //YUV 4:2:0 formats family
-    CV_YUV2RGB_NV12 = 90,
-    CV_YUV2BGR_NV12 = 91,
-    CV_YUV2RGB_NV21 = 92,
-    CV_YUV2BGR_NV21 = 93,
-    CV_YUV420sp2RGB = CV_YUV2RGB_NV21,
-    CV_YUV420sp2BGR = CV_YUV2BGR_NV21,
-
-    CV_YUV2RGBA_NV12 = 94,
-    CV_YUV2BGRA_NV12 = 95,
-    CV_YUV2RGBA_NV21 = 96,
-    CV_YUV2BGRA_NV21 = 97,
-    CV_YUV420sp2RGBA = CV_YUV2RGBA_NV21,
-    CV_YUV420sp2BGRA = CV_YUV2BGRA_NV21,
-
-    CV_YUV2RGB_YV12 = 98,
-    CV_YUV2BGR_YV12 = 99,
-    CV_YUV2RGB_IYUV = 100,
-    CV_YUV2BGR_IYUV = 101,
-    CV_YUV2RGB_I420 = CV_YUV2RGB_IYUV,
-    CV_YUV2BGR_I420 = CV_YUV2BGR_IYUV,
-    CV_YUV420p2RGB = CV_YUV2RGB_YV12,
-    CV_YUV420p2BGR = CV_YUV2BGR_YV12,
-
-    CV_YUV2RGBA_YV12 = 102,
-    CV_YUV2BGRA_YV12 = 103,
-    CV_YUV2RGBA_IYUV = 104,
-    CV_YUV2BGRA_IYUV = 105,
-    CV_YUV2RGBA_I420 = CV_YUV2RGBA_IYUV,
-    CV_YUV2BGRA_I420 = CV_YUV2BGRA_IYUV,
-    CV_YUV420p2RGBA = CV_YUV2RGBA_YV12,
-    CV_YUV420p2BGRA = CV_YUV2BGRA_YV12,
-
-    CV_YUV2GRAY_420 = 106,
-    CV_YUV2GRAY_NV21 = CV_YUV2GRAY_420,
-    CV_YUV2GRAY_NV12 = CV_YUV2GRAY_420,
-    CV_YUV2GRAY_YV12 = CV_YUV2GRAY_420,
-    CV_YUV2GRAY_IYUV = CV_YUV2GRAY_420,
-    CV_YUV2GRAY_I420 = CV_YUV2GRAY_420,
-    CV_YUV420sp2GRAY = CV_YUV2GRAY_420,
-    CV_YUV420p2GRAY = CV_YUV2GRAY_420,
-
-    //YUV 4:2:2 formats family
-    CV_YUV2RGB_UYVY = 107,
-    CV_YUV2BGR_UYVY = 108,
-    //CV_YUV2RGB_VYUY = 109,
-    //CV_YUV2BGR_VYUY = 110,
-    CV_YUV2RGB_Y422 = CV_YUV2RGB_UYVY,
-    CV_YUV2BGR_Y422 = CV_YUV2BGR_UYVY,
-    CV_YUV2RGB_UYNV = CV_YUV2RGB_UYVY,
-    CV_YUV2BGR_UYNV = CV_YUV2BGR_UYVY,
-
-    CV_YUV2RGBA_UYVY = 111,
-    CV_YUV2BGRA_UYVY = 112,
-    //CV_YUV2RGBA_VYUY = 113,
-    //CV_YUV2BGRA_VYUY = 114,
-    CV_YUV2RGBA_Y422 = CV_YUV2RGBA_UYVY,
-    CV_YUV2BGRA_Y422 = CV_YUV2BGRA_UYVY,
-    CV_YUV2RGBA_UYNV = CV_YUV2RGBA_UYVY,
-    CV_YUV2BGRA_UYNV = CV_YUV2BGRA_UYVY,
-
-    CV_YUV2RGB_YUY2 = 115,
-    CV_YUV2BGR_YUY2 = 116,
-    CV_YUV2RGB_YVYU = 117,
-    CV_YUV2BGR_YVYU = 118,
-    CV_YUV2RGB_YUYV = CV_YUV2RGB_YUY2,
-    CV_YUV2BGR_YUYV = CV_YUV2BGR_YUY2,
-    CV_YUV2RGB_YUNV = CV_YUV2RGB_YUY2,
-    CV_YUV2BGR_YUNV = CV_YUV2BGR_YUY2,
-
-    CV_YUV2RGBA_YUY2 = 119,
-    CV_YUV2BGRA_YUY2 = 120,
-    CV_YUV2RGBA_YVYU = 121,
-    CV_YUV2BGRA_YVYU = 122,
-    CV_YUV2RGBA_YUYV = CV_YUV2RGBA_YUY2,
-    CV_YUV2BGRA_YUYV = CV_YUV2BGRA_YUY2,
-    CV_YUV2RGBA_YUNV = CV_YUV2RGBA_YUY2,
-    CV_YUV2BGRA_YUNV = CV_YUV2BGRA_YUY2,
-
-    CV_YUV2GRAY_UYVY = 123,
-    CV_YUV2GRAY_YUY2 = 124,
-    //CV_YUV2GRAY_VYUY = CV_YUV2GRAY_UYVY,
-    CV_YUV2GRAY_Y422 = CV_YUV2GRAY_UYVY,
-    CV_YUV2GRAY_UYNV = CV_YUV2GRAY_UYVY,
-    CV_YUV2GRAY_YVYU = CV_YUV2GRAY_YUY2,
-    CV_YUV2GRAY_YUYV = CV_YUV2GRAY_YUY2,
-    CV_YUV2GRAY_YUNV = CV_YUV2GRAY_YUY2,
-
-    // alpha premultiplication
-    CV_RGBA2mRGBA = 125,
-    CV_mRGBA2RGBA = 126,
-
-    CV_RGB2YUV_I420 = 127,
-    CV_BGR2YUV_I420 = 128,
-    CV_RGB2YUV_IYUV = CV_RGB2YUV_I420,
-    CV_BGR2YUV_IYUV = CV_BGR2YUV_I420,
-
-    CV_RGBA2YUV_I420 = 129,
-    CV_BGRA2YUV_I420 = 130,
-    CV_RGBA2YUV_IYUV = CV_RGBA2YUV_I420,
-    CV_BGRA2YUV_IYUV = CV_BGRA2YUV_I420,
-    CV_RGB2YUV_YV12  = 131,
-    CV_BGR2YUV_YV12  = 132,
-    CV_RGBA2YUV_YV12 = 133,
-    CV_BGRA2YUV_YV12 = 134,
-
-    // Edge-Aware Demosaicing
-    CV_BayerBG2BGR_EA = 135,
-    CV_BayerGB2BGR_EA = 136,
-    CV_BayerRG2BGR_EA = 137,
-    CV_BayerGR2BGR_EA = 138,
-
-    CV_BayerBG2RGB_EA = CV_BayerRG2BGR_EA,
-    CV_BayerGB2RGB_EA = CV_BayerGR2BGR_EA,
-    CV_BayerRG2RGB_EA = CV_BayerBG2BGR_EA,
-    CV_BayerGR2RGB_EA = CV_BayerGB2BGR_EA,
-
-    CV_BayerBG2BGRA =139,
-    CV_BayerGB2BGRA =140,
-    CV_BayerRG2BGRA =141,
-    CV_BayerGR2BGRA =142,
-
-    CV_BayerBG2RGBA =CV_BayerRG2BGRA,
-    CV_BayerGB2RGBA =CV_BayerGR2BGRA,
-    CV_BayerRG2RGBA =CV_BayerBG2BGRA,
-    CV_BayerGR2RGBA =CV_BayerGB2BGRA,
-
-    CV_COLORCVT_MAX  = 143
-};
-
-
-/** Sub-pixel interpolation methods */
-enum
-{
-    CV_INTER_NN        =0,
-    CV_INTER_LINEAR    =1,
-    CV_INTER_CUBIC     =2,
-    CV_INTER_AREA      =3,
-    CV_INTER_LANCZOS4  =4
-};
-
-/** ... and other image warping flags */
-enum
-{
-    CV_WARP_FILL_OUTLIERS =8,
-    CV_WARP_INVERSE_MAP  =16
-};
-
-/** Shapes of a structuring element for morphological operations
-@see cv::MorphShapes, cv::getStructuringElement
-*/
-enum MorphShapes_c
-{
-    CV_SHAPE_RECT      =0,
-    CV_SHAPE_CROSS     =1,
-    CV_SHAPE_ELLIPSE   =2,
-    CV_SHAPE_CUSTOM    =100 //!< custom structuring element
-};
-
-/** Morphological operations */
-enum
-{
-    CV_MOP_ERODE        =0,
-    CV_MOP_DILATE       =1,
-    CV_MOP_OPEN         =2,
-    CV_MOP_CLOSE        =3,
-    CV_MOP_GRADIENT     =4,
-    CV_MOP_TOPHAT       =5,
-    CV_MOP_BLACKHAT     =6
-};
-
-/** Spatial and central moments */
-typedef struct CvMoments
-{
-    double  m00, m10, m01, m20, m11, m02, m30, m21, m12, m03; /**< spatial moments */
-    double  mu20, mu11, mu02, mu30, mu21, mu12, mu03; /**< central moments */
-    double  inv_sqrt_m00; /**< m00 != 0 ? 1/sqrt(m00) : 0 */
-
-#if defined(CV__ENABLE_C_API_CTORS) && defined(__cplusplus)
-    CvMoments(){}
-    CvMoments(const cv::Moments& m)
-    {
-        m00 = m.m00; m10 = m.m10; m01 = m.m01;
-        m20 = m.m20; m11 = m.m11; m02 = m.m02;
-        m30 = m.m30; m21 = m.m21; m12 = m.m12; m03 = m.m03;
-        mu20 = m.mu20; mu11 = m.mu11; mu02 = m.mu02;
-        mu30 = m.mu30; mu21 = m.mu21; mu12 = m.mu12; mu03 = m.mu03;
-        double am00 = std::abs(m.m00);
-        inv_sqrt_m00 = am00 > DBL_EPSILON ? 1./std::sqrt(am00) : 0;
-    }
-    operator cv::Moments() const
-    {
-        return cv::Moments(m00, m10, m01, m20, m11, m02, m30, m21, m12, m03);
-    }
-#endif
-}
-CvMoments;
-
-#ifdef __cplusplus
-} // extern "C"
-
-CV_INLINE CvMoments cvMoments()
-{
-#if !defined(CV__ENABLE_C_API_CTORS)
-    CvMoments self = CV_STRUCT_INITIALIZER; return self;
-#else
-    return CvMoments();
-#endif
-}
-
-CV_INLINE CvMoments cvMoments(const cv::Moments& m)
-{
-#if !defined(CV__ENABLE_C_API_CTORS)
-    double am00 = std::abs(m.m00);
-    CvMoments self = {
-        m.m00, m.m10, m.m01, m.m20, m.m11, m.m02, m.m30, m.m21, m.m12, m.m03,
-        m.mu20, m.mu11, m.mu02, m.mu30, m.mu21, m.mu12, m.mu03,
-        am00 > DBL_EPSILON ? 1./std::sqrt(am00) : 0
-    };
-    return self;
-#else
-    return CvMoments(m);
-#endif
-}
-
-extern "C" {
-#endif // __cplusplus
-
-/** Hu invariants */
-typedef struct CvHuMoments
-{
-    double hu1, hu2, hu3, hu4, hu5, hu6, hu7; /**< Hu invariants */
-}
-CvHuMoments;
-
-/** Template matching methods */
-enum
-{
-    CV_TM_SQDIFF        =0,
-    CV_TM_SQDIFF_NORMED =1,
-    CV_TM_CCORR         =2,
-    CV_TM_CCORR_NORMED  =3,
-    CV_TM_CCOEFF        =4,
-    CV_TM_CCOEFF_NORMED =5
-};
-
-typedef float (CV_CDECL * CvDistanceFunction)( const float* a, const float* b, void* user_param );
-
-/** Contour retrieval modes */
-enum
-{
-    CV_RETR_EXTERNAL=0,
-    CV_RETR_LIST=1,
-    CV_RETR_CCOMP=2,
-    CV_RETR_TREE=3,
-    CV_RETR_FLOODFILL=4
-};
-
-/** Contour approximation methods */
-enum
-{
-    CV_CHAIN_CODE=0,
-    CV_CHAIN_APPROX_NONE=1,
-    CV_CHAIN_APPROX_SIMPLE=2,
-    CV_CHAIN_APPROX_TC89_L1=3,
-    CV_CHAIN_APPROX_TC89_KCOS=4,
-    CV_LINK_RUNS=5
-};
-
-/*
-Internal structure that is used for sequential retrieving contours from the image.
-It supports both hierarchical and plane variants of Suzuki algorithm.
-*/
-typedef struct _CvContourScanner* CvContourScanner;
-
-/** Freeman chain reader state */
-typedef struct CvChainPtReader
-{
-    CV_SEQ_READER_FIELDS()
-    char      code;
-    CvPoint   pt;
-    schar     deltas[8][2];
-}
-CvChainPtReader;
-
-/** initializes 8-element array for fast access to 3x3 neighborhood of a pixel */
-#define  CV_INIT_3X3_DELTAS( deltas, step, nch )            \
-    ((deltas)[0] =  (nch),  (deltas)[1] = -(step) + (nch),  \
-     (deltas)[2] = -(step), (deltas)[3] = -(step) - (nch),  \
-     (deltas)[4] = -(nch),  (deltas)[5] =  (step) - (nch),  \
-     (deltas)[6] =  (step), (deltas)[7] =  (step) + (nch))
-
-
-/** Contour approximation algorithms */
-enum
-{
-    CV_POLY_APPROX_DP = 0
-};
-
-/** Shape matching methods */
-enum
-{
-    CV_CONTOURS_MATCH_I1  =1, //!< \f[I_1(A,B) =  \sum _{i=1...7}  \left |  \frac{1}{m^A_i} -  \frac{1}{m^B_i} \right |\f]
-    CV_CONTOURS_MATCH_I2  =2, //!< \f[I_2(A,B) =  \sum _{i=1...7}  \left | m^A_i - m^B_i  \right |\f]
-    CV_CONTOURS_MATCH_I3  =3  //!< \f[I_3(A,B) =  \max _{i=1...7}  \frac{ \left| m^A_i - m^B_i \right| }{ \left| m^A_i \right| }\f]
-};
-
-/** Shape orientation */
-enum
-{
-    CV_CLOCKWISE         =1,
-    CV_COUNTER_CLOCKWISE =2
-};
-
-
-/** Convexity defect */
-typedef struct CvConvexityDefect
-{
-    CvPoint* start; /**< point of the contour where the defect begins */
-    CvPoint* end; /**< point of the contour where the defect ends */
-    CvPoint* depth_point; /**< the farthest from the convex hull point within the defect */
-    float depth; /**< distance between the farthest point and the convex hull */
-} CvConvexityDefect;
-
-
-/** Histogram comparison methods */
-enum
-{
-    CV_COMP_CORREL        =0,
-    CV_COMP_CHISQR        =1,
-    CV_COMP_INTERSECT     =2,
-    CV_COMP_BHATTACHARYYA =3,
-    CV_COMP_HELLINGER     =CV_COMP_BHATTACHARYYA,
-    CV_COMP_CHISQR_ALT    =4,
-    CV_COMP_KL_DIV        =5
-};
-
-/** Mask size for distance transform */
-enum
-{
-    CV_DIST_MASK_3   =3,
-    CV_DIST_MASK_5   =5,
-    CV_DIST_MASK_PRECISE =0
-};
-
-/** Content of output label array: connected components or pixels */
-enum
-{
-  CV_DIST_LABEL_CCOMP = 0,
-  CV_DIST_LABEL_PIXEL = 1
-};
-
-/** Distance types for Distance Transform and M-estimators */
-enum
-{
-    CV_DIST_USER    =-1,  /**< User defined distance */
-    CV_DIST_L1      =1,   /**< distance = |x1-x2| + |y1-y2| */
-    CV_DIST_L2      =2,   /**< the simple euclidean distance */
-    CV_DIST_C       =3,   /**< distance = max(|x1-x2|,|y1-y2|) */
-    CV_DIST_L12     =4,   /**< L1-L2 metric: distance = 2(sqrt(1+x*x/2) - 1)) */
-    CV_DIST_FAIR    =5,   /**< distance = c^2(|x|/c-log(1+|x|/c)), c = 1.3998 */
-    CV_DIST_WELSCH  =6,   /**< distance = c^2/2(1-exp(-(x/c)^2)), c = 2.9846 */
-    CV_DIST_HUBER   =7    /**< distance = |x|<c ? x^2/2 : c(|x|-c/2), c=1.345 */
-};
-
-
-/** Threshold types */
-enum
-{
-    CV_THRESH_BINARY      =0,  /**< value = value > threshold ? max_value : 0       */
-    CV_THRESH_BINARY_INV  =1,  /**< value = value > threshold ? 0 : max_value       */
-    CV_THRESH_TRUNC       =2,  /**< value = value > threshold ? threshold : value   */
-    CV_THRESH_TOZERO      =3,  /**< value = value > threshold ? value : 0           */
-    CV_THRESH_TOZERO_INV  =4,  /**< value = value > threshold ? 0 : value           */
-    CV_THRESH_MASK        =7,
-    CV_THRESH_OTSU        =8, /**< use Otsu algorithm to choose the optimal threshold value;
-                                 combine the flag with one of the above CV_THRESH_* values */
-    CV_THRESH_TRIANGLE    =16  /**< use Triangle algorithm to choose the optimal threshold value;
-                                 combine the flag with one of the above CV_THRESH_* values, but not
-                                 with CV_THRESH_OTSU */
-};
-
-/** Adaptive threshold methods */
-enum
-{
-    CV_ADAPTIVE_THRESH_MEAN_C  =0,
-    CV_ADAPTIVE_THRESH_GAUSSIAN_C  =1
-};
-
-/** FloodFill flags */
-enum
-{
-    CV_FLOODFILL_FIXED_RANGE =(1 << 16),
-    CV_FLOODFILL_MASK_ONLY   =(1 << 17)
-};
-
-
-/** Canny edge detector flags */
-enum
-{
-    CV_CANNY_L2_GRADIENT  =(1 << 31)
-};
-
-/** Variants of a Hough transform */
-enum
-{
-    CV_HOUGH_STANDARD =0,
-    CV_HOUGH_PROBABILISTIC =1,
-    CV_HOUGH_MULTI_SCALE =2,
-    CV_HOUGH_GRADIENT =3
-};
-
-
-/* Fast search data structures  */
-struct CvFeatureTree;
-struct CvLSH;
-struct CvLSHOperations;
-
-/** @} */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/3rdParty/opencv2/objdetect/face.hpp b/3rdParty/opencv2/objdetect/face.hpp
deleted file mode 100644
index 69f4aab9f1..0000000000
--- a/3rdParty/opencv2/objdetect/face.hpp
+++ /dev/null
@@ -1,130 +0,0 @@
-// This file is part of OpenCV project.
-// It is subject to the license terms in the LICENSE file found in the top-level directory
-// of this distribution and at http://opencv.org/license.html.
-
-#ifndef OPENCV_OBJDETECT_FACE_HPP
-#define OPENCV_OBJDETECT_FACE_HPP
-
-#include <opencv2/core.hpp>
-
-namespace cv
-{
-
-//! @addtogroup objdetect_dnn_face
-//! @{
-
-/** @brief DNN-based face detector
-
-model download link: https://github.com/opencv/opencv_zoo/tree/master/models/face_detection_yunet
- */
-class CV_EXPORTS_W FaceDetectorYN
-{
-public:
-    virtual ~FaceDetectorYN() {};
-
-    /** @brief Set the size for the network input, which overwrites the input size of creating model. Call this method when the size of input image does not match the input size when creating model
-     *
-     * @param input_size the size of the input image
-     */
-    CV_WRAP virtual void setInputSize(const Size& input_size) = 0;
-
-    CV_WRAP virtual Size getInputSize() = 0;
-
-    /** @brief Set the score threshold to filter out bounding boxes of score less than the given value
-     *
-     * @param score_threshold threshold for filtering out bounding boxes
-     */
-    CV_WRAP virtual void setScoreThreshold(float score_threshold) = 0;
-
-    CV_WRAP virtual float getScoreThreshold() = 0;
-
-    /** @brief Set the Non-maximum-suppression threshold to suppress bounding boxes that have IoU greater than the given value
-     *
-     * @param nms_threshold threshold for NMS operation
-     */
-    CV_WRAP virtual void setNMSThreshold(float nms_threshold) = 0;
-
-    CV_WRAP virtual float getNMSThreshold() = 0;
-
-    /** @brief Set the number of bounding boxes preserved before NMS
-     *
-     * @param top_k the number of bounding boxes to preserve from top rank based on score
-     */
-    CV_WRAP virtual void setTopK(int top_k) = 0;
-
-    CV_WRAP virtual int getTopK() = 0;
-
-    /** @brief A simple interface to detect face from given image
-     *
-     *  @param image an image to detect
-     *  @param faces detection results stored in a cv::Mat
-     */
-    CV_WRAP virtual int detect(InputArray image, OutputArray faces) = 0;
-
-    /** @brief Creates an instance of this class with given parameters
-     *
-     *  @param model the path to the requested model
-     *  @param config the path to the config file for compability, which is not requested for ONNX models
-     *  @param input_size the size of the input image
-     *  @param score_threshold the threshold to filter out bounding boxes of score smaller than the given value
-     *  @param nms_threshold the threshold to suppress bounding boxes of IoU bigger than the given value
-     *  @param top_k keep top K bboxes before NMS
-     *  @param backend_id the id of backend
-     *  @param target_id the id of target device
-     */
-    CV_WRAP static Ptr<FaceDetectorYN> create(const String& model,
-                                              const String& config,
-                                              const Size& input_size,
-                                              float score_threshold = 0.9f,
-                                              float nms_threshold = 0.3f,
-                                              int top_k = 5000,
-                                              int backend_id = 0,
-                                              int target_id = 0);
-};
-
-/** @brief DNN-based face recognizer
-
-model download link: https://github.com/opencv/opencv_zoo/tree/master/models/face_recognition_sface
- */
-class CV_EXPORTS_W FaceRecognizerSF
-{
-public:
-    virtual ~FaceRecognizerSF() {};
-
-    /** @brief Definition of distance used for calculating the distance between two face features
-     */
-    enum DisType { FR_COSINE=0, FR_NORM_L2=1 };
-
-    /** @brief Aligning image to put face on the standard position
-     *  @param src_img input image
-     *  @param face_box the detection result used for indicate face in input image
-     *  @param aligned_img output aligned image
-     */
-    CV_WRAP virtual void alignCrop(InputArray src_img, InputArray face_box, OutputArray aligned_img) const = 0;
-
-    /** @brief Extracting face feature from aligned image
-     *  @param aligned_img input aligned image
-     *  @param face_feature output face feature
-     */
-    CV_WRAP virtual void feature(InputArray aligned_img, OutputArray face_feature) = 0;
-
-    /** @brief Calculating the distance between two face features
-     *  @param face_feature1 the first input feature
-     *  @param face_feature2 the second input feature of the same size and the same type as face_feature1
-     *  @param dis_type defining the similarity with optional values "FR_OSINE" or "FR_NORM_L2"
-     */
-    CV_WRAP virtual double match(InputArray face_feature1, InputArray face_feature2, int dis_type = FaceRecognizerSF::FR_COSINE) const = 0;
-
-    /** @brief Creates an instance of this class with given parameters
-     *  @param model the path of the onnx model used for face recognition
-     *  @param config the path to the config file for compability, which is not requested for ONNX models
-     *  @param backend_id the id of backend
-     *  @param target_id the id of target device
-     */
-    CV_WRAP static Ptr<FaceRecognizerSF> create(const String& model, const String& config, int backend_id = 0, int target_id = 0);
-};
-
-//! @}
-} // namespace cv
-
-#endif
diff --git a/3rdParty/opencv2/photo/cuda.hpp b/3rdParty/opencv2/photo/cuda.hpp
deleted file mode 100644
index c879acd640..0000000000
--- a/3rdParty/opencv2/photo/cuda.hpp
+++ /dev/null
@@ -1,132 +0,0 @@
-/*M///////////////////////////////////////////////////////////////////////////////////////
-//
-//  IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
-//
-//  By downloading, copying, installing or using the software you agree to this license.
-//  If you do not agree to this license, do not download, install,
-//  copy or use the software.
-//
-//
-//                           License Agreement
-//                For Open Source Computer Vision Library
-//
-// Copyright (C) 2000-2008, Intel Corporation, all rights reserved.
-// Copyright (C) 2008-2012, Willow Garage Inc., all rights reserved.
-// Third party copyrights are property of their respective owners.
-//
-// Redistribution and use in source and binary forms, with or without modification,
-// are permitted provided that the following conditions are met:
-//
-//   * Redistribution's of source code must retain the above copyright notice,
-//     this list of conditions and the following disclaimer.
-//
-//   * Redistribution's in binary form must reproduce the above copyright notice,
-//     this list of conditions and the following disclaimer in the documentation
-//     and/or other materials provided with the distribution.
-//
-//   * The name of the copyright holders may not be used to endorse or promote products
-//     derived from this software without specific prior written permission.
-//
-// This software is provided by the copyright holders and contributors "as is" and
-// any express or implied warranties, including, but not limited to, the implied
-// warranties of merchantability and fitness for a particular purpose are disclaimed.
-// In no event shall the Intel Corporation or contributors be liable for any direct,
-// indirect, incidental, special, exemplary, or consequential damages
-// (including, but not limited to, procurement of substitute goods or services;
-// loss of use, data, or profits; or business interruption) however caused
-// and on any theory of liability, whether in contract, strict liability,
-// or tort (including negligence or otherwise) arising in any way out of
-// the use of this software, even if advised of the possibility of such damage.
-//
-//M*/
-
-#ifndef OPENCV_PHOTO_CUDA_HPP
-#define OPENCV_PHOTO_CUDA_HPP
-
-#include "opencv2/core/cuda.hpp"
-
-namespace cv { namespace cuda {
-
-//! @addtogroup photo_denoise
-//! @{
-
-/** @brief Performs pure non local means denoising without any simplification, and thus it is not fast.
-
-@param src Source image. Supports only CV_8UC1, CV_8UC2 and CV_8UC3.
-@param dst Destination image.
-@param h Filter sigma regulating filter strength for color.
-@param search_window Size of search window.
-@param block_size Size of block used for computing weights.
-@param borderMode Border type. See borderInterpolate for details. BORDER_REFLECT101 ,
-BORDER_REPLICATE , BORDER_CONSTANT , BORDER_REFLECT and BORDER_WRAP are supported for now.
-@param stream Stream for the asynchronous version.
-
-@sa
-   fastNlMeansDenoising
- */
-CV_EXPORTS void nonLocalMeans(InputArray src, OutputArray dst,
-                              float h,
-                              int search_window = 21,
-                              int block_size = 7,
-                              int borderMode = BORDER_DEFAULT,
-                              Stream& stream = Stream::Null());
-
-/** @brief Perform image denoising using Non-local Means Denoising algorithm
-<http://www.ipol.im/pub/algo/bcm_non_local_means_denoising> with several computational
-optimizations. Noise expected to be a gaussian white noise
-
-@param src Input 8-bit 1-channel, 2-channel or 3-channel image.
-@param dst Output image with the same size and type as src .
-@param h Parameter regulating filter strength. Big h value perfectly removes noise but also
-removes image details, smaller h value preserves details but also preserves some noise
-@param search_window Size in pixels of the window that is used to compute weighted average for
-given pixel. Should be odd. Affect performance linearly: greater search_window - greater
-denoising time. Recommended value 21 pixels
-@param block_size Size in pixels of the template patch that is used to compute weights. Should be
-odd. Recommended value 7 pixels
-@param stream Stream for the asynchronous invocations.
-
-This function expected to be applied to grayscale images. For colored images look at
-FastNonLocalMeansDenoising::labMethod.
-
-@sa
-   fastNlMeansDenoising
- */
-CV_EXPORTS void fastNlMeansDenoising(InputArray src, OutputArray dst,
-                                     float h,
-                                     int search_window = 21,
-                                     int block_size = 7,
-                                     Stream& stream = Stream::Null());
-
-/** @brief Modification of fastNlMeansDenoising function for colored images
-
-@param src Input 8-bit 3-channel image.
-@param dst Output image with the same size and type as src .
-@param h_luminance Parameter regulating filter strength. Big h value perfectly removes noise but
-also removes image details, smaller h value preserves details but also preserves some noise
-@param photo_render float The same as h but for color components. For most images value equals 10 will be
-enough to remove colored noise and do not distort colors
-@param search_window Size in pixels of the window that is used to compute weighted average for
-given pixel. Should be odd. Affect performance linearly: greater search_window - greater
-denoising time. Recommended value 21 pixels
-@param block_size Size in pixels of the template patch that is used to compute weights. Should be
-odd. Recommended value 7 pixels
-@param stream Stream for the asynchronous invocations.
-
-The function converts image to CIELAB colorspace and then separately denoise L and AB components
-with given h parameters using FastNonLocalMeansDenoising::simpleMethod function.
-
-@sa
-   fastNlMeansDenoisingColored
- */
-CV_EXPORTS void fastNlMeansDenoisingColored(InputArray src, OutputArray dst,
-                                            float h_luminance, float photo_render,
-                                            int search_window = 21,
-                                            int block_size = 7,
-                                            Stream& stream = Stream::Null());
-
-//! @} photo
-
-}} // namespace cv { namespace cuda {
-
-#endif /* OPENCV_PHOTO_CUDA_HPP */
diff --git a/3rdParty/opencv2/stitching/detail/warpers.hpp b/3rdParty/opencv2/stitching/detail/warpers.hpp
deleted file mode 100644
index c7e5bb7b28..0000000000
--- a/3rdParty/opencv2/stitching/detail/warpers.hpp
+++ /dev/null
@@ -1,682 +0,0 @@
- /*M///////////////////////////////////////////////////////////////////////////////////////
-//
-//  IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
-//
-//  By downloading, copying, installing or using the software you agree to this license.
-//  If you do not agree to this license, do not download, install,
-//  copy or use the software.
-//
-//
-//                          License Agreement
-//                For Open Source Computer Vision Library
-//
-// Copyright (C) 2000-2008, Intel Corporation, all rights reserved.
-// Copyright (C) 2009, Willow Garage Inc., all rights reserved.
-// Third party copyrights are property of their respective owners.
-//
-// Redistribution and use in source and binary forms, with or without modification,
-// are permitted provided that the following conditions are met:
-//
-//   * Redistribution's of source code must retain the above copyright notice,
-//     this list of conditions and the following disclaimer.
-//
-//   * Redistribution's in binary form must reproduce the above copyright notice,
-//     this list of conditions and the following disclaimer in the documentation
-//     and/or other materials provided with the distribution.
-//
-//   * The name of the copyright holders may not be used to endorse or promote products
-//     derived from this software without specific prior written permission.
-//
-// This software is provided by the copyright holders and contributors "as is" and
-// any express or implied warranties, including, but not limited to, the implied
-// warranties of merchantability and fitness for a particular purpose are disclaimed.
-// In no event shall the Intel Corporation or contributors be liable for any direct,
-// indirect, incidental, special, exemplary, or consequential damages
-// (including, but not limited to, procurement of substitute goods or services;
-// loss of use, data, or profits; or business interruption) however caused
-// and on any theory of liability, whether in contract, strict liability,
-// or tort (including negligence or otherwise) arising in any way out of
-// the use of this software, even if advised of the possibility of such damage.
-//
-//M*/
-
-#ifndef OPENCV_STITCHING_WARPERS_HPP
-#define OPENCV_STITCHING_WARPERS_HPP
-
-#include "opencv2/core.hpp"
-#include "opencv2/core/cuda.hpp"
-#include "opencv2/imgproc.hpp"
-#include "opencv2/opencv_modules.hpp"
-
-namespace cv {
-namespace detail {
-
-//! @addtogroup stitching_warp
-//! @{
-
-/** @brief Rotation-only model image warper interface.
- */
-class CV_EXPORTS RotationWarper
-{
-public:
-    virtual ~RotationWarper() {}
-
-    /** @brief Projects the image point.
-
-    @param pt Source point
-    @param K Camera intrinsic parameters
-    @param R Camera rotation matrix
-    @return Projected point
-     */
-    virtual Point2f warpPoint(const Point2f &pt, InputArray K, InputArray R) = 0;
-
-    /** @brief Projects the image point backward.
-
-    @param pt Projected point
-    @param K Camera intrinsic parameters
-    @param R Camera rotation matrix
-    @return Backward-projected point
-    */
-#if CV_VERSION_MAJOR == 4
-    virtual Point2f warpPointBackward(const Point2f& pt, InputArray K, InputArray R)
-    {
-        CV_UNUSED(pt); CV_UNUSED(K); CV_UNUSED(R);
-        CV_Error(Error::StsNotImplemented, "");
-    }
-#else
-    virtual Point2f warpPointBackward(const Point2f& pt, InputArray K, InputArray R) = 0;
-#endif
-
-    /** @brief Builds the projection maps according to the given camera data.
-
-    @param src_size Source image size
-    @param K Camera intrinsic parameters
-    @param R Camera rotation matrix
-    @param xmap Projection map for the x axis
-    @param ymap Projection map for the y axis
-    @return Projected image minimum bounding box
-     */
-    virtual Rect buildMaps(Size src_size, InputArray K, InputArray R, OutputArray xmap, OutputArray ymap) = 0;
-
-    /** @brief Projects the image.
-
-    @param src Source image
-    @param K Camera intrinsic parameters
-    @param R Camera rotation matrix
-    @param interp_mode Interpolation mode
-    @param border_mode Border extrapolation mode
-    @param dst Projected image
-    @return Project image top-left corner
-     */
-    virtual Point warp(InputArray src, InputArray K, InputArray R, int interp_mode, int border_mode,
-                       CV_OUT OutputArray dst) = 0;
-
-    /** @brief Projects the image backward.
-
-    @param src Projected image
-    @param K Camera intrinsic parameters
-    @param R Camera rotation matrix
-    @param interp_mode Interpolation mode
-    @param border_mode Border extrapolation mode
-    @param dst_size Backward-projected image size
-    @param dst Backward-projected image
-     */
-    virtual void warpBackward(InputArray src, InputArray K, InputArray R, int interp_mode, int border_mode,
-                              Size dst_size, CV_OUT OutputArray dst) = 0;
-
-    /**
-    @param src_size Source image bounding box
-    @param K Camera intrinsic parameters
-    @param R Camera rotation matrix
-    @return Projected image minimum bounding box
-     */
-    virtual Rect warpRoi(Size src_size, InputArray K, InputArray R) = 0;
-
-    virtual float getScale() const { return 1.f; }
-    virtual void setScale(float) {}
-};
-
-/** @brief Base class for warping logic implementation.
- */
-struct CV_EXPORTS_W_SIMPLE ProjectorBase
-{
-    void setCameraParams(InputArray K = Mat::eye(3, 3, CV_32F),
-                         InputArray R = Mat::eye(3, 3, CV_32F),
-                         InputArray T = Mat::zeros(3, 1, CV_32F));
-
-    float scale;
-    float k[9];
-    float rinv[9];
-    float r_kinv[9];
-    float k_rinv[9];
-    float t[3];
-};
-
-/** @brief Base class for rotation-based warper using a detail::ProjectorBase_ derived class.
- */
-template <class P>
-class CV_EXPORTS_TEMPLATE RotationWarperBase : public RotationWarper
-{
-public:
-    Point2f warpPoint(const Point2f &pt, InputArray K, InputArray R) CV_OVERRIDE;
-
-    Point2f warpPointBackward(const Point2f &pt, InputArray K, InputArray R) CV_OVERRIDE;
-
-    Rect buildMaps(Size src_size, InputArray K, InputArray R, OutputArray xmap, OutputArray ymap) CV_OVERRIDE;
-
-    Point warp(InputArray src, InputArray K, InputArray R, int interp_mode, int border_mode,
-               OutputArray dst) CV_OVERRIDE;
-
-    void warpBackward(InputArray src, InputArray K, InputArray R, int interp_mode, int border_mode,
-                      Size dst_size, OutputArray dst) CV_OVERRIDE;
-
-    Rect warpRoi(Size src_size, InputArray K, InputArray R) CV_OVERRIDE;
-
-    float getScale() const  CV_OVERRIDE{ return projector_.scale; }
-    void setScale(float val) CV_OVERRIDE { projector_.scale = val; }
-
-protected:
-
-    // Detects ROI of the destination image. It's correct for any projection.
-    virtual void detectResultRoi(Size src_size, Point &dst_tl, Point &dst_br);
-
-    // Detects ROI of the destination image by walking over image border.
-    // Correctness for any projection isn't guaranteed.
-    void detectResultRoiByBorder(Size src_size, Point &dst_tl, Point &dst_br);
-
-    P projector_;
-};
-
-
-struct CV_EXPORTS PlaneProjector : ProjectorBase
-{
-    void mapForward(float x, float y, float &u, float &v);
-    void mapBackward(float u, float v, float &x, float &y);
-};
-
-/** @brief Warper that maps an image onto the z = 1 plane.
- */
-class CV_EXPORTS PlaneWarper : public RotationWarperBase<PlaneProjector>
-{
-public:
-    /** @brief Construct an instance of the plane warper class.
-
-    @param scale Projected image scale multiplier
-     */
-    PlaneWarper(float scale = 1.f) { projector_.scale = scale; }
-
-    Point2f warpPoint(const Point2f &pt, InputArray K, InputArray R) CV_OVERRIDE;
-    Point2f warpPoint(const Point2f &pt, InputArray K, InputArray R, InputArray T);
-
-    Point2f warpPointBackward(const Point2f& pt, InputArray K, InputArray R) CV_OVERRIDE;
-    Point2f warpPointBackward(const Point2f& pt, InputArray K, InputArray R, InputArray T);
-
-    virtual Rect buildMaps(Size src_size, InputArray K, InputArray R, InputArray T, CV_OUT OutputArray xmap, CV_OUT OutputArray ymap);
-    Rect buildMaps(Size src_size, InputArray K, InputArray R, CV_OUT OutputArray xmap, CV_OUT OutputArray ymap) CV_OVERRIDE;
-
-    Point warp(InputArray src, InputArray K, InputArray R,
-               int interp_mode, int border_mode, CV_OUT OutputArray dst) CV_OVERRIDE;
-    virtual Point warp(InputArray src, InputArray K, InputArray R, InputArray T, int interp_mode, int border_mode,
-        CV_OUT OutputArray dst);
-
-    Rect warpRoi(Size src_size, InputArray K, InputArray R) CV_OVERRIDE;
-    Rect warpRoi(Size src_size, InputArray K, InputArray R, InputArray T);
-
-protected:
-    void detectResultRoi(Size src_size, Point &dst_tl, Point &dst_br) CV_OVERRIDE;
-};
-
-
-/** @brief Affine warper that uses rotations and translations
-
- Uses affine transformation in homogeneous coordinates to represent both rotation and
- translation in camera rotation matrix.
- */
-class CV_EXPORTS AffineWarper : public PlaneWarper
-{
-public:
-    /** @brief Construct an instance of the affine warper class.
-
-    @param scale Projected image scale multiplier
-     */
-    AffineWarper(float scale = 1.f) : PlaneWarper(scale) {}
-
-    /** @brief Projects the image point.
-
-    @param pt Source point
-    @param K Camera intrinsic parameters
-    @param H Camera extrinsic parameters
-    @return Projected point
-     */
-    Point2f warpPoint(const Point2f &pt, InputArray K, InputArray H) CV_OVERRIDE;
-
-    /** @brief Projects the image point backward.
-
-    @param pt Projected point
-    @param K Camera intrinsic parameters
-    @param H Camera extrinsic parameters
-    @return Backward-projected point
-    */
-    Point2f warpPointBackward(const Point2f &pt, InputArray K, InputArray H) CV_OVERRIDE;
-
-    /** @brief Builds the projection maps according to the given camera data.
-
-    @param src_size Source image size
-    @param K Camera intrinsic parameters
-    @param H Camera extrinsic parameters
-    @param xmap Projection map for the x axis
-    @param ymap Projection map for the y axis
-    @return Projected image minimum bounding box
-     */
-    Rect buildMaps(Size src_size, InputArray K, InputArray H, OutputArray xmap, OutputArray ymap) CV_OVERRIDE;
-
-    /** @brief Projects the image.
-
-    @param src Source image
-    @param K Camera intrinsic parameters
-    @param H Camera extrinsic parameters
-    @param interp_mode Interpolation mode
-    @param border_mode Border extrapolation mode
-    @param dst Projected image
-    @return Project image top-left corner
-     */
-    Point warp(InputArray src, InputArray K, InputArray H,
-               int interp_mode, int border_mode, OutputArray dst) CV_OVERRIDE;
-
-    /**
-    @param src_size Source image bounding box
-    @param K Camera intrinsic parameters
-    @param H Camera extrinsic parameters
-    @return Projected image minimum bounding box
-     */
-    Rect warpRoi(Size src_size, InputArray K, InputArray H) CV_OVERRIDE;
-
-protected:
-    /** @brief Extracts rotation and translation matrices from matrix H representing
-        affine transformation in homogeneous coordinates
-     */
-    void getRTfromHomogeneous(InputArray H, Mat &R, Mat &T);
-};
-
-
-struct CV_EXPORTS_W_SIMPLE SphericalProjector : ProjectorBase
-{
-    CV_WRAP void mapForward(float x, float y, float &u, float &v);
-    CV_WRAP void mapBackward(float u, float v, float &x, float &y);
-};
-
-
-/** @brief Warper that maps an image onto the unit sphere located at the origin.
-
- Projects image onto unit sphere with origin at (0, 0, 0) and radius scale, measured in pixels.
- A 360 panorama would therefore have a resulting width of 2 * scale * PI pixels.
- Poles are located at (0, -1, 0) and (0, 1, 0) points.
-*/
-class CV_EXPORTS SphericalWarper : public RotationWarperBase<SphericalProjector>
-{
-public:
-    /** @brief Construct an instance of the spherical warper class.
-
-    @param scale Radius of the projected sphere, in pixels. An image spanning the
-                 whole sphere will have a width of 2 * scale * PI pixels.
-     */
-    SphericalWarper(float scale) { projector_.scale = scale; }
-
-    Rect buildMaps(Size src_size, InputArray K, InputArray R, OutputArray xmap, OutputArray ymap) CV_OVERRIDE;
-    Point warp(InputArray src, InputArray K, InputArray R, int interp_mode, int border_mode, OutputArray dst) CV_OVERRIDE;
-protected:
-    void detectResultRoi(Size src_size, Point &dst_tl, Point &dst_br) CV_OVERRIDE;
-};
-
-
-struct CV_EXPORTS CylindricalProjector : ProjectorBase
-{
-    void mapForward(float x, float y, float &u, float &v);
-    void mapBackward(float u, float v, float &x, float &y);
-};
-
-
-/** @brief Warper that maps an image onto the x\*x + z\*z = 1 cylinder.
- */
-class CV_EXPORTS CylindricalWarper : public RotationWarperBase<CylindricalProjector>
-{
-public:
-    /** @brief Construct an instance of the cylindrical warper class.
-
-    @param scale Projected image scale multiplier
-     */
-    CylindricalWarper(float scale) { projector_.scale = scale; }
-
-    Rect buildMaps(Size src_size, InputArray K, InputArray R, OutputArray xmap, OutputArray ymap) CV_OVERRIDE;
-    Point warp(InputArray src, InputArray K, InputArray R, int interp_mode, int border_mode, OutputArray dst) CV_OVERRIDE;
-protected:
-    void detectResultRoi(Size src_size, Point &dst_tl, Point &dst_br) CV_OVERRIDE
-    {
-        RotationWarperBase<CylindricalProjector>::detectResultRoiByBorder(src_size, dst_tl, dst_br);
-    }
-};
-
-
-struct CV_EXPORTS FisheyeProjector : ProjectorBase
-{
-    void mapForward(float x, float y, float &u, float &v);
-    void mapBackward(float u, float v, float &x, float &y);
-};
-
-
-class CV_EXPORTS FisheyeWarper : public RotationWarperBase<FisheyeProjector>
-{
-public:
-    FisheyeWarper(float scale) { projector_.scale = scale; }
-};
-
-
-struct CV_EXPORTS StereographicProjector : ProjectorBase
-{
-    void mapForward(float x, float y, float &u, float &v);
-    void mapBackward(float u, float v, float &x, float &y);
-};
-
-
-class CV_EXPORTS StereographicWarper : public RotationWarperBase<StereographicProjector>
-{
-public:
-    StereographicWarper(float scale) { projector_.scale = scale; }
-};
-
-
-struct CV_EXPORTS CompressedRectilinearProjector : ProjectorBase
-{
-    float a, b;
-
-    void mapForward(float x, float y, float &u, float &v);
-    void mapBackward(float u, float v, float &x, float &y);
-};
-
-
-class CV_EXPORTS CompressedRectilinearWarper : public RotationWarperBase<CompressedRectilinearProjector>
-{
-public:
-    CompressedRectilinearWarper(float scale, float A = 1, float B = 1)
-    {
-        projector_.a = A;
-        projector_.b = B;
-        projector_.scale = scale;
-    }
-};
-
-
-struct CV_EXPORTS CompressedRectilinearPortraitProjector : ProjectorBase
-{
-    float a, b;
-
-    void mapForward(float x, float y, float &u, float &v);
-    void mapBackward(float u, float v, float &x, float &y);
-};
-
-
-class CV_EXPORTS CompressedRectilinearPortraitWarper : public RotationWarperBase<CompressedRectilinearPortraitProjector>
-{
-public:
-   CompressedRectilinearPortraitWarper(float scale, float A = 1, float B = 1)
-   {
-       projector_.a = A;
-       projector_.b = B;
-       projector_.scale = scale;
-   }
-};
-
-
-struct CV_EXPORTS PaniniProjector : ProjectorBase
-{
-    float a, b;
-
-    void mapForward(float x, float y, float &u, float &v);
-    void mapBackward(float u, float v, float &x, float &y);
-};
-
-
-class CV_EXPORTS PaniniWarper : public RotationWarperBase<PaniniProjector>
-{
-public:
-   PaniniWarper(float scale, float A = 1, float B = 1)
-   {
-       projector_.a = A;
-       projector_.b = B;
-       projector_.scale = scale;
-   }
-};
-
-
-struct CV_EXPORTS PaniniPortraitProjector : ProjectorBase
-{
-    float a, b;
-
-    void mapForward(float x, float y, float &u, float &v);
-    void mapBackward(float u, float v, float &x, float &y);
-};
-
-
-class CV_EXPORTS PaniniPortraitWarper : public RotationWarperBase<PaniniPortraitProjector>
-{
-public:
-   PaniniPortraitWarper(float scale, float A = 1, float B = 1)
-   {
-       projector_.a = A;
-       projector_.b = B;
-       projector_.scale = scale;
-   }
-
-};
-
-
-struct CV_EXPORTS MercatorProjector : ProjectorBase
-{
-    void mapForward(float x, float y, float &u, float &v);
-    void mapBackward(float u, float v, float &x, float &y);
-};
-
-
-class CV_EXPORTS MercatorWarper : public RotationWarperBase<MercatorProjector>
-{
-public:
-    MercatorWarper(float scale) { projector_.scale = scale; }
-};
-
-
-struct CV_EXPORTS TransverseMercatorProjector : ProjectorBase
-{
-    void mapForward(float x, float y, float &u, float &v);
-    void mapBackward(float u, float v, float &x, float &y);
-};
-
-
-class CV_EXPORTS TransverseMercatorWarper : public RotationWarperBase<TransverseMercatorProjector>
-{
-public:
-    TransverseMercatorWarper(float scale) { projector_.scale = scale; }
-};
-
-
-class CV_EXPORTS PlaneWarperGpu : public PlaneWarper
-{
-public:
-    PlaneWarperGpu(float scale = 1.f) : PlaneWarper(scale) {}
-
-    Rect buildMaps(Size src_size, InputArray K, InputArray R, OutputArray xmap, OutputArray ymap) CV_OVERRIDE
-    {
-        Rect result = buildMaps(src_size, K, R, d_xmap_, d_ymap_);
-        d_xmap_.download(xmap);
-        d_ymap_.download(ymap);
-        return result;
-    }
-
-    Rect buildMaps(Size src_size, InputArray K, InputArray R, InputArray T, OutputArray xmap, OutputArray ymap) CV_OVERRIDE
-    {
-        Rect result = buildMaps(src_size, K, R, T, d_xmap_, d_ymap_);
-        d_xmap_.download(xmap);
-        d_ymap_.download(ymap);
-        return result;
-    }
-
-    Point warp(InputArray src, InputArray K, InputArray R, int interp_mode, int border_mode,
-               OutputArray dst) CV_OVERRIDE
-    {
-        d_src_.upload(src);
-        Point result = warp(d_src_, K, R, interp_mode, border_mode, d_dst_);
-        d_dst_.download(dst);
-        return result;
-    }
-
-    Point warp(InputArray src, InputArray K, InputArray R, InputArray T, int interp_mode, int border_mode,
-               OutputArray dst) CV_OVERRIDE
-    {
-        d_src_.upload(src);
-        Point result = warp(d_src_, K, R, T, interp_mode, border_mode, d_dst_);
-        d_dst_.download(dst);
-        return result;
-    }
-
-    Rect buildMaps(Size src_size, InputArray K, InputArray R, cuda::GpuMat & xmap, cuda::GpuMat & ymap);
-
-    Rect buildMaps(Size src_size, InputArray K, InputArray R, InputArray T, cuda::GpuMat & xmap, cuda::GpuMat & ymap);
-
-    Point warp(const cuda::GpuMat & src, InputArray K, InputArray R, int interp_mode, int border_mode,
-               cuda::GpuMat & dst);
-
-    Point warp(const cuda::GpuMat & src, InputArray K, InputArray R, InputArray T, int interp_mode, int border_mode,
-               cuda::GpuMat & dst);
-
-private:
-    cuda::GpuMat d_xmap_, d_ymap_, d_src_, d_dst_;
-};
-
-
-class CV_EXPORTS SphericalWarperGpu : public SphericalWarper
-{
-public:
-    SphericalWarperGpu(float scale) : SphericalWarper(scale) {}
-
-    Rect buildMaps(Size src_size, InputArray K, InputArray R, OutputArray xmap, OutputArray ymap) CV_OVERRIDE
-    {
-        Rect result = buildMaps(src_size, K, R, d_xmap_, d_ymap_);
-        d_xmap_.download(xmap);
-        d_ymap_.download(ymap);
-        return result;
-    }
-
-    Point warp(InputArray src, InputArray K, InputArray R, int interp_mode, int border_mode,
-               OutputArray dst) CV_OVERRIDE
-    {
-        d_src_.upload(src);
-        Point result = warp(d_src_, K, R, interp_mode, border_mode, d_dst_);
-        d_dst_.download(dst);
-        return result;
-    }
-
-    Rect buildMaps(Size src_size, InputArray K, InputArray R, cuda::GpuMat & xmap, cuda::GpuMat & ymap);
-
-    Point warp(const cuda::GpuMat & src, InputArray K, InputArray R, int interp_mode, int border_mode,
-               cuda::GpuMat & dst);
-
-private:
-    cuda::GpuMat d_xmap_, d_ymap_, d_src_, d_dst_;
-};
-
-
-class CV_EXPORTS CylindricalWarperGpu : public CylindricalWarper
-{
-public:
-    CylindricalWarperGpu(float scale) : CylindricalWarper(scale) {}
-
-    Rect buildMaps(Size src_size, InputArray K, InputArray R, OutputArray xmap, OutputArray ymap) CV_OVERRIDE
-    {
-        Rect result = buildMaps(src_size, K, R, d_xmap_, d_ymap_);
-        d_xmap_.download(xmap);
-        d_ymap_.download(ymap);
-        return result;
-    }
-
-    Point warp(InputArray src, InputArray K, InputArray R, int interp_mode, int border_mode,
-               OutputArray dst) CV_OVERRIDE
-    {
-        d_src_.upload(src);
-        Point result = warp(d_src_, K, R, interp_mode, border_mode, d_dst_);
-        d_dst_.download(dst);
-        return result;
-    }
-
-    Rect buildMaps(Size src_size, InputArray K, InputArray R, cuda::GpuMat & xmap, cuda::GpuMat & ymap);
-
-    Point warp(const cuda::GpuMat & src, InputArray K, InputArray R, int interp_mode, int border_mode,
-               cuda::GpuMat & dst);
-
-private:
-    cuda::GpuMat d_xmap_, d_ymap_, d_src_, d_dst_;
-};
-
-
-struct CV_EXPORTS SphericalPortraitProjector : ProjectorBase
-{
-    void mapForward(float x, float y, float &u, float &v);
-    void mapBackward(float u, float v, float &x, float &y);
-};
-
-
-// Projects image onto unit sphere with origin at (0, 0, 0).
-// Poles are located NOT at (0, -1, 0) and (0, 1, 0) points, BUT at (1, 0, 0) and (-1, 0, 0) points.
-class CV_EXPORTS SphericalPortraitWarper : public RotationWarperBase<SphericalPortraitProjector>
-{
-public:
-    SphericalPortraitWarper(float scale) { projector_.scale = scale; }
-
-protected:
-    void detectResultRoi(Size src_size, Point &dst_tl, Point &dst_br) CV_OVERRIDE;
-};
-
-struct CV_EXPORTS CylindricalPortraitProjector : ProjectorBase
-{
-    void mapForward(float x, float y, float &u, float &v);
-    void mapBackward(float u, float v, float &x, float &y);
-};
-
-
-class CV_EXPORTS CylindricalPortraitWarper : public RotationWarperBase<CylindricalPortraitProjector>
-{
-public:
-    CylindricalPortraitWarper(float scale) { projector_.scale = scale; }
-
-protected:
-    void detectResultRoi(Size src_size, Point &dst_tl, Point &dst_br) CV_OVERRIDE
-    {
-        RotationWarperBase<CylindricalPortraitProjector>::detectResultRoiByBorder(src_size, dst_tl, dst_br);
-    }
-};
-
-struct CV_EXPORTS PlanePortraitProjector : ProjectorBase
-{
-    void mapForward(float x, float y, float &u, float &v);
-    void mapBackward(float u, float v, float &x, float &y);
-};
-
-
-class CV_EXPORTS PlanePortraitWarper : public RotationWarperBase<PlanePortraitProjector>
-{
-public:
-    PlanePortraitWarper(float scale) { projector_.scale = scale; }
-
-protected:
-    void detectResultRoi(Size src_size, Point &dst_tl, Point &dst_br) CV_OVERRIDE
-    {
-        RotationWarperBase<PlanePortraitProjector>::detectResultRoiByBorder(src_size, dst_tl, dst_br);
-    }
-};
-
-//! @} stitching_warp
-
-} // namespace detail
-} // namespace cv
-
-#include "warpers_inl.hpp"
-
-#endif // OPENCV_STITCHING_WARPERS_HPP
diff --git a/3rdParty/opencv2/stitching/warpers.hpp b/3rdParty/opencv2/stitching/warpers.hpp
deleted file mode 100644
index 2c1d90bf3f..0000000000
--- a/3rdParty/opencv2/stitching/warpers.hpp
+++ /dev/null
@@ -1,277 +0,0 @@
-/*M///////////////////////////////////////////////////////////////////////////////////////
-//
-//  IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
-//
-//  By downloading, copying, installing or using the software you agree to this license.
-//  If you do not agree to this license, do not download, install,
-//  copy or use the software.
-//
-//
-//                          License Agreement
-//                For Open Source Computer Vision Library
-//
-// Copyright (C) 2000-2008, Intel Corporation, all rights reserved.
-// Copyright (C) 2009, Willow Garage Inc., all rights reserved.
-// Third party copyrights are property of their respective owners.
-//
-// Redistribution and use in source and binary forms, with or without modification,
-// are permitted provided that the following conditions are met:
-//
-//   * Redistribution's of source code must retain the above copyright notice,
-//     this list of conditions and the following disclaimer.
-//
-//   * Redistribution's in binary form must reproduce the above copyright notice,
-//     this list of conditions and the following disclaimer in the documentation
-//     and/or other materials provided with the distribution.
-//
-//   * The name of the copyright holders may not be used to endorse or promote products
-//     derived from this software without specific prior written permission.
-//
-// This software is provided by the copyright holders and contributors "as is" and
-// any express or implied warranties, including, but not limited to, the implied
-// warranties of merchantability and fitness for a particular purpose are disclaimed.
-// In no event shall the Intel Corporation or contributors be liable for any direct,
-// indirect, incidental, special, exemplary, or consequential damages
-// (including, but not limited to, procurement of substitute goods or services;
-// loss of use, data, or profits; or business interruption) however caused
-// and on any theory of liability, whether in contract, strict liability,
-// or tort (including negligence or otherwise) arising in any way out of
-// the use of this software, even if advised of the possibility of such damage.
-//
-//M*/
-
-#ifndef OPENCV_STITCHING_WARPER_CREATORS_HPP
-#define OPENCV_STITCHING_WARPER_CREATORS_HPP
-
-#include "opencv2/stitching/detail/warpers.hpp"
-#include <string>
-
-namespace cv {
-    class CV_EXPORTS_W PyRotationWarper
-    {
-        Ptr<detail::RotationWarper> rw;
-
-    public:
-        CV_WRAP PyRotationWarper(String type, float scale);
-        CV_WRAP PyRotationWarper() {};
-        ~PyRotationWarper() {}
-
-        /** @brief Projects the image point.
-
-        @param pt Source point
-        @param K Camera intrinsic parameters
-        @param R Camera rotation matrix
-        @return Projected point
-        */
-        CV_WRAP Point2f warpPoint(const Point2f &pt, InputArray K, InputArray R);
-
-        /** @brief Projects the image point backward.
-
-        @param pt Projected point
-        @param K Camera intrinsic parameters
-        @param R Camera rotation matrix
-        @return Backward-projected point
-        */
-#if CV_VERSION_MAJOR == 4
-        CV_WRAP Point2f warpPointBackward(const Point2f& pt, InputArray K, InputArray R)
-        {
-            CV_UNUSED(pt); CV_UNUSED(K); CV_UNUSED(R);
-            CV_Error(Error::StsNotImplemented, "");
-        }
-#else
-        CV_WRAP Point2f warpPointBackward(const Point2f &pt, InputArray K, InputArray R);
-#endif
-        /** @brief Builds the projection maps according to the given camera data.
-
-        @param src_size Source image size
-        @param K Camera intrinsic parameters
-        @param R Camera rotation matrix
-        @param xmap Projection map for the x axis
-        @param ymap Projection map for the y axis
-        @return Projected image minimum bounding box
-        */
-        CV_WRAP Rect buildMaps(Size src_size, InputArray K, InputArray R, OutputArray xmap, OutputArray ymap);
-
-        /** @brief Projects the image.
-
-        @param src Source image
-        @param K Camera intrinsic parameters
-        @param R Camera rotation matrix
-        @param interp_mode Interpolation mode
-        @param border_mode Border extrapolation mode
-        @param dst Projected image
-        @return Project image top-left corner
-        */
-        CV_WRAP Point warp(InputArray src, InputArray K, InputArray R, int interp_mode, int border_mode,
-            CV_OUT OutputArray dst);
-
-        /** @brief Projects the image backward.
-
-        @param src Projected image
-        @param K Camera intrinsic parameters
-        @param R Camera rotation matrix
-        @param interp_mode Interpolation mode
-        @param border_mode Border extrapolation mode
-        @param dst_size Backward-projected image size
-        @param dst Backward-projected image
-        */
-        CV_WRAP void warpBackward(InputArray src, InputArray K, InputArray R, int interp_mode, int border_mode,
-            Size dst_size, CV_OUT OutputArray dst);
-
-        /**
-        @param src_size Source image bounding box
-        @param K Camera intrinsic parameters
-        @param R Camera rotation matrix
-        @return Projected image minimum bounding box
-        */
-        CV_WRAP Rect warpRoi(Size src_size, InputArray K, InputArray R);
-
-        CV_WRAP float getScale() const { return 1.f; }
-        CV_WRAP void setScale(float) {}
-    };
-
-//! @addtogroup stitching_warp
-//! @{
-
-/** @brief Image warper factories base class.
- */
-
-class CV_EXPORTS_W WarperCreator
-{
-public:
-    CV_WRAP virtual ~WarperCreator() {}
-    virtual Ptr<detail::RotationWarper> create(float scale) const = 0;
-};
-
-
-/** @brief Plane warper factory class.
-  @sa detail::PlaneWarper
- */
-class CV_EXPORTS  PlaneWarper : public WarperCreator
-{
-public:
-    Ptr<detail::RotationWarper> create(float scale) const CV_OVERRIDE { return makePtr<detail::PlaneWarper>(scale); }
-};
-
-/** @brief Affine warper factory class.
-  @sa detail::AffineWarper
- */
-class CV_EXPORTS  AffineWarper : public WarperCreator
-{
-public:
-    Ptr<detail::RotationWarper> create(float scale) const CV_OVERRIDE { return makePtr<detail::AffineWarper>(scale); }
-};
-
-/** @brief Cylindrical warper factory class.
-@sa detail::CylindricalWarper
-*/
-class CV_EXPORTS CylindricalWarper: public WarperCreator
-{
-public:
-    Ptr<detail::RotationWarper> create(float scale) const CV_OVERRIDE { return makePtr<detail::CylindricalWarper>(scale); }
-};
-
-/** @brief Spherical warper factory class */
-class CV_EXPORTS SphericalWarper: public WarperCreator
-{
-public:
-    Ptr<detail::RotationWarper> create(float scale) const CV_OVERRIDE { return makePtr<detail::SphericalWarper>(scale); }
-};
-
-class CV_EXPORTS FisheyeWarper : public WarperCreator
-{
-public:
-    Ptr<detail::RotationWarper> create(float scale) const CV_OVERRIDE { return makePtr<detail::FisheyeWarper>(scale); }
-};
-
-class CV_EXPORTS StereographicWarper: public WarperCreator
-{
-public:
-    Ptr<detail::RotationWarper> create(float scale) const CV_OVERRIDE { return makePtr<detail::StereographicWarper>(scale); }
-};
-
-class CV_EXPORTS CompressedRectilinearWarper: public WarperCreator
-{
-    float a, b;
-public:
-    CompressedRectilinearWarper(float A = 1, float B = 1)
-    {
-        a = A; b = B;
-    }
-    Ptr<detail::RotationWarper> create(float scale) const CV_OVERRIDE { return makePtr<detail::CompressedRectilinearWarper>(scale, a, b); }
-};
-
-class CV_EXPORTS CompressedRectilinearPortraitWarper: public WarperCreator
-{
-    float a, b;
-public:
-    CompressedRectilinearPortraitWarper(float A = 1, float B = 1)
-    {
-        a = A; b = B;
-    }
-    Ptr<detail::RotationWarper> create(float scale) const CV_OVERRIDE { return makePtr<detail::CompressedRectilinearPortraitWarper>(scale, a, b); }
-};
-
-class CV_EXPORTS PaniniWarper: public WarperCreator
-{
-    float a, b;
-public:
-    PaniniWarper(float A = 1, float B = 1)
-    {
-        a = A; b = B;
-    }
-    Ptr<detail::RotationWarper> create(float scale) const CV_OVERRIDE { return makePtr<detail::PaniniWarper>(scale, a, b); }
-};
-
-class CV_EXPORTS PaniniPortraitWarper: public WarperCreator
-{
-    float a, b;
-public:
-    PaniniPortraitWarper(float A = 1, float B = 1)
-    {
-        a = A; b = B;
-    }
-    Ptr<detail::RotationWarper> create(float scale) const CV_OVERRIDE { return makePtr<detail::PaniniPortraitWarper>(scale, a, b); }
-};
-
-class CV_EXPORTS MercatorWarper: public WarperCreator
-{
-public:
-    Ptr<detail::RotationWarper> create(float scale) const CV_OVERRIDE { return makePtr<detail::MercatorWarper>(scale); }
-};
-
-class CV_EXPORTS TransverseMercatorWarper: public WarperCreator
-{
-public:
-    Ptr<detail::RotationWarper> create(float scale) const CV_OVERRIDE { return makePtr<detail::TransverseMercatorWarper>(scale); }
-};
-
-
-
-#ifdef HAVE_OPENCV_CUDAWARPING
-class PlaneWarperGpu: public WarperCreator
-{
-public:
-    Ptr<detail::RotationWarper> create(float scale) const CV_OVERRIDE { return makePtr<detail::PlaneWarperGpu>(scale); }
-};
-
-
-class CylindricalWarperGpu: public WarperCreator
-{
-public:
-    Ptr<detail::RotationWarper> create(float scale) const CV_OVERRIDE { return makePtr<detail::CylindricalWarperGpu>(scale); }
-};
-
-
-class SphericalWarperGpu: public WarperCreator
-{
-public:
-    Ptr<detail::RotationWarper> create(float scale) const CV_OVERRIDE { return makePtr<detail::SphericalWarperGpu>(scale); }
-};
-#endif
-
-//! @} stitching_warp
-
-} // namespace cv
-
-#endif // OPENCV_STITCHING_WARPER_CREATORS_HPP
diff --git a/3rdParty/opencv2/videoio/cap_ios.h b/3rdParty/opencv2/videoio/cap_ios.h
deleted file mode 100644
index 4b84805275..0000000000
--- a/3rdParty/opencv2/videoio/cap_ios.h
+++ /dev/null
@@ -1,150 +0,0 @@
-/*  For iOS video I/O
- *  by Eduard Feicho on 29/07/12
- *  Copyright 2012. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
- * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#import <UIKit/UIKit.h>
-#import <Accelerate/Accelerate.h>
-#import <AVFoundation/AVFoundation.h>
-#import <ImageIO/ImageIO.h>
-#include "opencv2/core.hpp"
-
-//! @addtogroup videoio_ios
-//! @{
-
-/////////////////////////////////////// CvAbstractCamera /////////////////////////////////////
-
-@class CvAbstractCamera;
-
-CV_EXPORTS @interface CvAbstractCamera : NSObject
-{
-    UIDeviceOrientation currentDeviceOrientation;
-
-    BOOL cameraAvailable;
-}
-
-@property (nonatomic, strong) AVCaptureSession* captureSession;
-@property (nonatomic, strong) AVCaptureConnection* videoCaptureConnection;
-
-@property (nonatomic, readonly) BOOL running;
-@property (nonatomic, readonly) BOOL captureSessionLoaded;
-
-@property (nonatomic, assign) int defaultFPS;
-@property (nonatomic, readonly) AVCaptureVideoPreviewLayer *captureVideoPreviewLayer;
-@property (nonatomic, assign) AVCaptureDevicePosition defaultAVCaptureDevicePosition;
-@property (nonatomic, assign) AVCaptureVideoOrientation defaultAVCaptureVideoOrientation;
-@property (nonatomic, assign) BOOL useAVCaptureVideoPreviewLayer;
-@property (nonatomic, strong) NSString *const defaultAVCaptureSessionPreset;
-
-@property (nonatomic, assign) int imageWidth;
-@property (nonatomic, assign) int imageHeight;
-
-@property (nonatomic, strong) UIView* parentView;
-
-- CV_UNUSED(start);
-- CV_UNUSED(stop);
-- CV_UNUSED(switchCameras);
-
-- (id)initWithParentView:(UIView*)parent;
-
-- CV_UNUSED(createCaptureOutput);
-- CV_UNUSED(createVideoPreviewLayer);
-- CV_UNUSED(updateOrientation);
-
-- CV_UNUSED(lockFocus);
-- CV_UNUSED(unlockFocus);
-- CV_UNUSED(lockExposure);
-- CV_UNUSED(unlockExposure);
-- CV_UNUSED(lockBalance);
-- CV_UNUSED(unlockBalance);
-
-@end
-
-///////////////////////////////// CvVideoCamera ///////////////////////////////////////////
-
-@class CvVideoCamera;
-
-CV_EXPORTS @protocol CvVideoCameraDelegate <NSObject>
-
-#ifdef __cplusplus
-// delegate method for processing image frames
-- (void)processImage:(cv::Mat&)image;
-#endif
-
-@end
-
-CV_EXPORTS @interface CvVideoCamera : CvAbstractCamera<AVCaptureVideoDataOutputSampleBufferDelegate>
-{
-    AVCaptureVideoDataOutput *videoDataOutput;
-
-    dispatch_queue_t videoDataOutputQueue;
-    CALayer *customPreviewLayer;
-
-    CMTime lastSampleTime;
-
-}
-
-@property (nonatomic, weak) id<CvVideoCameraDelegate> delegate;
-@property (nonatomic, assign) BOOL grayscaleMode;
-
-@property (nonatomic, assign) BOOL recordVideo;
-@property (nonatomic, assign) BOOL rotateVideo;
-@property (nonatomic, strong) AVAssetWriterInput* recordAssetWriterInput;
-@property (nonatomic, strong) AVAssetWriterInputPixelBufferAdaptor* recordPixelBufferAdaptor;
-@property (nonatomic, strong) AVAssetWriter* recordAssetWriter;
-
-- (void)adjustLayoutToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation;
-- CV_UNUSED(layoutPreviewLayer);
-- CV_UNUSED(saveVideo);
-- (NSURL *)videoFileURL;
-- (NSString *)videoFileString;
-
-
-@end
-
-///////////////////////////////// CvPhotoCamera ///////////////////////////////////////////
-
-@class CvPhotoCamera;
-
-CV_EXPORTS @protocol CvPhotoCameraDelegate <NSObject>
-
-- (void)photoCamera:(CvPhotoCamera*)photoCamera capturedImage:(UIImage *)image;
-- (void)photoCameraCancel:(CvPhotoCamera*)photoCamera;
-
-@end
-
-CV_EXPORTS @interface CvPhotoCamera : CvAbstractCamera
-{
-    AVCaptureStillImageOutput *stillImageOutput;
-}
-
-@property (nonatomic, weak) id<CvPhotoCameraDelegate> delegate;
-
-- CV_UNUSED(takePicture);
-
-@end
-
-//! @} videoio_ios
diff --git a/3rdParty/qdarkstyle/dark/__init__.py b/3rdParty/qdarkstyle/dark/__init__.py
index faaaf799c7..0bd233716d 100644
--- a/3rdParty/qdarkstyle/dark/__init__.py
+++ b/3rdParty/qdarkstyle/dark/__init__.py
@@ -1,3 +1,3 @@
-# -*- coding: utf-8 -*-
-
-
+# -*- coding: utf-8 -*-
+
+
diff --git a/3rdParty/qdarkstyle/dark/_variables.scss b/3rdParty/qdarkstyle/dark/_variables.scss
index d8f1bbedc8..438b8e5a0f 100644
--- a/3rdParty/qdarkstyle/dark/_variables.scss
+++ b/3rdParty/qdarkstyle/dark/_variables.scss
@@ -1,33 +1,33 @@
-// ---------------------------------------------------------------------------
-//
-//    WARNING! File created programmatically. All changes made in this file will be lost!
-//
-//    Created by the qtsass compiler v0.3.0
-//
-//    The definitions are in the "qdarkstyle.palette" module
-//
-//----------------------------------------------------------------------------
-$ID: 'dark';
-$COLOR_BACKGROUND_6: #60798B;
-$COLOR_BACKGROUND_5: #54687A;
-$COLOR_BACKGROUND_4: #455364;
-$COLOR_BACKGROUND_2: #293544;
-$COLOR_BACKGROUND_3: #37414F;
-$COLOR_BACKGROUND_1: #19232D;
-$COLOR_TEXT_1: #E0E1E3;
-$COLOR_TEXT_2: #C9CDD0;
-$COLOR_TEXT_3: #ACB1B6;
-$COLOR_TEXT_4: #9DA9B5;
-$COLOR_ACCENT_1: #26486B;
-$COLOR_ACCENT_2: #346792;
-$COLOR_ACCENT_3: #1A72BB;
-$COLOR_ACCENT_4: #259AE9;
-$OPACITY_TOOLTIP: 230;
-$SIZE_BORDER_RADIUS: 4px;
-$BORDER_1: 1px solid $COLOR_BACKGROUND_1;
-$BORDER_2: 1px solid $COLOR_BACKGROUND_4;
-$BORDER_3: 1px solid $COLOR_BACKGROUND_6;
-$BORDER_SELECTION_3: 1px solid $COLOR_ACCENT_3;
-$BORDER_SELECTION_2: 1px solid $COLOR_ACCENT_2;
-$BORDER_SELECTION_1: 1px solid $COLOR_ACCENT_1;
-$PATH_RESOURCES: ':/qss_icons';
+// ---------------------------------------------------------------------------
+//
+//    WARNING! File created programmatically. All changes made in this file will be lost!
+//
+//    Created by the qtsass compiler v0.3.0
+//
+//    The definitions are in the "qdarkstyle.palette" module
+//
+//----------------------------------------------------------------------------
+$ID: 'dark';
+$COLOR_BACKGROUND_6: #60798B;
+$COLOR_BACKGROUND_5: #54687A;
+$COLOR_BACKGROUND_4: #455364;
+$COLOR_BACKGROUND_2: #293544;
+$COLOR_BACKGROUND_3: #37414F;
+$COLOR_BACKGROUND_1: #19232D;
+$COLOR_TEXT_1: #E0E1E3;
+$COLOR_TEXT_2: #C9CDD0;
+$COLOR_TEXT_3: #ACB1B6;
+$COLOR_TEXT_4: #9DA9B5;
+$COLOR_ACCENT_1: #26486B;
+$COLOR_ACCENT_2: #346792;
+$COLOR_ACCENT_3: #1A72BB;
+$COLOR_ACCENT_4: #259AE9;
+$OPACITY_TOOLTIP: 230;
+$SIZE_BORDER_RADIUS: 4px;
+$BORDER_1: 1px solid $COLOR_BACKGROUND_1;
+$BORDER_2: 1px solid $COLOR_BACKGROUND_4;
+$BORDER_3: 1px solid $COLOR_BACKGROUND_6;
+$BORDER_SELECTION_3: 1px solid $COLOR_ACCENT_3;
+$BORDER_SELECTION_2: 1px solid $COLOR_ACCENT_2;
+$BORDER_SELECTION_1: 1px solid $COLOR_ACCENT_1;
+$PATH_RESOURCES: ':/qss_icons';
diff --git a/3rdParty/qdarkstyle/dark/darkstyle.qrc b/3rdParty/qdarkstyle/dark/darkstyle.qrc
index ce0d85be60..61664aacc2 100644
--- a/3rdParty/qdarkstyle/dark/darkstyle.qrc
+++ b/3rdParty/qdarkstyle/dark/darkstyle.qrc
@@ -1,216 +1,216 @@
-
-<RCC warning="WARNING! File created programmatically. All changes made in this file will be lost!">
-  <qresource prefix="qss_icons/dark">
-    <file>rc/arrow_down.png</file>
-    <file>rc/arrow_down@2x.png</file>
-    <file>rc/arrow_down_disabled.png</file>
-    <file>rc/arrow_down_disabled@2x.png</file>
-    <file>rc/arrow_down_focus.png</file>
-    <file>rc/arrow_down_focus@2x.png</file>
-    <file>rc/arrow_down_pressed.png</file>
-    <file>rc/arrow_down_pressed@2x.png</file>
-    <file>rc/arrow_left.png</file>
-    <file>rc/arrow_left@2x.png</file>
-    <file>rc/arrow_left_disabled.png</file>
-    <file>rc/arrow_left_disabled@2x.png</file>
-    <file>rc/arrow_left_focus.png</file>
-    <file>rc/arrow_left_focus@2x.png</file>
-    <file>rc/arrow_left_pressed.png</file>
-    <file>rc/arrow_left_pressed@2x.png</file>
-    <file>rc/arrow_right.png</file>
-    <file>rc/arrow_right@2x.png</file>
-    <file>rc/arrow_right_disabled.png</file>
-    <file>rc/arrow_right_disabled@2x.png</file>
-    <file>rc/arrow_right_focus.png</file>
-    <file>rc/arrow_right_focus@2x.png</file>
-    <file>rc/arrow_right_pressed.png</file>
-    <file>rc/arrow_right_pressed@2x.png</file>
-    <file>rc/arrow_up.png</file>
-    <file>rc/arrow_up@2x.png</file>
-    <file>rc/arrow_up_disabled.png</file>
-    <file>rc/arrow_up_disabled@2x.png</file>
-    <file>rc/arrow_up_focus.png</file>
-    <file>rc/arrow_up_focus@2x.png</file>
-    <file>rc/arrow_up_pressed.png</file>
-    <file>rc/arrow_up_pressed@2x.png</file>
-    <file>rc/base_icon.png</file>
-    <file>rc/base_icon@2x.png</file>
-    <file>rc/base_icon_disabled.png</file>
-    <file>rc/base_icon_disabled@2x.png</file>
-    <file>rc/base_icon_focus.png</file>
-    <file>rc/base_icon_focus@2x.png</file>
-    <file>rc/base_icon_pressed.png</file>
-    <file>rc/base_icon_pressed@2x.png</file>
-    <file>rc/branch_closed.png</file>
-    <file>rc/branch_closed@2x.png</file>
-    <file>rc/branch_closed_disabled.png</file>
-    <file>rc/branch_closed_disabled@2x.png</file>
-    <file>rc/branch_closed_focus.png</file>
-    <file>rc/branch_closed_focus@2x.png</file>
-    <file>rc/branch_closed_pressed.png</file>
-    <file>rc/branch_closed_pressed@2x.png</file>
-    <file>rc/branch_end.png</file>
-    <file>rc/branch_end@2x.png</file>
-    <file>rc/branch_end_disabled.png</file>
-    <file>rc/branch_end_disabled@2x.png</file>
-    <file>rc/branch_end_focus.png</file>
-    <file>rc/branch_end_focus@2x.png</file>
-    <file>rc/branch_end_pressed.png</file>
-    <file>rc/branch_end_pressed@2x.png</file>
-    <file>rc/branch_line.png</file>
-    <file>rc/branch_line@2x.png</file>
-    <file>rc/branch_line_disabled.png</file>
-    <file>rc/branch_line_disabled@2x.png</file>
-    <file>rc/branch_line_focus.png</file>
-    <file>rc/branch_line_focus@2x.png</file>
-    <file>rc/branch_line_pressed.png</file>
-    <file>rc/branch_line_pressed@2x.png</file>
-    <file>rc/branch_more.png</file>
-    <file>rc/branch_more@2x.png</file>
-    <file>rc/branch_more_disabled.png</file>
-    <file>rc/branch_more_disabled@2x.png</file>
-    <file>rc/branch_more_focus.png</file>
-    <file>rc/branch_more_focus@2x.png</file>
-    <file>rc/branch_more_pressed.png</file>
-    <file>rc/branch_more_pressed@2x.png</file>
-    <file>rc/branch_open.png</file>
-    <file>rc/branch_open@2x.png</file>
-    <file>rc/branch_open_disabled.png</file>
-    <file>rc/branch_open_disabled@2x.png</file>
-    <file>rc/branch_open_focus.png</file>
-    <file>rc/branch_open_focus@2x.png</file>
-    <file>rc/branch_open_pressed.png</file>
-    <file>rc/branch_open_pressed@2x.png</file>
-    <file>rc/checkbox_checked.png</file>
-    <file>rc/checkbox_checked@2x.png</file>
-    <file>rc/checkbox_checked_disabled.png</file>
-    <file>rc/checkbox_checked_disabled@2x.png</file>
-    <file>rc/checkbox_checked_focus.png</file>
-    <file>rc/checkbox_checked_focus@2x.png</file>
-    <file>rc/checkbox_checked_pressed.png</file>
-    <file>rc/checkbox_checked_pressed@2x.png</file>
-    <file>rc/checkbox_indeterminate.png</file>
-    <file>rc/checkbox_indeterminate@2x.png</file>
-    <file>rc/checkbox_indeterminate_disabled.png</file>
-    <file>rc/checkbox_indeterminate_disabled@2x.png</file>
-    <file>rc/checkbox_indeterminate_focus.png</file>
-    <file>rc/checkbox_indeterminate_focus@2x.png</file>
-    <file>rc/checkbox_indeterminate_pressed.png</file>
-    <file>rc/checkbox_indeterminate_pressed@2x.png</file>
-    <file>rc/checkbox_unchecked.png</file>
-    <file>rc/checkbox_unchecked@2x.png</file>
-    <file>rc/checkbox_unchecked_disabled.png</file>
-    <file>rc/checkbox_unchecked_disabled@2x.png</file>
-    <file>rc/checkbox_unchecked_focus.png</file>
-    <file>rc/checkbox_unchecked_focus@2x.png</file>
-    <file>rc/checkbox_unchecked_pressed.png</file>
-    <file>rc/checkbox_unchecked_pressed@2x.png</file>
-    <file>rc/line_horizontal.png</file>
-    <file>rc/line_horizontal@2x.png</file>
-    <file>rc/line_horizontal_disabled.png</file>
-    <file>rc/line_horizontal_disabled@2x.png</file>
-    <file>rc/line_horizontal_focus.png</file>
-    <file>rc/line_horizontal_focus@2x.png</file>
-    <file>rc/line_horizontal_pressed.png</file>
-    <file>rc/line_horizontal_pressed@2x.png</file>
-    <file>rc/line_vertical.png</file>
-    <file>rc/line_vertical@2x.png</file>
-    <file>rc/line_vertical_disabled.png</file>
-    <file>rc/line_vertical_disabled@2x.png</file>
-    <file>rc/line_vertical_focus.png</file>
-    <file>rc/line_vertical_focus@2x.png</file>
-    <file>rc/line_vertical_pressed.png</file>
-    <file>rc/line_vertical_pressed@2x.png</file>
-    <file>rc/radio_checked.png</file>
-    <file>rc/radio_checked@2x.png</file>
-    <file>rc/radio_checked_disabled.png</file>
-    <file>rc/radio_checked_disabled@2x.png</file>
-    <file>rc/radio_checked_focus.png</file>
-    <file>rc/radio_checked_focus@2x.png</file>
-    <file>rc/radio_checked_pressed.png</file>
-    <file>rc/radio_checked_pressed@2x.png</file>
-    <file>rc/radio_unchecked.png</file>
-    <file>rc/radio_unchecked@2x.png</file>
-    <file>rc/radio_unchecked_disabled.png</file>
-    <file>rc/radio_unchecked_disabled@2x.png</file>
-    <file>rc/radio_unchecked_focus.png</file>
-    <file>rc/radio_unchecked_focus@2x.png</file>
-    <file>rc/radio_unchecked_pressed.png</file>
-    <file>rc/radio_unchecked_pressed@2x.png</file>
-    <file>rc/toolbar_move_horizontal.png</file>
-    <file>rc/toolbar_move_horizontal@2x.png</file>
-    <file>rc/toolbar_move_horizontal_disabled.png</file>
-    <file>rc/toolbar_move_horizontal_disabled@2x.png</file>
-    <file>rc/toolbar_move_horizontal_focus.png</file>
-    <file>rc/toolbar_move_horizontal_focus@2x.png</file>
-    <file>rc/toolbar_move_horizontal_pressed.png</file>
-    <file>rc/toolbar_move_horizontal_pressed@2x.png</file>
-    <file>rc/toolbar_move_vertical.png</file>
-    <file>rc/toolbar_move_vertical@2x.png</file>
-    <file>rc/toolbar_move_vertical_disabled.png</file>
-    <file>rc/toolbar_move_vertical_disabled@2x.png</file>
-    <file>rc/toolbar_move_vertical_focus.png</file>
-    <file>rc/toolbar_move_vertical_focus@2x.png</file>
-    <file>rc/toolbar_move_vertical_pressed.png</file>
-    <file>rc/toolbar_move_vertical_pressed@2x.png</file>
-    <file>rc/toolbar_separator_horizontal.png</file>
-    <file>rc/toolbar_separator_horizontal@2x.png</file>
-    <file>rc/toolbar_separator_horizontal_disabled.png</file>
-    <file>rc/toolbar_separator_horizontal_disabled@2x.png</file>
-    <file>rc/toolbar_separator_horizontal_focus.png</file>
-    <file>rc/toolbar_separator_horizontal_focus@2x.png</file>
-    <file>rc/toolbar_separator_horizontal_pressed.png</file>
-    <file>rc/toolbar_separator_horizontal_pressed@2x.png</file>
-    <file>rc/toolbar_separator_vertical.png</file>
-    <file>rc/toolbar_separator_vertical@2x.png</file>
-    <file>rc/toolbar_separator_vertical_disabled.png</file>
-    <file>rc/toolbar_separator_vertical_disabled@2x.png</file>
-    <file>rc/toolbar_separator_vertical_focus.png</file>
-    <file>rc/toolbar_separator_vertical_focus@2x.png</file>
-    <file>rc/toolbar_separator_vertical_pressed.png</file>
-    <file>rc/toolbar_separator_vertical_pressed@2x.png</file>
-    <file>rc/transparent.png</file>
-    <file>rc/transparent@2x.png</file>
-    <file>rc/transparent_disabled.png</file>
-    <file>rc/transparent_disabled@2x.png</file>
-    <file>rc/transparent_focus.png</file>
-    <file>rc/transparent_focus@2x.png</file>
-    <file>rc/transparent_pressed.png</file>
-    <file>rc/transparent_pressed@2x.png</file>
-    <file>rc/window_close.png</file>
-    <file>rc/window_close@2x.png</file>
-    <file>rc/window_close_disabled.png</file>
-    <file>rc/window_close_disabled@2x.png</file>
-    <file>rc/window_close_focus.png</file>
-    <file>rc/window_close_focus@2x.png</file>
-    <file>rc/window_close_pressed.png</file>
-    <file>rc/window_close_pressed@2x.png</file>
-    <file>rc/window_grip.png</file>
-    <file>rc/window_grip@2x.png</file>
-    <file>rc/window_grip_disabled.png</file>
-    <file>rc/window_grip_disabled@2x.png</file>
-    <file>rc/window_grip_focus.png</file>
-    <file>rc/window_grip_focus@2x.png</file>
-    <file>rc/window_grip_pressed.png</file>
-    <file>rc/window_grip_pressed@2x.png</file>
-    <file>rc/window_minimize.png</file>
-    <file>rc/window_minimize@2x.png</file>
-    <file>rc/window_minimize_disabled.png</file>
-    <file>rc/window_minimize_disabled@2x.png</file>
-    <file>rc/window_minimize_focus.png</file>
-    <file>rc/window_minimize_focus@2x.png</file>
-    <file>rc/window_minimize_pressed.png</file>
-    <file>rc/window_minimize_pressed@2x.png</file>
-    <file>rc/window_undock.png</file>
-    <file>rc/window_undock@2x.png</file>
-    <file>rc/window_undock_disabled.png</file>
-    <file>rc/window_undock_disabled@2x.png</file>
-    <file>rc/window_undock_focus.png</file>
-    <file>rc/window_undock_focus@2x.png</file>
-    <file>rc/window_undock_pressed.png</file>
-    <file>rc/window_undock_pressed@2x.png</file>
-  </qresource>
-  <qresource prefix="qdarkstyle/dark">
-      <file>darkstyle.qss</file>
-  </qresource>
-</RCC>
+
+<RCC warning="WARNING! File created programmatically. All changes made in this file will be lost!">
+  <qresource prefix="qss_icons/dark">
+    <file>rc/arrow_down.png</file>
+    <file>rc/arrow_down@2x.png</file>
+    <file>rc/arrow_down_disabled.png</file>
+    <file>rc/arrow_down_disabled@2x.png</file>
+    <file>rc/arrow_down_focus.png</file>
+    <file>rc/arrow_down_focus@2x.png</file>
+    <file>rc/arrow_down_pressed.png</file>
+    <file>rc/arrow_down_pressed@2x.png</file>
+    <file>rc/arrow_left.png</file>
+    <file>rc/arrow_left@2x.png</file>
+    <file>rc/arrow_left_disabled.png</file>
+    <file>rc/arrow_left_disabled@2x.png</file>
+    <file>rc/arrow_left_focus.png</file>
+    <file>rc/arrow_left_focus@2x.png</file>
+    <file>rc/arrow_left_pressed.png</file>
+    <file>rc/arrow_left_pressed@2x.png</file>
+    <file>rc/arrow_right.png</file>
+    <file>rc/arrow_right@2x.png</file>
+    <file>rc/arrow_right_disabled.png</file>
+    <file>rc/arrow_right_disabled@2x.png</file>
+    <file>rc/arrow_right_focus.png</file>
+    <file>rc/arrow_right_focus@2x.png</file>
+    <file>rc/arrow_right_pressed.png</file>
+    <file>rc/arrow_right_pressed@2x.png</file>
+    <file>rc/arrow_up.png</file>
+    <file>rc/arrow_up@2x.png</file>
+    <file>rc/arrow_up_disabled.png</file>
+    <file>rc/arrow_up_disabled@2x.png</file>
+    <file>rc/arrow_up_focus.png</file>
+    <file>rc/arrow_up_focus@2x.png</file>
+    <file>rc/arrow_up_pressed.png</file>
+    <file>rc/arrow_up_pressed@2x.png</file>
+    <file>rc/base_icon.png</file>
+    <file>rc/base_icon@2x.png</file>
+    <file>rc/base_icon_disabled.png</file>
+    <file>rc/base_icon_disabled@2x.png</file>
+    <file>rc/base_icon_focus.png</file>
+    <file>rc/base_icon_focus@2x.png</file>
+    <file>rc/base_icon_pressed.png</file>
+    <file>rc/base_icon_pressed@2x.png</file>
+    <file>rc/branch_closed.png</file>
+    <file>rc/branch_closed@2x.png</file>
+    <file>rc/branch_closed_disabled.png</file>
+    <file>rc/branch_closed_disabled@2x.png</file>
+    <file>rc/branch_closed_focus.png</file>
+    <file>rc/branch_closed_focus@2x.png</file>
+    <file>rc/branch_closed_pressed.png</file>
+    <file>rc/branch_closed_pressed@2x.png</file>
+    <file>rc/branch_end.png</file>
+    <file>rc/branch_end@2x.png</file>
+    <file>rc/branch_end_disabled.png</file>
+    <file>rc/branch_end_disabled@2x.png</file>
+    <file>rc/branch_end_focus.png</file>
+    <file>rc/branch_end_focus@2x.png</file>
+    <file>rc/branch_end_pressed.png</file>
+    <file>rc/branch_end_pressed@2x.png</file>
+    <file>rc/branch_line.png</file>
+    <file>rc/branch_line@2x.png</file>
+    <file>rc/branch_line_disabled.png</file>
+    <file>rc/branch_line_disabled@2x.png</file>
+    <file>rc/branch_line_focus.png</file>
+    <file>rc/branch_line_focus@2x.png</file>
+    <file>rc/branch_line_pressed.png</file>
+    <file>rc/branch_line_pressed@2x.png</file>
+    <file>rc/branch_more.png</file>
+    <file>rc/branch_more@2x.png</file>
+    <file>rc/branch_more_disabled.png</file>
+    <file>rc/branch_more_disabled@2x.png</file>
+    <file>rc/branch_more_focus.png</file>
+    <file>rc/branch_more_focus@2x.png</file>
+    <file>rc/branch_more_pressed.png</file>
+    <file>rc/branch_more_pressed@2x.png</file>
+    <file>rc/branch_open.png</file>
+    <file>rc/branch_open@2x.png</file>
+    <file>rc/branch_open_disabled.png</file>
+    <file>rc/branch_open_disabled@2x.png</file>
+    <file>rc/branch_open_focus.png</file>
+    <file>rc/branch_open_focus@2x.png</file>
+    <file>rc/branch_open_pressed.png</file>
+    <file>rc/branch_open_pressed@2x.png</file>
+    <file>rc/checkbox_checked.png</file>
+    <file>rc/checkbox_checked@2x.png</file>
+    <file>rc/checkbox_checked_disabled.png</file>
+    <file>rc/checkbox_checked_disabled@2x.png</file>
+    <file>rc/checkbox_checked_focus.png</file>
+    <file>rc/checkbox_checked_focus@2x.png</file>
+    <file>rc/checkbox_checked_pressed.png</file>
+    <file>rc/checkbox_checked_pressed@2x.png</file>
+    <file>rc/checkbox_indeterminate.png</file>
+    <file>rc/checkbox_indeterminate@2x.png</file>
+    <file>rc/checkbox_indeterminate_disabled.png</file>
+    <file>rc/checkbox_indeterminate_disabled@2x.png</file>
+    <file>rc/checkbox_indeterminate_focus.png</file>
+    <file>rc/checkbox_indeterminate_focus@2x.png</file>
+    <file>rc/checkbox_indeterminate_pressed.png</file>
+    <file>rc/checkbox_indeterminate_pressed@2x.png</file>
+    <file>rc/checkbox_unchecked.png</file>
+    <file>rc/checkbox_unchecked@2x.png</file>
+    <file>rc/checkbox_unchecked_disabled.png</file>
+    <file>rc/checkbox_unchecked_disabled@2x.png</file>
+    <file>rc/checkbox_unchecked_focus.png</file>
+    <file>rc/checkbox_unchecked_focus@2x.png</file>
+    <file>rc/checkbox_unchecked_pressed.png</file>
+    <file>rc/checkbox_unchecked_pressed@2x.png</file>
+    <file>rc/line_horizontal.png</file>
+    <file>rc/line_horizontal@2x.png</file>
+    <file>rc/line_horizontal_disabled.png</file>
+    <file>rc/line_horizontal_disabled@2x.png</file>
+    <file>rc/line_horizontal_focus.png</file>
+    <file>rc/line_horizontal_focus@2x.png</file>
+    <file>rc/line_horizontal_pressed.png</file>
+    <file>rc/line_horizontal_pressed@2x.png</file>
+    <file>rc/line_vertical.png</file>
+    <file>rc/line_vertical@2x.png</file>
+    <file>rc/line_vertical_disabled.png</file>
+    <file>rc/line_vertical_disabled@2x.png</file>
+    <file>rc/line_vertical_focus.png</file>
+    <file>rc/line_vertical_focus@2x.png</file>
+    <file>rc/line_vertical_pressed.png</file>
+    <file>rc/line_vertical_pressed@2x.png</file>
+    <file>rc/radio_checked.png</file>
+    <file>rc/radio_checked@2x.png</file>
+    <file>rc/radio_checked_disabled.png</file>
+    <file>rc/radio_checked_disabled@2x.png</file>
+    <file>rc/radio_checked_focus.png</file>
+    <file>rc/radio_checked_focus@2x.png</file>
+    <file>rc/radio_checked_pressed.png</file>
+    <file>rc/radio_checked_pressed@2x.png</file>
+    <file>rc/radio_unchecked.png</file>
+    <file>rc/radio_unchecked@2x.png</file>
+    <file>rc/radio_unchecked_disabled.png</file>
+    <file>rc/radio_unchecked_disabled@2x.png</file>
+    <file>rc/radio_unchecked_focus.png</file>
+    <file>rc/radio_unchecked_focus@2x.png</file>
+    <file>rc/radio_unchecked_pressed.png</file>
+    <file>rc/radio_unchecked_pressed@2x.png</file>
+    <file>rc/toolbar_move_horizontal.png</file>
+    <file>rc/toolbar_move_horizontal@2x.png</file>
+    <file>rc/toolbar_move_horizontal_disabled.png</file>
+    <file>rc/toolbar_move_horizontal_disabled@2x.png</file>
+    <file>rc/toolbar_move_horizontal_focus.png</file>
+    <file>rc/toolbar_move_horizontal_focus@2x.png</file>
+    <file>rc/toolbar_move_horizontal_pressed.png</file>
+    <file>rc/toolbar_move_horizontal_pressed@2x.png</file>
+    <file>rc/toolbar_move_vertical.png</file>
+    <file>rc/toolbar_move_vertical@2x.png</file>
+    <file>rc/toolbar_move_vertical_disabled.png</file>
+    <file>rc/toolbar_move_vertical_disabled@2x.png</file>
+    <file>rc/toolbar_move_vertical_focus.png</file>
+    <file>rc/toolbar_move_vertical_focus@2x.png</file>
+    <file>rc/toolbar_move_vertical_pressed.png</file>
+    <file>rc/toolbar_move_vertical_pressed@2x.png</file>
+    <file>rc/toolbar_separator_horizontal.png</file>
+    <file>rc/toolbar_separator_horizontal@2x.png</file>
+    <file>rc/toolbar_separator_horizontal_disabled.png</file>
+    <file>rc/toolbar_separator_horizontal_disabled@2x.png</file>
+    <file>rc/toolbar_separator_horizontal_focus.png</file>
+    <file>rc/toolbar_separator_horizontal_focus@2x.png</file>
+    <file>rc/toolbar_separator_horizontal_pressed.png</file>
+    <file>rc/toolbar_separator_horizontal_pressed@2x.png</file>
+    <file>rc/toolbar_separator_vertical.png</file>
+    <file>rc/toolbar_separator_vertical@2x.png</file>
+    <file>rc/toolbar_separator_vertical_disabled.png</file>
+    <file>rc/toolbar_separator_vertical_disabled@2x.png</file>
+    <file>rc/toolbar_separator_vertical_focus.png</file>
+    <file>rc/toolbar_separator_vertical_focus@2x.png</file>
+    <file>rc/toolbar_separator_vertical_pressed.png</file>
+    <file>rc/toolbar_separator_vertical_pressed@2x.png</file>
+    <file>rc/transparent.png</file>
+    <file>rc/transparent@2x.png</file>
+    <file>rc/transparent_disabled.png</file>
+    <file>rc/transparent_disabled@2x.png</file>
+    <file>rc/transparent_focus.png</file>
+    <file>rc/transparent_focus@2x.png</file>
+    <file>rc/transparent_pressed.png</file>
+    <file>rc/transparent_pressed@2x.png</file>
+    <file>rc/window_close.png</file>
+    <file>rc/window_close@2x.png</file>
+    <file>rc/window_close_disabled.png</file>
+    <file>rc/window_close_disabled@2x.png</file>
+    <file>rc/window_close_focus.png</file>
+    <file>rc/window_close_focus@2x.png</file>
+    <file>rc/window_close_pressed.png</file>
+    <file>rc/window_close_pressed@2x.png</file>
+    <file>rc/window_grip.png</file>
+    <file>rc/window_grip@2x.png</file>
+    <file>rc/window_grip_disabled.png</file>
+    <file>rc/window_grip_disabled@2x.png</file>
+    <file>rc/window_grip_focus.png</file>
+    <file>rc/window_grip_focus@2x.png</file>
+    <file>rc/window_grip_pressed.png</file>
+    <file>rc/window_grip_pressed@2x.png</file>
+    <file>rc/window_minimize.png</file>
+    <file>rc/window_minimize@2x.png</file>
+    <file>rc/window_minimize_disabled.png</file>
+    <file>rc/window_minimize_disabled@2x.png</file>
+    <file>rc/window_minimize_focus.png</file>
+    <file>rc/window_minimize_focus@2x.png</file>
+    <file>rc/window_minimize_pressed.png</file>
+    <file>rc/window_minimize_pressed@2x.png</file>
+    <file>rc/window_undock.png</file>
+    <file>rc/window_undock@2x.png</file>
+    <file>rc/window_undock_disabled.png</file>
+    <file>rc/window_undock_disabled@2x.png</file>
+    <file>rc/window_undock_focus.png</file>
+    <file>rc/window_undock_focus@2x.png</file>
+    <file>rc/window_undock_pressed.png</file>
+    <file>rc/window_undock_pressed@2x.png</file>
+  </qresource>
+  <qresource prefix="qdarkstyle/dark">
+      <file>darkstyle.qss</file>
+  </qresource>
+</RCC>
diff --git a/3rdParty/qdarkstyle/dark/darkstyle.qss b/3rdParty/qdarkstyle/dark/darkstyle.qss
index 5fe3464fa1..1fc6099f2b 100644
--- a/3rdParty/qdarkstyle/dark/darkstyle.qss
+++ b/3rdParty/qdarkstyle/dark/darkstyle.qss
@@ -1,2217 +1,2217 @@
-/* ---------------------------------------------------------------------------
-
-    WARNING! File created programmatically. All changes made in this file will be lost!
-
-    Created by the qtsass compiler v0.3.0
-
-    The definitions are in the "qdarkstyle.qss._styles.scss" module
-
---------------------------------------------------------------------------- */
-/* Light Style - QDarkStyleSheet ------------------------------------------ */
-/*
-
-See Qt documentation:
-
-  - https://doc.qt.io/qt-5/stylesheet.html
-  - https://doc.qt.io/qt-5/stylesheet-reference.html
-  - https://doc.qt.io/qt-5/stylesheet-examples.html
-
---------------------------------------------------------------------------- */
-/* Reset elements ------------------------------------------------------------
-
-Resetting everything helps to unify styles across different operating systems
-
---------------------------------------------------------------------------- */
-* {
-  padding: 0px;
-  margin: 0px;
-  border: 0px;
-  border-style: none;
-  border-image: none;
-  outline: 0;
-}
-
-/* specific reset for elements inside QToolBar */
-QToolBar * {
-  margin: 0px;
-  padding: 0px;
-}
-
-/* QWidget ----------------------------------------------------------------
-
---------------------------------------------------------------------------- */
-QWidget {
-  background-color: #19232D;
-  border: 0px solid #455364;
-  padding: 0px;
-  color: #E0E1E3;
-  selection-background-color: #346792;
-  selection-color: #E0E1E3;
-}
-
-QWidget:disabled {
-  background-color: #19232D;
-  color: #9DA9B5;
-  selection-background-color: #26486B;
-  selection-color: #9DA9B5;
-}
-
-QWidget::item:selected {
-  background-color: #346792;
-}
-
-QWidget::item:hover:!selected {
-  background-color: #1A72BB;
-}
-
-/* QMainWindow ------------------------------------------------------------
-
-This adjusts the splitter in the dock widget, not qsplitter
-https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qmainwindow
-
---------------------------------------------------------------------------- */
-QMainWindow::separator {
-  background-color: #455364;
-  border: 0px solid #19232D;
-  spacing: 0px;
-  padding: 2px;
-}
-
-QMainWindow::separator:hover {
-  background-color: #60798B;
-  border: 0px solid #1A72BB;
-}
-
-QMainWindow::separator:horizontal {
-  width: 5px;
-  margin-top: 2px;
-  margin-bottom: 2px;
-  image: url(":/qss_icons/dark/rc/toolbar_separator_vertical.png");
-}
-
-QMainWindow::separator:vertical {
-  height: 5px;
-  margin-left: 2px;
-  margin-right: 2px;
-  image: url(":/qss_icons/dark/rc/toolbar_separator_horizontal.png");
-}
-
-/* QToolTip ---------------------------------------------------------------
-
-https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qtooltip
-
---------------------------------------------------------------------------- */
-QToolTip {
-  background-color: #346792;
-  color: #E0E1E3;
-  /* If you remove the border property, background stops working on Windows */
-  border: none;
-  /* Remove padding, for fix combo box tooltip */
-  padding: 0px;
-  /* Remove opacity, fix #174 - may need to use RGBA */
-}
-
-/* QStatusBar -------------------------------------------------------------
-
-https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qstatusbar
-
---------------------------------------------------------------------------- */
-QStatusBar {
-  border: 1px solid #455364;
-  /* Fixes Spyder #9120, #9121 */
-  background: #455364;
-  /* Fixes #205, white vertical borders separating items */
-}
-
-QStatusBar::item {
-  border: none;
-}
-
-QStatusBar QToolTip {
-  background-color: #1A72BB;
-  border: 1px solid #19232D;
-  color: #19232D;
-  /* Remove padding, for fix combo box tooltip */
-  padding: 0px;
-  /* Reducing transparency to read better */
-  opacity: 230;
-}
-
-QStatusBar QLabel {
-  /* Fixes Spyder #9120, #9121 */
-  background: transparent;
-}
-
-/* QCheckBox --------------------------------------------------------------
-
-https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qcheckbox
-
---------------------------------------------------------------------------- */
-QCheckBox {
-  background-color: #19232D;
-  color: #E0E1E3;
-  spacing: 4px;
-  outline: none;
-  padding-top: 4px;
-  padding-bottom: 4px;
-}
-
-QCheckBox:focus {
-  border: none;
-}
-
-QCheckBox QWidget:disabled {
-  background-color: #19232D;
-  color: #9DA9B5;
-}
-
-QCheckBox::indicator {
-  margin-left: 2px;
-  height: 14px;
-  width: 14px;
-}
-
-QCheckBox::indicator:unchecked {
-  image: url(":/qss_icons/dark/rc/checkbox_unchecked.png");
-}
-
-QCheckBox::indicator:unchecked:hover, QCheckBox::indicator:unchecked:focus, QCheckBox::indicator:unchecked:pressed {
-  border: none;
-  image: url(":/qss_icons/dark/rc/checkbox_unchecked_focus.png");
-}
-
-QCheckBox::indicator:unchecked:disabled {
-  image: url(":/qss_icons/dark/rc/checkbox_unchecked_disabled.png");
-}
-
-QCheckBox::indicator:checked {
-  image: url(":/qss_icons/dark/rc/checkbox_checked.png");
-}
-
-QCheckBox::indicator:checked:hover, QCheckBox::indicator:checked:focus, QCheckBox::indicator:checked:pressed {
-  border: none;
-  image: url(":/qss_icons/dark/rc/checkbox_checked_focus.png");
-}
-
-QCheckBox::indicator:checked:disabled {
-  image: url(":/qss_icons/dark/rc/checkbox_checked_disabled.png");
-}
-
-QCheckBox::indicator:indeterminate {
-  image: url(":/qss_icons/dark/rc/checkbox_indeterminate.png");
-}
-
-QCheckBox::indicator:indeterminate:disabled {
-  image: url(":/qss_icons/dark/rc/checkbox_indeterminate_disabled.png");
-}
-
-QCheckBox::indicator:indeterminate:focus, QCheckBox::indicator:indeterminate:hover, QCheckBox::indicator:indeterminate:pressed {
-  image: url(":/qss_icons/dark/rc/checkbox_indeterminate_focus.png");
-}
-
-/* QGroupBox --------------------------------------------------------------
-
-https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qgroupbox
-
---------------------------------------------------------------------------- */
-QGroupBox {
-  font-weight: bold;
-  border: 1px solid #455364;
-  border-radius: 4px;
-  padding: 2px;
-  padding-top: 4px;
-  margin-top: 6px;
-  margin-bottom: 4px;
-}
-
-QGroupBox::title {
-  subcontrol-origin: margin;
-  subcontrol-position: top left;
-  left: 4px;
-  padding-left: 2px;
-  padding-right: 4px;
-  padding-top: -4px;
-}
-
-QGroupBox::indicator {
-  margin-left: 2px;
-  margin-top: 2px;
-  padding: 0;
-  height: 14px;
-  width: 14px;
-}
-
-QGroupBox::indicator:unchecked {
-  border: none;
-  image: url(":/qss_icons/dark/rc/checkbox_unchecked.png");
-}
-
-QGroupBox::indicator:unchecked:hover, QGroupBox::indicator:unchecked:focus, QGroupBox::indicator:unchecked:pressed {
-  border: none;
-  image: url(":/qss_icons/dark/rc/checkbox_unchecked_focus.png");
-}
-
-QGroupBox::indicator:unchecked:disabled {
-  image: url(":/qss_icons/dark/rc/checkbox_unchecked_disabled.png");
-}
-
-QGroupBox::indicator:checked {
-  border: none;
-  image: url(":/qss_icons/dark/rc/checkbox_checked.png");
-}
-
-QGroupBox::indicator:checked:hover, QGroupBox::indicator:checked:focus, QGroupBox::indicator:checked:pressed {
-  border: none;
-  image: url(":/qss_icons/dark/rc/checkbox_checked_focus.png");
-}
-
-QGroupBox::indicator:checked:disabled {
-  image: url(":/qss_icons/dark/rc/checkbox_checked_disabled.png");
-}
-
-/* QRadioButton -----------------------------------------------------------
-
-https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qradiobutton
-
---------------------------------------------------------------------------- */
-QRadioButton {
-  background-color: #19232D;
-  color: #E0E1E3;
-  spacing: 4px;
-  padding-top: 4px;
-  padding-bottom: 4px;
-  border: none;
-  outline: none;
-}
-
-QRadioButton:focus {
-  border: none;
-}
-
-QRadioButton:disabled {
-  background-color: #19232D;
-  color: #9DA9B5;
-  border: none;
-  outline: none;
-}
-
-QRadioButton QWidget {
-  background-color: #19232D;
-  color: #E0E1E3;
-  spacing: 0px;
-  padding: 0px;
-  outline: none;
-  border: none;
-}
-
-QRadioButton::indicator {
-  border: none;
-  outline: none;
-  margin-left: 2px;
-  height: 14px;
-  width: 14px;
-}
-
-QRadioButton::indicator:unchecked {
-  image: url(":/qss_icons/dark/rc/radio_unchecked.png");
-}
-
-QRadioButton::indicator:unchecked:hover, QRadioButton::indicator:unchecked:focus, QRadioButton::indicator:unchecked:pressed {
-  border: none;
-  outline: none;
-  image: url(":/qss_icons/dark/rc/radio_unchecked_focus.png");
-}
-
-QRadioButton::indicator:unchecked:disabled {
-  image: url(":/qss_icons/dark/rc/radio_unchecked_disabled.png");
-}
-
-QRadioButton::indicator:checked {
-  border: none;
-  outline: none;
-  image: url(":/qss_icons/dark/rc/radio_checked.png");
-}
-
-QRadioButton::indicator:checked:hover, QRadioButton::indicator:checked:focus, QRadioButton::indicator:checked:pressed {
-  border: none;
-  outline: none;
-  image: url(":/qss_icons/dark/rc/radio_checked_focus.png");
-}
-
-QRadioButton::indicator:checked:disabled {
-  outline: none;
-  image: url(":/qss_icons/dark/rc/radio_checked_disabled.png");
-}
-
-/* QMenuBar ---------------------------------------------------------------
-
-https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qmenubar
-
---------------------------------------------------------------------------- */
-QMenuBar {
-  background-color: #455364;
-  padding: 2px;
-  border: 1px solid #19232D;
-  color: #E0E1E3;
-  selection-background-color: #1A72BB;
-}
-
-QMenuBar:focus {
-  border: 1px solid #346792;
-}
-
-QMenuBar::item {
-  background: transparent;
-  padding: 4px;
-}
-
-QMenuBar::item:selected {
-  padding: 4px;
-  background: transparent;
-  border: 0px solid #455364;
-  background-color: #1A72BB;
-}
-
-QMenuBar::item:pressed {
-  padding: 4px;
-  border: 0px solid #455364;
-  background-color: #1A72BB;
-  color: #E0E1E3;
-  margin-bottom: 0px;
-  padding-bottom: 0px;
-}
-
-/* QMenu ------------------------------------------------------------------
-
-https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qmenu
-
---------------------------------------------------------------------------- */
-QMenu {
-  border: 0px solid #455364;
-  color: #E0E1E3;
-  margin: 0px;
-  background-color: #37414F;
-  selection-background-color: #1A72BB;
-}
-
-QMenu::separator {
-  height: 1px;
-  background-color: #60798B;
-  color: #E0E1E3;
-}
-
-QMenu::item {
-  background-color: #37414F;
-  padding: 4px 24px 4px 28px;
-  /* Reserve space for selection border */
-  border: 1px transparent #455364;
-}
-
-QMenu::item:selected {
-  color: #E0E1E3;
-  background-color: #1A72BB;
-}
-
-QMenu::item:pressed {
-  background-color: #1A72BB;
-}
-
-QMenu::icon {
-  padding-left: 10px;
-  width: 14px;
-  height: 14px;
-}
-
-QMenu::indicator {
-  padding-left: 8px;
-  width: 12px;
-  height: 12px;
-  /* non-exclusive indicator = check box style indicator (see QActionGroup::setExclusive) */
-  /* exclusive indicator = radio button style indicator (see QActionGroup::setExclusive) */
-}
-
-QMenu::indicator:non-exclusive:unchecked {
-  image: url(":/qss_icons/dark/rc/checkbox_unchecked.png");
-}
-
-QMenu::indicator:non-exclusive:unchecked:hover, QMenu::indicator:non-exclusive:unchecked:focus, QMenu::indicator:non-exclusive:unchecked:pressed {
-  border: none;
-  image: url(":/qss_icons/dark/rc/checkbox_unchecked_focus.png");
-}
-
-QMenu::indicator:non-exclusive:unchecked:disabled {
-  image: url(":/qss_icons/dark/rc/checkbox_unchecked_disabled.png");
-}
-
-QMenu::indicator:non-exclusive:checked {
-  image: url(":/qss_icons/dark/rc/checkbox_checked.png");
-}
-
-QMenu::indicator:non-exclusive:checked:hover, QMenu::indicator:non-exclusive:checked:focus, QMenu::indicator:non-exclusive:checked:pressed {
-  border: none;
-  image: url(":/qss_icons/dark/rc/checkbox_checked_focus.png");
-}
-
-QMenu::indicator:non-exclusive:checked:disabled {
-  image: url(":/qss_icons/dark/rc/checkbox_checked_disabled.png");
-}
-
-QMenu::indicator:non-exclusive:indeterminate {
-  image: url(":/qss_icons/dark/rc/checkbox_indeterminate.png");
-}
-
-QMenu::indicator:non-exclusive:indeterminate:disabled {
-  image: url(":/qss_icons/dark/rc/checkbox_indeterminate_disabled.png");
-}
-
-QMenu::indicator:non-exclusive:indeterminate:focus, QMenu::indicator:non-exclusive:indeterminate:hover, QMenu::indicator:non-exclusive:indeterminate:pressed {
-  image: url(":/qss_icons/dark/rc/checkbox_indeterminate_focus.png");
-}
-
-QMenu::indicator:exclusive:unchecked {
-  image: url(":/qss_icons/dark/rc/radio_unchecked.png");
-}
-
-QMenu::indicator:exclusive:unchecked:hover, QMenu::indicator:exclusive:unchecked:focus, QMenu::indicator:exclusive:unchecked:pressed {
-  border: none;
-  outline: none;
-  image: url(":/qss_icons/dark/rc/radio_unchecked_focus.png");
-}
-
-QMenu::indicator:exclusive:unchecked:disabled {
-  image: url(":/qss_icons/dark/rc/radio_unchecked_disabled.png");
-}
-
-QMenu::indicator:exclusive:checked {
-  border: none;
-  outline: none;
-  image: url(":/qss_icons/dark/rc/radio_checked.png");
-}
-
-QMenu::indicator:exclusive:checked:hover, QMenu::indicator:exclusive:checked:focus, QMenu::indicator:exclusive:checked:pressed {
-  border: none;
-  outline: none;
-  image: url(":/qss_icons/dark/rc/radio_checked_focus.png");
-}
-
-QMenu::indicator:exclusive:checked:disabled {
-  outline: none;
-  image: url(":/qss_icons/dark/rc/radio_checked_disabled.png");
-}
-
-QMenu::right-arrow {
-  margin: 5px;
-  padding-left: 12px;
-  image: url(":/qss_icons/dark/rc/arrow_right.png");
-  height: 12px;
-  width: 12px;
-}
-
-/* QAbstractItemView ------------------------------------------------------
-
-https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qcombobox
-
---------------------------------------------------------------------------- */
-QAbstractItemView {
-  alternate-background-color: #19232D;
-  color: #E0E1E3;
-  border: 1px solid #455364;
-  border-radius: 4px;
-}
-
-QAbstractItemView QLineEdit {
-  padding: 2px;
-}
-
-/* QAbstractScrollArea ----------------------------------------------------
-
-https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qabstractscrollarea
-
---------------------------------------------------------------------------- */
-QAbstractScrollArea {
-  background-color: #19232D;
-  border: 1px solid #455364;
-  border-radius: 4px;
-  /* fix #159 */
-  padding: 2px;
-  /* remove min-height to fix #244 */
-  color: #E0E1E3;
-}
-
-QAbstractScrollArea:disabled {
-  color: #9DA9B5;
-}
-
-/* QScrollArea ------------------------------------------------------------
-
---------------------------------------------------------------------------- */
-QScrollArea QWidget QWidget:disabled {
-  background-color: #19232D;
-}
-
-/* QScrollBar -------------------------------------------------------------
-
-https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qscrollbar
-
---------------------------------------------------------------------------- */
-QScrollBar:horizontal {
-  height: 16px;
-  margin: 2px 16px 2px 16px;
-  border: 1px solid #455364;
-  border-radius: 4px;
-  background-color: #19232D;
-}
-
-QScrollBar:vertical {
-  background-color: #19232D;
-  width: 16px;
-  margin: 16px 2px 16px 2px;
-  border: 1px solid #455364;
-  border-radius: 4px;
-}
-
-QScrollBar::handle:horizontal {
-  background-color: #60798B;
-  border: 1px solid #455364;
-  border-radius: 4px;
-  min-width: 8px;
-}
-
-QScrollBar::handle:horizontal:hover {
-  background-color: #346792;
-  border: #346792;
-  border-radius: 4px;
-  min-width: 8px;
-}
-
-QScrollBar::handle:horizontal:focus {
-  border: 1px solid #1A72BB;
-}
-
-QScrollBar::handle:vertical {
-  background-color: #60798B;
-  border: 1px solid #455364;
-  min-height: 8px;
-  border-radius: 4px;
-}
-
-QScrollBar::handle:vertical:hover {
-  background-color: #346792;
-  border: #346792;
-  border-radius: 4px;
-  min-height: 8px;
-}
-
-QScrollBar::handle:vertical:focus {
-  border: 1px solid #1A72BB;
-}
-
-QScrollBar::add-line:horizontal {
-  margin: 0px 0px 0px 0px;
-  border-image: url(":/qss_icons/dark/rc/arrow_right_disabled.png");
-  height: 12px;
-  width: 12px;
-  subcontrol-position: right;
-  subcontrol-origin: margin;
-}
-
-QScrollBar::add-line:horizontal:hover, QScrollBar::add-line:horizontal:on {
-  border-image: url(":/qss_icons/dark/rc/arrow_right.png");
-  height: 12px;
-  width: 12px;
-  subcontrol-position: right;
-  subcontrol-origin: margin;
-}
-
-QScrollBar::add-line:vertical {
-  margin: 3px 0px 3px 0px;
-  border-image: url(":/qss_icons/dark/rc/arrow_down_disabled.png");
-  height: 12px;
-  width: 12px;
-  subcontrol-position: bottom;
-  subcontrol-origin: margin;
-}
-
-QScrollBar::add-line:vertical:hover, QScrollBar::add-line:vertical:on {
-  border-image: url(":/qss_icons/dark/rc/arrow_down.png");
-  height: 12px;
-  width: 12px;
-  subcontrol-position: bottom;
-  subcontrol-origin: margin;
-}
-
-QScrollBar::sub-line:horizontal {
-  margin: 0px 3px 0px 3px;
-  border-image: url(":/qss_icons/dark/rc/arrow_left_disabled.png");
-  height: 12px;
-  width: 12px;
-  subcontrol-position: left;
-  subcontrol-origin: margin;
-}
-
-QScrollBar::sub-line:horizontal:hover, QScrollBar::sub-line:horizontal:on {
-  border-image: url(":/qss_icons/dark/rc/arrow_left.png");
-  height: 12px;
-  width: 12px;
-  subcontrol-position: left;
-  subcontrol-origin: margin;
-}
-
-QScrollBar::sub-line:vertical {
-  margin: 3px 0px 3px 0px;
-  border-image: url(":/qss_icons/dark/rc/arrow_up_disabled.png");
-  height: 12px;
-  width: 12px;
-  subcontrol-position: top;
-  subcontrol-origin: margin;
-}
-
-QScrollBar::sub-line:vertical:hover, QScrollBar::sub-line:vertical:on {
-  border-image: url(":/qss_icons/dark/rc/arrow_up.png");
-  height: 12px;
-  width: 12px;
-  subcontrol-position: top;
-  subcontrol-origin: margin;
-}
-
-QScrollBar::up-arrow:horizontal, QScrollBar::down-arrow:horizontal {
-  background: none;
-}
-
-QScrollBar::up-arrow:vertical, QScrollBar::down-arrow:vertical {
-  background: none;
-}
-
-QScrollBar::add-page:horizontal, QScrollBar::sub-page:horizontal {
-  background: none;
-}
-
-QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical {
-  background: none;
-}
-
-/* QTextEdit --------------------------------------------------------------
-
-https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-specific-widgets
-
---------------------------------------------------------------------------- */
-QTextEdit {
-  background-color: #19232D;
-  color: #E0E1E3;
-  border-radius: 4px;
-  border: 1px solid #455364;
-}
-
-QTextEdit:focus {
-  border: 1px solid #1A72BB;
-}
-
-QTextEdit:selected {
-  background: #346792;
-  color: #455364;
-}
-
-/* QPlainTextEdit ---------------------------------------------------------
-
---------------------------------------------------------------------------- */
-QPlainTextEdit {
-  background-color: #19232D;
-  color: #E0E1E3;
-  border-radius: 4px;
-  border: 1px solid #455364;
-}
-
-QPlainTextEdit:focus {
-  border: 1px solid #1A72BB;
-}
-
-QPlainTextEdit:selected {
-  background: #346792;
-  color: #455364;
-}
-
-/* QSizeGrip --------------------------------------------------------------
-
-https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qsizegrip
-
---------------------------------------------------------------------------- */
-QSizeGrip {
-  background: transparent;
-  width: 12px;
-  height: 12px;
-  image: url(":/qss_icons/dark/rc/window_grip.png");
-}
-
-/* QStackedWidget ---------------------------------------------------------
-
---------------------------------------------------------------------------- */
-QStackedWidget {
-  padding: 2px;
-  border: 1px solid #455364;
-  border: 1px solid #19232D;
-}
-
-/* QToolBar ---------------------------------------------------------------
-
-https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qtoolbar
-
---------------------------------------------------------------------------- */
-QToolBar {
-  background-color: #455364;
-  border-bottom: 1px solid #19232D;
-  padding: 1px;
-  font-weight: bold;
-  spacing: 2px;
-}
-
-QToolBar:disabled {
-  /* Fixes #272 */
-  background-color: #455364;
-}
-
-QToolBar::handle:horizontal {
-  width: 16px;
-  image: url(":/qss_icons/dark/rc/toolbar_move_horizontal.png");
-}
-
-QToolBar::handle:vertical {
-  height: 16px;
-  image: url(":/qss_icons/dark/rc/toolbar_move_vertical.png");
-}
-
-QToolBar::separator:horizontal {
-  width: 16px;
-  image: url(":/qss_icons/dark/rc/toolbar_separator_horizontal.png");
-}
-
-QToolBar::separator:vertical {
-  height: 16px;
-  image: url(":/qss_icons/dark/rc/toolbar_separator_vertical.png");
-}
-
-QToolButton#qt_toolbar_ext_button {
-  background: #455364;
-  border: 0px;
-  color: #E0E1E3;
-  image: url(":/qss_icons/dark/rc/arrow_right.png");
-}
-
-/* QAbstractSpinBox -------------------------------------------------------
-
---------------------------------------------------------------------------- */
-QAbstractSpinBox {
-  background-color: #19232D;
-  border: 1px solid #455364;
-  color: #E0E1E3;
-  /* This fixes 103, 111 */
-  padding-top: 2px;
-  /* This fixes 103, 111 */
-  padding-bottom: 2px;
-  padding-left: 4px;
-  padding-right: 4px;
-  border-radius: 4px;
-  /* min-width: 5px; removed to fix 109 */
-}
-
-QAbstractSpinBox:up-button {
-  background-color: transparent #19232D;
-  subcontrol-origin: border;
-  subcontrol-position: top right;
-  border-left: 1px solid #455364;
-  border-bottom: 1px solid #455364;
-  border-top-left-radius: 0;
-  border-bottom-left-radius: 0;
-  margin: 1px;
-  width: 12px;
-  margin-bottom: -1px;
-}
-
-QAbstractSpinBox::up-arrow, QAbstractSpinBox::up-arrow:disabled, QAbstractSpinBox::up-arrow:off {
-  image: url(":/qss_icons/dark/rc/arrow_up_disabled.png");
-  height: 8px;
-  width: 8px;
-}
-
-QAbstractSpinBox::up-arrow:hover {
-  image: url(":/qss_icons/dark/rc/arrow_up.png");
-}
-
-QAbstractSpinBox:down-button {
-  background-color: transparent #19232D;
-  subcontrol-origin: border;
-  subcontrol-position: bottom right;
-  border-left: 1px solid #455364;
-  border-top: 1px solid #455364;
-  border-top-left-radius: 0;
-  border-bottom-left-radius: 0;
-  margin: 1px;
-  width: 12px;
-  margin-top: -1px;
-}
-
-QAbstractSpinBox::down-arrow, QAbstractSpinBox::down-arrow:disabled, QAbstractSpinBox::down-arrow:off {
-  image: url(":/qss_icons/dark/rc/arrow_down_disabled.png");
-  height: 8px;
-  width: 8px;
-}
-
-QAbstractSpinBox::down-arrow:hover {
-  image: url(":/qss_icons/dark/rc/arrow_down.png");
-}
-
-QAbstractSpinBox:hover {
-  border: 1px solid #346792;
-  color: #E0E1E3;
-}
-
-QAbstractSpinBox:focus {
-  border: 1px solid #1A72BB;
-}
-
-QAbstractSpinBox:selected {
-  background: #346792;
-  color: #455364;
-}
-
-/* ------------------------------------------------------------------------ */
-/* DISPLAYS --------------------------------------------------------------- */
-/* ------------------------------------------------------------------------ */
-/* QLabel -----------------------------------------------------------------
-
-https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qframe
-
---------------------------------------------------------------------------- */
-QLabel {
-  background-color: #19232D;
-  border: 0px solid #455364;
-  padding: 0px;
-  margin: 0px;
-  color: #E0E1E3;
-}
-
-QLabel:disabled {
-  background-color: #19232D;
-  border: 0px solid #455364;
-  color: #9DA9B5;
-}
-
-/* QTextBrowser -----------------------------------------------------------
-
-https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qabstractscrollarea
-
---------------------------------------------------------------------------- */
-QTextBrowser {
-  background-color: #19232D;
-  border: 1px solid #455364;
-  color: #E0E1E3;
-  border-radius: 4px;
-}
-
-QTextBrowser:disabled {
-  background-color: #19232D;
-  border: 1px solid #455364;
-  color: #9DA9B5;
-  border-radius: 4px;
-}
-
-QTextBrowser:hover, QTextBrowser:!hover, QTextBrowser:selected, QTextBrowser:pressed {
-  border: 1px solid #455364;
-}
-
-/* QGraphicsView ----------------------------------------------------------
-
---------------------------------------------------------------------------- */
-QGraphicsView {
-  background-color: #19232D;
-  border: 1px solid #455364;
-  color: #E0E1E3;
-  border-radius: 4px;
-}
-
-QGraphicsView:disabled {
-  background-color: #19232D;
-  border: 1px solid #455364;
-  color: #9DA9B5;
-  border-radius: 4px;
-}
-
-QGraphicsView:hover, QGraphicsView:!hover, QGraphicsView:selected, QGraphicsView:pressed {
-  border: 1px solid #455364;
-}
-
-/* QCalendarWidget --------------------------------------------------------
-
---------------------------------------------------------------------------- */
-QCalendarWidget {
-  border: 1px solid #455364;
-  border-radius: 4px;
-}
-
-QCalendarWidget:disabled {
-  background-color: #19232D;
-  color: #9DA9B5;
-}
-
-/* QLCDNumber -------------------------------------------------------------
-
---------------------------------------------------------------------------- */
-QLCDNumber {
-  background-color: #19232D;
-  color: #E0E1E3;
-}
-
-QLCDNumber:disabled {
-  background-color: #19232D;
-  color: #9DA9B5;
-}
-
-/* QProgressBar -----------------------------------------------------------
-
-https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qprogressbar
-
---------------------------------------------------------------------------- */
-QProgressBar {
-  background-color: #19232D;
-  border: 1px solid #455364;
-  color: #E0E1E3;
-  border-radius: 4px;
-  text-align: center;
-}
-
-QProgressBar:disabled {
-  background-color: #19232D;
-  border: 1px solid #455364;
-  color: #9DA9B5;
-  border-radius: 4px;
-  text-align: center;
-}
-
-QProgressBar::chunk {
-  background-color: #346792;
-  color: #19232D;
-  border-radius: 4px;
-}
-
-QProgressBar::chunk:disabled {
-  background-color: #26486B;
-  color: #9DA9B5;
-  border-radius: 4px;
-}
-
-/* ------------------------------------------------------------------------ */
-/* BUTTONS ---------------------------------------------------------------- */
-/* ------------------------------------------------------------------------ */
-/* QPushButton ------------------------------------------------------------
-
-https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qpushbutton
-
---------------------------------------------------------------------------- */
-QPushButton {
-  background-color: #455364;
-  color: #E0E1E3;
-  border-radius: 4px;
-  padding: 2px;
-  outline: none;
-  border: none;
-}
-
-QPushButton:disabled {
-  background-color: #455364;
-  color: #9DA9B5;
-  border-radius: 4px;
-  padding: 2px;
-}
-
-QPushButton:checked {
-  background-color: #60798B;
-  border-radius: 4px;
-  padding: 2px;
-  outline: none;
-}
-
-QPushButton:checked:disabled {
-  background-color: #60798B;
-  color: #9DA9B5;
-  border-radius: 4px;
-  padding: 2px;
-  outline: none;
-}
-
-QPushButton:checked:selected {
-  background: #60798B;
-}
-
-QPushButton:hover {
-  background-color: #54687A;
-  color: #E0E1E3;
-}
-
-QPushButton:pressed {
-  background-color: #60798B;
-}
-
-QPushButton:selected {
-  background: #60798B;
-  color: #E0E1E3;
-}
-
-QPushButton::menu-indicator {
-  subcontrol-origin: padding;
-  subcontrol-position: bottom right;
-  bottom: 4px;
-}
-
-QDialogButtonBox QPushButton {
-  /* Issue #194 #248 - Special case of QPushButton inside dialogs, for better UI */
-  min-width: 80px;
-}
-
-/* QToolButton ------------------------------------------------------------
-
-https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qtoolbutton
-
---------------------------------------------------------------------------- */
-QToolButton {
-  background-color: #455364;
-  color: #E0E1E3;
-  border-radius: 4px;
-  padding: 2px;
-  outline: none;
-  border: none;
-  /* The subcontrols below are used only in the DelayedPopup mode */
-  /* The subcontrols below are used only in the MenuButtonPopup mode */
-  /* The subcontrol below is used only in the InstantPopup or DelayedPopup mode */
-}
-
-QToolButton:disabled {
-  background-color: #455364;
-  color: #9DA9B5;
-  border-radius: 4px;
-  padding: 2px;
-}
-
-QToolButton:checked {
-  background-color: #60798B;
-  border-radius: 4px;
-  padding: 2px;
-  outline: none;
-}
-
-QToolButton:checked:disabled {
-  background-color: #60798B;
-  color: #9DA9B5;
-  border-radius: 4px;
-  padding: 2px;
-  outline: none;
-}
-
-QToolButton:checked:hover {
-  background-color: #54687A;
-  color: #E0E1E3;
-}
-
-QToolButton:checked:pressed {
-  background-color: #60798B;
-}
-
-QToolButton:checked:selected {
-  background: #60798B;
-  color: #E0E1E3;
-}
-
-QToolButton:hover {
-  background-color: #54687A;
-  color: #E0E1E3;
-}
-
-QToolButton:pressed {
-  background-color: #60798B;
-}
-
-QToolButton:selected {
-  background: #60798B;
-  color: #E0E1E3;
-}
-
-QToolButton[popupMode="0"] {
-  /* Only for DelayedPopup */
-  padding-right: 2px;
-}
-
-QToolButton[popupMode="1"] {
-  /* Only for MenuButtonPopup */
-  padding-right: 20px;
-}
-
-QToolButton[popupMode="1"]::menu-button {
-  border: none;
-}
-
-QToolButton[popupMode="1"]::menu-button:hover {
-  border: none;
-  border-left: 1px solid #455364;
-  border-radius: 0;
-}
-
-QToolButton[popupMode="2"] {
-  /* Only for InstantPopup */
-  padding-right: 2px;
-}
-
-QToolButton::menu-button {
-  padding: 2px;
-  border-radius: 4px;
-  width: 12px;
-  border: none;
-  outline: none;
-}
-
-QToolButton::menu-button:hover {
-  border: 1px solid #346792;
-}
-
-QToolButton::menu-button:checked:hover {
-  border: 1px solid #346792;
-}
-
-QToolButton::menu-indicator {
-  image: url(":/qss_icons/dark/rc/arrow_down.png");
-  height: 8px;
-  width: 8px;
-  top: 0;
-  /* Exclude a shift for better image */
-  left: -2px;
-  /* Shift it a bit */
-}
-
-QToolButton::menu-arrow {
-  image: url(":/qss_icons/dark/rc/arrow_down.png");
-  height: 8px;
-  width: 8px;
-}
-
-QToolButton::menu-arrow:hover {
-  image: url(":/qss_icons/dark/rc/arrow_down_focus.png");
-}
-
-/* QCommandLinkButton -----------------------------------------------------
-
---------------------------------------------------------------------------- */
-QCommandLinkButton {
-  background-color: transparent;
-  border: 1px solid #455364;
-  color: #E0E1E3;
-  border-radius: 4px;
-  padding: 0px;
-  margin: 0px;
-}
-
-QCommandLinkButton:disabled {
-  background-color: transparent;
-  color: #9DA9B5;
-}
-
-/* ------------------------------------------------------------------------ */
-/* INPUTS - NO FIELDS ----------------------------------------------------- */
-/* ------------------------------------------------------------------------ */
-/* QComboBox --------------------------------------------------------------
-
-https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qcombobox
-
---------------------------------------------------------------------------- */
-QComboBox {
-  border: 1px solid #455364;
-  border-radius: 4px;
-  selection-background-color: #346792;
-  padding-left: 4px;
-  padding-right: 4px;
-  /* padding-right = 36; 4 + 16*2 See scrollbar size */
-  /* changed to 4px to fix #239 */
-  /* Fixes #103, #111 */
-  min-height: 1.5em;
-  /* padding-top: 2px;     removed to fix #132 */
-  /* padding-bottom: 2px;  removed to fix #132 */
-  /* min-width: 75px;      removed to fix #109 */
-  /* Needed to remove indicator - fix #132 */
-}
-
-QComboBox QAbstractItemView {
-  border: 1px solid #455364;
-  border-radius: 0;
-  background-color: #19232D;
-  selection-background-color: #346792;
-}
-
-QComboBox QAbstractItemView:hover {
-  background-color: #19232D;
-  color: #E0E1E3;
-}
-
-QComboBox QAbstractItemView:selected {
-  background: #346792;
-  color: #455364;
-}
-
-QComboBox QAbstractItemView:alternate {
-  background: #19232D;
-}
-
-QComboBox:disabled {
-  background-color: #19232D;
-  color: #9DA9B5;
-}
-
-QComboBox:hover {
-  border: 1px solid #346792;
-}
-
-QComboBox:focus {
-  border: 1px solid #1A72BB;
-}
-
-QComboBox:on {
-  selection-background-color: #346792;
-}
-
-QComboBox::indicator {
-  border: none;
-  border-radius: 0;
-  background-color: transparent;
-  selection-background-color: transparent;
-  color: transparent;
-  selection-color: transparent;
-  /* Needed to remove indicator - fix #132 */
-}
-
-QComboBox::indicator:alternate {
-  background: #19232D;
-}
-
-QComboBox::item {
-  /* Remove to fix #282, #285 and MR #288*/
-  /*&:checked {
-            font-weight: bold;
-        }
-
-        &:selected {
-            border: 0px solid transparent;
-        }
-        */
-}
-
-QComboBox::item:alternate {
-  background: #19232D;
-}
-
-QComboBox::drop-down {
-  subcontrol-origin: padding;
-  subcontrol-position: top right;
-  width: 12px;
-  border-left: 1px solid #455364;
-}
-
-QComboBox::down-arrow {
-  image: url(":/qss_icons/dark/rc/arrow_down_disabled.png");
-  height: 8px;
-  width: 8px;
-}
-
-QComboBox::down-arrow:on, QComboBox::down-arrow:hover, QComboBox::down-arrow:focus {
-  image: url(":/qss_icons/dark/rc/arrow_down.png");
-}
-
-/* QSlider ----------------------------------------------------------------
-
-https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qslider
-
---------------------------------------------------------------------------- */
-QSlider:disabled {
-  background: #19232D;
-}
-
-QSlider:focus {
-  border: none;
-}
-
-QSlider::groove:horizontal {
-  background: #455364;
-  border: 1px solid #455364;
-  height: 4px;
-  margin: 0px;
-  border-radius: 4px;
-}
-
-QSlider::groove:vertical {
-  background: #455364;
-  border: 1px solid #455364;
-  width: 4px;
-  margin: 0px;
-  border-radius: 4px;
-}
-
-QSlider::add-page:vertical {
-  background: #346792;
-  border: 1px solid #455364;
-  width: 4px;
-  margin: 0px;
-  border-radius: 4px;
-}
-
-QSlider::add-page:vertical :disabled {
-  background: #26486B;
-}
-
-QSlider::sub-page:horizontal {
-  background: #346792;
-  border: 1px solid #455364;
-  height: 4px;
-  margin: 0px;
-  border-radius: 4px;
-}
-
-QSlider::sub-page:horizontal:disabled {
-  background: #26486B;
-}
-
-QSlider::handle:horizontal {
-  background: #9DA9B5;
-  border: 1px solid #455364;
-  width: 8px;
-  height: 8px;
-  margin: -8px 0px;
-  border-radius: 4px;
-}
-
-QSlider::handle:horizontal:hover {
-  background: #346792;
-  border: 1px solid #346792;
-}
-
-QSlider::handle:horizontal:focus {
-  border: 1px solid #1A72BB;
-}
-
-QSlider::handle:vertical {
-  background: #9DA9B5;
-  border: 1px solid #455364;
-  width: 8px;
-  height: 8px;
-  margin: 0 -8px;
-  border-radius: 4px;
-}
-
-QSlider::handle:vertical:hover {
-  background: #346792;
-  border: 1px solid #346792;
-}
-
-QSlider::handle:vertical:focus {
-  border: 1px solid #1A72BB;
-}
-
-/* QLineEdit --------------------------------------------------------------
-
-https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qlineedit
-
---------------------------------------------------------------------------- */
-QLineEdit {
-  background-color: #19232D;
-  padding-top: 2px;
-  /* This QLineEdit fix  103, 111 */
-  padding-bottom: 2px;
-  /* This QLineEdit fix  103, 111 */
-  padding-left: 4px;
-  padding-right: 4px;
-  border-style: solid;
-  border: 1px solid #455364;
-  border-radius: 4px;
-  color: #E0E1E3;
-}
-
-QLineEdit:disabled {
-  background-color: #19232D;
-  color: #9DA9B5;
-}
-
-QLineEdit:hover {
-  border: 1px solid #346792;
-  color: #E0E1E3;
-}
-
-QLineEdit:focus {
-  border: 1px solid #1A72BB;
-}
-
-QLineEdit:selected {
-  background-color: #346792;
-  color: #455364;
-}
-
-/* QTabWiget --------------------------------------------------------------
-
-https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qtabwidget-and-qtabbar
-
---------------------------------------------------------------------------- */
-QTabWidget {
-  padding: 2px;
-  selection-background-color: #455364;
-}
-
-QTabWidget QWidget {
-  /* Fixes #189 */
-  border-radius: 4px;
-}
-
-QTabWidget::pane {
-  border: 1px solid #455364;
-  border-radius: 4px;
-  margin: 0px;
-  /* Fixes double border inside pane with pyqt5 */
-  padding: 0px;
-}
-
-QTabWidget::pane:selected {
-  background-color: #455364;
-  border: 1px solid #346792;
-}
-
-/* QTabBar ----------------------------------------------------------------
-
-https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qtabwidget-and-qtabbar
-
---------------------------------------------------------------------------- */
-QTabBar, QDockWidget QTabBar {
-  qproperty-drawBase: 0;
-  border-radius: 4px;
-  margin: 0px;
-  padding: 2px;
-  border: 0;
-  /* left: 5px; move to the right by 5px - removed for fix */
-}
-
-QTabBar::close-button, QDockWidget QTabBar::close-button {
-  border: 0;
-  margin: 0;
-  padding: 4px;
-  image: url(":/qss_icons/dark/rc/window_close.png");
-}
-
-QTabBar::close-button:hover, QDockWidget QTabBar::close-button:hover {
-  image: url(":/qss_icons/dark/rc/window_close_focus.png");
-}
-
-QTabBar::close-button:pressed, QDockWidget QTabBar::close-button:pressed {
-  image: url(":/qss_icons/dark/rc/window_close_pressed.png");
-}
-
-QTabBar::tab, QDockWidget QTabBar::tab {
-  /* !selected and disabled ----------------------------------------- */
-  /* selected ------------------------------------------------------- */
-}
-
-QTabBar::tab:top:selected:disabled, QDockWidget QTabBar::tab:top:selected:disabled {
-  border-bottom: 3px solid #26486B;
-  color: #9DA9B5;
-  background-color: #455364;
-}
-
-QTabBar::tab:bottom:selected:disabled, QDockWidget QTabBar::tab:bottom:selected:disabled {
-  border-top: 3px solid #26486B;
-  color: #9DA9B5;
-  background-color: #455364;
-}
-
-QTabBar::tab:left:selected:disabled, QDockWidget QTabBar::tab:left:selected:disabled {
-  border-right: 3px solid #26486B;
-  color: #9DA9B5;
-  background-color: #455364;
-}
-
-QTabBar::tab:right:selected:disabled, QDockWidget QTabBar::tab:right:selected:disabled {
-  border-left: 3px solid #26486B;
-  color: #9DA9B5;
-  background-color: #455364;
-}
-
-QTabBar::tab:top:!selected:disabled, QDockWidget QTabBar::tab:top:!selected:disabled {
-  border-bottom: 3px solid #19232D;
-  color: #9DA9B5;
-  background-color: #19232D;
-}
-
-QTabBar::tab:bottom:!selected:disabled, QDockWidget QTabBar::tab:bottom:!selected:disabled {
-  border-top: 3px solid #19232D;
-  color: #9DA9B5;
-  background-color: #19232D;
-}
-
-QTabBar::tab:left:!selected:disabled, QDockWidget QTabBar::tab:left:!selected:disabled {
-  border-right: 3px solid #19232D;
-  color: #9DA9B5;
-  background-color: #19232D;
-}
-
-QTabBar::tab:right:!selected:disabled, QDockWidget QTabBar::tab:right:!selected:disabled {
-  border-left: 3px solid #19232D;
-  color: #9DA9B5;
-  background-color: #19232D;
-}
-
-QTabBar::tab:top:!selected, QDockWidget QTabBar::tab:top:!selected {
-  border-bottom: 2px solid #19232D;
-  margin-top: 2px;
-}
-
-QTabBar::tab:bottom:!selected, QDockWidget QTabBar::tab:bottom:!selected {
-  border-top: 2px solid #19232D;
-  margin-bottom: 2px;
-}
-
-QTabBar::tab:left:!selected, QDockWidget QTabBar::tab:left:!selected {
-  border-left: 2px solid #19232D;
-  margin-right: 2px;
-}
-
-QTabBar::tab:right:!selected, QDockWidget QTabBar::tab:right:!selected {
-  border-right: 2px solid #19232D;
-  margin-left: 2px;
-}
-
-QTabBar::tab:top, QDockWidget QTabBar::tab:top {
-  background-color: #455364;
-  margin-left: 2px;
-  padding-left: 4px;
-  padding-right: 4px;
-  padding-top: 2px;
-  padding-bottom: 2px;
-  min-width: 5px;
-  border-bottom: 3px solid #455364;
-  border-top-left-radius: 4px;
-  border-top-right-radius: 4px;
-}
-
-QTabBar::tab:top:selected, QDockWidget QTabBar::tab:top:selected {
-  background-color: #54687A;
-  border-bottom: 3px solid #259AE9;
-  border-top-left-radius: 4px;
-  border-top-right-radius: 4px;
-}
-
-QTabBar::tab:top:!selected:hover, QDockWidget QTabBar::tab:top:!selected:hover {
-  border: 1px solid #1A72BB;
-  border-bottom: 3px solid #1A72BB;
-  /* Fixes spyder-ide/spyder#9766 and #243 */
-  padding-left: 3px;
-  padding-right: 3px;
-}
-
-QTabBar::tab:bottom, QDockWidget QTabBar::tab:bottom {
-  border-top: 3px solid #455364;
-  background-color: #455364;
-  margin-left: 2px;
-  padding-left: 4px;
-  padding-right: 4px;
-  padding-top: 2px;
-  padding-bottom: 2px;
-  border-bottom-left-radius: 4px;
-  border-bottom-right-radius: 4px;
-  min-width: 5px;
-}
-
-QTabBar::tab:bottom:selected, QDockWidget QTabBar::tab:bottom:selected {
-  background-color: #54687A;
-  border-top: 3px solid #259AE9;
-  border-bottom-left-radius: 4px;
-  border-bottom-right-radius: 4px;
-}
-
-QTabBar::tab:bottom:!selected:hover, QDockWidget QTabBar::tab:bottom:!selected:hover {
-  border: 1px solid #1A72BB;
-  border-top: 3px solid #1A72BB;
-  /* Fixes spyder-ide/spyder#9766 and #243 */
-  padding-left: 3px;
-  padding-right: 3px;
-}
-
-QTabBar::tab:left, QDockWidget QTabBar::tab:left {
-  background-color: #455364;
-  margin-top: 2px;
-  padding-left: 2px;
-  padding-right: 2px;
-  padding-top: 4px;
-  padding-bottom: 4px;
-  border-top-left-radius: 4px;
-  border-bottom-left-radius: 4px;
-  min-height: 5px;
-}
-
-QTabBar::tab:left:selected, QDockWidget QTabBar::tab:left:selected {
-  background-color: #54687A;
-  border-right: 3px solid #259AE9;
-}
-
-QTabBar::tab:left:!selected:hover, QDockWidget QTabBar::tab:left:!selected:hover {
-  border: 1px solid #1A72BB;
-  border-right: 3px solid #1A72BB;
-  /* Fixes different behavior #271 */
-  margin-right: 0px;
-  padding-right: -1px;
-}
-
-QTabBar::tab:right, QDockWidget QTabBar::tab:right {
-  background-color: #455364;
-  margin-top: 2px;
-  padding-left: 2px;
-  padding-right: 2px;
-  padding-top: 4px;
-  padding-bottom: 4px;
-  border-top-right-radius: 4px;
-  border-bottom-right-radius: 4px;
-  min-height: 5px;
-}
-
-QTabBar::tab:right:selected, QDockWidget QTabBar::tab:right:selected {
-  background-color: #54687A;
-  border-left: 3px solid #259AE9;
-}
-
-QTabBar::tab:right:!selected:hover, QDockWidget QTabBar::tab:right:!selected:hover {
-  border: 1px solid #1A72BB;
-  border-left: 3px solid #1A72BB;
-  /* Fixes different behavior #271 */
-  margin-left: 0px;
-  padding-left: 0px;
-}
-
-QTabBar QToolButton, QDockWidget QTabBar QToolButton {
-  /* Fixes #136 */
-  background-color: #455364;
-  height: 12px;
-  width: 12px;
-}
-
-QTabBar QToolButton:pressed, QDockWidget QTabBar QToolButton:pressed {
-  background-color: #455364;
-}
-
-QTabBar QToolButton:pressed:hover, QDockWidget QTabBar QToolButton:pressed:hover {
-  border: 1px solid #346792;
-}
-
-QTabBar QToolButton::left-arrow:enabled, QDockWidget QTabBar QToolButton::left-arrow:enabled {
-  image: url(":/qss_icons/dark/rc/arrow_left.png");
-}
-
-QTabBar QToolButton::left-arrow:disabled, QDockWidget QTabBar QToolButton::left-arrow:disabled {
-  image: url(":/qss_icons/dark/rc/arrow_left_disabled.png");
-}
-
-QTabBar QToolButton::right-arrow:enabled, QDockWidget QTabBar QToolButton::right-arrow:enabled {
-  image: url(":/qss_icons/dark/rc/arrow_right.png");
-}
-
-QTabBar QToolButton::right-arrow:disabled, QDockWidget QTabBar QToolButton::right-arrow:disabled {
-  image: url(":/qss_icons/dark/rc/arrow_right_disabled.png");
-}
-
-/* QDockWiget -------------------------------------------------------------
-
---------------------------------------------------------------------------- */
-QDockWidget {
-  outline: 1px solid #455364;
-  background-color: #19232D;
-  border: 1px solid #455364;
-  border-radius: 4px;
-  titlebar-close-icon: url(":/qss_icons/dark/rc/transparent.png");
-  titlebar-normal-icon: url(":/qss_icons/dark/rc/transparent.png");
-}
-
-QDockWidget::title {
-  /* Better size for title bar */
-  padding: 3px;
-  spacing: 4px;
-  border: none;
-  background-color: #455364;
-}
-
-QDockWidget::close-button {
-  icon-size: 12px;
-  border: none;
-  background: transparent;
-  background-image: transparent;
-  border: 0;
-  margin: 0;
-  padding: 0;
-  image: url(":/qss_icons/dark/rc/window_close.png");
-}
-
-QDockWidget::close-button:hover {
-  image: url(":/qss_icons/dark/rc/window_close_focus.png");
-}
-
-QDockWidget::close-button:pressed {
-  image: url(":/qss_icons/dark/rc/window_close_pressed.png");
-}
-
-QDockWidget::float-button {
-  icon-size: 12px;
-  border: none;
-  background: transparent;
-  background-image: transparent;
-  border: 0;
-  margin: 0;
-  padding: 0;
-  image: url(":/qss_icons/dark/rc/window_undock.png");
-}
-
-QDockWidget::float-button:hover {
-  image: url(":/qss_icons/dark/rc/window_undock_focus.png");
-}
-
-QDockWidget::float-button:pressed {
-  image: url(":/qss_icons/dark/rc/window_undock_pressed.png");
-}
-
-/* QTreeView QListView QTableView -----------------------------------------
-
-https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qtreeview
-https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qlistview
-https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qtableview
-
---------------------------------------------------------------------------- */
-QTreeView:branch:selected, QTreeView:branch:hover {
-  background: url(":/qss_icons/dark/rc/transparent.png");
-}
-
-QTreeView:branch:has-siblings:!adjoins-item {
-  border-image: url(":/qss_icons/dark/rc/branch_line.png") 0;
-}
-
-QTreeView:branch:has-siblings:adjoins-item {
-  border-image: url(":/qss_icons/dark/rc/branch_more.png") 0;
-}
-
-QTreeView:branch:!has-children:!has-siblings:adjoins-item {
-  border-image: url(":/qss_icons/dark/rc/branch_end.png") 0;
-}
-
-QTreeView:branch:has-children:!has-siblings:closed, QTreeView:branch:closed:has-children:has-siblings {
-  border-image: none;
-  image: url(":/qss_icons/dark/rc/branch_closed.png");
-}
-
-QTreeView:branch:open:has-children:!has-siblings, QTreeView:branch:open:has-children:has-siblings {
-  border-image: none;
-  image: url(":/qss_icons/dark/rc/branch_open.png");
-}
-
-QTreeView:branch:has-children:!has-siblings:closed:hover, QTreeView:branch:closed:has-children:has-siblings:hover {
-  image: url(":/qss_icons/dark/rc/branch_closed_focus.png");
-}
-
-QTreeView:branch:open:has-children:!has-siblings:hover, QTreeView:branch:open:has-children:has-siblings:hover {
-  image: url(":/qss_icons/dark/rc/branch_open_focus.png");
-}
-
-QTreeView::indicator:checked,
-QListView::indicator:checked,
-QTableView::indicator:checked,
-QColumnView::indicator:checked {
-  image: url(":/qss_icons/dark/rc/checkbox_checked.png");
-}
-
-QTreeView::indicator:checked:hover, QTreeView::indicator:checked:focus, QTreeView::indicator:checked:pressed,
-QListView::indicator:checked:hover,
-QListView::indicator:checked:focus,
-QListView::indicator:checked:pressed,
-QTableView::indicator:checked:hover,
-QTableView::indicator:checked:focus,
-QTableView::indicator:checked:pressed,
-QColumnView::indicator:checked:hover,
-QColumnView::indicator:checked:focus,
-QColumnView::indicator:checked:pressed {
-  image: url(":/qss_icons/dark/rc/checkbox_checked_focus.png");
-}
-
-QTreeView::indicator:unchecked,
-QListView::indicator:unchecked,
-QTableView::indicator:unchecked,
-QColumnView::indicator:unchecked {
-  image: url(":/qss_icons/dark/rc/checkbox_unchecked.png");
-}
-
-QTreeView::indicator:unchecked:hover, QTreeView::indicator:unchecked:focus, QTreeView::indicator:unchecked:pressed,
-QListView::indicator:unchecked:hover,
-QListView::indicator:unchecked:focus,
-QListView::indicator:unchecked:pressed,
-QTableView::indicator:unchecked:hover,
-QTableView::indicator:unchecked:focus,
-QTableView::indicator:unchecked:pressed,
-QColumnView::indicator:unchecked:hover,
-QColumnView::indicator:unchecked:focus,
-QColumnView::indicator:unchecked:pressed {
-  image: url(":/qss_icons/dark/rc/checkbox_unchecked_focus.png");
-}
-
-QTreeView::indicator:indeterminate,
-QListView::indicator:indeterminate,
-QTableView::indicator:indeterminate,
-QColumnView::indicator:indeterminate {
-  image: url(":/qss_icons/dark/rc/checkbox_indeterminate.png");
-}
-
-QTreeView::indicator:indeterminate:hover, QTreeView::indicator:indeterminate:focus, QTreeView::indicator:indeterminate:pressed,
-QListView::indicator:indeterminate:hover,
-QListView::indicator:indeterminate:focus,
-QListView::indicator:indeterminate:pressed,
-QTableView::indicator:indeterminate:hover,
-QTableView::indicator:indeterminate:focus,
-QTableView::indicator:indeterminate:pressed,
-QColumnView::indicator:indeterminate:hover,
-QColumnView::indicator:indeterminate:focus,
-QColumnView::indicator:indeterminate:pressed {
-  image: url(":/qss_icons/dark/rc/checkbox_indeterminate_focus.png");
-}
-
-QTreeView,
-QListView,
-QTableView,
-QColumnView {
-  background-color: #19232D;
-  border: 1px solid #455364;
-  color: #E0E1E3;
-  gridline-color: #455364;
-  border-radius: 4px;
-}
-
-QTreeView:disabled,
-QListView:disabled,
-QTableView:disabled,
-QColumnView:disabled {
-  background-color: #19232D;
-  color: #9DA9B5;
-}
-
-QTreeView:selected,
-QListView:selected,
-QTableView:selected,
-QColumnView:selected {
-  background-color: #346792;
-  color: #455364;
-}
-
-QTreeView:focus,
-QListView:focus,
-QTableView:focus,
-QColumnView:focus {
-  border: 1px solid #1A72BB;
-}
-
-QTreeView::item:pressed,
-QListView::item:pressed,
-QTableView::item:pressed,
-QColumnView::item:pressed {
-  background-color: #346792;
-}
-
-QTreeView::item:selected:active,
-QListView::item:selected:active,
-QTableView::item:selected:active,
-QColumnView::item:selected:active {
-  background-color: #346792;
-}
-
-QTreeView::item:selected:!active,
-QListView::item:selected:!active,
-QTableView::item:selected:!active,
-QColumnView::item:selected:!active {
-  color: #E0E1E3;
-  background-color: #37414F;
-}
-
-QTreeView::item:!selected:hover,
-QListView::item:!selected:hover,
-QTableView::item:!selected:hover,
-QColumnView::item:!selected:hover {
-  outline: 0;
-  color: #E0E1E3;
-  background-color: #37414F;
-}
-
-QTableCornerButton::section {
-  background-color: #19232D;
-  border: 1px transparent #455364;
-  border-radius: 0px;
-}
-
-/* QHeaderView ------------------------------------------------------------
-
-https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qheaderview
-
---------------------------------------------------------------------------- */
-QHeaderView {
-  background-color: #455364;
-  border: 0px transparent #455364;
-  padding: 0;
-  margin: 0;
-  border-radius: 0;
-}
-
-QHeaderView:disabled {
-  background-color: #455364;
-  border: 1px transparent #455364;
-}
-
-QHeaderView::section {
-  background-color: #455364;
-  color: #E0E1E3;
-  border-radius: 0;
-  text-align: left;
-  font-size: 13px;
-}
-
-QHeaderView::section::horizontal {
-  padding-top: 0;
-  padding-bottom: 0;
-  padding-left: 4px;
-  padding-right: 4px;
-  border-left: 1px solid #19232D;
-}
-
-QHeaderView::section::horizontal::first, QHeaderView::section::horizontal::only-one {
-  border-left: 1px solid #455364;
-}
-
-QHeaderView::section::horizontal:disabled {
-  color: #9DA9B5;
-}
-
-QHeaderView::section::vertical {
-  padding-top: 0;
-  padding-bottom: 0;
-  padding-left: 4px;
-  padding-right: 4px;
-  border-top: 1px solid #19232D;
-}
-
-QHeaderView::section::vertical::first, QHeaderView::section::vertical::only-one {
-  border-top: 1px solid #455364;
-}
-
-QHeaderView::section::vertical:disabled {
-  color: #9DA9B5;
-}
-
-QHeaderView::down-arrow {
-  /* Those settings (border/width/height/background-color) solve bug */
-  /* transparent arrow background and size */
-  background-color: #455364;
-  border: none;
-  height: 12px;
-  width: 12px;
-  padding-left: 2px;
-  padding-right: 2px;
-  image: url(":/qss_icons/dark/rc/arrow_down.png");
-}
-
-QHeaderView::up-arrow {
-  background-color: #455364;
-  border: none;
-  height: 12px;
-  width: 12px;
-  padding-left: 2px;
-  padding-right: 2px;
-  image: url(":/qss_icons/dark/rc/arrow_up.png");
-}
-
-/* QToolBox --------------------------------------------------------------
-
-https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qtoolbox
-
---------------------------------------------------------------------------- */
-QToolBox {
-  padding: 0px;
-  border: 0px;
-  border: 1px solid #455364;
-}
-
-QToolBox:selected {
-  padding: 0px;
-  border: 2px solid #346792;
-}
-
-QToolBox::tab {
-  background-color: #19232D;
-  border: 1px solid #455364;
-  color: #E0E1E3;
-  border-top-left-radius: 4px;
-  border-top-right-radius: 4px;
-}
-
-QToolBox::tab:disabled {
-  color: #9DA9B5;
-}
-
-QToolBox::tab:selected {
-  background-color: #60798B;
-  border-bottom: 2px solid #346792;
-}
-
-QToolBox::tab:selected:disabled {
-  background-color: #455364;
-  border-bottom: 2px solid #26486B;
-}
-
-QToolBox::tab:!selected {
-  background-color: #455364;
-  border-bottom: 2px solid #455364;
-}
-
-QToolBox::tab:!selected:disabled {
-  background-color: #19232D;
-}
-
-QToolBox::tab:hover {
-  border-color: #1A72BB;
-  border-bottom: 2px solid #1A72BB;
-}
-
-QToolBox QScrollArea QWidget QWidget {
-  padding: 0px;
-  border: 0px;
-  background-color: #19232D;
-}
-
-/* QFrame -----------------------------------------------------------------
-
-https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qframe
-https://doc.qt.io/qt-5/qframe.html#-prop
-https://doc.qt.io/qt-5/qframe.html#details
-https://stackoverflow.com/questions/14581498/qt-stylesheet-for-hline-vline-color
-
---------------------------------------------------------------------------- */
-/* (dot) .QFrame  fix #141, #126, #123 */
-.QFrame {
-  border-radius: 4px;
-  border: 1px solid #455364;
-  /* No frame */
-  /* HLine */
-  /* HLine */
-}
-
-.QFrame[frameShape="0"] {
-  border-radius: 4px;
-  border: 1px transparent #455364;
-}
-
-.QFrame[frameShape="4"] {
-  max-height: 2px;
-  border: none;
-  background-color: #455364;
-}
-
-.QFrame[frameShape="5"] {
-  max-width: 2px;
-  border: none;
-  background-color: #455364;
-}
-
-/* QSplitter --------------------------------------------------------------
-
-https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qsplitter
-
---------------------------------------------------------------------------- */
-QSplitter {
-  background-color: #455364;
-  spacing: 0px;
-  padding: 0px;
-  margin: 0px;
-}
-
-QSplitter::handle {
-  background-color: #455364;
-  border: 0px solid #19232D;
-  spacing: 0px;
-  padding: 1px;
-  margin: 0px;
-}
-
-QSplitter::handle:hover {
-  background-color: #9DA9B5;
-}
-
-QSplitter::handle:horizontal {
-  width: 5px;
-  image: url(":/qss_icons/dark/rc/line_vertical.png");
-}
-
-QSplitter::handle:vertical {
-  height: 5px;
-  image: url(":/qss_icons/dark/rc/line_horizontal.png");
-}
-
-/* QDateEdit, QDateTimeEdit -----------------------------------------------
-
---------------------------------------------------------------------------- */
-QDateEdit, QDateTimeEdit {
-  selection-background-color: #346792;
-  border-style: solid;
-  border: 1px solid #455364;
-  border-radius: 4px;
-  /* This fixes 103, 111 */
-  padding-top: 2px;
-  /* This fixes 103, 111 */
-  padding-bottom: 2px;
-  padding-left: 4px;
-  padding-right: 4px;
-  min-width: 10px;
-}
-
-QDateEdit:on, QDateTimeEdit:on {
-  selection-background-color: #346792;
-}
-
-QDateEdit::drop-down, QDateTimeEdit::drop-down {
-  subcontrol-origin: padding;
-  subcontrol-position: top right;
-  width: 12px;
-  border-left: 1px solid #455364;
-}
-
-QDateEdit::down-arrow, QDateTimeEdit::down-arrow {
-  image: url(":/qss_icons/dark/rc/arrow_down_disabled.png");
-  height: 8px;
-  width: 8px;
-}
-
-QDateEdit::down-arrow:on, QDateEdit::down-arrow:hover, QDateEdit::down-arrow:focus, QDateTimeEdit::down-arrow:on, QDateTimeEdit::down-arrow:hover, QDateTimeEdit::down-arrow:focus {
-  image: url(":/qss_icons/dark/rc/arrow_down.png");
-}
-
-QDateEdit QAbstractItemView, QDateTimeEdit QAbstractItemView {
-  background-color: #19232D;
-  border-radius: 4px;
-  border: 1px solid #455364;
-  selection-background-color: #346792;
-}
-
-/* QAbstractView ----------------------------------------------------------
-
---------------------------------------------------------------------------- */
-QAbstractView:hover {
-  border: 1px solid #346792;
-  color: #E0E1E3;
-}
-
-QAbstractView:selected {
-  background: #346792;
-  color: #455364;
-}
-
-/* PlotWidget -------------------------------------------------------------
-
---------------------------------------------------------------------------- */
-PlotWidget {
-  /* Fix cut labels in plots #134 */
-  padding: 0px;
-}
+/* ---------------------------------------------------------------------------
+
+    WARNING! File created programmatically. All changes made in this file will be lost!
+
+    Created by the qtsass compiler v0.3.0
+
+    The definitions are in the "qdarkstyle.qss._styles.scss" module
+
+--------------------------------------------------------------------------- */
+/* Light Style - QDarkStyleSheet ------------------------------------------ */
+/*
+
+See Qt documentation:
+
+  - https://doc.qt.io/qt-5/stylesheet.html
+  - https://doc.qt.io/qt-5/stylesheet-reference.html
+  - https://doc.qt.io/qt-5/stylesheet-examples.html
+
+--------------------------------------------------------------------------- */
+/* Reset elements ------------------------------------------------------------
+
+Resetting everything helps to unify styles across different operating systems
+
+--------------------------------------------------------------------------- */
+* {
+  padding: 0px;
+  margin: 0px;
+  border: 0px;
+  border-style: none;
+  border-image: none;
+  outline: 0;
+}
+
+/* specific reset for elements inside QToolBar */
+QToolBar * {
+  margin: 0px;
+  padding: 0px;
+}
+
+/* QWidget ----------------------------------------------------------------
+
+--------------------------------------------------------------------------- */
+QWidget {
+  background-color: #19232D;
+  border: 0px solid #455364;
+  padding: 0px;
+  color: #E0E1E3;
+  selection-background-color: #346792;
+  selection-color: #E0E1E3;
+}
+
+QWidget:disabled {
+  background-color: #19232D;
+  color: #9DA9B5;
+  selection-background-color: #26486B;
+  selection-color: #9DA9B5;
+}
+
+QWidget::item:selected {
+  background-color: #346792;
+}
+
+QWidget::item:hover:!selected {
+  background-color: #1A72BB;
+}
+
+/* QMainWindow ------------------------------------------------------------
+
+This adjusts the splitter in the dock widget, not qsplitter
+https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qmainwindow
+
+--------------------------------------------------------------------------- */
+QMainWindow::separator {
+  background-color: #455364;
+  border: 0px solid #19232D;
+  spacing: 0px;
+  padding: 2px;
+}
+
+QMainWindow::separator:hover {
+  background-color: #60798B;
+  border: 0px solid #1A72BB;
+}
+
+QMainWindow::separator:horizontal {
+  width: 5px;
+  margin-top: 2px;
+  margin-bottom: 2px;
+  image: url(":/qss_icons/dark/rc/toolbar_separator_vertical.png");
+}
+
+QMainWindow::separator:vertical {
+  height: 5px;
+  margin-left: 2px;
+  margin-right: 2px;
+  image: url(":/qss_icons/dark/rc/toolbar_separator_horizontal.png");
+}
+
+/* QToolTip ---------------------------------------------------------------
+
+https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qtooltip
+
+--------------------------------------------------------------------------- */
+QToolTip {
+  background-color: #346792;
+  color: #E0E1E3;
+  /* If you remove the border property, background stops working on Windows */
+  border: none;
+  /* Remove padding, for fix combo box tooltip */
+  padding: 0px;
+  /* Remove opacity, fix #174 - may need to use RGBA */
+}
+
+/* QStatusBar -------------------------------------------------------------
+
+https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qstatusbar
+
+--------------------------------------------------------------------------- */
+QStatusBar {
+  border: 1px solid #455364;
+  /* Fixes Spyder #9120, #9121 */
+  background: #455364;
+  /* Fixes #205, white vertical borders separating items */
+}
+
+QStatusBar::item {
+  border: none;
+}
+
+QStatusBar QToolTip {
+  background-color: #1A72BB;
+  border: 1px solid #19232D;
+  color: #19232D;
+  /* Remove padding, for fix combo box tooltip */
+  padding: 0px;
+  /* Reducing transparency to read better */
+  opacity: 230;
+}
+
+QStatusBar QLabel {
+  /* Fixes Spyder #9120, #9121 */
+  background: transparent;
+}
+
+/* QCheckBox --------------------------------------------------------------
+
+https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qcheckbox
+
+--------------------------------------------------------------------------- */
+QCheckBox {
+  background-color: #19232D;
+  color: #E0E1E3;
+  spacing: 4px;
+  outline: none;
+  padding-top: 4px;
+  padding-bottom: 4px;
+}
+
+QCheckBox:focus {
+  border: none;
+}
+
+QCheckBox QWidget:disabled {
+  background-color: #19232D;
+  color: #9DA9B5;
+}
+
+QCheckBox::indicator {
+  margin-left: 2px;
+  height: 14px;
+  width: 14px;
+}
+
+QCheckBox::indicator:unchecked {
+  image: url(":/qss_icons/dark/rc/checkbox_unchecked.png");
+}
+
+QCheckBox::indicator:unchecked:hover, QCheckBox::indicator:unchecked:focus, QCheckBox::indicator:unchecked:pressed {
+  border: none;
+  image: url(":/qss_icons/dark/rc/checkbox_unchecked_focus.png");
+}
+
+QCheckBox::indicator:unchecked:disabled {
+  image: url(":/qss_icons/dark/rc/checkbox_unchecked_disabled.png");
+}
+
+QCheckBox::indicator:checked {
+  image: url(":/qss_icons/dark/rc/checkbox_checked.png");
+}
+
+QCheckBox::indicator:checked:hover, QCheckBox::indicator:checked:focus, QCheckBox::indicator:checked:pressed {
+  border: none;
+  image: url(":/qss_icons/dark/rc/checkbox_checked_focus.png");
+}
+
+QCheckBox::indicator:checked:disabled {
+  image: url(":/qss_icons/dark/rc/checkbox_checked_disabled.png");
+}
+
+QCheckBox::indicator:indeterminate {
+  image: url(":/qss_icons/dark/rc/checkbox_indeterminate.png");
+}
+
+QCheckBox::indicator:indeterminate:disabled {
+  image: url(":/qss_icons/dark/rc/checkbox_indeterminate_disabled.png");
+}
+
+QCheckBox::indicator:indeterminate:focus, QCheckBox::indicator:indeterminate:hover, QCheckBox::indicator:indeterminate:pressed {
+  image: url(":/qss_icons/dark/rc/checkbox_indeterminate_focus.png");
+}
+
+/* QGroupBox --------------------------------------------------------------
+
+https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qgroupbox
+
+--------------------------------------------------------------------------- */
+QGroupBox {
+  font-weight: bold;
+  border: 1px solid #455364;
+  border-radius: 4px;
+  padding: 2px;
+  padding-top: 4px;
+  margin-top: 6px;
+  margin-bottom: 4px;
+}
+
+QGroupBox::title {
+  subcontrol-origin: margin;
+  subcontrol-position: top left;
+  left: 4px;
+  padding-left: 2px;
+  padding-right: 4px;
+  padding-top: -4px;
+}
+
+QGroupBox::indicator {
+  margin-left: 2px;
+  margin-top: 2px;
+  padding: 0;
+  height: 14px;
+  width: 14px;
+}
+
+QGroupBox::indicator:unchecked {
+  border: none;
+  image: url(":/qss_icons/dark/rc/checkbox_unchecked.png");
+}
+
+QGroupBox::indicator:unchecked:hover, QGroupBox::indicator:unchecked:focus, QGroupBox::indicator:unchecked:pressed {
+  border: none;
+  image: url(":/qss_icons/dark/rc/checkbox_unchecked_focus.png");
+}
+
+QGroupBox::indicator:unchecked:disabled {
+  image: url(":/qss_icons/dark/rc/checkbox_unchecked_disabled.png");
+}
+
+QGroupBox::indicator:checked {
+  border: none;
+  image: url(":/qss_icons/dark/rc/checkbox_checked.png");
+}
+
+QGroupBox::indicator:checked:hover, QGroupBox::indicator:checked:focus, QGroupBox::indicator:checked:pressed {
+  border: none;
+  image: url(":/qss_icons/dark/rc/checkbox_checked_focus.png");
+}
+
+QGroupBox::indicator:checked:disabled {
+  image: url(":/qss_icons/dark/rc/checkbox_checked_disabled.png");
+}
+
+/* QRadioButton -----------------------------------------------------------
+
+https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qradiobutton
+
+--------------------------------------------------------------------------- */
+QRadioButton {
+  background-color: #19232D;
+  color: #E0E1E3;
+  spacing: 4px;
+  padding-top: 4px;
+  padding-bottom: 4px;
+  border: none;
+  outline: none;
+}
+
+QRadioButton:focus {
+  border: none;
+}
+
+QRadioButton:disabled {
+  background-color: #19232D;
+  color: #9DA9B5;
+  border: none;
+  outline: none;
+}
+
+QRadioButton QWidget {
+  background-color: #19232D;
+  color: #E0E1E3;
+  spacing: 0px;
+  padding: 0px;
+  outline: none;
+  border: none;
+}
+
+QRadioButton::indicator {
+  border: none;
+  outline: none;
+  margin-left: 2px;
+  height: 14px;
+  width: 14px;
+}
+
+QRadioButton::indicator:unchecked {
+  image: url(":/qss_icons/dark/rc/radio_unchecked.png");
+}
+
+QRadioButton::indicator:unchecked:hover, QRadioButton::indicator:unchecked:focus, QRadioButton::indicator:unchecked:pressed {
+  border: none;
+  outline: none;
+  image: url(":/qss_icons/dark/rc/radio_unchecked_focus.png");
+}
+
+QRadioButton::indicator:unchecked:disabled {
+  image: url(":/qss_icons/dark/rc/radio_unchecked_disabled.png");
+}
+
+QRadioButton::indicator:checked {
+  border: none;
+  outline: none;
+  image: url(":/qss_icons/dark/rc/radio_checked.png");
+}
+
+QRadioButton::indicator:checked:hover, QRadioButton::indicator:checked:focus, QRadioButton::indicator:checked:pressed {
+  border: none;
+  outline: none;
+  image: url(":/qss_icons/dark/rc/radio_checked_focus.png");
+}
+
+QRadioButton::indicator:checked:disabled {
+  outline: none;
+  image: url(":/qss_icons/dark/rc/radio_checked_disabled.png");
+}
+
+/* QMenuBar ---------------------------------------------------------------
+
+https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qmenubar
+
+--------------------------------------------------------------------------- */
+QMenuBar {
+  background-color: #455364;
+  padding: 2px;
+  border: 1px solid #19232D;
+  color: #E0E1E3;
+  selection-background-color: #1A72BB;
+}
+
+QMenuBar:focus {
+  border: 1px solid #346792;
+}
+
+QMenuBar::item {
+  background: transparent;
+  padding: 4px;
+}
+
+QMenuBar::item:selected {
+  padding: 4px;
+  background: transparent;
+  border: 0px solid #455364;
+  background-color: #1A72BB;
+}
+
+QMenuBar::item:pressed {
+  padding: 4px;
+  border: 0px solid #455364;
+  background-color: #1A72BB;
+  color: #E0E1E3;
+  margin-bottom: 0px;
+  padding-bottom: 0px;
+}
+
+/* QMenu ------------------------------------------------------------------
+
+https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qmenu
+
+--------------------------------------------------------------------------- */
+QMenu {
+  border: 0px solid #455364;
+  color: #E0E1E3;
+  margin: 0px;
+  background-color: #37414F;
+  selection-background-color: #1A72BB;
+}
+
+QMenu::separator {
+  height: 1px;
+  background-color: #60798B;
+  color: #E0E1E3;
+}
+
+QMenu::item {
+  background-color: #37414F;
+  padding: 4px 24px 4px 28px;
+  /* Reserve space for selection border */
+  border: 1px transparent #455364;
+}
+
+QMenu::item:selected {
+  color: #E0E1E3;
+  background-color: #1A72BB;
+}
+
+QMenu::item:pressed {
+  background-color: #1A72BB;
+}
+
+QMenu::icon {
+  padding-left: 10px;
+  width: 14px;
+  height: 14px;
+}
+
+QMenu::indicator {
+  padding-left: 8px;
+  width: 12px;
+  height: 12px;
+  /* non-exclusive indicator = check box style indicator (see QActionGroup::setExclusive) */
+  /* exclusive indicator = radio button style indicator (see QActionGroup::setExclusive) */
+}
+
+QMenu::indicator:non-exclusive:unchecked {
+  image: url(":/qss_icons/dark/rc/checkbox_unchecked.png");
+}
+
+QMenu::indicator:non-exclusive:unchecked:hover, QMenu::indicator:non-exclusive:unchecked:focus, QMenu::indicator:non-exclusive:unchecked:pressed {
+  border: none;
+  image: url(":/qss_icons/dark/rc/checkbox_unchecked_focus.png");
+}
+
+QMenu::indicator:non-exclusive:unchecked:disabled {
+  image: url(":/qss_icons/dark/rc/checkbox_unchecked_disabled.png");
+}
+
+QMenu::indicator:non-exclusive:checked {
+  image: url(":/qss_icons/dark/rc/checkbox_checked.png");
+}
+
+QMenu::indicator:non-exclusive:checked:hover, QMenu::indicator:non-exclusive:checked:focus, QMenu::indicator:non-exclusive:checked:pressed {
+  border: none;
+  image: url(":/qss_icons/dark/rc/checkbox_checked_focus.png");
+}
+
+QMenu::indicator:non-exclusive:checked:disabled {
+  image: url(":/qss_icons/dark/rc/checkbox_checked_disabled.png");
+}
+
+QMenu::indicator:non-exclusive:indeterminate {
+  image: url(":/qss_icons/dark/rc/checkbox_indeterminate.png");
+}
+
+QMenu::indicator:non-exclusive:indeterminate:disabled {
+  image: url(":/qss_icons/dark/rc/checkbox_indeterminate_disabled.png");
+}
+
+QMenu::indicator:non-exclusive:indeterminate:focus, QMenu::indicator:non-exclusive:indeterminate:hover, QMenu::indicator:non-exclusive:indeterminate:pressed {
+  image: url(":/qss_icons/dark/rc/checkbox_indeterminate_focus.png");
+}
+
+QMenu::indicator:exclusive:unchecked {
+  image: url(":/qss_icons/dark/rc/radio_unchecked.png");
+}
+
+QMenu::indicator:exclusive:unchecked:hover, QMenu::indicator:exclusive:unchecked:focus, QMenu::indicator:exclusive:unchecked:pressed {
+  border: none;
+  outline: none;
+  image: url(":/qss_icons/dark/rc/radio_unchecked_focus.png");
+}
+
+QMenu::indicator:exclusive:unchecked:disabled {
+  image: url(":/qss_icons/dark/rc/radio_unchecked_disabled.png");
+}
+
+QMenu::indicator:exclusive:checked {
+  border: none;
+  outline: none;
+  image: url(":/qss_icons/dark/rc/radio_checked.png");
+}
+
+QMenu::indicator:exclusive:checked:hover, QMenu::indicator:exclusive:checked:focus, QMenu::indicator:exclusive:checked:pressed {
+  border: none;
+  outline: none;
+  image: url(":/qss_icons/dark/rc/radio_checked_focus.png");
+}
+
+QMenu::indicator:exclusive:checked:disabled {
+  outline: none;
+  image: url(":/qss_icons/dark/rc/radio_checked_disabled.png");
+}
+
+QMenu::right-arrow {
+  margin: 5px;
+  padding-left: 12px;
+  image: url(":/qss_icons/dark/rc/arrow_right.png");
+  height: 12px;
+  width: 12px;
+}
+
+/* QAbstractItemView ------------------------------------------------------
+
+https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qcombobox
+
+--------------------------------------------------------------------------- */
+QAbstractItemView {
+  alternate-background-color: #19232D;
+  color: #E0E1E3;
+  border: 1px solid #455364;
+  border-radius: 4px;
+}
+
+QAbstractItemView QLineEdit {
+  padding: 2px;
+}
+
+/* QAbstractScrollArea ----------------------------------------------------
+
+https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qabstractscrollarea
+
+--------------------------------------------------------------------------- */
+QAbstractScrollArea {
+  background-color: #19232D;
+  border: 1px solid #455364;
+  border-radius: 4px;
+  /* fix #159 */
+  padding: 2px;
+  /* remove min-height to fix #244 */
+  color: #E0E1E3;
+}
+
+QAbstractScrollArea:disabled {
+  color: #9DA9B5;
+}
+
+/* QScrollArea ------------------------------------------------------------
+
+--------------------------------------------------------------------------- */
+QScrollArea QWidget QWidget:disabled {
+  background-color: #19232D;
+}
+
+/* QScrollBar -------------------------------------------------------------
+
+https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qscrollbar
+
+--------------------------------------------------------------------------- */
+QScrollBar:horizontal {
+  height: 16px;
+  margin: 2px 16px 2px 16px;
+  border: 1px solid #455364;
+  border-radius: 4px;
+  background-color: #19232D;
+}
+
+QScrollBar:vertical {
+  background-color: #19232D;
+  width: 16px;
+  margin: 16px 2px 16px 2px;
+  border: 1px solid #455364;
+  border-radius: 4px;
+}
+
+QScrollBar::handle:horizontal {
+  background-color: #60798B;
+  border: 1px solid #455364;
+  border-radius: 4px;
+  min-width: 8px;
+}
+
+QScrollBar::handle:horizontal:hover {
+  background-color: #346792;
+  border: #346792;
+  border-radius: 4px;
+  min-width: 8px;
+}
+
+QScrollBar::handle:horizontal:focus {
+  border: 1px solid #1A72BB;
+}
+
+QScrollBar::handle:vertical {
+  background-color: #60798B;
+  border: 1px solid #455364;
+  min-height: 8px;
+  border-radius: 4px;
+}
+
+QScrollBar::handle:vertical:hover {
+  background-color: #346792;
+  border: #346792;
+  border-radius: 4px;
+  min-height: 8px;
+}
+
+QScrollBar::handle:vertical:focus {
+  border: 1px solid #1A72BB;
+}
+
+QScrollBar::add-line:horizontal {
+  margin: 0px 0px 0px 0px;
+  border-image: url(":/qss_icons/dark/rc/arrow_right_disabled.png");
+  height: 12px;
+  width: 12px;
+  subcontrol-position: right;
+  subcontrol-origin: margin;
+}
+
+QScrollBar::add-line:horizontal:hover, QScrollBar::add-line:horizontal:on {
+  border-image: url(":/qss_icons/dark/rc/arrow_right.png");
+  height: 12px;
+  width: 12px;
+  subcontrol-position: right;
+  subcontrol-origin: margin;
+}
+
+QScrollBar::add-line:vertical {
+  margin: 3px 0px 3px 0px;
+  border-image: url(":/qss_icons/dark/rc/arrow_down_disabled.png");
+  height: 12px;
+  width: 12px;
+  subcontrol-position: bottom;
+  subcontrol-origin: margin;
+}
+
+QScrollBar::add-line:vertical:hover, QScrollBar::add-line:vertical:on {
+  border-image: url(":/qss_icons/dark/rc/arrow_down.png");
+  height: 12px;
+  width: 12px;
+  subcontrol-position: bottom;
+  subcontrol-origin: margin;
+}
+
+QScrollBar::sub-line:horizontal {
+  margin: 0px 3px 0px 3px;
+  border-image: url(":/qss_icons/dark/rc/arrow_left_disabled.png");
+  height: 12px;
+  width: 12px;
+  subcontrol-position: left;
+  subcontrol-origin: margin;
+}
+
+QScrollBar::sub-line:horizontal:hover, QScrollBar::sub-line:horizontal:on {
+  border-image: url(":/qss_icons/dark/rc/arrow_left.png");
+  height: 12px;
+  width: 12px;
+  subcontrol-position: left;
+  subcontrol-origin: margin;
+}
+
+QScrollBar::sub-line:vertical {
+  margin: 3px 0px 3px 0px;
+  border-image: url(":/qss_icons/dark/rc/arrow_up_disabled.png");
+  height: 12px;
+  width: 12px;
+  subcontrol-position: top;
+  subcontrol-origin: margin;
+}
+
+QScrollBar::sub-line:vertical:hover, QScrollBar::sub-line:vertical:on {
+  border-image: url(":/qss_icons/dark/rc/arrow_up.png");
+  height: 12px;
+  width: 12px;
+  subcontrol-position: top;
+  subcontrol-origin: margin;
+}
+
+QScrollBar::up-arrow:horizontal, QScrollBar::down-arrow:horizontal {
+  background: none;
+}
+
+QScrollBar::up-arrow:vertical, QScrollBar::down-arrow:vertical {
+  background: none;
+}
+
+QScrollBar::add-page:horizontal, QScrollBar::sub-page:horizontal {
+  background: none;
+}
+
+QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical {
+  background: none;
+}
+
+/* QTextEdit --------------------------------------------------------------
+
+https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-specific-widgets
+
+--------------------------------------------------------------------------- */
+QTextEdit {
+  background-color: #19232D;
+  color: #E0E1E3;
+  border-radius: 4px;
+  border: 1px solid #455364;
+}
+
+QTextEdit:focus {
+  border: 1px solid #1A72BB;
+}
+
+QTextEdit:selected {
+  background: #346792;
+  color: #455364;
+}
+
+/* QPlainTextEdit ---------------------------------------------------------
+
+--------------------------------------------------------------------------- */
+QPlainTextEdit {
+  background-color: #19232D;
+  color: #E0E1E3;
+  border-radius: 4px;
+  border: 1px solid #455364;
+}
+
+QPlainTextEdit:focus {
+  border: 1px solid #1A72BB;
+}
+
+QPlainTextEdit:selected {
+  background: #346792;
+  color: #455364;
+}
+
+/* QSizeGrip --------------------------------------------------------------
+
+https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qsizegrip
+
+--------------------------------------------------------------------------- */
+QSizeGrip {
+  background: transparent;
+  width: 12px;
+  height: 12px;
+  image: url(":/qss_icons/dark/rc/window_grip.png");
+}
+
+/* QStackedWidget ---------------------------------------------------------
+
+--------------------------------------------------------------------------- */
+QStackedWidget {
+  padding: 2px;
+  border: 1px solid #455364;
+  border: 1px solid #19232D;
+}
+
+/* QToolBar ---------------------------------------------------------------
+
+https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qtoolbar
+
+--------------------------------------------------------------------------- */
+QToolBar {
+  background-color: #455364;
+  border-bottom: 1px solid #19232D;
+  padding: 1px;
+  font-weight: bold;
+  spacing: 2px;
+}
+
+QToolBar:disabled {
+  /* Fixes #272 */
+  background-color: #455364;
+}
+
+QToolBar::handle:horizontal {
+  width: 16px;
+  image: url(":/qss_icons/dark/rc/toolbar_move_horizontal.png");
+}
+
+QToolBar::handle:vertical {
+  height: 16px;
+  image: url(":/qss_icons/dark/rc/toolbar_move_vertical.png");
+}
+
+QToolBar::separator:horizontal {
+  width: 16px;
+  image: url(":/qss_icons/dark/rc/toolbar_separator_horizontal.png");
+}
+
+QToolBar::separator:vertical {
+  height: 16px;
+  image: url(":/qss_icons/dark/rc/toolbar_separator_vertical.png");
+}
+
+QToolButton#qt_toolbar_ext_button {
+  background: #455364;
+  border: 0px;
+  color: #E0E1E3;
+  image: url(":/qss_icons/dark/rc/arrow_right.png");
+}
+
+/* QAbstractSpinBox -------------------------------------------------------
+
+--------------------------------------------------------------------------- */
+QAbstractSpinBox {
+  background-color: #19232D;
+  border: 1px solid #455364;
+  color: #E0E1E3;
+  /* This fixes 103, 111 */
+  padding-top: 2px;
+  /* This fixes 103, 111 */
+  padding-bottom: 2px;
+  padding-left: 4px;
+  padding-right: 4px;
+  border-radius: 4px;
+  /* min-width: 5px; removed to fix 109 */
+}
+
+QAbstractSpinBox:up-button {
+  background-color: transparent #19232D;
+  subcontrol-origin: border;
+  subcontrol-position: top right;
+  border-left: 1px solid #455364;
+  border-bottom: 1px solid #455364;
+  border-top-left-radius: 0;
+  border-bottom-left-radius: 0;
+  margin: 1px;
+  width: 12px;
+  margin-bottom: -1px;
+}
+
+QAbstractSpinBox::up-arrow, QAbstractSpinBox::up-arrow:disabled, QAbstractSpinBox::up-arrow:off {
+  image: url(":/qss_icons/dark/rc/arrow_up_disabled.png");
+  height: 8px;
+  width: 8px;
+}
+
+QAbstractSpinBox::up-arrow:hover {
+  image: url(":/qss_icons/dark/rc/arrow_up.png");
+}
+
+QAbstractSpinBox:down-button {
+  background-color: transparent #19232D;
+  subcontrol-origin: border;
+  subcontrol-position: bottom right;
+  border-left: 1px solid #455364;
+  border-top: 1px solid #455364;
+  border-top-left-radius: 0;
+  border-bottom-left-radius: 0;
+  margin: 1px;
+  width: 12px;
+  margin-top: -1px;
+}
+
+QAbstractSpinBox::down-arrow, QAbstractSpinBox::down-arrow:disabled, QAbstractSpinBox::down-arrow:off {
+  image: url(":/qss_icons/dark/rc/arrow_down_disabled.png");
+  height: 8px;
+  width: 8px;
+}
+
+QAbstractSpinBox::down-arrow:hover {
+  image: url(":/qss_icons/dark/rc/arrow_down.png");
+}
+
+QAbstractSpinBox:hover {
+  border: 1px solid #346792;
+  color: #E0E1E3;
+}
+
+QAbstractSpinBox:focus {
+  border: 1px solid #1A72BB;
+}
+
+QAbstractSpinBox:selected {
+  background: #346792;
+  color: #455364;
+}
+
+/* ------------------------------------------------------------------------ */
+/* DISPLAYS --------------------------------------------------------------- */
+/* ------------------------------------------------------------------------ */
+/* QLabel -----------------------------------------------------------------
+
+https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qframe
+
+--------------------------------------------------------------------------- */
+QLabel {
+  background-color: #19232D;
+  border: 0px solid #455364;
+  padding: 0px;
+  margin: 0px;
+  color: #E0E1E3;
+}
+
+QLabel:disabled {
+  background-color: #19232D;
+  border: 0px solid #455364;
+  color: #9DA9B5;
+}
+
+/* QTextBrowser -----------------------------------------------------------
+
+https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qabstractscrollarea
+
+--------------------------------------------------------------------------- */
+QTextBrowser {
+  background-color: #19232D;
+  border: 1px solid #455364;
+  color: #E0E1E3;
+  border-radius: 4px;
+}
+
+QTextBrowser:disabled {
+  background-color: #19232D;
+  border: 1px solid #455364;
+  color: #9DA9B5;
+  border-radius: 4px;
+}
+
+QTextBrowser:hover, QTextBrowser:!hover, QTextBrowser:selected, QTextBrowser:pressed {
+  border: 1px solid #455364;
+}
+
+/* QGraphicsView ----------------------------------------------------------
+
+--------------------------------------------------------------------------- */
+QGraphicsView {
+  background-color: #19232D;
+  border: 1px solid #455364;
+  color: #E0E1E3;
+  border-radius: 4px;
+}
+
+QGraphicsView:disabled {
+  background-color: #19232D;
+  border: 1px solid #455364;
+  color: #9DA9B5;
+  border-radius: 4px;
+}
+
+QGraphicsView:hover, QGraphicsView:!hover, QGraphicsView:selected, QGraphicsView:pressed {
+  border: 1px solid #455364;
+}
+
+/* QCalendarWidget --------------------------------------------------------
+
+--------------------------------------------------------------------------- */
+QCalendarWidget {
+  border: 1px solid #455364;
+  border-radius: 4px;
+}
+
+QCalendarWidget:disabled {
+  background-color: #19232D;
+  color: #9DA9B5;
+}
+
+/* QLCDNumber -------------------------------------------------------------
+
+--------------------------------------------------------------------------- */
+QLCDNumber {
+  background-color: #19232D;
+  color: #E0E1E3;
+}
+
+QLCDNumber:disabled {
+  background-color: #19232D;
+  color: #9DA9B5;
+}
+
+/* QProgressBar -----------------------------------------------------------
+
+https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qprogressbar
+
+--------------------------------------------------------------------------- */
+QProgressBar {
+  background-color: #19232D;
+  border: 1px solid #455364;
+  color: #E0E1E3;
+  border-radius: 4px;
+  text-align: center;
+}
+
+QProgressBar:disabled {
+  background-color: #19232D;
+  border: 1px solid #455364;
+  color: #9DA9B5;
+  border-radius: 4px;
+  text-align: center;
+}
+
+QProgressBar::chunk {
+  background-color: #346792;
+  color: #19232D;
+  border-radius: 4px;
+}
+
+QProgressBar::chunk:disabled {
+  background-color: #26486B;
+  color: #9DA9B5;
+  border-radius: 4px;
+}
+
+/* ------------------------------------------------------------------------ */
+/* BUTTONS ---------------------------------------------------------------- */
+/* ------------------------------------------------------------------------ */
+/* QPushButton ------------------------------------------------------------
+
+https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qpushbutton
+
+--------------------------------------------------------------------------- */
+QPushButton {
+  background-color: #455364;
+  color: #E0E1E3;
+  border-radius: 4px;
+  padding: 2px;
+  outline: none;
+  border: none;
+}
+
+QPushButton:disabled {
+  background-color: #455364;
+  color: #9DA9B5;
+  border-radius: 4px;
+  padding: 2px;
+}
+
+QPushButton:checked {
+  background-color: #60798B;
+  border-radius: 4px;
+  padding: 2px;
+  outline: none;
+}
+
+QPushButton:checked:disabled {
+  background-color: #60798B;
+  color: #9DA9B5;
+  border-radius: 4px;
+  padding: 2px;
+  outline: none;
+}
+
+QPushButton:checked:selected {
+  background: #60798B;
+}
+
+QPushButton:hover {
+  background-color: #54687A;
+  color: #E0E1E3;
+}
+
+QPushButton:pressed {
+  background-color: #60798B;
+}
+
+QPushButton:selected {
+  background: #60798B;
+  color: #E0E1E3;
+}
+
+QPushButton::menu-indicator {
+  subcontrol-origin: padding;
+  subcontrol-position: bottom right;
+  bottom: 4px;
+}
+
+QDialogButtonBox QPushButton {
+  /* Issue #194 #248 - Special case of QPushButton inside dialogs, for better UI */
+  min-width: 80px;
+}
+
+/* QToolButton ------------------------------------------------------------
+
+https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qtoolbutton
+
+--------------------------------------------------------------------------- */
+QToolButton {
+  background-color: #455364;
+  color: #E0E1E3;
+  border-radius: 4px;
+  padding: 2px;
+  outline: none;
+  border: none;
+  /* The subcontrols below are used only in the DelayedPopup mode */
+  /* The subcontrols below are used only in the MenuButtonPopup mode */
+  /* The subcontrol below is used only in the InstantPopup or DelayedPopup mode */
+}
+
+QToolButton:disabled {
+  background-color: #455364;
+  color: #9DA9B5;
+  border-radius: 4px;
+  padding: 2px;
+}
+
+QToolButton:checked {
+  background-color: #60798B;
+  border-radius: 4px;
+  padding: 2px;
+  outline: none;
+}
+
+QToolButton:checked:disabled {
+  background-color: #60798B;
+  color: #9DA9B5;
+  border-radius: 4px;
+  padding: 2px;
+  outline: none;
+}
+
+QToolButton:checked:hover {
+  background-color: #54687A;
+  color: #E0E1E3;
+}
+
+QToolButton:checked:pressed {
+  background-color: #60798B;
+}
+
+QToolButton:checked:selected {
+  background: #60798B;
+  color: #E0E1E3;
+}
+
+QToolButton:hover {
+  background-color: #54687A;
+  color: #E0E1E3;
+}
+
+QToolButton:pressed {
+  background-color: #60798B;
+}
+
+QToolButton:selected {
+  background: #60798B;
+  color: #E0E1E3;
+}
+
+QToolButton[popupMode="0"] {
+  /* Only for DelayedPopup */
+  padding-right: 2px;
+}
+
+QToolButton[popupMode="1"] {
+  /* Only for MenuButtonPopup */
+  padding-right: 20px;
+}
+
+QToolButton[popupMode="1"]::menu-button {
+  border: none;
+}
+
+QToolButton[popupMode="1"]::menu-button:hover {
+  border: none;
+  border-left: 1px solid #455364;
+  border-radius: 0;
+}
+
+QToolButton[popupMode="2"] {
+  /* Only for InstantPopup */
+  padding-right: 2px;
+}
+
+QToolButton::menu-button {
+  padding: 2px;
+  border-radius: 4px;
+  width: 12px;
+  border: none;
+  outline: none;
+}
+
+QToolButton::menu-button:hover {
+  border: 1px solid #346792;
+}
+
+QToolButton::menu-button:checked:hover {
+  border: 1px solid #346792;
+}
+
+QToolButton::menu-indicator {
+  image: url(":/qss_icons/dark/rc/arrow_down.png");
+  height: 8px;
+  width: 8px;
+  top: 0;
+  /* Exclude a shift for better image */
+  left: -2px;
+  /* Shift it a bit */
+}
+
+QToolButton::menu-arrow {
+  image: url(":/qss_icons/dark/rc/arrow_down.png");
+  height: 8px;
+  width: 8px;
+}
+
+QToolButton::menu-arrow:hover {
+  image: url(":/qss_icons/dark/rc/arrow_down_focus.png");
+}
+
+/* QCommandLinkButton -----------------------------------------------------
+
+--------------------------------------------------------------------------- */
+QCommandLinkButton {
+  background-color: transparent;
+  border: 1px solid #455364;
+  color: #E0E1E3;
+  border-radius: 4px;
+  padding: 0px;
+  margin: 0px;
+}
+
+QCommandLinkButton:disabled {
+  background-color: transparent;
+  color: #9DA9B5;
+}
+
+/* ------------------------------------------------------------------------ */
+/* INPUTS - NO FIELDS ----------------------------------------------------- */
+/* ------------------------------------------------------------------------ */
+/* QComboBox --------------------------------------------------------------
+
+https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qcombobox
+
+--------------------------------------------------------------------------- */
+QComboBox {
+  border: 1px solid #455364;
+  border-radius: 4px;
+  selection-background-color: #346792;
+  padding-left: 4px;
+  padding-right: 4px;
+  /* padding-right = 36; 4 + 16*2 See scrollbar size */
+  /* changed to 4px to fix #239 */
+  /* Fixes #103, #111 */
+  min-height: 1.5em;
+  /* padding-top: 2px;     removed to fix #132 */
+  /* padding-bottom: 2px;  removed to fix #132 */
+  /* min-width: 75px;      removed to fix #109 */
+  /* Needed to remove indicator - fix #132 */
+}
+
+QComboBox QAbstractItemView {
+  border: 1px solid #455364;
+  border-radius: 0;
+  background-color: #19232D;
+  selection-background-color: #346792;
+}
+
+QComboBox QAbstractItemView:hover {
+  background-color: #19232D;
+  color: #E0E1E3;
+}
+
+QComboBox QAbstractItemView:selected {
+  background: #346792;
+  color: #455364;
+}
+
+QComboBox QAbstractItemView:alternate {
+  background: #19232D;
+}
+
+QComboBox:disabled {
+  background-color: #19232D;
+  color: #9DA9B5;
+}
+
+QComboBox:hover {
+  border: 1px solid #346792;
+}
+
+QComboBox:focus {
+  border: 1px solid #1A72BB;
+}
+
+QComboBox:on {
+  selection-background-color: #346792;
+}
+
+QComboBox::indicator {
+  border: none;
+  border-radius: 0;
+  background-color: transparent;
+  selection-background-color: transparent;
+  color: transparent;
+  selection-color: transparent;
+  /* Needed to remove indicator - fix #132 */
+}
+
+QComboBox::indicator:alternate {
+  background: #19232D;
+}
+
+QComboBox::item {
+  /* Remove to fix #282, #285 and MR #288*/
+  /*&:checked {
+            font-weight: bold;
+        }
+
+        &:selected {
+            border: 0px solid transparent;
+        }
+        */
+}
+
+QComboBox::item:alternate {
+  background: #19232D;
+}
+
+QComboBox::drop-down {
+  subcontrol-origin: padding;
+  subcontrol-position: top right;
+  width: 12px;
+  border-left: 1px solid #455364;
+}
+
+QComboBox::down-arrow {
+  image: url(":/qss_icons/dark/rc/arrow_down_disabled.png");
+  height: 8px;
+  width: 8px;
+}
+
+QComboBox::down-arrow:on, QComboBox::down-arrow:hover, QComboBox::down-arrow:focus {
+  image: url(":/qss_icons/dark/rc/arrow_down.png");
+}
+
+/* QSlider ----------------------------------------------------------------
+
+https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qslider
+
+--------------------------------------------------------------------------- */
+QSlider:disabled {
+  background: #19232D;
+}
+
+QSlider:focus {
+  border: none;
+}
+
+QSlider::groove:horizontal {
+  background: #455364;
+  border: 1px solid #455364;
+  height: 4px;
+  margin: 0px;
+  border-radius: 4px;
+}
+
+QSlider::groove:vertical {
+  background: #455364;
+  border: 1px solid #455364;
+  width: 4px;
+  margin: 0px;
+  border-radius: 4px;
+}
+
+QSlider::add-page:vertical {
+  background: #346792;
+  border: 1px solid #455364;
+  width: 4px;
+  margin: 0px;
+  border-radius: 4px;
+}
+
+QSlider::add-page:vertical :disabled {
+  background: #26486B;
+}
+
+QSlider::sub-page:horizontal {
+  background: #346792;
+  border: 1px solid #455364;
+  height: 4px;
+  margin: 0px;
+  border-radius: 4px;
+}
+
+QSlider::sub-page:horizontal:disabled {
+  background: #26486B;
+}
+
+QSlider::handle:horizontal {
+  background: #9DA9B5;
+  border: 1px solid #455364;
+  width: 8px;
+  height: 8px;
+  margin: -8px 0px;
+  border-radius: 4px;
+}
+
+QSlider::handle:horizontal:hover {
+  background: #346792;
+  border: 1px solid #346792;
+}
+
+QSlider::handle:horizontal:focus {
+  border: 1px solid #1A72BB;
+}
+
+QSlider::handle:vertical {
+  background: #9DA9B5;
+  border: 1px solid #455364;
+  width: 8px;
+  height: 8px;
+  margin: 0 -8px;
+  border-radius: 4px;
+}
+
+QSlider::handle:vertical:hover {
+  background: #346792;
+  border: 1px solid #346792;
+}
+
+QSlider::handle:vertical:focus {
+  border: 1px solid #1A72BB;
+}
+
+/* QLineEdit --------------------------------------------------------------
+
+https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qlineedit
+
+--------------------------------------------------------------------------- */
+QLineEdit {
+  background-color: #19232D;
+  padding-top: 2px;
+  /* This QLineEdit fix  103, 111 */
+  padding-bottom: 2px;
+  /* This QLineEdit fix  103, 111 */
+  padding-left: 4px;
+  padding-right: 4px;
+  border-style: solid;
+  border: 1px solid #455364;
+  border-radius: 4px;
+  color: #E0E1E3;
+}
+
+QLineEdit:disabled {
+  background-color: #19232D;
+  color: #9DA9B5;
+}
+
+QLineEdit:hover {
+  border: 1px solid #346792;
+  color: #E0E1E3;
+}
+
+QLineEdit:focus {
+  border: 1px solid #1A72BB;
+}
+
+QLineEdit:selected {
+  background-color: #346792;
+  color: #455364;
+}
+
+/* QTabWiget --------------------------------------------------------------
+
+https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qtabwidget-and-qtabbar
+
+--------------------------------------------------------------------------- */
+QTabWidget {
+  padding: 2px;
+  selection-background-color: #455364;
+}
+
+QTabWidget QWidget {
+  /* Fixes #189 */
+  border-radius: 4px;
+}
+
+QTabWidget::pane {
+  border: 1px solid #455364;
+  border-radius: 4px;
+  margin: 0px;
+  /* Fixes double border inside pane with pyqt5 */
+  padding: 0px;
+}
+
+QTabWidget::pane:selected {
+  background-color: #455364;
+  border: 1px solid #346792;
+}
+
+/* QTabBar ----------------------------------------------------------------
+
+https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qtabwidget-and-qtabbar
+
+--------------------------------------------------------------------------- */
+QTabBar, QDockWidget QTabBar {
+  qproperty-drawBase: 0;
+  border-radius: 4px;
+  margin: 0px;
+  padding: 2px;
+  border: 0;
+  /* left: 5px; move to the right by 5px - removed for fix */
+}
+
+QTabBar::close-button, QDockWidget QTabBar::close-button {
+  border: 0;
+  margin: 0;
+  padding: 4px;
+  image: url(":/qss_icons/dark/rc/window_close.png");
+}
+
+QTabBar::close-button:hover, QDockWidget QTabBar::close-button:hover {
+  image: url(":/qss_icons/dark/rc/window_close_focus.png");
+}
+
+QTabBar::close-button:pressed, QDockWidget QTabBar::close-button:pressed {
+  image: url(":/qss_icons/dark/rc/window_close_pressed.png");
+}
+
+QTabBar::tab, QDockWidget QTabBar::tab {
+  /* !selected and disabled ----------------------------------------- */
+  /* selected ------------------------------------------------------- */
+}
+
+QTabBar::tab:top:selected:disabled, QDockWidget QTabBar::tab:top:selected:disabled {
+  border-bottom: 3px solid #26486B;
+  color: #9DA9B5;
+  background-color: #455364;
+}
+
+QTabBar::tab:bottom:selected:disabled, QDockWidget QTabBar::tab:bottom:selected:disabled {
+  border-top: 3px solid #26486B;
+  color: #9DA9B5;
+  background-color: #455364;
+}
+
+QTabBar::tab:left:selected:disabled, QDockWidget QTabBar::tab:left:selected:disabled {
+  border-right: 3px solid #26486B;
+  color: #9DA9B5;
+  background-color: #455364;
+}
+
+QTabBar::tab:right:selected:disabled, QDockWidget QTabBar::tab:right:selected:disabled {
+  border-left: 3px solid #26486B;
+  color: #9DA9B5;
+  background-color: #455364;
+}
+
+QTabBar::tab:top:!selected:disabled, QDockWidget QTabBar::tab:top:!selected:disabled {
+  border-bottom: 3px solid #19232D;
+  color: #9DA9B5;
+  background-color: #19232D;
+}
+
+QTabBar::tab:bottom:!selected:disabled, QDockWidget QTabBar::tab:bottom:!selected:disabled {
+  border-top: 3px solid #19232D;
+  color: #9DA9B5;
+  background-color: #19232D;
+}
+
+QTabBar::tab:left:!selected:disabled, QDockWidget QTabBar::tab:left:!selected:disabled {
+  border-right: 3px solid #19232D;
+  color: #9DA9B5;
+  background-color: #19232D;
+}
+
+QTabBar::tab:right:!selected:disabled, QDockWidget QTabBar::tab:right:!selected:disabled {
+  border-left: 3px solid #19232D;
+  color: #9DA9B5;
+  background-color: #19232D;
+}
+
+QTabBar::tab:top:!selected, QDockWidget QTabBar::tab:top:!selected {
+  border-bottom: 2px solid #19232D;
+  margin-top: 2px;
+}
+
+QTabBar::tab:bottom:!selected, QDockWidget QTabBar::tab:bottom:!selected {
+  border-top: 2px solid #19232D;
+  margin-bottom: 2px;
+}
+
+QTabBar::tab:left:!selected, QDockWidget QTabBar::tab:left:!selected {
+  border-left: 2px solid #19232D;
+  margin-right: 2px;
+}
+
+QTabBar::tab:right:!selected, QDockWidget QTabBar::tab:right:!selected {
+  border-right: 2px solid #19232D;
+  margin-left: 2px;
+}
+
+QTabBar::tab:top, QDockWidget QTabBar::tab:top {
+  background-color: #455364;
+  margin-left: 2px;
+  padding-left: 4px;
+  padding-right: 4px;
+  padding-top: 2px;
+  padding-bottom: 2px;
+  min-width: 5px;
+  border-bottom: 3px solid #455364;
+  border-top-left-radius: 4px;
+  border-top-right-radius: 4px;
+}
+
+QTabBar::tab:top:selected, QDockWidget QTabBar::tab:top:selected {
+  background-color: #54687A;
+  border-bottom: 3px solid #259AE9;
+  border-top-left-radius: 4px;
+  border-top-right-radius: 4px;
+}
+
+QTabBar::tab:top:!selected:hover, QDockWidget QTabBar::tab:top:!selected:hover {
+  border: 1px solid #1A72BB;
+  border-bottom: 3px solid #1A72BB;
+  /* Fixes spyder-ide/spyder#9766 and #243 */
+  padding-left: 3px;
+  padding-right: 3px;
+}
+
+QTabBar::tab:bottom, QDockWidget QTabBar::tab:bottom {
+  border-top: 3px solid #455364;
+  background-color: #455364;
+  margin-left: 2px;
+  padding-left: 4px;
+  padding-right: 4px;
+  padding-top: 2px;
+  padding-bottom: 2px;
+  border-bottom-left-radius: 4px;
+  border-bottom-right-radius: 4px;
+  min-width: 5px;
+}
+
+QTabBar::tab:bottom:selected, QDockWidget QTabBar::tab:bottom:selected {
+  background-color: #54687A;
+  border-top: 3px solid #259AE9;
+  border-bottom-left-radius: 4px;
+  border-bottom-right-radius: 4px;
+}
+
+QTabBar::tab:bottom:!selected:hover, QDockWidget QTabBar::tab:bottom:!selected:hover {
+  border: 1px solid #1A72BB;
+  border-top: 3px solid #1A72BB;
+  /* Fixes spyder-ide/spyder#9766 and #243 */
+  padding-left: 3px;
+  padding-right: 3px;
+}
+
+QTabBar::tab:left, QDockWidget QTabBar::tab:left {
+  background-color: #455364;
+  margin-top: 2px;
+  padding-left: 2px;
+  padding-right: 2px;
+  padding-top: 4px;
+  padding-bottom: 4px;
+  border-top-left-radius: 4px;
+  border-bottom-left-radius: 4px;
+  min-height: 5px;
+}
+
+QTabBar::tab:left:selected, QDockWidget QTabBar::tab:left:selected {
+  background-color: #54687A;
+  border-right: 3px solid #259AE9;
+}
+
+QTabBar::tab:left:!selected:hover, QDockWidget QTabBar::tab:left:!selected:hover {
+  border: 1px solid #1A72BB;
+  border-right: 3px solid #1A72BB;
+  /* Fixes different behavior #271 */
+  margin-right: 0px;
+  padding-right: -1px;
+}
+
+QTabBar::tab:right, QDockWidget QTabBar::tab:right {
+  background-color: #455364;
+  margin-top: 2px;
+  padding-left: 2px;
+  padding-right: 2px;
+  padding-top: 4px;
+  padding-bottom: 4px;
+  border-top-right-radius: 4px;
+  border-bottom-right-radius: 4px;
+  min-height: 5px;
+}
+
+QTabBar::tab:right:selected, QDockWidget QTabBar::tab:right:selected {
+  background-color: #54687A;
+  border-left: 3px solid #259AE9;
+}
+
+QTabBar::tab:right:!selected:hover, QDockWidget QTabBar::tab:right:!selected:hover {
+  border: 1px solid #1A72BB;
+  border-left: 3px solid #1A72BB;
+  /* Fixes different behavior #271 */
+  margin-left: 0px;
+  padding-left: 0px;
+}
+
+QTabBar QToolButton, QDockWidget QTabBar QToolButton {
+  /* Fixes #136 */
+  background-color: #455364;
+  height: 12px;
+  width: 12px;
+}
+
+QTabBar QToolButton:pressed, QDockWidget QTabBar QToolButton:pressed {
+  background-color: #455364;
+}
+
+QTabBar QToolButton:pressed:hover, QDockWidget QTabBar QToolButton:pressed:hover {
+  border: 1px solid #346792;
+}
+
+QTabBar QToolButton::left-arrow:enabled, QDockWidget QTabBar QToolButton::left-arrow:enabled {
+  image: url(":/qss_icons/dark/rc/arrow_left.png");
+}
+
+QTabBar QToolButton::left-arrow:disabled, QDockWidget QTabBar QToolButton::left-arrow:disabled {
+  image: url(":/qss_icons/dark/rc/arrow_left_disabled.png");
+}
+
+QTabBar QToolButton::right-arrow:enabled, QDockWidget QTabBar QToolButton::right-arrow:enabled {
+  image: url(":/qss_icons/dark/rc/arrow_right.png");
+}
+
+QTabBar QToolButton::right-arrow:disabled, QDockWidget QTabBar QToolButton::right-arrow:disabled {
+  image: url(":/qss_icons/dark/rc/arrow_right_disabled.png");
+}
+
+/* QDockWiget -------------------------------------------------------------
+
+--------------------------------------------------------------------------- */
+QDockWidget {
+  outline: 1px solid #455364;
+  background-color: #19232D;
+  border: 1px solid #455364;
+  border-radius: 4px;
+  titlebar-close-icon: url(":/qss_icons/dark/rc/transparent.png");
+  titlebar-normal-icon: url(":/qss_icons/dark/rc/transparent.png");
+}
+
+QDockWidget::title {
+  /* Better size for title bar */
+  padding: 3px;
+  spacing: 4px;
+  border: none;
+  background-color: #455364;
+}
+
+QDockWidget::close-button {
+  icon-size: 12px;
+  border: none;
+  background: transparent;
+  background-image: transparent;
+  border: 0;
+  margin: 0;
+  padding: 0;
+  image: url(":/qss_icons/dark/rc/window_close.png");
+}
+
+QDockWidget::close-button:hover {
+  image: url(":/qss_icons/dark/rc/window_close_focus.png");
+}
+
+QDockWidget::close-button:pressed {
+  image: url(":/qss_icons/dark/rc/window_close_pressed.png");
+}
+
+QDockWidget::float-button {
+  icon-size: 12px;
+  border: none;
+  background: transparent;
+  background-image: transparent;
+  border: 0;
+  margin: 0;
+  padding: 0;
+  image: url(":/qss_icons/dark/rc/window_undock.png");
+}
+
+QDockWidget::float-button:hover {
+  image: url(":/qss_icons/dark/rc/window_undock_focus.png");
+}
+
+QDockWidget::float-button:pressed {
+  image: url(":/qss_icons/dark/rc/window_undock_pressed.png");
+}
+
+/* QTreeView QListView QTableView -----------------------------------------
+
+https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qtreeview
+https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qlistview
+https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qtableview
+
+--------------------------------------------------------------------------- */
+QTreeView:branch:selected, QTreeView:branch:hover {
+  background: url(":/qss_icons/dark/rc/transparent.png");
+}
+
+QTreeView:branch:has-siblings:!adjoins-item {
+  border-image: url(":/qss_icons/dark/rc/branch_line.png") 0;
+}
+
+QTreeView:branch:has-siblings:adjoins-item {
+  border-image: url(":/qss_icons/dark/rc/branch_more.png") 0;
+}
+
+QTreeView:branch:!has-children:!has-siblings:adjoins-item {
+  border-image: url(":/qss_icons/dark/rc/branch_end.png") 0;
+}
+
+QTreeView:branch:has-children:!has-siblings:closed, QTreeView:branch:closed:has-children:has-siblings {
+  border-image: none;
+  image: url(":/qss_icons/dark/rc/branch_closed.png");
+}
+
+QTreeView:branch:open:has-children:!has-siblings, QTreeView:branch:open:has-children:has-siblings {
+  border-image: none;
+  image: url(":/qss_icons/dark/rc/branch_open.png");
+}
+
+QTreeView:branch:has-children:!has-siblings:closed:hover, QTreeView:branch:closed:has-children:has-siblings:hover {
+  image: url(":/qss_icons/dark/rc/branch_closed_focus.png");
+}
+
+QTreeView:branch:open:has-children:!has-siblings:hover, QTreeView:branch:open:has-children:has-siblings:hover {
+  image: url(":/qss_icons/dark/rc/branch_open_focus.png");
+}
+
+QTreeView::indicator:checked,
+QListView::indicator:checked,
+QTableView::indicator:checked,
+QColumnView::indicator:checked {
+  image: url(":/qss_icons/dark/rc/checkbox_checked.png");
+}
+
+QTreeView::indicator:checked:hover, QTreeView::indicator:checked:focus, QTreeView::indicator:checked:pressed,
+QListView::indicator:checked:hover,
+QListView::indicator:checked:focus,
+QListView::indicator:checked:pressed,
+QTableView::indicator:checked:hover,
+QTableView::indicator:checked:focus,
+QTableView::indicator:checked:pressed,
+QColumnView::indicator:checked:hover,
+QColumnView::indicator:checked:focus,
+QColumnView::indicator:checked:pressed {
+  image: url(":/qss_icons/dark/rc/checkbox_checked_focus.png");
+}
+
+QTreeView::indicator:unchecked,
+QListView::indicator:unchecked,
+QTableView::indicator:unchecked,
+QColumnView::indicator:unchecked {
+  image: url(":/qss_icons/dark/rc/checkbox_unchecked.png");
+}
+
+QTreeView::indicator:unchecked:hover, QTreeView::indicator:unchecked:focus, QTreeView::indicator:unchecked:pressed,
+QListView::indicator:unchecked:hover,
+QListView::indicator:unchecked:focus,
+QListView::indicator:unchecked:pressed,
+QTableView::indicator:unchecked:hover,
+QTableView::indicator:unchecked:focus,
+QTableView::indicator:unchecked:pressed,
+QColumnView::indicator:unchecked:hover,
+QColumnView::indicator:unchecked:focus,
+QColumnView::indicator:unchecked:pressed {
+  image: url(":/qss_icons/dark/rc/checkbox_unchecked_focus.png");
+}
+
+QTreeView::indicator:indeterminate,
+QListView::indicator:indeterminate,
+QTableView::indicator:indeterminate,
+QColumnView::indicator:indeterminate {
+  image: url(":/qss_icons/dark/rc/checkbox_indeterminate.png");
+}
+
+QTreeView::indicator:indeterminate:hover, QTreeView::indicator:indeterminate:focus, QTreeView::indicator:indeterminate:pressed,
+QListView::indicator:indeterminate:hover,
+QListView::indicator:indeterminate:focus,
+QListView::indicator:indeterminate:pressed,
+QTableView::indicator:indeterminate:hover,
+QTableView::indicator:indeterminate:focus,
+QTableView::indicator:indeterminate:pressed,
+QColumnView::indicator:indeterminate:hover,
+QColumnView::indicator:indeterminate:focus,
+QColumnView::indicator:indeterminate:pressed {
+  image: url(":/qss_icons/dark/rc/checkbox_indeterminate_focus.png");
+}
+
+QTreeView,
+QListView,
+QTableView,
+QColumnView {
+  background-color: #19232D;
+  border: 1px solid #455364;
+  color: #E0E1E3;
+  gridline-color: #455364;
+  border-radius: 4px;
+}
+
+QTreeView:disabled,
+QListView:disabled,
+QTableView:disabled,
+QColumnView:disabled {
+  background-color: #19232D;
+  color: #9DA9B5;
+}
+
+QTreeView:selected,
+QListView:selected,
+QTableView:selected,
+QColumnView:selected {
+  background-color: #346792;
+  color: #455364;
+}
+
+QTreeView:focus,
+QListView:focus,
+QTableView:focus,
+QColumnView:focus {
+  border: 1px solid #1A72BB;
+}
+
+QTreeView::item:pressed,
+QListView::item:pressed,
+QTableView::item:pressed,
+QColumnView::item:pressed {
+  background-color: #346792;
+}
+
+QTreeView::item:selected:active,
+QListView::item:selected:active,
+QTableView::item:selected:active,
+QColumnView::item:selected:active {
+  background-color: #346792;
+}
+
+QTreeView::item:selected:!active,
+QListView::item:selected:!active,
+QTableView::item:selected:!active,
+QColumnView::item:selected:!active {
+  color: #E0E1E3;
+  background-color: #37414F;
+}
+
+QTreeView::item:!selected:hover,
+QListView::item:!selected:hover,
+QTableView::item:!selected:hover,
+QColumnView::item:!selected:hover {
+  outline: 0;
+  color: #E0E1E3;
+  background-color: #37414F;
+}
+
+QTableCornerButton::section {
+  background-color: #19232D;
+  border: 1px transparent #455364;
+  border-radius: 0px;
+}
+
+/* QHeaderView ------------------------------------------------------------
+
+https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qheaderview
+
+--------------------------------------------------------------------------- */
+QHeaderView {
+  background-color: #455364;
+  border: 0px transparent #455364;
+  padding: 0;
+  margin: 0;
+  border-radius: 0;
+}
+
+QHeaderView:disabled {
+  background-color: #455364;
+  border: 1px transparent #455364;
+}
+
+QHeaderView::section {
+  background-color: #455364;
+  color: #E0E1E3;
+  border-radius: 0;
+  text-align: left;
+  font-size: 13px;
+}
+
+QHeaderView::section::horizontal {
+  padding-top: 0;
+  padding-bottom: 0;
+  padding-left: 4px;
+  padding-right: 4px;
+  border-left: 1px solid #19232D;
+}
+
+QHeaderView::section::horizontal::first, QHeaderView::section::horizontal::only-one {
+  border-left: 1px solid #455364;
+}
+
+QHeaderView::section::horizontal:disabled {
+  color: #9DA9B5;
+}
+
+QHeaderView::section::vertical {
+  padding-top: 0;
+  padding-bottom: 0;
+  padding-left: 4px;
+  padding-right: 4px;
+  border-top: 1px solid #19232D;
+}
+
+QHeaderView::section::vertical::first, QHeaderView::section::vertical::only-one {
+  border-top: 1px solid #455364;
+}
+
+QHeaderView::section::vertical:disabled {
+  color: #9DA9B5;
+}
+
+QHeaderView::down-arrow {
+  /* Those settings (border/width/height/background-color) solve bug */
+  /* transparent arrow background and size */
+  background-color: #455364;
+  border: none;
+  height: 12px;
+  width: 12px;
+  padding-left: 2px;
+  padding-right: 2px;
+  image: url(":/qss_icons/dark/rc/arrow_down.png");
+}
+
+QHeaderView::up-arrow {
+  background-color: #455364;
+  border: none;
+  height: 12px;
+  width: 12px;
+  padding-left: 2px;
+  padding-right: 2px;
+  image: url(":/qss_icons/dark/rc/arrow_up.png");
+}
+
+/* QToolBox --------------------------------------------------------------
+
+https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qtoolbox
+
+--------------------------------------------------------------------------- */
+QToolBox {
+  padding: 0px;
+  border: 0px;
+  border: 1px solid #455364;
+}
+
+QToolBox:selected {
+  padding: 0px;
+  border: 2px solid #346792;
+}
+
+QToolBox::tab {
+  background-color: #19232D;
+  border: 1px solid #455364;
+  color: #E0E1E3;
+  border-top-left-radius: 4px;
+  border-top-right-radius: 4px;
+}
+
+QToolBox::tab:disabled {
+  color: #9DA9B5;
+}
+
+QToolBox::tab:selected {
+  background-color: #60798B;
+  border-bottom: 2px solid #346792;
+}
+
+QToolBox::tab:selected:disabled {
+  background-color: #455364;
+  border-bottom: 2px solid #26486B;
+}
+
+QToolBox::tab:!selected {
+  background-color: #455364;
+  border-bottom: 2px solid #455364;
+}
+
+QToolBox::tab:!selected:disabled {
+  background-color: #19232D;
+}
+
+QToolBox::tab:hover {
+  border-color: #1A72BB;
+  border-bottom: 2px solid #1A72BB;
+}
+
+QToolBox QScrollArea QWidget QWidget {
+  padding: 0px;
+  border: 0px;
+  background-color: #19232D;
+}
+
+/* QFrame -----------------------------------------------------------------
+
+https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qframe
+https://doc.qt.io/qt-5/qframe.html#-prop
+https://doc.qt.io/qt-5/qframe.html#details
+https://stackoverflow.com/questions/14581498/qt-stylesheet-for-hline-vline-color
+
+--------------------------------------------------------------------------- */
+/* (dot) .QFrame  fix #141, #126, #123 */
+.QFrame {
+  border-radius: 4px;
+  border: 1px solid #455364;
+  /* No frame */
+  /* HLine */
+  /* HLine */
+}
+
+.QFrame[frameShape="0"] {
+  border-radius: 4px;
+  border: 1px transparent #455364;
+}
+
+.QFrame[frameShape="4"] {
+  max-height: 2px;
+  border: none;
+  background-color: #455364;
+}
+
+.QFrame[frameShape="5"] {
+  max-width: 2px;
+  border: none;
+  background-color: #455364;
+}
+
+/* QSplitter --------------------------------------------------------------
+
+https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qsplitter
+
+--------------------------------------------------------------------------- */
+QSplitter {
+  background-color: #455364;
+  spacing: 0px;
+  padding: 0px;
+  margin: 0px;
+}
+
+QSplitter::handle {
+  background-color: #455364;
+  border: 0px solid #19232D;
+  spacing: 0px;
+  padding: 1px;
+  margin: 0px;
+}
+
+QSplitter::handle:hover {
+  background-color: #9DA9B5;
+}
+
+QSplitter::handle:horizontal {
+  width: 5px;
+  image: url(":/qss_icons/dark/rc/line_vertical.png");
+}
+
+QSplitter::handle:vertical {
+  height: 5px;
+  image: url(":/qss_icons/dark/rc/line_horizontal.png");
+}
+
+/* QDateEdit, QDateTimeEdit -----------------------------------------------
+
+--------------------------------------------------------------------------- */
+QDateEdit, QDateTimeEdit {
+  selection-background-color: #346792;
+  border-style: solid;
+  border: 1px solid #455364;
+  border-radius: 4px;
+  /* This fixes 103, 111 */
+  padding-top: 2px;
+  /* This fixes 103, 111 */
+  padding-bottom: 2px;
+  padding-left: 4px;
+  padding-right: 4px;
+  min-width: 10px;
+}
+
+QDateEdit:on, QDateTimeEdit:on {
+  selection-background-color: #346792;
+}
+
+QDateEdit::drop-down, QDateTimeEdit::drop-down {
+  subcontrol-origin: padding;
+  subcontrol-position: top right;
+  width: 12px;
+  border-left: 1px solid #455364;
+}
+
+QDateEdit::down-arrow, QDateTimeEdit::down-arrow {
+  image: url(":/qss_icons/dark/rc/arrow_down_disabled.png");
+  height: 8px;
+  width: 8px;
+}
+
+QDateEdit::down-arrow:on, QDateEdit::down-arrow:hover, QDateEdit::down-arrow:focus, QDateTimeEdit::down-arrow:on, QDateTimeEdit::down-arrow:hover, QDateTimeEdit::down-arrow:focus {
+  image: url(":/qss_icons/dark/rc/arrow_down.png");
+}
+
+QDateEdit QAbstractItemView, QDateTimeEdit QAbstractItemView {
+  background-color: #19232D;
+  border-radius: 4px;
+  border: 1px solid #455364;
+  selection-background-color: #346792;
+}
+
+/* QAbstractView ----------------------------------------------------------
+
+--------------------------------------------------------------------------- */
+QAbstractView:hover {
+  border: 1px solid #346792;
+  color: #E0E1E3;
+}
+
+QAbstractView:selected {
+  background: #346792;
+  color: #455364;
+}
+
+/* PlotWidget -------------------------------------------------------------
+
+--------------------------------------------------------------------------- */
+PlotWidget {
+  /* Fix cut labels in plots #134 */
+  padding: 0px;
+}
diff --git a/3rdParty/qdarkstyle/dark/darkstyle_rc.py b/3rdParty/qdarkstyle/dark/darkstyle_rc.py
index 7eaf96d61f..8b382a74a8 100644
--- a/3rdParty/qdarkstyle/dark/darkstyle_rc.py
+++ b/3rdParty/qdarkstyle/dark/darkstyle_rc.py
@@ -1,11382 +1,11382 @@
-# -*- coding: utf-8 -*-
-
-# Resource object code
-#
-# Created by: The Resource Compiler for PyQt5 (Qt v5.15.2)
-#
-# WARNING! All changes made in this file will be lost!
-
-from qtpy import QtCore
-
-qt_resource_data = b"\
-\x00\x00\x1a\xa6\
-\x00\
-\x00\xdc\x92\x78\x9c\xd5\x3d\x6b\x6f\xdb\x46\xb6\xdf\x0b\xf4\x3f\
-\xd0\x31\xb0\x68\xbb\x96\x6d\xc9\xb2\x63\xab\xe8\x07\x3b\x8f\x6e\
-\x80\x34\x4d\x6a\x77\x8b\x8b\xc5\x85\x41\x49\x94\xc5\x0d\x45\x2a\
-\x24\x15\xc7\x2d\xee\x7f\xbf\x33\x43\xce\x70\x1e\x67\x5e\x7c\xd8\
-\xa9\x81\xa6\xb6\x34\x73\xde\x73\xce\x3c\xce\x9c\x39\xfa\x21\x18\
-\xf5\xf7\xf3\xed\x37\xdf\x7e\x13\xa0\x9f\x3f\x2e\x7f\x7b\xf7\xe6\
-\xdd\xcf\x7b\xc1\xeb\x38\x89\x82\x45\x1e\x85\x65\xb4\x0c\xb6\x79\
-\x76\x97\x87\x9b\x4d\x58\xc6\x8b\x30\x49\x1e\x0e\x83\xcb\x24\x09\
-\x16\xeb\x30\xbd\x8b\x8a\x60\x13\x2e\xa3\x20\x4e\x83\x72\x1d\x17\
-\xc1\x0a\xf7\xbb\x8f\xd1\xd7\xf3\x28\x48\xb2\xa2\xdc\xa3\xa0\x5f\
-\xd4\xc0\xe6\x0f\xa8\x65\x14\x7c\x2a\x8b\xb0\x28\x82\x45\xb6\xd9\
-\xa2\x2e\x79\xf0\xf9\xf8\xf0\xe4\xf0\x98\x36\xbe\x41\x2d\x96\xd1\
-\x2a\x4e\xe3\x32\xce\xd2\x22\x08\xf3\x1a\x45\x14\x3c\xfb\xb4\x0c\
-\xf3\x8f\x45\xf9\x90\x44\x87\x9f\x8a\xe2\xf0\x96\xfc\x5a\x1c\x16\
-\x8b\xa2\x78\x16\x6c\xb2\xe5\x2e\x89\x30\x98\x1e\xa5\x13\xfc\x70\
-\xf4\xed\x37\x47\x3f\x04\x6f\xe3\xbb\x75\x19\x5c\x63\x7c\xc1\x28\
-\xf8\xf0\x12\xd1\x41\xfe\xb8\x5e\x47\x51\xe9\xa1\x8e\x1a\x1e\xa6\
-\xf2\x3a\x8a\x82\x0f\x65\xb0\xcc\x16\xbb\x4d\x94\x96\x21\x66\x77\
-\x56\x49\x61\x14\xac\xcb\x72\x5b\xcc\x8e\x8e\xd0\xb7\x87\x9f\xca\
-\xc3\x38\x3b\xfa\x54\x8e\x4e\x8f\x2a\x86\x31\xce\xc3\x75\xb9\x49\
-\x1c\xdb\x8e\xf2\x68\x15\xe5\x51\xba\x88\xbc\x7a\x45\x5f\xc2\xcd\
-\x16\xcb\xb7\xea\x34\x88\x5c\x7f\x8b\x0a\x24\xbf\x28\x89\xb0\x08\
-\x8a\x4e\x76\x8d\x29\x24\xe0\xca\x38\xbd\x0b\xa2\xcf\x51\xfe\x80\
-\xec\x12\xfd\xba\x8e\x92\x6d\x11\x94\x59\xb0\x4b\xe3\xd5\x43\x50\
-\x71\x18\x84\x8b\x3c\x43\x56\xb8\x8c\x57\x44\x36\x65\x90\x6d\xa3\
-\x3c\x24\x7d\x8b\x87\xa2\x8c\x36\xc5\x10\x2c\xff\x10\xfc\x85\xc5\
-\xbf\x0d\x97\x4b\x84\x69\x16\x1c\x6f\xbf\xfc\x88\x3f\xd8\x84\xf9\
-\x5d\x9c\x36\x7f\xcf\xb3\x7c\x19\xe5\xf2\xdf\x23\x42\xfb\x2c\x48\
-\xb3\x34\xe2\x3f\x8e\x37\xe1\x1d\xff\x71\xb6\x2b\x93\x38\x45\x9f\
-\x1c\xa3\x3f\xff\x0f\xf3\x81\x44\x5d\x6c\xa3\x45\xbc\x8a\x17\x41\
-\x4e\x64\xbe\xca\xf2\x46\xee\x71\x5a\xc4\x68\x28\x7f\xb8\xc9\xb2\
-\xe4\x2a\xcc\x09\xa9\xcd\x1f\x15\xcd\x32\x89\x12\x0f\x14\xcd\x87\
-\x3f\xe2\xe5\x9d\xd7\x98\x80\x7f\x86\x90\x3e\xa5\x8d\xf0\x33\x0f\
-\x17\x1f\xef\xf2\x6c\x97\x2e\x47\x8b\x2c\xc9\x90\xb0\xf7\xc7\x17\
-\x93\x93\xc9\x4b\x59\x01\x41\x91\x25\xf1\x32\xd8\x9f\x9e\x9e\x9e\
-\x9c\x4d\x21\xde\x83\x80\x42\x78\x75\xfc\x6a\xfc\xea\x84\x7c\x54\
-\x20\xe9\x2e\xf0\xa0\x1e\x01\x98\x4e\xa6\x67\xcf\x2f\x26\x52\x3b\
-\x05\x08\x91\x69\x4d\xf4\x6c\x19\x17\xe1\x3c\x41\x6e\xd4\x81\x7a\
-\xfa\xd1\xc5\xcb\xcb\x8b\xab\x53\x3b\x39\x93\xb3\xe9\xf9\xd9\x95\
-\x86\x1c\x06\x44\x20\x67\x16\xa3\x31\x32\xab\x5a\x1b\x88\x62\x8c\
-\x02\x9d\xd7\x19\x1a\xa4\xb3\x3d\x2b\x8c\xf1\xe5\xf3\xc9\xd5\x15\
-\x6f\x63\xbf\x84\x71\xfa\x47\x9c\x2e\xb3\xfb\xce\x2e\xe3\x06\xc7\
-\xae\x70\xf9\xdf\x5d\x81\xc6\x01\x8e\x32\xc5\x36\x89\xcb\x12\xc5\
-\xa5\x3a\xea\x20\x07\xf9\x11\xc5\x35\x4c\xf7\x01\x1a\x62\x65\xf0\
-\x89\xb6\xf8\xf6\x1b\x4f\x27\xba\xbf\x40\x58\xb2\x4d\xfc\x27\xb2\
-\x9d\xd1\xa7\x0d\x62\xe2\x9e\x30\x31\x88\xad\x37\x32\x9a\x21\x35\
-\x6d\x43\xe4\xdc\xd0\x90\xd7\xc9\x98\x33\x6e\xc0\xf4\x39\xd3\x2a\
-\xb6\xe1\x42\x30\x7d\x36\x16\x26\x8d\x1f\x80\x91\x57\x0a\xd7\x92\
-\x70\x76\xfc\xfc\xe2\xfc\x4a\x4b\x82\x60\x04\x5a\x04\x79\xfc\x67\
-\x86\x82\x69\x52\x61\x41\x6a\x2b\xd7\xb3\xe0\x54\xf0\xb2\xa3\x32\
-\xdb\x52\x6a\xd9\x67\xf3\xac\x44\x9a\x69\x3e\xae\x5d\xea\x2e\x4f\
-\xbe\x7b\x36\x3b\x42\xb3\x8d\xdb\x78\x81\xa6\x23\x47\x78\x06\x72\
-\x94\x2f\x8e\x4a\xe4\x1c\xe7\x61\x7e\xcb\x70\xdf\x22\xd6\xc8\x24\
-\xe9\x70\x9b\xde\x3d\xfb\xde\x42\x28\x6d\x5c\x91\xb9\x8e\xf0\xf4\
-\x42\xa1\x33\x89\x56\xa5\x42\x68\x5e\x35\x6d\x4f\x67\x23\x23\x91\
-\x52\x3c\xae\xb0\xcb\xbf\x89\xb7\x5d\x9d\x37\x06\xd7\x69\x68\x60\
-\xaa\xcb\x78\x3b\xc8\xb8\xa0\x3c\x5a\x3d\x16\xe8\xd5\x91\x94\xde\
-\xac\x82\x87\x6c\x87\xc2\xe8\x06\x99\x33\x71\x11\x95\xb9\xe2\xc9\
-\x32\x9a\x43\x94\x0f\x07\x1c\x58\x34\xdd\xc8\xd0\xec\xe3\x3e\xcb\
-\x3f\xe2\xa9\x45\x96\x06\x95\x31\x14\x84\x98\xc6\xd2\x59\xec\x26\
-\x93\x22\x02\xb9\x1e\x58\x07\x24\x54\xaf\xe2\x2f\x78\xc6\x3c\xcf\
-\x50\x8f\x2f\x41\x2d\x9f\x1a\x86\x12\x8d\x1a\x18\x19\x1e\xad\x98\
-\x22\xdc\x7f\x7f\xfc\x7c\x8a\x66\x7e\x9b\xf0\x21\x48\x23\xe4\x6f\
-\xf1\x94\xa8\x88\x82\xdf\x7e\xbe\xba\x24\x90\x98\x19\x5c\xa3\xd9\
-\xe8\xae\xc0\xb1\xbf\x93\xbc\x3b\x9b\x41\x41\xe8\x40\xe6\x3b\x88\
-\x21\x34\x5c\xfe\xc5\x6b\x62\x0c\x46\x7c\x24\x96\xd7\xf1\x17\x34\
-\x6f\xbc\xde\x3e\x60\x5d\xef\x5f\x8c\x27\xc7\x07\xe4\x7f\x63\xaa\
-\x4a\xa6\xf4\x19\xdc\x75\x7f\x72\x7c\x7a\x10\xdc\xaf\x51\xf0\x0b\
-\x98\x03\xa8\xd0\x16\x41\x3d\x40\xb1\x91\xe0\xe0\x58\x34\x1a\x69\
-\x08\xad\xe2\xa6\x48\x6e\x6d\x38\x52\xcb\xc0\x6a\xe6\xcc\x9f\x82\
-\x9c\x03\x73\x09\xee\xa3\xde\x6c\x74\xb9\xc3\xb1\x24\x28\xf3\x30\
-\x45\x71\x05\x2f\x51\x1e\xb0\x55\xa2\xf5\x22\x5a\x2d\x46\x24\x0a\
-\x57\xdd\x6b\x3b\x46\x7e\xef\xe4\x18\xe2\xf6\x6d\x38\x8f\x6a\x67\
-\xea\xa9\xa9\x06\x77\xc9\x7b\xc2\x17\xeb\x68\xf1\xf1\x0a\xb1\xd1\
-\xcd\xd2\x3a\x0f\x81\x05\xa6\x03\x89\x73\x90\x11\xc0\x98\xf4\x98\
-\x52\xf2\x33\x5c\x3a\x15\x98\xd6\x3a\x65\xeb\x0e\xe6\xcd\x6a\xb5\
-\x57\x21\x77\x2a\xce\x18\x58\xcc\x9d\x72\x13\x07\x4a\xd2\x6c\x85\
-\xd6\xc5\x85\xc1\xd4\x19\xed\xbd\xcc\x8f\x25\xe4\x33\xe4\xa3\xd1\
-\xe8\x64\x13\x26\x30\x20\xd3\xa8\x3d\xa6\x7c\xd5\xb3\x8d\x31\xc8\
-\x4f\x03\x72\xb6\x4b\x89\x56\x29\xa9\xb6\x10\x4e\x4d\xe0\x96\xf5\
-\x93\xa6\x18\x46\x1c\xd5\xa4\xeb\x20\xb0\xb4\x22\xe2\xb6\xb6\xda\
-\xa2\xb5\x63\xc1\x44\x2c\x87\x2e\x7f\x46\x6e\x09\x5a\x2f\x76\x44\
-\x35\xb7\x40\x49\x01\x38\x60\x6d\xa7\x26\x77\x25\xb9\xa8\xc8\x45\
-\x41\x3d\xab\xc7\x57\x39\x1d\x55\xd3\x42\x31\xe8\xb7\x08\x05\x87\
-\x4d\x9c\x86\x28\x96\xfa\xa1\x13\xfa\xfa\xe2\x6a\xcb\xa3\x00\xa4\
-\x35\xa7\x46\x23\x10\x5b\x9a\x4c\x4a\x6c\x29\x18\x4d\x4b\x86\x00\
-\x4b\xc1\x41\xf4\x67\xe4\x80\xb7\x5f\x41\x10\xc5\x81\x60\x3b\x54\
-\x10\x65\x4c\x12\x01\xae\xd0\xca\x6a\x74\x5f\x47\x86\x79\x96\x2c\
-\x75\x33\x2c\x65\xc1\x3d\xca\xc3\x65\xbc\x2b\x94\x30\xa9\xac\x00\
-\x49\x2c\x3d\x83\x97\xaf\x7c\xe8\xa1\x84\xcd\x66\x65\x5c\x26\xf5\
-\x30\x29\x76\x73\xa4\xd0\x32\xcf\x92\x11\x5a\x07\x92\x0d\xbd\x0a\
-\xc4\x8f\xd2\xb7\xdb\xac\x20\x3b\xf0\x68\x86\x94\x6d\x03\x1c\xf9\
-\x48\x8b\x2a\x04\xca\x91\x5c\x0c\x8c\xf4\xd3\x7a\xa9\x2a\x37\x26\
-\xf4\x8f\x60\x4a\x5d\xe2\x2e\xb4\x8a\x6f\xa6\x97\xee\xa1\x19\xc0\
-\x2a\x87\xe6\x1e\x42\x9c\x34\xc6\x8d\x48\xd9\xa8\x35\xb7\xa2\x5e\
-\xc0\xdc\xea\x51\x62\xb5\x99\x84\xa1\x62\x35\x84\xb5\x27\xbd\xb9\
-\x6b\xcd\x45\x67\x2e\x1a\x7b\xc4\xe0\x6d\x42\x3f\x48\xf0\xc6\x41\
-\xe0\x37\xe4\xd6\xb2\xab\x1d\xf2\x4f\x69\x97\x38\xd0\x39\x08\x60\
-\xf7\x9a\xcd\x09\x1d\x83\xc4\x01\x9e\xcf\x9e\xd6\x53\x1e\xab\x27\
-\xc0\x64\xe4\xd5\x58\x65\x03\x1c\x99\xd6\x35\x16\xdf\xb6\xe3\xf1\
-\x83\x3f\x75\x81\xc7\x69\x8d\x49\x98\x9a\xf3\x2a\x68\xb5\x6a\x15\
-\x82\x1c\x9f\xac\x5c\x75\x59\x3a\xc2\x88\x7d\x57\x8f\xc4\xec\xb5\
-\xe1\xc8\x86\x83\x79\x37\x6b\x43\xea\xe2\xac\x0d\xcd\x7e\x4e\x15\
-\xa0\x27\x83\xa0\xe3\xb3\x12\xe5\xe7\xfd\x64\x94\x9a\x30\xa5\xc1\
-\x6a\x8e\x54\x6d\x05\xe0\xa5\x5f\x47\xed\x3a\xea\x76\x58\xcd\xb6\
-\xd0\x2b\xac\xd5\xae\x04\xe8\x43\xdc\x2f\x51\xba\xeb\xbc\x5b\xde\
-\x43\x88\xdb\x20\x3a\x86\xda\x2d\xa7\x3c\xea\xbc\x31\x74\x3a\x3e\
-\x91\x42\x93\x79\x83\xd9\xf5\xec\x5c\x3e\x09\xac\x08\x83\x82\x19\
-\x87\x4f\x3a\x87\xa6\x9d\xf8\x0d\x75\xed\xa6\x30\xc7\x11\xef\x9f\
-\x05\x18\xd2\x49\xb8\xd4\xc1\x0c\xdd\x9c\x6b\xe0\x2e\x81\x8a\x10\
-\x61\x14\xaa\x74\xb4\xc6\x05\x2a\x4a\x5a\x7e\x1e\x6b\xe6\x28\x52\
-\x8a\x08\x26\xb8\x87\x1c\xb6\x5e\xc6\xcb\x60\x83\x45\x34\x45\x58\
-\xde\x5a\x89\x72\x99\x3f\xc0\x09\xe5\xf3\xe9\x78\xfa\xba\xd5\x40\
-\x51\x52\x01\xd8\x4c\x44\x8f\x8e\x3b\x97\xd7\x64\xa8\x54\x90\xa1\
-\xa1\x04\xd1\xcc\xdb\x64\x30\xc1\xff\x90\x5f\xce\xf9\x83\xa1\x22\
-\xca\x3f\x47\x64\x0e\x17\x91\xa3\x25\xc6\x27\x3d\x6b\x15\x4f\x4f\
-\xf1\x40\xe7\x46\x15\x27\x63\x99\x40\x69\x9c\x02\x0a\x70\x15\xa4\
-\x3a\xd8\x9c\x7b\x2e\xe8\x12\x41\xdc\x3f\x19\x1f\x83\xb3\x41\x65\
-\xba\x28\xc0\x12\x27\xa4\x22\xc0\x73\x09\x9e\x32\xfd\x9c\x34\x32\
-\x47\x41\x11\x0d\x95\x45\xb2\x2b\xe2\xcf\x38\xe3\x92\x82\xfd\x29\
-\x20\xf1\x8f\x1c\xe9\x91\x51\xc5\x7d\xf7\x5d\x81\x73\x18\x2f\x89\
-\x62\xc8\xda\x12\x9b\x57\xf9\x8a\x42\xf9\xbe\xd6\x12\x82\x0e\x43\
-\x26\xf1\x35\xa8\xd6\x64\xed\x80\x83\xa2\x98\x09\xbc\xf4\x7e\xdc\
-\xe2\x88\x8d\x4d\xae\x5c\xdb\xd3\x59\x96\x6b\xfb\x47\xd9\xe0\x71\
-\x25\x66\xa8\xad\x1e\x33\xfe\x3e\x0f\x68\x9c\x30\x39\x2a\xd5\x4f\
-\xa5\x8f\xb8\x03\xe4\x46\xc8\x30\x07\x39\x66\xdc\x43\x1d\xe9\x78\
-\x60\x1d\xf4\x70\xc7\x87\x0e\x37\xb3\x81\x0f\x7c\x7c\xfa\x0c\x74\
-\xf4\xa3\xd0\xd0\xda\x17\x9b\x37\x2f\x1c\xd0\x68\xc5\xe2\xe3\x80\
-\xfd\x9d\xef\x30\xbb\x18\x2e\x74\x0d\xb2\x91\xa1\x47\xfc\x98\x7b\
-\x19\x56\x2a\x1c\x94\xed\xae\xea\xa7\xdb\xd4\xb0\xd3\xf4\x18\xfb\
-\x1a\x35\x19\xe4\x0c\x6f\x14\xe6\x79\x76\x2f\x5e\x03\x38\x05\x8f\
-\x00\xc7\xae\x79\xa9\x04\xe2\x2d\x81\xce\xf0\x02\x13\x53\x71\xe6\
-\xca\x16\x90\x97\xf3\x02\x4d\xf7\x17\xe5\x1b\x34\x07\xff\x77\x1c\
-\xb5\xcd\x02\xef\x9e\x9d\x85\xb3\xdd\x86\x3a\x58\x56\x98\x24\xf2\
-\x0f\x13\xe4\x7b\xb1\xe7\x05\x57\x7c\xc6\x5d\x95\x16\xa7\xd0\x95\
-\x29\x28\x94\x7c\x78\x8b\x0c\xee\xd5\x32\x2e\xa5\x5d\x06\x8d\x9a\
-\xae\x17\x79\x96\x24\x97\x79\x14\xb6\x52\x54\x67\x35\x85\x35\x1d\
-\x05\xa1\x03\x2d\x11\xc3\x41\x15\xc6\xb1\xab\x5d\x17\xaa\x37\x4d\
-\xbc\x72\x03\x90\x74\xab\x8c\xde\xd3\x0b\x39\xc1\x92\x5b\xd3\xd5\
-\x29\xca\x28\x52\x8f\xaa\x91\x85\x93\x2b\x49\xbf\xc9\x74\x5a\xf7\
-\xd3\x2c\xe9\x55\x5e\x24\xaf\x03\xa7\xd0\x91\xec\xe1\x6e\xda\xa6\
-\x3f\xc3\xe4\xfc\x36\xb4\xd1\xe3\x25\xff\xfc\x41\x89\xd3\xaf\x20\
-\x4f\x9a\xd0\x31\x58\x9e\x34\xe5\x52\xb9\x5e\xc1\xdc\xb5\x98\x8d\
-\x42\x6c\x90\x7c\xc8\x7e\x69\x6f\xe9\x56\x45\x70\xf4\x89\xb7\x2a\
-\xcc\xc3\x8e\x46\x16\x99\x74\x81\x6c\xd3\x0e\xb6\x9b\xeb\x6c\x88\
-\x9b\xad\xc3\x74\x99\x44\x8a\x10\xdd\x6e\xc2\x78\xc9\x0c\x0f\xf8\
-\x9a\xbf\x73\x47\x5a\x2c\x77\x73\xb8\x4b\x11\x94\x22\xf5\xb3\x5e\
-\xe8\x30\x6f\xe3\x4b\xfb\x69\x2a\x24\xab\x09\x38\xcb\xb6\xf1\x9a\
-\xcd\x46\x9a\x97\xa2\x29\x29\x83\x89\x56\xa4\xce\x4a\x46\x5b\xc9\
-\xa2\xc0\x32\x22\x13\x4c\xd9\x72\xb9\xad\x6a\xfe\x3f\x9e\x6c\x8f\
-\x69\xa0\x3a\x0f\xb5\xce\x07\x35\x09\x6b\x04\x9c\xfc\xb5\x92\xed\
-\xe6\xc2\x27\x5b\x51\x58\x9a\xb1\x94\x0f\x6f\xae\x9f\x9c\x59\x71\
-\xc0\x50\x95\x9e\xd4\xea\x3c\x69\xab\xd2\x65\x76\x9f\xf6\xa7\xd1\
-\xea\x1c\xa9\x07\x2e\x8d\x0a\x65\x8d\x5a\xa9\x13\x73\xfc\x64\x8c\
-\xa2\xc6\xf6\x31\xca\x29\xd5\x5f\xa1\x78\x7d\xd7\x9f\x42\x59\x3e\
-\x69\x57\x2e\x21\x85\x42\xcd\x5a\xa9\x14\x53\xf9\xd4\xac\x0e\x34\
-\x3e\x77\xdb\xfe\x94\x59\x66\xdb\x1e\x18\x34\x6a\xb2\xdb\xd0\xdc\
-\x6d\x9f\x86\xc7\xdd\xb6\xda\x39\xe1\x0c\x51\xe4\x0f\xfb\x0c\xa5\
-\x89\x9a\x8e\x20\xde\xf1\x03\xe0\x53\xf1\x68\xa1\xeb\xa6\x45\x7a\
-\xd8\xd8\x2b\x6e\xb1\x70\x75\xb4\x63\xdd\x48\x0d\x5a\x40\x87\x29\
-\x67\xb0\xdd\xe8\x26\x57\x97\xa3\x2f\x25\xd9\x91\xe8\xb6\xe4\xe9\
-\xba\x16\xa3\x55\x36\x46\x55\xc5\x80\x41\x8a\x88\x34\xbc\x3a\xac\
-\x73\xb4\xfb\x40\xea\x4a\xcb\x30\x1d\xae\x14\x48\xf1\xfa\x4d\x25\
-\x59\x2f\x5d\xa1\x07\xf8\xd2\xb5\x88\x1b\xab\xf8\x7d\x12\xc6\x69\
-\x77\x3d\x0f\xa2\x12\x91\xb6\x47\xd6\x8b\x80\xdc\x4f\x39\x62\xd7\
-\xae\x1a\xba\x8e\xff\x8c\x7e\xce\x3b\x17\x10\xe8\xbe\x21\x82\xe8\
-\xb8\xcb\x07\x2a\x20\xc0\x98\x54\x84\x24\x27\x76\x59\xf3\x2e\x6c\
-\xe1\xab\x2a\x0f\x72\x8b\x59\x51\xb3\x0e\xaf\xcb\x10\xef\xdf\x77\
-\xad\xb7\x33\xd4\xdd\x7a\x8e\xb6\xbf\xc0\x0d\x4a\x97\xad\x0d\x38\
-\x67\x50\xa8\x57\xf1\x35\x24\x5e\xd6\x55\x36\x06\xab\x57\xe1\x98\
-\x78\x59\x3b\x10\x9a\x75\x07\xa7\x5b\x32\x3d\xd0\x94\x2f\xf8\xca\
-\x1a\xcb\x9f\xe7\xcb\xba\xd4\xb4\x48\x7b\xa5\x5c\x81\x83\xe7\x13\
-\xe5\x8a\xbd\x4a\xa8\x08\x4b\xb7\x2f\x26\x6f\xd0\xb9\x56\x3a\xc1\
-\x5b\xde\xda\x22\x27\x0a\x56\xb8\x10\x4b\x3b\xa4\x9a\x0a\x30\x0c\
-\xa5\xb5\x4e\x8d\x37\x5a\x7b\x55\x17\x08\x7b\x4f\x3c\x5b\x4b\xdf\
-\x10\xd4\x24\xb9\x6b\xff\x53\x79\x4b\xbb\xa1\x58\x73\x3b\x07\xaf\
-\xc9\x68\xcb\x10\xe9\x02\x66\x9b\x7d\x16\xf5\x70\x6a\x1b\xa7\x1d\
-\xee\xa8\x0e\x7b\x92\x54\xd3\xe6\x30\x9f\x30\x7b\x53\xb8\x92\xcd\
-\x4d\x55\xb7\x11\x0f\xdd\xf1\xf1\xc9\x41\x30\x1e\x8f\xc5\xd3\x24\
-\xf1\x92\xa5\x53\x0f\xb9\x90\x92\x78\x3e\x2c\x5f\x62\x92\xae\x88\
-\xea\x4f\xbb\xb8\xad\x64\x7c\xf2\x5c\x1f\x6d\x2d\xe9\x81\xd6\xf8\
-\xf8\x82\xcb\x07\x94\xc4\x87\xd7\x49\xb0\xc5\x51\x41\x0a\xb9\xa3\
-\x7c\xb1\x2b\x75\xb5\x57\x91\x68\x5c\x28\x72\x7b\x72\x35\x43\xf5\
-\xe1\xb8\x69\x0f\x1f\x70\xda\x6a\x23\x04\x9c\xc0\x62\x12\x3a\x56\
-\x41\x40\x0d\xd8\xe1\x86\x66\xc9\x2b\xa5\x71\x8f\xc6\xc0\xe1\x2f\
-\x15\x26\x5b\x75\x1e\x28\x63\x88\x5b\x91\xd2\x08\x61\x6c\x94\xad\
-\x56\x6e\x79\x2a\x2e\x7b\x16\x52\xb2\xeb\xb9\x0b\x0b\xfc\xd6\xbc\
-\xf7\x56\x02\x0c\x9b\x2c\xba\x1f\xcd\xda\x2a\x8d\xb5\x32\x38\x32\
-\xb4\x9f\xd2\xda\xaa\x7b\xe0\x46\x53\x6b\x76\x30\x20\x3b\xe2\xf6\
-\x37\x4c\xe6\xc6\x35\xf3\x34\x38\xdb\x26\xb6\x8f\xc9\x09\x5b\x3d\
-\x9e\x46\x27\x6c\x2d\xc3\xf0\xf9\x33\x26\xc3\xed\x17\xfb\x79\x7f\
-\x0d\xcf\x6b\x11\x29\x77\xee\xb8\x8c\xec\x35\x96\x22\x78\x2f\xdf\
-\x5c\xbf\x7f\x7b\xf9\x3f\xd7\x5d\x01\x53\x78\xbd\x10\xc7\xc1\xab\
-\xab\x57\x75\x86\xd7\x79\x19\xb3\xca\xc3\xcd\x20\x15\x94\xf9\xfa\
-\x5c\xbd\xd4\x5d\x15\x5d\x89\x61\x92\x58\x19\x28\x41\xef\x75\x85\
-\xd9\xed\xde\x8e\x9a\xfc\x82\xb7\x52\xae\xd0\x98\x2d\xa2\x4e\xab\
-\xd2\xbf\x4b\xca\x13\xcf\xee\x10\x93\x54\xc3\x81\x3b\x87\xba\x95\
-\x66\xcd\x34\x28\x57\xd7\xad\x34\xd0\xe3\x0b\xfe\xb3\x3d\xe8\x43\
-\xea\x1d\xa5\x8f\xc1\x44\x53\xed\x9e\x5f\x55\x5e\x27\xdc\xae\xe3\
-\x45\xd1\x21\x03\x12\xff\x0c\x62\x18\x02\x6d\x8f\x6c\x19\x3c\xee\
-\x27\x33\x0d\x81\x88\xa6\x46\x08\xf7\xe1\x1e\xf8\x29\x67\x1d\xc2\
-\xe7\xfe\xe6\xf1\x22\x4c\xa2\x14\x4d\x24\x3a\x6e\x10\x0e\x62\x1e\
-\x12\x6d\x56\xa6\x8c\xa2\x16\x81\xf5\x50\x08\x90\xc4\xe4\x17\x2f\
-\xdf\xed\x36\xf3\x6e\x6e\x7c\x20\xe9\x35\xb4\x79\xb0\x28\x87\x44\
-\x0a\xa3\x27\x79\xbd\xc7\x2f\x45\x20\x13\xed\xb8\x1d\xdb\x39\xf0\
-\x6d\x6b\x3a\x86\xda\x8e\xe5\xf9\x7c\x34\xbf\x16\x04\x25\x8a\x14\
-\xa3\x30\x89\xef\xd0\x64\x67\x81\x16\x8e\x64\x51\x58\x1f\xe1\x34\
-\x14\x3d\x81\xb7\x73\x26\x6d\xb6\x58\xef\xd2\x8f\x2e\x69\x70\x5a\
-\x5a\xc1\xd1\xaf\xe2\xb0\x4b\x81\xab\x77\xef\xe5\xd5\x07\x98\xfc\
-\x5f\xfd\x7e\x73\xf3\xeb\xbb\xce\x6b\x93\xe1\x16\x27\xef\x77\xc5\
-\xba\x7b\xf9\xa6\x1e\x06\x36\xa2\x63\xc0\xf2\x4d\x1c\x9b\x3a\xab\
-\x69\x35\x70\x95\x25\x8b\x63\xd9\xa1\x86\x1e\xbb\x39\xb7\x1a\xb6\
-\x60\xdd\x7e\x0e\xab\x78\xb5\xcb\x21\x91\xd6\x9f\x75\x1d\x4e\x3b\
-\xc7\x40\x4d\x02\x6f\x8e\x3d\xe8\x31\x6c\x68\x30\x4a\x94\xce\xe6\
-\xb4\xdf\xd3\xe9\xd9\xf9\xf3\x4b\x53\x84\xe6\x40\xd9\xca\x0c\xe8\
-\x89\x70\xa1\xdc\x85\x82\x19\xae\x95\x31\x92\xaa\x0d\x00\x1b\x96\
-\xb5\x8c\xbd\x76\x2c\xd5\xd2\x95\x2f\xe3\x30\xc9\xee\x2a\xd4\xa4\
-\xc6\xb3\x3c\x3a\x71\x19\xfe\xa2\xd8\x45\x38\x48\x4c\xf1\x75\x96\
-\xf3\x60\x14\x5c\xe3\xdc\x9b\x30\x09\x16\x61\x11\x05\xd9\x4a\xe8\
-\x55\xbf\x70\xb3\x24\x80\x8b\xaa\x5e\x79\x5d\x61\xfc\xf7\x37\xf5\
-\x11\x06\x9f\xae\x2e\x55\x2c\x69\x8e\xb2\x9e\xd6\x09\x92\x43\xb4\
-\xe1\x9c\x20\xc7\xe6\x13\x3b\xc1\xfa\xb4\x29\xe2\x8c\xa8\x40\x0a\
-\x4b\xb2\x7b\xf2\x22\xd8\x0e\x8f\x86\x2c\x4d\x1e\xe8\x2b\x2d\x2f\
-\xa3\x24\x7c\x88\x96\xef\xb3\xed\x6e\x8b\x9f\x02\x8b\x9a\xda\x13\
-\x1e\x50\x48\x25\x1d\xc2\xbf\x1d\x50\x0d\x27\x2e\x54\x30\x6f\xd2\
-\xa2\x0c\xd3\xb2\x82\x81\x0c\x0d\x26\x4e\x3e\x24\x7d\x4c\x3f\xcf\
-\x61\x7d\x34\x3f\xaf\xe2\x7c\x5a\x3f\x0f\xd0\xd3\xd5\x65\x03\x20\
-\x3d\x5d\x37\x00\xa1\x93\x0b\xe7\xe0\xf5\xc8\x5c\x7b\xa6\x7a\x62\
-\xe6\x3f\x5b\x3c\x96\x7e\x41\x43\xe9\xa7\x67\xc7\xcf\xfe\x97\x05\
-\x85\x5f\xf1\x28\x5c\xc9\x43\x4e\x3c\xa1\x16\x5e\xd0\x31\x01\x1e\
-\x43\x80\x65\x17\x01\xc3\x3e\x76\x01\x5e\x07\x55\xe1\xb0\x10\x9a\
-\x0a\xba\x01\x80\x8e\x80\xe4\x87\xe2\x1c\x8e\x05\xf9\xa3\x3c\x13\
-\xfa\x09\x24\x1c\xc1\xf1\x79\x48\x1d\x90\x84\x26\x5d\x4c\x19\xec\
-\xf2\xe1\xa2\x63\xa1\x51\x0d\x6e\xd7\x73\x34\x33\x10\xc8\x9d\xf8\
-\x03\x93\x26\x5b\x9d\x6e\xa1\x80\x27\x95\x41\x40\x8e\x60\x8f\x69\
-\xb8\x25\xb5\x95\x50\x70\x0a\x83\x62\x1d\xaf\x4a\x7e\x8e\x44\x90\
-\xd7\x1a\xad\x8c\x68\xc4\x65\x85\x5c\x93\xe6\x71\x89\x7a\xce\xd1\
-\xbf\x60\x70\xab\x78\xe2\x0a\x09\xf4\xcf\x8f\x09\x67\xbb\x43\x57\
-\x5d\x61\xfb\x17\xd9\x66\x13\xa6\xcb\xb7\x71\xfa\xb1\xcb\xac\x70\
-\x98\xad\x55\x85\x36\x8d\x97\xd6\x95\x21\xec\xba\x55\x65\x79\xdc\
-\xb2\xde\xb3\x95\xa9\xb4\xce\x05\x64\x72\xb5\x5b\x91\xbd\x8a\x13\
-\x2f\x34\xde\xbd\xff\xfd\xe6\x1a\xad\x2f\xde\xfd\x1a\xbc\x7e\xf3\
-\xea\xed\xcb\x96\x9b\x35\x83\xed\xd0\xbc\xc0\x55\x28\xbe\x82\x67\
-\x16\x06\xad\x86\xc1\x98\xd4\xb9\x53\xfb\xb5\x68\xd7\x17\x39\xbd\
-\x52\xd6\x90\x02\x84\x6f\x82\x9f\x82\x93\xb3\x1f\x83\x69\xf0\xcf\
-\x60\x7c\xf6\xc3\x24\xc0\xcf\xfc\xb2\xfb\xf9\x01\x4e\x4c\x6f\x16\
-\x14\xd5\x3b\xca\x24\x89\x0d\x97\x40\x64\xc5\x19\x4e\x2e\x9a\x36\
-\x75\x66\x2d\xc9\xb6\xdb\x6f\xd2\xed\xf8\xfb\xbf\xe3\xc3\xd3\x68\
-\x23\x13\xc3\x32\xf7\xf0\xa3\xca\x72\xba\xdc\xfe\xf8\x64\xd2\xa0\
-\x80\x52\xf7\x2c\x5d\xb8\xa5\xf2\xf3\x53\x8a\x44\xed\x72\xcc\x31\
-\xf2\x2e\x8a\x96\xd5\x77\x75\x59\x8a\x26\xbe\x8d\x44\x0c\xcc\x43\
-\x54\x0a\xd7\x14\x42\xf1\x32\x81\x3a\x73\xc9\xb8\x1f\xee\x66\x1e\
-\x36\xe2\x2c\xd3\x6c\xfb\xc1\x8c\x01\x74\x97\xbc\x1a\x13\x5c\x56\
-\x53\x06\x00\x2c\x15\x5b\xa0\x50\x7a\x79\x6e\x8b\xc2\xf2\x9a\x27\
-\xb1\x5e\x5e\x29\x4a\xac\x17\x8d\x87\x6d\xb4\x6d\xaf\xff\xee\x68\
-\x76\x72\x2c\x33\x11\xa3\x89\x7b\x7a\x10\x9a\x06\x1d\x86\x20\x5f\
-\x8d\xaa\x8d\xad\x70\xa5\x61\x9b\xa7\x03\x99\xb7\x3b\x9f\x1c\xe0\
-\x7f\x4f\x03\x34\x1f\x08\x7e\xf9\x0d\xff\x7e\x4e\xbd\xc6\x3f\xc4\
-\xed\x89\xe6\x07\xbe\xb4\x50\xfd\x10\xec\xf4\x8f\x7f\x48\xa3\xa6\
-\xf9\x51\x53\x7c\x64\x91\x31\x70\xf4\x57\x50\x34\xb8\x0e\x6c\x2b\
-\xa9\x2c\xf3\x6c\x3b\xc2\xd3\xcc\xf6\xbb\xa9\x62\xb6\x31\xbc\x16\
-\x32\xac\xfa\x14\x8a\x58\x92\xe2\x23\xa5\x49\x42\xa8\xd1\x10\x3d\
-\x08\xe0\x6f\xd8\xab\x56\xd0\x97\x9c\x3f\x68\x9b\x56\x49\xae\x55\
-\x21\x11\x75\x3d\xf5\x1f\xf5\x71\x87\x8d\xd0\x31\xcc\xed\x2c\x02\
-\x5a\xeb\xc2\x81\x12\x3b\x55\x07\xdb\x7b\x21\x75\xb3\x19\x02\x83\
-\x14\x65\xbc\x18\x6c\xb9\xea\xc5\x7d\x4b\xad\x68\x0a\xae\x26\x8c\
-\x47\xc3\x12\x3d\xfa\xcb\xc4\xee\xd4\xd4\x36\xdc\x81\x18\xe5\xea\
-\xb3\x39\x9a\x3f\x3e\x39\x26\xbb\x60\x07\xe7\x22\x10\xa7\xbb\xe0\
-\xee\x5c\xf5\xa0\x72\x80\xa2\x16\x7c\x59\x4b\x36\xc1\x8f\xdc\x18\
-\x75\x45\xbd\xa1\xec\x1d\x29\x93\xa3\x73\xb5\xa6\x83\x89\x53\xc7\
-\x52\x4e\x56\xf9\x4b\x73\x1e\x3d\x78\xbf\x3a\x42\x22\x18\x83\xcd\
-\xf7\x2d\xc7\x63\x22\x49\x4f\x29\x9a\x6b\x36\x75\x94\x61\xab\x4a\
-\x4c\x24\x17\x8d\x56\x5b\xec\xe6\xfc\x3b\x87\x24\xbc\x8f\x1a\x21\
-\x3a\x86\x49\x6a\x13\x4a\x4a\x9a\x17\x14\xc6\xeb\x69\x0d\x24\x3c\
-\xbf\x74\xbd\xa7\xe6\xd7\xdb\xe7\x36\x1b\x91\xed\xac\xd2\xae\x83\
-\x79\x6b\x36\x2f\x74\x69\x7c\x35\xb5\x7d\xac\xc7\x18\xac\xae\x97\
-\x49\x18\x20\x2f\x57\xc1\x7a\xe9\x96\xb9\xa6\x5c\x31\x35\xfd\xf5\
-\x26\x9c\xff\x11\x77\xba\x19\x4f\x7e\xba\x1f\xd9\x87\xf3\xaa\x16\
-\xc8\x08\x79\x01\xf2\xe7\x60\x37\xc5\x31\xc7\x86\x0b\xf7\xc6\x25\
-\xaf\x7c\x3b\x9b\xc1\x12\x9e\x61\xe3\x36\xa4\xce\xe9\xde\x8e\x29\
-\x3f\x9e\x42\x99\xcd\xb6\x61\x1a\x69\x2d\xc1\xa1\xa4\xa1\x34\x05\
-\x60\x84\x2c\xb3\x1d\x32\xfb\xba\x1b\x4d\xf3\x20\xc8\xee\xe3\x72\
-\x1d\x6c\x1f\x3e\x95\xa7\xf0\x1b\xf4\x20\x89\x76\xe3\x33\x4f\x15\
-\xc5\x08\x50\xdb\x61\x0f\x25\x0a\xfe\x66\x76\x88\x38\x46\xcb\xb4\
-\x97\xd9\xe2\x23\xb5\xa2\x5a\x0c\x44\xaa\x38\x49\x77\x8b\x82\xe1\
-\xc3\x68\x99\x87\xf7\x57\x61\x11\x49\x77\x0b\x6d\xda\xd7\xd6\x92\
-\x60\x67\x59\x95\x83\x26\x5b\x93\x74\xb7\x01\x67\x66\x54\x5b\xb4\
-\xf3\x07\xfc\x4d\x30\x62\x1b\x96\xf8\xa4\x0b\xbb\x7b\xee\xe4\x8a\
-\x90\x3b\x9b\x2d\x92\xac\x88\xea\x73\x3d\x90\x23\xb1\x89\x68\xe1\
-\xe2\x75\xc8\x63\x91\x74\xca\x9b\x63\x0d\x10\x82\x45\xbe\x60\x0f\
-\x50\xc0\xd6\xc8\x36\x52\x7d\x4e\xc4\x78\x1a\xc0\x9a\xe5\x20\x82\
-\x3a\x4b\xc0\x85\x16\xaf\x97\x08\x04\x6a\xea\x9e\x1a\x7a\x90\x95\
-\x6b\xd0\xa3\x6f\x98\x4b\xdb\x63\x83\x1e\x6f\x41\xb1\x48\xea\x67\
-\xf6\x04\x12\x03\xd4\x65\x00\x29\x2c\xcc\xf0\x3c\x87\x82\xe6\xef\
-\xba\x6a\x18\x83\xdb\xf3\xb6\xc9\xa6\x3f\x27\x8d\xeb\xb2\x24\x45\
-\xbb\x84\x0c\x46\x40\x0d\xde\x87\x66\x5d\x17\x81\x6c\x32\xe1\x1b\
-\x88\x66\xe2\x32\x7c\x28\x86\x3b\x08\xf4\xd6\x33\xc2\x81\x28\xae\
-\xa0\xfb\x90\xac\xe9\x21\xd0\x5c\xb9\xce\x81\x48\xc6\x0a\xdc\xf3\
-\x35\x65\xb5\x83\xcd\x96\x2d\x8f\xd1\x5a\x6b\x4a\x03\x86\xe9\x45\
-\xb5\xb6\x8f\xd1\x9a\xfb\xa4\x9a\x68\xd1\x8b\x66\x4d\x0f\x8b\x3d\
-\xf7\x49\x73\x05\xdd\x8b\x68\x5d\x17\xb3\x45\xf7\x49\xb4\x60\xa0\
-\xae\x86\x0c\xda\xef\x04\x24\x50\x7d\xee\xde\x6e\xa2\x1e\x96\xa9\
-\x1a\xa4\x91\x0c\x71\xd9\x6c\x33\x3b\x67\x6b\x03\xd4\x65\x24\x03\
-\xca\x26\xd3\x5b\x85\xbb\xfd\x40\xc6\x6e\x24\x84\x7f\xd7\x19\xb4\
-\x0d\xb3\x45\xb8\xac\x32\xc0\x17\xa4\xbd\x36\x22\xc0\xed\x12\xdd\
-\x46\x88\x54\x69\xc7\xec\x67\x1d\x8a\x86\x48\xbb\x21\xf8\xfb\xea\
-\x51\x19\xcd\x82\x11\x9c\xc4\x38\xce\x75\x5c\xb2\x5b\x0d\x13\xa0\
-\xd3\x8b\xcb\x57\x17\xc3\x31\xd3\x78\x29\xd3\x1c\x5d\xd3\xda\xbe\
-\x8b\x62\x8c\x87\x4d\x23\xb6\x72\x2e\xb6\x0f\xb8\x35\x5a\x2f\x1f\
-\x55\xbf\xee\x5f\x3c\x3f\x3b\x23\x53\xe0\xfd\xc9\xf4\x04\xdc\xf1\
-\x3a\x81\x0d\xed\xc4\xe8\x97\xac\xde\xc8\x18\x14\xcd\xcf\xd3\x3e\
-\xdd\x38\x31\x94\xc1\x99\x82\x4d\x20\x43\x01\x86\x9b\x75\x32\xed\
-\x3e\x87\xf6\x18\x0e\xca\xc4\x5a\x19\x0b\xdd\x18\x75\x98\x56\xd9\
-\x06\x05\xdc\xc1\x63\x5c\x28\xd3\xad\xa7\x19\x14\xb8\x93\x25\x30\
-\x7a\x84\x05\xd0\x56\xe1\x31\x20\x04\x4d\xc9\xda\xe5\x21\x20\xde\
-\xca\x72\x76\x88\x26\x23\xe1\x53\xd6\x74\xa6\x2e\x2c\xa9\x5c\x97\
-\x5e\x1e\x66\x0e\xac\xc7\xa8\xa1\x5b\xa7\xd0\x36\xfb\x84\x9a\x7b\
-\x58\x27\x30\xb5\x06\xec\x73\x19\xaf\x56\x11\xa9\x1c\x36\x8f\xd6\
-\xe1\xe7\x38\xcb\x71\xd5\x4d\x96\x15\x28\xcc\x8e\xe4\xd7\xb8\xeb\
-\x8f\x85\x92\x5b\xca\x5c\xc8\x36\x57\xfa\xaa\x4d\x13\x76\xb1\xae\
-\x6e\xd8\x66\x9c\xe2\xe2\xd9\x79\x95\xed\x61\x9e\xea\xd2\x5b\x6f\
-\x9d\xf2\xca\xc7\x66\x9e\x60\x7b\x0f\xfb\x54\x17\x51\x6d\xcd\xb3\
-\x82\x24\x5b\x27\xff\x29\xcf\x2d\x7f\xf9\x12\xde\x53\x56\xae\x2d\
-\x72\xa7\x14\x27\x67\x0e\x05\x69\xdd\x1e\x1e\x04\xd0\x19\xb7\x38\
-\xa1\x86\xf6\xd1\x63\x43\x65\xd0\xb3\xbe\xb9\xf3\x1d\x14\x15\x0e\
-\x71\x6b\x75\x86\x55\x94\xea\x97\xe3\xb6\x4e\x3e\x89\x59\xc2\xbb\
-\x1b\x4e\x94\x19\x77\x0a\xac\xbd\x7c\x69\xd3\x3d\x99\x09\xa1\xe3\
-\x1e\xd0\xf4\x90\x1f\xd0\xcb\x87\x48\xa0\xe4\xad\x15\x8d\x87\x08\
-\xa1\x6e\xde\xe4\x69\x84\x88\x8f\xcc\x2a\xfc\x9d\xcf\x6e\x07\x39\
-\xdc\xe2\x64\x43\x38\x66\xd7\xcb\x34\xc7\x99\xfd\xbf\xfd\x58\xc6\
-\x65\x12\xcd\xc3\x7c\x54\x9d\xa0\x60\x01\x9b\xaa\x35\x37\x39\xad\
-\x5c\x6a\x26\x83\x91\x66\xf9\x26\x4c\xda\x00\xa9\x6f\xea\x33\x71\
-\xa0\x28\x83\x81\x32\x0f\x7c\x55\xdd\x1c\x23\x37\x1e\xf0\xf9\x5a\
-\xf5\x2d\xbe\x04\x21\x9d\xc6\xd2\xe9\x33\xab\x38\x2e\x3f\x7c\xd0\
-\x64\x57\x5b\xfd\x26\x4f\x8e\x7a\x2e\x87\x99\x1a\x61\x82\x4c\xf7\
-\x05\x4d\x05\xfd\x39\x02\x6a\x4b\xd7\x5d\xa2\x32\x1e\xfd\x55\x7f\
-\x76\x38\xf8\xd3\xb1\xd9\xeb\x99\x9e\x16\x49\xdf\x87\x75\x3c\xa2\
-\x55\x92\x85\xe5\xdf\x5f\x69\x08\x19\x62\xca\x91\xcf\x16\x5a\xab\
-\xe0\x5b\xd5\x26\x60\x69\xa3\xb6\x1a\x0f\xa8\x37\x92\xdc\x90\x47\
-\x11\x7d\x11\xb8\x28\xab\xdf\x6e\xb0\x57\xf7\xab\x49\xd8\x3d\xb9\
-\x01\xd1\xf1\x19\xa1\xec\x9c\xe0\x56\x94\x3d\x80\x29\xb1\x04\x2a\
-\x38\x43\xa4\x57\xd4\x32\x9f\xcd\x91\x19\x2f\xd6\x42\x3d\x49\xe9\
-\x2b\x4d\x16\x63\x0b\x3f\xaf\x40\x0e\x0b\x34\x28\xe7\x28\xf4\xdd\
-\x15\xb3\xbd\x70\xf9\xdf\x2c\x4e\x8b\x51\x73\xcf\xa3\x8e\x5d\x36\
-\x33\xab\xa0\xdd\xe2\x08\x5a\x21\xe4\xef\x9d\x9b\x50\x76\xc5\xb8\
-\xc9\x72\x3b\xc6\x3d\x8c\x72\xb1\x8e\x93\x25\x92\x48\xf5\x57\x6f\
-\x04\x44\xe9\xd2\x89\x63\x0d\x7a\xe2\x4f\x21\x95\x57\x5f\x88\x5d\
-\xf9\x9e\x10\xad\xce\x0f\xc7\xd7\xb4\x57\x38\x2c\x16\x92\x6d\x6b\
-\xcc\x30\x07\x00\xe9\x6a\x8f\xbe\x09\xc7\x18\x1c\x0c\xdb\x28\xf3\
-\xa6\xd0\xab\xa7\xe4\x7d\xdc\xbc\x20\x68\x38\xe3\xc6\x4f\xdc\x5a\
-\xaa\xcd\x42\x6f\x41\x33\x06\x68\xa6\x98\xbb\x4d\x56\xdf\xee\x3a\
-\x20\xe9\x9f\x55\x00\xd1\x7c\xcd\xa2\x8a\xe6\xfb\x17\x59\xb2\xdb\
-\xa4\x9a\x06\x6e\x0c\x90\xc6\xf3\xec\xcb\x6d\xdd\xcb\x9d\x7e\x55\
-\xba\x40\x1b\x22\x13\x4b\x1b\xba\x9f\x60\x96\x47\x8d\xce\xd2\xa8\
-\xc2\x67\x69\xc4\x21\x34\x49\xb8\xc1\x68\x6c\xc5\x50\x1a\x5b\x71\
-\x38\x8d\x5a\x6b\x90\x9a\x9b\x31\xac\xe6\x66\x5e\xf3\x1f\xd9\x16\
-\x9c\x2d\x7a\x97\x5a\x6c\x5a\x68\x00\xca\x49\x68\x01\xf3\xc4\x9a\
-\x78\x72\xc3\xfa\xf9\x70\x62\xb4\xee\xa6\x95\xc9\xbe\x9b\x56\x16\
-\x0b\x97\x91\x5a\x9b\x19\xad\x1c\x44\x6b\x96\xb9\xc5\xd2\x01\xc4\
-\x96\x76\x56\x6b\x07\x50\xdb\x1a\x5a\x2c\x5e\x41\xde\xd6\x4a\x9c\
-\xad\x1e\xfd\x16\xa1\xd5\xfe\x26\xc6\x77\x60\x75\xda\x50\x1a\x81\
-\x92\x53\x5a\xc1\x3c\x0a\xcd\x3c\xf9\x13\xfa\xfa\x72\x67\x1c\x0d\
-\x62\x4b\xd3\x88\x10\x5b\x5a\x46\x05\x44\x80\x53\x53\xe3\xe8\xd0\
-\x92\x60\xd7\x8b\x65\x94\x68\x88\x70\x68\x6b\x1d\x2d\x1a\x32\x5c\
-\x1a\x5b\x46\x0d\x48\x48\x17\xcb\x32\x8e\x1e\x5e\x29\x82\x6c\x44\
-\x02\x5d\xae\xf3\x78\x17\xee\xb9\xcb\xe3\x25\x5e\x72\x19\xde\x10\
-\x04\x4f\xef\xa9\x19\xb3\xad\x62\xde\xb0\xf8\x0f\x1b\x45\xf3\x9f\
-\x72\x62\xef\xe1\xb6\x12\xa3\x86\xad\x7f\x79\x6a\xf8\x0f\x1b\x6a\
-\xf8\x4f\x39\x6a\xba\x5f\x38\x6a\xa8\x51\x47\x1c\x60\xfe\x90\x25\
-\xfa\xbd\xa9\xdb\x78\x14\x5c\x7e\x00\x76\x1f\xd2\x37\xfc\xe8\x93\
-\xbe\x12\x06\x04\xf7\x9d\x5d\x20\x20\x39\xec\x8c\x31\x5c\x94\xf1\
-\x67\x39\x1e\x68\x5a\xc8\xe4\x01\x4d\x14\x32\xa5\x36\x5d\xc9\xdd\
-\xb3\xd3\xbb\xe7\x40\xf0\x9e\x0b\xc5\x7b\x3c\xc9\x50\x71\x2d\x80\
-\x8b\xe7\xd3\xf1\xf4\xb5\x8e\x0b\xf9\x24\x58\x65\x02\x68\x21\xf3\
-\x00\x34\x51\x58\x00\x8f\x90\xd9\x31\xc8\xb1\xce\xe9\x38\x30\x84\
-\x89\x79\x91\xe5\x69\x94\xd3\x93\xa6\xa2\xba\xb0\xe6\xeb\x05\x85\
-\x17\xd6\x0c\x55\x81\xc4\x22\xbf\xff\x8a\x42\xf4\x6d\xc7\xd7\x54\
-\x7a\xd8\xcc\x5c\x13\x3a\x06\xdb\x3f\xe4\xd8\xb4\x9e\x46\x73\x7b\
-\xe3\x06\xb1\x4a\x7b\xe4\xe2\x06\xba\xb6\xae\x64\x43\x87\x57\xe5\
-\x5b\xbb\x9e\x15\xf0\x56\x33\xf2\xaa\x73\x57\xb1\xc5\xbf\x7a\x80\
-\xcf\x84\xc9\x87\xa4\x2a\x4d\x7d\x56\xc1\xa7\x7f\x01\xb4\xcc\x94\
-\xaa\x02\x42\xd2\x8b\x70\xf8\xc0\x52\x5e\xc4\x4f\x7d\x2e\x21\x2b\
-\x35\x60\xa4\x8c\x76\x0b\x85\xb3\xd9\x2a\xce\x0b\x9c\x1c\x64\x6d\
-\x88\x0b\x21\x8f\x32\xf1\xb2\xa7\xb5\x04\x8d\x0d\xaa\x68\x20\x9a\
-\x19\x01\x08\x44\xac\x38\x30\xa8\x8c\xe5\x17\x15\x5d\x44\xcc\x6a\
-\x02\x98\x05\xdc\x34\x03\xc5\xab\x7d\xcb\xd1\x05\xb3\xb7\x6c\xe5\
-\x2a\x41\xe4\xea\x7c\x56\x44\x41\x11\x95\x25\xd9\xaa\xfd\xae\xa2\
-\xeb\x88\x64\xd1\x1c\x55\xc9\x35\x47\xf2\xb8\xfb\x1e\x53\x8b\x22\
-\xe0\x7c\x77\xd7\x5c\xa0\xe3\x47\x74\x85\xa2\xe9\x46\xb2\x30\xb9\
-\x0a\x7a\x6e\x7e\x82\xed\x11\x5b\x72\x7c\x3c\x53\xd4\x5a\xbf\xdc\
-\xc8\x4b\x92\xbe\x43\xea\xe3\xf7\x9e\x94\x1f\xf9\xf9\x53\x56\x1b\
-\xff\xe9\xab\x4f\x92\xd2\xf8\x03\x15\x9f\xa4\x2c\xf2\x3e\x44\x2e\
-\x47\xa3\xfe\xad\x1f\x90\x35\x3c\x69\xe1\xa1\x05\x3c\xd1\x27\x6c\
-\xd5\x80\x9a\xeb\xac\xc3\x3c\x47\xd4\xf1\x22\x04\x47\xa5\x9b\xbb\
-\x11\x7a\x58\x97\x67\x6a\x89\x7a\xe0\x4a\x95\x41\x72\xda\x0b\x91\
-\x0e\x03\x12\x42\x25\x55\x13\x12\x50\xc9\x57\x8d\x5a\xa2\xd0\x18\
-\x94\x88\xc2\x63\x99\x0d\x80\x51\x32\x07\x9b\x5e\xda\x2b\x27\x13\
-\xfd\x8a\xb5\x1e\x42\x1f\xae\x49\x31\xd4\xcb\x3c\x0a\x59\x69\x09\
-\xa1\xc4\x84\x7d\x78\xd9\xd8\xc0\x4e\xe9\x35\x7e\xca\xf4\xeb\x79\
-\x52\x55\x03\xa3\xfa\xba\xea\x36\xc2\x45\x11\x9c\x5a\x2e\xa3\x32\
-\x8c\x93\xa2\x69\x5b\x94\x48\x24\x58\x5b\xab\x24\xbb\x3f\x5c\x64\
-\x9b\xa3\x4f\xbb\xa8\xc0\x61\xbe\x38\x1a\x4f\x4f\xcf\xc7\xd3\x8b\
-\x73\x0c\x86\x23\x79\x95\xe5\xa3\x35\xd9\x03\xfa\xdc\xec\x04\x0d\
-\xe1\x3b\x91\x32\xbe\x5b\x66\xe5\xf7\xc1\x61\xad\x93\xba\xd0\xe4\
-\x74\x8c\xeb\xd9\x4e\xce\xc8\xbf\xd5\xbd\x0a\xda\x82\x37\x39\xd8\
-\xdf\xe8\x1c\x18\xae\x71\x99\x05\x44\x54\xcd\x94\xe2\x5f\xb8\xb0\
-\x0c\xf4\x27\x31\x96\x1a\xe9\x7f\x48\xa7\xeb\x75\xb8\xe5\x5f\x14\
-\x70\x20\xc2\xb0\x04\x81\x40\x4f\x29\xe8\x4d\xf8\x85\x25\x9c\x3b\
-\xa4\x35\x69\x12\xde\x20\x14\xa7\x3c\x8a\x7a\x4e\xd0\x1e\x03\x29\
-\x89\xb8\x4d\x62\x92\xcc\xd7\xcd\x1e\x3a\x0f\xa6\xa2\xa6\x63\x90\
-\x18\xcf\x98\x74\xf0\xcb\x2c\x55\x51\x29\x48\x62\xaa\x79\x4e\x31\
-\xd0\x82\x60\xbe\xcb\x6f\xf5\x12\xaa\x9e\x8e\xb1\x07\x1d\x96\x92\
-\xc5\x52\x68\x06\x7a\x8b\xeb\x58\xe9\xf2\xa8\x6d\x62\x89\xdd\xcf\
-\x2d\x5d\x8c\x48\x73\x65\x05\x97\xb8\x9a\x13\x2f\x6c\x38\xa2\x6a\
-\xc8\x05\x12\x8f\xc3\x92\x94\xa0\x3a\xa8\x7e\xbd\x89\x37\xad\xea\
-\xae\x0d\x93\x78\xac\xa1\x8d\x48\xc2\xb5\xb4\x79\xaf\x25\xc9\x68\
-\xc9\xb4\x15\xb9\x6b\xa1\xa9\x94\x06\x96\x68\x33\xf6\x90\x2f\x5a\
-\x7a\x2d\xc5\xb9\xeb\x94\x63\xde\xe6\xa9\xf4\xaa\xe2\xb2\xbc\x00\
-\x5b\x55\x84\x66\xe0\x9a\x22\xbe\x32\xd8\xaf\xa6\xbc\x2f\x47\x2b\
-\x5b\xb8\xab\xc4\x3e\x76\xe5\x5f\x88\xaa\x46\x39\xca\x37\xec\xd6\
-\x0b\xf4\x25\x3d\x67\xd5\xb1\x04\x28\x5d\x07\x1b\x6c\xd0\x43\x65\
-\x61\x46\xb8\x5a\x7e\x5d\x1e\xd0\xba\x7a\xf7\x0e\x0b\x3b\xcf\xe9\
-\x92\x87\xc5\x63\xef\x48\xe9\xfa\x1a\xdf\x1b\xe7\x69\xeb\x5c\xbf\
-\x50\x00\xd6\xa5\xe8\x3e\x92\xda\xfb\x24\x2b\x3b\xbe\xc0\x4d\x7e\
-\x86\x90\x1a\x47\x1b\xdd\xc8\x7b\x8d\x26\xe7\x8b\x5d\x19\x24\xe1\
-\x3c\x4a\x0a\xfc\xa0\xdd\x16\x35\x22\x37\xe9\xa6\xda\x32\x7a\xff\
-\x0f\x59\xf9\x35\x4a\
-\x00\x00\x04\x5f\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x04\x11\x49\x44\x41\x54\x78\x9c\xed\
-\x9b\x4d\x68\x1d\x55\x1c\xc5\x7f\x67\xf2\x90\x14\x95\xa2\xa8\x1b\
-\x51\x57\xa2\xb8\x11\x69\xc9\x47\x45\x49\x45\xab\x55\x0c\xcd\x7b\
-\xa5\xae\x44\x2a\x8a\x76\x21\x2a\x28\x82\x0a\xb1\xb4\x62\x05\xc1\
-\x85\x88\x16\x04\x71\x61\xd1\x90\x2f\x03\x5a\x8d\x4a\x2b\x48\x9b\
-\x3c\x6d\x69\x41\x5c\x14\x44\x5c\x28\xa2\x60\x54\xb0\x46\x9b\x37\
-\xc7\xc5\x6b\x64\x66\x5e\xc1\x44\xe6\xe3\x5a\xdf\x59\x9e\x03\x73\
-\xff\xf7\x77\xef\xdc\xb9\x77\xe6\x3d\xe8\xaa\xab\xae\xfe\xcf\x52\
-\xd5\x05\xac\x54\x7d\x13\x1e\x55\xe4\xa7\x65\x2b\x76\xb4\xbb\xd9\
-\xd0\x33\x79\x5c\xf7\x3f\x01\xa0\x7f\xc2\x1b\x89\xfc\x31\x3e\x5d\
-\xaf\x1d\xcf\x37\x7a\x7a\xf2\xb8\x76\x94\xc7\x45\x8a\x54\xdf\xb8\
-\xd7\x23\xcf\xfc\xdd\x79\x00\x29\xb7\xba\x83\x06\x30\x38\xee\xab\
-\x15\x79\x3f\x70\x5e\xd2\x37\xc4\x79\xb5\x11\x2c\x80\x75\x63\xbe\
-\x3c\x8e\x3c\x0b\x5c\x94\xcd\x04\xce\xab\x9d\x20\x01\xdc\x30\xe6\
-\x8b\x6b\x35\xcf\x02\x97\x15\xdd\x56\xad\xe8\x06\x56\xab\xeb\xdf\
-\xf1\xf9\x7f\xc6\x7e\x0f\x73\x55\x19\xed\x05\x35\x03\x86\x5e\x77\
-\xef\x52\xcb\xd3\x98\xf5\x49\xdf\x39\x4e\xf9\xac\x82\x01\x30\x74\
-\xc0\xb5\xc5\xb5\xde\x07\xdc\x94\x0a\x84\x95\xe3\xa2\x97\x55\x18\
-\x00\x6c\xfd\xbe\x10\xef\x35\x8c\x64\x13\x5c\x5c\xe7\x21\x10\x00\
-\xfd\x53\xf1\xf3\xa0\x7b\x53\xa6\x30\x05\x8e\xfc\xb2\x2a\x07\x30\
-\x30\xe9\x27\x40\x8f\x27\x3d\xb7\xef\xfa\xc2\x3b\x0f\x15\x03\x18\
-\x98\xf4\xfd\xc6\x7b\xb2\xbe\x14\xb5\xca\xaa\xa1\x32\x00\xfd\x53\
-\x6e\x18\xbf\x9a\x32\x0d\x36\x31\x2e\x6c\xd1\xef\x50\x25\x00\x06\
-\xc6\x7d\x33\xf6\xbe\x6c\xfb\x16\xb1\x54\xdc\x23\xef\x4c\x2a\x1d\
-\xc0\xe0\x94\xfb\x2c\x4f\x03\xe7\x24\x7d\x9b\x38\xcf\x2d\xee\x4a\
-\x55\x2a\x80\xfe\x69\x5f\x13\xdb\xfb\x11\xe7\xa6\x02\x97\x3f\xf2\
-\xcb\x2a\x0d\xc0\x86\x09\x5f\x41\xec\x59\xe0\xc2\x74\xa2\x98\x8a\
-\x3a\x0f\x25\x9d\x05\x36\x4c\xfa\x92\x16\xfe\x10\xb8\x34\x9d\x28\
-\xa6\xcc\x15\xef\x0c\x2a\x7c\x06\xac\x1b\xf3\xda\x25\xf9\x7d\xe0\
-\xca\x54\x20\xbb\xea\xce\x43\xc1\x33\x60\x70\xcc\x6b\xe2\x9a\x67\
-\x30\xd7\xa5\x02\x61\xac\x52\x36\x3a\xff\xa4\xc2\x66\xc0\xd0\x01\
-\xd7\xe2\x9a\xdf\x02\x6e\x4c\xfa\x2e\x61\x7f\xbf\x1a\x15\x03\x60\
-\xd4\xd1\xe2\x42\xfc\x1a\x30\x9c\xf2\x0b\x3e\xd9\xfd\x1b\xe5\x0f\
-\xc0\xd6\xc0\xb5\xf1\x0b\x46\xf7\x64\x93\x90\x46\x7e\x59\xb9\x03\
-\x18\x98\xe2\x49\xa3\x47\x53\x66\x7b\xad\x0b\xae\xf3\x90\x33\x80\
-\xbe\x49\x3f\x68\xbc\xbb\x23\x90\x4a\x3b\xdc\xac\x56\xb9\x01\xe8\
-\x9b\x6c\xed\x11\x7e\x25\xeb\x3b\xc0\x69\x9f\x54\x8e\x33\x20\xf3\
-\x42\x83\xf6\xfb\xfb\xaa\xb6\xb8\x2b\x55\x6e\x00\x04\x9d\xd3\x3c\
-\xe8\xae\xb7\x95\x1f\x00\xe9\x61\x32\x5d\x96\x88\x42\xff\xfc\x98\
-\x1b\x80\xb9\x11\x8d\x81\x1e\xea\x4c\x9c\xcb\x47\xcc\xa2\x94\xeb\
-\x53\x60\xbe\xae\x97\x41\xa3\x9d\x49\xb8\x10\x72\xdf\x07\xcc\x8f\
-\xb0\xcb\xf2\x4b\x69\x57\x20\xa2\x10\xef\x86\xfc\x77\x82\x92\x9b\
-\xc7\xa2\x47\x8c\xdf\x4c\xf9\x46\xb8\xfa\xb7\xd0\x59\x15\x53\xd0\
-\x4e\xc5\xad\x1f\xa3\xed\xc0\xbb\x99\x44\x28\x2c\x08\x85\x15\x73\
-\xe4\x01\x9d\x5a\xaa\x69\x1b\xf0\x69\x2a\x68\xff\xd0\x21\x18\x08\
-\x85\x16\x72\x64\x58\x27\xff\x90\xee\x04\x8e\x67\x22\x19\x07\x01\
-\xa1\xf0\x22\x8e\x8d\xe8\xe7\x78\x49\xb7\x19\xbe\x4a\xfa\x42\x32\
-\xaa\x7c\x59\x2c\x65\x14\x3e\xdb\xa6\xef\xa9\xe9\x16\xe0\xbb\xa4\
-\x2f\x1c\x55\x0d\xa1\xb4\x69\xd8\x1c\xd6\xd7\x2d\x74\x2b\xb0\x90\
-\xf4\xd5\xbe\x15\x2a\x83\x50\xea\x7d\xf8\x79\x5d\x5f\x18\xdd\x01\
-\x9c\xcc\xd6\xe1\x8a\x20\x94\xbe\x10\x35\xeb\x3a\xec\x58\x75\xe0\
-\x54\xd2\x17\x44\x76\xf9\x10\x2a\x59\x89\x9b\x5b\xf5\x81\xac\xbb\
-\xc9\x1e\x9e\x2a\x80\x50\xd9\xa3\x68\xae\xa1\xb7\x6d\xed\x48\x99\
-\x5a\x3e\x41\x96\xa7\x4a\x9f\xc5\xcd\x86\xf6\xda\x7a\xaa\x23\x70\
-\x79\x87\xa7\xca\x37\x23\xcd\x3a\xcf\x09\xbf\x98\x32\x75\xfa\xf0\
-\x54\x82\x2a\x07\x80\xe4\xb9\xe3\xd1\x63\xc2\x6f\xa4\xfc\x92\xb6\
-\xcc\xd5\x03\x00\xd8\xa9\xb8\xf7\x82\xe8\x3e\x60\x26\x93\x14\x7e\
-\x78\x0a\x03\x00\x70\x70\xa3\x96\xd6\xfc\xa2\xbb\x0c\x9f\xa4\x02\
-\x23\x17\x58\x67\x30\x00\x00\x0e\x6e\xd7\xa2\x7a\x35\x0c\x1c\x4d\
-\xfa\x2a\x70\x93\x14\x14\x00\x80\xf9\xdb\xf5\x6b\x0f\xda\x0c\x9c\
-\x28\xa3\xbd\xe0\x00\x00\x1c\xaa\xeb\x87\x1e\x6b\x13\xf0\x6d\xd1\
-\x6d\x05\x09\x00\xe0\x50\x43\xdf\x10\x69\x13\xf0\x53\x36\xcb\xf3\
-\xdc\x10\x2c\x00\x80\xf9\x2d\xfa\x32\x92\x36\x63\x7e\x4b\xfa\xca\
-\xb1\xee\xa0\x01\x00\x1c\x1e\x51\x53\xd6\x96\xcc\x0f\xa9\xce\xfe\
-\xbf\xcc\x24\x35\xb7\x55\x1f\x61\xed\xa2\xfd\xf9\xad\x85\xf4\x6c\
-\xd5\x35\x75\xd5\x55\x57\x67\x87\xfe\x02\x8f\xb0\x51\x56\xec\xcd\
-\x17\x8d\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x00\x88\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x00\x3a\x49\x44\x41\x54\x58\x85\xed\
-\xcd\xb1\x11\x00\x10\x00\xc0\xc0\x30\x99\xc6\x04\x56\x30\x96\x15\
-\x2c\xe0\xdc\x59\x4d\xa5\x55\x6a\xe4\xab\x74\x01\x49\x92\x7e\x17\
-\x4e\xe4\x52\x17\x90\x1e\x4d\xe7\xe8\x2d\x03\xc4\x17\x43\x49\x92\
-\xa4\x9b\x0d\x00\xac\x05\x04\x1d\x7e\x88\x63\x00\x00\x00\x00\x49\
-\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x03\xbb\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x03\x6d\x49\x44\x41\x54\x78\x9c\xed\
-\x9b\xbd\x6f\x13\x31\x18\xc6\x9f\xf7\x2e\x15\x13\x08\xa6\x22\x35\
-\xc4\xbd\x88\x05\x06\x40\x82\x85\x1d\xca\x00\x62\x80\xa1\x0b\x12\
-\x7f\x01\x1f\x1b\xb4\x03\x08\x24\x3e\xc4\xc4\xc7\x5f\x80\xc4\xd2\
-\x01\x06\x04\x03\x85\x9d\x05\x24\xca\xd0\x6e\x77\xe7\x24\x1d\x60\
-\x00\xc4\x56\x91\xe4\x61\x48\x24\x2e\x77\x17\x68\xe3\xbb\xb8\xa5\
-\xfe\x6d\x7e\xfd\xc6\x79\xfc\xc4\x67\x5b\x39\x1b\x70\x38\x1c\xdb\
-\x19\x59\x4f\x12\xc9\x8a\xd6\xad\xb3\x14\xce\x0a\xe4\x18\x80\x29\
-\x00\x3b\xca\x95\xb6\x61\xd6\x00\xac\x12\xfc\x20\x94\x05\xa5\xaa\
-\x2f\x45\xa4\xfd\xaf\x0f\xfd\xd3\x00\xad\xf5\x49\x42\x1e\x01\x72\
-\xa0\x10\x99\xe3\x63\x59\xd0\xbd\xaa\x94\x7a\xfb\xb7\x24\x6f\x58\
-\x05\x49\x89\x1b\xad\x79\xc2\x5b\xdc\x82\x9d\x07\x80\x83\x84\xb7\
-\x18\xe9\xd6\x1c\xc9\xa1\x3f\xf4\x50\x03\x74\x73\x75\x0e\xe4\x9d\
-\x72\xb4\x8d\x0f\x01\xef\xc6\x8d\xd5\xeb\xc3\xeb\x73\xe8\x0d\x7b\
-\x6f\x31\x15\xfe\x0e\xe2\x06\xd0\x79\xad\x94\x6a\x88\x48\xa7\x50\
-\xa5\x86\x90\xf4\xb5\xd6\x35\xc0\x3f\x0d\xc1\x6d\x00\x7b\x92\xf5\
-\x82\xee\x4c\xde\xe3\x90\x31\x80\x64\x45\x37\x9a\x9f\x07\x87\x3d\
-\xdf\x75\x3b\xed\x0b\xf5\x7a\xfd\x4b\x09\xda\x0b\x27\x0c\xc3\x49\
-\xcf\xaf\x3c\x03\xe4\x44\x22\xbc\xac\x6a\xd5\xc3\xe9\x89\x31\x63\
-\x40\x1c\x37\xcf\x41\xf0\x3c\x11\xfa\xd6\xfe\x35\x71\x60\xff\xfe\
-\xbd\x5f\xcb\x12\x5c\x06\x3d\x13\x26\x56\x90\x1c\x09\xc4\xf9\xe9\
-\xe9\x7d\x2f\x92\x79\x99\x39\x80\xc2\xd9\xc1\x00\x6e\x6e\xb5\xce\
-\x03\x40\xbd\x5e\xff\x22\xc0\xcd\x64\x2c\xd3\x37\xe4\x18\xd0\x5f\
-\xe7\x13\x74\x5e\x17\x2d\x6e\x5c\x90\x9d\x57\xc9\xb2\x40\x8e\xa6\
-\x73\xf2\x56\x81\xa9\x64\x41\x29\xd5\x28\x58\xd7\xd8\xc8\xd1\x5e\
-\x4d\xe7\xe4\x19\x30\xb0\xc3\xdb\x6c\xb3\xfd\x46\xc8\xd1\x9e\xd9\
-\xbd\x0e\xdd\x07\x6c\x17\x9c\x01\xb6\x05\xd8\xc6\x19\x60\x5b\x80\
-\x6d\x9c\x01\xb6\x05\xd8\xc6\x19\x60\x5b\x80\x6d\x9c\x01\xb6\x05\
-\xd8\xc6\x19\x60\x5b\x80\x6d\x2a\x45\x34\x12\x36\x1a\x33\x1e\xe4\
-\x01\x88\x43\x58\xe7\xbb\x06\x03\x08\x60\xa9\x2b\xbc\x56\xaf\xd5\
-\xd2\xff\x5b\x6e\x18\xe3\x11\x10\xe9\xd6\x45\x8f\xf2\x06\xc4\x61\
-\x94\xdf\x79\xf4\xbf\xe3\x88\x47\x79\x13\xe9\xd6\x45\xd3\xc6\x8c\
-\x0c\x88\xa2\x68\xb7\x80\x4f\x4c\x45\x8c\x8a\x80\x8f\xa3\x28\xda\
-\x6d\xd2\x86\x91\x01\x22\x95\xe3\x00\x76\x9a\xb4\x61\xc8\xae\xbe\
-\x86\x91\xd9\xf6\x93\xa0\x91\x01\x64\xfb\x3d\x80\x9f\x05\x69\x19\
-\x85\x9f\x7d\x0d\x23\x63\x64\x40\x10\x04\x3f\x08\xb9\x6c\xd2\x86\
-\x09\x84\x5c\x0e\x82\xe0\x87\x49\x1b\xc6\x8f\x40\xa0\xaa\x4f\xbb\
-\xc2\x53\x00\x3e\xa1\xb7\x44\x95\x0d\x21\x58\xea\x0a\x4f\x05\xaa\
-\xfa\xd4\xb4\xb1\x42\xf6\x01\xfd\xf5\xd8\x78\x4d\xb6\x81\x9b\x04\
-\x6d\x0b\xb0\x8d\x33\xc0\xb6\x00\xdb\x38\x03\x6c\x0b\xb0\x8d\x33\
-\xc0\xb6\x00\xdb\x38\x03\x6c\x0b\xb0\x8d\x33\xc0\xb6\x00\xdb\x38\
-\x03\x72\x62\x6b\xc9\x02\x49\x7f\x4c\x5a\x0a\x27\x47\xfb\x5a\x3a\
-\x27\xcf\x80\xd5\x64\xa1\x77\xfc\x74\x6b\x92\xa3\xbd\x95\xce\xc9\
-\x1e\x94\x04\x3f\x0c\x46\xfc\xd3\x85\xaa\x1a\x23\x22\xfe\x99\x64\
-\x99\xe0\xc7\x74\x4e\xf6\xa0\x24\x65\x61\x30\x80\xdb\x61\x18\x4e\
-\x16\xae\xae\x64\xc2\x30\x9c\x24\x70\x2b\x19\xcb\xf4\x0d\x39\x06\
-\x28\x55\x7d\x09\x70\x25\x11\xda\xe3\xf9\x95\x67\x5b\xc9\x84\x3f\
-\x87\xa5\x07\x4e\x8c\x2f\xf7\xfa\x36\x48\x76\x04\x88\xb4\x05\xbc\
-\x92\x8a\x9e\xf0\xfc\x89\x15\xad\x9b\x97\xe2\x38\x0e\x36\xe3\xc4\
-\x48\xd2\x8f\xe3\x38\xd0\xba\x79\xa9\x77\x48\x7a\xe0\xa4\x38\x04\
-\xdd\xab\x79\x57\x68\x86\xbe\xca\x8a\x1b\xad\xf9\xff\xe1\xc2\x04\
-\x00\x10\x32\x1f\xa8\xea\xbd\xbc\xba\xa1\xfb\x00\xb5\x6f\xea\x1e\
-\x21\xf3\xe5\xc9\x1a\x0b\x24\x30\x37\x5d\x9b\xba\x3f\x2c\x61\x9d\
-\x97\xa6\xbc\x87\x00\x0e\x16\x2a\xad\x7c\xd6\x75\x69\x6a\x94\x6b\
-\x73\x47\xd1\x3b\x75\xbd\x19\xaf\xcd\xb5\x08\x7e\xdc\xc8\xb5\x39\
-\x87\xc3\xb1\xbd\xf9\x0d\x9c\xbe\x20\xb7\xf5\xf6\x9b\x02\x00\x00\
-\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x01\xdc\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x01\x8e\x49\x44\x41\x54\x58\x85\xed\
-\x97\x41\x4a\xc3\x50\x10\x86\xbf\x79\x71\xab\x0b\x45\x5d\xd8\xd6\
-\x92\x4b\x28\x28\x5e\xa0\x5e\x41\x0f\x20\xe8\x4a\xd4\x23\x58\xc1\
-\x85\x15\x3c\x88\xd0\x0b\x08\x82\x5e\x22\xe6\x25\xcf\x85\x8a\x82\
-\x74\x9d\x8c\x0b\x1b\x91\x36\x46\xac\xa9\x0a\xe6\x5f\x0d\xf3\x86\
-\x37\x1f\x33\xc3\xe3\x0d\xfc\x77\xc9\xa0\xc3\xda\xdb\x95\x94\x64\
-\x5f\x54\x96\x11\x66\x4b\xc9\xa2\x3c\xa8\xe8\x95\xc1\x6b\x2f\x2e\
-\x2e\x5c\x7e\x08\x10\x86\xd1\x2e\x22\x47\x79\x60\x25\x29\x45\x75\
-\xaf\xd9\x6c\x1c\x0f\x01\x58\x6b\x57\x15\x73\x01\x3c\x0b\xb2\x63\
-\x8c\x76\xeb\xf5\xfa\x53\x19\x59\xe3\x38\x9e\x4e\x53\x69\x29\xda\
-\x01\xa6\x04\xb3\x36\x58\x09\x6e\x6c\x74\x1e\xda\x58\xad\x75\x1b\
-\x65\x24\xcd\x93\xb5\x6e\x33\xb4\xb1\xde\xd8\xe8\x3c\xf3\x99\xcc\
-\x10\x95\x65\x00\x63\xb4\x3b\x2e\x00\xcf\xa3\x0b\x20\xc8\xd2\x10\
-\x40\x36\x70\x65\x95\x3d\x4f\xb5\x5a\xed\xb1\x6f\xce\x0d\x03\xfc\
-\x92\x2a\x80\x0a\xe0\xd7\x01\x26\x3e\x0b\x08\xa3\x68\x0b\x95\x43\
-\x60\xf2\x8b\x77\xf7\x10\x3d\x68\x36\x1a\x67\x45\x41\x85\x15\x08\
-\x82\x60\x1e\x95\xd3\x11\x92\x03\x4c\xa2\xd2\x09\x82\x60\x7e\x64\
-\x80\x9f\x50\x21\x80\xef\xfb\x77\x88\x6e\x03\xbd\x11\xee\xee\x21\
-\xba\xe3\xfb\xfe\x5d\x51\xd0\xa7\x33\xd0\xef\x61\x61\x1f\xbf\xa3\
-\xbf\xdd\x82\x0a\xa0\x02\xf8\x59\x00\xe5\x01\x5e\x3f\x90\xe3\x4a\
-\xe6\x9c\x9b\xe9\x9b\xf7\x43\x00\x2a\x7a\x05\x90\xa6\xd2\x1a\x17\
-\x40\x92\xd0\x02\x50\xf4\x3a\xf3\xbd\x3d\x44\x06\xaf\xad\xa4\xeb\
-\x8a\x76\xac\x75\xe2\x79\x74\xdf\xfd\xe1\xbe\x25\xe7\xdc\x4c\x92\
-\xd0\x52\xf4\x04\x48\x0d\x5e\x3b\x3b\xcb\x5b\x4c\xda\x8c\x6f\x36\
-\x3e\x5e\x4c\x32\xbd\xad\x66\xaf\x5f\xe7\xb9\xc1\xf3\x11\x75\xaf\
-\xe8\x75\xde\x6a\x56\xe9\x05\x72\xdf\x93\xde\xaf\x9f\x93\x4c\x00\
-\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x05\x36\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x04\xe8\x49\x44\x41\x54\x78\x9c\xed\
-\x9b\x4f\x4c\x1c\x55\x1c\xc7\xbf\xbf\x99\x59\x4c\x7a\x21\x55\x1a\
-\x52\x69\x7a\x71\x9b\x88\x21\xa9\x48\x6f\xbd\x6c\x5c\x81\x43\x2b\
-\x91\xc0\x46\x8d\xd0\x34\xd9\x8d\xbd\x7a\xb1\x07\x12\x59\x20\x31\
-\xa6\xf5\xe4\xcd\xe8\x12\x1a\x25\x9a\x66\x5b\x30\x84\xc6\x00\x62\
-\x36\x2d\x7a\xa2\x92\x18\x5d\x2e\xc5\x03\x61\x0f\x18\x6c\xc3\xa9\
-\x59\xd8\x99\x9f\x07\xf6\xc9\xec\xec\xec\xce\x2c\xf3\x67\x07\xd9\
-\xcf\xed\xcd\xfc\x66\xde\x6f\xbe\xf9\xfe\xde\x7b\x33\x79\x03\x34\
-\x68\xd0\xe0\x24\x43\x76\x82\x22\x91\xa4\xa2\xb4\xe4\xfa\x88\xf1\
-\x2e\x80\x4b\x00\xda\x00\xbc\xe0\x69\x66\xb5\x93\x07\x90\x03\xb0\
-\xca\x84\xbb\x85\x9d\xb6\xb9\x4c\x66\xbc\x60\x75\x91\xa5\x00\x3d\
-\xfd\x89\x6e\x96\xf0\x05\x80\x76\x17\x92\xf4\x11\xca\x92\xc6\x1f\
-\x2d\xce\xa6\x96\xaa\x45\xc9\xd5\xee\xd0\x3d\x98\x18\x01\xe1\x0e\
-\x80\x33\xae\xe6\xe6\x0f\x67\x40\x18\x0e\xb7\x77\xee\x6d\xac\xaf\
-\xfd\x52\x29\xa8\xa2\x00\xdd\x83\x89\x11\x30\x3e\xf5\x26\x37\x1f\
-\x21\x8a\x86\xdb\x3b\xf3\x1b\xeb\x6b\x2b\xa6\xa7\xcd\x0e\x16\x6d\
-\xbf\x58\x72\x90\xf1\x8c\x89\x47\x25\x89\x1e\x34\x63\x77\x33\x9d\
-\x4e\xab\x1e\xa4\x7b\x64\x62\xb1\x98\xbc\x8b\xe6\xf3\x9a\xc6\x57\
-\x88\x69\x02\x84\xd3\xfa\xf3\xa4\xa1\xc7\xac\x1c\xca\x04\x88\x44\
-\x92\x4a\xe8\xa5\xdc\xef\xd0\xd5\x3c\x01\x3f\xa9\xfb\x18\x5a\x9e\
-\x4b\x6d\x7b\x92\xbd\xcb\x44\xfb\x12\xad\x72\x08\xd3\x0c\xbc\x75\
-\x78\x94\xb2\xfb\xff\xbc\x7c\xd1\x38\x30\x4a\xc6\x8b\x95\x96\x5c\
-\x1f\x4a\x07\xbc\xa7\xd0\x94\x0f\x8e\xcb\xc3\x03\xc0\xf2\x5c\x6a\
-\x5b\xdd\xc7\x10\x18\xcf\x0e\x8f\xf2\x6b\xc5\x67\x2b\xa1\x4c\x80\
-\xe2\x54\x77\x78\x19\x38\xb9\x38\xfb\xe5\xdf\x5e\x24\xea\x25\xcb\
-\x73\xa9\x6d\x06\x25\xf5\xc7\x8c\xcf\x06\x98\x08\x80\x83\x79\xfe\
-\x30\x40\xa2\x07\x2e\xe7\xe6\x1b\x92\xcc\xf3\xfa\x36\x01\x5d\x65\
-\x31\x26\xd7\xb5\xe9\x1b\xcd\xd8\xdd\x74\x39\x2f\xdf\x30\xe6\xce\
-\xc0\x39\x63\x8c\x99\x00\x25\x2b\xbc\xa0\x8d\xf6\xb5\x60\x92\x7b\
-\xd9\xea\xd5\x4c\x80\x13\x85\x52\xef\x04\xec\xd0\x1b\x8b\x87\x35\
-\x4d\x1a\x05\x78\x00\x00\x88\x71\xaf\xa0\x49\x13\x3f\xff\xf0\xd5\
-\x86\xd3\x7b\x07\xde\x01\xdd\x03\x37\x2e\x68\x1a\x3d\x04\x78\x18\
-\xc0\x29\x00\xa7\x98\x70\x4d\x96\xb5\x47\xbd\xb1\x78\xd8\xe9\xfd\
-\x03\x2d\x40\x24\x92\x54\xc0\xea\xf7\x00\xce\x9a\x9c\x3e\xcb\x2a\
-\x7d\xe2\xb4\x8f\x40\x0b\x10\x6a\xc9\xdd\x04\x95\x4f\x5d\x02\x26\
-\x0c\x3a\xed\x23\xb0\x02\xf4\xf4\xc7\x3b\xc0\x18\xf3\xba\x9f\x40\
-\x0a\x10\x89\x24\x15\x26\xba\x03\x20\x64\x11\x9a\x76\xda\x57\x20\
-\x05\xb0\xb2\x7e\x91\x3d\x4d\x52\x6f\x3b\xed\x2b\x70\x02\xd8\xb5\
-\x3e\x31\x8f\x2d\xa7\xa7\xb2\x4e\xfb\x0b\x94\x00\x35\x58\x7f\x75\
-\xef\xe9\xb9\xcf\xdd\xe8\x33\x50\x02\xd8\xb5\xbe\x04\xba\x6e\xe7\
-\x83\xa7\x1d\x02\xb3\x12\xec\xe9\x8f\x77\xb0\x4d\xeb\x2f\xcc\xa4\
-\xfe\x74\xab\xdf\x40\x38\xa0\x1e\xd6\x17\xb8\xe2\x80\x37\xdf\xf9\
-\xf0\x15\x45\xd2\x46\x0f\x17\x26\x74\x5f\x92\xb4\x89\x85\xf4\xe4\
-\x13\x3b\xd7\x87\x5a\x72\x37\xc1\xfe\x5a\x5f\xe0\xd8\x01\xbd\xb1\
-\x78\x58\x96\xb5\x47\x4c\xb8\x86\xe2\x5a\x1d\xe0\x61\x4d\xa3\x87\
-\xdd\x03\x37\x2e\x58\x5d\x5f\xcb\xa8\xbf\x70\xff\x6b\xd7\xac\x2f\
-\x70\x2c\xc0\xc1\x5b\x9a\xf9\x5a\x1d\x50\xbf\x8b\x44\x92\x15\x5d\
-\x56\x4f\xeb\x0b\x5c\x18\x03\x0e\x5e\x51\x2b\x70\xa9\xe9\xc5\xad\
-\x8f\x2b\x9d\xac\xc7\xa8\x6f\xc4\xf3\x41\x90\x89\xc6\x7a\xfa\xe3\
-\x1d\xc6\xe3\xf5\xb6\xbe\xc0\xb1\x00\xc4\xb8\x67\x11\xd2\xc4\x12\
-\x4d\xe9\x4b\x21\x08\xd6\x17\x38\x16\x40\x95\xd5\x5b\x00\xf6\x2c\
-\xc2\x4a\x4a\x21\x08\xd6\x17\x38\x16\x60\x39\x3d\x95\x05\x61\xdc\
-\x2a\x4e\x94\x42\x50\xac\x2f\x70\x65\x0c\xd8\xdf\x69\xbb\x0d\xc6\
-\x63\x8b\xb0\x26\x96\xe8\x5b\x96\xa4\x69\x04\xc0\xfa\x02\x57\x04\
-\xc8\x64\xc6\x0b\xc4\x7c\x1d\xd6\xa5\xf0\x3a\xc0\x17\x2d\x62\x7c\
-\xb1\xbe\xc0\xb5\x59\x60\x71\x76\xf2\x0f\x3b\xa5\x60\x85\x5f\xd6\
-\x17\xb8\x3a\x0d\xda\x2c\x85\x6a\xf8\x66\x7d\x81\xab\x02\xd4\x50\
-\x0a\x66\xf8\x6a\x7d\x81\xeb\x0b\xa1\xa3\x96\x82\xdf\xd6\x17\x78\
-\xb2\x12\x3c\x42\x29\xf8\x6e\x7d\x81\x27\x02\xd4\x58\x0a\x75\xb1\
-\xbe\xc0\xb3\x77\x01\xbb\xa5\x50\x2f\xeb\x0b\x3c\x7d\x19\xb2\x51\
-\x0a\x75\xb3\xbe\xc0\x53\x01\x32\x99\xf1\x82\x24\xf3\x7b\x00\xcc\
-\x36\x59\x6c\x4a\x12\xbf\x5f\x2f\xeb\x0b\x3c\x7f\x1d\x5e\x48\x4f\
-\x3e\x51\x18\x97\x19\x98\x07\xf0\x1c\xc0\x73\x06\xe6\x15\xc6\x65\
-\xbb\x9f\xcc\xbc\xc4\x97\xaf\xc2\x3f\xce\xa4\xb6\x00\xbc\xed\x47\
-\x5f\xb5\x12\x88\xaf\xc2\xf5\xc4\x4c\x80\xbc\xbe\x11\x8b\xc5\xaa\
-\xed\x27\x0e\x34\x26\xb9\xe7\x8d\x31\x66\x02\xe4\xf4\x8d\x5d\x34\
-\x9f\x77\x33\x29\x3f\x31\xe6\x4e\xc0\x96\x31\xc6\x4c\x80\x55\x7d\
-\x43\xd3\xf8\x8a\xcb\x79\xf9\x86\xa6\xd2\x55\x7d\x9b\x51\x3e\x25\
-\x97\x09\xc0\x84\xbb\xfa\x36\x31\x4d\x44\xfb\x12\xad\xee\xa7\xe7\
-\x2d\xd1\xbe\x44\x2b\x81\x4b\x16\x62\xc6\x67\x03\x4c\x04\x28\xec\
-\xb4\xcd\x01\x58\xff\xef\x00\xe1\xb4\x1c\xc2\xf4\x71\x12\x41\x6c\
-\x96\x2e\xdd\x31\x4e\xd9\xe2\xb3\x95\x50\xdb\x76\x79\x50\x52\x92\
-\x79\x3e\xd0\xdb\xe5\x55\xba\x4a\xe0\xf1\x23\x6f\x97\x17\xfc\x6f\
-\x7e\x98\x00\x40\xcc\x23\x8b\x33\x93\x9f\x99\x9d\xab\x38\xc5\xfd\
-\x95\xfd\x6d\x25\xdc\xde\x99\x07\x51\xd4\xbb\xd4\x3c\x87\x19\x18\
-\x59\x9a\x99\xbc\x55\x29\xa0\xea\x1c\xbf\xb1\xbe\xb6\x12\x7e\xf5\
-\x8d\x5f\x41\xd4\x85\x63\xf7\xdf\x10\x65\x49\xc3\xd0\xd2\x4c\xea\
-\x9b\xaa\x51\x76\x6e\xa5\xff\x6d\x8e\x80\xae\xe2\xae\xeb\xc0\xfd\
-\x36\x47\xc0\x16\x03\x8f\x6b\xf9\x6d\xae\x41\x83\x06\x27\x9b\x7f\
-\x01\x0f\x15\x0b\x99\x9e\x82\xdf\x92\x00\x00\x00\x00\x49\x45\x4e\
-\x44\xae\x42\x60\x82\
-\x00\x00\x02\x05\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x01\xb7\x49\x44\x41\x54\x58\x85\xed\
-\x96\xbd\x4a\xc3\x50\x14\xc7\xff\x27\x1f\x53\xc1\x07\xf0\xda\x34\
-\x43\xf7\x82\x93\x08\xe2\x2b\x88\x0e\xd2\xc5\x17\xd0\x45\x10\x71\
-\xe9\xd4\xc1\x41\x74\x29\x3e\x81\x93\x43\x9f\xc0\x45\x90\x82\xa3\
-\x7d\x80\x62\x3e\x50\x33\xb8\xe8\x20\xa1\x69\x7b\x1c\x6c\x42\x13\
-\x9b\x34\xe9\xe7\xd0\xfe\xa7\xfb\x71\xee\xfd\xff\x72\xee\xb9\x97\
-\x00\xcb\x2e\x4a\x9a\x74\x1c\x27\xe7\xba\xed\x2a\x88\xf6\x01\x14\
-\x26\xf4\x32\xc1\x54\x57\x55\xaa\x08\x21\x7e\x46\x02\x38\x8e\x93\
-\x73\xdb\x5e\x03\x8c\xd2\x84\xc6\x61\x11\x9a\xaa\x2c\x6d\xfb\x10\
-\x52\x5c\x9c\xeb\xb6\xab\x53\x37\x07\x00\x46\xc9\xf3\xb8\xea\x77\
-\x63\x01\xfa\x69\x9f\x8d\x88\x0f\xfc\xa6\x92\x10\x16\x3a\x73\xbd\
-\x90\x4f\xac\x97\x51\x32\x4c\x9b\x87\xed\x1d\x9f\x81\x39\x69\x05\
-\xf0\xaf\x06\x5a\xad\x37\x4d\x51\x78\x97\xc1\xa1\x71\xc3\xb0\x4f\
-\x62\x77\x91\xb8\x47\x2c\x37\x35\x6d\xfd\x99\x88\xba\x59\x00\x42\
-\x85\x65\x18\xd6\x19\x88\x2e\x87\x81\xa5\x11\x03\x4f\xc4\xdd\x43\
-\x5d\xd7\x3f\xa2\x73\x91\x22\x0c\x8a\x3a\x38\x82\x57\xcb\x2a\x83\
-\xe8\x6a\x5c\x73\x00\x20\x60\x87\x49\xbe\x67\x66\x39\xed\x9a\x00\
-\x80\x98\xce\xc7\x35\x8e\x42\x58\xd6\xfb\x56\xda\xf8\xc1\xaf\x0d\
-\xbf\x7a\x84\xdb\xd4\xae\x8c\x3d\x00\x22\xe8\x52\xb7\x04\xa0\x91\
-\x15\x20\x54\x0f\xba\x96\x8f\x2f\xba\x88\x0c\xcb\x06\x18\xc7\xc1\
-\x40\x8f\x52\xdf\xae\x85\x5f\xc3\x15\xc0\x0a\x60\xe1\x00\x63\xbf\
-\x7a\x89\x22\xd4\x0c\xd3\xae\x25\x44\x98\x7e\x63\x31\x19\x60\xaa\
-\xfb\xcd\xd9\x64\x20\x49\x84\xa6\xaa\x50\xc5\xef\xce\x33\x03\x26\
-\x98\x6e\x06\xff\x88\xff\x78\xfa\x32\x4c\xfb\x0b\xc0\xda\x34\x9c\
-\x08\x74\x54\x28\x6c\xdc\xa5\x89\x1d\xcc\xc0\xc3\x34\xcc\x01\x74\
-\x3c\x85\x1e\xd3\x06\x07\x00\x1d\x45\x3a\x05\xf0\x39\xb1\x3d\xf3\
-\x45\x51\x08\x3b\x33\x40\x51\x08\xbb\xa3\x48\x9b\x00\xea\x00\xbe\
-\xb3\xda\x02\x78\x61\xe2\xb2\xae\x6b\xd7\x19\xd7\x2e\xb9\x7e\x01\
-\xf9\xaa\x7b\xc5\x23\x95\x73\x7f\x00\x00\x00\x00\x49\x45\x4e\x44\
-\xae\x42\x60\x82\
-\x00\x00\x01\xa6\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x01\x58\x49\x44\x41\x54\x58\x85\xed\
-\xd2\x31\x2f\x43\x51\x18\xc6\xf1\xff\x39\x15\x03\x89\x10\x42\xba\
-\x11\x9b\x89\xb0\x89\x45\xb4\x69\xd0\x44\xb5\xb5\xd5\xc0\x15\x12\
-\x1f\xc0\x66\x12\x1f\xc0\xac\xb5\x34\x62\x68\x99\x08\xad\x44\x42\
-\x48\x37\x11\xc2\xd6\x45\x27\x83\x44\xca\xe4\xde\xfb\x5a\x19\x38\
-\xda\x2e\x12\xe7\x37\x3f\x79\xce\xf3\x26\x07\x2c\xcb\xb2\xac\xff\
-\x4e\x99\x02\xa1\xb8\xb3\x0d\x0c\x2b\x5f\x52\x85\x83\xf4\xdd\x6f\
-\x4a\x23\x33\x2b\xbd\x5e\xc0\xcd\x02\x2f\xc5\xfc\xf6\x34\x20\xdf\
-\x65\xb5\x79\xa1\xb4\x03\x83\xa2\xf5\x65\x38\xe6\x8c\x9b\xf2\xe1\
-\xa4\x33\xec\x35\xb9\x25\x60\x14\xa4\xd3\x94\x37\x0e\xa8\xea\xb6\
-\x14\x8a\x1c\x48\x9b\x68\x8e\x27\x12\xce\xfc\x77\xd9\x89\xd9\xc5\
-\x29\xf1\x39\x47\xe8\x11\xd4\xd9\xbb\xe7\x45\xf8\xe1\x7a\x80\x80\
-\x69\x40\xe5\xbe\xe4\xa6\x92\xd1\x7c\xe5\xe9\xb5\x15\x18\x53\x10\
-\xeb\x1f\x18\x92\xf2\xc3\xf5\xf9\xe7\x5c\x28\xbe\xb4\xa2\x14\x59\
-\xa0\x19\xc8\x76\xe8\x97\xb9\xa3\xfd\xdd\x37\x53\xbf\xf1\x0f\x7c\
-\x7d\xc4\x59\x05\xb6\x00\x8d\xb0\xf3\xdc\xa5\x97\xa7\x83\x41\xef\
-\xea\xb6\xb2\x89\x52\x6b\x00\xa2\x64\xe3\x34\x97\x5e\xc7\x70\x79\
-\x5d\x03\x00\xc2\xf1\xc5\xa8\xa0\xf6\x80\x16\x81\x0b\x05\x55\x60\
-\x12\x70\x15\xb2\x5c\xc8\xa7\x33\xb5\xf4\xd5\x3c\x00\x20\x14\x5f\
-\x18\x01\x7d\x08\x74\x03\x08\x54\x95\xf2\x13\xc5\x5c\xa6\x50\x6b\
-\x57\x5d\x03\x00\xc2\x49\xa7\x4f\x7c\xca\xc0\xa3\xf6\xfd\xe8\xc9\
-\x41\xe6\xa6\xde\xae\x46\x28\x1a\x38\xc2\xb2\x2c\xcb\xfa\x13\x3e\
-\x00\x77\x85\x6b\x30\xd4\xa0\xe5\x67\x00\x00\x00\x00\x49\x45\x4e\
-\x44\xae\x42\x60\x82\
-\x00\x00\x01\xa5\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x01\x57\x49\x44\x41\x54\x58\x85\xed\
-\xd2\xcd\x2b\x44\x51\x1c\xc6\xf1\xef\xb9\x93\xd2\x28\x29\xe5\x65\
-\xc7\x7f\x20\xf7\x92\xb2\xb3\x9a\x30\x3b\x65\x35\x56\x9a\x3b\xc2\
-\x88\x8d\xdd\xac\x64\xa5\xa6\xb9\x77\x33\x23\x79\xa9\x59\x58\x58\
-\x29\x25\x1b\x45\x22\xae\xa2\xac\x6d\x94\x6c\x88\x14\xa9\x3b\xf3\
-\xb3\x30\x0b\xd4\xb8\x33\x63\x25\xe7\xb3\x3c\x3d\x3d\x3d\xa7\x73\
-\x40\xd3\x34\x4d\xfb\xef\x54\x50\xc0\xb2\x33\x2b\x60\x98\xa8\x62\
-\xcc\xcb\xce\x5c\x55\x52\xda\x97\x48\x77\xf8\x12\xca\x83\x7a\xf2\
-\x72\x53\xc3\xa0\xa4\x5c\xd6\x08\x6c\x13\x9a\x40\xba\x10\x75\xd4\
-\x9d\x70\x07\x82\xe2\xdd\x13\x19\xd3\x97\xd0\x09\xd0\x0f\x34\x07\
-\xe5\x03\x07\xd4\x35\x14\x62\xc0\x16\xd0\x68\x88\xec\x5a\xb6\x33\
-\x56\x2e\x6b\xc6\x9d\x21\xa3\xa8\x0e\x80\x56\x60\xdf\x7f\xf3\x23\
-\x3f\xdd\xbe\xa2\x01\xc7\xe9\xb9\x57\xaf\xed\x7e\x54\x50\x4b\x40\
-\x1d\xb0\xd1\x63\x3b\x29\x90\x2f\xcf\x67\xda\x6e\x42\x29\xb6\x81\
-\x30\x48\xfe\xe5\xe1\x3e\x72\xb1\x3e\xfb\x18\xd4\x1f\xf8\x07\x3e\
-\xb3\xe2\x99\x49\x94\x72\x3e\x86\xcb\x9a\x48\xbd\x7d\xde\x7e\x5b\
-\xb0\xee\x9a\x17\x81\xf9\x52\xe1\xc2\x59\x6e\x3a\x15\x74\xf3\x9a\
-\x06\x00\xf4\xd8\x4e\x54\x60\x13\x08\x2b\x38\x14\xd4\x33\xc8\x20\
-\xe0\xa3\xb0\xbd\x6c\x72\xb5\x9a\xbe\xaa\x07\x00\xf4\xda\xae\x25\
-\xc8\x8e\x40\x4b\xe9\xe8\x59\x84\x91\xf3\xe5\xe4\x5e\xb5\x5d\x35\
-\x0d\x00\xe8\x1d\x77\x3b\x8b\x21\xb9\x06\x6e\x0c\x88\x9e\xe6\x92\
-\x97\xb5\x76\xfd\x82\xa8\xef\x9f\x51\xd3\x34\x4d\xfb\x73\xde\x01\
-\x57\x2b\x69\x45\xc4\x74\x4c\x85\x00\x00\x00\x00\x49\x45\x4e\x44\
-\xae\x42\x60\x82\
-\x00\x00\x02\xdb\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x02\x8d\x49\x44\x41\x54\x58\x85\xe5\
-\x97\x4f\x48\x54\x51\x14\xc6\x7f\xe7\x8d\xb8\x11\x82\x12\x03\x75\
-\x35\xb8\x10\xc9\x4d\x6d\x32\x8c\x28\x9c\xa6\x85\x12\x18\x6f\xb6\
-\x12\xcc\x64\xad\x5c\xa9\x2d\x87\xc1\xd5\x04\x2d\x12\x92\x2c\x27\
-\x28\x17\x19\xc6\xb8\x49\x28\x07\x13\x02\xff\xb4\xa9\x8d\xd5\x4e\
-\xdd\xd8\x42\x29\x68\xe1\x46\x98\x7b\x5a\xf8\xde\xf4\x1c\x9a\x3f\
-\x6f\x7c\xb6\xa8\x6f\xf5\xde\xb9\xe7\x9e\xef\x7b\xdf\xb9\x97\x77\
-\x2f\xfc\xef\x90\xe2\xc0\xd5\x1b\xf1\x6e\x44\xee\x02\x5d\x40\x53\
-\x40\x3c\xbb\xc0\x1a\xaa\xe9\x5c\x36\xb3\xec\x1d\x08\x79\x5f\x22\
-\x76\x7c\x58\x90\x17\x40\x3b\xd0\x10\x10\x39\x4e\xad\x76\x44\x6e\
-\xb6\x75\x9c\xdb\xdb\xf8\xfa\x71\xd5\x1d\x28\x38\x10\x89\x0d\x5e\
-\x14\x63\xde\x03\x3f\x51\x1d\xb2\x42\xcc\xbf\x9d\xcd\xfc\x08\x82\
-\xfd\x5a\x2c\x7e\xca\xe4\xe9\x45\x64\x1c\x38\x81\xea\x25\xd7\x89\
-\xba\x82\x12\x63\x46\x01\x41\x75\x28\x97\xcd\x4c\x07\x41\xec\xc2\
-\xf9\x90\xe9\x88\x9d\x10\x51\x9e\x39\x2d\xbe\x0e\x60\x79\xf2\xba\
-\x00\xac\x10\xf3\x41\x92\x7b\xa1\xf9\x7d\xb7\xf6\x79\x37\xe6\x15\
-\xd0\xe4\x51\x7b\x2c\x58\x9c\x7b\xfe\xdd\x79\x3c\xed\xc6\xea\x4a\
-\xe4\xd6\x8c\xa8\x7d\xab\x4f\x55\x1f\x03\x88\xc8\xe0\xc2\xab\x27\
-\xaf\xcb\xe5\x07\x2a\x20\x1a\x4b\x84\xd5\xe8\x0c\xce\x0e\x72\x84\
-\xb4\x94\x9b\x63\x95\x1b\xf4\x83\x64\x32\x69\xa9\xe1\x29\x3e\xb7\
-\x6f\x60\x02\x56\x3f\x7f\xbb\x03\x5c\xf6\xc6\x14\xc6\xfe\x8a\x80\
-\x68\x2c\x11\x56\xd5\x7b\x87\xc9\x65\xa9\xbb\xb3\x75\xf2\xd8\x05\
-\x94\xb0\x7e\xcf\xb2\x34\x9e\x4a\xa5\x4c\xa5\xf9\x15\x17\x61\xa5\
-\x55\x5d\xc2\xfa\x91\xdc\xec\xd4\x66\x35\x1f\x50\xd1\x01\x87\xbc\
-\x19\x68\x56\xd5\x99\x68\x2c\x11\x2e\x88\x3b\x82\xf5\x2e\xfc\x6e\
-\xc3\x06\x63\x24\x93\x4c\x26\x23\x00\x2b\xeb\xdb\x35\x5b\x5f\xb5\
-\x00\x85\x31\x81\x09\xf7\x5d\xd0\x2b\xcb\xeb\xdb\xb7\x2d\x11\xe1\
-\x08\xd6\xbb\xa8\xd8\x82\xee\xce\xd6\x49\x45\x96\xbc\x31\x81\x09\
-\x55\x7d\x78\x98\xdc\x9f\xf5\x55\x0b\x48\xa5\x52\xc6\xb2\x34\x0e\
-\xec\x95\x49\xf3\x6d\x7d\xd5\x02\x00\x16\x66\xa7\x36\x45\x64\xb4\
-\xd4\xb8\xc2\xc8\x82\x4f\xeb\x7d\x09\x00\xb8\x70\xa6\xe5\x51\x71\
-\x2b\x0e\xc8\x6b\xb3\xde\xb7\x80\x12\xad\xa8\xd9\x7a\xdf\x02\xe0\
-\xa0\x15\xc6\xa8\x0d\xba\x05\xba\x65\x8c\xda\xb5\x5a\xef\xc2\xf7\
-\xef\x78\x71\x2e\xf3\x06\x08\x57\x4c\xac\x12\x5e\x07\x76\xe1\xe0\
-\x00\x19\x54\xf1\x62\xf4\xf4\x0f\x34\x3a\x8f\x3b\x7f\x12\xb0\x06\
-\x60\xf2\xf4\x1e\x97\x00\x09\xd5\xbb\xb5\x3f\xb8\xb1\xdf\x2d\x50\
-\x4d\x23\xd2\x87\xc8\x78\xc4\x4e\x88\xe6\xf7\xe7\x3d\x67\xb8\x23\
-\xa1\xa7\x7f\xa0\x51\x42\xf5\xbd\xa2\x3c\x00\x0c\xaa\xe9\x82\x28\
-\x6f\x62\xc4\x8e\x0f\x8b\x4a\x9a\x00\x0f\x2a\x45\x30\x28\xa3\xb9\
-\xec\xd4\x7d\x37\x70\xe8\x66\xb4\xf1\xe5\xd3\x4a\x5b\xc7\xd9\x45\
-\x44\x9a\x80\x93\x04\x77\x3b\xda\x01\xde\xa1\x9a\xc8\x65\x33\x2f\
-\x03\xaa\xf9\x8f\xe0\x17\xaf\x0f\x09\xa8\xe3\xe3\x70\xe1\x00\x00\
-\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x01\x07\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x00\xb9\x49\x44\x41\x54\x78\x9c\xed\
-\xd9\x51\x0d\x83\x50\x10\x05\xd1\xa5\xc1\x1a\x0a\xb0\x80\xac\x5a\
-\xa8\x02\xc4\x81\x8c\xd3\xe4\xcd\x18\xd8\xc9\xe4\xfe\xed\x0c\xe4\
-\x38\xaf\xe7\x38\xaf\x47\x3a\x7c\xe4\xf1\x7f\xa0\x00\x5a\x40\x53\
-\x00\x2d\xa0\x29\x80\x16\xd0\x14\x40\x0b\x68\x0a\xa0\x05\x34\x05\
-\xd0\x02\x9a\x02\x68\x01\x4d\x01\xb4\x80\xa6\x00\x5a\x40\x53\x00\
-\x2d\xa0\x29\x80\x16\xd0\x14\x40\x0b\x68\x0a\xa0\x05\x34\x05\xd0\
-\x02\x9a\xe5\x03\x6c\xf2\xb8\x7e\x8d\xcf\xb4\x80\xd9\xb5\xc0\xcc\
-\xcc\xfd\xfb\xb2\x25\x2e\xbf\x80\x02\x68\x01\x4d\x01\xb4\x80\xa6\
-\x00\x5a\x40\x53\x00\x2d\xa0\x29\x80\x16\xd0\x14\x40\x0b\x68\x0a\
-\xa0\x05\x34\x05\xd0\x02\x9a\x02\x68\x01\x4d\x01\xb4\x80\xa6\x00\
-\x5a\x40\x53\x00\x2d\xa0\x29\x80\x16\xd0\x14\x40\x0b\x68\x96\x0f\
-\xf0\x02\x2e\x56\x08\x76\x9d\x62\x12\xf1\x00\x00\x00\x00\x49\x45\
-\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x00\x86\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x00\x38\x49\x44\x41\x54\x58\x85\xed\
-\xce\x31\x11\x00\x30\x08\x04\x41\x26\x9a\xf0\x84\x1f\x0c\x13\x11\
-\x50\xee\xf5\xff\xb3\x11\x8b\xb2\x7a\xb2\x7a\x36\x1f\x6f\x33\xbe\
-\x08\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xe0\
-\x03\xf8\x62\x04\x97\x5f\x3b\xc3\x6b\x00\x00\x00\x00\x49\x45\x4e\
-\x44\xae\x42\x60\x82\
-\x00\x00\x00\xcb\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x00\x7d\x49\x44\x41\x54\x78\x9c\xed\
-\xd9\xc1\x0d\x80\x20\x14\x05\x41\xb4\x29\xba\xa6\x10\x8b\x12\xcb\
-\x58\x13\x66\x1a\xf8\x2f\x1b\x6e\x8c\x11\x9a\xeb\xdd\x73\xbd\xbb\
-\xdc\x70\x97\xc7\xff\x40\x80\x7a\x40\x4d\x80\x7a\x40\x4d\x80\x7a\
-\x40\x4d\x80\x7a\x40\x4d\x80\x7a\x40\x4d\x80\x7a\x40\x4d\x80\x7a\
-\x40\x4d\x80\x7a\x40\x4d\x80\x7a\x40\x4d\x80\x7a\x40\x4d\x80\x7a\
-\x40\x4d\x80\x7a\x40\x4d\x80\x7a\x40\x4d\x80\x7a\x40\xed\xf8\x00\
-\x57\x79\xbc\xfe\x1a\x1f\xa3\x7f\x01\x4f\x7c\x1f\x00\x00\x00\x00\
-\x00\x00\x00\x4e\xf0\x01\xb9\x04\x09\xb0\x92\x01\xea\x01\x00\x00\
-\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x0c\xd6\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x0c\x88\x49\x44\x41\x54\x78\x9c\xe5\
-\x9b\x5b\x6f\x5b\xc7\x11\x80\xbf\x25\x45\x8a\x94\x28\x89\x92\xad\
-\xbb\x64\xc9\x4e\x9a\xc2\x41\xe0\x26\x45\xd1\xa0\x48\x0a\xf4\xa9\
-\x7d\xe9\x7b\x81\x16\xfd\xa3\x7d\x2a\x50\xb4\x0f\x41\x90\x36\x4e\
-\x52\x20\x69\x92\xc6\x96\x6c\xc9\x37\x5d\x48\x49\xa4\x2e\xe4\xf4\
-\x61\xf6\x1c\xee\xd9\x33\x87\xa4\xe4\xf4\xc9\x03\x10\x24\x77\xf7\
-\xcc\xce\xcc\xee\xce\x6d\xe7\x00\xb2\x05\xe2\x78\xe3\x40\x9c\xf2\
-\x9e\xfe\x78\x93\x84\x90\xe3\xf9\x4d\x12\x42\x96\x57\x97\xed\xe0\
-\x0e\xf0\x18\x9c\x14\x3c\xdc\x00\x6e\x19\x1d\x25\x60\x32\x8b\x2f\
-\x6d\xaf\x0d\xa1\x66\x12\x10\xe0\x62\xc8\x98\x73\xa0\x67\xb4\x77\
-\x81\xbe\xd1\xfe\x12\xdc\xa9\x8d\x2a\xcf\xa3\x1b\x35\x00\x64\x1b\
-\xb8\xed\x09\x3d\x01\x5e\xf8\x89\xa7\x80\x39\xdf\x2e\xc0\x59\xd0\
-\x3e\xeb\xdb\xfa\xbe\x1d\x8f\xa3\x0a\x34\x81\x8a\xef\x3f\xf7\x34\
-\x54\xfd\xf7\x25\x70\x04\x97\xa7\x50\x39\xf2\x6d\x53\xa8\x20\x9d\
-\x9f\xff\xc4\xff\x9f\xf2\x6d\x0e\x68\x01\xa7\xbe\x7d\x29\xe8\x7b\
-\x01\xee\x71\x31\x6f\x85\x52\x92\x2d\x90\x09\x90\x8f\x40\x56\x8d\
-\x31\x6b\x20\x0b\x46\xfb\x06\xc8\xbc\xff\x3d\x05\x72\x0f\xe4\xae\
-\xff\xcc\x80\xdc\x01\x19\xb2\x23\xa4\xee\xc7\x2c\xa8\xe0\xe5\xae\
-\xc7\x31\xe1\xfb\xe7\x40\x36\xf3\x47\x55\x9a\x05\xed\x1b\x20\xbf\
-\x06\x29\x5f\xf3\x88\xcb\x04\xc8\x9f\xf5\xc1\x5c\xdf\x36\x48\xc5\
-\x68\x7f\xdb\x3f\xb7\xe2\x27\x5b\x8e\xf0\xdd\x1b\x73\x72\x3c\xe3\
-\x25\xff\xdb\x79\x46\xb6\xa0\x75\x4b\xdb\xe5\x2d\x83\xd9\x32\xc8\
-\x4f\x8c\xf6\x09\x90\x3f\xda\xbc\x14\x13\xf0\x91\x7f\x30\x92\x9a\
-\xac\x17\x30\x7f\xc7\x7f\xb6\xed\x15\x96\xed\x6b\x4c\x4e\x60\xa2\
-\xe2\xf6\x59\x15\x4e\x7b\x49\xe7\xcb\xf5\x97\xb3\xcf\xa5\xbb\xb9\
-\x02\xf2\xab\x71\x27\xdf\x1e\x6c\xfb\x50\x63\xca\x14\xc8\x6d\x63\
-\xfc\x2a\xc8\x07\xba\x7d\x4d\x7c\xf3\x5e\x79\x5e\x13\x64\x56\xb7\
-\xbc\xd9\x37\x07\xf2\x00\x64\xd1\xe8\x6b\xfa\x67\x23\xcb\x26\x9b\
-\xfa\xc9\x82\x71\x26\xe4\x17\xe0\x3e\x0d\xfe\x27\xca\xa3\x07\xec\
-\x01\x21\xa3\xab\x70\x79\x0b\x2a\x5f\x0e\xe1\x64\x0d\x78\x5a\xd0\
-\x97\xda\xe1\x1b\x3c\x0b\xf0\x00\xba\x4f\xa0\xf6\x2a\x68\xeb\x28\
-\x5d\x94\xc9\x29\xbc\x98\x37\x98\x30\x90\xc6\xc4\x34\x50\xe6\x1f\
-\xa0\x5a\xbd\xed\xc7\x6c\x01\x2f\x54\xa1\x0f\x05\xf1\xc4\x2c\xf9\
-\xff\x89\xe9\x4a\x34\x78\xd8\x46\xd0\xf6\xc2\xa0\x25\x86\x17\x20\
-\x82\x32\xbc\xe7\x9f\x5d\x02\x7e\x06\x7c\x0e\xcc\xa0\x16\x22\x81\
-\x9c\xd9\x8c\x04\x20\x0d\xd4\xcc\x24\xff\x37\x80\x36\xb8\x5d\x3f\
-\x51\x05\x35\x5d\x9b\xc0\xd7\xe0\xae\xf4\x7c\xb9\x13\x72\x20\xce\
-\x8f\x9b\x42\x7d\x81\x6f\x47\x98\x9f\xf8\xd9\x45\x60\x1a\x35\xa9\
-\x7b\xf6\xb3\xd2\x86\xfa\x0b\xd4\x9f\x58\x01\x7e\x00\x16\x80\xcf\
-\x80\xe7\x80\xb7\x3c\xec\xf8\xe7\x7b\xaa\xdb\xdc\x55\xd1\xc4\x5b\
-\x03\xf3\x26\x5b\x59\xcd\x29\x1b\x5e\x0f\x7c\x1c\x29\x46\xcb\x4c\
-\x2e\xa1\xa6\x72\x46\x3f\x37\x05\x59\xf5\xca\x78\x3d\x6b\x55\xd2\
-\xfe\x99\x81\x7e\x91\x09\x90\xdf\x78\x2b\x11\xb6\x07\x8a\x51\xee\
-\xaa\x8e\x18\x40\xc9\x98\xb5\xaf\x13\xb2\x0b\xae\x17\x8d\x5d\x03\
-\xfe\x0e\xdc\x09\x84\x10\xac\xcc\x61\x53\x19\xe7\x10\xdc\x53\xdf\
-\x37\xe6\xaa\x9b\xe0\x9f\x75\x4f\x80\x03\xc5\x7d\xd8\xcc\xf7\x8b\
-\x03\xd6\x81\xbf\x01\xf7\xb2\x73\xba\x9e\xf2\x22\xeb\x18\x47\xc0\
-\x12\xc0\x14\x70\x16\x31\x0f\x7a\xe6\xbf\xf3\x5b\xe9\x31\x59\x21\
-\xa0\x1a\xb9\xd9\x57\xc6\xdd\xe5\xf8\x3c\x8e\x0b\xee\x52\x71\x37\
-\xfb\xd1\x6e\x08\x3d\xbc\x1e\xf0\x04\x3d\x7a\xe1\x90\x1e\xea\x29\
-\x4e\xc7\x58\x2d\x25\x38\xe7\x57\x2f\x00\xd9\x46\x95\x4c\x29\x30\
-\x77\x07\xc0\x7d\xe0\xd2\x9b\xab\x57\xe8\xee\x09\x4d\x9e\x9f\xd0\
-\xdc\x04\x25\xe8\xfa\xe3\x56\x3b\xc4\xf6\xf7\xa7\x81\x2e\x48\x78\
-\x66\xfb\x3a\x56\xee\x03\x47\xe8\xca\x7f\xad\x63\x05\xa0\x03\x9d\
-\x13\xa8\x2f\x92\xd1\x67\xee\x08\xe4\xa7\xf1\x04\x63\x58\x01\x79\
-\x0b\x2e\x2a\x50\x9d\x46\x15\xd3\x29\x83\xad\xbd\x0b\xfc\x0e\xf8\
-\x4b\x01\x03\x01\x74\xe6\xa1\x9e\x04\x3f\x3e\x4e\xa8\x1d\xf9\xce\
-\x79\xd4\x52\xf8\x1d\xd5\x39\x87\xfa\xe1\x10\x64\x5d\xd4\x3c\xfe\
-\x06\xf8\x24\xa0\xd9\x2b\xcf\x7a\x0d\xb8\x0d\x72\x1e\x2d\x66\x6e\
-\x25\x62\x01\xc4\xd1\xe1\x5d\x60\x1a\x26\x1f\xaa\x12\x74\xfb\xd9\
-\xe1\xb2\x0e\xfc\x03\x0d\x70\x8c\x20\x43\x80\xee\x6d\xa8\x4d\x40\
-\xfd\x25\xb8\x4e\x01\x43\x47\xd9\xbf\x52\x07\x16\xe0\xa2\x06\xd5\
-\x93\xbc\xd6\x4e\x7d\x93\xbf\x02\x6b\xe0\xf6\x82\xce\x36\xc8\x09\
-\xba\x63\xdf\xf6\x9e\x6b\x42\x5b\x9f\xe8\xd8\xc7\x3a\xa0\x0a\x9c\
-\xfb\x09\xee\xa1\xab\xf2\x85\x4d\xb3\x2c\xa1\xdb\xbe\x87\xad\x13\
-\xa6\x81\x55\xa8\xb5\x55\x89\x15\x32\x6f\x80\xeb\xe8\x33\xd5\xb6\
-\x32\x18\x1e\xab\x30\xaa\xa3\x87\xfa\x02\x2b\x05\x88\xbe\xf1\x63\
-\xee\xf9\xe7\x3a\x64\x1d\xb9\x22\x2b\xc0\x06\xf0\x0c\xf5\x01\x8c\
-\x03\x7c\xd8\x04\xba\xe0\xba\x9e\xe0\x48\x31\x1e\xcd\x43\xbb\x86\
-\xae\xc2\xf9\x58\x3c\xdb\x70\x01\x3c\x85\xf6\x24\x1c\x2f\x60\x87\
-\xb4\x5d\xe0\x4c\xe7\x8c\xc1\x9d\xa1\x8b\xfa\x83\xe7\x29\xc7\x8b\
-\x25\x80\x06\xea\x3d\x2d\xe6\xb7\x7c\x02\xcd\x29\x70\xad\x6c\x5b\
-\x22\x84\xcb\xf7\x61\xae\x07\xb3\xaf\xcc\x47\x6f\x04\xb3\xaf\x60\
-\xf6\x52\x71\x5b\x47\xcd\xb5\x60\xae\x20\x16\x61\x07\x35\xdf\x2d\
-\xd4\xc2\x65\xc0\x12\xc0\x34\xaa\x3d\x0b\x94\x9a\x2c\xa3\x6e\xaa\
-\x01\xc7\x4d\xa8\x7c\x0f\xcc\x33\x7e\xec\x3d\x06\x88\x03\x16\xa0\
-\xf2\x9d\xce\x61\xc2\x73\xdb\x59\x72\x97\x40\x19\xdc\x31\xba\xb8\
-\x19\xb0\x04\x20\xa8\x69\xd9\x29\x20\x64\xc2\xb6\xf3\x32\x05\xa5\
-\x64\x22\x7f\x1c\xac\x60\xeb\xda\x10\x6e\xfb\x16\x94\x4a\x5e\xbf\
-\xc4\xc3\xae\x94\x36\xb1\x78\x3a\xd4\x23\x34\xda\x0a\x94\x07\x83\
-\x4c\xbf\x7d\x13\xd5\xb2\xe1\x2a\xcc\x82\x74\x81\x15\x98\xd9\x0f\
-\xfa\x5a\xc0\xbb\xc0\x13\xd2\x8c\x4e\x06\x92\xd4\x19\xa8\x4f\x61\
-\xe5\x05\xe7\xd0\x40\xe7\x07\xfd\x2d\xa0\x3b\x73\x03\xe4\x19\x03\
-\x3f\x23\xc1\x7f\xa6\x7d\x1c\x64\xd1\xb8\x63\xef\x0e\x27\x81\x59\
-\x0a\x31\x61\x35\x72\x49\x48\x99\x47\x83\x8d\x65\x4f\x64\x84\x9c\
-\x1e\x74\x66\xa1\x7e\x00\xc4\x41\xc6\x23\x4f\xd0\xd7\xc1\xe4\x2b\
-\x40\x1f\x3a\x67\x50\xdf\x05\x1c\x74\x6f\x41\x2d\xc9\x2f\x3e\xf3\
-\xdf\xce\xcf\xf9\x05\x9a\x2b\x0c\xe1\x15\x74\x66\xa0\x9e\x08\x2d\
-\x9c\xb7\x89\x2a\xbe\xbe\xee\x86\x54\x57\x25\x79\xcb\x4c\xc2\xc6\
-\x5a\x99\x45\xe0\x4b\x90\xaa\x27\xe0\x25\xb8\x43\x34\xd3\x73\x96\
-\x8f\xfc\xa4\x01\xf5\x32\xb8\xe7\x79\x54\x82\x67\x7e\x01\x38\x46\
-\x57\xec\x1b\x63\x77\xb5\xfd\xf8\x32\xba\xe2\x07\x9e\x8e\xff\x68\
-\x5f\x2e\x7a\x3b\xf1\xa6\xcf\x67\x7f\x43\x9a\x64\x1f\x15\x98\x17\
-\x9a\x6c\x02\x4f\xe0\xa4\x03\x8d\x29\xb2\xe1\xb1\xa9\x03\x4a\xa8\
-\x04\x6f\x83\xdb\x09\xec\xf7\x2d\x6c\xe5\x37\x0d\x47\x05\x69\x68\
-\xa5\x00\xcd\xf4\x6e\x01\x4f\x87\x87\xc4\xa9\x2f\x7f\x1f\x0d\x67\
-\x87\x05\x52\x27\x18\xbe\xbd\x5f\x08\x9f\xb9\x72\x27\xa8\xb7\xba\
-\x01\x8d\x03\xf4\x48\x65\xa0\x48\x09\x2e\xe5\xe3\x01\x28\x20\xbe\
-\x01\xf3\x47\x46\x7b\x02\x65\x25\xb4\xf2\x90\x9c\xb3\x94\x9b\x3a\
-\x51\x78\x9f\x61\xdf\x3f\x84\xb4\x14\x08\x20\x37\x4e\x7c\x6a\x7c\
-\xcd\xea\xb5\x04\xb0\x00\x58\xf6\xdf\xba\x84\x18\x07\x56\x18\x24\
-\x34\x0c\x8f\x31\x81\x9c\x93\xf3\x12\x2e\x8c\xd4\x7b\x06\x8a\x84\
-\x69\xd1\xfa\x0a\x43\x60\x05\x47\xe0\x5a\xe1\xec\x28\xc1\xf4\x07\
-\x3b\xa7\x30\x94\x36\x3c\x3c\xd7\x85\xea\xa8\x7c\xdb\x35\x72\x0d\
-\xee\x0c\x55\xe6\x19\x88\x05\x30\x41\x71\x54\x77\x13\x9b\x5e\x83\
-\x6e\x64\xde\x62\x21\x0c\xbd\xb1\xb9\xa9\x1f\x51\xf4\x5c\xae\x3d\
-\xb6\x02\xcb\x70\x65\x69\xf3\xc0\x3f\xc8\xb4\x97\xec\xf6\x14\x9a\
-\x50\x7b\x66\xd0\x21\x20\x8f\xd1\x24\x0b\xc0\xa3\x02\xfd\x32\x62\
-\x85\xbb\x7d\x8d\x34\x73\xd0\xc3\xce\xd6\x8e\x8a\x05\x7a\x15\x98\
-\xb8\xce\xf6\x4f\xec\x75\x11\xf4\x47\xf4\xbf\x26\xd4\x1c\xc5\x47\
-\x70\xac\x79\x23\x01\x94\x9f\xa1\xf6\x37\xc6\xd5\xb3\x11\x8e\xcc\
-\xf2\x1e\x90\x9a\xa4\x10\xd2\x6d\xff\xc8\x7f\x46\x58\x87\x42\x28\
-\x12\x40\x19\xdb\xb3\xcc\xcd\x11\xeb\x80\x2e\x51\xbc\x1c\x40\x11\
-\xb3\xc3\x08\xbf\xca\xcf\x11\x9f\xf9\x51\xd6\x61\x28\x14\x8d\x1f\
-\x5b\x39\xc6\x02\x48\x72\xe7\x39\x6d\x79\x03\x22\x12\xe8\x93\xde\
-\x27\x16\x29\x3c\x4b\x08\x32\x43\xea\xe9\xdd\x78\xee\x00\xc4\xe7\
-\x17\xb3\x60\x99\xc1\x23\x06\xb7\x38\x3f\x06\x3c\x07\x56\x46\x68\
-\x7b\x22\x21\x94\x50\xaf\xcd\xb8\x70\xc9\xc0\x98\xbe\x49\x12\x4e\
-\xe7\x05\x6a\x09\xc0\x01\xfb\xe4\x2f\x12\x8b\xa4\x7d\x00\x6d\x43\
-\x6f\x64\xe0\x25\xf0\x21\x23\x8b\x13\x9c\xa0\x61\xf8\x47\x0c\xbf\
-\x13\xc4\x67\x80\x8e\x8b\x10\x0d\x7e\x8a\x43\xad\xcd\x2e\x63\xe8\
-\x00\x00\xf1\x8e\xd0\x53\x15\x42\x7a\xb3\x73\x80\x79\x1b\xcb\x25\
-\x34\xaa\x43\x28\x4d\xee\xeb\xfe\x05\x6c\x6a\xde\xa0\x08\x64\x8e\
-\xc1\xe5\xcb\xa6\x45\xf0\x00\xe6\x26\x31\xd3\x6d\xed\x45\xd2\x88\
-\x55\x9a\x68\x6e\xe3\x91\xc7\x35\x32\x1f\x00\x9a\xe7\x9f\x04\x77\
-\x0e\xec\x28\x12\xd9\x40\xad\xc3\xbc\x8f\xbd\x43\x44\x4b\xc0\x19\
-\xc8\x3b\x44\x91\x16\x9a\x81\x59\x43\xa3\xba\x26\x70\x01\x17\x5b\
-\x5e\xc7\x58\x4e\xcf\x29\x1a\x19\x2e\xe9\x58\x1e\x00\xff\x06\x89\
-\x4d\x73\x92\xd9\x49\xf2\x01\xc9\xff\x24\x84\xee\x78\xfc\x7b\x7a\
-\xaf\x09\x3e\x83\x9d\xf3\x49\x62\x01\x74\x7c\xdb\x32\x7a\x1e\xd1\
-\x0b\x05\x8e\x3c\xbd\x02\xec\x67\xb7\xb1\xa0\xb9\x43\x59\xcf\xe6\
-\x10\xd3\x73\xf7\x4f\x70\xed\x60\x8e\x82\x3c\xa3\x05\x02\x9a\x38\
-\xd9\x8d\xe6\x5c\xd3\x60\x2d\x61\x3c\x09\x87\xc5\xa1\xbb\xfa\x38\
-\xdb\x0e\x0c\x0a\xb6\x32\xd9\xe9\xf8\x08\x84\x57\xd7\x16\xec\xa1\
-\xc1\x8d\x05\xcf\xc8\x14\x56\xe0\x6f\x65\x5f\xfb\x6e\x30\xb6\x0e\
-\x2b\x14\xe6\x24\x93\xc0\xcb\x84\xe4\x3a\x3e\xa3\x38\x8b\x94\xe0\
-\x85\x6d\x0a\x5d\x5f\x89\xb2\xea\x6d\xdc\x15\xd0\xf2\x67\x30\xc9\
-\xdb\xbf\x0e\xf3\x09\x04\x42\x68\xdd\x46\x13\x24\x56\x4e\xb2\x1c\
-\xd0\x18\xf7\x2d\xa3\xd6\x68\x2c\x25\xd8\x46\xed\xa5\x19\x3f\xfb\
-\x6d\x6e\x64\x5f\x01\x38\x83\xc6\x32\x9c\x9c\x8d\xe1\x25\x5e\x03\
-\x9c\x28\xce\x99\x15\x06\x65\x77\x31\x2c\x53\x7c\xbc\x92\x1a\x85\
-\x9c\x59\xb5\x04\x70\x86\x2a\x97\x72\x41\x86\x15\x38\xee\x90\xbb\
-\xf7\x4f\xb7\xfd\x57\xd0\x38\xd3\x73\xfa\x63\x81\xac\x2a\x4e\xbe\
-\xc2\xf4\x18\xa5\x01\xad\xae\x2d\x74\x99\x83\xb3\x2e\xca\x53\x4e\
-\x78\x45\xf9\x80\xc4\x66\xbe\x6d\x13\xd4\x3c\x54\x84\xc9\x31\xc9\
-\xb9\xb7\xa7\xe8\x96\x5b\x85\x4e\x41\xa1\xd3\x38\x70\x3e\xab\x38\
-\x92\xea\x4f\xd3\x6d\x9e\x04\x66\x61\x2e\x4e\xd6\x26\xb0\x02\x53\
-\xd3\x01\x4f\x19\x88\x05\x70\x41\x9a\x34\x70\xde\x74\xc9\xba\x8d\
-\xd7\xed\x2b\x72\x4a\xd8\xee\xed\x15\xb0\x07\xf5\x4b\x55\x5c\xb2\
-\x38\x9e\xaf\x2f\xce\x8f\x5d\x81\x49\x8f\x23\x3c\xf3\xa1\x10\x28\
-\x01\xab\x76\xfa\x0e\xd4\x34\x5f\x54\xc0\x7d\xeb\x1b\xea\x44\x56\
-\x20\x36\x83\xf1\x95\xd3\x27\x68\x39\x1a\xc0\x32\x5a\x27\xd4\x0f\
-\xc6\x5d\x02\xbf\x45\xaf\xc7\x97\x0d\x9d\x97\xa4\xa0\x4e\xd1\xf8\
-\xfc\x3d\x2f\x84\x61\x89\x0f\x21\xad\x35\xa0\x81\xba\xd1\x56\x4d\
-\xcf\x25\xf0\x7b\xe0\x53\x06\x97\xa3\x89\x19\x4c\xca\x6b\x27\xf5\
-\x66\x3b\x85\x12\xc3\xdd\x67\xd9\x42\x0b\x0f\xc2\xb6\x86\xf7\x08\
-\x37\xa2\xf6\xa4\x0e\x6f\xcd\x7f\x1b\x56\x43\x1a\xdc\xa8\x46\x30\
-\x7d\x7e\x05\xf3\x52\x45\xaa\x68\x09\xed\x1c\xc8\xbb\xb6\x4e\x90\
-\xf7\xf3\xd6\x4a\x3e\x64\x8c\x1a\xa1\x43\x90\x20\x23\xeb\x4e\xe0\
-\xa4\xab\xf5\x80\x29\xa2\xf0\x8a\xba\x0f\xee\x11\xea\x25\xbe\x06\
-\xb3\xe3\x82\xcc\xa0\x29\xfb\xef\xd1\xcc\xcf\x0e\x79\xc5\xb8\x81\
-\xa6\xe0\xc3\x0b\x9e\xe4\x6e\x22\x03\x96\x00\xba\x40\x95\x4c\x49\
-\xec\xcc\x0b\xa8\x4c\x7a\xc9\x16\x85\xb4\xfb\xd0\xaa\xaa\xce\xb8\
-\x56\x5d\xee\x98\x20\x65\xc5\xdd\xaa\x90\xaf\xfa\x08\x14\x63\x7b\
-\x11\xba\x1d\x32\x1a\x5f\x2a\xa8\x6e\xcb\xd5\x28\x58\xb1\x40\x09\
-\xdc\x9e\x6e\x79\x79\x16\x28\xa0\xa7\xa8\x46\xee\x01\xff\x0d\x98\
-\x0f\x24\x3f\x77\xe0\x05\x94\x84\xbf\xa1\x0b\x7c\x13\x48\xbc\xbf\
-\x55\x94\xd1\xa7\x30\x27\x51\xbf\x04\x39\xc6\xfb\xd0\x68\x91\xb9\
-\xbe\x93\x8a\xd2\xe3\x76\x40\xee\x1a\xcc\x66\xe0\x25\x69\x2e\xc0\
-\xed\xa2\x75\x36\xc9\xd6\x17\x54\xf1\x54\xc8\x66\x8d\x22\x1c\x4e\
-\x54\x80\xec\xa3\xb5\x3f\xf7\xc6\x08\x97\x0d\x68\xdd\x46\x9d\x9b\
-\x25\xe0\xb9\xee\xb0\x9c\x9d\x9f\x26\x5d\xd5\xe3\x26\xba\xea\x65\
-\x54\x79\x76\xd0\xda\xe6\x25\x65\x1e\xd0\xcb\xd8\x8c\x33\x14\xed\
-\x00\x77\x9a\x0d\x57\xdd\x1e\x5a\xc3\xbf\x81\x46\x66\x9f\xa3\x42\
-\x78\x00\xe7\x27\x50\x3d\x52\x22\x0b\xcd\x5b\x5f\xe7\x68\x24\x15\
-\x9b\x49\x1b\x80\x83\x0b\xbf\xbb\xaa\xc9\x0b\x14\x21\x1c\x7b\x66\
-\xbc\xa9\x33\x1d\xcb\x65\xc5\x2f\x4b\x1e\x6f\x12\x23\x7c\x00\x3c\
-\x04\x0e\xc0\xbd\x0c\xc6\x97\xe3\x7b\x46\xeb\x08\xc4\xcc\x74\x3d\
-\x21\x0f\xd1\x82\x45\xd0\x2b\xef\x65\xdf\xbe\x1f\xb4\x1b\x20\x62\
-\xf7\x8b\x83\xea\xa4\x67\xb0\x53\xe0\xc5\xad\x8f\xc0\x7d\x05\x4c\
-\xc1\xd1\xf7\xd9\xeb\x39\x71\x9e\xb6\xf8\xcc\x8f\x93\x42\x93\x3b\
-\x03\xe7\x27\x53\x2e\x5f\xcf\x5a\x07\xf0\x66\xe8\x7d\xec\x44\x49\
-\x32\xe6\xff\x50\x2e\x0f\xba\x00\xf2\xf3\xbc\xf9\x95\xa6\x5a\x8a\
-\x5c\xb9\xfc\x1d\xcc\xb2\x5e\x1b\xf9\xc7\xd8\x2f\x4c\xac\x92\x7b\
-\x61\x42\x1c\xfa\x82\x85\xf1\x02\x43\x3a\x66\x7b\xcc\x89\x43\x9c\
-\x05\xcf\x88\x43\xdf\x18\xf9\xa5\xd1\x57\xce\xfa\x2b\xa9\x10\xaa\
-\x8c\xff\xc2\x44\x8a\xe8\x4f\x05\x4e\xc8\x46\x5e\x08\x00\xf2\x1e\
-\xfa\xca\x4a\xee\xa5\x04\x5e\xeb\x95\x99\xb4\xad\xe4\x9d\x9f\xb7\
-\x40\xde\x31\x9c\x9f\xb2\xa5\xe5\x3d\xf3\x7f\xc8\xe3\x2b\x9e\x3c\
-\x91\x5a\x59\xa5\x16\x7b\x80\xe0\x77\x82\x71\x7d\x2d\x1b\x7e\x6b\
-\xde\xd3\x4f\x2b\x74\x9e\x2a\x8c\x7e\x69\x6a\xca\x8f\x09\x04\x2f\
-\x2b\x0c\x5e\xbe\x2a\x7a\x39\x6a\x1e\x33\x66\x91\x2d\xcf\x43\x29\
-\xbf\x9b\x15\x62\x44\x86\x93\x23\x9b\xa8\xb6\xf5\x35\xba\xb4\xfc\
-\xef\x1a\x6a\xe6\x1c\x7a\x01\x72\xc1\xe0\xb5\xb9\x19\x40\xa0\x37\
-\x0d\xe5\xc4\x29\x4a\x4a\x64\x7b\xc1\xff\xe4\xf6\x26\x79\x6d\x2e\
-\x28\x97\x4d\xe9\xeb\xfa\x71\x0e\x35\x61\xa7\xfe\xf7\x24\xaa\xc4\
-\x7d\x01\x06\x1d\x54\xa1\xce\x06\x78\xf6\x06\x4e\x93\xed\xc0\x8d\
-\xb8\xa2\x8e\x41\x26\x30\x4a\xcd\x3c\x9e\x3a\x79\x2d\x1b\xbf\x38\
-\x59\x42\xaf\xca\x92\x23\x54\x65\xe0\x5f\xe0\x99\x38\x24\x6b\xf3\
-\xac\x17\x27\x85\x41\xe2\x33\x06\xa3\xb4\x36\x7d\xac\x88\xc7\x37\
-\xf7\xd5\x59\xab\xe1\x0d\x80\x0c\xcf\x6f\x1a\xf3\x09\xa8\x10\xfe\
-\x07\xb4\x0a\xfd\x7e\xcf\x22\x5b\xc2\x00\x00\x00\x00\x49\x45\x4e\
-\x44\xae\x42\x60\x82\
-\x00\x00\x02\x1b\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x01\xcd\x49\x44\x41\x54\x58\x85\xed\
-\x96\xb1\x4a\x23\x51\x14\x86\xbf\x93\x64\x13\x54\xb0\x70\x8b\x2d\
-\x04\xc5\x17\x30\xa0\x23\x2c\x82\xec\x2b\x2c\x8a\x8a\x85\x96\x8e\
-\x10\x89\x08\x22\x36\x56\x29\xb6\x08\xbb\xab\x23\x2b\x9b\xb4\x56\
-\x2a\x79\x02\x1b\x41\x04\xc1\x04\xf4\x09\x54\x2c\x54\xd0\x42\x0b\
-\x41\x50\x8f\x85\x4e\x4c\xa2\x33\xce\x24\xd1\x14\xe6\xaf\xee\x9d\
-\x39\x73\xff\x6f\xce\x3d\x73\xe6\xc2\x67\x97\xb8\xdd\xec\x1c\x4d\
-\x36\x85\x1b\xc2\x09\x90\x7e\x84\xf6\x8a\x9c\x94\x23\x84\x8c\x6a\
-\x64\x3e\x97\x36\xaf\xdf\x04\xe8\x1c\x4d\x36\x7d\x69\x8c\x6c\x0b\
-\x44\x2b\x32\x7e\xc1\xc1\x3e\x1a\xe9\xb5\x21\x02\x4e\x81\xe1\x86\
-\x70\xa2\xda\xe6\x00\x02\x51\x91\x9b\x84\x3d\x77\x04\x00\xe9\xaf\
-\xb6\x79\x5e\xca\x80\x3d\x0c\x39\xfb\x17\xef\x79\x36\x15\x77\xad\
-\x97\xb7\x64\x98\x96\xbe\xb6\xb6\x4b\x06\x3e\x46\x75\x80\x17\x35\
-\xd0\x3d\xbe\xd0\x26\x01\xf9\x81\x16\x5f\x37\x26\xac\x49\xa7\x45\
-\x44\xe5\x5e\x85\xfd\x8e\x8b\x6f\x3b\xeb\xeb\x43\x77\x65\x03\xf4\
-\x98\x8b\x33\x8a\xfc\x42\x5f\x29\x4e\x65\xc9\x69\x11\x45\x41\xe1\
-\xb0\xe5\x74\xab\x7b\xfc\xef\x70\x2e\x3d\x7d\xe2\x15\x20\xbf\x05\
-\x86\x69\x8d\x28\x92\x2c\x85\xf2\x23\x85\xbe\x80\x04\x57\x07\x07\
-\xd7\x82\xbe\x01\x40\x66\xcb\x35\x2e\x85\x38\xf8\x7a\xf6\xdd\x6b\
-\x7c\xc1\xdb\x6a\x69\xd7\xfb\xe7\xdd\x54\x7e\x0a\xda\x6a\xcf\x45\
-\x89\x02\xdb\x3e\x01\x8a\xff\x0b\xd9\x54\xdc\xb1\xe8\x4a\x65\x98\
-\x16\x40\x2c\x0f\x24\xea\xf9\xeb\xaa\xf9\x67\x58\x07\xa8\x03\xd4\
-\x1c\xa0\xec\xae\xe7\x2a\x65\xc9\x30\x2d\xc7\xd6\x8d\x72\x64\x0f\
-\x6b\x93\x01\x21\x63\x0f\xdf\x27\x03\x2e\x7a\x3a\x94\xce\xdb\xf3\
-\x8f\xcb\xc0\x63\xda\xff\x14\x9e\x88\xa1\xa0\xfd\x1a\xa6\x75\x09\
-\x34\x57\xc5\x4c\x74\x2c\xfb\x7f\x6a\xc5\x4b\xe8\x73\x06\x54\x37\
-\xaa\x62\x0e\xb7\x12\x08\x6d\x7a\x0d\xce\x03\x48\x28\x34\x0d\x9c\
-\x57\xea\xae\xca\xdc\xee\x72\xec\xd8\x37\xc0\xee\x72\xec\x58\x82\
-\xc1\x2e\x54\x33\xc0\x95\x5f\x5f\x90\x3d\x44\x47\x72\xe9\xf8\x6f\
-\x9f\xcf\x7e\x72\x3d\x00\x27\x99\x79\x91\xf6\x77\x59\xd9\x00\x00\
-\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x00\x95\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x00\x47\x49\x44\x41\x54\x58\x85\xed\
-\xd7\xb1\x0d\x00\x20\x0c\x03\x41\x83\xd8\x29\x2d\x13\x67\x02\xa4\
-\x6c\x16\x31\x84\xe9\xf8\xef\x63\x5d\x1b\x89\x8c\x22\xbb\x22\xbb\
-\x9c\x8d\x65\x1a\xb6\x79\xaf\xe9\x0e\x00\x00\x00\x00\x00\x00\x00\
-\x00\x00\x00\x00\x00\x00\x80\x9b\xf7\x19\x0d\x9d\x47\x8e\x8f\xbb\
-\xb2\xd3\x06\x7c\x18\x63\x85\x7e\x00\x00\x00\x00\x49\x45\x4e\x44\
-\xae\x42\x60\x82\
-\x00\x00\x01\x35\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x00\xe7\x49\x44\x41\x54\x78\x9c\xed\
-\x9b\xb1\x11\xc2\x30\x14\xc5\x9e\x19\x22\x13\x31\x01\xc7\x06\xd0\
-\x30\x11\x0d\x23\x70\x4c\xc0\x34\xa9\xb2\x85\x29\x08\x5d\x3a\xdb\
-\x88\x3b\xa4\xea\x17\xff\x12\x7d\xf5\x4e\x44\xe4\x9f\x29\xa3\x7f\
-\xb0\x3f\x9e\x0f\xa5\xe6\x9a\x24\xb5\xe4\xf2\xbc\xdf\x1e\x3d\xf7\
-\x5b\xd9\x8d\xfc\x78\x92\xac\xc7\x4c\x49\xa6\xcf\x61\x3d\xf7\x5b\
-\x19\x1e\x20\xef\x63\xb6\xe6\x5e\xfb\x4d\x7c\x23\xc0\x4f\x63\x00\
-\x5a\x80\xc6\x00\xb4\x00\x8d\x01\x68\x01\x1a\x03\xd0\x02\x34\x06\
-\xa0\x05\x68\x0c\x40\x0b\xd0\x18\x80\x16\xa0\x31\x00\x2d\x40\x63\
-\x00\x5a\x80\xc6\x00\xb4\x00\x8d\x01\x68\x01\x1a\x03\xd0\x02\x34\
-\x06\xa0\x05\x68\x0c\x40\x0b\xd0\x18\x80\x16\xa0\x31\x00\x2d\x40\
-\x63\x00\x5a\x80\xc6\x00\xb4\x00\x8d\x01\x68\x01\x1a\x03\xd0\x02\
-\x34\x06\xa0\x05\x68\x0c\x40\x0b\xd0\x18\x80\x16\xa0\x31\x00\x2d\
-\x40\x63\x00\x5a\x80\x66\xfc\xa3\xa9\x64\xd9\x9a\x7b\xed\xb7\x32\
-\x3c\x40\x4d\x4e\x49\xe6\x24\xf3\x3a\x77\xdd\x17\x11\x69\xe1\x05\
-\x2c\x27\x22\x30\x10\x9e\x42\xf3\x00\x00\x00\x00\x49\x45\x4e\x44\
-\xae\x42\x60\x82\
-\x00\x00\x01\x51\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x01\x03\x49\x44\x41\x54\x78\x9c\xed\
-\xd6\x21\x4e\xc4\x50\x14\x85\xe1\x73\xfb\x9a\x0a\x04\x0a\x3c\x1b\
-\x20\x21\x81\x04\x8b\x83\x05\xb0\x06\xdc\x4c\x48\x58\xc0\x50\xcf\
-\x18\x40\xa2\xf0\x48\x12\x70\xd8\x51\x84\x1d\xa0\x48\xc8\x38\x04\
-\x99\x4c\xda\x5e\x2c\x79\x0f\x70\x7d\x93\xd0\xff\x93\xe7\x56\x9c\
-\x1e\xd3\x4a\x00\x00\x00\x00\x00\x00\x00\x00\x00\xc0\x20\xd8\xdf\
-\x67\xb7\x83\xc9\x79\xc8\x53\xa5\x1f\x4f\x52\xa7\xba\xee\x7e\xbb\
-\xff\x38\xc0\xee\xc9\xc5\x86\x59\x35\x95\x74\x2c\x69\xad\xa7\x6e\
-\xb9\x2c\xe4\x7e\xdf\x56\xc5\xf8\xf9\x7a\xf4\x16\x1f\x93\x01\xf6\
-\x47\x97\xeb\xcd\x52\x2f\x26\x6d\x65\xa9\x97\x8b\x69\x1e\x9a\x6e\
-\x7b\x76\x73\xfa\xfe\x3d\x2e\xe2\xe7\xda\xa5\xea\x7f\xf7\xf2\x92\
-\xe4\xda\x6c\x42\x31\x8d\xe3\x64\x00\xb9\x1d\x66\x29\xb4\x02\x26\
-\x1d\xc5\x59\x3a\xc0\xc0\xa4\x03\x98\x3f\xae\xa0\x47\x16\x2e\x3d\
-\xc4\x59\x32\x40\xa8\x34\x71\xe9\x35\x4b\xa3\x9c\x4c\xf3\xb2\xed\
-\xce\xe2\x38\x19\x60\x76\x35\xfe\x08\x65\xb1\x27\xe9\x56\xd2\x67\
-\x8e\x6e\x3d\x5b\xc8\xfd\xae\x2d\x6d\x27\xfe\x02\x48\xfc\x08\x01\
-\x00\x00\x00\x00\x00\x00\x00\x00\x00\x43\xf1\x05\xad\xf1\x3c\x35\
-\x36\x50\x8e\x69\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
-\
-\x00\x00\x01\x8b\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x01\x3d\x49\x44\x41\x54\x58\x85\xed\
-\x93\x3f\x2f\x43\x61\x14\x87\x9f\x73\x5b\xc1\xd0\x88\x6f\xd0\x5d\
-\x62\xbb\xda\xc9\x62\x34\x48\x2b\x6c\xc2\x66\xf0\x09\x24\x12\x3a\
-\x58\x7c\x01\x7f\xd2\xc1\xaa\xf4\x76\x31\x4b\x2c\xa2\x9d\xd4\x07\
-\x10\x2c\xc2\xa2\x93\x84\xd4\xfb\x33\x50\x4d\x6c\xf7\xbd\xc9\x5d\
-\xdc\x67\x3b\xc9\x7b\x7e\xe7\xc9\xc9\x79\x21\x23\x23\xe3\xbf\x63\
-\xb1\x5e\x4b\x56\x6a\xc9\x01\xbc\x9b\x4d\xde\x54\xac\x97\x54\x20\
-\x88\xf5\x7a\x67\x28\x3c\x2a\xbd\x2e\x35\x94\x4b\x57\xa0\x66\x4e\
-\xd8\xf2\xa0\x7c\xcc\xab\x9f\xae\x00\xd0\xa9\xda\xa9\xd0\xee\xa0\
-\x2e\x45\xae\x9b\xaa\xc0\xb7\x44\x6e\x0b\xb8\xf8\x29\xa7\xcb\xd1\
-\xe7\xbe\xaf\x40\xbc\x23\xfc\x43\x29\x72\x1a\x26\xd9\x7a\xbb\x62\
-\x47\x71\x33\xbc\x36\x30\xa0\xdd\xb5\xe1\x11\x4a\x87\x61\x53\xb3\
-\xa9\x0a\x50\x33\x37\xde\xb7\xc2\x6f\x98\xe9\x32\x5d\x01\xe0\x05\
-\x3e\x80\x7b\xdf\xfe\x64\x02\x92\x15\x46\x5c\x1d\x28\x02\xcf\x39\
-\x59\x31\x55\x81\x72\xe4\xb6\x91\xad\x00\x6f\x98\xcd\x5f\x2d\xda\
-\x43\xdc\x0c\xef\x5f\x30\x13\x69\xd5\xd0\x31\xe0\x84\x2d\x74\xaa\
-\x76\xee\x93\xe3\xb5\x81\xb0\xa5\x39\x43\x75\x00\x61\x1b\xbe\xc3\
-\xbd\x04\xc2\x33\x4d\x05\x52\x13\xc8\x9b\xb4\xd7\xa9\xda\x81\xef\
-\xf0\xf8\x02\x92\x05\x81\x1a\xc0\x04\xa6\x93\xeb\xdb\x60\x33\xc9\
-\x70\x80\x7c\xdc\x06\x83\x27\xe0\x6e\xac\x17\xac\x51\x33\x97\x54\
-\x20\x23\x23\x23\xe3\x0b\x46\x70\x62\xa1\x9b\x7f\x53\x6a\x00\x00\
-\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x01\xb2\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x01\x64\x49\x44\x41\x54\x58\x85\xe5\
-\xd6\x31\x4e\xc3\x30\x14\xc6\xf1\xff\x73\x93\x72\x03\x3a\x70\x82\
-\x96\x89\x89\xb9\x8d\xc4\x58\x04\x5c\xa1\x03\xb7\xf0\x35\x90\xe8\
-\x15\x2a\x04\x2c\x88\x42\x7b\x08\xa0\x9c\x80\x01\x26\xf6\xd2\x98\
-\x81\x86\xa2\xa6\x21\x76\xe2\x84\x01\x8f\xf6\x93\x7f\x9f\x6c\xe7\
-\x29\xf0\xdf\x87\xd4\x89\x45\xfd\x41\x4b\x85\xe6\x12\xe4\x65\x3c\
-\x1a\x9e\x00\xa8\x7a\x71\xa6\x20\xfb\x60\x76\x92\xf9\x5a\x02\xac\
-\x70\xda\xc0\x73\x3c\x97\xc3\x64\xad\xf2\x2b\x48\xe3\x74\xef\xaf\
-\x86\xaf\xb5\x04\xc8\xc3\x2b\x0d\x60\x83\x57\x16\xc0\x16\xaf\x24\
-\x80\x0b\xee\x3d\x80\x2b\xee\x35\x40\x11\xdc\x5b\x00\x5b\xfc\xe0\
-\xe8\x74\xdb\xa8\x8f\x1b\x83\xbc\xdf\x8d\xce\x7b\xe0\xa1\x11\x39\
-\xe2\x13\x60\x4f\x30\xcd\x64\xbe\x54\x80\x02\xf8\x2e\xf0\x28\x71\
-\x70\x9c\xac\x15\xbe\x82\x12\x78\x74\x7b\x71\xf6\x56\x2a\x80\x2f\
-\xbc\x50\x00\x37\x7c\x31\x05\xd3\x01\x9e\x24\x0e\x7a\xeb\xb8\x73\
-\x00\xdf\xb8\x53\x80\x2a\x70\xb0\xfc\x0a\x6c\xf1\xa8\x3f\x68\xb9\
-\xe0\x60\x71\x02\x2e\xb8\x0a\x65\xe2\x82\xe7\x06\x28\x86\xcb\x4c\
-\xe2\x46\x77\x13\xee\xd4\x09\x2b\xc2\x53\x9d\x30\xa8\x0f\x5f\x4c\
-\x81\x0e\x6b\x9d\xb0\x51\x0e\x67\xb9\x69\x36\x1e\xf5\x07\x2d\x09\
-\xcc\xcf\x87\x99\xdd\x09\x0b\xe0\x6d\x90\x59\x3c\x37\xbd\xa2\x0f\
-\x53\x36\x6f\xea\x0b\x5f\xd5\x65\x9d\x90\x02\xd0\x5a\x2b\x15\x32\
-\xce\xc3\x01\x51\x21\xd7\x79\xf8\x7a\x5d\x16\xfe\x1d\x60\x39\xb6\
-\x80\x87\xdf\xfe\x64\xb4\xd6\x02\xd2\xfc\xaa\xcb\xc4\x53\x75\x36\
-\xfd\x00\xad\xb5\xc2\xae\x35\x8b\xe7\xba\xbf\x1d\x9f\xf9\xbe\xa6\
-\x95\x85\xff\xbc\x8e\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\
-\x82\
-\x00\x00\x03\xe0\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x03\x92\x49\x44\x41\x54\x78\x9c\xed\
-\x98\x4d\x68\x5c\x55\x18\x86\x9f\xf7\xde\x50\x12\x45\xa1\xda\x9d\
-\xe8\x56\x5c\xb7\x64\x22\xa9\x68\x54\x4a\x9b\x42\xd2\x49\x20\xe0\
-\x4a\xb4\xfe\x81\x6b\x7f\x41\x44\xac\x60\xba\xd0\xad\x8a\x05\x57\
-\xae\x9a\x8c\xc9\xa2\x15\x4a\x35\x9b\xca\x4c\xd2\x14\x74\xd3\x9f\
-\x9d\xc5\x65\x44\xd2\xb8\x88\x3a\x73\x5f\x17\xa1\x32\xb9\xf7\x26\
-\x99\x99\xdc\x99\x44\x7a\x9e\xe5\xf9\xee\x39\xe7\x7d\xbf\xf3\x73\
-\xcf\x39\x10\x08\x04\x02\x81\x40\x20\x10\x08\x04\x02\x81\x40\x20\
-\x10\xb8\xb7\x50\xba\x60\x70\xc6\x1f\x4a\xfe\x00\x88\x0d\x89\xc0\
-\x7b\xa0\xab\x30\x0c\x12\x44\x40\xc3\xd6\xc7\x8b\x93\xfa\xa8\x39\
-\x9e\x49\x40\x69\x36\xa9\x03\x71\xaf\x04\xf6\x98\x46\x6d\x22\xea\
-\x6b\x2e\x88\xf6\x4a\xc9\x7e\x21\x93\x00\x5b\x67\xd0\xff\x7b\xda\
-\xe7\x22\x6c\xeb\x4c\xb6\x38\x87\xd2\x8c\x47\x90\xe7\x80\x07\x52\
-\x21\x03\x49\x17\xe4\x15\x49\x44\xd6\xd7\x9a\xa4\xb1\x6a\x59\x0b\
-\xe9\x8f\x73\x13\x00\x50\xaa\xf8\x30\xf6\xf7\xc0\xa1\x54\x0d\xe3\
-\xfd\x99\x04\x43\xa4\xac\xa7\x15\xa4\xe3\xb5\xb2\x96\xf3\xea\x6c\
-\x99\x00\x80\x23\x73\x7e\x3c\x6e\xf8\x12\xf0\x68\xaa\x23\x6b\xbf\
-\xcd\x04\x11\xe1\xcd\x7e\x24\x6e\xd7\x23\x1d\xbb\x3a\xae\x9b\x5b\
-\x55\xdb\x76\x13\xbc\x3a\xae\x9b\x49\xa4\x61\xe0\xc6\xe6\xbe\x90\
-\xb5\x7f\x36\x50\xe7\x98\x07\x6e\x34\xa4\xa3\xdb\x99\x87\x1d\x66\
-\xc0\x5d\x0e\xcf\xfb\x50\x5f\xc3\x17\x31\x47\x52\x5d\x03\x6a\xb4\
-\x23\xb6\x78\x1c\xa7\x6d\x08\x96\xfe\xe9\xd3\xe8\xf2\x98\x56\x76\
-\xaa\xdd\xd2\x28\x2e\x8f\x69\xa5\x2f\xd2\xb3\xc0\x0f\x9b\x23\x02\
-\x88\x51\x4b\x79\x2c\x14\x6f\x8c\x78\x9e\xf9\xcb\x71\xac\xe7\x5a\
-\x31\x0f\x6d\x9c\x03\xae\x8c\x6b\x6d\x60\x55\x27\x05\x95\x1c\x35\
-\xb1\x5b\x9c\x4d\x45\x60\x90\xf2\x97\xe0\xec\xc1\x7e\x9d\xbc\x32\
-\xae\xb5\x56\xdb\x6a\x6b\x1d\x2f\xbc\xa4\xf5\xfe\x83\x9a\x92\x7d\
-\x2e\x1d\x93\x89\x9c\x5d\x87\x85\x63\x23\x39\xab\x5b\xf6\xb9\xc7\
-\xea\x9a\xba\x38\xaa\xbf\xda\x69\xaf\x33\xc1\xb6\x4a\x95\x64\x1a\
-\xf4\x56\x8e\xc0\x44\x5d\x3a\x48\x35\x9d\xeb\x37\x21\xfb\x6c\x75\
-\x22\x7a\x17\xa9\xed\x7e\x77\x35\x62\x83\x15\xbf\x2d\x7b\x3a\xa7\
-\xd9\x04\x5c\x68\x12\x8c\x24\x9c\x3d\xb9\x4a\xef\x2c\x96\x75\xb6\
-\xd3\x76\x77\x3d\x65\x87\x66\xfc\x8a\xe5\x2f\xc9\x8c\x4c\x71\x49\
-\xd8\xc2\x7c\x62\xe9\xb5\xc5\xb2\x32\xcb\xb1\x1d\x0a\x59\xb3\xa5\
-\x8a\x27\xb1\xbf\x05\x0e\x34\x97\x5b\xb6\xac\x5d\x1d\x98\x8c\x23\
-\x65\x7f\x33\x7f\x0b\xbd\x50\x9d\xd0\xec\x6e\xda\x86\x02\x77\xee\
-\xa1\xf3\x7e\xde\xf2\x77\x88\xfb\x9b\xcb\x8d\x2d\x3a\x4e\x42\xde\
-\xb9\xfe\xcf\x44\x3a\xb5\x54\xd6\xe5\x0e\xdb\xdc\x44\xa1\xbb\xf6\
-\x93\x15\x0f\x26\xf6\x05\xe0\xe1\x54\xa8\x93\x4b\x54\x9e\xf9\xdf\
-\x13\xeb\xc4\xd2\xa4\x96\x3a\xd5\x98\xa6\xf0\xdf\xd6\xd0\xac\x9f\
-\x30\xbe\x04\x3c\x92\x0a\x19\x91\xec\xf8\x7f\x10\xd8\xb9\x97\x9a\
-\xdf\x84\x8e\x55\x27\x74\xbd\x38\xb5\x5d\x78\x10\xa9\x4e\xe8\x7a\
-\x6c\x0d\x03\xb7\x52\x21\xb1\x61\x6c\x47\x4d\x39\xe6\x6f\xd5\xeb\
-\x1a\x2e\xda\x3c\x74\xe9\x45\xe8\xa7\x49\xfd\x1a\xa3\xa7\x80\x6b\
-\xa9\x90\x8c\xb7\x79\x6e\x73\x9c\x73\xa9\xb9\x76\xa0\xae\xa3\xcb\
-\x53\xba\x5d\xb0\xcc\x0d\x41\xdd\x68\xf4\x2e\xa5\x0b\x7e\xd0\xeb\
-\x9e\x17\x3c\x9d\xd3\x75\xe3\xbf\xf7\x56\x09\x9c\x9b\x98\x05\xfa\
-\x35\x5e\x1b\xd5\x9d\x6e\x69\xec\xea\x95\xb6\x36\xaa\x3b\xf7\xad\
-\xea\x38\x30\x9f\x8d\x3a\x66\x63\x00\xb4\x85\xf9\xb9\x81\x55\x9d\
-\xe8\xa6\x79\xe8\xd1\x05\xe6\x99\x1f\xdd\xb7\xfe\x47\xf2\xb5\xd1\
-\x8b\x2d\x55\xb0\xbf\x19\x78\x28\x7a\x75\x61\x44\xf5\x2e\x4b\xeb\
-\xcd\xa3\xc6\xc2\x88\xea\xd5\x9f\xa3\x97\x85\x3f\xdf\xe9\x5b\xe3\
-\xcf\x6a\xbf\x44\xa7\x7b\x61\x1e\x7a\x78\x85\x05\xc0\xd6\xe0\x2c\
-\xef\x49\xfe\x24\x5f\x8d\xde\xaf\x9d\xe2\xd3\x4e\x2e\x35\x9d\xd2\
-\xfb\x97\x0c\x60\x70\xc6\xaf\x4b\xfe\xa2\xa9\xc8\x48\x6f\xd4\xca\
-\xfa\xaa\xd7\x5a\xf6\x24\x01\x00\x43\x33\x8d\x69\x4b\xa7\x81\x06\
-\xd6\x9b\xb5\x49\x9d\xdf\x2b\x2d\x81\x40\x20\x10\x08\x04\x02\x81\
-\x40\x20\x10\x08\x04\x02\x81\x7b\x89\x7f\x01\x9b\xd6\x34\x0b\xef\
-\xec\xcc\xa6\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x04\x1d\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x03\xcf\x49\x44\x41\x54\x78\x9c\xed\
-\x98\x4f\x6c\x54\x55\x18\xc5\xcf\x79\x4f\x06\x89\x85\x05\xd4\x44\
-\xaa\x25\xee\xc0\xa5\x7d\x6f\xea\xc2\xc4\x14\x0d\x0d\x74\xa1\x94\
-\x85\x0b\x56\x16\xc2\xcc\x88\xb1\xba\xc0\xb0\xc2\xb1\x31\x21\x21\
-\x90\xc8\xcc\x0b\x8a\x48\xc0\x98\x18\x17\x35\xca\xaa\x25\x8d\x50\
-\x12\xa8\x89\x69\x47\x97\x86\xc4\x95\x7f\xaa\x89\x92\x98\x00\xa9\
-\x14\xdf\xfd\x5c\x30\x95\x79\x7f\x3a\x9d\x7f\x6f\xa6\xe2\xf7\x5b\
-\xbe\x6f\xee\xbd\xe7\x9c\xb9\xf7\xce\xf7\x06\x50\x14\x45\x51\x14\
-\x45\x51\x14\x45\x51\x14\x45\x51\xfe\x5f\xb0\x53\x0b\xf7\xe7\x0a\
-\xc3\x46\x78\x0a\x80\x45\xe0\xa3\xd9\x0f\x47\x8f\x74\x42\x87\xdd\
-\x89\x45\xd3\xb9\xe2\x01\x11\x7e\x02\x60\x03\x80\x2e\x00\xcf\x6d\
-\x76\x76\xfe\xf2\x6b\xe9\xe2\xb7\xed\xd6\xd2\xf6\x00\x9c\x6c\xf1\
-\x30\x80\x02\x42\xbb\x8f\xe4\x8b\x3d\xe9\xa1\x85\xf9\xb9\xc9\x99\
-\x76\xea\x69\x63\x00\x42\x27\xdb\x7d\x9c\xc0\xdb\x55\x3e\xb4\xa3\
-\xc7\xdd\xf5\xc8\x7c\x69\xe2\x2b\x60\xac\x2d\xaa\xda\x72\x07\x0c\
-\xe4\xf3\x0f\xdd\xfa\x6d\xe3\x19\x80\x23\x35\x0d\x10\x9c\xeb\xda\
-\x7c\x23\x7b\x65\x6c\xec\xef\x84\xa5\x25\x1f\xc0\xc0\x2b\xe7\x1f\
-\xbe\xb5\xf6\xe6\x67\x00\x76\x87\x6b\x02\x31\x00\x41\xc0\x8a\xd6\
-\xf8\xe5\xfa\x3b\x5d\x7b\xaf\x7c\x3c\xf2\x57\x92\xfa\x12\x0d\xe0\
-\x99\xd7\x8b\x1b\xfc\x45\x5c\x00\xb0\x3d\x66\x65\x1f\x72\x5f\x85\
-\x08\xec\xb0\x18\x02\x97\x53\x77\x17\x76\xcf\x9c\x3b\x7c\x33\x29\
-\x8d\x89\x05\xf0\xf4\x48\xf1\x51\x7b\x0d\x26\x41\x38\xc1\x8a\x00\
-\xa0\x1f\xab\x44\xc4\x8e\x91\x34\xe7\x2f\x62\xe8\xbb\xf3\xa3\xbf\
-\x27\xa1\x33\x91\x00\x9c\xcc\xc9\x2d\xa4\x35\x05\x60\x6b\xa8\x24\
-\x00\x4c\x75\x39\x62\xc5\xe8\xba\x4e\xdb\xde\x31\xfb\xfe\x6b\x3f\
-\xb5\x52\x27\x10\x73\xf6\x9a\xa5\xef\xe0\x7b\x4f\x91\xd6\x0c\xea\
-\x36\xbf\xf4\x11\x18\x80\x12\x2a\x6c\x15\xdf\x9f\x71\x32\xde\xb6\
-\x56\xe9\x5c\xa2\xa5\x01\xa4\x0f\x9c\x4c\x5b\xbe\x7d\x15\xc0\x13\
-\xc1\x0a\x6b\x30\x5f\x89\x18\x08\xc2\x21\xf4\x92\x72\xad\x3f\xeb\
-\xb9\x4d\xca\x0c\xd0\xb2\x00\xd2\xd9\xc2\x0b\x62\x59\x97\x01\x6c\
-\xaa\x7c\x2e\x02\x01\xa4\x0e\xf3\x65\x18\xbb\x13\x36\x19\xc8\x74\
-\x5f\xce\x7b\xbe\x09\xa9\x01\x5a\x12\x40\x3a\x5b\xdc\x23\xe0\x04\
-\xee\xb5\xb5\x95\x08\x59\xcf\x37\x1f\x26\x76\x27\x74\x59\x22\x93\
-\xfd\xb9\xc2\x70\xe3\xf3\xde\xa7\xe9\x00\xdc\xac\xb7\x5f\x80\x71\
-\x00\xa9\x40\xe1\x9e\xf1\x26\xcc\x57\x9d\x27\x65\x84\x9f\xbb\xb9\
-\xe2\xbe\x66\xa7\x6f\xaa\x15\x76\x33\xc5\xb7\x40\x78\x88\xdc\xda\
-\x12\xb7\x7d\x9b\x42\x08\x30\xb8\x0e\x01\xbc\xf4\xb8\xbb\xf3\xf6\
-\x7c\xe9\xe2\xd7\x8d\xce\xdb\x60\x00\x42\x37\xb3\xf1\x18\xc8\x77\
-\x22\x15\xc0\xb0\xc5\xe6\x81\xb2\x73\x0a\x00\x86\xc2\xe6\x60\x8f\
-\xbb\x6b\xdd\x7c\x69\xe2\x52\x23\xef\x0f\x75\xf7\x01\xe5\xbe\xfe\
-\x34\xc0\xfd\xe1\x9a\x40\x12\x31\x1f\x58\x83\x20\x25\x7a\x74\x49\
-\x9c\x7d\xf2\xc6\x63\xb9\xf1\xf1\x97\xa3\x4d\x56\x15\xea\x0a\xa0\
-\xdc\xd7\x7f\x0a\x60\x4f\x54\x98\x18\x4a\xb2\xe6\x2b\xd6\x22\x85\
-\x71\xf7\xd7\x17\x7f\xa6\xb0\xf7\x07\x6f\xf4\x4e\xad\x73\xd5\x1c\
-\xc0\xb3\xfb\x8e\xad\x5f\x5c\xb3\xee\x82\x00\xc1\x9f\x20\x01\x84\
-\x30\x44\xe4\xb6\x4e\x14\x81\x90\x88\x0d\xe1\xd2\xda\xbb\x0b\xc3\
-\xb5\xbe\x3f\xd4\x14\x80\x93\x39\xd1\x4d\xa6\x26\x01\x04\x9b\x10\
-\x11\x90\xf4\xdb\xea\x3c\x8c\x88\x1d\xbd\x16\x30\x2b\x66\x71\xa8\
-\x74\xe6\xd0\x1f\x2b\x0d\x5f\x31\x80\xf4\xc1\x53\xbd\xe2\xfb\x53\
-\x00\x42\x6d\x28\x1b\x6b\x70\x12\x40\x40\x8b\x90\xa0\x17\xe1\xf7\
-\xb6\x91\xc1\x6f\xce\x8e\xfe\x5c\x6d\x6c\xd5\x00\x9c\x8c\xb7\x8d\
-\x94\x29\x00\xbd\xa1\x15\x05\xa4\x69\xf3\xae\x5f\x01\x5a\x08\x87\
-\x00\xfc\x08\xcb\x0c\xce\x7d\xf0\xe6\xf5\xe5\x46\x2d\xdb\x08\xf5\
-\x67\x3d\x97\x94\xab\x88\x35\x8f\x55\x66\x1e\x28\xef\xc6\xb0\xa8\
-\x2d\x30\xd6\xb5\xbe\x57\x0b\x4e\xdc\x08\x60\x99\x00\x9c\x4c\x61\
-\xbb\x81\x4c\x03\xe8\x0e\x2c\x81\x25\xf3\xab\x16\x23\xd1\x10\xba\
-\x2d\xc3\x69\x37\xe7\x0d\xc4\x0d\x88\x1c\x81\x74\xae\x70\x44\xc4\
-\x1a\x8b\xd9\x4e\xff\x71\x28\xa4\xc9\xcf\x9e\x7e\xe3\xdd\xca\xa7\
-\xd1\xff\xe2\x0c\xf3\x0f\x9e\x79\xa0\xdc\xa9\xe4\xc3\x4f\xa3\x47\
-\xe0\x01\xb4\xfe\x2f\x31\xde\xa2\x3b\x80\x3c\x2a\xad\x78\x8b\x5b\
-\x65\x08\x60\x84\x3c\xda\x69\x1d\x8a\xa2\x28\x8a\xa2\x28\x8a\xa2\
-\x28\x8a\xa2\x28\x4a\xa7\xf9\x07\xee\x73\x3f\xf5\xa2\x1e\x57\x1f\
-\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x02\xc0\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x02\x72\x49\x44\x41\x54\x58\x85\xe5\
-\x97\xcf\x4e\x13\x61\x14\xc5\x7f\xf7\x6b\xbb\x22\x31\x51\xc0\x08\
-\xbb\xbe\x82\xd0\x8a\xd1\x18\x4c\x5c\x09\x71\xc5\x1b\xd0\xd0\x26\
-\x40\x49\x8c\xc2\xb2\x69\x58\x95\x44\x23\x2d\x90\x42\xc0\xc4\xb0\
-\xc1\xbd\x4d\xd8\x28\x89\x89\x8a\x40\x7d\x05\x58\x29\x11\x31\x71\
-\xc1\xaa\x76\xae\x8b\xce\xd4\xb1\xd0\x3f\x53\x06\x17\x7a\x96\xe7\
-\xde\x99\x73\xe6\xdc\x6f\x32\x77\xe0\x7f\x87\xd4\x12\xfd\x89\xdc\
-\x2d\x54\x67\x10\x06\x50\xba\x7d\x52\x39\x42\xd9\x46\x24\xb3\x97\
-\x9f\x7c\x57\xd7\x40\x24\x3e\xff\x48\x91\xb9\xb3\x8c\xf9\x04\x4b\
-\x95\xe9\xe2\x4a\xf2\xc9\x29\x03\x7d\x63\xcf\x6e\x8b\x98\xb7\xc0\
-\x0f\x44\x93\xa1\x52\xb9\xf0\x61\xed\xe1\x77\x3f\x54\x6f\x8e\x3e\
-\xbd\x52\x0a\x05\x86\x50\xc9\x02\x97\x10\xb9\xe3\x24\x11\xac\x3a\
-\x11\x33\x0d\x08\xa2\xc9\xbd\xfc\xd4\xba\x1f\xc2\x0e\xec\x07\x59\
-\xef\x8f\x67\x05\x78\x81\xea\x0c\xf0\x00\xc0\x54\xbb\x84\x01\x80\
-\x50\xa9\x5c\xf0\x53\xdc\x0d\x13\x34\x85\x8a\x14\x37\xaa\x5c\xb5\
-\x6a\x1f\x38\xbf\x62\x3f\x0b\x3b\x8b\x13\xc7\x15\x29\xae\x3a\x5c\
-\xb0\x7e\x7b\x7b\xb8\x9e\x58\x18\x36\x6a\xad\x00\x58\x62\xc6\x3e\
-\xe5\x27\x5e\x35\xea\xf7\xd5\x40\x34\x96\x0b\x5b\x6a\x6d\x00\x1d\
-\x00\xb6\x91\xde\x46\xd7\x98\x46\x45\x4f\x48\xa5\x8c\x15\xd0\xe7\
-\x8e\x78\xab\xf0\xcd\x40\xe4\xb0\x2b\x01\x0c\xba\x39\x55\x66\xff\
-\x8a\x81\x68\x2c\x17\x56\x74\xae\x86\xde\x2a\xf6\x1c\x2f\x5f\xbc\
-\x81\xb3\xa3\x3f\x31\x65\x19\x25\x9d\xb6\x9a\x5d\xde\xf4\x10\x36\
-\x3b\xd5\x91\xc3\xae\x84\xa2\x83\x6e\x4e\x95\xc7\x3b\xab\x93\xfb\
-\xad\xf8\x6f\x9a\x80\x2d\xde\x03\xf4\x18\xb5\x36\xa2\xb1\x5c\xd8\
-\xa9\x9d\x27\x7a\x07\x5e\x5f\xc3\x0e\x2b\xa0\x6b\xa4\x52\xf7\x00\
-\xac\xc3\xf6\xa3\x6f\xd9\x80\x2a\xb3\x22\x2c\xb9\xa8\xbb\x7d\x5f\
-\x3a\xe3\x46\x44\xce\x13\xbd\x83\xa6\x23\xb0\xe3\xdc\x72\x73\x22\
-\x2c\x29\xba\x58\xd3\xea\x29\xfa\x96\x0d\x90\x4e\x5b\xa6\x2c\xa3\
-\xc0\x49\x83\x2e\xcf\xd1\xb7\x6e\x00\xd8\x59\x9d\xdc\x17\x64\xba\
-\x5e\xbd\x9d\xe8\x3d\x19\x00\xd8\xbd\xf6\x2d\x4f\xcd\x28\x6c\xb4\
-\x15\xbd\x67\x03\x75\x46\xd1\x76\xf4\xde\x0d\xe0\x8c\x42\x47\x14\
-\x0e\x14\x0e\x04\x1d\x69\x37\x7a\x07\x9e\x3f\xc7\xbb\xcb\x53\x9b\
-\x40\xb8\x69\x63\x8b\x70\xaf\x64\x47\x50\x59\x20\xfd\xba\x79\x2d\
-\xa2\xe3\x0b\x9d\x15\x29\xbe\x9e\x36\xa0\x6c\x03\x94\x42\x81\xa1\
-\x8b\x32\x60\xfd\xb4\x86\x2a\x52\x7c\x74\xb8\xdf\x23\x10\xc9\xa0\
-\x3a\x8c\x4a\xb6\x3f\x9e\x15\x13\x34\x05\x67\x87\x3b\x2f\xa2\xe3\
-\x0b\x9d\xb6\xf8\x3c\x60\x21\x92\xa9\xca\xba\x1b\xed\x1f\x93\x0c\
-\x7e\x6e\x4a\x7f\xe2\xd4\x8f\x49\xc0\x5d\xfd\x5c\xdc\x7c\xdf\x1b\
-\xb9\xff\x1a\xe8\x16\xb8\x8c\xc7\xf5\xaa\x1e\xec\x99\xbf\x41\x24\
-\x56\x5c\x4e\xbe\xf4\xe3\x9e\xff\x0e\x7e\x01\x29\x72\x01\x2f\x4e\
-\xc0\xa2\xca\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x00\xc0\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x00\x72\x49\x44\x41\x54\x78\x9c\xed\
-\xd0\xb1\x09\x83\x60\x14\x04\xe0\xd3\x21\xc4\x26\xe0\x4c\x59\xc1\
-\xca\x89\xdc\x24\xf3\x08\x69\xc4\x21\x34\xad\xf8\xd7\x2a\xc4\xef\
-\x2b\x8f\x57\xdc\xbb\x04\x00\x00\x00\x00\x00\x00\x78\x82\xea\x18\
-\x4c\xd3\xf7\x9d\x2a\x63\x92\xe6\x86\x3e\x67\x9a\xb3\xa5\xef\xba\
-\xd7\x67\x1f\xd6\xc5\xd9\x7f\x3e\x9f\x24\x6d\xea\x8c\xc7\xb0\x1c\
-\xe0\x61\xca\x01\xb6\x0c\x49\x96\xeb\xab\x9c\x6e\xce\x9a\xe1\xee\
-\x12\x00\x00\x00\x00\x00\x00\x00\xc0\xf5\x7e\x5a\x95\x0d\x08\xf2\
-\x12\x5b\xad\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x00\xa7\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x00\x59\x49\x44\x41\x54\x58\x85\x63\
-\x60\xa0\x00\xb8\x85\xa4\x34\xb8\x85\xa4\x34\x50\x62\x06\x13\x25\
-\x9a\xa9\x01\x46\x1d\x30\xea\x80\x51\x07\x8c\x3a\x60\xd4\x01\xa3\
-\x0e\x18\x70\x07\xb0\x50\x6a\xc0\x7f\x06\x06\x07\x4a\xaa\xe4\xa1\
-\x1f\x02\x8c\x0c\x0c\x07\x76\xad\x99\xd3\x40\xae\xfe\x01\x0f\x81\
-\x51\x07\x8c\x3a\x60\xd4\x01\xa3\x0e\x18\x75\xc0\xa8\x03\x06\xdc\
-\x01\x00\x05\x9e\x09\x3f\xb6\x6d\xc4\xbd\x00\x00\x00\x00\x49\x45\
-\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x00\xf6\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x00\xa8\x49\x44\x41\x54\x78\x9c\xed\
-\xd0\xb1\x0d\x80\x30\x00\xc4\x40\xc2\x1e\x11\xec\x3f\x15\x88\x41\
-\x42\xcb\x06\x47\x61\x77\x5f\xbd\xe5\xb1\x21\xae\xfb\x59\xdf\x7d\
-\x1e\x73\x08\x8f\x5d\x9c\xfe\x89\x02\x68\x01\x4d\x01\xb4\x80\xa6\
-\x00\x5a\x40\x53\x00\x2d\xa0\x29\x80\x16\xd0\x14\x40\x0b\x68\x0a\
-\xa0\x05\x34\x05\xd0\x02\x9a\x02\x68\x01\x4d\x01\xb4\x80\xa6\x00\
-\x5a\x40\x53\x00\x2d\xa0\x29\x80\x16\xd0\x14\x40\x0b\x68\x0a\xa0\
-\x05\x34\x05\xd0\x02\x9a\x02\x68\x01\x4d\x01\xb4\x80\xa6\x00\x5a\
-\x40\x53\x00\x2d\xa0\x29\x80\x16\xd0\x14\x40\x0b\x68\x0a\xa0\x05\
-\x34\x05\xd0\x02\x9a\x02\x68\x01\x4d\x01\xb4\x80\xa6\x00\x5a\x40\
-\x53\x00\x2d\xa0\x29\x80\x16\xd0\x14\x40\x0b\x68\x0a\xa0\x05\x34\
-\x2f\x70\x51\x04\x80\x66\x61\x99\xa8\x00\x00\x00\x00\x49\x45\x4e\
-\x44\xae\x42\x60\x82\
-\x00\x00\x03\xf4\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x03\xa6\x49\x44\x41\x54\x58\x85\xe5\
-\x97\x4f\x68\x1c\x55\x18\xc0\x7f\xdf\x9b\xec\x26\x5a\x93\x88\x96\
-\x98\x9a\xdd\xc9\xee\xc6\x80\x86\x3d\x78\x90\x42\x0f\xf5\x4f\x29\
-\x2d\x22\x6d\xaa\xa0\x22\x52\x0b\x55\xf1\xd0\x9b\x20\xa4\x78\xe8\
-\x41\xd1\x80\x27\xa5\x28\x88\x20\x88\x5e\x0d\x36\x6a\xb5\x60\x69\
-\x4f\x52\x1a\x28\xc2\x2a\x91\x6d\xb2\x7f\x66\xb6\xab\x78\x90\xd8\
-\x58\x35\x99\x79\x9f\x87\x9d\x5d\x93\x6c\xd2\x64\xd9\x8d\x97\x7e\
-\x97\xf9\xf8\xe6\x9b\xf7\xfb\xbd\x61\xde\xcc\x1b\xb8\xd5\x43\x5a\
-\x69\xbe\x5a\xa9\x24\x63\x81\x3d\x62\x91\xfd\x82\x26\x51\x12\x08\
-\x06\xa5\x82\xe0\x0b\x5c\x34\x86\xa9\x64\x32\x99\xef\xa8\xc0\xbc\
-\xe7\xed\x36\x96\x49\xe0\xb1\xad\xf4\x2b\x5c\x36\xc8\xc9\xe1\xe1\
-\xc4\x77\x6d\x09\xcc\xcd\xcd\xf5\x3b\x4e\xfc\x03\x84\xe7\xa2\x52\
-\x55\x61\x1a\xd1\xb3\x2a\x32\x1f\x76\x75\x55\x6f\x0b\x43\x1b\x86\
-\xe1\xa0\xaa\x93\x52\xd1\x03\x02\xe3\xc0\x70\xd4\xff\xb5\x0d\x97\
-\x8f\x67\x32\x99\x5f\x5b\x16\xf0\x3c\xef\xbe\xd0\xea\x19\x90\x07\
-\x80\xaa\xc0\x29\xd7\x4d\x7c\x2c\x22\xc1\xcd\xa4\x55\xd5\x14\x3d\
-\xef\x59\x51\x79\x13\xc8\x20\x94\x6d\x20\x87\x33\x99\xc4\x0f\x5b\
-\x16\x28\x95\x4a\x19\xc5\x5c\x02\x76\x0a\x7c\xb1\xb4\xf4\xf7\x0b\
-\xa3\xa3\xa3\x7f\xdc\x0c\xbc\x36\xf2\xf9\x7c\x77\xac\xbb\xe7\x7d\
-\x94\xe3\xc0\x9f\xa8\xd9\x9b\x4a\x0d\x5d\xd9\x54\x20\x9f\xcf\xf7\
-\xc5\xe2\x3d\xdf\x03\x63\x0a\xef\xa6\xdc\xc4\xab\x22\x62\x5b\x81\
-\xd7\x43\x55\xa5\x58\xae\x4c\x08\xfa\x16\xe0\xa3\xe1\xee\x54\x2a\
-\x55\x5d\xd9\x63\xd6\x5e\x14\x8b\xf7\x9c\xae\xc1\x75\xba\x1d\x38\
-\x80\x88\x68\xca\x1d\x9a\x04\x3e\x02\x12\x88\xf3\xa9\xaa\xae\x9a\
-\xf4\x2a\x81\x72\xb9\xfc\x10\x70\x14\xe5\x37\x1b\x2c\x1f\x6d\x07\
-\xbe\x52\x62\xf1\xfa\xc2\x09\x60\x16\xd8\x57\x2a\xf9\x8f\x6f\x28\
-\x60\x95\xb7\x6b\x17\xf1\xc6\xc8\xc8\xc8\x42\xbb\xf0\x7a\x64\xb3\
-\xd9\x25\x94\xd7\x01\x54\x98\x5c\x79\x17\x1a\x49\xb1\x58\xdc\x85\
-\x38\x15\xe0\xf7\xc5\xeb\x0b\xbb\xb2\xd9\xec\x52\xa7\x04\xa0\xf6\
-\x3c\x94\xca\xfe\x4f\xc0\xfd\x36\x94\x07\xeb\xab\xa2\x71\x07\x44\
-\x9c\x43\x91\xd0\x57\x9d\x86\xd7\xc6\x17\x55\x38\x03\x20\x8e\x3e\
-\x59\xaf\x37\x04\x54\x79\xb4\x96\xf0\x4d\xa7\xe1\x0d\x09\x95\x6f\
-\xa3\x74\x5f\x93\x00\x22\xc9\x28\x29\x6c\x97\x80\xea\xf2\x3c\x80\
-\x40\xa2\x59\x20\x2a\xaa\x2e\x57\xd9\xa6\x08\x82\xa0\x3e\xf6\x50\
-\xfd\x41\x6c\x7a\x0f\xfc\x8f\xb1\x56\xc0\x56\x6a\xc7\xd8\xe0\x76\
-\x11\x1d\x67\x47\x34\xb6\x5c\xab\xbf\x63\xfe\x13\x50\xe3\xd5\xba\
-\x6c\x7a\xbb\x04\x8c\xb1\x99\x28\xf5\x1b\xb5\x06\x5f\xb8\x00\x60\
-\x94\x83\xdb\x25\x20\xa2\x07\x00\x14\x3d\xdf\x24\xe0\x88\x9d\xae\
-\x9d\x94\x27\x66\x66\x66\x62\x9d\x86\xab\xaa\x28\x1c\x06\xc0\xca\
-\x54\x93\x80\xeb\xba\xd7\x80\xf3\xc0\xce\xbb\x07\x06\x5e\xea\xb4\
-\x80\xe7\x79\x87\x80\x31\xe0\xc7\x54\x6a\xa8\xb1\x37\x58\xb5\x0a\
-\x8c\xe8\x04\x80\xa8\x39\x95\xcf\xe7\xfb\x3a\x05\xcf\xe5\x72\x71\
-\xab\x52\xfb\xce\x60\x4e\x8a\x88\xae\x2b\xe0\xba\xee\x65\xe0\x33\
-\xd0\x7b\xe2\xf1\x9e\x4f\x54\xb5\xed\x65\xaa\xaa\xd2\xdb\xdb\xf7\
-\x1e\x30\x86\x70\xc1\x75\xef\xfd\x72\xe5\xf9\x26\x40\x18\x2c\x9d\
-\x00\x66\x15\xc6\x4b\xa5\xca\x3b\xed\x48\xa8\xaa\x94\xcb\xfe\x6b\
-\x8a\xbc\x02\x5c\x33\xe8\xf3\x2b\x67\x0f\x1b\x6c\xc9\x6a\xfb\x41\
-\x2e\x01\x77\x21\x7c\x7e\x7b\x4f\xf7\xb1\x81\x81\x81\xc5\x56\xe0\
-\xb9\x5c\x2e\x7e\x47\x6f\xff\x69\xe0\x65\xe0\x86\x11\x7d\xc4\x75\
-\xdd\x99\xb5\x7d\xeb\xce\x2e\x99\x4c\x5e\x0d\x1d\xd9\x03\xfc\x8c\
-\xf2\xd4\x8d\xbf\xfe\x99\x2d\x16\xbd\x17\x55\xb5\x6b\x33\xb0\xaa\
-\x9a\x52\xc9\x7f\x66\x47\x6f\x7f\x2e\x82\xfb\xa8\xb3\x77\x3d\x38\
-\x6c\xb2\x2d\x2f\x14\x0a\x77\x62\x9c\x0f\x05\x79\x3a\x2a\xf9\xa8\
-\x4c\x8b\xc8\x59\x08\xe6\x8d\x31\xd5\x20\x08\x2c\xc4\x07\x71\xc2\
-\x61\xb1\x1c\x44\x64\x1c\xc8\x44\x83\x9f\xb3\x36\x38\x96\x4e\xa7\
-\x7f\xd9\x88\xb1\xa5\x1f\x93\x62\xd1\xdf\x23\xa2\x93\x0a\x0f\x6f\
-\xa5\x1f\xb8\x62\x45\x27\x32\xae\x7b\x6e\xb3\xc6\x96\x7e\xcd\x0a\
-\x85\x42\x0a\x13\x3b\x22\xe8\x7e\x94\x24\x42\x02\x70\x00\x5f\xc0\
-\xb7\xc8\x45\xac\x4c\xa5\xd3\x43\xb3\xad\x8c\x7b\x6b\xc7\xbf\xc1\
-\x7f\x6c\x10\x0e\xdc\xa9\xdc\x00\x00\x00\x00\x49\x45\x4e\x44\xae\
-\x42\x60\x82\
-\x00\x00\x02\x8a\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x02\x3c\x49\x44\x41\x54\x58\x85\xed\
-\x97\x3d\x6b\x14\x51\x14\x86\x9f\x73\xc7\x2e\x60\x61\x30\xa0\x66\
-\xdc\xd9\x5f\x61\x40\x91\x58\x6f\xca\xb4\xda\x04\xd4\xca\xca\xc4\
-\x1f\x90\x6a\x03\x16\x06\x0c\x2a\x68\x9d\x3a\xb8\x60\x17\x10\x84\
-\xe4\x57\xec\xbd\x99\xb1\x49\x50\xb0\x48\xb9\xf3\x5a\xec\x4e\x4c\
-\x26\xfb\xbd\x13\x1b\x7d\xab\xcb\x39\x77\xe6\x3c\xf3\x9e\x0b\x73\
-\x0f\xfc\xeb\xb2\x72\x20\x84\xef\xf7\x73\x3a\xaf\x4c\xb6\x84\x71\
-\xb3\x92\x2a\xe2\x44\xa6\x03\x47\xd4\xac\xd5\xee\x7c\x1b\x08\xe0\
-\xfd\xd1\x4b\xcc\xb6\xfa\x81\x55\xa4\x1c\x69\x23\x49\xee\xbe\xbe\
-\x04\x10\x42\x78\x20\xdc\x57\xe0\x97\x61\x2f\x9c\x53\x2b\x8e\xe3\
-\x9f\x55\x54\x4d\xd3\xf4\x46\x9e\x5b\x43\x68\x1b\xb8\x6e\xb8\x87\
-\x65\x27\x68\x87\xa3\x3d\x1f\x52\x85\x90\x3d\xae\xa2\x68\x3f\x85\
-\x90\x3d\xf1\x21\x55\x3b\x1c\xed\x15\x31\x57\x2c\x4c\xb6\x04\xe0\
-\x9c\x5a\x57\x05\x10\x45\xb4\x00\x0c\xbb\x77\x09\xa0\x38\x70\x55\
-\xd9\xde\x4f\x8b\x8b\x8b\x3f\x7a\xcb\x85\x22\x76\xad\xea\x22\x21\
-\x64\x2b\x42\x1f\x00\x0c\x7b\x5a\xab\x2d\x7e\x1e\xb6\xbf\x52\x00\
-\xef\x7d\x5d\x68\x17\x98\x03\xe8\x81\xdc\x1e\xf6\x8c\x1b\x96\x9c\
-\x44\x92\x1c\x2e\xfa\x54\x14\x1f\x57\x95\x01\x84\x34\x7d\x8e\x58\
-\xbe\x00\x65\xda\xfc\x2b\x00\xde\xfb\x3a\xb2\xad\x52\x78\x3f\x89\
-\xe3\xf7\x57\x0e\x30\xc0\xfa\x53\xd4\x59\x33\xb3\x7c\xd4\xf3\x23\
-\x0f\xe1\xa8\x53\xdd\xb5\xde\x96\x2f\x40\x99\xd6\xeb\xb5\xa4\x3d\
-\xce\x07\x8c\x74\xa0\x57\xfc\x16\x70\x4b\x68\xd7\x7b\x5f\x2f\x72\
-\xb3\x58\x3f\x36\x40\x49\x73\x58\xf4\x51\x92\x9b\xd5\xfa\x42\x23\
-\x5b\x20\xd3\xa6\xc9\x76\xce\x85\x1e\xf9\x34\x7d\x66\x60\xb3\x58\
-\x5f\x68\xa4\x03\x3d\x3b\xf7\xcf\xc7\x4c\xb6\x83\xec\x6d\x69\xeb\
-\x44\xd6\x8f\x0d\x60\x66\x39\xea\xac\x01\xa7\x43\xb6\x4d\x6c\xfd\
-\xd8\x00\x00\x49\x92\xb4\x31\x6d\x0c\xca\xcb\xb4\x9e\x24\x93\x59\
-\x3f\x11\x00\x40\x2d\x8e\xdf\x51\x6a\x45\x4f\x53\x59\x3f\x31\xc0\
-\x80\x56\x4c\x6d\xfd\xc4\x00\xd0\x6d\x85\x1c\xab\x60\x1e\xcc\xcb\
-\xb1\x3a\xad\xf5\x85\x26\xfe\x1d\xd7\xe3\xf8\x0b\x50\x1f\xb9\x71\
-\x4c\xfd\x71\x40\x9c\x40\xf7\x02\x59\xd5\xcb\xcb\xca\xb2\x6c\xbe\
-\xb7\x3c\xbe\x04\x20\xd3\x01\x40\x9e\x5b\xe3\xaa\x00\x3a\x1d\x1a\
-\x00\x42\x87\x45\xec\xac\x05\x8e\xa8\x29\xf2\x15\xa1\xed\x10\x32\
-\x8b\x22\x5a\xe7\xee\x70\x33\x29\xcb\xb2\xf9\x4e\x87\x86\xd0\x1b\
-\x20\x77\x44\xcd\x22\xd7\x6f\x30\x69\x52\xe1\x45\xa5\xa4\xc1\x83\
-\x49\xa1\xb3\xd1\xac\x7b\x75\x5e\x28\xe7\xa7\xd4\xb1\xd0\x61\xbf\
-\xd1\xec\xbf\x7e\x03\x1f\xb0\x01\x10\x54\x88\x8f\x55\x00\x00\x00\
-\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x00\x89\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x00\x3b\x49\x44\x41\x54\x78\x9c\xed\
-\xd0\x01\x09\x00\x20\x10\x04\xc1\xd7\xfe\x21\x15\x83\xf8\x29\xe4\
-\x40\x66\x12\x2c\x5b\x05\x00\x00\x00\x00\x00\x00\xc0\xff\xc6\xda\
-\xe7\xa6\x23\x92\x66\x3a\x20\xcd\x80\x74\x00\x00\x00\x00\x00\x00\
-\x00\x00\xbc\xd7\x42\xd4\x03\xab\xc4\x79\xcd\x85\x00\x00\x00\x00\
-\x49\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x01\x20\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x00\xd2\x49\x44\x41\x54\x78\x9c\xed\
-\xd0\xb1\x15\x82\x50\x10\x44\xd1\x5d\x8b\xa0\x16\xeb\xa0\x05\x22\
-\x2b\xb2\x0b\xea\xb0\x0e\x22\xab\x00\x03\x34\xd3\x94\xeb\x39\xcc\
-\x8d\x7e\xf6\x67\x5f\x55\x44\x9c\x59\xab\x8f\xaf\xf3\x36\x6e\xb5\
-\xdd\xf7\x11\x7d\x7b\x8c\x3d\x8b\x1d\x17\xf1\x69\x55\xd5\xfb\xf8\
-\xa1\xaa\x86\x4f\x08\x81\x05\xa8\xfd\xf8\x6f\xef\x43\xc9\x00\x7f\
-\x21\x01\xf4\x00\x2d\x01\xf4\x00\x2d\x01\xf4\x00\x2d\x01\xf4\x00\
-\x2d\x01\xf4\x00\x2d\x01\xf4\x00\x2d\x01\xf4\x00\x2d\x01\xf4\x00\
-\x2d\x01\xf4\x00\x2d\x01\xf4\x00\x2d\x01\xf4\x00\x2d\x01\xf4\x00\
-\x2d\x01\xf4\x00\x2d\x01\xf4\x00\x2d\x01\xf4\x00\x2d\x01\xf4\x00\
-\x2d\x01\xf4\x00\x2d\x01\xf4\x00\x2d\x01\xf4\x00\x2d\x01\xf4\x00\
-\x2d\x01\xf4\x00\x2d\x01\xf4\x00\x2d\x01\xf4\x00\x2d\x01\xf4\x00\
-\x2d\x01\xf4\x00\x4d\x06\x78\xfe\x78\x1f\xca\x05\x58\x7b\xea\xae\
-\xa5\xbb\x96\x5a\x7b\x62\x3b\x22\xe2\xd4\x5e\x68\x08\x13\x4e\x3b\
-\x46\xe4\xd2\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x04\x01\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x03\xb3\x49\x44\x41\x54\x78\x9c\xed\
-\x99\x4f\x68\x5c\x45\x1c\xc7\xbf\xdf\xd9\x4d\x08\x88\x27\x5b\xb1\
-\xbc\xbc\x9d\x8d\x8d\xb2\x67\x15\x4f\xed\x21\xfe\xa3\x5a\x28\x82\
-\x17\x3d\x09\xc6\x58\xc1\xa3\xa2\xa0\x88\x94\x7a\x69\x05\xbd\x56\
-\xb1\xe0\x49\x10\xa4\xda\x8b\x95\x42\xa5\x5e\x2d\xf5\x2c\x12\x92\
-\x7d\x79\x59\x11\x8d\xa7\x08\x4d\x36\xfb\xe6\xeb\x61\x37\x74\xf7\
-\xbd\xb7\x64\x93\x7d\xbb\x1b\xe9\x7c\x4e\xcb\xfc\x66\xe6\xf7\xfd\
-\xce\x9b\x79\x6f\x66\x16\xf0\x78\x3c\x1e\x8f\xc7\xe3\xf1\x78\x3c\
-\x1e\x8f\xc7\xe3\xf1\xdc\x5b\x30\x5d\x10\x45\x8d\x8f\x44\x7d\x28\
-\xe7\x4a\x24\x1d\x00\x4d\x40\x57\x91\x50\x92\xa1\x31\x09\xc5\xf3\
-\xd6\x06\xe7\x7a\x82\xe9\xda\xf5\x28\x6e\x01\x28\x8d\x4d\xde\x78\
-\x49\xaa\x36\x2c\x77\x17\x98\x49\x29\x39\x2c\x64\x06\x80\xc0\xc7\
-\xf8\xff\x4f\xfb\x3c\xd4\xf1\xd6\x43\x66\x09\x00\x40\xbd\xbe\xbe\
-\x00\xea\x2a\x80\xfb\x53\x7d\x88\xa4\xd3\x21\x1e\x1e\x01\x86\x59\
-\x5f\x9b\x72\x38\x33\x37\x17\xde\x4c\xd7\xcf\x1d\x00\x00\x88\xa2\
-\xe8\x71\xc1\xfc\x08\xe0\x48\xaa\x89\x00\xb9\x02\xb4\x8e\x02\x83\
-\xac\xa7\x0d\xc2\x9d\xb2\xd6\xde\xee\xd7\x20\x17\x6b\xed\x6d\x97\
-\x98\x13\x04\xe2\xde\x88\xc8\x43\xf8\xee\x60\x9e\x79\x62\xcd\x25\
-\xe6\x44\x3f\xf3\xc8\x34\xc8\x61\xb9\xd1\x08\xcb\x2d\x77\x1d\x40\
-\x2d\xd5\x52\x10\xdd\xe4\x5f\x17\x04\x28\x03\x65\xbc\xfc\xd6\x2a\
-\x9b\xe7\xe6\x83\x20\xce\x6d\x76\xb7\xf5\xde\x34\x1a\x8d\x23\x3b\
-\x2d\x77\x0d\xc0\x13\xdd\xe5\x12\x40\x32\x99\xe4\x20\x48\x28\x31\
-\xe5\x42\xc0\xad\xe9\xb2\x79\x21\x08\x82\x8d\xbd\xda\x0f\x34\x95\
-\x83\x20\xd8\xd8\xba\x33\xf3\x14\x80\x9f\xba\xcb\x49\x40\x50\x69\
-\xa0\x51\x2c\x1c\x51\xc8\x9a\x07\x70\x63\xfb\xce\xcc\xd3\x83\x98\
-\x07\xf6\xb1\x96\x6b\xb5\xa3\x9b\x72\xad\xd3\x20\xbe\xeb\x2e\x27\
-\x00\x01\x25\x0d\x38\x9b\x8a\xa0\x9d\x8b\x26\x93\x90\xb8\xb2\xd3\
-\xdc\x3a\x5d\xab\x1d\xdd\x1c\xb4\xaf\x7d\x8b\x96\x54\x8e\xe2\xf5\
-\x4b\x10\x16\x73\xa2\xae\xfd\x95\x18\x25\x22\xc0\xec\x83\x23\x2e\
-\xdb\x70\xf6\x6c\x7b\x49\x0e\xce\xbe\xdf\xe6\x24\x5b\x36\x9c\x5d\
-\x02\xf0\x49\x4e\x34\xef\x33\x54\x24\xb9\xe6\x05\x5c\xb4\xe1\xec\
-\xd2\x7e\xcd\x77\x3a\x3c\x38\x51\x14\xbf\x2b\xe0\x42\x4e\xa8\xf0\
-\x43\x14\xdb\x53\x2b\x6f\xe7\xfa\x9e\xb5\xe1\xc5\x21\xfa\x1d\x8e\
-\x7a\x3d\x7e\x1d\xc4\xe7\x48\x8b\x23\x1d\x54\xd0\x9e\x91\x24\xa4\
-\xb4\x79\x07\xe1\x8d\x6a\x35\xbc\x3c\x54\xd7\xc3\x34\xde\xa5\x5e\
-\x8f\x5f\x02\xf1\x35\x80\xe9\x54\x48\x68\xcf\x86\x83\x23\x18\x30\
-\xa3\xb3\x09\xe1\x95\x6a\x35\xbc\x32\x54\xdf\x28\x70\xbd\x46\x51\
-\xe3\x19\xc1\x7d\x0f\xe0\xbe\x54\x48\x24\xf6\x7d\x7e\x20\x01\x49\
-\xa6\xfd\xab\x87\x7f\x09\xbe\x68\xed\xec\x8d\x21\xe4\xde\xcd\x53\
-\x44\x27\xbb\xac\xc4\xf1\x93\xc6\xe1\x07\x00\x0f\xa4\x42\x07\x99\
-\x09\x79\x2f\xd4\x7f\x0c\xf5\x7c\xa5\x52\xb9\x75\x50\x8d\x79\x49\
-\x0a\xe3\xe1\x30\xfc\x05\x4a\x4e\x02\x68\xa4\x42\x04\x07\xcf\x95\
-\xbb\xaf\x07\xd6\xa1\xe4\x64\x91\xe6\x91\x93\xa4\x10\x56\x56\xfe\
-\xb0\xc6\x24\xd7\x41\x3c\x9a\x4a\x27\x10\x0e\x7d\xd7\x43\x9f\x7d\
-\xbd\xf0\x7b\x92\x98\x67\x8f\x1f\x0f\xd6\x8a\xd6\x3a\xb2\x6f\xf6\
-\xf2\xf2\x9f\x0f\x96\xa7\x9a\xd7\x00\x3e\xd6\x13\x90\x00\x9a\x9c\
-\xf3\x03\x01\xb9\x52\x76\xc9\xeb\xd7\x9d\xe9\xa9\x53\x8f\x1c\x3b\
-\xf6\xf7\x28\x74\x8e\xec\x58\x3b\x3f\xff\xd0\x5f\x3b\xcd\xed\x05\
-\x08\x3f\xf7\x04\x48\x48\xea\xb9\x73\x6c\x6f\xa7\x95\x35\x4f\xdc\
-\xdc\x69\x6e\x2f\x8c\xca\xfc\x6e\xee\x91\xb2\xba\xba\x3a\x03\x33\
-\xf5\x0d\xa1\x33\xdd\xe5\x9d\xe7\xef\x3a\x22\xf2\x36\x38\x57\x9d\
-\x6b\xbd\x3c\x37\x37\xb7\x35\x4a\x7d\x63\x39\xc0\x48\x2a\xaf\xad\
-\xc5\x5f\x0a\x7c\x75\x90\xfa\x04\xbf\xaa\x54\x82\x25\x92\xad\x51\
-\x6b\x1b\xcb\xcd\x0e\xc9\x56\xa5\x12\xbe\x06\xe9\xb3\x3d\x2b\x8b\
-\x9f\x56\x2a\xc1\xe2\x38\xcc\x03\x63\xbc\xda\x22\xe9\xac\x0d\xdf\
-\x06\xf9\x41\xbf\x3a\x02\xdf\xb7\x36\x78\xa7\xf3\x87\xcc\x78\x74\
-\x8d\x2b\x51\x37\xab\xd1\xfa\x59\x42\x97\xba\x8a\x44\xe0\x4d\x6b\
-\xc3\x2f\xc6\xad\x65\x32\x97\x39\x00\x56\xa3\xf8\x02\x81\x45\x00\
-\x09\xc1\xb7\xac\x9d\xfd\x76\x52\x5a\x3c\x1e\x8f\xc7\xe3\xf1\x78\
-\x3c\x1e\x8f\xc7\xe3\xf1\x78\x3c\xf7\x12\xff\x01\x83\xc1\x2a\x8b\
-\xb6\x49\x04\xca\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
-\
-\x00\x00\x00\x68\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x00\x1a\x49\x44\x41\x54\x58\x85\xed\
-\xc1\x01\x01\x00\x00\x00\x82\x20\xff\xaf\x6e\x48\x40\x01\x00\x00\
-\x00\xef\x06\x10\x20\x00\x01\x47\x01\xa0\x88\x00\x00\x00\x00\x49\
-\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x03\x5e\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x03\x10\x49\x44\x41\x54\x78\x9c\xed\
-\x99\xd1\x4b\x53\x51\x1c\xc7\xbf\xe7\x6c\x3a\x37\xca\xa2\x88\x1e\
-\xaa\x87\x46\x11\x24\x3d\x54\x90\x91\x09\xd1\x9c\x31\x91\x32\x2f\
-\x23\x7a\x4a\xe9\x6a\x10\x48\x7f\x40\xd0\x1e\xea\x2d\xa2\xde\x8a\
-\xb9\x2d\x1f\xd2\x82\xb5\x19\x8b\x2c\xb7\x52\x1f\xc2\x20\xb0\xa8\
-\xcc\x12\xb4\x1e\xca\x82\xc8\x32\x57\x8e\x9c\x3b\xa7\x27\x69\x5e\
-\xaf\x0d\xc1\x73\xae\xd0\xf9\x3c\x7e\x7f\xb0\xef\xf7\x7e\xef\xd9\
-\xce\xb9\x77\x80\x42\xa1\x50\x28\x14\x0a\x85\x42\xa1\x50\x28\x14\
-\x8a\xff\x0d\x22\xda\xc0\xab\xe9\x1d\x00\x8e\x03\x00\x38\x69\x4c\
-\xc5\x5b\xdb\x44\x7b\x2e\x06\xa1\x05\x1c\x68\x68\x28\x29\x4a\xdb\
-\x33\xf9\x1a\xe5\xec\x60\x77\x3c\xd2\x2b\xd2\x77\x31\x50\xa1\x9f\
-\xfe\xcb\x65\x37\x4a\x8c\xd0\x1e\x4f\x7d\xa3\x5b\xa8\xef\x22\x90\
-\xf1\x15\xe0\x66\xba\x33\xcb\x4a\x13\x89\x48\x5a\xb4\x7f\x21\xc4\
-\xae\x00\x00\xab\xe9\x8f\x79\xab\x00\x00\x32\x45\x74\x32\x10\x08\
-\x08\xf7\x2f\x84\xf0\x00\xd1\x68\x34\x67\x2f\xc9\xac\x32\x9b\xf5\
-\x0f\x8e\xe5\x44\xfb\x17\x42\xca\x1d\xb8\xdf\xde\x3e\x49\x29\xdf\
-\x6a\x36\xf3\x6a\xfa\x63\x19\x19\x16\x42\xda\x12\xec\x8e\x86\x47\
-\x40\x78\x95\xc9\xa8\xa2\x5a\x6b\xba\x28\x2b\x87\x11\x9b\x4c\xb3\
-\x77\x43\xcf\xdf\xbb\xb7\xef\x1c\x27\x20\x35\x86\xd1\xbe\x2d\x65\
-\xbb\x47\x46\x87\x9e\xbd\x92\x99\x07\x90\xb0\x0b\x98\xe1\xd5\xf4\
-\x36\x00\x27\x8c\x3a\xa5\xbc\xbc\x3b\x1a\x7e\x2a\x33\x8b\x25\x05\
-\x00\x80\x57\xd3\x47\x01\xcc\x3f\x0f\x64\xd9\x86\x54\x22\xf2\x49\
-\x56\x0e\xcb\x0a\x00\x16\x3e\x23\xfc\xa4\x2b\x5d\x4f\xa2\x97\x33\
-\x66\xb3\xa5\xc6\xd2\x7d\xf8\xdb\x5a\x5a\x6c\xa6\xaf\x60\xe9\x29\
-\x48\xba\x39\x96\x16\x30\x10\x0c\x66\xb3\xc5\x74\x9d\xd9\xcc\xab\
-\xe9\xdf\x65\x64\xb0\xfc\x24\xd6\x77\x33\xf8\x95\x30\xbe\xc3\x64\
-\xb4\xaa\x4a\xd3\x6f\x89\xf6\xb7\xbc\x00\x00\x48\x76\x86\x07\x39\
-\x41\x9d\x51\x27\xc0\x31\xd1\xde\xcb\xa2\x00\x00\xa0\x9c\x0e\x5b\
-\xe2\x6b\x85\xa9\x11\xcf\x61\x7d\x3d\x07\xeb\x32\x19\xf5\x8b\xf6\
-\xb6\xbc\x80\xda\xda\x66\x17\xb5\x23\x01\x60\xf3\x9c\x01\xc7\xf9\
-\x54\x2c\x54\x21\xda\xdf\xd2\x02\xfc\x7e\xbf\x6d\xda\xc1\x3a\x40\
-\xb0\x27\x5f\x27\xe0\xad\xa9\x78\x28\x20\x23\x83\xa5\x05\x4c\xb0\
-\xd2\x4b\x1c\x38\x92\xaf\x11\x82\x07\xd3\xe3\x1b\x4f\x03\x30\x3d\
-\x24\x2d\x35\x16\x1e\x85\x9b\xce\x00\xfc\xca\x5c\x95\xbc\x70\x66\
-\x73\x95\x32\xdf\x14\x59\xf3\x30\x54\xdf\x74\x14\x84\xc7\x0c\xfe\
-\x1f\x73\xd4\xbe\xb7\x27\x7a\x6d\x4c\x66\x16\xe9\x05\x54\x6b\xcd\
-\xe5\x1c\xac\x17\x80\x73\x56\xe3\x40\x9a\x03\xfb\x1f\xc5\x42\x2f\
-\x65\xe7\x91\xfa\x1b\xe0\xa9\x6f\x74\x73\xb0\xbb\xc8\xbb\x78\x00\
-\x33\x94\x41\xb3\xe2\xe2\x01\x89\x05\x1c\xf2\x9f\x5c\x43\x88\xad\
-\x0b\xc0\x9c\xb3\x3f\x01\x3f\x95\xec\x0c\xa5\x64\xe5\x30\x22\xa5\
-\x00\x9f\xaf\xc5\x91\x63\xe4\x0e\x01\xb6\xe5\xeb\x9c\xf0\x0b\xc9\
-\x58\x38\x22\x23\xc3\x42\x08\x2f\x20\x10\x08\xd0\x19\x57\xe6\x3a\
-\x01\x2a\x0d\xa3\x1b\x0f\x6f\x87\xcf\x89\xf6\x2f\x84\xf0\x02\xfa\
-\x5f\x8f\x9d\xc5\xec\x7f\x83\x7f\xe9\xb3\x4f\x39\x75\x48\xda\xeb\
-\xff\x85\xd0\x5d\xc0\xe7\x6b\x71\xcc\xb8\x32\x13\x00\x4a\xf2\xe4\
-\x37\xc5\x8e\xa2\x8a\x7b\x1d\x57\xa5\x3c\xef\x17\x42\xe8\x0a\xf8\
-\xb2\xe9\x37\xe3\x40\x36\x5f\xb2\xe5\xec\x35\xcb\xe5\xe2\x01\xc1\
-\xaf\xc5\x3f\x0f\x0c\x30\x77\xd9\xae\x61\xc2\xe1\xe1\x04\x1f\x08\
-\x25\x75\xc9\x78\xf0\xad\x48\x4f\x85\x42\xa1\x50\x28\x14\x0a\x85\
-\x42\xa1\x50\x28\x14\x8a\x42\xfc\x01\xea\x12\xdd\x53\xe7\x12\x49\
-\xf2\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x00\x75\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x00\x27\x49\x44\x41\x54\x78\x9c\xed\
-\xc1\x01\x0d\x00\x00\x00\xc2\xa0\xf7\x4f\x6d\x0e\x37\xa0\x00\x00\
-\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x80\x77\x03\
-\x40\x40\x00\x01\x8f\xf2\xc9\x51\x00\x00\x00\x00\x49\x45\x4e\x44\
-\xae\x42\x60\x82\
-\x00\x00\x06\xb5\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x06\x67\x49\x44\x41\x54\x78\x9c\xed\
-\x9b\x4d\x70\x5b\x57\x15\xc7\x7f\xe7\x2a\x85\x94\xd0\xa4\x4d\x3f\
-\x67\x18\x16\x0c\xbb\x34\x49\x93\x36\xb4\x14\x18\x68\xac\x2f\xa7\
-\x8d\xed\xda\x8a\x76\x6d\x67\x62\xd9\x1e\xd6\xac\xca\x02\x16\x4c\
-\x16\x6c\xd8\x32\x53\x5b\x76\x57\xed\x46\xb6\x34\x0c\x4d\x1b\x3f\
-\xe9\xc9\xe5\xa3\x84\x0e\xe5\xa3\x2d\x30\xcc\x74\x4a\x17\xdd\x51\
-\x0a\xc4\x69\x6a\x3b\x13\xdd\xc3\xc2\x92\x31\xfa\xbc\x4f\x7a\xcf\
-\x36\x83\xff\xcb\x7b\xcf\x3b\xe7\xfc\x7f\xbe\xf7\x3e\x3d\xe9\x19\
-\xf6\xb5\xaf\x7d\xfd\x3f\x4b\xda\x0d\xa6\x9e\x7d\xf6\x90\xae\x7d\
-\xf6\x3b\x28\x23\xc0\x41\x85\xab\xc6\xf0\x43\xaf\x90\xff\x60\x87\
-\xfb\xeb\x4b\xa9\xec\xd4\x97\xac\xe5\x79\x81\xc7\x81\x75\x55\x2e\
-\xdf\x8a\x7d\xe6\x47\xaf\x17\x7e\xfc\x49\x73\x6c\x0b\x80\xd1\xd1\
-\xc9\x3b\xd6\x6e\x33\x3f\x03\x4e\x37\x4d\x5d\x13\x4c\xda\x5b\x9a\
-\x7d\x33\xa2\xbe\x43\x51\x7c\x62\xfa\x2b\x46\xb4\x0c\x1c\xf9\xef\
-\x19\x79\xfb\xc0\xc1\x4f\xbf\xf9\xda\x4b\x2f\xad\x6e\x1f\x35\xcd\
-\x09\xd6\x0e\x98\xe7\x69\x35\x0f\x70\x44\x51\x2f\x95\x99\x79\x2c\
-\xc4\x7e\x43\x55\x67\xf3\x00\xfa\x50\x6d\xfd\xf6\xef\x36\x8f\xb6\
-\x00\x40\x18\xed\x5c\x42\x0f\xef\x55\x08\xdd\xcd\x6f\x4a\x61\xac\
-\x79\xac\x05\x80\xc0\xed\xdd\x4b\x6d\x42\x48\x67\x73\x8f\xf6\xd1\
-\x67\x24\x4a\x66\x26\xcf\xf4\x32\x5f\xd7\xc1\xe6\x81\xd6\x15\xa0\
-\xbc\xd1\xbb\xa4\x1e\xb6\xd6\x94\xf7\x02\x84\x64\x66\xf2\x0c\x98\
-\x0a\xbd\xcd\x03\xad\xde\x5a\x00\xa8\xc4\x2e\x01\xd7\x7a\xe7\xda\
-\x7d\x08\xc1\xcc\xcb\x2a\xc4\x7e\xd0\x3c\xda\x02\xa0\xbc\xf4\xc2\
-\x7b\xc6\x68\x0a\x67\x08\xb2\x2b\xdb\xa1\x6e\xde\x65\xd9\x03\xb2\
-\xaa\xaa\xe9\xf2\xd2\x0b\xef\xb5\xcc\x74\xba\x24\x9d\xcd\x3d\x6a\
-\xad\x29\x83\x1e\x76\xe8\xe7\x9a\x55\x49\xfa\xc5\xb9\xdf\x38\xc4\
-\x0e\xac\x54\x76\xea\x11\xb5\x54\x80\x3b\x7b\xc5\x2a\x5c\x47\x49\
-\x55\x8a\xf9\x5f\xb7\x9b\xef\x08\x00\xf6\x26\x84\x30\xcd\x43\x0f\
-\x00\xb0\xb7\x20\x84\x6d\x1e\x1c\x00\x00\xa4\x32\x33\x8f\x29\xea\
-\xb9\x42\x00\x9b\x28\x2f\x2d\xbc\xe5\x92\xdb\x55\xe9\x89\x99\x87\
-\x2d\xb6\x82\x70\x57\xaf\x58\x85\xeb\x6a\x6c\xda\x2f\x2c\x5c\xed\
-\x15\xeb\x04\x00\x76\x17\x42\x54\xe6\xa1\xdd\xe7\x80\x0e\xf2\x96\
-\x66\xdf\x54\xd5\xf4\xe6\xed\xa4\xa7\x8e\x80\xa9\x6c\x9e\xd4\x83\
-\x29\xa8\x79\x23\x32\xec\x6a\x1e\x02\xac\x80\x86\x12\x13\x53\x5f\
-\x45\xf0\x04\xee\x70\x08\xff\x17\xd8\x64\xbf\x2b\x21\x88\x79\xe0\
-\x13\x11\x49\x7b\x8b\x73\xbf\x0a\x52\x23\x30\x00\x08\x0e\x41\x0c\
-\x09\xaf\x90\xff\x6d\x90\x1a\x3b\x61\x1e\xfa\x04\x00\xd1\x42\x48\
-\x64\x72\xa7\x45\xc5\x8f\xda\x3c\x0c\x00\x00\x20\x9e\x9d\x7c\x5c\
-\xac\x59\x0e\x13\x42\x50\xf3\xa8\x0e\x97\x8b\xf3\x0e\xcf\x2f\xed\
-\x35\x10\x00\x08\x17\xc2\x4e\x9b\x87\x00\x77\x81\x4e\xf2\x0b\x0b\
-\x57\x8d\xc8\xb0\xc2\x75\x87\xf0\x3b\xb5\x46\x39\x3d\x31\xf3\x70\
-\xf3\x44\x22\x93\x3b\x2d\x88\xf3\x9e\x57\x63\xce\x0d\x6a\x1e\x42\
-\x58\x01\x0d\xa5\x2e\x4c\x7f\x4d\x55\x97\x81\xcf\xf7\x0c\x56\xfe\
-\x69\x30\x89\xe5\xe2\xec\xef\x00\x92\xd9\xe9\x53\x58\xf5\x81\xa3\
-\x0e\xa5\x6e\xa8\x31\xc3\x95\xc2\xec\x2f\x07\xeb\x78\x53\xa1\x01\
-\x80\xfe\x20\xd8\x98\xda\xdd\x32\x0f\x21\x03\x80\x80\x10\x44\x57\
-\x51\x00\x71\xf9\x74\x19\xba\x79\x88\x00\x00\x40\x72\x22\xf7\x75\
-\x44\xae\xe0\x02\xc1\x4d\x37\x8c\x70\x6e\x79\x31\xff\x8b\x90\xf2\
-\x6d\x29\x12\x00\x10\x2a\x84\xc8\xcc\x43\x08\x77\x81\x4e\x2a\x17\
-\xe7\xdf\x50\x63\xce\x01\x2d\x3f\x46\x04\xd0\x0d\x51\x7d\x32\x2a\
-\xf3\x10\xe1\x0a\x68\x28\x91\x9d\xf9\x86\x58\x7b\x05\x38\x14\xf0\
-\xd2\x1b\xa2\xfa\xa4\x57\x9c\xff\x79\x14\x7d\x35\x14\x39\x00\xa8\
-\x43\xa8\x59\x0f\xe9\xf5\x95\x7b\x5d\xc2\xba\x58\x4d\x47\x6d\x1e\
-\x22\xdc\x02\xdb\xa5\xd6\xae\x22\x72\xd3\xfd\x02\xbd\xa9\x31\xe3\
-\xf2\xd8\x3d\xb0\x22\x07\x10\xcf\x4c\x9d\x34\x50\x05\x75\xf9\xde\
-\xbe\x2e\x39\x8c\x55\x3f\x99\x9d\x3e\x15\x5d\x67\xf5\x4a\x51\x26\
-\xff\x8f\x79\xee\xee\x33\xc5\x3f\x30\x12\x2f\x17\xe6\xfe\x10\x66\
-\x5f\xdb\x15\xd9\x0a\x88\x67\xa6\x4e\x1a\xc5\xa7\x7f\xf3\x00\x47\
-\xb1\xea\xa7\xc7\x27\x1f\x0a\xab\xaf\x66\x45\x02\x20\x91\x9d\x39\
-\x61\x14\x1f\xe1\x9e\x10\xd2\x1d\xb5\xc6\x54\xa3\x82\x10\x3a\x80\
-\x44\x76\xe6\x84\xd4\x6c\xd5\xc5\xbc\xc0\x86\xc2\x86\x43\xda\xa3\
-\xd6\x98\x48\x56\x42\xa8\x00\x82\x98\x07\xd6\xac\x30\x6c\x54\x53\
-\xc0\xa7\x0e\xf1\x77\x47\x01\x21\xbc\xc7\xe1\xf1\xdc\x71\x15\x59\
-\x71\x35\x6f\xd4\x3e\xb5\x5c\x5c\x58\x01\x48\x66\xa7\xbf\x85\xd5\
-\x57\x81\xcf\x39\x5c\xfb\xb1\x85\x21\x7f\x29\xff\xce\x40\x0d\xd7\
-\x15\x0a\x80\x41\xcc\x37\xb4\x5b\x10\x06\x06\x10\xd4\xbc\x58\xce\
-\x7b\xa5\x7c\xb5\xdd\x64\xe2\xc2\xd4\x13\xa2\x5c\x66\x07\x21\x0c\
-\x74\x06\xa4\xc6\x73\xc7\xd5\x88\xf3\x9e\xef\x66\x1e\xa0\xb2\x98\
-\x7f\x5d\x85\xa7\x70\x3c\x13\x8c\xe2\xc7\x33\x53\x27\x9d\x1b\x6e\
-\xa3\xbe\x01\x6c\x99\x87\x7b\x1d\xc2\xd7\x10\x1d\xe9\x66\xbe\xa1\
-\x6d\x10\xd6\x7a\x66\x15\xee\x31\x8a\x9f\xc8\xce\x9c\x70\xe8\xa1\
-\x43\x8a\x3e\x94\xce\x4c\x3f\x68\xd1\x15\xdc\xcc\xaf\x23\x7a\xbe\
-\xbc\x38\xef\x07\xa9\x51\xdf\x0e\xaf\xd2\xf3\x9d\x25\x40\xf9\xbb\
-\xc6\xcc\x50\xa5\x30\xfb\x6e\x90\x1a\xd0\x07\x80\x9d\x30\xbf\x55\
-\x6b\x62\xf2\xac\x15\x73\x99\x08\x21\x04\x02\x50\x37\x5f\x05\xee\
-\x73\x08\x1f\xc8\xfc\x56\xcd\x80\x10\x44\xf5\xac\x57\x9a\xff\xa3\
-\x6b\x7e\x67\x00\x41\xcd\x5b\x95\x11\xbf\x38\x57\x71\xcd\xdf\x4d\
-\xa9\xf1\xa9\x21\x35\xbc\x42\x04\x10\x9c\x0e\xc1\x78\xf6\xe2\xb1\
-\xdd\x32\x0f\xe0\x95\xf2\x55\xb1\x9c\xc7\xf1\x60\x54\x91\x95\xd4\
-\x78\xee\xb8\x4b\xee\x9e\x00\xe2\xd9\x8b\xc7\x8c\x8d\xad\xe0\x68\
-\x5e\x2c\xa3\x61\x9a\x6f\xc8\x2b\xe5\xab\x88\x8e\xe0\x0a\xc1\x48\
-\xd5\x05\x42\xd7\x2d\xd0\x8f\x79\xaf\x94\x2f\x3b\xc4\xf6\xad\xe4\
-\x85\x5c\x1c\x95\x57\x68\xf3\xd6\x67\x1b\x7d\x24\x56\x87\xba\x6d\
-\x87\x8e\x2b\x20\x9e\xbd\x78\xcc\x68\x2c\xc0\x81\x67\xc7\xa2\x36\
-\x0f\x50\x5e\x9c\xf7\x11\x3d\x0f\xac\x3b\x84\xdf\xab\x46\xaa\xe9\
-\xcc\xf4\x83\x9d\x02\xda\xae\x80\x2d\xf3\xca\xfd\x0e\x45\x36\x10\
-\x3b\x5a\x5e\x5c\xf0\x1c\x62\x43\x53\xd0\x95\x60\x90\xb3\xcb\x4b\
-\x73\x7f\x6a\x9e\x68\x01\x30\x94\xfd\xf6\x17\x0e\xd8\x5b\x6f\x29\
-\x3c\xe0\x90\x78\x57\xcc\x37\x14\x9f\x98\x4e\x18\xd1\x9f\xe2\x06\
-\xe1\x6f\x72\xab\x76\xc6\xfb\xc9\x8b\x1f\x6e\x1f\x6c\xd9\x02\xb1\
-\x5a\xed\x7b\xff\x0b\xe6\x01\xfc\xe2\x5c\xc5\xaa\x8c\xe0\xb6\x1d\
-\xee\xd3\x58\xec\xfb\xcd\x83\x6d\x5e\x96\xd6\x27\x1c\x92\x6d\x28\
-\x32\xb6\x9b\xe6\x1b\xf2\x8b\x73\x15\xb1\x8c\xe2\x00\x41\x84\xb3\
-\xcd\x63\x6d\xfe\x5f\x40\x6a\x3d\xf2\x6c\x28\x32\x56\x59\x9a\x5b\
-\x76\x6f\x33\x5a\x79\xa5\x7c\xd9\x05\x82\x42\x8b\xb7\x56\x00\xa2\
-\xdd\xfe\xaa\x1b\xd6\xea\xd3\x7b\xc9\x7c\x43\x5e\x29\x5f\x46\xec\
-\x18\xdd\x21\x5c\x69\x1e\x68\x01\x50\xab\xdd\xbc\x24\xf0\x7e\x9b\
-\x8b\x37\xac\xd5\xa7\xfd\xd2\x7c\x4b\x92\xbd\xa2\xf2\xe2\x82\xd7\
-\x05\xc2\x07\x07\x4c\xed\x52\xf3\x60\xac\x25\xea\x2f\x6f\xaf\x7d\
-\xf1\xd4\x99\x97\x63\x35\x3d\x04\xdc\x0f\xdc\x44\xd4\x37\x1a\x7b\
-\xae\x5c\x8a\xee\x57\xda\xb0\xf4\xd7\x3f\xff\xfe\xfd\x2f\x1f\x7f\
-\xe4\xb2\xaa\x3c\x20\x9b\xef\x1b\x7d\xac\xaa\x2f\xdf\x16\xb3\xcf\
-\xbc\x56\x78\xf1\xa3\xdd\xee\x6f\x5f\xfb\xda\xd7\xde\xd2\xbf\x01\
-\xee\x83\x44\x52\xf4\x9c\x9a\x3b\x00\x00\x00\x00\x49\x45\x4e\x44\
-\xae\x42\x60\x82\
-\x00\x00\x03\x62\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x03\x14\x49\x44\x41\x54\x78\x9c\xed\
-\x9a\x3b\x68\x14\x51\x18\x85\xcf\x99\x5d\x30\x62\xb0\x11\x11\x31\
-\x85\xc1\x58\x08\x01\x0b\x61\x77\xed\x02\xbe\x30\x85\x8f\x0d\x31\
-\x60\x97\x80\xa8\xa4\xb3\x09\x29\xad\x8c\xa5\x90\x20\x5a\x58\x5a\
-\x24\xee\x86\x20\x24\x82\x0a\x16\x82\xd9\x80\x45\x24\x85\x85\xa2\
-\xc5\x82\x88\x58\x28\x3e\x12\xdc\x9d\x63\x13\x44\x77\x66\x77\x33\
-\x33\x7b\xf7\x26\xce\x7c\xe5\x9d\x9b\xf3\x9f\x39\x99\xc7\xbf\x77\
-\x2e\x90\x90\x90\x10\x67\x18\x55\xa0\x6f\x5a\x9d\xab\x69\x8c\x0a\
-\x1a\x14\xd0\x4b\x60\x5b\x2b\x8c\x85\x45\xc0\x1a\x81\x15\x82\x33\
-\x1d\x15\x4c\x3d\xbb\xc0\x6f\x8d\xe6\x47\x0a\x20\x5b\xd4\x09\x40\
-\xf7\x00\x74\x45\xd1\x31\x48\x19\xe0\x48\x29\xcf\xc7\xf5\x26\x38\
-\x61\x95\xb3\x45\x8d\x00\x7a\x84\xcd\x7b\xf2\x00\xd0\x05\x68\x21\
-\x5b\xd4\x70\xbd\x09\xa1\xae\x80\xec\xac\x4e\x42\x5a\x40\x84\x00\
-\xdb\x4c\x15\xe0\x69\xbf\x2b\x21\x70\x00\x7d\xd3\xea\xfc\x99\xd6\
-\x6b\x00\xfb\x5a\x62\xad\x7d\x94\xb7\x57\x78\xa8\xf6\x99\x10\xf8\
-\x3f\xb8\x9a\xc6\x28\xb6\xde\xc9\x03\x40\xd7\xba\xf7\x7f\x08\x1c\
-\x80\xa0\xc1\xd6\xf8\x69\x3f\x7e\xde\x43\x04\x80\xde\xd6\xd8\x69\
-\x3f\x7e\xde\xd3\x41\x45\x9a\xbd\xe7\x4b\x79\x27\x72\x6f\x11\x85\
-\x6c\xd1\x55\xbd\x63\x7e\xde\xb7\xca\x53\xdc\x18\x49\x00\xb6\x0d\
-\xd8\x26\x09\xc0\xb6\x01\xdb\x24\x01\xd8\x36\x60\x9b\xd8\x07\xd0\
-\xb4\x11\x3a\x52\xd0\xde\xb4\xe3\x5e\x95\xcb\x63\x20\xf6\x34\x9b\
-\x9f\x29\xba\x6f\xc2\x9a\xa1\x20\x10\x65\x81\xf3\xec\xc0\x9d\x52\
-\x3f\xbf\x86\xd5\xda\x70\xcd\x46\x07\x73\x05\x9d\x11\x75\x0f\xc0\
-\x2e\xd3\x46\x3c\x08\xef\x00\x5e\x2c\x0d\x70\x31\xc8\x9f\x35\xea\
-\x04\x01\x6f\xa7\x5a\xf7\x16\xc8\x14\xab\x13\xa2\xe6\x60\xe3\xe4\
-\x01\x80\xe8\x06\xf5\x3c\x53\xd4\x15\x93\x65\x7c\x03\xc8\x15\x34\
-\x44\x70\xcc\x64\xe1\x0d\x92\x22\x34\x99\x2d\x28\x67\xaa\x80\x27\
-\x80\xdc\xac\xf6\x8b\xba\x6b\xaa\x60\x08\x52\x80\xee\x67\xe7\xb5\
-\xd3\x84\xb8\x27\x00\xb9\xee\x38\x00\x23\xc5\x42\x43\x74\x6b\x15\
-\x97\x4d\x48\x7b\x6f\x01\xb2\xdf\x44\xa1\xa8\x10\x32\xe2\xcb\xef\
-\x19\xb0\x39\x57\x79\x65\xc6\x57\xe0\x05\x11\x27\xc5\x83\x26\x8c\
-\xa0\x8a\x1e\x17\x5a\xa8\x77\x58\x8c\xfe\x11\xc7\x8f\xc0\x01\xbc\
-\x38\xcb\xd0\x8d\x4e\x23\x8e\xce\x09\xa8\x9a\x50\x6e\x4c\xec\x5b\
-\xe1\x24\x00\xdb\x06\x6c\x93\x04\x60\xdb\x80\x6d\x92\x00\x6c\x1b\
-\xb0\x4d\x12\x80\x6d\x03\xb6\x49\x02\xb0\x6d\xc0\x36\x49\x00\xb6\
-\x0d\xd8\x26\xf0\xaf\x41\x5b\x10\x38\xd0\x6c\xc5\xb7\x19\x02\xd6\
-\x6a\xc7\x62\x75\x05\x10\x58\xa9\x1d\x8b\x59\x00\x9c\xa9\x1d\x8b\
-\x53\x00\xe5\x8e\x0a\xa6\x6a\x07\xe3\x12\x40\x15\xe0\x88\xdf\xbe\
-\xe1\x38\x04\x50\x05\x78\xa9\xde\x7e\xe1\x2d\xf3\x16\x08\x49\xd3\
-\xcd\xd2\xff\x5d\x00\x7f\x6f\x97\xff\xb1\x03\x93\xaf\x4e\xf1\x7b\
-\xa3\xf9\x9e\xa5\xe6\xa8\xef\x5a\x53\x08\x78\xbb\x94\x77\x7a\x5a\
-\xad\xeb\xfd\x34\x06\x7c\x6a\x75\x91\x96\x20\x7c\x34\x21\xeb\x09\
-\x80\xd0\x13\x13\x85\xa2\x42\x47\x4f\x4d\xe8\xfa\x5c\x01\xce\x4d\
-\x00\xbf\x4c\x14\x8b\xc0\xe7\x8a\xeb\xdc\x36\x21\xec\x09\x60\x29\
-\xcf\x65\x6d\x8e\xbd\x01\x7f\xa0\xc3\xe1\x97\x03\xfc\x60\x42\xdb\
-\xb7\x0f\x58\x5a\xc6\x2d\x00\x0f\x4c\x14\x0c\x8e\x26\x16\xcf\xf1\
-\xa1\x29\x75\xff\x46\xe8\x3a\xdd\xd2\x32\x87\x04\x5e\x83\xbd\xdb\
-\xe1\x0b\xc9\xa1\x52\x3e\x35\x6e\xb2\x48\xd3\x2f\xae\x99\xa2\x0e\
-\x13\xee\x98\xc0\xe3\x04\x76\x9b\x34\xb3\x4e\x19\xd2\x3c\x1d\xe7\
-\xc6\xe2\x79\xbe\x6f\x43\xbd\x84\x84\x84\x18\xf3\x1b\xe9\x0c\xd1\
-\x12\xec\xcb\x09\x01\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\
-\x82\
-\x00\x00\x00\x79\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x00\x2b\x49\x44\x41\x54\x58\x85\xed\
-\xce\x41\x01\x00\x20\x0c\xc4\xb0\x0d\x6f\x28\x98\x05\xfc\x5b\x00\
-\x19\xc7\x23\x31\xd0\x56\x01\x00\x61\xbd\xe7\xdc\xe4\xc0\x4a\xc6\
-\x01\x80\x2f\x3c\x1a\xe8\x01\xff\xf7\xcd\x6b\x25\x00\x00\x00\x00\
-\x49\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x0c\xd6\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x0c\x88\x49\x44\x41\x54\x78\x9c\xe5\
-\x9b\x5b\x6f\x5b\xc7\x11\x80\xbf\x25\x45\x8a\x94\x28\x89\x92\xad\
-\xbb\x64\xc9\x4e\x9a\xc2\x41\xe0\x26\x45\xd1\xa0\x48\x0a\xf4\xa9\
-\x7d\xe9\x7b\x81\x16\xfd\xa3\x7d\x2a\x50\xb4\x0f\x41\x90\x36\x4e\
-\x52\x20\x69\x92\xc6\x96\x6c\xc9\x37\x5d\x48\x49\xa4\x2e\xe4\xf4\
-\x61\xf6\x1c\xee\xd9\x33\x87\xa4\xe4\xf4\xc9\x03\x10\x24\x77\xf7\
-\xcc\xce\xcc\xee\xce\x6d\xe7\x00\xb2\x05\xe2\x78\xe3\x40\x9c\xf2\
-\x9e\xfe\x78\x93\x84\x90\xe3\xf9\x4d\x12\x42\x96\x57\x97\xed\xe0\
-\x0e\xf0\x18\x9c\x14\x3c\xdc\x00\x6e\x19\x1d\x25\x60\x32\x8b\x2f\
-\x6d\xaf\x0d\xa1\x66\x12\x10\xe0\x62\xc8\x98\x73\xa0\x67\xb4\x77\
-\x81\xbe\xd1\xfe\x12\xdc\xa9\x8d\x2a\xcf\xa3\x1b\x35\x00\x64\x1b\
-\xb8\xed\x09\x3d\x01\x5e\xf8\x89\xa7\x80\x39\xdf\x2e\xc0\x59\xd0\
-\x3e\xeb\xdb\xfa\xbe\x1d\x8f\xa3\x0a\x34\x81\x8a\xef\x3f\xf7\x34\
-\x54\xfd\xf7\x25\x70\x04\x97\xa7\x50\x39\xf2\x6d\x53\xa8\x20\x9d\
-\x9f\xff\xc4\xff\x9f\xf2\x6d\x0e\x68\x01\xa7\xbe\x7d\x29\xe8\x7b\
-\x01\xee\x71\x31\x6f\x85\x52\x92\x2d\x90\x09\x90\x8f\x40\x56\x8d\
-\x31\x6b\x20\x0b\x46\xfb\x06\xc8\xbc\xff\x3d\x05\x72\x0f\xe4\xae\
-\xff\xcc\x80\xdc\x01\x19\xb2\x23\xa4\xee\xc7\x2c\xa8\xe0\xe5\xae\
-\xc7\x31\xe1\xfb\xe7\x40\x36\xf3\x47\x55\x9a\x05\xed\x1b\x20\xbf\
-\x06\x29\x5f\xf3\x88\xcb\x04\xc8\x9f\xf5\xc1\x5c\xdf\x36\x48\xc5\
-\x68\x7f\xdb\x3f\xb7\xe2\x27\x5b\x8e\xf0\xdd\x1b\x73\x72\x3c\xe3\
-\x25\xff\xdb\x79\x46\xb6\xa0\x75\x4b\xdb\xe5\x2d\x83\xd9\x32\xc8\
-\x4f\x8c\xf6\x09\x90\x3f\xda\xbc\x14\x13\xf0\x91\x7f\x30\x92\x9a\
-\xac\x17\x30\x7f\xc7\x7f\xb6\xed\x15\x96\xed\x6b\x4c\x4e\x60\xa2\
-\xe2\xf6\x59\x15\x4e\x7b\x49\xe7\xcb\xf5\x97\xb3\xcf\xa5\xbb\xb9\
-\x02\xf2\xab\x71\x27\xdf\x1e\x6c\xfb\x50\x63\xca\x14\xc8\x6d\x63\
-\xfc\x2a\xc8\x07\xba\x7d\x4d\x7c\xf3\x5e\x79\x5e\x13\x64\x56\xb7\
-\xbc\xd9\x37\x07\xf2\x00\x64\xd1\xe8\x6b\xfa\x67\x23\xcb\x26\x9b\
-\xfa\xc9\x82\x71\x26\xe4\x17\xe0\x3e\x0d\xfe\x27\xca\xa3\x07\xec\
-\x01\x21\xa3\xab\x70\x79\x0b\x2a\x5f\x0e\xe1\x64\x0d\x78\x5a\xd0\
-\x97\xda\xe1\x1b\x3c\x0b\xf0\x00\xba\x4f\xa0\xf6\x2a\x68\xeb\x28\
-\x5d\x94\xc9\x29\xbc\x98\x37\x98\x30\x90\xc6\xc4\x34\x50\xe6\x1f\
-\xa0\x5a\xbd\xed\xc7\x6c\x01\x2f\x54\xa1\x0f\x05\xf1\xc4\x2c\xf9\
-\xff\x89\xe9\x4a\x34\x78\xd8\x46\xd0\xf6\xc2\xa0\x25\x86\x17\x20\
-\x82\x32\xbc\xe7\x9f\x5d\x02\x7e\x06\x7c\x0e\xcc\xa0\x16\x22\x81\
-\x9c\xd9\x8c\x04\x20\x0d\xd4\xcc\x24\xff\x37\x80\x36\xb8\x5d\x3f\
-\x51\x05\x35\x5d\x9b\xc0\xd7\xe0\xae\xf4\x7c\xb9\x13\x72\x20\xce\
-\x8f\x9b\x42\x7d\x81\x6f\x47\x98\x9f\xf8\xd9\x45\x60\x1a\x35\xa9\
-\x7b\xf6\xb3\xd2\x86\xfa\x0b\xd4\x9f\x58\x01\x7e\x00\x16\x80\xcf\
-\x80\xe7\x80\xb7\x3c\xec\xf8\xe7\x7b\xaa\xdb\xdc\x55\xd1\xc4\x5b\
-\x03\xf3\x26\x5b\x59\xcd\x29\x1b\x5e\x0f\x7c\x1c\x29\x46\xcb\x4c\
-\x2e\xa1\xa6\x72\x46\x3f\x37\x05\x59\xf5\xca\x78\x3d\x6b\x55\xd2\
-\xfe\x99\x81\x7e\x91\x09\x90\xdf\x78\x2b\x11\xb6\x07\x8a\x51\xee\
-\xaa\x8e\x18\x40\xc9\x98\xb5\xaf\x13\xb2\x0b\xae\x17\x8d\x5d\x03\
-\xfe\x0e\xdc\x09\x84\x10\xac\xcc\x61\x53\x19\xe7\x10\xdc\x53\xdf\
-\x37\xe6\xaa\x9b\xe0\x9f\x75\x4f\x80\x03\xc5\x7d\xd8\xcc\xf7\x8b\
-\x03\xd6\x81\xbf\x01\xf7\xb2\x73\xba\x9e\xf2\x22\xeb\x18\x47\xc0\
-\x12\xc0\x14\x70\x16\x31\x0f\x7a\xe6\xbf\xf3\x5b\xe9\x31\x59\x21\
-\xa0\x1a\xb9\xd9\x57\xc6\xdd\xe5\xf8\x3c\x8e\x0b\xee\x52\x71\x37\
-\xfb\xd1\x6e\x08\x3d\xbc\x1e\xf0\x04\x3d\x7a\xe1\x90\x1e\xea\x29\
-\x4e\xc7\x58\x2d\x25\x38\xe7\x57\x2f\x00\xd9\x46\x95\x4c\x29\x30\
-\x77\x07\xc0\x7d\xe0\xd2\x9b\xab\x57\xe8\xee\x09\x4d\x9e\x9f\xd0\
-\xdc\x04\x25\xe8\xfa\xe3\x56\x3b\xc4\xf6\xf7\xa7\x81\x2e\x48\x78\
-\x66\xfb\x3a\x56\xee\x03\x47\xe8\xca\x7f\xad\x63\x05\xa0\x03\x9d\
-\x13\xa8\x2f\x92\xd1\x67\xee\x08\xe4\xa7\xf1\x04\x63\x58\x01\x79\
-\x0b\x2e\x2a\x50\x9d\x46\x15\xd3\x29\x83\xad\xbd\x0b\xfc\x0e\xf8\
-\x4b\x01\x03\x01\x74\xe6\xa1\x9e\x04\x3f\x3e\x4e\xa8\x1d\xf9\xce\
-\x79\xd4\x52\xf8\x1d\xd5\x39\x87\xfa\xe1\x10\x64\x5d\xd4\x3c\xfe\
-\x06\xf8\x24\xa0\xd9\x2b\xcf\x7a\x0d\xb8\x0d\x72\x1e\x2d\x66\x6e\
-\x25\x62\x01\xc4\xd1\xe1\x5d\x60\x1a\x26\x1f\xaa\x12\x74\xfb\xd9\
-\xe1\xb2\x0e\xfc\x03\x0d\x70\x8c\x20\x43\x80\xee\x6d\xa8\x4d\x40\
-\xfd\x25\xb8\x4e\x01\x43\x47\xd9\xbf\x52\x07\x16\xe0\xa2\x06\xd5\
-\x93\xbc\xd6\x4e\x7d\x93\xbf\x02\x6b\xe0\xf6\x82\xce\x36\xc8\x09\
-\xba\x63\xdf\xf6\x9e\x6b\x42\x5b\x9f\xe8\xd8\xc7\x3a\xa0\x0a\x9c\
-\xfb\x09\xee\xa1\xab\xf2\x85\x4d\xb3\x2c\xa1\xdb\xbe\x87\xad\x13\
-\xa6\x81\x55\xa8\xb5\x55\x89\x15\x32\x6f\x80\xeb\xe8\x33\xd5\xb6\
-\x32\x18\x1e\xab\x30\xaa\xa3\x87\xfa\x02\x2b\x05\x88\xbe\xf1\x63\
-\xee\xf9\xe7\x3a\x64\x1d\xb9\x22\x2b\xc0\x06\xf0\x0c\xf5\x01\x8c\
-\x03\x7c\xd8\x04\xba\xe0\xba\x9e\xe0\x48\x31\x1e\xcd\x43\xbb\x86\
-\xae\xc2\xf9\x58\x3c\xdb\x70\x01\x3c\x85\xf6\x24\x1c\x2f\x60\x87\
-\xb4\x5d\xe0\x4c\xe7\x8c\xc1\x9d\xa1\x8b\xfa\x83\xe7\x29\xc7\x8b\
-\x25\x80\x06\xea\x3d\x2d\xe6\xb7\x7c\x02\xcd\x29\x70\xad\x6c\x5b\
-\x22\x84\xcb\xf7\x61\xae\x07\xb3\xaf\xcc\x47\x6f\x04\xb3\xaf\x60\
-\xf6\x52\x71\x5b\x47\xcd\xb5\x60\xae\x20\x16\x61\x07\x35\xdf\x2d\
-\xd4\xc2\x65\xc0\x12\xc0\x34\xaa\x3d\x0b\x94\x9a\x2c\xa3\x6e\xaa\
-\x01\xc7\x4d\xa8\x7c\x0f\xcc\x33\x7e\xec\x3d\x06\x88\x03\x16\xa0\
-\xf2\x9d\xce\x61\xc2\x73\xdb\x59\x72\x97\x40\x19\xdc\x31\xba\xb8\
-\x19\xb0\x04\x20\xa8\x69\xd9\x29\x20\x64\xc2\xb6\xf3\x32\x05\xa5\
-\x64\x22\x7f\x1c\xac\x60\xeb\xda\x10\x6e\xfb\x16\x94\x4a\x5e\xbf\
-\xc4\xc3\xae\x94\x36\xb1\x78\x3a\xd4\x23\x34\xda\x0a\x94\x07\x83\
-\x4c\xbf\x7d\x13\xd5\xb2\xe1\x2a\xcc\x82\x74\x81\x15\x98\xd9\x0f\
-\xfa\x5a\xc0\xbb\xc0\x13\xd2\x8c\x4e\x06\x92\xd4\x19\xa8\x4f\x61\
-\xe5\x05\xe7\xd0\x40\xe7\x07\xfd\x2d\xa0\x3b\x73\x03\xe4\x19\x03\
-\x3f\x23\xc1\x7f\xa6\x7d\x1c\x64\xd1\xb8\x63\xef\x0e\x27\x81\x59\
-\x0a\x31\x61\x35\x72\x49\x48\x99\x47\x83\x8d\x65\x4f\x64\x84\x9c\
-\x1e\x74\x66\xa1\x7e\x00\xc4\x41\xc6\x23\x4f\xd0\xd7\xc1\xe4\x2b\
-\x40\x1f\x3a\x67\x50\xdf\x05\x1c\x74\x6f\x41\x2d\xc9\x2f\x3e\xf3\
-\xdf\xce\xcf\xf9\x05\x9a\x2b\x0c\xe1\x15\x74\x66\xa0\x9e\x08\x2d\
-\x9c\xb7\x89\x2a\xbe\xbe\xee\x86\x54\x57\x25\x79\xcb\x4c\xc2\xc6\
-\x5a\x99\x45\xe0\x4b\x90\xaa\x27\xe0\x25\xb8\x43\x34\xd3\x73\x96\
-\x8f\xfc\xa4\x01\xf5\x32\xb8\xe7\x79\x54\x82\x67\x7e\x01\x38\x46\
-\x57\xec\x1b\x63\x77\xb5\xfd\xf8\x32\xba\xe2\x07\x9e\x8e\xff\x68\
-\x5f\x2e\x7a\x3b\xf1\xa6\xcf\x67\x7f\x43\x9a\x64\x1f\x15\x98\x17\
-\x9a\x6c\x02\x4f\xe0\xa4\x03\x8d\x29\xb2\xe1\xb1\xa9\x03\x4a\xa8\
-\x04\x6f\x83\xdb\x09\xec\xf7\x2d\x6c\xe5\x37\x0d\x47\x05\x69\x68\
-\xa5\x00\xcd\xf4\x6e\x01\x4f\x87\x87\xc4\xa9\x2f\x7f\x1f\x0d\x67\
-\x87\x05\x52\x27\x18\xbe\xbd\x5f\x08\x9f\xb9\x72\x27\xa8\xb7\xba\
-\x01\x8d\x03\xf4\x48\x65\xa0\x48\x09\x2e\xe5\xe3\x01\x28\x20\xbe\
-\x01\xf3\x47\x46\x7b\x02\x65\x25\xb4\xf2\x90\x9c\xb3\x94\x9b\x3a\
-\x51\x78\x9f\x61\xdf\x3f\x84\xb4\x14\x08\x20\x37\x4e\x7c\x6a\x7c\
-\xcd\xea\xb5\x04\xb0\x00\x58\xf6\xdf\xba\x84\x18\x07\x56\x18\x24\
-\x34\x0c\x8f\x31\x81\x9c\x93\xf3\x12\x2e\x8c\xd4\x7b\x06\x8a\x84\
-\x69\xd1\xfa\x0a\x43\x60\x05\x47\xe0\x5a\xe1\xec\x28\xc1\xf4\x07\
-\x3b\xa7\x30\x94\x36\x3c\x3c\xd7\x85\xea\xa8\x7c\xdb\x35\x72\x0d\
-\xee\x0c\x55\xe6\x19\x88\x05\x30\x41\x71\x54\x77\x13\x9b\x5e\x83\
-\x6e\x64\xde\x62\x21\x0c\xbd\xb1\xb9\xa9\x1f\x51\xf4\x5c\xae\x3d\
-\xb6\x02\xcb\x70\x65\x69\xf3\xc0\x3f\xc8\xb4\x97\xec\xf6\x14\x9a\
-\x50\x7b\x66\xd0\x21\x20\x8f\xd1\x24\x0b\xc0\xa3\x02\xfd\x32\x62\
-\x85\xbb\x7d\x8d\x34\x73\xd0\xc3\xce\xd6\x8e\x8a\x05\x7a\x15\x98\
-\xb8\xce\xf6\x4f\xec\x75\x11\xf4\x47\xf4\xbf\x26\xd4\x1c\xc5\x47\
-\x70\xac\x79\x23\x01\x94\x9f\xa1\xf6\x37\xc6\xd5\xb3\x11\x8e\xcc\
-\xf2\x1e\x90\x9a\xa4\x10\xd2\x6d\xff\xc8\x7f\x46\x58\x87\x42\x28\
-\x12\x40\x19\xdb\xb3\xcc\xcd\x11\xeb\x80\x2e\x51\xbc\x1c\x40\x11\
-\xb3\xc3\x08\xbf\xca\xcf\x11\x9f\xf9\x51\xd6\x61\x28\x14\x8d\x1f\
-\x5b\x39\xc6\x02\x48\x72\xe7\x39\x6d\x79\x03\x22\x12\xe8\x93\xde\
-\x27\x16\x29\x3c\x4b\x08\x32\x43\xea\xe9\xdd\x78\xee\x00\xc4\xe7\
-\x17\xb3\x60\x99\xc1\x23\x06\xb7\x38\x3f\x06\x3c\x07\x56\x46\x68\
-\x7b\x22\x21\x94\x50\xaf\xcd\xb8\x70\xc9\xc0\x98\xbe\x49\x12\x4e\
-\xe7\x05\x6a\x09\xc0\x01\xfb\xe4\x2f\x12\x8b\xa4\x7d\x00\x6d\x43\
-\x6f\x64\xe0\x25\xf0\x21\x23\x8b\x13\x9c\xa0\x61\xf8\x47\x0c\xbf\
-\x13\xc4\x67\x80\x8e\x8b\x10\x0d\x7e\x8a\x43\xad\xcd\x2e\x63\xe8\
-\x00\x00\xf1\x8e\xd0\x53\x15\x42\x7a\xb3\x73\x80\x79\x1b\xcb\x25\
-\x34\xaa\x43\x28\x4d\xee\xeb\xfe\x05\x6c\x6a\xde\xa0\x08\x64\x8e\
-\xc1\xe5\xcb\xa6\x45\xf0\x00\xe6\x26\x31\xd3\x6d\xed\x45\xd2\x88\
-\x55\x9a\x68\x6e\xe3\x91\xc7\x35\x32\x1f\x00\x9a\xe7\x9f\x04\x77\
-\x0e\xec\x28\x12\xd9\x40\xad\xc3\xbc\x8f\xbd\x43\x44\x4b\xc0\x19\
-\xc8\x3b\x44\x91\x16\x9a\x81\x59\x43\xa3\xba\x26\x70\x01\x17\x5b\
-\x5e\xc7\x58\x4e\xcf\x29\x1a\x19\x2e\xe9\x58\x1e\x00\xff\x06\x89\
-\x4d\x73\x92\xd9\x49\xf2\x01\xc9\xff\x24\x84\xee\x78\xfc\x7b\x7a\
-\xaf\x09\x3e\x83\x9d\xf3\x49\x62\x01\x74\x7c\xdb\x32\x7a\x1e\xd1\
-\x0b\x05\x8e\x3c\xbd\x02\xec\x67\xb7\xb1\xa0\xb9\x43\x59\xcf\xe6\
-\x10\xd3\x73\xf7\x4f\x70\xed\x60\x8e\x82\x3c\xa3\x05\x02\x9a\x38\
-\xd9\x8d\xe6\x5c\xd3\x60\x2d\x61\x3c\x09\x87\xc5\xa1\xbb\xfa\x38\
-\xdb\x0e\x0c\x0a\xb6\x32\xd9\xe9\xf8\x08\x84\x57\xd7\x16\xec\xa1\
-\xc1\x8d\x05\xcf\xc8\x14\x56\xe0\x6f\x65\x5f\xfb\x6e\x30\xb6\x0e\
-\x2b\x14\xe6\x24\x93\xc0\xcb\x84\xe4\x3a\x3e\xa3\x38\x8b\x94\xe0\
-\x85\x6d\x0a\x5d\x5f\x89\xb2\xea\x6d\xdc\x15\xd0\xf2\x67\x30\xc9\
-\xdb\xbf\x0e\xf3\x09\x04\x42\x68\xdd\x46\x13\x24\x56\x4e\xb2\x1c\
-\xd0\x18\xf7\x2d\xa3\xd6\x68\x2c\x25\xd8\x46\xed\xa5\x19\x3f\xfb\
-\x6d\x6e\x64\x5f\x01\x38\x83\xc6\x32\x9c\x9c\x8d\xe1\x25\x5e\x03\
-\x9c\x28\xce\x99\x15\x06\x65\x77\x31\x2c\x53\x7c\xbc\x92\x1a\x85\
-\x9c\x59\xb5\x04\x70\x86\x2a\x97\x72\x41\x86\x15\x38\xee\x90\xbb\
-\xf7\x4f\xb7\xfd\x57\xd0\x38\xd3\x73\xfa\x63\x81\xac\x2a\x4e\xbe\
-\xc2\xf4\x18\xa5\x01\xad\xae\x2d\x74\x99\x83\xb3\x2e\xca\x53\x4e\
-\x78\x45\xf9\x80\xc4\x66\xbe\x6d\x13\xd4\x3c\x54\x84\xc9\x31\xc9\
-\xb9\xb7\xa7\xe8\x96\x5b\x85\x4e\x41\xa1\xd3\x38\x70\x3e\xab\x38\
-\x92\xea\x4f\xd3\x6d\x9e\x04\x66\x61\x2e\x4e\xd6\x26\xb0\x02\x53\
-\xd3\x01\x4f\x19\x88\x05\x70\x41\x9a\x34\x70\xde\x74\xc9\xba\x8d\
-\xd7\xed\x2b\x72\x4a\xd8\xee\xed\x15\xb0\x07\xf5\x4b\x55\x5c\xb2\
-\x38\x9e\xaf\x2f\xce\x8f\x5d\x81\x49\x8f\x23\x3c\xf3\xa1\x10\x28\
-\x01\xab\x76\xfa\x0e\xd4\x34\x5f\x54\xc0\x7d\xeb\x1b\xea\x44\x56\
-\x20\x36\x83\xf1\x95\xd3\x27\x68\x39\x1a\xc0\x32\x5a\x27\xd4\x0f\
-\xc6\x5d\x02\xbf\x45\xaf\xc7\x97\x0d\x9d\x97\xa4\xa0\x4e\xd1\xf8\
-\xfc\x3d\x2f\x84\x61\x89\x0f\x21\xad\x35\xa0\x81\xba\xd1\x56\x4d\
-\xcf\x25\xf0\x7b\xe0\x53\x06\x97\xa3\x89\x19\x4c\xca\x6b\x27\xf5\
-\x66\x3b\x85\x12\xc3\xdd\x67\xd9\x42\x0b\x0f\xc2\xb6\x86\xf7\x08\
-\x37\xa2\xf6\xa4\x0e\x6f\xcd\x7f\x1b\x56\x43\x1a\xdc\xa8\x46\x30\
-\x7d\x7e\x05\xf3\x52\x45\xaa\x68\x09\xed\x1c\xc8\xbb\xb6\x4e\x90\
-\xf7\xf3\xd6\x4a\x3e\x64\x8c\x1a\xa1\x43\x90\x20\x23\xeb\x4e\xe0\
-\xa4\xab\xf5\x80\x29\xa2\xf0\x8a\xba\x0f\xee\x11\xea\x25\xbe\x06\
-\xb3\xe3\x82\xcc\xa0\x29\xfb\xef\xd1\xcc\xcf\x0e\x79\xc5\xb8\x81\
-\xa6\xe0\xc3\x0b\x9e\xe4\x6e\x22\x03\x96\x00\xba\x40\x95\x4c\x49\
-\xec\xcc\x0b\xa8\x4c\x7a\xc9\x16\x85\xb4\xfb\xd0\xaa\xaa\xce\xb8\
-\x56\x5d\xee\x98\x20\x65\xc5\xdd\xaa\x90\xaf\xfa\x08\x14\x63\x7b\
-\x11\xba\x1d\x32\x1a\x5f\x2a\xa8\x6e\xcb\xd5\x28\x58\xb1\x40\x09\
-\xdc\x9e\x6e\x79\x79\x16\x28\xa0\xa7\xa8\x46\xee\x01\xff\x0d\x98\
-\x0f\x24\x3f\x77\xe0\x05\x94\x84\xbf\xa1\x0b\x7c\x13\x48\xbc\xbf\
-\x55\x94\xd1\xa7\x30\x27\x51\xbf\x04\x39\xc6\xfb\xd0\x68\x91\xb9\
-\xbe\x93\x8a\xd2\xe3\x76\x40\xee\x1a\xcc\x66\xe0\x25\x69\x2e\xc0\
-\xed\xa2\x75\x36\xc9\xd6\x17\x54\xf1\x54\xc8\x66\x8d\x22\x1c\x4e\
-\x54\x80\xec\xa3\xb5\x3f\xf7\xc6\x08\x97\x0d\x68\xdd\x46\x9d\x9b\
-\x25\xe0\xb9\xee\xb0\x9c\x9d\x9f\x26\x5d\xd5\xe3\x26\xba\xea\x65\
-\x54\x79\x76\xd0\xda\xe6\x25\x65\x1e\xd0\xcb\xd8\x8c\x33\x14\xed\
-\x00\x77\x9a\x0d\x57\xdd\x1e\x5a\xc3\xbf\x81\x46\x66\x9f\xa3\x42\
-\x78\x00\xe7\x27\x50\x3d\x52\x22\x0b\xcd\x5b\x5f\xe7\x68\x24\x15\
-\x9b\x49\x1b\x80\x83\x0b\xbf\xbb\xaa\xc9\x0b\x14\x21\x1c\x7b\x66\
-\xbc\xa9\x33\x1d\xcb\x65\xc5\x2f\x4b\x1e\x6f\x12\x23\x7c\x00\x3c\
-\x04\x0e\xc0\xbd\x0c\xc6\x97\xe3\x7b\x46\xeb\x08\xc4\xcc\x74\x3d\
-\x21\x0f\xd1\x82\x45\xd0\x2b\xef\x65\xdf\xbe\x1f\xb4\x1b\x20\x62\
-\xf7\x8b\x83\xea\xa4\x67\xb0\x53\xe0\xc5\xad\x8f\xc0\x7d\x05\x4c\
-\xc1\xd1\xf7\xd9\xeb\x39\x71\x9e\xb6\xf8\xcc\x8f\x93\x42\x93\x3b\
-\x03\xe7\x27\x53\x2e\x5f\xcf\x5a\x07\xf0\x66\xe8\x7d\xec\x44\x49\
-\x32\xe6\xff\x50\x2e\x0f\xba\x00\xf2\xf3\xbc\xf9\x95\xa6\x5a\x8a\
-\x5c\xb9\xfc\x1d\xcc\xb2\x5e\x1b\xf9\xc7\xd8\x2f\x4c\xac\x92\x7b\
-\x61\x42\x1c\xfa\x82\x85\xf1\x02\x43\x3a\x66\x7b\xcc\x89\x43\x9c\
-\x05\xcf\x88\x43\xdf\x18\xf9\xa5\xd1\x57\xce\xfa\x2b\xa9\x10\xaa\
-\x8c\xff\xc2\x44\x8a\xe8\x4f\x05\x4e\xc8\x46\x5e\x08\x00\xf2\x1e\
-\xfa\xca\x4a\xee\xa5\x04\x5e\xeb\x95\x99\xb4\xad\xe4\x9d\x9f\xb7\
-\x40\xde\x31\x9c\x9f\xb2\xa5\xe5\x3d\xf3\x7f\xc8\xe3\x2b\x9e\x3c\
-\x91\x5a\x59\xa5\x16\x7b\x80\xe0\x77\x82\x71\x7d\x2d\x1b\x7e\x6b\
-\xde\xd3\x4f\x2b\x74\x9e\x2a\x8c\x7e\x69\x6a\xca\x8f\x09\x04\x2f\
-\x2b\x0c\x5e\xbe\x2a\x7a\x39\x6a\x1e\x33\x66\x91\x2d\xcf\x43\x29\
-\xbf\x9b\x15\x62\x44\x86\x93\x23\x9b\xa8\xb6\xf5\x35\xba\xb4\xfc\
-\xef\x1a\x6a\xe6\x1c\x7a\x01\x72\xc1\xe0\xb5\xb9\x19\x40\xa0\x37\
-\x0d\xe5\xc4\x29\x4a\x4a\x64\x7b\xc1\xff\xe4\xf6\x26\x79\x6d\x2e\
-\x28\x97\x4d\xe9\xeb\xfa\x71\x0e\x35\x61\xa7\xfe\xf7\x24\xaa\xc4\
-\x7d\x01\x06\x1d\x54\xa1\xce\x06\x78\xf6\x06\x4e\x93\xed\xc0\x8d\
-\xb8\xa2\x8e\x41\x26\x30\x4a\xcd\x3c\x9e\x3a\x79\x2d\x1b\xbf\x38\
-\x59\x42\xaf\xca\x92\x23\x54\x65\xe0\x5f\xe0\x99\x38\x24\x6b\xf3\
-\xac\x17\x27\x85\x41\xe2\x33\x06\xa3\xb4\x36\x7d\xac\x88\xc7\x37\
-\xf7\xd5\x59\xab\xe1\x0d\x80\x0c\xcf\x6f\x1a\xf3\x09\xa8\x10\xfe\
-\x07\xb4\x0a\xfd\x7e\xcf\x22\x5b\xc2\x00\x00\x00\x00\x49\x45\x4e\
-\x44\xae\x42\x60\x82\
-\x00\x00\x01\x98\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x01\x4a\x49\x44\x41\x54\x58\x85\xe5\
-\xd6\x3f\x4a\xc4\x40\x14\xc7\xf1\xef\x4b\x16\xbd\x81\x5b\x78\x02\
-\xd7\xca\x2a\x60\xb7\xf1\x00\x0b\xf1\x40\x7a\x22\x21\xd8\x08\xc2\
-\x6e\x27\xa4\x5e\xff\x9c\xc0\x42\x2b\x0f\xb0\xe1\x59\x84\x28\xc4\
-\xc4\x99\x97\x9d\x89\x85\x53\xce\x3c\xf8\xfc\x98\x79\x3c\x06\xfe\
-\xfb\x92\x29\xb1\xac\xd4\x39\x3b\x2d\x11\x5e\xab\x22\xb9\x04\x48\
-\x26\xc5\x6b\xdd\x20\x64\x28\xc7\xed\xfe\x24\x01\xbe\x70\x38\x01\
-\x5e\x98\xc9\xaa\x3d\x8b\xfe\x04\x3f\xf0\x54\x96\xd5\x4a\xde\x26\
-\x09\xe0\xc2\xa3\x06\xf0\xc1\xa3\x05\xf0\xc5\xa3\x04\xb0\xe0\xc1\
-\x03\x58\xf1\xa0\x01\xc6\xe0\xc1\x02\xf8\xe2\xe7\x37\x7a\xb4\x13\
-\xbd\x13\xe5\xa3\x2a\x92\x1c\x02\x0c\x22\x0b\x5e\xa3\x6b\x51\xce\
-\x80\x83\x76\x7f\x36\x25\x0e\x9c\x0a\x3c\x26\x48\xd1\x9e\x8d\x7e\
-\x82\x3d\xf0\x8b\x87\x42\xde\xf7\x0a\x10\x0a\x1f\x15\xc0\x88\x6f\
-\x80\x05\xf0\x94\x22\x79\x17\x37\x07\x08\x8d\x9b\x02\xc4\xc0\x01\
-\xd2\x90\x78\x56\xea\x5c\xd5\x1f\x07\x8f\x1b\xb0\xe0\xd4\xba\xb6\
-\xe0\xce\x00\x23\xf1\xe7\x14\x59\xf6\xe1\xa6\x49\x18\x03\xf7\x9e\
-\x84\x91\xf0\x0d\xb0\x70\x4e\x42\x23\xde\xd6\x0d\xe2\xae\xde\x90\
-\x9e\x62\x33\x4e\x2a\xf9\xd8\xc6\x94\x4e\x71\x68\xdc\x79\x43\x4d\
-\x13\x5e\x69\x42\xad\xf7\x2e\x1c\x55\x91\x5a\x6f\x5d\x78\xb7\x6e\
-\x08\xff\x0e\xd0\xac\x43\x60\xfb\xeb\x4f\xe6\x1a\xd1\xa6\x83\xb7\
-\x83\x78\x4f\x9d\xcf\x3c\x68\x6e\x41\xd5\x3d\x9a\x55\x25\x68\xdd\
-\x5f\xaf\x4f\xda\x1b\xa3\x91\x9e\x7b\xef\x4a\x00\x00\x00\x00\x49\
-\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x00\xa6\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x00\x58\x49\x44\x41\x54\x58\x85\x63\
-\x60\xa0\x00\xdc\x7f\xf8\xb8\xe1\xfe\xc3\xc7\x0d\x94\x98\xc1\x44\
-\x89\x66\x6a\x80\x51\x07\x8c\x3a\x60\xd4\x01\xa3\x0e\x18\x75\xc0\
-\xa8\x03\x06\xdc\x01\x2c\x14\x9b\xf0\x9f\xc1\x81\x92\x2a\x79\x18\
-\x84\x00\x23\xc3\x01\x45\x79\xd9\x06\x72\xb5\x0f\x78\x08\x8c\x3a\
-\x60\xd4\x01\xa3\x0e\x18\x75\xc0\xa8\x03\x46\x1d\x30\xe0\x0e\x00\
-\x00\xe6\xf7\x0c\x89\x70\x77\x76\x17\x00\x00\x00\x00\x49\x45\x4e\
-\x44\xae\x42\x60\x82\
-\x00\x00\x01\x50\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x01\x02\x49\x44\x41\x54\x78\x9c\xed\
-\xd6\x2d\x4e\x03\x51\x14\xc5\xf1\x73\x29\xe1\x4b\xa0\xc0\xb3\x01\
-\x92\x0a\x7c\xc7\x15\x3c\x86\xd4\x23\x31\x2c\xa0\x99\x05\x74\x07\
-\x4d\x05\x49\x25\xa6\x09\x81\x86\xb0\x08\x76\x80\x22\x21\x75\x08\
-\x98\x66\xca\xbb\x58\xf2\x1e\x04\x35\x8f\x84\xf9\xff\xe4\xb9\x23\
-\xce\x1c\x33\x23\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\xad\x60\
-\xbf\xdd\x8b\x62\xd8\xc9\xd2\xa4\x21\xbd\x9e\x42\x59\x96\xe1\xa7\
-\xfb\xb7\x03\x14\x67\xe7\x7b\x1b\xcb\x30\x72\xd3\xa9\xa4\x9d\xc6\
-\xda\xe5\x51\x99\xfc\xc6\x6b\xbf\xb8\x9f\x4d\x9e\xe3\x63\x32\xc0\
-\xc9\x60\xb0\xbb\xaa\xb6\x1e\x25\x3b\xc8\x50\x2e\xa7\x45\xa8\x75\
-\xf8\x30\x1b\xbf\x7c\x0d\xd7\xe2\xa7\x3e\x96\xdb\xe5\x3f\x7c\x79\
-\x49\xda\xb7\x75\x8d\xe2\x30\x19\xc0\x5d\xfd\x3c\x7d\xf2\x33\xd3\
-\x71\x9c\x25\x03\xb4\x4d\x32\x80\x99\xe6\x7f\x51\x24\x07\x77\xdd\
-\xc5\x59\x32\x40\x67\xf3\x7d\x28\xf9\x53\x96\x46\x79\x2d\x7c\xa5\
-\xcb\x38\x4c\x06\xb8\x9d\x4e\x5f\x43\xa8\x8f\xcc\x75\x25\xe9\x2d\
-\x4b\xb5\x66\x55\x26\xbf\x56\x1d\xba\xf1\x17\x40\xe2\x47\x08\x00\
-\x00\x00\x00\x00\x00\x00\x00\x00\x68\x8b\x4f\xc6\xe5\x42\x89\xb1\
-\xed\x97\x86\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x04\x75\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x04\x27\x49\x44\x41\x54\x78\x9c\xed\
-\x9b\x4f\x68\x5c\x55\x14\xc6\x7f\xe7\xcd\xb4\x5a\x8c\x08\xb6\xba\
-\x30\xa8\x2b\x51\xd4\x8d\x50\x84\x22\x48\x6c\x27\x89\x41\x0c\x76\
-\xc6\xd1\x95\xd8\xfc\x99\x50\x17\xa2\x05\x45\xf0\x0f\xe3\xd0\x8a\
-\x15\x04\x17\x22\xb6\x49\xa6\xc6\x45\x8a\x9a\x26\x0d\xa1\x1a\x3b\
-\x49\x64\x0a\x8a\x20\x28\x08\xc5\x85\x20\xe2\xa2\x41\x04\xad\x14\
-\x6d\x0b\x93\xb9\xc7\x45\x1c\x79\xf3\x66\xc0\x14\xdf\xbd\xef\x62\
-\xe6\x5b\x7e\x1f\xdc\x73\xee\x77\xce\xfd\xf7\x98\x81\x0e\x3a\xe8\
-\x60\x33\x43\x92\x4e\x60\xa3\xc8\x64\x47\x8b\x22\xf2\x32\x18\x51\
-\xd5\x43\xcb\x73\xc7\x5e\x8d\x63\xdc\x20\x8e\x41\x6c\xa3\x3f\x3b\
-\xfc\x00\x42\x11\x34\x0d\x92\x12\x09\x5e\x89\x6b\xec\x74\x5c\x03\
-\xd9\x42\x6f\x6e\x78\xa7\x21\x58\x90\xe6\x6e\x8d\xad\x70\x5e\x77\
-\x40\x5f\x6e\xec\x0e\x34\x58\x04\xba\x22\x92\x89\x2b\x86\xb7\x06\
-\x64\xf2\x63\xb7\x28\xa6\x82\xb0\xa3\x8d\xac\x71\xc5\xf1\xd2\x80\
-\x81\xfc\xd0\x0d\x18\x53\x01\x6e\xb6\x1d\xcb\x3b\x03\x06\x07\x87\
-\xaf\x5d\x33\xa9\x4f\x04\x6e\x77\x11\xcf\x2b\x03\x7a\xf6\xed\xbb\
-\xfa\xd2\xd6\x60\x1e\xd8\x19\x91\x62\x6b\xf9\x28\xbc\x31\xa0\xa7\
-\xa7\x98\xde\xf2\x47\xfa\x38\xca\xee\x88\xa4\xc4\xb8\xe9\x45\xe1\
-\x8b\x01\x92\xde\xbe\x7a\x14\x65\x6f\x13\xab\x6a\x75\xf2\xe0\x89\
-\x01\x99\xdc\xe8\x1b\x82\x0e\x47\x68\x45\xc4\xea\xe4\xc1\x03\x03\
-\x7a\x1f\x2d\xbc\x20\xf0\x7c\x1b\xc9\xfa\xe4\x21\x61\x03\x32\xb9\
-\x42\x01\xd5\xc3\x6d\xa4\xba\xab\x1c\x12\x33\x20\x93\x2b\xe4\x04\
-\x3d\xd2\x44\xae\xef\xf5\x4e\x2a\xdf\x40\x22\x06\xec\xc9\x16\x32\
-\x82\x1e\x6f\x89\x1f\x60\xb0\x78\xe4\xb5\x83\x73\x03\xfa\xf3\x23\
-\xf7\x06\xa2\xf3\xc0\xd6\x88\x64\x50\xb7\x93\x07\xc7\x06\xec\xc9\
-\x0f\xdd\x69\x8c\x2c\x02\xd7\x84\x79\xc1\x7d\xe5\x1b\x70\xf6\x1c\
-\xde\x9d\x1d\xb9\x35\x30\x52\x01\xae\x8f\x48\x46\x13\x9a\x3c\x38\
-\xea\x80\xbe\xbd\xfb\x6f\x4c\x09\x4b\x40\x77\x98\x17\x24\xb1\xca\
-\x37\x60\xbd\x03\x32\xf9\xb1\xeb\xd4\xac\x7d\x0a\x72\x5b\xb3\xa2\
-\x9a\x64\xe5\x1b\xb0\xda\x01\xbb\xf2\x07\xb6\x89\x31\x0b\xc0\x3d\
-\x11\x49\xc1\xfe\x2d\x6f\x23\xb0\x66\x40\x4f\x4f\x31\xdd\xa5\x17\
-\x3e\x00\xee\x8f\x48\xd6\xef\xf7\x57\x02\x2b\x06\x14\x8b\xc5\x60\
-\xcb\xf6\x73\x93\xa8\x0c\x46\x24\x6f\x2a\xdf\x80\x0d\x03\xe4\x8b\
-\xb3\xab\x6f\x02\x4f\x36\xb1\xda\xa8\x7c\xe2\xcb\xbe\x09\xb1\x1b\
-\x90\xc9\x8d\xbe\x28\xe8\x81\x16\x41\xfc\x69\xfb\x30\x62\x35\xa0\
-\x37\x57\xd8\x2f\x70\xa8\x55\x11\x67\x8f\x9b\x2b\x45\x6c\x06\xf4\
-\x66\x47\x0e\x83\xbe\x1b\xe5\xc5\xc3\xb6\x0f\x23\xbe\x0e\x10\x89\
-\x7e\xd0\x00\x24\xd1\x5b\xde\x46\x10\x9b\x01\xd2\xf6\x0d\xef\xf5\
-\xdc\x81\x18\x0d\x30\xc8\x33\xb4\xce\x38\xf1\x2f\x4e\xff\x86\xd8\
-\x12\x5c\x9e\x9d\xf8\x08\x78\xba\x55\xd1\x54\x5c\x31\x6c\x20\xd6\
-\x0a\x2d\xcd\x4e\xbe\x03\x5a\x6c\x66\x05\xc0\x5b\x13\x62\x6f\xd1\
-\xa5\xd9\xf2\x41\x11\xde\x8e\xf2\x8a\x7a\xb9\x1c\x6c\x24\xa5\xbb\
-\xee\xea\x7e\x56\x95\xe9\x30\x29\x88\x58\x8a\xf7\x9f\x60\x25\xa1\
-\x52\xa9\x64\xce\xef\x08\x86\x10\xf9\x38\x22\x09\x9e\x75\x82\xb5\
-\x64\xbe\x1e\x1f\xaf\x5d\x75\x59\x1e\x43\xf5\xf3\x66\x45\x44\x3d\
-\xea\x04\xab\x89\x9c\x3a\x35\x7e\xb1\x66\xea\x0f\x83\x7c\x1b\xe6\
-\x05\xc4\x97\x3d\xc1\x7a\x12\xd5\xf9\xa9\xdf\x6b\x41\xed\x41\x81\
-\x1f\xc2\xbc\x20\x22\x1e\xfc\x48\xcb\x49\x15\xaa\x33\x53\x3f\x13\
-\xd0\x8b\xb0\x1a\xe6\x15\x02\x91\x64\x4d\x70\xd6\x86\x95\x99\xc9\
-\x1f\xa5\xae\xfd\x28\xe7\xc3\xbc\x2a\x01\xeb\x27\x44\x22\x70\xba\
-\x0e\x2b\x27\xcb\x67\x4d\xca\x3c\x04\x5c\x6c\x56\x34\x20\xa1\xe5\
-\xe0\x7c\x23\x5a\x99\x39\xf6\xa5\x22\x59\xa0\xd6\x26\x17\xe7\x26\
-\x24\xb2\x13\x2f\xcf\x4e\x9c\x16\xe5\x09\xa2\x8f\x27\x25\x70\xbd\
-\x31\x26\x76\x14\x55\xe6\x26\x3f\x44\xf4\xa9\x26\x52\xd6\x37\x46\
-\x97\x1e\x24\x7a\x16\x2f\x9d\x28\x1f\x45\x78\xa9\x55\x71\xf7\x82\
-\x4c\xfc\x32\xb2\x74\x62\xf2\x75\x45\xde\x6a\x23\x39\xc9\x2d\x71\
-\x03\x00\xbd\xef\xee\x9b\x9e\x03\xde\x8f\xf0\x4e\xae\xcc\x3e\x18\
-\x40\xa9\x54\x32\xb5\x5f\xbb\x47\x11\x5d\x08\xf3\x7f\x6f\x88\x56\
-\x73\xf4\xc2\x00\x80\x6a\xb5\xb4\x56\xeb\xaa\x3f\x8e\x72\x26\x22\
-\x59\x35\xc1\x1b\x03\x00\xaa\x53\x53\x97\xd3\xdb\x2e\x0d\x2a\x7c\
-\x13\x91\xac\x1d\x0b\x5e\x19\x00\xb0\x38\x3d\x7d\x21\x30\xe9\x01\
-\xe0\x7b\x17\xf1\xbc\x33\x00\xa0\x72\xf2\xc8\x2f\x75\xd5\x3e\xe0\
-\x9c\xed\x58\x5e\x1a\x00\xf0\xd9\x5c\xf9\x27\x13\xd4\xfb\x80\xdf\
-\xda\xc8\xb1\x2d\x09\x6f\x0d\x00\x58\x99\x79\xef\xbb\x20\xd0\x01\
-\xe0\xcf\x88\xb4\x39\xfe\x32\x03\x70\x7a\xa6\xfc\x95\x51\x79\x04\
-\xf4\x9f\x77\x83\x6c\x86\xbf\xcc\x84\xb1\x32\x37\xb1\x0c\x1c\x04\
-\xad\x23\xd4\x45\x78\x2d\xe9\x9c\x3a\xe8\xa0\x83\xff\x07\xfe\x02\
-\xec\x35\x2d\x8c\x9b\x14\xe3\x6d\x00\x00\x00\x00\x49\x45\x4e\x44\
-\xae\x42\x60\x82\
-\x00\x00\x00\x8b\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x00\x3d\x49\x44\x41\x54\x78\x9c\xed\
-\xd0\x01\x09\x00\x20\x10\x04\xc1\xd7\x6e\x26\xb0\x82\xfd\x2b\xf8\
-\x29\xe4\x40\x66\x12\x2c\x5b\x05\x00\x00\x00\x00\x00\x00\xc0\xff\
-\xc6\xda\xe7\xa6\x23\x92\x66\x3a\x20\xcd\x80\x74\x00\x00\x00\x00\
-\x00\x00\x00\x00\xbc\xd7\xba\x61\x02\x03\x59\xaf\x8c\x6f\x00\x00\
-\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x00\x85\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x00\x37\x49\x44\x41\x54\x58\x85\xed\
-\xce\xb1\x11\x00\x30\x08\x03\x31\x2e\x4b\xb1\x35\x23\x42\x86\x80\
-\x52\xdf\xdb\xa7\x88\x45\x59\x3d\x59\x3d\x9b\x8f\xb7\x19\x5f\x04\
-\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xf0\x01\
-\x8b\x69\x06\x03\x87\x7c\xe1\xcd\x00\x00\x00\x00\x49\x45\x4e\x44\
-\xae\x42\x60\x82\
-\x00\x00\x04\x32\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x03\xe4\x49\x44\x41\x54\x78\x9c\xed\
-\x99\xcb\x6f\x5b\x55\x10\xc6\xbf\x39\xb6\x4b\x02\xa1\x42\x24\x6c\
-\x10\xa9\xa0\x41\x6a\xd3\x76\xe3\xb4\xac\x90\x90\x4b\xec\x8b\xda\
-\x45\x5a\x3f\xb2\x80\x2c\xc8\xc3\x0e\xfc\x03\x88\x55\x1b\xd8\x54\
-\x42\xac\x10\x42\x42\xa1\x24\x15\x2c\xb2\x30\x8f\xb6\x0b\x8c\xac\
-\xb6\x89\x68\x61\x01\x28\xde\xd5\x54\x2a\x46\xa2\xcd\x0a\x58\x54\
-\x55\xd5\xa8\xb1\xcf\xb0\x48\x08\xd7\xf7\x1e\x3b\x7e\xdc\x6b\x17\
-\x31\x3f\xc9\x9b\x99\xf3\x98\xf9\x3c\x67\xee\xb9\x36\x20\x08\x82\
-\x20\x08\x82\x20\x08\x82\x20\x08\x82\x20\xfc\xbf\xa0\x6e\x6d\x1c\
-\x4b\x64\xe2\x20\xfe\x08\x04\xc5\xe0\x4f\x2e\x7d\xf1\xe9\xa9\x6e\
-\xc4\x11\xe8\xc6\xa6\xd1\x64\x26\x43\xc4\x9f\x01\xd8\x0d\xa0\x8f\
-\x40\x2f\x0d\x1d\x0c\xaf\x95\xae\x17\x56\x3b\x1d\x4b\xc7\x05\x88\
-\xa5\x32\x6f\x13\xf8\x03\xb8\xaa\x8f\xc6\x86\x86\xc3\xf7\x4b\xc5\
-\xc2\xf7\x9d\x8c\xa7\x93\x02\x90\x95\xcc\xbc\x0f\xf0\xe9\xda\x23\
-\x28\xb6\xf7\xc0\xc8\x63\xa5\xe2\xea\xa5\x8e\x05\xd5\x89\x4d\x22\
-\x91\xb9\x60\xe8\xc9\xb5\x79\x10\xa6\x1a\x19\xcf\xa0\x85\xf2\x5f\
-\x4f\xbf\xb1\xb2\xf2\x6e\xd9\xef\xd8\x7c\x17\x20\x32\x39\xd9\x13\
-\xbc\x1b\x5a\x22\xf0\x49\x83\x5b\x13\x01\xcc\x50\x86\xc8\xbe\xde\
-\xe8\x2b\xbf\xb6\x72\xee\xdc\xba\x9f\xf1\xf9\x2a\xc0\xb1\x89\x89\
-\xdd\x1b\xeb\x8f\x9e\x27\xf0\x51\xbb\x9d\x37\x37\xae\x54\x8f\xe6\
-\x80\xbb\x2d\xe0\x4a\xef\x03\x7d\xf2\xe2\xc5\x85\xbb\x7e\xc5\xe8\
-\x9b\x00\xc7\xc6\xa7\x9e\x2a\x57\x02\x39\x10\x0e\x1b\xdc\x15\x83\
-\x0d\x30\xf7\xa4\x9f\x83\xaa\x72\x3c\x97\x5d\xfc\xc3\xc3\xf0\xb6\
-\xf1\x45\x80\xe8\xf8\xec\x1e\x68\x9d\x27\x60\x9f\xdd\xce\x60\x26\
-\x90\xae\x37\x97\xc1\x8a\x40\x54\x6d\xc3\x0d\x55\xae\xc4\xf2\x17\
-\x16\x6f\x79\x1d\xab\xe7\x02\x44\xe3\xe9\x61\x52\xc8\x03\x78\xc6\
-\xe1\x62\x00\x75\x93\xff\x77\x24\x2b\x10\x39\x63\xbb\x45\x50\x56\
-\xfe\xcb\xf9\x5f\x3c\x08\x73\x1b\x77\xf3\x69\x83\xd1\x44\xe6\x05\
-\x52\xb8\x0a\x67\xf2\xdc\x44\xf2\x00\x40\xa4\x01\x66\x87\x75\x90\
-\xa1\xaf\xc5\x92\xd3\x47\xda\x0e\xd4\x86\x67\x02\xc4\x52\x33\xa3\
-\x8a\xf8\x0a\x80\xfe\x6a\x0f\x33\xa8\x89\xe4\xb7\x21\xcd\x9b\x55\
-\x63\xa7\x1f\x50\xcb\x56\x3c\xfd\x72\xab\x71\x3a\xf1\x44\x80\x68\
-\x2a\x9d\x00\xd3\x37\x00\xfa\xec\x76\x06\x33\x76\x38\xf3\xf5\x20\
-\x40\x33\xbb\x44\xe8\x63\x85\x5c\x2c\x91\x89\xb7\xba\xae\x9d\xb6\
-\x6f\x82\x56\x22\x3d\x03\xe0\x73\x00\x41\xbb\x9d\x00\x0d\x90\x33\
-\xf8\xa6\x21\x02\x6f\xf5\x44\x7b\x4f\x08\x80\x30\xfe\xfc\x81\xf0\
-\xed\x5f\x8b\x85\x42\x3b\xeb\xb7\x25\x80\x95\x4c\xbf\xc5\x84\x0f\
-\x1d\xc1\x6d\x7e\x73\xee\xf2\x6d\x8b\xad\x96\x68\xdf\x87\x00\x3a\
-\xb1\xf7\x60\xf8\x5e\xe9\x7a\xe1\x87\x56\xd7\x6d\x55\x00\x8a\xa5\
-\x32\xef\x01\x78\xc7\xed\x81\x86\xc7\xc9\xdb\x17\x87\x4b\x6c\xb2\
-\x86\x86\xc3\xbd\xa5\x62\xe1\x72\xcb\x2b\x36\x43\x24\x32\x17\x0c\
-\xf5\xaf\x7d\x0c\x60\xc6\xe0\xf6\x31\xf9\x6d\x08\xa6\xde\xc5\x38\
-\xfb\x44\xe0\xce\x9b\xd9\x6c\xb6\xd6\x25\xcb\x48\x53\x15\x10\x99\
-\x9c\xec\x09\x05\xee\x2d\x01\x98\x70\x6c\xee\xf3\x37\x6f\x80\x41\
-\x8e\x03\x31\xb2\xce\x3d\x87\xf6\x3d\xfb\xe2\x85\x9b\x37\x7f\x6c\
-\x58\x84\x86\x2b\x60\x6c\x6c\xfa\xf1\xfb\xbb\xd4\x79\x30\x5c\x8f\
-\x20\x3f\xce\x7c\x03\x98\x2b\x01\xb8\xdc\xbb\xa1\xe3\x8d\xbe\x3f\
-\x34\x24\x40\xe4\xd5\xd9\x81\xd0\x03\x9d\x03\x60\xb8\x84\x50\xa5\
-\xf3\xb9\x57\x61\xaa\xe2\x9f\x36\x76\xa9\xe3\x2b\x4b\xf3\x7f\xee\
-\x34\x79\x47\x01\xac\x13\x53\x83\x1c\x0c\xe4\x01\xec\xaf\x72\x30\
-\x5a\xbc\xe0\xf8\x82\x82\x3b\x97\x62\x90\x61\xe5\xbe\x3a\x7b\xbb\
-\xde\xc4\xba\x02\x58\xc9\xd9\xfd\x0c\x9d\x07\x30\x68\xb7\x33\xc0\
-\xd4\xcc\xd5\xb6\x13\x98\xdf\x1f\x7e\x0f\x28\x6d\x7d\x9b\x5d\xb8\
-\x51\x6b\x5a\xcd\x9b\x60\x2c\x39\x7d\x84\x59\x5f\x85\x33\x79\xc6\
-\x8e\x6f\x74\x5d\x81\xc8\xd4\x84\xf7\x54\x2a\xea\x9a\x35\x9e\x36\
-\xbd\x92\x03\xa8\x21\xc0\x2b\x89\xe9\xa3\x80\x5a\x06\x61\xc0\xe1\
-\x62\x22\xe8\x2e\x9f\xf9\x7a\xb8\x45\x20\x0c\x68\x8d\xe5\x68\x2a\
-\x1d\x31\x4d\x70\x35\x90\xd1\x44\xfa\x14\x13\x2d\x12\xf0\x88\x61\
-\xfc\x3f\x9d\xf7\x61\xfe\xb8\x8e\xf5\x56\x2e\xaf\x3f\x37\x3c\xa2\
-\x7f\x2b\xae\x7e\x67\xf7\xb9\x2a\x40\x11\xe6\xa8\x8b\x7f\x98\xf8\
-\x05\x01\xa4\x08\x73\x4e\xbb\xa7\xbf\x07\xfc\x17\x31\x55\xc0\x19\
-\x7a\x78\x1e\x6f\x9e\x41\x04\xad\x08\x67\xba\x1d\x87\x20\x08\x82\
-\x20\x08\x82\x20\x08\x82\x20\x08\x82\xd0\x6d\xfe\x06\xf7\x21\x1d\
-\x03\xf2\x02\xba\x61\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\
-\x82\
-\x00\x00\x03\xe3\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x03\x95\x49\x44\x41\x54\x78\x9c\xed\
-\x9b\x3d\x48\x5b\x51\x14\xc7\xff\xe7\xe5\x49\x07\xb1\x2a\x16\x22\
-\x58\x74\xae\x43\x15\x92\x22\xdd\x84\x56\x1d\x14\x37\xeb\x50\x41\
-\x07\x89\x14\x5a\x3f\xa6\x52\x87\x06\x85\x62\xe9\xe2\x47\x1d\xaa\
-\x38\x28\xb8\xa8\x9b\x28\x54\xdb\xa1\x43\xa1\x88\x06\xd4\xc1\xce\
-\x8a\xb6\xa6\x90\xfa\x41\x1d\x6c\x93\x77\x3a\xa8\xe5\xe5\xe5\x45\
-\x93\xdc\x97\x5c\xad\xf7\xb7\xdd\xf3\x4e\x4e\xfe\xf7\xff\xde\xbb\
-\xf7\x92\xdc\x0b\x28\x14\x8a\xeb\x0c\x25\x92\x54\xe9\xf7\xeb\x47\
-\xbb\x05\xf5\x06\xd0\x48\x20\x2f\xc0\x45\x00\x6e\xa4\x59\x5b\xb2\
-\x1c\x03\xb4\xc3\xe0\x15\x0d\x98\xca\x2e\x0c\xcd\x7e\xea\xe9\x09\
-\x5f\xf4\xa1\x0b\x0d\xf0\xb6\x0d\x57\x81\x79\x10\xc4\x77\x9c\xd1\
-\x99\x19\x18\xd8\x20\x68\x9d\x2b\x23\x4f\x3f\x9c\x97\xa7\x9d\x53\
-\x82\xbc\xbe\xa1\x6e\xc0\x58\xbc\x6a\x9d\x07\x00\x02\x4a\x01\x63\
-\xf1\x5e\xdb\xe0\x0b\x80\xe3\xde\x68\x57\xbc\x0b\x5e\x5f\x41\x37\
-\x08\xaf\xd2\x23\x2f\x93\xd0\x83\x22\xef\xd2\xf1\xb7\xc0\xfb\xcf\
-\xb6\x57\xed\x82\xde\xb6\xe1\x2a\xc0\x58\xb4\x84\xf7\x40\x78\xa9\
-\x85\x69\xbe\xe4\xc0\xbd\x35\x33\xf3\x28\xe2\xb8\x56\x01\x1a\x1a\
-\xa6\x5d\x9b\xb9\xc1\x62\x43\xe7\x5a\x30\x7a\x01\xe4\x47\x67\x68\
-\xd5\x76\xaf\x43\x8c\x01\x95\x7e\xbf\xfe\xeb\xfb\xad\xf5\xa8\xc7\
-\x9e\xf0\xd1\x15\x36\x9a\x96\xc6\x3a\x83\xce\x4b\x77\x9e\x8a\xd6\
-\x01\x77\x44\xd7\x26\xc1\x78\x78\x16\x63\x60\x23\xa7\x30\x54\x66\
-\x1d\x18\x63\xc6\x80\xa3\xdd\x82\x7a\xcb\x3b\xff\xf3\x37\xb2\x1e\
-\x5f\x95\xce\x03\xc0\xd2\x58\x67\xd0\x15\x36\x9a\x00\xec\x9d\xc5\
-\x08\x28\x3d\xda\x2d\xa8\xb7\xe6\xc6\x18\x60\x00\x8d\x51\x01\x82\
-\x7f\xfd\xdd\x93\x1f\xe9\x10\x9a\x4e\x96\xc6\x3a\x83\x0c\xf6\x9b\
-\x63\x31\x7d\x83\x8d\x01\x27\xf3\xbc\x29\x21\x4c\xf3\xce\xcb\xcb\
-\x0c\xae\x88\x36\x67\x6e\x13\xe0\xb1\xe6\xd8\x4c\x83\x5c\x64\x6e\
-\x95\x1c\xb8\xb7\x9c\x16\x96\x29\x6c\xb4\xdf\xb6\xe6\xd8\xad\x03\
-\xa2\x56\x78\x97\x6d\xb4\x4f\x06\x1b\xed\x31\xab\xd7\x73\x16\x42\
-\xd7\x03\x65\x80\x6c\x01\xb2\x51\x06\xc8\x16\x20\x1b\x65\x80\x6c\
-\x01\xb2\x51\x06\xc8\x16\x20\x1b\x65\x80\x6c\x01\xb2\x51\x06\xc8\
-\x16\x20\x1b\xdd\x89\x22\x1e\xdf\x50\x35\x08\x6f\x08\xb8\x8b\x04\
-\xff\x6b\x10\x80\x01\x5a\x63\xe6\xe7\x81\xd1\x76\xeb\xef\x96\x49\
-\x23\xfc\x04\x78\x7c\x83\xcd\x44\x58\x20\xa0\x0c\xe9\xef\x3c\x4e\
-\xbe\x83\xcb\x89\xb0\xe0\xf1\x0d\x36\x8b\x16\x13\x32\xa0\xbc\xa5\
-\x3f\x8f\x88\xde\x8a\x8a\x48\x15\x22\x1a\x2a\x6f\xe9\xcf\x13\xa9\
-\x21\x64\x80\x9e\xa5\xdf\x07\x90\x23\x52\x43\x90\x9b\xa7\x1a\x52\
-\xe6\xda\x0f\x82\x42\x06\x84\xff\x84\xbf\x00\x38\x74\x48\x4b\x2a\
-\x1c\x9e\x6a\x48\x19\x21\x03\x56\xc7\xbb\xf6\x99\xb9\x5d\xa4\x86\
-\x08\xcc\xdc\xbe\x3a\xde\xb5\x2f\x52\x43\xf8\x15\x08\x8c\x76\x4c\
-\x30\xa3\x06\xa0\x55\x00\x2c\x5a\x2f\x01\x98\x81\x35\x66\xd4\x04\
-\x46\x3b\x26\x44\x8b\x39\xb2\x0e\x38\x9d\x8f\x85\xe7\x64\x19\xa8\
-\x41\x50\xb6\x00\xd9\x28\x03\x64\x0b\x90\x8d\x32\x40\xb6\x00\xd9\
-\x28\x03\x64\x0b\x90\x8d\x32\x40\xb6\x00\xd9\x28\x03\x64\x0b\x90\
-\x8d\x32\xc0\x26\x76\x6c\x6e\x34\x34\x4c\xc7\xdd\x4e\x7b\xd9\xb1\
-\xd1\x7e\x6c\xcd\xb1\x31\x80\x76\xcc\xad\xcd\xdc\x60\xb1\xa3\xaa\
-\x32\x88\x8d\xf6\x6d\x6b\x4e\x8c\x01\x0c\x5e\x31\xb7\x0d\x9d\x6b\
-\x1d\xd6\x95\x31\x22\x2e\xa3\xce\xdc\x66\x20\x60\xcd\x89\x31\x40\
-\x03\xa6\xa2\x02\x8c\xde\x8a\xd6\x01\xb7\xe3\xea\xd2\x4c\x45\xeb\
-\x80\x9b\x40\x3d\xe6\x58\x4c\xdf\x60\x63\x40\x76\x61\x68\x16\x4c\
-\x5f\x4d\xa1\xfc\x88\xae\x4d\x5e\x25\x13\xfe\x6d\x96\x36\xed\x18\
-\x67\x60\x23\xbb\x30\x34\x6b\xcd\x4d\x6a\xbb\x3c\x83\xfd\xae\x88\
-\x36\x77\x99\xb7\xcb\x47\x5c\x46\xdd\xe9\x9d\x4f\x6d\xbb\xfc\x19\
-\x5e\xdf\xd0\x7f\x72\x60\x02\x20\x70\xf7\xf2\x48\x47\x9f\xdd\xb5\
-\xb8\xeb\x80\x95\xd1\x67\x7d\x04\xee\x4e\x9f\xac\x8c\xc0\xcc\xf4\
-\x62\x79\xa4\xfd\x75\xbc\x84\x84\x0e\x4d\x31\x8c\x81\x93\x33\x38\
-\x57\x87\x44\x0f\x4d\xa5\x70\x6c\x0e\x1e\x9c\xec\xba\xbe\x84\xc7\
-\xe6\xb0\xcd\x40\x20\x99\x63\x73\x0a\x85\xe2\x7a\xf3\x17\x37\xaf\
-\x1e\xac\x94\x31\x9b\x08\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\
-\x60\x82\
-\x00\x00\x05\x08\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x04\xba\x49\x44\x41\x54\x58\x85\xe5\
-\x97\x5b\x6c\x94\x45\x14\xc7\x7f\x67\xbe\xd2\x2a\x78\x21\x2d\x89\
-\x8b\x72\x6d\x40\xb1\x51\xa3\x74\xb7\xe8\x83\x37\x24\x90\x80\x5c\
-\x34\x56\x43\x34\x62\x08\x74\x4b\x61\x0b\x9a\xa0\xa0\xc4\xb5\x01\
-\xb1\xbe\x40\xba\x5d\x5a\x76\x6d\x62\x48\x78\xb2\x89\x0d\x54\x40\
-\x49\x34\xf0\xa4\xa5\xbb\x36\x3c\xd8\x60\x4c\x20\x60\x69\x4b\x84\
-\x26\x1a\x01\xbb\xec\xce\xf1\x61\xbb\xcb\xd7\xfb\x45\xdf\xf8\xbf\
-\x7d\x67\xce\x39\xff\xff\xcc\x37\x33\xe7\x0c\xdc\xe9\x90\xf1\x38\
-\xfb\x2a\x0e\xcc\xb4\xa9\xe4\x1a\x51\x59\x82\x30\x13\x61\x06\x8a\
-\x41\xb9\x8c\x48\x07\xc2\x69\x47\x6d\x53\x4b\x64\xeb\x6f\xff\xab\
-\x00\x6f\x79\xa8\x04\xa5\x1a\x78\x71\x8c\x59\x5b\x45\x75\x67\x6b\
-\x64\xeb\xf7\xff\x49\x40\x71\x59\xe4\x7e\x91\xde\x7a\x60\x6d\x9f\
-\xa9\x0b\xa4\x59\x95\x13\xea\xa4\xce\xeb\x3f\xa6\x6b\xd2\x64\x63\
-\x35\x81\xc7\x8a\x9d\x63\x0c\x4b\xd5\xb2\x1a\x61\x76\x5f\xfa\xe3\
-\x4e\x2a\xb5\xbe\xa5\x61\xdb\x95\x71\x0b\x58\x58\x71\x60\x9e\x49\
-\xda\xa3\x88\x3e\x0a\x74\x89\x10\x9c\xf2\xc0\xb5\x2f\x4f\x55\x55\
-\x25\x47\x9c\x52\x30\x68\xbc\xdd\x05\x6f\x80\xec\x01\x2d\x04\x2e\
-\x19\x58\x75\x26\x52\x79\x76\xcc\x02\xbc\x9b\xf6\x15\x62\x73\x5a\
-\x80\x69\xc0\x11\x27\x97\xb7\x5b\x6a\x2b\xff\x1a\x91\x78\x00\xe6\
-\x05\x42\x79\x53\x7b\xa9\x43\x58\x0f\x5c\x47\x78\x36\x76\xb0\xb2\
-\x6d\x54\x01\x8b\x02\xa1\xfb\x92\x09\x7e\x14\x28\x52\xb4\x26\xee\
-\xe9\x79\x8f\xaa\x2a\x3b\x1e\xf2\xdb\x50\xf1\xf9\x43\x3b\x14\xd9\
-\x0b\x74\xa8\xa6\x4a\xe2\xd1\x77\xbb\xdc\x1e\x39\x03\x43\x52\xbd\
-\x84\x45\x28\x02\x9a\x87\x22\x4f\x9f\x84\xd4\x06\x81\xe5\x02\xb3\
-\x14\x2c\xc8\x45\x55\x8e\x41\xb2\xa1\x3f\x81\x68\x6b\x44\xab\x7d\
-\xe5\xb5\x85\xaa\x6c\x30\xe2\x1c\x06\x5d\x02\xa2\x43\xae\x40\x89\
-\xbf\xd6\x6b\xd1\x56\x84\x3f\xd4\xe6\xcd\x8f\x47\xfd\x7f\x66\x07\
-\x83\x41\xe3\xeb\xce\xff\x40\x91\x8f\x81\xbb\x86\x99\xf2\x75\x55\
-\x3e\x8c\x47\x03\xb5\x6e\x92\xa2\xd2\x60\xee\xe4\xfc\x82\xb3\xc0\
-\x02\xd0\x15\xb1\xc8\xd6\xe3\x99\x31\xe3\x8e\xb6\xa2\x9f\x01\xa8\
-\xea\xee\x81\xe4\xde\xee\xfc\x43\x7d\x4b\x39\x1c\x39\xc0\x14\x11\
-\x6a\xbc\xfe\x50\x1d\x68\x76\x72\xed\x8d\x55\x09\x81\x8f\xfa\xe6\
-\x5c\xed\x1e\xcb\x0a\x28\x2e\xdb\x3f\x1d\xe5\x25\xa0\xe7\x66\x4f\
-\x4f\xc4\x9d\xd5\xd7\x5d\xb0\x0b\xe4\xad\x11\x88\x5d\x50\x40\xca\
-\x7d\xfe\x70\xa5\xdb\xda\x1a\x09\x34\x01\xe7\x80\xc7\x4b\xfc\xb5\
-\x4f\x0c\x12\x20\x98\x95\x80\xa0\x1c\x6b\x6f\xac\x4a\x64\xec\xde\
-\x4d\xfb\x0a\x15\x76\x8d\x8d\x3c\x9d\x29\x2d\x43\x3f\x7d\x6a\x4b\
-\xed\x83\x2e\xbb\xa2\x7a\x14\xc0\x8a\xbe\x32\x48\x00\x22\x2f\xa4\
-\x03\xe5\xdb\x7e\xe9\x34\xa7\x02\x98\x34\x76\x01\x59\x4c\x71\x12\
-\x6c\x74\x1b\xac\x31\xdf\xa5\x73\xca\xe2\xc1\x02\x60\x26\x80\x23\
-\x72\xc1\x1d\xa4\xca\x8a\x09\x90\xa7\x21\xfa\xb2\xfb\x33\x97\xe4\
-\x79\x00\x85\x19\x83\x04\x64\x8c\x46\x6e\xb9\x8e\x91\x0a\x50\x38\
-\x71\x01\x99\x2b\x39\x8d\xab\x93\x9c\x4c\xee\x87\x32\x1b\xd1\x0c\
-\x0a\x72\x23\xf8\x89\x8c\xea\x33\x12\x14\x67\x94\xdc\xee\x4d\xc8\
-\x65\x80\x84\x38\x9e\xac\x53\xfa\x12\xba\x38\x61\x01\xc8\x25\xf7\
-\xd7\xbd\xd6\x78\xd2\xba\xe8\xcc\x5c\x70\xb7\x67\xa7\xf2\x3b\x80\
-\xb1\xcc\x1d\x90\xe4\x38\x13\x85\x68\xbf\x58\x73\x2b\x55\x08\x20\
-\xd0\x91\xb5\xdd\x1e\xd5\x53\x00\x22\xb2\xcc\x1d\xe4\xa0\x07\x81\
-\x89\xd4\x82\x84\x49\x4a\x43\x3f\x01\x86\xa5\x00\x0a\x3f\x0c\x12\
-\x90\xca\x91\x66\x00\x55\x5d\x51\x5c\x16\xc9\x1e\xbb\x96\x48\x65\
-\x3b\x10\x1a\x37\xbd\xca\xde\x33\x0d\x81\x0b\x6e\x83\x55\x59\x05\
-\x60\x6c\xaa\x69\x90\x80\xb6\x70\xa0\x53\xd2\xca\xa6\x41\xef\x86\
-\x7e\xb9\x34\xef\xfd\xf1\xfd\x0a\x6d\x8c\x4d\xbf\xba\xdb\x6d\xf1\
-\x6e\x0a\xaf\x14\x28\x02\x7e\x69\xfd\x62\x5b\xb6\x37\xe8\xbf\xc3\
-\xad\xdd\x01\x20\x42\x70\x51\x20\x74\x5f\xc6\x1c\x8f\xfa\x6f\xa9\
-\xe6\xae\x51\xb4\x86\x91\x7f\x47\x12\x61\xef\xdc\x9e\xe9\x6b\xdd\
-\x55\xb4\xa8\x34\x98\xab\x36\x5d\x67\x04\x76\x0e\x5b\x0d\x01\x8a\
-\xfd\xa1\xc3\x02\x6f\x02\x47\x62\x9e\x6b\xaf\x0e\x2c\xc7\xde\xf2\
-\x9a\xc7\x50\x29\x07\x96\x03\xb3\x48\x5f\xfe\x17\x15\xfd\x46\x8c\
-\xd6\xc7\xea\xb7\xfd\x3a\x60\x35\xc4\x5b\x56\x5b\x8f\xe0\x07\x4e\
-\xc5\x22\x81\xc5\x23\x0b\x48\xf7\x81\x3f\x01\x0b\x80\x7d\x31\xcf\
-\xb5\xed\xc3\x35\x24\xa5\xa5\x5f\x39\x00\x8d\x8d\xaf\xa7\x86\x5e\
-\x10\x15\x6f\x79\x78\x3b\xaa\x9f\xa3\x74\xa6\x72\xc5\xd7\x16\x0e\
-\x74\xba\x3d\x86\x6c\xc9\x16\x56\x1c\x98\x67\x52\xa9\x16\x20\x1f\
-\xf8\xfa\x86\xe3\xac\x6b\xaf\xdb\xfc\xf7\xd0\x24\x43\xa3\xa8\x34\
-\x98\x7b\x77\x7e\x41\x58\x60\x23\x70\xc3\x20\xcf\x9f\x89\x04\x62\
-\x03\xfd\x86\x6d\x4a\x4b\x36\x86\x1f\xb6\xc6\x1e\x05\x1e\x51\xe4\
-\xb2\x40\xf0\x1e\xcf\xd5\x43\x63\x69\x4a\x7d\x57\xf2\x5f\xb3\x2a\
-\x7b\x04\xe6\x03\x1d\xaa\x66\x75\x3c\xba\xe5\xe7\xa1\xdc\x47\x6c\
-\xcb\x9f\x7c\x67\xff\xd4\x9c\x3c\x13\x05\x29\xed\x33\x75\x88\xd0\
-\x8c\x72\x02\x6b\xce\xe7\xd8\x44\xd7\xcd\x94\x58\x27\x37\xc7\xa3\
-\x86\xd9\xc6\xda\x65\x88\x59\xdd\xd7\x0d\x03\x9c\x14\xc7\x59\xd7\
-\x5a\xb7\xb9\x7b\x38\x8e\x31\x3d\x4c\x4a\xfc\xe1\x67\x2c\x5a\x0d\
-\xfa\xdc\x58\xfc\x81\x36\x55\x76\xc4\xa3\x95\x27\x47\x73\x1c\xd7\
-\xd3\xec\xe9\xf2\xfd\x73\x92\xd6\x59\x83\xb0\x04\xed\x7b\x9a\x81\
-\x03\x74\xa4\xaf\x57\x3d\x6d\xd5\x34\xc5\xa3\x81\x73\xe3\xc9\x7b\
-\x67\xe3\x5f\x5e\xef\xd7\x3d\x0b\xb2\x5f\x42\x00\x00\x00\x00\x49\
-\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x00\xf6\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x00\xa8\x49\x44\x41\x54\x78\x9c\xed\
-\xd0\x31\x15\x80\x30\x00\xc4\x50\x5a\x53\xf5\x81\x50\x7c\x60\x0a\
-\xba\xe2\xe0\x33\x24\xdb\x4d\x97\x97\x71\x20\xd6\xf5\xbc\xdf\x7d\
-\x9f\x73\x08\x8f\x29\x4e\xff\x44\x01\xb4\x80\xa6\x00\x5a\x40\x53\
-\x00\x2d\xa0\x29\x80\x16\xd0\x14\x40\x0b\x68\x0a\xa0\x05\x34\x05\
-\xd0\x02\x9a\x02\x68\x01\x4d\x01\xb4\x80\xa6\x00\x5a\x40\x53\x00\
-\x2d\xa0\x29\x80\x16\xd0\x14\x40\x0b\x68\x0a\xa0\x05\x34\x05\xd0\
-\x02\x9a\x02\x68\x01\x4d\x01\xb4\x80\xa6\x00\x5a\x40\x53\x00\x2d\
-\xa0\x29\x80\x16\xd0\x14\x40\x0b\x68\x0a\xa0\x05\x34\x05\xd0\x02\
-\x9a\x02\x68\x01\x4d\x01\xb4\x80\xa6\x00\x5a\x40\x53\x00\x2d\xa0\
-\x29\x80\x16\xd0\x14\x40\x0b\x68\x0a\xa0\x05\x34\x05\xd0\x02\x9a\
-\x0d\x64\x41\x04\x80\xc9\xe4\x92\xad\x00\x00\x00\x00\x49\x45\x4e\
-\x44\xae\x42\x60\x82\
-\x00\x00\x00\x87\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x00\x39\x49\x44\x41\x54\x58\x85\xed\
-\xce\x31\x11\x00\x30\x08\x04\x41\x26\xe2\x50\x80\x04\x84\x20\x3d\
-\x22\xa0\xdc\xeb\xff\x67\x23\x16\x65\xf5\x64\xf5\x6c\x3e\xde\x66\
-\x7c\x11\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-\xc0\x07\x65\x23\x03\x3b\x58\x7b\xaf\x09\x00\x00\x00\x00\x49\x45\
-\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x00\x75\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x00\x27\x49\x44\x41\x54\x78\x9c\xed\
-\xc1\x01\x0d\x00\x00\x00\xc2\xa0\xf7\x4f\x6d\x0e\x37\xa0\x00\x00\
-\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x80\x77\x03\
-\x40\x40\x00\x01\x8f\xf2\xc9\x51\x00\x00\x00\x00\x49\x45\x4e\x44\
-\xae\x42\x60\x82\
-\x00\x00\x0a\x60\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x0a\x12\x49\x44\x41\x54\x78\x9c\xed\
-\x5b\x6b\x90\x14\xd5\x19\x3d\xe7\xce\xcc\xae\x83\x2c\x88\xf8\x48\
-\x4a\x28\x83\x31\x96\xae\x01\x4c\x70\x99\x5d\x82\x2b\x98\xa4\x54\
-\x82\x2c\xbb\x8b\x1b\x1f\xa5\xe2\x23\x2a\x26\xc6\xc4\x24\x26\x5a\
-\xa5\x8b\x46\x8d\xc6\x08\x96\x55\x06\xb5\x82\xa5\x22\x95\x64\x60\
-\x77\x00\x2d\x51\xab\xc4\xb5\x10\xd9\x5d\x5e\x6a\xf9\xc0\x32\x51\
-\x11\x42\x34\x2a\xca\x43\x79\xcc\xf4\x3d\xf9\xb1\xa0\xdd\x3d\x33\
-\xdd\x33\x3b\x33\x94\x95\x70\xaa\xe6\x47\x7f\xf7\xdc\xef\x9e\xfb\
-\x4d\xf7\xed\xfb\xf8\x1a\x38\x80\x03\x38\x80\xff\x67\x70\x7f\x34\
-\x72\x4a\x52\x87\xef\x89\xa1\x91\xd6\x8e\x94\xc1\xf1\x14\x8f\x11\
-\x70\x08\x80\x41\x00\x22\x00\xb6\xed\xfd\xbd\x27\xe8\x0d\xc0\xbc\
-\x8e\x28\x96\xf7\x4e\xe1\x3b\x95\xd6\x56\xb1\x00\x8c\x4b\xe9\x9b\
-\x8e\xb5\xd3\x41\x4e\x01\x30\xaa\x5f\x4e\x84\x77\x60\xb4\xd4\x5a\
-\xf3\xf0\xaa\x16\xac\x06\xa9\xf2\xaa\x2c\x77\x00\x24\x36\xa4\x70\
-\xba\x85\xae\x03\x30\xb1\x9c\xae\x09\xbc\x2a\x70\x56\xe6\x43\x3c\
-\xb6\xe6\x0a\xa6\xcb\xe8\xb7\x3c\x48\x74\x68\x22\x8c\xfe\x08\xe1\
-\xe4\x72\xf9\xcc\x83\x77\x05\xce\xec\x6d\xc6\xa3\xe5\xb8\x23\x4a\
-\x0e\x40\x62\xb1\x8e\x94\x63\xef\x26\x78\x7e\x00\xcd\x02\x58\x01\
-\xaa\x4b\xd6\xac\x37\x11\xfc\x53\x19\x6c\xb1\x16\xdb\x0f\x02\x9c\
-\x9d\x06\x35\x31\x60\xb0\x0c\x46\x08\x38\x0e\x50\x03\x80\x1f\x02\
-\x88\x07\xf8\x5c\x6e\x2d\x67\xac\x9a\xc6\xd7\x4a\xd1\x5f\x52\x00\
-\x1a\x52\x1a\x6b\xa5\x45\x00\xbe\x9e\xa3\x78\x3b\xa8\x27\x29\xf3\
-\xb8\x05\x9e\xea\x6d\xe1\xc7\x45\xf9\x4e\x2a\xee\x44\x70\x1a\x69\
-\xcf\x02\x38\x25\x4f\x1b\xbb\x44\x5e\xd2\xdb\xcc\xbf\xf6\x47\x3f\
-\x50\x42\x00\xc6\x76\xe8\x3c\x50\x0f\x11\xa8\xf6\x8b\xa2\x74\x6f\
-\xb4\xda\xdc\xf1\xc2\x64\x7e\xd2\x5f\xff\x6e\xd4\x26\x55\x55\x13\
-\xc5\x4f\x00\xdd\x04\xe0\x08\x7f\xb9\xa0\xdb\x7a\x5f\x36\x37\xe1\
-\x66\xda\x62\x7d\x17\x1f\x80\x76\x99\xc4\x28\x7b\x2b\xc8\xeb\x7d\
-\x25\x56\xd0\x43\x94\xb9\xb9\xa7\x95\x9b\x8a\xf6\x5b\x00\xbe\xb7\
-\x58\x35\x69\x8b\x6b\x29\xfd\x1a\xc0\x40\x4f\xa1\xb0\x28\xee\xf0\
-\x82\xae\x36\xee\x28\xc6\x67\x71\x01\x68\x97\x49\x8c\xb6\xf3\x01\
-\x9e\xe3\x2b\xd9\x6c\xc8\xe6\x95\xcd\xec\x2d\xca\x5f\x3f\x91\xe8\
-\xd0\x30\x18\xa5\xfc\x03\xae\x88\x75\xac\xe6\x84\x9e\x49\xdc\x56\
-\xa8\x2f\x53\x54\xc3\x27\xd9\x99\x39\x3a\xdf\x9d\x11\x4f\xde\x5f\
-\x9d\x07\x80\x9e\x56\x6e\x32\x69\x36\x0a\x9a\xef\xb6\x53\xf8\x0e\
-\x77\x69\xfe\xd9\x49\x45\x0a\xf5\x55\x70\x00\xea\x3b\xf4\x63\x88\
-\x37\x7a\x1a\x84\x1e\x89\x6f\xe5\xc4\x35\xad\xfc\x77\xa1\x7e\xca\
-\x85\x95\x6d\xdc\xd9\xdb\x6c\x2e\x10\xf9\x5b\x00\x5f\xbc\x0e\x05\
-\x4c\xde\x18\xb1\xb7\x17\xea\xa7\xa0\x47\x60\xec\x42\x9d\x4c\xa3\
-\xe5\x00\x0e\xfa\xd2\xaa\xc7\x7a\x9a\xcd\x85\x95\x98\x9d\x15\x8b\
-\x44\x87\x7e\x01\x6a\xb6\xdb\x26\xf0\xa2\xde\x16\x3e\x1a\x56\x37\
-\x34\x00\x63\x3b\x35\x94\xd0\xcb\x00\x8e\x72\x99\x7b\xe3\x5b\x79\
-\x6a\xd7\xc5\xdc\x55\x8c\xd0\xfa\x4e\x9d\x60\x85\x66\x1a\x3b\x0a\
-\xe2\x30\x00\xc3\x00\x38\x00\x36\x91\xda\x24\x6b\xd6\x2a\x86\xce\
-\xa2\xd7\x00\x12\x13\x29\x3b\x17\xe0\xc5\x2e\xeb\x1e\x8a\x0d\xdd\
-\xad\x5c\x1b\x54\x35\x34\x00\x89\x4e\x67\x2e\xc0\x4b\x5c\xa6\xcd\
-\xd1\x08\xeb\x56\x34\x71\x73\x21\xda\x6a\x93\xaa\xaa\x89\x61\x06\
-\xa4\x2b\x01\x1c\x5f\x48\x1d\x11\xeb\x0c\x78\xef\xf0\x34\xe6\x2d\
-\x68\xa3\x53\x48\x9d\x33\x9f\x54\xf5\xc7\x3b\xb5\x8c\xc4\x38\x97\
-\x79\x6d\x7c\x08\x13\x5d\x13\x99\xc9\x57\x2f\x30\x00\x89\x4e\x8d\
-\x07\xb4\xdc\xad\x0d\xe2\xb8\x9e\x56\x76\x17\x22\x6a\x6c\x4a\x53\
-\x69\x75\x17\x88\x63\x0b\xe1\xe7\xc0\x4b\x02\x7f\xd5\xdb\xc2\x65\
-\x85\x90\x13\x8b\x75\x24\x1c\xbd\x0a\xe0\xb0\x7d\x36\x82\xd7\x74\
-\xb7\xf0\xde\x7c\x75\xf2\x0f\x82\x12\x01\xfd\xc1\x67\x9c\x5f\x48\
-\xe7\xc7\x3c\xa0\x58\x22\xe5\xdc\x47\x29\x55\x42\xe7\x01\xe0\x24\
-\x42\xcf\xd6\x77\x38\x33\xd1\xae\xd0\x01\xbb\xa7\x89\x1f\x40\xbc\
-\xcd\xa3\x18\xba\x71\xd4\xd3\x3a\x38\x5f\x9d\xbc\x4e\x1b\x52\x68\
-\x04\x30\xde\x65\x4a\x3b\xd6\xb4\x87\x89\x18\xff\x84\x86\xc4\x0e\
-\xd7\x52\x88\x57\x85\x71\x0b\x85\xc8\xf6\xc4\x68\xfd\x7d\xcc\x12\
-\x0d\x08\xe3\xc6\xb7\xe1\x7e\x12\xef\xb9\x4c\x87\x0d\xf8\x0c\x57\
-\xe4\xe3\xe7\x0d\x80\x85\x7e\xe3\xbe\xa6\xf4\xc0\xea\x69\x7c\x3b\
-\xa8\xf1\xda\xa4\xaa\xd2\x7b\xb4\x48\xc0\xf7\xc3\x84\xf6\x03\xd3\
-\xa2\x69\x3d\x1a\x76\x27\xf4\x0d\xcc\xf4\xfc\x51\x82\xae\xcd\x37\
-\x37\xc8\xe9\xac\x2e\xa9\xaf\x01\x38\xc3\x65\x4a\x2b\x6a\x6e\x0d\
-\x94\x27\x71\x60\xd4\xde\x07\xa0\x31\x90\x57\x0a\x88\xd6\xc4\x68\
-\x1b\x7a\x17\x0e\x4f\x63\x1e\x80\xb7\x5c\xa6\xa3\x36\x18\xfc\x20\
-\x17\x37\x67\x00\x22\x51\x9c\x87\xbe\xad\xaa\x7d\x0d\x2f\xeb\x69\
-\xe2\x07\x41\x8d\x26\x16\xe1\x7c\x82\x97\x85\x89\x2b\x1d\xbc\xa9\
-\x7e\xa1\x72\x76\x66\x1f\x16\xb4\xd1\x21\xb4\xc0\x53\xcb\xd8\x8b\
-\x72\x71\x73\x06\x40\xd0\x59\x1e\x83\xe5\x92\xa0\x06\xc7\x2c\xd1\
-\x00\x48\x77\x04\x71\xca\x09\x19\xcd\x0a\x9d\xee\x1a\xe3\xd3\xcc\
-\x49\xb9\xea\x64\x05\x60\xef\x88\xe9\x7e\x97\x22\xe3\xe0\x89\xa0\
-\xb6\x62\x0e\xae\x85\x77\xa2\x54\x69\x8c\xdc\x10\xc3\xf4\x20\x42\
-\xf7\x3a\xac\x02\xe0\xbe\x6b\x07\x6f\x8a\x61\x8c\x9f\x97\x15\x80\
-\xea\xcf\x51\x0f\xa0\xca\x65\x7a\x69\x4d\x1b\xdf\xf3\xf3\xf6\xe1\
-\xec\xa4\x22\x56\xfa\x79\xa8\xe4\x32\x83\xd2\x35\x81\x84\x9b\x69\
-\x29\x79\xfe\x38\x29\x7b\x9f\x32\x2b\x00\x06\xf8\xb6\xa7\x12\x3d\
-\x13\xa1\x2c\x6c\x8c\xe1\x14\x02\x87\x07\x8a\xa9\x0c\x46\x26\x16\
-\xea\x5b\x41\x04\x4b\xe3\xd1\x2e\xda\x13\xfd\x9c\xec\x31\x40\xf6\
-\x04\x0f\xc1\x9a\xb7\xb2\x38\x6e\xba\xec\xb4\x40\x99\x95\x84\x41\
-\x6b\x50\x71\xc4\xc0\xa7\x9d\x27\xf8\x39\xd9\x01\x20\xbf\xe1\xbe\
-\xb4\x40\xe0\xbb\x1f\x62\xa5\x77\x81\x83\x1a\xcf\x7a\xa6\xdd\xc8\
-\xec\xf1\x69\x17\x46\xf8\x39\x59\x01\x90\x45\x8d\x8f\xf0\x69\xa0\
-\x06\xee\xd7\xc1\xcf\x8f\x61\x41\x85\x07\x7f\x96\xa5\xbd\xc6\xcf\
-\xc9\x0a\x00\xe9\x25\x59\x22\xff\x1e\x5b\xdf\xac\x2c\xd7\x6e\xed\
-\xfe\x42\x60\x00\xba\xa6\x63\x37\x00\xf7\x4a\xb0\xaa\x36\x29\xf7\
-\x00\x9f\x23\x00\xbe\x15\x22\x2d\xf2\x6e\x78\x4c\x98\x00\x93\xcb\
-\xc7\x7e\x44\xac\x54\x07\xd9\x8f\x00\xb0\xdd\x7d\xed\xbf\x23\xdc\
-\xd8\xbb\xce\x0e\x9c\x21\x56\x18\x81\xbb\xcf\x13\x1e\x46\x35\x80\
-\xa8\xcb\xb4\xe7\xf5\x36\xee\x71\x73\x72\x0c\x82\xf0\xec\xa8\xda\
-\xbe\x53\xdc\x20\xfc\x2b\xa4\xbc\x92\x08\x0c\xc0\xce\x43\x31\xd8\
-\x67\xda\xee\xe7\x64\x07\xc0\x6a\x83\x8f\x91\x35\x72\xba\x41\xe8\
-\xd5\xa0\xf2\x4a\x42\x21\x6d\xcb\xc1\x31\x3e\xd3\xbb\x7e\x4e\x8e\
-\xe7\xd7\xbc\xe1\xbe\xa2\x6c\xe0\x64\x03\x32\x9d\x81\xe5\x15\x84\
-\x09\x6f\xdb\xa3\x5d\xd0\xfa\x2c\x1f\x59\x55\x08\xdf\x61\x23\xc7\
-\x67\x71\x5c\x38\x68\x1b\x9e\x01\x02\xde\x14\x95\xc3\x86\xee\x16\
-\xac\x0b\x22\x10\x76\xbc\xf7\xda\x64\xdd\x31\x59\x01\x88\x67\xb0\
-\x12\x80\xfb\xfc\xfd\xbb\x89\x0e\xe5\x7d\xdd\x74\x5d\xcc\x5d\x94\
-\x1e\x0e\x95\x5b\x66\x48\x7c\x30\x70\x4b\xbe\x5d\x06\xe0\x64\x6f\
-\x25\x74\xf9\x69\x59\x01\xd8\x7b\xb6\xb6\xd2\x53\x8f\x98\xec\xe7\
-\xb9\x11\x73\xcc\x2d\x00\xb6\x06\x2a\x2e\x2f\x36\x46\x1c\xcc\x0e\
-\x22\xd4\x8d\xc2\x18\x78\xe7\x28\xdb\xe2\x87\x62\xb5\x9f\x97\x67\
-\x3f\x80\x9e\x55\x14\xa1\x29\x41\x8d\x2d\x6f\xe3\x87\x00\x83\x77\
-\x8c\xca\x09\xf2\x86\x95\x6d\xdc\x19\x44\x31\xb0\x1e\xcd\x82\x9e\
-\xca\xb5\x3d\x9e\x33\x00\xb1\x08\xe6\xa3\x2f\xa9\x61\x6f\x65\x9c\
-\x76\x4a\x52\x81\x2b\xbe\xf8\x10\xdc\x03\xe2\xe9\x40\xe1\xe5\x00\
-\x35\xaf\x67\x2a\xe6\x07\x72\xda\x65\x40\x7a\x16\x69\xb4\xe6\x91\
-\x5c\xd4\x9c\x01\x58\xd1\xc4\xcd\x02\x9e\xf9\xa2\x32\x50\x9d\x8e\
-\x5a\xff\x71\xb8\x07\x5d\x13\x99\xd9\xdd\x77\x70\xfa\x66\xa0\xb8\
-\xd2\xd0\x1d\xff\xd4\x5c\x1e\x76\x1c\x57\x3f\x1a\xe7\xc2\x7b\x08\
-\xf3\x7e\x7c\xe8\x97\xfd\x71\x23\xef\x34\x56\xe4\x9f\x3c\xd7\xe0\
-\x4f\xc7\x75\xe8\xe8\xa0\x86\x5f\x6a\xe6\xa7\x8e\xe5\x24\x54\x22\
-\x08\xc4\x6a\x44\x38\x35\xec\x38\xae\x36\xa9\x2a\x49\xbf\x77\xdb\
-\x44\xce\xce\x77\x3a\x94\x37\x00\xab\xa6\x62\x19\xbc\x83\x61\x95\
-\x03\x3b\x33\x4c\xe7\xea\x69\x7c\x7b\x37\x59\x0f\xe4\x8e\x78\xff\
-\xa0\xbf\x99\x34\x1b\xc3\x36\x66\x01\x60\x60\x0c\x97\x83\x9e\xc9\
-\xdb\x96\x98\xc1\x9c\x7c\xfc\xfc\x0b\x19\x52\x24\x6f\xf0\xd9\x2e\
-\x4c\xa4\x82\xd7\xe0\x40\xdf\x9d\x10\x1f\xc2\x1f\x11\xfc\x1d\x72\
-\x4c\x3f\x8b\xc0\x47\x02\x67\xf4\x34\x9b\xf3\xc2\x06\x3d\x00\x18\
-\xb3\x44\x87\x51\xf2\x1c\xe1\x43\xbc\x7d\x45\x13\xf3\x6a\x08\x5c\
-\xc9\x75\x37\xb3\x0b\xd4\x3c\x0f\x5f\x4a\x25\x16\xeb\xc8\x30\x31\
-\x5d\x13\x99\xe9\x6e\xe1\x9d\x11\xf0\x58\x49\x73\x00\x7c\x1e\x56\
-\xc7\x85\xad\x80\xee\xc8\x64\x78\x6c\x6f\x0b\xef\x2f\xe4\x08\xbe\
-\x36\xa9\xaa\x48\x46\x0b\xe1\xcd\x21\x7a\x25\xf3\x11\xf2\x9e\x0b\
-\x02\x05\x9c\x0e\x8f\xeb\xd4\x11\x0e\xf4\x0a\x80\x2f\x3a\x2d\xe1\
-\xc5\xa1\x71\x9e\xb6\x74\x12\x77\x87\xd5\xdf\x87\x31\x4b\x34\x20\
-\x96\xc1\x19\xa0\x6d\x95\x38\x12\x7d\xbb\xc8\x87\x02\x80\x80\x0f\
-\x09\x6c\x06\xb4\x96\x34\x0b\xb6\xa5\xf1\xac\x7f\xd5\x16\x86\xfa\
-\x4e\x67\x8e\xc0\x2b\x5d\xa6\xb4\x21\xc7\x87\x65\xae\x14\x94\x20\
-\x91\xe8\x50\xbd\xa8\x2e\x6f\x46\x98\x1e\xea\x69\x36\x97\x95\x92\
-\x20\xd1\x90\x54\xfc\x90\x81\xb0\xc5\x04\x32\x8f\xbe\xab\x40\xdd\
-\xe7\xb6\x89\xbc\xac\xb7\x99\x73\xc3\xea\x16\x9c\x24\x95\xe8\xd0\
-\x05\xa0\xbc\x19\x17\xd2\x83\xdb\x1d\x73\x75\xb1\xff\x56\xd9\x20\
-\xb1\x3e\x85\xab\x05\xcd\x86\xfb\x71\xa6\xee\xe9\x69\x8e\xfc\xb2\
-\x10\x17\x45\x65\x89\xd5\x77\x38\x77\x8a\xbc\xce\xa3\x01\x78\xde\
-\x89\x72\xda\x9a\x29\xfc\xa8\x18\x5f\xa5\xa2\x36\xa9\xaa\x41\x11\
-\xfb\x67\x91\x97\x7a\x0a\x88\xa7\xe3\x87\x70\x72\x50\x52\x84\x1b\
-\x45\x6d\x67\x0d\x77\xcc\x0d\x04\x52\xde\xf6\x70\x6a\x34\xa3\x55\
-\x0d\x8b\x34\xb2\x18\x5f\xa5\x60\x5c\xa7\x8e\xa8\x89\xea\xd9\xac\
-\xce\x03\xaf\xed\x06\xcf\x29\xb4\xf3\x40\x3f\x12\x25\xcf\x4e\x2a\
-\xb2\x31\x6a\xef\x12\xe8\xbf\xc5\xd2\x80\xe6\x44\x60\x6e\x7b\xb1\
-\x85\xff\x29\xd6\x6f\x21\x68\x48\x2a\xee\x44\xf1\x33\x42\xd7\x03\
-\x18\xe2\x2b\x5e\x9a\xc9\xf0\xdc\x35\x6d\x2c\x6a\x51\xd6\xff\x54\
-\xd9\x94\x2e\x65\xdf\xeb\xcd\xbf\x31\xb9\x83\xd2\xdd\x8a\x9b\x59\
-\xc5\x24\x2c\x06\x61\xc2\x73\x8a\xee\xda\x82\xe9\xa2\x66\x22\xc7\
-\x19\xa4\xa0\x59\x47\x67\xcc\x75\x85\xe6\x13\xb9\x51\x52\xb2\x74\
-\x5d\x87\x1a\x0d\xd5\x09\x60\x68\x8e\xe2\x4f\x00\x3d\x0e\x99\xc7\
-\x11\xc7\x33\xc5\x06\xa3\x36\xa9\xaa\x41\x06\x8d\x32\xf6\x2c\x80\
-\x4d\x00\x72\x4d\xc3\xd3\x22\x67\x14\x32\xda\xe7\x43\xc9\xe9\xf2\
-\x75\x8b\x34\xdc\x58\xdd\x03\xa0\x25\x80\x96\x06\xf1\xbc\x2c\x9f\
-\xa3\xc1\x9b\x12\xfe\x21\x83\x2d\xd5\x51\xec\x48\x1b\x38\x66\x07\
-\x6a\x6c\x15\x06\xcb\xc1\x08\x10\xc7\x11\xb6\x01\xe0\xe9\xe8\xfb\
-\xa4\x26\x9f\xf0\x55\x22\x67\xf4\x34\x73\x4d\x29\xfa\xcb\xf6\xc1\
-\x44\x7d\x4a\x67\x4a\xba\x13\x40\xa5\x07\xc3\xcd\x12\x6f\x39\xda\
-\xc1\x5f\xfa\x73\xcb\xfb\x51\xde\x4f\x66\xda\x65\xc6\x8e\x42\x93\
-\xa1\xae\x17\x50\x57\x56\xdf\xc0\xdb\x00\x67\xc5\xb7\x62\x6e\xb1\
-\x09\x9a\x41\xa8\xd8\x47\x53\x75\x0b\x75\xa2\x31\x76\xfa\xde\x8f\
-\x1d\x8e\xeb\xa7\x9b\xf7\x01\x3d\x69\x65\x1e\x59\xf5\x0a\x5e\xe8\
-\xcf\xf7\x00\x61\xd8\x2f\x9f\xcd\xd5\x2d\xd2\x70\x5a\x4c\x34\xb2\
-\x27\x8a\x3c\x1e\xc0\x08\x12\x83\x25\x0c\x42\xdf\xc9\xcd\x56\xf4\
-\x7d\x36\xb7\x11\xd0\x7a\xd2\xac\x17\xf1\x7c\x4f\x13\xde\xf8\x2a\
-\xe4\x22\x1f\xc0\x01\x1c\xc0\xff\x2e\xfe\x0b\x91\x5a\xc0\x8b\x79\
-\xe5\x16\x6d\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x0c\xd6\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x0c\x88\x49\x44\x41\x54\x78\x9c\xe5\
-\x9b\x5b\x6f\x5b\xc7\x11\x80\xbf\x25\x45\x8a\x94\x28\x89\x92\xad\
-\xbb\x64\xc9\x4e\x9a\xc2\x41\xe0\x26\x45\xd1\xa0\x48\x0a\xf4\xa9\
-\x7d\xe9\x7b\x81\x16\xfd\xa3\x7d\x2a\x50\xb4\x0f\x41\x90\x36\x4e\
-\x52\x20\x69\x92\xc6\x96\x6c\xc9\x37\x5d\x48\x49\xa4\x2e\xe4\xf4\
-\x61\xf6\x1c\xee\xd9\x33\x87\xa4\xe4\xf4\xc9\x03\x10\x24\x77\xf7\
-\xcc\xce\xcc\xee\xce\x6d\xe7\x00\xb2\x05\xe2\x78\xe3\x40\x9c\xf2\
-\x9e\xfe\x78\x93\x84\x90\xe3\xf9\x4d\x12\x42\x96\x57\x97\xed\xe0\
-\x0e\xf0\x18\x9c\x14\x3c\xdc\x00\x6e\x19\x1d\x25\x60\x32\x8b\x2f\
-\x6d\xaf\x0d\xa1\x66\x12\x10\xe0\x62\xc8\x98\x73\xa0\x67\xb4\x77\
-\x81\xbe\xd1\xfe\x12\xdc\xa9\x8d\x2a\xcf\xa3\x1b\x35\x00\x64\x1b\
-\xb8\xed\x09\x3d\x01\x5e\xf8\x89\xa7\x80\x39\xdf\x2e\xc0\x59\xd0\
-\x3e\xeb\xdb\xfa\xbe\x1d\x8f\xa3\x0a\x34\x81\x8a\xef\x3f\xf7\x34\
-\x54\xfd\xf7\x25\x70\x04\x97\xa7\x50\x39\xf2\x6d\x53\xa8\x20\x9d\
-\x9f\xff\xc4\xff\x9f\xf2\x6d\x0e\x68\x01\xa7\xbe\x7d\x29\xe8\x7b\
-\x01\xee\x71\x31\x6f\x85\x52\x92\x2d\x90\x09\x90\x8f\x40\x56\x8d\
-\x31\x6b\x20\x0b\x46\xfb\x06\xc8\xbc\xff\x3d\x05\x72\x0f\xe4\xae\
-\xff\xcc\x80\xdc\x01\x19\xb2\x23\xa4\xee\xc7\x2c\xa8\xe0\xe5\xae\
-\xc7\x31\xe1\xfb\xe7\x40\x36\xf3\x47\x55\x9a\x05\xed\x1b\x20\xbf\
-\x06\x29\x5f\xf3\x88\xcb\x04\xc8\x9f\xf5\xc1\x5c\xdf\x36\x48\xc5\
-\x68\x7f\xdb\x3f\xb7\xe2\x27\x5b\x8e\xf0\xdd\x1b\x73\x72\x3c\xe3\
-\x25\xff\xdb\x79\x46\xb6\xa0\x75\x4b\xdb\xe5\x2d\x83\xd9\x32\xc8\
-\x4f\x8c\xf6\x09\x90\x3f\xda\xbc\x14\x13\xf0\x91\x7f\x30\x92\x9a\
-\xac\x17\x30\x7f\xc7\x7f\xb6\xed\x15\x96\xed\x6b\x4c\x4e\x60\xa2\
-\xe2\xf6\x59\x15\x4e\x7b\x49\xe7\xcb\xf5\x97\xb3\xcf\xa5\xbb\xb9\
-\x02\xf2\xab\x71\x27\xdf\x1e\x6c\xfb\x50\x63\xca\x14\xc8\x6d\x63\
-\xfc\x2a\xc8\x07\xba\x7d\x4d\x7c\xf3\x5e\x79\x5e\x13\x64\x56\xb7\
-\xbc\xd9\x37\x07\xf2\x00\x64\xd1\xe8\x6b\xfa\x67\x23\xcb\x26\x9b\
-\xfa\xc9\x82\x71\x26\xe4\x17\xe0\x3e\x0d\xfe\x27\xca\xa3\x07\xec\
-\x01\x21\xa3\xab\x70\x79\x0b\x2a\x5f\x0e\xe1\x64\x0d\x78\x5a\xd0\
-\x97\xda\xe1\x1b\x3c\x0b\xf0\x00\xba\x4f\xa0\xf6\x2a\x68\xeb\x28\
-\x5d\x94\xc9\x29\xbc\x98\x37\x98\x30\x90\xc6\xc4\x34\x50\xe6\x1f\
-\xa0\x5a\xbd\xed\xc7\x6c\x01\x2f\x54\xa1\x0f\x05\xf1\xc4\x2c\xf9\
-\xff\x89\xe9\x4a\x34\x78\xd8\x46\xd0\xf6\xc2\xa0\x25\x86\x17\x20\
-\x82\x32\xbc\xe7\x9f\x5d\x02\x7e\x06\x7c\x0e\xcc\xa0\x16\x22\x81\
-\x9c\xd9\x8c\x04\x20\x0d\xd4\xcc\x24\xff\x37\x80\x36\xb8\x5d\x3f\
-\x51\x05\x35\x5d\x9b\xc0\xd7\xe0\xae\xf4\x7c\xb9\x13\x72\x20\xce\
-\x8f\x9b\x42\x7d\x81\x6f\x47\x98\x9f\xf8\xd9\x45\x60\x1a\x35\xa9\
-\x7b\xf6\xb3\xd2\x86\xfa\x0b\xd4\x9f\x58\x01\x7e\x00\x16\x80\xcf\
-\x80\xe7\x80\xb7\x3c\xec\xf8\xe7\x7b\xaa\xdb\xdc\x55\xd1\xc4\x5b\
-\x03\xf3\x26\x5b\x59\xcd\x29\x1b\x5e\x0f\x7c\x1c\x29\x46\xcb\x4c\
-\x2e\xa1\xa6\x72\x46\x3f\x37\x05\x59\xf5\xca\x78\x3d\x6b\x55\xd2\
-\xfe\x99\x81\x7e\x91\x09\x90\xdf\x78\x2b\x11\xb6\x07\x8a\x51\xee\
-\xaa\x8e\x18\x40\xc9\x98\xb5\xaf\x13\xb2\x0b\xae\x17\x8d\x5d\x03\
-\xfe\x0e\xdc\x09\x84\x10\xac\xcc\x61\x53\x19\xe7\x10\xdc\x53\xdf\
-\x37\xe6\xaa\x9b\xe0\x9f\x75\x4f\x80\x03\xc5\x7d\xd8\xcc\xf7\x8b\
-\x03\xd6\x81\xbf\x01\xf7\xb2\x73\xba\x9e\xf2\x22\xeb\x18\x47\xc0\
-\x12\xc0\x14\x70\x16\x31\x0f\x7a\xe6\xbf\xf3\x5b\xe9\x31\x59\x21\
-\xa0\x1a\xb9\xd9\x57\xc6\xdd\xe5\xf8\x3c\x8e\x0b\xee\x52\x71\x37\
-\xfb\xd1\x6e\x08\x3d\xbc\x1e\xf0\x04\x3d\x7a\xe1\x90\x1e\xea\x29\
-\x4e\xc7\x58\x2d\x25\x38\xe7\x57\x2f\x00\xd9\x46\x95\x4c\x29\x30\
-\x77\x07\xc0\x7d\xe0\xd2\x9b\xab\x57\xe8\xee\x09\x4d\x9e\x9f\xd0\
-\xdc\x04\x25\xe8\xfa\xe3\x56\x3b\xc4\xf6\xf7\xa7\x81\x2e\x48\x78\
-\x66\xfb\x3a\x56\xee\x03\x47\xe8\xca\x7f\xad\x63\x05\xa0\x03\x9d\
-\x13\xa8\x2f\x92\xd1\x67\xee\x08\xe4\xa7\xf1\x04\x63\x58\x01\x79\
-\x0b\x2e\x2a\x50\x9d\x46\x15\xd3\x29\x83\xad\xbd\x0b\xfc\x0e\xf8\
-\x4b\x01\x03\x01\x74\xe6\xa1\x9e\x04\x3f\x3e\x4e\xa8\x1d\xf9\xce\
-\x79\xd4\x52\xf8\x1d\xd5\x39\x87\xfa\xe1\x10\x64\x5d\xd4\x3c\xfe\
-\x06\xf8\x24\xa0\xd9\x2b\xcf\x7a\x0d\xb8\x0d\x72\x1e\x2d\x66\x6e\
-\x25\x62\x01\xc4\xd1\xe1\x5d\x60\x1a\x26\x1f\xaa\x12\x74\xfb\xd9\
-\xe1\xb2\x0e\xfc\x03\x0d\x70\x8c\x20\x43\x80\xee\x6d\xa8\x4d\x40\
-\xfd\x25\xb8\x4e\x01\x43\x47\xd9\xbf\x52\x07\x16\xe0\xa2\x06\xd5\
-\x93\xbc\xd6\x4e\x7d\x93\xbf\x02\x6b\xe0\xf6\x82\xce\x36\xc8\x09\
-\xba\x63\xdf\xf6\x9e\x6b\x42\x5b\x9f\xe8\xd8\xc7\x3a\xa0\x0a\x9c\
-\xfb\x09\xee\xa1\xab\xf2\x85\x4d\xb3\x2c\xa1\xdb\xbe\x87\xad\x13\
-\xa6\x81\x55\xa8\xb5\x55\x89\x15\x32\x6f\x80\xeb\xe8\x33\xd5\xb6\
-\x32\x18\x1e\xab\x30\xaa\xa3\x87\xfa\x02\x2b\x05\x88\xbe\xf1\x63\
-\xee\xf9\xe7\x3a\x64\x1d\xb9\x22\x2b\xc0\x06\xf0\x0c\xf5\x01\x8c\
-\x03\x7c\xd8\x04\xba\xe0\xba\x9e\xe0\x48\x31\x1e\xcd\x43\xbb\x86\
-\xae\xc2\xf9\x58\x3c\xdb\x70\x01\x3c\x85\xf6\x24\x1c\x2f\x60\x87\
-\xb4\x5d\xe0\x4c\xe7\x8c\xc1\x9d\xa1\x8b\xfa\x83\xe7\x29\xc7\x8b\
-\x25\x80\x06\xea\x3d\x2d\xe6\xb7\x7c\x02\xcd\x29\x70\xad\x6c\x5b\
-\x22\x84\xcb\xf7\x61\xae\x07\xb3\xaf\xcc\x47\x6f\x04\xb3\xaf\x60\
-\xf6\x52\x71\x5b\x47\xcd\xb5\x60\xae\x20\x16\x61\x07\x35\xdf\x2d\
-\xd4\xc2\x65\xc0\x12\xc0\x34\xaa\x3d\x0b\x94\x9a\x2c\xa3\x6e\xaa\
-\x01\xc7\x4d\xa8\x7c\x0f\xcc\x33\x7e\xec\x3d\x06\x88\x03\x16\xa0\
-\xf2\x9d\xce\x61\xc2\x73\xdb\x59\x72\x97\x40\x19\xdc\x31\xba\xb8\
-\x19\xb0\x04\x20\xa8\x69\xd9\x29\x20\x64\xc2\xb6\xf3\x32\x05\xa5\
-\x64\x22\x7f\x1c\xac\x60\xeb\xda\x10\x6e\xfb\x16\x94\x4a\x5e\xbf\
-\xc4\xc3\xae\x94\x36\xb1\x78\x3a\xd4\x23\x34\xda\x0a\x94\x07\x83\
-\x4c\xbf\x7d\x13\xd5\xb2\xe1\x2a\xcc\x82\x74\x81\x15\x98\xd9\x0f\
-\xfa\x5a\xc0\xbb\xc0\x13\xd2\x8c\x4e\x06\x92\xd4\x19\xa8\x4f\x61\
-\xe5\x05\xe7\xd0\x40\xe7\x07\xfd\x2d\xa0\x3b\x73\x03\xe4\x19\x03\
-\x3f\x23\xc1\x7f\xa6\x7d\x1c\x64\xd1\xb8\x63\xef\x0e\x27\x81\x59\
-\x0a\x31\x61\x35\x72\x49\x48\x99\x47\x83\x8d\x65\x4f\x64\x84\x9c\
-\x1e\x74\x66\xa1\x7e\x00\xc4\x41\xc6\x23\x4f\xd0\xd7\xc1\xe4\x2b\
-\x40\x1f\x3a\x67\x50\xdf\x05\x1c\x74\x6f\x41\x2d\xc9\x2f\x3e\xf3\
-\xdf\xce\xcf\xf9\x05\x9a\x2b\x0c\xe1\x15\x74\x66\xa0\x9e\x08\x2d\
-\x9c\xb7\x89\x2a\xbe\xbe\xee\x86\x54\x57\x25\x79\xcb\x4c\xc2\xc6\
-\x5a\x99\x45\xe0\x4b\x90\xaa\x27\xe0\x25\xb8\x43\x34\xd3\x73\x96\
-\x8f\xfc\xa4\x01\xf5\x32\xb8\xe7\x79\x54\x82\x67\x7e\x01\x38\x46\
-\x57\xec\x1b\x63\x77\xb5\xfd\xf8\x32\xba\xe2\x07\x9e\x8e\xff\x68\
-\x5f\x2e\x7a\x3b\xf1\xa6\xcf\x67\x7f\x43\x9a\x64\x1f\x15\x98\x17\
-\x9a\x6c\x02\x4f\xe0\xa4\x03\x8d\x29\xb2\xe1\xb1\xa9\x03\x4a\xa8\
-\x04\x6f\x83\xdb\x09\xec\xf7\x2d\x6c\xe5\x37\x0d\x47\x05\x69\x68\
-\xa5\x00\xcd\xf4\x6e\x01\x4f\x87\x87\xc4\xa9\x2f\x7f\x1f\x0d\x67\
-\x87\x05\x52\x27\x18\xbe\xbd\x5f\x08\x9f\xb9\x72\x27\xa8\xb7\xba\
-\x01\x8d\x03\xf4\x48\x65\xa0\x48\x09\x2e\xe5\xe3\x01\x28\x20\xbe\
-\x01\xf3\x47\x46\x7b\x02\x65\x25\xb4\xf2\x90\x9c\xb3\x94\x9b\x3a\
-\x51\x78\x9f\x61\xdf\x3f\x84\xb4\x14\x08\x20\x37\x4e\x7c\x6a\x7c\
-\xcd\xea\xb5\x04\xb0\x00\x58\xf6\xdf\xba\x84\x18\x07\x56\x18\x24\
-\x34\x0c\x8f\x31\x81\x9c\x93\xf3\x12\x2e\x8c\xd4\x7b\x06\x8a\x84\
-\x69\xd1\xfa\x0a\x43\x60\x05\x47\xe0\x5a\xe1\xec\x28\xc1\xf4\x07\
-\x3b\xa7\x30\x94\x36\x3c\x3c\xd7\x85\xea\xa8\x7c\xdb\x35\x72\x0d\
-\xee\x0c\x55\xe6\x19\x88\x05\x30\x41\x71\x54\x77\x13\x9b\x5e\x83\
-\x6e\x64\xde\x62\x21\x0c\xbd\xb1\xb9\xa9\x1f\x51\xf4\x5c\xae\x3d\
-\xb6\x02\xcb\x70\x65\x69\xf3\xc0\x3f\xc8\xb4\x97\xec\xf6\x14\x9a\
-\x50\x7b\x66\xd0\x21\x20\x8f\xd1\x24\x0b\xc0\xa3\x02\xfd\x32\x62\
-\x85\xbb\x7d\x8d\x34\x73\xd0\xc3\xce\xd6\x8e\x8a\x05\x7a\x15\x98\
-\xb8\xce\xf6\x4f\xec\x75\x11\xf4\x47\xf4\xbf\x26\xd4\x1c\xc5\x47\
-\x70\xac\x79\x23\x01\x94\x9f\xa1\xf6\x37\xc6\xd5\xb3\x11\x8e\xcc\
-\xf2\x1e\x90\x9a\xa4\x10\xd2\x6d\xff\xc8\x7f\x46\x58\x87\x42\x28\
-\x12\x40\x19\xdb\xb3\xcc\xcd\x11\xeb\x80\x2e\x51\xbc\x1c\x40\x11\
-\xb3\xc3\x08\xbf\xca\xcf\x11\x9f\xf9\x51\xd6\x61\x28\x14\x8d\x1f\
-\x5b\x39\xc6\x02\x48\x72\xe7\x39\x6d\x79\x03\x22\x12\xe8\x93\xde\
-\x27\x16\x29\x3c\x4b\x08\x32\x43\xea\xe9\xdd\x78\xee\x00\xc4\xe7\
-\x17\xb3\x60\x99\xc1\x23\x06\xb7\x38\x3f\x06\x3c\x07\x56\x46\x68\
-\x7b\x22\x21\x94\x50\xaf\xcd\xb8\x70\xc9\xc0\x98\xbe\x49\x12\x4e\
-\xe7\x05\x6a\x09\xc0\x01\xfb\xe4\x2f\x12\x8b\xa4\x7d\x00\x6d\x43\
-\x6f\x64\xe0\x25\xf0\x21\x23\x8b\x13\x9c\xa0\x61\xf8\x47\x0c\xbf\
-\x13\xc4\x67\x80\x8e\x8b\x10\x0d\x7e\x8a\x43\xad\xcd\x2e\x63\xe8\
-\x00\x00\xf1\x8e\xd0\x53\x15\x42\x7a\xb3\x73\x80\x79\x1b\xcb\x25\
-\x34\xaa\x43\x28\x4d\xee\xeb\xfe\x05\x6c\x6a\xde\xa0\x08\x64\x8e\
-\xc1\xe5\xcb\xa6\x45\xf0\x00\xe6\x26\x31\xd3\x6d\xed\x45\xd2\x88\
-\x55\x9a\x68\x6e\xe3\x91\xc7\x35\x32\x1f\x00\x9a\xe7\x9f\x04\x77\
-\x0e\xec\x28\x12\xd9\x40\xad\xc3\xbc\x8f\xbd\x43\x44\x4b\xc0\x19\
-\xc8\x3b\x44\x91\x16\x9a\x81\x59\x43\xa3\xba\x26\x70\x01\x17\x5b\
-\x5e\xc7\x58\x4e\xcf\x29\x1a\x19\x2e\xe9\x58\x1e\x00\xff\x06\x89\
-\x4d\x73\x92\xd9\x49\xf2\x01\xc9\xff\x24\x84\xee\x78\xfc\x7b\x7a\
-\xaf\x09\x3e\x83\x9d\xf3\x49\x62\x01\x74\x7c\xdb\x32\x7a\x1e\xd1\
-\x0b\x05\x8e\x3c\xbd\x02\xec\x67\xb7\xb1\xa0\xb9\x43\x59\xcf\xe6\
-\x10\xd3\x73\xf7\x4f\x70\xed\x60\x8e\x82\x3c\xa3\x05\x02\x9a\x38\
-\xd9\x8d\xe6\x5c\xd3\x60\x2d\x61\x3c\x09\x87\xc5\xa1\xbb\xfa\x38\
-\xdb\x0e\x0c\x0a\xb6\x32\xd9\xe9\xf8\x08\x84\x57\xd7\x16\xec\xa1\
-\xc1\x8d\x05\xcf\xc8\x14\x56\xe0\x6f\x65\x5f\xfb\x6e\x30\xb6\x0e\
-\x2b\x14\xe6\x24\x93\xc0\xcb\x84\xe4\x3a\x3e\xa3\x38\x8b\x94\xe0\
-\x85\x6d\x0a\x5d\x5f\x89\xb2\xea\x6d\xdc\x15\xd0\xf2\x67\x30\xc9\
-\xdb\xbf\x0e\xf3\x09\x04\x42\x68\xdd\x46\x13\x24\x56\x4e\xb2\x1c\
-\xd0\x18\xf7\x2d\xa3\xd6\x68\x2c\x25\xd8\x46\xed\xa5\x19\x3f\xfb\
-\x6d\x6e\x64\x5f\x01\x38\x83\xc6\x32\x9c\x9c\x8d\xe1\x25\x5e\x03\
-\x9c\x28\xce\x99\x15\x06\x65\x77\x31\x2c\x53\x7c\xbc\x92\x1a\x85\
-\x9c\x59\xb5\x04\x70\x86\x2a\x97\x72\x41\x86\x15\x38\xee\x90\xbb\
-\xf7\x4f\xb7\xfd\x57\xd0\x38\xd3\x73\xfa\x63\x81\xac\x2a\x4e\xbe\
-\xc2\xf4\x18\xa5\x01\xad\xae\x2d\x74\x99\x83\xb3\x2e\xca\x53\x4e\
-\x78\x45\xf9\x80\xc4\x66\xbe\x6d\x13\xd4\x3c\x54\x84\xc9\x31\xc9\
-\xb9\xb7\xa7\xe8\x96\x5b\x85\x4e\x41\xa1\xd3\x38\x70\x3e\xab\x38\
-\x92\xea\x4f\xd3\x6d\x9e\x04\x66\x61\x2e\x4e\xd6\x26\xb0\x02\x53\
-\xd3\x01\x4f\x19\x88\x05\x70\x41\x9a\x34\x70\xde\x74\xc9\xba\x8d\
-\xd7\xed\x2b\x72\x4a\xd8\xee\xed\x15\xb0\x07\xf5\x4b\x55\x5c\xb2\
-\x38\x9e\xaf\x2f\xce\x8f\x5d\x81\x49\x8f\x23\x3c\xf3\xa1\x10\x28\
-\x01\xab\x76\xfa\x0e\xd4\x34\x5f\x54\xc0\x7d\xeb\x1b\xea\x44\x56\
-\x20\x36\x83\xf1\x95\xd3\x27\x68\x39\x1a\xc0\x32\x5a\x27\xd4\x0f\
-\xc6\x5d\x02\xbf\x45\xaf\xc7\x97\x0d\x9d\x97\xa4\xa0\x4e\xd1\xf8\
-\xfc\x3d\x2f\x84\x61\x89\x0f\x21\xad\x35\xa0\x81\xba\xd1\x56\x4d\
-\xcf\x25\xf0\x7b\xe0\x53\x06\x97\xa3\x89\x19\x4c\xca\x6b\x27\xf5\
-\x66\x3b\x85\x12\xc3\xdd\x67\xd9\x42\x0b\x0f\xc2\xb6\x86\xf7\x08\
-\x37\xa2\xf6\xa4\x0e\x6f\xcd\x7f\x1b\x56\x43\x1a\xdc\xa8\x46\x30\
-\x7d\x7e\x05\xf3\x52\x45\xaa\x68\x09\xed\x1c\xc8\xbb\xb6\x4e\x90\
-\xf7\xf3\xd6\x4a\x3e\x64\x8c\x1a\xa1\x43\x90\x20\x23\xeb\x4e\xe0\
-\xa4\xab\xf5\x80\x29\xa2\xf0\x8a\xba\x0f\xee\x11\xea\x25\xbe\x06\
-\xb3\xe3\x82\xcc\xa0\x29\xfb\xef\xd1\xcc\xcf\x0e\x79\xc5\xb8\x81\
-\xa6\xe0\xc3\x0b\x9e\xe4\x6e\x22\x03\x96\x00\xba\x40\x95\x4c\x49\
-\xec\xcc\x0b\xa8\x4c\x7a\xc9\x16\x85\xb4\xfb\xd0\xaa\xaa\xce\xb8\
-\x56\x5d\xee\x98\x20\x65\xc5\xdd\xaa\x90\xaf\xfa\x08\x14\x63\x7b\
-\x11\xba\x1d\x32\x1a\x5f\x2a\xa8\x6e\xcb\xd5\x28\x58\xb1\x40\x09\
-\xdc\x9e\x6e\x79\x79\x16\x28\xa0\xa7\xa8\x46\xee\x01\xff\x0d\x98\
-\x0f\x24\x3f\x77\xe0\x05\x94\x84\xbf\xa1\x0b\x7c\x13\x48\xbc\xbf\
-\x55\x94\xd1\xa7\x30\x27\x51\xbf\x04\x39\xc6\xfb\xd0\x68\x91\xb9\
-\xbe\x93\x8a\xd2\xe3\x76\x40\xee\x1a\xcc\x66\xe0\x25\x69\x2e\xc0\
-\xed\xa2\x75\x36\xc9\xd6\x17\x54\xf1\x54\xc8\x66\x8d\x22\x1c\x4e\
-\x54\x80\xec\xa3\xb5\x3f\xf7\xc6\x08\x97\x0d\x68\xdd\x46\x9d\x9b\
-\x25\xe0\xb9\xee\xb0\x9c\x9d\x9f\x26\x5d\xd5\xe3\x26\xba\xea\x65\
-\x54\x79\x76\xd0\xda\xe6\x25\x65\x1e\xd0\xcb\xd8\x8c\x33\x14\xed\
-\x00\x77\x9a\x0d\x57\xdd\x1e\x5a\xc3\xbf\x81\x46\x66\x9f\xa3\x42\
-\x78\x00\xe7\x27\x50\x3d\x52\x22\x0b\xcd\x5b\x5f\xe7\x68\x24\x15\
-\x9b\x49\x1b\x80\x83\x0b\xbf\xbb\xaa\xc9\x0b\x14\x21\x1c\x7b\x66\
-\xbc\xa9\x33\x1d\xcb\x65\xc5\x2f\x4b\x1e\x6f\x12\x23\x7c\x00\x3c\
-\x04\x0e\xc0\xbd\x0c\xc6\x97\xe3\x7b\x46\xeb\x08\xc4\xcc\x74\x3d\
-\x21\x0f\xd1\x82\x45\xd0\x2b\xef\x65\xdf\xbe\x1f\xb4\x1b\x20\x62\
-\xf7\x8b\x83\xea\xa4\x67\xb0\x53\xe0\xc5\xad\x8f\xc0\x7d\x05\x4c\
-\xc1\xd1\xf7\xd9\xeb\x39\x71\x9e\xb6\xf8\xcc\x8f\x93\x42\x93\x3b\
-\x03\xe7\x27\x53\x2e\x5f\xcf\x5a\x07\xf0\x66\xe8\x7d\xec\x44\x49\
-\x32\xe6\xff\x50\x2e\x0f\xba\x00\xf2\xf3\xbc\xf9\x95\xa6\x5a\x8a\
-\x5c\xb9\xfc\x1d\xcc\xb2\x5e\x1b\xf9\xc7\xd8\x2f\x4c\xac\x92\x7b\
-\x61\x42\x1c\xfa\x82\x85\xf1\x02\x43\x3a\x66\x7b\xcc\x89\x43\x9c\
-\x05\xcf\x88\x43\xdf\x18\xf9\xa5\xd1\x57\xce\xfa\x2b\xa9\x10\xaa\
-\x8c\xff\xc2\x44\x8a\xe8\x4f\x05\x4e\xc8\x46\x5e\x08\x00\xf2\x1e\
-\xfa\xca\x4a\xee\xa5\x04\x5e\xeb\x95\x99\xb4\xad\xe4\x9d\x9f\xb7\
-\x40\xde\x31\x9c\x9f\xb2\xa5\xe5\x3d\xf3\x7f\xc8\xe3\x2b\x9e\x3c\
-\x91\x5a\x59\xa5\x16\x7b\x80\xe0\x77\x82\x71\x7d\x2d\x1b\x7e\x6b\
-\xde\xd3\x4f\x2b\x74\x9e\x2a\x8c\x7e\x69\x6a\xca\x8f\x09\x04\x2f\
-\x2b\x0c\x5e\xbe\x2a\x7a\x39\x6a\x1e\x33\x66\x91\x2d\xcf\x43\x29\
-\xbf\x9b\x15\x62\x44\x86\x93\x23\x9b\xa8\xb6\xf5\x35\xba\xb4\xfc\
-\xef\x1a\x6a\xe6\x1c\x7a\x01\x72\xc1\xe0\xb5\xb9\x19\x40\xa0\x37\
-\x0d\xe5\xc4\x29\x4a\x4a\x64\x7b\xc1\xff\xe4\xf6\x26\x79\x6d\x2e\
-\x28\x97\x4d\xe9\xeb\xfa\x71\x0e\x35\x61\xa7\xfe\xf7\x24\xaa\xc4\
-\x7d\x01\x06\x1d\x54\xa1\xce\x06\x78\xf6\x06\x4e\x93\xed\xc0\x8d\
-\xb8\xa2\x8e\x41\x26\x30\x4a\xcd\x3c\x9e\x3a\x79\x2d\x1b\xbf\x38\
-\x59\x42\xaf\xca\x92\x23\x54\x65\xe0\x5f\xe0\x99\x38\x24\x6b\xf3\
-\xac\x17\x27\x85\x41\xe2\x33\x06\xa3\xb4\x36\x7d\xac\x88\xc7\x37\
-\xf7\xd5\x59\xab\xe1\x0d\x80\x0c\xcf\x6f\x1a\xf3\x09\xa8\x10\xfe\
-\x07\xb4\x0a\xfd\x7e\xcf\x22\x5b\xc2\x00\x00\x00\x00\x49\x45\x4e\
-\x44\xae\x42\x60\x82\
-\x00\x00\x01\x23\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x00\xd5\x49\x44\x41\x54\x78\x9c\xed\
-\xdb\x31\x11\xc2\x40\x00\x05\xd1\x0d\x22\xa2\x08\x05\x0c\x0e\xa0\
-\x41\x11\x0d\x12\x18\x14\xa0\x26\x15\x2e\x42\x41\xe8\x52\x67\x99\
-\x61\x5f\x75\xdd\xfd\xdb\xfe\x20\xc9\x3f\x1b\xac\x8b\xf7\xc7\xf3\
-\x61\x98\xb9\x02\xcc\x03\x97\xe7\xfd\xf6\x30\x76\xec\x8c\x4b\x01\
-\x96\xc7\x8f\xc0\xf8\x0d\x61\xd0\x02\xf0\x79\xfc\xda\x79\x53\x66\
-\x80\x9f\x50\x00\x7b\x80\xad\x00\xf6\x00\x5b\x01\xec\x01\xb6\x02\
-\xd8\x03\x6c\x05\xb0\x07\xd8\x0a\x60\x0f\xb0\x15\xc0\x1e\x60\x2b\
-\x80\x3d\xc0\x56\x00\x7b\x80\xad\x00\xf6\x00\x5b\x01\xec\x01\xb6\
-\x02\xd8\x03\x6c\x05\xb0\x07\xd8\x0a\x60\x0f\xb0\x15\xc0\x1e\x60\
-\x2b\x80\x3d\xc0\x56\x00\x7b\x80\xad\x00\xf6\x00\x5b\x01\xec\x01\
-\xb6\x02\xd8\x03\x6c\x05\xb0\x07\xd8\x0a\x60\x0f\xb0\x15\xc0\x1e\
-\x60\x2b\x80\x3d\xc0\x56\x00\x7b\x80\xcd\xfb\x34\x05\xaf\xb5\xf3\
-\xd6\xb4\x00\x33\x9c\x80\x09\x98\x96\x73\x92\x6c\xee\x0d\xbb\x93\
-\x11\x50\xe7\xe7\xb7\x79\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\
-\x60\x82\
-\x00\x00\x00\x87\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x00\x39\x49\x44\x41\x54\x58\x85\xed\
-\xcd\xa1\x15\x00\x10\x00\x00\xd1\x63\x29\x55\x31\x80\x45\x4d\xe0\
-\x3d\xd9\x52\x9e\xa4\x8a\x8a\xfb\xe9\xda\x81\x24\x49\xbf\x0b\x27\
-\x52\x5b\x03\xc8\x8f\xae\x7d\xd6\x58\x00\xe2\x93\xa1\x24\x49\xd2\
-\xc5\x06\x65\xbc\x05\x04\xc9\x39\x8e\xf8\x00\x00\x00\x00\x49\x45\
-\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x04\xd0\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x04\x82\x49\x44\x41\x54\x58\x85\xe5\
-\x97\x5d\x88\xd4\x65\x18\xc5\x7f\xe7\x9d\xf1\x2b\xa9\x34\x24\xac\
-\x5c\xab\x25\xfb\x58\x2a\x05\x75\x56\x89\x3e\x34\x51\xd2\x74\x77\
-\x6b\xdb\x88\x22\x41\x14\xa5\x8b\x2e\x82\x4a\x4b\xda\xa2\x32\xbb\
-\x09\xac\xd0\x8a\x20\x04\xaf\xcc\x76\x56\xcd\xed\x03\x0a\xbd\x08\
-\x9d\x5d\xcd\x36\x48\x8a\xc0\xd0\x56\xb7\x0c\x04\x25\xd3\x6c\xe6\
-\x3d\x5d\xcc\xec\x38\xe3\xce\xae\x3b\xd6\x9d\xe7\x66\xf8\x3f\xff\
-\xe7\x3d\xe7\xbc\x5f\xff\xe7\x19\xb8\xd4\xa1\x6a\x92\xa7\xb7\xbb\
-\x26\x91\xa3\xd1\xf2\x1c\x8b\x1a\xcc\x04\x41\x00\x8e\x20\x7a\x8c\
-\x76\x29\x47\x3a\xd3\xac\x9f\xff\x57\x03\x33\xd3\x4e\x45\x7b\x2d\
-\x30\x6b\x88\xa4\x5d\x39\x69\x55\x57\x93\xbe\xfa\x4f\x06\xa6\x6e\
-\xf6\x95\xc9\x64\xdc\x00\x7a\xac\x10\xea\xc5\xde\xee\x10\x3e\x53\
-\x8e\x83\xc3\x23\xbd\x7f\x27\x89\x8e\x8c\x97\xb8\x41\x8a\x73\x41\
-\x0d\xc0\xf5\x05\xf6\x0e\x82\x96\x64\x1a\xf4\x7b\xd5\x06\x66\x6e\
-\xf5\x4d\x31\xe7\x6d\xc0\x6d\x40\xaf\x50\xeb\xc8\xb1\x7c\xb4\x73\
-\x96\xb2\x83\x4e\xa9\xd5\x21\x35\x85\x47\x65\xbf\x06\xd4\x4a\x1c\
-\x8e\xd6\xa2\xce\x87\xd4\x3d\x64\x03\xd3\xb6\xb8\x36\x11\x9c\x01\
-\xc6\x01\x5b\x19\xa9\x27\x33\xf3\x75\x72\x50\xe1\xf3\xf0\x40\x87\
-\x47\x1c\x3f\x13\xd7\x83\x96\x60\x4e\x05\xeb\xee\xdd\xcd\xda\x7f\
-\x41\x03\xf5\x1d\xbe\x82\x33\xde\x0d\xd4\x81\xd7\x65\xba\xc3\x33\
-\xbc\xa2\x58\x8d\x78\x11\xb6\xea\xdb\x59\x89\xbd\x06\xe8\xc9\x5a\
-\xa9\x7d\x0f\xab\xb7\x34\x25\xd9\x6f\xd0\xdf\xf1\x5d\x50\x9d\xcd\
-\xf6\xce\xef\xfb\x8b\x4f\x6f\x77\x4d\x88\x71\x29\xd2\x7c\xcc\x44\
-\x20\x62\x0e\x81\x76\x64\xe1\xc3\x32\x01\xc9\x19\x7b\x6d\x2a\xed\
-\x5a\xa1\xa5\x49\x79\x13\xf6\x1c\x24\x57\x5c\x81\xd4\x16\x4f\x53\
-\x70\x97\xe1\x8f\x5c\x56\x93\xf6\xb5\xe8\x44\xf1\x65\xab\x43\xfd\
-\x14\x9e\xc7\x7e\x09\x18\x59\x79\xc6\x9c\x92\xf4\xc2\x9e\x26\xde\
-\x29\x15\xa9\xdb\xec\xe1\x97\x27\xdd\x0d\xdc\x4a\xd4\x82\x4c\xb3\
-\x3a\xfa\xde\x85\xd2\xf1\x4a\xf8\x0d\x80\x60\xbd\xda\x4f\x7c\x72\
-\xdc\x58\x58\xca\xca\xe2\xf9\xe9\x8c\x36\x5e\x37\x23\x1d\xd7\x63\
-\x17\x27\x77\xa0\x45\x67\x85\x5e\xcc\x2b\x7a\x6d\xe9\xbb\xa2\x81\
-\xa9\x9f\xf8\x1a\xcc\xfd\xc0\xf1\x93\x39\xde\x2f\xe5\xad\x9f\xcc\
-\x6a\xd0\x13\x98\x21\xc1\x68\x45\x7d\x3b\x4f\x97\xc6\xf6\x34\x91\
-\x06\x7e\x04\xee\x48\xa5\xb9\xb3\x9f\x81\x64\x60\x21\x20\xe4\x1d\
-\x07\x5a\x74\xb6\x2f\x3e\x6d\x8b\x6b\xc1\xab\x0b\x33\x1c\x3a\xa2\
-\x5f\xbf\x6b\xab\xaf\x2d\x3e\x4b\x96\xbd\x0d\x20\x38\x36\xf5\x33\
-\x80\xe3\x7d\xf9\x9f\xf0\x79\x29\x4f\x22\x11\x9f\x02\x86\x55\x21\
-\x5d\x10\x64\xf4\x3f\x91\x65\x65\x9e\x14\xbe\x00\xb0\x34\xbb\xbf\
-\x01\x54\x53\x18\xf8\x4b\x19\x91\xb5\xa0\x6a\xf1\xa2\x07\x3f\x58\
-\xfa\x1c\xc4\xc1\x3c\x27\x13\x2a\x18\xc8\x07\x83\x38\x77\x8d\xf2\
-\x87\xa5\xf6\x62\x0d\xd8\x85\x4f\x72\x01\x63\x47\x14\xb8\xc5\x75\
-\x7d\x07\x31\x54\x18\x77\x0e\x2f\xa3\x0b\xe6\x0c\x02\x41\xe2\x02\
-\xdc\x65\xe4\x47\x00\x1c\x19\x5f\x8c\xbc\xa2\x68\x38\x74\xb1\x06\
-\x80\xc3\xa5\x0f\x27\x4e\x17\xb9\x8f\xf6\x7d\xe0\x4a\x0c\xf8\x57\
-\x00\x07\x6e\x2c\xa3\x90\x3b\xb8\x48\x88\xf2\xb1\xb9\x73\xdb\xd9\
-\xd3\x17\x2b\x1a\xb0\xc3\x4e\x80\xe0\x38\xaf\x8c\x44\xe1\x3d\xe0\
-\x62\x6a\xc1\xd9\x98\x0c\x1f\x96\x3b\x8a\x73\x0b\x6a\x5f\xf7\x33\
-\x30\x2c\xc9\x76\x00\xa3\x05\x53\xdf\x77\xf1\xda\x65\x1a\x75\x00\
-\xf9\xed\x6a\xd5\x2d\xad\xe9\x5c\xa4\x73\x37\xca\x16\x68\x11\x40\
-\x54\x48\xf7\x33\xf0\x4d\x83\x8e\x02\x5f\x03\xe3\x86\x5d\xcd\xd2\
-\x52\xb2\xec\xb1\xf0\x1c\xa2\x8a\xad\xf0\xc7\x9d\xdf\xf1\x6a\x69\
-\x64\x46\x1b\x0b\x81\x3a\xe0\x87\xae\x46\x8a\xbd\x41\xd9\x09\x8f\
-\xd6\xca\xbc\x59\xb7\xd6\x77\xf8\x8a\xbe\xf8\xbe\xe5\xfa\x27\x7b\
-\x4c\x8d\xe0\x75\x0c\xbe\x1d\x59\xe1\x35\x13\xb3\xe1\xb1\xd2\x2a\
-\x5a\xb7\xd9\xc3\xad\x7c\x9d\x51\xd0\xaa\x01\xab\x21\x40\xaa\x2d\
-\xb7\x49\xe8\x71\x60\x6b\xa6\x5b\x0f\x9d\x5f\x8e\xa7\xb5\xf9\xf6\
-\x04\x71\x05\xd6\x7c\xc4\x44\xc0\x86\x43\xc2\x9f\xe6\x12\x61\xc3\
-\xde\x06\xfd\x54\xbe\x18\x56\x7d\x3a\x6e\x00\x2d\x07\x76\x66\x9a\
-\x34\x7b\x50\x03\xf9\x3e\xd0\x7b\x80\x5b\x8d\xdf\xea\xec\x0e\xcf\
-\x0e\xd4\x90\x3c\xb2\xd9\x09\x80\x8f\x5b\x94\xab\xb8\x1e\xb6\x52\
-\xed\x3c\x2b\xfb\x4d\xe0\x68\x32\xa1\xe9\x85\xad\x2e\xa2\x62\x79\
-\x29\xf4\x83\x19\xe0\x2a\xa0\x6d\x54\x56\x8b\x77\xb6\xe8\xcf\x8a\
-\x22\x03\x20\xdf\x03\xc4\x77\x41\xcb\x80\xbf\x1c\x75\x6f\x67\xb3\
-\xf6\x9e\x9f\x37\x60\x7d\x4b\xb5\xf9\x66\xe1\x6d\xc0\x2d\xc0\x11\
-\x4b\xad\x97\x8d\x61\xe3\x50\x9a\xd2\x19\x53\x68\x76\xbe\x29\x9d\
-\x04\xf4\xc8\x6a\xd8\xf3\xb0\xbe\xad\x94\x3e\x68\x81\x9d\x92\xf6\
-\x98\x11\x8e\x1f\x80\x1e\x29\x84\x7a\x6c\x6f\x0f\x89\xf0\x59\x2e\
-\xcb\xc1\x64\xa4\xf7\xf4\x30\xe2\xa8\x1c\xe3\x73\x70\x7d\x08\x71\
-\x9e\xf3\x6d\x79\xdf\x07\xe7\xcb\x98\xd5\xe2\xae\x16\xfd\x36\x90\
-\xc6\x90\x2a\x7c\xaa\xcd\x33\x85\xd7\x02\xf7\x0c\x25\xdf\x62\xbf\
-\xd0\xca\x4c\x93\xbe\xbc\x50\x6e\x55\x7f\xcd\x66\xa4\x7d\x83\x23\
-\x8d\xc8\x73\x80\x1a\xf2\x15\x34\x01\xf4\x20\x7a\x40\xbb\x42\x8e\
-\xf4\xee\x66\xfd\x58\x0d\xef\xa5\x8d\x7f\x01\x53\xeb\xdb\x78\xb8\
-\xf8\xe0\x36\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x00\x8c\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x00\x3e\x49\x44\x41\x54\x58\x85\xed\
-\xd3\xb1\x11\x00\x10\x00\x04\xc1\xa3\x32\x89\x0a\xb4\xa0\x2c\x2d\
-\x68\xc0\x98\xd1\x9a\x48\x2a\x24\xb9\x8d\x3e\xbb\xe8\x41\x92\xf4\
-\x59\x38\x23\x97\xba\x80\xf4\x28\x3a\x47\x6f\x19\x20\xbe\x08\x4a\
-\x37\xbe\x40\x92\xa4\xef\x36\xf1\x29\x0a\x07\x7b\xbe\x69\xcc\x00\
-\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x0a\x8e\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x0a\x40\x49\x44\x41\x54\x78\x9c\xed\
-\x5b\x7d\x8c\x1c\x65\x19\xff\x3d\xb3\xb7\xd7\xbb\x72\xd7\x03\x29\
-\x07\xf5\x76\x76\x76\xaf\x3d\x02\xa1\x25\x2a\x05\x81\xd4\x13\x50\
-\x03\x12\x28\x20\x24\xf2\x11\xa4\x02\x22\xa0\x88\xf2\x65\xd0\x00\
-\x15\x21\xf2\x21\x85\x90\xd4\x02\xb1\x0d\x50\x1a\x31\x28\x10\x31\
-\x7c\x34\xa1\x94\x54\x85\x40\x2d\x88\x8b\x94\x5c\xbd\xdd\xf9\xd8\
-\xeb\x51\xca\x47\x3f\xb4\xd7\xdd\xd9\xf7\xe7\x1f\x77\x6d\x67\x66\
-\x67\x67\x76\xef\xf6\x2e\x46\xfb\xfb\x6f\x9e\xf7\xf7\x7c\xcc\x33\
-\xef\xce\xbc\xef\xf3\xbc\x0b\xec\xc7\x7e\xec\xc7\xff\x33\x64\x2a\
-\x9c\x0c\x6c\xde\x7c\x48\x72\xb7\xdb\x4f\xc1\x3c\x0d\x72\x84\x02\
-\x7b\x01\x1c\x28\x90\x19\x00\x13\x00\xb6\x03\xd8\x4e\x88\x05\xf0\
-\x3d\x0d\xf2\x0f\xd2\x5d\x97\xc9\x64\xf2\x93\x1d\xdb\xa4\x25\xc0\
-\xb2\xac\xd9\x0a\xda\x22\x28\x2e\x84\xe0\xe8\x71\x9a\xc9\x83\xf2\
-\x82\xa6\xa9\x47\x75\x5d\x5f\x2f\x22\x6c\x6a\x90\x68\x72\x02\x48\
-\x4a\xc1\x71\x4e\x15\x85\x9b\x00\x9c\xdc\x4c\xdb\x00\x72\x14\x2e\
-\xf9\x68\xcb\x96\x27\xe6\xcf\x9f\x5f\x6e\x96\xd1\xa6\x25\xa0\x50\
-\x70\x4e\x86\xf0\x1e\x00\xf3\x9b\x65\x33\x1c\x52\x20\xb0\x38\x93\
-\xee\x79\xbc\x19\x33\x62\xc2\x09\x18\x1c\x1c\x3c\x54\x4b\x24\xef\
-\x03\x70\x51\x04\x4d\x11\xf8\xb3\x88\xac\x85\xe2\x46\x26\xf0\xcf\
-\x16\xe0\x63\xd7\x75\x77\xb8\x6d\x6d\x95\xd6\x52\xa9\x93\x6c\xe9\
-\x02\x54\x96\x82\xc3\x01\x39\x41\xc0\xaf\x01\x68\xaf\x65\x90\xc0\
-\x3a\x0d\xea\x2a\xc3\x30\xde\x9d\x48\xfc\x13\x4a\xc0\xa0\x6d\x1f\
-\xa7\x29\x3c\x0b\x60\x56\xc8\xf0\x0e\x81\x3c\x4f\xf2\xb9\x96\x16\
-\x79\x31\x95\x4a\x7d\xd4\x88\x6d\xdb\xb6\xdb\x2b\x15\x39\x45\x44\
-\x9d\x49\xc8\xc2\x1a\x3e\x46\x28\xbc\x34\x9b\x4e\xff\x66\x3c\xf1\
-\x03\x13\x48\x40\xa1\x60\x5f\x08\xc1\x0a\x00\xd3\xaa\x82\x02\x1e\
-\xd4\xa0\xee\x32\x0c\xe3\x93\xf1\xda\xf7\x22\x97\xcb\xb5\x76\x74\
-\xcc\xf8\x0e\x44\x6e\x05\xd0\x5d\x45\xa0\xdc\x69\x18\x3d\xb7\x8a\
-\x88\x6a\xd4\x76\xc3\x09\x20\xa9\x59\x96\x7d\x07\x21\x37\x07\x86\
-\x14\x80\x15\x2d\x09\xf9\x59\x2a\x95\x72\x1a\xb5\x5b\x0f\x36\x6e\
-\xfc\xb0\xb3\xbd\x7d\xe4\x3a\x02\x37\x00\xe8\xf0\x07\x86\x67\xa7\
-\x4f\x9f\x76\x71\x77\x77\xf7\xce\x46\x6c\x36\x94\x00\x92\x9a\x69\
-\x16\x57\x41\x78\x7e\x60\x68\x48\x69\x38\xa7\x57\xd7\xdf\x68\xc4\
-\xde\x78\xe1\x38\x4e\xca\xad\xf0\x19\x54\xbf\x70\xdf\x2a\x97\x46\
-\x4e\xea\xeb\xeb\xdb\x5e\xaf\x2d\xad\x11\xc7\xa6\x5d\x5c\x5c\x75\
-\xf3\x82\xd7\xc1\xca\xfc\xa9\xba\x79\x00\x48\xa5\x52\x4e\x42\x43\
-\x3f\x80\x55\x81\xa1\xcf\x27\x5b\xdb\x56\x91\x4c\xd4\x6b\xab\xee\
-\x19\x90\xb7\xac\x6f\x0a\xe5\x49\xbf\x32\x1f\x53\xaa\x72\x65\x36\
-\x9b\x1d\xa9\xd7\x4e\x33\x41\x52\x2c\xcb\xb9\x91\xc0\x5d\xf0\xdc\
-\x0b\x81\x7b\xb2\x86\xfe\xe3\x7a\x6c\xd4\x95\x00\xcb\xb2\xe6\x2b\
-\xca\x3a\x00\x6d\x1e\xf1\x13\x46\x3a\xf5\xad\xc9\x58\x9d\x35\x8a\
-\xbc\xe9\xfc\x50\xc0\xfb\xbd\x32\x81\x5c\x62\x18\xa9\xc7\xe3\x74\
-\x63\x13\xe0\x38\xce\xc1\x6e\x85\x7f\x03\xd0\xe3\x51\x7a\x43\x29\
-\xf7\xcb\x8d\x3e\xf9\x42\xa1\x70\x24\xb4\x96\x73\x84\x38\x9a\x50\
-\x29\x40\x52\x00\x2a\x02\x38\x14\x38\x50\xdc\x00\xa8\xa7\x1b\xdd\
-\x03\x90\x14\xd3\x2c\x2e\x87\xf0\xdb\x1e\x71\x09\x4c\x9c\x90\xc9\
-\x7c\x76\x43\x94\x6e\x6c\x02\x0a\x96\xbd\x1c\xc4\xa5\x1e\xd1\x90\
-\x26\x3c\x36\x9d\x4e\x0f\xd5\x13\x5c\x2e\x97\x6b\xed\xec\xec\xba\
-\x8a\xc0\x95\x00\x8e\xa8\x47\x07\xc0\x5b\x14\x3e\x98\xd1\xf5\x95\
-\x22\x52\xa9\x47\x61\x60\x60\x60\x5a\xb2\xb5\x6d\x0d\x80\x13\xf7\
-\x49\xb9\xc1\x48\xeb\x5f\x14\x11\xb7\x96\x5e\x64\x02\x4c\xd3\x5c\
-\x40\x68\xeb\x3c\x22\x52\xc9\x89\xd9\x6c\xea\xf5\x7a\x82\xca\x5b\
-\xd6\xd9\x42\xb9\x17\xc0\x9c\x7a\xf8\x21\x78\x1b\x94\xeb\x33\x99\
-\xd4\x9a\x7a\xc8\x63\xab\xd2\x1c\x80\x99\x7b\x64\x02\x5c\x6b\x18\
-\xfa\x83\xb5\x74\x6a\x7e\x05\x48\x0a\x91\xf8\x45\x40\xbc\xaa\x9e\
-\x9b\x5f\xbf\x7e\x7d\xb2\x50\x70\x96\x0a\xe5\x19\x8c\xff\xe6\x01\
-\xe0\x73\x10\xbe\x9c\x37\xed\xc5\x24\x63\xbf\x58\xbd\xbd\xbd\x1f\
-\x10\x72\xa7\x57\x46\xe0\x96\xe1\xe1\xe1\x03\x6a\xe9\xd4\x34\x5a\
-\x70\x9c\x7e\x80\x0b\x3c\xa2\xb2\x40\xdd\x16\x17\x84\x69\x9a\x07\
-\xcd\x3c\xe4\xd0\x17\x20\xbc\x3a\x8e\x5b\x2f\x04\xb8\xcd\xb4\x9c\
-\xdf\x16\x8b\xc5\xe9\xb1\x64\x55\x7e\x08\x02\xcb\x23\x99\x39\x52\
-\x2a\x7d\xb7\x16\xbd\x66\x02\x44\xe1\xc6\x40\x14\x0f\x1b\x86\x31\
-\x18\xe5\x3b\x97\xcb\xb5\x02\xda\xb3\x00\xbe\x12\x1b\x68\xe3\x38\
-\xaf\xec\xaa\xc7\xe3\x66\x42\x36\x9b\x1d\x21\xe8\x7f\x50\x94\xeb\
-\x6a\xad\x0d\x42\x8d\xe5\xf3\xf9\xc3\x00\x9c\xe6\x11\x95\x95\x5b\
-\xbe\x23\xca\x31\x49\xe9\xe8\xec\x5a\x4a\xa0\x3f\x8a\x37\x41\x9c\
-\x5b\xb0\x9c\xd8\x59\x98\xd1\xf5\x95\x04\x06\x3c\xa2\x9e\x82\x6d\
-\x7f\x35\x8c\x1b\x9a\x00\x49\x24\x2e\x04\xb0\x37\x63\x02\xac\xe9\
-\xed\xed\xfd\x20\xca\xa9\x65\x39\x17\x01\xb8\x3c\x2e\xb8\x89\x42\
-\x80\x5b\x4d\xb3\x18\x7a\x33\x7b\x39\x22\x15\x21\x9f\xf2\xc9\x94\
-\x5c\x12\xc6\xad\x31\x9d\xe4\x4c\xef\x15\x85\x7f\x88\x72\x58\x2c\
-\x16\xa7\x8f\xad\xc6\xa6\x04\x0a\x6a\x49\xdc\x72\x97\x09\xf1\xc7\
-\x2c\x38\x3d\x4c\xa7\x2a\x01\xc3\xc3\xc3\x07\x80\xde\x6f\x29\x50\
-\x29\x27\xfe\x18\xe5\xac\x5c\xae\x5c\x07\xcf\x42\x69\xb2\x21\xc0\
-\x3c\xd3\x74\x16\x45\x71\x32\xa9\xd4\x9b\x80\x78\x67\x6d\x57\xde\
-\x71\x8e\x09\xf2\xaa\x12\xb0\x7b\xb7\x7b\x3c\x80\x56\x8f\xe8\xed\
-\xd9\xb3\x7b\xac\x20\x6f\x0f\x46\xb3\x2a\x3f\x88\x0f\xbb\xb9\xa0\
-\xe0\xda\xa8\x71\x11\x51\x10\xfa\x1e\x5c\x42\x55\xd7\x29\x43\x7e\
-\x02\x9c\x1b\x10\xac\xab\xe6\xec\x43\xa1\xe0\x7c\x09\x82\x43\xa2\
-\x38\x93\x01\x01\xe6\xd9\xb6\xdd\x17\xc5\xe1\xe8\xfe\x65\xdf\x35\
-\x70\x54\x90\x13\x96\x80\x23\x03\x8e\x06\xaa\x39\x9e\xf1\x04\xce\
-\x0b\xe8\x47\xd1\x9b\x0a\x57\xe1\xdc\xa8\x71\xa1\x04\x63\x3f\x32\
-\xc8\x09\x49\x80\x64\xbc\x57\xa4\x44\x7e\xfb\xa1\x82\x45\x89\x29\
-\xe9\xb5\xec\xf1\x54\xf5\x9b\xf6\x82\x2c\x05\x63\xcf\x06\x39\x55\
-\x09\x20\xd0\xe9\x73\x22\xf2\x69\x4c\x14\x53\xf6\xf2\x0b\xf1\x9d\
-\x8a\x61\x04\x63\xef\x0c\x12\x62\x13\x50\xa9\xb0\x66\x8d\x6d\x6c\
-\x55\x16\x56\xad\x9d\x1a\x30\x3a\x01\x99\x4c\x66\x37\x00\xef\x4e\
-\xb0\x75\x74\xb5\xba\x0f\x55\x09\x90\xe0\x1c\x4e\x32\xea\x47\xad\
-\x85\xd9\x98\x3a\x48\x72\xa2\x16\xc2\x82\xdf\xe1\xbd\x48\x28\xad\
-\x6a\xda\xec\x75\x3f\xba\xcf\x8e\x5c\x21\x4e\x2e\x18\x59\x7d\x2e\
-\x14\x0a\xd3\x00\xb4\x78\x44\xa5\xb9\x73\xe7\x96\xbc\x9c\xb0\x19\
-\xe0\xab\xa8\x92\x3c\x30\x26\x8a\x62\xcc\xf8\xa4\x41\x80\xc8\x04\
-\x90\xec\x0a\x88\x76\x04\x39\x55\x09\x50\x80\x19\x30\x53\xf5\xe6\
-\xf4\x07\xc1\x5c\xd4\xf8\x64\x82\x94\x48\xdf\x9a\xd6\xda\x1b\x10\
-\x15\xaa\x38\xd5\x6a\xf2\x9e\xcf\x89\x20\x72\xb1\x21\x82\xa7\xa3\
-\xc6\x27\x17\x5a\xa4\x6f\xa9\x8e\x7d\x63\x95\x85\x6a\x41\xc5\xd7\
-\x6c\x14\x7f\x51\xa4\x0a\x95\x4a\x65\x35\x80\x86\xba\x31\x4d\x82\
-\x69\x18\xb3\xde\x8a\x22\x30\x10\x3b\x81\xaa\x19\x53\x95\x80\xf6\
-\xf6\xf6\xd7\x00\x78\xfa\xef\xf2\x05\xc7\x71\x6a\x7e\x6e\xb2\xd9\
-\xec\x08\x04\x8f\xc6\xc7\xdb\x64\x88\x3c\x12\x55\x92\x1f\xfb\x44\
-\x9f\xe1\x13\x2a\x59\x1b\xe4\x55\x25\xa0\xbb\xbb\x7b\xa7\x00\xaf\
-\x79\x65\x65\x15\x30\x14\x40\x39\xd9\x72\x3b\x80\x6d\xd1\x11\x37\
-\x0f\x02\xd8\x09\xf1\xf7\x01\x82\xb0\x6d\xfb\x18\xf8\xd7\x28\xdb\
-\x33\x99\x9e\xf5\x41\x5e\xe8\x37\x9c\x84\x6f\x17\x25\xe0\xc2\x28\
-\x67\x7d\xb3\x66\x7d\x08\x32\xb2\x62\xd4\x64\xfc\x44\xd7\xf5\x5d\
-\x51\x04\x05\xcd\x17\x33\xc1\x17\xc3\xca\xe3\xa1\x09\xd0\x34\xae\
-\xc2\x68\xb7\x77\x8f\xf6\x29\x03\x9b\x37\x47\xee\xf8\x0c\x43\x7f\
-\x40\x80\x97\xa2\x38\x8d\x23\x74\x86\xaf\x4c\xa7\x53\xc1\x9e\xa0\
-\x5f\x8b\xd4\x40\xfa\x36\x69\x42\x79\x2c\x8c\x1b\x9a\x80\x74\x3a\
-\x3d\x04\x62\xb5\x47\x34\x2d\xb9\xbb\x1c\x6c\x87\xfb\x20\x22\xae\
-\x52\xee\xf9\x00\xde\x8f\xe2\x35\x06\x09\x5e\xbe\x4e\xe5\x5e\x11\
-\xd7\x8e\x33\x4d\xe7\x02\xf8\x9b\x30\xc3\x86\x91\x5a\x1d\xc6\xad\
-\x5d\x15\x16\xf9\x65\x40\xf0\xbd\xc1\xc1\x21\x23\xca\x71\x36\x9b\
-\xfd\x54\xa0\x4e\x47\x53\x93\xb0\x17\xeb\x95\x5b\x3e\x3b\xae\x1d\
-\x97\xcb\xe5\x5a\x21\xf8\xb9\x57\x26\xc0\xfd\xb5\xba\x43\x35\x13\
-\x90\x4e\xf7\xac\x81\xff\x65\xd8\x9a\x48\xa8\xc5\x71\x51\x1a\x86\
-\x31\x48\xe5\x1e\x2f\x40\x68\xc6\xc7\x05\xca\x93\x09\x0d\xfd\x71\
-\x85\x59\x00\xe8\xe8\xe8\xba\x02\xfe\x6d\xef\xc7\xbb\x76\xb5\x2d\
-\xab\xc5\x8f\xdc\xbc\xe7\xf3\xf6\x49\xa2\xe1\x15\x8f\x48\x09\xd4\
-\x71\x86\x61\xfc\x35\x36\x66\xb2\xc5\xb2\x9c\xeb\x09\xfc\x14\x21\
-\xdb\xd0\x3a\xb1\x95\x22\xb7\x64\xf4\x9e\x87\xeb\xe9\x42\x17\x8b\
-\xc5\x99\x65\x57\xbd\x0b\xef\x31\x1a\xf2\x86\x4c\x26\x7d\x5f\x2d\
-\x9d\x98\x26\x83\xbe\x16\xc0\x4a\x3f\x5f\x7b\x66\x70\x70\xf0\xd0\
-\xb8\x60\x44\xc4\x35\x0c\xfd\x6e\xb7\x9c\x9c\x03\xca\x32\x00\xff\
-\x8e\xd3\xf1\x60\x9b\x00\x77\x55\xdc\xd2\x9c\x6c\x3a\xf5\x50\x3d\
-\x37\x9f\xcb\xe5\x5a\xcb\x65\xf5\x3b\xf8\x6e\x1e\xef\x6c\xdd\xba\
-\xa5\x66\x5f\x10\xa8\xa3\x7c\xb3\x69\xd3\x70\x77\x4b\xd2\x7d\x07\
-\xa0\xf7\xa6\xff\x52\x2e\x8d\x9c\xd2\xd7\xd7\xb7\x3b\x4e\x7f\x0f\
-\x8a\xc5\xe2\xf4\x72\x59\x9d\x06\x0d\xe7\x92\x98\x27\xa3\x55\xe4\
-\xcf\x8c\x05\xfa\x21\x34\x0c\x41\xc9\x06\x80\x4f\xed\xdc\xb9\xed\
-\xe5\xe0\xae\x2d\x0e\xa6\x69\x2d\x23\xe4\x4a\x8f\xa8\xac\x34\x2c\
-\x88\x3b\xb9\x52\x57\xfd\x2a\x9f\x77\x8e\x17\x8d\x6b\xe1\x3d\x11\
-\x26\x58\x61\xe8\xa9\xcb\x27\x72\x40\xc2\xb6\xed\xf6\x91\x91\x11\
-\xd5\x48\x22\xc3\x50\xb0\xac\xab\x41\x59\xea\x13\x12\x97\x67\x32\
-\xfa\xf2\x38\xdd\xba\x0b\x78\xa6\xe9\x5c\x4c\xd0\x77\xe2\x82\xc0\
-\x23\xff\xda\xb1\xed\x9a\x46\x9f\x56\xb3\x30\x76\x44\xe6\x1a\x02\
-\xf7\xc3\xf3\x73\x16\xf0\x01\xc3\x48\xff\xa8\x1e\x1b\x0d\x55\x30\
-\xf3\xa6\x7d\xb7\x00\x37\xf9\xa3\xc0\xab\xc9\xa4\x76\x5e\x4f\x4f\
-\xcf\xd6\x46\x6c\x4d\x14\xb9\x5c\xae\xb5\x63\x46\xd7\xaf\x40\x5c\
-\xe6\x95\x0b\xf0\x52\x3a\x9d\x3a\x23\xea\x50\x44\x80\x5f\x3f\x48\
-\x26\x4c\xdb\x79\x0a\xc4\x39\x01\x33\x85\x84\xc6\x85\xba\xae\xff\
-\xbd\x11\x7b\xe3\xc5\xd8\x7b\xe9\xf7\xa8\xde\xa9\xbe\x4b\xe5\x2e\
-\xc8\x66\xb3\xd1\x85\x5c\x0f\xc6\x73\x50\x32\x61\x9a\xf6\xbd\x10\
-\x09\x4e\xb1\x32\x81\x65\x95\x72\xf2\xce\x39\x73\x0e\xdb\xd2\xa8\
-\xdd\x7a\x30\x7a\x7c\x16\xdf\x87\xe0\x66\x00\x07\xf9\x06\x05\x2f\
-\x54\xca\xa5\x0b\x66\xcf\x9e\xdd\xd0\xa6\x6c\x22\x47\x65\x2f\x83\
-\x60\x19\x80\x60\x61\x72\x27\x81\xfb\xdc\xd2\xc8\x92\x46\x0e\x2c\
-\x46\x81\x64\x8b\x69\x3a\x8b\x20\x58\x8c\xb0\x1e\x24\x65\x89\x61\
-\xf4\xdc\x54\xef\x79\x22\x2f\x26\x76\x58\xda\xb2\xfa\x35\xca\xd3\
-\x00\x0e\x0e\x19\xfe\x84\xe0\x73\x1a\xb4\xe7\x4a\xa5\x5d\xab\x1b\
-\x4d\xc6\xe8\xe1\xaa\x83\xfa\x15\xd4\x99\x02\x9c\x05\x20\x6c\x19\
-\x5e\x06\x71\x55\x3d\x6f\xfb\x5a\x98\x70\x1b\x67\x53\xb1\xa8\xb7\
-\x54\xd4\x03\x20\xbe\x11\x41\x2b\x03\x7c\x15\xa2\xbd\x02\xc5\xf7\
-\x95\x92\x4d\x6a\x9a\x7c\x9c\x74\xdd\x9d\xa5\x52\xa9\xd2\xd6\xd6\
-\xd6\xa9\x94\xea\x22\x13\x59\x6a\x38\x1c\x54\x27\x08\xe4\x54\x00\
-\x33\x6a\x19\x24\xf0\xe6\xd8\x71\xf9\xd8\x55\x69\x14\x9a\xf8\x87\
-\x09\xfb\xeb\x14\xdc\x2d\xc0\xbc\x66\xd9\xac\x81\x21\x42\x6e\xcf\
-\xa4\x7b\x7e\x3d\x9e\x29\x1f\x44\xb3\xff\x32\xa3\x99\xa6\x73\x16\
-\x05\x37\x0b\x70\x6c\x33\x6d\x03\x18\x04\xb9\x84\xac\x2c\x6f\xe6\
-\xd1\xdc\x49\xeb\x64\x9a\xa6\x79\x14\x45\x5b\x04\x85\x85\x10\x1c\
-\x3e\x4e\x33\xc3\x10\x3c\xaf\xc0\xc7\xb2\xba\xfe\xa7\xf1\xfc\x1f\
-\x20\x0e\x53\xd2\xca\xdd\x54\x2c\xea\x49\x97\x27\x2b\xf0\x28\x40\
-\x8e\x00\x98\x15\x41\x17\x88\x19\x18\xed\xdc\x6c\x03\xb8\x5d\x20\
-\xb6\x02\x36\x42\xb8\x51\x23\x5f\x4d\xa7\xd3\xef\xfd\x37\x9c\x45\
-\xde\x8f\xfd\xd8\x8f\xff\x5d\xfc\x07\xbb\x1b\xfe\xd4\xc4\x32\xd9\
-\x11\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x02\x3e\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x01\xf0\x49\x44\x41\x54\x58\x85\xed\
-\xd6\x3f\x68\x13\x61\x18\xc7\xf1\xef\xf3\x5e\x62\xa5\x82\x8a\x1d\
-\x14\x5d\x44\x9c\x1c\xfc\x13\xcc\xe0\xe0\x28\x5d\xea\x24\xc1\x45\
-\xd1\x45\xd2\xda\x34\x05\xc1\x51\x4a\x70\x74\x50\x92\x5a\x6b\x40\
-\x10\x75\x10\x8b\x5b\x10\xc5\xd1\xa1\xa0\x6d\xc4\xc5\xc9\xa1\x93\
-\x28\x48\x4b\x87\x8a\x35\xc9\xfd\x1c\xee\xb2\x38\xdd\x5d\x8e\xcb\
-\xa0\x0f\xdc\x76\xcf\xfb\xfb\xf0\xdc\xfb\xde\x1d\xfc\xeb\x65\x51\
-\x6e\x3a\x5d\xae\x6f\x80\x59\xbe\xdb\x39\xb2\xfc\xe8\xc6\x7a\x9a\
-\x00\x17\xf1\xbe\xbd\xa0\x3d\x9d\x5c\xae\x75\xfc\xf2\x9d\x5d\xc3\
-\x00\xf4\xeb\xcc\xc8\xe8\xc8\xcb\x63\xa5\xb9\x1d\xc3\x02\x20\x18\
-\x1f\xdd\x37\xf6\xa4\x54\x7a\xe1\x65\x0e\x10\xf8\x60\x02\x2e\xae\
-\x8d\x7d\x6b\x80\x22\xed\xa1\xd4\x00\x06\x12\xbe\x00\x24\xa6\x8a\
-\x93\xf5\x5a\xa6\x80\x00\x61\x92\xe1\x07\x08\xbb\x55\x2c\x37\x66\
-\x33\x05\x00\x98\x90\x50\x80\x40\xf7\x8a\xe5\xc6\xa5\x4c\x01\xf0\
-\xd7\x24\xd0\xe3\xc2\xe4\xfc\x44\xa6\x00\x08\x26\x81\x10\xe0\x39\
-\xf9\x4b\x85\xa9\xfa\xd9\x4c\x01\x81\x02\x3f\x44\xec\x74\x3e\xad\
-\xe2\xb5\xbb\x27\xb3\x05\x84\x08\xc9\x04\xec\x96\xf3\x5e\x17\xae\
-\xdf\x3f\x9a\x2d\x00\x30\x53\xff\x1d\xb1\xdf\x7a\xbd\xb7\xa7\x2a\
-\x8d\x83\x99\x02\x82\x0a\x4e\x86\xc1\x61\xd7\xd1\xab\x21\x00\x00\
-\x44\x88\x38\x31\x04\x80\x39\x30\x04\x6b\xbd\xbc\x1d\x8a\xd2\x91\
-\x4b\x2b\x5a\xe0\x2c\xf8\x36\x7c\x97\xe7\x9d\xfb\x38\x3f\xfd\x35\
-\x4a\x5f\x5a\x13\x70\x16\xfc\xdc\x6c\x3a\x18\x6f\x2f\x4c\x7f\x89\
-\xdc\x98\x46\x38\x41\xf8\x2f\xdf\x71\xfe\xfd\xc3\xea\xa7\x38\xcd\
-\x83\x3e\x02\x0b\xaf\x9e\x6f\xae\xd4\x7e\x50\x79\x17\x77\x81\xc4\
-\x13\x90\xc9\xfa\xfd\x86\x5d\x6d\x2f\x56\x5a\x49\xd6\x49\x3a\x01\
-\x33\x99\x03\x90\x98\x5d\x69\xce\x3c\x4b\xb8\x4e\x92\x09\xc8\x40\
-\x2e\x54\xdc\x5e\x6d\x56\xeb\x49\xc3\x63\x03\x84\x0c\xf5\xcf\xba\
-\x16\x3e\x2c\x56\xe7\x06\x09\x8f\x0d\x30\x70\x18\x20\x7b\xbe\x7a\
-\x60\x7d\x26\x7c\xf7\x0f\x54\x31\xf7\x80\x61\xf0\x66\x6b\xe3\xc7\
-\x15\x9a\x35\x7f\xd0\x70\x88\xbf\x07\x96\xb7\x7f\x6e\x5f\xf8\xbc\
-\x54\xfb\x9d\x46\x38\x44\x9c\x80\x60\xd3\xc0\xf2\xdd\xee\xc4\xca\
-\xd3\x9b\x5b\x69\x85\xff\x2f\x80\x3f\x94\x18\xa2\x63\x8f\xc5\xfb\
-\x89\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x00\x98\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x00\x4a\x49\x44\x41\x54\x58\x85\xed\
-\xce\x49\x0d\x00\x31\x0c\x04\xc1\x5c\x90\x0c\xca\x2c\x36\x14\x4c\
-\x25\xfc\x72\x80\x98\x95\xfc\xe9\xfa\xcf\xa8\x4b\x11\x98\xc7\x34\
-\x8f\xa9\x7c\x34\x65\xfc\x07\x02\x08\x20\x80\x00\x02\x08\x48\x0f\
-\x18\xf2\xc3\xad\x9f\x79\xe4\x04\xdc\xd3\x57\x6d\x5b\xb9\x00\x00\
-\x00\xf9\x1e\xf2\x23\x09\xdd\x64\x85\x0e\x0a\x00\x00\x00\x00\x49\
-\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x00\xd0\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x00\x82\x49\x44\x41\x54\x78\x9c\xed\
-\xd7\x31\x0e\x82\x50\x10\x04\xd0\x81\x43\x10\x1b\x13\xce\xe4\x15\
-\xa8\x38\x11\x37\xf1\x3c\x24\x36\xc4\x43\x88\xad\xe1\xdb\x22\x86\
-\xff\x5e\x39\xd9\x62\x76\xbb\x4d\x00\x00\x00\x00\x00\xa8\x47\xb3\
-\x0d\xe6\xf9\x71\x4b\x93\x29\x49\x77\x40\x9f\x3d\x2d\x59\x33\xf4\
-\xfd\xf5\xfe\x19\xb6\xc5\xd8\x39\x97\x4f\x92\x4b\xda\x4c\xdb\xb0\
-\x3c\x40\x65\xca\x03\xac\x19\x93\x3c\x7f\x5f\x65\x77\x4b\x5e\x19\
-\x8f\x2e\x01\x00\xfc\x0f\xbf\x40\x31\x76\xce\xe5\x13\xbf\xc0\x77\
-\x7e\x01\x00\x00\x00\x00\x00\x00\x2a\xf1\x06\x74\xea\x1a\x0f\x1a\
-\xcd\x17\x42\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x02\x2e\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x01\xe0\x49\x44\x41\x54\x58\x85\xe5\
-\x96\xbd\x6b\x14\x51\x14\xc5\x7f\x67\x46\x8d\x20\xf1\xab\x90\x85\
-\xcd\xec\x18\xc1\x2e\x85\xa5\x95\x65\x04\x25\x8d\x85\x56\x0a\x76\
-\x36\x42\xfe\x00\xb1\x10\x7b\x11\x04\x4b\x41\x2b\x2d\x6c\x82\x85\
-\xa6\xb3\xb2\x14\xd9\x4e\xc8\x3a\x3b\xbb\xb0\x58\x69\x82\x90\x0f\
-\x76\x8e\xc5\xac\xb5\xfb\x66\x1e\x0a\x7a\xab\x79\xc3\xbc\x73\x7e\
-\xf7\xbe\xfb\xde\x1b\xf8\xdf\x43\xb1\x05\xcb\xb2\x3c\x3d\xad\xd8\
-\x02\xfb\x6c\xde\x3b\xf5\xbb\xef\x0f\xc5\x34\x9f\x4c\x26\xc7\x76\
-\xf7\x0f\xde\x00\x27\xe6\xcd\x2d\x1a\x40\xbf\xdf\x3f\xb2\xb7\x77\
-\xf0\x1a\xb8\x18\x32\x2f\x89\x61\x6e\x3b\x5d\x5c\x3c\xf9\xdc\xb0\
-\x8a\x1d\x34\xb7\x35\x80\x6d\x0d\x87\xe5\x13\xe3\x1b\xf5\x1b\x55\
-\x7f\x14\xa0\x28\xc7\x0f\x8c\xee\x00\x18\x2a\x44\x50\x09\x5a\x01\
-\x0c\x8a\xd1\x3a\xf6\x3d\xdb\x80\x2b\x11\x66\xde\x0a\xa0\x28\x46\
-\x37\x85\x1f\x01\x24\x52\x05\x0a\x36\x6f\x0c\x50\x14\xe3\x35\xe3\
-\x67\xf5\x48\x95\x1b\x64\xde\x18\x60\x6b\x38\xbc\x64\xaa\x57\x40\
-\x5a\x1b\x07\xb6\x7d\x1b\x80\xc1\x60\x74\x21\xb1\x36\x80\xa3\x60\
-\x0b\x82\x3a\xbe\x15\x40\x59\x96\xe7\x95\xf8\x2d\x70\x1c\x70\xe8\
-\x76\x6b\x05\x50\x96\x65\x77\x5a\xb1\x09\x9c\x99\x75\x7a\x14\x73\
-\x98\xf3\x28\x9e\x56\x8c\xea\x27\xe3\x48\x99\xff\x8a\xf9\x96\xc0\
-\x7c\x8a\x69\x1a\x0c\x90\xa6\x5c\x01\x7d\x01\xa1\x48\xf7\x47\x10\
-\x40\x96\x65\xe3\x34\xf1\x2a\xf0\xd5\xf5\x3d\x1b\x0d\x62\x6e\xa1\
-\x2c\xcb\x3e\xbb\xd2\x65\x60\x1b\x10\x8e\x03\x11\x24\xb2\xbc\xbc\
-\xf4\xb1\x92\xd7\x80\x5d\x84\x1c\xa1\x12\xc1\x02\xe7\x7a\xbd\xf7\
-\x22\xb9\x0e\x4c\x05\x52\xcb\xdf\xba\x46\x19\xe4\x79\x77\x43\xe8\
-\x36\xc0\xac\x0a\x8d\x21\x1a\x97\x30\xcf\x97\x5e\x08\xd6\x01\x6c\
-\x37\x86\x68\xb5\x86\x79\x9e\x3d\x46\x7a\x28\x69\xa6\xe5\x60\x88\
-\xd6\x4d\x94\x67\xdd\xfb\x58\x4f\xeb\x91\x12\x3b\xac\x12\xad\x01\
-\x24\x39\xcf\xbb\x77\x85\x5e\xd6\xe3\x30\xcd\x28\x7b\x59\xd2\x74\
-\x67\xe7\xdb\x2d\xc1\xbb\xd0\xb9\xd1\x4e\xb4\x95\x95\x95\xfd\x85\
-\x85\xc3\xd7\x10\x1f\xfe\x0a\x00\x40\xa7\xd3\xf9\x91\x8a\xab\xb6\
-\xb7\xc1\xdf\x63\x6a\xff\xbb\xf1\x13\xb6\x0b\xa1\x01\x61\x9e\xcd\
-\x4b\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x00\x98\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x00\x4a\x49\x44\x41\x54\x58\x85\xed\
-\xce\xc1\x0d\xc0\x30\x08\x04\x41\x82\x5c\x1b\x15\x50\x02\x7d\x98\
-\x9a\x52\xa0\x9d\x22\x2e\x12\x9f\x9d\xff\x9d\xd6\x4c\x10\x59\x1d\
-\x59\xad\x7c\xb8\x32\xfe\x03\x01\x04\x10\x40\x00\x01\x04\x8c\x07\
-\x2c\xf5\xe0\x5e\xdb\x91\x35\x13\xf0\x1c\x7f\xcd\x8f\x72\x01\x00\
-\x00\xe6\x7d\x0c\xb6\x09\x4f\xb2\x71\xd6\x0c\x00\x00\x00\x00\x49\
-\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x00\x75\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x00\x27\x49\x44\x41\x54\x78\x9c\xed\
-\xc1\x01\x0d\x00\x00\x00\xc2\xa0\xf7\x4f\x6d\x0e\x37\xa0\x00\x00\
-\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x80\x77\x03\
-\x40\x40\x00\x01\x8f\xf2\xc9\x51\x00\x00\x00\x00\x49\x45\x4e\x44\
-\xae\x42\x60\x82\
-\x00\x00\x00\x77\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x00\x29\x49\x44\x41\x54\x58\x85\xed\
-\xce\x41\x01\x00\x20\x0c\xc4\xb0\x0d\x53\xb8\x9e\x44\x40\xc6\xf1\
-\x48\x0c\xb4\x55\x00\x40\x58\xef\x39\x37\x39\xb0\x92\x71\x00\xe0\
-\x0b\x0f\xd3\xb2\x02\xe6\x6a\x84\x46\x98\x00\x00\x00\x00\x49\x45\
-\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x00\x9a\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x00\x4c\x49\x44\x41\x54\x58\x85\xed\
-\xd7\xc1\x09\x00\x20\x08\x46\x61\x8b\x76\xf2\xda\xc4\x4d\x10\xb8\
-\x99\xb4\x41\xa6\x74\x7c\xef\xf8\x83\xf0\x5d\x15\xa1\x64\xba\xdc\
-\x74\xb9\xbd\xee\x51\xa3\x60\x98\xc9\xfd\x5a\xaf\x1c\xfd\x0c\x00\
-\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xf2\x9f\x51\x93\
-\x9d\xda\x29\xe8\x00\x81\xd7\x0c\xbd\xf7\x79\x8f\x39\x00\x00\x00\
-\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x00\xee\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x00\xa0\x49\x44\x41\x54\x78\x9c\xed\
-\xd0\x41\x11\x00\x20\x00\xc3\x30\x0e\x53\xb8\x46\x22\x20\x23\x3c\
-\x1a\x03\xeb\x6d\x0c\x68\xed\x73\xd7\x3e\x57\x36\x4c\x39\xfe\x83\
-\x0e\xd0\x01\x5a\x07\xe8\x00\xad\x03\x74\x80\xd6\x01\x3a\x40\xeb\
-\x00\x1d\xa0\x75\x80\x0e\xd0\x3a\x40\x07\x68\x1d\xa0\x03\xb4\x0e\
-\xd0\x01\x5a\x07\xe8\x00\xad\x03\x74\x80\xd6\x01\x3a\x40\xeb\x00\
-\x1d\xa0\x75\x80\x0e\xd0\x3a\x40\x07\x68\x1d\xa0\x03\xb4\x0e\xd0\
-\x01\x5a\x07\xe8\x00\xad\x03\x74\x80\xd6\x01\x3a\x40\xeb\x00\x1d\
-\xa0\x75\x80\x0e\xd0\x3a\x40\x07\x68\x1d\xa0\x03\xb4\x0e\xd0\x01\
-\x5a\x07\xe8\x00\xad\x03\x74\x80\xd6\x01\x3a\x40\xeb\x00\x1d\xa0\
-\x75\x80\x0e\xd0\x3a\x40\x07\x68\x0f\xaf\xe7\x06\x43\x97\x92\x59\
-\xbc\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x04\xea\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x04\x9c\x49\x44\x41\x54\x58\x85\xe5\
-\x97\x5d\x6c\x14\x55\x14\xc7\x7f\x67\xa6\x5b\xaa\x15\x6a\x94\x34\
-\x68\x77\x66\xa7\x8b\x4d\x90\x54\x9f\x2a\x09\x0f\xf8\x81\x04\x12\
-\x91\x0f\x49\xd4\x10\x8d\x24\x08\x91\xf8\xe0\x83\x09\x0a\x4a\xe4\
-\x01\xc5\xfa\x62\x82\x12\x50\x43\x62\x4c\x78\x33\xb1\x81\x0a\x28\
-\x89\x04\x9e\x90\xd0\x84\x90\x54\x03\x59\xda\xdd\x9d\xd9\xa5\x62\
-\x8d\x09\x22\xa8\xed\xce\x3d\x3e\xec\x07\xb3\xdd\x6e\xbb\xad\xbe\
-\x71\x5e\x76\xe6\xdc\xff\x39\xff\xff\xbd\x77\xee\x3d\x67\xe1\x4e\
-\x37\x99\x09\xf8\x4a\x3e\xef\xc4\x0a\x66\xbd\x41\x56\x08\xea\xa0\
-\xc4\x11\x2c\x94\x3c\x42\x4e\xe0\x8c\x65\xd1\xe7\x38\x4e\xea\x7f\
-\x15\x30\x1c\x04\x4b\x2c\x43\x2f\xf0\x54\x23\x78\x85\xf3\x16\xb2\
-\x33\x91\x88\xff\xf0\x9f\x04\x0c\x0d\x0d\xb5\xd9\x76\xf3\x41\x84\
-\x8d\x25\xd7\x88\x42\x3f\xa2\x27\x54\x64\x38\x6c\x6a\x1a\xb9\x2b\
-\x0c\x4d\x18\x86\x0b\x54\x6d\x4f\x45\x57\x0a\xac\x03\x12\x25\xfc\
-\x71\x13\x8e\x6f\x4e\x26\x93\xd7\x66\x2c\x20\x08\x82\x87\x42\xa3\
-\x47\x41\x1e\x06\x46\x04\x76\xbb\x6e\xfc\x4b\x11\x29\x4c\x25\x5a\
-\x55\xad\x4c\x10\xbc\x28\x2a\xef\x03\x49\x04\xdf\x14\x64\x6d\x32\
-\x19\xbf\xd8\xb0\x80\x6c\x36\x9b\x54\xac\x73\xc0\x7c\x81\x23\x63\
-\x63\x7f\xbf\xd2\xd5\xd5\xf5\xc7\x54\xc4\x13\x2d\x95\x4a\xcd\x89\
-\xcd\x69\x39\x80\xb2\x19\xb8\x89\x5a\xcb\x3c\xaf\xe3\xc2\xb4\x02\
-\x52\xa9\xd4\xbc\x58\x73\xcb\x59\x60\xb1\xc2\x3e\xcf\x8d\xbf\x29\
-\x22\x66\x26\xe4\x65\x53\x55\xc9\xf8\xf9\x1d\x82\xee\x05\x72\x68\
-\xb8\xc4\xf3\xbc\x91\x28\xa6\x69\x62\x50\xac\xb9\x65\x7f\x91\x5c\
-\xfb\x3d\xd7\xa9\x21\xbf\x92\xcf\x3b\x76\xc1\x6c\x11\x78\x06\x70\
-\x01\x83\x92\x05\x3d\x06\xe6\x50\x94\x40\x44\x54\x55\x7b\xb3\x7e\
-\x2e\x09\x6c\x41\xec\xc3\xaa\xba\x42\x44\x74\xd2\x15\xf0\x7d\xbf\
-\xc7\xa8\x9c\x47\x19\x0d\xc3\xb1\xae\x85\x0b\x17\x5e\x8f\xcc\xc6\
-\xca\xf8\xf9\xb7\x05\x7d\x0f\x68\xa9\x33\xe9\x9b\x02\xef\xb8\x6e\
-\xfc\xd3\x28\xc9\xe0\xe0\x60\xf3\x3d\x73\xdb\x2e\x02\x8b\x50\x56\
-\x7b\x9e\x73\xbc\x3c\x66\x45\xa3\x8d\xf2\x61\x51\x39\x7b\x26\x92\
-\x67\xfd\xdc\x57\xa5\xa5\xac\x47\x0e\xd0\xaa\xb0\xcf\xf7\x83\x03\
-\xaa\x5a\x99\x5c\x77\x77\xf7\x18\xca\xbb\x00\x2a\xf4\x46\xc7\x2a\
-\x02\x32\x99\xcc\x03\x20\x4f\x03\xbf\xdf\xb8\x71\xfd\xf3\xea\x95\
-\xc9\xed\x02\x5e\x56\xa5\x21\x53\x64\x9b\xef\xe7\xde\x88\xfa\x12\
-\x89\x78\x1f\x70\x49\xe0\x91\x74\x3a\xff\x68\x8d\x00\x11\x7b\x0d\
-\xc5\x2d\x39\xd6\xdd\xdd\x3d\x56\xf6\x17\x4f\x04\xbb\x8a\x98\xc6\
-\x04\x14\x45\xf0\x81\xef\xfb\x0f\xde\xce\x2f\xaa\x70\x14\x40\x6c\
-\x7d\xae\x46\x80\x2a\x4f\x96\x22\xbf\xab\x4a\x24\xf6\xeb\x40\xac\
-\x71\xea\x8a\xb5\xaa\xca\xd6\xa8\x43\x54\xbe\x2f\x3d\x2e\xaf\x11\
-\x80\x88\x53\x7a\x48\x57\x4f\x45\x57\xcf\x82\xbc\x18\x0a\xcf\x56\
-\xa7\x1a\x1f\x06\x10\x88\xd7\x0a\x28\x39\x55\xc7\x47\x6e\x07\xa8\
-\x00\xc9\xd9\x0a\x40\x2b\x57\x32\x00\x85\x42\xa1\x9c\xbb\xa3\xfc\
-\x21\x5a\x35\x41\xd5\x26\x0d\x60\xa6\x8a\xb6\xa7\xc9\x1d\x4d\x6e\
-\xf2\xc5\xdf\xd8\x82\x0a\xa2\x78\x09\x65\x67\x2d\x00\xfc\xe8\x8b\
-\x6d\xb7\x96\x72\xcb\xd5\xf2\x05\x77\x5b\x80\x5a\x41\x11\x65\x3a\
-\x27\x24\x39\xce\x6c\x4d\xb5\x2a\xd6\xb2\x4c\x79\x3b\x73\x15\x5f\
-\x05\x2b\x9c\x06\xb0\x94\x55\xd1\x20\xc1\x7c\x06\xcc\xa6\x16\x8c\
-\x81\x39\x54\x95\x4b\x74\x25\x80\xa2\xa7\x6a\x04\xd8\x62\xfa\x8b\
-\x83\xb2\x7a\x60\x60\xa0\x72\xec\x12\x89\xc4\xcf\x82\x7e\xd2\x38\
-\xaf\x96\x84\xb3\xd7\xf3\xbc\xca\x89\x52\x55\x51\x58\x0b\x80\x91\
-\xbe\x1a\x01\xae\xeb\x5e\x05\x4e\x01\xf3\xef\x6f\x6f\xdf\x12\x4d\
-\x39\x3a\xfa\xeb\x5b\x34\xbc\x15\x82\xa2\x5f\xbb\x6e\x7c\x4f\xd4\
-\x1b\x04\xc1\x1a\x60\x31\xf0\x93\xe7\x75\x54\x7a\x83\xaa\x2f\xdc\
-\x12\xdd\x01\x20\x6a\xed\x4e\xa5\x52\xf3\xca\xfe\x9e\x9e\x9e\xf1\
-\xdf\x46\xaf\xad\x57\xd8\xc7\xd4\xdb\x51\x40\x75\xaf\xe7\x3a\x1b\
-\xa3\x55\x74\x70\x70\xb0\xd9\xa8\x14\xeb\x0c\xd6\xce\xba\xd5\x10\
-\x20\x93\x0d\x0e\x03\x2f\x09\x1c\x71\xdd\xf8\x86\x89\xe5\xd8\xf7\
-\xfd\x6e\x83\x6c\x43\x2b\xe5\x58\x81\xac\xc2\xb7\x1a\x5a\x07\x93\
-\xc9\x8e\xcb\x51\xbc\xaa\x8a\xef\x07\x07\x15\x79\x0d\xe1\x74\xc2\
-\x89\x2f\x9f\x52\xc0\xd0\xd0\x50\x9b\xdd\xd4\xfc\x23\xb0\x08\x95\
-\x8f\x13\x89\x8e\xed\xf5\x1a\x12\x55\xb5\x01\x44\x24\xac\x33\x2e\
-\xbe\x9f\xdb\xae\xf0\x11\x70\xd5\x12\x7d\xac\xb4\xd5\x15\x9b\xb4\
-\xbc\x14\xfb\x41\xce\x01\xf7\x21\x7c\x73\x77\xcb\x9c\x4d\xed\xed\
-\xed\x7f\x4e\x86\xad\x67\xa5\x1e\x60\x3f\xb0\x15\xb8\x65\x89\x3e\
-\xe1\xba\xee\xc0\x44\xdc\xa4\xb7\x9c\xe3\x38\x57\x42\x5b\x96\x02\
-\x97\x51\x36\xdc\xfa\xeb\x9f\x4b\x99\x4c\xf0\xaa\xaa\xd6\x74\x50\
-\x13\x4d\x55\xad\x6c\x36\xf7\x42\xeb\xdc\xb6\xc1\x12\x79\x0e\xb5\
-\x97\x4d\x46\x0e\xd3\xb4\xe5\xe9\x74\xfa\x5e\x2c\xfb\x0b\x41\x9e\
-\x2f\xb9\x72\xa8\xf4\x8b\xc8\x09\x28\x0c\x5b\x96\x35\x52\x28\x14\
-\x0c\x34\x2f\xc0\x0e\x13\x62\x58\x85\xc8\x3a\x4a\xf5\x43\xe0\xa4\
-\x31\x85\x4d\x9d\x9d\x9d\xbf\xd4\xe3\x68\xa8\xc2\x67\x32\xb9\xa5\
-\x22\xda\xab\xf0\x78\x23\x78\xe0\x82\x11\xdd\x91\x74\xdd\x93\xd3\
-\x01\x67\xf4\xd7\x2c\x9d\x4e\x7b\x58\xb1\xf5\x82\xae\x40\x71\x10\
-\xe2\x80\x0d\xe4\x04\x72\x06\x39\x83\x91\xbe\xce\xce\x8e\x4b\x33\
-\xc9\x7b\x67\xdb\xbf\x21\xb9\xe6\xce\xae\xea\xf6\xd6\x00\x00\x00\
-\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x02\x18\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x01\xca\x49\x44\x41\x54\x58\x85\xed\
-\x96\x3f\x48\xc3\x40\x14\xc6\xbf\x97\x0a\x29\x08\xd5\x5d\xa9\x8b\
-\xb8\x76\x15\x41\x5c\x8c\xae\xd2\x58\xc4\x21\x2e\xad\x2e\xba\x14\
-\x44\x5c\x9c\x3a\x38\x08\x2e\xc5\xa5\x56\x1c\x5c\x94\x92\x82\xd0\
-\x45\xb3\x08\x22\x38\xda\xd1\xc1\xa1\x38\xb8\x08\xfe\x19\x0a\x85\
-\xe6\x9e\x8b\xa9\x35\x35\x69\xd2\xbf\x83\xfd\xa6\x77\xc9\xcb\x7d\
-\xbf\xbc\xbb\x7b\x1c\xf0\xdf\x45\x6e\x2f\x17\x34\x6d\x58\x94\x83\
-\x29\x02\x47\x01\x4c\xb4\xe9\x55\x02\x58\x97\x2b\x81\xbd\x42\x21\
-\x53\x6e\x0a\xb0\xa0\x69\xc3\x5c\x0e\xde\x01\x1c\x69\xd3\xd8\x26\
-\x2a\xca\x15\x9a\xb1\x20\x24\xa7\x34\x51\x0e\xa6\x3a\x6f\x0e\x00\
-\x1c\xa9\xc8\x66\xca\x1a\x39\x02\x7c\x97\xbd\x4b\x22\xd5\x8a\x86\
-\x5c\xb2\x7e\xad\xb9\xa1\x67\x5d\xf7\x4b\x33\x29\x6a\x82\xff\x9a\
-\xdb\xb1\x02\xbd\xd2\x00\xa0\x61\x0f\xcc\xc7\x36\xc2\x64\x9a\x73\
-\x0d\xcf\xd5\xf8\x96\xd3\x24\x12\x49\x82\x85\x28\x8e\x06\x3e\xef\
-\x73\xb9\x9c\xd9\x32\xc0\xfc\x72\x7c\x9b\x84\xd8\x07\x51\x03\x18\
-\x81\xd2\x4e\x93\x30\x33\x40\x84\x37\x31\x72\xbb\x18\xdd\x58\xb9\
-\xca\x67\x5e\xbc\x02\xd4\x96\x40\x51\x13\xab\xc4\x74\x60\x87\xf2\
-\x23\x02\x66\x4d\x12\x17\xb1\x58\x2c\xe0\x1b\x00\xc0\x4e\xab\xc6\
-\x76\x88\x77\x33\x34\xed\x35\xbf\xfe\x6f\xed\x5d\xef\xc8\x87\xef\
-\x12\x80\xb1\x1a\x84\x24\x45\x00\xdc\xf9\x05\xf8\xd5\x68\x0c\x3d\
-\xeb\xb8\xe9\xec\x52\xd4\x04\x00\x6c\x5a\x63\xc1\xc2\xf3\xe9\xea\
-\xfb\x31\x1c\x00\x0c\x00\xfa\x0e\xd0\x72\xd7\x73\x13\x81\xd2\x8a\
-\x9a\x70\x6c\xdd\x00\x4a\x56\xd0\xa7\x0a\xb0\x6e\x45\x5d\xa9\x80\
-\xbb\xa8\x28\x57\xa4\x3d\x6b\xd4\xcb\x0a\x94\x00\x3e\xac\xbf\x11\
-\x03\x75\xed\x57\x51\xd7\x3f\x00\x0e\x75\xc4\x8a\x79\xcd\xc8\x9f\
-\x9c\x79\x49\xad\x55\x80\x20\x8c\x8e\x98\x03\x55\x32\xc5\x8d\xd7\
-\xe4\x9f\x25\xa8\x8a\x24\x18\xaf\x6d\xdb\x33\x76\xaf\x2f\x4f\x9f\
-\xbd\xa6\xd7\x2e\x0e\x4f\x8f\x0f\x9f\x93\x53\x91\x73\x92\x28\x0c\
-\x48\xe3\x00\x64\x5f\xb6\x40\x91\x88\x92\x86\x9e\x3d\xf6\xf1\xdd\
-\x40\xf8\x02\x67\xdb\x80\xa5\xc9\x72\x5a\xc9\x00\x00\x00\x00\x49\
-\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x03\x34\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x02\xe6\x49\x44\x41\x54\x58\x85\xe5\
-\x96\xcb\x6e\xd3\x40\x14\x40\xcf\x0d\x2c\x80\xcf\x48\xb3\x69\x0a\
-\x8b\x24\x3b\xd6\x69\x36\x48\xb4\xb5\xc3\x4b\x42\x2d\x10\x5b\xf0\
-\x01\x48\x7c\x03\x4b\x76\x48\x24\x40\x05\xe5\xd5\x26\x1f\xd0\x76\
-\xcb\x36\x29\x8f\xda\xbc\x62\x5e\x12\xfc\x01\xb0\x69\x2e\x8b\xd4\
-\xc1\x8e\xed\xc4\x29\xd9\x20\xee\x6a\x6c\xcf\xdc\x73\xe6\xce\xe8\
-\xca\xf0\xbf\x87\xf8\x83\x4a\xd5\x3e\xa9\xaa\xb7\x81\xa3\x2a\xdc\
-\xd8\xde\xa8\xb7\xa6\x09\x2a\x57\x2d\x43\x94\x9b\xc0\x2f\x54\xaf\
-\x6d\xb5\x1a\xcf\x01\x32\xfe\x04\x55\x6d\x00\x27\x80\x9c\x28\xeb\
-\x15\xc3\x3a\x37\x2d\x78\xa5\x6a\x9f\x17\x65\x1d\xc8\x01\xc7\x11\
-\xa9\xfb\xdf\x32\x7f\xa6\xe9\x91\xc0\x9a\x8c\x0a\x8f\xa6\x21\x51\
-\xa9\xda\xe7\x55\x75\x2d\xcc\xe2\x58\x44\x40\xc9\x5c\x07\x7a\xd3\
-\x94\xa8\x18\xd6\xb9\x18\x78\x0f\xd1\xeb\xfe\xc3\x21\x7f\xe0\xb9\
-\x6d\x77\x26\x5f\x7c\x0f\x2c\xf1\xe7\x6e\x08\xc2\x52\x6e\xb6\xf8\
-\xb6\xeb\xb6\x77\x27\x86\x0b\x8f\x22\x70\x58\xd9\x6a\x36\x9e\x44\
-\x04\xf6\x25\x5e\xc7\x48\x64\x26\x95\xd8\x87\xaf\x0d\xe5\xdf\x87\
-\xd7\x1f\x06\xe7\x86\x04\x7c\x89\xec\x6c\xe1\x83\x88\x44\x24\xb2\
-\xf9\xd2\x1b\x6f\x8c\x44\xd9\xb4\xcf\xd2\xdf\xf9\x58\x78\xac\x40\
-\x5f\xa2\xf3\x2a\x4e\x42\xc0\x18\x25\x51\x36\xed\xb3\x82\x0e\xc3\
-\x35\x09\x9e\x28\xe0\x4b\xe4\xe6\x4a\x5d\x60\x31\x8d\xc4\x7c\xb5\
-\x76\x46\xe0\x71\x0c\x7c\x39\x09\x3e\x52\x00\xa0\xeb\xb4\x13\x25\
-\x66\xe6\x0a\xae\xe7\x74\x1c\x1f\x8e\xca\xc4\x70\x02\x49\x47\xc6\
-\xbc\x69\x5d\x04\x56\x09\xdf\xe8\x3d\x44\x2f\xf4\x51\x31\x70\xd5\
-\x95\xad\x56\xe3\xc1\xb8\xdc\xa9\x04\x92\x24\x04\x7a\xda\x1f\x06\
-\xc5\x52\xc3\x61\xcc\x11\x04\xc3\x73\xdb\x2f\x67\xf2\x45\x8f\xe1\
-\x3e\x11\xde\xc4\x44\xf0\x89\x04\x02\x12\xdd\x21\x89\x01\x5c\x85\
-\x4b\xdb\xcd\xf4\x70\x08\x97\x2e\x55\x28\xf2\x93\xfe\x05\x0b\x87\
-\x88\x66\x7a\xfc\x98\x34\xdf\x44\x15\x28\x9b\xb6\x29\xe8\x93\x84\
-\x75\x82\x60\xe6\x66\x8b\x4e\xd7\x6d\x3b\x53\x17\x28\x57\x2d\x43\
-\xe0\x29\x70\x38\xf0\xda\xaf\x44\xb0\x63\x9a\xd9\x7c\x69\xd7\x73\
-\xdb\x6e\x9a\xbc\xa9\x8e\x60\xff\x67\x22\x02\x17\xf4\xb2\x0a\x97\
-\x08\x1f\xc9\x21\x41\x9f\x96\x4d\xdb\x4c\x93\x7b\x6c\x05\xe6\x0d\
-\x7b\x49\xe0\x59\x1c\x7c\xb3\xd9\x58\xf5\x9c\xf6\x8b\x5c\xbe\xf0\
-\x09\x64\x81\x70\xb3\x4a\x55\x89\x91\x02\xf3\x86\xbd\x84\x68\x04\
-\x8e\xca\x95\xad\x56\x7d\xd5\x7f\xd1\x75\x3b\x49\x12\x46\x36\x5f\
-\x72\x46\x49\x24\x0a\x8c\x86\xdf\xb9\x3f\x3c\xbf\xeb\x76\x5e\xcc\
-\xcc\x96\x3e\x23\x4c\x24\x11\x2b\x50\x31\x6b\x8b\x08\xeb\x69\xe1\
-\x7e\x78\x6e\x7b\x27\x51\x62\xae\xb8\xeb\x39\x51\x89\x88\x40\xc5\
-\xac\x2d\x2a\x12\x81\xab\x50\xdb\x6e\xd6\x13\xe1\x41\x89\xec\x5c\
-\xf1\x8b\xc0\x69\x86\xef\x44\x8c\x44\x48\xa0\x5c\xb5\x16\x40\x36\
-\x62\xe1\x1b\xf5\x7b\xe3\xe0\x03\x09\x27\xbd\xc4\x40\xa0\x6c\xd4\
-\x4e\x09\xd2\xfa\x5b\x78\x50\x22\x97\x2f\x7c\x05\x89\x48\xe4\xf2\
-\x85\x9d\xae\xdb\x79\x07\x81\x3e\x90\x11\xb9\x35\x0c\x17\xd4\x3a\
-\x08\xdc\x8f\xcd\x66\xe3\xae\xa0\x16\xe1\x3e\x71\x58\x91\x5b\x03\
-\xee\x80\x86\x06\x7f\xc9\x55\x50\x6b\xb3\xd9\xb8\x7b\x50\xf8\x18\
-\x89\xbd\x88\x40\x46\xf5\x2a\xe0\x01\xdf\x51\x5d\x99\x06\x3c\x28\
-\x01\x2c\x23\x7c\x03\x3e\x4a\x8f\xab\xd3\xca\xfd\xef\xc7\x6f\xcf\
-\x0b\x86\xc1\xfd\xdf\x90\xb9\x00\x00\x00\x00\x49\x45\x4e\x44\xae\
-\x42\x60\x82\
-\x00\x00\x02\x25\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x01\xd7\x49\x44\x41\x54\x58\x85\xed\
-\x95\x3d\x68\x13\x51\x1c\xc0\x7f\xff\x77\xfd\xc2\xc1\x28\x2d\x3a\
-\x74\x29\xda\x0e\xea\x10\xb1\x9b\xa5\x50\xc4\x24\x94\xc6\xc1\xe6\
-\x4e\xf0\x0b\xc1\x26\xd6\x2e\xdd\x9c\x83\x9b\x7b\xb7\x0c\xd2\xcd\
-\xc5\xa1\x4a\x44\xac\x8b\x07\xe9\x22\xd8\x51\x27\x3f\x26\xc7\xd2\
-\x49\x38\xcf\x7b\x7f\x87\x5c\x6c\x42\xaa\x4d\x0f\xab\x14\xee\xb7\
-\x1c\x77\xf7\xff\xf8\xbd\x7b\xef\xde\x83\x94\x94\x94\x94\xff\x8c\
-\x24\x4d\xbc\xe4\xdd\x1f\x75\x6c\xf4\x02\x34\x4b\x68\x47\x5f\x3f\
-\x7f\xfc\x35\x49\x1d\x93\x24\x29\x57\x5a\x9c\x70\x6c\xd8\x00\xcd\
-\x02\xd0\x2f\x1b\x05\x6f\x61\xfc\x9f\x08\xe4\xbc\xca\x79\x88\x1a\
-\x20\x63\x0a\x28\x00\x32\x66\x55\x1a\x85\xab\x77\xb3\x07\x2a\x50\
-\x70\xcb\xd3\x58\x7c\xe0\x04\xa0\x02\x91\x40\x04\x28\xca\x49\x6b\
-\x8c\x5f\x70\xcb\xd3\x07\x22\x90\x77\x2b\x45\xab\xac\x83\x1e\xd5\
-\xe6\xc0\x6d\xdb\x6b\x0b\xaa\x40\xc6\x2a\xeb\x97\xe7\x17\xe6\xfe\
-\xaa\x40\xae\x54\xbe\xa5\xaa\x6b\xc0\x10\xaa\x2a\x9d\xcd\x63\xc4\
-\xaa\xa2\xc0\x90\x88\x3c\xcb\xbb\x95\x9b\xbd\xd4\x76\xf6\x0a\xc8\
-\x97\xca\xcb\x40\x0d\x30\x8a\xaa\x88\xec\xd2\x3c\x56\x10\x94\xe6\
-\x9f\x65\x80\xf9\x53\x67\x26\xb7\x3e\x7d\xd8\x7c\x9b\x54\x40\x72\
-\xa5\xca\x43\xe0\x51\x7c\x6b\xa5\xb5\xe6\xfe\x8c\x8a\xc4\x3e\xc2\
-\xec\xf8\xb9\x0b\xf2\xf1\xfd\xa6\xbf\x2f\x81\x6a\xb5\x6a\x06\x46\
-\x26\x56\x80\x07\x71\xa9\xd6\x1c\xf7\x8c\xec\x5c\x66\x4e\x9f\x9d\
-\x1c\xbe\x7d\xed\xca\x2b\xdf\xf7\xbb\x6a\x74\x6d\x44\x9e\xe7\x0d\
-\x6c\xdb\xcc\x2a\x70\x3d\x0e\xd9\x77\xf3\xb6\xf2\x02\xda\x5a\x67\
-\x4f\xb6\x86\xcd\x9d\x77\xb5\x5a\xf8\x5b\x81\x62\xf1\xde\x91\x60\
-\x30\x7a\x0a\x32\x8b\x02\x46\x2c\x9a\xb4\xf9\x2f\x07\x51\x55\xd3\
-\x6c\xa4\x2f\x07\x03\xc7\xad\xd7\x6b\xdf\xba\x04\xe6\x6e\x2c\x1d\
-\xff\x1e\x84\x75\xe0\x62\xfc\xc8\xd2\xdb\x9c\xef\xed\x80\x88\xee\
-\x7c\x89\x8d\x30\xfa\x51\x7c\xb3\xb6\xba\x0d\xd0\xd7\x0a\x0a\x82\
-\xf0\xb3\x40\xa6\x2d\x2f\xd1\x36\xbd\x1b\xda\x39\x8e\xa9\x7e\xa7\
-\xef\x0b\x70\xac\xa3\x49\xe2\x53\x29\x25\x25\x25\xe5\xb0\xf3\x13\
-\x19\xff\x9a\x58\xf0\x37\x9f\x0a\x00\x00\x00\x00\x49\x45\x4e\x44\
-\xae\x42\x60\x82\
-\x00\x00\x03\xd3\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x03\x85\x49\x44\x41\x54\x58\x85\xe5\
-\x97\x4d\x68\x9c\x55\x14\x86\x9f\xf7\x66\xd2\x1f\xa1\xb5\x95\xa2\
-\x29\x36\xb4\x06\xad\x9a\x8d\x81\xd4\x49\xb2\xf0\xa7\xa5\xb4\x54\
-\x69\x93\x9a\x18\x11\xa9\x85\xa2\xb8\x70\x27\x08\x29\x2e\xa2\x28\
-\x1a\x70\xa5\x14\x45\x11\x44\xd1\x4d\x68\x33\x69\xa2\xa9\x16\x2c\
-\xe9\x42\xda\x69\xac\xa5\x0b\x43\x41\x88\xa0\x93\x46\x11\x94\x6a\
-\xb5\x3f\xcc\x77\x5f\x17\x33\x49\x93\x4e\x92\x26\x64\xe2\xa6\x67\
-\x73\x3f\xce\x77\xbe\xf3\x3e\xf7\x7e\xf7\xe7\x5c\xb8\xd9\x4d\xf3\
-\x09\x7e\xb0\xd7\xd5\x15\x09\x2d\x96\xb7\x5a\x54\x63\xd6\x09\x02\
-\x30\x8a\xc8\x19\x1d\x57\x42\x26\xdb\xa6\x1f\xcb\x0a\xd0\x94\x71\
-\x3a\xda\x5d\xc0\xe6\x39\x26\x1d\x4a\xa4\xfd\x43\xbb\xf5\xcd\x82\
-\x00\xea\xbb\x7d\x6b\x2a\x15\xdf\x07\x3d\x5d\x74\x8d\x61\xf7\x3b\
-\x84\x23\x4a\x18\x59\x12\x19\xbb\x92\x22\x3a\x52\x25\xb1\x41\x8a\
-\xdb\x40\xcd\xc0\xfa\x62\xf6\x01\x82\xf6\x65\x9b\xf5\xdb\xbc\x01\
-\x9a\x0e\xfb\xee\x98\xb8\x0f\xb8\x1f\x18\x13\xea\x5c\xb6\x9a\x8f\
-\x07\x37\x2b\x3f\x6b\x97\x3a\x1d\xd2\x75\x3c\x25\xfb\x0d\xa0\x46\
-\xe2\xe7\x68\xed\x3a\xf5\x84\xce\xce\x19\x60\xd3\x41\xd7\x54\x04\
-\x67\x81\x35\xc0\x61\x96\xe9\xd9\xec\x63\xfa\x6b\x56\xe1\xeb\x6c\
-\xc7\x80\x97\xfe\x71\x39\xbe\x07\xda\x87\xf9\x27\x58\x0f\x9d\x68\
-\xd3\x99\x1b\x02\x34\x0c\x78\x25\x97\x7d\x02\xa8\x05\xbf\x93\x3d\
-\x1b\x5e\xe2\x35\xc5\xf9\x88\x4f\x98\xad\x86\x5e\x3a\xb0\xdf\x04\
-\x72\x79\x2b\x7d\xba\x55\x63\x93\x43\x42\xc9\x47\x57\xe2\x01\xa0\
-\xd6\xa6\x7f\x41\xe2\x00\x92\xb3\x2d\x74\x19\x7f\x04\xac\x4b\xc9\
-\x9f\x61\x4f\xe9\xf4\x14\x80\xf4\x41\x6f\xc2\xda\x63\xf8\x3d\x49\
-\xb4\x67\x41\xe2\x93\x20\x2e\xe6\xc3\x8b\xc0\x39\x60\x4b\xc3\x21\
-\x76\xcc\x08\xa0\x0a\xbf\x05\x10\xac\xd7\x4f\xb7\xeb\xc2\x82\xc5\
-\x8b\x36\xdc\xae\xab\x42\xaf\x14\x14\xdd\x35\x79\x14\x26\x1e\xea\
-\x0f\x79\x6d\x4a\x1e\x05\xfe\xfc\x3b\xaf\xb5\xc3\xed\xba\x5a\x2e\
-\x00\xa0\x30\x1f\x32\x1e\x06\xee\x33\xaa\x1b\x5f\x15\x13\x23\x90\
-\x0a\xec\x04\x84\xfc\x65\xd9\xc5\x01\x24\xcb\xee\x03\x08\x8e\xbb\
-\xc7\xdd\xd7\x7e\x81\xe3\xa3\x85\x26\x7c\x55\x76\xf1\xa2\x45\x85\
-\xaf\x01\x2c\x6d\x29\x05\x40\xd5\x85\x86\x9f\x16\x0b\x20\x88\x11\
-\x00\xcc\xba\x69\x00\x0a\xce\x20\xc6\x58\x24\x5b\xbd\xb4\x98\x5b\
-\xdc\x39\x3e\x11\x4b\xf7\x81\xff\xcb\x5e\xa5\x04\x60\x14\xc0\x91\
-\xaa\xc5\xd2\xbc\x70\x69\x22\xf7\xf9\xf1\x3d\x66\x12\x80\x7f\x01\
-\x70\xe0\xae\xc5\x02\x48\xa0\xa6\xf8\x98\x1b\xf7\x4d\x00\xd8\x61\
-\x10\x20\x38\x6e\x5f\x2c\x00\x14\xb7\x15\xd5\x8e\x95\x00\x54\xa6\
-\xe8\x07\x30\x7a\xbc\xfe\x03\x57\x96\x5d\xdc\x16\x68\x17\x40\x54\
-\xc8\x94\x00\x7c\xdb\xac\xf3\xc0\x31\x60\x4d\xe5\xed\x3c\x57\x6e\
-\xfd\xc6\x1e\x76\x02\xb5\xc0\x0f\x43\x2d\x4c\xd4\x06\x53\x56\x41\
-\xb4\x3a\x0a\xb0\xee\x6c\x18\xf0\xca\x72\x89\xd7\x76\x7b\x89\x55\
-\x38\x67\x14\xb4\x1f\xc9\xd3\x02\x0c\xb5\x6a\xc8\xf8\x73\xe0\x0e\
-\x2e\xfb\x53\x3a\xbd\xf0\x65\x6a\x6b\x45\x2a\xbe\x4b\xa1\xf7\x83\
-\x27\x9b\xf9\x62\xf2\xeb\x12\x81\xe4\xda\xd1\xd9\x9c\x7e\x20\xbe\
-\xbd\x20\x08\x5b\xe9\x5e\x5e\x06\xbd\x00\x9c\x4f\x55\xe8\x99\xc9\
-\xbd\x87\x19\x4a\xb2\x62\x3d\x98\x05\x6e\x03\x7a\x96\xe7\xb5\x77\
-\xb0\x5d\x17\xe7\xa3\x5d\xdb\xed\x25\x2b\x52\xf1\x00\xe8\x79\xe0\
-\x5f\x47\x3d\x72\xaa\x4d\xdf\x5d\x1f\x37\x63\x51\x9a\xee\xf1\x46\
-\xe1\x3e\xe0\x5e\x60\xd4\x52\xe7\x2d\xab\xf8\x64\x2e\x45\x69\x63\
-\x1d\x6d\x2e\x14\xa5\xf7\x00\x39\x59\xcd\x27\x5b\xf5\xfd\x74\xe1\
-\xb3\x96\xe5\x75\x19\xaf\x5a\xea\xf8\x21\xe8\xc9\xa2\x2b\x67\xbb\
-\x3f\x54\x84\x23\x49\x9e\x91\x54\x64\xec\x52\x25\x71\x79\x42\x55\
-\x02\xeb\x43\x88\xdb\x5d\x28\xcb\xc7\x37\x9c\xa3\x31\xaf\xbd\x43\
-\xed\xfa\x75\x26\x8d\x39\x5d\x4c\xd2\x3d\x6e\x12\xee\x02\x1e\x9e\
-\x4b\xbc\xc5\x19\xa1\x8e\xec\x6e\x1d\xbd\x51\xec\xbc\xae\x66\x8d\
-\x19\x6f\x70\xa4\x05\x79\x2b\x50\x4d\xe1\x04\xad\x00\x72\x88\x1c\
-\xe8\x78\x48\xc8\x9c\x68\xd3\xb9\xf9\xe4\xbd\xb9\xed\x3f\x89\x47\
-\x63\xa6\x91\x26\x12\xd0\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\
-\x60\x82\
-\x00\x00\x00\xf0\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x00\xa2\x49\x44\x41\x54\x78\x9c\xed\
-\xd0\x41\x11\x00\x20\x00\xc3\x30\x0e\x6f\x28\xc0\x02\xfe\x2d\x80\
-\x8c\xf0\x68\x0c\xac\xb7\x31\xa0\xb5\xcf\x5d\xfb\x5c\xd9\x30\xe5\
-\xf8\x0f\x3a\x40\x07\x68\x1d\xa0\x03\xb4\x0e\xd0\x01\x5a\x07\xe8\
-\x00\xad\x03\x74\x80\xd6\x01\x3a\x40\xeb\x00\x1d\xa0\x75\x80\x0e\
-\xd0\x3a\x40\x07\x68\x1d\xa0\x03\xb4\x0e\xd0\x01\x5a\x07\xe8\x00\
-\xad\x03\x74\x80\xd6\x01\x3a\x40\xeb\x00\x1d\xa0\x75\x80\x0e\xd0\
-\x3a\x40\x07\x68\x1d\xa0\x03\xb4\x0e\xd0\x01\x5a\x07\xe8\x00\xad\
-\x03\x74\x80\xd6\x01\x3a\x40\xeb\x00\x1d\xa0\x75\x80\x0e\xd0\x3a\
-\x40\x07\x68\x1d\xa0\x03\xb4\x0e\xd0\x01\x5a\x07\xe8\x00\xad\x03\
-\x74\x80\xd6\x01\x3a\x40\xeb\x00\x1d\xa0\x3d\x9d\xfa\x04\x75\x0c\
-\x2b\x93\xd0\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x00\x68\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x00\x1a\x49\x44\x41\x54\x58\x85\xed\
-\xc1\x01\x01\x00\x00\x00\x82\x20\xff\xaf\x6e\x48\x40\x01\x00\x00\
-\x00\xef\x06\x10\x20\x00\x01\x47\x01\xa0\x88\x00\x00\x00\x00\x49\
-\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x04\xe8\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x04\x9a\x49\x44\x41\x54\x58\x85\xc5\
-\x97\xd9\x76\xe2\x46\x10\x86\xbf\x66\x11\x12\x60\x50\x9c\xc4\x9e\
-\xf1\x24\x39\x59\xde\xff\x9d\x72\x31\x9e\x49\x1c\xcf\x18\x6c\x23\
-\x19\x24\xa8\x5c\xd4\xdf\xa8\x91\x71\x72\x97\xd4\x39\x1c\x89\x56\
-\xd7\xf6\xd7\xd6\x0d\x58\x09\x16\xf8\xcf\xc9\x02\x58\x19\xa4\x7c\
-\x09\xac\x21\x58\xf7\x91\x4b\x20\x1a\x96\x25\xef\x93\x44\x4a\x5c\
-\xb3\x64\x6d\x9b\xac\xed\xf4\x7e\x00\x1e\x7a\xf2\x97\xc0\x3a\xf4\
-\x16\x0e\xc0\x05\x30\x00\xaa\x44\x59\x90\x11\x13\xd8\x0d\x21\x8c\
-\x81\x71\xcf\xa5\x16\xac\x81\xac\x95\x11\x51\xb9\x01\x0d\x90\x4b\
-\xfe\x23\x30\x3c\x75\xd8\xf7\x2d\xc0\x7e\x11\x34\x63\xb0\x99\xd6\
-\x33\xb0\xf7\xf0\x50\x82\xe5\x60\x13\xb0\x82\x57\x64\x85\xbe\x4d\
-\xb5\xf7\xca\x79\xc1\xd7\x2c\x93\xec\x5f\xc1\x2e\xfa\x10\x02\xf6\
-\x01\xf8\x24\x24\x0c\x78\x01\x0a\xd8\xbd\x87\xec\xa3\xbc\x00\x58\
-\xc8\x8b\x73\x94\x7e\x9b\xc0\xee\x06\xb2\x5b\x21\x92\x4b\xdf\x1a\
-\xb8\x81\x70\x0b\x30\x92\xf2\x80\xc3\x3e\x96\xf2\x1b\xe0\xde\x19\
-\xb2\xfb\x44\xf9\x04\x0f\x91\x71\x1a\xf7\xe8\xcc\x4c\xca\xf4\xcb\
-\xbe\xc2\xa6\x80\xd9\x18\x78\x07\x7c\x94\x8e\x41\x0f\x01\xfb\x4e\
-\xff\x2b\x08\x15\xd8\xb5\xbe\xfd\x09\xcc\x1d\x8d\xd5\x0c\x4a\x5c\
-\x70\xa8\xcf\x03\x60\x73\xa0\xc5\xf3\xa5\xd2\xf3\x80\x27\xf4\x0e\
-\x78\xc2\xe3\xff\x0d\xb0\x82\xb0\x19\x25\xdc\x63\x29\xcf\xe5\xdd\
-\x1a\xb8\x92\xc5\x39\x94\x4f\x82\x71\x02\x66\x1d\x0f\x24\x08\xe5\
-\xc0\xb3\x94\x95\x42\x38\x03\xee\xf0\xf0\x64\x10\x9e\x12\x07\x3b\
-\x28\xdc\x52\x9b\xc0\xcb\xb5\x18\x83\xa0\x5c\x48\x68\xa4\x39\x1e\
-\x86\xb9\xf8\x07\xfa\x1f\xd7\x22\x6d\xc4\xbb\x93\xac\x00\xdb\xf7\
-\x4a\xcc\x63\xee\xc5\x10\xbc\x73\x41\x15\x30\xfd\x8c\xc7\xb2\x96\
-\xf5\x23\xc1\x56\x43\x75\x09\xd3\xb5\x23\x75\x8e\x6c\x21\x99\x35\
-\x30\x95\x03\x53\xba\xd2\x1b\x49\xf6\x1c\x0f\xc1\x97\x14\x81\x09\
-\xb4\x2f\x49\x6d\x16\x8a\xb5\xe1\x96\x5d\xc3\x74\xe5\x48\xbd\x49\
-\xb1\xce\xbf\x17\x8f\x09\x89\x58\xb6\x2d\x3c\x36\x78\xe8\xfa\x21\
-\x68\x4a\x58\x3c\x74\xc6\x30\x54\x3e\xe4\x78\xd2\xfc\x25\xc1\x85\
-\xfa\x41\xee\x49\x67\xb3\xee\x3f\x05\x9e\x37\x5f\x61\x73\x29\xde\
-\x3c\x91\x09\x2c\x9e\x49\x42\x15\x0d\xc8\xbc\x8b\x91\x0b\xc6\x52\
-\x1e\xb4\x62\x5c\xe1\x89\xf6\x20\x48\x73\x3d\x83\xa0\x9d\xba\x0c\
-\xa6\xae\x9c\x06\x66\x0f\xda\xd7\xe2\x3d\xe5\x12\xef\x31\x43\x68\
-\x4c\xfb\x63\x1f\x20\x40\x50\xd7\x0a\x8f\xde\xb9\x82\x32\xdb\x0c\
-\x82\xfa\xbb\x35\x12\x36\x06\xee\x7b\xbd\xfd\xca\x8d\x8e\x7c\xb4\
-\x60\x7b\x7f\x86\x1d\xd8\x33\x5e\x86\x03\xba\x24\x3f\xa9\x82\x61\
-\x52\xdf\x49\x93\xa9\xd3\x3d\xda\xc7\xbd\x7b\x63\xe9\x30\xbb\x4b\
-\x1c\x8a\x94\x4e\x59\xc9\x0c\x55\xe7\x6c\xc7\x30\x82\xf1\x21\xf1\
-\x86\xe4\xbd\x4d\x84\x8c\x80\xc6\x3d\xb7\x35\xea\x4c\x78\x46\x5b\
-\xd2\x1f\x52\x4a\x1d\x78\x35\x3d\x07\xc9\x73\x7f\x86\xb9\x4f\x87\
-\x9e\xc0\x3e\x9d\x6b\xcf\x96\xbc\xbf\xda\x17\x85\xed\xa0\x51\x57\
-\x0b\xd6\x6d\x0e\x06\xf5\xb0\x67\xc0\x30\x81\x7d\xa5\xdf\x32\x99\
-\x27\x7d\x83\x4f\x46\x6e\xdf\x98\x94\xa1\x55\x29\xf5\xac\x2d\xfa\
-\x75\xdf\xe2\x09\xa7\x79\x1e\x62\xdb\xbe\xa6\x3b\x03\x44\x0a\xaf\
-\xdf\xad\x00\x3b\xee\x8b\x39\x60\xca\x70\x53\x19\xce\x34\x58\xc0\
-\x4b\xb3\x94\xe2\x02\x6f\xb9\x6a\x36\x96\x42\xdc\x00\xdf\x4a\xb8\
-\x49\xb6\x0e\x21\x16\x3b\x20\x32\x76\x1f\xf9\xa2\x01\x3b\x08\x43\
-\x95\xdb\xd6\x0f\x24\x34\xfe\xdf\xc0\x33\x7f\x23\x21\x9f\xff\x61\
-\x1a\xee\x38\x9e\x76\xd6\x25\x2c\xef\x3a\x07\x79\xc0\x4b\x38\xee\
-\xd9\xc1\x49\x08\xc6\x75\xe2\xf5\x16\x35\x0a\x51\x05\x2f\x3f\xc9\
-\xf3\x73\x99\x7e\xb4\x40\x1e\x7e\x80\xe5\x53\xb7\xbc\x2a\xa4\x1c\
-\x37\x6c\xbc\x89\x5f\x06\x09\xe3\x06\xea\xb2\x63\xa2\xf6\x86\x14\
-\x0f\x1a\xf9\x2d\x3e\xdd\xfa\x67\xc1\x94\x22\xd4\x7f\xe0\xed\x36\
-\xf8\xb3\x4c\x86\x57\x36\x93\x31\x27\x21\xd8\xfb\xe6\xe2\x19\xec\
-\x86\x6e\xe0\x14\xf8\x49\xe6\x77\x3c\x9e\x7b\xa0\x74\xa4\xea\x41\
-\x97\xa0\xf5\x50\x02\xd5\x21\x8f\x7b\x7f\xc6\xbb\x9f\x8e\x77\x2c\
-\xa1\xb8\x95\xcc\x6d\x6a\x00\x6e\x40\x78\x06\x1b\xd0\xc5\x7c\x24\
-\x6f\x0e\x10\x36\x60\x2d\xf0\x0c\xe1\xe5\x3c\x00\x36\x77\x19\xa0\
-\x83\xeb\x67\x7c\x96\x6c\x24\x73\xe5\xf9\xd3\x45\x31\x0d\x41\xe3\
-\x93\x2d\x3c\x42\x7d\xe1\x9e\xb2\x96\xf5\x5b\xe5\xc7\x71\x8c\xbe\
-\x4d\x36\x56\xe8\x1a\x3c\xd1\xd6\xc0\x25\x54\x33\x47\xc3\x66\x5a\
-\x3f\x09\xc1\x57\xe0\x07\xdf\x6c\x4b\x60\x06\x2f\x41\x93\x74\x42\
-\x67\xb2\x0e\x97\x55\x05\x85\xd1\x75\xcf\xd8\xac\x0a\x3c\xdb\x77\
-\x38\xf3\xc2\x8d\xaf\xa7\x30\x9d\xe3\x13\x76\xe3\x8e\x87\x4d\x62\
-\x40\x30\xb0\x03\x5e\xeb\x01\xf8\x04\x45\x34\x86\x0e\x56\xf0\x30\
-\x4c\x75\xf4\x36\x21\x18\xe2\x1c\x59\x38\x82\xc7\xbd\x17\x6e\xcc\
-\xf4\x8b\x64\xc5\xd9\x72\xee\x50\x63\x17\xba\x34\xf4\x2f\x26\x0b\
-\xa8\x7e\xec\x2e\x23\xff\x76\x31\x01\xe7\xad\x3e\x74\x65\x7d\x72\
-\x31\xf9\xed\xcc\xc5\xe4\xd8\xdb\xf7\x82\x6d\x20\x2b\x33\x1c\xfe\
-\x81\x7f\x6f\x32\x79\x30\x84\x71\x7a\xf7\xcb\x75\x30\x6e\x7d\xd4\
-\x8e\x6a\xbc\x67\xec\xc5\xdb\xd0\x0d\xa6\x35\xc9\xd5\xec\x8d\xcb\
-\x69\xf4\xe2\x98\x70\xc3\xe4\x7d\xa2\xf7\x09\x6c\x35\x3b\x26\x95\
-\x94\x18\xdd\xe5\x54\x06\xb9\xb0\x18\xf3\x9e\xc3\x6b\xf8\x9f\xaf\
-\xe7\x7f\x03\x88\x7c\xd3\x3b\xed\x32\x4f\xdf\x00\x00\x00\x00\x49\
-\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x00\x8f\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x00\x41\x49\x44\x41\x54\x58\x85\xed\
-\xd3\xa1\x11\xc0\x20\x14\x04\xd1\x85\x9a\x28\x00\x93\x5a\x70\x14\
-\x83\x4a\x31\x99\xa1\x81\x14\x85\xc2\x22\xf9\x66\x9f\x3a\xb7\xea\
-\x40\x92\x14\x2c\xed\x51\xda\x98\x40\xbd\x54\xfd\xfe\xb7\x3f\x00\
-\xf9\x4a\x50\x3a\xf0\x05\x92\x24\x85\x5b\x1c\x18\x0a\x07\xd4\x09\
-\xe9\x09\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x00\xd2\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x00\x84\x49\x44\x41\x54\x58\x85\xed\
-\xd2\xb1\x0d\x82\x50\x18\xc4\xf1\xff\xf7\xdc\x81\xc4\x3d\x18\x80\
-\x4d\x2c\x6c\xe8\x1c\x41\x98\x81\x06\x13\x6b\x67\xb0\xb4\x77\x10\
-\x13\x76\xd0\xb3\x52\x21\x24\x76\x0f\x9a\xfb\x75\x97\xf7\x25\x77\
-\xc5\x03\x33\x33\xb3\x95\xc5\x34\x2a\xaa\x63\xb3\xc9\x59\x78\x6b\
-\x9b\x27\x84\x66\x03\xca\xba\xab\x90\x2e\xc0\x36\xe7\x80\x80\x01\
-\xb4\xbb\x9f\x0e\x57\x80\xf4\x7d\x91\xfa\xdc\xe5\x00\x82\xe2\x45\
-\x3a\x7f\x72\xfa\x77\xbc\x84\xdf\x80\x88\x1a\x78\xe4\x2e\x0c\x18\
-\x14\xec\x47\x79\x6c\xf9\x4f\x68\x66\x66\xb6\xba\x37\x95\x79\x1e\
-\x09\xc0\xb2\x67\x2f\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\
-\x82\
-\x00\x00\x00\x85\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x00\x37\x49\x44\x41\x54\x58\x85\xed\
-\xce\xc1\x0d\x00\x30\x08\x03\x31\xd4\xfd\x87\x04\x31\x08\x1d\x02\
-\x9e\xbe\x7f\x22\x47\x2c\xca\xea\xc9\xea\xd9\x7c\xbc\xcd\xf8\x22\
-\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x80\x0f\
-\x7e\x19\x07\x85\xa1\xbf\xac\xe9\x00\x00\x00\x00\x49\x45\x4e\x44\
-\xae\x42\x60\x82\
-\x00\x00\x01\xd2\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x01\x84\x49\x44\x41\x54\x58\x85\xed\
-\x97\xcd\x4a\x23\x41\x14\x85\xbf\xd3\xba\xd5\x85\x32\xfa\x26\xe9\
-\x0c\x8a\x2f\x90\x61\x04\x03\x3e\x84\x60\x56\x62\xe6\x11\x26\x82\
-\x0b\x23\xb8\x1f\xdc\x0d\xd8\xe0\x22\x2f\x30\x20\xa6\x7d\x13\x15\
-\x07\x24\x6b\xfb\xcc\xc2\xae\x20\x49\x6c\x31\x76\x74\xc0\x3e\xab\
-\xe2\xd6\xa5\xce\x57\x3f\x14\xf7\xc2\x67\x97\x46\x03\xf5\x33\xaf\
-\x65\xb8\x8d\xa8\x0b\xbe\x94\x61\x62\xb8\xc5\xf4\x23\xd4\xe9\x37\
-\x75\xf1\x2c\x40\x9c\x78\x0f\x7c\x30\x09\xac\x24\x65\x58\xfb\x69\
-\x53\x87\x63\x00\x71\xe2\x75\xf0\x1f\xe0\x1e\xab\x15\x3d\xd0\xbb\
-\xdc\xd6\xdf\x32\x5c\xbf\xfe\xf6\x52\x36\x47\x03\xb9\x0b\x2c\xca\
-\xda\x08\x27\x31\x1f\x92\x6c\xef\x4b\x08\xab\x95\x36\x75\x5a\x86\
-\x71\x50\xbe\x91\xd3\x5a\x62\x09\xff\xca\x70\x1b\xf8\x0e\x10\x0d\
-\xb3\x44\x1d\x20\x7a\xa0\x57\xa6\xf9\x88\x7a\x00\x12\x71\x08\x0c\
-\x01\xc2\x83\x2b\xeb\xd8\x27\xe9\x6a\x4b\x77\xf9\x70\x65\x0c\xe0\
-\xa3\x54\x01\x54\x00\x1f\x0e\x30\xff\x52\x42\x7c\xe6\x1d\xe4\x9f\
-\xc0\xc2\x2b\xd7\x1e\x60\xfd\x48\x9b\x3a\x29\x4a\x2a\x3c\x81\xf8\
-\xdc\xab\xc8\xc7\x53\x98\x03\x2c\x20\x77\xe3\x73\xaf\x4e\x0d\xf0\
-\x1e\x2a\x04\x48\x37\x75\x8d\xb5\x0b\x0c\xa6\x58\x7b\x80\xd5\x4a\
-\x37\x75\x5d\x94\xf4\xe2\x1b\xc8\xef\xb0\xf0\x1e\xdf\xa2\xff\xfb\
-\x0a\x2a\x80\x0a\xe0\x5d\x01\x0c\xb7\xf0\x58\x40\xce\xca\xac\x96\
-\x78\x39\x1f\xde\x8c\x01\x60\xfa\x00\xd9\x1c\x8d\x59\x01\xc0\xe3\
-\xda\x36\x69\x08\x0c\x3f\xa2\x08\x75\x8c\xbf\x21\x77\x6b\x89\x05\
-\xf4\x9e\xd4\x70\x6f\x52\xbe\xf3\x86\xf0\x11\x90\x45\xa8\x13\xe6\
-\x26\x35\x26\x1d\x66\xf7\x36\x9e\x6f\x4c\x82\x42\x6b\x96\x97\xce\
-\x2b\xa3\xf3\x53\xea\xc6\x26\x9d\xd4\x9a\x55\xfa\x07\xf1\xe4\x84\
-\x86\xea\x09\x57\xf9\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\
-\x82\
-\x00\x00\x04\x8a\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x04\x3c\x49\x44\x41\x54\x78\x9c\xed\
-\x9b\x4f\x88\x1c\x45\x14\xc6\xbf\xd7\x33\x99\xc4\x3f\x2b\x62\x16\
-\x15\x24\x78\x11\xff\x5c\x04\x77\x3b\x7a\xf0\xe0\x22\x26\x12\xc1\
-\x3f\x2c\x22\x1e\x04\x35\x9a\x99\xd9\x24\x33\xbb\x11\x09\x28\xea\
-\xb8\x98\x80\x41\x31\x6e\x8f\xba\x99\x4e\xc4\x1c\x44\xd1\x53\x0c\
-\x62\x64\x83\xb0\x90\x83\x91\xd9\x59\x30\x20\x82\x78\x10\x11\x49\
-\x84\x28\xea\x06\x75\x37\x5d\x9f\x87\x5d\x35\xe9\xea\x68\x26\xa9\
-\xaa\x2e\x70\x7e\xc7\x3a\xd4\xf7\xea\xab\x57\xaf\x5f\x75\xcf\x00\
-\x3d\x7a\xf4\xf8\x3f\x23\xa6\x26\x0a\xcb\x13\xcf\x43\xe4\x19\x01\
-\x48\xca\xb6\x99\xb8\x36\x6e\x6a\x6e\x9b\x04\xc6\x66\x12\x79\x16\
-\x40\x81\x40\x11\x82\x46\x58\x6d\x0e\x19\x9b\xdb\x22\xe6\x0c\x38\
-\x6d\x2e\x0a\xc8\xfd\x03\x23\x13\x83\x06\xe7\xb7\x82\x31\x03\x08\
-\xa8\xd4\x50\x5f\xa0\xe4\xe3\x70\xe4\xd5\xeb\x4c\x69\xd8\xc0\x98\
-\x01\x02\x30\x63\xb8\x1f\x2a\x38\xb8\x7a\xe3\xeb\xab\x4c\xe9\x98\
-\xc6\xe4\x11\x38\x13\xab\x98\x24\x53\x83\xe5\x97\xfb\x1d\x68\x75\
-\x8d\x0b\x03\x00\xe0\x7a\x91\xd2\x81\x5b\xd7\xef\xe8\x73\xa4\x77\
-\xd6\x58\x33\x80\xd4\x8e\x44\x38\xbf\xec\x82\x7d\xd7\xd4\xa2\xe5\
-\xb6\x34\xcf\x05\x6b\x06\x88\x40\x21\x55\x17\x08\xdc\x7e\xe9\x3c\
-\xde\x19\x6a\x34\x8a\xb6\x74\xbb\xc5\xf6\x11\x50\x80\xa4\x33\x61\
-\x78\xee\xe8\x65\xbb\x00\x1a\x6b\xc2\xce\x07\x07\x35\x80\x0a\x4c\
-\x9b\x20\x8f\x85\xe5\xe8\x45\xfb\xda\xff\x8d\x9b\x22\x28\x4c\xf7\
-\x08\x80\xc8\xd6\xb0\xda\xdc\xea\x44\xff\x5f\x70\xf5\x14\x00\x80\
-\x44\x1b\x21\x77\x0c\x96\x27\x1e\x77\x18\x83\x86\x4b\x03\xb2\xba\
-\x45\x88\x48\x6b\x75\x25\x1a\x76\x19\xc7\xa9\x38\x35\x60\xa9\x5b\
-\x4c\x9b\x10\x10\x78\x37\xdc\x10\xdd\xe1\x32\x96\xbf\xc5\x73\xd0\
-\x24\xa0\xd5\x84\x12\x02\xec\x0b\xab\xd1\xcd\xae\x83\xc9\xc3\x00\
-\x00\x42\xea\x85\xf1\x22\x10\x1f\x0d\x6c\xdc\x79\x83\xcb\x48\x72\
-\x32\x00\x10\x0a\x33\x6a\xc2\x4a\x49\x8a\x07\x6f\xda\xf4\xda\xd5\
-\xae\xe2\xc8\xcd\x00\x60\xb1\x26\xa4\x4d\x10\xf0\xaa\xc2\x49\x35\
-\x75\x63\x75\xf2\x72\x17\x31\xe4\x6a\x00\xb0\x64\x82\x7e\x6f\xb8\
-\xb6\xc4\x85\x03\xb7\xd4\xa2\x4b\x6c\xeb\xe7\x6e\x00\xb0\x78\x6f\
-\xa0\xfe\x3e\x61\x20\x59\xc0\xfe\xa1\x47\xde\x5a\x61\x53\xdb\x0b\
-\x03\x00\x40\x00\x85\x74\x26\x10\xb7\xcd\x95\x7e\x7d\xcf\xe6\xe5\
-\xc9\x1b\x03\x00\x00\x92\x61\x82\xe0\x9e\x13\xc7\xfa\xf7\xa0\xd1\
-\xb0\x12\xab\x5f\x06\x00\x80\x88\x62\xea\x06\x49\xf2\xe1\xf0\xe8\
-\xca\x97\x6c\xdc\x20\xfd\x33\x00\x84\x80\x0a\xd4\x5e\x31\x3e\x11\
-\x96\x9b\x4f\x99\x56\xf3\xd0\x80\x45\x44\x24\xd1\xca\xa2\x60\x7b\
-\x58\x8d\x2a\x26\x75\xbc\x35\x80\x00\x32\xba\x45\x80\x98\x0c\x2b\
-\xd1\xfd\xa6\x74\xbc\x35\x00\x00\x24\xbb\x65\x16\x00\x4d\x53\x1a\
-\x5e\x1b\x00\xe0\x4c\x75\xcf\xd8\x63\xd1\x9b\x97\x93\x59\x2c\x2d\
-\x3d\x6b\x93\xde\x34\xa5\xe1\xaf\x01\x02\x28\xa2\x90\xde\x7f\x81\
-\x6c\x6a\xb7\x6a\x6f\x98\x92\xf1\xd4\x00\x01\x49\x6d\xf1\xa4\x3c\
-\x37\x13\x9b\x5b\x3c\xe0\x6f\x0d\x08\xb4\x9d\x17\x44\x9d\x78\xf3\
-\x36\xd3\x42\x1e\x66\x80\x04\x7a\xe5\xe3\xdb\xed\x2b\x7e\xdc\x92\
-\xf1\x8d\xe1\xbc\xf1\x2b\x03\x08\x6d\xf1\x02\x7e\x48\xae\x58\x8f\
-\xf1\x71\xbd\x27\x30\x80\x47\x06\x48\x00\x41\x6a\xf1\x38\x54\xbc\
-\x30\x79\xa0\x13\x57\x16\x6c\xa9\xfa\x71\x04\x88\x00\x72\xfa\xce\
-\x13\xf8\x9c\x5c\x7e\xf7\xa7\x3b\xeb\xbf\xd9\x94\xf6\x21\x03\x24\
-\xbd\xf3\x20\xbe\x2e\x26\xea\xce\x4e\x5c\xf9\xd9\xb6\x78\xae\x06\
-\x70\xb1\xd7\x09\x52\x83\xdf\x17\x83\x64\xcd\x67\x7b\xc6\x8e\xb9\
-\x88\x21\xcf\x23\x20\xa2\x6f\xc0\x4f\xc2\x60\xed\xe1\x5d\xf5\x6f\
-\x5c\x05\x91\x4b\x06\x50\x32\x76\x1e\x38\xa1\x02\xdc\xd5\xde\xbd\
-\xf9\x0b\x97\xb1\xe4\x61\x80\x08\x35\xdd\x05\x12\xc3\xb3\x93\xf5\
-\xc3\xae\x83\x71\xfc\x71\x94\x59\x3b\x4f\x11\x3e\xd4\x89\xeb\x53\
-\x2e\x63\xf9\x0b\xa7\x35\x40\x20\xba\xe1\x64\xb5\xdd\x1a\x7d\xdf\
-\x65\x1c\xa7\xe2\x32\x03\x0a\xe9\x01\x01\x9f\x9e\x89\x47\x63\x87\
-\x31\x68\x38\x31\x80\x59\x3b\x0f\xbc\xd2\x6e\xd5\x73\xff\x99\x8c\
-\x83\x23\x20\x81\x40\xeb\xf2\xf6\x76\x5a\xb5\x27\x6d\x5c\x6e\xba\
-\xc5\x76\x06\x64\xdc\xec\xf0\x41\xdf\x95\xc7\x37\xf8\xb0\x78\xc0\
-\x62\x06\x90\x08\x24\xdd\xe2\x02\xd3\x17\xff\xd1\xf7\xe0\xf4\x78\
-\xfd\xa4\x2d\xdd\x6e\xb1\xf9\x43\xc9\xf4\xe2\x67\x0b\x25\xdc\x3b\
-\xbd\xf7\xd1\xdf\x6d\x69\x9e\x0b\xae\x1e\x83\x5f\xcd\xcb\xb2\x75\
-\x47\x9a\x23\xbf\x38\xd2\x3b\x6b\x5c\x18\xf0\x1d\xa9\xd6\x1c\x69\
-\x8d\xfc\xe0\x40\xab\x6b\x4c\xfe\x61\x22\xeb\x05\xfe\x71\x55\x48\
-\xd6\x76\xe2\xb1\x6f\x4d\xe9\x98\xc6\x58\x06\x64\xdc\xec\xe6\x44\
-\xa9\x75\xb3\xad\x2d\x5f\x9a\xd2\xb0\x81\xc1\x0c\xf8\xe7\x13\x16\
-\x21\x14\xf0\xbe\xf6\xee\xb1\xb6\xa9\xf9\x6d\x61\xf0\x5f\x63\xc1\
-\x76\x21\x12\x40\x12\x80\x2f\xb4\x5b\xa3\x9f\x18\x9b\xbb\x47\x8f\
-\x1e\x3d\x2c\xf1\x27\x17\xaf\x43\xaf\x5e\x06\xce\xc3\x00\x00\x00\
-\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x08\xd7\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x08\x89\x49\x44\x41\x54\x78\x9c\xed\
-\x5b\x6d\x70\x54\xd5\x19\x7e\xde\x73\x77\x37\xb0\x24\x7c\x64\x11\
-\x13\xd4\xd1\xa0\x65\x30\x54\x66\x60\xb3\x50\xd4\x46\xb0\x76\xa4\
-\x1d\xc1\x62\xbb\x56\xed\xa8\x80\x24\x21\x40\x56\x60\xac\x1d\x9c\
-\xd1\x4b\x5a\xa9\xf5\x2b\x26\xbb\x60\x08\x04\x0a\x2a\xd3\x19\xd3\
-\x11\xa6\x38\x80\x4c\x6b\xc3\x50\x0b\x21\x1b\xed\x50\x05\x3a\x7e\
-\x80\x94\x49\x88\x95\xcf\x60\x24\xd9\xdd\xf3\xf6\x47\x10\xee\xc7\
-\xee\x66\x6f\x72\x37\x86\x36\xcf\xbf\xfb\x9c\xe7\xbc\xfb\xdc\x77\
-\xcf\x3d\x7b\xee\x39\xef\x02\x03\x18\xc0\x00\xfe\x9f\x41\x7d\xf1\
-\x21\x13\xe7\x06\xaf\x52\x32\xa8\x10\x90\xb7\x80\x69\x1c\x08\x63\
-\x98\x31\x9c\x80\xa1\x00\x14\x80\xce\x01\x38\x07\xe6\x63\x20\x1c\
-\x02\x70\x50\xc4\x68\xcf\xfe\xda\xb2\x23\xe9\xf6\x96\xb6\x04\x78\
-\x8b\x83\x37\x0a\xc2\x1c\x66\xcc\x02\x61\x42\x0f\xc3\x1c\x61\xf0\
-\x0e\x21\x79\x63\xe3\xba\xc7\xc3\x00\xb1\xad\x26\x61\x7b\x02\x98\
-\x7c\x25\xc1\xbb\x19\xf4\x24\x80\xe9\xf6\xc6\xc6\x87\x04\xaa\x90\
-\xec\x7a\xa3\x69\x6d\x49\xc4\xae\xa0\xb6\x25\xc0\x5b\x5c\x35\x9d\
-\x88\x5e\x00\x50\x60\x57\xcc\x78\x60\xe0\x28\x98\x57\x34\xad\x0d\
-\xbc\x66\xc7\x88\xe8\x75\x02\xa6\xcc\xaf\xbc\x3a\xaa\x88\x97\x09\
-\xf8\x45\x12\x99\x24\xe0\x3d\x10\xd7\x4b\x29\x0e\x03\xb1\x4f\x1d\
-\x44\xa7\xa4\xe2\x68\x8b\x7e\x1d\x8b\x29\x83\xa2\x59\x60\xc7\x30\
-\x62\xe4\x49\xa6\xb1\x04\x9e\x0a\xc2\x0f\x01\x0c\x4e\x62\x7c\x0f\
-\xa4\x28\x6d\x5c\xb7\xf8\xa3\xde\xf8\xef\x55\x02\x0a\x16\x04\x27\
-\x83\xb1\x15\x40\x6e\x9c\xe6\x36\x00\xdb\x89\xb0\x8d\x14\xb1\x73\
-\xff\xea\xc5\x27\xad\xc4\x9e\xba\xb4\x62\x70\xe7\x57\x8e\x3b\x09\
-\x98\x09\xc2\xac\x04\x9f\x71\x01\xc0\xbc\x70\x4d\xe0\x0f\xd6\xdd\
-\x77\xa1\xc7\x09\xf0\x16\x87\x1e\x22\xe2\x0d\x00\x32\x4c\xa6\x98\
-\x83\x1d\x8a\xf3\x77\xff\xac\x5e\x78\xba\xa7\xf1\xb5\xc8\xf7\xab\
-\x2e\xf7\x88\xec\x22\x22\x7a\x86\x81\x51\x26\x01\xd3\xca\x70\xee\
-\x97\xcf\xa0\xbc\x5c\x5a\x8d\x6d\x3d\x01\xaa\x2a\xbc\x27\x46\x3e\
-\x4b\xe0\xe5\x86\x16\x49\x84\x0d\x22\x8a\xf2\x86\xda\xc0\x71\xcb\
-\x71\x53\xc0\x6d\xf3\x9e\xcf\xea\x70\xb8\x97\x81\xf8\x09\x00\x99\
-\x86\xe6\xad\xed\x8a\xf2\xf0\xc1\x57\x17\x9d\xb7\x12\xd3\x5a\x02\
-\x54\x55\x14\xb4\x8c\xdc\x0c\xe2\x07\x74\x3c\xa3\x19\x02\xb3\xc3\
-\x6b\x02\xfb\x2d\xc5\xeb\x21\xa6\xcc\x0f\x5e\x1b\x53\xb0\x05\xe6\
-\x09\xf7\x03\xc5\x85\x69\x0d\xa1\xc0\xb9\x54\x63\x09\x2b\x1f\xec\
-\x6b\xcd\x5e\x61\xbc\x79\x02\xf6\x31\x62\x05\x7d\x75\xf3\x00\xd0\
-\x50\x1b\x38\xee\x74\x47\x0b\x19\xd8\x6c\x68\x9a\x28\x3b\x79\xb3\
-\xdf\xff\xa6\x92\x6a\xac\x94\x85\xbe\x92\xd0\xcf\x19\x08\x69\x39\
-\x22\xda\x34\xa4\x23\xcb\xbf\x77\x7d\xe9\x99\x54\xe3\xd8\x85\xe3\
-\xfb\xde\x89\xb6\x34\x6d\xdf\x32\xda\xd7\xd8\x0e\xe0\x2e\x5c\x1a\
-\xcd\x34\xf6\xcc\xa0\xb6\x41\xcd\x4d\x3b\xff\x9c\x4a\x9c\x94\x1e\
-\x81\xc9\x25\xa1\x02\x09\xde\x03\x60\xd0\x65\x96\xdf\x08\xd7\x04\
-\x1e\x49\xc7\xea\xcc\x2a\x0a\x8a\x83\x4b\x40\x78\xc5\x40\x3f\x1a\
-\xae\x09\xbc\xd6\x5d\xdf\x6e\x1f\x81\xc9\x8b\x56\x79\x62\xc0\x56\
-\xe8\x6e\x1e\xfb\x33\x3b\x86\x16\xf5\x87\x9b\x07\x80\xf0\xda\xb2\
-\x2a\x80\x7f\x6f\xa0\xd7\x79\x8b\x57\x4d\xea\xae\x6f\xb7\x09\x90\
-\x11\xf9\x02\x81\xaf\xb9\x44\x30\x9a\x63\x4e\x9a\x5d\xbf\x71\xee\
-\x05\xeb\x56\xd3\x05\xe2\x33\x2e\x2a\x05\xe1\xef\x1a\xd2\x45\x24\
-\xd7\x4d\x53\x55\x47\xb2\x9e\x49\x13\xe0\x2d\xae\xbc\x1d\x84\x79\
-\x1a\x8a\xa5\x82\x9f\x7e\xb0\xaa\xac\xb9\x37\x76\xd3\x81\x4f\x42\
-\x81\x0e\x25\x2a\xef\x03\xf0\xa5\x86\x9e\xd4\xd6\xe2\x59\x98\xac\
-\x5f\x92\x04\x30\x11\x89\xe7\x0c\xdc\xe6\xf7\xab\x03\xfb\x7a\x6e\
-\x33\xbd\x68\xa8\x5d\xd2\x0a\xc6\x4a\x2d\x47\x84\xa7\x27\x3c\xfc\
-\xe2\x90\x44\x7d\x12\x26\xc0\x57\x14\x2a\x04\x70\xbb\x86\x8a\x40\
-\xc4\xd4\xde\xdb\x4c\x2f\x32\x3b\xb3\xd6\x00\x38\xa6\xa1\x46\x3a\
-\xdd\xae\x92\x44\xfa\x84\x09\x60\x81\x5f\xea\x09\xd4\x84\xab\x97\
-\x7d\xd6\x6b\x87\x69\x46\xfd\xc6\xb9\x17\x88\x60\xf8\xa2\xc4\xb2\
-\x44\x6b\x83\xb8\x09\xf0\x2d\x5c\x9d\x03\x60\x86\x86\x8a\x28\x52\
-\x3e\x6b\x97\xc9\x74\xe3\x86\x93\x39\xaf\x33\xf0\xf1\x37\xd7\x04\
-\xbe\xe6\x53\x4f\xeb\x5d\xf1\xb4\x71\x13\x20\x63\xd1\x87\xa0\x59\
-\x24\x11\xf0\x6e\x43\xed\x92\x56\xdb\x9d\xa6\x09\x75\x75\xf7\xc7\
-\x88\x50\xa7\xe5\x04\xf3\xa3\xf1\xb4\x71\x13\x40\xa0\x99\x06\xe6\
-\x4f\x76\x99\xeb\x2b\xb0\x94\x46\xcf\x3f\x8e\xf7\x18\x98\x12\x70\
-\x71\xc6\xbc\x55\xcb\x49\x8e\xbd\x6d\xaf\xbd\xf4\xa3\x29\xf7\x74\
-\x23\x00\xed\xa8\x1d\x76\xc4\x73\xc2\x6b\xd4\x99\x12\x90\xe1\x76\
-\x7d\x0f\x80\xeb\x32\x43\xff\x68\x5a\xbb\xe4\x98\x51\xd7\xef\x51\
-\x5e\x2e\x01\xd6\x7d\x71\xcc\xe6\x7d\xca\x38\x8f\x80\xf8\xae\x81\
-\xd8\x63\xab\xb1\x3e\x04\xb3\xde\x3b\x31\xc6\x1b\x35\xa6\x04\x30\
-\xf3\xcd\xba\x6b\xc8\x8f\x8d\x9a\x2b\x05\x82\xa1\xf7\x4e\xb8\xd9\
-\xa4\x31\x12\x44\xb8\x41\x47\x30\xf5\xfb\xdf\xfe\x84\x70\x3a\x8c\
-\xde\xf3\x8c\x12\xf3\x08\x20\x64\x69\xaf\x49\x50\x9f\xbf\xeb\xdb\
-\x85\x21\xed\x6e\xa3\xf7\x2c\xa3\xc6\x3c\x07\xb0\x5e\x24\x98\x2d\
-\xed\xb1\xf5\x27\xd4\x6f\x9c\xd3\x01\x20\xaa\xa1\x5c\xf9\x7e\xd5\
-\xa5\xd5\xc4\x5b\x07\xe8\x36\x49\xa2\x42\xf6\x8b\x77\xfe\x74\x21\
-\x5e\x02\xda\x74\x02\x56\x4c\xc3\xe6\x4a\xc1\xb4\x39\x1b\x33\x00\
-\x68\xf7\x03\x3a\x0f\xd6\x95\x77\x6a\x35\xe6\x49\x10\xd0\xed\xa8\
-\xb2\xe4\xe1\xe9\xb1\x97\x7e\x7c\xed\x38\x3b\xcc\x40\xb5\x19\x35\
-\xe6\x49\x10\xf4\xb9\xf6\x9a\x84\x79\xe6\xbc\x52\xc0\x8a\x63\x8c\
-\x9e\xc0\x51\xa3\x26\xce\x24\xc8\x87\xb4\x97\x04\x7c\xc7\x66\x5f\
-\x7d\x06\x09\xa9\xf3\xce\x84\xc3\x46\x8d\x39\x01\x24\x74\x87\x8d\
-\xcc\xba\x4d\x91\x2b\x0a\x0c\x83\x77\xa6\x0f\x8d\x1a\x53\x02\xda\
-\x15\xda\x0b\x40\x7b\xfe\x3e\x69\xca\xfc\xe0\xb5\xb6\xbb\x4b\x37\
-\x54\x55\x10\x70\x8f\x96\x62\x85\xeb\x8d\x32\x53\x02\xba\xce\xd6\
-\x68\xaf\x96\x8b\x2a\x74\x8f\x51\xd7\xdf\xe1\x6b\x1e\xe1\x85\xfe\
-\x44\xf9\xdc\xd0\x51\x27\xc3\x46\x5d\xfc\x2d\x31\xd6\xbf\x45\x11\
-\xf1\x2c\x5b\xdd\xf5\x05\x84\xd0\x79\x66\x60\x67\x7d\x79\x79\xd4\
-\x24\x8b\xd7\x37\xe6\xa2\xcd\x00\x2e\x1f\x35\x33\xee\x9c\x38\x37\
-\x78\x95\xdd\x1e\xd3\x06\x55\x15\x0c\xfc\x4c\x4b\x11\x78\x53\x3c\
-\x69\xdc\x04\x5c\xdc\xf7\xdf\xa5\xa1\x32\x14\xa7\xe9\x38\xbc\xdf\
-\xc2\xd7\xea\x79\x10\xc0\x38\x0d\x75\x22\x33\xe7\xd4\xae\x78\xda\
-\x84\xbb\xc2\x04\x7e\x49\x4f\xd0\xa2\x89\x8b\x56\x5d\x6f\x8b\xc3\
-\x34\x22\xdf\xaf\xba\x98\xf1\x1b\x1d\x49\xf4\x4a\xbc\xe1\x0f\x24\
-\x49\x40\x63\x4d\xe0\x5d\x00\xda\xc9\xd0\x25\xa2\x72\x85\x1d\x26\
-\xd3\x09\xb7\xc7\x53\x0c\xfd\x6b\xef\xa9\x8c\xce\xf6\xea\x44\xfa\
-\x24\x27\x43\xc4\x20\x7a\x4a\xc7\x00\x8f\x4c\x2a\xad\x32\xed\xab\
-\xf5\x17\x78\x8b\x5f\x1a\x49\x8c\xa7\xb5\x1c\x33\x7e\xfb\xde\x86\
-\x5f\x99\x96\xc0\xdf\x20\xe9\xd9\x60\x78\x4d\x59\x3d\x18\xaf\x6b\
-\xf5\x42\xd2\x96\x29\xf3\x2b\xaf\xee\xa5\x57\xdb\x91\xef\x57\x5d\
-\x24\x5c\x7f\xd4\xd5\x10\x31\x0e\x00\x19\xc1\x64\xfd\xba\x3d\x1d\
-\xee\x14\xce\x27\xa0\xdf\x5d\xbd\x2e\xe6\x10\x6f\xdd\x54\x16\x34\
-\x16\x47\x7d\xab\x70\x67\x67\x57\x81\x71\x87\x86\x8a\x40\xa0\xa8\
-\xbb\xa2\xca\x6e\x13\x70\x60\x4d\xe9\x17\x52\xe0\x27\x00\x3a\x2e\
-\x91\x8c\x5b\x87\x77\xe0\x55\x80\xfb\xa4\xd6\xb8\x3b\xf8\x4a\x42\
-\x0b\x01\x5a\xa0\x67\xa9\x34\x95\xb2\x9d\x94\x4a\x64\x5a\xc2\x3b\
-\x8e\x8f\xf6\xcd\xf8\x1c\xa0\xd9\x97\xe3\x63\xe2\xe8\x82\xc6\xdc\
-\xe1\x63\x26\xef\xfa\xcf\xc1\xdd\x31\x8b\x9e\x6d\x02\x93\xb7\xd8\
-\x13\x00\xa1\x0a\xfa\x8d\x9c\xca\x70\x4d\xe0\xb9\x44\xbd\xb4\x48\
-\xb9\x46\xa8\x39\xbc\xf3\xc0\x68\xef\x0c\x37\x88\x6e\xd3\xd0\x5e\
-\xa7\xdb\x5d\x98\x3b\xe9\x07\x6f\xb7\x34\xed\x6a\x4f\x35\x96\x1d\
-\xc8\xf7\xab\xae\xeb\xbf\x7f\xa0\x86\xba\x26\xea\x4b\x37\x4f\xc0\
-\x3b\x99\x39\x27\xe7\x1e\xdd\xbd\x3b\xa5\x9a\x41\x4b\x55\x62\x79\
-\xa7\x73\x9f\x62\xd0\x16\x1d\xc9\xb8\x03\xe4\x6a\xf4\x16\x87\x6e\
-\xb1\x12\xab\x37\x98\xb0\xa0\x7a\x94\x3b\xdb\xf3\x17\x80\x1e\x33\
-\x34\x7d\x14\xe9\x88\x3d\x90\xe8\x37\x3f\x1e\x2c\x3f\xc3\x7e\xff\
-\x9b\xca\x91\x11\x2d\x2f\x82\x68\xa9\xa1\x29\x42\x84\xea\x0e\x38\
-\x57\x1e\x58\x53\xfa\x85\xd5\xb8\xa9\x60\xea\xd2\x8a\xc1\x91\xaf\
-\x1c\x8b\x41\x58\x0e\x60\x84\xae\x91\xb0\x83\x65\xc6\x83\x4d\x6b\
-\x4b\xce\x5a\x89\xd9\xe3\x49\xac\xa0\x24\xf4\x18\xc0\xd5\x00\x9c\
-\x86\xa6\xf3\x20\x7e\x59\x71\x52\x85\x95\x82\xc5\x64\x98\xa6\xaa\
-\x8e\xb6\x96\xec\x39\x20\xb1\x42\x57\xaf\x74\x19\x15\x79\xa7\x72\
-\x9e\xac\xab\xbb\xdf\xf2\x5c\xd4\xab\x59\xdc\x57\x52\x59\xc8\x10\
-\x6f\x01\xf0\xc4\x69\x3e\x0d\x60\x1b\x80\x6d\x8a\x0b\xbb\xac\x26\
-\x23\xdf\xaf\xba\xdc\xc3\x3d\x85\xa4\x60\x26\x4b\xdc\x0b\x42\xbc\
-\x65\x78\x04\xa0\xd2\x70\x4d\xd9\xfa\x1e\xd8\x07\x60\x43\xb9\xbc\
-\x6f\xe1\xea\xeb\x38\x16\xab\x04\x70\x5f\x12\x59\x04\x84\xdd\x90\
-\xf8\x2b\x04\xfd\x4b\x30\x7f\xc2\x8a\x72\xea\x02\xd3\x79\xb7\x23\
-\x1a\x13\x91\x68\x96\x64\xc7\xb0\x28\x23\x8f\x04\x8d\x05\xcb\xa9\
-\x00\xdd\x8d\xae\xbf\xd4\x24\x72\xde\x28\x89\x4b\xdf\xaf\x7e\xbc\
-\xa9\x37\xfe\x6d\xfb\x1d\x2f\x28\x0a\xfd\x08\x82\x9f\x07\x90\xde\
-\xc9\xb0\xab\x2e\xf9\xd7\x79\x27\x73\x6a\x7b\x32\xe4\x8d\xb0\x77\
-\x21\xa3\xaa\x62\x72\x6b\xf6\xbd\x12\xb4\x1c\x0c\x9f\xad\xb1\x41\
-\x9f\x81\x65\x45\x66\xe7\xd0\xf5\x76\xd6\x28\xa6\x6d\x25\xe7\x2b\
-\x5a\x35\x5e\x0a\x9e\x43\xe0\x59\x00\xc6\xf6\x30\xcc\x09\x30\xb6\
-\x13\xc9\x4d\x8d\x39\xa7\xff\xd6\x93\xff\x03\x74\x87\x3e\x59\xca\
-\x5e\x9c\x27\xa6\x83\x79\x3c\x40\xe3\x40\xc8\x03\x30\x0c\x5d\xcf\
-\xb8\x83\x41\x67\x89\x71\x0e\xc4\xff\x26\xc2\x61\x29\x71\xd8\x41\
-\xd8\xdd\x50\x53\x76\xa8\xbf\x94\xe3\x0e\x60\x00\x03\xf8\xdf\xc4\
-\x7f\x01\x33\x41\xc7\xce\x61\x76\x81\xea\x00\x00\x00\x00\x49\x45\
-\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x04\x77\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x04\x29\x49\x44\x41\x54\x78\x9c\xed\
-\x9b\x4f\x88\xdb\x45\x14\xc7\xbf\x6f\x92\xad\x55\xd9\x5e\xb6\x78\
-\xa9\xc5\x9b\x7f\xc0\x93\x95\x1e\xbc\x18\x6a\x92\x1a\xa1\x5b\x1b\
-\xb2\xa2\x54\xb0\xdd\x64\xb5\x20\x1e\x14\x29\x28\x6a\x0c\xb6\xa0\
-\x08\x16\x2a\xe8\xba\x49\x64\x0f\x56\x51\x37\xe9\xba\x88\x5b\x93\
-\x2c\x2c\x08\x2a\x88\x82\xd0\x22\x88\x07\x91\x56\x50\x28\x45\x69\
-\x89\x74\x93\x79\x1e\xb2\x5b\xd2\xdf\xfc\x0a\x9b\xee\xcc\xfb\x0d\
-\x34\x9f\xdb\xce\xe1\x7d\xdf\x7c\x99\x79\x33\x6f\x33\x3f\x60\xc8\
-\x90\x21\x37\x32\x64\x2b\x50\x32\x3b\xf9\x3a\x11\xbd\x02\x28\x66\
-\xe6\x23\xad\x7a\xa5\x64\x2b\xb6\x4b\x94\xad\x40\x44\xea\x55\x80\
-\x62\x00\xc7\x41\x28\x26\x73\x85\x84\xad\xd8\x2e\xb1\x66\x40\x7f\
-\x2c\x02\x08\x8c\x85\xf4\x44\x61\x87\xc5\xf8\x4e\xb0\x69\x80\xee\
-\xff\x83\x80\x51\xee\xe2\xd4\xc3\x13\x93\x77\x59\xd4\xb0\x8e\x4d\
-\x03\xd8\x18\x21\x6c\xed\x6a\xd5\x4c\xef\x3d\xb8\xdd\xa2\x8e\x55\
-\x6c\x1a\x70\x2d\xb6\x73\x3c\xd6\x48\x3c\xf1\xf4\x56\x01\xad\x81\
-\x91\x30\x00\x00\xee\x1e\xb9\xac\x17\xc7\xc7\x27\x47\x85\xf4\xd6\
-\x8d\x33\x03\x98\x39\xb8\x25\xee\x6f\x6f\x52\xf3\x99\xcc\x73\x37\
-\xb9\xd2\xbc\x1e\x9c\x19\x40\x44\x1a\xc1\xba\xc0\xd8\xd5\xb9\xa5\
-\xfd\x71\x22\x51\x8c\xbb\xd2\x1d\x14\xd7\x5b\x40\xc3\x5c\x09\xd9\
-\x91\xb1\x73\xd3\xb0\x78\x09\xdb\x08\xee\x6b\x40\xd8\x4a\x00\xf2\
-\xa9\xdc\xd4\x9b\xce\xb5\xd7\x81\x54\x11\xd4\xc6\x08\xf3\xe1\x54\
-\x36\x7f\x58\x48\xff\x9a\x48\x19\x00\x00\x5d\x63\x84\xe8\xad\x54\
-\x2e\x5f\x10\xcc\xc1\x40\xd2\x80\xb5\xed\x70\x35\x4c\x1f\x24\x73\
-\x85\xac\x68\x1e\x7d\xc8\x1a\xc0\xcc\x20\x63\x3b\x28\x62\x7c\xf2\
-\x50\x76\x2a\x29\x9a\xcb\x9a\xb8\xb8\x22\x83\x61\xd6\x84\x4d\x8a\
-\x78\x7e\xf7\x44\x7e\xa7\x74\x3a\xf2\x06\xf4\x60\x32\xb7\xc3\xad\
-\x5a\xd3\x57\xc9\x7d\x85\x7b\x24\x13\x89\xca\x80\xb5\x9b\x62\xd0\
-\x84\x31\x52\x68\xee\xca\xe6\xef\x90\xca\x23\x32\x03\x56\x61\x32\
-\x6b\xc2\xb6\x18\x51\x23\xbd\xef\xd0\x6d\x12\x09\x44\x6d\x00\x98\
-\xc1\x80\x71\x5b\xbc\x53\xab\xce\x62\x66\xff\xfe\x2d\xae\xf5\x23\
-\x37\xa0\x87\x79\x5b\x24\xe0\xbe\x4e\xfb\xe6\x85\xc4\x81\x03\x9b\
-\x5d\x2a\x7b\x62\x00\x00\x40\xf7\x56\x43\x1f\x84\x07\x47\x2e\xc6\
-\x3e\x75\xd9\x3c\xf9\x64\x00\x88\x48\xb3\xd1\x41\xd2\xf8\xc8\xd8\
-\xb9\x4a\xb1\x58\x74\x92\xab\x57\x06\x00\x0c\xea\x9d\x0c\xc1\x9a\
-\xf0\xd4\xb7\xa7\xcf\xbe\x0d\x07\x1d\xa4\x67\x06\x5c\xc1\xbc\x32\
-\x83\x5e\x48\xe5\x0a\x2f\xd9\x16\xf2\xd5\x00\x00\x64\x36\x4f\x8c\
-\xa3\xa9\x5c\xfe\x19\x9b\x2a\x1e\x1b\xc0\x00\xa0\x8d\xcd\xc0\xf4\
-\x7e\x3a\x5b\xc8\xd9\x52\xf1\xd8\x00\x00\xbd\xa2\x10\xdc\x0e\x04\
-\xc2\xbb\xb6\x04\x7c\x37\x00\x14\x52\xf6\x98\x61\xed\x58\xf4\xde\
-\x00\xe6\xb0\x1c\xb9\x6a\x2b\xbe\x37\xff\x9d\x0d\x87\x63\xc1\x93\
-\x8f\x88\x9e\x6d\xd4\x2a\xef\xd9\x52\xf0\x78\x05\x98\x93\x07\xe1\
-\xb5\xc6\x5c\xd9\xda\xe4\x01\x7f\x0d\x50\x21\x77\x9e\xe3\xcd\xb9\
-\xca\x11\x07\x42\x3e\x41\x00\xb3\x82\x39\xfb\x8f\x1e\xb8\x77\xdb\
-\xf3\x08\xfb\x01\x76\x83\x78\x56\x03\xb4\x02\x5d\x5d\xf7\x19\xf8\
-\xf2\xc2\x98\x9a\x2c\x95\x4a\x21\xb7\xc3\x8d\xe3\xcd\x0a\xe0\xde\
-\xb2\x0f\x4e\xfe\x9b\x4b\x6a\xf4\xb1\x1f\x67\x66\x56\x5c\xe9\x7a\
-\x61\x00\x33\x14\x99\x15\xef\x67\x28\xb5\xe7\xbb\xcf\x8f\xb5\x5d\
-\x6a\x47\xbf\x05\x88\x88\xc0\xc1\x3d\xff\x9b\x5e\xe1\xdd\x4b\x0b\
-\xe5\x7f\x5c\xcb\x47\xbb\x02\x88\x68\xb5\xe8\xf5\x8d\xe1\xcf\x58\
-\x37\x9e\x5a\x5a\xa8\xfc\x25\x91\x42\x64\x06\xf4\x1e\x52\x05\x26\
-\xcf\xb8\xa0\x98\xd2\xa7\xe6\xa7\x7f\x97\xca\x23\x2a\x03\x88\x4d\
-\xed\x4b\x0c\x3c\xf2\x75\xad\x7c\x46\x32\x11\x79\x03\x08\x14\xa2\
-\xbb\x02\xd2\xd9\x56\xbd\xf2\xbd\x74\x3a\xd2\x06\x10\xb4\xa1\xc9\
-\x0c\x7a\xb2\x39\xf7\x61\x43\x38\x17\x00\xf2\x06\x28\xe3\xb0\x63\
-\x1c\x6a\xd5\xca\x9f\x09\xe7\x71\x05\xc9\x63\x30\x16\x1c\x20\xe6\
-\x97\x1b\xf5\xea\x8c\x60\x0e\x06\x52\x2b\x20\xac\xa7\x7f\xa7\x51\
-\xaf\x46\xfe\x4c\xc6\xbd\x01\xa1\xcd\x0d\xcf\x36\x6b\xd5\x17\xe1\
-\xa0\xb9\x19\x14\xd7\x06\x18\xcd\x0d\x01\x5f\xac\x9c\xbf\x7d\x0a\
-\x1e\x4c\x1e\x70\xfb\x50\x32\xac\xad\x5d\xbe\x3c\xda\x79\x7c\x79\
-\xb9\xd4\x71\xa5\x3b\x28\x2e\x1f\x4a\x06\x3b\xbb\x9f\xe2\x9b\xdb\
-\x7b\x97\x67\x67\xff\x73\xa5\x79\x3d\x48\x15\xc1\x5f\x95\x8e\x67\
-\x16\x4f\x9c\xf8\x57\x48\x6f\xdd\x48\x18\x70\x96\x95\x4a\x35\x4e\
-\x4e\xff\x2d\xa0\x35\x30\x36\xef\x01\x61\x3f\x5c\x9e\x67\x8d\x74\
-\xab\x36\xf3\x87\x45\x1d\xab\x38\xf9\x64\x66\x95\x8b\x9a\x29\xd3\
-\x3a\x59\xf9\xc5\xa2\x86\x75\xec\x7d\x34\x85\xfe\x57\x5f\xcc\x20\
-\x7e\x74\xa9\x5e\xfe\xc1\x56\x7c\x57\x58\xfc\x6a\x8c\x8f\x82\xd0\
-\x05\xb8\x0b\xe0\x8d\xe6\x5c\x75\xc9\x56\xec\x21\x43\x86\x0c\x71\
-\xc5\xff\x03\xa1\x32\xbd\x29\x9d\x1e\xd2\x00\x00\x00\x00\x49\x45\
-\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x00\x68\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x00\x1a\x49\x44\x41\x54\x58\x85\xed\
-\xc1\x01\x01\x00\x00\x00\x82\x20\xff\xaf\x6e\x48\x40\x01\x00\x00\
-\x00\xef\x06\x10\x20\x00\x01\x47\x01\xa0\x88\x00\x00\x00\x00\x49\
-\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x03\x17\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x02\xc9\x49\x44\x41\x54\x78\x9c\xed\
-\xd6\x4d\x48\x54\x51\x18\x06\xe0\xf7\xbd\x5e\x4b\xb2\x20\x82\xa0\
-\x08\x8c\x56\x41\x41\x54\xd2\x38\x1a\x84\x45\x04\x26\x29\x26\xcc\
-\x22\xca\x12\xa2\x9f\x45\x8b\x08\xa2\x82\x90\xa0\x45\x60\x05\x6e\
-\x82\x28\x88\x6a\x11\xf8\x33\x57\xa4\xbf\x4d\xf4\x03\xe6\x38\x30\
-\x81\x9b\x16\x19\x05\xad\xa2\xac\xb0\x20\x35\xaf\xf7\x6d\x23\xe4\
-\x5c\x2b\xcc\xb9\x33\x41\x7d\xcf\xf2\x7c\xe7\xbc\x7c\xe7\xbb\x1c\
-\x66\x00\x63\x8c\x31\xc6\x18\x63\x8c\x31\xc6\x18\x63\x8c\x31\xc6\
-\xfc\x2f\x98\x6b\x40\x45\xb7\x56\x21\xd0\x0d\x00\xcb\x04\x5e\x4c\
-\x37\xe0\x3c\x48\x45\xd0\xdb\x4f\xc5\xba\xd4\x00\xaa\x15\x00\x1c\
-\xf2\x48\xaa\x81\xf7\x72\xc9\xcb\x7d\x00\xc9\xe0\x31\x80\x4d\x3f\
-\x12\x75\xf3\xcb\xb8\xb3\xff\x79\x82\xdf\x72\xcd\xce\x22\x31\xee\
-\xe1\xb8\xa0\x73\x53\x56\x87\xfd\xf7\x5c\x9c\x39\xc8\xf1\xd9\xc6\
-\x3a\x11\xb4\x96\x9d\x21\xee\x59\xe0\xea\xfe\x5a\x4f\x0b\x23\xc8\
-\x06\x00\x54\x3f\x94\x1b\xf7\x82\x4b\xa1\xcb\x03\x11\x7c\xc0\x9c\
-\x07\x30\x01\x1e\x06\xf0\x2e\xb4\xbc\x79\xae\xd4\x5b\xd5\xa5\xe5\
-\xb9\xe6\x57\xb7\x6b\xfe\xc8\x27\x75\x0b\x3c\x34\x75\x5d\xc0\x18\
-\x1d\xee\xce\xe5\xeb\x03\x11\x4c\x10\x00\x62\x3d\x5a\x41\x5f\xf7\
-\x00\xac\x0c\x95\xde\x52\xac\x4d\x35\xf2\xd9\x6c\x72\xcb\xbb\xb4\
-\xd4\xa5\x6e\x03\x58\x1f\x2a\x7d\xa4\x58\x97\x6a\x64\xef\x6c\x72\
-\xa7\x8a\xe2\x09\x20\x5d\xc7\xd7\x8e\xcf\x2a\x00\x4f\x42\xa5\x25\
-\x82\x9e\xc4\xba\x54\xfb\xa7\x99\x1b\x3a\xb5\xba\xd8\x51\x0a\xd3\
-\x2f\xff\x4a\x60\x65\x14\x97\x07\x22\x1a\x00\x00\xf4\x25\xf8\x71\
-\x51\x09\xb7\x01\xba\x95\x55\x20\x4a\x49\xf5\xc4\x3d\x1d\x9e\x69\
-\x56\x2c\xa9\x2d\x8e\xa3\x5e\x09\x65\x59\x05\xa1\x7f\x8e\xcf\x78\
-\x7a\x27\x5f\x44\xd3\x75\x44\x4f\x20\x4b\x8b\x9c\x8a\x35\xc1\x59\
-\x90\x27\xa7\x17\xd5\xda\x3f\xe0\x9c\xc0\x19\x06\xbf\x3a\x1e\x4b\
-\xaa\x89\xd0\x55\x00\xc5\xa1\x46\xbd\x71\x97\xbb\x33\x75\xfc\x1a\
-\x65\xbb\xd1\x0f\x60\x52\x85\xa7\x03\x90\x2e\x01\x28\x9a\xba\x2e\
-\xa8\x7d\xde\xb0\xb3\xf7\x51\x33\x47\xb3\x0e\x48\xac\xf0\x70\x1a\
-\xd0\x99\xe9\x69\x6a\x2b\xf3\x9d\x63\x1d\x09\x4e\x44\xdd\x67\xde\
-\x06\x00\x00\x71\x4f\x35\x0a\xd4\x01\xa2\x34\x54\xea\x15\x58\x9f\
-\xde\xc9\x0f\x00\xb0\xaa\x5d\x73\x16\x14\x05\x97\x41\xee\x0b\xed\
-\x13\xc8\xa3\xfd\x0d\x6c\xcb\x57\x8f\x79\x1d\x00\x00\x54\x76\x6a\
-\x5d\xe0\xe8\x0e\x80\xa5\xa1\xd2\x60\x11\x59\x33\x36\x8e\x21\xb7\
-\x58\x9d\x10\xb6\x86\xea\xa3\x12\x77\xa5\x1b\xe9\xe5\xb3\xbf\xbc\
-\x0f\x00\x00\xca\xdb\x55\xe6\xba\xba\x0b\x60\xf5\x0c\x8f\x0c\x41\
-\xdc\xd1\xdf\xc8\x54\x3e\xfb\x02\x22\xfc\x15\xf8\x9d\x4c\x82\x6f\
-\x7c\x9f\x1b\x09\x3c\x98\xc1\xf6\x41\xa7\x88\x95\x85\xb8\x3c\x50\
-\xa0\x01\x00\x40\x26\xc1\xe1\xcf\x3e\xb7\x13\xba\xfe\xab\x3d\x12\
-\x9e\xfa\x2e\xab\xfa\xea\xf9\xb2\x50\x7d\x15\xe4\x09\x64\x91\x18\
-\x4f\x06\x2d\x22\x5b\x42\x95\x4e\xc7\x67\x53\x5f\x82\x23\x85\x6c\
-\xa7\xf0\x03\x98\x14\x4b\x4e\x5c\x21\xd8\x0c\x40\x82\x2e\xa4\x07\
-\x9c\x53\xbf\xfb\x7f\xf0\x4f\xaa\x7e\x28\xb7\xfa\x9a\x4a\xfe\x76\
-\x1f\xc6\x18\x63\x8c\x31\xc6\x18\x63\x8c\x31\xc6\x18\x63\xcc\x7f\
-\xe2\x3b\x5f\x7a\xf2\xea\xb1\x6e\xd0\x9c\x00\x00\x00\x00\x49\x45\
-\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x08\x6c\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x08\x1e\x49\x44\x41\x54\x78\x9c\xed\
-\x5b\x7d\x8c\x1c\x65\x1d\x7e\x7e\x33\xb7\x7b\x77\x70\x1f\x10\xe8\
-\x51\xb3\x1f\xb3\x7b\xd7\x6b\x4a\x5a\x4c\x2c\xa7\x11\xd2\x54\x4b\
-\x34\xa8\xa1\x87\x45\x12\x05\x03\x34\x90\x2a\x45\x49\x94\x40\x4d\
-\x4d\xc0\xaa\x54\xa1\x4a\x0b\xfc\x41\x55\x04\x2d\xd0\x48\x02\x42\
-\x63\x0d\x60\xff\xc0\x36\x55\x21\x80\xd1\xe8\x62\xcf\x5c\xdd\xdb\
-\xd9\x9d\xbb\x1e\xb5\x14\xfb\x61\x7a\xb7\xb3\xfb\x3e\xfe\xd1\x22\
-\xf3\xb5\x77\xbb\xb7\x33\xc7\x55\xef\xf9\x6f\x9e\xf7\xf7\xfe\xe6\
-\x99\x67\xde\x99\x7d\xe7\x7d\x7f\x0b\xcc\x63\x1e\xf3\xf8\x7f\x86\
-\xcc\xc6\x49\x86\x0f\x1d\x5a\x10\x9b\xac\xac\xa4\xe0\x12\x0d\xb2\
-\x44\x81\xbd\x00\xce\x13\x48\x17\x40\x1d\xc0\x71\x00\xc7\x09\x29\
-\x02\x3c\xa0\x41\xfe\x46\x56\xf6\x67\x32\x99\x91\xa8\xb5\x45\x66\
-\x40\xb1\x58\xec\x53\xd0\xd6\x42\x71\x10\x82\x0f\xce\x30\xcd\x08\
-\x28\x2f\x6a\x9a\xfa\x79\x2a\x95\x7a\x43\x44\x18\xaa\x48\x84\x6c\
-\x00\x49\x29\x58\xd6\x95\xa2\xb0\x01\xc0\xaa\x30\x73\x03\xc8\x51\
-\xb8\xf5\xed\xc3\x87\x9f\x1a\x18\x18\xb0\xc3\x4a\x1a\x9a\x01\x85\
-\x82\xb5\x0a\xc2\x2d\x00\x06\xc2\xca\x19\x0c\x29\x10\xd8\x94\x49\
-\x27\x9e\x08\x63\x44\x34\x6d\x40\x3e\x9f\xbf\x48\xd3\x63\x0f\x00\
-\xf8\xe2\x14\x61\x8a\xc0\xef\x45\x64\x2f\x14\x87\xa8\xe3\x1f\x2d\
-\xc0\xd1\x4a\xa5\x72\xa2\xd2\xd6\x56\x8d\x97\xcb\x9d\x64\x4b\x37\
-\xa0\xb2\x14\x2c\x06\xe4\x32\x01\x3f\x09\xa0\xbd\x56\x42\x02\xfb\
-\x35\xa8\xf5\x86\x61\xbc\xd9\x8c\xfe\xa6\x0c\xc8\x97\x4a\x1f\xd1\
-\x14\x76\x01\xf8\x40\x40\xf3\x09\x81\xbc\x40\x72\x77\x4b\x8b\xbc\
-\x94\x4c\x26\xdf\x6e\x24\x77\xa9\x54\x6a\xaf\x56\xe5\x0a\x11\xb5\
-\x9a\x90\xc1\x1a\xe7\x98\xa0\xf0\xe6\x6c\x3a\xfd\x8b\x99\xe8\x07\
-\x9a\x30\xa0\x50\x28\x5d\x0f\xc1\xe3\x00\x5a\x7d\xa2\x80\x87\x35\
-\xa8\xfb\x0c\xc3\x78\x67\xa6\xf9\x9d\xc8\xe5\x72\xf1\x8e\x8e\xae\
-\x75\x10\xb9\x07\x40\x8f\x2f\x80\xb2\xd9\x30\x12\xf7\x88\x88\x6a\
-\x34\x77\xc3\x06\x90\xd4\x8a\xc5\xd2\xbd\x84\x6c\xf4\x34\x29\x00\
-\x8f\xb7\xe8\xf2\xed\x64\x32\x69\x35\x9a\xb7\x1e\x0c\x0d\xfd\xb3\
-\xb3\xbd\x7d\xe2\x0e\x02\x77\x02\xe8\x70\x0b\xc3\xae\x73\xce\x69\
-\xbd\xa1\xa7\xa7\xe7\x64\x23\x39\x1b\x32\x80\xa4\x66\x9a\xa3\x3b\
-\x21\xfc\x82\xa7\x69\x4c\x69\x58\xd3\x9b\x4a\xbd\xd6\x48\xbe\x99\
-\xc2\xb2\xac\x64\xa5\xca\xe7\xe1\x7f\xe1\xfe\xc9\x2e\x4f\x7c\xbc\
-\xbf\xbf\xff\x78\xbd\xb9\xb4\x46\x4e\x6c\x96\x46\x37\xf9\x2e\x5e\
-\xf0\x2a\x58\x1d\x98\xad\x8b\x07\x80\x64\x32\x69\xe9\x1a\x56\x02\
-\xd8\xe9\x69\xfa\x50\x2c\xde\xb6\x93\xa4\x5e\x6f\xae\xba\x47\xc0\
-\x48\xb1\xf8\x79\xa1\x3c\xed\xee\xcc\x1d\x4a\x55\x6f\xcd\x66\xb3\
-\x13\xf5\xe6\x09\x13\x24\xa5\x58\xb4\xee\x22\x70\x1f\x1c\xd7\x42\
-\x60\x4b\xd6\x48\x7d\xa3\x9e\x1c\x75\x19\x50\x2c\x16\x07\x14\x65\
-\x3f\x80\x36\x07\xfd\x94\x91\x4e\xde\x18\xc5\xec\xac\x51\x8c\x98\
-\xd6\xd7\x04\xdc\xe6\xe4\x04\x72\x93\x61\x24\x9f\x98\xae\xef\xb4\
-\x8f\x80\x65\x59\x17\x28\xca\x2e\x38\x2e\x5e\x80\xd7\xa8\x2a\xeb\
-\xe6\xc2\xc5\x03\x40\x26\x9d\x78\x08\x94\x9f\x39\x39\x82\x8f\x16\
-\x0a\x63\xcb\xa7\xeb\x3b\xad\x01\x15\xc5\x2d\x00\x12\x0e\x6a\x4c\
-\x84\x6b\xde\xaf\x61\x1f\x04\x11\xa1\x6d\x9f\x5a\x0f\xe0\x0f\x0e\
-\x3a\x0e\xa9\x3c\x4a\xb2\x65\xaa\xbe\x53\x1a\x60\x9a\xe6\x0a\x10\
-\x37\x3b\x28\x52\xc9\xe7\xd2\xe9\xf4\x58\x13\x7a\x23\x41\x7f\x7f\
-\xff\xa4\xaa\xda\xd7\x00\x38\xf2\x1e\x2b\xcb\x8b\x45\xeb\xb6\xa9\
-\xfa\xd5\x34\x80\xa4\x10\xfa\xf7\x3d\xf4\xce\x6c\x36\xf9\x6a\x33\
-\x42\xa3\x44\x6f\x6f\xef\x5b\x84\x6c\x76\x72\x04\xee\x1e\x1f\x1f\
-\x3f\xb7\x56\x9f\x9a\x06\x14\x2c\x6b\x25\xc0\x15\x0e\xca\x16\xa8\
-\x6f\x85\xa0\x33\x5a\x28\xfb\x47\x10\x14\x1d\xcc\x85\x13\xe5\xf2\
-\x97\x6b\x85\xd7\x34\x40\x14\xee\x72\x13\xf8\xb1\x61\x18\xf9\xe6\
-\x15\x46\x8b\x6c\x36\x3b\x41\xd0\x7d\xa3\x28\x77\xd4\x9a\x1b\x04\
-\x1a\x30\x32\x32\xb2\x10\xc0\xa7\x1c\x94\xad\x2a\xf6\xbd\xa1\xa9\
-\x8c\x18\x99\x54\xea\x49\x02\xc3\x0e\x2a\x51\x28\x95\x3e\x11\x14\
-\x1b\x68\x80\xe8\xfa\xf5\x00\xfe\xeb\x98\x00\x2f\xf7\xf6\xf6\xbe\
-\x15\xae\xcc\xe8\x20\x22\x55\x21\x9f\x71\x71\x4a\x6e\x0a\x8a\xad\
-\xf1\x08\xc8\x6a\xe7\x11\x85\xbf\x0a\x4b\xdc\x6c\x81\xba\xb8\x35\
-\x0b\x3e\x13\xf4\x18\xf8\x0c\x18\x1f\x1f\x3f\x17\xc4\xe5\x4e\xae\
-\x6a\xeb\xbf\x0e\x5d\x61\xc4\xc8\x24\x93\xaf\x03\xe2\x1c\xb5\xdd\
-\x23\x96\x75\xa9\x37\xce\x67\xc0\xe4\x64\xe5\xa3\x00\xe2\x0e\xea\
-\xcf\x7d\x7d\x89\xa2\x37\x6e\xae\x43\x44\x14\x84\xae\x1b\xa7\x2b\
-\xff\x3a\x65\xc0\x23\xc0\x65\x1e\x62\x7f\xa8\xca\x66\x11\x3c\xfd\
-\xfd\xf2\xde\x31\xb0\xd4\x1b\x13\x64\xc0\xc5\xce\x23\x71\xbf\x4d\
-\xcf\x2a\x08\xc5\xab\xfd\x62\x6f\x4c\x80\x01\x92\x71\x1e\x91\x32\
-\xe7\x7f\xfb\x6b\x81\x2c\x7b\xb5\x67\xbd\x31\x3e\x03\x08\x74\x3a\
-\x8f\x45\xe4\x5f\x21\xeb\x9a\x4d\x78\xb5\x77\x7a\x03\xa6\x35\xa0\
-\x5a\x65\x43\x6b\x6c\x73\x09\x99\x4c\x66\x12\x40\xc5\x41\xc5\x73\
-\xb9\x9c\xf3\x05\xef\x37\x40\xbc\x8b\x24\x31\xce\x89\x6f\xfe\xa8\
-\x10\x34\x11\x3a\xe1\x3c\xd0\x95\xe6\x1b\x36\x67\x0b\x0a\x85\x42\
-\x2b\x00\xe7\x7a\x40\x79\xd9\xb2\x65\x65\x67\x4c\xd0\x08\x70\xad\
-\xa8\x92\x3c\x2f\x1a\x79\xd1\x83\x64\xb7\x87\x3a\xe1\x8d\xf1\x19\
-\xa0\x00\xd3\x93\xc6\xf7\xe6\x3c\x5b\xa0\x69\xf1\x5e\x0f\x55\xf0\
-\xc5\xf8\xbb\xc9\x01\xe7\x11\x05\xfd\x61\x8a\x9a\x4d\x88\x5f\xfb\
-\x90\x37\xc6\x67\x80\x86\xaa\x6b\xb3\x51\xdc\x8b\x22\x67\x15\xe8\
-\xd1\x4e\x20\xe7\x8d\xf1\x19\xd0\xde\xde\xfe\x0a\x00\xc7\xfe\xbb\
-\x2c\xb7\x2c\x2b\x19\x81\xbe\x48\x41\x52\x03\x70\x95\x8b\x54\xb2\
-\xd7\x1b\xe7\x33\xa0\xa7\xa7\xe7\xa4\x00\xaf\x38\x39\x5b\x79\x12\
-\x9d\x05\x28\x95\x4a\x97\xc2\xbd\xa3\x7c\x3c\x93\x49\xbc\xe1\x8d\
-\x0b\x5c\x0f\x20\xe1\xfa\x8a\x12\x70\x30\x5c\x79\xd1\x43\x41\x73\
-\x69\x26\xf8\x92\x88\x54\xbc\x71\x81\x06\x68\x1a\x77\xe2\xf4\x6e\
-\xef\xbb\xbd\xaf\x18\x3e\x74\x68\x41\xd8\x22\xa3\x02\x49\x0d\xe4\
-\xb5\x4e\x4e\x28\x3b\x82\x62\x03\x0d\x48\xa7\xd3\x63\x20\xf6\x38\
-\xa8\xd6\xd8\xa4\xed\xdd\x0e\x9f\xb3\x30\x4d\xeb\x3a\x00\x4b\x1c\
-\xd4\xb8\x61\x24\xf7\x04\xc5\xd6\x5e\x15\x16\xf9\xa1\x87\xf8\x4a\
-\x3e\x3f\x66\x84\xa2\x30\x42\xe4\x72\xb9\x38\x04\xdf\x75\x72\x02\
-\x6c\x0b\x1a\xfe\xc0\x14\x06\xa4\xd3\x89\x97\xe1\x7e\x19\xc6\x75\
-\x5d\x6d\x0a\x45\x65\x84\xe8\xe8\xe8\xfe\x12\xdc\x9f\xbd\x47\x4f\
-\x9d\x6a\xdb\x5e\x2b\x7e\xaa\x11\x40\x2a\x7c\xd3\xc9\x11\xbc\xd1\
-\x34\x4d\xdf\xba\xda\x5c\xc1\xe8\xe8\xe8\x85\x10\xdc\xed\x22\xc9\
-\xef\x2d\x59\xb2\xc0\x37\x05\x7e\x17\x53\xee\x0d\x66\xb3\xa9\xbd\
-\x00\x9e\x74\xc7\x6b\xcf\xe7\xf3\xf9\x8b\x9a\x11\x1a\x05\x72\xb9\
-\x5c\xdc\xb6\xd5\xb3\x70\xd6\x10\x11\x7f\x39\x72\xe4\xf0\xc3\x53\
-\xf5\x9b\x7e\x77\xd8\x8e\xdd\xe9\x5c\x5d\x25\x90\xd2\xf4\xd8\x73\
-\xc3\xc3\xc3\xde\xe2\xa8\xf7\x15\x9d\x9d\x5d\x0f\x41\xf0\x31\x07\
-\x65\x2b\x1d\xeb\xa6\x2b\xaa\x9c\xd6\x80\x45\x8b\x16\x1e\xa6\xc2\
-\x67\x01\x4c\x3a\xe8\xcb\x63\xad\x6d\x8f\x90\x9c\x95\x5a\xe3\xe9\
-\x50\x28\x16\x6f\x23\xe4\x56\x17\x49\xac\xaf\xa7\x6c\xa7\xee\x0b\
-\x30\x4d\xeb\x06\x82\xae\x8a\x0b\x02\x3f\xf9\xf7\x89\x63\xb7\x7b\
-\xbf\xb1\x67\x0b\x67\x4a\x64\x6e\x27\xb0\x0d\x8e\x9b\x29\xe0\x83\
-\x86\x91\xfe\x7a\x3d\x39\x1a\xba\x83\x23\x66\xe9\x7e\x01\x36\xb8\
-\x55\x60\x5f\x2c\xa6\x5d\x9b\x48\x24\x8e\xd4\xe8\x16\x09\x72\xb9\
-\x5c\xbc\xa3\xab\xfb\x11\x10\xb7\x38\x79\x01\x7e\x93\x4e\x27\xaf\
-\xaa\xf5\xb3\xe7\x45\xa3\x65\x72\xba\x59\xb2\x9e\x01\xb1\xc6\x93\
-\xa6\xa0\x6b\x1c\x4c\xa5\x52\x7f\x6d\x24\xdf\x4c\x71\xf0\xe0\x78\
-\x4f\x4b\xac\xf2\x4b\xf8\xbf\x54\xdf\xa4\xaa\xac\xc8\x66\xb3\x75\
-\x2f\xe4\xce\xa4\x50\x52\x37\xcd\xd2\x0f\x20\xe2\x1d\x62\x36\x81\
-\xed\x55\x3b\xb6\x79\xd1\xa2\x85\x87\x1b\xcd\x5b\x0f\x4e\x97\xcf\
-\xe2\xab\x10\x6c\x04\x70\xbe\xab\x51\xf0\x62\xd5\x2e\x5f\xd7\xd7\
-\xd7\x77\xac\x91\x9c\xcd\x94\xca\xde\x02\xc1\x76\x00\x31\x4f\xd3\
-\x49\x02\x0f\x54\xca\x13\x5b\x1b\x29\x58\x9c\x0a\x24\x5b\x4c\xd3\
-\x5a\x0b\xc1\x26\xb8\xeb\x95\xce\x04\xc8\x56\xc3\x48\x6c\x10\x91\
-\x6a\xa3\xb9\x9b\x2b\x96\x2e\x16\x57\x6a\x94\xe7\x00\x5c\x10\xd0\
-\xfc\x0e\xc1\xdd\x1a\xb4\xdd\xe5\xf2\xa9\x3d\x8d\x9a\x91\xcb\xe5\
-\xe2\x9d\x9d\xe7\xaf\x54\x50\xab\x05\xb8\x1a\x40\xd0\x34\xdc\x06\
-\xb1\x3e\x93\x49\x3d\x36\x13\xfd\x40\x08\xe5\xf2\x07\x47\x47\x53\
-\x2d\x55\xf5\x20\x88\x6b\xa6\x08\xb3\x01\xee\x83\x68\xbf\x85\xe2\
-\xdf\x95\x92\x83\xaa\x55\x8e\xc6\x2a\x95\x93\xe5\x72\xb9\xda\xd6\
-\xd6\xd6\xa9\x94\xea\x26\xf5\x2c\x35\x2c\x06\xd5\x65\x02\xb9\x12\
-\x40\x57\xad\x84\x04\x5e\x3f\x53\x2e\xff\xc7\x66\xf4\x87\xf8\x87\
-\x89\xd2\xa7\x29\xb8\x5f\x80\x4b\xc2\xca\x59\x03\x63\x84\x7c\x27\
-\x93\x4e\xfc\x74\x26\x43\xde\x8b\xb0\xff\x32\xa3\x99\xa6\x75\x35\
-\x05\x1b\x05\xf8\x70\x98\xb9\x01\xe4\x41\x6e\x25\xab\x8f\x85\x59\
-\xa3\x18\xd9\x4c\xce\x34\xcd\xa5\x14\x6d\x2d\x14\x06\x21\x58\x3c\
-\xc3\x34\xe3\x10\xbc\xa0\xc0\x1d\xd9\x54\xea\x77\x33\xf9\x3f\xc0\
-\x74\x98\x95\xa9\xec\xc1\xd1\xd1\x54\xac\xc2\x55\x0a\x5c\x0a\xc8\
-\x12\x80\x59\x11\x74\x83\xe8\xc2\xe9\x9d\x9b\x63\x00\x8f\x0b\xa4\
-\xa4\x80\x21\x08\x87\x34\x72\x5f\x3a\x9d\x3e\x30\x57\xca\x71\xe7\
-\x31\x8f\x79\xfc\x6f\xe2\x3f\x21\x7b\x09\x29\x0d\x19\xbe\x1d\x00\
-\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x00\x8d\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x00\x3f\x49\x44\x41\x54\x58\x85\xed\
-\xd3\xb1\x11\x00\x10\x10\x44\xd1\xa5\x10\x94\x22\xd1\xb5\x19\xad\
-\x18\x0a\x39\x91\x50\xea\x92\xff\xa2\xcd\x7e\xb4\x12\x00\xc0\x59\
-\xb8\x63\xae\x3d\x64\xaa\x7f\xb2\xd6\x4b\x4e\x4d\x92\xe2\x9f\x20\
-\xf0\xc6\x0b\x00\x00\x70\x77\x00\xa4\x4c\x0e\x07\xff\x04\x59\xb9\
-\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x02\x3e\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x01\xf0\x49\x44\x41\x54\x58\x85\xe5\
-\x96\x31\x68\x53\x51\x14\x86\xbf\x3f\x7d\xad\x52\x41\x31\x82\x08\
-\x2e\x2e\x2e\x0e\xe2\xd0\xa0\x5d\x1c\x2b\x54\xba\x08\xa9\x53\x05\
-\x11\x4d\x96\xb4\xa9\xe0\x26\x8a\xe2\x26\xb4\x4d\x2b\xd8\x87\x83\
-\x60\x27\x1b\x70\x29\x0e\xea\xe6\xa2\xf2\x3a\x48\x07\x17\x41\x1d\
-\x14\x41\xa8\x60\xa1\x45\xdb\xe4\x1d\x87\xa4\x4e\x82\xef\xde\x5c\
-\x22\xe8\xd9\x1e\xdc\xf3\xff\xdf\x3d\xef\xdc\x73\x2f\xfc\xef\xa1\
-\xd0\x82\x83\x17\xa6\xf2\x5b\x51\xef\x3b\x30\x5b\x8e\xc7\xf7\xfe\
-\x69\x7d\x14\xd2\xfc\xe8\xd8\xed\x5d\x8d\x28\x7a\x0c\xb6\x27\x6b\
-\x4e\x2e\x94\xf9\x91\xe2\xf5\xbe\xbe\xfe\x1d\x8f\x0c\x4e\xb8\xe4\
-\x05\x01\x28\x16\x17\x7b\xfa\xf3\xfb\x1e\x00\x43\xae\xb9\x01\x00\
-\x4c\xef\xf3\x9f\xef\x00\x67\x31\x30\x2c\xed\x2a\x40\xa1\x34\x77\
-\x13\x54\x06\xc3\x64\xa9\x90\x75\x0d\x60\xe0\xd2\x6c\xd5\xe0\x2a\
-\x80\x49\xce\xe6\x1d\x01\x0c\x94\x6b\x63\x88\x69\x00\x83\x54\x86\
-\xb3\xb9\x37\x40\xa1\x34\x3b\x82\xe9\x7e\xfb\x33\x15\x7e\xe6\x5e\
-\x00\x85\xd2\xcc\x49\x83\x45\xa0\x87\x96\xb1\xb7\xb9\x33\x40\xe1\
-\xe2\xf4\x31\x23\xb7\x04\xec\x6c\x1b\x3b\x75\xfc\xef\x22\xf3\x24\
-\x3c\x5e\xaa\x1d\x4e\xd1\x13\x60\xb7\x81\x29\x80\x39\x64\xac\xc0\
-\x60\x79\xea\x60\xd3\xf4\xcc\x60\x3f\x16\xce\x1c\x32\x56\x60\xcb\
-\xa2\x8f\xbf\xae\x2d\x85\x33\x87\xac\x3d\x60\xac\x84\x34\x75\x06\
-\xe8\xcd\x35\x86\x0d\x3e\xb4\x61\x82\x5d\x60\x99\x01\x5e\xcc\x5f\
-\xfe\x14\x61\x43\x82\x2f\xb4\xc6\x5d\x30\x88\xcc\x42\xaf\xe2\x89\
-\xb7\xa4\xcd\x53\xc0\x9a\x5a\x0f\x99\x20\x10\x4e\x22\xc9\xbd\xc9\
-\xd7\x22\x1d\x01\xbe\x13\x08\xc2\x59\x20\x89\xab\xcf\x05\xa3\x40\
-\x13\x10\xea\xec\x59\xe7\xb5\x83\x24\x1e\x5f\x42\x76\x1e\xd8\x6e\
-\x4a\x6f\x08\xef\x12\x2e\xcf\x4f\x2c\x08\x55\xb7\x75\xcc\xb3\x12\
-\x1d\xfd\xc3\x24\xae\xd4\x04\xb7\x00\x64\xe6\x05\xd1\x71\x13\x25\
-\x71\xe5\x9a\xc4\x5d\x10\x4a\xc9\xb5\x26\x75\x17\x01\x40\x76\x68\
-\xf5\x40\x05\x78\x88\x40\xc8\x49\x33\xc8\x59\xae\xd7\x47\x9b\x1b\
-\x5f\x57\xcf\x01\x4f\x5d\x73\x83\x4d\xb4\x37\xf5\x1b\x9b\x9b\x1b\
-\x3f\xce\x08\x5e\xfe\x15\x00\x80\x95\x85\x2b\xeb\x51\xa3\x71\x1a\
-\x58\x03\x7d\x0b\xa9\xfd\xef\xc6\x4f\x11\x32\x94\x0c\x6f\x6b\x20\
-\xde\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x00\x95\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x00\x47\x49\x44\x41\x54\x58\x85\xed\
-\xce\xb1\x0d\x00\x20\x0c\x03\x41\x82\x18\x2a\xdb\xc1\x42\x69\xd8\
-\x2f\xc0\x10\x46\x4a\xf3\xd7\xdb\xfa\xd6\x04\x1e\xb9\x3c\x72\x29\
-\x1f\x5d\x19\xff\x40\x00\x01\x04\x10\x40\x00\x01\xe5\x01\x43\x3d\
-\xb8\x66\xd3\x23\xab\x02\xfa\xb6\x7b\xb4\x0b\x00\x00\x50\xed\x01\
-\x74\x44\x0a\xfd\x41\x7d\x20\x9d\x00\x00\x00\x00\x49\x45\x4e\x44\
-\xae\x42\x60\x82\
-\x00\x00\x02\x21\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x01\xd3\x49\x44\x41\x54\x58\x85\xed\
-\xd5\x3b\x8b\x13\x51\x18\xc6\xf1\xff\x33\xf1\x86\x82\xd9\x4e\x50\
-\x0b\x11\x5b\xd1\x56\xc4\x72\x36\xcd\x6a\x61\x76\xb0\x71\x51\x34\
-\x29\x2c\x64\x3f\x81\x48\xf0\x0b\x88\x82\x8d\xd9\x20\xee\x16\x42\
-\x36\x2e\xc8\x22\xce\xc6\xce\xc2\xda\xde\xc2\x4a\xb0\x71\x89\xa0\
-\x78\x21\xe7\xb1\x98\x09\xd8\x99\xcb\x30\x29\xf4\xad\x4e\xf1\x5e\
-\x7e\x9c\x73\xe6\x0c\xfc\xeb\xa1\x71\x92\xe2\x7a\x63\x17\x50\x14\
-\xf9\x64\xda\x5d\xfb\x5c\x24\x20\x1a\x33\x6f\x01\xa8\x7a\xa8\xed\
-\xc5\x95\x95\x43\xf3\x00\x00\x60\x71\xce\xdf\xf6\xf7\x92\x24\xd9\
-\x37\x17\x40\x1e\xb5\xdd\x50\x7d\x9a\x24\x49\xa5\x74\x80\x50\x30\
-\x58\x70\x65\x10\xaa\x0f\x19\xf3\x0e\x15\x06\x30\xb6\x24\x67\x6b\
-\x6e\xc5\x97\x1b\xad\x52\x01\x99\xc2\x06\x05\x00\xc4\x9d\xb8\xde\
-\x5c\x2d\x17\x90\x2b\x04\x21\x5f\xdf\x8f\xeb\x8d\xab\x25\x03\xc0\
-\x60\x69\x84\xe0\xc9\xe2\x72\x73\xa9\x54\x00\x80\x8d\x33\x0b\x15\
-\xdb\xdd\xda\x72\xe3\x42\xa9\x80\x3c\x42\x0e\x39\x10\xac\xed\x38\
-\x69\x9e\x2d\x1b\x40\x76\x14\x36\xf8\x30\xf6\xab\x5a\x72\xf3\x54\
-\xa9\x80\x9c\x11\x00\x63\x8e\x84\x40\x3f\xbe\x74\xe3\x68\xc9\x00\
-\x00\x82\x33\xcc\x09\xf6\x56\x5e\xce\x03\xf0\xc7\xd3\xe8\x33\xf3\
-\x00\xe4\xfd\xfc\x81\x5f\xe1\x58\xa9\x00\x67\xbd\x84\xf8\x14\x45\
-\xc4\xfd\x17\x9d\x8f\xe3\xd4\xed\x29\x66\xba\x23\x49\x02\x06\xd1\
-\x30\xd4\xd2\xad\xce\xfb\x71\x4b\x67\xde\x01\xe3\x88\x6c\xf8\xf7\
-\x48\x5c\x4c\xb7\x3a\xef\x26\xa9\x9f\x11\x20\x09\x09\x18\x4a\x4a\
-\xd2\xcd\xf6\x9b\x49\x3b\xcc\x02\x10\x78\x54\x7f\x7d\x67\xf3\xf1\
-\xf6\x34\x4d\xa6\x05\x68\x54\x2b\x58\xed\xf7\xda\x1b\x53\xf6\x99\
-\x0a\x20\x9c\xd7\x99\x7b\x3b\xbd\xf6\x83\x69\x87\xc3\xa4\x5f\x81\
-\x10\x81\x08\x81\xed\x47\xaf\x9f\xaf\xdd\x9d\x65\x38\x4c\xba\x03\
-\x76\x84\x00\xfb\xd9\xf9\xd3\xc7\x6f\x93\xfd\x8a\x4b\x04\x64\x0f\
-\x6d\xba\x50\xf9\x72\xad\xd5\x6a\x85\xbf\x65\x17\x0e\x90\x79\xab\
-\x83\x3f\xea\xdd\x6e\xf7\x67\x11\xc3\x61\xec\x3b\xa0\x01\x42\x8a\
-\xc2\x52\xba\xbe\xfe\xb5\xa8\xe1\xff\x03\xe0\x37\xff\xea\x99\x56\
-\xb6\x04\x03\xd2\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
-\
-\x00\x00\x03\x2a\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x02\xdc\x49\x44\x41\x54\x78\x9c\xed\
-\x99\x4f\x48\x54\x51\x18\xc5\xcf\x79\xf3\xd2\xd1\x20\x49\x88\x16\
-\x41\x50\x10\xad\xaa\x45\xe1\x9b\x30\x21\x22\x08\x25\x1a\x67\x2c\
-\x23\x5a\x54\x10\x08\x41\xb4\x69\x17\xe4\xa2\x76\x11\xb4\x0f\xd2\
-\x45\x48\x58\x8e\xe6\x62\x08\x22\x6d\xa1\x8d\xcf\x72\x51\x04\x21\
-\x14\x44\xff\x16\x25\x16\x0a\x29\xf8\xde\xfd\x5a\x84\x31\x7f\x9e\
-\x0d\x82\xf7\xbe\xa0\xfb\x5b\x7e\x07\xe6\x9c\x39\xef\x3e\xee\x9d\
-\x3b\x80\xc5\x62\xb1\x58\x2c\x16\x8b\xc5\x62\xb1\x58\x2c\x96\xff\
-\x0d\xea\x36\xf0\x72\x61\x1f\xc0\x53\x00\x40\xf2\xdc\x44\x86\xbd\
-\xba\x3d\x57\x83\xd6\x02\x0e\xf6\x48\x72\xa1\x41\x16\x4a\x86\xc2\
-\x43\x7e\x07\x47\x75\xfa\xae\x06\x47\xeb\xa7\xaf\x87\x5b\x31\xa3\
-\x8c\xec\x7b\x20\xdb\xb5\xfa\xae\x02\x03\xaf\x80\x92\xa8\xb9\x9b\
-\xe0\x86\xf1\x34\xe7\x75\xfb\x57\x43\xef\x0a\x00\xb0\x35\x60\xe5\
-\x2a\x00\x10\x84\x32\x87\x6e\xd1\xee\x5f\x0d\xed\x01\xee\x77\x32\
-\x44\x92\x0d\x51\x9a\xb7\x47\x42\xdd\xfe\xd5\x30\xf2\x04\xfc\x36\
-\xce\x39\x09\xee\x88\xd2\xbc\x9c\x1a\x33\x91\x61\x25\x8c\x2d\xc1\
-\x42\x9a\x6f\x15\x79\x38\x42\x6a\xf6\x72\xe1\x0d\x53\x39\xca\x31\
-\xfa\x0e\x3e\xcf\xf0\x89\x90\x17\x2b\x15\x5e\x4e\xe5\xe4\xb4\xc9\
-\x2c\x7f\x9c\xe3\x30\x4d\xe5\xc2\x5e\x01\xcf\x94\xcf\x1d\xd2\x2b\
-\x64\x38\x69\x32\x4b\x2c\x05\x00\x80\x97\x53\xef\x00\x54\x9c\x07\
-\xdc\x04\xb7\x8c\xa7\xf9\xc5\x54\x8e\xd8\x0a\x00\x56\x3e\x23\x38\
-\x01\xeb\x0b\x9d\x5c\x88\xd2\xd6\x9a\x58\xf7\xe1\xe0\x1b\x6b\xa2\
-\xe6\xca\x95\x9f\x10\x31\xf2\x70\x62\x2d\x60\xaa\x8b\x4b\x81\xcb\
-\x4d\x51\x9a\x37\x28\xdf\x4d\x64\x88\xfd\x24\x36\x75\x8c\x33\x21\
-\xb8\x2b\x42\x6a\xf0\x06\xc3\x7b\xba\xfd\x63\x2f\x00\x00\x5e\x64\
-\xf9\x1a\x60\x7b\x85\x20\x3c\xa9\xdb\xfb\x9f\x28\x00\x00\x1c\x85\
-\xe9\x58\x7c\xe3\x30\x2d\xc7\x7b\x28\x9b\x15\x25\x5f\x3e\x17\xc1\
-\x33\xdd\xde\xb1\x17\xb0\x77\x58\xea\x11\xca\x30\x88\x6d\x25\x02\
-\xe5\xda\x64\x87\xd3\xac\xdb\x3f\xd6\x02\x4e\xf4\x4b\xc2\x0d\xa4\
-\x0f\x40\x53\xa9\x22\xb7\xfd\x76\xa7\xdb\x44\x86\x58\x0b\xf8\xe0\
-\xaa\x9b\x00\xd2\xc5\x33\x01\x1e\xd5\x6d\x74\x2e\x80\x8c\x3c\x24\
-\xad\x35\xf1\x1d\x85\x07\xe5\x12\x44\x6e\x95\x8d\x5f\xba\x09\xb6\
-\x98\xbc\x29\x8a\xa5\x80\xa6\x01\xc9\x90\x32\x50\xe6\xff\xc9\x09\
-\x98\x2a\x74\xf2\xb3\xc9\x2c\xc6\x0b\x48\x0d\x89\x27\x4a\x46\x01\
-\xd4\x15\x8d\xe7\xa1\x78\xc0\x3f\xce\x57\xa6\xf3\x24\x4c\x9a\xfd\
-\xbe\x0d\x96\x11\x02\xc5\x57\x64\x01\xc0\xb4\xdf\xc1\x82\xc9\x2c\
-\xcb\x44\x5e\x58\xea\x60\x7f\xbf\x34\x2a\x47\xf2\x00\xca\xce\xfe\
-\xec\xf2\xb3\x7c\x6c\x2a\x47\x39\x46\x76\x81\xd6\xbc\xd4\x2a\x57\
-\x86\x00\xec\x2c\x11\x44\xae\xfb\x59\xde\x31\x91\x61\x25\xf4\x17\
-\xd0\x2d\xce\xec\xa2\xea\x01\xd0\x52\x2a\xc8\x5d\x3f\xeb\x5c\xd5\
-\xee\x5f\x05\xed\x05\x78\xbb\x71\x65\xf9\xbf\xc1\x22\x9e\x36\x26\
-\x9d\xf3\xa6\xf6\xfa\xbf\xa1\x75\x17\x68\xcd\x4b\xed\xec\xa2\xfc\
-\x00\x90\x2c\x1a\xbf\x59\x57\xc3\xe6\xb1\xa3\x34\xf2\x7b\xbf\x1a\
-\x5a\x57\xc0\xd7\x8f\x50\x00\x96\x8a\x47\x24\xdb\xfe\x95\x2f\x0f\
-\x68\x2e\x60\xaa\x8b\x4b\x04\xcf\x02\x98\x01\x30\xad\xc8\x23\x13\
-\x19\xbe\xd7\xe9\x69\xb1\x58\x2c\x16\x8b\xc5\x62\xb1\x58\x2c\x16\
-\x8b\xc5\x52\x8d\x5f\x44\x94\xcc\xbe\xc4\xf9\xa0\xab\x00\x00\x00\
-\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x00\x9b\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x00\x4d\x49\x44\x41\x54\x58\x85\xed\
-\xd7\xb1\x0d\x00\x20\x08\x05\x51\x34\x0e\x66\xc3\x04\xae\xc0\x98\
-\x26\xac\xe6\x06\x22\xc4\xf2\xae\xfc\x09\xc9\x6b\x11\xa1\x64\xba\
-\xcc\x75\x99\xbf\xee\x51\xa3\x60\x98\xc9\xfd\x5a\xaf\x1c\xfd\x0c\
-\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xd2\x9f\x51\
-\x13\xd9\x99\x9d\xa2\x0e\xd8\x07\x09\x21\x90\x7b\x88\xd1\x00\x00\
-\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x00\xf9\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x00\xab\x49\x44\x41\x54\x78\x9c\xed\
-\xd0\x31\x15\x80\x30\x00\xc4\x50\x8a\xb7\x2a\xc0\x02\xb2\xb0\x80\
-\x02\xc4\x95\x15\x07\x9f\x21\xd9\x6e\xba\xbc\x8c\x0d\x31\x8f\x73\
-\x7d\xf7\x73\x5f\x43\x78\xec\xe2\xf4\x4f\x14\x40\x0b\x68\x0a\xa0\
-\x05\x34\x05\xd0\x02\x9a\x02\x68\x01\x4d\x01\xb4\x80\xa6\x00\x5a\
-\x40\x53\x00\x2d\xa0\x29\x80\x16\xd0\x14\x40\x0b\x68\x0a\xa0\x05\
-\x34\x05\xd0\x02\x9a\x02\x68\x01\x4d\x01\xb4\x80\xa6\x00\x5a\x40\
-\x53\x00\x2d\xa0\x29\x80\x16\xd0\x14\x40\x0b\x68\x0a\xa0\x05\x34\
-\x05\xd0\x02\x9a\x02\x68\x01\x4d\x01\xb4\x80\xa6\x00\x5a\x40\x53\
-\x00\x2d\xa0\x29\x80\x16\xd0\x14\x40\x0b\x68\x0a\xa0\x05\x34\x05\
-\xd0\x02\x9a\x02\x68\x01\x4d\x01\xb4\x80\xa6\x00\x5a\x40\x53\x00\
-\x2d\xa0\x79\x01\x55\xd1\x04\x80\x1e\x3b\xba\xea\x00\x00\x00\x00\
-\x49\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x04\xe8\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x04\x9a\x49\x44\x41\x54\x58\x85\xc5\
-\x97\xd9\x76\xe2\x46\x10\x86\xbf\x66\x11\x12\x60\x50\x9c\xc4\x9e\
-\xf1\x24\x39\x59\xde\xff\x9d\x72\x31\x9e\x49\x1c\xcf\x18\x6c\x23\
-\x19\x24\xa8\x5c\xd4\xdf\xa8\x91\x71\x72\x97\xd4\x39\x1c\x89\x56\
-\xd7\xf6\xd7\xd6\x0d\x58\x09\x16\xf8\xcf\xc9\x02\x58\x19\xa4\x7c\
-\x09\xac\x21\x58\xf7\x91\x4b\x20\x1a\x96\x25\xef\x93\x44\x4a\x5c\
-\xb3\x64\x6d\x9b\xac\xed\xf4\x7e\x00\x1e\x7a\xf2\x97\xc0\x3a\xf4\
-\x16\x0e\xc0\x05\x30\x00\xaa\x44\x59\x90\x11\x13\xd8\x0d\x21\x8c\
-\x81\x71\xcf\xa5\x16\xac\x81\xac\x95\x11\x51\xb9\x01\x0d\x90\x4b\
-\xfe\x23\x30\x3c\x75\xd8\xf7\x2d\xc0\x7e\x11\x34\x63\xb0\x99\xd6\
-\x33\xb0\xf7\xf0\x50\x82\xe5\x60\x13\xb0\x82\x57\x64\x85\xbe\x4d\
-\xb5\xf7\xca\x79\xc1\xd7\x2c\x93\xec\x5f\xc1\x2e\xfa\x10\x02\xf6\
-\x01\xf8\x24\x24\x0c\x78\x01\x0a\xd8\xbd\x87\xec\xa3\xbc\x00\x58\
-\xc8\x8b\x73\x94\x7e\x9b\xc0\xee\x06\xb2\x5b\x21\x92\x4b\xdf\x1a\
-\xb8\x81\x70\x0b\x30\x92\xf2\x80\xc3\x3e\x96\xf2\x1b\xe0\xde\x19\
-\xb2\xfb\x44\xf9\x04\x0f\x91\x71\x1a\xf7\xe8\xcc\x4c\xca\xf4\xcb\
-\xbe\xc2\xa6\x80\xd9\x18\x78\x07\x7c\x94\x8e\x41\x0f\x01\xfb\x4e\
-\xff\x2b\x08\x15\xd8\xb5\xbe\xfd\x09\xcc\x1d\x8d\xd5\x0c\x4a\x5c\
-\x70\xa8\xcf\x03\x60\x73\xa0\xc5\xf3\xa5\xd2\xf3\x80\x27\xf4\x0e\
-\x78\xc2\xe3\xff\x0d\xb0\x82\xb0\x19\x25\xdc\x63\x29\xcf\xe5\xdd\
-\x1a\xb8\x92\xc5\x39\x94\x4f\x82\x71\x02\x66\x1d\x0f\x24\x08\xe5\
-\xc0\xb3\x94\x95\x42\x38\x03\xee\xf0\xf0\x64\x10\x9e\x12\x07\x3b\
-\x28\xdc\x52\x9b\xc0\xcb\xb5\x18\x83\xa0\x5c\x48\x68\xa4\x39\x1e\
-\x86\xb9\xf8\x07\xfa\x1f\xd7\x22\x6d\xc4\xbb\x93\xac\x00\xdb\xf7\
-\x4a\xcc\x63\xee\xc5\x10\xbc\x73\x41\x15\x30\xfd\x8c\xc7\xb2\x96\
-\xf5\x23\xc1\x56\x43\x75\x09\xd3\xb5\x23\x75\x8e\x6c\x21\x99\x35\
-\x30\x95\x03\x53\xba\xd2\x1b\x49\xf6\x1c\x0f\xc1\x97\x14\x81\x09\
-\xb4\x2f\x49\x6d\x16\x8a\xb5\xe1\x96\x5d\xc3\x74\xe5\x48\xbd\x49\
-\xb1\xce\xbf\x17\x8f\x09\x89\x58\xb6\x2d\x3c\x36\x78\xe8\xfa\x21\
-\x68\x4a\x58\x3c\x74\xc6\x30\x54\x3e\xe4\x78\xd2\xfc\x25\xc1\x85\
-\xfa\x41\xee\x49\x67\xb3\xee\x3f\x05\x9e\x37\x5f\x61\x73\x29\xde\
-\x3c\x91\x09\x2c\x9e\x49\x42\x15\x0d\xc8\xbc\x8b\x91\x0b\xc6\x52\
-\x1e\xb4\x62\x5c\xe1\x89\xf6\x20\x48\x73\x3d\x83\xa0\x9d\xba\x0c\
-\xa6\xae\x9c\x06\x66\x0f\xda\xd7\xe2\x3d\xe5\x12\xef\x31\x43\x68\
-\x4c\xfb\x63\x1f\x20\x40\x50\xd7\x0a\x8f\xde\xb9\x82\x32\xdb\x0c\
-\x82\xfa\xbb\x35\x12\x36\x06\xee\x7b\xbd\xfd\xca\x8d\x8e\x7c\xb4\
-\x60\x7b\x7f\x86\x1d\xd8\x33\x5e\x86\x03\xba\x24\x3f\xa9\x82\x61\
-\x52\xdf\x49\x93\xa9\xd3\x3d\xda\xc7\xbd\x7b\x63\xe9\x30\xbb\x4b\
-\x1c\x8a\x94\x4e\x59\xc9\x0c\x55\xe7\x6c\xc7\x30\x82\xf1\x21\xf1\
-\x86\xe4\xbd\x4d\x84\x8c\x80\xc6\x3d\xb7\x35\xea\x4c\x78\x46\x5b\
-\xd2\x1f\x52\x4a\x1d\x78\x35\x3d\x07\xc9\x73\x7f\x86\xb9\x4f\x87\
-\x9e\xc0\x3e\x9d\x6b\xcf\x96\xbc\xbf\xda\x17\x85\xed\xa0\x51\x57\
-\x0b\xd6\x6d\x0e\x06\xf5\xb0\x67\xc0\x30\x81\x7d\xa5\xdf\x32\x99\
-\x27\x7d\x83\x4f\x46\x6e\xdf\x98\x94\xa1\x55\x29\xf5\xac\x2d\xfa\
-\x75\xdf\xe2\x09\xa7\x79\x1e\x62\xdb\xbe\xa6\x3b\x03\x44\x0a\xaf\
-\xdf\xad\x00\x3b\xee\x8b\x39\x60\xca\x70\x53\x19\xce\x34\x58\xc0\
-\x4b\xb3\x94\xe2\x02\x6f\xb9\x6a\x36\x96\x42\xdc\x00\xdf\x4a\xb8\
-\x49\xb6\x0e\x21\x16\x3b\x20\x32\x76\x1f\xf9\xa2\x01\x3b\x08\x43\
-\x95\xdb\xd6\x0f\x24\x34\xfe\xdf\xc0\x33\x7f\x23\x21\x9f\xff\x61\
-\x1a\xee\x38\x9e\x76\xd6\x25\x2c\xef\x3a\x07\x79\xc0\x4b\x38\xee\
-\xd9\xc1\x49\x08\xc6\x75\xe2\xf5\x16\x35\x0a\x51\x05\x2f\x3f\xc9\
-\xf3\x73\x99\x7e\xb4\x40\x1e\x7e\x80\xe5\x53\xb7\xbc\x2a\xa4\x1c\
-\x37\x6c\xbc\x89\x5f\x06\x09\xe3\x06\xea\xb2\x63\xa2\xf6\x86\x14\
-\x0f\x1a\xf9\x2d\x3e\xdd\xfa\x67\xc1\x94\x22\xd4\x7f\xe0\xed\x36\
-\xf8\xb3\x4c\x86\x57\x36\x93\x31\x27\x21\xd8\xfb\xe6\xe2\x19\xec\
-\x86\x6e\xe0\x14\xf8\x49\xe6\x77\x3c\x9e\x7b\xa0\x74\xa4\xea\x41\
-\x97\xa0\xf5\x50\x02\xd5\x21\x8f\x7b\x7f\xc6\xbb\x9f\x8e\x77\x2c\
-\xa1\xb8\x95\xcc\x6d\x6a\x00\x6e\x40\x78\x06\x1b\xd0\xc5\x7c\x24\
-\x6f\x0e\x10\x36\x60\x2d\xf0\x0c\xe1\xe5\x3c\x00\x36\x77\x19\xa0\
-\x83\xeb\x67\x7c\x96\x6c\x24\x73\xe5\xf9\xd3\x45\x31\x0d\x41\xe3\
-\x93\x2d\x3c\x42\x7d\xe1\x9e\xb2\x96\xf5\x5b\xe5\xc7\x71\x8c\xbe\
-\x4d\x36\x56\xe8\x1a\x3c\xd1\xd6\xc0\x25\x54\x33\x47\xc3\x66\x5a\
-\x3f\x09\xc1\x57\xe0\x07\xdf\x6c\x4b\x60\x06\x2f\x41\x93\x74\x42\
-\x67\xb2\x0e\x97\x55\x05\x85\xd1\x75\xcf\xd8\xac\x0a\x3c\xdb\x77\
-\x38\xf3\xc2\x8d\xaf\xa7\x30\x9d\xe3\x13\x76\xe3\x8e\x87\x4d\x62\
-\x40\x30\xb0\x03\x5e\xeb\x01\xf8\x04\x45\x34\x86\x0e\x56\xf0\x30\
-\x4c\x75\xf4\x36\x21\x18\xe2\x1c\x59\x38\x82\xc7\xbd\x17\x6e\xcc\
-\xf4\x8b\x64\xc5\xd9\x72\xee\x50\x63\x17\xba\x34\xf4\x2f\x26\x0b\
-\xa8\x7e\xec\x2e\x23\xff\x76\x31\x01\xe7\xad\x3e\x74\x65\x7d\x72\
-\x31\xf9\xed\xcc\xc5\xe4\xd8\xdb\xf7\x82\x6d\x20\x2b\x33\x1c\xfe\
-\x81\x7f\x6f\x32\x79\x30\x84\x71\x7a\xf7\xcb\x75\x30\x6e\x7d\xd4\
-\x8e\x6a\xbc\x67\xec\xc5\xdb\xd0\x0d\xa6\x35\xc9\xd5\xec\x8d\xcb\
-\x69\xf4\xe2\x98\x70\xc3\xe4\x7d\xa2\xf7\x09\x6c\x35\x3b\x26\x95\
-\x94\x18\xdd\xe5\x54\x06\xb9\xb0\x18\xf3\x9e\xc3\x6b\xf8\x9f\xaf\
-\xe7\x7f\x03\x88\x7c\xd3\x3b\xed\x32\x4f\xdf\x00\x00\x00\x00\x49\
-\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x02\x27\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x01\xd9\x49\x44\x41\x54\x58\x85\xe5\
-\x96\x31\x6b\x54\x41\x14\x85\xbf\x33\x59\x45\x09\x2a\x5a\xd8\x58\
-\x58\xd9\x58\x88\x4d\xd8\xa4\xb1\x4c\x40\x09\xb8\x89\xae\x95\x01\
-\x3b\x1b\x21\x3f\x40\x2c\x42\x7a\x11\x04\x4b\x21\xa9\x7c\xba\x89\
-\x10\x2c\xa2\x9d\x8d\x59\xd3\x48\x0a\x1b\x41\x04\x4d\x63\x67\x64\
-\x51\x92\xec\x1c\x8b\x65\xc1\x4a\xdf\xbc\x37\x28\xe8\xa9\xe7\x9e\
-\xfb\xdd\x3b\xf7\xce\x7b\xf0\xbf\x4b\xb9\x0d\x27\x0a\x9f\x88\x0d\
-\xbf\xb7\xf0\xeb\x56\x38\xfe\xbb\xf3\x8d\x9c\xc9\xcf\xad\x7b\x34\
-\xf6\xfc\x0c\x38\x26\x97\x8b\x09\xb9\x92\x9f\x2d\x7c\xf0\x70\xcf\
-\x2b\xc0\x78\x4a\x5c\x16\x80\xab\x85\x47\x8e\x1c\x88\x4b\xc0\x64\
-\xc9\xc2\x33\x02\xd8\xfa\xd8\x88\xf7\xb1\xae\x61\x23\x13\xff\x28\
-\x40\x73\x25\x2e\x18\xdd\x04\x83\x14\x11\x49\x4d\xa8\x05\xd0\xec\
-\x78\x1e\xe9\x36\x80\xad\x08\x69\xc9\x6b\x01\x34\x3b\xbe\x8e\x7c\
-\x97\x41\xd6\xa8\xc4\xca\x6b\x01\x8c\x3f\xf5\x34\xf2\x43\x18\x54\
-\xae\x0a\x95\x0f\x95\xfc\x0e\x8c\x75\x7c\xc1\xd1\x05\x30\x62\xec\
-\xaa\x95\x0f\x95\xd4\x81\xb1\x55\x9f\x0f\xf2\x1a\x70\x08\x6c\xa1\
-\xa4\x89\xaf\x05\xd0\x7c\xe2\x33\xc1\x5e\x07\x8e\x5a\x98\x0c\xc9\
-\x4b\x03\x4c\x14\x3e\x45\xf0\x0b\xe0\x24\xc2\xa9\xbb\xfe\x2b\x95\
-\x9a\x81\xd8\xf0\x27\x00\x63\x72\xb4\xfd\x67\x95\xbd\x82\x2d\x80\
-\xb2\x1f\x98\xec\x00\x61\x5f\x17\x81\x0f\x48\xa5\x63\xb2\x02\xbc\
-\x6a\x6b\x9b\xa8\x49\xe0\x33\x46\x56\x3e\x88\xd2\x46\xdd\x2b\x7a\
-\x17\xa5\x29\x60\x47\x46\xc6\x59\x20\x92\x4c\x36\x5b\x7a\x13\xad\
-\x69\xe0\xbb\x50\x16\x88\x64\x83\xcd\x59\xbd\x54\x50\x1b\xe8\x0f\
-\x20\x54\xeb\xb7\xae\x52\x05\x1b\x97\xb5\x86\x75\x03\x40\x83\x2e\
-\x54\x86\xa8\xdc\xc2\xee\xac\x96\x91\xe6\x87\x3e\xae\x08\x51\xeb\
-\x0e\xbb\x2d\xdd\xc3\x5e\x04\x50\x45\x88\xda\x43\xd4\x9d\x09\x77\
-\x6c\x3f\x00\x90\x9d\x0c\x51\x7f\x95\x24\x9f\xee\x87\x5b\xc8\x8f\
-\x90\x90\xd3\x36\x23\xcb\x2e\x3f\x6e\xab\xff\x75\x2f\xcc\x01\xcf\
-\x53\x97\x22\xdb\x8b\xf6\xb6\xad\xdd\x6f\xa3\x9a\x01\x36\xfe\x0a\
-\x00\xc0\xd6\x94\x7a\x61\x5f\x97\x90\x77\x6c\xbe\xe4\xf4\xfe\x77\
-\xf5\x03\x8b\xca\xad\x03\x49\x73\x42\xef\x00\x00\x00\x00\x49\x45\
-\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x02\xd8\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x02\x8a\x49\x44\x41\x54\x58\x85\xe5\
-\x96\x3d\x72\xd3\x40\x18\x86\xdf\xd7\x49\x01\x9c\x83\x12\x5a\x4b\
-\x70\x05\x0a\xa2\x35\xc4\x21\x24\x71\xfe\x66\xc2\x01\x32\xc3\x19\
-\x28\xd3\x51\x24\x01\x3b\xe4\xd7\x48\xce\x0c\x67\x60\xc6\xd6\x21\
-\xa0\x83\x1b\x00\x05\xd6\x4b\xe1\x28\xc8\x2b\xc9\x92\x3c\x6a\x18\
-\xbe\x4a\x5a\x7d\xfb\x3e\x8f\x77\x25\xcf\x02\xff\x7b\x31\xbe\x78\
-\x74\xad\xc7\x51\xa4\xb7\x10\xee\x92\x7c\x3d\x34\x0c\xea\x04\xb9\
-\x81\x8c\xa4\x37\x24\x7e\x41\x7c\x35\x6c\xf1\x33\x00\x34\xe2\x86\
-\x28\xd2\x11\x80\x87\x20\xee\x0b\xea\xbb\xbe\xda\x75\xc1\x9d\x40\
-\x2b\x82\xfa\x93\x6c\x3c\x10\x75\x18\x3f\x6b\x24\xfa\xee\x24\xae\
-\x1b\xa2\xce\xea\x90\x70\x02\xad\x00\x3a\x4d\xb2\x48\xdc\x4b\x0b\
-\x90\xfb\x00\xa2\x3a\x25\x26\x73\xa7\xe1\x00\xa2\x48\xdc\x4f\x09\
-\x8c\x3c\xfa\x22\xd7\x32\x24\x4e\xe7\x91\x70\x7d\xb5\x45\x9d\xd9\
-\x70\x90\x9d\xd0\xb0\x9f\x12\x00\x80\xd0\xe3\x79\x86\xc4\x42\x55\
-\x89\x1b\x78\xea\x97\x83\xec\x8c\x3c\x7e\x48\xf6\x36\x60\x55\xe8\
-\xf1\x5c\xe2\x7a\xa6\xc4\x40\xcb\x85\xf0\x81\x96\x6f\xe0\x0b\x45\
-\x70\x20\xf1\x19\xda\xd5\xf4\xb5\x4a\xea\xc4\x92\x1c\x93\x5c\x1d\
-\x7a\xbc\xca\x85\x4b\x67\x16\x5c\x20\x37\xb2\xe0\x33\x05\x00\xc0\
-\x0d\xf4\x52\x50\xaf\x8c\x44\x33\xd0\x73\x42\xe7\x55\xe0\x85\x02\
-\xb3\x24\x04\xbe\x88\x5f\xa6\x79\xe1\xa5\x04\x00\xc0\x19\x68\x0d\
-\x52\x37\x4b\x62\x12\x92\x01\x17\x3b\xa3\x16\x4f\x8a\xb2\x4b\x09\
-\xe4\x49\x48\x88\x40\x80\xd3\x62\xa5\xe1\x95\x04\x12\x12\xbd\x19\
-\xf3\x2a\xc1\x2b\x0b\xdc\x4a\x00\x3d\x48\xf6\x5c\x09\xdc\x0c\x0d\
-\x7b\x55\xf2\x52\xff\x03\x25\xea\xa7\x24\xd9\x83\x02\x44\xe1\x47\
-\xd5\xb0\x4a\x02\xce\x40\x2d\x48\x17\xcc\x98\x47\xa0\x01\xea\xc2\
-\xf1\xf5\xac\x4a\x66\xe9\x2d\x70\x03\x19\x41\x97\x00\x16\x13\xc3\
-\x02\x09\x6b\x3b\xc6\x20\xdb\x23\x8f\x7e\x99\xdc\x52\x2b\x90\x07\
-\x17\xb8\x25\x61\x13\x40\x72\x4b\x16\x20\x5d\x3a\x03\xb5\x6a\x11\
-\x68\xfa\xf2\xf2\xe0\xa1\x61\x37\x34\xec\x09\xdc\x9a\x57\x62\xa6\
-\x40\xd3\x97\x47\xea\xca\x86\x93\xdc\x0e\x0d\xbb\xf1\x40\x68\xd8\
-\xcd\x91\xb8\x28\x92\xc8\x15\x98\x05\x1f\x7a\x7c\x6f\xf7\x87\x86\
-\x5d\x92\xdb\x96\xc4\x62\x91\x44\xe6\x4b\xd8\x1c\x68\x89\x52\xbf\
-\x2c\x3c\x59\xee\x40\x9b\x92\x8e\xad\xec\xdf\x04\xdb\x59\x07\xdd\
-\xd4\x0a\xe4\xc1\x01\xee\x14\xc1\x01\x60\xd2\xc3\x1d\x58\x2b\x21\
-\xe8\xd2\x0d\x64\xec\xfe\xa9\x15\x70\x02\x3d\x05\xf4\x31\x0b\x3e\
-\x32\x7c\x57\x04\xb7\xb2\xb6\x00\x1d\xa1\x60\x25\x6e\x1f\x36\x7d\
-\x3d\x21\x75\x5d\x07\x3c\x21\xb1\x0d\xe8\x30\x25\xd1\xa0\x19\x2e\
-\xf1\x13\x30\x75\x2a\xd6\x41\x06\x7c\x77\x5e\x38\x00\x8c\x0c\x8f\
-\x01\xee\xc2\xde\x8e\xb1\x0e\xe2\x9b\xbf\x67\xf5\xe9\x33\x60\x0c\
-\x3f\x9e\x17\x5e\x20\x31\x4e\x09\x40\xdc\x03\xf0\x05\xc0\x77\x88\
-\x9d\x3a\xe0\x53\x12\xe4\x06\x80\x6f\x10\xbe\x8a\xdc\xab\x2b\xfb\
-\xdf\xaf\x3f\xf0\x88\x83\xb8\x80\x8e\x5a\x2b\x00\x00\x00\x00\x49\
-\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x00\xa4\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x00\x56\x49\x44\x41\x54\x58\x85\x63\
-\x60\xa0\x00\x58\xac\xfd\xdb\x60\xb1\xf6\x6f\x03\x25\x66\x30\x51\
-\xa2\x99\x1a\x60\xd4\x01\xa3\x0e\x18\x75\xc0\xa8\x03\x46\x1d\x30\
-\xea\x80\x01\x77\x00\x0b\xe5\x46\xfc\x77\xa0\xa4\x4a\x1e\x0e\x21\
-\xc0\x78\xe0\x44\x30\x73\x03\xb9\xba\x07\x3c\x04\x46\x1d\x30\xea\
-\x80\x51\x07\x8c\x3a\x60\xd4\x01\xa3\x0e\x18\x70\x07\x00\x00\x30\
-\xcb\x0b\x07\x89\x28\x47\x47\x00\x00\x00\x00\x49\x45\x4e\x44\xae\
-\x42\x60\x82\
-\x00\x00\x03\xf0\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x03\xa2\x49\x44\x41\x54\x78\x9c\xed\
-\x97\xbd\x6f\x1c\x45\x18\xc6\x9f\x67\x6e\xb1\x8c\x94\xd0\xc4\x29\
-\xa2\xfb\x8e\xb0\x30\x35\xa1\x87\x20\x2c\x94\x0a\xa7\x4c\x07\x51\
-\x04\x7f\x00\x10\x51\x44\x08\x21\x21\x3e\x6a\xa4\x28\x31\xe9\x10\
-\x05\x08\x68\x88\x25\x4b\xe0\x02\x3a\xa0\xc6\x91\x89\x76\x76\xf7\
-\x4e\x29\x9c\x8e\x02\x07\xdf\xcd\x43\x71\x32\xba\xdb\xdd\xf3\x7d\
-\xf8\xf6\x9c\x8f\xf9\x95\xf3\xee\x3b\xf3\xbc\xcf\xbe\xbb\x33\x03\
-\x78\x3c\x1e\x8f\xc7\xe3\xf1\x78\x3c\x1e\x8f\xc7\xe3\xf1\x78\x9e\
-\x2c\x78\x5c\x0b\x5b\x9b\xac\x81\xf8\x02\xa0\x01\x71\xb3\x51\xab\
-\x5c\x3b\x0e\x1d\xc7\x62\x40\x14\x25\x57\x04\x5c\x07\x60\xfe\x1f\
-\x14\xae\x34\x1a\xd5\xf5\x79\x6b\x31\xa3\x1f\x99\x2d\x51\x94\x5c\
-\x15\x70\x23\xb3\x36\x71\x33\x8a\x92\xf7\xe6\xad\x67\x6e\x1d\x20\
-\x89\x51\xd2\xfa\x0c\xc2\x3b\x23\x1e\xfd\xbc\x5e\xab\x5c\x25\xa9\
-\x79\xe8\x9a\x8b\x01\x92\x82\x28\x6a\xdf\x00\xf5\xc6\x58\x09\xc4\
-\xad\x7a\xb5\xf2\x16\xc9\x4e\xc1\xd2\x8a\x37\x20\x0c\xc3\x45\x32\
-\xf8\x1a\xc4\xeb\xfd\xe3\x02\x40\xc8\xa9\x27\xc1\x64\x84\x10\xdf\
-\xab\xdb\xb9\xd4\x6c\x36\xf7\x8a\xd4\x57\xe8\x3f\x60\x67\x67\xe7\
-\x19\x9a\xe0\x76\xa6\x78\x01\x04\xba\x00\x45\x40\x04\xba\x99\x7e\
-\x17\xd6\x68\x82\x1f\xb7\xb7\x77\x4f\x16\xa9\xb1\xb0\x0e\xd8\xb9\
-\x77\xef\xf4\x53\xff\x76\x36\x00\xbc\x30\x10\x90\x00\x9a\x6e\xaf\
-\x07\x52\x52\xe4\x4a\x60\x46\xd2\xef\xfb\x0b\xc1\x85\xe5\x33\x67\
-\x76\x8b\xd0\x59\x88\x01\x77\xef\xb6\x6b\xa5\xc0\x6d\x02\x78\x2e\
-\xb5\x9a\x00\x3a\x68\xd8\xff\x8d\x00\x65\xa0\x8c\xae\x3b\x9d\xc0\
-\xbc\xfa\x6c\xb9\x9c\xcc\x5a\xeb\xcc\x0d\xb0\xd6\x3e\x0f\x96\x36\
-\x01\x54\x52\x2b\x09\x82\x1b\x53\x94\x51\x4a\x1b\x81\xc4\x39\xb3\
-\xda\x6c\x96\xb7\x67\xa7\x76\xc6\xff\x80\x38\x8e\x5f\x04\x4b\xbf\
-\x20\x5d\x3c\xc6\x2f\xbe\xf7\x30\x1c\x30\xb8\x0d\x0a\xa8\xd2\xb8\
-\x5f\xe3\x38\x3e\x37\x0b\xad\x07\xcc\xcc\x80\x28\x6a\xbd\xe2\xc4\
-\x9f\x01\x9c\x4a\x85\x44\x8e\x5f\xfc\x01\xa4\x1c\xb2\xdf\xca\x29\
-\x27\x6e\x59\xdb\x3a\x3f\xb5\xd0\x14\x33\x31\xc0\xda\xe4\xa2\xa0\
-\xdb\x00\x4e\x0c\x04\x04\x01\x70\x43\x3f\xf9\x43\xe8\xe5\xd0\x41\
-\x99\xec\x13\xa0\x36\xac\x4d\xd6\xa6\x53\x3b\xc8\x91\x0d\xb0\x36\
-\xb9\x0c\xe2\x1b\x00\x0b\x03\x01\xd2\x61\x8a\x37\x9f\x81\x74\x20\
-\xd3\xf3\x2c\x80\xf8\xd6\xda\xf8\xcd\xa3\x4e\x7f\x24\x03\xac\x4d\
-\xde\x05\xb1\x9e\x9e\x87\x40\xde\x9b\x9b\x1e\xa9\xb7\x7b\x0c\x62\
-\x40\x7e\x69\x6d\x3c\xea\x68\x7d\x28\x53\xed\x02\x92\x68\xe3\xd6\
-\x27\x04\xf2\x2e\x2f\x0e\xd9\x4d\x7e\x56\x10\x39\x2f\x4d\xc0\xa7\
-\x8d\x5a\xe5\xfd\x69\xee\x0f\x13\x1b\x20\x29\x88\x92\xd6\x75\x08\
-\x97\x73\x84\x38\x16\x57\xfc\xc1\x1a\x64\x7e\xe7\xae\xd7\x6b\x95\
-\xb7\x49\x76\x27\x99\x6f\x22\x03\xc2\x30\x5c\x64\x29\xf8\x0a\xc2\
-\xc5\x8c\x30\xc1\x91\xc5\x16\xdf\xb7\x16\xc9\x1c\x13\x88\xef\xf6\
-\x1f\xec\x5d\x5a\x5e\x5e\x7e\x30\xee\x5c\x63\x1b\xb0\xbd\xbd\x7b\
-\x72\xf1\xe9\xbd\x1f\x00\xe4\x6c\x41\xca\xec\xdb\xc5\x23\x02\xcc\
-\xeb\x84\x9f\xf6\xfe\x59\x5c\x5b\x59\x39\xfd\xf7\x38\xb3\x8c\x65\
-\x40\xbb\xdd\x5e\xda\xef\xb8\x0d\x00\x03\x87\x10\xf5\xfa\x71\xa2\
-\x96\x9b\x35\x12\x4a\xe9\xeb\x83\x80\xdf\x16\x02\x73\xa1\x5c\x2e\
-\xdf\x1f\x95\x3f\xd2\x80\xbf\xda\xed\x6a\xd0\x71\x9b\x00\x56\x06\
-\x12\x09\x69\x82\xd3\x5d\x91\x90\x30\xca\xdc\x1f\xf4\x67\x50\x32\
-\xab\x95\x4a\xa5\x75\x68\xee\x61\xc1\x30\x6c\xaf\x18\xe3\x36\x05\
-\x54\x53\x69\xea\xb5\xfd\xc3\x04\x4d\xef\xb3\xe8\x1f\x42\xec\x3a\
-\x66\xf5\xec\xd9\xf2\x9d\xa1\x59\xc3\x02\x71\x1c\x9f\x73\xe2\x06\
-\x80\xa5\x54\x48\xc0\xc3\xf1\xe6\x73\x30\xc8\xd6\x74\x9f\x70\xaf\
-\xd5\xeb\xf5\x3f\x86\x25\x64\xb0\xb6\xf5\xb2\x13\xb7\xf0\x68\x15\
-\x0f\xe4\x9f\x41\x96\x04\xb3\x15\x86\xc9\x4b\x79\x09\x99\x0e\xb0\
-\x71\x7c\x0d\xe2\x87\x79\xb1\x47\x1c\x81\xfa\xa0\x51\xab\x7d\xd4\
-\x3f\x98\x29\x32\x8a\x92\x8e\x80\xd2\xfc\x74\xcd\x0f\x02\xdd\x7a\
-\xbd\x1a\xf4\x8f\xe5\x1d\x2b\x1f\x5b\xf2\x6a\xcb\x18\x60\xc8\x8f\
-\x73\x2e\x1e\x8f\x01\x74\xbd\xda\x3c\x1e\x8f\xc7\xe3\xf1\x78\x3c\
-\x1e\x8f\xc7\xe3\xf1\x78\x3c\x4f\x36\xff\x01\x8b\x04\x4e\x83\xb0\
-\x2f\x88\xa2\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x03\x2d\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x02\xdf\x49\x44\x41\x54\x78\x9c\xed\
-\xd5\x3f\x88\x14\x67\x18\xc7\xf1\xef\x33\xb3\x77\x08\x7a\x68\x93\
-\x10\xdd\x99\x9b\x59\xb7\x10\xe2\x35\x91\x2b\xa2\x42\x8a\x20\x01\
-\x95\x24\x58\xd8\x48\x34\x29\x44\xb0\xb0\x08\x81\x60\x0a\x91\x40\
-\x0a\xc1\x10\xb0\x11\x42\x6c\xa2\x45\x24\x11\x84\xc4\xc4\x34\x16\
-\x11\x2e\x68\x63\x75\x58\x68\x74\xde\x99\x59\x41\xcf\x53\x38\x14\
-\x3d\x6f\xdd\x7d\x52\x48\xc2\xde\x70\xfe\xe1\x66\x76\x15\x7c\x3e\
-\xe5\xfb\xcc\xfb\xdb\xe7\x7d\x66\x5f\x06\x8c\x31\xc6\x18\x63\x8c\
-\x31\xc6\x18\x63\x8c\x31\xc6\x18\xf3\xba\x90\xb2\x01\x69\x9a\xbe\
-\xad\x78\xc7\x81\x3a\xca\x77\x51\x14\x7c\x2b\x22\x5a\x41\x6f\x0b\
-\x72\x2e\xdf\x86\x70\x18\x00\x65\x5f\x1c\x87\x67\xcb\xe4\x55\x30\
-\x80\xfc\x2f\x85\xf7\x7a\x96\x4e\xdc\xbf\x37\xb3\x7b\x6c\x6c\x6c\
-\xae\x6c\x76\x2f\x55\x95\x2c\x6b\x7d\xa9\x70\xa8\x67\x79\x66\xfa\
-\xf6\xad\x37\xc6\xc7\xc7\xdb\x8b\xcd\xf5\x4a\x37\x86\x14\x33\x76\
-\x2e\x1b\x59\xfe\x67\x92\x24\x2b\xca\x66\xff\xff\x1b\xaa\xb5\x2c\
-\xcb\x8f\x16\x0e\x0f\x15\xbc\xc0\xd2\x01\x59\x96\x8d\x75\x55\xce\
-\x01\x6f\x16\x4a\x97\xbb\x1d\x7f\xcb\xea\xd5\xab\xd2\x32\xf9\x53\
-\x53\x53\xcb\x1e\x3c\x7c\x74\x12\xd8\x5a\x28\x3d\x12\xbc\xed\x51\
-\x54\xff\xad\x4c\x7e\xe9\x01\x00\x38\xe7\x1a\x88\x7f\x16\x58\x53\
-\x28\xdd\x44\xfd\xad\x71\xbc\xea\xd2\x22\x73\x57\x22\xde\x19\x90\
-\x75\x85\xd2\x5d\xc1\xfb\x28\x8a\xea\x13\x8b\x6a\xb8\x47\xe9\x2b\
-\x00\x10\xc7\x71\xe2\x7b\x6c\x10\x38\x5f\x28\xbd\x85\x74\xce\x3b\
-\xd7\x2a\xbe\xbd\xe7\x4a\xd3\x74\x2d\x9e\x7f\x61\x81\xc3\x5f\xef\
-\xf8\xb2\xbe\x8a\xc3\x43\x45\x03\x00\x08\xc3\xf0\xee\xdc\xdc\xec\
-\x07\x28\x3f\x15\x4a\x4b\x11\xfd\x35\xc9\xb2\xbd\x2f\x9a\xe5\x5c\
-\xeb\x7d\xc5\x9b\x40\x19\x9d\x57\x50\x2e\xb6\x87\x6b\xef\x36\x83\
-\xe0\x4a\x15\x3d\x43\x45\x57\xa0\x97\xaa\x7a\x59\x96\x7f\xa3\xc8\
-\x57\x0b\x94\x0f\x47\xa3\xc1\x7e\x11\xe9\x3e\x6d\x7f\x9a\xb6\x76\
-\x29\x7a\x0c\x18\x9a\x57\x10\x4e\x0f\xf9\xde\x27\xf5\x7a\xfd\x41\
-\x95\xfd\x56\x3e\x80\xff\xa4\x69\xbe\x47\xe1\x28\xe0\xf7\xae\x2b\
-\xfa\x33\xdd\xce\xa7\x8d\x46\x63\x76\xde\xfa\x93\xcf\xdc\x01\x85\
-\xaf\x8b\x59\x0a\x47\xe2\xd1\xe0\x0b\x11\xe9\x54\xdd\x67\xdf\x06\
-\x00\xe0\x5c\xbe\x19\xe1\x17\x60\xe9\xfc\x8a\x4e\xd4\x7c\xef\xe3\
-\x20\x08\xee\x00\x4c\x4e\x4e\x0e\x8f\x8c\xac\xf8\x5e\xd1\xcf\x0a\
-\x11\x2a\xf0\x79\x14\x85\x47\xfa\xd5\x63\x5f\x07\x00\xe0\xdc\x8d\
-\x77\x90\xee\xef\xc0\xca\xde\x75\x85\xab\xbe\xe8\xe6\x76\xbb\x3d\
-\xed\xd7\x86\x4e\x81\x6c\x2a\x6c\x9d\x45\xd9\x11\xc7\xe1\xe9\x7e\
-\xf6\xd7\xf7\x01\x00\x5c\xbb\x76\x63\xd4\xaf\x75\xff\x00\xd6\xbe\
-\xe0\x96\x69\xed\xca\x87\x8d\x46\x70\xa1\x9f\x7d\x41\x85\x5f\x81\
-\x67\x69\x36\xeb\x59\xe7\xf1\xdc\x46\xe0\xdc\xf3\x9e\x55\xb8\xea\
-\x7b\xac\x1f\xc4\xe1\x61\x40\x03\x00\x68\x36\x9b\x33\xf7\xef\xcd\
-\x6c\x11\xf4\xc7\x67\x3c\xf6\xf7\x70\xcd\xdb\x10\x86\xe1\x3f\x83\
-\xea\x6b\x20\x57\xa0\x97\xaa\x8a\xcb\x5a\x07\x05\x0e\x16\x4a\xa7\
-\x7c\x8f\x5d\x61\x18\x3e\x1c\x74\x4f\x2f\x85\x4b\xf3\x1f\x5c\x9a\
-\x3f\x76\x69\xde\x4e\xd2\xfc\x90\xaa\x0e\xec\xdf\xf8\xca\x50\xd5\
-\x5a\x92\x24\x4b\x5e\x76\x1f\xc6\x18\x63\x8c\x31\xc6\x18\x63\x8c\
-\x31\xc6\x18\x63\xcc\x6b\xe2\x5f\xd1\x80\xf4\xd2\x90\x91\xe7\x38\
-\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x02\x2d\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x01\xdf\x49\x44\x41\x54\x58\x85\xe5\
-\x96\xb1\x6b\x14\x51\x10\x87\xbf\xdf\xbb\x43\x82\x82\x47\x2c\x6c\
-\xac\xed\x2d\xad\x2c\x24\xb7\x01\x25\xcd\xc5\x8d\xd5\x05\x64\x15\
-\xd3\x08\xf9\x03\xc4\x42\xec\x45\x10\x54\xe2\x21\x78\x95\xae\x77\
-\x4d\xb0\xf0\x36\x58\x58\x59\x8a\xad\x20\x16\xda\xd8\xe8\x05\x0c\
-\x41\x72\x6f\x2c\x56\xc5\x4a\xf7\xed\x3e\x22\xe8\x74\x03\x3b\x33\
-\xdf\xfc\x76\xe6\x31\xf0\xbf\x9b\x62\x27\x5c\x4c\xb3\x23\xde\xeb\
-\x2d\x60\xc5\xe8\xfe\xfc\x9f\xbe\x6f\xc7\x2c\x9e\xf4\xfb\x87\xfc\
-\x8e\x9e\x02\x9d\xaa\x31\x2e\x56\xf1\x34\x4d\x0f\xd8\xce\xdc\x18\
-\x38\x19\x12\x17\x05\x20\x4d\xd3\xd6\x27\xdf\x79\x08\x96\x84\xc6\
-\xc6\x00\xd0\x67\xdf\xb9\x2d\x38\x8f\x01\xe0\xf7\x15\x60\xe1\x5c\
-\x76\x1d\x58\xc3\x00\x27\x0f\xdf\x31\x2a\x5a\xa3\x21\x5c\xe8\x5d\
-\x5c\x97\x71\x15\x00\xc9\x63\x16\x54\x1c\x1a\x28\xd0\xed\x65\x7d\
-\x89\x9b\x3f\x8b\x13\x5e\xbc\x36\x40\xb2\x9c\x2d\x21\x3d\x28\xbd\
-\x7a\x9d\xd7\x06\x48\x7a\xd9\x29\x43\x8f\x81\x96\x61\x56\xb7\xf3\
-\x5a\x00\xdd\xf4\xd2\x09\x93\xdb\x04\xe6\x30\x33\xa1\xa0\x89\x6f\
-\x04\xd0\x5d\xbe\x7c\x1c\x6f\xcf\xc0\x0e\x1b\x58\xf9\xdf\x9b\x5b\
-\x25\x80\xd3\xe9\xda\x31\x98\x15\xc0\x51\xc0\x14\xb8\xeb\xbf\xb3\
-\x4a\x6b\xd8\xf2\x7b\xef\x7f\x71\xa3\x15\x87\x8a\x0a\x08\x5e\x43\
-\xe0\x0b\x13\x13\x60\xcf\xb5\xcf\x80\xbd\x53\x40\x4c\x54\x80\xe7\
-\xf9\xdd\x0f\xd0\x4e\x80\x8f\x80\x2c\x22\x44\xe5\x44\xc5\xe8\xde\
-\x1b\x9c\x16\x41\xdb\x2a\x0f\x99\x28\x10\x41\x49\x8a\x7c\xe3\x95\
-\xcc\x2f\x01\xbb\x80\xcc\x9a\x43\x04\x27\x98\x8c\x07\x2f\x84\xad\
-\x00\x33\x09\x81\x1a\x9d\x75\xb5\x3a\x98\x8c\x06\x9b\x98\x5d\x28\
-\x3d\x73\x34\xb8\x2d\x6b\x4b\x58\x8c\x07\x43\xd0\xfa\x8f\x3c\xa5\
-\x1a\xfb\x08\x00\x50\x8c\x36\x6e\x99\xec\x06\x80\x79\x9c\x6a\x28\
-\xd1\x78\x88\xb6\x9e\x0c\xae\x09\xee\x20\x30\xc3\x11\xa8\x44\x8c\
-\x55\xb2\x8e\x9b\x5e\x31\x78\x84\x80\xc0\xcd\x88\xb2\xcb\x79\x9e\
-\xcf\xe6\xdd\x74\x15\x34\x09\x8d\x8d\xf6\xa2\xe5\x79\xfe\x55\x07\
-\x77\x7b\xc0\xcb\xbf\x02\x00\x30\x19\x0e\xbf\x38\x67\x67\x91\xb6\
-\x81\x69\xcc\xdc\xff\xae\x7d\x03\x68\x47\x95\x0a\x88\x7f\x49\xe0\
-\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x03\x38\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x02\xea\x49\x44\x41\x54\x78\x9c\xed\
-\x98\xc1\x6b\x13\x41\x18\xc5\xdf\xb7\x69\xda\xb4\x45\x2a\xa2\xf5\
-\x90\x4c\x36\x09\x04\x4f\xde\x8a\x15\xaa\x17\x11\x04\x2f\x2a\x82\
-\x22\x1e\xec\x41\x10\x04\xe9\xc5\x9b\xa0\x07\xbd\x89\x7f\x81\xa0\
-\x1e\xa4\x78\x11\x44\xa1\x08\xa2\xf5\x20\x1e\xbc\x29\x82\x2d\xb1\
-\xcd\x4e\x36\x11\xb4\x05\x4d\x15\x1b\x9a\x64\x3f\x4f\x62\x93\x6c\
-\x4d\x0b\x99\xd9\x1e\xbe\xdf\xf1\x7d\xb0\xef\xcd\xdb\x59\x66\x58\
-\x40\x10\x04\x41\x10\x04\x41\x10\x04\x41\x10\x04\xa1\xc7\x78\x9e\
-\x3f\xed\x69\x9f\x3d\xed\x73\xb1\x54\x9a\x8c\x3a\x4f\x3b\x64\xf2\
-\xe1\xc5\x62\x31\x41\x4e\xdf\x6a\x8b\xc8\x74\x24\x93\x49\xcd\x9a\
-\xf4\xdd\x0a\x8e\xc9\x87\x0f\x0f\x0f\xf7\x75\x88\xc4\xaf\xb4\xd6\
-\x39\x93\xbe\x5b\xc1\x68\x01\xa3\xa3\xa3\xbf\xc2\x74\x86\xb3\x30\
-\x37\xb7\xb4\xc3\xa4\xf7\x66\x31\x5a\x00\x00\xb8\xe9\x54\xe7\x2e\
-\x00\x90\x18\xac\xad\x30\xb3\x71\xff\x6e\x18\x0f\x40\x44\xcd\xfa\
-\x5a\x6d\x24\x6c\xa6\x4b\xe5\xa6\x69\xff\x6e\x58\x79\x03\xf9\x7c\
-\x7e\x25\xe6\x20\x1f\x36\xf3\x74\xe9\x8d\x8d\x0c\x1b\x61\x6d\x0b\
-\x2a\xa5\x3e\x13\xe8\x68\xe7\x84\x26\xbc\x92\x7f\xdb\x56\x8e\x76\
-\xac\x7e\x83\xae\x9b\x7a\x09\xc6\x95\x8e\x01\xe3\xaa\xe7\xf9\xe7\
-\x6d\x66\xf9\x8b\xd1\x7b\xc0\x46\x68\x5d\x7a\xc0\xa0\x0b\xed\x7a\
-\xe0\x60\x3c\xa7\xd4\x3b\x9b\x59\x22\x29\x00\x00\x3c\xed\x2f\x00\
-\xe8\xb8\x0f\x38\xc4\xc9\x74\x3a\xfd\xc5\x56\x8e\xc8\x0a\x00\x00\
-\x4f\xfb\x1c\xa6\xc7\x1c\x0c\x29\xa5\x56\xc3\x66\xbd\x26\xd2\x73\
-\x78\x79\xe9\x6b\x7f\x98\xde\x0c\xf0\x9b\x99\xad\xbc\x9c\x48\x77\
-\x00\x00\x54\x2a\x95\xdd\xf5\x46\xb0\x14\x32\xaa\x66\x5c\xb5\xd3\
-\xb4\x7f\xe4\x37\xb1\x64\x32\xb9\xec\x10\xef\x0f\x19\x8d\x68\x5d\
-\x7e\x64\xda\x3f\xf2\x02\x00\x20\x9d\x4e\x7f\x64\xe2\x93\xed\x3a\
-\x83\xcf\x9a\xf6\xde\x16\x05\x00\x00\x9a\xb1\xf9\x28\x6c\xb7\x45\
-\x01\x8b\x8b\x8b\x7b\xc9\x09\x66\x42\x46\x6f\x4d\x7b\x47\x5e\x40\
-\xa5\x52\x19\x8a\xc5\xe2\x4f\x01\x64\x5b\x06\x44\x37\x33\xae\x9a\
-\x30\xed\x1f\x69\x01\xcc\x1c\x6b\x34\x82\x69\x06\x0e\xb4\x8d\xee\
-\xba\x2a\x79\xc3\x46\x86\x48\x0b\xf0\x4a\xe5\x3b\x0c\x9c\x68\x11\
-\x19\xcf\xdd\x74\xea\x32\x11\x85\x5e\x92\x7a\x4d\x64\x05\x68\xed\
-\x4f\x11\x30\xd5\x22\x12\xde\xd7\x6a\x89\x33\x44\xd4\xb0\x95\x23\
-\x92\x8b\x90\xe7\xf9\xa7\x40\x78\xdc\xe6\x5f\x8e\x39\x38\xa8\x94\
-\xaa\xd8\xcc\x62\xbd\x80\xa2\xef\x8f\x53\x80\x59\x00\x83\xeb\xe4\
-\x9f\x81\x83\x43\x39\xa5\x3e\xd8\xce\x63\xf5\x13\xd0\x5a\xe7\xa8\
-\x89\x67\x68\x5d\x7c\x83\x10\x9c\x8e\x62\xf1\x80\xc5\x02\x7c\xdf\
-\xdf\xc5\x70\x66\x40\xd8\xd3\x32\x60\xbe\xe4\xba\xee\x0b\x5b\x39\
-\xda\x09\xfd\x63\xdb\x6b\x0a\x85\xc2\x40\x23\xc0\x13\x02\xf6\xb5\
-\x0c\x88\x6e\x65\x5c\x75\xcf\x46\x86\x8d\x30\xbe\x03\x98\xd9\x89\
-\xc7\x13\xf7\x09\x38\xdc\x36\x7a\xe8\xaa\xe4\x75\xd3\xfe\xdd\x30\
-\x5e\x80\xd6\xfe\x35\x10\xce\xb5\x88\x84\xd7\xf5\xb5\xda\x45\x5b\
-\x67\xfd\xff\x30\x7a\x0a\x14\x0a\x85\x81\x78\x7f\xe2\x07\x80\xc4\
-\x3f\x95\x3f\x11\x78\xc2\x75\xdd\xef\x26\xbd\x37\x8b\xd1\x1d\x50\
-\xad\x56\x03\x00\xf5\x75\xd2\x37\x0e\x9a\xc7\xb7\xcb\xe2\x01\xc3\
-\x05\x8c\x8d\x8d\xd5\xc1\x98\x04\xb0\x0c\x60\x9e\x03\x3a\x96\xcd\
-\x66\x3d\x93\x9e\x82\x20\x08\x82\x20\x08\x82\x20\x08\x82\x20\x08\
-\xdd\xf8\x03\x6a\x65\xdc\x45\x31\x50\xc4\x7d\x00\x00\x00\x00\x49\
-\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x00\x9a\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x00\x4c\x49\x44\x41\x54\x58\x85\xed\
-\xd7\xc1\x09\x00\x20\x0c\x04\xc1\x20\x16\x66\xe1\x82\xad\x48\x52\
-\x48\xec\x40\x3d\xf1\xb9\xfb\x3c\x08\xcc\x37\x66\x24\x36\x3d\xc6\
-\xf4\x18\xb7\xfb\xa9\x2a\x0b\xd2\x9a\xb4\x1f\x2a\x2f\x47\x3f\x03\
-\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xfd\x33\xb2\
-\xec\xda\x4e\xfb\x16\xbe\x7b\x13\xbf\x30\xe2\x93\xe7\x00\x00\x00\
-\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x06\xf1\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x06\xa3\x49\x44\x41\x54\x78\x9c\xed\
-\x9a\xcd\x73\x5b\x67\x15\x87\x9f\xf3\xca\xed\x24\x84\x3a\x4d\xbf\
-\x99\xae\xd8\x36\x6d\xda\xea\xc3\x21\x94\x81\xc6\x49\x6d\x27\x8d\
-\xe3\xfe\x01\x85\x45\x07\xf9\x63\x6a\x4b\x86\x55\x59\xc0\x82\xc9\
-\x02\x86\x81\xda\x96\xa7\xb6\x6c\x66\xd8\xf5\x1f\xa0\x09\x89\xbf\
-\x42\x81\x36\xb1\x25\xab\x1f\x40\x37\x9d\x4e\x17\x1d\x86\x19\x4a\
-\x0b\x71\x9a\x26\x4a\xf0\x7b\x58\xc8\x37\x88\x2b\xd9\x7a\xaf\x74\
-\x6f\x6d\x06\x3f\xcb\xf7\x9e\x7b\xde\xf3\xfb\xe9\x9c\x57\xd2\x95\
-\x60\x97\x5d\x76\xf9\x7f\x46\xea\x2d\x1e\xfa\xf6\xcf\xf6\xdd\xb1\
-\x77\xcf\xf7\xc5\x68\x2f\xca\x1e\x90\x4b\x66\x9d\x9f\xac\xfc\x72\
-\xe4\xc3\x2f\xba\xc0\x66\xe8\xf8\x6e\xee\xab\x36\xc6\x4b\xa0\x47\
-\x10\x6e\x60\xe5\xec\xe7\x6d\xe6\xe7\xef\xbd\xf2\xe2\x67\xfe\xd8\
-\x1a\x03\x9e\x7a\xe1\xa7\x77\x95\xef\xd8\xfb\x3a\xf0\xa4\xef\xd2\
-\x15\x55\xdb\xbd\x3a\x33\xba\x1c\x55\xe1\x61\x90\x4a\x8f\xa5\xd4\
-\x98\x79\x60\x7f\xf5\xba\xc2\x3b\x6d\x77\xf2\xcd\xe5\x5c\x66\xad\
-\x7a\xdd\xf8\x13\x94\xef\xdc\xfb\x12\xb5\xe2\x01\xf6\x8b\x98\xb9\
-\x44\xff\xd8\xe1\x50\x2b\x0e\x91\xcd\xc4\x03\x08\x3c\x6e\x6f\xe9\
-\x0f\xfc\xeb\x35\x06\xa0\x9c\xde\x62\x8f\xf6\x9d\x6a\xc2\x56\xe2\
-\x3d\xd4\x9a\x3e\xff\x5a\xad\x01\xb0\xb7\xc1\x5e\xed\x22\x66\x2e\
-\x39\x38\xd1\x11\xb0\xc6\xc8\xe8\x18\xc8\x25\x1b\x89\x07\x40\x74\
-\x8f\x7f\xa9\x9e\x01\x6f\x38\xec\xd9\x8e\x32\xbf\x13\x4c\xe8\x18\
-\xc8\x25\x2d\xba\x40\x23\xf1\x00\x68\x8d\xb6\x1a\x03\x62\xe8\x19\
-\xe0\x8a\xc3\xde\xdb\x6e\x42\x30\xf1\xac\xc5\xe0\xc7\xfe\xc5\x1a\
-\x03\x96\xf3\xd9\xf7\x11\xba\x70\x37\x61\x5b\xc6\x61\x43\x7c\xe3\
-\xb6\xaf\xb0\x66\x0d\xdd\xcb\xf9\xec\xfb\xfe\x0b\xf5\x46\x80\xe2\
-\x74\x66\x65\xc3\x84\xb5\x7a\xd7\x7d\xec\x47\x99\x4b\xa5\xc7\x52\
-\x0e\xb1\xa1\x10\x1f\x1a\x4f\x6c\x88\xbf\xdb\x21\xfc\xaa\x35\x74\
-\x97\xa6\x32\x97\xeb\x5d\xac\xfb\x41\xc8\x23\x39\x38\xd1\x81\x32\
-\x0f\xb4\x3b\x6c\x74\x45\xac\x7d\xa6\x30\x3b\x5a\x70\x88\x6d\x9a\
-\xf8\xd0\x78\xc2\x58\x59\xc0\x5d\x7c\xd7\x66\xe2\xa1\x81\x01\xb0\
-\xb3\x4c\x08\x5b\x3c\x38\x18\x00\x90\xe8\x1f\x3b\x2c\x62\xe6\x70\
-\x34\xc1\x20\xc7\x57\xf2\x23\x45\x97\xdc\xae\x24\xfa\x27\xe3\x22\
-\x76\x01\x38\xe0\x10\x7e\xd5\x60\xba\x57\xf2\xc3\x97\x1a\x05\x3a\
-\x19\x50\x29\x60\xfb\x4c\x88\x4a\x3c\x6c\x72\x08\xd6\x63\x75\x66\
-\x74\xd9\x1a\xba\x71\x3c\x18\x2d\xba\xd0\x31\x90\x4b\xba\xe6\xdf\
-\x8c\xa0\xe2\xc5\x6a\x8f\xab\x78\x08\xd0\x01\x1e\xf1\xa1\x89\xaf\
-\x19\xcb\x1c\x70\x97\x43\xf8\x3f\x0d\xf2\x4c\xb3\x9d\x10\x50\xfc\
-\x67\x62\xb5\xbb\x30\x9b\x7d\x33\xc8\x1e\xce\x1d\xe0\x51\x9a\xca\
-\x5c\xb6\x86\x2e\xe0\xaa\x43\xf8\xdd\x16\x9d\x8f\x0f\x8d\x27\x82\
-\xee\xf3\x45\x88\x87\x26\x3a\xc0\x23\x68\x27\x58\xa3\xc7\x4b\x53\
-\xd9\x55\x97\xdc\xc9\xc1\x89\x27\x51\x16\x89\x58\x3c\x34\xd1\x01\
-\x1e\xa5\xa9\xcc\x65\x83\xe9\xc6\xb1\x13\x8c\x95\x05\x97\x4e\x08\
-\x2a\x1e\x91\x9e\x66\xc5\x43\x0b\x1d\xe0\xd1\x31\x30\x79\xc4\x62\
-\x2f\x10\x42\x27\x34\x23\xbe\x38\x3d\xe2\xf2\xe5\x6d\x53\x9a\xee\
-\x00\x8f\x95\xfc\xf0\x25\xb1\xda\x83\x7b\x27\xcc\x27\xfa\x27\xe3\
-\xfe\x0b\x1b\xe2\x9d\x67\x5e\xd5\x9e\x68\x55\x3c\x84\x60\x00\x40\
-\x61\x36\xfb\xe6\x86\x09\x35\xcf\xdc\xea\x70\x40\xc4\x2e\x54\x9b\
-\x90\x4a\xbf\xfc\xc4\x86\xf8\x7b\x1c\xee\xbf\xa6\x6a\x4f\xac\xce\
-\x8c\xfe\xa1\xd9\x7a\xab\x69\x79\x04\xaa\x49\xa5\xc7\xbf\xae\x46\
-\x2e\x00\x5f\x76\x08\xff\x87\xaa\x39\x6e\xf4\x96\x55\x13\x5b\xc4\
-\x5d\x7c\x4f\x58\xe2\x21\x64\x03\x20\x98\x09\x82\xae\x69\xa5\x04\
-\x97\x4f\x97\xa1\x8b\xaf\xd4\x10\x01\xc9\xc1\xdc\x53\xa8\x9e\xc7\
-\xad\x13\x5c\xb8\x66\x0d\x27\x4a\x53\x99\xdf\x87\x94\xef\x36\x91\
-\x18\x00\xa1\x9a\x10\x99\x78\x08\xe9\x10\xac\x47\x71\x7a\xe4\x0d\
-\x55\x7b\x02\xb7\x83\x71\x33\xae\x09\xf6\x64\x54\xe2\x21\xc2\x0e\
-\xf0\x48\xf4\x8f\x7d\x43\xc4\x9c\x07\xf6\x05\xbc\xf5\x9a\x60\x4f\
-\x16\xf2\xa3\xbf\x8b\xa2\x2e\x8f\xc8\x0d\x80\x8a\x09\xc6\x98\x39\
-\xd5\x86\x8f\xdc\x3d\x6e\x08\xb6\x3b\x6a\xf1\x10\xe1\x08\x54\xa3\
-\x31\xd6\x54\xe5\xa6\xf3\x0d\xc2\x4d\xac\xba\x7c\xed\x6e\x99\xc8\
-\x0d\x88\x0f\x8d\x1d\x32\xd6\x2c\x81\xba\x3c\xbd\xad\xa0\xb4\xab\
-\x89\x2d\xa6\xd2\x2f\x3f\x11\x61\x69\x40\xc4\x23\xf0\x1f\xf1\xdc\
-\xdb\x64\x8a\x4f\xc5\xae\x1f\x2b\xcc\x7e\xef\xed\x30\xeb\xaa\x26\
-\x32\x03\x36\xc4\x2f\x02\xf7\xb5\x98\xea\x53\x03\x9d\x2b\xf9\xcc\
-\x3b\x61\xd4\xe5\x27\x12\x03\x12\xfd\xb9\xc7\x44\x74\x89\xd6\xc5\
-\x7b\x44\x66\x42\xe8\x67\x40\x10\xf1\x0a\x65\x85\xb2\x43\xda\x7b\
-\x2c\x2c\x76\x0c\x4c\x3c\xde\x7a\x85\xff\x4d\xa8\x06\x04\x7c\xe5\
-\xaf\x8b\x48\x8f\xc1\x76\x01\x9f\x3b\xc4\xdf\x1b\x85\x09\xa1\x8d\
-\x40\x72\x70\xfc\x51\x54\x2e\xe2\x28\x5e\x55\x9f\x5d\x9d\xc9\x5e\
-\x04\x48\xa5\x27\xbe\xa5\x86\x73\xc0\x97\x1c\xee\xfd\xc4\x1a\xdb\
-\x59\x9a\x1a\x7d\xb7\x95\x7a\x3d\x42\x31\xa0\x15\xf1\x1e\xdb\x65\
-\x42\xcb\x23\x10\x54\xbc\x15\x39\xe5\x17\x0f\x50\x98\xcd\xbc\x8e\
-\xc8\xb3\x38\x8e\x83\xb1\x66\x29\x3e\x34\x76\x28\x68\xbd\x7e\x5a\
-\x32\x20\x39\x38\xfe\x28\x88\xf3\xcc\x5b\x91\x53\xa5\xe9\x91\xa5\
-\xcd\x02\x8a\xd3\x23\xbf\x0d\x68\xc2\x62\xab\x26\x34\x3d\x02\xb7\
-\xc5\x2b\xf7\x3b\x84\x5f\x17\xb4\xb7\x90\xcf\x2e\xba\xe5\xce\x3d\
-\x8d\xea\x39\x1a\xff\x5d\x07\xe0\xef\xaa\xd2\xb9\x3a\x33\xf2\x47\
-\x97\xdc\x7e\x9a\xea\x80\x54\x7a\xf2\x60\x00\xf1\x37\x82\x88\x87\
-\xdb\x9d\x70\x12\xb8\xee\x10\x7e\x9f\x88\x2e\x25\xfa\x73\x8f\xb9\
-\xe6\xaf\x26\x70\x07\xa4\xd2\x93\x07\x35\x66\x2f\x06\x10\x7f\x2a\
-\x88\xf8\x6a\x12\xfd\xe3\x47\x45\xe4\x2c\x11\x76\x42\x20\x03\x52\
-\xe9\xc9\x83\x18\xbb\xa4\xf0\x80\x43\x78\x4b\xe2\x3d\x82\x9a\x80\
-\xe8\xd1\xe2\x74\xf6\x4f\xae\xf9\x9d\x0d\x08\x2a\x1e\x4b\x6f\x71\
-\x36\xb3\xe0\x9a\x7f\x2b\xe2\x83\xb9\x4e\xa3\xfa\x1a\x11\x98\xe0\
-\x64\xc0\xe1\x81\x89\x47\x2c\x5c\xdc\x0e\xf1\x1e\x51\x99\xd0\xf0\
-\x10\x0c\x2c\x1e\x73\x3a\x6c\xf1\x00\xa5\xe9\x91\x25\x41\x7b\x71\
-\x3c\x18\x41\x96\x2a\xef\x54\x5b\xb3\x65\x07\x34\x25\x3e\x3f\x3c\
-\xef\x10\xdb\x34\xa9\x81\xf1\x63\x8a\xbc\x06\xd4\xfc\xeb\xb3\x06\
-\xe1\x63\xd0\xce\xad\x3a\x61\xd3\x0e\x38\x3c\x30\xf1\xc8\x3a\x38\
-\xcf\xbc\x2a\x7d\x51\x8b\x07\x28\xe4\xb3\x8b\x82\x9e\x02\x6e\x34\
-\x0c\x56\xee\x07\x59\xaa\xbc\x6d\xd7\xa7\x6e\x07\x78\xe2\x81\x07\
-\x1d\x6a\x2a\xab\x72\x7a\x75\x26\x33\xe7\x10\x1b\x1a\x41\x3b\x41\
-\xd6\xcd\xd1\xc2\xec\xf0\x9f\x6b\x2f\xf9\x38\x32\xf8\x8b\x87\x6f\
-\x69\x5b\x11\x78\xc8\xa1\x8e\x6d\x11\xef\x91\x4c\x4f\x1c\xc7\xf0\
-\x6b\x1c\x4c\x10\xf8\x1b\xb1\x58\xb2\xf0\xca\x8b\x1f\x55\xaf\xd7\
-\x8c\xc0\x2d\xdb\xf6\x43\xfe\x07\xc4\x03\x14\x67\x33\x0b\x58\x7a\
-\x71\x18\x07\x85\x07\xb0\xeb\x3f\xf2\xaf\xd7\x9e\x01\xc2\xd3\x0e\
-\x7b\x97\xad\x48\xdf\x76\x8a\xf7\xa8\xbc\xe3\x98\xd3\xb8\x98\xa0\
-\x1c\xf5\xaf\xd5\x18\xa0\xb0\xde\x20\x4f\xd9\x8a\xf4\x95\xa6\x47\
-\x2e\xb8\x97\x19\x2d\x95\xc3\xd7\xc9\x84\x1a\x6d\x35\x06\x08\x6c\
-\xf5\xaa\x96\x05\x7d\x6e\x27\x89\xf7\x28\xe6\x87\xe7\x55\xe9\x63\
-\x0b\x13\x44\x38\xef\x5f\xab\x31\xc0\xb4\x99\x33\xc0\x07\x75\xee\
-\x2f\x0b\xfa\x5c\x21\x9f\xad\x49\xb2\x53\x58\x9d\xc9\xcc\x6d\x61\
-\xc2\x87\xff\x2a\x73\xc6\xbf\x18\xf3\x2f\xfc\xa5\x70\xee\xfa\x57\
-\x12\xc7\x5e\x15\x89\xed\x43\x79\x50\x84\x9b\x28\x8b\x8a\xf9\x4e\
-\x71\x26\xba\x5f\x69\xc3\xe2\xaf\xab\xbf\xf9\xe0\xe1\x78\xd7\x59\
-\xc4\x3c\x04\x1c\x40\xf9\x44\x45\x5f\xb5\x37\xe5\xf9\xb7\x7e\x95\
-\xf9\x78\xbb\xeb\xdb\x65\x97\x5d\x76\x16\xff\x06\x5e\xec\x1f\xa0\
-\xf6\x5e\x26\xad\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
-\
-\x00\x00\x02\x06\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x01\xb8\x49\x44\x41\x54\x58\x85\xed\
-\x97\xcf\x4a\x1b\x51\x14\x87\xbf\x33\x49\x56\x25\x42\x2b\xa9\xe0\
-\x6b\x34\xff\x8a\xc5\x07\x68\x4a\x5f\xa2\xc1\x94\x6a\x46\x29\x25\
-\xf6\x11\x1a\xa1\x25\x99\xd8\xa2\x45\x17\x92\x95\x0f\x10\x70\xd3\
-\x2e\x04\xab\x69\x93\xd7\x10\x34\x28\x94\x2c\x63\x72\x5c\xcc\x64\
-\x0c\xc6\x8e\x98\x4c\x62\x69\xf3\x5b\xde\x7b\xb8\xdf\x37\xf7\x5c\
-\x86\x7b\xe1\x7f\x8f\x5c\x1f\x88\xbe\x2e\xcd\xa1\xba\x8a\x90\x44\
-\x89\xf8\x44\x69\xa0\x1c\x21\x92\xaf\x6d\x64\x0f\xfe\x28\x10\xcb\
-\x14\xdf\x29\xb2\x76\x93\x98\x4f\xe9\xa8\x92\xab\x7f\x35\x3f\xf6\
-\x09\x3c\x59\x28\x3c\x13\x31\xf6\x81\xdf\x88\x9a\xa1\x56\xbb\x72\
-\xb8\xfd\xf6\xdc\x0f\xea\xd3\x57\x9f\x1e\xb5\x42\x81\x14\x2a\x16\
-\x30\x85\xc8\x7c\x77\x27\x82\xae\x89\x18\x39\x40\x10\x35\x6b\x1b\
-\xcb\x65\x3f\xc0\xdd\x38\x1f\x52\x8e\x66\x2c\x01\x76\x50\x5d\x05\
-\x5e\x02\x18\x6e\x95\x90\x04\x08\xb5\xda\x15\x3f\xe1\xbd\x31\x82\
-\x46\xc5\x46\x91\x70\xc7\xdc\x59\xe7\xc0\xf9\xb5\xed\x37\xe5\xe7\
-\xe7\xa5\x33\x1b\xc5\xe3\x7e\x81\x7b\xca\x44\x60\x22\x70\xef\x02\
-\xc1\xdb\x0a\x62\x99\xd2\x1b\x45\x3f\x00\xe1\x3b\xae\xdd\x14\xe4\
-\xfd\xaf\xcd\xec\x17\xaf\x22\xcf\x1d\x48\xa4\x0b\x33\x8a\x96\x06\
-\x80\x03\x84\x15\xb5\x12\xe9\xc2\xcc\xc0\x02\xe3\x88\xa7\x40\x75\
-\x6b\xe5\x44\x90\x2c\xd0\x1c\x60\xed\xa6\x20\x66\x75\x6b\xe5\xc4\
-\xab\xe8\xd6\x33\xe0\xf4\xd0\xb3\x8f\xc3\xe4\xef\x6e\xc1\x44\x60\
-\x22\x30\x5e\x01\xa1\x01\xf6\x05\x72\x54\xb0\xf8\xe2\xfa\xb4\x8d\
-\xe2\xb4\x5f\x40\x39\x02\x68\x85\x02\xa9\x51\x09\x74\x2e\x3a\x29\
-\x1b\x45\xb5\x3b\x76\xf5\x23\x12\xc9\xa3\xfa\x02\x15\x2b\x9a\xb1\
-\xc4\x08\x1a\x95\xee\x1d\x6e\xd8\xc4\x17\xd7\xa7\x1d\x78\x11\xe8\
-\x20\x92\x77\xb1\xbd\x85\xce\xc3\x24\xcf\xe8\xce\x46\xdf\xc3\x24\
-\xd0\x3b\x7b\x5c\xdf\xfb\x31\x1b\x7b\xfe\x0d\x88\x08\x3c\x04\x1e\
-\xf8\x41\x75\x7a\xfe\x1d\x91\x74\x7d\xd3\xdc\xf5\x63\xcd\x7f\x27\
-\x97\x00\x43\x86\x87\x3f\x9c\xa0\xff\x00\x00\x00\x00\x49\x45\x4e\
-\x44\xae\x42\x60\x82\
-\x00\x00\x02\x37\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x01\xe9\x49\x44\x41\x54\x58\x85\xed\
-\x94\x31\x68\x13\x61\x14\xc7\x7f\xef\x8e\x50\x8d\x20\x75\x50\x8a\
-\x93\x29\xe2\x24\xa2\xa5\x71\x11\xdc\x44\x91\x8e\x8a\x53\x41\x87\
-\xda\xa0\x49\x8a\x83\x93\x08\xea\xea\x60\x4d\x5b\x6b\xeb\xe0\xa0\
-\xa0\x58\xc4\x41\x07\xa5\x53\x71\x50\xa8\x8d\x5a\xc4\xc9\xc1\x45\
-\xa1\x88\x56\x45\x4b\xb5\xb9\xfb\x3b\x24\x67\xcf\x60\x9b\xbb\x58\
-\xec\x72\x3f\x38\xf8\x8e\x7b\xef\xff\xfe\xef\xde\xf7\x7d\x90\x90\
-\x90\x90\xb0\xca\x58\xb0\xe8\x3c\x5e\x9a\xc5\x68\xfd\x2f\x55\xc5\
-\xe7\x67\xa3\xc5\x0d\x00\x4e\xc8\x8a\xb3\x64\xc2\x4a\x13\xaa\xf5\
-\x7b\x91\xaa\x54\x32\x06\x4f\x83\x77\x21\x1f\xf0\x56\xe2\x11\xf8\
-\xa1\xf2\x4f\x52\x95\x4a\x66\xd1\x4b\x88\x1d\xdd\x17\xd7\xb5\xa4\
-\x5b\xee\x0a\xf6\x23\xc0\xe4\x83\xe9\x5f\x9a\x15\x32\xc3\x82\x46\
-\x1f\xfe\x9c\xfb\x71\x68\xfa\xc6\xe9\xef\xc1\x77\x37\x1c\x3c\x33\
-\x3d\xbe\xd0\xda\xbe\xfb\x4e\x6a\x6d\x7a\x1b\xc6\xf6\xaa\xc1\x3f\
-\x3c\xc6\x2b\x6e\x2c\x16\x97\xdd\x9e\x9b\xfd\x78\xe4\xd5\xad\x33\
-\xf3\xe1\x18\xb7\x3e\xe9\xc3\xeb\x09\x6f\x4f\xfb\xb1\x7b\x5f\xd2\
-\xdf\x36\x82\x65\x01\x93\x09\x8b\x69\x44\x60\x56\x1b\xb1\x19\xc3\
-\x99\x4f\x6d\x3d\x13\x63\xf9\x4a\x7d\xdc\x32\xaa\xb2\x6c\xae\x74\
-\x5e\xb2\xb3\xb5\x48\x1f\x11\x6d\x1c\x86\xa1\x6a\x71\xc1\x85\xa9\
-\x91\xc2\xb9\xa5\x46\xd9\xb0\xad\x6c\xef\x40\x9f\x50\x3f\x80\xaa\
-\x03\xf5\x1b\xa4\x38\x81\xae\x44\xdf\xd4\x68\xb1\xb4\xbc\xd7\x08\
-\x74\xe6\x2e\x77\x23\xbb\x0e\xb8\x02\x19\x7f\x37\x21\xe1\x58\x75\
-\x56\x9e\x61\x47\x27\x47\x0a\x37\x1b\x69\x47\x1e\x6c\x47\x6e\xb0\
-\xcb\x91\x3f\x06\xac\x01\x44\xbd\x09\x99\x83\xc9\x80\x79\xdf\x9c\
-\xc3\xe5\xab\xf9\x07\x51\x74\x63\xed\xac\x6c\x6f\xff\x5e\xe1\xdc\
-\x07\xd6\xd7\x99\x08\x7e\xfb\x57\xdf\xa1\xab\x3c\x5c\x7c\x1c\x55\
-\x33\xf6\x19\xcb\xf6\x5c\xda\x89\xe3\x3e\x12\x6c\x02\x54\xdb\xed\
-\x00\x33\xe6\x7b\x07\x26\xaf\x9d\x7a\x11\x47\xaf\xa9\x43\xde\x71\
-\x62\x68\xab\x79\xde\xb8\xc1\x16\x00\xc1\x5b\xb9\xee\xbe\xf2\x95\
-\x93\x6f\xe2\x6a\x35\x7d\xcb\xec\xca\x0f\x6c\x76\x17\xf4\x4e\xf0\
-\xd2\x4f\xd9\xc1\xe7\x83\x85\xf7\xcd\x6a\x25\x24\x24\x24\xac\x2a\
-\xbf\x00\xaf\x38\xac\x82\xe2\x51\x10\x13\x00\x00\x00\x00\x49\x45\
-\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x01\x04\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x00\xb6\x49\x44\x41\x54\x78\x9c\xed\
-\xd9\xd1\x0d\x83\x50\x0c\xc5\xd0\x14\x75\x8d\x0a\xf6\x9f\x0a\xc4\
-\x20\x74\x8c\x83\xf4\xec\x05\x62\x59\xf7\x2f\x33\x90\xf3\xba\x9f\
-\xf3\xba\x1f\xe9\xb0\xc9\xe3\x6f\xa0\x00\x5a\x40\x53\x00\x2d\xa0\
-\x29\x80\x16\xd0\x14\x40\x0b\x68\x0a\xa0\x05\x34\x05\xd0\x02\x9a\
-\x02\x68\x01\x4d\x01\xb4\x80\xa6\x00\x5a\x40\x53\x00\x2d\xa0\x29\
-\x80\x16\xd0\x14\x40\x0b\x68\x0a\xa0\x05\x34\x05\xd0\x02\x9a\xe5\
-\x03\x7c\xe4\x71\xfd\x1a\x9f\x69\x01\xf3\xd5\x02\x33\x33\xc7\xfe\
-\x63\x4b\x5c\x7e\x01\x05\xd0\x02\x9a\x02\x68\x01\x4d\x01\xb4\x80\
-\xa6\x00\x5a\x40\x53\x00\x2d\xa0\x29\x80\x16\xd0\x14\x40\x0b\x68\
-\x0a\xa0\x05\x34\x05\xd0\x02\x9a\x02\x68\x01\x4d\x01\xb4\x80\xa6\
-\x00\x5a\x40\x53\x00\x2d\xa0\x29\x80\x16\xd0\x2c\x1f\xe0\x0f\xc7\
-\xa8\x0b\xc6\x03\x24\x5a\xc7\x00\x00\x00\x00\x49\x45\x4e\x44\xae\
-\x42\x60\x82\
-\x00\x00\x00\x8a\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x00\x3c\x49\x44\x41\x54\x78\x9c\xed\
-\xd0\x01\x09\x00\x20\x10\x04\xc1\xd7\x4c\x76\xb2\x8f\x85\xfd\x14\
-\x72\x20\x33\x09\x96\xad\x02\x00\x00\x00\x00\x00\x00\xe0\x7f\x63\
-\xed\x73\xd3\x11\x49\x33\x1d\x90\x66\x40\x3a\x00\x00\x00\x00\x00\
-\x00\x00\x00\xde\x6b\x42\xab\x02\x34\xd3\x03\x1d\x60\x00\x00\x00\
-\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x03\x68\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x03\x1a\x49\x44\x41\x54\x78\x9c\xed\
-\xd6\x4f\x6c\x14\x65\x18\xc7\xf1\xef\x33\xdb\xad\x44\xc4\x34\x01\
-\xa3\x04\x82\x4a\x0f\xc4\x02\x51\xeb\x09\x88\x64\x85\xdd\x25\xa4\
-\xa9\xc8\x6e\x97\x10\x62\xb1\xa6\xdb\x46\x4c\x3c\x18\x13\x6f\xa6\
-\xf1\x46\x82\x91\x70\x69\x42\xff\x24\x04\x4d\x54\xa6\x7f\x38\x28\
-\xe8\x96\x26\x94\xa4\x88\x46\xca\xad\x1e\x80\x9a\x08\x21\x46\x10\
-\xc1\x90\xd0\x52\xf6\x7d\xbc\x70\xd8\x0e\x45\xb0\x33\xbb\x84\xf0\
-\x7c\x8e\xf3\xcc\xfc\xf6\xf7\xbe\xb3\xb3\xb3\x60\x8c\x31\xc6\x18\
-\x63\x8c\x31\xc6\x18\x63\x8c\x31\xc6\x98\xc7\x85\x84\x0d\xd8\x98\
-\x7b\xb7\xce\x2b\xc6\x0e\x8a\xb0\x04\xf8\xbc\xd0\xdf\xf3\x19\xa0\
-\xe1\xab\xcd\x2e\x95\x69\xdb\x2a\xa2\x7b\x00\x10\xf9\xa0\xd0\xd7\
-\x7d\x34\x4c\x5e\xe8\x0d\x48\x65\xf3\x23\xc0\xfa\x92\xc8\x2f\x6a\
-\xbc\x6b\x79\xdf\xf7\x6f\x85\xcd\x0e\x90\x54\x53\xdb\xc7\xa8\xee\
-\x2e\x39\x76\xfd\xea\x42\xef\x99\xd3\x5d\x5d\xd3\x73\x0d\xf5\x42\
-\xd7\x52\x0d\x64\x68\xf3\xdf\xae\xe6\xfb\xc4\x5b\x2d\x35\xa1\xb3\
-\xef\x48\x24\x3a\xaa\x52\xd9\x7c\x67\x60\xf1\x80\x84\xbe\x81\xa1\
-\x37\x40\x94\x5d\xc0\x9f\x33\x8e\xa1\x6f\xc4\x63\xf1\xd1\x0d\x99\
-\xd6\xe7\xc3\xe6\x27\x72\xef\x3f\x15\x5f\x74\xe9\x30\xf0\x5e\x60\
-\x34\x25\xb8\xb7\xc3\xdc\x7d\x88\xe0\x11\x00\x48\xe7\xf2\x2f\x3a\
-\xc7\x51\x81\x15\x81\xf0\x3f\x44\xbd\x86\x1f\x06\xba\xc6\xe6\x92\
-\xbb\x29\xd3\xbe\xb8\x28\xee\x5b\x81\xfa\xc0\xe8\x2a\xaa\x6f\x0e\
-\x0d\xf4\x8e\xce\xb9\xf4\x1d\xe1\x1f\x01\xa0\xe0\xf7\xfc\x16\xf3\
-\x74\x2d\x70\xa2\xf4\xb8\xc2\x73\x4e\xdc\x89\x64\xa6\xb5\xe1\xff\
-\x66\x6e\xca\xb6\xad\x74\xe2\x4e\xcd\xb2\xf8\x09\xe7\x64\x4d\x14\
-\x8b\x07\x88\x45\x11\x02\x70\x7e\xfc\xcc\xcd\x15\x2f\xac\xfb\xca\
-\xc5\x6f\xd7\x02\xab\x4b\x46\xd5\x22\xb2\x7d\x79\x5d\xfd\xe5\x89\
-\x5f\xc7\x7e\x79\x90\xac\xf4\xd6\xfc\x06\x15\x0a\xc0\xb3\x33\x27\
-\xfa\x53\x95\xe7\x36\x16\xfa\x7b\x2f\x44\xd5\x3b\xb2\x0d\x00\x38\
-\x77\xee\xe7\x62\xf3\xb6\xc6\xc1\x0b\x97\x6f\x54\x03\xaf\x97\x8c\
-\x44\xa0\x61\x79\x5d\xfd\xfc\xe6\x6d\x8d\xc3\x23\x23\x23\xf7\x7c\
-\x4d\x26\x9b\xf2\x3b\x11\x0e\x01\x4f\xce\x18\x08\x83\x4f\x4c\xc5\
-\xb6\x1c\x39\xdc\x7b\x3d\xca\xce\x91\xfc\x06\xcc\x26\x9d\xc9\xb7\
-\xab\xd0\xc9\xdd\x9b\x7c\x68\x7a\xc1\xed\x77\x8e\x1f\x38\x30\x19\
-\xec\x92\xca\xb6\x7e\x02\xf2\xe9\xdd\x69\xba\xaf\xc6\xfb\xe7\x23\
-\xdf\xf7\x8b\x51\xf7\x2c\xdb\x06\x00\xa4\x9b\xda\x36\xab\xaa\x0f\
-\xcc\x0f\x8c\x46\x9d\xbb\xb5\x65\x78\xf0\xe0\x5f\x00\xb9\x5c\xae\
-\xfa\x9a\x7b\x7a\x3f\x48\x4b\xe0\x3c\x05\xf9\x70\xa8\xbf\x7b\x5f\
-\xb9\x3a\x96\x75\x03\x00\x92\xd9\xd6\x57\x05\xf9\x0e\x58\x3c\x73\
-\xa2\x67\x8b\xc5\xd8\x66\x2f\xce\x15\xcf\xb9\x3e\x85\x64\xe0\xd2\
-\x49\x54\x76\x0c\x0d\x74\x0f\x96\xb3\x5f\xd9\x37\x00\x20\x99\x6b\
-\x5f\x26\xce\x1d\x01\x56\x3e\xd0\x05\xca\x15\x85\xc6\x63\x03\x3d\
-\xa7\xca\xdb\x2c\xa2\xd7\xe0\xfd\x1c\xf3\xbb\x7e\x57\xcf\x5b\x07\
-\x0c\xdf\xff\x6c\x3d\xeb\xc5\x74\x4d\x25\x16\x0f\x11\xbf\x05\xfe\
-\xcb\xc4\xf8\xe9\xa9\xd7\x56\xd5\x7e\x3d\xa9\xf3\x96\x01\xaf\xdc\
-\xe3\xb4\x93\xd3\xd5\xb1\xd4\xf0\x37\x3d\x17\x2b\xd5\xab\x22\x8f\
-\x40\xf0\x33\xd3\x4d\xf9\x0e\x55\x3a\x02\x4d\xfa\x6e\xc8\x82\x9d\
-\x3f\xfa\x7b\x6f\x56\xb2\x4c\xc5\xbe\x01\xa5\xce\x8f\x8f\x1d\xaf\
-\x7d\xa9\x7e\x29\xc2\xcb\x80\x43\x75\xcf\xda\x55\x4b\x77\x7d\xd9\
-\xb9\x3b\xd4\xff\xfa\x47\x4e\x22\xd1\x51\x95\x68\x69\x99\xf7\xb0\
-\x7b\x18\x63\x8c\x31\xc6\x18\x63\x8c\x31\xc6\x18\x63\x8c\x31\x8f\
-\x89\x7f\x01\x76\x43\xf4\x3d\x50\xc3\x70\x12\x00\x00\x00\x00\x49\
-\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x02\xe8\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x02\x9a\x49\x44\x41\x54\x58\x85\xe5\
-\x96\xbb\x72\xd3\x40\x14\x86\xbf\xe3\xa4\x00\x9e\x23\x25\x54\xb1\
-\x52\xf0\x0a\x14\x90\x84\xc4\x21\x64\x72\x23\x44\x6a\x2c\x37\x99\
-\xe1\x19\x28\x65\x35\x92\x27\x09\xd8\x21\xce\xc5\xc0\x30\xc3\x33\
-\x50\x59\x7e\x05\xe8\xe0\x0d\x80\x02\xfb\x50\xc4\x4a\x64\x5d\x6c\
-\xcb\x71\xc3\x70\x2a\x69\xb5\xfb\x7f\x9f\x56\xab\xd9\x85\xff\xbd\
-\x24\xbc\x30\x5e\x3a\x0f\xb5\x20\x1e\xca\x5d\x11\x5e\xb5\x7d\xfb\
-\xe3\x34\x41\x86\x59\x5d\x52\xe5\x35\xc2\x6f\x44\xac\xc0\x2b\x7f\
-\x01\x28\x84\x1d\xb4\x20\x47\xc0\x03\x84\x39\x85\x96\x61\xba\xa5\
-\x69\xc1\x8b\x96\xb3\xa6\xd0\x42\x98\x03\xee\xa3\x7a\x18\x3e\xbb\
-\x11\x80\x3b\x91\x31\x05\x45\x9b\xd3\x90\x28\x5a\xce\x1a\x2a\xa7\
-\x51\x16\x70\x2f\x21\x20\x22\x07\x40\x6f\x9a\x12\x86\xe9\x96\x52\
-\xe0\x3d\x55\x39\x48\x08\x04\x5e\xf9\x03\xb0\x91\x22\x71\x3a\x89\
-\x84\x61\xba\x25\x45\x9b\x71\xb8\x20\x5b\x9d\x5a\xb9\x95\x10\x00\
-\x08\x7c\xfb\x2c\x45\x62\x26\xaf\x44\x1f\x9e\x78\x73\x41\xb6\xda\
-\x7e\xf9\x5d\xb4\xaf\x90\x52\xf3\xfb\xee\xba\x88\x9e\xc4\x02\xba\
-\x22\xba\xde\xf6\x2a\x97\x43\xe1\x96\xb3\xaa\x2a\x4d\x60\x66\x14\
-\x3c\x53\x60\x52\x89\x0c\xb8\x0a\xb2\x99\x06\x27\x16\x3e\x50\x9d\
-\x5a\xb9\x29\xc2\x26\xf1\xcf\xa1\xd2\x34\x2c\x67\x35\x45\x78\x25\
-\x2f\x1c\x86\xcc\x40\x58\x86\x55\x7d\xae\x4a\x23\x26\xdb\x55\x95\
-\x67\xe1\x62\x9a\xdf\x77\x57\x44\xf4\x2c\x2f\x7c\x2c\x01\x00\xc3\
-\x74\x37\x14\xad\xa7\x49\x00\xa4\xc1\x11\xdd\x0a\xbc\xca\xc9\xa8\
-\xec\xb1\x04\xb2\x24\xb4\xff\x79\x64\x50\x6c\x6c\x78\x2e\x81\x88\
-\x44\x63\xc8\xb8\x5c\xf0\xdc\x02\x37\x12\x34\x40\xe3\x63\x15\xd8\
-\x0e\x7c\xbb\x91\x27\x2f\xf3\x2f\xc8\x2a\x15\x7e\x29\xaa\x89\xf6\
-\x2b\x81\x9f\x79\xf3\x72\x09\x14\x2d\x77\x19\xd5\x73\x49\x19\xd7\
-\x6f\x3b\x2f\x9a\xd5\xa7\x79\x32\x73\x2c\xc2\xea\x92\xc2\x05\x30\
-\x1b\x69\x0e\x67\x22\x9a\xd3\x45\xa4\xd4\xdf\x5b\x46\xd6\x58\x33\
-\x90\x05\x57\xd5\x1d\x60\x3b\x22\x02\x30\x83\xea\x45\xd1\x72\x97\
-\xa7\x22\xb0\x60\x39\x8b\x59\xf0\x4e\xad\x52\x0f\x7c\xbb\xd1\x17\
-\x99\x48\x62\xa8\xc0\x82\xe5\x2c\xf6\x54\x2e\xe3\x70\x11\x76\x3b\
-\xb5\x4a\x3d\x6c\xe8\xd4\x2a\xf5\x0c\x89\xf3\x51\x12\x99\x02\xc3\
-\xe0\x6d\xcf\x7e\x1b\xef\xdf\xa9\x55\xea\x22\xec\xc6\x24\x66\x47\
-\x49\x64\x6d\xc7\x4f\x44\xb4\x35\x2e\x3c\x5a\x86\x55\xdd\x56\xe5\
-\x38\x96\xfd\x47\xa0\x94\x76\xd0\x4d\x08\x64\xc2\x91\x17\x6d\xbf\
-\xfc\x66\x18\xfc\x5a\xc2\x74\x77\x14\x3d\x1a\x47\x62\x40\xa0\x68\
-\x3a\x8f\x41\xde\xdf\x06\x9e\x57\xe2\xfa\xe1\xfc\x7e\xf5\x91\x08\
-\x9f\xa6\x01\x0f\xab\x68\x55\x77\x51\x0e\x53\x24\x96\xda\xbe\xfd\
-\x19\x06\x4e\xc5\x38\x71\x38\xc2\xde\xa4\x70\x80\xc0\xb3\x8f\x11\
-\xf6\x88\x2d\x4c\x05\x27\xbc\x49\x6c\xad\x51\x78\xe0\xd9\xc7\x93\
-\xc2\x87\x4a\x28\xdd\x84\x00\xaa\x26\xc8\x57\xe0\xc7\xd5\x96\x7a\
-\x7b\x78\x54\x42\x90\x4d\x94\xef\xc0\xb7\x5e\x41\xcc\x69\x65\xff\
-\xfb\xf5\x17\x4b\x00\x72\xf1\x7d\xf9\x90\x28\x00\x00\x00\x00\x49\
-\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x03\x89\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x03\x3b\x49\x44\x41\x54\x78\x9c\xed\
-\x9a\xbd\x6b\x14\x41\x18\xc6\x9f\xd9\x0d\x84\xa0\xd8\x88\x04\x63\
-\x0a\x43\x62\xa1\x08\x42\x72\xd1\x94\xe2\x27\x06\xb1\x0b\x8a\x8d\
-\x78\x60\x36\x97\xd3\x53\x0b\x09\xfe\x05\xc6\x2a\xb8\x97\x4b\x72\
-\x29\xd2\x08\x36\xd1\x42\x84\x9c\xa0\x16\x01\x8b\x48\x2e\x29\x24\
-\x88\x85\x82\xc5\x29\x04\xb5\x88\xe4\x83\x33\x99\x7d\x2d\x22\x16\
-\xb7\x7b\x7b\xb7\x1f\x73\x93\x73\xe7\x57\xce\x0d\xcf\xfb\xec\x73\
-\xf3\xc5\xee\x00\x0a\x85\x22\xca\xb0\xa0\x02\x47\x06\x33\xbb\x9b\
-\x38\x4f\x32\x42\x1f\x18\x8e\x02\x68\x0c\xc1\x57\x10\x8a\x20\x2c\
-\x11\xc3\xf4\x86\xae\x67\x3e\x8c\x25\x57\xdd\x3a\x07\x0a\x20\x66\
-\x8c\x9e\x05\xac\x29\x00\xad\x41\x74\x04\x52\x00\xb4\x78\x3e\x7b\
-\xf3\x55\xb9\x0e\x9a\x5f\xe5\xd8\x80\x19\x07\xac\x97\xd8\xb9\x0f\
-\x0f\x00\xad\x80\x95\xeb\x36\xd2\xd7\xcb\x75\xf0\x35\x02\xba\xfa\
-\xcd\x73\x8c\x21\x87\x00\x01\xd6\x18\x0e\x68\x17\x9c\x46\x82\xe7\
-\x00\xb6\xe7\xbc\xf5\x91\x81\x0e\x84\xe3\xad\x66\x14\xd6\x75\xfd\
-\x70\xe9\x9a\xe0\xf9\x1f\x6c\xe2\x3c\x59\x87\x0f\x0f\x00\xad\x4d\
-\x9c\x27\x4b\x1b\x3d\x07\xc0\x08\x7d\xe1\xf8\xa9\x3d\x4e\xde\xbd\
-\xcf\xe1\xed\xad\xae\x3e\x71\xf0\xde\xe0\x43\xc6\x75\x9f\xcf\x67\
-\x53\x81\xcf\x16\x41\x88\x19\x26\xb9\xfc\x6c\xf3\x5e\x2f\xab\xb8\
-\x30\x54\x00\xb2\x0d\xc8\x46\x05\x20\xdb\x80\x6c\x54\x00\xb2\x0d\
-\xc8\x26\xf2\x01\x54\x3c\x08\x75\xf5\x8f\xec\xd7\x34\x2d\x41\x60\
-\xa7\x41\x68\xae\xd4\x3f\x66\x98\x9f\x7c\xbb\x21\x10\x18\x0a\x20\
-\xcc\xe8\x8d\xc8\xbe\x4b\xa7\x7e\xf9\xd6\xaa\x12\xd7\x00\x62\x89\
-\xf4\x25\x58\x34\x45\x84\xbd\x1e\x34\xdb\x7d\xbb\xd9\x3e\x43\x76\
-\x80\xe1\x24\xff\x8d\x44\x67\xc2\xbc\xba\x38\x9e\x9a\xf3\xad\x57\
-\x05\x65\xa7\x40\xcc\x30\x87\x61\xd1\x73\xc0\xd3\xc3\x87\x49\x9b\
-\x66\xe1\x6d\x97\x91\x1e\x10\x59\xc4\x31\x80\x6e\x23\x7d\x19\xc0\
-\x90\xc8\xc2\x55\xa2\x33\xd0\x68\x67\xc2\xec\x11\x55\xc0\x16\x40\
-\xcf\xc0\xc8\x41\x02\x4d\x8a\x2a\xe8\x03\x5d\xb3\xf0\xe4\xc4\x2d\
-\x73\x8f\x08\x71\x5b\x00\x5b\xd4\x70\x1f\x80\x90\x62\x01\x68\xe3\
-\x45\x18\x22\x84\x1d\xa6\x00\xf5\x8a\x28\x14\x18\x06\x21\xbe\x9c\
-\xd6\x80\x9d\xf9\x96\x97\xc4\xf8\xf2\xfc\x42\xc4\xd2\xf5\x43\x22\
-\x8c\xe8\x7c\xab\x83\xc0\x72\x65\x3b\xb0\xe0\x1f\x71\x9c\xf0\x1c\
-\xc0\xe2\x58\xd2\xff\x41\xc7\x85\xce\xc1\x0c\x34\xce\x45\x48\xbb\
-\x12\xf9\xa3\xb0\x0a\x40\xb6\x01\xd9\xa8\x00\x64\x1b\x90\x8d\x0a\
-\x40\xb6\x01\xd9\xa8\x00\x64\x1b\x90\x8d\x0a\x40\xb6\x01\xd9\xa8\
-\x00\x64\x1b\x90\x8d\x9f\xfb\x01\xb2\x68\xaf\xf0\xed\xbf\x1a\x8a\
-\xa5\x0d\xd1\x1a\x01\x84\xa5\xd2\xa6\x48\x05\x40\x0c\xd3\xa5\x6d\
-\x51\x0a\xa0\xb0\xa1\xeb\x99\xd2\xc6\xa8\x04\xc0\x01\x2d\xee\x74\
-\x6f\x38\x0a\x01\x70\x06\x76\xa3\xdc\x7d\xe1\x7a\xda\x05\xfc\x50\
-\x00\xb4\xf8\xbc\xcb\x65\xe9\xff\x31\x80\x7f\xd7\xe5\x37\xd7\x8b\
-\xa3\xef\x1f\xdf\x5b\x73\xeb\x6c\x7b\xd5\x1c\xc2\x5e\x2b\x8a\xcf\
-\xf9\x6c\xaa\x23\x6c\x51\xfb\x1a\xc0\xf0\x3d\xec\x22\xa1\xc0\xb0\
-\x2c\x42\xd6\x1e\x00\xe1\xb5\x88\x42\x41\x61\xa0\x37\x22\x74\x6d\
-\x01\x68\xc0\x43\x00\x9b\x22\x8a\x05\xe0\xa7\x65\x59\xe3\x22\x84\
-\xf5\xd2\x86\xaf\x0b\xb9\xe5\x96\xee\xde\x55\x00\xe7\x45\x14\xf4\
-\x03\x03\xae\xe4\x27\xef\x2c\x88\xd0\x76\x3c\x07\xe4\x9b\x7f\x3c\
-\x02\xf0\x54\x44\x41\xaf\x30\x46\xc3\xf3\xd9\xd4\x0b\x51\xfa\xb6\
-\x11\x00\x00\x98\x9d\xa5\x6f\x17\x8f\x3f\x6b\x59\xdb\xb5\x02\xe0\
-\x54\xd9\x7e\x62\x59\x61\x8c\xae\xcd\x4f\xdc\x36\x45\x16\xa9\xf8\
-\xc5\xf5\xb8\x61\x1e\xb3\x80\x21\x30\x9c\x01\x61\x9f\x48\x33\x7f\
-\x29\x00\x6c\xa6\x81\x6d\x3d\x98\x9b\xb8\xfb\xa5\x06\xf5\x14\x0a\
-\x45\x84\xf9\x03\x3a\xde\xd0\x31\x4b\x14\x34\x6a\x00\x00\x00\x00\
-\x49\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x00\x89\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x00\x3b\x49\x44\x41\x54\x78\x9c\xed\
-\xd0\x01\x09\x00\x20\x10\x04\xc1\xd7\x52\xb6\x36\xa2\x7e\x0a\x39\
-\x90\x99\x04\xcb\x56\x01\x00\x00\x00\x00\x00\x00\xf0\xbf\xb1\xf6\
-\xb9\xe9\x88\xa4\x99\x0e\x48\x33\x20\x1d\x00\x00\x00\x00\x00\x00\
-\x00\x00\xef\x35\x86\x6a\x02\xea\xd1\x43\x33\x62\x00\x00\x00\x00\
-\x49\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x08\x4f\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x08\x01\x49\x44\x41\x54\x78\x9c\xed\
-\x5b\x7d\x70\x54\xd5\x1d\x3d\xe7\xee\x26\x61\xab\x01\x0b\x7e\xb4\
-\xa3\x19\x8a\x4e\x19\x0c\x15\x5b\x20\x6c\x42\x11\xc1\x69\xc7\xca\
-\x00\x71\x13\x4c\xd5\x0e\x4a\x75\xa8\xc5\xd6\x99\xd6\xb1\x74\x70\
-\x46\x03\xad\xd8\x6a\x2b\xa8\x7f\x48\x5b\x3f\x2a\x2a\xd3\x99\x85\
-\xcd\x06\xe9\x80\x3a\x53\x09\x83\x7c\x6c\x42\xc6\xd6\x51\xa1\x63\
-\xeb\x07\x30\xa9\x5a\x0a\xe5\xc3\x12\xd8\xdd\x7b\xfa\x47\x50\xdf\
-\x7b\xbb\x9b\xec\x66\xdf\xc6\xa4\xcd\x99\xd9\x3f\xde\xef\x9e\xfb\
-\x7b\xe7\x9e\xf7\xf6\xbe\xfb\xee\xbd\x0f\x18\xc6\x30\x86\xf1\xff\
-\x0c\x0e\xc4\x49\xae\x88\xea\xbc\xd3\x65\x98\x49\x6b\x2f\x93\xc1\
-\x04\x8a\x17\x0b\x38\x07\xc0\x48\x00\x01\x00\xc7\xce\xfc\xf6\x0b\
-\xda\x0b\x98\x37\x11\xc4\xf6\xf6\xf9\x7c\xa7\xd4\xda\x4a\x66\xc0\
-\xf4\xb8\x2e\x49\x5b\xbb\x08\xe4\x7c\x00\x93\xfa\x95\x44\x78\x07\
-\x46\x5b\xac\x35\x4f\x77\x34\x60\x0f\x48\xf9\xab\xd2\x6f\x03\x24\
-\xd6\xc5\x71\xb5\x85\x96\x02\x98\xed\x67\x6a\x02\xaf\x0b\x5c\x95\
-\xfa\x27\x9e\xeb\xbc\x8d\x49\x1f\xf3\xfa\x83\x70\x4c\xb3\x61\xf4\
-\x20\x84\xa9\x7e\xe5\xcc\x81\x77\x05\x2e\x6f\x8f\xe0\x19\x3f\xee\
-\x88\xa2\x0d\x08\x6f\xd4\x05\x4a\xdb\x87\x08\x7e\xa7\x17\x9a\x05\
-\xb0\x03\x54\x9b\xac\xd9\x67\x02\xf8\xbb\x52\x38\x6c\x2d\x8e\x8f\
-\x00\xd2\x27\x0d\x2a\xcb\x80\x51\x32\x18\x27\x60\x3c\xa0\x3a\x00\
-\xdf\x04\x10\xea\x25\xe7\x76\x6b\xb9\xa4\x63\x01\xdf\x28\x46\x7f\
-\x51\x06\xd4\xc5\x35\xcd\x4a\xad\x00\xbe\x98\xa5\xf8\x38\xa8\xcd\
-\x94\xd9\x64\x81\x17\xda\x1b\xf8\xaf\x82\x72\x47\x15\x4a\x07\x70\
-\x15\x69\xe7\x01\x9c\x9f\xe3\x1c\xdd\x22\x6f\x69\x8f\xf0\x0f\xfd\
-\xd1\x0f\x14\x61\xc0\xb4\x98\x6e\x04\xf5\x14\x81\x0a\xaf\x28\x4a\
-\x8f\x06\x2b\xcc\x2f\x5f\x99\xcb\x23\xfd\xcd\xef\x44\x75\x54\xe5\
-\x95\x41\x2c\x06\x74\x2f\x80\xf3\xbd\xe5\x82\x56\xb6\xff\xc5\xdc\
-\x8b\x15\xb4\x85\xe6\x2e\xdc\x80\x66\x99\xf0\x24\x7b\x1f\xc8\x65\
-\x9e\x12\x2b\xe8\x29\xca\xac\x48\x34\xf2\x60\xc1\x79\xf3\xc0\xd7\
-\x37\xaa\x32\x69\x71\x27\xa5\xbb\x00\x9c\xed\x2a\x14\x5a\x43\x69\
-\x2e\x6c\x6b\xe2\x89\x42\x72\x16\x66\x40\xb3\x4c\xf8\x72\xbb\x0e\
-\xe0\xf5\x9e\x92\x2e\x43\x46\x76\x45\xd8\x5e\x50\xbe\x7e\x22\x1c\
-\xd3\x45\x30\x8a\x7b\x3b\x5c\x11\xaf\xb2\x82\xb3\x12\x73\x78\x2c\
-\xdf\x5c\xa6\xa0\x13\x7f\xd5\x2e\xcf\xd2\xf8\xdd\x29\x71\xea\x40\
-\x35\x1e\x00\x12\x8d\x3c\x68\x92\x9c\x29\x68\x9d\x33\x4e\xe1\x6b\
-\xec\xd6\xba\xeb\xa2\x0a\xe4\x9b\x2b\x6f\x03\x6a\x63\xfa\x36\xc4\
-\x7b\x5c\x27\x84\xd6\x86\x8e\x72\x76\x67\x23\xff\x91\x6f\x1e\xbf\
-\xb0\xab\x89\x27\xdb\x23\x66\xa1\xc8\x9f\x02\xf8\xe4\x71\x28\x60\
-\xee\x81\x80\xbd\x3f\xdf\x3c\x79\xfd\x05\xa6\x6d\xd0\x54\x1a\x6d\
-\x07\x30\xe2\xd3\xa8\x9e\x4b\x44\xcc\x4d\xa5\x18\x9d\x15\x8a\x70\
-\x4c\x3f\x02\xb5\xda\x19\x13\x78\x73\x7b\x03\x9f\xe9\xab\x6e\x9f\
-\x77\xc0\xb4\x16\x8d\xa1\x51\x2b\x5c\x8d\x47\x7b\xe8\xa8\x59\x3c\
-\x18\x1a\x0f\x00\x89\x06\x3c\x02\xe8\xf7\xce\x18\xa1\xc7\x6b\x63\
-\x9a\xdc\x57\xdd\x3e\x0d\x20\xec\x83\x00\x2e\x74\x84\xba\x82\x01\
-\x46\xda\xbe\xcb\xee\xc2\xa5\x96\x08\xa4\x46\x8f\x30\x4b\x24\xec\
-\x74\x44\xcb\x45\x3d\x3e\x6b\xab\x82\xbd\x55\xed\xd5\x80\x70\x8b\
-\x66\x00\xbc\xc5\x11\x12\xc4\xc6\x1d\xf5\xec\x2a\x46\x6f\x29\xb0\
-\x65\x0e\x4f\x31\xc8\x06\x00\x87\x1c\xe1\xc9\xdd\x47\x70\x7b\x6f\
-\xf5\x72\x1b\x20\x11\xd0\x2f\x3c\xc1\x75\x89\x46\xee\x2e\x42\x67\
-\x49\x91\xa8\xe7\x07\x10\x57\x3a\x63\x82\xee\x99\xf4\xa2\xce\xca\
-\x55\x27\xa7\x01\x75\x71\xcc\x04\x30\xc3\x11\x4a\xa6\xad\x69\x2e\
-\x5e\x66\x69\x11\x3a\x86\xdf\x90\xd8\xef\x08\x9d\xfb\xb9\x8f\x70\
-\x5b\x2e\x7e\x4e\x03\x2c\xf4\x13\xe7\x31\xa5\xdf\xee\x59\xc0\xb7\
-\x7d\xd0\x58\x52\xf4\xf4\x4d\x74\x5d\x28\x41\x77\xe6\x1a\x1b\x64\
-\x35\xa0\x26\xaa\x2f\x00\xf8\x96\x23\x94\x54\xd0\xdc\xe7\x9f\xcc\
-\xd2\xa2\x2a\x89\x67\x01\xbc\xe5\x08\x5d\xf8\x9e\xc1\x37\xb2\x71\
-\xb3\x1a\x10\x08\xe2\x46\xf4\x4c\x55\xf5\x80\x78\x39\x51\xcf\x0f\
-\xfc\x14\x59\x4a\xac\x6f\x62\x9a\xd0\x7a\x67\x8c\xc6\xde\x9c\x8d\
-\x9b\xd5\x00\x41\xf3\x5c\x01\xcb\xe7\x7d\x53\x37\x50\x30\xc6\xa3\
-\x99\x73\xb2\xfd\x0d\x32\x0c\x38\xd3\x63\x4e\x77\xc6\x52\x69\xfc\
-\xd1\x67\x79\x25\xc7\xee\x57\xd1\x01\xc0\x79\xd7\x8e\x3a\x58\x86\
-\x29\x5e\x5e\x86\x01\x15\xff\x41\x2d\x80\x72\x47\xe8\xcf\x9d\x4d\
-\xdc\xef\xe5\x0d\x7a\xac\xa0\xa5\xe4\xba\x70\x52\xe6\x3c\x65\x86\
-\x01\x06\xf8\x8a\xab\x12\xb5\xdd\x7f\x75\x03\x03\x4b\xe3\xd2\x2e\
-\xda\x89\x5e\x4e\x66\x1f\x20\x7b\xa9\x8b\x60\xcd\x5b\x19\x9c\x21\
-\x82\x80\x81\x47\x3b\x2f\xf5\x72\x32\x0d\x20\xbf\xe4\x3c\xb4\xc0\
-\xa0\x7f\xf6\xe7\x42\xea\xb4\x47\xbb\x30\xce\xcb\xc9\x30\x40\x16\
-\x95\x1e\xc2\xbf\x7d\x57\x36\x40\x38\xeb\xa3\x0c\xed\x95\x5e\x4e\
-\x86\x01\xa4\x9b\x64\x89\x82\xe6\xd8\x06\x13\xda\x16\xe1\x14\x80\
-\x94\x23\x54\x5e\x1d\x95\xb3\x83\xcf\x62\x80\x67\x92\x84\x16\x83\
-\xe2\x9d\xbf\x54\xc8\xfc\x0b\x00\xc7\x9d\xc7\xde\x3b\x62\x28\x61\
-\xd6\xd3\xa8\x00\xe0\x9c\x0f\x38\xfd\x66\x13\x4f\x3b\x39\x59\x3a\
-\x41\xb8\x66\x54\x6d\xcf\x2a\xee\x90\xc4\xc9\xd1\x18\xe5\x09\x1d\
-\xf7\x72\x32\x0d\xb0\x7a\xcf\xc3\xc8\xe8\x39\x87\x0a\x94\xc6\xc5\
-\x9e\xd0\xbb\x5e\x4e\x96\x77\x01\xb3\xd7\x79\x44\xd9\x2f\xfb\x29\
-\x6a\x80\xe1\xd2\x2e\x68\x9f\x97\x90\xed\x2f\xe0\x59\x6c\xe4\x8c\
-\x0c\xce\x10\x01\x61\x67\xb8\x8f\xcd\xeb\x5e\x4e\x86\x01\xa1\x14\
-\x76\x01\x70\xae\xbf\x4f\x0e\xc7\x74\x91\xff\xf2\x4a\x8c\x66\x19\
-\x80\x73\x5d\x31\xa1\xcd\x4b\xcb\x30\xe0\xcc\xda\xda\x2e\x57\x3d\
-\x62\xae\x97\x37\xd8\x51\x33\x09\x53\xe0\x5e\x51\x3e\x16\x1a\x8d\
-\x3d\x5e\x5e\x8e\xf9\x00\xba\xde\xa2\x08\xcd\xf7\x57\x5e\xe9\x61\
-\x60\x5d\x9a\x05\xbd\xd0\x36\x9b\xa9\x4c\x5e\x16\x94\x05\xb0\x0e\
-\x3d\x9b\x1a\xce\x54\xc6\x55\x57\x44\x75\x9e\xef\x2a\x4b\x85\x66\
-\x19\x90\x0b\x9c\x21\x5a\xb3\x36\x1b\x35\xab\x01\x3b\xea\xd9\x25\
-\xe0\xa5\x4f\x2a\x03\x15\xc9\xa0\xf5\x2e\x87\x0f\x5a\xd4\x5e\x8e\
-\x1b\x00\x4c\x70\x84\xde\x0f\x8d\xf9\xb4\x3d\x4e\xe4\x9c\x15\x16\
-\xf9\x6b\xd7\x31\xf8\x83\xe9\x31\x8d\xf5\x47\x62\xe9\x50\x1d\x55\
-\xb9\xa4\x9f\x3b\x63\x22\x57\x67\xbb\xfd\x81\x5e\x0c\xe8\xb8\x16\
-\x2f\xc3\xdd\x19\x96\xa7\x61\x97\xfb\xa2\xb2\x84\x38\xbb\x0c\xdf\
-\x03\x5d\x83\xb7\xc3\x65\x06\x6b\x72\xf1\x73\xaf\x0c\x91\x22\x79\
-\xb7\x27\x76\x53\x38\xae\x8c\x79\xb5\xc1\x82\x29\xcf\xeb\x5c\x4a\
-\xae\x25\x7c\x88\xf7\xef\xa8\x67\xc6\x10\xf8\x63\xf4\xba\x36\xb8\
-\x3b\xc2\x36\x50\xcf\xba\xf8\x52\x3c\xbc\x51\x17\x14\x27\xd5\x7f\
-\x54\x47\x55\x1e\x48\x69\x03\xdc\x7b\x88\x5e\x4b\x1d\xc2\xa3\xbd\
-\xd5\xeb\x73\x75\x38\x20\x73\x17\xdc\xb3\xab\x55\x4a\xa9\xe5\x9a\
-\xcd\xf2\x6e\x8e\xfa\x4c\x31\x32\x68\x1f\x21\x70\xa5\x23\x94\x34\
-\xe4\xe2\xbe\x36\x55\xf6\x69\xc0\xce\x06\x7e\x08\xf1\x5a\x01\xa7\
-\x3e\x8e\x91\x98\x7e\xb8\xdb\x3e\xd6\xb3\x80\xfa\xd9\x23\x1c\xd3\
-\xed\x02\xbf\xef\x8c\x89\x5c\x92\xcf\xb6\x9d\xbc\x1b\x10\x8e\x69\
-\x21\x28\xf7\x8e\x0b\xe9\x77\xc7\xd3\xe6\x0e\xef\x3b\xf6\x80\x41\
-\x62\x6d\x1c\x77\x08\x5a\x0d\xe7\xc5\xa4\x1e\x4e\x44\x02\x3f\xce\
-\x27\x45\x41\x57\xb0\x36\x96\x7e\x40\xe4\x52\x97\x06\x60\x5b\x3a\
-\xc8\x05\x9d\xf3\x79\x28\x57\xbd\x52\xa0\x3a\xaa\xf2\x91\x01\xfb\
-\x98\xc8\x5b\x5d\x05\xc4\x8b\xa1\x73\x38\x37\xd7\x63\xcf\x8b\x82\
-\x76\x89\x55\xa5\xcd\xdd\x04\xe2\xee\xf3\xe1\xca\x60\x4a\x1d\x75\
-\xad\xba\xac\x90\x5c\xc5\x60\x7a\x8b\xce\xaf\x0c\xea\x4f\x19\x8d\
-\x07\xde\x38\x05\x5e\x9f\x6f\xe3\x81\x7e\x6c\x94\xbc\x2e\xaa\xc0\
-\x81\xa0\xfd\x95\x40\xef\x2d\x96\x04\xb4\x26\x00\xb3\x72\x67\x03\
-\x3f\x2c\x34\x6f\x3e\xa8\x8b\x2a\x94\x0e\xe2\x87\x84\x96\x01\xf8\
-\xbc\xa7\x78\x4b\x2a\xc5\x1b\x3a\x9b\x78\xb4\x90\x9c\xfd\xdf\x2a\
-\x1b\xd7\xad\x94\xd6\x00\x28\xf3\x14\x9d\xa0\xf4\x90\x42\x66\x55\
-\x21\x1b\x16\x7b\xc3\xac\xad\x0a\x76\x1f\xc6\x22\x51\xcb\xe1\xde\
-\xaf\x04\x00\x10\xb4\x6a\x6c\xca\x2c\x5d\xdf\xc4\x74\xa1\xb9\x8b\
-\xea\xc5\x6b\x62\x9a\x69\xa8\x16\x00\x63\xb2\x14\x1f\x01\xb4\x09\
-\x32\x9b\x10\xc2\x4b\x85\x9a\x51\x1d\x55\xf9\x48\x83\x99\x32\x76\
-\x1e\xc0\x7a\x00\xd9\x86\xe1\x49\x91\x4b\xda\x23\x7c\xb2\x3f\xfa\
-\x01\x1f\xb6\xcb\xd7\xb4\xaa\xca\x58\x3d\x0c\xa0\xa1\x17\x5a\x12\
-\xc4\x36\x59\x6e\xa5\xc1\x5f\x25\xfc\x4d\x06\x87\x2b\x82\x38\x91\
-\x34\x48\x9b\x13\xa8\xb4\xe5\x18\xa5\x34\xc6\x81\x18\x4f\xd8\x3a\
-\x80\x57\xa3\xe7\x93\x9a\x5c\xc2\x3b\x44\x2e\x49\x44\xd8\x59\x8c\
-\x7e\xdf\x9e\xe3\xb5\x71\x5d\x23\xe9\x01\x00\xa5\xee\x0c\xbb\x24\
-\xfe\x6c\x6c\x1a\x4f\xf4\xe7\x96\xf7\xc2\xdf\x81\x4c\xb3\xcc\xb4\
-\x49\xa8\x37\xd4\x32\x01\x35\xbe\xe6\x06\xde\x06\xb8\x2a\x74\x14\
-\x4f\xfa\xb9\x47\xb1\x64\x23\xb9\x9a\x0d\x9a\x68\x8c\x5d\x74\xe6\
-\x63\x87\xf1\xfd\x4c\xf3\x3e\xa0\xcd\x56\x66\x6d\xc7\x6b\x78\xa5\
-\x3f\xdf\x03\xf4\x85\x01\x19\xca\xd6\xb4\xaa\x8a\x16\xb3\x8d\xec\
-\x44\x91\x13\x00\x8c\x23\x31\x4a\xc2\x48\xf4\xac\xdc\x1c\x45\xcf\
-\x67\x73\x07\x00\xed\x23\xcd\x3e\x11\xdb\x12\xf5\xd8\x3b\x58\xb6\
-\xe3\x0e\x63\x18\xc3\xf8\xdf\xc4\x7f\x01\x16\x1d\xd4\x53\x92\x2f\
-\x1f\x88\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x02\xeb\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x02\x9d\x49\x44\x41\x54\x78\x9c\xed\
-\x9a\xbd\x6e\x13\x41\x14\x46\xcf\x75\x08\xa1\x09\x5d\xde\x80\x37\
-\xb0\x5d\xd1\xf0\x08\x34\x58\x36\x09\x08\x1a\x7b\x0b\x6c\x57\x74\
-\xb4\x3c\x80\x6d\x90\x6c\x37\xfc\xe6\x47\x50\x20\xde\x80\x1a\x70\
-\xc5\x73\x20\x21\xd1\x40\x24\x7c\x29\x22\x24\x33\x5e\xc7\xb1\x77\
-\x66\x76\x66\xe3\x5b\xee\xde\xfd\x34\xe7\x68\x76\x76\x35\x1a\xd8\
-\xd4\xa6\x36\x75\x99\x4b\xf2\x1e\x80\xeb\x2a\x37\x07\xb7\x11\x7d\
-\x2a\xc2\x0f\x9d\x4a\x32\x19\xb7\xbf\xcd\xde\xbf\x92\xd7\xc0\x7c\
-\x54\x25\xe9\xd5\x51\x3d\x04\x4a\x28\x48\x49\x87\xc0\xcd\xd9\x9e\
-\x52\x3e\x43\x73\x5f\x67\xf0\x72\x06\xff\xaf\x94\xeb\x66\x5f\x21\
-\x05\xa4\xc2\xc3\x1f\xd0\x27\x66\x6f\xe1\x5e\x81\x45\xf0\xaa\xd2\
-\x98\x8c\x3b\x1f\xcd\xfe\x42\x2d\x82\xe7\xc3\xb7\xdf\xa7\x3d\x53\
-\x18\x01\xeb\xc0\x43\x41\x04\xac\x0b\x0f\x05\x10\x90\x05\x1e\x22\
-\x17\x90\x15\x1e\x22\x16\x60\x03\x1e\x22\x15\x60\x0b\x1e\x22\x14\
-\x60\x13\x1e\x22\x13\x60\x1b\x1e\x22\x12\xe0\x02\x1e\x22\x11\xe0\
-\x0a\x1e\x22\x10\xe0\x12\x1e\x02\x17\xe0\x1a\x1e\x02\x16\xe0\x03\
-\x1e\x02\x15\xe0\x0b\x1e\x02\x14\x60\x1b\xbe\xdc\x1c\xdc\x91\x92\
-\x3e\x07\x28\xa1\xad\xcf\xc3\xee\x87\xd9\xfb\x41\xed\x08\xd9\x86\
-\xaf\x24\xbd\xba\x88\x9e\xa0\xec\xa1\xec\x4d\x91\x91\xd9\x13\x8c\
-\x00\x17\xf0\x29\x79\x73\x15\x84\x00\x4f\xf0\x53\x41\x1f\x99\xbd\
-\xb9\x0b\xf0\x06\x2f\xdc\xff\x32\xec\xbe\x33\xfb\x73\x5d\x04\xfd\
-\xc2\x77\x0e\xd3\x9e\xc9\x4d\x40\x08\xf0\x90\x93\x80\x50\xe0\x21\
-\x07\x01\x21\xc1\x83\x67\x01\xa1\xc1\x83\x47\x01\x21\xc2\x83\x27\
-\x01\xbe\xe0\x55\xe5\xde\x64\xdc\x3e\x5a\x25\xcb\xb9\x80\x90\xe1\
-\xc1\xb1\x80\xd0\xe1\xc1\xa1\x80\x18\xe0\xc1\x91\x80\x58\xe0\xc1\
-\x81\x80\x98\xe0\xc1\xb2\x80\xd8\xe0\xc1\xa2\x80\x18\xe1\xc1\x92\
-\x80\x58\xe1\xc1\xc2\x19\x21\x5f\xf0\xc0\xc1\x64\xdc\x3e\x5e\x35\
-\xaf\x9a\xf4\x6a\x8a\x3c\x03\x07\x7b\x82\x3e\xe1\xbf\x8e\x3a\xab\
-\xc3\xb7\x06\x07\xaa\x72\xec\x64\x4f\x30\x0a\x78\xf4\x15\x4b\x18\
-\xd7\x12\x10\x3c\x7c\xd2\xdf\x4f\x81\xb7\xb3\x27\x18\x05\xbc\xf2\
-\xda\xcc\xb3\xb2\x27\x18\x37\x7c\xc6\x3d\xc1\xd0\xe1\xcb\xcd\xc1\
-\x5d\x11\x7d\x63\xe6\x2d\xfb\x74\x5e\x48\x40\x51\xe1\xe1\x02\x6b\
-\x80\x37\x78\xd1\x7d\xdf\xf0\xb0\x64\x06\x78\x85\x1f\x76\x4f\x56\
-\xcd\xcb\x0a\x0f\xe7\xfc\x09\x86\x0e\x5f\x69\xf5\x1b\x30\x0f\xcf\
-\x8a\x7f\x8c\xa9\x33\x20\x0e\x78\xde\xce\xe5\xad\xb1\x86\x6c\x99\
-\x17\xaa\x49\xaf\x86\xca\x11\x96\xe0\x17\xe4\xad\x0d\x5f\x4d\x7a\
-\x35\x48\xc9\x5b\x73\x01\xfd\x6f\x06\x94\x9b\xa3\x6d\x91\xdf\xdf\
-\x81\xdd\x99\xcb\x19\x0e\x27\xa4\xe6\x65\x78\xe7\xed\xe6\x81\xf1\
-\x15\xd8\x3d\xbd\xba\x05\xec\xcc\x5c\xca\x74\x2c\x25\x25\x2f\xd3\
-\x60\x6d\xe7\x81\x21\xe0\xd3\xcb\x87\xbf\x54\x79\x0c\x9c\x02\x3f\
-\x81\x7a\x96\x33\x39\x66\x9e\x88\x36\xb2\x0c\xd6\x76\xde\xc2\xba\
-\xd1\xee\xef\x94\x9b\xa3\xed\x50\xf3\x6e\x3d\x78\x71\xcd\x66\xde\
-\xa6\x36\x75\x89\xeb\x2f\x57\x3e\x7f\x9e\x34\x61\xbc\xb4\x00\x00\
-\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x00\x87\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x00\x39\x49\x44\x41\x54\x58\x85\xed\
-\xce\x31\x11\x00\x30\x08\x04\x41\x26\xde\x50\x80\x05\xfc\x5b\x20\
-\x22\xa0\xdc\xeb\xff\x67\x23\x16\x65\xf5\x64\xf5\x6c\x3e\xde\x66\
-\x7c\x11\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-\xc0\x07\xe4\xc6\x04\x35\x1a\x89\x95\x2e\x00\x00\x00\x00\x49\x45\
-\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x00\x86\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x00\x38\x49\x44\x41\x54\x58\x85\xed\
-\xce\x41\x0d\x00\x40\x08\x03\x41\x72\xaa\x90\x87\x21\x24\x92\x9c\
-\x08\x78\xce\xfe\xdb\x4c\xc4\xa2\xec\xa9\xec\xa9\xcd\xc7\xdb\x8c\
-\x2f\x02\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-\xf8\xac\x79\x05\x03\xdf\x56\x31\xc9\x00\x00\x00\x00\x49\x45\x4e\
-\x44\xae\x42\x60\x82\
-\x00\x00\x03\xa2\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x03\x54\x49\x44\x41\x54\x78\x9c\xed\
-\x9b\xbd\x4f\x53\x51\x18\x87\x9f\xb7\x85\x58\x07\x8d\x9d\x18\x24\
-\x3a\xcb\xa0\x24\x92\x36\x6e\x98\x28\x0c\x1a\x91\x26\xc8\x20\x09\
-\xff\x81\x71\x53\x18\x24\x9a\xf8\x11\x27\x3f\xfe\x02\x12\x17\x31\
-\x82\x18\x1d\x44\x13\x9c\x34\x25\x98\xa0\x03\xce\x12\x1c\x70\xb0\
-\xc4\xc5\x1a\xa4\xaf\x83\x17\x73\xef\xed\xad\xd2\x9e\x7b\x7b\x40\
-\xce\xb3\x9d\xf7\x9e\x9e\xfe\xde\xdf\x3d\x5f\x69\xcf\x01\x87\xc3\
-\xb1\x93\x91\xcd\x54\xea\x9e\xd5\x96\x72\x89\x33\x15\x2a\x83\x82\
-\x74\x29\xec\x17\xd8\x95\xb4\xb8\x7a\x50\xf8\x21\xf0\x59\xd1\xf9\
-\x14\xa9\x87\x99\x2c\x4f\x5f\x1f\x97\x9f\xff\xfa\xdc\x3f\x0d\xc8\
-\x4f\xea\x49\xd0\xbb\xc0\xa1\x58\x94\x36\x8f\x45\x90\x8b\xc5\x82\
-\xbc\xfc\x5b\xa5\x54\xcd\x27\xaa\x92\x7b\xac\xa3\xa0\x33\x6c\xbf\
-\xe4\x01\x3a\x40\x67\xf2\x53\x3a\x82\x6a\xcd\x17\x5d\xd3\x80\xdc\
-\x24\x23\x22\x7a\x3d\x19\x6d\x4d\x44\xf5\x46\xfe\x09\x97\x6b\x3d\
-\x8e\x74\xc6\xeb\xf6\x33\xa1\x70\x49\x45\xae\x90\xe6\xf9\xc1\x32\
-\x4b\x8f\xce\xc9\x7a\xac\x42\x0d\x19\x98\xd0\xf4\xa7\x0c\x07\x58\
-\xe7\x94\xa8\x5e\x03\xb2\xc1\x1a\xd2\x13\x35\x1c\xaa\x0c\xe8\x9e\
-\xd5\x96\xef\x25\xfd\x80\xbf\xdb\x0b\xaf\x48\xc9\x50\xb1\x4f\x56\
-\x62\x57\x9e\x00\xf9\x69\x6d\xa3\xa2\x0f\x50\x4e\xf8\xc2\x8b\xbb\
-\xb3\x72\x24\x3c\x31\x56\x0d\x81\x72\x89\x33\x04\xc7\xfc\xd7\xb4\
-\xca\xf9\xed\x92\x3c\x40\xb1\x4f\x56\x48\xc9\x10\x50\xf2\x85\x3b\
-\xbc\xdc\x02\x54\x19\x50\xa1\x32\xe8\x2f\xab\xc8\xd8\x9b\x82\x7c\
-\x89\x5f\x66\xb2\x14\xfb\x64\x45\x54\xc6\xfc\xb1\x70\x6e\x10\x61\
-\x80\x20\x5d\x81\x40\x9a\xe7\xb1\xab\x6b\x12\x95\x56\x9e\x05\x23\
-\x72\x34\x5c\xa7\xca\x00\x85\xfd\xfe\xf2\xc1\x32\x4b\x71\x0b\x6b\
-\x16\x11\xda\xdb\xc3\x75\x22\x7a\x40\x70\x87\xb7\xd5\x66\xfb\x7a\
-\x08\x6b\x8f\xda\xbd\xd6\xde\x08\xed\x10\x9c\x01\xb6\x05\xd8\xc6\
-\x19\x60\x5b\x80\x6d\x9c\x01\xb6\x05\xd8\xc6\x19\x60\x5b\x80\x6d\
-\x9c\x01\xb6\x05\xd8\xc6\x19\x60\x5b\x80\x6d\x5a\xe2\x68\x24\x3f\
-\xa5\x3d\xa8\xde\x06\x0e\xb3\xc9\xff\x1a\x0c\x50\xe0\x3d\x22\x97\
-\x8a\xfd\x12\xfe\xdd\xb2\x6e\x8c\x7b\x40\x6e\x52\x87\x51\x7d\x01\
-\x1c\x21\xf9\xe4\xf1\xbe\xa3\x13\xd5\x17\xb9\x49\x1d\x36\x6d\xcc\
-\xc8\x80\xce\x29\xdd\x27\xe8\x7d\x53\x11\x8d\x22\xe8\xbd\xce\x29\
-\xdd\x67\xd2\x86\x91\x01\x19\x38\x06\xec\x31\x69\xc3\x90\xbd\x9e\
-\x86\x86\xd9\xf1\x93\xa0\x91\x01\x65\x78\x0b\x7c\x8b\x49\x4b\x23\
-\x7c\xf3\x34\x34\x8c\x91\x01\x0b\xfd\xb2\xaa\xc8\x05\x93\x36\x4c\
-\x50\xe4\xc2\x42\xbf\xac\x9a\xb4\x61\x3c\x04\xe6\x0a\x32\x8e\x48\
-\x2f\xb0\xc0\xef\x25\x2a\x69\x36\x96\xc1\xde\xb9\x82\x8c\x9b\x36\
-\x16\xcb\x3e\xc0\x5b\x8f\x8d\xd7\x64\x1b\xb8\x49\xd0\xb6\x00\xdb\
-\x38\x03\x6c\x0b\xb0\x8d\x33\xc0\xb6\x00\xdb\x38\x03\x6c\x0b\xb0\
-\x8d\x33\xc0\xb6\x00\xdb\x38\x03\x6c\x0b\xb0\x8d\x33\x20\x1c\x50\
-\xf8\xe1\x2f\x0f\x4c\x68\xba\x79\x72\xe2\x25\xac\x3d\x9c\x1b\x44\
-\x1f\x92\xfa\xec\x2f\x7f\xca\x70\x20\x7e\x69\xcd\x21\x42\xfb\x72\
-\xb8\x4e\x44\x0f\xd0\xf9\x40\x60\x9d\x53\xf1\xca\x6a\x1e\xa9\x35\
-\x4e\x07\x23\xfa\xae\xaa\x4e\x75\x20\xf5\xd0\x5f\x16\xd5\x6b\xf9\
-\x69\x6d\x8b\x5b\x5c\xd2\xe4\xa7\xb5\x4d\x45\xaf\xfa\x63\xe1\xdc\
-\x7e\xc7\x42\x64\xb2\x3c\x05\x3e\xfa\x42\x59\x2a\xfa\x60\x3b\x99\
-\xf0\xe7\xb0\x74\xf0\xc4\xf8\xa2\x97\x5b\x80\xba\x8e\xcb\x8b\xca\
-\x58\xa5\x95\x67\x5b\xf9\xb8\x7c\x6a\x8d\xd3\xde\x9b\x6f\xec\xb8\
-\xfc\x06\xb9\xc7\x3a\xfa\x5f\x5c\x98\x00\x10\x19\x2d\xf6\xcb\xcd\
-\xa8\x47\x35\xf7\x01\x73\x05\x6e\x22\x32\x9a\x9c\xaa\xa6\xa0\x20\
-\x23\xc5\xb3\xdc\xaa\x55\x61\xb3\x97\xa6\xee\x00\x1d\xb1\x4a\x4b\
-\x9e\x4d\x5d\x9a\xaa\xfb\xda\x9c\x77\xe4\xbc\x7d\x2b\x5e\x9b\x03\
-\x96\x41\xdf\xd5\x73\x6d\xce\xe1\x70\xec\x6c\x7e\x01\x43\x8d\x07\
-\x87\xbb\xe6\x3f\x9a\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\
-\x82\
-\x00\x00\x08\xe5\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x08\x97\x49\x44\x41\x54\x78\x9c\xed\
-\x5b\x6d\x6c\x14\xc7\x19\x7e\xde\xb9\x0f\xdb\xa1\xfe\x68\x21\xa1\
-\xc8\xd0\x06\xac\x20\x28\xa6\x2a\x98\x56\x35\x45\x60\xc0\x9c\xeb\
-\xaa\x98\xf8\x60\xd5\x90\x0a\x62\xe3\x8f\x86\xa4\xad\x4a\x94\x46\
-\x02\x29\x39\xdc\x86\x7e\xa4\x0d\x09\x89\x14\x08\x9c\x8d\x21\xd0\
-\x48\x3d\x6c\x23\x93\xc6\xe1\x6c\xa7\x46\xa4\x80\x42\x20\x55\x02\
-\x36\x51\x52\x87\x50\x6a\x25\x51\xb1\x9d\x03\x81\xed\xbb\x9b\xb7\
-\x3f\xf8\xda\xdd\x5b\x9f\xef\x7c\xbb\xae\x69\xfd\xfc\x9b\x67\xde\
-\x7d\xf7\xd9\xe7\x66\x67\x66\x67\xe6\x80\x31\x8c\x61\x0c\xff\xcf\
-\xa0\x91\xb8\x49\xa1\x52\x7a\x77\x50\xda\x17\x0a\xe2\xd9\x92\x31\
-\x83\x80\x69\x00\x67\x80\x28\x0d\x12\x36\x10\x02\x00\x02\x20\xbe\
-\x00\x89\x0e\x16\xd4\x2e\x08\x47\xfd\x3e\xef\xc7\x56\x6b\xb3\xcc\
-\x80\x25\xf7\x57\x66\x09\x7b\xb8\x44\x30\x15\x31\xf0\xcd\x61\xa6\
-\xf9\x98\x99\x9b\x18\xa2\xb6\xb5\x7e\xd7\x3b\x00\xd8\x4c\x8d\x80\
-\xf9\x06\xd0\xd2\xe2\xb2\x02\x12\xe2\x09\x02\x2f\x36\x39\xf7\x19\
-\x26\x6c\xed\xf9\x8a\xd8\x77\x6a\xe7\xce\xa0\x59\x49\x4d\x33\xa0\
-\xc0\xbd\x6e\xb1\x24\xf1\x0c\x80\x79\x66\xe5\x34\x06\x9f\x27\x60\
-\xb3\xbf\xae\x7a\x2f\x4c\x68\x11\x09\x1b\xb0\xb4\xa8\x7c\x22\xd9\
-\xf1\x2c\x11\x7e\x1c\x25\x4c\x32\xf0\x37\x62\xb4\x31\xf8\x9c\x20\
-\xdb\x3f\x18\xd4\x1d\x14\xfd\x97\x53\x40\xe1\x81\x30\x52\x89\x44\
-\x3a\x88\xa6\x82\x31\x9d\x88\x73\xc1\xb4\x0c\x40\xca\x60\x09\x19\
-\x38\x6a\x03\xad\x3f\x5c\xb7\xeb\x6c\x22\xfa\x13\x32\xa0\x40\x29\
-\xfb\x8e\x94\x74\x10\xc0\x24\x7d\x1d\x03\x97\x01\xbc\x2e\x88\x0e\
-\x85\xc3\xfd\x6f\xb4\x36\xec\xbd\x14\x4f\xee\x5c\x65\x43\xca\xb8\
-\x70\x60\x09\x41\x2c\x07\x71\x91\xd1\x3d\x00\xf4\x01\x58\xd7\x5c\
-\xe7\x7d\x75\x58\x0f\x80\x04\x0c\xc8\x77\x97\x3d\x48\x44\x35\x00\
-\x92\x22\x44\x11\xbd\xe0\x74\xda\x7f\xf7\x97\x3f\x6d\xef\x19\x6e\
-\x7e\x35\x14\x45\x71\xf6\xca\xf4\x0a\x00\x4f\x01\xb8\x47\x5f\x4f\
-\xc0\x96\xdc\xec\xcc\xa7\xaa\xaa\xaa\x64\xbc\xb9\xe3\x36\xc0\xe3\
-\xf1\x88\x63\x67\xbb\x9e\x06\xf3\x46\x5d\x95\x04\xa3\xc6\x0e\x54\
-\x35\xd5\x7b\x2f\xc6\x9b\x37\x16\x14\x15\xad\x4b\xbd\x6a\x17\x8f\
-\x11\xe1\x71\x00\x5f\x52\xd7\x31\xe8\x60\x48\x38\xd6\xb4\xf9\x5e\
-\xba\x12\x4f\xce\xb8\x0c\xf0\x78\x3c\xe2\xd8\xfb\x17\xf7\x83\xe8\
-\x01\x5d\x96\x2e\x41\x5c\x7c\xd8\x57\xfd\x76\x3c\xf9\x86\x8b\x42\
-\x77\xf9\xe4\x10\xa1\x01\x91\x1d\xee\xbb\xf6\xe4\x6b\x79\x4d\xfb\
-\xf7\x07\x62\xcd\x65\x8b\xe7\xc6\xce\xf1\xf7\x55\x81\xe8\x51\x1d\
-\x7d\x42\xb0\x58\x7a\xb8\xce\xfb\x41\x3c\xb9\x12\xc1\x47\x1d\xa7\
-\x03\x13\xb3\x17\xed\x73\xc8\x81\x7b\x89\x34\x73\x8c\x49\xe1\x90\
-\x63\x76\x4e\x76\xd6\x9f\xdb\xdb\xdb\x63\x1a\x21\x62\x36\xc0\xe5\
-\x2e\xff\x11\x08\x2f\xea\xe8\x3d\xc1\xd4\x90\xd2\xfa\x6a\x75\x6f\
-\xac\x79\xcc\xc2\xc5\xf6\x13\xa1\xce\x8e\xd3\x0d\x59\x33\xe7\x5c\
-\x05\x51\x3e\x6e\xb4\x66\x02\xa6\xf7\x21\x25\xb9\xb3\xfd\x74\x4b\
-\x2c\x79\x62\x7a\x05\x96\xad\x5c\x37\x0f\x10\x47\x01\x24\xab\xe8\
-\x7d\xcd\x75\xde\xb5\xb0\x60\x76\x16\x2f\xf2\xdd\xe5\xbf\x20\xc2\
-\x73\x6a\x8e\x09\x0f\xb5\x1c\xf0\xee\x1d\xea\x5a\x31\x54\xc0\xd2\
-\xe2\xb5\xe3\x01\x71\x10\xea\x87\x67\xbc\x1d\x4c\x0d\x55\x60\x14\
-\x3c\x3c\x00\xb4\xd4\x7b\xb7\x81\xb1\x5b\xcd\x11\x63\x57\x81\xbb\
-\x72\xee\x50\xd7\x0e\x69\x00\x89\xa4\x67\x00\x64\xde\x26\xd0\x85\
-\x90\x2c\x6e\xab\xad\xed\x1b\x8e\x58\x8b\xc0\xf6\x6b\x29\xeb\x01\
-\x1c\x53\x71\xce\x30\xc9\x5d\x79\x79\x1e\x7b\xb4\x0b\xa3\x1a\x90\
-\xaf\x54\x2e\x20\xf0\x3a\xf5\x8d\x58\x62\x65\x73\x63\x4d\x57\x02\
-\x62\x2d\x41\x53\xd3\x8b\xfd\x32\x08\x37\x18\xff\xbe\xc9\x11\x30\
-\xd7\x39\xfe\x5f\x8f\x44\xbb\x2e\x9a\x01\x44\xe1\xf0\x6f\x75\xdc\
-\xfe\x96\x7a\xef\x89\x44\x84\x5a\x89\xd6\x46\xef\x67\x0c\x6c\x51\
-\x73\xcc\x78\xd2\xb5\x66\xcd\xb8\xc1\xae\x19\xd4\x80\x65\x4a\xc5\
-\x42\x10\x2d\x50\x51\x41\xc9\x61\x8f\x09\x3a\x2d\x45\x28\x2d\xb4\
-\x03\xc0\x85\x5b\x04\x61\x02\x5f\x4d\xfe\xc9\x60\xf1\x83\xb7\x00\
-\xc6\x2f\xb5\x04\xbd\xdc\x5a\xbf\xbb\x33\x61\x85\x16\xa3\xad\xb6\
-\xb6\x0f\x4c\xba\x1f\x8a\x1f\x53\x14\xc5\x70\xc8\x37\x34\x20\x4f\
-\x29\xf9\x2a\x98\xbf\xaf\xa2\x82\x32\xc8\x4f\x9b\xa6\xd2\x62\x64\
-\xd8\x7a\x5f\x01\xf8\x43\x15\x95\xd9\x23\x33\xf2\x8d\x62\x0d\x0d\
-\x70\x48\xc7\x83\xd0\x4e\x92\xde\x6c\x6d\xf4\x7e\x66\xa2\x46\x4b\
-\xe1\xf3\xf9\xc2\x60\xf2\xa9\x39\x02\x3f\x64\x14\x3b\xc8\x2b\xc0\
-\xcb\x35\x17\x13\x35\x9a\x25\x6e\xa4\x40\x24\xf4\x9a\x7f\x60\xf4\
-\x1a\x44\x18\x70\xa3\xc7\x9c\xaf\xe6\x24\xd1\x6b\xe6\xca\xb3\x1e\
-\xb9\xd9\x93\x4e\x82\xa0\x6e\xb5\xe9\x01\xa4\xe5\xe8\xe3\x22\x0c\
-\xe0\x6b\xce\xef\x02\x70\xaa\xa8\xbf\xb7\xf8\x76\x5e\xd0\xc7\x8d\
-\x76\x54\x55\x55\x49\x30\x34\x3f\x9c\x64\x11\xb1\x4e\x19\xf9\x0a\
-\xb0\xc8\x56\x17\x89\x70\xd4\x74\x75\x23\x04\x02\x6b\xb5\x33\x66\
-\xe9\x63\x0c\x0c\xc0\x4c\x75\x51\x4a\xfa\x30\x22\xe6\x4e\x01\x09\
-\x9d\x76\x9e\xa9\x0f\x89\x34\x80\xf8\x5e\x2d\x21\x47\xfd\xd8\x3f\
-\x18\x06\x28\xa8\xd7\x3e\x55\x1f\x63\x34\x0a\xa4\xaa\x0b\x04\x8c\
-\xf8\xb7\xbe\x69\x18\x17\xa1\x3d\x55\x1f\x32\xa4\x01\x82\x39\xae\
-\x35\xb6\xd1\x84\xb6\xda\xda\x7e\x00\x21\x15\xe5\x54\x14\x45\xdd\
-\xc1\x1b\x1a\xa0\x59\x24\x09\x09\x31\x2a\xbe\xf9\xad\x42\x84\x01\
-\xc4\xb8\xac\x09\x60\x8e\x68\x36\x77\x0a\xf2\x4a\x4a\x92\x00\xa8\
-\xd7\x03\x06\x7c\x3e\xdf\x80\x3a\x26\x72\x1e\x70\x7d\xa7\xf6\x76\
-\x19\xc8\xb0\x46\x9e\xf5\xb0\x75\xdb\xd3\x75\xd4\x65\x7d\x4c\xa4\
-\x01\xc0\x27\x1a\x82\x22\x7b\xce\x3b\x06\x49\x72\x9a\xa6\xcc\x38\
-\xaf\x0f\x31\x9a\x07\x74\xa8\x8b\x04\xba\xcf\x64\x59\x23\x06\x62\
-\xa1\xd1\xce\xc0\x39\x7d\x4c\x84\x01\x82\xa1\xd9\x6c\x64\x60\x81\
-\x3e\xe6\x4e\x81\x60\xd6\x6a\x27\x9c\x89\x88\xd1\x13\x03\x76\xe7\
-\x71\x00\xb7\xf6\xdf\x09\x98\x5b\xe8\x2e\x9f\x6c\x85\x40\x2b\xe1\
-\xf1\x78\x04\x83\x7e\xa8\x21\x19\x6d\xfa\xb8\x08\x03\x6e\xec\xad\
-\x1d\x57\x73\x21\xd2\x25\xba\x03\xf0\xd6\xfb\x5d\x39\xd0\xec\x28\
-\x53\x20\xd4\x9d\xf9\x8e\x3e\xce\x70\x3d\x80\x00\xdd\xe7\xaf\x2c\
-\x32\x55\xdd\x08\x80\x84\x5e\x33\xbf\xd1\xd6\x56\x15\xd2\xc7\x19\
-\x1a\xc0\x41\xb9\x1f\x80\x6a\xab\x99\x96\x14\x2a\xa5\x77\x9b\xaa\
-\xd0\x42\x78\x3c\x1e\x41\x4c\xab\x74\xf4\x1e\xa3\x58\x43\x03\x9a\
-\x1b\x6b\xba\x88\xe0\x57\x51\x49\x41\x69\xd7\x6f\x87\x8f\x5a\x1c\
-\x3f\xdb\xb5\x1a\xc0\x8c\x9b\x65\x02\x3e\x0d\x5e\xca\xf4\x1b\xc5\
-\x0e\xba\x2a\xcc\xe0\x3f\xaa\xcb\x04\x7e\x74\x89\xbb\xec\xeb\xa6\
-\xa9\xb4\x08\x8a\xa2\x38\x99\xf9\xd7\x6a\x8e\x99\x9f\x33\x6a\xfe\
-\x40\x14\x03\x9a\x0f\x54\xbf\x49\xac\xe9\x0c\x9d\x36\xc2\x66\x73\
-\x64\x5a\x87\x1e\x99\x56\x09\xed\x67\x6f\x77\x4a\x88\xb7\x0f\x16\
-\x1f\x6d\x67\x88\xa5\xc0\x26\x2d\x45\x6b\x5d\x4a\x79\xc4\xba\xda\
-\x68\x41\xde\xea\xca\x09\x04\x7a\x52\x43\x32\x7e\xd3\xd8\x58\x13\
-\x31\x05\xbe\x89\xa8\x7b\x83\x2d\x07\xbc\x6d\x00\xbd\xa2\x8e\x67\
-\x89\x86\xa5\x45\xe5\x13\x13\x52\x6a\x01\x14\x45\x71\x3a\xfa\xe5\
-\x01\xa8\xce\x10\x11\xf0\x5e\xf7\x04\xf1\x42\xb4\xeb\x86\xde\x1d\
-\x96\xb6\xc7\x75\xab\xab\x53\x84\x03\xf5\x85\x85\x3f\xd3\x1f\x8e\
-\xfa\xaf\xa2\x57\xa6\x6f\x03\x61\x91\x8a\x0a\x92\xe0\x8a\xa1\x0e\
-\x55\x0e\x69\x80\xbf\x61\xc7\xe7\x2c\x71\x3f\x80\x7e\x15\x3d\x3f\
-\x78\x57\xdf\x4b\x18\xa1\xb3\xc6\x43\xc1\xb5\xaa\xe2\x11\x00\x0f\
-\xab\x39\x62\xac\x8f\xe5\xcc\x52\x4c\x47\x64\x3a\x3b\x4e\x5f\xcc\
-\x9a\x39\xe7\x13\x10\x15\xdf\xba\x01\x30\x67\xda\x37\xe6\x4e\xca\
-\xc9\xce\xf2\xb7\xb7\xb7\x87\xe3\x56\x6d\x0e\xc8\xb5\xb2\xfc\xe7\
-\x0c\x6c\x83\xea\xc7\x20\xc2\xf3\xfe\x3a\xaf\x7e\x67\xdb\x10\x31\
-\x9f\x11\xea\xec\x78\xf7\xbd\xac\x59\x39\x77\x01\xf8\xde\xad\x1b\
-\x01\x39\x7d\x32\x79\xe1\xd7\xbe\x35\xef\xb5\xf3\x67\x4e\x5d\x8d\
-\x47\x79\xa2\x50\x14\xc5\x99\x39\x73\xfe\xcb\x00\x36\x41\xdb\x12\
-\x0f\x07\x2f\x65\x96\x9e\x3f\x7f\x24\xa6\x33\x83\x43\xbe\x02\x6a\
-\x64\x50\xef\x26\x5c\x3f\x9e\x76\x1b\x84\x45\x8e\x81\xf0\xc9\x7c\
-\xa5\x72\x76\x3c\xb9\x12\x81\xab\xf8\xe1\x7b\x7a\xc3\x69\xad\x00\
-\xca\x74\x55\x67\x83\xe1\xd0\x03\x83\x8d\xf9\x46\x88\xfb\x1d\x56\
-\x14\xc5\xd6\x23\x33\xfe\x40\xe0\x0d\xba\xaa\x20\x80\xed\x24\xed\
-\x5b\xfc\x0d\x3b\x3e\x8f\x37\x6f\x2c\xc8\x55\x36\xa4\xa4\xca\xcb\
-\x3f\x65\xc6\x46\x10\xbe\xac\xad\xe5\x26\x16\xb6\xd5\x2d\xbe\x9d\
-\x5f\xc4\x93\x73\xd8\x9d\x98\xcb\x5d\x5e\xc6\x84\xed\x00\x1c\xba\
-\xaa\x2b\x44\x78\xd6\x96\x74\x6d\x6b\x3c\x07\x16\xa3\x21\x2f\xcf\
-\x63\x77\x4c\xb8\x58\x02\xa6\xcd\x50\x9f\x57\xba\x05\xde\x9a\x21\
-\x02\x4f\xf8\x7c\xbe\xb8\xfb\xa2\x84\x7a\x71\x97\xbb\x6c\x21\x13\
-\xd5\x03\x18\x1f\xa9\x09\x3d\x04\x1c\x02\x70\xc8\x96\x72\xcd\x1f\
-\xaf\x19\x8a\xa2\x38\xbb\xc3\x19\x0b\x05\xf1\x72\x00\x2b\x00\x18\
-\x4d\xc3\x83\xc4\x58\xef\xaf\xf7\x56\x0f\x47\x3f\x60\xc2\x30\xe6\
-\x5a\x51\x3a\x85\xed\xb6\xe7\x01\xb8\xa3\x84\x05\x09\x38\xc2\x84\
-\xbf\x32\xd3\x07\x36\x19\xfe\x88\x25\x77\x3b\xc6\x25\x5f\x91\x14\
-\x08\xf7\x0f\xa4\xa6\x12\xfa\xd3\x29\x2c\xa6\x0a\xc2\x74\x66\xca\
-\x05\x51\x01\xc0\x69\x51\x72\x9e\x24\x81\xf5\x7e\x9f\xf7\x54\x22\
-\xfa\x4d\x1b\xc7\x5d\xab\x2a\x0a\x99\xf9\xf7\x00\xac\xed\x0c\x09\
-\x5d\x00\xff\x2a\x83\x02\xde\xe1\x34\xf9\xc8\x74\x26\xe2\xfa\x61\
-\xea\xae\x15\x20\xde\x08\xe0\xdb\x66\xe6\x06\xd0\x09\x60\x6b\x30\
-\x35\x54\x6d\xe6\x19\x45\xcb\x66\x72\x05\x2b\x2b\x66\x31\x50\xc2\
-\xe0\x22\x00\xd3\x87\x93\x83\x80\x4f\x25\xe8\x75\xc1\x72\x4f\xee\
-\xec\xc9\x6f\x0d\xe7\xff\x00\x31\xdc\xc3\x7a\xb8\x56\x94\x4e\x91\
-\x0e\xdb\x62\x02\xcd\x02\xe4\x0c\x30\x4d\x05\x90\x0e\x20\x0d\xd7\
-\x77\x6e\xbe\x00\x10\x00\xe8\x9f\x00\x9f\x63\xe0\x1c\x8b\xf0\x91\
-\x56\xdf\xee\x0e\x8c\x92\xe3\xb8\x63\x18\xc3\x18\xfe\x37\xf1\x1f\
-\x38\xf1\xe0\xe7\x81\x02\x5e\x62\x00\x00\x00\x00\x49\x45\x4e\x44\
-\xae\x42\x60\x82\
-\x00\x00\x00\xcd\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x00\x7f\x49\x44\x41\x54\x78\x9c\xed\
-\xd9\x51\x0d\x80\x30\x10\x05\xc1\x03\xff\xca\x50\x41\x83\x10\x90\
-\xb1\x24\x9d\x31\x70\x2f\x9b\xfe\x75\x26\x74\xaf\xe7\xbd\xd7\xf3\
-\x96\x1b\xce\xf2\xf8\x1f\x08\x50\x0f\xa8\x09\x50\x0f\xa8\x09\x50\
-\x0f\xa8\x09\x50\x0f\xa8\x09\x50\x0f\xa8\x09\x50\x0f\xa8\x09\x50\
-\x0f\xa8\x09\x50\x0f\xa8\x09\x50\x0f\xa8\x09\x50\x0f\xa8\x09\x50\
-\x0f\xa8\x09\x50\x0f\xa8\x09\x50\x0f\xa8\x09\x50\x0f\xa8\x6d\x1f\
-\xe0\x28\x8f\xd7\x5f\xe3\x33\xf1\x0b\x38\x66\xae\xf2\x3e\x00\x00\
-\x00\x00\x00\x00\x00\x6c\xe2\x03\x9c\x6d\x0b\xf4\x94\x3b\x8d\x4b\
-\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x01\x30\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x00\xe2\x49\x44\x41\x54\x78\x9c\xed\
-\xd0\xb1\x0d\xc2\x30\x18\x05\xe1\x67\x86\x48\x87\x94\x99\x58\x21\
-\x15\x13\xb1\x05\x33\x45\xa1\x61\x0b\x53\x80\xa8\xa0\xb2\x9d\x43\
-\xe2\xbe\x2a\xc5\x2f\x78\xbe\x44\xd2\x3f\x2b\xa3\xff\x60\x5d\x6f\
-\xa7\x94\x5c\x92\x24\x35\xe7\x79\x3e\x5e\x7b\xde\xb7\x3a\x8c\xfc\
-\xf1\x24\x79\x3d\x66\x4a\x32\xbd\x1f\xd6\xf3\xbe\xd1\xf8\x00\xcf\
-\xc7\x7c\xfa\xee\x75\xdf\x64\x8f\x00\x3f\xcd\x00\xf4\x00\x9a\x01\
-\xe8\x01\x34\x03\xd0\x03\x68\x06\xa0\x07\xd0\x0c\x40\x0f\xa0\x19\
-\x80\x1e\x40\x33\x00\x3d\x80\x66\x00\x7a\x00\xcd\x00\xf4\x00\x9a\
-\x01\xe8\x01\x34\x03\xd0\x03\x68\x06\xa0\x07\xd0\x0c\x40\x0f\xa0\
-\x19\x80\x1e\x40\x33\x00\x3d\x80\x66\x00\x7a\x00\xcd\x00\xf4\x00\
-\x9a\x01\xe8\x01\x34\x03\xd0\x03\x68\x06\xa0\x07\xd0\x0c\x40\x0f\
-\xa0\x19\x80\x1e\x40\x33\x00\x3d\x80\x66\x00\x7a\x00\xcd\x00\xf4\
-\x00\xda\x1e\x01\xee\x5f\xbe\x7b\xdd\x37\x19\x1f\xa0\x66\x49\xc9\
-\x96\x92\x2d\x35\x4b\xf7\x7b\x49\x6a\xf0\x00\xc5\x3d\x1c\x34\xe1\
-\xa3\xf7\x6f\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x04\x2c\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x03\xde\x49\x44\x41\x54\x78\x9c\xed\
-\x98\xcf\x6b\x5c\x55\x14\xc7\x3f\xe7\xbe\x34\x34\x91\x8a\x60\x71\
-\x93\xb6\x2e\xb2\xd0\x90\x22\xc6\x42\x17\xad\x59\xc4\xa6\x69\x0a\
-\x5a\x35\x31\x0b\x17\x22\x4d\x13\xf0\x1f\x10\x7f\x40\x91\xa0\x82\
-\xba\x50\x0a\x2e\x34\x9d\x69\x04\x89\x05\x33\x9d\x74\x84\x9a\x32\
-\x33\x29\x23\xe2\xaa\x36\xe9\xaa\x31\x5d\x04\x6d\x2b\x88\xa6\x0b\
-\x9b\xd2\x40\x66\xe6\x1d\x17\x49\x63\xdf\x9b\x37\xc9\x64\x66\xde\
-\x34\xda\xfb\x59\xbe\xf3\xee\x79\xdf\x73\xef\xb9\xe7\xbe\x7b\xc0\
-\x62\xb1\x58\x2c\x16\x8b\xc5\x62\xb1\x58\x2c\x16\x8b\xc5\xf2\x60\
-\x21\xfe\x07\x9d\x3d\xfd\xef\x89\x31\xc7\x51\x1c\xc0\x05\xb4\xf6\
-\xb2\xaa\x8a\x00\x06\x21\xaf\xae\xfb\x7e\x3a\x7e\x6a\xe8\x5e\x63\
-\x5d\xc1\xdb\xb2\x1a\x3c\x80\xa9\x85\xc2\x9a\xa0\x38\x22\xe6\x38\
-\xe0\x99\x80\xff\x4f\x80\x65\x52\x30\x01\xaa\xee\x07\xa0\xff\xf5\
-\xb4\x0f\x40\x75\x39\x36\x2f\x05\x35\x00\xe0\x50\x4f\x7f\x47\x5e\
-\x4c\x42\x60\x9b\xc7\x05\xa8\x2c\xd7\x85\xcd\x8b\xaa\x41\xc4\x13\
-\x97\xc2\x02\xc2\x91\x74\x2c\x92\xf1\xbf\x1e\x38\x01\x00\x5d\x7d\
-\x03\x7b\x34\xcf\x79\x84\xed\xfe\x2f\x80\x71\x37\x5f\x6d\x14\x40\
-\x0d\xfe\x98\x94\x79\x71\xe8\x4e\x8e\x45\x2e\x15\x1b\x55\x94\xee\
-\xbe\xfe\x27\xf2\xae\x49\x01\x3b\xbd\x4e\x55\x11\xd9\x6c\x99\x50\
-\x18\x3c\x5c\x73\x8c\xdb\x75\x7e\xec\xd4\x6c\xb1\x41\x6b\x4e\x00\
-\x40\xd7\x8b\x47\x77\x6a\x9d\x93\x04\x9e\xf4\x99\x94\xcd\xb3\x1d\
-\x82\x82\xff\x45\x72\xf9\xae\x64\x62\xe4\xfa\x7a\x03\xd7\x24\x99\
-\x18\xb9\x9e\xad\x37\xed\xc0\xcf\x3e\x93\x80\x3a\x41\x63\x6a\x87\
-\xb0\xa2\xc1\x1f\xfc\xc5\x6c\xbd\x69\x5f\x2f\x78\x28\xf1\x18\xcc\
-\x9c\x1e\x9e\x6f\xc8\xba\xcf\x21\x5c\x28\x22\xa0\xe6\x08\x08\xb8\
-\x4e\x40\x12\x4f\x36\x64\xdd\x03\x99\xd3\xc3\xf3\xa5\xf8\x29\x59\
-\xfc\xec\xec\xf4\xd2\xae\xbd\x4f\x7d\xeb\x64\x4d\x2b\xd0\xe2\x91\
-\x02\xa6\x84\xdd\x54\x45\x44\x8a\x7c\x33\x5e\x77\xa7\xa1\xf7\xdc\
-\xb9\x2f\xef\x94\xea\x69\x43\xab\xf7\xeb\xe5\xcb\xb9\x5d\x8f\xbd\
-\x70\xc6\x69\x5c\x68\x02\x9e\x09\x52\x15\x36\x72\xf7\xd7\xb6\x90\
-\xe8\x23\xe6\xef\xd7\x13\x89\x91\xec\x06\xfd\x95\xa7\xa3\xb3\x77\
-\xe0\x63\x81\x37\x03\x1c\xba\x1a\xd6\x19\x29\x08\x1a\x10\xbc\xc8\
-\x27\xa9\xd8\xc9\xb7\x29\xe3\xbb\x65\xef\xdf\xb9\x99\xa9\x54\x73\
-\x4b\xdb\x22\x22\x07\xfd\x72\xc2\xc8\x85\xa2\x2b\xaf\xfa\x56\xea\
-\x4c\x64\xa8\x70\x44\x69\x54\x54\xc0\xe6\x66\xa6\x7f\x6a\x6e\x6d\
-\xfb\x1d\xe4\x79\xbc\xd9\x54\xd5\x19\x10\x10\x2d\x0c\xde\x15\x65\
-\x30\x15\x8f\x7e\x5e\xa1\xef\xca\xe9\xec\x1d\xec\x15\xf4\x1b\xa0\
-\xde\x67\xaa\xf8\x5f\x41\x51\x13\x90\x52\x4b\x2a\xbc\x9a\x8e\x45\
-\xe2\x95\xf8\x86\x2a\xae\xd4\x81\x9e\xc1\x4e\x23\x7a\x16\x78\xc8\
-\x6b\x51\x85\xf2\xfe\x1a\x15\x8c\x14\x6a\xbc\x8d\xe8\x4b\xa9\x58\
-\x74\xb2\x3c\xa5\x5e\xaa\x9a\xaa\x87\xfa\x8e\xed\x75\x5d\xf9\x1e\
-\x78\xd4\x63\x50\x14\xd9\x60\x26\x28\x06\x29\xd0\x77\xd3\x55\x39\
-\x3c\x19\x3f\x79\xb1\x32\xa5\xff\x52\xf5\x6a\xd5\xf9\xf2\x40\x8b\
-\x18\x52\x40\x93\xcf\x54\xfa\x76\x08\xb8\xd1\x01\x37\xd4\xa5\x2b\
-\x3d\x1e\x99\xa9\x82\xcc\x55\xaa\xde\x10\x49\x8f\x47\x66\xf2\xaa\
-\xfb\x81\xab\x3e\x53\xf0\x11\xe6\x43\x09\x0c\xfe\xaa\x1a\xb3\xbf\
-\xda\xc1\x43\x48\x1d\xa1\x0b\xf1\xe8\x6f\xe2\xd6\xb5\x2b\x4c\x79\
-\x0c\xcb\x29\xbd\xd6\xc9\xe3\xf8\x0b\x9e\xc2\x54\x9d\xc9\x3f\x9b\
-\x1e\x1b\xbe\x16\x82\xd4\xf0\x5a\x62\xc9\xf1\x2f\xfe\xdc\xb2\x75\
-\xb1\x03\xe5\x07\xbf\x4d\x03\x27\x21\xf0\x4e\x91\xd9\xb2\x75\xb1\
-\x63\x62\x6c\xe4\xaf\x10\x24\x02\x21\xf7\x04\x27\x46\x47\x6f\x65\
-\x1f\xce\x75\x23\xfa\xdd\xbd\xcf\x57\x96\xd8\x11\x41\x64\x35\x2b\
-\xbc\x59\x2f\x90\xc8\x6e\xcb\x1d\x9e\x18\x1d\xbd\x15\xa6\xc6\xd0\
-\x6f\x72\xcb\xf7\x87\x23\x31\xa7\x71\xe1\x71\xe0\x69\x9f\x59\x08\
-\x2c\xc4\xfa\x55\xf6\xe6\x8e\xd7\x32\x67\x4f\x2c\x85\xad\xaf\x26\
-\x5d\xe1\x4c\x66\x28\xb7\x6f\x77\x53\xbf\x22\x9f\xad\xff\xb6\x7e\
-\xba\x6f\xf7\x8e\x63\x99\xcc\x50\x2e\x7c\x65\xb5\xbd\xc3\x02\xc8\
-\xc1\x57\x06\xde\x41\xf9\x30\xd0\xa8\xfa\x6e\x32\x1e\xfd\x88\x1a\
-\x36\x1c\x6b\xde\xcc\x98\xbb\x32\xf5\x63\x73\x6b\xdb\x1f\x2b\xf7\
-\x87\xbb\xa8\x28\x6f\x24\xe3\xd1\x13\xb5\xd6\x73\x5f\xba\x39\x73\
-\x57\xa6\x2f\x35\xb7\xee\x69\x64\xb9\xcf\x78\x5b\x94\xa3\xc9\x78\
-\xe4\xeb\xfb\xa1\xc5\x62\xb1\x58\x2c\x16\x8b\xc5\x62\xb1\x58\x2c\
-\x16\x8b\xc5\xf2\xa0\xf1\x0f\x64\x76\x37\x12\x6f\xd4\x61\x03\x00\
-\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x00\xc8\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x00\x7a\x49\x44\x41\x54\x58\x85\xed\
-\xd2\xb1\x0d\x83\x40\x10\x44\xd1\xbf\x4b\x0f\x96\x08\x08\xdc\x09\
-\x9d\x10\x90\xb8\x24\x02\xc7\xae\x81\x6e\x08\x1c\x20\xd1\x03\xb7\
-\x8e\x0e\x59\x42\x22\xe3\x2e\x99\x97\x8d\xb4\xd2\x4c\xb0\x20\x22\
-\x22\x52\x99\xfd\x87\x88\x30\xa0\xb9\xb9\x73\x37\xb3\x38\x0d\x58\
-\x96\x6f\x6f\xce\x07\x68\x6f\x1e\xb0\x85\x33\x3c\xbb\x6e\x06\xf0\
-\x63\x89\x33\x15\x28\x07\x78\x58\xe2\x9d\x83\x5f\x5d\x96\x70\x0c\
-\x88\xc4\x0b\x58\x0b\x74\x6e\x61\x31\xe6\x50\xfd\x09\x45\x44\x44\
-\xaa\xfb\x01\x02\x66\x1a\x07\xaf\xc1\xa8\xac\x00\x00\x00\x00\x49\
-\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x03\x63\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x03\x15\x49\x44\x41\x54\x78\x9c\xed\
-\x99\x5f\x48\x53\x61\x18\xc6\x9f\xef\x9c\xcd\xe9\xa0\x14\x2b\x92\
-\xbc\x52\x8c\xae\xba\xda\x99\x56\x26\x44\x04\xa1\x37\x15\x61\xd1\
-\x55\x46\xe2\x51\x6b\xb3\x24\xe8\x22\x68\x17\x75\x17\x99\x6d\x91\
-\x73\x81\x7a\x11\x12\x49\x10\x05\x26\x04\xd9\x45\x65\xe5\x66\x94\
-\x41\x08\xf6\xe7\xa2\x34\x44\x4b\x34\x1c\xfb\xfb\x76\x63\x31\xb7\
-\x63\x43\xf0\xfb\x8e\xd0\xf7\xbb\xdb\xfb\xc2\x9e\xe7\x7b\xce\xbb\
-\x9d\x77\x67\x80\x44\x22\x91\x48\x24\x12\x89\x44\x22\x91\x48\x24\
-\x92\xff\x0d\xc6\x5b\x40\xd3\xbd\xbd\x00\x8e\x01\x00\x63\x38\x31\
-\xec\x77\xf7\xf0\xd6\x5c\x09\x5c\x03\xd8\x53\xd7\x9d\xfb\xcb\x36\
-\x1f\x4e\xad\x11\xd1\xde\x50\xa0\x65\x90\xa7\xee\x4a\x50\x78\xbe\
-\xf9\x94\x7d\xc1\x92\x5e\x63\x8c\x3d\xd1\x9a\xda\x4a\x79\xea\xae\
-\x04\x11\x1f\x01\x32\xaa\xdb\x62\xe1\xf5\xcf\xbb\xce\xcf\xf3\xd6\
-\xcf\x06\xd7\x09\x00\x80\x92\x1f\x45\x19\x53\x00\x00\x11\x6b\xde\
-\x1c\x3c\x1e\xee\xfa\xd9\xe0\x6e\xa0\xaf\xef\x48\x42\xcd\x41\xbe\
-\x51\x4f\xfb\xbe\x21\xc1\x5b\x3f\x1b\x42\xae\xc0\x2b\x9f\x7b\x2e\
-\xa9\xaa\x5b\x8d\x7a\x9a\xee\x7d\x26\xc2\xc3\x72\x08\x1b\xc1\x91\
-\x9b\xa7\xc6\x19\x68\x9f\x41\xab\xd2\xa1\xfb\xae\x88\xf2\x91\x8e\
-\x2a\x52\x6c\x22\x34\xf0\x79\x8b\xb3\x7a\x06\x40\x4d\x6a\x9d\x01\
-\xbb\x8a\x9d\xd5\xe3\x13\xc1\x47\xa3\x22\xfd\x2c\x6a\x8b\xc7\xd9\
-\xe8\xeb\x21\xa2\xe3\x19\x0d\x86\x8a\xa0\xdf\xfd\x5a\xa4\x17\x53\
-\x02\x00\x00\x4d\xf7\x7d\x04\x28\x63\x1f\x48\x58\x59\xf1\x9b\x1b\
-\xae\x09\x51\x3e\x4c\x0b\x00\x58\x7e\x47\xb0\xda\xe3\xf6\xa1\x6b\
-\xad\x61\xa3\xde\x6a\x63\xea\x7d\x98\xc8\x96\x63\x54\x8f\x2d\x58\
-\x16\x00\x12\x72\x71\x4c\x0d\x20\x14\xd0\x63\x44\xd1\x4d\x46\x3d\
-\x4d\xf7\xfd\x14\xe1\xc1\xf4\x4d\x2c\x14\x38\x37\x0d\x46\xdb\x0d\
-\x5a\xf9\x9a\xee\xbd\xc3\x5b\xdf\xf4\x00\x00\x20\xe8\x6f\x79\x0f\
-\xd0\x41\x83\xd6\x51\xde\xda\x6b\x22\x00\x00\x20\x52\xc6\xcc\xd0\
-\x5d\x13\x01\x54\xd4\xb7\x6f\x66\x8c\xfa\x33\x1a\x0c\x2f\x78\x6b\
-\x9b\x1e\x80\xa3\xa1\xd3\x9e\x50\x95\x07\x00\x4a\x52\xeb\x8c\xd1\
-\xa5\xa0\xdf\x5d\xc9\x5b\xdf\xd4\x00\x6a\x6b\xef\xaa\x8c\x45\x7a\
-\x01\x94\xa7\xd6\x09\xb8\x35\xec\x77\x7b\x44\x78\x30\x35\x80\x4f\
-\x85\x93\x57\x01\x1c\x48\x2b\x0f\xac\x2b\x9a\x69\x06\x98\xe1\x92\
-\xb4\xda\x98\xb6\x09\x3a\x75\x5f\x0b\x81\xda\x53\x6b\x04\xbc\xcd\
-\x8d\x85\xab\x44\x3e\x29\x32\x25\x80\xf2\xc6\xeb\x87\x92\xc4\xee\
-\xa5\xe9\x7f\xb5\xb2\xf8\x8e\x21\x7f\xeb\x37\x91\x5e\x84\x07\xe0\
-\x68\x68\xaf\x60\x4c\x19\x04\x90\x97\x52\x9e\x4f\x2a\xc9\xdd\x23\
-\x1d\x67\xde\x89\xf6\x63\xf8\xbc\x8e\x17\x5a\x53\x5b\x29\x48\x79\
-\x08\x5a\x72\xf8\x38\xa0\x1c\x1e\xe9\x70\x0b\x3f\x3c\x20\xf0\x4b\
-\x70\xe7\xc9\xb6\x42\x24\x2d\xfd\x20\x2c\xdd\xfd\x19\xf4\x60\xe7\
-\xe9\xc7\xa2\x7c\xa4\x23\x64\x02\xca\x5c\x5e\x5b\x3c\x8a\xfb\x00\
-\xb6\xa5\xd6\x19\x70\x79\xd8\xef\xee\x12\xe1\x61\x39\xf8\x4f\x80\
-\xc7\xa3\x14\x44\xd1\x4d\x40\xd5\xd2\x06\xdd\x1e\xee\x74\x5d\xe4\
-\xae\x9f\x05\xee\x01\x38\x26\x37\x5e\xc0\xe2\x7f\x83\x29\x3c\x9d\
-\xcd\x61\xf5\xa2\xee\xf5\xff\x82\xeb\x5d\xa0\xcc\xe5\xb5\x15\x44\
-\x31\x0b\x20\xf7\x6f\x91\xd8\x87\x88\xaa\x56\x8e\x76\x34\x0b\xf9\
-\xbd\x9f\x0d\xae\x13\x90\x1f\xb1\x25\x01\xc4\xfe\xbc\x66\xc0\x94\
-\x45\x89\xd7\xac\x95\xc3\x03\x9c\x03\x08\x05\xf4\x18\x03\xea\x00\
-\x4c\x03\x18\x43\x32\xb1\xff\xa5\xff\xec\x17\x9e\x9a\x12\x89\x44\
-\x22\x91\x48\x24\x12\x89\x44\x22\x91\x48\x24\xd9\xf8\x0d\x59\x9b\
-\xda\x0c\x1f\xf1\x22\x4f\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\
-\x60\x82\
-\x00\x00\x01\x89\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x01\x3b\x49\x44\x41\x54\x58\x85\xed\
-\x97\x31\x4e\x02\x41\x14\x86\xbf\xb7\x81\xa5\x74\x69\x56\x0a\x43\
-\x34\xd9\x66\x2f\xe0\x09\x4c\xe4\x0e\x9c\x02\x6b\xb5\x90\x1e\x4e\
-\xc1\x19\x8c\x89\x27\xe0\x02\xdb\x6c\xc0\x80\xc5\x86\x06\x2c\x59\
-\xc8\x3e\x0b\x67\x0d\x2c\x62\xa1\xbb\xb1\x70\xfe\x6a\x32\x33\xc9\
-\xf7\x65\xa6\x79\x3f\xfc\xf7\x48\x71\x63\x3a\x9b\x5d\x3b\x2a\x37\
-\x0a\x97\x80\x57\x12\x67\x25\x30\xce\x44\x07\x17\xed\xf6\xd3\x51\
-\x81\x97\xd9\x6b\x1f\xd5\x5b\x60\x0d\x44\x28\x6f\xa5\xe0\x85\x13\
-\x20\x04\x1a\x88\xf4\xcf\xdb\x67\xf7\x07\x02\xd3\xf9\xbc\x23\x19\
-\x8f\xa0\xcf\xdb\x8d\xdb\x0d\x82\xd6\xa2\x14\xb8\x49\x1c\x27\x7e\
-\xad\x9e\x8e\x40\xae\x54\xb4\x93\xbf\x84\x93\x5f\x70\x32\x7a\xc0\
-\xba\x0a\x38\x40\x10\xb4\x16\xdb\x8d\xdb\x05\x52\x47\xa5\xf7\xc9\
-\xcd\x17\xe6\xcf\xa3\x2a\xe0\xbb\x12\x08\x91\x61\xed\x0b\x00\x5e\
-\x69\x7f\xfe\x5d\x32\x56\x40\xf3\x2b\x81\x3f\x89\x15\xb0\x02\x56\
-\xc0\x0a\x58\x01\x2b\x60\x05\xac\xc0\xae\xc0\xca\x4c\xaf\x55\x13\
-\x3d\x60\x79\x20\x20\x30\x06\xc2\x38\x4e\xfc\xaa\xd8\x71\x9c\xf8\
-\x28\xa1\x61\xed\x0b\x64\xa2\x03\xa0\x51\xab\xa7\xa3\x2a\x24\x26\
-\x93\xc9\xe9\xc7\x58\x8e\x9b\x89\x0e\xf3\xfd\x62\x31\x79\x40\xf5\
-\x0e\x48\x11\x22\x33\x40\xfe\x3e\x0e\x1e\x4a\x08\xb8\x47\x8b\x49\
-\x1e\x53\xcd\x7a\x66\x74\x6e\x16\xcf\x7f\x98\xa5\xa9\x66\xc3\x62\
-\x35\xb3\x79\x07\x25\xbf\x6e\x2c\x3a\x0b\x42\xe7\x00\x00\x00\x00\
-\x49\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x00\xd3\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x00\x85\x49\x44\x41\x54\x78\x9c\xed\
-\xd7\xb1\x0d\xc2\x40\x10\x04\xc0\x7d\xe8\x01\x51\x0a\x75\x20\x3a\
-\x20\x72\x45\xee\x82\x90\x1e\xe8\xc4\xa2\x07\x78\x52\xf4\x26\xb5\
-\x1e\xd9\x33\xe1\xea\x82\xbd\xcb\x2e\x01\x00\x00\x00\x00\x60\x3b\
-\x4a\x1b\x9c\x6e\xf5\x5c\x53\xc7\x24\x87\x0e\x7d\x96\x34\xe5\x5d\
-\xae\x8f\x4b\xb9\x7f\x87\xbb\x76\x6a\xa5\xcb\x27\xc9\xb1\xec\xeb\
-\xd8\x86\xb3\x03\x6c\xcd\xec\x00\x25\x65\x48\xf2\xec\xd0\x65\x69\
-\x53\x7d\x95\xa1\x77\x09\x00\xe0\x7f\xf8\x05\xda\xa9\x95\x2e\x9f\
-\xf8\x05\x7e\xf3\x0b\x00\x00\x00\x00\x00\x00\xb0\x11\x1f\x5d\xbc\
-\x24\x0f\x6c\x9f\x83\x41\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\
-\x60\x82\
-\x00\x00\x01\x8c\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x01\x3e\x49\x44\x41\x54\x58\x85\xed\
-\xd2\xbf\x2b\x85\x51\x00\xc6\xf1\xef\xf3\xca\x62\x90\x52\xac\xfc\
-\x05\x14\xbd\xf7\x96\xcd\x24\x3f\x8a\x9b\x98\x58\x29\x7f\x80\xcd\
-\x24\x93\xc9\x2c\x52\x06\x03\x2f\x29\x25\x8b\x22\xf1\x8a\xa2\xcc\
-\x16\x65\xb1\xd0\x1d\xa4\xee\xbd\x8f\x81\x01\xc5\xeb\xde\x4d\xce\
-\x67\x3c\x3d\x3d\x3d\xa7\x73\x20\x08\x82\x20\xf8\xef\x94\x15\xc8\
-\x6f\x95\x97\x2d\x75\x95\xd1\xc4\x45\x41\x37\xbf\x29\xcd\x6f\xbb\
-\xcd\xf6\x3a\xe2\x29\x1d\xd6\x20\x92\xbf\xcb\x46\x59\x65\x46\x4d\
-\x40\x67\x1d\x3e\x89\x13\xf7\x66\xe5\x73\xdb\xee\xb2\x7d\x06\xf4\
-\x50\xa1\x39\x2b\x9f\x39\x20\x2a\x6b\x02\xd8\x04\x1a\x85\xf7\xe3\
-\xc4\x93\xdf\x65\xe3\x2d\x0f\x60\x1f\x01\xad\xc0\xe1\x4b\xa4\xbe\
-\x9f\x6e\xff\xab\x01\xa7\x63\x7a\x4e\xaf\x35\x0e\x5e\x04\xea\x85\
-\xd7\x72\x89\xe7\xb0\x3f\x3d\x5f\x9c\x78\x5a\xf2\x2e\xd0\x00\x5e\
-\x2f\x96\xd4\x77\x35\xa2\xc7\xac\xfe\xcc\x3f\xf0\x51\x2e\xf1\x0c\
-\x78\xe9\x6d\xb8\x57\x4b\x0f\xd1\xd4\xe5\x3d\xe5\xb8\xa3\xb2\x20\
-\x34\x0b\x80\x3d\x9f\x16\xa2\xb9\xac\x9b\xd7\x34\x00\x20\xbf\xe3\
-\x21\x57\xbc\x01\x34\x00\xc7\x88\x22\xa6\x1f\x28\x81\xa6\xd2\x82\
-\x56\xaa\xe9\xab\x7a\x00\x40\xbc\xe9\x6e\x45\xde\x03\x5a\xde\x8f\
-\x8a\x48\xa3\xe9\x88\x0e\xaa\xed\xaa\x69\x00\x40\xbc\xeb\x76\x95\
-\x7c\x0b\xdc\x19\x0d\x9d\x17\x74\x5d\x6b\x57\xed\x6c\x7d\xfd\x8c\
-\x41\x10\x04\xc1\x9f\xf3\x0a\x0d\x2b\x72\x05\x90\xf4\xef\x82\x00\
-\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x02\x21\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x01\xd3\x49\x44\x41\x54\x58\x85\xed\
-\x97\xb1\x6b\x53\x51\x14\xc6\x7f\x5f\x5e\xe9\x22\x15\xb4\xc4\xfe\
-\x01\x1d\x4a\x47\x5d\x2c\x28\x2e\x79\xea\x10\x09\x54\x5e\xd7\x22\
-\xe4\xe9\x20\x98\xa9\x54\xff\x04\x33\x38\x18\xc1\xc5\x64\xd0\x0e\
-\x45\x94\x08\x85\x0c\x1a\xe2\x20\xa8\x75\xd1\x4d\xb7\xee\x6d\x51\
-\x90\xe0\x52\xc8\x3d\x0e\xbe\x17\x9f\x52\x5e\x89\x7d\x69\x45\xf3\
-\x4d\xf7\x9d\x7b\x38\xdf\xef\xde\x73\x79\xdc\x0b\xff\xbb\xf4\x7b\
-\xe0\xfc\xe5\xf2\x19\xa4\x9b\xc0\x1c\x90\xcf\xc8\x67\x1b\x58\xc7\
-\xac\xda\x6e\x36\x5e\x27\x27\xbc\xe4\x87\x1f\x94\x97\x84\x56\x81\
-\x19\xe0\x48\x46\xe6\x44\xb5\x66\x90\xae\x4c\xcf\x9e\xfa\xb6\xf1\
-\xe9\xfd\xdb\x78\xa2\xbf\x03\xfe\xc2\xb5\xb3\x72\xee\x15\xf0\x15\
-\xb3\x4a\xce\xa3\xf5\xfc\x49\xe3\x4b\x16\xee\x17\x17\xca\xc7\x5d\
-\x8f\x22\x52\x0d\x38\x8a\xd9\xb9\x78\x27\xc6\xfa\x24\xce\x2d\x03\
-\xc2\xac\xd2\x6e\x36\x56\xb2\x30\x8e\x15\x2d\x64\xc5\x0f\x42\xc9\
-\x78\x18\xb5\xb8\x04\x90\x4b\xe4\xcd\x01\xe4\x3c\x5a\x59\x9a\x27\
-\x65\xbd\x9d\xb8\xf6\xe9\x38\x96\x04\xc8\x27\x68\x87\xa2\xce\xb3\
-\x47\x9f\xa3\xe1\x89\xdd\x00\x0e\x45\x23\x80\x11\xc0\xa1\x03\x8c\
-\xed\x95\x70\x21\xb8\x7a\xdd\x99\xdd\x16\x4c\x0c\x52\xd8\xa0\x9b\
-\x93\x6e\xbd\x78\xfa\xe0\x7e\x5a\x5e\xea\x0e\x14\x4a\xe1\x94\x99\
-\xdd\x1b\xd4\x1c\x40\x30\x61\x66\xb5\x42\x29\x9c\xfa\x63\x80\x83\
-\x50\x2a\x40\x67\xad\xbe\x29\xe9\x86\x41\x77\xd0\xc2\x06\x5d\x49\
-\x95\xce\x5a\x7d\x33\x2d\x6f\xcf\x33\x10\xf5\x30\xb5\x8f\xfb\xd1\
-\xdf\xdd\x82\x11\xc0\x08\xe0\xa0\x01\xb6\xe1\xc7\x05\x72\x58\x66\
-\x85\xf9\xc5\xc9\x68\xb8\xb5\x1b\xc0\x3a\x80\xeb\x51\x1c\x16\x80\
-\xbc\xf1\xb8\xf6\xbb\x38\xf6\xf3\x47\x64\x56\x45\xba\x84\x54\xf3\
-\x83\x50\xd6\xdb\x69\x25\xee\x70\xfb\x52\x61\x7e\x71\x52\xde\x78\
-\x51\xc6\x5d\xc0\x61\x56\xed\x43\x25\x13\xfd\xa0\xbc\x24\x53\x95\
-\xe1\x9d\x0d\x87\xb1\xdc\x6e\xd6\xef\xc4\x81\x5f\x5e\x46\x1b\x1f\
-\x3f\xbc\x99\x9e\x3d\xd9\x41\xca\x03\xc7\xc8\xee\x75\xb4\x05\xbc\
-\xc4\x2c\x6c\x37\x1b\x8f\x33\xaa\xf9\x8f\xe8\x3b\xaa\x2b\x8c\x73\
-\x1f\xb4\x18\x18\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
-\
-\x00\x00\x01\xaa\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x01\x5c\x49\x44\x41\x54\x58\x85\xed\
-\x94\x3f\x4b\x42\x51\x18\x87\x9f\x57\xad\x4d\xac\x21\x8a\x5a\x0c\
-\xb7\x6c\x72\x74\x70\x09\x6d\x68\x08\xba\xda\x16\x05\x1a\x41\xdf\
-\xa0\x49\xce\xd0\xd2\x27\xa8\x54\x70\x0a\x32\x8d\x86\x5a\x14\xa4\
-\xbe\x80\xd0\xe4\x94\xd4\x14\xd1\x90\x53\x43\xea\x3d\x4d\x5a\x8d\
-\xf7\x5c\xb8\x4b\xf7\xd9\x5e\x38\xe7\xf7\x3e\xbc\xe7\x0f\xf8\xf8\
-\xf8\xfc\x77\xc4\xe9\xfa\xb4\x55\xb0\x01\x06\xa3\xe1\xec\xfd\x4d\
-\xb5\xef\x56\x20\xe0\x64\x71\xb1\x58\x9c\x08\x4f\x05\x43\x1f\xb9\
-\x5c\x2e\xe8\xa9\x80\x52\xca\x46\xf4\xf6\xb8\xee\xdb\x91\xa1\xa7\
-\x02\x00\xad\x7a\xe5\x4a\xe0\x78\x5c\x67\xac\xc2\xa3\x1b\x01\xa3\
-\x11\x3e\x75\x3b\xed\x58\x3c\x91\x02\x96\x81\xf9\xd8\x4a\x62\xa1\
-\xd7\xed\xdc\x99\x64\x39\xbd\x84\x7f\x48\x5b\x05\x3d\x09\xd2\x1c\
-\x34\xaf\xcb\xe7\x4e\x33\x1c\x1f\xc1\x6f\x92\xab\x4b\x93\x09\x6a\
-\xe1\x2c\xb3\x95\x4f\x79\x2a\xa0\x94\xb2\x07\x81\xe9\xf0\x8f\x84\
-\x3c\x78\x2a\x00\x30\xc7\xfb\x17\xe8\x67\xd3\xfd\x6e\x05\xa4\x6f\
-\xcf\x94\x41\xa2\x08\x6f\x23\xad\xa3\x9e\x0a\x64\xb2\x85\x22\xe8\
-\x1d\xe0\x53\x84\x8d\xf6\x75\xe5\xc5\x69\x86\xf1\x2b\xc8\x58\xf9\
-\x5d\x8d\x54\x01\x5b\x44\x36\x9b\xf5\xd2\xad\x49\x8e\xd1\x3f\x90\
-\xce\xe6\xd7\x40\x6a\x40\x00\xe4\xb0\xd5\x28\x5d\x98\xe4\x80\xc1\
-\x11\xac\x5b\xfb\x71\xb4\x34\x80\x10\x22\x27\xad\x46\xe9\xd4\xb4\
-\xb9\x89\x80\xd8\x50\x03\x22\x1a\x2e\x93\xf1\xc5\x23\x37\xcd\x01\
-\x42\xce\xb7\xe8\x57\x0d\xbd\x61\x78\xb8\xa7\x94\xb2\xdd\x0a\xf8\
-\xf8\xf8\xf8\x7c\x03\xa5\xd7\x5e\xc1\x97\x2b\x14\xb6\x00\x00\x00\
-\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x01\x31\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x00\xe3\x49\x44\x41\x54\x78\x9c\xed\
-\xd0\xb1\x11\x82\x40\x18\x05\xe1\xf7\x5b\x04\xb5\x58\x07\x2d\x18\
-\x59\x91\x5d\x50\x87\x75\x10\x59\x05\x18\xa0\x99\x46\x77\xb0\xce\
-\xb8\x5f\x74\xc1\x0d\xbc\xdb\x44\xd2\x3f\xab\xbd\x7f\x70\x9e\xd6\
-\x71\xcd\x7a\xdb\x7e\x56\xd7\xfb\x58\x53\xcf\xfb\xad\x4e\x7b\x7e\
-\x3c\x49\x5e\x8f\x19\x92\x0c\xef\x87\xf5\xbc\xdf\x6a\xf7\x00\xd9\
-\x1e\xf3\xe9\xdc\xeb\x7e\x93\x23\x02\xfc\x34\x03\xd0\x03\x68\x06\
-\xa0\x07\xd0\x0c\x40\x0f\xa0\x19\x80\x1e\x40\x33\x00\x3d\x80\x66\
-\x00\x7a\x00\xcd\x00\xf4\x00\x9a\x01\xe8\x01\x34\x03\xd0\x03\x68\
-\x06\xa0\x07\xd0\x0c\x40\x0f\xa0\x19\x80\x1e\x40\x33\x00\x3d\x80\
-\x66\x00\x7a\x00\xcd\x00\xf4\x00\x9a\x01\xe8\x01\x34\x03\xd0\x03\
-\x68\x06\xa0\x07\xd0\x0c\x40\x0f\xa0\x19\x80\x1e\x40\x33\x00\x3d\
-\x80\x66\x00\x7a\x00\xcd\x00\xf4\x00\x9a\x01\xe8\x01\x34\x03\xd0\
-\x03\x68\x47\x04\x78\x7c\x39\xf7\xba\xdf\x64\xff\x00\x4b\x5d\xaa\
-\x32\x57\x65\xce\x52\x97\xee\xf7\x25\xa9\xc1\x13\x85\x02\x26\x2c\
-\x67\x7d\xc5\x41\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
-\
-\x00\x00\x02\xda\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x02\x8c\x49\x44\x41\x54\x78\x9c\xed\
-\x9a\x3b\x6f\x13\x41\x14\x46\xcf\xb5\x13\x42\x13\xba\xfc\x92\x48\
-\xb6\x25\x1a\x5a\xba\x3c\x44\xe4\x90\x80\x44\x05\x05\x2d\x1d\x2d\
-\xff\x00\x24\x5c\x21\x1e\x79\x08\x84\x57\x34\xd4\x74\x80\x5b\x7e\
-\x07\x12\x12\x0d\x42\x72\x3e\x0a\x84\x64\x36\xeb\x38\xde\x9d\x99\
-\x9d\x59\xfb\x96\xb3\x77\x3f\xcd\x39\xda\x5d\x5b\x57\x03\xcb\x5a\
-\xd6\xb2\x16\xb9\xac\xee\x0d\xf8\xae\x4e\xa6\x2d\x93\x9e\x48\xfc\
-\x68\xb7\xed\xc1\xe7\x2d\xfb\x36\x79\x7d\xa5\xae\x8d\x85\xa8\xee\
-\x50\x7d\xa4\x23\xa0\x65\x06\xe3\xb1\x9e\x03\xd7\x27\x7b\x5a\xf5\
-\x6c\xcd\x7f\x75\x87\xea\xc3\x5f\xf8\x7f\x6b\x2d\xe3\x5a\xbe\xaf\
-\x91\x02\x8a\xe0\x81\xb1\xb0\xc7\xf9\xde\xc6\xbd\x02\x17\xc0\xef\
-\x8f\x76\xec\x43\xbe\xbf\x51\x1f\xc1\x19\xf0\xef\x8a\xee\x69\x8c\
-\x80\x32\xf0\xd0\x10\x01\x65\xe1\xa1\x01\x02\xaa\xc0\x43\xe2\x02\
-\xaa\xc2\x43\xc2\x02\x5c\xc0\x43\xa2\x02\x5c\xc1\x43\x82\x02\x5c\
-\xc2\x43\x62\x02\x5c\xc3\x43\x42\x02\x7c\xc0\x43\x22\x02\x7c\xc1\
-\x43\x02\x02\x7c\xc2\x43\xe4\x02\x7c\xc3\x43\xc4\x02\x42\xc0\x43\
-\xa4\x02\x42\xc1\x43\x84\x02\x5c\xc3\x77\x86\xba\x05\x7a\x06\x80\
-\xec\xfe\x68\xd7\xb2\xc9\xeb\x51\x4d\x84\x5c\xc3\x77\x87\xea\x1b\
-\x3a\x35\xd8\x30\xd8\xc0\x34\xc8\xf7\x44\x23\xc0\x07\x7c\x41\xde\
-\xb9\x8a\x42\x40\x20\xf8\xb3\x96\xd9\xc3\x7c\x6f\xed\x02\x42\xc1\
-\x1b\x76\xf7\xcb\xb6\xbd\xcd\xf7\xd7\xfa\x11\x0c\x0a\xbf\x63\x47\
-\x45\xf7\xd4\x26\x20\x06\x78\xa8\x49\x40\x2c\xf0\x50\x83\x80\x98\
-\xe0\x21\xb0\x80\xd8\xe0\x21\xa0\x80\x18\xe1\x21\x90\x80\x50\xf0\
-\x92\xdd\x19\xed\xda\xf1\x3c\x59\xde\x05\xc4\x0c\x0f\x9e\x05\xc4\
-\x0e\x0f\x1e\x05\xa4\x00\x0f\x9e\x04\xa4\x02\x0f\x1e\x04\xa4\x04\
-\x0f\x8e\x05\xa4\x06\x0f\x0e\x05\xa4\x08\x0f\x8e\x04\xa4\x0a\x0f\
-\x0e\x04\x04\x83\x37\x3b\x1c\x6d\xdb\xc9\xbc\x79\xbd\x4c\x7b\x67\
-\xd2\x53\xc0\xfd\x4c\x30\x76\xf8\x6e\xa6\x43\x49\x27\x5e\x66\x82\
-\x29\xc0\x23\xbd\x64\x06\x63\x29\x01\xb1\xc3\xf7\x86\x3a\x28\x80\
-\x77\x33\x13\x4c\x01\x5e\xe8\x55\x3e\xcf\xc9\x4c\x30\x69\xf8\xaa\
-\x33\xc1\xd8\xe1\x3b\xef\x75\xdb\x4c\xaf\xcf\xe5\xcd\xf8\xe9\xbc\
-\x94\x80\xa6\xc2\xc3\x25\xce\x0a\x87\x82\x07\x3b\x18\x6d\xdb\xe9\
-\xbc\x79\x55\xe0\x61\xc6\x13\x10\x12\xfe\xeb\x4e\x78\x78\xb8\x40\
-\x40\xf4\xf0\x99\xf6\x4d\x7a\x93\xcf\x9b\xf7\x35\x2a\x14\xb0\x28\
-\xf0\x00\xed\xfc\x42\x2f\xd3\x1e\xe8\x18\x47\xf0\x53\xf2\x4a\xc3\
-\xf7\x32\xed\xa1\xf3\x79\x65\x3f\xa0\xff\x3d\x01\x9b\x03\xad\xae\
-\x6c\xe8\x3b\xb0\x3e\xb1\x5c\x1a\x7e\x4a\x5e\x69\x78\xd7\x79\x90\
-\xfb\x27\xb8\x7e\x85\x36\xb0\x36\xb1\x54\xe9\x58\x4a\x41\x5e\xa5\
-\xcd\xba\xce\x83\x9c\x80\x4f\xf7\xec\x97\x61\x8f\x80\xdf\xc0\x4f\
-\x64\xfd\x2a\x67\x72\xf2\x79\x66\xb6\x5f\x65\xb3\xae\xf3\xa6\xd6\
-\xcd\x8f\x5a\xdb\x1c\x68\x35\xd6\xbc\x1b\x2f\x74\xd5\x65\xde\xb2\
-\x96\xb5\xc0\xf5\x07\xd6\x41\x4c\x2b\x6c\xde\x0f\x7f\x00\x00\x00\
-\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x04\xe8\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x04\x9a\x49\x44\x41\x54\x58\x85\xc5\
-\x97\xd9\x76\xe2\x46\x10\x86\xbf\x66\x11\x12\x60\x50\x9c\xc4\x9e\
-\xf1\x24\x39\x59\xde\xff\x9d\x72\x31\x9e\x49\x1c\xcf\x18\x6c\x23\
-\x19\x24\xa8\x5c\xd4\xdf\xa8\x91\x71\x72\x97\xd4\x39\x1c\x89\x56\
-\xd7\xf6\xd7\xd6\x0d\x58\x09\x16\xf8\xcf\xc9\x02\x58\x19\xa4\x7c\
-\x09\xac\x21\x58\xf7\x91\x4b\x20\x1a\x96\x25\xef\x93\x44\x4a\x5c\
-\xb3\x64\x6d\x9b\xac\xed\xf4\x7e\x00\x1e\x7a\xf2\x97\xc0\x3a\xf4\
-\x16\x0e\xc0\x05\x30\x00\xaa\x44\x59\x90\x11\x13\xd8\x0d\x21\x8c\
-\x81\x71\xcf\xa5\x16\xac\x81\xac\x95\x11\x51\xb9\x01\x0d\x90\x4b\
-\xfe\x23\x30\x3c\x75\xd8\xf7\x2d\xc0\x7e\x11\x34\x63\xb0\x99\xd6\
-\x33\xb0\xf7\xf0\x50\x82\xe5\x60\x13\xb0\x82\x57\x64\x85\xbe\x4d\
-\xb5\xf7\xca\x79\xc1\xd7\x2c\x93\xec\x5f\xc1\x2e\xfa\x10\x02\xf6\
-\x01\xf8\x24\x24\x0c\x78\x01\x0a\xd8\xbd\x87\xec\xa3\xbc\x00\x58\
-\xc8\x8b\x73\x94\x7e\x9b\xc0\xee\x06\xb2\x5b\x21\x92\x4b\xdf\x1a\
-\xb8\x81\x70\x0b\x30\x92\xf2\x80\xc3\x3e\x96\xf2\x1b\xe0\xde\x19\
-\xb2\xfb\x44\xf9\x04\x0f\x91\x71\x1a\xf7\xe8\xcc\x4c\xca\xf4\xcb\
-\xbe\xc2\xa6\x80\xd9\x18\x78\x07\x7c\x94\x8e\x41\x0f\x01\xfb\x4e\
-\xff\x2b\x08\x15\xd8\xb5\xbe\xfd\x09\xcc\x1d\x8d\xd5\x0c\x4a\x5c\
-\x70\xa8\xcf\x03\x60\x73\xa0\xc5\xf3\xa5\xd2\xf3\x80\x27\xf4\x0e\
-\x78\xc2\xe3\xff\x0d\xb0\x82\xb0\x19\x25\xdc\x63\x29\xcf\xe5\xdd\
-\x1a\xb8\x92\xc5\x39\x94\x4f\x82\x71\x02\x66\x1d\x0f\x24\x08\xe5\
-\xc0\xb3\x94\x95\x42\x38\x03\xee\xf0\xf0\x64\x10\x9e\x12\x07\x3b\
-\x28\xdc\x52\x9b\xc0\xcb\xb5\x18\x83\xa0\x5c\x48\x68\xa4\x39\x1e\
-\x86\xb9\xf8\x07\xfa\x1f\xd7\x22\x6d\xc4\xbb\x93\xac\x00\xdb\xf7\
-\x4a\xcc\x63\xee\xc5\x10\xbc\x73\x41\x15\x30\xfd\x8c\xc7\xb2\x96\
-\xf5\x23\xc1\x56\x43\x75\x09\xd3\xb5\x23\x75\x8e\x6c\x21\x99\x35\
-\x30\x95\x03\x53\xba\xd2\x1b\x49\xf6\x1c\x0f\xc1\x97\x14\x81\x09\
-\xb4\x2f\x49\x6d\x16\x8a\xb5\xe1\x96\x5d\xc3\x74\xe5\x48\xbd\x49\
-\xb1\xce\xbf\x17\x8f\x09\x89\x58\xb6\x2d\x3c\x36\x78\xe8\xfa\x21\
-\x68\x4a\x58\x3c\x74\xc6\x30\x54\x3e\xe4\x78\xd2\xfc\x25\xc1\x85\
-\xfa\x41\xee\x49\x67\xb3\xee\x3f\x05\x9e\x37\x5f\x61\x73\x29\xde\
-\x3c\x91\x09\x2c\x9e\x49\x42\x15\x0d\xc8\xbc\x8b\x91\x0b\xc6\x52\
-\x1e\xb4\x62\x5c\xe1\x89\xf6\x20\x48\x73\x3d\x83\xa0\x9d\xba\x0c\
-\xa6\xae\x9c\x06\x66\x0f\xda\xd7\xe2\x3d\xe5\x12\xef\x31\x43\x68\
-\x4c\xfb\x63\x1f\x20\x40\x50\xd7\x0a\x8f\xde\xb9\x82\x32\xdb\x0c\
-\x82\xfa\xbb\x35\x12\x36\x06\xee\x7b\xbd\xfd\xca\x8d\x8e\x7c\xb4\
-\x60\x7b\x7f\x86\x1d\xd8\x33\x5e\x86\x03\xba\x24\x3f\xa9\x82\x61\
-\x52\xdf\x49\x93\xa9\xd3\x3d\xda\xc7\xbd\x7b\x63\xe9\x30\xbb\x4b\
-\x1c\x8a\x94\x4e\x59\xc9\x0c\x55\xe7\x6c\xc7\x30\x82\xf1\x21\xf1\
-\x86\xe4\xbd\x4d\x84\x8c\x80\xc6\x3d\xb7\x35\xea\x4c\x78\x46\x5b\
-\xd2\x1f\x52\x4a\x1d\x78\x35\x3d\x07\xc9\x73\x7f\x86\xb9\x4f\x87\
-\x9e\xc0\x3e\x9d\x6b\xcf\x96\xbc\xbf\xda\x17\x85\xed\xa0\x51\x57\
-\x0b\xd6\x6d\x0e\x06\xf5\xb0\x67\xc0\x30\x81\x7d\xa5\xdf\x32\x99\
-\x27\x7d\x83\x4f\x46\x6e\xdf\x98\x94\xa1\x55\x29\xf5\xac\x2d\xfa\
-\x75\xdf\xe2\x09\xa7\x79\x1e\x62\xdb\xbe\xa6\x3b\x03\x44\x0a\xaf\
-\xdf\xad\x00\x3b\xee\x8b\x39\x60\xca\x70\x53\x19\xce\x34\x58\xc0\
-\x4b\xb3\x94\xe2\x02\x6f\xb9\x6a\x36\x96\x42\xdc\x00\xdf\x4a\xb8\
-\x49\xb6\x0e\x21\x16\x3b\x20\x32\x76\x1f\xf9\xa2\x01\x3b\x08\x43\
-\x95\xdb\xd6\x0f\x24\x34\xfe\xdf\xc0\x33\x7f\x23\x21\x9f\xff\x61\
-\x1a\xee\x38\x9e\x76\xd6\x25\x2c\xef\x3a\x07\x79\xc0\x4b\x38\xee\
-\xd9\xc1\x49\x08\xc6\x75\xe2\xf5\x16\x35\x0a\x51\x05\x2f\x3f\xc9\
-\xf3\x73\x99\x7e\xb4\x40\x1e\x7e\x80\xe5\x53\xb7\xbc\x2a\xa4\x1c\
-\x37\x6c\xbc\x89\x5f\x06\x09\xe3\x06\xea\xb2\x63\xa2\xf6\x86\x14\
-\x0f\x1a\xf9\x2d\x3e\xdd\xfa\x67\xc1\x94\x22\xd4\x7f\xe0\xed\x36\
-\xf8\xb3\x4c\x86\x57\x36\x93\x31\x27\x21\xd8\xfb\xe6\xe2\x19\xec\
-\x86\x6e\xe0\x14\xf8\x49\xe6\x77\x3c\x9e\x7b\xa0\x74\xa4\xea\x41\
-\x97\xa0\xf5\x50\x02\xd5\x21\x8f\x7b\x7f\xc6\xbb\x9f\x8e\x77\x2c\
-\xa1\xb8\x95\xcc\x6d\x6a\x00\x6e\x40\x78\x06\x1b\xd0\xc5\x7c\x24\
-\x6f\x0e\x10\x36\x60\x2d\xf0\x0c\xe1\xe5\x3c\x00\x36\x77\x19\xa0\
-\x83\xeb\x67\x7c\x96\x6c\x24\x73\xe5\xf9\xd3\x45\x31\x0d\x41\xe3\
-\x93\x2d\x3c\x42\x7d\xe1\x9e\xb2\x96\xf5\x5b\xe5\xc7\x71\x8c\xbe\
-\x4d\x36\x56\xe8\x1a\x3c\xd1\xd6\xc0\x25\x54\x33\x47\xc3\x66\x5a\
-\x3f\x09\xc1\x57\xe0\x07\xdf\x6c\x4b\x60\x06\x2f\x41\x93\x74\x42\
-\x67\xb2\x0e\x97\x55\x05\x85\xd1\x75\xcf\xd8\xac\x0a\x3c\xdb\x77\
-\x38\xf3\xc2\x8d\xaf\xa7\x30\x9d\xe3\x13\x76\xe3\x8e\x87\x4d\x62\
-\x40\x30\xb0\x03\x5e\xeb\x01\xf8\x04\x45\x34\x86\x0e\x56\xf0\x30\
-\x4c\x75\xf4\x36\x21\x18\xe2\x1c\x59\x38\x82\xc7\xbd\x17\x6e\xcc\
-\xf4\x8b\x64\xc5\xd9\x72\xee\x50\x63\x17\xba\x34\xf4\x2f\x26\x0b\
-\xa8\x7e\xec\x2e\x23\xff\x76\x31\x01\xe7\xad\x3e\x74\x65\x7d\x72\
-\x31\xf9\xed\xcc\xc5\xe4\xd8\xdb\xf7\x82\x6d\x20\x2b\x33\x1c\xfe\
-\x81\x7f\x6f\x32\x79\x30\x84\x71\x7a\xf7\xcb\x75\x30\x6e\x7d\xd4\
-\x8e\x6a\xbc\x67\xec\xc5\xdb\xd0\x0d\xa6\x35\xc9\xd5\xec\x8d\xcb\
-\x69\xf4\xe2\x98\x70\xc3\xe4\x7d\xa2\xf7\x09\x6c\x35\x3b\x26\x95\
-\x94\x18\xdd\xe5\x54\x06\xb9\xb0\x18\xf3\x9e\xc3\x6b\xf8\x9f\xaf\
-\xe7\x7f\x03\x88\x7c\xd3\x3b\xed\x32\x4f\xdf\x00\x00\x00\x00\x49\
-\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x00\xee\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x00\xa0\x49\x44\x41\x54\x78\x9c\xed\
-\xd0\x41\x0d\x00\x20\x00\x03\x31\x82\x7f\x91\x10\x84\x80\x8c\xf2\
-\xb8\x1a\xd8\x65\x63\x40\x6b\x9f\xbb\xf6\xb9\xb2\x61\xca\xf1\x1f\
-\x74\x80\x0e\xd0\x3a\x40\x07\x68\x1d\xa0\x03\xb4\x0e\xd0\x01\x5a\
-\x07\xe8\x00\xad\x03\x74\x80\xd6\x01\x3a\x40\xeb\x00\x1d\xa0\x75\
-\x80\x0e\xd0\x3a\x40\x07\x68\x1d\xa0\x03\xb4\x0e\xd0\x01\x5a\x07\
-\xe8\x00\xad\x03\x74\x80\xd6\x01\x3a\x40\xeb\x00\x1d\xa0\x75\x80\
-\x0e\xd0\x3a\x40\x07\x68\x1d\xa0\x03\xb4\x0e\xd0\x01\x5a\x07\xe8\
-\x00\xad\x03\x74\x80\xd6\x01\x3a\x40\xeb\x00\x1d\xa0\x75\x80\x0e\
-\xd0\x3a\x40\x07\x68\x1d\xa0\x03\xb4\x0e\xd0\x01\x5a\x07\xe8\x00\
-\xad\x03\x74\x80\xd6\x01\x3a\x40\x7b\xd6\x8f\x07\xc5\x02\xeb\xa3\
-\x1e\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x02\x0a\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x01\xbc\x49\x44\x41\x54\x58\x85\xed\
-\x94\x3d\x6b\x14\x61\x14\x85\x9f\xf3\x6e\x84\x85\x80\x68\x23\x83\
-\x9b\x9d\x37\x0b\xfe\x00\x7f\x81\x9d\x28\x12\xb4\xd1\x52\x48\x2b\
-\x41\xf2\x1f\xf4\x0f\x88\x16\x96\x36\x16\x8a\x58\x69\xa1\x58\x5a\
-\x68\xa9\xbd\x98\xcc\xec\x46\xd6\x4a\x63\x12\x30\xc8\xce\xb1\xd8\
-\x0f\x96\x7c\xed\xce\xfa\x91\x66\x1e\x18\xb8\x33\x5c\xce\x39\xdc\
-\x79\xef\x0b\x15\x15\x15\x15\xc7\x8c\x86\xc5\x7a\x96\x7f\x03\x9d\
-\xfa\x3f\xb6\xfe\xbe\x18\xd3\xd3\x00\x61\xf4\x69\xac\xfe\xe7\xf6\
-\x63\x5e\xa3\x62\x2e\xa8\x85\x78\xdf\xef\x30\x98\x02\xe8\xfd\x95\
-\xc7\x14\xd8\x43\xab\x77\x73\x41\xad\xe1\xcb\xe8\x17\x00\x74\xbb\
-\xdd\xf9\xdd\xdd\x5f\xcf\x0d\x97\x06\x49\x0b\x81\xf9\x03\x0c\x12\
-\x0e\x20\x30\xaf\xea\xf5\x13\xd7\x93\x24\xd9\xd9\x37\x01\x80\x24\
-\x49\x76\xb6\xb6\x36\xaf\x0a\x3d\x1d\xa4\x0b\x7b\x43\x96\xb4\x57\
-\x5f\x43\x60\x3d\xd9\xde\xde\xbc\x36\x6e\xce\x61\xe2\xb6\x6b\x59\
-\xb6\xf1\x00\xf9\x96\x6d\x24\x15\x94\x9c\x84\x40\x85\x1d\x24\x81\
-\xf5\x30\xc6\xc6\x6d\x49\xbd\xbd\x7d\x07\x1e\x3c\x49\xbd\x18\x1b\
-\x2b\x48\x77\x25\x01\x04\x95\x98\x84\x40\x86\x20\x09\xc3\x9d\x18\
-\x1b\x2b\x07\x99\x0f\x7a\x8f\x26\xcb\xda\xab\x86\x7b\x00\x06\x0b\
-\x8a\xa3\xfa\x3d\x16\x56\xb0\x1a\x63\xf3\xfe\x84\xb0\x93\xc9\xb2\
-\xce\x4d\xe3\x47\x40\xad\xef\x71\x48\x08\x13\x10\x02\x7a\x82\xe5\
-\x18\x9b\x8f\x27\x69\x4f\x3d\xd6\x2c\xeb\x2c\x19\x3f\x03\xea\x18\
-\xa3\x7d\x21\x86\x07\xf6\xa7\xd0\x8d\x18\x17\x5e\x4e\xa3\x5b\xea\
-\x84\x7f\xce\xf3\x0b\xc1\x7a\x01\x9c\x44\x78\x70\x57\x80\x08\x18\
-\x01\x3f\x82\xbc\x94\xa6\xe9\xdb\x69\x35\x4b\xaf\xd8\xda\x5a\xe7\
-\xbc\x82\x5f\x03\x67\x40\x76\x7f\xd5\x00\x7d\x75\xc1\xe5\x56\x6b\
-\xe1\x43\x19\xbd\x99\x76\xbc\xdd\x6e\x9f\xeb\x15\x7a\x03\x5e\x1c\
-\xc8\xac\xd7\x82\x2f\x36\x9b\xcd\x4f\x65\xb5\x66\xbe\x64\xf2\x3c\
-\x3f\x5b\x58\x1b\x88\x8f\x01\x5f\x49\xd3\xf4\xcb\xac\x5a\x15\x15\
-\x15\x15\xc7\xca\x6f\xbc\xd7\xa4\x72\xc7\xdc\xd0\xf5\x00\x00\x00\
-\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x00\x78\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x00\x2a\x49\x44\x41\x54\x58\x85\xed\
-\xce\x41\x01\x00\x20\x0c\xc4\xb0\x0d\x4d\x78\x9a\x1f\x0c\x83\x8c\
-\xe3\x91\x18\x68\xab\x00\x80\xb0\xde\x73\x6e\x72\x60\x25\xe3\x00\
-\xc0\x17\x1e\xbe\x17\x02\x30\xed\xb9\x5b\x96\x00\x00\x00\x00\x49\
-\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x01\x20\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x00\xd2\x49\x44\x41\x54\x78\x9c\xed\
-\xd0\xb1\x0d\xc2\x40\x14\x44\xc1\x35\x45\x38\x43\x72\x4d\xb4\xe0\
-\x88\x8a\xe8\x82\x9a\x2c\x93\xd0\x85\x09\x40\x44\x90\x7a\x90\xd8\
-\x89\x2e\xbb\xfd\x2f\xa9\xaa\x7f\x36\xa8\x8f\x97\xe5\x76\xca\x90\
-\x4b\x92\x64\xcb\x79\x9a\x8e\x57\xb1\xe3\x20\x3e\x4d\x92\xd7\xf1\
-\x63\x92\xf1\x1d\x02\x70\x01\x9e\xc7\x7f\x7a\xef\x4a\x06\xf8\x09\
-\x0d\xa0\x07\x68\x0d\xa0\x07\x68\x0d\xa0\x07\x68\x0d\xa0\x07\x68\
-\x0d\xa0\x07\x68\x0d\xa0\x07\x68\x0d\xa0\x07\x68\x0d\xa0\x07\x68\
-\x0d\xa0\x07\x68\x0d\xa0\x07\x68\x0d\xa0\x07\x68\x0d\xa0\x07\x68\
-\x0d\xa0\x07\x68\x0d\xa0\x07\x68\x0d\xa0\x07\x68\x0d\xa0\x07\x68\
-\x0d\xa0\x07\x68\x0d\xa0\x07\x68\x0d\xa0\x07\x68\x0d\xa0\x07\x68\
-\x0d\xa0\x07\x68\x0d\xa0\x07\x68\x0d\xa0\x07\x68\x0d\xa0\x07\x68\
-\x0d\xa0\x07\x68\x32\xc0\xfd\xcb\x7b\x57\x2e\xc0\x96\x39\x43\xd6\
-\x0c\x59\xb3\x65\x66\x3b\xaa\xea\xaf\x3d\x00\x08\x2d\x0e\x52\x29\
-\x6c\xf3\x60\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x04\x03\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x03\xb5\x49\x44\x41\x54\x58\x85\xe5\
-\x97\x5d\x68\x9b\x55\x18\xc7\x7f\xcf\x79\xfb\x81\x53\xe7\x6c\x07\
-\x8b\xd8\xb2\x59\xaa\x62\x41\x91\x35\xcd\xf4\xc2\xaf\x39\x36\x44\
-\xb6\x4e\xb0\x88\xc8\x9c\x0c\xd7\x74\xad\xe9\xaa\x20\x74\x78\x11\
-\x83\x43\x0b\x82\xc5\x34\xad\x26\x1b\x88\xa2\x57\x03\x8b\xed\x74\
-\x3a\x50\xba\x2b\xe9\xb2\x58\xbc\xb0\x14\x84\x0a\x9a\x36\x1d\xae\
-\x05\xc5\x6d\x36\xcb\x7b\x1e\x2f\x92\x7e\x66\xed\x5a\x9a\x7a\xb3\
-\xff\xe5\xf3\x3e\xe7\xfc\x7f\xcf\xe1\x3d\xe7\x3c\x07\x6e\x76\xc9\
-\x6a\x92\xeb\x9a\xbb\x2b\xad\x9b\xd9\x2f\x2a\xbb\x10\x2a\x11\x2a\
-\x50\x0c\xca\x18\x22\x49\x84\x73\x8e\xda\xde\xc1\xe8\xd1\x5f\x0b\
-\x0a\xe0\x6d\x0a\xfb\x50\x3a\x80\xa7\x56\x38\x6b\x5c\x54\x8f\xc5\
-\xa3\x47\xbf\x5f\x13\x40\x6d\x63\xf4\x0e\x91\xe9\x8f\x80\x17\x73\
-\xa1\x14\x48\xbf\x2a\x67\xd4\x71\x47\xf5\x5f\x93\x2a\xde\x60\xac\
-\xa6\xf1\x58\xb1\xdb\x8c\x61\xb7\x5a\xea\x11\xb6\xe6\xa6\xff\xc6\
-\x71\xdd\x43\x83\x27\xdb\x2e\xae\x1a\x60\x7b\x73\x77\xb5\xc9\xd8\
-\x3e\x44\x1f\x00\x52\x22\x04\x6f\xdd\x32\xf9\xc9\x40\x28\x94\x59\
-\xb6\xa4\x60\xd0\x78\x27\xca\x5f\x00\x39\x0e\x5a\x05\xfc\x6e\x60\
-\xdf\xf9\x68\xeb\xcf\x2b\x06\xf0\x1e\xf9\xa0\x0a\x5b\x34\x08\x6c\
-\x06\xbe\x72\x4a\x78\x79\xb0\xab\xf5\xef\x65\x8d\x17\xa9\x3a\x10\
-\x2e\xdd\x34\x4d\x0f\xc2\x21\xe0\x32\xc2\x63\x17\x3e\x6e\x1d\xba\
-\x21\xc0\x8e\x40\x78\x63\x26\xcd\x8f\x02\x35\x8a\x7e\x98\xf0\x4c\
-\xbd\x41\x28\x64\x57\x63\x3e\x27\x95\x3a\x7f\xb8\x5d\x91\x77\x81\
-\xa4\xaa\xeb\x4b\xc4\x5e\x4f\xcd\xcf\x30\x8b\x87\xb8\xd3\x44\x04\
-\x6a\x80\xfe\xb5\x99\x03\x88\xc6\xa3\xad\x1d\x22\x9c\x04\x2a\x8c\
-\x38\x9f\x83\x2e\x28\x7a\x01\x80\xcf\xdf\xe5\x45\x38\x80\xf0\xa7\
-\x6a\xe9\x81\xb5\x99\xcf\x41\x5c\x9e\x9c\x6c\x01\x46\x14\x76\x7a\
-\xfd\xe1\x67\x96\x04\xb0\xa2\xef\x01\xa8\xea\x3b\x89\x98\xff\xaf\
-\xb5\x9b\x67\x35\x7c\x2a\x94\x16\x78\x2b\x07\xd4\x31\x7f\x15\x66\
-\x01\x6a\x1b\x3b\xef\x42\x79\x1a\x98\xba\x3a\x35\x15\x2d\x94\xf9\
-\x8c\xe2\xd1\x40\x2f\x30\x02\x3c\xe8\xf3\x77\x3d\x94\x07\x20\x98\
-\xbd\x80\xa0\x7c\x3d\x7c\x2a\x94\x2e\x34\x00\x88\xa2\xda\x07\x60\
-\x45\x9f\xcb\x03\x40\xe4\x49\x00\x45\xbe\x2d\xbc\x79\x56\xd6\x98\
-\xef\xb2\x28\xb2\x33\x1f\x00\x2a\x01\x1c\x91\xdf\xd6\x0b\xa0\x84\
-\xcc\x28\x80\x42\x45\x1e\xc0\x4c\xd0\xc8\xb5\x54\xfe\xd0\xc2\xe8\
-\x52\xb1\x33\x33\xf7\xdd\x33\x3f\x62\xde\x39\xf0\xbf\x29\xf8\xf6\
-\x42\x00\x81\x31\x80\xb4\x38\x9e\xf5\xf2\xbc\xdd\x1a\x0f\x80\xc2\
-\xf8\xcc\x19\x33\xb7\x02\x2a\x7f\x00\x18\xcb\x3d\xeb\x05\x60\xae\
-\xb9\x55\x00\x02\xc9\xd9\xd8\xdc\x57\x1d\x00\x10\x91\x3d\xeb\x06\
-\x60\xd8\x0d\xa0\xf0\x43\x1e\x80\x5b\x24\xfd\x00\xaa\xfa\x6c\x6d\
-\x63\xb4\xb8\xf0\xf6\x2a\x56\x65\x1f\x80\xb1\x6e\x6f\x1e\xc0\x50\
-\x24\x30\x2e\x59\xb2\xcd\x30\xfd\x6a\xa1\xed\xbd\x47\x22\x7b\x73\
-\x97\xdc\x2f\xf1\x13\x6d\xb3\xbd\xc1\xc2\x5d\x60\x6d\x3b\x80\x08\
-\xc1\x1d\x81\xf0\xc6\x42\x99\xd7\x34\x04\x4b\xd4\x66\xef\x19\x81\
-\x63\x20\x7a\x5d\x80\xf8\x89\xb6\xb8\xc2\x17\xc0\x16\x37\xcd\x67\
-\x04\x83\x05\xd8\xa6\x2a\x1b\xee\x2c\x0f\xe7\xaa\x1f\x88\x47\x03\
-\xa7\xe7\x7f\xcd\x37\xd0\xd2\x16\xb2\x97\x46\xbd\x77\xa2\xfc\xfd\
-\xb5\x41\xa8\x78\x9b\x22\x6f\x22\xf8\x51\xc6\xdd\x62\x79\x69\x7e\
-\xf5\xb0\x44\x4b\xb6\xbd\xb9\xbb\xda\xb8\xee\x20\x50\x06\x7c\x79\
-\xc5\x71\x0e\x0e\xf7\xb4\xfc\xb3\x1a\xeb\x9a\x86\x60\xc9\x2d\x65\
-\xe5\x11\x81\xc3\xc0\x15\x83\x3c\x71\x3e\x1a\xb8\xb0\x38\x6f\xc9\
-\xa6\xd4\x77\x38\x72\x9f\x35\xb6\x0f\xb8\x5f\x91\x31\x81\xe0\x6d\
-\x9e\x4b\x9f\xae\xa4\x29\xad\xbb\x58\xf6\xbc\x55\x39\x2e\x70\x2f\
-\x90\x54\x35\xf5\x89\xd8\x6b\x3f\x5d\x2f\x7d\xd9\xb6\xfc\xe1\x57\
-\x3a\x37\x15\x95\x9a\x18\x48\x43\x2e\x94\x14\xa1\x1f\xe5\x0c\xd6\
-\x8c\x16\xd9\x74\xea\xaa\x2b\xd6\x29\x29\xf2\xa8\x61\xab\xb1\x76\
-\x0f\x62\xea\x73\xdd\x30\xc0\x59\x71\x9c\x83\xf1\x9e\x96\x89\xa5\
-\x3c\x56\xf4\x30\xf1\xf9\x23\x8f\x5a\xb4\x03\xf4\xf1\x95\xe4\x03\
-\x43\xaa\xb4\x27\x62\xad\x67\x6f\x94\xb8\xaa\xa7\xd9\x23\x4d\x9d\
-\xdb\x32\xd6\xd9\x8f\xb0\x0b\xcd\x3d\xcd\xc0\x01\x92\xd9\xe3\x55\
-\xcf\x59\x35\xbd\x89\x58\x60\x64\x35\xf3\xde\xdc\xfa\x0f\x80\xbd\
-\x5b\x45\x41\xb4\xc0\xa5\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\
-\x60\x82\
-\x00\x00\x04\xe8\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x04\x9a\x49\x44\x41\x54\x58\x85\xc5\
-\x97\xd9\x76\xe2\x46\x10\x86\xbf\x66\x11\x12\x60\x50\x9c\xc4\x9e\
-\xf1\x24\x39\x59\xde\xff\x9d\x72\x31\x9e\x49\x1c\xcf\x18\x6c\x23\
-\x19\x24\xa8\x5c\xd4\xdf\xa8\x91\x71\x72\x97\xd4\x39\x1c\x89\x56\
-\xd7\xf6\xd7\xd6\x0d\x58\x09\x16\xf8\xcf\xc9\x02\x58\x19\xa4\x7c\
-\x09\xac\x21\x58\xf7\x91\x4b\x20\x1a\x96\x25\xef\x93\x44\x4a\x5c\
-\xb3\x64\x6d\x9b\xac\xed\xf4\x7e\x00\x1e\x7a\xf2\x97\xc0\x3a\xf4\
-\x16\x0e\xc0\x05\x30\x00\xaa\x44\x59\x90\x11\x13\xd8\x0d\x21\x8c\
-\x81\x71\xcf\xa5\x16\xac\x81\xac\x95\x11\x51\xb9\x01\x0d\x90\x4b\
-\xfe\x23\x30\x3c\x75\xd8\xf7\x2d\xc0\x7e\x11\x34\x63\xb0\x99\xd6\
-\x33\xb0\xf7\xf0\x50\x82\xe5\x60\x13\xb0\x82\x57\x64\x85\xbe\x4d\
-\xb5\xf7\xca\x79\xc1\xd7\x2c\x93\xec\x5f\xc1\x2e\xfa\x10\x02\xf6\
-\x01\xf8\x24\x24\x0c\x78\x01\x0a\xd8\xbd\x87\xec\xa3\xbc\x00\x58\
-\xc8\x8b\x73\x94\x7e\x9b\xc0\xee\x06\xb2\x5b\x21\x92\x4b\xdf\x1a\
-\xb8\x81\x70\x0b\x30\x92\xf2\x80\xc3\x3e\x96\xf2\x1b\xe0\xde\x19\
-\xb2\xfb\x44\xf9\x04\x0f\x91\x71\x1a\xf7\xe8\xcc\x4c\xca\xf4\xcb\
-\xbe\xc2\xa6\x80\xd9\x18\x78\x07\x7c\x94\x8e\x41\x0f\x01\xfb\x4e\
-\xff\x2b\x08\x15\xd8\xb5\xbe\xfd\x09\xcc\x1d\x8d\xd5\x0c\x4a\x5c\
-\x70\xa8\xcf\x03\x60\x73\xa0\xc5\xf3\xa5\xd2\xf3\x80\x27\xf4\x0e\
-\x78\xc2\xe3\xff\x0d\xb0\x82\xb0\x19\x25\xdc\x63\x29\xcf\xe5\xdd\
-\x1a\xb8\x92\xc5\x39\x94\x4f\x82\x71\x02\x66\x1d\x0f\x24\x08\xe5\
-\xc0\xb3\x94\x95\x42\x38\x03\xee\xf0\xf0\x64\x10\x9e\x12\x07\x3b\
-\x28\xdc\x52\x9b\xc0\xcb\xb5\x18\x83\xa0\x5c\x48\x68\xa4\x39\x1e\
-\x86\xb9\xf8\x07\xfa\x1f\xd7\x22\x6d\xc4\xbb\x93\xac\x00\xdb\xf7\
-\x4a\xcc\x63\xee\xc5\x10\xbc\x73\x41\x15\x30\xfd\x8c\xc7\xb2\x96\
-\xf5\x23\xc1\x56\x43\x75\x09\xd3\xb5\x23\x75\x8e\x6c\x21\x99\x35\
-\x30\x95\x03\x53\xba\xd2\x1b\x49\xf6\x1c\x0f\xc1\x97\x14\x81\x09\
-\xb4\x2f\x49\x6d\x16\x8a\xb5\xe1\x96\x5d\xc3\x74\xe5\x48\xbd\x49\
-\xb1\xce\xbf\x17\x8f\x09\x89\x58\xb6\x2d\x3c\x36\x78\xe8\xfa\x21\
-\x68\x4a\x58\x3c\x74\xc6\x30\x54\x3e\xe4\x78\xd2\xfc\x25\xc1\x85\
-\xfa\x41\xee\x49\x67\xb3\xee\x3f\x05\x9e\x37\x5f\x61\x73\x29\xde\
-\x3c\x91\x09\x2c\x9e\x49\x42\x15\x0d\xc8\xbc\x8b\x91\x0b\xc6\x52\
-\x1e\xb4\x62\x5c\xe1\x89\xf6\x20\x48\x73\x3d\x83\xa0\x9d\xba\x0c\
-\xa6\xae\x9c\x06\x66\x0f\xda\xd7\xe2\x3d\xe5\x12\xef\x31\x43\x68\
-\x4c\xfb\x63\x1f\x20\x40\x50\xd7\x0a\x8f\xde\xb9\x82\x32\xdb\x0c\
-\x82\xfa\xbb\x35\x12\x36\x06\xee\x7b\xbd\xfd\xca\x8d\x8e\x7c\xb4\
-\x60\x7b\x7f\x86\x1d\xd8\x33\x5e\x86\x03\xba\x24\x3f\xa9\x82\x61\
-\x52\xdf\x49\x93\xa9\xd3\x3d\xda\xc7\xbd\x7b\x63\xe9\x30\xbb\x4b\
-\x1c\x8a\x94\x4e\x59\xc9\x0c\x55\xe7\x6c\xc7\x30\x82\xf1\x21\xf1\
-\x86\xe4\xbd\x4d\x84\x8c\x80\xc6\x3d\xb7\x35\xea\x4c\x78\x46\x5b\
-\xd2\x1f\x52\x4a\x1d\x78\x35\x3d\x07\xc9\x73\x7f\x86\xb9\x4f\x87\
-\x9e\xc0\x3e\x9d\x6b\xcf\x96\xbc\xbf\xda\x17\x85\xed\xa0\x51\x57\
-\x0b\xd6\x6d\x0e\x06\xf5\xb0\x67\xc0\x30\x81\x7d\xa5\xdf\x32\x99\
-\x27\x7d\x83\x4f\x46\x6e\xdf\x98\x94\xa1\x55\x29\xf5\xac\x2d\xfa\
-\x75\xdf\xe2\x09\xa7\x79\x1e\x62\xdb\xbe\xa6\x3b\x03\x44\x0a\xaf\
-\xdf\xad\x00\x3b\xee\x8b\x39\x60\xca\x70\x53\x19\xce\x34\x58\xc0\
-\x4b\xb3\x94\xe2\x02\x6f\xb9\x6a\x36\x96\x42\xdc\x00\xdf\x4a\xb8\
-\x49\xb6\x0e\x21\x16\x3b\x20\x32\x76\x1f\xf9\xa2\x01\x3b\x08\x43\
-\x95\xdb\xd6\x0f\x24\x34\xfe\xdf\xc0\x33\x7f\x23\x21\x9f\xff\x61\
-\x1a\xee\x38\x9e\x76\xd6\x25\x2c\xef\x3a\x07\x79\xc0\x4b\x38\xee\
-\xd9\xc1\x49\x08\xc6\x75\xe2\xf5\x16\x35\x0a\x51\x05\x2f\x3f\xc9\
-\xf3\x73\x99\x7e\xb4\x40\x1e\x7e\x80\xe5\x53\xb7\xbc\x2a\xa4\x1c\
-\x37\x6c\xbc\x89\x5f\x06\x09\xe3\x06\xea\xb2\x63\xa2\xf6\x86\x14\
-\x0f\x1a\xf9\x2d\x3e\xdd\xfa\x67\xc1\x94\x22\xd4\x7f\xe0\xed\x36\
-\xf8\xb3\x4c\x86\x57\x36\x93\x31\x27\x21\xd8\xfb\xe6\xe2\x19\xec\
-\x86\x6e\xe0\x14\xf8\x49\xe6\x77\x3c\x9e\x7b\xa0\x74\xa4\xea\x41\
-\x97\xa0\xf5\x50\x02\xd5\x21\x8f\x7b\x7f\xc6\xbb\x9f\x8e\x77\x2c\
-\xa1\xb8\x95\xcc\x6d\x6a\x00\x6e\x40\x78\x06\x1b\xd0\xc5\x7c\x24\
-\x6f\x0e\x10\x36\x60\x2d\xf0\x0c\xe1\xe5\x3c\x00\x36\x77\x19\xa0\
-\x83\xeb\x67\x7c\x96\x6c\x24\x73\xe5\xf9\xd3\x45\x31\x0d\x41\xe3\
-\x93\x2d\x3c\x42\x7d\xe1\x9e\xb2\x96\xf5\x5b\xe5\xc7\x71\x8c\xbe\
-\x4d\x36\x56\xe8\x1a\x3c\xd1\xd6\xc0\x25\x54\x33\x47\xc3\x66\x5a\
-\x3f\x09\xc1\x57\xe0\x07\xdf\x6c\x4b\x60\x06\x2f\x41\x93\x74\x42\
-\x67\xb2\x0e\x97\x55\x05\x85\xd1\x75\xcf\xd8\xac\x0a\x3c\xdb\x77\
-\x38\xf3\xc2\x8d\xaf\xa7\x30\x9d\xe3\x13\x76\xe3\x8e\x87\x4d\x62\
-\x40\x30\xb0\x03\x5e\xeb\x01\xf8\x04\x45\x34\x86\x0e\x56\xf0\x30\
-\x4c\x75\xf4\x36\x21\x18\xe2\x1c\x59\x38\x82\xc7\xbd\x17\x6e\xcc\
-\xf4\x8b\x64\xc5\xd9\x72\xee\x50\x63\x17\xba\x34\xf4\x2f\x26\x0b\
-\xa8\x7e\xec\x2e\x23\xff\x76\x31\x01\xe7\xad\x3e\x74\x65\x7d\x72\
-\x31\xf9\xed\xcc\xc5\xe4\xd8\xdb\xf7\x82\x6d\x20\x2b\x33\x1c\xfe\
-\x81\x7f\x6f\x32\x79\x30\x84\x71\x7a\xf7\xcb\x75\x30\x6e\x7d\xd4\
-\x8e\x6a\xbc\x67\xec\xc5\xdb\xd0\x0d\xa6\x35\xc9\xd5\xec\x8d\xcb\
-\x69\xf4\xe2\x98\x70\xc3\xe4\x7d\xa2\xf7\x09\x6c\x35\x3b\x26\x95\
-\x94\x18\xdd\xe5\x54\x06\xb9\xb0\x18\xf3\x9e\xc3\x6b\xf8\x9f\xaf\
-\xe7\x7f\x03\x88\x7c\xd3\x3b\xed\x32\x4f\xdf\x00\x00\x00\x00\x49\
-\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x06\x7b\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x06\x2d\x49\x44\x41\x54\x78\x9c\xed\
-\x9b\xc9\x73\x5c\x57\x15\xc6\x7f\xdf\xb5\x49\x39\x09\x91\x83\x33\
-\x40\x15\x2b\xb6\x78\x48\x9c\x48\x3d\x24\x14\xc4\x8a\x63\xc9\x93\
-\x2c\x75\xab\xf2\x87\xb0\x0a\x0b\x58\x50\x5e\xb0\xc9\x12\xfe\x88\
-\x54\xab\x25\x92\x38\x65\x6b\x34\x09\xa0\x1e\x0c\x45\x18\x56\x29\
-\x2a\x95\x62\x45\x26\xb0\x6c\x63\x29\x46\xf7\xb0\xe8\x6e\xe8\x74\
-\xb7\xf4\xee\xeb\x7e\x4f\xea\x14\xfa\x96\xf7\x9e\x3e\xf7\x7c\xbf\
-\x3a\xe7\xf5\xeb\xa7\x27\x38\xd0\x81\x0e\xf4\xff\x2c\xf5\x5a\x3c\
-\x75\xc3\x1e\x7d\xf8\x2e\x3f\x94\xec\xb2\xc1\x11\xcc\xd6\xed\x6b\
-\xee\x67\xb5\x29\x7d\xb8\xd7\x05\xf6\xa3\xcc\x9b\xf6\x1d\x3d\xf0\
-\xaf\x21\xe5\x05\x9b\x5e\xba\xf6\xc8\x03\x5e\xbf\xf9\xaa\xee\x76\
-\xc6\x76\x01\x78\xf1\x97\xf6\xd8\x03\x6f\xbf\x92\x71\xba\x63\xeb\
-\xb6\x9c\x26\x2a\xd3\xaa\xa6\x56\x79\x02\x1a\x9b\xb3\x31\x27\x5b\
-\x02\x8e\x76\x6c\xbd\xcf\x11\x7d\xbf\x7a\x41\x1b\xed\x8b\xae\x33\
-\xc1\xf6\xb6\x7f\xad\x87\x79\x80\xa3\xe6\x6d\x31\xb7\x60\xd9\x04\
-\xeb\x4d\x54\xbb\x98\x07\x78\x86\x4d\xff\xa3\xce\xc5\x2e\x00\xa0\
-\xa9\x5d\xce\x18\x19\x56\x08\x11\xe6\x9b\xd2\x95\xce\x95\x2e\x00\
-\x1e\x1e\x8e\x38\x6b\xc4\xbc\x2d\xe6\xe7\x2d\x13\xb7\xc8\xb4\x94\
-\x29\xd9\x68\xb4\x79\xc0\x38\xd2\xb9\xd4\x05\x40\xd8\x6f\x02\xce\
-\x1c\xf1\x66\x4b\xc3\x00\x21\x53\xb2\x51\x39\x5b\x26\xca\x3c\x80\
-\xba\xbd\x75\x8f\x80\x77\x57\x81\xdb\x01\x67\xef\x3b\x84\x58\xe6\
-\x61\x03\xef\x7e\xda\xb9\xd8\x05\xa0\x3a\xab\x0f\x9c\x74\x8e\x70\
-\x08\xfb\x32\x0e\x4d\xf3\xd1\x6d\xdf\xd0\x06\xa6\x89\xea\xac\x3e\
-\xe8\xdc\xe8\x79\x1f\x00\x90\x9f\xb7\x8c\x37\x5b\x02\x46\x02\x0e\
-\xb8\xed\x4d\xaf\xd4\x8b\xaa\x07\xc4\x0e\xac\xec\xbc\x3d\x8f\xd9\
-\x32\xf0\x78\x40\xf8\x1d\x4c\xe7\xaa\x45\x55\x7a\x6d\xee\x08\x00\
-\x86\x13\x42\x92\xe6\x21\x02\x00\x0c\x17\x84\xa4\xcd\x43\x00\x00\
-\x80\xdc\x82\x65\xcd\xdb\x22\x81\x10\xcc\xeb\x6c\x6d\x56\xb7\x42\
-\x72\x87\x2a\x37\x67\xcf\x99\x6c\x19\xf8\x46\x40\xf8\x1d\x43\x13\
-\xb5\x82\xd6\xa3\x02\x83\x00\xc0\xfe\x42\x48\xcb\x3c\xf4\xbc\x13\
-\xec\xad\xca\xb4\xaa\x98\x26\x80\x8d\xc8\x60\x38\x2a\x67\xcb\x99\
-\x92\x8d\x86\xe6\xdf\x49\x71\xcd\x3b\xa7\xc9\x50\xf3\x10\xa3\x03\
-\x5a\xca\xce\x59\x0e\xd9\x22\xf0\x58\x40\xf8\x3f\xcd\xeb\x95\x7e\
-\x3b\x21\xa6\xf9\xbb\xce\x69\x62\x7d\x5a\xbf\x8d\x73\x46\x6c\x00\
-\x10\x1f\x02\xd2\xd9\xea\x8c\x7e\x17\xe7\x8c\xbd\x30\x0f\x31\x46\
-\xa0\x5d\xd5\xa2\x2a\x98\xce\x01\x77\x02\xc2\x1f\xc7\x6c\x39\x3b\
-\x6f\xcf\x87\xe6\xcf\x97\xec\xf4\x5e\x98\x87\x3e\x01\x40\x03\x82\
-\xa1\x09\x12\x86\x90\x2f\xd9\x69\xef\x6c\x85\x40\xf3\x32\x4d\xf6\
-\x6b\x1e\xfa\x1c\x81\x76\x65\xca\x96\x17\x76\x83\x04\xc6\xa1\x1f\
-\xf3\x95\xa2\x42\x7e\xbc\xed\xa8\xbe\x3b\xa0\xa5\x5a\x41\xeb\xce\
-\x69\x92\xf0\x4e\x58\xca\xcd\xd9\x73\x9d\x1b\x4d\xf3\xc1\x6d\x0f\
-\x3a\x3f\xa8\x79\x48\xa0\x03\x5a\xca\x2f\xd8\x0b\xde\xdb\x0d\xe0\
-\xeb\x01\xe1\xff\x90\xe9\x6c\xa5\xa8\xdf\x03\x8c\xcd\xdb\xb3\xce\
-\x6c\x05\x38\x16\xf9\x49\xe3\x1e\xd2\x64\xb5\xa0\x5f\x0f\x56\x71\
-\x43\x89\x01\x80\xfe\x20\x6c\x3b\xfc\x7e\x99\x87\x84\x01\x40\x3c\
-\x08\x26\x36\x64\x40\xc8\xdd\x65\x0a\xe6\x21\x05\x00\x00\xb9\x39\
-\x7b\xd1\x64\xd7\x09\xeb\x84\x68\x19\xf7\xec\x90\xce\xd7\xa6\xf5\
-\x5e\x22\xf9\xda\x94\x0a\x00\x48\x10\x42\x8a\xe6\x21\x81\x6f\x81\
-\x9d\xd4\xb8\x42\xeb\x3c\xd0\xf5\xc7\x88\x60\x19\xf7\x3c\xba\x90\
-\x96\x79\x48\xb1\x03\x5a\xca\x96\xed\x7b\x98\x5d\x47\x3c\x1a\xeb\
-\x83\x4d\xf3\xf5\xa2\xde\x4d\xa9\x34\x60\x0f\x00\xc0\x7f\x21\x2c\
-\xa2\xc8\x47\xee\x0d\x19\x9b\x1e\x4d\xa4\x6d\x1e\x52\x1c\x81\x2f\
-\xc9\xb3\x81\xf8\x22\x38\xde\xe9\x0b\x5c\xd0\xcf\xee\x81\x95\x3a\
-\x80\x6c\xc9\x4e\xe1\x6c\x95\xb0\xa7\xb7\x0d\x99\x8d\x38\xb3\x95\
-\xb1\x79\x7b\x36\xbd\xca\x1a\x4a\x75\x04\xda\xcc\x3f\xd1\x67\x8a\
-\xcf\xbd\xf4\x72\x7d\x46\x7f\x48\xb2\xae\x76\xa5\x06\xa0\x69\x7e\
-\x05\x78\x72\xc0\x54\x9f\x1b\x1a\xaf\x15\xf4\x7e\x12\x75\x75\x2a\
-\x95\x11\xc8\x2f\xd8\xc9\x84\xcc\x03\x1c\x13\xb6\x9a\x29\xdb\x33\
-\x09\xe4\xea\x52\xe2\x00\xf2\x0b\x76\xd2\x7b\x5b\x25\xc0\xbc\xc1\
-\x96\x60\x2b\x20\xed\x31\x61\x2b\x69\x40\x48\x14\x40\x1c\xf3\xc0\
-\x7d\x27\x4d\x6e\x37\x9e\x2c\xfd\x2b\x20\xfe\x89\x34\x20\x24\x06\
-\x60\xb4\x6c\x27\xe2\x98\xc7\x74\xb1\x32\xa3\x9b\xf5\xa2\xde\x75\
-\xe8\x02\x31\x20\x64\x4b\x76\x6a\xb0\x6a\xff\xa7\x44\x2e\x82\xa3\
-\x65\x3b\x71\x08\x5b\x23\x86\xf9\x6a\x51\x6b\xed\x8b\xf9\xb2\xfd\
-\xc0\x63\xef\x00\x8f\x04\xe4\xf8\x0c\xaf\xf1\xea\xac\xfe\xd8\x4f\
-\xbd\xed\x1a\x18\x40\x5c\xf3\x86\x2e\xd5\x0a\x5a\xed\xb5\x99\x9b\
-\xb7\x97\xcc\xec\x1a\x7b\x08\x61\xa0\x11\x18\x2d\xdb\x09\x47\x78\
-\xdb\xef\x66\x1e\xa0\x32\xa3\x9b\x92\x2e\x12\x38\x0e\xb8\xc1\xc7\
-\xa1\xef\x0e\x68\x99\x17\x3c\x15\x10\x7e\xdf\x4b\x97\xeb\x33\x5a\
-\x09\xc9\xdd\xec\x84\x77\x88\x7e\x5d\x07\xe0\x53\xe7\x34\xbe\x3e\
-\xad\x3f\x85\xe4\xee\x54\x5f\x00\xc6\x4a\x76\x5c\xce\xd6\x02\xcd\
-\x6f\x7a\xe9\x52\xa8\xf9\x96\xf6\x0a\x42\xec\x11\xd8\x0b\xf3\xd0\
-\x18\x07\x4c\x17\x81\xfb\x01\xe1\x4f\x7a\x6f\xab\xf9\x05\x3b\x19\
-\xf7\x9c\x58\x1d\x30\x56\xb2\xe3\xae\x71\x6f\xff\x74\x40\x78\xdf\
-\xe6\xdb\x95\x9d\xb3\x33\xc8\xae\x11\xd8\x09\xdb\xe8\xcc\xad\x82\
-\xfe\x1c\x9a\x3f\xb8\x03\xe2\x9a\x97\x0f\x9f\xf9\xdd\x54\x2d\x6a\
-\xcd\xd0\x25\x02\x3b\xe1\x10\xb6\x36\x5a\xb6\x13\xa1\xf9\x83\x3a\
-\x20\xbb\x60\xdf\xc5\xdb\x1a\x31\xcc\x57\x66\xb5\x1c\x5a\x44\x88\
-\x32\x65\x1b\x17\xf6\x36\x09\x77\x42\x24\x80\xb8\xe6\x41\x53\xd5\
-\x82\x96\x02\x62\x63\x6b\x6c\xde\x5e\x76\x66\x6f\x11\x00\xc1\xe0\
-\x13\x8f\xc6\xa3\x20\xec\x0a\x60\x98\xcc\xb7\xd4\x84\xf0\x36\x74\
-\xbf\xf5\xd9\xa9\x10\x08\x3b\x5e\x03\x9a\xe6\x83\x67\x1e\xe9\x4a\
-\xda\xe6\x01\xea\x33\x5a\xf1\xd2\x25\x60\x33\x2a\x56\xf0\x94\xc3\
-\x56\xc7\x4a\x76\x7c\x97\x98\x6e\xb5\x99\xff\x66\xd4\x21\x06\x5b\
-\x92\xa6\xaa\x33\x5a\x8c\x8a\x4d\x52\x71\x3b\xc1\xbc\xce\xd4\x67\
-\xf5\x97\xce\xbd\x2e\x00\xf9\x37\xec\xdb\xfe\xb0\xdd\x02\xbe\x15\
-\x90\x78\x5f\xcc\xb7\x94\x2b\xd9\x59\x73\xf6\x16\x01\x10\x80\x8f\
-\xbd\xd3\x68\x7d\x5a\x7f\x6b\x5f\xec\x7e\x5b\xfc\xb0\xff\x31\x5f\
-\x01\xf3\x00\x95\x59\x2d\xcb\xeb\x32\x01\xe3\x00\x3c\x2d\xef\x7f\
-\xd2\xb9\xd8\xeb\xff\x05\x5e\x8a\xca\x64\xb0\x85\xd7\x95\xfd\x34\
-\xdf\x52\xe3\xeb\x56\x53\x04\x41\xd0\x99\xce\x95\x5e\x17\xc1\xed\
-\xdd\x52\xb4\xcc\xd7\x66\x75\x23\xb4\xc8\xb4\xd5\xb8\xf8\x46\x43\
-\x50\x0f\x6f\xdd\x00\x1a\x6f\x7f\xf5\x94\xc1\xd6\x21\x34\x3d\x4c\
-\xe6\x5b\xaa\x16\xb4\x84\x74\x85\x5d\x21\xd8\xf5\xce\x95\x2e\x00\
-\x66\xee\xaa\xc1\x5f\xbb\xd6\x9b\xe6\xd7\x0b\xea\x4a\x32\x2c\xaa\
-\xce\x68\x71\x47\x08\xc6\x87\x0f\xfd\xdb\x5d\xed\x5c\xee\x02\x50\
-\x2b\xe8\xb3\xed\xc3\xca\x81\xfd\x1c\xf8\x08\xf8\x18\x78\xd3\x99\
-\x5e\x18\x66\xf3\x2d\x55\x67\xb4\xe8\xa5\x3c\xc6\x02\xf0\x77\xe0\
-\x23\x64\xbf\x78\x68\x5b\xd9\xf7\x5e\xd5\x27\xfb\x5d\xdf\x81\x0e\
-\x74\xa0\xe1\xd2\x7f\x00\x72\xd2\x49\x30\x2e\xe9\xad\x3a\x00\x00\
-\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x04\x58\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x04\x0a\x49\x44\x41\x54\x78\x9c\xed\
-\x9b\x4b\x88\x5c\x45\x18\x85\xcf\xa9\x19\x34\x41\xa2\xa0\x21\x1b\
-\x09\xee\x7c\xac\x04\x13\x7b\xda\xb8\x30\x06\x13\x99\x80\x26\xdd\
-\x1d\x06\x17\x82\xe0\x83\x08\xae\x14\x09\x24\x88\x1a\x4c\x40\x11\
-\x5c\x28\xf8\x42\xd1\x85\x28\x8a\xdd\xf3\x40\x26\x32\x41\x1c\x10\
-\x64\x7a\x9a\x11\xb2\x10\x41\x5c\x04\x11\x41\x83\x09\x11\x25\x0d\
-\xe9\x5b\xc7\x45\xcf\xa8\xdc\x2a\x35\x9d\x54\x55\x17\xd8\xdf\xf2\
-\x2e\xea\xfc\xff\xb9\x55\x7f\xd5\x7f\x1f\xc0\x88\x11\x23\xfe\xcf\
-\x30\xd4\x40\x95\xa6\x9e\x35\xb4\x4f\x89\x94\x2c\x8f\x2c\x37\x78\
-\x38\xd4\xd8\x31\x09\x66\xc0\x44\xb3\x28\x40\x9a\xd5\x51\x45\x70\
-\xc7\x52\x8d\x8b\xa1\xc6\x8f\x85\x09\x36\xd2\x5a\xf2\x00\x20\x50\
-\xd2\xdc\xc4\xb4\xb6\x04\x1b\x3f\x12\xc1\x0c\x10\x60\x4b\x97\x36\
-\x40\xfa\x74\xeb\xac\x6e\x08\xa5\x11\x83\x60\x06\x10\x90\xe7\xf2\
-\xc6\xb1\x42\xc7\x6f\x9d\xd1\xe6\x50\x3a\xa1\x09\xb7\x04\xfe\x99\
-\xcd\xc6\x6a\x61\xcb\x9c\x36\x26\xd0\x1a\x98\x14\x06\x00\xc0\x8d\
-\xe3\x85\x8e\xdd\x3e\xab\x0d\x89\xf4\x2e\x98\x68\x06\xa8\xbc\x24\
-\x84\xad\xbd\x42\x33\x93\xf3\xba\x3c\x96\xe6\xc5\x10\xcd\x00\x02\
-\x16\x74\xea\xc2\x8e\xd3\x5d\xbd\xbf\xfd\x73\x8d\xc7\xd2\x1d\x94\
-\xb8\x4b\x40\xb0\x70\x8b\x63\xbd\x7b\xda\xbe\x0e\x29\xd8\x19\xe4\
-\x52\x48\x51\x03\x9c\x99\x20\xf2\xa1\x6a\xcb\x3e\x9f\x40\xfb\x3f\
-\x49\x53\x04\x05\xab\x72\x49\x20\x0f\x54\xa6\x75\x20\x89\xfe\xbf\
-\x90\x6a\x17\x00\x69\x0a\xe7\x9a\xf4\x42\xb5\xa9\x87\x53\xc5\xe0\
-\x23\x99\x01\x90\x7c\xa7\x45\x88\x7a\xa3\xda\x52\x3d\x59\x1c\x25\
-\xd2\x19\x80\xfe\x69\xd1\x63\x82\x11\xf4\x41\xf5\x63\xdd\x95\x32\
-\x96\x3f\xc5\x53\x0b\x12\xd0\xea\xee\xf0\x77\x2e\x13\x35\x73\xdb\
-\xb4\x2a\xa9\xe3\x49\x6e\x00\x00\x80\x9e\x99\x40\x5c\x61\xa5\xf9\
-\x6a\x4b\x37\xa5\x0c\x65\x38\x06\x60\xad\x79\x62\x79\x26\x5c\x23\
-\xe8\xf8\xb6\xa6\xae\x4b\x15\xc7\xd0\x0c\xe8\x23\x9f\x09\xd7\x16\
-\xd4\xc2\xb6\x96\x36\xa5\x88\x60\xc8\x06\x00\x7d\x13\x54\x3e\x2d\
-\x5e\x5f\x40\xc7\x26\xe6\x75\x65\x6c\xf5\x0c\x0c\x00\x00\x5a\xa7\
-\x79\x02\x6e\x51\x57\x73\xdb\xdf\xd1\xba\x98\xca\x99\x18\xb0\xda\
-\x3c\x95\x4c\x20\x70\xc7\xb9\xab\xf4\x61\xcc\xe6\x29\x1b\x03\x56\
-\xf1\x35\x4f\xf7\x76\xcf\xd8\xb7\xf0\x8c\xa2\xc4\x9a\x9b\x01\x80\
-\xaf\x79\x02\x1f\xa8\xdc\x6c\x5f\x8c\xd1\x41\xe6\x68\x40\xbf\x8d\
-\x2e\xd5\x45\x82\x4f\x54\x5a\x38\x18\x5a\x2a\x4f\x03\x00\x80\x74\
-\x9b\x27\xea\x68\xa5\xa9\xfd\x21\x65\xf2\x35\x00\x80\x04\x5b\xae\
-\x08\xa4\x5e\x9b\x68\x6a\x5f\x28\x8d\xac\x0d\xa0\xef\xc8\x0c\x10\
-\xd4\x2b\xa1\x34\xb2\x36\x00\x00\xe8\x2f\x7b\xc1\xb6\xc5\xbc\x0d\
-\xe8\x67\xef\xc4\x28\xe8\xed\x50\x12\xd9\x3c\x9d\xf5\x22\x8d\xb9\
-\xd7\xf8\xd8\x72\xc3\xbc\x1a\x4a\x22\xe3\x19\xe0\x4d\xfe\xe9\x76\
-\x83\xc1\x92\x07\x72\x34\x80\x80\x08\xe3\xbe\xb9\xd7\xcb\xed\x3a\
-\x8e\x84\x96\xcb\xce\x00\x09\x86\x2a\x67\xaf\xf7\xda\x27\xcc\xe3\
-\x20\x7d\x2f\x60\x2f\x89\xbc\x0c\x20\x0c\x4b\xb7\x9e\xc0\x27\xbd\
-\x53\xe6\x41\x1c\x76\x9e\x1b\x04\x21\x27\x03\x0c\x9c\x3b\x8f\x2f\
-\xd8\xe3\xd4\xca\x7e\x9e\x8f\x25\x9a\xc9\x2e\x20\xe3\xd9\xf1\x4f\
-\xf4\x7a\xbc\x67\x65\x8a\xe7\x62\x2a\x0f\xdd\x00\x81\x2c\x4f\x7b\
-\x08\xdf\x61\x9c\x77\xaf\xd4\x79\x36\xb6\xfe\x50\x97\x40\x3f\x79\
-\xa7\xcf\xff\x91\x86\x3b\xdb\x7b\xf8\x53\x8a\x18\x86\x67\x80\xe0\
-\x4b\xfe\x8c\xb5\xdc\xb5\x54\xe3\xc9\x54\x61\x0c\xc5\x00\x09\x04\
-\x4b\xda\xc2\xef\x10\x77\x77\xf6\xf1\xeb\x94\xb1\x24\xaf\x01\x02\
-\xc8\x72\xf2\xc0\x79\x18\xd6\xdb\x35\x2e\xa5\x8e\x27\xe9\x0c\x90\
-\x40\xca\xd1\x14\xc9\xfb\xdb\x35\x2e\xa4\x8c\x65\x8d\x74\x33\x80\
-\x84\x67\xcd\x03\xe4\xa3\x4b\x35\x7e\x94\x2c\x8e\x12\xc9\x66\x80\
-\x64\xdd\xe6\x86\x3c\xd4\xae\xf1\xcd\x54\x31\xf8\x48\x63\x00\x61\
-\xe8\x6c\xf5\x7a\xa9\xbd\x17\x43\xff\x4c\x26\x85\x01\xee\x11\x57\
-\x7a\x77\xb9\x66\x9e\x8c\xd1\xdc\x0c\x4a\x5c\x03\xfa\xd5\xbe\x7c\
-\xc4\x9d\x5d\x7f\xb5\x79\x24\x87\xe4\x81\xb8\x1f\x4a\xfa\x9a\x9b\
-\xc5\xf5\x67\x79\xdf\xe2\x9d\xec\xc5\xd2\x1d\x94\x68\xbb\x80\x73\
-\xbe\x07\xbe\xc2\x3a\xee\x59\xac\xb3\x1b\x4b\xf3\x62\x48\xb5\x0b\
-\x7c\x3b\x06\x4e\xb6\x77\xf3\xd7\x44\x7a\x17\x4c\x0a\x03\x7e\xe8\
-\xf5\xb8\xf3\xcb\x3a\x7f\x4e\xa0\x35\x30\x21\x7f\x98\xf0\x3d\xc1\
-\xff\x85\xe0\xae\x95\x29\x7e\x1f\x4a\x27\x34\xc1\x6a\x00\x5d\x33\
-\x7f\xb3\xe2\x64\xa7\xc1\x6f\x42\x69\xc4\x20\xe4\x12\xf8\xeb\x99\
-\x1d\x21\x4b\xee\xed\x34\xd8\x09\x38\x7e\x14\x42\xfe\x34\x75\x14\
-\x40\x01\xa0\x80\xf8\x5c\xa7\xc6\xcf\x82\x8d\x3d\x62\xc4\x88\x11\
-\x91\xf8\x03\x6e\xfe\x4e\x7e\xe0\xc6\x25\x53\x00\x00\x00\x00\x49\
-\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x00\xcd\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x00\x7f\x49\x44\x41\x54\x78\x9c\xed\
-\xd9\x51\x0d\x80\x30\x10\x05\xc1\x03\x6f\x55\x80\x05\xd4\x62\xaa\
-\xc8\x58\x12\x66\x0c\xdc\xcb\xa6\x7f\x9d\x09\xad\xeb\xde\xeb\xba\
-\x77\xb9\xe1\x2c\x8f\x7f\x81\x00\xf5\x80\x9a\x00\xf5\x80\x9a\x00\
-\xf5\x80\x9a\x00\xf5\x80\x9a\x00\xf5\x80\x9a\x00\xf5\x80\x9a\x00\
-\xf5\x80\x9a\x00\xf5\x80\x9a\x00\xf5\x80\x9a\x00\xf5\x80\x9a\x00\
-\xf5\x80\x9a\x00\xf5\x80\x9a\x00\xf5\x80\x9a\x00\xf5\x80\xda\xef\
-\x03\x1c\xe5\xf1\xfa\x6b\x7c\xa6\x7e\x01\x7b\x9e\xf4\x3e\x00\x00\
-\x00\x00\x00\x00\x00\xfc\xc3\x0b\xb7\x26\x07\xfa\x17\x1e\x2a\x64\
-\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x02\x8f\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x02\x41\x49\x44\x41\x54\x58\x85\xed\
-\x97\x31\x6b\x14\x51\x14\x85\xbf\x33\x59\xab\x80\x85\x62\x20\x76\
-\xf9\x03\x62\xb5\xbb\xa2\x88\x82\x5d\x42\x8a\x24\xf8\x07\x02\x6a\
-\x95\xca\x24\x65\x08\xa9\x56\xb0\x30\x60\x50\x41\x41\xd2\x04\xc1\
-\x2d\x82\x0b\x76\x01\x41\xb2\xbb\x95\xf8\x07\x92\x3a\x41\xc1\x22\
-\x95\xc9\x1c\x8b\x9d\xb7\xac\x9b\xd9\xec\x4e\x76\xb4\xd1\xaf\x7a\
-\xdc\x77\x67\xee\x99\x73\xdf\xcc\xbc\x07\xff\x3a\xea\x0e\x94\xdf\
-\xfb\x66\x8c\x97\x11\x65\xc1\x95\x3c\x8a\x18\x0e\x31\xf5\x08\x55\
-\xea\xb3\xfa\xdc\x53\x40\xa9\xea\xc7\xe0\x27\x69\xc2\x72\x22\xc6\
-\x5a\x6a\xcc\xea\xe9\x29\x01\xa5\xaa\x6f\x81\x3f\x01\x3f\xb0\x16\
-\xa2\x13\x6a\xbb\xf7\xf5\x3d\x8f\xaa\x37\xde\xf9\x52\x3c\xc2\x24\
-\xf2\x3a\x70\x51\xd6\xed\xe0\x44\x21\x24\xd9\x5e\x92\x10\xd6\x42\
-\x63\x56\x9b\x79\x14\x0e\x24\x0f\xb2\x59\xac\x5a\xc2\x6f\x63\xbc\
-\x0c\x4c\x03\x44\xed\x2c\x51\x06\x88\x4e\xa8\xe5\x59\xbc\x8b\x1a\
-\x80\x44\x29\x04\xda\x02\xc2\x82\xcb\xcb\xf6\x34\x9a\x33\xfa\x96\
-\x0c\xc7\x42\xac\xd0\x23\xf7\xdc\x14\xab\x9e\x12\x7e\x05\x60\xf4\
-\xa0\x39\xa3\x0f\x67\xe5\xe7\x2a\xa0\xb8\xed\x09\xfd\xf4\x16\x62\
-\x14\x20\x11\x72\xf5\xac\x6b\xa2\xb3\x26\x33\xb1\xe2\x48\xc7\x7e\
-\x13\x8a\x0f\x4a\x6e\x02\x4a\xd7\x78\x04\xdc\xe9\x8c\x49\x5a\xfb\
-\x2b\x02\x8a\xdb\x9e\x48\x3e\x60\x9d\xec\xd4\xbf\xf0\xf2\xcf\x0b\
-\x48\xb3\xde\x1c\xb9\xa0\x79\x56\x15\xf7\xbb\xbc\xef\x22\xec\xb7\
-\xaa\x53\xad\x8f\xb4\xd8\x98\xd6\xde\x20\xfa\xfb\x3a\x90\x14\x1f\
-\x07\xc6\x65\x6f\xb5\xec\x4e\xc4\x0d\x61\x7d\x20\xdb\x6b\x28\x46\
-\x75\xec\xd7\xac\xf8\x1e\x40\xaa\xf5\x17\x06\xb3\x7e\x60\x01\x92\
-\xd6\x6c\x6f\x74\x84\xee\x96\xaf\xf3\xd0\x31\x62\x08\xeb\x03\x7d\
-\x5b\x90\xd8\xb9\xd3\x19\xb3\xbd\x81\xfc\xbc\x2b\x35\x93\xf5\x03\
-\x0b\x60\x55\xb1\x0b\x9a\xc7\x1c\xf5\xcc\xc9\xb0\xea\xb3\x0b\x00\
-\x9a\xd3\xda\x03\x2d\xf5\x9a\x57\xa4\xc5\x66\x46\xeb\x33\x09\x00\
-\x68\x7c\xe5\x05\x5d\xad\x48\x38\x97\xf5\x99\x05\xa4\xb6\x62\x08\
-\xeb\xb3\x0b\xa0\xd5\x8a\x48\x9a\x03\xf6\x81\xfd\x48\x9a\x3b\xaf\
-\xf5\x81\xcc\xbf\xe3\xdd\x19\x7d\x04\x26\xfa\x26\x0e\x48\xdb\x01\
-\xc3\x21\xb4\x36\x90\x79\xdd\xbc\x9b\x62\xd5\x97\x93\xe1\xc1\x29\
-\x01\x98\x3a\x40\x3c\xc2\xe4\x9f\x12\x00\xad\x7b\xdb\x34\x42\xa0\
-\xdd\x82\x08\x55\x8c\xa7\x90\xd7\x8b\x55\x0b\xa8\x75\xec\xe1\x86\
-\x22\x79\xf2\x49\xe1\x67\x40\x1c\xa1\x4a\x98\x4b\x3b\x98\x54\xc8\
-\x73\xa7\xf4\x3b\xbd\x0f\x26\x81\x70\x34\x4b\xb6\xce\x63\xdd\xf3\
-\xe7\xe4\xc0\xa6\x91\x76\x34\xfb\xcf\x2f\xa6\x4e\xeb\xad\xb9\x6d\
-\xcb\x1e\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x00\x8b\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x00\x3d\x49\x44\x41\x54\x58\x85\xed\
-\xd3\x21\x12\x00\x10\x00\x05\xd1\xe5\x52\xaa\xe2\x00\x2e\xea\x04\
-\x66\x64\x97\x32\x92\x2a\x52\xf6\xa5\xdf\x36\x7d\x90\x24\x7d\x16\
-\xce\x48\x6d\x0d\x20\x3f\xaa\xf6\x59\x63\x01\x88\x4f\x82\xd2\x85\
-\x2f\x90\x24\xe9\xbb\x0d\xbb\x58\x0a\x07\x83\x32\x65\x0f\x00\x00\
-\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x01\x26\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x00\xd8\x49\x44\x41\x54\x78\x9c\xed\
-\xd2\xb1\x4d\xc3\x50\x18\x46\xd1\x1f\x86\xf0\x26\x2c\x92\x15\x52\
-\x20\x1a\x86\xa1\x89\xb2\x44\x16\x61\x8b\x54\x6c\x61\x0a\x2c\xa5\
-\x88\x68\x7d\x22\xe5\x1e\xc9\xd2\x73\xf5\x3e\x5f\x79\x26\xc9\x33\
-\x7b\x51\x17\xbf\xbd\x7f\x1d\x66\xe6\xb4\xbd\x7e\x7c\x9f\x3f\x2f\
-\x62\xc7\xab\xb8\x74\x73\x5a\x67\x96\x75\x66\x99\x5b\x88\xdd\xb1\
-\x00\xdb\x87\xdf\x9d\xf7\x26\xff\x80\x87\x50\x00\x3d\x40\x2b\x80\
-\x1e\xa0\x15\x40\x0f\xd0\x0a\xa0\x07\x68\x05\xd0\x03\xb4\x02\xe8\
-\x01\x5a\x01\xf4\x00\xad\x00\x7a\x80\x56\x00\x3d\x40\x2b\x80\x1e\
-\xa0\x15\x40\x0f\xd0\x0a\xa0\x07\x68\x05\xd0\x03\xb4\x02\xe8\x01\
-\x5a\x01\xf4\x00\xad\x00\x7a\x80\x56\x00\x3d\x40\x2b\x80\x1e\xa0\
-\x15\x40\x0f\xd0\x0a\xa0\x07\x68\x05\xd0\x03\xb4\x02\xe8\x01\x5a\
-\x01\xf4\x00\xad\x00\x7a\x80\x56\x00\x3d\x40\x93\x01\x7e\xfe\x39\
-\xef\x0a\x06\x58\x8f\x33\x73\xfd\x7b\xd6\xa3\xdb\x91\xe4\x99\xfd\
-\x02\xc9\x6e\x11\x4a\x9d\x22\x1c\x0a\x00\x00\x00\x00\x49\x45\x4e\
-\x44\xae\x42\x60\x82\
-\x00\x00\x03\x5c\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x03\x0e\x49\x44\x41\x54\x78\x9c\xed\
-\xd5\x4b\x6c\x54\x75\x14\xc7\xf1\xef\xb9\x53\xa6\xda\x81\xd0\xd0\
-\x98\x50\x4d\x4a\x64\x63\x52\x36\xc0\x4c\xc7\x47\xa2\xa9\xcf\xa4\
-\x16\x24\x2c\x70\x41\x04\x4b\x02\x33\x03\xed\x80\x62\xe2\xc2\xc4\
-\x4c\xba\x33\xf1\x51\x3b\x03\xa5\x0f\x89\x04\x16\x18\x0a\x29\x31\
-\x60\xdd\x98\x58\x92\x52\x18\xda\x59\xb2\x00\xa2\x1b\x83\x84\xd0\
-\x0a\x49\x83\x9d\xda\xce\x71\x51\xa3\xd3\x6b\x25\xd8\x7b\x67\xba\
-\xe0\x7c\x96\xff\x73\xef\x6f\x7e\xf7\xcc\x0b\x8c\x31\xc6\x18\x63\
-\x8c\x31\xc6\x18\x63\x8c\x31\xc6\x18\xf3\xa8\x10\xaf\x01\xcf\xc6\
-\xd3\xf5\xb3\xca\x71\x84\xa7\x50\xbe\x18\xed\x4d\x7e\x06\xa2\x7e\
-\x94\x5b\x48\x34\xd1\xb9\xb5\xa0\xf2\x29\x00\x05\x49\x8e\xf6\x25\
-\x07\xbd\xe4\x79\x5e\x40\x24\x9e\x19\x02\x7d\xe9\xef\x03\xe5\xc4\
-\xfd\xdf\xc6\x77\x5f\xed\x6f\x9f\xf6\x9a\x3d\x9f\x4a\x38\x9e\xf9\
-\x50\xe0\x93\xa2\xc3\x7b\xaa\x95\x4f\x8c\xf5\xc6\xff\x58\x6c\xaa\
-\xe3\x43\xb1\xf9\x19\xc2\x8e\xaa\x55\x35\xdf\xaf\x6f\xe9\xa8\xf6\
-\x9e\x3d\xa7\x31\x95\xaa\x88\xc4\xd3\x5d\xae\x87\x9f\x7b\x35\x8f\
-\xbc\x2f\x40\x74\xaf\xc0\x6d\xd7\xe9\xcb\x81\xca\xc0\xf0\x86\xd6\
-\x43\x6b\xbc\xc6\xd7\xef\x3b\xbc\x7c\xf2\x56\xcd\x59\x90\x84\x6b\
-\x94\x17\x78\xc7\xcb\xbb\x0f\x3e\x6c\x10\x20\xba\x3b\xf3\x74\x21\
-\xa0\x83\xc0\x33\xae\xd1\x2d\x55\xa7\x79\xac\xb7\x2d\xb7\x98\xdc\
-\x70\xac\xa3\x56\x24\x70\x0e\xd8\xe8\x1a\x4d\x20\xf2\xd6\x68\x77\
-\x72\x78\x31\xb9\xc5\x7c\xf8\x0a\x40\xf6\xab\xe4\xcf\xcb\x66\x66\
-\x5e\x00\xb9\xe0\x1a\xad\x16\x29\x5c\x08\xc7\xd2\xcd\xff\x37\xb3\
-\x61\xcf\xa1\x75\x22\x81\x4b\xfc\xeb\xe1\xe5\x27\xa7\xe0\x3c\xef\
-\xc7\xc3\x83\x4f\x0b\x00\x18\x39\x7a\x70\xe2\x6e\x50\xdf\x00\x4e\
-\xba\x46\x21\x11\xbe\x0d\xc7\xd2\x7b\x1f\x36\x6b\x63\x22\xf3\x8a\
-\x3a\x85\x61\xa0\x6e\xfe\x44\x2e\xcf\x4e\xeb\x73\xd9\xbe\xb6\x6b\
-\x9e\x0b\xff\x25\xe0\x57\x10\xc0\x44\x76\x70\xf6\xe6\xa6\xe8\x40\
-\xed\x64\x28\x28\xf0\x62\xd1\x48\x44\x68\x7e\x32\xd2\x14\xba\xb9\
-\x29\xfa\x03\x43\x43\xff\xf9\x37\x19\x89\xa7\x77\x0a\x9c\x02\xaa\
-\x8a\xcf\x15\x19\x40\x83\x5b\x72\x47\x5b\xef\xf9\xd9\xd9\x97\xdf\
-\x80\x85\x44\x62\x9d\x31\x44\xba\x70\x2d\x59\xe1\xd4\x8a\xfc\x8a\
-\x77\x7f\x3c\xb6\x6b\x6a\xfe\x1d\x2a\x0d\xf1\xcc\xc7\x0a\xed\xee\
-\x2c\x45\x3b\xd7\x4e\xd4\x7e\xd0\xdf\xff\xf6\xac\xdf\x3d\x4b\xb6\
-\x00\x80\xc8\x9e\x4c\x13\x8e\xf6\x03\x21\xd7\x68\xd8\xa9\x70\xb6\
-\x64\x0f\xb7\x8d\x03\xd4\x6f\x4b\x05\x1f\x5f\x55\xd3\x23\xd0\xe2\
-\xba\x4e\x05\x79\xff\x4a\x4f\xb2\xb3\x54\x1d\x4b\xba\x00\x80\x48\
-\x22\xbd\x01\xe5\x3c\x50\x5b\x7c\xae\x70\x1d\xa5\x09\x2a\xef\x88\
-\x93\x3f\x8d\xf2\x9a\xeb\xd6\x29\x47\x74\x7b\xb6\xfb\xc0\x40\x29\
-\xfb\x95\x7c\x01\x00\xe1\xd8\x97\x75\x22\xce\x77\xc0\xba\x87\xbc\
-\xe5\x4e\xc1\x61\x73\xee\xc8\xfe\x4b\xa5\xec\x05\x65\x5a\x00\x40\
-\x38\xd6\xb3\x52\x24\x7f\x06\x78\xf5\x41\xd7\x29\x5c\xd7\x40\xe0\
-\xcd\x5c\x57\xeb\x8d\x72\xf4\xf2\xf5\x5f\xe0\x41\x7e\x1d\x3b\x97\
-\xaf\x5e\x1b\xfd\x26\x58\x15\xaa\x03\xd6\x2f\x78\x91\x70\x11\x9d\
-\x7e\x3d\xd7\xfd\xde\x2f\xe5\xea\x55\xb6\x4f\xc0\x3f\x54\x22\x89\
-\x74\x0a\x95\x94\x6b\x70\x7a\x59\xd5\xcc\xce\x91\x8e\x83\xbf\x97\
-\xb3\xcd\x12\x2c\x60\x4e\x43\x22\xdd\xa7\xca\x2e\x40\x81\xcf\x47\
-\x57\x8f\x7f\x44\x7b\x7b\x61\xa9\xfa\x2c\x89\xc6\x54\xaa\xa2\xb1\
-\xe5\xeb\xc7\x96\xba\x87\x31\xc6\x18\x63\x8c\x31\xc6\x18\x63\x8c\
-\x31\xc6\x18\xf3\x88\xf8\x13\xba\x50\xdf\xc1\x6b\x55\xb9\xde\x00\
-\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x00\xc4\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x00\x76\x49\x44\x41\x54\x78\x9c\xed\
-\xd0\xc1\x0d\x82\x40\x14\x04\xd0\x59\x8b\x30\x36\x62\x23\xb6\xc0\
-\xc1\x70\xb2\x17\x2f\x84\x46\xa8\x82\x42\x88\x4d\xac\x57\x43\xf6\
-\x0a\x24\xf2\xde\x71\xf2\x0f\xf3\x27\x01\x00\x00\x00\x00\x00\x00\
-\xce\xa0\xac\x83\xfb\xf3\xfd\x48\x32\xd4\xe4\x7a\x40\x9f\x2d\x2d\
-\x49\xed\xe6\xf1\x35\xfd\x86\x97\xc6\xe1\x3f\x3e\x9f\x24\xb7\xa4\
-\x0c\xeb\xb0\x35\xc0\xa9\xb4\x06\xe8\x4b\xf2\xd9\xbd\xc9\xf6\x96\
-\xa4\xf6\x47\x97\x00\x00\x00\x00\x00\x00\x00\x00\xf6\xf7\x05\x16\
-\xa6\x0e\x08\x70\x11\x84\x99\x00\x00\x00\x00\x49\x45\x4e\x44\xae\
-\x42\x60\x82\
-\x00\x00\x00\xd6\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x00\x88\x49\x44\x41\x54\x78\x9c\xed\
-\xd7\xb1\x0d\xc2\x40\x10\x04\xc0\x7d\x8a\x40\x14\x44\x05\x88\x0e\
-\x20\x71\x45\x4e\x68\x81\x94\xc4\x0d\x59\x34\xf1\xa4\xc8\x2f\x42\
-\xeb\x91\x3d\x13\xae\x2e\xd8\xbb\xec\x12\x00\x00\x00\x00\x00\xf6\
-\xa3\x2c\x83\xf3\xf5\x7e\x29\x35\x63\x92\x63\x87\x3e\xab\x29\xc9\
-\x5c\x93\xdb\xf4\x7c\xbc\xbe\xf3\x43\x33\xb8\xc1\xe5\x93\xa4\x26\
-\xa7\x24\xe3\x32\x6f\x0e\xb0\x37\xcd\x01\x6a\xc9\x90\xe4\xdd\xa1\
-\xcb\xaa\x4a\x32\x27\x19\x7a\xf7\x00\x00\xfe\x87\x5f\xa0\x19\xdc\
-\xe0\xf2\x89\x5f\xe0\x27\xbf\x00\x00\x00\x00\x00\x00\x00\x3b\xf1\
-\x01\xd7\x53\x1e\x0f\x14\xfc\xaf\x10\x00\x00\x00\x00\x49\x45\x4e\
-\x44\xae\x42\x60\x82\
-\x00\x00\x02\xc4\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x02\x76\x49\x44\x41\x54\x78\x9c\xed\
-\x9a\x3d\x6f\xd3\x40\x1c\x87\x9f\x4b\xa8\xca\x02\x4b\x78\x59\x6a\
-\xe7\xfc\x39\xf8\x12\x2c\x54\x0d\x2d\xac\x74\x60\x65\x63\xe5\x1b\
-\x80\xc4\xca\x4b\x0b\x82\x01\xf1\x3d\xbc\x31\x66\x70\xed\x66\x43\
-\x48\x48\x2c\xa8\x52\x7b\x2c\x11\x32\x87\x9d\x36\xf6\xdd\xf9\xce\
-\xf1\x6f\xb3\xfd\xcf\x4f\xf7\x3c\x8a\x9d\xe8\x64\x18\x32\x64\xc8\
-\x26\x47\x74\xbd\x00\xdb\xc9\x8a\xe2\xbe\x50\xe2\x05\xf0\x73\x3c\
-\xe2\x30\x8a\xa2\x6f\xe5\xeb\xd7\x3a\x5a\x97\x93\x64\x45\xb1\x27\
-\x94\x38\x02\x46\x00\xe7\x17\xbc\x06\xee\x95\x67\x46\x5d\x2c\xcc\
-\x45\x74\xf8\x65\x6e\xea\x73\xbd\x14\x50\x03\x7f\xae\x84\x7a\xae\
-\xcf\xf6\xee\x16\xa8\x83\x17\x88\x99\x8c\xa3\xaf\xfa\x7c\xaf\x1e\
-\x82\xab\xe0\xa7\xd3\x9d\xcf\x55\x9f\xe9\x8d\x80\x26\xf0\xd0\x13\
-\x01\x4d\xe1\xa1\x07\x02\xda\xc0\x43\xe0\x02\xda\xc2\x43\xc0\x02\
-\x4c\xc0\x43\xa0\x02\x4c\xc1\x43\x80\x02\x4c\xc2\x43\x60\x02\x4c\
-\xc3\x43\x40\x02\x6c\xc0\x43\x20\x02\x6c\xc1\x43\x00\x02\x6c\xc2\
-\x83\xe7\x02\x6c\xc3\x83\xc7\x02\x5c\xc0\x83\xa7\x02\x5c\xc1\x83\
-\x87\x02\x4c\xc3\xe7\xf9\xe2\x81\x52\xea\xd5\xf2\xf0\x89\x94\xd1\
-\x97\xf2\x75\xaf\x04\x98\x86\xff\xaf\x4f\xf1\x5d\xca\xe8\x4e\x79\
-\xc6\x9b\x2d\x31\xeb\xf0\x35\xf1\x42\x80\x23\xf8\x0b\x21\xc4\x53\
-\x7d\xb6\x73\x01\xae\xe0\x51\x3c\x9e\x4e\x77\x3e\xe9\xf3\x9d\x3e\
-\x03\x5c\xc2\x4b\x19\x1d\x55\x7d\xa6\x33\x01\x3e\xc0\x43\x47\x02\
-\x7c\x81\x87\x0e\x04\xf8\x04\x0f\x8e\x05\xf8\x06\x0f\x0e\x05\xf8\
-\x08\x0f\x8e\x04\x38\x84\x7f\x24\x65\x74\xbc\x4e\x97\x75\x01\x3e\
-\xc3\x83\x65\x01\xbe\xc3\x83\x45\x01\x21\xc0\x83\x25\x01\xa1\xc0\
-\x83\x05\x01\x21\xc1\x83\x61\x01\xa1\xc1\x83\x41\x01\x21\xc2\x83\
-\x21\x01\xa1\xc2\x83\x01\x01\xae\xe0\x95\x50\x07\x49\x1c\x7f\x58\
-\xb7\x2f\xcf\x17\xbb\x4a\xa9\x97\xcb\x43\xb3\x7b\x82\xfe\xc3\x9f\
-\x1e\x28\x78\xf3\xb7\xcf\xe4\x9e\x60\x70\xf0\x35\x69\x24\xc0\x77\
-\xf8\x93\x93\xd3\xfd\x0a\x78\x33\x7b\x82\x21\xc0\x23\x78\xab\xf7\
-\x19\xd9\x13\x0c\x19\xbe\xf5\x9e\x60\x00\xf0\x0f\x11\xbc\xd3\xfb\
-\x2e\xfb\xe9\xbc\x92\x80\xbe\xc2\xc3\x15\x04\x38\x84\xdf\x4f\xe2\
-\xf8\xe3\xba\x7d\x6d\xe0\xe1\x12\x01\x7d\x87\x87\x15\x02\x7c\x87\
-\xcf\x8a\x62\x26\x94\x78\x5f\xd1\xb7\xd6\x6d\x54\x29\x60\x53\xe0\
-\x01\xc6\xfa\x89\x3c\x5f\xec\x02\xc7\x18\x82\xaf\xe9\x6b\x0c\xbf\
-\xa2\xaf\xd1\x03\xf4\x9f\x6f\x40\x9a\xa6\x5b\xb7\x6e\xdf\xfd\x01\
-\xdc\x28\x9d\x6e\x0c\x5f\xd3\xd7\x18\xde\x74\x1f\x68\xff\x04\x27\
-\x93\xc9\x18\xd8\x2e\x9d\x6a\xf5\x5a\x4a\x45\x5f\xab\xc5\x9a\xee\
-\x03\x4d\x40\x92\x24\xbf\x05\x3c\x03\xce\x80\x5f\x02\xb1\xd7\xe6\
-\x9d\x9c\x8a\xbe\x59\x9b\xc5\x9a\xee\xab\xcd\x7c\x3e\xdf\x4e\xd3\
-\x74\xcb\xd7\xbe\x2c\xcb\xae\x9b\xec\x1b\x32\x64\x83\xf3\x07\x17\
-\xa8\x1d\x6f\x59\x60\x0c\x9b\x00\x00\x00\x00\x49\x45\x4e\x44\xae\
-\x42\x60\x82\
-\x00\x00\x0a\xf4\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x0a\xa6\x49\x44\x41\x54\x78\x9c\xed\
-\x5b\x7b\x70\x54\xd5\x19\xff\x7d\xf7\xee\x6e\x60\x93\x08\x64\x11\
-\x83\xd2\x91\xd8\x96\xd1\x58\x98\x21\xbb\x0b\x52\x35\x22\xda\xd1\
-\x5a\xc5\x07\xae\xf5\x31\x28\x51\xd8\x4d\x80\x2c\xc2\x54\x5b\x9d\
-\xa9\x4b\xac\x76\xb4\x6a\x08\xbb\x60\xdc\x08\x18\x41\xa6\xad\x99\
-\x51\xa7\x3a\x8a\x4c\xb5\xa1\xd4\x22\x64\x03\x96\xfa\xc0\xf1\x11\
-\x1f\x34\x90\x4a\xc2\x23\x12\xb2\xd9\xdd\xf3\xf5\x8f\x20\xdc\x7b\
-\xf7\xee\xbd\x77\x93\x5d\xa6\xd3\xf2\xfb\x6f\xbf\xf3\x3b\xdf\xf9\
-\x9d\xef\x9e\x3d\xf7\x3c\xbe\x0b\x9c\xc6\x69\x9c\xc6\xff\x33\xe8\
-\x54\x34\x32\xb5\x2a\x7c\xa6\x5c\x40\x95\x80\x98\x0c\xa6\xf3\x41\
-\x38\x8f\x19\xa3\x09\x38\x03\x80\x0c\xd0\x11\x00\x47\xc0\xfc\x15\
-\x08\x1f\x01\xf8\x50\x4a\xd1\xd6\x1d\x6b\x6a\x3b\xf2\xad\x2d\x6f\
-\x01\x70\xfb\xc3\xdf\x97\x08\xf3\x98\x31\x1b\x84\x29\x43\x74\xd3\
-\xc1\xe0\x37\x24\xc1\xcd\x6d\xcf\x2e\x89\x01\xc4\x39\x15\x89\x9c\
-\x07\x80\xc9\x1b\x08\x5f\xc5\xa0\xfb\x01\x5c\x9e\x5b\xdf\x78\x9f\
-\x40\xf5\x82\x1d\x2f\xb4\x37\x05\x12\xb9\x72\x9a\xb3\x00\xb8\xfd\
-\x2b\x2f\x27\xa2\xdf\x01\xf0\xe4\xca\xa7\x1e\x18\xf8\x02\xcc\xcb\
-\xdb\x9b\x82\xeb\x73\x31\x22\x86\x1d\x80\xe9\xf3\x1b\xce\x4a\xca\
-\xd2\x53\x04\xdc\x61\x40\x13\x04\xbc\x03\xe2\x56\x21\xa4\x3d\x40\
-\xea\x33\x1b\x51\x8f\x90\x6d\xbd\xc9\x63\xa9\x94\x3c\x22\x59\x0c\
-\xb6\x8d\x22\x46\x99\x60\x9a\x44\xe0\x19\x20\xfc\x04\xc0\x48\x03\
-\xe1\x5b\x21\xa4\x9a\xb6\x67\x17\x7f\x30\x1c\xfd\xc3\x0a\x80\xa7\
-\x3a\x3c\x0d\x8c\x57\x00\x8c\xd7\x29\xee\x05\xf0\x3a\x11\x5e\x25\
-\x59\xda\xb4\x63\xf5\xe2\xee\x6c\x7c\xcf\x58\x5a\x3f\x72\xe0\xa8\
-\x6d\x16\x01\xd7\x81\x30\x3b\x43\x1b\xfd\x00\xee\x8e\x45\x83\xbf\
-\xcf\x5e\xfd\x20\x86\x1c\x00\xb7\x3f\x72\x3b\x11\xaf\x03\x50\x90\
-\x26\x8a\x39\x1c\x97\xed\x8f\xfd\xb3\x71\xe1\xc1\xa1\xfa\x57\xa2\
-\xdc\x17\x72\x38\xc7\x94\x2c\x20\xa2\x87\x18\x18\x97\x46\x60\x7a\
-\x34\x36\xfe\xc0\x43\xa8\xab\x13\xd9\xfa\xce\x3e\x00\xa1\x90\xe4\
-\xde\x3f\xf6\x11\x02\x3f\xa0\x29\x11\x44\x58\x27\x25\x51\xb7\x7d\
-\x4d\x70\x6f\xd6\x7e\x2d\xe0\xe2\xbb\x1f\x2f\x8e\xdb\x9c\xcb\x40\
-\xfc\x0b\x00\x45\x9a\xe2\x57\xfa\x64\x79\xee\x87\x4f\x2f\xfa\x36\
-\x1b\x9f\xd9\x05\x20\x14\x92\x3c\xfb\xc6\x6e\x04\xf1\xad\x2a\x3b\
-\xa3\x13\x12\x6e\x8c\x3d\x13\xdc\x91\x95\xbf\x21\x62\xfa\xfc\xf0\
-\x84\x94\x8c\x97\x91\x3e\xe1\xee\x92\x1d\x98\xb9\x3d\x12\x3c\x62\
-\xd5\x97\x94\x4d\xc3\xde\xae\x92\xe5\xda\xce\x13\xf0\x2e\x23\xe5\
-\x39\x55\x9d\x07\x80\xed\x6b\x82\x7b\xed\xce\x64\x25\x03\x1b\x35\
-\x45\x53\xc5\x00\x6f\xf4\xf9\x5e\x94\xad\xfa\xb2\x4c\xf4\x06\x22\
-\x3f\x67\x20\xa2\xb4\x11\xd1\xf3\x85\xf1\x62\xdf\xb6\xb5\x35\x87\
-\xac\xfa\xc9\x15\xf6\xbe\xfb\x66\x72\x5f\xfb\xeb\x2f\x9f\xed\x6d\
-\xeb\x03\x70\x25\x4e\x8c\x66\x9a\x74\x68\x44\xef\x88\xce\xf6\x4d\
-\x7f\xb6\xe2\xc7\xd2\x5f\x60\x5a\x20\xe2\x11\xe0\xad\x00\x46\x9c\
-\xb4\xf2\x0b\xb1\x68\xf0\xce\x7c\xac\xce\xb2\x85\xc7\x1f\xbe\x17\
-\x84\x15\x1a\xf3\x5d\xb1\x68\x70\xbd\x59\x5d\xd3\x00\x4c\x5b\xb4\
-\xca\x95\x4a\xf2\x3f\x08\x7c\x8e\xc2\xbc\xa3\x28\x5e\x7c\x59\x6b\
-\x73\x55\x7f\x36\x42\x2b\x16\xae\xb8\x40\x4a\xca\x37\x1e\x5f\x1a\
-\x4f\x00\x63\x02\x88\x52\x00\xf6\x12\x89\xbd\x42\xd0\x4e\x59\xd0\
-\x4b\xd9\xef\x01\x98\x3c\x81\xf0\x5a\x80\xaa\x14\xc6\x01\x66\x69\
-\x46\x7b\xd3\xe2\x9d\x46\x35\x4d\x03\xe0\xf1\x87\xd7\x82\x70\xf7\
-\xc9\xb6\xd0\x99\x72\x90\x77\xd7\xaa\xda\x4e\x2b\xd2\xca\x7d\x21\
-\x47\x61\xc9\xd8\x1a\x06\x57\x03\x38\xdf\x4a\x1d\x00\xbb\x88\x10\
-\x9e\xd8\x5d\xba\xa1\xa5\xe5\x96\x94\x95\x0a\x3f\xa8\x0d\x17\x8c\
-\x4e\xe0\x6d\x30\x7e\xac\x30\xef\x2c\x2a\xed\x9e\xde\x5a\x57\x97\
-\xcc\x54\xcf\x70\x12\x74\xfb\x1b\x2e\x51\x75\x1e\x60\x21\x63\x8e\
-\xd5\xce\xbb\xfd\x91\x1b\x9c\x63\x5c\x1f\x30\xb8\x01\xd6\x3b\x0f\
-\x00\x53\x99\xf1\x5c\x47\x49\x57\xac\xa2\x3a\x32\xcb\x4a\x85\x4f\
-\x23\xc1\xb8\x9c\x14\x37\x01\x38\xa0\x30\x57\xf4\xee\x73\x2d\x34\
-\xaa\x67\x30\x02\x98\x3c\x81\xc8\x5f\x01\x5c\xa2\xb0\xbd\x10\x8b\
-\x2e\x99\x6b\x26\xc6\xed\x8f\xda\x41\xfd\x0d\x04\x32\x6c\xdc\x32\
-\x88\xeb\x62\x67\xf5\x3c\x6c\x65\xa1\xa3\x33\x1f\x1c\x18\xe8\x8b\
-\x4f\xdc\xbd\xe1\xbe\xa3\x7a\xfc\x8c\x23\xc0\xbb\x20\x52\x09\x55\
-\xe7\x91\x80\x94\x0a\x99\x09\x98\x5c\xf3\xf4\x18\xa2\xf8\x1b\x39\
-\xeb\x3c\x00\x30\x85\x3c\xfb\x5d\x7f\x74\xfb\xa3\x4e\x33\x6a\xd1\
-\x40\xf1\x33\x00\xbe\x52\x98\xc6\xda\x9d\x8e\x40\x26\x7e\xc6\x00\
-\xb0\x84\xfb\xd4\x06\x44\x63\x8d\xcb\x3e\x37\x6a\xbc\xdc\x17\x72\
-\x14\x88\xd4\x2b\x00\xae\x30\x13\x3a\x04\xdc\x4c\xe8\x5f\x8f\x50\
-\xc8\xf0\x6f\xdb\xda\x5c\xd5\x4f\x04\xcd\x83\x92\x96\x65\x5a\x1b\
-\xe8\x3a\xf3\x2e\x5c\x5d\x0a\xe0\x6a\x85\x29\x21\x0b\xf1\x88\xb1\
-\x3e\xa6\x42\x97\x6b\x35\xc0\x95\xc6\xbc\x61\x80\x68\x8e\x7b\xbf\
-\xcb\x74\x14\x4e\xec\x2e\xdd\xc0\xc0\x27\x27\xaa\x81\xcf\xf9\xcc\
-\xd5\x75\xa5\x1e\x57\x37\x00\x22\x95\xbc\x1d\x8a\x45\x12\x01\x6f\
-\x6f\x5f\x73\x6f\x97\x51\xa3\xde\xc0\xaa\x3b\x98\x31\xdf\x4c\xdc\
-\x70\x41\xc0\x43\x9e\x05\x61\xdd\xce\x7c\x87\x96\x96\x5b\x52\x44\
-\x68\x51\xda\x24\xe6\xbb\xf4\xb8\xba\x01\x20\xd0\x75\x1a\xcb\x9f\
-\x8c\x1a\x74\xfb\xa3\x4e\x01\x3c\x66\xc4\xc9\x29\x24\xd4\x9b\x2d\
-\x77\x59\x08\xad\xe6\x6b\xf4\xea\xa4\x05\x60\xca\xdc\x27\x0a\x01\
-\xd5\xbb\x14\x82\x53\xaf\x19\x0a\xa2\xf8\x32\xcd\x42\x29\xdf\x98\
-\xdc\x51\xd2\x35\xcf\x88\xd0\x3e\xfe\x60\x1b\x00\xe5\xa8\x1d\xd5\
-\xe1\xda\xef\xd6\xf2\xd2\x02\x50\xe0\x74\x5c\x04\xc0\x71\xd2\x42\
-\xef\xb5\x37\xdd\xfb\x95\x96\xf7\x1d\x7c\xbe\x17\x65\x22\x04\xcd\
-\x35\xe7\x1a\xbc\xc4\xb0\xb8\xae\x4e\x00\xac\x7a\x70\xcc\xe9\xe7\
-\x94\x3a\x7f\x01\xe9\x47\x1a\xc3\x56\xa3\x76\x3a\x5c\x5d\x97\x82\
-\x71\xa6\xa1\x98\xfc\x60\xf2\xf4\xc0\xca\x1f\x1a\x11\x98\xd5\xda\
-\x89\x71\xa1\x96\x93\x16\x00\x66\xbe\x40\xf5\x1b\xe2\x13\x2d\x47\
-\x53\xe1\x66\xc3\xf2\x3c\x22\xc9\xd2\x1c\xa3\x72\x89\xa1\xd6\x4e\
-\xb8\x20\x8d\xa3\x35\x10\x61\xa2\xca\xc0\x64\xf8\xee\x07\x28\xaf\
-\xa7\xc0\x86\x2d\x13\xa7\xfd\xa7\x55\xb0\xdb\xb4\xda\xcb\xb4\x94\
-\xf4\x11\x40\x28\x56\x35\x22\x91\xc9\x5e\xff\x94\x4e\x7e\x2a\x10\
-\x30\xc1\xa8\xbc\xb0\xcf\xa9\xd5\x5e\xac\xe5\xa4\xcf\x01\xac\x26\
-\x49\xcc\x99\xcf\xd8\x06\x57\x65\x7a\xa7\xb5\xa7\x04\x6c\x12\x80\
-\xd6\xe6\x79\x71\x00\xca\x9d\xa0\xa3\xdc\x17\x72\x28\x39\x7a\xeb\
-\x00\xd5\x06\x29\x29\x89\x8c\x07\x1e\x33\x07\xeb\x67\x75\xac\x96\
-\x63\xd8\x87\xeb\x40\x4f\x7c\xaf\x8a\xc0\x72\xda\xb0\xf9\x0e\xc7\
-\xf7\xd9\x86\x2b\xc4\xbc\x82\x61\x78\xfa\x3c\x73\x5e\x73\x01\x00\
-\x9b\xc2\x34\xf0\x61\x4b\xdd\x80\x92\x93\x3e\x09\x02\xaa\x13\x55\
-\x16\x3c\xda\x44\xc4\xbf\x4c\x85\xe6\x0b\x64\x1c\x80\x63\xb6\xc3\
-\xa3\x34\xa6\x5e\x2d\x27\x7d\x12\x04\x7d\xa9\x6a\x43\x4a\x9f\x39\
-\xd5\xe5\xf4\xbe\x51\x79\x5e\xc1\xc6\x6d\xb3\x6c\x3b\x4f\x6d\xc0\
-\x17\x5a\x8e\xce\x24\xc8\x1f\x29\x7f\x12\x60\xbc\xd8\x20\xbc\x64\
-\x54\x9e\x4f\x30\xc8\xb0\x6d\x01\xa1\xd2\xce\x84\x3d\x5a\x4e\x7a\
-\x00\x48\x52\x5d\x36\x32\xab\x0e\x45\xd2\x50\x74\xac\x68\x33\x80\
-\xac\x6e\x63\x72\x02\xc6\x97\xed\x4d\x8b\x76\x19\x53\x34\xda\x75\
-\x46\x4c\x5a\x00\xfa\x64\xda\x06\x40\x79\xff\x5e\x31\x7d\x7e\x38\
-\xe3\xeb\xa6\xb5\xb9\xaa\x1f\x8c\x66\x33\xbd\x79\x40\x93\xe1\x91\
-\x7c\x28\x24\x11\x70\xad\xd2\xc4\x32\xb7\x6a\x69\x69\x01\x18\xbc\
-\x5b\xa3\x6d\x4a\x5b\x52\xa6\x6b\xb5\x3c\x25\x52\x09\x3c\x0c\xe0\
-\xb0\x89\xe0\x5c\xe2\x6b\x7b\x61\x52\x7b\x0f\xa0\x82\xb7\x73\x8c\
-\x1b\xea\x35\xca\x91\x33\xc6\x75\xc7\xb4\x3c\xfd\x77\x38\xab\x77\
-\x51\x44\x3c\xdb\xa8\xb1\x5d\xcf\x05\xbf\x21\xb0\xc9\x89\x51\xee\
-\x40\xa0\x07\xb7\xad\x58\x76\xcc\x90\x24\x49\x2a\xcd\x0c\x6c\xd2\
-\x3b\x1e\xd7\x0d\x40\xca\x41\x1b\x01\x9c\x3c\x81\x65\xcc\x9a\x5a\
-\x15\x36\xdc\xf1\x15\x96\xf6\x34\x10\xf0\xa6\xa1\xa8\x5c\x80\xb1\
-\xa1\x2d\xba\x58\x7b\x27\xa8\x46\x28\x24\x31\xa0\xda\xa4\x11\xf8\
-\x79\x3d\xaa\x6e\x00\x8e\x9f\xfb\x6f\x56\x98\x0a\x64\x7b\xda\x75\
-\xb8\x0a\xad\x75\x75\xc9\x44\x3c\x75\x2b\x80\x8f\x0d\xc5\x0d\x03\
-\x04\xbc\x5b\x34\x50\xec\x37\xbb\x8e\xf3\x76\xb9\x6e\x83\xfa\x1e\
-\x62\x7f\x51\x69\xcf\x66\x3d\x6e\xc6\x65\x2c\x81\x9f\x54\x1b\x68\
-\xd1\xd4\x45\xab\xce\x35\x6a\xf8\xbd\xe6\xa5\x87\x20\x25\xaf\x41\
-\x7e\x82\x10\x93\x52\xe2\x06\xb3\xeb\xb8\x72\x5f\xc8\xc1\x8c\xdf\
-\xa8\x8c\x44\x2b\x32\xdd\x0e\x65\x0c\x40\x5b\x34\xf8\x36\x00\xe5\
-\x64\xe8\x90\x92\x62\xb9\xa9\xca\xc6\x65\x9f\x27\xe3\xa9\x8b\xa0\
-\x1e\x41\xc3\x03\xd3\x1f\xec\xce\x64\xa5\xd9\xc1\x2c\x00\x38\x5d\
-\x2e\x3f\xd4\xdb\xde\x9e\x82\x81\xbe\xc6\x4c\x7c\x83\x8d\x0c\x31\
-\x88\x1e\x54\x59\x80\x3b\x2b\x6a\x56\x1a\xef\xc1\x31\x38\x12\x8a\
-\x4a\xbb\x7f\xc6\xc0\xaf\xa0\xb3\xfc\xcc\x02\x07\x18\x54\x13\x6b\
-\x5a\x7c\xbb\xe9\xa4\x07\xc0\xed\x7f\x72\x2c\x31\x7e\xad\xb4\x31\
-\xe3\xb7\xef\xac\xfb\x65\x46\x0d\x56\x2e\x47\xd7\x83\xa0\xbc\x0e\
-\xfb\x5a\x4e\x09\xaf\x95\xa7\x01\x00\x53\xaa\x1b\xc7\x15\x20\xb1\
-\x9c\x19\x77\x01\x30\xbd\xd9\x39\x8e\xc3\x44\xdc\x28\xc4\x88\xc7\
-\xda\x9b\x02\x96\x5e\xaf\xe5\xbe\x90\xc3\xe9\x72\x6d\x06\xe3\xb2\
-\x13\x46\xc6\x6e\x46\x81\xc7\x28\xaf\xd0\x34\x00\x53\xaa\x1b\xc7\
-\x39\x38\xb1\x1b\xc0\x59\x8a\x5a\x7f\x3f\x64\xc7\xac\x4f\x23\xc1\
-\xb8\x15\x71\xc0\xe0\xd1\xb9\x44\xf1\xab\x41\x3c\x87\x99\x26\x03\
-\x38\x07\x40\xc9\x71\x7f\xdf\x30\xa3\x93\xc0\x3b\x21\xa4\x96\xbe\
-\x43\x07\xde\xd2\xee\xda\xcc\xe0\x09\xac\x6c\x04\xa8\x5a\x61\x4a\
-\x80\x70\x89\x59\xe6\x8a\xa5\x04\x89\x8a\x9a\xf0\x45\x92\x40\x2b\
-\x94\x19\x61\x8c\x75\xb1\xa6\xda\xf9\xc3\x49\x90\x98\xb1\xb4\x7e\
-\xe4\x37\x49\x9b\xc8\x26\x90\x7a\xf0\x06\x22\x0b\x19\xbc\x5a\x6d\
-\xa5\xf9\xb1\x68\xed\x5a\xb3\xba\x96\x93\xa4\x3c\xd5\x2b\xe7\x82\
-\x49\x93\x71\x41\x4d\x7d\x3d\x07\x6a\xb3\x7d\x5a\xb9\x03\x93\xdb\
-\x1f\xa9\xa5\xc1\xdb\x60\xe5\x7c\xd6\x10\x8b\x06\x97\x5a\xf1\x60\
-\x39\x47\xa8\x33\xb6\x69\xf7\xd9\xee\xab\x9d\x20\xba\x58\x61\x76\
-\xdb\x9d\xce\xca\xf1\x15\x57\xbc\xb6\xaf\x7d\x73\x9f\x55\x5f\xb9\
-\x40\xb9\x2f\xe4\x38\xf7\xd2\xdd\x51\x1a\x9c\xa8\x4f\x3c\x48\x02\
-\xde\x2c\x2a\xed\xae\xfa\x62\xcb\x16\x4b\x39\x83\x59\x1d\x67\x95\
-\x1d\x1c\xff\x20\x83\x5e\x56\x19\x19\x97\x81\x1c\x6d\x6e\x7f\x64\
-\x72\x36\xbe\x86\x83\x29\xd5\x8d\xe3\x9c\x25\xae\xb7\x00\xba\x47\
-\x53\xf4\x41\x22\x9e\xba\xd5\x28\x23\x44\x8b\xac\x13\x25\x7d\xbe\
-\x17\xe5\x8e\x31\xfb\x9e\x00\x91\x76\x88\x25\x88\xd0\x18\x87\xfd\
-\xd1\xdd\xcf\xd4\xfc\x3b\x5b\xbf\x56\x30\x63\x69\xfd\xc8\xc4\x51\
-\xdb\x62\x10\x1e\x00\x30\x46\x55\x48\x78\x83\x45\xc1\x6d\x56\xdf\
-\x1a\x27\xab\x0d\x11\x9e\x40\xe4\x1e\x80\x1b\x91\x7e\x30\xf9\x2d\
-\x88\x9f\x92\xed\x54\x9f\x4d\xc2\xa2\x11\x66\x86\x42\xb6\xde\x7d\
-\x25\xf3\x40\xd2\xf2\x0c\x77\x90\xf5\x65\x3d\xa5\xf7\x5b\xcd\x27\
-\x52\x62\x58\xc9\xd2\xde\x40\x43\x25\x43\x7a\x09\x80\x4b\xa7\xf8\
-\x20\x80\x57\x01\xbc\x2a\x3b\xb0\x39\xdb\x60\x94\xfb\x42\x0e\xe7\
-\x68\x57\x25\xc9\xb8\x8e\x05\xae\x07\x41\x6f\x19\x9e\x00\xa8\xc6\
-\xca\x6c\x9f\x09\xc3\x4e\x97\xf7\x2e\x5c\xfd\x3d\x4e\xa5\x1a\x00\
-\xdc\x64\x40\x4b\x80\xb0\x05\x02\x7f\x81\x44\x1f\x4b\xcc\x9f\xb2\
-\x2c\xf7\xf4\x33\x7d\xeb\xb4\x25\x53\x52\x22\x59\x2c\xd8\x36\x2a\
-\xc9\x28\x23\x89\x26\x81\xc5\x0c\x80\xae\xc2\xe0\x27\x35\x99\x94\
-\xb7\x09\xe2\x9a\x9d\x8d\x4b\xda\x87\xa3\x3f\x67\x1f\x4c\x78\x16\
-\x44\x7e\x0a\x89\x1f\x07\x90\xdf\xc9\x70\x30\x2f\xf9\xe1\xb2\xee\
-\xd2\x35\x43\x19\xf2\x5a\xe4\xf6\x93\x99\x50\x48\x9a\xd6\x55\x72\
-\xbd\x00\x3d\x00\x86\x37\xa7\xbe\x41\x9f\x83\x45\x7d\xd1\xc0\x19\
-\x6b\xb3\x4d\xd0\x34\xf4\x9a\x2b\x47\x5a\x78\x17\xac\xba\x50\x48\
-\x3c\x8f\xc0\xb3\x01\x4c\x1a\xa2\x9b\xfd\x60\xbc\x4e\x24\x9e\x6f\
-\x2b\x3d\xf8\xb7\xa1\x7c\x0f\x60\x86\x53\xf2\xd9\xdc\xf1\x79\xe2\
-\x72\x30\x5f\x08\xd0\xf9\x20\x94\x01\x18\x85\xc1\xff\xb8\x8d\x41\
-\x87\x89\x71\x04\xc4\x5f\x13\x61\x8f\x10\xd8\x63\x23\x6c\xd9\x1e\
-\xad\xfd\xe8\xbf\x21\x17\xf9\x34\x4e\xe3\x34\xfe\x77\xf1\x1f\x1c\
-\x6b\xc6\x54\xc2\x9c\x88\xf8\x00\x00\x00\x00\x49\x45\x4e\x44\xae\
-\x42\x60\x82\
-\x00\x00\x00\x9b\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x00\x4d\x49\x44\x41\x54\x58\x85\xed\
-\xd7\xc1\x09\x00\x20\x08\x46\x61\x8b\x46\x72\x80\xb6\x71\x9f\xe6\
-\x09\x5c\xad\x0d\x32\xa5\xe3\x7b\xc7\x1f\x84\xef\xaa\x08\x25\x53\
-\x5b\xae\xb6\xfc\x75\x8f\x1a\x05\xc3\x4c\xee\xd7\x7a\xe5\xe8\x67\
-\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x90\xff\x8c\
-\x9a\xec\xd4\x4e\x41\x07\x39\xb5\x09\xe5\x39\xad\x0d\x4e\x00\x00\
-\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x01\xc7\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x01\x79\x49\x44\x41\x54\x58\x85\xe5\
-\xd6\x31\x4e\xc3\x30\x14\xc6\xf1\xff\xb3\x9b\x72\x03\x3a\x70\x82\
-\x82\x84\xc4\xd4\xb9\xe5\x00\x48\x70\x85\x0e\xb0\x54\xdc\x20\x1c\
-\xa1\x1b\x54\xe2\x12\x88\x05\x09\xa9\x99\x91\x3a\x51\x28\x27\x60\
-\x80\x89\xb9\x21\x35\x43\x15\xa1\xb6\x69\x63\xa7\x4e\x18\xf0\x68\
-\x3f\xf9\xf7\xc9\xb6\x9e\x0c\xff\x7d\x48\x95\x58\xab\xdb\x6f\x24\
-\x5a\xdf\x81\x79\x1f\x0d\x7a\x67\x00\xaa\x52\x5c\xe9\x08\x4c\x0b\
-\x64\x2f\x9d\xaf\x55\x8a\x8b\x69\x62\xe4\x4d\xcf\x92\x93\x74\xad\
-\xf4\x2b\xc8\xc0\xdb\x4f\xb7\x97\x1f\x95\x04\xc8\xc3\x4b\x0d\x60\
-\x83\x97\x16\xc0\x16\x2f\x25\x80\x0b\xee\x3d\x80\x2b\xee\x35\x40\
-\x11\xdc\x5b\x00\x5b\xfc\xf0\xfc\x7a\xb7\x6e\xe2\x07\xe0\x6b\x34\
-\xe8\x75\xc0\x43\x27\x74\xc4\x87\xc0\x11\x50\x4f\xe7\xb7\x0a\x50\
-\x00\x3f\x00\x5e\xa6\x12\x9c\xa6\x6b\x85\xaf\x60\x0b\xfc\xf8\xf9\
-\xe6\xe2\x73\xab\x00\xbe\xf0\x42\x01\x5c\xf0\xc0\xc4\x91\xc0\x3e\
-\xf0\x3a\x95\xa0\xb3\x8c\x3b\x07\xf0\x8d\x3b\x05\x28\x03\x07\xd0\
-\x3e\xf1\x56\xb7\xdf\x10\x31\xd6\x38\x58\x9c\x80\x0b\xfe\xad\xd5\
-\xd0\x05\xcf\x0d\x50\x04\x37\x30\x89\x25\x68\x67\xe1\x4e\x9d\xb0\
-\x24\x7c\xa5\x13\x66\xfe\x09\xcb\xc0\x03\x13\x47\xcc\xaf\x67\xa1\
-\x13\xae\x3c\x42\x17\x3c\x51\x3a\x12\xd9\x8c\x67\x3c\xcc\x85\x66\
-\xa4\xb2\x36\xb5\xc5\x11\xd3\x34\x30\xa9\x25\xb3\xcc\x07\x67\xf3\
-\x30\x25\x6b\x53\x57\xdc\xa6\x6e\xdd\x09\xcd\x4f\x20\x0c\x55\xa2\
-\xd5\x63\xfe\x67\xc2\x48\x52\x53\xf7\x79\xf8\x72\xdd\x3a\xfc\x37\
-\xc0\x7c\xec\x00\xe3\x8d\x3f\x99\xf0\x4a\x8c\xa1\x0e\x8c\xd7\xe3\
-\xab\x75\x36\xfd\x00\xc2\x50\x81\xb1\x68\xcd\x46\xfc\xd6\xfd\xf1\
-\xf8\x01\x9a\x8b\x01\xab\xe8\x4a\xa0\x68\x00\x00\x00\x00\x49\x45\
-\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x02\x2a\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x01\xdc\x49\x44\x41\x54\x58\x85\xed\
-\x95\xbf\x6b\x53\x51\x14\xc7\x3f\xdf\x9b\x68\x4a\x07\xab\x06\x2a\
-\xb5\xab\x2e\x82\x54\x92\x06\x51\xe9\x6c\x8b\x9d\x44\x07\x51\x70\
-\x32\x3f\x14\x2b\xfe\x05\x21\x9b\x93\xc5\x18\x85\x66\xea\xe6\xe2\
-\xa0\xa0\x54\xbb\x05\xec\x52\x1a\xd4\xbf\x40\xa7\xaa\x83\xe2\x24\
-\xb4\x4d\xee\x71\xc8\xb3\xa9\x69\xaa\xcd\x6b\xc4\xe5\x7d\xe0\x0d\
-\xef\xde\x7b\xce\xf9\x70\xee\xbb\xef\x42\x44\x44\x44\xc4\x7f\x46\
-\x61\x03\xcf\xe4\xef\x8f\xae\x5b\xfc\xa5\x60\xac\xb9\x4f\xa3\x6f\
-\x2b\xb7\x57\xc3\xe4\x71\x61\x82\x4e\xe7\x1e\x1c\x5f\xb7\xf8\x1b\
-\xc1\x18\x80\xdb\xb0\xa5\xd4\xcd\x47\xc7\xc2\xe4\xea\xb9\x03\x99\
-\x1b\xb3\xa7\x70\xb1\xd7\x06\xc3\x1d\x53\x5f\x1c\x9c\x5f\x9e\x9b\
-\x79\xdf\x4b\xbe\x9e\x3a\x90\x2a\x94\x27\xcc\xc5\x6a\x06\xc3\x18\
-\x06\x34\x5b\x8f\x0c\x38\xe2\xa1\x96\x2a\x94\x27\xfe\x89\x40\x2a\
-\x5f\x99\x76\x9e\x45\xe0\x80\x81\x21\x7c\x7b\xd6\xbc\x99\x0c\x18\
-\x72\x9e\xc5\x74\xb6\x7c\xa1\xaf\x02\x99\xdc\xc3\x6b\xce\xfc\x33\
-\x60\x00\x30\xb1\xb5\x78\x0b\xc9\x7c\xd0\x95\x01\x89\xe7\x99\x7c\
-\xf9\xea\x6e\x72\xc7\xfe\xb6\x20\x9d\x2d\xcf\x20\xaa\x81\xac\xd1\
-\xa5\x78\xdb\x02\xc3\x10\xc2\x01\x17\x47\xc6\x27\xbf\x7d\xaa\xbf\
-\x5a\x0e\x29\x60\x4a\xe7\x92\x25\x89\x7b\xc1\x80\x0f\x04\xfe\x8c\
-\x30\x13\x08\x24\x34\x75\x34\x33\xa9\xd5\x95\x85\x1a\x94\x76\x58\
-\xde\x8d\x62\xd1\x8d\x7f\x4e\x96\x81\x5b\xb4\xaa\x7a\xed\xa6\xf8\
-\x56\x7d\x4c\x42\x2e\x78\xa9\xac\x8c\x7c\xbd\x43\xa9\xb4\x7d\xeb\
-\x3a\x07\x4e\x5c\x2e\xee\x1f\x3c\x9c\x9c\x07\xae\x00\x98\xf0\xb2\
-\xde\x8a\x6f\x4a\x08\xc9\x36\xbf\xb3\x27\x66\x89\xeb\xf5\x6a\x6e\
-\x63\x47\x81\x74\x76\x6e\x50\x6e\xed\x29\xc6\x14\x06\x26\xf3\x6a\
-\x1d\xb1\xd0\xfc\xd6\x09\xb1\x60\x3e\x71\xa9\x5e\xcd\xfd\xd8\x26\
-\x70\xb2\xf0\xf8\x50\xc2\x1a\x2f\x30\xce\x06\x81\x7b\x2e\xde\x96\
-\x40\x6a\x9f\xb8\xa5\xc6\x5a\x73\xfa\xdd\xfc\xdd\xef\x00\xf1\x5f\
-\x8b\x12\xbe\xf1\x01\x18\x6a\x9b\x29\xd4\x6f\xba\x1b\x1d\xfb\x7c\
-\x2e\x9e\x88\x7f\x04\x0e\x42\xc8\xbb\x60\xef\xf4\xa5\xb1\x11\x11\
-\x11\x11\xfd\xe1\x27\x68\xea\x98\xa0\x5e\x6e\x43\xde\x00\x00\x00\
-\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x01\x47\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x00\xf9\x49\x44\x41\x54\x78\x9c\xed\
-\xd6\x21\x4e\xc4\x50\x14\x85\xe1\x73\x5b\xa6\x04\x04\x0a\x6c\x43\
-\x9a\x54\x92\x20\xd8\x03\x2c\x80\x75\x60\x58\x00\x61\x01\xb3\x09\
-\x3c\x92\x64\x58\x06\xba\x06\x53\x12\x32\x0e\x41\x86\x0e\xf3\x2e\
-\x96\xbc\x07\xb8\xbe\x49\xe8\xff\xc9\x73\x2b\x4e\x8f\x69\x25\x00\
-\x00\x00\x00\x00\x00\x00\x00\x00\x60\x12\xec\xaf\xa3\xbb\x9b\xa4\
-\x32\x53\x97\xb1\x04\x33\x0b\xbf\x1d\x7f\x1c\xa0\xef\xfb\xc3\xe1\
-\x73\x33\x37\xd9\xa5\xa4\xfd\xd1\xaa\xe5\xb1\x92\xf4\x50\x98\x5f\
-\xd5\x75\xfd\x12\x1f\x93\x01\xba\xae\x3b\x98\x55\x7b\x4f\x92\x1f\
-\xe7\x68\x97\x8d\x6b\x19\xc2\xfa\xa4\x69\x9a\xd7\xef\x71\x11\x3f\
-\x57\x55\xbb\xb7\xff\xee\xe5\x25\xc9\x74\x54\x94\xb3\x79\x1c\x27\
-\x03\xb8\x74\x9e\xa7\xd1\x56\x5c\xc4\x41\x32\xc0\xd4\x24\x03\x98\
-\xf4\xb8\x8d\x22\x99\x2c\xe2\x20\x19\x60\x18\x3e\x6e\x24\x7b\xce\
-\x52\x27\x27\xd7\x32\x6c\xd6\xd7\x71\x9c\x0c\xd0\xb6\xed\xdb\x4e\
-\xa9\x33\x97\xdf\x49\x7a\xcf\x52\x6e\x5c\x2b\x49\xf7\x45\xe1\xa7\
-\xf1\x17\x40\xe2\x47\x08\x00\x00\x00\x00\x00\x00\x00\x00\x00\x98\
-\x8a\x2f\xe6\x4f\x38\x6a\x74\xad\x97\x2f\x00\x00\x00\x00\x49\x45\
-\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x00\xef\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x00\xa1\x49\x44\x41\x54\x78\x9c\xed\
-\xd0\x41\x11\x00\x20\x00\xc3\x30\x0e\x4d\x78\xc2\x0f\x86\x41\x46\
-\x78\x34\x06\xd6\xdb\x18\xd0\xda\xe7\xae\x7d\xae\x6c\x98\x72\xfc\
-\x07\x1d\xa0\x03\xb4\x0e\xd0\x01\x5a\x07\xe8\x00\xad\x03\x74\x80\
-\xd6\x01\x3a\x40\xeb\x00\x1d\xa0\x75\x80\x0e\xd0\x3a\x40\x07\x68\
-\x1d\xa0\x03\xb4\x0e\xd0\x01\x5a\x07\xe8\x00\xad\x03\x74\x80\xd6\
-\x01\x3a\x40\xeb\x00\x1d\xa0\x75\x80\x0e\xd0\x3a\x40\x07\x68\x1d\
-\xa0\x03\xb4\x0e\xd0\x01\x5a\x07\xe8\x00\xad\x03\x74\x80\xd6\x01\
-\x3a\x40\xeb\x00\x1d\xa0\x75\x80\x0e\xd0\x3a\x40\x07\x68\x1d\xa0\
-\x03\xb4\x0e\xd0\x01\x5a\x07\xe8\x00\xad\x03\x74\x80\xd6\x01\x3a\
-\x40\xeb\x00\x1d\xa0\x75\x80\x0e\xd0\x1e\x06\x73\x04\xd7\x28\x98\
-\xcd\x67\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x03\x52\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x03\x04\x49\x44\x41\x54\x78\x9c\xed\
-\x9b\xbd\x4f\x14\x51\x14\xc5\xcf\x99\xac\x05\x6c\xa9\x1b\xbe\x7a\
-\x1b\x59\x1a\xe2\x62\x21\x35\x35\x9f\x46\x12\xb1\x93\x68\x02\x5a\
-\xc2\x5f\xa0\x35\x98\x08\xa5\x9a\x48\xc2\x67\x2c\xa9\xb1\x20\x24\
-\x34\x2c\x54\xd6\x2c\x12\xb4\xdc\xa5\x60\x9d\x63\xe1\xb2\x3b\xcc\
-\x0c\x1f\x22\xbb\x77\x37\xbc\x5f\xb5\xf7\xdd\x3b\xc9\x79\x27\xef\
-\xcd\x6c\x71\x2f\xe0\x70\x38\x6e\x33\xbc\x4a\x51\xd7\xba\x92\x4d\
-\x79\x8c\x80\x1a\x22\xd0\x29\xa1\x1d\x40\xa2\xca\xda\xfe\x95\x22\
-\x89\x9c\x80\x5d\x88\xcb\xc7\x49\x2c\xee\xf4\x31\x7f\xd9\x43\x17\
-\x1b\x20\x31\xb3\x86\x31\x42\x6f\x01\xb4\xdd\x94\xd2\x1a\x71\x20\
-\x70\x6a\xab\x1f\x9f\x41\xea\xbc\xa2\x73\x0d\xe8\x9e\xd7\x9d\x44\
-\xca\x9f\x05\x38\x5e\x1d\x7d\xb5\x42\xf3\xc5\x23\x6f\x62\x7b\x9c\
-\x27\x71\xd9\xf8\x63\x2c\x31\xb1\xea\xbf\x07\xf8\x22\x94\xc9\x4a\
-\xfa\x46\x7a\x3f\x48\xf8\x37\x2d\xf5\x7f\x90\xe0\x49\x7e\x2b\xc9\
-\xc7\x00\xd2\x95\x0c\xc7\x13\x29\x1f\x90\x5e\xc6\x9d\x84\xd8\x13\
-\x90\x59\xd5\x18\xa1\x8f\x81\xa5\x5f\x12\x27\xb7\x06\xb0\x70\xd1\
-\x71\xaa\x0b\x24\x66\x56\xf1\x94\xd4\x0c\x80\xbb\xe5\x65\xf0\xf9\
-\xd6\x00\x3f\x85\xcb\x23\x06\xfc\x7d\xe1\xe9\x3b\x2a\x77\xfe\x67\
-\x51\xec\xda\x1e\xe4\x41\xd5\x44\x57\x81\xee\x15\xb5\x25\xa8\x1d\
-\x00\xf7\x4a\x4b\xb9\xe3\x24\xef\x87\x5f\x8c\x5e\xf8\xc1\xa6\x3c\
-\x46\x10\x78\xe1\x49\x7c\xdd\x68\x9b\x07\x80\xed\x41\x1e\x10\x7c\
-\x13\x58\x6a\x6f\x2e\x60\x38\x5c\x17\x31\x00\xd4\x50\x20\xca\x6e\
-\x0d\x60\xa1\x0a\xfa\x6a\xc2\x66\x3f\xbe\x00\xc8\x9e\xc6\x82\x2e\
-\x37\x80\x40\x67\x25\xd0\x46\xdd\xdf\xf9\x8b\x20\x05\x6a\xa3\x1c\
-\x0b\x0f\xc2\x25\x11\x03\x4a\x7f\x72\x4a\x81\x77\x58\x2d\x6d\x35\
-\xe3\xec\x1e\x3a\xc2\xe9\xe8\x15\x08\x7c\x1a\xeb\xed\x53\x77\x1d\
-\x42\x7b\x88\x7c\xf6\xe3\x0c\xb8\x55\x38\x03\xac\x05\x58\xe3\x0c\
-\xb0\x16\x60\x8d\x33\xc0\x5a\x80\x35\xce\x00\x6b\x01\xd6\x38\x03\
-\xac\x05\x58\xe3\x0c\xb0\x16\x60\x8d\x33\xc0\x5a\x80\x35\xce\x00\
-\x6b\x01\xd6\x38\x03\xac\x05\x58\xe3\x0c\xb0\x16\x60\x8d\x33\xc0\
-\x5a\x80\x35\xce\x00\x6b\x01\xd6\x38\x03\xac\x05\x58\xe3\x0c\xb0\
-\x16\x60\x8d\x33\xc0\x5a\x80\x35\xce\x00\x6b\x01\xd6\x38\x03\xac\
-\x05\x58\x13\x67\x40\xf1\xf4\x87\xd4\xf8\x06\x85\xf6\x50\x0c\xe7\
-\xa3\x6d\x72\x44\xae\x12\xf8\x2d\xd5\x91\x55\x43\xce\xee\x61\x3f\
-\x9c\x8e\xb6\xc9\x01\xbb\x95\x80\xbd\x90\xae\x34\x53\x50\x97\x48\
-\x84\xd8\x5b\x8e\x89\xbd\x70\x49\xf4\x88\x8b\xcb\x81\x28\xfd\x68\
-\x15\x23\x55\x11\x57\x03\x7a\xd6\xf0\x04\x81\xce\x71\x82\x4b\xe1\
-\x9a\x88\x01\xc7\x49\x2c\x02\x28\xf7\x06\xfb\xd4\x6c\xcf\x57\x35\
-\xdc\x55\x78\xb8\xa8\x56\x41\x33\x81\xa5\x5c\xa1\x19\x97\x1b\xb0\
-\xd3\xc7\xbc\xc0\xa9\xd3\x98\x40\x4a\xbf\x95\xcd\xac\x68\xb4\x21\
-\xae\x83\xc4\xcc\x8a\x46\x99\xd0\x0e\x81\x54\x79\x19\x9c\x8e\x1b\
-\xa1\x89\xdf\x90\xc4\x9e\x35\xff\x43\xcc\xb4\x48\x16\xd4\x06\xe4\
-\x1d\xd6\x5b\x17\xa9\x04\x0f\xf4\x5b\x4a\x77\x3e\x1d\xcc\x11\x9a\
-\xdb\xec\xf7\x5e\xc5\xf5\x3d\xc7\x4f\x8c\x90\x2a\xce\x6b\x22\x91\
-\xf2\x11\x32\x21\x0d\x31\x0d\x08\xaa\xc7\x16\xea\x98\x03\x4a\x68\
-\xee\xe4\xc8\x9b\x3c\xaf\xe9\xfb\x2a\x43\x53\xcf\x08\xbd\x43\xe3\
-\x0d\x4d\xe5\x04\x4e\x5f\x7b\x68\x2a\x48\xd7\xba\x92\xcd\x05\x0c\
-\x0b\x1a\x2e\xb5\x9c\x77\xa0\x0e\xc7\xe6\x00\xec\x83\xd8\x23\xb8\
-\x54\x68\xc6\xd2\x55\xc6\xe6\x1c\x0e\xc7\xed\xe6\x0f\xfd\x5b\xf6\
-\x1a\x3c\xff\xda\x47\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\
-\x82\
-\x00\x00\x00\xc5\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x00\x77\x49\x44\x41\x54\x78\x9c\xed\
-\xd0\xb1\x0d\xc2\x40\x10\x04\xc0\x3d\xe8\x01\x51\x0a\x75\x20\x3a\
-\x20\x72\x45\xee\x82\x90\x1e\xe8\xc4\xa2\x07\x78\x52\xf4\x8e\x8d\
-\x25\x3c\x13\xae\x2e\xd8\xdb\x04\x00\x00\x00\x00\x00\x00\xd8\x82\
-\xea\x83\xd3\xad\x9d\x5b\xda\x98\xe4\xb0\x42\x9f\x25\x4d\x79\xd7\
-\xf5\x71\xa9\xfb\x77\xb8\xeb\xaf\xfe\xf4\xf9\x24\x39\xd6\xbe\x8d\
-\x7d\x38\x1b\x60\x6b\x66\x03\x54\x6a\x48\xf2\x5c\xa1\xcb\xd2\xa6\
-\xf6\xaa\x61\xed\x12\x00\x00\x00\x00\x00\x00\x00\xc0\xef\x7d\x00\
-\x4e\xfe\x12\x08\x2a\x3f\xe7\x81\x00\x00\x00\x00\x49\x45\x4e\x44\
-\xae\x42\x60\x82\
-\x00\x00\x05\x27\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x04\xd9\x49\x44\x41\x54\x78\x9c\xed\
-\x9b\x4f\x68\x14\x57\x1c\xc7\xbf\xbf\x99\xd1\x42\xd3\x22\x76\x85\
-\xdd\x90\xa2\x87\xc6\x43\x45\xb0\x24\x5b\xf6\xe0\x65\xa1\xb5\x17\
-\x6d\x2e\x6d\x6a\x4b\x55\x3c\x84\xac\x8d\x36\xe6\xd2\x82\x81\x66\
-\xb2\x81\x62\x6b\x2f\xd9\x60\xc4\xb5\x81\x16\x1a\x5a\x34\xf6\x12\
-\x22\x94\xb4\x87\xa0\xbd\x2c\xd9\x78\x90\xba\xbd\xd8\x83\x21\xd6\
-\xac\x10\x45\x30\x48\xc2\xce\xfc\x7a\x48\x5e\x3b\xbb\x3b\xbb\x3b\
-\x9b\xf9\x9b\x66\x3f\xb0\x87\x79\xf3\x9b\x79\xbf\xf9\xee\xf7\x37\
-\xf3\x66\x78\x0f\x68\xd0\xa0\xc1\x56\x86\xac\x04\xc5\x55\x55\x59\
-\x5e\x0c\x75\xe8\xc0\x51\x02\x45\x01\x6e\x01\xf0\x82\xcb\xb9\xd5\
-\xcb\x0a\x40\x0f\x18\x9c\x95\x80\xab\x4d\x91\xa5\xc9\x99\x64\xb2\
-\x50\xeb\xa0\x9a\x02\x44\x13\x17\x0f\x81\x39\x05\xe2\xd7\x9d\xc9\
-\xd3\x1b\x18\xc8\x11\xa4\xbe\x6c\xfa\xcc\xaf\xd5\xe2\xa4\x2a\xa7\
-\xa0\x68\xf7\x48\x3f\xa0\x4f\x6f\xb6\x8b\x07\x00\x02\xf6\x01\xfa\
-\xf4\x9b\x89\xd4\x39\x80\x2b\xfe\xd1\x72\xa5\x1d\xd1\xee\x50\x3f\
-\x08\x5f\xba\x93\x9e\x97\xd0\x5b\x2d\xd1\xcc\xca\xdf\x73\xbf\xfc\
-\x6e\xba\xd7\xac\x31\x9a\xb8\x78\x08\xd0\xa7\x4b\x9a\x9f\x80\x30\
-\x20\x15\xe8\xc6\x9e\xa7\xe1\xf9\x89\x89\x0f\x34\xc7\x73\xb5\x41\
-\x67\xe7\x35\xf9\xfe\x8e\xfc\x6e\x5d\xe1\xc3\x60\x0c\x01\xd8\x59\
-\x1c\x21\xbd\x63\x56\x0e\x65\x02\xc4\x55\x55\x79\xf6\x70\xd7\x9d\
-\x22\xdb\x13\x7e\x93\x0b\xfa\xb1\xcc\x58\x5f\xde\xf9\xd4\x9d\x27\
-\xd6\x35\x1c\xd6\x14\x69\x1c\x8c\xb7\x45\x1b\x03\xb9\x97\x23\x4b\
-\x07\x4a\x6f\x8c\x65\xf7\x80\xe5\xc5\x50\x47\x49\xcd\x3f\x5e\xc5\
-\xb6\x8f\x37\xcb\xc5\x03\x40\x66\xac\x2f\x2f\x17\xf4\x63\x00\x9e\
-\x88\x36\x02\xf6\x2d\x2f\x86\x3a\x4a\x63\xcb\x04\xd0\x81\xa3\x45\
-\x0d\x04\xf5\xce\xe5\x4f\x1e\xb9\x91\xa8\x9b\x64\xc6\xfa\xf2\x0c\
-\x56\x8d\x6d\x65\xd7\x06\x13\x01\xd6\x9e\xf3\x86\x80\x02\xdd\x70\
-\x3e\x3d\x6f\x90\x35\x69\xca\xb8\x4d\x40\x7b\x69\x8c\xc9\x63\x90\
-\x5b\x8c\x5b\x7b\x9e\x86\xe7\x9d\x4e\xcc\x2b\x4c\x72\x7f\xb5\x34\
-\xc6\x6c\x1c\x50\x34\xc2\x0b\xda\xdd\xbe\x1e\x4c\x72\x2f\x1b\xbd\
-\x56\x19\x08\x6d\x0d\x14\xbf\x13\xb0\x42\x5b\xcf\x68\xab\x54\xd0\
-\x06\x40\x78\x6f\xbd\xe9\x3a\x33\x86\xe6\xae\xf4\xfe\x65\xf7\xdc\
-\x81\x77\x40\x2c\x91\xda\x2b\x69\xda\x4d\x10\x8e\x03\x78\x71\xfd\
-\x77\x82\x08\xb7\xda\x7a\x46\x5b\xed\x9e\x3f\xd0\x02\xc4\x55\x55\
-\xd1\x98\x7e\x02\xd0\x6c\xb2\xbb\x59\xd2\xb4\x2f\xec\xf6\x11\x68\
-\x01\x9e\x3d\x0c\x7d\x0e\x2a\x7f\x74\x19\x78\xdf\x6e\x1f\x81\x15\
-\x20\x7a\x2a\xb5\x1f\x84\x41\xb7\xfb\x09\xa4\x00\x71\x55\x55\xa0\
-\xd3\xf7\x00\xb6\x55\x8b\x23\xa2\x09\xbb\x7d\x05\x52\x00\x0b\xd6\
-\x07\x80\x55\x89\xf9\x82\xdd\xbe\x02\x27\x80\x55\xeb\x13\x78\x30\
-\x93\xee\xcd\xd9\xed\x2f\x50\x02\x58\xb5\x3e\x80\x6c\x53\xe4\xf1\
-\x37\x4e\xf4\x19\x28\x01\xac\x5a\x9f\x74\xe9\xa4\x95\x0f\x9e\x56\
-\x08\x8c\x00\xf5\x58\x7f\xf6\xdb\x33\x77\x9d\xea\x37\x10\x02\xf8\
-\x61\x7d\x81\x23\xef\x02\xed\xdd\x23\xaf\x11\x61\x00\x62\x60\xc2\
-\xf8\x59\x57\xe4\xa1\xdb\x97\x4e\xdf\xb3\x72\xbc\x1f\xd6\x17\xd8\
-\x76\x40\x5b\xcf\x68\x2b\x11\x6e\x01\x38\x01\x31\x56\x27\x1c\x97\
-\x34\xed\x66\x2c\x91\xda\x5b\xeb\x78\xbf\xac\x2f\xb0\x2d\x80\x54\
-\xd0\x06\x50\x61\xac\xae\x81\x7e\x8c\xab\x6a\x45\x97\xf9\x69\x7d\
-\x81\xfd\x7b\xc0\x7f\xaf\xa8\x66\x44\x97\x17\x5f\xf9\xac\xd2\x4e\
-\x3f\xad\x2f\x70\xfd\x26\xc8\xa0\xc1\xe8\xa9\xd4\xfe\xd2\x76\xbf\
-\xad\x2f\x70\x42\x80\xeb\x35\xf6\x6f\x07\xd3\x77\xc6\x52\x08\x82\
-\xf5\x05\xb6\x05\x90\x81\xaf\x01\xac\xd6\x08\x2b\x2a\x85\x20\x58\
-\x5f\x60\x5b\x80\x4c\xba\x37\x07\x46\xb2\x56\x9c\x28\x85\xa0\x58\
-\x5f\xe0\xc8\x3d\xe0\xa5\xe6\xa5\x0b\x60\xcc\xd5\x08\xdb\x0e\x96\
-\x7e\x60\xa6\x71\x04\xc0\xfa\x02\x47\x04\x98\x49\x26\x0b\x90\xf8\
-\x24\x6a\x96\x02\xbf\x41\xc0\x81\x1a\xa7\xf3\xc4\xfa\x02\xc7\x9e\
-\x02\xd9\xcb\x67\xff\xb0\x52\x0a\xb5\xf0\xca\xfa\x02\x47\x1f\x83\
-\x16\x4b\xa1\x1a\x9e\x59\x5f\xe0\xa8\x00\xd6\x4b\xc1\x14\x4f\xad\
-\x2f\x70\x7c\x20\xb4\xd1\x52\xf0\xda\xfa\x02\x57\x46\x82\x1b\x28\
-\x05\xcf\xad\x2f\x70\x45\x80\x3a\x4b\xc1\x17\xeb\x0b\x5c\x7b\x17\
-\xb0\x5a\x0a\x7e\x59\x5f\xe0\xea\xcb\x90\x85\x52\xf0\xcd\xfa\x02\
-\x57\x05\x98\x49\x26\x0b\xba\x22\x7f\x08\xc0\x6c\x92\xc5\xbc\x2e\
-\xcb\x1f\xf9\x65\x7d\x81\xeb\xaf\xc3\xb7\x2f\x9d\xbe\x27\x6b\x38\
-\x48\xe0\x29\x00\xcf\x01\x3c\x27\xf0\x94\xac\xe1\xa0\xd5\x4f\x66\
-\x6e\xe2\xc9\xfc\x80\xcc\x58\xef\x02\x80\x77\xbd\xe8\xab\x5e\x02\
-\xf1\x55\xd8\x4f\xcc\x04\x58\x31\x6e\x74\x76\x5e\xab\x38\x9d\x36\
-\xe8\x98\xe4\xbe\x52\x1a\x63\x22\x00\x3d\x30\x6e\xdd\xdf\x91\xdf\
-\xed\x68\x56\x1e\x62\x92\xfb\x42\x69\x4c\x99\x00\x0c\xce\x1a\xb7\
-\x75\x85\x0f\x3b\x9c\x97\x67\x68\xb2\x7e\xc4\xb8\xcd\x28\x7f\x24\
-\x97\x09\x20\x01\x57\x8b\x1a\x18\x43\xb1\xae\xe1\xb0\xe3\xd9\xb9\
-\x4c\xac\x6b\x38\x4c\xa0\xa2\x81\x58\xd9\xb5\xc1\x44\x80\xa6\xc8\
-\xd2\x24\x98\xfe\x34\x34\xed\xd4\x14\x69\x7c\x33\x89\xf0\xef\x64\
-\x69\xc3\x8c\x71\x06\x72\x4d\x91\xa5\xc9\xd2\xd8\xba\xa6\xcb\x33\
-\x58\x95\x35\x69\x2a\xc8\xd3\xe5\x35\x59\x3f\xb2\xfe\xcf\x6f\x6c\
-\xba\xbc\x20\xda\x3d\xf2\x3f\x59\x30\x01\x10\xb8\x7f\x36\x7d\xf6\
-\xbc\xd9\xbe\x8a\xe3\x80\xec\x95\x4f\xcf\x13\xb8\xdf\xbd\xb4\x3c\
-\x81\x99\xe9\xdc\x6c\xba\xf7\xab\x4a\x01\x96\x16\x4d\x31\xf4\xe1\
-\xb5\x35\x38\x9b\x07\xab\x8b\xa6\x36\xb0\x6c\x0e\xed\x58\x9b\x75\
-\x1d\xc0\x65\x73\x58\x60\x60\xae\x9e\x65\x73\x0d\x1a\x34\xd8\xda\
-\xfc\x03\xf8\xad\xf2\xfb\x1a\x49\x36\xd6\x00\x00\x00\x00\x49\x45\
-\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x01\x87\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x01\x39\x49\x44\x41\x54\x58\x85\xed\
-\xd7\xbf\x4e\xc2\x50\x14\xc7\xf1\xef\xb9\x21\x30\x5a\x17\x7c\x86\
-\xbe\x40\x5f\x80\x8a\x4c\x26\xa8\x1b\x23\x98\xb0\xd6\x59\x1d\x64\
-\x87\x95\x44\x57\x46\x65\x34\x22\x4f\xd0\x17\xe8\x3b\xb0\x50\x47\
-\x08\xe1\x38\x94\x2a\x7f\x5d\x6c\xe3\xe0\xfd\x8d\x37\x37\xfd\x7d\
-\xd2\xbb\x9c\x03\xff\x3d\xb2\x7d\xe0\x5f\x5e\x9f\x09\xdc\x80\x7a\
-\x80\x93\x51\x4f\x0c\x12\x2a\x74\xc7\xcf\x8f\x6f\x07\x01\xfe\x55\
-\xb3\x23\x2a\xb7\xc0\x0c\x88\x50\x3e\x32\xa9\x17\x8e\x00\x17\x28\
-\xa1\x74\xde\x5f\x9e\xee\x77\x00\x95\x7a\xb3\x66\x8c\xbc\x0a\x8c\
-\x59\x16\x1a\xa3\x61\x7f\x92\x49\xf9\x2a\xd5\x7a\xbb\x8c\x59\x0c\
-\x14\x7c\x45\x6a\xe9\x9f\x30\xe9\x05\x63\x4c\x00\xcc\xf2\x28\x07\
-\x18\x0d\xfb\x13\x96\x85\x06\x30\x17\x34\xf8\xea\xfd\xbe\xa2\x1e\
-\x10\xe5\x51\xbe\x81\x40\x22\x14\x6f\x0f\x00\x27\xb3\x37\xff\x29\
-\xaa\x31\xc2\xf1\x3e\xc0\x9f\xc4\x02\x2c\xc0\x02\x2c\xc0\x02\x2c\
-\xc0\x02\x2c\x60\x1d\x10\xaf\xa6\xd7\x7c\x23\xe2\xa0\x4c\xf7\x00\
-\x24\x04\xdc\x6a\xbd\x5d\xce\xab\x3b\xf9\xb6\xba\x08\xe1\x0e\x40\
-\xa1\x0b\x94\x30\x8b\x41\x1e\x88\xca\x79\xeb\x04\xb3\x18\x00\x45\
-\x45\x7a\xe9\xf9\xc6\x62\x72\x7a\xd1\x7a\x40\xb8\x03\xe6\xc9\xf4\
-\xaa\x71\x26\xed\x22\x0e\xa8\x0b\x14\x0f\x2e\x26\x69\x92\xd5\x4c\
-\x03\x14\x6f\x7d\x7a\xfd\x55\x94\x29\x42\xa8\x48\x6f\x7b\x35\xb3\
-\xf9\x04\xc3\x25\x66\x2f\xe5\x8f\x2b\x3d\x00\x00\x00\x00\x49\x45\
-\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x03\x4e\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x03\x00\x49\x44\x41\x54\x78\x9c\xed\
-\x9b\x4f\x4f\x13\x51\x14\xc5\xcf\x41\x40\x09\x4b\xad\x94\x3f\xb6\
-\x0d\x0b\x37\x80\x2b\x96\xf2\x2d\x00\x23\x89\xb8\x93\x68\x22\xba\
-\x84\x4f\xa0\x6b\x35\x11\x97\x6a\x22\x89\xf0\x2d\x70\xc9\x8a\xc2\
-\xca\x05\x43\x0b\xa5\x50\x5d\x12\xb4\x20\xc7\x05\x2d\x0e\xd3\x81\
-\x56\xe2\xf4\xb6\xf2\x7e\xab\xd7\xfb\xde\x34\xe7\x9e\xbe\x37\xaf\
-\x8b\x7b\x01\x87\xc3\x71\x99\x61\x2d\x8b\xf2\xf9\x7c\xe7\x7e\xb1\
-\x38\x4e\x71\x14\xc4\x20\x84\x1e\x00\xad\x11\x6b\xfb\x5b\x0e\x41\
-\xe4\x20\xac\x8a\x5a\xec\x68\x6f\xff\x1c\x8f\xc7\xf7\xaa\x3d\x74\
-\xae\x01\x92\xe8\x65\xb6\x26\x09\xbd\x00\xd0\xfd\xcf\xa4\xd6\x87\
-\x6d\x82\x33\x89\x44\xef\x47\x92\x3a\x6b\xd1\x99\x06\x2c\x2f\x2f\
-\xb7\xc5\x62\x37\x5f\x0b\x9c\x8a\x46\x5f\x7d\x20\xf4\xae\x50\xd8\
-\x7d\x3a\x3c\x3c\x7c\x10\x36\x1f\xba\x8d\x8f\x7f\xf9\xcd\x37\x02\
-\x1e\x9d\x8a\x03\x69\x8a\x5f\x48\xe5\x25\x1d\x45\x21\xf8\xa2\x90\
-\x6c\x91\x18\x17\x75\x97\xc0\x50\x39\x2e\x70\x2a\x16\xbb\x09\x49\
-\x8f\xc3\x76\x42\xe8\x0e\xd8\xd8\xd8\x9c\x14\xf4\xde\x17\xfa\x0e\
-\x61\x3a\x99\xec\x9b\x3f\x6f\x3b\x35\x02\x92\xb8\xb1\xb1\x79\x1f\
-\xc4\x2b\x00\xd7\xcb\x71\x82\x0f\x93\xc9\xbe\x0f\xc1\xf5\x15\x06\
-\xe4\xf3\xf9\xce\x1f\x3f\x0f\xbe\xe2\xcf\x99\xff\x06\xfd\xba\x93\
-\x4a\xa5\xb6\x23\x53\x1d\x01\x9e\xe7\x75\x83\x57\x56\x00\xdc\x28\
-\x85\x72\xd7\xae\xb6\xdd\x0e\xbe\x18\x5b\x82\x0f\xee\x17\x8b\xe3\
-\xf0\xbf\xf0\x84\x67\xcd\x96\x3c\x00\xa4\x52\xa9\x6d\x08\xcf\x7d\
-\xa1\x9e\xfd\x62\x71\x2c\xb8\xae\xc2\x00\x8a\xa3\xe5\xb1\x80\x74\
-\x32\xd9\x37\x1f\x91\xc6\xc8\x49\x26\xfb\x3e\x09\x48\x97\x3f\x53\
-\xac\x6e\x00\x88\x41\xdf\x03\x4b\x8d\x7e\xe6\xcf\x83\xa4\x28\x2e\
-\xf9\x42\x03\xc1\x35\x95\x06\x1c\xff\xc9\x29\x7d\x81\x76\xa2\x91\
-\x56\x3f\x02\x39\xf4\x06\xe7\x2b\x0d\xf0\x5d\x8d\x8d\x76\xd5\x5d\
-\x84\x40\x0e\x15\xd7\x7e\x98\x01\x97\x0a\x67\x80\xb5\x00\x6b\x9c\
-\x01\xd6\x02\xac\x71\x06\x58\x0b\xb0\xc6\x19\x60\x2d\xc0\x1a\x67\
-\x80\xb5\x00\x6b\x9c\x01\xd6\x02\xac\x71\x06\x58\x0b\xb0\xc6\x19\
-\x60\x2d\xc0\x1a\x67\x80\xb5\x00\x6b\x9c\x01\xd6\x02\xac\x71\x06\
-\x58\x0b\xb0\xc6\x19\x60\x2d\xc0\x1a\x67\x80\xb5\x00\x6b\x9c\x01\
-\xd6\x02\xac\x71\x06\x58\x0b\xb0\xc6\x19\x60\x2d\xc0\x1a\x67\x80\
-\xb5\x00\x6b\xc2\x0c\x38\x2c\x0f\x48\x36\xbd\x41\x81\x1c\x0e\x83\
-\xf3\x61\x65\x72\xb9\xf2\x50\x62\x57\x34\xb2\xea\x47\x20\x87\xad\
-\xe0\x7c\x58\x99\xdc\xea\xc9\x90\x1a\x91\x54\x53\x4f\x41\x23\x22\
-\x89\xa2\x46\x7c\xa1\xb5\xe0\x9a\x0a\x03\x44\x2d\x96\xc7\x04\x86\
-\xbc\x6c\x76\x3c\x22\x7d\x91\xe3\x65\xb3\xf7\x4e\x55\x8e\x53\x0b\
-\xc1\x35\xd5\x8b\xa5\x85\xc2\xd1\xd1\xc1\x50\x7f\x7f\x7f\x53\x15\
-\x4d\xae\xaf\xaf\xc7\xc9\xd6\x15\x10\xb1\x52\xa8\xb6\x62\xe9\x78\
-\x3c\xbe\x47\x70\xe6\x24\x40\xc4\x5a\x5a\xda\xd2\x9e\x97\x9d\x68\
-\x86\xe3\x20\x89\x9e\x97\x9d\x08\x24\x0f\x82\xb3\x61\x2d\x34\xa1\
-\x09\x49\x62\x26\x93\x7d\x1b\xec\x16\x29\x35\x4c\x2c\x91\xda\x69\
-\xb4\x2a\xd2\x52\xc3\x44\x97\xa8\x11\xff\xb6\x07\x00\x42\x73\x89\
-\xc4\xad\x27\x35\x37\x4c\x00\xff\x55\xcb\xcc\x5c\xa1\xb0\x3b\x7d\
-\x56\xcb\x4c\xd5\xa6\xa9\x4c\x66\xeb\x81\xa0\x97\x68\xbe\xa6\xa9\
-\x1c\xc1\xd9\x0b\x37\x4d\xf9\x29\xb5\xcd\x8d\x95\xea\xed\x07\x70\
-\x5c\x75\xdd\x78\x6d\x73\xc7\xf7\xfc\x9a\xa8\x85\x8e\xf6\xf6\x85\
-\x5a\xda\xe6\x1c\x0e\xc7\xe5\xe6\x37\x49\x9a\x11\x82\x28\x6e\xc8\
-\x6e\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x00\x78\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x00\x2a\x49\x44\x41\x54\x58\x85\xed\
-\xce\x41\x11\x00\x20\x0c\x04\xb1\x16\xff\x22\xe9\x20\x04\x64\x1c\
-\x8f\xc4\xc0\x6e\x15\x00\x10\xd6\x7b\xce\x4d\x0e\xac\x64\x1c\x00\
-\xf8\xc2\x03\x48\xae\x03\xa7\xd4\xed\xa0\x47\x00\x00\x00\x00\x49\
-\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x06\x65\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x06\x17\x49\x44\x41\x54\x78\x9c\xed\
-\x9a\xc9\x73\x5c\xd5\x15\x87\xbf\x73\x5b\x31\x32\x83\x4c\x6c\x50\
-\x00\xf5\x1b\x5a\x15\x6f\xb0\x31\x93\xc1\x98\xa4\x12\x2c\x1c\x24\
-\x83\x6d\xe5\x6f\x61\x05\x8b\x64\x91\xf2\x82\x0d\xcb\xe4\xef\xa0\
-\x98\xca\xd6\x18\x46\x43\x85\xa4\x42\x80\x2a\xaa\x28\xd4\x6f\x90\
-\x29\x07\xc7\x0e\x96\x71\x2c\x19\xeb\x1e\x16\x52\x3b\xe2\x75\xab\
-\xfb\xbe\xee\xf7\x24\x51\xe8\x5b\xde\x77\xfa\xbe\xf3\xfb\xfa\xdc\
-\x1e\xa4\x86\x6d\xb6\xd9\xe6\xa7\x8c\xb4\x5a\x3c\x7f\xfe\xfc\x6d\
-\x8b\x8b\xd7\x9f\x57\x91\x13\x40\x3f\x70\x56\x74\xf9\xa5\x30\x0c\
-\xeb\x1b\xdb\x5e\x77\x44\x51\x54\x53\xa9\xbc\x00\x1c\x06\x16\x0d\
-\xbc\xb1\x73\xe7\x2d\x2f\x0f\x0e\x0e\x7e\x9b\xad\x6d\x12\xf0\xf9\
-\xe7\x17\xee\xe8\xdf\xb9\xf8\x16\xf0\x70\xe6\xd2\x65\x35\x8c\xd6\
-\x3c\xef\xc3\x72\xda\x2e\x86\x24\x49\x1e\xb3\x2a\x93\xc0\xae\x1f\
-\x5c\x10\x3e\xfe\x6e\x69\xf1\x37\x7b\xf7\xee\x5d\x58\xbb\x6c\xb2\
-\x1b\xf4\xf7\x5f\x7b\x81\xe6\xf0\x00\xbb\xc4\x32\x51\x4f\xd3\x43\
-\x45\x36\x5c\x24\xeb\x86\x07\x50\x1e\xdc\xb1\xa3\xff\xc5\xec\x72\
-\x93\x00\x44\x4e\xb6\xb9\xc7\xc0\x56\x95\xd0\x36\xfc\x2a\x8a\x8e\
-\x67\xd7\x9a\x05\xc0\xce\x0e\xf7\x1a\x10\xcb\xc4\x5c\x9a\x3e\x9e\
-\xb3\xc7\xd2\x48\x92\xe4\x60\xa7\xf0\x2b\x48\x7f\x76\xa5\x49\x80\
-\xa2\xef\x39\xdc\x73\xc0\x58\x26\xb7\x82\x84\xd5\xf0\x53\x74\x0c\
-\x0f\x40\x53\xb6\x26\x01\x7d\x46\x4e\x01\x97\x1d\x36\xdb\x74\x09\
-\x39\xc3\x2f\x54\x0c\x7f\xca\x2e\x36\x09\xf0\x3c\xef\x0b\x6b\x78\
-\x06\x77\x09\x9b\x72\x1c\xdc\xc7\x1e\x80\x05\xb5\x32\xea\x79\xde\
-\x17\xd9\x0b\x2d\x3f\x07\x00\xcc\xa5\xe9\xe3\xc6\x32\x09\x0c\x38\
-\xdc\xe0\xb2\x11\xfd\x9d\xef\xfb\x7f\x73\xa8\xed\x99\x38\x8e\x1f\
-\x55\xcc\x14\x70\xa7\x43\xf9\x15\xb5\xf2\x4c\xad\x56\xfd\xa0\xd5\
-\xc5\x75\x05\xc0\xd6\x94\x50\x64\x78\xe8\x20\x00\xb6\x96\x84\xa2\
-\xc3\x83\x83\x00\x80\x7a\x9a\x1e\x12\xcb\x04\xee\x12\x8e\xfa\xbe\
-\xff\x91\xcb\xde\xae\x44\xd1\x57\x8f\x20\xcb\x53\xc0\xcf\x1d\xca\
-\xaf\xa0\x32\x1a\x86\xd5\xb3\x9d\x0a\x9d\x04\xc0\xe6\x4a\x28\x2b\
-\x3c\xb4\xfe\x20\xd4\x92\x9a\xe7\x7d\xa8\x56\x46\x81\x85\x8e\xc5\
-\xb0\xcb\xaa\x4c\x25\x49\x72\xd0\x75\xff\xf5\xc8\x1f\xde\x8c\xb9\
-\x86\x87\x1c\x13\xd0\xa0\x5e\x9f\x7f\x42\x8c\x4e\x00\x77\x38\x94\
-\x7f\xb3\xfa\x9a\xd0\xd5\x24\xe4\x0c\xff\x2d\x6a\x46\xc3\x70\xe8\
-\xfd\x3c\xf7\xc8\x2d\x00\xf2\x4b\x10\xec\xd1\x20\x08\xfe\x9e\xe7\
-\x1e\x1b\x11\x1e\xba\x14\x00\xe5\x4a\x88\xa2\x73\x0f\x23\x76\x9a\
-\x92\xc3\x43\x0f\x02\x00\xa2\x68\xfe\x30\xa2\x67\x28\x50\x42\xde\
-\xf0\x82\x19\x0b\x82\x21\x97\xef\x2f\x2d\xe9\x49\x00\x14\x2b\x61\
-\xa3\xc3\x43\x8e\x77\x81\xf5\x08\xc3\xea\x59\xd4\x8c\x01\x57\x1c\
-\xca\xef\x54\xcc\x64\x14\x7d\xf5\x48\xf6\xc2\x6a\x78\xe7\x33\x2f\
-\xd8\x63\xbd\x86\x87\x02\x26\xa0\x41\x14\x9d\x7b\x12\xb1\x67\x80\
-\xdb\x1d\xca\xff\x8b\x56\x8e\x86\xe1\x7d\xff\x00\xa8\xd7\xe7\x1f\
-\x12\xa3\xd3\xc0\x6e\x87\xc7\x5e\x15\xec\x58\x10\x04\xef\xf6\xd2\
-\x6f\x83\xc2\x04\x40\x77\x12\x54\xad\xdd\xac\xf0\x50\xb0\x00\xc8\
-\x29\x41\x59\x50\x14\x11\x71\xf9\x74\x59\x78\x78\x28\x41\x00\x40\
-\x1c\x9f\xfb\x95\x62\x4f\xe3\x36\x09\x2e\x5c\x35\xa2\xc7\x7c\xdf\
-\x7f\xa7\xa0\xfd\x6e\x52\x8a\x00\x28\x54\x42\x69\xe1\xa1\x80\x77\
-\x81\xf5\x08\x82\xa1\xf7\x04\x7b\x0c\x68\xfa\x67\x44\x0e\xae\x5a\
-\xd1\x67\xcb\x0a\x0f\x25\x4e\x40\x83\x38\x8e\x7f\xad\x98\xd3\xc0\
-\x6d\x39\x1f\x7a\xd5\x8a\x3e\x3b\xec\xfb\x6f\x97\xd1\x57\x83\xd2\
-\x05\xc0\xaa\x04\x35\x13\x48\xc7\x3f\xb9\x37\x58\xb4\xa2\xa3\x65\
-\x87\x87\x12\x8f\xc0\x5a\x96\x8d\x59\x40\xb8\xee\x5a\xaf\x70\x5d\
-\x96\x8d\xcb\xd7\xee\x9e\x29\x5d\xc0\x5c\x9a\x1e\x30\x96\x19\xdc\
-\xfe\x7a\x0b\x80\xc0\x80\x18\x9d\xae\xd7\xe7\x1f\x2a\xb1\xb5\xc6\
-\xbd\xca\x63\x4d\xf8\x3d\x5d\x6e\x71\x49\xad\x3c\x5d\xab\x55\xff\
-\x59\x64\x5f\x6b\x29\x6d\x02\x56\xc3\x4f\xd3\x7d\x78\x80\xdd\x62\
-\x74\x7a\x6e\x6e\xfe\xc1\xa2\xfa\xca\x52\xca\x04\xa4\x69\xfa\xc0\
-\xf2\xca\x33\x7f\x57\x41\x5b\x5e\xb2\xcb\x32\x32\x3c\x5c\xfd\xb8\
-\xa0\xfd\x6e\x52\xf8\x04\xe4\x0c\xbf\xa4\xaa\x4b\x0e\x75\xbb\x4d\
-\xa5\x9c\x49\x28\x54\x40\xce\xf0\xd7\xd4\x32\xa6\x2b\xff\x86\xfb\
-\x9f\x43\xfd\x9e\x32\x24\x14\x76\x04\x92\x24\xd9\x6f\x55\x66\x71\
-\x0c\x8f\xca\x73\x61\x58\x9d\x05\xa8\xa7\xe9\x6f\xc5\xf2\x26\x70\
-\xab\xc3\x63\x2f\x5a\xc3\xc8\xb0\xe7\xfd\xab\x97\x7e\x1b\x14\x22\
-\xa0\x97\xf0\x0d\x36\x4b\x42\xcf\x47\xa0\x8b\xf0\xc7\xb3\xe1\x01\
-\x6a\x9e\xf7\x96\x5a\x9e\xc3\xf5\x38\x58\x66\xe6\xd2\xf4\x40\xde\
-\x7e\xb3\xf4\x24\x20\x49\x92\xfd\xd6\x8a\xf3\x99\x5f\x0d\x3f\xb3\
-\x5e\x41\xad\xe6\xfd\x35\xa7\x84\xe9\x5e\x25\x74\x7d\x04\x6e\x86\
-\x17\xee\x76\x28\xbf\x26\xc8\x89\x20\xa8\x4e\xbb\xec\x5d\xaf\xa7\
-\x4f\x89\xe1\x4d\x3a\xff\x5c\x07\xe0\x3f\x15\xc3\x88\xe7\x79\x9f\
-\xb8\xec\x9d\xa5\x2b\x01\x71\x1c\xef\x53\x35\xb3\x8e\xe1\x17\x05\
-\x39\xee\x1a\xbe\xc1\x46\x49\xc8\x2d\x60\x23\xc2\x37\x88\xa2\xf9\
-\x23\x88\xbe\x41\x89\x12\x72\x09\x88\xe3\x78\x9f\x62\x66\x80\x41\
-\x87\xf2\x9e\xc2\x37\xc8\x2b\xc1\x88\x1e\xf1\x7d\xff\x53\xd7\xfd\
-\x9d\x5f\x04\xf3\x87\x37\xce\x67\xbe\x1d\x61\x58\x9d\x45\xe5\x38\
-\x70\xcd\xa1\xfc\x2e\xab\x32\x9b\x24\xc9\x7e\xd7\xfd\x9d\x26\x20\
-\x8e\xe3\xfb\x15\x33\x4b\xae\xf0\x43\x53\xae\x4d\xb8\x10\x45\xf3\
-\x23\x88\xbe\x4e\xc1\x93\xd0\x71\x02\xf2\x87\xb7\x27\x8b\x0e\x0f\
-\x10\x86\xd5\x19\x41\x4e\xe0\x3a\x09\x56\x66\x5c\x26\xa1\xed\x04\
-\x74\x17\x3e\x98\x74\xa8\xed\x9a\x38\x9e\x7f\x5a\xd1\xd7\x59\xf9\
-\x15\x7b\x7b\x94\x0b\xc6\xe8\x48\xbb\x49\x58\x77\x02\x56\xc2\x57\
-\x9c\xcf\xbc\x15\x1d\x2f\x3b\x3c\x40\x10\x54\xa7\x05\x39\x0e\x2c\
-\x76\x2c\x16\xee\xb6\x56\x66\xe2\x38\xde\xb7\x7e\x49\x0b\xfe\x1f\
-\x5e\x7f\xe1\xd0\xd3\x92\x15\x3d\x39\xec\xfb\x13\x0e\xb5\x85\x91\
-\x77\x12\x44\xec\x91\x20\x08\x3e\xcb\x5e\x6a\x12\x90\xa6\xe9\xd0\
-\xb2\xe5\x23\xe0\x1e\x87\x3e\x36\x25\x7c\x83\x38\x3e\x77\x54\xb1\
-\xaf\xe1\x22\x01\xbe\xbe\xd1\x67\x0e\xfe\x72\x68\x28\x5d\xbb\xd8\
-\x74\x04\xac\xd5\x3f\xf0\x23\x08\x0f\x10\x04\x43\x53\x82\x39\x81\
-\xcb\x71\x80\xc1\xbe\x1b\xf6\x8f\xd9\xc5\x16\xbf\x16\x97\xa7\x1c\
-\x36\x5b\x52\xd1\xf1\xcd\x0c\xdf\x60\x45\x82\x3d\x89\x9b\x84\x23\
-\xd9\x85\x56\x2f\x82\xcb\x1d\x36\x59\x52\xd1\xf1\x9a\xef\x9f\x71\
-\x69\x70\x23\x08\x82\x60\xd2\x49\x82\x36\x67\x6b\x12\x20\x68\xbb\
-\x67\x75\x49\x0d\xbf\xdf\x4a\xe1\x1b\x04\x41\x30\x69\x45\xc7\x69\
-\x23\x41\x85\xd3\xd9\xb5\x26\x01\x95\x8a\x39\x05\x7c\xd9\xe2\xf1\
-\x2b\xe1\x3d\xaf\x69\x93\xad\xc2\xb0\xef\x4f\xb4\x91\x50\xbf\xb1\
-\xa3\xef\x54\x76\xb1\x49\x40\xb5\x5a\xbd\xf8\xb3\x3e\xf3\x04\xc2\
-\x9f\x81\x18\xf8\x5a\x91\x57\xd1\xca\x93\x5b\x39\x7c\x83\x61\xdf\
-\x9f\x50\x2b\x87\x51\x5e\x01\xf9\x37\x10\xa3\xf2\x97\xef\x76\xf4\
-\x1d\xda\x7b\xef\xbd\x17\x36\xbb\xbf\x6d\xb6\xd9\x66\x6b\xf1\x3d\
-\x64\x29\x23\xc7\x02\xc7\xba\xcb\x00\x00\x00\x00\x49\x45\x4e\x44\
-\xae\x42\x60\x82\
-\x00\x00\x01\x06\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x00\xb8\x49\x44\x41\x54\x78\x9c\xed\
-\xd9\xc1\x0d\x83\x50\x10\xc4\xd0\x0d\xa2\x24\x7a\xe2\x46\x31\xdc\
-\xe8\x29\x3d\x91\x32\x5e\xa4\x6f\x37\xb0\x96\x35\xb7\x9d\x81\x1c\
-\xe7\xfd\x1e\xe7\xfd\x4a\x87\x4d\x1e\xff\x07\x0a\xa0\x05\x34\x05\
-\xd0\x02\x9a\x02\x68\x01\x4d\x01\xb4\x80\xa6\x00\x5a\x40\x53\x00\
-\x2d\xa0\x29\x80\x16\xd0\x14\x40\x0b\x68\x0a\xa0\x05\x34\x05\xd0\
-\x02\x9a\x02\x68\x01\x4d\x01\xb4\x80\xa6\x00\x5a\x40\x53\x00\x2d\
-\xa0\x59\x3e\xc0\x47\x1e\xd7\xaf\xf1\x99\x16\x30\xbb\x16\x98\x99\
-\xf9\x3e\x17\x5b\xe2\xf2\x0b\x28\x80\x16\xd0\x14\x40\x0b\x68\x0a\
-\xa0\x05\x34\x05\xd0\x02\x9a\x02\x68\x01\x4d\x01\xb4\x80\xa6\x00\
-\x5a\x40\x53\x00\x2d\xa0\x29\x80\x16\xd0\x14\x40\x0b\x68\x0a\xa0\
-\x05\x34\x05\xd0\x02\x9a\x02\x68\x01\x4d\x01\xb4\x80\x66\xf9\x00\
-\x3f\xfa\xaa\x08\xd8\xe7\x6a\x2c\xe4\x00\x00\x00\x00\x49\x45\x4e\
-\x44\xae\x42\x60\x82\
-\x00\x00\x04\x72\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x04\x24\x49\x44\x41\x54\x78\x9c\xed\
-\x9b\x4d\x88\x1c\x55\x14\x85\xbf\x5b\xdd\x09\x8a\x8a\x20\x2a\x62\
-\x4f\x57\x75\x0d\x19\x14\x77\xc2\xe0\x52\x50\x34\x1a\xc4\xe0\x0f\
-\xe8\x4a\x44\x51\xd0\x85\x18\x41\x11\x74\x11\x21\x8a\x11\x04\x17\
-\x22\x1a\x70\xe3\xc2\xa0\xae\xc2\x80\x46\x47\x5d\x08\x82\xe0\x42\
-\x10\x44\x82\x66\xa6\xe7\x75\xcd\x24\xd1\x88\x8a\x60\x18\xec\xee\
-\x77\x5d\xcc\x88\x55\x35\x43\x98\x21\xef\xbd\x7a\x9a\x3e\xcb\x73\
-\xa0\xee\x7d\xa7\xee\x7d\x3f\xf5\x03\x13\x4c\x30\xc1\x04\xff\x01\
-\x18\xb3\xb2\xdf\x0c\x8a\xe1\x92\x29\x46\xc6\x14\x2f\xb8\xba\xae\
-\xb8\xba\x90\x4f\x2c\x2d\x2d\xdf\x84\xe8\xe7\xfc\x9b\xaf\xed\x65\
-\xdd\x96\x8b\x6b\x27\x2e\x2e\xe2\x13\x83\xc1\x60\x16\xd1\x39\x4a\
-\x37\x4b\x55\x9d\xe5\x1d\xb5\x01\xfd\xfe\xca\xb5\x56\xe5\x28\x70\
-\x71\x99\x17\x11\xeb\x2a\x46\xb4\x06\x2c\x2c\xac\xa4\x49\x62\xe7\
-\x81\xcb\x37\x91\xd5\x55\x9c\x28\x0d\xf8\xf1\xe4\xc9\x2b\x5a\x6d\
-\x3b\xaf\xd0\xf5\x1d\x2b\x3a\x03\x8e\x1d\x3b\x7d\xc9\x8e\xbf\x46\
-\x1f\x01\xd7\x84\x88\xd7\x0e\x11\x64\xab\xe8\xf7\xfb\x17\x48\xb2\
-\x7a\x04\x98\xad\x49\x8a\xa7\x15\x2b\x9a\x0a\x50\xd5\xb6\xb4\xda\
-\x87\x81\x9b\xeb\x12\xe0\x6c\xd2\xab\x23\x0a\x03\x54\x55\x4c\xb1\
-\x7c\x08\xe5\xee\xaa\x22\x5e\x07\x0f\x91\x18\x60\x06\xcb\xaf\xa0\
-\x3c\x5c\xe6\x44\x50\x50\xaf\x83\x87\x08\xe6\x00\x63\x8a\x67\x15\
-\x9e\x29\x73\xba\xb6\xc8\x79\x1f\x3c\x34\x5c\x01\xc6\x14\x8f\x2a\
-\x1c\xac\xf3\x22\x8c\x43\xe5\xd0\x98\x01\x4b\x4b\xc5\xbd\x0a\x6f\
-\x6d\x54\xfc\x97\x7d\x19\x8d\x18\x60\xcc\xca\x2d\x08\x87\x37\xc4\
-\x57\xec\xfa\xc4\x17\x0c\xc1\x0d\x58\x2c\x8a\x1b\x14\x7b\x04\xd8\
-\x59\xe6\x15\x2c\xe2\x6e\x8b\xbb\x55\x04\x9d\x04\x8d\x31\xd7\xa9\
-\xe5\x28\x70\x51\x4d\xb2\xe2\x70\x7f\xbf\x1d\x04\xab\x80\xc5\xc5\
-\x13\x99\x92\xcc\x03\x97\x55\x04\xc1\xd2\xd0\xe0\x21\x90\x01\xc7\
-\x8f\x9f\xba\x52\x5a\xe3\x4f\x81\x4e\x99\x17\xb0\x68\x73\x83\x87\
-\x00\x2d\xb0\xb0\xb0\x70\x69\xab\x3d\xfc\x18\x98\xa9\x2a\xaa\x1a\
-\x78\xc2\xdb\x0c\x5e\x0d\x28\x8a\xe2\x42\x6b\x99\x53\xb8\xbe\x26\
-\x29\xb8\x7b\xa8\x71\x2e\xf0\xd6\x02\xaa\xda\x1e\x59\x79\x4f\xe1\
-\xc6\xba\x44\xa0\x5d\xde\x56\xe0\xc5\x00\x55\x4d\x06\x83\xe2\x6d\
-\x41\xf7\x96\x79\x89\x6c\xf0\xe0\xc1\x00\x55\x15\x63\x8a\x57\x15\
-\x79\xb0\xcc\x8b\xa0\x1a\xd9\xe0\xc1\xc3\x1c\x60\x8a\xe2\x39\x44\
-\x9e\x2a\x73\x21\x0f\x37\xdb\x85\xd3\x0a\xe8\x0f\x96\x1f\x43\xe5\
-\xc5\x3a\x1f\xf2\x70\xb3\x5d\x38\x33\xa0\x6f\x8a\x83\xa2\xfa\xe6\
-\x46\x25\xec\xe1\x66\xbb\x70\x66\x80\xd4\x1e\x68\xc0\xfa\xfe\x3e\
-\x82\xb5\xfe\x6c\x70\xd7\x02\x9b\x94\x79\x03\x67\x9b\x6d\xc3\x5d\
-\x05\x20\x4f\x52\xdb\xd3\x2b\x12\xc5\x23\xb7\xb3\xc1\x59\x82\x59\
-\x36\xf5\x01\xaa\x4f\x94\x39\x01\x14\x5a\x31\xbf\x83\x75\x7a\x87\
-\x7a\xbd\xf4\x0d\x81\xfd\x65\x4e\x00\xd4\x46\x6b\x82\xf3\x12\x4d\
-\xd3\xa9\x03\xc0\xeb\x15\x52\x04\xc4\xdd\x1b\x5d\x97\x70\x9e\x94\
-\x88\x68\x96\x4e\xed\x03\xde\xad\x08\x8a\x20\x71\x3c\x86\x2f\xc3\
-\x4b\x42\x22\x62\x7f\x39\xfd\xd3\x43\xc0\x87\x15\x41\x11\x90\x44\
-\x22\xea\x06\x6f\x77\x64\x76\x76\x76\xb8\xa3\x9d\xdc\x07\xf2\x65\
-\x55\x51\x71\xf9\x81\xc3\xb9\xc2\x6b\x22\x9d\x4e\xe7\x8c\xda\xe1\
-\x9d\x08\xdf\x56\x15\x11\x34\x8e\x76\xf0\x9e\x44\x9e\xe7\xbf\xeb\
-\x78\x74\x3b\xb0\x50\x11\x04\x41\x9a\x6f\x86\x20\x77\x21\xcf\xf3\
-\x53\xe8\xf8\x56\xe0\x44\x45\x50\x4d\xd6\x96\x88\xe6\x10\xac\x0c\
-\x7b\xbd\x5e\x3f\x11\xbd\x0d\xf8\xad\xaa\x68\x42\x83\x9b\x84\xa0\
-\x7d\x98\xa6\xe9\x77\xa8\xdc\x01\x9c\xa9\xe7\xa1\x0d\x99\x10\x7c\
-\x22\xea\xf5\xa6\xbe\x52\xd1\x7b\x80\x61\x99\x17\x48\x54\xc3\x9b\
-\xd0\xc8\x4c\x9c\xa7\xe9\x27\x2a\xfa\x00\xb5\xc3\x93\x08\x09\x68\
-\x50\x13\x1a\x5b\x8a\xf2\x34\x7d\x5f\x91\xc7\x37\x2a\x61\x4f\x90\
-\x8d\xae\xc5\x79\x36\x75\x08\x91\xe7\xeb\xbc\x2a\x4e\x3e\x83\xdd\
-\x0a\x1a\xdf\x8c\x64\xdd\xce\xcb\xa8\xbe\x56\xe6\x44\xfe\x69\x07\
-\xff\x68\xdc\x00\x11\xd1\x2c\xeb\x3e\x2d\xe8\x3b\x65\x5e\xd7\xcf\
-\x0d\xbe\xe3\x37\x6e\x00\xac\x1d\x9e\xd2\xb4\xfb\x88\x22\x73\x55\
-\x45\x05\xcf\x39\x46\x61\x00\x80\x88\x8c\xb0\xc3\xfb\x51\xbe\xa8\
-\x4b\x78\xcc\x33\x1a\x03\x00\xf2\x3c\x5f\x1d\x0e\x57\xf7\x82\x7e\
-\x53\x93\xbc\x2d\x8d\x51\x19\x00\x30\x33\x33\xf3\xc7\x68\xb8\x73\
-\x0f\xca\x0f\x21\xe2\x45\x67\x00\xc0\xae\x5d\x57\xfd\x6c\x6d\x6b\
-\x37\xb0\xe2\x3b\x56\x94\x06\x00\x4c\x4f\x5f\x6d\x04\xbb\x1b\xf8\
-\x75\x13\xd9\x59\x4b\x44\x6b\x00\x40\x96\x65\xdf\xdb\x84\x3d\xc0\
-\x9f\x65\xfe\xbc\xf9\x65\x06\x60\xba\xdb\xfd\x5a\x48\xee\x2a\xbf\
-\x62\x3b\x2f\x7e\x99\x29\x23\xcb\x3a\x9f\x09\x72\x00\x18\x83\x8c\
-\x13\x91\x97\x9a\xce\x69\x82\x09\x26\xf8\x7f\xe0\x6f\x3e\x50\x4e\
-\x18\x86\xf9\x70\xa3\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\
-\x82\
-\x00\x00\x03\x61\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x03\x13\x49\x44\x41\x54\x78\x9c\xed\
-\x9a\xbf\x6b\x14\x41\x14\xc7\xbf\x6f\x93\x70\x9e\x04\x1b\x31\x46\
-\x72\x9b\xdd\x8d\xb9\x42\x08\xd8\xda\xfb\x03\xb4\xb0\x93\x80\x5d\
-\x0e\x44\x25\x9d\x4d\xc8\x5f\x60\x2c\x85\x04\xd1\x22\xa5\x4d\x6c\
-\x44\x48\x04\xb5\xb3\xb0\x15\x52\x08\xd1\xec\xde\xde\x82\x78\x62\
-\xa1\xa8\xe7\x91\xdc\x8c\x4d\x08\x78\xbb\x77\x97\xdd\xb9\x97\xc9\
-\xb9\xf3\x29\xe7\xe6\xbe\xef\xbb\xdf\xdb\x9d\x7d\xcc\x0d\x60\x30\
-\x18\xf2\x0c\xa9\x0a\xd4\xeb\xf5\xd1\x46\xa3\x39\x2f\x81\x1b\x00\
-\x66\x00\x14\xd4\x6d\x29\xd1\x04\xb0\x49\xc0\x5a\xb1\x58\x58\x19\
-\x1b\x1b\xfb\xd9\x6d\xb2\x52\x00\xd5\x6a\xf5\xb2\x84\xb5\x0a\xa0\
-\xa4\xa2\xc3\x48\x44\x10\x15\xc7\x71\x5e\x75\x9a\x60\x65\x55\x0e\
-\x82\xb0\x22\x61\xbd\xc4\xd1\xbd\x78\x00\x28\x49\x58\x1b\x7e\x18\
-\xce\x75\x9a\x90\xe9\x0e\xd8\x0e\xc3\x2b\x96\xa4\x0d\x28\x04\x78\
-\xc8\xb4\x08\xe2\x6a\xd2\x9d\x90\x3a\x80\x7a\xbd\x3e\xfa\xbb\xd1\
-\xfc\x00\x60\xa2\x2f\xd6\x0e\x8f\xe8\x78\xb1\x70\xae\x7d\x4d\x48\
-\xfd\x0b\x36\x1a\xcd\x79\x0c\xde\xc5\x03\x40\x69\xcf\xfb\x3f\xa4\
-\x0e\x60\x6f\xb5\x1f\x48\x92\xbc\x67\x79\x86\x67\xfa\xe0\x45\x17\
-\x31\xef\xc3\x19\x44\xba\xbe\xe7\x5d\xc7\x56\xee\x2d\x54\x08\xaa\
-\x35\xd9\xe5\xe3\x98\xf7\x41\x59\xc5\xd9\x30\x01\xe8\x36\xa0\x1b\
-\x13\x80\x6e\x03\xba\x31\x01\xe8\x36\xa0\x9b\xdc\x07\xd0\xb3\x11\
-\x0a\x82\xe0\x0c\xac\xe1\xbb\x90\xf2\x22\x80\xd3\x3d\xe7\x57\x6b\
-\x1f\x15\xfc\x48\x10\x22\x08\xac\xef\xec\xfc\x79\x5c\x2e\x97\x7f\
-\x28\x68\x1d\x88\xae\x5d\x5b\x18\x86\xd7\x85\xa4\x55\x00\x27\xb9\
-\x8d\x24\xe0\x4b\x41\x37\x3d\xaf\xf4\x2e\xcd\x97\x7a\x74\x82\xb1\
-\x4e\xb5\xe3\x23\xe0\x57\x6b\x4b\x42\xd2\x73\xe8\xb9\x78\x00\xf0\
-\xc8\x92\x6f\xfd\x30\xba\xc3\x59\x24\x31\x00\x3f\x0c\x67\x09\x58\
-\xe0\x2c\x7c\x40\x86\x48\xca\x65\xdf\x8f\x2e\x70\x15\x88\x05\xe0\
-\xfb\xbe\x4b\x92\x9e\x70\x15\xcc\xc0\x10\x59\xf2\xe9\xd6\xd6\xd6\
-\x09\x0e\xf1\xf8\x1d\x60\x0d\x2f\x02\x60\x29\xa6\x80\x37\x32\x72\
-\xec\x36\x87\x70\x2c\x00\x02\xae\x71\x14\x52\xc6\xe2\xf1\x95\xb4\
-\x06\x1c\xcd\x5d\x5e\xc9\xe3\x2b\xf5\x86\xc8\x90\x85\x32\x87\x91\
-\x5d\x60\x9a\x04\x36\xba\x4c\x61\xd9\x68\x49\x1d\x80\x6d\xdb\x2a\
-\x8d\x4e\x47\x6a\xb5\x1a\x5a\x1c\xc2\x3d\xc8\x7d\x2b\x6c\x02\xd0\
-\x6d\x40\x37\x26\x00\xdd\x06\x74\x63\x02\xd0\x6d\x40\x37\x26\x00\
-\xdd\x06\x74\x63\x02\xd0\x6d\x40\x37\x26\x00\xdd\x06\x74\x93\xe5\
-\x7c\x80\x2e\xce\xf6\xda\xf1\x3d\x00\xcd\xf6\x81\xbc\xdd\x01\x9b\
-\xed\x03\xb9\x0a\x80\x80\xb5\xf6\xb1\x3c\x05\x10\x15\x8b\x85\x95\
-\xf6\xc1\xbc\x04\xd0\x22\x88\x4a\xd2\xb9\xe1\x3c\x04\xd0\x92\x24\
-\x6f\x75\x3a\x2f\x3c\x48\x6f\x81\x2c\x44\x04\x51\x71\x27\x3b\x1f\
-\x96\xfe\x1f\x03\xd8\x3f\x2e\x5f\x28\x8c\x2c\x8f\x8f\x8f\xff\xea\
-\x36\x39\xb6\xd5\xdc\x87\x77\x2d\x17\x9f\x5c\xc7\x9e\xee\xb7\x68\
-\x7c\x0d\x90\xf8\xda\xef\x22\x7d\xe2\x0b\x87\x68\xd2\x22\xf8\x9a\
-\xa3\x90\x32\x44\x6f\x38\x64\x63\x01\x08\x41\x0f\x00\xec\x70\x14\
-\x53\xe0\x1b\xc4\xee\x23\x0e\xe1\x58\x00\x53\x53\xa5\xf7\x92\xe8\
-\x28\x9c\x0d\xd8\x87\x60\xcd\xb9\xae\xfb\x99\x43\x3b\xb1\x0f\x70\
-\xed\x89\x87\x00\x9e\x71\x14\x4c\x0b\x01\x4b\x8e\x33\xf1\x82\x4b\
-\x3f\x31\x00\x22\x12\xce\x64\x69\x56\x12\xdd\x83\xbe\xc7\xe1\x3b\
-\x81\x66\x1d\xc7\x5e\xe4\x2c\xd2\xf3\x1f\xd7\xed\xed\xe8\xbc\x65\
-\xc9\x05\x00\x97\x40\x38\xc5\x69\x66\x8f\x48\x02\xeb\x10\xbb\xf7\
-\x3d\xcf\x0b\x0e\xa1\x9e\xc1\x60\xc8\x31\x7f\x01\x50\x46\xc4\x66\
-\xcc\x07\x14\xea\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
-\
-\x00\x00\x00\x97\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x00\x49\x49\x44\x41\x54\x58\x85\xed\
-\xce\xc1\x09\xc0\x30\x0c\x04\x41\xc9\x49\xdf\x71\x4d\x6e\x48\x08\
-\xd5\x11\xec\x22\xce\xa0\xcf\xce\xff\x8e\x35\x13\x44\xd6\x8c\xac\
-\xa9\x7c\x0c\x65\x7c\x03\x01\x04\x10\x40\x00\x01\x04\xb4\x07\xbc\
-\xea\x81\x9b\x7d\x91\xd5\x13\xe0\xfb\x59\xdb\x7f\xe5\x02\x00\x00\
-\xf4\x3b\x2b\x9a\x0d\x40\x4d\xe0\x05\x89\x00\x00\x00\x00\x49\x45\
-\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x00\x85\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x00\x37\x49\x44\x41\x54\x58\x85\xed\
-\xce\xc1\x0d\x00\x30\x08\x03\x31\xd4\xc9\xd9\x14\x21\x16\xe9\x10\
-\xf0\xf4\xfd\x13\x39\x62\x51\xf5\x64\xf5\xe4\xe6\xe3\x6d\xc6\x17\
-\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x7c\
-\x9f\x23\x06\x85\x22\x0f\x12\xcb\x00\x00\x00\x00\x49\x45\x4e\x44\
-\xae\x42\x60\x82\
-\x00\x00\x05\x38\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x04\xea\x49\x44\x41\x54\x58\x85\xe5\
-\x97\x5b\x6c\x54\x55\x14\x86\xbf\xb5\x67\x3a\x20\x24\xe5\x22\x46\
-\x04\x2a\xd0\x80\x29\x04\x4c\x04\x25\x01\x82\xa2\xd0\xd6\x8a\x40\
-\x29\x39\x1a\x52\x22\xf6\x02\x21\x26\xfa\x60\x82\x82\x10\x27\x0d\
-\x0a\xf5\xc5\x04\x45\x94\xda\x16\x8d\xf2\xc2\xf4\xa2\x6d\x28\xd0\
-\x01\xd2\xbe\x80\x04\x6b\x43\xc0\x42\x62\x2c\x17\x4b\xab\x31\x10\
-\x30\x8a\xb4\x9d\xd9\xcb\x87\x99\x29\x67\x7a\x6f\xf1\x8d\xf5\x74\
-\xf6\xda\xeb\xfc\xff\xbf\xd7\xd9\x6b\xaf\x7d\xe0\x41\x37\x19\x4a\
-\x70\xda\xea\x9c\x24\xeb\xf1\x66\x8a\xb1\xcb\x51\x49\x02\xa6\x00\
-\x46\xe0\xba\x42\x0b\xaa\xf5\x88\xb7\x32\x58\xbe\xff\x97\xff\x55\
-\x40\xba\x93\xb7\x20\x6c\x4d\xa1\xa0\xcf\x0f\x12\xf7\x2c\xa2\xdb\
-\x82\x65\x25\x27\xee\x4b\xc0\x72\x67\xd3\x18\xb1\xf6\x73\x60\x5d\
-\xd4\xd5\xa6\x50\x6d\xd0\x23\x61\xa4\xd9\x67\xc2\x6d\x1d\xa1\xb0\
-\xf5\x9a\x11\x13\xc3\x6a\xa7\x89\x48\x1a\xb0\x1a\x98\x1a\x8d\xaf\
-\xb1\x9d\xe4\x9e\xa8\x2a\xfe\x63\xc8\x02\xd2\x9d\xbc\x19\xd6\x4a\
-\x15\x30\x2b\x42\x2c\xfe\xd0\x8d\x49\x07\xea\xea\x0a\x42\xfd\x89\
-\xf6\xfb\xfd\xe6\xd4\x85\xeb\xaf\x02\x1f\x00\xc9\xc0\x35\x63\xed\
-\xaa\x63\x95\xa5\xe7\x06\x2d\x60\x59\x56\x4e\xb2\xc1\x73\x06\x61\
-\x82\xc0\xf7\x9e\x91\xff\xbe\x76\xe4\xe0\xc1\xbf\xfa\x23\xee\x6e\
-\x19\x19\x6f\x8e\xe8\x1c\x75\x77\x9f\xa0\xb9\xc0\x3f\x8a\x2e\x39\
-\x5e\x5e\xd2\x38\xa0\x80\x8c\xec\xec\xc4\xd0\xdd\x51\xa7\x41\x67\
-\x83\xee\x59\x34\x67\xca\xdb\x05\x05\x05\x76\x28\xe4\x6e\xfc\xb4\
-\xac\xbc\xad\x2a\xb2\x0b\x68\x31\x6a\x16\x1c\xab\x28\x6a\x73\x07\
-\x78\xbb\xbf\x11\xba\x3b\x6a\x6f\x84\x9c\xea\xde\xc8\xd3\x56\xe7\
-\x24\xa9\xd7\x9b\x0f\xfa\x12\xf0\xb8\x80\x55\xf4\x2a\x22\x87\x8d\
-\x35\xc5\xdd\x08\xb4\xb6\xa2\xa4\x30\x35\x2b\x3f\x19\x21\xdf\x1a\
-\xfb\x2d\xb0\x1c\xd0\x5e\x33\x90\xba\x36\xf7\x69\x30\x67\x81\x3f\
-\xd5\x98\x99\xc7\x03\x45\xb7\x63\x73\x7e\xbf\xdf\x9c\x3e\xdf\xf2\
-\xae\x8a\xbc\x0f\x8c\xec\x63\xc5\xff\x08\xbc\x57\x5b\x5e\xfc\xa9\
-\x9b\xc4\x71\x1c\xdf\x2d\x3b\xe6\x1c\x90\x02\xac\x08\x96\x17\xd7\
-\xc4\xe6\x4c\x5c\xbe\x30\xbb\x01\x54\x65\x67\x77\xf2\x53\x17\xae\
-\x7f\x1d\x4d\x65\x5f\xe4\x00\xa3\x15\xf6\xa4\xae\xcd\xdf\xe7\x5e\
-\x5c\x20\x10\xe8\x50\x61\x7b\x74\x58\xe8\x9e\xeb\x12\x90\x9e\xb5\
-\xe9\x31\x85\x65\xc0\xcd\x71\x9e\x5b\xfb\xdd\xa8\xa7\x2e\xb4\xec\
-\x00\xd6\xdf\x5b\x53\x3f\x16\x89\xd9\x9c\xba\x76\xe3\x5b\x6e\xf7\
-\xf1\xb2\xe2\x4a\xe0\x12\x30\x37\x7d\x4d\xee\x93\x3d\x04\x28\x76\
-\x65\x44\x99\x1c\x0e\x04\x02\x1d\x31\xff\xb2\xac\x9c\x64\x90\x1d\
-\xc0\xe0\x8e\xad\xae\x18\xfd\x30\x75\x55\xee\xa4\x38\x69\x22\x55\
-\x00\xea\x31\x6b\x7a\x0a\x10\x96\x02\xa8\xda\xa3\x6e\x3c\x63\x3c\
-\x6f\x00\x09\x83\xa0\xee\x6e\xa3\xd5\x6b\x36\xc6\x69\x0b\xeb\x31\
-\x00\xab\xbc\xd0\x43\x00\xaa\x49\x11\x75\x7a\x39\x0e\x46\x59\x31\
-\x0c\xf2\x08\xa1\xf0\xb2\x7b\x6c\xd4\xdb\x0c\x20\x91\x1e\xd2\x4d\
-\x80\x44\x9c\x09\x9d\x3e\x77\x19\x09\x91\xd3\x6c\xb8\x36\xd5\x3d\
-\x90\xf6\x84\x18\xf6\xe4\x28\x76\x7c\x15\x74\x37\xbf\xdf\x2f\x03\
-\xc5\x0c\x60\x9e\x01\xb0\xdd\xe0\x72\x1d\x20\x64\x42\x13\x63\x9e\
-\x82\x82\x02\x2b\x70\xf5\x3e\x04\x5c\x73\x0f\xda\x1f\xba\x13\xc5\
-\xd6\xd6\xd8\x01\xe7\xde\x03\xbf\x01\x88\x30\x3d\x0e\x42\xa8\x61\
-\xb8\xa6\xf1\xef\x26\xa0\xc9\x51\x7f\x4b\xcc\x77\x4f\x80\xa1\x2e\
-\xfa\x94\xee\x7e\x29\x2c\xe1\x2f\x80\xe1\xf4\x82\x0e\xf1\x50\x1c\
-\xa7\x47\x4c\x1a\x00\x62\x4e\xf6\x14\xd0\xa1\xd5\x51\x75\x2b\xe6\
-\x6f\xda\xd4\x55\x76\x27\x02\x07\x9a\x44\xf8\x24\x3a\x37\xa0\xc5\
-\x42\x54\xd9\x55\x1b\x28\x76\x57\x94\x28\xb2\x2a\xca\x5a\xd9\x43\
-\x40\xb0\xaa\xb4\x15\xe1\x24\xc2\x84\x71\x37\x6c\xbe\x1b\xf4\xc6\
-\x78\xf3\x0e\x50\x33\x98\x83\x48\x22\x2a\x02\x8b\xe7\x4e\xde\xe9\
-\xf6\xa7\x66\x6d\x5c\x19\x6d\x72\x3f\x07\x03\x5f\x76\xdd\x0d\xe2\
-\x76\xb8\xb5\xb2\x15\x40\x04\x7f\x46\x76\x76\x62\xcc\xdf\x50\x54\
-\xd4\x79\xf3\x61\x93\x09\xba\x87\xfe\x3f\x47\x08\x65\xd7\x58\xcf\
-\xed\x75\xee\x2e\xea\x38\x8e\x0f\x61\x77\x44\xa0\x6e\xc3\x95\xcb\
-\xb8\x32\xb9\x7c\xf1\xa7\xd6\xe4\x59\xf3\x66\x0a\x2c\xd4\x50\xc2\
-\xec\xf5\xaf\xac\x3c\x54\x5f\x5f\xaf\x00\x6d\x0d\x0d\xb6\xf9\x62\
-\xe3\xd1\x19\x29\x4f\x55\x20\xa2\xc0\x23\x40\x22\x60\x05\x2e\x83\
-\x7e\xe3\x31\x9a\x5b\x5b\x5e\x72\xa8\xa9\xa9\xc9\xfd\xb1\x64\x72\
-\xca\xe2\xcf\x10\xcd\x00\xea\x82\xe5\x25\xdb\xdd\x9c\x3d\x92\x1a\
-\xbd\x07\xfe\x00\xa4\x80\x7e\xbc\x68\xce\x94\x2d\x7d\x5d\x48\x1c\
-\xc7\xf1\x00\x04\x02\x81\x70\x1f\x19\x91\xd4\xac\xbc\x2d\x88\x7c\
-\x84\xd0\x4a\x87\x7d\x26\x58\x55\xda\xda\xaf\x00\xe8\xba\x0f\x9e\
-\x01\xc6\x03\x15\x9d\xc6\xb7\xa1\x2e\xb0\xef\xef\x3e\x48\x7a\x35\
-\xc7\x71\x7c\xb7\x6d\xe2\x5e\x45\x36\x02\x77\xc0\x3e\x17\x2c\x2f\
-\xfd\xb1\x7b\x5c\xaf\x27\xd5\xaf\x4d\x8d\x37\xa7\xa7\xcc\xff\x0e\
-\x21\x4d\x60\x89\x47\xc3\x1b\x66\xcc\x9a\x77\x3b\xe9\xd1\x95\xe7\
-\xaf\x5c\xa9\xef\xb7\x24\xfd\x7e\xbf\x49\x98\xf0\x84\xd3\xae\xbe\
-\x32\x90\x54\x22\x57\xb1\xb4\xda\x8a\xe2\x86\xde\xe2\xfb\xdd\xd7\
-\x4b\x33\x5f\x1f\x9b\x60\xbc\x45\x08\x4e\xd4\xd5\x22\x50\x0d\x7a\
-\x44\x30\xcd\x18\xdb\xd6\xde\x19\xb6\x3e\x8f\x6f\xa2\x45\xa7\x02\
-\xe9\x82\xae\xa6\xab\x7f\x48\x6d\xa7\xe9\xdc\x50\x17\xf8\xea\xf7\
-\xbe\x38\x06\xf5\x63\xb2\xcc\xc9\x5d\x68\xac\x29\x04\x9e\x1d\x4c\
-\x3c\xd0\x88\xd8\xad\xc1\xb2\xd2\xda\x81\x02\x87\xf4\x6b\xf6\x62\
-\xe6\xe6\x69\x21\x13\xca\x14\x23\xcb\x45\x35\x49\x23\x6d\xd5\x03\
-\xb4\x00\x2d\xa2\x5a\x8f\x78\x2a\x6b\xcb\x8b\x2e\x0d\x05\xf7\xc1\
-\xb6\xff\x00\xf7\x80\xda\xb0\x80\x19\xdd\x42\x00\x00\x00\x00\x49\
-\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x00\xcc\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x00\x7e\x49\x44\x41\x54\x78\x9c\xed\
-\xd9\x41\x0d\xc0\x20\x14\x05\x41\x5a\x4d\x78\xc2\x4f\x65\xd5\x14\
-\x95\xb1\x4d\x98\x31\xf0\x5f\x36\xdc\x18\x23\x34\xd7\xb3\xe7\x7a\
-\x76\xb9\xe1\x2e\x8f\xff\x81\x00\xf5\x80\x9a\x00\xf5\x80\x9a\x00\
-\xf5\x80\x9a\x00\xf5\x80\x9a\x00\xf5\x80\x9a\x00\xf5\x80\x9a\x00\
-\xf5\x80\x9a\x00\xf5\x80\x9a\x00\xf5\x80\x9a\x00\xf5\x80\x9a\x00\
-\xf5\x80\x9a\x00\xf5\x80\x9a\x00\xf5\x80\x9a\x00\xf5\x80\xda\xf1\
-\x01\xae\xf2\x78\xfd\x35\x3e\x46\xff\x02\xde\xf8\x3e\x00\x00\x00\
-\x00\x00\x00\x00\x9c\xe0\x03\xda\xaf\x07\x8e\xa0\xaf\x15\x04\x00\
-\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x00\x68\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x00\x1a\x49\x44\x41\x54\x58\x85\xed\
-\xc1\x01\x01\x00\x00\x00\x82\x20\xff\xaf\x6e\x48\x40\x01\x00\x00\
-\x00\xef\x06\x10\x20\x00\x01\x47\x01\xa0\x88\x00\x00\x00\x00\x49\
-\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x01\xf7\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x01\xa9\x49\x44\x41\x54\x58\x85\xed\
-\x96\xb1\x4a\xc3\x50\x14\x86\xff\x93\x64\xb1\x05\x5f\x40\xd4\x37\
-\xa8\x60\xa1\x11\x41\x7c\x03\x29\x0d\x2a\x5d\x7c\x01\x5d\x04\x11\
-\x97\x4e\x1d\x1c\x44\x97\xe2\x13\x38\x59\x49\x3a\x17\x17\x41\x0a\
-\x86\x52\xb0\x8f\x50\x3b\xb8\xb8\x28\xd4\xa9\xb9\xc7\xa1\x26\x36\
-\xb5\xb7\x4d\x4c\x6b\x86\xf6\x9f\x6e\x92\x73\xcf\xff\xe5\xdc\x7b\
-\x0f\x17\x98\x75\xd1\xa8\x8f\xa9\x2a\x27\x13\x1d\x51\x64\x50\x0e\
-\xc0\x6a\x44\xaf\x16\x83\x4d\x47\x53\x0a\x8d\x1d\xfa\x1c\x0b\x90\
-\xaa\x72\x72\xa1\xc3\x35\x00\x6b\x11\x8d\x07\xd5\xec\x6a\xb4\xe9\
-\x42\x28\xb2\xa8\x44\x47\x14\xa7\x60\x0e\x00\x6b\x6a\x57\x14\xdd\
-\x07\x29\xc0\x77\xd9\xa7\x22\x02\x19\xee\x58\x1b\x11\xe7\x5b\x73\
-\x3b\xa7\x8c\xdc\x2f\xe3\xa4\x5b\x82\x87\xe5\x96\x56\xe0\xbf\x34\
-\x07\xf8\xb5\x07\xd2\x65\x5e\xd1\x54\x6c\x03\xec\x7b\x9f\xa9\xf0\
-\x91\x2c\x09\x09\x08\x02\x9a\xcb\x0e\x9e\xee\xf6\xc8\xf9\x33\x80\
-\x6e\xf1\x09\xc0\xe7\xc3\xc0\x88\xb9\x24\xcd\x42\x3d\xdc\x17\x0d\
-\x8f\x69\x93\xf7\x1b\x06\xbd\x06\x05\xf0\x96\x20\x53\xe1\x3c\xc0\
-\x17\xc3\xcc\x43\x68\x4b\x23\xbe\xdd\x2d\xb3\x1a\x1a\x80\x98\x4f\
-\x23\x18\xfb\x20\xda\x2a\x36\x82\x06\xf7\xff\xed\x40\xd7\xe3\xeb\
-\xe0\x9e\x94\x05\xb0\xe4\xcd\xec\xe5\xaa\x85\x05\xf0\x35\x1a\x3b\
-\xa7\x4a\x37\xdd\xa0\x74\xcb\x01\x40\x87\x1e\x80\x12\xfc\x74\xc5\
-\x7e\x0c\xe7\x00\x73\x80\xd8\x01\xa2\x74\x3d\xa9\x88\xb9\xa4\x5b\
-\x42\xde\xba\x81\x96\x3b\x88\xa5\x02\x0c\x36\xe3\x04\x68\x3a\x9a\
-\x52\x88\x03\xa0\xc5\xe0\xab\xfe\x1b\x31\xd0\xd7\x7e\x75\x4b\xbc\
-\x03\x58\x9c\x88\x15\xd3\x81\x6d\xd0\x4d\x90\xd0\x9f\x0a\x30\xee\
-\x27\x62\x0e\x74\x85\x8a\x87\xa0\xc1\x1e\x80\x50\xe9\x18\xc0\x5b\
-\x64\x7b\xa6\xb3\x7a\x96\xda\xa1\x01\xea\x59\x6a\x0b\x85\xd6\xc1\
-\x30\x01\x7c\x84\xb5\x05\xf0\x0c\x50\xde\x36\xe8\x32\xe4\xdc\x19\
-\xd7\x17\x91\x1d\x7b\x32\x62\xe5\x6b\x14\x00\x00\x00\x00\x49\x45\
-\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x01\x94\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x01\x46\x49\x44\x41\x54\x58\x85\xed\
-\xd1\x21\x4b\x43\x51\x18\xc6\xf1\xff\x7b\xc7\x8a\x41\x04\x41\xcb\
-\x76\xdd\xf6\x09\x04\x6d\x36\x93\xa8\x6b\x82\x49\xab\x82\xdf\xc1\
-\x62\x31\xf8\x11\x64\x20\x18\x0c\x26\x41\x10\x8b\xa0\x08\x86\x15\
-\xc1\xec\x7d\xcf\x3d\xd7\xee\x98\x60\x71\x7b\x2d\x1a\x14\xb6\xbb\
-\xbb\x24\x78\x7e\xf1\xf0\xf0\xf0\x1c\x5e\x08\x82\x20\x08\xfe\x3b\
-\xc9\x0b\x68\xea\x8f\x31\x16\x22\xb1\xad\x38\x8e\x9f\x46\x29\x4d\
-\x92\xa4\x26\x51\xe9\x14\xa4\x33\x17\x57\xd6\x45\xc4\x06\x65\xa3\
-\xdc\x36\x63\x0a\x98\xef\x9b\xdc\xab\x66\xcb\x79\x71\xe7\xdc\x82\
-\x44\xe5\x07\x90\x25\x8c\xe9\xbc\x7c\xee\x80\x52\xc4\x16\x70\x0e\
-\x4c\x22\x76\xe5\x5c\xb6\x3d\x28\xab\x9a\xad\x19\xd1\x2d\xd8\x2c\
-\x70\x63\xf6\xb1\x32\xec\xf7\x23\x0d\xa8\x56\xab\xef\x73\x71\x65\
-\x13\xe1\x08\x28\x1b\x76\xe2\x9c\xdf\x37\xb3\x1f\xe7\x4b\xd2\x6c\
-\x17\xb1\x0b\x60\x02\x38\x7d\xeb\x76\x56\xea\xf5\xfa\x6b\x5e\x7f\
-\x21\xaa\xe9\x9e\x3a\xdf\x53\xe7\x4d\x35\x6b\xb5\xdb\xed\xb2\x99\
-\x45\x89\xf3\x87\xea\xbc\xa9\xf3\xa6\x69\x76\xf0\x7b\xdc\x30\x23\
-\x07\xbf\x39\xf7\xd2\x34\xfa\x67\xc0\x84\xc1\x9d\x40\x17\x58\x05\
-\x3e\x30\xdb\xa9\xd5\xe2\x56\x91\xbe\xc2\x03\x00\xd2\x34\x5d\xec\
-\x9b\x5c\x02\x33\x5f\x4f\xdd\xbe\xd8\x46\x23\x8e\xaf\x8b\x76\x8d\
-\x35\x00\x40\x55\xeb\x48\xe9\x59\xc0\xf7\x7a\xd2\x6c\x34\x2a\x8f\
-\xe3\x76\x8d\xcd\xcc\xa4\xc8\xbd\x83\x20\x08\x82\x3f\xe9\x13\xfa\
-\xca\x87\x49\xdf\x83\x3a\x35\x00\x00\x00\x00\x49\x45\x4e\x44\xae\
-\x42\x60\x82\
-\x00\x00\x04\x83\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x04\x35\x49\x44\x41\x54\x78\x9c\xed\
-\x9b\x4b\x88\x1c\x55\x14\x86\xbf\x53\xdd\x93\x31\x24\x41\x88\xf1\
-\x85\xa8\x2b\x51\x5c\x08\x43\xb7\x11\x11\x64\x14\x8d\x06\x31\xf8\
-\x00\x5d\x89\x4e\x30\xd3\x1d\x92\x9e\x76\x40\x11\x7c\xd0\x36\x89\
-\x98\x80\xf8\xe8\x36\xa6\x7b\x0c\x18\x17\x06\x75\x15\x06\x34\x3a\
-\xba\x48\x40\x90\xcc\x74\xe2\x03\x71\x21\x88\xb8\xd0\xa8\x84\x28\
-\x9a\x09\x66\x66\xba\x7e\x17\x6d\xa0\xaa\x18\x83\xd1\x7a\x5c\x4c\
-\xff\xcb\xff\x40\xdd\x73\xbf\x3a\x7d\xef\x3d\x55\xd5\xd0\x57\x5f\
-\x7d\x9d\xcd\xb2\xac\x13\xf8\xa7\x2a\x8e\x36\x6b\x66\x7a\x4a\x60\
-\x48\x5b\x3b\x13\xd5\x67\xe2\xb8\xae\x17\xc7\x45\x92\x56\x61\xf4\
-\xe5\x9b\x30\x6a\x82\x3c\x90\xc3\xec\xe9\xb8\xae\xed\x3c\x80\xd5\
-\xa5\x66\xd1\xcc\x26\x41\xc1\x6a\x8d\x2d\x6f\xa7\x01\x14\x46\x9b\
-\x57\xf9\x68\x1f\xb0\x3c\xe8\x0b\xfc\xb8\xc6\x70\x16\x40\x61\xf4\
-\xa5\xcb\xcc\x34\x05\xac\x8a\xc6\x0c\x14\xd7\x38\xf9\xb8\x2e\x14\
-\xa7\x86\x46\x1a\xe7\x9b\x31\x05\x5c\x9a\xf4\x58\xce\x55\xc0\x0d\
-\xeb\xb7\xaf\xc8\x2d\xe1\x3d\xe0\xca\x34\xc6\x73\x0a\xc0\xf0\x43\
-\xaf\x9f\x33\x37\xb0\x74\x2f\x50\x0c\xfa\x8a\xb1\xe4\xa3\x72\x06\
-\xc0\x70\xad\x96\xff\x7d\xf0\xf8\x1e\xc1\xcd\x91\x90\x2c\xc6\x45\
-\x2f\x2a\x47\x00\xc8\x8e\x1f\x39\xaf\x6d\xe8\xee\xb0\x6f\x22\xc1\
-\xc9\x83\x23\x00\x8a\xa5\xe6\x76\x8c\xf5\x41\x4f\x98\x40\x89\x4e\
-\x1e\x1c\x00\x50\x28\x35\x1e\x07\x1e\x8b\xfa\x96\xc2\xe4\x21\x63\
-\x00\xd7\x96\x1b\x1b\x0c\xb6\x2d\x12\xea\xa6\x95\x43\x66\x00\x8a\
-\xe5\xe6\xbd\x12\xad\xa8\xaf\x94\xee\xfc\x29\x65\x02\xa0\xb8\xa1\
-\x71\x0b\xd2\x9e\x45\xc6\xf7\xad\xb7\xf0\xa5\xa6\xd4\x01\x14\xcb\
-\x8d\xd5\x78\xec\x05\x96\x04\x7d\x19\x3e\x09\xee\xf7\x7f\xa7\x54\
-\x01\x5c\x57\x6a\x5c\x8d\xd8\x07\x2c\x8b\x84\x7c\x53\xfa\x93\x87\
-\x14\x01\x0c\x6d\x7a\xe5\xf2\x05\x6c\x0a\x58\x19\xf4\xff\xea\xec\
-\x32\x99\x3c\xa4\x04\xe0\x9a\xf2\xce\x0b\xbc\x05\xff\x43\x43\x97\
-\x04\x7d\x81\x1f\x67\x67\xf7\x6f\x94\x78\x37\x58\x18\x6d\x9f\x6b\
-\x3a\xf9\x3e\x70\x45\xd0\x57\xef\x88\x9b\xe9\xe4\x21\xe1\x0a\xb8\
-\x7e\xfc\x85\xa5\x66\x73\x93\xc0\x50\x28\x20\x4b\xf4\x7c\x7f\x26\
-\x4a\x0c\xc0\x70\xad\x96\x9f\x9f\xcd\xbf\x05\xba\x31\xe8\xab\x77\
-\xca\x75\x62\xf2\x90\x14\x80\x5a\xcd\x9b\xfd\x69\xd5\x2e\x8c\x75\
-\x41\x5b\xb8\x73\xe7\x4f\x29\x01\x00\xb2\xe2\x91\x95\xcf\x4b\x7a\
-\x30\xec\xbb\x37\x79\x48\x60\x11\x2c\x96\x1b\x4f\x20\x1b\x0f\x99\
-\x12\x98\x7b\x93\x87\x98\x2b\xa0\x50\x6a\x96\x91\x6d\x0d\x99\x02\
-\x33\x4b\xad\xb9\x39\x53\xc5\x06\xa0\x58\x6a\x6c\x33\xb4\x33\xea\
-\xcb\xf0\x33\xdf\xeb\x4e\xa3\xf8\x2a\x20\xf2\x40\x03\x7a\x9d\x9d\
-\x0b\x7b\xfd\xe9\x14\x1f\x00\xa5\xd7\xc3\xc7\xa9\xd8\x00\x98\xa9\
-\x4a\xe4\x6e\x1b\xe6\xb9\xfe\xfa\x35\x36\x00\x33\xad\xea\x3b\x48\
-\x95\xa8\x2f\x91\x73\x19\x42\xac\xbb\x40\x67\xa2\xba\xc3\xa0\x16\
-\xf4\x0c\x40\xca\xb9\xfa\x26\x3e\xf6\x83\xd0\x4c\xbb\xb2\x05\xac\
-\x19\x76\x0d\x50\xe6\x0f\x60\x17\x53\x02\x49\x99\x3a\x17\x1d\x7d\
-\x44\xf0\x66\x34\x90\xcc\x78\xff\x4d\xc9\x24\x54\xaf\xfb\x68\x70\
-\x04\x78\x37\x12\x31\xe4\x16\x84\xc4\x92\x39\x34\x51\x9a\x97\x06\
-\xef\x03\x3e\x0e\x05\x0c\x03\x73\x06\x42\xa2\x89\x1c\x9a\x28\x9d\
-\x58\x38\xd9\xbd\x53\xf0\x79\x38\x22\x67\x7e\x0e\x89\x27\xf1\xd9\
-\xee\xf1\x5f\xbd\x5c\xee\x76\xe0\x9b\x48\xc8\x7a\xd5\x90\xad\x52\
-\xb9\x0b\x33\xaf\x6e\xfa\xd1\xeb\xda\xad\x88\x1f\x42\x01\xe1\x29\
-\x63\x08\xa9\x95\xe1\xf4\xae\xca\xb7\x78\xba\x0d\xf8\x25\xe8\x9b\
-\xf0\x7a\x8f\x0a\xb2\x51\xaa\xbf\xc3\x4e\xab\xfa\xa5\x87\x77\x07\
-\x70\x22\x14\x90\x79\x22\x1b\x08\xa9\x2f\x44\xd3\xed\xcd\x9f\xf8\
-\x66\xf7\x00\xf3\x41\xdf\x30\x4f\x19\x54\x42\x26\x2b\xf1\xe1\x56\
-\xe5\x03\xc3\x1e\x20\xda\x3c\xc9\x3c\xa5\x7c\x66\xce\x6c\x2b\x9a\
-\x69\x57\xde\xc6\xd8\x18\xf5\x4d\x78\x69\x12\xc8\x74\x2f\xee\xb4\
-\xc6\xda\x88\x27\x43\xa6\x81\xa4\x5c\x5a\x39\x64\x7e\x18\xe9\x4c\
-\x54\x9e\x43\x7a\x31\x64\x9a\xa1\x94\x4e\x8b\x99\x03\x00\x53\xe7\
-\xe2\x63\x8f\x9a\xd9\x1b\x21\x17\xa5\xd2\x37\x38\x00\x00\xa8\xd7\
-\xfd\x65\x17\x1e\x7d\x18\x31\x19\xf2\x2d\xf9\x0e\xd2\x0d\x00\xc0\
-\xfe\x7a\x7d\x61\xf9\xdc\x8a\xfb\x31\x0e\x44\x42\xa6\x04\xf3\x74\
-\x06\x00\xc0\xfe\xdd\x23\x7f\xe4\x06\x58\x07\x1c\x0e\xfa\x96\xe0\
-\xd6\xe8\x14\x00\x80\x83\xcd\xb1\xdf\xe6\x6c\x60\x2d\xf0\x75\x1a\
-\xe3\x39\x07\x00\xe0\x8b\xd6\xc6\x9f\xbb\x79\x6f\x8d\xb0\xef\x93\
-\x1e\xcb\x49\x00\x00\x9f\xee\xd8\xfc\x5d\x1e\xad\x01\x8e\x45\x63\
-\x71\x9e\x16\x9d\x05\x00\x70\xb0\x3d\xf6\x15\xc6\x5a\x60\x36\xe8\
-\xdb\xd9\xf2\x97\x19\x80\x4e\x6b\x6c\x1a\x9f\xbb\x14\xf8\x7e\x30\
-\xce\x8f\x29\x9d\x07\x00\xd0\x79\x6d\xec\x23\xd0\x16\xb0\xae\x89\
-\x2e\xe6\x3d\x9b\x75\x4e\x7d\xf5\xd5\xd7\xff\x43\x7f\x02\x97\x76\
-\x3e\x83\x62\x89\x8e\x83\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\
-\x60\x82\
-\x00\x00\x00\x89\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x00\x3b\x49\x44\x41\x54\x58\x85\xed\
-\xcd\xb1\x11\x00\x10\x10\x05\xd1\x4f\x21\x28\x45\xa2\x6b\x33\x5a\
-\x31\x14\x72\x22\xa1\xf4\x12\xfb\xa2\xcd\x56\x02\x00\xe0\x77\xe1\
-\xc6\x5c\x7b\xc8\x54\x7d\xb6\xd6\x4b\x4e\x4d\x92\xa2\xcf\x10\x00\
-\x00\xe0\xed\x00\x5a\x36\x07\x04\x97\xc1\x22\x16\x00\x00\x00\x00\
-\x49\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x02\xca\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x02\x7c\x49\x44\x41\x54\x58\x85\xed\
-\x97\x4b\x72\xd3\x40\x14\x45\xcf\x73\x32\x00\xb6\x10\x59\x2d\xcd\
-\x60\x0b\x6c\x81\x01\x90\x00\x81\x90\x8a\xf3\x71\x15\x2c\x20\x55\
-\xac\x81\x61\x66\x0c\x20\xc4\xf9\x3b\x21\x14\x55\xac\x81\x35\xc0\
-\x08\xb7\x24\x03\x3b\x00\x06\xc4\x8f\x41\xe4\x20\xeb\x63\x49\x2e\
-\x33\x82\x1e\x59\xaf\xba\xef\x39\x7e\x6a\x5b\x2d\xf8\xd7\x87\x0c\
-\x3f\x58\xfb\xe5\xa6\xca\xe0\x85\xc0\x55\x94\x67\x9e\xd7\x7c\x3b\
-\x4d\x90\xb5\xd1\x3c\xc2\x73\xe0\xa7\xd0\x78\x6a\xcc\xdc\x87\x51\
-\x81\x20\xfa\x08\x5c\x8f\x2f\x07\x2a\xba\xe4\xbb\x6e\x77\x1a\xf0\
-\x5e\x18\x3e\x14\x95\x03\xa0\x11\x97\x3e\x79\xa6\x79\x83\x44\x01\
-\x90\x2b\x89\x35\x0d\x51\x39\xec\x85\xe1\xe2\x5f\x80\x83\x70\xed\
-\x12\x74\x59\x54\xdd\x04\x06\xd3\x94\xe8\x85\xe1\x62\x06\x0e\x03\
-\x51\xd9\xcc\x08\x78\x5e\xf3\x4c\x45\x97\x73\x24\x0e\x26\x91\x88\
-\xe1\x87\x19\x38\xb4\x8c\x71\x4e\x33\x02\x00\xbe\xeb\x1e\xe5\x48\
-\xcc\xd4\x95\x28\xfc\xe6\xd0\x32\xa6\xb9\x9f\x9c\x2b\xe4\x0c\x6b\
-\xa3\x25\x84\xbd\x54\xc0\xb9\x20\x4b\xc6\x38\x27\xe3\xe0\x41\xd0\
-\x7f\xa0\xe8\x21\x30\x53\x06\x2f\x14\x98\x54\xa2\x00\xae\x02\x2b\
-\x79\xf0\xb1\x02\xb1\xc4\x63\x84\xdd\x2a\x12\x41\xd0\xbf\xaf\xe8\
-\x51\x1d\x78\xa9\x40\x89\xc4\xa3\xe1\x66\x9a\x14\x5e\x49\xe0\x02\
-\x10\x2d\x2b\x74\xf2\x24\x00\xf2\xe1\xd2\x32\xc6\xd9\x2b\xcb\xae\
-\x24\x30\x46\x62\xf8\x6b\x49\xd6\x2a\xc3\x6b\x09\x24\x24\x76\xc7\
-\xac\xab\x05\x87\xd4\xff\x40\xd9\x30\xa6\xb9\x2f\xb0\x02\x68\x01\
-\x7c\xb5\x0e\xbc\xb6\x00\x80\x2a\x3f\xf2\x04\xe4\xa2\xf6\xbd\x6e\
-\x5e\x2d\x01\x6b\xa3\x05\x84\xe3\xbc\x75\x0a\x0d\x45\x8f\x83\xa0\
-\x7f\xaf\x4e\x66\xe5\x3d\x10\x3f\xcf\xbb\xc0\xec\x08\x57\x04\x54\
-\x93\x39\xe7\x28\x8b\x9e\xd7\x3c\xab\x92\x5b\xa9\x03\x45\x70\x45\
-\xd6\x44\x59\x65\xf4\x96\xcc\x20\x74\xad\x8d\x16\xa6\x22\x60\x6d\
-\x74\xb7\x08\xee\x1b\xa7\x63\x8c\xb3\xab\xc8\xda\xa4\x12\x63\x05\
-\x62\xf8\x49\x06\x2e\xba\xee\x1b\xa7\x33\x2c\xf8\xc6\xe9\x14\x48\
-\x1c\x97\x49\x14\x0a\x8c\x85\xbb\xee\x4e\x7a\xbe\x6f\x9c\x8e\x8a\
-\xae\xa7\x24\x66\xcb\x24\x72\x37\x61\x2f\x0c\xef\x88\xca\x69\x55\
-\x78\x6a\xed\xaa\xa8\x6c\xa7\xb2\x7f\xc5\x1b\x33\x73\xd0\xcd\x74\
-\x60\x0c\x7c\xa3\x0c\x0e\xe0\xbb\xee\x8e\x8a\x6e\x90\xed\x44\xd7\
-\xda\x68\x3e\x3d\x7f\xa4\x03\xbd\x30\xbc\x2d\x2a\x6f\x0a\xe0\xaf\
-\xcb\xe0\xa9\xac\x35\x51\x79\x45\x49\x27\x12\xef\x05\xfd\x5b\x88\
-\xbe\x9b\x06\xfc\x4f\x66\xb8\x8e\xc8\xcb\xb4\x84\xd0\x98\x37\x66\
-\xee\x3d\x8c\x1c\x95\x75\x2b\x0d\x47\xb5\x3d\x29\x1c\xc0\xf3\xdc\
-\x6d\x54\xdb\xa4\x6e\x87\x32\xd8\x1a\x5e\x5c\x0a\xe8\xe8\x41\x54\
-\x51\x6d\x7b\x9e\xbb\x3d\x29\xbc\x44\xe2\x3c\x23\x20\x2a\x4f\x80\
-\xcf\xc0\x37\x41\x5a\xd3\x80\x27\x25\xe2\xa7\xe8\x57\xa0\xc7\x05\
-\xeb\xff\x00\xe0\x37\x93\x02\x62\x58\xa2\x39\x4a\x39\x00\x00\x00\
-\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x00\xce\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x00\x80\x49\x44\x41\x54\x58\x85\xed\
-\xd2\x21\x0e\xc2\x40\x14\x84\xe1\x7f\x96\x3b\x90\x70\x13\xe4\x9e\
-\x81\x0b\x20\x30\x1c\x09\x81\xc6\xd6\x22\xeb\x38\x0a\x49\xef\x40\
-\x07\xd5\x26\x0d\x09\xae\x5b\x33\x9f\x7b\x6f\x37\x99\x11\x0f\x22\
-\x22\x22\x36\xa6\xc5\x64\xab\xf6\xec\xd6\x0c\xec\x2b\x1f\x24\xff\
-\x14\x38\x76\xae\xb6\x1f\xc0\x61\xcd\x02\xc0\x50\xd0\xf9\x75\xd2\
-\x13\xa0\x4c\x5b\xdb\xb7\x06\xe1\x00\xfb\x11\xdf\xa7\xa1\xfc\xfb\
-\xd9\xc2\x5c\x40\xd2\x15\x78\x37\xc8\x1c\x3c\xea\x32\xe7\x2e\x9e\
-\x36\x38\xc2\x88\x88\x88\xcd\x7d\x01\x5e\x93\x20\x04\x37\xe4\x99\
-\xec\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x0b\x37\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x0a\xe9\x49\x44\x41\x54\x78\x9c\xed\
-\x5b\x7d\x70\x54\xd5\x15\xff\x9d\xbb\x9b\x4d\x22\xe6\x43\xc1\xaf\
-\x06\x3f\x30\xc8\x40\x43\xac\x12\xb4\xc6\xd2\xc8\x47\xb2\x18\x85\
-\x60\x36\xbc\x56\xb1\x68\x20\x9b\x08\x5a\xdb\xe2\xb4\x4e\x65\xa6\
-\xae\xb1\xda\xb1\x1f\x02\x23\xa3\x68\xd8\x40\x44\xa3\x6d\x97\x04\
-\x06\xac\x31\x5f\x76\x53\x14\x1c\x85\xd0\x22\x04\x18\x35\x44\xc5\
-\xd4\x56\x49\x42\x40\x20\xfb\x76\xdf\xe9\x1f\x21\xf0\xf6\xed\xdb\
-\xb7\x6f\x93\x5d\xa6\xd3\xf2\x9b\xd9\x3f\xde\xb9\xbf\x7b\xce\x79\
-\xe7\xdd\x77\xdf\xbd\xe7\x9e\x05\xce\xe3\x3c\xce\xe3\xff\x19\x74\
-\x2e\x8c\x14\x4a\x8b\x2e\x91\x15\x6b\x9e\x20\xce\x56\x18\x13\x09\
-\xb8\x16\xe0\x74\x10\xa5\x42\x81\x05\x84\x7e\x00\xfd\x20\xfe\x0c\
-\x0a\xf6\xb3\xa0\x0e\x41\xd8\xd6\xe4\x71\x1f\x8a\xb7\x6f\x71\x0b\
-\xc0\xcc\xbb\x2a\x32\x85\x35\x50\x2a\x98\x8a\x18\xb8\x7e\x98\x6a\
-\x0e\x31\x73\x03\x43\xd4\xb4\xd6\xaf\xdd\x09\x80\x63\xe9\x23\x10\
-\xfb\x00\xd0\xac\xe2\xb2\xd9\x24\xc4\xa3\x04\x9e\x11\x63\xdd\x7b\
-\x99\xb0\xa2\xf7\x62\xf1\xea\xae\xaa\x2a\x39\x56\x4a\x63\x16\x80\
-\xd9\x8e\xc5\x33\x14\x12\xbf\x03\x30\x35\x56\x3a\xf5\xc1\x5d\x04\
-\x3c\xd1\x54\x57\xbd\x01\x31\x18\x11\x23\x0e\xc0\xac\x22\xe7\x65\
-\x64\xc5\xb3\x44\xb8\xd7\x80\xa6\x30\xf0\x2e\x31\xbc\x0c\x3e\x20\
-\xc8\xf2\x09\x83\x7a\x64\x31\x70\x2c\x19\x14\xf0\x05\x90\x42\x24\
-\xd2\x40\x34\x0e\x8c\x09\x44\x9c\x0b\xa6\x02\x00\xc9\xe1\x14\x32\
-\xb0\xcd\x02\x5a\xda\x58\xb7\x76\xdf\x48\xfc\x1f\x51\x00\x66\x4b\
-\x65\x37\x2b\x0a\x6d\x06\x70\x85\xb6\x8d\x81\x63\x00\xde\x14\x44\
-\x5b\x03\x81\x81\xb7\x5a\x37\x6d\x38\x12\x8d\xee\x5c\x69\x59\xf2\
-\xa8\x40\xff\x4c\x82\x98\x0b\xe2\x22\x3d\x1b\x00\x4e\x01\x58\xdc\
-\x5c\xe7\x7e\x7d\x58\x37\x80\x11\x04\x20\xdf\x51\xb6\x80\x88\xd6\
-\x01\x48\x0c\x71\x8a\xe8\x39\x9b\xcd\xfa\xcc\x5f\x5e\x5b\xd3\x3b\
-\x5c\xfd\x6a\x48\x92\x64\xeb\x53\xd2\xca\x01\x3c\x0e\xe0\x52\x6d\
-\x3b\x01\x4f\xe7\x4e\xce\x78\xbc\xb2\xb2\x52\x89\x56\x77\xd4\x01\
-\x70\xb9\x5c\x62\xfb\xbe\xee\xa7\xc0\xfc\x98\xa6\x49\x01\x63\x9d\
-\x15\xa8\x6c\xa8\x77\x1f\x8e\x56\xaf\x19\x14\x15\x2d\x4e\x39\x61\
-\x15\x8f\x10\xe1\xe7\x00\x2e\x54\xb7\x31\x68\xb3\x5f\x24\x2c\xf4\
-\x7a\x5e\x38\x1e\x8d\xce\xa8\x02\xe0\x72\xb9\xc4\xf6\x0f\x0f\xd7\
-\x82\xe8\x6e\x8d\x96\x6e\x41\x5c\xdc\xe8\xa9\x7e\x3f\x1a\x7d\xc3\
-\x45\xa1\xc3\x39\xd6\x4f\xd8\x84\xd0\x09\x77\xb7\x35\xe9\xe4\xf4\
-\x86\xda\xda\x7e\xb3\xba\x2c\xd1\x18\xb6\x8d\xbe\xae\x12\x44\x0f\
-\x69\xc4\xef\x09\x16\xb3\x1a\xeb\xdc\x07\xa3\xd1\x35\x12\x7c\xbc\
-\xbf\xbd\xff\xb2\xc9\xb7\xbd\x9a\xa0\xf8\xae\x21\x0a\x5a\x63\x5c\
-\x11\xf0\x27\x64\xe7\x4c\xce\xfc\x73\x47\x47\x87\xa9\x2f\x84\xe9\
-\x00\xd8\x1d\xce\x1f\x82\xb0\x5a\x23\x7e\x59\x4e\xf1\x4b\xad\xaf\
-\x57\xf7\x99\xd5\x13\x2b\x1c\xee\x78\xcf\xdf\xb9\xbf\x7d\x53\xe6\
-\xa4\x1b\x4f\x80\x28\x1f\xa7\x47\x33\x01\x13\x4e\x21\x39\xa9\xb3\
-\xa3\xbd\xc5\x8c\x1e\x53\xaf\x40\x41\xc9\xe2\xa9\x80\xd8\x06\x20\
-\x49\x25\x7e\xb5\xb9\xce\x7d\x1f\xe2\xb0\x3a\x8b\x16\xf9\x0e\xe7\
-\xcf\x88\xb0\x52\x2d\x63\xc2\xfd\x2d\x1b\xdd\x1b\x22\xf5\x8d\x18\
-\x80\x59\xc5\xf7\x8d\x16\xc2\xf6\x0f\x00\x19\x67\xb5\xe3\x7d\x39\
-\xd5\x7f\x9b\xb7\xa6\xe6\x54\x54\x8e\x16\x3b\x27\x91\x05\xc5\xcc\
-\xb8\x9e\x80\xb1\x18\xfc\x05\x00\x1c\x26\xe0\x30\x33\xda\xc9\x82\
-\xfa\x61\xec\x01\xa8\xc0\xe1\xac\x06\x61\x91\x4a\xe6\x13\x2c\x72\
-\x1b\xeb\xab\xda\x0d\x3b\x46\x74\xba\xa4\xbc\x9a\xc0\x8b\x55\x3d\
-\xba\xe1\x53\x6e\x6a\xde\xb2\xae\xdb\x8c\x67\x83\x9f\xb0\xf4\xa5\
-\x00\x2f\x01\x30\xd1\x4c\x1f\x00\xbb\xc1\xf4\x5c\xba\xa5\xef\x15\
-\x8f\xc7\x13\x30\xd3\xa1\xb0\xf0\xe1\x44\xff\x05\x27\xdf\x06\x70\
-\xeb\x90\x8c\x81\x76\xff\x91\x8c\xef\x7a\xbd\x95\xfe\x70\xfd\x84\
-\x91\xd2\x7c\xa9\x62\x5a\xd0\xcd\x03\xcc\x0a\x4a\xcc\xde\xbc\xbd\
-\xa4\xec\xae\x3e\x25\x6d\x1f\xc0\xab\x60\xfe\xe6\x01\xe0\x46\x10\
-\xaf\xef\x53\xd2\x76\xda\x8b\x9d\x33\xcd\x74\x68\x68\x58\x3d\xa0\
-\xc8\x70\x80\xf1\xf5\x90\x8c\x80\x29\xb6\xd1\x5f\x3c\x68\xd4\xcf\
-\x68\x12\xa4\xcc\x89\x37\xd4\x82\xe8\x2a\x95\xac\xb6\xa5\xde\xad\
-\x9d\x08\x43\x90\x53\x51\x91\x90\x75\xf5\x0d\xab\x41\xf4\x2c\x80\
-\x8b\x23\x7a\x1f\x1e\x97\x83\x70\xff\xf8\xac\x29\xf4\x23\x69\xee\
-\xdf\xda\xda\xda\x0c\xe7\x9b\x43\x07\xdb\xbf\xb9\x76\xd2\x14\x99\
-\x08\xb7\x9f\x11\x32\x6e\x1a\x3f\x35\xeb\x85\x4f\xf6\xec\xd1\xdd\
-\x40\x85\x1d\x01\x05\x52\x79\x1e\x88\xa6\xa9\x44\xb2\xc2\x01\x57\
-\x24\x8f\xef\x5c\xb0\xf4\xa2\x8b\x8f\x28\x0d\x44\x64\x18\xf9\x68\
-\xc0\x0c\xd7\xf6\x7d\x5f\xfc\x69\xce\x9c\x8a\x0b\x22\x71\xfd\xa9\
-\xfe\x17\x01\x7c\x76\x46\x40\x18\xc3\x27\x92\x1e\x08\xc7\x0f\xff\
-\x0a\x30\x7e\x11\x2c\xa0\x97\x5a\xeb\xd7\x77\x1a\x19\x97\x24\xc9\
-\xe6\x1b\x90\x37\x03\x98\x15\xc9\xd1\xa8\xc1\x98\xef\x4b\x0c\x6c\
-\x70\xb9\x5c\x86\xaf\xad\xb7\xa6\xe6\x14\x98\x34\x0f\x8a\x1f\x91\
-\x24\x49\x77\xb4\xeb\x2a\x9b\x2e\x95\x5e\x0e\xe6\xdb\x55\x22\x59\
-\x91\xf9\xa9\x08\x2e\x52\x5f\x20\xed\x79\x00\x79\x11\x78\xc3\x06\
-\x83\x4a\xb6\xef\xed\x8e\x38\x0a\xd3\x2d\x7d\xaf\x00\xfc\x91\x4a\
-\x94\xd1\xab\xa4\xe7\xeb\x71\x75\x03\x90\xa0\x24\x2c\x40\xf0\xfc\
-\xf0\x76\xeb\x16\xf7\xbf\x8c\x8c\x16\x94\x38\xef\x05\xc1\x19\xc9\
-\xb9\x91\x83\x1f\x9f\xe5\x28\xd7\xbd\x99\x21\x78\x3c\x9e\x00\x98\
-\x3c\x6a\x19\x81\xef\xd7\xe3\x86\x19\x4e\x3c\x37\xa8\x33\xd1\x16\
-\x23\x83\xa7\xdf\xcd\x67\x8c\x38\xb1\x84\x20\x5e\x11\x6e\x48\x0f\
-\x81\x48\x68\x7d\xbe\x43\xaf\x4f\x48\x00\xec\x0b\x17\x8e\x82\xea\
-\x5b\x0a\x00\x0a\xd1\x1b\x46\xc6\x7c\x36\x7e\x04\xea\x85\x52\xfc\
-\x91\x7d\x34\x90\x56\x6a\x44\xc8\x9d\x7c\xc5\x07\x20\xa8\x47\x6d\
-\x5a\x3f\x52\x73\xb4\xbc\x90\x00\xf0\x49\xdb\x2d\x00\x6c\x2a\xd1\
-\xdf\x5b\x3c\x55\x9f\x69\x79\x43\x90\x24\xc9\xc2\xc4\x3f\x89\xec\
-\x73\x6c\xc1\x84\x9f\x1a\xb5\x57\x56\x56\x2a\x60\x04\x3d\x38\x85\
-\x45\x48\x9e\x32\xf4\x15\x60\x31\x59\x7d\x49\x84\x6d\x46\x86\x7a\
-\x39\xed\xfb\x00\x2e\x31\xe2\xc4\x09\xd9\x05\x25\x0f\x5c\x67\x44\
-\x20\x70\xb0\xef\x8c\x2c\x2d\x47\x27\x00\x98\xa4\xbe\x54\x14\xfa\
-\x28\x84\xa3\x36\xc2\x98\x6f\xd4\x1e\x4f\x30\x02\x25\x86\x04\x12\
-\x1a\xdf\x79\x92\x96\x12\x1a\x00\xe2\x6b\x82\x05\x8a\xe1\xb7\x1f\
-\xe0\x38\x67\x81\xc3\x83\x08\x21\xef\xb4\x1a\x3e\x92\xb5\xbe\x8f\
-\xd3\x72\xf4\xbe\x02\x29\x41\x46\x80\x08\x7b\x7d\x3a\x97\x93\x5f\
-\x30\x18\x63\x0d\xdb\x47\x85\xf8\x9e\xa2\xa5\x44\x0c\x80\x60\x0e\
-\x9b\x63\x3b\xbd\x2a\xd3\xcb\xd6\x9e\x2b\x18\x06\xc0\x5b\x53\x33\
-\x00\x40\xbd\x13\xb4\x49\x92\xa4\x9e\xe0\x75\x03\x10\xb4\x45\xf6\
-\x0b\x11\x76\x03\xd2\xd6\x06\x11\x46\xc7\xb9\x01\x21\x61\xa4\x2a\
-\x42\x9c\x27\xc6\xb1\x20\x02\x73\xc8\xb0\x19\x82\xd7\x5b\xe9\x27\
-\xc0\x70\x85\x18\x57\x28\x30\xcc\x3e\x4f\x2f\x2d\x4d\x04\x60\x55\
-\x89\x7c\x1e\x8f\xc7\xa7\xe6\x84\xae\x03\x06\x4f\x6a\xcf\x5e\x03\
-\xe9\x46\x46\x98\xf1\x45\x64\x4f\xe3\x03\x22\xe3\x00\x58\x7a\xac\
-\x69\x1a\xd1\x31\x2d\x27\x34\x00\xc0\xa7\xc1\x56\x42\x67\x4e\x4d\
-\xfb\x5e\xc3\xf6\xf8\xc2\xd8\x76\xa2\x72\x6d\xd0\x35\xa3\x4b\x4b\
-\xd1\x5b\x07\xec\x57\x5f\x12\xc8\x70\xb1\x01\xa6\x7a\xc3\xf6\x38\
-\x82\x58\x18\xda\x26\x16\x41\xbe\x33\x70\x40\xcb\x09\x09\x80\x60\
-\x04\x1d\x36\x32\x30\x4d\xcb\x51\x43\x4e\x95\x9b\x00\x44\x75\x1a\
-\x13\x23\x7c\xda\x58\x5f\xb5\xdb\x88\x20\x98\x83\x7d\xd7\x19\xad\
-\x21\x01\xf0\x59\x6d\x3b\x00\x9c\x49\x1f\x11\x30\xa5\xd0\xe1\x0c\
-\xfb\xb9\x19\xcc\x0c\x53\x8d\x09\x87\x63\x0b\x42\x15\x0c\x52\xf2\
-\x2e\x97\x4b\x30\x68\x4e\x90\x90\xe1\xd5\xf2\x42\x02\x70\xfa\x6c\
-\x6d\x87\x5a\xe6\x27\x8d\x22\x0d\xac\xc2\xff\x24\x80\xa3\x86\x0e\
-\xc7\x16\x9f\x1f\xa7\x94\x95\x46\x84\x77\x3e\xec\xce\x41\xd0\x1a\
-\x85\xfa\xfd\x3d\x19\x3b\xb5\x3c\xdd\x6f\x38\x01\x9a\xed\xaf\x52\
-\x64\x64\xac\xc1\xb3\xfe\x2b\xa6\x88\x19\xa3\x58\x62\xf9\x0e\xcf\
-\xca\x93\x46\x04\x12\x5a\x9f\xf9\x2d\xbd\xf4\xb8\x6e\x00\x58\x56\
-\x6a\x01\xa8\x8e\x9a\x69\x66\xa1\xb4\xc8\x70\xc7\xe7\xff\x7a\xec\
-\x2a\x00\x8d\x46\x9c\xd8\x80\x5e\x69\xae\x73\xd7\x1a\x31\x5c\x2e\
-\x97\x20\x26\xed\x26\xed\x65\x3d\xae\x6e\x00\x9a\xb7\xac\xeb\x26\
-\x42\x93\x4a\x94\x28\x2b\x56\xed\x71\x78\x10\xbc\xde\x4a\xbf\x1c\
-\xf0\xdf\xcd\x40\x3c\x0f\x49\xdf\x93\x53\xe4\x0a\x44\x38\x8e\xdb\
-\xb1\xaf\xfb\x1e\xa8\xce\x21\x08\xf8\x52\x3e\x92\xd1\xa4\xc7\x0d\
-\xbb\x8c\x65\xf0\x1f\xd4\xd7\x04\x7e\x68\xa6\xa3\xec\x6a\x23\xc3\
-\xde\xcd\x35\x7d\xcc\x81\x3b\xe2\x14\x84\x9d\x8a\x8c\xbb\x22\x1d\
-\xc7\x49\x92\x64\x63\xe6\x5f\xab\x65\xcc\xbc\x32\xdc\xe9\x50\xd8\
-\x00\x34\x6f\xac\x7e\x9b\x38\x68\x32\xb4\x59\x08\x4f\x44\xf2\xb2\
-\xb5\x7e\x7d\xa7\x3f\xe0\xbf\x05\x20\xdd\x88\x0f\x0b\xcc\x7f\x3c\
-\x2e\x52\xf2\x22\x25\x66\x01\xa0\x57\x49\xad\x40\xf0\xb6\xb7\x27\
-\xd9\xcf\x6b\xc2\xf1\x8d\x36\x32\xac\x08\x2c\x0f\x16\xd1\x7d\x76\
-\xc9\x69\xb8\x07\x07\x06\x47\x82\x7c\xe4\x5b\x77\x82\xe8\x97\xac\
-\xb3\xfc\x34\x0d\xc6\xd7\x00\x2d\x6d\xae\xaf\x5e\x10\x69\xd2\x03\
-\x80\xe9\xf7\x54\x8c\x21\xd0\xaf\x34\x3a\x7e\xb3\x65\xcb\xba\xb0\
-\x3e\x18\x66\x56\x3b\x3b\xda\xbb\x32\xbf\x9d\x93\x09\xe0\x3b\xa7\
-\x45\x04\x46\xe1\xb8\xeb\xa6\xbc\x76\xe8\x60\xfb\x37\x46\x7d\xbb\
-\xba\xda\x94\xce\x8e\xf6\x77\xc7\x4f\xbc\xb9\x9a\x48\xb9\x10\x40\
-\x16\x60\x7a\xf7\x76\x94\x80\x55\x6c\x11\x3f\x68\xd9\xb8\xf6\x5d\
-\x33\x1d\x24\x49\xb2\xc9\x72\xe2\x56\xd0\xd9\xb4\x17\x01\x7b\x7a\
-\xc6\x88\xb2\x7f\xee\xda\x15\xb6\x76\x28\xe2\xe9\xb0\xbd\x78\xc9\
-\xa5\x6c\xf1\xef\x01\xe3\x32\x95\x78\xbb\xf5\x44\xf2\xcc\x86\x86\
-\xd5\x03\x66\x9c\x03\x06\x53\xe7\xa7\x92\x94\xdb\x05\xa3\x84\x81\
-\x6c\x0c\x66\x91\x87\xce\x0d\xbf\x02\xa8\x1b\xcc\xed\x24\xc8\x93\
-\x46\x7d\xad\xda\x5d\x5b\x24\x14\x94\x38\xd7\x00\x58\xa2\x12\xc9\
-\x42\xf0\xb4\x48\x65\x3b\xa6\x0a\x24\xf2\x1d\xce\x5b\x88\xe0\x85\
-\xaa\x22\x8c\x41\xeb\x5a\xea\xd6\x3a\x31\x82\x02\x89\x5c\x69\x59\
-\x72\xfa\x71\xbf\x12\x4d\x20\xf5\x60\x9f\x5f\xfe\x20\x33\x3f\xaf\
-\x96\x11\xc3\xd9\x54\xef\xae\x8e\xd4\xd7\x74\x91\x54\x81\xa3\x6c\
-\x21\x88\x82\x2a\x2e\x18\xa8\xba\x48\x1c\x7d\x38\xda\xa7\x15\x43\
-\x90\xbd\xc4\xf9\x30\x03\x2b\xa1\x9a\xcf\x88\xb0\xaa\x69\xa3\x7b\
-\x99\x19\x05\xa6\x6b\x84\x3a\xf7\xef\xde\x93\x99\x95\x73\x01\x80\
-\xef\x9d\x31\x04\xe4\x9c\x52\x92\xf2\xae\xba\x61\xea\x1b\x5d\x7b\
-\x77\x9d\x88\xc6\xf3\x91\x42\x92\x24\x5b\xc6\xa4\x5b\x5f\x02\xb0\
-\x1c\xc1\x0f\xb2\x51\x3e\x92\xb1\xa8\xab\xab\xcd\x54\xcd\x60\x54\
-\xe9\xac\x74\xea\x5b\x8e\xc1\xf2\xb4\xb3\x20\xdc\x96\xe0\x0b\x7c\
-\x90\x2f\x55\x64\x47\xa3\x6b\x24\xb0\x17\x2f\xb9\xb4\x2f\x90\xda\
-\x0a\xa0\x4c\xd3\xb4\x4f\x0e\xf8\xef\x36\xaa\x08\xd1\x22\xea\x42\
-\x49\x49\x92\x2c\xbd\x4a\xfa\xef\x09\xac\x1d\x62\x32\x80\x35\xa4\
-\x58\x9f\x6e\xda\xf4\xe2\xbf\xa3\xd5\x6b\x06\xb9\xd2\xb2\xe4\x14\
-\xe5\xd8\x8f\x99\xf1\x18\x08\x17\x05\xb7\x72\x03\x0b\xcb\x3d\x2d\
-\x9e\xaa\xa8\x36\x65\xc3\x2e\x95\xb5\x3b\x9c\x65\x4c\x58\x83\xd0\
-\x4f\xdb\x71\x22\x3c\x6b\x49\x3c\xb9\x22\x9a\x82\x45\x23\x4c\x9f\
-\xee\xb2\x26\x8c\x39\x5c\x0a\xa6\x27\xa0\x7b\x06\xc9\x2b\xd2\x45\
-\xff\xa3\x66\xeb\x89\xd4\x18\x51\xb1\xb4\xdd\x51\x96\xc7\x44\xf5\
-\x00\x46\x87\xfa\x84\x5e\x02\xb6\x02\xd8\x6a\x49\x3e\xd9\x14\x6d\
-\x30\x24\x49\xb2\xf5\x04\xd2\xf3\x04\xf1\x5c\x00\xf3\x00\xe8\x2d\
-\xc3\x65\x62\x2c\x35\x33\xdb\x87\xc3\x88\xcb\xe5\xed\xf3\x16\x5d\
-\xc9\x56\xcb\x2a\x00\x0e\x03\x9a\x4c\x40\x1b\x13\xfe\xca\x4c\x07\
-\x2d\x4a\xe0\x63\x56\xb8\x27\x61\x54\xd2\x71\x85\xfa\x03\x03\xbe\
-\x94\x14\xc2\x40\x1a\x05\xc4\x38\x41\x98\xc0\x4c\xb9\x20\x9a\x0d\
-\x70\xaa\x81\xce\x0f\x48\x60\x69\x93\xc7\xbd\x6b\x24\xfe\xc7\xec\
-\x0f\x13\xf6\xf9\xe5\x85\xcc\xfc\x5b\x0c\x2e\x72\xe2\x07\x42\x37\
-\xc0\x4f\xa6\x53\xbf\x7b\x38\x43\x3e\x54\x5d\x0c\x31\x58\x4c\xdd\
-\x3d\x0f\xc4\x8f\x01\xb8\x29\x96\xba\x01\x74\x02\x58\x21\xa7\xf8\
-\xab\xa3\x2d\xd0\x34\x42\xdc\xfe\x34\x35\xbb\xa4\x3c\x8b\x81\x52\
-\x06\x17\x01\x98\x30\x1c\x1d\x04\x7c\xa9\x80\xde\x14\xac\xbc\x9c\
-\x9b\x3d\xf6\x9d\xe1\xfc\x1f\xc0\x84\x8d\xf8\xc3\x3e\x6f\xd1\x95\
-\x4a\x82\x65\x06\x81\xb2\x00\x65\x22\x98\xc6\x01\x48\x03\x90\x8a\
-\xc1\x93\x9b\xa3\x00\xfa\x01\xfa\x1c\xe0\x03\x0c\x1c\x60\x11\x68\
-\x6b\xf5\xac\xdf\x8f\xff\x82\x5a\xe4\xf3\x38\x8f\xf3\xf8\xdf\xc5\
-\x7f\x00\x80\x02\xea\x80\xb2\xb7\x05\xfa\x00\x00\x00\x00\x49\x45\
-\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x01\xb2\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x01\x64\x49\x44\x41\x54\x58\x85\xe5\
-\xd6\xb1\x4a\x03\x31\x1c\xc7\xf1\x6f\x72\x97\xfa\x06\x56\x90\x6a\
-\x29\x5d\xaa\x93\x93\x73\xeb\x03\x08\xfa\xa4\xe2\x52\x10\xda\x87\
-\x50\xeb\x52\x6e\x13\xd4\xc9\xfd\xae\xf7\x77\x90\x13\xda\x5e\xbd\
-\x24\x4d\xce\xc1\x8c\xc9\x1f\x3e\x3f\x92\x3f\x7f\x02\xff\x7d\xa9\
-\x36\xb1\x2c\xcb\xba\x5a\x9b\x3b\x34\xaf\xfd\x93\xde\x2d\x80\x6e\
-\x15\x4f\xd2\x39\x8a\x4b\x4a\x8e\xab\xfd\xb4\x55\x1c\x35\x02\x79\
-\x29\xcb\xe2\xba\x3a\x8b\xfe\x04\x5b\xf8\xaa\x18\x0f\x06\x83\xf7\
-\x56\x02\x34\xe1\x51\x03\xd8\xe0\xd1\x02\xd8\xe2\x51\x02\xb8\xe0\
-\xc1\x03\xb8\xe2\x41\x03\xf8\xe0\xc1\x02\xd8\xe2\xcb\xe5\xdb\x61\
-\x6a\xf2\x29\xf0\xd9\x3f\xed\x4d\x20\xc0\x24\x74\xc4\x67\xc0\x05\
-\x48\xa7\xda\xdf\x2b\x80\x07\x7e\x0e\x3c\x15\x79\xe7\xa6\x3a\xf3\
-\x7e\x02\x7f\xdc\x5c\x0d\x87\x47\x1f\x7b\x05\x08\x85\x7b\x05\x70\
-\xc4\xe7\xc0\x19\xf0\x5c\xe4\x66\xb2\x89\x3b\x07\x08\x8d\x3b\x05\
-\x88\x81\x03\x24\x21\xf1\x2c\xcb\xba\x49\x8a\x35\x0e\x16\x37\xe0\
-\x82\xeb\xc4\xcc\x5c\xf0\xc6\x00\x9e\xf8\xa2\xc8\xcd\xb8\x0e\x77\
-\x9a\x84\x91\xf0\xad\x49\x58\xfb\x27\x8c\x84\x57\xbd\xb1\x36\x09\
-\xb7\x9a\xd0\x0d\x4f\xe7\xa0\x7e\xc5\x6b\x1a\x73\x6d\x18\xe9\xcd\
-\x62\x47\x7c\x04\x2c\xca\x55\x5e\xdb\x70\x36\x8d\xa9\xd6\x8b\xfd\
-\x70\x9b\xba\x5d\x37\xa4\x01\x44\x44\xab\xc4\x3c\x34\xe1\x22\xa2\
-\x54\x62\xee\x9b\xf0\xcd\xba\x5d\xf8\x4f\x00\x00\x25\x1c\x08\x3c\
-\x36\xfc\x64\x94\x52\x74\xbe\xeb\xea\xf1\xba\x3a\x9b\x79\x80\x88\
-\x68\x11\x69\x1c\x4c\x22\xa2\x42\xd6\xfd\xf9\xfa\x02\x53\x42\xe8\
-\x88\x61\x1a\x4e\x81\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\
-\x82\
-\x00\x00\x03\x5e\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x03\x10\x49\x44\x41\x54\x78\x9c\xed\
-\x9b\x4d\x4f\x13\x51\x14\x86\xdf\x53\xd1\x21\x74\xa9\x84\x0f\xf7\
-\x6e\xb0\xdd\xb4\xc4\x8d\xfe\x0b\xc1\x48\x52\xdc\x98\x56\x89\xad\
-\xb2\x30\x81\x5f\xa0\x09\x0b\x4d\x5b\x23\xed\x4e\x49\x34\x01\xfe\
-\x05\xee\xa4\x1b\x0a\x2b\xd7\x14\x49\x74\x09\x32\x0a\x7d\x5d\xb4\
-\x94\x61\x66\x4a\x2b\x32\x3d\x6d\xb8\xcf\x6a\x3a\xe7\x4e\xf2\xde\
-\x27\xf7\xf6\x6e\xee\x01\x0c\x06\xc3\x65\x46\xda\x19\x14\x4d\x2c\
-\x84\xad\x81\xfe\x49\x02\xf7\x01\xde\x06\x30\x0a\xa0\x2f\xd8\x68\
-\xff\xcc\x21\x80\x0a\x20\x9b\x02\xac\xda\xfb\x07\xcb\x1b\x4b\x2f\
-\xf7\x5a\x7d\xd4\x42\x00\x25\x96\xcc\x4e\x8b\xc8\x2b\x00\x23\x17\
-\x93\xb3\x63\xec\x00\x98\x5b\x2f\xa4\x97\x00\x61\xb3\x41\x4d\x05\
-\xc4\x92\x85\xab\x02\x3b\x07\x41\x2a\x90\x78\x9d\x82\x28\x10\x56\
-\xba\x54\x4c\xfd\xf1\x2b\x37\x59\xc6\x14\x91\x7c\x1e\x40\xd2\x55\
-\x28\x8b\xe0\x0b\x88\xef\x55\xa0\x7a\xb1\x49\xff\x8f\x10\x10\x82\
-\x60\x98\xc4\x5d\x00\x91\x46\x41\x90\x12\xda\x00\xf8\xd4\x6f\x25\
-\xf8\xae\x80\x78\x2a\x3b\x0d\xe0\x83\xe3\xd5\x4f\x52\x32\xa5\xe2\
-\xb3\xcf\x67\x2d\xa7\xee\x80\x12\x4b\xe6\x1f\x8a\x30\x0b\xe0\xba\
-\xa3\xf0\x68\xbd\x90\xf9\xe8\x1e\xed\x11\x10\x4d\x2c\x84\xaf\x0d\
-\x58\xdf\x70\xb2\xe7\x7f\x90\x47\xd1\x52\x71\x76\x27\x98\xc0\xc1\
-\x10\x4b\xbe\x19\x11\xb9\xb2\x01\xe0\x06\x00\x80\xa8\xfc\xfe\x65\
-\xdf\x72\xff\x31\x86\xdc\x1f\x5a\x03\xfd\x93\x70\xfc\xe1\x91\xf2\
-\xbc\xd7\x26\x0f\x00\xa5\xe2\xec\x8e\x08\x5e\x34\x5e\x08\x46\xad\
-\xb0\x35\xe1\x1e\xe7\x11\x50\x3b\xea\x1a\x94\x6b\xcb\xbe\x37\xf9\
-\xba\x98\xfe\x04\xa0\x7c\xfc\x9b\x94\xd6\x02\xea\xe7\x7c\xed\x09\
-\x5c\xeb\xfe\x3d\x7f\x16\xc2\xda\x1c\xea\x90\x63\xee\x11\x3e\x02\
-\x30\x7a\x52\x94\xdd\x60\x82\x75\x8e\x53\x73\x10\xdc\xf4\xd6\xbd\
-\x34\x8e\xc6\x6e\x3b\xea\xce\x83\x6b\x0e\x9e\x63\xdf\x4f\xc0\xa5\
-\xc2\x08\xd0\x0e\xa0\x8d\x11\xa0\x1d\x40\x1b\x23\x40\x3b\x80\x36\
-\x46\x80\x76\x00\x6d\x8c\x00\xed\x00\xda\x18\x01\xda\x01\xb4\x31\
-\x02\xb4\x03\x68\x63\x04\x68\x07\xd0\xc6\x08\xd0\x0e\xa0\x8d\x11\
-\xa0\x1d\x40\x1b\x23\x40\x3b\x80\x36\x46\x80\x76\x00\x6d\x8c\x00\
-\xed\x00\xda\x18\x01\xda\x01\xb4\x31\x02\xb4\x03\x68\x63\x04\x68\
-\x07\xd0\xc6\x08\xd0\x0e\xa0\x8d\x9f\x80\x43\x47\xb1\xe7\x05\xb9\
-\xe6\x70\xe8\x53\xf7\x50\x39\x7e\xa8\x82\x43\x41\x84\xea\x24\xa7\
-\xe6\x40\x6c\xbb\xeb\x3e\x02\x64\xb3\xf1\x04\xb9\x07\xb0\xad\x9e\
-\x82\xee\x84\x52\x9b\x43\x1d\x91\x2d\xf7\x08\x8f\x00\x01\x56\x1d\
-\x3f\x23\xe3\xa9\xfc\x64\x30\xe1\x82\x27\xfe\x24\xfb\x00\x8e\x9b\
-\xe3\x22\x5c\x71\x8f\xf1\x08\xb0\xf7\x0f\x96\x51\x6b\x36\x00\x00\
-\x50\x98\xbb\xf3\xf8\x6d\xcf\x6d\x85\xf1\x99\x77\xc3\x80\x64\x1b\
-\x2f\x88\x8a\xbd\x67\xb7\x16\x50\xbf\x4d\x3d\xe7\xf8\x70\xf0\xa8\
-\x2f\x54\x8e\x25\x73\x53\xbd\xb1\x1d\x28\xb1\x64\x6e\x8a\xd5\xa3\
-\x0d\x10\x83\x8d\xd7\x82\x79\xbf\x16\x9a\x26\x13\xa2\xc4\x93\xb9\
-\xf7\x3e\xdd\x22\x65\x82\x6b\x21\xc8\x6e\xb7\xdd\x22\x0d\x01\xa1\
-\x2a\x38\x54\xdf\xf3\x91\xd3\x55\x2e\xae\x17\x32\x33\x7e\xf7\x9e\
-\x9b\x74\x8c\x08\x89\x42\x5a\x68\xc3\x25\x21\x22\x90\x08\xd1\x66\
-\xb7\x55\x07\xa9\x65\xf2\x4b\xc5\x45\xb2\x3f\xd3\xec\xd2\x77\xcb\
-\xa6\xa9\x78\x2a\x97\x00\xf0\x1a\xbd\xd6\x34\x45\x54\x20\x98\x3f\
-\x77\xd3\x94\x93\x68\x62\x21\x6c\x85\xad\x09\x52\x26\x40\x8e\xd5\
-\x6f\x5d\x77\x5f\xdb\x1c\xb1\x0d\x91\x2d\x11\xae\xd8\x7b\xf6\x4a\
-\x3b\x6d\x73\x06\x83\xe1\x72\xf3\x17\xf4\xb0\xe5\x26\x61\x1e\x11\
-\x45\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x01\x8d\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x01\x3f\x49\x44\x41\x54\x58\x85\xed\
-\x92\xb1\x4a\x03\x51\x10\x45\xcf\x4d\x02\xa2\x18\x82\xad\xac\xd9\
-\x4d\x5a\xc1\x5f\xb0\xb0\xb4\xb0\xb3\x13\xed\x2c\xfc\x02\x41\xb0\
-\xb2\xf1\x07\x14\x49\x61\xab\x62\x67\x2d\xe8\x1f\xf8\x03\xba\x6f\
-\xb3\x20\xa6\xd1\xca\x42\x93\x37\x56\x09\x62\xb7\x6f\x61\x1b\xf7\
-\x74\x03\x33\x77\x0e\xef\x0d\xd4\xd4\xd4\xfc\x77\x54\xa4\xd9\xcc\
-\xe4\xb2\xdc\x03\x98\x1f\x2f\xf5\x7a\xbd\x8f\xb2\x02\x8d\x82\xfd\
-\x33\x61\x35\x5a\xef\x66\xd6\xac\x54\x40\x92\x17\xda\x9e\xd6\x2e\
-\xcb\xc7\x95\x0a\x00\xc4\x71\x74\x83\xe9\x64\x5a\xa7\xe9\xf0\xa9\
-\x52\x01\x80\x24\x89\x8e\x80\x7b\x00\xc4\x9a\x73\xd9\x59\xa8\x40\
-\xa1\x23\xfc\x4b\xea\x86\xf6\x2b\x68\x3f\x8e\x57\x2e\x2a\x15\x30\
-\xb3\x86\xcb\xf2\xc9\xb4\xf6\xb2\xf5\x7e\xb7\xfb\x58\x24\x23\xe8\
-\x0b\xa6\x48\xf2\x0b\xf3\x73\xed\x59\x98\xe9\xa1\x68\x46\x29\x01\
-\x80\xd1\x68\xf4\x05\x4a\x43\xe7\x4b\x09\x98\x99\x16\xdb\x9d\x01\
-\x58\x02\x7a\xf3\x93\x66\x52\xa9\x40\x9a\xe5\xc7\xc0\x0e\xf0\x29\
-\x26\x9b\xfd\xfe\xb2\x2b\x9a\x11\x7c\x84\x2f\x2e\xdf\x15\x76\x09\
-\x78\xa1\xad\x38\x8e\xee\x42\x72\x82\x5e\xc0\xb9\x7c\x43\xd8\x00\
-\xc0\xa4\x83\xd0\xe5\x41\x02\xce\xb9\x55\xc3\x6e\x81\x96\xc1\x69\
-\xaf\x1b\x9d\x87\x2e\x2f\x2c\x60\x66\x32\x1a\xd7\x40\x47\xe8\x2a\
-\xe9\x46\x87\x65\x96\x03\xb4\x02\x66\x5e\x81\x67\xef\xbf\xf7\x24\
-\xf9\xb2\x02\x35\x35\x35\x35\x3f\x6e\x39\x66\xc8\x1a\xa6\xbc\x56\
-\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x01\x83\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x01\x35\x49\x44\x41\x54\x58\x85\xed\
-\x97\x31\x4e\x02\x51\x14\x45\xcf\x65\x12\x28\x91\x06\xd7\x30\x1b\
-\x18\x22\xb5\x09\xb4\x1a\x3b\x56\x81\xb5\x5a\x48\x2f\xab\xa0\x53\
-\x8c\x95\x31\xb1\x36\x71\x36\xc0\x1e\x68\xc0\x52\x93\x99\x6b\x01\
-\x93\x20\x82\x85\x99\x89\x85\xff\x96\xef\xbf\xfc\x7b\xf2\xfe\x2f\
-\xde\x85\xff\x2e\x6d\x17\x92\x5b\xf7\x54\xf3\x39\x90\x00\x07\x25\
-\xf9\x2c\x81\xd4\xb9\x6e\xd2\x33\x3d\xed\x05\xe8\xdc\x65\x23\xa4\
-\x0b\xc3\xbb\x60\x66\x78\x2b\xc3\x5d\xd0\x34\xc4\x82\x06\xf2\xe8\
-\xf5\x24\xba\xfa\x06\x70\x34\x75\x3f\xc7\x8f\x88\xe7\xc8\x1a\xbc\
-\x9c\x6a\x5e\x86\x79\xa1\xee\xd4\xed\x4c\x9e\x60\x8e\x9d\xab\x5f\
-\x4c\xa2\x56\x34\xe4\x78\x68\x78\xaf\xc2\x1c\xe0\xe5\x54\xf3\xc8\
-\x1a\x00\x1f\x8a\x3c\x2c\xea\xb5\x8d\x9e\x44\x30\xab\xc2\x7c\x13\
-\x02\x98\x61\x92\x5d\x00\x07\x65\xbd\xf9\x4f\xf2\xea\x43\xb6\x76\
-\x01\xfc\x89\x02\x40\x00\x08\x00\x01\x20\x00\x04\x80\x00\x10\x00\
-\x36\x01\x96\x82\x66\xd5\x86\x5a\xad\xfa\x8b\x5d\x00\xa9\x21\xee\
-\x4e\xdd\xae\xca\x7c\x7d\x77\x8c\x48\xbf\x01\x38\xd7\x8d\xa0\x91\
-\xc9\x93\x2a\x20\x3a\x0f\x3e\xcc\xe4\x09\x50\x77\xa6\x71\x51\xff\
-\x1a\x4c\xee\xb3\x6b\xac\x4b\xe0\x83\x55\x30\x59\x96\x61\xbe\x1e\
-\x7b\x0c\xd4\xf7\x06\x93\x42\xc9\xad\x7b\x8a\x3c\x5c\xaf\xce\xad\
-\xed\xf3\x5f\x6a\x81\x48\x9d\x69\xbc\x1d\xcd\x82\x3e\x01\x68\xb1\
-\x6f\x2f\x7c\x41\x27\x3e\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\
-\x60\x82\
-\x00\x00\x03\xeb\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x03\x9d\x49\x44\x41\x54\x78\x9c\xed\
-\x9b\x3f\x6c\x52\x51\x14\xc6\xbf\xf3\x78\xe8\xa4\xd8\xa8\x69\x22\
-\xc6\xa9\x83\x75\x50\x6b\x5d\xdc\x48\x10\x1c\x34\xa4\xa6\x25\x0e\
-\xd6\xd8\x28\xb3\x71\x33\x61\x90\xd4\xc4\x18\xdd\xd4\xc5\x01\x4c\
-\x35\x2e\xa6\xf6\x4f\x88\x0e\x52\x9b\x30\x54\x5d\xaa\x55\x07\x98\
-\xea\x60\x64\xa8\xf1\x1f\x6e\xd8\xf2\x8e\x43\xd1\x3e\x1e\x0f\x5a\
-\x7a\xdf\xe3\xb6\x72\x7f\xdb\x3d\xef\xdc\xc3\x77\xbf\xbc\x77\xef\
-\x4d\xb8\x17\x50\x28\x14\xed\x0c\xad\x25\x29\x10\x48\xe8\xfa\xae\
-\x42\x84\x18\x67\x00\x1c\x05\xe0\x07\xb0\xd5\x55\x65\xcd\x53\x02\
-\x50\x00\x30\xcb\x84\xc7\x4b\x5f\xfd\xe9\x6c\x76\x78\x69\xb5\x4e\
-\xab\x1a\x10\x3e\x1d\x0b\xb1\x86\xdb\x00\xba\x1d\x10\xd9\x42\x28\
-\x47\x06\x5f\xce\x4c\x24\xa7\x1a\x65\x79\x1a\x55\x08\x0d\xc4\xe2\
-\x20\x8c\x00\xd8\xed\xa8\xb6\xd6\xb0\x1b\x84\x73\x5d\xdd\x3d\xbf\
-\xe7\xf3\x73\x2f\xeb\x25\xd5\x35\x20\x34\x10\x8b\x83\x71\xdd\x1d\
-\x6d\x2d\x84\x28\xd8\xd5\xdd\x53\x9a\xcf\xcf\xcd\xd8\x3e\xb6\x0b\
-\x56\x5e\xfb\x4c\x55\x90\xf1\x83\x89\xaf\x6a\x1a\x3d\xf3\xa1\xf8\
-\x69\x74\x74\xb4\xec\x82\xdc\x75\x13\x8d\x46\x3d\x45\xf8\xf6\x19\
-\x06\x9f\x24\xa6\x6b\x20\x74\x98\x9f\x93\x81\xb0\xdd\xe7\x50\x63\
-\x40\x20\x90\xd0\xbd\x3b\x0b\x1f\x60\xfa\xe6\x09\x78\x51\x5e\xc4\
-\xe0\x74\x3a\xb9\xe0\x8a\x7a\x87\x09\x46\x62\x9d\x1e\x2f\x1e\x31\
-\x70\x7c\x25\x4a\xb9\xc5\x6f\x7b\x0e\x59\x27\x46\xcd\xda\x59\xdf\
-\x55\x88\xa0\x7a\xc2\xfb\x0e\x43\x3f\xbb\x59\x06\x0f\x00\xd3\xe9\
-\xe4\x42\x79\x11\x83\x60\xfc\x58\x89\xf2\x81\xca\xd8\xaa\xa8\x31\
-\xa0\xb2\xd4\xad\x74\x03\x27\x32\x13\xf7\xbe\xb8\x21\xd4\x4d\xa6\
-\xd3\xc9\x05\x06\x25\xcc\x31\xeb\xd8\x00\x1b\x03\xb0\xbc\xce\xaf\
-\x24\x68\xf4\xcc\x61\x6d\x2d\x43\xf3\xf0\x53\x73\x9b\x80\xde\x9a\
-\x1c\x9b\x7e\x7e\x73\xc3\x87\xe2\x27\x87\x75\xb5\x0c\xab\x76\x06\
-\xf6\x5a\x73\xec\x0c\xa8\xda\xe1\x6d\xb4\xd9\xbe\x19\x6c\xb4\xd7\
-\xec\x5e\xed\x0c\x68\x2b\x94\x01\xb2\x05\xc8\x46\x19\x20\x5b\x80\
-\x6c\x94\x01\xb2\x05\xc8\x46\x19\x20\x5b\x80\x6c\x94\x01\xb2\x05\
-\xc8\x46\x19\x20\x5b\x80\x6c\x74\x27\x8a\x84\x06\x2e\x84\xc1\x9e\
-\x5b\x00\x1f\xc4\x1a\xff\x6b\x10\x80\x01\xbc\x07\x19\x57\xa6\x9e\
-\xdc\xcf\xac\x9a\xbd\x0a\xc2\x6f\x40\xb8\xff\xe2\x79\xb0\xf6\x1c\
-\xe0\x43\x70\x7f\xf0\xa8\xfc\xc6\x61\xb0\xf6\x3c\xdc\x7f\xf1\xbc\
-\x68\x31\x21\x03\x02\x7d\x43\x3b\x0c\xd0\x5d\x51\x11\xeb\x85\xa1\
-\xdd\x09\xf4\x0d\xed\x10\xa9\x21\x64\xc0\x16\xdd\x7b\x8c\x80\x6d\
-\x22\x35\xc4\xe0\xed\x5b\x74\xef\x31\x91\x0a\x6d\x3f\x09\x0a\x19\
-\xf0\x7b\x69\xf1\x35\x40\xbf\x9c\x12\xd3\x3c\xf4\x6b\x59\xc3\xfa\
-\x11\x32\x20\x3b\x39\xf2\x93\x60\x5c\x12\xa9\x21\x02\xc1\xb8\x94\
-\x9d\x1c\xf9\x29\x52\x43\xf8\x13\xc8\x8c\xa5\x1e\x80\x8c\x13\x00\
-\xde\x61\x79\x89\x72\x1b\x06\xe8\x3d\xc8\x38\x91\x19\x4b\x3d\x10\
-\x2d\xe6\xc8\x3e\xa0\xb2\x1e\x0b\xaf\xc9\x32\x50\x93\xa0\x6c\x01\
-\xb2\x51\x06\xc8\x16\x20\x1b\x65\x80\x6c\x01\xb2\x51\x06\xc8\x16\
-\x20\x1b\x65\x80\x6c\x01\xb2\x51\x06\xc8\x16\x20\x1b\x65\x80\x4d\
-\xac\x64\x6e\x44\xa3\xd1\x46\xe7\x89\x37\x34\x36\xda\x4b\xd6\x1c\
-\x3b\x03\x0a\xe6\x46\x11\xbe\x7d\x4e\x8a\x6a\x25\x56\xed\x04\x7c\
-\xb6\xe6\xd8\x19\x30\x6b\x6e\x18\x06\x9f\x74\x58\x57\xcb\x30\xca\
-\x74\xca\xdc\x66\xe0\x8d\x35\xa7\xc6\x00\x26\x3c\x36\xb7\x89\xe9\
-\x5a\x30\x12\xeb\x74\x5e\x9e\xbb\x04\x23\xb1\x4e\x02\x0f\x9b\x63\
-\xd6\xb1\x01\x36\x06\x2c\x7d\xf5\xa7\x01\xe4\xff\x05\x08\x1d\x1e\
-\x2f\x1e\x6d\x26\x13\xfe\x1e\x96\xae\x3e\x31\x4e\xb9\xca\xd8\xaa\
-\x68\xee\xb8\x3c\x28\xa1\x79\xf8\xe9\x86\x3e\x2e\x5f\xa6\x53\x04\
-\x1e\x5e\xf7\x71\xf9\xbf\xfc\x37\x17\x26\x00\x10\x73\x3c\x33\x9e\
-\xba\x61\xf7\xac\xee\x12\xf7\x31\xf7\x76\xa6\xab\xbb\xa7\x04\xa2\
-\xa0\x7b\xd2\x5c\x87\x19\x88\x4f\x8d\xa7\x6e\xd6\x4b\x68\xb8\xc6\
-\xcf\xe7\xe7\x66\xba\xf6\x1f\x79\x05\xa2\x5e\x6c\xba\x7b\x43\x94\
-\x23\x03\x83\x53\xe3\xc9\x87\x0d\xb3\xd6\x52\xca\x7c\x6d\x8e\x80\
-\xde\xca\xa9\xeb\x0d\x77\x6d\x8e\x80\xcf\x0c\xbc\x69\xe6\xda\x9c\
-\x42\xa1\x68\x6f\xfe\x00\x06\x14\x1b\x10\x41\x9d\x58\x08\x00\x00\
-\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x04\x15\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x03\xc7\x49\x44\x41\x54\x58\x85\xe5\
-\x97\x51\x48\x5d\x65\x1c\xc0\x7f\xff\xef\xea\x5d\xf3\xc1\x6d\x21\
-\xcc\x4a\xd9\x26\x2b\xb6\xa8\x1e\x5a\x0c\x0a\x56\x2b\xf5\x9a\x0c\
-\xa7\x33\x0e\x11\x42\x36\x6d\x16\x44\x2f\x41\xe0\xe8\xe1\x20\x45\
-\x13\x7a\x2a\xc6\x62\x4e\x2d\x22\x9f\xae\x57\x4b\x6b\xb6\x7b\x75\
-\x5c\x5f\x16\xc3\x42\x46\x2b\x84\xc8\x46\x5d\xb5\x88\x0d\x8d\x5a\
-\xea\xbd\xf7\xfb\xf7\x70\xaf\x76\xbd\xd7\x39\x2f\x5e\x7b\xd9\xff\
-\xe9\x9c\xef\xfc\xbf\xff\xef\xf7\x1d\xce\x39\xdf\xff\xc0\x9d\x1e\
-\x92\x4d\xb2\xaf\xf6\x78\xa9\xf5\xe4\xd5\x89\xb1\x15\xa8\x94\x02\
-\x25\x80\x11\x98\x52\x88\xa0\x3a\x8a\xe4\xf5\x87\x02\x67\x7f\xcc\
-\xa9\x40\x95\xd3\x7c\x30\x6e\x4d\xbb\xa0\x4f\xaf\xb3\xee\x18\xa2\
-\x27\x43\xbd\x5d\x23\x1b\x12\xa8\x70\x5a\xb6\x89\xb5\x1f\x02\x2f\
-\x24\x87\x66\x14\x06\x0d\x3a\x14\x47\x26\xbd\x26\x3e\xb3\x18\x8b\
-\xdb\x3c\xb3\xa5\x38\xae\x76\xb7\x88\xf8\x80\x5a\x60\x57\x32\xff\
-\xbc\x8d\xd2\x34\x32\xd0\xf9\x7b\xd6\x02\x55\x4e\xf3\x5e\x6b\x65\
-\x00\xd8\x9f\x00\x8b\x1b\xbb\x7e\xef\x47\xe1\x70\x5b\x6c\x2d\x69\
-\xd7\x75\xcd\xa5\xab\x53\xcf\x03\xef\x00\x65\xc0\x2f\xc6\xda\xa3\
-\x17\xfa\xbb\xaf\xac\x5b\xa0\xbc\xfe\x78\x99\xc1\x73\x19\xa1\x48\
-\xe0\x73\xcf\x5d\xff\xbc\x38\xd4\xd3\xf3\xe7\x5a\xe0\xf4\xa8\xae\
-\x7e\x7d\x4b\xb4\x60\xfe\x8c\xa0\x4d\xc0\xdf\x8a\x1e\x1a\x0e\x74\
-\x8d\xdf\x56\xa0\xba\xa1\xa1\x30\x36\x5f\xf0\x35\xe8\x83\xa0\xef\
-\x3f\xf1\x50\xc9\x1b\x6d\x6d\x6d\x36\x1b\x78\x6a\x7d\x5f\x7d\x73\
-\xab\x8a\xbc\x0b\x44\x8c\x9a\x83\x17\xfa\x3a\x66\x52\x13\x4c\xfa\
-\x8c\xd8\x7c\xc1\xe9\x04\x9c\xc1\x0d\xc2\x01\x34\xd8\xd7\xd5\x8e\
-\xd2\x09\x94\x58\x63\x3f\x25\x6d\xd1\x2b\x4e\x2a\x9f\x6b\x7a\x0c\
-\xcc\x18\xf0\x87\x1a\x73\xff\xb0\xbf\x63\x6e\x03\xf0\xe5\x70\x1c\
-\xc7\x3b\x6b\xb7\x5d\x01\xf6\x01\x47\x42\x81\xce\xf3\x4b\xd7\x56\
-\xdc\x01\xc1\x9c\x02\x50\x95\xb7\x73\x05\x07\xf0\xfb\xfd\x8b\x2a\
-\xbc\x95\x3c\x6d\x27\x65\xe1\xcb\x02\x55\xf5\x2d\xf7\x28\x94\x03\
-\x37\x76\x78\x66\xcf\xe6\x0a\xbe\x14\xc3\xbd\x9d\xfd\xc0\x04\xf0\
-\x70\xd5\xb1\xa6\x47\x32\x04\x14\x5b\x93\x30\x93\x2f\xfd\x7e\xff\
-\x62\xae\x05\x00\x45\x64\x00\x40\x3d\xe6\x58\xa6\x80\x70\x18\x40\
-\xd5\x7e\xb5\x09\x70\x00\x24\xae\x17\x00\xac\xf2\x4c\x86\x00\xaa\
-\xa5\x09\x3b\xfd\x79\xb3\x04\x8c\xe6\x4d\x02\x48\x62\x0f\x49\x13\
-\x90\xc4\x60\x7e\xd4\x3b\x93\x31\x33\x47\x21\x0b\xf9\x4b\xb5\xef\
-\x23\xf9\x20\x66\x7c\x07\xfe\xaf\x70\x5d\x37\x5d\x40\xa6\x00\x62\
-\x26\x56\xbc\x59\xd0\x85\xad\x37\x93\xb5\x75\x7a\xe9\x03\x97\xfa\
-\x0c\xfc\x0a\x20\xc2\x9e\xcd\x12\xc8\x47\xcb\x12\x2c\x22\x4b\x63\
-\xff\x09\x18\xc2\xc9\xa3\xaa\xcd\x12\x50\x31\x3e\x00\xc4\x5c\xcc\
-\x14\x58\xd4\xc1\xa4\xdd\x91\x03\x2d\x2d\xf9\x9b\xc0\x17\x45\x8e\
-\x26\xa9\xfd\x19\x02\xa1\x81\xee\x69\x84\x8b\x08\x45\x3b\xae\xdb\
-\x97\x73\x4d\xaf\xac\x3f\x51\x93\xdc\xe4\xbe\x0f\xf9\xcf\x2d\xf7\
-\x06\x2b\xde\x02\x6b\xa5\x15\x40\x04\xb7\xba\xa1\xa1\x30\x57\x70\
-\xc7\x71\xbc\x08\xa7\x00\x04\x3d\x09\xe8\xaa\x02\x23\x7d\xe7\xc6\
-\x54\xe9\x41\xd9\x19\x9f\xdf\xfa\x89\xeb\xba\xb9\x78\x4d\x65\x36\
-\xbe\xfd\x83\xe4\xea\xc3\xc1\x40\xd7\x17\xa9\x17\x33\x01\x1e\xf3\
-\x1a\x30\xa1\x50\x7b\xe9\x6a\xe4\xbd\x0d\x4a\x48\x65\x7d\xf3\x9b\
-\x88\xbe\x82\x30\x4d\xd4\x36\x90\xb2\x7a\xb8\x45\x4b\x96\xec\x07\
-\x2f\x03\x77\x03\x7d\x51\xe3\x6d\x0c\xfb\xcf\xfc\x95\x0d\xd9\x71\
-\x1c\xef\x9c\x2d\x3c\xad\xc8\x09\xe0\x26\xd8\xa7\x42\x81\xee\x6f\
-\xd2\xf3\x3c\xab\x4d\xfe\xe9\x87\xf1\x1b\x7b\xf6\x1d\xf8\x0c\xc1\
-\x27\x70\xc8\xa3\xf1\xc6\xbd\xfb\x1f\x9d\x2b\xdd\x59\xf3\xdd\xb5\
-\x6b\xa3\x6b\x76\x48\xae\xeb\x9a\xfc\xa2\x07\x9c\x05\xf5\xf6\x82\
-\x54\x92\x68\xc5\x7c\xc1\xbe\xce\x6f\x57\xcb\x5f\xb3\x2d\x3f\x5c\
-\xf7\xd2\xf6\x7c\x93\xd7\x81\xe0\x24\x87\x22\x02\x83\xa0\x43\x82\
-\x99\xc4\xd8\x99\x85\x68\xdc\x7a\x3d\xde\x62\x8b\xee\x02\xaa\x04\
-\xad\x25\xd1\x0d\x03\x12\x8c\x9a\x68\x63\xd8\xff\xf1\x6f\xb7\x62\
-\xac\xeb\xc7\xa4\xdc\x69\x7a\xdc\x58\xd3\x0e\x3c\xb9\x9e\x7c\x60\
-\x1c\xb1\xad\xa1\xde\xee\xe0\xed\x12\xb3\xfa\x35\x7b\xb6\xee\xd5\
-\xdd\x31\x13\xab\x13\x23\x15\xa2\x5a\xaa\x89\x6d\xd5\x03\x44\x80\
-\x88\xa8\x8e\x22\x9e\xfe\x60\xa0\x63\x22\x9b\xba\x77\x76\xfc\x0b\
-\xeb\x32\x64\xd4\x54\xc2\x43\x07\x00\x00\x00\x00\x49\x45\x4e\x44\
-\xae\x42\x60\x82\
-\x00\x00\x03\x64\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x03\x16\x49\x44\x41\x54\x78\x9c\xed\
-\x9b\xbf\x4f\x53\x51\x14\xc7\xbf\xdf\x17\x08\x90\x4e\xf2\x23\x02\
-\xee\x2e\x58\x17\x57\x4d\x4c\xac\x75\x73\xa8\x05\x23\x49\xd1\xa4\
-\xa5\x44\x13\xd0\x11\xfe\x02\x9d\xc1\x44\xac\x38\x68\x13\x4d\xa0\
-\xb2\x83\x6c\xb8\xba\x50\x98\x9c\x29\x92\x14\xb6\x0a\x44\xf2\x8e\
-\x03\x7d\x4d\x73\xfb\x6a\x11\x69\x4f\x1b\xee\x67\xba\x3d\xf7\xbe\
-\xf6\x7b\xbe\xbd\xf7\xdd\xe5\x1c\xc0\x62\xb1\x5c\x64\x78\x9a\x45\
-\xe1\x58\x2c\xe0\x1e\x74\x8c\x50\x10\x05\x70\x0d\xc0\x20\x80\xb6\
-\xba\x2a\xfb\x77\x8e\x01\xe4\x00\x6c\x0a\x91\x71\xba\x8e\x16\x57\
-\xd3\xe9\x42\xad\x87\x6a\x19\xc0\xf0\x83\xf8\x98\x80\x2f\x01\x0c\
-\x9c\x87\xca\x06\xb2\x23\xc4\xf4\x5a\x66\x21\x0d\x40\xaa\x2d\xaa\
-\x6a\xc0\x8d\x64\xb2\xbd\x3b\x2f\x73\xa0\x4c\xd4\x45\x5e\xa3\x10\
-\xbe\xdd\xef\xe5\xe4\xf7\x54\xea\xb7\xdf\x74\xb5\x6d\xcc\x4b\x7b\
-\xee\x6b\x10\x49\x23\x9e\x25\xf0\x4d\x20\x3f\x29\x8e\x7b\xbe\x4a\
-\xff\x0f\xa1\xeb\x10\xec\x17\xe0\x26\x80\x60\x69\x82\x32\xd1\x9d\
-\x07\x00\x3c\x85\xcf\x4e\xf0\xdd\x01\xa1\x68\x62\x8c\x82\x0f\x65\
-\xa1\x3d\x11\x99\x5a\x5b\x7e\xff\xd9\xef\x4b\x9a\x0c\x86\x22\xf1\
-\x47\x24\x67\x01\xf4\x78\x41\x21\x1e\xaf\x65\x16\x3e\x56\x2c\x36\
-\x03\xe1\x58\x2c\x20\xbf\x3a\x7e\xc0\x3b\xf3\x82\xbc\x03\xe7\xfa\
-\xca\x72\x6a\xa7\x8e\xa2\xcf\x9d\x7b\x91\xe4\x80\x0b\x77\x03\x44\
-\x2f\x00\x80\xc8\xb1\xeb\xe8\xaa\xf9\x62\x74\xcc\x07\xdd\x83\x8e\
-\x11\x94\xbd\xf0\x04\xf2\xbc\xd5\x92\x07\x80\x95\xe5\xd4\x0e\x1d\
-\xbe\x28\x05\x04\x83\x52\xe8\x1c\x36\xd7\x55\x18\x50\xbc\xea\x3c\
-\xb2\xc5\x6d\xdf\x92\xac\x66\xde\x7d\x02\x90\x2d\x05\x28\xb5\x0d\
-\xc0\xc9\x3d\x0f\x00\x10\x91\x75\x34\xff\x99\xff\x1b\x52\xcc\xc1\
-\x63\xc8\x5c\xe0\x67\xc0\xa0\x37\x20\xb1\x5b\x0f\x55\x8d\xc4\xc8\
-\xe1\x8a\x39\xef\x67\x40\xe9\x6a\x6c\xb6\xab\xee\x2c\x18\x39\x54\
-\x5c\xfb\x7e\x06\x5c\x28\xac\x01\xda\x02\xb4\xb1\x06\x68\x0b\xd0\
-\xc6\x1a\xa0\x2d\x40\x1b\x6b\x80\xb6\x00\x6d\xac\x01\xda\x02\xb4\
-\xb1\x06\x68\x0b\xd0\xc6\x1a\xa0\x2d\x40\x1b\x6b\x80\xb6\x00\x6d\
-\xac\x01\xda\x02\xb4\xb1\x06\x68\x0b\xd0\xc6\x1a\xa0\x2d\x40\x1b\
-\x6b\x80\xb6\x00\x6d\xac\x01\xda\x02\xb4\xb1\x06\x68\x0b\xd0\xc6\
-\x1a\xa0\x2d\x40\x1b\x6b\x80\xb6\x00\x6d\xac\x01\xda\x02\xb4\xf1\
-\x33\xe0\xd8\x1b\x08\xdd\x96\x37\xc8\xc8\xe1\xd8\x9c\xf7\x4b\x30\
-\x57\x7a\x58\x70\xb9\x1e\xa2\x1a\x89\x91\xc3\xb6\x39\xef\x67\xc0\
-\xa6\x37\x20\x79\x0b\xa7\xec\x29\x68\x52\x58\xcc\xc1\x63\xcb\x5c\
-\x50\x61\x80\x10\x99\xb2\x8f\xc1\x70\x24\x31\x52\x0f\x65\x8d\x20\
-\x1c\x1d\x7f\x88\xf2\xca\x71\xe1\x92\xb9\xa6\xc2\x00\xa7\xeb\x68\
-\x11\x40\xa9\x36\x58\x88\xb9\x3b\xf7\x13\x2d\x77\x14\x6e\x0f\x3f\
-\xe9\x17\x91\xd9\x52\x80\xc8\x31\x70\x58\xdb\x80\xd5\x74\xba\x20\
-\xc4\x74\x59\xa8\xcf\x69\x47\x36\x14\x89\x8f\xa2\x35\x8e\x03\x43\
-\x91\xf8\x68\xbb\xdb\xb6\x01\xa0\xcf\x0b\x0a\x30\xe3\xd7\x42\x53\
-\x2d\x21\xde\x8d\x8c\xbf\xf1\xe9\x16\xc9\x8a\xc8\x3a\x89\xdd\x66\
-\xab\x22\x15\xba\x8e\x08\x2e\x17\xcf\x7c\xd0\x98\x9e\xff\xfa\x65\
-\xe1\x19\x7c\xea\x9e\xab\x75\x8c\xc8\x7e\x2f\x27\xbb\xf3\x80\x61\
-\x42\x90\x64\xf0\xe4\x07\x9b\xad\x86\x9a\xa0\xff\xdf\x39\xbf\xdf\
-\xe3\x4c\xa1\x4a\xd1\x77\xcd\xa6\xa9\x50\x34\x11\xa3\xe0\x15\x5a\
-\xad\x69\x8a\xc8\x09\x30\x73\xe6\xa6\xa9\x72\xc2\xb1\x58\x40\x0a\
-\x9d\xc3\xc5\x7a\xfb\x21\x9c\x54\x5d\x37\x63\xdb\xdc\x36\x80\x2d\
-\x08\x97\x18\x38\x5c\x3a\x4d\xdb\x9c\xc5\x62\xb9\xd8\xfc\x01\xdf\
-\x73\xe1\xb5\xcf\x33\xa6\xd1\x00\x00\x00\x00\x49\x45\x4e\x44\xae\
-\x42\x60\x82\
-\x00\x00\x00\xc8\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x00\x7a\x49\x44\x41\x54\x78\x9c\xed\
-\xd0\xb1\x6d\xc2\x60\x14\x85\xd1\xef\x67\x88\x88\x81\x32\x01\x62\
-\x83\xd0\x78\x22\x9a\xac\x90\x36\x0d\x0b\x59\x2c\xe1\xb4\x91\x5d\
-\x83\x25\x38\xa7\xbc\x7a\xc5\x7d\xb7\x00\x00\x00\x00\x00\x00\x80\
-\x77\x30\xd6\xc1\xe7\xf9\x72\x1a\x4b\xd7\xea\x63\x87\x3e\x0f\x33\
-\x6a\x5e\xea\xeb\xf6\xf3\xfd\xfb\x3f\x3f\x6c\x0e\x5f\xf0\xf9\xaa\
-\xa5\x8e\xd5\x75\x9d\x6f\x06\x78\x37\x9b\x01\x96\xd1\x54\xdd\x77\
-\xe8\xf2\x50\xa3\xe6\x6a\xda\xbb\x07\x00\x00\x00\x00\x00\x00\x00\
-\xf0\x7c\x7f\x0b\xd1\x0f\x08\x20\x9f\x5b\xc7\x00\x00\x00\x00\x49\
-\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x01\x04\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x00\xb6\x49\x44\x41\x54\x78\x9c\xed\
-\xd9\x41\x0d\xc3\x40\x10\xc5\xd0\x69\x14\x4e\xe1\x51\xa0\xe1\x11\
-\x52\x9b\xc2\x78\x95\xd6\x26\x30\x96\xf5\x6f\x33\x03\xb9\xee\xf5\
-\x5e\xf7\x7a\xa5\xc3\x21\x8f\xff\x03\x05\xd0\x02\x9a\x02\x68\x01\
-\x4d\x01\xb4\x80\xa6\x00\x5a\x40\x53\x00\x2d\xa0\x29\x80\x16\xd0\
-\x14\x40\x0b\x68\x0a\xa0\x05\x34\x05\xd0\x02\x9a\x02\x68\x01\x4d\
-\x01\xb4\x80\xa6\x00\x5a\x40\x53\x00\x2d\xa0\x29\x80\x16\xd0\x6c\
-\x1f\xe0\x23\x8f\xeb\xd7\xf8\x4c\x0b\x98\x53\x0b\xcc\xcc\x3c\xdf\
-\x83\x2d\x71\xfb\x05\x14\x40\x0b\x68\x0a\xa0\x05\x34\x05\xd0\x02\
-\x9a\x02\x68\x01\x4d\x01\xb4\x80\xa6\x00\x5a\x40\x53\x00\x2d\xa0\
-\x29\x80\x16\xd0\x14\x40\x0b\x68\x0a\xa0\x05\x34\x05\xd0\x02\x9a\
-\x02\x68\x01\x4d\x01\xb4\x80\xa6\x00\x5a\x40\xb3\x7d\x80\x1f\x17\
-\x67\x0a\x44\xf8\xee\xeb\x4c\x00\x00\x00\x00\x49\x45\x4e\x44\xae\
-\x42\x60\x82\
-\x00\x00\x02\x1d\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x01\xcf\x49\x44\x41\x54\x58\x85\xed\
-\xd6\x3d\x8b\x53\x41\x18\xc5\xf1\xff\x99\x44\xf1\x05\x5f\x3a\x41\
-\x1b\x11\x2b\x0b\xb5\x31\x61\x11\x4b\x49\xb3\xb2\x59\x65\xd7\x46\
-\xd0\xd6\x42\xf6\x13\x88\x2c\x7e\x01\x51\xb0\x16\xb1\x90\x15\xcd\
-\x2e\x04\x71\xb1\x14\x89\x49\xa5\x16\x56\x16\x6b\x23\xd8\x28\x8b\
-\xf8\x82\x26\x73\x2c\xe6\x46\x2c\x73\x93\x30\x16\xfa\x14\x97\x5b\
-\xcc\xcc\xf9\xcd\xdc\x67\xe0\xc2\xbf\x5e\x1a\x65\x50\xad\x15\x3f\
-\xc9\x28\xf4\x75\xa8\xb3\xa8\x8f\xd3\x04\x84\x51\x06\xc9\xec\x05\
-\xf6\xc4\xaa\xdb\x47\xd7\xbd\x33\x3b\xe0\x8f\x9a\xd9\xfe\xd5\x0f\
-\x8f\xac\x78\xeb\x5f\x01\x38\x3d\x1a\xbb\xb6\xc4\xbb\x0b\x2b\xae\
-\x64\x07\x60\x22\xc2\x58\xe7\xdf\x55\xe2\x2d\xec\x91\x7a\x68\x6a\
-\x00\x09\x63\x6c\x83\xa4\xcb\xf5\xd5\xb8\x9c\x15\x50\x94\x81\x98\
-\xde\x74\xb5\xde\xf2\x52\x6e\x00\x12\xf6\x6f\x84\x6f\xd4\x5b\xbe\
-\x90\x15\x00\x20\xb0\xd1\x10\x71\xa7\xf6\xc8\xb3\x59\x01\x09\x61\
-\x1b\x1b\xa8\x08\x3f\xa8\xad\xfa\x54\x56\x40\x42\x28\x92\x10\xdb\
-\x14\xdd\x3e\xd1\xf2\xf1\xac\x80\x82\x11\x9d\x9a\x73\x77\xb0\x9f\
-\xcc\xac\xf9\x70\x66\x00\x28\x35\xa5\x81\x7d\x71\xe0\xa7\x27\xd7\
-\xbc\x3f\x2b\xa0\x50\xc4\xf4\x35\x38\xd8\x1f\xf8\x71\x7e\x40\x42\
-\x0c\xeb\x58\x7e\x80\x09\x85\x60\xa3\x5a\xd1\x81\xac\x00\x8b\x40\
-\x4a\xff\x10\x2a\x3a\xfd\x7c\x4e\xef\x33\x02\x1c\x64\x04\x6c\x1a\
-\x35\x3a\x73\x7a\x3b\xea\xcc\xea\xc4\xd1\x38\x08\x09\xf8\xee\xa0\
-\x33\xbd\xa6\x5e\x95\x99\x3f\xd1\x09\xd8\x52\x11\x3e\x30\x5a\xe8\
-\x35\xf5\xac\xec\x1a\x63\x9f\x80\x8d\x24\xa7\x0d\x48\x97\x7a\xf3\
-\x6a\x8f\xb3\xce\xb8\x27\x20\xa5\xa6\x43\x68\xa9\x3b\xaf\x7b\x63\
-\xae\x53\x1e\x60\x23\x18\xee\xdc\xd7\x5f\x9c\xd5\xcd\x71\xc3\x4b\
-\x03\x9c\x7e\x05\xd2\x5d\x97\x6f\x77\x9b\xe1\xda\x24\xe1\xa5\x01\
-\xc2\x21\xf5\x9c\xef\x77\x5f\x86\x2b\x48\xce\x0a\x48\x3b\x67\xfd\
-\x73\x3f\x5c\x64\xb9\xf8\x19\x99\xb0\xca\xde\x82\xce\xb7\x1d\x3a\
-\xf7\xa6\xa1\x1f\xd3\x08\x2f\x03\xd8\x44\x56\xf8\x19\x66\x5f\x37\
-\xf4\x65\x5a\xe1\xff\x0b\xe0\x17\x0f\x9e\xa4\x40\x97\xf1\x9c\xea\
-\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x00\xf8\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x00\xaa\x49\x44\x41\x54\x78\x9c\xed\
-\xd0\x31\x15\x80\x30\x00\xc4\x50\x8a\xa6\x7a\x62\x43\x0c\x1b\x9e\
-\xf0\x54\x56\x1c\x7c\x86\x64\xbb\xe9\xf2\x32\x36\xc4\x3c\xae\xf5\
-\xdd\xcf\x7d\x0e\xe1\xb1\x8b\xd3\x3f\x51\x00\x2d\xa0\x29\x80\x16\
-\xd0\x14\x40\x0b\x68\x0a\xa0\x05\x34\x05\xd0\x02\x9a\x02\x68\x01\
-\x4d\x01\xb4\x80\xa6\x00\x5a\x40\x53\x00\x2d\xa0\x29\x80\x16\xd0\
-\x14\x40\x0b\x68\x0a\xa0\x05\x34\x05\xd0\x02\x9a\x02\x68\x01\x4d\
-\x01\xb4\x80\xa6\x00\x5a\x40\x53\x00\x2d\xa0\x29\x80\x16\xd0\x14\
-\x40\x0b\x68\x0a\xa0\x05\x34\x05\xd0\x02\x9a\x02\x68\x01\x4d\x01\
-\xb4\x80\xa6\x00\x5a\x40\x53\x00\x2d\xa0\x29\x80\x16\xd0\x14\x40\
-\x0b\x68\x0a\xa0\x05\x34\x05\xd0\x02\x9a\x02\x68\x01\x4d\x01\xb4\
-\x80\xe6\x05\x58\xe1\x04\x80\x5c\x86\x43\xbc\x00\x00\x00\x00\x49\
-\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x01\x4d\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x00\xff\x49\x44\x41\x54\x78\x9c\xed\
-\xd6\xa1\x4a\x04\x51\x14\xc6\xf1\xef\xcc\x8c\x08\x06\xd3\xda\x7d\
-\x01\x41\x50\xb0\xda\x5c\xb6\x6c\xf1\x39\x2c\x3e\x80\xec\x03\xec\
-\x4b\xd8\x2d\xc2\x8a\xb6\x29\x86\x8d\xbe\x81\x69\x41\x6c\x06\x19\
-\x41\xef\x31\x58\xe4\x5e\xb5\xcd\x59\x70\xfe\xbf\x78\xce\x84\xef\
-\x7e\xe1\xce\x95\x00\x00\x00\x00\x00\x00\x00\x00\x00\x80\x41\xb0\
-\x3f\xb7\xee\x76\xdc\xaa\x0e\xca\xd2\x8b\xb6\x55\xd2\xcc\xd2\x6f\
-\xfb\x1f\x0b\x38\xb8\xf6\x51\xf3\x9e\xe6\x92\x9d\x4a\xda\xea\x2d\
-\x5d\x8c\x4e\xae\x45\xd3\xd8\xd9\xfd\xd4\x56\xf9\xb2\x28\xe0\xe8\
-\xc6\xb7\xd5\xf9\x83\xa4\xdd\x88\x74\x51\x5c\x7a\xb6\xda\xf6\x96\
-\x53\x7b\xfa\x3e\xaf\x8a\x2f\xdf\xd2\x4c\xff\xec\xf0\x92\x64\xd2\
-\x8e\x7f\xa4\x79\x3e\x2f\x0b\x70\x3b\x09\x49\xb4\x06\x26\x1b\xe7\
-\xb3\xb2\x80\x81\x29\x0b\x30\xbf\x5b\x43\x8e\x10\x2e\xbf\xcd\x67\
-\x65\x01\x9b\xd5\x85\xa4\xc7\x80\x3c\xa1\xbe\x2e\xc1\xea\x3c\x9f\
-\x17\x05\x2c\x27\xf6\xe2\xb2\x43\xc9\x2f\x25\xbd\x86\xa4\xeb\x57\
-\x27\xd7\xd5\x46\x6d\xfb\xf9\x1f\x40\xe2\x21\x04\x00\x00\x00\x00\
-\x00\x00\x00\x00\x00\x0c\xc5\x27\x17\xb6\x3b\xc1\x0d\x7c\x50\x9f\
-\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x02\x22\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x01\xd4\x49\x44\x41\x54\x58\x85\xed\
-\xd6\x31\x6b\x14\x41\x18\xc6\xf1\xff\x33\x17\x8d\x20\xd1\x74\x1e\
-\xde\xed\xad\x1c\x96\x82\xb6\x16\x96\x92\x26\x56\x22\x36\x82\xb6\
-\x16\x92\x4f\x20\x22\x7e\x01\x51\xb0\x16\xb1\x10\xc4\xee\x10\xc5\
-\xd2\xc2\x5a\xb8\x52\x48\x76\x37\x91\xb3\x51\x03\x11\x8c\x72\xf3\
-\x58\xec\x5d\x5a\x6f\xef\x96\x4d\xa1\xd3\xec\x2e\xcc\x3b\xcf\x6f\
-\xdf\x9d\x81\x85\x7f\x7d\x68\x96\x49\x5b\x59\xfe\x0d\xa4\x56\xa0\
-\x9f\x24\xc9\xd7\x3a\x01\x61\xb6\x69\x5a\x05\x4e\x8e\x23\x83\xd1\
-\x68\x74\xfc\x10\x00\x07\xe3\xe2\xfe\xfe\xef\x57\xc3\xe1\xf0\xe8\
-\xe1\x00\x6c\x0c\x6b\x2b\x2b\xab\xcf\x6c\xb7\x9a\x07\xa0\x28\x61\
-\xe3\xeb\x59\xb6\xf3\xd8\xf6\x4c\x7b\xa8\x3e\x80\x70\x34\x2e\xef\
-\x7d\x3b\x2b\x76\xee\x37\x0b\x00\x04\x06\x47\xdb\x60\xdf\xcd\xb2\
-\x62\xa3\x51\xc0\x84\x61\x29\x44\x00\xc3\xc3\x2c\x2b\x6e\x34\x0c\
-\x00\xb0\x91\xa6\x88\xa7\x59\xb6\xbd\xde\x30\x00\xb0\x4d\xb9\x27\
-\x5a\xc6\x2f\xf3\x3c\xbf\xd4\x2c\x00\x40\x44\xb0\x81\x63\xd1\x1a\
-\x6c\x6e\x6e\x5f\x68\x16\x50\x2a\x22\x60\xe0\x84\x02\x6f\x8a\xa2\
-\x38\xdb\x30\x00\x80\x38\x39\x21\xa7\xc6\x51\xef\xf2\x3c\x3f\xdd\
-\x34\x00\x43\x2c\x1b\xe1\x33\x11\xbd\x6e\x1c\x30\x55\x4c\xae\xe7\
-\x1b\x07\x08\x02\x12\xa0\xad\x20\x77\x66\xa9\x59\xaa\x31\x3f\x18\
-\x04\xfa\xd2\x0a\xbe\x9c\x24\xbd\xcf\x33\x15\xd5\x93\xed\x40\xf9\
-\x73\xb3\x1b\xc7\xac\x25\x49\xf2\x69\xd6\xca\x85\x01\x86\x40\xd9\
-\xf7\x9f\x41\xbe\xd2\xef\x77\x3f\x56\xa9\x5f\x10\x20\xa9\x7c\xf3\
-\xb1\xd0\xb5\x5e\xaf\xf7\xbe\xea\x0a\x8b\x00\x34\x69\x3d\x82\x5b\
-\x69\xda\x1d\xcc\xb3\xc8\xbc\x00\xd9\x07\xe1\x1b\x69\x9a\x3c\x9f\
-\x73\x9d\xea\xa7\xc0\xe5\x07\x0f\x65\xf3\xf5\x20\xed\x75\x1f\xcd\
-\x1b\x0e\x15\x3b\x60\x97\xe1\xe5\x83\x9e\xa4\x49\xe7\xde\x22\xe1\
-\x95\x01\x92\xa7\xe1\x2f\xd2\xb4\x73\x47\x92\xff\x52\x52\x2f\x00\
-\x84\xe0\xed\xde\xde\xf7\x9b\x9a\xfc\x8c\x2c\x3a\xaa\xee\x81\x0f\
-\xcb\xcb\x47\xae\xa6\xe9\xb9\x5f\x75\x84\x57\x00\x78\xd7\x46\x4b\
-\x2d\xad\xb7\xdb\xed\x1f\x75\x85\xff\x1f\x00\x7f\x00\x61\x3f\xa0\
-\x35\x7d\x81\xed\xd8\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\
-\x82\
-\x00\x00\x04\xe7\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x04\x99\x49\x44\x41\x54\x78\x9c\xed\
-\x9b\xbd\x6f\x1c\x45\x18\xc6\x9f\x77\xf7\x1c\xa4\x74\xa9\x4c\x74\
-\x1f\x63\x1f\x4e\x91\x28\x52\x90\x92\x2e\x6d\xa0\x09\x50\x60\xa4\
-\x80\x44\xa2\xfc\x03\x11\x69\x40\xd8\x12\x4e\xb0\x14\x02\xa1\x81\
-\xbf\x00\x24\x2c\x50\x44\x42\x11\x39\x8d\xa1\x4a\x5a\xa7\x41\x60\
-\x37\xe1\xd8\x8f\xbb\x22\x14\x50\x22\x87\xdb\x7d\x28\xce\x23\xf6\
-\x6e\xf7\xbc\x7b\xde\x4f\xe3\xfb\x49\x2e\x76\xe6\xbd\x9b\x77\x1f\
-\x3f\xef\xec\xec\x69\x06\x98\x32\x65\xca\x61\x46\x92\x04\x91\xac\
-\xd9\x76\xf7\x0d\x0a\x2f\x09\xe4\x1c\x80\x3a\x80\x17\xf2\x4d\x6d\
-\x62\x76\x00\xf4\x08\x6e\x0a\xe5\xae\x52\x8d\x07\x22\xd2\x8f\xfb\
-\x50\xac\x00\xb6\x6d\xbf\x42\xc8\x97\x80\x9c\xcc\x24\xcd\xe2\xd8\
-\x12\xf8\xd7\x95\x52\x3f\xee\x15\x64\x8c\xeb\x20\x29\x96\xd3\x5d\
-\x26\x8c\x8d\x03\x78\xf3\x00\x70\x8a\x30\x36\x7e\xb7\xbb\x4b\x24\
-\xc7\xfe\xa3\xc7\x0a\x60\xbb\xbd\x25\x90\xb7\xf2\xc9\xad\x38\x04\
-\xfc\xc4\x72\x7a\x1f\x8e\xef\x8f\x60\x60\x7b\x63\x63\xa4\xf9\x2f\
-\x10\x2b\x80\xf7\x50\x29\xe5\x88\x88\x97\x69\xa6\x29\x21\x69\xda\
-\xb6\xdd\x02\xcc\x8b\x10\xac\x02\x38\x16\xec\x17\xf8\xaf\x46\x95\
-\x43\x48\x00\x92\x35\xdb\x71\x7f\x1e\xb6\x3d\x7f\xf2\xbd\xfe\xbb\
-\xed\x76\xfb\x59\x0e\xb9\x67\x4e\xa7\xd3\x99\x35\xcc\xda\x1a\x20\
-\x17\x02\xcd\x5b\xaa\xd5\x38\x33\x3a\x31\x86\x04\xb0\x2c\xf7\x4d\
-\x08\xee\x07\x9a\xfe\xec\xff\x33\x73\x72\x61\xe1\xc5\x3f\xf2\x4a\
-\x38\x0f\x06\x22\xcc\x6c\x23\xe8\x04\x62\x71\x6e\xae\xf9\x43\x30\
-\x2e\x34\x07\x50\x78\x69\xb8\x01\x37\x0e\xda\xcd\x03\x40\xbb\xdd\
-\x7e\x26\xc0\x8d\x60\x5b\xe8\xde\x10\x21\xc0\xee\x73\x3e\x80\xf7\
-\x30\xeb\xe4\x8a\x82\xf4\xd6\x83\xd7\x02\x39\x3b\x1a\x13\xf5\x14\
-\xa8\x07\x2f\x94\x52\x4e\xc6\x79\x15\x46\x44\xee\x8d\xd1\x98\x28\
-\x01\x86\x56\x78\x55\x9b\xed\x27\x21\x22\xf7\xd0\xea\x75\xec\x3a\
-\xe0\xb0\x50\x2b\x3b\x81\x24\xb8\xae\xbb\xe0\xf9\x58\x01\xb0\x08\
-\x00\x04\xef\x99\x82\xd5\x56\xab\xf5\x5b\xda\xef\xae\xbc\x03\x5c\
-\xd7\x3d\xe1\xf9\x78\x04\xe0\x32\x80\xa3\x00\x8e\x0a\xe4\x8a\x4f\
-\x79\xec\xba\xee\x42\xda\xef\xaf\xb4\x00\x24\x6b\x9e\x8f\xef\x00\
-\x1c\x8f\xe8\x3e\xde\xf7\xf9\x51\xda\x31\x2a\x2d\x80\xed\xf6\x3e\
-\x00\x10\x7a\x74\x69\x04\xf2\x56\xda\x31\x2a\x2b\x80\xe3\x38\xa7\
-\x41\xde\xcc\x7b\x9c\x4a\x0a\x40\xb2\xe6\x53\xbe\x06\x30\xb3\x57\
-\x9c\x80\xdf\xa7\x1d\xab\x92\x02\xc4\x59\x7f\x97\xe7\x00\xef\xa4\
-\x1d\xab\x72\x02\x24\xb5\x3e\x21\x37\x95\x52\x5b\x69\xc7\xab\x94\
-\x00\x49\xad\x0f\x60\x73\xae\x55\xff\x3c\x8b\x31\x2b\x25\x40\x52\
-\xeb\x0b\xfc\xab\x49\x7e\xf0\x4c\x42\x65\x04\x98\xd0\xfa\xbf\x66\
-\x35\x6e\x25\x04\x28\xc3\xfa\x9a\x4c\xde\x05\x1c\xc7\x79\xc9\x23\
-\x56\x02\x0b\x93\xfb\xa6\x81\xd5\x66\xb3\xf9\x34\xc9\xe7\xcb\xb0\
-\xbe\x26\xb5\x03\x5c\xd7\x5d\xf0\x29\x8f\x05\x72\x05\xbb\x6b\x75\
-\x00\x97\x3d\x1f\x8f\x5c\xd7\x3d\x11\xf7\xf9\xb2\xac\xaf\x49\x2d\
-\xc0\xee\x5b\x5a\xe4\x5a\xdd\xf3\xf1\x2d\xc9\xb1\x2e\x2b\xd3\xfa\
-\x9a\x2c\xe6\x80\xc5\x3d\xfa\xce\x59\x4e\xef\xfd\x71\x9d\x65\x5a\
-\x5f\x93\xfb\x24\x28\xe0\x4d\xc7\x71\x4e\x8f\xb6\x97\x6d\x7d\x4d\
-\x6a\x01\x08\xde\x8b\x09\x39\xe2\x53\xbe\x0a\x96\x42\x15\xac\xaf\
-\x49\x2d\x80\x01\x7e\x06\xe0\x79\x4c\xd8\x50\x29\x54\xc1\xfa\x9a\
-\xd4\x02\x28\xa5\xb6\x20\xf2\x71\x5c\x9c\x2e\x85\xaa\x58\x5f\x93\
-\xc9\x1c\xa0\x9a\xf5\x3b\x00\x9e\xc4\x84\x1d\xf1\x29\xdf\xf8\x90\
-\x35\x54\xc0\xfa\x9a\x4c\x04\x10\x91\xbe\x21\xbc\x8a\xf8\x52\x78\
-\x19\xc4\x99\x98\x98\x42\xac\xaf\xc9\xec\x29\xd0\x6a\xb5\x7e\x49\
-\x52\x0a\x71\x14\x65\x7d\x4d\xa6\x8f\xc1\x84\xa5\xb0\x17\x85\x59\
-\x5f\x93\xa9\x00\x13\x94\x42\x14\x85\x5a\x5f\x93\xf9\x42\x68\xbf\
-\xa5\x50\xb4\xf5\x35\xb9\xac\x04\xf7\x51\x0a\x85\x5b\x5f\x93\x8b\
-\x00\x13\x96\x42\x29\xd6\xd7\xe4\xf6\x2e\x90\xb4\x14\xca\xb2\xbe\
-\x26\xd7\x97\xa1\x04\xa5\x50\x9a\xf5\x35\xb9\x0a\x20\x22\x7d\xd3\
-\xc0\xdb\x10\x84\x37\x59\x08\x1c\xd3\xc0\x3b\x65\x59\x5f\x93\xfb\
-\xeb\x70\xb3\xd9\x7c\x5a\x33\xe4\x3c\x80\x75\x00\x7f\xef\xfe\xad\
-\xd7\x0c\x39\x9f\xf4\x27\xb3\x3c\x29\x64\x7f\x40\xa3\xd1\xe8\x02\
-\x78\xbd\x88\xb1\x26\xa5\x12\xbf\x0a\x97\x49\x94\x00\x3b\xc1\x0b\
-\x92\x66\x41\xb9\x64\x4e\x44\xee\x3b\xa3\x31\x51\x02\xf4\x82\x17\
-\x83\xed\xa7\x07\x93\x88\xdc\xbb\xa3\x31\xe1\x8d\x92\xe0\xe6\x70\
-\x8b\x79\x31\xd3\xac\x0a\x44\xc4\x7c\x2d\x78\x4d\x30\xf4\x48\x0e\
-\x6f\x94\xa4\xdc\x1d\x6e\xc0\x6a\xa7\xd3\x99\xcd\x3c\xbb\x9c\xe9\
-\x74\x3a\xb3\x04\x86\x16\x62\xa1\x7b\x43\x84\x00\x4a\x35\x1e\x00\
-\xdc\x0e\x34\x1d\x33\xcc\xda\xda\x41\x12\xe1\xbf\xcd\xd2\x43\x3b\
-\xc6\xb7\x06\xf7\x36\x4c\xd8\x01\x22\x7d\x01\xdf\x1b\x69\xbd\x60\
-\x98\x33\xdb\xb6\xed\x5e\xb3\x2c\x6b\xbe\x8a\x13\x23\x49\xd3\xb2\
-\xac\x79\xdb\x76\xaf\x0d\x36\x49\x0f\xed\x14\x87\xc0\xbf\x1e\xb5\
-\xe8\x1a\x7b\x92\xc2\x72\xba\xcb\xff\x87\x03\x13\x00\x40\xc8\xf2\
-\xbc\x6a\xdc\x8e\xea\x1b\xbb\x0e\x50\xcd\xfa\x6d\x42\x96\xf3\x4b\
-\xab\x10\x48\x60\x69\xae\x55\xff\x74\x5c\x40\xc2\x43\x53\xc6\x17\
-\x00\x4e\x65\x9a\x5a\xfe\x24\x3a\x34\xb5\x9f\x63\x73\x67\x31\xd8\
-\x75\x5d\xc5\x63\x73\x5d\x82\x4f\x26\x39\x36\x37\x65\xca\x94\xc3\
-\xcd\xbf\x5b\x3f\xf6\x3c\xa0\xff\x9c\x5c\x00\x00\x00\x00\x49\x45\
-\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x04\xf5\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x04\xa7\x49\x44\x41\x54\x78\x9c\xed\
-\x9b\xcf\x6f\x15\x55\x14\xc7\xbf\x67\xa6\x85\xc2\xca\xe7\xa6\x21\
-\x10\x58\x58\x16\x36\x4d\x30\xf1\xa5\x2f\x95\x4d\x9b\xa8\x1b\x90\
-\x96\x02\xa2\x11\x08\x7f\x82\x1b\x89\x6d\x62\x5b\x9b\x28\x8a\x1b\
-\xfd\x0b\x34\xb1\xd1\x00\x6d\xf1\x91\xb2\xa9\x26\x6d\x20\x81\x3c\
-\x2d\x1b\xa3\x75\x83\x0b\x9a\xb2\xa8\x8b\xd6\x15\x2d\xd0\xb9\x5f\
-\x17\x7d\x53\x66\xe6\xcd\x74\xe6\x31\x77\x7e\xd4\xbe\x4f\xf2\x16\
-\x73\xee\x79\xef\x9e\x7b\xde\xf7\xdc\xb9\x33\xb9\x17\x68\xd0\xa0\
-\xc1\x4e\x46\xa2\x38\x75\xcf\xb0\x69\x6d\x05\x27\x14\xd4\x59\x81\
-\x14\x09\xec\x17\x60\x77\xd2\xc1\xd5\x03\x81\x27\x02\x3c\x22\x38\
-\x67\xc0\xb8\xda\x52\xc0\xcd\xd9\x1e\x59\x0f\xfb\x5e\x68\x02\x4a\
-\x93\x7c\x0b\xe0\x37\x00\x5e\xd5\x12\x69\x7a\xcc\x03\xf2\x61\xa5\
-\x5f\x7e\xde\xca\xc9\x08\x6c\x21\xa5\x73\x82\x83\x00\xa7\xb1\xfd\
-\x06\x0f\x00\xed\x00\xa7\x4b\x37\x38\x00\x32\xf0\x8f\x0e\x4c\x40\
-\xe7\x24\x06\x44\xf8\x59\x32\xb1\xa5\x08\xf9\x79\xe9\x27\x7c\x1c\
-\xd4\xec\x9b\x99\xaa\xec\xa7\x3d\xe6\x15\x8a\x0c\xc1\xc4\xad\x43\
-\x6b\x58\xb8\xfe\xae\x58\x5a\x03\x8d\xc9\x99\x6b\x34\x1f\xb6\xe0\
-\x20\x2c\x1c\x13\x72\x14\x40\xc1\xed\x21\x6f\xfb\x95\x43\x4d\x02\
-\xba\x67\xd8\xb4\xba\xc2\xdf\xe1\x94\xbd\xe0\x17\x18\x72\xae\xd2\
-\x2b\x4b\xda\x23\x4f\x80\x52\x99\xad\x50\x1c\x03\xf1\xa6\xc3\x3c\
-\xbf\xa7\x20\x47\xbc\x13\x63\x4d\x09\xac\xad\xe0\x04\xdc\x35\xbf\
-\x6c\x52\x3e\xd8\x2e\x83\x07\x80\x4a\xaf\x2c\xc1\x90\x73\x00\x56\
-\x1c\xe6\xf6\xea\xd8\x5c\xd4\x24\x40\x41\x9d\x75\x5e\x53\x64\xf8\
-\x6e\xbf\xfc\xa3\x3f\xcc\x64\xa9\xf4\xca\x92\x50\x86\x9d\x36\xef\
-\xd8\x00\x9f\x04\x08\xa4\xe8\x32\x98\xb8\xa5\x3d\xba\x94\x50\xcd\
-\x98\x72\x5b\xe4\x75\xaf\x4f\x4d\x02\x08\xec\x77\x5e\x1f\x5a\xc3\
-\x82\xee\xc0\xd2\xc2\x27\xf6\x03\x5e\x1f\x1f\x05\xb8\x57\x78\x79\
-\x9b\xed\xeb\xc1\x1b\xbb\xdf\xea\x35\x78\x21\xb4\x43\x68\xca\x3a\
-\x80\x28\x74\x95\xd9\xa6\x94\x1a\x02\xe5\xd4\x86\x85\xe3\xa6\x18\
-\xa3\x77\x4f\xca\xdf\x71\x7f\x3b\xf7\x0a\x28\x8d\xf3\xb0\xb2\x78\
-\x1b\x94\xf3\x00\xf6\x6e\x7c\xe4\x82\x45\xde\xe9\x2a\xb3\x2d\xee\
-\xef\xe7\x3a\x01\xdd\x33\x6c\x82\xc1\x1f\x01\xec\xf3\x69\xde\xa7\
-\x2c\xf5\x49\xdc\x3e\x72\x9d\x80\xc7\xcb\xb8\x04\xa0\xe6\xd6\xf5\
-\x1c\x39\x1d\xb7\x8f\xdc\xce\x01\xc5\x49\x76\x08\x38\x92\x74\x3f\
-\xb9\x54\x40\xf7\x0c\x9b\x4c\xf0\x3b\x00\xcd\x5b\xf9\x09\x78\x3d\
-\x6e\x5f\xb9\x4c\x40\xb8\xf4\x01\x00\x4f\x69\x18\x57\xe2\xf6\x95\
-\xbb\x12\x88\x2c\x7d\x91\x91\x4a\x9f\xcc\xc7\xed\x2f\x57\x0a\x88\
-\x2a\x7d\x08\xe6\xf6\xbc\x84\xaf\x74\xf4\x99\xab\x04\x44\x95\xbe\
-\xb2\xe4\x62\x94\x17\x9e\x51\xc8\x4d\x09\xd4\x23\xfd\xdf\x4e\xcb\
-\x9f\xba\xfa\xcd\x85\x02\xb2\x90\xbe\x8d\x16\x05\xbc\x71\x83\xaf\
-\x58\x54\x43\x9b\x0b\x13\xe1\x84\x61\x18\xa3\xf7\x7a\xe5\x41\x94\
-\xef\x3f\x5e\xc6\x25\x91\x74\xa5\x6f\x13\x5b\x01\x5d\x65\xb6\x59\
-\xe4\x1d\x40\x2e\xc0\x5e\xab\x53\xce\x2b\x8b\xb7\x4b\xe3\x3c\x1c\
-\xf6\xfd\xe2\x24\x3b\x44\xd2\x97\xbe\x4d\xec\x04\x28\xa5\x86\x10\
-\xb0\x56\x87\xc9\x1f\xba\x67\x18\xa8\xb2\x2c\xa5\x6f\x13\x7f\x0e\
-\xd8\x7c\x44\xf5\x6b\x43\x71\xf5\x5f\x7c\x14\xd4\x9c\xc5\xac\xef\
-\x25\xf9\x49\x90\x1c\x29\x4e\xb2\xc3\x6b\xce\x5a\xfa\x36\x1a\x12\
-\xc0\xf1\x10\x87\x5d\xa6\xf0\x5b\x67\x29\xe4\x41\xfa\x36\xf1\x13\
-\x60\x18\x5f\x02\x78\xba\xa5\x8f\xa7\x14\xf2\x20\x7d\x9b\xd8\x09\
-\xa8\xf4\xc9\x3c\x29\x9f\x86\x3a\x56\x4b\x21\x2f\xd2\xb7\xd1\x32\
-\x07\xec\x7d\x19\x57\x00\xdc\x0f\x71\xdb\x65\x82\xdf\x9b\xe0\x18\
-\x72\x20\x7d\x1b\x2d\x09\x98\xed\x91\x75\x0b\x72\x11\x61\xa5\x00\
-\xbc\x06\xe0\x48\x88\x4f\x2a\xd2\xb7\xd1\x76\x17\x98\xeb\x97\x3f\
-\x22\x95\x42\x18\x29\x49\xdf\x46\xeb\x6d\x30\x62\x29\x04\x93\xa2\
-\xf4\x6d\xb4\x26\xa0\x8e\x52\xf0\x23\x55\xe9\xdb\x68\x5f\x08\xbd\
-\x70\x29\xa4\x2c\x7d\x9b\x44\x56\x82\x75\x97\x42\x06\xd2\xb7\x49\
-\x24\x01\x75\x96\x42\x26\xd2\xb7\x49\xec\x59\x20\x72\x29\x64\x24\
-\x7d\x9b\x44\x1f\x86\x42\x4b\x21\x43\xe9\xdb\x24\x9a\x80\xd9\x1e\
-\x59\x37\x4c\x79\x4f\xa4\x76\x93\x85\x08\x16\x0c\x43\xde\xcf\x4a\
-\xfa\x36\x89\x3f\x0e\xdf\xeb\x95\x07\x54\x72\x54\x80\x29\x00\xab\
-\x00\x56\x05\x98\xa2\x92\xa3\x51\x5f\x99\x25\x49\x2a\x6f\x85\x2b\
-\xa7\x64\x11\xc0\x3b\x69\xf4\x55\x2f\xb9\x78\x2b\x9c\x25\x7e\x9b\
-\xa4\x9e\x38\xaf\xcf\x5c\xa3\x99\x5e\x38\x7a\xf1\xc6\xee\x1d\x1b\
-\xe0\xbf\x49\xea\x91\xf3\xfa\x61\x0b\x0e\xea\x0f\x2d\x1d\x7c\x62\
-\x5f\xf4\xfa\xf8\x28\x80\x73\x2e\x83\x85\x63\x7a\xc3\x4a\x0f\xe3\
-\x19\x8e\xbb\x2d\xac\xb9\x25\xd7\x24\xc0\x80\x71\xd5\x79\x2d\xe4\
-\x68\xa9\xcc\x56\xdd\xc1\x25\x4d\xa9\xcc\x56\x0a\x5d\x0b\x31\xef\
-\xd8\x36\x6c\x1e\x5a\x0a\xb8\x09\xe0\x2f\x87\xa9\x00\xc5\xb1\xed\
-\x94\x84\xcd\xcd\xd2\xee\x1d\xe3\xf3\xd5\xb1\xb9\xa8\x6b\xbb\xbc\
-\x50\x86\x55\x33\xa6\xf2\xbc\x5d\xde\x78\x86\xe3\xd5\x7f\xfe\xc5\
-\xb6\xcb\xdb\x74\x4e\x70\xf0\x7f\x71\x60\x02\x00\x44\x06\x2b\x27\
-\xe5\xb2\x5f\x53\xe0\x3a\xe0\xd7\x7e\x5c\x86\xc8\x60\x72\x51\xa5\
-\x02\x01\x19\xa8\xf4\xe1\x8b\x20\x87\xa8\x87\xa6\xbe\x06\xd0\xae\
-\x35\xb4\xe4\x89\x74\x68\xaa\xee\x63\x73\xd5\x2d\xe7\x07\xf2\x78\
-\x6c\x0e\xc0\x22\xc0\xfb\xf5\x1c\x9b\x6b\xd0\xa0\xc1\xce\xe6\x3f\
-\xb7\x37\xe9\x8b\xf9\x5d\x56\x0e\x00\x00\x00\x00\x49\x45\x4e\x44\
-\xae\x42\x60\x82\
-\x00\x00\x00\x97\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x00\x49\x49\x44\x41\x54\x58\x85\xed\
-\xd7\x41\x0d\x00\x20\x0c\x04\xc1\x83\x20\xa9\x02\x70\x53\x3f\xd5\
-\x43\x52\x6b\x88\x38\x7e\xec\xfe\x7b\x99\x6f\x25\x32\x8a\xac\x8e\
-\xac\x76\x36\x96\x69\xd8\xe6\xbd\xa6\x3b\x00\x00\x00\x00\x00\x00\
-\x00\x00\x00\x00\x00\x00\x00\x00\x6e\xde\x67\x34\x74\x1e\x39\x3e\
-\xee\x02\x8e\xc2\x05\x10\x61\x1a\xbe\x91\x00\x00\x00\x00\x49\x45\
-\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x03\xde\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x03\x90\x49\x44\x41\x54\x78\x9c\xed\
-\x98\xcf\x6f\x54\x55\x1c\xc5\xcf\xb9\xf3\xd2\xd4\x04\x31\x4a\xdd\
-\x89\x2e\x81\x75\xdb\x99\x31\xc6\x64\xaa\x81\x98\x2e\xb4\xd3\x1a\
-\x16\xec\x90\x10\xfd\x03\x54\xe2\x82\x18\x62\x42\xfc\xb1\x36\x21\
-\x50\x60\x45\x4c\xa0\xf3\xa6\xb8\x60\x92\x26\x32\x24\xd8\xc8\x88\
-\xac\xd5\x35\xee\x24\x1a\xe3\xa2\x55\xda\x7b\x5c\xcc\x80\xd3\x77\
-\x6f\x3b\xbf\xde\x9b\xa9\x78\x3f\xcb\xfb\xee\xfd\x7e\xcf\xf7\xbc\
-\xef\xdc\x77\xef\x00\x81\x40\x20\x10\x08\x04\x02\x81\x40\x20\x10\
-\x08\x04\x02\x81\xff\x17\x1c\x55\xe2\x7c\x45\x65\x52\x5f\x02\x30\
-\x90\x2e\x34\x16\x72\xa7\x47\xa1\x63\x24\x06\x14\x63\x9d\x14\x74\
-\x0e\x80\x79\x2c\x44\x3c\x79\x67\x81\x8b\xc3\xd6\x62\x3a\x4f\x49\
-\x97\x62\xac\x53\x82\xce\x27\x73\x8b\xba\x90\xaf\xea\xc3\x61\xeb\
-\x19\x5e\x07\x48\x2c\x54\xed\xe7\x00\xdf\xef\x30\xf1\x8b\x46\xd9\
-\x9c\x02\xa9\x61\xc8\x1a\x8a\x01\xa5\xba\xa2\xb5\xdf\xed\x79\x80\
-\xc7\xbb\x5b\xa1\x4b\x4f\x3d\x6b\xde\xbd\x35\xc3\x8d\x6c\x95\x0d\
-\xc1\x80\xd2\x65\x8d\xaf\xed\xd5\x57\x20\xe6\x92\xcf\x24\x58\x36\
-\x15\x38\x3f\x45\x02\xd5\xf1\x3f\x78\xec\xd6\x71\xae\x67\xa9\x2f\
-\x53\x03\x0a\x37\xb4\x17\xeb\x5a\x06\x30\xe3\x49\xbd\x09\x3c\xea\
-\x72\x02\x50\xce\x13\xe2\x66\x94\xe3\xdc\xea\x5b\xfc\x33\x2b\x8d\
-\x99\x19\xf0\xea\x55\x3d\xff\x77\xa4\x1a\x80\xc9\xad\x4f\x84\x66\
-\xf1\x3e\x94\x73\x24\x11\x3f\x8c\x3d\xe4\xec\xed\xa3\xfc\x35\x0b\
-\x9d\x99\x18\x30\x79\x55\x2f\x46\x91\x56\x00\x1c\x48\x64\x13\x05\
-\xbb\xe3\xee\x46\x18\xc8\xd1\xf5\xb3\x35\x3c\x7c\x77\x8e\xf7\x53\
-\x96\x9a\xbe\x01\xc5\x58\x87\x04\xad\x00\x78\x21\xf1\x48\x20\x2c\
-\x3a\xed\xed\x04\x24\x18\xba\xda\xee\x1b\xcb\x23\xdf\xbd\xcd\x9f\
-\xd2\x53\x9b\xf2\x39\x60\xba\xa2\x69\x41\xb7\xe1\x2b\x1e\x5d\x14\
-\xdf\x9a\x49\xc0\x82\xce\xec\xfd\xd6\xe8\xdb\xfc\x92\xa6\x52\x11\
-\xdb\x22\x35\x03\xa6\xab\x7a\xdd\x50\x37\x01\xec\x6b\x1f\x17\xd4\
-\x2c\xbe\x57\x04\x0b\x38\x26\xec\xa3\x51\x3d\x1f\xeb\xb5\xbe\x85\
-\x26\x48\xc5\x80\x62\xac\x79\x23\xdd\x00\xb0\xa7\x7d\x5c\x90\x08\
-\xf6\x5e\xfc\xbf\x58\x34\x0d\x6c\x67\x0f\xa1\x5a\xbe\xa2\xf2\x00\
-\x71\x1f\x33\xb0\x01\xf9\xaa\x4e\x08\xba\x06\x60\xac\x7d\x5c\xa0\
-\x1d\xb0\xf8\x16\xb4\x72\xe3\x8c\x91\x5a\x2a\xc4\x7a\x67\xd0\xe8\
-\x03\x19\x90\x8f\xf5\x01\xa5\xc5\x64\x9c\x66\xf1\xce\x9b\xeb\x1b\
-\x42\xf2\x98\x60\x00\x5d\x2c\xc4\xea\x70\xb4\xee\x14\xbb\x1f\x24\
-\x16\x63\xfb\xa9\x48\xe7\xf2\x22\xc0\xd2\xfd\xed\xa6\x05\xe1\x79\
-\x69\x82\x3e\xfb\xbe\x6c\x3e\xea\xe7\xfe\xd0\xb3\x01\xa5\xba\xa2\
-\xf5\xdf\xec\x39\x91\x27\x5c\x21\x99\x16\xdf\xcc\x21\x90\xf4\x9a\
-\xb0\xf8\xd2\x86\x79\xef\xda\xd1\xed\x0e\x59\x7e\x7a\x32\xa0\x74\
-\x59\xe3\x6b\xcf\xe8\x0a\x80\xf9\x44\xf6\x66\xf1\xee\xa7\x2b\x13\
-\x24\x90\x80\xf1\xa8\x8f\x9f\x1b\xe7\xb1\xda\x2c\xff\xea\x36\x56\
-\xd7\x06\xbc\x72\x5d\x4f\x6f\x6c\x6a\x19\x80\xf3\x09\x6a\x5d\x6a\
-\x86\x52\x7c\x5b\x4e\x6f\x27\x10\xf8\x26\x97\x63\xb9\xdb\xfb\x43\
-\x57\x06\x4c\x7e\xad\x89\x68\x53\x35\x08\x5b\x0f\x21\x12\xc0\xde\
-\x5a\x2e\x55\x48\xc0\xda\x1c\xb8\xb5\x0c\x02\x77\x1f\x46\x9c\xbd\
-\xf7\x26\x1f\x74\x0c\xd1\x69\xc2\xf4\xb2\xf6\x1b\xab\x15\x00\x07\
-\x13\x8f\xfa\x3b\xe0\x64\x81\xff\xfe\xf0\x23\xc4\x23\x8d\x05\xfe\
-\xb2\xd3\xd2\x1d\x3f\x83\x2f\x2f\xe9\xa0\xb1\x5a\xc5\x6e\x2e\x1e\
-\xd8\xee\xd4\x78\x88\x46\xab\x53\xd7\x75\xc0\xb7\xe4\x11\xdb\x76\
-\x40\x7e\x49\x53\x34\xaa\x01\x98\x70\xd2\xed\xa6\xe2\xdb\xf1\x77\
-\xc2\x03\x90\x6f\x34\xca\xbc\xe7\x5b\xe2\xed\x80\x42\x45\x33\x34\
-\xaa\x23\x51\xbc\x76\x73\xf1\x00\xd0\xbc\x6a\x27\x3b\x61\x02\x52\
-\xbd\x58\x55\xc9\xb7\xc4\xe9\x80\x42\x45\xa7\x61\x74\xc6\xe3\xe4\
-\x70\xb7\xf9\x01\x71\xc4\x13\x82\xe5\xc7\x8d\x05\x7e\xb2\xe3\xbc\
-\x62\x6c\x37\x04\xf8\xfe\x9e\xfa\xcf\x43\x60\xf3\xce\xbc\x89\xda\
-\xc7\x3c\x27\xaa\x27\x17\x5f\x6d\xee\x1e\x40\x9e\x6d\xed\xaa\x4f\
-\x16\x82\x05\x79\x76\xd4\x32\x02\x81\x40\x20\x10\x08\x04\x02\x81\
-\x40\x20\x10\x08\x04\x02\xa3\xe6\x1f\x3c\x8f\x50\x7d\x3b\xd7\xa3\
-\xf5\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x02\xfc\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x02\xae\x49\x44\x41\x54\x78\x9c\xed\
-\x9a\x3f\x6e\x13\x41\x14\x87\xbf\xd9\x10\x85\x26\x48\x14\xb9\x01\
-\x15\x25\x29\x69\x90\x88\x2d\xa5\x43\xd8\xa0\x84\x24\x10\xc9\xb1\
-\xa1\x80\x1b\xd0\x72\x03\x90\x00\xc7\x05\x7f\x82\x03\xb1\x8d\x68\
-\xb3\x3e\x44\x24\x2e\xc0\x05\x22\x21\x0a\x8a\x08\xfc\x68\x90\x70\
-\xc6\xde\x18\xef\xce\xcc\xce\x6c\xfc\xca\xf5\xdb\x9f\xe6\xfb\xb4\
-\x9e\x1d\x3d\x2d\xcc\x6a\x56\xb3\x3a\xcf\xa5\xf2\x5e\x80\xed\x2a\
-\x57\x6a\xb7\x84\xe8\x19\xc8\x77\x89\xa2\x47\xfd\x83\xd7\x5f\x87\
-\x7f\xbf\x90\xd7\xc2\x5c\x54\xb9\x5a\x5f\x13\x91\x3d\x90\x08\x40\
-\x0d\x06\x2f\x81\xeb\xc3\x3d\x51\x2e\x2b\x73\x50\xff\xe0\x4f\x31\
-\x5e\xd2\xfb\x0a\x29\x20\x01\xfe\xb7\x28\x9e\xea\xbd\x85\xfb\x0b\
-\x24\xc1\xa3\x64\xbd\xdf\x69\x7d\xd1\xfb\x0b\xb5\x09\x9e\x05\x1f\
-\x77\x5a\x07\xe3\xee\x29\x8c\x80\x34\xf0\x50\x10\x01\x69\xe1\xa1\
-\x00\x02\xb2\xc0\x43\xe0\x02\xb2\xc2\x43\xc0\x02\x4c\xc0\x43\xa0\
-\x02\x4c\xc1\x43\x80\x02\x4c\xc2\x43\x60\x02\x4c\xc3\x43\x40\x02\
-\x6c\xc0\x43\x20\x02\x6c\xc1\x43\x00\x02\x6c\xc2\x83\xe7\x02\x6c\
-\xc3\x83\xc7\x02\x5c\xc0\x83\xa7\x02\x5c\xc1\x83\x87\x02\x4c\xc3\
-\x97\xaa\xb5\x3b\x88\x7a\x01\x80\xa8\x87\x71\xaf\xf9\x79\xf8\x77\
-\xaf\x26\x42\xa6\xe1\xcb\xd5\xfa\x1a\xa2\xf6\x81\x25\x60\x09\x25\
-\xaf\xf4\x1e\x6f\x04\xd8\x80\x1f\x93\x37\x52\x5e\x08\x70\x04\x3f\
-\x10\xd4\x63\xbd\x37\x77\x01\xae\xe0\x95\x52\xf7\xfb\xdd\xe6\x27\
-\xbd\x3f\xd7\x4d\xd0\x25\xfc\x61\xa7\xb9\x37\xee\x9e\xdc\x04\xf8\
-\x00\x0f\x39\x09\xf0\x05\x1e\x72\x10\xe0\x13\x3c\x38\x16\xe0\x1b\
-\x3c\x38\x14\xe0\x23\x3c\x38\x12\xe0\xec\x3d\x2f\xb2\xd5\xef\xb5\
-\x3e\x4c\x93\x65\x5d\x80\xcf\xf0\x60\x59\x80\xef\xf0\x60\x51\x40\
-\x08\xf0\x60\x49\x40\x28\xf0\x60\x41\x40\x48\xf0\x60\x58\x40\x68\
-\xf0\x60\x50\x40\x88\xf0\x60\x48\x40\xa8\xf0\x60\xe0\x1b\x21\x57\
-\xf0\xc0\x66\xbf\xd7\x6a\x4f\x9b\xb7\x52\xa9\xdf\x55\xc8\x73\xc0\
-\xfc\x4c\xd0\x25\x7c\xdc\xdd\x9d\x1a\xbe\x54\xd9\xd9\x54\x48\x1b\
-\x1b\x33\xc1\x10\xe0\x81\x37\x4c\x60\x4c\x25\xc0\x77\xf8\x72\xb5\
-\xbe\xc1\x28\xbc\x99\x99\x60\x08\xf0\x22\xf2\x56\xcf\x33\x32\x13\
-\x0c\x19\x3e\xf3\x4c\xd0\x77\xf8\x95\xdb\xb5\x7b\x4a\xa9\x77\x7a\
-\xde\xa4\x57\xe7\x7f\x09\x28\x2a\x3c\xc0\x5c\xca\xc5\xda\x98\xe4\
-\x6c\xc4\xdd\xdd\xfd\x69\xf3\xb2\xc0\xc3\x84\x27\xc0\x25\xfc\x61\
-\xa7\xe9\x1c\x1e\xce\x38\x09\xfa\x0e\x5f\xaa\xec\xac\x03\x23\xf0\
-\x4c\x79\x62\x1c\xfb\x04\x04\x02\xff\x5e\xcf\x23\xc5\x1e\x32\x22\
-\xe0\xef\xd9\xb9\x8d\x21\xf8\x84\xbc\xf4\x8f\x7d\x42\x1e\x29\x37\
-\xd0\x53\x02\x96\x1b\x8d\xf9\xcb\xc7\x83\x63\x05\x8b\x43\x97\x53\
-\xc3\x27\xe4\xa5\x86\x37\x9d\x07\xda\x49\x70\xf1\xe4\x64\x4e\xc1\
-\xc2\xd0\xa5\x4c\x9f\xa5\x8c\xc9\xcb\xb4\x58\xd3\x79\xa0\xbd\x06\
-\xbf\x1d\x1d\xfd\xba\x72\xf5\xda\x0f\xe0\xa6\xc0\xcf\x48\xd8\x8a\
-\xbb\xad\x4e\xda\x70\x3d\x0f\xd4\x83\xb8\xdb\xfc\xe8\x4b\x5e\x62\
-\xad\xae\x3e\x59\x58\x6e\x34\xe6\x7d\xcd\xbb\xb1\xbd\x7d\xd1\x64\
-\xde\xac\x66\x75\x8e\xeb\x0f\x00\x7d\xea\x19\xbf\xa0\x8f\x59\x00\
-\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x02\x14\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x01\xc6\x49\x44\x41\x54\x58\x85\xed\
-\x94\xb1\x6a\x14\x51\x14\x86\xbf\xff\xee\xa0\x41\xd0\x68\x13\x8b\
-\xb4\xda\xd8\xac\x20\xee\x6e\xd4\xd4\x22\x06\x45\xb1\x11\x05\x4b\
-\x0b\x51\x1f\x41\xf3\x08\x06\x1f\x40\x50\x10\x42\x76\xb3\x91\x88\
-\x98\x2e\xe0\x82\x08\x01\xf5\x05\xb4\x12\xc4\xc6\x4a\x58\xb3\x73\
-\x7f\x8b\x99\x84\x24\xbb\xd1\xec\xb0\x6a\x33\x5f\x75\x87\x7b\xee\
-\xf9\xff\x73\xce\xbd\x03\x25\x25\x25\x25\xff\x19\x15\x3d\x38\x35\
-\xef\xc9\x98\xf8\x25\x50\x4d\x2a\x9a\xec\x5c\xd6\x97\x22\x79\x42\
-\x91\x43\xf5\x05\x1f\x8f\x89\xdf\x00\x55\x80\x5e\xea\xce\xd4\x92\
-\x8f\x15\xc9\x35\x74\x07\x4e\x2f\xfa\x64\xb0\x5f\x03\x13\xd8\x79\
-\x16\x01\x7c\x35\x3a\xff\xee\xaa\x3e\x0c\x93\x6f\xa8\x0e\xd4\xda\
-\x9e\x0e\xf6\x2a\x30\x81\x30\x41\x29\x41\x29\x60\xe0\xa8\xf0\x6a\
-\xad\xed\xe9\xbf\x62\xa0\xd6\xf2\x8c\xa2\x57\x80\x43\x16\xc6\x44\
-\x9c\x4b\x43\x74\xb6\x1a\x57\xf4\x4a\xad\xe9\x8b\x23\x35\x50\x5f\
-\xf4\x4d\xe1\x36\x30\x06\xb6\x4c\xdc\x19\x23\x88\x64\x33\x19\x93\
-\xbc\xd4\x68\xf9\xc6\x48\x0c\x34\x5a\xbe\x87\xfd\x14\xa8\x18\x1b\
-\xd4\x27\xbe\xc5\x46\xcc\x62\xa8\x18\x3f\x6b\x34\x7d\xb7\xb8\x01\
-\x5b\xf5\x56\x3a\x6b\xfc\x28\xff\x8c\xfa\xad\x78\x6e\x01\x45\xe7\
-\x71\x96\xe7\x1a\xcd\xf4\x21\xf6\xae\x97\x7d\xf0\xc6\x03\x87\x7a\
-\x35\xce\x81\xee\x00\x18\xa2\x36\xa6\xbd\x47\x9c\xbd\x8d\x00\x20\
-\xfb\xf1\xdb\x8f\xe1\x3e\xb3\xfd\x05\xf4\x19\x38\x31\xef\x7d\x07\
-\x93\xf8\x04\x74\xdd\x59\xa6\x28\x0d\x27\xbe\x69\xc2\x08\x11\x32\
-\x11\x3f\xef\x7d\x0b\xb7\xd6\x6e\x6b\x7d\x57\x03\xa7\x5e\xf8\x40\
-\xd2\xf3\x02\x70\x21\x1b\xb7\x22\x43\x56\x3e\x00\x81\x43\x2e\xf5\
-\xaa\x97\xe8\xda\xda\x25\xfd\xe8\x33\x70\x6e\xd9\x47\x7e\x76\xbd\
-\x2c\x71\xc6\x80\x4c\xa4\x60\xe5\x3b\xd9\xde\x09\x3a\x5d\x69\xe6\
-\xfd\x15\x7d\x07\x48\x36\x82\xd6\xbb\xfe\x24\x31\xbe\xe9\x4a\xc5\
-\x7e\xd3\x83\xd0\xf6\x41\x9f\xdd\x6f\x7f\x06\x0e\xc3\x96\x57\xe0\
-\xd1\x14\xbb\x27\xec\x7f\xa7\x55\x52\x52\x52\xf2\x47\x7e\x01\x51\
-\xe3\xba\x72\x94\x2f\x72\xc5\x00\x00\x00\x00\x49\x45\x4e\x44\xae\
-\x42\x60\x82\
-\x00\x00\x00\xd1\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x00\x83\x49\x44\x41\x54\x78\x9c\xed\
-\xd7\xb1\x0d\xc2\x40\x10\x04\xc0\x7d\x8a\x40\x34\x42\x23\xb4\x40\
-\x80\x1c\xd1\x0b\x89\x45\x23\x54\xe1\x42\x2c\x9a\x78\x52\x64\x7d\
-\x6a\x8c\xfc\x33\xe1\xea\x82\xbd\xcb\x2e\x01\x00\x00\x00\x00\xa0\
-\x1f\x65\x19\x9c\x6f\x8f\x4b\x92\xb1\x26\xc7\x0d\xfa\xac\x69\x4e\
-\xea\x75\x7a\xde\x5f\xdf\xe1\xa1\x31\xb8\xc7\xe5\x93\xe4\x94\x94\
-\x71\x19\xb6\x0e\xd0\x95\xd6\x01\x86\x92\xbc\x7f\xde\x64\x7d\x73\
-\x52\x87\xad\x4b\x00\x00\xff\xc3\x2f\xd0\x18\xdc\xe3\xf2\x89\x5f\
-\xa0\xcd\x2f\x00\x00\x00\x00\x00\x00\x40\x27\x3e\xec\xfd\x1c\x0f\
-\x3a\x57\x98\xc9\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
-\
-\x00\x00\x01\x34\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x00\xe6\x49\x44\x41\x54\x78\x9c\xed\
-\xd2\xb1\x09\xc2\x40\x00\x46\xe1\x5f\x87\xc8\x26\x2e\xe2\x0a\x29\
-\xc4\xc6\x61\x6c\x82\x4b\xb8\x88\x5b\xa4\x72\x8b\xb3\x30\x60\x21\
-\x36\xde\x5d\x9e\xe0\xfb\x20\x90\xc0\xa1\x7f\x1e\x49\x24\xfd\xb3\
-\x4d\xef\x3f\xd8\x1d\xce\xfb\x24\xd3\xf2\x78\xbc\x5d\x4e\xd7\x96\
-\xe7\x6b\x6d\x7b\xfe\xf8\x62\x2a\xc9\x50\x92\x21\xaf\x17\x6b\x79\
-\xbe\x4a\xf7\x00\xcb\x8b\xbc\xdd\xb7\x3a\x5f\x6b\x8d\x2f\xe0\xa7\
-\x19\x80\x1e\x40\x33\x00\x3d\x80\x66\x00\x7a\x00\xcd\x00\xf4\x00\
-\x9a\x01\xe8\x01\x34\x03\xd0\x03\x68\x06\xa0\x07\xd0\x0c\x40\x0f\
-\xa0\x19\x80\x1e\x40\x33\x00\x3d\x80\x66\x00\x7a\x00\xcd\x00\xf4\
-\x00\x9a\x01\xe8\x01\x34\x03\xd0\x03\x68\x06\xa0\x07\xd0\x0c\x40\
-\x0f\xa0\x19\x80\x1e\x40\x33\x00\x3d\x80\x66\x00\x7a\x00\xcd\x00\
-\xf4\x00\x9a\x01\xe8\x01\x34\x03\xd0\x03\x68\x06\xa0\x07\xd0\x0c\
-\x40\x0f\xa0\x19\x80\x1e\x40\x5b\x23\xc0\xfd\xc3\x7d\xab\xf3\x55\
-\x56\x08\x50\xc6\x24\xf3\xf3\x2a\x63\xfb\xf3\x92\xf4\xbd\x07\x47\
-\xdd\x22\x24\x17\x57\x09\xda\x00\x00\x00\x00\x49\x45\x4e\x44\xae\
-\x42\x60\x82\
-\x00\x00\x04\x2e\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x03\xe0\x49\x44\x41\x54\x78\x9c\xed\
-\x98\x4d\x68\x5c\x55\x14\xc7\x7f\xe7\xbd\x32\xa9\x9a\xb8\xb1\x94\
-\xb4\x52\xc4\x8d\xd6\x8d\x60\x32\x16\xba\x28\x34\x7e\x84\x88\x52\
-\x94\x4a\x51\x57\xcd\xa2\xe9\xa4\x69\x26\x11\xea\x27\x04\x09\x56\
-\xb0\x5d\xa8\xcd\xd4\x7c\x8c\x94\x44\x84\x82\x9b\x62\x5d\x18\x69\
-\xa9\x4c\x16\xae\xe6\x4d\x0a\x6e\xfc\xc0\x45\x69\x35\x0b\x9b\x48\
-\x21\x81\xa6\x53\xe7\x1d\x17\xc9\x68\xe6\xbd\x97\x4e\x66\xe6\xbd\
-\x49\x4a\xef\x6f\x79\xcf\xbb\xe7\xfe\xcf\xb9\xef\xde\x7b\xee\x05\
-\x83\xc1\x60\x30\x18\x0c\x06\x83\xc1\x60\x30\x18\x0c\x06\xc3\xbd\
-\x85\x78\x1b\xe2\x5d\xa9\x0f\x04\x1d\x50\xc1\x56\x70\x05\x74\x3d\
-\x84\x85\x85\x82\x08\x58\xa2\x14\x14\xf9\xd0\x49\xf7\x0e\xae\xb4\
-\x6f\xf2\xf5\x10\x1d\x50\xb0\x01\x04\xac\x3a\xe9\x8c\x8c\xe2\x0c\
-\xab\x60\x83\x0e\x00\x25\x09\xb8\xeb\x03\xac\x15\x7f\x02\x54\x8f\
-\x2b\x72\x57\xff\xf6\x41\x28\xa2\xa8\x1e\xf7\xb6\xfb\xf6\x00\x80\
-\xd6\xae\x53\x6d\x22\x72\x1e\x68\xf2\x7c\xae\xa0\x6e\x24\x0a\xc3\
-\xc3\xc2\x1f\xd7\x3c\x22\xfb\x9c\xd1\xde\x8c\xf7\xe3\xc0\x04\x00\
-\xb4\x74\x9f\x6a\xb5\x5c\xf9\x1e\xd8\x52\x62\x50\x14\x61\x43\x26\
-\x41\xc1\x12\x7f\x4c\xb3\xae\xa5\x1d\xd3\x23\x7d\xb9\xa0\x3e\xab\
-\x26\x00\x20\xde\xfd\xd9\xe3\xb8\xd6\x45\x60\x87\xa7\x9b\x02\xee\
-\xc6\x39\x20\x64\x39\x78\xf5\xc6\x73\x15\xcb\x6d\x77\x46\xfa\x7f\
-\x5d\xbd\x67\x19\x9e\x3e\xf2\xf9\x0e\x2d\x14\x2e\x00\x3b\x3d\x5d\
-\x37\x48\x12\x04\xc0\xc2\x1f\xfc\x2f\x62\xdb\xed\xd9\xe1\x9e\x6b\
-\x77\xea\x5d\xf6\x14\xc8\x0e\xf7\x5c\x53\xcd\xef\x01\x9c\x52\x8b\
-\x8a\xa2\x76\xf9\x14\x46\x87\x00\x8a\xda\xbe\xe0\x85\xac\x6a\x7e\
-\x4f\xb9\xe0\x61\x8d\xc7\x60\x2e\x7d\x6c\xb6\xe1\xf6\xcd\x67\x04\
-\x7e\xf0\x09\x50\xec\xf5\xc8\x81\x82\xb8\x04\x8e\x7d\xa9\x21\x7f\
-\xf3\xd9\x5c\xfa\xd8\xec\x5a\xfc\x54\xa4\x7d\xef\xc1\xf1\xcd\xf3\
-\x0d\x0b\x67\x05\x7d\xc5\x2f\x48\x5d\xa9\xd3\xf1\xa9\xa8\x08\x12\
-\x34\x79\xe7\x6e\xc4\x78\xe3\xf7\x54\xf2\xd6\x5a\x7d\x55\x54\x08\
-\x65\x26\x3a\x17\x9b\x9a\x67\x0f\x80\x9e\xf1\xda\x04\xb1\xb4\xc2\
-\x84\x56\xc3\x52\x69\x1b\x14\xbc\x9e\x79\xf4\xef\xe6\x03\x95\x04\
-\x0f\x55\x0b\x56\x89\x1f\x4e\x9d\x00\xde\x0a\x10\x18\xd9\xfd\xa1\
-\x58\xd7\xfb\x0d\x7a\xd2\x49\x27\xdf\xa5\x8a\x3f\xb0\xa6\x19\x8b\
-\x27\x52\x6f\xa3\x7a\x22\xc0\xab\x8b\x86\x9d\x04\x15\x82\x66\x5e\
-\xe4\x1d\x67\xb4\xf7\x64\xb5\x5e\xed\x5a\x24\xcd\x38\x93\x3f\x6e\
-\x6b\xed\xf8\x53\x44\x5e\xa2\x34\x99\xa2\x84\xb8\x1e\x84\xa0\xe0\
-\x5d\x90\x43\xce\x58\xef\xe9\xda\x5c\x87\x40\x3c\x91\xda\x8f\xea\
-\x59\x20\xe6\x31\x2d\xd7\x0a\x35\x11\x54\xda\xe6\x05\x5e\xcf\x8e\
-\x25\xcf\xd5\xe8\x3b\xbc\x49\x8a\x1f\x1a\x7a\x0e\x8b\x6f\x80\x07\
-\x56\xb6\xeb\xd2\x96\x5d\x65\x12\x24\xa8\xc0\x59\x10\xf4\xe5\xec\
-\x58\xdf\xa5\xea\x7c\x7a\x46\x08\xc3\x49\x91\x78\x62\x68\x17\xca\
-\x77\xc0\x43\x9e\x61\xaa\xb8\x44\x05\x06\x3f\x27\xae\xfb\x42\xf6\
-\x8b\xfe\x6c\x2d\x3a\x4b\x46\x09\xcb\x51\x91\x96\x23\x9f\x3e\x21\
-\x85\x4d\x17\x05\x7d\xd8\x63\xaa\x60\x39\x04\x06\xff\x87\x6b\x17\
-\xda\xa7\x87\xdf\xfc\x39\x04\x99\xff\x8f\x14\xa6\xb3\x22\x4f\xf5\
-\x9c\x7e\xc4\xfe\xc7\xbd\x00\x3c\x56\x62\x50\x51\xe4\x4e\x7f\x82\
-\x00\x1a\xb4\xe6\x7f\x53\x75\x9f\xcf\xa5\xfb\xaf\x86\x2c\x35\xba\
-\xc2\xe5\xc9\xc4\xc8\xd6\x98\xde\x9e\x04\x5a\x4a\x2d\x0a\x48\x21\
-\x50\x89\xaa\x1d\x20\x69\xba\x90\xa7\xe3\xf2\x78\xf2\x7a\x14\x3a\
-\x23\x7b\x12\xfb\x69\xb4\xfb\x2f\x3b\x46\x1b\xc2\x54\xa9\x45\x00\
-\x4a\x2e\x51\xc5\x3b\x45\x40\xf0\x19\x3b\x46\x5b\x54\xc1\xff\xa7\
-\x26\x4a\xf6\x1e\x1c\xdf\xbc\x10\x9b\xff\x1a\x61\x9f\xd7\xa6\xcb\
-\x7b\xc2\x2a\x8f\xaf\xe7\x1b\x6f\x35\xbd\x96\x99\xe8\x5c\x8c\x52\
-\x5f\xe4\x8f\xa2\x99\x89\xce\xc5\xc6\x6d\x73\xfb\x45\xe4\x4b\xaf\
-\x4d\x96\x5e\x70\x7c\x1a\x14\x26\x1a\x9b\xe7\x5e\x8d\x3a\x78\xa8\
-\xb1\x12\x5c\x2b\x57\xa6\xa6\xdc\x99\x17\x77\x7d\xbb\x7d\xfe\xbe\
-\x07\x11\xd9\x5d\xe6\xf3\x4f\x72\xcd\x73\x47\xaf\x0c\x0e\xfa\xf7\
-\x89\x08\xa8\xf3\x55\x5e\x25\xde\x95\x7a\x0f\xe1\xa3\x60\x31\xfa\
-\x7e\x76\x2c\xf9\x71\x35\x97\x9a\x6a\x59\x97\xf7\x9c\x78\x62\xe8\
-\x30\xca\xe8\x8a\x26\x45\x35\xe1\xa4\xfb\xd2\xf5\xd6\x52\x97\x25\
-\xe0\x65\xc6\x99\xcc\x6d\x6f\xed\xb8\x1f\x91\x9d\x02\x0b\x40\xa7\
-\x93\xee\xfb\x6a\x3d\xb4\x18\x0c\x06\x83\xc1\x60\x30\x18\x0c\x06\
-\x83\xc1\x60\x30\x18\xee\x35\xfe\x05\x2f\xee\x41\x9b\x3f\x6f\x48\
-\xfe\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x02\x22\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x01\xd4\x49\x44\x41\x54\x58\x85\xed\
-\x94\xb1\x6b\x13\x51\x1c\xc7\x3f\xdf\x17\x84\xa0\x20\x71\xd0\xc1\
-\x49\x89\x08\x4a\x06\x25\xb8\x3a\x79\xb5\x48\xe9\x50\x0d\x8e\x82\
-\x6d\x66\xff\x02\x41\xdd\xfc\x0b\x1c\x92\xb8\x56\xbc\x06\xa1\x75\
-\xf0\x7a\x43\x07\x07\x75\x11\xed\x10\x17\x2d\x2e\x0a\x2e\xb5\x64\
-\xb1\xa1\xe6\x7e\x0e\x97\x33\xa7\x6d\x63\x92\x16\xbb\xdc\x17\x0e\
-\xde\xdd\xfb\xbe\xef\xf7\xfb\x7e\xef\xf7\x0e\x32\x64\xc8\x90\xe1\
-\x80\xa1\x64\xe0\x5d\x9f\xfb\x0e\x14\xfe\x93\xef\x46\xd8\xac\x1f\
-\x03\x70\xfd\x28\x72\xbb\xd2\xf7\x1b\x29\xaf\xfe\x40\xd1\x69\xe0\
-\x75\x8a\x16\x01\xdd\xfd\x78\x84\xa2\xdf\xde\xc6\xab\x9e\xd7\x9f\
-\x01\x02\xbf\xb1\xae\xc3\x9d\x2b\x40\x00\x80\xe1\x48\x1d\xd1\x1e\
-\x76\xab\x08\x73\xf1\x90\x17\x1c\xe9\x78\x81\xdf\x58\x4f\xa6\x73\
-\x69\xee\xa7\xd5\xd5\xad\x72\xa9\xf8\xf4\x87\xe5\xcf\x4a\x94\x30\
-\xb4\xb7\x08\x12\x98\x13\x80\xd9\x93\x82\x6b\xdf\x5c\x9a\x9f\xdf\
-\x4c\x33\x72\x7f\x2f\x69\xb5\x5a\xdd\x72\xa9\xf8\xac\x63\xf9\xe3\
-\x88\x4b\x8c\x5b\x05\xc5\xe6\xc4\x02\x8f\x0a\xb9\x76\xd5\xf7\xfd\
-\x9f\xdb\x68\x83\x24\xbc\x99\xb9\xfb\x88\xbb\xbd\xd7\x08\xcc\x86\
-\x75\x4f\xcc\x41\x0f\xc2\x66\xed\x1e\xb0\xe3\xda\x6d\x15\x48\x63\
-\xed\xc3\xdb\x95\xe2\xf9\xf2\x06\x30\xd9\x0b\xab\xdd\x84\x12\x98\
-\xe1\x24\x92\x9d\xdf\x09\x9b\xf5\x87\x83\xf8\x03\x03\xf4\x42\xbc\
-\x29\x9e\xbb\xb8\x86\x34\x0d\xb8\x5e\x5f\xec\x18\xc2\xcc\x9c\x24\
-\x11\x77\xff\xad\xb0\x59\xaf\xfd\x4b\x7f\xe8\xf3\x9d\xb8\x51\x9d\
-\x32\x33\x1f\xc8\x13\x57\x21\x4a\xcf\xa7\xcc\x37\x25\x55\x96\x17\
-\x6a\xcf\x87\xd1\x1d\xa9\xc1\x26\x66\x66\x2f\x9b\xdc\x12\xd8\x51\
-\x33\x33\x29\xbe\xdf\x7d\x73\xb5\x9d\x6c\x2a\x58\xa8\xbf\x1c\x56\
-\x73\xe4\x0e\xf7\x2a\xd5\x0b\x44\x16\x00\x27\x0c\x4c\x89\x86\xf8\
-\x86\x34\x19\xfa\xb5\x77\xa3\xe8\x8d\x75\xc5\xae\x56\x66\xcf\x44\
-\x11\x21\xe8\x54\xfc\xc5\x3e\x3b\x87\x17\xf8\x8d\x8f\xa3\x6a\x8d\
-\xfd\x9b\xf1\xa6\x6f\x9f\xe4\x90\xfb\x02\x7a\xcf\x56\xf7\x5a\xb8\
-\xf8\xf8\xeb\xb8\x5a\x19\x32\x64\xc8\x70\xa0\xf8\x05\xa4\xf1\xa4\
-\x8e\x44\xc6\x51\x5e\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\
-\x82\
-\x00\x00\x00\x8a\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x00\x3c\x49\x44\x41\x54\x58\x85\xed\
-\xcd\x21\x15\x00\x21\x00\xc0\xd0\x41\x26\x02\x60\xc8\x82\xbb\x30\
-\xa7\x08\xc3\x7b\x14\x20\x14\x0a\x8b\xc4\xb0\xaf\xe6\x06\x92\x24\
-\xbd\x2e\xec\x48\xf5\x1f\x40\xbe\x74\xed\xb3\x7d\x05\x20\x5e\x19\
-\x4a\x92\x24\x1d\x2c\x16\x1c\x05\x04\xcb\x08\x93\xc5\x00\x00\x00\
-\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x01\x93\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x01\x45\x49\x44\x41\x54\x58\x85\xed\
-\xd7\xb1\x4e\xc2\x50\x14\xc6\xf1\xff\x29\xa1\x8c\x96\x05\x9f\xa1\
-\x0b\x03\x09\xf8\x02\x26\xf0\x0e\xac\x26\x94\xc1\x18\x9c\xd5\x41\
-\x76\x10\x19\xe8\x0b\xf0\x0c\xc6\xc4\x27\xa8\x89\x03\x4b\xdf\x81\
-\x05\x1c\x29\x81\xe3\x00\x35\x58\xc0\x41\xdb\x38\x78\xbf\xf1\xb4\
-\xc9\xf7\x4b\x6f\x87\x7b\xe0\xbf\x47\x92\x83\x8a\x37\xac\x5b\xaa\
-\xd7\x40\x0d\x70\x52\xea\x99\x03\xc1\x5a\xa4\xf7\xe6\x5f\x3e\x1f\
-\x05\x54\x5b\x8f\x5d\x85\x1b\x60\x01\x12\x22\xfa\x9e\x4a\xbd\xca\
-\x09\xa8\x0b\x14\x44\xb4\xfb\xea\x5f\xdd\xed\x01\xaa\xad\x41\x43\
-\x91\x27\x84\x97\x88\x7c\x73\xe2\xb7\xa7\xa9\x94\x6f\x53\xf6\x46\
-\x25\x9b\xe5\x18\xe5\x7c\x2d\xd2\x88\xbf\x84\xf5\x89\x44\x3a\xc0\
-\x22\x8b\x72\x80\x89\xdf\x9e\x46\xe4\x9b\x40\x94\x53\xed\xc4\x73\
-\x6b\xe7\x9d\x1a\x48\x98\x45\xf9\x2e\x42\x21\xd4\xcd\xff\xb5\x07\
-\x70\x52\x3b\xf3\x6f\x22\xc2\x1c\x28\x1e\x02\xfc\x49\x0c\xc0\x00\
-\x0c\xc0\x00\x0c\xc0\x00\x0c\xc0\x00\x76\x01\xf3\xcd\xed\x35\xdb\
-\xa8\xe2\x00\xb3\x43\x80\x00\xd4\x2d\x7b\xa3\x52\x56\xe5\x65\x6f\
-\x54\x12\x70\x05\x82\x3d\xc0\x5a\xa4\x07\x14\x6c\x96\xe3\x2c\x10\
-\x67\x17\x0f\xa7\x36\xcb\x31\x60\xaf\x44\xfa\xf1\xfc\xeb\x62\xe2\
-\x0d\xee\x55\xe5\x16\x88\x14\xc2\xed\x05\xf2\xd7\x51\xc5\x11\x70\
-\x01\xfb\xe8\x62\x12\xa7\xe2\x0d\xeb\x39\xd5\xce\xf6\xea\x5c\x4c\
-\x3e\xff\x61\x66\x02\xc1\x4a\xa4\x9f\x5c\xcd\x4c\x3e\x00\xa7\x7c\
-\x6e\x32\xdb\xbd\x64\x45\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\
-\x60\x82\
-\x00\x00\x00\xa1\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x00\x53\x49\x44\x41\x54\x58\x85\x63\
-\x60\xa0\x00\x98\x64\x4c\x6c\x30\xc9\x98\xd8\x40\x89\x19\x4c\x94\
-\x68\xa6\x06\x18\x75\xc0\xa8\x03\x46\x1d\x30\xea\x80\x51\x07\x8c\
-\x3a\x60\xc0\x1d\xc0\x42\x05\x33\x1c\x28\xa9\x92\x87\x45\x08\x1c\
-\x38\x33\x23\xbf\x81\x5c\xcd\x03\x1e\x02\xa3\x0e\x18\x75\xc0\xa8\
-\x03\x46\x1d\x30\xea\x80\x51\x07\x0c\xb8\x03\x00\xb9\x93\x08\x9d\
-\x47\x2d\xcd\xca\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
-\
-\x00\x00\x03\x9c\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x03\x4e\x49\x44\x41\x54\x78\x9c\xed\
-\x9b\xcd\x6b\x13\x41\x18\xc6\x9f\x77\xd3\xa8\x85\x52\x0f\x22\x22\
-\xf6\x60\x6d\x3c\xa8\x05\xd1\x93\xde\x8a\x36\x89\x15\x14\x9b\x18\
-\x94\x16\x11\xd2\x54\xfb\xf1\x07\x14\xff\x02\xeb\x51\x69\xfd\x22\
-\xed\xa5\xd4\x83\x31\x55\x11\x5a\x4d\x2a\xb4\xe0\xc1\x8b\x1f\x87\
-\x22\x3d\x58\x11\xcc\xa5\x8a\x87\x96\x8a\xa9\x49\x66\x3c\x18\x04\
-\xb3\x9b\x4d\xb3\xbb\x93\x31\xcd\xfc\x8e\xb3\xc3\xf3\x3e\xfb\x64\
-\x32\x33\xec\xce\x02\x0a\x85\xa2\x96\x21\xbb\x02\x6d\xa1\x81\x06\
-\x37\xcf\x0c\x82\xf1\x10\x08\xad\x00\xb6\x3a\xe0\xcb\x0e\xeb\xe0\
-\x58\x80\x46\xb1\x0c\xb9\x47\xe7\x62\xb7\xd7\xcc\x3a\xdb\x0a\xc0\
-\xd7\x19\xf1\x72\x0d\xe3\x00\x9a\xec\xe8\x08\x24\x45\x0c\xe1\xc4\
-\xe3\x68\xb2\x58\x07\x97\x55\x65\x5f\xb0\x27\xcc\x89\x1e\x02\xd8\
-\x6e\x55\xa3\x02\x34\x82\xd0\xb5\xef\xd0\xd1\x2f\x9f\x3e\xbc\x7d\
-\x6f\xd4\xc1\xd2\x08\xf0\x9e\x0f\xfb\xc0\xb5\x19\x00\x9a\x2d\x7b\
-\x95\x23\x47\x0c\x1d\x46\x23\xa1\xec\x00\xda\x42\x03\x0d\x6e\xf6\
-\x6b\x11\xc0\x1e\x47\xac\x55\x8e\x54\x46\xdb\x72\xa0\x70\x4e\x28\
-\xfb\x17\x74\xf3\xcc\x20\xaa\xef\xe6\x01\xa0\x29\xef\xfd\x1f\xca\
-\x1f\xc2\x8c\x87\x1c\xb1\x23\x03\x03\xef\xe5\x07\xf0\x67\xa9\xab\
-\x4e\x0c\xbc\xd7\x59\x90\x31\x5d\xe7\x93\xf1\xa8\xed\xbd\x85\x1d\
-\xbc\xc1\x08\x37\xb9\xac\xf3\x5e\x2d\xb3\xb8\x30\x54\x00\xb2\x0d\
-\xc8\x46\x05\x20\xdb\x80\x6c\x54\x00\xb2\x0d\xc8\xa6\xe6\x03\x28\
-\xb9\x11\xf2\x07\xae\xec\x66\x60\xfd\x20\x9c\x24\x60\x97\xd9\x2e\
-\x03\x00\x7c\xc1\xc8\x47\xab\x66\x38\xc0\x01\xa4\x08\x98\x76\x6d\
-\xfb\x79\x6f\x66\x72\x72\xd5\xaa\xd6\x46\x31\x0d\xc0\x1b\xe8\x3d\
-\xcb\x88\x8d\x03\xd8\x91\x37\x58\x12\x0e\xb4\xd8\xf4\xe4\xe1\x40\
-\x5b\x36\x5d\xdf\xdf\x1e\x88\x74\xcd\x4e\x45\x5f\xdb\xd4\x33\xa5\
-\xe8\x5f\xc0\x1b\xe8\x19\x06\xf1\xa7\xc8\xdf\xbc\x04\x9a\x89\xf0\
-\xca\x1b\xec\xed\x13\x59\xc4\x30\x00\x5f\x20\x72\x01\x44\x43\x22\
-\x0b\x6f\x10\x17\xc0\x47\xda\x03\x91\x63\xa2\x0a\xe8\x02\x38\x75\
-\xae\x6f\x2f\x27\xba\x2f\xaa\xa0\x05\x5c\x44\x78\xd0\xd1\xdd\xdd\
-\x28\x42\x5c\x17\x40\xd6\x95\xbd\x06\x70\x21\xc5\x6c\xd0\x9c\x4b\
-\xd7\x5f\x15\x21\xac\x0b\x80\x80\xd3\x22\x0a\xd9\x85\x0b\xf2\x65\
-\x34\x07\xfc\xaf\x8f\xb8\x85\xf8\x2a\xfb\x81\x88\xa6\xf1\xfd\x22\
-\x8c\x64\xb3\xf0\x68\x1a\xcd\x14\xbb\x4e\x0e\xbc\xc4\x31\xa2\xec\
-\x00\x5e\xc4\xc6\x2c\x6f\x74\xcc\xf0\x87\x7a\xc0\x98\x08\x65\x73\
-\x6a\x7e\x2b\xac\x02\x90\x6d\x40\x36\x2a\x00\xd9\x06\x64\xa3\x02\
-\x90\x6d\x40\x36\x2a\x00\xd9\x06\x64\xa3\x02\x90\x6d\x40\x36\x2a\
-\x00\xd9\x06\x64\x63\xe5\x7c\x80\x14\x38\xd0\x52\xe2\xdd\xff\x46\
-\x58\x2f\x6c\xa8\xad\x11\xc0\xb1\x50\xd8\x54\x5b\x01\x68\x14\xd3\
-\x35\xc9\xf0\x21\x89\x54\x86\xdc\xa3\x85\x8d\x55\x33\x07\xd8\x24\
-\x47\x0c\xe1\xb9\xb8\xfe\xdc\x70\x2d\x04\x90\xe3\x84\xde\x64\x91\
-\xf3\xc2\x9b\x3d\x80\x14\x31\x84\x8b\xdd\x3c\xb0\x39\x03\xf8\x7b\
-\x5c\x9e\xea\xd3\x23\x89\x89\x89\x1f\x66\x9d\x75\x8f\x9a\x1d\x58\
-\x6b\x85\x40\xc0\x52\x22\x1e\xf5\x38\xad\x6b\xb4\x0a\x7c\x73\xba\
-\x88\x13\x70\x60\x59\x84\xae\x51\x00\xb3\x22\x0a\xd9\x86\xe3\xa5\
-\x08\x59\x5d\x00\x1a\x63\x37\x00\x64\x44\x14\xb3\xc1\x77\x0d\xda\
-\x1d\x11\xc2\xba\x2f\x46\x96\x16\xdf\x2d\x7b\x0e\x1e\x59\x03\xc8\
-\x2f\xa2\xa0\x15\x08\xfc\x62\x62\x2a\xfa\x46\x84\xb6\xe1\x4e\xf0\
-\x78\x6b\xd3\x4d\x10\x1e\x89\x28\x58\x2e\x04\x0c\x27\xe2\x63\xcf\
-\x44\xe9\x1b\x7e\x33\x34\x3f\x3f\xcf\x2f\x85\xce\xc4\x53\x5f\x57\
-\x57\x00\x3a\x51\xac\x9f\x60\x56\x38\xe8\x72\x32\x1e\xbd\x25\xb2\
-\x48\xc9\x37\xae\xfe\xce\xf0\x61\xa6\x69\x43\x00\xda\x01\xec\x14\
-\x69\x26\x4f\x8a\x03\xd3\x75\xb9\xba\xeb\xcf\x9f\xdc\xfd\x5c\x81\
-\x7a\x0a\x85\xa2\x86\xf9\x0d\x29\x0e\xd0\xf4\xc6\x6c\xeb\x8f\x00\
-\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x01\x9f\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x01\x51\x49\x44\x41\x54\x58\x85\xed\
-\x94\x2d\x48\x43\x51\x14\x80\xbf\xf3\x36\x10\x14\x15\x67\xd1\x66\
-\x17\x2c\xbe\x55\x8b\x98\x4d\xb3\x6a\x71\x4f\xd0\x4d\x8c\x82\xe0\
-\x5e\xb0\x98\xdc\x14\xdd\xc6\xc2\xaa\x13\x9b\x59\xb0\xcf\xbf\x64\
-\x53\x9b\x7f\xf8\x93\x06\x8a\xbb\xc7\xb4\x89\xf1\xdd\x07\xaf\xf8\
-\xbe\x76\xe0\xfc\x7c\xdc\x7b\xee\x85\x98\x98\x98\xff\x8e\x04\x4b\
-\x57\x71\xbd\x5d\x03\xf0\xfd\xd9\x1e\xba\xaa\xaf\x7d\x84\x15\x70\
-\x02\x65\x6f\x16\xba\xc2\xc9\x9e\xc4\x7b\x26\xd3\x48\x44\x2b\xe0\
-\xfb\x46\x55\xe6\x3a\xe1\x5d\xea\xf1\x3b\x5a\x01\xe0\xbc\x9a\x3b\
-\x42\x65\xab\x13\xbb\xd9\xd2\x75\xa4\x02\x00\xcd\x6a\x6e\x43\xe0\
-\x14\x00\x61\xc2\xf5\x8a\x07\xb6\x02\x01\x97\xf0\x2f\xae\x57\xd2\
-\x6e\xa0\xea\x35\xab\xab\xd5\xa0\x3d\xac\x4e\xa0\x43\x73\xe4\xf5\
-\x77\x09\x45\x2a\x69\x6f\x67\x2a\x52\x01\x7c\xdf\xb4\x12\x89\xfe\
-\x4e\xa8\x38\x67\xd1\x0a\x00\xbc\x3c\x7f\x29\xdc\xdb\x96\x87\x14\
-\x50\xe9\x1d\x1a\xae\x09\x8c\x01\x4f\xed\xa4\x33\x16\xb4\x43\xa8\
-\x8f\xc4\x5d\x4a\x15\x40\xf2\x40\xcb\x38\x3a\x73\xb9\x9f\xbf\x09\
-\xda\xc3\xfa\x15\x4c\x66\x8b\xf3\x22\x52\x07\x8c\x11\x67\xf6\xa2\
-\xbc\x72\x62\xd3\x27\x69\x53\x94\xf6\x8a\xd3\x8a\xd4\x00\x14\x59\
-\xb6\x1d\x0e\x16\x3b\x90\x5e\xdc\x1b\x57\xe4\x18\x48\xa2\xba\x7d\
-\x5e\xc9\x95\x6d\x87\x5b\x08\xa8\x18\xc7\x34\x80\x41\xe0\xb0\x39\
-\xfa\xb6\x1e\x66\x38\x58\x5c\x81\xc0\x83\xa0\xb7\x7d\x9f\x03\x0b\
-\xf8\x79\x13\x56\x20\x26\x26\x26\xe6\x07\x9e\x35\x61\x37\x0a\x6d\
-\x65\xe5\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x00\x97\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x00\x49\x49\x44\x41\x54\x58\x85\xed\
-\xd7\xb1\x0d\x00\x20\x0c\x03\x41\x0b\x31\x18\x83\x23\x65\x15\x94\
-\x0c\x12\x86\x30\x1d\xff\x7d\xac\x6b\x23\x91\xd1\xc9\x8a\x93\x15\
-\xce\xc6\xb4\x04\xad\x65\xdd\x4b\x1a\xee\x00\x00\x00\x00\x00\x00\
-\x00\x00\x00\x00\x00\x00\x00\x00\xb8\x79\x9f\x91\x7a\xbf\x61\xfc\
-\xdc\x05\xd1\x25\x09\xfd\x18\x55\xe2\x51\x00\x00\x00\x00\x49\x45\
-\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x00\x87\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x00\x39\x49\x44\x41\x54\x58\x85\xed\
-\xce\x31\x11\x00\x30\x08\x04\x41\x26\x9a\x10\x85\x0c\x2c\xe0\x38\
-\x22\xa0\xdc\xeb\xff\x67\x23\x16\x65\x4d\x67\x4d\x6f\x3e\xde\x66\
-\x7c\x11\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
-\xc0\x07\x39\x3f\x03\x99\x39\x3b\x26\x1f\x00\x00\x00\x00\x49\x45\
-\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x02\x0d\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x01\xbf\x49\x44\x41\x54\x58\x85\xed\
-\x94\xb1\x6a\x54\x41\x14\x86\xbf\x7f\x36\x4a\x90\xe0\x6a\x13\x8b\
-\x8d\x91\x04\xad\x63\x91\x4a\x49\x2d\x62\x4a\x1b\x51\xf0\x01\x44\
-\x7d\x05\x7d\x04\x83\x0f\x20\x28\xd8\x58\x28\x28\x62\xba\x80\x79\
-\x00\x61\xfb\xdd\xd9\xd9\x15\x02\x29\xac\x6c\xc2\x9d\xdf\xe2\xee\
-\x26\x31\xbb\x01\xf7\xba\x62\x73\xbf\xe2\x32\x70\xee\x9c\xff\x9b\
-\x73\x87\x0b\x35\x35\x35\x35\xff\x19\x55\xdd\x98\x52\x6a\x15\xe6\
-\x13\x66\x2d\xc8\xad\xe5\xe5\xe5\xef\x55\xfa\x84\x8a\xe1\xd7\x8a\
-\xac\xaf\x98\x35\x80\xec\xb0\x9b\x52\xba\x5a\xa5\xd7\xd4\x13\xe8\
-\x74\xfa\xd7\x15\xfc\x05\x58\x04\x1f\x6b\xa3\xbd\x5c\x70\x6b\x75\
-\x75\xe9\xdb\x34\xfd\xa6\x9a\x40\xaf\xd7\xdb\x50\xf0\x0e\xb0\x28\
-\x30\xa8\x00\x15\xe5\xda\x97\x42\xc3\x3b\xbd\x5e\x6f\xe3\x9f\x08\
-\xc4\xd8\xdf\xcc\xd6\x36\x70\x1e\xb0\x21\x8f\x6a\xc3\xb5\x81\x66\
-\xb6\xb6\xbb\xdd\xfe\x9d\x99\x0a\xc4\x98\x1e\x18\xbf\x07\xe6\xcb\
-\xec\xa3\xf0\x63\xe4\x61\x6d\x1e\xf9\x43\xb7\x9b\xee\xcf\x44\x20\
-\xc6\xf4\xc4\xf0\x1a\x68\xb8\x1c\xfb\xa4\xf0\x21\xca\x18\x03\x0d\
-\xc4\x9b\x18\xd3\xe3\xca\x02\xb6\xd5\x89\xe9\xb9\xe1\xc5\xa8\xb9\
-\x26\x9f\xfc\x84\x03\x19\x95\x92\x86\xad\x4e\x4c\xcf\x6c\x9f\x7a\
-\xd9\x27\x16\x6c\x87\x98\xfa\x5b\x98\x47\xb6\x09\x52\xf6\xd1\x95\
-\xff\x43\x24\x3b\x07\x49\x20\x5e\x5e\xb9\xbc\xf4\x54\x1a\x9f\xde\
-\x98\x40\xbb\xdd\x3e\xbb\xb0\xd0\x7c\x85\xb8\x37\xd4\xc9\xa0\x29\
-\xc3\x0f\x8f\x22\x50\x39\x65\xf3\x76\x7f\x7f\xef\xe1\xfa\xfa\xfa\
-\xc1\xa9\x02\x83\xc1\xe0\xdc\x41\x91\xdf\x61\x6e\x97\x7b\xc8\x9a\
-\xfa\xe4\x27\x14\x40\xc2\x01\x04\xe2\xf3\x99\x46\xb8\xdb\x6a\xb5\
-\x7e\x8e\x09\xc4\x18\x2f\x9a\xf0\x11\xb8\x51\x5e\x66\x65\xf4\x77\
-\xe1\xc7\x2c\x04\x0e\x48\x80\x77\x9d\x8b\xcd\x95\x95\x95\x1f\x00\
-\x73\xa3\x77\xb2\x43\x47\xa2\x59\x6a\x09\x2a\xfe\xa6\x27\xa2\xc3\
-\x07\xa0\x9b\x0a\x73\x5d\xe0\xc2\xef\x21\x55\x3f\x73\x05\x3c\xa3\
-\xc1\xd6\xd4\xd4\xd4\xcc\x84\x5f\x30\x7d\xb9\x9b\x4b\x8f\xb2\x18\
-\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x00\x75\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x00\x27\x49\x44\x41\x54\x78\x9c\xed\
-\xc1\x01\x0d\x00\x00\x00\xc2\xa0\xf7\x4f\x6d\x0e\x37\xa0\x00\x00\
-\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x80\x77\x03\
-\x40\x40\x00\x01\x8f\xf2\xc9\x51\x00\x00\x00\x00\x49\x45\x4e\x44\
-\xae\x42\x60\x82\
-\x00\x00\x04\x67\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x04\x19\x49\x44\x41\x54\x78\x9c\xed\
-\x9b\x4d\x88\x1c\x45\x18\x86\xdf\xb7\x67\x27\x59\x91\x78\x31\x88\
-\x30\x3b\xdd\xd3\x3b\x89\x3f\x57\x5d\xbc\x0a\xc1\x44\x22\xf8\xc3\
-\x22\xe2\x41\x10\xfc\x41\xc1\x93\x22\x01\x3d\xa8\xa0\x01\x45\xf0\
-\xa0\xe0\x1f\x0a\x1e\x44\xd1\x53\x0c\x62\x64\x83\x10\xf0\x22\x08\
-\x82\x07\x31\x38\xcb\x6c\xd7\xf4\x74\x30\x46\x11\x45\x71\xcd\xf4\
-\xd4\xe7\x61\x26\xc6\xed\x6a\xcd\x8e\xa9\xaa\xee\xc3\x3c\xb7\x6d\
-\x96\x7a\xbf\x7a\xa6\xba\xbb\xbe\xee\x19\x60\xce\x9c\x39\x73\x2c\
-\xa0\x54\xfa\x4c\xa2\xd2\x5c\x0d\xd2\x91\x52\xd9\xd3\x55\xd7\xb3\
-\x5d\x68\x6b\xa0\x44\xa5\x63\x00\xc1\xf4\x4f\x11\x8d\x7d\x71\xdc\
-\x3e\x61\x6b\x7c\x57\x04\x17\xfe\x97\xed\x21\x22\xff\x1c\x8b\x0c\
-\x70\x54\x29\x75\xbd\xad\xf1\x5d\x61\x4d\x00\x49\x5d\x38\xb4\x4b\
-\x10\x7c\xda\xef\x67\x57\xdb\xca\x70\x81\x35\x01\x00\xa4\xe4\xd8\
-\xee\x46\x43\x1f\x5f\xcf\xb2\xb6\xc5\x1c\xab\xd8\x14\x50\x8a\x00\
-\xed\x85\x5c\xaf\x65\x59\xb6\xdb\x75\xd6\xff\xc1\xb9\x80\x29\xd7\
-\x8c\x72\x7d\xec\xe4\xc9\x33\xbb\x3c\xe5\x6d\x1b\x97\x02\x8a\xa7\
-\xc4\xca\xe2\x25\x9b\x47\x7a\xbd\xde\x4e\x87\x99\x33\xe3\x52\x80\
-\x86\x29\x61\x5f\x73\xe7\xe2\x7b\x22\xb2\xe0\x30\x77\x26\x5c\x9f\
-\x02\x1a\xe0\x56\x09\x82\x55\x95\x0e\x5f\x17\x11\x6b\x7b\x90\x8b\
-\xc1\xc3\x35\x40\x34\x8b\x2b\x41\x70\x7f\x32\x18\x3e\xef\x3e\xfb\
-\xc2\x78\xb9\x08\x0a\xa0\xa5\x70\x32\x10\x38\xa4\x54\x7a\xc8\x47\
-\xfe\x7f\xe1\xeb\x2e\x00\x12\xe3\xe2\x31\x01\x5e\x48\x92\xf4\x01\
-\x5f\x35\x94\xe1\x4d\xc0\x04\x29\xee\x16\x01\xe2\x8d\x24\x49\x57\
-\xfd\xd6\x71\x1e\xcf\x02\x28\x10\x14\x25\x04\x20\xde\x57\x2a\xbb\
-\xc9\x6f\x2d\xe7\xc2\x7d\x43\x08\x60\x48\xd8\x21\xd0\x47\xfa\x69\
-\x7a\x83\xef\x72\xfc\x0b\x98\x50\x26\xe1\xd2\x40\xe3\x93\x24\x49\
-\xae\xf5\x59\x48\x55\x02\x00\x40\x40\x43\xc2\xe5\x60\xe3\x78\xbf\
-\x7f\x2a\xf2\x55\x44\x95\x02\x00\x81\xd0\x5c\x09\xad\x20\x18\xaf\
-\xad\xaf\x7f\x7f\x85\x8f\x12\xaa\x15\x00\x40\x00\x91\xe2\x46\x89\
-\xb8\x6a\xa1\x79\xf6\x58\xaf\xd7\xbb\xcc\x75\x7e\xe5\x02\x00\x80\
-\xa5\x7d\x03\xaf\x6b\x36\x17\x8f\x6e\x6c\x6c\x2c\xba\xcc\xae\x85\
-\x80\x29\xa6\x04\xe2\x46\x04\xcd\x0f\x5c\x36\x4f\x75\x12\x00\x94\
-\x34\x4f\x84\xdc\x36\x18\xa4\x6f\x15\x9e\x39\x5a\xa3\x6e\x02\x00\
-\x88\x26\xb7\xae\x04\x01\xef\x55\x2a\x7b\xd1\x45\x07\x59\x43\x01\
-\x80\x88\xd9\x3c\x81\xf2\x98\x4a\xb3\x27\x6c\x67\xd5\x52\x00\x50\
-\xde\x3c\x41\xe4\xf0\x86\x1a\x3e\x64\x33\xa7\xb6\x02\x26\x98\xcd\
-\x13\x21\xaf\x29\x35\xbc\xd3\x56\x42\xcd\x05\x50\xc4\x6c\x9e\x28\
-\x90\x57\x6c\x25\xd4\x5c\x00\xfe\xed\xe5\x9d\xb5\xdb\x62\x6d\x1e\
-\x4e\x96\x31\x9d\xbb\xf1\x21\x09\xf0\xb6\xad\x8c\x1a\x0b\x20\x34\
-\xa4\x61\x2c\x00\xca\x23\x71\x18\xbe\x6a\x2b\xa5\xa6\xa7\x00\x21\
-\x52\x32\x79\x91\xa7\x3a\x16\x27\x0f\xd4\x55\x00\x25\x60\x61\xf6\
-\x02\xbc\x1c\x45\xed\xe7\x6c\x47\xd5\x4e\x00\x81\x00\x62\x5c\xfa\
-\xde\xed\x84\x4b\x8f\x92\x2c\x7b\x01\x7b\x51\xd4\x46\xc0\xe4\x13\
-\x67\x20\xe6\x75\xff\xe3\x1f\xcf\x9c\xbe\xaf\xe4\xf5\xbb\x15\x6a\
-\x23\x60\xd2\xec\x6c\xdd\xeb\x0b\xf0\x79\x23\xc0\x5d\x2b\x2b\x2b\
-\x23\x57\xb9\xf5\x10\x20\x12\x9c\x5b\x03\x7f\x43\x7c\xad\xf3\xb3\
-\xb7\xb6\xdb\xed\x3f\x5c\x46\x57\x7f\x1b\x24\x09\x73\xd9\xaf\xeb\
-\x7c\x74\x73\xb7\xdb\xfd\xc5\x75\x7c\xc5\x2b\x80\x84\xd9\xe7\x9f\
-\x12\x9d\xef\x5f\x5e\x5e\x3e\xed\xa3\x82\x2a\x57\x00\x01\x63\xf2\
-\x3f\x13\xfa\x40\x27\x8e\x13\x5f\x45\x54\xb2\x02\xa6\x57\xfa\x62\
-\xf6\xef\xa2\x79\x4b\x14\x45\xdf\xf8\xac\xc5\xbf\x00\x01\x69\xe6\
-\x8e\x34\x65\x35\x8e\x97\xbe\xf0\x5d\x8e\xef\x97\xa3\x04\x8d\x4c\
-\x21\x78\xcf\x72\x18\xae\xf9\xad\x65\x82\xef\x97\xa3\x46\x1e\x81\
-\x87\xa3\x68\xe9\x43\xbf\x75\x9c\xc7\x9b\x00\x11\x34\x8c\x63\xe0\
-\x93\x51\xd4\x7e\xd3\x57\x0d\x65\x78\xb9\x0b\xd0\x5c\xf6\x80\xf0\
-\xa5\x4e\xd4\xaa\xfc\x6b\x32\x1e\x56\x00\x03\x29\x34\x37\x04\xdf\
-\x89\xa2\xd6\xe3\x2e\x9a\x9b\x59\x71\x2d\xc0\xd8\xdf\x13\xf8\x28\
-\x0c\x5b\x0f\xd6\x61\xf2\x80\x5b\x01\x01\x8a\x5b\x5c\xe2\x84\xd6\
-\xf9\xdd\x24\x73\x87\xb9\x33\xe1\x52\x40\xf1\x91\xc6\x57\xa3\x3f\
-\x37\x6f\x8f\xe3\x78\xd3\x61\xe6\xcc\xf8\xd9\x0a\x0b\xbe\xcb\xf3\
-\x1d\x07\xf7\xee\x0d\x7f\xf5\x92\x37\x03\x3e\x6e\x83\xc3\xf1\x38\
-\xd8\xbf\x67\xcf\x95\x3f\x78\xc8\x9a\x19\x9b\x02\xca\x9e\xe0\xff\
-\x04\x19\x1f\xe8\x76\x5b\x03\x8b\x39\x56\x71\xf5\x93\x19\x00\xf8\
-\x2d\xa0\x1c\xec\x74\x3a\xdf\xda\xca\x70\x81\xa3\x9f\xcc\x50\x08\
-\xde\x11\x86\xe1\x97\xb6\xc6\x77\x85\x35\x01\x01\x79\x18\xe0\x18\
-\xc0\x98\xe0\xb3\x51\xb4\xf4\x99\xad\xb1\xe7\xcc\x99\x33\xc7\x15\
-\x7f\x01\x49\x16\x4b\x51\x69\x18\xd5\x52\x00\x00\x00\x00\x49\x45\
-\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x00\x97\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x00\x49\x49\x44\x41\x54\x58\x85\xed\
-\xd7\xb1\x0d\x00\x20\x0c\x03\x41\x83\x18\x8c\x26\x13\x64\x85\x8c\
-\x89\x94\xd5\x18\xc2\x74\xfc\xf7\xb1\xae\x8d\x44\x46\x91\xd5\x91\
-\xd5\xce\xc6\x32\x0d\xdb\xbc\xd7\x74\x07\x00\x00\x00\x00\x00\x00\
-\x00\x00\x00\x00\x00\x00\x00\xc0\xcd\xfa\x8c\x86\x74\x5e\x41\xfe\
-\xed\x02\xdd\xeb\x04\xae\xa2\x49\x76\xdf\x00\x00\x00\x00\x49\x45\
-\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x0c\xd6\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x0c\x88\x49\x44\x41\x54\x78\x9c\xe5\
-\x9b\x5b\x6f\x5b\xc7\x11\x80\xbf\x25\x45\x8a\x94\x28\x89\x92\xad\
-\xbb\x64\xc9\x4e\x9a\xc2\x41\xe0\x26\x45\xd1\xa0\x48\x0a\xf4\xa9\
-\x7d\xe9\x7b\x81\x16\xfd\xa3\x7d\x2a\x50\xb4\x0f\x41\x90\x36\x4e\
-\x52\x20\x69\x92\xc6\x96\x6c\xc9\x37\x5d\x48\x49\xa4\x2e\xe4\xf4\
-\x61\xf6\x1c\xee\xd9\x33\x87\xa4\xe4\xf4\xc9\x03\x10\x24\x77\xf7\
-\xcc\xce\xcc\xee\xce\x6d\xe7\x00\xb2\x05\xe2\x78\xe3\x40\x9c\xf2\
-\x9e\xfe\x78\x93\x84\x90\xe3\xf9\x4d\x12\x42\x96\x57\x97\xed\xe0\
-\x0e\xf0\x18\x9c\x14\x3c\xdc\x00\x6e\x19\x1d\x25\x60\x32\x8b\x2f\
-\x6d\xaf\x0d\xa1\x66\x12\x10\xe0\x62\xc8\x98\x73\xa0\x67\xb4\x77\
-\x81\xbe\xd1\xfe\x12\xdc\xa9\x8d\x2a\xcf\xa3\x1b\x35\x00\x64\x1b\
-\xb8\xed\x09\x3d\x01\x5e\xf8\x89\xa7\x80\x39\xdf\x2e\xc0\x59\xd0\
-\x3e\xeb\xdb\xfa\xbe\x1d\x8f\xa3\x0a\x34\x81\x8a\xef\x3f\xf7\x34\
-\x54\xfd\xf7\x25\x70\x04\x97\xa7\x50\x39\xf2\x6d\x53\xa8\x20\x9d\
-\x9f\xff\xc4\xff\x9f\xf2\x6d\x0e\x68\x01\xa7\xbe\x7d\x29\xe8\x7b\
-\x01\xee\x71\x31\x6f\x85\x52\x92\x2d\x90\x09\x90\x8f\x40\x56\x8d\
-\x31\x6b\x20\x0b\x46\xfb\x06\xc8\xbc\xff\x3d\x05\x72\x0f\xe4\xae\
-\xff\xcc\x80\xdc\x01\x19\xb2\x23\xa4\xee\xc7\x2c\xa8\xe0\xe5\xae\
-\xc7\x31\xe1\xfb\xe7\x40\x36\xf3\x47\x55\x9a\x05\xed\x1b\x20\xbf\
-\x06\x29\x5f\xf3\x88\xcb\x04\xc8\x9f\xf5\xc1\x5c\xdf\x36\x48\xc5\
-\x68\x7f\xdb\x3f\xb7\xe2\x27\x5b\x8e\xf0\xdd\x1b\x73\x72\x3c\xe3\
-\x25\xff\xdb\x79\x46\xb6\xa0\x75\x4b\xdb\xe5\x2d\x83\xd9\x32\xc8\
-\x4f\x8c\xf6\x09\x90\x3f\xda\xbc\x14\x13\xf0\x91\x7f\x30\x92\x9a\
-\xac\x17\x30\x7f\xc7\x7f\xb6\xed\x15\x96\xed\x6b\x4c\x4e\x60\xa2\
-\xe2\xf6\x59\x15\x4e\x7b\x49\xe7\xcb\xf5\x97\xb3\xcf\xa5\xbb\xb9\
-\x02\xf2\xab\x71\x27\xdf\x1e\x6c\xfb\x50\x63\xca\x14\xc8\x6d\x63\
-\xfc\x2a\xc8\x07\xba\x7d\x4d\x7c\xf3\x5e\x79\x5e\x13\x64\x56\xb7\
-\xbc\xd9\x37\x07\xf2\x00\x64\xd1\xe8\x6b\xfa\x67\x23\xcb\x26\x9b\
-\xfa\xc9\x82\x71\x26\xe4\x17\xe0\x3e\x0d\xfe\x27\xca\xa3\x07\xec\
-\x01\x21\xa3\xab\x70\x79\x0b\x2a\x5f\x0e\xe1\x64\x0d\x78\x5a\xd0\
-\x97\xda\xe1\x1b\x3c\x0b\xf0\x00\xba\x4f\xa0\xf6\x2a\x68\xeb\x28\
-\x5d\x94\xc9\x29\xbc\x98\x37\x98\x30\x90\xc6\xc4\x34\x50\xe6\x1f\
-\xa0\x5a\xbd\xed\xc7\x6c\x01\x2f\x54\xa1\x0f\x05\xf1\xc4\x2c\xf9\
-\xff\x89\xe9\x4a\x34\x78\xd8\x46\xd0\xf6\xc2\xa0\x25\x86\x17\x20\
-\x82\x32\xbc\xe7\x9f\x5d\x02\x7e\x06\x7c\x0e\xcc\xa0\x16\x22\x81\
-\x9c\xd9\x8c\x04\x20\x0d\xd4\xcc\x24\xff\x37\x80\x36\xb8\x5d\x3f\
-\x51\x05\x35\x5d\x9b\xc0\xd7\xe0\xae\xf4\x7c\xb9\x13\x72\x20\xce\
-\x8f\x9b\x42\x7d\x81\x6f\x47\x98\x9f\xf8\xd9\x45\x60\x1a\x35\xa9\
-\x7b\xf6\xb3\xd2\x86\xfa\x0b\xd4\x9f\x58\x01\x7e\x00\x16\x80\xcf\
-\x80\xe7\x80\xb7\x3c\xec\xf8\xe7\x7b\xaa\xdb\xdc\x55\xd1\xc4\x5b\
-\x03\xf3\x26\x5b\x59\xcd\x29\x1b\x5e\x0f\x7c\x1c\x29\x46\xcb\x4c\
-\x2e\xa1\xa6\x72\x46\x3f\x37\x05\x59\xf5\xca\x78\x3d\x6b\x55\xd2\
-\xfe\x99\x81\x7e\x91\x09\x90\xdf\x78\x2b\x11\xb6\x07\x8a\x51\xee\
-\xaa\x8e\x18\x40\xc9\x98\xb5\xaf\x13\xb2\x0b\xae\x17\x8d\x5d\x03\
-\xfe\x0e\xdc\x09\x84\x10\xac\xcc\x61\x53\x19\xe7\x10\xdc\x53\xdf\
-\x37\xe6\xaa\x9b\xe0\x9f\x75\x4f\x80\x03\xc5\x7d\xd8\xcc\xf7\x8b\
-\x03\xd6\x81\xbf\x01\xf7\xb2\x73\xba\x9e\xf2\x22\xeb\x18\x47\xc0\
-\x12\xc0\x14\x70\x16\x31\x0f\x7a\xe6\xbf\xf3\x5b\xe9\x31\x59\x21\
-\xa0\x1a\xb9\xd9\x57\xc6\xdd\xe5\xf8\x3c\x8e\x0b\xee\x52\x71\x37\
-\xfb\xd1\x6e\x08\x3d\xbc\x1e\xf0\x04\x3d\x7a\xe1\x90\x1e\xea\x29\
-\x4e\xc7\x58\x2d\x25\x38\xe7\x57\x2f\x00\xd9\x46\x95\x4c\x29\x30\
-\x77\x07\xc0\x7d\xe0\xd2\x9b\xab\x57\xe8\xee\x09\x4d\x9e\x9f\xd0\
-\xdc\x04\x25\xe8\xfa\xe3\x56\x3b\xc4\xf6\xf7\xa7\x81\x2e\x48\x78\
-\x66\xfb\x3a\x56\xee\x03\x47\xe8\xca\x7f\xad\x63\x05\xa0\x03\x9d\
-\x13\xa8\x2f\x92\xd1\x67\xee\x08\xe4\xa7\xf1\x04\x63\x58\x01\x79\
-\x0b\x2e\x2a\x50\x9d\x46\x15\xd3\x29\x83\xad\xbd\x0b\xfc\x0e\xf8\
-\x4b\x01\x03\x01\x74\xe6\xa1\x9e\x04\x3f\x3e\x4e\xa8\x1d\xf9\xce\
-\x79\xd4\x52\xf8\x1d\xd5\x39\x87\xfa\xe1\x10\x64\x5d\xd4\x3c\xfe\
-\x06\xf8\x24\xa0\xd9\x2b\xcf\x7a\x0d\xb8\x0d\x72\x1e\x2d\x66\x6e\
-\x25\x62\x01\xc4\xd1\xe1\x5d\x60\x1a\x26\x1f\xaa\x12\x74\xfb\xd9\
-\xe1\xb2\x0e\xfc\x03\x0d\x70\x8c\x20\x43\x80\xee\x6d\xa8\x4d\x40\
-\xfd\x25\xb8\x4e\x01\x43\x47\xd9\xbf\x52\x07\x16\xe0\xa2\x06\xd5\
-\x93\xbc\xd6\x4e\x7d\x93\xbf\x02\x6b\xe0\xf6\x82\xce\x36\xc8\x09\
-\xba\x63\xdf\xf6\x9e\x6b\x42\x5b\x9f\xe8\xd8\xc7\x3a\xa0\x0a\x9c\
-\xfb\x09\xee\xa1\xab\xf2\x85\x4d\xb3\x2c\xa1\xdb\xbe\x87\xad\x13\
-\xa6\x81\x55\xa8\xb5\x55\x89\x15\x32\x6f\x80\xeb\xe8\x33\xd5\xb6\
-\x32\x18\x1e\xab\x30\xaa\xa3\x87\xfa\x02\x2b\x05\x88\xbe\xf1\x63\
-\xee\xf9\xe7\x3a\x64\x1d\xb9\x22\x2b\xc0\x06\xf0\x0c\xf5\x01\x8c\
-\x03\x7c\xd8\x04\xba\xe0\xba\x9e\xe0\x48\x31\x1e\xcd\x43\xbb\x86\
-\xae\xc2\xf9\x58\x3c\xdb\x70\x01\x3c\x85\xf6\x24\x1c\x2f\x60\x87\
-\xb4\x5d\xe0\x4c\xe7\x8c\xc1\x9d\xa1\x8b\xfa\x83\xe7\x29\xc7\x8b\
-\x25\x80\x06\xea\x3d\x2d\xe6\xb7\x7c\x02\xcd\x29\x70\xad\x6c\x5b\
-\x22\x84\xcb\xf7\x61\xae\x07\xb3\xaf\xcc\x47\x6f\x04\xb3\xaf\x60\
-\xf6\x52\x71\x5b\x47\xcd\xb5\x60\xae\x20\x16\x61\x07\x35\xdf\x2d\
-\xd4\xc2\x65\xc0\x12\xc0\x34\xaa\x3d\x0b\x94\x9a\x2c\xa3\x6e\xaa\
-\x01\xc7\x4d\xa8\x7c\x0f\xcc\x33\x7e\xec\x3d\x06\x88\x03\x16\xa0\
-\xf2\x9d\xce\x61\xc2\x73\xdb\x59\x72\x97\x40\x19\xdc\x31\xba\xb8\
-\x19\xb0\x04\x20\xa8\x69\xd9\x29\x20\x64\xc2\xb6\xf3\x32\x05\xa5\
-\x64\x22\x7f\x1c\xac\x60\xeb\xda\x10\x6e\xfb\x16\x94\x4a\x5e\xbf\
-\xc4\xc3\xae\x94\x36\xb1\x78\x3a\xd4\x23\x34\xda\x0a\x94\x07\x83\
-\x4c\xbf\x7d\x13\xd5\xb2\xe1\x2a\xcc\x82\x74\x81\x15\x98\xd9\x0f\
-\xfa\x5a\xc0\xbb\xc0\x13\xd2\x8c\x4e\x06\x92\xd4\x19\xa8\x4f\x61\
-\xe5\x05\xe7\xd0\x40\xe7\x07\xfd\x2d\xa0\x3b\x73\x03\xe4\x19\x03\
-\x3f\x23\xc1\x7f\xa6\x7d\x1c\x64\xd1\xb8\x63\xef\x0e\x27\x81\x59\
-\x0a\x31\x61\x35\x72\x49\x48\x99\x47\x83\x8d\x65\x4f\x64\x84\x9c\
-\x1e\x74\x66\xa1\x7e\x00\xc4\x41\xc6\x23\x4f\xd0\xd7\xc1\xe4\x2b\
-\x40\x1f\x3a\x67\x50\xdf\x05\x1c\x74\x6f\x41\x2d\xc9\x2f\x3e\xf3\
-\xdf\xce\xcf\xf9\x05\x9a\x2b\x0c\xe1\x15\x74\x66\xa0\x9e\x08\x2d\
-\x9c\xb7\x89\x2a\xbe\xbe\xee\x86\x54\x57\x25\x79\xcb\x4c\xc2\xc6\
-\x5a\x99\x45\xe0\x4b\x90\xaa\x27\xe0\x25\xb8\x43\x34\xd3\x73\x96\
-\x8f\xfc\xa4\x01\xf5\x32\xb8\xe7\x79\x54\x82\x67\x7e\x01\x38\x46\
-\x57\xec\x1b\x63\x77\xb5\xfd\xf8\x32\xba\xe2\x07\x9e\x8e\xff\x68\
-\x5f\x2e\x7a\x3b\xf1\xa6\xcf\x67\x7f\x43\x9a\x64\x1f\x15\x98\x17\
-\x9a\x6c\x02\x4f\xe0\xa4\x03\x8d\x29\xb2\xe1\xb1\xa9\x03\x4a\xa8\
-\x04\x6f\x83\xdb\x09\xec\xf7\x2d\x6c\xe5\x37\x0d\x47\x05\x69\x68\
-\xa5\x00\xcd\xf4\x6e\x01\x4f\x87\x87\xc4\xa9\x2f\x7f\x1f\x0d\x67\
-\x87\x05\x52\x27\x18\xbe\xbd\x5f\x08\x9f\xb9\x72\x27\xa8\xb7\xba\
-\x01\x8d\x03\xf4\x48\x65\xa0\x48\x09\x2e\xe5\xe3\x01\x28\x20\xbe\
-\x01\xf3\x47\x46\x7b\x02\x65\x25\xb4\xf2\x90\x9c\xb3\x94\x9b\x3a\
-\x51\x78\x9f\x61\xdf\x3f\x84\xb4\x14\x08\x20\x37\x4e\x7c\x6a\x7c\
-\xcd\xea\xb5\x04\xb0\x00\x58\xf6\xdf\xba\x84\x18\x07\x56\x18\x24\
-\x34\x0c\x8f\x31\x81\x9c\x93\xf3\x12\x2e\x8c\xd4\x7b\x06\x8a\x84\
-\x69\xd1\xfa\x0a\x43\x60\x05\x47\xe0\x5a\xe1\xec\x28\xc1\xf4\x07\
-\x3b\xa7\x30\x94\x36\x3c\x3c\xd7\x85\xea\xa8\x7c\xdb\x35\x72\x0d\
-\xee\x0c\x55\xe6\x19\x88\x05\x30\x41\x71\x54\x77\x13\x9b\x5e\x83\
-\x6e\x64\xde\x62\x21\x0c\xbd\xb1\xb9\xa9\x1f\x51\xf4\x5c\xae\x3d\
-\xb6\x02\xcb\x70\x65\x69\xf3\xc0\x3f\xc8\xb4\x97\xec\xf6\x14\x9a\
-\x50\x7b\x66\xd0\x21\x20\x8f\xd1\x24\x0b\xc0\xa3\x02\xfd\x32\x62\
-\x85\xbb\x7d\x8d\x34\x73\xd0\xc3\xce\xd6\x8e\x8a\x05\x7a\x15\x98\
-\xb8\xce\xf6\x4f\xec\x75\x11\xf4\x47\xf4\xbf\x26\xd4\x1c\xc5\x47\
-\x70\xac\x79\x23\x01\x94\x9f\xa1\xf6\x37\xc6\xd5\xb3\x11\x8e\xcc\
-\xf2\x1e\x90\x9a\xa4\x10\xd2\x6d\xff\xc8\x7f\x46\x58\x87\x42\x28\
-\x12\x40\x19\xdb\xb3\xcc\xcd\x11\xeb\x80\x2e\x51\xbc\x1c\x40\x11\
-\xb3\xc3\x08\xbf\xca\xcf\x11\x9f\xf9\x51\xd6\x61\x28\x14\x8d\x1f\
-\x5b\x39\xc6\x02\x48\x72\xe7\x39\x6d\x79\x03\x22\x12\xe8\x93\xde\
-\x27\x16\x29\x3c\x4b\x08\x32\x43\xea\xe9\xdd\x78\xee\x00\xc4\xe7\
-\x17\xb3\x60\x99\xc1\x23\x06\xb7\x38\x3f\x06\x3c\x07\x56\x46\x68\
-\x7b\x22\x21\x94\x50\xaf\xcd\xb8\x70\xc9\xc0\x98\xbe\x49\x12\x4e\
-\xe7\x05\x6a\x09\xc0\x01\xfb\xe4\x2f\x12\x8b\xa4\x7d\x00\x6d\x43\
-\x6f\x64\xe0\x25\xf0\x21\x23\x8b\x13\x9c\xa0\x61\xf8\x47\x0c\xbf\
-\x13\xc4\x67\x80\x8e\x8b\x10\x0d\x7e\x8a\x43\xad\xcd\x2e\x63\xe8\
-\x00\x00\xf1\x8e\xd0\x53\x15\x42\x7a\xb3\x73\x80\x79\x1b\xcb\x25\
-\x34\xaa\x43\x28\x4d\xee\xeb\xfe\x05\x6c\x6a\xde\xa0\x08\x64\x8e\
-\xc1\xe5\xcb\xa6\x45\xf0\x00\xe6\x26\x31\xd3\x6d\xed\x45\xd2\x88\
-\x55\x9a\x68\x6e\xe3\x91\xc7\x35\x32\x1f\x00\x9a\xe7\x9f\x04\x77\
-\x0e\xec\x28\x12\xd9\x40\xad\xc3\xbc\x8f\xbd\x43\x44\x4b\xc0\x19\
-\xc8\x3b\x44\x91\x16\x9a\x81\x59\x43\xa3\xba\x26\x70\x01\x17\x5b\
-\x5e\xc7\x58\x4e\xcf\x29\x1a\x19\x2e\xe9\x58\x1e\x00\xff\x06\x89\
-\x4d\x73\x92\xd9\x49\xf2\x01\xc9\xff\x24\x84\xee\x78\xfc\x7b\x7a\
-\xaf\x09\x3e\x83\x9d\xf3\x49\x62\x01\x74\x7c\xdb\x32\x7a\x1e\xd1\
-\x0b\x05\x8e\x3c\xbd\x02\xec\x67\xb7\xb1\xa0\xb9\x43\x59\xcf\xe6\
-\x10\xd3\x73\xf7\x4f\x70\xed\x60\x8e\x82\x3c\xa3\x05\x02\x9a\x38\
-\xd9\x8d\xe6\x5c\xd3\x60\x2d\x61\x3c\x09\x87\xc5\xa1\xbb\xfa\x38\
-\xdb\x0e\x0c\x0a\xb6\x32\xd9\xe9\xf8\x08\x84\x57\xd7\x16\xec\xa1\
-\xc1\x8d\x05\xcf\xc8\x14\x56\xe0\x6f\x65\x5f\xfb\x6e\x30\xb6\x0e\
-\x2b\x14\xe6\x24\x93\xc0\xcb\x84\xe4\x3a\x3e\xa3\x38\x8b\x94\xe0\
-\x85\x6d\x0a\x5d\x5f\x89\xb2\xea\x6d\xdc\x15\xd0\xf2\x67\x30\xc9\
-\xdb\xbf\x0e\xf3\x09\x04\x42\x68\xdd\x46\x13\x24\x56\x4e\xb2\x1c\
-\xd0\x18\xf7\x2d\xa3\xd6\x68\x2c\x25\xd8\x46\xed\xa5\x19\x3f\xfb\
-\x6d\x6e\x64\x5f\x01\x38\x83\xc6\x32\x9c\x9c\x8d\xe1\x25\x5e\x03\
-\x9c\x28\xce\x99\x15\x06\x65\x77\x31\x2c\x53\x7c\xbc\x92\x1a\x85\
-\x9c\x59\xb5\x04\x70\x86\x2a\x97\x72\x41\x86\x15\x38\xee\x90\xbb\
-\xf7\x4f\xb7\xfd\x57\xd0\x38\xd3\x73\xfa\x63\x81\xac\x2a\x4e\xbe\
-\xc2\xf4\x18\xa5\x01\xad\xae\x2d\x74\x99\x83\xb3\x2e\xca\x53\x4e\
-\x78\x45\xf9\x80\xc4\x66\xbe\x6d\x13\xd4\x3c\x54\x84\xc9\x31\xc9\
-\xb9\xb7\xa7\xe8\x96\x5b\x85\x4e\x41\xa1\xd3\x38\x70\x3e\xab\x38\
-\x92\xea\x4f\xd3\x6d\x9e\x04\x66\x61\x2e\x4e\xd6\x26\xb0\x02\x53\
-\xd3\x01\x4f\x19\x88\x05\x70\x41\x9a\x34\x70\xde\x74\xc9\xba\x8d\
-\xd7\xed\x2b\x72\x4a\xd8\xee\xed\x15\xb0\x07\xf5\x4b\x55\x5c\xb2\
-\x38\x9e\xaf\x2f\xce\x8f\x5d\x81\x49\x8f\x23\x3c\xf3\xa1\x10\x28\
-\x01\xab\x76\xfa\x0e\xd4\x34\x5f\x54\xc0\x7d\xeb\x1b\xea\x44\x56\
-\x20\x36\x83\xf1\x95\xd3\x27\x68\x39\x1a\xc0\x32\x5a\x27\xd4\x0f\
-\xc6\x5d\x02\xbf\x45\xaf\xc7\x97\x0d\x9d\x97\xa4\xa0\x4e\xd1\xf8\
-\xfc\x3d\x2f\x84\x61\x89\x0f\x21\xad\x35\xa0\x81\xba\xd1\x56\x4d\
-\xcf\x25\xf0\x7b\xe0\x53\x06\x97\xa3\x89\x19\x4c\xca\x6b\x27\xf5\
-\x66\x3b\x85\x12\xc3\xdd\x67\xd9\x42\x0b\x0f\xc2\xb6\x86\xf7\x08\
-\x37\xa2\xf6\xa4\x0e\x6f\xcd\x7f\x1b\x56\x43\x1a\xdc\xa8\x46\x30\
-\x7d\x7e\x05\xf3\x52\x45\xaa\x68\x09\xed\x1c\xc8\xbb\xb6\x4e\x90\
-\xf7\xf3\xd6\x4a\x3e\x64\x8c\x1a\xa1\x43\x90\x20\x23\xeb\x4e\xe0\
-\xa4\xab\xf5\x80\x29\xa2\xf0\x8a\xba\x0f\xee\x11\xea\x25\xbe\x06\
-\xb3\xe3\x82\xcc\xa0\x29\xfb\xef\xd1\xcc\xcf\x0e\x79\xc5\xb8\x81\
-\xa6\xe0\xc3\x0b\x9e\xe4\x6e\x22\x03\x96\x00\xba\x40\x95\x4c\x49\
-\xec\xcc\x0b\xa8\x4c\x7a\xc9\x16\x85\xb4\xfb\xd0\xaa\xaa\xce\xb8\
-\x56\x5d\xee\x98\x20\x65\xc5\xdd\xaa\x90\xaf\xfa\x08\x14\x63\x7b\
-\x11\xba\x1d\x32\x1a\x5f\x2a\xa8\x6e\xcb\xd5\x28\x58\xb1\x40\x09\
-\xdc\x9e\x6e\x79\x79\x16\x28\xa0\xa7\xa8\x46\xee\x01\xff\x0d\x98\
-\x0f\x24\x3f\x77\xe0\x05\x94\x84\xbf\xa1\x0b\x7c\x13\x48\xbc\xbf\
-\x55\x94\xd1\xa7\x30\x27\x51\xbf\x04\x39\xc6\xfb\xd0\x68\x91\xb9\
-\xbe\x93\x8a\xd2\xe3\x76\x40\xee\x1a\xcc\x66\xe0\x25\x69\x2e\xc0\
-\xed\xa2\x75\x36\xc9\xd6\x17\x54\xf1\x54\xc8\x66\x8d\x22\x1c\x4e\
-\x54\x80\xec\xa3\xb5\x3f\xf7\xc6\x08\x97\x0d\x68\xdd\x46\x9d\x9b\
-\x25\xe0\xb9\xee\xb0\x9c\x9d\x9f\x26\x5d\xd5\xe3\x26\xba\xea\x65\
-\x54\x79\x76\xd0\xda\xe6\x25\x65\x1e\xd0\xcb\xd8\x8c\x33\x14\xed\
-\x00\x77\x9a\x0d\x57\xdd\x1e\x5a\xc3\xbf\x81\x46\x66\x9f\xa3\x42\
-\x78\x00\xe7\x27\x50\x3d\x52\x22\x0b\xcd\x5b\x5f\xe7\x68\x24\x15\
-\x9b\x49\x1b\x80\x83\x0b\xbf\xbb\xaa\xc9\x0b\x14\x21\x1c\x7b\x66\
-\xbc\xa9\x33\x1d\xcb\x65\xc5\x2f\x4b\x1e\x6f\x12\x23\x7c\x00\x3c\
-\x04\x0e\xc0\xbd\x0c\xc6\x97\xe3\x7b\x46\xeb\x08\xc4\xcc\x74\x3d\
-\x21\x0f\xd1\x82\x45\xd0\x2b\xef\x65\xdf\xbe\x1f\xb4\x1b\x20\x62\
-\xf7\x8b\x83\xea\xa4\x67\xb0\x53\xe0\xc5\xad\x8f\xc0\x7d\x05\x4c\
-\xc1\xd1\xf7\xd9\xeb\x39\x71\x9e\xb6\xf8\xcc\x8f\x93\x42\x93\x3b\
-\x03\xe7\x27\x53\x2e\x5f\xcf\x5a\x07\xf0\x66\xe8\x7d\xec\x44\x49\
-\x32\xe6\xff\x50\x2e\x0f\xba\x00\xf2\xf3\xbc\xf9\x95\xa6\x5a\x8a\
-\x5c\xb9\xfc\x1d\xcc\xb2\x5e\x1b\xf9\xc7\xd8\x2f\x4c\xac\x92\x7b\
-\x61\x42\x1c\xfa\x82\x85\xf1\x02\x43\x3a\x66\x7b\xcc\x89\x43\x9c\
-\x05\xcf\x88\x43\xdf\x18\xf9\xa5\xd1\x57\xce\xfa\x2b\xa9\x10\xaa\
-\x8c\xff\xc2\x44\x8a\xe8\x4f\x05\x4e\xc8\x46\x5e\x08\x00\xf2\x1e\
-\xfa\xca\x4a\xee\xa5\x04\x5e\xeb\x95\x99\xb4\xad\xe4\x9d\x9f\xb7\
-\x40\xde\x31\x9c\x9f\xb2\xa5\xe5\x3d\xf3\x7f\xc8\xe3\x2b\x9e\x3c\
-\x91\x5a\x59\xa5\x16\x7b\x80\xe0\x77\x82\x71\x7d\x2d\x1b\x7e\x6b\
-\xde\xd3\x4f\x2b\x74\x9e\x2a\x8c\x7e\x69\x6a\xca\x8f\x09\x04\x2f\
-\x2b\x0c\x5e\xbe\x2a\x7a\x39\x6a\x1e\x33\x66\x91\x2d\xcf\x43\x29\
-\xbf\x9b\x15\x62\x44\x86\x93\x23\x9b\xa8\xb6\xf5\x35\xba\xb4\xfc\
-\xef\x1a\x6a\xe6\x1c\x7a\x01\x72\xc1\xe0\xb5\xb9\x19\x40\xa0\x37\
-\x0d\xe5\xc4\x29\x4a\x4a\x64\x7b\xc1\xff\xe4\xf6\x26\x79\x6d\x2e\
-\x28\x97\x4d\xe9\xeb\xfa\x71\x0e\x35\x61\xa7\xfe\xf7\x24\xaa\xc4\
-\x7d\x01\x06\x1d\x54\xa1\xce\x06\x78\xf6\x06\x4e\x93\xed\xc0\x8d\
-\xb8\xa2\x8e\x41\x26\x30\x4a\xcd\x3c\x9e\x3a\x79\x2d\x1b\xbf\x38\
-\x59\x42\xaf\xca\x92\x23\x54\x65\xe0\x5f\xe0\x99\x38\x24\x6b\xf3\
-\xac\x17\x27\x85\x41\xe2\x33\x06\xa3\xb4\x36\x7d\xac\x88\xc7\x37\
-\xf7\xd5\x59\xab\xe1\x0d\x80\x0c\xcf\x6f\x1a\xf3\x09\xa8\x10\xfe\
-\x07\xb4\x0a\xfd\x7e\xcf\x22\x5b\xc2\x00\x00\x00\x00\x49\x45\x4e\
-\x44\xae\x42\x60\x82\
-\x00\x00\x02\x0b\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x01\xbd\x49\x44\x41\x54\x58\x85\xed\
-\x94\x3d\x6b\x14\x51\x18\x85\x9f\x73\xd7\x42\x09\x88\x36\x16\x16\
-\x41\xc1\x5a\x6c\x92\x45\x04\x3b\x59\x91\xe0\xba\x8b\xa6\x51\xc1\
-\x7f\x90\x5f\x20\xa8\xbf\x40\x6c\x52\xda\x58\x28\xb2\x89\x41\x0b\
-\x43\x4a\x91\x24\x6b\xa3\x29\x52\x59\xd8\x28\x58\x25\xa8\x91\x90\
-\xdd\xbd\xc7\x62\x66\xdd\x65\xa3\x9b\x99\xf5\x23\xcd\x3c\x30\xf0\
-\x32\xdc\x39\xe7\xdc\xfb\xbe\x77\xa0\xa0\xa0\xa0\x60\x9f\x51\xb7\
-\x98\x9c\x8b\x1b\x82\x23\xff\xc3\xd4\xb0\xd9\xac\x87\xa3\x00\xe1\
-\x67\x12\xf5\xea\x7f\x4d\xbf\x57\xaf\x68\xe9\x24\xb0\x92\x26\x04\
-\x13\x81\xce\xdf\x78\x6c\xa2\x7b\xfe\xcb\xa9\x57\x12\xa6\x3f\xd9\
-\xe9\x45\x8f\x1d\xfa\xee\x06\xa6\x82\x8d\x51\x94\x30\x7f\x86\xc0\
-\x01\x84\xe1\xe5\xf6\x98\xae\xae\x55\xb4\xb5\xeb\x04\x00\xd6\x2a\
-\xda\xfa\xda\xd2\x65\xe4\x27\x48\x48\x0e\x83\x21\xf3\x60\x23\x43\
-\x48\x24\xfc\xf8\x5b\x5b\xd5\x7e\xf3\x5d\x01\x00\xd6\xa7\xb5\x33\
-\xde\x0a\xd7\x6d\xcf\xa6\xde\xc1\xce\x1f\xc2\x20\x89\x20\xc0\xf6\
-\xec\x78\x3b\xdc\x58\x9f\xd6\xce\xe0\xba\xdf\x0b\xdb\x2a\x3f\x8b\
-\x77\xb1\x6e\x27\x82\x8a\xc2\x99\xda\x61\x24\xe1\x74\x73\xbe\xb7\
-\x5a\x0b\x77\x90\x7e\xf9\xed\x9e\x3b\x2b\xcf\x7b\x06\xfb\x7e\x37\
-\x15\x28\x0e\x37\x77\x10\x52\x22\xae\x99\x95\xba\x1e\x0c\x5b\x9f\
-\xe9\x68\xcb\x0d\xdf\x44\x7e\x08\x94\x86\x85\xe8\x33\xef\x20\xdd\
-\x5a\xad\xe9\xd1\x5e\xda\x99\x7b\x3b\x39\xe7\x29\xe1\xa7\xc0\x41\
-\x92\x9b\x3a\x18\xa2\x3b\xb0\xdb\x46\xd7\x9a\x75\xbd\xc8\xa2\x9b\
-\x6b\xb8\x26\x1a\x3e\x1f\xe4\xe7\xc0\x61\x83\x95\x86\x30\x04\x25\
-\x5a\x5f\x1c\x34\xd5\xbc\xa2\x57\x59\x35\x73\x4f\xf7\xc4\xbc\xcf\
-\x04\x7b\x11\x38\x86\x30\xd1\xdd\x96\x7f\x8e\xd2\xc5\x37\x35\xbd\
-\xcd\xa3\x37\xd2\x1d\x3f\xbb\xe0\x53\xb1\xe3\x25\xe0\x44\xfa\xea\
-\x43\x28\xe9\xc2\x72\x55\xef\xf3\x6a\x8d\xfc\x93\x39\xb7\xe0\xe3\
-\xed\x8e\x3f\x02\xef\x0e\x94\x74\xe9\x75\x55\x9f\x46\xd5\x2a\x28\
-\x28\x28\xd8\x57\x7e\x00\xa4\xf8\xb1\x06\x78\x8b\xc7\xb8\x00\x00\
-\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
-\x00\x00\x00\xcf\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
-\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
-\x01\x95\x2b\x0e\x1b\x00\x00\x00\x81\x49\x44\x41\x54\x58\x85\xed\
-\xd2\x31\x0e\x82\x50\x10\x84\xe1\x7f\x9f\x77\x20\xe1\x36\xaf\xe0\
-\x08\xf6\x16\x5a\x70\x0b\xc2\x2d\x28\xb0\xb5\xb5\xb5\x31\xe1\x36\
-\x26\xdc\x01\x96\x0a\x88\x98\xd8\xf1\x68\xe6\xeb\x76\xb3\xc9\x4c\
-\xb1\x20\x22\x22\x72\x30\xdb\xce\x31\x56\xa7\x3d\x03\xbb\xae\x1e\
-\x00\xff\x29\x50\x9c\x6f\xd1\x9c\x07\x90\xef\x59\x00\xe8\xc7\xd1\
-\x2f\xef\xe7\xfd\x05\x10\x96\xb5\xd3\x24\x08\x07\xc8\x42\xb0\x76\
-\x1e\xc2\xbf\xcb\x14\xd6\x02\x46\x09\x7c\x12\x64\xf6\x8e\x5d\xd7\
-\xd8\x6f\xc9\x9f\x50\x44\x44\xe4\x70\x13\x6a\x59\x1a\x0e\xce\xfb\
-\x3e\xfc\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
-"
-
-qt_resource_name = b"\
-\x00\x09\
-\x09\x5f\x97\x13\
-\x00\x71\
-\x00\x73\x00\x73\x00\x5f\x00\x69\x00\x63\x00\x6f\x00\x6e\x00\x73\
-\x00\x0a\
-\x09\x24\x4d\x25\
-\x00\x71\
-\x00\x64\x00\x61\x00\x72\x00\x6b\x00\x73\x00\x74\x00\x79\x00\x6c\x00\x65\
-\x00\x04\
-\x00\x06\xa8\x8b\
-\x00\x64\
-\x00\x61\x00\x72\x00\x6b\
-\x00\x0d\
-\x0d\x36\x0c\x63\
-\x00\x64\
-\x00\x61\x00\x72\x00\x6b\x00\x73\x00\x74\x00\x79\x00\x6c\x00\x65\x00\x2e\x00\x71\x00\x73\x00\x73\
-\x00\x02\
-\x00\x00\x07\x83\
-\x00\x72\
-\x00\x63\
-\x00\x17\
-\x0e\xfe\x32\x47\
-\x00\x61\
-\x00\x72\x00\x72\x00\x6f\x00\x77\x00\x5f\x00\x6c\x00\x65\x00\x66\x00\x74\x00\x5f\x00\x66\x00\x6f\x00\x63\x00\x75\x00\x73\x00\x40\
-\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x27\
-\x0d\x0d\x92\xa7\
-\x00\x74\
-\x00\x6f\x00\x6f\x00\x6c\x00\x62\x00\x61\x00\x72\x00\x5f\x00\x73\x00\x65\x00\x70\x00\x61\x00\x72\x00\x61\x00\x74\x00\x6f\x00\x72\
-\x00\x5f\x00\x76\x00\x65\x00\x72\x00\x74\x00\x69\x00\x63\x00\x61\x00\x6c\x00\x5f\x00\x64\x00\x69\x00\x73\x00\x61\x00\x62\x00\x6c\
-\x00\x65\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x1d\
-\x0c\x09\x66\x07\
-\x00\x63\
-\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x62\x00\x6f\x00\x78\x00\x5f\x00\x69\x00\x6e\x00\x64\x00\x65\x00\x74\x00\x65\x00\x72\x00\x6d\
-\x00\x69\x00\x6e\x00\x61\x00\x74\x00\x65\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x1a\
-\x01\x87\xae\x67\
-\x00\x63\
-\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x62\x00\x6f\x00\x78\x00\x5f\x00\x69\x00\x6e\x00\x64\x00\x65\x00\x74\x00\x65\x00\x72\x00\x6d\
-\x00\x69\x00\x6e\x00\x61\x00\x74\x00\x65\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x20\
-\x0e\xfe\x76\x47\
-\x00\x63\
-\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x62\x00\x6f\x00\x78\x00\x5f\x00\x63\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x65\x00\x64\x00\x5f\
-\x00\x64\x00\x69\x00\x73\x00\x61\x00\x62\x00\x6c\x00\x65\x00\x64\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x11\
-\x09\xcb\xcc\xe7\
-\x00\x77\
-\x00\x69\x00\x6e\x00\x64\x00\x6f\x00\x77\x00\x5f\x00\x75\x00\x6e\x00\x64\x00\x6f\x00\x63\x00\x6b\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\
-\x00\x18\
-\x07\x8b\xec\xe7\
-\x00\x62\
-\x00\x72\x00\x61\x00\x6e\x00\x63\x00\x68\x00\x5f\x00\x6f\x00\x70\x00\x65\x00\x6e\x00\x5f\x00\x64\x00\x69\x00\x73\x00\x61\x00\x62\
-\x00\x6c\x00\x65\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x17\
-\x0d\x9d\x97\x47\
-\x00\x62\
-\x00\x72\x00\x61\x00\x6e\x00\x63\x00\x68\x00\x5f\x00\x6f\x00\x70\x00\x65\x00\x6e\x00\x5f\x00\x70\x00\x72\x00\x65\x00\x73\x00\x73\
-\x00\x65\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x1d\
-\x09\x07\x81\x07\
-\x00\x63\
-\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x62\x00\x6f\x00\x78\x00\x5f\x00\x63\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x65\x00\x64\x00\x5f\
-\x00\x64\x00\x69\x00\x73\x00\x61\x00\x62\x00\x6c\x00\x65\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x1b\
-\x09\x0d\xa6\xc7\
-\x00\x62\
-\x00\x72\x00\x61\x00\x6e\x00\x63\x00\x68\x00\x5f\x00\x6d\x00\x6f\x00\x72\x00\x65\x00\x5f\x00\x64\x00\x69\x00\x73\x00\x61\x00\x62\
-\x00\x6c\x00\x65\x00\x64\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x19\
-\x07\x36\x1b\x47\
-\x00\x6c\
-\x00\x69\x00\x6e\x00\x65\x00\x5f\x00\x76\x00\x65\x00\x72\x00\x74\x00\x69\x00\x63\x00\x61\x00\x6c\x00\x5f\x00\x70\x00\x72\x00\x65\
-\x00\x73\x00\x73\x00\x65\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x17\
-\x0c\xeb\x5f\x67\
-\x00\x62\
-\x00\x72\x00\x61\x00\x6e\x00\x63\x00\x68\x00\x5f\x00\x65\x00\x6e\x00\x64\x00\x5f\x00\x66\x00\x6f\x00\x63\x00\x75\x00\x73\x00\x40\
-\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x10\
-\x05\x3e\x39\x67\
-\x00\x62\
-\x00\x61\x00\x73\x00\x65\x00\x5f\x00\x69\x00\x63\x00\x6f\x00\x6e\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x19\
-\x00\x4f\x29\xc7\
-\x00\x77\
-\x00\x69\x00\x6e\x00\x64\x00\x6f\x00\x77\x00\x5f\x00\x75\x00\x6e\x00\x64\x00\x6f\x00\x63\x00\x6b\x00\x5f\x00\x70\x00\x72\x00\x65\
-\x00\x73\x00\x73\x00\x65\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x26\
-\x04\x24\xf6\xe7\
-\x00\x74\
-\x00\x6f\x00\x6f\x00\x6c\x00\x62\x00\x61\x00\x72\x00\x5f\x00\x73\x00\x65\x00\x70\x00\x61\x00\x72\x00\x61\x00\x74\x00\x6f\x00\x72\
-\x00\x5f\x00\x68\x00\x6f\x00\x72\x00\x69\x00\x7a\x00\x6f\x00\x6e\x00\x74\x00\x61\x00\x6c\x00\x5f\x00\x66\x00\x6f\x00\x63\x00\x75\
-\x00\x73\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x27\
-\x0e\x3d\xd7\xc7\
-\x00\x74\
-\x00\x6f\x00\x6f\x00\x6c\x00\x62\x00\x61\x00\x72\x00\x5f\x00\x6d\x00\x6f\x00\x76\x00\x65\x00\x5f\x00\x68\x00\x6f\x00\x72\x00\x69\
-\x00\x7a\x00\x6f\x00\x6e\x00\x74\x00\x61\x00\x6c\x00\x5f\x00\x64\x00\x69\x00\x73\x00\x61\x00\x62\x00\x6c\x00\x65\x00\x64\x00\x40\
-\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x1e\
-\x07\x50\x2b\xe7\
-\x00\x77\
-\x00\x69\x00\x6e\x00\x64\x00\x6f\x00\x77\x00\x5f\x00\x6d\x00\x69\x00\x6e\x00\x69\x00\x6d\x00\x69\x00\x7a\x00\x65\x00\x5f\x00\x70\
-\x00\x72\x00\x65\x00\x73\x00\x73\x00\x65\x00\x64\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x17\
-\x0d\x6c\x22\x07\
-\x00\x62\
-\x00\x72\x00\x61\x00\x6e\x00\x63\x00\x68\x00\x5f\x00\x63\x00\x6c\x00\x6f\x00\x73\x00\x65\x00\x64\x00\x5f\x00\x66\x00\x6f\x00\x63\
-\x00\x75\x00\x73\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x18\
-\x03\xae\x62\xe7\
-\x00\x77\
-\x00\x69\x00\x6e\x00\x64\x00\x6f\x00\x77\x00\x5f\x00\x67\x00\x72\x00\x69\x00\x70\x00\x5f\x00\x64\x00\x69\x00\x73\x00\x61\x00\x62\
-\x00\x6c\x00\x65\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x17\
-\x0e\x19\x8b\xc7\
-\x00\x61\
-\x00\x72\x00\x72\x00\x6f\x00\x77\x00\x5f\x00\x64\x00\x6f\x00\x77\x00\x6e\x00\x5f\x00\x66\x00\x6f\x00\x63\x00\x75\x00\x73\x00\x40\
-\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x17\
-\x04\xf8\x32\xc7\
-\x00\x61\
-\x00\x72\x00\x72\x00\x6f\x00\x77\x00\x5f\x00\x75\x00\x70\x00\x5f\x00\x70\x00\x72\x00\x65\x00\x73\x00\x73\x00\x65\x00\x64\x00\x40\
-\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x1c\
-\x02\x75\x51\x87\
-\x00\x63\
-\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x62\x00\x6f\x00\x78\x00\x5f\x00\x63\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x65\x00\x64\x00\x5f\
-\x00\x70\x00\x72\x00\x65\x00\x73\x00\x73\x00\x65\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x21\
-\x01\xf6\xa2\x67\
-\x00\x74\
-\x00\x6f\x00\x6f\x00\x6c\x00\x62\x00\x61\x00\x72\x00\x5f\x00\x73\x00\x65\x00\x70\x00\x61\x00\x72\x00\x61\x00\x74\x00\x6f\x00\x72\
-\x00\x5f\x00\x76\x00\x65\x00\x72\x00\x74\x00\x69\x00\x63\x00\x61\x00\x6c\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\
-\x00\x18\
-\x07\x83\xfe\x27\
-\x00\x62\
-\x00\x72\x00\x61\x00\x6e\x00\x63\x00\x68\x00\x5f\x00\x6d\x00\x6f\x00\x72\x00\x65\x00\x5f\x00\x64\x00\x69\x00\x73\x00\x61\x00\x62\
-\x00\x6c\x00\x65\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x14\
-\x01\xe9\xfd\xe7\
-\x00\x6c\
-\x00\x69\x00\x6e\x00\x65\x00\x5f\x00\x76\x00\x65\x00\x72\x00\x74\x00\x69\x00\x63\x00\x61\x00\x6c\x00\x40\x00\x32\x00\x78\x00\x2e\
-\x00\x70\x00\x6e\x00\x67\
-\x00\x13\
-\x08\xc8\x96\xe7\
-\x00\x72\
-\x00\x61\x00\x64\x00\x69\x00\x6f\x00\x5f\x00\x75\x00\x6e\x00\x63\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x65\x00\x64\x00\x2e\x00\x70\
-\x00\x6e\x00\x67\
-\x00\x14\
-\x07\xec\xd1\xc7\
-\x00\x63\
-\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x62\x00\x6f\x00\x78\x00\x5f\x00\x63\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x65\x00\x64\x00\x2e\
-\x00\x70\x00\x6e\x00\x67\
-\x00\x16\
-\x03\x94\x39\x67\
-\x00\x6c\
-\x00\x69\x00\x6e\x00\x65\x00\x5f\x00\x68\x00\x6f\x00\x72\x00\x69\x00\x7a\x00\x6f\x00\x6e\x00\x74\x00\x61\x00\x6c\x00\x40\x00\x32\
-\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x29\
-\x09\x81\xd3\x67\
-\x00\x74\
-\x00\x6f\x00\x6f\x00\x6c\x00\x62\x00\x61\x00\x72\x00\x5f\x00\x73\x00\x65\x00\x70\x00\x61\x00\x72\x00\x61\x00\x74\x00\x6f\x00\x72\
-\x00\x5f\x00\x68\x00\x6f\x00\x72\x00\x69\x00\x7a\x00\x6f\x00\x6e\x00\x74\x00\x61\x00\x6c\x00\x5f\x00\x66\x00\x6f\x00\x63\x00\x75\
-\x00\x73\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x11\
-\x08\x8f\x96\xa7\
-\x00\x61\
-\x00\x72\x00\x72\x00\x6f\x00\x77\x00\x5f\x00\x64\x00\x6f\x00\x77\x00\x6e\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\
-\x00\x17\
-\x07\x06\x3d\xa7\
-\x00\x74\
-\x00\x72\x00\x61\x00\x6e\x00\x73\x00\x70\x00\x61\x00\x72\x00\x65\x00\x6e\x00\x74\x00\x5f\x00\x70\x00\x72\x00\x65\x00\x73\x00\x73\
-\x00\x65\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x1d\
-\x0e\x35\xf3\xa7\
-\x00\x62\
-\x00\x72\x00\x61\x00\x6e\x00\x63\x00\x68\x00\x5f\x00\x63\x00\x6c\x00\x6f\x00\x73\x00\x65\x00\x64\x00\x5f\x00\x64\x00\x69\x00\x73\
-\x00\x61\x00\x62\x00\x6c\x00\x65\x00\x64\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x1a\
-\x05\x35\xb6\x67\
-\x00\x74\
-\x00\x72\x00\x61\x00\x6e\x00\x73\x00\x70\x00\x61\x00\x72\x00\x65\x00\x6e\x00\x74\x00\x5f\x00\x70\x00\x72\x00\x65\x00\x73\x00\x73\
-\x00\x65\x00\x64\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x1c\
-\x00\x10\xb9\x67\
-\x00\x77\
-\x00\x69\x00\x6e\x00\x64\x00\x6f\x00\x77\x00\x5f\x00\x63\x00\x6c\x00\x6f\x00\x73\x00\x65\x00\x5f\x00\x64\x00\x69\x00\x73\x00\x61\
-\x00\x62\x00\x6c\x00\x65\x00\x64\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x1a\
-\x0b\x46\x72\x87\
-\x00\x77\
-\x00\x69\x00\x6e\x00\x64\x00\x6f\x00\x77\x00\x5f\x00\x75\x00\x6e\x00\x64\x00\x6f\x00\x63\x00\x6b\x00\x5f\x00\x66\x00\x6f\x00\x63\
-\x00\x75\x00\x73\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x1c\
-\x09\xc8\xa4\xa7\
-\x00\x6c\
-\x00\x69\x00\x6e\x00\x65\x00\x5f\x00\x68\x00\x6f\x00\x72\x00\x69\x00\x7a\x00\x6f\x00\x6e\x00\x74\x00\x61\x00\x6c\x00\x5f\x00\x64\
-\x00\x69\x00\x73\x00\x61\x00\x62\x00\x6c\x00\x65\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x19\
-\x0c\xa5\xc5\x27\
-\x00\x62\
-\x00\x61\x00\x73\x00\x65\x00\x5f\x00\x69\x00\x63\x00\x6f\x00\x6e\x00\x5f\x00\x64\x00\x69\x00\x73\x00\x61\x00\x62\x00\x6c\x00\x65\
-\x00\x64\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x15\
-\x0a\x12\x4a\x67\
-\x00\x77\
-\x00\x69\x00\x6e\x00\x64\x00\x6f\x00\x77\x00\x5f\x00\x67\x00\x72\x00\x69\x00\x70\x00\x5f\x00\x66\x00\x6f\x00\x63\x00\x75\x00\x73\
-\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x0f\
-\x06\x16\x25\xe7\
-\x00\x62\
-\x00\x72\x00\x61\x00\x6e\x00\x63\x00\x68\x00\x5f\x00\x6d\x00\x6f\x00\x72\x00\x65\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x1f\
-\x04\x8d\x48\xc7\
-\x00\x77\
-\x00\x69\x00\x6e\x00\x64\x00\x6f\x00\x77\x00\x5f\x00\x6d\x00\x69\x00\x6e\x00\x69\x00\x6d\x00\x69\x00\x7a\x00\x65\x00\x5f\x00\x64\
-\x00\x69\x00\x73\x00\x61\x00\x62\x00\x6c\x00\x65\x00\x64\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x1a\
-\x02\xb6\xb5\xa7\
-\x00\x61\
-\x00\x72\x00\x72\x00\x6f\x00\x77\x00\x5f\x00\x6c\x00\x65\x00\x66\x00\x74\x00\x5f\x00\x64\x00\x69\x00\x73\x00\x61\x00\x62\x00\x6c\
-\x00\x65\x00\x64\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x1f\
-\x0c\xa4\x6f\xa7\
-\x00\x6c\
-\x00\x69\x00\x6e\x00\x65\x00\x5f\x00\x68\x00\x6f\x00\x72\x00\x69\x00\x7a\x00\x6f\x00\x6e\x00\x74\x00\x61\x00\x6c\x00\x5f\x00\x64\
-\x00\x69\x00\x73\x00\x61\x00\x62\x00\x6c\x00\x65\x00\x64\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x17\
-\x00\x6c\xa3\xa7\
-\x00\x6c\
-\x00\x69\x00\x6e\x00\x65\x00\x5f\x00\x76\x00\x65\x00\x72\x00\x74\x00\x69\x00\x63\x00\x61\x00\x6c\x00\x5f\x00\x66\x00\x6f\x00\x63\
-\x00\x75\x00\x73\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x18\
-\x0e\x0c\xda\xa7\
-\x00\x61\
-\x00\x72\x00\x72\x00\x6f\x00\x77\x00\x5f\x00\x75\x00\x70\x00\x5f\x00\x64\x00\x69\x00\x73\x00\x61\x00\x62\x00\x6c\x00\x65\x00\x64\
-\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x25\
-\x06\x6c\x47\xe7\
-\x00\x63\
-\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x62\x00\x6f\x00\x78\x00\x5f\x00\x69\x00\x6e\x00\x64\x00\x65\x00\x74\x00\x65\x00\x72\x00\x6d\
-\x00\x69\x00\x6e\x00\x61\x00\x74\x00\x65\x00\x5f\x00\x70\x00\x72\x00\x65\x00\x73\x00\x73\x00\x65\x00\x64\x00\x40\x00\x32\x00\x78\
-\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x19\
-\x01\x0e\xe5\xa7\
-\x00\x72\
-\x00\x61\x00\x64\x00\x69\x00\x6f\x00\x5f\x00\x63\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x65\x00\x64\x00\x5f\x00\x70\x00\x72\x00\x65\
-\x00\x73\x00\x73\x00\x65\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x1a\
-\x0c\xd5\x5a\x67\
-\x00\x6c\
-\x00\x69\x00\x6e\x00\x65\x00\x5f\x00\x76\x00\x65\x00\x72\x00\x74\x00\x69\x00\x63\x00\x61\x00\x6c\x00\x5f\x00\x66\x00\x6f\x00\x63\
-\x00\x75\x00\x73\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x18\
-\x07\x86\x4e\x27\
-\x00\x62\
-\x00\x72\x00\x61\x00\x6e\x00\x63\x00\x68\x00\x5f\x00\x6c\x00\x69\x00\x6e\x00\x65\x00\x5f\x00\x64\x00\x69\x00\x73\x00\x61\x00\x62\
-\x00\x6c\x00\x65\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x12\
-\x00\x68\xca\xe7\
-\x00\x74\
-\x00\x72\x00\x61\x00\x6e\x00\x73\x00\x70\x00\x61\x00\x72\x00\x65\x00\x6e\x00\x74\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\
-\x00\x67\
-\x00\x1a\
-\x0f\x5a\xb4\xa7\
-\x00\x72\
-\x00\x61\x00\x64\x00\x69\x00\x6f\x00\x5f\x00\x63\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x65\x00\x64\x00\x5f\x00\x66\x00\x6f\x00\x63\
-\x00\x75\x00\x73\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x16\
-\x05\x7a\xd3\x67\
-\x00\x62\
-\x00\x61\x00\x73\x00\x65\x00\x5f\x00\x69\x00\x63\x00\x6f\x00\x6e\x00\x5f\x00\x66\x00\x6f\x00\x63\x00\x75\x00\x73\x00\x40\x00\x32\
-\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x2c\
-\x0c\xa4\x5a\x47\
-\x00\x74\
-\x00\x6f\x00\x6f\x00\x6c\x00\x62\x00\x61\x00\x72\x00\x5f\x00\x73\x00\x65\x00\x70\x00\x61\x00\x72\x00\x61\x00\x74\x00\x6f\x00\x72\
-\x00\x5f\x00\x68\x00\x6f\x00\x72\x00\x69\x00\x7a\x00\x6f\x00\x6e\x00\x74\x00\x61\x00\x6c\x00\x5f\x00\x64\x00\x69\x00\x73\x00\x61\
-\x00\x62\x00\x6c\x00\x65\x00\x64\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x24\
-\x05\x94\xa0\x47\
-\x00\x74\
-\x00\x6f\x00\x6f\x00\x6c\x00\x62\x00\x61\x00\x72\x00\x5f\x00\x73\x00\x65\x00\x70\x00\x61\x00\x72\x00\x61\x00\x74\x00\x6f\x00\x72\
-\x00\x5f\x00\x76\x00\x65\x00\x72\x00\x74\x00\x69\x00\x63\x00\x61\x00\x6c\x00\x5f\x00\x66\x00\x6f\x00\x63\x00\x75\x00\x73\x00\x2e\
-\x00\x70\x00\x6e\x00\x67\
-\x00\x17\
-\x0f\x1e\x9b\x47\
-\x00\x72\
-\x00\x61\x00\x64\x00\x69\x00\x6f\x00\x5f\x00\x63\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x65\x00\x64\x00\x5f\x00\x66\x00\x6f\x00\x63\
-\x00\x75\x00\x73\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x22\
-\x01\x41\xee\x87\
-\x00\x74\
-\x00\x6f\x00\x6f\x00\x6c\x00\x62\x00\x61\x00\x72\x00\x5f\x00\x6d\x00\x6f\x00\x76\x00\x65\x00\x5f\x00\x76\x00\x65\x00\x72\x00\x74\
-\x00\x69\x00\x63\x00\x61\x00\x6c\x00\x5f\x00\x64\x00\x69\x00\x73\x00\x61\x00\x62\x00\x6c\x00\x65\x00\x64\x00\x2e\x00\x70\x00\x6e\
-\x00\x67\
-\x00\x14\
-\x00\x2e\x0a\x07\
-\x00\x72\
-\x00\x61\x00\x64\x00\x69\x00\x6f\x00\x5f\x00\x63\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x65\x00\x64\x00\x40\x00\x32\x00\x78\x00\x2e\
-\x00\x70\x00\x6e\x00\x67\
-\x00\x17\
-\x03\x9f\x72\x87\
-\x00\x61\
-\x00\x72\x00\x72\x00\x6f\x00\x77\x00\x5f\x00\x72\x00\x69\x00\x67\x00\x68\x00\x74\x00\x5f\x00\x70\x00\x72\x00\x65\x00\x73\x00\x73\
-\x00\x65\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x16\
-\x0f\x35\xfb\x07\
-\x00\x62\
-\x00\x72\x00\x61\x00\x6e\x00\x63\x00\x68\x00\x5f\x00\x65\x00\x6e\x00\x64\x00\x5f\x00\x70\x00\x72\x00\x65\x00\x73\x00\x73\x00\x65\
-\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x1c\
-\x0f\xd0\x9c\x67\
-\x00\x74\
-\x00\x6f\x00\x6f\x00\x6c\x00\x62\x00\x61\x00\x72\x00\x5f\x00\x6d\x00\x6f\x00\x76\x00\x65\x00\x5f\x00\x76\x00\x65\x00\x72\x00\x74\
-\x00\x69\x00\x63\x00\x61\x00\x6c\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x0e\
-\x08\xfa\xe1\x27\
-\x00\x61\
-\x00\x72\x00\x72\x00\x6f\x00\x77\x00\x5f\x00\x6c\x00\x65\x00\x66\x00\x74\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x17\
-\x0d\x0d\x28\xa7\
-\x00\x62\
-\x00\x72\x00\x61\x00\x6e\x00\x63\x00\x68\x00\x5f\x00\x65\x00\x6e\x00\x64\x00\x5f\x00\x64\x00\x69\x00\x73\x00\x61\x00\x62\x00\x6c\
-\x00\x65\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x18\
-\x0f\xd7\x34\x67\
-\x00\x74\
-\x00\x72\x00\x61\x00\x6e\x00\x73\x00\x70\x00\x61\x00\x72\x00\x65\x00\x6e\x00\x74\x00\x5f\x00\x66\x00\x6f\x00\x63\x00\x75\x00\x73\
-\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x19\
-\x0c\x24\xec\x07\
-\x00\x6c\
-\x00\x69\x00\x6e\x00\x65\x00\x5f\x00\x68\x00\x6f\x00\x72\x00\x69\x00\x7a\x00\x6f\x00\x6e\x00\x74\x00\x61\x00\x6c\x00\x5f\x00\x66\
-\x00\x6f\x00\x63\x00\x75\x00\x73\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x21\
-\x05\x70\x30\x27\
-\x00\x74\
-\x00\x6f\x00\x6f\x00\x6c\x00\x62\x00\x61\x00\x72\x00\x5f\x00\x6d\x00\x6f\x00\x76\x00\x65\x00\x5f\x00\x68\x00\x6f\x00\x72\x00\x69\
-\x00\x7a\x00\x6f\x00\x6e\x00\x74\x00\x61\x00\x6c\x00\x5f\x00\x66\x00\x6f\x00\x63\x00\x75\x00\x73\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\
-\x00\x18\
-\x06\x60\x39\xe7\
-\x00\x62\
-\x00\x72\x00\x61\x00\x6e\x00\x63\x00\x68\x00\x5f\x00\x6c\x00\x69\x00\x6e\x00\x65\x00\x5f\x00\x66\x00\x6f\x00\x63\x00\x75\x00\x73\
-\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x11\
-\x0a\xe5\x6c\x07\
-\x00\x72\
-\x00\x61\x00\x64\x00\x69\x00\x6f\x00\x5f\x00\x63\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x65\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\
-\x00\x1a\
-\x0a\xa0\x05\x47\
-\x00\x77\
-\x00\x69\x00\x6e\x00\x64\x00\x6f\x00\x77\x00\x5f\x00\x75\x00\x6e\x00\x64\x00\x6f\x00\x63\x00\x6b\x00\x5f\x00\x64\x00\x69\x00\x73\
-\x00\x61\x00\x62\x00\x6c\x00\x65\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x19\
-\x0f\x7e\x6f\xe7\
-\x00\x77\
-\x00\x69\x00\x6e\x00\x64\x00\x6f\x00\x77\x00\x5f\x00\x63\x00\x6c\x00\x6f\x00\x73\x00\x65\x00\x5f\x00\x64\x00\x69\x00\x73\x00\x61\
-\x00\x62\x00\x6c\x00\x65\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x15\
-\x0c\x60\x8e\x27\
-\x00\x61\
-\x00\x72\x00\x72\x00\x6f\x00\x77\x00\x5f\x00\x75\x00\x70\x00\x5f\x00\x64\x00\x69\x00\x73\x00\x61\x00\x62\x00\x6c\x00\x65\x00\x64\
-\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x19\
-\x0b\x59\x6e\x87\
-\x00\x72\
-\x00\x61\x00\x64\x00\x69\x00\x6f\x00\x5f\x00\x75\x00\x6e\x00\x63\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x65\x00\x64\x00\x5f\x00\x66\
-\x00\x6f\x00\x63\x00\x75\x00\x73\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x1b\
-\x02\x0d\xa6\x67\
-\x00\x62\
-\x00\x72\x00\x61\x00\x6e\x00\x63\x00\x68\x00\x5f\x00\x6c\x00\x69\x00\x6e\x00\x65\x00\x5f\x00\x64\x00\x69\x00\x73\x00\x61\x00\x62\
-\x00\x6c\x00\x65\x00\x64\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x18\
-\x0e\x31\x43\xa7\
-\x00\x74\
-\x00\x72\x00\x61\x00\x6e\x00\x73\x00\x70\x00\x61\x00\x72\x00\x65\x00\x6e\x00\x74\x00\x5f\x00\x64\x00\x69\x00\x73\x00\x61\x00\x62\
-\x00\x6c\x00\x65\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x13\
-\x0c\x24\x39\x47\
-\x00\x62\
-\x00\x61\x00\x73\x00\x65\x00\x5f\x00\x69\x00\x63\x00\x6f\x00\x6e\x00\x5f\x00\x66\x00\x6f\x00\x63\x00\x75\x00\x73\x00\x2e\x00\x70\
-\x00\x6e\x00\x67\
-\x00\x21\
-\x0e\xf1\x37\x67\
-\x00\x74\
-\x00\x6f\x00\x6f\x00\x6c\x00\x62\x00\x61\x00\x72\x00\x5f\x00\x6d\x00\x6f\x00\x76\x00\x65\x00\x5f\x00\x76\x00\x65\x00\x72\x00\x74\
-\x00\x69\x00\x63\x00\x61\x00\x6c\x00\x5f\x00\x70\x00\x72\x00\x65\x00\x73\x00\x73\x00\x65\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\
-\x00\x1b\
-\x0b\xea\x1b\xe7\
-\x00\x77\
-\x00\x69\x00\x6e\x00\x64\x00\x6f\x00\x77\x00\x5f\x00\x6d\x00\x69\x00\x6e\x00\x69\x00\x6d\x00\x69\x00\x7a\x00\x65\x00\x5f\x00\x70\
-\x00\x72\x00\x65\x00\x73\x00\x73\x00\x65\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x11\
-\x05\x2a\x70\x67\
-\x00\x6c\
-\x00\x69\x00\x6e\x00\x65\x00\x5f\x00\x76\x00\x65\x00\x72\x00\x74\x00\x69\x00\x63\x00\x61\x00\x6c\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\
-\x00\x20\
-\x09\xd7\x1f\xa7\
-\x00\x63\
-\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x62\x00\x6f\x00\x78\x00\x5f\x00\x69\x00\x6e\x00\x64\x00\x65\x00\x74\x00\x65\x00\x72\x00\x6d\
-\x00\x69\x00\x6e\x00\x61\x00\x74\x00\x65\x00\x5f\x00\x66\x00\x6f\x00\x63\x00\x75\x00\x73\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x1a\
-\x01\xc7\x25\x47\
-\x00\x61\
-\x00\x72\x00\x72\x00\x6f\x00\x77\x00\x5f\x00\x72\x00\x69\x00\x67\x00\x68\x00\x74\x00\x5f\x00\x70\x00\x72\x00\x65\x00\x73\x00\x73\
-\x00\x65\x00\x64\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x1e\
-\x04\x3c\x09\xc7\
-\x00\x72\
-\x00\x61\x00\x64\x00\x69\x00\x6f\x00\x5f\x00\x75\x00\x6e\x00\x63\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x65\x00\x64\x00\x5f\x00\x70\
-\x00\x72\x00\x65\x00\x73\x00\x73\x00\x65\x00\x64\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x1b\
-\x0d\xfd\xa2\x07\
-\x00\x61\
-\x00\x72\x00\x72\x00\x6f\x00\x77\x00\x5f\x00\x72\x00\x69\x00\x67\x00\x68\x00\x74\x00\x5f\x00\x64\x00\x69\x00\x73\x00\x61\x00\x62\
-\x00\x6c\x00\x65\x00\x64\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x0f\
-\x0c\xe2\x68\x67\
-\x00\x74\
-\x00\x72\x00\x61\x00\x6e\x00\x73\x00\x70\x00\x61\x00\x72\x00\x65\x00\x6e\x00\x74\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x18\
-\x06\x6d\x9b\x27\
-\x00\x62\
-\x00\x72\x00\x61\x00\x6e\x00\x63\x00\x68\x00\x5f\x00\x6f\x00\x70\x00\x65\x00\x6e\x00\x5f\x00\x66\x00\x6f\x00\x63\x00\x75\x00\x73\
-\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x16\
-\x0f\x80\x4f\xa7\
-\x00\x72\
-\x00\x61\x00\x64\x00\x69\x00\x6f\x00\x5f\x00\x75\x00\x6e\x00\x63\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x65\x00\x64\x00\x40\x00\x32\
-\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x19\
-\x0e\x26\x93\xe7\
-\x00\x74\
-\x00\x6f\x00\x6f\x00\x6c\x00\x62\x00\x61\x00\x72\x00\x5f\x00\x6d\x00\x6f\x00\x76\x00\x65\x00\x5f\x00\x76\x00\x65\x00\x72\x00\x74\
-\x00\x69\x00\x63\x00\x61\x00\x6c\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x16\
-\x06\x14\xad\xc7\
-\x00\x61\
-\x00\x72\x00\x72\x00\x6f\x00\x77\x00\x5f\x00\x6c\x00\x65\x00\x66\x00\x74\x00\x5f\x00\x70\x00\x72\x00\x65\x00\x73\x00\x73\x00\x65\
-\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x14\
-\x00\x44\xa0\x47\
-\x00\x62\
-\x00\x72\x00\x61\x00\x6e\x00\x63\x00\x68\x00\x5f\x00\x65\x00\x6e\x00\x64\x00\x5f\x00\x66\x00\x6f\x00\x63\x00\x75\x00\x73\x00\x2e\
-\x00\x70\x00\x6e\x00\x67\
-\x00\x18\
-\x07\xa5\xb1\x27\
-\x00\x61\
-\x00\x72\x00\x72\x00\x6f\x00\x77\x00\x5f\x00\x72\x00\x69\x00\x67\x00\x68\x00\x74\x00\x5f\x00\x64\x00\x69\x00\x73\x00\x61\x00\x62\
-\x00\x6c\x00\x65\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x1a\
-\x04\xce\xfa\x67\
-\x00\x62\
-\x00\x72\x00\x61\x00\x6e\x00\x63\x00\x68\x00\x5f\x00\x63\x00\x6c\x00\x6f\x00\x73\x00\x65\x00\x64\x00\x5f\x00\x66\x00\x6f\x00\x63\
-\x00\x75\x00\x73\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x24\
-\x04\x0b\x8d\x27\
-\x00\x74\
-\x00\x6f\x00\x6f\x00\x6c\x00\x62\x00\x61\x00\x72\x00\x5f\x00\x6d\x00\x6f\x00\x76\x00\x65\x00\x5f\x00\x68\x00\x6f\x00\x72\x00\x69\
-\x00\x7a\x00\x6f\x00\x6e\x00\x74\x00\x61\x00\x6c\x00\x5f\x00\x64\x00\x69\x00\x73\x00\x61\x00\x62\x00\x6c\x00\x65\x00\x64\x00\x2e\
-\x00\x70\x00\x6e\x00\x67\
-\x00\x1d\
-\x04\x34\xf0\xc7\
-\x00\x6c\
-\x00\x69\x00\x6e\x00\x65\x00\x5f\x00\x76\x00\x65\x00\x72\x00\x74\x00\x69\x00\x63\x00\x61\x00\x6c\x00\x5f\x00\x64\x00\x69\x00\x73\
-\x00\x61\x00\x62\x00\x6c\x00\x65\x00\x64\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x15\
-\x0f\xac\xe3\xc7\
-\x00\x62\
-\x00\x61\x00\x73\x00\x65\x00\x5f\x00\x69\x00\x63\x00\x6f\x00\x6e\x00\x5f\x00\x70\x00\x72\x00\x65\x00\x73\x00\x73\x00\x65\x00\x64\
-\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x14\
-\x0b\x2d\x81\x07\
-\x00\x61\
-\x00\x72\x00\x72\x00\x6f\x00\x77\x00\x5f\x00\x6c\x00\x65\x00\x66\x00\x74\x00\x5f\x00\x66\x00\x6f\x00\x63\x00\x75\x00\x73\x00\x2e\
-\x00\x70\x00\x6e\x00\x67\
-\x00\x16\
-\x0a\x7a\x87\x67\
-\x00\x77\
-\x00\x69\x00\x6e\x00\x64\x00\x6f\x00\x77\x00\x5f\x00\x63\x00\x6c\x00\x6f\x00\x73\x00\x65\x00\x5f\x00\x66\x00\x6f\x00\x63\x00\x75\
-\x00\x73\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x15\
-\x06\xf8\x08\xa7\
-\x00\x62\
-\x00\x72\x00\x61\x00\x6e\x00\x63\x00\x68\x00\x5f\x00\x6d\x00\x6f\x00\x72\x00\x65\x00\x5f\x00\x66\x00\x6f\x00\x63\x00\x75\x00\x73\
-\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x0f\
-\x01\x40\x2d\xa7\
-\x00\x61\
-\x00\x72\x00\x72\x00\x6f\x00\x77\x00\x5f\x00\x75\x00\x70\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x12\
-\x04\xb5\x9d\x47\
-\x00\x62\
-\x00\x72\x00\x61\x00\x6e\x00\x63\x00\x68\x00\x5f\x00\x6f\x00\x70\x00\x65\x00\x6e\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\
-\x00\x67\
-\x00\x17\
-\x0f\x18\x45\x87\
-\x00\x61\
-\x00\x72\x00\x72\x00\x6f\x00\x77\x00\x5f\x00\x6c\x00\x65\x00\x66\x00\x74\x00\x5f\x00\x64\x00\x69\x00\x73\x00\x61\x00\x62\x00\x6c\
-\x00\x65\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x14\
-\x05\xe4\x2d\xe7\
-\x00\x62\
-\x00\x72\x00\x61\x00\x6e\x00\x63\x00\x68\x00\x5f\x00\x63\x00\x6c\x00\x6f\x00\x73\x00\x65\x00\x64\x00\x40\x00\x32\x00\x78\x00\x2e\
-\x00\x70\x00\x6e\x00\x67\
-\x00\x1b\
-\x07\xac\x39\xa7\
-\x00\x74\
-\x00\x6f\x00\x6f\x00\x6c\x00\x62\x00\x61\x00\x72\x00\x5f\x00\x6d\x00\x6f\x00\x76\x00\x65\x00\x5f\x00\x68\x00\x6f\x00\x72\x00\x69\
-\x00\x7a\x00\x6f\x00\x6e\x00\x74\x00\x61\x00\x6c\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x1b\
-\x0a\x19\xf4\xe7\
-\x00\x77\
-\x00\x69\x00\x6e\x00\x64\x00\x6f\x00\x77\x00\x5f\x00\x63\x00\x6c\x00\x6f\x00\x73\x00\x65\x00\x5f\x00\x70\x00\x72\x00\x65\x00\x73\
-\x00\x73\x00\x65\x00\x64\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x22\
-\x08\x8a\x08\x27\
-\x00\x63\
-\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x62\x00\x6f\x00\x78\x00\x5f\x00\x69\x00\x6e\x00\x64\x00\x65\x00\x74\x00\x65\x00\x72\x00\x6d\
-\x00\x69\x00\x6e\x00\x61\x00\x74\x00\x65\x00\x5f\x00\x70\x00\x72\x00\x65\x00\x73\x00\x73\x00\x65\x00\x64\x00\x2e\x00\x70\x00\x6e\
-\x00\x67\
-\x00\x16\
-\x0a\x1a\xd6\x47\
-\x00\x61\
-\x00\x72\x00\x72\x00\x6f\x00\x77\x00\x5f\x00\x64\x00\x6f\x00\x77\x00\x6e\x00\x5f\x00\x70\x00\x72\x00\x65\x00\x73\x00\x73\x00\x65\
-\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x12\
-\x04\xb1\x94\x27\
-\x00\x62\
-\x00\x72\x00\x61\x00\x6e\x00\x63\x00\x68\x00\x5f\x00\x6d\x00\x6f\x00\x72\x00\x65\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\
-\x00\x67\
-\x00\x1e\
-\x0c\xd2\xb9\x87\
-\x00\x6c\
-\x00\x69\x00\x6e\x00\x65\x00\x5f\x00\x68\x00\x6f\x00\x72\x00\x69\x00\x7a\x00\x6f\x00\x6e\x00\x74\x00\x61\x00\x6c\x00\x5f\x00\x70\
-\x00\x72\x00\x65\x00\x73\x00\x73\x00\x65\x00\x64\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x1b\
-\x08\x21\xa7\xc7\
-\x00\x62\
-\x00\x72\x00\x61\x00\x6e\x00\x63\x00\x68\x00\x5f\x00\x6f\x00\x70\x00\x65\x00\x6e\x00\x5f\x00\x64\x00\x69\x00\x73\x00\x61\x00\x62\
-\x00\x6c\x00\x65\x00\x64\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x18\
-\x05\x12\xcf\x67\
-\x00\x77\
-\x00\x69\x00\x6e\x00\x64\x00\x6f\x00\x77\x00\x5f\x00\x63\x00\x6c\x00\x6f\x00\x73\x00\x65\x00\x5f\x00\x70\x00\x72\x00\x65\x00\x73\
-\x00\x73\x00\x65\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x1c\
-\x04\x73\x5f\x47\
-\x00\x77\
-\x00\x69\x00\x6e\x00\x64\x00\x6f\x00\x77\x00\x5f\x00\x75\x00\x6e\x00\x64\x00\x6f\x00\x63\x00\x6b\x00\x5f\x00\x70\x00\x72\x00\x65\
-\x00\x73\x00\x73\x00\x65\x00\x64\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x1c\
-\x08\x2e\xd3\x67\
-\x00\x6c\
-\x00\x69\x00\x6e\x00\x65\x00\x5f\x00\x68\x00\x6f\x00\x72\x00\x69\x00\x7a\x00\x6f\x00\x6e\x00\x74\x00\x61\x00\x6c\x00\x5f\x00\x66\
-\x00\x6f\x00\x63\x00\x75\x00\x73\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x1c\
-\x00\x06\x3d\xc7\
-\x00\x72\
-\x00\x61\x00\x64\x00\x69\x00\x6f\x00\x5f\x00\x75\x00\x6e\x00\x63\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x65\x00\x64\x00\x5f\x00\x66\
-\x00\x6f\x00\x63\x00\x75\x00\x73\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x1a\
-\x0a\x14\xed\x47\
-\x00\x77\
-\x00\x69\x00\x6e\x00\x64\x00\x6f\x00\x77\x00\x5f\x00\x67\x00\x72\x00\x69\x00\x70\x00\x5f\x00\x70\x00\x72\x00\x65\x00\x73\x00\x73\
-\x00\x65\x00\x64\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x1a\
-\x0d\x33\x2d\xa7\
-\x00\x6c\
-\x00\x69\x00\x6e\x00\x65\x00\x5f\x00\x76\x00\x65\x00\x72\x00\x74\x00\x69\x00\x63\x00\x61\x00\x6c\x00\x5f\x00\x64\x00\x69\x00\x73\
-\x00\x61\x00\x62\x00\x6c\x00\x65\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x15\
-\x0b\x78\x08\xe7\
-\x00\x62\
-\x00\x72\x00\x61\x00\x6e\x00\x63\x00\x68\x00\x5f\x00\x6c\x00\x69\x00\x6e\x00\x65\x00\x5f\x00\x66\x00\x6f\x00\x63\x00\x75\x00\x73\
-\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x23\
-\x07\x14\x6d\x87\
-\x00\x63\
-\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x62\x00\x6f\x00\x78\x00\x5f\x00\x69\x00\x6e\x00\x64\x00\x65\x00\x74\x00\x65\x00\x72\x00\x6d\
-\x00\x69\x00\x6e\x00\x61\x00\x74\x00\x65\x00\x5f\x00\x66\x00\x6f\x00\x63\x00\x75\x00\x73\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\
-\x00\x6e\x00\x67\
-\x00\x1f\
-\x02\x4f\x6a\xa7\
-\x00\x72\
-\x00\x61\x00\x64\x00\x69\x00\x6f\x00\x5f\x00\x75\x00\x6e\x00\x63\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x65\x00\x64\x00\x5f\x00\x64\
-\x00\x69\x00\x73\x00\x61\x00\x62\x00\x6c\x00\x65\x00\x64\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x11\
-\x01\xf6\xff\x67\
-\x00\x62\
-\x00\x72\x00\x61\x00\x6e\x00\x63\x00\x68\x00\x5f\x00\x65\x00\x6e\x00\x64\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\
-\x00\x1e\
-\x05\x75\xad\x27\
-\x00\x74\
-\x00\x6f\x00\x6f\x00\x6c\x00\x62\x00\x61\x00\x72\x00\x5f\x00\x6d\x00\x6f\x00\x76\x00\x65\x00\x5f\x00\x68\x00\x6f\x00\x72\x00\x69\
-\x00\x7a\x00\x6f\x00\x6e\x00\x74\x00\x61\x00\x6c\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x1a\
-\x09\x2e\xa9\x47\
-\x00\x61\
-\x00\x72\x00\x72\x00\x6f\x00\x77\x00\x5f\x00\x64\x00\x6f\x00\x77\x00\x6e\x00\x5f\x00\x64\x00\x69\x00\x73\x00\x61\x00\x62\x00\x6c\
-\x00\x65\x00\x64\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x13\
-\x05\x76\x1e\x67\
-\x00\x77\
-\x00\x69\x00\x6e\x00\x64\x00\x6f\x00\x77\x00\x5f\x00\x6d\x00\x69\x00\x6e\x00\x69\x00\x6d\x00\x69\x00\x7a\x00\x65\x00\x2e\x00\x70\
-\x00\x6e\x00\x67\
-\x00\x1c\
-\x0c\xfb\xa0\x47\
-\x00\x62\
-\x00\x72\x00\x61\x00\x6e\x00\x63\x00\x68\x00\x5f\x00\x63\x00\x6c\x00\x6f\x00\x73\x00\x65\x00\x64\x00\x5f\x00\x70\x00\x72\x00\x65\
-\x00\x73\x00\x73\x00\x65\x00\x64\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x16\
-\x01\x75\xcc\x87\
-\x00\x63\
-\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x62\x00\x6f\x00\x78\x00\x5f\x00\x75\x00\x6e\x00\x63\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x65\
-\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x22\
-\x00\xa7\x99\x47\
-\x00\x74\
-\x00\x6f\x00\x6f\x00\x6c\x00\x62\x00\x61\x00\x72\x00\x5f\x00\x6d\x00\x6f\x00\x76\x00\x65\x00\x5f\x00\x76\x00\x65\x00\x72\x00\x74\
-\x00\x69\x00\x63\x00\x61\x00\x6c\x00\x5f\x00\x66\x00\x6f\x00\x63\x00\x75\x00\x73\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\
-\x00\x67\
-\x00\x15\
-\x06\x62\x08\x27\
-\x00\x62\
-\x00\x72\x00\x61\x00\x6e\x00\x63\x00\x68\x00\x5f\x00\x6f\x00\x70\x00\x65\x00\x6e\x00\x5f\x00\x66\x00\x6f\x00\x63\x00\x75\x00\x73\
-\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x23\
-\x06\xf2\x1a\x47\
-\x00\x63\
-\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x62\x00\x6f\x00\x78\x00\x5f\x00\x69\x00\x6e\x00\x64\x00\x65\x00\x74\x00\x65\x00\x72\x00\x6d\
-\x00\x69\x00\x6e\x00\x61\x00\x74\x00\x65\x00\x5f\x00\x64\x00\x69\x00\x73\x00\x61\x00\x62\x00\x6c\x00\x65\x00\x64\x00\x2e\x00\x70\
-\x00\x6e\x00\x67\
-\x00\x1a\
-\x05\x28\x8d\xa7\
-\x00\x62\
-\x00\x72\x00\x61\x00\x6e\x00\x63\x00\x68\x00\x5f\x00\x63\x00\x6c\x00\x6f\x00\x73\x00\x65\x00\x64\x00\x5f\x00\x64\x00\x69\x00\x73\
-\x00\x61\x00\x62\x00\x6c\x00\x65\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x24\
-\x05\xed\xfa\xe7\
-\x00\x74\
-\x00\x6f\x00\x6f\x00\x6c\x00\x62\x00\x61\x00\x72\x00\x5f\x00\x6d\x00\x6f\x00\x76\x00\x65\x00\x5f\x00\x68\x00\x6f\x00\x72\x00\x69\
-\x00\x7a\x00\x6f\x00\x6e\x00\x74\x00\x61\x00\x6c\x00\x5f\x00\x66\x00\x6f\x00\x63\x00\x75\x00\x73\x00\x40\x00\x32\x00\x78\x00\x2e\
-\x00\x70\x00\x6e\x00\x67\
-\x00\x18\
-\x02\x48\x15\x27\
-\x00\x77\
-\x00\x69\x00\x6e\x00\x64\x00\x6f\x00\x77\x00\x5f\x00\x67\x00\x72\x00\x69\x00\x70\x00\x5f\x00\x66\x00\x6f\x00\x63\x00\x75\x00\x73\
-\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x0d\
-\x0b\x72\x3d\x07\
-\x00\x62\
-\x00\x61\x00\x73\x00\x65\x00\x5f\x00\x69\x00\x63\x00\x6f\x00\x6e\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x12\
-\x04\xb3\x4c\x27\
-\x00\x62\
-\x00\x72\x00\x61\x00\x6e\x00\x63\x00\x68\x00\x5f\x00\x6c\x00\x69\x00\x6e\x00\x65\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\
-\x00\x67\
-\x00\x0e\
-\x06\x0c\xe6\x07\
-\x00\x61\
-\x00\x72\x00\x72\x00\x6f\x00\x77\x00\x5f\x00\x64\x00\x6f\x00\x77\x00\x6e\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x1b\
-\x0f\x79\xa3\xc7\
-\x00\x6c\
-\x00\x69\x00\x6e\x00\x65\x00\x5f\x00\x68\x00\x6f\x00\x72\x00\x69\x00\x7a\x00\x6f\x00\x6e\x00\x74\x00\x61\x00\x6c\x00\x5f\x00\x70\
-\x00\x72\x00\x65\x00\x73\x00\x73\x00\x65\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x23\
-\x03\x43\xb9\x67\
-\x00\x74\
-\x00\x6f\x00\x6f\x00\x6c\x00\x62\x00\x61\x00\x72\x00\x5f\x00\x73\x00\x65\x00\x70\x00\x61\x00\x72\x00\x61\x00\x74\x00\x6f\x00\x72\
-\x00\x5f\x00\x68\x00\x6f\x00\x72\x00\x69\x00\x7a\x00\x6f\x00\x6e\x00\x74\x00\x61\x00\x6c\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\
-\x00\x6e\x00\x67\
-\x00\x1b\
-\x0a\xfb\x2d\x27\
-\x00\x72\
-\x00\x61\x00\x64\x00\x69\x00\x6f\x00\x5f\x00\x75\x00\x6e\x00\x63\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x65\x00\x64\x00\x5f\x00\x70\
-\x00\x72\x00\x65\x00\x73\x00\x73\x00\x65\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x16\
-\x04\x9c\xa4\xa7\
-\x00\x62\
-\x00\x61\x00\x73\x00\x65\x00\x5f\x00\x69\x00\x63\x00\x6f\x00\x6e\x00\x5f\x00\x64\x00\x69\x00\x73\x00\x61\x00\x62\x00\x6c\x00\x65\
-\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x19\
-\x0e\x98\x18\x27\
-\x00\x77\
-\x00\x69\x00\x6e\x00\x64\x00\x6f\x00\x77\x00\x5f\x00\x63\x00\x6c\x00\x6f\x00\x73\x00\x65\x00\x5f\x00\x66\x00\x6f\x00\x63\x00\x75\
-\x00\x73\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x18\
-\x06\x43\xc6\xe7\
-\x00\x61\
-\x00\x72\x00\x72\x00\x6f\x00\x77\x00\x5f\x00\x72\x00\x69\x00\x67\x00\x68\x00\x74\x00\x5f\x00\x66\x00\x6f\x00\x63\x00\x75\x00\x73\
-\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x1a\
-\x04\x64\xf7\x07\
-\x00\x62\
-\x00\x72\x00\x61\x00\x6e\x00\x63\x00\x68\x00\x5f\x00\x65\x00\x6e\x00\x64\x00\x5f\x00\x64\x00\x69\x00\x73\x00\x61\x00\x62\x00\x6c\
-\x00\x65\x00\x64\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x1a\
-\x05\x11\xe0\xe7\
-\x00\x63\
-\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x62\x00\x6f\x00\x78\x00\x5f\x00\x63\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x65\x00\x64\x00\x5f\
-\x00\x66\x00\x6f\x00\x63\x00\x75\x00\x73\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x1f\
-\x06\x75\x64\x87\
-\x00\x74\
-\x00\x6f\x00\x6f\x00\x6c\x00\x62\x00\x61\x00\x72\x00\x5f\x00\x6d\x00\x6f\x00\x76\x00\x65\x00\x5f\x00\x76\x00\x65\x00\x72\x00\x74\
-\x00\x69\x00\x63\x00\x61\x00\x6c\x00\x5f\x00\x66\x00\x6f\x00\x63\x00\x75\x00\x73\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x2b\
-\x03\xd2\xba\xc7\
-\x00\x74\
-\x00\x6f\x00\x6f\x00\x6c\x00\x62\x00\x61\x00\x72\x00\x5f\x00\x73\x00\x65\x00\x70\x00\x61\x00\x72\x00\x61\x00\x74\x00\x6f\x00\x72\
-\x00\x5f\x00\x68\x00\x6f\x00\x72\x00\x69\x00\x7a\x00\x6f\x00\x6e\x00\x74\x00\x61\x00\x6c\x00\x5f\x00\x70\x00\x72\x00\x65\x00\x73\
-\x00\x73\x00\x65\x00\x64\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x1a\
-\x0f\x9a\xe5\x07\
-\x00\x62\
-\x00\x72\x00\x61\x00\x6e\x00\x63\x00\x68\x00\x5f\x00\x6f\x00\x70\x00\x65\x00\x6e\x00\x5f\x00\x70\x00\x72\x00\x65\x00\x73\x00\x73\
-\x00\x65\x00\x64\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x29\
-\x09\xe4\xb0\x07\
-\x00\x74\
-\x00\x6f\x00\x6f\x00\x6c\x00\x62\x00\x61\x00\x72\x00\x5f\x00\x73\x00\x65\x00\x70\x00\x61\x00\x72\x00\x61\x00\x74\x00\x6f\x00\x72\
-\x00\x5f\x00\x76\x00\x65\x00\x72\x00\x74\x00\x69\x00\x63\x00\x61\x00\x6c\x00\x5f\x00\x70\x00\x72\x00\x65\x00\x73\x00\x73\x00\x65\
-\x00\x64\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x25\
-\x08\x07\x7e\x87\
-\x00\x74\
-\x00\x6f\x00\x6f\x00\x6c\x00\x62\x00\x61\x00\x72\x00\x5f\x00\x6d\x00\x6f\x00\x76\x00\x65\x00\x5f\x00\x76\x00\x65\x00\x72\x00\x74\
-\x00\x69\x00\x63\x00\x61\x00\x6c\x00\x5f\x00\x64\x00\x69\x00\x73\x00\x61\x00\x62\x00\x6c\x00\x65\x00\x64\x00\x40\x00\x32\x00\x78\
-\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x12\
-\x06\xa7\x5a\x47\
-\x00\x77\
-\x00\x69\x00\x6e\x00\x64\x00\x6f\x00\x77\x00\x5f\x00\x67\x00\x72\x00\x69\x00\x70\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\
-\x00\x67\
-\x00\x1c\
-\x08\xb5\x77\x67\
-\x00\x72\
-\x00\x61\x00\x64\x00\x69\x00\x6f\x00\x5f\x00\x63\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x65\x00\x64\x00\x5f\x00\x70\x00\x72\x00\x65\
-\x00\x73\x00\x73\x00\x65\x00\x64\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x23\
-\x03\xa5\x91\x47\
-\x00\x74\
-\x00\x6f\x00\x6f\x00\x6c\x00\x62\x00\x61\x00\x72\x00\x5f\x00\x6d\x00\x6f\x00\x76\x00\x65\x00\x5f\x00\x68\x00\x6f\x00\x72\x00\x69\
-\x00\x7a\x00\x6f\x00\x6e\x00\x74\x00\x61\x00\x6c\x00\x5f\x00\x70\x00\x72\x00\x65\x00\x73\x00\x73\x00\x65\x00\x64\x00\x2e\x00\x70\
-\x00\x6e\x00\x67\
-\x00\x17\
-\x0d\xdf\xcf\xa7\
-\x00\x77\
-\x00\x69\x00\x6e\x00\x64\x00\x6f\x00\x77\x00\x5f\x00\x67\x00\x72\x00\x69\x00\x70\x00\x5f\x00\x70\x00\x72\x00\x65\x00\x73\x00\x73\
-\x00\x65\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x14\
-\x0b\x23\x21\x67\
-\x00\x61\
-\x00\x72\x00\x72\x00\x6f\x00\x77\x00\x5f\x00\x75\x00\x70\x00\x5f\x00\x70\x00\x72\x00\x65\x00\x73\x00\x73\x00\x65\x00\x64\x00\x2e\
-\x00\x70\x00\x6e\x00\x67\
-\x00\x16\
-\x07\x09\xf8\x27\
-\x00\x77\
-\x00\x69\x00\x6e\x00\x64\x00\x6f\x00\x77\x00\x5f\x00\x6d\x00\x69\x00\x6e\x00\x69\x00\x6d\x00\x69\x00\x7a\x00\x65\x00\x40\x00\x32\
-\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x1a\
-\x02\x38\x25\x07\
-\x00\x62\
-\x00\x72\x00\x61\x00\x6e\x00\x63\x00\x68\x00\x5f\x00\x6c\x00\x69\x00\x6e\x00\x65\x00\x5f\x00\x70\x00\x72\x00\x65\x00\x73\x00\x73\
-\x00\x65\x00\x64\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x1f\
-\x0b\x48\x50\x87\
-\x00\x63\
-\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x62\x00\x6f\x00\x78\x00\x5f\x00\x75\x00\x6e\x00\x63\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x65\
-\x00\x64\x00\x5f\x00\x66\x00\x6f\x00\x63\x00\x75\x00\x73\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x27\
-\x0c\xeb\xe5\x67\
-\x00\x74\
-\x00\x6f\x00\x6f\x00\x6c\x00\x62\x00\x61\x00\x72\x00\x5f\x00\x73\x00\x65\x00\x70\x00\x61\x00\x72\x00\x61\x00\x74\x00\x6f\x00\x72\
-\x00\x5f\x00\x76\x00\x65\x00\x72\x00\x74\x00\x69\x00\x63\x00\x61\x00\x6c\x00\x5f\x00\x66\x00\x6f\x00\x63\x00\x75\x00\x73\x00\x40\
-\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x1f\
-\x03\xf7\x18\x07\
-\x00\x63\
-\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x62\x00\x6f\x00\x78\x00\x5f\x00\x63\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x65\x00\x64\x00\x5f\
-\x00\x70\x00\x72\x00\x65\x00\x73\x00\x73\x00\x65\x00\x64\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x1f\
-\x0a\xae\x27\x47\
-\x00\x63\
-\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x62\x00\x6f\x00\x78\x00\x5f\x00\x75\x00\x6e\x00\x63\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x65\
-\x00\x64\x00\x5f\x00\x64\x00\x69\x00\x73\x00\x61\x00\x62\x00\x6c\x00\x65\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x19\
-\x0a\x27\x78\x07\
-\x00\x63\
-\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x62\x00\x6f\x00\x78\x00\x5f\x00\x75\x00\x6e\x00\x63\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x65\
-\x00\x64\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x13\
-\x0b\x4e\x57\xa7\
-\x00\x6c\
-\x00\x69\x00\x6e\x00\x65\x00\x5f\x00\x68\x00\x6f\x00\x72\x00\x69\x00\x7a\x00\x6f\x00\x6e\x00\x74\x00\x61\x00\x6c\x00\x2e\x00\x70\
-\x00\x6e\x00\x67\
-\x00\x13\
-\x00\xcf\x5c\xc7\
-\x00\x77\
-\x00\x69\x00\x6e\x00\x64\x00\x6f\x00\x77\x00\x5f\x00\x63\x00\x6c\x00\x6f\x00\x73\x00\x65\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\
-\x00\x6e\x00\x67\
-\x00\x1a\
-\x07\x88\x25\x07\
-\x00\x62\
-\x00\x72\x00\x61\x00\x6e\x00\x63\x00\x68\x00\x5f\x00\x6d\x00\x6f\x00\x72\x00\x65\x00\x5f\x00\x70\x00\x72\x00\x65\x00\x73\x00\x73\
-\x00\x65\x00\x64\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x11\
-\x08\xfc\x49\xe7\
-\x00\x61\
-\x00\x72\x00\x72\x00\x6f\x00\x77\x00\x5f\x00\x6c\x00\x65\x00\x66\x00\x74\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\
-\x00\x14\
-\x0a\x20\x6e\x07\
-\x00\x77\
-\x00\x69\x00\x6e\x00\x64\x00\x6f\x00\x77\x00\x5f\x00\x75\x00\x6e\x00\x64\x00\x6f\x00\x63\x00\x6b\x00\x40\x00\x32\x00\x78\x00\x2e\
-\x00\x70\x00\x6e\x00\x67\
-\x00\x0e\
-\x0d\x4e\x71\x87\
-\x00\x62\
-\x00\x72\x00\x61\x00\x6e\x00\x63\x00\x68\x00\x5f\x00\x65\x00\x6e\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x0f\
-\x00\xd6\x25\xc7\
-\x00\x62\
-\x00\x72\x00\x61\x00\x6e\x00\x63\x00\x68\x00\x5f\x00\x6c\x00\x69\x00\x6e\x00\x65\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x1a\
-\x0e\xbc\xc3\x67\
-\x00\x72\
-\x00\x61\x00\x64\x00\x69\x00\x6f\x00\x5f\x00\x63\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x65\x00\x64\x00\x5f\x00\x64\x00\x69\x00\x73\
-\x00\x61\x00\x62\x00\x6c\x00\x65\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x19\
-\x09\x5e\xb0\x07\
-\x00\x62\
-\x00\x72\x00\x61\x00\x6e\x00\x63\x00\x68\x00\x5f\x00\x65\x00\x6e\x00\x64\x00\x5f\x00\x70\x00\x72\x00\x65\x00\x73\x00\x73\x00\x65\
-\x00\x64\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x15\
-\x03\x1c\x93\x87\
-\x00\x74\
-\x00\x72\x00\x61\x00\x6e\x00\x73\x00\x70\x00\x61\x00\x72\x00\x65\x00\x6e\x00\x74\x00\x5f\x00\x66\x00\x6f\x00\x63\x00\x75\x00\x73\
-\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x17\
-\x09\x2f\xda\x87\
-\x00\x77\
-\x00\x69\x00\x6e\x00\x64\x00\x6f\x00\x77\x00\x5f\x00\x75\x00\x6e\x00\x64\x00\x6f\x00\x63\x00\x6b\x00\x5f\x00\x66\x00\x6f\x00\x63\
-\x00\x75\x00\x73\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x0f\
-\x06\x53\x25\xa7\
-\x00\x62\
-\x00\x72\x00\x61\x00\x6e\x00\x63\x00\x68\x00\x5f\x00\x6f\x00\x70\x00\x65\x00\x6e\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x19\
-\x0c\x33\x94\x27\
-\x00\x61\
-\x00\x72\x00\x72\x00\x6f\x00\x77\x00\x5f\x00\x6c\x00\x65\x00\x66\x00\x74\x00\x5f\x00\x70\x00\x72\x00\x65\x00\x73\x00\x73\x00\x65\
-\x00\x64\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x1e\
-\x0f\x96\x71\x87\
-\x00\x74\
-\x00\x6f\x00\x6f\x00\x6c\x00\x62\x00\x61\x00\x72\x00\x5f\x00\x73\x00\x65\x00\x70\x00\x61\x00\x72\x00\x61\x00\x74\x00\x6f\x00\x72\
-\x00\x5f\x00\x76\x00\x65\x00\x72\x00\x74\x00\x69\x00\x63\x00\x61\x00\x6c\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x10\
-\x00\x55\x62\x07\
-\x00\x77\
-\x00\x69\x00\x6e\x00\x64\x00\x6f\x00\x77\x00\x5f\x00\x63\x00\x6c\x00\x6f\x00\x73\x00\x65\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x19\
-\x00\x38\x7f\xa7\
-\x00\x77\
-\x00\x69\x00\x6e\x00\x64\x00\x6f\x00\x77\x00\x5f\x00\x6d\x00\x69\x00\x6e\x00\x69\x00\x6d\x00\x69\x00\x7a\x00\x65\x00\x5f\x00\x66\
-\x00\x6f\x00\x63\x00\x75\x00\x73\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x1d\
-\x0a\xd8\x81\x27\
-\x00\x72\
-\x00\x61\x00\x64\x00\x69\x00\x6f\x00\x5f\x00\x63\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x65\x00\x64\x00\x5f\x00\x64\x00\x69\x00\x73\
-\x00\x61\x00\x62\x00\x6c\x00\x65\x00\x64\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x0f\
-\x00\x6f\x04\x87\
-\x00\x77\
-\x00\x69\x00\x6e\x00\x64\x00\x6f\x00\x77\x00\x5f\x00\x67\x00\x72\x00\x69\x00\x70\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x21\
-\x0a\x51\x5f\x47\
-\x00\x63\
-\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x62\x00\x6f\x00\x78\x00\x5f\x00\x75\x00\x6e\x00\x63\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x65\
-\x00\x64\x00\x5f\x00\x70\x00\x72\x00\x65\x00\x73\x00\x73\x00\x65\x00\x64\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\
-\x00\x11\
-\x0b\xda\x30\xa7\
-\x00\x62\
-\x00\x72\x00\x61\x00\x6e\x00\x63\x00\x68\x00\x5f\x00\x63\x00\x6c\x00\x6f\x00\x73\x00\x65\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\
-\x00\x1c\
-\x08\x3f\xda\x67\
-\x00\x63\
-\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x62\x00\x6f\x00\x78\x00\x5f\x00\x75\x00\x6e\x00\x63\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x65\
-\x00\x64\x00\x5f\x00\x66\x00\x6f\x00\x63\x00\x75\x00\x73\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x26\
-\x07\x4b\x88\xe7\
-\x00\x63\
-\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x62\x00\x6f\x00\x78\x00\x5f\x00\x69\x00\x6e\x00\x64\x00\x65\x00\x74\x00\x65\x00\x72\x00\x6d\
-\x00\x69\x00\x6e\x00\x61\x00\x74\x00\x65\x00\x5f\x00\x64\x00\x69\x00\x73\x00\x61\x00\x62\x00\x6c\x00\x65\x00\x64\x00\x40\x00\x32\
-\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x1c\
-\x01\xe0\x4a\x07\
-\x00\x72\
-\x00\x61\x00\x64\x00\x69\x00\x6f\x00\x5f\x00\x75\x00\x6e\x00\x63\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x65\x00\x64\x00\x5f\x00\x64\
-\x00\x69\x00\x73\x00\x61\x00\x62\x00\x6c\x00\x65\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x22\
-\x04\x9a\x03\x67\
-\x00\x63\
-\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x62\x00\x6f\x00\x78\x00\x5f\x00\x75\x00\x6e\x00\x63\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x65\
-\x00\x64\x00\x5f\x00\x64\x00\x69\x00\x73\x00\x61\x00\x62\x00\x6c\x00\x65\x00\x64\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\
-\x00\x67\
-\x00\x2a\
-\x0f\xc4\xf7\x07\
-\x00\x74\
-\x00\x6f\x00\x6f\x00\x6c\x00\x62\x00\x61\x00\x72\x00\x5f\x00\x73\x00\x65\x00\x70\x00\x61\x00\x72\x00\x61\x00\x74\x00\x6f\x00\x72\
-\x00\x5f\x00\x76\x00\x65\x00\x72\x00\x74\x00\x69\x00\x63\x00\x61\x00\x6c\x00\x5f\x00\x64\x00\x69\x00\x73\x00\x61\x00\x62\x00\x6c\
-\x00\x65\x00\x64\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x18\
-\x06\x65\x89\xe7\
-\x00\x62\
-\x00\x72\x00\x61\x00\x6e\x00\x63\x00\x68\x00\x5f\x00\x6d\x00\x6f\x00\x72\x00\x65\x00\x5f\x00\x66\x00\x6f\x00\x63\x00\x75\x00\x73\
-\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x15\
-\x04\x90\x0a\xc7\
-\x00\x61\
-\x00\x72\x00\x72\x00\x6f\x00\x77\x00\x5f\x00\x72\x00\x69\x00\x67\x00\x68\x00\x74\x00\x5f\x00\x66\x00\x6f\x00\x63\x00\x75\x00\x73\
-\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x1c\
-\x07\x5b\xb0\x67\
-\x00\x6c\
-\x00\x69\x00\x6e\x00\x65\x00\x5f\x00\x76\x00\x65\x00\x72\x00\x74\x00\x69\x00\x63\x00\x61\x00\x6c\x00\x5f\x00\x70\x00\x72\x00\x65\
-\x00\x73\x00\x73\x00\x65\x00\x64\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x1c\
-\x01\x15\x51\xe7\
-\x00\x77\
-\x00\x69\x00\x6e\x00\x64\x00\x6f\x00\x77\x00\x5f\x00\x6d\x00\x69\x00\x6e\x00\x69\x00\x6d\x00\x69\x00\x7a\x00\x65\x00\x5f\x00\x66\
-\x00\x6f\x00\x63\x00\x75\x00\x73\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x0f\
-\x0f\x2c\x24\xc7\
-\x00\x61\
-\x00\x72\x00\x72\x00\x6f\x00\x77\x00\x5f\x00\x72\x00\x69\x00\x67\x00\x68\x00\x74\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x17\
-\x0b\xf3\xab\x27\
-\x00\x63\
-\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x62\x00\x6f\x00\x78\x00\x5f\x00\x63\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x65\x00\x64\x00\x40\
-\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x1d\
-\x08\xe1\xf6\xc7\
-\x00\x63\
-\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x62\x00\x6f\x00\x78\x00\x5f\x00\x63\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x65\x00\x64\x00\x5f\
-\x00\x66\x00\x6f\x00\x63\x00\x75\x00\x73\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x28\
-\x0f\x63\x53\xc7\
-\x00\x74\
-\x00\x6f\x00\x6f\x00\x6c\x00\x62\x00\x61\x00\x72\x00\x5f\x00\x73\x00\x65\x00\x70\x00\x61\x00\x72\x00\x61\x00\x74\x00\x6f\x00\x72\
-\x00\x5f\x00\x68\x00\x6f\x00\x72\x00\x69\x00\x7a\x00\x6f\x00\x6e\x00\x74\x00\x61\x00\x6c\x00\x5f\x00\x70\x00\x72\x00\x65\x00\x73\
-\x00\x73\x00\x65\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x15\
-\x0d\x86\xf9\xe7\
-\x00\x61\
-\x00\x72\x00\x72\x00\x6f\x00\x77\x00\x5f\x00\x75\x00\x70\x00\x5f\x00\x66\x00\x6f\x00\x63\x00\x75\x00\x73\x00\x40\x00\x32\x00\x78\
-\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x1b\
-\x00\xc1\x23\x67\
-\x00\x77\
-\x00\x69\x00\x6e\x00\x64\x00\x6f\x00\x77\x00\x5f\x00\x67\x00\x72\x00\x69\x00\x70\x00\x5f\x00\x64\x00\x69\x00\x73\x00\x61\x00\x62\
-\x00\x6c\x00\x65\x00\x64\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x12\
-\x0d\x78\xb6\x87\
-\x00\x61\
-\x00\x72\x00\x72\x00\x6f\x00\x77\x00\x5f\x00\x75\x00\x70\x00\x5f\x00\x66\x00\x6f\x00\x63\x00\x75\x00\x73\x00\x2e\x00\x70\x00\x6e\
-\x00\x67\
-\x00\x24\
-\x05\x98\x88\x87\
-\x00\x74\
-\x00\x6f\x00\x6f\x00\x6c\x00\x62\x00\x61\x00\x72\x00\x5f\x00\x6d\x00\x6f\x00\x76\x00\x65\x00\x5f\x00\x76\x00\x65\x00\x72\x00\x74\
-\x00\x69\x00\x63\x00\x61\x00\x6c\x00\x5f\x00\x70\x00\x72\x00\x65\x00\x73\x00\x73\x00\x65\x00\x64\x00\x40\x00\x32\x00\x78\x00\x2e\
-\x00\x70\x00\x6e\x00\x67\
-\x00\x26\
-\x0f\xfb\x22\x07\
-\x00\x74\
-\x00\x6f\x00\x6f\x00\x6c\x00\x62\x00\x61\x00\x72\x00\x5f\x00\x6d\x00\x6f\x00\x76\x00\x65\x00\x5f\x00\x68\x00\x6f\x00\x72\x00\x69\
-\x00\x7a\x00\x6f\x00\x6e\x00\x74\x00\x61\x00\x6c\x00\x5f\x00\x70\x00\x72\x00\x65\x00\x73\x00\x73\x00\x65\x00\x64\x00\x40\x00\x32\
-\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x19\
-\x0b\x8a\x15\xe7\
-\x00\x61\
-\x00\x72\x00\x72\x00\x6f\x00\x77\x00\x5f\x00\x64\x00\x6f\x00\x77\x00\x6e\x00\x5f\x00\x70\x00\x72\x00\x65\x00\x73\x00\x73\x00\x65\
-\x00\x64\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x17\
-\x0f\xff\xfc\x07\
-\x00\x61\
-\x00\x72\x00\x72\x00\x6f\x00\x77\x00\x5f\x00\x64\x00\x6f\x00\x77\x00\x6e\x00\x5f\x00\x64\x00\x69\x00\x73\x00\x61\x00\x62\x00\x6c\
-\x00\x65\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x26\
-\x0f\x35\xf0\xa7\
-\x00\x74\
-\x00\x6f\x00\x6f\x00\x6c\x00\x62\x00\x61\x00\x72\x00\x5f\x00\x73\x00\x65\x00\x70\x00\x61\x00\x72\x00\x61\x00\x74\x00\x6f\x00\x72\
-\x00\x5f\x00\x76\x00\x65\x00\x72\x00\x74\x00\x69\x00\x63\x00\x61\x00\x6c\x00\x5f\x00\x70\x00\x72\x00\x65\x00\x73\x00\x73\x00\x65\
-\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x1e\
-\x00\x4f\xcb\xe7\
-\x00\x63\
-\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x62\x00\x6f\x00\x78\x00\x5f\x00\x75\x00\x6e\x00\x63\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x65\
-\x00\x64\x00\x5f\x00\x70\x00\x72\x00\x65\x00\x73\x00\x73\x00\x65\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x17\
-\x0b\x9d\x16\x67\
-\x00\x62\
-\x00\x72\x00\x61\x00\x6e\x00\x63\x00\x68\x00\x5f\x00\x6d\x00\x6f\x00\x72\x00\x65\x00\x5f\x00\x70\x00\x72\x00\x65\x00\x73\x00\x73\
-\x00\x65\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x1d\
-\x06\xba\x02\xa7\
-\x00\x77\
-\x00\x69\x00\x6e\x00\x64\x00\x6f\x00\x77\x00\x5f\x00\x75\x00\x6e\x00\x64\x00\x6f\x00\x63\x00\x6b\x00\x5f\x00\x64\x00\x69\x00\x73\
-\x00\x61\x00\x62\x00\x6c\x00\x65\x00\x64\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x19\
-\x07\xb7\xa1\x47\
-\x00\x62\
-\x00\x72\x00\x61\x00\x6e\x00\x63\x00\x68\x00\x5f\x00\x63\x00\x6c\x00\x6f\x00\x73\x00\x65\x00\x64\x00\x5f\x00\x70\x00\x72\x00\x65\
-\x00\x73\x00\x73\x00\x65\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x20\
-\x07\x4e\x5a\xc7\
-\x00\x74\
-\x00\x6f\x00\x6f\x00\x6c\x00\x62\x00\x61\x00\x72\x00\x5f\x00\x73\x00\x65\x00\x70\x00\x61\x00\x72\x00\x61\x00\x74\x00\x6f\x00\x72\
-\x00\x5f\x00\x68\x00\x6f\x00\x72\x00\x69\x00\x7a\x00\x6f\x00\x6e\x00\x74\x00\x61\x00\x6c\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x17\
-\x0b\x9d\x4d\x67\
-\x00\x62\
-\x00\x72\x00\x61\x00\x6e\x00\x63\x00\x68\x00\x5f\x00\x6c\x00\x69\x00\x6e\x00\x65\x00\x5f\x00\x70\x00\x72\x00\x65\x00\x73\x00\x73\
-\x00\x65\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x0c\
-\x0b\xd0\x7a\xe7\
-\x00\x61\
-\x00\x72\x00\x72\x00\x6f\x00\x77\x00\x5f\x00\x75\x00\x70\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x1b\
-\x02\xd4\x90\x87\
-\x00\x74\
-\x00\x72\x00\x61\x00\x6e\x00\x73\x00\x70\x00\x61\x00\x72\x00\x65\x00\x6e\x00\x74\x00\x5f\x00\x64\x00\x69\x00\x73\x00\x61\x00\x62\
-\x00\x6c\x00\x65\x00\x64\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x12\
-\x04\xa2\xb3\x27\
-\x00\x61\
-\x00\x72\x00\x72\x00\x6f\x00\x77\x00\x5f\x00\x72\x00\x69\x00\x67\x00\x68\x00\x74\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\
-\x00\x67\
-\x00\x29\
-\x08\x67\xa4\xa7\
-\x00\x74\
-\x00\x6f\x00\x6f\x00\x6c\x00\x62\x00\x61\x00\x72\x00\x5f\x00\x73\x00\x65\x00\x70\x00\x61\x00\x72\x00\x61\x00\x74\x00\x6f\x00\x72\
-\x00\x5f\x00\x68\x00\x6f\x00\x72\x00\x69\x00\x7a\x00\x6f\x00\x6e\x00\x74\x00\x61\x00\x6c\x00\x5f\x00\x64\x00\x69\x00\x73\x00\x61\
-\x00\x62\x00\x6c\x00\x65\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x18\
-\x08\xd2\xa3\x27\
-\x00\x62\
-\x00\x61\x00\x73\x00\x65\x00\x5f\x00\x69\x00\x63\x00\x6f\x00\x6e\x00\x5f\x00\x70\x00\x72\x00\x65\x00\x73\x00\x73\x00\x65\x00\x64\
-\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
-\x00\x14\
-\x06\xe9\x8f\x67\
-\x00\x61\
-\x00\x72\x00\x72\x00\x6f\x00\x77\x00\x5f\x00\x64\x00\x6f\x00\x77\x00\x6e\x00\x5f\x00\x66\x00\x6f\x00\x63\x00\x75\x00\x73\x00\x2e\
-\x00\x70\x00\x6e\x00\x67\
-\x00\x1c\
-\x00\xf3\x26\x27\
-\x00\x77\
-\x00\x69\x00\x6e\x00\x64\x00\x6f\x00\x77\x00\x5f\x00\x6d\x00\x69\x00\x6e\x00\x69\x00\x6d\x00\x69\x00\x7a\x00\x65\x00\x5f\x00\x64\
-\x00\x69\x00\x73\x00\x61\x00\x62\x00\x6c\x00\x65\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\
-"
-
-qt_resource_struct_v1 = b"\
-\x00\x00\x00\x00\x00\x02\x00\x00\x00\x02\x00\x00\x00\x01\
-\x00\x00\x00\x18\x00\x02\x00\x00\x00\x01\x00\x00\x00\xd5\
-\x00\x00\x00\x00\x00\x02\x00\x00\x00\x01\x00\x00\x00\x03\
-\x00\x00\x00\x32\x00\x02\x00\x00\x00\x01\x00\x00\x00\x04\
-\x00\x00\x00\x60\x00\x02\x00\x00\x00\xd0\x00\x00\x00\x05\
-\x00\x00\x18\x4c\x00\x00\x00\x00\x00\x01\x00\x01\x3b\x76\
-\x00\x00\x07\xe8\x00\x00\x00\x00\x00\x01\x00\x00\x68\x2b\
-\x00\x00\x0d\x0e\x00\x00\x00\x00\x00\x01\x00\x00\xb6\x47\
-\x00\x00\x25\xea\x00\x00\x00\x00\x00\x01\x00\x01\xd7\xaf\
-\x00\x00\x13\x62\x00\x00\x00\x00\x00\x01\x00\x01\x04\xe1\
-\x00\x00\x03\x52\x00\x00\x00\x00\x00\x01\x00\x00\x41\xeb\
-\x00\x00\x2c\x2c\x00\x00\x00\x00\x00\x01\x00\x02\x1c\x30\
-\x00\x00\x25\xc4\x00\x00\x00\x00\x00\x01\x00\x01\xd4\xe1\
-\x00\x00\x0b\x4e\x00\x00\x00\x00\x00\x01\x00\x00\x97\x7a\
-\x00\x00\x09\xec\x00\x00\x00\x00\x00\x01\x00\x00\x88\x43\
-\x00\x00\x26\x62\x00\x00\x00\x00\x00\x01\x00\x01\xe3\xbc\
-\x00\x00\x1a\xfe\x00\x00\x00\x00\x00\x01\x00\x01\x60\x51\
-\x00\x00\x2a\x68\x00\x00\x00\x00\x00\x01\x00\x02\x0e\x25\
-\x00\x00\x23\x4e\x00\x00\x00\x00\x00\x01\x00\x01\xb5\x50\
-\x00\x00\x24\x2c\x00\x00\x00\x00\x00\x01\x00\x01\xc5\x39\
-\x00\x00\x2e\xd4\x00\x00\x00\x00\x00\x01\x00\x02\x3b\x4e\
-\x00\x00\x0a\xa6\x00\x00\x00\x00\x00\x01\x00\x00\x90\xe9\
-\x00\x00\x29\x0c\x00\x00\x00\x00\x00\x01\x00\x01\xfc\x4d\
-\x00\x00\x15\x4e\x00\x00\x00\x00\x00\x01\x00\x01\x17\x04\
-\x00\x00\x0c\xc4\x00\x00\x00\x00\x00\x01\x00\x00\xb5\xb7\
-\x00\x00\x1a\xcc\x00\x00\x00\x00\x00\x01\x00\x01\x5e\xc4\
-\x00\x00\x01\x32\x00\x00\x00\x00\x00\x01\x00\x00\x23\x58\
-\x00\x00\x11\xb4\x00\x00\x00\x00\x00\x01\x00\x00\xe4\x33\
-\x00\x00\x27\x86\x00\x00\x00\x00\x00\x01\x00\x01\xef\xdb\
-\x00\x00\x06\x00\x00\x00\x00\x00\x00\x01\x00\x00\x56\xae\
-\x00\x00\x05\x82\x00\x00\x00\x00\x00\x01\x00\x00\x55\x3f\
-\x00\x00\x19\xbe\x00\x00\x00\x00\x00\x01\x00\x01\x54\x5c\
-\x00\x00\x10\x24\x00\x00\x00\x00\x00\x01\x00\x00\xda\x1f\
-\x00\x00\x21\x90\x00\x00\x00\x00\x00\x01\x00\x01\xa5\xba\
-\x00\x00\x1c\x4c\x00\x00\x00\x00\x00\x01\x00\x01\x67\xc0\
-\x00\x00\x19\x7a\x00\x00\x00\x00\x00\x01\x00\x01\x4b\x73\
-\x00\x00\x05\x44\x00\x00\x00\x00\x00\x01\x00\x00\x52\x7b\
-\x00\x00\x09\x6e\x00\x00\x00\x00\x00\x01\x00\x00\x83\x3b\
-\x00\x00\x2d\xb2\x00\x00\x00\x00\x00\x01\x00\x02\x26\xe6\
-\x00\x00\x24\xc2\x00\x00\x00\x00\x00\x01\x00\x01\xcb\xce\
-\x00\x00\x1d\x2a\x00\x00\x00\x00\x00\x01\x00\x01\x73\x06\
-\x00\x00\x06\x88\x00\x00\x00\x00\x00\x01\x00\x00\x5e\x2e\
-\x00\x00\x0d\x3c\x00\x00\x00\x00\x00\x01\x00\x00\xc0\xd9\
-\x00\x00\x20\xb0\x00\x00\x00\x00\x00\x01\x00\x01\x9f\xd7\
-\x00\x00\x04\xa6\x00\x00\x00\x00\x00\x01\x00\x00\x48\xc0\
-\x00\x00\x1f\x0a\x00\x00\x00\x00\x00\x01\x00\x01\x8b\xeb\
-\x00\x00\x22\x62\x00\x00\x00\x00\x00\x01\x00\x01\xaa\xcc\
-\x00\x00\x14\x00\x00\x00\x00\x00\x00\x01\x00\x01\x0a\xcd\
-\x00\x00\x03\x8a\x00\x00\x00\x00\x00\x01\x00\x00\x44\x0a\
-\x00\x00\x14\x4e\x00\x00\x00\x00\x00\x01\x00\x01\x0b\x6c\
-\x00\x00\x11\xee\x00\x00\x00\x00\x00\x01\x00\x00\xe8\xc1\
-\x00\x00\x1e\x52\x00\x00\x00\x00\x00\x01\x00\x01\x87\xf8\
-\x00\x00\x17\xd0\x00\x00\x00\x00\x00\x01\x00\x01\x37\x5c\
-\x00\x00\x09\x2a\x00\x00\x00\x00\x00\x01\x00\x00\x81\xe7\
-\x00\x00\x28\x9e\x00\x00\x00\x00\x00\x01\x00\x01\xf9\x30\
-\x00\x00\x27\xc4\x00\x00\x00\x00\x00\x01\x00\x01\xf3\xf4\
-\x00\x00\x1d\xb2\x00\x00\x00\x00\x00\x01\x00\x01\x78\x31\
-\x00\x00\x2d\xee\x00\x00\x00\x00\x00\x01\x00\x02\x27\x5f\
-\x00\x00\x16\xf2\x00\x00\x00\x00\x00\x01\x00\x01\x2f\x6e\
-\x00\x00\x1c\xa2\x00\x00\x00\x00\x00\x01\x00\x01\x6f\x8a\
-\x00\x00\x15\x72\x00\x00\x00\x00\x00\x01\x00\x01\x1a\xf8\
-\x00\x00\x13\xc6\x00\x00\x00\x00\x00\x01\x00\x01\x07\x9f\
-\x00\x00\x05\x10\x00\x00\x00\x00\x00\x01\x00\x00\x4e\x5a\
-\x00\x00\x1e\x8c\x00\x00\x00\x00\x00\x01\x00\x01\x88\xc9\
-\x00\x00\x17\x9a\x00\x00\x00\x00\x00\x01\x00\x01\x34\x70\
-\x00\x00\x1b\xc4\x00\x00\x00\x00\x00\x01\x00\x01\x64\xdd\
-\x00\x00\x11\x46\x00\x00\x00\x00\x00\x01\x00\x00\xe1\xd4\
-\x00\x00\x07\xae\x00\x00\x00\x00\x00\x01\x00\x00\x67\xb2\
-\x00\x00\x03\x2c\x00\x00\x00\x00\x00\x01\x00\x00\x35\x11\
-\x00\x00\x0e\xa4\x00\x00\x00\x00\x00\x01\x00\x00\xc8\x4d\
-\x00\x00\x19\xe6\x00\x00\x00\x00\x00\x01\x00\x01\x55\x2d\
-\x00\x00\x1a\x62\x00\x00\x00\x00\x00\x01\x00\x01\x5a\x91\
-\x00\x00\x0b\xb2\x00\x00\x00\x00\x00\x01\x00\x00\xa2\x57\
-\x00\x00\x0c\x42\x00\x00\x00\x00\x00\x01\x00\x00\xb0\x58\
-\x00\x00\x2a\xce\x00\x00\x00\x00\x00\x01\x00\x02\x13\x3d\
-\x00\x00\x15\xd0\x00\x00\x00\x00\x00\x01\x00\x01\x20\x5a\
-\x00\x00\x1b\xfe\x00\x00\x00\x00\x00\x01\x00\x01\x66\x8b\
-\x00\x00\x1c\xcc\x00\x00\x00\x00\x00\x01\x00\x01\x70\x7c\
-\x00\x00\x13\x30\x00\x00\x00\x00\x00\x01\x00\x01\x02\x9f\
-\x00\x00\x09\x06\x00\x00\x00\x00\x00\x01\x00\x00\x81\x3d\
-\x00\x00\x1e\x1c\x00\x00\x00\x00\x00\x01\x00\x01\x83\x9c\
-\x00\x00\x25\x26\x00\x00\x00\x00\x00\x01\x00\x01\xce\x35\
-\x00\x00\x0e\xec\x00\x00\x00\x00\x00\x01\x00\x00\xc8\xeb\
-\x00\x00\x1b\x48\x00\x00\x00\x00\x00\x01\x00\x01\x61\x28\
-\x00\x00\x28\x68\x00\x00\x00\x00\x00\x01\x00\x01\xf8\x28\
-\x00\x00\x0a\x56\x00\x00\x00\x00\x00\x01\x00\x00\x8d\x02\
-\x00\x00\x12\x90\x00\x00\x00\x00\x00\x01\x00\x00\xf6\x83\
-\x00\x00\x1e\xc6\x00\x00\x00\x00\x00\x01\x00\x01\x8b\x5c\
-\x00\x00\x20\x48\x00\x00\x00\x00\x00\x01\x00\x01\x92\x17\
-\x00\x00\x2c\xa2\x00\x00\x00\x00\x00\x01\x00\x02\x1e\x6c\
-\x00\x00\x2e\xa6\x00\x00\x00\x00\x00\x01\x00\x02\x39\x3f\
-\x00\x00\x1b\x78\x00\x00\x00\x00\x00\x01\x00\x01\x62\xb8\
-\x00\x00\x15\x1e\x00\x00\x00\x00\x00\x01\x00\x01\x16\x5c\
-\x00\x00\x07\x3a\x00\x00\x00\x00\x00\x01\x00\x00\x63\xe4\
-\x00\x00\x21\x5e\x00\x00\x00\x00\x00\x01\x00\x01\xa4\x6f\
-\x00\x00\x19\x2e\x00\x00\x00\x00\x00\x01\x00\x01\x47\xcd\
-\x00\x00\x02\xc0\x00\x00\x00\x00\x00\x01\x00\x00\x33\xb8\
-\x00\x00\x27\x34\x00\x00\x00\x00\x00\x01\x00\x01\xeb\xec\
-\x00\x00\x2d\x1a\x00\x00\x00\x00\x00\x01\x00\x02\x23\xaf\
-\x00\x00\x04\x30\x00\x00\x00\x00\x00\x01\x00\x00\x45\xdc\
-\x00\x00\x28\xce\x00\x00\x00\x00\x00\x01\x00\x01\xfb\x51\
-\x00\x00\x05\xca\x00\x00\x00\x00\x00\x01\x00\x00\x56\x03\
-\x00\x00\x0b\x18\x00\x00\x00\x00\x00\x01\x00\x00\x96\xef\
-\x00\x00\x23\x7a\x00\x00\x00\x00\x00\x01\x00\x01\xbb\xb9\
-\x00\x00\x01\xda\x00\x00\x00\x00\x00\x01\x00\x00\x2c\x7b\
-\x00\x00\x13\x90\x00\x00\x00\x00\x00\x01\x00\x01\x05\x7a\
-\x00\x00\x15\xfe\x00\x00\x00\x00\x00\x01\x00\x01\x23\x96\
-\x00\x00\x2c\xe2\x00\x00\x00\x00\x00\x01\x00\x02\x22\x0c\
-\x00\x00\x06\x5a\x00\x00\x00\x00\x00\x01\x00\x00\x5b\xa0\
-\x00\x00\x1f\xf8\x00\x00\x00\x00\x00\x01\x00\x01\x91\x3d\
-\x00\x00\x17\x5e\x00\x00\x00\x00\x00\x01\x00\x01\x31\x04\
-\x00\x00\x18\x0e\x00\x00\x00\x00\x00\x01\x00\x01\x3a\xe9\
-\x00\x00\x26\xf6\x00\x00\x00\x00\x00\x01\x00\x01\xea\x65\
-\x00\x00\x2e\x18\x00\x00\x00\x00\x00\x01\x00\x02\x2b\xca\
-\x00\x00\x16\x76\x00\x00\x00\x00\x00\x01\x00\x01\x2b\x29\
-\x00\x00\x07\x12\x00\x00\x00\x00\x00\x01\x00\x00\x5f\xdf\
-\x00\x00\x20\x72\x00\x00\x00\x00\x00\x01\x00\x01\x94\xdf\
-\x00\x00\x06\x2e\x00\x00\x00\x00\x00\x01\x00\x00\x57\xa8\
-\x00\x00\x2e\x70\x00\x00\x00\x00\x00\x01\x00\x02\x2c\x65\
-\x00\x00\x29\xa2\x00\x00\x00\x00\x00\x01\x00\x02\x04\xaf\
-\x00\x00\x0d\xe0\x00\x00\x00\x00\x00\x01\x00\x00\xc4\x8b\
-\x00\x00\x23\xb4\x00\x00\x00\x00\x00\x01\x00\x01\xbc\xc3\
-\x00\x00\x02\x44\x00\x00\x00\x00\x00\x01\x00\x00\x2f\xce\
-\x00\x00\x02\x84\x00\x00\x00\x00\x00\x01\x00\x00\x32\xad\
-\x00\x00\x1a\x28\x00\x00\x00\x00\x00\x01\x00\x01\x56\x61\
-\x00\x00\x24\xf2\x00\x00\x00\x00\x00\x01\x00\x01\xcc\x3a\
-\x00\x00\x24\x8a\x00\x00\x00\x00\x00\x01\x00\x01\xca\xfe\
-\x00\x00\x06\xba\x00\x00\x00\x00\x00\x01\x00\x00\x5e\xbb\
-\x00\x00\x08\x60\x00\x00\x00\x00\x00\x01\x00\x00\x72\x4a\
-\x00\x00\x01\xb2\x00\x00\x00\x00\x00\x01\x00\x00\x2a\x72\
-\x00\x00\x11\x6e\x00\x00\x00\x00\x00\x01\x00\x00\xe2\x5d\
-\x00\x00\x1f\xa0\x00\x00\x00\x00\x00\x01\x00\x01\x90\x75\
-\x00\x00\x08\xd6\x00\x00\x00\x00\x00\x01\x00\x00\x7f\xa1\
-\x00\x00\x18\x8a\x00\x00\x00\x00\x00\x01\x00\x01\x43\xc9\
-\x00\x00\x16\x3a\x00\x00\x00\x00\x00\x01\x00\x01\x24\x34\
-\x00\x00\x16\xc0\x00\x00\x00\x00\x00\x01\x00\x01\x2d\x33\
-\x00\x00\x23\xdc\x00\x00\x00\x00\x00\x01\x00\x01\xc1\x39\
-\x00\x00\x22\xea\x00\x00\x00\x00\x00\x01\x00\x01\xb1\x82\
-\x00\x00\x26\x86\x00\x00\x00\x00\x00\x01\x00\x01\xe5\x72\
-\x00\x00\x14\xec\x00\x00\x00\x00\x00\x01\x00\x01\x13\x80\
-\x00\x00\x0f\x4a\x00\x00\x00\x00\x00\x01\x00\x00\xce\xcb\
-\x00\x00\x22\xa6\x00\x00\x00\x00\x00\x01\x00\x01\xaf\xf7\
-\x00\x00\x26\x22\x00\x00\x00\x00\x00\x01\x00\x01\xd8\x81\
-\x00\x00\x0f\x22\x00\x00\x00\x00\x00\x01\x00\x00\xc9\xdd\
-\x00\x00\x1d\x76\x00\x00\x00\x00\x00\x01\x00\x01\x74\x2a\
-\x00\x00\x21\x30\x00\x00\x00\x00\x00\x01\x00\x01\xa2\x41\
-\x00\x00\x14\xbe\x00\x00\x00\x00\x00\x01\x00\x01\x11\x55\
-\x00\x00\x08\x26\x00\x00\x00\x00\x00\x01\x00\x00\x6e\xe4\
-\x00\x00\x21\xca\x00\x00\x00\x00\x00\x01\x00\x01\xa6\xad\
-\x00\x00\x23\x22\x00\x00\x00\x00\x00\x01\x00\x01\xb4\xd4\
-\x00\x00\x0f\xec\x00\x00\x00\x00\x00\x01\x00\x00\xd6\x48\
-\x00\x00\x1c\x82\x00\x00\x00\x00\x00\x01\x00\x01\x6a\x9e\
-\x00\x00\x18\xfe\x00\x00\x00\x00\x00\x01\x00\x01\x47\x43\
-\x00\x00\x2b\x6e\x00\x00\x00\x00\x00\x01\x00\x02\x15\x4a\
-\x00\x00\x2c\x6e\x00\x00\x00\x00\x00\x01\x00\x02\x1d\xc7\
-\x00\x00\x2d\x60\x00\x00\x00\x00\x00\x01\x00\x02\x24\x4a\
-\x00\x00\x2d\x94\x00\x00\x00\x00\x00\x01\x00\x02\x24\xd5\
-\x00\x00\x26\xce\x00\x00\x00\x00\x00\x01\x00\x01\xe8\xd4\
-\x00\x00\x11\x0a\x00\x00\x00\x00\x00\x01\x00\x00\xe0\xfe\
-\x00\x00\x29\x6e\x00\x00\x00\x00\x00\x01\x00\x01\xff\xc4\
-\x00\x00\x00\xf2\x00\x00\x00\x00\x00\x01\x00\x00\x1f\x99\
-\x00\x00\x10\x96\x00\x00\x00\x00\x00\x01\x00\x00\xdb\x7f\
-\x00\x00\x0e\x6c\x00\x00\x00\x00\x00\x01\x00\x00\xc7\xd2\
-\x00\x00\x25\x4a\x00\x00\x00\x00\x00\x01\x00\x01\xcf\xcd\
-\x00\x00\x0f\xbc\x00\x00\x00\x00\x00\x01\x00\x00\xd4\x1f\
-\x00\x00\x0b\xe4\x00\x00\x00\x00\x00\x01\x00\x00\xaf\x31\
-\x00\x00\x09\xa8\x00\x00\x00\x00\x00\x01\x00\x00\x87\xb4\
-\x00\x00\x08\x9e\x00\x00\x00\x00\x00\x01\x00\x00\x72\xc7\
-\x00\x00\x17\x1c\x00\x00\x00\x00\x00\x01\x00\x01\x30\x76\
-\x00\x00\x0a\xde\x00\x00\x00\x00\x00\x01\x00\x00\x95\xf5\
-\x00\x00\x12\x6c\x00\x00\x00\x00\x00\x01\x00\x00\xf6\x17\
-\x00\x00\x02\xf8\x00\x00\x00\x00\x00\x01\x00\x00\x34\x42\
-\x00\x00\x22\x0e\x00\x00\x00\x00\x00\x01\x00\x01\xaa\x03\
-\x00\x00\x1a\x8e\x00\x00\x00\x00\x00\x01\x00\x01\x5b\x5d\
-\x00\x00\x0e\x02\x00\x00\x00\x00\x00\x01\x00\x00\xc6\xbd\
-\x00\x00\x00\x9e\x00\x00\x00\x00\x00\x01\x00\x00\x1f\x0d\
-\x00\x00\x18\xc4\x00\x00\x00\x00\x00\x01\x00\x01\x46\xb8\
-\x00\x00\x24\x0a\x00\x00\x00\x00\x00\x01\x00\x01\xc4\x9e\
-\x00\x00\x04\x72\x00\x00\x00\x00\x00\x01\x00\x00\x47\x31\
-\x00\x00\x2a\xa4\x00\x00\x00\x00\x00\x01\x00\x02\x11\x25\
-\x00\x00\x2a\x38\x00\x00\x00\x00\x00\x01\x00\x02\x0a\x43\
-\x00\x00\x02\x10\x00\x00\x00\x00\x00\x01\x00\x00\x2e\x25\
-\x00\x00\x20\xfc\x00\x00\x00\x00\x00\x01\x00\x01\xa0\x76\
-\x00\x00\x12\x30\x00\x00\x00\x00\x00\x01\x00\x00\xf1\x9c\
-\x00\x00\x0a\x20\x00\x00\x00\x00\x00\x01\x00\x00\x88\xcc\
-\x00\x00\x04\xdc\x00\x00\x00\x00\x00\x01\x00\x00\x4a\x76\
-\x00\x00\x12\xf8\x00\x00\x00\x00\x00\x01\x00\x01\x02\x0e\
-\x00\x00\x10\x60\x00\x00\x00\x00\x00\x01\x00\x00\xdb\x13\
-\x00\x00\x07\x6e\x00\x00\x00\x00\x00\x01\x00\x00\x64\x50\
-\x00\x00\x03\xdc\x00\x00\x00\x00\x00\x01\x00\x00\x44\xa3\
-\x00\x00\x1d\xe4\x00\x00\x00\x00\x00\x01\x00\x01\x7d\x1d\
-\x00\x00\x24\x50\x00\x00\x00\x00\x00\x01\x00\x01\xc5\xc2\
-\x00\x00\x10\xc2\x00\x00\x00\x00\x00\x01\x00\x00\xe0\x6b\
-\x00\x00\x00\x6a\x00\x00\x00\x00\x00\x01\x00\x00\x1a\xaa\
-\x00\x00\x01\x6c\x00\x00\x00\x00\x00\x01\x00\x00\x25\x38\
-\x00\x00\x15\x9c\x00\x00\x00\x00\x00\x01\x00\x01\x1e\x29\
-\x00\x00\x0c\x90\x00\x00\x00\x00\x00\x01\x00\x00\xb0\xe3\
-\x00\x00\x29\x4a\x00\x00\x00\x00\x00\x01\x00\x01\xfd\x9e\
-\x00\x00\x2b\xda\x00\x00\x00\x00\x00\x01\x00\x02\x1b\xa2\
-\x00\x00\x0d\x70\x00\x00\x00\x00\x00\x01\x00\x00\xc3\x1b\
-\x00\x00\x0b\x78\x00\x00\x00\x00\x00\x01\x00\x00\x97\xf3\
-\x00\x00\x29\xe2\x00\x00\x00\x00\x00\x01\x00\x02\x09\xa8\
-\x00\x00\x1c\xee\x00\x00\x00\x00\x00\x01\x00\x01\x72\x8a\
-\x00\x00\x0f\x84\x00\x00\x00\x00\x00\x01\x00\x00\xd0\xe7\
-\x00\x00\x12\xc6\x00\x00\x00\x00\x00\x01\x00\x00\xf9\x9e\
-\x00\x00\x25\x82\x00\x00\x00\x00\x00\x01\x00\x01\xd4\x54\
-\x00\x00\x1f\x66\x00\x00\x00\x00\x00\x01\x00\x01\x8d\x15\
-\x00\x00\x14\x8e\x00\x00\x00\x00\x00\x01\x00\x01\x0c\x69\
-\x00\x00\x28\x0e\x00\x00\x00\x00\x00\x01\x00\x01\xf7\x5c\
-\x00\x00\x0d\xa2\x00\x00\x00\x00\x00\x01\x00\x00\xc3\xb7\
-\x00\x00\x0e\x36\x00\x00\x00\x00\x00\x01\x00\x00\xc7\x59\
-\x00\x00\x2b\x1c\x00\x00\x00\x00\x00\x01\x00\x02\x14\x12\
-\x00\x00\x2b\xa6\x00\x00\x00\x00\x00\x01\x00\x02\x19\x7c\
-\x00\x00\x00\x32\x00\x02\x00\x00\x00\x01\x00\x00\x00\xd6\
-\x00\x00\x00\x40\x00\x01\x00\x00\x00\x01\x00\x00\x00\x00\
-"
-
-qt_resource_struct_v2 = b"\
-\x00\x00\x00\x00\x00\x02\x00\x00\x00\x02\x00\x00\x00\x01\
-\x00\x00\x00\x00\x00\x00\x00\x00\
-\x00\x00\x00\x18\x00\x02\x00\x00\x00\x01\x00\x00\x00\xd5\
-\x00\x00\x00\x00\x00\x00\x00\x00\
-\x00\x00\x00\x00\x00\x02\x00\x00\x00\x01\x00\x00\x00\x03\
-\x00\x00\x00\x00\x00\x00\x00\x00\
-\x00\x00\x00\x32\x00\x02\x00\x00\x00\x01\x00\x00\x00\x04\
-\x00\x00\x00\x00\x00\x00\x00\x00\
-\x00\x00\x00\x60\x00\x02\x00\x00\x00\xd0\x00\x00\x00\x05\
-\x00\x00\x00\x00\x00\x00\x00\x00\
-\x00\x00\x18\x4c\x00\x00\x00\x00\x00\x01\x00\x01\x3b\x76\
-\x00\x00\x01\x81\x15\x91\x87\xb0\
-\x00\x00\x07\xe8\x00\x00\x00\x00\x00\x01\x00\x00\x68\x2b\
-\x00\x00\x01\x81\x15\x91\x88\x41\
-\x00\x00\x0d\x0e\x00\x00\x00\x00\x00\x01\x00\x00\xb6\x47\
-\x00\x00\x01\x81\x15\x91\x87\x94\
-\x00\x00\x25\xea\x00\x00\x00\x00\x00\x01\x00\x01\xd7\xaf\
-\x00\x00\x01\x81\x15\x91\x86\x7f\
-\x00\x00\x13\x62\x00\x00\x00\x00\x00\x01\x00\x01\x04\xe1\
-\x00\x00\x01\x81\x15\x91\x84\xf5\
-\x00\x00\x03\x52\x00\x00\x00\x00\x00\x01\x00\x00\x41\xeb\
-\x00\x00\x01\x81\x15\x91\x86\x9e\
-\x00\x00\x2c\x2c\x00\x00\x00\x00\x00\x01\x00\x02\x1c\x30\
-\x00\x00\x01\x81\x15\x91\x85\x87\
-\x00\x00\x25\xc4\x00\x00\x00\x00\x00\x01\x00\x01\xd4\xe1\
-\x00\x00\x01\x81\x15\x91\x86\x4c\
-\x00\x00\x0b\x4e\x00\x00\x00\x00\x00\x01\x00\x00\x97\x7a\
-\x00\x00\x01\x81\x15\x91\x88\x2e\
-\x00\x00\x09\xec\x00\x00\x00\x00\x00\x01\x00\x00\x88\x43\
-\x00\x00\x01\x81\x15\x91\x85\xba\
-\x00\x00\x26\x62\x00\x00\x00\x00\x00\x01\x00\x01\xe3\xbc\
-\x00\x00\x01\x81\x15\x91\x86\x5c\
-\x00\x00\x1a\xfe\x00\x00\x00\x00\x00\x01\x00\x01\x60\x51\
-\x00\x00\x01\x81\x15\x91\x87\xe7\
-\x00\x00\x2a\x68\x00\x00\x00\x00\x00\x01\x00\x02\x0e\x25\
-\x00\x00\x01\x81\x15\x91\x88\x51\
-\x00\x00\x23\x4e\x00\x00\x00\x00\x00\x01\x00\x01\xb5\x50\
-\x00\x00\x01\x81\x15\x91\x88\x3d\
-\x00\x00\x24\x2c\x00\x00\x00\x00\x00\x01\x00\x01\xc5\x39\
-\x00\x00\x01\x81\x15\x91\x85\x07\
-\x00\x00\x2e\xd4\x00\x00\x00\x00\x00\x01\x00\x02\x3b\x4e\
-\x00\x00\x01\x81\x15\x91\x86\x7c\
-\x00\x00\x0a\xa6\x00\x00\x00\x00\x00\x01\x00\x00\x90\xe9\
-\x00\x00\x01\x81\x15\x91\x85\xd5\
-\x00\x00\x29\x0c\x00\x00\x00\x00\x00\x01\x00\x01\xfc\x4d\
-\x00\x00\x01\x81\x15\x91\x88\x67\
-\x00\x00\x15\x4e\x00\x00\x00\x00\x00\x01\x00\x01\x17\x04\
-\x00\x00\x01\x81\x15\x91\x86\xbe\
-\x00\x00\x0c\xc4\x00\x00\x00\x00\x00\x01\x00\x00\xb5\xb7\
-\x00\x00\x01\x81\x15\x91\x86\x10\
-\x00\x00\x1a\xcc\x00\x00\x00\x00\x00\x01\x00\x01\x5e\xc4\
-\x00\x00\x01\x81\x15\x91\x85\x6a\
-\x00\x00\x01\x32\x00\x00\x00\x00\x00\x01\x00\x00\x23\x58\
-\x00\x00\x01\x81\x15\x91\x85\x54\
-\x00\x00\x11\xb4\x00\x00\x00\x00\x00\x01\x00\x00\xe4\x33\
-\x00\x00\x01\x81\x15\x91\x86\xbe\
-\x00\x00\x27\x86\x00\x00\x00\x00\x00\x01\x00\x01\xef\xdb\
-\x00\x00\x01\x81\x15\x91\x85\xda\
-\x00\x00\x06\x00\x00\x00\x00\x00\x00\x01\x00\x00\x56\xae\
-\x00\x00\x01\x81\x15\x91\x87\x84\
-\x00\x00\x05\x82\x00\x00\x00\x00\x00\x01\x00\x00\x55\x3f\
-\x00\x00\x01\x81\x15\x91\x88\x17\
-\x00\x00\x19\xbe\x00\x00\x00\x00\x00\x01\x00\x01\x54\x5c\
-\x00\x00\x01\x81\x15\x91\x86\xec\
-\x00\x00\x10\x24\x00\x00\x00\x00\x00\x01\x00\x00\xda\x1f\
-\x00\x00\x01\x81\x15\x91\x86\xfc\
-\x00\x00\x21\x90\x00\x00\x00\x00\x00\x01\x00\x01\xa5\xba\
-\x00\x00\x01\x81\x15\x91\x87\x0c\
-\x00\x00\x1c\x4c\x00\x00\x00\x00\x00\x01\x00\x01\x67\xc0\
-\x00\x00\x01\x81\x15\x91\x88\x57\
-\x00\x00\x19\x7a\x00\x00\x00\x00\x00\x01\x00\x01\x4b\x73\
-\x00\x00\x01\x81\x15\x91\x87\xaa\
-\x00\x00\x05\x44\x00\x00\x00\x00\x00\x01\x00\x00\x52\x7b\
-\x00\x00\x01\x81\x15\x91\x85\x54\
-\x00\x00\x09\x6e\x00\x00\x00\x00\x00\x01\x00\x00\x83\x3b\
-\x00\x00\x01\x81\x15\x91\x86\xae\
-\x00\x00\x2d\xb2\x00\x00\x00\x00\x00\x01\x00\x02\x26\xe6\
-\x00\x00\x01\x81\x15\x91\x88\x33\
-\x00\x00\x24\xc2\x00\x00\x00\x00\x00\x01\x00\x01\xcb\xce\
-\x00\x00\x01\x81\x15\x91\x86\x4c\
-\x00\x00\x1d\x2a\x00\x00\x00\x00\x00\x01\x00\x01\x73\x06\
-\x00\x00\x01\x81\x15\x91\x87\xfb\
-\x00\x00\x06\x88\x00\x00\x00\x00\x00\x01\x00\x00\x5e\x2e\
-\x00\x00\x01\x81\x15\x91\x87\x75\
-\x00\x00\x0d\x3c\x00\x00\x00\x00\x00\x01\x00\x00\xc0\xd9\
-\x00\x00\x01\x81\x15\x91\x84\x9c\
-\x00\x00\x20\xb0\x00\x00\x00\x00\x00\x01\x00\x01\x9f\xd7\
-\x00\x00\x01\x81\x15\x91\x85\xf9\
-\x00\x00\x04\xa6\x00\x00\x00\x00\x00\x01\x00\x00\x48\xc0\
-\x00\x00\x01\x81\x15\x91\x86\x5c\
-\x00\x00\x1f\x0a\x00\x00\x00\x00\x00\x01\x00\x01\x8b\xeb\
-\x00\x00\x01\x81\x15\x91\x88\x13\
-\x00\x00\x22\x62\x00\x00\x00\x00\x00\x01\x00\x01\xaa\xcc\
-\x00\x00\x01\x81\x15\x91\x87\x4e\
-\x00\x00\x14\x00\x00\x00\x00\x00\x00\x01\x00\x01\x0a\xcd\
-\x00\x00\x01\x81\x15\x91\x85\xf9\
-\x00\x00\x03\x8a\x00\x00\x00\x00\x00\x01\x00\x00\x44\x0a\
-\x00\x00\x01\x81\x15\x91\x86\x2b\
-\x00\x00\x14\x4e\x00\x00\x00\x00\x00\x01\x00\x01\x0b\x6c\
-\x00\x00\x01\x81\x15\x91\x87\x88\
-\x00\x00\x11\xee\x00\x00\x00\x00\x00\x01\x00\x00\xe8\xc1\
-\x00\x00\x01\x81\x15\x91\x87\xb5\
-\x00\x00\x1e\x52\x00\x00\x00\x00\x00\x01\x00\x01\x87\xf8\
-\x00\x00\x01\x81\x15\x91\x86\xec\
-\x00\x00\x17\xd0\x00\x00\x00\x00\x00\x01\x00\x01\x37\x5c\
-\x00\x00\x01\x81\x15\x91\x88\x7c\
-\x00\x00\x09\x2a\x00\x00\x00\x00\x00\x01\x00\x00\x81\xe7\
-\x00\x00\x01\x81\x15\x91\x88\x62\
-\x00\x00\x28\x9e\x00\x00\x00\x00\x00\x01\x00\x01\xf9\x30\
-\x00\x00\x01\x81\x15\x91\x84\x9c\
-\x00\x00\x27\xc4\x00\x00\x00\x00\x00\x01\x00\x01\xf3\xf4\
-\x00\x00\x01\x81\x15\x91\x87\x69\
-\x00\x00\x1d\xb2\x00\x00\x00\x00\x00\x01\x00\x01\x78\x31\
-\x00\x00\x01\x81\x15\x91\x84\xbb\
-\x00\x00\x2d\xee\x00\x00\x00\x00\x00\x01\x00\x02\x27\x5f\
-\x00\x00\x01\x81\x15\x91\x86\xae\
-\x00\x00\x16\xf2\x00\x00\x00\x00\x00\x01\x00\x01\x2f\x6e\
-\x00\x00\x01\x81\x15\x91\x87\x0c\
-\x00\x00\x1c\xa2\x00\x00\x00\x00\x00\x01\x00\x01\x6f\x8a\
-\x00\x00\x01\x81\x15\x91\x86\xfc\
-\x00\x00\x15\x72\x00\x00\x00\x00\x00\x01\x00\x01\x1a\xf8\
-\x00\x00\x01\x81\x15\x91\x87\x0c\
-\x00\x00\x13\xc6\x00\x00\x00\x00\x00\x01\x00\x01\x07\x9f\
-\x00\x00\x01\x81\x15\x91\x86\xec\
-\x00\x00\x05\x10\x00\x00\x00\x00\x00\x01\x00\x00\x4e\x5a\
-\x00\x00\x01\x81\x15\x91\x86\xcd\
-\x00\x00\x1e\x8c\x00\x00\x00\x00\x00\x01\x00\x01\x88\xc9\
-\x00\x00\x01\x81\x15\x91\x85\x52\
-\x00\x00\x17\x9a\x00\x00\x00\x00\x00\x01\x00\x01\x34\x70\
-\x00\x00\x01\x81\x15\x91\x86\x5c\
-\x00\x00\x1b\xc4\x00\x00\x00\x00\x00\x01\x00\x01\x64\xdd\
-\x00\x00\x01\x81\x15\x91\x84\xcb\
-\x00\x00\x11\x46\x00\x00\x00\x00\x00\x01\x00\x00\xe1\xd4\
-\x00\x00\x01\x81\x15\x91\x85\xa9\
-\x00\x00\x07\xae\x00\x00\x00\x00\x00\x01\x00\x00\x67\xb2\
-\x00\x00\x01\x81\x15\x91\x88\x39\
-\x00\x00\x03\x2c\x00\x00\x00\x00\x00\x01\x00\x00\x35\x11\
-\x00\x00\x01\x81\x15\x91\x86\xcd\
-\x00\x00\x0e\xa4\x00\x00\x00\x00\x00\x01\x00\x00\xc8\x4d\
-\x00\x00\x01\x81\x15\x91\x85\xf9\
-\x00\x00\x19\xe6\x00\x00\x00\x00\x00\x01\x00\x01\x55\x2d\
-\x00\x00\x01\x81\x15\x91\x87\xc3\
-\x00\x00\x1a\x62\x00\x00\x00\x00\x00\x01\x00\x01\x5a\x91\
-\x00\x00\x01\x81\x15\x91\x86\x6b\
-\x00\x00\x0b\xb2\x00\x00\x00\x00\x00\x01\x00\x00\xa2\x57\
-\x00\x00\x01\x81\x15\x91\x86\xdd\
-\x00\x00\x0c\x42\x00\x00\x00\x00\x00\x01\x00\x00\xb0\x58\
-\x00\x00\x01\x81\x15\x91\x86\x3d\
-\x00\x00\x2a\xce\x00\x00\x00\x00\x00\x01\x00\x02\x13\x3d\
-\x00\x00\x01\x81\x15\x91\x87\xec\
-\x00\x00\x15\xd0\x00\x00\x00\x00\x00\x01\x00\x01\x20\x5a\
-\x00\x00\x01\x81\x15\x91\x86\xdd\
-\x00\x00\x1b\xfe\x00\x00\x00\x00\x00\x01\x00\x01\x66\x8b\
-\x00\x00\x01\x81\x15\x91\x87\xd5\
-\x00\x00\x1c\xcc\x00\x00\x00\x00\x00\x01\x00\x01\x70\x7c\
-\x00\x00\x01\x81\x15\x91\x84\x48\
-\x00\x00\x13\x30\x00\x00\x00\x00\x00\x01\x00\x01\x02\x9f\
-\x00\x00\x01\x81\x15\x91\x84\x87\
-\x00\x00\x09\x06\x00\x00\x00\x00\x00\x01\x00\x00\x81\x3d\
-\x00\x00\x01\x81\x15\x91\x85\x1a\
-\x00\x00\x1e\x1c\x00\x00\x00\x00\x00\x01\x00\x01\x83\x9c\
-\x00\x00\x01\x81\x15\x91\x86\xbe\
-\x00\x00\x25\x26\x00\x00\x00\x00\x00\x01\x00\x01\xce\x35\
-\x00\x00\x01\x81\x15\x91\x85\x2e\
-\x00\x00\x0e\xec\x00\x00\x00\x00\x00\x01\x00\x00\xc8\xeb\
-\x00\x00\x01\x81\x15\x91\x86\xfc\
-\x00\x00\x1b\x48\x00\x00\x00\x00\x00\x01\x00\x01\x61\x28\
-\x00\x00\x01\x81\x15\x91\x85\x34\
-\x00\x00\x28\x68\x00\x00\x00\x00\x00\x01\x00\x01\xf8\x28\
-\x00\x00\x01\x81\x15\x91\x87\x0c\
-\x00\x00\x0a\x56\x00\x00\x00\x00\x00\x01\x00\x00\x8d\x02\
-\x00\x00\x01\x81\x15\x91\x87\x61\
-\x00\x00\x12\x90\x00\x00\x00\x00\x00\x01\x00\x00\xf6\x83\
-\x00\x00\x01\x81\x15\x91\x87\x23\
-\x00\x00\x1e\xc6\x00\x00\x00\x00\x00\x01\x00\x01\x8b\x5c\
-\x00\x00\x01\x81\x15\x91\x86\x13\
-\x00\x00\x20\x48\x00\x00\x00\x00\x00\x01\x00\x01\x92\x17\
-\x00\x00\x01\x81\x15\x91\x88\x4e\
-\x00\x00\x2c\xa2\x00\x00\x00\x00\x00\x01\x00\x02\x1e\x6c\
-\x00\x00\x01\x81\x15\x91\x88\x75\
-\x00\x00\x2e\xa6\x00\x00\x00\x00\x00\x01\x00\x02\x39\x3f\
-\x00\x00\x01\x81\x15\x91\x84\x65\
-\x00\x00\x1b\x78\x00\x00\x00\x00\x00\x01\x00\x01\x62\xb8\
-\x00\x00\x01\x81\x15\x91\x85\x54\
-\x00\x00\x15\x1e\x00\x00\x00\x00\x00\x01\x00\x01\x16\x5c\
-\x00\x00\x01\x81\x15\x91\x85\x27\
-\x00\x00\x07\x3a\x00\x00\x00\x00\x00\x01\x00\x00\x63\xe4\
-\x00\x00\x01\x81\x15\x91\x86\x4c\
-\x00\x00\x21\x5e\x00\x00\x00\x00\x00\x01\x00\x01\xa4\x6f\
-\x00\x00\x01\x81\x15\x91\x88\x5e\
-\x00\x00\x19\x2e\x00\x00\x00\x00\x00\x01\x00\x01\x47\xcd\
-\x00\x00\x01\x81\x15\x91\x87\x5d\
-\x00\x00\x02\xc0\x00\x00\x00\x00\x00\x01\x00\x00\x33\xb8\
-\x00\x00\x01\x81\x15\x91\x85\xbd\
-\x00\x00\x27\x34\x00\x00\x00\x00\x00\x01\x00\x01\xeb\xec\
-\x00\x00\x01\x81\x15\x91\x87\x58\
-\x00\x00\x2d\x1a\x00\x00\x00\x00\x00\x01\x00\x02\x23\xaf\
-\x00\x00\x01\x81\x15\x91\x86\x1f\
-\x00\x00\x04\x30\x00\x00\x00\x00\x00\x01\x00\x00\x45\xdc\
-\x00\x00\x01\x81\x15\x91\x88\x6b\
-\x00\x00\x28\xce\x00\x00\x00\x00\x00\x01\x00\x01\xfb\x51\
-\x00\x00\x01\x81\x15\x91\x87\x90\
-\x00\x00\x05\xca\x00\x00\x00\x00\x00\x01\x00\x00\x56\x03\
-\x00\x00\x01\x81\x15\x91\x85\x1d\
-\x00\x00\x0b\x18\x00\x00\x00\x00\x00\x01\x00\x00\x96\xef\
-\x00\x00\x01\x81\x15\x91\x85\x0a\
-\x00\x00\x23\x7a\x00\x00\x00\x00\x00\x01\x00\x01\xbb\xb9\
-\x00\x00\x01\x81\x15\x91\x87\x0c\
-\x00\x00\x01\xda\x00\x00\x00\x00\x00\x01\x00\x00\x2c\x7b\
-\x00\x00\x01\x81\x15\x91\x85\x31\
-\x00\x00\x13\x90\x00\x00\x00\x00\x00\x01\x00\x01\x05\x7a\
-\x00\x00\x01\x81\x15\x91\x84\x8c\
-\x00\x00\x15\xfe\x00\x00\x00\x00\x00\x01\x00\x01\x23\x96\
-\x00\x00\x01\x81\x15\x91\x85\xe9\
-\x00\x00\x2c\xe2\x00\x00\x00\x00\x00\x01\x00\x02\x22\x0c\
-\x00\x00\x01\x81\x15\x91\x84\xdb\
-\x00\x00\x06\x5a\x00\x00\x00\x00\x00\x01\x00\x00\x5b\xa0\
-\x00\x00\x01\x81\x15\x91\x85\x46\
-\x00\x00\x1f\xf8\x00\x00\x00\x00\x00\x01\x00\x01\x91\x3d\
-\x00\x00\x01\x81\x15\x91\x87\xe3\
-\x00\x00\x17\x5e\x00\x00\x00\x00\x00\x01\x00\x01\x31\x04\
-\x00\x00\x01\x81\x15\x91\x87\x1b\
-\x00\x00\x18\x0e\x00\x00\x00\x00\x00\x01\x00\x01\x3a\xe9\
-\x00\x00\x01\x81\x15\x91\x87\x7d\
-\x00\x00\x26\xf6\x00\x00\x00\x00\x00\x01\x00\x01\xea\x65\
-\x00\x00\x01\x81\x15\x91\x85\x7d\
-\x00\x00\x2e\x18\x00\x00\x00\x00\x00\x01\x00\x02\x2b\xca\
-\x00\x00\x01\x81\x15\x91\x86\x28\
-\x00\x00\x16\x76\x00\x00\x00\x00\x00\x01\x00\x01\x2b\x29\
-\x00\x00\x01\x81\x15\x91\x85\x54\
-\x00\x00\x07\x12\x00\x00\x00\x00\x00\x01\x00\x00\x5f\xdf\
-\x00\x00\x01\x81\x15\x91\x86\x9e\
-\x00\x00\x20\x72\x00\x00\x00\x00\x00\x01\x00\x01\x94\xdf\
-\x00\x00\x01\x81\x15\x91\x87\xa3\
-\x00\x00\x06\x2e\x00\x00\x00\x00\x00\x01\x00\x00\x57\xa8\
-\x00\x00\x01\x81\x15\x91\x85\xda\
-\x00\x00\x2e\x70\x00\x00\x00\x00\x00\x01\x00\x02\x2c\x65\
-\x00\x00\x01\x81\x15\x91\x86\xdd\
-\x00\x00\x29\xa2\x00\x00\x00\x00\x00\x01\x00\x02\x04\xaf\
-\x00\x00\x01\x81\x15\x91\x87\x48\
-\x00\x00\x0d\xe0\x00\x00\x00\x00\x00\x01\x00\x00\xc4\x8b\
-\x00\x00\x01\x81\x15\x91\x84\x7c\
-\x00\x00\x23\xb4\x00\x00\x00\x00\x00\x01\x00\x01\xbc\xc3\
-\x00\x00\x01\x81\x15\x91\x86\xae\
-\x00\x00\x02\x44\x00\x00\x00\x00\x00\x01\x00\x00\x2f\xce\
-\x00\x00\x01\x81\x15\x91\x85\x4f\
-\x00\x00\x02\x84\x00\x00\x00\x00\x00\x01\x00\x00\x32\xad\
-\x00\x00\x01\x81\x15\x91\x87\x0c\
-\x00\x00\x1a\x28\x00\x00\x00\x00\x00\x01\x00\x01\x56\x61\
-\x00\x00\x01\x81\x15\x91\x86\x9e\
-\x00\x00\x24\xf2\x00\x00\x00\x00\x00\x01\x00\x01\xcc\x3a\
-\x00\x00\x01\x81\x15\x91\x86\x8f\
-\x00\x00\x24\x8a\x00\x00\x00\x00\x00\x01\x00\x01\xca\xfe\
-\x00\x00\x01\x81\x15\x91\x86\xfc\
-\x00\x00\x06\xba\x00\x00\x00\x00\x00\x01\x00\x00\x5e\xbb\
-\x00\x00\x01\x81\x15\x91\x88\x0d\
-\x00\x00\x08\x60\x00\x00\x00\x00\x00\x01\x00\x00\x72\x4a\
-\x00\x00\x01\x81\x15\x91\x85\x93\
-\x00\x00\x01\xb2\x00\x00\x00\x00\x00\x01\x00\x00\x2a\x72\
-\x00\x00\x01\x81\x15\x91\x86\x7f\
-\x00\x00\x11\x6e\x00\x00\x00\x00\x00\x01\x00\x00\xe2\x5d\
-\x00\x00\x01\x81\x15\x91\x85\x54\
-\x00\x00\x1f\xa0\x00\x00\x00\x00\x00\x01\x00\x01\x90\x75\
-\x00\x00\x01\x81\x15\x91\x88\x2b\
-\x00\x00\x08\xd6\x00\x00\x00\x00\x00\x01\x00\x00\x7f\xa1\
-\x00\x00\x01\x81\x15\x91\x86\x6b\
-\x00\x00\x18\x8a\x00\x00\x00\x00\x00\x01\x00\x01\x43\xc9\
-\x00\x00\x01\x81\x15\x91\x88\x5b\
-\x00\x00\x16\x3a\x00\x00\x00\x00\x00\x01\x00\x01\x24\x34\
-\x00\x00\x01\x81\x15\x91\x88\x4a\
-\x00\x00\x16\xc0\x00\x00\x00\x00\x00\x01\x00\x01\x2d\x33\
-\x00\x00\x01\x81\x15\x91\x84\x72\
-\x00\x00\x23\xdc\x00\x00\x00\x00\x00\x01\x00\x01\xc1\x39\
-\x00\x00\x01\x81\x15\x91\x88\x70\
-\x00\x00\x22\xea\x00\x00\x00\x00\x00\x01\x00\x01\xb1\x82\
-\x00\x00\x01\x81\x15\x91\x87\x66\
-\x00\x00\x26\x86\x00\x00\x00\x00\x00\x01\x00\x01\xe5\x72\
-\x00\x00\x01\x81\x15\x91\x87\x72\
-\x00\x00\x14\xec\x00\x00\x00\x00\x00\x01\x00\x01\x13\x80\
-\x00\x00\x01\x81\x15\x91\x86\x5c\
-\x00\x00\x0f\x4a\x00\x00\x00\x00\x00\x01\x00\x00\xce\xcb\
-\x00\x00\x01\x81\x15\x91\x86\x8f\
-\x00\x00\x22\xa6\x00\x00\x00\x00\x00\x01\x00\x01\xaf\xf7\
-\x00\x00\x01\x81\x15\x91\x85\x74\
-\x00\x00\x26\x22\x00\x00\x00\x00\x00\x01\x00\x01\xd8\x81\
-\x00\x00\x01\x81\x15\x91\x87\x99\
-\x00\x00\x0f\x22\x00\x00\x00\x00\x00\x01\x00\x00\xc9\xdd\
-\x00\x00\x01\x81\x15\x91\x85\xc6\
-\x00\x00\x1d\x76\x00\x00\x00\x00\x00\x01\x00\x01\x74\x2a\
-\x00\x00\x01\x81\x15\x91\x85\xe9\
-\x00\x00\x21\x30\x00\x00\x00\x00\x00\x01\x00\x01\xa2\x41\
-\x00\x00\x01\x81\x15\x91\x84\xac\
-\x00\x00\x14\xbe\x00\x00\x00\x00\x00\x01\x00\x01\x11\x55\
-\x00\x00\x01\x81\x15\x91\x84\x84\
-\x00\x00\x08\x26\x00\x00\x00\x00\x00\x01\x00\x00\x6e\xe4\
-\x00\x00\x01\x81\x15\x91\x88\x79\
-\x00\x00\x21\xca\x00\x00\x00\x00\x00\x01\x00\x01\xa6\xad\
-\x00\x00\x01\x81\x15\x91\x87\x6e\
-\x00\x00\x23\x22\x00\x00\x00\x00\x00\x01\x00\x01\xb4\xd4\
-\x00\x00\x01\x81\x15\x91\x85\x8b\
-\x00\x00\x0f\xec\x00\x00\x00\x00\x00\x01\x00\x00\xd6\x48\
-\x00\x00\x01\x81\x15\x91\x85\xda\
-\x00\x00\x1c\x82\x00\x00\x00\x00\x00\x01\x00\x01\x6a\x9e\
-\x00\x00\x01\x81\x15\x91\x84\xac\
-\x00\x00\x18\xfe\x00\x00\x00\x00\x00\x01\x00\x01\x47\x43\
-\x00\x00\x01\x81\x15\x91\x85\x0d\
-\x00\x00\x2b\x6e\x00\x00\x00\x00\x00\x01\x00\x02\x15\x4a\
-\x00\x00\x01\x81\x15\x91\x86\x9e\
-\x00\x00\x2c\x6e\x00\x00\x00\x00\x00\x01\x00\x02\x1d\xc7\
-\x00\x00\x01\x81\x15\x91\x85\x2a\
-\x00\x00\x2d\x60\x00\x00\x00\x00\x00\x01\x00\x02\x24\x4a\
-\x00\x00\x01\x81\x15\x91\x85\x17\
-\x00\x00\x2d\x94\x00\x00\x00\x00\x00\x01\x00\x02\x24\xd5\
-\x00\x00\x01\x81\x15\x91\x84\x9c\
-\x00\x00\x26\xce\x00\x00\x00\x00\x00\x01\x00\x01\xe8\xd4\
-\x00\x00\x01\x81\x15\x91\x84\xcb\
-\x00\x00\x11\x0a\x00\x00\x00\x00\x00\x01\x00\x00\xe0\xfe\
-\x00\x00\x01\x81\x15\x91\x86\x7f\
-\x00\x00\x29\x6e\x00\x00\x00\x00\x00\x01\x00\x01\xff\xc4\
-\x00\x00\x01\x81\x15\x91\x87\x3e\
-\x00\x00\x00\xf2\x00\x00\x00\x00\x00\x01\x00\x00\x1f\x99\
-\x00\x00\x01\x81\x15\x91\x87\x53\
-\x00\x00\x10\x96\x00\x00\x00\x00\x00\x01\x00\x00\xdb\x7f\
-\x00\x00\x01\x81\x15\x91\x84\xbb\
-\x00\x00\x0e\x6c\x00\x00\x00\x00\x00\x01\x00\x00\xc7\xd2\
-\x00\x00\x01\x81\x15\x91\x85\x9c\
-\x00\x00\x25\x4a\x00\x00\x00\x00\x00\x01\x00\x01\xcf\xcd\
-\x00\x00\x01\x81\x15\x91\x86\xae\
-\x00\x00\x0f\xbc\x00\x00\x00\x00\x00\x01\x00\x00\xd4\x1f\
-\x00\x00\x01\x81\x15\x91\x84\x9c\
-\x00\x00\x0b\xe4\x00\x00\x00\x00\x00\x01\x00\x00\xaf\x31\
-\x00\x00\x01\x81\x15\x91\x88\x09\
-\x00\x00\x09\xa8\x00\x00\x00\x00\x00\x01\x00\x00\x87\xb4\
-\x00\x00\x01\x81\x15\x91\x87\x79\
-\x00\x00\x08\x9e\x00\x00\x00\x00\x00\x01\x00\x00\x72\xc7\
-\x00\x00\x01\x81\x15\x91\x86\xcd\
-\x00\x00\x17\x1c\x00\x00\x00\x00\x00\x01\x00\x01\x30\x76\
-\x00\x00\x01\x81\x15\x91\x87\x80\
-\x00\x00\x0a\xde\x00\x00\x00\x00\x00\x01\x00\x00\x95\xf5\
-\x00\x00\x01\x81\x15\x91\x87\x8c\
-\x00\x00\x12\x6c\x00\x00\x00\x00\x00\x01\x00\x00\xf6\x17\
-\x00\x00\x01\x81\x15\x91\x86\x3d\
-\x00\x00\x02\xf8\x00\x00\x00\x00\x00\x01\x00\x00\x34\x42\
-\x00\x00\x01\x81\x15\x91\x86\xfc\
-\x00\x00\x22\x0e\x00\x00\x00\x00\x00\x01\x00\x01\xaa\x03\
-\x00\x00\x01\x81\x15\x91\x88\x1f\
-\x00\x00\x1a\x8e\x00\x00\x00\x00\x00\x01\x00\x01\x5b\x5d\
-\x00\x00\x01\x81\x15\x91\x86\xec\
-\x00\x00\x0e\x02\x00\x00\x00\x00\x00\x01\x00\x00\xc6\xbd\
-\x00\x00\x01\x81\x15\x91\x84\xea\
-\x00\x00\x00\x9e\x00\x00\x00\x00\x00\x01\x00\x00\x1f\x0d\
-\x00\x00\x01\x81\x15\x91\x86\x2d\
-\x00\x00\x18\xc4\x00\x00\x00\x00\x00\x01\x00\x01\x46\xb8\
-\x00\x00\x01\x81\x15\x91\x85\xb1\
-\x00\x00\x24\x0a\x00\x00\x00\x00\x00\x01\x00\x01\xc4\x9e\
-\x00\x00\x01\x81\x15\x91\x84\xdb\
-\x00\x00\x04\x72\x00\x00\x00\x00\x00\x01\x00\x00\x47\x31\
-\x00\x00\x01\x81\x15\x91\x84\xdb\
-\x00\x00\x2a\xa4\x00\x00\x00\x00\x00\x01\x00\x02\x11\x25\
-\x00\x00\x01\x81\x15\x91\x84\xac\
-\x00\x00\x2a\x38\x00\x00\x00\x00\x00\x01\x00\x02\x0a\x43\
-\x00\x00\x01\x81\x15\x91\x86\xcd\
-\x00\x00\x02\x10\x00\x00\x00\x00\x00\x01\x00\x00\x2e\x25\
-\x00\x00\x01\x81\x15\x91\x85\x3e\
-\x00\x00\x20\xfc\x00\x00\x00\x00\x00\x01\x00\x01\xa0\x76\
-\x00\x00\x01\x81\x15\x91\x86\x6b\
-\x00\x00\x12\x30\x00\x00\x00\x00\x00\x01\x00\x00\xf1\x9c\
-\x00\x00\x01\x81\x15\x91\x86\xbe\
-\x00\x00\x0a\x20\x00\x00\x00\x00\x00\x01\x00\x00\x88\xcc\
-\x00\x00\x01\x81\x15\x91\x86\xbe\
-\x00\x00\x04\xdc\x00\x00\x00\x00\x00\x01\x00\x00\x4a\x76\
-\x00\x00\x01\x81\x15\x91\x86\x9e\
-\x00\x00\x12\xf8\x00\x00\x00\x00\x00\x01\x00\x01\x02\x0e\
-\x00\x00\x01\x81\x15\x91\x86\x0d\
-\x00\x00\x10\x60\x00\x00\x00\x00\x00\x01\x00\x00\xdb\x13\
-\x00\x00\x01\x81\x15\x91\x86\x3d\
-\x00\x00\x07\x6e\x00\x00\x00\x00\x00\x01\x00\x00\x64\x50\
-\x00\x00\x01\x81\x15\x91\x86\xec\
-\x00\x00\x03\xdc\x00\x00\x00\x00\x00\x01\x00\x00\x44\xa3\
-\x00\x00\x01\x81\x15\x91\x87\xd0\
-\x00\x00\x1d\xe4\x00\x00\x00\x00\x00\x01\x00\x01\x7d\x1d\
-\x00\x00\x01\x81\x15\x91\x88\x46\
-\x00\x00\x24\x50\x00\x00\x00\x00\x00\x01\x00\x01\xc5\xc2\
-\x00\x00\x01\x81\x15\x91\x85\xc9\
-\x00\x00\x10\xc2\x00\x00\x00\x00\x00\x01\x00\x00\xe0\x6b\
-\x00\x00\x01\x81\x15\x91\x86\x16\
-\x00\x00\x00\x6a\x00\x00\x00\x00\x00\x01\x00\x00\x1a\xaa\
-\x00\x00\x01\x81\x15\x91\x86\xae\
-\x00\x00\x01\x6c\x00\x00\x00\x00\x00\x01\x00\x00\x25\x38\
-\x00\x00\x01\x81\x15\x91\x87\x43\
-\x00\x00\x15\x9c\x00\x00\x00\x00\x00\x01\x00\x01\x1e\x29\
-\x00\x00\x01\x81\x15\x91\x84\x81\
-\x00\x00\x0c\x90\x00\x00\x00\x00\x00\x01\x00\x00\xb0\xe3\
-\x00\x00\x01\x81\x15\x91\x85\xcd\
-\x00\x00\x29\x4a\x00\x00\x00\x00\x00\x01\x00\x01\xfd\x9e\
-\x00\x00\x01\x81\x15\x91\x84\x8c\
-\x00\x00\x2b\xda\x00\x00\x00\x00\x00\x01\x00\x02\x1b\xa2\
-\x00\x00\x01\x81\x15\x91\x86\x3d\
-\x00\x00\x0d\x70\x00\x00\x00\x00\x00\x01\x00\x00\xc3\x1b\
-\x00\x00\x01\x81\x15\x91\x84\xfd\
-\x00\x00\x0b\x78\x00\x00\x00\x00\x00\x01\x00\x00\x97\xf3\
-\x00\x00\x01\x81\x15\x91\x87\x9f\
-\x00\x00\x29\xe2\x00\x00\x00\x00\x00\x01\x00\x02\x09\xa8\
-\x00\x00\x01\x81\x15\x91\x86\x2d\
-\x00\x00\x1c\xee\x00\x00\x00\x00\x00\x01\x00\x01\x72\x8a\
-\x00\x00\x01\x81\x15\x91\x85\x9f\
-\x00\x00\x0f\x84\x00\x00\x00\x00\x00\x01\x00\x00\xd0\xe7\
-\x00\x00\x01\x81\x15\x91\x86\x5c\
-\x00\x00\x12\xc6\x00\x00\x00\x00\x00\x01\x00\x00\xf9\x9e\
-\x00\x00\x01\x81\x15\x91\x87\xa7\
-\x00\x00\x25\x82\x00\x00\x00\x00\x00\x01\x00\x01\xd4\x54\
-\x00\x00\x01\x81\x15\x91\x86\x2d\
-\x00\x00\x1f\x66\x00\x00\x00\x00\x00\x01\x00\x01\x8d\x15\
-\x00\x00\x01\x81\x15\x91\x87\x32\
-\x00\x00\x14\x8e\x00\x00\x00\x00\x00\x01\x00\x01\x0c\x69\
-\x00\x00\x01\x81\x15\x91\x84\xbb\
-\x00\x00\x28\x0e\x00\x00\x00\x00\x00\x01\x00\x01\xf7\x5c\
-\x00\x00\x01\x81\x15\x91\x88\x1b\
-\x00\x00\x0d\xa2\x00\x00\x00\x00\x00\x01\x00\x00\xc3\xb7\
-\x00\x00\x01\x81\x15\x91\x87\xdd\
-\x00\x00\x0e\x36\x00\x00\x00\x00\x00\x01\x00\x00\xc7\x59\
-\x00\x00\x01\x81\x15\x91\x88\x36\
-\x00\x00\x2b\x1c\x00\x00\x00\x00\x00\x01\x00\x02\x14\x12\
-\x00\x00\x01\x81\x15\x91\x87\xd9\
-\x00\x00\x2b\xa6\x00\x00\x00\x00\x00\x01\x00\x02\x19\x7c\
-\x00\x00\x01\x81\x15\x91\x84\x53\
-\x00\x00\x00\x32\x00\x02\x00\x00\x00\x01\x00\x00\x00\xd6\
-\x00\x00\x00\x00\x00\x00\x00\x00\
-\x00\x00\x00\x40\x00\x01\x00\x00\x00\x01\x00\x00\x00\x00\
-\x00\x00\x01\x81\x15\x91\x89\x29\
-"
-
-qt_version = [int(v) for v in QtCore.qVersion().split('.')]
-if qt_version < [5, 8, 0]:
-    rcc_version = 1
-    qt_resource_struct = qt_resource_struct_v1
-else:
-    rcc_version = 2
-    qt_resource_struct = qt_resource_struct_v2
-
-def qInitResources():
-    QtCore.qRegisterResourceData(rcc_version, qt_resource_struct, qt_resource_name, qt_resource_data)
-
-def qCleanupResources():
-    QtCore.qUnregisterResourceData(rcc_version, qt_resource_struct, qt_resource_name, qt_resource_data)
-
-qInitResources()
+# -*- coding: utf-8 -*-
+
+# Resource object code
+#
+# Created by: The Resource Compiler for PyQt5 (Qt v5.15.2)
+#
+# WARNING! All changes made in this file will be lost!
+
+from qtpy import QtCore
+
+qt_resource_data = b"\
+\x00\x00\x1a\xa6\
+\x00\
+\x00\xdc\x92\x78\x9c\xd5\x3d\x6b\x6f\xdb\x46\xb6\xdf\x0b\xf4\x3f\
+\xd0\x31\xb0\x68\xbb\x96\x6d\xc9\xb2\x63\xab\xe8\x07\x3b\x8f\x6e\
+\x80\x34\x4d\x6a\x77\x8b\x8b\xc5\x85\x41\x49\x94\xc5\x0d\x45\x2a\
+\x24\x15\xc7\x2d\xee\x7f\xbf\x33\x43\xce\x70\x1e\x67\x5e\x7c\xd8\
+\xa9\x81\xa6\xb6\x34\x73\xde\x73\xce\x3c\xce\x9c\x39\xfa\x21\x18\
+\xf5\xf7\xf3\xed\x37\xdf\x7e\x13\xa0\x9f\x3f\x2e\x7f\x7b\xf7\xe6\
+\xdd\xcf\x7b\xc1\xeb\x38\x89\x82\x45\x1e\x85\x65\xb4\x0c\xb6\x79\
+\x76\x97\x87\x9b\x4d\x58\xc6\x8b\x30\x49\x1e\x0e\x83\xcb\x24\x09\
+\x16\xeb\x30\xbd\x8b\x8a\x60\x13\x2e\xa3\x20\x4e\x83\x72\x1d\x17\
+\xc1\x0a\xf7\xbb\x8f\xd1\xd7\xf3\x28\x48\xb2\xa2\xdc\xa3\xa0\x5f\
+\xd4\xc0\xe6\x0f\xa8\x65\x14\x7c\x2a\x8b\xb0\x28\x82\x45\xb6\xd9\
+\xa2\x2e\x79\xf0\xf9\xf8\xf0\xe4\xf0\x98\x36\xbe\x41\x2d\x96\xd1\
+\x2a\x4e\xe3\x32\xce\xd2\x22\x08\xf3\x1a\x45\x14\x3c\xfb\xb4\x0c\
+\xf3\x8f\x45\xf9\x90\x44\x87\x9f\x8a\xe2\xf0\x96\xfc\x5a\x1c\x16\
+\x8b\xa2\x78\x16\x6c\xb2\xe5\x2e\x89\x30\x98\x1e\xa5\x13\xfc\x70\
+\xf4\xed\x37\x47\x3f\x04\x6f\xe3\xbb\x75\x19\x5c\x63\x7c\xc1\x28\
+\xf8\xf0\x12\xd1\x41\xfe\xb8\x5e\x47\x51\xe9\xa1\x8e\x1a\x1e\xa6\
+\xf2\x3a\x8a\x82\x0f\x65\xb0\xcc\x16\xbb\x4d\x94\x96\x21\x66\x77\
+\x56\x49\x61\x14\xac\xcb\x72\x5b\xcc\x8e\x8e\xd0\xb7\x87\x9f\xca\
+\xc3\x38\x3b\xfa\x54\x8e\x4e\x8f\x2a\x86\x31\xce\xc3\x75\xb9\x49\
+\x1c\xdb\x8e\xf2\x68\x15\xe5\x51\xba\x88\xbc\x7a\x45\x5f\xc2\xcd\
+\x16\xcb\xb7\xea\x34\x88\x5c\x7f\x8b\x0a\x24\xbf\x28\x89\xb0\x08\
+\x8a\x4e\x76\x8d\x29\x24\xe0\xca\x38\xbd\x0b\xa2\xcf\x51\xfe\x80\
+\xec\x12\xfd\xba\x8e\x92\x6d\x11\x94\x59\xb0\x4b\xe3\xd5\x43\x50\
+\x71\x18\x84\x8b\x3c\x43\x56\xb8\x8c\x57\x44\x36\x65\x90\x6d\xa3\
+\x3c\x24\x7d\x8b\x87\xa2\x8c\x36\xc5\x10\x2c\xff\x10\xfc\x85\xc5\
+\xbf\x0d\x97\x4b\x84\x69\x16\x1c\x6f\xbf\xfc\x88\x3f\xd8\x84\xf9\
+\x5d\x9c\x36\x7f\xcf\xb3\x7c\x19\xe5\xf2\xdf\x23\x42\xfb\x2c\x48\
+\xb3\x34\xe2\x3f\x8e\x37\xe1\x1d\xff\x71\xb6\x2b\x93\x38\x45\x9f\
+\x1c\xa3\x3f\xff\x0f\xf3\x81\x44\x5d\x6c\xa3\x45\xbc\x8a\x17\x41\
+\x4e\x64\xbe\xca\xf2\x46\xee\x71\x5a\xc4\x68\x28\x7f\xb8\xc9\xb2\
+\xe4\x2a\xcc\x09\xa9\xcd\x1f\x15\xcd\x32\x89\x12\x0f\x14\xcd\x87\
+\x3f\xe2\xe5\x9d\xd7\x98\x80\x7f\x86\x90\x3e\xa5\x8d\xf0\x33\x0f\
+\x17\x1f\xef\xf2\x6c\x97\x2e\x47\x8b\x2c\xc9\x90\xb0\xf7\xc7\x17\
+\x93\x93\xc9\x4b\x59\x01\x41\x91\x25\xf1\x32\xd8\x9f\x9e\x9e\x9e\
+\x9c\x4d\x21\xde\x83\x80\x42\x78\x75\xfc\x6a\xfc\xea\x84\x7c\x54\
+\x20\xe9\x2e\xf0\xa0\x1e\x01\x98\x4e\xa6\x67\xcf\x2f\x26\x52\x3b\
+\x05\x08\x91\x69\x4d\xf4\x6c\x19\x17\xe1\x3c\x41\x6e\xd4\x81\x7a\
+\xfa\xd1\xc5\xcb\xcb\x8b\xab\x53\x3b\x39\x93\xb3\xe9\xf9\xd9\x95\
+\x86\x1c\x06\x44\x20\x67\x16\xa3\x31\x32\xab\x5a\x1b\x88\x62\x8c\
+\x02\x9d\xd7\x19\x1a\xa4\xb3\x3d\x2b\x8c\xf1\xe5\xf3\xc9\xd5\x15\
+\x6f\x63\xbf\x84\x71\xfa\x47\x9c\x2e\xb3\xfb\xce\x2e\xe3\x06\xc7\
+\xae\x70\xf9\xdf\x5d\x81\xc6\x01\x8e\x32\xc5\x36\x89\xcb\x12\xc5\
+\xa5\x3a\xea\x20\x07\xf9\x11\xc5\x35\x4c\xf7\x01\x1a\x62\x65\xf0\
+\x89\xb6\xf8\xf6\x1b\x4f\x27\xba\xbf\x40\x58\xb2\x4d\xfc\x27\xb2\
+\x9d\xd1\xa7\x0d\x62\xe2\x9e\x30\x31\x88\xad\x37\x32\x9a\x21\x35\
+\x6d\x43\xe4\xdc\xd0\x90\xd7\xc9\x98\x33\x6e\xc0\xf4\x39\xd3\x2a\
+\xb6\xe1\x42\x30\x7d\x36\x16\x26\x8d\x1f\x80\x91\x57\x0a\xd7\x92\
+\x70\x76\xfc\xfc\xe2\xfc\x4a\x4b\x82\x60\x04\x5a\x04\x79\xfc\x67\
+\x86\x82\x69\x52\x61\x41\x6a\x2b\xd7\xb3\xe0\x54\xf0\xb2\xa3\x32\
+\xdb\x52\x6a\xd9\x67\xf3\xac\x44\x9a\x69\x3e\xae\x5d\xea\x2e\x4f\
+\xbe\x7b\x36\x3b\x42\xb3\x8d\xdb\x78\x81\xa6\x23\x47\x78\x06\x72\
+\x94\x2f\x8e\x4a\xe4\x1c\xe7\x61\x7e\xcb\x70\xdf\x22\xd6\xc8\x24\
+\xe9\x70\x9b\xde\x3d\xfb\xde\x42\x28\x6d\x5c\x91\xb9\x8e\xf0\xf4\
+\x42\xa1\x33\x89\x56\xa5\x42\x68\x5e\x35\x6d\x4f\x67\x23\x23\x91\
+\x52\x3c\xae\xb0\xcb\xbf\x89\xb7\x5d\x9d\x37\x06\xd7\x69\x68\x60\
+\xaa\xcb\x78\x3b\xc8\xb8\xa0\x3c\x5a\x3d\x16\xe8\xd5\x91\x94\xde\
+\xac\x82\x87\x6c\x87\xc2\xe8\x06\x99\x33\x71\x11\x95\xb9\xe2\xc9\
+\x32\x9a\x43\x94\x0f\x07\x1c\x58\x34\xdd\xc8\xd0\xec\xe3\x3e\xcb\
+\x3f\xe2\xa9\x45\x96\x06\x95\x31\x14\x84\x98\xc6\xd2\x59\xec\x26\
+\x93\x22\x02\xb9\x1e\x58\x07\x24\x54\xaf\xe2\x2f\x78\xc6\x3c\xcf\
+\x50\x8f\x2f\x41\x2d\x9f\x1a\x86\x12\x8d\x1a\x18\x19\x1e\xad\x98\
+\x22\xdc\x7f\x7f\xfc\x7c\x8a\x66\x7e\x9b\xf0\x21\x48\x23\xe4\x6f\
+\xf1\x94\xa8\x88\x82\xdf\x7e\xbe\xba\x24\x90\x98\x19\x5c\xa3\xd9\
+\xe8\xae\xc0\xb1\xbf\x93\xbc\x3b\x9b\x41\x41\xe8\x40\xe6\x3b\x88\
+\x21\x34\x5c\xfe\xc5\x6b\x62\x0c\x46\x7c\x24\x96\xd7\xf1\x17\x34\
+\x6f\xbc\xde\x3e\x60\x5d\xef\x5f\x8c\x27\xc7\x07\xe4\x7f\x63\xaa\
+\x4a\xa6\xf4\x19\xdc\x75\x7f\x72\x7c\x7a\x10\xdc\xaf\x51\xf0\x0b\
+\x98\x03\xa8\xd0\x16\x41\x3d\x40\xb1\x91\xe0\xe0\x58\x34\x1a\x69\
+\x08\xad\xe2\xa6\x48\x6e\x6d\x38\x52\xcb\xc0\x6a\xe6\xcc\x9f\x82\
+\x9c\x03\x73\x09\xee\xa3\xde\x6c\x74\xb9\xc3\xb1\x24\x28\xf3\x30\
+\x45\x71\x05\x2f\x51\x1e\xb0\x55\xa2\xf5\x22\x5a\x2d\x46\x24\x0a\
+\x57\xdd\x6b\x3b\x46\x7e\xef\xe4\x18\xe2\xf6\x6d\x38\x8f\x6a\x67\
+\xea\xa9\xa9\x06\x77\xc9\x7b\xc2\x17\xeb\x68\xf1\xf1\x0a\xb1\xd1\
+\xcd\xd2\x3a\x0f\x81\x05\xa6\x03\x89\x73\x90\x11\xc0\x98\xf4\x98\
+\x52\xf2\x33\x5c\x3a\x15\x98\xd6\x3a\x65\xeb\x0e\xe6\xcd\x6a\xb5\
+\x57\x21\x77\x2a\xce\x18\x58\xcc\x9d\x72\x13\x07\x4a\xd2\x6c\x85\
+\xd6\xc5\x85\xc1\xd4\x19\xed\xbd\xcc\x8f\x25\xe4\x33\xe4\xa3\xd1\
+\xe8\x64\x13\x26\x30\x20\xd3\xa8\x3d\xa6\x7c\xd5\xb3\x8d\x31\xc8\
+\x4f\x03\x72\xb6\x4b\x89\x56\x29\xa9\xb6\x10\x4e\x4d\xe0\x96\xf5\
+\x93\xa6\x18\x46\x1c\xd5\xa4\xeb\x20\xb0\xb4\x22\xe2\xb6\xb6\xda\
+\xa2\xb5\x63\xc1\x44\x2c\x87\x2e\x7f\x46\x6e\x09\x5a\x2f\x76\x44\
+\x35\xb7\x40\x49\x01\x38\x60\x6d\xa7\x26\x77\x25\xb9\xa8\xc8\x45\
+\x41\x3d\xab\xc7\x57\x39\x1d\x55\xd3\x42\x31\xe8\xb7\x08\x05\x87\
+\x4d\x9c\x86\x28\x96\xfa\xa1\x13\xfa\xfa\xe2\x6a\xcb\xa3\x00\xa4\
+\x35\xa7\x46\x23\x10\x5b\x9a\x4c\x4a\x6c\x29\x18\x4d\x4b\x86\x00\
+\x4b\xc1\x41\xf4\x67\xe4\x80\xb7\x5f\x41\x10\xc5\x81\x60\x3b\x54\
+\x10\x65\x4c\x12\x01\xae\xd0\xca\x6a\x74\x5f\x47\x86\x79\x96\x2c\
+\x75\x33\x2c\x65\xc1\x3d\xca\xc3\x65\xbc\x2b\x94\x30\xa9\xac\x00\
+\x49\x2c\x3d\x83\x97\xaf\x7c\xe8\xa1\x84\xcd\x66\x65\x5c\x26\xf5\
+\x30\x29\x76\x73\xa4\xd0\x32\xcf\x92\x11\x5a\x07\x92\x0d\xbd\x0a\
+\xc4\x8f\xd2\xb7\xdb\xac\x20\x3b\xf0\x68\x86\x94\x6d\x03\x1c\xf9\
+\x48\x8b\x2a\x04\xca\x91\x5c\x0c\x8c\xf4\xd3\x7a\xa9\x2a\x37\x26\
+\xf4\x8f\x60\x4a\x5d\xe2\x2e\xb4\x8a\x6f\xa6\x97\xee\xa1\x19\xc0\
+\x2a\x87\xe6\x1e\x42\x9c\x34\xc6\x8d\x48\xd9\xa8\x35\xb7\xa2\x5e\
+\xc0\xdc\xea\x51\x62\xb5\x99\x84\xa1\x62\x35\x84\xb5\x27\xbd\xb9\
+\x6b\xcd\x45\x67\x2e\x1a\x7b\xc4\xe0\x6d\x42\x3f\x48\xf0\xc6\x41\
+\xe0\x37\xe4\xd6\xb2\xab\x1d\xf2\x4f\x69\x97\x38\xd0\x39\x08\x60\
+\xf7\x9a\xcd\x09\x1d\x83\xc4\x01\x9e\xcf\x9e\xd6\x53\x1e\xab\x27\
+\xc0\x64\xe4\xd5\x58\x65\x03\x1c\x99\xd6\x35\x16\xdf\xb6\xe3\xf1\
+\x83\x3f\x75\x81\xc7\x69\x8d\x49\x98\x9a\xf3\x2a\x68\xb5\x6a\x15\
+\x82\x1c\x9f\xac\x5c\x75\x59\x3a\xc2\x88\x7d\x57\x8f\xc4\xec\xb5\
+\xe1\xc8\x86\x83\x79\x37\x6b\x43\xea\xe2\xac\x0d\xcd\x7e\x4e\x15\
+\xa0\x27\x83\xa0\xe3\xb3\x12\xe5\xe7\xfd\x64\x94\x9a\x30\xa5\xc1\
+\x6a\x8e\x54\x6d\x05\xe0\xa5\x5f\x47\xed\x3a\xea\x76\x58\xcd\xb6\
+\xd0\x2b\xac\xd5\xae\x04\xe8\x43\xdc\x2f\x51\xba\xeb\xbc\x5b\xde\
+\x43\x88\xdb\x20\x3a\x86\xda\x2d\xa7\x3c\xea\xbc\x31\x74\x3a\x3e\
+\x91\x42\x93\x79\x83\xd9\xf5\xec\x5c\x3e\x09\xac\x08\x83\x82\x19\
+\x87\x4f\x3a\x87\xa6\x9d\xf8\x0d\x75\xed\xa6\x30\xc7\x11\xef\x9f\
+\x05\x18\xd2\x49\xb8\xd4\xc1\x0c\xdd\x9c\x6b\xe0\x2e\x81\x8a\x10\
+\x61\x14\xaa\x74\xb4\xc6\x05\x2a\x4a\x5a\x7e\x1e\x6b\xe6\x28\x52\
+\x8a\x08\x26\xb8\x87\x1c\xb6\x5e\xc6\xcb\x60\x83\x45\x34\x45\x58\
+\xde\x5a\x89\x72\x99\x3f\xc0\x09\xe5\xf3\xe9\x78\xfa\xba\xd5\x40\
+\x51\x52\x01\xd8\x4c\x44\x8f\x8e\x3b\x97\xd7\x64\xa8\x54\x90\xa1\
+\xa1\x04\xd1\xcc\xdb\x64\x30\xc1\xff\x90\x5f\xce\xf9\x83\xa1\x22\
+\xca\x3f\x47\x64\x0e\x17\x91\xa3\x25\xc6\x27\x3d\x6b\x15\x4f\x4f\
+\xf1\x40\xe7\x46\x15\x27\x63\x99\x40\x69\x9c\x02\x0a\x70\x15\xa4\
+\x3a\xd8\x9c\x7b\x2e\xe8\x12\x41\xdc\x3f\x19\x1f\x83\xb3\x41\x65\
+\xba\x28\xc0\x12\x27\xa4\x22\xc0\x73\x09\x9e\x32\xfd\x9c\x34\x32\
+\x47\x41\x11\x0d\x95\x45\xb2\x2b\xe2\xcf\x38\xe3\x92\x82\xfd\x29\
+\x20\xf1\x8f\x1c\xe9\x91\x51\xc5\x7d\xf7\x5d\x81\x73\x18\x2f\x89\
+\x62\xc8\xda\x12\x9b\x57\xf9\x8a\x42\xf9\xbe\xd6\x12\x82\x0e\x43\
+\x26\xf1\x35\xa8\xd6\x64\xed\x80\x83\xa2\x98\x09\xbc\xf4\x7e\xdc\
+\xe2\x88\x8d\x4d\xae\x5c\xdb\xd3\x59\x96\x6b\xfb\x47\xd9\xe0\x71\
+\x25\x66\xa8\xad\x1e\x33\xfe\x3e\x0f\x68\x9c\x30\x39\x2a\xd5\x4f\
+\xa5\x8f\xb8\x03\xe4\x46\xc8\x30\x07\x39\x66\xdc\x43\x1d\xe9\x78\
+\x60\x1d\xf4\x70\xc7\x87\x0e\x37\xb3\x81\x0f\x7c\x7c\xfa\x0c\x74\
+\xf4\xa3\xd0\xd0\xda\x17\x9b\x37\x2f\x1c\xd0\x68\xc5\xe2\xe3\x80\
+\xfd\x9d\xef\x30\xbb\x18\x2e\x74\x0d\xb2\x91\xa1\x47\xfc\x98\x7b\
+\x19\x56\x2a\x1c\x94\xed\xae\xea\xa7\xdb\xd4\xb0\xd3\xf4\x18\xfb\
+\x1a\x35\x19\xe4\x0c\x6f\x14\xe6\x79\x76\x2f\x5e\x03\x38\x05\x8f\
+\x00\xc7\xae\x79\xa9\x04\xe2\x2d\x81\xce\xf0\x02\x13\x53\x71\xe6\
+\xca\x16\x90\x97\xf3\x02\x4d\xf7\x17\xe5\x1b\x34\x07\xff\x77\x1c\
+\xb5\xcd\x02\xef\x9e\x9d\x85\xb3\xdd\x86\x3a\x58\x56\x98\x24\xf2\
+\x0f\x13\xe4\x7b\xb1\xe7\x05\x57\x7c\xc6\x5d\x95\x16\xa7\xd0\x95\
+\x29\x28\x94\x7c\x78\x8b\x0c\xee\xd5\x32\x2e\xa5\x5d\x06\x8d\x9a\
+\xae\x17\x79\x96\x24\x97\x79\x14\xb6\x52\x54\x67\x35\x85\x35\x1d\
+\x05\xa1\x03\x2d\x11\xc3\x41\x15\xc6\xb1\xab\x5d\x17\xaa\x37\x4d\
+\xbc\x72\x03\x90\x74\xab\x8c\xde\xd3\x0b\x39\xc1\x92\x5b\xd3\xd5\
+\x29\xca\x28\x52\x8f\xaa\x91\x85\x93\x2b\x49\xbf\xc9\x74\x5a\xf7\
+\xd3\x2c\xe9\x55\x5e\x24\xaf\x03\xa7\xd0\x91\xec\xe1\x6e\xda\xa6\
+\x3f\xc3\xe4\xfc\x36\xb4\xd1\xe3\x25\xff\xfc\x41\x89\xd3\xaf\x20\
+\x4f\x9a\xd0\x31\x58\x9e\x34\xe5\x52\xb9\x5e\xc1\xdc\xb5\x98\x8d\
+\x42\x6c\x90\x7c\xc8\x7e\x69\x6f\xe9\x56\x45\x70\xf4\x89\xb7\x2a\
+\xcc\xc3\x8e\x46\x16\x99\x74\x81\x6c\xd3\x0e\xb6\x9b\xeb\x6c\x88\
+\x9b\xad\xc3\x74\x99\x44\x8a\x10\xdd\x6e\xc2\x78\xc9\x0c\x0f\xf8\
+\x9a\xbf\x73\x47\x5a\x2c\x77\x73\xb8\x4b\x11\x94\x22\xf5\xb3\x5e\
+\xe8\x30\x6f\xe3\x4b\xfb\x69\x2a\x24\xab\x09\x38\xcb\xb6\xf1\x9a\
+\xcd\x46\x9a\x97\xa2\x29\x29\x83\x89\x56\xa4\xce\x4a\x46\x5b\xc9\
+\xa2\xc0\x32\x22\x13\x4c\xd9\x72\xb9\xad\x6a\xfe\x3f\x9e\x6c\x8f\
+\x69\xa0\x3a\x0f\xb5\xce\x07\x35\x09\x6b\x04\x9c\xfc\xb5\x92\xed\
+\xe6\xc2\x27\x5b\x51\x58\x9a\xb1\x94\x0f\x6f\xae\x9f\x9c\x59\x71\
+\xc0\x50\x95\x9e\xd4\xea\x3c\x69\xab\xd2\x65\x76\x9f\xf6\xa7\xd1\
+\xea\x1c\xa9\x07\x2e\x8d\x0a\x65\x8d\x5a\xa9\x13\x73\xfc\x64\x8c\
+\xa2\xc6\xf6\x31\xca\x29\xd5\x5f\xa1\x78\x7d\xd7\x9f\x42\x59\x3e\
+\x69\x57\x2e\x21\x85\x42\xcd\x5a\xa9\x14\x53\xf9\xd4\xac\x0e\x34\
+\x3e\x77\xdb\xfe\x94\x59\x66\xdb\x1e\x18\x34\x6a\xb2\xdb\xd0\xdc\
+\x6d\x9f\x86\xc7\xdd\xb6\xda\x39\xe1\x0c\x51\xe4\x0f\xfb\x0c\xa5\
+\x89\x9a\x8e\x20\xde\xf1\x03\xe0\x53\xf1\x68\xa1\xeb\xa6\x45\x7a\
+\xd8\xd8\x2b\x6e\xb1\x70\x75\xb4\x63\xdd\x48\x0d\x5a\x40\x87\x29\
+\x67\xb0\xdd\xe8\x26\x57\x97\xa3\x2f\x25\xd9\x91\xe8\xb6\xe4\xe9\
+\xba\x16\xa3\x55\x36\x46\x55\xc5\x80\x41\x8a\x88\x34\xbc\x3a\xac\
+\x73\xb4\xfb\x40\xea\x4a\xcb\x30\x1d\xae\x14\x48\xf1\xfa\x4d\x25\
+\x59\x2f\x5d\xa1\x07\xf8\xd2\xb5\x88\x1b\xab\xf8\x7d\x12\xc6\x69\
+\x77\x3d\x0f\xa2\x12\x91\xb6\x47\xd6\x8b\x80\xdc\x4f\x39\x62\xd7\
+\xae\x1a\xba\x8e\xff\x8c\x7e\xce\x3b\x17\x10\xe8\xbe\x21\x82\xe8\
+\xb8\xcb\x07\x2a\x20\xc0\x98\x54\x84\x24\x27\x76\x59\xf3\x2e\x6c\
+\xe1\xab\x2a\x0f\x72\x8b\x59\x51\xb3\x0e\xaf\xcb\x10\xef\xdf\x77\
+\xad\xb7\x33\xd4\xdd\x7a\x8e\xb6\xbf\xc0\x0d\x4a\x97\xad\x0d\x38\
+\x67\x50\xa8\x57\xf1\x35\x24\x5e\xd6\x55\x36\x06\xab\x57\xe1\x98\
+\x78\x59\x3b\x10\x9a\x75\x07\xa7\x5b\x32\x3d\xd0\x94\x2f\xf8\xca\
+\x1a\xcb\x9f\xe7\xcb\xba\xd4\xb4\x48\x7b\xa5\x5c\x81\x83\xe7\x13\
+\xe5\x8a\xbd\x4a\xa8\x08\x4b\xb7\x2f\x26\x6f\xd0\xb9\x56\x3a\xc1\
+\x5b\xde\xda\x22\x27\x0a\x56\xb8\x10\x4b\x3b\xa4\x9a\x0a\x30\x0c\
+\xa5\xb5\x4e\x8d\x37\x5a\x7b\x55\x17\x08\x7b\x4f\x3c\x5b\x4b\xdf\
+\x10\xd4\x24\xb9\x6b\xff\x53\x79\x4b\xbb\xa1\x58\x73\x3b\x07\xaf\
+\xc9\x68\xcb\x10\xe9\x02\x66\x9b\x7d\x16\xf5\x70\x6a\x1b\xa7\x1d\
+\xee\xa8\x0e\x7b\x92\x54\xd3\xe6\x30\x9f\x30\x7b\x53\xb8\x92\xcd\
+\x4d\x55\xb7\x11\x0f\xdd\xf1\xf1\xc9\x41\x30\x1e\x8f\xc5\xd3\x24\
+\xf1\x92\xa5\x53\x0f\xb9\x90\x92\x78\x3e\x2c\x5f\x62\x92\xae\x88\
+\xea\x4f\xbb\xb8\xad\x64\x7c\xf2\x5c\x1f\x6d\x2d\xe9\x81\xd6\xf8\
+\xf8\x82\xcb\x07\x94\xc4\x87\xd7\x49\xb0\xc5\x51\x41\x0a\xb9\xa3\
+\x7c\xb1\x2b\x75\xb5\x57\x91\x68\x5c\x28\x72\x7b\x72\x35\x43\xf5\
+\xe1\xb8\x69\x0f\x1f\x70\xda\x6a\x23\x04\x9c\xc0\x62\x12\x3a\x56\
+\x41\x40\x0d\xd8\xe1\x86\x66\xc9\x2b\xa5\x71\x8f\xc6\xc0\xe1\x2f\
+\x15\x26\x5b\x75\x1e\x28\x63\x88\x5b\x91\xd2\x08\x61\x6c\x94\xad\
+\x56\x6e\x79\x2a\x2e\x7b\x16\x52\xb2\xeb\xb9\x0b\x0b\xfc\xd6\xbc\
+\xf7\x56\x02\x0c\x9b\x2c\xba\x1f\xcd\xda\x2a\x8d\xb5\x32\x38\x32\
+\xb4\x9f\xd2\xda\xaa\x7b\xe0\x46\x53\x6b\x76\x30\x20\x3b\xe2\xf6\
+\x37\x4c\xe6\xc6\x35\xf3\x34\x38\xdb\x26\xb6\x8f\xc9\x09\x5b\x3d\
+\x9e\x46\x27\x6c\x2d\xc3\xf0\xf9\x33\x26\xc3\xed\x17\xfb\x79\x7f\
+\x0d\xcf\x6b\x11\x29\x77\xee\xb8\x8c\xec\x35\x96\x22\x78\x2f\xdf\
+\x5c\xbf\x7f\x7b\xf9\x3f\xd7\x5d\x01\x53\x78\xbd\x10\xc7\xc1\xab\
+\xab\x57\x75\x86\xd7\x79\x19\xb3\xca\xc3\xcd\x20\x15\x94\xf9\xfa\
+\x5c\xbd\xd4\x5d\x15\x5d\x89\x61\x92\x58\x19\x28\x41\xef\x75\x85\
+\xd9\xed\xde\x8e\x9a\xfc\x82\xb7\x52\xae\xd0\x98\x2d\xa2\x4e\xab\
+\xd2\xbf\x4b\xca\x13\xcf\xee\x10\x93\x54\xc3\x81\x3b\x87\xba\x95\
+\x66\xcd\x34\x28\x57\xd7\xad\x34\xd0\xe3\x0b\xfe\xb3\x3d\xe8\x43\
+\xea\x1d\xa5\x8f\xc1\x44\x53\xed\x9e\x5f\x55\x5e\x27\xdc\xae\xe3\
+\x45\xd1\x21\x03\x12\xff\x0c\x62\x18\x02\x6d\x8f\x6c\x19\x3c\xee\
+\x27\x33\x0d\x81\x88\xa6\x46\x08\xf7\xe1\x1e\xf8\x29\x67\x1d\xc2\
+\xe7\xfe\xe6\xf1\x22\x4c\xa2\x14\x4d\x24\x3a\x6e\x10\x0e\x62\x1e\
+\x12\x6d\x56\xa6\x8c\xa2\x16\x81\xf5\x50\x08\x90\xc4\xe4\x17\x2f\
+\xdf\xed\x36\xf3\x6e\x6e\x7c\x20\xe9\x35\xb4\x79\xb0\x28\x87\x44\
+\x0a\xa3\x27\x79\xbd\xc7\x2f\x45\x20\x13\xed\xb8\x1d\xdb\x39\xf0\
+\x6d\x6b\x3a\x86\xda\x8e\xe5\xf9\x7c\x34\xbf\x16\x04\x25\x8a\x14\
+\xa3\x30\x89\xef\xd0\x64\x67\x81\x16\x8e\x64\x51\x58\x1f\xe1\x34\
+\x14\x3d\x81\xb7\x73\x26\x6d\xb6\x58\xef\xd2\x8f\x2e\x69\x70\x5a\
+\x5a\xc1\xd1\xaf\xe2\xb0\x4b\x81\xab\x77\xef\xe5\xd5\x07\x98\xfc\
+\x5f\xfd\x7e\x73\xf3\xeb\xbb\xce\x6b\x93\xe1\x16\x27\xef\x77\xc5\
+\xba\x7b\xf9\xa6\x1e\x06\x36\xa2\x63\xc0\xf2\x4d\x1c\x9b\x3a\xab\
+\x69\x35\x70\x95\x25\x8b\x63\xd9\xa1\x86\x1e\xbb\x39\xb7\x1a\xb6\
+\x60\xdd\x7e\x0e\xab\x78\xb5\xcb\x21\x91\xd6\x9f\x75\x1d\x4e\x3b\
+\xc7\x40\x4d\x02\x6f\x8e\x3d\xe8\x31\x6c\x68\x30\x4a\x94\xce\xe6\
+\xb4\xdf\xd3\xe9\xd9\xf9\xf3\x4b\x53\x84\xe6\x40\xd9\xca\x0c\xe8\
+\x89\x70\xa1\xdc\x85\x82\x19\xae\x95\x31\x92\xaa\x0d\x00\x1b\x96\
+\xb5\x8c\xbd\x76\x2c\xd5\xd2\x95\x2f\xe3\x30\xc9\xee\x2a\xd4\xa4\
+\xc6\xb3\x3c\x3a\x71\x19\xfe\xa2\xd8\x45\x38\x48\x4c\xf1\x75\x96\
+\xf3\x60\x14\x5c\xe3\xdc\x9b\x30\x09\x16\x61\x11\x05\xd9\x4a\xe8\
+\x55\xbf\x70\xb3\x24\x80\x8b\xaa\x5e\x79\x5d\x61\xfc\xf7\x37\xf5\
+\x11\x06\x9f\xae\x2e\x55\x2c\x69\x8e\xb2\x9e\xd6\x09\x92\x43\xb4\
+\xe1\x9c\x20\xc7\xe6\x13\x3b\xc1\xfa\xb4\x29\xe2\x8c\xa8\x40\x0a\
+\x4b\xb2\x7b\xf2\x22\xd8\x0e\x8f\x86\x2c\x4d\x1e\xe8\x2b\x2d\x2f\
+\xa3\x24\x7c\x88\x96\xef\xb3\xed\x6e\x8b\x9f\x02\x8b\x9a\xda\x13\
+\x1e\x50\x48\x25\x1d\xc2\xbf\x1d\x50\x0d\x27\x2e\x54\x30\x6f\xd2\
+\xa2\x0c\xd3\xb2\x82\x81\x0c\x0d\x26\x4e\x3e\x24\x7d\x4c\x3f\xcf\
+\x61\x7d\x34\x3f\xaf\xe2\x7c\x5a\x3f\x0f\xd0\xd3\xd5\x65\x03\x20\
+\x3d\x5d\x37\x00\xa1\x93\x0b\xe7\xe0\xf5\xc8\x5c\x7b\xa6\x7a\x62\
+\xe6\x3f\x5b\x3c\x96\x7e\x41\x43\xe9\xa7\x67\xc7\xcf\xfe\x97\x05\
+\x85\x5f\xf1\x28\x5c\xc9\x43\x4e\x3c\xa1\x16\x5e\xd0\x31\x01\x1e\
+\x43\x80\x65\x17\x01\xc3\x3e\x76\x01\x5e\x07\x55\xe1\xb0\x10\x9a\
+\x0a\xba\x01\x80\x8e\x80\xe4\x87\xe2\x1c\x8e\x05\xf9\xa3\x3c\x13\
+\xfa\x09\x24\x1c\xc1\xf1\x79\x48\x1d\x90\x84\x26\x5d\x4c\x19\xec\
+\xf2\xe1\xa2\x63\xa1\x51\x0d\x6e\xd7\x73\x34\x33\x10\xc8\x9d\xf8\
+\x03\x93\x26\x5b\x9d\x6e\xa1\x80\x27\x95\x41\x40\x8e\x60\x8f\x69\
+\xb8\x25\xb5\x95\x50\x70\x0a\x83\x62\x1d\xaf\x4a\x7e\x8e\x44\x90\
+\xd7\x1a\xad\x8c\x68\xc4\x65\x85\x5c\x93\xe6\x71\x89\x7a\xce\xd1\
+\xbf\x60\x70\xab\x78\xe2\x0a\x09\xf4\xcf\x8f\x09\x67\xbb\x43\x57\
+\x5d\x61\xfb\x17\xd9\x66\x13\xa6\xcb\xb7\x71\xfa\xb1\xcb\xac\x70\
+\x98\xad\x55\x85\x36\x8d\x97\xd6\x95\x21\xec\xba\x55\x65\x79\xdc\
+\xb2\xde\xb3\x95\xa9\xb4\xce\x05\x64\x72\xb5\x5b\x91\xbd\x8a\x13\
+\x2f\x34\xde\xbd\xff\xfd\xe6\x1a\xad\x2f\xde\xfd\x1a\xbc\x7e\xf3\
+\xea\xed\xcb\x96\x9b\x35\x83\xed\xd0\xbc\xc0\x55\x28\xbe\x82\x67\
+\x16\x06\xad\x86\xc1\x98\xd4\xb9\x53\xfb\xb5\x68\xd7\x17\x39\xbd\
+\x52\xd6\x90\x02\x84\x6f\x82\x9f\x82\x93\xb3\x1f\x83\x69\xf0\xcf\
+\x60\x7c\xf6\xc3\x24\xc0\xcf\xfc\xb2\xfb\xf9\x01\x4e\x4c\x6f\x16\
+\x14\xd5\x3b\xca\x24\x89\x0d\x97\x40\x64\xc5\x19\x4e\x2e\x9a\x36\
+\x75\x66\x2d\xc9\xb6\xdb\x6f\xd2\xed\xf8\xfb\xbf\xe3\xc3\xd3\x68\
+\x23\x13\xc3\x32\xf7\xf0\xa3\xca\x72\xba\xdc\xfe\xf8\x64\xd2\xa0\
+\x80\x52\xf7\x2c\x5d\xb8\xa5\xf2\xf3\x53\x8a\x44\xed\x72\xcc\x31\
+\xf2\x2e\x8a\x96\xd5\x77\x75\x59\x8a\x26\xbe\x8d\x44\x0c\xcc\x43\
+\x54\x0a\xd7\x14\x42\xf1\x32\x81\x3a\x73\xc9\xb8\x1f\xee\x66\x1e\
+\x36\xe2\x2c\xd3\x6c\xfb\xc1\x8c\x01\x74\x97\xbc\x1a\x13\x5c\x56\
+\x53\x06\x00\x2c\x15\x5b\xa0\x50\x7a\x79\x6e\x8b\xc2\xf2\x9a\x27\
+\xb1\x5e\x5e\x29\x4a\xac\x17\x8d\x87\x6d\xb4\x6d\xaf\xff\xee\x68\
+\x76\x72\x2c\x33\x11\xa3\x89\x7b\x7a\x10\x9a\x06\x1d\x86\x20\x5f\
+\x8d\xaa\x8d\xad\x70\xa5\x61\x9b\xa7\x03\x99\xb7\x3b\x9f\x1c\xe0\
+\x7f\x4f\x03\x34\x1f\x08\x7e\xf9\x0d\xff\x7e\x4e\xbd\xc6\x3f\xc4\
+\xed\x89\xe6\x07\xbe\xb4\x50\xfd\x10\xec\xf4\x8f\x7f\x48\xa3\xa6\
+\xf9\x51\x53\x7c\x64\x91\x31\x70\xf4\x57\x50\x34\xb8\x0e\x6c\x2b\
+\xa9\x2c\xf3\x6c\x3b\xc2\xd3\xcc\xf6\xbb\xa9\x62\xb6\x31\xbc\x16\
+\x32\xac\xfa\x14\x8a\x58\x92\xe2\x23\xa5\x49\x42\xa8\xd1\x10\x3d\
+\x08\xe0\x6f\xd8\xab\x56\xd0\x97\x9c\x3f\x68\x9b\x56\x49\xae\x55\
+\x21\x11\x75\x3d\xf5\x1f\xf5\x71\x87\x8d\xd0\x31\xcc\xed\x2c\x02\
+\x5a\xeb\xc2\x81\x12\x3b\x55\x07\xdb\x7b\x21\x75\xb3\x19\x02\x83\
+\x14\x65\xbc\x18\x6c\xb9\xea\xc5\x7d\x4b\xad\x68\x0a\xae\x26\x8c\
+\x47\xc3\x12\x3d\xfa\xcb\xc4\xee\xd4\xd4\x36\xdc\x81\x18\xe5\xea\
+\xb3\x39\x9a\x3f\x3e\x39\x26\xbb\x60\x07\xe7\x22\x10\xa7\xbb\xe0\
+\xee\x5c\xf5\xa0\x72\x80\xa2\x16\x7c\x59\x4b\x36\xc1\x8f\xdc\x18\
+\x75\x45\xbd\xa1\xec\x1d\x29\x93\xa3\x73\xb5\xa6\x83\x89\x53\xc7\
+\x52\x4e\x56\xf9\x4b\x73\x1e\x3d\x78\xbf\x3a\x42\x22\x18\x83\xcd\
+\xf7\x2d\xc7\x63\x22\x49\x4f\x29\x9a\x6b\x36\x75\x94\x61\xab\x4a\
+\x4c\x24\x17\x8d\x56\x5b\xec\xe6\xfc\x3b\x87\x24\xbc\x8f\x1a\x21\
+\x3a\x86\x49\x6a\x13\x4a\x4a\x9a\x17\x14\xc6\xeb\x69\x0d\x24\x3c\
+\xbf\x74\xbd\xa7\xe6\xd7\xdb\xe7\x36\x1b\x91\xed\xac\xd2\xae\x83\
+\x79\x6b\x36\x2f\x74\x69\x7c\x35\xb5\x7d\xac\xc7\x18\xac\xae\x97\
+\x49\x18\x20\x2f\x57\xc1\x7a\xe9\x96\xb9\xa6\x5c\x31\x35\xfd\xf5\
+\x26\x9c\xff\x11\x77\xba\x19\x4f\x7e\xba\x1f\xd9\x87\xf3\xaa\x16\
+\xc8\x08\x79\x01\xf2\xe7\x60\x37\xc5\x31\xc7\x86\x0b\xf7\xc6\x25\
+\xaf\x7c\x3b\x9b\xc1\x12\x9e\x61\xe3\x36\xa4\xce\xe9\xde\x8e\x29\
+\x3f\x9e\x42\x99\xcd\xb6\x61\x1a\x69\x2d\xc1\xa1\xa4\xa1\x34\x05\
+\x60\x84\x2c\xb3\x1d\x32\xfb\xba\x1b\x4d\xf3\x20\xc8\xee\xe3\x72\
+\x1d\x6c\x1f\x3e\x95\xa7\xf0\x1b\xf4\x20\x89\x76\xe3\x33\x4f\x15\
+\xc5\x08\x50\xdb\x61\x0f\x25\x0a\xfe\x66\x76\x88\x38\x46\xcb\xb4\
+\x97\xd9\xe2\x23\xb5\xa2\x5a\x0c\x44\xaa\x38\x49\x77\x8b\x82\xe1\
+\xc3\x68\x99\x87\xf7\x57\x61\x11\x49\x77\x0b\x6d\xda\xd7\xd6\x92\
+\x60\x67\x59\x95\x83\x26\x5b\x93\x74\xb7\x01\x67\x66\x54\x5b\xb4\
+\xf3\x07\xfc\x4d\x30\x62\x1b\x96\xf8\xa4\x0b\xbb\x7b\xee\xe4\x8a\
+\x90\x3b\x9b\x2d\x92\xac\x88\xea\x73\x3d\x90\x23\xb1\x89\x68\xe1\
+\xe2\x75\xc8\x63\x91\x74\xca\x9b\x63\x0d\x10\x82\x45\xbe\x60\x0f\
+\x50\xc0\xd6\xc8\x36\x52\x7d\x4e\xc4\x78\x1a\xc0\x9a\xe5\x20\x82\
+\x3a\x4b\xc0\x85\x16\xaf\x97\x08\x04\x6a\xea\x9e\x1a\x7a\x90\x95\
+\x6b\xd0\xa3\x6f\x98\x4b\xdb\x63\x83\x1e\x6f\x41\xb1\x48\xea\x67\
+\xf6\x04\x12\x03\xd4\x65\x00\x29\x2c\xcc\xf0\x3c\x87\x82\xe6\xef\
+\xba\x6a\x18\x83\xdb\xf3\xb6\xc9\xa6\x3f\x27\x8d\xeb\xb2\x24\x45\
+\xbb\x84\x0c\x46\x40\x0d\xde\x87\x66\x5d\x17\x81\x6c\x32\xe1\x1b\
+\x88\x66\xe2\x32\x7c\x28\x86\x3b\x08\xf4\xd6\x33\xc2\x81\x28\xae\
+\xa0\xfb\x90\xac\xe9\x21\xd0\x5c\xb9\xce\x81\x48\xc6\x0a\xdc\xf3\
+\x35\x65\xb5\x83\xcd\x96\x2d\x8f\xd1\x5a\x6b\x4a\x03\x86\xe9\x45\
+\xb5\xb6\x8f\xd1\x9a\xfb\xa4\x9a\x68\xd1\x8b\x66\x4d\x0f\x8b\x3d\
+\xf7\x49\x73\x05\xdd\x8b\x68\x5d\x17\xb3\x45\xf7\x49\xb4\x60\xa0\
+\xae\x86\x0c\xda\xef\x04\x24\x50\x7d\xee\xde\x6e\xa2\x1e\x96\xa9\
+\x1a\xa4\x91\x0c\x71\xd9\x6c\x33\x3b\x67\x6b\x03\xd4\x65\x24\x03\
+\xca\x26\xd3\x5b\x85\xbb\xfd\x40\xc6\x6e\x24\x84\x7f\xd7\x19\xb4\
+\x0d\xb3\x45\xb8\xac\x32\xc0\x17\xa4\xbd\x36\x22\xc0\xed\x12\xdd\
+\x46\x88\x54\x69\xc7\xec\x67\x1d\x8a\x86\x48\xbb\x21\xf8\xfb\xea\
+\x51\x19\xcd\x82\x11\x9c\xc4\x38\xce\x75\x5c\xb2\x5b\x0d\x13\xa0\
+\xd3\x8b\xcb\x57\x17\xc3\x31\xd3\x78\x29\xd3\x1c\x5d\xd3\xda\xbe\
+\x8b\x62\x8c\x87\x4d\x23\xb6\x72\x2e\xb6\x0f\xb8\x35\x5a\x2f\x1f\
+\x55\xbf\xee\x5f\x3c\x3f\x3b\x23\x53\xe0\xfd\xc9\xf4\x04\xdc\xf1\
+\x3a\x81\x0d\xed\xc4\xe8\x97\xac\xde\xc8\x18\x14\xcd\xcf\xd3\x3e\
+\xdd\x38\x31\x94\xc1\x99\x82\x4d\x20\x43\x01\x86\x9b\x75\x32\xed\
+\x3e\x87\xf6\x18\x0e\xca\xc4\x5a\x19\x0b\xdd\x18\x75\x98\x56\xd9\
+\x06\x05\xdc\xc1\x63\x5c\x28\xd3\xad\xa7\x19\x14\xb8\x93\x25\x30\
+\x7a\x84\x05\xd0\x56\xe1\x31\x20\x04\x4d\xc9\xda\xe5\x21\x20\xde\
+\xca\x72\x76\x88\x26\x23\xe1\x53\xd6\x74\xa6\x2e\x2c\xa9\x5c\x97\
+\x5e\x1e\x66\x0e\xac\xc7\xa8\xa1\x5b\xa7\xd0\x36\xfb\x84\x9a\x7b\
+\x58\x27\x30\xb5\x06\xec\x73\x19\xaf\x56\x11\xa9\x1c\x36\x8f\xd6\
+\xe1\xe7\x38\xcb\x71\xd5\x4d\x96\x15\x28\xcc\x8e\xe4\xd7\xb8\xeb\
+\x8f\x85\x92\x5b\xca\x5c\xc8\x36\x57\xfa\xaa\x4d\x13\x76\xb1\xae\
+\x6e\xd8\x66\x9c\xe2\xe2\xd9\x79\x95\xed\x61\x9e\xea\xd2\x5b\x6f\
+\x9d\xf2\xca\xc7\x66\x9e\x60\x7b\x0f\xfb\x54\x17\x51\x6d\xcd\xb3\
+\x82\x24\x5b\x27\xff\x29\xcf\x2d\x7f\xf9\x12\xde\x53\x56\xae\x2d\
+\x72\xa7\x14\x27\x67\x0e\x05\x69\xdd\x1e\x1e\x04\xd0\x19\xb7\x38\
+\xa1\x86\xf6\xd1\x63\x43\x65\xd0\xb3\xbe\xb9\xf3\x1d\x14\x15\x0e\
+\x71\x6b\x75\x86\x55\x94\xea\x97\xe3\xb6\x4e\x3e\x89\x59\xc2\xbb\
+\x1b\x4e\x94\x19\x77\x0a\xac\xbd\x7c\x69\xd3\x3d\x99\x09\xa1\xe3\
+\x1e\xd0\xf4\x90\x1f\xd0\xcb\x87\x48\xa0\xe4\xad\x15\x8d\x87\x08\
+\xa1\x6e\xde\xe4\x69\x84\x88\x8f\xcc\x2a\xfc\x9d\xcf\x6e\x07\x39\
+\xdc\xe2\x64\x43\x38\x66\xd7\xcb\x34\xc7\x99\xfd\xbf\xfd\x58\xc6\
+\x65\x12\xcd\xc3\x7c\x54\x9d\xa0\x60\x01\x9b\xaa\x35\x37\x39\xad\
+\x5c\x6a\x26\x83\x91\x66\xf9\x26\x4c\xda\x00\xa9\x6f\xea\x33\x71\
+\xa0\x28\x83\x81\x32\x0f\x7c\x55\xdd\x1c\x23\x37\x1e\xf0\xf9\x5a\
+\xf5\x2d\xbe\x04\x21\x9d\xc6\xd2\xe9\x33\xab\x38\x2e\x3f\x7c\xd0\
+\x64\x57\x5b\xfd\x26\x4f\x8e\x7a\x2e\x87\x99\x1a\x61\x82\x4c\xf7\
+\x05\x4d\x05\xfd\x39\x02\x6a\x4b\xd7\x5d\xa2\x32\x1e\xfd\x55\x7f\
+\x76\x38\xf8\xd3\xb1\xd9\xeb\x99\x9e\x16\x49\xdf\x87\x75\x3c\xa2\
+\x55\x92\x85\xe5\xdf\x5f\x69\x08\x19\x62\xca\x91\xcf\x16\x5a\xab\
+\xe0\x5b\xd5\x26\x60\x69\xa3\xb6\x1a\x0f\xa8\x37\x92\xdc\x90\x47\
+\x11\x7d\x11\xb8\x28\xab\xdf\x6e\xb0\x57\xf7\xab\x49\xd8\x3d\xb9\
+\x01\xd1\xf1\x19\xa1\xec\x9c\xe0\x56\x94\x3d\x80\x29\xb1\x04\x2a\
+\x38\x43\xa4\x57\xd4\x32\x9f\xcd\x91\x19\x2f\xd6\x42\x3d\x49\xe9\
+\x2b\x4d\x16\x63\x0b\x3f\xaf\x40\x0e\x0b\x34\x28\xe7\x28\xf4\xdd\
+\x15\xb3\xbd\x70\xf9\xdf\x2c\x4e\x8b\x51\x73\xcf\xa3\x8e\x5d\x36\
+\x33\xab\xa0\xdd\xe2\x08\x5a\x21\xe4\xef\x9d\x9b\x50\x76\xc5\xb8\
+\xc9\x72\x3b\xc6\x3d\x8c\x72\xb1\x8e\x93\x25\x92\x48\xf5\x57\x6f\
+\x04\x44\xe9\xd2\x89\x63\x0d\x7a\xe2\x4f\x21\x95\x57\x5f\x88\x5d\
+\xf9\x9e\x10\xad\xce\x0f\xc7\xd7\xb4\x57\x38\x2c\x16\x92\x6d\x6b\
+\xcc\x30\x07\x00\xe9\x6a\x8f\xbe\x09\xc7\x18\x1c\x0c\xdb\x28\xf3\
+\xa6\xd0\xab\xa7\xe4\x7d\xdc\xbc\x20\x68\x38\xe3\xc6\x4f\xdc\x5a\
+\xaa\xcd\x42\x6f\x41\x33\x06\x68\xa6\x98\xbb\x4d\x56\xdf\xee\x3a\
+\x20\xe9\x9f\x55\x00\xd1\x7c\xcd\xa2\x8a\xe6\xfb\x17\x59\xb2\xdb\
+\xa4\x9a\x06\x6e\x0c\x90\xc6\xf3\xec\xcb\x6d\xdd\xcb\x9d\x7e\x55\
+\xba\x40\x1b\x22\x13\x4b\x1b\xba\x9f\x60\x96\x47\x8d\xce\xd2\xa8\
+\xc2\x67\x69\xc4\x21\x34\x49\xb8\xc1\x68\x6c\xc5\x50\x1a\x5b\x71\
+\x38\x8d\x5a\x6b\x90\x9a\x9b\x31\xac\xe6\x66\x5e\xf3\x1f\xd9\x16\
+\x9c\x2d\x7a\x97\x5a\x6c\x5a\x68\x00\xca\x49\x68\x01\xf3\xc4\x9a\
+\x78\x72\xc3\xfa\xf9\x70\x62\xb4\xee\xa6\x95\xc9\xbe\x9b\x56\x16\
+\x0b\x97\x91\x5a\x9b\x19\xad\x1c\x44\x6b\x96\xb9\xc5\xd2\x01\xc4\
+\x96\x76\x56\x6b\x07\x50\xdb\x1a\x5a\x2c\x5e\x41\xde\xd6\x4a\x9c\
+\xad\x1e\xfd\x16\xa1\xd5\xfe\x26\xc6\x77\x60\x75\xda\x50\x1a\x81\
+\x92\x53\x5a\xc1\x3c\x0a\xcd\x3c\xf9\x13\xfa\xfa\x72\x67\x1c\x0d\
+\x62\x4b\xd3\x88\x10\x5b\x5a\x46\x05\x44\x80\x53\x53\xe3\xe8\xd0\
+\x92\x60\xd7\x8b\x65\x94\x68\x88\x70\x68\x6b\x1d\x2d\x1a\x32\x5c\
+\x1a\x5b\x46\x0d\x48\x48\x17\xcb\x32\x8e\x1e\x5e\x29\x82\x6c\x44\
+\x02\x5d\xae\xf3\x78\x17\xee\xb9\xcb\xe3\x25\x5e\x72\x19\xde\x10\
+\x04\x4f\xef\xa9\x19\xb3\xad\x62\xde\xb0\xf8\x0f\x1b\x45\xf3\x9f\
+\x72\x62\xef\xe1\xb6\x12\xa3\x86\xad\x7f\x79\x6a\xf8\x0f\x1b\x6a\
+\xf8\x4f\x39\x6a\xba\x5f\x38\x6a\xa8\x51\x47\x1c\x60\xfe\x90\x25\
+\xfa\xbd\xa9\xdb\x78\x14\x5c\x7e\x00\x76\x1f\xd2\x37\xfc\xe8\x93\
+\xbe\x12\x06\x04\xf7\x9d\x5d\x20\x20\x39\xec\x8c\x31\x5c\x94\xf1\
+\x67\x39\x1e\x68\x5a\xc8\xe4\x01\x4d\x14\x32\xa5\x36\x5d\xc9\xdd\
+\xb3\xd3\xbb\xe7\x40\xf0\x9e\x0b\xc5\x7b\x3c\xc9\x50\x71\x2d\x80\
+\x8b\xe7\xd3\xf1\xf4\xb5\x8e\x0b\xf9\x24\x58\x65\x02\x68\x21\xf3\
+\x00\x34\x51\x58\x00\x8f\x90\xd9\x31\xc8\xb1\xce\xe9\x38\x30\x84\
+\x89\x79\x91\xe5\x69\x94\xd3\x93\xa6\xa2\xba\xb0\xe6\xeb\x05\x85\
+\x17\xd6\x0c\x55\x81\xc4\x22\xbf\xff\x8a\x42\xf4\x6d\xc7\xd7\x54\
+\x7a\xd8\xcc\x5c\x13\x3a\x06\xdb\x3f\xe4\xd8\xb4\x9e\x46\x73\x7b\
+\xe3\x06\xb1\x4a\x7b\xe4\xe2\x06\xba\xb6\xae\x64\x43\x87\x57\xe5\
+\x5b\xbb\x9e\x15\xf0\x56\x33\xf2\xaa\x73\x57\xb1\xc5\xbf\x7a\x80\
+\xcf\x84\xc9\x87\xa4\x2a\x4d\x7d\x56\xc1\xa7\x7f\x01\xb4\xcc\x94\
+\xaa\x02\x42\xd2\x8b\x70\xf8\xc0\x52\x5e\xc4\x4f\x7d\x2e\x21\x2b\
+\x35\x60\xa4\x8c\x76\x0b\x85\xb3\xd9\x2a\xce\x0b\x9c\x1c\x64\x6d\
+\x88\x0b\x21\x8f\x32\xf1\xb2\xa7\xb5\x04\x8d\x0d\xaa\x68\x20\x9a\
+\x19\x01\x08\x44\xac\x38\x30\xa8\x8c\xe5\x17\x15\x5d\x44\xcc\x6a\
+\x02\x98\x05\xdc\x34\x03\xc5\xab\x7d\xcb\xd1\x05\xb3\xb7\x6c\xe5\
+\x2a\x41\xe4\xea\x7c\x56\x44\x41\x11\x95\x25\xd9\xaa\xfd\xae\xa2\
+\xeb\x88\x64\xd1\x1c\x55\xc9\x35\x47\xf2\xb8\xfb\x1e\x53\x8b\x22\
+\xe0\x7c\x77\xd7\x5c\xa0\xe3\x47\x74\x85\xa2\xe9\x46\xb2\x30\xb9\
+\x0a\x7a\x6e\x7e\x82\xed\x11\x5b\x72\x7c\x3c\x53\xd4\x5a\xbf\xdc\
+\xc8\x4b\x92\xbe\x43\xea\xe3\xf7\x9e\x94\x1f\xf9\xf9\x53\x56\x1b\
+\xff\xe9\xab\x4f\x92\xd2\xf8\x03\x15\x9f\xa4\x2c\xf2\x3e\x44\x2e\
+\x47\xa3\xfe\xad\x1f\x90\x35\x3c\x69\xe1\xa1\x05\x3c\xd1\x27\x6c\
+\xd5\x80\x9a\xeb\xac\xc3\x3c\x47\xd4\xf1\x22\x04\x47\xa5\x9b\xbb\
+\x11\x7a\x58\x97\x67\x6a\x89\x7a\xe0\x4a\x95\x41\x72\xda\x0b\x91\
+\x0e\x03\x12\x42\x25\x55\x13\x12\x50\xc9\x57\x8d\x5a\xa2\xd0\x18\
+\x94\x88\xc2\x63\x99\x0d\x80\x51\x32\x07\x9b\x5e\xda\x2b\x27\x13\
+\xfd\x8a\xb5\x1e\x42\x1f\xae\x49\x31\xd4\xcb\x3c\x0a\x59\x69\x09\
+\xa1\xc4\x84\x7d\x78\xd9\xd8\xc0\x4e\xe9\x35\x7e\xca\xf4\xeb\x79\
+\x52\x55\x03\xa3\xfa\xba\xea\x36\xc2\x45\x11\x9c\x5a\x2e\xa3\x32\
+\x8c\x93\xa2\x69\x5b\x94\x48\x24\x58\x5b\xab\x24\xbb\x3f\x5c\x64\
+\x9b\xa3\x4f\xbb\xa8\xc0\x61\xbe\x38\x1a\x4f\x4f\xcf\xc7\xd3\x8b\
+\x73\x0c\x86\x23\x79\x95\xe5\xa3\x35\xd9\x03\xfa\xdc\xec\x04\x0d\
+\xe1\x3b\x91\x32\xbe\x5b\x66\xe5\xf7\xc1\x61\xad\x93\xba\xd0\xe4\
+\x74\x8c\xeb\xd9\x4e\xce\xc8\xbf\xd5\xbd\x0a\xda\x82\x37\x39\xd8\
+\xdf\xe8\x1c\x18\xae\x71\x99\x05\x44\x54\xcd\x94\xe2\x5f\xb8\xb0\
+\x0c\xf4\x27\x31\x96\x1a\xe9\x7f\x48\xa7\xeb\x75\xb8\xe5\x5f\x14\
+\x70\x20\xc2\xb0\x04\x81\x40\x4f\x29\xe8\x4d\xf8\x85\x25\x9c\x3b\
+\xa4\x35\x69\x12\xde\x20\x14\xa7\x3c\x8a\x7a\x4e\xd0\x1e\x03\x29\
+\x89\xb8\x4d\x62\x92\xcc\xd7\xcd\x1e\x3a\x0f\xa6\xa2\xa6\x63\x90\
+\x18\xcf\x98\x74\xf0\xcb\x2c\x55\x51\x29\x48\x62\xaa\x79\x4e\x31\
+\xd0\x82\x60\xbe\xcb\x6f\xf5\x12\xaa\x9e\x8e\xb1\x07\x1d\x96\x92\
+\xc5\x52\x68\x06\x7a\x8b\xeb\x58\xe9\xf2\xa8\x6d\x62\x89\xdd\xcf\
+\x2d\x5d\x8c\x48\x73\x65\x05\x97\xb8\x9a\x13\x2f\x6c\x38\xa2\x6a\
+\xc8\x05\x12\x8f\xc3\x92\x94\xa0\x3a\xa8\x7e\xbd\x89\x37\xad\xea\
+\xae\x0d\x93\x78\xac\xa1\x8d\x48\xc2\xb5\xb4\x79\xaf\x25\xc9\x68\
+\xc9\xb4\x15\xb9\x6b\xa1\xa9\x94\x06\x96\x68\x33\xf6\x90\x2f\x5a\
+\x7a\x2d\xc5\xb9\xeb\x94\x63\xde\xe6\xa9\xf4\xaa\xe2\xb2\xbc\x00\
+\x5b\x55\x84\x66\xe0\x9a\x22\xbe\x32\xd8\xaf\xa6\xbc\x2f\x47\x2b\
+\x5b\xb8\xab\xc4\x3e\x76\xe5\x5f\x88\xaa\x46\x39\xca\x37\xec\xd6\
+\x0b\xf4\x25\x3d\x67\xd5\xb1\x04\x28\x5d\x07\x1b\x6c\xd0\x43\x65\
+\x61\x46\xb8\x5a\x7e\x5d\x1e\xd0\xba\x7a\xf7\x0e\x0b\x3b\xcf\xe9\
+\x92\x87\xc5\x63\xef\x48\xe9\xfa\x1a\xdf\x1b\xe7\x69\xeb\x5c\xbf\
+\x50\x00\xd6\xa5\xe8\x3e\x92\xda\xfb\x24\x2b\x3b\xbe\xc0\x4d\x7e\
+\x86\x90\x1a\x47\x1b\xdd\xc8\x7b\x8d\x26\xe7\x8b\x5d\x19\x24\xe1\
+\x3c\x4a\x0a\xfc\xa0\xdd\x16\x35\x22\x37\xe9\xa6\xda\x32\x7a\xff\
+\x0f\x59\xf9\x35\x4a\
+\x00\x00\x04\x5f\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x04\x11\x49\x44\x41\x54\x78\x9c\xed\
+\x9b\x4d\x68\x1d\x55\x1c\xc5\x7f\x67\xf2\x90\x14\x95\xa2\xa8\x1b\
+\x51\x57\xa2\xb8\x11\x69\xc9\x47\x45\x49\x45\xab\x55\x0c\xcd\x7b\
+\xa5\xae\x44\x2a\x8a\x76\x21\x2a\x28\x82\x0a\xb1\xb4\x62\x05\xc1\
+\x85\x88\x16\x04\x71\x61\xd1\x90\x2f\x03\x5a\x8d\x4a\x2b\x48\x9b\
+\x3c\x6d\x69\x41\x5c\x14\x44\x5c\x28\xa2\x60\x54\xb0\x46\x9b\x37\
+\xc7\xc5\x6b\x64\x66\x5e\xc1\x44\xe6\xe3\x5a\xdf\x59\x9e\x03\x73\
+\xff\xf7\x77\xef\xdc\xb9\x77\xe6\x3d\xe8\xaa\xab\xae\xfe\xcf\x52\
+\xd5\x05\xac\x54\x7d\x13\x1e\x55\xe4\xa7\x65\x2b\x76\xb4\xbb\xd9\
+\xd0\x33\x79\x5c\xf7\x3f\x01\xa0\x7f\xc2\x1b\x89\xfc\x31\x3e\x5d\
+\xaf\x1d\xcf\x37\x7a\x7a\xf2\xb8\x76\x94\xc7\x45\x8a\x54\xdf\xb8\
+\xd7\x23\xcf\xfc\xdd\x79\x00\x29\xb7\xba\x83\x06\x30\x38\xee\xab\
+\x15\x79\x3f\x70\x5e\xd2\x37\xc4\x79\xb5\x11\x2c\x80\x75\x63\xbe\
+\x3c\x8e\x3c\x0b\x5c\x94\xcd\x04\xce\xab\x9d\x20\x01\xdc\x30\xe6\
+\x8b\x6b\x35\xcf\x02\x97\x15\xdd\x56\xad\xe8\x06\x56\xab\xeb\xdf\
+\xf1\xf9\x7f\xc6\x7e\x0f\x73\x55\x19\xed\x05\x35\x03\x86\x5e\x77\
+\xef\x52\xcb\xd3\x98\xf5\x49\xdf\x39\x4e\xf9\xac\x82\x01\x30\x74\
+\xc0\xb5\xc5\xb5\xde\x07\xdc\x94\x0a\x84\x95\xe3\xa2\x97\x55\x18\
+\x00\x6c\xfd\xbe\x10\xef\x35\x8c\x64\x13\x5c\x5c\xe7\x21\x10\x00\
+\xfd\x53\xf1\xf3\xa0\x7b\x53\xa6\x30\x05\x8e\xfc\xb2\x2a\x07\x30\
+\x30\xe9\x27\x40\x8f\x27\x3d\xb7\xef\xfa\xc2\x3b\x0f\x15\x03\x18\
+\x98\xf4\xfd\xc6\x7b\xb2\xbe\x14\xb5\xca\xaa\xa1\x32\x00\xfd\x53\
+\x6e\x18\xbf\x9a\x32\x0d\x36\x31\x2e\x6c\xd1\xef\x50\x25\x00\x06\
+\xc6\x7d\x33\xf6\xbe\x6c\xfb\x16\xb1\x54\xdc\x23\xef\x4c\x2a\x1d\
+\xc0\xe0\x94\xfb\x2c\x4f\x03\xe7\x24\x7d\x9b\x38\xcf\x2d\xee\x4a\
+\x55\x2a\x80\xfe\x69\x5f\x13\xdb\xfb\x11\xe7\xa6\x02\x97\x3f\xf2\
+\xcb\x2a\x0d\xc0\x86\x09\x5f\x41\xec\x59\xe0\xc2\x74\xa2\x98\x8a\
+\x3a\x0f\x25\x9d\x05\x36\x4c\xfa\x92\x16\xfe\x10\xb8\x34\x9d\x28\
+\xa6\xcc\x15\xef\x0c\x2a\x7c\x06\xac\x1b\xf3\xda\x25\xf9\x7d\xe0\
+\xca\x54\x20\xbb\xea\xce\x43\xc1\x33\x60\x70\xcc\x6b\xe2\x9a\x67\
+\x30\xd7\xa5\x02\x61\xac\x52\x36\x3a\xff\xa4\xc2\x66\xc0\xd0\x01\
+\xd7\xe2\x9a\xdf\x02\x6e\x4c\xfa\x2e\x61\x7f\xbf\x1a\x15\x03\x60\
+\xd4\xd1\xe2\x42\xfc\x1a\x30\x9c\xf2\x0b\x3e\xd9\xfd\x1b\xe5\x0f\
+\xc0\xd6\xc0\xb5\xf1\x0b\x46\xf7\x64\x93\x90\x46\x7e\x59\xb9\x03\
+\x18\x98\xe2\x49\xa3\x47\x53\x66\x7b\xad\x0b\xae\xf3\x90\x33\x80\
+\xbe\x49\x3f\x68\xbc\xbb\x23\x90\x4a\x3b\xdc\xac\x56\xb9\x01\xe8\
+\x9b\x6c\xed\x11\x7e\x25\xeb\x3b\xc0\x69\x9f\x54\x8e\x33\x20\xf3\
+\x42\x83\xf6\xfb\xfb\xaa\xb6\xb8\x2b\x55\x6e\x00\x04\x9d\xd3\x3c\
+\xe8\xae\xb7\x95\x1f\x00\xe9\x61\x32\x5d\x96\x88\x42\xff\xfc\x98\
+\x1b\x80\xb9\x11\x8d\x81\x1e\xea\x4c\x9c\xcb\x47\xcc\xa2\x94\xeb\
+\x53\x60\xbe\xae\x97\x41\xa3\x9d\x49\xb8\x10\x72\xdf\x07\xcc\x8f\
+\xb0\xcb\xf2\x4b\x69\x57\x20\xa2\x10\xef\x86\xfc\x77\x82\x92\x9b\
+\xc7\xa2\x47\x8c\xdf\x4c\xf9\x46\xb8\xfa\xb7\xd0\x59\x15\x53\xd0\
+\x4e\xc5\xad\x1f\xa3\xed\xc0\xbb\x99\x44\x28\x2c\x08\x85\x15\x73\
+\xe4\x01\x9d\x5a\xaa\x69\x1b\xf0\x69\x2a\x68\xff\xd0\x21\x18\x08\
+\x85\x16\x72\x64\x58\x27\xff\x90\xee\x04\x8e\x67\x22\x19\x07\x01\
+\xa1\xf0\x22\x8e\x8d\xe8\xe7\x78\x49\xb7\x19\xbe\x4a\xfa\x42\x32\
+\xaa\x7c\x59\x2c\x65\x14\x3e\xdb\xa6\xef\xa9\xe9\x16\xe0\xbb\xa4\
+\x2f\x1c\x55\x0d\xa1\xb4\x69\xd8\x1c\xd6\xd7\x2d\x74\x2b\xb0\x90\
+\xf4\xd5\xbe\x15\x2a\x83\x50\xea\x7d\xf8\x79\x5d\x5f\x18\xdd\x01\
+\x9c\xcc\xd6\xe1\x8a\x20\x94\xbe\x10\x35\xeb\x3a\xec\x58\x75\xe0\
+\x54\xd2\x17\x44\x76\xf9\x10\x2a\x59\x89\x9b\x5b\xf5\x81\xac\xbb\
+\xc9\x1e\x9e\x2a\x80\x50\xd9\xa3\x68\xae\xa1\xb7\x6d\xed\x48\x99\
+\x5a\x3e\x41\x96\xa7\x4a\x9f\xc5\xcd\x86\xf6\xda\x7a\xaa\x23\x70\
+\x79\x87\xa7\xca\x37\x23\xcd\x3a\xcf\x09\xbf\x98\x32\x75\xfa\xf0\
+\x54\x82\x2a\x07\x80\xe4\xb9\xe3\xd1\x63\xc2\x6f\xa4\xfc\x92\xb6\
+\xcc\xd5\x03\x00\xd8\xa9\xb8\xf7\x82\xe8\x3e\x60\x26\x93\x14\x7e\
+\x78\x0a\x03\x00\x70\x70\xa3\x96\xd6\xfc\xa2\xbb\x0c\x9f\xa4\x02\
+\x23\x17\x58\x67\x30\x00\x00\x0e\x6e\xd7\xa2\x7a\x35\x0c\x1c\x4d\
+\xfa\x2a\x70\x93\x14\x14\x00\x80\xf9\xdb\xf5\x6b\x0f\xda\x0c\x9c\
+\x28\xa3\xbd\xe0\x00\x00\x1c\xaa\xeb\x87\x1e\x6b\x13\xf0\x6d\xd1\
+\x6d\x05\x09\x00\xe0\x50\x43\xdf\x10\x69\x13\xf0\x53\x36\xcb\xf3\
+\xdc\x10\x2c\x00\x80\xf9\x2d\xfa\x32\x92\x36\x63\x7e\x4b\xfa\xca\
+\xb1\xee\xa0\x01\x00\x1c\x1e\x51\x53\xd6\x96\xcc\x0f\xa9\xce\xfe\
+\xbf\xcc\x24\x35\xb7\x55\x1f\x61\xed\xa2\xfd\xf9\xad\x85\xf4\x6c\
+\xd5\x35\x75\xd5\x55\x57\x67\x87\xfe\x02\x8f\xb0\x51\x56\xec\xcd\
+\x17\x8d\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x00\x88\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x00\x3a\x49\x44\x41\x54\x58\x85\xed\
+\xcd\xb1\x11\x00\x10\x00\xc0\xc0\x30\x99\xc6\x04\x56\x30\x96\x15\
+\x2c\xe0\xdc\x59\x4d\xa5\x55\x6a\xe4\xab\x74\x01\x49\x92\x7e\x17\
+\x4e\xe4\x52\x17\x90\x1e\x4d\xe7\xe8\x2d\x03\xc4\x17\x43\x49\x92\
+\xa4\x9b\x0d\x00\xac\x05\x04\x1d\x7e\x88\x63\x00\x00\x00\x00\x49\
+\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x03\xbb\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x03\x6d\x49\x44\x41\x54\x78\x9c\xed\
+\x9b\xbd\x6f\x13\x31\x18\xc6\x9f\xf7\x2e\x15\x13\x08\xa6\x22\x35\
+\xc4\xbd\x88\x05\x06\x40\x82\x85\x1d\xca\x00\x62\x80\xa1\x0b\x12\
+\x7f\x01\x1f\x1b\xb4\x03\x08\x24\x3e\xc4\xc4\xc7\x5f\x80\xc4\xd2\
+\x01\x06\x04\x03\x85\x9d\x05\x24\xca\xd0\x6e\x77\xe7\x24\x1d\x60\
+\x00\xc4\x56\x91\xe4\x61\x48\x24\x2e\x77\x17\x68\xe3\xbb\xb8\xa5\
+\xfe\x6d\x7e\xfd\xc6\x79\xfc\xc4\x67\x5b\x39\x1b\x70\x38\x1c\xdb\
+\x19\x59\x4f\x12\xc9\x8a\xd6\xad\xb3\x14\xce\x0a\xe4\x18\x80\x29\
+\x00\x3b\xca\x95\xb6\x61\xd6\x00\xac\x12\xfc\x20\x94\x05\xa5\xaa\
+\x2f\x45\xa4\xfd\xaf\x0f\xfd\xd3\x00\xad\xf5\x49\x42\x1e\x01\x72\
+\xa0\x10\x99\xe3\x63\x59\xd0\xbd\xaa\x94\x7a\xfb\xb7\x24\x6f\x58\
+\x05\x49\x89\x1b\xad\x79\xc2\x5b\xdc\x82\x9d\x07\x80\x83\x84\xb7\
+\x18\xe9\xd6\x1c\xc9\xa1\x3f\xf4\x50\x03\x74\x73\x75\x0e\xe4\x9d\
+\x72\xb4\x8d\x0f\x01\xef\xc6\x8d\xd5\xeb\xc3\xeb\x73\xe8\x0d\x7b\
+\x6f\x31\x15\xfe\x0e\xe2\x06\xd0\x79\xad\x94\x6a\x88\x48\xa7\x50\
+\xa5\x86\x90\xf4\xb5\xd6\x35\xc0\x3f\x0d\xc1\x6d\x00\x7b\x92\xf5\
+\x82\xee\x4c\xde\xe3\x90\x31\x80\x64\x45\x37\x9a\x9f\x07\x87\x3d\
+\xdf\x75\x3b\xed\x0b\xf5\x7a\xfd\x4b\x09\xda\x0b\x27\x0c\xc3\x49\
+\xcf\xaf\x3c\x03\xe4\x44\x22\xbc\xac\x6a\xd5\xc3\xe9\x89\x31\x63\
+\x40\x1c\x37\xcf\x41\xf0\x3c\x11\xfa\xd6\xfe\x35\x71\x60\xff\xfe\
+\xbd\x5f\xcb\x12\x5c\x06\x3d\x13\x26\x56\x90\x1c\x09\xc4\xf9\xe9\
+\xe9\x7d\x2f\x92\x79\x99\x39\x80\xc2\xd9\xc1\x00\x6e\x6e\xb5\xce\
+\x03\x40\xbd\x5e\xff\x22\xc0\xcd\x64\x2c\xd3\x37\xe4\x18\xd0\x5f\
+\xe7\x13\x74\x5e\x17\x2d\x6e\x5c\x90\x9d\x57\xc9\xb2\x40\x8e\xa6\
+\x73\xf2\x56\x81\xa9\x64\x41\x29\xd5\x28\x58\xd7\xd8\xc8\xd1\x5e\
+\x4d\xe7\xe4\x19\x30\xb0\xc3\xdb\x6c\xb3\xfd\x46\xc8\xd1\x9e\xd9\
+\xbd\x0e\xdd\x07\x6c\x17\x9c\x01\xb6\x05\xd8\xc6\x19\x60\x5b\x80\
+\x6d\x9c\x01\xb6\x05\xd8\xc6\x19\x60\x5b\x80\x6d\x9c\x01\xb6\x05\
+\xd8\xc6\x19\x60\x5b\x80\x6d\x2a\x45\x34\x12\x36\x1a\x33\x1e\xe4\
+\x01\x88\x43\x58\xe7\xbb\x06\x03\x08\x60\xa9\x2b\xbc\x56\xaf\xd5\
+\xd2\xff\x5b\x6e\x18\xe3\x11\x10\xe9\xd6\x45\x8f\xf2\x06\xc4\x61\
+\x94\xdf\x79\xf4\xbf\xe3\x88\x47\x79\x13\xe9\xd6\x45\xd3\xc6\x8c\
+\x0c\x88\xa2\x68\xb7\x80\x4f\x4c\x45\x8c\x8a\x80\x8f\xa3\x28\xda\
+\x6d\xd2\x86\x91\x01\x22\x95\xe3\x00\x76\x9a\xb4\x61\xc8\xae\xbe\
+\x86\x91\xd9\xf6\x93\xa0\x91\x01\x64\xfb\x3d\x80\x9f\x05\x69\x19\
+\x85\x9f\x7d\x0d\x23\x63\x64\x40\x10\x04\x3f\x08\xb9\x6c\xd2\x86\
+\x09\x84\x5c\x0e\x82\xe0\x87\x49\x1b\xc6\x8f\x40\xa0\xaa\x4f\xbb\
+\xc2\x53\x00\x3e\xa1\xb7\x44\x95\x0d\x21\x58\xea\x0a\x4f\x05\xaa\
+\xfa\xd4\xb4\xb1\x42\xf6\x01\xfd\xf5\xd8\x78\x4d\xb6\x81\x9b\x04\
+\x6d\x0b\xb0\x8d\x33\xc0\xb6\x00\xdb\x38\x03\x6c\x0b\xb0\x8d\x33\
+\xc0\xb6\x00\xdb\x38\x03\x6c\x0b\xb0\x8d\x33\xc0\xb6\x00\xdb\x38\
+\x03\x72\x62\x6b\xc9\x02\x49\x7f\x4c\x5a\x0a\x27\x47\xfb\x5a\x3a\
+\x27\xcf\x80\xd5\x64\xa1\x77\xfc\x74\x6b\x92\xa3\xbd\x95\xce\xc9\
+\x1e\x94\x04\x3f\x0c\x46\xfc\xd3\x85\xaa\x1a\x23\x22\xfe\x99\x64\
+\x99\xe0\xc7\x74\x4e\xf6\xa0\x24\x65\x61\x30\x80\xdb\x61\x18\x4e\
+\x16\xae\xae\x64\xc2\x30\x9c\x24\x70\x2b\x19\xcb\xf4\x0d\x39\x06\
+\x28\x55\x7d\x09\x70\x25\x11\xda\xe3\xf9\x95\x67\x5b\xc9\x84\x3f\
+\x87\xa5\x07\x4e\x8c\x2f\xf7\xfa\x36\x48\x76\x04\x88\xb4\x05\xbc\
+\x92\x8a\x9e\xf0\xfc\x89\x15\xad\x9b\x97\xe2\x38\x0e\x36\xe3\xc4\
+\x48\xd2\x8f\xe3\x38\xd0\xba\x79\xa9\x77\x48\x7a\xe0\xa4\x38\x04\
+\xdd\xab\x79\x57\x68\x86\xbe\xca\x8a\x1b\xad\xf9\xff\xe1\xc2\x04\
+\x00\x10\x32\x1f\xa8\xea\xbd\xbc\xba\xa1\xfb\x00\xb5\x6f\xea\x1e\
+\x21\xf3\xe5\xc9\x1a\x0b\x24\x30\x37\x5d\x9b\xba\x3f\x2c\x61\x9d\
+\x97\xa6\xbc\x87\x00\x0e\x16\x2a\xad\x7c\xd6\x75\x69\x6a\x94\x6b\
+\x73\x47\xd1\x3b\x75\xbd\x19\xaf\xcd\xb5\x08\x7e\xdc\xc8\xb5\x39\
+\x87\xc3\xb1\xbd\xf9\x0d\x9c\xbe\x20\xb7\xf5\xf6\x9b\x02\x00\x00\
+\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x01\xdc\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x01\x8e\x49\x44\x41\x54\x58\x85\xed\
+\x97\x41\x4a\xc3\x50\x10\x86\xbf\x79\x71\xab\x0b\x45\x5d\xd8\xd6\
+\x92\x4b\x28\x28\x5e\xa0\x5e\x41\x0f\x20\xe8\x4a\xd4\x23\x58\xc1\
+\x85\x15\x3c\x88\xd0\x0b\x08\x82\x5e\x22\xe6\x25\xcf\x85\x8a\x82\
+\x74\x9d\x8c\x0b\x1b\x91\x36\x46\xac\xa9\x0a\xe6\x5f\x0d\xf3\x86\
+\x37\x1f\x33\xc3\xe3\x0d\xfc\x77\xc9\xa0\xc3\xda\xdb\x95\x94\x64\
+\x5f\x54\x96\x11\x66\x4b\xc9\xa2\x3c\xa8\xe8\x95\xc1\x6b\x2f\x2e\
+\x2e\x5c\x7e\x08\x10\x86\xd1\x2e\x22\x47\x79\x60\x25\x29\x45\x75\
+\xaf\xd9\x6c\x1c\x0f\x01\x58\x6b\x57\x15\x73\x01\x3c\x0b\xb2\x63\
+\x8c\x76\xeb\xf5\xfa\x53\x19\x59\xe3\x38\x9e\x4e\x53\x69\x29\xda\
+\x01\xa6\x04\xb3\x36\x58\x09\x6e\x6c\x74\x1e\xda\x58\xad\x75\x1b\
+\x65\x24\xcd\x93\xb5\x6e\x33\xb4\xb1\xde\xd8\xe8\x3c\xf3\x99\xcc\
+\x10\x95\x65\x00\x63\xb4\x3b\x2e\x00\xcf\xa3\x0b\x20\xc8\xd2\x10\
+\x40\x36\x70\x65\x95\x3d\x4f\xb5\x5a\xed\xb1\x6f\xce\x0d\x03\xfc\
+\x92\x2a\x80\x0a\xe0\xd7\x01\x26\x3e\x0b\x08\xa3\x68\x0b\x95\x43\
+\x60\xf2\x8b\x77\xf7\x10\x3d\x68\x36\x1a\x67\x45\x41\x85\x15\x08\
+\x82\x60\x1e\x95\xd3\x11\x92\x03\x4c\xa2\xd2\x09\x82\x60\x7e\x64\
+\x80\x9f\x50\x21\x80\xef\xfb\x77\x88\x6e\x03\xbd\x11\xee\xee\x21\
+\xba\xe3\xfb\xfe\x5d\x51\xd0\xa7\x33\xd0\xef\x61\x61\x1f\xbf\xa3\
+\xbf\xdd\x82\x0a\xa0\x02\xf8\x59\x00\xe5\x01\x5e\x3f\x90\xe3\x4a\
+\xe6\x9c\x9b\xe9\x9b\xf7\x43\x00\x2a\x7a\x05\x90\xa6\xd2\x1a\x17\
+\x40\x92\xd0\x02\x50\xf4\x3a\xf3\xbd\x3d\x44\x06\xaf\xad\xa4\xeb\
+\x8a\x76\xac\x75\xe2\x79\x74\xdf\xfd\xe1\xbe\x25\xe7\xdc\x4c\x92\
+\xd0\x52\xf4\x04\x48\x0d\x5e\x3b\x3b\xcb\x5b\x4c\xda\x8c\x6f\x36\
+\x3e\x5e\x4c\x32\xbd\xad\x66\xaf\x5f\xe7\xb9\xc1\xf3\x11\x75\xaf\
+\xe8\x75\xde\x6a\x56\xe9\x05\x72\xdf\x93\xde\xaf\x9f\x93\x4c\x00\
+\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x05\x36\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x04\xe8\x49\x44\x41\x54\x78\x9c\xed\
+\x9b\x4f\x4c\x1c\x55\x1c\xc7\xbf\xbf\x99\x59\x4c\x7a\x21\x55\x1a\
+\x52\x69\x7a\x71\x9b\x88\x21\xa9\x48\x6f\xbd\x6c\x5c\x81\x43\x2b\
+\x91\xc0\x46\x8d\xd0\x34\xd9\x8d\xbd\x7a\xb1\x07\x12\x59\x20\x31\
+\xa6\xf5\xe4\xcd\xe8\x12\x1a\x25\x9a\x66\x5b\x30\x84\xc6\x00\x62\
+\x36\x2d\x7a\xa2\x92\x18\x5d\x2e\xc5\x03\x61\x0f\x18\x6c\xc3\xa9\
+\x59\xd8\x99\x9f\x07\xf6\xc9\xec\xec\xec\xce\x2c\xf3\x67\x07\xd9\
+\xcf\xed\xcd\xfc\x66\xde\x6f\xbe\xf9\xfe\xde\x7b\x33\x79\x03\x34\
+\x68\xd0\xe0\x24\x43\x76\x82\x22\x91\xa4\xa2\xb4\xe4\xfa\x88\xf1\
+\x2e\x80\x4b\x00\xda\x00\xbc\xe0\x69\x66\xb5\x93\x07\x90\x03\xb0\
+\xca\x84\xbb\x85\x9d\xb6\xb9\x4c\x66\xbc\x60\x75\x91\xa5\x00\x3d\
+\xfd\x89\x6e\x96\xf0\x05\x80\x76\x17\x92\xf4\x11\xca\x92\xc6\x1f\
+\x2d\xce\xa6\x96\xaa\x45\xc9\xd5\xee\xd0\x3d\x98\x18\x01\xe1\x0e\
+\x80\x33\xae\xe6\xe6\x0f\x67\x40\x18\x0e\xb7\x77\xee\x6d\xac\xaf\
+\xfd\x52\x29\xa8\xa2\x00\xdd\x83\x89\x11\x30\x3e\xf5\x26\x37\x1f\
+\x21\x8a\x86\xdb\x3b\xf3\x1b\xeb\x6b\x2b\xa6\xa7\xcd\x0e\x16\x6d\
+\xbf\x58\x72\x90\xf1\x8c\x89\x47\x25\x89\x1e\x34\x63\x77\x33\x9d\
+\x4e\xab\x1e\xa4\x7b\x64\x62\xb1\x98\xbc\x8b\xe6\xf3\x9a\xc6\x57\
+\x88\x69\x02\x84\xd3\xfa\xf3\xa4\xa1\xc7\xac\x1c\xca\x04\x88\x44\
+\x92\x4a\xe8\xa5\xdc\xef\xd0\xd5\x3c\x01\x3f\xa9\xfb\x18\x5a\x9e\
+\x4b\x6d\x7b\x92\xbd\xcb\x44\xfb\x12\xad\x72\x08\xd3\x0c\xbc\x75\
+\x78\x94\xb2\xfb\xff\xbc\x7c\xd1\x38\x30\x4a\xc6\x8b\x95\x96\x5c\
+\x1f\x4a\x07\xbc\xa7\xd0\x94\x0f\x8e\xcb\xc3\x03\xc0\xf2\x5c\x6a\
+\x5b\xdd\xc7\x10\x18\xcf\x0e\x8f\xf2\x6b\xc5\x67\x2b\xa1\x4c\x80\
+\xe2\x54\x77\x78\x19\x38\xb9\x38\xfb\xe5\xdf\x5e\x24\xea\x25\xcb\
+\x73\xa9\x6d\x06\x25\xf5\xc7\x8c\xcf\x06\x98\x08\x80\x83\x79\xfe\
+\x30\x40\xa2\x07\x2e\xe7\xe6\x1b\x92\xcc\xf3\xfa\x36\x01\x5d\x65\
+\x31\x26\xd7\xb5\xe9\x1b\xcd\xd8\xdd\x74\x39\x2f\xdf\x30\xe6\xce\
+\xc0\x39\x63\x8c\x99\x00\x25\x2b\xbc\xa0\x8d\xf6\xb5\x60\x92\x7b\
+\xd9\xea\xd5\x4c\x80\x13\x85\x52\xef\x04\xec\xd0\x1b\x8b\x87\x35\
+\x4d\x1a\x05\x78\x00\x00\x88\x71\xaf\xa0\x49\x13\x3f\xff\xf0\xd5\
+\x86\xd3\x7b\x07\xde\x01\xdd\x03\x37\x2e\x68\x1a\x3d\x04\x78\x18\
+\xc0\x29\x00\xa7\x98\x70\x4d\x96\xb5\x47\xbd\xb1\x78\xd8\xe9\xfd\
+\x03\x2d\x40\x24\x92\x54\xc0\xea\xf7\x00\xce\x9a\x9c\x3e\xcb\x2a\
+\x7d\xe2\xb4\x8f\x40\x0b\x10\x6a\xc9\xdd\x04\x95\x4f\x5d\x02\x26\
+\x0c\x3a\xed\x23\xb0\x02\xf4\xf4\xc7\x3b\xc0\x18\xf3\xba\x9f\x40\
+\x0a\x10\x89\x24\x15\x26\xba\x03\x20\x64\x11\x9a\x76\xda\x57\x20\
+\x05\xb0\xb2\x7e\x91\x3d\x4d\x52\x6f\x3b\xed\x2b\x70\x02\xd8\xb5\
+\x3e\x31\x8f\x2d\xa7\xa7\xb2\x4e\xfb\x0b\x94\x00\x35\x58\x7f\x75\
+\xef\xe9\xb9\xcf\xdd\xe8\x33\x50\x02\xd8\xb5\xbe\x04\xba\x6e\xe7\
+\x83\xa7\x1d\x02\xb3\x12\xec\xe9\x8f\x77\xb0\x4d\xeb\x2f\xcc\xa4\
+\xfe\x74\xab\xdf\x40\x38\xa0\x1e\xd6\x17\xb8\xe2\x80\x37\xdf\xf9\
+\xf0\x15\x45\xd2\x46\x0f\x17\x26\x74\x5f\x92\xb4\x89\x85\xf4\xe4\
+\x13\x3b\xd7\x87\x5a\x72\x37\xc1\xfe\x5a\x5f\xe0\xd8\x01\xbd\xb1\
+\x78\x58\x96\xb5\x47\x4c\xb8\x86\xe2\x5a\x1d\xe0\x61\x4d\xa3\x87\
+\xdd\x03\x37\x2e\x58\x5d\x5f\xcb\xa8\xbf\x70\xff\x6b\xd7\xac\x2f\
+\x70\x2c\xc0\xc1\x5b\x9a\xf9\x5a\x1d\x50\xbf\x8b\x44\x92\x15\x5d\
+\x56\x4f\xeb\x0b\x5c\x18\x03\x0e\x5e\x51\x2b\x70\xa9\xe9\xc5\xad\
+\x8f\x2b\x9d\xac\xc7\xa8\x6f\xc4\xf3\x41\x90\x89\xc6\x7a\xfa\xe3\
+\x1d\xc6\xe3\xf5\xb6\xbe\xc0\xb1\x00\xc4\xb8\x67\x11\xd2\xc4\x12\
+\x4d\xe9\x4b\x21\x08\xd6\x17\x38\x16\x40\x95\xd5\x5b\x00\xf6\x2c\
+\xc2\x4a\x4a\x21\x08\xd6\x17\x38\x16\x60\x39\x3d\x95\x05\x61\xdc\
+\x2a\x4e\x94\x42\x50\xac\x2f\x70\x65\x0c\xd8\xdf\x69\xbb\x0d\xc6\
+\x63\x8b\xb0\x26\x96\xe8\x5b\x96\xa4\x69\x04\xc0\xfa\x02\x57\x04\
+\xc8\x64\xc6\x0b\xc4\x7c\x1d\xd6\xa5\xf0\x3a\xc0\x17\x2d\x62\x7c\
+\xb1\xbe\xc0\xb5\x59\x60\x71\x76\xf2\x0f\x3b\xa5\x60\x85\x5f\xd6\
+\x17\xb8\x3a\x0d\xda\x2c\x85\x6a\xf8\x66\x7d\x81\xab\x02\xd4\x50\
+\x0a\x66\xf8\x6a\x7d\x81\xeb\x0b\xa1\xa3\x96\x82\xdf\xd6\x17\x78\
+\xb2\x12\x3c\x42\x29\xf8\x6e\x7d\x81\x27\x02\xd4\x58\x0a\x75\xb1\
+\xbe\xc0\xb3\x77\x01\xbb\xa5\x50\x2f\xeb\x0b\x3c\x7d\x19\xb2\x51\
+\x0a\x75\xb3\xbe\xc0\x53\x01\x32\x99\xf1\x82\x24\xf3\x7b\x00\xcc\
+\x36\x59\x6c\x4a\x12\xbf\x5f\x2f\xeb\x0b\x3c\x7f\x1d\x5e\x48\x4f\
+\x3e\x51\x18\x97\x19\x98\x07\xf0\x1c\xc0\x73\x06\xe6\x15\xc6\x65\
+\xbb\x9f\xcc\xbc\xc4\x97\xaf\xc2\x3f\xce\xa4\xb6\x00\xbc\xed\x47\
+\x5f\xb5\x12\x88\xaf\xc2\xf5\xc4\x4c\x80\xbc\xbe\x11\x8b\xc5\xaa\
+\xed\x27\x0e\x34\x26\xb9\xe7\x8d\x31\x66\x02\xe4\xf4\x8d\x5d\x34\
+\x9f\x77\x33\x29\x3f\x31\xe6\x4e\xc0\x96\x31\xc6\x4c\x80\x55\x7d\
+\x43\xd3\xf8\x8a\xcb\x79\xf9\x86\xa6\xd2\x55\x7d\x9b\x51\x3e\x25\
+\x97\x09\xc0\x84\xbb\xfa\x36\x31\x4d\x44\xfb\x12\xad\xee\xa7\xe7\
+\x2d\xd1\xbe\x44\x2b\x81\x4b\x16\x62\xc6\x67\x03\x4c\x04\x28\xec\
+\xb4\xcd\x01\x58\xff\xef\x00\xe1\xb4\x1c\xc2\xf4\x71\x12\x41\x6c\
+\x96\x2e\xdd\x31\x4e\xd9\xe2\xb3\x95\x50\xdb\x76\x79\x50\x52\x92\
+\x79\x3e\xd0\xdb\xe5\x55\xba\x4a\xe0\xf1\x23\x6f\x97\x17\xfc\x6f\
+\x7e\x98\x00\x40\xcc\x23\x8b\x33\x93\x9f\x99\x9d\xab\x38\xc5\xfd\
+\x95\xfd\x6d\x25\xdc\xde\x99\x07\x51\xd4\xbb\xd4\x3c\x87\x19\x18\
+\x59\x9a\x99\xbc\x55\x29\xa0\xea\x1c\xbf\xb1\xbe\xb6\x12\x7e\xf5\
+\x8d\x5f\x41\xd4\x85\x63\xf7\xdf\x10\x65\x49\xc3\xd0\xd2\x4c\xea\
+\x9b\xaa\x51\x76\x6e\xa5\xff\x6d\x8e\x80\xae\xe2\xae\xeb\xc0\xfd\
+\x36\x47\xc0\x16\x03\x8f\x6b\xf9\x6d\xae\x41\x83\x06\x27\x9b\x7f\
+\x01\x0f\x15\x0b\x99\x9e\x82\xdf\x92\x00\x00\x00\x00\x49\x45\x4e\
+\x44\xae\x42\x60\x82\
+\x00\x00\x02\x05\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x01\xb7\x49\x44\x41\x54\x58\x85\xed\
+\x96\xbd\x4a\xc3\x50\x14\xc7\xff\x27\x1f\x53\xc1\x07\xf0\xda\x34\
+\x43\xf7\x82\x93\x08\xe2\x2b\x88\x0e\xd2\xc5\x17\xd0\x45\x10\x71\
+\xe9\xd4\xc1\x41\x74\x29\x3e\x81\x93\x43\x9f\xc0\x45\x90\x82\xa3\
+\x7d\x80\x62\x3e\x50\x33\xb8\xe8\x20\xa1\x69\x7b\x1c\x6c\x42\x13\
+\x9b\x34\xe9\xe7\xd0\xfe\xa7\xfb\x71\xee\xfd\xff\x72\xee\xb9\x97\
+\x00\xcb\x2e\x4a\x9a\x74\x1c\x27\xe7\xba\xed\x2a\x88\xf6\x01\x14\
+\x26\xf4\x32\xc1\x54\x57\x55\xaa\x08\x21\x7e\x46\x02\x38\x8e\x93\
+\x73\xdb\x5e\x03\x8c\xd2\x84\xc6\x61\x11\x9a\xaa\x2c\x6d\xfb\x10\
+\x52\x5c\x9c\xeb\xb6\xab\x53\x37\x07\x00\x46\xc9\xf3\xb8\xea\x77\
+\x63\x01\xfa\x69\x9f\x8d\x88\x0f\xfc\xa6\x92\x10\x16\x3a\x73\xbd\
+\x90\x4f\xac\x97\x51\x32\x4c\x9b\x87\xed\x1d\x9f\x81\x39\x69\x05\
+\xf0\xaf\x06\x5a\xad\x37\x4d\x51\x78\x97\xc1\xa1\x71\xc3\xb0\x4f\
+\x62\x77\x91\xb8\x47\x2c\x37\x35\x6d\xfd\x99\x88\xba\x59\x00\x42\
+\x85\x65\x18\xd6\x19\x88\x2e\x87\x81\xa5\x11\x03\x4f\xc4\xdd\x43\
+\x5d\xd7\x3f\xa2\x73\x91\x22\x0c\x8a\x3a\x38\x82\x57\xcb\x2a\x83\
+\xe8\x6a\x5c\x73\x00\x20\x60\x87\x49\xbe\x67\x66\x39\xed\x9a\x00\
+\x80\x98\xce\xc7\x35\x8e\x42\x58\xd6\xfb\x56\xda\xf8\xc1\xaf\x0d\
+\xbf\x7a\x84\xdb\xd4\xae\x8c\x3d\x00\x22\xe8\x52\xb7\x04\xa0\x91\
+\x15\x20\x54\x0f\xba\x96\x8f\x2f\xba\x88\x0c\xcb\x06\x18\xc7\xc1\
+\x40\x8f\x52\xdf\xae\x85\x5f\xc3\x15\xc0\x0a\x60\xe1\x00\x63\xbf\
+\x7a\x89\x22\xd4\x0c\xd3\xae\x25\x44\x98\x7e\x63\x31\x19\x60\xaa\
+\xfb\xcd\xd9\x64\x20\x49\x84\xa6\xaa\x50\xc5\xef\xce\x33\x03\x26\
+\x98\x6e\x06\xff\x88\xff\x78\xfa\x32\x4c\xfb\x0b\xc0\xda\x34\x9c\
+\x08\x74\x54\x28\x6c\xdc\xa5\x89\x1d\xcc\xc0\xc3\x34\xcc\x01\x74\
+\x3c\x85\x1e\xd3\x06\x07\x00\x1d\x45\x3a\x05\xf0\x39\xb1\x3d\xf3\
+\x45\x51\x08\x3b\x33\x40\x51\x08\xbb\xa3\x48\x9b\x00\xea\x00\xbe\
+\xb3\xda\x02\x78\x61\xe2\xb2\xae\x6b\xd7\x19\xd7\x2e\xb9\x7e\x01\
+\xf9\xaa\x7b\xc5\x23\x95\x73\x7f\x00\x00\x00\x00\x49\x45\x4e\x44\
+\xae\x42\x60\x82\
+\x00\x00\x01\xa6\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x01\x58\x49\x44\x41\x54\x58\x85\xed\
+\xd2\x31\x2f\x43\x51\x18\xc6\xf1\xff\x39\x15\x03\x89\x10\x42\xba\
+\x11\x9b\x89\xb0\x89\x45\xb4\x69\xd0\x44\xb5\xb5\xd5\xc0\x15\x12\
+\x1f\xc0\x66\x12\x1f\xc0\xac\xb5\x34\x62\x68\x99\x08\xad\x44\x42\
+\x48\x37\x11\xc2\xd6\x45\x27\x83\x44\xca\xe4\xde\xfb\x5a\x19\x38\
+\xda\x2e\x12\xe7\x37\x3f\x79\xce\xf3\x26\x07\x2c\xcb\xb2\xac\xff\
+\x4e\x99\x02\xa1\xb8\xb3\x0d\x0c\x2b\x5f\x52\x85\x83\xf4\xdd\x6f\
+\x4a\x23\x33\x2b\xbd\x5e\xc0\xcd\x02\x2f\xc5\xfc\xf6\x34\x20\xdf\
+\x65\xb5\x79\xa1\xb4\x03\x83\xa2\xf5\x65\x38\xe6\x8c\x9b\xf2\xe1\
+\xa4\x33\xec\x35\xb9\x25\x60\x14\xa4\xd3\x94\x37\x0e\xa8\xea\xb6\
+\x14\x8a\x1c\x48\x9b\x68\x8e\x27\x12\xce\xfc\x77\xd9\x89\xd9\xc5\
+\x29\xf1\x39\x47\xe8\x11\xd4\xd9\xbb\xe7\x45\xf8\xe1\x7a\x80\x80\
+\x69\x40\xe5\xbe\xe4\xa6\x92\xd1\x7c\xe5\xe9\xb5\x15\x18\x53\x10\
+\xeb\x1f\x18\x92\xf2\xc3\xf5\xf9\xe7\x5c\x28\xbe\xb4\xa2\x14\x59\
+\xa0\x19\xc8\x76\xe8\x97\xb9\xa3\xfd\xdd\x37\x53\xbf\xf1\x0f\x7c\
+\x7d\xc4\x59\x05\xb6\x00\x8d\xb0\xf3\xdc\xa5\x97\xa7\x83\x41\xef\
+\xea\xb6\xb2\x89\x52\x6b\x00\xa2\x64\xe3\x34\x97\x5e\xc7\x70\x79\
+\x5d\x03\x00\xc2\xf1\xc5\xa8\xa0\xf6\x80\x16\x81\x0b\x05\x55\x60\
+\x12\x70\x15\xb2\x5c\xc8\xa7\x33\xb5\xf4\xd5\x3c\x00\x20\x14\x5f\
+\x18\x01\x7d\x08\x74\x03\x08\x54\x95\xf2\x13\xc5\x5c\xa6\x50\x6b\
+\x57\x5d\x03\x00\xc2\x49\xa7\x4f\x7c\xca\xc0\xa3\xf6\xfd\xe8\xc9\
+\x41\xe6\xa6\xde\xae\x46\x28\x1a\x38\xc2\xb2\x2c\xcb\xfa\x13\x3e\
+\x00\x77\x85\x6b\x30\xd4\xa0\xe5\x67\x00\x00\x00\x00\x49\x45\x4e\
+\x44\xae\x42\x60\x82\
+\x00\x00\x01\xa5\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x01\x57\x49\x44\x41\x54\x58\x85\xed\
+\xd2\xcd\x2b\x44\x51\x1c\xc6\xf1\xef\xb9\x93\xd2\x28\x29\xe5\x65\
+\xc7\x7f\x20\xf7\x92\xb2\xb3\x9a\x30\x3b\x65\x35\x56\x9a\x3b\xc2\
+\x88\x8d\xdd\xac\x64\xa5\xa6\xb9\x77\x33\x23\x79\xa9\x59\x58\x58\
+\x29\x25\x1b\x45\x22\xae\xa2\xac\x6d\x94\x6c\x88\x14\xa9\x3b\xf3\
+\xb3\x30\x0b\xd4\xb8\x33\x63\x25\xe7\xb3\x3c\x3d\x3d\x3d\xa7\x73\
+\x40\xd3\x34\x4d\xfb\xef\x54\x50\xc0\xb2\x33\x2b\x60\x98\xa8\x62\
+\xcc\xcb\xce\x5c\x55\x52\xda\x97\x48\x77\xf8\x12\xca\x83\x7a\xf2\
+\x72\x53\xc3\xa0\xa4\x5c\xd6\x08\x6c\x13\x9a\x40\xba\x10\x75\xd4\
+\x9d\x70\x07\x82\xe2\xdd\x13\x19\xd3\x97\xd0\x09\xd0\x0f\x34\x07\
+\xe5\x03\x07\xd4\x35\x14\x62\xc0\x16\xd0\x68\x88\xec\x5a\xb6\x33\
+\x56\x2e\x6b\xc6\x9d\x21\xa3\xa8\x0e\x80\x56\x60\xdf\x7f\xf3\x23\
+\x3f\xdd\xbe\xa2\x01\xc7\xe9\xb9\x57\xaf\xed\x7e\x54\x50\x4b\x40\
+\x1d\xb0\xd1\x63\x3b\x29\x90\x2f\xcf\x67\xda\x6e\x42\x29\xb6\x81\
+\x30\x48\xfe\xe5\xe1\x3e\x72\xb1\x3e\xfb\x18\xd4\x1f\xf8\x07\x3e\
+\xb3\xe2\x99\x49\x94\x72\x3e\x86\xcb\x9a\x48\xbd\x7d\xde\x7e\x5b\
+\xb0\xee\x9a\x17\x81\xf9\x52\xe1\xc2\x59\x6e\x3a\x15\x74\xf3\x9a\
+\x06\x00\xf4\xd8\x4e\x54\x60\x13\x08\x2b\x38\x14\xd4\x33\xc8\x20\
+\xe0\xa3\xb0\xbd\x6c\x72\xb5\x9a\xbe\xaa\x07\x00\xf4\xda\xae\x25\
+\xc8\x8e\x40\x4b\xe9\xe8\x59\x84\x91\xf3\xe5\xe4\x5e\xb5\x5d\x35\
+\x0d\x00\xe8\x1d\x77\x3b\x8b\x21\xb9\x06\x6e\x0c\x88\x9e\xe6\x92\
+\x97\xb5\x76\xfd\x82\xa8\xef\x9f\x51\xd3\x34\x4d\xfb\x73\xde\x01\
+\x57\x2b\x69\x45\xc4\x74\x4c\x85\x00\x00\x00\x00\x49\x45\x4e\x44\
+\xae\x42\x60\x82\
+\x00\x00\x02\xdb\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x02\x8d\x49\x44\x41\x54\x58\x85\xe5\
+\x97\x4f\x48\x54\x51\x14\xc6\x7f\xe7\x8d\xb8\x11\x82\x12\x03\x75\
+\x35\xb8\x10\xc9\x4d\x6d\x32\x8c\x28\x9c\xa6\x85\x12\x18\x6f\xb6\
+\x12\xcc\x64\xad\x5c\xa9\x2d\x87\xc1\xd5\x04\x2d\x12\x92\x2c\x27\
+\x28\x17\x19\xc6\xb8\x49\x28\x07\x13\x02\xff\xb4\xa9\x8d\xd5\x4e\
+\xdd\xd8\x42\x29\x68\xe1\x46\x98\x7b\x5a\xf8\xde\xf4\x1c\x9a\x3f\
+\x6f\x7c\xb6\xa8\x6f\xf5\xde\xb9\xe7\x9e\xef\x7b\xdf\xb9\x97\x77\
+\x2f\xfc\xef\x90\xe2\xc0\xd5\x1b\xf1\x6e\x44\xee\x02\x5d\x40\x53\
+\x40\x3c\xbb\xc0\x1a\xaa\xe9\x5c\x36\xb3\xec\x1d\x08\x79\x5f\x22\
+\x76\x7c\x58\x90\x17\x40\x3b\xd0\x10\x10\x39\x4e\xad\x76\x44\x6e\
+\xb6\x75\x9c\xdb\xdb\xf8\xfa\x71\xd5\x1d\x28\x38\x10\x89\x0d\x5e\
+\x14\x63\xde\x03\x3f\x51\x1d\xb2\x42\xcc\xbf\x9d\xcd\xfc\x08\x82\
+\xfd\x5a\x2c\x7e\xca\xe4\xe9\x45\x64\x1c\x38\x81\xea\x25\xd7\x89\
+\xba\x82\x12\x63\x46\x01\x41\x75\x28\x97\xcd\x4c\x07\x41\xec\xc2\
+\xf9\x90\xe9\x88\x9d\x10\x51\x9e\x39\x2d\xbe\x0e\x60\x79\xf2\xba\
+\x00\xac\x10\xf3\x41\x92\x7b\xa1\xf9\x7d\xb7\xf6\x79\x37\xe6\x15\
+\xd0\xe4\x51\x7b\x2c\x58\x9c\x7b\xfe\xdd\x79\x3c\xed\xc6\xea\x4a\
+\xe4\xd6\x8c\xa8\x7d\xab\x4f\x55\x1f\x03\x88\xc8\xe0\xc2\xab\x27\
+\xaf\xcb\xe5\x07\x2a\x20\x1a\x4b\x84\xd5\xe8\x0c\xce\x0e\x72\x84\
+\xb4\x94\x9b\x63\x95\x1b\xf4\x83\x64\x32\x69\xa9\xe1\x29\x3e\xb7\
+\x6f\x60\x02\x56\x3f\x7f\xbb\x03\x5c\xf6\xc6\x14\xc6\xfe\x8a\x80\
+\x68\x2c\x11\x56\xd5\x7b\x87\xc9\x65\xa9\xbb\xb3\x75\xf2\xd8\x05\
+\x94\xb0\x7e\xcf\xb2\x34\x9e\x4a\xa5\x4c\xa5\xf9\x15\x17\x61\xa5\
+\x55\x5d\xc2\xfa\x91\xdc\xec\xd4\x66\x35\x1f\x50\xd1\x01\x87\xbc\
+\x19\x68\x56\xd5\x99\x68\x2c\x11\x2e\x88\x3b\x82\xf5\x2e\xfc\x6e\
+\xc3\x06\x63\x24\x93\x4c\x26\x23\x00\x2b\xeb\xdb\x35\x5b\x5f\xb5\
+\x00\x85\x31\x81\x09\xf7\x5d\xd0\x2b\xcb\xeb\xdb\xb7\x2d\x11\xe1\
+\x08\xd6\xbb\xa8\xd8\x82\xee\xce\xd6\x49\x45\x96\xbc\x31\x81\x09\
+\x55\x7d\x78\x98\xdc\x9f\xf5\x55\x0b\x48\xa5\x52\xc6\xb2\x34\x0e\
+\xec\x95\x49\xf3\x6d\x7d\xd5\x02\x00\x16\x66\xa7\x36\x45\x64\xb4\
+\xd4\xb8\xc2\xc8\x82\x4f\xeb\x7d\x09\x00\xb8\x70\xa6\xe5\x51\x71\
+\x2b\x0e\xc8\x6b\xb3\xde\xb7\x80\x12\xad\xa8\xd9\x7a\xdf\x02\xe0\
+\xa0\x15\xc6\xa8\x0d\xba\x05\xba\x65\x8c\xda\xb5\x5a\xef\xc2\xf7\
+\xef\x78\x71\x2e\xf3\x06\x08\x57\x4c\xac\x12\x5e\x07\x76\xe1\xe0\
+\x00\x19\x54\xf1\x62\xf4\xf4\x0f\x34\x3a\x8f\x3b\x7f\x12\xb0\x06\
+\x60\xf2\xf4\x1e\x97\x00\x09\xd5\xbb\xb5\x3f\xb8\xb1\xdf\x2d\x50\
+\x4d\x23\xd2\x87\xc8\x78\xc4\x4e\x88\xe6\xf7\xe7\x3d\x67\xb8\x23\
+\xa1\xa7\x7f\xa0\x51\x42\xf5\xbd\xa2\x3c\x00\x0c\xaa\xe9\x82\x28\
+\x6f\x62\xc4\x8e\x0f\x8b\x4a\x9a\x00\x0f\x2a\x45\x30\x28\xa3\xb9\
+\xec\xd4\x7d\x37\x70\xe8\x66\xb4\xf1\xe5\xd3\x4a\x5b\xc7\xd9\x45\
+\x44\x9a\x80\x93\x04\x77\x3b\xda\x01\xde\xa1\x9a\xc8\x65\x33\x2f\
+\x03\xaa\xf9\x8f\xe0\x17\xaf\x0f\x09\xa8\xe3\xe3\x70\xe1\x00\x00\
+\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x01\x07\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x00\xb9\x49\x44\x41\x54\x78\x9c\xed\
+\xd9\x51\x0d\x83\x50\x10\x05\xd1\xa5\xc1\x1a\x0a\xb0\x80\xac\x5a\
+\xa8\x02\xc4\x81\x8c\xd3\xe4\xcd\x18\xd8\xc9\xe4\xfe\xed\x0c\xe4\
+\x38\xaf\xe7\x38\xaf\x47\x3a\x7c\xe4\xf1\x7f\xa0\x00\x5a\x40\x53\
+\x00\x2d\xa0\x29\x80\x16\xd0\x14\x40\x0b\x68\x0a\xa0\x05\x34\x05\
+\xd0\x02\x9a\x02\x68\x01\x4d\x01\xb4\x80\xa6\x00\x5a\x40\x53\x00\
+\x2d\xa0\x29\x80\x16\xd0\x14\x40\x0b\x68\x0a\xa0\x05\x34\x05\xd0\
+\x02\x9a\xe5\x03\x6c\xf2\xb8\x7e\x8d\xcf\xb4\x80\xd9\xb5\xc0\xcc\
+\xcc\xfd\xfb\xb2\x25\x2e\xbf\x80\x02\x68\x01\x4d\x01\xb4\x80\xa6\
+\x00\x5a\x40\x53\x00\x2d\xa0\x29\x80\x16\xd0\x14\x40\x0b\x68\x0a\
+\xa0\x05\x34\x05\xd0\x02\x9a\x02\x68\x01\x4d\x01\xb4\x80\xa6\x00\
+\x5a\x40\x53\x00\x2d\xa0\x29\x80\x16\xd0\x14\x40\x0b\x68\x96\x0f\
+\xf0\x02\x2e\x56\x08\x76\x9d\x62\x12\xf1\x00\x00\x00\x00\x49\x45\
+\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x00\x86\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x00\x38\x49\x44\x41\x54\x58\x85\xed\
+\xce\x31\x11\x00\x30\x08\x04\x41\x26\x9a\xf0\x84\x1f\x0c\x13\x11\
+\x50\xee\xf5\xff\xb3\x11\x8b\xb2\x7a\xb2\x7a\x36\x1f\x6f\x33\xbe\
+\x08\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xe0\
+\x03\xf8\x62\x04\x97\x5f\x3b\xc3\x6b\x00\x00\x00\x00\x49\x45\x4e\
+\x44\xae\x42\x60\x82\
+\x00\x00\x00\xcb\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x00\x7d\x49\x44\x41\x54\x78\x9c\xed\
+\xd9\xc1\x0d\x80\x20\x14\x05\x41\xb4\x29\xba\xa6\x10\x8b\x12\xcb\
+\x58\x13\x66\x1a\xf8\x2f\x1b\x6e\x8c\x11\x9a\xeb\xdd\x73\xbd\xbb\
+\xdc\x70\x97\xc7\xff\x40\x80\x7a\x40\x4d\x80\x7a\x40\x4d\x80\x7a\
+\x40\x4d\x80\x7a\x40\x4d\x80\x7a\x40\x4d\x80\x7a\x40\x4d\x80\x7a\
+\x40\x4d\x80\x7a\x40\x4d\x80\x7a\x40\x4d\x80\x7a\x40\x4d\x80\x7a\
+\x40\x4d\x80\x7a\x40\x4d\x80\x7a\x40\x4d\x80\x7a\x40\xed\xf8\x00\
+\x57\x79\xbc\xfe\x1a\x1f\xa3\x7f\x01\x4f\x7c\x1f\x00\x00\x00\x00\
+\x00\x00\x00\x4e\xf0\x01\xb9\x04\x09\xb0\x92\x01\xea\x01\x00\x00\
+\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x0c\xd6\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x0c\x88\x49\x44\x41\x54\x78\x9c\xe5\
+\x9b\x5b\x6f\x5b\xc7\x11\x80\xbf\x25\x45\x8a\x94\x28\x89\x92\xad\
+\xbb\x64\xc9\x4e\x9a\xc2\x41\xe0\x26\x45\xd1\xa0\x48\x0a\xf4\xa9\
+\x7d\xe9\x7b\x81\x16\xfd\xa3\x7d\x2a\x50\xb4\x0f\x41\x90\x36\x4e\
+\x52\x20\x69\x92\xc6\x96\x6c\xc9\x37\x5d\x48\x49\xa4\x2e\xe4\xf4\
+\x61\xf6\x1c\xee\xd9\x33\x87\xa4\xe4\xf4\xc9\x03\x10\x24\x77\xf7\
+\xcc\xce\xcc\xee\xce\x6d\xe7\x00\xb2\x05\xe2\x78\xe3\x40\x9c\xf2\
+\x9e\xfe\x78\x93\x84\x90\xe3\xf9\x4d\x12\x42\x96\x57\x97\xed\xe0\
+\x0e\xf0\x18\x9c\x14\x3c\xdc\x00\x6e\x19\x1d\x25\x60\x32\x8b\x2f\
+\x6d\xaf\x0d\xa1\x66\x12\x10\xe0\x62\xc8\x98\x73\xa0\x67\xb4\x77\
+\x81\xbe\xd1\xfe\x12\xdc\xa9\x8d\x2a\xcf\xa3\x1b\x35\x00\x64\x1b\
+\xb8\xed\x09\x3d\x01\x5e\xf8\x89\xa7\x80\x39\xdf\x2e\xc0\x59\xd0\
+\x3e\xeb\xdb\xfa\xbe\x1d\x8f\xa3\x0a\x34\x81\x8a\xef\x3f\xf7\x34\
+\x54\xfd\xf7\x25\x70\x04\x97\xa7\x50\x39\xf2\x6d\x53\xa8\x20\x9d\
+\x9f\xff\xc4\xff\x9f\xf2\x6d\x0e\x68\x01\xa7\xbe\x7d\x29\xe8\x7b\
+\x01\xee\x71\x31\x6f\x85\x52\x92\x2d\x90\x09\x90\x8f\x40\x56\x8d\
+\x31\x6b\x20\x0b\x46\xfb\x06\xc8\xbc\xff\x3d\x05\x72\x0f\xe4\xae\
+\xff\xcc\x80\xdc\x01\x19\xb2\x23\xa4\xee\xc7\x2c\xa8\xe0\xe5\xae\
+\xc7\x31\xe1\xfb\xe7\x40\x36\xf3\x47\x55\x9a\x05\xed\x1b\x20\xbf\
+\x06\x29\x5f\xf3\x88\xcb\x04\xc8\x9f\xf5\xc1\x5c\xdf\x36\x48\xc5\
+\x68\x7f\xdb\x3f\xb7\xe2\x27\x5b\x8e\xf0\xdd\x1b\x73\x72\x3c\xe3\
+\x25\xff\xdb\x79\x46\xb6\xa0\x75\x4b\xdb\xe5\x2d\x83\xd9\x32\xc8\
+\x4f\x8c\xf6\x09\x90\x3f\xda\xbc\x14\x13\xf0\x91\x7f\x30\x92\x9a\
+\xac\x17\x30\x7f\xc7\x7f\xb6\xed\x15\x96\xed\x6b\x4c\x4e\x60\xa2\
+\xe2\xf6\x59\x15\x4e\x7b\x49\xe7\xcb\xf5\x97\xb3\xcf\xa5\xbb\xb9\
+\x02\xf2\xab\x71\x27\xdf\x1e\x6c\xfb\x50\x63\xca\x14\xc8\x6d\x63\
+\xfc\x2a\xc8\x07\xba\x7d\x4d\x7c\xf3\x5e\x79\x5e\x13\x64\x56\xb7\
+\xbc\xd9\x37\x07\xf2\x00\x64\xd1\xe8\x6b\xfa\x67\x23\xcb\x26\x9b\
+\xfa\xc9\x82\x71\x26\xe4\x17\xe0\x3e\x0d\xfe\x27\xca\xa3\x07\xec\
+\x01\x21\xa3\xab\x70\x79\x0b\x2a\x5f\x0e\xe1\x64\x0d\x78\x5a\xd0\
+\x97\xda\xe1\x1b\x3c\x0b\xf0\x00\xba\x4f\xa0\xf6\x2a\x68\xeb\x28\
+\x5d\x94\xc9\x29\xbc\x98\x37\x98\x30\x90\xc6\xc4\x34\x50\xe6\x1f\
+\xa0\x5a\xbd\xed\xc7\x6c\x01\x2f\x54\xa1\x0f\x05\xf1\xc4\x2c\xf9\
+\xff\x89\xe9\x4a\x34\x78\xd8\x46\xd0\xf6\xc2\xa0\x25\x86\x17\x20\
+\x82\x32\xbc\xe7\x9f\x5d\x02\x7e\x06\x7c\x0e\xcc\xa0\x16\x22\x81\
+\x9c\xd9\x8c\x04\x20\x0d\xd4\xcc\x24\xff\x37\x80\x36\xb8\x5d\x3f\
+\x51\x05\x35\x5d\x9b\xc0\xd7\xe0\xae\xf4\x7c\xb9\x13\x72\x20\xce\
+\x8f\x9b\x42\x7d\x81\x6f\x47\x98\x9f\xf8\xd9\x45\x60\x1a\x35\xa9\
+\x7b\xf6\xb3\xd2\x86\xfa\x0b\xd4\x9f\x58\x01\x7e\x00\x16\x80\xcf\
+\x80\xe7\x80\xb7\x3c\xec\xf8\xe7\x7b\xaa\xdb\xdc\x55\xd1\xc4\x5b\
+\x03\xf3\x26\x5b\x59\xcd\x29\x1b\x5e\x0f\x7c\x1c\x29\x46\xcb\x4c\
+\x2e\xa1\xa6\x72\x46\x3f\x37\x05\x59\xf5\xca\x78\x3d\x6b\x55\xd2\
+\xfe\x99\x81\x7e\x91\x09\x90\xdf\x78\x2b\x11\xb6\x07\x8a\x51\xee\
+\xaa\x8e\x18\x40\xc9\x98\xb5\xaf\x13\xb2\x0b\xae\x17\x8d\x5d\x03\
+\xfe\x0e\xdc\x09\x84\x10\xac\xcc\x61\x53\x19\xe7\x10\xdc\x53\xdf\
+\x37\xe6\xaa\x9b\xe0\x9f\x75\x4f\x80\x03\xc5\x7d\xd8\xcc\xf7\x8b\
+\x03\xd6\x81\xbf\x01\xf7\xb2\x73\xba\x9e\xf2\x22\xeb\x18\x47\xc0\
+\x12\xc0\x14\x70\x16\x31\x0f\x7a\xe6\xbf\xf3\x5b\xe9\x31\x59\x21\
+\xa0\x1a\xb9\xd9\x57\xc6\xdd\xe5\xf8\x3c\x8e\x0b\xee\x52\x71\x37\
+\xfb\xd1\x6e\x08\x3d\xbc\x1e\xf0\x04\x3d\x7a\xe1\x90\x1e\xea\x29\
+\x4e\xc7\x58\x2d\x25\x38\xe7\x57\x2f\x00\xd9\x46\x95\x4c\x29\x30\
+\x77\x07\xc0\x7d\xe0\xd2\x9b\xab\x57\xe8\xee\x09\x4d\x9e\x9f\xd0\
+\xdc\x04\x25\xe8\xfa\xe3\x56\x3b\xc4\xf6\xf7\xa7\x81\x2e\x48\x78\
+\x66\xfb\x3a\x56\xee\x03\x47\xe8\xca\x7f\xad\x63\x05\xa0\x03\x9d\
+\x13\xa8\x2f\x92\xd1\x67\xee\x08\xe4\xa7\xf1\x04\x63\x58\x01\x79\
+\x0b\x2e\x2a\x50\x9d\x46\x15\xd3\x29\x83\xad\xbd\x0b\xfc\x0e\xf8\
+\x4b\x01\x03\x01\x74\xe6\xa1\x9e\x04\x3f\x3e\x4e\xa8\x1d\xf9\xce\
+\x79\xd4\x52\xf8\x1d\xd5\x39\x87\xfa\xe1\x10\x64\x5d\xd4\x3c\xfe\
+\x06\xf8\x24\xa0\xd9\x2b\xcf\x7a\x0d\xb8\x0d\x72\x1e\x2d\x66\x6e\
+\x25\x62\x01\xc4\xd1\xe1\x5d\x60\x1a\x26\x1f\xaa\x12\x74\xfb\xd9\
+\xe1\xb2\x0e\xfc\x03\x0d\x70\x8c\x20\x43\x80\xee\x6d\xa8\x4d\x40\
+\xfd\x25\xb8\x4e\x01\x43\x47\xd9\xbf\x52\x07\x16\xe0\xa2\x06\xd5\
+\x93\xbc\xd6\x4e\x7d\x93\xbf\x02\x6b\xe0\xf6\x82\xce\x36\xc8\x09\
+\xba\x63\xdf\xf6\x9e\x6b\x42\x5b\x9f\xe8\xd8\xc7\x3a\xa0\x0a\x9c\
+\xfb\x09\xee\xa1\xab\xf2\x85\x4d\xb3\x2c\xa1\xdb\xbe\x87\xad\x13\
+\xa6\x81\x55\xa8\xb5\x55\x89\x15\x32\x6f\x80\xeb\xe8\x33\xd5\xb6\
+\x32\x18\x1e\xab\x30\xaa\xa3\x87\xfa\x02\x2b\x05\x88\xbe\xf1\x63\
+\xee\xf9\xe7\x3a\x64\x1d\xb9\x22\x2b\xc0\x06\xf0\x0c\xf5\x01\x8c\
+\x03\x7c\xd8\x04\xba\xe0\xba\x9e\xe0\x48\x31\x1e\xcd\x43\xbb\x86\
+\xae\xc2\xf9\x58\x3c\xdb\x70\x01\x3c\x85\xf6\x24\x1c\x2f\x60\x87\
+\xb4\x5d\xe0\x4c\xe7\x8c\xc1\x9d\xa1\x8b\xfa\x83\xe7\x29\xc7\x8b\
+\x25\x80\x06\xea\x3d\x2d\xe6\xb7\x7c\x02\xcd\x29\x70\xad\x6c\x5b\
+\x22\x84\xcb\xf7\x61\xae\x07\xb3\xaf\xcc\x47\x6f\x04\xb3\xaf\x60\
+\xf6\x52\x71\x5b\x47\xcd\xb5\x60\xae\x20\x16\x61\x07\x35\xdf\x2d\
+\xd4\xc2\x65\xc0\x12\xc0\x34\xaa\x3d\x0b\x94\x9a\x2c\xa3\x6e\xaa\
+\x01\xc7\x4d\xa8\x7c\x0f\xcc\x33\x7e\xec\x3d\x06\x88\x03\x16\xa0\
+\xf2\x9d\xce\x61\xc2\x73\xdb\x59\x72\x97\x40\x19\xdc\x31\xba\xb8\
+\x19\xb0\x04\x20\xa8\x69\xd9\x29\x20\x64\xc2\xb6\xf3\x32\x05\xa5\
+\x64\x22\x7f\x1c\xac\x60\xeb\xda\x10\x6e\xfb\x16\x94\x4a\x5e\xbf\
+\xc4\xc3\xae\x94\x36\xb1\x78\x3a\xd4\x23\x34\xda\x0a\x94\x07\x83\
+\x4c\xbf\x7d\x13\xd5\xb2\xe1\x2a\xcc\x82\x74\x81\x15\x98\xd9\x0f\
+\xfa\x5a\xc0\xbb\xc0\x13\xd2\x8c\x4e\x06\x92\xd4\x19\xa8\x4f\x61\
+\xe5\x05\xe7\xd0\x40\xe7\x07\xfd\x2d\xa0\x3b\x73\x03\xe4\x19\x03\
+\x3f\x23\xc1\x7f\xa6\x7d\x1c\x64\xd1\xb8\x63\xef\x0e\x27\x81\x59\
+\x0a\x31\x61\x35\x72\x49\x48\x99\x47\x83\x8d\x65\x4f\x64\x84\x9c\
+\x1e\x74\x66\xa1\x7e\x00\xc4\x41\xc6\x23\x4f\xd0\xd7\xc1\xe4\x2b\
+\x40\x1f\x3a\x67\x50\xdf\x05\x1c\x74\x6f\x41\x2d\xc9\x2f\x3e\xf3\
+\xdf\xce\xcf\xf9\x05\x9a\x2b\x0c\xe1\x15\x74\x66\xa0\x9e\x08\x2d\
+\x9c\xb7\x89\x2a\xbe\xbe\xee\x86\x54\x57\x25\x79\xcb\x4c\xc2\xc6\
+\x5a\x99\x45\xe0\x4b\x90\xaa\x27\xe0\x25\xb8\x43\x34\xd3\x73\x96\
+\x8f\xfc\xa4\x01\xf5\x32\xb8\xe7\x79\x54\x82\x67\x7e\x01\x38\x46\
+\x57\xec\x1b\x63\x77\xb5\xfd\xf8\x32\xba\xe2\x07\x9e\x8e\xff\x68\
+\x5f\x2e\x7a\x3b\xf1\xa6\xcf\x67\x7f\x43\x9a\x64\x1f\x15\x98\x17\
+\x9a\x6c\x02\x4f\xe0\xa4\x03\x8d\x29\xb2\xe1\xb1\xa9\x03\x4a\xa8\
+\x04\x6f\x83\xdb\x09\xec\xf7\x2d\x6c\xe5\x37\x0d\x47\x05\x69\x68\
+\xa5\x00\xcd\xf4\x6e\x01\x4f\x87\x87\xc4\xa9\x2f\x7f\x1f\x0d\x67\
+\x87\x05\x52\x27\x18\xbe\xbd\x5f\x08\x9f\xb9\x72\x27\xa8\xb7\xba\
+\x01\x8d\x03\xf4\x48\x65\xa0\x48\x09\x2e\xe5\xe3\x01\x28\x20\xbe\
+\x01\xf3\x47\x46\x7b\x02\x65\x25\xb4\xf2\x90\x9c\xb3\x94\x9b\x3a\
+\x51\x78\x9f\x61\xdf\x3f\x84\xb4\x14\x08\x20\x37\x4e\x7c\x6a\x7c\
+\xcd\xea\xb5\x04\xb0\x00\x58\xf6\xdf\xba\x84\x18\x07\x56\x18\x24\
+\x34\x0c\x8f\x31\x81\x9c\x93\xf3\x12\x2e\x8c\xd4\x7b\x06\x8a\x84\
+\x69\xd1\xfa\x0a\x43\x60\x05\x47\xe0\x5a\xe1\xec\x28\xc1\xf4\x07\
+\x3b\xa7\x30\x94\x36\x3c\x3c\xd7\x85\xea\xa8\x7c\xdb\x35\x72\x0d\
+\xee\x0c\x55\xe6\x19\x88\x05\x30\x41\x71\x54\x77\x13\x9b\x5e\x83\
+\x6e\x64\xde\x62\x21\x0c\xbd\xb1\xb9\xa9\x1f\x51\xf4\x5c\xae\x3d\
+\xb6\x02\xcb\x70\x65\x69\xf3\xc0\x3f\xc8\xb4\x97\xec\xf6\x14\x9a\
+\x50\x7b\x66\xd0\x21\x20\x8f\xd1\x24\x0b\xc0\xa3\x02\xfd\x32\x62\
+\x85\xbb\x7d\x8d\x34\x73\xd0\xc3\xce\xd6\x8e\x8a\x05\x7a\x15\x98\
+\xb8\xce\xf6\x4f\xec\x75\x11\xf4\x47\xf4\xbf\x26\xd4\x1c\xc5\x47\
+\x70\xac\x79\x23\x01\x94\x9f\xa1\xf6\x37\xc6\xd5\xb3\x11\x8e\xcc\
+\xf2\x1e\x90\x9a\xa4\x10\xd2\x6d\xff\xc8\x7f\x46\x58\x87\x42\x28\
+\x12\x40\x19\xdb\xb3\xcc\xcd\x11\xeb\x80\x2e\x51\xbc\x1c\x40\x11\
+\xb3\xc3\x08\xbf\xca\xcf\x11\x9f\xf9\x51\xd6\x61\x28\x14\x8d\x1f\
+\x5b\x39\xc6\x02\x48\x72\xe7\x39\x6d\x79\x03\x22\x12\xe8\x93\xde\
+\x27\x16\x29\x3c\x4b\x08\x32\x43\xea\xe9\xdd\x78\xee\x00\xc4\xe7\
+\x17\xb3\x60\x99\xc1\x23\x06\xb7\x38\x3f\x06\x3c\x07\x56\x46\x68\
+\x7b\x22\x21\x94\x50\xaf\xcd\xb8\x70\xc9\xc0\x98\xbe\x49\x12\x4e\
+\xe7\x05\x6a\x09\xc0\x01\xfb\xe4\x2f\x12\x8b\xa4\x7d\x00\x6d\x43\
+\x6f\x64\xe0\x25\xf0\x21\x23\x8b\x13\x9c\xa0\x61\xf8\x47\x0c\xbf\
+\x13\xc4\x67\x80\x8e\x8b\x10\x0d\x7e\x8a\x43\xad\xcd\x2e\x63\xe8\
+\x00\x00\xf1\x8e\xd0\x53\x15\x42\x7a\xb3\x73\x80\x79\x1b\xcb\x25\
+\x34\xaa\x43\x28\x4d\xee\xeb\xfe\x05\x6c\x6a\xde\xa0\x08\x64\x8e\
+\xc1\xe5\xcb\xa6\x45\xf0\x00\xe6\x26\x31\xd3\x6d\xed\x45\xd2\x88\
+\x55\x9a\x68\x6e\xe3\x91\xc7\x35\x32\x1f\x00\x9a\xe7\x9f\x04\x77\
+\x0e\xec\x28\x12\xd9\x40\xad\xc3\xbc\x8f\xbd\x43\x44\x4b\xc0\x19\
+\xc8\x3b\x44\x91\x16\x9a\x81\x59\x43\xa3\xba\x26\x70\x01\x17\x5b\
+\x5e\xc7\x58\x4e\xcf\x29\x1a\x19\x2e\xe9\x58\x1e\x00\xff\x06\x89\
+\x4d\x73\x92\xd9\x49\xf2\x01\xc9\xff\x24\x84\xee\x78\xfc\x7b\x7a\
+\xaf\x09\x3e\x83\x9d\xf3\x49\x62\x01\x74\x7c\xdb\x32\x7a\x1e\xd1\
+\x0b\x05\x8e\x3c\xbd\x02\xec\x67\xb7\xb1\xa0\xb9\x43\x59\xcf\xe6\
+\x10\xd3\x73\xf7\x4f\x70\xed\x60\x8e\x82\x3c\xa3\x05\x02\x9a\x38\
+\xd9\x8d\xe6\x5c\xd3\x60\x2d\x61\x3c\x09\x87\xc5\xa1\xbb\xfa\x38\
+\xdb\x0e\x0c\x0a\xb6\x32\xd9\xe9\xf8\x08\x84\x57\xd7\x16\xec\xa1\
+\xc1\x8d\x05\xcf\xc8\x14\x56\xe0\x6f\x65\x5f\xfb\x6e\x30\xb6\x0e\
+\x2b\x14\xe6\x24\x93\xc0\xcb\x84\xe4\x3a\x3e\xa3\x38\x8b\x94\xe0\
+\x85\x6d\x0a\x5d\x5f\x89\xb2\xea\x6d\xdc\x15\xd0\xf2\x67\x30\xc9\
+\xdb\xbf\x0e\xf3\x09\x04\x42\x68\xdd\x46\x13\x24\x56\x4e\xb2\x1c\
+\xd0\x18\xf7\x2d\xa3\xd6\x68\x2c\x25\xd8\x46\xed\xa5\x19\x3f\xfb\
+\x6d\x6e\x64\x5f\x01\x38\x83\xc6\x32\x9c\x9c\x8d\xe1\x25\x5e\x03\
+\x9c\x28\xce\x99\x15\x06\x65\x77\x31\x2c\x53\x7c\xbc\x92\x1a\x85\
+\x9c\x59\xb5\x04\x70\x86\x2a\x97\x72\x41\x86\x15\x38\xee\x90\xbb\
+\xf7\x4f\xb7\xfd\x57\xd0\x38\xd3\x73\xfa\x63\x81\xac\x2a\x4e\xbe\
+\xc2\xf4\x18\xa5\x01\xad\xae\x2d\x74\x99\x83\xb3\x2e\xca\x53\x4e\
+\x78\x45\xf9\x80\xc4\x66\xbe\x6d\x13\xd4\x3c\x54\x84\xc9\x31\xc9\
+\xb9\xb7\xa7\xe8\x96\x5b\x85\x4e\x41\xa1\xd3\x38\x70\x3e\xab\x38\
+\x92\xea\x4f\xd3\x6d\x9e\x04\x66\x61\x2e\x4e\xd6\x26\xb0\x02\x53\
+\xd3\x01\x4f\x19\x88\x05\x70\x41\x9a\x34\x70\xde\x74\xc9\xba\x8d\
+\xd7\xed\x2b\x72\x4a\xd8\xee\xed\x15\xb0\x07\xf5\x4b\x55\x5c\xb2\
+\x38\x9e\xaf\x2f\xce\x8f\x5d\x81\x49\x8f\x23\x3c\xf3\xa1\x10\x28\
+\x01\xab\x76\xfa\x0e\xd4\x34\x5f\x54\xc0\x7d\xeb\x1b\xea\x44\x56\
+\x20\x36\x83\xf1\x95\xd3\x27\x68\x39\x1a\xc0\x32\x5a\x27\xd4\x0f\
+\xc6\x5d\x02\xbf\x45\xaf\xc7\x97\x0d\x9d\x97\xa4\xa0\x4e\xd1\xf8\
+\xfc\x3d\x2f\x84\x61\x89\x0f\x21\xad\x35\xa0\x81\xba\xd1\x56\x4d\
+\xcf\x25\xf0\x7b\xe0\x53\x06\x97\xa3\x89\x19\x4c\xca\x6b\x27\xf5\
+\x66\x3b\x85\x12\xc3\xdd\x67\xd9\x42\x0b\x0f\xc2\xb6\x86\xf7\x08\
+\x37\xa2\xf6\xa4\x0e\x6f\xcd\x7f\x1b\x56\x43\x1a\xdc\xa8\x46\x30\
+\x7d\x7e\x05\xf3\x52\x45\xaa\x68\x09\xed\x1c\xc8\xbb\xb6\x4e\x90\
+\xf7\xf3\xd6\x4a\x3e\x64\x8c\x1a\xa1\x43\x90\x20\x23\xeb\x4e\xe0\
+\xa4\xab\xf5\x80\x29\xa2\xf0\x8a\xba\x0f\xee\x11\xea\x25\xbe\x06\
+\xb3\xe3\x82\xcc\xa0\x29\xfb\xef\xd1\xcc\xcf\x0e\x79\xc5\xb8\x81\
+\xa6\xe0\xc3\x0b\x9e\xe4\x6e\x22\x03\x96\x00\xba\x40\x95\x4c\x49\
+\xec\xcc\x0b\xa8\x4c\x7a\xc9\x16\x85\xb4\xfb\xd0\xaa\xaa\xce\xb8\
+\x56\x5d\xee\x98\x20\x65\xc5\xdd\xaa\x90\xaf\xfa\x08\x14\x63\x7b\
+\x11\xba\x1d\x32\x1a\x5f\x2a\xa8\x6e\xcb\xd5\x28\x58\xb1\x40\x09\
+\xdc\x9e\x6e\x79\x79\x16\x28\xa0\xa7\xa8\x46\xee\x01\xff\x0d\x98\
+\x0f\x24\x3f\x77\xe0\x05\x94\x84\xbf\xa1\x0b\x7c\x13\x48\xbc\xbf\
+\x55\x94\xd1\xa7\x30\x27\x51\xbf\x04\x39\xc6\xfb\xd0\x68\x91\xb9\
+\xbe\x93\x8a\xd2\xe3\x76\x40\xee\x1a\xcc\x66\xe0\x25\x69\x2e\xc0\
+\xed\xa2\x75\x36\xc9\xd6\x17\x54\xf1\x54\xc8\x66\x8d\x22\x1c\x4e\
+\x54\x80\xec\xa3\xb5\x3f\xf7\xc6\x08\x97\x0d\x68\xdd\x46\x9d\x9b\
+\x25\xe0\xb9\xee\xb0\x9c\x9d\x9f\x26\x5d\xd5\xe3\x26\xba\xea\x65\
+\x54\x79\x76\xd0\xda\xe6\x25\x65\x1e\xd0\xcb\xd8\x8c\x33\x14\xed\
+\x00\x77\x9a\x0d\x57\xdd\x1e\x5a\xc3\xbf\x81\x46\x66\x9f\xa3\x42\
+\x78\x00\xe7\x27\x50\x3d\x52\x22\x0b\xcd\x5b\x5f\xe7\x68\x24\x15\
+\x9b\x49\x1b\x80\x83\x0b\xbf\xbb\xaa\xc9\x0b\x14\x21\x1c\x7b\x66\
+\xbc\xa9\x33\x1d\xcb\x65\xc5\x2f\x4b\x1e\x6f\x12\x23\x7c\x00\x3c\
+\x04\x0e\xc0\xbd\x0c\xc6\x97\xe3\x7b\x46\xeb\x08\xc4\xcc\x74\x3d\
+\x21\x0f\xd1\x82\x45\xd0\x2b\xef\x65\xdf\xbe\x1f\xb4\x1b\x20\x62\
+\xf7\x8b\x83\xea\xa4\x67\xb0\x53\xe0\xc5\xad\x8f\xc0\x7d\x05\x4c\
+\xc1\xd1\xf7\xd9\xeb\x39\x71\x9e\xb6\xf8\xcc\x8f\x93\x42\x93\x3b\
+\x03\xe7\x27\x53\x2e\x5f\xcf\x5a\x07\xf0\x66\xe8\x7d\xec\x44\x49\
+\x32\xe6\xff\x50\x2e\x0f\xba\x00\xf2\xf3\xbc\xf9\x95\xa6\x5a\x8a\
+\x5c\xb9\xfc\x1d\xcc\xb2\x5e\x1b\xf9\xc7\xd8\x2f\x4c\xac\x92\x7b\
+\x61\x42\x1c\xfa\x82\x85\xf1\x02\x43\x3a\x66\x7b\xcc\x89\x43\x9c\
+\x05\xcf\x88\x43\xdf\x18\xf9\xa5\xd1\x57\xce\xfa\x2b\xa9\x10\xaa\
+\x8c\xff\xc2\x44\x8a\xe8\x4f\x05\x4e\xc8\x46\x5e\x08\x00\xf2\x1e\
+\xfa\xca\x4a\xee\xa5\x04\x5e\xeb\x95\x99\xb4\xad\xe4\x9d\x9f\xb7\
+\x40\xde\x31\x9c\x9f\xb2\xa5\xe5\x3d\xf3\x7f\xc8\xe3\x2b\x9e\x3c\
+\x91\x5a\x59\xa5\x16\x7b\x80\xe0\x77\x82\x71\x7d\x2d\x1b\x7e\x6b\
+\xde\xd3\x4f\x2b\x74\x9e\x2a\x8c\x7e\x69\x6a\xca\x8f\x09\x04\x2f\
+\x2b\x0c\x5e\xbe\x2a\x7a\x39\x6a\x1e\x33\x66\x91\x2d\xcf\x43\x29\
+\xbf\x9b\x15\x62\x44\x86\x93\x23\x9b\xa8\xb6\xf5\x35\xba\xb4\xfc\
+\xef\x1a\x6a\xe6\x1c\x7a\x01\x72\xc1\xe0\xb5\xb9\x19\x40\xa0\x37\
+\x0d\xe5\xc4\x29\x4a\x4a\x64\x7b\xc1\xff\xe4\xf6\x26\x79\x6d\x2e\
+\x28\x97\x4d\xe9\xeb\xfa\x71\x0e\x35\x61\xa7\xfe\xf7\x24\xaa\xc4\
+\x7d\x01\x06\x1d\x54\xa1\xce\x06\x78\xf6\x06\x4e\x93\xed\xc0\x8d\
+\xb8\xa2\x8e\x41\x26\x30\x4a\xcd\x3c\x9e\x3a\x79\x2d\x1b\xbf\x38\
+\x59\x42\xaf\xca\x92\x23\x54\x65\xe0\x5f\xe0\x99\x38\x24\x6b\xf3\
+\xac\x17\x27\x85\x41\xe2\x33\x06\xa3\xb4\x36\x7d\xac\x88\xc7\x37\
+\xf7\xd5\x59\xab\xe1\x0d\x80\x0c\xcf\x6f\x1a\xf3\x09\xa8\x10\xfe\
+\x07\xb4\x0a\xfd\x7e\xcf\x22\x5b\xc2\x00\x00\x00\x00\x49\x45\x4e\
+\x44\xae\x42\x60\x82\
+\x00\x00\x02\x1b\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x01\xcd\x49\x44\x41\x54\x58\x85\xed\
+\x96\xb1\x4a\x23\x51\x14\x86\xbf\x93\x64\x13\x54\xb0\x70\x8b\x2d\
+\x04\xc5\x17\x30\xa0\x23\x2c\x82\xec\x2b\x2c\x8a\x8a\x85\x96\x8e\
+\x10\x89\x08\x22\x36\x56\x29\xb6\x08\xbb\xab\x23\x2b\x9b\xb4\x56\
+\x2a\x79\x02\x1b\x41\x04\xc1\x04\xf4\x09\x54\x2c\x54\xd0\x42\x0b\
+\x41\x50\x8f\x85\x4e\x4c\xa2\x33\xce\x24\xd1\x14\xe6\xaf\xee\x9d\
+\x39\x73\xff\x6f\xce\x3d\x73\xe6\xc2\x67\x97\xb8\xdd\xec\x1c\x4d\
+\x36\x85\x1b\xc2\x09\x90\x7e\x84\xf6\x8a\x9c\x94\x23\x84\x8c\x6a\
+\x64\x3e\x97\x36\xaf\xdf\x04\xe8\x1c\x4d\x36\x7d\x69\x8c\x6c\x0b\
+\x44\x2b\x32\x7e\xc1\xc1\x3e\x1a\xe9\xb5\x21\x02\x4e\x81\xe1\x86\
+\x70\xa2\xda\xe6\x00\x02\x51\x91\x9b\x84\x3d\x77\x04\x00\xe9\xaf\
+\xb6\x79\x5e\xca\x80\x3d\x0c\x39\xfb\x17\xef\x79\x36\x15\x77\xad\
+\x97\xb7\x64\x98\x96\xbe\xb6\xb6\x4b\x06\x3e\x46\x75\x80\x17\x35\
+\xd0\x3d\xbe\xd0\x26\x01\xf9\x81\x16\x5f\x37\x26\xac\x49\xa7\x45\
+\x44\xe5\x5e\x85\xfd\x8e\x8b\x6f\x3b\xeb\xeb\x43\x77\x65\x03\xf4\
+\x98\x8b\x33\x8a\xfc\x42\x5f\x29\x4e\x65\xc9\x69\x11\x45\x41\xe1\
+\xb0\xe5\x74\xab\x7b\xfc\xef\x70\x2e\x3d\x7d\xe2\x15\x20\xbf\x05\
+\x86\x69\x8d\x28\x92\x2c\x85\xf2\x23\x85\xbe\x80\x04\x57\x07\x07\
+\xd7\x82\xbe\x01\x40\x66\xcb\x35\x2e\x85\x38\xf8\x7a\xf6\xdd\x6b\
+\x7c\xc1\xdb\x6a\x69\xd7\xfb\xe7\xdd\x54\x7e\x0a\xda\x6a\xcf\x45\
+\x89\x02\xdb\x3e\x01\x8a\xff\x0b\xd9\x54\xdc\xb1\xe8\x4a\x65\x98\
+\x16\x40\x2c\x0f\x24\xea\xf9\xeb\xaa\xf9\x67\x58\x07\xa8\x03\xd4\
+\x1c\xa0\xec\xae\xe7\x2a\x65\xc9\x30\x2d\xc7\xd6\x8d\x72\x64\x0f\
+\x6b\x93\x01\x21\x63\x0f\xdf\x27\x03\x2e\x7a\x3a\x94\xce\xdb\xf3\
+\x8f\xcb\xc0\x63\xda\xff\x14\x9e\x88\xa1\xa0\xfd\x1a\xa6\x75\x09\
+\x34\x57\xc5\x4c\x74\x2c\xfb\x7f\x6a\xc5\x4b\xe8\x73\x06\x54\x37\
+\xaa\x62\x0e\xb7\x12\x08\x6d\x7a\x0d\xce\x03\x48\x28\x34\x0d\x9c\
+\x57\xea\xae\xca\xdc\xee\x72\xec\xd8\x37\xc0\xee\x72\xec\x58\x82\
+\xc1\x2e\x54\x33\xc0\x95\x5f\x5f\x90\x3d\x44\x47\x72\xe9\xf8\x6f\
+\x9f\xcf\x7e\x72\x3d\x00\x27\x99\x79\x91\xf6\x77\x59\xd9\x00\x00\
+\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x00\x95\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x00\x47\x49\x44\x41\x54\x58\x85\xed\
+\xd7\xb1\x0d\x00\x20\x0c\x03\x41\x83\xd8\x29\x2d\x13\x67\x02\xa4\
+\x6c\x16\x31\x84\xe9\xf8\xef\x63\x5d\x1b\x89\x8c\x22\xbb\x22\xbb\
+\x9c\x8d\x65\x1a\xb6\x79\xaf\xe9\x0e\x00\x00\x00\x00\x00\x00\x00\
+\x00\x00\x00\x00\x00\x00\x80\x9b\xf7\x19\x0d\x9d\x47\x8e\x8f\xbb\
+\xb2\xd3\x06\x7c\x18\x63\x85\x7e\x00\x00\x00\x00\x49\x45\x4e\x44\
+\xae\x42\x60\x82\
+\x00\x00\x01\x35\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x00\xe7\x49\x44\x41\x54\x78\x9c\xed\
+\x9b\xb1\x11\xc2\x30\x14\xc5\x9e\x19\x22\x13\x31\x01\xc7\x06\xd0\
+\x30\x11\x0d\x23\x70\x4c\xc0\x34\xa9\xb2\x85\x29\x08\x5d\x3a\xdb\
+\x88\x3b\xa4\xea\x17\xff\x12\x7d\xf5\x4e\x44\xe4\x9f\x29\xa3\x7f\
+\xb0\x3f\x9e\x0f\xa5\xe6\x9a\x24\xb5\xe4\xf2\xbc\xdf\x1e\x3d\xf7\
+\x5b\xd9\x8d\xfc\x78\x92\xac\xc7\x4c\x49\xa6\xcf\x61\x3d\xf7\x5b\
+\x19\x1e\x20\xef\x63\xb6\xe6\x5e\xfb\x4d\x7c\x23\xc0\x4f\x63\x00\
+\x5a\x80\xc6\x00\xb4\x00\x8d\x01\x68\x01\x1a\x03\xd0\x02\x34\x06\
+\xa0\x05\x68\x0c\x40\x0b\xd0\x18\x80\x16\xa0\x31\x00\x2d\x40\x63\
+\x00\x5a\x80\xc6\x00\xb4\x00\x8d\x01\x68\x01\x1a\x03\xd0\x02\x34\
+\x06\xa0\x05\x68\x0c\x40\x0b\xd0\x18\x80\x16\xa0\x31\x00\x2d\x40\
+\x63\x00\x5a\x80\xc6\x00\xb4\x00\x8d\x01\x68\x01\x1a\x03\xd0\x02\
+\x34\x06\xa0\x05\x68\x0c\x40\x0b\xd0\x18\x80\x16\xa0\x31\x00\x2d\
+\x40\x63\x00\x5a\x80\x66\xfc\xa3\xa9\x64\xd9\x9a\x7b\xed\xb7\x32\
+\x3c\x40\x4d\x4e\x49\xe6\x24\xf3\x3a\x77\xdd\x17\x11\x69\xe1\x05\
+\x2c\x27\x22\x30\x10\x9e\x42\xf3\x00\x00\x00\x00\x49\x45\x4e\x44\
+\xae\x42\x60\x82\
+\x00\x00\x01\x51\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x01\x03\x49\x44\x41\x54\x78\x9c\xed\
+\xd6\x21\x4e\xc4\x50\x14\x85\xe1\x73\xfb\x9a\x0a\x04\x0a\x3c\x1b\
+\x20\x21\x81\x04\x8b\x83\x05\xb0\x06\xdc\x4c\x48\x58\xc0\x50\xcf\
+\x18\x40\xa2\xf0\x48\x12\x70\xd8\x51\x84\x1d\xa0\x48\xc8\x38\x04\
+\x99\x4c\xda\x5e\x2c\x79\x0f\x70\x7d\x93\xd0\xff\x93\xe7\x56\x9c\
+\x1e\xd3\x4a\x00\x00\x00\x00\x00\x00\x00\x00\x00\xc0\x20\xd8\xdf\
+\x67\xb7\x83\xc9\x79\xc8\x53\xa5\x1f\x4f\x52\xa7\xba\xee\x7e\xbb\
+\xff\x38\xc0\xee\xc9\xc5\x86\x59\x35\x95\x74\x2c\x69\xad\xa7\x6e\
+\xb9\x2c\xe4\x7e\xdf\x56\xc5\xf8\xf9\x7a\xf4\x16\x1f\x93\x01\xf6\
+\x47\x97\xeb\xcd\x52\x2f\x26\x6d\x65\xa9\x97\x8b\x69\x1e\x9a\x6e\
+\x7b\x76\x73\xfa\xfe\x3d\x2e\xe2\xe7\xda\xa5\xea\x7f\xf7\xf2\x92\
+\xe4\xda\x6c\x42\x31\x8d\xe3\x64\x00\xb9\x1d\x66\x29\xb4\x02\x26\
+\x1d\xc5\x59\x3a\xc0\xc0\xa4\x03\x98\x3f\xae\xa0\x47\x16\x2e\x3d\
+\xc4\x59\x32\x40\xa8\x34\x71\xe9\x35\x4b\xa3\x9c\x4c\xf3\xb2\xed\
+\xce\xe2\x38\x19\x60\x76\x35\xfe\x08\x65\xb1\x27\xe9\x56\xd2\x67\
+\x8e\x6e\x3d\x5b\xc8\xfd\xae\x2d\x6d\x27\xfe\x02\x48\xfc\x08\x01\
+\x00\x00\x00\x00\x00\x00\x00\x00\x00\x43\xf1\x05\xad\xf1\x3c\x35\
+\x36\x50\x8e\x69\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
+\
+\x00\x00\x01\x8b\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x01\x3d\x49\x44\x41\x54\x58\x85\xed\
+\x93\x3f\x2f\x43\x61\x14\x87\x9f\x73\x5b\xc1\xd0\x88\x6f\xd0\x5d\
+\x62\xbb\xda\xc9\x62\x34\x48\x2b\x6c\xc2\x66\xf0\x09\x24\x12\x3a\
+\x58\x7c\x01\x7f\xd2\xc1\xaa\xf4\x76\x31\x4b\x2c\xa2\x9d\xd4\x07\
+\x10\x2c\xc2\xa2\x93\x84\xd4\xfb\x33\x50\x4d\x6c\xf7\xbd\xc9\x5d\
+\xdc\x67\x3b\xc9\x7b\x7e\xe7\xc9\xc9\x79\x21\x23\x23\xe3\xbf\x63\
+\xb1\x5e\x4b\x56\x6a\xc9\x01\xbc\x9b\x4d\xde\x54\xac\x97\x54\x20\
+\x88\xf5\x7a\x67\x28\x3c\x2a\xbd\x2e\x35\x94\x4b\x57\xa0\x66\x4e\
+\xd8\xf2\xa0\x7c\xcc\xab\x9f\xae\x00\xd0\xa9\xda\xa9\xd0\xee\xa0\
+\x2e\x45\xae\x9b\xaa\xc0\xb7\x44\x6e\x0b\xb8\xf8\x29\xa7\xcb\xd1\
+\xe7\xbe\xaf\x40\xbc\x23\xfc\x43\x29\x72\x1a\x26\xd9\x7a\xbb\x62\
+\x47\x71\x33\xbc\x36\x30\xa0\xdd\xb5\xe1\x11\x4a\x87\x61\x53\xb3\
+\xa9\x0a\x50\x33\x37\xde\xb7\xc2\x6f\x98\xe9\x32\x5d\x01\xe0\x05\
+\x3e\x80\x7b\xdf\xfe\x64\x02\x92\x15\x46\x5c\x1d\x28\x02\xcf\x39\
+\x59\x31\x55\x81\x72\xe4\xb6\x91\xad\x00\x6f\x98\xcd\x5f\x2d\xda\
+\x43\xdc\x0c\xef\x5f\x30\x13\x69\xd5\xd0\x31\xe0\x84\x2d\x74\xaa\
+\x76\xee\x93\xe3\xb5\x81\xb0\xa5\x39\x43\x75\x00\x61\x1b\xbe\xc3\
+\xbd\x04\xc2\x33\x4d\x05\x52\x13\xc8\x9b\xb4\xd7\xa9\xda\x81\xef\
+\xf0\xf8\x02\x92\x05\x81\x1a\xc0\x04\xa6\x93\xeb\xdb\x60\x33\xc9\
+\x70\x80\x7c\xdc\x06\x83\x27\xe0\x6e\xac\x17\xac\x51\x33\x97\x54\
+\x20\x23\x23\x23\xe3\x0b\x46\x70\x62\xa1\x9b\x7f\x53\x6a\x00\x00\
+\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x01\xb2\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x01\x64\x49\x44\x41\x54\x58\x85\xe5\
+\xd6\x31\x4e\xc3\x30\x14\xc6\xf1\xff\x73\x93\x72\x03\x3a\x70\x82\
+\x96\x89\x89\xb9\x8d\xc4\x58\x04\x5c\xa1\x03\xb7\xf0\x35\x90\xe8\
+\x15\x2a\x04\x2c\x88\x42\x7b\x08\xa0\x9c\x80\x01\x26\xf6\xd2\x98\
+\x81\x86\xa2\xa6\x21\x76\xe2\x84\x01\x8f\xf6\x93\x7f\x9f\x6c\xe7\
+\x29\xf0\xdf\x87\xd4\x89\x45\xfd\x41\x4b\x85\xe6\x12\xe4\x65\x3c\
+\x1a\x9e\x00\xa8\x7a\x71\xa6\x20\xfb\x60\x76\x92\xf9\x5a\x02\xac\
+\x70\xda\xc0\x73\x3c\x97\xc3\x64\xad\xf2\x2b\x48\xe3\x74\xef\xaf\
+\x86\xaf\xb5\x04\xc8\xc3\x2b\x0d\x60\x83\x57\x16\xc0\x16\xaf\x24\
+\x80\x0b\xee\x3d\x80\x2b\xee\x35\x40\x11\xdc\x5b\x00\x5b\xfc\xe0\
+\xe8\x74\xdb\xa8\x8f\x1b\x83\xbc\xdf\x8d\xce\x7b\xe0\xa1\x11\x39\
+\xe2\x13\x60\x4f\x30\xcd\x64\xbe\x54\x80\x02\xf8\x2e\xf0\x28\x71\
+\x70\x9c\xac\x15\xbe\x82\x12\x78\x74\x7b\x71\xf6\x56\x2a\x80\x2f\
+\xbc\x50\x00\x37\x7c\x31\x05\xd3\x01\x9e\x24\x0e\x7a\xeb\xb8\x73\
+\x00\xdf\xb8\x53\x80\x2a\x70\xb0\xfc\x0a\x6c\xf1\xa8\x3f\x68\xb9\
+\xe0\x60\x71\x02\x2e\xb8\x0a\x65\xe2\x82\xe7\x06\x28\x86\xcb\x4c\
+\xe2\x46\x77\x13\xee\xd4\x09\x2b\xc2\x53\x9d\x30\xa8\x0f\x5f\x4c\
+\x81\x0e\x6b\x9d\xb0\x51\x0e\x67\xb9\x69\x36\x1e\xf5\x07\x2d\x09\
+\xcc\xcf\x87\x99\xdd\x09\x0b\xe0\x6d\x90\x59\x3c\x37\xbd\xa2\x0f\
+\x53\x36\x6f\xea\x0b\x5f\xd5\x65\x9d\x90\x02\xd0\x5a\x2b\x15\x32\
+\xce\xc3\x01\x51\x21\xd7\x79\xf8\x7a\x5d\x16\xfe\x1d\x60\x39\xb6\
+\x80\x87\xdf\xfe\x64\xb4\xd6\x02\xd2\xfc\xaa\xcb\xc4\x53\x75\x36\
+\xfd\x00\xad\xb5\xc2\xae\x35\x8b\xe7\xba\xbf\x1d\x9f\xf9\xbe\xa6\
+\x95\x85\xff\xbc\x8e\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\
+\x82\
+\x00\x00\x03\xe0\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x03\x92\x49\x44\x41\x54\x78\x9c\xed\
+\x98\x4d\x68\x5c\x55\x18\x86\x9f\xf7\xde\x50\x12\x45\xa1\xda\x9d\
+\xe8\x56\x5c\xb7\x64\x22\xa9\x68\x54\x4a\x9b\x42\xd2\x49\x20\xe0\
+\x4a\xb4\xfe\x81\x6b\x7f\x41\x44\xac\x60\xba\xd0\xad\x8a\x05\x57\
+\xae\x9a\x8c\xc9\xa2\x15\x4a\x35\x9b\xca\x4c\xd2\x14\x74\xd3\x9f\
+\x9d\xc5\x65\x44\xd2\xb8\x88\x3a\x73\x5f\x17\xa1\x32\xb9\xf7\x26\
+\x99\x99\xdc\x99\x44\x7a\x9e\xe5\xf9\xee\x39\xe7\x7d\xbf\xf3\x73\
+\xcf\x39\x10\x08\x04\x02\x81\x40\x20\x10\x08\x04\x02\x81\x40\x20\
+\x10\xb8\xb7\x50\xba\x60\x70\xc6\x1f\x4a\xfe\x00\x88\x0d\x89\xc0\
+\x7b\xa0\xab\x30\x0c\x12\x44\x40\xc3\xd6\xc7\x8b\x93\xfa\xa8\x39\
+\x9e\x49\x40\x69\x36\xa9\x03\x71\xaf\x04\xf6\x98\x46\x6d\x22\xea\
+\x6b\x2e\x88\xf6\x4a\xc9\x7e\x21\x93\x00\x5b\x67\xd0\xff\x7b\xda\
+\xe7\x22\x6c\xeb\x4c\xb6\x38\x87\xd2\x8c\x47\x90\xe7\x80\x07\x52\
+\x21\x03\x49\x17\xe4\x15\x49\x44\xd6\xd7\x9a\xa4\xb1\x6a\x59\x0b\
+\xe9\x8f\x73\x13\x00\x50\xaa\xf8\x30\xf6\xf7\xc0\xa1\x54\x0d\xe3\
+\xfd\x99\x04\x43\xa4\xac\xa7\x15\xa4\xe3\xb5\xb2\x96\xf3\xea\x6c\
+\x99\x00\x80\x23\x73\x7e\x3c\x6e\xf8\x12\xf0\x68\xaa\x23\x6b\xbf\
+\xcd\x04\x11\xe1\xcd\x7e\x24\x6e\xd7\x23\x1d\xbb\x3a\xae\x9b\x5b\
+\x55\xdb\x76\x13\xbc\x3a\xae\x9b\x49\xa4\x61\xe0\xc6\xe6\xbe\x90\
+\xb5\x7f\x36\x50\xe7\x98\x07\x6e\x34\xa4\xa3\xdb\x99\x87\x1d\x66\
+\xc0\x5d\x0e\xcf\xfb\x50\x5f\xc3\x17\x31\x47\x52\x5d\x03\x6a\xb4\
+\x23\xb6\x78\x1c\xa7\x6d\x08\x96\xfe\xe9\xd3\xe8\xf2\x98\x56\x76\
+\xaa\xdd\xd2\x28\x2e\x8f\x69\xa5\x2f\xd2\xb3\xc0\x0f\x9b\x23\x02\
+\x88\x51\x4b\x79\x2c\x14\x6f\x8c\x78\x9e\xf9\xcb\x71\xac\xe7\x5a\
+\x31\x0f\x6d\x9c\x03\xae\x8c\x6b\x6d\x60\x55\x27\x05\x95\x1c\x35\
+\xb1\x5b\x9c\x4d\x45\x60\x90\xf2\x97\xe0\xec\xc1\x7e\x9d\xbc\x32\
+\xae\xb5\x56\xdb\x6a\x6b\x1d\x2f\xbc\xa4\xf5\xfe\x83\x9a\x92\x7d\
+\x2e\x1d\x93\x89\x9c\x5d\x87\x85\x63\x23\x39\xab\x5b\xf6\xb9\xc7\
+\xea\x9a\xba\x38\xaa\xbf\xda\x69\xaf\x33\xc1\xb6\x4a\x95\x64\x1a\
+\xf4\x56\x8e\xc0\x44\x5d\x3a\x48\x35\x9d\xeb\x37\x21\xfb\x6c\x75\
+\x22\x7a\x17\xa9\xed\x7e\x77\x35\x62\x83\x15\xbf\x2d\x7b\x3a\xa7\
+\xd9\x04\x5c\x68\x12\x8c\x24\x9c\x3d\xb9\x4a\xef\x2c\x96\x75\xb6\
+\xd3\x76\x77\x3d\x65\x87\x66\xfc\x8a\xe5\x2f\xc9\x8c\x4c\x71\x49\
+\xd8\xc2\x7c\x62\xe9\xb5\xc5\xb2\x32\xcb\xb1\x1d\x0a\x59\xb3\xa5\
+\x8a\x27\xb1\xbf\x05\x0e\x34\x97\x5b\xb6\xac\x5d\x1d\x98\x8c\x23\
+\x65\x7f\x33\x7f\x0b\xbd\x50\x9d\xd0\xec\x6e\xda\x86\x02\x77\xee\
+\xa1\xf3\x7e\xde\xf2\x77\x88\xfb\x9b\xcb\x8d\x2d\x3a\x4e\x42\xde\
+\xb9\xfe\xcf\x44\x3a\xb5\x54\xd6\xe5\x0e\xdb\xdc\x44\xa1\xbb\xf6\
+\x93\x15\x0f\x26\xf6\x05\xe0\xe1\x54\xa8\x93\x4b\x54\x9e\xf9\xdf\
+\x13\xeb\xc4\xd2\xa4\x96\x3a\xd5\x98\xa6\xf0\xdf\xd6\xd0\xac\x9f\
+\x30\xbe\x04\x3c\x92\x0a\x19\x91\xec\xf8\x7f\x10\xd8\xb9\x97\x9a\
+\xdf\x84\x8e\x55\x27\x74\xbd\x38\xb5\x5d\x78\x10\xa9\x4e\xe8\x7a\
+\x6c\x0d\x03\xb7\x52\x21\xb1\x61\x6c\x47\x4d\x39\xe6\x6f\xd5\xeb\
+\x1a\x2e\xda\x3c\x74\xe9\x45\xe8\xa7\x49\xfd\x1a\xa3\xa7\x80\x6b\
+\xa9\x90\x8c\xb7\x79\x6e\x73\x9c\x73\xa9\xb9\x76\xa0\xae\xa3\xcb\
+\x53\xba\x5d\xb0\xcc\x0d\x41\xdd\x68\xf4\x2e\xa5\x0b\x7e\xd0\xeb\
+\x9e\x17\x3c\x9d\xd3\x75\xe3\xbf\xf7\x56\x09\x9c\x9b\x98\x05\xfa\
+\x35\x5e\x1b\xd5\x9d\x6e\x69\xec\xea\x95\xb6\x36\xaa\x3b\xf7\xad\
+\xea\x38\x30\x9f\x8d\x3a\x66\x63\x00\xb4\x85\xf9\xb9\x81\x55\x9d\
+\xe8\xa6\x79\xe8\xd1\x05\xe6\x99\x1f\xdd\xb7\xfe\x47\xf2\xb5\xd1\
+\x8b\x2d\x55\xb0\xbf\x19\x78\x28\x7a\x75\x61\x44\xf5\x2e\x4b\xeb\
+\xcd\xa3\xc6\xc2\x88\xea\xd5\x9f\xa3\x97\x85\x3f\xdf\xe9\x5b\xe3\
+\xcf\x6a\xbf\x44\xa7\x7b\x61\x1e\x7a\x78\x85\x05\xc0\xd6\xe0\x2c\
+\xef\x49\xfe\x24\x5f\x8d\xde\xaf\x9d\xe2\xd3\x4e\x2e\x35\x9d\xd2\
+\xfb\x97\x0c\x60\x70\xc6\xaf\x4b\xfe\xa2\xa9\xc8\x48\x6f\xd4\xca\
+\xfa\xaa\xd7\x5a\xf6\x24\x01\x00\x43\x33\x8d\x69\x4b\xa7\x81\x06\
+\xd6\x9b\xb5\x49\x9d\xdf\x2b\x2d\x81\x40\x20\x10\x08\x04\x02\x81\
+\x40\x20\x10\x08\x04\x02\x81\x7b\x89\x7f\x01\x9b\xd6\x34\x0b\xef\
+\xec\xcc\xa6\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x04\x1d\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x03\xcf\x49\x44\x41\x54\x78\x9c\xed\
+\x98\x4f\x6c\x54\x55\x18\xc5\xcf\x79\x4f\x06\x89\x85\x05\xd4\x44\
+\xaa\x25\xee\xc0\xa5\x7d\x6f\xea\xc2\xc4\x14\x0d\x0d\x74\xa1\x94\
+\x85\x0b\x56\x16\xc2\xcc\x88\xb1\xba\xc0\xb0\xc2\xb1\x31\x21\x21\
+\x90\xc8\xcc\x0b\x8a\x48\xc0\x98\x18\x17\x35\xca\xaa\x25\x8d\x50\
+\x12\xa8\x89\x69\x47\x97\x86\xc4\x95\x7f\xaa\x89\x92\x98\x00\xa9\
+\x14\xdf\xfd\x5c\x30\x95\x79\x7f\x3a\x9d\x7f\x6f\xa6\xe2\xf7\x5b\
+\xbe\x6f\xee\xbd\xe7\x9c\xb9\xf7\xce\xf7\x06\x50\x14\x45\x51\x14\
+\x45\x51\x14\x45\x51\x14\x45\x51\xfe\x5f\xb0\x53\x0b\xf7\xe7\x0a\
+\xc3\x46\x78\x0a\x80\x45\xe0\xa3\xd9\x0f\x47\x8f\x74\x42\x87\xdd\
+\x89\x45\xd3\xb9\xe2\x01\x11\x7e\x02\x60\x03\x80\x2e\x00\xcf\x6d\
+\x76\x76\xfe\xf2\x6b\xe9\xe2\xb7\xed\xd6\xd2\xf6\x00\x9c\x6c\xf1\
+\x30\x80\x02\x42\xbb\x8f\xe4\x8b\x3d\xe9\xa1\x85\xf9\xb9\xc9\x99\
+\x76\xea\x69\x63\x00\x42\x27\xdb\x7d\x9c\xc0\xdb\x55\x3e\xb4\xa3\
+\xc7\xdd\xf5\xc8\x7c\x69\xe2\x2b\x60\xac\x2d\xaa\xda\x72\x07\x0c\
+\xe4\xf3\x0f\xdd\xfa\x6d\xe3\x19\x80\x23\x35\x0d\x10\x9c\xeb\xda\
+\x7c\x23\x7b\x65\x6c\xec\xef\x84\xa5\x25\x1f\xc0\xc0\x2b\xe7\x1f\
+\xbe\xb5\xf6\xe6\x67\x00\x76\x87\x6b\x02\x31\x00\x41\xc0\x8a\xd6\
+\xf8\xe5\xfa\x3b\x5d\x7b\xaf\x7c\x3c\xf2\x57\x92\xfa\x12\x0d\xe0\
+\x99\xd7\x8b\x1b\xfc\x45\x5c\x00\xb0\x3d\x66\x65\x1f\x72\x5f\x85\
+\x08\xec\xb0\x18\x02\x97\x53\x77\x17\x76\xcf\x9c\x3b\x7c\x33\x29\
+\x8d\x89\x05\xf0\xf4\x48\xf1\x51\x7b\x0d\x26\x41\x38\xc1\x8a\x00\
+\xa0\x1f\xab\x44\xc4\x8e\x91\x34\xe7\x2f\x62\xe8\xbb\xf3\xa3\xbf\
+\x27\xa1\x33\x91\x00\x9c\xcc\xc9\x2d\xa4\x35\x05\x60\x6b\xa8\x24\
+\x00\x4c\x75\x39\x62\xc5\xe8\xba\x4e\xdb\xde\x31\xfb\xfe\x6b\x3f\
+\xb5\x52\x27\x10\x73\xf6\x9a\xa5\xef\xe0\x7b\x4f\x91\xd6\x0c\xea\
+\x36\xbf\xf4\x11\x18\x80\x12\x2a\x6c\x15\xdf\x9f\x71\x32\xde\xb6\
+\x56\xe9\x5c\xa2\xa5\x01\xa4\x0f\x9c\x4c\x5b\xbe\x7d\x15\xc0\x13\
+\xc1\x0a\x6b\x30\x5f\x89\x18\x08\xc2\x21\xf4\x92\x72\xad\x3f\xeb\
+\xb9\x4d\xca\x0c\xd0\xb2\x00\xd2\xd9\xc2\x0b\x62\x59\x97\x01\x6c\
+\xaa\x7c\x2e\x02\x01\xa4\x0e\xf3\x65\x18\xbb\x13\x36\x19\xc8\x74\
+\x5f\xce\x7b\xbe\x09\xa9\x01\x5a\x12\x40\x3a\x5b\xdc\x23\xe0\x04\
+\xee\xb5\xb5\x95\x08\x59\xcf\x37\x1f\x26\x76\x27\x74\x59\x22\x93\
+\xfd\xb9\xc2\x70\xe3\xf3\xde\xa7\xe9\x00\xdc\xac\xb7\x5f\x80\x71\
+\x00\xa9\x40\xe1\x9e\xf1\x26\xcc\x57\x9d\x27\x65\x84\x9f\xbb\xb9\
+\xe2\xbe\x66\xa7\x6f\xaa\x15\x76\x33\xc5\xb7\x40\x78\x88\xdc\xda\
+\x12\xb7\x7d\x9b\x42\x08\x30\xb8\x0e\x01\xbc\xf4\xb8\xbb\xf3\xf6\
+\x7c\xe9\xe2\xd7\x8d\xce\xdb\x60\x00\x42\x37\xb3\xf1\x18\xc8\x77\
+\x22\x15\xc0\xb0\xc5\xe6\x81\xb2\x73\x0a\x00\x86\xc2\xe6\x60\x8f\
+\xbb\x6b\xdd\x7c\x69\xe2\x52\x23\xef\x0f\x75\xf7\x01\xe5\xbe\xfe\
+\x34\xc0\xfd\xe1\x9a\x40\x12\x31\x1f\x58\x83\x20\x25\x7a\x74\x49\
+\x9c\x7d\xf2\xc6\x63\xb9\xf1\xf1\x97\xa3\x4d\x56\x15\xea\x0a\xa0\
+\xdc\xd7\x7f\x0a\x60\x4f\x54\x98\x18\x4a\xb2\xe6\x2b\xd6\x22\x85\
+\x71\xf7\xd7\x17\x7f\xa6\xb0\xf7\x07\x6f\xf4\x4e\xad\x73\xd5\x1c\
+\xc0\xb3\xfb\x8e\xad\x5f\x5c\xb3\xee\x82\x00\xc1\x9f\x20\x01\x84\
+\x30\x44\xe4\xb6\x4e\x14\x81\x90\x88\x0d\xe1\xd2\xda\xbb\x0b\xc3\
+\xb5\xbe\x3f\xd4\x14\x80\x93\x39\xd1\x4d\xa6\x26\x01\x04\x9b\x10\
+\x11\x90\xf4\xdb\xea\x3c\x8c\x88\x1d\xbd\x16\x30\x2b\x66\x71\xa8\
+\x74\xe6\xd0\x1f\x2b\x0d\x5f\x31\x80\xf4\xc1\x53\xbd\xe2\xfb\x53\
+\x00\x42\x6d\x28\x1b\x6b\x70\x12\x40\x40\x8b\x90\xa0\x17\xe1\xf7\
+\xb6\x91\xc1\x6f\xce\x8e\xfe\x5c\x6d\x6c\xd5\x00\x9c\x8c\xb7\x8d\
+\x94\x29\x00\xbd\xa1\x15\x05\xa4\x69\xf3\xae\x5f\x01\x5a\x08\x87\
+\x00\xfc\x08\xcb\x0c\xce\x7d\xf0\xe6\xf5\xe5\x46\x2d\xdb\x08\xf5\
+\x67\x3d\x97\x94\xab\x88\x35\x8f\x55\x66\x1e\x28\xef\xc6\xb0\xa8\
+\x2d\x30\xd6\xb5\xbe\x57\x0b\x4e\xdc\x08\x60\x99\x00\x9c\x4c\x61\
+\xbb\x81\x4c\x03\xe8\x0e\x2c\x81\x25\xf3\xab\x16\x23\xd1\x10\xba\
+\x2d\xc3\x69\x37\xe7\x0d\xc4\x0d\x88\x1c\x81\x74\xae\x70\x44\xc4\
+\x1a\x8b\xd9\x4e\xff\x71\x28\xa4\xc9\xcf\x9e\x7e\xe3\xdd\xca\xa7\
+\xd1\xff\xe2\x0c\xf3\x0f\x9e\x79\xa0\xdc\xa9\xe4\xc3\x4f\xa3\x47\
+\xe0\x01\xb4\xfe\x2f\x31\xde\xa2\x3b\x80\x3c\x2a\xad\x78\x8b\x5b\
+\x65\x08\x60\x84\x3c\xda\x69\x1d\x8a\xa2\x28\x8a\xa2\x28\x8a\xa2\
+\x28\x8a\xa2\x28\x4a\xa7\xf9\x07\xee\x73\x3f\xf5\xa2\x1e\x57\x1f\
+\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x02\xc0\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x02\x72\x49\x44\x41\x54\x58\x85\xe5\
+\x97\xcf\x4e\x13\x61\x14\xc5\x7f\xf7\x6b\xbb\x22\x31\x51\xc0\x08\
+\xbb\xbe\x82\xd0\x8a\xd1\x18\x4c\x5c\x09\x71\xc5\x1b\xd0\xd0\x26\
+\x40\x49\x8c\xc2\xb2\x69\x58\x95\x44\x23\x2d\x90\x42\xc0\xc4\xb0\
+\xc1\xbd\x4d\xd8\x28\x89\x89\x8a\x40\x7d\x05\x58\x29\x11\x31\x71\
+\xc1\xaa\x76\xae\x8b\xce\xd4\xb1\xd0\x3f\x53\x06\x17\x7a\x96\xe7\
+\xde\x99\x73\xe6\xdc\x6f\x32\x77\xe0\x7f\x87\xd4\x12\xfd\x89\xdc\
+\x2d\x54\x67\x10\x06\x50\xba\x7d\x52\x39\x42\xd9\x46\x24\xb3\x97\
+\x9f\x7c\x57\xd7\x40\x24\x3e\xff\x48\x91\xb9\xb3\x8c\xf9\x04\x4b\
+\x95\xe9\xe2\x4a\xf2\xc9\x29\x03\x7d\x63\xcf\x6e\x8b\x98\xb7\xc0\
+\x0f\x44\x93\xa1\x52\xb9\xf0\x61\xed\xe1\x77\x3f\x54\x6f\x8e\x3e\
+\xbd\x52\x0a\x05\x86\x50\xc9\x02\x97\x10\xb9\xe3\x24\x11\xac\x3a\
+\x11\x33\x0d\x08\xa2\xc9\xbd\xfc\xd4\xba\x1f\xc2\x0e\xec\x07\x59\
+\xef\x8f\x67\x05\x78\x81\xea\x0c\xf0\x00\xc0\x54\xbb\x84\x01\x80\
+\x50\xa9\x5c\xf0\x53\xdc\x0d\x13\x34\x85\x8a\x14\x37\xaa\x5c\xb5\
+\x6a\x1f\x38\xbf\x62\x3f\x0b\x3b\x8b\x13\xc7\x15\x29\xae\x3a\x5c\
+\xb0\x7e\x7b\x7b\xb8\x9e\x58\x18\x36\x6a\xad\x00\x58\x62\xc6\x3e\
+\xe5\x27\x5e\x35\xea\xf7\xd5\x40\x34\x96\x0b\x5b\x6a\x6d\x00\x1d\
+\x00\xb6\x91\xde\x46\xd7\x98\x46\x45\x4f\x48\xa5\x8c\x15\xd0\xe7\
+\x8e\x78\xab\xf0\xcd\x40\xe4\xb0\x2b\x01\x0c\xba\x39\x55\x66\xff\
+\x8a\x81\x68\x2c\x17\x56\x74\xae\x86\xde\x2a\xf6\x1c\x2f\x5f\xbc\
+\x81\xb3\xa3\x3f\x31\x65\x19\x25\x9d\xb6\x9a\x5d\xde\xf4\x10\x36\
+\x3b\xd5\x91\xc3\xae\x84\xa2\x83\x6e\x4e\x95\xc7\x3b\xab\x93\xfb\
+\xad\xf8\x6f\x9a\x80\x2d\xde\x03\xf4\x18\xb5\x36\xa2\xb1\x5c\xd8\
+\xa9\x9d\x27\x7a\x07\x5e\x5f\xc3\x0e\x2b\xa0\x6b\xa4\x52\xf7\x00\
+\xac\xc3\xf6\xa3\x6f\xd9\x80\x2a\xb3\x22\x2c\xb9\xa8\xbb\x7d\x5f\
+\x3a\xe3\x46\x44\xce\x13\xbd\x83\xa6\x23\xb0\xe3\xdc\x72\x73\x22\
+\x2c\x29\xba\x58\xd3\xea\x29\xfa\x96\x0d\x90\x4e\x5b\xa6\x2c\xa3\
+\xc0\x49\x83\x2e\xcf\xd1\xb7\x6e\x00\xd8\x59\x9d\xdc\x17\x64\xba\
+\x5e\xbd\x9d\xe8\x3d\x19\x00\xd8\xbd\xf6\x2d\x4f\xcd\x28\x6c\xb4\
+\x15\xbd\x67\x03\x75\x46\xd1\x76\xf4\xde\x0d\xe0\x8c\x42\x47\x14\
+\x0e\x14\x0e\x04\x1d\x69\x37\x7a\x07\x9e\x3f\xc7\xbb\xcb\x53\x9b\
+\x40\xb8\x69\x63\x8b\x70\xaf\x64\x47\x50\x59\x20\xfd\xba\x79\x2d\
+\xa2\xe3\x0b\x9d\x15\x29\xbe\x9e\x36\xa0\x6c\x03\x94\x42\x81\xa1\
+\x8b\x32\x60\xfd\xb4\x86\x2a\x52\x7c\x74\xb8\xdf\x23\x10\xc9\xa0\
+\x3a\x8c\x4a\xb6\x3f\x9e\x15\x13\x34\x05\x67\x87\x3b\x2f\xa2\xe3\
+\x0b\x9d\xb6\xf8\x3c\x60\x21\x92\xa9\xca\xba\x1b\xed\x1f\x93\x0c\
+\x7e\x6e\x4a\x7f\xe2\xd4\x8f\x49\xc0\x5d\xfd\x5c\xdc\x7c\xdf\x1b\
+\xb9\xff\x1a\xe8\x16\xb8\x8c\xc7\xf5\xaa\x1e\xec\x99\xbf\x41\x24\
+\x56\x5c\x4e\xbe\xf4\xe3\x9e\xff\x0e\x7e\x01\x29\x72\x01\x2f\x4e\
+\xc0\xa2\xca\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x00\xc0\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x00\x72\x49\x44\x41\x54\x78\x9c\xed\
+\xd0\xb1\x09\x83\x60\x14\x04\xe0\xd3\x21\xc4\x26\xe0\x4c\x59\xc1\
+\xca\x89\xdc\x24\xf3\x08\x69\xc4\x21\x34\xad\xf8\xd7\x2a\xc4\xef\
+\x2b\x8f\x57\xdc\xbb\x04\x00\x00\x00\x00\x00\x00\x78\x82\xea\x18\
+\x4c\xd3\xf7\x9d\x2a\x63\x92\xe6\x86\x3e\x67\x9a\xb3\xa5\xef\xba\
+\xd7\x67\x1f\xd6\xc5\xd9\x7f\x3e\x9f\x24\x6d\xea\x8c\xc7\xb0\x1c\
+\xe0\x61\xca\x01\xb6\x0c\x49\x96\xeb\xab\x9c\x6e\xce\x9a\xe1\xee\
+\x12\x00\x00\x00\x00\x00\x00\x00\xc0\xf5\x7e\x5a\x95\x0d\x08\xf2\
+\x12\x5b\xad\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x00\xa7\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x00\x59\x49\x44\x41\x54\x58\x85\x63\
+\x60\xa0\x00\xb8\x85\xa4\x34\xb8\x85\xa4\x34\x50\x62\x06\x13\x25\
+\x9a\xa9\x01\x46\x1d\x30\xea\x80\x51\x07\x8c\x3a\x60\xd4\x01\xa3\
+\x0e\x18\x70\x07\xb0\x50\x6a\xc0\x7f\x06\x06\x07\x4a\xaa\xe4\xa1\
+\x1f\x02\x8c\x0c\x0c\x07\x76\xad\x99\xd3\x40\xae\xfe\x01\x0f\x81\
+\x51\x07\x8c\x3a\x60\xd4\x01\xa3\x0e\x18\x75\xc0\xa8\x03\x06\xdc\
+\x01\x00\x05\x9e\x09\x3f\xb6\x6d\xc4\xbd\x00\x00\x00\x00\x49\x45\
+\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x00\xf6\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x00\xa8\x49\x44\x41\x54\x78\x9c\xed\
+\xd0\xb1\x0d\x80\x30\x00\xc4\x40\xc2\x1e\x11\xec\x3f\x15\x88\x41\
+\x42\xcb\x06\x47\x61\x77\x5f\xbd\xe5\xb1\x21\xae\xfb\x59\xdf\x7d\
+\x1e\x73\x08\x8f\x5d\x9c\xfe\x89\x02\x68\x01\x4d\x01\xb4\x80\xa6\
+\x00\x5a\x40\x53\x00\x2d\xa0\x29\x80\x16\xd0\x14\x40\x0b\x68\x0a\
+\xa0\x05\x34\x05\xd0\x02\x9a\x02\x68\x01\x4d\x01\xb4\x80\xa6\x00\
+\x5a\x40\x53\x00\x2d\xa0\x29\x80\x16\xd0\x14\x40\x0b\x68\x0a\xa0\
+\x05\x34\x05\xd0\x02\x9a\x02\x68\x01\x4d\x01\xb4\x80\xa6\x00\x5a\
+\x40\x53\x00\x2d\xa0\x29\x80\x16\xd0\x14\x40\x0b\x68\x0a\xa0\x05\
+\x34\x05\xd0\x02\x9a\x02\x68\x01\x4d\x01\xb4\x80\xa6\x00\x5a\x40\
+\x53\x00\x2d\xa0\x29\x80\x16\xd0\x14\x40\x0b\x68\x0a\xa0\x05\x34\
+\x2f\x70\x51\x04\x80\x66\x61\x99\xa8\x00\x00\x00\x00\x49\x45\x4e\
+\x44\xae\x42\x60\x82\
+\x00\x00\x03\xf4\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x03\xa6\x49\x44\x41\x54\x58\x85\xe5\
+\x97\x4f\x68\x1c\x55\x18\xc0\x7f\xdf\x9b\xec\x26\x5a\x93\x88\x96\
+\x98\x9a\xdd\xc9\xee\xc6\x80\x86\x3d\x78\x90\x42\x0f\xf5\x4f\x29\
+\x2d\x22\x6d\xaa\xa0\x22\x52\x0b\x55\xf1\xd0\x9b\x20\xa4\x78\xe8\
+\x41\xd1\x80\x27\xa5\x28\x88\x20\x88\x5e\x0d\x36\x6a\xb5\x60\x69\
+\x4f\x52\x1a\x28\xc2\x2a\x91\x6d\xb2\x7f\x66\xb6\xab\x78\x90\xd8\
+\x58\x35\x99\x79\x9f\x87\x9d\x5d\x93\x6c\xd2\x64\xd9\x8d\x97\x7e\
+\x97\xf9\xf8\xe6\x9b\xf7\xfb\xbd\x61\xde\xcc\x1b\xb8\xd5\x43\x5a\
+\x69\xbe\x5a\xa9\x24\x63\x81\x3d\x62\x91\xfd\x82\x26\x51\x12\x08\
+\x06\xa5\x82\xe0\x0b\x5c\x34\x86\xa9\x64\x32\x99\xef\xa8\xc0\xbc\
+\xe7\xed\x36\x96\x49\xe0\xb1\xad\xf4\x2b\x5c\x36\xc8\xc9\xe1\xe1\
+\xc4\x77\x6d\x09\xcc\xcd\xcd\xf5\x3b\x4e\xfc\x03\x84\xe7\xa2\x52\
+\x55\x61\x1a\xd1\xb3\x2a\x32\x1f\x76\x75\x55\x6f\x0b\x43\x1b\x86\
+\xe1\xa0\xaa\x93\x52\xd1\x03\x02\xe3\xc0\x70\xd4\xff\xb5\x0d\x97\
+\x8f\x67\x32\x99\x5f\x5b\x16\xf0\x3c\xef\xbe\xd0\xea\x19\x90\x07\
+\x80\xaa\xc0\x29\xd7\x4d\x7c\x2c\x22\xc1\xcd\xa4\x55\xd5\x14\x3d\
+\xef\x59\x51\x79\x13\xc8\x20\x94\x6d\x20\x87\x33\x99\xc4\x0f\x5b\
+\x16\x28\x95\x4a\x19\xc5\x5c\x02\x76\x0a\x7c\xb1\xb4\xf4\xf7\x0b\
+\xa3\xa3\xa3\x7f\xdc\x0c\xbc\x36\xf2\xf9\x7c\x77\xac\xbb\xe7\x7d\
+\x94\xe3\xc0\x9f\xa8\xd9\x9b\x4a\x0d\x5d\xd9\x54\x20\x9f\xcf\xf7\
+\xc5\xe2\x3d\xdf\x03\x63\x0a\xef\xa6\xdc\xc4\xab\x22\x62\x5b\x81\
+\xd7\x43\x55\xa5\x58\xae\x4c\x08\xfa\x16\xe0\xa3\xe1\xee\x54\x2a\
+\x55\x5d\xd9\x63\xd6\x5e\x14\x8b\xf7\x9c\xae\xc1\x75\xba\x1d\x38\
+\x80\x88\x68\xca\x1d\x9a\x04\x3e\x02\x12\x88\xf3\xa9\xaa\xae\x9a\
+\xf4\x2a\x81\x72\xb9\xfc\x10\x70\x14\xe5\x37\x1b\x2c\x1f\x6d\x07\
+\xbe\x52\x62\xf1\xfa\xc2\x09\x60\x16\xd8\x57\x2a\xf9\x8f\x6f\x28\
+\x60\x95\xb7\x6b\x17\xf1\xc6\xc8\xc8\xc8\x42\xbb\xf0\x7a\x64\xb3\
+\xd9\x25\x94\xd7\x01\x54\x98\x5c\x79\x17\x1a\x49\xb1\x58\xdc\x85\
+\x38\x15\xe0\xf7\xc5\xeb\x0b\xbb\xb2\xd9\xec\x52\xa7\x04\xa0\xf6\
+\x3c\x94\xca\xfe\x4f\xc0\xfd\x36\x94\x07\xeb\xab\xa2\x71\x07\x44\
+\x9c\x43\x91\xd0\x57\x9d\x86\xd7\xc6\x17\x55\x38\x03\x20\x8e\x3e\
+\x59\xaf\x37\x04\x54\x79\xb4\x96\xf0\x4d\xa7\xe1\x0d\x09\x95\x6f\
+\xa3\x74\x5f\x93\x00\x22\xc9\x28\x29\x6c\x97\x80\xea\xf2\x3c\x80\
+\x40\xa2\x59\x20\x2a\xaa\x2e\x57\xd9\xa6\x08\x82\xa0\x3e\xf6\x50\
+\xfd\x41\x6c\x7a\x0f\xfc\x8f\xb1\x56\xc0\x56\x6a\xc7\xd8\xe0\x76\
+\x11\x1d\x67\x47\x34\xb6\x5c\xab\xbf\x63\xfe\x13\x50\xe3\xd5\xba\
+\x6c\x7a\xbb\x04\x8c\xb1\x99\x28\xf5\x1b\xb5\x06\x5f\xb8\x00\x60\
+\x94\x83\xdb\x25\x20\xa2\x07\x00\x14\x3d\xdf\x24\xe0\x88\x9d\xae\
+\x9d\x94\x27\x66\x66\x66\x62\x9d\x86\xab\xaa\x28\x1c\x06\xc0\xca\
+\x54\x93\x80\xeb\xba\xd7\x80\xf3\xc0\xce\xbb\x07\x06\x5e\xea\xb4\
+\x80\xe7\x79\x87\x80\x31\xe0\xc7\x54\x6a\xa8\xb1\x37\x58\xb5\x0a\
+\x8c\xe8\x04\x80\xa8\x39\x95\xcf\xe7\xfb\x3a\x05\xcf\xe5\x72\x71\
+\xab\x52\xfb\xce\x60\x4e\x8a\x88\xae\x2b\xe0\xba\xee\x65\xe0\x33\
+\xd0\x7b\xe2\xf1\x9e\x4f\x54\xb5\xed\x65\xaa\xaa\xd2\xdb\xdb\xf7\
+\x1e\x30\x86\x70\xc1\x75\xef\xfd\x72\xe5\xf9\x26\x40\x18\x2c\x9d\
+\x00\x66\x15\xc6\x4b\xa5\xca\x3b\xed\x48\xa8\xaa\x94\xcb\xfe\x6b\
+\x8a\xbc\x02\x5c\x33\xe8\xf3\x2b\x67\x0f\x1b\x6c\xc9\x6a\xfb\x41\
+\x2e\x01\x77\x21\x7c\x7e\x7b\x4f\xf7\xb1\x81\x81\x81\xc5\x56\xe0\
+\xb9\x5c\x2e\x7e\x47\x6f\xff\x69\xe0\x65\xe0\x86\x11\x7d\xc4\x75\
+\xdd\x99\xb5\x7d\xeb\xce\x2e\x99\x4c\x5e\x0d\x1d\xd9\x03\xfc\x8c\
+\xf2\xd4\x8d\xbf\xfe\x99\x2d\x16\xbd\x17\x55\xb5\x6b\x33\xb0\xaa\
+\x9a\x52\xc9\x7f\x66\x47\x6f\x7f\x2e\x82\xfb\xa8\xb3\x77\x3d\x38\
+\x6c\xb2\x2d\x2f\x14\x0a\x77\x62\x9c\x0f\x05\x79\x3a\x2a\xf9\xa8\
+\x4c\x8b\xc8\x59\x08\xe6\x8d\x31\xd5\x20\x08\x2c\xc4\x07\x71\xc2\
+\x61\xb1\x1c\x44\x64\x1c\xc8\x44\x83\x9f\xb3\x36\x38\x96\x4e\xa7\
+\x7f\xd9\x88\xb1\xa5\x1f\x93\x62\xd1\xdf\x23\xa2\x93\x0a\x0f\x6f\
+\xa5\x1f\xb8\x62\x45\x27\x32\xae\x7b\x6e\xb3\xc6\x96\x7e\xcd\x0a\
+\x85\x42\x0a\x13\x3b\x22\xe8\x7e\x94\x24\x42\x02\x70\x00\x5f\xc0\
+\xb7\xc8\x45\xac\x4c\xa5\xd3\x43\xb3\xad\x8c\x7b\x6b\xc7\xbf\xc1\
+\x7f\x6c\x10\x0e\xdc\xa9\xdc\x00\x00\x00\x00\x49\x45\x4e\x44\xae\
+\x42\x60\x82\
+\x00\x00\x02\x8a\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x02\x3c\x49\x44\x41\x54\x58\x85\xed\
+\x97\x3d\x6b\x14\x51\x14\x86\x9f\x73\xc7\x2e\x60\x61\x30\xa0\x66\
+\xdc\xd9\x5f\x61\x40\x91\x58\x6f\xca\xb4\xda\x04\xd4\xca\xca\xc4\
+\x1f\x90\x6a\x03\x16\x06\x0c\x2a\x68\x9d\x3a\xb8\x60\x17\x10\x84\
+\xe4\x57\xec\xbd\x99\xb1\x49\x50\xb0\x48\xb9\xf3\x5a\xec\x4e\x4c\
+\x26\xfb\xbd\x13\x1b\x7d\xab\xcb\x39\x77\xe6\x3c\xf3\x9e\x0b\x73\
+\x0f\xfc\xeb\xb2\x72\x20\x84\xef\xf7\x73\x3a\xaf\x4c\xb6\x84\x71\
+\xb3\x92\x2a\xe2\x44\xa6\x03\x47\xd4\xac\xd5\xee\x7c\x1b\x08\xe0\
+\xfd\xd1\x4b\xcc\xb6\xfa\x81\x55\xa4\x1c\x69\x23\x49\xee\xbe\xbe\
+\x04\x10\x42\x78\x20\xdc\x57\xe0\x97\x61\x2f\x9c\x53\x2b\x8e\xe3\
+\x9f\x55\x54\x4d\xd3\xf4\x46\x9e\x5b\x43\x68\x1b\xb8\x6e\xb8\x87\
+\x65\x27\x68\x87\xa3\x3d\x1f\x52\x85\x90\x3d\xae\xa2\x68\x3f\x85\
+\x90\x3d\xf1\x21\x55\x3b\x1c\xed\x15\x31\x57\x2c\x4c\xb6\x04\xe0\
+\x9c\x5a\x57\x05\x10\x45\xb4\x00\x0c\xbb\x77\x09\xa0\x38\x70\x55\
+\xd9\xde\x4f\x8b\x8b\x8b\x3f\x7a\xcb\x85\x22\x76\xad\xea\x22\x21\
+\x64\x2b\x42\x1f\x00\x0c\x7b\x5a\xab\x2d\x7e\x1e\xb6\xbf\x52\x00\
+\xef\x7d\x5d\x68\x17\x98\x03\xe8\x81\xdc\x1e\xf6\x8c\x1b\x96\x9c\
+\x44\x92\x1c\x2e\xfa\x54\x14\x1f\x57\x95\x01\x84\x34\x7d\x8e\x58\
+\xbe\x00\x65\xda\xfc\x2b\x00\xde\xfb\x3a\xb2\xad\x52\x78\x3f\x89\
+\xe3\xf7\x57\x0e\x30\xc0\xfa\x53\xd4\x59\x33\xb3\x7c\xd4\xf3\x23\
+\x0f\xe1\xa8\x53\xdd\xb5\xde\x96\x2f\x40\x99\xd6\xeb\xb5\xa4\x3d\
+\xce\x07\x8c\x74\xa0\x57\xfc\x16\x70\x4b\x68\xd7\x7b\x5f\x2f\x72\
+\xb3\x58\x3f\x36\x40\x49\x73\x58\xf4\x51\x92\x9b\xd5\xfa\x42\x23\
+\x5b\x20\xd3\xa6\xc9\x76\xce\x85\x1e\xf9\x34\x7d\x66\x60\xb3\x58\
+\x5f\x68\xa4\x03\x3d\x3b\xf7\xcf\xc7\x4c\xb6\x83\xec\x6d\x69\xeb\
+\x44\xd6\x8f\x0d\x60\x66\x39\xea\xac\x01\xa7\x43\xb6\x4d\x6c\xfd\
+\xd8\x00\x00\x49\x92\xb4\x31\x6d\x0c\xca\xcb\xb4\x9e\x24\x93\x59\
+\x3f\x11\x00\x40\x2d\x8e\xdf\x51\x6a\x45\x4f\x53\x59\x3f\x31\xc0\
+\x80\x56\x4c\x6d\xfd\xc4\x00\xd0\x6d\x85\x1c\xab\x60\x1e\xcc\xcb\
+\xb1\x3a\xad\xf5\x85\x26\xfe\x1d\xd7\xe3\xf8\x0b\x50\x1f\xb9\x71\
+\x4c\xfd\x71\x40\x9c\x40\xf7\x02\x59\xd5\xcb\xcb\xca\xb2\x6c\xbe\
+\xb7\x3c\xbe\x04\x20\xd3\x01\x40\x9e\x5b\xe3\xaa\x00\x3a\x1d\x1a\
+\x00\x42\x87\x45\xec\xac\x05\x8e\xa8\x29\xf2\x15\xa1\xed\x10\x32\
+\x8b\x22\x5a\xe7\xee\x70\x33\x29\xcb\xb2\xf9\x4e\x87\x86\xd0\x1b\
+\x20\x77\x44\xcd\x22\xd7\x6f\x30\x69\x52\xe1\x45\xa5\xa4\xc1\x83\
+\x49\xa1\xb3\xd1\xac\x7b\x75\x5e\x28\xe7\xa7\xd4\xb1\xd0\x61\xbf\
+\xd1\xec\xbf\x7e\x03\x1f\xb0\x01\x10\x54\x88\x8f\x55\x00\x00\x00\
+\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x00\x89\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x00\x3b\x49\x44\x41\x54\x78\x9c\xed\
+\xd0\x01\x09\x00\x20\x10\x04\xc1\xd7\xfe\x21\x15\x83\xf8\x29\xe4\
+\x40\x66\x12\x2c\x5b\x05\x00\x00\x00\x00\x00\x00\xc0\xff\xc6\xda\
+\xe7\xa6\x23\x92\x66\x3a\x20\xcd\x80\x74\x00\x00\x00\x00\x00\x00\
+\x00\x00\xbc\xd7\x42\xd4\x03\xab\xc4\x79\xcd\x85\x00\x00\x00\x00\
+\x49\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x01\x20\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x00\xd2\x49\x44\x41\x54\x78\x9c\xed\
+\xd0\xb1\x15\x82\x50\x10\x44\xd1\x5d\x8b\xa0\x16\xeb\xa0\x05\x22\
+\x2b\xb2\x0b\xea\xb0\x0e\x22\xab\x00\x03\x34\xd3\x94\xeb\x39\xcc\
+\x8d\x7e\xf6\x67\x5f\x55\x44\x9c\x59\xab\x8f\xaf\xf3\x36\x6e\xb5\
+\xdd\xf7\x11\x7d\x7b\x8c\x3d\x8b\x1d\x17\xf1\x69\x55\xd5\xfb\xf8\
+\xa1\xaa\x86\x4f\x08\x81\x05\xa8\xfd\xf8\x6f\xef\x43\xc9\x00\x7f\
+\x21\x01\xf4\x00\x2d\x01\xf4\x00\x2d\x01\xf4\x00\x2d\x01\xf4\x00\
+\x2d\x01\xf4\x00\x2d\x01\xf4\x00\x2d\x01\xf4\x00\x2d\x01\xf4\x00\
+\x2d\x01\xf4\x00\x2d\x01\xf4\x00\x2d\x01\xf4\x00\x2d\x01\xf4\x00\
+\x2d\x01\xf4\x00\x2d\x01\xf4\x00\x2d\x01\xf4\x00\x2d\x01\xf4\x00\
+\x2d\x01\xf4\x00\x2d\x01\xf4\x00\x2d\x01\xf4\x00\x2d\x01\xf4\x00\
+\x2d\x01\xf4\x00\x2d\x01\xf4\x00\x2d\x01\xf4\x00\x2d\x01\xf4\x00\
+\x2d\x01\xf4\x00\x4d\x06\x78\xfe\x78\x1f\xca\x05\x58\x7b\xea\xae\
+\xa5\xbb\x96\x5a\x7b\x62\x3b\x22\xe2\xd4\x5e\x68\x08\x13\x4e\x3b\
+\x46\xe4\xd2\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x04\x01\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x03\xb3\x49\x44\x41\x54\x78\x9c\xed\
+\x99\x4f\x68\x5c\x45\x1c\xc7\xbf\xdf\xd9\x4d\x08\x88\x27\x5b\xb1\
+\xbc\xbc\x9d\x8d\x8d\xb2\x67\x15\x4f\xed\x21\xfe\xa3\x5a\x28\x82\
+\x17\x3d\x09\xc6\x58\xc1\xa3\xa2\xa0\x88\x94\x7a\x69\x05\xbd\x56\
+\xb1\xe0\x49\x10\xa4\xda\x8b\x95\x42\xa5\x5e\x2d\xf5\x2c\x12\x92\
+\x7d\x79\x59\x11\x8d\xa7\x08\x4d\x36\xfb\xe6\xeb\x61\x37\x74\xf7\
+\xbd\xb7\x64\x93\x7d\xbb\x1b\xe9\x7c\x4e\xcb\xfc\x66\xe6\xf7\xfd\
+\xce\x9b\x79\x6f\x66\x16\xf0\x78\x3c\x1e\x8f\xc7\xe3\xf1\x78\x3c\
+\x1e\x8f\xc7\xe3\xf1\xdc\x5b\x30\x5d\x10\x45\x8d\x8f\x44\x7d\x28\
+\xe7\x4a\x24\x1d\x00\x4d\x40\x57\x91\x50\x92\xa1\x31\x09\xc5\xf3\
+\xd6\x06\xe7\x7a\x82\xe9\xda\xf5\x28\x6e\x01\x28\x8d\x4d\xde\x78\
+\x49\xaa\x36\x2c\x77\x17\x98\x49\x29\x39\x2c\x64\x06\x80\xc0\xc7\
+\xf8\xff\x4f\xfb\x3c\xd4\xf1\xd6\x43\x66\x09\x00\x40\xbd\xbe\xbe\
+\x00\xea\x2a\x80\xfb\x53\x7d\x88\xa4\xd3\x21\x1e\x1e\x01\x86\x59\
+\x5f\x9b\x72\x38\x33\x37\x17\xde\x4c\xd7\xcf\x1d\x00\x00\x88\xa2\
+\xe8\x71\xc1\xfc\x08\xe0\x48\xaa\x89\x00\xb9\x02\xb4\x8e\x02\x83\
+\xac\xa7\x0d\xc2\x9d\xb2\xd6\xde\xee\xd7\x20\x17\x6b\xed\x6d\x97\
+\x98\x13\x04\xe2\xde\x88\xc8\x43\xf8\xee\x60\x9e\x79\x62\xcd\x25\
+\xe6\x44\x3f\xf3\xc8\x34\xc8\x61\xb9\xd1\x08\xcb\x2d\x77\x1d\x40\
+\x2d\xd5\x52\x10\xdd\xe4\x5f\x17\x04\x28\x03\x65\xbc\xfc\xd6\x2a\
+\x9b\xe7\xe6\x83\x20\xce\x6d\x76\xb7\xf5\xde\x34\x1a\x8d\x23\x3b\
+\x2d\x77\x0d\xc0\x13\xdd\xe5\x12\x40\x32\x99\xe4\x20\x48\x28\x31\
+\xe5\x42\xc0\xad\xe9\xb2\x79\x21\x08\x82\x8d\xbd\xda\x0f\x34\x95\
+\x83\x20\xd8\xd8\xba\x33\xf3\x14\x80\x9f\xba\xcb\x49\x40\x50\x69\
+\xa0\x51\x2c\x1c\x51\xc8\x9a\x07\x70\x63\xfb\xce\xcc\xd3\x83\x98\
+\x07\xf6\xb1\x96\x6b\xb5\xa3\x9b\x72\xad\xd3\x20\xbe\xeb\x2e\x27\
+\x00\x01\x25\x0d\x38\x9b\x8a\xa0\x9d\x8b\x26\x93\x90\xb8\xb2\xd3\
+\xdc\x3a\x5d\xab\x1d\xdd\x1c\xb4\xaf\x7d\x8b\x96\x54\x8e\xe2\xf5\
+\x4b\x10\x16\x73\xa2\xae\xfd\x95\x18\x25\x22\xc0\xec\x83\x23\x2e\
+\xdb\x70\xf6\x6c\x7b\x49\x0e\xce\xbe\xdf\xe6\x24\x5b\x36\x9c\x5d\
+\x02\xf0\x49\x4e\x34\xef\x33\x54\x24\xb9\xe6\x05\x5c\xb4\xe1\xec\
+\xd2\x7e\xcd\x77\x3a\x3c\x38\x51\x14\xbf\x2b\xe0\x42\x4e\xa8\xf0\
+\x43\x14\xdb\x53\x2b\x6f\xe7\xfa\x9e\xb5\xe1\xc5\x21\xfa\x1d\x8e\
+\x7a\x3d\x7e\x1d\xc4\xe7\x48\x8b\x23\x1d\x54\xd0\x9e\x91\x24\xa4\
+\xb4\x79\x07\xe1\x8d\x6a\x35\xbc\x3c\x54\xd7\xc3\x34\xde\xa5\x5e\
+\x8f\x5f\x02\xf1\x35\x80\xe9\x54\x48\x68\xcf\x86\x83\x23\x18\x30\
+\xa3\xb3\x09\xe1\x95\x6a\x35\xbc\x32\x54\xdf\x28\x70\xbd\x46\x51\
+\xe3\x19\xc1\x7d\x0f\xe0\xbe\x54\x48\x24\xf6\x7d\x7e\x20\x01\x49\
+\xa6\xfd\xab\x87\x7f\x09\xbe\x68\xed\xec\x8d\x21\xe4\xde\xcd\x53\
+\x44\x27\xbb\xac\xc4\xf1\x93\xc6\xe1\x07\x00\x0f\xa4\x42\x07\x99\
+\x09\x79\x2f\xd4\x7f\x0c\xf5\x7c\xa5\x52\xb9\x75\x50\x8d\x79\x49\
+\x0a\xe3\xe1\x30\xfc\x05\x4a\x4e\x02\x68\xa4\x42\x04\x07\xcf\x95\
+\xbb\xaf\x07\xd6\xa1\xe4\x64\x91\xe6\x91\x93\xa4\x10\x56\x56\xfe\
+\xb0\xc6\x24\xd7\x41\x3c\x9a\x4a\x27\x10\x0e\x7d\xd7\x43\x9f\x7d\
+\xbd\xf0\x7b\x92\x98\x67\x8f\x1f\x0f\xd6\x8a\xd6\x3a\xb2\x6f\xf6\
+\xf2\xf2\x9f\x0f\x96\xa7\x9a\xd7\x00\x3e\xd6\x13\x90\x00\x9a\x9c\
+\xf3\x03\x01\xb9\x52\x76\xc9\xeb\xd7\x9d\xe9\xa9\x53\x8f\x1c\x3b\
+\xf6\xf7\x28\x74\x8e\xec\x58\x3b\x3f\xff\xd0\x5f\x3b\xcd\xed\x05\
+\x08\x3f\xf7\x04\x48\x48\xea\xb9\x73\x6c\x6f\xa7\x95\x35\x4f\xdc\
+\xdc\x69\x6e\x2f\x8c\xca\xfc\x6e\xee\x91\xb2\xba\xba\x3a\x03\x33\
+\xf5\x0d\xa1\x33\xdd\xe5\x9d\xe7\xef\x3a\x22\xf2\x36\x38\x57\x9d\
+\x6b\xbd\x3c\x37\x37\xb7\x35\x4a\x7d\x63\x39\xc0\x48\x2a\xaf\xad\
+\xc5\x5f\x0a\x7c\x75\x90\xfa\x04\xbf\xaa\x54\x82\x25\x92\xad\x51\
+\x6b\x1b\xcb\xcd\x0e\xc9\x56\xa5\x12\xbe\x06\xe9\xb3\x3d\x2b\x8b\
+\x9f\x56\x2a\xc1\xe2\x38\xcc\x03\x63\xbc\xda\x22\xe9\xac\x0d\xdf\
+\x06\xf9\x41\xbf\x3a\x02\xdf\xb7\x36\x78\xa7\xf3\x87\xcc\x78\x74\
+\x8d\x2b\x51\x37\xab\xd1\xfa\x59\x42\x97\xba\x8a\x44\xe0\x4d\x6b\
+\xc3\x2f\xc6\xad\x65\x32\x97\x39\x00\x56\xa3\xf8\x02\x81\x45\x00\
+\x09\xc1\xb7\xac\x9d\xfd\x76\x52\x5a\x3c\x1e\x8f\xc7\xe3\xf1\x78\
+\x3c\x1e\x8f\xc7\xe3\xf1\x78\x3c\xf7\x12\xff\x01\x83\xc1\x2a\x8b\
+\xb6\x49\x04\xca\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
+\
+\x00\x00\x00\x68\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x00\x1a\x49\x44\x41\x54\x58\x85\xed\
+\xc1\x01\x01\x00\x00\x00\x82\x20\xff\xaf\x6e\x48\x40\x01\x00\x00\
+\x00\xef\x06\x10\x20\x00\x01\x47\x01\xa0\x88\x00\x00\x00\x00\x49\
+\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x03\x5e\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x03\x10\x49\x44\x41\x54\x78\x9c\xed\
+\x99\xd1\x4b\x53\x51\x1c\xc7\xbf\xe7\x6c\x3a\x37\xca\xa2\x88\x1e\
+\xaa\x87\x46\x11\x24\x3d\x54\x90\x91\x09\xd1\x9c\x31\x91\x32\x2f\
+\x23\x7a\x4a\xe9\x6a\x10\x48\x7f\x40\xd0\x1e\xea\x2d\xa2\xde\x8a\
+\xb9\x2d\x1f\xd2\x82\xb5\x19\x8b\x2c\xb7\x52\x1f\xc2\x20\xb0\xa8\
+\xcc\x12\xb4\x1e\xca\x82\xc8\x32\x57\x8e\x9c\x3b\xa7\x27\x69\x5e\
+\xaf\x0d\xc1\x73\xae\xd0\xf9\x3c\x7e\x7f\xb0\xef\xf7\x7e\xef\xd9\
+\xce\xb9\x77\x80\x42\xa1\x50\x28\x14\x0a\x85\x42\xa1\x50\x28\x14\
+\x8a\xff\x0d\x22\xda\xc0\xab\xe9\x1d\x00\x8e\x03\x00\x38\x69\x4c\
+\xc5\x5b\xdb\x44\x7b\x2e\x06\xa1\x05\x1c\x68\x68\x28\x29\x4a\xdb\
+\x33\xf9\x1a\xe5\xec\x60\x77\x3c\xd2\x2b\xd2\x77\x31\x50\xa1\x9f\
+\xfe\xcb\x65\x37\x4a\x8c\xd0\x1e\x4f\x7d\xa3\x5b\xa8\xef\x22\x90\
+\xf1\x15\xe0\x66\xba\x33\xcb\x4a\x13\x89\x48\x5a\xb4\x7f\x21\xc4\
+\xae\x00\x00\xab\xe9\x8f\x79\xab\x00\x00\x32\x45\x74\x32\x10\x08\
+\x08\xf7\x2f\x84\xf0\x00\xd1\x68\x34\x67\x2f\xc9\xac\x32\x9b\xf5\
+\x0f\x8e\xe5\x44\xfb\x17\x42\xca\x1d\xb8\xdf\xde\x3e\x49\x29\xdf\
+\x6a\x36\xf3\x6a\xfa\x63\x19\x19\x16\x42\xda\x12\xec\x8e\x86\x47\
+\x40\x78\x95\xc9\xa8\xa2\x5a\x6b\xba\x28\x2b\x87\x11\x9b\x4c\xb3\
+\x77\x43\xcf\xdf\xbb\xb7\xef\x1c\x27\x20\x35\x86\xd1\xbe\x2d\x65\
+\xbb\x47\x46\x87\x9e\xbd\x92\x99\x07\x90\xb0\x0b\x98\xe1\xd5\xf4\
+\x36\x00\x27\x8c\x3a\xa5\xbc\xbc\x3b\x1a\x7e\x2a\x33\x8b\x25\x05\
+\x00\x80\x57\xd3\x47\x01\xcc\x3f\x0f\x64\xd9\x86\x54\x22\xf2\x49\
+\x56\x0e\xcb\x0a\x00\x16\x3e\x23\xfc\xa4\x2b\x5d\x4f\xa2\x97\x33\
+\x66\xb3\xa5\xc6\xd2\x7d\xf8\xdb\x5a\x5a\x6c\xa6\xaf\x60\xe9\x29\
+\x48\xba\x39\x96\x16\x30\x10\x0c\x66\xb3\xc5\x74\x9d\xd9\xcc\xab\
+\xe9\xdf\x65\x64\xb0\xfc\x24\xd6\x77\x33\xf8\x95\x30\xbe\xc3\x64\
+\xb4\xaa\x4a\xd3\x6f\x89\xf6\xb7\xbc\x00\x00\x48\x76\x86\x07\x39\
+\x41\x9d\x51\x27\xc0\x31\xd1\xde\xcb\xa2\x00\x00\xa0\x9c\x0e\x5b\
+\xe2\x6b\x85\xa9\x11\xcf\x61\x7d\x3d\x07\xeb\x32\x19\xf5\x8b\xf6\
+\xb6\xbc\x80\xda\xda\x66\x17\xb5\x23\x01\x60\xf3\x9c\x01\xc7\xf9\
+\x54\x2c\x54\x21\xda\xdf\xd2\x02\xfc\x7e\xbf\x6d\xda\xc1\x3a\x40\
+\xb0\x27\x5f\x27\xe0\xad\xa9\x78\x28\x20\x23\x83\xa5\x05\x4c\xb0\
+\xd2\x4b\x1c\x38\x92\xaf\x11\x82\x07\xd3\xe3\x1b\x4f\x03\x30\x3d\
+\x24\x2d\x35\x16\x1e\x85\x9b\xce\x00\xfc\xca\x5c\x95\xbc\x70\x66\
+\x73\x95\x32\xdf\x14\x59\xf3\x30\x54\xdf\x74\x14\x84\xc7\x0c\xfe\
+\x1f\x73\xd4\xbe\xb7\x27\x7a\x6d\x4c\x66\x16\xe9\x05\x54\x6b\xcd\
+\xe5\x1c\xac\x17\x80\x73\x56\xe3\x40\x9a\x03\xfb\x1f\xc5\x42\x2f\
+\x65\xe7\x91\xfa\x1b\xe0\xa9\x6f\x74\x73\xb0\xbb\xc8\xbb\x78\x00\
+\x33\x94\x41\xb3\xe2\xe2\x01\x89\x05\x1c\xf2\x9f\x5c\x43\x88\xad\
+\x0b\xc0\x9c\xb3\x3f\x01\x3f\x95\xec\x0c\xa5\x64\xe5\x30\x22\xa5\
+\x00\x9f\xaf\xc5\x91\x63\xe4\x0e\x01\xb6\xe5\xeb\x9c\xf0\x0b\xc9\
+\x58\x38\x22\x23\xc3\x42\x08\x2f\x20\x10\x08\xd0\x19\x57\xe6\x3a\
+\x01\x2a\x0d\xa3\x1b\x0f\x6f\x87\xcf\x89\xf6\x2f\x84\xf0\x02\xfa\
+\x5f\x8f\x9d\xc5\xec\x7f\x83\x7f\xe9\xb3\x4f\x39\x75\x48\xda\xeb\
+\xff\x85\xd0\x5d\xc0\xe7\x6b\x71\xcc\xb8\x32\x13\x00\x4a\xf2\xe4\
+\x37\xc5\x8e\xa2\x8a\x7b\x1d\x57\xa5\x3c\xef\x17\x42\xe8\x0a\xf8\
+\xb2\xe9\x37\xe3\x40\x36\x5f\xb2\xe5\xec\x35\xcb\xe5\xe2\x01\xc1\
+\xaf\xc5\x3f\x0f\x0c\x30\x77\xd9\xae\x61\xc2\xe1\xe1\x04\x1f\x08\
+\x25\x75\xc9\x78\xf0\xad\x48\x4f\x85\x42\xa1\x50\x28\x14\x0a\x85\
+\x42\xa1\x50\x28\x14\x8a\x42\xfc\x01\xea\x12\xdd\x53\xe7\x12\x49\
+\xf2\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x00\x75\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x00\x27\x49\x44\x41\x54\x78\x9c\xed\
+\xc1\x01\x0d\x00\x00\x00\xc2\xa0\xf7\x4f\x6d\x0e\x37\xa0\x00\x00\
+\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x80\x77\x03\
+\x40\x40\x00\x01\x8f\xf2\xc9\x51\x00\x00\x00\x00\x49\x45\x4e\x44\
+\xae\x42\x60\x82\
+\x00\x00\x06\xb5\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x06\x67\x49\x44\x41\x54\x78\x9c\xed\
+\x9b\x4d\x70\x5b\x57\x15\xc7\x7f\xe7\x2a\x85\x94\xd0\xa4\x4d\x3f\
+\x67\x18\x16\x0c\xbb\x34\x49\x93\x36\xb4\x14\x18\x68\xac\x2f\xa7\
+\x8d\xed\xda\x8a\x76\x6d\x67\x62\xd9\x1e\xd6\xac\xca\x02\x16\x4c\
+\x16\x6c\xd8\x32\x53\x5b\x76\x57\xed\x46\xb6\x34\x0c\x4d\x1b\x3f\
+\xe9\xc9\xe5\xa3\x84\x0e\xe5\xa3\x2d\x30\xcc\x74\x4a\x17\xdd\x51\
+\x0a\xc4\x69\x6a\x3b\x13\xdd\xc3\xc2\x92\x31\xfa\xbc\x4f\x7a\xcf\
+\x36\x83\xff\xcb\x7b\xcf\x3b\xe7\xfc\x7f\xbe\xf7\x3e\x3d\xe9\x19\
+\xf6\xb5\xaf\x7d\xfd\x3f\x4b\xda\x0d\xa6\x9e\x7d\xf6\x90\xae\x7d\
+\xf6\x3b\x28\x23\xc0\x41\x85\xab\xc6\xf0\x43\xaf\x90\xff\x60\x87\
+\xfb\xeb\x4b\xa9\xec\xd4\x97\xac\xe5\x79\x81\xc7\x81\x75\x55\x2e\
+\xdf\x8a\x7d\xe6\x47\xaf\x17\x7e\xfc\x49\x73\x6c\x0b\x80\xd1\xd1\
+\xc9\x3b\xd6\x6e\x33\x3f\x03\x4e\x37\x4d\x5d\x13\x4c\xda\x5b\x9a\
+\x7d\x33\xa2\xbe\x43\x51\x7c\x62\xfa\x2b\x46\xb4\x0c\x1c\xf9\xef\
+\x19\x79\xfb\xc0\xc1\x4f\xbf\xf9\xda\x4b\x2f\xad\x6e\x1f\x35\xcd\
+\x09\xd6\x0e\x98\xe7\x69\x35\x0f\x70\x44\x51\x2f\x95\x99\x79\x2c\
+\xc4\x7e\x43\x55\x67\xf3\x00\xfa\x50\x6d\xfd\xf6\xef\x36\x8f\xb6\
+\x00\x40\x18\xed\x5c\x42\x0f\xef\x55\x08\xdd\xcd\x6f\x4a\x61\xac\
+\x79\xac\x05\x80\xc0\xed\xdd\x4b\x6d\x42\x48\x67\x73\x8f\xf6\xd1\
+\x67\x24\x4a\x66\x26\xcf\xf4\x32\x5f\xd7\xc1\xe6\x81\xd6\x15\xa0\
+\xbc\xd1\xbb\xa4\x1e\xb6\xd6\x94\xf7\x02\x84\x64\x66\xf2\x0c\x98\
+\x0a\xbd\xcd\x03\xad\xde\x5a\x00\xa8\xc4\x2e\x01\xd7\x7a\xe7\xda\
+\x7d\x08\xc1\xcc\xcb\x2a\xc4\x7e\xd0\x3c\xda\x02\xa0\xbc\xf4\xc2\
+\x7b\xc6\x68\x0a\x67\x08\xb2\x2b\xdb\xa1\x6e\xde\x65\xd9\x03\xb2\
+\xaa\xaa\xe9\xf2\xd2\x0b\xef\xb5\xcc\x74\xba\x24\x9d\xcd\x3d\x6a\
+\xad\x29\x83\x1e\x76\xe8\xe7\x9a\x55\x49\xfa\xc5\xb9\xdf\x38\xc4\
+\x0e\xac\x54\x76\xea\x11\xb5\x54\x80\x3b\x7b\xc5\x2a\x5c\x47\x49\
+\x55\x8a\xf9\x5f\xb7\x9b\xef\x08\x00\xf6\x26\x84\x30\xcd\x43\x0f\
+\x00\xb0\xb7\x20\x84\x6d\x1e\x1c\x00\x00\xa4\x32\x33\x8f\x29\xea\
+\xb9\x42\x00\x9b\x28\x2f\x2d\xbc\xe5\x92\xdb\x55\xe9\x89\x99\x87\
+\x2d\xb6\x82\x70\x57\xaf\x58\x85\xeb\x6a\x6c\xda\x2f\x2c\x5c\xed\
+\x15\xeb\x04\x00\x76\x17\x42\x54\xe6\xa1\xdd\xe7\x80\x0e\xf2\x96\
+\x66\xdf\x54\xd5\xf4\xe6\xed\xa4\xa7\x8e\x80\xa9\x6c\x9e\xd4\x83\
+\x29\xa8\x79\x23\x32\xec\x6a\x1e\x02\xac\x80\x86\x12\x13\x53\x5f\
+\x45\xf0\x04\xee\x70\x08\xff\x17\xd8\x64\xbf\x2b\x21\x88\x79\xe0\
+\x13\x11\x49\x7b\x8b\x73\xbf\x0a\x52\x23\x30\x00\x08\x0e\x41\x0c\
+\x09\xaf\x90\xff\x6d\x90\x1a\x3b\x61\x1e\xfa\x04\x00\xd1\x42\x48\
+\x64\x72\xa7\x45\xc5\x8f\xda\x3c\x0c\x00\x00\x20\x9e\x9d\x7c\x5c\
+\xac\x59\x0e\x13\x42\x50\xf3\xa8\x0e\x97\x8b\xf3\x0e\xcf\x2f\xed\
+\x35\x10\x00\x08\x17\xc2\x4e\x9b\x87\x00\x77\x81\x4e\xf2\x0b\x0b\
+\x57\x8d\xc8\xb0\xc2\x75\x87\xf0\x3b\xb5\x46\x39\x3d\x31\xf3\x70\
+\xf3\x44\x22\x93\x3b\x2d\x88\xf3\x9e\x57\x63\xce\x0d\x6a\x1e\x42\
+\x58\x01\x0d\xa5\x2e\x4c\x7f\x4d\x55\x97\x81\xcf\xf7\x0c\x56\xfe\
+\x69\x30\x89\xe5\xe2\xec\xef\x00\x92\xd9\xe9\x53\x58\xf5\x81\xa3\
+\x0e\xa5\x6e\xa8\x31\xc3\x95\xc2\xec\x2f\x07\xeb\x78\x53\xa1\x01\
+\x80\xfe\x20\xd8\x98\xda\xdd\x32\x0f\x21\x03\x80\x80\x10\x44\x57\
+\x51\x00\x71\xf9\x74\x19\xba\x79\x88\x00\x00\x40\x72\x22\xf7\x75\
+\x44\xae\xe0\x02\xc1\x4d\x37\x8c\x70\x6e\x79\x31\xff\x8b\x90\xf2\
+\x6d\x29\x12\x00\x10\x2a\x84\xc8\xcc\x43\x08\x77\x81\x4e\x2a\x17\
+\xe7\xdf\x50\x63\xce\x01\x2d\x3f\x46\x04\xd0\x0d\x51\x7d\x32\x2a\
+\xf3\x10\xe1\x0a\x68\x28\x91\x9d\xf9\x86\x58\x7b\x05\x38\x14\xf0\
+\xd2\x1b\xa2\xfa\xa4\x57\x9c\xff\x79\x14\x7d\x35\x14\x39\x00\xa8\
+\x43\xa8\x59\x0f\xe9\xf5\x95\x7b\x5d\xc2\xba\x58\x4d\x47\x6d\x1e\
+\x22\xdc\x02\xdb\xa5\xd6\xae\x22\x72\xd3\xfd\x02\xbd\xa9\x31\xe3\
+\xf2\xd8\x3d\xb0\x22\x07\x10\xcf\x4c\x9d\x34\x50\x05\x75\xf9\xde\
+\xbe\x2e\x39\x8c\x55\x3f\x99\x9d\x3e\x15\x5d\x67\xf5\x4a\x51\x26\
+\xff\x8f\x79\xee\xee\x33\xc5\x3f\x30\x12\x2f\x17\xe6\xfe\x10\x66\
+\x5f\xdb\x15\xd9\x0a\x88\x67\xa6\x4e\x1a\xc5\xa7\x7f\xf3\x00\x47\
+\xb1\xea\xa7\xc7\x27\x1f\x0a\xab\xaf\x66\x45\x02\x20\x91\x9d\x39\
+\x61\x14\x1f\xe1\x9e\x10\xd2\x1d\xb5\xc6\x54\xa3\x82\x10\x3a\x80\
+\x44\x76\xe6\x84\xd4\x6c\xd5\xc5\xbc\xc0\x86\xc2\x86\x43\xda\xa3\
+\xd6\x98\x48\x56\x42\xa8\x00\x82\x98\x07\xd6\xac\x30\x6c\x54\x53\
+\xc0\xa7\x0e\xf1\x77\x47\x01\x21\xbc\xc7\xe1\xf1\xdc\x71\x15\x59\
+\x71\x35\x6f\xd4\x3e\xb5\x5c\x5c\x58\x01\x48\x66\xa7\xbf\x85\xd5\
+\x57\x81\xcf\x39\x5c\xfb\xb1\x85\x21\x7f\x29\xff\xce\x40\x0d\xd7\
+\x15\x0a\x80\x41\xcc\x37\xb4\x5b\x10\x06\x06\x10\xd4\xbc\x58\xce\
+\x7b\xa5\x7c\xb5\xdd\x64\xe2\xc2\xd4\x13\xa2\x5c\x66\x07\x21\x0c\
+\x74\x06\xa4\xc6\x73\xc7\xd5\x88\xf3\x9e\xef\x66\x1e\xa0\xb2\x98\
+\x7f\x5d\x85\xa7\x70\x3c\x13\x8c\xe2\xc7\x33\x53\x27\x9d\x1b\x6e\
+\xa3\xbe\x01\x6c\x99\x87\x7b\x1d\xc2\xd7\x10\x1d\xe9\x66\xbe\xa1\
+\x6d\x10\xd6\x7a\x66\x15\xee\x31\x8a\x9f\xc8\xce\x9c\x70\xe8\xa1\
+\x43\x8a\x3e\x94\xce\x4c\x3f\x68\xd1\x15\xdc\xcc\xaf\x23\x7a\xbe\
+\xbc\x38\xef\x07\xa9\x51\xdf\x0e\xaf\xd2\xf3\x9d\x25\x40\xf9\xbb\
+\xc6\xcc\x50\xa5\x30\xfb\x6e\x90\x1a\xd0\x07\x80\x9d\x30\xbf\x55\
+\x6b\x62\xf2\xac\x15\x73\x99\x08\x21\x04\x02\x50\x37\x5f\x05\xee\
+\x73\x08\x1f\xc8\xfc\x56\xcd\x80\x10\x44\xf5\xac\x57\x9a\xff\xa3\
+\x6b\x7e\x67\x00\x41\xcd\x5b\x95\x11\xbf\x38\x57\x71\xcd\xdf\x4d\
+\xa9\xf1\xa9\x21\x35\xbc\x42\x04\x10\x9c\x0e\xc1\x78\xf6\xe2\xb1\
+\xdd\x32\x0f\xe0\x95\xf2\x55\xb1\x9c\xc7\xf1\x60\x54\x91\x95\xd4\
+\x78\xee\xb8\x4b\xee\x9e\x00\xe2\xd9\x8b\xc7\x8c\x8d\xad\xe0\x68\
+\x5e\x2c\xa3\x61\x9a\x6f\xc8\x2b\xe5\xab\x88\x8e\xe0\x0a\xc1\x48\
+\xd5\x05\x42\xd7\x2d\xd0\x8f\x79\xaf\x94\x2f\x3b\xc4\xf6\xad\xe4\
+\x85\x5c\x1c\x95\x57\x68\xf3\xd6\x67\x1b\x7d\x24\x56\x87\xba\x6d\
+\x87\x8e\x2b\x20\x9e\xbd\x78\xcc\x68\x2c\xc0\x81\x67\xc7\xa2\x36\
+\x0f\x50\x5e\x9c\xf7\x11\x3d\x0f\xac\x3b\x84\xdf\xab\x46\xaa\xe9\
+\xcc\xf4\x83\x9d\x02\xda\xae\x80\x2d\xf3\xca\xfd\x0e\x45\x36\x10\
+\x3b\x5a\x5e\x5c\xf0\x1c\x62\x43\x53\xd0\x95\x60\x90\xb3\xcb\x4b\
+\x73\x7f\x6a\x9e\x68\x01\x30\x94\xfd\xf6\x17\x0e\xd8\x5b\x6f\x29\
+\x3c\xe0\x90\x78\x57\xcc\x37\x14\x9f\x98\x4e\x18\xd1\x9f\xe2\x06\
+\xe1\x6f\x72\xab\x76\xc6\xfb\xc9\x8b\x1f\x6e\x1f\x6c\xd9\x02\xb1\
+\x5a\xed\x7b\xff\x0b\xe6\x01\xfc\xe2\x5c\xc5\xaa\x8c\xe0\xb6\x1d\
+\xee\xd3\x58\xec\xfb\xcd\x83\x6d\x5e\x96\xd6\x27\x1c\x92\x6d\x28\
+\x32\xb6\x9b\xe6\x1b\xf2\x8b\x73\x15\xb1\x8c\xe2\x00\x41\x84\xb3\
+\xcd\x63\x6d\xfe\x5f\x40\x6a\x3d\xf2\x6c\x28\x32\x56\x59\x9a\x5b\
+\x76\x6f\x33\x5a\x79\xa5\x7c\xd9\x05\x82\x42\x8b\xb7\x56\x00\xa2\
+\xdd\xfe\xaa\x1b\xd6\xea\xd3\x7b\xc9\x7c\x43\x5e\x29\x5f\x46\xec\
+\x18\xdd\x21\x5c\x69\x1e\x68\x01\x50\xab\xdd\xbc\x24\xf0\x7e\x9b\
+\x8b\x37\xac\xd5\xa7\xfd\xd2\x7c\x4b\x92\xbd\xa2\xf2\xe2\x82\xd7\
+\x05\xc2\x07\x07\x4c\xed\x52\xf3\x60\xac\x25\xea\x2f\x6f\xaf\x7d\
+\xf1\xd4\x99\x97\x63\x35\x3d\x04\xdc\x0f\xdc\x44\xd4\x37\x1a\x7b\
+\xae\x5c\x8a\xee\x57\xda\xb0\xf4\xd7\x3f\xff\xfe\xfd\x2f\x1f\x7f\
+\xe4\xb2\xaa\x3c\x20\x9b\xef\x1b\x7d\xac\xaa\x2f\xdf\x16\xb3\xcf\
+\xbc\x56\x78\xf1\xa3\xdd\xee\x6f\x5f\xfb\xda\xd7\xde\xd2\xbf\x01\
+\xee\x83\x44\x52\xf4\x9c\x9a\x3b\x00\x00\x00\x00\x49\x45\x4e\x44\
+\xae\x42\x60\x82\
+\x00\x00\x03\x62\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x03\x14\x49\x44\x41\x54\x78\x9c\xed\
+\x9a\x3b\x68\x14\x51\x18\x85\xcf\x99\x5d\x30\x62\xb0\x11\x11\x31\
+\x85\xc1\x58\x08\x01\x0b\x61\x77\xed\x02\xbe\x30\x85\x8f\x0d\x31\
+\x60\x97\x80\xa8\xa4\xb3\x09\x29\xad\x8c\xa5\x90\x20\x5a\x58\x5a\
+\x24\xee\x86\x20\x24\x82\x0a\x16\x82\xd9\x80\x45\x24\x85\x85\xa2\
+\xc5\x82\x88\x58\x28\x3e\x12\xdc\x9d\x63\x13\x44\x77\x66\x77\x33\
+\x33\x7b\xf7\x26\xce\x7c\xe5\x9d\x9b\xf3\x9f\x39\x99\xc7\xbf\x77\
+\x2e\x90\x90\x90\x10\x67\x18\x55\xa0\x6f\x5a\x9d\xab\x69\x8c\x0a\
+\x1a\x14\xd0\x4b\x60\x5b\x2b\x8c\x85\x45\xc0\x1a\x81\x15\x82\x33\
+\x1d\x15\x4c\x3d\xbb\xc0\x6f\x8d\xe6\x47\x0a\x20\x5b\xd4\x09\x40\
+\xf7\x00\x74\x45\xd1\x31\x48\x19\xe0\x48\x29\xcf\xc7\xf5\x26\x38\
+\x61\x95\xb3\x45\x8d\x00\x7a\x84\xcd\x7b\xf2\x00\xd0\x05\x68\x21\
+\x5b\xd4\x70\xbd\x09\xa1\xae\x80\xec\xac\x4e\x42\x5a\x40\x84\x00\
+\xdb\x4c\x15\xe0\x69\xbf\x2b\x21\x70\x00\x7d\xd3\xea\xfc\x99\xd6\
+\x6b\x00\xfb\x5a\x62\xad\x7d\x94\xb7\x57\x78\xa8\xf6\x99\x10\xf8\
+\x3f\xb8\x9a\xc6\x28\xb6\xde\xc9\x03\x40\xd7\xba\xf7\x7f\x08\x1c\
+\x80\xa0\xc1\xd6\xf8\x69\x3f\x7e\xde\x43\x04\x80\xde\xd6\xd8\x69\
+\x3f\x7e\xde\xd3\x41\x45\x9a\xbd\xe7\x4b\x79\x27\x72\x6f\x11\x85\
+\x6c\xd1\x55\xbd\x63\x7e\xde\xb7\xca\x53\xdc\x18\x49\x00\xb6\x0d\
+\xd8\x26\x09\xc0\xb6\x01\xdb\x24\x01\xd8\x36\x60\x9b\xd8\x07\xd0\
+\xb4\x11\x3a\x52\xd0\xde\xb4\xe3\x5e\x95\xcb\x63\x20\xf6\x34\x9b\
+\x9f\x29\xba\x6f\xc2\x9a\xa1\x20\x10\x65\x81\xf3\xec\xc0\x9d\x52\
+\x3f\xbf\x86\xd5\xda\x70\xcd\x46\x07\x73\x05\x9d\x11\x75\x0f\xc0\
+\x2e\xd3\x46\x3c\x08\xef\x00\x5e\x2c\x0d\x70\x31\xc8\x9f\x35\xea\
+\x04\x01\x6f\xa7\x5a\xf7\x16\xc8\x14\xab\x13\xa2\xe6\x60\xe3\xe4\
+\x01\x80\xe8\x06\xf5\x3c\x53\xd4\x15\x93\x65\x7c\x03\xc8\x15\x34\
+\x44\x70\xcc\x64\xe1\x0d\x92\x22\x34\x99\x2d\x28\x67\xaa\x80\x27\
+\x80\xdc\xac\xf6\x8b\xba\x6b\xaa\x60\x08\x52\x80\xee\x67\xe7\xb5\
+\xd3\x84\xb8\x27\x00\xb9\xee\x38\x00\x23\xc5\x42\x43\x74\x6b\x15\
+\x97\x4d\x48\x7b\x6f\x01\xb2\xdf\x44\xa1\xa8\x10\x32\xe2\xcb\xef\
+\x19\xb0\x39\x57\x79\x65\xc6\x57\xe0\x05\x11\x27\xc5\x83\x26\x8c\
+\xa0\x8a\x1e\x17\x5a\xa8\x77\x58\x8c\xfe\x11\xc7\x8f\xc0\x01\xbc\
+\x38\xcb\xd0\x8d\x4e\x23\x8e\xce\x09\xa8\x9a\x50\x6e\x4c\xec\x5b\
+\xe1\x24\x00\xdb\x06\x6c\x93\x04\x60\xdb\x80\x6d\x92\x00\x6c\x1b\
+\xb0\x4d\x12\x80\x6d\x03\xb6\x49\x02\xb0\x6d\xc0\x36\x49\x00\xb6\
+\x0d\xd8\x26\xf0\xaf\x41\x5b\x10\x38\xd0\x6c\xc5\xb7\x19\x02\xd6\
+\x6a\xc7\x62\x75\x05\x10\x58\xa9\x1d\x8b\x59\x00\x9c\xa9\x1d\x8b\
+\x53\x00\xe5\x8e\x0a\xa6\x6a\x07\xe3\x12\x40\x15\xe0\x88\xdf\xbe\
+\xe1\x38\x04\x50\x05\x78\xa9\xde\x7e\xe1\x2d\xf3\x16\x08\x49\xd3\
+\xcd\xd2\xff\x5d\x00\x7f\x6f\x97\xff\xb1\x03\x93\xaf\x4e\xf1\x7b\
+\xa3\xf9\x9e\xa5\xe6\xa8\xef\x5a\x53\x08\x78\xbb\x94\x77\x7a\x5a\
+\xad\xeb\xfd\x34\x06\x7c\x6a\x75\x91\x96\x20\x7c\x34\x21\xeb\x09\
+\x80\xd0\x13\x13\x85\xa2\x42\x47\x4f\x4d\xe8\xfa\x5c\x01\xce\x4d\
+\x00\xbf\x4c\x14\x8b\xc0\xe7\x8a\xeb\xdc\x36\x21\xec\x09\x60\x29\
+\xcf\x65\x6d\x8e\xbd\x01\x7f\xa0\xc3\xe1\x97\x03\xfc\x60\x42\xdb\
+\xb7\x0f\x58\x5a\xc6\x2d\x00\x0f\x4c\x14\x0c\x8e\x26\x16\xcf\xf1\
+\xa1\x29\x75\xff\x46\xe8\x3a\xdd\xd2\x32\x87\x04\x5e\x83\xbd\xdb\
+\xe1\x0b\xc9\xa1\x52\x3e\x35\x6e\xb2\x48\xd3\x2f\xae\x99\xa2\x0e\
+\x13\xee\x98\xc0\xe3\x04\x76\x9b\x34\xb3\x4e\x19\xd2\x3c\x1d\xe7\
+\xc6\xe2\x79\xbe\x6f\x43\xbd\x84\x84\x84\x18\xf3\x1b\xe9\x0c\xd1\
+\x12\xec\xcb\x09\x01\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\
+\x82\
+\x00\x00\x00\x79\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x00\x2b\x49\x44\x41\x54\x58\x85\xed\
+\xce\x41\x01\x00\x20\x0c\xc4\xb0\x0d\x6f\x28\x98\x05\xfc\x5b\x00\
+\x19\xc7\x23\x31\xd0\x56\x01\x00\x61\xbd\xe7\xdc\xe4\xc0\x4a\xc6\
+\x01\x80\x2f\x3c\x1a\xe8\x01\xff\xf7\xcd\x6b\x25\x00\x00\x00\x00\
+\x49\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x0c\xd6\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x0c\x88\x49\x44\x41\x54\x78\x9c\xe5\
+\x9b\x5b\x6f\x5b\xc7\x11\x80\xbf\x25\x45\x8a\x94\x28\x89\x92\xad\
+\xbb\x64\xc9\x4e\x9a\xc2\x41\xe0\x26\x45\xd1\xa0\x48\x0a\xf4\xa9\
+\x7d\xe9\x7b\x81\x16\xfd\xa3\x7d\x2a\x50\xb4\x0f\x41\x90\x36\x4e\
+\x52\x20\x69\x92\xc6\x96\x6c\xc9\x37\x5d\x48\x49\xa4\x2e\xe4\xf4\
+\x61\xf6\x1c\xee\xd9\x33\x87\xa4\xe4\xf4\xc9\x03\x10\x24\x77\xf7\
+\xcc\xce\xcc\xee\xce\x6d\xe7\x00\xb2\x05\xe2\x78\xe3\x40\x9c\xf2\
+\x9e\xfe\x78\x93\x84\x90\xe3\xf9\x4d\x12\x42\x96\x57\x97\xed\xe0\
+\x0e\xf0\x18\x9c\x14\x3c\xdc\x00\x6e\x19\x1d\x25\x60\x32\x8b\x2f\
+\x6d\xaf\x0d\xa1\x66\x12\x10\xe0\x62\xc8\x98\x73\xa0\x67\xb4\x77\
+\x81\xbe\xd1\xfe\x12\xdc\xa9\x8d\x2a\xcf\xa3\x1b\x35\x00\x64\x1b\
+\xb8\xed\x09\x3d\x01\x5e\xf8\x89\xa7\x80\x39\xdf\x2e\xc0\x59\xd0\
+\x3e\xeb\xdb\xfa\xbe\x1d\x8f\xa3\x0a\x34\x81\x8a\xef\x3f\xf7\x34\
+\x54\xfd\xf7\x25\x70\x04\x97\xa7\x50\x39\xf2\x6d\x53\xa8\x20\x9d\
+\x9f\xff\xc4\xff\x9f\xf2\x6d\x0e\x68\x01\xa7\xbe\x7d\x29\xe8\x7b\
+\x01\xee\x71\x31\x6f\x85\x52\x92\x2d\x90\x09\x90\x8f\x40\x56\x8d\
+\x31\x6b\x20\x0b\x46\xfb\x06\xc8\xbc\xff\x3d\x05\x72\x0f\xe4\xae\
+\xff\xcc\x80\xdc\x01\x19\xb2\x23\xa4\xee\xc7\x2c\xa8\xe0\xe5\xae\
+\xc7\x31\xe1\xfb\xe7\x40\x36\xf3\x47\x55\x9a\x05\xed\x1b\x20\xbf\
+\x06\x29\x5f\xf3\x88\xcb\x04\xc8\x9f\xf5\xc1\x5c\xdf\x36\x48\xc5\
+\x68\x7f\xdb\x3f\xb7\xe2\x27\x5b\x8e\xf0\xdd\x1b\x73\x72\x3c\xe3\
+\x25\xff\xdb\x79\x46\xb6\xa0\x75\x4b\xdb\xe5\x2d\x83\xd9\x32\xc8\
+\x4f\x8c\xf6\x09\x90\x3f\xda\xbc\x14\x13\xf0\x91\x7f\x30\x92\x9a\
+\xac\x17\x30\x7f\xc7\x7f\xb6\xed\x15\x96\xed\x6b\x4c\x4e\x60\xa2\
+\xe2\xf6\x59\x15\x4e\x7b\x49\xe7\xcb\xf5\x97\xb3\xcf\xa5\xbb\xb9\
+\x02\xf2\xab\x71\x27\xdf\x1e\x6c\xfb\x50\x63\xca\x14\xc8\x6d\x63\
+\xfc\x2a\xc8\x07\xba\x7d\x4d\x7c\xf3\x5e\x79\x5e\x13\x64\x56\xb7\
+\xbc\xd9\x37\x07\xf2\x00\x64\xd1\xe8\x6b\xfa\x67\x23\xcb\x26\x9b\
+\xfa\xc9\x82\x71\x26\xe4\x17\xe0\x3e\x0d\xfe\x27\xca\xa3\x07\xec\
+\x01\x21\xa3\xab\x70\x79\x0b\x2a\x5f\x0e\xe1\x64\x0d\x78\x5a\xd0\
+\x97\xda\xe1\x1b\x3c\x0b\xf0\x00\xba\x4f\xa0\xf6\x2a\x68\xeb\x28\
+\x5d\x94\xc9\x29\xbc\x98\x37\x98\x30\x90\xc6\xc4\x34\x50\xe6\x1f\
+\xa0\x5a\xbd\xed\xc7\x6c\x01\x2f\x54\xa1\x0f\x05\xf1\xc4\x2c\xf9\
+\xff\x89\xe9\x4a\x34\x78\xd8\x46\xd0\xf6\xc2\xa0\x25\x86\x17\x20\
+\x82\x32\xbc\xe7\x9f\x5d\x02\x7e\x06\x7c\x0e\xcc\xa0\x16\x22\x81\
+\x9c\xd9\x8c\x04\x20\x0d\xd4\xcc\x24\xff\x37\x80\x36\xb8\x5d\x3f\
+\x51\x05\x35\x5d\x9b\xc0\xd7\xe0\xae\xf4\x7c\xb9\x13\x72\x20\xce\
+\x8f\x9b\x42\x7d\x81\x6f\x47\x98\x9f\xf8\xd9\x45\x60\x1a\x35\xa9\
+\x7b\xf6\xb3\xd2\x86\xfa\x0b\xd4\x9f\x58\x01\x7e\x00\x16\x80\xcf\
+\x80\xe7\x80\xb7\x3c\xec\xf8\xe7\x7b\xaa\xdb\xdc\x55\xd1\xc4\x5b\
+\x03\xf3\x26\x5b\x59\xcd\x29\x1b\x5e\x0f\x7c\x1c\x29\x46\xcb\x4c\
+\x2e\xa1\xa6\x72\x46\x3f\x37\x05\x59\xf5\xca\x78\x3d\x6b\x55\xd2\
+\xfe\x99\x81\x7e\x91\x09\x90\xdf\x78\x2b\x11\xb6\x07\x8a\x51\xee\
+\xaa\x8e\x18\x40\xc9\x98\xb5\xaf\x13\xb2\x0b\xae\x17\x8d\x5d\x03\
+\xfe\x0e\xdc\x09\x84\x10\xac\xcc\x61\x53\x19\xe7\x10\xdc\x53\xdf\
+\x37\xe6\xaa\x9b\xe0\x9f\x75\x4f\x80\x03\xc5\x7d\xd8\xcc\xf7\x8b\
+\x03\xd6\x81\xbf\x01\xf7\xb2\x73\xba\x9e\xf2\x22\xeb\x18\x47\xc0\
+\x12\xc0\x14\x70\x16\x31\x0f\x7a\xe6\xbf\xf3\x5b\xe9\x31\x59\x21\
+\xa0\x1a\xb9\xd9\x57\xc6\xdd\xe5\xf8\x3c\x8e\x0b\xee\x52\x71\x37\
+\xfb\xd1\x6e\x08\x3d\xbc\x1e\xf0\x04\x3d\x7a\xe1\x90\x1e\xea\x29\
+\x4e\xc7\x58\x2d\x25\x38\xe7\x57\x2f\x00\xd9\x46\x95\x4c\x29\x30\
+\x77\x07\xc0\x7d\xe0\xd2\x9b\xab\x57\xe8\xee\x09\x4d\x9e\x9f\xd0\
+\xdc\x04\x25\xe8\xfa\xe3\x56\x3b\xc4\xf6\xf7\xa7\x81\x2e\x48\x78\
+\x66\xfb\x3a\x56\xee\x03\x47\xe8\xca\x7f\xad\x63\x05\xa0\x03\x9d\
+\x13\xa8\x2f\x92\xd1\x67\xee\x08\xe4\xa7\xf1\x04\x63\x58\x01\x79\
+\x0b\x2e\x2a\x50\x9d\x46\x15\xd3\x29\x83\xad\xbd\x0b\xfc\x0e\xf8\
+\x4b\x01\x03\x01\x74\xe6\xa1\x9e\x04\x3f\x3e\x4e\xa8\x1d\xf9\xce\
+\x79\xd4\x52\xf8\x1d\xd5\x39\x87\xfa\xe1\x10\x64\x5d\xd4\x3c\xfe\
+\x06\xf8\x24\xa0\xd9\x2b\xcf\x7a\x0d\xb8\x0d\x72\x1e\x2d\x66\x6e\
+\x25\x62\x01\xc4\xd1\xe1\x5d\x60\x1a\x26\x1f\xaa\x12\x74\xfb\xd9\
+\xe1\xb2\x0e\xfc\x03\x0d\x70\x8c\x20\x43\x80\xee\x6d\xa8\x4d\x40\
+\xfd\x25\xb8\x4e\x01\x43\x47\xd9\xbf\x52\x07\x16\xe0\xa2\x06\xd5\
+\x93\xbc\xd6\x4e\x7d\x93\xbf\x02\x6b\xe0\xf6\x82\xce\x36\xc8\x09\
+\xba\x63\xdf\xf6\x9e\x6b\x42\x5b\x9f\xe8\xd8\xc7\x3a\xa0\x0a\x9c\
+\xfb\x09\xee\xa1\xab\xf2\x85\x4d\xb3\x2c\xa1\xdb\xbe\x87\xad\x13\
+\xa6\x81\x55\xa8\xb5\x55\x89\x15\x32\x6f\x80\xeb\xe8\x33\xd5\xb6\
+\x32\x18\x1e\xab\x30\xaa\xa3\x87\xfa\x02\x2b\x05\x88\xbe\xf1\x63\
+\xee\xf9\xe7\x3a\x64\x1d\xb9\x22\x2b\xc0\x06\xf0\x0c\xf5\x01\x8c\
+\x03\x7c\xd8\x04\xba\xe0\xba\x9e\xe0\x48\x31\x1e\xcd\x43\xbb\x86\
+\xae\xc2\xf9\x58\x3c\xdb\x70\x01\x3c\x85\xf6\x24\x1c\x2f\x60\x87\
+\xb4\x5d\xe0\x4c\xe7\x8c\xc1\x9d\xa1\x8b\xfa\x83\xe7\x29\xc7\x8b\
+\x25\x80\x06\xea\x3d\x2d\xe6\xb7\x7c\x02\xcd\x29\x70\xad\x6c\x5b\
+\x22\x84\xcb\xf7\x61\xae\x07\xb3\xaf\xcc\x47\x6f\x04\xb3\xaf\x60\
+\xf6\x52\x71\x5b\x47\xcd\xb5\x60\xae\x20\x16\x61\x07\x35\xdf\x2d\
+\xd4\xc2\x65\xc0\x12\xc0\x34\xaa\x3d\x0b\x94\x9a\x2c\xa3\x6e\xaa\
+\x01\xc7\x4d\xa8\x7c\x0f\xcc\x33\x7e\xec\x3d\x06\x88\x03\x16\xa0\
+\xf2\x9d\xce\x61\xc2\x73\xdb\x59\x72\x97\x40\x19\xdc\x31\xba\xb8\
+\x19\xb0\x04\x20\xa8\x69\xd9\x29\x20\x64\xc2\xb6\xf3\x32\x05\xa5\
+\x64\x22\x7f\x1c\xac\x60\xeb\xda\x10\x6e\xfb\x16\x94\x4a\x5e\xbf\
+\xc4\xc3\xae\x94\x36\xb1\x78\x3a\xd4\x23\x34\xda\x0a\x94\x07\x83\
+\x4c\xbf\x7d\x13\xd5\xb2\xe1\x2a\xcc\x82\x74\x81\x15\x98\xd9\x0f\
+\xfa\x5a\xc0\xbb\xc0\x13\xd2\x8c\x4e\x06\x92\xd4\x19\xa8\x4f\x61\
+\xe5\x05\xe7\xd0\x40\xe7\x07\xfd\x2d\xa0\x3b\x73\x03\xe4\x19\x03\
+\x3f\x23\xc1\x7f\xa6\x7d\x1c\x64\xd1\xb8\x63\xef\x0e\x27\x81\x59\
+\x0a\x31\x61\x35\x72\x49\x48\x99\x47\x83\x8d\x65\x4f\x64\x84\x9c\
+\x1e\x74\x66\xa1\x7e\x00\xc4\x41\xc6\x23\x4f\xd0\xd7\xc1\xe4\x2b\
+\x40\x1f\x3a\x67\x50\xdf\x05\x1c\x74\x6f\x41\x2d\xc9\x2f\x3e\xf3\
+\xdf\xce\xcf\xf9\x05\x9a\x2b\x0c\xe1\x15\x74\x66\xa0\x9e\x08\x2d\
+\x9c\xb7\x89\x2a\xbe\xbe\xee\x86\x54\x57\x25\x79\xcb\x4c\xc2\xc6\
+\x5a\x99\x45\xe0\x4b\x90\xaa\x27\xe0\x25\xb8\x43\x34\xd3\x73\x96\
+\x8f\xfc\xa4\x01\xf5\x32\xb8\xe7\x79\x54\x82\x67\x7e\x01\x38\x46\
+\x57\xec\x1b\x63\x77\xb5\xfd\xf8\x32\xba\xe2\x07\x9e\x8e\xff\x68\
+\x5f\x2e\x7a\x3b\xf1\xa6\xcf\x67\x7f\x43\x9a\x64\x1f\x15\x98\x17\
+\x9a\x6c\x02\x4f\xe0\xa4\x03\x8d\x29\xb2\xe1\xb1\xa9\x03\x4a\xa8\
+\x04\x6f\x83\xdb\x09\xec\xf7\x2d\x6c\xe5\x37\x0d\x47\x05\x69\x68\
+\xa5\x00\xcd\xf4\x6e\x01\x4f\x87\x87\xc4\xa9\x2f\x7f\x1f\x0d\x67\
+\x87\x05\x52\x27\x18\xbe\xbd\x5f\x08\x9f\xb9\x72\x27\xa8\xb7\xba\
+\x01\x8d\x03\xf4\x48\x65\xa0\x48\x09\x2e\xe5\xe3\x01\x28\x20\xbe\
+\x01\xf3\x47\x46\x7b\x02\x65\x25\xb4\xf2\x90\x9c\xb3\x94\x9b\x3a\
+\x51\x78\x9f\x61\xdf\x3f\x84\xb4\x14\x08\x20\x37\x4e\x7c\x6a\x7c\
+\xcd\xea\xb5\x04\xb0\x00\x58\xf6\xdf\xba\x84\x18\x07\x56\x18\x24\
+\x34\x0c\x8f\x31\x81\x9c\x93\xf3\x12\x2e\x8c\xd4\x7b\x06\x8a\x84\
+\x69\xd1\xfa\x0a\x43\x60\x05\x47\xe0\x5a\xe1\xec\x28\xc1\xf4\x07\
+\x3b\xa7\x30\x94\x36\x3c\x3c\xd7\x85\xea\xa8\x7c\xdb\x35\x72\x0d\
+\xee\x0c\x55\xe6\x19\x88\x05\x30\x41\x71\x54\x77\x13\x9b\x5e\x83\
+\x6e\x64\xde\x62\x21\x0c\xbd\xb1\xb9\xa9\x1f\x51\xf4\x5c\xae\x3d\
+\xb6\x02\xcb\x70\x65\x69\xf3\xc0\x3f\xc8\xb4\x97\xec\xf6\x14\x9a\
+\x50\x7b\x66\xd0\x21\x20\x8f\xd1\x24\x0b\xc0\xa3\x02\xfd\x32\x62\
+\x85\xbb\x7d\x8d\x34\x73\xd0\xc3\xce\xd6\x8e\x8a\x05\x7a\x15\x98\
+\xb8\xce\xf6\x4f\xec\x75\x11\xf4\x47\xf4\xbf\x26\xd4\x1c\xc5\x47\
+\x70\xac\x79\x23\x01\x94\x9f\xa1\xf6\x37\xc6\xd5\xb3\x11\x8e\xcc\
+\xf2\x1e\x90\x9a\xa4\x10\xd2\x6d\xff\xc8\x7f\x46\x58\x87\x42\x28\
+\x12\x40\x19\xdb\xb3\xcc\xcd\x11\xeb\x80\x2e\x51\xbc\x1c\x40\x11\
+\xb3\xc3\x08\xbf\xca\xcf\x11\x9f\xf9\x51\xd6\x61\x28\x14\x8d\x1f\
+\x5b\x39\xc6\x02\x48\x72\xe7\x39\x6d\x79\x03\x22\x12\xe8\x93\xde\
+\x27\x16\x29\x3c\x4b\x08\x32\x43\xea\xe9\xdd\x78\xee\x00\xc4\xe7\
+\x17\xb3\x60\x99\xc1\x23\x06\xb7\x38\x3f\x06\x3c\x07\x56\x46\x68\
+\x7b\x22\x21\x94\x50\xaf\xcd\xb8\x70\xc9\xc0\x98\xbe\x49\x12\x4e\
+\xe7\x05\x6a\x09\xc0\x01\xfb\xe4\x2f\x12\x8b\xa4\x7d\x00\x6d\x43\
+\x6f\x64\xe0\x25\xf0\x21\x23\x8b\x13\x9c\xa0\x61\xf8\x47\x0c\xbf\
+\x13\xc4\x67\x80\x8e\x8b\x10\x0d\x7e\x8a\x43\xad\xcd\x2e\x63\xe8\
+\x00\x00\xf1\x8e\xd0\x53\x15\x42\x7a\xb3\x73\x80\x79\x1b\xcb\x25\
+\x34\xaa\x43\x28\x4d\xee\xeb\xfe\x05\x6c\x6a\xde\xa0\x08\x64\x8e\
+\xc1\xe5\xcb\xa6\x45\xf0\x00\xe6\x26\x31\xd3\x6d\xed\x45\xd2\x88\
+\x55\x9a\x68\x6e\xe3\x91\xc7\x35\x32\x1f\x00\x9a\xe7\x9f\x04\x77\
+\x0e\xec\x28\x12\xd9\x40\xad\xc3\xbc\x8f\xbd\x43\x44\x4b\xc0\x19\
+\xc8\x3b\x44\x91\x16\x9a\x81\x59\x43\xa3\xba\x26\x70\x01\x17\x5b\
+\x5e\xc7\x58\x4e\xcf\x29\x1a\x19\x2e\xe9\x58\x1e\x00\xff\x06\x89\
+\x4d\x73\x92\xd9\x49\xf2\x01\xc9\xff\x24\x84\xee\x78\xfc\x7b\x7a\
+\xaf\x09\x3e\x83\x9d\xf3\x49\x62\x01\x74\x7c\xdb\x32\x7a\x1e\xd1\
+\x0b\x05\x8e\x3c\xbd\x02\xec\x67\xb7\xb1\xa0\xb9\x43\x59\xcf\xe6\
+\x10\xd3\x73\xf7\x4f\x70\xed\x60\x8e\x82\x3c\xa3\x05\x02\x9a\x38\
+\xd9\x8d\xe6\x5c\xd3\x60\x2d\x61\x3c\x09\x87\xc5\xa1\xbb\xfa\x38\
+\xdb\x0e\x0c\x0a\xb6\x32\xd9\xe9\xf8\x08\x84\x57\xd7\x16\xec\xa1\
+\xc1\x8d\x05\xcf\xc8\x14\x56\xe0\x6f\x65\x5f\xfb\x6e\x30\xb6\x0e\
+\x2b\x14\xe6\x24\x93\xc0\xcb\x84\xe4\x3a\x3e\xa3\x38\x8b\x94\xe0\
+\x85\x6d\x0a\x5d\x5f\x89\xb2\xea\x6d\xdc\x15\xd0\xf2\x67\x30\xc9\
+\xdb\xbf\x0e\xf3\x09\x04\x42\x68\xdd\x46\x13\x24\x56\x4e\xb2\x1c\
+\xd0\x18\xf7\x2d\xa3\xd6\x68\x2c\x25\xd8\x46\xed\xa5\x19\x3f\xfb\
+\x6d\x6e\x64\x5f\x01\x38\x83\xc6\x32\x9c\x9c\x8d\xe1\x25\x5e\x03\
+\x9c\x28\xce\x99\x15\x06\x65\x77\x31\x2c\x53\x7c\xbc\x92\x1a\x85\
+\x9c\x59\xb5\x04\x70\x86\x2a\x97\x72\x41\x86\x15\x38\xee\x90\xbb\
+\xf7\x4f\xb7\xfd\x57\xd0\x38\xd3\x73\xfa\x63\x81\xac\x2a\x4e\xbe\
+\xc2\xf4\x18\xa5\x01\xad\xae\x2d\x74\x99\x83\xb3\x2e\xca\x53\x4e\
+\x78\x45\xf9\x80\xc4\x66\xbe\x6d\x13\xd4\x3c\x54\x84\xc9\x31\xc9\
+\xb9\xb7\xa7\xe8\x96\x5b\x85\x4e\x41\xa1\xd3\x38\x70\x3e\xab\x38\
+\x92\xea\x4f\xd3\x6d\x9e\x04\x66\x61\x2e\x4e\xd6\x26\xb0\x02\x53\
+\xd3\x01\x4f\x19\x88\x05\x70\x41\x9a\x34\x70\xde\x74\xc9\xba\x8d\
+\xd7\xed\x2b\x72\x4a\xd8\xee\xed\x15\xb0\x07\xf5\x4b\x55\x5c\xb2\
+\x38\x9e\xaf\x2f\xce\x8f\x5d\x81\x49\x8f\x23\x3c\xf3\xa1\x10\x28\
+\x01\xab\x76\xfa\x0e\xd4\x34\x5f\x54\xc0\x7d\xeb\x1b\xea\x44\x56\
+\x20\x36\x83\xf1\x95\xd3\x27\x68\x39\x1a\xc0\x32\x5a\x27\xd4\x0f\
+\xc6\x5d\x02\xbf\x45\xaf\xc7\x97\x0d\x9d\x97\xa4\xa0\x4e\xd1\xf8\
+\xfc\x3d\x2f\x84\x61\x89\x0f\x21\xad\x35\xa0\x81\xba\xd1\x56\x4d\
+\xcf\x25\xf0\x7b\xe0\x53\x06\x97\xa3\x89\x19\x4c\xca\x6b\x27\xf5\
+\x66\x3b\x85\x12\xc3\xdd\x67\xd9\x42\x0b\x0f\xc2\xb6\x86\xf7\x08\
+\x37\xa2\xf6\xa4\x0e\x6f\xcd\x7f\x1b\x56\x43\x1a\xdc\xa8\x46\x30\
+\x7d\x7e\x05\xf3\x52\x45\xaa\x68\x09\xed\x1c\xc8\xbb\xb6\x4e\x90\
+\xf7\xf3\xd6\x4a\x3e\x64\x8c\x1a\xa1\x43\x90\x20\x23\xeb\x4e\xe0\
+\xa4\xab\xf5\x80\x29\xa2\xf0\x8a\xba\x0f\xee\x11\xea\x25\xbe\x06\
+\xb3\xe3\x82\xcc\xa0\x29\xfb\xef\xd1\xcc\xcf\x0e\x79\xc5\xb8\x81\
+\xa6\xe0\xc3\x0b\x9e\xe4\x6e\x22\x03\x96\x00\xba\x40\x95\x4c\x49\
+\xec\xcc\x0b\xa8\x4c\x7a\xc9\x16\x85\xb4\xfb\xd0\xaa\xaa\xce\xb8\
+\x56\x5d\xee\x98\x20\x65\xc5\xdd\xaa\x90\xaf\xfa\x08\x14\x63\x7b\
+\x11\xba\x1d\x32\x1a\x5f\x2a\xa8\x6e\xcb\xd5\x28\x58\xb1\x40\x09\
+\xdc\x9e\x6e\x79\x79\x16\x28\xa0\xa7\xa8\x46\xee\x01\xff\x0d\x98\
+\x0f\x24\x3f\x77\xe0\x05\x94\x84\xbf\xa1\x0b\x7c\x13\x48\xbc\xbf\
+\x55\x94\xd1\xa7\x30\x27\x51\xbf\x04\x39\xc6\xfb\xd0\x68\x91\xb9\
+\xbe\x93\x8a\xd2\xe3\x76\x40\xee\x1a\xcc\x66\xe0\x25\x69\x2e\xc0\
+\xed\xa2\x75\x36\xc9\xd6\x17\x54\xf1\x54\xc8\x66\x8d\x22\x1c\x4e\
+\x54\x80\xec\xa3\xb5\x3f\xf7\xc6\x08\x97\x0d\x68\xdd\x46\x9d\x9b\
+\x25\xe0\xb9\xee\xb0\x9c\x9d\x9f\x26\x5d\xd5\xe3\x26\xba\xea\x65\
+\x54\x79\x76\xd0\xda\xe6\x25\x65\x1e\xd0\xcb\xd8\x8c\x33\x14\xed\
+\x00\x77\x9a\x0d\x57\xdd\x1e\x5a\xc3\xbf\x81\x46\x66\x9f\xa3\x42\
+\x78\x00\xe7\x27\x50\x3d\x52\x22\x0b\xcd\x5b\x5f\xe7\x68\x24\x15\
+\x9b\x49\x1b\x80\x83\x0b\xbf\xbb\xaa\xc9\x0b\x14\x21\x1c\x7b\x66\
+\xbc\xa9\x33\x1d\xcb\x65\xc5\x2f\x4b\x1e\x6f\x12\x23\x7c\x00\x3c\
+\x04\x0e\xc0\xbd\x0c\xc6\x97\xe3\x7b\x46\xeb\x08\xc4\xcc\x74\x3d\
+\x21\x0f\xd1\x82\x45\xd0\x2b\xef\x65\xdf\xbe\x1f\xb4\x1b\x20\x62\
+\xf7\x8b\x83\xea\xa4\x67\xb0\x53\xe0\xc5\xad\x8f\xc0\x7d\x05\x4c\
+\xc1\xd1\xf7\xd9\xeb\x39\x71\x9e\xb6\xf8\xcc\x8f\x93\x42\x93\x3b\
+\x03\xe7\x27\x53\x2e\x5f\xcf\x5a\x07\xf0\x66\xe8\x7d\xec\x44\x49\
+\x32\xe6\xff\x50\x2e\x0f\xba\x00\xf2\xf3\xbc\xf9\x95\xa6\x5a\x8a\
+\x5c\xb9\xfc\x1d\xcc\xb2\x5e\x1b\xf9\xc7\xd8\x2f\x4c\xac\x92\x7b\
+\x61\x42\x1c\xfa\x82\x85\xf1\x02\x43\x3a\x66\x7b\xcc\x89\x43\x9c\
+\x05\xcf\x88\x43\xdf\x18\xf9\xa5\xd1\x57\xce\xfa\x2b\xa9\x10\xaa\
+\x8c\xff\xc2\x44\x8a\xe8\x4f\x05\x4e\xc8\x46\x5e\x08\x00\xf2\x1e\
+\xfa\xca\x4a\xee\xa5\x04\x5e\xeb\x95\x99\xb4\xad\xe4\x9d\x9f\xb7\
+\x40\xde\x31\x9c\x9f\xb2\xa5\xe5\x3d\xf3\x7f\xc8\xe3\x2b\x9e\x3c\
+\x91\x5a\x59\xa5\x16\x7b\x80\xe0\x77\x82\x71\x7d\x2d\x1b\x7e\x6b\
+\xde\xd3\x4f\x2b\x74\x9e\x2a\x8c\x7e\x69\x6a\xca\x8f\x09\x04\x2f\
+\x2b\x0c\x5e\xbe\x2a\x7a\x39\x6a\x1e\x33\x66\x91\x2d\xcf\x43\x29\
+\xbf\x9b\x15\x62\x44\x86\x93\x23\x9b\xa8\xb6\xf5\x35\xba\xb4\xfc\
+\xef\x1a\x6a\xe6\x1c\x7a\x01\x72\xc1\xe0\xb5\xb9\x19\x40\xa0\x37\
+\x0d\xe5\xc4\x29\x4a\x4a\x64\x7b\xc1\xff\xe4\xf6\x26\x79\x6d\x2e\
+\x28\x97\x4d\xe9\xeb\xfa\x71\x0e\x35\x61\xa7\xfe\xf7\x24\xaa\xc4\
+\x7d\x01\x06\x1d\x54\xa1\xce\x06\x78\xf6\x06\x4e\x93\xed\xc0\x8d\
+\xb8\xa2\x8e\x41\x26\x30\x4a\xcd\x3c\x9e\x3a\x79\x2d\x1b\xbf\x38\
+\x59\x42\xaf\xca\x92\x23\x54\x65\xe0\x5f\xe0\x99\x38\x24\x6b\xf3\
+\xac\x17\x27\x85\x41\xe2\x33\x06\xa3\xb4\x36\x7d\xac\x88\xc7\x37\
+\xf7\xd5\x59\xab\xe1\x0d\x80\x0c\xcf\x6f\x1a\xf3\x09\xa8\x10\xfe\
+\x07\xb4\x0a\xfd\x7e\xcf\x22\x5b\xc2\x00\x00\x00\x00\x49\x45\x4e\
+\x44\xae\x42\x60\x82\
+\x00\x00\x01\x98\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x01\x4a\x49\x44\x41\x54\x58\x85\xe5\
+\xd6\x3f\x4a\xc4\x40\x14\xc7\xf1\xef\x4b\x16\xbd\x81\x5b\x78\x02\
+\xd7\xca\x2a\x60\xb7\xf1\x00\x0b\xf1\x40\x7a\x22\x21\xd8\x08\xc2\
+\x6e\x27\xa4\x5e\xff\x9c\xc0\x42\x2b\x0f\xb0\xe1\x59\x84\x28\xc4\
+\xc4\x99\x97\x9d\x89\x85\x53\xce\x3c\xf8\xfc\x98\x79\x3c\x06\xfe\
+\xfb\x92\x29\xb1\xac\xd4\x39\x3b\x2d\x11\x5e\xab\x22\xb9\x04\x48\
+\x26\xc5\x6b\xdd\x20\x64\x28\xc7\xed\xfe\x24\x01\xbe\x70\x38\x01\
+\x5e\x98\xc9\xaa\x3d\x8b\xfe\x04\x3f\xf0\x54\x96\xd5\x4a\xde\x26\
+\x09\xe0\xc2\xa3\x06\xf0\xc1\xa3\x05\xf0\xc5\xa3\x04\xb0\xe0\xc1\
+\x03\x58\xf1\xa0\x01\xc6\xe0\xc1\x02\xf8\xe2\xe7\x37\x7a\xb4\x13\
+\xbd\x13\xe5\xa3\x2a\x92\x1c\x02\x0c\x22\x0b\x5e\xa3\x6b\x51\xce\
+\x80\x83\x76\x7f\x36\x25\x0e\x9c\x0a\x3c\x26\x48\xd1\x9e\x8d\x7e\
+\x82\x3d\xf0\x8b\x87\x42\xde\xf7\x0a\x10\x0a\x1f\x15\xc0\x88\x6f\
+\x80\x05\xf0\x94\x22\x79\x17\x37\x07\x08\x8d\x9b\x02\xc4\xc0\x01\
+\xd2\x90\x78\x56\xea\x5c\xd5\x1f\x07\x8f\x1b\xb0\xe0\xd4\xba\xb6\
+\xe0\xce\x00\x23\xf1\xe7\x14\x59\xf6\xe1\xa6\x49\x18\x03\xf7\x9e\
+\x84\x91\xf0\x0d\xb0\x70\x4e\x42\x23\xde\xd6\x0d\xe2\xae\xde\x90\
+\x9e\x62\x33\x4e\x2a\xf9\xd8\xc6\x94\x4e\x71\x68\xdc\x79\x43\x4d\
+\x13\x5e\x69\x42\xad\xf7\x2e\x1c\x55\x91\x5a\x6f\x5d\x78\xb7\x6e\
+\x08\xff\x0e\xd0\xac\x43\x60\xfb\xeb\x4f\xe6\x1a\xd1\xa6\x83\xb7\
+\x83\x78\x4f\x9d\xcf\x3c\x68\x6e\x41\xd5\x3d\x9a\x55\x25\x68\xdd\
+\x5f\xaf\x4f\xda\x1b\xa3\x91\x9e\x7b\xef\x4a\x00\x00\x00\x00\x49\
+\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x00\xa6\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x00\x58\x49\x44\x41\x54\x58\x85\x63\
+\x60\xa0\x00\xdc\x7f\xf8\xb8\xe1\xfe\xc3\xc7\x0d\x94\x98\xc1\x44\
+\x89\x66\x6a\x80\x51\x07\x8c\x3a\x60\xd4\x01\xa3\x0e\x18\x75\xc0\
+\xa8\x03\x06\xdc\x01\x2c\x14\x9b\xf0\x9f\xc1\x81\x92\x2a\x79\x18\
+\x84\x00\x23\xc3\x01\x45\x79\xd9\x06\x72\xb5\x0f\x78\x08\x8c\x3a\
+\x60\xd4\x01\xa3\x0e\x18\x75\xc0\xa8\x03\x46\x1d\x30\xe0\x0e\x00\
+\x00\xe6\xf7\x0c\x89\x70\x77\x76\x17\x00\x00\x00\x00\x49\x45\x4e\
+\x44\xae\x42\x60\x82\
+\x00\x00\x01\x50\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x01\x02\x49\x44\x41\x54\x78\x9c\xed\
+\xd6\x2d\x4e\x03\x51\x14\xc5\xf1\x73\x29\xe1\x4b\xa0\xc0\xb3\x01\
+\x92\x0a\x7c\xc7\x15\x3c\x86\xd4\x23\x31\x2c\xa0\x99\x05\x74\x07\
+\x4d\x05\x49\x25\xa6\x09\x81\x86\xb0\x08\x76\x80\x22\x21\x75\x08\
+\x98\x66\xca\xbb\x58\xf2\x1e\x04\x35\x8f\x84\xf9\xff\xe4\xb9\x23\
+\xce\x1c\x33\x23\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\xad\x60\
+\xbf\xdd\x8b\x62\xd8\xc9\xd2\xa4\x21\xbd\x9e\x42\x59\x96\xe1\xa7\
+\xfb\xb7\x03\x14\x67\xe7\x7b\x1b\xcb\x30\x72\xd3\xa9\xa4\x9d\xc6\
+\xda\xe5\x51\x99\xfc\xc6\x6b\xbf\xb8\x9f\x4d\x9e\xe3\x63\x32\xc0\
+\xc9\x60\xb0\xbb\xaa\xb6\x1e\x25\x3b\xc8\x50\x2e\xa7\x45\xa8\x75\
+\xf8\x30\x1b\xbf\x7c\x0d\xd7\xe2\xa7\x3e\x96\xdb\xe5\x3f\x7c\x79\
+\x49\xda\xb7\x75\x8d\xe2\x30\x19\xc0\x5d\xfd\x3c\x7d\xf2\x33\xd3\
+\x71\x9c\x25\x03\xb4\x4d\x32\x80\x99\xe6\x7f\x51\x24\x07\x77\xdd\
+\xc5\x59\x32\x40\x67\xf3\x7d\x28\xf9\x53\x96\x46\x79\x2d\x7c\xa5\
+\xcb\x38\x4c\x06\xb8\x9d\x4e\x5f\x43\xa8\x8f\xcc\x75\x25\xe9\x2d\
+\x4b\xb5\x66\x55\x26\xbf\x56\x1d\xba\xf1\x17\x40\xe2\x47\x08\x00\
+\x00\x00\x00\x00\x00\x00\x00\x00\x68\x8b\x4f\xc6\xe5\x42\x89\xb1\
+\xed\x97\x86\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x04\x75\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x04\x27\x49\x44\x41\x54\x78\x9c\xed\
+\x9b\x4f\x68\x5c\x55\x14\xc6\x7f\xe7\xcd\xb4\x5a\x8c\x08\xb6\xba\
+\x30\xa8\x2b\x51\xd4\x8d\x50\x84\x22\x48\x6c\x27\x89\x41\x0c\x76\
+\xc6\xd1\x95\xd8\xfc\x99\x50\x17\xa2\x05\x45\xf0\x0f\xe3\xd0\x8a\
+\x15\x04\x17\x22\xb6\x49\xa6\xc6\x45\x8a\x9a\x26\x0d\xa1\x1a\x3b\
+\x49\x64\x0a\x8a\x20\x28\x08\xc5\x85\x20\xe2\xa2\x41\x04\xad\x14\
+\x6d\x0b\x93\xb9\xc7\x45\x1c\x79\xf3\x66\xc0\x14\xdf\xbd\xef\x62\
+\xe6\x5b\x7e\x1f\xdc\x73\xee\x77\xce\xfd\xf7\x98\x81\x0e\x3a\xe8\
+\x60\x33\x43\x92\x4e\x60\xa3\xc8\x64\x47\x8b\x22\xf2\x32\x18\x51\
+\xd5\x43\xcb\x73\xc7\x5e\x8d\x63\xdc\x20\x8e\x41\x6c\xa3\x3f\x3b\
+\xfc\x00\x42\x11\x34\x0d\x92\x12\x09\x5e\x89\x6b\xec\x74\x5c\x03\
+\xd9\x42\x6f\x6e\x78\xa7\x21\x58\x90\xe6\x6e\x8d\xad\x70\x5e\x77\
+\x40\x5f\x6e\xec\x0e\x34\x58\x04\xba\x22\x92\x89\x2b\x86\xb7\x06\
+\x64\xf2\x63\xb7\x28\xa6\x82\xb0\xa3\x8d\xac\x71\xc5\xf1\xd2\x80\
+\x81\xfc\xd0\x0d\x18\x53\x01\x6e\xb6\x1d\xcb\x3b\x03\x06\x07\x87\
+\xaf\x5d\x33\xa9\x4f\x04\x6e\x77\x11\xcf\x2b\x03\x7a\xf6\xed\xbb\
+\xfa\xd2\xd6\x60\x1e\xd8\x19\x91\x62\x6b\xf9\x28\xbc\x31\xa0\xa7\
+\xa7\x98\xde\xf2\x47\xfa\x38\xca\xee\x88\xa4\xc4\xb8\xe9\x45\xe1\
+\x8b\x01\x92\xde\xbe\x7a\x14\x65\x6f\x13\xab\x6a\x75\xf2\xe0\x89\
+\x01\x99\xdc\xe8\x1b\x82\x0e\x47\x68\x45\xc4\xea\xe4\xc1\x03\x03\
+\x7a\x1f\x2d\xbc\x20\xf0\x7c\x1b\xc9\xfa\xe4\x21\x61\x03\x32\xb9\
+\x42\x01\xd5\xc3\x6d\xa4\xba\xab\x1c\x12\x33\x20\x93\x2b\xe4\x04\
+\x3d\xd2\x44\xae\xef\xf5\x4e\x2a\xdf\x40\x22\x06\xec\xc9\x16\x32\
+\x82\x1e\x6f\x89\x1f\x60\xb0\x78\xe4\xb5\x83\x73\x03\xfa\xf3\x23\
+\xf7\x06\xa2\xf3\xc0\xd6\x88\x64\x50\xb7\x93\x07\xc7\x06\xec\xc9\
+\x0f\xdd\x69\x8c\x2c\x02\xd7\x84\x79\xc1\x7d\xe5\x1b\x70\xf6\x1c\
+\xde\x9d\x1d\xb9\x35\x30\x52\x01\xae\x8f\x48\x46\x13\x9a\x3c\x38\
+\xea\x80\xbe\xbd\xfb\x6f\x4c\x09\x4b\x40\x77\x98\x17\x24\xb1\xca\
+\x37\x60\xbd\x03\x32\xf9\xb1\xeb\xd4\xac\x7d\x0a\x72\x5b\xb3\xa2\
+\x9a\x64\xe5\x1b\xb0\xda\x01\xbb\xf2\x07\xb6\x89\x31\x0b\xc0\x3d\
+\x11\x49\xc1\xfe\x2d\x6f\x23\xb0\x66\x40\x4f\x4f\x31\xdd\xa5\x17\
+\x3e\x00\xee\x8f\x48\xd6\xef\xf7\x57\x02\x2b\x06\x14\x8b\xc5\x60\
+\xcb\xf6\x73\x93\xa8\x0c\x46\x24\x6f\x2a\xdf\x80\x0d\x03\xe4\x8b\
+\xb3\xab\x6f\x02\x4f\x36\xb1\xda\xa8\x7c\xe2\xcb\xbe\x09\xb1\x1b\
+\x90\xc9\x8d\xbe\x28\xe8\x81\x16\x41\xfc\x69\xfb\x30\x62\x35\xa0\
+\x37\x57\xd8\x2f\x70\xa8\x55\x11\x67\x8f\x9b\x2b\x45\x6c\x06\xf4\
+\x66\x47\x0e\x83\xbe\x1b\xe5\xc5\xc3\xb6\x0f\x23\xbe\x0e\x10\x89\
+\x7e\xd0\x00\x24\xd1\x5b\xde\x46\x10\x9b\x01\xd2\xf6\x0d\xef\xf5\
+\xdc\x81\x18\x0d\x30\xc8\x33\xb4\xce\x38\xf1\x2f\x4e\xff\x86\xd8\
+\x12\x5c\x9e\x9d\xf8\x08\x78\xba\x55\xd1\x54\x5c\x31\x6c\x20\xd6\
+\x0a\x2d\xcd\x4e\xbe\x03\x5a\x6c\x66\x05\xc0\x5b\x13\x62\x6f\xd1\
+\xa5\xd9\xf2\x41\x11\xde\x8e\xf2\x8a\x7a\xb9\x1c\x6c\x24\xa5\xbb\
+\xee\xea\x7e\x56\x95\xe9\x30\x29\x88\x58\x8a\xf7\x9f\x60\x25\xa1\
+\x52\xa9\x64\xce\xef\x08\x86\x10\xf9\x38\x22\x09\x9e\x75\x82\xb5\
+\x64\xbe\x1e\x1f\xaf\x5d\x75\x59\x1e\x43\xf5\xf3\x66\x45\x44\x3d\
+\xea\x04\xab\x89\x9c\x3a\x35\x7e\xb1\x66\xea\x0f\x83\x7c\x1b\xe6\
+\x05\xc4\x97\x3d\xc1\x7a\x12\xd5\xf9\xa9\xdf\x6b\x41\xed\x41\x81\
+\x1f\xc2\xbc\x20\x22\x1e\xfc\x48\xcb\x49\x15\xaa\x33\x53\x3f\x13\
+\xd0\x8b\xb0\x1a\xe6\x15\x02\x91\x64\x4d\x70\xd6\x86\x95\x99\xc9\
+\x1f\xa5\xae\xfd\x28\xe7\xc3\xbc\x2a\x01\xeb\x27\x44\x22\x70\xba\
+\x0e\x2b\x27\xcb\x67\x4d\xca\x3c\x04\x5c\x6c\x56\x34\x20\xa1\xe5\
+\xe0\x7c\x23\x5a\x99\x39\xf6\xa5\x22\x59\xa0\xd6\x26\x17\xe7\x26\
+\x24\xb2\x13\x2f\xcf\x4e\x9c\x16\xe5\x09\xa2\x8f\x27\x25\x70\xbd\
+\x31\x26\x76\x14\x55\xe6\x26\x3f\x44\xf4\xa9\x26\x52\xd6\x37\x46\
+\x97\x1e\x24\x7a\x16\x2f\x9d\x28\x1f\x45\x78\xa9\x55\x71\xf7\x82\
+\x4c\xfc\x32\xb2\x74\x62\xf2\x75\x45\xde\x6a\x23\x39\xc9\x2d\x71\
+\x03\x00\xbd\xef\xee\x9b\x9e\x03\xde\x8f\xf0\x4e\xae\xcc\x3e\x18\
+\x40\xa9\x54\x32\xb5\x5f\xbb\x47\x11\x5d\x08\xf3\x7f\x6f\x88\x56\
+\x73\xf4\xc2\x00\x80\x6a\xb5\xb4\x56\xeb\xaa\x3f\x8e\x72\x26\x22\
+\x59\x35\xc1\x1b\x03\x00\xaa\x53\x53\x97\xd3\xdb\x2e\x0d\x2a\x7c\
+\x13\x91\xac\x1d\x0b\x5e\x19\x00\xb0\x38\x3d\x7d\x21\x30\xe9\x01\
+\xe0\x7b\x17\xf1\xbc\x33\x00\xa0\x72\xf2\xc8\x2f\x75\xd5\x3e\xe0\
+\x9c\xed\x58\x5e\x1a\x00\xf0\xd9\x5c\xf9\x27\x13\xd4\xfb\x80\xdf\
+\xda\xc8\xb1\x2d\x09\x6f\x0d\x00\x58\x99\x79\xef\xbb\x20\xd0\x01\
+\xe0\xcf\x88\xb4\x39\xfe\x32\x03\x70\x7a\xa6\xfc\x95\x51\x79\x04\
+\xf4\x9f\x77\x83\x6c\x86\xbf\xcc\x84\xb1\x32\x37\xb1\x0c\x1c\x04\
+\xad\x23\xd4\x45\x78\x2d\xe9\x9c\x3a\xe8\xa0\x83\xff\x07\xfe\x02\
+\xec\x35\x2d\x8c\x9b\x14\xe3\x6d\x00\x00\x00\x00\x49\x45\x4e\x44\
+\xae\x42\x60\x82\
+\x00\x00\x00\x8b\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x00\x3d\x49\x44\x41\x54\x78\x9c\xed\
+\xd0\x01\x09\x00\x20\x10\x04\xc1\xd7\x6e\x26\xb0\x82\xfd\x2b\xf8\
+\x29\xe4\x40\x66\x12\x2c\x5b\x05\x00\x00\x00\x00\x00\x00\xc0\xff\
+\xc6\xda\xe7\xa6\x23\x92\x66\x3a\x20\xcd\x80\x74\x00\x00\x00\x00\
+\x00\x00\x00\x00\xbc\xd7\xba\x61\x02\x03\x59\xaf\x8c\x6f\x00\x00\
+\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x00\x85\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x00\x37\x49\x44\x41\x54\x58\x85\xed\
+\xce\xb1\x11\x00\x30\x08\x03\x31\x2e\x4b\xb1\x35\x23\x42\x86\x80\
+\x52\xdf\xdb\xa7\x88\x45\x59\x3d\x59\x3d\x9b\x8f\xb7\x19\x5f\x04\
+\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xf0\x01\
+\x8b\x69\x06\x03\x87\x7c\xe1\xcd\x00\x00\x00\x00\x49\x45\x4e\x44\
+\xae\x42\x60\x82\
+\x00\x00\x04\x32\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x03\xe4\x49\x44\x41\x54\x78\x9c\xed\
+\x99\xcb\x6f\x5b\x55\x10\xc6\xbf\x39\xb6\x4b\x02\xa1\x42\x24\x6c\
+\x10\xa9\xa0\x41\x6a\xd3\x76\xe3\xb4\xac\x90\x90\x4b\xec\x8b\xda\
+\x45\x5a\x3f\xb2\x80\x2c\xc8\xc3\x0e\xfc\x03\x88\x55\x1b\xd8\x54\
+\x42\xac\x10\x42\x42\xa1\x24\x15\x2c\xb2\x30\x8f\xb6\x0b\x8c\xac\
+\xb6\x89\x68\x61\x01\x28\xde\xd5\x54\x2a\x46\xa2\xcd\x0a\x58\x54\
+\x55\xd5\xa8\xb1\xcf\xb0\x48\x08\xd7\xf7\x1e\x3b\x7e\xdc\x6b\x17\
+\x31\x3f\xc9\x9b\x99\xf3\x98\xf9\x3c\x67\xee\xb9\x36\x20\x08\x82\
+\x20\x08\x82\x20\x08\x82\x20\x08\x82\x20\xfc\xbf\xa0\x6e\x6d\x1c\
+\x4b\x64\xe2\x20\xfe\x08\x04\xc5\xe0\x4f\x2e\x7d\xf1\xe9\xa9\x6e\
+\xc4\x11\xe8\xc6\xa6\xd1\x64\x26\x43\xc4\x9f\x01\xd8\x0d\xa0\x8f\
+\x40\x2f\x0d\x1d\x0c\xaf\x95\xae\x17\x56\x3b\x1d\x4b\xc7\x05\x88\
+\xa5\x32\x6f\x13\xf8\x03\xb8\xaa\x8f\xc6\x86\x86\xc3\xf7\x4b\xc5\
+\xc2\xf7\x9d\x8c\xa7\x93\x02\x90\x95\xcc\xbc\x0f\xf0\xe9\xda\x23\
+\x28\xb6\xf7\xc0\xc8\x63\xa5\xe2\xea\xa5\x8e\x05\xd5\x89\x4d\x22\
+\x91\xb9\x60\xe8\xc9\xb5\x79\x10\xa6\x1a\x19\xcf\xa0\x85\xf2\x5f\
+\x4f\xbf\xb1\xb2\xf2\x6e\xd9\xef\xd8\x7c\x17\x20\x32\x39\xd9\x13\
+\xbc\x1b\x5a\x22\xf0\x49\x83\x5b\x13\x01\xcc\x50\x86\xc8\xbe\xde\
+\xe8\x2b\xbf\xb6\x72\xee\xdc\xba\x9f\xf1\xf9\x2a\xc0\xb1\x89\x89\
+\xdd\x1b\xeb\x8f\x9e\x27\xf0\x51\xbb\x9d\x37\x37\xae\x54\x8f\xe6\
+\x80\xbb\x2d\xe0\x4a\xef\x03\x7d\xf2\xe2\xc5\x85\xbb\x7e\xc5\xe8\
+\x9b\x00\xc7\xc6\xa7\x9e\x2a\x57\x02\x39\x10\x0e\x1b\xdc\x15\x83\
+\x0d\x30\xf7\xa4\x9f\x83\xaa\x72\x3c\x97\x5d\xfc\xc3\xc3\xf0\xb6\
+\xf1\x45\x80\xe8\xf8\xec\x1e\x68\x9d\x27\x60\x9f\xdd\xce\x60\x26\
+\x90\xae\x37\x97\xc1\x8a\x40\x54\x6d\xc3\x0d\x55\xae\xc4\xf2\x17\
+\x16\x6f\x79\x1d\xab\xe7\x02\x44\xe3\xe9\x61\x52\xc8\x03\x78\xc6\
+\xe1\x62\x00\x75\x93\xff\x77\x24\x2b\x10\x39\x63\xbb\x45\x50\x56\
+\xfe\xcb\xf9\x5f\x3c\x08\x73\x1b\x77\xf3\x69\x83\xd1\x44\xe6\x05\
+\x52\xb8\x0a\x67\xf2\xdc\x44\xf2\x00\x40\xa4\x01\x66\x87\x75\x90\
+\xa1\xaf\xc5\x92\xd3\x47\xda\x0e\xd4\x86\x67\x02\xc4\x52\x33\xa3\
+\x8a\xf8\x0a\x80\xfe\x6a\x0f\x33\xa8\x89\xe4\xb7\x21\xcd\x9b\x55\
+\x63\xa7\x1f\x50\xcb\x56\x3c\xfd\x72\xab\x71\x3a\xf1\x44\x80\x68\
+\x2a\x9d\x00\xd3\x37\x00\xfa\xec\x76\x06\x33\x76\x38\xf3\xf5\x20\
+\x40\x33\xbb\x44\xe8\x63\x85\x5c\x2c\x91\x89\xb7\xba\xae\x9d\xb6\
+\x6f\x82\x56\x22\x3d\x03\xe0\x73\x00\x41\xbb\x9d\x00\x0d\x90\x33\
+\xf8\xa6\x21\x02\x6f\xf5\x44\x7b\x4f\x08\x80\x30\xfe\xfc\x81\xf0\
+\xed\x5f\x8b\x85\x42\x3b\xeb\xb7\x25\x80\x95\x4c\xbf\xc5\x84\x0f\
+\x1d\xc1\x6d\x7e\x73\xee\xf2\x6d\x8b\xad\x96\x68\xdf\x87\x00\x3a\
+\xb1\xf7\x60\xf8\x5e\xe9\x7a\xe1\x87\x56\xd7\x6d\x55\x00\x8a\xa5\
+\x32\xef\x01\x78\xc7\xed\x81\x86\xc7\xc9\xdb\x17\x87\x4b\x6c\xb2\
+\x86\x86\xc3\xbd\xa5\x62\xe1\x72\xcb\x2b\x36\x43\x24\x32\x17\x0c\
+\xf5\xaf\x7d\x0c\x60\xc6\xe0\xf6\x31\xf9\x6d\x08\xa6\xde\xc5\x38\
+\xfb\x44\xe0\xce\x9b\xd9\x6c\xb6\xd6\x25\xcb\x48\x53\x15\x10\x99\
+\x9c\xec\x09\x05\xee\x2d\x01\x98\x70\x6c\xee\xf3\x37\x6f\x80\x41\
+\x8e\x03\x31\xb2\xce\x3d\x87\xf6\x3d\xfb\xe2\x85\x9b\x37\x7f\x6c\
+\x58\x84\x86\x2b\x60\x6c\x6c\xfa\xf1\xfb\xbb\xd4\x79\x30\x5c\x8f\
+\x20\x3f\xce\x7c\x03\x98\x2b\x01\xb8\xdc\xbb\xa1\xe3\x8d\xbe\x3f\
+\x34\x24\x40\xe4\xd5\xd9\x81\xd0\x03\x9d\x03\x60\xb8\x84\x50\xa5\
+\xf3\xb9\x57\x61\xaa\xe2\x9f\x36\x76\xa9\xe3\x2b\x4b\xf3\x7f\xee\
+\x34\x79\x47\x01\xac\x13\x53\x83\x1c\x0c\xe4\x01\xec\xaf\x72\x30\
+\x5a\xbc\xe0\xf8\x82\x82\x3b\x97\x62\x90\x61\xe5\xbe\x3a\x7b\xbb\
+\xde\xc4\xba\x02\x58\xc9\xd9\xfd\x0c\x9d\x07\x30\x68\xb7\x33\xc0\
+\xd4\xcc\xd5\xb6\x13\x98\xdf\x1f\x7e\x0f\x28\x6d\x7d\x9b\x5d\xb8\
+\x51\x6b\x5a\xcd\x9b\x60\x2c\x39\x7d\x84\x59\x5f\x85\x33\x79\xc6\
+\x8e\x6f\x74\x5d\x81\xc8\xd4\x84\xf7\x54\x2a\xea\x9a\x35\x9e\x36\
+\xbd\x92\x03\xa8\x21\xc0\x2b\x89\xe9\xa3\x80\x5a\x06\x61\xc0\xe1\
+\x62\x22\xe8\x2e\x9f\xf9\x7a\xb8\x45\x20\x0c\x68\x8d\xe5\x68\x2a\
+\x1d\x31\x4d\x70\x35\x90\xd1\x44\xfa\x14\x13\x2d\x12\xf0\x88\x61\
+\xfc\x3f\x9d\xf7\x61\xfe\xb8\x8e\xf5\x56\x2e\xaf\x3f\x37\x3c\xa2\
+\x7f\x2b\xae\x7e\x67\xf7\xb9\x2a\x40\x11\xe6\xa8\x8b\x7f\x98\xf8\
+\x05\x01\xa4\x08\x73\x4e\xbb\xa7\xbf\x07\xfc\x17\x31\x55\xc0\x19\
+\x7a\x78\x1e\x6f\x9e\x41\x04\xad\x08\x67\xba\x1d\x87\x20\x08\x82\
+\x20\x08\x82\x20\x08\x82\x20\x08\x82\xd0\x6d\xfe\x06\xf7\x21\x1d\
+\x03\xf2\x02\xba\x61\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\
+\x82\
+\x00\x00\x03\xe3\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x03\x95\x49\x44\x41\x54\x78\x9c\xed\
+\x9b\x3d\x48\x5b\x51\x14\xc7\xff\xe7\xe5\x49\x07\xb1\x2a\x16\x22\
+\x58\x74\xae\x43\x15\x92\x22\xdd\x84\x56\x1d\x14\x37\xeb\x50\x41\
+\x07\x89\x14\x5a\x3f\xa6\x52\x87\x06\x85\x62\xe9\xe2\x47\x1d\xaa\
+\x38\x28\xb8\xa8\x9b\x28\x54\xdb\xa1\x43\xa1\x88\x06\xd4\xc1\xce\
+\x8a\xb6\xa6\x90\xfa\x41\x1d\x6c\x93\x77\x3a\xa8\xe5\xe5\xe5\x45\
+\x93\xdc\x97\x5c\xad\xf7\xb7\xdd\xf3\x4e\x4e\xfe\xf7\xff\xde\xbb\
+\xf7\x92\xdc\x0b\x28\x14\x8a\xeb\x0c\x25\x92\x54\xe9\xf7\xeb\x47\
+\xbb\x05\xf5\x06\xd0\x48\x20\x2f\xc0\x45\x00\x6e\xa4\x59\x5b\xb2\
+\x1c\x03\xb4\xc3\xe0\x15\x0d\x98\xca\x2e\x0c\xcd\x7e\xea\xe9\x09\
+\x5f\xf4\xa1\x0b\x0d\xf0\xb6\x0d\x57\x81\x79\x10\xc4\x77\x9c\xd1\
+\x99\x19\x18\xd8\x20\x68\x9d\x2b\x23\x4f\x3f\x9c\x97\xa7\x9d\x53\
+\x82\xbc\xbe\xa1\x6e\xc0\x58\xbc\x6a\x9d\x07\x00\x02\x4a\x01\x63\
+\xf1\x5e\xdb\xe0\x0b\x80\xe3\xde\x68\x57\xbc\x0b\x5e\x5f\x41\x37\
+\x08\xaf\xd2\x23\x2f\x93\xd0\x83\x22\xef\xd2\xf1\xb7\xc0\xfb\xcf\
+\xb6\x57\xed\x82\xde\xb6\xe1\x2a\xc0\x58\xb4\x84\xf7\x40\x78\xa9\
+\x85\x69\xbe\xe4\xc0\xbd\x35\x33\xf3\x28\xe2\xb8\x56\x01\x1a\x1a\
+\xa6\x5d\x9b\xb9\xc1\x62\x43\xe7\x5a\x30\x7a\x01\xe4\x47\x67\x68\
+\xd5\x76\xaf\x43\x8c\x01\x95\x7e\xbf\xfe\xeb\xfb\xad\xf5\xa8\xc7\
+\x9e\xf0\xd1\x15\x36\x9a\x96\xc6\x3a\x83\xce\x4b\x77\x9e\x8a\xd6\
+\x01\x77\x44\xd7\x26\xc1\x78\x78\x16\x63\x60\x23\xa7\x30\x54\x66\
+\x1d\x18\x63\xc6\x80\xa3\xdd\x82\x7a\xcb\x3b\xff\xf3\x37\xb2\x1e\
+\x5f\x95\xce\x03\xc0\xd2\x58\x67\xd0\x15\x36\x9a\x00\xec\x9d\xc5\
+\x08\x28\x3d\xda\x2d\xa8\xb7\xe6\xc6\x18\x60\x00\x8d\x51\x01\x82\
+\x7f\xfd\xdd\x93\x1f\xe9\x10\x9a\x4e\x96\xc6\x3a\x83\x0c\xf6\x9b\
+\x63\x31\x7d\x83\x8d\x01\x27\xf3\xbc\x29\x21\x4c\xf3\xce\xcb\xcb\
+\x0c\xae\x88\x36\x67\x6e\x13\xe0\xb1\xe6\xd8\x4c\x83\x5c\x64\x6e\
+\x95\x1c\xb8\xb7\x9c\x16\x96\x29\x6c\xb4\xdf\xb6\xe6\xd8\xad\x03\
+\xa2\x56\x78\x97\x6d\xb4\x4f\x06\x1b\xed\x31\xab\xd7\x73\x16\x42\
+\xd7\x03\x65\x80\x6c\x01\xb2\x51\x06\xc8\x16\x20\x1b\x65\x80\x6c\
+\x01\xb2\x51\x06\xc8\x16\x20\x1b\x65\x80\x6c\x01\xb2\x51\x06\xc8\
+\x16\x20\x1b\xdd\x89\x22\x1e\xdf\x50\x35\x08\x6f\x08\xb8\x8b\x04\
+\xff\x6b\x10\x80\x01\x5a\x63\xe6\xe7\x81\xd1\x76\xeb\xef\x96\x49\
+\x23\xfc\x04\x78\x7c\x83\xcd\x44\x58\x20\xa0\x0c\xe9\xef\x3c\x4e\
+\xbe\x83\xcb\x89\xb0\xe0\xf1\x0d\x36\x8b\x16\x13\x32\xa0\xbc\xa5\
+\x3f\x8f\x88\xde\x8a\x8a\x48\x15\x22\x1a\x2a\x6f\xe9\xcf\x13\xa9\
+\x21\x64\x80\x9e\xa5\xdf\x07\x90\x23\x52\x43\x90\x9b\xa7\x1a\x52\
+\xe6\xda\x0f\x82\x42\x06\x84\xff\x84\xbf\x00\x38\x74\x48\x4b\x2a\
+\x1c\x9e\x6a\x48\x19\x21\x03\x56\xc7\xbb\xf6\x99\xb9\x5d\xa4\x86\
+\x08\xcc\xdc\xbe\x3a\xde\xb5\x2f\x52\x43\xf8\x15\x08\x8c\x76\x4c\
+\x30\xa3\x06\xa0\x55\x00\x2c\x5a\x2f\x01\x98\x81\x35\x66\xd4\x04\
+\x46\x3b\x26\x44\x8b\x39\xb2\x0e\x38\x9d\x8f\x85\xe7\x64\x19\xa8\
+\x41\x50\xb6\x00\xd9\x28\x03\x64\x0b\x90\x8d\x32\x40\xb6\x00\xd9\
+\x28\x03\x64\x0b\x90\x8d\x32\x40\xb6\x00\xd9\x28\x03\x64\x0b\x90\
+\x8d\x32\xc0\x26\x76\x6c\x6e\x34\x34\x4c\xc7\xdd\x4e\x7b\xd9\xb1\
+\xd1\x7e\x6c\xcd\xb1\x31\x80\x76\xcc\xad\xcd\xdc\x60\xb1\xa3\xaa\
+\x32\x88\x8d\xf6\x6d\x6b\x4e\x8c\x01\x0c\x5e\x31\xb7\x0d\x9d\x6b\
+\x1d\xd6\x95\x31\x22\x2e\xa3\xce\xdc\x66\x20\x60\xcd\x89\x31\x40\
+\x03\xa6\xa2\x02\x8c\xde\x8a\xd6\x01\xb7\xe3\xea\xd2\x4c\x45\xeb\
+\x80\x9b\x40\x3d\xe6\x58\x4c\xdf\x60\x63\x40\x76\x61\x68\x16\x4c\
+\x5f\x4d\xa1\xfc\x88\xae\x4d\x5e\x25\x13\xfe\x6d\x96\x36\xed\x18\
+\x67\x60\x23\xbb\x30\x34\x6b\xcd\x4d\x6a\xbb\x3c\x83\xfd\xae\x88\
+\x36\x77\x99\xb7\xcb\x47\x5c\x46\xdd\xe9\x9d\x4f\x6d\xbb\xfc\x19\
+\x5e\xdf\xd0\x7f\x72\x60\x02\x20\x70\xf7\xf2\x48\x47\x9f\xdd\xb5\
+\xb8\xeb\x80\x95\xd1\x67\x7d\x04\xee\x4e\x9f\xac\x8c\xc0\xcc\xf4\
+\x62\x79\xa4\xfd\x75\xbc\x84\x84\x0e\x4d\x31\x8c\x81\x93\x33\x38\
+\x57\x87\x44\x0f\x4d\xa5\x70\x6c\x0e\x1e\x9c\xec\xba\xbe\x84\xc7\
+\xe6\xb0\xcd\x40\x20\x99\x63\x73\x0a\x85\xe2\x7a\xf3\x17\x37\xaf\
+\x1e\xac\x94\x31\x9b\x08\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\
+\x60\x82\
+\x00\x00\x05\x08\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x04\xba\x49\x44\x41\x54\x58\x85\xe5\
+\x97\x5b\x6c\x94\x45\x14\xc7\x7f\x67\xbe\xd2\x2a\x78\x21\x2d\x89\
+\x8b\x72\x6d\x40\xb1\x51\xa3\x74\xb7\xe8\x83\x37\x24\x90\x80\x5c\
+\x34\x56\x43\x34\x62\x08\x74\x4b\x61\x0b\x9a\xa0\xa0\xc4\xb5\x01\
+\xb1\xbe\x40\xba\x5d\x5a\x76\x6d\x62\x48\x78\xb2\x89\x0d\x54\x40\
+\x49\x34\xf0\xa4\xa5\xbb\x36\x3c\xd8\x60\x4c\x20\x60\x69\x4b\x84\
+\x26\x1a\x01\xbb\xec\xce\xf1\x61\xbb\xcb\xd7\xfb\x45\xdf\xf8\xbf\
+\x7d\x67\xce\x39\xff\xff\xcc\x37\x33\xe7\x0c\xdc\xe9\x90\xf1\x38\
+\xfb\x2a\x0e\xcc\xb4\xa9\xe4\x1a\x51\x59\x82\x30\x13\x61\x06\x8a\
+\x41\xb9\x8c\x48\x07\xc2\x69\x47\x6d\x53\x4b\x64\xeb\x6f\xff\xab\
+\x00\x6f\x79\xa8\x04\xa5\x1a\x78\x71\x8c\x59\x5b\x45\x75\x67\x6b\
+\x64\xeb\xf7\xff\x49\x40\x71\x59\xe4\x7e\x91\xde\x7a\x60\x6d\x9f\
+\xa9\x0b\xa4\x59\x95\x13\xea\xa4\xce\xeb\x3f\xa6\x6b\xd2\x64\x63\
+\x35\x81\xc7\x8a\x9d\x63\x0c\x4b\xd5\xb2\x1a\x61\x76\x5f\xfa\xe3\
+\x4e\x2a\xb5\xbe\xa5\x61\xdb\x95\x71\x0b\x58\x58\x71\x60\x9e\x49\
+\xda\xa3\x88\x3e\x0a\x74\x89\x10\x9c\xf2\xc0\xb5\x2f\x4f\x55\x55\
+\x25\x47\x9c\x52\x30\x68\xbc\xdd\x05\x6f\x80\xec\x01\x2d\x04\x2e\
+\x19\x58\x75\x26\x52\x79\x76\xcc\x02\xbc\x9b\xf6\x15\x62\x73\x5a\
+\x80\x69\xc0\x11\x27\x97\xb7\x5b\x6a\x2b\xff\x1a\x91\x78\x00\xe6\
+\x05\x42\x79\x53\x7b\xa9\x43\x58\x0f\x5c\x47\x78\x36\x76\xb0\xb2\
+\x6d\x54\x01\x8b\x02\xa1\xfb\x92\x09\x7e\x14\x28\x52\xb4\x26\xee\
+\xe9\x79\x8f\xaa\x2a\x3b\x1e\xf2\xdb\x50\xf1\xf9\x43\x3b\x14\xd9\
+\x0b\x74\xa8\xa6\x4a\xe2\xd1\x77\xbb\xdc\x1e\x39\x03\x43\x52\xbd\
+\x84\x45\x28\x02\x9a\x87\x22\x4f\x9f\x84\xd4\x06\x81\xe5\x02\xb3\
+\x14\x2c\xc8\x45\x55\x8e\x41\xb2\xa1\x3f\x81\x68\x6b\x44\xab\x7d\
+\xe5\xb5\x85\xaa\x6c\x30\xe2\x1c\x06\x5d\x02\xa2\x43\xae\x40\x89\
+\xbf\xd6\x6b\xd1\x56\x84\x3f\xd4\xe6\xcd\x8f\x47\xfd\x7f\x66\x07\
+\x83\x41\xe3\xeb\xce\xff\x40\x91\x8f\x81\xbb\x86\x99\xf2\x75\x55\
+\x3e\x8c\x47\x03\xb5\x6e\x92\xa2\xd2\x60\xee\xe4\xfc\x82\xb3\xc0\
+\x02\xd0\x15\xb1\xc8\xd6\xe3\x99\x31\xe3\x8e\xb6\xa2\x9f\x01\xa8\
+\xea\xee\x81\xe4\xde\xee\xfc\x43\x7d\x4b\x39\x1c\x39\xc0\x14\x11\
+\x6a\xbc\xfe\x50\x1d\x68\x76\x72\xed\x8d\x55\x09\x81\x8f\xfa\xe6\
+\x5c\xed\x1e\xcb\x0a\x28\x2e\xdb\x3f\x1d\xe5\x25\xa0\xe7\x66\x4f\
+\x4f\xc4\x9d\xd5\xd7\x5d\xb0\x0b\xe4\xad\x11\x88\x5d\x50\x40\xca\
+\x7d\xfe\x70\xa5\xdb\xda\x1a\x09\x34\x01\xe7\x80\xc7\x4b\xfc\xb5\
+\x4f\x0c\x12\x20\x98\x95\x80\xa0\x1c\x6b\x6f\xac\x4a\x64\xec\xde\
+\x4d\xfb\x0a\x15\x76\x8d\x8d\x3c\x9d\x29\x2d\x43\x3f\x7d\x6a\x4b\
+\xed\x83\x2e\xbb\xa2\x7a\x14\xc0\x8a\xbe\x32\x48\x00\x22\x2f\xa4\
+\x03\xe5\xdb\x7e\xe9\x34\xa7\x02\x98\x34\x76\x01\x59\x4c\x71\x12\
+\x6c\x74\x1b\xac\x31\xdf\xa5\x73\xca\xe2\xc1\x02\x60\x26\x80\x23\
+\x72\xc1\x1d\xa4\xca\x8a\x09\x90\xa7\x21\xfa\xb2\xfb\x33\x97\xe4\
+\x79\x00\x85\x19\x83\x04\x64\x8c\x46\x6e\xb9\x8e\x91\x0a\x50\x38\
+\x71\x01\x99\x2b\x39\x8d\xab\x93\x9c\x4c\xee\x87\x32\x1b\xd1\x0c\
+\x0a\x72\x23\xf8\x89\x8c\xea\x33\x12\x14\x67\x94\xdc\xee\x4d\xc8\
+\x65\x80\x84\x38\x9e\xac\x53\xfa\x12\xba\x38\x61\x01\xc8\x25\xf7\
+\xd7\xbd\xd6\x78\xd2\xba\xe8\xcc\x5c\x70\xb7\x67\xa7\xf2\x3b\x80\
+\xb1\xcc\x1d\x90\xe4\x38\x13\x85\x68\xbf\x58\x73\x2b\x55\x08\x20\
+\xd0\x91\xb5\xdd\x1e\xd5\x53\x00\x22\xb2\xcc\x1d\xe4\xa0\x07\x81\
+\x89\xd4\x82\x84\x49\x4a\x43\x3f\x01\x86\xa5\x00\x0a\x3f\x0c\x12\
+\x90\xca\x91\x66\x00\x55\x5d\x51\x5c\x16\xc9\x1e\xbb\x96\x48\x65\
+\x3b\x10\x1a\x37\xbd\xca\xde\x33\x0d\x81\x0b\x6e\x83\x55\x59\x05\
+\x60\x6c\xaa\x69\x90\x80\xb6\x70\xa0\x53\xd2\xca\xa6\x41\xef\x86\
+\x7e\xb9\x34\xef\xfd\xf1\xfd\x0a\x6d\x8c\x4d\xbf\xba\xdb\x6d\xf1\
+\x6e\x0a\xaf\x14\x28\x02\x7e\x69\xfd\x62\x5b\xb6\x37\xe8\xbf\xc3\
+\xad\xdd\x01\x20\x42\x70\x51\x20\x74\x5f\xc6\x1c\x8f\xfa\x6f\xa9\
+\xe6\xae\x51\xb4\x86\x91\x7f\x47\x12\x61\xef\xdc\x9e\xe9\x6b\xdd\
+\x55\xb4\xa8\x34\x98\xab\x36\x5d\x67\x04\x76\x0e\x5b\x0d\x01\x8a\
+\xfd\xa1\xc3\x02\x6f\x02\x47\x62\x9e\x6b\xaf\x0e\x2c\xc7\xde\xf2\
+\x9a\xc7\x50\x29\x07\x96\x03\xb3\x48\x5f\xfe\x17\x15\xfd\x46\x8c\
+\xd6\xc7\xea\xb7\xfd\x3a\x60\x35\xc4\x5b\x56\x5b\x8f\xe0\x07\x4e\
+\xc5\x22\x81\xc5\x23\x0b\x48\xf7\x81\x3f\x01\x0b\x80\x7d\x31\xcf\
+\xb5\xed\xc3\x35\x24\xa5\xa5\x5f\x39\x00\x8d\x8d\xaf\xa7\x86\x5e\
+\x10\x15\x6f\x79\x78\x3b\xaa\x9f\xa3\x74\xa6\x72\xc5\xd7\x16\x0e\
+\x74\xba\x3d\x86\x6c\xc9\x16\x56\x1c\x98\x67\x52\xa9\x16\x20\x1f\
+\xf8\xfa\x86\xe3\xac\x6b\xaf\xdb\xfc\xf7\xd0\x24\x43\xa3\xa8\x34\
+\x98\x7b\x77\x7e\x41\x58\x60\x23\x70\xc3\x20\xcf\x9f\x89\x04\x62\
+\x03\xfd\x86\x6d\x4a\x4b\x36\x86\x1f\xb6\xc6\x1e\x05\x1e\x51\xe4\
+\xb2\x40\xf0\x1e\xcf\xd5\x43\x63\x69\x4a\x7d\x57\xf2\x5f\xb3\x2a\
+\x7b\x04\xe6\x03\x1d\xaa\x66\x75\x3c\xba\xe5\xe7\xa1\xdc\x47\x6c\
+\xcb\x9f\x7c\x67\xff\xd4\x9c\x3c\x13\x05\x29\xed\x33\x75\x88\xd0\
+\x8c\x72\x02\x6b\xce\xe7\xd8\x44\xd7\xcd\x94\x58\x27\x37\xc7\xa3\
+\x86\xd9\xc6\xda\x65\x88\x59\xdd\xd7\x0d\x03\x9c\x14\xc7\x59\xd7\
+\x5a\xb7\xb9\x7b\x38\x8e\x31\x3d\x4c\x4a\xfc\xe1\x67\x2c\x5a\x0d\
+\xfa\xdc\x58\xfc\x81\x36\x55\x76\xc4\xa3\x95\x27\x47\x73\x1c\xd7\
+\xd3\xec\xe9\xf2\xfd\x73\x92\xd6\x59\x83\xb0\x04\xed\x7b\x9a\x81\
+\x03\x74\xa4\xaf\x57\x3d\x6d\xd5\x34\xc5\xa3\x81\x73\xe3\xc9\x7b\
+\x67\xe3\x5f\x5e\xef\xd7\x3d\x0b\xb2\x5f\x42\x00\x00\x00\x00\x49\
+\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x00\xf6\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x00\xa8\x49\x44\x41\x54\x78\x9c\xed\
+\xd0\x31\x15\x80\x30\x00\xc4\x50\x5a\x53\xf5\x81\x50\x7c\x60\x0a\
+\xba\xe2\xe0\x33\x24\xdb\x4d\x97\x97\x71\x20\xd6\xf5\xbc\xdf\x7d\
+\x9f\x73\x08\x8f\x29\x4e\xff\x44\x01\xb4\x80\xa6\x00\x5a\x40\x53\
+\x00\x2d\xa0\x29\x80\x16\xd0\x14\x40\x0b\x68\x0a\xa0\x05\x34\x05\
+\xd0\x02\x9a\x02\x68\x01\x4d\x01\xb4\x80\xa6\x00\x5a\x40\x53\x00\
+\x2d\xa0\x29\x80\x16\xd0\x14\x40\x0b\x68\x0a\xa0\x05\x34\x05\xd0\
+\x02\x9a\x02\x68\x01\x4d\x01\xb4\x80\xa6\x00\x5a\x40\x53\x00\x2d\
+\xa0\x29\x80\x16\xd0\x14\x40\x0b\x68\x0a\xa0\x05\x34\x05\xd0\x02\
+\x9a\x02\x68\x01\x4d\x01\xb4\x80\xa6\x00\x5a\x40\x53\x00\x2d\xa0\
+\x29\x80\x16\xd0\x14\x40\x0b\x68\x0a\xa0\x05\x34\x05\xd0\x02\x9a\
+\x0d\x64\x41\x04\x80\xc9\xe4\x92\xad\x00\x00\x00\x00\x49\x45\x4e\
+\x44\xae\x42\x60\x82\
+\x00\x00\x00\x87\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x00\x39\x49\x44\x41\x54\x58\x85\xed\
+\xce\x31\x11\x00\x30\x08\x04\x41\x26\xe2\x50\x80\x04\x84\x20\x3d\
+\x22\xa0\xdc\xeb\xff\x67\x23\x16\x65\xf5\x64\xf5\x6c\x3e\xde\x66\
+\x7c\x11\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
+\xc0\x07\x65\x23\x03\x3b\x58\x7b\xaf\x09\x00\x00\x00\x00\x49\x45\
+\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x00\x75\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x00\x27\x49\x44\x41\x54\x78\x9c\xed\
+\xc1\x01\x0d\x00\x00\x00\xc2\xa0\xf7\x4f\x6d\x0e\x37\xa0\x00\x00\
+\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x80\x77\x03\
+\x40\x40\x00\x01\x8f\xf2\xc9\x51\x00\x00\x00\x00\x49\x45\x4e\x44\
+\xae\x42\x60\x82\
+\x00\x00\x0a\x60\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x0a\x12\x49\x44\x41\x54\x78\x9c\xed\
+\x5b\x6b\x90\x14\xd5\x19\x3d\xe7\xce\xcc\xae\x83\x2c\x88\xf8\x48\
+\x4a\x28\x83\x31\x96\xae\x01\x4c\x70\x99\x5d\x82\x2b\x98\xa4\x54\
+\x82\x2c\xbb\x8b\x1b\x1f\xa5\xe2\x23\x2a\x26\xc6\xc4\x24\x26\x5a\
+\xa5\x8b\x46\x8d\xc6\x08\x96\x55\x06\xb5\x82\xa5\x22\x95\x64\x60\
+\x77\x00\x2d\x51\xab\xc4\xb5\x10\xd9\x5d\x5e\x6a\xf9\xc0\x32\x51\
+\x11\x42\x34\x2a\xca\x43\x79\xcc\xf4\x3d\xf9\xb1\xa0\xdd\x3d\x33\
+\xdd\x33\x3b\x33\x94\x95\x70\xaa\xe6\x47\x7f\xf7\xdc\xef\x9e\xfb\
+\x4d\xf7\xed\xfb\xf8\x1a\x38\x80\x03\x38\x80\xff\x67\x70\x7f\x34\
+\x72\x4a\x52\x87\xef\x89\xa1\x91\xd6\x8e\x94\xc1\xf1\x14\x8f\x11\
+\x70\x08\x80\x41\x00\x22\x00\xb6\xed\xfd\xbd\x27\xe8\x0d\xc0\xbc\
+\x8e\x28\x96\xf7\x4e\xe1\x3b\x95\xd6\x56\xb1\x00\x8c\x4b\xe9\x9b\
+\x8e\xb5\xd3\x41\x4e\x01\x30\xaa\x5f\x4e\x84\x77\x60\xb4\xd4\x5a\
+\xf3\xf0\xaa\x16\xac\x06\xa9\xf2\xaa\x2c\x77\x00\x24\x36\xa4\x70\
+\xba\x85\xae\x03\x30\xb1\x9c\xae\x09\xbc\x2a\x70\x56\xe6\x43\x3c\
+\xb6\xe6\x0a\xa6\xcb\xe8\xb7\x3c\x48\x74\x68\x22\x8c\xfe\x08\xe1\
+\xe4\x72\xf9\xcc\x83\x77\x05\xce\xec\x6d\xc6\xa3\xe5\xb8\x23\x4a\
+\x0e\x40\x62\xb1\x8e\x94\x63\xef\x26\x78\x7e\x00\xcd\x02\x58\x01\
+\xaa\x4b\xd6\xac\x37\x11\xfc\x53\x19\x6c\xb1\x16\xdb\x0f\x02\x9c\
+\x9d\x06\x35\x31\x60\xb0\x0c\x46\x08\x38\x0e\x50\x03\x80\x1f\x02\
+\x88\x07\xf8\x5c\x6e\x2d\x67\xac\x9a\xc6\xd7\x4a\xd1\x5f\x52\x00\
+\x1a\x52\x1a\x6b\xa5\x45\x00\xbe\x9e\xa3\x78\x3b\xa8\x27\x29\xf3\
+\xb8\x05\x9e\xea\x6d\xe1\xc7\x45\xf9\x4e\x2a\xee\x44\x70\x1a\x69\
+\xcf\x02\x38\x25\x4f\x1b\xbb\x44\x5e\xd2\xdb\xcc\xbf\xf6\x47\x3f\
+\x50\x42\x00\xc6\x76\xe8\x3c\x50\x0f\x11\xa8\xf6\x8b\xa2\x74\x6f\
+\xb4\xda\xdc\xf1\xc2\x64\x7e\xd2\x5f\xff\x6e\xd4\x26\x55\x55\x13\
+\xc5\x4f\x00\xdd\x04\xe0\x08\x7f\xb9\xa0\xdb\x7a\x5f\x36\x37\xe1\
+\x66\xda\x62\x7d\x17\x1f\x80\x76\x99\xc4\x28\x7b\x2b\xc8\xeb\x7d\
+\x25\x56\xd0\x43\x94\xb9\xb9\xa7\x95\x9b\x8a\xf6\x5b\x00\xbe\xb7\
+\x58\x35\x69\x8b\x6b\x29\xfd\x1a\xc0\x40\x4f\xa1\xb0\x28\xee\xf0\
+\x82\xae\x36\xee\x28\xc6\x67\x71\x01\x68\x97\x49\x8c\xb6\xf3\x01\
+\x9e\xe3\x2b\xd9\x6c\xc8\xe6\x95\xcd\xec\x2d\xca\x5f\x3f\x91\xe8\
+\xd0\x30\x18\xa5\xfc\x03\xae\x88\x75\xac\xe6\x84\x9e\x49\xdc\x56\
+\xa8\x2f\x53\x54\xc3\x27\xd9\x99\x39\x3a\xdf\x9d\x11\x4f\xde\x5f\
+\x9d\x07\x80\x9e\x56\x6e\x32\x69\x36\x0a\x9a\xef\xb6\x53\xf8\x0e\
+\x77\x69\xfe\xd9\x49\x45\x0a\xf5\x55\x70\x00\xea\x3b\xf4\x63\x88\
+\x37\x7a\x1a\x84\x1e\x89\x6f\xe5\xc4\x35\xad\xfc\x77\xa1\x7e\xca\
+\x85\x95\x6d\xdc\xd9\xdb\x6c\x2e\x10\xf9\x5b\x00\x5f\xbc\x0e\x05\
+\x4c\xde\x18\xb1\xb7\x17\xea\xa7\xa0\x47\x60\xec\x42\x9d\x4c\xa3\
+\xe5\x00\x0e\xfa\xd2\xaa\xc7\x7a\x9a\xcd\x85\x95\x98\x9d\x15\x8b\
+\x44\x87\x7e\x01\x6a\xb6\xdb\x26\xf0\xa2\xde\x16\x3e\x1a\x56\x37\
+\x34\x00\x63\x3b\x35\x94\xd0\xcb\x00\x8e\x72\x99\x7b\xe3\x5b\x79\
+\x6a\xd7\xc5\xdc\x55\x8c\xd0\xfa\x4e\x9d\x60\x85\x66\x1a\x3b\x0a\
+\xe2\x30\x00\xc3\x00\x38\x00\x36\x91\xda\x24\x6b\xd6\x2a\x86\xce\
+\xa2\xd7\x00\x12\x13\x29\x3b\x17\xe0\xc5\x2e\xeb\x1e\x8a\x0d\xdd\
+\xad\x5c\x1b\x54\x35\x34\x00\x89\x4e\x67\x2e\xc0\x4b\x5c\xa6\xcd\
+\xd1\x08\xeb\x56\x34\x71\x73\x21\xda\x6a\x93\xaa\xaa\x89\x61\x06\
+\xa4\x2b\x01\x1c\x5f\x48\x1d\x11\xeb\x0c\x78\xef\xf0\x34\xe6\x2d\
+\x68\xa3\x53\x48\x9d\x33\x9f\x54\xf5\xc7\x3b\xb5\x8c\xc4\x38\x97\
+\x79\x6d\x7c\x08\x13\x5d\x13\x99\xc9\x57\x2f\x30\x00\x89\x4e\x8d\
+\x07\xb4\xdc\xad\x0d\xe2\xb8\x9e\x56\x76\x17\x22\x6a\x6c\x4a\x53\
+\x69\x75\x17\x88\x63\x0b\xe1\xe7\xc0\x4b\x02\x7f\xd5\xdb\xc2\x65\
+\x85\x90\x13\x8b\x75\x24\x1c\xbd\x0a\xe0\xb0\x7d\x36\x82\xd7\x74\
+\xb7\xf0\xde\x7c\x75\xf2\x0f\x82\x12\x01\xfd\xc1\x67\x9c\x5f\x48\
+\xe7\xc7\x3c\xa0\x58\x22\xe5\xdc\x47\x29\x55\x42\xe7\x01\xe0\x24\
+\x42\xcf\xd6\x77\x38\x33\xd1\xae\xd0\x01\xbb\xa7\x89\x1f\x40\xbc\
+\xcd\xa3\x18\xba\x71\xd4\xd3\x3a\x38\x5f\x9d\xbc\x4e\x1b\x52\x68\
+\x04\x30\xde\x65\x4a\x3b\xd6\xb4\x87\x89\x18\xff\x84\x86\xc4\x0e\
+\xd7\x52\x88\x57\x85\x71\x0b\x85\xc8\xf6\xc4\x68\xfd\x7d\xcc\x12\
+\x0d\x08\xe3\xc6\xb7\xe1\x7e\x12\xef\xb9\x4c\x87\x0d\xf8\x0c\x57\
+\xe4\xe3\xe7\x0d\x80\x85\x7e\xe3\xbe\xa6\xf4\xc0\xea\x69\x7c\x3b\
+\xa8\xf1\xda\xa4\xaa\xd2\x7b\xb4\x48\xc0\xf7\xc3\x84\xf6\x03\xd3\
+\xa2\x69\x3d\x1a\x76\x27\xf4\x0d\xcc\xf4\xfc\x51\x82\xae\xcd\x37\
+\x37\xc8\xe9\xac\x2e\xa9\xaf\x01\x38\xc3\x65\x4a\x2b\x6a\x6e\x0d\
+\x94\x27\x71\x60\xd4\xde\x07\xa0\x31\x90\x57\x0a\x88\xd6\xc4\x68\
+\x1b\x7a\x17\x0e\x4f\x63\x1e\x80\xb7\x5c\xa6\xa3\x36\x18\xfc\x20\
+\x17\x37\x67\x00\x22\x51\x9c\x87\xbe\xad\xaa\x7d\x0d\x2f\xeb\x69\
+\xe2\x07\x41\x8d\x26\x16\xe1\x7c\x82\x97\x85\x89\x2b\x1d\xbc\xa9\
+\x7e\xa1\x72\x76\x66\x1f\x16\xb4\xd1\x21\xb4\xc0\x53\xcb\xd8\x8b\
+\x72\x71\x73\x06\x40\xd0\x59\x1e\x83\xe5\x92\xa0\x06\xc7\x2c\xd1\
+\x00\x48\x77\x04\x71\xca\x09\x19\xcd\x0a\x9d\xee\x1a\xe3\xd3\xcc\
+\x49\xb9\xea\x64\x05\x60\xef\x88\xe9\x7e\x97\x22\xe3\xe0\x89\xa0\
+\xb6\x62\x0e\xae\x85\x77\xa2\x54\x69\x8c\xdc\x10\xc3\xf4\x20\x42\
+\xf7\x3a\xac\x02\xe0\xbe\x6b\x07\x6f\x8a\x61\x8c\x9f\x97\x15\x80\
+\xea\xcf\x51\x0f\xa0\xca\x65\x7a\x69\x4d\x1b\xdf\xf3\xf3\xf6\xe1\
+\xec\xa4\x22\x56\xfa\x79\xa8\xe4\x32\x83\xd2\x35\x81\x84\x9b\x69\
+\x29\x79\xfe\x38\x29\x7b\x9f\x32\x2b\x00\x06\xf8\xb6\xa7\x12\x3d\
+\x13\xa1\x2c\x6c\x8c\xe1\x14\x02\x87\x07\x8a\xa9\x0c\x46\x26\x16\
+\xea\x5b\x41\x04\x4b\xe3\xd1\x2e\xda\x13\xfd\x9c\xec\x31\x40\xf6\
+\x04\x0f\xc1\x9a\xb7\xb2\x38\x6e\xba\xec\xb4\x40\x99\x95\x84\x41\
+\x6b\x50\x71\xc4\xc0\xa7\x9d\x27\xf8\x39\xd9\x01\x20\xbf\xe1\xbe\
+\xb4\x40\xe0\xbb\x1f\x62\xa5\x77\x81\x83\x1a\xcf\x7a\xa6\xdd\xc8\
+\xec\xf1\x69\x17\x46\xf8\x39\x59\x01\x90\x45\x8d\x8f\xf0\x69\xa0\
+\x06\xee\xd7\xc1\xcf\x8f\x61\x41\x85\x07\x7f\x96\xa5\xbd\xc6\xcf\
+\xc9\x0a\x00\xe9\x25\x59\x22\xff\x1e\x5b\xdf\xac\x2c\xd7\x6e\xed\
+\xfe\x42\x60\x00\xba\xa6\x63\x37\x00\xf7\x4a\xb0\xaa\x36\x29\xf7\
+\x00\x9f\x23\x00\xbe\x15\x22\x2d\xf2\x6e\x78\x4c\x98\x00\x93\xcb\
+\xc7\x7e\x44\xac\x54\x07\xd9\x8f\x00\xb0\xdd\x7d\xed\xbf\x23\xdc\
+\xd8\xbb\xce\x0e\x9c\x21\x56\x18\x81\xbb\xcf\x13\x1e\x46\x35\x80\
+\xa8\xcb\xb4\xe7\xf5\x36\xee\x71\x73\x72\x0c\x82\xf0\xec\xa8\xda\
+\xbe\x53\xdc\x20\xfc\x2b\xa4\xbc\x92\x08\x0c\xc0\xce\x43\x31\xd8\
+\x67\xda\xee\xe7\x64\x07\xc0\x6a\x83\x8f\x91\x35\x72\xba\x41\xe8\
+\xd5\xa0\xf2\x4a\x42\x21\x6d\xcb\xc1\x31\x3e\xd3\xbb\x7e\x4e\x8e\
+\xe7\xd7\xbc\xe1\xbe\xa2\x6c\xe0\x64\x03\x32\x9d\x81\xe5\x15\x84\
+\x09\x6f\xdb\xa3\x5d\xd0\xfa\x2c\x1f\x59\x55\x08\xdf\x61\x23\xc7\
+\x67\x71\x5c\x38\x68\x1b\x9e\x01\x02\xde\x14\x95\xc3\x86\xee\x16\
+\xac\x0b\x22\x10\x76\xbc\xf7\xda\x64\xdd\x31\x59\x01\x88\x67\xb0\
+\x12\x80\xfb\xfc\xfd\xbb\x89\x0e\xe5\x7d\xdd\x74\x5d\xcc\x5d\x94\
+\x1e\x0e\x95\x5b\x66\x48\x7c\x30\x70\x4b\xbe\x5d\x06\xe0\x64\x6f\
+\x25\x74\xf9\x69\x59\x01\xd8\x7b\xb6\xb6\xd2\x53\x8f\x98\xec\xe7\
+\xb9\x11\x73\xcc\x2d\x00\xb6\x06\x2a\x2e\x2f\x36\x46\x1c\xcc\x0e\
+\x22\xd4\x8d\xc2\x18\x78\xe7\x28\xdb\xe2\x87\x62\xb5\x9f\x97\x67\
+\x3f\x80\x9e\x55\x14\xa1\x29\x41\x8d\x2d\x6f\xe3\x87\x00\x83\x77\
+\x8c\xca\x09\xf2\x86\x95\x6d\xdc\x19\x44\x31\xb0\x1e\xcd\x82\x9e\
+\xca\xb5\x3d\x9e\x33\x00\xb1\x08\xe6\xa3\x2f\xa9\x61\x6f\x65\x9c\
+\x76\x4a\x52\x81\x2b\xbe\xf8\x10\xdc\x03\xe2\xe9\x40\xe1\xe5\x00\
+\x35\xaf\x67\x2a\xe6\x07\x72\xda\x65\x40\x7a\x16\x69\xb4\xe6\x91\
+\x5c\xd4\x9c\x01\x58\xd1\xc4\xcd\x02\x9e\xf9\xa2\x32\x50\x9d\x8e\
+\x5a\xff\x71\xb8\x07\x5d\x13\x99\xd9\xdd\x77\x70\xfa\x66\xa0\xb8\
+\xd2\xd0\x1d\xff\xd4\x5c\x1e\x76\x1c\x57\x3f\x1a\xe7\xc2\x7b\x08\
+\xf3\x7e\x7c\xe8\x97\xfd\x71\x23\xef\x34\x56\xe4\x9f\x3c\xd7\xe0\
+\x4f\xc7\x75\xe8\xe8\xa0\x86\x5f\x6a\xe6\xa7\x8e\xe5\x24\x54\x22\
+\x08\xc4\x6a\x44\x38\x35\xec\x38\xae\x36\xa9\x2a\x49\xbf\x77\xdb\
+\x44\xce\xce\x77\x3a\x94\x37\x00\xab\xa6\x62\x19\xbc\x83\x61\x95\
+\x03\x3b\x33\x4c\xe7\xea\x69\x7c\x7b\x37\x59\x0f\xe4\x8e\x78\xff\
+\xa0\xbf\x99\x34\x1b\xc3\x36\x66\x01\x60\x60\x0c\x97\x83\x9e\xc9\
+\xdb\x96\x98\xc1\x9c\x7c\xfc\xfc\x0b\x19\x52\x24\x6f\xf0\xd9\x2e\
+\x4c\xa4\x82\xd7\xe0\x40\xdf\x9d\x10\x1f\xc2\x1f\x11\xfc\x1d\x72\
+\x4c\x3f\x8b\xc0\x47\x02\x67\xf4\x34\x9b\xf3\xc2\x06\x3d\x00\x18\
+\xb3\x44\x87\x51\xf2\x1c\xe1\x43\xbc\x7d\x45\x13\xf3\x6a\x08\x5c\
+\xc9\x75\x37\xb3\x0b\xd4\x3c\x0f\x5f\x4a\x25\x16\xeb\xc8\x30\x31\
+\x5d\x13\x99\xe9\x6e\xe1\x9d\x11\xf0\x58\x49\x73\x00\x7c\x1e\x56\
+\xc7\x85\xad\x80\xee\xc8\x64\x78\x6c\x6f\x0b\xef\x2f\xe4\x08\xbe\
+\x36\xa9\xaa\x48\x46\x0b\xe1\xcd\x21\x7a\x25\xf3\x11\xf2\x9e\x0b\
+\x02\x05\x9c\x0e\x8f\xeb\xd4\x11\x0e\xf4\x0a\x80\x2f\x3a\x2d\xe1\
+\xc5\xa1\x71\x9e\xb6\x74\x12\x77\x87\xd5\xdf\x87\x31\x4b\x34\x20\
+\x96\xc1\x19\xa0\x6d\x95\x38\x12\x7d\xbb\xc8\x87\x02\x80\x80\x0f\
+\x09\x6c\x06\xb4\x96\x34\x0b\xb6\xa5\xf1\xac\x7f\xd5\x16\x86\xfa\
+\x4e\x67\x8e\xc0\x2b\x5d\xa6\xb4\x21\xc7\x87\x65\xae\x14\x94\x20\
+\x91\xe8\x50\xbd\xa8\x2e\x6f\x46\x98\x1e\xea\x69\x36\x97\x95\x92\
+\x20\xd1\x90\x54\xfc\x90\x81\xb0\xc5\x04\x32\x8f\xbe\xab\x40\xdd\
+\xe7\xb6\x89\xbc\xac\xb7\x99\x73\xc3\xea\x16\x9c\x24\x95\xe8\xd0\
+\x05\xa0\xbc\x19\x17\xd2\x83\xdb\x1d\x73\x75\xb1\xff\x56\xd9\x20\
+\xb1\x3e\x85\xab\x05\xcd\x86\xfb\x71\xa6\xee\xe9\x69\x8e\xfc\xb2\
+\x10\x17\x45\x65\x89\xd5\x77\x38\x77\x8a\xbc\xce\xa3\x01\x78\xde\
+\x89\x72\xda\x9a\x29\xfc\xa8\x18\x5f\xa5\xa2\x36\xa9\xaa\x41\x11\
+\xfb\x67\x91\x97\x7a\x0a\x88\xa7\xe3\x87\x70\x72\x50\x52\x84\x1b\
+\x45\x6d\x67\x0d\x77\xcc\x0d\x04\x52\xde\xf6\x70\x6a\x34\xa3\x55\
+\x0d\x8b\x34\xb2\x18\x5f\xa5\x60\x5c\xa7\x8e\xa8\x89\xea\xd9\xac\
+\xce\x03\xaf\xed\x06\xcf\x29\xb4\xf3\x40\x3f\x12\x25\xcf\x4e\x2a\
+\xb2\x31\x6a\xef\x12\xe8\xbf\xc5\xd2\x80\xe6\x44\x60\x6e\x7b\xb1\
+\x85\xff\x29\xd6\x6f\x21\x68\x48\x2a\xee\x44\xf1\x33\x42\xd7\x03\
+\x18\xe2\x2b\x5e\x9a\xc9\xf0\xdc\x35\x6d\x2c\x6a\x51\xd6\xff\x54\
+\xd9\x94\x2e\x65\xdf\xeb\xcd\xbf\x31\xb9\x83\xd2\xdd\x8a\x9b\x59\
+\xc5\x24\x2c\x06\x61\xc2\x73\x8a\xee\xda\x82\xe9\xa2\x66\x22\xc7\
+\x19\xa4\xa0\x59\x47\x67\xcc\x75\x85\xe6\x13\xb9\x51\x52\xb2\x74\
+\x5d\x87\x1a\x0d\xd5\x09\x60\x68\x8e\xe2\x4f\x00\x3d\x0e\x99\xc7\
+\x11\xc7\x33\xc5\x06\xa3\x36\xa9\xaa\x41\x06\x8d\x32\xf6\x2c\x80\
+\x4d\x00\x72\x4d\xc3\xd3\x22\x67\x14\x32\xda\xe7\x43\xc9\xe9\xf2\
+\x75\x8b\x34\xdc\x58\xdd\x03\xa0\x25\x80\x96\x06\xf1\xbc\x2c\x9f\
+\xa3\xc1\x9b\x12\xfe\x21\x83\x2d\xd5\x51\xec\x48\x1b\x38\x66\x07\
+\x6a\x6c\x15\x06\xcb\xc1\x08\x10\xc7\x11\xb6\x01\xe0\xe9\xe8\xfb\
+\xa4\x26\x9f\xf0\x55\x22\x67\xf4\x34\x73\x4d\x29\xfa\xcb\xf6\xc1\
+\x44\x7d\x4a\x67\x4a\xba\x13\x40\xa5\x07\xc3\xcd\x12\x6f\x39\xda\
+\xc1\x5f\xfa\x73\xcb\xfb\x51\xde\x4f\x66\xda\x65\xc6\x8e\x42\x93\
+\xa1\xae\x17\x50\x57\x56\xdf\xc0\xdb\x00\x67\xc5\xb7\x62\x6e\xb1\
+\x09\x9a\x41\xa8\xd8\x47\x53\x75\x0b\x75\xa2\x31\x76\xfa\xde\x8f\
+\x1d\x8e\xeb\xa7\x9b\xf7\x01\x3d\x69\x65\x1e\x59\xf5\x0a\x5e\xe8\
+\xcf\xf7\x00\x61\xd8\x2f\x9f\xcd\xd5\x2d\xd2\x70\x5a\x4c\x34\xb2\
+\x27\x8a\x3c\x1e\xc0\x08\x12\x83\x25\x0c\x42\xdf\xc9\xcd\x56\xf4\
+\x7d\x36\xb7\x11\xd0\x7a\xd2\xac\x17\xf1\x7c\x4f\x13\xde\xf8\x2a\
+\xe4\x22\x1f\xc0\x01\x1c\xc0\xff\x2e\xfe\x0b\x91\x5a\xc0\x8b\x79\
+\xe5\x16\x6d\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x0c\xd6\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x0c\x88\x49\x44\x41\x54\x78\x9c\xe5\
+\x9b\x5b\x6f\x5b\xc7\x11\x80\xbf\x25\x45\x8a\x94\x28\x89\x92\xad\
+\xbb\x64\xc9\x4e\x9a\xc2\x41\xe0\x26\x45\xd1\xa0\x48\x0a\xf4\xa9\
+\x7d\xe9\x7b\x81\x16\xfd\xa3\x7d\x2a\x50\xb4\x0f\x41\x90\x36\x4e\
+\x52\x20\x69\x92\xc6\x96\x6c\xc9\x37\x5d\x48\x49\xa4\x2e\xe4\xf4\
+\x61\xf6\x1c\xee\xd9\x33\x87\xa4\xe4\xf4\xc9\x03\x10\x24\x77\xf7\
+\xcc\xce\xcc\xee\xce\x6d\xe7\x00\xb2\x05\xe2\x78\xe3\x40\x9c\xf2\
+\x9e\xfe\x78\x93\x84\x90\xe3\xf9\x4d\x12\x42\x96\x57\x97\xed\xe0\
+\x0e\xf0\x18\x9c\x14\x3c\xdc\x00\x6e\x19\x1d\x25\x60\x32\x8b\x2f\
+\x6d\xaf\x0d\xa1\x66\x12\x10\xe0\x62\xc8\x98\x73\xa0\x67\xb4\x77\
+\x81\xbe\xd1\xfe\x12\xdc\xa9\x8d\x2a\xcf\xa3\x1b\x35\x00\x64\x1b\
+\xb8\xed\x09\x3d\x01\x5e\xf8\x89\xa7\x80\x39\xdf\x2e\xc0\x59\xd0\
+\x3e\xeb\xdb\xfa\xbe\x1d\x8f\xa3\x0a\x34\x81\x8a\xef\x3f\xf7\x34\
+\x54\xfd\xf7\x25\x70\x04\x97\xa7\x50\x39\xf2\x6d\x53\xa8\x20\x9d\
+\x9f\xff\xc4\xff\x9f\xf2\x6d\x0e\x68\x01\xa7\xbe\x7d\x29\xe8\x7b\
+\x01\xee\x71\x31\x6f\x85\x52\x92\x2d\x90\x09\x90\x8f\x40\x56\x8d\
+\x31\x6b\x20\x0b\x46\xfb\x06\xc8\xbc\xff\x3d\x05\x72\x0f\xe4\xae\
+\xff\xcc\x80\xdc\x01\x19\xb2\x23\xa4\xee\xc7\x2c\xa8\xe0\xe5\xae\
+\xc7\x31\xe1\xfb\xe7\x40\x36\xf3\x47\x55\x9a\x05\xed\x1b\x20\xbf\
+\x06\x29\x5f\xf3\x88\xcb\x04\xc8\x9f\xf5\xc1\x5c\xdf\x36\x48\xc5\
+\x68\x7f\xdb\x3f\xb7\xe2\x27\x5b\x8e\xf0\xdd\x1b\x73\x72\x3c\xe3\
+\x25\xff\xdb\x79\x46\xb6\xa0\x75\x4b\xdb\xe5\x2d\x83\xd9\x32\xc8\
+\x4f\x8c\xf6\x09\x90\x3f\xda\xbc\x14\x13\xf0\x91\x7f\x30\x92\x9a\
+\xac\x17\x30\x7f\xc7\x7f\xb6\xed\x15\x96\xed\x6b\x4c\x4e\x60\xa2\
+\xe2\xf6\x59\x15\x4e\x7b\x49\xe7\xcb\xf5\x97\xb3\xcf\xa5\xbb\xb9\
+\x02\xf2\xab\x71\x27\xdf\x1e\x6c\xfb\x50\x63\xca\x14\xc8\x6d\x63\
+\xfc\x2a\xc8\x07\xba\x7d\x4d\x7c\xf3\x5e\x79\x5e\x13\x64\x56\xb7\
+\xbc\xd9\x37\x07\xf2\x00\x64\xd1\xe8\x6b\xfa\x67\x23\xcb\x26\x9b\
+\xfa\xc9\x82\x71\x26\xe4\x17\xe0\x3e\x0d\xfe\x27\xca\xa3\x07\xec\
+\x01\x21\xa3\xab\x70\x79\x0b\x2a\x5f\x0e\xe1\x64\x0d\x78\x5a\xd0\
+\x97\xda\xe1\x1b\x3c\x0b\xf0\x00\xba\x4f\xa0\xf6\x2a\x68\xeb\x28\
+\x5d\x94\xc9\x29\xbc\x98\x37\x98\x30\x90\xc6\xc4\x34\x50\xe6\x1f\
+\xa0\x5a\xbd\xed\xc7\x6c\x01\x2f\x54\xa1\x0f\x05\xf1\xc4\x2c\xf9\
+\xff\x89\xe9\x4a\x34\x78\xd8\x46\xd0\xf6\xc2\xa0\x25\x86\x17\x20\
+\x82\x32\xbc\xe7\x9f\x5d\x02\x7e\x06\x7c\x0e\xcc\xa0\x16\x22\x81\
+\x9c\xd9\x8c\x04\x20\x0d\xd4\xcc\x24\xff\x37\x80\x36\xb8\x5d\x3f\
+\x51\x05\x35\x5d\x9b\xc0\xd7\xe0\xae\xf4\x7c\xb9\x13\x72\x20\xce\
+\x8f\x9b\x42\x7d\x81\x6f\x47\x98\x9f\xf8\xd9\x45\x60\x1a\x35\xa9\
+\x7b\xf6\xb3\xd2\x86\xfa\x0b\xd4\x9f\x58\x01\x7e\x00\x16\x80\xcf\
+\x80\xe7\x80\xb7\x3c\xec\xf8\xe7\x7b\xaa\xdb\xdc\x55\xd1\xc4\x5b\
+\x03\xf3\x26\x5b\x59\xcd\x29\x1b\x5e\x0f\x7c\x1c\x29\x46\xcb\x4c\
+\x2e\xa1\xa6\x72\x46\x3f\x37\x05\x59\xf5\xca\x78\x3d\x6b\x55\xd2\
+\xfe\x99\x81\x7e\x91\x09\x90\xdf\x78\x2b\x11\xb6\x07\x8a\x51\xee\
+\xaa\x8e\x18\x40\xc9\x98\xb5\xaf\x13\xb2\x0b\xae\x17\x8d\x5d\x03\
+\xfe\x0e\xdc\x09\x84\x10\xac\xcc\x61\x53\x19\xe7\x10\xdc\x53\xdf\
+\x37\xe6\xaa\x9b\xe0\x9f\x75\x4f\x80\x03\xc5\x7d\xd8\xcc\xf7\x8b\
+\x03\xd6\x81\xbf\x01\xf7\xb2\x73\xba\x9e\xf2\x22\xeb\x18\x47\xc0\
+\x12\xc0\x14\x70\x16\x31\x0f\x7a\xe6\xbf\xf3\x5b\xe9\x31\x59\x21\
+\xa0\x1a\xb9\xd9\x57\xc6\xdd\xe5\xf8\x3c\x8e\x0b\xee\x52\x71\x37\
+\xfb\xd1\x6e\x08\x3d\xbc\x1e\xf0\x04\x3d\x7a\xe1\x90\x1e\xea\x29\
+\x4e\xc7\x58\x2d\x25\x38\xe7\x57\x2f\x00\xd9\x46\x95\x4c\x29\x30\
+\x77\x07\xc0\x7d\xe0\xd2\x9b\xab\x57\xe8\xee\x09\x4d\x9e\x9f\xd0\
+\xdc\x04\x25\xe8\xfa\xe3\x56\x3b\xc4\xf6\xf7\xa7\x81\x2e\x48\x78\
+\x66\xfb\x3a\x56\xee\x03\x47\xe8\xca\x7f\xad\x63\x05\xa0\x03\x9d\
+\x13\xa8\x2f\x92\xd1\x67\xee\x08\xe4\xa7\xf1\x04\x63\x58\x01\x79\
+\x0b\x2e\x2a\x50\x9d\x46\x15\xd3\x29\x83\xad\xbd\x0b\xfc\x0e\xf8\
+\x4b\x01\x03\x01\x74\xe6\xa1\x9e\x04\x3f\x3e\x4e\xa8\x1d\xf9\xce\
+\x79\xd4\x52\xf8\x1d\xd5\x39\x87\xfa\xe1\x10\x64\x5d\xd4\x3c\xfe\
+\x06\xf8\x24\xa0\xd9\x2b\xcf\x7a\x0d\xb8\x0d\x72\x1e\x2d\x66\x6e\
+\x25\x62\x01\xc4\xd1\xe1\x5d\x60\x1a\x26\x1f\xaa\x12\x74\xfb\xd9\
+\xe1\xb2\x0e\xfc\x03\x0d\x70\x8c\x20\x43\x80\xee\x6d\xa8\x4d\x40\
+\xfd\x25\xb8\x4e\x01\x43\x47\xd9\xbf\x52\x07\x16\xe0\xa2\x06\xd5\
+\x93\xbc\xd6\x4e\x7d\x93\xbf\x02\x6b\xe0\xf6\x82\xce\x36\xc8\x09\
+\xba\x63\xdf\xf6\x9e\x6b\x42\x5b\x9f\xe8\xd8\xc7\x3a\xa0\x0a\x9c\
+\xfb\x09\xee\xa1\xab\xf2\x85\x4d\xb3\x2c\xa1\xdb\xbe\x87\xad\x13\
+\xa6\x81\x55\xa8\xb5\x55\x89\x15\x32\x6f\x80\xeb\xe8\x33\xd5\xb6\
+\x32\x18\x1e\xab\x30\xaa\xa3\x87\xfa\x02\x2b\x05\x88\xbe\xf1\x63\
+\xee\xf9\xe7\x3a\x64\x1d\xb9\x22\x2b\xc0\x06\xf0\x0c\xf5\x01\x8c\
+\x03\x7c\xd8\x04\xba\xe0\xba\x9e\xe0\x48\x31\x1e\xcd\x43\xbb\x86\
+\xae\xc2\xf9\x58\x3c\xdb\x70\x01\x3c\x85\xf6\x24\x1c\x2f\x60\x87\
+\xb4\x5d\xe0\x4c\xe7\x8c\xc1\x9d\xa1\x8b\xfa\x83\xe7\x29\xc7\x8b\
+\x25\x80\x06\xea\x3d\x2d\xe6\xb7\x7c\x02\xcd\x29\x70\xad\x6c\x5b\
+\x22\x84\xcb\xf7\x61\xae\x07\xb3\xaf\xcc\x47\x6f\x04\xb3\xaf\x60\
+\xf6\x52\x71\x5b\x47\xcd\xb5\x60\xae\x20\x16\x61\x07\x35\xdf\x2d\
+\xd4\xc2\x65\xc0\x12\xc0\x34\xaa\x3d\x0b\x94\x9a\x2c\xa3\x6e\xaa\
+\x01\xc7\x4d\xa8\x7c\x0f\xcc\x33\x7e\xec\x3d\x06\x88\x03\x16\xa0\
+\xf2\x9d\xce\x61\xc2\x73\xdb\x59\x72\x97\x40\x19\xdc\x31\xba\xb8\
+\x19\xb0\x04\x20\xa8\x69\xd9\x29\x20\x64\xc2\xb6\xf3\x32\x05\xa5\
+\x64\x22\x7f\x1c\xac\x60\xeb\xda\x10\x6e\xfb\x16\x94\x4a\x5e\xbf\
+\xc4\xc3\xae\x94\x36\xb1\x78\x3a\xd4\x23\x34\xda\x0a\x94\x07\x83\
+\x4c\xbf\x7d\x13\xd5\xb2\xe1\x2a\xcc\x82\x74\x81\x15\x98\xd9\x0f\
+\xfa\x5a\xc0\xbb\xc0\x13\xd2\x8c\x4e\x06\x92\xd4\x19\xa8\x4f\x61\
+\xe5\x05\xe7\xd0\x40\xe7\x07\xfd\x2d\xa0\x3b\x73\x03\xe4\x19\x03\
+\x3f\x23\xc1\x7f\xa6\x7d\x1c\x64\xd1\xb8\x63\xef\x0e\x27\x81\x59\
+\x0a\x31\x61\x35\x72\x49\x48\x99\x47\x83\x8d\x65\x4f\x64\x84\x9c\
+\x1e\x74\x66\xa1\x7e\x00\xc4\x41\xc6\x23\x4f\xd0\xd7\xc1\xe4\x2b\
+\x40\x1f\x3a\x67\x50\xdf\x05\x1c\x74\x6f\x41\x2d\xc9\x2f\x3e\xf3\
+\xdf\xce\xcf\xf9\x05\x9a\x2b\x0c\xe1\x15\x74\x66\xa0\x9e\x08\x2d\
+\x9c\xb7\x89\x2a\xbe\xbe\xee\x86\x54\x57\x25\x79\xcb\x4c\xc2\xc6\
+\x5a\x99\x45\xe0\x4b\x90\xaa\x27\xe0\x25\xb8\x43\x34\xd3\x73\x96\
+\x8f\xfc\xa4\x01\xf5\x32\xb8\xe7\x79\x54\x82\x67\x7e\x01\x38\x46\
+\x57\xec\x1b\x63\x77\xb5\xfd\xf8\x32\xba\xe2\x07\x9e\x8e\xff\x68\
+\x5f\x2e\x7a\x3b\xf1\xa6\xcf\x67\x7f\x43\x9a\x64\x1f\x15\x98\x17\
+\x9a\x6c\x02\x4f\xe0\xa4\x03\x8d\x29\xb2\xe1\xb1\xa9\x03\x4a\xa8\
+\x04\x6f\x83\xdb\x09\xec\xf7\x2d\x6c\xe5\x37\x0d\x47\x05\x69\x68\
+\xa5\x00\xcd\xf4\x6e\x01\x4f\x87\x87\xc4\xa9\x2f\x7f\x1f\x0d\x67\
+\x87\x05\x52\x27\x18\xbe\xbd\x5f\x08\x9f\xb9\x72\x27\xa8\xb7\xba\
+\x01\x8d\x03\xf4\x48\x65\xa0\x48\x09\x2e\xe5\xe3\x01\x28\x20\xbe\
+\x01\xf3\x47\x46\x7b\x02\x65\x25\xb4\xf2\x90\x9c\xb3\x94\x9b\x3a\
+\x51\x78\x9f\x61\xdf\x3f\x84\xb4\x14\x08\x20\x37\x4e\x7c\x6a\x7c\
+\xcd\xea\xb5\x04\xb0\x00\x58\xf6\xdf\xba\x84\x18\x07\x56\x18\x24\
+\x34\x0c\x8f\x31\x81\x9c\x93\xf3\x12\x2e\x8c\xd4\x7b\x06\x8a\x84\
+\x69\xd1\xfa\x0a\x43\x60\x05\x47\xe0\x5a\xe1\xec\x28\xc1\xf4\x07\
+\x3b\xa7\x30\x94\x36\x3c\x3c\xd7\x85\xea\xa8\x7c\xdb\x35\x72\x0d\
+\xee\x0c\x55\xe6\x19\x88\x05\x30\x41\x71\x54\x77\x13\x9b\x5e\x83\
+\x6e\x64\xde\x62\x21\x0c\xbd\xb1\xb9\xa9\x1f\x51\xf4\x5c\xae\x3d\
+\xb6\x02\xcb\x70\x65\x69\xf3\xc0\x3f\xc8\xb4\x97\xec\xf6\x14\x9a\
+\x50\x7b\x66\xd0\x21\x20\x8f\xd1\x24\x0b\xc0\xa3\x02\xfd\x32\x62\
+\x85\xbb\x7d\x8d\x34\x73\xd0\xc3\xce\xd6\x8e\x8a\x05\x7a\x15\x98\
+\xb8\xce\xf6\x4f\xec\x75\x11\xf4\x47\xf4\xbf\x26\xd4\x1c\xc5\x47\
+\x70\xac\x79\x23\x01\x94\x9f\xa1\xf6\x37\xc6\xd5\xb3\x11\x8e\xcc\
+\xf2\x1e\x90\x9a\xa4\x10\xd2\x6d\xff\xc8\x7f\x46\x58\x87\x42\x28\
+\x12\x40\x19\xdb\xb3\xcc\xcd\x11\xeb\x80\x2e\x51\xbc\x1c\x40\x11\
+\xb3\xc3\x08\xbf\xca\xcf\x11\x9f\xf9\x51\xd6\x61\x28\x14\x8d\x1f\
+\x5b\x39\xc6\x02\x48\x72\xe7\x39\x6d\x79\x03\x22\x12\xe8\x93\xde\
+\x27\x16\x29\x3c\x4b\x08\x32\x43\xea\xe9\xdd\x78\xee\x00\xc4\xe7\
+\x17\xb3\x60\x99\xc1\x23\x06\xb7\x38\x3f\x06\x3c\x07\x56\x46\x68\
+\x7b\x22\x21\x94\x50\xaf\xcd\xb8\x70\xc9\xc0\x98\xbe\x49\x12\x4e\
+\xe7\x05\x6a\x09\xc0\x01\xfb\xe4\x2f\x12\x8b\xa4\x7d\x00\x6d\x43\
+\x6f\x64\xe0\x25\xf0\x21\x23\x8b\x13\x9c\xa0\x61\xf8\x47\x0c\xbf\
+\x13\xc4\x67\x80\x8e\x8b\x10\x0d\x7e\x8a\x43\xad\xcd\x2e\x63\xe8\
+\x00\x00\xf1\x8e\xd0\x53\x15\x42\x7a\xb3\x73\x80\x79\x1b\xcb\x25\
+\x34\xaa\x43\x28\x4d\xee\xeb\xfe\x05\x6c\x6a\xde\xa0\x08\x64\x8e\
+\xc1\xe5\xcb\xa6\x45\xf0\x00\xe6\x26\x31\xd3\x6d\xed\x45\xd2\x88\
+\x55\x9a\x68\x6e\xe3\x91\xc7\x35\x32\x1f\x00\x9a\xe7\x9f\x04\x77\
+\x0e\xec\x28\x12\xd9\x40\xad\xc3\xbc\x8f\xbd\x43\x44\x4b\xc0\x19\
+\xc8\x3b\x44\x91\x16\x9a\x81\x59\x43\xa3\xba\x26\x70\x01\x17\x5b\
+\x5e\xc7\x58\x4e\xcf\x29\x1a\x19\x2e\xe9\x58\x1e\x00\xff\x06\x89\
+\x4d\x73\x92\xd9\x49\xf2\x01\xc9\xff\x24\x84\xee\x78\xfc\x7b\x7a\
+\xaf\x09\x3e\x83\x9d\xf3\x49\x62\x01\x74\x7c\xdb\x32\x7a\x1e\xd1\
+\x0b\x05\x8e\x3c\xbd\x02\xec\x67\xb7\xb1\xa0\xb9\x43\x59\xcf\xe6\
+\x10\xd3\x73\xf7\x4f\x70\xed\x60\x8e\x82\x3c\xa3\x05\x02\x9a\x38\
+\xd9\x8d\xe6\x5c\xd3\x60\x2d\x61\x3c\x09\x87\xc5\xa1\xbb\xfa\x38\
+\xdb\x0e\x0c\x0a\xb6\x32\xd9\xe9\xf8\x08\x84\x57\xd7\x16\xec\xa1\
+\xc1\x8d\x05\xcf\xc8\x14\x56\xe0\x6f\x65\x5f\xfb\x6e\x30\xb6\x0e\
+\x2b\x14\xe6\x24\x93\xc0\xcb\x84\xe4\x3a\x3e\xa3\x38\x8b\x94\xe0\
+\x85\x6d\x0a\x5d\x5f\x89\xb2\xea\x6d\xdc\x15\xd0\xf2\x67\x30\xc9\
+\xdb\xbf\x0e\xf3\x09\x04\x42\x68\xdd\x46\x13\x24\x56\x4e\xb2\x1c\
+\xd0\x18\xf7\x2d\xa3\xd6\x68\x2c\x25\xd8\x46\xed\xa5\x19\x3f\xfb\
+\x6d\x6e\x64\x5f\x01\x38\x83\xc6\x32\x9c\x9c\x8d\xe1\x25\x5e\x03\
+\x9c\x28\xce\x99\x15\x06\x65\x77\x31\x2c\x53\x7c\xbc\x92\x1a\x85\
+\x9c\x59\xb5\x04\x70\x86\x2a\x97\x72\x41\x86\x15\x38\xee\x90\xbb\
+\xf7\x4f\xb7\xfd\x57\xd0\x38\xd3\x73\xfa\x63\x81\xac\x2a\x4e\xbe\
+\xc2\xf4\x18\xa5\x01\xad\xae\x2d\x74\x99\x83\xb3\x2e\xca\x53\x4e\
+\x78\x45\xf9\x80\xc4\x66\xbe\x6d\x13\xd4\x3c\x54\x84\xc9\x31\xc9\
+\xb9\xb7\xa7\xe8\x96\x5b\x85\x4e\x41\xa1\xd3\x38\x70\x3e\xab\x38\
+\x92\xea\x4f\xd3\x6d\x9e\x04\x66\x61\x2e\x4e\xd6\x26\xb0\x02\x53\
+\xd3\x01\x4f\x19\x88\x05\x70\x41\x9a\x34\x70\xde\x74\xc9\xba\x8d\
+\xd7\xed\x2b\x72\x4a\xd8\xee\xed\x15\xb0\x07\xf5\x4b\x55\x5c\xb2\
+\x38\x9e\xaf\x2f\xce\x8f\x5d\x81\x49\x8f\x23\x3c\xf3\xa1\x10\x28\
+\x01\xab\x76\xfa\x0e\xd4\x34\x5f\x54\xc0\x7d\xeb\x1b\xea\x44\x56\
+\x20\x36\x83\xf1\x95\xd3\x27\x68\x39\x1a\xc0\x32\x5a\x27\xd4\x0f\
+\xc6\x5d\x02\xbf\x45\xaf\xc7\x97\x0d\x9d\x97\xa4\xa0\x4e\xd1\xf8\
+\xfc\x3d\x2f\x84\x61\x89\x0f\x21\xad\x35\xa0\x81\xba\xd1\x56\x4d\
+\xcf\x25\xf0\x7b\xe0\x53\x06\x97\xa3\x89\x19\x4c\xca\x6b\x27\xf5\
+\x66\x3b\x85\x12\xc3\xdd\x67\xd9\x42\x0b\x0f\xc2\xb6\x86\xf7\x08\
+\x37\xa2\xf6\xa4\x0e\x6f\xcd\x7f\x1b\x56\x43\x1a\xdc\xa8\x46\x30\
+\x7d\x7e\x05\xf3\x52\x45\xaa\x68\x09\xed\x1c\xc8\xbb\xb6\x4e\x90\
+\xf7\xf3\xd6\x4a\x3e\x64\x8c\x1a\xa1\x43\x90\x20\x23\xeb\x4e\xe0\
+\xa4\xab\xf5\x80\x29\xa2\xf0\x8a\xba\x0f\xee\x11\xea\x25\xbe\x06\
+\xb3\xe3\x82\xcc\xa0\x29\xfb\xef\xd1\xcc\xcf\x0e\x79\xc5\xb8\x81\
+\xa6\xe0\xc3\x0b\x9e\xe4\x6e\x22\x03\x96\x00\xba\x40\x95\x4c\x49\
+\xec\xcc\x0b\xa8\x4c\x7a\xc9\x16\x85\xb4\xfb\xd0\xaa\xaa\xce\xb8\
+\x56\x5d\xee\x98\x20\x65\xc5\xdd\xaa\x90\xaf\xfa\x08\x14\x63\x7b\
+\x11\xba\x1d\x32\x1a\x5f\x2a\xa8\x6e\xcb\xd5\x28\x58\xb1\x40\x09\
+\xdc\x9e\x6e\x79\x79\x16\x28\xa0\xa7\xa8\x46\xee\x01\xff\x0d\x98\
+\x0f\x24\x3f\x77\xe0\x05\x94\x84\xbf\xa1\x0b\x7c\x13\x48\xbc\xbf\
+\x55\x94\xd1\xa7\x30\x27\x51\xbf\x04\x39\xc6\xfb\xd0\x68\x91\xb9\
+\xbe\x93\x8a\xd2\xe3\x76\x40\xee\x1a\xcc\x66\xe0\x25\x69\x2e\xc0\
+\xed\xa2\x75\x36\xc9\xd6\x17\x54\xf1\x54\xc8\x66\x8d\x22\x1c\x4e\
+\x54\x80\xec\xa3\xb5\x3f\xf7\xc6\x08\x97\x0d\x68\xdd\x46\x9d\x9b\
+\x25\xe0\xb9\xee\xb0\x9c\x9d\x9f\x26\x5d\xd5\xe3\x26\xba\xea\x65\
+\x54\x79\x76\xd0\xda\xe6\x25\x65\x1e\xd0\xcb\xd8\x8c\x33\x14\xed\
+\x00\x77\x9a\x0d\x57\xdd\x1e\x5a\xc3\xbf\x81\x46\x66\x9f\xa3\x42\
+\x78\x00\xe7\x27\x50\x3d\x52\x22\x0b\xcd\x5b\x5f\xe7\x68\x24\x15\
+\x9b\x49\x1b\x80\x83\x0b\xbf\xbb\xaa\xc9\x0b\x14\x21\x1c\x7b\x66\
+\xbc\xa9\x33\x1d\xcb\x65\xc5\x2f\x4b\x1e\x6f\x12\x23\x7c\x00\x3c\
+\x04\x0e\xc0\xbd\x0c\xc6\x97\xe3\x7b\x46\xeb\x08\xc4\xcc\x74\x3d\
+\x21\x0f\xd1\x82\x45\xd0\x2b\xef\x65\xdf\xbe\x1f\xb4\x1b\x20\x62\
+\xf7\x8b\x83\xea\xa4\x67\xb0\x53\xe0\xc5\xad\x8f\xc0\x7d\x05\x4c\
+\xc1\xd1\xf7\xd9\xeb\x39\x71\x9e\xb6\xf8\xcc\x8f\x93\x42\x93\x3b\
+\x03\xe7\x27\x53\x2e\x5f\xcf\x5a\x07\xf0\x66\xe8\x7d\xec\x44\x49\
+\x32\xe6\xff\x50\x2e\x0f\xba\x00\xf2\xf3\xbc\xf9\x95\xa6\x5a\x8a\
+\x5c\xb9\xfc\x1d\xcc\xb2\x5e\x1b\xf9\xc7\xd8\x2f\x4c\xac\x92\x7b\
+\x61\x42\x1c\xfa\x82\x85\xf1\x02\x43\x3a\x66\x7b\xcc\x89\x43\x9c\
+\x05\xcf\x88\x43\xdf\x18\xf9\xa5\xd1\x57\xce\xfa\x2b\xa9\x10\xaa\
+\x8c\xff\xc2\x44\x8a\xe8\x4f\x05\x4e\xc8\x46\x5e\x08\x00\xf2\x1e\
+\xfa\xca\x4a\xee\xa5\x04\x5e\xeb\x95\x99\xb4\xad\xe4\x9d\x9f\xb7\
+\x40\xde\x31\x9c\x9f\xb2\xa5\xe5\x3d\xf3\x7f\xc8\xe3\x2b\x9e\x3c\
+\x91\x5a\x59\xa5\x16\x7b\x80\xe0\x77\x82\x71\x7d\x2d\x1b\x7e\x6b\
+\xde\xd3\x4f\x2b\x74\x9e\x2a\x8c\x7e\x69\x6a\xca\x8f\x09\x04\x2f\
+\x2b\x0c\x5e\xbe\x2a\x7a\x39\x6a\x1e\x33\x66\x91\x2d\xcf\x43\x29\
+\xbf\x9b\x15\x62\x44\x86\x93\x23\x9b\xa8\xb6\xf5\x35\xba\xb4\xfc\
+\xef\x1a\x6a\xe6\x1c\x7a\x01\x72\xc1\xe0\xb5\xb9\x19\x40\xa0\x37\
+\x0d\xe5\xc4\x29\x4a\x4a\x64\x7b\xc1\xff\xe4\xf6\x26\x79\x6d\x2e\
+\x28\x97\x4d\xe9\xeb\xfa\x71\x0e\x35\x61\xa7\xfe\xf7\x24\xaa\xc4\
+\x7d\x01\x06\x1d\x54\xa1\xce\x06\x78\xf6\x06\x4e\x93\xed\xc0\x8d\
+\xb8\xa2\x8e\x41\x26\x30\x4a\xcd\x3c\x9e\x3a\x79\x2d\x1b\xbf\x38\
+\x59\x42\xaf\xca\x92\x23\x54\x65\xe0\x5f\xe0\x99\x38\x24\x6b\xf3\
+\xac\x17\x27\x85\x41\xe2\x33\x06\xa3\xb4\x36\x7d\xac\x88\xc7\x37\
+\xf7\xd5\x59\xab\xe1\x0d\x80\x0c\xcf\x6f\x1a\xf3\x09\xa8\x10\xfe\
+\x07\xb4\x0a\xfd\x7e\xcf\x22\x5b\xc2\x00\x00\x00\x00\x49\x45\x4e\
+\x44\xae\x42\x60\x82\
+\x00\x00\x01\x23\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x00\xd5\x49\x44\x41\x54\x78\x9c\xed\
+\xdb\x31\x11\xc2\x40\x00\x05\xd1\x0d\x22\xa2\x08\x05\x0c\x0e\xa0\
+\x41\x11\x0d\x12\x18\x14\xa0\x26\x15\x2e\x42\x41\xe8\x52\x67\x99\
+\x61\x5f\x75\xdd\xfd\xdb\xfe\x20\xc9\x3f\x1b\xac\x8b\xf7\xc7\xf3\
+\x61\x98\xb9\x02\xcc\x03\x97\xe7\xfd\xf6\x30\x76\xec\x8c\x4b\x01\
+\x96\xc7\x8f\xc0\xf8\x0d\x61\xd0\x02\xf0\x79\xfc\xda\x79\x53\x66\
+\x80\x9f\x50\x00\x7b\x80\xad\x00\xf6\x00\x5b\x01\xec\x01\xb6\x02\
+\xd8\x03\x6c\x05\xb0\x07\xd8\x0a\x60\x0f\xb0\x15\xc0\x1e\x60\x2b\
+\x80\x3d\xc0\x56\x00\x7b\x80\xad\x00\xf6\x00\x5b\x01\xec\x01\xb6\
+\x02\xd8\x03\x6c\x05\xb0\x07\xd8\x0a\x60\x0f\xb0\x15\xc0\x1e\x60\
+\x2b\x80\x3d\xc0\x56\x00\x7b\x80\xad\x00\xf6\x00\x5b\x01\xec\x01\
+\xb6\x02\xd8\x03\x6c\x05\xb0\x07\xd8\x0a\x60\x0f\xb0\x15\xc0\x1e\
+\x60\x2b\x80\x3d\xc0\x56\x00\x7b\x80\xcd\xfb\x34\x05\xaf\xb5\xf3\
+\xd6\xb4\x00\x33\x9c\x80\x09\x98\x96\x73\x92\x6c\xee\x0d\xbb\x93\
+\x11\x50\xe7\xe7\xb7\x79\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\
+\x60\x82\
+\x00\x00\x00\x87\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x00\x39\x49\x44\x41\x54\x58\x85\xed\
+\xcd\xa1\x15\x00\x10\x00\x00\xd1\x63\x29\x55\x31\x80\x45\x4d\xe0\
+\x3d\xd9\x52\x9e\xa4\x8a\x8a\xfb\xe9\xda\x81\x24\x49\xbf\x0b\x27\
+\x52\x5b\x03\xc8\x8f\xae\x7d\xd6\x58\x00\xe2\x93\xa1\x24\x49\xd2\
+\xc5\x06\x65\xbc\x05\x04\xc9\x39\x8e\xf8\x00\x00\x00\x00\x49\x45\
+\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x04\xd0\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x04\x82\x49\x44\x41\x54\x58\x85\xe5\
+\x97\x5d\x88\xd4\x65\x18\xc5\x7f\xe7\x9d\xf1\x2b\xa9\x34\x24\xac\
+\x5c\xab\x25\xfb\x58\x2a\x05\x75\x56\x89\x3e\x34\x51\xd2\x74\x77\
+\x6b\xdb\x88\x22\x41\x14\xa5\x8b\x2e\x82\x4a\x4b\xda\xa2\x32\xbb\
+\x09\xac\xd0\x8a\x20\x04\xaf\xcc\x76\x56\xcd\xed\x03\x0a\xbd\x08\
+\x9d\x5d\xcd\x36\x48\x8a\xc0\xd0\x56\xb7\x0c\x04\x25\xd3\x6c\xe6\
+\x3d\x5d\xcc\xec\x38\xe3\xce\xae\x3b\xd6\x9d\xe7\x66\xf8\x3f\xff\
+\xe7\x3d\xe7\xbc\x5f\xff\xe7\x19\xb8\xd4\xa1\x6a\x92\xa7\xb7\xbb\
+\x26\x91\xa3\xd1\xf2\x1c\x8b\x1a\xcc\x04\x41\x00\x8e\x20\x7a\x8c\
+\x76\x29\x47\x3a\xd3\xac\x9f\xff\x57\x03\x33\xd3\x4e\x45\x7b\x2d\
+\x30\x6b\x88\xa4\x5d\x39\x69\x55\x57\x93\xbe\xfa\x4f\x06\xa6\x6e\
+\xf6\x95\xc9\x64\xdc\x00\x7a\xac\x10\xea\xc5\xde\xee\x10\x3e\x53\
+\x8e\x83\xc3\x23\xbd\x7f\x27\x89\x8e\x8c\x97\xb8\x41\x8a\x73\x41\
+\x0d\xc0\xf5\x05\xf6\x0e\x82\x96\x64\x1a\xf4\x7b\xd5\x06\x66\x6e\
+\xf5\x4d\x31\xe7\x6d\xc0\x6d\x40\xaf\x50\xeb\xc8\xb1\x7c\xb4\x73\
+\x96\xb2\x83\x4e\xa9\xd5\x21\x35\x85\x47\x65\xbf\x06\xd4\x4a\x1c\
+\x8e\xd6\xa2\xce\x87\xd4\x3d\x64\x03\xd3\xb6\xb8\x36\x11\x9c\x01\
+\xc6\x01\x5b\x19\xa9\x27\x33\xf3\x75\x72\x50\xe1\xf3\xf0\x40\x87\
+\x47\x1c\x3f\x13\xd7\x83\x96\x60\x4e\x05\xeb\xee\xdd\xcd\xda\x7f\
+\x41\x03\xf5\x1d\xbe\x82\x33\xde\x0d\xd4\x81\xd7\x65\xba\xc3\x33\
+\xbc\xa2\x58\x8d\x78\x11\xb6\xea\xdb\x59\x89\xbd\x06\xe8\xc9\x5a\
+\xa9\x7d\x0f\xab\xb7\x34\x25\xd9\x6f\xd0\xdf\xf1\x5d\x50\x9d\xcd\
+\xf6\xce\xef\xfb\x8b\x4f\x6f\x77\x4d\x88\x71\x29\xd2\x7c\xcc\x44\
+\x20\x62\x0e\x81\x76\x64\xe1\xc3\x32\x01\xc9\x19\x7b\x6d\x2a\xed\
+\x5a\xa1\xa5\x49\x79\x13\xf6\x1c\x24\x57\x5c\x81\xd4\x16\x4f\x53\
+\x70\x97\xe1\x8f\x5c\x56\x93\xf6\xb5\xe8\x44\xf1\x65\xab\x43\xfd\
+\x14\x9e\xc7\x7e\x09\x18\x59\x79\xc6\x9c\x92\xf4\xc2\x9e\x26\xde\
+\x29\x15\xa9\xdb\xec\xe1\x97\x27\xdd\x0d\xdc\x4a\xd4\x82\x4c\xb3\
+\x3a\xfa\xde\x85\xd2\xf1\x4a\xf8\x0d\x80\x60\xbd\xda\x4f\x7c\x72\
+\xdc\x58\x58\xca\xca\xe2\xf9\xe9\x8c\x36\x5e\x37\x23\x1d\xd7\x63\
+\x17\x27\x77\xa0\x45\x67\x85\x5e\xcc\x2b\x7a\x6d\xe9\xbb\xa2\x81\
+\xa9\x9f\xf8\x1a\xcc\xfd\xc0\xf1\x93\x39\xde\x2f\xe5\xad\x9f\xcc\
+\x6a\xd0\x13\x98\x21\xc1\x68\x45\x7d\x3b\x4f\x97\xc6\xf6\x34\x91\
+\x06\x7e\x04\xee\x48\xa5\xb9\xb3\x9f\x81\x64\x60\x21\x20\xe4\x1d\
+\x07\x5a\x74\xb6\x2f\x3e\x6d\x8b\x6b\xc1\xab\x0b\x33\x1c\x3a\xa2\
+\x5f\xbf\x6b\xab\xaf\x2d\x3e\x4b\x96\xbd\x0d\x20\x38\x36\xf5\x33\
+\x80\xe3\x7d\xf9\x9f\xf0\x79\x29\x4f\x22\x11\x9f\x02\x86\x55\x21\
+\x5d\x10\x64\xf4\x3f\x91\x65\x65\x9e\x14\xbe\x00\xb0\x34\xbb\xbf\
+\x01\x54\x53\x18\xf8\x4b\x19\x91\xb5\xa0\x6a\xf1\xa2\x07\x3f\x58\
+\xfa\x1c\xc4\xc1\x3c\x27\x13\x2a\x18\xc8\x07\x83\x38\x77\x8d\xf2\
+\x87\xa5\xf6\x62\x0d\xd8\x85\x4f\x72\x01\x63\x47\x14\xb8\xc5\x75\
+\x7d\x07\x31\x54\x18\x77\x0e\x2f\xa3\x0b\xe6\x0c\x02\x41\xe2\x02\
+\xdc\x65\xe4\x47\x00\x1c\x19\x5f\x8c\xbc\xa2\x68\x38\x74\xb1\x06\
+\x80\xc3\xa5\x0f\x27\x4e\x17\xb9\x8f\xf6\x7d\xe0\x4a\x0c\xf8\x57\
+\x00\x07\x6e\x2c\xa3\x90\x3b\xb8\x48\x88\xf2\xb1\xb9\x73\xdb\xd9\
+\xd3\x17\x2b\x1a\xb0\xc3\x4e\x80\xe0\x38\xaf\x8c\x44\xe1\x3d\xe0\
+\x62\x6a\xc1\xd9\x98\x0c\x1f\x96\x3b\x8a\x73\x0b\x6a\x5f\xf7\x33\
+\x30\x2c\xc9\x76\x00\xa3\x05\x53\xdf\x77\xf1\xda\x65\x1a\x75\x00\
+\xf9\xed\x6a\xd5\x2d\xad\xe9\x5c\xa4\x73\x37\xca\x16\x68\x11\x40\
+\x54\x48\xf7\x33\xf0\x4d\x83\x8e\x02\x5f\x03\xe3\x86\x5d\xcd\xd2\
+\x52\xb2\xec\xb1\xf0\x1c\xa2\x8a\xad\xf0\xc7\x9d\xdf\xf1\x6a\x69\
+\x64\x46\x1b\x0b\x81\x3a\xe0\x87\xae\x46\x8a\xbd\x41\xd9\x09\x8f\
+\xd6\xca\xbc\x59\xb7\xd6\x77\xf8\x8a\xbe\xf8\xbe\xe5\xfa\x27\x7b\
+\x4c\x8d\xe0\x75\x0c\xbe\x1d\x59\xe1\x35\x13\xb3\xe1\xb1\xd2\x2a\
+\x5a\xb7\xd9\xc3\xad\x7c\x9d\x51\xd0\xaa\x01\xab\x21\x40\xaa\x2d\
+\xb7\x49\xe8\x71\x60\x6b\xa6\x5b\x0f\x9d\x5f\x8e\xa7\xb5\xf9\xf6\
+\x04\x71\x05\xd6\x7c\xc4\x44\xc0\x86\x43\xc2\x9f\xe6\x12\x61\xc3\
+\xde\x06\xfd\x54\xbe\x18\x56\x7d\x3a\x6e\x00\x2d\x07\x76\x66\x9a\
+\x34\x7b\x50\x03\xf9\x3e\xd0\x7b\x80\x5b\x8d\xdf\xea\xec\x0e\xcf\
+\x0e\xd4\x90\x3c\xb2\xd9\x09\x80\x8f\x5b\x94\xab\xb8\x1e\xb6\x52\
+\xed\x3c\x2b\xfb\x4d\xe0\x68\x32\xa1\xe9\x85\xad\x2e\xa2\x62\x79\
+\x29\xf4\x83\x19\xe0\x2a\xa0\x6d\x54\x56\x8b\x77\xb6\xe8\xcf\x8a\
+\x22\x03\x20\xdf\x03\xc4\x77\x41\xcb\x80\xbf\x1c\x75\x6f\x67\xb3\
+\xf6\x9e\x9f\x37\x60\x7d\x4b\xb5\xf9\x66\xe1\x6d\xc0\x2d\xc0\x11\
+\x4b\xad\x97\x8d\x61\xe3\x50\x9a\xd2\x19\x53\x68\x76\xbe\x29\x9d\
+\x04\xf4\xc8\x6a\xd8\xf3\xb0\xbe\xad\x94\x3e\x68\x81\x9d\x92\xf6\
+\x98\x11\x8e\x1f\x80\x1e\x29\x84\x7a\x6c\x6f\x0f\x89\xf0\x59\x2e\
+\xcb\xc1\x64\xa4\xf7\xf4\x30\xe2\xa8\x1c\xe3\x73\x70\x7d\x08\x71\
+\x9e\xf3\x6d\x79\xdf\x07\xe7\xcb\x98\xd5\xe2\xae\x16\xfd\x36\x90\
+\xc6\x90\x2a\x7c\xaa\xcd\x33\x85\xd7\x02\xf7\x0c\x25\xdf\x62\xbf\
+\xd0\xca\x4c\x93\xbe\xbc\x50\x6e\x55\x7f\xcd\x66\xa4\x7d\x83\x23\
+\x8d\xc8\x73\x80\x1a\xf2\x15\x34\x01\xf4\x20\x7a\x40\xbb\x42\x8e\
+\xf4\xee\x66\xfd\x58\x0d\xef\xa5\x8d\x7f\x01\x53\xeb\xdb\x78\xb8\
+\xf8\xe0\x36\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x00\x8c\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x00\x3e\x49\x44\x41\x54\x58\x85\xed\
+\xd3\xb1\x11\x00\x10\x00\x04\xc1\xa3\x32\x89\x0a\xb4\xa0\x2c\x2d\
+\x68\xc0\x98\xd1\x9a\x48\x2a\x24\xb9\x8d\x3e\xbb\xe8\x41\x92\xf4\
+\x59\x38\x23\x97\xba\x80\xf4\x28\x3a\x47\x6f\x19\x20\xbe\x08\x4a\
+\x37\xbe\x40\x92\xa4\xef\x36\xf1\x29\x0a\x07\x7b\xbe\x69\xcc\x00\
+\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x0a\x8e\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x0a\x40\x49\x44\x41\x54\x78\x9c\xed\
+\x5b\x7d\x8c\x1c\x65\x19\xff\x3d\xb3\xb7\xd7\xbb\x72\xd7\x03\x29\
+\x07\xf5\x76\x76\x76\xaf\x3d\x02\xa1\x25\x2a\x05\x81\xd4\x13\x50\
+\x03\x12\x28\x20\x24\xf2\x11\xa4\x02\x22\xa0\x88\xf2\x65\xd0\x00\
+\x15\x21\xf2\x21\x85\x90\xd4\x02\xb1\x0d\x50\x1a\x31\x28\x10\x31\
+\x7c\x34\xa1\x94\x54\x85\x40\x2d\x88\x8b\x94\x5c\xbd\xdd\xf9\xd8\
+\xeb\x51\xca\x47\x3f\xb4\xd7\xdd\xd9\xf7\xe7\x1f\x77\x6d\x67\x66\
+\x67\x67\x76\xef\xf6\x2e\x46\xfb\xfb\x6f\x9e\xf7\xf7\x7c\xcc\x33\
+\xef\xce\xbc\xef\xf3\xbc\x0b\xec\xc7\x7e\xec\xc7\xff\x33\x64\x2a\
+\x9c\x0c\x6c\xde\x7c\x48\x72\xb7\xdb\x4f\xc1\x3c\x0d\x72\x84\x02\
+\x7b\x01\x1c\x28\x90\x19\x00\x13\x00\xb6\x03\xd8\x4e\x88\x05\xf0\
+\x3d\x0d\xf2\x0f\xd2\x5d\x97\xc9\x64\xf2\x93\x1d\xdb\xa4\x25\xc0\
+\xb2\xac\xd9\x0a\xda\x22\x28\x2e\x84\xe0\xe8\x71\x9a\xc9\x83\xf2\
+\x82\xa6\xa9\x47\x75\x5d\x5f\x2f\x22\x6c\x6a\x90\x68\x72\x02\x48\
+\x4a\xc1\x71\x4e\x15\x85\x9b\x00\x9c\xdc\x4c\xdb\x00\x72\x14\x2e\
+\xf9\x68\xcb\x96\x27\xe6\xcf\x9f\x5f\x6e\x96\xd1\xa6\x25\xa0\x50\
+\x70\x4e\x86\xf0\x1e\x00\xf3\x9b\x65\x33\x1c\x52\x20\xb0\x38\x93\
+\xee\x79\xbc\x19\x33\x62\xc2\x09\x18\x1c\x1c\x3c\x54\x4b\x24\xef\
+\x03\x70\x51\x04\x4d\x11\xf8\xb3\x88\xac\x85\xe2\x46\x26\xf0\xcf\
+\x16\xe0\x63\xd7\x75\x77\xb8\x6d\x6d\x95\xd6\x52\xa9\x93\x6c\xe9\
+\x02\x54\x96\x82\xc3\x01\x39\x41\xc0\xaf\x01\x68\xaf\x65\x90\xc0\
+\x3a\x0d\xea\x2a\xc3\x30\xde\x9d\x48\xfc\x13\x4a\xc0\xa0\x6d\x1f\
+\xa7\x29\x3c\x0b\x60\x56\xc8\xf0\x0e\x81\x3c\x4f\xf2\xb9\x96\x16\
+\x79\x31\x95\x4a\x7d\xd4\x88\x6d\xdb\xb6\xdb\x2b\x15\x39\x45\x44\
+\x9d\x49\xc8\xc2\x1a\x3e\x46\x28\xbc\x34\x9b\x4e\xff\x66\x3c\xf1\
+\x03\x13\x48\x40\xa1\x60\x5f\x08\xc1\x0a\x00\xd3\xaa\x82\x02\x1e\
+\xd4\xa0\xee\x32\x0c\xe3\x93\xf1\xda\xf7\x22\x97\xcb\xb5\x76\x74\
+\xcc\xf8\x0e\x44\x6e\x05\xd0\x5d\x45\xa0\xdc\x69\x18\x3d\xb7\x8a\
+\x88\x6a\xd4\x76\xc3\x09\x20\xa9\x59\x96\x7d\x07\x21\x37\x07\x86\
+\x14\x80\x15\x2d\x09\xf9\x59\x2a\x95\x72\x1a\xb5\x5b\x0f\x36\x6e\
+\xfc\xb0\xb3\xbd\x7d\xe4\x3a\x02\x37\x00\xe8\xf0\x07\x86\x67\xa7\
+\x4f\x9f\x76\x71\x77\x77\xf7\xce\x46\x6c\x36\x94\x00\x92\x9a\x69\
+\x16\x57\x41\x78\x7e\x60\x68\x48\x69\x38\xa7\x57\xd7\xdf\x68\xc4\
+\xde\x78\xe1\x38\x4e\xca\xad\xf0\x19\x54\xbf\x70\xdf\x2a\x97\x46\
+\x4e\xea\xeb\xeb\xdb\x5e\xaf\x2d\xad\x11\xc7\xa6\x5d\x5c\x5c\x75\
+\xf3\x82\xd7\xc1\xca\xfc\xa9\xba\x79\x00\x48\xa5\x52\x4e\x42\x43\
+\x3f\x80\x55\x81\xa1\xcf\x27\x5b\xdb\x56\x91\x4c\xd4\x6b\xab\xee\
+\x19\x90\xb7\xac\x6f\x0a\xe5\x49\xbf\x32\x1f\x53\xaa\x72\x65\x36\
+\x9b\x1d\xa9\xd7\x4e\x33\x41\x52\x2c\xcb\xb9\x91\xc0\x5d\xf0\xdc\
+\x0b\x81\x7b\xb2\x86\xfe\xe3\x7a\x6c\xd4\x95\x00\xcb\xb2\xe6\x2b\
+\xca\x3a\x00\x6d\x1e\xf1\x13\x46\x3a\xf5\xad\xc9\x58\x9d\x35\x8a\
+\xbc\xe9\xfc\x50\xc0\xfb\xbd\x32\x81\x5c\x62\x18\xa9\xc7\xe3\x74\
+\x63\x13\xe0\x38\xce\xc1\x6e\x85\x7f\x03\xd0\xe3\x51\x7a\x43\x29\
+\xf7\xcb\x8d\x3e\xf9\x42\xa1\x70\x24\xb4\x96\x73\x84\x38\x9a\x50\
+\x29\x40\x52\x00\x2a\x02\x38\x14\x38\x50\xdc\x00\xa8\xa7\x1b\xdd\
+\x03\x90\x14\xd3\x2c\x2e\x87\xf0\xdb\x1e\x71\x09\x4c\x9c\x90\xc9\
+\x7c\x76\x43\x94\x6e\x6c\x02\x0a\x96\xbd\x1c\xc4\xa5\x1e\xd1\x90\
+\x26\x3c\x36\x9d\x4e\x0f\xd5\x13\x5c\x2e\x97\x6b\xed\xec\xec\xba\
+\x8a\xc0\x95\x00\x8e\xa8\x47\x07\xc0\x5b\x14\x3e\x98\xd1\xf5\x95\
+\x22\x52\xa9\x47\x61\x60\x60\x60\x5a\xb2\xb5\x6d\x0d\x80\x13\xf7\
+\x49\xb9\xc1\x48\xeb\x5f\x14\x11\xb7\x96\x5e\x64\x02\x4c\xd3\x5c\
+\x40\x68\xeb\x3c\x22\x52\xc9\x89\xd9\x6c\xea\xf5\x7a\x82\xca\x5b\
+\xd6\xd9\x42\xb9\x17\xc0\x9c\x7a\xf8\x21\x78\x1b\x94\xeb\x33\x99\
+\xd4\x9a\x7a\xc8\x63\xab\xd2\x1c\x80\x99\x7b\x64\x02\x5c\x6b\x18\
+\xfa\x83\xb5\x74\x6a\x7e\x05\x48\x0a\x91\xf8\x45\x40\xbc\xaa\x9e\
+\x9b\x5f\xbf\x7e\x7d\xb2\x50\x70\x96\x0a\xe5\x19\x8c\xff\xe6\x01\
+\xe0\x73\x10\xbe\x9c\x37\xed\xc5\x24\x63\xbf\x58\xbd\xbd\xbd\x1f\
+\x10\x72\xa7\x57\x46\xe0\x96\xe1\xe1\xe1\x03\x6a\xe9\xd4\x34\x5a\
+\x70\x9c\x7e\x80\x0b\x3c\xa2\xb2\x40\xdd\x16\x17\x84\x69\x9a\x07\
+\xcd\x3c\xe4\xd0\x17\x20\xbc\x3a\x8e\x5b\x2f\x04\xb8\xcd\xb4\x9c\
+\xdf\x16\x8b\xc5\xe9\xb1\x64\x55\x7e\x08\x02\xcb\x23\x99\x39\x52\
+\x2a\x7d\xb7\x16\xbd\x66\x02\x44\xe1\xc6\x40\x14\x0f\x1b\x86\x31\
+\x18\xe5\x3b\x97\xcb\xb5\x02\xda\xb3\x00\xbe\x12\x1b\x68\xe3\x38\
+\xaf\xec\xaa\xc7\xe3\x66\x42\x36\x9b\x1d\x21\xe8\x7f\x50\x94\xeb\
+\x6a\xad\x0d\x42\x8d\xe5\xf3\xf9\xc3\x00\x9c\xe6\x11\x95\x95\x5b\
+\xbe\x23\xca\x31\x49\xe9\xe8\xec\x5a\x4a\xa0\x3f\x8a\x37\x41\x9c\
+\x5b\xb0\x9c\xd8\x59\x98\xd1\xf5\x95\x04\x06\x3c\xa2\x9e\x82\x6d\
+\x7f\x35\x8c\x1b\x9a\x00\x49\x24\x2e\x04\xb0\x37\x63\x02\xac\xe9\
+\xed\xed\xfd\x20\xca\xa9\x65\x39\x17\x01\xb8\x3c\x2e\xb8\x89\x42\
+\x80\x5b\x4d\xb3\x18\x7a\x33\x7b\x39\x22\x15\x21\x9f\xf2\xc9\x94\
+\x5c\x12\xc6\xad\x31\x9d\xe4\x4c\xef\x15\x85\x7f\x88\x72\x58\x2c\
+\x16\xa7\x8f\xad\xc6\xa6\x04\x0a\x6a\x49\xdc\x72\x97\x09\xf1\xc7\
+\x2c\x38\x3d\x4c\xa7\x2a\x01\xc3\xc3\xc3\x07\x80\xde\x6f\x29\x50\
+\x29\x27\xfe\x18\xe5\xac\x5c\xae\x5c\x07\xcf\x42\x69\xb2\x21\xc0\
+\x3c\xd3\x74\x16\x45\x71\x32\xa9\xd4\x9b\x80\x78\x67\x6d\x57\xde\
+\x71\x8e\x09\xf2\xaa\x12\xb0\x7b\xb7\x7b\x3c\x80\x56\x8f\xe8\xed\
+\xd9\xb3\x7b\xac\x20\x6f\x0f\x46\xb3\x2a\x3f\x88\x0f\xbb\xb9\xa0\
+\xe0\xda\xa8\x71\x11\x51\x10\xfa\x1e\x5c\x42\x55\xd7\x29\x43\x7e\
+\x02\x9c\x1b\x10\xac\xab\xe6\xec\x43\xa1\xe0\x7c\x09\x82\x43\xa2\
+\x38\x93\x01\x01\xe6\xd9\xb6\xdd\x17\xc5\xe1\xe8\xfe\x65\xdf\x35\
+\x70\x54\x90\x13\x96\x80\x23\x03\x8e\x06\xaa\x39\x9e\xf1\x04\xce\
+\x0b\xe8\x47\xd1\x9b\x0a\x57\xe1\xdc\xa8\x71\xa1\x04\x63\x3f\x32\
+\xc8\x09\x49\x80\x64\xbc\x57\xa4\x44\x7e\xfb\xa1\x82\x45\x89\x29\
+\xe9\xb5\xec\xf1\x54\xf5\x9b\xf6\x82\x2c\x05\x63\xcf\x06\x39\x55\
+\x09\x20\xd0\xe9\x73\x22\xf2\x69\x4c\x14\x53\xf6\xf2\x0b\xf1\x9d\
+\x8a\x61\x04\x63\xef\x0c\x12\x62\x13\x50\xa9\xb0\x66\x8d\x6d\x6c\
+\x55\x16\x56\xad\x9d\x1a\x30\x3a\x01\x99\x4c\x66\x37\x00\xef\x4e\
+\xb0\x75\x74\xb5\xba\x0f\x55\x09\x90\xe0\x1c\x4e\x32\xea\x47\xad\
+\x85\xd9\x98\x3a\x48\x72\xa2\x16\xc2\x82\xdf\xe1\xbd\x48\x28\xad\
+\x6a\xda\xec\x75\x3f\xba\xcf\x8e\x5c\x21\x4e\x2e\x18\x59\x7d\x2e\
+\x14\x0a\xd3\x00\xb4\x78\x44\xa5\xb9\x73\xe7\x96\xbc\x9c\xb0\x19\
+\xe0\xab\xa8\x92\x3c\x30\x26\x8a\x62\xcc\xf8\xa4\x41\x80\xc8\x04\
+\x90\xec\x0a\x88\x76\x04\x39\x55\x09\x50\x80\x19\x30\x53\xf5\xe6\
+\xf4\x07\xc1\x5c\xd4\xf8\x64\x82\x94\x48\xdf\x9a\xd6\xda\x1b\x10\
+\x15\xaa\x38\xd5\x6a\xf2\x9e\xcf\x89\x20\x72\xb1\x21\x82\xa7\xa3\
+\xc6\x27\x17\x5a\xa4\x6f\xa9\x8e\x7d\x63\x95\x85\x6a\x41\xc5\xd7\
+\x6c\x14\x7f\x51\xa4\x0a\x95\x4a\x65\x35\x80\x86\xba\x31\x4d\x82\
+\x69\x18\xb3\xde\x8a\x22\x30\x10\x3b\x81\xaa\x19\x53\x95\x80\xf6\
+\xf6\xf6\xd7\x00\x78\xfa\xef\xf2\x05\xc7\x71\x6a\x7e\x6e\xb2\xd9\
+\xec\x08\x04\x8f\xc6\xc7\xdb\x64\x88\x3c\x12\x55\x92\x1f\xfb\x44\
+\x9f\xe1\x13\x2a\x59\x1b\xe4\x55\x25\xa0\xbb\xbb\x7b\xa7\x00\xaf\
+\x79\x65\x65\x15\x30\x14\x40\x39\xd9\x72\x3b\x80\x6d\xd1\x11\x37\
+\x0f\x02\xd8\x09\xf1\xf7\x01\x82\xb0\x6d\xfb\x18\xf8\xd7\x28\xdb\
+\x33\x99\x9e\xf5\x41\x5e\xe8\x37\x9c\x84\x6f\x17\x25\xe0\xc2\x28\
+\x67\x7d\xb3\x66\x7d\x08\x32\xb2\x62\xd4\x64\xfc\x44\xd7\xf5\x5d\
+\x51\x04\x05\xcd\x17\x33\xc1\x17\xc3\xca\xe3\xa1\x09\xd0\x34\xae\
+\xc2\x68\xb7\x77\x8f\xf6\x29\x03\x9b\x37\x47\xee\xf8\x0c\x43\x7f\
+\x40\x80\x97\xa2\x38\x8d\x23\x74\x86\xaf\x4c\xa7\x53\xc1\x9e\xa0\
+\x5f\x8b\xd4\x40\xfa\x36\x69\x42\x79\x2c\x8c\x1b\x9a\x80\x74\x3a\
+\x3d\x04\x62\xb5\x47\x34\x2d\xb9\xbb\x1c\x6c\x87\xfb\x20\x22\xae\
+\x52\xee\xf9\x00\xde\x8f\xe2\x35\x06\x09\x5e\xbe\x4e\xe5\x5e\x11\
+\xd7\x8e\x33\x4d\xe7\x02\xf8\x9b\x30\xc3\x86\x91\x5a\x1d\xc6\xad\
+\x5d\x15\x16\xf9\x65\x40\xf0\xbd\xc1\xc1\x21\x23\xca\x71\x36\x9b\
+\xfd\x54\xa0\x4e\x47\x53\x93\xb0\x17\xeb\x95\x5b\x3e\x3b\xae\x1d\
+\x97\xcb\xe5\x5a\x21\xf8\xb9\x57\x26\xc0\xfd\xb5\xba\x43\x35\x13\
+\x90\x4e\xf7\xac\x81\xff\x65\xd8\x9a\x48\xa8\xc5\x71\x51\x1a\x86\
+\x31\x48\xe5\x1e\x2f\x40\x68\xc6\xc7\x05\xca\x93\x09\x0d\xfd\x71\
+\x85\x59\x00\xe8\xe8\xe8\xba\x02\xfe\x6d\xef\xc7\xbb\x76\xb5\x2d\
+\xab\xc5\x8f\xdc\xbc\xe7\xf3\xf6\x49\xa2\xe1\x15\x8f\x48\x09\xd4\
+\x71\x86\x61\xfc\x35\x36\x66\xb2\xc5\xb2\x9c\xeb\x09\xfc\x14\x21\
+\xdb\xd0\x3a\xb1\x95\x22\xb7\x64\xf4\x9e\x87\xeb\xe9\x42\x17\x8b\
+\xc5\x99\x65\x57\xbd\x0b\xef\x31\x1a\xf2\x86\x4c\x26\x7d\x5f\x2d\
+\x9d\x98\x26\x83\xbe\x16\xc0\x4a\x3f\x5f\x7b\x66\x70\x70\xf0\xd0\
+\xb8\x60\x44\xc4\x35\x0c\xfd\x6e\xb7\x9c\x9c\x03\xca\x32\x00\xff\
+\x8e\xd3\xf1\x60\x9b\x00\x77\x55\xdc\xd2\x9c\x6c\x3a\xf5\x50\x3d\
+\x37\x9f\xcb\xe5\x5a\xcb\x65\xf5\x3b\xf8\x6e\x1e\xef\x6c\xdd\xba\
+\xa5\x66\x5f\x10\xa8\xa3\x7c\xb3\x69\xd3\x70\x77\x4b\xd2\x7d\x07\
+\xa0\xf7\xa6\xff\x52\x2e\x8d\x9c\xd2\xd7\xd7\xb7\x3b\x4e\x7f\x0f\
+\x8a\xc5\xe2\xf4\x72\x59\x9d\x06\x0d\xe7\x92\x98\x27\xa3\x55\xe4\
+\xcf\x8c\x05\xfa\x21\x34\x0c\x41\xc9\x06\x80\x4f\xed\xdc\xb9\xed\
+\xe5\xe0\xae\x2d\x0e\xa6\x69\x2d\x23\xe4\x4a\x8f\xa8\xac\x34\x2c\
+\x88\x3b\xb9\x52\x57\xfd\x2a\x9f\x77\x8e\x17\x8d\x6b\xe1\x3d\x11\
+\x26\x58\x61\xe8\xa9\xcb\x27\x72\x40\xc2\xb6\xed\xf6\x91\x91\x11\
+\xd5\x48\x22\xc3\x50\xb0\xac\xab\x41\x59\xea\x13\x12\x97\x67\x32\
+\xfa\xf2\x38\xdd\xba\x0b\x78\xa6\xe9\x5c\x4c\xd0\x77\xe2\x82\xc0\
+\x23\xff\xda\xb1\xed\x9a\x46\x9f\x56\xb3\x30\x76\x44\xe6\x1a\x02\
+\xf7\xc3\xf3\x73\x16\xf0\x01\xc3\x48\xff\xa8\x1e\x1b\x0d\x55\x30\
+\xf3\xa6\x7d\xb7\x00\x37\xf9\xa3\xc0\xab\xc9\xa4\x76\x5e\x4f\x4f\
+\xcf\xd6\x46\x6c\x4d\x14\xb9\x5c\xae\xb5\x63\x46\xd7\xaf\x40\x5c\
+\xe6\x95\x0b\xf0\x52\x3a\x9d\x3a\x23\xea\x50\x44\x80\x5f\x3f\x48\
+\x26\x4c\xdb\x79\x0a\xc4\x39\x01\x33\x85\x84\xc6\x85\xba\xae\xff\
+\xbd\x11\x7b\xe3\xc5\xd8\x7b\xe9\xf7\xa8\xde\xa9\xbe\x4b\xe5\x2e\
+\xc8\x66\xb3\xd1\x85\x5c\x0f\xc6\x73\x50\x32\x61\x9a\xf6\xbd\x10\
+\x09\x4e\xb1\x32\x81\x65\x95\x72\xf2\xce\x39\x73\x0e\xdb\xd2\xa8\
+\xdd\x7a\x30\x7a\x7c\x16\xdf\x87\xe0\x66\x00\x07\xf9\x06\x05\x2f\
+\x54\xca\xa5\x0b\x66\xcf\x9e\xdd\xd0\xa6\x6c\x22\x47\x65\x2f\x83\
+\x60\x19\x80\x60\x61\x72\x27\x81\xfb\xdc\xd2\xc8\x92\x46\x0e\x2c\
+\x46\x81\x64\x8b\x69\x3a\x8b\x20\x58\x8c\xb0\x1e\x24\x65\x89\x61\
+\xf4\xdc\x54\xef\x79\x22\x2f\x26\x76\x58\xda\xb2\xfa\x35\xca\xd3\
+\x00\x0e\x0e\x19\xfe\x84\xe0\x73\x1a\xb4\xe7\x4a\xa5\x5d\xab\x1b\
+\x4d\xc6\xe8\xe1\xaa\x83\xfa\x15\xd4\x99\x02\x9c\x05\x20\x6c\x19\
+\x5e\x06\x71\x55\x3d\x6f\xfb\x5a\x98\x70\x1b\x67\x53\xb1\xa8\xb7\
+\x54\xd4\x03\x20\xbe\x11\x41\x2b\x03\x7c\x15\xa2\xbd\x02\xc5\xf7\
+\x95\x92\x4d\x6a\x9a\x7c\x9c\x74\xdd\x9d\xa5\x52\xa9\xd2\xd6\xd6\
+\xd6\xa9\x94\xea\x22\x13\x59\x6a\x38\x1c\x54\x27\x08\xe4\x54\x00\
+\x33\x6a\x19\x24\xf0\xe6\xd8\x71\xf9\xd8\x55\x69\x14\x9a\xf8\x87\
+\x09\xfb\xeb\x14\xdc\x2d\xc0\xbc\x66\xd9\xac\x81\x21\x42\x6e\xcf\
+\xa4\x7b\x7e\x3d\x9e\x29\x1f\x44\xb3\xff\x32\xa3\x99\xa6\x73\x16\
+\x05\x37\x0b\x70\x6c\x33\x6d\x03\x18\x04\xb9\x84\xac\x2c\x6f\xe6\
+\xd1\xdc\x49\xeb\x64\x9a\xa6\x79\x14\x45\x5b\x04\x85\x85\x10\x1c\
+\x3e\x4e\x33\xc3\x10\x3c\xaf\xc0\xc7\xb2\xba\xfe\xa7\xf1\xfc\x1f\
+\x20\x0e\x53\xd2\xca\xdd\x54\x2c\xea\x49\x97\x27\x2b\xf0\x28\x40\
+\x8e\x00\x98\x15\x41\x17\x88\x19\x18\xed\xdc\x6c\x03\xb8\x5d\x20\
+\xb6\x02\x36\x42\xb8\x51\x23\x5f\x4d\xa7\xd3\xef\xfd\x37\x9c\x45\
+\xde\x8f\xfd\xd8\x8f\xff\x5d\xfc\x07\xbb\x1b\xfe\xd4\xc4\x32\xd9\
+\x11\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x02\x3e\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x01\xf0\x49\x44\x41\x54\x58\x85\xed\
+\xd6\x3f\x68\x13\x61\x18\xc7\xf1\xef\xf3\x5e\x62\xa5\x82\x8a\x1d\
+\x14\x5d\x44\x9c\x1c\xfc\x13\xcc\xe0\xe0\x28\x5d\xea\x24\xc1\x45\
+\xd1\x45\xd2\xda\x34\x05\xc1\x51\x4a\x70\x74\x50\x92\x5a\x6b\x40\
+\x10\x75\x10\x8b\x5b\x10\xc5\xd1\xa1\xa0\x6d\xc4\xc5\xc9\xa1\x93\
+\x28\x48\x4b\x87\x8a\x35\xc9\xfd\x1c\xee\xb2\x38\xdd\x5d\x8e\xcb\
+\xa0\x0f\xdc\x76\xcf\xfb\xfb\xf0\xdc\xfb\xde\x1d\xfc\xeb\x65\x51\
+\x6e\x3a\x5d\xae\x6f\x80\x59\xbe\xdb\x39\xb2\xfc\xe8\xc6\x7a\x9a\
+\x00\x17\xf1\xbe\xbd\xa0\x3d\x9d\x5c\xae\x75\xfc\xf2\x9d\x5d\xc3\
+\x00\xf4\xeb\xcc\xc8\xe8\xc8\xcb\x63\xa5\xb9\x1d\xc3\x02\x20\x18\
+\x1f\xdd\x37\xf6\xa4\x54\x7a\xe1\x65\x0e\x10\xf8\x60\x02\x2e\xae\
+\x8d\x7d\x6b\x80\x22\xed\xa1\xd4\x00\x06\x12\xbe\x00\x24\xa6\x8a\
+\x93\xf5\x5a\xa6\x80\x00\x61\x92\xe1\x07\x08\xbb\x55\x2c\x37\x66\
+\x33\x05\x00\x98\x90\x50\x80\x40\xf7\x8a\xe5\xc6\xa5\x4c\x01\xf0\
+\xd7\x24\xd0\xe3\xc2\xe4\xfc\x44\xa6\x00\x08\x26\x81\x10\xe0\x39\
+\xf9\x4b\x85\xa9\xfa\xd9\x4c\x01\x81\x02\x3f\x44\xec\x74\x3e\xad\
+\xe2\xb5\xbb\x27\xb3\x05\x84\x08\xc9\x04\xec\x96\xf3\x5e\x17\xae\
+\xdf\x3f\x9a\x2d\x00\x30\x53\xff\x1d\xb1\xdf\x7a\xbd\xb7\xa7\x2a\
+\x8d\x83\x99\x02\x82\x0a\x4e\x86\xc1\x61\xd7\xd1\xab\x21\x00\x00\
+\x44\x88\x38\x31\x04\x80\x39\x30\x04\x6b\xbd\xbc\x1d\x8a\xd2\x91\
+\x4b\x2b\x5a\xe0\x2c\xf8\x36\x7c\x97\xe7\x9d\xfb\x38\x3f\xfd\x35\
+\x4a\x5f\x5a\x13\x70\x16\xfc\xdc\x6c\x3a\x18\x6f\x2f\x4c\x7f\x89\
+\xdc\x98\x46\x38\x41\xf8\x2f\xdf\x71\xfe\xfd\xc3\xea\xa7\x38\xcd\
+\x83\x3e\x02\x0b\xaf\x9e\x6f\xae\xd4\x7e\x50\x79\x17\x77\x81\xc4\
+\x13\x90\xc9\xfa\xfd\x86\x5d\x6d\x2f\x56\x5a\x49\xd6\x49\x3a\x01\
+\x33\x99\x03\x90\x98\x5d\x69\xce\x3c\x4b\xb8\x4e\x92\x09\xc8\x40\
+\x2e\x54\xdc\x5e\x6d\x56\xeb\x49\xc3\x63\x03\x84\x0c\xf5\xcf\xba\
+\x16\x3e\x2c\x56\xe7\x06\x09\x8f\x0d\x30\x70\x18\x20\x7b\xbe\x7a\
+\x60\x7d\x26\x7c\xf7\x0f\x54\x31\xf7\x80\x61\xf0\x66\x6b\xe3\xc7\
+\x15\x9a\x35\x7f\xd0\x70\x88\xbf\x07\x96\xb7\x7f\x6e\x5f\xf8\xbc\
+\x54\xfb\x9d\x46\x38\x44\x9c\x80\x60\xd3\xc0\xf2\xdd\xee\xc4\xca\
+\xd3\x9b\x5b\x69\x85\xff\x2f\x80\x3f\x94\x18\xa2\x63\x8f\xc5\xfb\
+\x89\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x00\x98\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x00\x4a\x49\x44\x41\x54\x58\x85\xed\
+\xce\x49\x0d\x00\x31\x0c\x04\xc1\x5c\x90\x0c\xca\x2c\x36\x14\x4c\
+\x25\xfc\x72\x80\x98\x95\xfc\xe9\xfa\xcf\xa8\x4b\x11\x98\xc7\x34\
+\x8f\xa9\x7c\x34\x65\xfc\x07\x02\x08\x20\x80\x00\x02\x08\x48\x0f\
+\x18\xf2\xc3\xad\x9f\x79\xe4\x04\xdc\xd3\x57\x6d\x5b\xb9\x00\x00\
+\x00\xf9\x1e\xf2\x23\x09\xdd\x64\x85\x0e\x0a\x00\x00\x00\x00\x49\
+\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x00\xd0\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x00\x82\x49\x44\x41\x54\x78\x9c\xed\
+\xd7\x31\x0e\x82\x50\x10\x04\xd0\x81\x43\x10\x1b\x13\xce\xe4\x15\
+\xa8\x38\x11\x37\xf1\x3c\x24\x36\xc4\x43\x88\xad\xe1\xdb\x22\x86\
+\xff\x5e\x39\xd9\x62\x76\xbb\x4d\x00\x00\x00\x00\x00\xa8\x47\xb3\
+\x0d\xe6\xf9\x71\x4b\x93\x29\x49\x77\x40\x9f\x3d\x2d\x59\x33\xf4\
+\xfd\xf5\xfe\x19\xb6\xc5\xd8\x39\x97\x4f\x92\x4b\xda\x4c\xdb\xb0\
+\x3c\x40\x65\xca\x03\xac\x19\x93\x3c\x7f\x5f\x65\x77\x4b\x5e\x19\
+\x8f\x2e\x01\x00\xfc\x0f\xbf\x40\x31\x76\xce\xe5\x13\xbf\xc0\x77\
+\x7e\x01\x00\x00\x00\x00\x00\x00\x2a\xf1\x06\x74\xea\x1a\x0f\x1a\
+\xcd\x17\x42\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x02\x2e\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x01\xe0\x49\x44\x41\x54\x58\x85\xe5\
+\x96\xbd\x6b\x14\x51\x14\xc5\x7f\x67\x46\x8d\x20\xf1\xab\x90\x85\
+\xcd\xec\x18\xc1\x2e\x85\xa5\x95\x65\x04\x25\x8d\x85\x56\x0a\x76\
+\x36\x42\xfe\x00\xb1\x10\x7b\x11\x04\x4b\x41\x2b\x2d\x6c\x82\x85\
+\xa6\xb3\xb2\x14\xd9\x4e\xc8\x3a\x3b\xbb\xb0\x58\x69\x82\x90\x0f\
+\x76\x8e\xc5\xac\xb5\xfb\x66\x1e\x0a\x7a\xab\x79\xc3\xbc\x73\x7e\
+\xf7\xbe\xfb\xde\x1b\xf8\xdf\x43\xb1\x05\xcb\xb2\x3c\x3d\xad\xd8\
+\x02\xfb\x6c\xde\x3b\xf5\xbb\xef\x0f\xc5\x34\x9f\x4c\x26\xc7\x76\
+\xf7\x0f\xde\x00\x27\xe6\xcd\x2d\x1a\x40\xbf\xdf\x3f\xb2\xb7\x77\
+\xf0\x1a\xb8\x18\x32\x2f\x89\x61\x6e\x3b\x5d\x5c\x3c\xf9\xdc\xb0\
+\x8a\x1d\x34\xb7\x35\x80\x6d\x0d\x87\xe5\x13\xe3\x1b\xf5\x1b\x55\
+\x7f\x14\xa0\x28\xc7\x0f\x8c\xee\x00\x18\x2a\x44\x50\x09\x5a\x01\
+\x0c\x8a\xd1\x3a\xf6\x3d\xdb\x80\x2b\x11\x66\xde\x0a\xa0\x28\x46\
+\x37\x85\x1f\x01\x24\x52\x05\x0a\x36\x6f\x0c\x50\x14\xe3\x35\xe3\
+\x67\xf5\x48\x95\x1b\x64\xde\x18\x60\x6b\x38\xbc\x64\xaa\x57\x40\
+\x5a\x1b\x07\xb6\x7d\x1b\x80\xc1\x60\x74\x21\xb1\x36\x80\xa3\x60\
+\x0b\x82\x3a\xbe\x15\x40\x59\x96\xe7\x95\xf8\x2d\x70\x1c\x70\xe8\
+\x76\x6b\x05\x50\x96\x65\x77\x5a\xb1\x09\x9c\x99\x75\x7a\x14\x73\
+\x98\xf3\x28\x9e\x56\x8c\xea\x27\xe3\x48\x99\xff\x8a\xf9\x96\xc0\
+\x7c\x8a\x69\x1a\x0c\x90\xa6\x5c\x01\x7d\x01\xa1\x48\xf7\x47\x10\
+\x40\x96\x65\xe3\x34\xf1\x2a\xf0\xd5\xf5\x3d\x1b\x0d\x62\x6e\xa1\
+\x2c\xcb\x3e\xbb\xd2\x65\x60\x1b\x10\x8e\x03\x11\x24\xb2\xbc\xbc\
+\xf4\xb1\x92\xd7\x80\x5d\x84\x1c\xa1\x12\xc1\x02\xe7\x7a\xbd\xf7\
+\x22\xb9\x0e\x4c\x05\x52\xcb\xdf\xba\x46\x19\xe4\x79\x77\x43\xe8\
+\x36\xc0\xac\x0a\x8d\x21\x1a\x97\x30\xcf\x97\x5e\x08\xd6\x01\x6c\
+\x37\x86\x68\xb5\x86\x79\x9e\x3d\x46\x7a\x28\x69\xa6\xe5\x60\x88\
+\xd6\x4d\x94\x67\xdd\xfb\x58\x4f\xeb\x91\x12\x3b\xac\x12\xad\x01\
+\x24\x39\xcf\xbb\x77\x85\x5e\xd6\xe3\x30\xcd\x28\x7b\x59\xd2\x74\
+\x67\xe7\xdb\x2d\xc1\xbb\xd0\xb9\xd1\x4e\xb4\x95\x95\x95\xfd\x85\
+\x85\xc3\xd7\x10\x1f\xfe\x0a\x00\x40\xa7\xd3\xf9\x91\x8a\xab\xb6\
+\xb7\xc1\xdf\x63\x6a\xff\xbb\xf1\x13\xb6\x0b\xa1\x01\x61\x9e\xcd\
+\x4b\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x00\x98\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x00\x4a\x49\x44\x41\x54\x58\x85\xed\
+\xce\xc1\x0d\xc0\x30\x08\x04\x41\x82\x5c\x1b\x15\x50\x02\x7d\x98\
+\x9a\x52\xa0\x9d\x22\x2e\x12\x9f\x9d\xff\x9d\xd6\x4c\x10\x59\x1d\
+\x59\xad\x7c\xb8\x32\xfe\x03\x01\x04\x10\x40\x00\x01\x04\x8c\x07\
+\x2c\xf5\xe0\x5e\xdb\x91\x35\x13\xf0\x1c\x7f\xcd\x8f\x72\x01\x00\
+\x00\xe6\x7d\x0c\xb6\x09\x4f\xb2\x71\xd6\x0c\x00\x00\x00\x00\x49\
+\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x00\x75\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x00\x27\x49\x44\x41\x54\x78\x9c\xed\
+\xc1\x01\x0d\x00\x00\x00\xc2\xa0\xf7\x4f\x6d\x0e\x37\xa0\x00\x00\
+\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x80\x77\x03\
+\x40\x40\x00\x01\x8f\xf2\xc9\x51\x00\x00\x00\x00\x49\x45\x4e\x44\
+\xae\x42\x60\x82\
+\x00\x00\x00\x77\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x00\x29\x49\x44\x41\x54\x58\x85\xed\
+\xce\x41\x01\x00\x20\x0c\xc4\xb0\x0d\x53\xb8\x9e\x44\x40\xc6\xf1\
+\x48\x0c\xb4\x55\x00\x40\x58\xef\x39\x37\x39\xb0\x92\x71\x00\xe0\
+\x0b\x0f\xd3\xb2\x02\xe6\x6a\x84\x46\x98\x00\x00\x00\x00\x49\x45\
+\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x00\x9a\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x00\x4c\x49\x44\x41\x54\x58\x85\xed\
+\xd7\xc1\x09\x00\x20\x08\x46\x61\x8b\x76\xf2\xda\xc4\x4d\x10\xb8\
+\x99\xb4\x41\xa6\x74\x7c\xef\xf8\x83\xf0\x5d\x15\xa1\x64\xba\xdc\
+\x74\xb9\xbd\xee\x51\xa3\x60\x98\xc9\xfd\x5a\xaf\x1c\xfd\x0c\x00\
+\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xf2\x9f\x51\x93\
+\x9d\xda\x29\xe8\x00\x81\xd7\x0c\xbd\xf7\x79\x8f\x39\x00\x00\x00\
+\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x00\xee\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x00\xa0\x49\x44\x41\x54\x78\x9c\xed\
+\xd0\x41\x11\x00\x20\x00\xc3\x30\x0e\x53\xb8\x46\x22\x20\x23\x3c\
+\x1a\x03\xeb\x6d\x0c\x68\xed\x73\xd7\x3e\x57\x36\x4c\x39\xfe\x83\
+\x0e\xd0\x01\x5a\x07\xe8\x00\xad\x03\x74\x80\xd6\x01\x3a\x40\xeb\
+\x00\x1d\xa0\x75\x80\x0e\xd0\x3a\x40\x07\x68\x1d\xa0\x03\xb4\x0e\
+\xd0\x01\x5a\x07\xe8\x00\xad\x03\x74\x80\xd6\x01\x3a\x40\xeb\x00\
+\x1d\xa0\x75\x80\x0e\xd0\x3a\x40\x07\x68\x1d\xa0\x03\xb4\x0e\xd0\
+\x01\x5a\x07\xe8\x00\xad\x03\x74\x80\xd6\x01\x3a\x40\xeb\x00\x1d\
+\xa0\x75\x80\x0e\xd0\x3a\x40\x07\x68\x1d\xa0\x03\xb4\x0e\xd0\x01\
+\x5a\x07\xe8\x00\xad\x03\x74\x80\xd6\x01\x3a\x40\xeb\x00\x1d\xa0\
+\x75\x80\x0e\xd0\x3a\x40\x07\x68\x0f\xaf\xe7\x06\x43\x97\x92\x59\
+\xbc\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x04\xea\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x04\x9c\x49\x44\x41\x54\x58\x85\xe5\
+\x97\x5d\x6c\x14\x55\x14\xc7\x7f\x67\xa6\x5b\xaa\x15\x6a\x94\x34\
+\x68\x77\x66\xa7\x8b\x4d\x90\x54\x9f\x2a\x09\x0f\xf8\x81\x04\x12\
+\x91\x0f\x49\xd4\x10\x8d\x24\x08\x91\xf8\xe0\x83\x09\x0a\x4a\xe4\
+\x01\xc5\xfa\x62\x82\x12\x50\x43\x62\x4c\x78\x33\xb1\x81\x0a\x28\
+\x89\x04\x9e\x90\xd0\x84\x90\x54\x03\x59\xda\xdd\x9d\xd9\xa5\x62\
+\x8d\x09\x22\xa8\xed\xce\x3d\x3e\xec\x07\xb3\xdd\x6e\xbb\xad\xbe\
+\x71\x5e\x76\xe6\xdc\xff\x39\xff\xff\xbd\x77\xee\x3d\x67\xe1\x4e\
+\x37\x99\x09\xf8\x4a\x3e\xef\xc4\x0a\x66\xbd\x41\x56\x08\xea\xa0\
+\xc4\x11\x2c\x94\x3c\x42\x4e\xe0\x8c\x65\xd1\xe7\x38\x4e\xea\x7f\
+\x15\x30\x1c\x04\x4b\x2c\x43\x2f\xf0\x54\x23\x78\x85\xf3\x16\xb2\
+\x33\x91\x88\xff\xf0\x9f\x04\x0c\x0d\x0d\xb5\xd9\x76\xf3\x41\x84\
+\x8d\x25\xd7\x88\x42\x3f\xa2\x27\x54\x64\x38\x6c\x6a\x1a\xb9\x2b\
+\x0c\x4d\x18\x86\x0b\x54\x6d\x4f\x45\x57\x0a\xac\x03\x12\x25\xfc\
+\x71\x13\x8e\x6f\x4e\x26\x93\xd7\x66\x2c\x20\x08\x82\x87\x42\xa3\
+\x47\x41\x1e\x06\x46\x04\x76\xbb\x6e\xfc\x4b\x11\x29\x4c\x25\x5a\
+\x55\xad\x4c\x10\xbc\x28\x2a\xef\x03\x49\x04\xdf\x14\x64\x6d\x32\
+\x19\xbf\xd8\xb0\x80\x6c\x36\x9b\x54\xac\x73\xc0\x7c\x81\x23\x63\
+\x63\x7f\xbf\xd2\xd5\xd5\xf5\xc7\x54\xc4\x13\x2d\x95\x4a\xcd\x89\
+\xcd\x69\x39\x80\xb2\x19\xb8\x89\x5a\xcb\x3c\xaf\xe3\xc2\xb4\x02\
+\x52\xa9\xd4\xbc\x58\x73\xcb\x59\x60\xb1\xc2\x3e\xcf\x8d\xbf\x29\
+\x22\x66\x26\xe4\x65\x53\x55\xc9\xf8\xf9\x1d\x82\xee\x05\x72\x68\
+\xb8\xc4\xf3\xbc\x91\x28\xa6\x69\x62\x50\xac\xb9\x65\x7f\x91\x5c\
+\xfb\x3d\xd7\xa9\x21\xbf\x92\xcf\x3b\x76\xc1\x6c\x11\x78\x06\x70\
+\x01\x83\x92\x05\x3d\x06\xe6\x50\x94\x40\x44\x54\x55\x7b\xb3\x7e\
+\x2e\x09\x6c\x41\xec\xc3\xaa\xba\x42\x44\x74\xd2\x15\xf0\x7d\xbf\
+\xc7\xa8\x9c\x47\x19\x0d\xc3\xb1\xae\x85\x0b\x17\x5e\x8f\xcc\xc6\
+\xca\xf8\xf9\xb7\x05\x7d\x0f\x68\xa9\x33\xe9\x9b\x02\xef\xb8\x6e\
+\xfc\xd3\x28\xc9\xe0\xe0\x60\xf3\x3d\x73\xdb\x2e\x02\x8b\x50\x56\
+\x7b\x9e\x73\xbc\x3c\x66\x45\xa3\x8d\xf2\x61\x51\x39\x7b\x26\x92\
+\x67\xfd\xdc\x57\xa5\xa5\xac\x47\x0e\xd0\xaa\xb0\xcf\xf7\x83\x03\
+\xaa\x5a\x99\x5c\x77\x77\xf7\x18\xca\xbb\x00\x2a\xf4\x46\xc7\x2a\
+\x02\x32\x99\xcc\x03\x20\x4f\x03\xbf\xdf\xb8\x71\xfd\xf3\xea\x95\
+\xc9\xed\x02\x5e\x56\xa5\x21\x53\x64\x9b\xef\xe7\xde\x88\xfa\x12\
+\x89\x78\x1f\x70\x49\xe0\x91\x74\x3a\xff\x68\x8d\x00\x11\x7b\x0d\
+\xc5\x2d\x39\xd6\xdd\xdd\x3d\x56\xf6\x17\x4f\x04\xbb\x8a\x98\xc6\
+\x04\x14\x45\xf0\x81\xef\xfb\x0f\xde\xce\x2f\xaa\x70\x14\x40\x6c\
+\x7d\xae\x46\x80\x2a\x4f\x96\x22\xbf\xab\x4a\x24\xf6\xeb\x40\xac\
+\x71\xea\x8a\xb5\xaa\xca\xd6\xa8\x43\x54\xbe\x2f\x3d\x2e\xaf\x11\
+\x80\x88\x53\x7a\x48\x57\x4f\x45\x57\xcf\x82\xbc\x18\x0a\xcf\x56\
+\xa7\x1a\x1f\x06\x10\x88\xd7\x0a\x28\x39\x55\xc7\x47\x6e\x07\xa8\
+\x00\xc9\xd9\x0a\x40\x2b\x57\x32\x00\x85\x42\xa1\x9c\xbb\xa3\xfc\
+\x21\x5a\x35\x41\xd5\x26\x0d\x60\xa6\x8a\xb6\xa7\xc9\x1d\x4d\x6e\
+\xf2\xc5\xdf\xd8\x82\x0a\xa2\x78\x09\x65\x67\x2d\x00\xfc\xe8\x8b\
+\x6d\xb7\x96\x72\xcb\xd5\xf2\x05\x77\x5b\x80\x5a\x41\x11\x65\x3a\
+\x27\x24\x39\xce\x6c\x4d\xb5\x2a\xd6\xb2\x4c\x79\x3b\x73\x15\x5f\
+\x05\x2b\x9c\x06\xb0\x94\x55\xd1\x20\xc1\x7c\x06\xcc\xa6\x16\x8c\
+\x81\x39\x54\x95\x4b\x74\x25\x80\xa2\xa7\x6a\x04\xd8\x62\xfa\x8b\
+\x83\xb2\x7a\x60\x60\xa0\x72\xec\x12\x89\xc4\xcf\x82\x7e\xd2\x38\
+\xaf\x96\x84\xb3\xd7\xf3\xbc\xca\x89\x52\x55\x51\x58\x0b\x80\x91\
+\xbe\x1a\x01\xae\xeb\x5e\x05\x4e\x01\xf3\xef\x6f\x6f\xdf\x12\x4d\
+\x39\x3a\xfa\xeb\x5b\x34\xbc\x15\x82\xa2\x5f\xbb\x6e\x7c\x4f\xd4\
+\x1b\x04\xc1\x1a\x60\x31\xf0\x93\xe7\x75\x54\x7a\x83\xaa\x2f\xdc\
+\x12\xdd\x01\x20\x6a\xed\x4e\xa5\x52\xf3\xca\xfe\x9e\x9e\x9e\xf1\
+\xdf\x46\xaf\xad\x57\xd8\xc7\xd4\xdb\x51\x40\x75\xaf\xe7\x3a\x1b\
+\xa3\x55\x74\x70\x70\xb0\xd9\xa8\x14\xeb\x0c\xd6\xce\xba\xd5\x10\
+\x20\x93\x0d\x0e\x03\x2f\x09\x1c\x71\xdd\xf8\x86\x89\xe5\xd8\xf7\
+\xfd\x6e\x83\x6c\x43\x2b\xe5\x58\x81\xac\xc2\xb7\x1a\x5a\x07\x93\
+\xc9\x8e\xcb\x51\xbc\xaa\x8a\xef\x07\x07\x15\x79\x0d\xe1\x74\xc2\
+\x89\x2f\x9f\x52\xc0\xd0\xd0\x50\x9b\xdd\xd4\xfc\x23\xb0\x08\x95\
+\x8f\x13\x89\x8e\xed\xf5\x1a\x12\x55\xb5\x01\x44\x24\xac\x33\x2e\
+\xbe\x9f\xdb\xae\xf0\x11\x70\xd5\x12\x7d\xac\xb4\xd5\x15\x9b\xb4\
+\xbc\x14\xfb\x41\xce\x01\xf7\x21\x7c\x73\x77\xcb\x9c\x4d\xed\xed\
+\xed\x7f\x4e\x86\xad\x67\xa5\x1e\x60\x3f\xb0\x15\xb8\x65\x89\x3e\
+\xe1\xba\xee\xc0\x44\xdc\xa4\xb7\x9c\xe3\x38\x57\x42\x5b\x96\x02\
+\x97\x51\x36\xdc\xfa\xeb\x9f\x4b\x99\x4c\xf0\xaa\xaa\xd6\x74\x50\
+\x13\x4d\x55\xad\x6c\x36\xf7\x42\xeb\xdc\xb6\xc1\x12\x79\x0e\xb5\
+\x97\x4d\x46\x0e\xd3\xb4\xe5\xe9\x74\xfa\x5e\x2c\xfb\x0b\x41\x9e\
+\x2f\xb9\x72\xa8\xf4\x8b\xc8\x09\x28\x0c\x5b\x96\x35\x52\x28\x14\
+\x0c\x34\x2f\xc0\x0e\x13\x62\x58\x85\xc8\x3a\x4a\xf5\x43\xe0\xa4\
+\x31\x85\x4d\x9d\x9d\x9d\xbf\xd4\xe3\x68\xa8\xc2\x67\x32\xb9\xa5\
+\x22\xda\xab\xf0\x78\x23\x78\xe0\x82\x11\xdd\x91\x74\xdd\x93\xd3\
+\x01\x67\xf4\xd7\x2c\x9d\x4e\x7b\x58\xb1\xf5\x82\xae\x40\x71\x10\
+\xe2\x80\x0d\xe4\x04\x72\x06\x39\x83\x91\xbe\xce\xce\x8e\x4b\x33\
+\xc9\x7b\x67\xdb\xbf\x21\xb9\xe6\xce\xae\xea\xf6\xd6\x00\x00\x00\
+\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x02\x18\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x01\xca\x49\x44\x41\x54\x58\x85\xed\
+\x96\x3f\x48\xc3\x40\x14\xc6\xbf\x97\x0a\x29\x08\xd5\x5d\xa9\x8b\
+\xb8\x76\x15\x41\x5c\x8c\xae\xd2\x58\xc4\x21\x2e\xad\x2e\xba\x14\
+\x44\x5c\x9c\x3a\x38\x08\x2e\xc5\xa5\x56\x1c\x5c\x94\x92\x82\xd0\
+\x45\xb3\x08\x22\x38\xda\xd1\xc1\xa1\x38\xb8\x08\xfe\x19\x0a\x85\
+\xe6\x9e\x8b\xa9\x35\x35\x69\xd2\xbf\x83\xfd\xa6\x77\xc9\xcb\x7d\
+\xbf\xbc\xbb\x7b\x1c\xf0\xdf\x45\x6e\x2f\x17\x34\x6d\x58\x94\x83\
+\x29\x02\x47\x01\x4c\xb4\xe9\x55\x02\x58\x97\x2b\x81\xbd\x42\x21\
+\x53\x6e\x0a\xb0\xa0\x69\xc3\x5c\x0e\xde\x01\x1c\x69\xd3\xd8\x26\
+\x2a\xca\x15\x9a\xb1\x20\x24\xa7\x34\x51\x0e\xa6\x3a\x6f\x0e\x00\
+\x1c\xa9\xc8\x66\xca\x1a\x39\x02\x7c\x97\xbd\x4b\x22\xd5\x8a\x86\
+\x5c\xb2\x7e\xad\xb9\xa1\x67\x5d\xf7\x4b\x33\x29\x6a\x82\xff\x9a\
+\xdb\xb1\x02\xbd\xd2\x00\xa0\x61\x0f\xcc\xc7\x36\xc2\x64\x9a\x73\
+\x0d\xcf\xd5\xf8\x96\xd3\x24\x12\x49\x82\x85\x28\x8e\x06\x3e\xef\
+\x73\xb9\x9c\xd9\x32\xc0\xfc\x72\x7c\x9b\x84\xd8\x07\x51\x03\x18\
+\x81\xd2\x4e\x93\x30\x33\x40\x84\x37\x31\x72\xbb\x18\xdd\x58\xb9\
+\xca\x67\x5e\xbc\x02\xd4\x96\x40\x51\x13\xab\xc4\x74\x60\x87\xf2\
+\x23\x02\x66\x4d\x12\x17\xb1\x58\x2c\xe0\x1b\x00\xc0\x4e\xab\xc6\
+\x76\x88\x77\x33\x34\xed\x35\xbf\xfe\x6f\xed\x5d\xef\xc8\x87\xef\
+\x12\x80\xb1\x1a\x84\x24\x45\x00\xdc\xf9\x05\xf8\xd5\x68\x0c\x3d\
+\xeb\xb8\xe9\xec\x52\xd4\x04\x00\x6c\x5a\x63\xc1\xc2\xf3\xe9\xea\
+\xfb\x31\x1c\x00\x0c\x00\xfa\x0e\xd0\x72\xd7\x73\x13\x81\xd2\x8a\
+\x9a\x70\x6c\xdd\x00\x4a\x56\xd0\xa7\x0a\xb0\x6e\x45\x5d\xa9\x80\
+\xbb\xa8\x28\x57\xa4\x3d\x6b\xd4\xcb\x0a\x94\x00\x3e\xac\xbf\x11\
+\x03\x75\xed\x57\x51\xd7\x3f\x00\x0e\x75\xc4\x8a\x79\xcd\xc8\x9f\
+\x9c\x79\x49\xad\x55\x80\x20\x8c\x8e\x98\x03\x55\x32\xc5\x8d\xd7\
+\xe4\x9f\x25\xa8\x8a\x24\x18\xaf\x6d\xdb\x33\x76\xaf\x2f\x4f\x9f\
+\xbd\xa6\xd7\x2e\x0e\x4f\x8f\x0f\x9f\x93\x53\x91\x73\x92\x28\x0c\
+\x48\xe3\x00\x64\x5f\xb6\x40\x91\x88\x92\x86\x9e\x3d\xf6\xf1\xdd\
+\x40\xf8\x02\x67\xdb\x80\xa5\xc9\x72\x5a\xc9\x00\x00\x00\x00\x49\
+\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x03\x34\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x02\xe6\x49\x44\x41\x54\x58\x85\xe5\
+\x96\xcb\x6e\xd3\x40\x14\x40\xcf\x0d\x2c\x80\xcf\x48\xb3\x69\x0a\
+\x8b\x24\x3b\xd6\x69\x36\x48\xb4\xb5\xc3\x4b\x42\x2d\x10\x5b\xf0\
+\x01\x48\x7c\x03\x4b\x76\x48\x24\x40\x05\xe5\xd5\x26\x1f\xd0\x76\
+\xcb\x36\x29\x8f\xda\xbc\x62\x5e\x12\xfc\x01\xb0\x69\x2e\x8b\xd4\
+\xc1\x8e\xed\xc4\x29\xd9\x20\xee\x6a\x6c\xcf\xdc\x73\xe6\xce\xe8\
+\xca\xf0\xbf\x87\xf8\x83\x4a\xd5\x3e\xa9\xaa\xb7\x81\xa3\x2a\xdc\
+\xd8\xde\xa8\xb7\xa6\x09\x2a\x57\x2d\x43\x94\x9b\xc0\x2f\x54\xaf\
+\x6d\xb5\x1a\xcf\x01\x32\xfe\x04\x55\x6d\x00\x27\x80\x9c\x28\xeb\
+\x15\xc3\x3a\x37\x2d\x78\xa5\x6a\x9f\x17\x65\x1d\xc8\x01\xc7\x11\
+\xa9\xfb\xdf\x32\x7f\xa6\xe9\x91\xc0\x9a\x8c\x0a\x8f\xa6\x21\x51\
+\xa9\xda\xe7\x55\x75\x2d\xcc\xe2\x58\x44\x40\xc9\x5c\x07\x7a\xd3\
+\x94\xa8\x18\xd6\xb9\x18\x78\x0f\xd1\xeb\xfe\xc3\x21\x7f\xe0\xb9\
+\x6d\x77\x26\x5f\x7c\x0f\x2c\xf1\xe7\x6e\x08\xc2\x52\x6e\xb6\xf8\
+\xb6\xeb\xb6\x77\x27\x86\x0b\x8f\x22\x70\x58\xd9\x6a\x36\x9e\x44\
+\x04\xf6\x25\x5e\xc7\x48\x64\x26\x95\xd8\x87\xaf\x0d\xe5\xdf\x87\
+\xd7\x1f\x06\xe7\x86\x04\x7c\x89\xec\x6c\xe1\x83\x88\x44\x24\xb2\
+\xf9\xd2\x1b\x6f\x8c\x44\xd9\xb4\xcf\xd2\xdf\xf9\x58\x78\xac\x40\
+\x5f\xa2\xf3\x2a\x4e\x42\xc0\x18\x25\x51\x36\xed\xb3\x82\x0e\xc3\
+\x35\x09\x9e\x28\xe0\x4b\xe4\xe6\x4a\x5d\x60\x31\x8d\xc4\x7c\xb5\
+\x76\x46\xe0\x71\x0c\x7c\x39\x09\x3e\x52\x00\xa0\xeb\xb4\x13\x25\
+\x66\xe6\x0a\xae\xe7\x74\x1c\x1f\x8e\xca\xc4\x70\x02\x49\x47\xc6\
+\xbc\x69\x5d\x04\x56\x09\xdf\xe8\x3d\x44\x2f\xf4\x51\x31\x70\xd5\
+\x95\xad\x56\xe3\xc1\xb8\xdc\xa9\x04\x92\x24\x04\x7a\xda\x1f\x06\
+\xc5\x52\xc3\x61\xcc\x11\x04\xc3\x73\xdb\x2f\x67\xf2\x45\x8f\xe1\
+\x3e\x11\xde\xc4\x44\xf0\x89\x04\x02\x12\xdd\x21\x89\x01\x5c\x85\
+\x4b\xdb\xcd\xf4\x70\x08\x97\x2e\x55\x28\xf2\x93\xfe\x05\x0b\x87\
+\x88\x66\x7a\xfc\x98\x34\xdf\x44\x15\x28\x9b\xb6\x29\xe8\x93\x84\
+\x75\x82\x60\xe6\x66\x8b\x4e\xd7\x6d\x3b\x53\x17\x28\x57\x2d\x43\
+\xe0\x29\x70\x38\xf0\xda\xaf\x44\xb0\x63\x9a\xd9\x7c\x69\xd7\x73\
+\xdb\x6e\x9a\xbc\xa9\x8e\x60\xff\x67\x22\x02\x17\xf4\xb2\x0a\x97\
+\x08\x1f\xc9\x21\x41\x9f\x96\x4d\xdb\x4c\x93\x7b\x6c\x05\xe6\x0d\
+\x7b\x49\xe0\x59\x1c\x7c\xb3\xd9\x58\xf5\x9c\xf6\x8b\x5c\xbe\xf0\
+\x09\x64\x81\x70\xb3\x4a\x55\x89\x91\x02\xf3\x86\xbd\x84\x68\x04\
+\x8e\xca\x95\xad\x56\x7d\xd5\x7f\xd1\x75\x3b\x49\x12\x46\x36\x5f\
+\x72\x46\x49\x24\x0a\x8c\x86\xdf\xb9\x3f\x3c\xbf\xeb\x76\x5e\xcc\
+\xcc\x96\x3e\x23\x4c\x24\x11\x2b\x50\x31\x6b\x8b\x08\xeb\x69\xe1\
+\x7e\x78\x6e\x7b\x27\x51\x62\xae\xb8\xeb\x39\x51\x89\x88\x40\xc5\
+\xac\x2d\x2a\x12\x81\xab\x50\xdb\x6e\xd6\x13\xe1\x41\x89\xec\x5c\
+\xf1\x8b\xc0\x69\x86\xef\x44\x8c\x44\x48\xa0\x5c\xb5\x16\x40\x36\
+\x62\xe1\x1b\xf5\x7b\xe3\xe0\x03\x09\x27\xbd\xc4\x40\xa0\x6c\xd4\
+\x4e\x09\xd2\xfa\x5b\x78\x50\x22\x97\x2f\x7c\x05\x89\x48\xe4\xf2\
+\x85\x9d\xae\xdb\x79\x07\x81\x3e\x90\x11\xb9\x35\x0c\x17\xd4\x3a\
+\x08\xdc\x8f\xcd\x66\xe3\xae\xa0\x16\xe1\x3e\x71\x58\x91\x5b\x03\
+\xee\x80\x86\x06\x7f\xc9\x55\x50\x6b\xb3\xd9\xb8\x7b\x50\xf8\x18\
+\x89\xbd\x88\x40\x46\xf5\x2a\xe0\x01\xdf\x51\x5d\x99\x06\x3c\x28\
+\x01\x2c\x23\x7c\x03\x3e\x4a\x8f\xab\xd3\xca\xfd\xef\xc7\x6f\xcf\
+\x0b\x86\xc1\xfd\xdf\x90\xb9\x00\x00\x00\x00\x49\x45\x4e\x44\xae\
+\x42\x60\x82\
+\x00\x00\x02\x25\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x01\xd7\x49\x44\x41\x54\x58\x85\xed\
+\x95\x3d\x68\x13\x51\x1c\xc0\x7f\xff\x77\xfd\xc2\xc1\x28\x2d\x3a\
+\x74\x29\xda\x0e\xea\x10\xb1\x9b\xa5\x50\xc4\x24\x94\xc6\xc1\xe6\
+\x4e\xf0\x0b\xc1\x26\xd6\x2e\xdd\x9c\x83\x9b\x7b\xb7\x0c\xd2\xcd\
+\xc5\xa1\x4a\x44\xac\x8b\x07\xe9\x22\xd8\x51\x27\x3f\x26\xc7\xd2\
+\x49\x38\xcf\x7b\x7f\x87\x5c\x6c\x42\xaa\x4d\x0f\xab\x14\xee\xb7\
+\x1c\x77\xf7\xff\xf8\xbd\x7b\xef\xde\x83\x94\x94\x94\x94\xff\x8c\
+\x24\x4d\xbc\xe4\xdd\x1f\x75\x6c\xf4\x02\x34\x4b\x68\x47\x5f\x3f\
+\x7f\xfc\x35\x49\x1d\x93\x24\x29\x57\x5a\x9c\x70\x6c\xd8\x00\xcd\
+\x02\xd0\x2f\x1b\x05\x6f\x61\xfc\x9f\x08\xe4\xbc\xca\x79\x88\x1a\
+\x20\x63\x0a\x28\x00\x32\x66\x55\x1a\x85\xab\x77\xb3\x07\x2a\x50\
+\x70\xcb\xd3\x58\x7c\xe0\x04\xa0\x02\x91\x40\x04\x28\xca\x49\x6b\
+\x8c\x5f\x70\xcb\xd3\x07\x22\x90\x77\x2b\x45\xab\xac\x83\x1e\xd5\
+\xe6\xc0\x6d\xdb\x6b\x0b\xaa\x40\xc6\x2a\xeb\x97\xe7\x17\xe6\xfe\
+\xaa\x40\xae\x54\xbe\xa5\xaa\x6b\xc0\x10\xaa\x2a\x9d\xcd\x63\xc4\
+\xaa\xa2\xc0\x90\x88\x3c\xcb\xbb\x95\x9b\xbd\xd4\x76\xf6\x0a\xc8\
+\x97\xca\xcb\x40\x0d\x30\x8a\xaa\x88\xec\xd2\x3c\x56\x10\x94\xe6\
+\x9f\x65\x80\xf9\x53\x67\x26\xb7\x3e\x7d\xd8\x7c\x9b\x54\x40\x72\
+\xa5\xca\x43\xe0\x51\x7c\x6b\xa5\xb5\xe6\xfe\x8c\x8a\xc4\x3e\xc2\
+\xec\xf8\xb9\x0b\xf2\xf1\xfd\xa6\xbf\x2f\x81\x6a\xb5\x6a\x06\x46\
+\x26\x56\x80\x07\x71\xa9\xd6\x1c\xf7\x8c\xec\x5c\x66\x4e\x9f\x9d\
+\x1c\xbe\x7d\xed\xca\x2b\xdf\xf7\xbb\x6a\x74\x6d\x44\x9e\xe7\x0d\
+\x6c\xdb\xcc\x2a\x70\x3d\x0e\xd9\x77\xf3\xb6\xf2\x02\xda\x5a\x67\
+\x4f\xb6\x86\xcd\x9d\x77\xb5\x5a\xf8\x5b\x81\x62\xf1\xde\x91\x60\
+\x30\x7a\x0a\x32\x8b\x02\x46\x2c\x9a\xb4\xf9\x2f\x07\x51\x55\xd3\
+\x6c\xa4\x2f\x07\x03\xc7\xad\xd7\x6b\xdf\xba\x04\xe6\x6e\x2c\x1d\
+\xff\x1e\x84\x75\xe0\x62\xfc\xc8\xd2\xdb\x9c\xef\xed\x80\x88\xee\
+\x7c\x89\x8d\x30\xfa\x51\x7c\xb3\xb6\xba\x0d\xd0\xd7\x0a\x0a\x82\
+\xf0\xb3\x40\xa6\x2d\x2f\xd1\x36\xbd\x1b\xda\x39\x8e\xa9\x7e\xa7\
+\xef\x0b\x70\xac\xa3\x49\xe2\x53\x29\x25\x25\x25\xe5\xb0\xf3\x13\
+\x19\xff\x9a\x58\xf0\x37\x9f\x0a\x00\x00\x00\x00\x49\x45\x4e\x44\
+\xae\x42\x60\x82\
+\x00\x00\x03\xd3\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x03\x85\x49\x44\x41\x54\x58\x85\xe5\
+\x97\x4d\x68\x9c\x55\x14\x86\x9f\xf7\x66\xd2\x1f\xa1\xb5\x95\xa2\
+\x29\x36\xb4\x06\xad\x9a\x8d\x81\xd4\x49\xb2\xf0\xa7\xa5\xb4\x54\
+\x69\x93\x9a\x18\x11\xa9\x85\xa2\xb8\x70\x27\x08\x29\x2e\xa2\x28\
+\x1a\x70\xa5\x14\x45\x11\x44\xd1\x4d\x68\x33\x69\xa2\xa9\x16\x2c\
+\xe9\x42\xda\x69\xac\xa5\x0b\x43\x41\x88\xa0\x93\x46\x11\x94\x6a\
+\xb5\x3f\xcc\x77\x5f\x17\x33\x49\x93\x4e\x92\x26\x64\xe2\xa6\x67\
+\x73\x3f\xce\x77\xbe\xf3\x3e\xf7\x7e\xf7\xe7\x5c\xb8\xd9\x4d\xf3\
+\x09\x7e\xb0\xd7\xd5\x15\x09\x2d\x96\xb7\x5a\x54\x63\xd6\x09\x02\
+\x30\x8a\xc8\x19\x1d\x57\x42\x26\xdb\xa6\x1f\xcb\x0a\xd0\x94\x71\
+\x3a\xda\x5d\xc0\xe6\x39\x26\x1d\x4a\xa4\xfd\x43\xbb\xf5\xcd\x82\
+\x00\xea\xbb\x7d\x6b\x2a\x15\xdf\x07\x3d\x5d\x74\x8d\x61\xf7\x3b\
+\x84\x23\x4a\x18\x59\x12\x19\xbb\x92\x22\x3a\x52\x25\xb1\x41\x8a\
+\xdb\x40\xcd\xc0\xfa\x62\xf6\x01\x82\xf6\x65\x9b\xf5\xdb\xbc\x01\
+\x9a\x0e\xfb\xee\x98\xb8\x0f\xb8\x1f\x18\x13\xea\x5c\xb6\x9a\x8f\
+\x07\x37\x2b\x3f\x6b\x97\x3a\x1d\xd2\x75\x3c\x25\xfb\x0d\xa0\x46\
+\xe2\xe7\x68\xed\x3a\xf5\x84\xce\xce\x19\x60\xd3\x41\xd7\x54\x04\
+\x67\x81\x35\xc0\x61\x96\xe9\xd9\xec\x63\xfa\x6b\x56\xe1\xeb\x6c\
+\xc7\x80\x97\xfe\x71\x39\xbe\x07\xda\x87\xf9\x27\x58\x0f\x9d\x68\
+\xd3\x99\x1b\x02\x34\x0c\x78\x25\x97\x7d\x02\xa8\x05\xbf\x93\x3d\
+\x1b\x5e\xe2\x35\xc5\xf9\x88\x4f\x98\xad\x86\x5e\x3a\xb0\xdf\x04\
+\x72\x79\x2b\x7d\xba\x55\x63\x93\x43\x42\xc9\x47\x57\xe2\x01\xa0\
+\xd6\xa6\x7f\x41\xe2\x00\x92\xb3\x2d\x74\x19\x7f\x04\xac\x4b\xc9\
+\x9f\x61\x4f\xe9\xf4\x14\x80\xf4\x41\x6f\xc2\xda\x63\xf8\x3d\x49\
+\xb4\x67\x41\xe2\x93\x20\x2e\xe6\xc3\x8b\xc0\x39\x60\x4b\xc3\x21\
+\x76\xcc\x08\xa0\x0a\xbf\x05\x10\xac\xd7\x4f\xb7\xeb\xc2\x82\xc5\
+\x8b\x36\xdc\xae\xab\x42\xaf\x14\x14\xdd\x35\x79\x14\x26\x1e\xea\
+\x0f\x79\x6d\x4a\x1e\x05\xfe\xfc\x3b\xaf\xb5\xc3\xed\xba\x5a\x2e\
+\x00\xa0\x30\x1f\x32\x1e\x06\xee\x33\xaa\x1b\x5f\x15\x13\x23\x90\
+\x0a\xec\x04\x84\xfc\x65\xd9\xc5\x01\x24\xcb\xee\x03\x08\x8e\xbb\
+\xc7\xdd\xd7\x7e\x81\xe3\xa3\x85\x26\x7c\x55\x76\xf1\xa2\x45\x85\
+\xaf\x01\x2c\x6d\x29\x05\x40\xd5\x85\x86\x9f\x16\x0b\x20\x88\x11\
+\x00\xcc\xba\x69\x00\x0a\xce\x20\xc6\x58\x24\x5b\xbd\xb4\x98\x5b\
+\xdc\x39\x3e\x11\x4b\xf7\x81\xff\xcb\x5e\xa5\x04\x60\x14\xc0\x91\
+\xaa\xc5\xd2\xbc\x70\x69\x22\xf7\xf9\xf1\x3d\x66\x12\x80\x7f\x01\
+\x70\xe0\xae\xc5\x02\x48\xa0\xa6\xf8\x98\x1b\xf7\x4d\x00\xd8\x61\
+\x10\x20\x38\x6e\x5f\x2c\x00\x14\xb7\x15\xd5\x8e\x95\x00\x54\xa6\
+\xe8\x07\x30\x7a\xbc\xfe\x03\x57\x96\x5d\xdc\x16\x68\x17\x40\x54\
+\xc8\x94\x00\x7c\xdb\xac\xf3\xc0\x31\x60\x4d\xe5\xed\x3c\x57\x6e\
+\xfd\xc6\x1e\x76\x02\xb5\xc0\x0f\x43\x2d\x4c\xd4\x06\x53\x56\x41\
+\xb4\x3a\x0a\xb0\xee\x6c\x18\xf0\xca\x72\x89\xd7\x76\x7b\x89\x55\
+\x38\x67\x14\xb4\x1f\xc9\xd3\x02\x0c\xb5\x6a\xc8\xf8\x73\xe0\x0e\
+\x2e\xfb\x53\x3a\xbd\xf0\x65\x6a\x6b\x45\x2a\xbe\x4b\xa1\xf7\x83\
+\x27\x9b\xf9\x62\xf2\xeb\x12\x81\xe4\xda\xd1\xd9\x9c\x7e\x20\xbe\
+\xbd\x20\x08\x5b\xe9\x5e\x5e\x06\xbd\x00\x9c\x4f\x55\xe8\x99\xc9\
+\xbd\x87\x19\x4a\xb2\x62\x3d\x98\x05\x6e\x03\x7a\x96\xe7\xb5\x77\
+\xb0\x5d\x17\xe7\xa3\x5d\xdb\xed\x25\x2b\x52\xf1\x00\xe8\x79\xe0\
+\x5f\x47\x3d\x72\xaa\x4d\xdf\x5d\x1f\x37\x63\x51\x9a\xee\xf1\x46\
+\xe1\x3e\xe0\x5e\x60\xd4\x52\xe7\x2d\xab\xf8\x64\x2e\x45\x69\x63\
+\x1d\x6d\x2e\x14\xa5\xf7\x00\x39\x59\xcd\x27\x5b\xf5\xfd\x74\xe1\
+\xb3\x96\xe5\x75\x19\xaf\x5a\xea\xf8\x21\xe8\xc9\xa2\x2b\x67\xbb\
+\x3f\x54\x84\x23\x49\x9e\x91\x54\x64\xec\x52\x25\x71\x79\x42\x55\
+\x02\xeb\x43\x88\xdb\x5d\x28\xcb\xc7\x37\x9c\xa3\x31\xaf\xbd\x43\
+\xed\xfa\x75\x26\x8d\x39\x5d\x4c\xd2\x3d\x6e\x12\xee\x02\x1e\x9e\
+\x4b\xbc\xc5\x19\xa1\x8e\xec\x6e\x1d\xbd\x51\xec\xbc\xae\x66\x8d\
+\x19\x6f\x70\xa4\x05\x79\x2b\x50\x4d\xe1\x04\xad\x00\x72\x88\x1c\
+\xe8\x78\x48\xc8\x9c\x68\xd3\xb9\xf9\xe4\xbd\xb9\xed\x3f\x89\x47\
+\x63\xa6\x91\x26\x12\xd0\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\
+\x60\x82\
+\x00\x00\x00\xf0\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x00\xa2\x49\x44\x41\x54\x78\x9c\xed\
+\xd0\x41\x11\x00\x20\x00\xc3\x30\x0e\x6f\x28\xc0\x02\xfe\x2d\x80\
+\x8c\xf0\x68\x0c\xac\xb7\x31\xa0\xb5\xcf\x5d\xfb\x5c\xd9\x30\xe5\
+\xf8\x0f\x3a\x40\x07\x68\x1d\xa0\x03\xb4\x0e\xd0\x01\x5a\x07\xe8\
+\x00\xad\x03\x74\x80\xd6\x01\x3a\x40\xeb\x00\x1d\xa0\x75\x80\x0e\
+\xd0\x3a\x40\x07\x68\x1d\xa0\x03\xb4\x0e\xd0\x01\x5a\x07\xe8\x00\
+\xad\x03\x74\x80\xd6\x01\x3a\x40\xeb\x00\x1d\xa0\x75\x80\x0e\xd0\
+\x3a\x40\x07\x68\x1d\xa0\x03\xb4\x0e\xd0\x01\x5a\x07\xe8\x00\xad\
+\x03\x74\x80\xd6\x01\x3a\x40\xeb\x00\x1d\xa0\x75\x80\x0e\xd0\x3a\
+\x40\x07\x68\x1d\xa0\x03\xb4\x0e\xd0\x01\x5a\x07\xe8\x00\xad\x03\
+\x74\x80\xd6\x01\x3a\x40\xeb\x00\x1d\xa0\x3d\x9d\xfa\x04\x75\x0c\
+\x2b\x93\xd0\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x00\x68\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x00\x1a\x49\x44\x41\x54\x58\x85\xed\
+\xc1\x01\x01\x00\x00\x00\x82\x20\xff\xaf\x6e\x48\x40\x01\x00\x00\
+\x00\xef\x06\x10\x20\x00\x01\x47\x01\xa0\x88\x00\x00\x00\x00\x49\
+\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x04\xe8\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x04\x9a\x49\x44\x41\x54\x58\x85\xc5\
+\x97\xd9\x76\xe2\x46\x10\x86\xbf\x66\x11\x12\x60\x50\x9c\xc4\x9e\
+\xf1\x24\x39\x59\xde\xff\x9d\x72\x31\x9e\x49\x1c\xcf\x18\x6c\x23\
+\x19\x24\xa8\x5c\xd4\xdf\xa8\x91\x71\x72\x97\xd4\x39\x1c\x89\x56\
+\xd7\xf6\xd7\xd6\x0d\x58\x09\x16\xf8\xcf\xc9\x02\x58\x19\xa4\x7c\
+\x09\xac\x21\x58\xf7\x91\x4b\x20\x1a\x96\x25\xef\x93\x44\x4a\x5c\
+\xb3\x64\x6d\x9b\xac\xed\xf4\x7e\x00\x1e\x7a\xf2\x97\xc0\x3a\xf4\
+\x16\x0e\xc0\x05\x30\x00\xaa\x44\x59\x90\x11\x13\xd8\x0d\x21\x8c\
+\x81\x71\xcf\xa5\x16\xac\x81\xac\x95\x11\x51\xb9\x01\x0d\x90\x4b\
+\xfe\x23\x30\x3c\x75\xd8\xf7\x2d\xc0\x7e\x11\x34\x63\xb0\x99\xd6\
+\x33\xb0\xf7\xf0\x50\x82\xe5\x60\x13\xb0\x82\x57\x64\x85\xbe\x4d\
+\xb5\xf7\xca\x79\xc1\xd7\x2c\x93\xec\x5f\xc1\x2e\xfa\x10\x02\xf6\
+\x01\xf8\x24\x24\x0c\x78\x01\x0a\xd8\xbd\x87\xec\xa3\xbc\x00\x58\
+\xc8\x8b\x73\x94\x7e\x9b\xc0\xee\x06\xb2\x5b\x21\x92\x4b\xdf\x1a\
+\xb8\x81\x70\x0b\x30\x92\xf2\x80\xc3\x3e\x96\xf2\x1b\xe0\xde\x19\
+\xb2\xfb\x44\xf9\x04\x0f\x91\x71\x1a\xf7\xe8\xcc\x4c\xca\xf4\xcb\
+\xbe\xc2\xa6\x80\xd9\x18\x78\x07\x7c\x94\x8e\x41\x0f\x01\xfb\x4e\
+\xff\x2b\x08\x15\xd8\xb5\xbe\xfd\x09\xcc\x1d\x8d\xd5\x0c\x4a\x5c\
+\x70\xa8\xcf\x03\x60\x73\xa0\xc5\xf3\xa5\xd2\xf3\x80\x27\xf4\x0e\
+\x78\xc2\xe3\xff\x0d\xb0\x82\xb0\x19\x25\xdc\x63\x29\xcf\xe5\xdd\
+\x1a\xb8\x92\xc5\x39\x94\x4f\x82\x71\x02\x66\x1d\x0f\x24\x08\xe5\
+\xc0\xb3\x94\x95\x42\x38\x03\xee\xf0\xf0\x64\x10\x9e\x12\x07\x3b\
+\x28\xdc\x52\x9b\xc0\xcb\xb5\x18\x83\xa0\x5c\x48\x68\xa4\x39\x1e\
+\x86\xb9\xf8\x07\xfa\x1f\xd7\x22\x6d\xc4\xbb\x93\xac\x00\xdb\xf7\
+\x4a\xcc\x63\xee\xc5\x10\xbc\x73\x41\x15\x30\xfd\x8c\xc7\xb2\x96\
+\xf5\x23\xc1\x56\x43\x75\x09\xd3\xb5\x23\x75\x8e\x6c\x21\x99\x35\
+\x30\x95\x03\x53\xba\xd2\x1b\x49\xf6\x1c\x0f\xc1\x97\x14\x81\x09\
+\xb4\x2f\x49\x6d\x16\x8a\xb5\xe1\x96\x5d\xc3\x74\xe5\x48\xbd\x49\
+\xb1\xce\xbf\x17\x8f\x09\x89\x58\xb6\x2d\x3c\x36\x78\xe8\xfa\x21\
+\x68\x4a\x58\x3c\x74\xc6\x30\x54\x3e\xe4\x78\xd2\xfc\x25\xc1\x85\
+\xfa\x41\xee\x49\x67\xb3\xee\x3f\x05\x9e\x37\x5f\x61\x73\x29\xde\
+\x3c\x91\x09\x2c\x9e\x49\x42\x15\x0d\xc8\xbc\x8b\x91\x0b\xc6\x52\
+\x1e\xb4\x62\x5c\xe1\x89\xf6\x20\x48\x73\x3d\x83\xa0\x9d\xba\x0c\
+\xa6\xae\x9c\x06\x66\x0f\xda\xd7\xe2\x3d\xe5\x12\xef\x31\x43\x68\
+\x4c\xfb\x63\x1f\x20\x40\x50\xd7\x0a\x8f\xde\xb9\x82\x32\xdb\x0c\
+\x82\xfa\xbb\x35\x12\x36\x06\xee\x7b\xbd\xfd\xca\x8d\x8e\x7c\xb4\
+\x60\x7b\x7f\x86\x1d\xd8\x33\x5e\x86\x03\xba\x24\x3f\xa9\x82\x61\
+\x52\xdf\x49\x93\xa9\xd3\x3d\xda\xc7\xbd\x7b\x63\xe9\x30\xbb\x4b\
+\x1c\x8a\x94\x4e\x59\xc9\x0c\x55\xe7\x6c\xc7\x30\x82\xf1\x21\xf1\
+\x86\xe4\xbd\x4d\x84\x8c\x80\xc6\x3d\xb7\x35\xea\x4c\x78\x46\x5b\
+\xd2\x1f\x52\x4a\x1d\x78\x35\x3d\x07\xc9\x73\x7f\x86\xb9\x4f\x87\
+\x9e\xc0\x3e\x9d\x6b\xcf\x96\xbc\xbf\xda\x17\x85\xed\xa0\x51\x57\
+\x0b\xd6\x6d\x0e\x06\xf5\xb0\x67\xc0\x30\x81\x7d\xa5\xdf\x32\x99\
+\x27\x7d\x83\x4f\x46\x6e\xdf\x98\x94\xa1\x55\x29\xf5\xac\x2d\xfa\
+\x75\xdf\xe2\x09\xa7\x79\x1e\x62\xdb\xbe\xa6\x3b\x03\x44\x0a\xaf\
+\xdf\xad\x00\x3b\xee\x8b\x39\x60\xca\x70\x53\x19\xce\x34\x58\xc0\
+\x4b\xb3\x94\xe2\x02\x6f\xb9\x6a\x36\x96\x42\xdc\x00\xdf\x4a\xb8\
+\x49\xb6\x0e\x21\x16\x3b\x20\x32\x76\x1f\xf9\xa2\x01\x3b\x08\x43\
+\x95\xdb\xd6\x0f\x24\x34\xfe\xdf\xc0\x33\x7f\x23\x21\x9f\xff\x61\
+\x1a\xee\x38\x9e\x76\xd6\x25\x2c\xef\x3a\x07\x79\xc0\x4b\x38\xee\
+\xd9\xc1\x49\x08\xc6\x75\xe2\xf5\x16\x35\x0a\x51\x05\x2f\x3f\xc9\
+\xf3\x73\x99\x7e\xb4\x40\x1e\x7e\x80\xe5\x53\xb7\xbc\x2a\xa4\x1c\
+\x37\x6c\xbc\x89\x5f\x06\x09\xe3\x06\xea\xb2\x63\xa2\xf6\x86\x14\
+\x0f\x1a\xf9\x2d\x3e\xdd\xfa\x67\xc1\x94\x22\xd4\x7f\xe0\xed\x36\
+\xf8\xb3\x4c\x86\x57\x36\x93\x31\x27\x21\xd8\xfb\xe6\xe2\x19\xec\
+\x86\x6e\xe0\x14\xf8\x49\xe6\x77\x3c\x9e\x7b\xa0\x74\xa4\xea\x41\
+\x97\xa0\xf5\x50\x02\xd5\x21\x8f\x7b\x7f\xc6\xbb\x9f\x8e\x77\x2c\
+\xa1\xb8\x95\xcc\x6d\x6a\x00\x6e\x40\x78\x06\x1b\xd0\xc5\x7c\x24\
+\x6f\x0e\x10\x36\x60\x2d\xf0\x0c\xe1\xe5\x3c\x00\x36\x77\x19\xa0\
+\x83\xeb\x67\x7c\x96\x6c\x24\x73\xe5\xf9\xd3\x45\x31\x0d\x41\xe3\
+\x93\x2d\x3c\x42\x7d\xe1\x9e\xb2\x96\xf5\x5b\xe5\xc7\x71\x8c\xbe\
+\x4d\x36\x56\xe8\x1a\x3c\xd1\xd6\xc0\x25\x54\x33\x47\xc3\x66\x5a\
+\x3f\x09\xc1\x57\xe0\x07\xdf\x6c\x4b\x60\x06\x2f\x41\x93\x74\x42\
+\x67\xb2\x0e\x97\x55\x05\x85\xd1\x75\xcf\xd8\xac\x0a\x3c\xdb\x77\
+\x38\xf3\xc2\x8d\xaf\xa7\x30\x9d\xe3\x13\x76\xe3\x8e\x87\x4d\x62\
+\x40\x30\xb0\x03\x5e\xeb\x01\xf8\x04\x45\x34\x86\x0e\x56\xf0\x30\
+\x4c\x75\xf4\x36\x21\x18\xe2\x1c\x59\x38\x82\xc7\xbd\x17\x6e\xcc\
+\xf4\x8b\x64\xc5\xd9\x72\xee\x50\x63\x17\xba\x34\xf4\x2f\x26\x0b\
+\xa8\x7e\xec\x2e\x23\xff\x76\x31\x01\xe7\xad\x3e\x74\x65\x7d\x72\
+\x31\xf9\xed\xcc\xc5\xe4\xd8\xdb\xf7\x82\x6d\x20\x2b\x33\x1c\xfe\
+\x81\x7f\x6f\x32\x79\x30\x84\x71\x7a\xf7\xcb\x75\x30\x6e\x7d\xd4\
+\x8e\x6a\xbc\x67\xec\xc5\xdb\xd0\x0d\xa6\x35\xc9\xd5\xec\x8d\xcb\
+\x69\xf4\xe2\x98\x70\xc3\xe4\x7d\xa2\xf7\x09\x6c\x35\x3b\x26\x95\
+\x94\x18\xdd\xe5\x54\x06\xb9\xb0\x18\xf3\x9e\xc3\x6b\xf8\x9f\xaf\
+\xe7\x7f\x03\x88\x7c\xd3\x3b\xed\x32\x4f\xdf\x00\x00\x00\x00\x49\
+\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x00\x8f\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x00\x41\x49\x44\x41\x54\x58\x85\xed\
+\xd3\xa1\x11\xc0\x20\x14\x04\xd1\x85\x9a\x28\x00\x93\x5a\x70\x14\
+\x83\x4a\x31\x99\xa1\x81\x14\x85\xc2\x22\xf9\x66\x9f\x3a\xb7\xea\
+\x40\x92\x14\x2c\xed\x51\xda\x98\x40\xbd\x54\xfd\xfe\xb7\x3f\x00\
+\xf9\x4a\x50\x3a\xf0\x05\x92\x24\x85\x5b\x1c\x18\x0a\x07\xd4\x09\
+\xe9\x09\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x00\xd2\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x00\x84\x49\x44\x41\x54\x58\x85\xed\
+\xd2\xb1\x0d\x82\x50\x18\xc4\xf1\xff\xf7\xdc\x81\xc4\x3d\x18\x80\
+\x4d\x2c\x6c\xe8\x1c\x41\x98\x81\x06\x13\x6b\x67\xb0\xb4\x77\x10\
+\x13\x76\xd0\xb3\x52\x21\x24\x76\x0f\x9a\xfb\x75\x97\xf7\x25\x77\
+\xc5\x03\x33\x33\xb3\x95\xc5\x34\x2a\xaa\x63\xb3\xc9\x59\x78\x6b\
+\x9b\x27\x84\x66\x03\xca\xba\xab\x90\x2e\xc0\x36\xe7\x80\x80\x01\
+\xb4\xbb\x9f\x0e\x57\x80\xf4\x7d\x91\xfa\xdc\xe5\x00\x82\xe2\x45\
+\x3a\x7f\x72\xfa\x77\xbc\x84\xdf\x80\x88\x1a\x78\xe4\x2e\x0c\x18\
+\x14\xec\x47\x79\x6c\xf9\x4f\x68\x66\x66\xb6\xba\x37\x95\x79\x1e\
+\x09\xc0\xb2\x67\x2f\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\
+\x82\
+\x00\x00\x00\x85\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x00\x37\x49\x44\x41\x54\x58\x85\xed\
+\xce\xc1\x0d\x00\x30\x08\x03\x31\xd4\xfd\x87\x04\x31\x08\x1d\x02\
+\x9e\xbe\x7f\x22\x47\x2c\xca\xea\xc9\xea\xd9\x7c\xbc\xcd\xf8\x22\
+\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x80\x0f\
+\x7e\x19\x07\x85\xa1\xbf\xac\xe9\x00\x00\x00\x00\x49\x45\x4e\x44\
+\xae\x42\x60\x82\
+\x00\x00\x01\xd2\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x01\x84\x49\x44\x41\x54\x58\x85\xed\
+\x97\xcd\x4a\x23\x41\x14\x85\xbf\xd3\xba\xd5\x85\x32\xfa\x26\xe9\
+\x0c\x8a\x2f\x90\x61\x04\x03\x3e\x84\x60\x56\x62\xe6\x11\x26\x82\
+\x0b\x23\xb8\x1f\xdc\x0d\xd8\xe0\x22\x2f\x30\x20\xa6\x7d\x13\x15\
+\x07\x24\x6b\xfb\xcc\xc2\xae\x20\x49\x6c\x31\x76\x74\xc0\x3e\xab\
+\xe2\xd6\xa5\xce\x57\x3f\x14\xf7\xc2\x67\x97\x46\x03\xf5\x33\xaf\
+\x65\xb8\x8d\xa8\x0b\xbe\x94\x61\x62\xb8\xc5\xf4\x23\xd4\xe9\x37\
+\x75\xf1\x2c\x40\x9c\x78\x0f\x7c\x30\x09\xac\x24\x65\x58\xfb\x69\
+\x53\x87\x63\x00\x71\xe2\x75\xf0\x1f\xe0\x1e\xab\x15\x3d\xd0\xbb\
+\xdc\xd6\xdf\x32\x5c\xbf\xfe\xf6\x52\x36\x47\x03\xb9\x0b\x2c\xca\
+\xda\x08\x27\x31\x1f\x92\x6c\xef\x4b\x08\xab\x95\x36\x75\x5a\x86\
+\x71\x50\xbe\x91\xd3\x5a\x62\x09\xff\xca\x70\x1b\xf8\x0e\x10\x0d\
+\xb3\x44\x1d\x20\x7a\xa0\x57\xa6\xf9\x88\x7a\x00\x12\x71\x08\x0c\
+\x01\xc2\x83\x2b\xeb\xd8\x27\xe9\x6a\x4b\x77\xf9\x70\x65\x0c\xe0\
+\xa3\x54\x01\x54\x00\x1f\x0e\x30\xff\x52\x42\x7c\xe6\x1d\xe4\x9f\
+\xc0\xc2\x2b\xd7\x1e\x60\xfd\x48\x9b\x3a\x29\x4a\x2a\x3c\x81\xf8\
+\xdc\xab\xc8\xc7\x53\x98\x03\x2c\x20\x77\xe3\x73\xaf\x4e\x0d\xf0\
+\x1e\x2a\x04\x48\x37\x75\x8d\xb5\x0b\x0c\xa6\x58\x7b\x80\xd5\x4a\
+\x37\x75\x5d\x94\xf4\xe2\x1b\xc8\xef\xb0\xf0\x1e\xdf\xa2\xff\xfb\
+\x0a\x2a\x80\x0a\xe0\x5d\x01\x0c\xb7\xf0\x58\x40\xce\xca\xac\x96\
+\x78\x39\x1f\xde\x8c\x01\x60\xfa\x00\xd9\x1c\x8d\x59\x01\xc0\xe3\
+\xda\x36\x69\x08\x0c\x3f\xa2\x08\x75\x8c\xbf\x21\x77\x6b\x89\x05\
+\xf4\x9e\xd4\x70\x6f\x52\xbe\xf3\x86\xf0\x11\x90\x45\xa8\x13\xe6\
+\x26\x35\x26\x1d\x66\xf7\x36\x9e\x6f\x4c\x82\x42\x6b\x96\x97\xce\
+\x2b\xa3\xf3\x53\xea\xc6\x26\x9d\xd4\x9a\x55\xfa\x07\xf1\xe4\x84\
+\x86\xea\x09\x57\xf9\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\
+\x82\
+\x00\x00\x04\x8a\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x04\x3c\x49\x44\x41\x54\x78\x9c\xed\
+\x9b\x4f\x88\x1c\x45\x14\xc6\xbf\xd7\x33\x99\xc4\x3f\x2b\x62\x16\
+\x15\x24\x78\x11\xff\x5c\x04\x77\x3b\x7a\xf0\xe0\x22\x26\x12\xc1\
+\x3f\x2c\x22\x1e\x04\x35\x9a\x99\xd9\x24\x33\xbb\x11\x09\x28\xea\
+\xb8\x98\x80\x41\x31\x6e\x8f\xba\x99\x4e\xc4\x1c\x44\xd1\x53\x0c\
+\x62\x64\x83\xb0\x90\x83\x91\xd9\x59\x30\x20\x82\x78\x10\x11\x49\
+\x84\x28\xea\x06\x75\x37\x5d\x9f\x87\x5d\x35\xe9\xea\x68\x26\xa9\
+\xaa\x2e\x70\x7e\xc7\x3a\xd4\xf7\xea\xab\x57\xaf\x5f\x75\xcf\x00\
+\x3d\x7a\xf4\xf8\x3f\x23\xa6\x26\x0a\xcb\x13\xcf\x43\xe4\x19\x01\
+\x48\xca\xb6\x99\xb8\x36\x6e\x6a\x6e\x9b\x04\xc6\x66\x12\x79\x16\
+\x40\x81\x40\x11\x82\x46\x58\x6d\x0e\x19\x9b\xdb\x22\xe6\x0c\x38\
+\x6d\x2e\x0a\xc8\xfd\x03\x23\x13\x83\x06\xe7\xb7\x82\x31\x03\x08\
+\xa8\xd4\x50\x5f\xa0\xe4\xe3\x70\xe4\xd5\xeb\x4c\x69\xd8\xc0\x98\
+\x01\x02\x30\x63\xb8\x1f\x2a\x38\xb8\x7a\xe3\xeb\xab\x4c\xe9\x98\
+\xc6\xe4\x11\x38\x13\xab\x98\x24\x53\x83\xe5\x97\xfb\x1d\x68\x75\
+\x8d\x0b\x03\x00\xe0\x7a\x91\xd2\x81\x5b\xd7\xef\xe8\x73\xa4\x77\
+\xd6\x58\x33\x80\xd4\x8e\x44\x38\xbf\xec\x82\x7d\xd7\xd4\xa2\xe5\
+\xb6\x34\xcf\x05\x6b\x06\x88\x40\x21\x55\x17\x08\xdc\x7e\xe9\x3c\
+\xde\x19\x6a\x34\x8a\xb6\x74\xbb\xc5\xf6\x11\x50\x80\xa4\x33\x61\
+\x78\xee\xe8\x65\xbb\x00\x1a\x6b\xc2\xce\x07\x07\x35\x80\x0a\x4c\
+\x9b\x20\x8f\x85\xe5\xe8\x45\xfb\xda\xff\x8d\x9b\x22\x28\x4c\xf7\
+\x08\x80\xc8\xd6\xb0\xda\xdc\xea\x44\xff\x5f\x70\xf5\x14\x00\x80\
+\x44\x1b\x21\x77\x0c\x96\x27\x1e\x77\x18\x83\x86\x4b\x03\xb2\xba\
+\x45\x88\x48\x6b\x75\x25\x1a\x76\x19\xc7\xa9\x38\x35\x60\xa9\x5b\
+\x4c\x9b\x10\x10\x78\x37\xdc\x10\xdd\xe1\x32\x96\xbf\xc5\x73\xd0\
+\x24\xa0\xd5\x84\x12\x02\xec\x0b\xab\xd1\xcd\xae\x83\xc9\xc3\x00\
+\x00\x42\xea\x85\xf1\x22\x10\x1f\x0d\x6c\xdc\x79\x83\xcb\x48\x72\
+\x32\x00\x10\x0a\x33\x6a\xc2\x4a\x49\x8a\x07\x6f\xda\xf4\xda\xd5\
+\xae\xe2\xc8\xcd\x00\x60\xb1\x26\xa4\x4d\x10\xf0\xaa\xc2\x49\x35\
+\x75\x63\x75\xf2\x72\x17\x31\xe4\x6a\x00\xb0\x64\x82\x7e\x6f\xb8\
+\xb6\xc4\x85\x03\xb7\xd4\xa2\x4b\x6c\xeb\xe7\x6e\x00\xb0\x78\x6f\
+\xa0\xfe\x3e\x61\x20\x59\xc0\xfe\xa1\x47\xde\x5a\x61\x53\xdb\x0b\
+\x03\x00\x40\x00\x85\x74\x26\x10\xb7\xcd\x95\x7e\x7d\xcf\xe6\xe5\
+\xc9\x1b\x03\x00\x00\x92\x61\x82\xe0\x9e\x13\xc7\xfa\xf7\xa0\xd1\
+\xb0\x12\xab\x5f\x06\x00\x80\x88\x62\xea\x06\x49\xf2\xe1\xf0\xe8\
+\xca\x97\x6c\xdc\x20\xfd\x33\x00\x84\x80\x0a\xd4\x5e\x31\x3e\x11\
+\x96\x9b\x4f\x99\x56\xf3\xd0\x80\x45\x44\x24\xd1\xca\xa2\x60\x7b\
+\x58\x8d\x2a\x26\x75\xbc\x35\x80\x00\x32\xba\x45\x80\x98\x0c\x2b\
+\xd1\xfd\xa6\x74\xbc\x35\x00\x00\x24\xbb\x65\x16\x00\x4d\x53\x1a\
+\x5e\x1b\x00\xe0\x4c\x75\xcf\xd8\x63\xd1\x9b\x97\x93\x59\x2c\x2d\
+\x3d\x6b\x93\xde\x34\xa5\xe1\xaf\x01\x02\x28\xa2\x90\xde\x7f\x81\
+\x6c\x6a\xb7\x6a\x6f\x98\x92\xf1\xd4\x00\x01\x49\x6d\xf1\xa4\x3c\
+\x37\x13\x9b\x5b\x3c\xe0\x6f\x0d\x08\xb4\x9d\x17\x44\x9d\x78\xf3\
+\x36\xd3\x42\x1e\x66\x80\x04\x7a\xe5\xe3\xdb\xed\x2b\x7e\xdc\x92\
+\xf1\x8d\xe1\xbc\xf1\x2b\x03\x08\x6d\xf1\x02\x7e\x48\xae\x58\x8f\
+\xf1\x71\xbd\x27\x30\x80\x47\x06\x48\x00\x41\x6a\xf1\x38\x54\xbc\
+\x30\x79\xa0\x13\x57\x16\x6c\xa9\xfa\x71\x04\x88\x00\x72\xfa\xce\
+\x13\xf8\x9c\x5c\x7e\xf7\xa7\x3b\xeb\xbf\xd9\x94\xf6\x21\x03\x24\
+\xbd\xf3\x20\xbe\x2e\x26\xea\xce\x4e\x5c\xf9\xd9\xb6\x78\xae\x06\
+\x70\xb1\xd7\x09\x52\x83\xdf\x17\x83\x64\xcd\x67\x7b\xc6\x8e\xb9\
+\x88\x21\xcf\x23\x20\xa2\x6f\xc0\x4f\xc2\x60\xed\xe1\x5d\xf5\x6f\
+\x5c\x05\x91\x4b\x06\x50\x32\x76\x1e\x38\xa1\x02\xdc\xd5\xde\xbd\
+\xf9\x0b\x97\xb1\xe4\x61\x80\x08\x35\xdd\x05\x12\xc3\xb3\x93\xf5\
+\xc3\xae\x83\x71\xfc\x71\x94\x59\x3b\x4f\x11\x3e\xd4\x89\xeb\x53\
+\x2e\x63\xf9\x0b\xa7\x35\x40\x20\xba\xe1\x64\xb5\xdd\x1a\x7d\xdf\
+\x65\x1c\xa7\xe2\x32\x03\x0a\xe9\x01\x01\x9f\x9e\x89\x47\x63\x87\
+\x31\x68\x38\x31\x80\x59\x3b\x0f\xbc\xd2\x6e\xd5\x73\xff\x99\x8c\
+\x83\x23\x20\x81\x40\xeb\xf2\xf6\x76\x5a\xb5\x27\x6d\x5c\x6e\xba\
+\xc5\x76\x06\x64\xdc\xec\xf0\x41\xdf\x95\xc7\x37\xf8\xb0\x78\xc0\
+\x62\x06\x90\x08\x24\xdd\xe2\x02\xd3\x17\xff\xd1\xf7\xe0\xf4\x78\
+\xfd\xa4\x2d\xdd\x6e\xb1\xf9\x43\xc9\xf4\xe2\x67\x0b\x25\xdc\x3b\
+\xbd\xf7\xd1\xdf\x6d\x69\x9e\x0b\xae\x1e\x83\x5f\xcd\xcb\xb2\x75\
+\x47\x9a\x23\xbf\x38\xd2\x3b\x6b\x5c\x18\xf0\x1d\xa9\xd6\x1c\x69\
+\x8d\xfc\xe0\x40\xab\x6b\x4c\xfe\x61\x22\xeb\x05\xfe\x71\x55\x48\
+\xd6\x76\xe2\xb1\x6f\x4d\xe9\x98\xc6\x58\x06\x64\xdc\xec\xe6\x44\
+\xa9\x75\xb3\xad\x2d\x5f\x9a\xd2\xb0\x81\xc1\x0c\xf8\xe7\x13\x16\
+\x21\x14\xf0\xbe\xf6\xee\xb1\xb6\xa9\xf9\x6d\x61\xf0\x5f\x63\xc1\
+\x76\x21\x12\x40\x12\x80\x2f\xb4\x5b\xa3\x9f\x18\x9b\xbb\x47\x8f\
+\x1e\x3d\x2c\xf1\x27\x17\xaf\x43\xaf\x5e\x06\xce\xc3\x00\x00\x00\
+\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x08\xd7\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x08\x89\x49\x44\x41\x54\x78\x9c\xed\
+\x5b\x6d\x70\x54\xd5\x19\x7e\xde\x73\x77\x37\xb0\x24\x7c\x64\x11\
+\x13\xd4\xd1\xa0\x65\x30\x54\x66\x60\xb3\x50\xd4\x46\xb0\x76\xa4\
+\x1d\xc1\x62\xbb\x56\xed\xa8\x80\x24\x21\x40\x56\x60\xac\x1d\x9c\
+\xd1\x4b\x5a\xa9\xf5\x2b\x26\xbb\x60\x08\x04\x0a\x2a\xd3\x19\xd3\
+\x11\xa6\x38\x80\x4c\x6b\xc3\x50\x0b\x21\x1b\xed\x50\x05\x3a\x7e\
+\x80\x94\x49\x88\x95\xcf\x60\x24\xd9\xdd\xf3\xf6\x47\x10\xee\xc7\
+\xee\x66\x6f\x72\x37\x86\x36\xcf\xbf\xfb\x9c\xe7\xbc\xfb\xdc\x77\
+\xcf\x3d\x7b\xee\x39\xef\x02\x03\x18\xc0\x00\xfe\x9f\x41\x7d\xf1\
+\x21\x13\xe7\x06\xaf\x52\x32\xa8\x10\x90\xb7\x80\x69\x1c\x08\x63\
+\x98\x31\x9c\x80\xa1\x00\x14\x80\xce\x01\x38\x07\xe6\x63\x20\x1c\
+\x02\x70\x50\xc4\x68\xcf\xfe\xda\xb2\x23\xe9\xf6\x96\xb6\x04\x78\
+\x8b\x83\x37\x0a\xc2\x1c\x66\xcc\x02\x61\x42\x0f\xc3\x1c\x61\xf0\
+\x0e\x21\x79\x63\xe3\xba\xc7\xc3\x00\xb1\xad\x26\x61\x7b\x02\x98\
+\x7c\x25\xc1\xbb\x19\xf4\x24\x80\xe9\xf6\xc6\xc6\x87\x04\xaa\x90\
+\xec\x7a\xa3\x69\x6d\x49\xc4\xae\xa0\xb6\x25\xc0\x5b\x5c\x35\x9d\
+\x88\x5e\x00\x50\x60\x57\xcc\x78\x60\xe0\x28\x98\x57\x34\xad\x0d\
+\xbc\x66\xc7\x88\xe8\x75\x02\xa6\xcc\xaf\xbc\x3a\xaa\x88\x97\x09\
+\xf8\x45\x12\x99\x24\xe0\x3d\x10\xd7\x4b\x29\x0e\x03\xb1\x4f\x1d\
+\x44\xa7\xa4\xe2\x68\x8b\x7e\x1d\x8b\x29\x83\xa2\x59\x60\xc7\x30\
+\x62\xe4\x49\xa6\xb1\x04\x9e\x0a\xc2\x0f\x01\x0c\x4e\x62\x7c\x0f\
+\xa4\x28\x6d\x5c\xb7\xf8\xa3\xde\xf8\xef\x55\x02\x0a\x16\x04\x27\
+\x83\xb1\x15\x40\x6e\x9c\xe6\x36\x00\xdb\x89\xb0\x8d\x14\xb1\x73\
+\xff\xea\xc5\x27\xad\xc4\x9e\xba\xb4\x62\x70\xe7\x57\x8e\x3b\x09\
+\x98\x09\xc2\xac\x04\x9f\x71\x01\xc0\xbc\x70\x4d\xe0\x0f\xd6\xdd\
+\x77\xa1\xc7\x09\xf0\x16\x87\x1e\x22\xe2\x0d\x00\x32\x4c\xa6\x98\
+\x83\x1d\x8a\xf3\x77\xff\xac\x5e\x78\xba\xa7\xf1\xb5\xc8\xf7\xab\
+\x2e\xf7\x88\xec\x22\x22\x7a\x86\x81\x51\x26\x01\xd3\xca\x70\xee\
+\x97\xcf\xa0\xbc\x5c\x5a\x8d\x6d\x3d\x01\xaa\x2a\xbc\x27\x46\x3e\
+\x4b\xe0\xe5\x86\x16\x49\x84\x0d\x22\x8a\xf2\x86\xda\xc0\x71\xcb\
+\x71\x53\xc0\x6d\xf3\x9e\xcf\xea\x70\xb8\x97\x81\xf8\x09\x00\x99\
+\x86\xe6\xad\xed\x8a\xf2\xf0\xc1\x57\x17\x9d\xb7\x12\xd3\x5a\x02\
+\x54\x55\x14\xb4\x8c\xdc\x0c\xe2\x07\x74\x3c\xa3\x19\x02\xb3\xc3\
+\x6b\x02\xfb\x2d\xc5\xeb\x21\xa6\xcc\x0f\x5e\x1b\x53\xb0\x05\xe6\
+\x09\xf7\x03\xc5\x85\x69\x0d\xa1\xc0\xb9\x54\x63\x09\x2b\x1f\xec\
+\x6b\xcd\x5e\x61\xbc\x79\x02\xf6\x31\x62\x05\x7d\x75\xf3\x00\xd0\
+\x50\x1b\x38\xee\x74\x47\x0b\x19\xd8\x6c\x68\x9a\x28\x3b\x79\xb3\
+\xdf\xff\xa6\x92\x6a\xac\x94\x85\xbe\x92\xd0\xcf\x19\x08\x69\x39\
+\x22\xda\x34\xa4\x23\xcb\xbf\x77\x7d\xe9\x99\x54\xe3\xd8\x85\xe3\
+\xfb\xde\x89\xb6\x34\x6d\xdf\x32\xda\xd7\xd8\x0e\xe0\x2e\x5c\x1a\
+\xcd\x34\xf6\xcc\xa0\xb6\x41\xcd\x4d\x3b\xff\x9c\x4a\x9c\x94\x1e\
+\x81\xc9\x25\xa1\x02\x09\xde\x03\x60\xd0\x65\x96\xdf\x08\xd7\x04\
+\x1e\x49\xc7\xea\xcc\x2a\x0a\x8a\x83\x4b\x40\x78\xc5\x40\x3f\x1a\
+\xae\x09\xbc\xd6\x5d\xdf\x6e\x1f\x81\xc9\x8b\x56\x79\x62\xc0\x56\
+\xe8\x6e\x1e\xfb\x33\x3b\x86\x16\xf5\x87\x9b\x07\x80\xf0\xda\xb2\
+\x2a\x80\x7f\x6f\xa0\xd7\x79\x8b\x57\x4d\xea\xae\x6f\xb7\x09\x90\
+\x11\xf9\x02\x81\xaf\xb9\x44\x30\x9a\x63\x4e\x9a\x5d\xbf\x71\xee\
+\x05\xeb\x56\xd3\x05\xe2\x33\x2e\x2a\x05\xe1\xef\x1a\xd2\x45\x24\
+\xd7\x4d\x53\x55\x47\xb2\x9e\x49\x13\xe0\x2d\xae\xbc\x1d\x84\x79\
+\x1a\x8a\xa5\x82\x9f\x7e\xb0\xaa\xac\xb9\x37\x76\xd3\x81\x4f\x42\
+\x81\x0e\x25\x2a\xef\x03\xf0\xa5\x86\x9e\xd4\xd6\xe2\x59\x98\xac\
+\x5f\x92\x04\x30\x11\x89\xe7\x0c\xdc\xe6\xf7\xab\x03\xfb\x7a\x6e\
+\x33\xbd\x68\xa8\x5d\xd2\x0a\xc6\x4a\x2d\x47\x84\xa7\x27\x3c\xfc\
+\xe2\x90\x44\x7d\x12\x26\xc0\x57\x14\x2a\x04\x70\xbb\x86\x8a\x40\
+\xc4\xd4\xde\xdb\x4c\x2f\x32\x3b\xb3\xd6\x00\x38\xa6\xa1\x46\x3a\
+\xdd\xae\x92\x44\xfa\x84\x09\x60\x81\x5f\xea\x09\xd4\x84\xab\x97\
+\x7d\xd6\x6b\x87\x69\x46\xfd\xc6\xb9\x17\x88\x60\xf8\xa2\xc4\xb2\
+\x44\x6b\x83\xb8\x09\xf0\x2d\x5c\x9d\x03\x60\x86\x86\x8a\x28\x52\
+\x3e\x6b\x97\xc9\x74\xe3\x86\x93\x39\xaf\x33\xf0\xf1\x37\xd7\x04\
+\xbe\xe6\x53\x4f\xeb\x5d\xf1\xb4\x71\x13\x20\x63\xd1\x87\xa0\x59\
+\x24\x11\xf0\x6e\x43\xed\x92\x56\xdb\x9d\xa6\x09\x75\x75\xf7\xc7\
+\x88\x50\xa7\xe5\x04\xf3\xa3\xf1\xb4\x71\x13\x40\xa0\x99\x06\xe6\
+\x4f\x76\x99\xeb\x2b\xb0\x94\x46\xcf\x3f\x8e\xf7\x18\x98\x12\x70\
+\x71\xc6\xbc\x55\xcb\x49\x8e\xbd\x6d\xaf\xbd\xf4\xa3\x29\xf7\x74\
+\x23\x00\xed\xa8\x1d\x76\xc4\x73\xc2\x6b\xd4\x99\x12\x90\xe1\x76\
+\x7d\x0f\x80\xeb\x32\x43\xff\x68\x5a\xbb\xe4\x98\x51\xd7\xef\x51\
+\x5e\x2e\x01\xd6\x7d\x71\xcc\xe6\x7d\xca\x38\x8f\x80\xf8\xae\x81\
+\xd8\x63\xab\xb1\x3e\x04\xb3\xde\x3b\x31\xc6\x1b\x35\xa6\x04\x30\
+\xf3\xcd\xba\x6b\xc8\x8f\x8d\x9a\x2b\x05\x82\xa1\xf7\x4e\xb8\xd9\
+\xa4\x31\x12\x44\xb8\x41\x47\x30\xf5\xfb\xdf\xfe\x84\x70\x3a\x8c\
+\xde\xf3\x8c\x12\xf3\x08\x20\x64\x69\xaf\x49\x50\x9f\xbf\xeb\xdb\
+\x85\x21\xed\x6e\xa3\xf7\x2c\xa3\xc6\x3c\x07\xb0\x5e\x24\x98\x2d\
+\xed\xb1\xf5\x27\xd4\x6f\x9c\xd3\x01\x20\xaa\xa1\x5c\xf9\x7e\xd5\
+\xa5\xd5\xc4\x5b\x07\xe8\x36\x49\xa2\x42\xf6\x8b\x77\xfe\x74\x21\
+\x5e\x02\xda\x74\x02\x56\x4c\xc3\xe6\x4a\xc1\xb4\x39\x1b\x33\x00\
+\x68\xf7\x03\x3a\x0f\xd6\x95\x77\x6a\x35\xe6\x49\x10\xd0\xed\xa8\
+\xb2\xe4\xe1\xe9\xb1\x97\x7e\x7c\xed\x38\x3b\xcc\x40\xb5\x19\x35\
+\xe6\x49\x10\xf4\xb9\xf6\x9a\x84\x79\xe6\xbc\x52\xc0\x8a\x63\x8c\
+\x9e\xc0\x51\xa3\x26\xce\x24\xc8\x87\xb4\x97\x04\x7c\xc7\x66\x5f\
+\x7d\x06\x09\xa9\xf3\xce\x84\xc3\x46\x8d\x39\x01\x24\x74\x87\x8d\
+\xcc\xba\x4d\x91\x2b\x0a\x0c\x83\x77\xa6\x0f\x8d\x1a\x53\x02\xda\
+\x15\xda\x0b\x40\x7b\xfe\x3e\x69\xca\xfc\xe0\xb5\xb6\xbb\x4b\x37\
+\x54\x55\x10\x70\x8f\x96\x62\x85\xeb\x8d\x32\x53\x02\xba\xce\xd6\
+\x68\xaf\x96\x8b\x2a\x74\x8f\x51\xd7\xdf\xe1\x6b\x1e\xe1\x85\xfe\
+\x44\xf9\xdc\xd0\x51\x27\xc3\x46\x5d\xfc\x2d\x31\xd6\xbf\x45\x11\
+\xf1\x2c\x5b\xdd\xf5\x05\x84\xd0\x79\x66\x60\x67\x7d\x79\x79\xd4\
+\x24\x8b\xd7\x37\xe6\xa2\xcd\x00\x2e\x1f\x35\x33\xee\x9c\x38\x37\
+\x78\x95\xdd\x1e\xd3\x06\x55\x15\x0c\xfc\x4c\x4b\x11\x78\x53\x3c\
+\x69\xdc\x04\x5c\xdc\xf7\xdf\xa5\xa1\x32\x14\xa7\xe9\x38\xbc\xdf\
+\xc2\xd7\xea\x79\x10\xc0\x38\x0d\x75\x22\x33\xe7\xd4\xae\x78\xda\
+\x84\xbb\xc2\x04\x7e\x49\x4f\xd0\xa2\x89\x8b\x56\x5d\x6f\x8b\xc3\
+\x34\x22\xdf\xaf\xba\x98\xf1\x1b\x1d\x49\xf4\x4a\xbc\xe1\x0f\x24\
+\x49\x40\x63\x4d\xe0\x5d\x00\xda\xc9\xd0\x25\xa2\x72\x85\x1d\x26\
+\xd3\x09\xb7\xc7\x53\x0c\xfd\x6b\xef\xa9\x8c\xce\xf6\xea\x44\xfa\
+\x24\x27\x43\xc4\x20\x7a\x4a\xc7\x00\x8f\x4c\x2a\xad\x32\xed\xab\
+\xf5\x17\x78\x8b\x5f\x1a\x49\x8c\xa7\xb5\x1c\x33\x7e\xfb\xde\x86\
+\x5f\x99\x96\xc0\xdf\x20\xe9\xd9\x60\x78\x4d\x59\x3d\x18\xaf\x6b\
+\xf5\x42\xd2\x96\x29\xf3\x2b\xaf\xee\xa5\x57\xdb\x91\xef\x57\x5d\
+\x24\x5c\x7f\xd4\xd5\x10\x31\x0e\x00\x19\xc1\x64\xfd\xba\x3d\x1d\
+\xee\x14\xce\x27\xa0\xdf\x5d\xbd\x2e\xe6\x10\x6f\xdd\x54\x16\x34\
+\x16\x47\x7d\xab\x70\x67\x67\x57\x81\x71\x87\x86\x8a\x40\xa0\xa8\
+\xbb\xa2\xca\x6e\x13\x70\x60\x4d\xe9\x17\x52\xe0\x27\x00\x3a\x2e\
+\x91\x8c\x5b\x87\x77\xe0\x55\x80\xfb\xa4\xd6\xb8\x3b\xf8\x4a\x42\
+\x0b\x01\x5a\xa0\x67\xa9\x34\x95\xb2\x9d\x94\x4a\x64\x5a\xc2\x3b\
+\x8e\x8f\xf6\xcd\xf8\x1c\xa0\xd9\x97\xe3\x63\xe2\xe8\x82\xc6\xdc\
+\xe1\x63\x26\xef\xfa\xcf\xc1\xdd\x31\x8b\x9e\x6d\x02\x93\xb7\xd8\
+\x13\x00\xa1\x0a\xfa\x8d\x9c\xca\x70\x4d\xe0\xb9\x44\xbd\xb4\x48\
+\xb9\x46\xa8\x39\xbc\xf3\xc0\x68\xef\x0c\x37\x88\x6e\xd3\xd0\x5e\
+\xa7\xdb\x5d\x98\x3b\xe9\x07\x6f\xb7\x34\xed\x6a\x4f\x35\x96\x1d\
+\xc8\xf7\xab\xae\xeb\xbf\x7f\xa0\x86\xba\x26\xea\x4b\x37\x4f\xc0\
+\x3b\x99\x39\x27\xe7\x1e\xdd\xbd\x3b\xa5\x9a\x41\x4b\x55\x62\x79\
+\xa7\x73\x9f\x62\xd0\x16\x1d\xc9\xb8\x03\xe4\x6a\xf4\x16\x87\x6e\
+\xb1\x12\xab\x37\x98\xb0\xa0\x7a\x94\x3b\xdb\xf3\x17\x80\x1e\x33\
+\x34\x7d\x14\xe9\x88\x3d\x90\xe8\x37\x3f\x1e\x2c\x3f\xc3\x7e\xff\
+\x9b\xca\x91\x11\x2d\x2f\x82\x68\xa9\xa1\x29\x42\x84\xea\x0e\x38\
+\x57\x1e\x58\x53\xfa\x85\xd5\xb8\xa9\x60\xea\xd2\x8a\xc1\x91\xaf\
+\x1c\x8b\x41\x58\x0e\x60\x84\xae\x91\xb0\x83\x65\xc6\x83\x4d\x6b\
+\x4b\xce\x5a\x89\xd9\xe3\x49\xac\xa0\x24\xf4\x18\xc0\xd5\x00\x9c\
+\x86\xa6\xf3\x20\x7e\x59\x71\x52\x85\x95\x82\xc5\x64\x98\xa6\xaa\
+\x8e\xb6\x96\xec\x39\x20\xb1\x42\x57\xaf\x74\x19\x15\x79\xa7\x72\
+\x9e\xac\xab\xbb\xdf\xf2\x5c\xd4\xab\x59\xdc\x57\x52\x59\xc8\x10\
+\x6f\x01\xf0\xc4\x69\x3e\x0d\x60\x1b\x80\x6d\x8a\x0b\xbb\xac\x26\
+\x23\xdf\xaf\xba\xdc\xc3\x3d\x85\xa4\x60\x26\x4b\xdc\x0b\x42\xbc\
+\x65\x78\x04\xa0\xd2\x70\x4d\xd9\xfa\x1e\xd8\x07\x60\x43\xb9\xbc\
+\x6f\xe1\xea\xeb\x38\x16\xab\x04\x70\x5f\x12\x59\x04\x84\xdd\x90\
+\xf8\x2b\x04\xfd\x4b\x30\x7f\xc2\x8a\x72\xea\x02\xd3\x79\xb7\x23\
+\x1a\x13\x91\x68\x96\x64\xc7\xb0\x28\x23\x8f\x04\x8d\x05\xcb\xa9\
+\x00\xdd\x8d\xae\xbf\xd4\x24\x72\xde\x28\x89\x4b\xdf\xaf\x7e\xbc\
+\xa9\x37\xfe\x6d\xfb\x1d\x2f\x28\x0a\xfd\x08\x82\x9f\x07\x90\xde\
+\xc9\xb0\xab\x2e\xf9\xd7\x79\x27\x73\x6a\x7b\x32\xe4\x8d\xb0\x77\
+\x21\xa3\xaa\x62\x72\x6b\xf6\xbd\x12\xb4\x1c\x0c\x9f\xad\xb1\x41\
+\x9f\x81\x65\x45\x66\xe7\xd0\xf5\x76\xd6\x28\xa6\x6d\x25\xe7\x2b\
+\x5a\x35\x5e\x0a\x9e\x43\xe0\x59\x00\xc6\xf6\x30\xcc\x09\x30\xb6\
+\x13\xc9\x4d\x8d\x39\xa7\xff\xd6\x93\xff\x03\x74\x87\x3e\x59\xca\
+\x5e\x9c\x27\xa6\x83\x79\x3c\x40\xe3\x40\xc8\x03\x30\x0c\x5d\xcf\
+\xb8\x83\x41\x67\x89\x71\x0e\xc4\xff\x26\xc2\x61\x29\x71\xd8\x41\
+\xd8\xdd\x50\x53\x76\xa8\xbf\x94\xe3\x0e\x60\x00\x03\xf8\xdf\xc4\
+\x7f\x01\x33\x41\xc7\xce\x61\x76\x81\xea\x00\x00\x00\x00\x49\x45\
+\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x04\x77\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x04\x29\x49\x44\x41\x54\x78\x9c\xed\
+\x9b\x4f\x88\xdb\x45\x14\xc7\xbf\x6f\x92\xad\x55\xd9\x5e\xb6\x78\
+\xa9\xc5\x9b\x7f\xc0\x93\x95\x1e\xbc\x18\x6a\x92\x1a\xa1\x5b\x1b\
+\xb2\xa2\x54\xb0\xdd\x64\xb5\x20\x1e\x14\x29\x28\x6a\x0c\xb6\xa0\
+\x08\x16\x2a\xe8\xba\x49\x64\x0f\x56\x51\x37\xe9\xba\x88\x5b\x93\
+\x2c\x2c\x08\x2a\x88\x82\xd0\x22\x88\x07\x91\x56\x50\x28\x45\x69\
+\x89\x74\x93\x79\x1e\xb2\x5b\xd2\xdf\xfc\x0a\x9b\xee\xcc\xfb\x0d\
+\x34\x9f\xdb\xce\xe1\x7d\xdf\x7c\x99\x79\x33\x6f\x33\x3f\x60\xc8\
+\x90\x21\x37\x32\x64\x2b\x50\x32\x3b\xf9\x3a\x11\xbd\x02\x28\x66\
+\xe6\x23\xad\x7a\xa5\x64\x2b\xb6\x4b\x94\xad\x40\x44\xea\x55\x80\
+\x62\x00\xc7\x41\x28\x26\x73\x85\x84\xad\xd8\x2e\xb1\x66\x40\x7f\
+\x2c\x02\x08\x8c\x85\xf4\x44\x61\x87\xc5\xf8\x4e\xb0\x69\x80\xee\
+\xff\x83\x80\x51\xee\xe2\xd4\xc3\x13\x93\x77\x59\xd4\xb0\x8e\x4d\
+\x03\xd8\x18\x21\x6c\xed\x6a\xd5\x4c\xef\x3d\xb8\xdd\xa2\x8e\x55\
+\x6c\x1a\x70\x2d\xb6\x73\x3c\xd6\x48\x3c\xf1\xf4\x56\x01\xad\x81\
+\x91\x30\x00\x00\xee\x1e\xb9\xac\x17\xc7\xc7\x27\x47\x85\xf4\xd6\
+\x8d\x33\x03\x98\x39\xb8\x25\xee\x6f\x6f\x52\xf3\x99\xcc\x73\x37\
+\xb9\xd2\xbc\x1e\x9c\x19\x40\x44\x1a\xc1\xba\xc0\xd8\xd5\xb9\xa5\
+\xfd\x71\x22\x51\x8c\xbb\xd2\x1d\x14\xd7\x5b\x40\xc3\x5c\x09\xd9\
+\x91\xb1\x73\xd3\xb0\x78\x09\xdb\x08\xee\x6b\x40\xd8\x4a\x00\xf2\
+\xa9\xdc\xd4\x9b\xce\xb5\xd7\x81\x54\x11\xd4\xc6\x08\xf3\xe1\x54\
+\x36\x7f\x58\x48\xff\x9a\x48\x19\x00\x00\x5d\x63\x84\xe8\xad\x54\
+\x2e\x5f\x10\xcc\xc1\x40\xd2\x80\xb5\xed\x70\x35\x4c\x1f\x24\x73\
+\x85\xac\x68\x1e\x7d\xc8\x1a\xc0\xcc\x20\x63\x3b\x28\x62\x7c\xf2\
+\x50\x76\x2a\x29\x9a\xcb\x9a\xb8\xb8\x22\x83\x61\xd6\x84\x4d\x8a\
+\x78\x7e\xf7\x44\x7e\xa7\x74\x3a\xf2\x06\xf4\x60\x32\xb7\xc3\xad\
+\x5a\xd3\x57\xc9\x7d\x85\x7b\x24\x13\x89\xca\x80\xb5\x9b\x62\xd0\
+\x84\x31\x52\x68\xee\xca\xe6\xef\x90\xca\x23\x32\x03\x56\x61\x32\
+\x6b\xc2\xb6\x18\x51\x23\xbd\xef\xd0\x6d\x12\x09\x44\x6d\x00\x98\
+\xc1\x80\x71\x5b\xbc\x53\xab\xce\x62\x66\xff\xfe\x2d\xae\xf5\x23\
+\x37\xa0\x87\x79\x5b\x24\xe0\xbe\x4e\xfb\xe6\x85\xc4\x81\x03\x9b\
+\x5d\x2a\x7b\x62\x00\x00\x40\xf7\x56\x43\x1f\x84\x07\x47\x2e\xc6\
+\x3e\x75\xd9\x3c\xf9\x64\x00\x88\x48\xb3\xd1\x41\xd2\xf8\xc8\xd8\
+\xb9\x4a\xb1\x58\x74\x92\xab\x57\x06\x00\x0c\xea\x9d\x0c\xc1\x9a\
+\xf0\xd4\xb7\xa7\xcf\xbe\x0d\x07\x1d\xa4\x67\x06\x5c\xc1\xbc\x32\
+\x83\x5e\x48\xe5\x0a\x2f\xd9\x16\xf2\xd5\x00\x00\x64\x36\x4f\x8c\
+\xa3\xa9\x5c\xfe\x19\x9b\x2a\x1e\x1b\xc0\x00\xa0\x8d\xcd\xc0\xf4\
+\x7e\x3a\x5b\xc8\xd9\x52\xf1\xd8\x00\x00\xbd\xa2\x10\xdc\x0e\x04\
+\xc2\xbb\xb6\x04\x7c\x37\x00\x14\x52\xf6\x98\x61\xed\x58\xf4\xde\
+\x00\xe6\xb0\x1c\xb9\x6a\x2b\xbe\x37\xff\x9d\x0d\x87\x63\xc1\x93\
+\x8f\x88\x9e\x6d\xd4\x2a\xef\xd9\x52\xf0\x78\x05\x98\x93\x07\xe1\
+\xb5\xc6\x5c\xd9\xda\xe4\x01\x7f\x0d\x50\x21\x77\x9e\xe3\xcd\xb9\
+\xca\x11\x07\x42\x3e\x41\x00\xb3\x82\x39\xfb\x8f\x1e\xb8\x77\xdb\
+\xf3\x08\xfb\x01\x76\x83\x78\x56\x03\xb4\x02\x5d\x5d\xf7\x19\xf8\
+\xf2\xc2\x98\x9a\x2c\x95\x4a\x21\xb7\xc3\x8d\xe3\xcd\x0a\xe0\xde\
+\xb2\x0f\x4e\xfe\x9b\x4b\x6a\xf4\xb1\x1f\x67\x66\x56\x5c\xe9\x7a\
+\x61\x00\x33\x14\x99\x15\xef\x67\x28\xb5\xe7\xbb\xcf\x8f\xb5\x5d\
+\x6a\x47\xbf\x05\x88\x88\xc0\xc1\x3d\xff\x9b\x5e\xe1\xdd\x4b\x0b\
+\xe5\x7f\x5c\xcb\x47\xbb\x02\x88\x68\xb5\xe8\xf5\x8d\xe1\xcf\x58\
+\x37\x9e\x5a\x5a\xa8\xfc\x25\x91\x42\x64\x06\xf4\x1e\x52\x05\x26\
+\xcf\xb8\xa0\x98\xd2\xa7\xe6\xa7\x7f\x97\xca\x23\x2a\x03\x88\x4d\
+\xed\x4b\x0c\x3c\xf2\x75\xad\x7c\x46\x32\x11\x79\x03\x08\x14\xa2\
+\xbb\x02\xd2\xd9\x56\xbd\xf2\xbd\x74\x3a\xd2\x06\x10\xb4\xa1\xc9\
+\x0c\x7a\xb2\x39\xf7\x61\x43\x38\x17\x00\xf2\x06\x28\xe3\xb0\x63\
+\x1c\x6a\xd5\xca\x9f\x09\xe7\x71\x05\xc9\x63\x30\x16\x1c\x20\xe6\
+\x97\x1b\xf5\xea\x8c\x60\x0e\x06\x52\x2b\x20\xac\xa7\x7f\xa7\x51\
+\xaf\x46\xfe\x4c\xc6\xbd\x01\xa1\xcd\x0d\xcf\x36\x6b\xd5\x17\xe1\
+\xa0\xb9\x19\x14\xd7\x06\x18\xcd\x0d\x01\x5f\xac\x9c\xbf\x7d\x0a\
+\x1e\x4c\x1e\x70\xfb\x50\x32\xac\xad\x5d\xbe\x3c\xda\x79\x7c\x79\
+\xb9\xd4\x71\xa5\x3b\x28\x2e\x1f\x4a\x06\x3b\xbb\x9f\xe2\x9b\xdb\
+\x7b\x97\x67\x67\xff\x73\xa5\x79\x3d\x48\x15\xc1\x5f\x95\x8e\x67\
+\x16\x4f\x9c\xf8\x57\x48\x6f\xdd\x48\x18\x70\x96\x95\x4a\x35\x4e\
+\x4e\xff\x2d\xa0\x35\x30\x36\xef\x01\x61\x3f\x5c\x9e\x67\x8d\x74\
+\xab\x36\xf3\x87\x45\x1d\xab\x38\xf9\x64\x66\x95\x8b\x9a\x29\xd3\
+\x3a\x59\xf9\xc5\xa2\x86\x75\xec\x7d\x34\x85\xfe\x57\x5f\xcc\x20\
+\x7e\x74\xa9\x5e\xfe\xc1\x56\x7c\x57\x58\xfc\x6a\x8c\x8f\x82\xd0\
+\x05\xb8\x0b\xe0\x8d\xe6\x5c\x75\xc9\x56\xec\x21\x43\x86\x0c\x71\
+\xc5\xff\x03\xa1\x32\xbd\x29\x9d\x1e\xd2\x00\x00\x00\x00\x49\x45\
+\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x00\x68\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x00\x1a\x49\x44\x41\x54\x58\x85\xed\
+\xc1\x01\x01\x00\x00\x00\x82\x20\xff\xaf\x6e\x48\x40\x01\x00\x00\
+\x00\xef\x06\x10\x20\x00\x01\x47\x01\xa0\x88\x00\x00\x00\x00\x49\
+\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x03\x17\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x02\xc9\x49\x44\x41\x54\x78\x9c\xed\
+\xd6\x4d\x48\x54\x51\x18\x06\xe0\xf7\xbd\x5e\x4b\xb2\x20\x82\xa0\
+\x08\x8c\x56\x41\x41\x54\xd2\x38\x1a\x84\x45\x04\x26\x29\x26\xcc\
+\x22\xca\x12\xa2\x9f\x45\x8b\x08\xa2\x82\x90\xa0\x45\x60\x05\x6e\
+\x82\x28\x88\x6a\x11\xf8\x33\x57\xa4\xbf\x4d\xf4\x03\xe6\x38\x30\
+\x81\x9b\x16\x19\x05\xad\xa2\xac\xb0\x20\x35\xaf\xf7\x6d\x23\xe4\
+\x5c\x2b\xcc\xb9\x33\x41\x7d\xcf\xf2\x7c\xe7\xbc\x7c\xe7\xbb\x1c\
+\x66\x00\x63\x8c\x31\xc6\x18\x63\x8c\x31\xc6\x18\x63\x8c\x31\xc6\
+\xfc\x2f\x98\x6b\x40\x45\xb7\x56\x21\xd0\x0d\x00\xcb\x04\x5e\x4c\
+\x37\xe0\x3c\x48\x45\xd0\xdb\x4f\xc5\xba\xd4\x00\xaa\x15\x00\x1c\
+\xf2\x48\xaa\x81\xf7\x72\xc9\xcb\x7d\x00\xc9\xe0\x31\x80\x4d\x3f\
+\x12\x75\xf3\xcb\xb8\xb3\xff\x79\x82\xdf\x72\xcd\xce\x22\x31\xee\
+\xe1\xb8\xa0\x73\x53\x56\x87\xfd\xf7\x5c\x9c\x39\xc8\xf1\xd9\xc6\
+\x3a\x11\xb4\x96\x9d\x21\xee\x59\xe0\xea\xfe\x5a\x4f\x0b\x23\xc8\
+\x06\x00\x54\x3f\x94\x1b\xf7\x82\x4b\xa1\xcb\x03\x11\x7c\xc0\x9c\
+\x07\x30\x01\x1e\x06\xf0\x2e\xb4\xbc\x79\xae\xd4\x5b\xd5\xa5\xe5\
+\xb9\xe6\x57\xb7\x6b\xfe\xc8\x27\x75\x0b\x3c\x34\x75\x5d\xc0\x18\
+\x1d\xee\xce\xe5\xeb\x03\x11\x4c\x10\x00\x62\x3d\x5a\x41\x5f\xf7\
+\x00\xac\x0c\x95\xde\x52\xac\x4d\x35\xf2\xd9\x6c\x72\xcb\xbb\xb4\
+\xd4\xa5\x6e\x03\x58\x1f\x2a\x7d\xa4\x58\x97\x6a\x64\xef\x6c\x72\
+\xa7\x8a\xe2\x09\x20\x5d\xc7\xd7\x8e\xcf\x2a\x00\x4f\x42\xa5\x25\
+\x82\x9e\xc4\xba\x54\xfb\xa7\x99\x1b\x3a\xb5\xba\xd8\x51\x0a\xd3\
+\x2f\xff\x4a\x60\x65\x14\x97\x07\x22\x1a\x00\x00\xf4\x25\xf8\x71\
+\x51\x09\xb7\x01\xba\x95\x55\x20\x4a\x49\xf5\xc4\x3d\x1d\x9e\x69\
+\x56\x2c\xa9\x2d\x8e\xa3\x5e\x09\x65\x59\x05\xa1\x7f\x8e\xcf\x78\
+\x7a\x27\x5f\x44\xd3\x75\x44\x4f\x20\x4b\x8b\x9c\x8a\x35\xc1\x59\
+\x90\x27\xa7\x17\xd5\xda\x3f\xe0\x9c\xc0\x19\x06\xbf\x3a\x1e\x4b\
+\xaa\x89\xd0\x55\x00\xc5\xa1\x46\xbd\x71\x97\xbb\x33\x75\xfc\x1a\
+\x65\xbb\xd1\x0f\x60\x52\x85\xa7\x03\x90\x2e\x01\x28\x9a\xba\x2e\
+\xa8\x7d\xde\xb0\xb3\xf7\x51\x33\x47\xb3\x0e\x48\xac\xf0\x70\x1a\
+\xd0\x99\xe9\x69\x6a\x2b\xf3\x9d\x63\x1d\x09\x4e\x44\xdd\x67\xde\
+\x06\x00\x00\x71\x4f\x35\x0a\xd4\x01\xa2\x34\x54\xea\x15\x58\x9f\
+\xde\xc9\x0f\x00\xb0\xaa\x5d\x73\x16\x14\x05\x97\x41\xee\x0b\xed\
+\x13\xc8\xa3\xfd\x0d\x6c\xcb\x57\x8f\x79\x1d\x00\x00\x54\x76\x6a\
+\x5d\xe0\xe8\x0e\x80\xa5\xa1\xd2\x60\x11\x59\x33\x36\x8e\x21\xb7\
+\x58\x9d\x10\xb6\x86\xea\xa3\x12\x77\xa5\x1b\xe9\xe5\xb3\xbf\xbc\
+\x0f\x00\x00\xca\xdb\x55\xe6\xba\xba\x0b\x60\xf5\x0c\x8f\x0c\x41\
+\xdc\xd1\xdf\xc8\x54\x3e\xfb\x02\x22\xfc\x15\xf8\x9d\x4c\x82\x6f\
+\x7c\x9f\x1b\x09\x3c\x98\xc1\xf6\x41\xa7\x88\x95\x85\xb8\x3c\x50\
+\xa0\x01\x00\x40\x26\xc1\xe1\xcf\x3e\xb7\x13\xba\xfe\xab\x3d\x12\
+\x9e\xfa\x2e\xab\xfa\xea\xf9\xb2\x50\x7d\x15\xe4\x09\x64\x91\x18\
+\x4f\x06\x2d\x22\x5b\x42\x95\x4e\xc7\x67\x53\x5f\x82\x23\x85\x6c\
+\xa7\xf0\x03\x98\x14\x4b\x4e\x5c\x21\xd8\x0c\x40\x82\x2e\xa4\x07\
+\x9c\x53\xbf\xfb\x7f\xf0\x4f\xaa\x7e\x28\xb7\xfa\x9a\x4a\xfe\x76\
+\x1f\xc6\x18\x63\x8c\x31\xc6\x18\x63\x8c\x31\xc6\x18\x63\xcc\x7f\
+\xe2\x3b\x5f\x7a\xf2\xea\xb1\x6e\xd0\x9c\x00\x00\x00\x00\x49\x45\
+\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x08\x6c\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x08\x1e\x49\x44\x41\x54\x78\x9c\xed\
+\x5b\x7d\x8c\x1c\x65\x1d\x7e\x7e\x33\xb7\x7b\x77\x70\x1f\x10\xe8\
+\x51\xb3\x1f\xb3\x7b\xd7\x6b\x4a\x5a\x4c\x2c\xa7\x11\xd2\x54\x4b\
+\x34\xa8\xa1\x87\x45\x12\x05\x03\x34\x90\x2a\x45\x49\x94\x40\x4d\
+\x4d\xc0\xaa\x54\xa1\x4a\x0b\xfc\x41\x55\x04\x2d\xd0\x48\x02\x42\
+\x63\x0d\x60\xff\xc0\x36\x55\x21\x80\xd1\xe8\x62\xcf\x5c\xdd\xdb\
+\xd9\x9d\xbb\x1e\xb5\x14\xfb\x61\x7a\xb7\xb3\xfb\x3e\xfe\xd1\x22\
+\xf3\xb5\x77\xbb\xb7\x33\xc7\x55\xef\xf9\x6f\x9e\xf7\xf7\xfe\xe6\
+\x99\x67\xde\x99\x7d\xe7\x7d\x7f\x0b\xcc\x63\x1e\xf3\xf8\x7f\x86\
+\xcc\xc6\x49\x86\x0f\x1d\x5a\x10\x9b\xac\xac\xa4\xe0\x12\x0d\xb2\
+\x44\x81\xbd\x00\xce\x13\x48\x17\x40\x1d\xc0\x71\x00\xc7\x09\x29\
+\x02\x3c\xa0\x41\xfe\x46\x56\xf6\x67\x32\x99\x91\xa8\xb5\x45\x66\
+\x40\xb1\x58\xec\x53\xd0\xd6\x42\x71\x10\x82\x0f\xce\x30\xcd\x08\
+\x28\x2f\x6a\x9a\xfa\x79\x2a\x95\x7a\x43\x44\x18\xaa\x48\x84\x6c\
+\x00\x49\x29\x58\xd6\x95\xa2\xb0\x01\xc0\xaa\x30\x73\x03\xc8\x51\
+\xb8\xf5\xed\xc3\x87\x9f\x1a\x18\x18\xb0\xc3\x4a\x1a\x9a\x01\x85\
+\x82\xb5\x0a\xc2\x2d\x00\x06\xc2\xca\x19\x0c\x29\x10\xd8\x94\x49\
+\x27\x9e\x08\x63\x44\x34\x6d\x40\x3e\x9f\xbf\x48\xd3\x63\x0f\x00\
+\xf8\xe2\x14\x61\x8a\xc0\xef\x45\x64\x2f\x14\x87\xa8\xe3\x1f\x2d\
+\xc0\xd1\x4a\xa5\x72\xa2\xd2\xd6\x56\x8d\x97\xcb\x9d\x64\x4b\x37\
+\xa0\xb2\x14\x2c\x06\xe4\x32\x01\x3f\x09\xa0\xbd\x56\x42\x02\xfb\
+\x35\xa8\xf5\x86\x61\xbc\xd9\x8c\xfe\xa6\x0c\xc8\x97\x4a\x1f\xd1\
+\x14\x76\x01\xf8\x40\x40\xf3\x09\x81\xbc\x40\x72\x77\x4b\x8b\xbc\
+\x94\x4c\x26\xdf\x6e\x24\x77\xa9\x54\x6a\xaf\x56\xe5\x0a\x11\xb5\
+\x9a\x90\xc1\x1a\xe7\x98\xa0\xf0\xe6\x6c\x3a\xfd\x8b\x99\xe8\x07\
+\x9a\x30\xa0\x50\x28\x5d\x0f\xc1\xe3\x00\x5a\x7d\xa2\x80\x87\x35\
+\xa8\xfb\x0c\xc3\x78\x67\xa6\xf9\x9d\xc8\xe5\x72\xf1\x8e\x8e\xae\
+\x75\x10\xb9\x07\x40\x8f\x2f\x80\xb2\xd9\x30\x12\xf7\x88\x88\x6a\
+\x34\x77\xc3\x06\x90\xd4\x8a\xc5\xd2\xbd\x84\x6c\xf4\x34\x29\x00\
+\x8f\xb7\xe8\xf2\xed\x64\x32\x69\x35\x9a\xb7\x1e\x0c\x0d\xfd\xb3\
+\xb3\xbd\x7d\xe2\x0e\x02\x77\x02\xe8\x70\x0b\xc3\xae\x73\xce\x69\
+\xbd\xa1\xa7\xa7\xe7\x64\x23\x39\x1b\x32\x80\xa4\x66\x9a\xa3\x3b\
+\x21\xfc\x82\xa7\x69\x4c\x69\x58\xd3\x9b\x4a\xbd\xd6\x48\xbe\x99\
+\xc2\xb2\xac\x64\xa5\xca\xe7\xe1\x7f\xe1\xfe\xc9\x2e\x4f\x7c\xbc\
+\xbf\xbf\xff\x78\xbd\xb9\xb4\x46\x4e\x6c\x96\x46\x37\xf9\x2e\x5e\
+\xf0\x2a\x58\x1d\x98\xad\x8b\x07\x80\x64\x32\x69\xe9\x1a\x56\x02\
+\xd8\xe9\x69\xfa\x50\x2c\xde\xb6\x93\xa4\x5e\x6f\xae\xba\x47\xc0\
+\x48\xb1\xf8\x79\xa1\x3c\xed\xee\xcc\x1d\x4a\x55\x6f\xcd\x66\xb3\
+\x13\xf5\xe6\x09\x13\x24\xa5\x58\xb4\xee\x22\x70\x1f\x1c\xd7\x42\
+\x60\x4b\xd6\x48\x7d\xa3\x9e\x1c\x75\x19\x50\x2c\x16\x07\x14\x65\
+\x3f\x80\x36\x07\xfd\x94\x91\x4e\xde\x18\xc5\xec\xac\x51\x8c\x98\
+\xd6\xd7\x04\xdc\xe6\xe4\x04\x72\x93\x61\x24\x9f\x98\xae\xef\xb4\
+\x8f\x80\x65\x59\x17\x28\xca\x2e\x38\x2e\x5e\x80\xd7\xa8\x2a\xeb\
+\xe6\xc2\xc5\x03\x40\x26\x9d\x78\x08\x94\x9f\x39\x39\x82\x8f\x16\
+\x0a\x63\xcb\xa7\xeb\x3b\xad\x01\x15\xc5\x2d\x00\x12\x0e\x6a\x4c\
+\x84\x6b\xde\xaf\x61\x1f\x04\x11\xa1\x6d\x9f\x5a\x0f\xe0\x0f\x0e\
+\x3a\x0e\xa9\x3c\x4a\xb2\x65\xaa\xbe\x53\x1a\x60\x9a\xe6\x0a\x10\
+\x37\x3b\x28\x52\xc9\xe7\xd2\xe9\xf4\x58\x13\x7a\x23\x41\x7f\x7f\
+\xff\xa4\xaa\xda\xd7\x00\x38\xf2\x1e\x2b\xcb\x8b\x45\xeb\xb6\xa9\
+\xfa\xd5\x34\x80\xa4\x10\xfa\xf7\x3d\xf4\xce\x6c\x36\xf9\x6a\x33\
+\x42\xa3\x44\x6f\x6f\xef\x5b\x84\x6c\x76\x72\x04\xee\x1e\x1f\x1f\
+\x3f\xb7\x56\x9f\x9a\x06\x14\x2c\x6b\x25\xc0\x15\x0e\xca\x16\xa8\
+\x6f\x85\xa0\x33\x5a\x28\xfb\x47\x10\x14\x1d\xcc\x85\x13\xe5\xf2\
+\x97\x6b\x85\xd7\x34\x40\x14\xee\x72\x13\xf8\xb1\x61\x18\xf9\xe6\
+\x15\x46\x8b\x6c\x36\x3b\x41\xd0\x7d\xa3\x28\x77\xd4\x9a\x1b\x04\
+\x1a\x30\x32\x32\xb2\x10\xc0\xa7\x1c\x94\xad\x2a\xf6\xbd\xa1\xa9\
+\x8c\x18\x99\x54\xea\x49\x02\xc3\x0e\x2a\x51\x28\x95\x3e\x11\x14\
+\x1b\x68\x80\xe8\xfa\xf5\x00\xfe\xeb\x98\x00\x2f\xf7\xf6\xf6\xbe\
+\x15\xae\xcc\xe8\x20\x22\x55\x21\x9f\x71\x71\x4a\x6e\x0a\x8a\xad\
+\xf1\x08\xc8\x6a\xe7\x11\x85\xbf\x0a\x4b\xdc\x6c\x81\xba\xb8\x35\
+\x0b\x3e\x13\xf4\x18\xf8\x0c\x18\x1f\x1f\x3f\x17\xc4\xe5\x4e\xae\
+\x6a\xeb\xbf\x0e\x5d\x61\xc4\xc8\x24\x93\xaf\x03\xe2\x1c\xb5\xdd\
+\x23\x96\x75\xa9\x37\xce\x67\xc0\xe4\x64\xe5\xa3\x00\xe2\x0e\xea\
+\xcf\x7d\x7d\x89\xa2\x37\x6e\xae\x43\x44\x14\x84\xae\x1b\xa7\x2b\
+\xff\x3a\x65\xc0\x23\xc0\x65\x1e\x62\x7f\xa8\xca\x66\x11\x3c\xfd\
+\xfd\xf2\xde\x31\xb0\xd4\x1b\x13\x64\xc0\xc5\xce\x23\x71\xbf\x4d\
+\xcf\x2a\x08\xc5\xab\xfd\x62\x6f\x4c\x80\x01\x92\x71\x1e\x91\x32\
+\xe7\x7f\xfb\x6b\x81\x2c\x7b\xb5\x67\xbd\x31\x3e\x03\x08\x74\x3a\
+\x8f\x45\xe4\x5f\x21\xeb\x9a\x4d\x78\xb5\x77\x7a\x03\xa6\x35\xa0\
+\x5a\x65\x43\x6b\x6c\x73\x09\x99\x4c\x66\x12\x40\xc5\x41\xc5\x73\
+\xb9\x9c\xf3\x05\xef\x37\x40\xbc\x8b\x24\x31\xce\x89\x6f\xfe\xa8\
+\x10\x34\x11\x3a\xe1\x3c\xd0\x95\xe6\x1b\x36\x67\x0b\x0a\x85\x42\
+\x2b\x00\xe7\x7a\x40\x79\xd9\xb2\x65\x65\x67\x4c\xd0\x08\x70\xad\
+\xa8\x92\x3c\x2f\x1a\x79\xd1\x83\x64\xb7\x87\x3a\xe1\x8d\xf1\x19\
+\xa0\x00\xd3\x93\xc6\xf7\xe6\x3c\x5b\xa0\x69\xf1\x5e\x0f\x55\xf0\
+\xc5\xf8\xbb\xc9\x01\xe7\x11\x05\xfd\x61\x8a\x9a\x4d\x88\x5f\xfb\
+\x90\x37\xc6\x67\x80\x86\xaa\x6b\xb3\x51\xdc\x8b\x22\x67\x15\xe8\
+\xd1\x4e\x20\xe7\x8d\xf1\x19\xd0\xde\xde\xfe\x0a\x00\xc7\xfe\xbb\
+\x2c\xb7\x2c\x2b\x19\x81\xbe\x48\x41\x52\x03\x70\x95\x8b\x54\xb2\
+\xd7\x1b\xe7\x33\xa0\xa7\xa7\xe7\xa4\x00\xaf\x38\x39\x5b\x79\x12\
+\x9d\x05\x28\x95\x4a\x97\xc2\xbd\xa3\x7c\x3c\x93\x49\xbc\xe1\x8d\
+\x0b\x5c\x0f\x20\xe1\xfa\x8a\x12\x70\x30\x5c\x79\xd1\x43\x41\x73\
+\x69\x26\xf8\x92\x88\x54\xbc\x71\x81\x06\x68\x1a\x77\xe2\xf4\x6e\
+\xef\xbb\xbd\xaf\x18\x3e\x74\x68\x41\xd8\x22\xa3\x02\x49\x0d\xe4\
+\xb5\x4e\x4e\x28\x3b\x82\x62\x03\x0d\x48\xa7\xd3\x63\x20\xf6\x38\
+\xa8\xd6\xd8\xa4\xed\xdd\x0e\x9f\xb3\x30\x4d\xeb\x3a\x00\x4b\x1c\
+\xd4\xb8\x61\x24\xf7\x04\xc5\xd6\x5e\x15\x16\xf9\xa1\x87\xf8\x4a\
+\x3e\x3f\x66\x84\xa2\x30\x42\xe4\x72\xb9\x38\x04\xdf\x75\x72\x02\
+\x6c\x0b\x1a\xfe\xc0\x14\x06\xa4\xd3\x89\x97\xe1\x7e\x19\xc6\x75\
+\x5d\x6d\x0a\x45\x65\x84\xe8\xe8\xe8\xfe\x12\xdc\x9f\xbd\x47\x4f\
+\x9d\x6a\xdb\x5e\x2b\x7e\xaa\x11\x40\x2a\x7c\xd3\xc9\x11\xbc\xd1\
+\x34\x4d\xdf\xba\xda\x5c\xc1\xe8\xe8\xe8\x85\x10\xdc\xed\x22\xc9\
+\xef\x2d\x59\xb2\xc0\x37\x05\x7e\x17\x53\xee\x0d\x66\xb3\xa9\xbd\
+\x00\x9e\x74\xc7\x6b\xcf\xe7\xf3\xf9\x8b\x9a\x11\x1a\x05\x72\xb9\
+\x5c\xdc\xb6\xd5\xb3\x70\xd6\x10\x11\x7f\x39\x72\xe4\xf0\xc3\x53\
+\xf5\x9b\x7e\x77\xd8\x8e\xdd\xe9\x5c\x5d\x25\x90\xd2\xf4\xd8\x73\
+\xc3\xc3\xc3\xde\xe2\xa8\xf7\x15\x9d\x9d\x5d\x0f\x41\xf0\x31\x07\
+\x65\x2b\x1d\xeb\xa6\x2b\xaa\x9c\xd6\x80\x45\x8b\x16\x1e\xa6\xc2\
+\x67\x01\x4c\x3a\xe8\xcb\x63\xad\x6d\x8f\x90\x9c\x95\x5a\xe3\xe9\
+\x50\x28\x16\x6f\x23\xe4\x56\x17\x49\xac\xaf\xa7\x6c\xa7\xee\x0b\
+\x30\x4d\xeb\x06\x82\xae\x8a\x0b\x02\x3f\xf9\xf7\x89\x63\xb7\x7b\
+\xbf\xb1\x67\x0b\x67\x4a\x64\x6e\x27\xb0\x0d\x8e\x9b\x29\xe0\x83\
+\x86\x91\xfe\x7a\x3d\x39\x1a\xba\x83\x23\x66\xe9\x7e\x01\x36\xb8\
+\x55\x60\x5f\x2c\xa6\x5d\x9b\x48\x24\x8e\xd4\xe8\x16\x09\x72\xb9\
+\x5c\xbc\xa3\xab\xfb\x11\x10\xb7\x38\x79\x01\x7e\x93\x4e\x27\xaf\
+\xaa\xf5\xb3\xe7\x45\xa3\x65\x72\xba\x59\xb2\x9e\x01\xb1\xc6\x93\
+\xa6\xa0\x6b\x1c\x4c\xa5\x52\x7f\x6d\x24\xdf\x4c\x71\xf0\xe0\x78\
+\x4f\x4b\xac\xf2\x4b\xf8\xbf\x54\xdf\xa4\xaa\xac\xc8\x66\xb3\x75\
+\x2f\xe4\xce\xa4\x50\x52\x37\xcd\xd2\x0f\x20\xe2\x1d\x62\x36\x81\
+\xed\x55\x3b\xb6\x79\xd1\xa2\x85\x87\x1b\xcd\x5b\x0f\x4e\x97\xcf\
+\xe2\xab\x10\x6c\x04\x70\xbe\xab\x51\xf0\x62\xd5\x2e\x5f\xd7\xd7\
+\xd7\x77\xac\x91\x9c\xcd\x94\xca\xde\x02\xc1\x76\x00\x31\x4f\xd3\
+\x49\x02\x0f\x54\xca\x13\x5b\x1b\x29\x58\x9c\x0a\x24\x5b\x4c\xd3\
+\x5a\x0b\xc1\x26\xb8\xeb\x95\xce\x04\xc8\x56\xc3\x48\x6c\x10\x91\
+\x6a\xa3\xb9\x9b\x2b\x96\x2e\x16\x57\x6a\x94\xe7\x00\x5c\x10\xd0\
+\xfc\x0e\xc1\xdd\x1a\xb4\xdd\xe5\xf2\xa9\x3d\x8d\x9a\x91\xcb\xe5\
+\xe2\x9d\x9d\xe7\xaf\x54\x50\xab\x05\xb8\x1a\x40\xd0\x34\xdc\x06\
+\xb1\x3e\x93\x49\x3d\x36\x13\xfd\x40\x08\xe5\xf2\x07\x47\x47\x53\
+\x2d\x55\xf5\x20\x88\x6b\xa6\x08\xb3\x01\xee\x83\x68\xbf\x85\xe2\
+\xdf\x95\x92\x83\xaa\x55\x8e\xc6\x2a\x95\x93\xe5\x72\xb9\xda\xd6\
+\xd6\xd6\xa9\x94\xea\x26\xf5\x2c\x35\x2c\x06\xd5\x65\x02\xb9\x12\
+\x40\x57\xad\x84\x04\x5e\x3f\x53\x2e\xff\xc7\x66\xf4\x87\xf8\x87\
+\x89\xd2\xa7\x29\xb8\x5f\x80\x4b\xc2\xca\x59\x03\x63\x84\x7c\x27\
+\x93\x4e\xfc\x74\x26\x43\xde\x8b\xb0\xff\x32\xa3\x99\xa6\x75\x35\
+\x05\x1b\x05\xf8\x70\x98\xb9\x01\xe4\x41\x6e\x25\xab\x8f\x85\x59\
+\xa3\x18\xd9\x4c\xce\x34\xcd\xa5\x14\x6d\x2d\x14\x06\x21\x58\x3c\
+\xc3\x34\xe3\x10\xbc\xa0\xc0\x1d\xd9\x54\xea\x77\x33\xf9\x3f\xc0\
+\x74\x98\x95\xa9\xec\xc1\xd1\xd1\x54\xac\xc2\x55\x0a\x5c\x0a\xc8\
+\x12\x80\x59\x11\x74\x83\xe8\xc2\xe9\x9d\x9b\x63\x00\x8f\x0b\xa4\
+\xa4\x80\x21\x08\x87\x34\x72\x5f\x3a\x9d\x3e\x30\x57\xca\x71\xe7\
+\x31\x8f\x79\xfc\x6f\xe2\x3f\x21\x7b\x09\x29\x0d\x19\xbe\x1d\x00\
+\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x00\x8d\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x00\x3f\x49\x44\x41\x54\x58\x85\xed\
+\xd3\xb1\x11\x00\x10\x10\x44\xd1\xa5\x10\x94\x22\xd1\xb5\x19\xad\
+\x18\x0a\x39\x91\x50\xea\x92\xff\xa2\xcd\x7e\xb4\x12\x00\xc0\x59\
+\xb8\x63\xae\x3d\x64\xaa\x7f\xb2\xd6\x4b\x4e\x4d\x92\xe2\x9f\x20\
+\xf0\xc6\x0b\x00\x00\x70\x77\x00\xa4\x4c\x0e\x07\xff\x04\x59\xb9\
+\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x02\x3e\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x01\xf0\x49\x44\x41\x54\x58\x85\xe5\
+\x96\x31\x68\x53\x51\x14\x86\xbf\x3f\x7d\xad\x52\x41\x31\x82\x08\
+\x2e\x2e\x2e\x0e\xe2\xd0\xa0\x5d\x1c\x2b\x54\xba\x08\xa9\x53\x05\
+\x11\x4d\x96\xb4\xa9\xe0\x26\x8a\xe2\x26\xb4\x4d\x2b\xd8\x87\x83\
+\x60\x27\x1b\x70\x29\x0e\xea\xe6\xa2\xf2\x3a\x48\x07\x17\x41\x1d\
+\x14\x41\xa8\x60\xa1\x45\xdb\xe4\x1d\x87\xa4\x4e\x82\xef\xde\x5c\
+\x22\xe8\xd9\x1e\xdc\xf3\xff\xdf\x3d\xef\xdc\x73\x2f\xfc\xef\xa1\
+\xd0\x82\x83\x17\xa6\xf2\x5b\x51\xef\x3b\x30\x5b\x8e\xc7\xf7\xfe\
+\x69\x7d\x14\xd2\xfc\xe8\xd8\xed\x5d\x8d\x28\x7a\x0c\xb6\x27\x6b\
+\x4e\x2e\x94\xf9\x91\xe2\xf5\xbe\xbe\xfe\x1d\x8f\x0c\x4e\xb8\xe4\
+\x05\x01\x28\x16\x17\x7b\xfa\xf3\xfb\x1e\x00\x43\xae\xb9\x01\x00\
+\x4c\xef\xf3\x9f\xef\x00\x67\x31\x30\x2c\xed\x2a\x40\xa1\x34\x77\
+\x13\x54\x06\xc3\x64\xa9\x90\x75\x0d\x60\xe0\xd2\x6c\xd5\xe0\x2a\
+\x80\x49\xce\xe6\x1d\x01\x0c\x94\x6b\x63\x88\x69\x00\x83\x54\x86\
+\xb3\xb9\x37\x40\xa1\x34\x3b\x82\xe9\x7e\xfb\x33\x15\x7e\xe6\x5e\
+\x00\x85\xd2\xcc\x49\x83\x45\xa0\x87\x96\xb1\xb7\xb9\x33\x40\xe1\
+\xe2\xf4\x31\x23\xb7\x04\xec\x6c\x1b\x3b\x75\xfc\xef\x22\xf3\x24\
+\x3c\x5e\xaa\x1d\x4e\xd1\x13\x60\xb7\x81\x29\x80\x39\x64\xac\xc0\
+\x60\x79\xea\x60\xd3\xf4\xcc\x60\x3f\x16\xce\x1c\x32\x56\x60\xcb\
+\xa2\x8f\xbf\xae\x2d\x85\x33\x87\xac\x3d\x60\xac\x84\x34\x75\x06\
+\xe8\xcd\x35\x86\x0d\x3e\xb4\x61\x82\x5d\x60\x99\x01\x5e\xcc\x5f\
+\xfe\x14\x61\x43\x82\x2f\xb4\xc6\x5d\x30\x88\xcc\x42\xaf\xe2\x89\
+\xb7\xa4\xcd\x53\xc0\x9a\x5a\x0f\x99\x20\x10\x4e\x22\xc9\xbd\xc9\
+\xd7\x22\x1d\x01\xbe\x13\x08\xc2\x59\x20\x89\xab\xcf\x05\xa3\x40\
+\x13\x10\xea\xec\x59\xe7\xb5\x83\x24\x1e\x5f\x42\x76\x1e\xd8\x6e\
+\x4a\x6f\x08\xef\x12\x2e\xcf\x4f\x2c\x08\x55\xb7\x75\xcc\xb3\x12\
+\x1d\xfd\xc3\x24\xae\xd4\x04\xb7\x00\x64\xe6\x05\xd1\x71\x13\x25\
+\x71\xe5\x9a\xc4\x5d\x10\x4a\xc9\xb5\x26\x75\x17\x01\x40\x76\x68\
+\xf5\x40\x05\x78\x88\x40\xc8\x49\x33\xc8\x59\xae\xd7\x47\x9b\x1b\
+\x5f\x57\xcf\x01\x4f\x5d\x73\x83\x4d\xb4\x37\xf5\x1b\x9b\x9b\x1b\
+\x3f\xce\x08\x5e\xfe\x15\x00\x80\x95\x85\x2b\xeb\x51\xa3\x71\x1a\
+\x58\x03\x7d\x0b\xa9\xfd\xef\xc6\x4f\x11\x32\x94\x0c\x6f\x6b\x20\
+\xde\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x00\x95\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x00\x47\x49\x44\x41\x54\x58\x85\xed\
+\xce\xb1\x0d\x00\x20\x0c\x03\x41\x82\x18\x2a\xdb\xc1\x42\x69\xd8\
+\x2f\xc0\x10\x46\x4a\xf3\xd7\xdb\xfa\xd6\x04\x1e\xb9\x3c\x72\x29\
+\x1f\x5d\x19\xff\x40\x00\x01\x04\x10\x40\x00\x01\xe5\x01\x43\x3d\
+\xb8\x66\xd3\x23\xab\x02\xfa\xb6\x7b\xb4\x0b\x00\x00\x50\xed\x01\
+\x74\x44\x0a\xfd\x41\x7d\x20\x9d\x00\x00\x00\x00\x49\x45\x4e\x44\
+\xae\x42\x60\x82\
+\x00\x00\x02\x21\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x01\xd3\x49\x44\x41\x54\x58\x85\xed\
+\xd5\x3b\x8b\x13\x51\x18\xc6\xf1\xff\x33\xf1\x86\x82\xd9\x4e\x50\
+\x0b\x11\x5b\xd1\x56\xc4\x72\x36\xcd\x6a\x61\x76\xb0\x71\x51\x34\
+\x29\x2c\x64\x3f\x81\x48\xf0\x0b\x88\x82\x8d\xd9\x20\xee\x16\x42\
+\x36\x2e\xc8\x22\xce\xc6\xce\xc2\xda\xde\xc2\x4a\xb0\x71\x89\xa0\
+\x78\x21\xe7\xb1\x98\x09\xd8\x99\xcb\x30\x29\xf4\xad\x4e\xf1\x5e\
+\x7e\x9c\x73\xe6\x0c\xfc\xeb\xa1\x71\x92\xe2\x7a\x63\x17\x50\x14\
+\xf9\x64\xda\x5d\xfb\x5c\x24\x20\x1a\x33\x6f\x01\xa8\x7a\xa8\xed\
+\xc5\x95\x95\x43\xf3\x00\x00\x60\x71\xce\xdf\xf6\xf7\x92\x24\xd9\
+\x37\x17\x40\x1e\xb5\xdd\x50\x7d\x9a\x24\x49\xa5\x74\x80\x50\x30\
+\x58\x70\x65\x10\xaa\x0f\x19\xf3\x0e\x15\x06\x30\xb6\x24\x67\x6b\
+\x6e\xc5\x97\x1b\xad\x52\x01\x99\xc2\x06\x05\x00\xc4\x9d\xb8\xde\
+\x5c\x2d\x17\x90\x2b\x04\x21\x5f\xdf\x8f\xeb\x8d\xab\x25\x03\xc0\
+\x60\x69\x84\xe0\xc9\xe2\x72\x73\xa9\x54\x00\x80\x8d\x33\x0b\x15\
+\xdb\xdd\xda\x72\xe3\x42\xa9\x80\x3c\x42\x0e\x39\x10\xac\xed\x38\
+\x69\x9e\x2d\x1b\x40\x76\x14\x36\xf8\x30\xf6\xab\x5a\x72\xf3\x54\
+\xa9\x80\x9c\x11\x00\x63\x8e\x84\x40\x3f\xbe\x74\xe3\x68\xc9\x00\
+\x00\x82\x33\xcc\x09\xf6\x56\x5e\xce\x03\xf0\xc7\xd3\xe8\x33\xf3\
+\x00\xe4\xfd\xfc\x81\x5f\xe1\x58\xa9\x00\x67\xbd\x84\xf8\x14\x45\
+\xc4\xfd\x17\x9d\x8f\xe3\xd4\xed\x29\x66\xba\x23\x49\x02\x06\xd1\
+\x30\xd4\xd2\xad\xce\xfb\x71\x4b\x67\xde\x01\xe3\x88\x6c\xf8\xf7\
+\x48\x5c\x4c\xb7\x3a\xef\x26\xa9\x9f\x11\x20\x09\x09\x18\x4a\x4a\
+\xd2\xcd\xf6\x9b\x49\x3b\xcc\x02\x10\x78\x54\x7f\x7d\x67\xf3\xf1\
+\xf6\x34\x4d\xa6\x05\x68\x54\x2b\x58\xed\xf7\xda\x1b\x53\xf6\x99\
+\x0a\x20\x9c\xd7\x99\x7b\x3b\xbd\xf6\x83\x69\x87\xc3\xa4\x5f\x81\
+\x10\x81\x08\x81\xed\x47\xaf\x9f\xaf\xdd\x9d\x65\x38\x4c\xba\x03\
+\x76\x84\x00\xfb\xd9\xf9\xd3\xc7\x6f\x93\xfd\x8a\x4b\x04\x64\x0f\
+\x6d\xba\x50\xf9\x72\xad\xd5\x6a\x85\xbf\x65\x17\x0e\x90\x79\xab\
+\x83\x3f\xea\xdd\x6e\xf7\x67\x11\xc3\x61\xec\x3b\xa0\x01\x42\x8a\
+\xc2\x52\xba\xbe\xfe\xb5\xa8\xe1\xff\x03\xe0\x37\xff\xea\x99\x56\
+\xb6\x04\x03\xd2\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
+\
+\x00\x00\x03\x2a\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x02\xdc\x49\x44\x41\x54\x78\x9c\xed\
+\x99\x4f\x48\x54\x51\x18\xc5\xcf\x79\xf3\xd2\xd1\x20\x49\x88\x16\
+\x41\x50\x10\xad\xaa\x45\xe1\x9b\x30\x21\x22\x08\x25\x1a\x67\x2c\
+\x23\x5a\x54\x10\x08\x41\xb4\x69\x17\xe4\xa2\x76\x11\xb4\x0f\xd2\
+\x45\x48\x58\x8e\xe6\x62\x08\x22\x6d\xa1\x8d\xcf\x72\x51\x04\x21\
+\x14\x44\xff\x16\x25\x16\x0a\x29\xf8\xde\xfd\x5a\x84\x31\x7f\x9e\
+\x0d\x82\xf7\xbe\xa0\xfb\x5b\x7e\x07\xe6\x9c\x39\xef\x3e\xee\x9d\
+\x3b\x80\xc5\x62\xb1\x58\x2c\x16\x8b\xc5\x62\xb1\x58\x2c\x96\xff\
+\x0d\xea\x36\xf0\x72\x61\x1f\xc0\x53\x00\x40\xf2\xdc\x44\x86\xbd\
+\xba\x3d\x57\x83\xd6\x02\x0e\xf6\x48\x72\xa1\x41\x16\x4a\x86\xc2\
+\x43\x7e\x07\x47\x75\xfa\xae\x06\x47\xeb\xa7\xaf\x87\x5b\x31\xa3\
+\x8c\xec\x7b\x20\xdb\xb5\xfa\xae\x02\x03\xaf\x80\x92\xa8\xb9\x9b\
+\xe0\x86\xf1\x34\xe7\x75\xfb\x57\x43\xef\x0a\x00\xb0\x35\x60\xe5\
+\x2a\x00\x10\x84\x32\x87\x6e\xd1\xee\x5f\x0d\xed\x01\xee\x77\x32\
+\x44\x92\x0d\x51\x9a\xb7\x47\x42\xdd\xfe\xd5\x30\xf2\x04\xfc\x36\
+\xce\x39\x09\xee\x88\xd2\xbc\x9c\x1a\x33\x91\x61\x25\x8c\x2d\xc1\
+\x42\x9a\x6f\x15\x79\x38\x42\x6a\xf6\x72\xe1\x0d\x53\x39\xca\x31\
+\xfa\x0e\x3e\xcf\xf0\x89\x90\x17\x2b\x15\x5e\x4e\xe5\xe4\xb4\xc9\
+\x2c\x7f\x9c\xe3\x30\x4d\xe5\xc2\x5e\x01\xcf\x94\xcf\x1d\xd2\x2b\
+\x64\x38\x69\x32\x4b\x2c\x05\x00\x80\x97\x53\xef\x00\x54\x9c\x07\
+\xdc\x04\xb7\x8c\xa7\xf9\xc5\x54\x8e\xd8\x0a\x00\x56\x3e\x23\x38\
+\x01\xeb\x0b\x9d\x5c\x88\xd2\xd6\x9a\x58\xf7\xe1\xe0\x1b\x6b\xa2\
+\xe6\xca\x95\x9f\x10\x31\xf2\x70\x62\x2d\x60\xaa\x8b\x4b\x81\xcb\
+\x4d\x51\x9a\x37\x28\xdf\x4d\x64\x88\xfd\x24\x36\x75\x8c\x33\x21\
+\xb8\x2b\x42\x6a\xf0\x06\xc3\x7b\xba\xfd\x63\x2f\x00\x00\x5e\x64\
+\xf9\x1a\x60\x7b\x85\x20\x3c\xa9\xdb\xfb\x9f\x28\x00\x00\x1c\x85\
+\xe9\x58\x7c\xe3\x30\x2d\xc7\x7b\x28\x9b\x15\x25\x5f\x3e\x17\xc1\
+\x33\xdd\xde\xb1\x17\xb0\x77\x58\xea\x11\xca\x30\x88\x6d\x25\x02\
+\xe5\xda\x64\x87\xd3\xac\xdb\x3f\xd6\x02\x4e\xf4\x4b\xc2\x0d\xa4\
+\x0f\x40\x53\xa9\x22\xb7\xfd\x76\xa7\xdb\x44\x86\x58\x0b\xf8\xe0\
+\xaa\x9b\x00\xd2\xc5\x33\x01\x1e\xd5\x6d\x74\x2e\x80\x8c\x3c\x24\
+\xad\x35\xf1\x1d\x85\x07\xe5\x12\x44\x6e\x95\x8d\x5f\xba\x09\xb6\
+\x98\xbc\x29\x8a\xa5\x80\xa6\x01\xc9\x90\x32\x50\xe6\xff\xc9\x09\
+\x98\x2a\x74\xf2\xb3\xc9\x2c\xc6\x0b\x48\x0d\x89\x27\x4a\x46\x01\
+\xd4\x15\x8d\xe7\xa1\x78\xc0\x3f\xce\x57\xa6\xf3\x24\x4c\x9a\xfd\
+\xbe\x0d\x96\x11\x02\xc5\x57\x64\x01\xc0\xb4\xdf\xc1\x82\xc9\x2c\
+\xcb\x44\x5e\x58\xea\x60\x7f\xbf\x34\x2a\x47\xf2\x00\xca\xce\xfe\
+\xec\xf2\xb3\x7c\x6c\x2a\x47\x39\x46\x76\x81\xd6\xbc\xd4\x2a\x57\
+\x86\x00\xec\x2c\x11\x44\xae\xfb\x59\xde\x31\x91\x61\x25\xf4\x17\
+\xd0\x2d\xce\xec\xa2\xea\x01\xd0\x52\x2a\xc8\x5d\x3f\xeb\x5c\xd5\
+\xee\x5f\x05\xed\x05\x78\xbb\x71\x65\xf9\xbf\xc1\x22\x9e\x36\x26\
+\x9d\xf3\xa6\xf6\xfa\xbf\xa1\x75\x17\x68\xcd\x4b\xed\xec\xa2\xfc\
+\x00\x90\x2c\x1a\xbf\x59\x57\xc3\xe6\xb1\xa3\x34\xf2\x7b\xbf\x1a\
+\x5a\x57\xc0\xd7\x8f\x50\x00\x96\x8a\x47\x24\xdb\xfe\x95\x2f\x0f\
+\x68\x2e\x60\xaa\x8b\x4b\x04\xcf\x02\x98\x01\x30\xad\xc8\x23\x13\
+\x19\xbe\xd7\xe9\x69\xb1\x58\x2c\x16\x8b\xc5\x62\xb1\x58\x2c\x16\
+\x8b\xc5\x52\x8d\x5f\x44\x94\xcc\xbe\xc4\xf9\xa0\xab\x00\x00\x00\
+\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x00\x9b\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x00\x4d\x49\x44\x41\x54\x58\x85\xed\
+\xd7\xb1\x0d\x00\x20\x08\x05\x51\x34\x0e\x66\xc3\x04\xae\xc0\x98\
+\x26\xac\xe6\x06\x22\xc4\xf2\xae\xfc\x09\xc9\x6b\x11\xa1\x64\xba\
+\xcc\x75\x99\xbf\xee\x51\xa3\x60\x98\xc9\xfd\x5a\xaf\x1c\xfd\x0c\
+\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xd2\x9f\x51\
+\x13\xd9\x99\x9d\xa2\x0e\xd8\x07\x09\x21\x90\x7b\x88\xd1\x00\x00\
+\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x00\xf9\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x00\xab\x49\x44\x41\x54\x78\x9c\xed\
+\xd0\x31\x15\x80\x30\x00\xc4\x50\x8a\xb7\x2a\xc0\x02\xb2\xb0\x80\
+\x02\xc4\x95\x15\x07\x9f\x21\xd9\x6e\xba\xbc\x8c\x0d\x31\x8f\x73\
+\x7d\xf7\x73\x5f\x43\x78\xec\xe2\xf4\x4f\x14\x40\x0b\x68\x0a\xa0\
+\x05\x34\x05\xd0\x02\x9a\x02\x68\x01\x4d\x01\xb4\x80\xa6\x00\x5a\
+\x40\x53\x00\x2d\xa0\x29\x80\x16\xd0\x14\x40\x0b\x68\x0a\xa0\x05\
+\x34\x05\xd0\x02\x9a\x02\x68\x01\x4d\x01\xb4\x80\xa6\x00\x5a\x40\
+\x53\x00\x2d\xa0\x29\x80\x16\xd0\x14\x40\x0b\x68\x0a\xa0\x05\x34\
+\x05\xd0\x02\x9a\x02\x68\x01\x4d\x01\xb4\x80\xa6\x00\x5a\x40\x53\
+\x00\x2d\xa0\x29\x80\x16\xd0\x14\x40\x0b\x68\x0a\xa0\x05\x34\x05\
+\xd0\x02\x9a\x02\x68\x01\x4d\x01\xb4\x80\xa6\x00\x5a\x40\x53\x00\
+\x2d\xa0\x79\x01\x55\xd1\x04\x80\x1e\x3b\xba\xea\x00\x00\x00\x00\
+\x49\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x04\xe8\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x04\x9a\x49\x44\x41\x54\x58\x85\xc5\
+\x97\xd9\x76\xe2\x46\x10\x86\xbf\x66\x11\x12\x60\x50\x9c\xc4\x9e\
+\xf1\x24\x39\x59\xde\xff\x9d\x72\x31\x9e\x49\x1c\xcf\x18\x6c\x23\
+\x19\x24\xa8\x5c\xd4\xdf\xa8\x91\x71\x72\x97\xd4\x39\x1c\x89\x56\
+\xd7\xf6\xd7\xd6\x0d\x58\x09\x16\xf8\xcf\xc9\x02\x58\x19\xa4\x7c\
+\x09\xac\x21\x58\xf7\x91\x4b\x20\x1a\x96\x25\xef\x93\x44\x4a\x5c\
+\xb3\x64\x6d\x9b\xac\xed\xf4\x7e\x00\x1e\x7a\xf2\x97\xc0\x3a\xf4\
+\x16\x0e\xc0\x05\x30\x00\xaa\x44\x59\x90\x11\x13\xd8\x0d\x21\x8c\
+\x81\x71\xcf\xa5\x16\xac\x81\xac\x95\x11\x51\xb9\x01\x0d\x90\x4b\
+\xfe\x23\x30\x3c\x75\xd8\xf7\x2d\xc0\x7e\x11\x34\x63\xb0\x99\xd6\
+\x33\xb0\xf7\xf0\x50\x82\xe5\x60\x13\xb0\x82\x57\x64\x85\xbe\x4d\
+\xb5\xf7\xca\x79\xc1\xd7\x2c\x93\xec\x5f\xc1\x2e\xfa\x10\x02\xf6\
+\x01\xf8\x24\x24\x0c\x78\x01\x0a\xd8\xbd\x87\xec\xa3\xbc\x00\x58\
+\xc8\x8b\x73\x94\x7e\x9b\xc0\xee\x06\xb2\x5b\x21\x92\x4b\xdf\x1a\
+\xb8\x81\x70\x0b\x30\x92\xf2\x80\xc3\x3e\x96\xf2\x1b\xe0\xde\x19\
+\xb2\xfb\x44\xf9\x04\x0f\x91\x71\x1a\xf7\xe8\xcc\x4c\xca\xf4\xcb\
+\xbe\xc2\xa6\x80\xd9\x18\x78\x07\x7c\x94\x8e\x41\x0f\x01\xfb\x4e\
+\xff\x2b\x08\x15\xd8\xb5\xbe\xfd\x09\xcc\x1d\x8d\xd5\x0c\x4a\x5c\
+\x70\xa8\xcf\x03\x60\x73\xa0\xc5\xf3\xa5\xd2\xf3\x80\x27\xf4\x0e\
+\x78\xc2\xe3\xff\x0d\xb0\x82\xb0\x19\x25\xdc\x63\x29\xcf\xe5\xdd\
+\x1a\xb8\x92\xc5\x39\x94\x4f\x82\x71\x02\x66\x1d\x0f\x24\x08\xe5\
+\xc0\xb3\x94\x95\x42\x38\x03\xee\xf0\xf0\x64\x10\x9e\x12\x07\x3b\
+\x28\xdc\x52\x9b\xc0\xcb\xb5\x18\x83\xa0\x5c\x48\x68\xa4\x39\x1e\
+\x86\xb9\xf8\x07\xfa\x1f\xd7\x22\x6d\xc4\xbb\x93\xac\x00\xdb\xf7\
+\x4a\xcc\x63\xee\xc5\x10\xbc\x73\x41\x15\x30\xfd\x8c\xc7\xb2\x96\
+\xf5\x23\xc1\x56\x43\x75\x09\xd3\xb5\x23\x75\x8e\x6c\x21\x99\x35\
+\x30\x95\x03\x53\xba\xd2\x1b\x49\xf6\x1c\x0f\xc1\x97\x14\x81\x09\
+\xb4\x2f\x49\x6d\x16\x8a\xb5\xe1\x96\x5d\xc3\x74\xe5\x48\xbd\x49\
+\xb1\xce\xbf\x17\x8f\x09\x89\x58\xb6\x2d\x3c\x36\x78\xe8\xfa\x21\
+\x68\x4a\x58\x3c\x74\xc6\x30\x54\x3e\xe4\x78\xd2\xfc\x25\xc1\x85\
+\xfa\x41\xee\x49\x67\xb3\xee\x3f\x05\x9e\x37\x5f\x61\x73\x29\xde\
+\x3c\x91\x09\x2c\x9e\x49\x42\x15\x0d\xc8\xbc\x8b\x91\x0b\xc6\x52\
+\x1e\xb4\x62\x5c\xe1\x89\xf6\x20\x48\x73\x3d\x83\xa0\x9d\xba\x0c\
+\xa6\xae\x9c\x06\x66\x0f\xda\xd7\xe2\x3d\xe5\x12\xef\x31\x43\x68\
+\x4c\xfb\x63\x1f\x20\x40\x50\xd7\x0a\x8f\xde\xb9\x82\x32\xdb\x0c\
+\x82\xfa\xbb\x35\x12\x36\x06\xee\x7b\xbd\xfd\xca\x8d\x8e\x7c\xb4\
+\x60\x7b\x7f\x86\x1d\xd8\x33\x5e\x86\x03\xba\x24\x3f\xa9\x82\x61\
+\x52\xdf\x49\x93\xa9\xd3\x3d\xda\xc7\xbd\x7b\x63\xe9\x30\xbb\x4b\
+\x1c\x8a\x94\x4e\x59\xc9\x0c\x55\xe7\x6c\xc7\x30\x82\xf1\x21\xf1\
+\x86\xe4\xbd\x4d\x84\x8c\x80\xc6\x3d\xb7\x35\xea\x4c\x78\x46\x5b\
+\xd2\x1f\x52\x4a\x1d\x78\x35\x3d\x07\xc9\x73\x7f\x86\xb9\x4f\x87\
+\x9e\xc0\x3e\x9d\x6b\xcf\x96\xbc\xbf\xda\x17\x85\xed\xa0\x51\x57\
+\x0b\xd6\x6d\x0e\x06\xf5\xb0\x67\xc0\x30\x81\x7d\xa5\xdf\x32\x99\
+\x27\x7d\x83\x4f\x46\x6e\xdf\x98\x94\xa1\x55\x29\xf5\xac\x2d\xfa\
+\x75\xdf\xe2\x09\xa7\x79\x1e\x62\xdb\xbe\xa6\x3b\x03\x44\x0a\xaf\
+\xdf\xad\x00\x3b\xee\x8b\x39\x60\xca\x70\x53\x19\xce\x34\x58\xc0\
+\x4b\xb3\x94\xe2\x02\x6f\xb9\x6a\x36\x96\x42\xdc\x00\xdf\x4a\xb8\
+\x49\xb6\x0e\x21\x16\x3b\x20\x32\x76\x1f\xf9\xa2\x01\x3b\x08\x43\
+\x95\xdb\xd6\x0f\x24\x34\xfe\xdf\xc0\x33\x7f\x23\x21\x9f\xff\x61\
+\x1a\xee\x38\x9e\x76\xd6\x25\x2c\xef\x3a\x07\x79\xc0\x4b\x38\xee\
+\xd9\xc1\x49\x08\xc6\x75\xe2\xf5\x16\x35\x0a\x51\x05\x2f\x3f\xc9\
+\xf3\x73\x99\x7e\xb4\x40\x1e\x7e\x80\xe5\x53\xb7\xbc\x2a\xa4\x1c\
+\x37\x6c\xbc\x89\x5f\x06\x09\xe3\x06\xea\xb2\x63\xa2\xf6\x86\x14\
+\x0f\x1a\xf9\x2d\x3e\xdd\xfa\x67\xc1\x94\x22\xd4\x7f\xe0\xed\x36\
+\xf8\xb3\x4c\x86\x57\x36\x93\x31\x27\x21\xd8\xfb\xe6\xe2\x19\xec\
+\x86\x6e\xe0\x14\xf8\x49\xe6\x77\x3c\x9e\x7b\xa0\x74\xa4\xea\x41\
+\x97\xa0\xf5\x50\x02\xd5\x21\x8f\x7b\x7f\xc6\xbb\x9f\x8e\x77\x2c\
+\xa1\xb8\x95\xcc\x6d\x6a\x00\x6e\x40\x78\x06\x1b\xd0\xc5\x7c\x24\
+\x6f\x0e\x10\x36\x60\x2d\xf0\x0c\xe1\xe5\x3c\x00\x36\x77\x19\xa0\
+\x83\xeb\x67\x7c\x96\x6c\x24\x73\xe5\xf9\xd3\x45\x31\x0d\x41\xe3\
+\x93\x2d\x3c\x42\x7d\xe1\x9e\xb2\x96\xf5\x5b\xe5\xc7\x71\x8c\xbe\
+\x4d\x36\x56\xe8\x1a\x3c\xd1\xd6\xc0\x25\x54\x33\x47\xc3\x66\x5a\
+\x3f\x09\xc1\x57\xe0\x07\xdf\x6c\x4b\x60\x06\x2f\x41\x93\x74\x42\
+\x67\xb2\x0e\x97\x55\x05\x85\xd1\x75\xcf\xd8\xac\x0a\x3c\xdb\x77\
+\x38\xf3\xc2\x8d\xaf\xa7\x30\x9d\xe3\x13\x76\xe3\x8e\x87\x4d\x62\
+\x40\x30\xb0\x03\x5e\xeb\x01\xf8\x04\x45\x34\x86\x0e\x56\xf0\x30\
+\x4c\x75\xf4\x36\x21\x18\xe2\x1c\x59\x38\x82\xc7\xbd\x17\x6e\xcc\
+\xf4\x8b\x64\xc5\xd9\x72\xee\x50\x63\x17\xba\x34\xf4\x2f\x26\x0b\
+\xa8\x7e\xec\x2e\x23\xff\x76\x31\x01\xe7\xad\x3e\x74\x65\x7d\x72\
+\x31\xf9\xed\xcc\xc5\xe4\xd8\xdb\xf7\x82\x6d\x20\x2b\x33\x1c\xfe\
+\x81\x7f\x6f\x32\x79\x30\x84\x71\x7a\xf7\xcb\x75\x30\x6e\x7d\xd4\
+\x8e\x6a\xbc\x67\xec\xc5\xdb\xd0\x0d\xa6\x35\xc9\xd5\xec\x8d\xcb\
+\x69\xf4\xe2\x98\x70\xc3\xe4\x7d\xa2\xf7\x09\x6c\x35\x3b\x26\x95\
+\x94\x18\xdd\xe5\x54\x06\xb9\xb0\x18\xf3\x9e\xc3\x6b\xf8\x9f\xaf\
+\xe7\x7f\x03\x88\x7c\xd3\x3b\xed\x32\x4f\xdf\x00\x00\x00\x00\x49\
+\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x02\x27\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x01\xd9\x49\x44\x41\x54\x58\x85\xe5\
+\x96\x31\x6b\x54\x41\x14\x85\xbf\x33\x59\x45\x09\x2a\x5a\xd8\x58\
+\x58\xd9\x58\x88\x4d\xd8\xa4\xb1\x4c\x40\x09\xb8\x89\xae\x95\x01\
+\x3b\x1b\x21\x3f\x40\x2c\x42\x7a\x11\x04\x4b\x21\xa9\x7c\xba\x89\
+\x10\x2c\xa2\x9d\x8d\x59\xd3\x48\x0a\x1b\x41\x04\x4d\x63\x67\x64\
+\x51\x92\xec\x1c\x8b\x65\xc1\x4a\xdf\xbc\x37\x28\xe8\xa9\xe7\x9e\
+\xfb\xdd\x3b\xf7\xce\x7b\xf0\xbf\x4b\xb9\x0d\x27\x0a\x9f\x88\x0d\
+\xbf\xb7\xf0\xeb\x56\x38\xfe\xbb\xf3\x8d\x9c\xc9\xcf\xad\x7b\x34\
+\xf6\xfc\x0c\x38\x26\x97\x8b\x09\xb9\x92\x9f\x2d\x7c\xf0\x70\xcf\
+\x2b\xc0\x78\x4a\x5c\x16\x80\xab\x85\x47\x8e\x1c\x88\x4b\xc0\x64\
+\xc9\xc2\x33\x02\xd8\xfa\xd8\x88\xf7\xb1\xae\x61\x23\x13\xff\x28\
+\x40\x73\x25\x2e\x18\xdd\x04\x83\x14\x11\x49\x4d\xa8\x05\xd0\xec\
+\x78\x1e\xe9\x36\x80\xad\x08\x69\xc9\x6b\x01\x34\x3b\xbe\x8e\x7c\
+\x97\x41\xd6\xa8\xc4\xca\x6b\x01\x8c\x3f\xf5\x34\xf2\x43\x18\x54\
+\xae\x0a\x95\x0f\x95\xfc\x0e\x8c\x75\x7c\xc1\xd1\x05\x30\x62\xec\
+\xaa\x95\x0f\x95\xd4\x81\xb1\x55\x9f\x0f\xf2\x1a\x70\x08\x6c\xa1\
+\xa4\x89\xaf\x05\xd0\x7c\xe2\x33\xc1\x5e\x07\x8e\x5a\x98\x0c\xc9\
+\x4b\x03\x4c\x14\x3e\x45\xf0\x0b\xe0\x24\xc2\xa9\xbb\xfe\x2b\x95\
+\x9a\x81\xd8\xf0\x27\x00\x63\x72\xb4\xfd\x67\x95\xbd\x82\x2d\x80\
+\xb2\x1f\x98\xec\x00\x61\x5f\x17\x81\x0f\x48\xa5\x63\xb2\x02\xbc\
+\x6a\x6b\x9b\xa8\x49\xe0\x33\x46\x56\x3e\x88\xd2\x46\xdd\x2b\x7a\
+\x17\xa5\x29\x60\x47\x46\xc6\x59\x20\x92\x4c\x36\x5b\x7a\x13\xad\
+\x69\xe0\xbb\x50\x16\x88\x64\x83\xcd\x59\xbd\x54\x50\x1b\xe8\x0f\
+\x20\x54\xeb\xb7\xae\x52\x05\x1b\x97\xb5\x86\x75\x03\x40\x83\x2e\
+\x54\x86\xa8\xdc\xc2\xee\xac\x96\x91\xe6\x87\x3e\xae\x08\x51\xeb\
+\x0e\xbb\x2d\xdd\xc3\x5e\x04\x50\x45\x88\xda\x43\xd4\x9d\x09\x77\
+\x6c\x3f\x00\x90\x9d\x0c\x51\x7f\x95\x24\x9f\xee\x87\x5b\xc8\x8f\
+\x90\x90\xd3\x36\x23\xcb\x2e\x3f\x6e\xab\xff\x75\x2f\xcc\x01\xcf\
+\x53\x97\x22\xdb\x8b\xf6\xb6\xad\xdd\x6f\xa3\x9a\x01\x36\xfe\x0a\
+\x00\xc0\xd6\x94\x7a\x61\x5f\x97\x90\x77\x6c\xbe\xe4\xf4\xfe\x77\
+\xf5\x03\x8b\xca\xad\x03\x49\x73\x42\xef\x00\x00\x00\x00\x49\x45\
+\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x02\xd8\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x02\x8a\x49\x44\x41\x54\x58\x85\xe5\
+\x96\x3d\x72\xd3\x40\x18\x86\xdf\xd7\x49\x01\x9c\x83\x12\x5a\x4b\
+\x70\x05\x0a\xa2\x35\xc4\x21\x24\x71\xfe\x66\xc2\x01\x32\xc3\x19\
+\x28\xd3\x51\x24\x01\x3b\xe4\xd7\x48\xce\x0c\x67\x60\xc6\xd6\x21\
+\xa0\x83\x1b\x00\x05\xd6\x4b\xe1\x28\xc8\x2b\xc9\x92\x3c\x6a\x18\
+\xbe\x4a\x5a\x7d\xfb\x3e\x8f\x77\x25\xcf\x02\xff\x7b\x31\xbe\x78\
+\x74\xad\xc7\x51\xa4\xb7\x10\xee\x92\x7c\x3d\x34\x0c\xea\x04\xb9\
+\x81\x8c\xa4\x37\x24\x7e\x41\x7c\x35\x6c\xf1\x33\x00\x34\xe2\x86\
+\x28\xd2\x11\x80\x87\x20\xee\x0b\xea\xbb\xbe\xda\x75\xc1\x9d\x40\
+\x2b\x82\xfa\x93\x6c\x3c\x10\x75\x18\x3f\x6b\x24\xfa\xee\x24\xae\
+\x1b\xa2\xce\xea\x90\x70\x02\xad\x00\x3a\x4d\xb2\x48\xdc\x4b\x0b\
+\x90\xfb\x00\xa2\x3a\x25\x26\x73\xa7\xe1\x00\xa2\x48\xdc\x4f\x09\
+\x8c\x3c\xfa\x22\xd7\x32\x24\x4e\xe7\x91\x70\x7d\xb5\x45\x9d\xd9\
+\x70\x90\x9d\xd0\xb0\x9f\x12\x00\x80\xd0\xe3\x79\x86\xc4\x42\x55\
+\x89\x1b\x78\xea\x97\x83\xec\x8c\x3c\x7e\x48\xf6\x36\x60\x55\xe8\
+\xf1\x5c\xe2\x7a\xa6\xc4\x40\xcb\x85\xf0\x81\x96\x6f\xe0\x0b\x45\
+\x70\x20\xf1\x19\xda\xd5\xf4\xb5\x4a\xea\xc4\x92\x1c\x93\x5c\x1d\
+\x7a\xbc\xca\x85\x4b\x67\x16\x5c\x20\x37\xb2\xe0\x33\x05\x00\xc0\
+\x0d\xf4\x52\x50\xaf\x8c\x44\x33\xd0\x73\x42\xe7\x55\xe0\x85\x02\
+\xb3\x24\x04\xbe\x88\x5f\xa6\x79\xe1\xa5\x04\x00\xc0\x19\x68\x0d\
+\x52\x37\x4b\x62\x12\x92\x01\x17\x3b\xa3\x16\x4f\x8a\xb2\x4b\x09\
+\xe4\x49\x48\x88\x40\x80\xd3\x62\xa5\xe1\x95\x04\x12\x12\xbd\x19\
+\xf3\x2a\xc1\x2b\x0b\xdc\x4a\x00\x3d\x48\xf6\x5c\x09\xdc\x0c\x0d\
+\x7b\x55\xf2\x52\xff\x03\x25\xea\xa7\x24\xd9\x83\x02\x44\xe1\x47\
+\xd5\xb0\x4a\x02\xce\x40\x2d\x48\x17\xcc\x98\x47\xa0\x01\xea\xc2\
+\xf1\xf5\xac\x4a\x66\xe9\x2d\x70\x03\x19\x41\x97\x00\x16\x13\xc3\
+\x02\x09\x6b\x3b\xc6\x20\xdb\x23\x8f\x7e\x99\xdc\x52\x2b\x90\x07\
+\x17\xb8\x25\x61\x13\x40\x72\x4b\x16\x20\x5d\x3a\x03\xb5\x6a\x11\
+\x68\xfa\xf2\xf2\xe0\xa1\x61\x37\x34\xec\x09\xdc\x9a\x57\x62\xa6\
+\x40\xd3\x97\x47\xea\xca\x86\x93\xdc\x0e\x0d\xbb\xf1\x40\x68\xd8\
+\xcd\x91\xb8\x28\x92\xc8\x15\x98\x05\x1f\x7a\x7c\x6f\xf7\x87\x86\
+\x5d\x92\xdb\x96\xc4\x62\x91\x44\xe6\x4b\xd8\x1c\x68\x89\x52\xbf\
+\x2c\x3c\x59\xee\x40\x9b\x92\x8e\xad\xec\xdf\x04\xdb\x59\x07\xdd\
+\xd4\x0a\xe4\xc1\x01\xee\x14\xc1\x01\x60\xd2\xc3\x1d\x58\x2b\x21\
+\xe8\xd2\x0d\x64\xec\xfe\xa9\x15\x70\x02\x3d\x05\xf4\x31\x0b\x3e\
+\x32\x7c\x57\x04\xb7\xb2\xb6\x00\x1d\xa1\x60\x25\x6e\x1f\x36\x7d\
+\x3d\x21\x75\x5d\x07\x3c\x21\xb1\x0d\xe8\x30\x25\xd1\xa0\x19\x2e\
+\xf1\x13\x30\x75\x2a\xd6\x41\x06\x7c\x77\x5e\x38\x00\x8c\x0c\x8f\
+\x01\xee\xc2\xde\x8e\xb1\x0e\xe2\x9b\xbf\x67\xf5\xe9\x33\x60\x0c\
+\x3f\x9e\x17\x5e\x20\x31\x4e\x09\x40\xdc\x03\xf0\x05\xc0\x77\x88\
+\x9d\x3a\xe0\x53\x12\xe4\x06\x80\x6f\x10\xbe\x8a\xdc\xab\x2b\xfb\
+\xdf\xaf\x3f\xf0\x88\x83\xb8\x80\x8e\x5a\x2b\x00\x00\x00\x00\x49\
+\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x00\xa4\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x00\x56\x49\x44\x41\x54\x58\x85\x63\
+\x60\xa0\x00\x58\xac\xfd\xdb\x60\xb1\xf6\x6f\x03\x25\x66\x30\x51\
+\xa2\x99\x1a\x60\xd4\x01\xa3\x0e\x18\x75\xc0\xa8\x03\x46\x1d\x30\
+\xea\x80\x01\x77\x00\x0b\xe5\x46\xfc\x77\xa0\xa4\x4a\x1e\x0e\x21\
+\xc0\x78\xe0\x44\x30\x73\x03\xb9\xba\x07\x3c\x04\x46\x1d\x30\xea\
+\x80\x51\x07\x8c\x3a\x60\xd4\x01\xa3\x0e\x18\x70\x07\x00\x00\x30\
+\xcb\x0b\x07\x89\x28\x47\x47\x00\x00\x00\x00\x49\x45\x4e\x44\xae\
+\x42\x60\x82\
+\x00\x00\x03\xf0\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x03\xa2\x49\x44\x41\x54\x78\x9c\xed\
+\x97\xbd\x6f\x1c\x45\x18\xc6\x9f\x67\x6e\xb1\x8c\x94\xd0\xc4\x29\
+\xa2\xfb\x8e\xb0\x30\x35\xa1\x87\x20\x2c\x94\x0a\xa7\x4c\x07\x51\
+\x04\x7f\x00\x10\x51\x44\x08\x21\x21\x3e\x6a\xa4\x28\x31\xe9\x10\
+\x05\x08\x68\x88\x25\x4b\xe0\x02\x3a\xa0\xc6\x91\x89\x76\x76\xf7\
+\x4e\x29\x9c\x8e\x02\x07\xdf\xcd\x43\x71\x32\xba\xdb\xdd\xf3\x7d\
+\xf8\xf6\x9c\x8f\xf9\x95\xf3\xee\x3b\xf3\xbc\xcf\xbe\xbb\x33\x03\
+\x78\x3c\x1e\x8f\xc7\xe3\xf1\x78\x3c\x1e\x8f\xc7\xe3\xf1\x78\x9e\
+\x2c\x78\x5c\x0b\x5b\x9b\xac\x81\xf8\x02\xa0\x01\x71\xb3\x51\xab\
+\x5c\x3b\x0e\x1d\xc7\x62\x40\x14\x25\x57\x04\x5c\x07\x60\xfe\x1f\
+\x14\xae\x34\x1a\xd5\xf5\x79\x6b\x31\xa3\x1f\x99\x2d\x51\x94\x5c\
+\x15\x70\x23\xb3\x36\x71\x33\x8a\x92\xf7\xe6\xad\x67\x6e\x1d\x20\
+\x89\x51\xd2\xfa\x0c\xc2\x3b\x23\x1e\xfd\xbc\x5e\xab\x5c\x25\xa9\
+\x79\xe8\x9a\x8b\x01\x92\x82\x28\x6a\xdf\x00\xf5\xc6\x58\x09\xc4\
+\xad\x7a\xb5\xf2\x16\xc9\x4e\xc1\xd2\x8a\x37\x20\x0c\xc3\x45\x32\
+\xf8\x1a\xc4\xeb\xfd\xe3\x02\x40\xc8\xa9\x27\xc1\x64\x84\x10\xdf\
+\xab\xdb\xb9\xd4\x6c\x36\xf7\x8a\xd4\x57\xe8\x3f\x60\x67\x67\xe7\
+\x19\x9a\xe0\x76\xa6\x78\x01\x04\xba\x00\x45\x40\x04\xba\x99\x7e\
+\x17\xd6\x68\x82\x1f\xb7\xb7\x77\x4f\x16\xa9\xb1\xb0\x0e\xd8\xb9\
+\x77\xef\xf4\x53\xff\x76\x36\x00\xbc\x30\x10\x90\x00\x9a\x6e\xaf\
+\x07\x52\x52\xe4\x4a\x60\x46\xd2\xef\xfb\x0b\xc1\x85\xe5\x33\x67\
+\x76\x8b\xd0\x59\x88\x01\x77\xef\xb6\x6b\xa5\xc0\x6d\x02\x78\x2e\
+\xb5\x9a\x00\x3a\x68\xd8\xff\x8d\x00\x65\xa0\x8c\xae\x3b\x9d\xc0\
+\xbc\xfa\x6c\xb9\x9c\xcc\x5a\xeb\xcc\x0d\xb0\xd6\x3e\x0f\x96\x36\
+\x01\x54\x52\x2b\x09\x82\x1b\x53\x94\x51\x4a\x1b\x81\xc4\x39\xb3\
+\xda\x6c\x96\xb7\x67\xa7\x76\xc6\xff\x80\x38\x8e\x5f\x04\x4b\xbf\
+\x20\x5d\x3c\xc6\x2f\xbe\xf7\x30\x1c\x30\xb8\x0d\x0a\xa8\xd2\xb8\
+\x5f\xe3\x38\x3e\x37\x0b\xad\x07\xcc\xcc\x80\x28\x6a\xbd\xe2\xc4\
+\x9f\x01\x9c\x4a\x85\x44\x8e\x5f\xfc\x01\xa4\x1c\xb2\xdf\xca\x29\
+\x27\x6e\x59\xdb\x3a\x3f\xb5\xd0\x14\x33\x31\xc0\xda\xe4\xa2\xa0\
+\xdb\x00\x4e\x0c\x04\x04\x01\x70\x43\x3f\xf9\x43\xe8\xe5\xd0\x41\
+\x99\xec\x13\xa0\x36\xac\x4d\xd6\xa6\x53\x3b\xc8\x91\x0d\xb0\x36\
+\xb9\x0c\xe2\x1b\x00\x0b\x03\x01\xd2\x61\x8a\x37\x9f\x81\x74\x20\
+\xd3\xf3\x2c\x80\xf8\xd6\xda\xf8\xcd\xa3\x4e\x7f\x24\x03\xac\x4d\
+\xde\x05\xb1\x9e\x9e\x87\x40\xde\x9b\x9b\x1e\xa9\xb7\x7b\x0c\x62\
+\x40\x7e\x69\x6d\x3c\xea\x68\x7d\x28\x53\xed\x02\x92\x68\xe3\xd6\
+\x27\x04\xf2\x2e\x2f\x0e\xd9\x4d\x7e\x56\x10\x39\x2f\x4d\xc0\xa7\
+\x8d\x5a\xe5\xfd\x69\xee\x0f\x13\x1b\x20\x29\x88\x92\xd6\x75\x08\
+\x97\x73\x84\x38\x16\x57\xfc\xc1\x1a\x64\x7e\xe7\xae\xd7\x6b\x95\
+\xb7\x49\x76\x27\x99\x6f\x22\x03\xc2\x30\x5c\x64\x29\xf8\x0a\xc2\
+\xc5\x8c\x30\xc1\x91\xc5\x16\xdf\xb7\x16\xc9\x1c\x13\x88\xef\xf6\
+\x1f\xec\x5d\x5a\x5e\x5e\x7e\x30\xee\x5c\x63\x1b\xb0\xbd\xbd\x7b\
+\x72\xf1\xe9\xbd\x1f\x00\xe4\x6c\x41\xca\xec\xdb\xc5\x23\x02\xcc\
+\xeb\x84\x9f\xf6\xfe\x59\x5c\x5b\x59\x39\xfd\xf7\x38\xb3\x8c\x65\
+\x40\xbb\xdd\x5e\xda\xef\xb8\x0d\x00\x03\x87\x10\xf5\xfa\x71\xa2\
+\x96\x9b\x35\x12\x4a\xe9\xeb\x83\x80\xdf\x16\x02\x73\xa1\x5c\x2e\
+\xdf\x1f\x95\x3f\xd2\x80\xbf\xda\xed\x6a\xd0\x71\x9b\x00\x56\x06\
+\x12\x09\x69\x82\xd3\x5d\x91\x90\x30\xca\xdc\x1f\xf4\x67\x50\x32\
+\xab\x95\x4a\xa5\x75\x68\xee\x61\xc1\x30\x6c\xaf\x18\xe3\x36\x05\
+\x54\x53\x69\xea\xb5\xfd\xc3\x04\x4d\xef\xb3\xe8\x1f\x42\xec\x3a\
+\x66\xf5\xec\xd9\xf2\x9d\xa1\x59\xc3\x02\x71\x1c\x9f\x73\xe2\x06\
+\x80\xa5\x54\x48\xc0\xc3\xf1\xe6\x73\x30\xc8\xd6\x74\x9f\x70\xaf\
+\xd5\xeb\xf5\x3f\x86\x25\x64\xb0\xb6\xf5\xb2\x13\xb7\xf0\x68\x15\
+\x0f\xe4\x9f\x41\x96\x04\xb3\x15\x86\xc9\x4b\x79\x09\x99\x0e\xb0\
+\x71\x7c\x0d\xe2\x87\x79\xb1\x47\x1c\x81\xfa\xa0\x51\xab\x7d\xd4\
+\x3f\x98\x29\x32\x8a\x92\x8e\x80\xd2\xfc\x74\xcd\x0f\x02\xdd\x7a\
+\xbd\x1a\xf4\x8f\xe5\x1d\x2b\x1f\x5b\xf2\x6a\xcb\x18\x60\xc8\x8f\
+\x73\x2e\x1e\x8f\x01\x74\xbd\xda\x3c\x1e\x8f\xc7\xe3\xf1\x78\x3c\
+\x1e\x8f\xc7\xe3\xf1\x78\x3c\x4f\x36\xff\x01\x8b\x04\x4e\x83\xb0\
+\x2f\x88\xa2\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x03\x2d\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x02\xdf\x49\x44\x41\x54\x78\x9c\xed\
+\xd5\x3f\x88\x14\x67\x18\xc7\xf1\xef\x33\xb3\x77\x08\x7a\x68\x93\
+\x10\xdd\x99\x9b\x59\xb7\x10\xe2\x35\x91\x2b\xa2\x42\x8a\x20\x01\
+\x95\x24\x58\xd8\x48\x34\x29\x44\xb0\xb0\x08\x81\x60\x0a\x91\x40\
+\x0a\xc1\x10\xb0\x11\x42\x6c\xa2\x45\x24\x11\x84\xc4\xc4\x34\x16\
+\x11\x2e\x68\x63\x75\x58\x68\x74\xde\x99\x59\x41\xcf\x53\x38\x14\
+\x3d\x6f\xdd\x7d\x52\x48\xc2\xde\x70\xfe\xe1\x66\x76\x15\x7c\x3e\
+\xe5\xfb\xcc\xfb\xdb\xe7\x7d\x66\x5f\x06\x8c\x31\xc6\x18\x63\x8c\
+\x31\xc6\x18\x63\x8c\x31\xc6\x18\xf3\xba\x90\xb2\x01\x69\x9a\xbe\
+\xad\x78\xc7\x81\x3a\xca\x77\x51\x14\x7c\x2b\x22\x5a\x41\x6f\x0b\
+\x72\x2e\xdf\x86\x70\x18\x00\x65\x5f\x1c\x87\x67\xcb\xe4\x55\x30\
+\x80\xfc\x2f\x85\xf7\x7a\x96\x4e\xdc\xbf\x37\xb3\x7b\x6c\x6c\x6c\
+\xae\x6c\x76\x2f\x55\x95\x2c\x6b\x7d\xa9\x70\xa8\x67\x79\x66\xfa\
+\xf6\xad\x37\xc6\xc7\xc7\xdb\x8b\xcd\xf5\x4a\x37\x86\x14\x33\x76\
+\x2e\x1b\x59\xfe\x67\x92\x24\x2b\xca\x66\xff\xff\x1b\xaa\xb5\x2c\
+\xcb\x8f\x16\x0e\x0f\x15\xbc\xc0\xd2\x01\x59\x96\x8d\x75\x55\xce\
+\x01\x6f\x16\x4a\x97\xbb\x1d\x7f\xcb\xea\xd5\xab\xd2\x32\xf9\x53\
+\x53\x53\xcb\x1e\x3c\x7c\x74\x12\xd8\x5a\x28\x3d\x12\xbc\xed\x51\
+\x54\xff\xad\x4c\x7e\xe9\x01\x00\x38\xe7\x1a\x88\x7f\x16\x58\x53\
+\x28\xdd\x44\xfd\xad\x71\xbc\xea\xd2\x22\x73\x57\x22\xde\x19\x90\
+\x75\x85\xd2\x5d\xc1\xfb\x28\x8a\xea\x13\x8b\x6a\xb8\x47\xe9\x2b\
+\x00\x10\xc7\x71\xe2\x7b\x6c\x10\x38\x5f\x28\xbd\x85\x74\xce\x3b\
+\xd7\x2a\xbe\xbd\xe7\x4a\xd3\x74\x2d\x9e\x7f\x61\x81\xc3\x5f\xef\
+\xf8\xb2\xbe\x8a\xc3\x43\x45\x03\x00\x08\xc3\xf0\xee\xdc\xdc\xec\
+\x07\x28\x3f\x15\x4a\x4b\x11\xfd\x35\xc9\xb2\xbd\x2f\x9a\xe5\x5c\
+\xeb\x7d\xc5\x9b\x40\x19\x9d\x57\x50\x2e\xb6\x87\x6b\xef\x36\x83\
+\xe0\x4a\x15\x3d\x43\x45\x57\xa0\x97\xaa\x7a\x59\x96\x7f\xa3\xc8\
+\x57\x0b\x94\x0f\x47\xa3\xc1\x7e\x11\xe9\x3e\x6d\x7f\x9a\xb6\x76\
+\x29\x7a\x0c\x18\x9a\x57\x10\x4e\x0f\xf9\xde\x27\xf5\x7a\xfd\x41\
+\x95\xfd\x56\x3e\x80\xff\xa4\x69\xbe\x47\xe1\x28\xe0\xf7\xae\x2b\
+\xfa\x33\xdd\xce\xa7\x8d\x46\x63\x76\xde\xfa\x93\xcf\xdc\x01\x85\
+\xaf\x8b\x59\x0a\x47\xe2\xd1\xe0\x0b\x11\xe9\x54\xdd\x67\xdf\x06\
+\x00\xe0\x5c\xbe\x19\xe1\x17\x60\xe9\xfc\x8a\x4e\xd4\x7c\xef\xe3\
+\x20\x08\xee\x00\x4c\x4e\x4e\x0e\x8f\x8c\xac\xf8\x5e\xd1\xcf\x0a\
+\x11\x2a\xf0\x79\x14\x85\x47\xfa\xd5\x63\x5f\x07\x00\xe0\xdc\x8d\
+\x77\x90\xee\xef\xc0\xca\xde\x75\x85\xab\xbe\xe8\xe6\x76\xbb\x3d\
+\xed\xd7\x86\x4e\x81\x6c\x2a\x6c\x9d\x45\xd9\x11\xc7\xe1\xe9\x7e\
+\xf6\xd7\xf7\x01\x00\x5c\xbb\x76\x63\xd4\xaf\x75\xff\x00\xd6\xbe\
+\xe0\x96\x69\xed\xca\x87\x8d\x46\x70\xa1\x9f\x7d\x41\x85\x5f\x81\
+\x67\x69\x36\xeb\x59\xe7\xf1\xdc\x46\xe0\xdc\xf3\x9e\x55\xb8\xea\
+\x7b\xac\x1f\xc4\xe1\x61\x40\x03\x00\x68\x36\x9b\x33\xf7\xef\xcd\
+\x6c\x11\xf4\xc7\x67\x3c\xf6\xf7\x70\xcd\xdb\x10\x86\xe1\x3f\x83\
+\xea\x6b\x20\x57\xa0\x97\xaa\x8a\xcb\x5a\x07\x05\x0e\x16\x4a\xa7\
+\x7c\x8f\x5d\x61\x18\x3e\x1c\x74\x4f\x2f\x85\x4b\xf3\x1f\x5c\x9a\
+\x3f\x76\x69\xde\x4e\xd2\xfc\x90\xaa\x0e\xec\xdf\xf8\xca\x50\xd5\
+\x5a\x92\x24\x4b\x5e\x76\x1f\xc6\x18\x63\x8c\x31\xc6\x18\x63\x8c\
+\x31\xc6\x18\x63\xcc\x6b\xe2\x5f\xd1\x80\xf4\xd2\x90\x91\xe7\x38\
+\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x02\x2d\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x01\xdf\x49\x44\x41\x54\x58\x85\xe5\
+\x96\xb1\x6b\x14\x51\x10\x87\xbf\xdf\xbb\x43\x82\x82\x47\x2c\x6c\
+\xac\xed\x2d\xad\x2c\x24\xb7\x01\x25\xcd\xc5\x8d\xd5\x05\x64\x15\
+\xd3\x08\xf9\x03\xc4\x42\xec\x45\x10\x54\xe2\x21\x78\x95\xae\x77\
+\x4d\xb0\xf0\x36\x58\x58\x59\x8a\xad\x20\x16\xda\xd8\xe8\x05\x0c\
+\x41\x72\x6f\x2c\x56\xc5\x4a\xf7\xed\x3e\x22\xe8\x74\x03\x3b\x33\
+\xdf\xfc\x76\xe6\x31\xf0\xbf\x9b\x62\x27\x5c\x4c\xb3\x23\xde\xeb\
+\x2d\x60\xc5\xe8\xfe\xfc\x9f\xbe\x6f\xc7\x2c\x9e\xf4\xfb\x87\xfc\
+\x8e\x9e\x02\x9d\xaa\x31\x2e\x56\xf1\x34\x4d\x0f\xd8\xce\xdc\x18\
+\x38\x19\x12\x17\x05\x20\x4d\xd3\xd6\x27\xdf\x79\x08\x96\x84\xc6\
+\xc6\x00\xd0\x67\xdf\xb9\x2d\x38\x8f\x01\xe0\xf7\x15\x60\xe1\x5c\
+\x76\x1d\x58\xc3\x00\x27\x0f\xdf\x31\x2a\x5a\xa3\x21\x5c\xe8\x5d\
+\x5c\x97\x71\x15\x00\xc9\x63\x16\x54\x1c\x1a\x28\xd0\xed\x65\x7d\
+\x89\x9b\x3f\x8b\x13\x5e\xbc\x36\x40\xb2\x9c\x2d\x21\x3d\x28\xbd\
+\x7a\x9d\xd7\x06\x48\x7a\xd9\x29\x43\x8f\x81\x96\x61\x56\xb7\xf3\
+\x5a\x00\xdd\xf4\xd2\x09\x93\xdb\x04\xe6\x30\x33\xa1\xa0\x89\x6f\
+\x04\xd0\x5d\xbe\x7c\x1c\x6f\xcf\xc0\x0e\x1b\x58\xf9\xdf\x9b\x5b\
+\x25\x80\xd3\xe9\xda\x31\x98\x15\xc0\x51\xc0\x14\xb8\xeb\xbf\xb3\
+\x4a\x6b\xd8\xf2\x7b\xef\x7f\x71\xa3\x15\x87\x8a\x0a\x08\x5e\x43\
+\xe0\x0b\x13\x13\x60\xcf\xb5\xcf\x80\xbd\x53\x40\x4c\x54\x80\xe7\
+\xf9\xdd\x0f\xd0\x4e\x80\x8f\x80\x2c\x22\x44\xe5\x44\xc5\xe8\xde\
+\x1b\x9c\x16\x41\xdb\x2a\x0f\x99\x28\x10\x41\x49\x8a\x7c\xe3\x95\
+\xcc\x2f\x01\xbb\x80\xcc\x9a\x43\x04\x27\x98\x8c\x07\x2f\x84\xad\
+\x00\x33\x09\x81\x1a\x9d\x75\xb5\x3a\x98\x8c\x06\x9b\x98\x5d\x28\
+\x3d\x73\x34\xb8\x2d\x6b\x4b\x58\x8c\x07\x43\xd0\xfa\x8f\x3c\xa5\
+\x1a\xfb\x08\x00\x50\x8c\x36\x6e\x99\xec\x06\x80\x79\x9c\x6a\x28\
+\xd1\x78\x88\xb6\x9e\x0c\xae\x09\xee\x20\x30\xc3\x11\xa8\x44\x8c\
+\x55\xb2\x8e\x9b\x5e\x31\x78\x84\x80\xc0\xcd\x88\xb2\xcb\x79\x9e\
+\xcf\xe6\xdd\x74\x15\x34\x09\x8d\x8d\xf6\xa2\xe5\x79\xfe\x55\x07\
+\x77\x7b\xc0\xcb\xbf\x02\x00\x30\x19\x0e\xbf\x38\x67\x67\x91\xb6\
+\x81\x69\xcc\xdc\xff\xae\x7d\x03\x68\x47\x95\x0a\x88\x7f\x49\xe0\
+\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x03\x38\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x02\xea\x49\x44\x41\x54\x78\x9c\xed\
+\x98\xc1\x6b\x13\x41\x18\xc5\xdf\xb7\x69\xda\xb4\x45\x2a\xa2\xf5\
+\x90\x4c\x36\x09\x04\x4f\xde\x8a\x15\xaa\x17\x11\x04\x2f\x2a\x82\
+\x22\x1e\xec\x41\x10\x04\xe9\xc5\x9b\xa0\x07\xbd\x89\x7f\x81\xa0\
+\x1e\xa4\x78\x11\x44\xa1\x08\xa2\xf5\x20\x1e\xbc\x29\x82\x2d\xb1\
+\xcd\x4e\x36\x11\xb4\x05\x4d\x15\x1b\x9a\x64\x3f\x4f\x62\x93\x6c\
+\x4d\x0b\x99\xd9\x1e\xbe\xdf\xf1\x7d\xb0\xef\xcd\xdb\x59\x66\x58\
+\x40\x10\x04\x41\x10\x04\x41\x10\x04\x41\x10\x04\xa1\xc7\x78\x9e\
+\x3f\xed\x69\x9f\x3d\xed\x73\xb1\x54\x9a\x8c\x3a\x4f\x3b\x64\xf2\
+\xe1\xc5\x62\x31\x41\x4e\xdf\x6a\x8b\xc8\x74\x24\x93\x49\xcd\x9a\
+\xf4\xdd\x0a\x8e\xc9\x87\x0f\x0f\x0f\xf7\x75\x88\xc4\xaf\xb4\xd6\
+\x39\x93\xbe\x5b\xc1\x68\x01\xa3\xa3\xa3\xbf\xc2\x74\x86\xb3\x30\
+\x37\xb7\xb4\xc3\xa4\xf7\x66\x31\x5a\x00\x00\xb8\xe9\x54\xe7\x2e\
+\x00\x90\x18\xac\xad\x30\xb3\x71\xff\x6e\x18\x0f\x40\x44\xcd\xfa\
+\x5a\x6d\x24\x6c\xa6\x4b\xe5\xa6\x69\xff\x6e\x58\x79\x03\xf9\x7c\
+\x7e\x25\xe6\x20\x1f\x36\xf3\x74\xe9\x8d\x8d\x0c\x1b\x61\x6d\x0b\
+\x2a\xa5\x3e\x13\xe8\x68\xe7\x84\x26\xbc\x92\x7f\xdb\x56\x8e\x76\
+\xac\x7e\x83\xae\x9b\x7a\x09\xc6\x95\x8e\x01\xe3\xaa\xe7\xf9\xe7\
+\x6d\x66\xf9\x8b\xd1\x7b\xc0\x46\x68\x5d\x7a\xc0\xa0\x0b\xed\x7a\
+\xe0\x60\x3c\xa7\xd4\x3b\x9b\x59\x22\x29\x00\x00\x3c\xed\x2f\x00\
+\xe8\xb8\x0f\x38\xc4\xc9\x74\x3a\xfd\xc5\x56\x8e\xc8\x0a\x00\x00\
+\x4f\xfb\x1c\xa6\xc7\x1c\x0c\x29\xa5\x56\xc3\x66\xbd\x26\xd2\x73\
+\x78\x79\xe9\x6b\x7f\x98\xde\x0c\xf0\x9b\x99\xad\xbc\x9c\x48\x77\
+\x00\x00\x54\x2a\x95\xdd\xf5\x46\xb0\x14\x32\xaa\x66\x5c\xb5\xd3\
+\xb4\x7f\xe4\x37\xb1\x64\x32\xb9\xec\x10\xef\x0f\x19\x8d\x68\x5d\
+\x7e\x64\xda\x3f\xf2\x02\x00\x20\x9d\x4e\x7f\x64\xe2\x93\xed\x3a\
+\x83\xcf\x9a\xf6\xde\x16\x05\x00\x00\x9a\xb1\xf9\x28\x6c\xb7\x45\
+\x01\x8b\x8b\x8b\x7b\xc9\x09\x66\x42\x46\x6f\x4d\x7b\x47\x5e\x40\
+\xa5\x52\x19\x8a\xc5\xe2\x4f\x01\x64\x5b\x06\x44\x37\x33\xae\x9a\
+\x30\xed\x1f\x69\x01\xcc\x1c\x6b\x34\x82\x69\x06\x0e\xb4\x8d\xee\
+\xba\x2a\x79\xc3\x46\x86\x48\x0b\xf0\x4a\xe5\x3b\x0c\x9c\x68\x11\
+\x19\xcf\xdd\x74\xea\x32\x11\x85\x5e\x92\x7a\x4d\x64\x05\x68\xed\
+\x4f\x11\x30\xd5\x22\x12\xde\xd7\x6a\x89\x33\x44\xd4\xb0\x95\x23\
+\x92\x8b\x90\xe7\xf9\xa7\x40\x78\xdc\xe6\x5f\x8e\x39\x38\xa8\x94\
+\xaa\xd8\xcc\x62\xbd\x80\xa2\xef\x8f\x53\x80\x59\x00\x83\xeb\xe4\
+\x9f\x81\x83\x43\x39\xa5\x3e\xd8\xce\x63\xf5\x13\xd0\x5a\xe7\xa8\
+\x89\x67\x68\x5d\x7c\x83\x10\x9c\x8e\x62\xf1\x80\xc5\x02\x7c\xdf\
+\xdf\xc5\x70\x66\x40\xd8\xd3\x32\x60\xbe\xe4\xba\xee\x0b\x5b\x39\
+\xda\x09\xfd\x63\xdb\x6b\x0a\x85\xc2\x40\x23\xc0\x13\x02\xf6\xb5\
+\x0c\x88\x6e\x65\x5c\x75\xcf\x46\x86\x8d\x30\xbe\x03\x98\xd9\x89\
+\xc7\x13\xf7\x09\x38\xdc\x36\x7a\xe8\xaa\xe4\x75\xd3\xfe\xdd\x30\
+\x5e\x80\xd6\xfe\x35\x10\xce\xb5\x88\x84\xd7\xf5\xb5\xda\x45\x5b\
+\x67\xfd\xff\x30\x7a\x0a\x14\x0a\x85\x81\x78\x7f\xe2\x07\x80\xc4\
+\x3f\x95\x3f\x11\x78\xc2\x75\xdd\xef\x26\xbd\x37\x8b\xd1\x1d\x50\
+\xad\x56\x03\x00\xf5\x75\xd2\x37\x0e\x9a\xc7\xb7\xcb\xe2\x01\xc3\
+\x05\x8c\x8d\x8d\xd5\xc1\x98\x04\xb0\x0c\x60\x9e\x03\x3a\x96\xcd\
+\x66\x3d\x93\x9e\x82\x20\x08\x82\x20\x08\x82\x20\x08\x82\x20\x08\
+\xdd\xf8\x03\x6a\x65\xdc\x45\x31\x50\xc4\x7d\x00\x00\x00\x00\x49\
+\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x00\x9a\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x00\x4c\x49\x44\x41\x54\x58\x85\xed\
+\xd7\xc1\x09\x00\x20\x0c\x04\xc1\x20\x16\x66\xe1\x82\xad\x48\x52\
+\x48\xec\x40\x3d\xf1\xb9\xfb\x3c\x08\xcc\x37\x66\x24\x36\x3d\xc6\
+\xf4\x18\xb7\xfb\xa9\x2a\x0b\xd2\x9a\xb4\x1f\x2a\x2f\x47\x3f\x03\
+\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xfd\x33\xb2\
+\xec\xda\x4e\xfb\x16\xbe\x7b\x13\xbf\x30\xe2\x93\xe7\x00\x00\x00\
+\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x06\xf1\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x06\xa3\x49\x44\x41\x54\x78\x9c\xed\
+\x9a\xcd\x73\x5b\x67\x15\x87\x9f\xf3\xca\xed\x24\x84\x3a\x4d\xbf\
+\x99\xae\xd8\x36\x6d\xda\xea\xc3\x21\x94\x81\xc6\x49\x6d\x27\x8d\
+\xe3\xfe\x01\x85\x45\x07\xf9\x63\x6a\x4b\x86\x55\x59\xc0\x82\xc9\
+\x02\x86\x81\xda\x96\xa7\xb6\x6c\x66\xd8\xf5\x1f\xa0\x09\x89\xbf\
+\x42\x81\x36\xb1\x25\xab\x1f\x40\x37\x9d\x4e\x17\x1d\x86\x19\x4a\
+\x0b\x71\x9a\x26\x4a\xf0\x7b\x58\xc8\x37\x88\x2b\xd9\x7a\xaf\x74\
+\x6f\x6d\x06\x3f\xcb\xf7\x9e\x7b\xde\xf3\xfb\xe9\x9c\x57\xd2\x95\
+\x60\x97\x5d\x76\xf9\x7f\x46\xea\x2d\x1e\xfa\xf6\xcf\xf6\xdd\xb1\
+\x77\xcf\xf7\xc5\x68\x2f\xca\x1e\x90\x4b\x66\x9d\x9f\xac\xfc\x72\
+\xe4\xc3\x2f\xba\xc0\x66\xe8\xf8\x6e\xee\xab\x36\xc6\x4b\xa0\x47\
+\x10\x6e\x60\xe5\xec\xe7\x6d\xe6\xe7\xef\xbd\xf2\xe2\x67\xfe\xd8\
+\x1a\x03\x9e\x7a\xe1\xa7\x77\x95\xef\xd8\xfb\x3a\xf0\xa4\xef\xd2\
+\x15\x55\xdb\xbd\x3a\x33\xba\x1c\x55\xe1\x61\x90\x4a\x8f\xa5\xd4\
+\x98\x79\x60\x7f\xf5\xba\xc2\x3b\x6d\x77\xf2\xcd\xe5\x5c\x66\xad\
+\x7a\xdd\xf8\x13\x94\xef\xdc\xfb\x12\xb5\xe2\x01\xf6\x8b\x98\xb9\
+\x44\xff\xd8\xe1\x50\x2b\x0e\x91\xcd\xc4\x03\x08\x3c\x6e\x6f\xe9\
+\x0f\xfc\xeb\x35\x06\xa0\x9c\xde\x62\x8f\xf6\x9d\x6a\xc2\x56\xe2\
+\x3d\xd4\x9a\x3e\xff\x5a\xad\x01\xb0\xb7\xc1\x5e\xed\x22\x66\x2e\
+\x39\x38\xd1\x11\xb0\xc6\xc8\xe8\x18\xc8\x25\x1b\x89\x07\x40\x74\
+\x8f\x7f\xa9\x9e\x01\x6f\x38\xec\xd9\x8e\x32\xbf\x13\x4c\xe8\x18\
+\xc8\x25\x2d\xba\x40\x23\xf1\x00\x68\x8d\xb6\x1a\x03\x62\xe8\x19\
+\xe0\x8a\xc3\xde\xdb\x6e\x42\x30\xf1\xac\xc5\xe0\xc7\xfe\xc5\x1a\
+\x03\x96\xf3\xd9\xf7\x11\xba\x70\x37\x61\x5b\xc6\x61\x43\x7c\xe3\
+\xb6\xaf\xb0\x66\x0d\xdd\xcb\xf9\xec\xfb\xfe\x0b\xf5\x46\x80\xe2\
+\x74\x66\x65\xc3\x84\xb5\x7a\xd7\x7d\xec\x47\x99\x4b\xa5\xc7\x52\
+\x0e\xb1\xa1\x10\x1f\x1a\x4f\x6c\x88\xbf\xdb\x21\xfc\xaa\x35\x74\
+\x97\xa6\x32\x97\xeb\x5d\xac\xfb\x41\xc8\x23\x39\x38\xd1\x81\x32\
+\x0f\xb4\x3b\x6c\x74\x45\xac\x7d\xa6\x30\x3b\x5a\x70\x88\x6d\x9a\
+\xf8\xd0\x78\xc2\x58\x59\xc0\x5d\x7c\xd7\x66\xe2\xa1\x81\x01\xb0\
+\xb3\x4c\x08\x5b\x3c\x38\x18\x00\x90\xe8\x1f\x3b\x2c\x62\xe6\x70\
+\x34\xc1\x20\xc7\x57\xf2\x23\x45\x97\xdc\xae\x24\xfa\x27\xe3\x22\
+\x76\x01\x38\xe0\x10\x7e\xd5\x60\xba\x57\xf2\xc3\x97\x1a\x05\x3a\
+\x19\x50\x29\x60\xfb\x4c\x88\x4a\x3c\x6c\x72\x08\xd6\x63\x75\x66\
+\x74\xd9\x1a\xba\x71\x3c\x18\x2d\xba\xd0\x31\x90\x4b\xba\xe6\xdf\
+\x8c\xa0\xe2\xc5\x6a\x8f\xab\x78\x08\xd0\x01\x1e\xf1\xa1\x89\xaf\
+\x19\xcb\x1c\x70\x97\x43\xf8\x3f\x0d\xf2\x4c\xb3\x9d\x10\x50\xfc\
+\x67\x62\xb5\xbb\x30\x9b\x7d\x33\xc8\x1e\xce\x1d\xe0\x51\x9a\xca\
+\x5c\xb6\x86\x2e\xe0\xaa\x43\xf8\xdd\x16\x9d\x8f\x0f\x8d\x27\x82\
+\xee\xf3\x45\x88\x87\x26\x3a\xc0\x23\x68\x27\x58\xa3\xc7\x4b\x53\
+\xd9\x55\x97\xdc\xc9\xc1\x89\x27\x51\x16\x89\x58\x3c\x34\xd1\x01\
+\x1e\xa5\xa9\xcc\x65\x83\xe9\xc6\xb1\x13\x8c\x95\x05\x97\x4e\x08\
+\x2a\x1e\x91\x9e\x66\xc5\x43\x0b\x1d\xe0\xd1\x31\x30\x79\xc4\x62\
+\x2f\x10\x42\x27\x34\x23\xbe\x38\x3d\xe2\xf2\xe5\x6d\x53\x9a\xee\
+\x00\x8f\x95\xfc\xf0\x25\xb1\xda\x83\x7b\x27\xcc\x27\xfa\x27\xe3\
+\xfe\x0b\x1b\xe2\x9d\x67\x5e\xd5\x9e\x68\x55\x3c\x84\x60\x00\x40\
+\x61\x36\xfb\xe6\x86\x09\x35\xcf\xdc\xea\x70\x40\xc4\x2e\x54\x9b\
+\x90\x4a\xbf\xfc\xc4\x86\xf8\x7b\x1c\xee\xbf\xa6\x6a\x4f\xac\xce\
+\x8c\xfe\xa1\xd9\x7a\xab\x69\x79\x04\xaa\x49\xa5\xc7\xbf\xae\x46\
+\x2e\x00\x5f\x76\x08\xff\x87\xaa\x39\x6e\xf4\x96\x55\x13\x5b\xc4\
+\x5d\x7c\x4f\x58\xe2\x21\x64\x03\x20\x98\x09\x82\xae\x69\xa5\x04\
+\x97\x4f\x97\xa1\x8b\xaf\xd4\x10\x01\xc9\xc1\xdc\x53\xa8\x9e\xc7\
+\xad\x13\x5c\xb8\x66\x0d\x27\x4a\x53\x99\xdf\x87\x94\xef\x36\x91\
+\x18\x00\xa1\x9a\x10\x99\x78\x08\xe9\x10\xac\x47\x71\x7a\xe4\x0d\
+\x55\x7b\x02\xb7\x83\x71\x33\xae\x09\xf6\x64\x54\xe2\x21\xc2\x0e\
+\xf0\x48\xf4\x8f\x7d\x43\xc4\x9c\x07\xf6\x05\xbc\xf5\x9a\x60\x4f\
+\x16\xf2\xa3\xbf\x8b\xa2\x2e\x8f\xc8\x0d\x80\x8a\x09\xc6\x98\x39\
+\xd5\x86\x8f\xdc\x3d\x6e\x08\xb6\x3b\x6a\xf1\x10\xe1\x08\x54\xa3\
+\x31\xd6\x54\xe5\xa6\xf3\x0d\xc2\x4d\xac\xba\x7c\xed\x6e\x99\xc8\
+\x0d\x88\x0f\x8d\x1d\x32\xd6\x2c\x81\xba\x3c\xbd\xad\xa0\xb4\xab\
+\x89\x2d\xa6\xd2\x2f\x3f\x11\x61\x69\x40\xc4\x23\xf0\x1f\xf1\xdc\
+\xdb\x64\x8a\x4f\xc5\xae\x1f\x2b\xcc\x7e\xef\xed\x30\xeb\xaa\x26\
+\x32\x03\x36\xc4\x2f\x02\xf7\xb5\x98\xea\x53\x03\x9d\x2b\xf9\xcc\
+\x3b\x61\xd4\xe5\x27\x12\x03\x12\xfd\xb9\xc7\x44\x74\x89\xd6\xc5\
+\x7b\x44\x66\x42\xe8\x67\x40\x10\xf1\x0a\x65\x85\xb2\x43\xda\x7b\
+\x2c\x2c\x76\x0c\x4c\x3c\xde\x7a\x85\xff\x4d\xa8\x06\x04\x7c\xe5\
+\xaf\x8b\x48\x8f\xc1\x76\x01\x9f\x3b\xc4\xdf\x1b\x85\x09\xa1\x8d\
+\x40\x72\x70\xfc\x51\x54\x2e\xe2\x28\x5e\x55\x9f\x5d\x9d\xc9\x5e\
+\x04\x48\xa5\x27\xbe\xa5\x86\x73\xc0\x97\x1c\xee\xfd\xc4\x1a\xdb\
+\x59\x9a\x1a\x7d\xb7\x95\x7a\x3d\x42\x31\xa0\x15\xf1\x1e\xdb\x65\
+\x42\xcb\x23\x10\x54\xbc\x15\x39\xe5\x17\x0f\x50\x98\xcd\xbc\x8e\
+\xc8\xb3\x38\x8e\x83\xb1\x66\x29\x3e\x34\x76\x28\x68\xbd\x7e\x5a\
+\x32\x20\x39\x38\xfe\x28\x88\xf3\xcc\x5b\x91\x53\xa5\xe9\x91\xa5\
+\xcd\x02\x8a\xd3\x23\xbf\x0d\x68\xc2\x62\xab\x26\x34\x3d\x02\xb7\
+\xc5\x2b\xf7\x3b\x84\x5f\x17\xb4\xb7\x90\xcf\x2e\xba\xe5\xce\x3d\
+\x8d\xea\x39\x1a\xff\x5d\x07\xe0\xef\xaa\xd2\xb9\x3a\x33\xf2\x47\
+\x97\xdc\x7e\x9a\xea\x80\x54\x7a\xf2\x60\x00\xf1\x37\x82\x88\x87\
+\xdb\x9d\x70\x12\xb8\xee\x10\x7e\x9f\x88\x2e\x25\xfa\x73\x8f\xb9\
+\xe6\xaf\x26\x70\x07\xa4\xd2\x93\x07\x35\x66\x2f\x06\x10\x7f\x2a\
+\x88\xf8\x6a\x12\xfd\xe3\x47\x45\xe4\x2c\x11\x76\x42\x20\x03\x52\
+\xe9\xc9\x83\x18\xbb\xa4\xf0\x80\x43\x78\x4b\xe2\x3d\x82\x9a\x80\
+\xe8\xd1\xe2\x74\xf6\x4f\xae\xf9\x9d\x0d\x08\x2a\x1e\x4b\x6f\x71\
+\x36\xb3\xe0\x9a\x7f\x2b\xe2\x83\xb9\x4e\xa3\xfa\x1a\x11\x98\xe0\
+\x64\xc0\xe1\x81\x89\x47\x2c\x5c\xdc\x0e\xf1\x1e\x51\x99\xd0\xf0\
+\x10\x0c\x2c\x1e\x73\x3a\x6c\xf1\x00\xa5\xe9\x91\x25\x41\x7b\x71\
+\x3c\x18\x41\x96\x2a\xef\x54\x5b\xb3\x65\x07\x34\x25\x3e\x3f\x3c\
+\xef\x10\xdb\x34\xa9\x81\xf1\x63\x8a\xbc\x06\xd4\xfc\xeb\xb3\x06\
+\xe1\x63\xd0\xce\xad\x3a\x61\xd3\x0e\x38\x3c\x30\xf1\xc8\x3a\x38\
+\xcf\xbc\x2a\x7d\x51\x8b\x07\x28\xe4\xb3\x8b\x82\x9e\x02\x6e\x34\
+\x0c\x56\xee\x07\x59\xaa\xbc\x6d\xd7\xa7\x6e\x07\x78\xe2\x81\x07\
+\x1d\x6a\x2a\xab\x72\x7a\x75\x26\x33\xe7\x10\x1b\x1a\x41\x3b\x41\
+\xd6\xcd\xd1\xc2\xec\xf0\x9f\x6b\x2f\xf9\x38\x32\xf8\x8b\x87\x6f\
+\x69\x5b\x11\x78\xc8\xa1\x8e\x6d\x11\xef\x91\x4c\x4f\x1c\xc7\xf0\
+\x6b\x1c\x4c\x10\xf8\x1b\xb1\x58\xb2\xf0\xca\x8b\x1f\x55\xaf\xd7\
+\x8c\xc0\x2d\xdb\xf6\x43\xfe\x07\xc4\x03\x14\x67\x33\x0b\x58\x7a\
+\x71\x18\x07\x85\x07\xb0\xeb\x3f\xf2\xaf\xd7\x9e\x01\xc2\xd3\x0e\
+\x7b\x97\xad\x48\xdf\x76\x8a\xf7\xa8\xbc\xe3\x98\xd3\xb8\x98\xa0\
+\x1c\xf5\xaf\xd5\x18\xa0\xb0\xde\x20\x4f\xd9\x8a\xf4\x95\xa6\x47\
+\x2e\xb8\x97\x19\x2d\x95\xc3\xd7\xc9\x84\x1a\x6d\x35\x06\x08\x6c\
+\xf5\xaa\x96\x05\x7d\x6e\x27\x89\xf7\x28\xe6\x87\xe7\x55\xe9\x63\
+\x0b\x13\x44\x38\xef\x5f\xab\x31\xc0\xb4\x99\x33\xc0\x07\x75\xee\
+\x2f\x0b\xfa\x5c\x21\x9f\xad\x49\xb2\x53\x58\x9d\xc9\xcc\x6d\x61\
+\xc2\x87\xff\x2a\x73\xc6\xbf\x18\xf3\x2f\xfc\xa5\x70\xee\xfa\x57\
+\x12\xc7\x5e\x15\x89\xed\x43\x79\x50\x84\x9b\x28\x8b\x8a\xf9\x4e\
+\x71\x26\xba\x5f\x69\xc3\xe2\xaf\xab\xbf\xf9\xe0\xe1\x78\xd7\x59\
+\xc4\x3c\x04\x1c\x40\xf9\x44\x45\x5f\xb5\x37\xe5\xf9\xb7\x7e\x95\
+\xf9\x78\xbb\xeb\xdb\x65\x97\x5d\x76\x16\xff\x06\x5e\xec\x1f\xa0\
+\xf6\x5e\x26\xad\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
+\
+\x00\x00\x02\x06\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x01\xb8\x49\x44\x41\x54\x58\x85\xed\
+\x97\xcf\x4a\x1b\x51\x14\x87\xbf\x33\x49\x56\x25\x42\x2b\xa9\xe0\
+\x6b\x34\xff\x8a\xc5\x07\x68\x4a\x5f\xa2\xc1\x94\x6a\x46\x29\x25\
+\xf6\x11\x1a\xa1\x25\x99\xd8\xa2\x45\x17\x92\x95\x0f\x10\x70\xd3\
+\x2e\x04\xab\x69\x93\xd7\x10\x34\x28\x94\x2c\x63\x72\x5c\xcc\x64\
+\x0c\xc6\x8e\x98\x4c\x62\x69\xf3\x5b\xde\x7b\xb8\xdf\x37\xf7\x5c\
+\x86\x7b\xe1\x7f\x8f\x5c\x1f\x88\xbe\x2e\xcd\xa1\xba\x8a\x90\x44\
+\x89\xf8\x44\x69\xa0\x1c\x21\x92\xaf\x6d\x64\x0f\xfe\x28\x10\xcb\
+\x14\xdf\x29\xb2\x76\x93\x98\x4f\xe9\xa8\x92\xab\x7f\x35\x3f\xf6\
+\x09\x3c\x59\x28\x3c\x13\x31\xf6\x81\xdf\x88\x9a\xa1\x56\xbb\x72\
+\xb8\xfd\xf6\xdc\x0f\xea\xd3\x57\x9f\x1e\xb5\x42\x81\x14\x2a\x16\
+\x30\x85\xc8\x7c\x77\x27\x82\xae\x89\x18\x39\x40\x10\x35\x6b\x1b\
+\xcb\x65\x3f\xc0\xdd\x38\x1f\x52\x8e\x66\x2c\x01\x76\x50\x5d\x05\
+\x5e\x02\x18\x6e\x95\x90\x04\x08\xb5\xda\x15\x3f\xe1\xbd\x31\x82\
+\x46\xc5\x46\x91\x70\xc7\xdc\x59\xe7\xc0\xf9\xb5\xed\x37\xe5\xe7\
+\xe7\xa5\x33\x1b\xc5\xe3\x7e\x81\x7b\xca\x44\x60\x22\x70\xef\x02\
+\xc1\xdb\x0a\x62\x99\xd2\x1b\x45\x3f\x00\xe1\x3b\xae\xdd\x14\xe4\
+\xfd\xaf\xcd\xec\x17\xaf\x22\xcf\x1d\x48\xa4\x0b\x33\x8a\x96\x06\
+\x80\x03\x84\x15\xb5\x12\xe9\xc2\xcc\xc0\x02\xe3\x88\xa7\x40\x75\
+\x6b\xe5\x44\x90\x2c\xd0\x1c\x60\xed\xa6\x20\x66\x75\x6b\xe5\xc4\
+\xab\xe8\xd6\x33\xe0\xf4\xd0\xb3\x8f\xc3\xe4\xef\x6e\xc1\x44\x60\
+\x22\x30\x5e\x01\xa1\x01\xf6\x05\x72\x54\xb0\xf8\xe2\xfa\xb4\x8d\
+\xe2\xb4\x5f\x40\x39\x02\x68\x85\x02\xa9\x51\x09\x74\x2e\x3a\x29\
+\x1b\x45\xb5\x3b\x76\xf5\x23\x12\xc9\xa3\xfa\x02\x15\x2b\x9a\xb1\
+\xc4\x08\x1a\x95\xee\x1d\x6e\xd8\xc4\x17\xd7\xa7\x1d\x78\x11\xe8\
+\x20\x92\x77\xb1\xbd\x85\xce\xc3\x24\xcf\xe8\xce\x46\xdf\xc3\x24\
+\xd0\x3b\x7b\x5c\xdf\xfb\x31\x1b\x7b\xfe\x0d\x88\x08\x3c\x04\x1e\
+\xf8\x41\x75\x7a\xfe\x1d\x91\x74\x7d\xd3\xdc\xf5\x63\xcd\x7f\x27\
+\x97\x00\x43\x86\x87\x3f\x9c\xa0\xff\x00\x00\x00\x00\x49\x45\x4e\
+\x44\xae\x42\x60\x82\
+\x00\x00\x02\x37\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x01\xe9\x49\x44\x41\x54\x58\x85\xed\
+\x94\x31\x68\x13\x61\x14\xc7\x7f\xef\x8e\x50\x8d\x20\x75\x50\x8a\
+\x93\x29\xe2\x24\xa2\xa5\x71\x11\xdc\x44\x91\x8e\x8a\x53\x41\x87\
+\xda\xa0\x49\x8a\x83\x93\x08\xea\xea\x60\x4d\x5b\x6b\xeb\xe0\xa0\
+\xa0\x58\xc4\x41\x07\xa5\x53\x71\x50\xa8\x8d\x5a\xc4\xc9\xc1\x45\
+\xa1\x88\x56\x45\x4b\xb5\xb9\xfb\x3b\x24\x67\xcf\x60\x9b\xbb\x58\
+\xec\x72\x3f\x38\xf8\x8e\x7b\xef\xff\xfe\xef\xde\xf7\x7d\x90\x90\
+\x90\x90\xb0\xca\x58\xb0\xe8\x3c\x5e\x9a\xc5\x68\xfd\x2f\x55\xc5\
+\xe7\x67\xa3\xc5\x0d\x00\x4e\xc8\x8a\xb3\x64\xc2\x4a\x13\xaa\xf5\
+\x7b\x91\xaa\x54\x32\x06\x4f\x83\x77\x21\x1f\xf0\x56\xe2\x11\xf8\
+\xa1\xf2\x4f\x52\x95\x4a\x66\xd1\x4b\x88\x1d\xdd\x17\xd7\xb5\xa4\
+\x5b\xee\x0a\xf6\x23\xc0\xe4\x83\xe9\x5f\x9a\x15\x32\xc3\x82\x46\
+\x1f\xfe\x9c\xfb\x71\x68\xfa\xc6\xe9\xef\xc1\x77\x37\x1c\x3c\x33\
+\x3d\xbe\xd0\xda\xbe\xfb\x4e\x6a\x6d\x7a\x1b\xc6\xf6\xaa\xc1\x3f\
+\x3c\xc6\x2b\x6e\x2c\x16\x97\xdd\x9e\x9b\xfd\x78\xe4\xd5\xad\x33\
+\xf3\xe1\x18\xb7\x3e\xe9\xc3\xeb\x09\x6f\x4f\xfb\xb1\x7b\x5f\xd2\
+\xdf\x36\x82\x65\x01\x93\x09\x8b\x69\x44\x60\x56\x1b\xb1\x19\xc3\
+\x99\x4f\x6d\x3d\x13\x63\xf9\x4a\x7d\xdc\x32\xaa\xb2\x6c\xae\x74\
+\x5e\xb2\xb3\xb5\x48\x1f\x11\x6d\x1c\x86\xa1\x6a\x71\xc1\x85\xa9\
+\x91\xc2\xb9\xa5\x46\xd9\xb0\xad\x6c\xef\x40\x9f\x50\x3f\x80\xaa\
+\x03\xf5\x1b\xa4\x38\x81\xae\x44\xdf\xd4\x68\xb1\xb4\xbc\xd7\x08\
+\x74\xe6\x2e\x77\x23\xbb\x0e\xb8\x02\x19\x7f\x37\x21\xe1\x58\x75\
+\x56\x9e\x61\x47\x27\x47\x0a\x37\x1b\x69\x47\x1e\x6c\x47\x6e\xb0\
+\xcb\x91\x3f\x06\xac\x01\x44\xbd\x09\x99\x83\xc9\x80\x79\xdf\x9c\
+\xc3\xe5\xab\xf9\x07\x51\x74\x63\xed\xac\x6c\x6f\xff\x5e\xe1\xdc\
+\x07\xd6\xd7\x99\x08\x7e\xfb\x57\xdf\xa1\xab\x3c\x5c\x7c\x1c\x55\
+\x33\xf6\x19\xcb\xf6\x5c\xda\x89\xe3\x3e\x12\x6c\x02\x54\xdb\xed\
+\x00\x33\xe6\x7b\x07\x26\xaf\x9d\x7a\x11\x47\xaf\xa9\x43\xde\x71\
+\x62\x68\xab\x79\xde\xb8\xc1\x16\x00\xc1\x5b\xb9\xee\xbe\xf2\x95\
+\x93\x6f\xe2\x6a\x35\x7d\xcb\xec\xca\x0f\x6c\x76\x17\xf4\x4e\xf0\
+\xd2\x4f\xd9\xc1\xe7\x83\x85\xf7\xcd\x6a\x25\x24\x24\x24\xac\x2a\
+\xbf\x00\xaf\x38\xac\x82\xe2\x51\x10\x13\x00\x00\x00\x00\x49\x45\
+\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x01\x04\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x00\xb6\x49\x44\x41\x54\x78\x9c\xed\
+\xd9\xd1\x0d\x83\x50\x0c\xc5\xd0\x14\x75\x8d\x0a\xf6\x9f\x0a\xc4\
+\x20\x74\x8c\x83\xf4\xec\x05\x62\x59\xf7\x2f\x33\x90\xf3\xba\x9f\
+\xf3\xba\x1f\xe9\xb0\xc9\xe3\x6f\xa0\x00\x5a\x40\x53\x00\x2d\xa0\
+\x29\x80\x16\xd0\x14\x40\x0b\x68\x0a\xa0\x05\x34\x05\xd0\x02\x9a\
+\x02\x68\x01\x4d\x01\xb4\x80\xa6\x00\x5a\x40\x53\x00\x2d\xa0\x29\
+\x80\x16\xd0\x14\x40\x0b\x68\x0a\xa0\x05\x34\x05\xd0\x02\x9a\xe5\
+\x03\x7c\xe4\x71\xfd\x1a\x9f\x69\x01\xf3\xd5\x02\x33\x33\xc7\xfe\
+\x63\x4b\x5c\x7e\x01\x05\xd0\x02\x9a\x02\x68\x01\x4d\x01\xb4\x80\
+\xa6\x00\x5a\x40\x53\x00\x2d\xa0\x29\x80\x16\xd0\x14\x40\x0b\x68\
+\x0a\xa0\x05\x34\x05\xd0\x02\x9a\x02\x68\x01\x4d\x01\xb4\x80\xa6\
+\x00\x5a\x40\x53\x00\x2d\xa0\x29\x80\x16\xd0\x2c\x1f\xe0\x0f\xc7\
+\xa8\x0b\xc6\x03\x24\x5a\xc7\x00\x00\x00\x00\x49\x45\x4e\x44\xae\
+\x42\x60\x82\
+\x00\x00\x00\x8a\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x00\x3c\x49\x44\x41\x54\x78\x9c\xed\
+\xd0\x01\x09\x00\x20\x10\x04\xc1\xd7\x4c\x76\xb2\x8f\x85\xfd\x14\
+\x72\x20\x33\x09\x96\xad\x02\x00\x00\x00\x00\x00\x00\xe0\x7f\x63\
+\xed\x73\xd3\x11\x49\x33\x1d\x90\x66\x40\x3a\x00\x00\x00\x00\x00\
+\x00\x00\x00\xde\x6b\x42\xab\x02\x34\xd3\x03\x1d\x60\x00\x00\x00\
+\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x03\x68\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x03\x1a\x49\x44\x41\x54\x78\x9c\xed\
+\xd6\x4f\x6c\x14\x65\x18\xc7\xf1\xef\x33\xdb\xad\x44\xc4\x34\x01\
+\xa3\x04\x82\x4a\x0f\xc4\x02\x51\xeb\x09\x88\x64\x85\xdd\x25\xa4\
+\xa9\xc8\x6e\x97\x10\x62\xb1\xa6\xdb\x46\x4c\x3c\x18\x13\x6f\xa6\
+\xf1\x46\x82\x91\x70\x69\x42\xff\x24\x04\x4d\x54\xa6\x7f\x38\x28\
+\xe8\x96\x26\x94\xa4\x88\x46\xca\xad\x1e\x80\x9a\x08\x21\x46\x10\
+\xc1\x90\xd0\x52\xf6\x7d\xbc\x70\xd8\x0e\x45\xb0\x33\xbb\x84\xf0\
+\x7c\x8e\xf3\xcc\xfc\xf6\xf7\xbe\xb3\xb3\xb3\x60\x8c\x31\xc6\x18\
+\x63\x8c\x31\xc6\x18\x63\x8c\x31\xc6\x98\xc7\x85\x84\x0d\xd8\x98\
+\x7b\xb7\xce\x2b\xc6\x0e\x8a\xb0\x04\xf8\xbc\xd0\xdf\xf3\x19\xa0\
+\xe1\xab\xcd\x2e\x95\x69\xdb\x2a\xa2\x7b\x00\x10\xf9\xa0\xd0\xd7\
+\x7d\x34\x4c\x5e\xe8\x0d\x48\x65\xf3\x23\xc0\xfa\x92\xc8\x2f\x6a\
+\xbc\x6b\x79\xdf\xf7\x6f\x85\xcd\x0e\x90\x54\x53\xdb\xc7\xa8\xee\
+\x2e\x39\x76\xfd\xea\x42\xef\x99\xd3\x5d\x5d\xd3\x73\x0d\xf5\x42\
+\xd7\x52\x0d\x64\x68\xf3\xdf\xae\xe6\xfb\xc4\x5b\x2d\x35\xa1\xb3\
+\xef\x48\x24\x3a\xaa\x52\xd9\x7c\x67\x60\xf1\x80\x84\xbe\x81\xa1\
+\x37\x40\x94\x5d\xc0\x9f\x33\x8e\xa1\x6f\xc4\x63\xf1\xd1\x0d\x99\
+\xd6\xe7\xc3\xe6\x27\x72\xef\x3f\x15\x5f\x74\xe9\x30\xf0\x5e\x60\
+\x34\x25\xb8\xb7\xc3\xdc\x7d\x88\xe0\x11\x00\x48\xe7\xf2\x2f\x3a\
+\xc7\x51\x81\x15\x81\xf0\x3f\x44\xbd\x86\x1f\x06\xba\xc6\xe6\x92\
+\xbb\x29\xd3\xbe\xb8\x28\xee\x5b\x81\xfa\xc0\xe8\x2a\xaa\x6f\x0e\
+\x0d\xf4\x8e\xce\xb9\xf4\x1d\xe1\x1f\x01\xa0\xe0\xf7\xfc\x16\xf3\
+\x74\x2d\x70\xa2\xf4\xb8\xc2\x73\x4e\xdc\x89\x64\xa6\xb5\xe1\xff\
+\x66\x6e\xca\xb6\xad\x74\xe2\x4e\xcd\xb2\xf8\x09\xe7\x64\x4d\x14\
+\x8b\x07\x88\x45\x11\x02\x70\x7e\xfc\xcc\xcd\x15\x2f\xac\xfb\xca\
+\xc5\x6f\xd7\x02\xab\x4b\x46\xd5\x22\xb2\x7d\x79\x5d\xfd\xe5\x89\
+\x5f\xc7\x7e\x79\x90\xac\xf4\xd6\xfc\x06\x15\x0a\xc0\xb3\x33\x27\
+\xfa\x53\x95\xe7\x36\x16\xfa\x7b\x2f\x44\xd5\x3b\xb2\x0d\x00\x38\
+\x77\xee\xe7\x62\xf3\xb6\xc6\xc1\x0b\x97\x6f\x54\x03\xaf\x97\x8c\
+\x44\xa0\x61\x79\x5d\xfd\xfc\xe6\x6d\x8d\xc3\x23\x23\x23\xf7\x7c\
+\x4d\x26\x9b\xf2\x3b\x11\x0e\x01\x4f\xce\x18\x08\x83\x4f\x4c\xc5\
+\xb6\x1c\x39\xdc\x7b\x3d\xca\xce\x91\xfc\x06\xcc\x26\x9d\xc9\xb7\
+\xab\xd0\xc9\xdd\x9b\x7c\x68\x7a\xc1\xed\x77\x8e\x1f\x38\x30\x19\
+\xec\x92\xca\xb6\x7e\x02\xf2\xe9\xdd\x69\xba\xaf\xc6\xfb\xe7\x23\
+\xdf\xf7\x8b\x51\xf7\x2c\xdb\x06\x00\xa4\x9b\xda\x36\xab\xaa\x0f\
+\xcc\x0f\x8c\x46\x9d\xbb\xb5\x65\x78\xf0\xe0\x5f\x00\xb9\x5c\xae\
+\xfa\x9a\x7b\x7a\x3f\x48\x4b\xe0\x3c\x05\xf9\x70\xa8\xbf\x7b\x5f\
+\xb9\x3a\x96\x75\x03\x00\x92\xd9\xd6\x57\x05\xf9\x0e\x58\x3c\x73\
+\xa2\x67\x8b\xc5\xd8\x66\x2f\xce\x15\xcf\xb9\x3e\x85\x64\xe0\xd2\
+\x49\x54\x76\x0c\x0d\x74\x0f\x96\xb3\x5f\xd9\x37\x00\x20\x99\x6b\
+\x5f\x26\xce\x1d\x01\x56\x3e\xd0\x05\xca\x15\x85\xc6\x63\x03\x3d\
+\xa7\xca\xdb\x2c\xa2\xd7\xe0\xfd\x1c\xf3\xbb\x7e\x57\xcf\x5b\x07\
+\x0c\xdf\xff\x6c\x3d\xeb\xc5\x74\x4d\x25\x16\x0f\x11\xbf\x05\xfe\
+\xcb\xc4\xf8\xe9\xa9\xd7\x56\xd5\x7e\x3d\xa9\xf3\x96\x01\xaf\xdc\
+\xe3\xb4\x93\xd3\xd5\xb1\xd4\xf0\x37\x3d\x17\x2b\xd5\xab\x22\x8f\
+\x40\xf0\x33\xd3\x4d\xf9\x0e\x55\x3a\x02\x4d\xfa\x6e\xc8\x82\x9d\
+\x3f\xfa\x7b\x6f\x56\xb2\x4c\xc5\xbe\x01\xa5\xce\x8f\x8f\x1d\xaf\
+\x7d\xa9\x7e\x29\xc2\xcb\x80\x43\x75\xcf\xda\x55\x4b\x77\x7d\xd9\
+\xb9\x3b\xd4\xff\xfa\x47\x4e\x22\xd1\x51\x95\x68\x69\x99\xf7\xb0\
+\x7b\x18\x63\x8c\x31\xc6\x18\x63\x8c\x31\xc6\x18\x63\x8c\x31\x8f\
+\x89\x7f\x01\x76\x43\xf4\x3d\x50\xc3\x70\x12\x00\x00\x00\x00\x49\
+\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x02\xe8\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x02\x9a\x49\x44\x41\x54\x58\x85\xe5\
+\x96\xbb\x72\xd3\x40\x14\x86\xbf\xe3\xa4\x00\x9e\x23\x25\x54\xb1\
+\x52\xf0\x0a\x14\x90\x84\xc4\x21\x64\x72\x23\x44\x6a\x2c\x37\x99\
+\xe1\x19\x28\x65\x35\x92\x27\x09\xd8\x21\xce\xc5\xc0\x30\xc3\x33\
+\x50\x59\x7e\x05\xe8\xe0\x0d\x80\x02\xfb\x50\xc4\x4a\x64\x5d\x6c\
+\xcb\x71\xc3\x70\x2a\x69\xb5\xfb\x7f\x9f\x56\xab\xd9\x85\xff\xbd\
+\x24\xbc\x30\x5e\x3a\x0f\xb5\x20\x1e\xca\x5d\x11\x5e\xb5\x7d\xfb\
+\xe3\x34\x41\x86\x59\x5d\x52\xe5\x35\xc2\x6f\x44\xac\xc0\x2b\x7f\
+\x01\x28\x84\x1d\xb4\x20\x47\xc0\x03\x84\x39\x85\x96\x61\xba\xa5\
+\x69\xc1\x8b\x96\xb3\xa6\xd0\x42\x98\x03\xee\xa3\x7a\x18\x3e\xbb\
+\x11\x80\x3b\x91\x31\x05\x45\x9b\xd3\x90\x28\x5a\xce\x1a\x2a\xa7\
+\x51\x16\x70\x2f\x21\x20\x22\x07\x40\x6f\x9a\x12\x86\xe9\x96\x52\
+\xe0\x3d\x55\x39\x48\x08\x04\x5e\xf9\x03\xb0\x91\x22\x71\x3a\x89\
+\x84\x61\xba\x25\x45\x9b\x71\xb8\x20\x5b\x9d\x5a\xb9\x95\x10\x00\
+\x08\x7c\xfb\x2c\x45\x62\x26\xaf\x44\x1f\x9e\x78\x73\x41\xb6\xda\
+\x7e\xf9\x5d\xb4\xaf\x90\x52\xf3\xfb\xee\xba\x88\x9e\xc4\x02\xba\
+\x22\xba\xde\xf6\x2a\x97\x43\xe1\x96\xb3\xaa\x2a\x4d\x60\x66\x14\
+\x3c\x53\x60\x52\x89\x0c\xb8\x0a\xb2\x99\x06\x27\x16\x3e\x50\x9d\
+\x5a\xb9\x29\xc2\x26\xf1\xcf\xa1\xd2\x34\x2c\x67\x35\x45\x78\x25\
+\x2f\x1c\x86\xcc\x40\x58\x86\x55\x7d\xae\x4a\x23\x26\xdb\x55\x95\
+\x67\xe1\x62\x9a\xdf\x77\x57\x44\xf4\x2c\x2f\x7c\x2c\x01\x00\xc3\
+\x74\x37\x14\xad\xa7\x49\x00\xa4\xc1\x11\xdd\x0a\xbc\xca\xc9\xa8\
+\xec\xb1\x04\xb2\x24\xb4\xff\x79\x64\x50\x6c\x6c\x78\x2e\x81\x88\
+\x44\x63\xc8\xb8\x5c\xf0\xdc\x02\x37\x12\x34\x40\xe3\x63\x15\xd8\
+\x0e\x7c\xbb\x91\x27\x2f\xf3\x2f\xc8\x2a\x15\x7e\x29\xaa\x89\xf6\
+\x2b\x81\x9f\x79\xf3\x72\x09\x14\x2d\x77\x19\xd5\x73\x49\x19\xd7\
+\x6f\x3b\x2f\x9a\xd5\xa7\x79\x32\x73\x2c\xc2\xea\x92\xc2\x05\x30\
+\x1b\x69\x0e\x67\x22\x9a\xd3\x45\xa4\xd4\xdf\x5b\x46\xd6\x58\x33\
+\x90\x05\x57\xd5\x1d\x60\x3b\x22\x02\x30\x83\xea\x45\xd1\x72\x97\
+\xa7\x22\xb0\x60\x39\x8b\x59\xf0\x4e\xad\x52\x0f\x7c\xbb\xd1\x17\
+\x99\x48\x62\xa8\xc0\x82\xe5\x2c\xf6\x54\x2e\xe3\x70\x11\x76\x3b\
+\xb5\x4a\x3d\x6c\xe8\xd4\x2a\xf5\x0c\x89\xf3\x51\x12\x99\x02\xc3\
+\xe0\x6d\xcf\x7e\x1b\xef\xdf\xa9\x55\xea\x22\xec\xc6\x24\x66\x47\
+\x49\x64\x6d\xc7\x4f\x44\xb4\x35\x2e\x3c\x5a\x86\x55\xdd\x56\xe5\
+\x38\x96\xfd\x47\xa0\x94\x76\xd0\x4d\x08\x64\xc2\x91\x17\x6d\xbf\
+\xfc\x66\x18\xfc\x5a\xc2\x74\x77\x14\x3d\x1a\x47\x62\x40\xa0\x68\
+\x3a\x8f\x41\xde\xdf\x06\x9e\x57\xe2\xfa\xe1\xfc\x7e\xf5\x91\x08\
+\x9f\xa6\x01\x0f\xab\x68\x55\x77\x51\x0e\x53\x24\x96\xda\xbe\xfd\
+\x19\x06\x4e\xc5\x38\x71\x38\xc2\xde\xa4\x70\x80\xc0\xb3\x8f\x11\
+\xf6\x88\x2d\x4c\x05\x27\xbc\x49\x6c\xad\x51\x78\xe0\xd9\xc7\x93\
+\xc2\x87\x4a\x28\xdd\x84\x00\xaa\x26\xc8\x57\xe0\xc7\xd5\x96\x7a\
+\x7b\x78\x54\x42\x90\x4d\x94\xef\xc0\xb7\x5e\x41\xcc\x69\x65\xff\
+\xfb\xf5\x17\x4b\x00\x72\xf1\x7d\xf9\x90\x28\x00\x00\x00\x00\x49\
+\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x03\x89\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x03\x3b\x49\x44\x41\x54\x78\x9c\xed\
+\x9a\xbd\x6b\x14\x41\x18\xc6\x9f\xd9\x0d\x84\xa0\xd8\x88\x04\x63\
+\x0a\x43\x62\xa1\x08\x42\x72\xd1\x94\xe2\x27\x06\xb1\x0b\x8a\x8d\
+\x78\x60\x36\x97\xd3\x53\x0b\x09\xfe\x05\xc6\x2a\xb8\x97\x4b\x72\
+\x29\xd2\x08\x36\xd1\x42\x84\x9c\xa0\x16\x01\x8b\x48\x2e\x29\x24\
+\x88\x85\x82\xc5\x29\x04\xb5\x88\xe4\x83\x33\x99\x7d\x2d\x22\x16\
+\xb7\x7b\x7b\xb7\x1f\x73\x93\x73\xe7\x57\xce\x0d\xcf\xfb\xec\x73\
+\xf3\xc5\xee\x00\x0a\x85\x22\xca\xb0\xa0\x02\x47\x06\x33\xbb\x9b\
+\x38\x4f\x32\x42\x1f\x18\x8e\x02\x68\x0c\xc1\x57\x10\x8a\x20\x2c\
+\x11\xc3\xf4\x86\xae\x67\x3e\x8c\x25\x57\xdd\x3a\x07\x0a\x20\x66\
+\x8c\x9e\x05\xac\x29\x00\xad\x41\x74\x04\x52\x00\xb4\x78\x3e\x7b\
+\xf3\x55\xb9\x0e\x9a\x5f\xe5\xd8\x80\x19\x07\xac\x97\xd8\xb9\x0f\
+\x0f\x00\xad\x80\x95\xeb\x36\xd2\xd7\xcb\x75\xf0\x35\x02\xba\xfa\
+\xcd\x73\x8c\x21\x87\x00\x01\xd6\x18\x0e\x68\x17\x9c\x46\x82\xe7\
+\x00\xb6\xe7\xbc\xf5\x91\x81\x0e\x84\xe3\xad\x66\x14\xd6\x75\xfd\
+\x70\xe9\x9a\xe0\xf9\x1f\x6c\xe2\x3c\x59\x87\x0f\x0f\x00\xad\x4d\
+\x9c\x27\x4b\x1b\x3d\x07\xc0\x08\x7d\xe1\xf8\xa9\x3d\x4e\xde\xbd\
+\xcf\xe1\xed\xad\xae\x3e\x71\xf0\xde\xe0\x43\xc6\x75\x9f\xcf\x67\
+\x53\x81\xcf\x16\x41\x88\x19\x26\xb9\xfc\x6c\xf3\x5e\x2f\xab\xb8\
+\x30\x54\x00\xb2\x0d\xc8\x46\x05\x20\xdb\x80\x6c\x54\x00\xb2\x0d\
+\xc8\x26\xf2\x01\x54\x3c\x08\x75\xf5\x8f\xec\xd7\x34\x2d\x41\x60\
+\xa7\x41\x68\xae\xd4\x3f\x66\x98\x9f\x7c\xbb\x21\x10\x18\x0a\x20\
+\xcc\xe8\x8d\xc8\xbe\x4b\xa7\x7e\xf9\xd6\xaa\x12\xd7\x00\x62\x89\
+\xf4\x25\x58\x34\x45\x84\xbd\x1e\x34\xdb\x7d\xbb\xd9\x3e\x43\x76\
+\x80\xe1\x24\xff\x8d\x44\x67\xc2\xbc\xba\x38\x9e\x9a\xf3\xad\x57\
+\x05\x65\xa7\x40\xcc\x30\x87\x61\xd1\x73\xc0\xd3\xc3\x87\x49\x9b\
+\x66\xe1\x6d\x97\x91\x1e\x10\x59\xc4\x31\x80\x6e\x23\x7d\x19\xc0\
+\x90\xc8\xc2\x55\xa2\x33\xd0\x68\x67\xc2\xec\x11\x55\xc0\x16\x40\
+\xcf\xc0\xc8\x41\x02\x4d\x8a\x2a\xe8\x03\x5d\xb3\xf0\xe4\xc4\x2d\
+\x73\x8f\x08\x71\x5b\x00\x5b\xd4\x70\x1f\x80\x90\x62\x01\x68\xe3\
+\x45\x18\x22\x84\x1d\xa6\x00\xf5\x8a\x28\x14\x18\x06\x21\xbe\x9c\
+\xd6\x80\x9d\xf9\x96\x97\xc4\xf8\xf2\xfc\x42\xc4\xd2\xf5\x43\x22\
+\x8c\xe8\x7c\xab\x83\xc0\x72\x65\x3b\xb0\xe0\x1f\x71\x9c\xf0\x1c\
+\xc0\xe2\x58\xd2\xff\x41\xc7\x85\xce\xc1\x0c\x34\xce\x45\x48\xbb\
+\x12\xf9\xa3\xb0\x0a\x40\xb6\x01\xd9\xa8\x00\x64\x1b\x90\x8d\x0a\
+\x40\xb6\x01\xd9\xa8\x00\x64\x1b\x90\x8d\x0a\x40\xb6\x01\xd9\xa8\
+\x00\x64\x1b\x90\x8d\x9f\xfb\x01\xb2\x68\xaf\xf0\xed\xbf\x1a\x8a\
+\xa5\x0d\xd1\x1a\x01\x84\xa5\xd2\xa6\x48\x05\x40\x0c\xd3\xa5\x6d\
+\x51\x0a\xa0\xb0\xa1\xeb\x99\xd2\xc6\xa8\x04\xc0\x01\x2d\xee\x74\
+\x6f\x38\x0a\x01\x70\x06\x76\xa3\xdc\x7d\xe1\x7a\xda\x05\xfc\x50\
+\x00\xb4\xf8\xbc\xcb\x65\xe9\xff\x31\x80\x7f\xd7\xe5\x37\xd7\x8b\
+\xa3\xef\x1f\xdf\x5b\x73\xeb\x6c\x7b\xd5\x1c\xc2\x5e\x2b\x8a\xcf\
+\xf9\x6c\xaa\x23\x6c\x51\xfb\x1a\xc0\xf0\x3d\xec\x22\xa1\xc0\xb0\
+\x2c\x42\xd6\x1e\x00\xe1\xb5\x88\x42\x41\x61\xa0\x37\x22\x74\x6d\
+\x01\x68\xc0\x43\x00\x9b\x22\x8a\x05\xe0\xa7\x65\x59\xe3\x22\x84\
+\xf5\xd2\x86\xaf\x0b\xb9\xe5\x96\xee\xde\x55\x00\xe7\x45\x14\xf4\
+\x03\x03\xae\xe4\x27\xef\x2c\x88\xd0\x76\x3c\x07\xe4\x9b\x7f\x3c\
+\x02\xf0\x54\x44\x41\xaf\x30\x46\xc3\xf3\xd9\xd4\x0b\x51\xfa\xb6\
+\x11\x00\x00\x98\x9d\xa5\x6f\x17\x8f\x3f\x6b\x59\xdb\xb5\x02\xe0\
+\x54\xd9\x7e\x62\x59\x61\x8c\xae\xcd\x4f\xdc\x36\x45\x16\xa9\xf8\
+\xc5\xf5\xb8\x61\x1e\xb3\x80\x21\x30\x9c\x01\x61\x9f\x48\x33\x7f\
+\x29\x00\x6c\xa6\x81\x6d\x3d\x98\x9b\xb8\xfb\xa5\x06\xf5\x14\x0a\
+\x45\x84\xf9\x03\x3a\xde\xd0\x31\x4b\x14\x34\x6a\x00\x00\x00\x00\
+\x49\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x00\x89\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x00\x3b\x49\x44\x41\x54\x78\x9c\xed\
+\xd0\x01\x09\x00\x20\x10\x04\xc1\xd7\x52\xb6\x36\xa2\x7e\x0a\x39\
+\x90\x99\x04\xcb\x56\x01\x00\x00\x00\x00\x00\x00\xf0\xbf\xb1\xf6\
+\xb9\xe9\x88\xa4\x99\x0e\x48\x33\x20\x1d\x00\x00\x00\x00\x00\x00\
+\x00\x00\xef\x35\x86\x6a\x02\xea\xd1\x43\x33\x62\x00\x00\x00\x00\
+\x49\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x08\x4f\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x08\x01\x49\x44\x41\x54\x78\x9c\xed\
+\x5b\x7d\x70\x54\xd5\x1d\x3d\xe7\xee\x26\x61\xab\x01\x0b\x7e\xb4\
+\xa3\x19\x8a\x4e\x19\x0c\x15\x5b\x20\x6c\x42\x11\xc1\x69\xc7\xca\
+\x00\x71\x13\x4c\xd5\x0e\x4a\x75\xa8\xc5\xd6\x99\xd6\xb1\x74\x70\
+\x46\x03\xad\xd8\x6a\x2b\xa8\x7f\x48\x5b\x3f\x2a\x2a\xd3\x99\x85\
+\xcd\x06\xe9\x80\x3a\x53\x09\x83\x7c\x6c\x42\xc6\xd6\x51\xa1\x63\
+\xeb\x07\x30\xa9\x5a\x0a\xe5\xc3\x12\xd8\xdd\x7b\xfa\x47\x50\xdf\
+\x7b\xbb\x9b\xec\x66\xdf\xc6\xa4\xcd\x99\xd9\x3f\xde\xef\x9e\xfb\
+\x7b\xe7\x9e\xf7\xf6\xbe\xfb\xee\xbd\x0f\x18\xc6\x30\x86\xf1\xff\
+\x0c\x0e\xc4\x49\xae\x88\xea\xbc\xd3\x65\x98\x49\x6b\x2f\x93\xc1\
+\x04\x8a\x17\x0b\x38\x07\xc0\x48\x00\x01\x00\xc7\xce\xfc\xf6\x0b\
+\xda\x0b\x98\x37\x11\xc4\xf6\xf6\xf9\x7c\xa7\xd4\xda\x4a\x66\xc0\
+\xf4\xb8\x2e\x49\x5b\xbb\x08\xe4\x7c\x00\x93\xfa\x95\x44\x78\x07\
+\x46\x5b\xac\x35\x4f\x77\x34\x60\x0f\x48\xf9\xab\xd2\x6f\x03\x24\
+\xd6\xc5\x71\xb5\x85\x96\x02\x98\xed\x67\x6a\x02\xaf\x0b\x5c\x95\
+\xfa\x27\x9e\xeb\xbc\x8d\x49\x1f\xf3\xfa\x83\x70\x4c\xb3\x61\xf4\
+\x20\x84\xa9\x7e\xe5\xcc\x81\x77\x05\x2e\x6f\x8f\xe0\x19\x3f\xee\
+\x88\xa2\x0d\x08\x6f\xd4\x05\x4a\xdb\x87\x08\x7e\xa7\x17\x9a\x05\
+\xb0\x03\x54\x9b\xac\xd9\x67\x02\xf8\xbb\x52\x38\x6c\x2d\x8e\x8f\
+\x00\xd2\x27\x0d\x2a\xcb\x80\x51\x32\x18\x27\x60\x3c\xa0\x3a\x00\
+\xdf\x04\x10\xea\x25\xe7\x76\x6b\xb9\xa4\x63\x01\xdf\x28\x46\x7f\
+\x51\x06\xd4\xc5\x35\xcd\x4a\xad\x00\xbe\x98\xa5\xf8\x38\xa8\xcd\
+\x94\xd9\x64\x81\x17\xda\x1b\xf8\xaf\x82\x72\x47\x15\x4a\x07\x70\
+\x15\x69\xe7\x01\x9c\x9f\xe3\x1c\xdd\x22\x6f\x69\x8f\xf0\x0f\xfd\
+\xd1\x0f\x14\x61\xc0\xb4\x98\x6e\x04\xf5\x14\x81\x0a\xaf\x28\x4a\
+\x8f\x06\x2b\xcc\x2f\x5f\x99\xcb\x23\xfd\xcd\xef\x44\x75\x54\xe5\
+\x95\x41\x2c\x06\x74\x2f\x80\xf3\xbd\xe5\x82\x56\xb6\xff\xc5\xdc\
+\x8b\x15\xb4\x85\xe6\x2e\xdc\x80\x66\x99\xf0\x24\x7b\x1f\xc8\x65\
+\x9e\x12\x2b\xe8\x29\xca\xac\x48\x34\xf2\x60\xc1\x79\xf3\xc0\xd7\
+\x37\xaa\x32\x69\x71\x27\xa5\xbb\x00\x9c\xed\x2a\x14\x5a\x43\x69\
+\x2e\x6c\x6b\xe2\x89\x42\x72\x16\x66\x40\xb3\x4c\xf8\x72\xbb\x0e\
+\xe0\xf5\x9e\x92\x2e\x43\x46\x76\x45\xd8\x5e\x50\xbe\x7e\x22\x1c\
+\xd3\x45\x30\x8a\x7b\x3b\x5c\x11\xaf\xb2\x82\xb3\x12\x73\x78\x2c\
+\xdf\x5c\xa6\xa0\x13\x7f\xd5\x2e\xcf\xd2\xf8\xdd\x29\x71\xea\x40\
+\x35\x1e\x00\x12\x8d\x3c\x68\x92\x9c\x29\x68\x9d\x33\x4e\xe1\x6b\
+\xec\xd6\xba\xeb\xa2\x0a\xe4\x9b\x2b\x6f\x03\x6a\x63\xfa\x36\xc4\
+\x7b\x5c\x27\x84\xd6\x86\x8e\x72\x76\x67\x23\xff\x91\x6f\x1e\xbf\
+\xb0\xab\x89\x27\xdb\x23\x66\xa1\xc8\x9f\x02\xf8\xe4\x71\x28\x60\
+\xee\x81\x80\xbd\x3f\xdf\x3c\x79\xfd\x05\xa6\x6d\xd0\x54\x1a\x6d\
+\x07\x30\xe2\xd3\xa8\x9e\x4b\x44\xcc\x4d\xa5\x18\x9d\x15\x8a\x70\
+\x4c\x3f\x02\xb5\xda\x19\x13\x78\x73\x7b\x03\x9f\xe9\xab\x6e\x9f\
+\x77\xc0\xb4\x16\x8d\xa1\x51\x2b\x5c\x8d\x47\x7b\xe8\xa8\x59\x3c\
+\x18\x1a\x0f\x00\x89\x06\x3c\x02\xe8\xf7\xce\x18\xa1\xc7\x6b\x63\
+\x9a\xdc\x57\xdd\x3e\x0d\x20\xec\x83\x00\x2e\x74\x84\xba\x82\x01\
+\x46\xda\xbe\xcb\xee\xc2\xa5\x96\x08\xa4\x46\x8f\x30\x4b\x24\xec\
+\x74\x44\xcb\x45\x3d\x3e\x6b\xab\x82\xbd\x55\xed\xd5\x80\x70\x8b\
+\x66\x00\xbc\xc5\x11\x12\xc4\xc6\x1d\xf5\xec\x2a\x46\x6f\x29\xb0\
+\x65\x0e\x4f\x31\xc8\x06\x00\x87\x1c\xe1\xc9\xdd\x47\x70\x7b\x6f\
+\xf5\x72\x1b\x20\x11\xd0\x2f\x3c\xc1\x75\x89\x46\xee\x2e\x42\x67\
+\x49\x91\xa8\xe7\x07\x10\x57\x3a\x63\x82\xee\x99\xf4\xa2\xce\xca\
+\x55\x27\xa7\x01\x75\x71\xcc\x04\x30\xc3\x11\x4a\xa6\xad\x69\x2e\
+\x5e\x66\x69\x11\x3a\x86\xdf\x90\xd8\xef\x08\x9d\xfb\xb9\x8f\x70\
+\x5b\x2e\x7e\x4e\x03\x2c\xf4\x13\xe7\x31\xa5\xdf\xee\x59\xc0\xb7\
+\x7d\xd0\x58\x52\xf4\xf4\x4d\x74\x5d\x28\x41\x77\xe6\x1a\x1b\x64\
+\x35\xa0\x26\xaa\x2f\x00\xf8\x96\x23\x94\x54\xd0\xdc\xe7\x9f\xcc\
+\xd2\xa2\x2a\x89\x67\x01\xbc\xe5\x08\x5d\xf8\x9e\xc1\x37\xb2\x71\
+\xb3\x1a\x10\x08\xe2\x46\xf4\x4c\x55\xf5\x80\x78\x39\x51\xcf\x0f\
+\xfc\x14\x59\x4a\xac\x6f\x62\x9a\xd0\x7a\x67\x8c\xc6\xde\x9c\x8d\
+\x9b\xd5\x00\x41\xf3\x5c\x01\xcb\xe7\x7d\x53\x37\x50\x30\xc6\xa3\
+\x99\x73\xb2\xfd\x0d\x32\x0c\x38\xd3\x63\x4e\x77\xc6\x52\x69\xfc\
+\xd1\x67\x79\x25\xc7\xee\x57\xd1\x01\xc0\x79\xd7\x8e\x3a\x58\x86\
+\x29\x5e\x5e\x86\x01\x15\xff\x41\x2d\x80\x72\x47\xe8\xcf\x9d\x4d\
+\xdc\xef\xe5\x0d\x7a\xac\xa0\xa5\xe4\xba\x70\x52\xe6\x3c\x65\x86\
+\x01\x06\xf8\x8a\xab\x12\xb5\xdd\x7f\x75\x03\x03\x4b\xe3\xd2\x2e\
+\xda\x89\x5e\x4e\x66\x1f\x20\x7b\xa9\x8b\x60\xcd\x5b\x19\x9c\x21\
+\x82\x80\x81\x47\x3b\x2f\xf5\x72\x32\x0d\x20\xbf\xe4\x3c\xb4\xc0\
+\xa0\x7f\xf6\xe7\x42\xea\xb4\x47\xbb\x30\xce\xcb\xc9\x30\x40\x16\
+\x95\x1e\xc2\xbf\x7d\x57\x36\x40\x38\xeb\xa3\x0c\xed\x95\x5e\x4e\
+\x86\x01\xa4\x9b\x64\x89\x82\xe6\xd8\x06\x13\xda\x16\xe1\x14\x80\
+\x94\x23\x54\x5e\x1d\x95\xb3\x83\xcf\x62\x80\x67\x92\x84\x16\x83\
+\xe2\x9d\xbf\x54\xc8\xfc\x0b\x00\xc7\x9d\xc7\xde\x3b\x62\x28\x61\
+\xd6\xd3\xa8\x00\xe0\x9c\x0f\x38\xfd\x66\x13\x4f\x3b\x39\x59\x3a\
+\x41\xb8\x66\x54\x6d\xcf\x2a\xee\x90\xc4\xc9\xd1\x18\xe5\x09\x1d\
+\xf7\x72\x32\x0d\xb0\x7a\xcf\xc3\xc8\xe8\x39\x87\x0a\x94\xc6\xc5\
+\x9e\xd0\xbb\x5e\x4e\x96\x77\x01\xb3\xd7\x79\x44\xd9\x2f\xfb\x29\
+\x6a\x80\xe1\xd2\x2e\x68\x9f\x97\x90\xed\x2f\xe0\x59\x6c\xe4\x8c\
+\x0c\xce\x10\x01\x61\x67\xb8\x8f\xcd\xeb\x5e\x4e\x86\x01\xa1\x14\
+\x76\x01\x70\xae\xbf\x4f\x0e\xc7\x74\x91\xff\xf2\x4a\x8c\x66\x19\
+\x80\x73\x5d\x31\xa1\xcd\x4b\xcb\x30\xe0\xcc\xda\xda\x2e\x57\x3d\
+\x62\xae\x97\x37\xd8\x51\x33\x09\x53\xe0\x5e\x51\x3e\x16\x1a\x8d\
+\x3d\x5e\x5e\x8e\xf9\x00\xba\xde\xa2\x08\xcd\xf7\x57\x5e\xe9\x61\
+\x60\x5d\x9a\x05\xbd\xd0\x36\x9b\xa9\x4c\x5e\x16\x94\x05\xb0\x0e\
+\x3d\x9b\x1a\xce\x54\xc6\x55\x57\x44\x75\x9e\xef\x2a\x4b\x85\x66\
+\x19\x90\x0b\x9c\x21\x5a\xb3\x36\x1b\x35\xab\x01\x3b\xea\xd9\x25\
+\xe0\xa5\x4f\x2a\x03\x15\xc9\xa0\xf5\x2e\x87\x0f\x5a\xd4\x5e\x8e\
+\x1b\x00\x4c\x70\x84\xde\x0f\x8d\xf9\xb4\x3d\x4e\xe4\x9c\x15\x16\
+\xf9\x6b\xd7\x31\xf8\x83\xe9\x31\x8d\xf5\x47\x62\xe9\x50\x1d\x55\
+\xb9\xa4\x9f\x3b\x63\x22\x57\x67\xbb\xfd\x81\x5e\x0c\xe8\xb8\x16\
+\x2f\xc3\xdd\x19\x96\xa7\x61\x97\xfb\xa2\xb2\x84\x38\xbb\x0c\xdf\
+\x03\x5d\x83\xb7\xc3\x65\x06\x6b\x72\xf1\x73\xaf\x0c\x91\x22\x79\
+\xb7\x27\x76\x53\x38\xae\x8c\x79\xb5\xc1\x82\x29\xcf\xeb\x5c\x4a\
+\xae\x25\x7c\x88\xf7\xef\xa8\x67\xc6\x10\xf8\x63\xf4\xba\x36\xb8\
+\x3b\xc2\x36\x50\xcf\xba\xf8\x52\x3c\xbc\x51\x17\x14\x27\xd5\x7f\
+\x54\x47\x55\x1e\x48\x69\x03\xdc\x7b\x88\x5e\x4b\x1d\xc2\xa3\xbd\
+\xd5\xeb\x73\x75\x38\x20\x73\x17\xdc\xb3\xab\x55\x4a\xa9\xe5\x9a\
+\xcd\xf2\x6e\x8e\xfa\x4c\x31\x32\x68\x1f\x21\x70\xa5\x23\x94\x34\
+\xe4\xe2\xbe\x36\x55\xf6\x69\xc0\xce\x06\x7e\x08\xf1\x5a\x01\xa7\
+\x3e\x8e\x91\x98\x7e\xb8\xdb\x3e\xd6\xb3\x80\xfa\xd9\x23\x1c\xd3\
+\xed\x02\xbf\xef\x8c\x89\x5c\x92\xcf\xb6\x9d\xbc\x1b\x10\x8e\x69\
+\x21\x28\xf7\x8e\x0b\xe9\x77\xc7\xd3\xe6\x0e\xef\x3b\xf6\x80\x41\
+\x62\x6d\x1c\x77\x08\x5a\x0d\xe7\xc5\xa4\x1e\x4e\x44\x02\x3f\xce\
+\x27\x45\x41\x57\xb0\x36\x96\x7e\x40\xe4\x52\x97\x06\x60\x5b\x3a\
+\xc8\x05\x9d\xf3\x79\x28\x57\xbd\x52\xa0\x3a\xaa\xf2\x91\x01\xfb\
+\x98\xc8\x5b\x5d\x05\xc4\x8b\xa1\x73\x38\x37\xd7\x63\xcf\x8b\x82\
+\x76\x89\x55\xa5\xcd\xdd\x04\xe2\xee\xf3\xe1\xca\x60\x4a\x1d\x75\
+\xad\xba\xac\x90\x5c\xc5\x60\x7a\x8b\xce\xaf\x0c\xea\x4f\x19\x8d\
+\x07\xde\x38\x05\x5e\x9f\x6f\xe3\x81\x7e\x6c\x94\xbc\x2e\xaa\xc0\
+\x81\xa0\xfd\x95\x40\xef\x2d\x96\x04\xb4\x26\x00\xb3\x72\x67\x03\
+\x3f\x2c\x34\x6f\x3e\xa8\x8b\x2a\x94\x0e\xe2\x87\x84\x96\x01\xf8\
+\xbc\xa7\x78\x4b\x2a\xc5\x1b\x3a\x9b\x78\xb4\x90\x9c\xfd\xdf\x2a\
+\x1b\xd7\xad\x94\xd6\x00\x28\xf3\x14\x9d\xa0\xf4\x90\x42\x66\x55\
+\x21\x1b\x16\x7b\xc3\xac\xad\x0a\x76\x1f\xc6\x22\x51\xcb\xe1\xde\
+\xaf\x04\x00\x10\xb4\x6a\x6c\xca\x2c\x5d\xdf\xc4\x74\xa1\xb9\x8b\
+\xea\xc5\x6b\x62\x9a\x69\xa8\x16\x00\x63\xb2\x14\x1f\x01\xb4\x09\
+\x32\x9b\x10\xc2\x4b\x85\x9a\x51\x1d\x55\xf9\x48\x83\x99\x32\x76\
+\x1e\xc0\x7a\x00\xd9\x86\xe1\x49\x91\x4b\xda\x23\x7c\xb2\x3f\xfa\
+\x01\x1f\xb6\xcb\xd7\xb4\xaa\xca\x58\x3d\x0c\xa0\xa1\x17\x5a\x12\
+\xc4\x36\x59\x6e\xa5\xc1\x5f\x25\xfc\x4d\x06\x87\x2b\x82\x38\x91\
+\x34\x48\x9b\x13\xa8\xb4\xe5\x18\xa5\x34\xc6\x81\x18\x4f\xd8\x3a\
+\x80\x57\xa3\xe7\x93\x9a\x5c\xc2\x3b\x44\x2e\x49\x44\xd8\x59\x8c\
+\x7e\xdf\x9e\xe3\xb5\x71\x5d\x23\xe9\x01\x00\xa5\xee\x0c\xbb\x24\
+\xfe\x6c\x6c\x1a\x4f\xf4\xe7\x96\xf7\xc2\xdf\x81\x4c\xb3\xcc\xb4\
+\x49\xa8\x37\xd4\x32\x01\x35\xbe\xe6\x06\xde\x06\xb8\x2a\x74\x14\
+\x4f\xfa\xb9\x47\xb1\x64\x23\xb9\x9a\x0d\x9a\x68\x8c\x5d\x74\xe6\
+\x63\x87\xf1\xfd\x4c\xf3\x3e\xa0\xcd\x56\x66\x6d\xc7\x6b\x78\xa5\
+\x3f\xdf\x03\xf4\x85\x01\x19\xca\xd6\xb4\xaa\x8a\x16\xb3\x8d\xec\
+\x44\x91\x13\x00\x8c\x23\x31\x4a\xc2\x48\xf4\xac\xdc\x1c\x45\xcf\
+\x67\x73\x07\x00\xed\x23\xcd\x3e\x11\xdb\x12\xf5\xd8\x3b\x58\xb6\
+\xe3\x0e\x63\x18\xc3\xf8\xdf\xc4\x7f\x01\x16\x1d\xd4\x53\x92\x2f\
+\x1f\x88\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x02\xeb\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x02\x9d\x49\x44\x41\x54\x78\x9c\xed\
+\x9a\xbd\x6e\x13\x41\x14\x46\xcf\x75\x08\xa1\x09\x5d\xde\x80\x37\
+\xb0\x5d\xd1\xf0\x08\x34\x58\x36\x09\x08\x1a\x7b\x0b\x6c\x57\x74\
+\xb4\x3c\x80\x6d\x90\x6c\x37\xfc\xe6\x47\x50\x20\xde\x80\x1a\x70\
+\xc5\x73\x20\x21\xd1\x40\x24\x7c\x29\x22\x24\x33\x5e\xc7\xb1\x77\
+\x66\x76\x66\xe3\x5b\xee\xde\xfd\x34\xe7\x68\x76\x76\x35\x1a\xd8\
+\xd4\xa6\x36\x75\x99\x4b\xf2\x1e\x80\xeb\x2a\x37\x07\xb7\x11\x7d\
+\x2a\xc2\x0f\x9d\x4a\x32\x19\xb7\xbf\xcd\xde\xbf\x92\xd7\xc0\x7c\
+\x54\x25\xe9\xd5\x51\x3d\x04\x4a\x28\x48\x49\x87\xc0\xcd\xd9\x9e\
+\x52\x3e\x43\x73\x5f\x67\xf0\x72\x06\xff\xaf\x94\xeb\x66\x5f\x21\
+\x05\xa4\xc2\xc3\x1f\xd0\x27\x66\x6f\xe1\x5e\x81\x45\xf0\xaa\xd2\
+\x98\x8c\x3b\x1f\xcd\xfe\x42\x2d\x82\xe7\xc3\xb7\xdf\xa7\x3d\x53\
+\x18\x01\xeb\xc0\x43\x41\x04\xac\x0b\x0f\x05\x10\x90\x05\x1e\x22\
+\x17\x90\x15\x1e\x22\x16\x60\x03\x1e\x22\x15\x60\x0b\x1e\x22\x14\
+\x60\x13\x1e\x22\x13\x60\x1b\x1e\x22\x12\xe0\x02\x1e\x22\x11\xe0\
+\x0a\x1e\x22\x10\xe0\x12\x1e\x02\x17\xe0\x1a\x1e\x02\x16\xe0\x03\
+\x1e\x02\x15\xe0\x0b\x1e\x02\x14\x60\x1b\xbe\xdc\x1c\xdc\x91\x92\
+\x3e\x07\x28\xa1\xad\xcf\xc3\xee\x87\xd9\xfb\x41\xed\x08\xd9\x86\
+\xaf\x24\xbd\xba\x88\x9e\xa0\xec\xa1\xec\x4d\x91\x91\xd9\x13\x8c\
+\x00\x17\xf0\x29\x79\x73\x15\x84\x00\x4f\xf0\x53\x41\x1f\x99\xbd\
+\xb9\x0b\xf0\x06\x2f\xdc\xff\x32\xec\xbe\x33\xfb\x73\x5d\x04\xfd\
+\xc2\x77\x0e\xd3\x9e\xc9\x4d\x40\x08\xf0\x90\x93\x80\x50\xe0\x21\
+\x07\x01\x21\xc1\x83\x67\x01\xa1\xc1\x83\x47\x01\x21\xc2\x83\x27\
+\x01\xbe\xe0\x55\xe5\xde\x64\xdc\x3e\x5a\x25\xcb\xb9\x80\x90\xe1\
+\xc1\xb1\x80\xd0\xe1\xc1\xa1\x80\x18\xe0\xc1\x91\x80\x58\xe0\xc1\
+\x81\x80\x98\xe0\xc1\xb2\x80\xd8\xe0\xc1\xa2\x80\x18\xe1\xc1\x92\
+\x80\x58\xe1\xc1\xc2\x19\x21\x5f\xf0\xc0\xc1\x64\xdc\x3e\x5e\x35\
+\xaf\x9a\xf4\x6a\x8a\x3c\x03\x07\x7b\x82\x3e\xe1\xbf\x8e\x3a\xab\
+\xc3\xb7\x06\x07\xaa\x72\xec\x64\x4f\x30\x0a\x78\xf4\x15\x4b\x18\
+\xd7\x12\x10\x3c\x7c\xd2\xdf\x4f\x81\xb7\xb3\x27\x18\x05\xbc\xf2\
+\xda\xcc\xb3\xb2\x27\x18\x37\x7c\xc6\x3d\xc1\xd0\xe1\xcb\xcd\xc1\
+\x5d\x11\x7d\x63\xe6\x2d\xfb\x74\x5e\x48\x40\x51\xe1\xe1\x02\x6b\
+\x80\x37\x78\xd1\x7d\xdf\xf0\xb0\x64\x06\x78\x85\x1f\x76\x4f\x56\
+\xcd\xcb\x0a\x0f\xe7\xfc\x09\x86\x0e\x5f\x69\xf5\x1b\x30\x0f\xcf\
+\x8a\x7f\x8c\xa9\x33\x20\x0e\x78\xde\xce\xe5\xad\xb1\x86\x6c\x99\
+\x17\xaa\x49\xaf\x86\xca\x11\x96\xe0\x17\xe4\xad\x0d\x5f\x4d\x7a\
+\x35\x48\xc9\x5b\x73\x01\xfd\x6f\x06\x94\x9b\xa3\x6d\x91\xdf\xdf\
+\x81\xdd\x99\xcb\x19\x0e\x27\xa4\xe6\x65\x78\xe7\xed\xe6\x81\xf1\
+\x15\xd8\x3d\xbd\xba\x05\xec\xcc\x5c\xca\x74\x2c\x25\x25\x2f\xd3\
+\x60\x6d\xe7\x81\x21\xe0\xd3\xcb\x87\xbf\x54\x79\x0c\x9c\x02\x3f\
+\x81\x7a\x96\x33\x39\x66\x9e\x88\x36\xb2\x0c\xd6\x76\xde\xc2\xba\
+\xd1\xee\xef\x94\x9b\xa3\xed\x50\xf3\x6e\x3d\x78\x71\xcd\x66\xde\
+\xa6\x36\x75\x89\xeb\x2f\x57\x3e\x7f\x9e\x34\x61\xbc\xb4\x00\x00\
+\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x00\x87\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x00\x39\x49\x44\x41\x54\x58\x85\xed\
+\xce\x31\x11\x00\x30\x08\x04\x41\x26\xde\x50\x80\x05\xfc\x5b\x20\
+\x22\xa0\xdc\xeb\xff\x67\x23\x16\x65\xf5\x64\xf5\x6c\x3e\xde\x66\
+\x7c\x11\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
+\xc0\x07\xe4\xc6\x04\x35\x1a\x89\x95\x2e\x00\x00\x00\x00\x49\x45\
+\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x00\x86\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x00\x38\x49\x44\x41\x54\x58\x85\xed\
+\xce\x41\x0d\x00\x40\x08\x03\x41\x72\xaa\x90\x87\x21\x24\x92\x9c\
+\x08\x78\xce\xfe\xdb\x4c\xc4\xa2\xec\xa9\xec\xa9\xcd\xc7\xdb\x8c\
+\x2f\x02\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
+\xf8\xac\x79\x05\x03\xdf\x56\x31\xc9\x00\x00\x00\x00\x49\x45\x4e\
+\x44\xae\x42\x60\x82\
+\x00\x00\x03\xa2\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x03\x54\x49\x44\x41\x54\x78\x9c\xed\
+\x9b\xbd\x4f\x53\x51\x18\x87\x9f\xb7\x85\x58\x07\x8d\x9d\x18\x24\
+\x3a\xcb\xa0\x24\x92\x36\x6e\x98\x28\x0c\x1a\x91\x26\xc8\x20\x09\
+\xff\x81\x71\x53\x18\x24\x9a\xf8\x11\x27\x3f\xfe\x02\x12\x17\x31\
+\x82\x18\x1d\x44\x13\x9c\x34\x25\x98\xa0\x03\xce\x12\x1c\x70\xb0\
+\xc4\xc5\x1a\xa4\xaf\x83\x17\x73\xef\xed\xad\xd2\x9e\x7b\x7b\x40\
+\xce\xb3\x9d\xf7\x9e\x9e\xfe\xde\xdf\x3d\x5f\x69\xcf\x01\x87\xc3\
+\xb1\x93\x91\xcd\x54\xea\x9e\xd5\x96\x72\x89\x33\x15\x2a\x83\x82\
+\x74\x29\xec\x17\xd8\x95\xb4\xb8\x7a\x50\xf8\x21\xf0\x59\xd1\xf9\
+\x14\xa9\x87\x99\x2c\x4f\x5f\x1f\x97\x9f\xff\xfa\xdc\x3f\x0d\xc8\
+\x4f\xea\x49\xd0\xbb\xc0\xa1\x58\x94\x36\x8f\x45\x90\x8b\xc5\x82\
+\xbc\xfc\x5b\xa5\x54\xcd\x27\xaa\x92\x7b\xac\xa3\xa0\x33\x6c\xbf\
+\xe4\x01\x3a\x40\x67\xf2\x53\x3a\x82\x6a\xcd\x17\x5d\xd3\x80\xdc\
+\x24\x23\x22\x7a\x3d\x19\x6d\x4d\x44\xf5\x46\xfe\x09\x97\x6b\x3d\
+\x8e\x74\xc6\xeb\xf6\x33\xa1\x70\x49\x45\xae\x90\xe6\xf9\xc1\x32\
+\x4b\x8f\xce\xc9\x7a\xac\x42\x0d\x19\x98\xd0\xf4\xa7\x0c\x07\x58\
+\xe7\x94\xa8\x5e\x03\xb2\xc1\x1a\xd2\x13\x35\x1c\xaa\x0c\xe8\x9e\
+\xd5\x96\xef\x25\xfd\x80\xbf\xdb\x0b\xaf\x48\xc9\x50\xb1\x4f\x56\
+\x62\x57\x9e\x00\xf9\x69\x6d\xa3\xa2\x0f\x50\x4e\xf8\xc2\x8b\xbb\
+\xb3\x72\x24\x3c\x31\x56\x0d\x81\x72\x89\x33\x04\xc7\xfc\xd7\xb4\
+\xca\xf9\xed\x92\x3c\x40\xb1\x4f\x56\x48\xc9\x10\x50\xf2\x85\x3b\
+\xbc\xdc\x02\x54\x19\x50\xa1\x32\xe8\x2f\xab\xc8\xd8\x9b\x82\x7c\
+\x89\x5f\x66\xb2\x14\xfb\x64\x45\x54\xc6\xfc\xb1\x70\x6e\x10\x61\
+\x80\x20\x5d\x81\x40\x9a\xe7\xb1\xab\x6b\x12\x95\x56\x9e\x05\x23\
+\x72\x34\x5c\xa7\xca\x00\x85\xfd\xfe\xf2\xc1\x32\x4b\x71\x0b\x6b\
+\x16\x11\xda\xdb\xc3\x75\x22\x7a\x40\x70\x87\xb7\xd5\x66\xfb\x7a\
+\x08\x6b\x8f\xda\xbd\xd6\xde\x08\xed\x10\x9c\x01\xb6\x05\xd8\xc6\
+\x19\x60\x5b\x80\x6d\x9c\x01\xb6\x05\xd8\xc6\x19\x60\x5b\x80\x6d\
+\x9c\x01\xb6\x05\xd8\xc6\x19\x60\x5b\x80\x6d\x5a\xe2\x68\x24\x3f\
+\xa5\x3d\xa8\xde\x06\x0e\xb3\xc9\xff\x1a\x0c\x50\xe0\x3d\x22\x97\
+\x8a\xfd\x12\xfe\xdd\xb2\x6e\x8c\x7b\x40\x6e\x52\x87\x51\x7d\x01\
+\x1c\x21\xf9\xe4\xf1\xbe\xa3\x13\xd5\x17\xb9\x49\x1d\x36\x6d\xcc\
+\xc8\x80\xce\x29\xdd\x27\xe8\x7d\x53\x11\x8d\x22\xe8\xbd\xce\x29\
+\xdd\x67\xd2\x86\x91\x01\x19\x38\x06\xec\x31\x69\xc3\x90\xbd\x9e\
+\x86\x86\xd9\xf1\x93\xa0\x91\x01\x65\x78\x0b\x7c\x8b\x49\x4b\x23\
+\x7c\xf3\x34\x34\x8c\x91\x01\x0b\xfd\xb2\xaa\xc8\x05\x93\x36\x4c\
+\x50\xe4\xc2\x42\xbf\xac\x9a\xb4\x61\x3c\x04\xe6\x0a\x32\x8e\x48\
+\x2f\xb0\xc0\xef\x25\x2a\x69\x36\x96\xc1\xde\xb9\x82\x8c\x9b\x36\
+\x16\xcb\x3e\xc0\x5b\x8f\x8d\xd7\x64\x1b\xb8\x49\xd0\xb6\x00\xdb\
+\x38\x03\x6c\x0b\xb0\x8d\x33\xc0\xb6\x00\xdb\x38\x03\x6c\x0b\xb0\
+\x8d\x33\xc0\xb6\x00\xdb\x38\x03\x6c\x0b\xb0\x8d\x33\x20\x1c\x50\
+\xf8\xe1\x2f\x0f\x4c\x68\xba\x79\x72\xe2\x25\xac\x3d\x9c\x1b\x44\
+\x1f\x92\xfa\xec\x2f\x7f\xca\x70\x20\x7e\x69\xcd\x21\x42\xfb\x72\
+\xb8\x4e\x44\x0f\xd0\xf9\x40\x60\x9d\x53\xf1\xca\x6a\x1e\xa9\x35\
+\x4e\x07\x23\xfa\xae\xaa\x4e\x75\x20\xf5\xd0\x5f\x16\xd5\x6b\xf9\
+\x69\x6d\x8b\x5b\x5c\xd2\xe4\xa7\xb5\x4d\x45\xaf\xfa\x63\xe1\xdc\
+\x7e\xc7\x42\x64\xb2\x3c\x05\x3e\xfa\x42\x59\x2a\xfa\x60\x3b\x99\
+\xf0\xe7\xb0\x74\xf0\xc4\xf8\xa2\x97\x5b\x80\xba\x8e\xcb\x8b\xca\
+\x58\xa5\x95\x67\x5b\xf9\xb8\x7c\x6a\x8d\xd3\xde\x9b\x6f\xec\xb8\
+\xfc\x06\xb9\xc7\x3a\xfa\x5f\x5c\x98\x00\x10\x19\x2d\xf6\xcb\xcd\
+\xa8\x47\x35\xf7\x01\x73\x05\x6e\x22\x32\x9a\x9c\xaa\xa6\xa0\x20\
+\x23\xc5\xb3\xdc\xaa\x55\x61\xb3\x97\xa6\xee\x00\x1d\xb1\x4a\x4b\
+\x9e\x4d\x5d\x9a\xaa\xfb\xda\x9c\x77\xe4\xbc\x7d\x2b\x5e\x9b\x03\
+\x96\x41\xdf\xd5\x73\x6d\xce\xe1\x70\xec\x6c\x7e\x01\x43\x8d\x07\
+\x87\xbb\xe6\x3f\x9a\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\
+\x82\
+\x00\x00\x08\xe5\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x08\x97\x49\x44\x41\x54\x78\x9c\xed\
+\x5b\x6d\x6c\x14\xc7\x19\x7e\xde\xb9\x0f\xdb\xa1\xfe\x68\x21\xa1\
+\xc8\xd0\x06\xac\x20\x28\xa6\x2a\x98\x56\x35\x45\x60\xc0\x9c\xeb\
+\xaa\x98\xf8\x60\xd5\x90\x0a\x62\xe3\x8f\x86\xa4\xad\x4a\x94\x46\
+\x02\x29\x39\xdc\x86\x7e\xa4\x0d\x09\x89\x14\x08\x9c\x8d\x21\xd0\
+\x48\x3d\x6c\x23\x93\xc6\xe1\x6c\xa7\x46\xa4\x80\x42\x20\x55\x02\
+\x36\x51\x52\x87\x50\x6a\x25\x51\xb1\x9d\x03\x81\xed\xbb\x9b\xb7\
+\x3f\xf8\xda\xdd\x5b\x9f\xef\x7c\xbb\xae\x69\xfd\xfc\x9b\x67\xde\
+\x7d\xf7\xd9\xe7\x66\x67\x66\x67\xe6\x80\x31\x8c\x61\x0c\xff\xcf\
+\xa0\x91\xb8\x49\xa1\x52\x7a\x77\x50\xda\x17\x0a\xe2\xd9\x92\x31\
+\x83\x80\x69\x00\x67\x80\x28\x0d\x12\x36\x10\x02\x00\x02\x20\xbe\
+\x00\x89\x0e\x16\xd4\x2e\x08\x47\xfd\x3e\xef\xc7\x56\x6b\xb3\xcc\
+\x80\x25\xf7\x57\x66\x09\x7b\xb8\x44\x30\x15\x31\xf0\xcd\x61\xa6\
+\xf9\x98\x99\x9b\x18\xa2\xb6\xb5\x7e\xd7\x3b\x00\xd8\x4c\x8d\x80\
+\xf9\x06\xd0\xd2\xe2\xb2\x02\x12\xe2\x09\x02\x2f\x36\x39\xf7\x19\
+\x26\x6c\xed\xf9\x8a\xd8\x77\x6a\xe7\xce\xa0\x59\x49\x4d\x33\xa0\
+\xc0\xbd\x6e\xb1\x24\xf1\x0c\x80\x79\x66\xe5\x34\x06\x9f\x27\x60\
+\xb3\xbf\xae\x7a\x2f\x4c\x68\x11\x09\x1b\xb0\xb4\xa8\x7c\x22\xd9\
+\xf1\x2c\x11\x7e\x1c\x25\x4c\x32\xf0\x37\x62\xb4\x31\xf8\x9c\x20\
+\xdb\x3f\x18\xd4\x1d\x14\xfd\x97\x53\x40\xe1\x81\x30\x52\x89\x44\
+\x3a\x88\xa6\x82\x31\x9d\x88\x73\xc1\xb4\x0c\x40\xca\x60\x09\x19\
+\x38\x6a\x03\xad\x3f\x5c\xb7\xeb\x6c\x22\xfa\x13\x32\xa0\x40\x29\
+\xfb\x8e\x94\x74\x10\xc0\x24\x7d\x1d\x03\x97\x01\xbc\x2e\x88\x0e\
+\x85\xc3\xfd\x6f\xb4\x36\xec\xbd\x14\x4f\xee\x5c\x65\x43\xca\xb8\
+\x70\x60\x09\x41\x2c\x07\x71\x91\xd1\x3d\x00\xf4\x01\x58\xd7\x5c\
+\xe7\x7d\x75\x58\x0f\x80\x04\x0c\xc8\x77\x97\x3d\x48\x44\x35\x00\
+\x92\x22\x44\x11\xbd\xe0\x74\xda\x7f\xf7\x97\x3f\x6d\xef\x19\x6e\
+\x7e\x35\x14\x45\x71\xf6\xca\xf4\x0a\x00\x4f\x01\xb8\x47\x5f\x4f\
+\xc0\x96\xdc\xec\xcc\xa7\xaa\xaa\xaa\x64\xbc\xb9\xe3\x36\xc0\xe3\
+\xf1\x88\x63\x67\xbb\x9e\x06\xf3\x46\x5d\x95\x04\xa3\xc6\x0e\x54\
+\x35\xd5\x7b\x2f\xc6\x9b\x37\x16\x14\x15\xad\x4b\xbd\x6a\x17\x8f\
+\x11\xe1\x71\x00\x5f\x52\xd7\x31\xe8\x60\x48\x38\xd6\xb4\xf9\x5e\
+\xba\x12\x4f\xce\xb8\x0c\xf0\x78\x3c\xe2\xd8\xfb\x17\xf7\x83\xe8\
+\x01\x5d\x96\x2e\x41\x5c\x7c\xd8\x57\xfd\x76\x3c\xf9\x86\x8b\x42\
+\x77\xf9\xe4\x10\xa1\x01\x91\x1d\xee\xbb\xf6\xe4\x6b\x79\x4d\xfb\
+\xf7\x07\x62\xcd\x65\x8b\xe7\xc6\xce\xf1\xf7\x55\x81\xe8\x51\x1d\
+\x7d\x42\xb0\x58\x7a\xb8\xce\xfb\x41\x3c\xb9\x12\xc1\x47\x1d\xa7\
+\x03\x13\xb3\x17\xed\x73\xc8\x81\x7b\x89\x34\x73\x8c\x49\xe1\x90\
+\x63\x76\x4e\x76\xd6\x9f\xdb\xdb\xdb\x63\x1a\x21\x62\x36\xc0\xe5\
+\x2e\xff\x11\x08\x2f\xea\xe8\x3d\xc1\xd4\x90\xd2\xfa\x6a\x75\x6f\
+\xac\x79\xcc\xc2\xc5\xf6\x13\xa1\xce\x8e\xd3\x0d\x59\x33\xe7\x5c\
+\x05\x51\x3e\x6e\xb4\x66\x02\xa6\xf7\x21\x25\xb9\xb3\xfd\x74\x4b\
+\x2c\x79\x62\x7a\x05\x96\xad\x5c\x37\x0f\x10\x47\x01\x24\xab\xe8\
+\x7d\xcd\x75\xde\xb5\xb0\x60\x76\x16\x2f\xf2\xdd\xe5\xbf\x20\xc2\
+\x73\x6a\x8e\x09\x0f\xb5\x1c\xf0\xee\x1d\xea\x5a\x31\x54\xc0\xd2\
+\xe2\xb5\xe3\x01\x71\x10\xea\x87\x67\xbc\x1d\x4c\x0d\x55\x60\x14\
+\x3c\x3c\x00\xb4\xd4\x7b\xb7\x81\xb1\x5b\xcd\x11\x63\x57\x81\xbb\
+\x72\xee\x50\xd7\x0e\x69\x00\x89\xa4\x67\x00\x64\xde\x26\xd0\x85\
+\x90\x2c\x6e\xab\xad\xed\x1b\x8e\x58\x8b\xc0\xf6\x6b\x29\xeb\x01\
+\x1c\x53\x71\xce\x30\xc9\x5d\x79\x79\x1e\x7b\xb4\x0b\xa3\x1a\x90\
+\xaf\x54\x2e\x20\xf0\x3a\xf5\x8d\x58\x62\x65\x73\x63\x4d\x57\x02\
+\x62\x2d\x41\x53\xd3\x8b\xfd\x32\x08\x37\x18\xff\xbe\xc9\x11\x30\
+\xd7\x39\xfe\x5f\x8f\x44\xbb\x2e\x9a\x01\x44\xe1\xf0\x6f\x75\xdc\
+\xfe\x96\x7a\xef\x89\x44\x84\x5a\x89\xd6\x46\xef\x67\x0c\x6c\x51\
+\x73\xcc\x78\xd2\xb5\x66\xcd\xb8\xc1\xae\x19\xd4\x80\x65\x4a\xc5\
+\x42\x10\x2d\x50\x51\x41\xc9\x61\x8f\x09\x3a\x2d\x45\x28\x2d\xb4\
+\x03\xc0\x85\x5b\x04\x61\x02\x5f\x4d\xfe\xc9\x60\xf1\x83\xb7\x00\
+\xc6\x2f\xb5\x04\xbd\xdc\x5a\xbf\xbb\x33\x61\x85\x16\xa3\xad\xb6\
+\xb6\x0f\x4c\xba\x1f\x8a\x1f\x53\x14\xc5\x70\xc8\x37\x34\x20\x4f\
+\x29\xf9\x2a\x98\xbf\xaf\xa2\x82\x32\xc8\x4f\x9b\xa6\xd2\x62\x64\
+\xd8\x7a\x5f\x01\xf8\x43\x15\x95\xd9\x23\x33\xf2\x8d\x62\x0d\x0d\
+\x70\x48\xc7\x83\xd0\x4e\x92\xde\x6c\x6d\xf4\x7e\x66\xa2\x46\x4b\
+\xe1\xf3\xf9\xc2\x60\xf2\xa9\x39\x02\x3f\x64\x14\x3b\xc8\x2b\xc0\
+\xcb\x35\x17\x13\x35\x9a\x25\x6e\xa4\x40\x24\xf4\x9a\x7f\x60\xf4\
+\x1a\x44\x18\x70\xa3\xc7\x9c\xaf\xe6\x24\xd1\x6b\xe6\xca\xb3\x1e\
+\xb9\xd9\x93\x4e\x82\xa0\x6e\xb5\xe9\x01\xa4\xe5\xe8\xe3\x22\x0c\
+\xe0\x6b\xce\xef\x02\x70\xaa\xa8\xbf\xb7\xf8\x76\x5e\xd0\xc7\x8d\
+\x76\x54\x55\x55\x49\x30\x34\x3f\x9c\x64\x11\xb1\x4e\x19\xf9\x0a\
+\xb0\xc8\x56\x17\x89\x70\xd4\x74\x75\x23\x04\x02\x6b\xb5\x33\x66\
+\xe9\x63\x0c\x0c\xc0\x4c\x75\x51\x4a\xfa\x30\x22\xe6\x4e\x01\x09\
+\x9d\x76\x9e\xa9\x0f\x89\x34\x80\xf8\x5e\x2d\x21\x47\xfd\xd8\x3f\
+\x18\x06\x28\xa8\xd7\x3e\x55\x1f\x63\x34\x0a\xa4\xaa\x0b\x04\x8c\
+\xf8\xb7\xbe\x69\x18\x17\xa1\x3d\x55\x1f\x32\xa4\x01\x82\x39\xae\
+\x35\xb6\xd1\x84\xb6\xda\xda\x7e\x00\x21\x15\xe5\x54\x14\x45\xdd\
+\xc1\x1b\x1a\xa0\x59\x24\x09\x09\x31\x2a\xbe\xf9\xad\x42\x84\x01\
+\xc4\xb8\xac\x09\x60\x8e\x68\x36\x77\x0a\xf2\x4a\x4a\x92\x00\xa8\
+\xd7\x03\x06\x7c\x3e\xdf\x80\x3a\x26\x72\x1e\x70\x7d\xa7\xf6\x76\
+\x19\xc8\xb0\x46\x9e\xf5\xb0\x75\xdb\xd3\x75\xd4\x65\x7d\x4c\xa4\
+\x01\xc0\x27\x1a\x82\x22\x7b\xce\x3b\x06\x49\x72\x9a\xa6\xcc\x38\
+\xaf\x0f\x31\x9a\x07\x74\xa8\x8b\x04\xba\xcf\x64\x59\x23\x06\x62\
+\xa1\xd1\xce\xc0\x39\x7d\x4c\x84\x01\x82\xa1\xd9\x6c\x64\x60\x81\
+\x3e\xe6\x4e\x81\x60\xd6\x6a\x27\x9c\x89\x88\xd1\x13\x03\x76\xe7\
+\x71\x00\xb7\xf6\xdf\x09\x98\x5b\xe8\x2e\x9f\x6c\x85\x40\x2b\xe1\
+\xf1\x78\x04\x83\x7e\xa8\x21\x19\x6d\xfa\xb8\x08\x03\x6e\xec\xad\
+\x1d\x57\x73\x21\xd2\x25\xba\x03\xf0\xd6\xfb\x5d\x39\xd0\xec\x28\
+\x53\x20\xd4\x9d\xf9\x8e\x3e\xce\x70\x3d\x80\x00\xdd\xe7\xaf\x2c\
+\x32\x55\xdd\x08\x80\x84\x5e\x33\xbf\xd1\xd6\x56\x15\xd2\xc7\x19\
+\x1a\xc0\x41\xb9\x1f\x80\x6a\xab\x99\x96\x14\x2a\xa5\x77\x9b\xaa\
+\xd0\x42\x78\x3c\x1e\x41\x4c\xab\x74\xf4\x1e\xa3\x58\x43\x03\x9a\
+\x1b\x6b\xba\x88\xe0\x57\x51\x49\x41\x69\xd7\x6f\x87\x8f\x5a\x1c\
+\x3f\xdb\xb5\x1a\xc0\x8c\x9b\x65\x02\x3e\x0d\x5e\xca\xf4\x1b\xc5\
+\x0e\xba\x2a\xcc\xe0\x3f\xaa\xcb\x04\x7e\x74\x89\xbb\xec\xeb\xa6\
+\xa9\xb4\x08\x8a\xa2\x38\x99\xf9\xd7\x6a\x8e\x99\x9f\x33\x6a\xfe\
+\x40\x14\x03\x9a\x0f\x54\xbf\x49\xac\xe9\x0c\x9d\x36\xc2\x66\x73\
+\x64\x5a\x87\x1e\x99\x56\x09\xed\x67\x6f\x77\x4a\x88\xb7\x0f\x16\
+\x1f\x6d\x67\x88\xa5\xc0\x26\x2d\x45\x6b\x5d\x4a\x79\xc4\xba\xda\
+\x68\x41\xde\xea\xca\x09\x04\x7a\x52\x43\x32\x7e\xd3\xd8\x58\x13\
+\x31\x05\xbe\x89\xa8\x7b\x83\x2d\x07\xbc\x6d\x00\xbd\xa2\x8e\x67\
+\x89\x86\xa5\x45\xe5\x13\x13\x52\x6a\x01\x14\x45\x71\x3a\xfa\xe5\
+\x01\xa8\xce\x10\x11\xf0\x5e\xf7\x04\xf1\x42\xb4\xeb\x86\xde\x1d\
+\x96\xb6\xc7\x75\xab\xab\x53\x84\x03\xf5\x85\x85\x3f\xd3\x1f\x8e\
+\xfa\xaf\xa2\x57\xa6\x6f\x03\x61\x91\x8a\x0a\x92\xe0\x8a\xa1\x0e\
+\x55\x0e\x69\x80\xbf\x61\xc7\xe7\x2c\x71\x3f\x80\x7e\x15\x3d\x3f\
+\x78\x57\xdf\x4b\x18\xa1\xb3\xc6\x43\xc1\xb5\xaa\xe2\x11\x00\x0f\
+\xab\x39\x62\xac\x8f\xe5\xcc\x52\x4c\x47\x64\x3a\x3b\x4e\x5f\xcc\
+\x9a\x39\xe7\x13\x10\x15\xdf\xba\x01\x30\x67\xda\x37\xe6\x4e\xca\
+\xc9\xce\xf2\xb7\xb7\xb7\x87\xe3\x56\x6d\x0e\xc8\xb5\xb2\xfc\xe7\
+\x0c\x6c\x83\xea\xc7\x20\xc2\xf3\xfe\x3a\xaf\x7e\x67\xdb\x10\x31\
+\x9f\x11\xea\xec\x78\xf7\xbd\xac\x59\x39\x77\x01\xf8\xde\xad\x1b\
+\x01\x39\x7d\x32\x79\xe1\xd7\xbe\x35\xef\xb5\xf3\x67\x4e\x5d\x8d\
+\x47\x79\xa2\x50\x14\xc5\x99\x39\x73\xfe\xcb\x00\x36\x41\xdb\x12\
+\x0f\x07\x2f\x65\x96\x9e\x3f\x7f\x24\xa6\x33\x83\x43\xbe\x02\x6a\
+\x64\x50\xef\x26\x5c\x3f\x9e\x76\x1b\x84\x45\x8e\x81\xf0\xc9\x7c\
+\xa5\x72\x76\x3c\xb9\x12\x81\xab\xf8\xe1\x7b\x7a\xc3\x69\xad\x00\
+\xca\x74\x55\x67\x83\xe1\xd0\x03\x83\x8d\xf9\x46\x88\xfb\x1d\x56\
+\x14\xc5\xd6\x23\x33\xfe\x40\xe0\x0d\xba\xaa\x20\x80\xed\x24\xed\
+\x5b\xfc\x0d\x3b\x3e\x8f\x37\x6f\x2c\xc8\x55\x36\xa4\xa4\xca\xcb\
+\x3f\x65\xc6\x46\x10\xbe\xac\xad\xe5\x26\x16\xb6\xd5\x2d\xbe\x9d\
+\x5f\xc4\x93\x73\xd8\x9d\x98\xcb\x5d\x5e\xc6\x84\xed\x00\x1c\xba\
+\xaa\x2b\x44\x78\xd6\x96\x74\x6d\x6b\x3c\x07\x16\xa3\x21\x2f\xcf\
+\x63\x77\x4c\xb8\x58\x02\xa6\xcd\x50\x9f\x57\xba\x05\xde\x9a\x21\
+\x02\x4f\xf8\x7c\xbe\xb8\xfb\xa2\x84\x7a\x71\x97\xbb\x6c\x21\x13\
+\xd5\x03\x18\x1f\xa9\x09\x3d\x04\x1c\x02\x70\xc8\x96\x72\xcd\x1f\
+\xaf\x19\x8a\xa2\x38\xbb\xc3\x19\x0b\x05\xf1\x72\x00\x2b\x00\x18\
+\x4d\xc3\x83\xc4\x58\xef\xaf\xf7\x56\x0f\x47\x3f\x60\xc2\x30\xe6\
+\x5a\x51\x3a\x85\xed\xb6\xe7\x01\xb8\xa3\x84\x05\x09\x38\xc2\x84\
+\xbf\x32\xd3\x07\x36\x19\xfe\x88\x25\x77\x3b\xc6\x25\x5f\x91\x14\
+\x08\xf7\x0f\xa4\xa6\x12\xfa\xd3\x29\x2c\xa6\x0a\xc2\x74\x66\xca\
+\x05\x51\x01\xc0\x69\x51\x72\x9e\x24\x81\xf5\x7e\x9f\xf7\x54\x22\
+\xfa\x4d\x1b\xc7\x5d\xab\x2a\x0a\x99\xf9\xf7\x00\xac\xed\x0c\x09\
+\x5d\x00\xff\x2a\x83\x02\xde\xe1\x34\xf9\xc8\x74\x26\xe2\xfa\x61\
+\xea\xae\x15\x20\xde\x08\xe0\xdb\x66\xe6\x06\xd0\x09\x60\x6b\x30\
+\x35\x54\x6d\xe6\x19\x45\xcb\x66\x72\x05\x2b\x2b\x66\x31\x50\xc2\
+\xe0\x22\x00\xd3\x87\x93\x83\x80\x4f\x25\xe8\x75\xc1\x72\x4f\xee\
+\xec\xc9\x6f\x0d\xe7\xff\x00\x31\xdc\xc3\x7a\xb8\x56\x94\x4e\x91\
+\x0e\xdb\x62\x02\xcd\x02\xe4\x0c\x30\x4d\x05\x90\x0e\x20\x0d\xd7\
+\x77\x6e\xbe\x00\x10\x00\xe8\x9f\x00\x9f\x63\xe0\x1c\x8b\xf0\x91\
+\x56\xdf\xee\x0e\x8c\x92\xe3\xb8\x63\x18\xc3\x18\xfe\x37\xf1\x1f\
+\x38\xf1\xe0\xe7\x81\x02\x5e\x62\x00\x00\x00\x00\x49\x45\x4e\x44\
+\xae\x42\x60\x82\
+\x00\x00\x00\xcd\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x00\x7f\x49\x44\x41\x54\x78\x9c\xed\
+\xd9\x51\x0d\x80\x30\x10\x05\xc1\x03\xff\xca\x50\x41\x83\x10\x90\
+\xb1\x24\x9d\x31\x70\x2f\x9b\xfe\x75\x26\x74\xaf\xe7\xbd\xd7\xf3\
+\x96\x1b\xce\xf2\xf8\x1f\x08\x50\x0f\xa8\x09\x50\x0f\xa8\x09\x50\
+\x0f\xa8\x09\x50\x0f\xa8\x09\x50\x0f\xa8\x09\x50\x0f\xa8\x09\x50\
+\x0f\xa8\x09\x50\x0f\xa8\x09\x50\x0f\xa8\x09\x50\x0f\xa8\x09\x50\
+\x0f\xa8\x09\x50\x0f\xa8\x09\x50\x0f\xa8\x09\x50\x0f\xa8\x6d\x1f\
+\xe0\x28\x8f\xd7\x5f\xe3\x33\xf1\x0b\x38\x66\xae\xf2\x3e\x00\x00\
+\x00\x00\x00\x00\x00\x6c\xe2\x03\x9c\x6d\x0b\xf4\x94\x3b\x8d\x4b\
+\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x01\x30\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x00\xe2\x49\x44\x41\x54\x78\x9c\xed\
+\xd0\xb1\x0d\xc2\x30\x18\x05\xe1\x67\x86\x48\x87\x94\x99\x58\x21\
+\x15\x13\xb1\x05\x33\x45\xa1\x61\x0b\x53\x80\xa8\xa0\xb2\x9d\x43\
+\xe2\xbe\x2a\xc5\x2f\x78\xbe\x44\xd2\x3f\x2b\xa3\xff\x60\x5d\x6f\
+\xa7\x94\x5c\x92\x24\x35\xe7\x79\x3e\x5e\x7b\xde\xb7\x3a\x8c\xfc\
+\xf1\x24\x79\x3d\x66\x4a\x32\xbd\x1f\xd6\xf3\xbe\xd1\xf8\x00\xcf\
+\xc7\x7c\xfa\xee\x75\xdf\x64\x8f\x00\x3f\xcd\x00\xf4\x00\x9a\x01\
+\xe8\x01\x34\x03\xd0\x03\x68\x06\xa0\x07\xd0\x0c\x40\x0f\xa0\x19\
+\x80\x1e\x40\x33\x00\x3d\x80\x66\x00\x7a\x00\xcd\x00\xf4\x00\x9a\
+\x01\xe8\x01\x34\x03\xd0\x03\x68\x06\xa0\x07\xd0\x0c\x40\x0f\xa0\
+\x19\x80\x1e\x40\x33\x00\x3d\x80\x66\x00\x7a\x00\xcd\x00\xf4\x00\
+\x9a\x01\xe8\x01\x34\x03\xd0\x03\x68\x06\xa0\x07\xd0\x0c\x40\x0f\
+\xa0\x19\x80\x1e\x40\x33\x00\x3d\x80\x66\x00\x7a\x00\xcd\x00\xf4\
+\x00\xda\x1e\x01\xee\x5f\xbe\x7b\xdd\x37\x19\x1f\xa0\x66\x49\xc9\
+\x96\x92\x2d\x35\x4b\xf7\x7b\x49\x6a\xf0\x00\xc5\x3d\x1c\x34\xe1\
+\xa3\xf7\x6f\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x04\x2c\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x03\xde\x49\x44\x41\x54\x78\x9c\xed\
+\x98\xcf\x6b\x5c\x55\x14\xc7\x3f\xe7\xbe\x34\x34\x91\x8a\x60\x71\
+\x93\xb6\x2e\xb2\xd0\x90\x22\xc6\x42\x17\xad\x59\xc4\xa6\x69\x0a\
+\x5a\x35\x31\x0b\x17\x22\x4d\x13\xf0\x1f\x10\x7f\x40\x91\xa0\x82\
+\xba\x50\x0a\x2e\x34\x9d\x69\x04\x89\x05\x33\x9d\x74\x84\x9a\x32\
+\x33\x29\x23\xe2\xaa\x36\xe9\xaa\x31\x5d\x04\x6d\x2b\x88\xa6\x0b\
+\x9b\xd2\x40\x66\xe6\x1d\x17\x49\x63\xdf\x9b\x37\xc9\x64\x66\xde\
+\x34\xda\xfb\x59\xbe\xf3\xee\x79\xdf\x73\xef\xb9\xe7\xbe\x7b\xc0\
+\x62\xb1\x58\x2c\x16\x8b\xc5\x62\xb1\x58\x2c\x16\x8b\xc5\xf2\x60\
+\x21\xfe\x07\x9d\x3d\xfd\xef\x89\x31\xc7\x51\x1c\xc0\x05\xb4\xf6\
+\xb2\xaa\x8a\x00\x06\x21\xaf\xae\xfb\x7e\x3a\x7e\x6a\xe8\x5e\x63\
+\x5d\xc1\xdb\xb2\x1a\x3c\x80\xa9\x85\xc2\x9a\xa0\x38\x22\xe6\x38\
+\xe0\x99\x80\xff\x4f\x80\x65\x52\x30\x01\xaa\xee\x07\xa0\xff\xf5\
+\xb4\x0f\x40\x75\x39\x36\x2f\x05\x35\x00\xe0\x50\x4f\x7f\x47\x5e\
+\x4c\x42\x60\x9b\xc7\x05\xa8\x2c\xd7\x85\xcd\x8b\xaa\x41\xc4\x13\
+\x97\xc2\x02\xc2\x91\x74\x2c\x92\xf1\xbf\x1e\x38\x01\x00\x5d\x7d\
+\x03\x7b\x34\xcf\x79\x84\xed\xfe\x2f\x80\x71\x37\x5f\x6d\x14\x40\
+\x0d\xfe\x98\x94\x79\x71\xe8\x4e\x8e\x45\x2e\x15\x1b\x55\x94\xee\
+\xbe\xfe\x27\xf2\xae\x49\x01\x3b\xbd\x4e\x55\x11\xd9\x6c\x99\x50\
+\x18\x3c\x5c\x73\x8c\xdb\x75\x7e\xec\xd4\x6c\xb1\x41\x6b\x4e\x00\
+\x40\xd7\x8b\x47\x77\x6a\x9d\x93\x04\x9e\xf4\x99\x94\xcd\xb3\x1d\
+\x82\x82\xff\x45\x72\xf9\xae\x64\x62\xe4\xfa\x7a\x03\xd7\x24\x99\
+\x18\xb9\x9e\xad\x37\xed\xc0\xcf\x3e\x93\x80\x3a\x41\x63\x6a\x87\
+\xb0\xa2\xc1\x1f\xfc\xc5\x6c\xbd\x69\x5f\x2f\x78\x28\xf1\x18\xcc\
+\x9c\x1e\x9e\x6f\xc8\xba\xcf\x21\x5c\x28\x22\xa0\xe6\x08\x08\xb8\
+\x4e\x40\x12\x4f\x36\x64\xdd\x03\x99\xd3\xc3\xf3\xa5\xf8\x29\x59\
+\xfc\xec\xec\xf4\xd2\xae\xbd\x4f\x7d\xeb\x64\x4d\x2b\xd0\xe2\x91\
+\x02\xa6\x84\xdd\x54\x45\x44\x8a\x7c\x33\x5e\x77\xa7\xa1\xf7\xdc\
+\xb9\x2f\xef\x94\xea\x69\x43\xab\xf7\xeb\xe5\xcb\xb9\x5d\x8f\xbd\
+\x70\xc6\x69\x5c\x68\x02\x9e\x09\x52\x15\x36\x72\xf7\xd7\xb6\x90\
+\xe8\x23\xe6\xef\xd7\x13\x89\x91\xec\x06\xfd\x95\xa7\xa3\xb3\x77\
+\xe0\x63\x81\x37\x03\x1c\xba\x1a\xd6\x19\x29\x08\x1a\x10\xbc\xc8\
+\x27\xa9\xd8\xc9\xb7\x29\xe3\xbb\x65\xef\xdf\xb9\x99\xa9\x54\x73\
+\x4b\xdb\x22\x22\x07\xfd\x72\xc2\xc8\x85\xa2\x2b\xaf\xfa\x56\xea\
+\x4c\x64\xa8\x70\x44\x69\x54\x54\xc0\xe6\x66\xa6\x7f\x6a\x6e\x6d\
+\xfb\x1d\xe4\x79\xbc\xd9\x54\xd5\x19\x10\x10\x2d\x0c\xde\x15\x65\
+\x30\x15\x8f\x7e\x5e\xa1\xef\xca\xe9\xec\x1d\xec\x15\xf4\x1b\xa0\
+\xde\x67\xaa\xf8\x5f\x41\x51\x13\x90\x52\x4b\x2a\xbc\x9a\x8e\x45\
+\xe2\x95\xf8\x86\x2a\xae\xd4\x81\x9e\xc1\x4e\x23\x7a\x16\x78\xc8\
+\x6b\x51\x85\xf2\xfe\x1a\x15\x8c\x14\x6a\xbc\x8d\xe8\x4b\xa9\x58\
+\x74\xb2\x3c\xa5\x5e\xaa\x9a\xaa\x87\xfa\x8e\xed\x75\x5d\xf9\x1e\
+\x78\xd4\x63\x50\x14\xd9\x60\x26\x28\x06\x29\xd0\x77\xd3\x55\x39\
+\x3c\x19\x3f\x79\xb1\x32\xa5\xff\x52\xf5\x6a\xd5\xf9\xf2\x40\x8b\
+\x18\x52\x40\x93\xcf\x54\xfa\x76\x08\xb8\xd1\x01\x37\xd4\xa5\x2b\
+\x3d\x1e\x99\xa9\x82\xcc\x55\xaa\xde\x10\x49\x8f\x47\x66\xf2\xaa\
+\xfb\x81\xab\x3e\x53\xf0\x11\xe6\x43\x09\x0c\xfe\xaa\x1a\xb3\xbf\
+\xda\xc1\x43\x48\x1d\xa1\x0b\xf1\xe8\x6f\xe2\xd6\xb5\x2b\x4c\x79\
+\x0c\xcb\x29\xbd\xd6\xc9\xe3\xf8\x0b\x9e\xc2\x54\x9d\xc9\x3f\x9b\
+\x1e\x1b\xbe\x16\x82\xd4\xf0\x5a\x62\xc9\xf1\x2f\xfe\xdc\xb2\x75\
+\xb1\x03\xe5\x07\xbf\x4d\x03\x27\x21\xf0\x4e\x91\xd9\xb2\x75\xb1\
+\x63\x62\x6c\xe4\xaf\x10\x24\x02\x21\xf7\x04\x27\x46\x47\x6f\x65\
+\x1f\xce\x75\x23\xfa\xdd\xbd\xcf\x57\x96\xd8\x11\x41\x64\x35\x2b\
+\xbc\x59\x2f\x90\xc8\x6e\xcb\x1d\x9e\x18\x1d\xbd\x15\xa6\xc6\xd0\
+\x6f\x72\xcb\xf7\x87\x23\x31\xa7\x71\xe1\x71\xe0\x69\x9f\x59\x08\
+\x2c\xc4\xfa\x55\xf6\xe6\x8e\xd7\x32\x67\x4f\x2c\x85\xad\xaf\x26\
+\x5d\xe1\x4c\x66\x28\xb7\x6f\x77\x53\xbf\x22\x9f\xad\xff\xb6\x7e\
+\xba\x6f\xf7\x8e\x63\x99\xcc\x50\x2e\x7c\x65\xb5\xbd\xc3\x02\xc8\
+\xc1\x57\x06\xde\x41\xf9\x30\xd0\xa8\xfa\x6e\x32\x1e\xfd\x88\x1a\
+\x36\x1c\x6b\xde\xcc\x98\xbb\x32\xf5\x63\x73\x6b\xdb\x1f\x2b\xf7\
+\x87\xbb\xa8\x28\x6f\x24\xe3\xd1\x13\xb5\xd6\x73\x5f\xba\x39\x73\
+\x57\xa6\x2f\x35\xb7\xee\x69\x64\xb9\xcf\x78\x5b\x94\xa3\xc9\x78\
+\xe4\xeb\xfb\xa1\xc5\x62\xb1\x58\x2c\x16\x8b\xc5\x62\xb1\x58\x2c\
+\x16\x8b\xc5\xf2\xa0\xf1\x0f\x64\x76\x37\x12\x6f\xd4\x61\x03\x00\
+\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x00\xc8\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x00\x7a\x49\x44\x41\x54\x58\x85\xed\
+\xd2\xb1\x0d\x83\x40\x10\x44\xd1\xbf\x4b\x0f\x96\x08\x08\xdc\x09\
+\x9d\x10\x90\xb8\x24\x02\xc7\xae\x81\x6e\x08\x1c\x20\xd1\x03\xb7\
+\x8e\x0e\x59\x42\x22\xe3\x2e\x99\x97\x8d\xb4\xd2\x4c\xb0\x20\x22\
+\x22\x52\x99\xfd\x87\x88\x30\xa0\xb9\xb9\x73\x37\xb3\x38\x0d\x58\
+\x96\x6f\x6f\xce\x07\x68\x6f\x1e\xb0\x85\x33\x3c\xbb\x6e\x06\xf0\
+\x63\x89\x33\x15\x28\x07\x78\x58\xe2\x9d\x83\x5f\x5d\x96\x70\x0c\
+\x88\xc4\x0b\x58\x0b\x74\x6e\x61\x31\xe6\x50\xfd\x09\x45\x44\x44\
+\xaa\xfb\x01\x02\x66\x1a\x07\xaf\xc1\xa8\xac\x00\x00\x00\x00\x49\
+\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x03\x63\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x03\x15\x49\x44\x41\x54\x78\x9c\xed\
+\x99\x5f\x48\x53\x61\x18\xc6\x9f\xef\x9c\xcd\xe9\xa0\x14\x2b\x92\
+\xbc\x52\x8c\xae\xba\xda\x99\x56\x26\x44\x04\xa1\x37\x15\x61\xd1\
+\x55\x46\xe2\x51\x6b\xb3\x24\xe8\x22\x68\x17\x75\x17\x99\x6d\x91\
+\x73\x81\x7a\x11\x12\x49\x10\x05\x26\x04\xd9\x45\x65\xe5\x66\x94\
+\x41\x08\xf6\xe7\xa2\x34\x44\x4b\x34\x1c\xfb\xfb\x76\x63\x31\xb7\
+\x63\x43\xf0\xfb\x8e\xd0\xf7\xbb\xdb\xfb\xc2\x9e\xe7\x7b\xce\xbb\
+\x9d\x77\x67\x80\x44\x22\x91\x48\x24\x12\x89\x44\x22\x91\x48\x24\
+\x92\xff\x0d\xc6\x5b\x40\xd3\xbd\xbd\x00\x8e\x01\x00\x63\x38\x31\
+\xec\x77\xf7\xf0\xd6\x5c\x09\x5c\x03\xd8\x53\xd7\x9d\xfb\xcb\x36\
+\x1f\x4e\xad\x11\xd1\xde\x50\xa0\x65\x90\xa7\xee\x4a\x50\x78\xbe\
+\xf9\x94\x7d\xc1\x92\x5e\x63\x8c\x3d\xd1\x9a\xda\x4a\x79\xea\xae\
+\x04\x11\x1f\x01\x32\xaa\xdb\x62\xe1\xf5\xcf\xbb\xce\xcf\xf3\xd6\
+\xcf\x06\xd7\x09\x00\x80\x92\x1f\x45\x19\x53\x00\x00\x11\x6b\xde\
+\x1c\x3c\x1e\xee\xfa\xd9\xe0\x6e\xa0\xaf\xef\x48\x42\xcd\x41\xbe\
+\x51\x4f\xfb\xbe\x21\xc1\x5b\x3f\x1b\x42\xae\xc0\x2b\x9f\x7b\x2e\
+\xa9\xaa\x5b\x8d\x7a\x9a\xee\x7d\x26\xc2\xc3\x72\x08\x1b\xc1\x91\
+\x9b\xa7\xc6\x19\x68\x9f\x41\xab\xd2\xa1\xfb\xae\x88\xf2\x91\x8e\
+\x2a\x52\x6c\x22\x34\xf0\x79\x8b\xb3\x7a\x06\x40\x4d\x6a\x9d\x01\
+\xbb\x8a\x9d\xd5\xe3\x13\xc1\x47\xa3\x22\xfd\x2c\x6a\x8b\xc7\xd9\
+\xe8\xeb\x21\xa2\xe3\x19\x0d\x86\x8a\xa0\xdf\xfd\x5a\xa4\x17\x53\
+\x02\x00\x00\x4d\xf7\x7d\x04\x28\x63\x1f\x48\x58\x59\xf1\x9b\x1b\
+\xae\x09\x51\x3e\x4c\x0b\x00\x58\x7e\x47\xb0\xda\xe3\xf6\xa1\x6b\
+\xad\x61\xa3\xde\x6a\x63\xea\x7d\x98\xc8\x96\x63\x54\x8f\x2d\x58\
+\x16\x00\x12\x72\x71\x4c\x0d\x20\x14\xd0\x63\x44\xd1\x4d\x46\x3d\
+\x4d\xf7\xfd\x14\xe1\xc1\xf4\x4d\x2c\x14\x38\x37\x0d\x46\xdb\x0d\
+\x5a\xf9\x9a\xee\xbd\xc3\x5b\xdf\xf4\x00\x00\x20\xe8\x6f\x79\x0f\
+\xd0\x41\x83\xd6\x51\xde\xda\x6b\x22\x00\x00\x20\x52\xc6\xcc\xd0\
+\x5d\x13\x01\x54\xd4\xb7\x6f\x66\x8c\xfa\x33\x1a\x0c\x2f\x78\x6b\
+\x9b\x1e\x80\xa3\xa1\xd3\x9e\x50\x95\x07\x00\x4a\x52\xeb\x8c\xd1\
+\xa5\xa0\xdf\x5d\xc9\x5b\xdf\xd4\x00\x6a\x6b\xef\xaa\x8c\x45\x7a\
+\x01\x94\xa7\xd6\x09\xb8\x35\xec\x77\x7b\x44\x78\x30\x35\x80\x4f\
+\x85\x93\x57\x01\x1c\x48\x2b\x0f\xac\x2b\x9a\x69\x06\x98\xe1\x92\
+\xb4\xda\x98\xb6\x09\x3a\x75\x5f\x0b\x81\xda\x53\x6b\x04\xbc\xcd\
+\x8d\x85\xab\x44\x3e\x29\x32\x25\x80\xf2\xc6\xeb\x87\x92\xc4\xee\
+\xa5\xe9\x7f\xb5\xb2\xf8\x8e\x21\x7f\xeb\x37\x91\x5e\x84\x07\xe0\
+\x68\x68\xaf\x60\x4c\x19\x04\x90\x97\x52\x9e\x4f\x2a\xc9\xdd\x23\
+\x1d\x67\xde\x89\xf6\x63\xf8\xbc\x8e\x17\x5a\x53\x5b\x29\x48\x79\
+\x08\x5a\x72\xf8\x38\xa0\x1c\x1e\xe9\x70\x0b\x3f\x3c\x20\xf0\x4b\
+\x70\xe7\xc9\xb6\x42\x24\x2d\xfd\x20\x2c\xdd\xfd\x19\xf4\x60\xe7\
+\xe9\xc7\xa2\x7c\xa4\x23\x64\x02\xca\x5c\x5e\x5b\x3c\x8a\xfb\x00\
+\xb6\xa5\xd6\x19\x70\x79\xd8\xef\xee\x12\xe1\x61\x39\xf8\x4f\x80\
+\xc7\xa3\x14\x44\xd1\x4d\x40\xd5\xd2\x06\xdd\x1e\xee\x74\x5d\xe4\
+\xae\x9f\x05\xee\x01\x38\x26\x37\x5e\xc0\xe2\x7f\x83\x29\x3c\x9d\
+\xcd\x61\xf5\xa2\xee\xf5\xff\x82\xeb\x5d\xa0\xcc\xe5\xb5\x15\x44\
+\x31\x0b\x20\xf7\x6f\x91\xd8\x87\x88\xaa\x56\x8e\x76\x34\x0b\xf9\
+\xbd\x9f\x0d\xae\x13\x90\x1f\xb1\x25\x01\xc4\xfe\xbc\x66\xc0\x94\
+\x45\x89\xd7\xac\x95\xc3\x03\x9c\x03\x08\x05\xf4\x18\x03\xea\x00\
+\x4c\x03\x18\x43\x32\xb1\xff\xa5\xff\xec\x17\x9e\x9a\x12\x89\x44\
+\x22\x91\x48\x24\x12\x89\x44\x22\x91\x48\x24\xd9\xf8\x0d\x59\x9b\
+\xda\x0c\x1f\xf1\x22\x4f\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\
+\x60\x82\
+\x00\x00\x01\x89\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x01\x3b\x49\x44\x41\x54\x58\x85\xed\
+\x97\x31\x4e\x02\x41\x14\x86\xbf\xb7\x81\xa5\x74\x69\x56\x0a\x43\
+\x34\xd9\x66\x2f\xe0\x09\x4c\xe4\x0e\x9c\x02\x6b\xb5\x90\x1e\x4e\
+\xc1\x19\x8c\x89\x27\xe0\x02\xdb\x6c\xc0\x80\xc5\x86\x06\x2c\x59\
+\xc8\x3e\x0b\x67\x0d\x2c\x62\xa1\xbb\xb1\x70\xfe\x6a\x32\x33\xc9\
+\xf7\x65\xa6\x79\x3f\xfc\xf7\x48\x71\x63\x3a\x9b\x5d\x3b\x2a\x37\
+\x0a\x97\x80\x57\x12\x67\x25\x30\xce\x44\x07\x17\xed\xf6\xd3\x51\
+\x81\x97\xd9\x6b\x1f\xd5\x5b\x60\x0d\x44\x28\x6f\xa5\xe0\x85\x13\
+\x20\x04\x1a\x88\xf4\xcf\xdb\x67\xf7\x07\x02\xd3\xf9\xbc\x23\x19\
+\x8f\xa0\xcf\xdb\x8d\xdb\x0d\x82\xd6\xa2\x14\xb8\x49\x1c\x27\x7e\
+\xad\x9e\x8e\x40\xae\x54\xb4\x93\xbf\x84\x93\x5f\x70\x32\x7a\xc0\
+\xba\x0a\x38\x40\x10\xb4\x16\xdb\x8d\xdb\x05\x52\x47\xa5\xf7\xc9\
+\xcd\x17\xe6\xcf\xa3\x2a\xe0\xbb\x12\x08\x91\x61\xed\x0b\x00\x5e\
+\x69\x7f\xfe\x5d\x32\x56\x40\xf3\x2b\x81\x3f\x89\x15\xb0\x02\x56\
+\xc0\x0a\x58\x01\x2b\x60\x05\xac\xc0\xae\xc0\xca\x4c\xaf\x55\x13\
+\x3d\x60\x79\x20\x20\x30\x06\xc2\x38\x4e\xfc\xaa\xd8\x71\x9c\xf8\
+\x28\xa1\x61\xed\x0b\x64\xa2\x03\xa0\x51\xab\xa7\xa3\x2a\x24\x26\
+\x93\xc9\xe9\xc7\x58\x8e\x9b\x89\x0e\xf3\xfd\x62\x31\x79\x40\xf5\
+\x0e\x48\x11\x22\x33\x40\xfe\x3e\x0e\x1e\x4a\x08\xb8\x47\x8b\x49\
+\x1e\x53\xcd\x7a\x66\x74\x6e\x16\xcf\x7f\x98\xa5\xa9\x66\xc3\x62\
+\x35\xb3\x79\x07\x25\xbf\x6e\x2c\x3a\x0b\x42\xe7\x00\x00\x00\x00\
+\x49\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x00\xd3\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x00\x85\x49\x44\x41\x54\x78\x9c\xed\
+\xd7\xb1\x0d\xc2\x40\x10\x04\xc0\x7d\xe8\x01\x51\x0a\x75\x20\x3a\
+\x20\x72\x45\xee\x82\x90\x1e\xe8\xc4\xa2\x07\x78\x52\xf4\x26\xb5\
+\x1e\xd9\x33\xe1\xea\x82\xbd\xcb\x2e\x01\x00\x00\x00\x00\x60\x3b\
+\x4a\x1b\x9c\x6e\xf5\x5c\x53\xc7\x24\x87\x0e\x7d\x96\x34\xe5\x5d\
+\xae\x8f\x4b\xb9\x7f\x87\xbb\x76\x6a\xa5\xcb\x27\xc9\xb1\xec\xeb\
+\xd8\x86\xb3\x03\x6c\xcd\xec\x00\x25\x65\x48\xf2\xec\xd0\x65\x69\
+\x53\x7d\x95\xa1\x77\x09\x00\xe0\x7f\xf8\x05\xda\xa9\x95\x2e\x9f\
+\xf8\x05\x7e\xf3\x0b\x00\x00\x00\x00\x00\x00\xb0\x11\x1f\x5d\xbc\
+\x24\x0f\x6c\x9f\x83\x41\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\
+\x60\x82\
+\x00\x00\x01\x8c\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x01\x3e\x49\x44\x41\x54\x58\x85\xed\
+\xd2\xbf\x2b\x85\x51\x00\xc6\xf1\xef\xf3\xca\x62\x90\x52\xac\xfc\
+\x05\x14\xbd\xf7\x96\xcd\x24\x3f\x8a\x9b\x98\x58\x29\x7f\x80\xcd\
+\x24\x93\xc9\x2c\x52\x06\x03\x2f\x29\x25\x8b\x22\xf1\x8a\xa2\xcc\
+\x16\x65\xb1\xd0\x1d\xa4\xee\xbd\x8f\x81\x01\xc5\xeb\xde\x4d\xce\
+\x67\x3c\x3d\x3d\x3d\xa7\x73\x20\x08\x82\x20\xf8\xef\x94\x15\xc8\
+\x6f\x95\x97\x2d\x75\x95\xd1\xc4\x45\x41\x37\xbf\x29\xcd\x6f\xbb\
+\xcd\xf6\x3a\xe2\x29\x1d\xd6\x20\x92\xbf\xcb\x46\x59\x65\x46\x4d\
+\x40\x67\x1d\x3e\x89\x13\xf7\x66\xe5\x73\xdb\xee\xb2\x7d\x06\xf4\
+\x50\xa1\x39\x2b\x9f\x39\x20\x2a\x6b\x02\xd8\x04\x1a\x85\xf7\xe3\
+\xc4\x93\xdf\x65\xe3\x2d\x0f\x60\x1f\x01\xad\xc0\xe1\x4b\xa4\xbe\
+\x9f\x6e\xff\xab\x01\xa7\x63\x7a\x4e\xaf\x35\x0e\x5e\x04\xea\x85\
+\xd7\x72\x89\xe7\xb0\x3f\x3d\x5f\x9c\x78\x5a\xf2\x2e\xd0\x00\x5e\
+\x2f\x96\xd4\x77\x35\xa2\xc7\xac\xfe\xcc\x3f\xf0\x51\x2e\xf1\x0c\
+\x78\xe9\x6d\xb8\x57\x4b\x0f\xd1\xd4\xe5\x3d\xe5\xb8\xa3\xb2\x20\
+\x34\x0b\x80\x3d\x9f\x16\xa2\xb9\xac\x9b\xd7\x34\x00\x20\xbf\xe3\
+\x21\x57\xbc\x01\x34\x00\xc7\x88\x22\xa6\x1f\x28\x81\xa6\xd2\x82\
+\x56\xaa\xe9\xab\x7a\x00\x40\xbc\xe9\x6e\x45\xde\x03\x5a\xde\x8f\
+\x8a\x48\xa3\xe9\x88\x0e\xaa\xed\xaa\x69\x00\x40\xbc\xeb\x76\x95\
+\x7c\x0b\xdc\x19\x0d\x9d\x17\x74\x5d\x6b\x57\xed\x6c\x7d\xfd\x8c\
+\x41\x10\x04\xc1\x9f\xf3\x0a\x0d\x2b\x72\x05\x90\xf4\xef\x82\x00\
+\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x02\x21\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x01\xd3\x49\x44\x41\x54\x58\x85\xed\
+\x97\xb1\x6b\x53\x51\x14\xc6\x7f\x5f\x5e\xe9\x22\x15\xb4\xc4\xfe\
+\x01\x1d\x4a\x47\x5d\x2c\x28\x2e\x79\xea\x10\x09\x54\x5e\xd7\x22\
+\xe4\xe9\x20\x98\xa9\x54\xff\x04\x33\x38\x18\xc1\xc5\x64\xd0\x0e\
+\x45\x94\x08\x85\x0c\x1a\xe2\x20\xa8\x75\xd1\x4d\xb7\xee\x6d\x51\
+\x90\xe0\x52\xc8\x3d\x0e\xbe\x17\x9f\x52\x5e\x89\x7d\x69\x45\xf3\
+\x4d\xf7\x9d\x7b\x38\xdf\xef\xde\x73\x79\xdc\x0b\xff\xbb\xf4\x7b\
+\xe0\xfc\xe5\xf2\x19\xa4\x9b\xc0\x1c\x90\xcf\xc8\x67\x1b\x58\xc7\
+\xac\xda\x6e\x36\x5e\x27\x27\xbc\xe4\x87\x1f\x94\x97\x84\x56\x81\
+\x19\xe0\x48\x46\xe6\x44\xb5\x66\x90\xae\x4c\xcf\x9e\xfa\xb6\xf1\
+\xe9\xfd\xdb\x78\xa2\xbf\x03\xfe\xc2\xb5\xb3\x72\xee\x15\xf0\x15\
+\xb3\x4a\xce\xa3\xf5\xfc\x49\xe3\x4b\x16\xee\x17\x17\xca\xc7\x5d\
+\x8f\x22\x52\x0d\x38\x8a\xd9\xb9\x78\x27\xc6\xfa\x24\xce\x2d\x03\
+\xc2\xac\xd2\x6e\x36\x56\xb2\x30\x8e\x15\x2d\x64\xc5\x0f\x42\xc9\
+\x78\x18\xb5\xb8\x04\x90\x4b\xe4\xcd\x01\xe4\x3c\x5a\x59\x9a\x27\
+\x65\xbd\x9d\xb8\xf6\xe9\x38\x96\x04\xc8\x27\x68\x87\xa2\xce\xb3\
+\x47\x9f\xa3\xe1\x89\xdd\x00\x0e\x45\x23\x80\x11\xc0\xa1\x03\x8c\
+\xed\x95\x70\x21\xb8\x7a\xdd\x99\xdd\x16\x4c\x0c\x52\xd8\xa0\x9b\
+\x93\x6e\xbd\x78\xfa\xe0\x7e\x5a\x5e\xea\x0e\x14\x4a\xe1\x94\x99\
+\xdd\x1b\xd4\x1c\x40\x30\x61\x66\xb5\x42\x29\x9c\xfa\x63\x80\x83\
+\x50\x2a\x40\x67\xad\xbe\x29\xe9\x86\x41\x77\xd0\xc2\x06\x5d\x49\
+\x95\xce\x5a\x7d\x33\x2d\x6f\xcf\x33\x10\xf5\x30\xb5\x8f\xfb\xd1\
+\xdf\xdd\x82\x11\xc0\x08\xe0\xa0\x01\xb6\xe1\xc7\x05\x72\x58\x66\
+\x85\xf9\xc5\xc9\x68\xb8\xb5\x1b\xc0\x3a\x80\xeb\x51\x1c\x16\x80\
+\xbc\xf1\xb8\xf6\xbb\x38\xf6\xf3\x47\x64\x56\x45\xba\x84\x54\xf3\
+\x83\x50\xd6\xdb\x69\x25\xee\x70\xfb\x52\x61\x7e\x71\x52\xde\x78\
+\x51\xc6\x5d\xc0\x61\x56\xed\x43\x25\x13\xfd\xa0\xbc\x24\x53\x95\
+\xe1\x9d\x0d\x87\xb1\xdc\x6e\xd6\xef\xc4\x81\x5f\x5e\x46\x1b\x1f\
+\x3f\xbc\x99\x9e\x3d\xd9\x41\xca\x03\xc7\xc8\xee\x75\xb4\x05\xbc\
+\xc4\x2c\x6c\x37\x1b\x8f\x33\xaa\xf9\x8f\xe8\x3b\xaa\x2b\x8c\x73\
+\x1f\xb4\x18\x18\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
+\
+\x00\x00\x01\xaa\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x01\x5c\x49\x44\x41\x54\x58\x85\xed\
+\x94\x3f\x4b\x42\x51\x18\x87\x9f\x57\xad\x4d\xac\x21\x8a\x5a\x0c\
+\xb7\x6c\x72\x74\x70\x09\x6d\x68\x08\xba\xda\x16\x05\x1a\x41\xdf\
+\xa0\x49\xce\xd0\xd2\x27\xa8\x54\x70\x0a\x32\x8d\x86\x5a\x14\xa4\
+\xbe\x80\xd0\xe4\x94\xd4\x14\xd1\x90\x53\x43\xea\x3d\x4d\x5a\x8d\
+\xf7\x5c\xb8\x4b\xf7\xd9\x5e\x38\xe7\xf7\x3e\xbc\xe7\x0f\xf8\xf8\
+\xf8\xfc\x77\xc4\xe9\xfa\xb4\x55\xb0\x01\x06\xa3\xe1\xec\xfd\x4d\
+\xb5\xef\x56\x20\xe0\x64\x71\xb1\x58\x9c\x08\x4f\x05\x43\x1f\xb9\
+\x5c\x2e\xe8\xa9\x80\x52\xca\x46\xf4\xf6\xb8\xee\xdb\x91\xa1\xa7\
+\x02\x00\xad\x7a\xe5\x4a\xe0\x78\x5c\x67\xac\xc2\xa3\x1b\x01\xa3\
+\x11\x3e\x75\x3b\xed\x58\x3c\x91\x02\x96\x81\xf9\xd8\x4a\x62\xa1\
+\xd7\xed\xdc\x99\x64\x39\xbd\x84\x7f\x48\x5b\x05\x3d\x09\xd2\x1c\
+\x34\xaf\xcb\xe7\x4e\x33\x1c\x1f\xc1\x6f\x92\xab\x4b\x93\x09\x6a\
+\xe1\x2c\xb3\x95\x4f\x79\x2a\xa0\x94\xb2\x07\x81\xe9\xf0\x8f\x84\
+\x3c\x78\x2a\x00\x30\xc7\xfb\x17\xe8\x67\xd3\xfd\x6e\x05\xa4\x6f\
+\xcf\x94\x41\xa2\x08\x6f\x23\xad\xa3\x9e\x0a\x64\xb2\x85\x22\xe8\
+\x1d\xe0\x53\x84\x8d\xf6\x75\xe5\xc5\x69\x86\xf1\x2b\xc8\x58\xf9\
+\x5d\x8d\x54\x01\x5b\x44\x36\x9b\xf5\xd2\xad\x49\x8e\xd1\x3f\x90\
+\xce\xe6\xd7\x40\x6a\x40\x00\xe4\xb0\xd5\x28\x5d\x98\xe4\x80\xc1\
+\x11\xac\x5b\xfb\x71\xb4\x34\x80\x10\x22\x27\xad\x46\xe9\xd4\xb4\
+\xb9\x89\x80\xd8\x50\x03\x22\x1a\x2e\x93\xf1\xc5\x23\x37\xcd\x01\
+\x42\xce\xb7\xe8\x57\x0d\xbd\x61\x78\xb8\xa7\x94\xb2\xdd\x0a\xf8\
+\xf8\xf8\xf8\x7c\x03\xa5\xd7\x5e\xc1\x97\x2b\x14\xb6\x00\x00\x00\
+\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x01\x31\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x00\xe3\x49\x44\x41\x54\x78\x9c\xed\
+\xd0\xb1\x11\x82\x40\x18\x05\xe1\xf7\x5b\x04\xb5\x58\x07\x2d\x18\
+\x59\x91\x5d\x50\x87\x75\x10\x59\x05\x18\xa0\x99\x46\x77\xb0\xce\
+\xb8\x5f\x74\xc1\x0d\xbc\xdb\x44\xd2\x3f\xab\xbd\x7f\x70\x9e\xd6\
+\x71\xcd\x7a\xdb\x7e\x56\xd7\xfb\x58\x53\xcf\xfb\xad\x4e\x7b\x7e\
+\x3c\x49\x5e\x8f\x19\x92\x0c\xef\x87\xf5\xbc\xdf\x6a\xf7\x00\xd9\
+\x1e\xf3\xe9\xdc\xeb\x7e\x93\x23\x02\xfc\x34\x03\xd0\x03\x68\x06\
+\xa0\x07\xd0\x0c\x40\x0f\xa0\x19\x80\x1e\x40\x33\x00\x3d\x80\x66\
+\x00\x7a\x00\xcd\x00\xf4\x00\x9a\x01\xe8\x01\x34\x03\xd0\x03\x68\
+\x06\xa0\x07\xd0\x0c\x40\x0f\xa0\x19\x80\x1e\x40\x33\x00\x3d\x80\
+\x66\x00\x7a\x00\xcd\x00\xf4\x00\x9a\x01\xe8\x01\x34\x03\xd0\x03\
+\x68\x06\xa0\x07\xd0\x0c\x40\x0f\xa0\x19\x80\x1e\x40\x33\x00\x3d\
+\x80\x66\x00\x7a\x00\xcd\x00\xf4\x00\x9a\x01\xe8\x01\x34\x03\xd0\
+\x03\x68\x47\x04\x78\x7c\x39\xf7\xba\xdf\x64\xff\x00\x4b\x5d\xaa\
+\x32\x57\x65\xce\x52\x97\xee\xf7\x25\xa9\xc1\x13\x85\x02\x26\x2c\
+\x67\x7d\xc5\x41\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
+\
+\x00\x00\x02\xda\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x02\x8c\x49\x44\x41\x54\x78\x9c\xed\
+\x9a\x3b\x6f\x13\x41\x14\x46\xcf\xb5\x13\x42\x13\xba\xfc\x92\x48\
+\xb6\x25\x1a\x5a\xba\x3c\x44\xe4\x90\x80\x44\x05\x05\x2d\x1d\x2d\
+\xff\x00\x24\x5c\x21\x1e\x79\x08\x84\x57\x34\xd4\x74\x80\x5b\x7e\
+\x07\x12\x12\x0d\x42\x72\x3e\x0a\x84\x64\x36\xeb\x38\xde\x9d\x99\
+\x9d\x59\xfb\x96\xb3\x77\x3f\xcd\x39\xda\x5d\x5b\x57\x03\xcb\x5a\
+\xd6\xb2\x16\xb9\xac\xee\x0d\xf8\xae\x4e\xa6\x2d\x93\x9e\x48\xfc\
+\x68\xb7\xed\xc1\xe7\x2d\xfb\x36\x79\x7d\xa5\xae\x8d\x85\xa8\xee\
+\x50\x7d\xa4\x23\xa0\x65\x06\xe3\xb1\x9e\x03\xd7\x27\x7b\x5a\xf5\
+\x6c\xcd\x7f\x75\x87\xea\xc3\x5f\xf8\x7f\x6b\x2d\xe3\x5a\xbe\xaf\
+\x91\x02\x8a\xe0\x81\xb1\xb0\xc7\xf9\xde\xc6\xbd\x02\x17\xc0\xef\
+\x8f\x76\xec\x43\xbe\xbf\x51\x1f\xc1\x19\xf0\xef\x8a\xee\x69\x8c\
+\x80\x32\xf0\xd0\x10\x01\x65\xe1\xa1\x01\x02\xaa\xc0\x43\xe2\x02\
+\xaa\xc2\x43\xc2\x02\x5c\xc0\x43\xa2\x02\x5c\xc1\x43\x82\x02\x5c\
+\xc2\x43\x62\x02\x5c\xc3\x43\x42\x02\x7c\xc0\x43\x22\x02\x7c\xc1\
+\x43\x02\x02\x7c\xc2\x43\xe4\x02\x7c\xc3\x43\xc4\x02\x42\xc0\x43\
+\xa4\x02\x42\xc1\x43\x84\x02\x5c\xc3\x77\x86\xba\x05\x7a\x06\x80\
+\xec\xfe\x68\xd7\xb2\xc9\xeb\x51\x4d\x84\x5c\xc3\x77\x87\xea\x1b\
+\x3a\x35\xd8\x30\xd8\xc0\x34\xc8\xf7\x44\x23\xc0\x07\x7c\x41\xde\
+\xb9\x8a\x42\x40\x20\xf8\xb3\x96\xd9\xc3\x7c\x6f\xed\x02\x42\xc1\
+\x1b\x76\xf7\xcb\xb6\xbd\xcd\xf7\xd7\xfa\x11\x0c\x0a\xbf\x63\x47\
+\x45\xf7\xd4\x26\x20\x06\x78\xa8\x49\x40\x2c\xf0\x50\x83\x80\x98\
+\xe0\x21\xb0\x80\xd8\xe0\x21\xa0\x80\x18\xe1\x21\x90\x80\x50\xf0\
+\x92\xdd\x19\xed\xda\xf1\x3c\x59\xde\x05\xc4\x0c\x0f\x9e\x05\xc4\
+\x0e\x0f\x1e\x05\xa4\x00\x0f\x9e\x04\xa4\x02\x0f\x1e\x04\xa4\x04\
+\x0f\x8e\x05\xa4\x06\x0f\x0e\x05\xa4\x08\x0f\x8e\x04\xa4\x0a\x0f\
+\x0e\x04\x04\x83\x37\x3b\x1c\x6d\xdb\xc9\xbc\x79\xbd\x4c\x7b\x67\
+\xd2\x53\xc0\xfd\x4c\x30\x76\xf8\x6e\xa6\x43\x49\x27\x5e\x66\x82\
+\x29\xc0\x23\xbd\x64\x06\x63\x29\x01\xb1\xc3\xf7\x86\x3a\x28\x80\
+\x77\x33\x13\x4c\x01\x5e\xe8\x55\x3e\xcf\xc9\x4c\x30\x69\xf8\xaa\
+\x33\xc1\xd8\xe1\x3b\xef\x75\xdb\x4c\xaf\xcf\xe5\xcd\xf8\xe9\xbc\
+\x94\x80\xa6\xc2\xc3\x25\xce\x0a\x87\x82\x07\x3b\x18\x6d\xdb\xe9\
+\xbc\x79\x55\xe0\x61\xc6\x13\x10\x12\xfe\xeb\x4e\x78\x78\xb8\x40\
+\x40\xf4\xf0\x99\xf6\x4d\x7a\x93\xcf\x9b\xf7\x35\x2a\x14\xb0\x28\
+\xf0\x00\xed\xfc\x42\x2f\xd3\x1e\xe8\x18\x47\xf0\x53\xf2\x4a\xc3\
+\xf7\x32\xed\xa1\xf3\x79\x65\x3f\xa0\xff\x3d\x01\x9b\x03\xad\xae\
+\x6c\xe8\x3b\xb0\x3e\xb1\x5c\x1a\x7e\x4a\x5e\x69\x78\xd7\x79\x90\
+\xfb\x27\xb8\x7e\x85\x36\xb0\x36\xb1\x54\xe9\x58\x4a\x41\x5e\xa5\
+\xcd\xba\xce\x83\x9c\x80\x4f\xf7\xec\x97\x61\x8f\x80\xdf\xc0\x4f\
+\x64\xfd\x2a\x67\x72\xf2\x79\x66\xb6\x5f\x65\xb3\xae\xf3\xa6\xd6\
+\xcd\x8f\x5a\xdb\x1c\x68\x35\xd6\xbc\x1b\x2f\x74\xd5\x65\xde\xb2\
+\x96\xb5\xc0\xf5\x07\xd6\x41\x4c\x2b\x6c\xde\x0f\x7f\x00\x00\x00\
+\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x04\xe8\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x04\x9a\x49\x44\x41\x54\x58\x85\xc5\
+\x97\xd9\x76\xe2\x46\x10\x86\xbf\x66\x11\x12\x60\x50\x9c\xc4\x9e\
+\xf1\x24\x39\x59\xde\xff\x9d\x72\x31\x9e\x49\x1c\xcf\x18\x6c\x23\
+\x19\x24\xa8\x5c\xd4\xdf\xa8\x91\x71\x72\x97\xd4\x39\x1c\x89\x56\
+\xd7\xf6\xd7\xd6\x0d\x58\x09\x16\xf8\xcf\xc9\x02\x58\x19\xa4\x7c\
+\x09\xac\x21\x58\xf7\x91\x4b\x20\x1a\x96\x25\xef\x93\x44\x4a\x5c\
+\xb3\x64\x6d\x9b\xac\xed\xf4\x7e\x00\x1e\x7a\xf2\x97\xc0\x3a\xf4\
+\x16\x0e\xc0\x05\x30\x00\xaa\x44\x59\x90\x11\x13\xd8\x0d\x21\x8c\
+\x81\x71\xcf\xa5\x16\xac\x81\xac\x95\x11\x51\xb9\x01\x0d\x90\x4b\
+\xfe\x23\x30\x3c\x75\xd8\xf7\x2d\xc0\x7e\x11\x34\x63\xb0\x99\xd6\
+\x33\xb0\xf7\xf0\x50\x82\xe5\x60\x13\xb0\x82\x57\x64\x85\xbe\x4d\
+\xb5\xf7\xca\x79\xc1\xd7\x2c\x93\xec\x5f\xc1\x2e\xfa\x10\x02\xf6\
+\x01\xf8\x24\x24\x0c\x78\x01\x0a\xd8\xbd\x87\xec\xa3\xbc\x00\x58\
+\xc8\x8b\x73\x94\x7e\x9b\xc0\xee\x06\xb2\x5b\x21\x92\x4b\xdf\x1a\
+\xb8\x81\x70\x0b\x30\x92\xf2\x80\xc3\x3e\x96\xf2\x1b\xe0\xde\x19\
+\xb2\xfb\x44\xf9\x04\x0f\x91\x71\x1a\xf7\xe8\xcc\x4c\xca\xf4\xcb\
+\xbe\xc2\xa6\x80\xd9\x18\x78\x07\x7c\x94\x8e\x41\x0f\x01\xfb\x4e\
+\xff\x2b\x08\x15\xd8\xb5\xbe\xfd\x09\xcc\x1d\x8d\xd5\x0c\x4a\x5c\
+\x70\xa8\xcf\x03\x60\x73\xa0\xc5\xf3\xa5\xd2\xf3\x80\x27\xf4\x0e\
+\x78\xc2\xe3\xff\x0d\xb0\x82\xb0\x19\x25\xdc\x63\x29\xcf\xe5\xdd\
+\x1a\xb8\x92\xc5\x39\x94\x4f\x82\x71\x02\x66\x1d\x0f\x24\x08\xe5\
+\xc0\xb3\x94\x95\x42\x38\x03\xee\xf0\xf0\x64\x10\x9e\x12\x07\x3b\
+\x28\xdc\x52\x9b\xc0\xcb\xb5\x18\x83\xa0\x5c\x48\x68\xa4\x39\x1e\
+\x86\xb9\xf8\x07\xfa\x1f\xd7\x22\x6d\xc4\xbb\x93\xac\x00\xdb\xf7\
+\x4a\xcc\x63\xee\xc5\x10\xbc\x73\x41\x15\x30\xfd\x8c\xc7\xb2\x96\
+\xf5\x23\xc1\x56\x43\x75\x09\xd3\xb5\x23\x75\x8e\x6c\x21\x99\x35\
+\x30\x95\x03\x53\xba\xd2\x1b\x49\xf6\x1c\x0f\xc1\x97\x14\x81\x09\
+\xb4\x2f\x49\x6d\x16\x8a\xb5\xe1\x96\x5d\xc3\x74\xe5\x48\xbd\x49\
+\xb1\xce\xbf\x17\x8f\x09\x89\x58\xb6\x2d\x3c\x36\x78\xe8\xfa\x21\
+\x68\x4a\x58\x3c\x74\xc6\x30\x54\x3e\xe4\x78\xd2\xfc\x25\xc1\x85\
+\xfa\x41\xee\x49\x67\xb3\xee\x3f\x05\x9e\x37\x5f\x61\x73\x29\xde\
+\x3c\x91\x09\x2c\x9e\x49\x42\x15\x0d\xc8\xbc\x8b\x91\x0b\xc6\x52\
+\x1e\xb4\x62\x5c\xe1\x89\xf6\x20\x48\x73\x3d\x83\xa0\x9d\xba\x0c\
+\xa6\xae\x9c\x06\x66\x0f\xda\xd7\xe2\x3d\xe5\x12\xef\x31\x43\x68\
+\x4c\xfb\x63\x1f\x20\x40\x50\xd7\x0a\x8f\xde\xb9\x82\x32\xdb\x0c\
+\x82\xfa\xbb\x35\x12\x36\x06\xee\x7b\xbd\xfd\xca\x8d\x8e\x7c\xb4\
+\x60\x7b\x7f\x86\x1d\xd8\x33\x5e\x86\x03\xba\x24\x3f\xa9\x82\x61\
+\x52\xdf\x49\x93\xa9\xd3\x3d\xda\xc7\xbd\x7b\x63\xe9\x30\xbb\x4b\
+\x1c\x8a\x94\x4e\x59\xc9\x0c\x55\xe7\x6c\xc7\x30\x82\xf1\x21\xf1\
+\x86\xe4\xbd\x4d\x84\x8c\x80\xc6\x3d\xb7\x35\xea\x4c\x78\x46\x5b\
+\xd2\x1f\x52\x4a\x1d\x78\x35\x3d\x07\xc9\x73\x7f\x86\xb9\x4f\x87\
+\x9e\xc0\x3e\x9d\x6b\xcf\x96\xbc\xbf\xda\x17\x85\xed\xa0\x51\x57\
+\x0b\xd6\x6d\x0e\x06\xf5\xb0\x67\xc0\x30\x81\x7d\xa5\xdf\x32\x99\
+\x27\x7d\x83\x4f\x46\x6e\xdf\x98\x94\xa1\x55\x29\xf5\xac\x2d\xfa\
+\x75\xdf\xe2\x09\xa7\x79\x1e\x62\xdb\xbe\xa6\x3b\x03\x44\x0a\xaf\
+\xdf\xad\x00\x3b\xee\x8b\x39\x60\xca\x70\x53\x19\xce\x34\x58\xc0\
+\x4b\xb3\x94\xe2\x02\x6f\xb9\x6a\x36\x96\x42\xdc\x00\xdf\x4a\xb8\
+\x49\xb6\x0e\x21\x16\x3b\x20\x32\x76\x1f\xf9\xa2\x01\x3b\x08\x43\
+\x95\xdb\xd6\x0f\x24\x34\xfe\xdf\xc0\x33\x7f\x23\x21\x9f\xff\x61\
+\x1a\xee\x38\x9e\x76\xd6\x25\x2c\xef\x3a\x07\x79\xc0\x4b\x38\xee\
+\xd9\xc1\x49\x08\xc6\x75\xe2\xf5\x16\x35\x0a\x51\x05\x2f\x3f\xc9\
+\xf3\x73\x99\x7e\xb4\x40\x1e\x7e\x80\xe5\x53\xb7\xbc\x2a\xa4\x1c\
+\x37\x6c\xbc\x89\x5f\x06\x09\xe3\x06\xea\xb2\x63\xa2\xf6\x86\x14\
+\x0f\x1a\xf9\x2d\x3e\xdd\xfa\x67\xc1\x94\x22\xd4\x7f\xe0\xed\x36\
+\xf8\xb3\x4c\x86\x57\x36\x93\x31\x27\x21\xd8\xfb\xe6\xe2\x19\xec\
+\x86\x6e\xe0\x14\xf8\x49\xe6\x77\x3c\x9e\x7b\xa0\x74\xa4\xea\x41\
+\x97\xa0\xf5\x50\x02\xd5\x21\x8f\x7b\x7f\xc6\xbb\x9f\x8e\x77\x2c\
+\xa1\xb8\x95\xcc\x6d\x6a\x00\x6e\x40\x78\x06\x1b\xd0\xc5\x7c\x24\
+\x6f\x0e\x10\x36\x60\x2d\xf0\x0c\xe1\xe5\x3c\x00\x36\x77\x19\xa0\
+\x83\xeb\x67\x7c\x96\x6c\x24\x73\xe5\xf9\xd3\x45\x31\x0d\x41\xe3\
+\x93\x2d\x3c\x42\x7d\xe1\x9e\xb2\x96\xf5\x5b\xe5\xc7\x71\x8c\xbe\
+\x4d\x36\x56\xe8\x1a\x3c\xd1\xd6\xc0\x25\x54\x33\x47\xc3\x66\x5a\
+\x3f\x09\xc1\x57\xe0\x07\xdf\x6c\x4b\x60\x06\x2f\x41\x93\x74\x42\
+\x67\xb2\x0e\x97\x55\x05\x85\xd1\x75\xcf\xd8\xac\x0a\x3c\xdb\x77\
+\x38\xf3\xc2\x8d\xaf\xa7\x30\x9d\xe3\x13\x76\xe3\x8e\x87\x4d\x62\
+\x40\x30\xb0\x03\x5e\xeb\x01\xf8\x04\x45\x34\x86\x0e\x56\xf0\x30\
+\x4c\x75\xf4\x36\x21\x18\xe2\x1c\x59\x38\x82\xc7\xbd\x17\x6e\xcc\
+\xf4\x8b\x64\xc5\xd9\x72\xee\x50\x63\x17\xba\x34\xf4\x2f\x26\x0b\
+\xa8\x7e\xec\x2e\x23\xff\x76\x31\x01\xe7\xad\x3e\x74\x65\x7d\x72\
+\x31\xf9\xed\xcc\xc5\xe4\xd8\xdb\xf7\x82\x6d\x20\x2b\x33\x1c\xfe\
+\x81\x7f\x6f\x32\x79\x30\x84\x71\x7a\xf7\xcb\x75\x30\x6e\x7d\xd4\
+\x8e\x6a\xbc\x67\xec\xc5\xdb\xd0\x0d\xa6\x35\xc9\xd5\xec\x8d\xcb\
+\x69\xf4\xe2\x98\x70\xc3\xe4\x7d\xa2\xf7\x09\x6c\x35\x3b\x26\x95\
+\x94\x18\xdd\xe5\x54\x06\xb9\xb0\x18\xf3\x9e\xc3\x6b\xf8\x9f\xaf\
+\xe7\x7f\x03\x88\x7c\xd3\x3b\xed\x32\x4f\xdf\x00\x00\x00\x00\x49\
+\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x00\xee\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x00\xa0\x49\x44\x41\x54\x78\x9c\xed\
+\xd0\x41\x0d\x00\x20\x00\x03\x31\x82\x7f\x91\x10\x84\x80\x8c\xf2\
+\xb8\x1a\xd8\x65\x63\x40\x6b\x9f\xbb\xf6\xb9\xb2\x61\xca\xf1\x1f\
+\x74\x80\x0e\xd0\x3a\x40\x07\x68\x1d\xa0\x03\xb4\x0e\xd0\x01\x5a\
+\x07\xe8\x00\xad\x03\x74\x80\xd6\x01\x3a\x40\xeb\x00\x1d\xa0\x75\
+\x80\x0e\xd0\x3a\x40\x07\x68\x1d\xa0\x03\xb4\x0e\xd0\x01\x5a\x07\
+\xe8\x00\xad\x03\x74\x80\xd6\x01\x3a\x40\xeb\x00\x1d\xa0\x75\x80\
+\x0e\xd0\x3a\x40\x07\x68\x1d\xa0\x03\xb4\x0e\xd0\x01\x5a\x07\xe8\
+\x00\xad\x03\x74\x80\xd6\x01\x3a\x40\xeb\x00\x1d\xa0\x75\x80\x0e\
+\xd0\x3a\x40\x07\x68\x1d\xa0\x03\xb4\x0e\xd0\x01\x5a\x07\xe8\x00\
+\xad\x03\x74\x80\xd6\x01\x3a\x40\x7b\xd6\x8f\x07\xc5\x02\xeb\xa3\
+\x1e\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x02\x0a\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x01\xbc\x49\x44\x41\x54\x58\x85\xed\
+\x94\x3d\x6b\x14\x61\x14\x85\x9f\xf3\x6e\x84\x85\x80\x68\x23\x83\
+\x9b\x9d\x37\x0b\xfe\x00\x7f\x81\x9d\x28\x12\xb4\xd1\x52\x48\x2b\
+\x41\xf2\x1f\xf4\x0f\x88\x16\x96\x36\x16\x8a\x58\x69\xa1\x58\x5a\
+\x68\xa9\xbd\x98\xcc\xec\x46\xd6\x4a\x63\x12\x30\xc8\xce\xb1\xd8\
+\x0f\x96\x7c\xed\xce\xfa\x91\x66\x1e\x18\xb8\x33\x5c\xce\x39\xdc\
+\x79\xef\x0b\x15\x15\x15\x15\xc7\x8c\x86\xc5\x7a\x96\x7f\x03\x9d\
+\xfa\x3f\xb6\xfe\xbe\x18\xd3\xd3\x00\x61\xf4\x69\xac\xfe\xe7\xf6\
+\x63\x5e\xa3\x62\x2e\xa8\x85\x78\xdf\xef\x30\x98\x02\xe8\xfd\x95\
+\xc7\x14\xd8\x43\xab\x77\x73\x41\xad\xe1\xcb\xe8\x17\x00\x74\xbb\
+\xdd\xf9\xdd\xdd\x5f\xcf\x0d\x97\x06\x49\x0b\x81\xf9\x03\x0c\x12\
+\x0e\x20\x30\xaf\xea\xf5\x13\xd7\x93\x24\xd9\xd9\x37\x01\x80\x24\
+\x49\x76\xb6\xb6\x36\xaf\x0a\x3d\x1d\xa4\x0b\x7b\x43\x96\xb4\x57\
+\x5f\x43\x60\x3d\xd9\xde\xde\xbc\x36\x6e\xce\x61\xe2\xb6\x6b\x59\
+\xb6\xf1\x00\xf9\x96\x6d\x24\x15\x94\x9c\x84\x40\x85\x1d\x24\x81\
+\xf5\x30\xc6\xc6\x6d\x49\xbd\xbd\x7d\x07\x1e\x3c\x49\xbd\x18\x1b\
+\x2b\x48\x77\x25\x01\x04\x95\x98\x84\x40\x86\x20\x09\xc3\x9d\x18\
+\x1b\x2b\x07\x99\x0f\x7a\x8f\x26\xcb\xda\xab\x86\x7b\x00\x06\x0b\
+\x8a\xa3\xfa\x3d\x16\x56\xb0\x1a\x63\xf3\xfe\x84\xb0\x93\xc9\xb2\
+\xce\x4d\xe3\x47\x40\xad\xef\x71\x48\x08\x13\x10\x02\x7a\x82\xe5\
+\x18\x9b\x8f\x27\x69\x4f\x3d\xd6\x2c\xeb\x2c\x19\x3f\x03\xea\x18\
+\xa3\x7d\x21\x86\x07\xf6\xa7\xd0\x8d\x18\x17\x5e\x4e\xa3\x5b\xea\
+\x84\x7f\xce\xf3\x0b\xc1\x7a\x01\x9c\x44\x78\x70\x57\x80\x08\x18\
+\x01\x3f\x82\xbc\x94\xa6\xe9\xdb\x69\x35\x4b\xaf\xd8\xda\x5a\xe7\
+\xbc\x82\x5f\x03\x67\x40\x76\x7f\xd5\x00\x7d\x75\xc1\xe5\x56\x6b\
+\xe1\x43\x19\xbd\x99\x76\xbc\xdd\x6e\x9f\xeb\x15\x7a\x03\x5e\x1c\
+\xc8\xac\xd7\x82\x2f\x36\x9b\xcd\x4f\x65\xb5\x66\xbe\x64\xf2\x3c\
+\x3f\x5b\x58\x1b\x88\x8f\x01\x5f\x49\xd3\xf4\xcb\xac\x5a\x15\x15\
+\x15\x15\xc7\xca\x6f\xbc\xd7\xa4\x72\xc7\xdc\xd0\xf5\x00\x00\x00\
+\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x00\x78\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x00\x2a\x49\x44\x41\x54\x58\x85\xed\
+\xce\x41\x01\x00\x20\x0c\xc4\xb0\x0d\x4d\x78\x9a\x1f\x0c\x83\x8c\
+\xe3\x91\x18\x68\xab\x00\x80\xb0\xde\x73\x6e\x72\x60\x25\xe3\x00\
+\xc0\x17\x1e\xbe\x17\x02\x30\xed\xb9\x5b\x96\x00\x00\x00\x00\x49\
+\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x01\x20\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x00\xd2\x49\x44\x41\x54\x78\x9c\xed\
+\xd0\xb1\x0d\xc2\x40\x14\x44\xc1\x35\x45\x38\x43\x72\x4d\xb4\xe0\
+\x88\x8a\xe8\x82\x9a\x2c\x93\xd0\x85\x09\x40\x44\x90\x7a\x90\xd8\
+\x89\x2e\xbb\xfd\x2f\xa9\xaa\x7f\x36\xa8\x8f\x97\xe5\x76\xca\x90\
+\x4b\x92\x64\xcb\x79\x9a\x8e\x57\xb1\xe3\x20\x3e\x4d\x92\xd7\xf1\
+\x63\x92\xf1\x1d\x02\x70\x01\x9e\xc7\x7f\x7a\xef\x4a\x06\xf8\x09\
+\x0d\xa0\x07\x68\x0d\xa0\x07\x68\x0d\xa0\x07\x68\x0d\xa0\x07\x68\
+\x0d\xa0\x07\x68\x0d\xa0\x07\x68\x0d\xa0\x07\x68\x0d\xa0\x07\x68\
+\x0d\xa0\x07\x68\x0d\xa0\x07\x68\x0d\xa0\x07\x68\x0d\xa0\x07\x68\
+\x0d\xa0\x07\x68\x0d\xa0\x07\x68\x0d\xa0\x07\x68\x0d\xa0\x07\x68\
+\x0d\xa0\x07\x68\x0d\xa0\x07\x68\x0d\xa0\x07\x68\x0d\xa0\x07\x68\
+\x0d\xa0\x07\x68\x0d\xa0\x07\x68\x0d\xa0\x07\x68\x0d\xa0\x07\x68\
+\x0d\xa0\x07\x68\x32\xc0\xfd\xcb\x7b\x57\x2e\xc0\x96\x39\x43\xd6\
+\x0c\x59\xb3\x65\x66\x3b\xaa\xea\xaf\x3d\x00\x08\x2d\x0e\x52\x29\
+\x6c\xf3\x60\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x04\x03\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x03\xb5\x49\x44\x41\x54\x58\x85\xe5\
+\x97\x5d\x68\x9b\x55\x18\xc7\x7f\xcf\x79\xfb\x81\x53\xe7\x6c\x07\
+\x8b\xd8\xb2\x59\xaa\x62\x41\x91\x35\xcd\xf4\xc2\xaf\x39\x36\x44\
+\xb6\x4e\xb0\x88\xc8\x9c\x0c\xd7\x74\xad\xe9\xaa\x20\x74\x78\x11\
+\x83\x43\x0b\x82\xc5\x34\xad\x26\x1b\x88\xa2\x57\x03\x8b\xed\x74\
+\x3a\x50\xba\x2b\xe9\xb2\x58\xbc\xb0\x14\x84\x0a\x9a\x36\x1d\xae\
+\x05\xc5\x6d\x36\xcb\x7b\x1e\x2f\x92\x7e\x66\xed\x5a\x9a\x7a\xb3\
+\xff\xe5\xf3\x3e\xe7\xfc\x7f\xcf\xe1\x3d\xe7\x3c\x07\x6e\x76\xc9\
+\x6a\x92\xeb\x9a\xbb\x2b\xad\x9b\xd9\x2f\x2a\xbb\x10\x2a\x11\x2a\
+\x50\x0c\xca\x18\x22\x49\x84\x73\x8e\xda\xde\xc1\xe8\xd1\x5f\x0b\
+\x0a\xe0\x6d\x0a\xfb\x50\x3a\x80\xa7\x56\x38\x6b\x5c\x54\x8f\xc5\
+\xa3\x47\xbf\x5f\x13\x40\x6d\x63\xf4\x0e\x91\xe9\x8f\x80\x17\x73\
+\xa1\x14\x48\xbf\x2a\x67\xd4\x71\x47\xf5\x5f\x93\x2a\xde\x60\xac\
+\xa6\xf1\x58\xb1\xdb\x8c\x61\xb7\x5a\xea\x11\xb6\xe6\xa6\xff\xc6\
+\x71\xdd\x43\x83\x27\xdb\x2e\xae\x1a\x60\x7b\x73\x77\xb5\xc9\xd8\
+\x3e\x44\x1f\x00\x52\x22\x04\x6f\xdd\x32\xf9\xc9\x40\x28\x94\x59\
+\xb6\xa4\x60\xd0\x78\x27\xca\x5f\x00\x39\x0e\x5a\x05\xfc\x6e\x60\
+\xdf\xf9\x68\xeb\xcf\x2b\x06\xf0\x1e\xf9\xa0\x0a\x5b\x34\x08\x6c\
+\x06\xbe\x72\x4a\x78\x79\xb0\xab\xf5\xef\x65\x8d\x17\xa9\x3a\x10\
+\x2e\xdd\x34\x4d\x0f\xc2\x21\xe0\x32\xc2\x63\x17\x3e\x6e\x1d\xba\
+\x21\xc0\x8e\x40\x78\x63\x26\xcd\x8f\x02\x35\x8a\x7e\x98\xf0\x4c\
+\xbd\x41\x28\x64\x57\x63\x3e\x27\x95\x3a\x7f\xb8\x5d\x91\x77\x81\
+\xa4\xaa\xeb\x4b\xc4\x5e\x4f\xcd\xcf\x30\x8b\x87\xb8\xd3\x44\x04\
+\x6a\x80\xfe\xb5\x99\x03\x88\xc6\xa3\xad\x1d\x22\x9c\x04\x2a\x8c\
+\x38\x9f\x83\x2e\x28\x7a\x01\x80\xcf\xdf\xe5\x45\x38\x80\xf0\xa7\
+\x6a\xe9\x81\xb5\x99\xcf\x41\x5c\x9e\x9c\x6c\x01\x46\x14\x76\x7a\
+\xfd\xe1\x67\x96\x04\xb0\xa2\xef\x01\xa8\xea\x3b\x89\x98\xff\xaf\
+\xb5\x9b\x67\x35\x7c\x2a\x94\x16\x78\x2b\x07\xd4\x31\x7f\x15\x66\
+\x01\x6a\x1b\x3b\xef\x42\x79\x1a\x98\xba\x3a\x35\x15\x2d\x94\xf9\
+\x8c\xe2\xd1\x40\x2f\x30\x02\x3c\xe8\xf3\x77\x3d\x94\x07\x20\x98\
+\xbd\x80\xa0\x7c\x3d\x7c\x2a\x94\x2e\x34\x00\x88\xa2\xda\x07\x60\
+\x45\x9f\xcb\x03\x40\xe4\x49\x00\x45\xbe\x2d\xbc\x79\x56\xd6\x98\
+\xef\xb2\x28\xb2\x33\x1f\x00\x2a\x01\x1c\x91\xdf\xd6\x0b\xa0\x84\
+\xcc\x28\x80\x42\x45\x1e\xc0\x4c\xd0\xc8\xb5\x54\xfe\xd0\xc2\xe8\
+\x52\xb1\x33\x33\xf7\xdd\x33\x3f\x62\xde\x39\xf0\xbf\x29\xf8\xf6\
+\x42\x00\x81\x31\x80\xb4\x38\x9e\xf5\xf2\xbc\xdd\x1a\x0f\x80\xc2\
+\xf8\xcc\x19\x33\xb7\x02\x2a\x7f\x00\x18\xcb\x3d\xeb\x05\x60\xae\
+\xb9\x55\x00\x02\xc9\xd9\xd8\xdc\x57\x1d\x00\x10\x91\x3d\xeb\x06\
+\x60\xd8\x0d\xa0\xf0\x43\x1e\x80\x5b\x24\xfd\x00\xaa\xfa\x6c\x6d\
+\x63\xb4\xb8\xf0\xf6\x2a\x56\x65\x1f\x80\xb1\x6e\x6f\x1e\xc0\x50\
+\x24\x30\x2e\x59\xb2\xcd\x30\xfd\x6a\xa1\xed\xbd\x47\x22\x7b\x73\
+\x97\xdc\x2f\xf1\x13\x6d\xb3\xbd\xc1\xc2\x5d\x60\x6d\x3b\x80\x08\
+\xc1\x1d\x81\xf0\xc6\x42\x99\xd7\x34\x04\x4b\xd4\x66\xef\x19\x81\
+\x63\x20\x7a\x5d\x80\xf8\x89\xb6\xb8\xc2\x17\xc0\x16\x37\xcd\x67\
+\x04\x83\x05\xd8\xa6\x2a\x1b\xee\x2c\x0f\xe7\xaa\x1f\x88\x47\x03\
+\xa7\xe7\x7f\xcd\x37\xd0\xd2\x16\xb2\x97\x46\xbd\x77\xa2\xfc\xfd\
+\xb5\x41\xa8\x78\x9b\x22\x6f\x22\xf8\x51\xc6\xdd\x62\x79\x69\x7e\
+\xf5\xb0\x44\x4b\xb6\xbd\xb9\xbb\xda\xb8\xee\x20\x50\x06\x7c\x79\
+\xc5\x71\x0e\x0e\xf7\xb4\xfc\xb3\x1a\xeb\x9a\x86\x60\xc9\x2d\x65\
+\xe5\x11\x81\xc3\xc0\x15\x83\x3c\x71\x3e\x1a\xb8\xb0\x38\x6f\xc9\
+\xa6\xd4\x77\x38\x72\x9f\x35\xb6\x0f\xb8\x5f\x91\x31\x81\xe0\x6d\
+\x9e\x4b\x9f\xae\xa4\x29\xad\xbb\x58\xf6\xbc\x55\x39\x2e\x70\x2f\
+\x90\x54\x35\xf5\x89\xd8\x6b\x3f\x5d\x2f\x7d\xd9\xb6\xfc\xe1\x57\
+\x3a\x37\x15\x95\x9a\x18\x48\x43\x2e\x94\x14\xa1\x1f\xe5\x0c\xd6\
+\x8c\x16\xd9\x74\xea\xaa\x2b\xd6\x29\x29\xf2\xa8\x61\xab\xb1\x76\
+\x0f\x62\xea\x73\xdd\x30\xc0\x59\x71\x9c\x83\xf1\x9e\x96\x89\xa5\
+\x3c\x56\xf4\x30\xf1\xf9\x23\x8f\x5a\xb4\x03\xf4\xf1\x95\xe4\x03\
+\x43\xaa\xb4\x27\x62\xad\x67\x6f\x94\xb8\xaa\xa7\xd9\x23\x4d\x9d\
+\xdb\x32\xd6\xd9\x8f\xb0\x0b\xcd\x3d\xcd\xc0\x01\x92\xd9\xe3\x55\
+\xcf\x59\x35\xbd\x89\x58\x60\x64\x35\xf3\xde\xdc\xfa\x0f\x80\xbd\
+\x5b\x45\x41\xb4\xc0\xa5\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\
+\x60\x82\
+\x00\x00\x04\xe8\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x04\x9a\x49\x44\x41\x54\x58\x85\xc5\
+\x97\xd9\x76\xe2\x46\x10\x86\xbf\x66\x11\x12\x60\x50\x9c\xc4\x9e\
+\xf1\x24\x39\x59\xde\xff\x9d\x72\x31\x9e\x49\x1c\xcf\x18\x6c\x23\
+\x19\x24\xa8\x5c\xd4\xdf\xa8\x91\x71\x72\x97\xd4\x39\x1c\x89\x56\
+\xd7\xf6\xd7\xd6\x0d\x58\x09\x16\xf8\xcf\xc9\x02\x58\x19\xa4\x7c\
+\x09\xac\x21\x58\xf7\x91\x4b\x20\x1a\x96\x25\xef\x93\x44\x4a\x5c\
+\xb3\x64\x6d\x9b\xac\xed\xf4\x7e\x00\x1e\x7a\xf2\x97\xc0\x3a\xf4\
+\x16\x0e\xc0\x05\x30\x00\xaa\x44\x59\x90\x11\x13\xd8\x0d\x21\x8c\
+\x81\x71\xcf\xa5\x16\xac\x81\xac\x95\x11\x51\xb9\x01\x0d\x90\x4b\
+\xfe\x23\x30\x3c\x75\xd8\xf7\x2d\xc0\x7e\x11\x34\x63\xb0\x99\xd6\
+\x33\xb0\xf7\xf0\x50\x82\xe5\x60\x13\xb0\x82\x57\x64\x85\xbe\x4d\
+\xb5\xf7\xca\x79\xc1\xd7\x2c\x93\xec\x5f\xc1\x2e\xfa\x10\x02\xf6\
+\x01\xf8\x24\x24\x0c\x78\x01\x0a\xd8\xbd\x87\xec\xa3\xbc\x00\x58\
+\xc8\x8b\x73\x94\x7e\x9b\xc0\xee\x06\xb2\x5b\x21\x92\x4b\xdf\x1a\
+\xb8\x81\x70\x0b\x30\x92\xf2\x80\xc3\x3e\x96\xf2\x1b\xe0\xde\x19\
+\xb2\xfb\x44\xf9\x04\x0f\x91\x71\x1a\xf7\xe8\xcc\x4c\xca\xf4\xcb\
+\xbe\xc2\xa6\x80\xd9\x18\x78\x07\x7c\x94\x8e\x41\x0f\x01\xfb\x4e\
+\xff\x2b\x08\x15\xd8\xb5\xbe\xfd\x09\xcc\x1d\x8d\xd5\x0c\x4a\x5c\
+\x70\xa8\xcf\x03\x60\x73\xa0\xc5\xf3\xa5\xd2\xf3\x80\x27\xf4\x0e\
+\x78\xc2\xe3\xff\x0d\xb0\x82\xb0\x19\x25\xdc\x63\x29\xcf\xe5\xdd\
+\x1a\xb8\x92\xc5\x39\x94\x4f\x82\x71\x02\x66\x1d\x0f\x24\x08\xe5\
+\xc0\xb3\x94\x95\x42\x38\x03\xee\xf0\xf0\x64\x10\x9e\x12\x07\x3b\
+\x28\xdc\x52\x9b\xc0\xcb\xb5\x18\x83\xa0\x5c\x48\x68\xa4\x39\x1e\
+\x86\xb9\xf8\x07\xfa\x1f\xd7\x22\x6d\xc4\xbb\x93\xac\x00\xdb\xf7\
+\x4a\xcc\x63\xee\xc5\x10\xbc\x73\x41\x15\x30\xfd\x8c\xc7\xb2\x96\
+\xf5\x23\xc1\x56\x43\x75\x09\xd3\xb5\x23\x75\x8e\x6c\x21\x99\x35\
+\x30\x95\x03\x53\xba\xd2\x1b\x49\xf6\x1c\x0f\xc1\x97\x14\x81\x09\
+\xb4\x2f\x49\x6d\x16\x8a\xb5\xe1\x96\x5d\xc3\x74\xe5\x48\xbd\x49\
+\xb1\xce\xbf\x17\x8f\x09\x89\x58\xb6\x2d\x3c\x36\x78\xe8\xfa\x21\
+\x68\x4a\x58\x3c\x74\xc6\x30\x54\x3e\xe4\x78\xd2\xfc\x25\xc1\x85\
+\xfa\x41\xee\x49\x67\xb3\xee\x3f\x05\x9e\x37\x5f\x61\x73\x29\xde\
+\x3c\x91\x09\x2c\x9e\x49\x42\x15\x0d\xc8\xbc\x8b\x91\x0b\xc6\x52\
+\x1e\xb4\x62\x5c\xe1\x89\xf6\x20\x48\x73\x3d\x83\xa0\x9d\xba\x0c\
+\xa6\xae\x9c\x06\x66\x0f\xda\xd7\xe2\x3d\xe5\x12\xef\x31\x43\x68\
+\x4c\xfb\x63\x1f\x20\x40\x50\xd7\x0a\x8f\xde\xb9\x82\x32\xdb\x0c\
+\x82\xfa\xbb\x35\x12\x36\x06\xee\x7b\xbd\xfd\xca\x8d\x8e\x7c\xb4\
+\x60\x7b\x7f\x86\x1d\xd8\x33\x5e\x86\x03\xba\x24\x3f\xa9\x82\x61\
+\x52\xdf\x49\x93\xa9\xd3\x3d\xda\xc7\xbd\x7b\x63\xe9\x30\xbb\x4b\
+\x1c\x8a\x94\x4e\x59\xc9\x0c\x55\xe7\x6c\xc7\x30\x82\xf1\x21\xf1\
+\x86\xe4\xbd\x4d\x84\x8c\x80\xc6\x3d\xb7\x35\xea\x4c\x78\x46\x5b\
+\xd2\x1f\x52\x4a\x1d\x78\x35\x3d\x07\xc9\x73\x7f\x86\xb9\x4f\x87\
+\x9e\xc0\x3e\x9d\x6b\xcf\x96\xbc\xbf\xda\x17\x85\xed\xa0\x51\x57\
+\x0b\xd6\x6d\x0e\x06\xf5\xb0\x67\xc0\x30\x81\x7d\xa5\xdf\x32\x99\
+\x27\x7d\x83\x4f\x46\x6e\xdf\x98\x94\xa1\x55\x29\xf5\xac\x2d\xfa\
+\x75\xdf\xe2\x09\xa7\x79\x1e\x62\xdb\xbe\xa6\x3b\x03\x44\x0a\xaf\
+\xdf\xad\x00\x3b\xee\x8b\x39\x60\xca\x70\x53\x19\xce\x34\x58\xc0\
+\x4b\xb3\x94\xe2\x02\x6f\xb9\x6a\x36\x96\x42\xdc\x00\xdf\x4a\xb8\
+\x49\xb6\x0e\x21\x16\x3b\x20\x32\x76\x1f\xf9\xa2\x01\x3b\x08\x43\
+\x95\xdb\xd6\x0f\x24\x34\xfe\xdf\xc0\x33\x7f\x23\x21\x9f\xff\x61\
+\x1a\xee\x38\x9e\x76\xd6\x25\x2c\xef\x3a\x07\x79\xc0\x4b\x38\xee\
+\xd9\xc1\x49\x08\xc6\x75\xe2\xf5\x16\x35\x0a\x51\x05\x2f\x3f\xc9\
+\xf3\x73\x99\x7e\xb4\x40\x1e\x7e\x80\xe5\x53\xb7\xbc\x2a\xa4\x1c\
+\x37\x6c\xbc\x89\x5f\x06\x09\xe3\x06\xea\xb2\x63\xa2\xf6\x86\x14\
+\x0f\x1a\xf9\x2d\x3e\xdd\xfa\x67\xc1\x94\x22\xd4\x7f\xe0\xed\x36\
+\xf8\xb3\x4c\x86\x57\x36\x93\x31\x27\x21\xd8\xfb\xe6\xe2\x19\xec\
+\x86\x6e\xe0\x14\xf8\x49\xe6\x77\x3c\x9e\x7b\xa0\x74\xa4\xea\x41\
+\x97\xa0\xf5\x50\x02\xd5\x21\x8f\x7b\x7f\xc6\xbb\x9f\x8e\x77\x2c\
+\xa1\xb8\x95\xcc\x6d\x6a\x00\x6e\x40\x78\x06\x1b\xd0\xc5\x7c\x24\
+\x6f\x0e\x10\x36\x60\x2d\xf0\x0c\xe1\xe5\x3c\x00\x36\x77\x19\xa0\
+\x83\xeb\x67\x7c\x96\x6c\x24\x73\xe5\xf9\xd3\x45\x31\x0d\x41\xe3\
+\x93\x2d\x3c\x42\x7d\xe1\x9e\xb2\x96\xf5\x5b\xe5\xc7\x71\x8c\xbe\
+\x4d\x36\x56\xe8\x1a\x3c\xd1\xd6\xc0\x25\x54\x33\x47\xc3\x66\x5a\
+\x3f\x09\xc1\x57\xe0\x07\xdf\x6c\x4b\x60\x06\x2f\x41\x93\x74\x42\
+\x67\xb2\x0e\x97\x55\x05\x85\xd1\x75\xcf\xd8\xac\x0a\x3c\xdb\x77\
+\x38\xf3\xc2\x8d\xaf\xa7\x30\x9d\xe3\x13\x76\xe3\x8e\x87\x4d\x62\
+\x40\x30\xb0\x03\x5e\xeb\x01\xf8\x04\x45\x34\x86\x0e\x56\xf0\x30\
+\x4c\x75\xf4\x36\x21\x18\xe2\x1c\x59\x38\x82\xc7\xbd\x17\x6e\xcc\
+\xf4\x8b\x64\xc5\xd9\x72\xee\x50\x63\x17\xba\x34\xf4\x2f\x26\x0b\
+\xa8\x7e\xec\x2e\x23\xff\x76\x31\x01\xe7\xad\x3e\x74\x65\x7d\x72\
+\x31\xf9\xed\xcc\xc5\xe4\xd8\xdb\xf7\x82\x6d\x20\x2b\x33\x1c\xfe\
+\x81\x7f\x6f\x32\x79\x30\x84\x71\x7a\xf7\xcb\x75\x30\x6e\x7d\xd4\
+\x8e\x6a\xbc\x67\xec\xc5\xdb\xd0\x0d\xa6\x35\xc9\xd5\xec\x8d\xcb\
+\x69\xf4\xe2\x98\x70\xc3\xe4\x7d\xa2\xf7\x09\x6c\x35\x3b\x26\x95\
+\x94\x18\xdd\xe5\x54\x06\xb9\xb0\x18\xf3\x9e\xc3\x6b\xf8\x9f\xaf\
+\xe7\x7f\x03\x88\x7c\xd3\x3b\xed\x32\x4f\xdf\x00\x00\x00\x00\x49\
+\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x06\x7b\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x06\x2d\x49\x44\x41\x54\x78\x9c\xed\
+\x9b\xc9\x73\x5c\x57\x15\xc6\x7f\xdf\xb5\x49\x39\x09\x91\x83\x33\
+\x40\x15\x2b\xb6\x78\x48\x9c\x48\x3d\x24\x14\xc4\x8a\x63\xc9\x93\
+\x2c\x75\xab\xf2\x87\xb0\x0a\x0b\x58\x50\x5e\xb0\xc9\x12\xfe\x88\
+\x54\xab\x25\x92\x38\x65\x6b\x34\x09\xa0\x1e\x0c\x45\x18\x56\x29\
+\x2a\x95\x62\x45\x26\xb0\x6c\x63\x29\x46\xf7\xb0\xe8\x6e\xe8\x74\
+\xb7\xf4\xee\xeb\x7e\x4f\xea\x14\xfa\x96\xf7\x9e\x3e\xf7\x7c\xbf\
+\x3a\xe7\xf5\xeb\xa7\x27\x38\xd0\x81\x0e\xf4\xff\x2c\xf5\x5a\x3c\
+\x75\xc3\x1e\x7d\xf8\x2e\x3f\x94\xec\xb2\xc1\x11\xcc\xd6\xed\x6b\
+\xee\x67\xb5\x29\x7d\xb8\xd7\x05\xf6\xa3\xcc\x9b\xf6\x1d\x3d\xf0\
+\xaf\x21\xe5\x05\x9b\x5e\xba\xf6\xc8\x03\x5e\xbf\xf9\xaa\xee\x76\
+\xc6\x76\x01\x78\xf1\x97\xf6\xd8\x03\x6f\xbf\x92\x71\xba\x63\xeb\
+\xb6\x9c\x26\x2a\xd3\xaa\xa6\x56\x79\x02\x1a\x9b\xb3\x31\x27\x5b\
+\x02\x8e\x76\x6c\xbd\xcf\x11\x7d\xbf\x7a\x41\x1b\xed\x8b\xae\x33\
+\xc1\xf6\xb6\x7f\xad\x87\x79\x80\xa3\xe6\x6d\x31\xb7\x60\xd9\x04\
+\xeb\x4d\x54\xbb\x98\x07\x78\x86\x4d\xff\xa3\xce\xc5\x2e\x00\xa0\
+\xa9\x5d\xce\x18\x19\x56\x08\x11\xe6\x9b\xd2\x95\xce\x95\x2e\x00\
+\x1e\x1e\x8e\x38\x6b\xc4\xbc\x2d\xe6\xe7\x2d\x13\xb7\xc8\xb4\x94\
+\x29\xd9\x68\xb4\x79\xc0\x38\xd2\xb9\xd4\x05\x40\xd8\x6f\x02\xce\
+\x1c\xf1\x66\x4b\xc3\x00\x21\x53\xb2\x51\x39\x5b\x26\xca\x3c\x80\
+\xba\xbd\x75\x8f\x80\x77\x57\x81\xdb\x01\x67\xef\x3b\x84\x58\xe6\
+\x61\x03\xef\x7e\xda\xb9\xd8\x05\xa0\x3a\xab\x0f\x9c\x74\x8e\x70\
+\x08\xfb\x32\x0e\x4d\xf3\xd1\x6d\xdf\xd0\x06\xa6\x89\xea\xac\x3e\
+\xe8\xdc\xe8\x79\x1f\x00\x90\x9f\xb7\x8c\x37\x5b\x02\x46\x02\x0e\
+\xb8\xed\x4d\xaf\xd4\x8b\xaa\x07\xc4\x0e\xac\xec\xbc\x3d\x8f\xd9\
+\x32\xf0\x78\x40\xf8\x1d\x4c\xe7\xaa\x45\x55\x7a\x6d\xee\x08\x00\
+\x86\x13\x42\x92\xe6\x21\x02\x00\x0c\x17\x84\xa4\xcd\x43\x00\x00\
+\x80\xdc\x82\x65\xcd\xdb\x22\x81\x10\xcc\xeb\x6c\x6d\x56\xb7\x42\
+\x72\x87\x2a\x37\x67\xcf\x99\x6c\x19\xf8\x46\x40\xf8\x1d\x43\x13\
+\xb5\x82\xd6\xa3\x02\x83\x00\xc0\xfe\x42\x48\xcb\x3c\xf4\xbc\x13\
+\xec\xad\xca\xb4\xaa\x98\x26\x80\x8d\xc8\x60\x38\x2a\x67\xcb\x99\
+\x92\x8d\x86\xe6\xdf\x49\x71\xcd\x3b\xa7\xc9\x50\xf3\x10\xa3\x03\
+\x5a\xca\xce\x59\x0e\xd9\x22\xf0\x58\x40\xf8\x3f\xcd\xeb\x95\x7e\
+\x3b\x21\xa6\xf9\xbb\xce\x69\x62\x7d\x5a\xbf\x8d\x73\x46\x6c\x00\
+\x10\x1f\x02\xd2\xd9\xea\x8c\x7e\x17\xe7\x8c\xbd\x30\x0f\x31\x46\
+\xa0\x5d\xd5\xa2\x2a\x98\xce\x01\x77\x02\xc2\x1f\xc7\x6c\x39\x3b\
+\x6f\xcf\x87\xe6\xcf\x97\xec\xf4\x5e\x98\x87\x3e\x01\x40\x03\x82\
+\xa1\x09\x12\x86\x90\x2f\xd9\x69\xef\x6c\x85\x40\xf3\x32\x4d\xf6\
+\x6b\x1e\xfa\x1c\x81\x76\x65\xca\x96\x17\x76\x83\x04\xc6\xa1\x1f\
+\xf3\x95\xa2\x42\x7e\xbc\xed\xa8\xbe\x3b\xa0\xa5\x5a\x41\xeb\xce\
+\x69\x92\xf0\x4e\x58\xca\xcd\xd9\x73\x9d\x1b\x4d\xf3\xc1\x6d\x0f\
+\x3a\x3f\xa8\x79\x48\xa0\x03\x5a\xca\x2f\xd8\x0b\xde\xdb\x0d\xe0\
+\xeb\x01\xe1\xff\x90\xe9\x6c\xa5\xa8\xdf\x03\x8c\xcd\xdb\xb3\xce\
+\x6c\x05\x38\x16\xf9\x49\xe3\x1e\xd2\x64\xb5\xa0\x5f\x0f\x56\x71\
+\x43\x89\x01\x80\xfe\x20\x6c\x3b\xfc\x7e\x99\x87\x84\x01\x40\x3c\
+\x08\x26\x36\x64\x40\xc8\xdd\x65\x0a\xe6\x21\x05\x00\x00\xb9\x39\
+\x7b\xd1\x64\xd7\x09\xeb\x84\x68\x19\xf7\xec\x90\xce\xd7\xa6\xf5\
+\x5e\x22\xf9\xda\x94\x0a\x00\x48\x10\x42\x8a\xe6\x21\x81\x6f\x81\
+\x9d\xd4\xb8\x42\xeb\x3c\xd0\xf5\xc7\x88\x60\x19\xf7\x3c\xba\x90\
+\x96\x79\x48\xb1\x03\x5a\xca\x96\xed\x7b\x98\x5d\x47\x3c\x1a\xeb\
+\x83\x4d\xf3\xf5\xa2\xde\x4d\xa9\x34\x60\x0f\x00\xc0\x7f\x21\x2c\
+\xa2\xc8\x47\xee\x0d\x19\x9b\x1e\x4d\xa4\x6d\x1e\x52\x1c\x81\x2f\
+\xc9\xb3\x81\xf8\x22\x38\xde\xe9\x0b\x5c\xd0\xcf\xee\x81\x95\x3a\
+\x80\x6c\xc9\x4e\xe1\x6c\x95\xb0\xa7\xb7\x0d\x99\x8d\x38\xb3\x95\
+\xb1\x79\x7b\x36\xbd\xca\x1a\x4a\x75\x04\xda\xcc\x3f\xd1\x67\x8a\
+\xcf\xbd\xf4\x72\x7d\x46\x7f\x48\xb2\xae\x76\xa5\x06\xa0\x69\x7e\
+\x05\x78\x72\xc0\x54\x9f\x1b\x1a\xaf\x15\xf4\x7e\x12\x75\x75\x2a\
+\x95\x11\xc8\x2f\xd8\xc9\x84\xcc\x03\x1c\x13\xb6\x9a\x29\xdb\x33\
+\x09\xe4\xea\x52\xe2\x00\xf2\x0b\x76\xd2\x7b\x5b\x25\xc0\xbc\xc1\
+\x96\x60\x2b\x20\xed\x31\x61\x2b\x69\x40\x48\x14\x40\x1c\xf3\xc0\
+\x7d\x27\x4d\x6e\x37\x9e\x2c\xfd\x2b\x20\xfe\x89\x34\x20\x24\x06\
+\x60\xb4\x6c\x27\xe2\x98\xc7\x74\xb1\x32\xa3\x9b\xf5\xa2\xde\x75\
+\xe8\x02\x31\x20\x64\x4b\x76\x6a\xb0\x6a\xff\xa7\x44\x2e\x82\xa3\
+\x65\x3b\x71\x08\x5b\x23\x86\xf9\x6a\x51\x6b\xed\x8b\xf9\xb2\xfd\
+\xc0\x63\xef\x00\x8f\x04\xe4\xf8\x0c\xaf\xf1\xea\xac\xfe\xd8\x4f\
+\xbd\xed\x1a\x18\x40\x5c\xf3\x86\x2e\xd5\x0a\x5a\xed\xb5\x99\x9b\
+\xb7\x97\xcc\xec\x1a\x7b\x08\x61\xa0\x11\x18\x2d\xdb\x09\x47\x78\
+\xdb\xef\x66\x1e\xa0\x32\xa3\x9b\x92\x2e\x12\x38\x0e\xb8\xc1\xc7\
+\xa1\xef\x0e\x68\x99\x17\x3c\x15\x10\x7e\xdf\x4b\x97\xeb\x33\x5a\
+\x09\xc9\xdd\xec\x84\x77\x88\x7e\x5d\x07\xe0\x53\xe7\x34\xbe\x3e\
+\xad\x3f\x85\xe4\xee\x54\x5f\x00\xc6\x4a\x76\x5c\xce\xd6\x02\xcd\
+\x6f\x7a\xe9\x52\xa8\xf9\x96\xf6\x0a\x42\xec\x11\xd8\x0b\xf3\xd0\
+\x18\x07\x4c\x17\x81\xfb\x01\xe1\x4f\x7a\x6f\xab\xf9\x05\x3b\x19\
+\xf7\x9c\x58\x1d\x30\x56\xb2\xe3\xae\x71\x6f\xff\x74\x40\x78\xdf\
+\xe6\xdb\x95\x9d\xb3\x33\xc8\xae\x11\xd8\x09\xdb\xe8\xcc\xad\x82\
+\xfe\x1c\x9a\x3f\xb8\x03\xe2\x9a\x97\x0f\x9f\xf9\xdd\x54\x2d\x6a\
+\xcd\xd0\x25\x02\x3b\xe1\x10\xb6\x36\x5a\xb6\x13\xa1\xf9\x83\x3a\
+\x20\xbb\x60\xdf\xc5\xdb\x1a\x31\xcc\x57\x66\xb5\x1c\x5a\x44\x88\
+\x32\x65\x1b\x17\xf6\x36\x09\x77\x42\x24\x80\xb8\xe6\x41\x53\xd5\
+\x82\x96\x02\x62\x63\x6b\x6c\xde\x5e\x76\x66\x6f\x11\x00\xc1\xe0\
+\x13\x8f\xc6\xa3\x20\xec\x0a\x60\x98\xcc\xb7\xd4\x84\xf0\x36\x74\
+\xbf\xf5\xd9\xa9\x10\x08\x3b\x5e\x03\x9a\xe6\x83\x67\x1e\xe9\x4a\
+\xda\xe6\x01\xea\x33\x5a\xf1\xd2\x25\x60\x33\x2a\x56\xf0\x94\xc3\
+\x56\xc7\x4a\x76\x7c\x97\x98\x6e\xb5\x99\xff\x66\xd4\x21\x06\x5b\
+\x92\xa6\xaa\x33\x5a\x8c\x8a\x4d\x52\x71\x3b\xc1\xbc\xce\xd4\x67\
+\xf5\x97\xce\xbd\x2e\x00\xf9\x37\xec\xdb\xfe\xb0\xdd\x02\xbe\x15\
+\x90\x78\x5f\xcc\xb7\x94\x2b\xd9\x59\x73\xf6\x16\x01\x10\x80\x8f\
+\xbd\xd3\x68\x7d\x5a\x7f\x6b\x5f\xec\x7e\x5b\xfc\xb0\xff\x31\x5f\
+\x01\xf3\x00\x95\x59\x2d\xcb\xeb\x32\x01\xe3\x00\x3c\x2d\xef\x7f\
+\xd2\xb9\xd8\xeb\xff\x05\x5e\x8a\xca\x64\xb0\x85\xd7\x95\xfd\x34\
+\xdf\x52\xe3\xeb\x56\x53\x04\x41\xd0\x99\xce\x95\x5e\x17\xc1\xed\
+\xdd\x52\xb4\xcc\xd7\x66\x75\x23\xb4\xc8\xb4\xd5\xb8\xf8\x46\x43\
+\x50\x0f\x6f\xdd\x00\x1a\x6f\x7f\xf5\x94\xc1\xd6\x21\x34\x3d\x4c\
+\xe6\x5b\xaa\x16\xb4\x84\x74\x85\x5d\x21\xd8\xf5\xce\x95\x2e\x00\
+\x66\xee\xaa\xc1\x5f\xbb\xd6\x9b\xe6\xd7\x0b\xea\x4a\x32\x2c\xaa\
+\xce\x68\x71\x47\x08\xc6\x87\x0f\xfd\xdb\x5d\xed\x5c\xee\x02\x50\
+\x2b\xe8\xb3\xed\xc3\xca\x81\xfd\x1c\xf8\x08\xf8\x18\x78\xd3\x99\
+\x5e\x18\x66\xf3\x2d\x55\x67\xb4\xe8\xa5\x3c\xc6\x02\xf0\x77\xe0\
+\x23\x64\xbf\x78\x68\x5b\xd9\xf7\x5e\xd5\x27\xfb\x5d\xdf\x81\x0e\
+\x74\xa0\xe1\xd2\x7f\x00\x72\xd2\x49\x30\x2e\xe9\xad\x3a\x00\x00\
+\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x04\x58\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x04\x0a\x49\x44\x41\x54\x78\x9c\xed\
+\x9b\x4b\x88\x5c\x45\x18\x85\xcf\xa9\x19\x34\x41\xa2\xa0\x21\x1b\
+\x09\xee\x7c\xac\x04\x13\x7b\xda\xb8\x30\x06\x13\x99\x80\x26\xdd\
+\x1d\x06\x17\x82\xe0\x83\x08\xae\x14\x09\x24\x88\x1a\x4c\x40\x11\
+\x5c\x28\xf8\x42\xd1\x85\x28\x8a\xdd\xf3\x40\x26\x32\x41\x1c\x10\
+\x64\x7a\x9a\x11\xb2\x10\x41\x5c\x04\x11\x41\x83\x09\x11\x25\x0d\
+\xe9\x5b\xc7\x45\xcf\xa8\xdc\x2a\x35\x9d\x54\x55\x17\xd8\xdf\xf2\
+\x2e\xea\xfc\xff\xb9\x55\x7f\xd5\x7f\x1f\xc0\x88\x11\x23\xfe\xcf\
+\x30\xd4\x40\x95\xa6\x9e\x35\xb4\x4f\x89\x94\x2c\x8f\x2c\x37\x78\
+\x38\xd4\xd8\x31\x09\x66\xc0\x44\xb3\x28\x40\x9a\xd5\x51\x45\x70\
+\xc7\x52\x8d\x8b\xa1\xc6\x8f\x85\x09\x36\xd2\x5a\xf2\x00\x20\x50\
+\xd2\xdc\xc4\xb4\xb6\x04\x1b\x3f\x12\xc1\x0c\x10\x60\x4b\x97\x36\
+\x40\xfa\x74\xeb\xac\x6e\x08\xa5\x11\x83\x60\x06\x10\x90\xe7\xf2\
+\xc6\xb1\x42\xc7\x6f\x9d\xd1\xe6\x50\x3a\xa1\x09\xb7\x04\xfe\x99\
+\xcd\xc6\x6a\x61\xcb\x9c\x36\x26\xd0\x1a\x98\x14\x06\x00\xc0\x8d\
+\xe3\x85\x8e\xdd\x3e\xab\x0d\x89\xf4\x2e\x98\x68\x06\xa8\xbc\x24\
+\x84\xad\xbd\x42\x33\x93\xf3\xba\x3c\x96\xe6\xc5\x10\xcd\x00\x02\
+\x16\x74\xea\xc2\x8e\xd3\x5d\xbd\xbf\xfd\x73\x8d\xc7\xd2\x1d\x94\
+\xb8\x4b\x40\xb0\x70\x8b\x63\xbd\x7b\xda\xbe\x0e\x29\xd8\x19\xe4\
+\x52\x48\x51\x03\x9c\x99\x20\xf2\xa1\x6a\xcb\x3e\x9f\x40\xfb\x3f\
+\x49\x53\x04\x05\xab\x72\x49\x20\x0f\x54\xa6\x75\x20\x89\xfe\xbf\
+\x90\x6a\x17\x00\x69\x0a\xe7\x9a\xf4\x42\xb5\xa9\x87\x53\xc5\xe0\
+\x23\x99\x01\x90\x7c\xa7\x45\x88\x7a\xa3\xda\x52\x3d\x59\x1c\x25\
+\xd2\x19\x80\xfe\x69\xd1\x63\x82\x11\xf4\x41\xf5\x63\xdd\x95\x32\
+\x96\x3f\xc5\x53\x0b\x12\xd0\xea\xee\xf0\x77\x2e\x13\x35\x73\xdb\
+\xb4\x2a\xa9\xe3\x49\x6e\x00\x00\x80\x9e\x99\x40\x5c\x61\xa5\xf9\
+\x6a\x4b\x37\xa5\x0c\x65\x38\x06\x60\xad\x79\x62\x79\x26\x5c\x23\
+\xe8\xf8\xb6\xa6\xae\x4b\x15\xc7\xd0\x0c\xe8\x23\x9f\x09\xd7\x16\
+\xd4\xc2\xb6\x96\x36\xa5\x88\x60\xc8\x06\x00\x7d\x13\x54\x3e\x2d\
+\x5e\x5f\x40\xc7\x26\xe6\x75\x65\x6c\xf5\x0c\x0c\x00\x00\x5a\xa7\
+\x79\x02\x6e\x51\x57\x73\xdb\xdf\xd1\xba\x98\xca\x99\x18\xb0\xda\
+\x3c\x95\x4c\x20\x70\xc7\xb9\xab\xf4\x61\xcc\xe6\x29\x1b\x03\x56\
+\xf1\x35\x4f\xf7\x76\xcf\xd8\xb7\xf0\x8c\xa2\xc4\x9a\x9b\x01\x80\
+\xaf\x79\x02\x1f\xa8\xdc\x6c\x5f\x8c\xd1\x41\xe6\x68\x40\xbf\x8d\
+\x2e\xd5\x45\x82\x4f\x54\x5a\x38\x18\x5a\x2a\x4f\x03\x00\x80\x74\
+\x9b\x27\xea\x68\xa5\xa9\xfd\x21\x65\xf2\x35\x00\x80\x04\x5b\xae\
+\x08\xa4\x5e\x9b\x68\x6a\x5f\x28\x8d\xac\x0d\xa0\xef\xc8\x0c\x10\
+\xd4\x2b\xa1\x34\xb2\x36\x00\x00\xe8\x2f\x7b\xc1\xb6\xc5\xbc\x0d\
+\xe8\x67\xef\xc4\x28\xe8\xed\x50\x12\xd9\x3c\x9d\xf5\x22\x8d\xb9\
+\xd7\xf8\xd8\x72\xc3\xbc\x1a\x4a\x22\xe3\x19\xe0\x4d\xfe\xe9\x76\
+\x83\xc1\x92\x07\x72\x34\x80\x80\x08\xe3\xbe\xb9\xd7\xcb\xed\x3a\
+\x8e\x84\x96\xcb\xce\x00\x09\x86\x2a\x67\xaf\xf7\xda\x27\xcc\xe3\
+\x20\x7d\x2f\x60\x2f\x89\xbc\x0c\x20\x0c\x4b\xb7\x9e\xc0\x27\xbd\
+\x53\xe6\x41\x1c\x76\x9e\x1b\x04\x21\x27\x03\x0c\x9c\x3b\x8f\x2f\
+\xd8\xe3\xd4\xca\x7e\x9e\x8f\x25\x9a\xc9\x2e\x20\xe3\xd9\xf1\x4f\
+\xf4\x7a\xbc\x67\x65\x8a\xe7\x62\x2a\x0f\xdd\x00\x81\x2c\x4f\x7b\
+\x08\xdf\x61\x9c\x77\xaf\xd4\x79\x36\xb6\xfe\x50\x97\x40\x3f\x79\
+\xa7\xcf\xff\x91\x86\x3b\xdb\x7b\xf8\x53\x8a\x18\x86\x67\x80\xe0\
+\x4b\xfe\x8c\xb5\xdc\xb5\x54\xe3\xc9\x54\x61\x0c\xc5\x00\x09\x04\
+\x4b\xda\xc2\xef\x10\x77\x77\xf6\xf1\xeb\x94\xb1\x24\xaf\x01\x02\
+\xc8\x72\xf2\xc0\x79\x18\xd6\xdb\x35\x2e\xa5\x8e\x27\xe9\x0c\x90\
+\x40\xca\xd1\x14\xc9\xfb\xdb\x35\x2e\xa4\x8c\x65\x8d\x74\x33\x80\
+\x84\x67\xcd\x03\xe4\xa3\x4b\x35\x7e\x94\x2c\x8e\x12\xc9\x66\x80\
+\x64\xdd\xe6\x86\x3c\xd4\xae\xf1\xcd\x54\x31\xf8\x48\x63\x00\x61\
+\xe8\x6c\xf5\x7a\xa9\xbd\x17\x43\xff\x4c\x26\x85\x01\xee\x11\x57\
+\x7a\x77\xb9\x66\x9e\x8c\xd1\xdc\x0c\x4a\x5c\x03\xfa\xd5\xbe\x7c\
+\xc4\x9d\x5d\x7f\xb5\x79\x24\x87\xe4\x81\xb8\x1f\x4a\xfa\x9a\x9b\
+\xc5\xf5\x67\x79\xdf\xe2\x9d\xec\xc5\xd2\x1d\x94\x68\xbb\x80\x73\
+\xbe\x07\xbe\xc2\x3a\xee\x59\xac\xb3\x1b\x4b\xf3\x62\x48\xb5\x0b\
+\x7c\x3b\x06\x4e\xb6\x77\xf3\xd7\x44\x7a\x17\x4c\x0a\x03\x7e\xe8\
+\xf5\xb8\xf3\xcb\x3a\x7f\x4e\xa0\x35\x30\x21\x7f\x98\xf0\x3d\xc1\
+\xff\x85\xe0\xae\x95\x29\x7e\x1f\x4a\x27\x34\xc1\x6a\x00\x5d\x33\
+\x7f\xb3\xe2\x64\xa7\xc1\x6f\x42\x69\xc4\x20\xe4\x12\xf8\xeb\x99\
+\x1d\x21\x4b\xee\xed\x34\xd8\x09\x38\x7e\x14\x42\xfe\x34\x75\x14\
+\x40\x01\xa0\x80\xf8\x5c\xa7\xc6\xcf\x82\x8d\x3d\x62\xc4\x88\x11\
+\x91\xf8\x03\x6e\xfe\x4e\x7e\xe0\xc6\x25\x53\x00\x00\x00\x00\x49\
+\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x00\xcd\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x00\x7f\x49\x44\x41\x54\x78\x9c\xed\
+\xd9\x51\x0d\x80\x30\x10\x05\xc1\x03\x6f\x55\x80\x05\xd4\x62\xaa\
+\xc8\x58\x12\x66\x0c\xdc\xcb\xa6\x7f\x9d\x09\xad\xeb\xde\xeb\xba\
+\x77\xb9\xe1\x2c\x8f\x7f\x81\x00\xf5\x80\x9a\x00\xf5\x80\x9a\x00\
+\xf5\x80\x9a\x00\xf5\x80\x9a\x00\xf5\x80\x9a\x00\xf5\x80\x9a\x00\
+\xf5\x80\x9a\x00\xf5\x80\x9a\x00\xf5\x80\x9a\x00\xf5\x80\x9a\x00\
+\xf5\x80\x9a\x00\xf5\x80\x9a\x00\xf5\x80\x9a\x00\xf5\x80\xda\xef\
+\x03\x1c\xe5\xf1\xfa\x6b\x7c\xa6\x7e\x01\x7b\x9e\xf4\x3e\x00\x00\
+\x00\x00\x00\x00\x00\xfc\xc3\x0b\xb7\x26\x07\xfa\x17\x1e\x2a\x64\
+\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x02\x8f\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x02\x41\x49\x44\x41\x54\x58\x85\xed\
+\x97\x31\x6b\x14\x51\x14\x85\xbf\x33\x59\xab\x80\x85\x62\x20\x76\
+\xf9\x03\x62\xb5\xbb\xa2\x88\x82\x5d\x42\x8a\x24\xf8\x07\x02\x6a\
+\x95\xca\x24\x65\x08\xa9\x56\xb0\x30\x60\x50\x41\x41\xd2\x04\xc1\
+\x2d\x82\x0b\x76\x01\x41\xb2\xbb\x95\xf8\x07\x92\x3a\x41\xc1\x22\
+\x95\xc9\x1c\x8b\x9d\xb7\xac\x9b\xd9\xec\x4e\x76\xb4\xd1\xaf\x7a\
+\xdc\x77\x67\xee\x99\x73\xdf\xcc\xbc\x07\xff\x3a\xea\x0e\x94\xdf\
+\xfb\x66\x8c\x97\x11\x65\xc1\x95\x3c\x8a\x18\x0e\x31\xf5\x08\x55\
+\xea\xb3\xfa\xdc\x53\x40\xa9\xea\xc7\xe0\x27\x69\xc2\x72\x22\xc6\
+\x5a\x6a\xcc\xea\xe9\x29\x01\xa5\xaa\x6f\x81\x3f\x01\x3f\xb0\x16\
+\xa2\x13\x6a\xbb\xf7\xf5\x3d\x8f\xaa\x37\xde\xf9\x52\x3c\xc2\x24\
+\xf2\x3a\x70\x51\xd6\xed\xe0\x44\x21\x24\xd9\x5e\x92\x10\xd6\x42\
+\x63\x56\x9b\x79\x14\x0e\x24\x0f\xb2\x59\xac\x5a\xc2\x6f\x63\xbc\
+\x0c\x4c\x03\x44\xed\x2c\x51\x06\x88\x4e\xa8\xe5\x59\xbc\x8b\x1a\
+\x80\x44\x29\x04\xda\x02\xc2\x82\xcb\xcb\xf6\x34\x9a\x33\xfa\x96\
+\x0c\xc7\x42\xac\xd0\x23\xf7\xdc\x14\xab\x9e\x12\x7e\x05\x60\xf4\
+\xa0\x39\xa3\x0f\x67\xe5\xe7\x2a\xa0\xb8\xed\x09\xfd\xf4\x16\x62\
+\x14\x20\x11\x72\xf5\xac\x6b\xa2\xb3\x26\x33\xb1\xe2\x48\xc7\x7e\
+\x13\x8a\x0f\x4a\x6e\x02\x4a\xd7\x78\x04\xdc\xe9\x8c\x49\x5a\xfb\
+\x2b\x02\x8a\xdb\x9e\x48\x3e\x60\x9d\xec\xd4\xbf\xf0\xf2\xcf\x0b\
+\x48\xb3\xde\x1c\xb9\xa0\x79\x56\x15\xf7\xbb\xbc\xef\x22\xec\xb7\
+\xaa\x53\xad\x8f\xb4\xd8\x98\xd6\xde\x20\xfa\xfb\x3a\x90\x14\x1f\
+\x07\xc6\x65\x6f\xb5\xec\x4e\xc4\x0d\x61\x7d\x20\xdb\x6b\x28\x46\
+\x75\xec\xd7\xac\xf8\x1e\x40\xaa\xf5\x17\x06\xb3\x7e\x60\x01\x92\
+\xd6\x6c\x6f\x74\x84\xee\x96\xaf\xf3\xd0\x31\x62\x08\xeb\x03\x7d\
+\x5b\x90\xd8\xb9\xd3\x19\xb3\xbd\x81\xfc\xbc\x2b\x35\x93\xf5\x03\
+\x0b\x60\x55\xb1\x0b\x9a\xc7\x1c\xf5\xcc\xc9\xb0\xea\xb3\x0b\x00\
+\x9a\xd3\xda\x03\x2d\xf5\x9a\x57\xa4\xc5\x66\x46\xeb\x33\x09\x00\
+\x68\x7c\xe5\x05\x5d\xad\x48\x38\x97\xf5\x99\x05\xa4\xb6\x62\x08\
+\xeb\xb3\x0b\xa0\xd5\x8a\x48\x9a\x03\xf6\x81\xfd\x48\x9a\x3b\xaf\
+\xf5\x81\xcc\xbf\xe3\xdd\x19\x7d\x04\x26\xfa\x26\x0e\x48\xdb\x01\
+\xc3\x21\xb4\x36\x90\x79\xdd\xbc\x9b\x62\xd5\x97\x93\xe1\xc1\x29\
+\x01\x98\x3a\x40\x3c\xc2\xe4\x9f\x12\x00\xad\x7b\xdb\x34\x42\xa0\
+\xdd\x82\x08\x55\x8c\xa7\x90\xd7\x8b\x55\x0b\xa8\x75\xec\xe1\x86\
+\x22\x79\xf2\x49\xe1\x67\x40\x1c\xa1\x4a\x98\x4b\x3b\x98\x54\xc8\
+\x73\xa7\xf4\x3b\xbd\x0f\x26\x81\x70\x34\x4b\xb6\xce\x63\xdd\xf3\
+\xe7\xe4\xc0\xa6\x91\x76\x34\xfb\xcf\x2f\xa6\x4e\xeb\xad\xb9\x6d\
+\xcb\x1e\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x00\x8b\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x00\x3d\x49\x44\x41\x54\x58\x85\xed\
+\xd3\x21\x12\x00\x10\x00\x05\xd1\xe5\x52\xaa\xe2\x00\x2e\xea\x04\
+\x66\x64\x97\x32\x92\x2a\x52\xf6\xa5\xdf\x36\x7d\x90\x24\x7d\x16\
+\xce\x48\x6d\x0d\x20\x3f\xaa\xf6\x59\x63\x01\x88\x4f\x82\xd2\x85\
+\x2f\x90\x24\xe9\xbb\x0d\xbb\x58\x0a\x07\x83\x32\x65\x0f\x00\x00\
+\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x01\x26\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x00\xd8\x49\x44\x41\x54\x78\x9c\xed\
+\xd2\xb1\x4d\xc3\x50\x18\x46\xd1\x1f\x86\xf0\x26\x2c\x92\x15\x52\
+\x20\x1a\x86\xa1\x89\xb2\x44\x16\x61\x8b\x54\x6c\x61\x0a\x2c\xa5\
+\x88\x68\x7d\x22\xe5\x1e\xc9\xd2\x73\xf5\x3e\x5f\x79\x26\xc9\x33\
+\x7b\x51\x17\xbf\xbd\x7f\x1d\x66\xe6\xb4\xbd\x7e\x7c\x9f\x3f\x2f\
+\x62\xc7\xab\xb8\x74\x73\x5a\x67\x96\x75\x66\x99\x5b\x88\xdd\xb1\
+\x00\xdb\x87\xdf\x9d\xf7\x26\xff\x80\x87\x50\x00\x3d\x40\x2b\x80\
+\x1e\xa0\x15\x40\x0f\xd0\x0a\xa0\x07\x68\x05\xd0\x03\xb4\x02\xe8\
+\x01\x5a\x01\xf4\x00\xad\x00\x7a\x80\x56\x00\x3d\x40\x2b\x80\x1e\
+\xa0\x15\x40\x0f\xd0\x0a\xa0\x07\x68\x05\xd0\x03\xb4\x02\xe8\x01\
+\x5a\x01\xf4\x00\xad\x00\x7a\x80\x56\x00\x3d\x40\x2b\x80\x1e\xa0\
+\x15\x40\x0f\xd0\x0a\xa0\x07\x68\x05\xd0\x03\xb4\x02\xe8\x01\x5a\
+\x01\xf4\x00\xad\x00\x7a\x80\x56\x00\x3d\x40\x93\x01\x7e\xfe\x39\
+\xef\x0a\x06\x58\x8f\x33\x73\xfd\x7b\xd6\xa3\xdb\x91\xe4\x99\xfd\
+\x02\xc9\x6e\x11\x4a\x9d\x22\x1c\x0a\x00\x00\x00\x00\x49\x45\x4e\
+\x44\xae\x42\x60\x82\
+\x00\x00\x03\x5c\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x03\x0e\x49\x44\x41\x54\x78\x9c\xed\
+\xd5\x4b\x6c\x54\x75\x14\xc7\xf1\xef\xb9\x53\xa6\xda\x81\xd0\xd0\
+\x98\x50\x4d\x4a\x64\x63\x52\x36\xc0\x4c\xc7\x47\xa2\xa9\xcf\xa4\
+\x16\x24\x2c\x70\x41\x04\x4b\x02\x33\x03\xed\x80\x62\xe2\xc2\xc4\
+\x4c\xba\x33\xf1\x51\x3b\x03\xa5\x0f\x89\x04\x16\x18\x0a\x29\x31\
+\x60\xdd\x98\x58\x92\x52\x18\xda\x59\xb2\x00\xa2\x1b\x83\x84\xd0\
+\x0a\x49\x83\x9d\xda\xce\x71\x51\xa3\xd3\x6b\x25\xd8\x7b\x67\xba\
+\xe0\x7c\x96\xff\x73\xef\x6f\x7e\xf7\xcc\x0b\x8c\x31\xc6\x18\x63\
+\x8c\x31\xc6\x18\x63\x8c\x31\xc6\x18\xf3\xa8\x10\xaf\x01\xcf\xc6\
+\xd3\xf5\xb3\xca\x71\x84\xa7\x50\xbe\x18\xed\x4d\x7e\x06\xa2\x7e\
+\x94\x5b\x48\x34\xd1\xb9\xb5\xa0\xf2\x29\x00\x05\x49\x8e\xf6\x25\
+\x07\xbd\xe4\x79\x5e\x40\x24\x9e\x19\x02\x7d\xe9\xef\x03\xe5\xc4\
+\xfd\xdf\xc6\x77\x5f\xed\x6f\x9f\xf6\x9a\x3d\x9f\x4a\x38\x9e\xf9\
+\x50\xe0\x93\xa2\xc3\x7b\xaa\x95\x4f\x8c\xf5\xc6\xff\x58\x6c\xaa\
+\xe3\x43\xb1\xf9\x19\xc2\x8e\xaa\x55\x35\xdf\xaf\x6f\xe9\xa8\xf6\
+\x9e\x3d\xa7\x31\x95\xaa\x88\xc4\xd3\x5d\xae\x87\x9f\x7b\x35\x8f\
+\xbc\x2f\x40\x74\xaf\xc0\x6d\xd7\xe9\xcb\x81\xca\xc0\xf0\x86\xd6\
+\x43\x6b\xbc\xc6\xd7\xef\x3b\xbc\x7c\xf2\x56\xcd\x59\x90\x84\x6b\
+\x94\x17\x78\xc7\xcb\xbb\x0f\x3e\x6c\x10\x20\xba\x3b\xf3\x74\x21\
+\xa0\x83\xc0\x33\xae\xd1\x2d\x55\xa7\x79\xac\xb7\x2d\xb7\x98\xdc\
+\x70\xac\xa3\x56\x24\x70\x0e\xd8\xe8\x1a\x4d\x20\xf2\xd6\x68\x77\
+\x72\x78\x31\xb9\xc5\x7c\xf8\x0a\x40\xf6\xab\xe4\xcf\xcb\x66\x66\
+\x5e\x00\xb9\xe0\x1a\xad\x16\x29\x5c\x08\xc7\xd2\xcd\xff\x37\xb3\
+\x61\xcf\xa1\x75\x22\x81\x4b\xfc\xeb\xe1\xe5\x27\xa7\xe0\x3c\xef\
+\xc7\xc3\x83\x4f\x0b\x00\x18\x39\x7a\x70\xe2\x6e\x50\xdf\x00\x4e\
+\xba\x46\x21\x11\xbe\x0d\xc7\xd2\x7b\x1f\x36\x6b\x63\x22\xf3\x8a\
+\x3a\x85\x61\xa0\x6e\xfe\x44\x2e\xcf\x4e\xeb\x73\xd9\xbe\xb6\x6b\
+\x9e\x0b\xff\x25\xe0\x57\x10\xc0\x44\x76\x70\xf6\xe6\xa6\xe8\x40\
+\xed\x64\x28\x28\xf0\x62\xd1\x48\x44\x68\x7e\x32\xd2\x14\xba\xb9\
+\x29\xfa\x03\x43\x43\xff\xf9\x37\x19\x89\xa7\x77\x0a\x9c\x02\xaa\
+\x8a\xcf\x15\x19\x40\x83\x5b\x72\x47\x5b\xef\xf9\xd9\xd9\x97\xdf\
+\x80\x85\x44\x62\x9d\x31\x44\xba\x70\x2d\x59\xe1\xd4\x8a\xfc\x8a\
+\x77\x7f\x3c\xb6\x6b\x6a\xfe\x1d\x2a\x0d\xf1\xcc\xc7\x0a\xed\xee\
+\x2c\x45\x3b\xd7\x4e\xd4\x7e\xd0\xdf\xff\xf6\xac\xdf\x3d\x4b\xb6\
+\x00\x80\xc8\x9e\x4c\x13\x8e\xf6\x03\x21\xd7\x68\xd8\xa9\x70\xb6\
+\x64\x0f\xb7\x8d\x03\xd4\x6f\x4b\x05\x1f\x5f\x55\xd3\x23\xd0\xe2\
+\xba\x4e\x05\x79\xff\x4a\x4f\xb2\xb3\x54\x1d\x4b\xba\x00\x80\x48\
+\x22\xbd\x01\xe5\x3c\x50\x5b\x7c\xae\x70\x1d\xa5\x09\x2a\xef\x88\
+\x93\x3f\x8d\xf2\x9a\xeb\xd6\x29\x47\x74\x7b\xb6\xfb\xc0\x40\x29\
+\xfb\x95\x7c\x01\x00\xe1\xd8\x97\x75\x22\xce\x77\xc0\xba\x87\xbc\
+\xe5\x4e\xc1\x61\x73\xee\xc8\xfe\x4b\xa5\xec\x05\x65\x5a\x00\x40\
+\x38\xd6\xb3\x52\x24\x7f\x06\x78\xf5\x41\xd7\x29\x5c\xd7\x40\xe0\
+\xcd\x5c\x57\xeb\x8d\x72\xf4\xf2\xf5\x5f\xe0\x41\x7e\x1d\x3b\x97\
+\xaf\x5e\x1b\xfd\x26\x58\x15\xaa\x03\xd6\x2f\x78\x91\x70\x11\x9d\
+\x7e\x3d\xd7\xfd\xde\x2f\xe5\xea\x55\xb6\x4f\xc0\x3f\x54\x22\x89\
+\x74\x0a\x95\x94\x6b\x70\x7a\x59\xd5\xcc\xce\x91\x8e\x83\xbf\x97\
+\xb3\xcd\x12\x2c\x60\x4e\x43\x22\xdd\xa7\xca\x2e\x40\x81\xcf\x47\
+\x57\x8f\x7f\x44\x7b\x7b\x61\xa9\xfa\x2c\x89\xc6\x54\xaa\xa2\xb1\
+\xe5\xeb\xc7\x96\xba\x87\x31\xc6\x18\x63\x8c\x31\xc6\x18\x63\x8c\
+\x31\xc6\x18\xf3\x88\xf8\x13\xba\x50\xdf\xc1\x6b\x55\xb9\xde\x00\
+\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x00\xc4\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x00\x76\x49\x44\x41\x54\x78\x9c\xed\
+\xd0\xc1\x0d\x82\x40\x14\x04\xd0\x59\x8b\x30\x36\x62\x23\xb6\xc0\
+\xc1\x70\xb2\x17\x2f\x84\x46\xa8\x82\x42\x88\x4d\xac\x57\x43\xf6\
+\x0a\x24\xf2\xde\x71\xf2\x0f\xf3\x27\x01\x00\x00\x00\x00\x00\x00\
+\xce\xa0\xac\x83\xfb\xf3\xfd\x48\x32\xd4\xe4\x7a\x40\x9f\x2d\x2d\
+\x49\xed\xe6\xf1\x35\xfd\x86\x97\xc6\xe1\x3f\x3e\x9f\x24\xb7\xa4\
+\x0c\xeb\xb0\x35\xc0\xa9\xb4\x06\xe8\x4b\xf2\xd9\xbd\xc9\xf6\x96\
+\xa4\xf6\x47\x97\x00\x00\x00\x00\x00\x00\x00\x00\xf6\xf7\x05\x16\
+\xa6\x0e\x08\x70\x11\x84\x99\x00\x00\x00\x00\x49\x45\x4e\x44\xae\
+\x42\x60\x82\
+\x00\x00\x00\xd6\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x00\x88\x49\x44\x41\x54\x78\x9c\xed\
+\xd7\xb1\x0d\xc2\x40\x10\x04\xc0\x7d\x8a\x40\x14\x44\x05\x88\x0e\
+\x20\x71\x45\x4e\x68\x81\x94\xc4\x0d\x59\x34\xf1\xa4\xc8\x2f\x42\
+\xeb\x91\x3d\x13\xae\x2e\xd8\xbb\xec\x12\x00\x00\x00\x00\x00\xf6\
+\xa3\x2c\x83\xf3\xf5\x7e\x29\x35\x63\x92\x63\x87\x3e\xab\x29\xc9\
+\x5c\x93\xdb\xf4\x7c\xbc\xbe\xf3\x43\x33\xb8\xc1\xe5\x93\xa4\x26\
+\xa7\x24\xe3\x32\x6f\x0e\xb0\x37\xcd\x01\x6a\xc9\x90\xe4\xdd\xa1\
+\xcb\xaa\x4a\x32\x27\x19\x7a\xf7\x00\x00\xfe\x87\x5f\xa0\x19\xdc\
+\xe0\xf2\x89\x5f\xe0\x27\xbf\x00\x00\x00\x00\x00\x00\x00\x3b\xf1\
+\x01\xd7\x53\x1e\x0f\x14\xfc\xaf\x10\x00\x00\x00\x00\x49\x45\x4e\
+\x44\xae\x42\x60\x82\
+\x00\x00\x02\xc4\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x02\x76\x49\x44\x41\x54\x78\x9c\xed\
+\x9a\x3d\x6f\xd3\x40\x1c\x87\x9f\x4b\xa8\xca\x02\x4b\x78\x59\x6a\
+\xe7\xfc\x39\xf8\x12\x2c\x54\x0d\x2d\xac\x74\x60\x65\x63\xe5\x1b\
+\x80\xc4\xca\x4b\x0b\x82\x01\xf1\x3d\xbc\x31\x66\x70\xed\x66\x43\
+\x48\x48\x2c\xa8\x52\x7b\x2c\x11\x32\x87\x9d\x36\xf6\xdd\xf9\xce\
+\xf1\x6f\xb3\xfd\xcf\x4f\xf7\x3c\x8a\x9d\xe8\x64\x18\x32\x64\xc8\
+\x26\x47\x74\xbd\x00\xdb\xc9\x8a\xe2\xbe\x50\xe2\x05\xf0\x73\x3c\
+\xe2\x30\x8a\xa2\x6f\xe5\xeb\xd7\x3a\x5a\x97\x93\x64\x45\xb1\x27\
+\x94\x38\x02\x46\x00\xe7\x17\xbc\x06\xee\x95\x67\x46\x5d\x2c\xcc\
+\x45\x74\xf8\x65\x6e\xea\x73\xbd\x14\x50\x03\x7f\xae\x84\x7a\xae\
+\xcf\xf6\xee\x16\xa8\x83\x17\x88\x99\x8c\xa3\xaf\xfa\x7c\xaf\x1e\
+\x82\xab\xe0\xa7\xd3\x9d\xcf\x55\x9f\xe9\x8d\x80\x26\xf0\xd0\x13\
+\x01\x4d\xe1\xa1\x07\x02\xda\xc0\x43\xe0\x02\xda\xc2\x43\xc0\x02\
+\x4c\xc0\x43\xa0\x02\x4c\xc1\x43\x80\x02\x4c\xc2\x43\x60\x02\x4c\
+\xc3\x43\x40\x02\x6c\xc0\x43\x20\x02\x6c\xc1\x43\x00\x02\x6c\xc2\
+\x83\xe7\x02\x6c\xc3\x83\xc7\x02\x5c\xc0\x83\xa7\x02\x5c\xc1\x83\
+\x87\x02\x4c\xc3\xe7\xf9\xe2\x81\x52\xea\xd5\xf2\xf0\x89\x94\xd1\
+\x97\xf2\x75\xaf\x04\x98\x86\xff\xaf\x4f\xf1\x5d\xca\xe8\x4e\x79\
+\xc6\x9b\x2d\x31\xeb\xf0\x35\xf1\x42\x80\x23\xf8\x0b\x21\xc4\x53\
+\x7d\xb6\x73\x01\xae\xe0\x51\x3c\x9e\x4e\x77\x3e\xe9\xf3\x9d\x3e\
+\x03\x5c\xc2\x4b\x19\x1d\x55\x7d\xa6\x33\x01\x3e\xc0\x43\x47\x02\
+\x7c\x81\x87\x0e\x04\xf8\x04\x0f\x8e\x05\xf8\x06\x0f\x0e\x05\xf8\
+\x08\x0f\x8e\x04\x38\x84\x7f\x24\x65\x74\xbc\x4e\x97\x75\x01\x3e\
+\xc3\x83\x65\x01\xbe\xc3\x83\x45\x01\x21\xc0\x83\x25\x01\xa1\xc0\
+\x83\x05\x01\x21\xc1\x83\x61\x01\xa1\xc1\x83\x41\x01\x21\xc2\x83\
+\x21\x01\xa1\xc2\x83\x01\x01\xae\xe0\x95\x50\x07\x49\x1c\x7f\x58\
+\xb7\x2f\xcf\x17\xbb\x4a\xa9\x97\xcb\x43\xb3\x7b\x82\xfe\xc3\x9f\
+\x1e\x28\x78\xf3\xb7\xcf\xe4\x9e\x60\x70\xf0\x35\x69\x24\xc0\x77\
+\xf8\x93\x93\xd3\xfd\x0a\x78\x33\x7b\x82\x21\xc0\x23\x78\xab\xf7\
+\x19\xd9\x13\x0c\x19\xbe\xf5\x9e\x60\x00\xf0\x0f\x11\xbc\xd3\xfb\
+\x2e\xfb\xe9\xbc\x92\x80\xbe\xc2\xc3\x15\x04\x38\x84\xdf\x4f\xe2\
+\xf8\xe3\xba\x7d\x6d\xe0\xe1\x12\x01\x7d\x87\x87\x15\x02\x7c\x87\
+\xcf\x8a\x62\x26\x94\x78\x5f\xd1\xb7\xd6\x6d\x54\x29\x60\x53\xe0\
+\x01\xc6\xfa\x89\x3c\x5f\xec\x02\xc7\x18\x82\xaf\xe9\x6b\x0c\xbf\
+\xa2\xaf\xd1\x03\xf4\x9f\x6f\x40\x9a\xa6\x5b\xb7\x6e\xdf\xfd\x01\
+\xdc\x28\x9d\x6e\x0c\x5f\xd3\xd7\x18\xde\x74\x1f\x68\xff\x04\x27\
+\x93\xc9\x18\xd8\x2e\x9d\x6a\xf5\x5a\x4a\x45\x5f\xab\xc5\x9a\xee\
+\x03\x4d\x40\x92\x24\xbf\x05\x3c\x03\xce\x80\x5f\x02\xb1\xd7\xe6\
+\x9d\x9c\x8a\xbe\x59\x9b\xc5\x9a\xee\xab\xcd\x7c\x3e\xdf\x4e\xd3\
+\x74\xcb\xd7\xbe\x2c\xcb\xae\x9b\xec\x1b\x32\x64\x83\xf3\x07\x17\
+\xa8\x1d\x6f\x59\x60\x0c\x9b\x00\x00\x00\x00\x49\x45\x4e\x44\xae\
+\x42\x60\x82\
+\x00\x00\x0a\xf4\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x0a\xa6\x49\x44\x41\x54\x78\x9c\xed\
+\x5b\x7b\x70\x54\xd5\x19\xff\x7d\xf7\xee\x6e\x60\x93\x08\x64\x11\
+\x83\xd2\x91\xd8\x96\xd1\x58\x98\x21\xbb\x0b\x52\x35\x22\xda\xd1\
+\x5a\xc5\x07\xae\xf5\x31\x28\x51\xd8\x4d\x80\x2c\xc2\x54\x5b\x9d\
+\xa9\x4b\xac\x76\xb4\x6a\x08\xbb\x60\xdc\x08\x18\x41\xa6\xad\x99\
+\x51\xa7\x3a\x8a\x4c\xb5\xa1\xd4\x22\x64\x03\x96\xfa\xc0\xf1\x11\
+\x1f\x34\x90\x4a\xc2\x23\x12\xb2\xd9\xdd\xf3\xf5\x8f\x20\xdc\x7b\
+\xf7\xee\xbd\x77\x93\x5d\xa6\xd3\xf2\xfb\x6f\xbf\xf3\x3b\xdf\xf9\
+\x9d\xef\x9e\x3d\xf7\x3c\xbe\x0b\x9c\xc6\x69\x9c\xc6\xff\x33\xe8\
+\x54\x34\x32\xb5\x2a\x7c\xa6\x5c\x40\x95\x80\x98\x0c\xa6\xf3\x41\
+\x38\x8f\x19\xa3\x09\x38\x03\x80\x0c\xd0\x11\x00\x47\xc0\xfc\x15\
+\x08\x1f\x01\xf8\x50\x4a\xd1\xd6\x1d\x6b\x6a\x3b\xf2\xad\x2d\x6f\
+\x01\x70\xfb\xc3\xdf\x97\x08\xf3\x98\x31\x1b\x84\x29\x43\x74\xd3\
+\xc1\xe0\x37\x24\xc1\xcd\x6d\xcf\x2e\x89\x01\xc4\x39\x15\x89\x9c\
+\x07\x80\xc9\x1b\x08\x5f\xc5\xa0\xfb\x01\x5c\x9e\x5b\xdf\x78\x9f\
+\x40\xf5\x82\x1d\x2f\xb4\x37\x05\x12\xb9\x72\x9a\xb3\x00\xb8\xfd\
+\x2b\x2f\x27\xa2\xdf\x01\xf0\xe4\xca\xa7\x1e\x18\xf8\x02\xcc\xcb\
+\xdb\x9b\x82\xeb\x73\x31\x22\x86\x1d\x80\xe9\xf3\x1b\xce\x4a\xca\
+\xd2\x53\x04\xdc\x61\x40\x13\x04\xbc\x03\xe2\x56\x21\xa4\x3d\x40\
+\xea\x33\x1b\x51\x8f\x90\x6d\xbd\xc9\x63\xa9\x94\x3c\x22\x59\x0c\
+\xb6\x8d\x22\x46\x99\x60\x9a\x44\xe0\x19\x20\xfc\x04\xc0\x48\x03\
+\xe1\x5b\x21\xa4\x9a\xb6\x67\x17\x7f\x30\x1c\xfd\xc3\x0a\x80\xa7\
+\x3a\x3c\x0d\x8c\x57\x00\x8c\xd7\x29\xee\x05\xf0\x3a\x11\x5e\x25\
+\x59\xda\xb4\x63\xf5\xe2\xee\x6c\x7c\xcf\x58\x5a\x3f\x72\xe0\xa8\
+\x6d\x16\x01\xd7\x81\x30\x3b\x43\x1b\xfd\x00\xee\x8e\x45\x83\xbf\
+\xcf\x5e\xfd\x20\x86\x1c\x00\xb7\x3f\x72\x3b\x11\xaf\x03\x50\x90\
+\x26\x8a\x39\x1c\x97\xed\x8f\xfd\xb3\x71\xe1\xc1\xa1\xfa\x57\xa2\
+\xdc\x17\x72\x38\xc7\x94\x2c\x20\xa2\x87\x18\x18\x97\x46\x60\x7a\
+\x34\x36\xfe\xc0\x43\xa8\xab\x13\xd9\xfa\xce\x3e\x00\xa1\x90\xe4\
+\xde\x3f\xf6\x11\x02\x3f\xa0\x29\x11\x44\x58\x27\x25\x51\xb7\x7d\
+\x4d\x70\x6f\xd6\x7e\x2d\xe0\xe2\xbb\x1f\x2f\x8e\xdb\x9c\xcb\x40\
+\xfc\x0b\x00\x45\x9a\xe2\x57\xfa\x64\x79\xee\x87\x4f\x2f\xfa\x36\
+\x1b\x9f\xd9\x05\x20\x14\x92\x3c\xfb\xc6\x6e\x04\xf1\xad\x2a\x3b\
+\xa3\x13\x12\x6e\x8c\x3d\x13\xdc\x91\x95\xbf\x21\x62\xfa\xfc\xf0\
+\x84\x94\x8c\x97\x91\x3e\xe1\xee\x92\x1d\x98\xb9\x3d\x12\x3c\x62\
+\xd5\x97\x94\x4d\xc3\xde\xae\x92\xe5\xda\xce\x13\xf0\x2e\x23\xe5\
+\x39\x55\x9d\x07\x80\xed\x6b\x82\x7b\xed\xce\x64\x25\x03\x1b\x35\
+\x45\x53\xc5\x00\x6f\xf4\xf9\x5e\x94\xad\xfa\xb2\x4c\xf4\x06\x22\
+\x3f\x67\x20\xa2\xb4\x11\xd1\xf3\x85\xf1\x62\xdf\xb6\xb5\x35\x87\
+\xac\xfa\xc9\x15\xf6\xbe\xfb\x66\x72\x5f\xfb\xeb\x2f\x9f\xed\x6d\
+\xeb\x03\x70\x25\x4e\x8c\x66\x9a\x74\x68\x44\xef\x88\xce\xf6\x4d\
+\x7f\xb6\xe2\xc7\xd2\x5f\x60\x5a\x20\xe2\x11\xe0\xad\x00\x46\x9c\
+\xb4\xf2\x0b\xb1\x68\xf0\xce\x7c\xac\xce\xb2\x85\xc7\x1f\xbe\x17\
+\x84\x15\x1a\xf3\x5d\xb1\x68\x70\xbd\x59\x5d\xd3\x00\x4c\x5b\xb4\
+\xca\x95\x4a\xf2\x3f\x08\x7c\x8e\xc2\xbc\xa3\x28\x5e\x7c\x59\x6b\
+\x73\x55\x7f\x36\x42\x2b\x16\xae\xb8\x40\x4a\xca\x37\x1e\x5f\x1a\
+\x4f\x00\x63\x02\x88\x52\x00\xf6\x12\x89\xbd\x42\xd0\x4e\x59\xd0\
+\x4b\xd9\xef\x01\x98\x3c\x81\xf0\x5a\x80\xaa\x14\xc6\x01\x66\x69\
+\x46\x7b\xd3\xe2\x9d\x46\x35\x4d\x03\xe0\xf1\x87\xd7\x82\x70\xf7\
+\xc9\xb6\xd0\x99\x72\x90\x77\xd7\xaa\xda\x4e\x2b\xd2\xca\x7d\x21\
+\x47\x61\xc9\xd8\x1a\x06\x57\x03\x38\xdf\x4a\x1d\x00\xbb\x88\x10\
+\x9e\xd8\x5d\xba\xa1\xa5\xe5\x96\x94\x95\x0a\x3f\xa8\x0d\x17\x8c\
+\x4e\xe0\x6d\x30\x7e\xac\x30\xef\x2c\x2a\xed\x9e\xde\x5a\x57\x97\
+\xcc\x54\xcf\x70\x12\x74\xfb\x1b\x2e\x51\x75\x1e\x60\x21\x63\x8e\
+\xd5\xce\xbb\xfd\x91\x1b\x9c\x63\x5c\x1f\x30\xb8\x01\xd6\x3b\x0f\
+\x00\x53\x99\xf1\x5c\x47\x49\x57\xac\xa2\x3a\x32\xcb\x4a\x85\x4f\
+\x23\xc1\xb8\x9c\x14\x37\x01\x38\xa0\x30\x57\xf4\xee\x73\x2d\x34\
+\xaa\x67\x30\x02\x98\x3c\x81\xc8\x5f\x01\x5c\xa2\xb0\xbd\x10\x8b\
+\x2e\x99\x6b\x26\xc6\xed\x8f\xda\x41\xfd\x0d\x04\x32\x6c\xdc\x32\
+\x88\xeb\x62\x67\xf5\x3c\x6c\x65\xa1\xa3\x33\x1f\x1c\x18\xe8\x8b\
+\x4f\xdc\xbd\xe1\xbe\xa3\x7a\xfc\x8c\x23\xc0\xbb\x20\x52\x09\x55\
+\xe7\x91\x80\x94\x0a\x99\x09\x98\x5c\xf3\xf4\x18\xa2\xf8\x1b\x39\
+\xeb\x3c\x00\x30\x85\x3c\xfb\x5d\x7f\x74\xfb\xa3\x4e\x33\x6a\xd1\
+\x40\xf1\x33\x00\xbe\x52\x98\xc6\xda\x9d\x8e\x40\x26\x7e\xc6\x00\
+\xb0\x84\xfb\xd4\x06\x44\x63\x8d\xcb\x3e\x37\x6a\xbc\xdc\x17\x72\
+\x14\x88\xd4\x2b\x00\xae\x30\x13\x3a\x04\xdc\x4c\xe8\x5f\x8f\x50\
+\xc8\xf0\x6f\xdb\xda\x5c\xd5\x4f\x04\xcd\x83\x92\x96\x65\x5a\x1b\
+\xe8\x3a\xf3\x2e\x5c\x5d\x0a\xe0\x6a\x85\x29\x21\x0b\xf1\x88\xb1\
+\x3e\xa6\x42\x97\x6b\x35\xc0\x95\xc6\xbc\x61\x80\x68\x8e\x7b\xbf\
+\xcb\x74\x14\x4e\xec\x2e\xdd\xc0\xc0\x27\x27\xaa\x81\xcf\xf9\xcc\
+\xd5\x75\xa5\x1e\x57\x37\x00\x22\x95\xbc\x1d\x8a\x45\x12\x01\x6f\
+\x6f\x5f\x73\x6f\x97\x51\xa3\xde\xc0\xaa\x3b\x98\x31\xdf\x4c\xdc\
+\x70\x41\xc0\x43\x9e\x05\x61\xdd\xce\x7c\x87\x96\x96\x5b\x52\x44\
+\x68\x51\xda\x24\xe6\xbb\xf4\xb8\xba\x01\x20\xd0\x75\x1a\xcb\x9f\
+\x8c\x1a\x74\xfb\xa3\x4e\x01\x3c\x66\xc4\xc9\x29\x24\xd4\x9b\x2d\
+\x77\x59\x08\xad\xe6\x6b\xf4\xea\xa4\x05\x60\xca\xdc\x27\x0a\x01\
+\xd5\xbb\x14\x82\x53\xaf\x19\x0a\xa2\xf8\x32\xcd\x42\x29\xdf\x98\
+\xdc\x51\xd2\x35\xcf\x88\xd0\x3e\xfe\x60\x1b\x00\xe5\xa8\x1d\xd5\
+\xe1\xda\xef\xd6\xf2\xd2\x02\x50\xe0\x74\x5c\x04\xc0\x71\xd2\x42\
+\xef\xb5\x37\xdd\xfb\x95\x96\xf7\x1d\x7c\xbe\x17\x65\x22\x04\xcd\
+\x35\xe7\x1a\xbc\xc4\xb0\xb8\xae\x4e\x00\xac\x7a\x70\xcc\xe9\xe7\
+\x94\x3a\x7f\x01\xe9\x47\x1a\xc3\x56\xa3\x76\x3a\x5c\x5d\x97\x82\
+\x71\xa6\xa1\x98\xfc\x60\xf2\xf4\xc0\xca\x1f\x1a\x11\x98\xd5\xda\
+\x89\x71\xa1\x96\x93\x16\x00\x66\xbe\x40\xf5\x1b\xe2\x13\x2d\x47\
+\x53\xe1\x66\xc3\xf2\x3c\x22\xc9\xd2\x1c\xa3\x72\x89\xa1\xd6\x4e\
+\xb8\x20\x8d\xa3\x35\x10\x61\xa2\xca\xc0\x64\xf8\xee\x07\x28\xaf\
+\xa7\xc0\x86\x2d\x13\xa7\xfd\xa7\x55\xb0\xdb\xb4\xda\xcb\xb4\x94\
+\xf4\x11\x40\x28\x56\x35\x22\x91\xc9\x5e\xff\x94\x4e\x7e\x2a\x10\
+\x30\xc1\xa8\xbc\xb0\xcf\xa9\xd5\x5e\xac\xe5\xa4\xcf\x01\xac\x26\
+\x49\xcc\x99\xcf\xd8\x06\x57\x65\x7a\xa7\xb5\xa7\x04\x6c\x12\x80\
+\xd6\xe6\x79\x71\x00\xca\x9d\xa0\xa3\xdc\x17\x72\x28\x39\x7a\xeb\
+\x00\xd5\x06\x29\x29\x89\x8c\x07\x1e\x33\x07\xeb\x67\x75\xac\x96\
+\x63\xd8\x87\xeb\x40\x4f\x7c\xaf\x8a\xc0\x72\xda\xb0\xf9\x0e\xc7\
+\xf7\xd9\x86\x2b\xc4\xbc\x82\x61\x78\xfa\x3c\x73\x5e\x73\x01\x00\
+\x9b\xc2\x34\xf0\x61\x4b\xdd\x80\x92\x93\x3e\x09\x02\xaa\x13\x55\
+\x16\x3c\xda\x44\xc4\xbf\x4c\x85\xe6\x0b\x64\x1c\x80\x63\xb6\xc3\
+\xa3\x34\xa6\x5e\x2d\x27\x7d\x12\x04\x7d\xa9\x6a\x43\x4a\x9f\x39\
+\xd5\xe5\xf4\xbe\x51\x79\x5e\xc1\xc6\x6d\xb3\x6c\x3b\x4f\x6d\xc0\
+\x17\x5a\x8e\xce\x24\xc8\x1f\x29\x7f\x12\x60\xbc\xd8\x20\xbc\x64\
+\x54\x9e\x4f\x30\xc8\xb0\x6d\x01\xa1\xd2\xce\x84\x3d\x5a\x4e\x7a\
+\x00\x48\x52\x5d\x36\x32\xab\x0e\x45\xd2\x50\x74\xac\x68\x33\x80\
+\xac\x6e\x63\x72\x02\xc6\x97\xed\x4d\x8b\x76\x19\x53\x34\xda\x75\
+\x46\x4c\x5a\x00\xfa\x64\xda\x06\x40\x79\xff\x5e\x31\x7d\x7e\x38\
+\xe3\xeb\xa6\xb5\xb9\xaa\x1f\x8c\x66\x33\xbd\x79\x40\x93\xe1\x91\
+\x7c\x28\x24\x11\x70\xad\xd2\xc4\x32\xb7\x6a\x69\x69\x01\x18\xbc\
+\x5b\xa3\x6d\x4a\x5b\x52\xa6\x6b\xb5\x3c\x25\x52\x09\x3c\x0c\xe0\
+\xb0\x89\xe0\x5c\xe2\x6b\x7b\x61\x52\x7b\x0f\xa0\x82\xb7\x73\x8c\
+\x1b\xea\x35\xca\x91\x33\xc6\x75\xc7\xb4\x3c\xfd\x77\x38\xab\x77\
+\x51\x44\x3c\xdb\xa8\xb1\x5d\xcf\x05\xbf\x21\xb0\xc9\x89\x51\xee\
+\x40\xa0\x07\xb7\xad\x58\x76\xcc\x90\x24\x49\x2a\xcd\x0c\x6c\xd2\
+\x3b\x1e\xd7\x0d\x40\xca\x41\x1b\x01\x9c\x3c\x81\x65\xcc\x9a\x5a\
+\x15\x36\xdc\xf1\x15\x96\xf6\x34\x10\xf0\xa6\xa1\xa8\x5c\x80\xb1\
+\xa1\x2d\xba\x58\x7b\x27\xa8\x46\x28\x24\x31\xa0\xda\xa4\x11\xf8\
+\x79\x3d\xaa\x6e\x00\x8e\x9f\xfb\x6f\x56\x98\x0a\x64\x7b\xda\x75\
+\xb8\x0a\xad\x75\x75\xc9\x44\x3c\x75\x2b\x80\x8f\x0d\xc5\x0d\x03\
+\x04\xbc\x5b\x34\x50\xec\x37\xbb\x8e\xf3\x76\xb9\x6e\x83\xfa\x1e\
+\x62\x7f\x51\x69\xcf\x66\x3d\x6e\xc6\x65\x2c\x81\x9f\x54\x1b\x68\
+\xd1\xd4\x45\xab\xce\x35\x6a\xf8\xbd\xe6\xa5\x87\x20\x25\xaf\x41\
+\x7e\x82\x10\x93\x52\xe2\x06\xb3\xeb\xb8\x72\x5f\xc8\xc1\x8c\xdf\
+\xa8\x8c\x44\x2b\x32\xdd\x0e\x65\x0c\x40\x5b\x34\xf8\x36\x00\xe5\
+\x64\xe8\x90\x92\x62\xb9\xa9\xca\xc6\x65\x9f\x27\xe3\xa9\x8b\xa0\
+\x1e\x41\xc3\x03\xd3\x1f\xec\xce\x64\xa5\xd9\xc1\x2c\x00\x38\x5d\
+\x2e\x3f\xd4\xdb\xde\x9e\x82\x81\xbe\xc6\x4c\x7c\x83\x8d\x0c\x31\
+\x88\x1e\x54\x59\x80\x3b\x2b\x6a\x56\x1a\xef\xc1\x31\x38\x12\x8a\
+\x4a\xbb\x7f\xc6\xc0\xaf\xa0\xb3\xfc\xcc\x02\x07\x18\x54\x13\x6b\
+\x5a\x7c\xbb\xe9\xa4\x07\xc0\xed\x7f\x72\x2c\x31\x7e\xad\xb4\x31\
+\xe3\xb7\xef\xac\xfb\x65\x46\x0d\x56\x2e\x47\xd7\x83\xa0\xbc\x0e\
+\xfb\x5a\x4e\x09\xaf\x95\xa7\x01\x00\x53\xaa\x1b\xc7\x15\x20\xb1\
+\x9c\x19\x77\x01\x30\xbd\xd9\x39\x8e\xc3\x44\xdc\x28\xc4\x88\xc7\
+\xda\x9b\x02\x96\x5e\xaf\xe5\xbe\x90\xc3\xe9\x72\x6d\x06\xe3\xb2\
+\x13\x46\xc6\x6e\x46\x81\xc7\x28\xaf\xd0\x34\x00\x53\xaa\x1b\xc7\
+\x39\x38\xb1\x1b\xc0\x59\x8a\x5a\x7f\x3f\x64\xc7\xac\x4f\x23\xc1\
+\xb8\x15\x71\xc0\xe0\xd1\xb9\x44\xf1\xab\x41\x3c\x87\x99\x26\x03\
+\x38\x07\x40\xc9\x71\x7f\xdf\x30\xa3\x93\xc0\x3b\x21\xa4\x96\xbe\
+\x43\x07\xde\xd2\xee\xda\xcc\xe0\x09\xac\x6c\x04\xa8\x5a\x61\x4a\
+\x80\x70\x89\x59\xe6\x8a\xa5\x04\x89\x8a\x9a\xf0\x45\x92\x40\x2b\
+\x94\x19\x61\x8c\x75\xb1\xa6\xda\xf9\xc3\x49\x90\x98\xb1\xb4\x7e\
+\xe4\x37\x49\x9b\xc8\x26\x90\x7a\xf0\x06\x22\x0b\x19\xbc\x5a\x6d\
+\xa5\xf9\xb1\x68\xed\x5a\xb3\xba\x96\x93\xa4\x3c\xd5\x2b\xe7\x82\
+\x49\x93\x71\x41\x4d\x7d\x3d\x07\x6a\xb3\x7d\x5a\xb9\x03\x93\xdb\
+\x1f\xa9\xa5\xc1\xdb\x60\xe5\x7c\xd6\x10\x8b\x06\x97\x5a\xf1\x60\
+\x39\x47\xa8\x33\xb6\x69\xf7\xd9\xee\xab\x9d\x20\xba\x58\x61\x76\
+\xdb\x9d\xce\xca\xf1\x15\x57\xbc\xb6\xaf\x7d\x73\x9f\x55\x5f\xb9\
+\x40\xb9\x2f\xe4\x38\xf7\xd2\xdd\x51\x1a\x9c\xa8\x4f\x3c\x48\x02\
+\xde\x2c\x2a\xed\xae\xfa\x62\xcb\x16\x4b\x39\x83\x59\x1d\x67\x95\
+\x1d\x1c\xff\x20\x83\x5e\x56\x19\x19\x97\x81\x1c\x6d\x6e\x7f\x64\
+\x72\x36\xbe\x86\x83\x29\xd5\x8d\xe3\x9c\x25\xae\xb7\x00\xba\x47\
+\x53\xf4\x41\x22\x9e\xba\xd5\x28\x23\x44\x8b\xac\x13\x25\x7d\xbe\
+\x17\xe5\x8e\x31\xfb\x9e\x00\x91\x76\x88\x25\x88\xd0\x18\x87\xfd\
+\xd1\xdd\xcf\xd4\xfc\x3b\x5b\xbf\x56\x30\x63\x69\xfd\xc8\xc4\x51\
+\xdb\x62\x10\x1e\x00\x30\x46\x55\x48\x78\x83\x45\xc1\x6d\x56\xdf\
+\x1a\x27\xab\x0d\x11\x9e\x40\xe4\x1e\x80\x1b\x91\x7e\x30\xf9\x2d\
+\x88\x9f\x92\xed\x54\x9f\x4d\xc2\xa2\x11\x66\x86\x42\xb6\xde\x7d\
+\x25\xf3\x40\xd2\xf2\x0c\x77\x90\xf5\x65\x3d\xa5\xf7\x5b\xcd\x27\
+\x52\x62\x58\xc9\xd2\xde\x40\x43\x25\x43\x7a\x09\x80\x4b\xa7\xf8\
+\x20\x80\x57\x01\xbc\x2a\x3b\xb0\x39\xdb\x60\x94\xfb\x42\x0e\xe7\
+\x68\x57\x25\xc9\xb8\x8e\x05\xae\x07\x41\x6f\x19\x9e\x00\xa8\xc6\
+\xca\x6c\x9f\x09\xc3\x4e\x97\xf7\x2e\x5c\xfd\x3d\x4e\xa5\x1a\x00\
+\xdc\x64\x40\x4b\x80\xb0\x05\x02\x7f\x81\x44\x1f\x4b\xcc\x9f\xb2\
+\x2c\xf7\xf4\x33\x7d\xeb\xb4\x25\x53\x52\x22\x59\x2c\xd8\x36\x2a\
+\xc9\x28\x23\x89\x26\x81\xc5\x0c\x80\xae\xc2\xe0\x27\x35\x99\x94\
+\xb7\x09\xe2\x9a\x9d\x8d\x4b\xda\x87\xa3\x3f\x67\x1f\x4c\x78\x16\
+\x44\x7e\x0a\x89\x1f\x07\x90\xdf\xc9\x70\x30\x2f\xf9\xe1\xb2\xee\
+\xd2\x35\x43\x19\xf2\x5a\xe4\xf6\x93\x99\x50\x48\x9a\xd6\x55\x72\
+\xbd\x00\x3d\x00\x86\x37\xa7\xbe\x41\x9f\x83\x45\x7d\xd1\xc0\x19\
+\x6b\xb3\x4d\xd0\x34\xf4\x9a\x2b\x47\x5a\x78\x17\xac\xba\x50\x48\
+\x3c\x8f\xc0\xb3\x01\x4c\x1a\xa2\x9b\xfd\x60\xbc\x4e\x24\x9e\x6f\
+\x2b\x3d\xf8\xb7\xa1\x7c\x0f\x60\x86\x53\xf2\xd9\xdc\xf1\x79\xe2\
+\x72\x30\x5f\x08\xd0\xf9\x20\x94\x01\x18\x85\xc1\xff\xb8\x8d\x41\
+\x87\x89\x71\x04\xc4\x5f\x13\x61\x8f\x10\xd8\x63\x23\x6c\xd9\x1e\
+\xad\xfd\xe8\xbf\x21\x17\xf9\x34\x4e\xe3\x34\xfe\x77\xf1\x1f\x1c\
+\x6b\xc6\x54\xc2\x9c\x88\xf8\x00\x00\x00\x00\x49\x45\x4e\x44\xae\
+\x42\x60\x82\
+\x00\x00\x00\x9b\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x00\x4d\x49\x44\x41\x54\x58\x85\xed\
+\xd7\xc1\x09\x00\x20\x08\x46\x61\x8b\x46\x72\x80\xb6\x71\x9f\xe6\
+\x09\x5c\xad\x0d\x32\xa5\xe3\x7b\xc7\x1f\x84\xef\xaa\x08\x25\x53\
+\x5b\xae\xb6\xfc\x75\x8f\x1a\x05\xc3\x4c\xee\xd7\x7a\xe5\xe8\x67\
+\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x90\xff\x8c\
+\x9a\xec\xd4\x4e\x41\x07\x39\xb5\x09\xe5\x39\xad\x0d\x4e\x00\x00\
+\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x01\xc7\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x01\x79\x49\x44\x41\x54\x58\x85\xe5\
+\xd6\x31\x4e\xc3\x30\x14\xc6\xf1\xff\xb3\x9b\x72\x03\x3a\x70\x82\
+\x82\x84\xc4\xd4\xb9\xe5\x00\x48\x70\x85\x0e\xb0\x54\xdc\x20\x1c\
+\xa1\x1b\x54\xe2\x12\x88\x05\x09\xa9\x99\x91\x3a\x51\x28\x27\x60\
+\x80\x89\xb9\x21\x35\x43\x15\xa1\xb6\x69\x63\xa7\x4e\x18\xf0\x68\
+\x3f\xf9\xf7\xc9\xb6\x9e\x0c\xff\x7d\x48\x95\x58\xab\xdb\x6f\x24\
+\x5a\xdf\x81\x79\x1f\x0d\x7a\x67\x00\xaa\x52\x5c\xe9\x08\x4c\x0b\
+\x64\x2f\x9d\xaf\x55\x8a\x8b\x69\x62\xe4\x4d\xcf\x92\x93\x74\xad\
+\xf4\x2b\xc8\xc0\xdb\x4f\xb7\x97\x1f\x95\x04\xc8\xc3\x4b\x0d\x60\
+\x83\x97\x16\xc0\x16\x2f\x25\x80\x0b\xee\x3d\x80\x2b\xee\x35\x40\
+\x11\xdc\x5b\x00\x5b\xfc\xf0\xfc\x7a\xb7\x6e\xe2\x07\xe0\x6b\x34\
+\xe8\x75\xc0\x43\x27\x74\xc4\x87\xc0\x11\x50\x4f\xe7\xb7\x0a\x50\
+\x00\x3f\x00\x5e\xa6\x12\x9c\xa6\x6b\x85\xaf\x60\x0b\xfc\xf8\xf9\
+\xe6\xe2\x73\xab\x00\xbe\xf0\x42\x01\x5c\xf0\xc0\xc4\x91\xc0\x3e\
+\xf0\x3a\x95\xa0\xb3\x8c\x3b\x07\xf0\x8d\x3b\x05\x28\x03\x07\xd0\
+\x3e\xf1\x56\xb7\xdf\x10\x31\xd6\x38\x58\x9c\x80\x0b\xfe\xad\xd5\
+\xd0\x05\xcf\x0d\x50\x04\x37\x30\x89\x25\x68\x67\xe1\x4e\x9d\xb0\
+\x24\x7c\xa5\x13\x66\xfe\x09\xcb\xc0\x03\x13\x47\xcc\xaf\x67\xa1\
+\x13\xae\x3c\x42\x17\x3c\x51\x3a\x12\xd9\x8c\x67\x3c\xcc\x85\x66\
+\xa4\xb2\x36\xb5\xc5\x11\xd3\x34\x30\xa9\x25\xb3\xcc\x07\x67\xf3\
+\x30\x25\x6b\x53\x57\xdc\xa6\x6e\xdd\x09\xcd\x4f\x20\x0c\x55\xa2\
+\xd5\x63\xfe\x67\xc2\x48\x52\x53\xf7\x79\xf8\x72\xdd\x3a\xfc\x37\
+\xc0\x7c\xec\x00\xe3\x8d\x3f\x99\xf0\x4a\x8c\xa1\x0e\x8c\xd7\xe3\
+\xab\x75\x36\xfd\x00\xc2\x50\x81\xb1\x68\xcd\x46\xfc\xd6\xfd\xf1\
+\xf8\x01\x9a\x8b\x01\xab\xe8\x4a\xa0\x68\x00\x00\x00\x00\x49\x45\
+\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x02\x2a\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x01\xdc\x49\x44\x41\x54\x58\x85\xed\
+\x95\xbf\x6b\x53\x51\x14\xc7\x3f\xdf\x9b\x68\x4a\x07\xab\x06\x2a\
+\xb5\xab\x2e\x82\x54\x92\x06\x51\xe9\x6c\x8b\x9d\x44\x07\x51\x70\
+\x32\x3f\x14\x2b\xfe\x05\x21\x9b\x93\xc5\x18\x85\x66\xea\xe6\xe2\
+\xa0\xa0\x54\xbb\x05\xec\x52\x1a\xd4\xbf\x40\xa7\xaa\x83\xe2\x24\
+\xb4\x4d\xee\x71\xc8\xb3\xa9\x69\xaa\xcd\x6b\xc4\xe5\x7d\xe0\x0d\
+\xef\xde\x7b\xce\xf9\x70\xee\xbb\xef\x42\x44\x44\x44\xc4\x7f\x46\
+\x61\x03\xcf\xe4\xef\x8f\xae\x5b\xfc\xa5\x60\xac\xb9\x4f\xa3\x6f\
+\x2b\xb7\x57\xc3\xe4\x71\x61\x82\x4e\xe7\x1e\x1c\x5f\xb7\xf8\x1b\
+\xc1\x18\x80\xdb\xb0\xa5\xd4\xcd\x47\xc7\xc2\xe4\xea\xb9\x03\x99\
+\x1b\xb3\xa7\x70\xb1\xd7\x06\xc3\x1d\x53\x5f\x1c\x9c\x5f\x9e\x9b\
+\x79\xdf\x4b\xbe\x9e\x3a\x90\x2a\x94\x27\xcc\xc5\x6a\x06\xc3\x18\
+\x06\x34\x5b\x8f\x0c\x38\xe2\xa1\x96\x2a\x94\x27\xfe\x89\x40\x2a\
+\x5f\x99\x76\x9e\x45\xe0\x80\x81\x21\x7c\x7b\xd6\xbc\x99\x0c\x18\
+\x72\x9e\xc5\x74\xb6\x7c\xa1\xaf\x02\x99\xdc\xc3\x6b\xce\xfc\x33\
+\x60\x00\x30\xb1\xb5\x78\x0b\xc9\x7c\xd0\x95\x01\x89\xe7\x99\x7c\
+\xf9\xea\x6e\x72\xc7\xfe\xb6\x20\x9d\x2d\xcf\x20\xaa\x81\xac\xd1\
+\xa5\x78\xdb\x02\xc3\x10\xc2\x01\x17\x47\xc6\x27\xbf\x7d\xaa\xbf\
+\x5a\x0e\x29\x60\x4a\xe7\x92\x25\x89\x7b\xc1\x80\x0f\x04\xfe\x8c\
+\x30\x13\x08\x24\x34\x75\x34\x33\xa9\xd5\x95\x85\x1a\x94\x76\x58\
+\xde\x8d\x62\xd1\x8d\x7f\x4e\x96\x81\x5b\xb4\xaa\x7a\xed\xa6\xf8\
+\x56\x7d\x4c\x42\x2e\x78\xa9\xac\x8c\x7c\xbd\x43\xa9\xb4\x7d\xeb\
+\x3a\x07\x4e\x5c\x2e\xee\x1f\x3c\x9c\x9c\x07\xae\x00\x98\xf0\xb2\
+\xde\x8a\x6f\x4a\x08\xc9\x36\xbf\xb3\x27\x66\x89\xeb\xf5\x6a\x6e\
+\x63\x47\x81\x74\x76\x6e\x50\x6e\xed\x29\xc6\x14\x06\x26\xf3\x6a\
+\x1d\xb1\xd0\xfc\xd6\x09\xb1\x60\x3e\x71\xa9\x5e\xcd\xfd\xd8\x26\
+\x70\xb2\xf0\xf8\x50\xc2\x1a\x2f\x30\xce\x06\x81\x7b\x2e\xde\x96\
+\x40\x6a\x9f\xb8\xa5\xc6\x5a\x73\xfa\xdd\xfc\xdd\xef\x00\xf1\x5f\
+\x8b\x12\xbe\xf1\x01\x18\x6a\x9b\x29\xd4\x6f\xba\x1b\x1d\xfb\x7c\
+\x2e\x9e\x88\x7f\x04\x0e\x42\xc8\xbb\x60\xef\xf4\xa5\xb1\x11\x11\
+\x11\x11\xfd\xe1\x27\x68\xea\x98\xa0\x5e\x6e\x43\xde\x00\x00\x00\
+\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x01\x47\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x00\xf9\x49\x44\x41\x54\x78\x9c\xed\
+\xd6\x21\x4e\xc4\x50\x14\x85\xe1\x73\x5b\xa6\x04\x04\x0a\x6c\x43\
+\x9a\x54\x92\x20\xd8\x03\x2c\x80\x75\x60\x58\x00\x61\x01\xb3\x09\
+\x3c\x92\x64\x58\x06\xba\x06\x53\x12\x32\x0e\x41\x86\x0e\xf3\x2e\
+\x96\xbc\x07\xb8\xbe\x49\xe8\xff\xc9\x73\x2b\x4e\x8f\x69\x25\x00\
+\x00\x00\x00\x00\x00\x00\x00\x00\x60\x12\xec\xaf\xa3\xbb\x9b\xa4\
+\x32\x53\x97\xb1\x04\x33\x0b\xbf\x1d\x7f\x1c\xa0\xef\xfb\xc3\xe1\
+\x73\x33\x37\xd9\xa5\xa4\xfd\xd1\xaa\xe5\xb1\x92\xf4\x50\x98\x5f\
+\xd5\x75\xfd\x12\x1f\x93\x01\xba\xae\x3b\x98\x55\x7b\x4f\x92\x1f\
+\xe7\x68\x97\x8d\x6b\x19\xc2\xfa\xa4\x69\x9a\xd7\xef\x71\x11\x3f\
+\x57\x55\xbb\xb7\xff\xee\xe5\x25\xc9\x74\x54\x94\xb3\x79\x1c\x27\
+\x03\xb8\x74\x9e\xa7\xd1\x56\x5c\xc4\x41\x32\xc0\xd4\x24\x03\x98\
+\xf4\xb8\x8d\x22\x99\x2c\xe2\x20\x19\x60\x18\x3e\x6e\x24\x7b\xce\
+\x52\x27\x27\xd7\x32\x6c\xd6\xd7\x71\x9c\x0c\xd0\xb6\xed\xdb\x4e\
+\xa9\x33\x97\xdf\x49\x7a\xcf\x52\x6e\x5c\x2b\x49\xf7\x45\xe1\xa7\
+\xf1\x17\x40\xe2\x47\x08\x00\x00\x00\x00\x00\x00\x00\x00\x00\x98\
+\x8a\x2f\xe6\x4f\x38\x6a\x74\xad\x97\x2f\x00\x00\x00\x00\x49\x45\
+\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x00\xef\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x00\xa1\x49\x44\x41\x54\x78\x9c\xed\
+\xd0\x41\x11\x00\x20\x00\xc3\x30\x0e\x4d\x78\xc2\x0f\x86\x41\x46\
+\x78\x34\x06\xd6\xdb\x18\xd0\xda\xe7\xae\x7d\xae\x6c\x98\x72\xfc\
+\x07\x1d\xa0\x03\xb4\x0e\xd0\x01\x5a\x07\xe8\x00\xad\x03\x74\x80\
+\xd6\x01\x3a\x40\xeb\x00\x1d\xa0\x75\x80\x0e\xd0\x3a\x40\x07\x68\
+\x1d\xa0\x03\xb4\x0e\xd0\x01\x5a\x07\xe8\x00\xad\x03\x74\x80\xd6\
+\x01\x3a\x40\xeb\x00\x1d\xa0\x75\x80\x0e\xd0\x3a\x40\x07\x68\x1d\
+\xa0\x03\xb4\x0e\xd0\x01\x5a\x07\xe8\x00\xad\x03\x74\x80\xd6\x01\
+\x3a\x40\xeb\x00\x1d\xa0\x75\x80\x0e\xd0\x3a\x40\x07\x68\x1d\xa0\
+\x03\xb4\x0e\xd0\x01\x5a\x07\xe8\x00\xad\x03\x74\x80\xd6\x01\x3a\
+\x40\xeb\x00\x1d\xa0\x75\x80\x0e\xd0\x1e\x06\x73\x04\xd7\x28\x98\
+\xcd\x67\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x03\x52\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x03\x04\x49\x44\x41\x54\x78\x9c\xed\
+\x9b\xbd\x4f\x14\x51\x14\xc5\xcf\x99\xac\x05\x6c\xa9\x1b\xbe\x7a\
+\x1b\x59\x1a\xe2\x62\x21\x35\x35\x9f\x46\x12\xb1\x93\x68\x02\x5a\
+\xc2\x5f\xa0\x35\x98\x08\xa5\x9a\x48\xc2\x67\x2c\xa9\xb1\x20\x24\
+\x34\x2c\x54\xd6\x2c\x12\xb4\xdc\xa5\x60\x9d\x63\xe1\xb2\x3b\xcc\
+\x0c\x1f\x22\xbb\x77\x37\xbc\x5f\xb5\xf7\xdd\x3b\xc9\x79\x27\xef\
+\xcd\x6c\x71\x2f\xe0\x70\x38\x6e\x33\xbc\x4a\x51\xd7\xba\x92\x4d\
+\x79\x8c\x80\x1a\x22\xd0\x29\xa1\x1d\x40\xa2\xca\xda\xfe\x95\x22\
+\x89\x9c\x80\x5d\x88\xcb\xc7\x49\x2c\xee\xf4\x31\x7f\xd9\x43\x17\
+\x1b\x20\x31\xb3\x86\x31\x42\x6f\x01\xb4\xdd\x94\xd2\x1a\x71\x20\
+\x70\x6a\xab\x1f\x9f\x41\xea\xbc\xa2\x73\x0d\xe8\x9e\xd7\x9d\x44\
+\xca\x9f\x05\x38\x5e\x1d\x7d\xb5\x42\xf3\xc5\x23\x6f\x62\x7b\x9c\
+\x27\x71\xd9\xf8\x63\x2c\x31\xb1\xea\xbf\x07\xf8\x22\x94\xc9\x4a\
+\xfa\x46\x7a\x3f\x48\xf8\x37\x2d\xf5\x7f\x90\xe0\x49\x7e\x2b\xc9\
+\xc7\x00\xd2\x95\x0c\xc7\x13\x29\x1f\x90\x5e\xc6\x9d\x84\xd8\x13\
+\x90\x59\xd5\x18\xa1\x8f\x81\xa5\x5f\x12\x27\xb7\x06\xb0\x70\xd1\
+\x71\xaa\x0b\x24\x66\x56\xf1\x94\xd4\x0c\x80\xbb\xe5\x65\xf0\xf9\
+\xd6\x00\x3f\x85\xcb\x23\x06\xfc\x7d\xe1\xe9\x3b\x2a\x77\xfe\x67\
+\x51\xec\xda\x1e\xe4\x41\xd5\x44\x57\x81\xee\x15\xb5\x25\xa8\x1d\
+\x00\xf7\x4a\x4b\xb9\xe3\x24\xef\x87\x5f\x8c\x5e\xf8\xc1\xa6\x3c\
+\x46\x10\x78\xe1\x49\x7c\xdd\x68\x9b\x07\x80\xed\x41\x1e\x10\x7c\
+\x13\x58\x6a\x6f\x2e\x60\x38\x5c\x17\x31\x00\xd4\x50\x20\xca\x6e\
+\x0d\x60\xa1\x0a\xfa\x6a\xc2\x66\x3f\xbe\x00\xc8\x9e\xc6\x82\x2e\
+\x37\x80\x40\x67\x25\xd0\x46\xdd\xdf\xf9\x8b\x20\x05\x6a\xa3\x1c\
+\x0b\x0f\xc2\x25\x11\x03\x4a\x7f\x72\x4a\x81\x77\x58\x2d\x6d\x35\
+\xe3\xec\x1e\x3a\xc2\xe9\xe8\x15\x08\x7c\x1a\xeb\xed\x53\x77\x1d\
+\x42\x7b\x88\x7c\xf6\xe3\x0c\xb8\x55\x38\x03\xac\x05\x58\xe3\x0c\
+\xb0\x16\x60\x8d\x33\xc0\x5a\x80\x35\xce\x00\x6b\x01\xd6\x38\x03\
+\xac\x05\x58\xe3\x0c\xb0\x16\x60\x8d\x33\xc0\x5a\x80\x35\xce\x00\
+\x6b\x01\xd6\x38\x03\xac\x05\x58\xe3\x0c\xb0\x16\x60\x8d\x33\xc0\
+\x5a\x80\x35\xce\x00\x6b\x01\xd6\x38\x03\xac\x05\x58\xe3\x0c\xb0\
+\x16\x60\x8d\x33\xc0\x5a\x80\x35\xce\x00\x6b\x01\xd6\x38\x03\xac\
+\x05\x58\x13\x67\x40\xf1\xf4\x87\xd4\xf8\x06\x85\xf6\x50\x0c\xe7\
+\xa3\x6d\x72\x44\xae\x12\xf8\x2d\xd5\x91\x55\x43\xce\xee\x61\x3f\
+\x9c\x8e\xb6\xc9\x01\xbb\x95\x80\xbd\x90\xae\x34\x53\x50\x97\x48\
+\x84\xd8\x5b\x8e\x89\xbd\x70\x49\xf4\x88\x8b\xcb\x81\x28\xfd\x68\
+\x15\x23\x55\x11\x57\x03\x7a\xd6\xf0\x04\x81\xce\x71\x82\x4b\xe1\
+\x9a\x88\x01\xc7\x49\x2c\x02\x28\xf7\x06\xfb\xd4\x6c\xcf\x57\x35\
+\xdc\x55\x78\xb8\xa8\x56\x41\x33\x81\xa5\x5c\xa1\x19\x97\x1b\xb0\
+\xd3\xc7\xbc\xc0\xa9\xd3\x98\x40\x4a\xbf\x95\xcd\xac\x68\xb4\x21\
+\xae\x83\xc4\xcc\x8a\x46\x99\xd0\x0e\x81\x54\x79\x19\x9c\x8e\x1b\
+\xa1\x89\xdf\x90\xc4\x9e\x35\xff\x43\xcc\xb4\x48\x16\xd4\x06\xe4\
+\x1d\xd6\x5b\x17\xa9\x04\x0f\xf4\x5b\x4a\x77\x3e\x1d\xcc\x11\x9a\
+\xdb\xec\xf7\x5e\xc5\xf5\x3d\xc7\x4f\x8c\x90\x2a\xce\x6b\x22\x91\
+\xf2\x11\x32\x21\x0d\x31\x0d\x08\xaa\xc7\x16\xea\x98\x03\x4a\x68\
+\xee\xe4\xc8\x9b\x3c\xaf\xe9\xfb\x2a\x43\x53\xcf\x08\xbd\x43\xe3\
+\x0d\x4d\xe5\x04\x4e\x5f\x7b\x68\x2a\x48\xd7\xba\x92\xcd\x05\x0c\
+\x0b\x1a\x2e\xb5\x9c\x77\xa0\x0e\xc7\xe6\x00\xec\x83\xd8\x23\xb8\
+\x54\x68\xc6\xd2\x55\xc6\xe6\x1c\x0e\xc7\xed\xe6\x0f\xfd\x5b\xf6\
+\x1a\x3c\xff\xda\x47\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\
+\x82\
+\x00\x00\x00\xc5\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x00\x77\x49\x44\x41\x54\x78\x9c\xed\
+\xd0\xb1\x0d\xc2\x40\x10\x04\xc0\x3d\xe8\x01\x51\x0a\x75\x20\x3a\
+\x20\x72\x45\xee\x82\x90\x1e\xe8\xc4\xa2\x07\x78\x52\xf4\x8e\x8d\
+\x25\x3c\x13\xae\x2e\xd8\xdb\x04\x00\x00\x00\x00\x00\x00\xd8\x82\
+\xea\x83\xd3\xad\x9d\x5b\xda\x98\xe4\xb0\x42\x9f\x25\x4d\x79\xd7\
+\xf5\x71\xa9\xfb\x77\xb8\xeb\xaf\xfe\xf4\xf9\x24\x39\xd6\xbe\x8d\
+\x7d\x38\x1b\x60\x6b\x66\x03\x54\x6a\x48\xf2\x5c\xa1\xcb\xd2\xa6\
+\xf6\xaa\x61\xed\x12\x00\x00\x00\x00\x00\x00\x00\xc0\xef\x7d\x00\
+\x4e\xfe\x12\x08\x2a\x3f\xe7\x81\x00\x00\x00\x00\x49\x45\x4e\x44\
+\xae\x42\x60\x82\
+\x00\x00\x05\x27\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x04\xd9\x49\x44\x41\x54\x78\x9c\xed\
+\x9b\x4f\x68\x14\x57\x1c\xc7\xbf\xbf\x99\xd1\x42\xd3\x22\x76\x85\
+\xdd\x90\xa2\x87\xc6\x43\x45\xb0\x24\x5b\xf6\xe0\x65\xa1\xb5\x17\
+\x6d\x2e\x6d\x6a\x4b\x55\x3c\x84\xac\x8d\x36\xe6\xd2\x82\x81\x66\
+\xb2\x81\x62\x6b\x2f\xd9\x60\xc4\xb5\x81\x16\x1a\x5a\x34\xf6\x12\
+\x22\x94\xb4\x87\xa0\xbd\x2c\xd9\x78\x90\xba\xbd\xd8\x83\x21\xd6\
+\xac\x10\x45\x30\x48\xc2\xce\xfc\x7a\x48\x5e\x3b\xbb\x3b\xbb\x3b\
+\x9b\xf9\x9b\x66\x3f\xb0\x87\x79\xf3\x9b\x79\xbf\xf9\xee\xf7\x37\
+\xf3\x66\x78\x0f\x68\xd0\xa0\xc1\x56\x86\xac\x04\xc5\x55\x55\x59\
+\x5e\x0c\x75\xe8\xc0\x51\x02\x45\x01\x6e\x01\xf0\x82\xcb\xb9\xd5\
+\xcb\x0a\x40\x0f\x18\x9c\x95\x80\xab\x4d\x91\xa5\xc9\x99\x64\xb2\
+\x50\xeb\xa0\x9a\x02\x44\x13\x17\x0f\x81\x39\x05\xe2\xd7\x9d\xc9\
+\xd3\x1b\x18\xc8\x11\xa4\xbe\x6c\xfa\xcc\xaf\xd5\xe2\xa4\x2a\xa7\
+\xa0\x68\xf7\x48\x3f\xa0\x4f\x6f\xb6\x8b\x07\x00\x02\xf6\x01\xfa\
+\xf4\x9b\x89\xd4\x39\x80\x2b\xfe\xd1\x72\xa5\x1d\xd1\xee\x50\x3f\
+\x08\x5f\xba\x93\x9e\x97\xd0\x5b\x2d\xd1\xcc\xca\xdf\x73\xbf\xfc\
+\x6e\xba\xd7\xac\x31\x9a\xb8\x78\x08\xd0\xa7\x4b\x9a\x9f\x80\x30\
+\x20\x15\xe8\xc6\x9e\xa7\xe1\xf9\x89\x89\x0f\x34\xc7\x73\xb5\x41\
+\x67\xe7\x35\xf9\xfe\x8e\xfc\x6e\x5d\xe1\xc3\x60\x0c\x01\xd8\x59\
+\x1c\x21\xbd\x63\x56\x0e\x65\x02\xc4\x55\x55\x79\xf6\x70\xd7\x9d\
+\x22\xdb\x13\x7e\x93\x0b\xfa\xb1\xcc\x58\x5f\xde\xf9\xd4\x9d\x27\
+\xd6\x35\x1c\xd6\x14\x69\x1c\x8c\xb7\x45\x1b\x03\xb9\x97\x23\x4b\
+\x07\x4a\x6f\x8c\x65\xf7\x80\xe5\xc5\x50\x47\x49\xcd\x3f\x5e\xc5\
+\xb6\x8f\x37\xcb\xc5\x03\x40\x66\xac\x2f\x2f\x17\xf4\x63\x00\x9e\
+\x88\x36\x02\xf6\x2d\x2f\x86\x3a\x4a\x63\xcb\x04\xd0\x81\xa3\x45\
+\x0d\x04\xf5\xce\xe5\x4f\x1e\xb9\x91\xa8\x9b\x64\xc6\xfa\xf2\x0c\
+\x56\x8d\x6d\x65\xd7\x06\x13\x01\xd6\x9e\xf3\x86\x80\x02\xdd\x70\
+\x3e\x3d\x6f\x90\x35\x69\xca\xb8\x4d\x40\x7b\x69\x8c\xc9\x63\x90\
+\x5b\x8c\x5b\x7b\x9e\x86\xe7\x9d\x4e\xcc\x2b\x4c\x72\x7f\xb5\x34\
+\xc6\x6c\x1c\x50\x34\xc2\x0b\xda\xdd\xbe\x1e\x4c\x72\x2f\x1b\xbd\
+\x56\x19\x08\x6d\x0d\x14\xbf\x13\xb0\x42\x5b\xcf\x68\xab\x54\xd0\
+\x06\x40\x78\x6f\xbd\xe9\x3a\x33\x86\xe6\xae\xf4\xfe\x65\xf7\xdc\
+\x81\x77\x40\x2c\x91\xda\x2b\x69\xda\x4d\x10\x8e\x03\x78\x71\xfd\
+\x77\x82\x08\xb7\xda\x7a\x46\x5b\xed\x9e\x3f\xd0\x02\xc4\x55\x55\
+\xd1\x98\x7e\x02\xd0\x6c\xb2\xbb\x59\xd2\xb4\x2f\xec\xf6\x11\x68\
+\x01\x9e\x3d\x0c\x7d\x0e\x2a\x7f\x74\x19\x78\xdf\x6e\x1f\x81\x15\
+\x20\x7a\x2a\xb5\x1f\x84\x41\xb7\xfb\x09\xa4\x00\x71\x55\x55\xa0\
+\xd3\xf7\x00\xb6\x55\x8b\x23\xa2\x09\xbb\x7d\x05\x52\x00\x0b\xd6\
+\x07\x80\x55\x89\xf9\x82\xdd\xbe\x02\x27\x80\x55\xeb\x13\x78\x30\
+\x93\xee\xcd\xd9\xed\x2f\x50\x02\x58\xb5\x3e\x80\x6c\x53\xe4\xf1\
+\x37\x4e\xf4\x19\x28\x01\xac\x5a\x9f\x74\xe9\xa4\x95\x0f\x9e\x56\
+\x08\x8c\x00\xf5\x58\x7f\xf6\xdb\x33\x77\x9d\xea\x37\x10\x02\xf8\
+\x61\x7d\x81\x23\xef\x02\xed\xdd\x23\xaf\x11\x61\x00\x62\x60\xc2\
+\xf8\x59\x57\xe4\xa1\xdb\x97\x4e\xdf\xb3\x72\xbc\x1f\xd6\x17\xd8\
+\x76\x40\x5b\xcf\x68\x2b\x11\x6e\x01\x38\x01\x31\x56\x27\x1c\x97\
+\x34\xed\x66\x2c\x91\xda\x5b\xeb\x78\xbf\xac\x2f\xb0\x2d\x80\x54\
+\xd0\x06\x50\x61\xac\xae\x81\x7e\x8c\xab\x6a\x45\x97\xf9\x69\x7d\
+\x81\xfd\x7b\xc0\x7f\xaf\xa8\x66\x44\x97\x17\x5f\xf9\xac\xd2\x4e\
+\x3f\xad\x2f\x70\xfd\x26\xc8\xa0\xc1\xe8\xa9\xd4\xfe\xd2\x76\xbf\
+\xad\x2f\x70\x42\x80\xeb\x35\xf6\x6f\x07\xd3\x77\xc6\x52\x08\x82\
+\xf5\x05\xb6\x05\x90\x81\xaf\x01\xac\xd6\x08\x2b\x2a\x85\x20\x58\
+\x5f\x60\x5b\x80\x4c\xba\x37\x07\x46\xb2\x56\x9c\x28\x85\xa0\x58\
+\x5f\xe0\xc8\x3d\xe0\xa5\xe6\xa5\x0b\x60\xcc\xd5\x08\xdb\x0e\x96\
+\x7e\x60\xa6\x71\x04\xc0\xfa\x02\x47\x04\x98\x49\x26\x0b\x90\xf8\
+\x24\x6a\x96\x02\xbf\x41\xc0\x81\x1a\xa7\xf3\xc4\xfa\x02\xc7\x9e\
+\x02\xd9\xcb\x67\xff\xb0\x52\x0a\xb5\xf0\xca\xfa\x02\x47\x1f\x83\
+\x16\x4b\xa1\x1a\x9e\x59\x5f\xe0\xa8\x00\xd6\x4b\xc1\x14\x4f\xad\
+\x2f\x70\x7c\x20\xb4\xd1\x52\xf0\xda\xfa\x02\x57\x46\x82\x1b\x28\
+\x05\xcf\xad\x2f\x70\x45\x80\x3a\x4b\xc1\x17\xeb\x0b\x5c\x7b\x17\
+\xb0\x5a\x0a\x7e\x59\x5f\xe0\xea\xcb\x90\x85\x52\xf0\xcd\xfa\x02\
+\x57\x05\x98\x49\x26\x0b\xba\x22\x7f\x08\xc0\x6c\x92\xc5\xbc\x2e\
+\xcb\x1f\xf9\x65\x7d\x81\xeb\xaf\xc3\xb7\x2f\x9d\xbe\x27\x6b\x38\
+\x48\xe0\x29\x00\xcf\x01\x3c\x27\xf0\x94\xac\xe1\xa0\xd5\x4f\x66\
+\x6e\xe2\xc9\xfc\x80\xcc\x58\xef\x02\x80\x77\xbd\xe8\xab\x5e\x02\
+\xf1\x55\xd8\x4f\xcc\x04\x58\x31\x6e\x74\x76\x5e\xab\x38\x9d\x36\
+\xe8\x98\xe4\xbe\x52\x1a\x63\x22\x00\x3d\x30\x6e\xdd\xdf\x91\xdf\
+\xed\x68\x56\x1e\x62\x92\xfb\x42\x69\x4c\x99\x00\x0c\xce\x1a\xb7\
+\x75\x85\x0f\x3b\x9c\x97\x67\x68\xb2\x7e\xc4\xb8\xcd\x28\x7f\x24\
+\x97\x09\x20\x01\x57\x8b\x1a\x18\x43\xb1\xae\xe1\xb0\xe3\xd9\xb9\
+\x4c\xac\x6b\x38\x4c\xa0\xa2\x81\x58\xd9\xb5\xc1\x44\x80\xa6\xc8\
+\xd2\x24\x98\xfe\x34\x34\xed\xd4\x14\x69\x7c\x33\x89\xf0\xef\x64\
+\x69\xc3\x8c\x71\x06\x72\x4d\x91\xa5\xc9\xd2\xd8\xba\xa6\xcb\x33\
+\x58\x95\x35\x69\x2a\xc8\xd3\xe5\x35\x59\x3f\xb2\xfe\xcf\x6f\x6c\
+\xba\xbc\x20\xda\x3d\xf2\x3f\x59\x30\x01\x10\xb8\x7f\x36\x7d\xf6\
+\xbc\xd9\xbe\x8a\xe3\x80\xec\x95\x4f\xcf\x13\xb8\xdf\xbd\xb4\x3c\
+\x81\x99\xe9\xdc\x6c\xba\xf7\xab\x4a\x01\x96\x16\x4d\x31\xf4\xe1\
+\xb5\x35\x38\x9b\x07\xab\x8b\xa6\x36\xb0\x6c\x0e\xed\x58\x9b\x75\
+\x1d\xc0\x65\x73\x58\x60\x60\xae\x9e\x65\x73\x0d\x1a\x34\xd8\xda\
+\xfc\x03\xf8\xad\xf2\xfb\x1a\x49\x36\xd6\x00\x00\x00\x00\x49\x45\
+\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x01\x87\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x01\x39\x49\x44\x41\x54\x58\x85\xed\
+\xd7\xbf\x4e\xc2\x50\x14\xc7\xf1\xef\xb9\x21\x30\x5a\x17\x7c\x86\
+\xbe\x40\x5f\x80\x8a\x4c\x26\xa8\x1b\x23\x98\xb0\xd6\x59\x1d\x64\
+\x87\x95\x44\x57\x46\x65\x34\x22\x4f\xd0\x17\xe8\x3b\xb0\x50\x47\
+\x08\xe1\x38\x94\x2a\x7f\x5d\x6c\xe3\xe0\xfd\x8d\x37\x37\xfd\x7d\
+\xd2\xbb\x9c\x03\xff\x3d\xb2\x7d\xe0\x5f\x5e\x9f\x09\xdc\x80\x7a\
+\x80\x93\x51\x4f\x0c\x12\x2a\x74\xc7\xcf\x8f\x6f\x07\x01\xfe\x55\
+\xb3\x23\x2a\xb7\xc0\x0c\x88\x50\x3e\x32\xa9\x17\x8e\x00\x17\x28\
+\xa1\x74\xde\x5f\x9e\xee\x77\x00\x95\x7a\xb3\x66\x8c\xbc\x0a\x8c\
+\x59\x16\x1a\xa3\x61\x7f\x92\x49\xf9\x2a\xd5\x7a\xbb\x8c\x59\x0c\
+\x14\x7c\x45\x6a\xe9\x9f\x30\xe9\x05\x63\x4c\x00\xcc\xf2\x28\x07\
+\x18\x0d\xfb\x13\x96\x85\x06\x30\x17\x34\xf8\xea\xfd\xbe\xa2\x1e\
+\x10\xe5\x51\xbe\x81\x40\x22\x14\x6f\x0f\x00\x27\xb3\x37\xff\x29\
+\xaa\x31\xc2\xf1\x3e\xc0\x9f\xc4\x02\x2c\xc0\x02\x2c\xc0\x02\x2c\
+\xc0\x02\x2c\x60\x1d\x10\xaf\xa6\xd7\x7c\x23\xe2\xa0\x4c\xf7\x00\
+\x24\x04\xdc\x6a\xbd\x5d\xce\xab\x3b\xf9\xb6\xba\x08\xe1\x0e\x40\
+\xa1\x0b\x94\x30\x8b\x41\x1e\x88\xca\x79\xeb\x04\xb3\x18\x00\x45\
+\x45\x7a\xe9\xf9\xc6\x62\x72\x7a\xd1\x7a\x40\xb8\x03\xe6\xc9\xf4\
+\xaa\x71\x26\xed\x22\x0e\xa8\x0b\x14\x0f\x2e\x26\x69\x92\xd5\x4c\
+\x03\x14\x6f\x7d\x7a\xfd\x55\x94\x29\x42\xa8\x48\x6f\x7b\x35\xb3\
+\xf9\x04\xc3\x25\x66\x2f\xe5\x8f\x2b\x3d\x00\x00\x00\x00\x49\x45\
+\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x03\x4e\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x03\x00\x49\x44\x41\x54\x78\x9c\xed\
+\x9b\x4f\x4f\x13\x51\x14\xc5\xcf\x41\x40\x09\x4b\xad\x94\x3f\xb6\
+\x0d\x0b\x37\x80\x2b\x96\xf2\x2d\x00\x23\x89\xb8\x93\x68\x22\xba\
+\x84\x4f\xa0\x6b\x35\x11\x97\x6a\x22\x89\xf0\x2d\x70\xc9\x8a\xc2\
+\xca\x05\x43\x0b\xa5\x50\x5d\x12\xb4\x20\xc7\x05\x2d\x0e\xd3\x81\
+\x56\xe2\xf4\xb6\xf2\x7e\xab\xd7\xfb\xde\x34\xe7\x9e\xbe\x37\xaf\
+\x8b\x7b\x01\x87\xc3\x71\x99\x61\x2d\x8b\xf2\xf9\x7c\xe7\x7e\xb1\
+\x38\x4e\x71\x14\xc4\x20\x84\x1e\x00\xad\x11\x6b\xfb\x5b\x0e\x41\
+\xe4\x20\xac\x8a\x5a\xec\x68\x6f\xff\x1c\x8f\xc7\xf7\xaa\x3d\x74\
+\xae\x01\x92\xe8\x65\xb6\x26\x09\xbd\x00\xd0\xfd\xcf\xa4\xd6\x87\
+\x6d\x82\x33\x89\x44\xef\x47\x92\x3a\x6b\xd1\x99\x06\x2c\x2f\x2f\
+\xb7\xc5\x62\x37\x5f\x0b\x9c\x8a\x46\x5f\x7d\x20\xf4\xae\x50\xd8\
+\x7d\x3a\x3c\x3c\x7c\x10\x36\x1f\xba\x8d\x8f\x7f\xf9\xcd\x37\x02\
+\x1e\x9d\x8a\x03\x69\x8a\x5f\x48\xe5\x25\x1d\x45\x21\xf8\xa2\x90\
+\x6c\x91\x18\x17\x75\x97\xc0\x50\x39\x2e\x70\x2a\x16\xbb\x09\x49\
+\x8f\xc3\x76\x42\xe8\x0e\xd8\xd8\xd8\x9c\x14\xf4\xde\x17\xfa\x0e\
+\x61\x3a\x99\xec\x9b\x3f\x6f\x3b\x35\x02\x92\xb8\xb1\xb1\x79\x1f\
+\xc4\x2b\x00\xd7\xcb\x71\x82\x0f\x93\xc9\xbe\x0f\xc1\xf5\x15\x06\
+\xe4\xf3\xf9\xce\x1f\x3f\x0f\xbe\xe2\xcf\x99\xff\x06\xfd\xba\x93\
+\x4a\xa5\xb6\x23\x53\x1d\x01\x9e\xe7\x75\x83\x57\x56\x00\xdc\x28\
+\x85\x72\xd7\xae\xb6\xdd\x0e\xbe\x18\x5b\x82\x0f\xee\x17\x8b\xe3\
+\xf0\xbf\xf0\x84\x67\xcd\x96\x3c\x00\xa4\x52\xa9\x6d\x08\xcf\x7d\
+\xa1\x9e\xfd\x62\x71\x2c\xb8\xae\xc2\x00\x8a\xa3\xe5\xb1\x80\x74\
+\x32\xd9\x37\x1f\x91\xc6\xc8\x49\x26\xfb\x3e\x09\x48\x97\x3f\x53\
+\xac\x6e\x00\x88\x41\xdf\x03\x4b\x8d\x7e\xe6\xcf\x83\xa4\x28\x2e\
+\xf9\x42\x03\xc1\x35\x95\x06\x1c\xff\xc9\x29\x7d\x81\x76\xa2\x91\
+\x56\x3f\x02\x39\xf4\x06\xe7\x2b\x0d\xf0\x5d\x8d\x8d\x76\xd5\x5d\
+\x84\x40\x0e\x15\xd7\x7e\x98\x01\x97\x0a\x67\x80\xb5\x00\x6b\x9c\
+\x01\xd6\x02\xac\x71\x06\x58\x0b\xb0\xc6\x19\x60\x2d\xc0\x1a\x67\
+\x80\xb5\x00\x6b\x9c\x01\xd6\x02\xac\x71\x06\x58\x0b\xb0\xc6\x19\
+\x60\x2d\xc0\x1a\x67\x80\xb5\x00\x6b\x9c\x01\xd6\x02\xac\x71\x06\
+\x58\x0b\xb0\xc6\x19\x60\x2d\xc0\x1a\x67\x80\xb5\x00\x6b\x9c\x01\
+\xd6\x02\xac\x71\x06\x58\x0b\xb0\xc6\x19\x60\x2d\xc0\x1a\x67\x80\
+\xb5\x00\x6b\xc2\x0c\x38\x2c\x0f\x48\x36\xbd\x41\x81\x1c\x0e\x83\
+\xf3\x61\x65\x72\xb9\xf2\x50\x62\x57\x34\xb2\xea\x47\x20\x87\xad\
+\xe0\x7c\x58\x99\xdc\xea\xc9\x90\x1a\x91\x54\x53\x4f\x41\x23\x22\
+\x89\xa2\x46\x7c\xa1\xb5\xe0\x9a\x0a\x03\x44\x2d\x96\xc7\x04\x86\
+\xbc\x6c\x76\x3c\x22\x7d\x91\xe3\x65\xb3\xf7\x4e\x55\x8e\x53\x0b\
+\xc1\x35\xd5\x8b\xa5\x85\xc2\xd1\xd1\xc1\x50\x7f\x7f\x7f\x53\x15\
+\x4d\xae\xaf\xaf\xc7\xc9\xd6\x15\x10\xb1\x52\xa8\xb6\x62\xe9\x78\
+\x3c\xbe\x47\x70\xe6\x24\x40\xc4\x5a\x5a\xda\xd2\x9e\x97\x9d\x68\
+\x86\xe3\x20\x89\x9e\x97\x9d\x08\x24\x0f\x82\xb3\x61\x2d\x34\xa1\
+\x09\x49\x62\x26\x93\x7d\x1b\xec\x16\x29\x35\x4c\x2c\x91\xda\x69\
+\xb4\x2a\xd2\x52\xc3\x44\x97\xa8\x11\xff\xb6\x07\x00\x42\x73\x89\
+\xc4\xad\x27\x35\x37\x4c\x00\xff\x55\xcb\xcc\x5c\xa1\xb0\x3b\x7d\
+\x56\xcb\x4c\xd5\xa6\xa9\x4c\x66\xeb\x81\xa0\x97\x68\xbe\xa6\xa9\
+\x1c\xc1\xd9\x0b\x37\x4d\xf9\x29\xb5\xcd\x8d\x95\xea\xed\x07\x70\
+\x5c\x75\xdd\x78\x6d\x73\xc7\xf7\xfc\x9a\xa8\x85\x8e\xf6\xf6\x85\
+\x5a\xda\xe6\x1c\x0e\xc7\xe5\xe6\x37\x49\x9a\x11\x82\x28\x6e\xc8\
+\x6e\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x00\x78\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x00\x2a\x49\x44\x41\x54\x58\x85\xed\
+\xce\x41\x11\x00\x20\x0c\x04\xb1\x16\xff\x22\xe9\x20\x04\x64\x1c\
+\x8f\xc4\xc0\x6e\x15\x00\x10\xd6\x7b\xce\x4d\x0e\xac\x64\x1c\x00\
+\xf8\xc2\x03\x48\xae\x03\xa7\xd4\xed\xa0\x47\x00\x00\x00\x00\x49\
+\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x06\x65\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x06\x17\x49\x44\x41\x54\x78\x9c\xed\
+\x9a\xc9\x73\x5c\xd5\x15\x87\xbf\x73\x5b\x31\x32\x83\x4c\x6c\x50\
+\x00\xf5\x1b\x5a\x15\x6f\xb0\x31\x93\xc1\x98\xa4\x12\x2c\x1c\x24\
+\x83\x6d\xe5\x6f\x61\x05\x8b\x64\x91\xf2\x82\x0d\xcb\xe4\xef\xa0\
+\x98\xca\xd6\x18\x46\x43\x85\xa4\x42\x80\x2a\xaa\x28\xd4\x6f\x90\
+\x29\x07\xc7\x0e\x96\x71\x2c\x19\xeb\x1e\x16\x52\x3b\xe2\x75\xab\
+\xfb\xbe\xee\xf7\x24\x51\xe8\x5b\xde\x77\xfa\xbe\xf3\xfb\xfa\xdc\
+\x1e\xa4\x86\x6d\xb6\xd9\xe6\xa7\x8c\xb4\x5a\x3c\x7f\xfe\xfc\x6d\
+\x8b\x8b\xd7\x9f\x57\x91\x13\x40\x3f\x70\x56\x74\xf9\xa5\x30\x0c\
+\xeb\x1b\xdb\x5e\x77\x44\x51\x54\x53\xa9\xbc\x00\x1c\x06\x16\x0d\
+\xbc\xb1\x73\xe7\x2d\x2f\x0f\x0e\x0e\x7e\x9b\xad\x6d\x12\xf0\xf9\
+\xe7\x17\xee\xe8\xdf\xb9\xf8\x16\xf0\x70\xe6\xd2\x65\x35\x8c\xd6\
+\x3c\xef\xc3\x72\xda\x2e\x86\x24\x49\x1e\xb3\x2a\x93\xc0\xae\x1f\
+\x5c\x10\x3e\xfe\x6e\x69\xf1\x37\x7b\xf7\xee\x5d\x58\xbb\x6c\xb2\
+\x1b\xf4\xf7\x5f\x7b\x81\xe6\xf0\x00\xbb\xc4\x32\x51\x4f\xd3\x43\
+\x45\x36\x5c\x24\xeb\x86\x07\x50\x1e\xdc\xb1\xa3\xff\xc5\xec\x72\
+\x93\x00\x44\x4e\xb6\xb9\xc7\xc0\x56\x95\xd0\x36\xfc\x2a\x8a\x8e\
+\x67\xd7\x9a\x05\xc0\xce\x0e\xf7\x1a\x10\xcb\xc4\x5c\x9a\x3e\x9e\
+\xb3\xc7\xd2\x48\x92\xe4\x60\xa7\xf0\x2b\x48\x7f\x76\xa5\x49\x80\
+\xa2\xef\x39\xdc\x73\xc0\x58\x26\xb7\x82\x84\xd5\xf0\x53\x74\x0c\
+\x0f\x40\x53\xb6\x26\x01\x7d\x46\x4e\x01\x97\x1d\x36\xdb\x74\x09\
+\x39\xc3\x2f\x54\x0c\x7f\xca\x2e\x36\x09\xf0\x3c\xef\x0b\x6b\x78\
+\x06\x77\x09\x9b\x72\x1c\xdc\xc7\x1e\x80\x05\xb5\x32\xea\x79\xde\
+\x17\xd9\x0b\x2d\x3f\x07\x00\xcc\xa5\xe9\xe3\xc6\x32\x09\x0c\x38\
+\xdc\xe0\xb2\x11\xfd\x9d\xef\xfb\x7f\x73\xa8\xed\x99\x38\x8e\x1f\
+\x55\xcc\x14\x70\xa7\x43\xf9\x15\xb5\xf2\x4c\xad\x56\xfd\xa0\xd5\
+\xc5\x75\x05\xc0\xd6\x94\x50\x64\x78\xe8\x20\x00\xb6\x96\x84\xa2\
+\xc3\x83\x83\x00\x80\x7a\x9a\x1e\x12\xcb\x04\xee\x12\x8e\xfa\xbe\
+\xff\x91\xcb\xde\xae\x44\xd1\x57\x8f\x20\xcb\x53\xc0\xcf\x1d\xca\
+\xaf\xa0\x32\x1a\x86\xd5\xb3\x9d\x0a\x9d\x04\xc0\xe6\x4a\x28\x2b\
+\x3c\xb4\xfe\x20\xd4\x92\x9a\xe7\x7d\xa8\x56\x46\x81\x85\x8e\xc5\
+\xb0\xcb\xaa\x4c\x25\x49\x72\xd0\x75\xff\xf5\xc8\x1f\xde\x8c\xb9\
+\x86\x87\x1c\x13\xd0\xa0\x5e\x9f\x7f\x42\x8c\x4e\x00\x77\x38\x94\
+\x7f\xb3\xfa\x9a\xd0\xd5\x24\xe4\x0c\xff\x2d\x6a\x46\xc3\x70\xe8\
+\xfd\x3c\xf7\xc8\x2d\x00\xf2\x4b\x10\xec\xd1\x20\x08\xfe\x9e\xe7\
+\x1e\x1b\x11\x1e\xba\x14\x00\xe5\x4a\x88\xa2\x73\x0f\x23\x76\x9a\
+\x92\xc3\x43\x0f\x02\x00\xa2\x68\xfe\x30\xa2\x67\x28\x50\x42\xde\
+\xf0\x82\x19\x0b\x82\x21\x97\xef\x2f\x2d\xe9\x49\x00\x14\x2b\x61\
+\xa3\xc3\x43\x8e\x77\x81\xf5\x08\xc3\xea\x59\xd4\x8c\x01\x57\x1c\
+\xca\xef\x54\xcc\x64\x14\x7d\xf5\x48\xf6\xc2\x6a\x78\xe7\x33\x2f\
+\xd8\x63\xbd\x86\x87\x02\x26\xa0\x41\x14\x9d\x7b\x12\xb1\x67\x80\
+\xdb\x1d\xca\xff\x8b\x56\x8e\x86\xe1\x7d\xff\x00\xa8\xd7\xe7\x1f\
+\x12\xa3\xd3\xc0\x6e\x87\xc7\x5e\x15\xec\x58\x10\x04\xef\xf6\xd2\
+\x6f\x83\xc2\x04\x40\x77\x12\x54\xad\xdd\xac\xf0\x50\xb0\x00\xc8\
+\x29\x41\x59\x50\x14\x11\x71\xf9\x74\x59\x78\x78\x28\x41\x00\x40\
+\x1c\x9f\xfb\x95\x62\x4f\xe3\x36\x09\x2e\x5c\x35\xa2\xc7\x7c\xdf\
+\x7f\xa7\xa0\xfd\x6e\x52\x8a\x00\x28\x54\x42\x69\xe1\xa1\x80\x77\
+\x81\xf5\x08\x82\xa1\xf7\x04\x7b\x0c\x68\xfa\x67\x44\x0e\xae\x5a\
+\xd1\x67\xcb\x0a\x0f\x25\x4e\x40\x83\x38\x8e\x7f\xad\x98\xd3\xc0\
+\x6d\x39\x1f\x7a\xd5\x8a\x3e\x3b\xec\xfb\x6f\x97\xd1\x57\x83\xd2\
+\x05\xc0\xaa\x04\x35\x13\x48\xc7\x3f\xb9\x37\x58\xb4\xa2\xa3\x65\
+\x87\x87\x12\x8f\xc0\x5a\x96\x8d\x59\x40\xb8\xee\x5a\xaf\x70\x5d\
+\x96\x8d\xcb\xd7\xee\x9e\x29\x5d\xc0\x5c\x9a\x1e\x30\x96\x19\xdc\
+\xfe\x7a\x0b\x80\xc0\x80\x18\x9d\xae\xd7\xe7\x1f\x2a\xb1\xb5\xc6\
+\xbd\xca\x63\x4d\xf8\x3d\x5d\x6e\x71\x49\xad\x3c\x5d\xab\x55\xff\
+\x59\x64\x5f\x6b\x29\x6d\x02\x56\xc3\x4f\xd3\x7d\x78\x80\xdd\x62\
+\x74\x7a\x6e\x6e\xfe\xc1\xa2\xfa\xca\x52\xca\x04\xa4\x69\xfa\xc0\
+\xf2\xca\x33\x7f\x57\x41\x5b\x5e\xb2\xcb\x32\x32\x3c\x5c\xfd\xb8\
+\xa0\xfd\x6e\x52\xf8\x04\xe4\x0c\xbf\xa4\xaa\x4b\x0e\x75\xbb\x4d\
+\xa5\x9c\x49\x28\x54\x40\xce\xf0\xd7\xd4\x32\xa6\x2b\xff\x86\xfb\
+\x9f\x43\xfd\x9e\x32\x24\x14\x76\x04\x92\x24\xd9\x6f\x55\x66\x71\
+\x0c\x8f\xca\x73\x61\x58\x9d\x05\xa8\xa7\xe9\x6f\xc5\xf2\x26\x70\
+\xab\xc3\x63\x2f\x5a\xc3\xc8\xb0\xe7\xfd\xab\x97\x7e\x1b\x14\x22\
+\xa0\x97\xf0\x0d\x36\x4b\x42\xcf\x47\xa0\x8b\xf0\xc7\xb3\xe1\x01\
+\x6a\x9e\xf7\x96\x5a\x9e\xc3\xf5\x38\x58\x66\xe6\xd2\xf4\x40\xde\
+\x7e\xb3\xf4\x24\x20\x49\x92\xfd\xd6\x8a\xf3\x99\x5f\x0d\x3f\xb3\
+\x5e\x41\xad\xe6\xfd\x35\xa7\x84\xe9\x5e\x25\x74\x7d\x04\x6e\x86\
+\x17\xee\x76\x28\xbf\x26\xc8\x89\x20\xa8\x4e\xbb\xec\x5d\xaf\xa7\
+\x4f\x89\xe1\x4d\x3a\xff\x5c\x07\xe0\x3f\x15\xc3\x88\xe7\x79\x9f\
+\xb8\xec\x9d\xa5\x2b\x01\x71\x1c\xef\x53\x35\xb3\x8e\xe1\x17\x05\
+\x39\xee\x1a\xbe\xc1\x46\x49\xc8\x2d\x60\x23\xc2\x37\x88\xa2\xf9\
+\x23\x88\xbe\x41\x89\x12\x72\x09\x88\xe3\x78\x9f\x62\x66\x80\x41\
+\x87\xf2\x9e\xc2\x37\xc8\x2b\xc1\x88\x1e\xf1\x7d\xff\x53\xd7\xfd\
+\x9d\x5f\x04\xf3\x87\x37\xce\x67\xbe\x1d\x61\x58\x9d\x45\xe5\x38\
+\x70\xcd\xa1\xfc\x2e\xab\x32\x9b\x24\xc9\x7e\xd7\xfd\x9d\x26\x20\
+\x8e\xe3\xfb\x15\x33\x4b\xae\xf0\x43\x53\xae\x4d\xb8\x10\x45\xf3\
+\x23\x88\xbe\x4e\xc1\x93\xd0\x71\x02\xf2\x87\xb7\x27\x8b\x0e\x0f\
+\x10\x86\xd5\x19\x41\x4e\xe0\x3a\x09\x56\x66\x5c\x26\xa1\xed\x04\
+\x74\x17\x3e\x98\x74\xa8\xed\x9a\x38\x9e\x7f\x5a\xd1\xd7\x59\xf9\
+\x15\x7b\x7b\x94\x0b\xc6\xe8\x48\xbb\x49\x58\x77\x02\x56\xc2\x57\
+\x9c\xcf\xbc\x15\x1d\x2f\x3b\x3c\x40\x10\x54\xa7\x05\x39\x0e\x2c\
+\x76\x2c\x16\xee\xb6\x56\x66\xe2\x38\xde\xb7\x7e\x49\x0b\xfe\x1f\
+\x5e\x7f\xe1\xd0\xd3\x92\x15\x3d\x39\xec\xfb\x13\x0e\xb5\x85\x91\
+\x77\x12\x44\xec\x91\x20\x08\x3e\xcb\x5e\x6a\x12\x90\xa6\xe9\xd0\
+\xb2\xe5\x23\xe0\x1e\x87\x3e\x36\x25\x7c\x83\x38\x3e\x77\x54\xb1\
+\xaf\xe1\x22\x01\xbe\xbe\xd1\x67\x0e\xfe\x72\x68\x28\x5d\xbb\xd8\
+\x74\x04\xac\xd5\x3f\xf0\x23\x08\x0f\x10\x04\x43\x53\x82\x39\x81\
+\xcb\x71\x80\xc1\xbe\x1b\xf6\x8f\xd9\xc5\x16\xbf\x16\x97\xa7\x1c\
+\x36\x5b\x52\xd1\xf1\xcd\x0c\xdf\x60\x45\x82\x3d\x89\x9b\x84\x23\
+\xd9\x85\x56\x2f\x82\xcb\x1d\x36\x59\x52\xd1\xf1\x9a\xef\x9f\x71\
+\x69\x70\x23\x08\x82\x60\xd2\x49\x82\x36\x67\x6b\x12\x20\x68\xbb\
+\x67\x75\x49\x0d\xbf\xdf\x4a\xe1\x1b\x04\x41\x30\x69\x45\xc7\x69\
+\x23\x41\x85\xd3\xd9\xb5\x26\x01\x95\x8a\x39\x05\x7c\xd9\xe2\xf1\
+\x2b\xe1\x3d\xaf\x69\x93\xad\xc2\xb0\xef\x4f\xb4\x91\x50\xbf\xb1\
+\xa3\xef\x54\x76\xb1\x49\x40\xb5\x5a\xbd\xf8\xb3\x3e\xf3\x04\xc2\
+\x9f\x81\x18\xf8\x5a\x91\x57\xd1\xca\x93\x5b\x39\x7c\x83\x61\xdf\
+\x9f\x50\x2b\x87\x51\x5e\x01\xf9\x37\x10\xa3\xf2\x97\xef\x76\xf4\
+\x1d\xda\x7b\xef\xbd\x17\x36\xbb\xbf\x6d\xb6\xd9\x66\x6b\xf1\x3d\
+\x64\x29\x23\xc7\x02\xc7\xba\xcb\x00\x00\x00\x00\x49\x45\x4e\x44\
+\xae\x42\x60\x82\
+\x00\x00\x01\x06\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x00\xb8\x49\x44\x41\x54\x78\x9c\xed\
+\xd9\xc1\x0d\x83\x50\x10\xc4\xd0\x0d\xa2\x24\x7a\xe2\x46\x31\xdc\
+\xe8\x29\x3d\x91\x32\x5e\xa4\x6f\x37\xb0\x96\x35\xb7\x9d\x81\x1c\
+\xe7\xfd\x1e\xe7\xfd\x4a\x87\x4d\x1e\xff\x07\x0a\xa0\x05\x34\x05\
+\xd0\x02\x9a\x02\x68\x01\x4d\x01\xb4\x80\xa6\x00\x5a\x40\x53\x00\
+\x2d\xa0\x29\x80\x16\xd0\x14\x40\x0b\x68\x0a\xa0\x05\x34\x05\xd0\
+\x02\x9a\x02\x68\x01\x4d\x01\xb4\x80\xa6\x00\x5a\x40\x53\x00\x2d\
+\xa0\x59\x3e\xc0\x47\x1e\xd7\xaf\xf1\x99\x16\x30\xbb\x16\x98\x99\
+\xf9\x3e\x17\x5b\xe2\xf2\x0b\x28\x80\x16\xd0\x14\x40\x0b\x68\x0a\
+\xa0\x05\x34\x05\xd0\x02\x9a\x02\x68\x01\x4d\x01\xb4\x80\xa6\x00\
+\x5a\x40\x53\x00\x2d\xa0\x29\x80\x16\xd0\x14\x40\x0b\x68\x0a\xa0\
+\x05\x34\x05\xd0\x02\x9a\x02\x68\x01\x4d\x01\xb4\x80\x66\xf9\x00\
+\x3f\xfa\xaa\x08\xd8\xe7\x6a\x2c\xe4\x00\x00\x00\x00\x49\x45\x4e\
+\x44\xae\x42\x60\x82\
+\x00\x00\x04\x72\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x04\x24\x49\x44\x41\x54\x78\x9c\xed\
+\x9b\x4d\x88\x1c\x55\x14\x85\xbf\x5b\xdd\x09\x8a\x8a\x20\x2a\x62\
+\x4f\x57\x75\x0d\x19\x14\x77\xc2\xe0\x52\x50\x34\x1a\xc4\xe0\x0f\
+\xe8\x4a\x44\x51\xd0\x85\x18\x41\x11\x74\x11\x21\x8a\x11\x04\x17\
+\x22\x1a\x70\xe3\xc2\xa0\xae\xc2\x80\x46\x47\x5d\x08\x82\xe0\x42\
+\x10\x44\x82\x66\xa6\xe7\x75\xcd\x24\xd1\x88\x8a\x60\x18\xec\xee\
+\x77\x5d\xcc\x88\x55\x35\x43\x98\x21\xef\xbd\x7a\x9a\x3e\xcb\x73\
+\xa0\xee\x7d\xa7\xee\x7d\x3f\xf5\x03\x13\x4c\x30\xc1\x04\xff\x01\
+\x18\xb3\xb2\xdf\x0c\x8a\xe1\x92\x29\x46\xc6\x14\x2f\xb8\xba\xae\
+\xb8\xba\x90\x4f\x2c\x2d\x2d\xdf\x84\xe8\xe7\xfc\x9b\xaf\xed\x65\
+\xdd\x96\x8b\x6b\x27\x2e\x2e\xe2\x13\x83\xc1\x60\x16\xd1\x39\x4a\
+\x37\x4b\x55\x9d\xe5\x1d\xb5\x01\xfd\xfe\xca\xb5\x56\xe5\x28\x70\
+\x71\x99\x17\x11\xeb\x2a\x46\xb4\x06\x2c\x2c\xac\xa4\x49\x62\xe7\
+\x81\xcb\x37\x91\xd5\x55\x9c\x28\x0d\xf8\xf1\xe4\xc9\x2b\x5a\x6d\
+\x3b\xaf\xd0\xf5\x1d\x2b\x3a\x03\x8e\x1d\x3b\x7d\xc9\x8e\xbf\x46\
+\x1f\x01\xd7\x84\x88\xd7\x0e\x11\x64\xab\xe8\xf7\xfb\x17\x48\xb2\
+\x7a\x04\x98\xad\x49\x8a\xa7\x15\x2b\x9a\x0a\x50\xd5\xb6\xb4\xda\
+\x87\x81\x9b\xeb\x12\xe0\x6c\xd2\xab\x23\x0a\x03\x54\x55\x4c\xb1\
+\x7c\x08\xe5\xee\xaa\x22\x5e\x07\x0f\x91\x18\x60\x06\xcb\xaf\xa0\
+\x3c\x5c\xe6\x44\x50\x50\xaf\x83\x87\x08\xe6\x00\x63\x8a\x67\x15\
+\x9e\x29\x73\xba\xb6\xc8\x79\x1f\x3c\x34\x5c\x01\xc6\x14\x8f\x2a\
+\x1c\xac\xf3\x22\x8c\x43\xe5\xd0\x98\x01\x4b\x4b\xc5\xbd\x0a\x6f\
+\x6d\x54\xfc\x97\x7d\x19\x8d\x18\x60\xcc\xca\x2d\x08\x87\x37\xc4\
+\x57\xec\xfa\xc4\x17\x0c\xc1\x0d\x58\x2c\x8a\x1b\x14\x7b\x04\xd8\
+\x59\xe6\x15\x2c\xe2\x6e\x8b\xbb\x55\x04\x9d\x04\x8d\x31\xd7\xa9\
+\xe5\x28\x70\x51\x4d\xb2\xe2\x70\x7f\xbf\x1d\x04\xab\x80\xc5\xc5\
+\x13\x99\x92\xcc\x03\x97\x55\x04\xc1\xd2\xd0\xe0\x21\x90\x01\xc7\
+\x8f\x9f\xba\x52\x5a\xe3\x4f\x81\x4e\x99\x17\xb0\x68\x73\x83\x87\
+\x00\x2d\xb0\xb0\xb0\x70\x69\xab\x3d\xfc\x18\x98\xa9\x2a\xaa\x1a\
+\x78\xc2\xdb\x0c\x5e\x0d\x28\x8a\xe2\x42\x6b\x99\x53\xb8\xbe\x26\
+\x29\xb8\x7b\xa8\x71\x2e\xf0\xd6\x02\xaa\xda\x1e\x59\x79\x4f\xe1\
+\xc6\xba\x44\xa0\x5d\xde\x56\xe0\xc5\x00\x55\x4d\x06\x83\xe2\x6d\
+\x41\xf7\x96\x79\x89\x6c\xf0\xe0\xc1\x00\x55\x15\x63\x8a\x57\x15\
+\x79\xb0\xcc\x8b\xa0\x1a\xd9\xe0\xc1\xc3\x1c\x60\x8a\xe2\x39\x44\
+\x9e\x2a\x73\x21\x0f\x37\xdb\x85\xd3\x0a\xe8\x0f\x96\x1f\x43\xe5\
+\xc5\x3a\x1f\xf2\x70\xb3\x5d\x38\x33\xa0\x6f\x8a\x83\xa2\xfa\xe6\
+\x46\x25\xec\xe1\x66\xbb\x70\x66\x80\xd4\x1e\x68\xc0\xfa\xfe\x3e\
+\x82\xb5\xfe\x6c\x70\xd7\x02\x9b\x94\x79\x03\x67\x9b\x6d\xc3\x5d\
+\x05\x20\x4f\x52\xdb\xd3\x2b\x12\xc5\x23\xb7\xb3\xc1\x59\x82\x59\
+\x36\xf5\x01\xaa\x4f\x94\x39\x01\x14\x5a\x31\xbf\x83\x75\x7a\x87\
+\x7a\xbd\xf4\x0d\x81\xfd\x65\x4e\x00\xd4\x46\x6b\x82\xf3\x12\x4d\
+\xd3\xa9\x03\xc0\xeb\x15\x52\x04\xc4\xdd\x1b\x5d\x97\x70\x9e\x94\
+\x88\x68\x96\x4e\xed\x03\xde\xad\x08\x8a\x20\x71\x3c\x86\x2f\xc3\
+\x4b\x42\x22\x62\x7f\x39\xfd\xd3\x43\xc0\x87\x15\x41\x11\x90\x44\
+\x22\xea\x06\x6f\x77\x64\x76\x76\x76\xb8\xa3\x9d\xdc\x07\xf2\x65\
+\x55\x51\x71\xf9\x81\xc3\xb9\xc2\x6b\x22\x9d\x4e\xe7\x8c\xda\xe1\
+\x9d\x08\xdf\x56\x15\x11\x34\x8e\x76\xf0\x9e\x44\x9e\xe7\xbf\xeb\
+\x78\x74\x3b\xb0\x50\x11\x04\x41\x9a\x6f\x86\x20\x77\x21\xcf\xf3\
+\x53\xe8\xf8\x56\xe0\x44\x45\x50\x4d\xd6\x96\x88\xe6\x10\xac\x0c\
+\x7b\xbd\x5e\x3f\x11\xbd\x0d\xf8\xad\xaa\x68\x42\x83\x9b\x84\xa0\
+\x7d\x98\xa6\xe9\x77\xa8\xdc\x01\x9c\xa9\xe7\xa1\x0d\x99\x10\x7c\
+\x22\xea\xf5\xa6\xbe\x52\xd1\x7b\x80\x61\x99\x17\x48\x54\xc3\x9b\
+\xd0\xc8\x4c\x9c\xa7\xe9\x27\x2a\xfa\x00\xb5\xc3\x93\x08\x09\x68\
+\x50\x13\x1a\x5b\x8a\xf2\x34\x7d\x5f\x91\xc7\x37\x2a\x61\x4f\x90\
+\x8d\xae\xc5\x79\x36\x75\x08\x91\xe7\xeb\xbc\x2a\x4e\x3e\x83\xdd\
+\x0a\x1a\xdf\x8c\x64\xdd\xce\xcb\xa8\xbe\x56\xe6\x44\xfe\x69\x07\
+\xff\x68\xdc\x00\x11\xd1\x2c\xeb\x3e\x2d\xe8\x3b\x65\x5e\xd7\xcf\
+\x0d\xbe\xe3\x37\x6e\x00\xac\x1d\x9e\xd2\xb4\xfb\x88\x22\x73\x55\
+\x45\x05\xcf\x39\x46\x61\x00\x80\x88\x8c\xb0\xc3\xfb\x51\xbe\xa8\
+\x4b\x78\xcc\x33\x1a\x03\x00\xf2\x3c\x5f\x1d\x0e\x57\xf7\x82\x7e\
+\x53\x93\xbc\x2d\x8d\x51\x19\x00\x30\x33\x33\xf3\xc7\x68\xb8\x73\
+\x0f\xca\x0f\x21\xe2\x45\x67\x00\xc0\xae\x5d\x57\xfd\x6c\x6d\x6b\
+\x37\xb0\xe2\x3b\x56\x94\x06\x00\x4c\x4f\x5f\x6d\x04\xbb\x1b\xf8\
+\x75\x13\xd9\x59\x4b\x44\x6b\x00\x40\x96\x65\xdf\xdb\x84\x3d\xc0\
+\x9f\x65\xfe\xbc\xf9\x65\x06\x60\xba\xdb\xfd\x5a\x48\xee\x2a\xbf\
+\x62\x3b\x2f\x7e\x99\x29\x23\xcb\x3a\x9f\x09\x72\x00\x18\x83\x8c\
+\x13\x91\x97\x9a\xce\x69\x82\x09\x26\xf8\x7f\xe0\x6f\x3e\x50\x4e\
+\x18\x86\xf9\x70\xa3\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\
+\x82\
+\x00\x00\x03\x61\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x03\x13\x49\x44\x41\x54\x78\x9c\xed\
+\x9a\xbf\x6b\x14\x41\x14\xc7\xbf\x6f\x93\x70\x9e\x04\x1b\x31\x46\
+\x72\x9b\xdd\x8d\xb9\x42\x08\xd8\xda\xfb\x03\xb4\xb0\x93\x80\x5d\
+\x0e\x44\x25\x9d\x4d\xc8\x5f\x60\x2c\x85\x04\xd1\x22\xa5\x4d\x6c\
+\x44\x48\x04\xb5\xb3\xb0\x15\x52\x08\xd1\xec\xde\xde\x82\x78\x62\
+\xa1\xa8\xe7\x91\xdc\x8c\x4d\x08\x78\xbb\x77\x97\xdd\xb9\x97\xc9\
+\xb9\xf3\x29\xe7\xe6\xbe\xef\xbb\xdf\xdb\x9d\x7d\xcc\x0d\x60\x30\
+\x18\xf2\x0c\xa9\x0a\xd4\xeb\xf5\xd1\x46\xa3\x39\x2f\x81\x1b\x00\
+\x66\x00\x14\xd4\x6d\x29\xd1\x04\xb0\x49\xc0\x5a\xb1\x58\x58\x19\
+\x1b\x1b\xfb\xd9\x6d\xb2\x52\x00\xd5\x6a\xf5\xb2\x84\xb5\x0a\xa0\
+\xa4\xa2\xc3\x48\x44\x10\x15\xc7\x71\x5e\x75\x9a\x60\x65\x55\x0e\
+\x82\xb0\x22\x61\xbd\xc4\xd1\xbd\x78\x00\x28\x49\x58\x1b\x7e\x18\
+\xce\x75\x9a\x90\xe9\x0e\xd8\x0e\xc3\x2b\x96\xa4\x0d\x28\x04\x78\
+\xc8\xb4\x08\xe2\x6a\xd2\x9d\x90\x3a\x80\x7a\xbd\x3e\xfa\xbb\xd1\
+\xfc\x00\x60\xa2\x2f\xd6\x0e\x8f\xe8\x78\xb1\x70\xae\x7d\x4d\x48\
+\xfd\x0b\x36\x1a\xcd\x79\x0c\xde\xc5\x03\x40\x69\xcf\xfb\x3f\xa4\
+\x0e\x60\x6f\xb5\x1f\x48\x92\xbc\x67\x79\x86\x67\xfa\xe0\x45\x17\
+\x31\xef\xc3\x19\x44\xba\xbe\xe7\x5d\xc7\x56\xee\x2d\x54\x08\xaa\
+\x35\xd9\xe5\xe3\x98\xf7\x41\x59\xc5\xd9\x30\x01\xe8\x36\xa0\x1b\
+\x13\x80\x6e\x03\xba\x31\x01\xe8\x36\xa0\x9b\xdc\x07\xd0\xb3\x11\
+\x0a\x82\xe0\x0c\xac\xe1\xbb\x90\xf2\x22\x80\xd3\x3d\xe7\x57\x6b\
+\x1f\x15\xfc\x48\x10\x22\x08\xac\xef\xec\xfc\x79\x5c\x2e\x97\x7f\
+\x28\x68\x1d\x88\xae\x5d\x5b\x18\x86\xd7\x85\xa4\x55\x00\x27\xb9\
+\x8d\x24\xe0\x4b\x41\x37\x3d\xaf\xf4\x2e\xcd\x97\x7a\x74\x82\xb1\
+\x4e\xb5\xe3\x23\xe0\x57\x6b\x4b\x42\xd2\x73\xe8\xb9\x78\x00\xf0\
+\xc8\x92\x6f\xfd\x30\xba\xc3\x59\x24\x31\x00\x3f\x0c\x67\x09\x58\
+\xe0\x2c\x7c\x40\x86\x48\xca\x65\xdf\x8f\x2e\x70\x15\x88\x05\xe0\
+\xfb\xbe\x4b\x92\x9e\x70\x15\xcc\xc0\x10\x59\xf2\xe9\xd6\xd6\xd6\
+\x09\x0e\xf1\xf8\x1d\x60\x0d\x2f\x02\x60\x29\xa6\x80\x37\x32\x72\
+\xec\x36\x87\x70\x2c\x00\x02\xae\x71\x14\x52\xc6\xe2\xf1\x95\xb4\
+\x06\x1c\xcd\x5d\x5e\xc9\xe3\x2b\xf5\x86\xc8\x90\x85\x32\x87\x91\
+\x5d\x60\x9a\x04\x36\xba\x4c\x61\xd9\x68\x49\x1d\x80\x6d\xdb\x2a\
+\x8d\x4e\x47\x6a\xb5\x1a\x5a\x1c\xc2\x3d\xc8\x7d\x2b\x6c\x02\xd0\
+\x6d\x40\x37\x26\x00\xdd\x06\x74\x63\x02\xd0\x6d\x40\x37\x26\x00\
+\xdd\x06\x74\x63\x02\xd0\x6d\x40\x37\x26\x00\xdd\x06\x74\x93\xe5\
+\x7c\x80\x2e\xce\xf6\xda\xf1\x3d\x00\xcd\xf6\x81\xbc\xdd\x01\x9b\
+\xed\x03\xb9\x0a\x80\x80\xb5\xf6\xb1\x3c\x05\x10\x15\x8b\x85\x95\
+\xf6\xc1\xbc\x04\xd0\x22\x88\x4a\xd2\xb9\xe1\x3c\x04\xd0\x92\x24\
+\x6f\x75\x3a\x2f\x3c\x48\x6f\x81\x2c\x44\x04\x51\x71\x27\x3b\x1f\
+\x96\xfe\x1f\x03\xd8\x3f\x2e\x5f\x28\x8c\x2c\x8f\x8f\x8f\xff\xea\
+\x36\x39\xb6\xd5\xdc\x87\x77\x2d\x17\x9f\x5c\xc7\x9e\xee\xb7\x68\
+\x7c\x0d\x90\xf8\xda\xef\x22\x7d\xe2\x0b\x87\x68\xd2\x22\xf8\x9a\
+\xa3\x90\x32\x44\x6f\x38\x64\x63\x01\x08\x41\x0f\x00\xec\x70\x14\
+\x53\xe0\x1b\xc4\xee\x23\x0e\xe1\x58\x00\x53\x53\xa5\xf7\x92\xe8\
+\x28\x9c\x0d\xd8\x87\x60\xcd\xb9\xae\xfb\x99\x43\x3b\xb1\x0f\x70\
+\xed\x89\x87\x00\x9e\x71\x14\x4c\x0b\x01\x4b\x8e\x33\xf1\x82\x4b\
+\x3f\x31\x00\x22\x12\xce\x64\x69\x56\x12\xdd\x83\xbe\xc7\xe1\x3b\
+\x81\x66\x1d\xc7\x5e\xe4\x2c\xd2\xf3\x1f\xd7\xed\xed\xe8\xbc\x65\
+\xc9\x05\x00\x97\x40\x38\xc5\x69\x66\x8f\x48\x02\xeb\x10\xbb\xf7\
+\x3d\xcf\x0b\x0e\xa1\x9e\xc1\x60\xc8\x31\x7f\x01\x50\x46\xc4\x66\
+\xcc\x07\x14\xea\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
+\
+\x00\x00\x00\x97\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x00\x49\x49\x44\x41\x54\x58\x85\xed\
+\xce\xc1\x09\xc0\x30\x0c\x04\x41\xc9\x49\xdf\x71\x4d\x6e\x48\x08\
+\xd5\x11\xec\x22\xce\xa0\xcf\xce\xff\x8e\x35\x13\x44\xd6\x8c\xac\
+\xa9\x7c\x0c\x65\x7c\x03\x01\x04\x10\x40\x00\x01\x04\xb4\x07\xbc\
+\xea\x81\x9b\x7d\x91\xd5\x13\xe0\xfb\x59\xdb\x7f\xe5\x02\x00\x00\
+\xf4\x3b\x2b\x9a\x0d\x40\x4d\xe0\x05\x89\x00\x00\x00\x00\x49\x45\
+\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x00\x85\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x00\x37\x49\x44\x41\x54\x58\x85\xed\
+\xce\xc1\x0d\x00\x30\x08\x03\x31\xd4\xc9\xd9\x14\x21\x16\xe9\x10\
+\xf0\xf4\xfd\x13\x39\x62\x51\xf5\x64\xf5\xe4\xe6\xe3\x6d\xc6\x17\
+\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x7c\
+\x9f\x23\x06\x85\x22\x0f\x12\xcb\x00\x00\x00\x00\x49\x45\x4e\x44\
+\xae\x42\x60\x82\
+\x00\x00\x05\x38\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x04\xea\x49\x44\x41\x54\x58\x85\xe5\
+\x97\x5b\x6c\x54\x55\x14\x86\xbf\xb5\x67\x3a\x20\x24\xe5\x22\x46\
+\x04\x2a\xd0\x80\x29\x04\x4c\x04\x25\x01\x82\xa2\xd0\xd6\x8a\x40\
+\x29\x39\x1a\x52\x22\xf6\x02\x21\x26\xfa\x60\x82\x82\x10\x27\x0d\
+\x0a\xf5\xc5\x04\x45\x94\xda\x16\x8d\xf2\xc2\xf4\xa2\x6d\x28\xd0\
+\x01\xd2\xbe\x80\x04\x6b\x43\xc0\x42\x62\x2c\x17\x4b\xab\x31\x10\
+\x30\x8a\xb4\x9d\xd9\xcb\x87\x99\x29\x67\x7a\x6f\xf1\x8d\xf5\x74\
+\xf6\xda\xeb\xfc\xff\xbf\xd7\xd9\x6b\xaf\x7d\xe0\x41\x37\x19\x4a\
+\x70\xda\xea\x9c\x24\xeb\xf1\x66\x8a\xb1\xcb\x51\x49\x02\xa6\x00\
+\x46\xe0\xba\x42\x0b\xaa\xf5\x88\xb7\x32\x58\xbe\xff\x97\xff\x55\
+\x40\xba\x93\xb7\x20\x6c\x4d\xa1\xa0\xcf\x0f\x12\xf7\x2c\xa2\xdb\
+\x82\x65\x25\x27\xee\x4b\xc0\x72\x67\xd3\x18\xb1\xf6\x73\x60\x5d\
+\xd4\xd5\xa6\x50\x6d\xd0\x23\x61\xa4\xd9\x67\xc2\x6d\x1d\xa1\xb0\
+\xf5\x9a\x11\x13\xc3\x6a\xa7\x89\x48\x1a\xb0\x1a\x98\x1a\x8d\xaf\
+\xb1\x9d\xe4\x9e\xa8\x2a\xfe\x63\xc8\x02\xd2\x9d\xbc\x19\xd6\x4a\
+\x15\x30\x2b\x42\x2c\xfe\xd0\x8d\x49\x07\xea\xea\x0a\x42\xfd\x89\
+\xf6\xfb\xfd\xe6\xd4\x85\xeb\xaf\x02\x1f\x00\xc9\xc0\x35\x63\xed\
+\xaa\x63\x95\xa5\xe7\x06\x2d\x60\x59\x56\x4e\xb2\xc1\x73\x06\x61\
+\x82\xc0\xf7\x9e\x91\xff\xbe\x76\xe4\xe0\xc1\xbf\xfa\x23\xee\x6e\
+\x19\x19\x6f\x8e\xe8\x1c\x75\x77\x9f\xa0\xb9\xc0\x3f\x8a\x2e\x39\
+\x5e\x5e\xd2\x38\xa0\x80\x8c\xec\xec\xc4\xd0\xdd\x51\xa7\x41\x67\
+\x83\xee\x59\x34\x67\xca\xdb\x05\x05\x05\x76\x28\xe4\x6e\xfc\xb4\
+\xac\xbc\xad\x2a\xb2\x0b\x68\x31\x6a\x16\x1c\xab\x28\x6a\x73\x07\
+\x78\xbb\xbf\x11\xba\x3b\x6a\x6f\x84\x9c\xea\xde\xc8\xd3\x56\xe7\
+\x24\xa9\xd7\x9b\x0f\xfa\x12\xf0\xb8\x80\x55\xf4\x2a\x22\x87\x8d\
+\x35\xc5\xdd\x08\xb4\xb6\xa2\xa4\x30\x35\x2b\x3f\x19\x21\xdf\x1a\
+\xfb\x2d\xb0\x1c\xd0\x5e\x33\x90\xba\x36\xf7\x69\x30\x67\x81\x3f\
+\xd5\x98\x99\xc7\x03\x45\xb7\x63\x73\x7e\xbf\xdf\x9c\x3e\xdf\xf2\
+\xae\x8a\xbc\x0f\x8c\xec\x63\xc5\xff\x08\xbc\x57\x5b\x5e\xfc\xa9\
+\x9b\xc4\x71\x1c\xdf\x2d\x3b\xe6\x1c\x90\x02\xac\x08\x96\x17\xd7\
+\xc4\xe6\x4c\x5c\xbe\x30\xbb\x01\x54\x65\x67\x77\xf2\x53\x17\xae\
+\x7f\x1d\x4d\x65\x5f\xe4\x00\xa3\x15\xf6\xa4\xae\xcd\xdf\xe7\x5e\
+\x5c\x20\x10\xe8\x50\x61\x7b\x74\x58\xe8\x9e\xeb\x12\x90\x9e\xb5\
+\xe9\x31\x85\x65\xc0\xcd\x71\x9e\x5b\xfb\xdd\xa8\xa7\x2e\xb4\xec\
+\x00\xd6\xdf\x5b\x53\x3f\x16\x89\xd9\x9c\xba\x76\xe3\x5b\x6e\xf7\
+\xf1\xb2\xe2\x4a\xe0\x12\x30\x37\x7d\x4d\xee\x93\x3d\x04\x28\x76\
+\x65\x44\x99\x1c\x0e\x04\x02\x1d\x31\xff\xb2\xac\x9c\x64\x90\x1d\
+\xc0\xe0\x8e\xad\xae\x18\xfd\x30\x75\x55\xee\xa4\x38\x69\x22\x55\
+\x00\xea\x31\x6b\x7a\x0a\x10\x96\x02\xa8\xda\xa3\x6e\x3c\x63\x3c\
+\x6f\x00\x09\x83\xa0\xee\x6e\xa3\xd5\x6b\x36\xc6\x69\x0b\xeb\x31\
+\x00\xab\xbc\xd0\x43\x00\xaa\x49\x11\x75\x7a\x39\x0e\x46\x59\x31\
+\x0c\xf2\x08\xa1\xf0\xb2\x7b\x6c\xd4\xdb\x0c\x20\x91\x1e\xd2\x4d\
+\x80\x44\x9c\x09\x9d\x3e\x77\x19\x09\x91\xd3\x6c\xb8\x36\xd5\x3d\
+\x90\xf6\x84\x18\xf6\xe4\x28\x76\x7c\x15\x74\x37\xbf\xdf\x2f\x03\
+\xc5\x0c\x60\x9e\x01\xb0\xdd\xe0\x72\x1d\x20\x64\x42\x13\x63\x9e\
+\x82\x82\x02\x2b\x70\xf5\x3e\x04\x5c\x73\x0f\xda\x1f\xba\x13\xc5\
+\xd6\xd6\xd8\x01\xe7\xde\x03\xbf\x01\x88\x30\x3d\x0e\x42\xa8\x61\
+\xb8\xa6\xf1\xef\x26\xa0\xc9\x51\x7f\x4b\xcc\x77\x4f\x80\xa1\x2e\
+\xfa\x94\xee\x7e\x29\x2c\xe1\x2f\x80\xe1\xf4\x82\x0e\xf1\x50\x1c\
+\xa7\x47\x4c\x1a\x00\x62\x4e\xf6\x14\xd0\xa1\xd5\x51\x75\x2b\xe6\
+\x6f\xda\xd4\x55\x76\x27\x02\x07\x9a\x44\xf8\x24\x3a\x37\xa0\xc5\
+\x42\x54\xd9\x55\x1b\x28\x76\x57\x94\x28\xb2\x2a\xca\x5a\xd9\x43\
+\x40\xb0\xaa\xb4\x15\xe1\x24\xc2\x84\x71\x37\x6c\xbe\x1b\xf4\xc6\
+\x78\xf3\x0e\x50\x33\x98\x83\x48\x22\x2a\x02\x8b\xe7\x4e\xde\xe9\
+\xf6\xa7\x66\x6d\x5c\x19\x6d\x72\x3f\x07\x03\x5f\x76\xdd\x0d\xe2\
+\x76\xb8\xb5\xb2\x15\x40\x04\x7f\x46\x76\x76\x62\xcc\xdf\x50\x54\
+\xd4\x79\xf3\x61\x93\x09\xba\x87\xfe\x3f\x47\x08\x65\xd7\x58\xcf\
+\xed\x75\xee\x2e\xea\x38\x8e\x0f\x61\x77\x44\xa0\x6e\xc3\x95\xcb\
+\xb8\x32\xb9\x7c\xf1\xa7\xd6\xe4\x59\xf3\x66\x0a\x2c\xd4\x50\xc2\
+\xec\xf5\xaf\xac\x3c\x54\x5f\x5f\xaf\x00\x6d\x0d\x0d\xb6\xf9\x62\
+\xe3\xd1\x19\x29\x4f\x55\x20\xa2\xc0\x23\x40\x22\x60\x05\x2e\x83\
+\x7e\xe3\x31\x9a\x5b\x5b\x5e\x72\xa8\xa9\xa9\xc9\xfd\xb1\x64\x72\
+\xca\xe2\xcf\x10\xcd\x00\xea\x82\xe5\x25\xdb\xdd\x9c\x3d\x92\x1a\
+\xbd\x07\xfe\x00\xa4\x80\x7e\xbc\x68\xce\x94\x2d\x7d\x5d\x48\x1c\
+\xc7\xf1\x00\x04\x02\x81\x70\x1f\x19\x91\xd4\xac\xbc\x2d\x88\x7c\
+\x84\xd0\x4a\x87\x7d\x26\x58\x55\xda\xda\xaf\x00\xe8\xba\x0f\x9e\
+\x01\xc6\x03\x15\x9d\xc6\xb7\xa1\x2e\xb0\xef\xef\x3e\x48\x7a\x35\
+\xc7\x71\x7c\xb7\x6d\xe2\x5e\x45\x36\x02\x77\xc0\x3e\x17\x2c\x2f\
+\xfd\xb1\x7b\x5c\xaf\x27\xd5\xaf\x4d\x8d\x37\xa7\xa7\xcc\xff\x0e\
+\x21\x4d\x60\x89\x47\xc3\x1b\x66\xcc\x9a\x77\x3b\xe9\xd1\x95\xe7\
+\xaf\x5c\xa9\xef\xb7\x24\xfd\x7e\xbf\x49\x98\xf0\x84\xd3\xae\xbe\
+\x32\x90\x54\x22\x57\xb1\xb4\xda\x8a\xe2\x86\xde\xe2\xfb\xdd\xd7\
+\x4b\x33\x5f\x1f\x9b\x60\xbc\x45\x08\x4e\xd4\xd5\x22\x50\x0d\x7a\
+\x44\x30\xcd\x18\xdb\xd6\xde\x19\xb6\x3e\x8f\x6f\xa2\x45\xa7\x02\
+\xe9\x82\xae\xa6\xab\x7f\x48\x6d\xa7\xe9\xdc\x50\x17\xf8\xea\xf7\
+\xbe\x38\x06\xf5\x63\xb2\xcc\xc9\x5d\x68\xac\x29\x04\x9e\x1d\x4c\
+\x3c\xd0\x88\xd8\xad\xc1\xb2\xd2\xda\x81\x02\x87\xf4\x6b\xf6\x62\
+\xe6\xe6\x69\x21\x13\xca\x14\x23\xcb\x45\x35\x49\x23\x6d\xd5\x03\
+\xb4\x00\x2d\xa2\x5a\x8f\x78\x2a\x6b\xcb\x8b\x2e\x0d\x05\xf7\xc1\
+\xb6\xff\x00\xf7\x80\xda\xb0\x80\x19\xdd\x42\x00\x00\x00\x00\x49\
+\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x00\xcc\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x00\x7e\x49\x44\x41\x54\x78\x9c\xed\
+\xd9\x41\x0d\xc0\x20\x14\x05\x41\x5a\x4d\x78\xc2\x4f\x65\xd5\x14\
+\x95\xb1\x4d\x98\x31\xf0\x5f\x36\xdc\x18\x23\x34\xd7\xb3\xe7\x7a\
+\x76\xb9\xe1\x2e\x8f\xff\x81\x00\xf5\x80\x9a\x00\xf5\x80\x9a\x00\
+\xf5\x80\x9a\x00\xf5\x80\x9a\x00\xf5\x80\x9a\x00\xf5\x80\x9a\x00\
+\xf5\x80\x9a\x00\xf5\x80\x9a\x00\xf5\x80\x9a\x00\xf5\x80\x9a\x00\
+\xf5\x80\x9a\x00\xf5\x80\x9a\x00\xf5\x80\x9a\x00\xf5\x80\xda\xf1\
+\x01\xae\xf2\x78\xfd\x35\x3e\x46\xff\x02\xde\xf8\x3e\x00\x00\x00\
+\x00\x00\x00\x00\x9c\xe0\x03\xda\xaf\x07\x8e\xa0\xaf\x15\x04\x00\
+\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x00\x68\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x00\x1a\x49\x44\x41\x54\x58\x85\xed\
+\xc1\x01\x01\x00\x00\x00\x82\x20\xff\xaf\x6e\x48\x40\x01\x00\x00\
+\x00\xef\x06\x10\x20\x00\x01\x47\x01\xa0\x88\x00\x00\x00\x00\x49\
+\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x01\xf7\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x01\xa9\x49\x44\x41\x54\x58\x85\xed\
+\x96\xb1\x4a\xc3\x50\x14\x86\xff\x93\x64\xb1\x05\x5f\x40\xd4\x37\
+\xa8\x60\xa1\x11\x41\x7c\x03\x29\x0d\x2a\x5d\x7c\x01\x5d\x04\x11\
+\x97\x4e\x1d\x1c\x44\x97\xe2\x13\x38\x59\x49\x3a\x17\x17\x41\x0a\
+\x86\x52\xb0\x8f\x50\x3b\xb8\xb8\x28\xd4\xa9\xb9\xc7\xa1\x26\x36\
+\xb5\xb7\x4d\x4c\x6b\x86\xf6\x9f\x6e\x92\x73\xcf\xff\xe5\xdc\x7b\
+\x0f\x17\x98\x75\xd1\xa8\x8f\xa9\x2a\x27\x13\x1d\x51\x64\x50\x0e\
+\xc0\x6a\x44\xaf\x16\x83\x4d\x47\x53\x0a\x8d\x1d\xfa\x1c\x0b\x90\
+\xaa\x72\x72\xa1\xc3\x35\x00\x6b\x11\x8d\x07\xd5\xec\x6a\xb4\xe9\
+\x42\x28\xb2\xa8\x44\x47\x14\xa7\x60\x0e\x00\x6b\x6a\x57\x14\xdd\
+\x07\x29\xc0\x77\xd9\xa7\x22\x02\x19\xee\x58\x1b\x11\xe7\x5b\x73\
+\x3b\xa7\x8c\xdc\x2f\xe3\xa4\x5b\x82\x87\xe5\x96\x56\xe0\xbf\x34\
+\x07\xf8\xb5\x07\xd2\x65\x5e\xd1\x54\x6c\x03\xec\x7b\x9f\xa9\xf0\
+\x91\x2c\x09\x09\x08\x02\x9a\xcb\x0e\x9e\xee\xf6\xc8\xf9\x33\x80\
+\x6e\xf1\x09\xc0\xe7\xc3\xc0\x88\xb9\x24\xcd\x42\x3d\xdc\x17\x0d\
+\x8f\x69\x93\xf7\x1b\x06\xbd\x06\x05\xf0\x96\x20\x53\xe1\x3c\xc0\
+\x17\xc3\xcc\x43\x68\x4b\x23\xbe\xdd\x2d\xb3\x1a\x1a\x80\x98\x4f\
+\x23\x18\xfb\x20\xda\x2a\x36\x82\x06\xf7\xff\xed\x40\xd7\xe3\xeb\
+\xe0\x9e\x94\x05\xb0\xe4\xcd\xec\xe5\xaa\x85\x05\xf0\x35\x1a\x3b\
+\xa7\x4a\x37\xdd\xa0\x74\xcb\x01\x40\x87\x1e\x80\x12\xfc\x74\xc5\
+\x7e\x0c\xe7\x00\x73\x80\xd8\x01\xa2\x74\x3d\xa9\x88\xb9\xa4\x5b\
+\x42\xde\xba\x81\x96\x3b\x88\xa5\x02\x0c\x36\xe3\x04\x68\x3a\x9a\
+\x52\x88\x03\xa0\xc5\xe0\xab\xfe\x1b\x31\xd0\xd7\x7e\x75\x4b\xbc\
+\x03\x58\x9c\x88\x15\xd3\x81\x6d\xd0\x4d\x90\xd0\x9f\x0a\x30\xee\
+\x27\x62\x0e\x74\x85\x8a\x87\xa0\xc1\x1e\x80\x50\xe9\x18\xc0\x5b\
+\x64\x7b\xa6\xb3\x7a\x96\xda\xa1\x01\xea\x59\x6a\x0b\x85\xd6\xc1\
+\x30\x01\x7c\x84\xb5\x05\xf0\x0c\x50\xde\x36\xe8\x32\xe4\xdc\x19\
+\xd7\x17\x91\x1d\x7b\x32\x62\xe5\x6b\x14\x00\x00\x00\x00\x49\x45\
+\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x01\x94\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x01\x46\x49\x44\x41\x54\x58\x85\xed\
+\xd1\x21\x4b\x43\x51\x18\xc6\xf1\xff\x7b\xc7\x8a\x41\x04\x41\xcb\
+\x76\xdd\xf6\x09\x04\x6d\x36\x93\xa8\x6b\x82\x49\xab\x82\xdf\xc1\
+\x62\x31\xf8\x11\x64\x20\x18\x0c\x26\x41\x10\x8b\xa0\x08\x86\x15\
+\xc1\xec\x7d\xcf\x3d\xd7\xee\x98\x60\x71\x7b\x2d\x1a\x14\xb6\xbb\
+\xbb\x24\x78\x7e\xf1\xf0\xf0\xf0\x1c\x5e\x08\x82\x20\x08\xfe\x3b\
+\xc9\x0b\x68\xea\x8f\x31\x16\x22\xb1\xad\x38\x8e\x9f\x46\x29\x4d\
+\x92\xa4\x26\x51\xe9\x14\xa4\x33\x17\x57\xd6\x45\xc4\x06\x65\xa3\
+\xdc\x36\x63\x0a\x98\xef\x9b\xdc\xab\x66\xcb\x79\x71\xe7\xdc\x82\
+\x44\xe5\x07\x90\x25\x8c\xe9\xbc\x7c\xee\x80\x52\xc4\x16\x70\x0e\
+\x4c\x22\x76\xe5\x5c\xb6\x3d\x28\xab\x9a\xad\x19\xd1\x2d\xd8\x2c\
+\x70\x63\xf6\xb1\x32\xec\xf7\x23\x0d\xa8\x56\xab\xef\x73\x71\x65\
+\x13\xe1\x08\x28\x1b\x76\xe2\x9c\xdf\x37\xb3\x1f\xe7\x4b\xd2\x6c\
+\x17\xb1\x0b\x60\x02\x38\x7d\xeb\x76\x56\xea\xf5\xfa\x6b\x5e\x7f\
+\x21\xaa\xe9\x9e\x3a\xdf\x53\xe7\x4d\x35\x6b\xb5\xdb\xed\xb2\x99\
+\x45\x89\xf3\x87\xea\xbc\xa9\xf3\xa6\x69\x76\xf0\x7b\xdc\x30\x23\
+\x07\xbf\x39\xf7\xd2\x34\xfa\x67\xc0\x84\xc1\x9d\x40\x17\x58\x05\
+\x3e\x30\xdb\xa9\xd5\xe2\x56\x91\xbe\xc2\x03\x00\xd2\x34\x5d\xec\
+\x9b\x5c\x02\x33\x5f\x4f\xdd\xbe\xd8\x46\x23\x8e\xaf\x8b\x76\x8d\
+\x35\x00\x40\x55\xeb\x48\xe9\x59\xc0\xf7\x7a\xd2\x6c\x34\x2a\x8f\
+\xe3\x76\x8d\xcd\xcc\xa4\xc8\xbd\x83\x20\x08\x82\x3f\xe9\x13\xfa\
+\xca\x87\x49\xdf\x83\x3a\x35\x00\x00\x00\x00\x49\x45\x4e\x44\xae\
+\x42\x60\x82\
+\x00\x00\x04\x83\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x04\x35\x49\x44\x41\x54\x78\x9c\xed\
+\x9b\x4b\x88\x1c\x55\x14\x86\xbf\x53\xdd\x93\x31\x24\x41\x88\xf1\
+\x85\xa8\x2b\x51\x5c\x08\x43\xb7\x11\x11\x64\x14\x8d\x06\x31\xf8\
+\x00\x5d\x89\x4e\x30\xd3\x1d\x92\x9e\x76\x40\x11\x7c\xd0\x36\x89\
+\x98\x80\xf8\xe8\x36\xa6\x7b\x0c\x18\x17\x06\x75\x15\x06\x34\x3a\
+\xba\x48\x40\x90\xcc\x74\xe2\x03\x71\x21\x88\xb8\xd0\xa8\x84\x28\
+\x9a\x09\x66\x66\xba\x7e\x17\x6d\xa0\xaa\x18\x83\xd1\x7a\x5c\x4c\
+\xff\xcb\xff\x40\xdd\x73\xbf\x3a\x7d\xef\x3d\x55\xd5\xd0\x57\x5f\
+\x7d\x9d\xcd\xb2\xac\x13\xf8\xa7\x2a\x8e\x36\x6b\x66\x7a\x4a\x60\
+\x48\x5b\x3b\x13\xd5\x67\xe2\xb8\xae\x17\xc7\x45\x92\x56\x61\xf4\
+\xe5\x9b\x30\x6a\x82\x3c\x90\xc3\xec\xe9\xb8\xae\xed\x3c\x80\xd5\
+\xa5\x66\xd1\xcc\x26\x41\xc1\x6a\x8d\x2d\x6f\xa7\x01\x14\x46\x9b\
+\x57\xf9\x68\x1f\xb0\x3c\xe8\x0b\xfc\xb8\xc6\x70\x16\x40\x61\xf4\
+\xa5\xcb\xcc\x34\x05\xac\x8a\xc6\x0c\x14\xd7\x38\xf9\xb8\x2e\x14\
+\xa7\x86\x46\x1a\xe7\x9b\x31\x05\x5c\x9a\xf4\x58\xce\x55\xc0\x0d\
+\xeb\xb7\xaf\xc8\x2d\xe1\x3d\xe0\xca\x34\xc6\x73\x0a\xc0\xf0\x43\
+\xaf\x9f\x33\x37\xb0\x74\x2f\x50\x0c\xfa\x8a\xb1\xe4\xa3\x72\x06\
+\xc0\x70\xad\x96\xff\x7d\xf0\xf8\x1e\xc1\xcd\x91\x90\x2c\xc6\x45\
+\x2f\x2a\x47\x00\xc8\x8e\x1f\x39\xaf\x6d\xe8\xee\xb0\x6f\x22\xc1\
+\xc9\x83\x23\x00\x8a\xa5\xe6\x76\x8c\xf5\x41\x4f\x98\x40\x89\x4e\
+\x1e\x1c\x00\x50\x28\x35\x1e\x07\x1e\x8b\xfa\x96\xc2\xe4\x21\x63\
+\x00\xd7\x96\x1b\x1b\x0c\xb6\x2d\x12\xea\xa6\x95\x43\x66\x00\x8a\
+\xe5\xe6\xbd\x12\xad\xa8\xaf\x94\xee\xfc\x29\x65\x02\xa0\xb8\xa1\
+\x71\x0b\xd2\x9e\x45\xc6\xf7\xad\xb7\xf0\xa5\xa6\xd4\x01\x14\xcb\
+\x8d\xd5\x78\xec\x05\x96\x04\x7d\x19\x3e\x09\xee\xf7\x7f\xa7\x54\
+\x01\x5c\x57\x6a\x5c\x8d\xd8\x07\x2c\x8b\x84\x7c\x53\xfa\x93\x87\
+\x14\x01\x0c\x6d\x7a\xe5\xf2\x05\x6c\x0a\x58\x19\xf4\xff\xea\xec\
+\x32\x99\x3c\xa4\x04\xe0\x9a\xf2\xce\x0b\xbc\x05\xff\x43\x43\x97\
+\x04\x7d\x81\x1f\x67\x67\xf7\x6f\x94\x78\x37\x58\x18\x6d\x9f\x6b\
+\x3a\xf9\x3e\x70\x45\xd0\x57\xef\x88\x9b\xe9\xe4\x21\xe1\x0a\xb8\
+\x7e\xfc\x85\xa5\x66\x73\x93\xc0\x50\x28\x20\x4b\xf4\x7c\x7f\x26\
+\x4a\x0c\xc0\x70\xad\x96\x9f\x9f\xcd\xbf\x05\xba\x31\xe8\xab\x77\
+\xca\x75\x62\xf2\x90\x14\x80\x5a\xcd\x9b\xfd\x69\xd5\x2e\x8c\x75\
+\x41\x5b\xb8\x73\xe7\x4f\x29\x01\x00\xb2\xe2\x91\x95\xcf\x4b\x7a\
+\x30\xec\xbb\x37\x79\x48\x60\x11\x2c\x96\x1b\x4f\x20\x1b\x0f\x99\
+\x12\x98\x7b\x93\x87\x98\x2b\xa0\x50\x6a\x96\x91\x6d\x0d\x99\x02\
+\x33\x4b\xad\xb9\x39\x53\xc5\x06\xa0\x58\x6a\x6c\x33\xb4\x33\xea\
+\xcb\xf0\x33\xdf\xeb\x4e\xa3\xf8\x2a\x20\xf2\x40\x03\x7a\x9d\x9d\
+\x0b\x7b\xfd\xe9\x14\x1f\x00\xa5\xd7\xc3\xc7\xa9\xd8\x00\x98\xa9\
+\x4a\xe4\x6e\x1b\xe6\xb9\xfe\xfa\x35\x36\x00\x33\xad\xea\x3b\x48\
+\x95\xa8\x2f\x91\x73\x19\x42\xac\xbb\x40\x67\xa2\xba\xc3\xa0\x16\
+\xf4\x0c\x40\xca\xb9\xfa\x26\x3e\xf6\x83\xd0\x4c\xbb\xb2\x05\xac\
+\x19\x76\x0d\x50\xe6\x0f\x60\x17\x53\x02\x49\x99\x3a\x17\x1d\x7d\
+\x44\xf0\x66\x34\x90\xcc\x78\xff\x4d\xc9\x24\x54\xaf\xfb\x68\x70\
+\x04\x78\x37\x12\x31\xe4\x16\x84\xc4\x92\x39\x34\x51\x9a\x97\x06\
+\xef\x03\x3e\x0e\x05\x0c\x03\x73\x06\x42\xa2\x89\x1c\x9a\x28\x9d\
+\x58\x38\xd9\xbd\x53\xf0\x79\x38\x22\x67\x7e\x0e\x89\x27\xf1\xd9\
+\xee\xf1\x5f\xbd\x5c\xee\x76\xe0\x9b\x48\xc8\x7a\xd5\x90\xad\x52\
+\xb9\x0b\x33\xaf\x6e\xfa\xd1\xeb\xda\xad\x88\x1f\x42\x01\xe1\x29\
+\x63\x08\xa9\x95\xe1\xf4\xae\xca\xb7\x78\xba\x0d\xf8\x25\xe8\x9b\
+\xf0\x7a\x8f\x0a\xb2\x51\xaa\xbf\xc3\x4e\xab\xfa\xa5\x87\x77\x07\
+\x70\x22\x14\x90\x79\x22\x1b\x08\xa9\x2f\x44\xd3\xed\xcd\x9f\xf8\
+\x66\xf7\x00\xf3\x41\xdf\x30\x4f\x19\x54\x42\x26\x2b\xf1\xe1\x56\
+\xe5\x03\xc3\x1e\x20\xda\x3c\xc9\x3c\xa5\x7c\x66\xce\x6c\x2b\x9a\
+\x69\x57\xde\xc6\xd8\x18\xf5\x4d\x78\x69\x12\xc8\x74\x2f\xee\xb4\
+\xc6\xda\x88\x27\x43\xa6\x81\xa4\x5c\x5a\x39\x64\x7e\x18\xe9\x4c\
+\x54\x9e\x43\x7a\x31\x64\x9a\xa1\x94\x4e\x8b\x99\x03\x00\x53\xe7\
+\xe2\x63\x8f\x9a\xd9\x1b\x21\x17\xa5\xd2\x37\x38\x00\x00\xa8\xd7\
+\xfd\x65\x17\x1e\x7d\x18\x31\x19\xf2\x2d\xf9\x0e\xd2\x0d\x00\xc0\
+\xfe\x7a\x7d\x61\xf9\xdc\x8a\xfb\x31\x0e\x44\x42\xa6\x04\xf3\x74\
+\x06\x00\xc0\xfe\xdd\x23\x7f\xe4\x06\x58\x07\x1c\x0e\xfa\x96\xe0\
+\xd6\xe8\x14\x00\x80\x83\xcd\xb1\xdf\xe6\x6c\x60\x2d\xf0\x75\x1a\
+\xe3\x39\x07\x00\xe0\x8b\xd6\xc6\x9f\xbb\x79\x6f\x8d\xb0\xef\x93\
+\x1e\xcb\x49\x00\x00\x9f\xee\xd8\xfc\x5d\x1e\xad\x01\x8e\x45\x63\
+\x71\x9e\x16\x9d\x05\x00\x70\xb0\x3d\xf6\x15\xc6\x5a\x60\x36\xe8\
+\xdb\xd9\xf2\x97\x19\x80\x4e\x6b\x6c\x1a\x9f\xbb\x14\xf8\x7e\x30\
+\xce\x8f\x29\x9d\x07\x00\xd0\x79\x6d\xec\x23\xd0\x16\xb0\xae\x89\
+\x2e\xe6\x3d\x9b\x75\x4e\x7d\xf5\xd5\xd7\xff\x43\x7f\x02\x97\x76\
+\x3e\x83\x62\x89\x8e\x83\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\
+\x60\x82\
+\x00\x00\x00\x89\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x00\x3b\x49\x44\x41\x54\x58\x85\xed\
+\xcd\xb1\x11\x00\x10\x10\x05\xd1\x4f\x21\x28\x45\xa2\x6b\x33\x5a\
+\x31\x14\x72\x22\xa1\xf4\x12\xfb\xa2\xcd\x56\x02\x00\xe0\x77\xe1\
+\xc6\x5c\x7b\xc8\x54\x7d\xb6\xd6\x4b\x4e\x4d\x92\xa2\xcf\x10\x00\
+\x00\xe0\xed\x00\x5a\x36\x07\x04\x97\xc1\x22\x16\x00\x00\x00\x00\
+\x49\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x02\xca\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x02\x7c\x49\x44\x41\x54\x58\x85\xed\
+\x97\x4b\x72\xd3\x40\x14\x45\xcf\x73\x32\x00\xb6\x10\x59\x2d\xcd\
+\x60\x0b\x6c\x81\x01\x90\x00\x81\x90\x8a\xf3\x71\x15\x2c\x20\x55\
+\xac\x81\x61\x66\x0c\x20\xc4\xf9\x3b\x21\x14\x55\xac\x81\x35\xc0\
+\x08\xb7\x24\x03\x3b\x00\x06\xc4\x8f\x41\xe4\x20\xeb\x63\x49\x2e\
+\x33\x82\x1e\x59\xaf\xba\xef\x39\x7e\x6a\x5b\x2d\xf8\xd7\x87\x0c\
+\x3f\x58\xfb\xe5\xa6\xca\xe0\x85\xc0\x55\x94\x67\x9e\xd7\x7c\x3b\
+\x4d\x90\xb5\xd1\x3c\xc2\x73\xe0\xa7\xd0\x78\x6a\xcc\xdc\x87\x51\
+\x81\x20\xfa\x08\x5c\x8f\x2f\x07\x2a\xba\xe4\xbb\x6e\x77\x1a\xf0\
+\x5e\x18\x3e\x14\x95\x03\xa0\x11\x97\x3e\x79\xa6\x79\x83\x44\x01\
+\x90\x2b\x89\x35\x0d\x51\x39\xec\x85\xe1\xe2\x5f\x80\x83\x70\xed\
+\x12\x74\x59\x54\xdd\x04\x06\xd3\x94\xe8\x85\xe1\x62\x06\x0e\x03\
+\x51\xd9\xcc\x08\x78\x5e\xf3\x4c\x45\x97\x73\x24\x0e\x26\x91\x88\
+\xe1\x87\x19\x38\xb4\x8c\x71\x4e\x33\x02\x00\xbe\xeb\x1e\xe5\x48\
+\xcc\xd4\x95\x28\xfc\xe6\xd0\x32\xa6\xb9\x9f\x9c\x2b\xe4\x0c\x6b\
+\xa3\x25\x84\xbd\x54\xc0\xb9\x20\x4b\xc6\x38\x27\xe3\xe0\x41\xd0\
+\x7f\xa0\xe8\x21\x30\x53\x06\x2f\x14\x98\x54\xa2\x00\xae\x02\x2b\
+\x79\xf0\xb1\x02\xb1\xc4\x63\x84\xdd\x2a\x12\x41\xd0\xbf\xaf\xe8\
+\x51\x1d\x78\xa9\x40\x89\xc4\xa3\xe1\x66\x9a\x14\x5e\x49\xe0\x02\
+\x10\x2d\x2b\x74\xf2\x24\x00\xf2\xe1\xd2\x32\xc6\xd9\x2b\xcb\xae\
+\x24\x30\x46\x62\xf8\x6b\x49\xd6\x2a\xc3\x6b\x09\x24\x24\x76\xc7\
+\xac\xab\x05\x87\xd4\xff\x40\xd9\x30\xa6\xb9\x2f\xb0\x02\x68\x01\
+\x7c\xb5\x0e\xbc\xb6\x00\x80\x2a\x3f\xf2\x04\xe4\xa2\xf6\xbd\x6e\
+\x5e\x2d\x01\x6b\xa3\x05\x84\xe3\xbc\x75\x0a\x0d\x45\x8f\x83\xa0\
+\x7f\xaf\x4e\x66\xe5\x3d\x10\x3f\xcf\xbb\xc0\xec\x08\x57\x04\x54\
+\x93\x39\xe7\x28\x8b\x9e\xd7\x3c\xab\x92\x5b\xa9\x03\x45\x70\x45\
+\xd6\x44\x59\x65\xf4\x96\xcc\x20\x74\xad\x8d\x16\xa6\x22\x60\x6d\
+\x74\xb7\x08\xee\x1b\xa7\x63\x8c\xb3\xab\xc8\xda\xa4\x12\x63\x05\
+\x62\xf8\x49\x06\x2e\xba\xee\x1b\xa7\x33\x2c\xf8\xc6\xe9\x14\x48\
+\x1c\x97\x49\x14\x0a\x8c\x85\xbb\xee\x4e\x7a\xbe\x6f\x9c\x8e\x8a\
+\xae\xa7\x24\x66\xcb\x24\x72\x37\x61\x2f\x0c\xef\x88\xca\x69\x55\
+\x78\x6a\xed\xaa\xa8\x6c\xa7\xb2\x7f\xc5\x1b\x33\x73\xd0\xcd\x74\
+\x60\x0c\x7c\xa3\x0c\x0e\xe0\xbb\xee\x8e\x8a\x6e\x90\xed\x44\xd7\
+\xda\x68\x3e\x3d\x7f\xa4\x03\xbd\x30\xbc\x2d\x2a\x6f\x0a\xe0\xaf\
+\xcb\xe0\xa9\xac\x35\x51\x79\x45\x49\x27\x12\xef\x05\xfd\x5b\x88\
+\xbe\x9b\x06\xfc\x4f\x66\xb8\x8e\xc8\xcb\xb4\x84\xd0\x98\x37\x66\
+\xee\x3d\x8c\x1c\x95\x75\x2b\x0d\x47\xb5\x3d\x29\x1c\xc0\xf3\xdc\
+\x6d\x54\xdb\xa4\x6e\x87\x32\xd8\x1a\x5e\x5c\x0a\xe8\xe8\x41\x54\
+\x51\x6d\x7b\x9e\xbb\x3d\x29\xbc\x44\xe2\x3c\x23\x20\x2a\x4f\x80\
+\xcf\xc0\x37\x41\x5a\xd3\x80\x27\x25\xe2\xa7\xe8\x57\xa0\xc7\x05\
+\xeb\xff\x00\xe0\x37\x93\x02\x62\x58\xa2\x39\x4a\x39\x00\x00\x00\
+\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x00\xce\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x00\x80\x49\x44\x41\x54\x58\x85\xed\
+\xd2\x21\x0e\xc2\x40\x14\x84\xe1\x7f\x96\x3b\x90\x70\x13\xe4\x9e\
+\x81\x0b\x20\x30\x1c\x09\x81\xc6\xd6\x22\xeb\x38\x0a\x49\xef\x40\
+\x07\xd5\x26\x0d\x09\xae\x5b\x33\x9f\x7b\x6f\x37\x99\x11\x0f\x22\
+\x22\x22\x36\xa6\xc5\x64\xab\xf6\xec\xd6\x0c\xec\x2b\x1f\x24\xff\
+\x14\x38\x76\xae\xb6\x1f\xc0\x61\xcd\x02\xc0\x50\xd0\xf9\x75\xd2\
+\x13\xa0\x4c\x5b\xdb\xb7\x06\xe1\x00\xfb\x11\xdf\xa7\xa1\xfc\xfb\
+\xd9\xc2\x5c\x40\xd2\x15\x78\x37\xc8\x1c\x3c\xea\x32\xe7\x2e\x9e\
+\x36\x38\xc2\x88\x88\x88\xcd\x7d\x01\x5e\x93\x20\x04\x37\xe4\x99\
+\xec\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x0b\x37\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x0a\xe9\x49\x44\x41\x54\x78\x9c\xed\
+\x5b\x7d\x70\x54\xd5\x15\xff\x9d\xbb\x9b\x4d\x22\xe6\x43\xc1\xaf\
+\x06\x3f\x30\xc8\x40\x43\xac\x12\xb4\xc6\xd2\xc8\x47\xb2\x18\x85\
+\x60\x36\xbc\x56\xb1\x68\x20\x9b\x08\x5a\xdb\xe2\xb4\x4e\x65\xa6\
+\xae\xb1\xda\xb1\x1f\x02\x23\xa3\x68\xd8\x40\x44\xa3\x6d\x97\x04\
+\x06\xac\x31\x5f\x76\x53\x14\x1c\x85\xd0\x22\x04\x18\x35\x44\xc5\
+\xd4\x56\x49\x42\x40\x20\xfb\x76\xdf\xe9\x1f\x21\xf0\xf6\xed\xdb\
+\xb7\x6f\x93\x5d\xa6\xd3\xf2\x9b\xd9\x3f\xde\xb9\xbf\x7b\xce\x79\
+\xe7\xdd\x77\xdf\xbd\xe7\x9e\x05\xce\xe3\x3c\xce\xe3\xff\x19\x74\
+\x2e\x8c\x14\x4a\x8b\x2e\x91\x15\x6b\x9e\x20\xce\x56\x18\x13\x09\
+\xb8\x16\xe0\x74\x10\xa5\x42\x81\x05\x84\x7e\x00\xfd\x20\xfe\x0c\
+\x0a\xf6\xb3\xa0\x0e\x41\xd8\xd6\xe4\x71\x1f\x8a\xb7\x6f\x71\x0b\
+\xc0\xcc\xbb\x2a\x32\x85\x35\x50\x2a\x98\x8a\x18\xb8\x7e\x98\x6a\
+\x0e\x31\x73\x03\x43\xd4\xb4\xd6\xaf\xdd\x09\x80\x63\xe9\x23\x10\
+\xfb\x00\xd0\xac\xe2\xb2\xd9\x24\xc4\xa3\x04\x9e\x11\x63\xdd\x7b\
+\x99\xb0\xa2\xf7\x62\xf1\xea\xae\xaa\x2a\x39\x56\x4a\x63\x16\x80\
+\xd9\x8e\xc5\x33\x14\x12\xbf\x03\x30\x35\x56\x3a\xf5\xc1\x5d\x04\
+\x3c\xd1\x54\x57\xbd\x01\x31\x18\x11\x23\x0e\xc0\xac\x22\xe7\x65\
+\x64\xc5\xb3\x44\xb8\xd7\x80\xa6\x30\xf0\x2e\x31\xbc\x0c\x3e\x20\
+\xc8\xf2\x09\x83\x7a\x64\x31\x70\x2c\x19\x14\xf0\x05\x90\x42\x24\
+\xd2\x40\x34\x0e\x8c\x09\x44\x9c\x0b\xa6\x02\x00\xc9\xe1\x14\x32\
+\xb0\xcd\x02\x5a\xda\x58\xb7\x76\xdf\x48\xfc\x1f\x51\x00\x66\x4b\
+\x65\x37\x2b\x0a\x6d\x06\x70\x85\xb6\x8d\x81\x63\x00\xde\x14\x44\
+\x5b\x03\x81\x81\xb7\x5a\x37\x6d\x38\x12\x8d\xee\x5c\x69\x59\xf2\
+\xa8\x40\xff\x4c\x82\x98\x0b\xe2\x22\x3d\x1b\x00\x4e\x01\x58\xdc\
+\x5c\xe7\x7e\x7d\x58\x37\x80\x11\x04\x20\xdf\x51\xb6\x80\x88\xd6\
+\x01\x48\x0c\x71\x8a\xe8\x39\x9b\xcd\xfa\xcc\x5f\x5e\x5b\xd3\x3b\
+\x5c\xfd\x6a\x48\x92\x64\xeb\x53\xd2\xca\x01\x3c\x0e\xe0\x52\x6d\
+\x3b\x01\x4f\xe7\x4e\xce\x78\xbc\xb2\xb2\x52\x89\x56\x77\xd4\x01\
+\x70\xb9\x5c\x62\xfb\xbe\xee\xa7\xc0\xfc\x98\xa6\x49\x01\x63\x9d\
+\x15\xa8\x6c\xa8\x77\x1f\x8e\x56\xaf\x19\x14\x15\x2d\x4e\x39\x61\
+\x15\x8f\x10\xe1\xe7\x00\x2e\x54\xb7\x31\x68\xb3\x5f\x24\x2c\xf4\
+\x7a\x5e\x38\x1e\x8d\xce\xa8\x02\xe0\x72\xb9\xc4\xf6\x0f\x0f\xd7\
+\x82\xe8\x6e\x8d\x96\x6e\x41\x5c\xdc\xe8\xa9\x7e\x3f\x1a\x7d\xc3\
+\x45\xa1\xc3\x39\xd6\x4f\xd8\x84\xd0\x09\x77\xb7\x35\xe9\xe4\xf4\
+\x86\xda\xda\x7e\xb3\xba\x2c\xd1\x18\xb6\x8d\xbe\xae\x12\x44\x0f\
+\x69\xc4\xef\x09\x16\xb3\x1a\xeb\xdc\x07\xa3\xd1\x35\x12\x7c\xbc\
+\xbf\xbd\xff\xb2\xc9\xb7\xbd\x9a\xa0\xf8\xae\x21\x0a\x5a\x63\x5c\
+\x11\xf0\x27\x64\xe7\x4c\xce\xfc\x73\x47\x47\x87\xa9\x2f\x84\xe9\
+\x00\xd8\x1d\xce\x1f\x82\xb0\x5a\x23\x7e\x59\x4e\xf1\x4b\xad\xaf\
+\x57\xf7\x99\xd5\x13\x2b\x1c\xee\x78\xcf\xdf\xb9\xbf\x7d\x53\xe6\
+\xa4\x1b\x4f\x80\x28\x1f\xa7\x47\x33\x01\x13\x4e\x21\x39\xa9\xb3\
+\xa3\xbd\xc5\x8c\x1e\x53\xaf\x40\x41\xc9\xe2\xa9\x80\xd8\x06\x20\
+\x49\x25\x7e\xb5\xb9\xce\x7d\x1f\xe2\xb0\x3a\x8b\x16\xf9\x0e\xe7\
+\xcf\x88\xb0\x52\x2d\x63\xc2\xfd\x2d\x1b\xdd\x1b\x22\xf5\x8d\x18\
+\x80\x59\xc5\xf7\x8d\x16\xc2\xf6\x0f\x00\x19\x67\xb5\xe3\x7d\x39\
+\xd5\x7f\x9b\xb7\xa6\xe6\x54\x54\x8e\x16\x3b\x27\x91\x05\xc5\xcc\
+\xb8\x9e\x80\xb1\x18\xfc\x05\x00\x1c\x26\xe0\x30\x33\xda\xc9\x82\
+\xfa\x61\xec\x01\xa8\xc0\xe1\xac\x06\x61\x91\x4a\xe6\x13\x2c\x72\
+\x1b\xeb\xab\xda\x0d\x3b\x46\x74\xba\xa4\xbc\x9a\xc0\x8b\x55\x3d\
+\xba\xe1\x53\x6e\x6a\xde\xb2\xae\xdb\x8c\x67\x83\x9f\xb0\xf4\xa5\
+\x00\x2f\x01\x30\xd1\x4c\x1f\x00\xbb\xc1\xf4\x5c\xba\xa5\xef\x15\
+\x8f\xc7\x13\x30\xd3\xa1\xb0\xf0\xe1\x44\xff\x05\x27\xdf\x06\x70\
+\xeb\x90\x8c\x81\x76\xff\x91\x8c\xef\x7a\xbd\x95\xfe\x70\xfd\x84\
+\x91\xd2\x7c\xa9\x62\x5a\xd0\xcd\x03\xcc\x0a\x4a\xcc\xde\xbc\xbd\
+\xa4\xec\xae\x3e\x25\x6d\x1f\xc0\xab\x60\xfe\xe6\x01\xe0\x46\x10\
+\xaf\xef\x53\xd2\x76\xda\x8b\x9d\x33\xcd\x74\x68\x68\x58\x3d\xa0\
+\xc8\x70\x80\xf1\xf5\x90\x8c\x80\x29\xb6\xd1\x5f\x3c\x68\xd4\xcf\
+\x68\x12\xa4\xcc\x89\x37\xd4\x82\xe8\x2a\x95\xac\xb6\xa5\xde\xad\
+\x9d\x08\x43\x90\x53\x51\x91\x90\x75\xf5\x0d\xab\x41\xf4\x2c\x80\
+\x8b\x23\x7a\x1f\x1e\x97\x83\x70\xff\xf8\xac\x29\xf4\x23\x69\xee\
+\xdf\xda\xda\xda\x0c\xe7\x9b\x43\x07\xdb\xbf\xb9\x76\xd2\x14\x99\
+\x08\xb7\x9f\x11\x32\x6e\x1a\x3f\x35\xeb\x85\x4f\xf6\xec\xd1\xdd\
+\x40\x85\x1d\x01\x05\x52\x79\x1e\x88\xa6\xa9\x44\xb2\xc2\x01\x57\
+\x24\x8f\xef\x5c\xb0\xf4\xa2\x8b\x8f\x28\x0d\x44\x64\x18\xf9\x68\
+\xc0\x0c\xd7\xf6\x7d\x5f\xfc\x69\xce\x9c\x8a\x0b\x22\x71\xfd\xa9\
+\xfe\x17\x01\x7c\x76\x46\x40\x18\xc3\x27\x92\x1e\x08\xc7\x0f\xff\
+\x0a\x30\x7e\x11\x2c\xa0\x97\x5a\xeb\xd7\x77\x1a\x19\x97\x24\xc9\
+\xe6\x1b\x90\x37\x03\x98\x15\xc9\xd1\xa8\xc1\x98\xef\x4b\x0c\x6c\
+\x70\xb9\x5c\x86\xaf\xad\xb7\xa6\xe6\x14\x98\x34\x0f\x8a\x1f\x91\
+\x24\x49\x77\xb4\xeb\x2a\x9b\x2e\x95\x5e\x0e\xe6\xdb\x55\x22\x59\
+\x91\xf9\xa9\x08\x2e\x52\x5f\x20\xed\x79\x00\x79\x11\x78\xc3\x06\
+\x83\x4a\xb6\xef\xed\x8e\x38\x0a\xd3\x2d\x7d\xaf\x00\xfc\x91\x4a\
+\x94\xd1\xab\xa4\xe7\xeb\x71\x75\x03\x90\xa0\x24\x2c\x40\xf0\xfc\
+\xf0\x76\xeb\x16\xf7\xbf\x8c\x8c\x16\x94\x38\xef\x05\xc1\x19\xc9\
+\xb9\x91\x83\x1f\x9f\xe5\x28\xd7\xbd\x99\x21\x78\x3c\x9e\x00\x98\
+\x3c\x6a\x19\x81\xef\xd7\xe3\x86\x19\x4e\x3c\x37\xa8\x33\xd1\x16\
+\x23\x83\xa7\xdf\xcd\x67\x8c\x38\xb1\x84\x20\x5e\x11\x6e\x48\x0f\
+\x81\x48\x68\x7d\xbe\x43\xaf\x4f\x48\x00\xec\x0b\x17\x8e\x82\xea\
+\x5b\x0a\x00\x0a\xd1\x1b\x46\xc6\x7c\x36\x7e\x04\xea\x85\x52\xfc\
+\x91\x7d\x34\x90\x56\x6a\x44\xc8\x9d\x7c\xc5\x07\x20\xa8\x47\x6d\
+\x5a\x3f\x52\x73\xb4\xbc\x90\x00\xf0\x49\xdb\x2d\x00\x6c\x2a\xd1\
+\xdf\x5b\x3c\x55\x9f\x69\x79\x43\x90\x24\xc9\xc2\xc4\x3f\x89\xec\
+\x73\x6c\xc1\x84\x9f\x1a\xb5\x57\x56\x56\x2a\x60\x04\x3d\x38\x85\
+\x45\x48\x9e\x32\xf4\x15\x60\x31\x59\x7d\x49\x84\x6d\x46\x86\x7a\
+\x39\xed\xfb\x00\x2e\x31\xe2\xc4\x09\xd9\x05\x25\x0f\x5c\x67\x44\
+\x20\x70\xb0\xef\x8c\x2c\x2d\x47\x27\x00\x98\xa4\xbe\x54\x14\xfa\
+\x28\x84\xa3\x36\xc2\x98\x6f\xd4\x1e\x4f\x30\x02\x25\x86\x04\x12\
+\x1a\xdf\x79\x92\x96\x12\x1a\x00\xe2\x6b\x82\x05\x8a\xe1\xb7\x1f\
+\xe0\x38\x67\x81\xc3\x83\x08\x21\xef\xb4\x1a\x3e\x92\xb5\xbe\x8f\
+\xd3\x72\xf4\xbe\x02\x29\x41\x46\x80\x08\x7b\x7d\x3a\x97\x93\x5f\
+\x30\x18\x63\x0d\xdb\x47\x85\xf8\x9e\xa2\xa5\x44\x0c\x80\x60\x0e\
+\x9b\x63\x3b\xbd\x2a\xd3\xcb\xd6\x9e\x2b\x18\x06\xc0\x5b\x53\x33\
+\x00\x40\xbd\x13\xb4\x49\x92\xa4\x9e\xe0\x75\x03\x10\xb4\x45\xf6\
+\x0b\x11\x76\x03\xd2\xd6\x06\x11\x46\xc7\xb9\x01\x21\x61\xa4\x2a\
+\x42\x9c\x27\xc6\xb1\x20\x02\x73\xc8\xb0\x19\x82\xd7\x5b\xe9\x27\
+\xc0\x70\x85\x18\x57\x28\x30\xcc\x3e\x4f\x2f\x2d\x4d\x04\x60\x55\
+\x89\x7c\x1e\x8f\xc7\xa7\xe6\x84\xae\x03\x06\x4f\x6a\xcf\x5e\x03\
+\xe9\x46\x46\x98\xf1\x45\x64\x4f\xe3\x03\x22\xe3\x00\x58\x7a\xac\
+\x69\x1a\xd1\x31\x2d\x27\x34\x00\xc0\xa7\xc1\x56\x42\x67\x4e\x4d\
+\xfb\x5e\xc3\xf6\xf8\xc2\xd8\x76\xa2\x72\x6d\xd0\x35\xa3\x4b\x4b\
+\xd1\x5b\x07\xec\x57\x5f\x12\xc8\x70\xb1\x01\xa6\x7a\xc3\xf6\x38\
+\x82\x58\x18\xda\x26\x16\x41\xbe\x33\x70\x40\xcb\x09\x09\x80\x60\
+\x04\x1d\x36\x32\x30\x4d\xcb\x51\x43\x4e\x95\x9b\x00\x44\x75\x1a\
+\x13\x23\x7c\xda\x58\x5f\xb5\xdb\x88\x20\x98\x83\x7d\xd7\x19\xad\
+\x21\x01\xf0\x59\x6d\x3b\x00\x9c\x49\x1f\x11\x30\xa5\xd0\xe1\x0c\
+\xfb\xb9\x19\xcc\x0c\x53\x8d\x09\x87\x63\x0b\x42\x15\x0c\x52\xf2\
+\x2e\x97\x4b\x30\x68\x4e\x90\x90\xe1\xd5\xf2\x42\x02\x70\xfa\x6c\
+\x6d\x87\x5a\xe6\x27\x8d\x22\x0d\xac\xc2\xff\x24\x80\xa3\x86\x0e\
+\xc7\x16\x9f\x1f\xa7\x94\x95\x46\x84\x77\x3e\xec\xce\x41\xd0\x1a\
+\x85\xfa\xfd\x3d\x19\x3b\xb5\x3c\xdd\x6f\x38\x01\x9a\xed\xaf\x52\
+\x64\x64\xac\xc1\xb3\xfe\x2b\xa6\x88\x19\xa3\x58\x62\xf9\x0e\xcf\
+\xca\x93\x46\x04\x12\x5a\x9f\xf9\x2d\xbd\xf4\xb8\x6e\x00\x58\x56\
+\x6a\x01\xa8\x8e\x9a\x69\x66\xa1\xb4\xc8\x70\xc7\xe7\xff\x7a\xec\
+\x2a\x00\x8d\x46\x9c\xd8\x80\x5e\x69\xae\x73\xd7\x1a\x31\x5c\x2e\
+\x97\x20\x26\xed\x26\xed\x65\x3d\xae\x6e\x00\x9a\xb7\xac\xeb\x26\
+\x42\x93\x4a\x94\x28\x2b\x56\xed\x71\x78\x10\xbc\xde\x4a\xbf\x1c\
+\xf0\xdf\xcd\x40\x3c\x0f\x49\xdf\x93\x53\xe4\x0a\x44\x38\x8e\xdb\
+\xb1\xaf\xfb\x1e\xa8\xce\x21\x08\xf8\x52\x3e\x92\xd1\xa4\xc7\x0d\
+\xbb\x8c\x65\xf0\x1f\xd4\xd7\x04\x7e\x68\xa6\xa3\xec\x6a\x23\xc3\
+\xde\xcd\x35\x7d\xcc\x81\x3b\xe2\x14\x84\x9d\x8a\x8c\xbb\x22\x1d\
+\xc7\x49\x92\x64\x63\xe6\x5f\xab\x65\xcc\xbc\x32\xdc\xe9\x50\xd8\
+\x00\x34\x6f\xac\x7e\x9b\x38\x68\x32\xb4\x59\x08\x4f\x44\xf2\xb2\
+\xb5\x7e\x7d\xa7\x3f\xe0\xbf\x05\x20\xdd\x88\x0f\x0b\xcc\x7f\x3c\
+\x2e\x52\xf2\x22\x25\x66\x01\xa0\x57\x49\xad\x40\xf0\xb6\xb7\x27\
+\xd9\xcf\x6b\xc2\xf1\x8d\x36\x32\xac\x08\x2c\x0f\x16\xd1\x7d\x76\
+\xc9\x69\xb8\x07\x07\x06\x47\x82\x7c\xe4\x5b\x77\x82\xe8\x97\xac\
+\xb3\xfc\x34\x0d\xc6\xd7\x00\x2d\x6d\xae\xaf\x5e\x10\x69\xd2\x03\
+\x80\xe9\xf7\x54\x8c\x21\xd0\xaf\x34\x3a\x7e\xb3\x65\xcb\xba\xb0\
+\x3e\x18\x66\x56\x3b\x3b\xda\xbb\x32\xbf\x9d\x93\x09\xe0\x3b\xa7\
+\x45\x04\x46\xe1\xb8\xeb\xa6\xbc\x76\xe8\x60\xfb\x37\x46\x7d\xbb\
+\xba\xda\x94\xce\x8e\xf6\x77\xc7\x4f\xbc\xb9\x9a\x48\xb9\x10\x40\
+\x16\x60\x7a\xf7\x76\x94\x80\x55\x6c\x11\x3f\x68\xd9\xb8\xf6\x5d\
+\x33\x1d\x24\x49\xb2\xc9\x72\xe2\x56\xd0\xd9\xb4\x17\x01\x7b\x7a\
+\xc6\x88\xb2\x7f\xee\xda\x15\xb6\x76\x28\xe2\xe9\xb0\xbd\x78\xc9\
+\xa5\x6c\xf1\xef\x01\xe3\x32\x95\x78\xbb\xf5\x44\xf2\xcc\x86\x86\
+\xd5\x03\x66\x9c\x03\x06\x53\xe7\xa7\x92\x94\xdb\x05\xa3\x84\x81\
+\x6c\x0c\x66\x91\x87\xce\x0d\xbf\x02\xa8\x1b\xcc\xed\x24\xc8\x93\
+\x46\x7d\xad\xda\x5d\x5b\x24\x14\x94\x38\xd7\x00\x58\xa2\x12\xc9\
+\x42\xf0\xb4\x48\x65\x3b\xa6\x0a\x24\xf2\x1d\xce\x5b\x88\xe0\x85\
+\xaa\x22\x8c\x41\xeb\x5a\xea\xd6\x3a\x31\x82\x02\x89\x5c\x69\x59\
+\x72\xfa\x71\xbf\x12\x4d\x20\xf5\x60\x9f\x5f\xfe\x20\x33\x3f\xaf\
+\x96\x11\xc3\xd9\x54\xef\xae\x8e\xd4\xd7\x74\x91\x54\x81\xa3\x6c\
+\x21\x88\x82\x2a\x2e\x18\xa8\xba\x48\x1c\x7d\x38\xda\xa7\x15\x43\
+\x90\xbd\xc4\xf9\x30\x03\x2b\xa1\x9a\xcf\x88\xb0\xaa\x69\xa3\x7b\
+\x99\x19\x05\xa6\x6b\x84\x3a\xf7\xef\xde\x93\x99\x95\x73\x01\x80\
+\xef\x9d\x31\x04\xe4\x9c\x52\x92\xf2\xae\xba\x61\xea\x1b\x5d\x7b\
+\x77\x9d\x88\xc6\xf3\x91\x42\x92\x24\x5b\xc6\xa4\x5b\x5f\x02\xb0\
+\x1c\xc1\x0f\xb2\x51\x3e\x92\xb1\xa8\xab\xab\xcd\x54\xcd\x60\x54\
+\xe9\xac\x74\xea\x5b\x8e\xc1\xf2\xb4\xb3\x20\xdc\x96\xe0\x0b\x7c\
+\x90\x2f\x55\x64\x47\xa3\x6b\x24\xb0\x17\x2f\xb9\xb4\x2f\x90\xda\
+\x0a\xa0\x4c\xd3\xb4\x4f\x0e\xf8\xef\x36\xaa\x08\xd1\x22\xea\x42\
+\x49\x49\x92\x2c\xbd\x4a\xfa\xef\x09\xac\x1d\x62\x32\x80\x35\xa4\
+\x58\x9f\x6e\xda\xf4\xe2\xbf\xa3\xd5\x6b\x06\xb9\xd2\xb2\xe4\x14\
+\xe5\xd8\x8f\x99\xf1\x18\x08\x17\x05\xb7\x72\x03\x0b\xcb\x3d\x2d\
+\x9e\xaa\xa8\x36\x65\xc3\x2e\x95\xb5\x3b\x9c\x65\x4c\x58\x83\xd0\
+\x4f\xdb\x71\x22\x3c\x6b\x49\x3c\xb9\x22\x9a\x82\x45\x23\x4c\x9f\
+\xee\xb2\x26\x8c\x39\x5c\x0a\xa6\x27\xa0\x7b\x06\xc9\x2b\xd2\x45\
+\xff\xa3\x66\xeb\x89\xd4\x18\x51\xb1\xb4\xdd\x51\x96\xc7\x44\xf5\
+\x00\x46\x87\xfa\x84\x5e\x02\xb6\x02\xd8\x6a\x49\x3e\xd9\x14\x6d\
+\x30\x24\x49\xb2\xf5\x04\xd2\xf3\x04\xf1\x5c\x00\xf3\x00\xe8\x2d\
+\xc3\x65\x62\x2c\x35\x33\xdb\x87\xc3\x88\xcb\xe5\xed\xf3\x16\x5d\
+\xc9\x56\xcb\x2a\x00\x0e\x03\x9a\x4c\x40\x1b\x13\xfe\xca\x4c\x07\
+\x2d\x4a\xe0\x63\x56\xb8\x27\x61\x54\xd2\x71\x85\xfa\x03\x03\xbe\
+\x94\x14\xc2\x40\x1a\x05\xc4\x38\x41\x98\xc0\x4c\xb9\x20\x9a\x0d\
+\x70\xaa\x81\xce\x0f\x48\x60\x69\x93\xc7\xbd\x6b\x24\xfe\xc7\xec\
+\x0f\x13\xf6\xf9\xe5\x85\xcc\xfc\x5b\x0c\x2e\x72\xe2\x07\x42\x37\
+\xc0\x4f\xa6\x53\xbf\x7b\x38\x43\x3e\x54\x5d\x0c\x31\x58\x4c\xdd\
+\x3d\x0f\xc4\x8f\x01\xb8\x29\x96\xba\x01\x74\x02\x58\x21\xa7\xf8\
+\xab\xa3\x2d\xd0\x34\x42\xdc\xfe\x34\x35\xbb\xa4\x3c\x8b\x81\x52\
+\x06\x17\x01\x98\x30\x1c\x1d\x04\x7c\xa9\x80\xde\x14\xac\xbc\x9c\
+\x9b\x3d\xf6\x9d\xe1\xfc\x1f\xc0\x84\x8d\xf8\xc3\x3e\x6f\xd1\x95\
+\x4a\x82\x65\x06\x81\xb2\x00\x65\x22\x98\xc6\x01\x48\x03\x90\x8a\
+\xc1\x93\x9b\xa3\x00\xfa\x01\xfa\x1c\xe0\x03\x0c\x1c\x60\x11\x68\
+\x6b\xf5\xac\xdf\x8f\xff\x82\x5a\xe4\xf3\x38\x8f\xf3\xf8\xdf\xc5\
+\x7f\x00\x80\x02\xea\x80\xb2\xb7\x05\xfa\x00\x00\x00\x00\x49\x45\
+\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x01\xb2\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x01\x64\x49\x44\x41\x54\x58\x85\xe5\
+\xd6\xb1\x4a\x03\x31\x1c\xc7\xf1\x6f\x72\x97\xfa\x06\x56\x90\x6a\
+\x29\x5d\xaa\x93\x93\x73\xeb\x03\x08\xfa\xa4\xe2\x52\x10\xda\x87\
+\x50\xeb\x52\x6e\x13\xd4\xc9\xfd\xae\xf7\x77\x90\x13\xda\x5e\xbd\
+\x24\x4d\xce\xc1\x8c\xc9\x1f\x3e\x3f\x92\x3f\x7f\x02\xff\x7d\xa9\
+\x36\xb1\x2c\xcb\xba\x5a\x9b\x3b\x34\xaf\xfd\x93\xde\x2d\x80\x6e\
+\x15\x4f\xd2\x39\x8a\x4b\x4a\x8e\xab\xfd\xb4\x55\x1c\x35\x02\x79\
+\x29\xcb\xe2\xba\x3a\x8b\xfe\x04\x5b\xf8\xaa\x18\x0f\x06\x83\xf7\
+\x56\x02\x34\xe1\x51\x03\xd8\xe0\xd1\x02\xd8\xe2\x51\x02\xb8\xe0\
+\xc1\x03\xb8\xe2\x41\x03\xf8\xe0\xc1\x02\xd8\xe2\xcb\xe5\xdb\x61\
+\x6a\xf2\x29\xf0\xd9\x3f\xed\x4d\x20\xc0\x24\x74\xc4\x67\xc0\x05\
+\x48\xa7\xda\xdf\x2b\x80\x07\x7e\x0e\x3c\x15\x79\xe7\xa6\x3a\xf3\
+\x7e\x02\x7f\xdc\x5c\x0d\x87\x47\x1f\x7b\x05\x08\x85\x7b\x05\x70\
+\xc4\xe7\xc0\x19\xf0\x5c\xe4\x66\xb2\x89\x3b\x07\x08\x8d\x3b\x05\
+\x88\x81\x03\x24\x21\xf1\x2c\xcb\xba\x49\x8a\x35\x0e\x16\x37\xe0\
+\x82\xeb\xc4\xcc\x5c\xf0\xc6\x00\x9e\xf8\xa2\xc8\xcd\xb8\x0e\x77\
+\x9a\x84\x91\xf0\xad\x49\x58\xfb\x27\x8c\x84\x57\xbd\xb1\x36\x09\
+\xb7\x9a\xd0\x0d\x4f\xe7\xa0\x7e\xc5\x6b\x1a\x73\x6d\x18\xe9\xcd\
+\x62\x47\x7c\x04\x2c\xca\x55\x5e\xdb\x70\x36\x8d\xa9\xd6\x8b\xfd\
+\x70\x9b\xba\x5d\x37\xa4\x01\x44\x44\xab\xc4\x3c\x34\xe1\x22\xa2\
+\x54\x62\xee\x9b\xf0\xcd\xba\x5d\xf8\x4f\x00\x00\x25\x1c\x08\x3c\
+\x36\xfc\x64\x94\x52\x74\xbe\xeb\xea\xf1\xba\x3a\x9b\x79\x80\x88\
+\x68\x11\x69\x1c\x4c\x22\xa2\x42\xd6\xfd\xf9\xfa\x02\x53\x42\xe8\
+\x88\x61\x1a\x4e\x81\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\
+\x82\
+\x00\x00\x03\x5e\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x03\x10\x49\x44\x41\x54\x78\x9c\xed\
+\x9b\x4d\x4f\x13\x51\x14\x86\xdf\x53\xd1\x21\x74\xa9\x84\x0f\xf7\
+\x6e\xb0\xdd\xb4\xc4\x8d\xfe\x0b\xc1\x48\x52\xdc\x98\x56\x89\xad\
+\xb2\x30\x81\x5f\xa0\x09\x0b\x4d\x5b\x23\xed\x4e\x49\x34\x01\xfe\
+\x05\xee\xa4\x1b\x0a\x2b\xd7\x14\x49\x74\x09\x32\x0a\x7d\x5d\xb4\
+\x94\x61\x66\x4a\x2b\x32\x3d\x6d\xb8\xcf\x6a\x3a\xe7\x4e\xf2\xde\
+\x27\xf7\xf6\x6e\xee\x01\x0c\x06\xc3\x65\x46\xda\x19\x14\x4d\x2c\
+\x84\xad\x81\xfe\x49\x02\xf7\x01\xde\x06\x30\x0a\xa0\x2f\xd8\x68\
+\xff\xcc\x21\x80\x0a\x20\x9b\x02\xac\xda\xfb\x07\xcb\x1b\x4b\x2f\
+\xf7\x5a\x7d\xd4\x42\x00\x25\x96\xcc\x4e\x8b\xc8\x2b\x00\x23\x17\
+\x93\xb3\x63\xec\x00\x98\x5b\x2f\xa4\x97\x00\x61\xb3\x41\x4d\x05\
+\xc4\x92\x85\xab\x02\x3b\x07\x41\x2a\x90\x78\x9d\x82\x28\x10\x56\
+\xba\x54\x4c\xfd\xf1\x2b\x37\x59\xc6\x14\x91\x7c\x1e\x40\xd2\x55\
+\x28\x8b\xe0\x0b\x88\xef\x55\xa0\x7a\xb1\x49\xff\x8f\x10\x10\x82\
+\x60\x98\xc4\x5d\x00\x91\x46\x41\x90\x12\xda\x00\xf8\xd4\x6f\x25\
+\xf8\xae\x80\x78\x2a\x3b\x0d\xe0\x83\xe3\xd5\x4f\x52\x32\xa5\xe2\
+\xb3\xcf\x67\x2d\xa7\xee\x80\x12\x4b\xe6\x1f\x8a\x30\x0b\xe0\xba\
+\xa3\xf0\x68\xbd\x90\xf9\xe8\x1e\xed\x11\x10\x4d\x2c\x84\xaf\x0d\
+\x58\xdf\x70\xb2\xe7\x7f\x90\x47\xd1\x52\x71\x76\x27\x98\xc0\xc1\
+\x10\x4b\xbe\x19\x11\xb9\xb2\x01\xe0\x06\x00\x80\xa8\xfc\xfe\x65\
+\xdf\x72\xff\x31\x86\xdc\x1f\x5a\x03\xfd\x93\x70\xfc\xe1\x91\xf2\
+\xbc\xd7\x26\x0f\x00\xa5\xe2\xec\x8e\x08\x5e\x34\x5e\x08\x46\xad\
+\xb0\x35\xe1\x1e\xe7\x11\x50\x3b\xea\x1a\x94\x6b\xcb\xbe\x37\xf9\
+\xba\x98\xfe\x04\xa0\x7c\xfc\x9b\x94\xd6\x02\xea\xe7\x7c\xed\x09\
+\x5c\xeb\xfe\x3d\x7f\x16\xc2\xda\x1c\xea\x90\x63\xee\x11\x3e\x02\
+\x30\x7a\x52\x94\xdd\x60\x82\x75\x8e\x53\x73\x10\xdc\xf4\xd6\xbd\
+\x34\x8e\xc6\x6e\x3b\xea\xce\x83\x6b\x0e\x9e\x63\xdf\x4f\xc0\xa5\
+\xc2\x08\xd0\x0e\xa0\x8d\x11\xa0\x1d\x40\x1b\x23\x40\x3b\x80\x36\
+\x46\x80\x76\x00\x6d\x8c\x00\xed\x00\xda\x18\x01\xda\x01\xb4\x31\
+\x02\xb4\x03\x68\x63\x04\x68\x07\xd0\xc6\x08\xd0\x0e\xa0\x8d\x11\
+\xa0\x1d\x40\x1b\x23\x40\x3b\x80\x36\x46\x80\x76\x00\x6d\x8c\x00\
+\xed\x00\xda\x18\x01\xda\x01\xb4\x31\x02\xb4\x03\x68\x63\x04\x68\
+\x07\xd0\xc6\x08\xd0\x0e\xa0\x8d\x9f\x80\x43\x47\xb1\xe7\x05\xb9\
+\xe6\x70\xe8\x53\xf7\x50\x39\x7e\xa8\x82\x43\x41\x84\xea\x24\xa7\
+\xe6\x40\x6c\xbb\xeb\x3e\x02\x64\xb3\xf1\x04\xb9\x07\xb0\xad\x9e\
+\x82\xee\x84\x52\x9b\x43\x1d\x91\x2d\xf7\x08\x8f\x00\x01\x56\x1d\
+\x3f\x23\xe3\xa9\xfc\x64\x30\xe1\x82\x27\xfe\x24\xfb\x00\x8e\x9b\
+\xe3\x22\x5c\x71\x8f\xf1\x08\xb0\xf7\x0f\x96\x51\x6b\x36\x00\x00\
+\x50\x98\xbb\xf3\xf8\x6d\xcf\x6d\x85\xf1\x99\x77\xc3\x80\x64\x1b\
+\x2f\x88\x8a\xbd\x67\xb7\x16\x50\xbf\x4d\x3d\xe7\xf8\x70\xf0\xa8\
+\x2f\x54\x8e\x25\x73\x53\xbd\xb1\x1d\x28\xb1\x64\x6e\x8a\xd5\xa3\
+\x0d\x10\x83\x8d\xd7\x82\x79\xbf\x16\x9a\x26\x13\xa2\xc4\x93\xb9\
+\xf7\x3e\xdd\x22\x65\x82\x6b\x21\xc8\x6e\xb7\xdd\x22\x0d\x01\xa1\
+\x2a\x38\x54\xdf\xf3\x91\xd3\x55\x2e\xae\x17\x32\x33\x7e\xf7\x9e\
+\x9b\x74\x8c\x08\x89\x42\x5a\x68\xc3\x25\x21\x22\x90\x08\xd1\x66\
+\xb7\x55\x07\xa9\x65\xf2\x4b\xc5\x45\xb2\x3f\xd3\xec\xd2\x77\xcb\
+\xa6\xa9\x78\x2a\x97\x00\xf0\x1a\xbd\xd6\x34\x45\x54\x20\x98\x3f\
+\x77\xd3\x94\x93\x68\x62\x21\x6c\x85\xad\x09\x52\x26\x40\x8e\xd5\
+\x6f\x5d\x77\x5f\xdb\x1c\xb1\x0d\x91\x2d\x11\xae\xd8\x7b\xf6\x4a\
+\x3b\x6d\x73\x06\x83\xe1\x72\xf3\x17\xf4\xb0\xe5\x26\x61\x1e\x11\
+\x45\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x01\x8d\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x01\x3f\x49\x44\x41\x54\x58\x85\xed\
+\x92\xb1\x4a\x03\x51\x10\x45\xcf\x4d\x02\xa2\x18\x82\xad\xac\xd9\
+\x4d\x5a\xc1\x5f\xb0\xb0\xb4\xb0\xb3\x13\xed\x2c\xfc\x02\x41\xb0\
+\xb2\xf1\x07\x14\x49\x61\xab\x62\x67\x2d\xe8\x1f\xf8\x03\xba\x6f\
+\xb3\x20\xa6\xd1\xca\x42\x93\x37\x56\x09\x62\xb7\x6f\x61\x1b\xf7\
+\x74\x03\x33\x77\x0e\xef\x0d\xd4\xd4\xd4\xfc\x77\x54\xa4\xd9\xcc\
+\xe4\xb2\xdc\x03\x98\x1f\x2f\xf5\x7a\xbd\x8f\xb2\x02\x8d\x82\xfd\
+\x33\x61\x35\x5a\xef\x66\xd6\xac\x54\x40\x92\x17\xda\x9e\xd6\x2e\
+\xcb\xc7\x95\x0a\x00\xc4\x71\x74\x83\xe9\x64\x5a\xa7\xe9\xf0\xa9\
+\x52\x01\x80\x24\x89\x8e\x80\x7b\x00\xc4\x9a\x73\xd9\x59\xa8\x40\
+\xa1\x23\xfc\x4b\xea\x86\xf6\x2b\x68\x3f\x8e\x57\x2e\x2a\x15\x30\
+\xb3\x86\xcb\xf2\xc9\xb4\xf6\xb2\xf5\x7e\xb7\xfb\x58\x24\x23\xe8\
+\x0b\xa6\x48\xf2\x0b\xf3\x73\xed\x59\x98\xe9\xa1\x68\x46\x29\x01\
+\x80\xd1\x68\xf4\x05\x4a\x43\xe7\x4b\x09\x98\x99\x16\xdb\x9d\x01\
+\x58\x02\x7a\xf3\x93\x66\x52\xa9\x40\x9a\xe5\xc7\xc0\x0e\xf0\x29\
+\x26\x9b\xfd\xfe\xb2\x2b\x9a\x11\x7c\x84\x2f\x2e\xdf\x15\x76\x09\
+\x78\xa1\xad\x38\x8e\xee\x42\x72\x82\x5e\xc0\xb9\x7c\x43\xd8\x00\
+\xc0\xa4\x83\xd0\xe5\x41\x02\xce\xb9\x55\xc3\x6e\x81\x96\xc1\x69\
+\xaf\x1b\x9d\x87\x2e\x2f\x2c\x60\x66\x32\x1a\xd7\x40\x47\xe8\x2a\
+\xe9\x46\x87\x65\x96\x03\xb4\x02\x66\x5e\x81\x67\xef\xbf\xf7\x24\
+\xf9\xb2\x02\x35\x35\x35\x35\x3f\x6e\x39\x66\xc8\x1a\xa6\xbc\x56\
+\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x01\x83\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x01\x35\x49\x44\x41\x54\x58\x85\xed\
+\x97\x31\x4e\x02\x51\x14\x45\xcf\x65\x12\x28\x91\x06\xd7\x30\x1b\
+\x18\x22\xb5\x09\xb4\x1a\x3b\x56\x81\xb5\x5a\x48\x2f\xab\xa0\x53\
+\x8c\x95\x31\xb1\x36\x71\x36\xc0\x1e\x68\xc0\x52\x93\x99\x6b\x01\
+\x93\x20\x82\x85\x99\x89\x85\xff\x96\xef\xbf\xfc\x7b\xf2\xfe\x2f\
+\xde\x85\xff\x2e\x6d\x17\x92\x5b\xf7\x54\xf3\x39\x90\x00\x07\x25\
+\xf9\x2c\x81\xd4\xb9\x6e\xd2\x33\x3d\xed\x05\xe8\xdc\x65\x23\xa4\
+\x0b\xc3\xbb\x60\x66\x78\x2b\xc3\x5d\xd0\x34\xc4\x82\x06\xf2\xe8\
+\xf5\x24\xba\xfa\x06\x70\x34\x75\x3f\xc7\x8f\x88\xe7\xc8\x1a\xbc\
+\x9c\x6a\x5e\x86\x79\xa1\xee\xd4\xed\x4c\x9e\x60\x8e\x9d\xab\x5f\
+\x4c\xa2\x56\x34\xe4\x78\x68\x78\xaf\xc2\x1c\xe0\xe5\x54\xf3\xc8\
+\x1a\x00\x1f\x8a\x3c\x2c\xea\xb5\x8d\x9e\x44\x30\xab\xc2\x7c\x13\
+\x02\x98\x61\x92\x5d\x00\x07\x65\xbd\xf9\x4f\xf2\xea\x43\xb6\x76\
+\x01\xfc\x89\x02\x40\x00\x08\x00\x01\x20\x00\x04\x80\x00\x10\x00\
+\x36\x01\x96\x82\x66\xd5\x86\x5a\xad\xfa\x8b\x5d\x00\xa9\x21\xee\
+\x4e\xdd\xae\xca\x7c\x7d\x77\x8c\x48\xbf\x01\x38\xd7\x8d\xa0\x91\
+\xc9\x93\x2a\x20\x3a\x0f\x3e\xcc\xe4\x09\x50\x77\xa6\x71\x51\xff\
+\x1a\x4c\xee\xb3\x6b\xac\x4b\xe0\x83\x55\x30\x59\x96\x61\xbe\x1e\
+\x7b\x0c\xd4\xf7\x06\x93\x42\xc9\xad\x7b\x8a\x3c\x5c\xaf\xce\xad\
+\xed\xf3\x5f\x6a\x81\x48\x9d\x69\xbc\x1d\xcd\x82\x3e\x01\x68\xb1\
+\x6f\x2f\x7c\x41\x27\x3e\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\
+\x60\x82\
+\x00\x00\x03\xeb\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x03\x9d\x49\x44\x41\x54\x78\x9c\xed\
+\x9b\x3f\x6c\x52\x51\x14\xc6\xbf\xf3\x78\xe8\xa4\xd8\xa8\x69\x22\
+\xc6\xa9\x83\x75\x50\x6b\x5d\xdc\x48\x10\x1c\x34\xa4\xa6\x25\x0e\
+\xd6\xd8\x28\xb3\x71\x33\x61\x90\xd4\xc4\x18\xdd\xd4\xc5\x01\x4c\
+\x35\x2e\xa6\xf6\x4f\x88\x0e\x52\x9b\x30\x54\x5d\xaa\x55\x07\x98\
+\xea\x60\x64\xa8\xf1\x1f\x6e\xd8\xf2\x8e\x43\xd1\x3e\x1e\x0f\x5a\
+\x7a\xdf\xe3\xb6\x72\x7f\xdb\x3d\xef\xdc\xc3\x77\xbf\xbc\x77\xef\
+\x4d\xb8\x17\x50\x28\x14\xed\x0c\xad\x25\x29\x10\x48\xe8\xfa\xae\
+\x42\x84\x18\x67\x00\x1c\x05\xe0\x07\xb0\xd5\x55\x65\xcd\x53\x02\
+\x50\x00\x30\xcb\x84\xc7\x4b\x5f\xfd\xe9\x6c\x76\x78\x69\xb5\x4e\
+\xab\x1a\x10\x3e\x1d\x0b\xb1\x86\xdb\x00\xba\x1d\x10\xd9\x42\x28\
+\x47\x06\x5f\xce\x4c\x24\xa7\x1a\x65\x79\x1a\x55\x08\x0d\xc4\xe2\
+\x20\x8c\x00\xd8\xed\xa8\xb6\xd6\xb0\x1b\x84\x73\x5d\xdd\x3d\xbf\
+\xe7\xf3\x73\x2f\xeb\x25\xd5\x35\x20\x34\x10\x8b\x83\x71\xdd\x1d\
+\x6d\x2d\x84\x28\xd8\xd5\xdd\x53\x9a\xcf\xcf\xcd\xd8\x3e\xb6\x0b\
+\x56\x5e\xfb\x4c\x55\x90\xf1\x83\x89\xaf\x6a\x1a\x3d\xf3\xa1\xf8\
+\x69\x74\x74\xb4\xec\x82\xdc\x75\x13\x8d\x46\x3d\x45\xf8\xf6\x19\
+\x06\x9f\x24\xa6\x6b\x20\x74\x98\x9f\x93\x81\xb0\xdd\xe7\x50\x63\
+\x40\x20\x90\xd0\xbd\x3b\x0b\x1f\x60\xfa\xe6\x09\x78\x51\x5e\xc4\
+\xe0\x74\x3a\xb9\xe0\x8a\x7a\x87\x09\x46\x62\x9d\x1e\x2f\x1e\x31\
+\x70\x7c\x25\x4a\xb9\xc5\x6f\x7b\x0e\x59\x27\x46\xcd\xda\x59\xdf\
+\x55\x88\xa0\x7a\xc2\xfb\x0e\x43\x3f\xbb\x59\x06\x0f\x00\xd3\xe9\
+\xe4\x42\x79\x11\x83\x60\xfc\x58\x89\xf2\x81\xca\xd8\xaa\xa8\x31\
+\xa0\xb2\xd4\xad\x74\x03\x27\x32\x13\xf7\xbe\xb8\x21\xd4\x4d\xa6\
+\xd3\xc9\x05\x06\x25\xcc\x31\xeb\xd8\x00\x1b\x03\xb0\xbc\xce\xaf\
+\x24\x68\xf4\xcc\x61\x6d\x2d\x43\xf3\xf0\x53\x73\x9b\x80\xde\x9a\
+\x1c\x9b\x7e\x7e\x73\xc3\x87\xe2\x27\x87\x75\xb5\x0c\xab\x76\x06\
+\xf6\x5a\x73\xec\x0c\xa8\xda\xe1\x6d\xb4\xd9\xbe\x19\x6c\xb4\xd7\
+\xec\x5e\xed\x0c\x68\x2b\x94\x01\xb2\x05\xc8\x46\x19\x20\x5b\x80\
+\x6c\x94\x01\xb2\x05\xc8\x46\x19\x20\x5b\x80\x6c\x94\x01\xb2\x05\
+\xc8\x46\x19\x20\x5b\x80\x6c\x74\x27\x8a\x84\x06\x2e\x84\xc1\x9e\
+\x5b\x00\x1f\xc4\x1a\xff\x6b\x10\x80\x01\xbc\x07\x19\x57\xa6\x9e\
+\xdc\xcf\xac\x9a\xbd\x0a\xc2\x6f\x40\xb8\xff\xe2\x79\xb0\xf6\x1c\
+\xe0\x43\x70\x7f\xf0\xa8\xfc\xc6\x61\xb0\xf6\x3c\xdc\x7f\xf1\xbc\
+\x68\x31\x21\x03\x02\x7d\x43\x3b\x0c\xd0\x5d\x51\x11\xeb\x85\xa1\
+\xdd\x09\xf4\x0d\xed\x10\xa9\x21\x64\xc0\x16\xdd\x7b\x8c\x80\x6d\
+\x22\x35\xc4\xe0\xed\x5b\x74\xef\x31\x91\x0a\x6d\x3f\x09\x0a\x19\
+\xf0\x7b\x69\xf1\x35\x40\xbf\x9c\x12\xd3\x3c\xf4\x6b\x59\xc3\xfa\
+\x11\x32\x20\x3b\x39\xf2\x93\x60\x5c\x12\xa9\x21\x02\xc1\xb8\x94\
+\x9d\x1c\xf9\x29\x52\x43\xf8\x13\xc8\x8c\xa5\x1e\x80\x8c\x13\x00\
+\xde\x61\x79\x89\x72\x1b\x06\xe8\x3d\xc8\x38\x91\x19\x4b\x3d\x10\
+\x2d\xe6\xc8\x3e\xa0\xb2\x1e\x0b\xaf\xc9\x32\x50\x93\xa0\x6c\x01\
+\xb2\x51\x06\xc8\x16\x20\x1b\x65\x80\x6c\x01\xb2\x51\x06\xc8\x16\
+\x20\x1b\x65\x80\x6c\x01\xb2\x51\x06\xc8\x16\x20\x1b\x65\x80\x4d\
+\xac\x64\x6e\x44\xa3\xd1\x46\xe7\x89\x37\x34\x36\xda\x4b\xd6\x1c\
+\x3b\x03\x0a\xe6\x46\x11\xbe\x7d\x4e\x8a\x6a\x25\x56\xed\x04\x7c\
+\xb6\xe6\xd8\x19\x30\x6b\x6e\x18\x06\x9f\x74\x58\x57\xcb\x30\xca\
+\x74\xca\xdc\x66\xe0\x8d\x35\xa7\xc6\x00\x26\x3c\x36\xb7\x89\xe9\
+\x5a\x30\x12\xeb\x74\x5e\x9e\xbb\x04\x23\xb1\x4e\x02\x0f\x9b\x63\
+\xd6\xb1\x01\x36\x06\x2c\x7d\xf5\xa7\x01\xe4\xff\x05\x08\x1d\x1e\
+\x2f\x1e\x6d\x26\x13\xfe\x1e\x96\xae\x3e\x31\x4e\xb9\xca\xd8\xaa\
+\x68\xee\xb8\x3c\x28\xa1\x79\xf8\xe9\x86\x3e\x2e\x5f\xa6\x53\x04\
+\x1e\x5e\xf7\x71\xf9\xbf\xfc\x37\x17\x26\x00\x10\x73\x3c\x33\x9e\
+\xba\x61\xf7\xac\xee\x12\xf7\x31\xf7\x76\xa6\xab\xbb\xa7\x04\xa2\
+\xa0\x7b\xd2\x5c\x87\x19\x88\x4f\x8d\xa7\x6e\xd6\x4b\x68\xb8\xc6\
+\xcf\xe7\xe7\x66\xba\xf6\x1f\x79\x05\xa2\x5e\x6c\xba\x7b\x43\x94\
+\x23\x03\x83\x53\xe3\xc9\x87\x0d\xb3\xd6\x52\xca\x7c\x6d\x8e\x80\
+\xde\xca\xa9\xeb\x0d\x77\x6d\x8e\x80\xcf\x0c\xbc\x69\xe6\xda\x9c\
+\x42\xa1\x68\x6f\xfe\x00\x06\x14\x1b\x10\x41\x9d\x58\x08\x00\x00\
+\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x04\x15\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x03\xc7\x49\x44\x41\x54\x58\x85\xe5\
+\x97\x51\x48\x5d\x65\x1c\xc0\x7f\xff\xef\xea\x5d\xf3\xc1\x6d\x21\
+\xcc\x4a\xd9\x26\x2b\xb6\xa8\x1e\x5a\x0c\x0a\x56\x2b\xf5\x9a\x0c\
+\xa7\x33\x0e\x11\x42\x36\x6d\x16\x44\x2f\x41\xe0\xe8\xe1\x20\x45\
+\x13\x7a\x2a\xc6\x62\x4e\x2d\x22\x9f\xae\x57\x4b\x6b\xb6\x7b\x75\
+\x5c\x5f\x16\xc3\x42\x46\x2b\x84\xc8\x46\x5d\xb5\x88\x0d\x8d\x5a\
+\xea\xbd\xf7\xfb\xf7\x70\xaf\x76\xbd\xd7\x39\x2f\x5e\x7b\xd9\xff\
+\xe9\x9c\xef\xfc\xbf\xff\xef\xf7\x1d\xce\x39\xdf\xff\xc0\x9d\x1e\
+\x92\x4d\xb2\xaf\xf6\x78\xa9\xf5\xe4\xd5\x89\xb1\x15\xa8\x94\x02\
+\x25\x80\x11\x98\x52\x88\xa0\x3a\x8a\xe4\xf5\x87\x02\x67\x7f\xcc\
+\xa9\x40\x95\xd3\x7c\x30\x6e\x4d\xbb\xa0\x4f\xaf\xb3\xee\x18\xa2\
+\x27\x43\xbd\x5d\x23\x1b\x12\xa8\x70\x5a\xb6\x89\xb5\x1f\x02\x2f\
+\x24\x87\x66\x14\x06\x0d\x3a\x14\x47\x26\xbd\x26\x3e\xb3\x18\x8b\
+\xdb\x3c\xb3\xa5\x38\xae\x76\xb7\x88\xf8\x80\x5a\x60\x57\x32\xff\
+\xbc\x8d\xd2\x34\x32\xd0\xf9\x7b\xd6\x02\x55\x4e\xf3\x5e\x6b\x65\
+\x00\xd8\x9f\x00\x8b\x1b\xbb\x7e\xef\x47\xe1\x70\x5b\x6c\x2d\x69\
+\xd7\x75\xcd\xa5\xab\x53\xcf\x03\xef\x00\x65\xc0\x2f\xc6\xda\xa3\
+\x17\xfa\xbb\xaf\xac\x5b\xa0\xbc\xfe\x78\x99\xc1\x73\x19\xa1\x48\
+\xe0\x73\xcf\x5d\xff\xbc\x38\xd4\xd3\xf3\xe7\x5a\xe0\xf4\xa8\xae\
+\x7e\x7d\x4b\xb4\x60\xfe\x8c\xa0\x4d\xc0\xdf\x8a\x1e\x1a\x0e\x74\
+\x8d\xdf\x56\xa0\xba\xa1\xa1\x30\x36\x5f\xf0\x35\xe8\x83\xa0\xef\
+\x3f\xf1\x50\xc9\x1b\x6d\x6d\x6d\x36\x1b\x78\x6a\x7d\x5f\x7d\x73\
+\xab\x8a\xbc\x0b\x44\x8c\x9a\x83\x17\xfa\x3a\x66\x52\x13\x4c\xfa\
+\x8c\xd8\x7c\xc1\xe9\x04\x9c\xc1\x0d\xc2\x01\x34\xd8\xd7\xd5\x8e\
+\xd2\x09\x94\x58\x63\x3f\x25\x6d\xd1\x2b\x4e\x2a\x9f\x6b\x7a\x0c\
+\xcc\x18\xf0\x87\x1a\x73\xff\xb0\xbf\x63\x6e\x03\xf0\xe5\x70\x1c\
+\xc7\x3b\x6b\xb7\x5d\x01\xf6\x01\x47\x42\x81\xce\xf3\x4b\xd7\x56\
+\xdc\x01\xc1\x9c\x02\x50\x95\xb7\x73\x05\x07\xf0\xfb\xfd\x8b\x2a\
+\xbc\x95\x3c\x6d\x27\x65\xe1\xcb\x02\x55\xf5\x2d\xf7\x28\x94\x03\
+\x37\x76\x78\x66\xcf\xe6\x0a\xbe\x14\xc3\xbd\x9d\xfd\xc0\x04\xf0\
+\x70\xd5\xb1\xa6\x47\x32\x04\x14\x5b\x93\x30\x93\x2f\xfd\x7e\xff\
+\x62\xae\x05\x00\x45\x64\x00\x40\x3d\xe6\x58\xa6\x80\x70\x18\x40\
+\xd5\x7e\xb5\x09\x70\x00\x24\xae\x17\x00\xac\xf2\x4c\x86\x00\xaa\
+\xa5\x09\x3b\xfd\x79\xb3\x04\x8c\xe6\x4d\x02\x48\x62\x0f\x49\x13\
+\x90\xc4\x60\x7e\xd4\x3b\x93\x31\x33\x47\x21\x0b\xf9\x4b\xb5\xef\
+\x23\xf9\x20\x66\x7c\x07\xfe\xaf\x70\x5d\x37\x5d\x40\xa6\x00\x62\
+\x26\x56\xbc\x59\xd0\x85\xad\x37\x93\xb5\x75\x7a\xe9\x03\x97\xfa\
+\x0c\xfc\x0a\x20\xc2\x9e\xcd\x12\xc8\x47\xcb\x12\x2c\x22\x4b\x63\
+\xff\x09\x18\xc2\xc9\xa3\xaa\xcd\x12\x50\x31\x3e\x00\xc4\x5c\xcc\
+\x14\x58\xd4\xc1\xa4\xdd\x91\x03\x2d\x2d\xf9\x9b\xc0\x17\x45\x8e\
+\x26\xa9\xfd\x19\x02\xa1\x81\xee\x69\x84\x8b\x08\x45\x3b\xae\xdb\
+\x97\x73\x4d\xaf\xac\x3f\x51\x93\xdc\xe4\xbe\x0f\xf9\xcf\x2d\xf7\
+\x06\x2b\xde\x02\x6b\xa5\x15\x40\x04\xb7\xba\xa1\xa1\x30\x57\x70\
+\xc7\x71\xbc\x08\xa7\x00\x04\x3d\x09\xe8\xaa\x02\x23\x7d\xe7\xc6\
+\x54\xe9\x41\xd9\x19\x9f\xdf\xfa\x89\xeb\xba\xb9\x78\x4d\x65\x36\
+\xbe\xfd\x83\xe4\xea\xc3\xc1\x40\xd7\x17\xa9\x17\x33\x01\x1e\xf3\
+\x1a\x30\xa1\x50\x7b\xe9\x6a\xe4\xbd\x0d\x4a\x48\x65\x7d\xf3\x9b\
+\x88\xbe\x82\x30\x4d\xd4\x36\x90\xb2\x7a\xb8\x45\x4b\x96\xec\x07\
+\x2f\x03\x77\x03\x7d\x51\xe3\x6d\x0c\xfb\xcf\xfc\x95\x0d\xd9\x71\
+\x1c\xef\x9c\x2d\x3c\xad\xc8\x09\xe0\x26\xd8\xa7\x42\x81\xee\x6f\
+\xd2\xf3\x3c\xab\x4d\xfe\xe9\x87\xf1\x1b\x7b\xf6\x1d\xf8\x0c\xc1\
+\x27\x70\xc8\xa3\xf1\xc6\xbd\xfb\x1f\x9d\x2b\xdd\x59\xf3\xdd\xb5\
+\x6b\xa3\x6b\x76\x48\xae\xeb\x9a\xfc\xa2\x07\x9c\x05\xf5\xf6\x82\
+\x54\x92\x68\xc5\x7c\xc1\xbe\xce\x6f\x57\xcb\x5f\xb3\x2d\x3f\x5c\
+\xf7\xd2\xf6\x7c\x93\xd7\x81\xe0\x24\x87\x22\x02\x83\xa0\x43\x82\
+\x99\xc4\xd8\x99\x85\x68\xdc\x7a\x3d\xde\x62\x8b\xee\x02\xaa\x04\
+\xad\x25\xd1\x0d\x03\x12\x8c\x9a\x68\x63\xd8\xff\xf1\x6f\xb7\x62\
+\xac\xeb\xc7\xa4\xdc\x69\x7a\xdc\x58\xd3\x0e\x3c\xb9\x9e\x7c\x60\
+\x1c\xb1\xad\xa1\xde\xee\xe0\xed\x12\xb3\xfa\x35\x7b\xb6\xee\xd5\
+\xdd\x31\x13\xab\x13\x23\x15\xa2\x5a\xaa\x89\x6d\xd5\x03\x44\x80\
+\x88\xa8\x8e\x22\x9e\xfe\x60\xa0\x63\x22\x9b\xba\x77\x76\xfc\x0b\
+\xeb\x32\x64\xd4\x54\xc2\x43\x07\x00\x00\x00\x00\x49\x45\x4e\x44\
+\xae\x42\x60\x82\
+\x00\x00\x03\x64\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x03\x16\x49\x44\x41\x54\x78\x9c\xed\
+\x9b\xbf\x4f\x53\x51\x14\xc7\xbf\xdf\x17\x08\x90\x4e\xf2\x23\x02\
+\xee\x2e\x58\x17\x57\x4d\x4c\xac\x75\x73\xa8\x05\x23\x49\xd1\xa4\
+\xa5\x44\x13\xd0\x11\xfe\x02\x9d\xc1\x44\xac\x38\x68\x13\x4d\xa0\
+\xb2\x83\x6c\xb8\xba\x50\x98\x9c\x29\x92\x14\xb6\x0a\x44\xf2\x8e\
+\x03\x7d\x4d\x73\xfb\x6a\x11\x69\x4f\x1b\xee\x67\xba\x3d\xf7\xbe\
+\xf6\x7b\xbe\xbd\xf7\xdd\xe5\x1c\xc0\x62\xb1\x5c\x64\x78\x9a\x45\
+\xe1\x58\x2c\xe0\x1e\x74\x8c\x50\x10\x05\x70\x0d\xc0\x20\x80\xb6\
+\xba\x2a\xfb\x77\x8e\x01\xe4\x00\x6c\x0a\x91\x71\xba\x8e\x16\x57\
+\xd3\xe9\x42\xad\x87\x6a\x19\xc0\xf0\x83\xf8\x98\x80\x2f\x01\x0c\
+\x9c\x87\xca\x06\xb2\x23\xc4\xf4\x5a\x66\x21\x0d\x40\xaa\x2d\xaa\
+\x6a\xc0\x8d\x64\xb2\xbd\x3b\x2f\x73\xa0\x4c\xd4\x45\x5e\xa3\x10\
+\xbe\xdd\xef\xe5\xe4\xf7\x54\xea\xb7\xdf\x74\xb5\x6d\xcc\x4b\x7b\
+\xee\x6b\x10\x49\x23\x9e\x25\xf0\x4d\x20\x3f\x29\x8e\x7b\xbe\x4a\
+\xff\x0f\xa1\xeb\x10\xec\x17\xe0\x26\x80\x60\x69\x82\x32\xd1\x9d\
+\x07\x00\x3c\x85\xcf\x4e\xf0\xdd\x01\xa1\x68\x62\x8c\x82\x0f\x65\
+\xa1\x3d\x11\x99\x5a\x5b\x7e\xff\xd9\xef\x4b\x9a\x0c\x86\x22\xf1\
+\x47\x24\x67\x01\xf4\x78\x41\x21\x1e\xaf\x65\x16\x3e\x56\x2c\x36\
+\x03\xe1\x58\x2c\x20\xbf\x3a\x7e\xc0\x3b\xf3\x82\xbc\x03\xe7\xfa\
+\xca\x72\x6a\xa7\x8e\xa2\xcf\x9d\x7b\x91\xe4\x80\x0b\x77\x03\x44\
+\x2f\x00\x80\xc8\xb1\xeb\xe8\xaa\xf9\x62\x74\xcc\x07\xdd\x83\x8e\
+\x11\x94\xbd\xf0\x04\xf2\xbc\xd5\x92\x07\x80\x95\xe5\xd4\x0e\x1d\
+\xbe\x28\x05\x04\x83\x52\xe8\x1c\x36\xd7\x55\x18\x50\xbc\xea\x3c\
+\xb2\xc5\x6d\xdf\x92\xac\x66\xde\x7d\x02\x90\x2d\x05\x28\xb5\x0d\
+\xc0\xc9\x3d\x0f\x00\x10\x91\x75\x34\xff\x99\xff\x1b\x52\xcc\xc1\
+\x63\xc8\x5c\xe0\x67\xc0\xa0\x37\x20\xb1\x5b\x0f\x55\x8d\xc4\xc8\
+\xe1\x8a\x39\xef\x67\x40\xe9\x6a\x6c\xb6\xab\xee\x2c\x18\x39\x54\
+\x5c\xfb\x7e\x06\x5c\x28\xac\x01\xda\x02\xb4\xb1\x06\x68\x0b\xd0\
+\xc6\x1a\xa0\x2d\x40\x1b\x6b\x80\xb6\x00\x6d\xac\x01\xda\x02\xb4\
+\xb1\x06\x68\x0b\xd0\xc6\x1a\xa0\x2d\x40\x1b\x6b\x80\xb6\x00\x6d\
+\xac\x01\xda\x02\xb4\xb1\x06\x68\x0b\xd0\xc6\x1a\xa0\x2d\x40\x1b\
+\x6b\x80\xb6\x00\x6d\xac\x01\xda\x02\xb4\xb1\x06\x68\x0b\xd0\xc6\
+\x1a\xa0\x2d\x40\x1b\x6b\x80\xb6\x00\x6d\xac\x01\xda\x02\xb4\xf1\
+\x33\xe0\xd8\x1b\x08\xdd\x96\x37\xc8\xc8\xe1\xd8\x9c\xf7\x4b\x30\
+\x57\x7a\x58\x70\xb9\x1e\xa2\x1a\x89\x91\xc3\xb6\x39\xef\x67\xc0\
+\xa6\x37\x20\x79\x0b\xa7\xec\x29\x68\x52\x58\xcc\xc1\x63\xcb\x5c\
+\x50\x61\x80\x10\x99\xb2\x8f\xc1\x70\x24\x31\x52\x0f\x65\x8d\x20\
+\x1c\x1d\x7f\x88\xf2\xca\x71\xe1\x92\xb9\xa6\xc2\x00\xa7\xeb\x68\
+\x11\x40\xa9\x36\x58\x88\xb9\x3b\xf7\x13\x2d\x77\x14\x6e\x0f\x3f\
+\xe9\x17\x91\xd9\x52\x80\xc8\x31\x70\x58\xdb\x80\xd5\x74\xba\x20\
+\xc4\x74\x59\xa8\xcf\x69\x47\x36\x14\x89\x8f\xa2\x35\x8e\x03\x43\
+\x91\xf8\x68\xbb\xdb\xb6\x01\xa0\xcf\x0b\x0a\x30\xe3\xd7\x42\x53\
+\x2d\x21\xde\x8d\x8c\xbf\xf1\xe9\x16\xc9\x8a\xc8\x3a\x89\xdd\x66\
+\xab\x22\x15\xba\x8e\x08\x2e\x17\xcf\x7c\xd0\x98\x9e\xff\xfa\x65\
+\xe1\x19\x7c\xea\x9e\xab\x75\x8c\xc8\x7e\x2f\x27\xbb\xf3\x80\x61\
+\x42\x90\x64\xf0\xe4\x07\x9b\xad\x86\x9a\xa0\xff\xdf\x39\xbf\xdf\
+\xe3\x4c\xa1\x4a\xd1\x77\xcd\xa6\xa9\x50\x34\x11\xa3\xe0\x15\x5a\
+\xad\x69\x8a\xc8\x09\x30\x73\xe6\xa6\xa9\x72\xc2\xb1\x58\x40\x0a\
+\x9d\xc3\xc5\x7a\xfb\x21\x9c\x54\x5d\x37\x63\xdb\xdc\x36\x80\x2d\
+\x08\x97\x18\x38\x5c\x3a\x4d\xdb\x9c\xc5\x62\xb9\xd8\xfc\x01\xdf\
+\x73\xe1\xb5\xcf\x33\xa6\xd1\x00\x00\x00\x00\x49\x45\x4e\x44\xae\
+\x42\x60\x82\
+\x00\x00\x00\xc8\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x00\x7a\x49\x44\x41\x54\x78\x9c\xed\
+\xd0\xb1\x6d\xc2\x60\x14\x85\xd1\xef\x67\x88\x88\x81\x32\x01\x62\
+\x83\xd0\x78\x22\x9a\xac\x90\x36\x0d\x0b\x59\x2c\xe1\xb4\x91\x5d\
+\x83\x25\x38\xa7\xbc\x7a\xc5\x7d\xb7\x00\x00\x00\x00\x00\x00\x80\
+\x77\x30\xd6\xc1\xe7\xf9\x72\x1a\x4b\xd7\xea\x63\x87\x3e\x0f\x33\
+\x6a\x5e\xea\xeb\xf6\xf3\xfd\xfb\x3f\x3f\x6c\x0e\x5f\xf0\xf9\xaa\
+\xa5\x8e\xd5\x75\x9d\x6f\x06\x78\x37\x9b\x01\x96\xd1\x54\xdd\x77\
+\xe8\xf2\x50\xa3\xe6\x6a\xda\xbb\x07\x00\x00\x00\x00\x00\x00\x00\
+\xf0\x7c\x7f\x0b\xd1\x0f\x08\x20\x9f\x5b\xc7\x00\x00\x00\x00\x49\
+\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x01\x04\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x00\xb6\x49\x44\x41\x54\x78\x9c\xed\
+\xd9\x41\x0d\xc3\x40\x10\xc5\xd0\x69\x14\x4e\xe1\x51\xa0\xe1\x11\
+\x52\x9b\xc2\x78\x95\xd6\x26\x30\x96\xf5\x6f\x33\x03\xb9\xee\xf5\
+\x5e\xf7\x7a\xa5\xc3\x21\x8f\xff\x03\x05\xd0\x02\x9a\x02\x68\x01\
+\x4d\x01\xb4\x80\xa6\x00\x5a\x40\x53\x00\x2d\xa0\x29\x80\x16\xd0\
+\x14\x40\x0b\x68\x0a\xa0\x05\x34\x05\xd0\x02\x9a\x02\x68\x01\x4d\
+\x01\xb4\x80\xa6\x00\x5a\x40\x53\x00\x2d\xa0\x29\x80\x16\xd0\x6c\
+\x1f\xe0\x23\x8f\xeb\xd7\xf8\x4c\x0b\x98\x53\x0b\xcc\xcc\x3c\xdf\
+\x83\x2d\x71\xfb\x05\x14\x40\x0b\x68\x0a\xa0\x05\x34\x05\xd0\x02\
+\x9a\x02\x68\x01\x4d\x01\xb4\x80\xa6\x00\x5a\x40\x53\x00\x2d\xa0\
+\x29\x80\x16\xd0\x14\x40\x0b\x68\x0a\xa0\x05\x34\x05\xd0\x02\x9a\
+\x02\x68\x01\x4d\x01\xb4\x80\xa6\x00\x5a\x40\xb3\x7d\x80\x1f\x17\
+\x67\x0a\x44\xf8\xee\xeb\x4c\x00\x00\x00\x00\x49\x45\x4e\x44\xae\
+\x42\x60\x82\
+\x00\x00\x02\x1d\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x01\xcf\x49\x44\x41\x54\x58\x85\xed\
+\xd6\x3d\x8b\x53\x41\x18\xc5\xf1\xff\x99\x44\xf1\x05\x5f\x3a\x41\
+\x1b\x11\x2b\x0b\xb5\x31\x61\x11\x4b\x49\xb3\xb2\x59\x65\xd7\x46\
+\xd0\xd6\x42\xf6\x13\x88\x2c\x7e\x01\x51\xb0\x16\xb1\x90\x15\xcd\
+\x2e\x04\x71\xb1\x14\x89\x49\xa5\x16\x56\x16\x6b\x23\xd8\x28\x8b\
+\xf8\x82\x26\x73\x2c\xe6\x46\x2c\x73\x93\x30\x16\xfa\x14\x97\x5b\
+\xcc\xcc\xf9\xcd\xdc\x67\xe0\xc2\xbf\x5e\x1a\x65\x50\xad\x15\x3f\
+\xc9\x28\xf4\x75\xa8\xb3\xa8\x8f\xd3\x04\x84\x51\x06\xc9\xec\x05\
+\xf6\xc4\xaa\xdb\x47\xd7\xbd\x33\x3b\xe0\x8f\x9a\xd9\xfe\xd5\x0f\
+\x8f\xac\x78\xeb\x5f\x01\x38\x3d\x1a\xbb\xb6\xc4\xbb\x0b\x2b\xae\
+\x64\x07\x60\x22\xc2\x58\xe7\xdf\x55\xe2\x2d\xec\x91\x7a\x68\x6a\
+\x00\x09\x63\x6c\x83\xa4\xcb\xf5\xd5\xb8\x9c\x15\x50\x94\x81\x98\
+\xde\x74\xb5\xde\xf2\x52\x6e\x00\x12\xf6\x6f\x84\x6f\xd4\x5b\xbe\
+\x90\x15\x00\x20\xb0\xd1\x10\x71\xa7\xf6\xc8\xb3\x59\x01\x09\x61\
+\x1b\x1b\xa8\x08\x3f\xa8\xad\xfa\x54\x56\x40\x42\x28\x92\x10\xdb\
+\x14\xdd\x3e\xd1\xf2\xf1\xac\x80\x82\x11\x9d\x9a\x73\x77\xb0\x9f\
+\xcc\xac\xf9\x70\x66\x00\x28\x35\xa5\x81\x7d\x71\xe0\xa7\x27\xd7\
+\xbc\x3f\x2b\xa0\x50\xc4\xf4\x35\x38\xd8\x1f\xf8\x71\x7e\x40\x42\
+\x0c\xeb\x58\x7e\x80\x09\x85\x60\xa3\x5a\xd1\x81\xac\x00\x8b\x40\
+\x4a\xff\x10\x2a\x3a\xfd\x7c\x4e\xef\x33\x02\x1c\x64\x04\x6c\x1a\
+\x35\x3a\x73\x7a\x3b\xea\xcc\xea\xc4\xd1\x38\x08\x09\xf8\xee\xa0\
+\x33\xbd\xa6\x5e\x95\x99\x3f\xd1\x09\xd8\x52\x11\x3e\x30\x5a\xe8\
+\x35\xf5\xac\xec\x1a\x63\x9f\x80\x8d\x24\xa7\x0d\x48\x97\x7a\xf3\
+\x6a\x8f\xb3\xce\xb8\x27\x20\xa5\xa6\x43\x68\xa9\x3b\xaf\x7b\x63\
+\xae\x53\x1e\x60\x23\x18\xee\xdc\xd7\x5f\x9c\xd5\xcd\x71\xc3\x4b\
+\x03\x9c\x7e\x05\xd2\x5d\x97\x6f\x77\x9b\xe1\xda\x24\xe1\xa5\x01\
+\xc2\x21\xf5\x9c\xef\x77\x5f\x86\x2b\x48\xce\x0a\x48\x3b\x67\xfd\
+\x73\x3f\x5c\x64\xb9\xf8\x19\x99\xb0\xca\xde\x82\xce\xb7\x1d\x3a\
+\xf7\xa6\xa1\x1f\xd3\x08\x2f\x03\xd8\x44\x56\xf8\x19\x66\x5f\x37\
+\xf4\x65\x5a\xe1\xff\x0b\xe0\x17\x0f\x9e\xa4\x40\x97\xf1\x9c\xea\
+\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x00\xf8\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x00\xaa\x49\x44\x41\x54\x78\x9c\xed\
+\xd0\x31\x15\x80\x30\x00\xc4\x50\x8a\xa6\x7a\x62\x43\x0c\x1b\x9e\
+\xf0\x54\x56\x1c\x7c\x86\x64\xbb\xe9\xf2\x32\x36\xc4\x3c\xae\xf5\
+\xdd\xcf\x7d\x0e\xe1\xb1\x8b\xd3\x3f\x51\x00\x2d\xa0\x29\x80\x16\
+\xd0\x14\x40\x0b\x68\x0a\xa0\x05\x34\x05\xd0\x02\x9a\x02\x68\x01\
+\x4d\x01\xb4\x80\xa6\x00\x5a\x40\x53\x00\x2d\xa0\x29\x80\x16\xd0\
+\x14\x40\x0b\x68\x0a\xa0\x05\x34\x05\xd0\x02\x9a\x02\x68\x01\x4d\
+\x01\xb4\x80\xa6\x00\x5a\x40\x53\x00\x2d\xa0\x29\x80\x16\xd0\x14\
+\x40\x0b\x68\x0a\xa0\x05\x34\x05\xd0\x02\x9a\x02\x68\x01\x4d\x01\
+\xb4\x80\xa6\x00\x5a\x40\x53\x00\x2d\xa0\x29\x80\x16\xd0\x14\x40\
+\x0b\x68\x0a\xa0\x05\x34\x05\xd0\x02\x9a\x02\x68\x01\x4d\x01\xb4\
+\x80\xe6\x05\x58\xe1\x04\x80\x5c\x86\x43\xbc\x00\x00\x00\x00\x49\
+\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x01\x4d\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x00\xff\x49\x44\x41\x54\x78\x9c\xed\
+\xd6\xa1\x4a\x04\x51\x14\xc6\xf1\xef\xcc\x8c\x08\x06\xd3\xda\x7d\
+\x01\x41\x50\xb0\xda\x5c\xb6\x6c\xf1\x39\x2c\x3e\x80\xec\x03\xec\
+\x4b\xd8\x2d\xc2\x8a\xb6\x29\x86\x8d\xbe\x81\x69\x41\x6c\x06\x19\
+\x41\xef\x31\x58\xe4\x5e\xb5\xcd\x59\x70\xfe\xbf\x78\xce\x84\xef\
+\x7e\xe1\xce\x95\x00\x00\x00\x00\x00\x00\x00\x00\x00\x80\x41\xb0\
+\x3f\xb7\xee\x76\xdc\xaa\x0e\xca\xd2\x8b\xb6\x55\xd2\xcc\xd2\x6f\
+\xfb\x1f\x0b\x38\xb8\xf6\x51\xf3\x9e\xe6\x92\x9d\x4a\xda\xea\x2d\
+\x5d\x8c\x4e\xae\x45\xd3\xd8\xd9\xfd\xd4\x56\xf9\xb2\x28\xe0\xe8\
+\xc6\xb7\xd5\xf9\x83\xa4\xdd\x88\x74\x51\x5c\x7a\xb6\xda\xf6\x96\
+\x53\x7b\xfa\x3e\xaf\x8a\x2f\xdf\xd2\x4c\xff\xec\xf0\x92\x64\xd2\
+\x8e\x7f\xa4\x79\x3e\x2f\x0b\x70\x3b\x09\x49\xb4\x06\x26\x1b\xe7\
+\xb3\xb2\x80\x81\x29\x0b\x30\xbf\x5b\x43\x8e\x10\x2e\xbf\xcd\x67\
+\x65\x01\x9b\xd5\x85\xa4\xc7\x80\x3c\xa1\xbe\x2e\xc1\xea\x3c\x9f\
+\x17\x05\x2c\x27\xf6\xe2\xb2\x43\xc9\x2f\x25\xbd\x86\xa4\xeb\x57\
+\x27\xd7\xd5\x46\x6d\xfb\xf9\x1f\x40\xe2\x21\x04\x00\x00\x00\x00\
+\x00\x00\x00\x00\x00\x0c\xc5\x27\x17\xb6\x3b\xc1\x0d\x7c\x50\x9f\
+\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x02\x22\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x01\xd4\x49\x44\x41\x54\x58\x85\xed\
+\xd6\x31\x6b\x14\x41\x18\xc6\xf1\xff\x33\x17\x8d\x20\xd1\x74\x1e\
+\xde\xed\xad\x1c\x96\x82\xb6\x16\x96\x92\x26\x56\x22\x36\x82\xb6\
+\x16\x92\x4f\x20\x22\x7e\x01\x51\xb0\x16\xb1\x10\xc4\xee\x10\xc5\
+\xd2\xc2\x5a\xb8\x52\x48\x76\x37\x91\xb3\x51\x03\x11\x8c\x72\xf3\
+\x58\xec\x5d\x5a\x6f\xef\x96\x4d\xa1\xd3\xec\x2e\xcc\x3b\xcf\x6f\
+\xdf\x9d\x81\x85\x7f\x7d\x68\x96\x49\x5b\x59\xfe\x0d\xa4\x56\xa0\
+\x9f\x24\xc9\xd7\x3a\x01\x61\xb6\x69\x5a\x05\x4e\x8e\x23\x83\xd1\
+\x68\x74\xfc\x10\x00\x07\xe3\xe2\xfe\xfe\xef\x57\xc3\xe1\xf0\xe8\
+\xe1\x00\x6c\x0c\x6b\x2b\x2b\xab\xcf\x6c\xb7\x9a\x07\xa0\x28\x61\
+\xe3\xeb\x59\xb6\xf3\xd8\xf6\x4c\x7b\xa8\x3e\x80\x70\x34\x2e\xef\
+\x7d\x3b\x2b\x76\xee\x37\x0b\x00\x04\x06\x47\xdb\x60\xdf\xcd\xb2\
+\x62\xa3\x51\xc0\x84\x61\x29\x44\x00\xc3\xc3\x2c\x2b\x6e\x34\x0c\
+\x00\xb0\x91\xa6\x88\xa7\x59\xb6\xbd\xde\x30\x00\xb0\x4d\xb9\x27\
+\x5a\xc6\x2f\xf3\x3c\xbf\xd4\x2c\x00\x40\x44\xb0\x81\x63\xd1\x1a\
+\x6c\x6e\x6e\x5f\x68\x16\x50\x2a\x22\x60\xe0\x84\x02\x6f\x8a\xa2\
+\x38\xdb\x30\x00\x80\x38\x39\x21\xa7\xc6\x51\xef\xf2\x3c\x3f\xdd\
+\x34\x00\x43\x2c\x1b\xe1\x33\x11\xbd\x6e\x1c\x30\x55\x4c\xae\xe7\
+\x1b\x07\x08\x02\x12\xa0\xad\x20\x77\x66\xa9\x59\xaa\x31\x3f\x18\
+\x04\xfa\xd2\x0a\xbe\x9c\x24\xbd\xcf\x33\x15\xd5\x93\xed\x40\xf9\
+\x73\xb3\x1b\xc7\xac\x25\x49\xf2\x69\xd6\xca\x85\x01\x86\x40\xd9\
+\xf7\x9f\x41\xbe\xd2\xef\x77\x3f\x56\xa9\x5f\x10\x20\xa9\x7c\xf3\
+\xb1\xd0\xb5\x5e\xaf\xf7\xbe\xea\x0a\x8b\x00\x34\x69\x3d\x82\x5b\
+\x69\xda\x1d\xcc\xb3\xc8\xbc\x00\xd9\x07\xe1\x1b\x69\x9a\x3c\x9f\
+\x73\x9d\xea\xa7\xc0\xe5\x07\x0f\x65\xf3\xf5\x20\xed\x75\x1f\xcd\
+\x1b\x0e\x15\x3b\x60\x97\xe1\xe5\x83\x9e\xa4\x49\xe7\xde\x22\xe1\
+\x95\x01\x92\xa7\xe1\x2f\xd2\xb4\x73\x47\x92\xff\x52\x52\x2f\x00\
+\x84\xe0\xed\xde\xde\xf7\x9b\x9a\xfc\x8c\x2c\x3a\xaa\xee\x81\x0f\
+\xcb\xcb\x47\xae\xa6\xe9\xb9\x5f\x75\x84\x57\x00\x78\xd7\x46\x4b\
+\x2d\xad\xb7\xdb\xed\x1f\x75\x85\xff\x1f\x00\x7f\x00\x61\x3f\xa0\
+\x35\x7d\x81\xed\xd8\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\
+\x82\
+\x00\x00\x04\xe7\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x04\x99\x49\x44\x41\x54\x78\x9c\xed\
+\x9b\xbd\x6f\x1c\x45\x18\xc6\x9f\x77\xf7\x1c\xa4\x74\xa9\x4c\x74\
+\x1f\x63\x1f\x4e\x91\x28\x52\x90\x92\x2e\x6d\xa0\x09\x50\x60\xa4\
+\x80\x44\xa2\xfc\x03\x11\x69\x40\xd8\x12\x4e\xb0\x14\x02\xa1\x81\
+\xbf\x00\x24\x2c\x50\x44\x42\x11\x39\x8d\xa1\x4a\x5a\xa7\x41\x60\
+\x37\xe1\xd8\x8f\xbb\x22\x14\x50\x22\x87\xdb\x7d\x28\xce\x23\xf6\
+\x6e\xf7\xbc\x7b\xde\x4f\xe3\xfb\x49\x2e\x76\xe6\xbd\x9b\x77\x1f\
+\x3f\xef\xec\xec\x69\x06\x98\x32\x65\xca\x61\x46\x92\x04\x91\xac\
+\xd9\x76\xf7\x0d\x0a\x2f\x09\xe4\x1c\x80\x3a\x80\x17\xf2\x4d\x6d\
+\x62\x76\x00\xf4\x08\x6e\x0a\xe5\xae\x52\x8d\x07\x22\xd2\x8f\xfb\
+\x50\xac\x00\xb6\x6d\xbf\x42\xc8\x97\x80\x9c\xcc\x24\xcd\xe2\xd8\
+\x12\xf8\xd7\x95\x52\x3f\xee\x15\x64\x8c\xeb\x20\x29\x96\xd3\x5d\
+\x26\x8c\x8d\x03\x78\xf3\x00\x70\x8a\x30\x36\x7e\xb7\xbb\x4b\x24\
+\xc7\xfe\xa3\xc7\x0a\x60\xbb\xbd\x25\x90\xb7\xf2\xc9\xad\x38\x04\
+\xfc\xc4\x72\x7a\x1f\x8e\xef\x8f\x60\x60\x7b\x63\x63\xa4\xf9\x2f\
+\x10\x2b\x80\xf7\x50\x29\xe5\x88\x88\x97\x69\xa6\x29\x21\x69\xda\
+\xb6\xdd\x02\xcc\x8b\x10\xac\x02\x38\x16\xec\x17\xf8\xaf\x46\x95\
+\x43\x48\x00\x92\x35\xdb\x71\x7f\x1e\xb6\x3d\x7f\xf2\xbd\xfe\xbb\
+\xed\x76\xfb\x59\x0e\xb9\x67\x4e\xa7\xd3\x99\x35\xcc\xda\x1a\x20\
+\x17\x02\xcd\x5b\xaa\xd5\x38\x33\x3a\x31\x86\x04\xb0\x2c\xf7\x4d\
+\x08\xee\x07\x9a\xfe\xec\xff\x33\x73\x72\x61\xe1\xc5\x3f\xf2\x4a\
+\x38\x0f\x06\x22\xcc\x6c\x23\xe8\x04\x62\x71\x6e\xae\xf9\x43\x30\
+\x2e\x34\x07\x50\x78\x69\xb8\x01\x37\x0e\xda\xcd\x03\x40\xbb\xdd\
+\x7e\x26\xc0\x8d\x60\x5b\xe8\xde\x10\x21\xc0\xee\x73\x3e\x80\xf7\
+\x30\xeb\xe4\x8a\x82\xf4\xd6\x83\xd7\x02\x39\x3b\x1a\x13\xf5\x14\
+\xa8\x07\x2f\x94\x52\x4e\xc6\x79\x15\x46\x44\xee\x8d\xd1\x98\x28\
+\x01\x86\x56\x78\x55\x9b\xed\x27\x21\x22\xf7\xd0\xea\x75\xec\x3a\
+\xe0\xb0\x50\x2b\x3b\x81\x24\xb8\xae\xbb\xe0\xf9\x58\x01\xb0\x08\
+\x00\x04\xef\x99\x82\xd5\x56\xab\xf5\x5b\xda\xef\xae\xbc\x03\x5c\
+\xd7\x3d\xe1\xf9\x78\x04\xe0\x32\x80\xa3\x00\x8e\x0a\xe4\x8a\x4f\
+\x79\xec\xba\xee\x42\xda\xef\xaf\xb4\x00\x24\x6b\x9e\x8f\xef\x00\
+\x1c\x8f\xe8\x3e\xde\xf7\xf9\x51\xda\x31\x2a\x2d\x80\xed\xf6\x3e\
+\x00\x10\x7a\x74\x69\x04\xf2\x56\xda\x31\x2a\x2b\x80\xe3\x38\xa7\
+\x41\xde\xcc\x7b\x9c\x4a\x0a\x40\xb2\xe6\x53\xbe\x06\x30\xb3\x57\
+\x9c\x80\xdf\xa7\x1d\xab\x92\x02\xc4\x59\x7f\x97\xe7\x00\xef\xa4\
+\x1d\xab\x72\x02\x24\xb5\x3e\x21\x37\x95\x52\x5b\x69\xc7\xab\x94\
+\x00\x49\xad\x0f\x60\x73\xae\x55\xff\x3c\x8b\x31\x2b\x25\x40\x52\
+\xeb\x0b\xfc\xab\x49\x7e\xf0\x4c\x42\x65\x04\x98\xd0\xfa\xbf\x66\
+\x35\x6e\x25\x04\x28\xc3\xfa\x9a\x4c\xde\x05\x1c\xc7\x79\xc9\x23\
+\x56\x02\x0b\x93\xfb\xa6\x81\xd5\x66\xb3\xf9\x34\xc9\xe7\xcb\xb0\
+\xbe\x26\xb5\x03\x5c\xd7\x5d\xf0\x29\x8f\x05\x72\x05\xbb\x6b\x75\
+\x00\x97\x3d\x1f\x8f\x5c\xd7\x3d\x11\xf7\xf9\xb2\xac\xaf\x49\x2d\
+\xc0\xee\x5b\x5a\xe4\x5a\xdd\xf3\xf1\x2d\xc9\xb1\x2e\x2b\xd3\xfa\
+\x9a\x2c\xe6\x80\xc5\x3d\xfa\xce\x59\x4e\xef\xfd\x71\x9d\x65\x5a\
+\x5f\x93\xfb\x24\x28\xe0\x4d\xc7\x71\x4e\x8f\xb6\x97\x6d\x7d\x4d\
+\x6a\x01\x08\xde\x8b\x09\x39\xe2\x53\xbe\x0a\x96\x42\x15\xac\xaf\
+\x49\x2d\x80\x01\x7e\x06\xe0\x79\x4c\xd8\x50\x29\x54\xc1\xfa\x9a\
+\xd4\x02\x28\xa5\xb6\x20\xf2\x71\x5c\x9c\x2e\x85\xaa\x58\x5f\x93\
+\xc9\x1c\xa0\x9a\xf5\x3b\x00\x9e\xc4\x84\x1d\xf1\x29\xdf\xf8\x90\
+\x35\x54\xc0\xfa\x9a\x4c\x04\x10\x91\xbe\x21\xbc\x8a\xf8\x52\x78\
+\x19\xc4\x99\x98\x98\x42\xac\xaf\xc9\xec\x29\xd0\x6a\xb5\x7e\x49\
+\x52\x0a\x71\x14\x65\x7d\x4d\xa6\x8f\xc1\x84\xa5\xb0\x17\x85\x59\
+\x5f\x93\xa9\x00\x13\x94\x42\x14\x85\x5a\x5f\x93\xf9\x42\x68\xbf\
+\xa5\x50\xb4\xf5\x35\xb9\xac\x04\xf7\x51\x0a\x85\x5b\x5f\x93\x8b\
+\x00\x13\x96\x42\x29\xd6\xd7\xe4\xf6\x2e\x90\xb4\x14\xca\xb2\xbe\
+\x26\xd7\x97\xa1\x04\xa5\x50\x9a\xf5\x35\xb9\x0a\x20\x22\x7d\xd3\
+\xc0\xdb\x10\x84\x37\x59\x08\x1c\xd3\xc0\x3b\x65\x59\x5f\x93\xfb\
+\xeb\x70\xb3\xd9\x7c\x5a\x33\xe4\x3c\x80\x75\x00\x7f\xef\xfe\xad\
+\xd7\x0c\x39\x9f\xf4\x27\xb3\x3c\x29\x64\x7f\x40\xa3\xd1\xe8\x02\
+\x78\xbd\x88\xb1\x26\xa5\x12\xbf\x0a\x97\x49\x94\x00\x3b\xc1\x0b\
+\x92\x66\x41\xb9\x64\x4e\x44\xee\x3b\xa3\x31\x51\x02\xf4\x82\x17\
+\x83\xed\xa7\x07\x93\x88\xdc\xbb\xa3\x31\xe1\x8d\x92\xe0\xe6\x70\
+\x8b\x79\x31\xd3\xac\x0a\x44\xc4\x7c\x2d\x78\x4d\x30\xf4\x48\x0e\
+\x6f\x94\xa4\xdc\x1d\x6e\xc0\x6a\xa7\xd3\x99\xcd\x3c\xbb\x9c\xe9\
+\x74\x3a\xb3\x04\x86\x16\x62\xa1\x7b\x43\x84\x00\x4a\x35\x1e\x00\
+\xdc\x0e\x34\x1d\x33\xcc\xda\xda\x41\x12\xe1\xbf\xcd\xd2\x43\x3b\
+\xc6\xb7\x06\xf7\x36\x4c\xd8\x01\x22\x7d\x01\xdf\x1b\x69\xbd\x60\
+\x98\x33\xdb\xb6\xed\x5e\xb3\x2c\x6b\xbe\x8a\x13\x23\x49\xd3\xb2\
+\xac\x79\xdb\x76\xaf\x0d\x36\x49\x0f\xed\x14\x87\xc0\xbf\x1e\xb5\
+\xe8\x1a\x7b\x92\xc2\x72\xba\xcb\xff\x87\x03\x13\x00\x40\xc8\xf2\
+\xbc\x6a\xdc\x8e\xea\x1b\xbb\x0e\x50\xcd\xfa\x6d\x42\x96\xf3\x4b\
+\xab\x10\x48\x60\x69\xae\x55\xff\x74\x5c\x40\xc2\x43\x53\xc6\x17\
+\x00\x4e\x65\x9a\x5a\xfe\x24\x3a\x34\xb5\x9f\x63\x73\x67\x31\xd8\
+\x75\x5d\xc5\x63\x73\x5d\x82\x4f\x26\x39\x36\x37\x65\xca\x94\xc3\
+\xcd\xbf\x5b\x3f\xf6\x3c\xa0\xff\x9c\x5c\x00\x00\x00\x00\x49\x45\
+\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x04\xf5\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x04\xa7\x49\x44\x41\x54\x78\x9c\xed\
+\x9b\xcf\x6f\x15\x55\x14\xc7\xbf\x67\xa6\x85\xc2\xca\xe7\xa6\x21\
+\x10\x58\x58\x16\x36\x4d\x30\xf1\xa5\x2f\x95\x4d\x9b\xa8\x1b\x90\
+\x96\x02\xa2\x11\x08\x7f\x82\x1b\x89\x6d\x62\x5b\x9b\x28\x8a\x1b\
+\xfd\x0b\x34\xb1\xd1\x00\x6d\xf1\x91\xb2\xa9\x26\x6d\x20\x81\x3c\
+\x2d\x1b\xa3\x75\x83\x0b\x9a\xb2\xa8\x8b\xd6\x15\x2d\xd0\xb9\x5f\
+\x17\x7d\x53\x66\xe6\xcd\x74\xe6\x31\x77\x7e\xd4\xbe\x4f\xf2\x16\
+\x73\xee\x79\xef\x9e\x7b\xde\xf7\xdc\xb9\x33\xb9\x17\x68\xd0\xa0\
+\xc1\x4e\x46\xa2\x38\x75\xcf\xb0\x69\x6d\x05\x27\x14\xd4\x59\x81\
+\x14\x09\xec\x17\x60\x77\xd2\xc1\xd5\x03\x81\x27\x02\x3c\x22\x38\
+\x67\xc0\xb8\xda\x52\xc0\xcd\xd9\x1e\x59\x0f\xfb\x5e\x68\x02\x4a\
+\x93\x7c\x0b\xe0\x37\x00\x5e\xd5\x12\x69\x7a\xcc\x03\xf2\x61\xa5\
+\x5f\x7e\xde\xca\xc9\x08\x6c\x21\xa5\x73\x82\x83\x00\xa7\xb1\xfd\
+\x06\x0f\x00\xed\x00\xa7\x4b\x37\x38\x00\x32\xf0\x8f\x0e\x4c\x40\
+\xe7\x24\x06\x44\xf8\x59\x32\xb1\xa5\x08\xf9\x79\xe9\x27\x7c\x1c\
+\xd4\xec\x9b\x99\xaa\xec\xa7\x3d\xe6\x15\x8a\x0c\xc1\xc4\xad\x43\
+\x6b\x58\xb8\xfe\xae\x58\x5a\x03\x8d\xc9\x99\x6b\x34\x1f\xb6\xe0\
+\x20\x2c\x1c\x13\x72\x14\x40\xc1\xed\x21\x6f\xfb\x95\x43\x4d\x02\
+\xba\x67\xd8\xb4\xba\xc2\xdf\xe1\x94\xbd\xe0\x17\x18\x72\xae\xd2\
+\x2b\x4b\xda\x23\x4f\x80\x52\x99\xad\x50\x1c\x03\xf1\xa6\xc3\x3c\
+\xbf\xa7\x20\x47\xbc\x13\x63\x4d\x09\xac\xad\xe0\x04\xdc\x35\xbf\
+\x6c\x52\x3e\xd8\x2e\x83\x07\x80\x4a\xaf\x2c\xc1\x90\x73\x00\x56\
+\x1c\xe6\xf6\xea\xd8\x5c\xd4\x24\x40\x41\x9d\x75\x5e\x53\x64\xf8\
+\x6e\xbf\xfc\xa3\x3f\xcc\x64\xa9\xf4\xca\x92\x50\x86\x9d\x36\xef\
+\xd8\x00\x9f\x04\x08\xa4\xe8\x32\x98\xb8\xa5\x3d\xba\x94\x50\xcd\
+\x98\x72\x5b\xe4\x75\xaf\x4f\x4d\x02\x08\xec\x77\x5e\x1f\x5a\xc3\
+\x82\xee\xc0\xd2\xc2\x27\xf6\x03\x5e\x1f\x1f\x05\xb8\x57\x78\x79\
+\x9b\xed\xeb\xc1\x1b\xbb\xdf\xea\x35\x78\x21\xb4\x43\x68\xca\x3a\
+\x80\x28\x74\x95\xd9\xa6\x94\x1a\x02\xe5\xd4\x86\x85\xe3\xa6\x18\
+\xa3\x77\x4f\xca\xdf\x71\x7f\x3b\xf7\x0a\x28\x8d\xf3\xb0\xb2\x78\
+\x1b\x94\xf3\x00\xf6\x6e\x7c\xe4\x82\x45\xde\xe9\x2a\xb3\x2d\xee\
+\xef\xe7\x3a\x01\xdd\x33\x6c\x82\xc1\x1f\x01\xec\xf3\x69\xde\xa7\
+\x2c\xf5\x49\xdc\x3e\x72\x9d\x80\xc7\xcb\xb8\x04\xa0\xe6\xd6\xf5\
+\x1c\x39\x1d\xb7\x8f\xdc\xce\x01\xc5\x49\x76\x08\x38\x92\x74\x3f\
+\xb9\x54\x40\xf7\x0c\x9b\x4c\xf0\x3b\x00\xcd\x5b\xf9\x09\x78\x3d\
+\x6e\x5f\xb9\x4c\x40\xb8\xf4\x01\x00\x4f\x69\x18\x57\xe2\xf6\x95\
+\xbb\x12\x88\x2c\x7d\x91\x91\x4a\x9f\xcc\xc7\xed\x2f\x57\x0a\x88\
+\x2a\x7d\x08\xe6\xf6\xbc\x84\xaf\x74\xf4\x99\xab\x04\x44\x95\xbe\
+\xb2\xe4\x62\x94\x17\x9e\x51\xc8\x4d\x09\xd4\x23\xfd\xdf\x4e\xcb\
+\x9f\xba\xfa\xcd\x85\x02\xb2\x90\xbe\x8d\x16\x05\xbc\x71\x83\xaf\
+\x58\x54\x43\x9b\x0b\x13\xe1\x84\x61\x18\xa3\xf7\x7a\xe5\x41\x94\
+\xef\x3f\x5e\xc6\x25\x91\x74\xa5\x6f\x13\x5b\x01\x5d\x65\xb6\x59\
+\xe4\x1d\x40\x2e\xc0\x5e\xab\x53\xce\x2b\x8b\xb7\x4b\xe3\x3c\x1c\
+\xf6\xfd\xe2\x24\x3b\x44\xd2\x97\xbe\x4d\xec\x04\x28\xa5\x86\x10\
+\xb0\x56\x87\xc9\x1f\xba\x67\x18\xa8\xb2\x2c\xa5\x6f\x13\x7f\x0e\
+\xd8\x7c\x44\xf5\x6b\x43\x71\xf5\x5f\x7c\x14\xd4\x9c\xc5\xac\xef\
+\x25\xf9\x49\x90\x1c\x29\x4e\xb2\xc3\x6b\xce\x5a\xfa\x36\x1a\x12\
+\xc0\xf1\x10\x87\x5d\xa6\xf0\x5b\x67\x29\xe4\x41\xfa\x36\xf1\x13\
+\x60\x18\x5f\x02\x78\xba\xa5\x8f\xa7\x14\xf2\x20\x7d\x9b\xd8\x09\
+\xa8\xf4\xc9\x3c\x29\x9f\x86\x3a\x56\x4b\x21\x2f\xd2\xb7\xd1\x32\
+\x07\xec\x7d\x19\x57\x00\xdc\x0f\x71\xdb\x65\x82\xdf\x9b\xe0\x18\
+\x72\x20\x7d\x1b\x2d\x09\x98\xed\x91\x75\x0b\x72\x11\x61\xa5\x00\
+\xbc\x06\xe0\x48\x88\x4f\x2a\xd2\xb7\xd1\x76\x17\x98\xeb\x97\x3f\
+\x22\x95\x42\x18\x29\x49\xdf\x46\xeb\x6d\x30\x62\x29\x04\x93\xa2\
+\xf4\x6d\xb4\x26\xa0\x8e\x52\xf0\x23\x55\xe9\xdb\x68\x5f\x08\xbd\
+\x70\x29\xa4\x2c\x7d\x9b\x44\x56\x82\x75\x97\x42\x06\xd2\xb7\x49\
+\x24\x01\x75\x96\x42\x26\xd2\xb7\x49\xec\x59\x20\x72\x29\x64\x24\
+\x7d\x9b\x44\x1f\x86\x42\x4b\x21\x43\xe9\xdb\x24\x9a\x80\xd9\x1e\
+\x59\x37\x4c\x79\x4f\xa4\x76\x93\x85\x08\x16\x0c\x43\xde\xcf\x4a\
+\xfa\x36\x89\x3f\x0e\xdf\xeb\x95\x07\x54\x72\x54\x80\x29\x00\xab\
+\x00\x56\x05\x98\xa2\x92\xa3\x51\x5f\x99\x25\x49\x2a\x6f\x85\x2b\
+\xa7\x64\x11\xc0\x3b\x69\xf4\x55\x2f\xb9\x78\x2b\x9c\x25\x7e\x9b\
+\xa4\x9e\x38\xaf\xcf\x5c\xa3\x99\x5e\x38\x7a\xf1\xc6\xee\x1d\x1b\
+\xe0\xbf\x49\xea\x91\xf3\xfa\x61\x0b\x0e\xea\x0f\x2d\x1d\x7c\x62\
+\x5f\xf4\xfa\xf8\x28\x80\x73\x2e\x83\x85\x63\x7a\xc3\x4a\x0f\xe3\
+\x19\x8e\xbb\x2d\xac\xb9\x25\xd7\x24\xc0\x80\x71\xd5\x79\x2d\xe4\
+\x68\xa9\xcc\x56\xdd\xc1\x25\x4d\xa9\xcc\x56\x0a\x5d\x0b\x31\xef\
+\xd8\x36\x6c\x1e\x5a\x0a\xb8\x09\xe0\x2f\x87\xa9\x00\xc5\xb1\xed\
+\x94\x84\xcd\xcd\xd2\xee\x1d\xe3\xf3\xd5\xb1\xb9\xa8\x6b\xbb\xbc\
+\x50\x86\x55\x33\xa6\xf2\xbc\x5d\xde\x78\x86\xe3\xd5\x7f\xfe\xc5\
+\xb6\xcb\xdb\x74\x4e\x70\xf0\x7f\x71\x60\x02\x00\x44\x06\x2b\x27\
+\xe5\xb2\x5f\x53\xe0\x3a\xe0\xd7\x7e\x5c\x86\xc8\x60\x72\x51\xa5\
+\x02\x01\x19\xa8\xf4\xe1\x8b\x20\x87\xa8\x87\xa6\xbe\x06\xd0\xae\
+\x35\xb4\xe4\x89\x74\x68\xaa\xee\x63\x73\xd5\x2d\xe7\x07\xf2\x78\
+\x6c\x0e\xc0\x22\xc0\xfb\xf5\x1c\x9b\x6b\xd0\xa0\xc1\xce\xe6\x3f\
+\xb7\x37\xe9\x8b\xf9\x5d\x56\x0e\x00\x00\x00\x00\x49\x45\x4e\x44\
+\xae\x42\x60\x82\
+\x00\x00\x00\x97\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x00\x49\x49\x44\x41\x54\x58\x85\xed\
+\xd7\x41\x0d\x00\x20\x0c\x04\xc1\x83\x20\xa9\x02\x70\x53\x3f\xd5\
+\x43\x52\x6b\x88\x38\x7e\xec\xfe\x7b\x99\x6f\x25\x32\x8a\xac\x8e\
+\xac\x76\x36\x96\x69\xd8\xe6\xbd\xa6\x3b\x00\x00\x00\x00\x00\x00\
+\x00\x00\x00\x00\x00\x00\x00\x00\x6e\xde\x67\x34\x74\x1e\x39\x3e\
+\xee\x02\x8e\xc2\x05\x10\x61\x1a\xbe\x91\x00\x00\x00\x00\x49\x45\
+\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x03\xde\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x03\x90\x49\x44\x41\x54\x78\x9c\xed\
+\x98\xcf\x6f\x54\x55\x1c\xc5\xcf\xb9\xf3\xd2\xd4\x04\x31\x4a\xdd\
+\x89\x2e\x81\x75\xdb\x99\x31\xc6\x64\xaa\x81\x98\x2e\xb4\xd3\x1a\
+\x16\xec\x90\x10\xfd\x03\x54\xe2\x82\x18\x62\x42\xfc\xb1\x36\x21\
+\x50\x60\x45\x4c\xa0\xf3\xa6\xb8\x60\x92\x26\x32\x24\xd8\xc8\x88\
+\xac\xd5\x35\xee\x24\x1a\xe3\xa2\x55\xda\x7b\x5c\xcc\x80\xd3\x77\
+\x6f\x3b\xbf\xde\x9b\xa9\x78\x3f\xcb\xfb\xee\xfd\x7e\xcf\xf7\xbc\
+\xef\xdc\x77\xef\x00\x81\x40\x20\x10\x08\x04\x02\x81\x40\x20\x10\
+\x08\x04\x02\x81\xff\x17\x1c\x55\xe2\x7c\x45\x65\x52\x5f\x02\x30\
+\x90\x2e\x34\x16\x72\xa7\x47\xa1\x63\x24\x06\x14\x63\x9d\x14\x74\
+\x0e\x80\x79\x2c\x44\x3c\x79\x67\x81\x8b\xc3\xd6\x62\x3a\x4f\x49\
+\x97\x62\xac\x53\x82\xce\x27\x73\x8b\xba\x90\xaf\xea\xc3\x61\xeb\
+\x19\x5e\x07\x48\x2c\x54\xed\xe7\x00\xdf\xef\x30\xf1\x8b\x46\xd9\
+\x9c\x02\xa9\x61\xc8\x1a\x8a\x01\xa5\xba\xa2\xb5\xdf\xed\x79\x80\
+\xc7\xbb\x5b\xa1\x4b\x4f\x3d\x6b\xde\xbd\x35\xc3\x8d\x6c\x95\x0d\
+\xc1\x80\xd2\x65\x8d\xaf\xed\xd5\x57\x20\xe6\x92\xcf\x24\x58\x36\
+\x15\x38\x3f\x45\x02\xd5\xf1\x3f\x78\xec\xd6\x71\xae\x67\xa9\x2f\
+\x53\x03\x0a\x37\xb4\x17\xeb\x5a\x06\x30\xe3\x49\xbd\x09\x3c\xea\
+\x72\x02\x50\xce\x13\xe2\x66\x94\xe3\xdc\xea\x5b\xfc\x33\x2b\x8d\
+\x99\x19\xf0\xea\x55\x3d\xff\x77\xa4\x1a\x80\xc9\xad\x4f\x84\x66\
+\xf1\x3e\x94\x73\x24\x11\x3f\x8c\x3d\xe4\xec\xed\xa3\xfc\x35\x0b\
+\x9d\x99\x18\x30\x79\x55\x2f\x46\x91\x56\x00\x1c\x48\x64\x13\x05\
+\xbb\xe3\xee\x46\x18\xc8\xd1\xf5\xb3\x35\x3c\x7c\x77\x8e\xf7\x53\
+\x96\x9a\xbe\x01\xc5\x58\x87\x04\xad\x00\x78\x21\xf1\x48\x20\x2c\
+\x3a\xed\xed\x04\x24\x18\xba\xda\xee\x1b\xcb\x23\xdf\xbd\xcd\x9f\
+\xd2\x53\x9b\xf2\x39\x60\xba\xa2\x69\x41\xb7\xe1\x2b\x1e\x5d\x14\
+\xdf\x9a\x49\xc0\x82\xce\xec\xfd\xd6\xe8\xdb\xfc\x92\xa6\x52\x11\
+\xdb\x22\x35\x03\xa6\xab\x7a\xdd\x50\x37\x01\xec\x6b\x1f\x17\xd4\
+\x2c\xbe\x57\x04\x0b\x38\x26\xec\xa3\x51\x3d\x1f\xeb\xb5\xbe\x85\
+\x26\x48\xc5\x80\x62\xac\x79\x23\xdd\x00\xb0\xa7\x7d\x5c\x90\x08\
+\xf6\x5e\xfc\xbf\x58\x34\x0d\x6c\x67\x0f\xa1\x5a\xbe\xa2\xf2\x00\
+\x71\x1f\x33\xb0\x01\xf9\xaa\x4e\x08\xba\x06\x60\xac\x7d\x5c\xa0\
+\x1d\xb0\xf8\x16\xb4\x72\xe3\x8c\x91\x5a\x2a\xc4\x7a\x67\xd0\xe8\
+\x03\x19\x90\x8f\xf5\x01\xa5\xc5\x64\x9c\x66\xf1\xce\x9b\xeb\x1b\
+\x42\xf2\x98\x60\x00\x5d\x2c\xc4\xea\x70\xb4\xee\x14\xbb\x1f\x24\
+\x16\x63\xfb\xa9\x48\xe7\xf2\x22\xc0\xd2\xfd\xed\xa6\x05\xe1\x79\
+\x69\x82\x3e\xfb\xbe\x6c\x3e\xea\xe7\xfe\xd0\xb3\x01\xa5\xba\xa2\
+\xf5\xdf\xec\x39\x91\x27\x5c\x21\x99\x16\xdf\xcc\x21\x90\xf4\x9a\
+\xb0\xf8\xd2\x86\x79\xef\xda\xd1\xed\x0e\x59\x7e\x7a\x32\xa0\x74\
+\x59\xe3\x6b\xcf\xe8\x0a\x80\xf9\x44\xf6\x66\xf1\xee\xa7\x2b\x13\
+\x24\x90\x80\xf1\xa8\x8f\x9f\x1b\xe7\xb1\xda\x2c\xff\xea\x36\x56\
+\xd7\x06\xbc\x72\x5d\x4f\x6f\x6c\x6a\x19\x80\xf3\x09\x6a\x5d\x6a\
+\x86\x52\x7c\x5b\x4e\x6f\x27\x10\xf8\x26\x97\x63\xb9\xdb\xfb\x43\
+\x57\x06\x4c\x7e\xad\x89\x68\x53\x35\x08\x5b\x0f\x21\x12\xc0\xde\
+\x5a\x2e\x55\x48\xc0\xda\x1c\xb8\xb5\x0c\x02\x77\x1f\x46\x9c\xbd\
+\xf7\x26\x1f\x74\x0c\xd1\x69\xc2\xf4\xb2\xf6\x1b\xab\x15\x00\x07\
+\x13\x8f\xfa\x3b\xe0\x64\x81\xff\xfe\xf0\x23\xc4\x23\x8d\x05\xfe\
+\xb2\xd3\xd2\x1d\x3f\x83\x2f\x2f\xe9\xa0\xb1\x5a\xc5\x6e\x2e\x1e\
+\xd8\xee\xd4\x78\x88\x46\xab\x53\xd7\x75\xc0\xb7\xe4\x11\xdb\x76\
+\x40\x7e\x49\x53\x34\xaa\x01\x98\x70\xd2\xed\xa6\xe2\xdb\xf1\x77\
+\xc2\x03\x90\x6f\x34\xca\xbc\xe7\x5b\xe2\xed\x80\x42\x45\x33\x34\
+\xaa\x23\x51\xbc\x76\x73\xf1\x00\xd0\xbc\x6a\x27\x3b\x61\x02\x52\
+\xbd\x58\x55\xc9\xb7\xc4\xe9\x80\x42\x45\xa7\x61\x74\xc6\xe3\xe4\
+\x70\xb7\xf9\x01\x71\xc4\x13\x82\xe5\xc7\x8d\x05\x7e\xb2\xe3\xbc\
+\x62\x6c\x37\x04\xf8\xfe\x9e\xfa\xcf\x43\x60\xf3\xce\xbc\x89\xda\
+\xc7\x3c\x27\xaa\x27\x17\x5f\x6d\xee\x1e\x40\x9e\x6d\xed\xaa\x4f\
+\x16\x82\x05\x79\x76\xd4\x32\x02\x81\x40\x20\x10\x08\x04\x02\x81\
+\x40\x20\x10\x08\x04\x02\xa3\xe6\x1f\x3c\x8f\x50\x7d\x3b\xd7\xa3\
+\xf5\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x02\xfc\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x02\xae\x49\x44\x41\x54\x78\x9c\xed\
+\x9a\x3f\x6e\x13\x41\x14\x87\xbf\xd9\x10\x85\x26\x48\x14\xb9\x01\
+\x15\x25\x29\x69\x90\x88\x2d\xa5\x43\xd8\xa0\x84\x24\x10\xc9\xb1\
+\xa1\x80\x1b\xd0\x72\x03\x90\x00\xc7\x05\x7f\x82\x03\xb1\x8d\x68\
+\xb3\x3e\x44\x24\x2e\xc0\x05\x22\x21\x0a\x8a\x08\xfc\x68\x90\x70\
+\xc6\xde\x18\xef\xce\xcc\xce\x6c\xfc\xca\xf5\xdb\x9f\xe6\xfb\xb4\
+\x9e\x1d\x3d\x2d\xcc\x6a\x56\xb3\x3a\xcf\xa5\xf2\x5e\x80\xed\x2a\
+\x57\x6a\xb7\x84\xe8\x19\xc8\x77\x89\xa2\x47\xfd\x83\xd7\x5f\x87\
+\x7f\xbf\x90\xd7\xc2\x5c\x54\xb9\x5a\x5f\x13\x91\x3d\x90\x08\x40\
+\x0d\x06\x2f\x81\xeb\xc3\x3d\x51\x2e\x2b\x73\x50\xff\xe0\x4f\x31\
+\x5e\xd2\xfb\x0a\x29\x20\x01\xfe\xb7\x28\x9e\xea\xbd\x85\xfb\x0b\
+\x24\xc1\xa3\x64\xbd\xdf\x69\x7d\xd1\xfb\x0b\xb5\x09\x9e\x05\x1f\
+\x77\x5a\x07\xe3\xee\x29\x8c\x80\x34\xf0\x50\x10\x01\x69\xe1\xa1\
+\x00\x02\xb2\xc0\x43\xe0\x02\xb2\xc2\x43\xc0\x02\x4c\xc0\x43\xa0\
+\x02\x4c\xc1\x43\x80\x02\x4c\xc2\x43\x60\x02\x4c\xc3\x43\x40\x02\
+\x6c\xc0\x43\x20\x02\x6c\xc1\x43\x00\x02\x6c\xc2\x83\xe7\x02\x6c\
+\xc3\x83\xc7\x02\x5c\xc0\x83\xa7\x02\x5c\xc1\x83\x87\x02\x4c\xc3\
+\x97\xaa\xb5\x3b\x88\x7a\x01\x80\xa8\x87\x71\xaf\xf9\x79\xf8\x77\
+\xaf\x26\x42\xa6\xe1\xcb\xd5\xfa\x1a\xa2\xf6\x81\x25\x60\x09\x25\
+\xaf\xf4\x1e\x6f\x04\xd8\x80\x1f\x93\x37\x52\x5e\x08\x70\x04\x3f\
+\x10\xd4\x63\xbd\x37\x77\x01\xae\xe0\x95\x52\xf7\xfb\xdd\xe6\x27\
+\xbd\x3f\xd7\x4d\xd0\x25\xfc\x61\xa7\xb9\x37\xee\x9e\xdc\x04\xf8\
+\x00\x0f\x39\x09\xf0\x05\x1e\x72\x10\xe0\x13\x3c\x38\x16\xe0\x1b\
+\x3c\x38\x14\xe0\x23\x3c\x38\x12\xe0\xec\x3d\x2f\xb2\xd5\xef\xb5\
+\x3e\x4c\x93\x65\x5d\x80\xcf\xf0\x60\x59\x80\xef\xf0\x60\x51\x40\
+\x08\xf0\x60\x49\x40\x28\xf0\x60\x41\x40\x48\xf0\x60\x58\x40\x68\
+\xf0\x60\x50\x40\x88\xf0\x60\x48\x40\xa8\xf0\x60\xe0\x1b\x21\x57\
+\xf0\xc0\x66\xbf\xd7\x6a\x4f\x9b\xb7\x52\xa9\xdf\x55\xc8\x73\xc0\
+\xfc\x4c\xd0\x25\x7c\xdc\xdd\x9d\x1a\xbe\x54\xd9\xd9\x54\x48\x1b\
+\x1b\x33\xc1\x10\xe0\x81\x37\x4c\x60\x4c\x25\xc0\x77\xf8\x72\xb5\
+\xbe\xc1\x28\xbc\x99\x99\x60\x08\xf0\x22\xf2\x56\xcf\x33\x32\x13\
+\x0c\x19\x3e\xf3\x4c\xd0\x77\xf8\x95\xdb\xb5\x7b\x4a\xa9\x77\x7a\
+\xde\xa4\x57\xe7\x7f\x09\x28\x2a\x3c\xc0\x5c\xca\xc5\xda\x98\xe4\
+\x6c\xc4\xdd\xdd\xfd\x69\xf3\xb2\xc0\xc3\x84\x27\xc0\x25\xfc\x61\
+\xa7\xe9\x1c\x1e\xce\x38\x09\xfa\x0e\x5f\xaa\xec\xac\x03\x23\xf0\
+\x4c\x79\x62\x1c\xfb\x04\x04\x02\xff\x5e\xcf\x23\xc5\x1e\x32\x22\
+\xe0\xef\xd9\xb9\x8d\x21\xf8\x84\xbc\xf4\x8f\x7d\x42\x1e\x29\x37\
+\xd0\x53\x02\x96\x1b\x8d\xf9\xcb\xc7\x83\x63\x05\x8b\x43\x97\x53\
+\xc3\x27\xe4\xa5\x86\x37\x9d\x07\xda\x49\x70\xf1\xe4\x64\x4e\xc1\
+\xc2\xd0\xa5\x4c\x9f\xa5\x8c\xc9\xcb\xb4\x58\xd3\x79\xa0\xbd\x06\
+\xbf\x1d\x1d\xfd\xba\x72\xf5\xda\x0f\xe0\xa6\xc0\xcf\x48\xd8\x8a\
+\xbb\xad\x4e\xda\x70\x3d\x0f\xd4\x83\xb8\xdb\xfc\xe8\x4b\x5e\x62\
+\xad\xae\x3e\x59\x58\x6e\x34\xe6\x7d\xcd\xbb\xb1\xbd\x7d\xd1\x64\
+\xde\xac\x66\x75\x8e\xeb\x0f\x00\x7d\xea\x19\xbf\xa0\x8f\x59\x00\
+\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x02\x14\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x01\xc6\x49\x44\x41\x54\x58\x85\xed\
+\x94\xb1\x6a\x14\x51\x14\x86\xbf\xff\xee\xa0\x41\xd0\x68\x13\x8b\
+\xb4\xda\xd8\xac\x20\xee\x6e\xd4\xd4\x22\x06\x45\xb1\x11\x05\x4b\
+\x0b\x51\x1f\x41\xf3\x08\x06\x1f\x40\x50\x10\x42\x76\xb3\x91\x88\
+\x98\x2e\xe0\x82\x08\x01\xf5\x05\xb4\x12\xc4\xc6\x4a\x58\xb3\x73\
+\x7f\x8b\x99\x84\x24\xbb\xd1\xec\xb0\x6a\x33\x5f\x75\x87\x7b\xee\
+\xf9\xff\x73\xce\xbd\x03\x25\x25\x25\x25\xff\x19\x15\x3d\x38\x35\
+\xef\xc9\x98\xf8\x25\x50\x4d\x2a\x9a\xec\x5c\xd6\x97\x22\x79\x42\
+\x91\x43\xf5\x05\x1f\x8f\x89\xdf\x00\x55\x80\x5e\xea\xce\xd4\x92\
+\x8f\x15\xc9\x35\x74\x07\x4e\x2f\xfa\x64\xb0\x5f\x03\x13\xd8\x79\
+\x16\x01\x7c\x35\x3a\xff\xee\xaa\x3e\x0c\x93\x6f\xa8\x0e\xd4\xda\
+\x9e\x0e\xf6\x2a\x30\x81\x30\x41\x29\x41\x29\x60\xe0\xa8\xf0\x6a\
+\xad\xed\xe9\xbf\x62\xa0\xd6\xf2\x8c\xa2\x57\x80\x43\x16\xc6\x44\
+\x9c\x4b\x43\x74\xb6\x1a\x57\xf4\x4a\xad\xe9\x8b\x23\x35\x50\x5f\
+\xf4\x4d\xe1\x36\x30\x06\xb6\x4c\xdc\x19\x23\x88\x64\x33\x19\x93\
+\xbc\xd4\x68\xf9\xc6\x48\x0c\x34\x5a\xbe\x87\xfd\x14\xa8\x18\x1b\
+\xd4\x27\xbe\xc5\x46\xcc\x62\xa8\x18\x3f\x6b\x34\x7d\xb7\xb8\x01\
+\x5b\xf5\x56\x3a\x6b\xfc\x28\xff\x8c\xfa\xad\x78\x6e\x01\x45\xe7\
+\x71\x96\xe7\x1a\xcd\xf4\x21\xf6\xae\x97\x7d\xf0\xc6\x03\x87\x7a\
+\x35\xce\x81\xee\x00\x18\xa2\x36\xa6\xbd\x47\x9c\xbd\x8d\x00\x20\
+\xfb\xf1\xdb\x8f\xe1\x3e\xb3\xfd\x05\xf4\x19\x38\x31\xef\x7d\x07\
+\x93\xf8\x04\x74\xdd\x59\xa6\x28\x0d\x27\xbe\x69\xc2\x08\x11\x32\
+\x11\x3f\xef\x7d\x0b\xb7\xd6\x6e\x6b\x7d\x57\x03\xa7\x5e\xf8\x40\
+\xd2\xf3\x02\x70\x21\x1b\xb7\x22\x43\x56\x3e\x00\x81\x43\x2e\xf5\
+\xaa\x97\xe8\xda\xda\x25\xfd\xe8\x33\x70\x6e\xd9\x47\x7e\x76\xbd\
+\x2c\x71\xc6\x80\x4c\xa4\x60\xe5\x3b\xd9\xde\x09\x3a\x5d\x69\xe6\
+\xfd\x15\x7d\x07\x48\x36\x82\xd6\xbb\xfe\x24\x31\xbe\xe9\x4a\xc5\
+\x7e\xd3\x83\xd0\xf6\x41\x9f\xdd\x6f\x7f\x06\x0e\xc3\x96\x57\xe0\
+\xd1\x14\xbb\x27\xec\x7f\xa7\x55\x52\x52\x52\xf2\x47\x7e\x01\x51\
+\xe3\xba\x72\x94\x2f\x72\xc5\x00\x00\x00\x00\x49\x45\x4e\x44\xae\
+\x42\x60\x82\
+\x00\x00\x00\xd1\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x00\x83\x49\x44\x41\x54\x78\x9c\xed\
+\xd7\xb1\x0d\xc2\x40\x10\x04\xc0\x7d\x8a\x40\x34\x42\x23\xb4\x40\
+\x80\x1c\xd1\x0b\x89\x45\x23\x54\xe1\x42\x2c\x9a\x78\x52\x64\x7d\
+\x6a\x8c\xfc\x33\xe1\xea\x82\xbd\xcb\x2e\x01\x00\x00\x00\x00\xa0\
+\x1f\x65\x19\x9c\x6f\x8f\x4b\x92\xb1\x26\xc7\x0d\xfa\xac\x69\x4e\
+\xea\x75\x7a\xde\x5f\xdf\xe1\xa1\x31\xb8\xc7\xe5\x93\xe4\x94\x94\
+\x71\x19\xb6\x0e\xd0\x95\xd6\x01\x86\x92\xbc\x7f\xde\x64\x7d\x73\
+\x52\x87\xad\x4b\x00\x00\xff\xc3\x2f\xd0\x18\xdc\xe3\xf2\x89\x5f\
+\xa0\xcd\x2f\x00\x00\x00\x00\x00\x00\x40\x27\x3e\xec\xfd\x1c\x0f\
+\x3a\x57\x98\xc9\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
+\
+\x00\x00\x01\x34\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x00\xe6\x49\x44\x41\x54\x78\x9c\xed\
+\xd2\xb1\x09\xc2\x40\x00\x46\xe1\x5f\x87\xc8\x26\x2e\xe2\x0a\x29\
+\xc4\xc6\x61\x6c\x82\x4b\xb8\x88\x5b\xa4\x72\x8b\xb3\x30\x60\x21\
+\x36\xde\x5d\x9e\xe0\xfb\x20\x90\xc0\xa1\x7f\x1e\x49\x24\xfd\xb3\
+\x4d\xef\x3f\xd8\x1d\xce\xfb\x24\xd3\xf2\x78\xbc\x5d\x4e\xd7\x96\
+\xe7\x6b\x6d\x7b\xfe\xf8\x62\x2a\xc9\x50\x92\x21\xaf\x17\x6b\x79\
+\xbe\x4a\xf7\x00\xcb\x8b\xbc\xdd\xb7\x3a\x5f\x6b\x8d\x2f\xe0\xa7\
+\x19\x80\x1e\x40\x33\x00\x3d\x80\x66\x00\x7a\x00\xcd\x00\xf4\x00\
+\x9a\x01\xe8\x01\x34\x03\xd0\x03\x68\x06\xa0\x07\xd0\x0c\x40\x0f\
+\xa0\x19\x80\x1e\x40\x33\x00\x3d\x80\x66\x00\x7a\x00\xcd\x00\xf4\
+\x00\x9a\x01\xe8\x01\x34\x03\xd0\x03\x68\x06\xa0\x07\xd0\x0c\x40\
+\x0f\xa0\x19\x80\x1e\x40\x33\x00\x3d\x80\x66\x00\x7a\x00\xcd\x00\
+\xf4\x00\x9a\x01\xe8\x01\x34\x03\xd0\x03\x68\x06\xa0\x07\xd0\x0c\
+\x40\x0f\xa0\x19\x80\x1e\x40\x5b\x23\xc0\xfd\xc3\x7d\xab\xf3\x55\
+\x56\x08\x50\xc6\x24\xf3\xf3\x2a\x63\xfb\xf3\x92\xf4\xbd\x07\x47\
+\xdd\x22\x24\x17\x57\x09\xda\x00\x00\x00\x00\x49\x45\x4e\x44\xae\
+\x42\x60\x82\
+\x00\x00\x04\x2e\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x03\xe0\x49\x44\x41\x54\x78\x9c\xed\
+\x98\x4d\x68\x5c\x55\x14\xc7\x7f\xe7\xbd\x32\xa9\x9a\xb8\xb1\x94\
+\xb4\x52\xc4\x8d\xd6\x8d\x60\x32\x16\xba\x28\x34\x7e\x84\x88\x52\
+\x94\x4a\x51\x57\xcd\xa2\xe9\xa4\x69\x26\x11\xea\x27\x04\x09\x56\
+\xb0\x5d\xa8\xcd\xd4\x7c\x8c\x94\x44\x84\x82\x9b\x62\x5d\x18\x69\
+\xa9\x4c\x16\xae\xe6\x4d\x0a\x6e\xfc\xc0\x45\x69\x35\x0b\x9b\x48\
+\x21\x81\xa6\x53\xe7\x1d\x17\xc9\x68\xe6\xbd\x97\x4e\x66\xe6\xbd\
+\x49\x4a\xef\x6f\x79\xcf\xbb\xe7\xfe\xcf\xb9\xef\xde\x7b\xee\x05\
+\x83\xc1\x60\x30\x18\x0c\x06\x83\xc1\x60\x30\x18\x0c\x06\xc3\xbd\
+\x85\x78\x1b\xe2\x5d\xa9\x0f\x04\x1d\x50\xc1\x56\x70\x05\x74\x3d\
+\x84\x85\x85\x82\x08\x58\xa2\x14\x14\xf9\xd0\x49\xf7\x0e\xae\xb4\
+\x6f\xf2\xf5\x10\x1d\x50\xb0\x01\x04\xac\x3a\xe9\x8c\x8c\xe2\x0c\
+\xab\x60\x83\x0e\x00\x25\x09\xb8\xeb\x03\xac\x15\x7f\x02\x54\x8f\
+\x2b\x72\x57\xff\xf6\x41\x28\xa2\xa8\x1e\xf7\xb6\xfb\xf6\x00\x80\
+\xd6\xae\x53\x6d\x22\x72\x1e\x68\xf2\x7c\xae\xa0\x6e\x24\x0a\xc3\
+\xc3\xc2\x1f\xd7\x3c\x22\xfb\x9c\xd1\xde\x8c\xf7\xe3\xc0\x04\x00\
+\xb4\x74\x9f\x6a\xb5\x5c\xf9\x1e\xd8\x52\x62\x50\x14\x61\x43\x26\
+\x41\xc1\x12\x7f\x4c\xb3\xae\xa5\x1d\xd3\x23\x7d\xb9\xa0\x3e\xab\
+\x26\x00\x20\xde\xfd\xd9\xe3\xb8\xd6\x45\x60\x87\xa7\x9b\x02\xee\
+\xc6\x39\x20\x64\x39\x78\xf5\xc6\x73\x15\xcb\x6d\x77\x46\xfa\x7f\
+\x5d\xbd\x67\x19\x9e\x3e\xf2\xf9\x0e\x2d\x14\x2e\x00\x3b\x3d\x5d\
+\x37\x48\x12\x04\xc0\xc2\x1f\xfc\x2f\x62\xdb\xed\xd9\xe1\x9e\x6b\
+\x77\xea\x5d\xf6\x14\xc8\x0e\xf7\x5c\x53\xcd\xef\x01\x9c\x52\x8b\
+\x8a\xa2\x76\xf9\x14\x46\x87\x00\x8a\xda\xbe\xe0\x85\xac\x6a\x7e\
+\x4f\xb9\xe0\x61\x8d\xc7\x60\x2e\x7d\x6c\xb6\xe1\xf6\xcd\x67\x04\
+\x7e\xf0\x09\x50\xec\xf5\xc8\x81\x82\xb8\x04\x8e\x7d\xa9\x21\x7f\
+\xf3\xd9\x5c\xfa\xd8\xec\x5a\xfc\x54\xa4\x7d\xef\xc1\xf1\xcd\xf3\
+\x0d\x0b\x67\x05\x7d\xc5\x2f\x48\x5d\xa9\xd3\xf1\xa9\xa8\x08\x12\
+\x34\x79\xe7\x6e\xc4\x78\xe3\xf7\x54\xf2\xd6\x5a\x7d\x55\x54\x08\
+\x65\x26\x3a\x17\x9b\x9a\x67\x0f\x80\x9e\xf1\xda\x04\xb1\xb4\xc2\
+\x84\x56\xc3\x52\x69\x1b\x14\xbc\x9e\x79\xf4\xef\xe6\x03\x95\x04\
+\x0f\x55\x0b\x56\x89\x1f\x4e\x9d\x00\xde\x0a\x10\x18\xd9\xfd\xa1\
+\x58\xd7\xfb\x0d\x7a\xd2\x49\x27\xdf\xa5\x8a\x3f\xb0\xa6\x19\x8b\
+\x27\x52\x6f\xa3\x7a\x22\xc0\xab\x8b\x86\x9d\x04\x15\x82\x66\x5e\
+\xe4\x1d\x67\xb4\xf7\x64\xb5\x5e\xed\x5a\x24\xcd\x38\x93\x3f\x6e\
+\x6b\xed\xf8\x53\x44\x5e\xa2\x34\x99\xa2\x84\xb8\x1e\x84\xa0\xe0\
+\x5d\x90\x43\xce\x58\xef\xe9\xda\x5c\x87\x40\x3c\x91\xda\x8f\xea\
+\x59\x20\xe6\x31\x2d\xd7\x0a\x35\x11\x54\xda\xe6\x05\x5e\xcf\x8e\
+\x25\xcf\xd5\xe8\x3b\xbc\x49\x8a\x1f\x1a\x7a\x0e\x8b\x6f\x80\x07\
+\x56\xb6\xeb\xd2\x96\x5d\x65\x12\x24\xa8\xc0\x59\x10\xf4\xe5\xec\
+\x58\xdf\xa5\xea\x7c\x7a\x46\x08\xc3\x49\x91\x78\x62\x68\x17\xca\
+\x77\xc0\x43\x9e\x61\xaa\xb8\x44\x05\x06\x3f\x27\xae\xfb\x42\xf6\
+\x8b\xfe\x6c\x2d\x3a\x4b\x46\x09\xcb\x51\x91\x96\x23\x9f\x3e\x21\
+\x85\x4d\x17\x05\x7d\xd8\x63\xaa\x60\x39\x04\x06\xff\x87\x6b\x17\
+\xda\xa7\x87\xdf\xfc\x39\x04\x99\xff\x8f\x14\xa6\xb3\x22\x4f\xf5\
+\x9c\x7e\xc4\xfe\xc7\xbd\x00\x3c\x56\x62\x50\x51\xe4\x4e\x7f\x82\
+\x00\x1a\xb4\xe6\x7f\x53\x75\x9f\xcf\xa5\xfb\xaf\x86\x2c\x35\xba\
+\xc2\xe5\xc9\xc4\xc8\xd6\x98\xde\x9e\x04\x5a\x4a\x2d\x0a\x48\x21\
+\x50\x89\xaa\x1d\x20\x69\xba\x90\xa7\xe3\xf2\x78\xf2\x7a\x14\x3a\
+\x23\x7b\x12\xfb\x69\xb4\xfb\x2f\x3b\x46\x1b\xc2\x54\xa9\x45\x00\
+\x4a\x2e\x51\xc5\x3b\x45\x40\xf0\x19\x3b\x46\x5b\x54\xc1\xff\xa7\
+\x26\x4a\xf6\x1e\x1c\xdf\xbc\x10\x9b\xff\x1a\x61\x9f\xd7\xa6\xcb\
+\x7b\xc2\x2a\x8f\xaf\xe7\x1b\x6f\x35\xbd\x96\x99\xe8\x5c\x8c\x52\
+\x5f\xe4\x8f\xa2\x99\x89\xce\xc5\xc6\x6d\x73\xfb\x45\xe4\x4b\xaf\
+\x4d\x96\x5e\x70\x7c\x1a\x14\x26\x1a\x9b\xe7\x5e\x8d\x3a\x78\xa8\
+\xb1\x12\x5c\x2b\x57\xa6\xa6\xdc\x99\x17\x77\x7d\xbb\x7d\xfe\xbe\
+\x07\x11\xd9\x5d\xe6\xf3\x4f\x72\xcd\x73\x47\xaf\x0c\x0e\xfa\xf7\
+\x89\x08\xa8\xf3\x55\x5e\x25\xde\x95\x7a\x0f\xe1\xa3\x60\x31\xfa\
+\x7e\x76\x2c\xf9\x71\x35\x97\x9a\x6a\x59\x97\xf7\x9c\x78\x62\xe8\
+\x30\xca\xe8\x8a\x26\x45\x35\xe1\xa4\xfb\xd2\xf5\xd6\x52\x97\x25\
+\xe0\x65\xc6\x99\xcc\x6d\x6f\xed\xb8\x1f\x91\x9d\x02\x0b\x40\xa7\
+\x93\xee\xfb\x6a\x3d\xb4\x18\x0c\x06\x83\xc1\x60\x30\x18\x0c\x06\
+\x83\xc1\x60\x30\x18\xee\x35\xfe\x05\x2f\xee\x41\x9b\x3f\x6f\x48\
+\xfe\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x02\x22\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x01\xd4\x49\x44\x41\x54\x58\x85\xed\
+\x94\xb1\x6b\x13\x51\x1c\xc7\x3f\xdf\x17\x84\xa0\x20\x71\xd0\xc1\
+\x49\x89\x08\x4a\x06\x25\xb8\x3a\x79\xb5\x48\xe9\x50\x0d\x8e\x82\
+\x6d\x66\xff\x02\x41\xdd\xfc\x0b\x1c\x92\xb8\x56\xbc\x06\xa1\x75\
+\xf0\x7a\x43\x07\x07\x75\x11\xed\x10\x17\x2d\x2e\x0a\x2e\xb5\x64\
+\xb1\xa1\xe6\x7e\x0e\x97\x33\xa7\x6d\x63\x92\x16\xbb\xdc\x17\x0e\
+\xde\xdd\xfb\xbe\xef\xf7\xfb\x7e\xef\xf7\x0e\x32\x64\xc8\x90\xe1\
+\x80\xa1\x64\xe0\x5d\x9f\xfb\x0e\x14\xfe\x93\xef\x46\xd8\xac\x1f\
+\x03\x70\xfd\x28\x72\xbb\xd2\xf7\x1b\x29\xaf\xfe\x40\xd1\x69\xe0\
+\x75\x8a\x16\x01\xdd\xfd\x78\x84\xa2\xdf\xde\xc6\xab\x9e\xd7\x9f\
+\x01\x02\xbf\xb1\xae\xc3\x9d\x2b\x40\x00\x80\xe1\x48\x1d\xd1\x1e\
+\x76\xab\x08\x73\xf1\x90\x17\x1c\xe9\x78\x81\xdf\x58\x4f\xa6\x73\
+\x69\xee\xa7\xd5\xd5\xad\x72\xa9\xf8\xf4\x87\xe5\xcf\x4a\x94\x30\
+\xb4\xb7\x08\x12\x98\x13\x80\xd9\x93\x82\x6b\xdf\x5c\x9a\x9f\xdf\
+\x4c\x33\x72\x7f\x2f\x69\xb5\x5a\xdd\x72\xa9\xf8\xac\x63\xf9\xe3\
+\x88\x4b\x8c\x5b\x05\xc5\xe6\xc4\x02\x8f\x0a\xb9\x76\xd5\xf7\xfd\
+\x9f\xdb\x68\x83\x24\xbc\x99\xb9\xfb\x88\xbb\xbd\xd7\x08\xcc\x86\
+\x75\x4f\xcc\x41\x0f\xc2\x66\xed\x1e\xb0\xe3\xda\x6d\x15\x48\x63\
+\xed\xc3\xdb\x95\xe2\xf9\xf2\x06\x30\xd9\x0b\xab\xdd\x84\x12\x98\
+\xe1\x24\x92\x9d\xdf\x09\x9b\xf5\x87\x83\xf8\x03\x03\xf4\x42\xbc\
+\x29\x9e\xbb\xb8\x86\x34\x0d\xb8\x5e\x5f\xec\x18\xc2\xcc\x9c\x24\
+\x11\x77\xff\xad\xb0\x59\xaf\xfd\x4b\x7f\xe8\xf3\x9d\xb8\x51\x9d\
+\x32\x33\x1f\xc8\x13\x57\x21\x4a\xcf\xa7\xcc\x37\x25\x55\x96\x17\
+\x6a\xcf\x87\xd1\x1d\xa9\xc1\x26\x66\x66\x2f\x9b\xdc\x12\xd8\x51\
+\x33\x33\x29\xbe\xdf\x7d\x73\xb5\x9d\x6c\x2a\x58\xa8\xbf\x1c\x56\
+\x73\xe4\x0e\xf7\x2a\xd5\x0b\x44\x16\x00\x27\x0c\x4c\x89\x86\xf8\
+\x86\x34\x19\xfa\xb5\x77\xa3\xe8\x8d\x75\xc5\xae\x56\x66\xcf\x44\
+\x11\x21\xe8\x54\xfc\xc5\x3e\x3b\x87\x17\xf8\x8d\x8f\xa3\x6a\x8d\
+\xfd\x9b\xf1\xa6\x6f\x9f\xe4\x90\xfb\x02\x7a\xcf\x56\xf7\x5a\xb8\
+\xf8\xf8\xeb\xb8\x5a\x19\x32\x64\xc8\x70\xa0\xf8\x05\xa4\xf1\xa4\
+\x8e\x44\xc6\x51\x5e\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\
+\x82\
+\x00\x00\x00\x8a\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x00\x3c\x49\x44\x41\x54\x58\x85\xed\
+\xcd\x21\x15\x00\x21\x00\xc0\xd0\x41\x26\x02\x60\xc8\x82\xbb\x30\
+\xa7\x08\xc3\x7b\x14\x20\x14\x0a\x8b\xc4\xb0\xaf\xe6\x06\x92\x24\
+\xbd\x2e\xec\x48\xf5\x1f\x40\xbe\x74\xed\xb3\x7d\x05\x20\x5e\x19\
+\x4a\x92\x24\x1d\x2c\x16\x1c\x05\x04\xcb\x08\x93\xc5\x00\x00\x00\
+\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x01\x93\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x01\x45\x49\x44\x41\x54\x58\x85\xed\
+\xd7\xb1\x4e\xc2\x50\x14\xc6\xf1\xff\x29\xa1\x8c\x96\x05\x9f\xa1\
+\x0b\x03\x09\xf8\x02\x26\xf0\x0e\xac\x26\x94\xc1\x18\x9c\xd5\x41\
+\x76\x10\x19\xe8\x0b\xf0\x0c\xc6\xc4\x27\xa8\x89\x03\x4b\xdf\x81\
+\x05\x1c\x29\x81\xe3\x00\x35\x58\xc0\x41\xdb\x38\x78\xbf\xf1\xb4\
+\xc9\xf7\x4b\x6f\x87\x7b\xe0\xbf\x47\x92\x83\x8a\x37\xac\x5b\xaa\
+\xd7\x40\x0d\x70\x52\xea\x99\x03\xc1\x5a\xa4\xf7\xe6\x5f\x3e\x1f\
+\x05\x54\x5b\x8f\x5d\x85\x1b\x60\x01\x12\x22\xfa\x9e\x4a\xbd\xca\
+\x09\xa8\x0b\x14\x44\xb4\xfb\xea\x5f\xdd\xed\x01\xaa\xad\x41\x43\
+\x91\x27\x84\x97\x88\x7c\x73\xe2\xb7\xa7\xa9\x94\x6f\x53\xf6\x46\
+\x25\x9b\xe5\x18\xe5\x7c\x2d\xd2\x88\xbf\x84\xf5\x89\x44\x3a\xc0\
+\x22\x8b\x72\x80\x89\xdf\x9e\x46\xe4\x9b\x40\x94\x53\xed\xc4\x73\
+\x6b\xe7\x9d\x1a\x48\x98\x45\xf9\x2e\x42\x21\xd4\xcd\xff\xb5\x07\
+\x70\x52\x3b\xf3\x6f\x22\xc2\x1c\x28\x1e\x02\xfc\x49\x0c\xc0\x00\
+\x0c\xc0\x00\x0c\xc0\x00\x0c\xc0\x00\x76\x01\xf3\xcd\xed\x35\xdb\
+\xa8\xe2\x00\xb3\x43\x80\x00\xd4\x2d\x7b\xa3\x52\x56\xe5\x65\x6f\
+\x54\x12\x70\x05\x82\x3d\xc0\x5a\xa4\x07\x14\x6c\x96\xe3\x2c\x10\
+\x67\x17\x0f\xa7\x36\xcb\x31\x60\xaf\x44\xfa\xf1\xfc\xeb\x62\xe2\
+\x0d\xee\x55\xe5\x16\x88\x14\xc2\xed\x05\xf2\xd7\x51\xc5\x11\x70\
+\x01\xfb\xe8\x62\x12\xa7\xe2\x0d\xeb\x39\xd5\xce\xf6\xea\x5c\x4c\
+\x3e\xff\x61\x66\x02\xc1\x4a\xa4\x9f\x5c\xcd\x4c\x3e\x00\xa7\x7c\
+\x6e\x32\xdb\xbd\x64\x45\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\
+\x60\x82\
+\x00\x00\x00\xa1\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x00\x53\x49\x44\x41\x54\x58\x85\x63\
+\x60\xa0\x00\x98\x64\x4c\x6c\x30\xc9\x98\xd8\x40\x89\x19\x4c\x94\
+\x68\xa6\x06\x18\x75\xc0\xa8\x03\x46\x1d\x30\xea\x80\x51\x07\x8c\
+\x3a\x60\xc0\x1d\xc0\x42\x05\x33\x1c\x28\xa9\x92\x87\x45\x08\x1c\
+\x38\x33\x23\xbf\x81\x5c\xcd\x03\x1e\x02\xa3\x0e\x18\x75\xc0\xa8\
+\x03\x46\x1d\x30\xea\x80\x51\x07\x0c\xb8\x03\x00\xb9\x93\x08\x9d\
+\x47\x2d\xcd\xca\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
+\
+\x00\x00\x03\x9c\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x03\x4e\x49\x44\x41\x54\x78\x9c\xed\
+\x9b\xcd\x6b\x13\x41\x18\xc6\x9f\x77\xd3\xa8\x85\x52\x0f\x22\x22\
+\xf6\x60\x6d\x3c\xa8\x05\xd1\x93\xde\x8a\x36\x89\x15\x14\x9b\x18\
+\x94\x16\x11\xd2\x54\xfb\xf1\x07\x14\xff\x02\xeb\x51\x69\xfd\x22\
+\xed\xa5\xd4\x83\x31\x55\x11\x5a\x4d\x2a\xb4\xe0\xc1\x8b\x1f\x87\
+\x22\x3d\x58\x11\xcc\xa5\x8a\x87\x96\x8a\xa9\x49\x66\x3c\x18\x04\
+\xb3\x9b\x4d\xb3\xbb\x93\x31\xcd\xfc\x8e\xb3\xc3\xf3\x3e\xfb\x64\
+\x32\x33\xec\xce\x02\x0a\x85\xa2\x96\x21\xbb\x02\x6d\xa1\x81\x06\
+\x37\xcf\x0c\x82\xf1\x10\x08\xad\x00\xb6\x3a\xe0\xcb\x0e\xeb\xe0\
+\x58\x80\x46\xb1\x0c\xb9\x47\xe7\x62\xb7\xd7\xcc\x3a\xdb\x0a\xc0\
+\xd7\x19\xf1\x72\x0d\xe3\x00\x9a\xec\xe8\x08\x24\x45\x0c\xe1\xc4\
+\xe3\x68\xb2\x58\x07\x97\x55\x65\x5f\xb0\x27\xcc\x89\x1e\x02\xd8\
+\x6e\x55\xa3\x02\x34\x82\xd0\xb5\xef\xd0\xd1\x2f\x9f\x3e\xbc\x7d\
+\x6f\xd4\xc1\xd2\x08\xf0\x9e\x0f\xfb\xc0\xb5\x19\x00\x9a\x2d\x7b\
+\x95\x23\x47\x0c\x1d\x46\x23\xa1\xec\x00\xda\x42\x03\x0d\x6e\xf6\
+\x6b\x11\xc0\x1e\x47\xac\x55\x8e\x54\x46\xdb\x72\xa0\x70\x4e\x28\
+\xfb\x17\x74\xf3\xcc\x20\xaa\xef\xe6\x01\xa0\x29\xef\xfd\x1f\xca\
+\x1f\xc2\x8c\x87\x1c\xb1\x23\x03\x03\xef\xe5\x07\xf0\x67\xa9\xab\
+\x4e\x0c\xbc\xd7\x59\x90\x31\x5d\xe7\x93\xf1\xa8\xed\xbd\x85\x1d\
+\xbc\xc1\x08\x37\xb9\xac\xf3\x5e\x2d\xb3\xb8\x30\x54\x00\xb2\x0d\
+\xc8\x46\x05\x20\xdb\x80\x6c\x54\x00\xb2\x0d\xc8\xa6\xe6\x03\x28\
+\xb9\x11\xf2\x07\xae\xec\x66\x60\xfd\x20\x9c\x24\x60\x97\xd9\x2e\
+\x03\x00\x7c\xc1\xc8\x47\xab\x66\x38\xc0\x01\xa4\x08\x98\x76\x6d\
+\xfb\x79\x6f\x66\x72\x72\xd5\xaa\xd6\x46\x31\x0d\xc0\x1b\xe8\x3d\
+\xcb\x88\x8d\x03\xd8\x91\x37\x58\x12\x0e\xb4\xd8\xf4\xe4\xe1\x40\
+\x5b\x36\x5d\xdf\xdf\x1e\x88\x74\xcd\x4e\x45\x5f\xdb\xd4\x33\xa5\
+\xe8\x5f\xc0\x1b\xe8\x19\x06\xf1\xa7\xc8\xdf\xbc\x04\x9a\x89\xf0\
+\xca\x1b\xec\xed\x13\x59\xc4\x30\x00\x5f\x20\x72\x01\x44\x43\x22\
+\x0b\x6f\x10\x17\xc0\x47\xda\x03\x91\x63\xa2\x0a\xe8\x02\x38\x75\
+\xae\x6f\x2f\x27\xba\x2f\xaa\xa0\x05\x5c\x44\x78\xd0\xd1\xdd\xdd\
+\x28\x42\x5c\x17\x40\xd6\x95\xbd\x06\x70\x21\xc5\x6c\xd0\x9c\x4b\
+\xd7\x5f\x15\x21\xac\x0b\x80\x80\xd3\x22\x0a\xd9\x85\x0b\xf2\x65\
+\x34\x07\xfc\xaf\x8f\xb8\x85\xf8\x2a\xfb\x81\x88\xa6\xf1\xfd\x22\
+\x8c\x64\xb3\xf0\x68\x1a\xcd\x14\xbb\x4e\x0e\xbc\xc4\x31\xa2\xec\
+\x00\x5e\xc4\xc6\x2c\x6f\x74\xcc\xf0\x87\x7a\xc0\x98\x08\x65\x73\
+\x6a\x7e\x2b\xac\x02\x90\x6d\x40\x36\x2a\x00\xd9\x06\x64\xa3\x02\
+\x90\x6d\x40\x36\x2a\x00\xd9\x06\x64\xa3\x02\x90\x6d\x40\x36\x2a\
+\x00\xd9\x06\x64\x63\xe5\x7c\x80\x14\x38\xd0\x52\xe2\xdd\xff\x46\
+\x58\x2f\x6c\xa8\xad\x11\xc0\xb1\x50\xd8\x54\x5b\x01\x68\x14\xd3\
+\x35\xc9\xf0\x21\x89\x54\x86\xdc\xa3\x85\x8d\x55\x33\x07\xd8\x24\
+\x47\x0c\xe1\xb9\xb8\xfe\xdc\x70\x2d\x04\x90\xe3\x84\xde\x64\x91\
+\xf3\xc2\x9b\x3d\x80\x14\x31\x84\x8b\xdd\x3c\xb0\x39\x03\xf8\x7b\
+\x5c\x9e\xea\xd3\x23\x89\x89\x89\x1f\x66\x9d\x75\x8f\x9a\x1d\x58\
+\x6b\x85\x40\xc0\x52\x22\x1e\xf5\x38\xad\x6b\xb4\x0a\x7c\x73\xba\
+\x88\x13\x70\x60\x59\x84\xae\x51\x00\xb3\x22\x0a\xd9\x86\xe3\xa5\
+\x08\x59\x5d\x00\x1a\x63\x37\x00\x64\x44\x14\xb3\xc1\x77\x0d\xda\
+\x1d\x11\xc2\xba\x2f\x46\x96\x16\xdf\x2d\x7b\x0e\x1e\x59\x03\xc8\
+\x2f\xa2\xa0\x15\x08\xfc\x62\x62\x2a\xfa\x46\x84\xb6\xe1\x4e\xf0\
+\x78\x6b\xd3\x4d\x10\x1e\x89\x28\x58\x2e\x04\x0c\x27\xe2\x63\xcf\
+\x44\xe9\x1b\x7e\x33\x34\x3f\x3f\xcf\x2f\x85\xce\xc4\x53\x5f\x57\
+\x57\x00\x3a\x51\xac\x9f\x60\x56\x38\xe8\x72\x32\x1e\xbd\x25\xb2\
+\x48\xc9\x37\xae\xfe\xce\xf0\x61\xa6\x69\x43\x00\xda\x01\xec\x14\
+\x69\x26\x4f\x8a\x03\xd3\x75\xb9\xba\xeb\xcf\x9f\xdc\xfd\x5c\x81\
+\x7a\x0a\x85\xa2\x86\xf9\x0d\x29\x0e\xd0\xf4\xc6\x6c\xeb\x8f\x00\
+\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x01\x9f\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x01\x51\x49\x44\x41\x54\x58\x85\xed\
+\x94\x2d\x48\x43\x51\x14\x80\xbf\xf3\x36\x10\x14\x15\x67\xd1\x66\
+\x17\x2c\xbe\x55\x8b\x98\x4d\xb3\x6a\x71\x4f\xd0\x4d\x8c\x82\xe0\
+\x5e\xb0\x98\xdc\x14\xdd\xc6\xc2\xaa\x13\x9b\x59\xb0\xcf\xbf\x64\
+\x53\x9b\x7f\xf8\x93\x06\x8a\xbb\xc7\xb4\x89\xf1\xdd\x07\xaf\xf8\
+\xbe\x76\xe0\xfc\x7c\xdc\x7b\xee\x85\x98\x98\x98\xff\x8e\x04\x4b\
+\x57\x71\xbd\x5d\x03\xf0\xfd\xd9\x1e\xba\xaa\xaf\x7d\x84\x15\x70\
+\x02\x65\x6f\x16\xba\xc2\xc9\x9e\xc4\x7b\x26\xd3\x48\x44\x2b\xe0\
+\xfb\x46\x55\xe6\x3a\xe1\x5d\xea\xf1\x3b\x5a\x01\xe0\xbc\x9a\x3b\
+\x42\x65\xab\x13\xbb\xd9\xd2\x75\xa4\x02\x00\xcd\x6a\x6e\x43\xe0\
+\x14\x00\x61\xc2\xf5\x8a\x07\xb6\x02\x01\x97\xf0\x2f\xae\x57\xd2\
+\x6e\xa0\xea\x35\xab\xab\xd5\xa0\x3d\xac\x4e\xa0\x43\x73\xe4\xf5\
+\x77\x09\x45\x2a\x69\x6f\x67\x2a\x52\x01\x7c\xdf\xb4\x12\x89\xfe\
+\x4e\xa8\x38\x67\xd1\x0a\x00\xbc\x3c\x7f\x29\xdc\xdb\x96\x87\x14\
+\x50\xe9\x1d\x1a\xae\x09\x8c\x01\x4f\xed\xa4\x33\x16\xb4\x43\xa8\
+\x8f\xc4\x5d\x4a\x15\x40\xf2\x40\xcb\x38\x3a\x73\xb9\x9f\xbf\x09\
+\xda\xc3\xfa\x15\x4c\x66\x8b\xf3\x22\x52\x07\x8c\x11\x67\xf6\xa2\
+\xbc\x72\x62\xd3\x27\x69\x53\x94\xf6\x8a\xd3\x8a\xd4\x00\x14\x59\
+\xb6\x1d\x0e\x16\x3b\x90\x5e\xdc\x1b\x57\xe4\x18\x48\xa2\xba\x7d\
+\x5e\xc9\x95\x6d\x87\x5b\x08\xa8\x18\xc7\x34\x80\x41\xe0\xb0\x39\
+\xfa\xb6\x1e\x66\x38\x58\x5c\x81\xc0\x83\xa0\xb7\x7d\x9f\x03\x0b\
+\xf8\x79\x13\x56\x20\x26\x26\x26\xe6\x07\x9e\x35\x61\x37\x0a\x6d\
+\x65\xe5\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x00\x97\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x00\x49\x49\x44\x41\x54\x58\x85\xed\
+\xd7\xb1\x0d\x00\x20\x0c\x03\x41\x0b\x31\x18\x83\x23\x65\x15\x94\
+\x0c\x12\x86\x30\x1d\xff\x7d\xac\x6b\x23\x91\xd1\xc9\x8a\x93\x15\
+\xce\xc6\xb4\x04\xad\x65\xdd\x4b\x1a\xee\x00\x00\x00\x00\x00\x00\
+\x00\x00\x00\x00\x00\x00\x00\x00\xb8\x79\x9f\x91\x7a\xbf\x61\xfc\
+\xdc\x05\xd1\x25\x09\xfd\x18\x55\xe2\x51\x00\x00\x00\x00\x49\x45\
+\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x00\x87\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x00\x39\x49\x44\x41\x54\x58\x85\xed\
+\xce\x31\x11\x00\x30\x08\x04\x41\x26\x9a\x10\x85\x0c\x2c\xe0\x38\
+\x22\xa0\xdc\xeb\xff\x67\x23\x16\x65\x4d\x67\x4d\x6f\x3e\xde\x66\
+\x7c\x11\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\
+\xc0\x07\x39\x3f\x03\x99\x39\x3b\x26\x1f\x00\x00\x00\x00\x49\x45\
+\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x02\x0d\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x01\xbf\x49\x44\x41\x54\x58\x85\xed\
+\x94\xb1\x6a\x54\x41\x14\x86\xbf\x7f\x36\x4a\x90\xe0\x6a\x13\x8b\
+\x8d\x91\x04\xad\x63\x91\x4a\x49\x2d\x62\x4a\x1b\x51\xf0\x01\x44\
+\x7d\x05\x7d\x04\x83\x0f\x20\x28\xd8\x58\x28\x28\x62\xba\x80\x79\
+\x00\x61\xfb\xdd\xd9\xd9\x15\x02\x29\xac\x6c\xc2\x9d\xdf\xe2\xee\
+\x26\x31\xbb\x01\xf7\xba\x62\x73\xbf\xe2\x32\x70\xee\x9c\xff\x9b\
+\x73\x87\x0b\x35\x35\x35\x35\xff\x19\x55\xdd\x98\x52\x6a\x15\xe6\
+\x13\x66\x2d\xc8\xad\xe5\xe5\xe5\xef\x55\xfa\x84\x8a\xe1\xd7\x8a\
+\xac\xaf\x98\x35\x80\xec\xb0\x9b\x52\xba\x5a\xa5\xd7\xd4\x13\xe8\
+\x74\xfa\xd7\x15\xfc\x05\x58\x04\x1f\x6b\xa3\xbd\x5c\x70\x6b\x75\
+\x75\xe9\xdb\x34\xfd\xa6\x9a\x40\xaf\xd7\xdb\x50\xf0\x0e\xb0\x28\
+\x30\xa8\x00\x15\xe5\xda\x97\x42\xc3\x3b\xbd\x5e\x6f\xe3\x9f\x08\
+\xc4\xd8\xdf\xcc\xd6\x36\x70\x1e\xb0\x21\x8f\x6a\xc3\xb5\x81\x66\
+\xb6\xb6\xbb\xdd\xfe\x9d\x99\x0a\xc4\x98\x1e\x18\xbf\x07\xe6\xcb\
+\xec\xa3\xf0\x63\xe4\x61\x6d\x1e\xf9\x43\xb7\x9b\xee\xcf\x44\x20\
+\xc6\xf4\xc4\xf0\x1a\x68\xb8\x1c\xfb\xa4\xf0\x21\xca\x18\x03\x0d\
+\xc4\x9b\x18\xd3\xe3\xca\x02\xb6\xd5\x89\xe9\xb9\xe1\xc5\xa8\xb9\
+\x26\x9f\xfc\x84\x03\x19\x95\x92\x86\xad\x4e\x4c\xcf\x6c\x9f\x7a\
+\xd9\x27\x16\x6c\x87\x98\xfa\x5b\x98\x47\xb6\x09\x52\xf6\xd1\x95\
+\xff\x43\x24\x3b\x07\x49\x20\x5e\x5e\xb9\xbc\xf4\x54\x1a\x9f\xde\
+\x98\x40\xbb\xdd\x3e\xbb\xb0\xd0\x7c\x85\xb8\x37\xd4\xc9\xa0\x29\
+\xc3\x0f\x8f\x22\x50\x39\x65\xf3\x76\x7f\x7f\xef\xe1\xfa\xfa\xfa\
+\xc1\xa9\x02\x83\xc1\xe0\xdc\x41\x91\xdf\x61\x6e\x97\x7b\xc8\x9a\
+\xfa\xe4\x27\x14\x40\xc2\x01\x04\xe2\xf3\x99\x46\xb8\xdb\x6a\xb5\
+\x7e\x8e\x09\xc4\x18\x2f\x9a\xf0\x11\xb8\x51\x5e\x66\x65\xf4\x77\
+\xe1\xc7\x2c\x04\x0e\x48\x80\x77\x9d\x8b\xcd\x95\x95\x95\x1f\x00\
+\x73\xa3\x77\xb2\x43\x47\xa2\x59\x6a\x09\x2a\xfe\xa6\x27\xa2\xc3\
+\x07\xa0\x9b\x0a\x73\x5d\xe0\xc2\xef\x21\x55\x3f\x73\x05\x3c\xa3\
+\xc1\xd6\xd4\xd4\xd4\xcc\x84\x5f\x30\x7d\xb9\x9b\x4b\x8f\xb2\x18\
+\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x00\x75\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x00\x27\x49\x44\x41\x54\x78\x9c\xed\
+\xc1\x01\x0d\x00\x00\x00\xc2\xa0\xf7\x4f\x6d\x0e\x37\xa0\x00\x00\
+\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x80\x77\x03\
+\x40\x40\x00\x01\x8f\xf2\xc9\x51\x00\x00\x00\x00\x49\x45\x4e\x44\
+\xae\x42\x60\x82\
+\x00\x00\x04\x67\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x04\x19\x49\x44\x41\x54\x78\x9c\xed\
+\x9b\x4d\x88\x1c\x45\x18\x86\xdf\xb7\x67\x27\x59\x91\x78\x31\x88\
+\x30\x3b\xdd\xd3\x3b\x89\x3f\x57\x5d\xbc\x0a\xc1\x44\x22\xf8\xc3\
+\x22\xe2\x41\x10\xfc\x41\xc1\x93\x22\x01\x3d\xa8\xa0\x01\x45\xf0\
+\xa0\xe0\x1f\x0a\x1e\x44\xd1\x53\x0c\x62\x64\x83\x10\xf0\x22\x08\
+\x82\x07\x31\x38\xcb\x6c\xd7\xf4\x74\x30\x46\x11\x45\x71\xcd\xf4\
+\xd4\xe7\x61\x26\xc6\xed\x6a\xcd\x8e\xa9\xaa\xee\xc3\x3c\xb7\x6d\
+\x96\x7a\xbf\x7a\xa6\xba\xbb\xbe\xee\x19\x60\xce\x9c\x39\x73\x2c\
+\xa0\x54\xfa\x4c\xa2\xd2\x5c\x0d\xd2\x91\x52\xd9\xd3\x55\xd7\xb3\
+\x5d\x68\x6b\xa0\x44\xa5\x63\x00\xc1\xf4\x4f\x11\x8d\x7d\x71\xdc\
+\x3e\x61\x6b\x7c\x57\x04\x17\xfe\x97\xed\x21\x22\xff\x1c\x8b\x0c\
+\x70\x54\x29\x75\xbd\xad\xf1\x5d\x61\x4d\x00\x49\x5d\x38\xb4\x4b\
+\x10\x7c\xda\xef\x67\x57\xdb\xca\x70\x81\x35\x01\x00\xa4\xe4\xd8\
+\xee\x46\x43\x1f\x5f\xcf\xb2\xb6\xc5\x1c\xab\xd8\x14\x50\x8a\x00\
+\xed\x85\x5c\xaf\x65\x59\xb6\xdb\x75\xd6\xff\xc1\xb9\x80\x29\xd7\
+\x8c\x72\x7d\xec\xe4\xc9\x33\xbb\x3c\xe5\x6d\x1b\x97\x02\x8a\xa7\
+\xc4\xca\xe2\x25\x9b\x47\x7a\xbd\xde\x4e\x87\x99\x33\xe3\x52\x80\
+\x86\x29\x61\x5f\x73\xe7\xe2\x7b\x22\xb2\xe0\x30\x77\x26\x5c\x9f\
+\x02\x1a\xe0\x56\x09\x82\x55\x95\x0e\x5f\x17\x11\x6b\x7b\x90\x8b\
+\xc1\xc3\x35\x40\x34\x8b\x2b\x41\x70\x7f\x32\x18\x3e\xef\x3e\xfb\
+\xc2\x78\xb9\x08\x0a\xa0\xa5\x70\x32\x10\x38\xa4\x54\x7a\xc8\x47\
+\xfe\x7f\xe1\xeb\x2e\x00\x12\xe3\xe2\x31\x01\x5e\x48\x92\xf4\x01\
+\x5f\x35\x94\xe1\x4d\xc0\x04\x29\xee\x16\x01\xe2\x8d\x24\x49\x57\
+\xfd\xd6\x71\x1e\xcf\x02\x28\x10\x14\x25\x04\x20\xde\x57\x2a\xbb\
+\xc9\x6f\x2d\xe7\xc2\x7d\x43\x08\x60\x48\xd8\x21\xd0\x47\xfa\x69\
+\x7a\x83\xef\x72\xfc\x0b\x98\x50\x26\xe1\xd2\x40\xe3\x93\x24\x49\
+\xae\xf5\x59\x48\x55\x02\x00\x40\x40\x43\xc2\xe5\x60\xe3\x78\xbf\
+\x7f\x2a\xf2\x55\x44\x95\x02\x00\x81\xd0\x5c\x09\xad\x20\x18\xaf\
+\xad\xaf\x7f\x7f\x85\x8f\x12\xaa\x15\x00\x40\x00\x91\xe2\x46\x89\
+\xb8\x6a\xa1\x79\xf6\x58\xaf\xd7\xbb\xcc\x75\x7e\xe5\x02\x00\x80\
+\xa5\x7d\x03\xaf\x6b\x36\x17\x8f\x6e\x6c\x6c\x2c\xba\xcc\xae\x85\
+\x80\x29\xa6\x04\xe2\x46\x04\xcd\x0f\x5c\x36\x4f\x75\x12\x00\x94\
+\x34\x4f\x84\xdc\x36\x18\xa4\x6f\x15\x9e\x39\x5a\xa3\x6e\x02\x00\
+\x88\x26\xb7\xae\x04\x01\xef\x55\x2a\x7b\xd1\x45\x07\x59\x43\x01\
+\x80\x88\xd9\x3c\x81\xf2\x98\x4a\xb3\x27\x6c\x67\xd5\x52\x00\x50\
+\xde\x3c\x41\xe4\xf0\x86\x1a\x3e\x64\x33\xa7\xb6\x02\x26\x98\xcd\
+\x13\x21\xaf\x29\x35\xbc\xd3\x56\x42\xcd\x05\x50\xc4\x6c\x9e\x28\
+\x90\x57\x6c\x25\xd4\x5c\x00\xfe\xed\xe5\x9d\xb5\xdb\x62\x6d\x1e\
+\x4e\x96\x31\x9d\xbb\xf1\x21\x09\xf0\xb6\xad\x8c\x1a\x0b\x20\x34\
+\xa4\x61\x2c\x00\xca\x23\x71\x18\xbe\x6a\x2b\xa5\xa6\xa7\x00\x21\
+\x52\x32\x79\x91\xa7\x3a\x16\x27\x0f\xd4\x55\x00\x25\x60\x61\xf6\
+\x02\xbc\x1c\x45\xed\xe7\x6c\x47\xd5\x4e\x00\x81\x00\x62\x5c\xfa\
+\xde\xed\x84\x4b\x8f\x92\x2c\x7b\x01\x7b\x51\xd4\x46\xc0\xe4\x13\
+\x67\x20\xe6\x75\xff\xe3\x1f\xcf\x9c\xbe\xaf\xe4\xf5\xbb\x15\x6a\
+\x23\x60\xd2\xec\x6c\xdd\xeb\x0b\xf0\x79\x23\xc0\x5d\x2b\x2b\x2b\
+\x23\x57\xb9\xf5\x10\x20\x12\x9c\x5b\x03\x7f\x43\x7c\xad\xf3\xb3\
+\xb7\xb6\xdb\xed\x3f\x5c\x46\x57\x7f\x1b\x24\x09\x73\xd9\xaf\xeb\
+\x7c\x74\x73\xb7\xdb\xfd\xc5\x75\x7c\xc5\x2b\x80\x84\xd9\xe7\x9f\
+\x12\x9d\xef\x5f\x5e\x5e\x3e\xed\xa3\x82\x2a\x57\x00\x01\x63\xf2\
+\x3f\x13\xfa\x40\x27\x8e\x13\x5f\x45\x54\xb2\x02\xa6\x57\xfa\x62\
+\xf6\xef\xa2\x79\x4b\x14\x45\xdf\xf8\xac\xc5\xbf\x00\x01\x69\xe6\
+\x8e\x34\x65\x35\x8e\x97\xbe\xf0\x5d\x8e\xef\x97\xa3\x04\x8d\x4c\
+\x21\x78\xcf\x72\x18\xae\xf9\xad\x65\x82\xef\x97\xa3\x46\x1e\x81\
+\x87\xa3\x68\xe9\x43\xbf\x75\x9c\xc7\x9b\x00\x11\x34\x8c\x63\xe0\
+\x93\x51\xd4\x7e\xd3\x57\x0d\x65\x78\xb9\x0b\xd0\x5c\xf6\x80\xf0\
+\xa5\x4e\xd4\xaa\xfc\x6b\x32\x1e\x56\x00\x03\x29\x34\x37\x04\xdf\
+\x89\xa2\xd6\xe3\x2e\x9a\x9b\x59\x71\x2d\xc0\xd8\xdf\x13\xf8\x28\
+\x0c\x5b\x0f\xd6\x61\xf2\x80\x5b\x01\x01\x8a\x5b\x5c\xe2\x84\xd6\
+\xf9\xdd\x24\x73\x87\xb9\x33\xe1\x52\x40\xf1\x91\xc6\x57\xa3\x3f\
+\x37\x6f\x8f\xe3\x78\xd3\x61\xe6\xcc\xf8\xd9\x0a\x0b\xbe\xcb\xf3\
+\x1d\x07\xf7\xee\x0d\x7f\xf5\x92\x37\x03\x3e\x6e\x83\xc3\xf1\x38\
+\xd8\xbf\x67\xcf\x95\x3f\x78\xc8\x9a\x19\x9b\x02\xca\x9e\xe0\xff\
+\x04\x19\x1f\xe8\x76\x5b\x03\x8b\x39\x56\x71\xf5\x93\x19\x00\xf8\
+\x2d\xa0\x1c\xec\x74\x3a\xdf\xda\xca\x70\x81\xa3\x9f\xcc\x50\x08\
+\xde\x11\x86\xe1\x97\xb6\xc6\x77\x85\x35\x01\x01\x79\x18\xe0\x18\
+\xc0\x98\xe0\xb3\x51\xb4\xf4\x99\xad\xb1\xe7\xcc\x99\x33\xc7\x15\
+\x7f\x01\x49\x16\x4b\x51\x69\x18\xd5\x52\x00\x00\x00\x00\x49\x45\
+\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x00\x97\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x00\x49\x49\x44\x41\x54\x58\x85\xed\
+\xd7\xb1\x0d\x00\x20\x0c\x03\x41\x83\x18\x8c\x26\x13\x64\x85\x8c\
+\x89\x94\xd5\x18\xc2\x74\xfc\xf7\xb1\xae\x8d\x44\x46\x91\xd5\x91\
+\xd5\xce\xc6\x32\x0d\xdb\xbc\xd7\x74\x07\x00\x00\x00\x00\x00\x00\
+\x00\x00\x00\x00\x00\x00\x00\xc0\xcd\xfa\x8c\x86\x74\x5e\x41\xfe\
+\xed\x02\xdd\xeb\x04\xae\xa2\x49\x76\xdf\x00\x00\x00\x00\x49\x45\
+\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x0c\xd6\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x40\x00\x00\x00\x40\x08\x06\x00\x00\x00\xaa\x69\x71\xde\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x0c\x88\x49\x44\x41\x54\x78\x9c\xe5\
+\x9b\x5b\x6f\x5b\xc7\x11\x80\xbf\x25\x45\x8a\x94\x28\x89\x92\xad\
+\xbb\x64\xc9\x4e\x9a\xc2\x41\xe0\x26\x45\xd1\xa0\x48\x0a\xf4\xa9\
+\x7d\xe9\x7b\x81\x16\xfd\xa3\x7d\x2a\x50\xb4\x0f\x41\x90\x36\x4e\
+\x52\x20\x69\x92\xc6\x96\x6c\xc9\x37\x5d\x48\x49\xa4\x2e\xe4\xf4\
+\x61\xf6\x1c\xee\xd9\x33\x87\xa4\xe4\xf4\xc9\x03\x10\x24\x77\xf7\
+\xcc\xce\xcc\xee\xce\x6d\xe7\x00\xb2\x05\xe2\x78\xe3\x40\x9c\xf2\
+\x9e\xfe\x78\x93\x84\x90\xe3\xf9\x4d\x12\x42\x96\x57\x97\xed\xe0\
+\x0e\xf0\x18\x9c\x14\x3c\xdc\x00\x6e\x19\x1d\x25\x60\x32\x8b\x2f\
+\x6d\xaf\x0d\xa1\x66\x12\x10\xe0\x62\xc8\x98\x73\xa0\x67\xb4\x77\
+\x81\xbe\xd1\xfe\x12\xdc\xa9\x8d\x2a\xcf\xa3\x1b\x35\x00\x64\x1b\
+\xb8\xed\x09\x3d\x01\x5e\xf8\x89\xa7\x80\x39\xdf\x2e\xc0\x59\xd0\
+\x3e\xeb\xdb\xfa\xbe\x1d\x8f\xa3\x0a\x34\x81\x8a\xef\x3f\xf7\x34\
+\x54\xfd\xf7\x25\x70\x04\x97\xa7\x50\x39\xf2\x6d\x53\xa8\x20\x9d\
+\x9f\xff\xc4\xff\x9f\xf2\x6d\x0e\x68\x01\xa7\xbe\x7d\x29\xe8\x7b\
+\x01\xee\x71\x31\x6f\x85\x52\x92\x2d\x90\x09\x90\x8f\x40\x56\x8d\
+\x31\x6b\x20\x0b\x46\xfb\x06\xc8\xbc\xff\x3d\x05\x72\x0f\xe4\xae\
+\xff\xcc\x80\xdc\x01\x19\xb2\x23\xa4\xee\xc7\x2c\xa8\xe0\xe5\xae\
+\xc7\x31\xe1\xfb\xe7\x40\x36\xf3\x47\x55\x9a\x05\xed\x1b\x20\xbf\
+\x06\x29\x5f\xf3\x88\xcb\x04\xc8\x9f\xf5\xc1\x5c\xdf\x36\x48\xc5\
+\x68\x7f\xdb\x3f\xb7\xe2\x27\x5b\x8e\xf0\xdd\x1b\x73\x72\x3c\xe3\
+\x25\xff\xdb\x79\x46\xb6\xa0\x75\x4b\xdb\xe5\x2d\x83\xd9\x32\xc8\
+\x4f\x8c\xf6\x09\x90\x3f\xda\xbc\x14\x13\xf0\x91\x7f\x30\x92\x9a\
+\xac\x17\x30\x7f\xc7\x7f\xb6\xed\x15\x96\xed\x6b\x4c\x4e\x60\xa2\
+\xe2\xf6\x59\x15\x4e\x7b\x49\xe7\xcb\xf5\x97\xb3\xcf\xa5\xbb\xb9\
+\x02\xf2\xab\x71\x27\xdf\x1e\x6c\xfb\x50\x63\xca\x14\xc8\x6d\x63\
+\xfc\x2a\xc8\x07\xba\x7d\x4d\x7c\xf3\x5e\x79\x5e\x13\x64\x56\xb7\
+\xbc\xd9\x37\x07\xf2\x00\x64\xd1\xe8\x6b\xfa\x67\x23\xcb\x26\x9b\
+\xfa\xc9\x82\x71\x26\xe4\x17\xe0\x3e\x0d\xfe\x27\xca\xa3\x07\xec\
+\x01\x21\xa3\xab\x70\x79\x0b\x2a\x5f\x0e\xe1\x64\x0d\x78\x5a\xd0\
+\x97\xda\xe1\x1b\x3c\x0b\xf0\x00\xba\x4f\xa0\xf6\x2a\x68\xeb\x28\
+\x5d\x94\xc9\x29\xbc\x98\x37\x98\x30\x90\xc6\xc4\x34\x50\xe6\x1f\
+\xa0\x5a\xbd\xed\xc7\x6c\x01\x2f\x54\xa1\x0f\x05\xf1\xc4\x2c\xf9\
+\xff\x89\xe9\x4a\x34\x78\xd8\x46\xd0\xf6\xc2\xa0\x25\x86\x17\x20\
+\x82\x32\xbc\xe7\x9f\x5d\x02\x7e\x06\x7c\x0e\xcc\xa0\x16\x22\x81\
+\x9c\xd9\x8c\x04\x20\x0d\xd4\xcc\x24\xff\x37\x80\x36\xb8\x5d\x3f\
+\x51\x05\x35\x5d\x9b\xc0\xd7\xe0\xae\xf4\x7c\xb9\x13\x72\x20\xce\
+\x8f\x9b\x42\x7d\x81\x6f\x47\x98\x9f\xf8\xd9\x45\x60\x1a\x35\xa9\
+\x7b\xf6\xb3\xd2\x86\xfa\x0b\xd4\x9f\x58\x01\x7e\x00\x16\x80\xcf\
+\x80\xe7\x80\xb7\x3c\xec\xf8\xe7\x7b\xaa\xdb\xdc\x55\xd1\xc4\x5b\
+\x03\xf3\x26\x5b\x59\xcd\x29\x1b\x5e\x0f\x7c\x1c\x29\x46\xcb\x4c\
+\x2e\xa1\xa6\x72\x46\x3f\x37\x05\x59\xf5\xca\x78\x3d\x6b\x55\xd2\
+\xfe\x99\x81\x7e\x91\x09\x90\xdf\x78\x2b\x11\xb6\x07\x8a\x51\xee\
+\xaa\x8e\x18\x40\xc9\x98\xb5\xaf\x13\xb2\x0b\xae\x17\x8d\x5d\x03\
+\xfe\x0e\xdc\x09\x84\x10\xac\xcc\x61\x53\x19\xe7\x10\xdc\x53\xdf\
+\x37\xe6\xaa\x9b\xe0\x9f\x75\x4f\x80\x03\xc5\x7d\xd8\xcc\xf7\x8b\
+\x03\xd6\x81\xbf\x01\xf7\xb2\x73\xba\x9e\xf2\x22\xeb\x18\x47\xc0\
+\x12\xc0\x14\x70\x16\x31\x0f\x7a\xe6\xbf\xf3\x5b\xe9\x31\x59\x21\
+\xa0\x1a\xb9\xd9\x57\xc6\xdd\xe5\xf8\x3c\x8e\x0b\xee\x52\x71\x37\
+\xfb\xd1\x6e\x08\x3d\xbc\x1e\xf0\x04\x3d\x7a\xe1\x90\x1e\xea\x29\
+\x4e\xc7\x58\x2d\x25\x38\xe7\x57\x2f\x00\xd9\x46\x95\x4c\x29\x30\
+\x77\x07\xc0\x7d\xe0\xd2\x9b\xab\x57\xe8\xee\x09\x4d\x9e\x9f\xd0\
+\xdc\x04\x25\xe8\xfa\xe3\x56\x3b\xc4\xf6\xf7\xa7\x81\x2e\x48\x78\
+\x66\xfb\x3a\x56\xee\x03\x47\xe8\xca\x7f\xad\x63\x05\xa0\x03\x9d\
+\x13\xa8\x2f\x92\xd1\x67\xee\x08\xe4\xa7\xf1\x04\x63\x58\x01\x79\
+\x0b\x2e\x2a\x50\x9d\x46\x15\xd3\x29\x83\xad\xbd\x0b\xfc\x0e\xf8\
+\x4b\x01\x03\x01\x74\xe6\xa1\x9e\x04\x3f\x3e\x4e\xa8\x1d\xf9\xce\
+\x79\xd4\x52\xf8\x1d\xd5\x39\x87\xfa\xe1\x10\x64\x5d\xd4\x3c\xfe\
+\x06\xf8\x24\xa0\xd9\x2b\xcf\x7a\x0d\xb8\x0d\x72\x1e\x2d\x66\x6e\
+\x25\x62\x01\xc4\xd1\xe1\x5d\x60\x1a\x26\x1f\xaa\x12\x74\xfb\xd9\
+\xe1\xb2\x0e\xfc\x03\x0d\x70\x8c\x20\x43\x80\xee\x6d\xa8\x4d\x40\
+\xfd\x25\xb8\x4e\x01\x43\x47\xd9\xbf\x52\x07\x16\xe0\xa2\x06\xd5\
+\x93\xbc\xd6\x4e\x7d\x93\xbf\x02\x6b\xe0\xf6\x82\xce\x36\xc8\x09\
+\xba\x63\xdf\xf6\x9e\x6b\x42\x5b\x9f\xe8\xd8\xc7\x3a\xa0\x0a\x9c\
+\xfb\x09\xee\xa1\xab\xf2\x85\x4d\xb3\x2c\xa1\xdb\xbe\x87\xad\x13\
+\xa6\x81\x55\xa8\xb5\x55\x89\x15\x32\x6f\x80\xeb\xe8\x33\xd5\xb6\
+\x32\x18\x1e\xab\x30\xaa\xa3\x87\xfa\x02\x2b\x05\x88\xbe\xf1\x63\
+\xee\xf9\xe7\x3a\x64\x1d\xb9\x22\x2b\xc0\x06\xf0\x0c\xf5\x01\x8c\
+\x03\x7c\xd8\x04\xba\xe0\xba\x9e\xe0\x48\x31\x1e\xcd\x43\xbb\x86\
+\xae\xc2\xf9\x58\x3c\xdb\x70\x01\x3c\x85\xf6\x24\x1c\x2f\x60\x87\
+\xb4\x5d\xe0\x4c\xe7\x8c\xc1\x9d\xa1\x8b\xfa\x83\xe7\x29\xc7\x8b\
+\x25\x80\x06\xea\x3d\x2d\xe6\xb7\x7c\x02\xcd\x29\x70\xad\x6c\x5b\
+\x22\x84\xcb\xf7\x61\xae\x07\xb3\xaf\xcc\x47\x6f\x04\xb3\xaf\x60\
+\xf6\x52\x71\x5b\x47\xcd\xb5\x60\xae\x20\x16\x61\x07\x35\xdf\x2d\
+\xd4\xc2\x65\xc0\x12\xc0\x34\xaa\x3d\x0b\x94\x9a\x2c\xa3\x6e\xaa\
+\x01\xc7\x4d\xa8\x7c\x0f\xcc\x33\x7e\xec\x3d\x06\x88\x03\x16\xa0\
+\xf2\x9d\xce\x61\xc2\x73\xdb\x59\x72\x97\x40\x19\xdc\x31\xba\xb8\
+\x19\xb0\x04\x20\xa8\x69\xd9\x29\x20\x64\xc2\xb6\xf3\x32\x05\xa5\
+\x64\x22\x7f\x1c\xac\x60\xeb\xda\x10\x6e\xfb\x16\x94\x4a\x5e\xbf\
+\xc4\xc3\xae\x94\x36\xb1\x78\x3a\xd4\x23\x34\xda\x0a\x94\x07\x83\
+\x4c\xbf\x7d\x13\xd5\xb2\xe1\x2a\xcc\x82\x74\x81\x15\x98\xd9\x0f\
+\xfa\x5a\xc0\xbb\xc0\x13\xd2\x8c\x4e\x06\x92\xd4\x19\xa8\x4f\x61\
+\xe5\x05\xe7\xd0\x40\xe7\x07\xfd\x2d\xa0\x3b\x73\x03\xe4\x19\x03\
+\x3f\x23\xc1\x7f\xa6\x7d\x1c\x64\xd1\xb8\x63\xef\x0e\x27\x81\x59\
+\x0a\x31\x61\x35\x72\x49\x48\x99\x47\x83\x8d\x65\x4f\x64\x84\x9c\
+\x1e\x74\x66\xa1\x7e\x00\xc4\x41\xc6\x23\x4f\xd0\xd7\xc1\xe4\x2b\
+\x40\x1f\x3a\x67\x50\xdf\x05\x1c\x74\x6f\x41\x2d\xc9\x2f\x3e\xf3\
+\xdf\xce\xcf\xf9\x05\x9a\x2b\x0c\xe1\x15\x74\x66\xa0\x9e\x08\x2d\
+\x9c\xb7\x89\x2a\xbe\xbe\xee\x86\x54\x57\x25\x79\xcb\x4c\xc2\xc6\
+\x5a\x99\x45\xe0\x4b\x90\xaa\x27\xe0\x25\xb8\x43\x34\xd3\x73\x96\
+\x8f\xfc\xa4\x01\xf5\x32\xb8\xe7\x79\x54\x82\x67\x7e\x01\x38\x46\
+\x57\xec\x1b\x63\x77\xb5\xfd\xf8\x32\xba\xe2\x07\x9e\x8e\xff\x68\
+\x5f\x2e\x7a\x3b\xf1\xa6\xcf\x67\x7f\x43\x9a\x64\x1f\x15\x98\x17\
+\x9a\x6c\x02\x4f\xe0\xa4\x03\x8d\x29\xb2\xe1\xb1\xa9\x03\x4a\xa8\
+\x04\x6f\x83\xdb\x09\xec\xf7\x2d\x6c\xe5\x37\x0d\x47\x05\x69\x68\
+\xa5\x00\xcd\xf4\x6e\x01\x4f\x87\x87\xc4\xa9\x2f\x7f\x1f\x0d\x67\
+\x87\x05\x52\x27\x18\xbe\xbd\x5f\x08\x9f\xb9\x72\x27\xa8\xb7\xba\
+\x01\x8d\x03\xf4\x48\x65\xa0\x48\x09\x2e\xe5\xe3\x01\x28\x20\xbe\
+\x01\xf3\x47\x46\x7b\x02\x65\x25\xb4\xf2\x90\x9c\xb3\x94\x9b\x3a\
+\x51\x78\x9f\x61\xdf\x3f\x84\xb4\x14\x08\x20\x37\x4e\x7c\x6a\x7c\
+\xcd\xea\xb5\x04\xb0\x00\x58\xf6\xdf\xba\x84\x18\x07\x56\x18\x24\
+\x34\x0c\x8f\x31\x81\x9c\x93\xf3\x12\x2e\x8c\xd4\x7b\x06\x8a\x84\
+\x69\xd1\xfa\x0a\x43\x60\x05\x47\xe0\x5a\xe1\xec\x28\xc1\xf4\x07\
+\x3b\xa7\x30\x94\x36\x3c\x3c\xd7\x85\xea\xa8\x7c\xdb\x35\x72\x0d\
+\xee\x0c\x55\xe6\x19\x88\x05\x30\x41\x71\x54\x77\x13\x9b\x5e\x83\
+\x6e\x64\xde\x62\x21\x0c\xbd\xb1\xb9\xa9\x1f\x51\xf4\x5c\xae\x3d\
+\xb6\x02\xcb\x70\x65\x69\xf3\xc0\x3f\xc8\xb4\x97\xec\xf6\x14\x9a\
+\x50\x7b\x66\xd0\x21\x20\x8f\xd1\x24\x0b\xc0\xa3\x02\xfd\x32\x62\
+\x85\xbb\x7d\x8d\x34\x73\xd0\xc3\xce\xd6\x8e\x8a\x05\x7a\x15\x98\
+\xb8\xce\xf6\x4f\xec\x75\x11\xf4\x47\xf4\xbf\x26\xd4\x1c\xc5\x47\
+\x70\xac\x79\x23\x01\x94\x9f\xa1\xf6\x37\xc6\xd5\xb3\x11\x8e\xcc\
+\xf2\x1e\x90\x9a\xa4\x10\xd2\x6d\xff\xc8\x7f\x46\x58\x87\x42\x28\
+\x12\x40\x19\xdb\xb3\xcc\xcd\x11\xeb\x80\x2e\x51\xbc\x1c\x40\x11\
+\xb3\xc3\x08\xbf\xca\xcf\x11\x9f\xf9\x51\xd6\x61\x28\x14\x8d\x1f\
+\x5b\x39\xc6\x02\x48\x72\xe7\x39\x6d\x79\x03\x22\x12\xe8\x93\xde\
+\x27\x16\x29\x3c\x4b\x08\x32\x43\xea\xe9\xdd\x78\xee\x00\xc4\xe7\
+\x17\xb3\x60\x99\xc1\x23\x06\xb7\x38\x3f\x06\x3c\x07\x56\x46\x68\
+\x7b\x22\x21\x94\x50\xaf\xcd\xb8\x70\xc9\xc0\x98\xbe\x49\x12\x4e\
+\xe7\x05\x6a\x09\xc0\x01\xfb\xe4\x2f\x12\x8b\xa4\x7d\x00\x6d\x43\
+\x6f\x64\xe0\x25\xf0\x21\x23\x8b\x13\x9c\xa0\x61\xf8\x47\x0c\xbf\
+\x13\xc4\x67\x80\x8e\x8b\x10\x0d\x7e\x8a\x43\xad\xcd\x2e\x63\xe8\
+\x00\x00\xf1\x8e\xd0\x53\x15\x42\x7a\xb3\x73\x80\x79\x1b\xcb\x25\
+\x34\xaa\x43\x28\x4d\xee\xeb\xfe\x05\x6c\x6a\xde\xa0\x08\x64\x8e\
+\xc1\xe5\xcb\xa6\x45\xf0\x00\xe6\x26\x31\xd3\x6d\xed\x45\xd2\x88\
+\x55\x9a\x68\x6e\xe3\x91\xc7\x35\x32\x1f\x00\x9a\xe7\x9f\x04\x77\
+\x0e\xec\x28\x12\xd9\x40\xad\xc3\xbc\x8f\xbd\x43\x44\x4b\xc0\x19\
+\xc8\x3b\x44\x91\x16\x9a\x81\x59\x43\xa3\xba\x26\x70\x01\x17\x5b\
+\x5e\xc7\x58\x4e\xcf\x29\x1a\x19\x2e\xe9\x58\x1e\x00\xff\x06\x89\
+\x4d\x73\x92\xd9\x49\xf2\x01\xc9\xff\x24\x84\xee\x78\xfc\x7b\x7a\
+\xaf\x09\x3e\x83\x9d\xf3\x49\x62\x01\x74\x7c\xdb\x32\x7a\x1e\xd1\
+\x0b\x05\x8e\x3c\xbd\x02\xec\x67\xb7\xb1\xa0\xb9\x43\x59\xcf\xe6\
+\x10\xd3\x73\xf7\x4f\x70\xed\x60\x8e\x82\x3c\xa3\x05\x02\x9a\x38\
+\xd9\x8d\xe6\x5c\xd3\x60\x2d\x61\x3c\x09\x87\xc5\xa1\xbb\xfa\x38\
+\xdb\x0e\x0c\x0a\xb6\x32\xd9\xe9\xf8\x08\x84\x57\xd7\x16\xec\xa1\
+\xc1\x8d\x05\xcf\xc8\x14\x56\xe0\x6f\x65\x5f\xfb\x6e\x30\xb6\x0e\
+\x2b\x14\xe6\x24\x93\xc0\xcb\x84\xe4\x3a\x3e\xa3\x38\x8b\x94\xe0\
+\x85\x6d\x0a\x5d\x5f\x89\xb2\xea\x6d\xdc\x15\xd0\xf2\x67\x30\xc9\
+\xdb\xbf\x0e\xf3\x09\x04\x42\x68\xdd\x46\x13\x24\x56\x4e\xb2\x1c\
+\xd0\x18\xf7\x2d\xa3\xd6\x68\x2c\x25\xd8\x46\xed\xa5\x19\x3f\xfb\
+\x6d\x6e\x64\x5f\x01\x38\x83\xc6\x32\x9c\x9c\x8d\xe1\x25\x5e\x03\
+\x9c\x28\xce\x99\x15\x06\x65\x77\x31\x2c\x53\x7c\xbc\x92\x1a\x85\
+\x9c\x59\xb5\x04\x70\x86\x2a\x97\x72\x41\x86\x15\x38\xee\x90\xbb\
+\xf7\x4f\xb7\xfd\x57\xd0\x38\xd3\x73\xfa\x63\x81\xac\x2a\x4e\xbe\
+\xc2\xf4\x18\xa5\x01\xad\xae\x2d\x74\x99\x83\xb3\x2e\xca\x53\x4e\
+\x78\x45\xf9\x80\xc4\x66\xbe\x6d\x13\xd4\x3c\x54\x84\xc9\x31\xc9\
+\xb9\xb7\xa7\xe8\x96\x5b\x85\x4e\x41\xa1\xd3\x38\x70\x3e\xab\x38\
+\x92\xea\x4f\xd3\x6d\x9e\x04\x66\x61\x2e\x4e\xd6\x26\xb0\x02\x53\
+\xd3\x01\x4f\x19\x88\x05\x70\x41\x9a\x34\x70\xde\x74\xc9\xba\x8d\
+\xd7\xed\x2b\x72\x4a\xd8\xee\xed\x15\xb0\x07\xf5\x4b\x55\x5c\xb2\
+\x38\x9e\xaf\x2f\xce\x8f\x5d\x81\x49\x8f\x23\x3c\xf3\xa1\x10\x28\
+\x01\xab\x76\xfa\x0e\xd4\x34\x5f\x54\xc0\x7d\xeb\x1b\xea\x44\x56\
+\x20\x36\x83\xf1\x95\xd3\x27\x68\x39\x1a\xc0\x32\x5a\x27\xd4\x0f\
+\xc6\x5d\x02\xbf\x45\xaf\xc7\x97\x0d\x9d\x97\xa4\xa0\x4e\xd1\xf8\
+\xfc\x3d\x2f\x84\x61\x89\x0f\x21\xad\x35\xa0\x81\xba\xd1\x56\x4d\
+\xcf\x25\xf0\x7b\xe0\x53\x06\x97\xa3\x89\x19\x4c\xca\x6b\x27\xf5\
+\x66\x3b\x85\x12\xc3\xdd\x67\xd9\x42\x0b\x0f\xc2\xb6\x86\xf7\x08\
+\x37\xa2\xf6\xa4\x0e\x6f\xcd\x7f\x1b\x56\x43\x1a\xdc\xa8\x46\x30\
+\x7d\x7e\x05\xf3\x52\x45\xaa\x68\x09\xed\x1c\xc8\xbb\xb6\x4e\x90\
+\xf7\xf3\xd6\x4a\x3e\x64\x8c\x1a\xa1\x43\x90\x20\x23\xeb\x4e\xe0\
+\xa4\xab\xf5\x80\x29\xa2\xf0\x8a\xba\x0f\xee\x11\xea\x25\xbe\x06\
+\xb3\xe3\x82\xcc\xa0\x29\xfb\xef\xd1\xcc\xcf\x0e\x79\xc5\xb8\x81\
+\xa6\xe0\xc3\x0b\x9e\xe4\x6e\x22\x03\x96\x00\xba\x40\x95\x4c\x49\
+\xec\xcc\x0b\xa8\x4c\x7a\xc9\x16\x85\xb4\xfb\xd0\xaa\xaa\xce\xb8\
+\x56\x5d\xee\x98\x20\x65\xc5\xdd\xaa\x90\xaf\xfa\x08\x14\x63\x7b\
+\x11\xba\x1d\x32\x1a\x5f\x2a\xa8\x6e\xcb\xd5\x28\x58\xb1\x40\x09\
+\xdc\x9e\x6e\x79\x79\x16\x28\xa0\xa7\xa8\x46\xee\x01\xff\x0d\x98\
+\x0f\x24\x3f\x77\xe0\x05\x94\x84\xbf\xa1\x0b\x7c\x13\x48\xbc\xbf\
+\x55\x94\xd1\xa7\x30\x27\x51\xbf\x04\x39\xc6\xfb\xd0\x68\x91\xb9\
+\xbe\x93\x8a\xd2\xe3\x76\x40\xee\x1a\xcc\x66\xe0\x25\x69\x2e\xc0\
+\xed\xa2\x75\x36\xc9\xd6\x17\x54\xf1\x54\xc8\x66\x8d\x22\x1c\x4e\
+\x54\x80\xec\xa3\xb5\x3f\xf7\xc6\x08\x97\x0d\x68\xdd\x46\x9d\x9b\
+\x25\xe0\xb9\xee\xb0\x9c\x9d\x9f\x26\x5d\xd5\xe3\x26\xba\xea\x65\
+\x54\x79\x76\xd0\xda\xe6\x25\x65\x1e\xd0\xcb\xd8\x8c\x33\x14\xed\
+\x00\x77\x9a\x0d\x57\xdd\x1e\x5a\xc3\xbf\x81\x46\x66\x9f\xa3\x42\
+\x78\x00\xe7\x27\x50\x3d\x52\x22\x0b\xcd\x5b\x5f\xe7\x68\x24\x15\
+\x9b\x49\x1b\x80\x83\x0b\xbf\xbb\xaa\xc9\x0b\x14\x21\x1c\x7b\x66\
+\xbc\xa9\x33\x1d\xcb\x65\xc5\x2f\x4b\x1e\x6f\x12\x23\x7c\x00\x3c\
+\x04\x0e\xc0\xbd\x0c\xc6\x97\xe3\x7b\x46\xeb\x08\xc4\xcc\x74\x3d\
+\x21\x0f\xd1\x82\x45\xd0\x2b\xef\x65\xdf\xbe\x1f\xb4\x1b\x20\x62\
+\xf7\x8b\x83\xea\xa4\x67\xb0\x53\xe0\xc5\xad\x8f\xc0\x7d\x05\x4c\
+\xc1\xd1\xf7\xd9\xeb\x39\x71\x9e\xb6\xf8\xcc\x8f\x93\x42\x93\x3b\
+\x03\xe7\x27\x53\x2e\x5f\xcf\x5a\x07\xf0\x66\xe8\x7d\xec\x44\x49\
+\x32\xe6\xff\x50\x2e\x0f\xba\x00\xf2\xf3\xbc\xf9\x95\xa6\x5a\x8a\
+\x5c\xb9\xfc\x1d\xcc\xb2\x5e\x1b\xf9\xc7\xd8\x2f\x4c\xac\x92\x7b\
+\x61\x42\x1c\xfa\x82\x85\xf1\x02\x43\x3a\x66\x7b\xcc\x89\x43\x9c\
+\x05\xcf\x88\x43\xdf\x18\xf9\xa5\xd1\x57\xce\xfa\x2b\xa9\x10\xaa\
+\x8c\xff\xc2\x44\x8a\xe8\x4f\x05\x4e\xc8\x46\x5e\x08\x00\xf2\x1e\
+\xfa\xca\x4a\xee\xa5\x04\x5e\xeb\x95\x99\xb4\xad\xe4\x9d\x9f\xb7\
+\x40\xde\x31\x9c\x9f\xb2\xa5\xe5\x3d\xf3\x7f\xc8\xe3\x2b\x9e\x3c\
+\x91\x5a\x59\xa5\x16\x7b\x80\xe0\x77\x82\x71\x7d\x2d\x1b\x7e\x6b\
+\xde\xd3\x4f\x2b\x74\x9e\x2a\x8c\x7e\x69\x6a\xca\x8f\x09\x04\x2f\
+\x2b\x0c\x5e\xbe\x2a\x7a\x39\x6a\x1e\x33\x66\x91\x2d\xcf\x43\x29\
+\xbf\x9b\x15\x62\x44\x86\x93\x23\x9b\xa8\xb6\xf5\x35\xba\xb4\xfc\
+\xef\x1a\x6a\xe6\x1c\x7a\x01\x72\xc1\xe0\xb5\xb9\x19\x40\xa0\x37\
+\x0d\xe5\xc4\x29\x4a\x4a\x64\x7b\xc1\xff\xe4\xf6\x26\x79\x6d\x2e\
+\x28\x97\x4d\xe9\xeb\xfa\x71\x0e\x35\x61\xa7\xfe\xf7\x24\xaa\xc4\
+\x7d\x01\x06\x1d\x54\xa1\xce\x06\x78\xf6\x06\x4e\x93\xed\xc0\x8d\
+\xb8\xa2\x8e\x41\x26\x30\x4a\xcd\x3c\x9e\x3a\x79\x2d\x1b\xbf\x38\
+\x59\x42\xaf\xca\x92\x23\x54\x65\xe0\x5f\xe0\x99\x38\x24\x6b\xf3\
+\xac\x17\x27\x85\x41\xe2\x33\x06\xa3\xb4\x36\x7d\xac\x88\xc7\x37\
+\xf7\xd5\x59\xab\xe1\x0d\x80\x0c\xcf\x6f\x1a\xf3\x09\xa8\x10\xfe\
+\x07\xb4\x0a\xfd\x7e\xcf\x22\x5b\xc2\x00\x00\x00\x00\x49\x45\x4e\
+\x44\xae\x42\x60\x82\
+\x00\x00\x02\x0b\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x01\xbd\x49\x44\x41\x54\x58\x85\xed\
+\x94\x3d\x6b\x14\x51\x18\x85\x9f\x73\xd7\x42\x09\x88\x36\x16\x16\
+\x41\xc1\x5a\x6c\x92\x45\x04\x3b\x59\x91\xe0\xba\x8b\xa6\x51\xc1\
+\x7f\x90\x5f\x20\xa8\xbf\x40\x6c\x52\xda\x58\x28\xb2\x89\x41\x0b\
+\x43\x4a\x91\x24\x6b\xa3\x29\x52\x59\xd8\x28\x58\x25\xa8\x91\x90\
+\xdd\xbd\xc7\x62\x66\xdd\x65\xa3\x9b\x99\xf5\x23\xcd\x3c\x30\xf0\
+\x32\xdc\x39\xe7\xdc\xfb\xbe\x77\xa0\xa0\xa0\xa0\x60\x9f\x51\xb7\
+\x98\x9c\x8b\x1b\x82\x23\xff\xc3\xd4\xb0\xd9\xac\x87\xa3\x00\xe1\
+\x67\x12\xf5\xea\x7f\x4d\xbf\x57\xaf\x68\xe9\x24\xb0\x92\x26\x04\
+\x13\x81\xce\xdf\x78\x6c\xa2\x7b\xfe\xcb\xa9\x57\x12\xa6\x3f\xd9\
+\xe9\x45\x8f\x1d\xfa\xee\x06\xa6\x82\x8d\x51\x94\x30\x7f\x86\xc0\
+\x01\x84\xe1\xe5\xf6\x98\xae\xae\x55\xb4\xb5\xeb\x04\x00\xd6\x2a\
+\xda\xfa\xda\xd2\x65\xe4\x27\x48\x48\x0e\x83\x21\xf3\x60\x23\x43\
+\x48\x24\xfc\xf8\x5b\x5b\xd5\x7e\xf3\x5d\x01\x00\xd6\xa7\xb5\x33\
+\xde\x0a\xd7\x6d\xcf\xa6\xde\xc1\xce\x1f\xc2\x20\x89\x20\xc0\xf6\
+\xec\x78\x3b\xdc\x58\x9f\xd6\xce\xe0\xba\xdf\x0b\xdb\x2a\x3f\x8b\
+\x77\xb1\x6e\x27\x82\x8a\xc2\x99\xda\x61\x24\xe1\x74\x73\xbe\xb7\
+\x5a\x0b\x77\x90\x7e\xf9\xed\x9e\x3b\x2b\xcf\x7b\x06\xfb\x7e\x37\
+\x15\x28\x0e\x37\x77\x10\x52\x22\xae\x99\x95\xba\x1e\x0c\x5b\x9f\
+\xe9\x68\xcb\x0d\xdf\x44\x7e\x08\x94\x86\x85\xe8\x33\xef\x20\xdd\
+\x5a\xad\xe9\xd1\x5e\xda\x99\x7b\x3b\x39\xe7\x29\xe1\xa7\xc0\x41\
+\x92\x9b\x3a\x18\xa2\x3b\xb0\xdb\x46\xd7\x9a\x75\xbd\xc8\xa2\x9b\
+\x6b\xb8\x26\x1a\x3e\x1f\xe4\xe7\xc0\x61\x83\x95\x86\x30\x04\x25\
+\x5a\x5f\x1c\x34\xd5\xbc\xa2\x57\x59\x35\x73\x4f\xf7\xc4\xbc\xcf\
+\x04\x7b\x11\x38\x86\x30\xd1\xdd\x96\x7f\x8e\xd2\xc5\x37\x35\xbd\
+\xcd\xa3\x37\xd2\x1d\x3f\xbb\xe0\x53\xb1\xe3\x25\xe0\x44\xfa\xea\
+\x43\x28\xe9\xc2\x72\x55\xef\xf3\x6a\x8d\xfc\x93\x39\xb7\xe0\xe3\
+\xed\x8e\x3f\x02\xef\x0e\x94\x74\xe9\x75\x55\x9f\x46\xd5\x2a\x28\
+\x28\x28\xd8\x57\x7e\x00\xa4\xf8\xb1\x06\x78\x8b\xc7\xb8\x00\x00\
+\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
+\x00\x00\x00\xcf\
+\x89\
+\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
+\x00\x00\x20\x00\x00\x00\x20\x08\x06\x00\x00\x00\x73\x7a\x7a\xf4\
+\x00\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0e\xc4\x00\x00\x0e\xc4\
+\x01\x95\x2b\x0e\x1b\x00\x00\x00\x81\x49\x44\x41\x54\x58\x85\xed\
+\xd2\x31\x0e\x82\x50\x10\x84\xe1\x7f\x9f\x77\x20\xe1\x36\xaf\xe0\
+\x08\xf6\x16\x5a\x70\x0b\xc2\x2d\x28\xb0\xb5\xb5\xb5\x31\xe1\x36\
+\x26\xdc\x01\x96\x0a\x88\x98\xd8\xf1\x68\xe6\xeb\x76\xb3\xc9\x4c\
+\xb1\x20\x22\x22\x72\x30\xdb\xce\x31\x56\xa7\x3d\x03\xbb\xae\x1e\
+\x00\xff\x29\x50\x9c\x6f\xd1\x9c\x07\x90\xef\x59\x00\xe8\xc7\xd1\
+\x2f\xef\xe7\xfd\x05\x10\x96\xb5\xd3\x24\x08\x07\xc8\x42\xb0\x76\
+\x1e\xc2\xbf\xcb\x14\xd6\x02\x46\x09\x7c\x12\x64\xf6\x8e\x5d\xd7\
+\xd8\x6f\xc9\x9f\x50\x44\x44\xe4\x70\x13\x6a\x59\x1a\x0e\xce\xfb\
+\x3e\xfc\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
+"
+
+qt_resource_name = b"\
+\x00\x09\
+\x09\x5f\x97\x13\
+\x00\x71\
+\x00\x73\x00\x73\x00\x5f\x00\x69\x00\x63\x00\x6f\x00\x6e\x00\x73\
+\x00\x0a\
+\x09\x24\x4d\x25\
+\x00\x71\
+\x00\x64\x00\x61\x00\x72\x00\x6b\x00\x73\x00\x74\x00\x79\x00\x6c\x00\x65\
+\x00\x04\
+\x00\x06\xa8\x8b\
+\x00\x64\
+\x00\x61\x00\x72\x00\x6b\
+\x00\x0d\
+\x0d\x36\x0c\x63\
+\x00\x64\
+\x00\x61\x00\x72\x00\x6b\x00\x73\x00\x74\x00\x79\x00\x6c\x00\x65\x00\x2e\x00\x71\x00\x73\x00\x73\
+\x00\x02\
+\x00\x00\x07\x83\
+\x00\x72\
+\x00\x63\
+\x00\x17\
+\x0e\xfe\x32\x47\
+\x00\x61\
+\x00\x72\x00\x72\x00\x6f\x00\x77\x00\x5f\x00\x6c\x00\x65\x00\x66\x00\x74\x00\x5f\x00\x66\x00\x6f\x00\x63\x00\x75\x00\x73\x00\x40\
+\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x27\
+\x0d\x0d\x92\xa7\
+\x00\x74\
+\x00\x6f\x00\x6f\x00\x6c\x00\x62\x00\x61\x00\x72\x00\x5f\x00\x73\x00\x65\x00\x70\x00\x61\x00\x72\x00\x61\x00\x74\x00\x6f\x00\x72\
+\x00\x5f\x00\x76\x00\x65\x00\x72\x00\x74\x00\x69\x00\x63\x00\x61\x00\x6c\x00\x5f\x00\x64\x00\x69\x00\x73\x00\x61\x00\x62\x00\x6c\
+\x00\x65\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x1d\
+\x0c\x09\x66\x07\
+\x00\x63\
+\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x62\x00\x6f\x00\x78\x00\x5f\x00\x69\x00\x6e\x00\x64\x00\x65\x00\x74\x00\x65\x00\x72\x00\x6d\
+\x00\x69\x00\x6e\x00\x61\x00\x74\x00\x65\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x1a\
+\x01\x87\xae\x67\
+\x00\x63\
+\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x62\x00\x6f\x00\x78\x00\x5f\x00\x69\x00\x6e\x00\x64\x00\x65\x00\x74\x00\x65\x00\x72\x00\x6d\
+\x00\x69\x00\x6e\x00\x61\x00\x74\x00\x65\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x20\
+\x0e\xfe\x76\x47\
+\x00\x63\
+\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x62\x00\x6f\x00\x78\x00\x5f\x00\x63\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x65\x00\x64\x00\x5f\
+\x00\x64\x00\x69\x00\x73\x00\x61\x00\x62\x00\x6c\x00\x65\x00\x64\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x11\
+\x09\xcb\xcc\xe7\
+\x00\x77\
+\x00\x69\x00\x6e\x00\x64\x00\x6f\x00\x77\x00\x5f\x00\x75\x00\x6e\x00\x64\x00\x6f\x00\x63\x00\x6b\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\
+\x00\x18\
+\x07\x8b\xec\xe7\
+\x00\x62\
+\x00\x72\x00\x61\x00\x6e\x00\x63\x00\x68\x00\x5f\x00\x6f\x00\x70\x00\x65\x00\x6e\x00\x5f\x00\x64\x00\x69\x00\x73\x00\x61\x00\x62\
+\x00\x6c\x00\x65\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x17\
+\x0d\x9d\x97\x47\
+\x00\x62\
+\x00\x72\x00\x61\x00\x6e\x00\x63\x00\x68\x00\x5f\x00\x6f\x00\x70\x00\x65\x00\x6e\x00\x5f\x00\x70\x00\x72\x00\x65\x00\x73\x00\x73\
+\x00\x65\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x1d\
+\x09\x07\x81\x07\
+\x00\x63\
+\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x62\x00\x6f\x00\x78\x00\x5f\x00\x63\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x65\x00\x64\x00\x5f\
+\x00\x64\x00\x69\x00\x73\x00\x61\x00\x62\x00\x6c\x00\x65\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x1b\
+\x09\x0d\xa6\xc7\
+\x00\x62\
+\x00\x72\x00\x61\x00\x6e\x00\x63\x00\x68\x00\x5f\x00\x6d\x00\x6f\x00\x72\x00\x65\x00\x5f\x00\x64\x00\x69\x00\x73\x00\x61\x00\x62\
+\x00\x6c\x00\x65\x00\x64\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x19\
+\x07\x36\x1b\x47\
+\x00\x6c\
+\x00\x69\x00\x6e\x00\x65\x00\x5f\x00\x76\x00\x65\x00\x72\x00\x74\x00\x69\x00\x63\x00\x61\x00\x6c\x00\x5f\x00\x70\x00\x72\x00\x65\
+\x00\x73\x00\x73\x00\x65\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x17\
+\x0c\xeb\x5f\x67\
+\x00\x62\
+\x00\x72\x00\x61\x00\x6e\x00\x63\x00\x68\x00\x5f\x00\x65\x00\x6e\x00\x64\x00\x5f\x00\x66\x00\x6f\x00\x63\x00\x75\x00\x73\x00\x40\
+\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x10\
+\x05\x3e\x39\x67\
+\x00\x62\
+\x00\x61\x00\x73\x00\x65\x00\x5f\x00\x69\x00\x63\x00\x6f\x00\x6e\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x19\
+\x00\x4f\x29\xc7\
+\x00\x77\
+\x00\x69\x00\x6e\x00\x64\x00\x6f\x00\x77\x00\x5f\x00\x75\x00\x6e\x00\x64\x00\x6f\x00\x63\x00\x6b\x00\x5f\x00\x70\x00\x72\x00\x65\
+\x00\x73\x00\x73\x00\x65\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x26\
+\x04\x24\xf6\xe7\
+\x00\x74\
+\x00\x6f\x00\x6f\x00\x6c\x00\x62\x00\x61\x00\x72\x00\x5f\x00\x73\x00\x65\x00\x70\x00\x61\x00\x72\x00\x61\x00\x74\x00\x6f\x00\x72\
+\x00\x5f\x00\x68\x00\x6f\x00\x72\x00\x69\x00\x7a\x00\x6f\x00\x6e\x00\x74\x00\x61\x00\x6c\x00\x5f\x00\x66\x00\x6f\x00\x63\x00\x75\
+\x00\x73\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x27\
+\x0e\x3d\xd7\xc7\
+\x00\x74\
+\x00\x6f\x00\x6f\x00\x6c\x00\x62\x00\x61\x00\x72\x00\x5f\x00\x6d\x00\x6f\x00\x76\x00\x65\x00\x5f\x00\x68\x00\x6f\x00\x72\x00\x69\
+\x00\x7a\x00\x6f\x00\x6e\x00\x74\x00\x61\x00\x6c\x00\x5f\x00\x64\x00\x69\x00\x73\x00\x61\x00\x62\x00\x6c\x00\x65\x00\x64\x00\x40\
+\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x1e\
+\x07\x50\x2b\xe7\
+\x00\x77\
+\x00\x69\x00\x6e\x00\x64\x00\x6f\x00\x77\x00\x5f\x00\x6d\x00\x69\x00\x6e\x00\x69\x00\x6d\x00\x69\x00\x7a\x00\x65\x00\x5f\x00\x70\
+\x00\x72\x00\x65\x00\x73\x00\x73\x00\x65\x00\x64\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x17\
+\x0d\x6c\x22\x07\
+\x00\x62\
+\x00\x72\x00\x61\x00\x6e\x00\x63\x00\x68\x00\x5f\x00\x63\x00\x6c\x00\x6f\x00\x73\x00\x65\x00\x64\x00\x5f\x00\x66\x00\x6f\x00\x63\
+\x00\x75\x00\x73\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x18\
+\x03\xae\x62\xe7\
+\x00\x77\
+\x00\x69\x00\x6e\x00\x64\x00\x6f\x00\x77\x00\x5f\x00\x67\x00\x72\x00\x69\x00\x70\x00\x5f\x00\x64\x00\x69\x00\x73\x00\x61\x00\x62\
+\x00\x6c\x00\x65\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x17\
+\x0e\x19\x8b\xc7\
+\x00\x61\
+\x00\x72\x00\x72\x00\x6f\x00\x77\x00\x5f\x00\x64\x00\x6f\x00\x77\x00\x6e\x00\x5f\x00\x66\x00\x6f\x00\x63\x00\x75\x00\x73\x00\x40\
+\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x17\
+\x04\xf8\x32\xc7\
+\x00\x61\
+\x00\x72\x00\x72\x00\x6f\x00\x77\x00\x5f\x00\x75\x00\x70\x00\x5f\x00\x70\x00\x72\x00\x65\x00\x73\x00\x73\x00\x65\x00\x64\x00\x40\
+\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x1c\
+\x02\x75\x51\x87\
+\x00\x63\
+\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x62\x00\x6f\x00\x78\x00\x5f\x00\x63\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x65\x00\x64\x00\x5f\
+\x00\x70\x00\x72\x00\x65\x00\x73\x00\x73\x00\x65\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x21\
+\x01\xf6\xa2\x67\
+\x00\x74\
+\x00\x6f\x00\x6f\x00\x6c\x00\x62\x00\x61\x00\x72\x00\x5f\x00\x73\x00\x65\x00\x70\x00\x61\x00\x72\x00\x61\x00\x74\x00\x6f\x00\x72\
+\x00\x5f\x00\x76\x00\x65\x00\x72\x00\x74\x00\x69\x00\x63\x00\x61\x00\x6c\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\
+\x00\x18\
+\x07\x83\xfe\x27\
+\x00\x62\
+\x00\x72\x00\x61\x00\x6e\x00\x63\x00\x68\x00\x5f\x00\x6d\x00\x6f\x00\x72\x00\x65\x00\x5f\x00\x64\x00\x69\x00\x73\x00\x61\x00\x62\
+\x00\x6c\x00\x65\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x14\
+\x01\xe9\xfd\xe7\
+\x00\x6c\
+\x00\x69\x00\x6e\x00\x65\x00\x5f\x00\x76\x00\x65\x00\x72\x00\x74\x00\x69\x00\x63\x00\x61\x00\x6c\x00\x40\x00\x32\x00\x78\x00\x2e\
+\x00\x70\x00\x6e\x00\x67\
+\x00\x13\
+\x08\xc8\x96\xe7\
+\x00\x72\
+\x00\x61\x00\x64\x00\x69\x00\x6f\x00\x5f\x00\x75\x00\x6e\x00\x63\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x65\x00\x64\x00\x2e\x00\x70\
+\x00\x6e\x00\x67\
+\x00\x14\
+\x07\xec\xd1\xc7\
+\x00\x63\
+\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x62\x00\x6f\x00\x78\x00\x5f\x00\x63\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x65\x00\x64\x00\x2e\
+\x00\x70\x00\x6e\x00\x67\
+\x00\x16\
+\x03\x94\x39\x67\
+\x00\x6c\
+\x00\x69\x00\x6e\x00\x65\x00\x5f\x00\x68\x00\x6f\x00\x72\x00\x69\x00\x7a\x00\x6f\x00\x6e\x00\x74\x00\x61\x00\x6c\x00\x40\x00\x32\
+\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x29\
+\x09\x81\xd3\x67\
+\x00\x74\
+\x00\x6f\x00\x6f\x00\x6c\x00\x62\x00\x61\x00\x72\x00\x5f\x00\x73\x00\x65\x00\x70\x00\x61\x00\x72\x00\x61\x00\x74\x00\x6f\x00\x72\
+\x00\x5f\x00\x68\x00\x6f\x00\x72\x00\x69\x00\x7a\x00\x6f\x00\x6e\x00\x74\x00\x61\x00\x6c\x00\x5f\x00\x66\x00\x6f\x00\x63\x00\x75\
+\x00\x73\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x11\
+\x08\x8f\x96\xa7\
+\x00\x61\
+\x00\x72\x00\x72\x00\x6f\x00\x77\x00\x5f\x00\x64\x00\x6f\x00\x77\x00\x6e\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\
+\x00\x17\
+\x07\x06\x3d\xa7\
+\x00\x74\
+\x00\x72\x00\x61\x00\x6e\x00\x73\x00\x70\x00\x61\x00\x72\x00\x65\x00\x6e\x00\x74\x00\x5f\x00\x70\x00\x72\x00\x65\x00\x73\x00\x73\
+\x00\x65\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x1d\
+\x0e\x35\xf3\xa7\
+\x00\x62\
+\x00\x72\x00\x61\x00\x6e\x00\x63\x00\x68\x00\x5f\x00\x63\x00\x6c\x00\x6f\x00\x73\x00\x65\x00\x64\x00\x5f\x00\x64\x00\x69\x00\x73\
+\x00\x61\x00\x62\x00\x6c\x00\x65\x00\x64\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x1a\
+\x05\x35\xb6\x67\
+\x00\x74\
+\x00\x72\x00\x61\x00\x6e\x00\x73\x00\x70\x00\x61\x00\x72\x00\x65\x00\x6e\x00\x74\x00\x5f\x00\x70\x00\x72\x00\x65\x00\x73\x00\x73\
+\x00\x65\x00\x64\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x1c\
+\x00\x10\xb9\x67\
+\x00\x77\
+\x00\x69\x00\x6e\x00\x64\x00\x6f\x00\x77\x00\x5f\x00\x63\x00\x6c\x00\x6f\x00\x73\x00\x65\x00\x5f\x00\x64\x00\x69\x00\x73\x00\x61\
+\x00\x62\x00\x6c\x00\x65\x00\x64\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x1a\
+\x0b\x46\x72\x87\
+\x00\x77\
+\x00\x69\x00\x6e\x00\x64\x00\x6f\x00\x77\x00\x5f\x00\x75\x00\x6e\x00\x64\x00\x6f\x00\x63\x00\x6b\x00\x5f\x00\x66\x00\x6f\x00\x63\
+\x00\x75\x00\x73\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x1c\
+\x09\xc8\xa4\xa7\
+\x00\x6c\
+\x00\x69\x00\x6e\x00\x65\x00\x5f\x00\x68\x00\x6f\x00\x72\x00\x69\x00\x7a\x00\x6f\x00\x6e\x00\x74\x00\x61\x00\x6c\x00\x5f\x00\x64\
+\x00\x69\x00\x73\x00\x61\x00\x62\x00\x6c\x00\x65\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x19\
+\x0c\xa5\xc5\x27\
+\x00\x62\
+\x00\x61\x00\x73\x00\x65\x00\x5f\x00\x69\x00\x63\x00\x6f\x00\x6e\x00\x5f\x00\x64\x00\x69\x00\x73\x00\x61\x00\x62\x00\x6c\x00\x65\
+\x00\x64\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x15\
+\x0a\x12\x4a\x67\
+\x00\x77\
+\x00\x69\x00\x6e\x00\x64\x00\x6f\x00\x77\x00\x5f\x00\x67\x00\x72\x00\x69\x00\x70\x00\x5f\x00\x66\x00\x6f\x00\x63\x00\x75\x00\x73\
+\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x0f\
+\x06\x16\x25\xe7\
+\x00\x62\
+\x00\x72\x00\x61\x00\x6e\x00\x63\x00\x68\x00\x5f\x00\x6d\x00\x6f\x00\x72\x00\x65\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x1f\
+\x04\x8d\x48\xc7\
+\x00\x77\
+\x00\x69\x00\x6e\x00\x64\x00\x6f\x00\x77\x00\x5f\x00\x6d\x00\x69\x00\x6e\x00\x69\x00\x6d\x00\x69\x00\x7a\x00\x65\x00\x5f\x00\x64\
+\x00\x69\x00\x73\x00\x61\x00\x62\x00\x6c\x00\x65\x00\x64\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x1a\
+\x02\xb6\xb5\xa7\
+\x00\x61\
+\x00\x72\x00\x72\x00\x6f\x00\x77\x00\x5f\x00\x6c\x00\x65\x00\x66\x00\x74\x00\x5f\x00\x64\x00\x69\x00\x73\x00\x61\x00\x62\x00\x6c\
+\x00\x65\x00\x64\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x1f\
+\x0c\xa4\x6f\xa7\
+\x00\x6c\
+\x00\x69\x00\x6e\x00\x65\x00\x5f\x00\x68\x00\x6f\x00\x72\x00\x69\x00\x7a\x00\x6f\x00\x6e\x00\x74\x00\x61\x00\x6c\x00\x5f\x00\x64\
+\x00\x69\x00\x73\x00\x61\x00\x62\x00\x6c\x00\x65\x00\x64\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x17\
+\x00\x6c\xa3\xa7\
+\x00\x6c\
+\x00\x69\x00\x6e\x00\x65\x00\x5f\x00\x76\x00\x65\x00\x72\x00\x74\x00\x69\x00\x63\x00\x61\x00\x6c\x00\x5f\x00\x66\x00\x6f\x00\x63\
+\x00\x75\x00\x73\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x18\
+\x0e\x0c\xda\xa7\
+\x00\x61\
+\x00\x72\x00\x72\x00\x6f\x00\x77\x00\x5f\x00\x75\x00\x70\x00\x5f\x00\x64\x00\x69\x00\x73\x00\x61\x00\x62\x00\x6c\x00\x65\x00\x64\
+\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x25\
+\x06\x6c\x47\xe7\
+\x00\x63\
+\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x62\x00\x6f\x00\x78\x00\x5f\x00\x69\x00\x6e\x00\x64\x00\x65\x00\x74\x00\x65\x00\x72\x00\x6d\
+\x00\x69\x00\x6e\x00\x61\x00\x74\x00\x65\x00\x5f\x00\x70\x00\x72\x00\x65\x00\x73\x00\x73\x00\x65\x00\x64\x00\x40\x00\x32\x00\x78\
+\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x19\
+\x01\x0e\xe5\xa7\
+\x00\x72\
+\x00\x61\x00\x64\x00\x69\x00\x6f\x00\x5f\x00\x63\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x65\x00\x64\x00\x5f\x00\x70\x00\x72\x00\x65\
+\x00\x73\x00\x73\x00\x65\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x1a\
+\x0c\xd5\x5a\x67\
+\x00\x6c\
+\x00\x69\x00\x6e\x00\x65\x00\x5f\x00\x76\x00\x65\x00\x72\x00\x74\x00\x69\x00\x63\x00\x61\x00\x6c\x00\x5f\x00\x66\x00\x6f\x00\x63\
+\x00\x75\x00\x73\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x18\
+\x07\x86\x4e\x27\
+\x00\x62\
+\x00\x72\x00\x61\x00\x6e\x00\x63\x00\x68\x00\x5f\x00\x6c\x00\x69\x00\x6e\x00\x65\x00\x5f\x00\x64\x00\x69\x00\x73\x00\x61\x00\x62\
+\x00\x6c\x00\x65\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x12\
+\x00\x68\xca\xe7\
+\x00\x74\
+\x00\x72\x00\x61\x00\x6e\x00\x73\x00\x70\x00\x61\x00\x72\x00\x65\x00\x6e\x00\x74\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\
+\x00\x67\
+\x00\x1a\
+\x0f\x5a\xb4\xa7\
+\x00\x72\
+\x00\x61\x00\x64\x00\x69\x00\x6f\x00\x5f\x00\x63\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x65\x00\x64\x00\x5f\x00\x66\x00\x6f\x00\x63\
+\x00\x75\x00\x73\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x16\
+\x05\x7a\xd3\x67\
+\x00\x62\
+\x00\x61\x00\x73\x00\x65\x00\x5f\x00\x69\x00\x63\x00\x6f\x00\x6e\x00\x5f\x00\x66\x00\x6f\x00\x63\x00\x75\x00\x73\x00\x40\x00\x32\
+\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x2c\
+\x0c\xa4\x5a\x47\
+\x00\x74\
+\x00\x6f\x00\x6f\x00\x6c\x00\x62\x00\x61\x00\x72\x00\x5f\x00\x73\x00\x65\x00\x70\x00\x61\x00\x72\x00\x61\x00\x74\x00\x6f\x00\x72\
+\x00\x5f\x00\x68\x00\x6f\x00\x72\x00\x69\x00\x7a\x00\x6f\x00\x6e\x00\x74\x00\x61\x00\x6c\x00\x5f\x00\x64\x00\x69\x00\x73\x00\x61\
+\x00\x62\x00\x6c\x00\x65\x00\x64\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x24\
+\x05\x94\xa0\x47\
+\x00\x74\
+\x00\x6f\x00\x6f\x00\x6c\x00\x62\x00\x61\x00\x72\x00\x5f\x00\x73\x00\x65\x00\x70\x00\x61\x00\x72\x00\x61\x00\x74\x00\x6f\x00\x72\
+\x00\x5f\x00\x76\x00\x65\x00\x72\x00\x74\x00\x69\x00\x63\x00\x61\x00\x6c\x00\x5f\x00\x66\x00\x6f\x00\x63\x00\x75\x00\x73\x00\x2e\
+\x00\x70\x00\x6e\x00\x67\
+\x00\x17\
+\x0f\x1e\x9b\x47\
+\x00\x72\
+\x00\x61\x00\x64\x00\x69\x00\x6f\x00\x5f\x00\x63\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x65\x00\x64\x00\x5f\x00\x66\x00\x6f\x00\x63\
+\x00\x75\x00\x73\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x22\
+\x01\x41\xee\x87\
+\x00\x74\
+\x00\x6f\x00\x6f\x00\x6c\x00\x62\x00\x61\x00\x72\x00\x5f\x00\x6d\x00\x6f\x00\x76\x00\x65\x00\x5f\x00\x76\x00\x65\x00\x72\x00\x74\
+\x00\x69\x00\x63\x00\x61\x00\x6c\x00\x5f\x00\x64\x00\x69\x00\x73\x00\x61\x00\x62\x00\x6c\x00\x65\x00\x64\x00\x2e\x00\x70\x00\x6e\
+\x00\x67\
+\x00\x14\
+\x00\x2e\x0a\x07\
+\x00\x72\
+\x00\x61\x00\x64\x00\x69\x00\x6f\x00\x5f\x00\x63\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x65\x00\x64\x00\x40\x00\x32\x00\x78\x00\x2e\
+\x00\x70\x00\x6e\x00\x67\
+\x00\x17\
+\x03\x9f\x72\x87\
+\x00\x61\
+\x00\x72\x00\x72\x00\x6f\x00\x77\x00\x5f\x00\x72\x00\x69\x00\x67\x00\x68\x00\x74\x00\x5f\x00\x70\x00\x72\x00\x65\x00\x73\x00\x73\
+\x00\x65\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x16\
+\x0f\x35\xfb\x07\
+\x00\x62\
+\x00\x72\x00\x61\x00\x6e\x00\x63\x00\x68\x00\x5f\x00\x65\x00\x6e\x00\x64\x00\x5f\x00\x70\x00\x72\x00\x65\x00\x73\x00\x73\x00\x65\
+\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x1c\
+\x0f\xd0\x9c\x67\
+\x00\x74\
+\x00\x6f\x00\x6f\x00\x6c\x00\x62\x00\x61\x00\x72\x00\x5f\x00\x6d\x00\x6f\x00\x76\x00\x65\x00\x5f\x00\x76\x00\x65\x00\x72\x00\x74\
+\x00\x69\x00\x63\x00\x61\x00\x6c\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x0e\
+\x08\xfa\xe1\x27\
+\x00\x61\
+\x00\x72\x00\x72\x00\x6f\x00\x77\x00\x5f\x00\x6c\x00\x65\x00\x66\x00\x74\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x17\
+\x0d\x0d\x28\xa7\
+\x00\x62\
+\x00\x72\x00\x61\x00\x6e\x00\x63\x00\x68\x00\x5f\x00\x65\x00\x6e\x00\x64\x00\x5f\x00\x64\x00\x69\x00\x73\x00\x61\x00\x62\x00\x6c\
+\x00\x65\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x18\
+\x0f\xd7\x34\x67\
+\x00\x74\
+\x00\x72\x00\x61\x00\x6e\x00\x73\x00\x70\x00\x61\x00\x72\x00\x65\x00\x6e\x00\x74\x00\x5f\x00\x66\x00\x6f\x00\x63\x00\x75\x00\x73\
+\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x19\
+\x0c\x24\xec\x07\
+\x00\x6c\
+\x00\x69\x00\x6e\x00\x65\x00\x5f\x00\x68\x00\x6f\x00\x72\x00\x69\x00\x7a\x00\x6f\x00\x6e\x00\x74\x00\x61\x00\x6c\x00\x5f\x00\x66\
+\x00\x6f\x00\x63\x00\x75\x00\x73\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x21\
+\x05\x70\x30\x27\
+\x00\x74\
+\x00\x6f\x00\x6f\x00\x6c\x00\x62\x00\x61\x00\x72\x00\x5f\x00\x6d\x00\x6f\x00\x76\x00\x65\x00\x5f\x00\x68\x00\x6f\x00\x72\x00\x69\
+\x00\x7a\x00\x6f\x00\x6e\x00\x74\x00\x61\x00\x6c\x00\x5f\x00\x66\x00\x6f\x00\x63\x00\x75\x00\x73\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\
+\x00\x18\
+\x06\x60\x39\xe7\
+\x00\x62\
+\x00\x72\x00\x61\x00\x6e\x00\x63\x00\x68\x00\x5f\x00\x6c\x00\x69\x00\x6e\x00\x65\x00\x5f\x00\x66\x00\x6f\x00\x63\x00\x75\x00\x73\
+\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x11\
+\x0a\xe5\x6c\x07\
+\x00\x72\
+\x00\x61\x00\x64\x00\x69\x00\x6f\x00\x5f\x00\x63\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x65\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\
+\x00\x1a\
+\x0a\xa0\x05\x47\
+\x00\x77\
+\x00\x69\x00\x6e\x00\x64\x00\x6f\x00\x77\x00\x5f\x00\x75\x00\x6e\x00\x64\x00\x6f\x00\x63\x00\x6b\x00\x5f\x00\x64\x00\x69\x00\x73\
+\x00\x61\x00\x62\x00\x6c\x00\x65\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x19\
+\x0f\x7e\x6f\xe7\
+\x00\x77\
+\x00\x69\x00\x6e\x00\x64\x00\x6f\x00\x77\x00\x5f\x00\x63\x00\x6c\x00\x6f\x00\x73\x00\x65\x00\x5f\x00\x64\x00\x69\x00\x73\x00\x61\
+\x00\x62\x00\x6c\x00\x65\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x15\
+\x0c\x60\x8e\x27\
+\x00\x61\
+\x00\x72\x00\x72\x00\x6f\x00\x77\x00\x5f\x00\x75\x00\x70\x00\x5f\x00\x64\x00\x69\x00\x73\x00\x61\x00\x62\x00\x6c\x00\x65\x00\x64\
+\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x19\
+\x0b\x59\x6e\x87\
+\x00\x72\
+\x00\x61\x00\x64\x00\x69\x00\x6f\x00\x5f\x00\x75\x00\x6e\x00\x63\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x65\x00\x64\x00\x5f\x00\x66\
+\x00\x6f\x00\x63\x00\x75\x00\x73\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x1b\
+\x02\x0d\xa6\x67\
+\x00\x62\
+\x00\x72\x00\x61\x00\x6e\x00\x63\x00\x68\x00\x5f\x00\x6c\x00\x69\x00\x6e\x00\x65\x00\x5f\x00\x64\x00\x69\x00\x73\x00\x61\x00\x62\
+\x00\x6c\x00\x65\x00\x64\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x18\
+\x0e\x31\x43\xa7\
+\x00\x74\
+\x00\x72\x00\x61\x00\x6e\x00\x73\x00\x70\x00\x61\x00\x72\x00\x65\x00\x6e\x00\x74\x00\x5f\x00\x64\x00\x69\x00\x73\x00\x61\x00\x62\
+\x00\x6c\x00\x65\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x13\
+\x0c\x24\x39\x47\
+\x00\x62\
+\x00\x61\x00\x73\x00\x65\x00\x5f\x00\x69\x00\x63\x00\x6f\x00\x6e\x00\x5f\x00\x66\x00\x6f\x00\x63\x00\x75\x00\x73\x00\x2e\x00\x70\
+\x00\x6e\x00\x67\
+\x00\x21\
+\x0e\xf1\x37\x67\
+\x00\x74\
+\x00\x6f\x00\x6f\x00\x6c\x00\x62\x00\x61\x00\x72\x00\x5f\x00\x6d\x00\x6f\x00\x76\x00\x65\x00\x5f\x00\x76\x00\x65\x00\x72\x00\x74\
+\x00\x69\x00\x63\x00\x61\x00\x6c\x00\x5f\x00\x70\x00\x72\x00\x65\x00\x73\x00\x73\x00\x65\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\
+\x00\x1b\
+\x0b\xea\x1b\xe7\
+\x00\x77\
+\x00\x69\x00\x6e\x00\x64\x00\x6f\x00\x77\x00\x5f\x00\x6d\x00\x69\x00\x6e\x00\x69\x00\x6d\x00\x69\x00\x7a\x00\x65\x00\x5f\x00\x70\
+\x00\x72\x00\x65\x00\x73\x00\x73\x00\x65\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x11\
+\x05\x2a\x70\x67\
+\x00\x6c\
+\x00\x69\x00\x6e\x00\x65\x00\x5f\x00\x76\x00\x65\x00\x72\x00\x74\x00\x69\x00\x63\x00\x61\x00\x6c\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\
+\x00\x20\
+\x09\xd7\x1f\xa7\
+\x00\x63\
+\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x62\x00\x6f\x00\x78\x00\x5f\x00\x69\x00\x6e\x00\x64\x00\x65\x00\x74\x00\x65\x00\x72\x00\x6d\
+\x00\x69\x00\x6e\x00\x61\x00\x74\x00\x65\x00\x5f\x00\x66\x00\x6f\x00\x63\x00\x75\x00\x73\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x1a\
+\x01\xc7\x25\x47\
+\x00\x61\
+\x00\x72\x00\x72\x00\x6f\x00\x77\x00\x5f\x00\x72\x00\x69\x00\x67\x00\x68\x00\x74\x00\x5f\x00\x70\x00\x72\x00\x65\x00\x73\x00\x73\
+\x00\x65\x00\x64\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x1e\
+\x04\x3c\x09\xc7\
+\x00\x72\
+\x00\x61\x00\x64\x00\x69\x00\x6f\x00\x5f\x00\x75\x00\x6e\x00\x63\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x65\x00\x64\x00\x5f\x00\x70\
+\x00\x72\x00\x65\x00\x73\x00\x73\x00\x65\x00\x64\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x1b\
+\x0d\xfd\xa2\x07\
+\x00\x61\
+\x00\x72\x00\x72\x00\x6f\x00\x77\x00\x5f\x00\x72\x00\x69\x00\x67\x00\x68\x00\x74\x00\x5f\x00\x64\x00\x69\x00\x73\x00\x61\x00\x62\
+\x00\x6c\x00\x65\x00\x64\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x0f\
+\x0c\xe2\x68\x67\
+\x00\x74\
+\x00\x72\x00\x61\x00\x6e\x00\x73\x00\x70\x00\x61\x00\x72\x00\x65\x00\x6e\x00\x74\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x18\
+\x06\x6d\x9b\x27\
+\x00\x62\
+\x00\x72\x00\x61\x00\x6e\x00\x63\x00\x68\x00\x5f\x00\x6f\x00\x70\x00\x65\x00\x6e\x00\x5f\x00\x66\x00\x6f\x00\x63\x00\x75\x00\x73\
+\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x16\
+\x0f\x80\x4f\xa7\
+\x00\x72\
+\x00\x61\x00\x64\x00\x69\x00\x6f\x00\x5f\x00\x75\x00\x6e\x00\x63\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x65\x00\x64\x00\x40\x00\x32\
+\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x19\
+\x0e\x26\x93\xe7\
+\x00\x74\
+\x00\x6f\x00\x6f\x00\x6c\x00\x62\x00\x61\x00\x72\x00\x5f\x00\x6d\x00\x6f\x00\x76\x00\x65\x00\x5f\x00\x76\x00\x65\x00\x72\x00\x74\
+\x00\x69\x00\x63\x00\x61\x00\x6c\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x16\
+\x06\x14\xad\xc7\
+\x00\x61\
+\x00\x72\x00\x72\x00\x6f\x00\x77\x00\x5f\x00\x6c\x00\x65\x00\x66\x00\x74\x00\x5f\x00\x70\x00\x72\x00\x65\x00\x73\x00\x73\x00\x65\
+\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x14\
+\x00\x44\xa0\x47\
+\x00\x62\
+\x00\x72\x00\x61\x00\x6e\x00\x63\x00\x68\x00\x5f\x00\x65\x00\x6e\x00\x64\x00\x5f\x00\x66\x00\x6f\x00\x63\x00\x75\x00\x73\x00\x2e\
+\x00\x70\x00\x6e\x00\x67\
+\x00\x18\
+\x07\xa5\xb1\x27\
+\x00\x61\
+\x00\x72\x00\x72\x00\x6f\x00\x77\x00\x5f\x00\x72\x00\x69\x00\x67\x00\x68\x00\x74\x00\x5f\x00\x64\x00\x69\x00\x73\x00\x61\x00\x62\
+\x00\x6c\x00\x65\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x1a\
+\x04\xce\xfa\x67\
+\x00\x62\
+\x00\x72\x00\x61\x00\x6e\x00\x63\x00\x68\x00\x5f\x00\x63\x00\x6c\x00\x6f\x00\x73\x00\x65\x00\x64\x00\x5f\x00\x66\x00\x6f\x00\x63\
+\x00\x75\x00\x73\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x24\
+\x04\x0b\x8d\x27\
+\x00\x74\
+\x00\x6f\x00\x6f\x00\x6c\x00\x62\x00\x61\x00\x72\x00\x5f\x00\x6d\x00\x6f\x00\x76\x00\x65\x00\x5f\x00\x68\x00\x6f\x00\x72\x00\x69\
+\x00\x7a\x00\x6f\x00\x6e\x00\x74\x00\x61\x00\x6c\x00\x5f\x00\x64\x00\x69\x00\x73\x00\x61\x00\x62\x00\x6c\x00\x65\x00\x64\x00\x2e\
+\x00\x70\x00\x6e\x00\x67\
+\x00\x1d\
+\x04\x34\xf0\xc7\
+\x00\x6c\
+\x00\x69\x00\x6e\x00\x65\x00\x5f\x00\x76\x00\x65\x00\x72\x00\x74\x00\x69\x00\x63\x00\x61\x00\x6c\x00\x5f\x00\x64\x00\x69\x00\x73\
+\x00\x61\x00\x62\x00\x6c\x00\x65\x00\x64\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x15\
+\x0f\xac\xe3\xc7\
+\x00\x62\
+\x00\x61\x00\x73\x00\x65\x00\x5f\x00\x69\x00\x63\x00\x6f\x00\x6e\x00\x5f\x00\x70\x00\x72\x00\x65\x00\x73\x00\x73\x00\x65\x00\x64\
+\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x14\
+\x0b\x2d\x81\x07\
+\x00\x61\
+\x00\x72\x00\x72\x00\x6f\x00\x77\x00\x5f\x00\x6c\x00\x65\x00\x66\x00\x74\x00\x5f\x00\x66\x00\x6f\x00\x63\x00\x75\x00\x73\x00\x2e\
+\x00\x70\x00\x6e\x00\x67\
+\x00\x16\
+\x0a\x7a\x87\x67\
+\x00\x77\
+\x00\x69\x00\x6e\x00\x64\x00\x6f\x00\x77\x00\x5f\x00\x63\x00\x6c\x00\x6f\x00\x73\x00\x65\x00\x5f\x00\x66\x00\x6f\x00\x63\x00\x75\
+\x00\x73\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x15\
+\x06\xf8\x08\xa7\
+\x00\x62\
+\x00\x72\x00\x61\x00\x6e\x00\x63\x00\x68\x00\x5f\x00\x6d\x00\x6f\x00\x72\x00\x65\x00\x5f\x00\x66\x00\x6f\x00\x63\x00\x75\x00\x73\
+\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x0f\
+\x01\x40\x2d\xa7\
+\x00\x61\
+\x00\x72\x00\x72\x00\x6f\x00\x77\x00\x5f\x00\x75\x00\x70\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x12\
+\x04\xb5\x9d\x47\
+\x00\x62\
+\x00\x72\x00\x61\x00\x6e\x00\x63\x00\x68\x00\x5f\x00\x6f\x00\x70\x00\x65\x00\x6e\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\
+\x00\x67\
+\x00\x17\
+\x0f\x18\x45\x87\
+\x00\x61\
+\x00\x72\x00\x72\x00\x6f\x00\x77\x00\x5f\x00\x6c\x00\x65\x00\x66\x00\x74\x00\x5f\x00\x64\x00\x69\x00\x73\x00\x61\x00\x62\x00\x6c\
+\x00\x65\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x14\
+\x05\xe4\x2d\xe7\
+\x00\x62\
+\x00\x72\x00\x61\x00\x6e\x00\x63\x00\x68\x00\x5f\x00\x63\x00\x6c\x00\x6f\x00\x73\x00\x65\x00\x64\x00\x40\x00\x32\x00\x78\x00\x2e\
+\x00\x70\x00\x6e\x00\x67\
+\x00\x1b\
+\x07\xac\x39\xa7\
+\x00\x74\
+\x00\x6f\x00\x6f\x00\x6c\x00\x62\x00\x61\x00\x72\x00\x5f\x00\x6d\x00\x6f\x00\x76\x00\x65\x00\x5f\x00\x68\x00\x6f\x00\x72\x00\x69\
+\x00\x7a\x00\x6f\x00\x6e\x00\x74\x00\x61\x00\x6c\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x1b\
+\x0a\x19\xf4\xe7\
+\x00\x77\
+\x00\x69\x00\x6e\x00\x64\x00\x6f\x00\x77\x00\x5f\x00\x63\x00\x6c\x00\x6f\x00\x73\x00\x65\x00\x5f\x00\x70\x00\x72\x00\x65\x00\x73\
+\x00\x73\x00\x65\x00\x64\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x22\
+\x08\x8a\x08\x27\
+\x00\x63\
+\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x62\x00\x6f\x00\x78\x00\x5f\x00\x69\x00\x6e\x00\x64\x00\x65\x00\x74\x00\x65\x00\x72\x00\x6d\
+\x00\x69\x00\x6e\x00\x61\x00\x74\x00\x65\x00\x5f\x00\x70\x00\x72\x00\x65\x00\x73\x00\x73\x00\x65\x00\x64\x00\x2e\x00\x70\x00\x6e\
+\x00\x67\
+\x00\x16\
+\x0a\x1a\xd6\x47\
+\x00\x61\
+\x00\x72\x00\x72\x00\x6f\x00\x77\x00\x5f\x00\x64\x00\x6f\x00\x77\x00\x6e\x00\x5f\x00\x70\x00\x72\x00\x65\x00\x73\x00\x73\x00\x65\
+\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x12\
+\x04\xb1\x94\x27\
+\x00\x62\
+\x00\x72\x00\x61\x00\x6e\x00\x63\x00\x68\x00\x5f\x00\x6d\x00\x6f\x00\x72\x00\x65\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\
+\x00\x67\
+\x00\x1e\
+\x0c\xd2\xb9\x87\
+\x00\x6c\
+\x00\x69\x00\x6e\x00\x65\x00\x5f\x00\x68\x00\x6f\x00\x72\x00\x69\x00\x7a\x00\x6f\x00\x6e\x00\x74\x00\x61\x00\x6c\x00\x5f\x00\x70\
+\x00\x72\x00\x65\x00\x73\x00\x73\x00\x65\x00\x64\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x1b\
+\x08\x21\xa7\xc7\
+\x00\x62\
+\x00\x72\x00\x61\x00\x6e\x00\x63\x00\x68\x00\x5f\x00\x6f\x00\x70\x00\x65\x00\x6e\x00\x5f\x00\x64\x00\x69\x00\x73\x00\x61\x00\x62\
+\x00\x6c\x00\x65\x00\x64\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x18\
+\x05\x12\xcf\x67\
+\x00\x77\
+\x00\x69\x00\x6e\x00\x64\x00\x6f\x00\x77\x00\x5f\x00\x63\x00\x6c\x00\x6f\x00\x73\x00\x65\x00\x5f\x00\x70\x00\x72\x00\x65\x00\x73\
+\x00\x73\x00\x65\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x1c\
+\x04\x73\x5f\x47\
+\x00\x77\
+\x00\x69\x00\x6e\x00\x64\x00\x6f\x00\x77\x00\x5f\x00\x75\x00\x6e\x00\x64\x00\x6f\x00\x63\x00\x6b\x00\x5f\x00\x70\x00\x72\x00\x65\
+\x00\x73\x00\x73\x00\x65\x00\x64\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x1c\
+\x08\x2e\xd3\x67\
+\x00\x6c\
+\x00\x69\x00\x6e\x00\x65\x00\x5f\x00\x68\x00\x6f\x00\x72\x00\x69\x00\x7a\x00\x6f\x00\x6e\x00\x74\x00\x61\x00\x6c\x00\x5f\x00\x66\
+\x00\x6f\x00\x63\x00\x75\x00\x73\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x1c\
+\x00\x06\x3d\xc7\
+\x00\x72\
+\x00\x61\x00\x64\x00\x69\x00\x6f\x00\x5f\x00\x75\x00\x6e\x00\x63\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x65\x00\x64\x00\x5f\x00\x66\
+\x00\x6f\x00\x63\x00\x75\x00\x73\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x1a\
+\x0a\x14\xed\x47\
+\x00\x77\
+\x00\x69\x00\x6e\x00\x64\x00\x6f\x00\x77\x00\x5f\x00\x67\x00\x72\x00\x69\x00\x70\x00\x5f\x00\x70\x00\x72\x00\x65\x00\x73\x00\x73\
+\x00\x65\x00\x64\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x1a\
+\x0d\x33\x2d\xa7\
+\x00\x6c\
+\x00\x69\x00\x6e\x00\x65\x00\x5f\x00\x76\x00\x65\x00\x72\x00\x74\x00\x69\x00\x63\x00\x61\x00\x6c\x00\x5f\x00\x64\x00\x69\x00\x73\
+\x00\x61\x00\x62\x00\x6c\x00\x65\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x15\
+\x0b\x78\x08\xe7\
+\x00\x62\
+\x00\x72\x00\x61\x00\x6e\x00\x63\x00\x68\x00\x5f\x00\x6c\x00\x69\x00\x6e\x00\x65\x00\x5f\x00\x66\x00\x6f\x00\x63\x00\x75\x00\x73\
+\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x23\
+\x07\x14\x6d\x87\
+\x00\x63\
+\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x62\x00\x6f\x00\x78\x00\x5f\x00\x69\x00\x6e\x00\x64\x00\x65\x00\x74\x00\x65\x00\x72\x00\x6d\
+\x00\x69\x00\x6e\x00\x61\x00\x74\x00\x65\x00\x5f\x00\x66\x00\x6f\x00\x63\x00\x75\x00\x73\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\
+\x00\x6e\x00\x67\
+\x00\x1f\
+\x02\x4f\x6a\xa7\
+\x00\x72\
+\x00\x61\x00\x64\x00\x69\x00\x6f\x00\x5f\x00\x75\x00\x6e\x00\x63\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x65\x00\x64\x00\x5f\x00\x64\
+\x00\x69\x00\x73\x00\x61\x00\x62\x00\x6c\x00\x65\x00\x64\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x11\
+\x01\xf6\xff\x67\
+\x00\x62\
+\x00\x72\x00\x61\x00\x6e\x00\x63\x00\x68\x00\x5f\x00\x65\x00\x6e\x00\x64\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\
+\x00\x1e\
+\x05\x75\xad\x27\
+\x00\x74\
+\x00\x6f\x00\x6f\x00\x6c\x00\x62\x00\x61\x00\x72\x00\x5f\x00\x6d\x00\x6f\x00\x76\x00\x65\x00\x5f\x00\x68\x00\x6f\x00\x72\x00\x69\
+\x00\x7a\x00\x6f\x00\x6e\x00\x74\x00\x61\x00\x6c\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x1a\
+\x09\x2e\xa9\x47\
+\x00\x61\
+\x00\x72\x00\x72\x00\x6f\x00\x77\x00\x5f\x00\x64\x00\x6f\x00\x77\x00\x6e\x00\x5f\x00\x64\x00\x69\x00\x73\x00\x61\x00\x62\x00\x6c\
+\x00\x65\x00\x64\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x13\
+\x05\x76\x1e\x67\
+\x00\x77\
+\x00\x69\x00\x6e\x00\x64\x00\x6f\x00\x77\x00\x5f\x00\x6d\x00\x69\x00\x6e\x00\x69\x00\x6d\x00\x69\x00\x7a\x00\x65\x00\x2e\x00\x70\
+\x00\x6e\x00\x67\
+\x00\x1c\
+\x0c\xfb\xa0\x47\
+\x00\x62\
+\x00\x72\x00\x61\x00\x6e\x00\x63\x00\x68\x00\x5f\x00\x63\x00\x6c\x00\x6f\x00\x73\x00\x65\x00\x64\x00\x5f\x00\x70\x00\x72\x00\x65\
+\x00\x73\x00\x73\x00\x65\x00\x64\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x16\
+\x01\x75\xcc\x87\
+\x00\x63\
+\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x62\x00\x6f\x00\x78\x00\x5f\x00\x75\x00\x6e\x00\x63\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x65\
+\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x22\
+\x00\xa7\x99\x47\
+\x00\x74\
+\x00\x6f\x00\x6f\x00\x6c\x00\x62\x00\x61\x00\x72\x00\x5f\x00\x6d\x00\x6f\x00\x76\x00\x65\x00\x5f\x00\x76\x00\x65\x00\x72\x00\x74\
+\x00\x69\x00\x63\x00\x61\x00\x6c\x00\x5f\x00\x66\x00\x6f\x00\x63\x00\x75\x00\x73\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\
+\x00\x67\
+\x00\x15\
+\x06\x62\x08\x27\
+\x00\x62\
+\x00\x72\x00\x61\x00\x6e\x00\x63\x00\x68\x00\x5f\x00\x6f\x00\x70\x00\x65\x00\x6e\x00\x5f\x00\x66\x00\x6f\x00\x63\x00\x75\x00\x73\
+\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x23\
+\x06\xf2\x1a\x47\
+\x00\x63\
+\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x62\x00\x6f\x00\x78\x00\x5f\x00\x69\x00\x6e\x00\x64\x00\x65\x00\x74\x00\x65\x00\x72\x00\x6d\
+\x00\x69\x00\x6e\x00\x61\x00\x74\x00\x65\x00\x5f\x00\x64\x00\x69\x00\x73\x00\x61\x00\x62\x00\x6c\x00\x65\x00\x64\x00\x2e\x00\x70\
+\x00\x6e\x00\x67\
+\x00\x1a\
+\x05\x28\x8d\xa7\
+\x00\x62\
+\x00\x72\x00\x61\x00\x6e\x00\x63\x00\x68\x00\x5f\x00\x63\x00\x6c\x00\x6f\x00\x73\x00\x65\x00\x64\x00\x5f\x00\x64\x00\x69\x00\x73\
+\x00\x61\x00\x62\x00\x6c\x00\x65\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x24\
+\x05\xed\xfa\xe7\
+\x00\x74\
+\x00\x6f\x00\x6f\x00\x6c\x00\x62\x00\x61\x00\x72\x00\x5f\x00\x6d\x00\x6f\x00\x76\x00\x65\x00\x5f\x00\x68\x00\x6f\x00\x72\x00\x69\
+\x00\x7a\x00\x6f\x00\x6e\x00\x74\x00\x61\x00\x6c\x00\x5f\x00\x66\x00\x6f\x00\x63\x00\x75\x00\x73\x00\x40\x00\x32\x00\x78\x00\x2e\
+\x00\x70\x00\x6e\x00\x67\
+\x00\x18\
+\x02\x48\x15\x27\
+\x00\x77\
+\x00\x69\x00\x6e\x00\x64\x00\x6f\x00\x77\x00\x5f\x00\x67\x00\x72\x00\x69\x00\x70\x00\x5f\x00\x66\x00\x6f\x00\x63\x00\x75\x00\x73\
+\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x0d\
+\x0b\x72\x3d\x07\
+\x00\x62\
+\x00\x61\x00\x73\x00\x65\x00\x5f\x00\x69\x00\x63\x00\x6f\x00\x6e\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x12\
+\x04\xb3\x4c\x27\
+\x00\x62\
+\x00\x72\x00\x61\x00\x6e\x00\x63\x00\x68\x00\x5f\x00\x6c\x00\x69\x00\x6e\x00\x65\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\
+\x00\x67\
+\x00\x0e\
+\x06\x0c\xe6\x07\
+\x00\x61\
+\x00\x72\x00\x72\x00\x6f\x00\x77\x00\x5f\x00\x64\x00\x6f\x00\x77\x00\x6e\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x1b\
+\x0f\x79\xa3\xc7\
+\x00\x6c\
+\x00\x69\x00\x6e\x00\x65\x00\x5f\x00\x68\x00\x6f\x00\x72\x00\x69\x00\x7a\x00\x6f\x00\x6e\x00\x74\x00\x61\x00\x6c\x00\x5f\x00\x70\
+\x00\x72\x00\x65\x00\x73\x00\x73\x00\x65\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x23\
+\x03\x43\xb9\x67\
+\x00\x74\
+\x00\x6f\x00\x6f\x00\x6c\x00\x62\x00\x61\x00\x72\x00\x5f\x00\x73\x00\x65\x00\x70\x00\x61\x00\x72\x00\x61\x00\x74\x00\x6f\x00\x72\
+\x00\x5f\x00\x68\x00\x6f\x00\x72\x00\x69\x00\x7a\x00\x6f\x00\x6e\x00\x74\x00\x61\x00\x6c\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\
+\x00\x6e\x00\x67\
+\x00\x1b\
+\x0a\xfb\x2d\x27\
+\x00\x72\
+\x00\x61\x00\x64\x00\x69\x00\x6f\x00\x5f\x00\x75\x00\x6e\x00\x63\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x65\x00\x64\x00\x5f\x00\x70\
+\x00\x72\x00\x65\x00\x73\x00\x73\x00\x65\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x16\
+\x04\x9c\xa4\xa7\
+\x00\x62\
+\x00\x61\x00\x73\x00\x65\x00\x5f\x00\x69\x00\x63\x00\x6f\x00\x6e\x00\x5f\x00\x64\x00\x69\x00\x73\x00\x61\x00\x62\x00\x6c\x00\x65\
+\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x19\
+\x0e\x98\x18\x27\
+\x00\x77\
+\x00\x69\x00\x6e\x00\x64\x00\x6f\x00\x77\x00\x5f\x00\x63\x00\x6c\x00\x6f\x00\x73\x00\x65\x00\x5f\x00\x66\x00\x6f\x00\x63\x00\x75\
+\x00\x73\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x18\
+\x06\x43\xc6\xe7\
+\x00\x61\
+\x00\x72\x00\x72\x00\x6f\x00\x77\x00\x5f\x00\x72\x00\x69\x00\x67\x00\x68\x00\x74\x00\x5f\x00\x66\x00\x6f\x00\x63\x00\x75\x00\x73\
+\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x1a\
+\x04\x64\xf7\x07\
+\x00\x62\
+\x00\x72\x00\x61\x00\x6e\x00\x63\x00\x68\x00\x5f\x00\x65\x00\x6e\x00\x64\x00\x5f\x00\x64\x00\x69\x00\x73\x00\x61\x00\x62\x00\x6c\
+\x00\x65\x00\x64\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x1a\
+\x05\x11\xe0\xe7\
+\x00\x63\
+\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x62\x00\x6f\x00\x78\x00\x5f\x00\x63\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x65\x00\x64\x00\x5f\
+\x00\x66\x00\x6f\x00\x63\x00\x75\x00\x73\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x1f\
+\x06\x75\x64\x87\
+\x00\x74\
+\x00\x6f\x00\x6f\x00\x6c\x00\x62\x00\x61\x00\x72\x00\x5f\x00\x6d\x00\x6f\x00\x76\x00\x65\x00\x5f\x00\x76\x00\x65\x00\x72\x00\x74\
+\x00\x69\x00\x63\x00\x61\x00\x6c\x00\x5f\x00\x66\x00\x6f\x00\x63\x00\x75\x00\x73\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x2b\
+\x03\xd2\xba\xc7\
+\x00\x74\
+\x00\x6f\x00\x6f\x00\x6c\x00\x62\x00\x61\x00\x72\x00\x5f\x00\x73\x00\x65\x00\x70\x00\x61\x00\x72\x00\x61\x00\x74\x00\x6f\x00\x72\
+\x00\x5f\x00\x68\x00\x6f\x00\x72\x00\x69\x00\x7a\x00\x6f\x00\x6e\x00\x74\x00\x61\x00\x6c\x00\x5f\x00\x70\x00\x72\x00\x65\x00\x73\
+\x00\x73\x00\x65\x00\x64\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x1a\
+\x0f\x9a\xe5\x07\
+\x00\x62\
+\x00\x72\x00\x61\x00\x6e\x00\x63\x00\x68\x00\x5f\x00\x6f\x00\x70\x00\x65\x00\x6e\x00\x5f\x00\x70\x00\x72\x00\x65\x00\x73\x00\x73\
+\x00\x65\x00\x64\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x29\
+\x09\xe4\xb0\x07\
+\x00\x74\
+\x00\x6f\x00\x6f\x00\x6c\x00\x62\x00\x61\x00\x72\x00\x5f\x00\x73\x00\x65\x00\x70\x00\x61\x00\x72\x00\x61\x00\x74\x00\x6f\x00\x72\
+\x00\x5f\x00\x76\x00\x65\x00\x72\x00\x74\x00\x69\x00\x63\x00\x61\x00\x6c\x00\x5f\x00\x70\x00\x72\x00\x65\x00\x73\x00\x73\x00\x65\
+\x00\x64\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x25\
+\x08\x07\x7e\x87\
+\x00\x74\
+\x00\x6f\x00\x6f\x00\x6c\x00\x62\x00\x61\x00\x72\x00\x5f\x00\x6d\x00\x6f\x00\x76\x00\x65\x00\x5f\x00\x76\x00\x65\x00\x72\x00\x74\
+\x00\x69\x00\x63\x00\x61\x00\x6c\x00\x5f\x00\x64\x00\x69\x00\x73\x00\x61\x00\x62\x00\x6c\x00\x65\x00\x64\x00\x40\x00\x32\x00\x78\
+\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x12\
+\x06\xa7\x5a\x47\
+\x00\x77\
+\x00\x69\x00\x6e\x00\x64\x00\x6f\x00\x77\x00\x5f\x00\x67\x00\x72\x00\x69\x00\x70\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\
+\x00\x67\
+\x00\x1c\
+\x08\xb5\x77\x67\
+\x00\x72\
+\x00\x61\x00\x64\x00\x69\x00\x6f\x00\x5f\x00\x63\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x65\x00\x64\x00\x5f\x00\x70\x00\x72\x00\x65\
+\x00\x73\x00\x73\x00\x65\x00\x64\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x23\
+\x03\xa5\x91\x47\
+\x00\x74\
+\x00\x6f\x00\x6f\x00\x6c\x00\x62\x00\x61\x00\x72\x00\x5f\x00\x6d\x00\x6f\x00\x76\x00\x65\x00\x5f\x00\x68\x00\x6f\x00\x72\x00\x69\
+\x00\x7a\x00\x6f\x00\x6e\x00\x74\x00\x61\x00\x6c\x00\x5f\x00\x70\x00\x72\x00\x65\x00\x73\x00\x73\x00\x65\x00\x64\x00\x2e\x00\x70\
+\x00\x6e\x00\x67\
+\x00\x17\
+\x0d\xdf\xcf\xa7\
+\x00\x77\
+\x00\x69\x00\x6e\x00\x64\x00\x6f\x00\x77\x00\x5f\x00\x67\x00\x72\x00\x69\x00\x70\x00\x5f\x00\x70\x00\x72\x00\x65\x00\x73\x00\x73\
+\x00\x65\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x14\
+\x0b\x23\x21\x67\
+\x00\x61\
+\x00\x72\x00\x72\x00\x6f\x00\x77\x00\x5f\x00\x75\x00\x70\x00\x5f\x00\x70\x00\x72\x00\x65\x00\x73\x00\x73\x00\x65\x00\x64\x00\x2e\
+\x00\x70\x00\x6e\x00\x67\
+\x00\x16\
+\x07\x09\xf8\x27\
+\x00\x77\
+\x00\x69\x00\x6e\x00\x64\x00\x6f\x00\x77\x00\x5f\x00\x6d\x00\x69\x00\x6e\x00\x69\x00\x6d\x00\x69\x00\x7a\x00\x65\x00\x40\x00\x32\
+\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x1a\
+\x02\x38\x25\x07\
+\x00\x62\
+\x00\x72\x00\x61\x00\x6e\x00\x63\x00\x68\x00\x5f\x00\x6c\x00\x69\x00\x6e\x00\x65\x00\x5f\x00\x70\x00\x72\x00\x65\x00\x73\x00\x73\
+\x00\x65\x00\x64\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x1f\
+\x0b\x48\x50\x87\
+\x00\x63\
+\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x62\x00\x6f\x00\x78\x00\x5f\x00\x75\x00\x6e\x00\x63\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x65\
+\x00\x64\x00\x5f\x00\x66\x00\x6f\x00\x63\x00\x75\x00\x73\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x27\
+\x0c\xeb\xe5\x67\
+\x00\x74\
+\x00\x6f\x00\x6f\x00\x6c\x00\x62\x00\x61\x00\x72\x00\x5f\x00\x73\x00\x65\x00\x70\x00\x61\x00\x72\x00\x61\x00\x74\x00\x6f\x00\x72\
+\x00\x5f\x00\x76\x00\x65\x00\x72\x00\x74\x00\x69\x00\x63\x00\x61\x00\x6c\x00\x5f\x00\x66\x00\x6f\x00\x63\x00\x75\x00\x73\x00\x40\
+\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x1f\
+\x03\xf7\x18\x07\
+\x00\x63\
+\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x62\x00\x6f\x00\x78\x00\x5f\x00\x63\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x65\x00\x64\x00\x5f\
+\x00\x70\x00\x72\x00\x65\x00\x73\x00\x73\x00\x65\x00\x64\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x1f\
+\x0a\xae\x27\x47\
+\x00\x63\
+\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x62\x00\x6f\x00\x78\x00\x5f\x00\x75\x00\x6e\x00\x63\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x65\
+\x00\x64\x00\x5f\x00\x64\x00\x69\x00\x73\x00\x61\x00\x62\x00\x6c\x00\x65\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x19\
+\x0a\x27\x78\x07\
+\x00\x63\
+\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x62\x00\x6f\x00\x78\x00\x5f\x00\x75\x00\x6e\x00\x63\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x65\
+\x00\x64\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x13\
+\x0b\x4e\x57\xa7\
+\x00\x6c\
+\x00\x69\x00\x6e\x00\x65\x00\x5f\x00\x68\x00\x6f\x00\x72\x00\x69\x00\x7a\x00\x6f\x00\x6e\x00\x74\x00\x61\x00\x6c\x00\x2e\x00\x70\
+\x00\x6e\x00\x67\
+\x00\x13\
+\x00\xcf\x5c\xc7\
+\x00\x77\
+\x00\x69\x00\x6e\x00\x64\x00\x6f\x00\x77\x00\x5f\x00\x63\x00\x6c\x00\x6f\x00\x73\x00\x65\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\
+\x00\x6e\x00\x67\
+\x00\x1a\
+\x07\x88\x25\x07\
+\x00\x62\
+\x00\x72\x00\x61\x00\x6e\x00\x63\x00\x68\x00\x5f\x00\x6d\x00\x6f\x00\x72\x00\x65\x00\x5f\x00\x70\x00\x72\x00\x65\x00\x73\x00\x73\
+\x00\x65\x00\x64\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x11\
+\x08\xfc\x49\xe7\
+\x00\x61\
+\x00\x72\x00\x72\x00\x6f\x00\x77\x00\x5f\x00\x6c\x00\x65\x00\x66\x00\x74\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\
+\x00\x14\
+\x0a\x20\x6e\x07\
+\x00\x77\
+\x00\x69\x00\x6e\x00\x64\x00\x6f\x00\x77\x00\x5f\x00\x75\x00\x6e\x00\x64\x00\x6f\x00\x63\x00\x6b\x00\x40\x00\x32\x00\x78\x00\x2e\
+\x00\x70\x00\x6e\x00\x67\
+\x00\x0e\
+\x0d\x4e\x71\x87\
+\x00\x62\
+\x00\x72\x00\x61\x00\x6e\x00\x63\x00\x68\x00\x5f\x00\x65\x00\x6e\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x0f\
+\x00\xd6\x25\xc7\
+\x00\x62\
+\x00\x72\x00\x61\x00\x6e\x00\x63\x00\x68\x00\x5f\x00\x6c\x00\x69\x00\x6e\x00\x65\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x1a\
+\x0e\xbc\xc3\x67\
+\x00\x72\
+\x00\x61\x00\x64\x00\x69\x00\x6f\x00\x5f\x00\x63\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x65\x00\x64\x00\x5f\x00\x64\x00\x69\x00\x73\
+\x00\x61\x00\x62\x00\x6c\x00\x65\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x19\
+\x09\x5e\xb0\x07\
+\x00\x62\
+\x00\x72\x00\x61\x00\x6e\x00\x63\x00\x68\x00\x5f\x00\x65\x00\x6e\x00\x64\x00\x5f\x00\x70\x00\x72\x00\x65\x00\x73\x00\x73\x00\x65\
+\x00\x64\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x15\
+\x03\x1c\x93\x87\
+\x00\x74\
+\x00\x72\x00\x61\x00\x6e\x00\x73\x00\x70\x00\x61\x00\x72\x00\x65\x00\x6e\x00\x74\x00\x5f\x00\x66\x00\x6f\x00\x63\x00\x75\x00\x73\
+\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x17\
+\x09\x2f\xda\x87\
+\x00\x77\
+\x00\x69\x00\x6e\x00\x64\x00\x6f\x00\x77\x00\x5f\x00\x75\x00\x6e\x00\x64\x00\x6f\x00\x63\x00\x6b\x00\x5f\x00\x66\x00\x6f\x00\x63\
+\x00\x75\x00\x73\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x0f\
+\x06\x53\x25\xa7\
+\x00\x62\
+\x00\x72\x00\x61\x00\x6e\x00\x63\x00\x68\x00\x5f\x00\x6f\x00\x70\x00\x65\x00\x6e\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x19\
+\x0c\x33\x94\x27\
+\x00\x61\
+\x00\x72\x00\x72\x00\x6f\x00\x77\x00\x5f\x00\x6c\x00\x65\x00\x66\x00\x74\x00\x5f\x00\x70\x00\x72\x00\x65\x00\x73\x00\x73\x00\x65\
+\x00\x64\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x1e\
+\x0f\x96\x71\x87\
+\x00\x74\
+\x00\x6f\x00\x6f\x00\x6c\x00\x62\x00\x61\x00\x72\x00\x5f\x00\x73\x00\x65\x00\x70\x00\x61\x00\x72\x00\x61\x00\x74\x00\x6f\x00\x72\
+\x00\x5f\x00\x76\x00\x65\x00\x72\x00\x74\x00\x69\x00\x63\x00\x61\x00\x6c\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x10\
+\x00\x55\x62\x07\
+\x00\x77\
+\x00\x69\x00\x6e\x00\x64\x00\x6f\x00\x77\x00\x5f\x00\x63\x00\x6c\x00\x6f\x00\x73\x00\x65\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x19\
+\x00\x38\x7f\xa7\
+\x00\x77\
+\x00\x69\x00\x6e\x00\x64\x00\x6f\x00\x77\x00\x5f\x00\x6d\x00\x69\x00\x6e\x00\x69\x00\x6d\x00\x69\x00\x7a\x00\x65\x00\x5f\x00\x66\
+\x00\x6f\x00\x63\x00\x75\x00\x73\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x1d\
+\x0a\xd8\x81\x27\
+\x00\x72\
+\x00\x61\x00\x64\x00\x69\x00\x6f\x00\x5f\x00\x63\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x65\x00\x64\x00\x5f\x00\x64\x00\x69\x00\x73\
+\x00\x61\x00\x62\x00\x6c\x00\x65\x00\x64\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x0f\
+\x00\x6f\x04\x87\
+\x00\x77\
+\x00\x69\x00\x6e\x00\x64\x00\x6f\x00\x77\x00\x5f\x00\x67\x00\x72\x00\x69\x00\x70\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x21\
+\x0a\x51\x5f\x47\
+\x00\x63\
+\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x62\x00\x6f\x00\x78\x00\x5f\x00\x75\x00\x6e\x00\x63\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x65\
+\x00\x64\x00\x5f\x00\x70\x00\x72\x00\x65\x00\x73\x00\x73\x00\x65\x00\x64\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\
+\x00\x11\
+\x0b\xda\x30\xa7\
+\x00\x62\
+\x00\x72\x00\x61\x00\x6e\x00\x63\x00\x68\x00\x5f\x00\x63\x00\x6c\x00\x6f\x00\x73\x00\x65\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\
+\x00\x1c\
+\x08\x3f\xda\x67\
+\x00\x63\
+\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x62\x00\x6f\x00\x78\x00\x5f\x00\x75\x00\x6e\x00\x63\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x65\
+\x00\x64\x00\x5f\x00\x66\x00\x6f\x00\x63\x00\x75\x00\x73\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x26\
+\x07\x4b\x88\xe7\
+\x00\x63\
+\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x62\x00\x6f\x00\x78\x00\x5f\x00\x69\x00\x6e\x00\x64\x00\x65\x00\x74\x00\x65\x00\x72\x00\x6d\
+\x00\x69\x00\x6e\x00\x61\x00\x74\x00\x65\x00\x5f\x00\x64\x00\x69\x00\x73\x00\x61\x00\x62\x00\x6c\x00\x65\x00\x64\x00\x40\x00\x32\
+\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x1c\
+\x01\xe0\x4a\x07\
+\x00\x72\
+\x00\x61\x00\x64\x00\x69\x00\x6f\x00\x5f\x00\x75\x00\x6e\x00\x63\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x65\x00\x64\x00\x5f\x00\x64\
+\x00\x69\x00\x73\x00\x61\x00\x62\x00\x6c\x00\x65\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x22\
+\x04\x9a\x03\x67\
+\x00\x63\
+\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x62\x00\x6f\x00\x78\x00\x5f\x00\x75\x00\x6e\x00\x63\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x65\
+\x00\x64\x00\x5f\x00\x64\x00\x69\x00\x73\x00\x61\x00\x62\x00\x6c\x00\x65\x00\x64\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\
+\x00\x67\
+\x00\x2a\
+\x0f\xc4\xf7\x07\
+\x00\x74\
+\x00\x6f\x00\x6f\x00\x6c\x00\x62\x00\x61\x00\x72\x00\x5f\x00\x73\x00\x65\x00\x70\x00\x61\x00\x72\x00\x61\x00\x74\x00\x6f\x00\x72\
+\x00\x5f\x00\x76\x00\x65\x00\x72\x00\x74\x00\x69\x00\x63\x00\x61\x00\x6c\x00\x5f\x00\x64\x00\x69\x00\x73\x00\x61\x00\x62\x00\x6c\
+\x00\x65\x00\x64\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x18\
+\x06\x65\x89\xe7\
+\x00\x62\
+\x00\x72\x00\x61\x00\x6e\x00\x63\x00\x68\x00\x5f\x00\x6d\x00\x6f\x00\x72\x00\x65\x00\x5f\x00\x66\x00\x6f\x00\x63\x00\x75\x00\x73\
+\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x15\
+\x04\x90\x0a\xc7\
+\x00\x61\
+\x00\x72\x00\x72\x00\x6f\x00\x77\x00\x5f\x00\x72\x00\x69\x00\x67\x00\x68\x00\x74\x00\x5f\x00\x66\x00\x6f\x00\x63\x00\x75\x00\x73\
+\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x1c\
+\x07\x5b\xb0\x67\
+\x00\x6c\
+\x00\x69\x00\x6e\x00\x65\x00\x5f\x00\x76\x00\x65\x00\x72\x00\x74\x00\x69\x00\x63\x00\x61\x00\x6c\x00\x5f\x00\x70\x00\x72\x00\x65\
+\x00\x73\x00\x73\x00\x65\x00\x64\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x1c\
+\x01\x15\x51\xe7\
+\x00\x77\
+\x00\x69\x00\x6e\x00\x64\x00\x6f\x00\x77\x00\x5f\x00\x6d\x00\x69\x00\x6e\x00\x69\x00\x6d\x00\x69\x00\x7a\x00\x65\x00\x5f\x00\x66\
+\x00\x6f\x00\x63\x00\x75\x00\x73\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x0f\
+\x0f\x2c\x24\xc7\
+\x00\x61\
+\x00\x72\x00\x72\x00\x6f\x00\x77\x00\x5f\x00\x72\x00\x69\x00\x67\x00\x68\x00\x74\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x17\
+\x0b\xf3\xab\x27\
+\x00\x63\
+\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x62\x00\x6f\x00\x78\x00\x5f\x00\x63\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x65\x00\x64\x00\x40\
+\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x1d\
+\x08\xe1\xf6\xc7\
+\x00\x63\
+\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x62\x00\x6f\x00\x78\x00\x5f\x00\x63\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x65\x00\x64\x00\x5f\
+\x00\x66\x00\x6f\x00\x63\x00\x75\x00\x73\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x28\
+\x0f\x63\x53\xc7\
+\x00\x74\
+\x00\x6f\x00\x6f\x00\x6c\x00\x62\x00\x61\x00\x72\x00\x5f\x00\x73\x00\x65\x00\x70\x00\x61\x00\x72\x00\x61\x00\x74\x00\x6f\x00\x72\
+\x00\x5f\x00\x68\x00\x6f\x00\x72\x00\x69\x00\x7a\x00\x6f\x00\x6e\x00\x74\x00\x61\x00\x6c\x00\x5f\x00\x70\x00\x72\x00\x65\x00\x73\
+\x00\x73\x00\x65\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x15\
+\x0d\x86\xf9\xe7\
+\x00\x61\
+\x00\x72\x00\x72\x00\x6f\x00\x77\x00\x5f\x00\x75\x00\x70\x00\x5f\x00\x66\x00\x6f\x00\x63\x00\x75\x00\x73\x00\x40\x00\x32\x00\x78\
+\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x1b\
+\x00\xc1\x23\x67\
+\x00\x77\
+\x00\x69\x00\x6e\x00\x64\x00\x6f\x00\x77\x00\x5f\x00\x67\x00\x72\x00\x69\x00\x70\x00\x5f\x00\x64\x00\x69\x00\x73\x00\x61\x00\x62\
+\x00\x6c\x00\x65\x00\x64\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x12\
+\x0d\x78\xb6\x87\
+\x00\x61\
+\x00\x72\x00\x72\x00\x6f\x00\x77\x00\x5f\x00\x75\x00\x70\x00\x5f\x00\x66\x00\x6f\x00\x63\x00\x75\x00\x73\x00\x2e\x00\x70\x00\x6e\
+\x00\x67\
+\x00\x24\
+\x05\x98\x88\x87\
+\x00\x74\
+\x00\x6f\x00\x6f\x00\x6c\x00\x62\x00\x61\x00\x72\x00\x5f\x00\x6d\x00\x6f\x00\x76\x00\x65\x00\x5f\x00\x76\x00\x65\x00\x72\x00\x74\
+\x00\x69\x00\x63\x00\x61\x00\x6c\x00\x5f\x00\x70\x00\x72\x00\x65\x00\x73\x00\x73\x00\x65\x00\x64\x00\x40\x00\x32\x00\x78\x00\x2e\
+\x00\x70\x00\x6e\x00\x67\
+\x00\x26\
+\x0f\xfb\x22\x07\
+\x00\x74\
+\x00\x6f\x00\x6f\x00\x6c\x00\x62\x00\x61\x00\x72\x00\x5f\x00\x6d\x00\x6f\x00\x76\x00\x65\x00\x5f\x00\x68\x00\x6f\x00\x72\x00\x69\
+\x00\x7a\x00\x6f\x00\x6e\x00\x74\x00\x61\x00\x6c\x00\x5f\x00\x70\x00\x72\x00\x65\x00\x73\x00\x73\x00\x65\x00\x64\x00\x40\x00\x32\
+\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x19\
+\x0b\x8a\x15\xe7\
+\x00\x61\
+\x00\x72\x00\x72\x00\x6f\x00\x77\x00\x5f\x00\x64\x00\x6f\x00\x77\x00\x6e\x00\x5f\x00\x70\x00\x72\x00\x65\x00\x73\x00\x73\x00\x65\
+\x00\x64\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x17\
+\x0f\xff\xfc\x07\
+\x00\x61\
+\x00\x72\x00\x72\x00\x6f\x00\x77\x00\x5f\x00\x64\x00\x6f\x00\x77\x00\x6e\x00\x5f\x00\x64\x00\x69\x00\x73\x00\x61\x00\x62\x00\x6c\
+\x00\x65\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x26\
+\x0f\x35\xf0\xa7\
+\x00\x74\
+\x00\x6f\x00\x6f\x00\x6c\x00\x62\x00\x61\x00\x72\x00\x5f\x00\x73\x00\x65\x00\x70\x00\x61\x00\x72\x00\x61\x00\x74\x00\x6f\x00\x72\
+\x00\x5f\x00\x76\x00\x65\x00\x72\x00\x74\x00\x69\x00\x63\x00\x61\x00\x6c\x00\x5f\x00\x70\x00\x72\x00\x65\x00\x73\x00\x73\x00\x65\
+\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x1e\
+\x00\x4f\xcb\xe7\
+\x00\x63\
+\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x62\x00\x6f\x00\x78\x00\x5f\x00\x75\x00\x6e\x00\x63\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x65\
+\x00\x64\x00\x5f\x00\x70\x00\x72\x00\x65\x00\x73\x00\x73\x00\x65\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x17\
+\x0b\x9d\x16\x67\
+\x00\x62\
+\x00\x72\x00\x61\x00\x6e\x00\x63\x00\x68\x00\x5f\x00\x6d\x00\x6f\x00\x72\x00\x65\x00\x5f\x00\x70\x00\x72\x00\x65\x00\x73\x00\x73\
+\x00\x65\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x1d\
+\x06\xba\x02\xa7\
+\x00\x77\
+\x00\x69\x00\x6e\x00\x64\x00\x6f\x00\x77\x00\x5f\x00\x75\x00\x6e\x00\x64\x00\x6f\x00\x63\x00\x6b\x00\x5f\x00\x64\x00\x69\x00\x73\
+\x00\x61\x00\x62\x00\x6c\x00\x65\x00\x64\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x19\
+\x07\xb7\xa1\x47\
+\x00\x62\
+\x00\x72\x00\x61\x00\x6e\x00\x63\x00\x68\x00\x5f\x00\x63\x00\x6c\x00\x6f\x00\x73\x00\x65\x00\x64\x00\x5f\x00\x70\x00\x72\x00\x65\
+\x00\x73\x00\x73\x00\x65\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x20\
+\x07\x4e\x5a\xc7\
+\x00\x74\
+\x00\x6f\x00\x6f\x00\x6c\x00\x62\x00\x61\x00\x72\x00\x5f\x00\x73\x00\x65\x00\x70\x00\x61\x00\x72\x00\x61\x00\x74\x00\x6f\x00\x72\
+\x00\x5f\x00\x68\x00\x6f\x00\x72\x00\x69\x00\x7a\x00\x6f\x00\x6e\x00\x74\x00\x61\x00\x6c\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x17\
+\x0b\x9d\x4d\x67\
+\x00\x62\
+\x00\x72\x00\x61\x00\x6e\x00\x63\x00\x68\x00\x5f\x00\x6c\x00\x69\x00\x6e\x00\x65\x00\x5f\x00\x70\x00\x72\x00\x65\x00\x73\x00\x73\
+\x00\x65\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x0c\
+\x0b\xd0\x7a\xe7\
+\x00\x61\
+\x00\x72\x00\x72\x00\x6f\x00\x77\x00\x5f\x00\x75\x00\x70\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x1b\
+\x02\xd4\x90\x87\
+\x00\x74\
+\x00\x72\x00\x61\x00\x6e\x00\x73\x00\x70\x00\x61\x00\x72\x00\x65\x00\x6e\x00\x74\x00\x5f\x00\x64\x00\x69\x00\x73\x00\x61\x00\x62\
+\x00\x6c\x00\x65\x00\x64\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x12\
+\x04\xa2\xb3\x27\
+\x00\x61\
+\x00\x72\x00\x72\x00\x6f\x00\x77\x00\x5f\x00\x72\x00\x69\x00\x67\x00\x68\x00\x74\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\
+\x00\x67\
+\x00\x29\
+\x08\x67\xa4\xa7\
+\x00\x74\
+\x00\x6f\x00\x6f\x00\x6c\x00\x62\x00\x61\x00\x72\x00\x5f\x00\x73\x00\x65\x00\x70\x00\x61\x00\x72\x00\x61\x00\x74\x00\x6f\x00\x72\
+\x00\x5f\x00\x68\x00\x6f\x00\x72\x00\x69\x00\x7a\x00\x6f\x00\x6e\x00\x74\x00\x61\x00\x6c\x00\x5f\x00\x64\x00\x69\x00\x73\x00\x61\
+\x00\x62\x00\x6c\x00\x65\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x18\
+\x08\xd2\xa3\x27\
+\x00\x62\
+\x00\x61\x00\x73\x00\x65\x00\x5f\x00\x69\x00\x63\x00\x6f\x00\x6e\x00\x5f\x00\x70\x00\x72\x00\x65\x00\x73\x00\x73\x00\x65\x00\x64\
+\x00\x40\x00\x32\x00\x78\x00\x2e\x00\x70\x00\x6e\x00\x67\
+\x00\x14\
+\x06\xe9\x8f\x67\
+\x00\x61\
+\x00\x72\x00\x72\x00\x6f\x00\x77\x00\x5f\x00\x64\x00\x6f\x00\x77\x00\x6e\x00\x5f\x00\x66\x00\x6f\x00\x63\x00\x75\x00\x73\x00\x2e\
+\x00\x70\x00\x6e\x00\x67\
+\x00\x1c\
+\x00\xf3\x26\x27\
+\x00\x77\
+\x00\x69\x00\x6e\x00\x64\x00\x6f\x00\x77\x00\x5f\x00\x6d\x00\x69\x00\x6e\x00\x69\x00\x6d\x00\x69\x00\x7a\x00\x65\x00\x5f\x00\x64\
+\x00\x69\x00\x73\x00\x61\x00\x62\x00\x6c\x00\x65\x00\x64\x00\x2e\x00\x70\x00\x6e\x00\x67\
+"
+
+qt_resource_struct_v1 = b"\
+\x00\x00\x00\x00\x00\x02\x00\x00\x00\x02\x00\x00\x00\x01\
+\x00\x00\x00\x18\x00\x02\x00\x00\x00\x01\x00\x00\x00\xd5\
+\x00\x00\x00\x00\x00\x02\x00\x00\x00\x01\x00\x00\x00\x03\
+\x00\x00\x00\x32\x00\x02\x00\x00\x00\x01\x00\x00\x00\x04\
+\x00\x00\x00\x60\x00\x02\x00\x00\x00\xd0\x00\x00\x00\x05\
+\x00\x00\x18\x4c\x00\x00\x00\x00\x00\x01\x00\x01\x3b\x76\
+\x00\x00\x07\xe8\x00\x00\x00\x00\x00\x01\x00\x00\x68\x2b\
+\x00\x00\x0d\x0e\x00\x00\x00\x00\x00\x01\x00\x00\xb6\x47\
+\x00\x00\x25\xea\x00\x00\x00\x00\x00\x01\x00\x01\xd7\xaf\
+\x00\x00\x13\x62\x00\x00\x00\x00\x00\x01\x00\x01\x04\xe1\
+\x00\x00\x03\x52\x00\x00\x00\x00\x00\x01\x00\x00\x41\xeb\
+\x00\x00\x2c\x2c\x00\x00\x00\x00\x00\x01\x00\x02\x1c\x30\
+\x00\x00\x25\xc4\x00\x00\x00\x00\x00\x01\x00\x01\xd4\xe1\
+\x00\x00\x0b\x4e\x00\x00\x00\x00\x00\x01\x00\x00\x97\x7a\
+\x00\x00\x09\xec\x00\x00\x00\x00\x00\x01\x00\x00\x88\x43\
+\x00\x00\x26\x62\x00\x00\x00\x00\x00\x01\x00\x01\xe3\xbc\
+\x00\x00\x1a\xfe\x00\x00\x00\x00\x00\x01\x00\x01\x60\x51\
+\x00\x00\x2a\x68\x00\x00\x00\x00\x00\x01\x00\x02\x0e\x25\
+\x00\x00\x23\x4e\x00\x00\x00\x00\x00\x01\x00\x01\xb5\x50\
+\x00\x00\x24\x2c\x00\x00\x00\x00\x00\x01\x00\x01\xc5\x39\
+\x00\x00\x2e\xd4\x00\x00\x00\x00\x00\x01\x00\x02\x3b\x4e\
+\x00\x00\x0a\xa6\x00\x00\x00\x00\x00\x01\x00\x00\x90\xe9\
+\x00\x00\x29\x0c\x00\x00\x00\x00\x00\x01\x00\x01\xfc\x4d\
+\x00\x00\x15\x4e\x00\x00\x00\x00\x00\x01\x00\x01\x17\x04\
+\x00\x00\x0c\xc4\x00\x00\x00\x00\x00\x01\x00\x00\xb5\xb7\
+\x00\x00\x1a\xcc\x00\x00\x00\x00\x00\x01\x00\x01\x5e\xc4\
+\x00\x00\x01\x32\x00\x00\x00\x00\x00\x01\x00\x00\x23\x58\
+\x00\x00\x11\xb4\x00\x00\x00\x00\x00\x01\x00\x00\xe4\x33\
+\x00\x00\x27\x86\x00\x00\x00\x00\x00\x01\x00\x01\xef\xdb\
+\x00\x00\x06\x00\x00\x00\x00\x00\x00\x01\x00\x00\x56\xae\
+\x00\x00\x05\x82\x00\x00\x00\x00\x00\x01\x00\x00\x55\x3f\
+\x00\x00\x19\xbe\x00\x00\x00\x00\x00\x01\x00\x01\x54\x5c\
+\x00\x00\x10\x24\x00\x00\x00\x00\x00\x01\x00\x00\xda\x1f\
+\x00\x00\x21\x90\x00\x00\x00\x00\x00\x01\x00\x01\xa5\xba\
+\x00\x00\x1c\x4c\x00\x00\x00\x00\x00\x01\x00\x01\x67\xc0\
+\x00\x00\x19\x7a\x00\x00\x00\x00\x00\x01\x00\x01\x4b\x73\
+\x00\x00\x05\x44\x00\x00\x00\x00\x00\x01\x00\x00\x52\x7b\
+\x00\x00\x09\x6e\x00\x00\x00\x00\x00\x01\x00\x00\x83\x3b\
+\x00\x00\x2d\xb2\x00\x00\x00\x00\x00\x01\x00\x02\x26\xe6\
+\x00\x00\x24\xc2\x00\x00\x00\x00\x00\x01\x00\x01\xcb\xce\
+\x00\x00\x1d\x2a\x00\x00\x00\x00\x00\x01\x00\x01\x73\x06\
+\x00\x00\x06\x88\x00\x00\x00\x00\x00\x01\x00\x00\x5e\x2e\
+\x00\x00\x0d\x3c\x00\x00\x00\x00\x00\x01\x00\x00\xc0\xd9\
+\x00\x00\x20\xb0\x00\x00\x00\x00\x00\x01\x00\x01\x9f\xd7\
+\x00\x00\x04\xa6\x00\x00\x00\x00\x00\x01\x00\x00\x48\xc0\
+\x00\x00\x1f\x0a\x00\x00\x00\x00\x00\x01\x00\x01\x8b\xeb\
+\x00\x00\x22\x62\x00\x00\x00\x00\x00\x01\x00\x01\xaa\xcc\
+\x00\x00\x14\x00\x00\x00\x00\x00\x00\x01\x00\x01\x0a\xcd\
+\x00\x00\x03\x8a\x00\x00\x00\x00\x00\x01\x00\x00\x44\x0a\
+\x00\x00\x14\x4e\x00\x00\x00\x00\x00\x01\x00\x01\x0b\x6c\
+\x00\x00\x11\xee\x00\x00\x00\x00\x00\x01\x00\x00\xe8\xc1\
+\x00\x00\x1e\x52\x00\x00\x00\x00\x00\x01\x00\x01\x87\xf8\
+\x00\x00\x17\xd0\x00\x00\x00\x00\x00\x01\x00\x01\x37\x5c\
+\x00\x00\x09\x2a\x00\x00\x00\x00\x00\x01\x00\x00\x81\xe7\
+\x00\x00\x28\x9e\x00\x00\x00\x00\x00\x01\x00\x01\xf9\x30\
+\x00\x00\x27\xc4\x00\x00\x00\x00\x00\x01\x00\x01\xf3\xf4\
+\x00\x00\x1d\xb2\x00\x00\x00\x00\x00\x01\x00\x01\x78\x31\
+\x00\x00\x2d\xee\x00\x00\x00\x00\x00\x01\x00\x02\x27\x5f\
+\x00\x00\x16\xf2\x00\x00\x00\x00\x00\x01\x00\x01\x2f\x6e\
+\x00\x00\x1c\xa2\x00\x00\x00\x00\x00\x01\x00\x01\x6f\x8a\
+\x00\x00\x15\x72\x00\x00\x00\x00\x00\x01\x00\x01\x1a\xf8\
+\x00\x00\x13\xc6\x00\x00\x00\x00\x00\x01\x00\x01\x07\x9f\
+\x00\x00\x05\x10\x00\x00\x00\x00\x00\x01\x00\x00\x4e\x5a\
+\x00\x00\x1e\x8c\x00\x00\x00\x00\x00\x01\x00\x01\x88\xc9\
+\x00\x00\x17\x9a\x00\x00\x00\x00\x00\x01\x00\x01\x34\x70\
+\x00\x00\x1b\xc4\x00\x00\x00\x00\x00\x01\x00\x01\x64\xdd\
+\x00\x00\x11\x46\x00\x00\x00\x00\x00\x01\x00\x00\xe1\xd4\
+\x00\x00\x07\xae\x00\x00\x00\x00\x00\x01\x00\x00\x67\xb2\
+\x00\x00\x03\x2c\x00\x00\x00\x00\x00\x01\x00\x00\x35\x11\
+\x00\x00\x0e\xa4\x00\x00\x00\x00\x00\x01\x00\x00\xc8\x4d\
+\x00\x00\x19\xe6\x00\x00\x00\x00\x00\x01\x00\x01\x55\x2d\
+\x00\x00\x1a\x62\x00\x00\x00\x00\x00\x01\x00\x01\x5a\x91\
+\x00\x00\x0b\xb2\x00\x00\x00\x00\x00\x01\x00\x00\xa2\x57\
+\x00\x00\x0c\x42\x00\x00\x00\x00\x00\x01\x00\x00\xb0\x58\
+\x00\x00\x2a\xce\x00\x00\x00\x00\x00\x01\x00\x02\x13\x3d\
+\x00\x00\x15\xd0\x00\x00\x00\x00\x00\x01\x00\x01\x20\x5a\
+\x00\x00\x1b\xfe\x00\x00\x00\x00\x00\x01\x00\x01\x66\x8b\
+\x00\x00\x1c\xcc\x00\x00\x00\x00\x00\x01\x00\x01\x70\x7c\
+\x00\x00\x13\x30\x00\x00\x00\x00\x00\x01\x00\x01\x02\x9f\
+\x00\x00\x09\x06\x00\x00\x00\x00\x00\x01\x00\x00\x81\x3d\
+\x00\x00\x1e\x1c\x00\x00\x00\x00\x00\x01\x00\x01\x83\x9c\
+\x00\x00\x25\x26\x00\x00\x00\x00\x00\x01\x00\x01\xce\x35\
+\x00\x00\x0e\xec\x00\x00\x00\x00\x00\x01\x00\x00\xc8\xeb\
+\x00\x00\x1b\x48\x00\x00\x00\x00\x00\x01\x00\x01\x61\x28\
+\x00\x00\x28\x68\x00\x00\x00\x00\x00\x01\x00\x01\xf8\x28\
+\x00\x00\x0a\x56\x00\x00\x00\x00\x00\x01\x00\x00\x8d\x02\
+\x00\x00\x12\x90\x00\x00\x00\x00\x00\x01\x00\x00\xf6\x83\
+\x00\x00\x1e\xc6\x00\x00\x00\x00\x00\x01\x00\x01\x8b\x5c\
+\x00\x00\x20\x48\x00\x00\x00\x00\x00\x01\x00\x01\x92\x17\
+\x00\x00\x2c\xa2\x00\x00\x00\x00\x00\x01\x00\x02\x1e\x6c\
+\x00\x00\x2e\xa6\x00\x00\x00\x00\x00\x01\x00\x02\x39\x3f\
+\x00\x00\x1b\x78\x00\x00\x00\x00\x00\x01\x00\x01\x62\xb8\
+\x00\x00\x15\x1e\x00\x00\x00\x00\x00\x01\x00\x01\x16\x5c\
+\x00\x00\x07\x3a\x00\x00\x00\x00\x00\x01\x00\x00\x63\xe4\
+\x00\x00\x21\x5e\x00\x00\x00\x00\x00\x01\x00\x01\xa4\x6f\
+\x00\x00\x19\x2e\x00\x00\x00\x00\x00\x01\x00\x01\x47\xcd\
+\x00\x00\x02\xc0\x00\x00\x00\x00\x00\x01\x00\x00\x33\xb8\
+\x00\x00\x27\x34\x00\x00\x00\x00\x00\x01\x00\x01\xeb\xec\
+\x00\x00\x2d\x1a\x00\x00\x00\x00\x00\x01\x00\x02\x23\xaf\
+\x00\x00\x04\x30\x00\x00\x00\x00\x00\x01\x00\x00\x45\xdc\
+\x00\x00\x28\xce\x00\x00\x00\x00\x00\x01\x00\x01\xfb\x51\
+\x00\x00\x05\xca\x00\x00\x00\x00\x00\x01\x00\x00\x56\x03\
+\x00\x00\x0b\x18\x00\x00\x00\x00\x00\x01\x00\x00\x96\xef\
+\x00\x00\x23\x7a\x00\x00\x00\x00\x00\x01\x00\x01\xbb\xb9\
+\x00\x00\x01\xda\x00\x00\x00\x00\x00\x01\x00\x00\x2c\x7b\
+\x00\x00\x13\x90\x00\x00\x00\x00\x00\x01\x00\x01\x05\x7a\
+\x00\x00\x15\xfe\x00\x00\x00\x00\x00\x01\x00\x01\x23\x96\
+\x00\x00\x2c\xe2\x00\x00\x00\x00\x00\x01\x00\x02\x22\x0c\
+\x00\x00\x06\x5a\x00\x00\x00\x00\x00\x01\x00\x00\x5b\xa0\
+\x00\x00\x1f\xf8\x00\x00\x00\x00\x00\x01\x00\x01\x91\x3d\
+\x00\x00\x17\x5e\x00\x00\x00\x00\x00\x01\x00\x01\x31\x04\
+\x00\x00\x18\x0e\x00\x00\x00\x00\x00\x01\x00\x01\x3a\xe9\
+\x00\x00\x26\xf6\x00\x00\x00\x00\x00\x01\x00\x01\xea\x65\
+\x00\x00\x2e\x18\x00\x00\x00\x00\x00\x01\x00\x02\x2b\xca\
+\x00\x00\x16\x76\x00\x00\x00\x00\x00\x01\x00\x01\x2b\x29\
+\x00\x00\x07\x12\x00\x00\x00\x00\x00\x01\x00\x00\x5f\xdf\
+\x00\x00\x20\x72\x00\x00\x00\x00\x00\x01\x00\x01\x94\xdf\
+\x00\x00\x06\x2e\x00\x00\x00\x00\x00\x01\x00\x00\x57\xa8\
+\x00\x00\x2e\x70\x00\x00\x00\x00\x00\x01\x00\x02\x2c\x65\
+\x00\x00\x29\xa2\x00\x00\x00\x00\x00\x01\x00\x02\x04\xaf\
+\x00\x00\x0d\xe0\x00\x00\x00\x00\x00\x01\x00\x00\xc4\x8b\
+\x00\x00\x23\xb4\x00\x00\x00\x00\x00\x01\x00\x01\xbc\xc3\
+\x00\x00\x02\x44\x00\x00\x00\x00\x00\x01\x00\x00\x2f\xce\
+\x00\x00\x02\x84\x00\x00\x00\x00\x00\x01\x00\x00\x32\xad\
+\x00\x00\x1a\x28\x00\x00\x00\x00\x00\x01\x00\x01\x56\x61\
+\x00\x00\x24\xf2\x00\x00\x00\x00\x00\x01\x00\x01\xcc\x3a\
+\x00\x00\x24\x8a\x00\x00\x00\x00\x00\x01\x00\x01\xca\xfe\
+\x00\x00\x06\xba\x00\x00\x00\x00\x00\x01\x00\x00\x5e\xbb\
+\x00\x00\x08\x60\x00\x00\x00\x00\x00\x01\x00\x00\x72\x4a\
+\x00\x00\x01\xb2\x00\x00\x00\x00\x00\x01\x00\x00\x2a\x72\
+\x00\x00\x11\x6e\x00\x00\x00\x00\x00\x01\x00\x00\xe2\x5d\
+\x00\x00\x1f\xa0\x00\x00\x00\x00\x00\x01\x00\x01\x90\x75\
+\x00\x00\x08\xd6\x00\x00\x00\x00\x00\x01\x00\x00\x7f\xa1\
+\x00\x00\x18\x8a\x00\x00\x00\x00\x00\x01\x00\x01\x43\xc9\
+\x00\x00\x16\x3a\x00\x00\x00\x00\x00\x01\x00\x01\x24\x34\
+\x00\x00\x16\xc0\x00\x00\x00\x00\x00\x01\x00\x01\x2d\x33\
+\x00\x00\x23\xdc\x00\x00\x00\x00\x00\x01\x00\x01\xc1\x39\
+\x00\x00\x22\xea\x00\x00\x00\x00\x00\x01\x00\x01\xb1\x82\
+\x00\x00\x26\x86\x00\x00\x00\x00\x00\x01\x00\x01\xe5\x72\
+\x00\x00\x14\xec\x00\x00\x00\x00\x00\x01\x00\x01\x13\x80\
+\x00\x00\x0f\x4a\x00\x00\x00\x00\x00\x01\x00\x00\xce\xcb\
+\x00\x00\x22\xa6\x00\x00\x00\x00\x00\x01\x00\x01\xaf\xf7\
+\x00\x00\x26\x22\x00\x00\x00\x00\x00\x01\x00\x01\xd8\x81\
+\x00\x00\x0f\x22\x00\x00\x00\x00\x00\x01\x00\x00\xc9\xdd\
+\x00\x00\x1d\x76\x00\x00\x00\x00\x00\x01\x00\x01\x74\x2a\
+\x00\x00\x21\x30\x00\x00\x00\x00\x00\x01\x00\x01\xa2\x41\
+\x00\x00\x14\xbe\x00\x00\x00\x00\x00\x01\x00\x01\x11\x55\
+\x00\x00\x08\x26\x00\x00\x00\x00\x00\x01\x00\x00\x6e\xe4\
+\x00\x00\x21\xca\x00\x00\x00\x00\x00\x01\x00\x01\xa6\xad\
+\x00\x00\x23\x22\x00\x00\x00\x00\x00\x01\x00\x01\xb4\xd4\
+\x00\x00\x0f\xec\x00\x00\x00\x00\x00\x01\x00\x00\xd6\x48\
+\x00\x00\x1c\x82\x00\x00\x00\x00\x00\x01\x00\x01\x6a\x9e\
+\x00\x00\x18\xfe\x00\x00\x00\x00\x00\x01\x00\x01\x47\x43\
+\x00\x00\x2b\x6e\x00\x00\x00\x00\x00\x01\x00\x02\x15\x4a\
+\x00\x00\x2c\x6e\x00\x00\x00\x00\x00\x01\x00\x02\x1d\xc7\
+\x00\x00\x2d\x60\x00\x00\x00\x00\x00\x01\x00\x02\x24\x4a\
+\x00\x00\x2d\x94\x00\x00\x00\x00\x00\x01\x00\x02\x24\xd5\
+\x00\x00\x26\xce\x00\x00\x00\x00\x00\x01\x00\x01\xe8\xd4\
+\x00\x00\x11\x0a\x00\x00\x00\x00\x00\x01\x00\x00\xe0\xfe\
+\x00\x00\x29\x6e\x00\x00\x00\x00\x00\x01\x00\x01\xff\xc4\
+\x00\x00\x00\xf2\x00\x00\x00\x00\x00\x01\x00\x00\x1f\x99\
+\x00\x00\x10\x96\x00\x00\x00\x00\x00\x01\x00\x00\xdb\x7f\
+\x00\x00\x0e\x6c\x00\x00\x00\x00\x00\x01\x00\x00\xc7\xd2\
+\x00\x00\x25\x4a\x00\x00\x00\x00\x00\x01\x00\x01\xcf\xcd\
+\x00\x00\x0f\xbc\x00\x00\x00\x00\x00\x01\x00\x00\xd4\x1f\
+\x00\x00\x0b\xe4\x00\x00\x00\x00\x00\x01\x00\x00\xaf\x31\
+\x00\x00\x09\xa8\x00\x00\x00\x00\x00\x01\x00\x00\x87\xb4\
+\x00\x00\x08\x9e\x00\x00\x00\x00\x00\x01\x00\x00\x72\xc7\
+\x00\x00\x17\x1c\x00\x00\x00\x00\x00\x01\x00\x01\x30\x76\
+\x00\x00\x0a\xde\x00\x00\x00\x00\x00\x01\x00\x00\x95\xf5\
+\x00\x00\x12\x6c\x00\x00\x00\x00\x00\x01\x00\x00\xf6\x17\
+\x00\x00\x02\xf8\x00\x00\x00\x00\x00\x01\x00\x00\x34\x42\
+\x00\x00\x22\x0e\x00\x00\x00\x00\x00\x01\x00\x01\xaa\x03\
+\x00\x00\x1a\x8e\x00\x00\x00\x00\x00\x01\x00\x01\x5b\x5d\
+\x00\x00\x0e\x02\x00\x00\x00\x00\x00\x01\x00\x00\xc6\xbd\
+\x00\x00\x00\x9e\x00\x00\x00\x00\x00\x01\x00\x00\x1f\x0d\
+\x00\x00\x18\xc4\x00\x00\x00\x00\x00\x01\x00\x01\x46\xb8\
+\x00\x00\x24\x0a\x00\x00\x00\x00\x00\x01\x00\x01\xc4\x9e\
+\x00\x00\x04\x72\x00\x00\x00\x00\x00\x01\x00\x00\x47\x31\
+\x00\x00\x2a\xa4\x00\x00\x00\x00\x00\x01\x00\x02\x11\x25\
+\x00\x00\x2a\x38\x00\x00\x00\x00\x00\x01\x00\x02\x0a\x43\
+\x00\x00\x02\x10\x00\x00\x00\x00\x00\x01\x00\x00\x2e\x25\
+\x00\x00\x20\xfc\x00\x00\x00\x00\x00\x01\x00\x01\xa0\x76\
+\x00\x00\x12\x30\x00\x00\x00\x00\x00\x01\x00\x00\xf1\x9c\
+\x00\x00\x0a\x20\x00\x00\x00\x00\x00\x01\x00\x00\x88\xcc\
+\x00\x00\x04\xdc\x00\x00\x00\x00\x00\x01\x00\x00\x4a\x76\
+\x00\x00\x12\xf8\x00\x00\x00\x00\x00\x01\x00\x01\x02\x0e\
+\x00\x00\x10\x60\x00\x00\x00\x00\x00\x01\x00\x00\xdb\x13\
+\x00\x00\x07\x6e\x00\x00\x00\x00\x00\x01\x00\x00\x64\x50\
+\x00\x00\x03\xdc\x00\x00\x00\x00\x00\x01\x00\x00\x44\xa3\
+\x00\x00\x1d\xe4\x00\x00\x00\x00\x00\x01\x00\x01\x7d\x1d\
+\x00\x00\x24\x50\x00\x00\x00\x00\x00\x01\x00\x01\xc5\xc2\
+\x00\x00\x10\xc2\x00\x00\x00\x00\x00\x01\x00\x00\xe0\x6b\
+\x00\x00\x00\x6a\x00\x00\x00\x00\x00\x01\x00\x00\x1a\xaa\
+\x00\x00\x01\x6c\x00\x00\x00\x00\x00\x01\x00\x00\x25\x38\
+\x00\x00\x15\x9c\x00\x00\x00\x00\x00\x01\x00\x01\x1e\x29\
+\x00\x00\x0c\x90\x00\x00\x00\x00\x00\x01\x00\x00\xb0\xe3\
+\x00\x00\x29\x4a\x00\x00\x00\x00\x00\x01\x00\x01\xfd\x9e\
+\x00\x00\x2b\xda\x00\x00\x00\x00\x00\x01\x00\x02\x1b\xa2\
+\x00\x00\x0d\x70\x00\x00\x00\x00\x00\x01\x00\x00\xc3\x1b\
+\x00\x00\x0b\x78\x00\x00\x00\x00\x00\x01\x00\x00\x97\xf3\
+\x00\x00\x29\xe2\x00\x00\x00\x00\x00\x01\x00\x02\x09\xa8\
+\x00\x00\x1c\xee\x00\x00\x00\x00\x00\x01\x00\x01\x72\x8a\
+\x00\x00\x0f\x84\x00\x00\x00\x00\x00\x01\x00\x00\xd0\xe7\
+\x00\x00\x12\xc6\x00\x00\x00\x00\x00\x01\x00\x00\xf9\x9e\
+\x00\x00\x25\x82\x00\x00\x00\x00\x00\x01\x00\x01\xd4\x54\
+\x00\x00\x1f\x66\x00\x00\x00\x00\x00\x01\x00\x01\x8d\x15\
+\x00\x00\x14\x8e\x00\x00\x00\x00\x00\x01\x00\x01\x0c\x69\
+\x00\x00\x28\x0e\x00\x00\x00\x00\x00\x01\x00\x01\xf7\x5c\
+\x00\x00\x0d\xa2\x00\x00\x00\x00\x00\x01\x00\x00\xc3\xb7\
+\x00\x00\x0e\x36\x00\x00\x00\x00\x00\x01\x00\x00\xc7\x59\
+\x00\x00\x2b\x1c\x00\x00\x00\x00\x00\x01\x00\x02\x14\x12\
+\x00\x00\x2b\xa6\x00\x00\x00\x00\x00\x01\x00\x02\x19\x7c\
+\x00\x00\x00\x32\x00\x02\x00\x00\x00\x01\x00\x00\x00\xd6\
+\x00\x00\x00\x40\x00\x01\x00\x00\x00\x01\x00\x00\x00\x00\
+"
+
+qt_resource_struct_v2 = b"\
+\x00\x00\x00\x00\x00\x02\x00\x00\x00\x02\x00\x00\x00\x01\
+\x00\x00\x00\x00\x00\x00\x00\x00\
+\x00\x00\x00\x18\x00\x02\x00\x00\x00\x01\x00\x00\x00\xd5\
+\x00\x00\x00\x00\x00\x00\x00\x00\
+\x00\x00\x00\x00\x00\x02\x00\x00\x00\x01\x00\x00\x00\x03\
+\x00\x00\x00\x00\x00\x00\x00\x00\
+\x00\x00\x00\x32\x00\x02\x00\x00\x00\x01\x00\x00\x00\x04\
+\x00\x00\x00\x00\x00\x00\x00\x00\
+\x00\x00\x00\x60\x00\x02\x00\x00\x00\xd0\x00\x00\x00\x05\
+\x00\x00\x00\x00\x00\x00\x00\x00\
+\x00\x00\x18\x4c\x00\x00\x00\x00\x00\x01\x00\x01\x3b\x76\
+\x00\x00\x01\x81\x15\x91\x87\xb0\
+\x00\x00\x07\xe8\x00\x00\x00\x00\x00\x01\x00\x00\x68\x2b\
+\x00\x00\x01\x81\x15\x91\x88\x41\
+\x00\x00\x0d\x0e\x00\x00\x00\x00\x00\x01\x00\x00\xb6\x47\
+\x00\x00\x01\x81\x15\x91\x87\x94\
+\x00\x00\x25\xea\x00\x00\x00\x00\x00\x01\x00\x01\xd7\xaf\
+\x00\x00\x01\x81\x15\x91\x86\x7f\
+\x00\x00\x13\x62\x00\x00\x00\x00\x00\x01\x00\x01\x04\xe1\
+\x00\x00\x01\x81\x15\x91\x84\xf5\
+\x00\x00\x03\x52\x00\x00\x00\x00\x00\x01\x00\x00\x41\xeb\
+\x00\x00\x01\x81\x15\x91\x86\x9e\
+\x00\x00\x2c\x2c\x00\x00\x00\x00\x00\x01\x00\x02\x1c\x30\
+\x00\x00\x01\x81\x15\x91\x85\x87\
+\x00\x00\x25\xc4\x00\x00\x00\x00\x00\x01\x00\x01\xd4\xe1\
+\x00\x00\x01\x81\x15\x91\x86\x4c\
+\x00\x00\x0b\x4e\x00\x00\x00\x00\x00\x01\x00\x00\x97\x7a\
+\x00\x00\x01\x81\x15\x91\x88\x2e\
+\x00\x00\x09\xec\x00\x00\x00\x00\x00\x01\x00\x00\x88\x43\
+\x00\x00\x01\x81\x15\x91\x85\xba\
+\x00\x00\x26\x62\x00\x00\x00\x00\x00\x01\x00\x01\xe3\xbc\
+\x00\x00\x01\x81\x15\x91\x86\x5c\
+\x00\x00\x1a\xfe\x00\x00\x00\x00\x00\x01\x00\x01\x60\x51\
+\x00\x00\x01\x81\x15\x91\x87\xe7\
+\x00\x00\x2a\x68\x00\x00\x00\x00\x00\x01\x00\x02\x0e\x25\
+\x00\x00\x01\x81\x15\x91\x88\x51\
+\x00\x00\x23\x4e\x00\x00\x00\x00\x00\x01\x00\x01\xb5\x50\
+\x00\x00\x01\x81\x15\x91\x88\x3d\
+\x00\x00\x24\x2c\x00\x00\x00\x00\x00\x01\x00\x01\xc5\x39\
+\x00\x00\x01\x81\x15\x91\x85\x07\
+\x00\x00\x2e\xd4\x00\x00\x00\x00\x00\x01\x00\x02\x3b\x4e\
+\x00\x00\x01\x81\x15\x91\x86\x7c\
+\x00\x00\x0a\xa6\x00\x00\x00\x00\x00\x01\x00\x00\x90\xe9\
+\x00\x00\x01\x81\x15\x91\x85\xd5\
+\x00\x00\x29\x0c\x00\x00\x00\x00\x00\x01\x00\x01\xfc\x4d\
+\x00\x00\x01\x81\x15\x91\x88\x67\
+\x00\x00\x15\x4e\x00\x00\x00\x00\x00\x01\x00\x01\x17\x04\
+\x00\x00\x01\x81\x15\x91\x86\xbe\
+\x00\x00\x0c\xc4\x00\x00\x00\x00\x00\x01\x00\x00\xb5\xb7\
+\x00\x00\x01\x81\x15\x91\x86\x10\
+\x00\x00\x1a\xcc\x00\x00\x00\x00\x00\x01\x00\x01\x5e\xc4\
+\x00\x00\x01\x81\x15\x91\x85\x6a\
+\x00\x00\x01\x32\x00\x00\x00\x00\x00\x01\x00\x00\x23\x58\
+\x00\x00\x01\x81\x15\x91\x85\x54\
+\x00\x00\x11\xb4\x00\x00\x00\x00\x00\x01\x00\x00\xe4\x33\
+\x00\x00\x01\x81\x15\x91\x86\xbe\
+\x00\x00\x27\x86\x00\x00\x00\x00\x00\x01\x00\x01\xef\xdb\
+\x00\x00\x01\x81\x15\x91\x85\xda\
+\x00\x00\x06\x00\x00\x00\x00\x00\x00\x01\x00\x00\x56\xae\
+\x00\x00\x01\x81\x15\x91\x87\x84\
+\x00\x00\x05\x82\x00\x00\x00\x00\x00\x01\x00\x00\x55\x3f\
+\x00\x00\x01\x81\x15\x91\x88\x17\
+\x00\x00\x19\xbe\x00\x00\x00\x00\x00\x01\x00\x01\x54\x5c\
+\x00\x00\x01\x81\x15\x91\x86\xec\
+\x00\x00\x10\x24\x00\x00\x00\x00\x00\x01\x00\x00\xda\x1f\
+\x00\x00\x01\x81\x15\x91\x86\xfc\
+\x00\x00\x21\x90\x00\x00\x00\x00\x00\x01\x00\x01\xa5\xba\
+\x00\x00\x01\x81\x15\x91\x87\x0c\
+\x00\x00\x1c\x4c\x00\x00\x00\x00\x00\x01\x00\x01\x67\xc0\
+\x00\x00\x01\x81\x15\x91\x88\x57\
+\x00\x00\x19\x7a\x00\x00\x00\x00\x00\x01\x00\x01\x4b\x73\
+\x00\x00\x01\x81\x15\x91\x87\xaa\
+\x00\x00\x05\x44\x00\x00\x00\x00\x00\x01\x00\x00\x52\x7b\
+\x00\x00\x01\x81\x15\x91\x85\x54\
+\x00\x00\x09\x6e\x00\x00\x00\x00\x00\x01\x00\x00\x83\x3b\
+\x00\x00\x01\x81\x15\x91\x86\xae\
+\x00\x00\x2d\xb2\x00\x00\x00\x00\x00\x01\x00\x02\x26\xe6\
+\x00\x00\x01\x81\x15\x91\x88\x33\
+\x00\x00\x24\xc2\x00\x00\x00\x00\x00\x01\x00\x01\xcb\xce\
+\x00\x00\x01\x81\x15\x91\x86\x4c\
+\x00\x00\x1d\x2a\x00\x00\x00\x00\x00\x01\x00\x01\x73\x06\
+\x00\x00\x01\x81\x15\x91\x87\xfb\
+\x00\x00\x06\x88\x00\x00\x00\x00\x00\x01\x00\x00\x5e\x2e\
+\x00\x00\x01\x81\x15\x91\x87\x75\
+\x00\x00\x0d\x3c\x00\x00\x00\x00\x00\x01\x00\x00\xc0\xd9\
+\x00\x00\x01\x81\x15\x91\x84\x9c\
+\x00\x00\x20\xb0\x00\x00\x00\x00\x00\x01\x00\x01\x9f\xd7\
+\x00\x00\x01\x81\x15\x91\x85\xf9\
+\x00\x00\x04\xa6\x00\x00\x00\x00\x00\x01\x00\x00\x48\xc0\
+\x00\x00\x01\x81\x15\x91\x86\x5c\
+\x00\x00\x1f\x0a\x00\x00\x00\x00\x00\x01\x00\x01\x8b\xeb\
+\x00\x00\x01\x81\x15\x91\x88\x13\
+\x00\x00\x22\x62\x00\x00\x00\x00\x00\x01\x00\x01\xaa\xcc\
+\x00\x00\x01\x81\x15\x91\x87\x4e\
+\x00\x00\x14\x00\x00\x00\x00\x00\x00\x01\x00\x01\x0a\xcd\
+\x00\x00\x01\x81\x15\x91\x85\xf9\
+\x00\x00\x03\x8a\x00\x00\x00\x00\x00\x01\x00\x00\x44\x0a\
+\x00\x00\x01\x81\x15\x91\x86\x2b\
+\x00\x00\x14\x4e\x00\x00\x00\x00\x00\x01\x00\x01\x0b\x6c\
+\x00\x00\x01\x81\x15\x91\x87\x88\
+\x00\x00\x11\xee\x00\x00\x00\x00\x00\x01\x00\x00\xe8\xc1\
+\x00\x00\x01\x81\x15\x91\x87\xb5\
+\x00\x00\x1e\x52\x00\x00\x00\x00\x00\x01\x00\x01\x87\xf8\
+\x00\x00\x01\x81\x15\x91\x86\xec\
+\x00\x00\x17\xd0\x00\x00\x00\x00\x00\x01\x00\x01\x37\x5c\
+\x00\x00\x01\x81\x15\x91\x88\x7c\
+\x00\x00\x09\x2a\x00\x00\x00\x00\x00\x01\x00\x00\x81\xe7\
+\x00\x00\x01\x81\x15\x91\x88\x62\
+\x00\x00\x28\x9e\x00\x00\x00\x00\x00\x01\x00\x01\xf9\x30\
+\x00\x00\x01\x81\x15\x91\x84\x9c\
+\x00\x00\x27\xc4\x00\x00\x00\x00\x00\x01\x00\x01\xf3\xf4\
+\x00\x00\x01\x81\x15\x91\x87\x69\
+\x00\x00\x1d\xb2\x00\x00\x00\x00\x00\x01\x00\x01\x78\x31\
+\x00\x00\x01\x81\x15\x91\x84\xbb\
+\x00\x00\x2d\xee\x00\x00\x00\x00\x00\x01\x00\x02\x27\x5f\
+\x00\x00\x01\x81\x15\x91\x86\xae\
+\x00\x00\x16\xf2\x00\x00\x00\x00\x00\x01\x00\x01\x2f\x6e\
+\x00\x00\x01\x81\x15\x91\x87\x0c\
+\x00\x00\x1c\xa2\x00\x00\x00\x00\x00\x01\x00\x01\x6f\x8a\
+\x00\x00\x01\x81\x15\x91\x86\xfc\
+\x00\x00\x15\x72\x00\x00\x00\x00\x00\x01\x00\x01\x1a\xf8\
+\x00\x00\x01\x81\x15\x91\x87\x0c\
+\x00\x00\x13\xc6\x00\x00\x00\x00\x00\x01\x00\x01\x07\x9f\
+\x00\x00\x01\x81\x15\x91\x86\xec\
+\x00\x00\x05\x10\x00\x00\x00\x00\x00\x01\x00\x00\x4e\x5a\
+\x00\x00\x01\x81\x15\x91\x86\xcd\
+\x00\x00\x1e\x8c\x00\x00\x00\x00\x00\x01\x00\x01\x88\xc9\
+\x00\x00\x01\x81\x15\x91\x85\x52\
+\x00\x00\x17\x9a\x00\x00\x00\x00\x00\x01\x00\x01\x34\x70\
+\x00\x00\x01\x81\x15\x91\x86\x5c\
+\x00\x00\x1b\xc4\x00\x00\x00\x00\x00\x01\x00\x01\x64\xdd\
+\x00\x00\x01\x81\x15\x91\x84\xcb\
+\x00\x00\x11\x46\x00\x00\x00\x00\x00\x01\x00\x00\xe1\xd4\
+\x00\x00\x01\x81\x15\x91\x85\xa9\
+\x00\x00\x07\xae\x00\x00\x00\x00\x00\x01\x00\x00\x67\xb2\
+\x00\x00\x01\x81\x15\x91\x88\x39\
+\x00\x00\x03\x2c\x00\x00\x00\x00\x00\x01\x00\x00\x35\x11\
+\x00\x00\x01\x81\x15\x91\x86\xcd\
+\x00\x00\x0e\xa4\x00\x00\x00\x00\x00\x01\x00\x00\xc8\x4d\
+\x00\x00\x01\x81\x15\x91\x85\xf9\
+\x00\x00\x19\xe6\x00\x00\x00\x00\x00\x01\x00\x01\x55\x2d\
+\x00\x00\x01\x81\x15\x91\x87\xc3\
+\x00\x00\x1a\x62\x00\x00\x00\x00\x00\x01\x00\x01\x5a\x91\
+\x00\x00\x01\x81\x15\x91\x86\x6b\
+\x00\x00\x0b\xb2\x00\x00\x00\x00\x00\x01\x00\x00\xa2\x57\
+\x00\x00\x01\x81\x15\x91\x86\xdd\
+\x00\x00\x0c\x42\x00\x00\x00\x00\x00\x01\x00\x00\xb0\x58\
+\x00\x00\x01\x81\x15\x91\x86\x3d\
+\x00\x00\x2a\xce\x00\x00\x00\x00\x00\x01\x00\x02\x13\x3d\
+\x00\x00\x01\x81\x15\x91\x87\xec\
+\x00\x00\x15\xd0\x00\x00\x00\x00\x00\x01\x00\x01\x20\x5a\
+\x00\x00\x01\x81\x15\x91\x86\xdd\
+\x00\x00\x1b\xfe\x00\x00\x00\x00\x00\x01\x00\x01\x66\x8b\
+\x00\x00\x01\x81\x15\x91\x87\xd5\
+\x00\x00\x1c\xcc\x00\x00\x00\x00\x00\x01\x00\x01\x70\x7c\
+\x00\x00\x01\x81\x15\x91\x84\x48\
+\x00\x00\x13\x30\x00\x00\x00\x00\x00\x01\x00\x01\x02\x9f\
+\x00\x00\x01\x81\x15\x91\x84\x87\
+\x00\x00\x09\x06\x00\x00\x00\x00\x00\x01\x00\x00\x81\x3d\
+\x00\x00\x01\x81\x15\x91\x85\x1a\
+\x00\x00\x1e\x1c\x00\x00\x00\x00\x00\x01\x00\x01\x83\x9c\
+\x00\x00\x01\x81\x15\x91\x86\xbe\
+\x00\x00\x25\x26\x00\x00\x00\x00\x00\x01\x00\x01\xce\x35\
+\x00\x00\x01\x81\x15\x91\x85\x2e\
+\x00\x00\x0e\xec\x00\x00\x00\x00\x00\x01\x00\x00\xc8\xeb\
+\x00\x00\x01\x81\x15\x91\x86\xfc\
+\x00\x00\x1b\x48\x00\x00\x00\x00\x00\x01\x00\x01\x61\x28\
+\x00\x00\x01\x81\x15\x91\x85\x34\
+\x00\x00\x28\x68\x00\x00\x00\x00\x00\x01\x00\x01\xf8\x28\
+\x00\x00\x01\x81\x15\x91\x87\x0c\
+\x00\x00\x0a\x56\x00\x00\x00\x00\x00\x01\x00\x00\x8d\x02\
+\x00\x00\x01\x81\x15\x91\x87\x61\
+\x00\x00\x12\x90\x00\x00\x00\x00\x00\x01\x00\x00\xf6\x83\
+\x00\x00\x01\x81\x15\x91\x87\x23\
+\x00\x00\x1e\xc6\x00\x00\x00\x00\x00\x01\x00\x01\x8b\x5c\
+\x00\x00\x01\x81\x15\x91\x86\x13\
+\x00\x00\x20\x48\x00\x00\x00\x00\x00\x01\x00\x01\x92\x17\
+\x00\x00\x01\x81\x15\x91\x88\x4e\
+\x00\x00\x2c\xa2\x00\x00\x00\x00\x00\x01\x00\x02\x1e\x6c\
+\x00\x00\x01\x81\x15\x91\x88\x75\
+\x00\x00\x2e\xa6\x00\x00\x00\x00\x00\x01\x00\x02\x39\x3f\
+\x00\x00\x01\x81\x15\x91\x84\x65\
+\x00\x00\x1b\x78\x00\x00\x00\x00\x00\x01\x00\x01\x62\xb8\
+\x00\x00\x01\x81\x15\x91\x85\x54\
+\x00\x00\x15\x1e\x00\x00\x00\x00\x00\x01\x00\x01\x16\x5c\
+\x00\x00\x01\x81\x15\x91\x85\x27\
+\x00\x00\x07\x3a\x00\x00\x00\x00\x00\x01\x00\x00\x63\xe4\
+\x00\x00\x01\x81\x15\x91\x86\x4c\
+\x00\x00\x21\x5e\x00\x00\x00\x00\x00\x01\x00\x01\xa4\x6f\
+\x00\x00\x01\x81\x15\x91\x88\x5e\
+\x00\x00\x19\x2e\x00\x00\x00\x00\x00\x01\x00\x01\x47\xcd\
+\x00\x00\x01\x81\x15\x91\x87\x5d\
+\x00\x00\x02\xc0\x00\x00\x00\x00\x00\x01\x00\x00\x33\xb8\
+\x00\x00\x01\x81\x15\x91\x85\xbd\
+\x00\x00\x27\x34\x00\x00\x00\x00\x00\x01\x00\x01\xeb\xec\
+\x00\x00\x01\x81\x15\x91\x87\x58\
+\x00\x00\x2d\x1a\x00\x00\x00\x00\x00\x01\x00\x02\x23\xaf\
+\x00\x00\x01\x81\x15\x91\x86\x1f\
+\x00\x00\x04\x30\x00\x00\x00\x00\x00\x01\x00\x00\x45\xdc\
+\x00\x00\x01\x81\x15\x91\x88\x6b\
+\x00\x00\x28\xce\x00\x00\x00\x00\x00\x01\x00\x01\xfb\x51\
+\x00\x00\x01\x81\x15\x91\x87\x90\
+\x00\x00\x05\xca\x00\x00\x00\x00\x00\x01\x00\x00\x56\x03\
+\x00\x00\x01\x81\x15\x91\x85\x1d\
+\x00\x00\x0b\x18\x00\x00\x00\x00\x00\x01\x00\x00\x96\xef\
+\x00\x00\x01\x81\x15\x91\x85\x0a\
+\x00\x00\x23\x7a\x00\x00\x00\x00\x00\x01\x00\x01\xbb\xb9\
+\x00\x00\x01\x81\x15\x91\x87\x0c\
+\x00\x00\x01\xda\x00\x00\x00\x00\x00\x01\x00\x00\x2c\x7b\
+\x00\x00\x01\x81\x15\x91\x85\x31\
+\x00\x00\x13\x90\x00\x00\x00\x00\x00\x01\x00\x01\x05\x7a\
+\x00\x00\x01\x81\x15\x91\x84\x8c\
+\x00\x00\x15\xfe\x00\x00\x00\x00\x00\x01\x00\x01\x23\x96\
+\x00\x00\x01\x81\x15\x91\x85\xe9\
+\x00\x00\x2c\xe2\x00\x00\x00\x00\x00\x01\x00\x02\x22\x0c\
+\x00\x00\x01\x81\x15\x91\x84\xdb\
+\x00\x00\x06\x5a\x00\x00\x00\x00\x00\x01\x00\x00\x5b\xa0\
+\x00\x00\x01\x81\x15\x91\x85\x46\
+\x00\x00\x1f\xf8\x00\x00\x00\x00\x00\x01\x00\x01\x91\x3d\
+\x00\x00\x01\x81\x15\x91\x87\xe3\
+\x00\x00\x17\x5e\x00\x00\x00\x00\x00\x01\x00\x01\x31\x04\
+\x00\x00\x01\x81\x15\x91\x87\x1b\
+\x00\x00\x18\x0e\x00\x00\x00\x00\x00\x01\x00\x01\x3a\xe9\
+\x00\x00\x01\x81\x15\x91\x87\x7d\
+\x00\x00\x26\xf6\x00\x00\x00\x00\x00\x01\x00\x01\xea\x65\
+\x00\x00\x01\x81\x15\x91\x85\x7d\
+\x00\x00\x2e\x18\x00\x00\x00\x00\x00\x01\x00\x02\x2b\xca\
+\x00\x00\x01\x81\x15\x91\x86\x28\
+\x00\x00\x16\x76\x00\x00\x00\x00\x00\x01\x00\x01\x2b\x29\
+\x00\x00\x01\x81\x15\x91\x85\x54\
+\x00\x00\x07\x12\x00\x00\x00\x00\x00\x01\x00\x00\x5f\xdf\
+\x00\x00\x01\x81\x15\x91\x86\x9e\
+\x00\x00\x20\x72\x00\x00\x00\x00\x00\x01\x00\x01\x94\xdf\
+\x00\x00\x01\x81\x15\x91\x87\xa3\
+\x00\x00\x06\x2e\x00\x00\x00\x00\x00\x01\x00\x00\x57\xa8\
+\x00\x00\x01\x81\x15\x91\x85\xda\
+\x00\x00\x2e\x70\x00\x00\x00\x00\x00\x01\x00\x02\x2c\x65\
+\x00\x00\x01\x81\x15\x91\x86\xdd\
+\x00\x00\x29\xa2\x00\x00\x00\x00\x00\x01\x00\x02\x04\xaf\
+\x00\x00\x01\x81\x15\x91\x87\x48\
+\x00\x00\x0d\xe0\x00\x00\x00\x00\x00\x01\x00\x00\xc4\x8b\
+\x00\x00\x01\x81\x15\x91\x84\x7c\
+\x00\x00\x23\xb4\x00\x00\x00\x00\x00\x01\x00\x01\xbc\xc3\
+\x00\x00\x01\x81\x15\x91\x86\xae\
+\x00\x00\x02\x44\x00\x00\x00\x00\x00\x01\x00\x00\x2f\xce\
+\x00\x00\x01\x81\x15\x91\x85\x4f\
+\x00\x00\x02\x84\x00\x00\x00\x00\x00\x01\x00\x00\x32\xad\
+\x00\x00\x01\x81\x15\x91\x87\x0c\
+\x00\x00\x1a\x28\x00\x00\x00\x00\x00\x01\x00\x01\x56\x61\
+\x00\x00\x01\x81\x15\x91\x86\x9e\
+\x00\x00\x24\xf2\x00\x00\x00\x00\x00\x01\x00\x01\xcc\x3a\
+\x00\x00\x01\x81\x15\x91\x86\x8f\
+\x00\x00\x24\x8a\x00\x00\x00\x00\x00\x01\x00\x01\xca\xfe\
+\x00\x00\x01\x81\x15\x91\x86\xfc\
+\x00\x00\x06\xba\x00\x00\x00\x00\x00\x01\x00\x00\x5e\xbb\
+\x00\x00\x01\x81\x15\x91\x88\x0d\
+\x00\x00\x08\x60\x00\x00\x00\x00\x00\x01\x00\x00\x72\x4a\
+\x00\x00\x01\x81\x15\x91\x85\x93\
+\x00\x00\x01\xb2\x00\x00\x00\x00\x00\x01\x00\x00\x2a\x72\
+\x00\x00\x01\x81\x15\x91\x86\x7f\
+\x00\x00\x11\x6e\x00\x00\x00\x00\x00\x01\x00\x00\xe2\x5d\
+\x00\x00\x01\x81\x15\x91\x85\x54\
+\x00\x00\x1f\xa0\x00\x00\x00\x00\x00\x01\x00\x01\x90\x75\
+\x00\x00\x01\x81\x15\x91\x88\x2b\
+\x00\x00\x08\xd6\x00\x00\x00\x00\x00\x01\x00\x00\x7f\xa1\
+\x00\x00\x01\x81\x15\x91\x86\x6b\
+\x00\x00\x18\x8a\x00\x00\x00\x00\x00\x01\x00\x01\x43\xc9\
+\x00\x00\x01\x81\x15\x91\x88\x5b\
+\x00\x00\x16\x3a\x00\x00\x00\x00\x00\x01\x00\x01\x24\x34\
+\x00\x00\x01\x81\x15\x91\x88\x4a\
+\x00\x00\x16\xc0\x00\x00\x00\x00\x00\x01\x00\x01\x2d\x33\
+\x00\x00\x01\x81\x15\x91\x84\x72\
+\x00\x00\x23\xdc\x00\x00\x00\x00\x00\x01\x00\x01\xc1\x39\
+\x00\x00\x01\x81\x15\x91\x88\x70\
+\x00\x00\x22\xea\x00\x00\x00\x00\x00\x01\x00\x01\xb1\x82\
+\x00\x00\x01\x81\x15\x91\x87\x66\
+\x00\x00\x26\x86\x00\x00\x00\x00\x00\x01\x00\x01\xe5\x72\
+\x00\x00\x01\x81\x15\x91\x87\x72\
+\x00\x00\x14\xec\x00\x00\x00\x00\x00\x01\x00\x01\x13\x80\
+\x00\x00\x01\x81\x15\x91\x86\x5c\
+\x00\x00\x0f\x4a\x00\x00\x00\x00\x00\x01\x00\x00\xce\xcb\
+\x00\x00\x01\x81\x15\x91\x86\x8f\
+\x00\x00\x22\xa6\x00\x00\x00\x00\x00\x01\x00\x01\xaf\xf7\
+\x00\x00\x01\x81\x15\x91\x85\x74\
+\x00\x00\x26\x22\x00\x00\x00\x00\x00\x01\x00\x01\xd8\x81\
+\x00\x00\x01\x81\x15\x91\x87\x99\
+\x00\x00\x0f\x22\x00\x00\x00\x00\x00\x01\x00\x00\xc9\xdd\
+\x00\x00\x01\x81\x15\x91\x85\xc6\
+\x00\x00\x1d\x76\x00\x00\x00\x00\x00\x01\x00\x01\x74\x2a\
+\x00\x00\x01\x81\x15\x91\x85\xe9\
+\x00\x00\x21\x30\x00\x00\x00\x00\x00\x01\x00\x01\xa2\x41\
+\x00\x00\x01\x81\x15\x91\x84\xac\
+\x00\x00\x14\xbe\x00\x00\x00\x00\x00\x01\x00\x01\x11\x55\
+\x00\x00\x01\x81\x15\x91\x84\x84\
+\x00\x00\x08\x26\x00\x00\x00\x00\x00\x01\x00\x00\x6e\xe4\
+\x00\x00\x01\x81\x15\x91\x88\x79\
+\x00\x00\x21\xca\x00\x00\x00\x00\x00\x01\x00\x01\xa6\xad\
+\x00\x00\x01\x81\x15\x91\x87\x6e\
+\x00\x00\x23\x22\x00\x00\x00\x00\x00\x01\x00\x01\xb4\xd4\
+\x00\x00\x01\x81\x15\x91\x85\x8b\
+\x00\x00\x0f\xec\x00\x00\x00\x00\x00\x01\x00\x00\xd6\x48\
+\x00\x00\x01\x81\x15\x91\x85\xda\
+\x00\x00\x1c\x82\x00\x00\x00\x00\x00\x01\x00\x01\x6a\x9e\
+\x00\x00\x01\x81\x15\x91\x84\xac\
+\x00\x00\x18\xfe\x00\x00\x00\x00\x00\x01\x00\x01\x47\x43\
+\x00\x00\x01\x81\x15\x91\x85\x0d\
+\x00\x00\x2b\x6e\x00\x00\x00\x00\x00\x01\x00\x02\x15\x4a\
+\x00\x00\x01\x81\x15\x91\x86\x9e\
+\x00\x00\x2c\x6e\x00\x00\x00\x00\x00\x01\x00\x02\x1d\xc7\
+\x00\x00\x01\x81\x15\x91\x85\x2a\
+\x00\x00\x2d\x60\x00\x00\x00\x00\x00\x01\x00\x02\x24\x4a\
+\x00\x00\x01\x81\x15\x91\x85\x17\
+\x00\x00\x2d\x94\x00\x00\x00\x00\x00\x01\x00\x02\x24\xd5\
+\x00\x00\x01\x81\x15\x91\x84\x9c\
+\x00\x00\x26\xce\x00\x00\x00\x00\x00\x01\x00\x01\xe8\xd4\
+\x00\x00\x01\x81\x15\x91\x84\xcb\
+\x00\x00\x11\x0a\x00\x00\x00\x00\x00\x01\x00\x00\xe0\xfe\
+\x00\x00\x01\x81\x15\x91\x86\x7f\
+\x00\x00\x29\x6e\x00\x00\x00\x00\x00\x01\x00\x01\xff\xc4\
+\x00\x00\x01\x81\x15\x91\x87\x3e\
+\x00\x00\x00\xf2\x00\x00\x00\x00\x00\x01\x00\x00\x1f\x99\
+\x00\x00\x01\x81\x15\x91\x87\x53\
+\x00\x00\x10\x96\x00\x00\x00\x00\x00\x01\x00\x00\xdb\x7f\
+\x00\x00\x01\x81\x15\x91\x84\xbb\
+\x00\x00\x0e\x6c\x00\x00\x00\x00\x00\x01\x00\x00\xc7\xd2\
+\x00\x00\x01\x81\x15\x91\x85\x9c\
+\x00\x00\x25\x4a\x00\x00\x00\x00\x00\x01\x00\x01\xcf\xcd\
+\x00\x00\x01\x81\x15\x91\x86\xae\
+\x00\x00\x0f\xbc\x00\x00\x00\x00\x00\x01\x00\x00\xd4\x1f\
+\x00\x00\x01\x81\x15\x91\x84\x9c\
+\x00\x00\x0b\xe4\x00\x00\x00\x00\x00\x01\x00\x00\xaf\x31\
+\x00\x00\x01\x81\x15\x91\x88\x09\
+\x00\x00\x09\xa8\x00\x00\x00\x00\x00\x01\x00\x00\x87\xb4\
+\x00\x00\x01\x81\x15\x91\x87\x79\
+\x00\x00\x08\x9e\x00\x00\x00\x00\x00\x01\x00\x00\x72\xc7\
+\x00\x00\x01\x81\x15\x91\x86\xcd\
+\x00\x00\x17\x1c\x00\x00\x00\x00\x00\x01\x00\x01\x30\x76\
+\x00\x00\x01\x81\x15\x91\x87\x80\
+\x00\x00\x0a\xde\x00\x00\x00\x00\x00\x01\x00\x00\x95\xf5\
+\x00\x00\x01\x81\x15\x91\x87\x8c\
+\x00\x00\x12\x6c\x00\x00\x00\x00\x00\x01\x00\x00\xf6\x17\
+\x00\x00\x01\x81\x15\x91\x86\x3d\
+\x00\x00\x02\xf8\x00\x00\x00\x00\x00\x01\x00\x00\x34\x42\
+\x00\x00\x01\x81\x15\x91\x86\xfc\
+\x00\x00\x22\x0e\x00\x00\x00\x00\x00\x01\x00\x01\xaa\x03\
+\x00\x00\x01\x81\x15\x91\x88\x1f\
+\x00\x00\x1a\x8e\x00\x00\x00\x00\x00\x01\x00\x01\x5b\x5d\
+\x00\x00\x01\x81\x15\x91\x86\xec\
+\x00\x00\x0e\x02\x00\x00\x00\x00\x00\x01\x00\x00\xc6\xbd\
+\x00\x00\x01\x81\x15\x91\x84\xea\
+\x00\x00\x00\x9e\x00\x00\x00\x00\x00\x01\x00\x00\x1f\x0d\
+\x00\x00\x01\x81\x15\x91\x86\x2d\
+\x00\x00\x18\xc4\x00\x00\x00\x00\x00\x01\x00\x01\x46\xb8\
+\x00\x00\x01\x81\x15\x91\x85\xb1\
+\x00\x00\x24\x0a\x00\x00\x00\x00\x00\x01\x00\x01\xc4\x9e\
+\x00\x00\x01\x81\x15\x91\x84\xdb\
+\x00\x00\x04\x72\x00\x00\x00\x00\x00\x01\x00\x00\x47\x31\
+\x00\x00\x01\x81\x15\x91\x84\xdb\
+\x00\x00\x2a\xa4\x00\x00\x00\x00\x00\x01\x00\x02\x11\x25\
+\x00\x00\x01\x81\x15\x91\x84\xac\
+\x00\x00\x2a\x38\x00\x00\x00\x00\x00\x01\x00\x02\x0a\x43\
+\x00\x00\x01\x81\x15\x91\x86\xcd\
+\x00\x00\x02\x10\x00\x00\x00\x00\x00\x01\x00\x00\x2e\x25\
+\x00\x00\x01\x81\x15\x91\x85\x3e\
+\x00\x00\x20\xfc\x00\x00\x00\x00\x00\x01\x00\x01\xa0\x76\
+\x00\x00\x01\x81\x15\x91\x86\x6b\
+\x00\x00\x12\x30\x00\x00\x00\x00\x00\x01\x00\x00\xf1\x9c\
+\x00\x00\x01\x81\x15\x91\x86\xbe\
+\x00\x00\x0a\x20\x00\x00\x00\x00\x00\x01\x00\x00\x88\xcc\
+\x00\x00\x01\x81\x15\x91\x86\xbe\
+\x00\x00\x04\xdc\x00\x00\x00\x00\x00\x01\x00\x00\x4a\x76\
+\x00\x00\x01\x81\x15\x91\x86\x9e\
+\x00\x00\x12\xf8\x00\x00\x00\x00\x00\x01\x00\x01\x02\x0e\
+\x00\x00\x01\x81\x15\x91\x86\x0d\
+\x00\x00\x10\x60\x00\x00\x00\x00\x00\x01\x00\x00\xdb\x13\
+\x00\x00\x01\x81\x15\x91\x86\x3d\
+\x00\x00\x07\x6e\x00\x00\x00\x00\x00\x01\x00\x00\x64\x50\
+\x00\x00\x01\x81\x15\x91\x86\xec\
+\x00\x00\x03\xdc\x00\x00\x00\x00\x00\x01\x00\x00\x44\xa3\
+\x00\x00\x01\x81\x15\x91\x87\xd0\
+\x00\x00\x1d\xe4\x00\x00\x00\x00\x00\x01\x00\x01\x7d\x1d\
+\x00\x00\x01\x81\x15\x91\x88\x46\
+\x00\x00\x24\x50\x00\x00\x00\x00\x00\x01\x00\x01\xc5\xc2\
+\x00\x00\x01\x81\x15\x91\x85\xc9\
+\x00\x00\x10\xc2\x00\x00\x00\x00\x00\x01\x00\x00\xe0\x6b\
+\x00\x00\x01\x81\x15\x91\x86\x16\
+\x00\x00\x00\x6a\x00\x00\x00\x00\x00\x01\x00\x00\x1a\xaa\
+\x00\x00\x01\x81\x15\x91\x86\xae\
+\x00\x00\x01\x6c\x00\x00\x00\x00\x00\x01\x00\x00\x25\x38\
+\x00\x00\x01\x81\x15\x91\x87\x43\
+\x00\x00\x15\x9c\x00\x00\x00\x00\x00\x01\x00\x01\x1e\x29\
+\x00\x00\x01\x81\x15\x91\x84\x81\
+\x00\x00\x0c\x90\x00\x00\x00\x00\x00\x01\x00\x00\xb0\xe3\
+\x00\x00\x01\x81\x15\x91\x85\xcd\
+\x00\x00\x29\x4a\x00\x00\x00\x00\x00\x01\x00\x01\xfd\x9e\
+\x00\x00\x01\x81\x15\x91\x84\x8c\
+\x00\x00\x2b\xda\x00\x00\x00\x00\x00\x01\x00\x02\x1b\xa2\
+\x00\x00\x01\x81\x15\x91\x86\x3d\
+\x00\x00\x0d\x70\x00\x00\x00\x00\x00\x01\x00\x00\xc3\x1b\
+\x00\x00\x01\x81\x15\x91\x84\xfd\
+\x00\x00\x0b\x78\x00\x00\x00\x00\x00\x01\x00\x00\x97\xf3\
+\x00\x00\x01\x81\x15\x91\x87\x9f\
+\x00\x00\x29\xe2\x00\x00\x00\x00\x00\x01\x00\x02\x09\xa8\
+\x00\x00\x01\x81\x15\x91\x86\x2d\
+\x00\x00\x1c\xee\x00\x00\x00\x00\x00\x01\x00\x01\x72\x8a\
+\x00\x00\x01\x81\x15\x91\x85\x9f\
+\x00\x00\x0f\x84\x00\x00\x00\x00\x00\x01\x00\x00\xd0\xe7\
+\x00\x00\x01\x81\x15\x91\x86\x5c\
+\x00\x00\x12\xc6\x00\x00\x00\x00\x00\x01\x00\x00\xf9\x9e\
+\x00\x00\x01\x81\x15\x91\x87\xa7\
+\x00\x00\x25\x82\x00\x00\x00\x00\x00\x01\x00\x01\xd4\x54\
+\x00\x00\x01\x81\x15\x91\x86\x2d\
+\x00\x00\x1f\x66\x00\x00\x00\x00\x00\x01\x00\x01\x8d\x15\
+\x00\x00\x01\x81\x15\x91\x87\x32\
+\x00\x00\x14\x8e\x00\x00\x00\x00\x00\x01\x00\x01\x0c\x69\
+\x00\x00\x01\x81\x15\x91\x84\xbb\
+\x00\x00\x28\x0e\x00\x00\x00\x00\x00\x01\x00\x01\xf7\x5c\
+\x00\x00\x01\x81\x15\x91\x88\x1b\
+\x00\x00\x0d\xa2\x00\x00\x00\x00\x00\x01\x00\x00\xc3\xb7\
+\x00\x00\x01\x81\x15\x91\x87\xdd\
+\x00\x00\x0e\x36\x00\x00\x00\x00\x00\x01\x00\x00\xc7\x59\
+\x00\x00\x01\x81\x15\x91\x88\x36\
+\x00\x00\x2b\x1c\x00\x00\x00\x00\x00\x01\x00\x02\x14\x12\
+\x00\x00\x01\x81\x15\x91\x87\xd9\
+\x00\x00\x2b\xa6\x00\x00\x00\x00\x00\x01\x00\x02\x19\x7c\
+\x00\x00\x01\x81\x15\x91\x84\x53\
+\x00\x00\x00\x32\x00\x02\x00\x00\x00\x01\x00\x00\x00\xd6\
+\x00\x00\x00\x00\x00\x00\x00\x00\
+\x00\x00\x00\x40\x00\x01\x00\x00\x00\x01\x00\x00\x00\x00\
+\x00\x00\x01\x81\x15\x91\x89\x29\
+"
+
+qt_version = [int(v) for v in QtCore.qVersion().split('.')]
+if qt_version < [5, 8, 0]:
+    rcc_version = 1
+    qt_resource_struct = qt_resource_struct_v1
+else:
+    rcc_version = 2
+    qt_resource_struct = qt_resource_struct_v2
+
+def qInitResources():
+    QtCore.qRegisterResourceData(rcc_version, qt_resource_struct, qt_resource_name, qt_resource_data)
+
+def qCleanupResources():
+    QtCore.qUnregisterResourceData(rcc_version, qt_resource_struct, qt_resource_name, qt_resource_data)
+
+qInitResources()
diff --git a/3rdParty/qdarkstyle/dark/main.scss b/3rdParty/qdarkstyle/dark/main.scss
index dc40bc521c..44409319fb 100644
--- a/3rdParty/qdarkstyle/dark/main.scss
+++ b/3rdParty/qdarkstyle/dark/main.scss
@@ -1,4 +1,4 @@
-/* Light Style - QDarkStyleSheet ------------------------------------------ */
-
-@import '_variables';
-@import '../qss/_styles';
+/* Light Style - QDarkStyleSheet ------------------------------------------ */
+
+@import '_variables';
+@import '../qss/_styles';
diff --git a/3rdParty/qdarkstyle/dark/palette.py b/3rdParty/qdarkstyle/dark/palette.py
index 23a1d1f837..791e1a759e 100644
--- a/3rdParty/qdarkstyle/dark/palette.py
+++ b/3rdParty/qdarkstyle/dark/palette.py
@@ -1,36 +1,36 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-"""QDarkStyle default dark palette."""
-
-# Local imports
-from qdarkstyle.colorsystem import Blue, Gray
-from qdarkstyle.palette import Palette
-
-
-class DarkPalette(Palette):
-    """Dark palette variables."""
-
-    # Identifier
-    ID = 'dark'
-
-    # Color
-    COLOR_BACKGROUND_1 = Gray.B10
-    COLOR_BACKGROUND_2 = Gray.B20
-    COLOR_BACKGROUND_3 = Gray.B30
-    COLOR_BACKGROUND_4 = Gray.B40
-    COLOR_BACKGROUND_5 = Gray.B50
-    COLOR_BACKGROUND_6 = Gray.B60
-
-    COLOR_TEXT_1 = Gray.B130
-    COLOR_TEXT_2 = Gray.B110
-    COLOR_TEXT_3 = Gray.B90
-    COLOR_TEXT_4 = Gray.B80
-
-    COLOR_ACCENT_1 = Blue.B20
-    COLOR_ACCENT_2 = Blue.B40
-    COLOR_ACCENT_3 = Blue.B50
-    COLOR_ACCENT_4 = Blue.B70
-    COLOR_ACCENT_5 = Blue.B80
-
-    OPACITY_TOOLTIP = 230
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+"""QDarkStyle default dark palette."""
+
+# Local imports
+from qdarkstyle.colorsystem import Blue, Gray
+from qdarkstyle.palette import Palette
+
+
+class DarkPalette(Palette):
+    """Dark palette variables."""
+
+    # Identifier
+    ID = 'dark'
+
+    # Color
+    COLOR_BACKGROUND_1 = Gray.B10
+    COLOR_BACKGROUND_2 = Gray.B20
+    COLOR_BACKGROUND_3 = Gray.B30
+    COLOR_BACKGROUND_4 = Gray.B40
+    COLOR_BACKGROUND_5 = Gray.B50
+    COLOR_BACKGROUND_6 = Gray.B60
+
+    COLOR_TEXT_1 = Gray.B130
+    COLOR_TEXT_2 = Gray.B110
+    COLOR_TEXT_3 = Gray.B90
+    COLOR_TEXT_4 = Gray.B80
+
+    COLOR_ACCENT_1 = Blue.B20
+    COLOR_ACCENT_2 = Blue.B40
+    COLOR_ACCENT_3 = Blue.B50
+    COLOR_ACCENT_4 = Blue.B70
+    COLOR_ACCENT_5 = Blue.B80
+
+    OPACITY_TOOLTIP = 230
diff --git a/3rdParty/qdarkstyle/dark/rc/.keep b/3rdParty/qdarkstyle/dark/rc/.keep
index 8d1c8b69c3..56f3b36e27 100644
--- a/3rdParty/qdarkstyle/dark/rc/.keep
+++ b/3rdParty/qdarkstyle/dark/rc/.keep
@@ -1 +1 @@
- 
+ 
diff --git a/3rdParty/sdbus-cpp/include/sdbus-c++/AdaptorInterfaces.h b/3rdParty/sdbus-cpp/include/sdbus-c++/AdaptorInterfaces.h
new file mode 100644
index 0000000000..550a0959f7
--- /dev/null
+++ b/3rdParty/sdbus-cpp/include/sdbus-c++/AdaptorInterfaces.h
@@ -0,0 +1,152 @@
+/**
+ * (C) 2016 - 2021 KISTLER INSTRUMENTE AG, Winterthur, Switzerland
+ * (C) 2016 - 2024 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
+ *
+ * @file AdaptorInterfaces.h
+ *
+ * Created on: Nov 8, 2016
+ * Project: sdbus-c++
+ * Description: High-level D-Bus IPC C++ library based on sd-bus
+ *
+ * This file is part of sdbus-c++.
+ *
+ * sdbus-c++ is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * sdbus-c++ is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with sdbus-c++. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef SDBUS_CXX_ADAPTORINTERFACES_H_
+#define SDBUS_CXX_ADAPTORINTERFACES_H_
+
+#include <sdbus-c++/IObject.h>
+#include <cassert>
+#include <string>
+#include <memory>
+
+// Forward declarations
+namespace sdbus {
+    class IConnection;
+}
+
+namespace sdbus {
+
+    /********************************************//**
+     * @class ObjectHolder
+     *
+     * ObjectHolder is a helper that simply owns and provides
+     * access to an object to other classes in the inheritance
+     * hierarchy of an object based on generated interface classes.
+     *
+     ***********************************************/
+    class ObjectHolder
+    {
+    protected:
+        ObjectHolder(std::unique_ptr<IObject>&& object)
+            : object_(std::move(object))
+        {
+        }
+
+        const IObject& getObject() const
+        {
+            assert(object_ != nullptr);
+            return *object_;
+        }
+
+        IObject& getObject()
+        {
+            assert(object_ != nullptr);
+            return *object_;
+        }
+
+    private:
+        std::unique_ptr<IObject> object_;
+    };
+
+    /********************************************//**
+     * @class AdaptorInterfaces
+     *
+     * AdaptorInterfaces is a helper template class that joins all interface classes of a remote
+     * D-Bus object generated by sdbus-c++-xml2cpp to be used on the server (the adaptor) side,
+     * including some auxiliary classes. AdaptorInterfaces is the class that native-like object
+     * implementation classes written by users should inherit from and implement all pure virtual
+     * methods. So the _Interfaces template parameter is a list of sdbus-c++-xml2cpp-generated
+     * adaptor-side interface classes representing interfaces (with methods, signals and properties)
+     * of the D-Bus object.
+     *
+     * In the final adaptor class inherited from AdaptorInterfaces, one needs to make sure:
+     *   1. to call `registerAdaptor();` in the class constructor, and, conversely,
+     *   2. to call `unregisterAdaptor();` in the class destructor,
+     * so that the object API vtable is registered and unregistered at the proper time.
+     *
+     ***********************************************/
+    template <typename... _Interfaces>
+    class AdaptorInterfaces
+        : protected ObjectHolder
+        , public _Interfaces...
+    {
+    public:
+        /*!
+         * @brief Creates object instance
+         *
+         * @param[in] connection D-Bus connection where the object will publish itself
+         * @param[in] objectPath Path of the D-Bus object
+         *
+         * For more information, consult @ref createObject(sdbus::IConnection&,std::string)
+         */
+        AdaptorInterfaces(IConnection& connection, ObjectPath objectPath)
+            : ObjectHolder(createObject(connection, std::move(objectPath)))
+            , _Interfaces(getObject())...
+        {
+        }
+
+        /*!
+         * @brief Adds object vtable (i.e. D-Bus API) definitions for all interfaces it implements
+         *
+         * This function must be called in the constructor of the final adaptor class that implements AdaptorInterfaces.
+         *
+         * See also @ref IObject::addVTable()
+         */
+        void registerAdaptor()
+        {
+            (_Interfaces::registerAdaptor(), ...);
+        }
+
+        /*!
+         * @brief Unregisters adaptors's API and removes it from the bus
+         *
+         * This function must be called in the destructor of the final adaptor class that implements AdaptorInterfaces.
+         *
+         * For more information, see underlying @ref IObject::unregister()
+         */
+        void unregisterAdaptor()
+        {
+            getObject().unregister();
+        }
+
+        /*!
+         * @brief Returns reference to the underlying IObject instance
+         */
+        using ObjectHolder::getObject;
+
+    protected:
+        using base_type = AdaptorInterfaces;
+
+        AdaptorInterfaces(const AdaptorInterfaces&) = delete;
+        AdaptorInterfaces& operator=(const AdaptorInterfaces&) = delete;
+        AdaptorInterfaces(AdaptorInterfaces&&) = delete;
+        AdaptorInterfaces& operator=(AdaptorInterfaces&&) = delete;
+        ~AdaptorInterfaces() = default;
+    };
+
+}
+
+#endif /* SDBUS_CXX_ADAPTORINTERFACES_H_ */
diff --git a/3rdParty/sdbus-cpp/include/sdbus-c++/ConvenienceApiClasses.h b/3rdParty/sdbus-cpp/include/sdbus-c++/ConvenienceApiClasses.h
new file mode 100644
index 0000000000..d644ab8ebe
--- /dev/null
+++ b/3rdParty/sdbus-cpp/include/sdbus-c++/ConvenienceApiClasses.h
@@ -0,0 +1,290 @@
+/**
+ * (C) 2016 - 2021 KISTLER INSTRUMENTE AG, Winterthur, Switzerland
+ * (C) 2016 - 2024 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
+ *
+ * @file ConvenienceApiClasses.h
+ *
+ * Created on: Jan 19, 2017
+ * Project: sdbus-c++
+ * Description: High-level D-Bus IPC C++ library based on sd-bus
+ *
+ * This file is part of sdbus-c++.
+ *
+ * sdbus-c++ is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * sdbus-c++ is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with sdbus-c++. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef SDBUS_CXX_CONVENIENCEAPICLASSES_H_
+#define SDBUS_CXX_CONVENIENCEAPICLASSES_H_
+
+#include <sdbus-c++/Message.h>
+#include <sdbus-c++/TypeTraits.h>
+#include <sdbus-c++/Types.h>
+#include <sdbus-c++/VTableItems.h>
+
+#include <chrono>
+#include <cstdint>
+#include <future>
+#include <map>
+#include <string>
+#include <string_view>
+#include <vector>
+
+// Forward declarations
+namespace sdbus {
+    class IObject;
+    class IProxy;
+    class Error;
+    class PendingAsyncCall;
+}
+
+namespace sdbus {
+
+    class VTableAdder
+    {
+    public:
+        void forInterface(InterfaceName interfaceName);
+        void forInterface(std::string interfaceName);
+        [[nodiscard]] Slot forInterface(InterfaceName interfaceName, return_slot_t);
+        [[nodiscard]] Slot forInterface(std::string interfaceName, return_slot_t);
+
+    private:
+        friend IObject;
+        VTableAdder(IObject& object, std::vector<VTableItem> vtable);
+
+    private:
+        IObject& object_;
+        std::vector<VTableItem> vtable_;
+    };
+
+    class SignalEmitter
+    {
+    public:
+        SignalEmitter& onInterface(const InterfaceName& interfaceName);
+        SignalEmitter& onInterface(const std::string& interfaceName);
+        SignalEmitter& onInterface(const char* interfaceName);
+        template <typename... _Args> void withArguments(_Args&&... args);
+
+        SignalEmitter(SignalEmitter&& other) = default;
+        ~SignalEmitter() noexcept(false);
+
+    private:
+        friend IObject;
+        SignalEmitter(IObject& object, const SignalName& signalName);
+        SignalEmitter(IObject& object, const char* signalName);
+
+    private:
+        IObject& object_;
+        const char* signalName_;
+        Signal signal_;
+        int exceptions_{}; // Number of active exceptions when SignalEmitter is constructed
+    };
+
+    class MethodInvoker
+    {
+    public:
+        MethodInvoker& onInterface(const InterfaceName& interfaceName);
+        MethodInvoker& onInterface(const std::string& interfaceName);
+        MethodInvoker& onInterface(const char* interfaceName);
+        MethodInvoker& withTimeout(uint64_t usec);
+        template <typename _Rep, typename _Period>
+        MethodInvoker& withTimeout(const std::chrono::duration<_Rep, _Period>& timeout);
+        template <typename... _Args> MethodInvoker& withArguments(_Args&&... args);
+        template <typename... _Args> void storeResultsTo(_Args&... args);
+        void dontExpectReply();
+
+        MethodInvoker(MethodInvoker&& other) = default;
+        ~MethodInvoker() noexcept(false);
+
+    private:
+        friend IProxy;
+        MethodInvoker(IProxy& proxy, const MethodName& methodName);
+        MethodInvoker(IProxy& proxy, const char* methodName);
+
+    private:
+        IProxy& proxy_;
+        const char* methodName_;
+        uint64_t timeout_{};
+        MethodCall method_;
+        int exceptions_{}; // Number of active exceptions when MethodInvoker is constructed
+        bool methodCalled_{};
+    };
+
+    class AsyncMethodInvoker
+    {
+    public:
+        AsyncMethodInvoker& onInterface(const InterfaceName& interfaceName);
+        AsyncMethodInvoker& onInterface(const std::string& interfaceName);
+        AsyncMethodInvoker& onInterface(const char* interfaceName);
+        AsyncMethodInvoker& withTimeout(uint64_t usec);
+        template <typename _Rep, typename _Period>
+        AsyncMethodInvoker& withTimeout(const std::chrono::duration<_Rep, _Period>& timeout);
+        template <typename... _Args> AsyncMethodInvoker& withArguments(_Args&&... args);
+        template <typename _Function> PendingAsyncCall uponReplyInvoke(_Function&& callback);
+        template <typename _Function> [[nodiscard]] Slot uponReplyInvoke(_Function&& callback, return_slot_t);
+        // Returned future will be std::future<void> for no (void) D-Bus method return value
+        //                      or std::future<T> for single D-Bus method return value
+        //                      or std::future<std::tuple<...>> for multiple method return values
+        template <typename... _Args> std::future<future_return_t<_Args...>> getResultAsFuture();
+
+    private:
+        friend IProxy;
+        AsyncMethodInvoker(IProxy& proxy, const MethodName& methodName);
+        AsyncMethodInvoker(IProxy& proxy, const char* methodName);
+        template <typename _Function> async_reply_handler makeAsyncReplyHandler(_Function&& callback);
+
+    private:
+        IProxy& proxy_;
+        const char* methodName_;
+        uint64_t timeout_{};
+        MethodCall method_;
+    };
+
+    class SignalSubscriber
+    {
+    public:
+        SignalSubscriber& onInterface(const InterfaceName& interfaceName);
+        SignalSubscriber& onInterface(const std::string& interfaceName);
+        SignalSubscriber& onInterface(const char* interfaceName);
+        template <typename _Function> void call(_Function&& callback);
+        template <typename _Function> [[nodiscard]] Slot call(_Function&& callback, return_slot_t);
+
+    private:
+        friend IProxy;
+        SignalSubscriber(IProxy& proxy, const SignalName& signalName);
+        SignalSubscriber(IProxy& proxy, const char* signalName);
+        template <typename _Function> signal_handler makeSignalHandler(_Function&& callback);
+
+    private:
+        IProxy& proxy_;
+        const char* signalName_;
+        const char* interfaceName_{};
+    };
+
+    class PropertyGetter
+    {
+    public:
+        Variant onInterface(std::string_view interfaceName);
+
+    private:
+        friend IProxy;
+        PropertyGetter(IProxy& proxy, std::string_view propertyName);
+
+        static constexpr const char* DBUS_PROPERTIES_INTERFACE_NAME = "org.freedesktop.DBus.Properties";
+
+    private:
+        IProxy& proxy_;
+        std::string_view propertyName_;
+    };
+
+    class AsyncPropertyGetter
+    {
+    public:
+        AsyncPropertyGetter& onInterface(std::string_view interfaceName);
+        template <typename _Function> PendingAsyncCall uponReplyInvoke(_Function&& callback);
+        template <typename _Function> [[nodiscard]] Slot uponReplyInvoke(_Function&& callback, return_slot_t);
+        std::future<Variant> getResultAsFuture();
+
+    private:
+        friend IProxy;
+        AsyncPropertyGetter(IProxy& proxy, std::string_view propertyName);
+
+        static constexpr const char* DBUS_PROPERTIES_INTERFACE_NAME = "org.freedesktop.DBus.Properties";
+
+    private:
+        IProxy& proxy_;
+        std::string_view propertyName_;
+        std::string_view interfaceName_;
+    };
+
+    class PropertySetter
+    {
+    public:
+        PropertySetter& onInterface(std::string_view interfaceName);
+        template <typename _Value> void toValue(const _Value& value);
+        template <typename _Value> void toValue(const _Value& value, dont_expect_reply_t);
+        void toValue(const Variant& value);
+        void toValue(const Variant& value, dont_expect_reply_t);
+
+    private:
+        friend IProxy;
+        PropertySetter(IProxy& proxy, std::string_view propertyName);
+
+        static constexpr const char* DBUS_PROPERTIES_INTERFACE_NAME = "org.freedesktop.DBus.Properties";
+
+    private:
+        IProxy& proxy_;
+        std::string_view propertyName_;
+        std::string_view interfaceName_;
+    };
+
+    class AsyncPropertySetter
+    {
+    public:
+        AsyncPropertySetter& onInterface(std::string_view interfaceName);
+        template <typename _Value> AsyncPropertySetter& toValue(_Value&& value);
+        AsyncPropertySetter& toValue(Variant value);
+        template <typename _Function> PendingAsyncCall uponReplyInvoke(_Function&& callback);
+        template <typename _Function> [[nodiscard]] Slot uponReplyInvoke(_Function&& callback, return_slot_t);
+        std::future<void> getResultAsFuture();
+
+    private:
+        friend IProxy;
+        AsyncPropertySetter(IProxy& proxy, std::string_view propertyName);
+
+        static constexpr const char* DBUS_PROPERTIES_INTERFACE_NAME = "org.freedesktop.DBus.Properties";
+
+    private:
+        IProxy& proxy_;
+        std::string_view propertyName_;
+        std::string_view interfaceName_;
+        Variant value_;
+    };
+
+    class AllPropertiesGetter
+    {
+    public:
+        std::map<PropertyName, Variant> onInterface(std::string_view interfaceName);
+
+    private:
+        friend IProxy;
+        AllPropertiesGetter(IProxy& proxy);
+
+        static constexpr const char* DBUS_PROPERTIES_INTERFACE_NAME = "org.freedesktop.DBus.Properties";
+
+    private:
+        IProxy& proxy_;
+    };
+
+    class AsyncAllPropertiesGetter
+    {
+    public:
+        AsyncAllPropertiesGetter& onInterface(std::string_view interfaceName);
+        template <typename _Function> PendingAsyncCall uponReplyInvoke(_Function&& callback);
+        template <typename _Function> [[nodiscard]] Slot uponReplyInvoke(_Function&& callback, return_slot_t);
+        std::future<std::map<PropertyName, Variant>> getResultAsFuture();
+
+    private:
+        friend IProxy;
+        AsyncAllPropertiesGetter(IProxy& proxy);
+
+        static constexpr const char* DBUS_PROPERTIES_INTERFACE_NAME = "org.freedesktop.DBus.Properties";
+
+    private:
+        IProxy& proxy_;
+        std::string_view interfaceName_;
+    };
+
+} // namespace sdbus
+
+#endif /* SDBUS_CXX_CONVENIENCEAPICLASSES_H_ */
diff --git a/3rdParty/sdbus-cpp/include/sdbus-c++/ConvenienceApiClasses.inl b/3rdParty/sdbus-cpp/include/sdbus-c++/ConvenienceApiClasses.inl
new file mode 100644
index 0000000000..4be40a9fb5
--- /dev/null
+++ b/3rdParty/sdbus-cpp/include/sdbus-c++/ConvenienceApiClasses.inl
@@ -0,0 +1,718 @@
+/**
+ * (C) 2016 - 2021 KISTLER INSTRUMENTE AG, Winterthur, Switzerland
+ * (C) 2016 - 2024 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
+ *
+ * @file ConvenienceApiClasses.inl
+ *
+ * Created on: Dec 19, 2016
+ * Project: sdbus-c++
+ * Description: High-level D-Bus IPC C++ library based on sd-bus
+ *
+ * This file is part of sdbus-c++.
+ *
+ * sdbus-c++ is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * sdbus-c++ is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with sdbus-c++. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef SDBUS_CPP_CONVENIENCEAPICLASSES_INL_
+#define SDBUS_CPP_CONVENIENCEAPICLASSES_INL_
+
+#include <sdbus-c++/Error.h>
+#include <sdbus-c++/IObject.h>
+#include <sdbus-c++/IProxy.h>
+#include <sdbus-c++/Message.h>
+#include <sdbus-c++/MethodResult.h>
+#include <sdbus-c++/TypeTraits.h>
+#include <sdbus-c++/Types.h>
+
+#include <cassert>
+#include <exception>
+#include <string>
+#include <tuple>
+#include <type_traits>
+
+namespace sdbus {
+
+    /*** ------------- ***/
+    /***  VTableAdder  ***/
+    /*** ------------- ***/
+
+    inline VTableAdder::VTableAdder(IObject& object, std::vector<VTableItem> vtable)
+        : object_(object)
+        , vtable_(std::move(vtable))
+    {
+    }
+
+    inline void VTableAdder::forInterface(InterfaceName interfaceName)
+    {
+        object_.addVTable(std::move(interfaceName), std::move(vtable_));
+    }
+
+    inline void VTableAdder::forInterface(std::string interfaceName)
+    {
+        forInterface(InterfaceName{std::move(interfaceName)});
+    }
+
+    [[nodiscard]] inline Slot VTableAdder::forInterface(InterfaceName interfaceName, return_slot_t)
+    {
+        return object_.addVTable(std::move(interfaceName), std::move(vtable_), return_slot);
+    }
+
+    [[nodiscard]] inline Slot VTableAdder::forInterface(std::string interfaceName, return_slot_t)
+    {
+        return forInterface(InterfaceName{std::move(interfaceName)}, return_slot);
+    }
+
+    /*** ------------- ***/
+    /*** SignalEmitter ***/
+    /*** ------------- ***/
+
+    inline SignalEmitter::SignalEmitter(IObject& object, const SignalName& signalName)
+        : SignalEmitter(object, signalName.c_str())
+    {
+    }
+
+    inline SignalEmitter::SignalEmitter(IObject& object, const char* signalName)
+        : object_(object)
+        , signalName_(signalName)
+        , exceptions_(std::uncaught_exceptions())
+    {
+    }
+
+    inline SignalEmitter::~SignalEmitter() noexcept(false) // since C++11, destructors must
+    {                                                      // explicitly be allowed to throw
+        // Don't emit the signal if SignalEmitter threw an exception in one of its methods
+        if (std::uncaught_exceptions() != exceptions_)
+            return;
+
+        // emitSignal() can throw. But as the SignalEmitter shall always be used as an unnamed,
+        // temporary object, i.e. not as a stack-allocated object, the double-exception situation
+        // shall never happen. I.e. it should not happen that this destructor is directly called
+        // in the stack-unwinding process of another flying exception (which would lead to immediate
+        // termination). It can be called indirectly in the destructor of another object, but that's
+        // fine and safe provided that the caller catches exceptions thrown from here.
+        // Therefore, we can allow emitSignal() to throw even if we are in the destructor.
+        // Bottomline is, to be on the safe side, the caller must take care of catching and reacting
+        // to the exception thrown from here if the caller is a destructor itself.
+        object_.emitSignal(signal_);
+    }
+
+    inline SignalEmitter& SignalEmitter::onInterface(const InterfaceName& interfaceName)
+    {
+        return onInterface(interfaceName.c_str());
+    }
+
+    inline SignalEmitter& SignalEmitter::onInterface(const std::string& interfaceName)
+    {
+        return onInterface(interfaceName.c_str());
+    }
+
+    inline SignalEmitter& SignalEmitter::onInterface(const char* interfaceName)
+    {
+        signal_ = object_.createSignal(interfaceName, signalName_);
+
+        return *this;
+    }
+
+    template <typename... _Args>
+    inline void SignalEmitter::withArguments(_Args&&... args)
+    {
+        assert(signal_.isValid()); // onInterface() must be placed/called prior to withArguments()
+
+        detail::serialize_pack(signal_, std::forward<_Args>(args)...);
+    }
+
+    /*** ------------- ***/
+    /*** MethodInvoker ***/
+    /*** ------------- ***/
+
+    inline MethodInvoker::MethodInvoker(IProxy& proxy, const MethodName& methodName)
+        : MethodInvoker(proxy, methodName.c_str())
+    {
+    }
+
+    inline MethodInvoker::MethodInvoker(IProxy& proxy, const char* methodName)
+        : proxy_(proxy)
+        , methodName_(methodName)
+        , exceptions_(std::uncaught_exceptions())
+    {
+    }
+
+    inline MethodInvoker::~MethodInvoker() noexcept(false) // since C++11, destructors must
+    {                                                      // explicitly be allowed to throw
+        // Don't call the method if it has been called already or if MethodInvoker
+        // threw an exception in one of its methods
+        if (methodCalled_ || std::uncaught_exceptions() != exceptions_)
+            return;
+
+        // callMethod() can throw. But as the MethodInvoker shall always be used as an unnamed,
+        // temporary object, i.e. not as a stack-allocated object, the double-exception situation
+        // shall never happen. I.e. it should not happen that this destructor is directly called
+        // in the stack-unwinding process of another flying exception (which would lead to immediate
+        // termination). It can be called indirectly in the destructor of another object, but that's
+        // fine and safe provided that the caller catches exceptions thrown from here.
+        // Therefore, we can allow callMethod() to throw even if we are in the destructor.
+        // Bottomline is, to be on the safe side, the caller must take care of catching and reacting
+        // to the exception thrown from here if the caller is a destructor itself.
+        proxy_.callMethod(method_, timeout_);
+    }
+
+    inline MethodInvoker& MethodInvoker::onInterface(const InterfaceName& interfaceName)
+    {
+        return onInterface(interfaceName.c_str());
+    }
+
+    inline MethodInvoker& MethodInvoker::onInterface(const std::string& interfaceName)
+    {
+        return onInterface(interfaceName.c_str());
+    }
+
+    inline MethodInvoker& MethodInvoker::onInterface(const char* interfaceName)
+    {
+        method_ = proxy_.createMethodCall(interfaceName, methodName_);
+
+        return *this;
+    }
+
+    inline MethodInvoker& MethodInvoker::withTimeout(uint64_t usec)
+    {
+        timeout_ = usec;
+
+        return *this;
+    }
+
+    template <typename _Rep, typename _Period>
+    inline MethodInvoker& MethodInvoker::withTimeout(const std::chrono::duration<_Rep, _Period>& timeout)
+    {
+        auto microsecs = std::chrono::duration_cast<std::chrono::microseconds>(timeout);
+        return withTimeout(microsecs.count());
+    }
+
+    template <typename... _Args>
+    inline MethodInvoker& MethodInvoker::withArguments(_Args&&... args)
+    {
+        assert(method_.isValid()); // onInterface() must be placed/called prior to this function
+
+        detail::serialize_pack(method_, std::forward<_Args>(args)...);
+
+        return *this;
+    }
+
+    template <typename... _Args>
+    inline void MethodInvoker::storeResultsTo(_Args&... args)
+    {
+        assert(method_.isValid()); // onInterface() must be placed/called prior to this function
+
+        auto reply = proxy_.callMethod(method_, timeout_);
+        methodCalled_ = true;
+
+        detail::deserialize_pack(reply, args...);
+    }
+
+    inline void MethodInvoker::dontExpectReply()
+    {
+        assert(method_.isValid()); // onInterface() must be placed/called prior to this function
+
+        method_.dontExpectReply();
+    }
+
+    /*** ------------------ ***/
+    /*** AsyncMethodInvoker ***/
+    /*** ------------------ ***/
+
+    inline AsyncMethodInvoker::AsyncMethodInvoker(IProxy& proxy, const MethodName& methodName)
+        : AsyncMethodInvoker(proxy, methodName.c_str())
+    {
+    }
+
+    inline AsyncMethodInvoker::AsyncMethodInvoker(IProxy& proxy, const char* methodName)
+        : proxy_(proxy)
+        , methodName_(methodName)
+    {
+    }
+
+    inline AsyncMethodInvoker& AsyncMethodInvoker::onInterface(const InterfaceName& interfaceName)
+    {
+        return onInterface(interfaceName.c_str());
+    }
+
+    inline AsyncMethodInvoker& AsyncMethodInvoker::onInterface(const std::string& interfaceName)
+    {
+        return onInterface(interfaceName.c_str());
+    }
+
+    inline AsyncMethodInvoker& AsyncMethodInvoker::onInterface(const char* interfaceName)
+    {
+        method_ = proxy_.createMethodCall(interfaceName, methodName_);
+
+        return *this;
+    }
+
+    inline AsyncMethodInvoker& AsyncMethodInvoker::withTimeout(uint64_t usec)
+    {
+        timeout_ = usec;
+
+        return *this;
+    }
+
+    template <typename _Rep, typename _Period>
+    inline AsyncMethodInvoker& AsyncMethodInvoker::withTimeout(const std::chrono::duration<_Rep, _Period>& timeout)
+    {
+        auto microsecs = std::chrono::duration_cast<std::chrono::microseconds>(timeout);
+        return withTimeout(microsecs.count());
+    }
+
+    template <typename... _Args>
+    inline AsyncMethodInvoker& AsyncMethodInvoker::withArguments(_Args&&... args)
+    {
+        assert(method_.isValid()); // onInterface() must be placed/called prior to this function
+
+        detail::serialize_pack(method_, std::forward<_Args>(args)...);
+
+        return *this;
+    }
+
+    template <typename _Function>
+    PendingAsyncCall AsyncMethodInvoker::uponReplyInvoke(_Function&& callback)
+    {
+        assert(method_.isValid()); // onInterface() must be placed/called prior to this function
+
+        return proxy_.callMethodAsync(method_, makeAsyncReplyHandler(std::forward<_Function>(callback)), timeout_);
+    }
+
+    template <typename _Function>
+    [[nodiscard]] Slot AsyncMethodInvoker::uponReplyInvoke(_Function&& callback, return_slot_t)
+    {
+        assert(method_.isValid()); // onInterface() must be placed/called prior to this function
+
+        return proxy_.callMethodAsync( method_
+                                     , makeAsyncReplyHandler(std::forward<_Function>(callback))
+                                     , timeout_
+                                     , return_slot );
+    }
+
+    template <typename _Function>
+    inline async_reply_handler AsyncMethodInvoker::makeAsyncReplyHandler(_Function&& callback)
+    {
+        return [callback = std::forward<_Function>(callback)](MethodReply reply, std::optional<Error> error)
+        {
+            // Create a tuple of callback input arguments' types, which will be used
+            // as a storage for the argument values deserialized from the message.
+            tuple_of_function_input_arg_types_t<_Function> args;
+
+            // Deserialize input arguments from the message into the tuple (if no error occurred).
+            if (!error)
+            {
+                try
+                {
+                    reply >> args;
+                }
+                catch (const Error& e)
+                {
+                    // Pass message deserialization exceptions to the client via callback error parameter,
+                    // instead of propagating them up the message loop call stack.
+                    sdbus::apply(callback, e, args);
+                    return;
+                }
+            }
+
+            // Invoke callback with input arguments from the tuple.
+            sdbus::apply(callback, std::move(error), args);
+        };
+    }
+
+    template <typename... _Args>
+    std::future<future_return_t<_Args...>> AsyncMethodInvoker::getResultAsFuture()
+    {
+        auto promise = std::make_shared<std::promise<future_return_t<_Args...>>>();
+        auto future = promise->get_future();
+
+        uponReplyInvoke([promise = std::move(promise)](std::optional<Error> error, _Args... args)
+        {
+            if (!error)
+                if constexpr (!std::is_void_v<future_return_t<_Args...>>)
+                    promise->set_value({std::move(args)...});
+                else
+                    promise->set_value();
+            else
+                promise->set_exception(std::make_exception_ptr(*std::move(error)));
+        });
+
+        // Will be std::future<void> for no D-Bus method return value
+        //      or std::future<T> for single D-Bus method return value
+        //      or std::future<std::tuple<...>> for multiple method return values
+        return future;
+    }
+
+    /*** ---------------- ***/
+    /*** SignalSubscriber ***/
+    /*** ---------------- ***/
+
+    inline SignalSubscriber::SignalSubscriber(IProxy& proxy, const SignalName& signalName)
+        : SignalSubscriber(proxy, signalName.c_str())
+    {
+    }
+
+    inline SignalSubscriber::SignalSubscriber(IProxy& proxy, const char* signalName)
+        : proxy_(proxy)
+        , signalName_(signalName)
+    {
+    }
+
+    inline SignalSubscriber& SignalSubscriber::onInterface(const InterfaceName& interfaceName)
+    {
+        return onInterface(interfaceName.c_str());
+    }
+
+    inline SignalSubscriber& SignalSubscriber::onInterface(const std::string& interfaceName)
+    {
+        return onInterface(interfaceName.c_str());
+    }
+
+    inline SignalSubscriber& SignalSubscriber::onInterface(const char* interfaceName)
+    {
+        interfaceName_ = std::move(interfaceName);
+
+        return *this;
+    }
+
+    template <typename _Function>
+    inline void SignalSubscriber::call(_Function&& callback)
+    {
+        assert(interfaceName_ != nullptr); // onInterface() must be placed/called prior to this function
+
+        proxy_.registerSignalHandler( interfaceName_
+                                    , signalName_
+                                    , makeSignalHandler(std::forward<_Function>(callback)) );
+    }
+
+    template <typename _Function>
+    [[nodiscard]] inline Slot SignalSubscriber::call(_Function&& callback, return_slot_t)
+    {
+        assert(interfaceName_ != nullptr); // onInterface() must be placed/called prior to this function
+
+        return proxy_.registerSignalHandler( interfaceName_
+                                           , signalName_
+                                           , makeSignalHandler(std::forward<_Function>(callback))
+                                           , return_slot );
+    }
+
+    template <typename _Function>
+    inline signal_handler SignalSubscriber::makeSignalHandler(_Function&& callback)
+    {
+        return [callback = std::forward<_Function>(callback)](Signal signal)
+        {
+            // Create a tuple of callback input arguments' types, which will be used
+            // as a storage for the argument values deserialized from the signal message.
+            tuple_of_function_input_arg_types_t<_Function> signalArgs;
+
+            // The signal handler can take pure signal parameters only, or an additional `std::optional<Error>` as its first
+            // parameter. In the former case, if the deserialization fails (e.g. due to signature mismatch),
+            // the failure is ignored (and signal simply dropped). In the latter case, the deserialization failure
+            // will be communicated to the client's signal handler as a valid Error object inside the std::optional parameter.
+            if constexpr (has_error_param_v<_Function>)
+            {
+                // Deserialize input arguments from the signal message into the tuple
+                try
+                {
+                    signal >> signalArgs;
+                }
+                catch (const sdbus::Error& e)
+                {
+                    // Pass message deserialization exceptions to the client via callback error parameter,
+                    // instead of propagating them up the message loop call stack.
+                    sdbus::apply(callback, e, signalArgs);
+                    return;
+                }
+
+                // Invoke callback with no error and input arguments from the tuple.
+                sdbus::apply(callback, {}, signalArgs);
+            }
+            else
+            {
+                // Deserialize input arguments from the signal message into the tuple
+                signal >> signalArgs;
+
+                // Invoke callback with input arguments from the tuple.
+                sdbus::apply(callback, signalArgs);
+            }
+        };
+    }
+
+    /*** -------------- ***/
+    /*** PropertyGetter ***/
+    /*** -------------- ***/
+
+    inline PropertyGetter::PropertyGetter(IProxy& proxy, std::string_view propertyName)
+        : proxy_(proxy)
+        , propertyName_(std::move(propertyName))
+    {
+    }
+
+    inline Variant PropertyGetter::onInterface(std::string_view interfaceName)
+    {
+        Variant var;
+        proxy_.callMethod("Get")
+              .onInterface(DBUS_PROPERTIES_INTERFACE_NAME)
+              .withArguments(interfaceName, propertyName_)
+              .storeResultsTo(var);
+        return var;
+    }
+
+    /*** ------------------- ***/
+    /*** AsyncPropertyGetter ***/
+    /*** ------------------- ***/
+
+    inline AsyncPropertyGetter::AsyncPropertyGetter(IProxy& proxy, std::string_view propertyName)
+        : proxy_(proxy)
+        , propertyName_(std::move(propertyName))
+    {
+    }
+
+    inline AsyncPropertyGetter& AsyncPropertyGetter::onInterface(std::string_view interfaceName)
+    {
+        interfaceName_ = std::move(interfaceName);
+
+        return *this;
+    }
+
+    template <typename _Function>
+    PendingAsyncCall AsyncPropertyGetter::uponReplyInvoke(_Function&& callback)
+    {
+        static_assert( std::is_invocable_r_v<void, _Function, std::optional<Error>, Variant>
+                     , "Property get callback function must accept std::optional<Error> and property value as Variant" );
+
+        assert(!interfaceName_.empty()); // onInterface() must be placed/called prior to this function
+
+        return proxy_.callMethodAsync("Get")
+                     .onInterface(DBUS_PROPERTIES_INTERFACE_NAME)
+                     .withArguments(interfaceName_, propertyName_)
+                     .uponReplyInvoke(std::forward<_Function>(callback));
+    }
+
+    template <typename _Function>
+    [[nodiscard]] Slot AsyncPropertyGetter::uponReplyInvoke(_Function&& callback, return_slot_t)
+    {
+        static_assert( std::is_invocable_r_v<void, _Function, std::optional<Error>, Variant>
+                     , "Property get callback function must accept std::optional<Error> and property value as Variant" );
+
+        assert(!interfaceName_.empty()); // onInterface() must be placed/called prior to this function
+
+        return proxy_.callMethodAsync("Get")
+                     .onInterface(DBUS_PROPERTIES_INTERFACE_NAME)
+                     .withArguments(interfaceName_, propertyName_)
+                     .uponReplyInvoke(std::forward<_Function>(callback), return_slot);
+    }
+
+    inline std::future<Variant> AsyncPropertyGetter::getResultAsFuture()
+    {
+        assert(!interfaceName_.empty()); // onInterface() must be placed/called prior to this function
+
+        return proxy_.callMethodAsync("Get")
+                     .onInterface(DBUS_PROPERTIES_INTERFACE_NAME)
+                     .withArguments(interfaceName_, propertyName_)
+                     .getResultAsFuture<Variant>();
+    }
+
+    /*** -------------- ***/
+    /*** PropertySetter ***/
+    /*** -------------- ***/
+
+    inline PropertySetter::PropertySetter(IProxy& proxy, std::string_view propertyName)
+        : proxy_(proxy)
+        , propertyName_(std::move(propertyName))
+    {
+    }
+
+    inline PropertySetter& PropertySetter::onInterface(std::string_view interfaceName)
+    {
+        interfaceName_ = std::move(interfaceName);
+
+        return *this;
+    }
+
+    template <typename _Value>
+    inline void PropertySetter::toValue(const _Value& value)
+    {
+        PropertySetter::toValue(Variant{value});
+    }
+
+    template <typename _Value>
+    inline void PropertySetter::toValue(const _Value& value, dont_expect_reply_t)
+    {
+        PropertySetter::toValue(Variant{value}, dont_expect_reply);
+    }
+
+    inline void PropertySetter::toValue(const Variant& value)
+    {
+        assert(!interfaceName_.empty()); // onInterface() must be placed/called prior to this function
+
+        proxy_.callMethod("Set")
+              .onInterface(DBUS_PROPERTIES_INTERFACE_NAME)
+              .withArguments(interfaceName_, propertyName_, value);
+    }
+
+    inline void PropertySetter::toValue(const Variant& value, dont_expect_reply_t)
+    {
+        assert(!interfaceName_.empty()); // onInterface() must be placed/called prior to this function
+
+        proxy_.callMethod("Set")
+              .onInterface(DBUS_PROPERTIES_INTERFACE_NAME)
+              .withArguments(interfaceName_, propertyName_, value)
+              .dontExpectReply();
+    }
+
+    /*** ------------------- ***/
+    /*** AsyncPropertySetter ***/
+    /*** ------------------- ***/
+
+    inline AsyncPropertySetter::AsyncPropertySetter(IProxy& proxy, std::string_view propertyName)
+        : proxy_(proxy)
+        , propertyName_(propertyName)
+    {
+    }
+
+    inline AsyncPropertySetter& AsyncPropertySetter::onInterface(std::string_view interfaceName)
+    {
+        interfaceName_ = std::move(interfaceName);
+
+        return *this;
+    }
+
+    template <typename _Value>
+    inline AsyncPropertySetter& AsyncPropertySetter::toValue(_Value&& value)
+    {
+        return AsyncPropertySetter::toValue(Variant{std::forward<_Value>(value)});
+    }
+
+    inline AsyncPropertySetter& AsyncPropertySetter::toValue(Variant value)
+    {
+        value_ = std::move(value);
+
+        return *this;
+    }
+
+    template <typename _Function>
+    PendingAsyncCall AsyncPropertySetter::uponReplyInvoke(_Function&& callback)
+    {
+        static_assert( std::is_invocable_r_v<void, _Function, std::optional<Error>>
+                     , "Property set callback function must accept std::optional<Error> only" );
+
+        assert(!interfaceName_.empty()); // onInterface() must be placed/called prior to this function
+
+        return proxy_.callMethodAsync("Set")
+                     .onInterface(DBUS_PROPERTIES_INTERFACE_NAME)
+                     .withArguments(interfaceName_, propertyName_, std::move(value_))
+                     .uponReplyInvoke(std::forward<_Function>(callback));
+    }
+
+    template <typename _Function>
+    [[nodiscard]] Slot AsyncPropertySetter::uponReplyInvoke(_Function&& callback, return_slot_t)
+    {
+        static_assert( std::is_invocable_r_v<void, _Function, std::optional<Error>>
+                     , "Property set callback function must accept std::optional<Error> only" );
+
+        assert(!interfaceName_.empty()); // onInterface() must be placed/called prior to this function
+
+        return proxy_.callMethodAsync("Set")
+                     .onInterface(DBUS_PROPERTIES_INTERFACE_NAME)
+                     .withArguments(interfaceName_, propertyName_, std::move(value_))
+                     .uponReplyInvoke(std::forward<_Function>(callback), return_slot);
+    }
+
+    inline std::future<void> AsyncPropertySetter::getResultAsFuture()
+    {
+        assert(!interfaceName_.empty()); // onInterface() must be placed/called prior to this function
+
+        return proxy_.callMethodAsync("Set")
+                     .onInterface(DBUS_PROPERTIES_INTERFACE_NAME)
+                     .withArguments(interfaceName_, propertyName_, std::move(value_))
+                     .getResultAsFuture<>();
+    }
+
+    /*** ------------------- ***/
+    /*** AllPropertiesGetter ***/
+    /*** ------------------- ***/
+
+    inline AllPropertiesGetter::AllPropertiesGetter(IProxy& proxy)
+        : proxy_(proxy)
+    {
+    }
+
+    inline std::map<PropertyName, Variant> AllPropertiesGetter::onInterface(std::string_view interfaceName)
+    {
+        std::map<PropertyName, Variant> props;
+        proxy_.callMethod("GetAll")
+              .onInterface(DBUS_PROPERTIES_INTERFACE_NAME)
+              .withArguments(std::move(interfaceName))
+              .storeResultsTo(props);
+        return props;
+    }
+
+    /*** ------------------------ ***/
+    /*** AsyncAllPropertiesGetter ***/
+    /*** ------------------------ ***/
+
+    inline AsyncAllPropertiesGetter::AsyncAllPropertiesGetter(IProxy& proxy)
+            : proxy_(proxy)
+    {
+    }
+
+    inline AsyncAllPropertiesGetter& AsyncAllPropertiesGetter::onInterface(std::string_view interfaceName)
+    {
+        interfaceName_ = std::move(interfaceName);
+
+        return *this;
+    }
+
+    template <typename _Function>
+    PendingAsyncCall AsyncAllPropertiesGetter::uponReplyInvoke(_Function&& callback)
+    {
+        static_assert( std::is_invocable_r_v<void, _Function, std::optional<Error>, std::map<PropertyName, Variant>>
+                     , "All properties get callback function must accept std::optional<Error> and a map of property names to their values" );
+
+        assert(!interfaceName_.empty()); // onInterface() must be placed/called prior to this function
+
+        return proxy_.callMethodAsync("GetAll")
+                     .onInterface(DBUS_PROPERTIES_INTERFACE_NAME)
+                     .withArguments(interfaceName_)
+                     .uponReplyInvoke(std::forward<_Function>(callback));
+    }
+
+    template <typename _Function>
+    [[nodiscard]] Slot AsyncAllPropertiesGetter::uponReplyInvoke(_Function&& callback, return_slot_t)
+    {
+        static_assert( std::is_invocable_r_v<void, _Function, std::optional<Error>, std::map<PropertyName, Variant>>
+                     , "All properties get callback function must accept std::optional<Error> and a map of property names to their values" );
+
+        assert(!interfaceName_.empty()); // onInterface() must be placed/called prior to this function
+
+        return proxy_.callMethodAsync("GetAll")
+                     .onInterface(DBUS_PROPERTIES_INTERFACE_NAME)
+                     .withArguments(interfaceName_)
+                     .uponReplyInvoke(std::forward<_Function>(callback), return_slot);
+    }
+
+    inline std::future<std::map<PropertyName, Variant>> AsyncAllPropertiesGetter::getResultAsFuture()
+    {
+        assert(!interfaceName_.empty()); // onInterface() must be placed/called prior to this function
+
+        return proxy_.callMethodAsync("GetAll")
+                     .onInterface(DBUS_PROPERTIES_INTERFACE_NAME)
+                     .withArguments(interfaceName_)
+                     .getResultAsFuture<std::map<PropertyName, Variant>>();
+    }
+
+} // namespace sdbus
+
+#endif /* SDBUS_CPP_CONVENIENCEAPICLASSES_INL_ */
diff --git a/3rdParty/sdbus-cpp/include/sdbus-c++/Error.h b/3rdParty/sdbus-cpp/include/sdbus-c++/Error.h
new file mode 100644
index 0000000000..4f6e2e9d8e
--- /dev/null
+++ b/3rdParty/sdbus-cpp/include/sdbus-c++/Error.h
@@ -0,0 +1,106 @@
+/**
+ * (C) 2016 - 2021 KISTLER INSTRUMENTE AG, Winterthur, Switzerland
+ * (C) 2016 - 2024 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
+ *
+ * @file Error.h
+ *
+ * Created on: Nov 8, 2016
+ * Project: sdbus-c++
+ * Description: High-level D-Bus IPC C++ library based on sd-bus
+ *
+ * This file is part of sdbus-c++.
+ *
+ * sdbus-c++ is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * sdbus-c++ is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with sdbus-c++. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef SDBUS_CXX_ERROR_H_
+#define SDBUS_CXX_ERROR_H_
+
+#include <errno.h>
+#include <stdexcept>
+#include <string>
+
+namespace sdbus {
+
+    /********************************************//**
+     * @class Error
+     *
+     * Represents a common sdbus-c++ exception.
+     *
+     ***********************************************/
+    class Error
+        : public std::runtime_error
+    {
+    public:
+        // Strong type representing the D-Bus error name
+        class Name : public std::string
+        {
+        public:
+            Name() = default;
+            explicit Name(std::string value)
+                : std::string(std::move(value))
+            {}
+            explicit Name(const char* value)
+                : std::string(value)
+            {}
+
+            using std::string::operator=;
+        };
+
+        explicit Error(Name name, const char* message = nullptr)
+            : Error(std::move(name), std::string(message ? message : ""))
+        {
+        }
+
+        Error(Name name, std::string message)
+            : std::runtime_error(!message.empty() ? "[" + name + "] " + message : "[" + name + "]")
+            , name_(std::move(name))
+            , message_(std::move(message))
+        {
+        }
+
+        [[nodiscard]] const Name& getName() const
+        {
+            return name_;
+        }
+
+        [[nodiscard]] const std::string& getMessage() const
+        {
+            return message_;
+        }
+
+        [[nodiscard]] bool isValid() const
+        {
+            return !getName().empty();
+        }
+
+    private:
+        Name name_;
+        std::string message_;
+    };
+
+    Error createError(int errNo, std::string customMsg = {});
+
+    inline const Error::Name SDBUSCPP_ERROR_NAME{"org.sdbuscpp.Error"};
+}
+
+#define SDBUS_THROW_ERROR(_MSG, _ERRNO)                         \
+    throw sdbus::createError((_ERRNO), (_MSG))                  \
+    /**/
+
+#define SDBUS_THROW_ERROR_IF(_COND, _MSG, _ERRNO)               \
+    if (!(_COND)) ; else SDBUS_THROW_ERROR((_MSG), (_ERRNO))    \
+    /**/
+
+#endif /* SDBUS_CXX_ERROR_H_ */
diff --git a/3rdParty/sdbus-cpp/include/sdbus-c++/Flags.h b/3rdParty/sdbus-cpp/include/sdbus-c++/Flags.h
new file mode 100644
index 0000000000..d85a4aa51d
--- /dev/null
+++ b/3rdParty/sdbus-cpp/include/sdbus-c++/Flags.h
@@ -0,0 +1,99 @@
+/**
+ * (C) 2016 - 2021 KISTLER INSTRUMENTE AG, Winterthur, Switzerland
+ * (C) 2016 - 2024 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
+ *
+ * @file Flags.h
+ *
+ * Created on: Dec 31, 2018
+ * Project: sdbus-c++
+ * Description: High-level D-Bus IPC C++ library based on sd-bus
+ *
+ * This file is part of sdbus-c++.
+ *
+ * sdbus-c++ is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * sdbus-c++ is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with sdbus-c++. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef SDBUS_CXX_FLAGS_H_
+#define SDBUS_CXX_FLAGS_H_
+
+#include <bitset>
+#include <cstdint>
+
+namespace sdbus {
+
+    // D-Bus interface, method, signal or property flags
+    class Flags
+    {
+    public:
+        enum GeneralFlags : uint8_t
+        {    DEPRECATED = 0
+        ,    METHOD_NO_REPLY = 1
+        ,    PRIVILEGED = 2
+        };
+
+        enum PropertyUpdateBehaviorFlags : uint8_t
+        {   EMITS_CHANGE_SIGNAL = 3
+        ,   EMITS_INVALIDATION_SIGNAL = 4
+        ,   EMITS_NO_SIGNAL = 5
+        ,   CONST_PROPERTY_VALUE = 6
+        };
+
+        enum : uint8_t
+        {   FLAG_COUNT = 7
+        };
+
+        Flags()
+        {
+            // EMITS_CHANGE_SIGNAL is on by default
+            flags_.set(EMITS_CHANGE_SIGNAL, true);
+        }
+
+        void set(GeneralFlags flag, bool value = true)
+        {
+            flags_.set(flag, value);
+        }
+
+        void set(PropertyUpdateBehaviorFlags flag, bool value = true)
+        {
+            flags_.set(EMITS_CHANGE_SIGNAL, false);
+            flags_.set(EMITS_INVALIDATION_SIGNAL, false);
+            flags_.set(EMITS_NO_SIGNAL, false);
+            flags_.set(CONST_PROPERTY_VALUE, false);
+
+            flags_.set(flag, value);
+        }
+
+        [[nodiscard]] bool test(GeneralFlags flag) const
+        {
+            return flags_.test(flag);
+        }
+
+        [[nodiscard]] bool test(PropertyUpdateBehaviorFlags flag) const
+        {
+            return flags_.test(flag);
+        }
+
+        [[nodiscard]] uint64_t toSdBusInterfaceFlags() const;
+        [[nodiscard]] uint64_t toSdBusMethodFlags() const;
+        [[nodiscard]] uint64_t toSdBusSignalFlags() const;
+        [[nodiscard]] uint64_t toSdBusPropertyFlags() const;
+        [[nodiscard]] uint64_t toSdBusWritablePropertyFlags() const;
+
+    private:
+        std::bitset<FLAG_COUNT> flags_;
+    };
+
+}
+
+#endif /* SDBUS_CXX_FLAGS_H_ */
diff --git a/3rdParty/sdbus-cpp/include/sdbus-c++/IConnection.h b/3rdParty/sdbus-cpp/include/sdbus-c++/IConnection.h
new file mode 100644
index 0000000000..42caa76b4b
--- /dev/null
+++ b/3rdParty/sdbus-cpp/include/sdbus-c++/IConnection.h
@@ -0,0 +1,584 @@
+/**
+ * (C) 2016 - 2021 KISTLER INSTRUMENTE AG, Winterthur, Switzerland
+ * (C) 2016 - 2024 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
+ *
+ * @file IConnection.h
+ *
+ * Created on: Nov 8, 2016
+ * Project: sdbus-c++
+ * Description: High-level D-Bus IPC C++ library based on sd-bus
+ *
+ * This file is part of sdbus-c++.
+ *
+ * sdbus-c++ is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * sdbus-c++ is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with sdbus-c++. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef SDBUS_CXX_ICONNECTION_H_
+#define SDBUS_CXX_ICONNECTION_H_
+
+#include <sdbus-c++/TypeTraits.h>
+
+#include <chrono>
+#include <cstdint>
+#include <memory>
+#include <optional>
+#include <string>
+
+// Forward declarations
+struct sd_bus;
+struct sd_event;
+namespace sdbus {
+    class Message;
+    class ObjectPath;
+    class BusName;
+    using ServiceName = BusName;
+}
+
+namespace sdbus {
+
+    /********************************************//**
+     * @class IConnection
+     *
+     * An interface to D-Bus bus connection. Incorporates implementation
+     * of both synchronous and asynchronous D-Bus I/O event loop.
+     *
+     * All methods throw sdbus::Error in case of failure. All methods in
+     * this class are thread-aware, but not thread-safe.
+     *
+     ***********************************************/
+    class IConnection
+    {
+    public:
+        struct PollData;
+
+        virtual ~IConnection() = default;
+
+        /*!
+         * @brief Enters I/O event loop on this bus connection
+         *
+         * The incoming D-Bus messages are processed in the loop. The method
+         * blocks indefinitely, until unblocked through leaveEventLoop().
+         *
+         * @throws sdbus::Error in case of failure
+         */
+        virtual void enterEventLoop() = 0;
+
+        /*!
+         * @brief Enters I/O event loop on this bus connection in a separate thread
+         *
+         * The same as enterEventLoop, except that it doesn't block
+         * because it runs the loop in a separate, internally managed thread.
+         */
+        virtual void enterEventLoopAsync() = 0;
+
+        /*!
+         * @brief Leaves the I/O event loop running on this bus connection
+         *
+         * This causes the loop to exit and frees the thread serving the loop
+         *
+         * @throws sdbus::Error in case of failure
+         */
+        virtual void leaveEventLoop() = 0;
+
+        /*!
+         * @brief Attaches the bus connection to an sd-event event loop
+         *
+         * @param[in] event sd-event event loop object
+         * @param[in] priority Specified priority
+         *
+         * @throws sdbus::Error in case of failure
+         *
+         * See `man sd_bus_attach_event'.
+         */
+        virtual void attachSdEventLoop(sd_event *event, int priority = 0) = 0;
+
+        /*!
+         * @brief Detaches the bus connection from an sd-event event loop
+         *
+         * @throws sdbus::Error in case of failure
+         */
+        virtual void detachSdEventLoop() = 0;
+
+        /*!
+         * @brief Gets current sd-event event loop for the bus connection
+         *
+         * @return Pointer to event loop object if attached, nullptr otherwise
+         */
+        virtual sd_event *getSdEventLoop() = 0;
+
+        /*!
+         * @brief Returns fd's, I/O events and timeout data to be used in an external event loop
+         *
+         * This function is useful to hook up a bus connection object with an
+         * external (like GMainLoop, boost::asio, etc.) or manual event loop
+         * involving poll() or a similar I/O polling call.
+         *
+         * Before **each** invocation of the I/O polling call, this function
+         * should be invoked. Returned PollData::fd file descriptor should
+         * be polled for the events indicated by PollData::events, and the I/O
+         * call should block for that up to the returned PollData::timeout.
+         *
+         * Additionally, returned PollData::eventFd should be polled for POLLIN
+         * events.
+         *
+         * After each I/O polling call the bus connection needs to process
+         * incoming or outgoing data, by invoking processPendingEvent().
+         *
+         * Note that the returned timeout should be considered only a maximum
+         * sleeping time. It is permissible (and even expected) that shorter
+         * timeouts are used by the calling program, in case other event sources
+         * are polled in the same event loop. Note that the returned time-value
+         * is absolute, based of CLOCK_MONOTONIC and specified in microseconds.
+         * Use PollData::getPollTimeout() to have the timeout value converted
+         * in a form that can be passed to poll(2).
+         *
+         * The bus connection conveniently integrates sd-event event loop.
+         * To attach the bus connection to an sd-event event loop, use
+         * attachSdEventLoop() function.
+         *
+         * @throws sdbus::Error in case of failure
+         */
+        [[nodiscard]] virtual PollData getEventLoopPollData() const = 0;
+
+        /*!
+         * @brief Processes a pending event
+         *
+         * @returns True if an event was processed, false if no operations were pending
+         *
+         * This function drives the D-Bus connection. It processes pending I/O events.
+         * Queued outgoing messages (or parts thereof) are sent out. Queued incoming
+         * messages are dispatched to registered callbacks. Timeouts are recalculated.
+         *
+         * It returns false when no operations were pending and true if a message was
+         * processed. When false is returned the caller should synchronously poll for
+         * I/O events before calling into processPendingEvent() again.
+         * Don't forget to call getEventLoopPollData() each time before the next poll.
+         *
+         * You don't need to directly call this method or getEventLoopPollData() method
+         * when using convenient, internal bus connection event loops through
+         * enterEventLoop() or enterEventLoopAsync() calls, or when the bus is
+         * connected to an sd-event event loop through attachSdEventLoop().
+         * It is invoked automatically when necessary.
+         *
+         * @throws sdbus::Error in case of failure
+         */
+        virtual bool processPendingEvent() = 0;
+
+        /*!
+         * @brief Provides access to the currently processed D-Bus message
+         *
+         * This method provides access to the currently processed incoming D-Bus message.
+         * "Currently processed" means that the registered callback handler(s) for that message
+         * are being invoked. This method is meant to be called from within a callback handler
+         * (e.g. from a D-Bus signal handler, or async method reply handler, etc.). In such a case it is
+         * guaranteed to return a valid D-Bus message instance for which the handler is called.
+         * If called from other contexts/threads, it may return a valid or invalid message, depending
+         * on whether a message was processed or not at the time of the call.
+         *
+         * @return Currently processed D-Bus message
+         */
+        [[nodiscard]] virtual Message getCurrentlyProcessedMessage() const = 0;
+
+        /*!
+         * @brief Sets general method call timeout
+         *
+         * @param[in] timeout Timeout value in microseconds
+         *
+         * General method call timeout is used for all method calls upon this connection.
+         * Method call-specific timeout overrides this general setting.
+         *
+         * Supported by libsystemd>=v240.
+         *
+         * @throws sdbus::Error in case of failure
+         */
+        virtual void setMethodCallTimeout(uint64_t timeout) = 0;
+
+        /*!
+         * @copydoc IConnection::setMethodCallTimeout(uint64_t)
+         */
+        template <typename _Rep, typename _Period>
+        void setMethodCallTimeout(const std::chrono::duration<_Rep, _Period>& timeout);
+
+        /*!
+         * @brief Gets general method call timeout
+         *
+         * @return Timeout value in microseconds
+         *
+         * Supported by libsystemd>=v240.
+         *
+         * @throws sdbus::Error in case of failure
+         */
+        [[nodiscard]] virtual uint64_t getMethodCallTimeout() const = 0;
+
+        /*!
+         * @brief Adds an ObjectManager at the specified D-Bus object path
+         * @param[in] objectPath Object path at which the ObjectManager interface shall be installed
+         *
+         * Creates an ObjectManager interface at the specified object path on
+         * the connection. This is a convenient way to interrogate a connection
+         * to see what objects it has.
+         *
+         * This call creates a floating registration. The ObjectManager will
+         * be there for the object path until the connection is destroyed.
+         *
+         * Another, recommended way to add object managers is directly through IObject API.
+         *
+         * @throws sdbus::Error in case of failure
+         */
+        virtual void addObjectManager(const ObjectPath& objectPath) = 0;
+
+        /*!
+         * @brief Adds an ObjectManager at the specified D-Bus object path
+         * @param[in] objectPath Object path at which the ObjectManager interface shall be installed
+         * @return Slot handle owning the registration
+         *
+         * Creates an ObjectManager interface at the specified object path on
+         * the connection. This is a convenient way to interrogate a connection
+         * to see what objects it has.
+         *
+         * This call returns an owning slot. The lifetime of the ObjectManager
+         * interface is bound to the lifetime of the returned slot instance.
+         *
+         * Another, recommended way to add object managers is directly through IObject API.
+         *
+         * @throws sdbus::Error in case of failure
+         */
+        [[nodiscard]] virtual Slot addObjectManager(const ObjectPath& objectPath, return_slot_t) = 0;
+
+        /*!
+         * @brief Installs a floating match rule for messages received on this bus connection
+         *
+         * @param[in] match Match expression to filter incoming D-Bus message
+         * @param[in] callback Callback handler to be called upon processing an inbound D-Bus message matching the rule
+         *
+         * The method installs a match rule for messages received on the specified bus connection.
+         * The syntax of the match rule expression passed in match is described in the D-Bus specification.
+         * The specified handler function callback is called for each incoming message matching the specified
+         * expression. The match is installed synchronously when connected to a bus broker, i.e. the call
+         * sends a control message requesting the match to be added to the broker and waits until the broker
+         * confirms the match has been installed successfully.
+         *
+         * The method installs a floating match rule for messages received on the specified bus connection.
+         * Floating means that the bus connection object owns the match rule, i.e. lifetime of the match rule
+         * is bound to the lifetime of the bus connection.
+         *
+         * For more information, consult `man sd_bus_add_match`.
+         *
+         * @throws sdbus::Error in case of failure
+         */
+        virtual void addMatch(const std::string& match, message_handler callback) = 0;
+
+        /*!
+         * @brief Installs a match rule for messages received on this bus connection
+         *
+         * @param[in] match Match expression to filter incoming D-Bus message
+         * @param[in] callback Callback handler to be called upon processing an inbound D-Bus message matching the rule
+         * @return RAII-style slot handle representing the ownership of the subscription
+         *
+         * The method installs a match rule for messages received on the specified bus connection.
+         * The syntax of the match rule expression passed in match is described in the D-Bus specification.
+         * The specified handler function callback is called for each incoming message matching the specified
+         * expression. The match is installed synchronously when connected to a bus broker, i.e. the call
+         * sends a control message requesting the match to be added to the broker and waits until the broker
+         * confirms the match has been installed successfully.
+         *
+         * The lifetime of the match rule is bound to the lifetime of the returned slot instance. Destroying
+         * the slot instance implies uninstalling of the match rule from the bus connection.
+         *
+         * For more information, consult `man sd_bus_add_match`.
+         *
+         * @throws sdbus::Error in case of failure
+         */
+        [[nodiscard]] virtual Slot addMatch(const std::string& match, message_handler callback, return_slot_t) = 0;
+
+        /*!
+         * @brief Asynchronously installs a floating match rule for messages received on this bus connection
+         *
+         * @param[in] match Match expression to filter incoming D-Bus message
+         * @param[in] callback Callback handler to be called upon processing an inbound D-Bus message matching the rule
+         * @param[in] installCallback Callback handler to be called upon processing an inbound D-Bus message matching the rule
+         *
+         * This method operates the same as `addMatch()` above, just that it installs the match rule asynchronously,
+         * in a non-blocking fashion. A request is sent to the broker, but the call does not wait for a response.
+         * The `installCallback' callable is called when the response is later received, with the response message
+         * from the broker as parameter. If it's an empty function object, a default implementation is used that
+         * terminates the bus connection should installing the match fail.
+         *
+         * The method installs a floating match rule for messages received on the specified bus connection.
+         * Floating means that the bus connection object owns the match rule, i.e. lifetime of the match rule
+         * is bound to the lifetime of the bus connection.
+         *
+         * For more information, consult `man sd_bus_add_match_async`.
+         *
+         * @throws sdbus::Error in case of failure
+         */
+        virtual void addMatchAsync(const std::string& match, message_handler callback, message_handler installCallback) = 0;
+
+        /*!
+         * @brief Asynchronously installs a match rule for messages received on this bus connection
+         *
+         * @param[in] match Match expression to filter incoming D-Bus message
+         * @param[in] callback Callback handler to be called upon processing an inbound D-Bus message matching the rule
+         * @param[in] installCallback Callback handler to be called upon processing an inbound D-Bus message matching the rule
+         * @return RAII-style slot handle representing the ownership of the subscription
+         *
+         * This method operates the same as `addMatch()` above, just that it installs the match rule asynchronously,
+         * in a non-blocking fashion. A request is sent to the broker, but the call does not wait for a response.
+         * The `installCallback' callable is called when the response is later received, with the response message
+         * from the broker as parameter. If it's an empty function object, a default implementation is used that
+         * terminates the bus connection should installing the match fail.
+         *
+         * The lifetime of the match rule is bound to the lifetime of the returned slot instance. Destroying
+         * the slot instance implies the uninstalling of the match rule from the bus connection.
+         *
+         * For more information, consult `man sd_bus_add_match_async`.
+         *
+         * @throws sdbus::Error in case of failure
+         */
+        [[nodiscard]] virtual Slot addMatchAsync( const std::string& match
+                                                , message_handler callback
+                                                , message_handler installCallback
+                                                , return_slot_t ) = 0;
+
+        /*!
+         * @brief Retrieves the unique name of a connection. E.g. ":1.xx"
+         *
+         * @throws sdbus::Error in case of failure
+         */
+        [[nodiscard]] virtual BusName getUniqueName() const = 0;
+
+        /*!
+         * @brief Requests a well-known D-Bus service name on a bus
+         *
+         * @param[in] name Name to request
+         *
+         * @throws sdbus::Error in case of failure
+         */
+        virtual void requestName(const ServiceName& name) = 0;
+
+        /*!
+         * @brief Releases an acquired well-known D-Bus service name on a bus
+         *
+         * @param[in] name Name to release
+         *
+         * @throws sdbus::Error in case of failure
+         */
+        virtual void releaseName(const ServiceName& name) = 0;
+
+        /*!
+         * @struct PollData
+         *
+         * Carries poll data needed for integration with external event loop implementations.
+         *
+         * See getEventLoopPollData() for more info.
+         */
+        struct PollData
+        {
+            /*!
+             * The read fd to be monitored by the event loop.
+             */
+            int fd;
+
+            /*!
+             * The events to use for poll(2) alongside fd.
+             */
+            short int events;
+
+            /*!
+             * Absolute timeout value in microseconds, based of CLOCK_MONOTONIC.
+             *
+             * Call getPollTimeout() to get timeout recalculated to relative timeout that can be passed to poll(2).
+             */
+            std::chrono::microseconds timeout;
+
+            /*!
+             * An additional event fd to be monitored by the event loop for POLLIN events.
+             */
+            int eventFd;
+
+            /*!
+             * Returns the timeout as relative value from now.
+             *
+             * Returned value is std::chrono::microseconds::max() if the timeout is indefinite.
+             *
+             * @return Relative timeout as a time duration
+             */
+            [[nodiscard]] std::chrono::microseconds getRelativeTimeout() const;
+
+            /*!
+             * Returns relative timeout in the form which can be passed as argument 'timeout' to poll(2)
+             *
+             * @return -1 if the timeout is indefinite. 0 if the poll(2) shouldn't block.
+             *         An integer in milliseconds otherwise.
+             */
+            [[nodiscard]] int getPollTimeout() const;
+        };
+    };
+
+    template <typename _Rep, typename _Period>
+    inline void IConnection::setMethodCallTimeout(const std::chrono::duration<_Rep, _Period>& timeout)
+    {
+        auto microsecs = std::chrono::duration_cast<std::chrono::microseconds>(timeout);
+        return setMethodCallTimeout(microsecs.count());
+    }
+
+    /*!
+     * @brief Creates/opens D-Bus session bus connection when in a user context, and a system bus connection, otherwise.
+     *
+     * @return Connection instance
+     *
+     * @throws sdbus::Error in case of failure
+     */
+    [[nodiscard]] std::unique_ptr<sdbus::IConnection> createBusConnection();
+
+    /*!
+     * @brief Creates/opens D-Bus session bus connection with a name when in a user context, and a system bus connection with a name, otherwise.
+     *
+     * @param[in] name Name to request on the connection after its opening
+     * @return Connection instance
+     *
+     * @throws sdbus::Error in case of failure
+     */
+    [[nodiscard]] std::unique_ptr<sdbus::IConnection> createBusConnection(const ServiceName& name);
+
+    /*!
+     * @brief Creates/opens D-Bus system bus connection
+     *
+     * @return Connection instance
+     *
+     * @throws sdbus::Error in case of failure
+     */
+    [[nodiscard]] std::unique_ptr<sdbus::IConnection> createSystemBusConnection();
+
+    /*!
+     * @brief Creates/opens D-Bus system bus connection with a name
+     *
+     * @param[in] name Name to request on the connection after its opening
+     * @return Connection instance
+     *
+     * @throws sdbus::Error in case of failure
+     */
+    [[nodiscard]] std::unique_ptr<sdbus::IConnection> createSystemBusConnection(const ServiceName& name);
+
+    /*!
+     * @brief Creates/opens D-Bus session bus connection
+     *
+     * @return Connection instance
+     *
+     * @throws sdbus::Error in case of failure
+     */
+    [[nodiscard]] std::unique_ptr<sdbus::IConnection> createSessionBusConnection();
+
+    /*!
+     * @brief Creates/opens D-Bus session bus connection with a name
+     *
+     * @param[in] name Name to request on the connection after its opening
+     * @return Connection instance
+     *
+     * @throws sdbus::Error in case of failure
+     */
+    [[nodiscard]] std::unique_ptr<sdbus::IConnection> createSessionBusConnection(const ServiceName& name);
+
+    /*!
+     * @brief Creates/opens D-Bus session bus connection at a custom address
+     *
+     * @param[in] address ";"-separated list of addresses of bus brokers to try to connect
+     * @return Connection instance
+     *
+     * @throws sdbus::Error in case of failure
+     *
+     * Consult manual pages for `sd_bus_set_address` of the underlying sd-bus library for more information.
+     */
+    [[nodiscard]] std::unique_ptr<sdbus::IConnection> createSessionBusConnectionWithAddress(const std::string& address);
+
+    /*!
+     * @brief Creates/opens D-Bus system connection on a remote host using ssh
+     *
+     * @param[in] host Name of the host to connect
+     * @return Connection instance
+     *
+     * @throws sdbus::Error in case of failure
+     */
+    [[nodiscard]] std::unique_ptr<sdbus::IConnection> createRemoteSystemBusConnection(const std::string& host);
+
+    /*!
+     * @brief Opens direct D-Bus connection at a custom address
+     *
+     * @param[in] address ";"-separated list of addresses of bus brokers to try to connect to
+     * @return Connection instance
+     *
+     * @throws sdbus::Error in case of failure
+     */
+    [[nodiscard]] std::unique_ptr<sdbus::IConnection> createDirectBusConnection(const std::string& address);
+
+    /*!
+     * @brief Opens direct D-Bus connection at the given file descriptor
+     *
+     * @param[in] fd File descriptor used to communicate directly from/to a D-Bus server
+     * @return Connection instance
+     *
+     * The underlying sdbus-c++ connection instance takes over ownership of fd, so the caller can let it go.
+     * If, however, the call throws an exception, the ownership of fd remains with the caller.
+     *
+     * @throws sdbus::Error in case of failure
+     */
+    [[nodiscard]] std::unique_ptr<sdbus::IConnection> createDirectBusConnection(int fd);
+
+    /*!
+     * @brief Opens direct D-Bus connection at fd as a server
+     *
+     * @param[in] fd File descriptor to use for server DBus connection
+     * @return Server connection instance
+     *
+     * This creates a new, custom bus object in server mode. One can then call createDirectBusConnection()
+     * on client side to connect to this bus.
+     *
+     * The underlying sdbus-c++ connection instance takes over ownership of fd, so the caller can let it go.
+     * If, however, the call throws an exception, the ownership of fd remains with the caller.
+     *
+     * @throws sdbus::Error in case of failure
+     */
+    [[nodiscard]] std::unique_ptr<sdbus::IConnection> createServerBus(int fd);
+
+    /*!
+     * @brief Creates sdbus-c++ bus connection representation out of underlying sd_bus instance
+     *
+     * @param[in] bus File descriptor to use for server DBus connection
+     * @return Connection instance
+     *
+     * This functions is helpful in cases where clients need a custom, tweaked configuration of their
+     * bus object. Since sdbus-c++ does not provide C++ API for all bus connection configuration
+     * functions of the underlying sd-bus library, clients can use these sd-bus functions themselves
+     * to create and configure their sd_bus object, and create sdbus-c++ IConnection on top of it.
+     *
+     * The IConnection instance assumes unique ownership of the provided bus object. The bus object
+     * must have been started by the client before this call.
+     * The bus object will get flushed, closed, and unreffed when the IConnection instance is destroyed.
+     *
+     * @throws sdbus::Error in case of failure
+     *
+     * Code example:
+     * @code
+     * sd_bus* bus{};
+     * ::sd_bus_new(&bus);
+     * ::sd_bus_set_address(bus, address);
+     * ::sd_bus_set_anonymous(bus, true);
+     * ::sd_bus_start(bus);
+     * auto con = sdbus::createBusConnection(bus); // IConnection consumes sd_bus object
+     * @endcode
+     */
+    [[nodiscard]] std::unique_ptr<sdbus::IConnection> createBusConnection(sd_bus *bus);
+}
+
+#endif /* SDBUS_CXX_ICONNECTION_H_ */
diff --git a/3rdParty/sdbus-cpp/include/sdbus-c++/IObject.h b/3rdParty/sdbus-cpp/include/sdbus-c++/IObject.h
new file mode 100644
index 0000000000..21953bcc13
--- /dev/null
+++ b/3rdParty/sdbus-cpp/include/sdbus-c++/IObject.h
@@ -0,0 +1,484 @@
+/**
+ * (C) 2016 - 2021 KISTLER INSTRUMENTE AG, Winterthur, Switzerland
+ * (C) 2016 - 2024 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
+ *
+ * @file IObject.h
+ *
+ * Created on: Nov 8, 2016
+ * Project: sdbus-c++
+ * Description: High-level D-Bus IPC C++ library based on sd-bus
+ *
+ * This file is part of sdbus-c++.
+ *
+ * sdbus-c++ is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * sdbus-c++ is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with sdbus-c++. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef SDBUS_CXX_IOBJECT_H_
+#define SDBUS_CXX_IOBJECT_H_
+
+#include <sdbus-c++/ConvenienceApiClasses.h>
+#include <sdbus-c++/Flags.h>
+#include <sdbus-c++/TypeTraits.h>
+#include <sdbus-c++/VTableItems.h>
+
+#include <functional>
+#include <memory>
+#include <string>
+#include <vector>
+
+// Forward declarations
+namespace sdbus {
+    class Signal;
+    class IConnection;
+    class ObjectPath;
+}
+
+namespace sdbus {
+
+    /********************************************//**
+     * @class IObject
+     *
+     * IObject class represents a D-Bus object instance identified by a specific object path.
+     * D-Bus object provides its interfaces, methods, signals and properties on a bus
+     * identified by a specific bus name.
+     *
+     * All IObject member methods throw @c sdbus::Error in case of D-Bus or sdbus-c++ error.
+     * The IObject class has been designed as thread-aware. However, the operation of
+     * creating and sending asynchronous method replies, as well as creating and emitting
+     * signals, is thread-safe by design.
+     *
+     ***********************************************/
+    class IObject
+    {
+    public: // High-level, convenience API
+        virtual ~IObject() = default;
+
+        /*!
+         * @brief Adds a declaration of methods, properties and signals of the object at a given interface
+         *
+         * @param[in] vtable Individual instances of VTable item structures stored in a vector
+         * @return VTableAdder high-level helper class
+         *
+         * This method is used to declare attributes for the object under the given interface.
+         * Parameter `vtable' represents a vtable definition that may contain method declarations
+         * (using MethodVTableItem struct), property declarations (using PropertyVTableItem
+         * struct), signal declarations (using SignalVTableItem struct), or global interface
+         * flags (using InterfaceFlagsVTableItem struct).
+         *
+         * An interface can have any number of vtables attached to it.
+         *
+         * Consult manual pages for the underlying `sd_bus_add_object_vtable` function for more information.
+         *
+         * The method can be called at any time during object's lifetime.
+         *
+         * When called like `addVTable(vtable).forInterface(interface)`, then an internal registration
+         * slot is created for that vtable and its lifetime is tied to the lifetime of the Object instance.
+         * When called like `addVTable(items...).forInterface(interface, sdbus::return_slot)`, then an internal
+         * registration slot is created for the vtable and is returned to the caller. Keeping the slot means
+         * keep the registration "alive". Destroying the slot means that the vtable is not needed anymore,
+         * and the vtable gets removed from the object. This allows for "dynamic" object API where vtables
+         * can be added or removed by the user at runtime.
+         *
+         * The function provides strong exception guarantee. The state of the object remains
+         * unmodified in face of an exception.
+         *
+         * @throws sdbus::Error in case of failure
+         */
+        [[nodiscard]] VTableAdder addVTable(std::vector<VTableItem> vtable);
+
+        /*!
+         * @brief Adds a declaration of methods, properties and signals of the object at a given interface
+         *
+         * @param[in] items Individual instances of VTable item structures
+         * @return VTableAdder high-level helper class
+         *
+         * This method is used to declare attributes for the object under the given interface.
+         * Parameter pack contains vtable definition that may contain method declarations
+         * (using MethodVTableItem struct), property declarations (using PropertyVTableItem
+         * struct), signal declarations (using SignalVTableItem struct), or global interface
+         * flags (using InterfaceFlagsVTableItem struct).
+         *
+         * An interface can have any number of vtables attached to it.
+         *
+         * Consult manual pages for the underlying `sd_bus_add_object_vtable` function for more information.
+         *
+         * The method can be called at any time during object's lifetime.
+         *
+         * When called like `addVTable(items...).forInterface(interface)`, then an internal registration
+         * slot is created for that vtable and its lifetime is tied to the lifetime of the Object instance.
+         * When called like `addVTable(items...).forInterface(interface, sdbus::return_slot)`, then an internal
+         * registration slot is created for the vtable and is returned to the caller. Keeping the slot means
+         * keep the registration "alive". Destroying the slot means that the vtable is not needed anymore,
+         * and the vtable gets removed from the object. This allows for "dynamic" object API where vtables
+         * can be added or removed by the user at runtime.
+         *
+         * The function provides strong exception guarantee. The state of the object remains
+         * unmodified in face of an exception.
+         *
+         * @throws sdbus::Error in case of failure
+         */
+        template < typename... VTableItems
+                 , typename = std::enable_if_t<(is_one_of_variants_types<VTableItem, std::decay_t<VTableItems>> && ...)> >
+        [[nodiscard]] VTableAdder addVTable(VTableItems&&... items);
+
+        /*!
+         * @brief Emits signal on D-Bus
+         *
+         * @param[in] signalName Name of the signal
+         * @return A helper object for convenient emission of signals
+         *
+         * This is a high-level, convenience way of emitting D-Bus signals that abstracts
+         * from the D-Bus message concept. Signal arguments are automatically serialized
+         * in a message and D-Bus signatures automatically deduced from the provided native arguments.
+         *
+         * Example of use:
+         * @code
+         * int arg1 = ...;
+         * double arg2 = ...;
+         * SignalName fooSignal{"fooSignal"};
+         * object_.emitSignal(fooSignal).onInterface("com.kistler.foo").withArguments(arg1, arg2);
+         * @endcode
+         *
+         * @throws sdbus::Error in case of failure
+         */
+        [[nodiscard]] SignalEmitter emitSignal(const SignalName& signalName);
+
+        /*!
+         * @copydoc IObject::emitSignal(const SignalName&)
+         */
+        [[nodiscard]] SignalEmitter emitSignal(const std::string& signalName);
+
+        /*!
+         * @copydoc IObject::emitSignal(const SignalName&)
+         */
+        [[nodiscard]] SignalEmitter emitSignal(const char* signalName);
+
+        /*!
+         * @brief Emits PropertyChanged signal for specified properties under a given interface of this object path
+         *
+         * @param[in] interfaceName Name of an interface that properties belong to
+         * @param[in] propNames Names of properties that will be included in the PropertiesChanged signal
+         *
+         * @throws sdbus::Error in case of failure
+         */
+        virtual void emitPropertiesChangedSignal(const InterfaceName& interfaceName, const std::vector<PropertyName>& propNames) = 0;
+
+        /*!
+         * @copydoc IObject::emitPropertiesChangedSignal(const InterfaceName&,const std::vector<PropertyName>&)
+         */
+        virtual void emitPropertiesChangedSignal(const char* interfaceName, const std::vector<PropertyName>& propNames) = 0;
+
+        /*!
+         * @brief Emits PropertyChanged signal for all properties on a given interface of this object path
+         *
+         * @param[in] interfaceName Name of an interface
+         *
+         * @throws sdbus::Error in case of failure
+         */
+        virtual void emitPropertiesChangedSignal(const InterfaceName& interfaceName) = 0;
+
+        /*!
+         * @copydoc IObject::emitPropertiesChangedSignal(const InterfaceName&)
+         */
+        virtual void emitPropertiesChangedSignal(const char* interfaceName) = 0;
+
+        /*!
+         * @brief Emits InterfacesAdded signal on this object path
+         *
+         * This emits an InterfacesAdded signal on this object path, by iterating all registered
+         * interfaces on the path. All properties are queried and included in the signal.
+         * This call is equivalent to emitInterfacesAddedSignal() with an explicit list of
+         * registered interfaces. However, unlike emitInterfacesAddedSignal(interfaces), this
+         * call can figure out the list of supported interfaces itself. Furthermore, it properly
+         * adds the builtin org.freedesktop.DBus.* interfaces.
+         *
+         * @throws sdbus::Error in case of failure
+         */
+        virtual void emitInterfacesAddedSignal() = 0;
+
+        /*!
+         * @brief Emits InterfacesAdded signal on this object path
+         *
+         * This emits an InterfacesAdded signal on this object path with explicitly provided list
+         * of registered interfaces. Since v2.0, sdbus-c++ supports dynamically addable/removable
+         * object interfaces and their vtables, so this method now makes more sense.
+         *
+         * @throws sdbus::Error in case of failure
+         */
+        virtual void emitInterfacesAddedSignal(const std::vector<InterfaceName>& interfaces) = 0;
+
+        /*!
+         * @brief Emits InterfacesRemoved signal on this object path
+         *
+         * This is like sd_bus_emit_object_added(), but emits an InterfacesRemoved signal on this
+         * object path. This only includes any registered interfaces but skips the properties.
+         * This function shall be called (just) before destroying the object.
+         *
+         * @throws sdbus::Error in case of failure
+         */
+        virtual void emitInterfacesRemovedSignal() = 0;
+
+        /*!
+         * @brief Emits InterfacesRemoved signal on this object path
+         *
+         * This emits an InterfacesRemoved signal on the given path with explicitly provided list
+         * of registered interfaces. Since v2.0, sdbus-c++ supports dynamically addable/removable
+         * object interfaces and their vtables, so this method now makes more sense.
+         *
+         * @throws sdbus::Error in case of failure
+         */
+        virtual void emitInterfacesRemovedSignal(const std::vector<InterfaceName>& interfaces) = 0;
+
+        /*!
+         * @brief Adds an ObjectManager interface at the path of this D-Bus object
+         *
+         * Creates an ObjectManager interface at the specified object path on
+         * the connection. This is a convenient way to interrogate a connection
+         * to see what objects it has.
+         *
+         * This call creates a so-called floating registration. This means that
+         * the ObjectManager interface stays there for the lifetime of the object.
+         *
+         * @throws sdbus::Error in case of failure
+         */
+        virtual void addObjectManager() = 0;
+
+        /*!
+         * @brief Adds an ObjectManager interface at the path of this D-Bus object
+         *
+         * @return Slot handle owning the registration
+         *
+         * Creates an ObjectManager interface at the specified object path on
+         * the connection. This is a convenient way to interrogate a connection
+         * to see what objects it has.
+         *
+         * The lifetime of the ObjectManager interface is bound to the lifetime
+         * of the returned slot instance.
+         *
+         * @throws sdbus::Error in case of failure
+         */
+        [[nodiscard]] virtual Slot addObjectManager(return_slot_t) = 0;
+
+        /*!
+         * @brief Provides D-Bus connection used by the object
+         *
+         * @return Reference to the D-Bus connection
+         */
+        [[nodiscard]] virtual sdbus::IConnection& getConnection() const = 0;
+
+        /*!
+         * @brief Returns object path of the underlying DBus object
+         */
+        [[nodiscard]] virtual const ObjectPath& getObjectPath() const = 0;
+
+        /*!
+         * @brief Provides access to the currently processed D-Bus message
+         *
+         * This method provides access to the currently processed incoming D-Bus message.
+         * "Currently processed" means that the registered callback handler(s) for that message
+         * are being invoked. This method is meant to be called from within a callback handler
+         * (e.g. from a D-Bus signal handler, or async method reply handler, etc.). In such a case it is
+         * guaranteed to return a valid D-Bus message instance for which the handler is called.
+         * If called from other contexts/threads, it may return a valid or invalid message, depending
+         * on whether a message was processed or not at the time of the call.
+         *
+         * @return Currently processed D-Bus message
+         */
+        [[nodiscard]] virtual Message getCurrentlyProcessedMessage() const = 0;
+
+        /*!
+         * @brief Unregisters object's API and removes object from the bus
+         *
+         * This method unregisters the object, its interfaces, methods, signals and properties
+         * from the bus. Unregistration is done automatically also in object's destructor. This
+         * method makes sense if, in the process of object removal, we need to make sure that
+         * callbacks are unregistered explicitly before the final destruction of the object instance.
+         *
+         * @throws sdbus::Error in case of failure
+         */
+        virtual void unregister() = 0;
+
+    public: // Lower-level, message-based API
+        /*!
+         * @brief Adds a declaration of methods, properties and signals of the object at a given interface
+         *
+         * @param[in] interfaceName Name of an interface the the vtable is registered for
+         * @param[in] items Individual instances of VTable item structures
+         *
+         * This method is used to declare attributes for the object under the given interface.
+         * Parameter `items' represents a vtable definition that may contain method declarations
+         * (using MethodVTableItem struct), property declarations (using PropertyVTableItem
+         * struct), signal declarations (using SignalVTableItem struct), or global interface
+         * flags (using InterfaceFlagsVTableItem struct).
+         *
+         * An interface can have any number of vtables attached to it.
+         *
+         * Consult manual pages for the underlying `sd_bus_add_object_vtable` function for more information.
+         *
+         * The method can be called at any time during object's lifetime. For each vtable an internal
+         * registration slot is created and its lifetime is tied to the lifetime of the Object instance.
+         *
+         * The function provides strong exception guarantee. The state of the object remains
+         * unmodified in face of an exception.
+         *
+         * @throws sdbus::Error in case of failure
+         */
+        template < typename... VTableItems
+                 , typename = std::enable_if_t<(is_one_of_variants_types<VTableItem, std::decay_t<VTableItems>> && ...)> >
+        void addVTable(InterfaceName interfaceName, VTableItems&&... items);
+
+        /*!
+         * @brief Adds a declaration of methods, properties and signals of the object at a given interface
+         *
+         * @param[in] interfaceName Name of an interface the the vtable is registered for
+         * @param[in] vtable A list of individual descriptions in the form of VTable item instances
+         *
+         * This method is used to declare attributes for the object under the given interface.
+         * The `vtable' parameter may contain method declarations (using MethodVTableItem struct),
+         * property declarations (using PropertyVTableItem struct), signal declarations (using
+         * SignalVTableItem struct), or global interface flags (using InterfaceFlagsVTableItem struct).
+         *
+         * An interface can have any number of vtables attached to it.
+         *
+         * Consult manual pages for the underlying `sd_bus_add_object_vtable` function for more information.
+         *
+         * The method can be called at any time during object's lifetime. For each vtable an internal
+         * registration slot is created and its lifetime is tied to the lifetime of the Object instance.
+         *
+         * The function provides strong exception guarantee. The state of the object remains
+         * unmodified in face of an exception.
+         *
+         * @throws sdbus::Error in case of failure
+         */
+        virtual void addVTable(InterfaceName interfaceName, std::vector<VTableItem> vtable) = 0;
+
+        /*!
+         * @brief Adds a declaration of methods, properties and signals of the object at a given interface
+         *
+         * @param[in] interfaceName Name of an interface the the vtable is registered for
+         * @param[in] vtable A list of individual descriptions in the form of VTable item instances
+         *
+         * This method is used to declare attributes for the object under the given interface.
+         * The `vtable' parameter may contain method declarations (using MethodVTableItem struct),
+         * property declarations (using PropertyVTableItem struct), signal declarations (using
+         * SignalVTableItem struct), or global interface flags (using InterfaceFlagsVTableItem struct).
+         *
+         * An interface can have any number of vtables attached to it.
+         *
+         * Consult manual pages for the underlying `sd_bus_add_object_vtable` function for more information.
+         *
+         * The method can be called at any time during object's lifetime. For each vtable an internal
+         * registration slot is created and is returned to the caller. The returned slot should be destroyed
+         * when the vtable is not needed anymore. This allows for "dynamic" object API where vtables
+         * can be added or removed by the user at runtime.
+         *
+         * The function provides strong exception guarantee. The state of the object remains
+         * unmodified in face of an exception.
+         *
+         * @throws sdbus::Error in case of failure
+         */
+        [[nodiscard]] virtual Slot addVTable(InterfaceName interfaceName, std::vector<VTableItem> vtable, return_slot_t) = 0;
+
+        /*!
+         * @brief Creates a signal message
+         *
+         * @param[in] interfaceName Name of an interface that the signal belongs under
+         * @param[in] signalName Name of the signal
+         * @return A signal message
+         *
+         * Serialize signal arguments into the returned message and emit the signal by passing
+         * the message with serialized arguments to the @c emitSignal function.
+         * Alternatively, use higher-level API @c emitSignal(const std::string& signalName) defined below.
+         *
+         * @throws sdbus::Error in case of failure
+         */
+        [[nodiscard]] virtual Signal createSignal(const InterfaceName& interfaceName, const SignalName& signalName) const = 0;
+
+        /*!
+         * @brief Emits signal for this object path
+         *
+         * @param[in] message Signal message to be sent out
+         *
+         * Note: To avoid messing with messages, use higher-level API defined below.
+         *
+         * @throws sdbus::Error in case of failure
+         */
+        virtual void emitSignal(const sdbus::Signal& message) = 0;
+
+    protected: // Internal API for efficiency reasons used by high-level API helper classes
+        friend SignalEmitter;
+
+        [[nodiscard]] virtual Signal createSignal(const char* interfaceName, const char* signalName) const = 0;
+    };
+
+    // Out-of-line member definitions
+
+    inline SignalEmitter IObject::emitSignal(const SignalName& signalName)
+    {
+        return SignalEmitter(*this, signalName);
+    }
+
+    inline SignalEmitter IObject::emitSignal(const std::string& signalName)
+    {
+        return SignalEmitter(*this, signalName.c_str());
+    }
+
+    inline SignalEmitter IObject::emitSignal(const char* signalName)
+    {
+        return SignalEmitter(*this, signalName);
+    }
+
+    template <typename... VTableItems, typename>
+    void IObject::addVTable(InterfaceName interfaceName, VTableItems&&... items)
+    {
+        addVTable(std::move(interfaceName), {std::forward<VTableItems>(items)...});
+    }
+
+    template <typename... VTableItems, typename>
+    VTableAdder IObject::addVTable(VTableItems&&... items)
+    {
+        return addVTable(std::vector<VTableItem>{std::forward<VTableItems>(items)...});
+    }
+
+    inline VTableAdder IObject::addVTable(std::vector<VTableItem> vtable)
+    {
+        return VTableAdder(*this, std::move(vtable));
+    }
+
+    /*!
+     * @brief Creates instance representing a D-Bus object
+     *
+     * @param[in] connection D-Bus connection to be used by the object
+     * @param[in] objectPath Path of the D-Bus object
+     * @return Pointer to the object representation instance
+     *
+     * The provided connection will be used by the object to export methods,
+     * issue signals and provide properties.
+     *
+     * Creating a D-Bus object instance is (thread-)safe even upon the connection
+     * which is already running its I/O event loop.
+     *
+     * Code example:
+     * @code
+     * auto proxy = sdbus::createObject(connection, "/com/kistler/foo");
+     * @endcode
+     */
+    [[nodiscard]] std::unique_ptr<sdbus::IObject> createObject(sdbus::IConnection& connection, ObjectPath objectPath);
+
+}
+
+#include <sdbus-c++/ConvenienceApiClasses.inl>
+#include <sdbus-c++/VTableItems.inl>
+
+#endif /* SDBUS_CXX_IOBJECT_H_ */
diff --git a/3rdParty/sdbus-cpp/include/sdbus-c++/IProxy.h b/3rdParty/sdbus-cpp/include/sdbus-c++/IProxy.h
new file mode 100644
index 0000000000..5c21191a20
--- /dev/null
+++ b/3rdParty/sdbus-cpp/include/sdbus-c++/IProxy.h
@@ -0,0 +1,981 @@
+/**
+ * (C) 2016 - 2021 KISTLER INSTRUMENTE AG, Winterthur, Switzerland
+ * (C) 2016 - 2024 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
+ *
+ * @file IProxy.h
+ *
+ * Created on: Nov 8, 2016
+ * Project: sdbus-c++
+ * Description: High-level D-Bus IPC C++ library based on sd-bus
+ *
+ * This file is part of sdbus-c++.
+ *
+ * sdbus-c++ is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * sdbus-c++ is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with sdbus-c++. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef SDBUS_CXX_IPROXY_H_
+#define SDBUS_CXX_IPROXY_H_
+
+#include <sdbus-c++/ConvenienceApiClasses.h>
+#include <sdbus-c++/TypeTraits.h>
+
+#include <chrono>
+#include <functional>
+#include <future>
+#include <memory>
+#include <string>
+#include <string_view>
+
+// Forward declarations
+namespace sdbus {
+    class MethodCall;
+    class MethodReply;
+    class IConnection;
+    class ObjectPath;
+    class PendingAsyncCall;
+    namespace internal {
+        class Proxy;
+    }
+}
+
+namespace sdbus {
+
+    /********************************************//**
+     * @class IProxy
+     *
+     * IProxy class represents a proxy object, which is a convenient local object created
+     * to represent a remote D-Bus object in another process.
+     * The proxy enables calling methods on remote objects, receiving signals from remote
+     * objects, and getting/setting properties of remote objects.
+     *
+     * All IProxy member methods throw @c sdbus::Error in case of D-Bus or sdbus-c++ error.
+     * The IProxy class has been designed as thread-aware. However, the operation of
+     * creating and sending method calls (both synchronously and asynchronously) is
+     * thread-safe by design.
+     *
+     ***********************************************/
+    class IProxy
+    {
+    public: // High-level, convenience API
+        virtual ~IProxy() = default;
+
+        /*!
+         * @brief Calls method on the D-Bus object
+         *
+         * @param[in] methodName Name of the method
+         * @return A helper object for convenient invocation of the method
+         *
+         * This is a high-level, convenience way of calling D-Bus methods that abstracts
+         * from the D-Bus message concept. Method arguments/return value are automatically (de)serialized
+         * in a message and D-Bus signatures automatically deduced from the provided native arguments
+         * and return values.
+         *
+         * Example of use:
+         * @code
+         * int result, a = ..., b = ...;
+         * MethodName multiply{"multiply"};
+         * object_.callMethod(multiply).onInterface(INTERFACE_NAME).withArguments(a, b).storeResultsTo(result);
+         * @endcode
+         *
+         * @throws sdbus::Error in case of failure
+         */
+        [[nodiscard]] MethodInvoker callMethod(const MethodName& methodName);
+
+        /*!
+         * @copydoc IProxy::callMethod(const MethodName&)
+         */
+        [[nodiscard]] MethodInvoker callMethod(const std::string& methodName);
+
+        /*!
+         * @copydoc IProxy::callMethod(const MethodName&)
+         */
+        [[nodiscard]] MethodInvoker callMethod(const char* methodName);
+
+        /*!
+         * @brief Calls method on the D-Bus object asynchronously
+         *
+         * @param[in] methodName Name of the method
+         * @return A helper object for convenient asynchronous invocation of the method
+         *
+         * This is a high-level, convenience way of calling D-Bus methods that abstracts
+         * from the D-Bus message concept. Method arguments/return value are automatically (de)serialized
+         * in a message and D-Bus signatures automatically deduced from the provided native arguments
+         * and return values.
+         *
+         * Example of use:
+         * @code
+         * int a = ..., b = ...;
+         * MethodName multiply{"multiply"};
+         * object_.callMethodAsync(multiply).onInterface(INTERFACE_NAME).withArguments(a, b).uponReplyInvoke([](int result)
+         * {
+         *     std::cout << "Got result of multiplying " << a << " and " << b << ": " << result << std::endl;
+         * });
+         * @endcode
+         *
+         * @throws sdbus::Error in case of failure
+         */
+        [[nodiscard]] AsyncMethodInvoker callMethodAsync(const MethodName& methodName);
+
+        /*!
+         * @copydoc IProxy::callMethodAsync(const MethodName&)
+         */
+        [[nodiscard]] AsyncMethodInvoker callMethodAsync(const std::string& methodName);
+
+        /*!
+         * @copydoc IProxy::callMethodAsync(const MethodName&)
+         */
+        [[nodiscard]] AsyncMethodInvoker callMethodAsync(const char* methodName);
+
+        /*!
+         * @brief Registers signal handler for a given signal of the D-Bus object
+         *
+         * @param[in] signalName Name of the signal
+         * @return A helper object for convenient registration of the signal handler
+         *
+         * This is a high-level, convenience way of registering to D-Bus signals that abstracts
+         * from the D-Bus message concept. Signal arguments are automatically serialized
+         * in a message and D-Bus signatures automatically deduced from the parameters
+         * of the provided native signal callback.
+         *
+         * A signal can be subscribed to and unsubscribed from at any time during proxy
+         * lifetime. The subscription is active immediately after the call.
+         *
+         * Example of use:
+         * @code
+         * object_.uponSignal("stateChanged").onInterface("com.kistler.foo").call([this](int arg1, double arg2){ this->onStateChanged(arg1, arg2); });
+         * sdbus::InterfaceName foo{"com.kistler.foo"};
+         * sdbus::SignalName levelChanged{"levelChanged"};
+         * object_.uponSignal(levelChanged).onInterface(foo).call([this](uint16_t level){ this->onLevelChanged(level); });
+         * @endcode
+         *
+         * @throws sdbus::Error in case of failure
+         */
+        [[nodiscard]] SignalSubscriber uponSignal(const SignalName& signalName);
+
+        /*!
+         * @copydoc IProxy::uponSignal(const SignalName&)
+         */
+        [[nodiscard]] SignalSubscriber uponSignal(const std::string& signalName);
+
+        /*!
+         * @copydoc IProxy::uponSignal(const SignalName&)
+         */
+        [[nodiscard]] SignalSubscriber uponSignal(const char* signalName);
+
+        /*!
+         * @brief Gets value of a property of the D-Bus object
+         *
+         * @param[in] propertyName Name of the property
+         * @return A helper object for convenient getting of property value
+         *
+         * This is a high-level, convenience way of reading D-Bus property values that abstracts
+         * from the D-Bus message concept. sdbus::Variant is returned which shall then be converted
+         * to the real property type (implicit conversion is supported).
+         *
+         * Example of use:
+         * @code
+         * int state = object.getProperty("state").onInterface("com.kistler.foo");
+         * sdbus::InterfaceName foo{"com.kistler.foo"};
+         * sdbus::PropertyName level{"level"};
+         * int level = object.getProperty(level).onInterface(foo);
+         * @endcode
+         *
+         * @throws sdbus::Error in case of failure
+         */
+        [[nodiscard]] PropertyGetter getProperty(const PropertyName& propertyName);
+
+        /*!
+         * @copydoc IProxy::getProperty(const PropertyName&)
+         */
+        [[nodiscard]] PropertyGetter getProperty(std::string_view propertyName);
+
+        /*!
+         * @brief Gets value of a property of the D-Bus object asynchronously
+         *
+         * @param[in] propertyName Name of the property
+         * @return A helper object for convenient asynchronous getting of property value
+         *
+         * This is a high-level, convenience way of reading D-Bus property values that abstracts
+         * from the D-Bus message concept.
+         *
+         * Example of use:
+         * @code
+         * std::future<sdbus::Variant> state = object.getPropertyAsync("state").onInterface("com.kistler.foo").getResultAsFuture();
+         * auto callback = [](std::optional<sdbus::Error> err, const sdbus::Variant& value){ ... };
+         * object.getPropertyAsync("state").onInterface("com.kistler.foo").uponReplyInvoke(std::move(callback));
+         * @endcode
+         *
+         * @throws sdbus::Error in case of failure
+         */
+        [[nodiscard]] AsyncPropertyGetter getPropertyAsync(const PropertyName& propertyName);
+
+        /*!
+         * @copydoc IProxy::getPropertyAsync(const PropertyName&)
+         */
+        [[nodiscard]] AsyncPropertyGetter getPropertyAsync(std::string_view propertyName);
+
+        /*!
+         * @brief Sets value of a property of the D-Bus object
+         *
+         * @param[in] propertyName Name of the property
+         * @return A helper object for convenient setting of property value
+         *
+         * This is a high-level, convenience way of writing D-Bus property values that abstracts
+         * from the D-Bus message concept.
+         * Setting property value with NoReply flag is also supported.
+         *
+         * Example of use:
+         * @code
+         * int state = ...;
+         * object_.setProperty("state").onInterface("com.kistler.foo").toValue(state);
+         * // Or we can just send the set message call without waiting for the reply
+         * object_.setProperty("state").onInterface("com.kistler.foo").toValue(state, dont_expect_reply);
+         * @endcode
+         *
+         * @throws sdbus::Error in case of failure
+         */
+        [[nodiscard]] PropertySetter setProperty(const PropertyName& propertyName);
+
+        /*!
+         * @copydoc IProxy::setProperty(const PropertyName&)
+         */
+        [[nodiscard]] PropertySetter setProperty(std::string_view propertyName);
+
+        /*!
+         * @brief Sets value of a property of the D-Bus object asynchronously
+         *
+         * @param[in] propertyName Name of the property
+         * @return A helper object for convenient asynchronous setting of property value
+         *
+         * This is a high-level, convenience way of writing D-Bus property values that abstracts
+         * from the D-Bus message concept.
+         *
+         * Example of use:
+         * @code
+         * int state = ...;
+         * // We can wait until the set operation finishes by waiting on the future
+         * std::future<void> res = object_.setPropertyAsync("state").onInterface("com.kistler.foo").toValue(state).getResultAsFuture();
+         * @endcode
+         *
+         * @throws sdbus::Error in case of failure
+         */
+        [[nodiscard]] AsyncPropertySetter setPropertyAsync(const PropertyName& propertyName);
+
+        /*!
+         * @copydoc IProxy::setPropertyAsync(const PropertyName&)
+         */
+        [[nodiscard]] AsyncPropertySetter setPropertyAsync(std::string_view propertyName);
+
+        /*!
+         * @brief Gets values of all properties of the D-Bus object
+         *
+         * @return A helper object for convenient getting of properties' values
+         *
+         * This is a high-level, convenience way of reading D-Bus properties' values that abstracts
+         * from the D-Bus message concept.
+         *
+         * Example of use:
+         * @code
+         * auto props = object.getAllProperties().onInterface("com.kistler.foo");
+         * @endcode
+         *
+         * @throws sdbus::Error in case of failure
+         */
+        [[nodiscard]] AllPropertiesGetter getAllProperties();
+
+        /*!
+         * @brief Gets values of all properties of the D-Bus object asynchronously
+         *
+         * @return A helper object for convenient asynchronous getting of properties' values
+         *
+         * This is a high-level, convenience way of reading D-Bus properties' values that abstracts
+         * from the D-Bus message concept.
+         *
+         * Example of use:
+         * @code
+         * auto callback = [](std::optional<sdbus::Error> err, const std::map<PropertyName, Variant>>& properties){ ... };
+         * auto props = object.getAllPropertiesAsync().onInterface("com.kistler.foo").uponReplyInvoke(std::move(callback));
+         * @endcode
+         *
+         * @throws sdbus::Error in case of failure
+         */
+        [[nodiscard]] AsyncAllPropertiesGetter getAllPropertiesAsync();
+
+        /*!
+         * @brief Provides D-Bus connection used by the proxy
+         *
+         * @return Reference to the D-Bus connection
+         */
+        [[nodiscard]] virtual sdbus::IConnection& getConnection() const = 0;
+
+        /*!
+         * @brief Returns object path of the underlying DBus object
+         */
+        [[nodiscard]] virtual const ObjectPath& getObjectPath() const = 0;
+
+        /*!
+         * @brief Provides access to the currently processed D-Bus message
+         *
+         * This method provides access to the currently processed incoming D-Bus message.
+         * "Currently processed" means that the registered callback handler(s) for that message
+         * are being invoked. This method is meant to be called from within a callback handler
+         * (e.g. from a D-Bus signal handler, or async method reply handler, etc.). In such a case it is
+         * guaranteed to return a valid D-Bus message instance for which the handler is called.
+         * If called from other contexts/threads, it may return a valid or invalid message, depending
+         * on whether a message was processed or not at the time of the call.
+         *
+         * @return Currently processed D-Bus message
+         */
+        [[nodiscard]] virtual Message getCurrentlyProcessedMessage() const = 0;
+
+        /*!
+         * @brief Unregisters proxy's signal handlers and stops receiving replies to pending async calls
+         *
+         * Unregistration is done automatically also in proxy's destructor. This method makes
+         * sense if, in the process of proxy removal, we need to make sure that callbacks
+         * are unregistered explicitly before the final destruction of the proxy instance.
+         *
+         * @throws sdbus::Error in case of failure
+         */
+        virtual void unregister() = 0;
+
+    public: // Lower-level, message-based API
+        /*!
+         * @brief Creates a method call message
+         *
+         * @param[in] interfaceName Name of an interface that provides a given method
+         * @param[in] methodName Name of the method
+         * @return A method call message
+         *
+         * Serialize method arguments into the returned message and invoke the method by passing
+         * the message with serialized arguments to the @c callMethod function.
+         * Alternatively, use higher-level API @c callMethod(const std::string& methodName) defined below.
+         *
+         * @throws sdbus::Error in case of failure
+         */
+        [[nodiscard]] virtual MethodCall createMethodCall(const InterfaceName& interfaceName, const MethodName& methodName) const = 0;
+
+        /*!
+         * @brief Calls method on the remote D-Bus object
+         *
+         * @param[in] message Message representing a method call
+         * @return A method reply message
+         *
+         * The call does not block if the method call has dont-expect-reply flag set. In that case,
+         * the call returns immediately and the return value is an empty, invalid method reply.
+         *
+         * The call blocks otherwise, waiting for the remote peer to send back a reply or an error,
+         * or until the call times out.
+         *
+         * While blocking, other concurrent operations (in other threads) on the underlying bus
+         * connection are stalled until the call returns. This is not an issue in vast majority of
+         * (simple, single-threaded) applications. In asynchronous, multi-threaded designs involving
+         * shared bus connections, this may be an issue. It is advised to instead use an asynchronous
+         * callMethod() function overload, which does not block the bus connection, or do the synchronous
+         * call from another Proxy instance created just before the call and then destroyed (which is
+         * anyway quite a typical approach in D-Bus implementations). Such proxy instance must have
+         * its own bus connection. So-called light-weight proxies (ones running without an event loop thread)
+         * tag are designed for exactly that purpose.
+         *
+         * The default D-Bus method call timeout is used. See IConnection::getMethodCallTimeout().
+         *
+         * Note: To avoid messing with messages, use API on a higher level of abstraction defined below.
+         *
+         * @throws sdbus::Error in case of failure (also in case the remote function returned an error)
+         */
+        virtual MethodReply callMethod(const MethodCall& message) = 0;
+
+        /*!
+         * @brief Calls method on the remote D-Bus object
+         *
+         * @param[in] message Message representing a method call
+         * @param[in] timeout Method call timeout (in microseconds)
+         * @return A method reply message
+         *
+         * The call does not block if the method call has dont-expect-reply flag set. In that case,
+         * the call returns immediately and the return value is an empty, invalid method reply.
+         *
+         * The call blocks otherwise, waiting for the remote peer to send back a reply or an error,
+         * or until the call times out.
+         *
+         * While blocking, other concurrent operations (in other threads) on the underlying bus
+         * connection are stalled until the call returns. This is not an issue in vast majority of
+         * (simple, single-threaded) applications. In asynchronous, multi-threaded designs involving
+         * shared bus connections, this may be an issue. It is advised to instead use an asynchronous
+         * callMethod() function overload, which does not block the bus connection, or do the synchronous
+         * call from another Proxy instance created just before the call and then destroyed (which is
+         * anyway quite a typical approach in D-Bus implementations). Such proxy instance must have
+         * its own bus connection. So-called light-weight proxies (ones running without an event loop thread)
+         * tag are designed for exactly that purpose.
+         *
+         * If timeout is zero, the default D-Bus method call timeout is used. See IConnection::getMethodCallTimeout().
+         *
+         * Note: To avoid messing with messages, use API on a higher level of abstraction defined below.
+         *
+         * @throws sdbus::Error in case of failure (also in case the remote function returned an error)
+         */
+        virtual MethodReply callMethod(const MethodCall& message, uint64_t timeout) = 0;
+
+        /*!
+         * @copydoc IProxy::callMethod(const MethodCall&,uint64_t)
+         */
+        template <typename _Rep, typename _Period>
+        MethodReply callMethod(const MethodCall& message, const std::chrono::duration<_Rep, _Period>& timeout);
+
+        /*!
+         * @brief Calls method on the D-Bus object asynchronously
+         *
+         * @param[in] message Message representing an async method call
+         * @param[in] asyncReplyCallback Handler for the async reply
+         * @return Observing handle for the the pending asynchronous call
+         *
+         * This is a callback-based way of asynchronously calling a remote D-Bus method.
+         *
+         * The call itself is non-blocking. It doesn't wait for the reply. Once the reply arrives,
+         * the provided async reply handler will get invoked from the context of the bus
+         * connection I/O event loop thread.
+         *
+         * An non-owning, observing async call handle is returned that can be used to query call status or cancel the call.
+         *
+         * The default D-Bus method call timeout is used. See IConnection::getMethodCallTimeout().
+         *
+         * Note: To avoid messing with messages, use API on a higher level of abstraction defined below.
+         *
+         * @throws sdbus::Error in case of failure
+         */
+        virtual PendingAsyncCall callMethodAsync(const MethodCall& message, async_reply_handler asyncReplyCallback) = 0;
+
+        /*!
+         * @brief Calls method on the D-Bus object asynchronously
+         *
+         * @param[in] message Message representing an async method call
+         * @param[in] asyncReplyCallback Handler for the async reply
+         * @return RAII-style slot handle representing the ownership of the async call
+         *
+         * This is a callback-based way of asynchronously calling a remote D-Bus method.
+         *
+         * The call itself is non-blocking. It doesn't wait for the reply. Once the reply arrives,
+         * the provided async reply handler will get invoked from the context of the bus
+         * connection I/O event loop thread.
+         *
+         * A slot (an owning handle) is returned for the async call. Lifetime of the call is bound to the lifetime of the slot.
+         * The slot can be used to cancel the method call at a later time by simply destroying it.
+         *
+         * The default D-Bus method call timeout is used. See IConnection::getMethodCallTimeout().
+         *
+         * Note: To avoid messing with messages, use API on a higher level of abstraction defined below.
+         *
+         * @throws sdbus::Error in case of failure
+         */
+        [[nodiscard]] virtual Slot callMethodAsync( const MethodCall& message
+                                                  , async_reply_handler asyncReplyCallback
+                                                  , return_slot_t ) = 0;
+
+        /*!
+         * @brief Calls method on the D-Bus object asynchronously, with custom timeout
+         *
+         * @param[in] message Message representing an async method call
+         * @param[in] asyncReplyCallback Handler for the async reply
+         * @param[in] timeout Method call timeout (in microseconds)
+         * @return Observing handle for the the pending asynchronous call
+         *
+         * This is a callback-based way of asynchronously calling a remote D-Bus method.
+         *
+         * The call itself is non-blocking. It doesn't wait for the reply. Once the reply arrives,
+         * the provided async reply handler will get invoked from the context of the bus
+         * connection I/O event loop thread.
+         *
+         * An non-owning, observing async call handle is returned that can be used to query call status or cancel the call.
+         *
+         * If timeout is zero, the default D-Bus method call timeout is used. See IConnection::getMethodCallTimeout().
+         *
+         * Note: To avoid messing with messages, use API on a higher level of abstraction defined below.
+         *
+         * @throws sdbus::Error in case of failure
+         */
+        virtual PendingAsyncCall callMethodAsync( const MethodCall& message
+                                                , async_reply_handler asyncReplyCallback
+                                                , uint64_t timeout ) = 0;
+
+        /*!
+         * @brief Calls method on the D-Bus object asynchronously, with custom timeout
+         *
+         * @param[in] message Message representing an async method call
+         * @param[in] asyncReplyCallback Handler for the async reply
+         * @param[in] timeout Method call timeout (in microseconds)
+         * @return RAII-style slot handle representing the ownership of the async call
+         *
+         * This is a callback-based way of asynchronously calling a remote D-Bus method.
+         *
+         * The call itself is non-blocking. It doesn't wait for the reply. Once the reply arrives,
+         * the provided async reply handler will get invoked from the context of the bus
+         * connection I/O event loop thread.
+         *
+         * A slot (an owning handle) is returned for the async call. Lifetime of the call is bound to the lifetime of the slot.
+         * The slot can be used to cancel the method call at a later time by simply destroying it.
+         *
+         * If timeout is zero, the default D-Bus method call timeout is used. See IConnection::getMethodCallTimeout().
+         *
+         * Note: To avoid messing with messages, use API on a higher level of abstraction defined below.
+         *
+         * @throws sdbus::Error in case of failure
+         */
+        [[nodiscard]] virtual Slot callMethodAsync( const MethodCall& message
+                                                  , async_reply_handler asyncReplyCallback
+                                                  , uint64_t timeout
+                                                  , return_slot_t ) = 0;
+
+        /*!
+         * @copydoc IProxy::callMethod(const MethodCall&,async_reply_handler,uint64_t)
+         */
+        template <typename _Rep, typename _Period>
+        PendingAsyncCall callMethodAsync( const MethodCall& message
+                                        , async_reply_handler asyncReplyCallback
+                                        , const std::chrono::duration<_Rep, _Period>& timeout );
+
+        /*!
+         * @copydoc IProxy::callMethod(const MethodCall&,async_reply_handler,uint64_t,return_slot_t)
+         */
+        template <typename _Rep, typename _Period>
+        [[nodiscard]] Slot callMethodAsync( const MethodCall& message
+                                          , async_reply_handler asyncReplyCallback
+                                          , const std::chrono::duration<_Rep, _Period>& timeout
+                                          , return_slot_t );
+
+        /*!
+         * @brief Calls method on the D-Bus object asynchronously
+         *
+         * @param[in] message Message representing an async method call
+         * @param[in] Tag denoting a std::future-based overload
+         * @return Future object providing access to the future method reply message
+         *
+         * This is a std::future-based way of asynchronously calling a remote D-Bus method.
+         *
+         * The call itself is non-blocking. It doesn't wait for the reply. Once the reply arrives,
+         * the provided future object will be set to contain the reply (or sdbus::Error
+         * in case the remote method threw an exception).
+         *
+         * The default D-Bus method call timeout is used. See IConnection::getMethodCallTimeout().
+         *
+         * Note: To avoid messing with messages, use higher-level API defined below.
+         *
+         * @throws sdbus::Error in case of failure
+         */
+        virtual std::future<MethodReply> callMethodAsync(const MethodCall& message, with_future_t) = 0;
+
+        /*!
+         * @brief Calls method on the D-Bus object asynchronously, with custom timeout
+         *
+         * @param[in] message Message representing an async method call
+         * @param[in] timeout Method call timeout
+         * @param[in] Tag denoting a std::future-based overload
+         * @return Future object providing access to the future method reply message
+         *
+         * This is a std::future-based way of asynchronously calling a remote D-Bus method.
+         *
+         * The call itself is non-blocking. It doesn't wait for the reply. Once the reply arrives,
+         * the provided future object will be set to contain the reply (or sdbus::Error
+         * in case the remote method threw an exception, or the call timed out).
+         *
+         * If timeout is zero, the default D-Bus method call timeout is used. See IConnection::getMethodCallTimeout().
+         *
+         * Note: To avoid messing with messages, use higher-level API defined below.
+         *
+         * @throws sdbus::Error in case of failure
+         */
+        virtual std::future<MethodReply> callMethodAsync( const MethodCall& message
+                                                        , uint64_t timeout
+                                                        , with_future_t ) = 0;
+
+        /*!
+         * @copydoc IProxy::callMethod(const MethodCall&,uint64_t,with_future_t)
+         */
+        template <typename _Rep, typename _Period>
+        std::future<MethodReply> callMethodAsync( const MethodCall& message
+                                                , const std::chrono::duration<_Rep, _Period>& timeout
+                                                , with_future_t );
+
+        /*!
+         * @brief Registers a handler for the desired signal emitted by the D-Bus object
+         *
+         * @param[in] interfaceName Name of an interface that the signal belongs to
+         * @param[in] signalName Name of the signal
+         * @param[in] signalHandler Callback that implements the body of the signal handler
+         *
+         * A signal can be subscribed to at any time during proxy lifetime. The subscription
+         * is active immediately after the call, and stays active for the entire lifetime
+         * of the Proxy object.
+         *
+         * To be able to unsubscribe from the signal at a later time, use the registerSignalHandler()
+         * overload with request_slot tag.
+         *
+         * @throws sdbus::Error in case of failure
+         */
+        virtual void registerSignalHandler( const InterfaceName& interfaceName
+                                          , const SignalName& signalName
+                                          , signal_handler signalHandler ) = 0;
+
+        /*!
+         * @brief Registers a handler for the desired signal emitted by the D-Bus object
+         *
+         * @param[in] interfaceName Name of an interface that the signal belongs to
+         * @param[in] signalName Name of the signal
+         * @param[in] signalHandler Callback that implements the body of the signal handler
+         *
+         * @return RAII-style slot handle representing the ownership of the subscription
+         *
+         * A signal can be subscribed to and unsubscribed from at any time during proxy
+         * lifetime. The subscription is active immediately after the call. The lifetime
+         * of the subscription is bound to the lifetime of the slot object. The subscription
+         * is unregistered by letting go of the slot object.
+         *
+         * @throws sdbus::Error in case of failure
+         */
+        [[nodiscard]] virtual Slot registerSignalHandler( const InterfaceName& interfaceName
+                                                        , const SignalName& signalName
+                                                        , signal_handler signalHandler
+                                                        , return_slot_t ) = 0;
+
+    protected: // Internal API for efficiency reasons used by high-level API helper classes
+        friend MethodInvoker;
+        friend AsyncMethodInvoker;
+        friend SignalSubscriber;
+
+        [[nodiscard]] virtual MethodCall createMethodCall(const char* interfaceName, const char* methodName) const = 0;
+        virtual void registerSignalHandler( const char* interfaceName
+                                          , const char* signalName
+                                          , signal_handler signalHandler ) = 0;
+        [[nodiscard]] virtual Slot registerSignalHandler( const char* interfaceName
+                                                        , const char* signalName
+                                                        , signal_handler signalHandler
+                                                        , return_slot_t ) = 0;
+    };
+
+    /********************************************//**
+     * @class PendingAsyncCall
+     *
+     * PendingAsyncCall represents a simple handle type to cancel the delivery
+     * of the asynchronous D-Bus call result to the application.
+     *
+     * The handle is lifetime-independent from the originating Proxy object.
+     * It's safe to call its methods even after the Proxy has gone.
+     *
+     ***********************************************/
+    class PendingAsyncCall
+    {
+    public:
+        PendingAsyncCall() = default;
+
+        /*!
+         * @brief Cancels the delivery of the pending asynchronous call result
+         *
+         * This function effectively removes the callback handler registered to the
+         * async D-Bus method call result delivery. Does nothing if the call was
+         * completed already, or if the originating Proxy object has gone meanwhile.
+         */
+        void cancel();
+
+        /*!
+         * @brief Answers whether the asynchronous call is still pending
+         *
+         * @return True if the call is pending, false if the call has been fully completed
+         *
+         * Pending call in this context means a call whose results have not arrived, or
+         * have arrived and are currently being processed by the callback handler.
+         */
+        [[nodiscard]] bool isPending() const;
+
+    private:
+        friend internal::Proxy;
+        PendingAsyncCall(std::weak_ptr<void> callInfo);
+
+    private:
+        std::weak_ptr<void> callInfo_;
+    };
+
+    // Out-of-line member definitions
+
+    template <typename _Rep, typename _Period>
+    inline MethodReply IProxy::callMethod(const MethodCall& message, const std::chrono::duration<_Rep, _Period>& timeout)
+    {
+        auto microsecs = std::chrono::duration_cast<std::chrono::microseconds>(timeout);
+        return callMethod(message, microsecs.count());
+    }
+
+    template <typename _Rep, typename _Period>
+    inline PendingAsyncCall IProxy::callMethodAsync( const MethodCall& message
+                                                   , async_reply_handler asyncReplyCallback
+                                                   , const std::chrono::duration<_Rep, _Period>& timeout )
+    {
+        auto microsecs = std::chrono::duration_cast<std::chrono::microseconds>(timeout);
+        return callMethodAsync(message, std::move(asyncReplyCallback), microsecs.count());
+    }
+
+    template <typename _Rep, typename _Period>
+    inline Slot IProxy::callMethodAsync( const MethodCall& message
+                                       , async_reply_handler asyncReplyCallback
+                                       , const std::chrono::duration<_Rep, _Period>& timeout
+                                       , return_slot_t )
+    {
+        auto microsecs = std::chrono::duration_cast<std::chrono::microseconds>(timeout);
+        return callMethodAsync(message, std::move(asyncReplyCallback), microsecs.count(), return_slot);
+    }
+
+    template <typename _Rep, typename _Period>
+    inline std::future<MethodReply> IProxy::callMethodAsync( const MethodCall& message
+                                                           , const std::chrono::duration<_Rep, _Period>& timeout
+                                                           , with_future_t )
+    {
+        auto microsecs = std::chrono::duration_cast<std::chrono::microseconds>(timeout);
+        return callMethodAsync(message, microsecs.count(), with_future);
+    }
+
+    inline MethodInvoker IProxy::callMethod(const MethodName& methodName)
+    {
+        return MethodInvoker(*this, methodName);
+    }
+
+    inline MethodInvoker IProxy::callMethod(const std::string& methodName)
+    {
+        return MethodInvoker(*this, methodName.c_str());
+    }
+
+    inline MethodInvoker IProxy::callMethod(const char* methodName)
+    {
+        return MethodInvoker(*this, methodName);
+    }
+
+    inline AsyncMethodInvoker IProxy::callMethodAsync(const MethodName& methodName)
+    {
+        return AsyncMethodInvoker(*this, methodName);
+    }
+
+    inline AsyncMethodInvoker IProxy::callMethodAsync(const std::string& methodName)
+    {
+        return AsyncMethodInvoker(*this, methodName.c_str());
+    }
+
+    inline AsyncMethodInvoker IProxy::callMethodAsync(const char* methodName)
+    {
+        return AsyncMethodInvoker(*this, methodName);
+    }
+
+    inline SignalSubscriber IProxy::uponSignal(const SignalName& signalName)
+    {
+        return SignalSubscriber(*this, signalName);
+    }
+
+    inline SignalSubscriber IProxy::uponSignal(const std::string& signalName)
+    {
+        return SignalSubscriber(*this, signalName.c_str());
+    }
+
+    inline SignalSubscriber IProxy::uponSignal(const char* signalName)
+    {
+        return SignalSubscriber(*this, signalName);
+    }
+
+    inline PropertyGetter IProxy::getProperty(const PropertyName& propertyName)
+    {
+        return PropertyGetter(*this, propertyName);
+    }
+
+    inline PropertyGetter IProxy::getProperty(std::string_view propertyName)
+    {
+        return PropertyGetter(*this, std::move(propertyName));
+    }
+
+    inline AsyncPropertyGetter IProxy::getPropertyAsync(const PropertyName& propertyName)
+    {
+        return AsyncPropertyGetter(*this, propertyName);
+    }
+
+    inline AsyncPropertyGetter IProxy::getPropertyAsync(std::string_view propertyName)
+    {
+        return AsyncPropertyGetter(*this, std::move(propertyName));
+    }
+
+    inline PropertySetter IProxy::setProperty(const PropertyName& propertyName)
+    {
+        return PropertySetter(*this, propertyName);
+    }
+
+    inline PropertySetter IProxy::setProperty(std::string_view propertyName)
+    {
+        return PropertySetter(*this, std::move(propertyName));
+    }
+
+    inline AsyncPropertySetter IProxy::setPropertyAsync(const PropertyName& propertyName)
+    {
+        return AsyncPropertySetter(*this, propertyName);
+    }
+
+    inline AsyncPropertySetter IProxy::setPropertyAsync(std::string_view propertyName)
+    {
+        return AsyncPropertySetter(*this, std::move(propertyName));
+    }
+
+    inline AllPropertiesGetter IProxy::getAllProperties()
+    {
+        return AllPropertiesGetter(*this);
+    }
+
+    inline AsyncAllPropertiesGetter IProxy::getAllPropertiesAsync()
+    {
+        return AsyncAllPropertiesGetter(*this);
+    }
+
+    /*!
+     * @brief Creates a proxy object for a specific remote D-Bus object
+     *
+     * @param[in] connection D-Bus connection to be used by the proxy object
+     * @param[in] destination Bus name that provides the remote D-Bus object
+     * @param[in] objectPath Path of the remote D-Bus object
+     * @return Pointer to the proxy object instance
+     *
+     * The provided connection will be used by the proxy to issue calls against the object,
+     * and signals, if any, will be subscribed to on this connection. The caller still
+     * remains the owner of the connection (the proxy just keeps a reference to it), and
+     * should make sure that an I/O event loop is running on that connection, so the proxy
+     * may receive incoming signals and asynchronous method replies.
+     *
+     * The destination parameter may be an empty string (useful e.g. in case of direct
+     * D-Bus connections to a custom server bus).
+     *
+     * Code example:
+     * @code
+     * auto proxy = sdbus::createProxy(connection, "com.kistler.foo", "/com/kistler/foo");
+     * @endcode
+     */
+    [[nodiscard]] std::unique_ptr<sdbus::IProxy> createProxy( sdbus::IConnection& connection
+                                                            , ServiceName destination
+                                                            , ObjectPath objectPath );
+
+    /*!
+     * @brief Creates a proxy object for a specific remote D-Bus object
+     *
+     * @param[in] connection D-Bus connection to be used by the proxy object
+     * @param[in] destination Bus name that provides the remote D-Bus object
+     * @param[in] objectPath Path of the remote D-Bus object
+     * @return Pointer to the object proxy instance
+     *
+     * The provided connection will be used by the proxy to issue calls against the object,
+     * and signals, if any, will be subscribed to on this connection. The Object proxy becomes
+     * an exclusive owner of this connection, and will automatically start a procesing loop
+     * upon that connection in a separate internal thread. Handlers for incoming signals and
+     * asynchronous method replies will be executed in the context of that thread.
+     *
+     * The destination parameter may be an empty string (useful e.g. in case of direct
+     * D-Bus connections to a custom server bus).
+     *
+     * Code example:
+     * @code
+     * auto proxy = sdbus::createProxy(std::move(connection), "com.kistler.foo", "/com/kistler/foo");
+     * @endcode
+     */
+    [[nodiscard]] std::unique_ptr<sdbus::IProxy> createProxy( std::unique_ptr<sdbus::IConnection>&& connection
+                                                            , ServiceName destination
+                                                            , ObjectPath objectPath );
+
+    /*!
+     * @brief Creates a light-weight proxy object for a specific remote D-Bus object
+     *
+     * @param[in] connection D-Bus connection to be used by the proxy object
+     * @param[in] destination Bus name that provides the remote D-Bus object
+     * @param[in] objectPath Path of the remote D-Bus object
+     * @return Pointer to the object proxy instance
+     *
+     * The provided connection will be used by the proxy to issue calls against the object.
+     * The Object proxy becomes an exclusive owner of this connection, but will not start
+     * an event loop thread on this connection. This is cheap construction and is suitable
+     * for short-lived proxies created just to execute simple synchronous D-Bus calls and
+     * then destroyed. Such blocking request-reply calls will work without an event loop
+     * (but signals, async calls, etc. won't).
+     *
+     * The destination parameter may be an empty string (useful e.g. in case of direct
+     * D-Bus connections to a custom server bus).
+     *
+     * Code example:
+     * @code
+     * auto proxy = sdbus::createProxy(std::move(connection), "com.kistler.foo", "/com/kistler/foo", sdbus::dont_run_event_loop_thread);
+     * @endcode
+     */
+    [[nodiscard]] std::unique_ptr<sdbus::IProxy> createProxy( std::unique_ptr<sdbus::IConnection>&& connection
+                                                            , ServiceName destination
+                                                            , ObjectPath objectPath
+                                                            , dont_run_event_loop_thread_t );
+
+    /*!
+     * @brief Creates a light-weight proxy object for a specific remote D-Bus object
+     *
+     * Does the same thing as createProxy(std::unique_ptr<sdbus::IConnection>&&, ServiceName, ObjectPath, dont_run_event_loop_thread_t);
+     */
+    [[nodiscard]] std::unique_ptr<sdbus::IProxy> createLightWeightProxy( std::unique_ptr<sdbus::IConnection>&& connection
+                                                                       , ServiceName destination
+                                                                       , ObjectPath objectPath );
+
+    /*!
+     * @brief Creates a proxy object for a specific remote D-Bus object
+     *
+     * @param[in] destination Bus name that provides the remote D-Bus object
+     * @param[in] objectPath Path of the remote D-Bus object
+     * @return Pointer to the object proxy instance
+     *
+     * No D-Bus connection is provided here, so the object proxy will create and manage
+     * his own connection, and will automatically start an event loop upon that connection
+     * in a separate internal thread. Handlers for incoming signals and asynchronous
+     * method replies will be executed in the context of that thread.
+     *
+     * Code example:
+     * @code
+     * auto proxy = sdbus::createProxy("com.kistler.foo", "/com/kistler/foo");
+     * @endcode
+     */
+    [[nodiscard]] std::unique_ptr<sdbus::IProxy> createProxy( ServiceName destination
+                                                            , ObjectPath objectPath );
+
+    /*!
+     * @brief Creates a light-weight proxy object for a specific remote D-Bus object
+     *
+     * @param[in] destination Bus name that provides the remote D-Bus object
+     * @param[in] objectPath Path of the remote D-Bus object
+     * @return Pointer to the object proxy instance
+     *
+     * No D-Bus connection is provided here, so the object proxy will create and manage
+     * his own connection, but it will not start an event loop thread. This is cheap
+     * construction and is suitable for short-lived proxies created just to execute simple
+     * synchronous D-Bus calls and then destroyed. Such blocking request-reply calls
+     * will work without an event loop (but signals, async calls, etc. won't).
+     *
+     * Code example:
+     * @code
+     * auto proxy = sdbus::createProxy("com.kistler.foo", "/com/kistler/foo", sdbus::dont_run_event_loop_thread );
+     * @endcode
+     */
+    [[nodiscard]] std::unique_ptr<sdbus::IProxy> createProxy( ServiceName destination
+                                                            , ObjectPath objectPath
+                                                            , dont_run_event_loop_thread_t );
+
+    /*!
+     * @brief Creates a light-weight proxy object for a specific remote D-Bus object
+     *
+     * Does the same thing as createProxy(ServiceName, ObjectPath, dont_run_event_loop_thread_t);
+     */
+    [[nodiscard]] std::unique_ptr<sdbus::IProxy> createLightWeightProxy(ServiceName destination, ObjectPath objectPath);
+
+}
+
+#include <sdbus-c++/ConvenienceApiClasses.inl>
+
+#endif /* SDBUS_CXX_IPROXY_H_ */
diff --git a/3rdParty/sdbus-cpp/include/sdbus-c++/Message.h b/3rdParty/sdbus-cpp/include/sdbus-c++/Message.h
new file mode 100644
index 0000000000..4be8d85898
--- /dev/null
+++ b/3rdParty/sdbus-cpp/include/sdbus-c++/Message.h
@@ -0,0 +1,782 @@
+/**
+ * (C) 2016 - 2021 KISTLER INSTRUMENTE AG, Winterthur, Switzerland
+ * (C) 2016 - 2024 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
+ *
+ * @file Message.h
+ *
+ * Created on: Nov 9, 2016
+ * Project: sdbus-c++
+ * Description: High-level D-Bus IPC C++ library based on sd-bus
+ *
+ * This file is part of sdbus-c++.
+ *
+ * sdbus-c++ is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * sdbus-c++ is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with sdbus-c++. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef SDBUS_CXX_MESSAGE_H_
+#define SDBUS_CXX_MESSAGE_H_
+
+#include <sdbus-c++/Error.h>
+#include <sdbus-c++/TypeTraits.h>
+
+#include <algorithm>
+#include <array>
+#include <cassert>
+#include <cstdint>
+#include <cstring>
+#include <functional>
+#include <map>
+#ifdef __has_include
+#  if __has_include(<span>)
+#    include <span>
+#  endif
+#endif
+#include <string>
+#include <sys/types.h>
+#include <unordered_map>
+#include <utility>
+#include <variant>
+#include <vector>
+
+// Forward declarations
+namespace sdbus {
+    class Variant;
+    class ObjectPath;
+    class Signature;
+    template <typename... _ValueTypes> class Struct;
+    class UnixFd;
+    class MethodReply;
+    namespace internal {
+        class IConnection;
+    }
+}
+
+namespace sdbus {
+
+    /********************************************//**
+     * @class Message
+     *
+     * Message represents a D-Bus message, which can be either method call message,
+     * method reply message, signal message, or a plain message.
+     *
+     * Serialization and deserialization functions are provided for types supported
+     * by D-Bus.
+     *
+     * You mostly don't need to work with this class directly if you use high-level
+     * APIs of @c IObject and @c IProxy.
+     *
+     ***********************************************/
+    class [[nodiscard]] Message
+    {
+    public:
+        Message(const Message&) noexcept;
+        Message& operator=(const Message&) noexcept;
+        Message(Message&& other) noexcept;
+        Message& operator=(Message&& other) noexcept;
+        ~Message();
+
+        Message& operator<<(bool item);
+        Message& operator<<(int16_t item);
+        Message& operator<<(int32_t item);
+        Message& operator<<(int64_t item);
+        Message& operator<<(uint8_t item);
+        Message& operator<<(uint16_t item);
+        Message& operator<<(uint32_t item);
+        Message& operator<<(uint64_t item);
+        Message& operator<<(double item);
+        Message& operator<<(const char *item);
+        Message& operator<<(const std::string &item);
+        Message& operator<<(std::string_view item);
+        Message& operator<<(const Variant &item);
+        template <typename ...Elements>
+        Message& operator<<(const std::variant<Elements...>& value);
+        Message& operator<<(const ObjectPath &item);
+        Message& operator<<(const Signature &item);
+        Message& operator<<(const UnixFd &item);
+        template <typename _Element, typename _Allocator>
+        Message& operator<<(const std::vector<_Element, _Allocator>& items);
+        template <typename _Element, std::size_t _Size>
+        Message& operator<<(const std::array<_Element, _Size>& items);
+#ifdef __cpp_lib_span
+        template <typename _Element, std::size_t _Extent>
+        Message& operator<<(const std::span<_Element, _Extent>& items);
+#endif
+        template <typename _Enum, typename = std::enable_if_t<std::is_enum_v<_Enum>>>
+        Message& operator<<(const _Enum& item);
+        template <typename _Key, typename _Value>
+        Message& operator<<(const DictEntry<_Key, _Value>& value);
+        template <typename _Key, typename _Value, typename _Compare, typename _Allocator>
+        Message& operator<<(const std::map<_Key, _Value, _Compare, _Allocator>& items);
+        template <typename _Key, typename _Value, typename _Hash, typename _KeyEqual, typename _Allocator>
+        Message& operator<<(const std::unordered_map<_Key, _Value, _Hash, _KeyEqual, _Allocator>& items);
+        template <typename... _ValueTypes>
+        Message& operator<<(const Struct<_ValueTypes...>& item);
+        template <typename... _ValueTypes>
+        Message& operator<<(const std::tuple<_ValueTypes...>& item);
+
+        Message& operator>>(bool& item);
+        Message& operator>>(int16_t& item);
+        Message& operator>>(int32_t& item);
+        Message& operator>>(int64_t& item);
+        Message& operator>>(uint8_t& item);
+        Message& operator>>(uint16_t& item);
+        Message& operator>>(uint32_t& item);
+        Message& operator>>(uint64_t& item);
+        Message& operator>>(double& item);
+        Message& operator>>(char*& item);
+        Message& operator>>(std::string &item);
+        Message& operator>>(Variant &item);
+        template <typename ...Elements>
+        Message& operator>>(std::variant<Elements...>& value);
+        Message& operator>>(ObjectPath &item);
+        Message& operator>>(Signature &item);
+        Message& operator>>(UnixFd &item);
+        template <typename _Element, typename _Allocator>
+        Message& operator>>(std::vector<_Element, _Allocator>& items);
+        template <typename _Element, std::size_t _Size>
+        Message& operator>>(std::array<_Element, _Size>& items);
+#ifdef __cpp_lib_span
+        template <typename _Element, std::size_t _Extent>
+        Message& operator>>(std::span<_Element, _Extent>& items);
+#endif
+        template <typename _Enum, typename = std::enable_if_t<std::is_enum_v<_Enum>>>
+        Message& operator>>(_Enum& item);
+        template <typename _Key, typename _Value>
+        Message& operator>>(DictEntry<_Key, _Value>& value);
+        template <typename _Key, typename _Value, typename _Compare, typename _Allocator>
+        Message& operator>>(std::map<_Key, _Value, _Compare, _Allocator>& items);
+        template <typename _Key, typename _Value, typename _Hash, typename _KeyEqual, typename _Allocator>
+        Message& operator>>(std::unordered_map<_Key, _Value, _Hash, _KeyEqual, _Allocator>& items);
+        template <typename... _ValueTypes>
+        Message& operator>>(Struct<_ValueTypes...>& item);
+        template <typename... _ValueTypes>
+        Message& operator>>(std::tuple<_ValueTypes...>& item);
+
+        template <typename _ElementType>
+        Message& openContainer();
+        Message& openContainer(const char* signature);
+        Message& closeContainer();
+        template <typename _KeyType, typename _ValueType>
+        Message& openDictEntry();
+        Message& openDictEntry(const char* signature);
+        Message& closeDictEntry();
+        template <typename _ValueType>
+        Message& openVariant();
+        Message& openVariant(const char* signature);
+        Message& closeVariant();
+        template <typename... _ValueTypes>
+        Message& openStruct();
+        Message& openStruct(const char* signature);
+        Message& closeStruct();
+
+        template <typename _ElementType>
+        Message& enterContainer();
+        Message& enterContainer(const char* signature);
+        Message& exitContainer();
+        template <typename _KeyType, typename _ValueType>
+        Message& enterDictEntry();
+        Message& enterDictEntry(const char* signature);
+        Message& exitDictEntry();
+        template <typename _ValueType>
+        Message& enterVariant();
+        Message& enterVariant(const char* signature);
+        Message& exitVariant();
+        template <typename... _ValueTypes>
+        Message& enterStruct();
+        Message& enterStruct(const char* signature);
+        Message& exitStruct();
+
+        Message& appendArray(char type, const void *ptr, size_t size);
+        Message& readArray(char type, const void **ptr, size_t *size);
+
+        template <typename _Key, typename _Value, typename _Callback>
+        Message& serializeDictionary(const _Callback& callback);
+        template <typename _Key, typename _Value>
+        Message& serializeDictionary(const std::initializer_list<DictEntry<_Key, _Value>>& dictEntries);
+        template <typename _Key, typename _Value, typename _Callback>
+        Message& deserializeDictionary(const _Callback& callback);
+
+        explicit operator bool() const;
+        void clearFlags();
+
+        const char* getInterfaceName() const;
+        const char* getMemberName() const;
+        const char* getSender() const;
+        const char* getPath() const;
+        const char* getDestination() const;
+        uint64_t getCookie() const;
+        std::pair<char, const char*> peekType() const;
+        bool isValid() const;
+        bool isEmpty() const;
+        bool isAtEnd(bool complete) const;
+
+        void copyTo(Message& destination, bool complete) const;
+        void seal();
+        void rewind(bool complete);
+
+        pid_t getCredsPid() const;
+        uid_t getCredsUid() const;
+        uid_t getCredsEuid() const;
+        gid_t getCredsGid() const;
+        gid_t getCredsEgid() const;
+        std::vector<gid_t> getCredsSupplementaryGids() const;
+        std::string getSELinuxContext() const;
+
+        class Factory;
+
+    private:
+        template <typename _Array>
+        void serializeArray(const _Array& items);
+        template <typename _Array>
+        void deserializeArray(_Array& items);
+        template <typename _Array>
+        void deserializeArrayFast(_Array& items);
+        template <typename _Element, typename _Allocator>
+        void deserializeArrayFast(std::vector<_Element, _Allocator>& items);
+        template <typename _Array>
+        void deserializeArraySlow(_Array& items);
+        template <typename _Element, typename _Allocator>
+        void deserializeArraySlow(std::vector<_Element, _Allocator>& items);
+
+    protected:
+        Message() = default;
+        explicit Message(internal::IConnection* connection) noexcept;
+        Message(void *msg, internal::IConnection* connection) noexcept;
+        Message(void *msg, internal::IConnection* connection, adopt_message_t) noexcept;
+
+        friend Factory;
+
+    protected:
+        void* msg_{};
+        internal::IConnection* connection_{};
+        mutable bool ok_{true};
+    };
+
+    class MethodCall : public Message
+    {
+        using Message::Message;
+        friend Factory;
+
+    public:
+        MethodCall() = default;
+
+        MethodReply send(uint64_t timeout) const;
+        [[nodiscard]] Slot send(void* callback, void* userData, uint64_t timeout, return_slot_t) const;
+
+        MethodReply createReply() const;
+        MethodReply createErrorReply(const sdbus::Error& error) const;
+
+        void dontExpectReply();
+        bool doesntExpectReply() const;
+
+    protected:
+        MethodCall(void *msg, internal::IConnection* connection, adopt_message_t) noexcept;
+
+    private:
+        MethodReply sendWithReply(uint64_t timeout = 0) const;
+        MethodReply sendWithNoReply() const;
+    };
+
+    class MethodReply : public Message
+    {
+        using Message::Message;
+        friend Factory;
+
+    public:
+        MethodReply() = default;
+        void send() const;
+        uint64_t getReplyCookie() const;
+    };
+
+    class Signal : public Message
+    {
+        using Message::Message;
+        friend Factory;
+
+    public:
+        Signal() = default;
+        void setDestination(const std::string& destination);
+        void setDestination(const char* destination);
+        void send() const;
+    };
+
+    class PropertySetCall : public Message
+    {
+        using Message::Message;
+        friend Factory;
+
+    public:
+        PropertySetCall() = default;
+    };
+
+    class PropertyGetReply : public Message
+    {
+        using Message::Message;
+        friend Factory;
+
+    public:
+        PropertyGetReply() = default;
+    };
+
+    // Represents any of the above message types, or just a message that serves as a container for data
+    class PlainMessage : public Message
+    {
+        using Message::Message;
+        friend Factory;
+
+    public:
+        PlainMessage() = default;
+    };
+
+    PlainMessage createPlainMessage();
+
+    template <typename ...Elements>
+    inline Message& Message::operator<<(const std::variant<Elements...>& value)
+    {
+        std::visit([this](const auto& inner)
+        {
+            openVariant<decltype(inner)>();
+            *this << inner;
+            closeVariant();
+        }, value);
+
+        return *this;
+    }
+
+    template <typename _Element, typename _Allocator>
+    inline Message& Message::operator<<(const std::vector<_Element, _Allocator>& items)
+    {
+        serializeArray(items);
+
+        return *this;
+    }
+
+    template <typename _Element, std::size_t _Size>
+    inline Message& Message::operator<<(const std::array<_Element, _Size>& items)
+    {
+        serializeArray(items);
+
+        return *this;
+    }
+
+#ifdef __cpp_lib_span
+    template <typename _Element, std::size_t _Extent>
+    inline Message& Message::operator<<(const std::span<_Element, _Extent>& items)
+    {
+        serializeArray(items);
+
+        return *this;
+    }
+#endif
+
+    template <typename _Enum, typename>
+    inline Message& Message::operator<<(const _Enum &item)
+    {
+        return operator<<(static_cast<std::underlying_type_t<_Enum>>(item));
+    }
+
+    template <typename _Array>
+    inline void Message::serializeArray(const _Array& items)
+    {
+        using ElementType = typename _Array::value_type;
+
+        // Use faster, one-step serialization of contiguous array of elements of trivial D-Bus types except bool,
+        // otherwise use step-by-step serialization of individual elements.
+        if constexpr (signature_of<ElementType>::is_trivial_dbus_type && !std::is_same_v<ElementType, bool>)
+        {
+            constexpr auto signature = as_null_terminated(signature_of_v<ElementType>);
+            appendArray(*signature.data(), items.data(), items.size() * sizeof(ElementType));
+        }
+        else
+        {
+            openContainer<ElementType>();
+
+            for (const auto& item : items)
+                *this << item;
+
+            closeContainer();
+        }
+    }
+
+    template <typename _Key, typename _Value>
+    inline Message& Message::operator<<(const DictEntry<_Key, _Value>& value)
+    {
+        openDictEntry<_Key, _Value>();
+        *this << value.first;
+        *this << value.second;
+        closeDictEntry();
+
+        return *this;
+    }
+
+    template <typename _Key, typename _Value, typename _Compare, typename _Allocator>
+    inline Message& Message::operator<<(const std::map<_Key, _Value, _Compare, _Allocator>& items)
+    {
+        serializeDictionary<_Key, _Value>([&items](Message& msg){ for (const auto& item : items) msg << item; });
+
+        return *this;
+    }
+
+    template <typename _Key, typename _Value, typename _Hash, typename _KeyEqual, typename _Allocator>
+    inline Message& Message::operator<<(const std::unordered_map<_Key, _Value, _Hash, _KeyEqual, _Allocator>& items)
+    {
+        serializeDictionary<_Key, _Value>([&items](Message& msg){ for (const auto& item : items) msg << item; });
+
+        return *this;
+    }
+
+    template <typename _Key, typename _Value>
+    inline Message& Message::serializeDictionary(const std::initializer_list<DictEntry<_Key, _Value>>& items)
+    {
+        serializeDictionary<_Key, _Value>([&](Message& msg){ for (const auto& item : items) msg << item; });
+
+        return *this;
+    }
+
+    template <typename _Key, typename _Value, typename _Callback>
+    inline Message& Message::serializeDictionary(const _Callback& callback)
+    {
+        openContainer<DictEntry<_Key, _Value>>();
+        callback(*this);
+        closeContainer();
+
+        return *this;
+    }
+
+    namespace detail
+    {
+        template <typename... _Args>
+        void serialize_pack(Message& msg, _Args&&... args)
+        {
+            (void)(msg << ... << args);
+        }
+
+        template <class _Tuple, std::size_t... _Is>
+        void serialize_tuple( Message& msg
+                            , const _Tuple& t
+                            , std::index_sequence<_Is...>)
+        {
+            serialize_pack(msg, std::get<_Is>(t)...);
+        }
+    }
+
+    template <typename... _ValueTypes>
+    inline Message& Message::operator<<(const Struct<_ValueTypes...>& item)
+    {
+        openStruct<_ValueTypes...>();
+        detail::serialize_tuple(*this, item, std::index_sequence_for<_ValueTypes...>{});
+        closeStruct();
+
+        return *this;
+    }
+
+    template <typename... _ValueTypes>
+    inline Message& Message::operator<<(const std::tuple<_ValueTypes...>& item)
+    {
+        detail::serialize_tuple(*this, item, std::index_sequence_for<_ValueTypes...>{});
+        return *this;
+    }
+
+    namespace detail
+    {
+        template <typename _Element, typename... _Elements>
+        bool deserialize_variant(Message& msg, std::variant<_Elements...>& value, const char* signature)
+        {
+            constexpr auto elemSignature = as_null_terminated(sdbus::signature_of_v<_Element>);
+            if (std::strcmp(signature, elemSignature.data()) != 0)
+                return false;
+
+            _Element temp;
+            msg.enterVariant(signature);
+            msg >> temp;
+            msg.exitVariant();
+            value = std::move(temp);
+            return true;
+        }
+    }
+
+    template <typename... Elements>
+    inline Message& Message::operator>>(std::variant<Elements...>& value)
+    {
+        auto [type, contents] = peekType();
+        bool result = (detail::deserialize_variant<Elements>(*this, value, contents) || ...);
+        SDBUS_THROW_ERROR_IF(!result, "Failed to deserialize variant: signature did not match any of the variant types", EINVAL);
+        return *this;
+    }
+
+    template <typename _Element, typename _Allocator>
+    inline Message& Message::operator>>(std::vector<_Element, _Allocator>& items)
+    {
+        deserializeArray(items);
+
+        return *this;
+    }
+
+    template <typename _Element, std::size_t _Size>
+    inline Message& Message::operator>>(std::array<_Element, _Size>& items)
+    {
+        deserializeArray(items);
+
+        return *this;
+    }
+
+#ifdef __cpp_lib_span
+    template <typename _Element, std::size_t _Extent>
+    inline Message& Message::operator>>(std::span<_Element, _Extent>& items)
+    {
+        deserializeArray(items);
+
+        return *this;
+    }
+#endif
+
+    template <typename _Enum, typename>
+    inline Message& Message::operator>>(_Enum& item)
+    {
+        std::underlying_type_t<_Enum> val;
+        *this >> val;
+        item = static_cast<_Enum>(val);
+        return *this;
+    }
+
+    template <typename _Array>
+    inline void Message::deserializeArray(_Array& items)
+    {
+        using ElementType = typename _Array::value_type;
+
+        // Use faster, one-step deserialization of contiguous array of elements of trivial D-Bus types except bool,
+        // otherwise use step-by-step deserialization of individual elements.
+        if constexpr (signature_of<ElementType>::is_trivial_dbus_type && !std::is_same_v<ElementType, bool>)
+        {
+            deserializeArrayFast(items);
+        }
+        else
+        {
+            deserializeArraySlow(items);
+        }
+    }
+
+    template <typename _Array>
+    inline void Message::deserializeArrayFast(_Array& items)
+    {
+        using ElementType = typename _Array::value_type;
+
+        size_t arraySize{};
+        const ElementType* arrayPtr{};
+
+        constexpr auto signature = as_null_terminated(sdbus::signature_of_v<ElementType>);
+        readArray(*signature.data(), (const void**)&arrayPtr, &arraySize);
+
+        size_t elementsInMsg = arraySize / sizeof(ElementType);
+        bool notEnoughSpace = items.size() < elementsInMsg;
+        SDBUS_THROW_ERROR_IF(notEnoughSpace, "Failed to deserialize array: not enough space in destination sequence", EINVAL);
+
+        std::copy_n(arrayPtr, elementsInMsg, items.begin());
+    }
+
+    template <typename _Element, typename _Allocator>
+    void Message::deserializeArrayFast(std::vector<_Element, _Allocator>& items)
+    {
+        size_t arraySize{};
+        const _Element* arrayPtr{};
+
+        constexpr auto signature = as_null_terminated(sdbus::signature_of_v<_Element>);
+        readArray(*signature.data(), (const void**)&arrayPtr, &arraySize);
+
+        items.insert(items.end(), arrayPtr, arrayPtr + (arraySize / sizeof(_Element)));
+    }
+
+    template <typename _Array>
+    inline void Message::deserializeArraySlow(_Array& items)
+    {
+        using ElementType = typename _Array::value_type;
+
+        if(!enterContainer<ElementType>())
+            return;
+
+        for (auto& elem : items)
+            if (!(*this >> elem))
+                break; // Keep the rest in the destination sequence untouched
+
+        SDBUS_THROW_ERROR_IF(!isAtEnd(false), "Failed to deserialize array: not enough space in destination sequence", EINVAL);
+
+        clearFlags();
+
+        exitContainer();
+    }
+
+    template <typename _Element, typename _Allocator>
+    void Message::deserializeArraySlow(std::vector<_Element, _Allocator>& items)
+    {
+        if(!enterContainer<_Element>())
+            return;
+
+        while (true)
+        {
+            _Element elem;
+            if (*this >> elem)
+                items.emplace_back(std::move(elem));
+            else
+                break;
+        }
+
+        clearFlags();
+
+        exitContainer();
+    }
+
+    template <typename _Key, typename _Value>
+    inline Message& Message::operator>>(DictEntry<_Key, _Value>& value)
+    {
+        if (!enterDictEntry<_Key, _Value>())
+            return *this;
+        *this >> value.first >> value.second;
+        exitDictEntry();
+
+        return *this;
+    }
+
+    template <typename _Key, typename _Value, typename _Compare, typename _Allocator>
+    inline Message& Message::operator>>(std::map<_Key, _Value, _Compare, _Allocator>& items)
+    {
+        deserializeDictionary<_Key, _Value>([&items](auto dictEntry){ items.insert(std::move(dictEntry)); });
+
+        return *this;
+    }
+
+    template <typename _Key, typename _Value, typename _Hash, typename _KeyEqual, typename _Allocator>
+    inline Message& Message::operator>>(std::unordered_map<_Key, _Value, _Hash, _KeyEqual, _Allocator>& items)
+    {
+        deserializeDictionary<_Key, _Value>([&items](auto dictEntry){ items.insert(std::move(dictEntry)); });
+
+        return *this;
+    }
+
+    template <typename _Key, typename _Value, typename _Callback>
+    inline Message& Message::deserializeDictionary(const _Callback& callback)
+    {
+        if (!enterContainer<DictEntry<_Key, _Value>>())
+            return *this;
+
+        while (true)
+        {
+            DictEntry<_Key, _Value> dictEntry;
+            *this >> dictEntry;
+            if (!*this)
+                break;
+            callback(std::move(dictEntry));
+        }
+        clearFlags();
+
+        exitContainer();
+
+        return *this;
+    }
+
+    namespace detail
+    {
+        template <typename... _Args>
+        void deserialize_pack(Message& msg, _Args&... args)
+        {
+            (void)(msg >> ... >> args);
+        }
+
+        template <class _Tuple, std::size_t... _Is>
+        void deserialize_tuple( Message& msg
+                              , _Tuple& t
+                              , std::index_sequence<_Is...> )
+        {
+            deserialize_pack(msg, std::get<_Is>(t)...);
+        }
+    }
+
+    template <typename... _ValueTypes>
+    inline Message& Message::operator>>(Struct<_ValueTypes...>& item)
+    {
+        if (!enterStruct<_ValueTypes...>())
+            return *this;
+
+        detail::deserialize_tuple(*this, item, std::index_sequence_for<_ValueTypes...>{});
+
+        exitStruct();
+
+        return *this;
+    }
+
+    template <typename... _ValueTypes>
+    inline Message& Message::operator>>(std::tuple<_ValueTypes...>& item)
+    {
+        detail::deserialize_tuple(*this, item, std::index_sequence_for<_ValueTypes...>{});
+        return *this;
+    }
+
+    template <typename _ElementType>
+    inline Message& Message::openContainer()
+    {
+        constexpr auto signature = as_null_terminated(signature_of_v<_ElementType>);
+        return openContainer(signature.data());
+    }
+
+    template <typename _KeyType, typename _ValueType>
+    inline Message& Message::openDictEntry()
+    {
+        constexpr auto signature = as_null_terminated(signature_of_v<std::tuple<_KeyType, _ValueType>>);
+        return openDictEntry(signature.data());
+    }
+
+    template <typename _ValueType>
+    inline Message& Message::openVariant()
+    {
+        constexpr auto signature = as_null_terminated(signature_of_v<_ValueType>);
+        return openVariant(signature.data());
+    }
+
+    template <typename... _ValueTypes>
+    inline Message& Message::openStruct()
+    {
+        constexpr auto signature = as_null_terminated(signature_of_v<std::tuple<_ValueTypes...>>);
+        return openStruct(signature.data());
+    }
+
+    template <typename _ElementType>
+    inline Message& Message::enterContainer()
+    {
+        constexpr auto signature = as_null_terminated(signature_of_v<_ElementType>);
+        return enterContainer(signature.data());
+    }
+
+    template <typename _KeyType, typename _ValueType>
+    inline Message& Message::enterDictEntry()
+    {
+        constexpr auto signature = as_null_terminated(signature_of_v<std::tuple<_KeyType, _ValueType>>);
+        return enterDictEntry(signature.data());
+    }
+
+    template <typename _ValueType>
+    inline Message& Message::enterVariant()
+    {
+        constexpr auto signature = as_null_terminated(signature_of_v<_ValueType>);
+        return enterVariant(signature.data());
+    }
+
+    template <typename... _ValueTypes>
+    inline Message& Message::enterStruct()
+    {
+        constexpr auto signature = as_null_terminated(signature_of_v<std::tuple<_ValueTypes...>>);
+        return enterStruct(signature.data());
+    }
+
+}
+
+#endif /* SDBUS_CXX_MESSAGE_H_ */
diff --git a/3rdParty/sdbus-cpp/include/sdbus-c++/MethodResult.h b/3rdParty/sdbus-cpp/include/sdbus-c++/MethodResult.h
new file mode 100644
index 0000000000..d6f8540f01
--- /dev/null
+++ b/3rdParty/sdbus-cpp/include/sdbus-c++/MethodResult.h
@@ -0,0 +1,93 @@
+/**
+ * (C) 2016 - 2021 KISTLER INSTRUMENTE AG, Winterthur, Switzerland
+ * (C) 2016 - 2024 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
+ *
+ * @file MethodResult.h
+ *
+ * Created on: Nov 8, 2016
+ * Project: sdbus-c++
+ * Description: High-level D-Bus IPC C++ library based on sd-bus
+ *
+ * This file is part of sdbus-c++.
+ *
+ * sdbus-c++ is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * sdbus-c++ is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with sdbus-c++. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef SDBUS_CXX_METHODRESULT_H_
+#define SDBUS_CXX_METHODRESULT_H_
+
+#include <sdbus-c++/Message.h>
+
+#include <cassert>
+
+// Forward declarations
+namespace sdbus {
+    class Error;
+}
+
+namespace sdbus {
+
+    /********************************************//**
+     * @class Result
+     *
+     * Represents result of an asynchronous server-side method.
+     * An instance is provided to the method and shall be set
+     * by the method to either method return value or an error.
+     *
+     ***********************************************/
+    template <typename... _Results>
+    class Result
+    {
+    public:
+        Result() = default;
+        Result(MethodCall call);
+
+        Result(const Result&) = delete;
+        Result& operator=(const Result&) = delete;
+
+        Result(Result&& other) = default;
+        Result& operator=(Result&& other) = default;
+
+        void returnResults(const _Results&... results) const;
+        void returnError(const Error& error) const;
+
+    private:
+        MethodCall call_;
+    };
+
+    template <typename... _Results>
+    inline Result<_Results...>::Result(MethodCall call)
+        : call_(std::move(call))
+    {
+    }
+
+    template <typename... _Results>
+    inline void Result<_Results...>::returnResults(const _Results&... results) const
+    {
+        assert(call_.isValid());
+        auto reply = call_.createReply();
+        (void)(reply << ... << results);
+        reply.send();
+    }
+
+    template <typename... _Results>
+    inline void Result<_Results...>::returnError(const Error& error) const
+    {
+        auto reply = call_.createErrorReply(error);
+        reply.send();
+    }
+
+}
+
+#endif /* SDBUS_CXX_METHODRESULT_H_ */
diff --git a/3rdParty/sdbus-cpp/include/sdbus-c++/ProxyInterfaces.h b/3rdParty/sdbus-cpp/include/sdbus-c++/ProxyInterfaces.h
new file mode 100644
index 0000000000..72f25c6be4
--- /dev/null
+++ b/3rdParty/sdbus-cpp/include/sdbus-c++/ProxyInterfaces.h
@@ -0,0 +1,217 @@
+/**
+ * (C) 2016 - 2021 KISTLER INSTRUMENTE AG, Winterthur, Switzerland
+ * (C) 2016 - 2024 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
+ *
+ * @file ProxyInterfaces.h
+ *
+ * Created on: Apr 8, 2019
+ * Project: sdbus-c++
+ * Description: High-level D-Bus IPC C++ library based on sd-bus
+ *
+ * This file is part of sdbus-c++.
+ *
+ * sdbus-c++ is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * sdbus-c++ is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with sdbus-c++. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef SDBUS_CXX_PROXYINTERFACES_H_
+#define SDBUS_CXX_PROXYINTERFACES_H_
+
+#include <sdbus-c++/IProxy.h>
+#include <cassert>
+#include <string>
+#include <memory>
+
+// Forward declarations
+namespace sdbus {
+    class IConnection;
+}
+
+namespace sdbus {
+
+    /********************************************//**
+     * @class ProxyObjectHolder
+     *
+     * ProxyObjectHolder is a helper that simply owns and provides
+     * access to a proxy object to other classes in the inheritance
+     * hierarchy of a native-like proxy object based on generated
+     * interface classes.
+     *
+     ***********************************************/
+    class ProxyObjectHolder
+    {
+    protected:
+        ProxyObjectHolder(std::unique_ptr<IProxy>&& proxy)
+            : proxy_(std::move(proxy))
+        {
+            assert(proxy_ != nullptr);
+        }
+
+        const IProxy& getProxy() const
+        {
+            assert(proxy_ != nullptr);
+            return *proxy_;
+        }
+
+        IProxy& getProxy()
+        {
+            assert(proxy_ != nullptr);
+            return *proxy_;
+        }
+
+    private:
+        std::unique_ptr<IProxy> proxy_;
+    };
+
+    /********************************************//**
+     * @class ProxyInterfaces
+     *
+     * ProxyInterfaces is a helper template class that joins all interface classes of a remote
+     * D-Bus object generated by sdbus-c++-xml2cpp to be used on the client (the proxy) side,
+     * including some auxiliary classes. ProxyInterfaces is the class that native-like proxy
+     * implementation classes written by users should inherit from and implement all pure virtual
+     * methods. So the _Interfaces template parameter is a list of sdbus-c++-xml2cpp-generated
+     * proxy-side interface classes representing interfaces of the corresponding remote D-Bus object.
+     *
+     * In the final adaptor class inherited from ProxyInterfaces, one needs to make sure:
+     *   1. to call `registerProxy();` in the class constructor, and, conversely,
+     *   2. to call `unregisterProxy();` in the class destructor,
+     * so that the signals are subscribed to and unsubscribed from at a proper time.
+     *
+     ***********************************************/
+    template <typename... _Interfaces>
+    class ProxyInterfaces
+        : protected ProxyObjectHolder
+        , public _Interfaces...
+    {
+    public:
+        /*!
+         * @brief Creates native-like proxy object instance
+         *
+         * @param[in] destination Bus name that provides a D-Bus object
+         * @param[in] objectPath Path of the D-Bus object
+         *
+         * This constructor overload creates a proxy that manages its own D-Bus connection(s).
+         * For more information on its behavior, consult @ref createProxy(std::string,std::string)
+         */
+        ProxyInterfaces(ServiceName destination, ObjectPath objectPath)
+            : ProxyObjectHolder(createProxy(std::move(destination), std::move(objectPath)))
+            , _Interfaces(getProxy())...
+        {
+        }
+
+        /*!
+         * @brief Creates native-like proxy object instance
+         *
+         * @param[in] destination Bus name that provides a D-Bus object
+         * @param[in] objectPath Path of the D-Bus object
+         *
+         * This constructor overload creates a proxy that manages its own D-Bus connection(s).
+         * For more information on its behavior, consult @ref createProxy(std::string,std::string,sdbus::dont_run_event_loop_thread_t)
+         */
+        ProxyInterfaces(ServiceName destination, ObjectPath objectPath, dont_run_event_loop_thread_t)
+            : ProxyObjectHolder(createProxy(std::move(destination), std::move(objectPath), dont_run_event_loop_thread))
+            , _Interfaces(getProxy())...
+        {
+        }
+
+        /*!
+         * @brief Creates native-like proxy object instance
+         *
+         * @param[in] connection D-Bus connection to be used by the proxy object
+         * @param[in] destination Bus name that provides a D-Bus object
+         * @param[in] objectPath Path of the D-Bus object
+         *
+         * The proxy created this way just references a D-Bus connection owned and managed by the user.
+         * For more information on its behavior, consult @ref createProxy(IConnection&,std::string,std::string)
+         */
+        ProxyInterfaces(IConnection& connection, ServiceName destination, ObjectPath objectPath)
+            : ProxyObjectHolder(createProxy(connection, std::move(destination), std::move(objectPath)))
+            , _Interfaces(getProxy())...
+        {
+        }
+
+        /*!
+         * @brief Creates native-like proxy object instance
+         *
+         * @param[in] connection D-Bus connection to be used by the proxy object
+         * @param[in] destination Bus name that provides a D-Bus object
+         * @param[in] objectPath Path of the D-Bus object
+         *
+         * The proxy created this way becomes an owner of the connection.
+         * For more information on its behavior, consult @ref createProxy(std::unique_ptr<sdbus::IConnection>&&,std::string,std::string)
+         */
+        ProxyInterfaces(std::unique_ptr<sdbus::IConnection>&& connection, ServiceName destination, ObjectPath objectPath)
+            : ProxyObjectHolder(createProxy(std::move(connection), std::move(destination), std::move(objectPath)))
+            , _Interfaces(getProxy())...
+        {
+        }
+
+        /*!
+         * @brief Creates native-like proxy object instance
+         *
+         * @param[in] connection D-Bus connection to be used by the proxy object
+         * @param[in] destination Bus name that provides a D-Bus object
+         * @param[in] objectPath Path of the D-Bus object
+         *
+         * The proxy created this way becomes an owner of the connection.
+         * For more information on its behavior, consult @ref createProxy(std::unique_ptr<sdbus::IConnection>&&,std::string,std::string,sdbus::dont_run_event_loop_thread_t)
+         */
+        ProxyInterfaces(std::unique_ptr<sdbus::IConnection>&& connection, ServiceName destination, ObjectPath objectPath, dont_run_event_loop_thread_t)
+                : ProxyObjectHolder(createProxy(std::move(connection), std::move(destination), std::move(objectPath), dont_run_event_loop_thread))
+                , _Interfaces(getProxy())...
+        {
+        }
+
+        /*!
+         * @brief Registers handlers for D-Bus signals of the remote object
+         *
+         * This function must be called in the constructor of the final proxy class that implements ProxyInterfaces.
+         *
+         * See also @ref IProxy::registerSignalHandler()
+         */
+        void registerProxy()
+        {
+            (_Interfaces::registerProxy(), ...);
+        }
+
+        /*!
+         * @brief Unregisters the proxy so it no more receives signals and async call replies
+         *
+         * This function must be called in the destructor of the final proxy class that implements ProxyInterfaces.
+         *
+         * See underlying @ref IProxy::unregister()
+         */
+        void unregisterProxy()
+        {
+            getProxy().unregister();
+        }
+
+        /*!
+         * @brief Returns reference to the underlying IProxy instance
+         */
+        using ProxyObjectHolder::getProxy;
+
+    protected:
+        using base_type = ProxyInterfaces;
+
+        ProxyInterfaces(const ProxyInterfaces&) = delete;
+        ProxyInterfaces& operator=(const ProxyInterfaces&) = delete;
+        ProxyInterfaces(ProxyInterfaces&&) = delete;
+        ProxyInterfaces& operator=(ProxyInterfaces&&) = delete;
+        ~ProxyInterfaces() = default;
+    };
+
+}
+
+#endif /* SDBUS_CXX_INTERFACES_H_ */
diff --git a/3rdParty/sdbus-cpp/include/sdbus-c++/StandardInterfaces.h b/3rdParty/sdbus-cpp/include/sdbus-c++/StandardInterfaces.h
new file mode 100644
index 0000000000..83007b0ec9
--- /dev/null
+++ b/3rdParty/sdbus-cpp/include/sdbus-c++/StandardInterfaces.h
@@ -0,0 +1,530 @@
+/**
+ * (C) 2016 - 2021 KISTLER INSTRUMENTE AG, Winterthur, Switzerland
+ * (C) 2016 - 2024 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
+ *
+ * @file StandardInterfaces.h
+ *
+ * Created on: Dec 13, 2016
+ * Project: sdbus-c++
+ * Description: High-level D-Bus IPC C++ library based on sd-bus
+ *
+ * This file is part of sdbus-c++.
+ *
+ * sdbus-c++ is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * sdbus-c++ is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with sdbus-c++. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef SDBUS_CXX_STANDARDINTERFACES_H_
+#define SDBUS_CXX_STANDARDINTERFACES_H_
+
+#include <sdbus-c++/IObject.h>
+#include <sdbus-c++/IProxy.h>
+#include <sdbus-c++/Types.h>
+#include <string>
+#include <string_view>
+#include <map>
+#include <vector>
+
+namespace sdbus {
+
+    // Proxy for peer
+    class Peer_proxy
+    {
+        static inline const char* INTERFACE_NAME = "org.freedesktop.DBus.Peer";
+
+    protected:
+        Peer_proxy(sdbus::IProxy& proxy)
+            : m_proxy(proxy)
+        {
+        }
+
+        Peer_proxy(const Peer_proxy&) = delete;
+        Peer_proxy& operator=(const Peer_proxy&) = delete;
+        Peer_proxy(Peer_proxy&&) = delete;
+        Peer_proxy& operator=(Peer_proxy&&) = delete;
+
+        ~Peer_proxy() = default;
+
+        void registerProxy()
+        {
+        }
+
+    public:
+        void Ping()
+        {
+            m_proxy.callMethod("Ping").onInterface(INTERFACE_NAME);
+        }
+
+        std::string GetMachineId()
+        {
+            std::string machineUUID;
+            m_proxy.callMethod("GetMachineId").onInterface(INTERFACE_NAME).storeResultsTo(machineUUID);
+            return machineUUID;
+        }
+
+    private:
+        sdbus::IProxy& m_proxy;
+    };
+
+    // Proxy for introspection
+    class Introspectable_proxy
+    {
+        static inline const char* INTERFACE_NAME = "org.freedesktop.DBus.Introspectable";
+
+    protected:
+        Introspectable_proxy(sdbus::IProxy& proxy)
+            : m_proxy(proxy)
+        {
+        }
+
+        Introspectable_proxy(const Introspectable_proxy&) = delete;
+        Introspectable_proxy& operator=(const Introspectable_proxy&) = delete;
+        Introspectable_proxy(Introspectable_proxy&&) = delete;
+        Introspectable_proxy& operator=(Introspectable_proxy&&) = delete;
+
+        ~Introspectable_proxy() = default;
+
+        void registerProxy()
+        {
+        }
+
+    public:
+        std::string Introspect()
+        {
+            std::string xml;
+            m_proxy.callMethod("Introspect").onInterface(INTERFACE_NAME).storeResultsTo(xml);
+            return xml;
+        }
+
+    private:
+        sdbus::IProxy& m_proxy;
+    };
+
+    // Proxy for properties
+    class Properties_proxy
+    {
+        static inline const char* INTERFACE_NAME = "org.freedesktop.DBus.Properties";
+
+    protected:
+        Properties_proxy(sdbus::IProxy& proxy)
+            : m_proxy(proxy)
+        {
+        }
+
+        Properties_proxy(const Properties_proxy&) = delete;
+        Properties_proxy& operator=(const Properties_proxy&) = delete;
+        Properties_proxy(Properties_proxy&&) = delete;
+        Properties_proxy& operator=(Properties_proxy&&) = delete;
+
+        ~Properties_proxy() = default;
+
+        void registerProxy()
+        {
+            m_proxy
+                .uponSignal("PropertiesChanged")
+                .onInterface(INTERFACE_NAME)
+                .call([this]( const InterfaceName& interfaceName
+                            , const std::map<PropertyName, sdbus::Variant>& changedProperties
+                            , const std::vector<PropertyName>& invalidatedProperties )
+                            {
+                                this->onPropertiesChanged(interfaceName, changedProperties, invalidatedProperties);
+                            });
+        }
+
+        virtual void onPropertiesChanged( const InterfaceName& interfaceName
+                                        , const std::map<PropertyName, sdbus::Variant>& changedProperties
+                                        , const std::vector<PropertyName>& invalidatedProperties ) = 0;
+
+    public:
+        sdbus::Variant Get(const InterfaceName& interfaceName, const PropertyName& propertyName)
+        {
+            return m_proxy.getProperty(propertyName).onInterface(interfaceName);
+        }
+
+        sdbus::Variant Get(std::string_view interfaceName, std::string_view propertyName)
+        {
+            return m_proxy.getProperty(propertyName).onInterface(interfaceName);
+        }
+
+        template <typename _Function>
+        PendingAsyncCall GetAsync(const InterfaceName& interfaceName, const PropertyName& propertyName, _Function&& callback)
+        {
+            return m_proxy.getPropertyAsync(propertyName).onInterface(interfaceName).uponReplyInvoke(std::forward<_Function>(callback));
+        }
+
+        template <typename _Function>
+        [[nodiscard]] Slot GetAsync(const InterfaceName& interfaceName, const PropertyName& propertyName, _Function&& callback, return_slot_t)
+        {
+            return m_proxy.getPropertyAsync(propertyName).onInterface(interfaceName).uponReplyInvoke(std::forward<_Function>(callback), return_slot);
+        }
+
+        std::future<sdbus::Variant> GetAsync(const InterfaceName& interfaceName, const PropertyName& propertyName, with_future_t)
+        {
+            return m_proxy.getPropertyAsync(propertyName).onInterface(interfaceName).getResultAsFuture();
+        }
+
+        template <typename _Function>
+        PendingAsyncCall GetAsync(std::string_view interfaceName, std::string_view propertyName, _Function&& callback)
+        {
+            return m_proxy.getPropertyAsync(propertyName).onInterface(interfaceName).uponReplyInvoke(std::forward<_Function>(callback));
+        }
+
+        template <typename _Function>
+        [[nodiscard]] Slot GetAsync(std::string_view interfaceName, std::string_view propertyName, _Function&& callback, return_slot_t)
+        {
+            return m_proxy.getPropertyAsync(propertyName).onInterface(interfaceName).uponReplyInvoke(std::forward<_Function>(callback), return_slot);
+        }
+
+        std::future<sdbus::Variant> GetAsync(std::string_view interfaceName, std::string_view propertyName, with_future_t)
+        {
+            return m_proxy.getPropertyAsync(propertyName).onInterface(interfaceName).getResultAsFuture();
+        }
+
+        void Set(const InterfaceName& interfaceName, const PropertyName& propertyName, const sdbus::Variant& value)
+        {
+            m_proxy.setProperty(propertyName).onInterface(interfaceName).toValue(value);
+        }
+
+        void Set(std::string_view interfaceName, const std::string_view propertyName, const sdbus::Variant& value)
+        {
+            m_proxy.setProperty(propertyName).onInterface(interfaceName).toValue(value);
+        }
+
+        void Set(const InterfaceName& interfaceName, const PropertyName& propertyName, const sdbus::Variant& value, dont_expect_reply_t)
+        {
+            m_proxy.setProperty(propertyName).onInterface(interfaceName).toValue(value, dont_expect_reply);
+        }
+
+        void Set(std::string_view interfaceName, const std::string_view propertyName, const sdbus::Variant& value, dont_expect_reply_t)
+        {
+            m_proxy.setProperty(propertyName).onInterface(interfaceName).toValue(value, dont_expect_reply);
+        }
+
+        template <typename _Function>
+        PendingAsyncCall SetAsync(const InterfaceName& interfaceName, const PropertyName& propertyName, const sdbus::Variant& value, _Function&& callback)
+        {
+            return m_proxy.setPropertyAsync(propertyName).onInterface(interfaceName).toValue(value).uponReplyInvoke(std::forward<_Function>(callback));
+        }
+
+        template <typename _Function>
+        [[nodiscard]] Slot SetAsync(const InterfaceName& interfaceName, const PropertyName& propertyName, const sdbus::Variant& value, _Function&& callback, return_slot_t)
+        {
+            return m_proxy.setPropertyAsync(propertyName).onInterface(interfaceName).toValue(value).uponReplyInvoke(std::forward<_Function>(callback), return_slot);
+        }
+
+        std::future<void> SetAsync(const InterfaceName& interfaceName, const PropertyName& propertyName, const sdbus::Variant& value, with_future_t)
+        {
+            return m_proxy.setPropertyAsync(propertyName).onInterface(interfaceName).toValue(value).getResultAsFuture();
+        }
+
+        template <typename _Function>
+        PendingAsyncCall SetAsync(std::string_view interfaceName, std::string_view propertyName, const sdbus::Variant& value, _Function&& callback)
+        {
+            return m_proxy.setPropertyAsync(propertyName).onInterface(interfaceName).toValue(value).uponReplyInvoke(std::forward<_Function>(callback));
+        }
+
+        template <typename _Function>
+        [[nodiscard]] Slot SetAsync(std::string_view interfaceName, std::string_view propertyName, const sdbus::Variant& value, _Function&& callback, return_slot_t)
+        {
+            return m_proxy.setPropertyAsync(propertyName).onInterface(interfaceName).toValue(value).uponReplyInvoke(std::forward<_Function>(callback), return_slot);
+        }
+
+        std::future<void> SetAsync(std::string_view interfaceName, std::string_view propertyName, const sdbus::Variant& value, with_future_t)
+        {
+            return m_proxy.setPropertyAsync(propertyName).onInterface(interfaceName).toValue(value).getResultAsFuture();
+        }
+
+        std::map<PropertyName, sdbus::Variant> GetAll(const InterfaceName& interfaceName)
+        {
+            return m_proxy.getAllProperties().onInterface(interfaceName);
+        }
+
+        std::map<PropertyName, sdbus::Variant> GetAll(std::string_view interfaceName)
+        {
+            return m_proxy.getAllProperties().onInterface(interfaceName);
+        }
+
+        template <typename _Function>
+        PendingAsyncCall GetAllAsync(const InterfaceName& interfaceName, _Function&& callback)
+        {
+            return m_proxy.getAllPropertiesAsync().onInterface(interfaceName).uponReplyInvoke(std::forward<_Function>(callback));
+        }
+
+        template <typename _Function>
+        [[nodiscard]] Slot GetAllAsync(const InterfaceName& interfaceName, _Function&& callback, return_slot_t)
+        {
+            return m_proxy.getAllPropertiesAsync().onInterface(interfaceName).uponReplyInvoke(std::forward<_Function>(callback), return_slot);
+        }
+
+        std::future<std::map<PropertyName, sdbus::Variant>> GetAllAsync(const InterfaceName& interfaceName, with_future_t)
+        {
+            return m_proxy.getAllPropertiesAsync().onInterface(interfaceName).getResultAsFuture();
+        }
+
+        template <typename _Function>
+        PendingAsyncCall GetAllAsync(std::string_view interfaceName, _Function&& callback)
+        {
+            return m_proxy.getAllPropertiesAsync().onInterface(interfaceName).uponReplyInvoke(std::forward<_Function>(callback));
+        }
+
+        template <typename _Function>
+        [[nodiscard]] Slot GetAllAsync(std::string_view interfaceName, _Function&& callback, return_slot_t)
+        {
+            return m_proxy.getAllPropertiesAsync().onInterface(interfaceName).uponReplyInvoke(std::forward<_Function>(callback), return_slot);
+        }
+
+        std::future<std::map<PropertyName, sdbus::Variant>> GetAllAsync(std::string_view interfaceName, with_future_t)
+        {
+            return m_proxy.getAllPropertiesAsync().onInterface(interfaceName).getResultAsFuture();
+        }
+
+    private:
+        sdbus::IProxy& m_proxy;
+    };
+
+    // Proxy for object manager
+    class ObjectManager_proxy
+    {
+        static inline const char* INTERFACE_NAME = "org.freedesktop.DBus.ObjectManager";
+
+    protected:
+        ObjectManager_proxy(sdbus::IProxy& proxy)
+            : m_proxy(proxy)
+        {
+        }
+
+        ObjectManager_proxy(const ObjectManager_proxy&) = delete;
+        ObjectManager_proxy& operator=(const ObjectManager_proxy&) = delete;
+        ObjectManager_proxy(ObjectManager_proxy&&) = delete;
+        ObjectManager_proxy& operator=(ObjectManager_proxy&&) = delete;
+
+        ~ObjectManager_proxy() = default;
+
+        void registerProxy()
+        {
+            m_proxy
+                .uponSignal("InterfacesAdded")
+                .onInterface(INTERFACE_NAME)
+                .call([this]( const sdbus::ObjectPath& objectPath
+                            , const std::map<sdbus::InterfaceName, std::map<PropertyName, sdbus::Variant>>& interfacesAndProperties )
+                            {
+                                this->onInterfacesAdded(objectPath, interfacesAndProperties);
+                            });
+
+            m_proxy
+                .uponSignal("InterfacesRemoved")
+                .onInterface(INTERFACE_NAME)
+                .call([this]( const sdbus::ObjectPath& objectPath
+                            , const std::vector<sdbus::InterfaceName>& interfaces )
+                            {
+                                this->onInterfacesRemoved(objectPath, interfaces);
+                            });
+        }
+
+        virtual void onInterfacesAdded( const sdbus::ObjectPath& objectPath
+                                      , const std::map<sdbus::InterfaceName, std::map<PropertyName, sdbus::Variant>>& interfacesAndProperties) = 0;
+        virtual void onInterfacesRemoved( const sdbus::ObjectPath& objectPath
+                                        , const std::vector<sdbus::InterfaceName>& interfaces) = 0;
+
+    public:
+        std::map<sdbus::ObjectPath, std::map<sdbus::InterfaceName, std::map<PropertyName, sdbus::Variant>>> GetManagedObjects()
+        {
+            std::map<sdbus::ObjectPath, std::map<sdbus::InterfaceName, std::map<PropertyName, sdbus::Variant>>> objectsInterfacesAndProperties;
+            m_proxy.callMethod("GetManagedObjects").onInterface(INTERFACE_NAME).storeResultsTo(objectsInterfacesAndProperties);
+            return objectsInterfacesAndProperties;
+        }
+
+        template <typename _Function>
+        PendingAsyncCall GetManagedObjectsAsync(_Function&& callback)
+        {
+            return m_proxy.callMethodAsync("GetManagedObjects").onInterface(INTERFACE_NAME).uponReplyInvoke(std::forward<_Function>(callback));
+        }
+
+        template <typename _Function>
+        [[nodiscard]] Slot GetManagedObjectsAsync(_Function&& callback, return_slot_t)
+        {
+            return m_proxy.callMethodAsync("GetManagedObjects").onInterface(INTERFACE_NAME).uponReplyInvoke(std::forward<_Function>(callback), return_slot);
+        }
+
+        std::future<std::map<sdbus::ObjectPath, std::map<sdbus::InterfaceName, std::map<PropertyName, sdbus::Variant>>>> GetManagedObjectsAsync(with_future_t)
+        {
+            return m_proxy.callMethodAsync("GetManagedObjects").onInterface(INTERFACE_NAME).getResultAsFuture<std::map<sdbus::ObjectPath, std::map<sdbus::InterfaceName, std::map<PropertyName, sdbus::Variant>>>>();
+        }
+
+    private:
+        sdbus::IProxy& m_proxy;
+    };
+
+    // Adaptors for the above-listed standard D-Bus interfaces are not necessary because the functionality
+    // is provided by underlying libsystemd implementation. The exception is Properties_adaptor,
+    // ObjectManager_adaptor and ManagedObject_adaptor, which provide convenience functionality to emit signals.
+
+    // Adaptor for properties
+    class Properties_adaptor
+    {
+        static inline const char* INTERFACE_NAME = "org.freedesktop.DBus.Properties";
+
+    protected:
+        Properties_adaptor(sdbus::IObject& object) : m_object(object)
+        {
+        }
+
+        Properties_adaptor(const Properties_adaptor&) = delete;
+        Properties_adaptor& operator=(const Properties_adaptor&) = delete;
+        Properties_adaptor(Properties_adaptor&&) = delete;
+        Properties_adaptor& operator=(Properties_adaptor&&) = delete;
+
+        ~Properties_adaptor() = default;
+
+        void registerAdaptor()
+        {
+        }
+
+    public:
+        void emitPropertiesChangedSignal(const InterfaceName& interfaceName, const std::vector<PropertyName>& properties)
+        {
+            m_object.emitPropertiesChangedSignal(interfaceName, properties);
+        }
+
+        void emitPropertiesChangedSignal(const char* interfaceName, const std::vector<PropertyName>& properties)
+        {
+            m_object.emitPropertiesChangedSignal(interfaceName, properties);
+        }
+
+        void emitPropertiesChangedSignal(const InterfaceName& interfaceName)
+        {
+            m_object.emitPropertiesChangedSignal(interfaceName);
+        }
+
+        void emitPropertiesChangedSignal(const char* interfaceName)
+        {
+            m_object.emitPropertiesChangedSignal(interfaceName);
+        }
+
+    private:
+        sdbus::IObject& m_object;
+    };
+
+    /*!
+     * @brief Object Manager Convenience Adaptor
+     *
+     * Adding this class as _Interfaces.. template parameter of class AdaptorInterfaces
+     * implements the *GetManagedObjects()* method of the [org.freedesktop.DBus.ObjectManager.GetManagedObjects](https://dbus.freedesktop.org/doc/dbus-specification.html#standard-interfaces-objectmanager)
+     * interface.
+     *
+     * Note that there can be multiple object managers in a path hierarchy. InterfacesAdded/InterfacesRemoved
+     * signals are sent from the closest object manager at either the same path or the closest parent path of an object.
+     */
+    class ObjectManager_adaptor
+    {
+        static inline const char* INTERFACE_NAME = "org.freedesktop.DBus.ObjectManager";
+
+    protected:
+        explicit ObjectManager_adaptor(sdbus::IObject& object) : m_object(object)
+        {
+        }
+
+        ObjectManager_adaptor(const ObjectManager_adaptor&) = delete;
+        ObjectManager_adaptor& operator=(const ObjectManager_adaptor&) = delete;
+        ObjectManager_adaptor(ObjectManager_adaptor&&) = delete;
+        ObjectManager_adaptor& operator=(ObjectManager_adaptor&&) = delete;
+
+        ~ObjectManager_adaptor() = default;
+
+        void registerAdaptor()
+        {
+            m_object.addObjectManager();
+        }
+
+    private:
+        sdbus::IObject& m_object;
+    };
+
+    /*!
+     * @brief Managed Object Convenience Adaptor
+     *
+     * Adding this class as _Interfaces.. template parameter of class AdaptorInterfaces
+     * will extend the resulting object adaptor with emitInterfacesAddedSignal()/emitInterfacesRemovedSignal()
+     * according to org.freedesktop.DBus.ObjectManager.InterfacesAdded/.InterfacesRemoved.
+     *
+     * Note that objects which implement this adaptor require an object manager (e.g via ObjectManager_adaptor) to be
+     * instantiated on one of it's parent object paths or the same path. InterfacesAdded/InterfacesRemoved
+     * signals are sent from the closest object manager at either the same path or the closest parent path of an object.
+     */
+    class ManagedObject_adaptor
+    {
+    protected:
+        explicit ManagedObject_adaptor(sdbus::IObject& object)
+            : m_object(object)
+        {
+        }
+
+        ManagedObject_adaptor(const ManagedObject_adaptor&) = delete;
+        ManagedObject_adaptor& operator=(const ManagedObject_adaptor&) = delete;
+        ManagedObject_adaptor(ManagedObject_adaptor&&) = delete;
+        ManagedObject_adaptor& operator=(ManagedObject_adaptor&&) = delete;
+
+        ~ManagedObject_adaptor() = default;
+
+        void registerAdaptor()
+        {
+        }
+
+    public:
+        /*!
+         * @brief Emits InterfacesAdded signal for this object path
+         *
+         * See IObject::emitInterfacesAddedSignal().
+         */
+        void emitInterfacesAddedSignal()
+        {
+            m_object.emitInterfacesAddedSignal();
+        }
+
+        /*!
+         * @brief Emits InterfacesAdded signal for this object path
+         *
+         * See IObject::emitInterfacesAddedSignal().
+         */
+        void emitInterfacesAddedSignal(const std::vector<sdbus::InterfaceName>& interfaces)
+        {
+            m_object.emitInterfacesAddedSignal(interfaces);
+        }
+
+        /*!
+         * @brief Emits InterfacesRemoved signal for this object path
+         *
+         * See IObject::emitInterfacesRemovedSignal().
+         */
+        void emitInterfacesRemovedSignal()
+        {
+            m_object.emitInterfacesRemovedSignal();
+        }
+
+        /*!
+         * @brief Emits InterfacesRemoved signal for this object path
+         *
+         * See IObject::emitInterfacesRemovedSignal().
+         */
+        void emitInterfacesRemovedSignal(const std::vector<InterfaceName>& interfaces)
+        {
+            m_object.emitInterfacesRemovedSignal(interfaces);
+        }
+
+    private:
+        sdbus::IObject& m_object;
+    };
+
+}
+
+#endif /* SDBUS_CXX_STANDARDINTERFACES_H_ */
diff --git a/3rdParty/sdbus-cpp/include/sdbus-c++/TypeTraits.h b/3rdParty/sdbus-cpp/include/sdbus-c++/TypeTraits.h
new file mode 100644
index 0000000000..e9143fa640
--- /dev/null
+++ b/3rdParty/sdbus-cpp/include/sdbus-c++/TypeTraits.h
@@ -0,0 +1,702 @@
+/**
+ * (C) 2016 - 2021 KISTLER INSTRUMENTE AG, Winterthur, Switzerland
+ * (C) 2016 - 2024 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
+ *
+ * @file TypeTraits.h
+ *
+ * Created on: Nov 9, 2016
+ * Project: sdbus-c++
+ * Description: High-level D-Bus IPC C++ library based on sd-bus
+ *
+ * This file is part of sdbus-c++.
+ *
+ * sdbus-c++ is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * sdbus-c++ is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with sdbus-c++. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef SDBUS_CXX_TYPETRAITS_H_
+#define SDBUS_CXX_TYPETRAITS_H_
+
+#include <sdbus-c++/Error.h>
+
+#include <array>
+#include <cstdint>
+#include <functional>
+#include <map>
+#include <memory>
+#include <optional>
+#ifdef __has_include
+#  if __has_include(<span>)
+#    include <span>
+#  endif
+#endif
+#include <string>
+#include <string_view>
+#include <tuple>
+#include <type_traits>
+#include <unordered_map>
+#include <utility>
+#include <variant>
+#include <vector>
+
+// Forward declarations
+namespace sdbus {
+    class Variant;
+    template <typename... _ValueTypes> class Struct;
+    class ObjectPath;
+    class Signature;
+    class UnixFd;
+    template<typename _T1, typename _T2> using DictEntry = std::pair<_T1, _T2>;
+    class BusName;
+    class InterfaceName;
+    class MemberName;
+    class MethodCall;
+    class MethodReply;
+    class Signal;
+    class Message;
+    class PropertySetCall;
+    class PropertyGetReply;
+    template <typename... _Results> class Result;
+    class Error;
+    template <typename _T, typename _Enable = void> struct signature_of;
+}
+
+namespace sdbus {
+
+    // Callbacks from sdbus-c++
+    using method_callback = std::function<void(MethodCall msg)>;
+    using async_reply_handler = std::function<void(MethodReply reply, std::optional<Error> error)>;
+    using signal_handler = std::function<void(Signal signal)>;
+    using message_handler = std::function<void(Message msg)>;
+    using property_set_callback = std::function<void(PropertySetCall msg)>;
+    using property_get_callback = std::function<void(PropertyGetReply& reply)>;
+
+    // Type-erased RAII-style handle to callbacks/subscriptions registered to sdbus-c++
+    using Slot = std::unique_ptr<void, std::function<void(void*)>>;
+
+    // Tag specifying that an owning handle (so-called slot) of the logical resource shall be provided to the client
+    struct return_slot_t { explicit return_slot_t() = default; };
+    inline constexpr return_slot_t return_slot{};
+    // Tag specifying that the library shall own the slot resulting from the call of the function (so-called floating slot)
+    struct floating_slot_t { explicit floating_slot_t() = default; };
+    inline constexpr floating_slot_t floating_slot{};
+    // Tag denoting the assumption that the caller has already obtained message ownership
+    struct adopt_message_t { explicit adopt_message_t() = default; };
+    inline constexpr adopt_message_t adopt_message{};
+    // Tag denoting the assumption that the caller has already obtained fd ownership
+    struct adopt_fd_t { explicit adopt_fd_t() = default; };
+    inline constexpr adopt_fd_t adopt_fd{};
+    // Tag specifying that the proxy shall not run an event loop thread on its D-Bus connection.
+    // Such proxies are typically created to carry out a simple synchronous D-Bus call(s) and then are destroyed.
+    struct dont_run_event_loop_thread_t { explicit dont_run_event_loop_thread_t() = default; };
+    inline constexpr dont_run_event_loop_thread_t dont_run_event_loop_thread{};
+    // Tag denoting an asynchronous call that returns std::future as a handle
+    struct with_future_t { explicit with_future_t() = default; };
+    inline constexpr with_future_t with_future{};
+    // Tag denoting a call where the reply shouldn't be waited for
+    struct dont_expect_reply_t { explicit dont_expect_reply_t() = default; };
+    inline constexpr dont_expect_reply_t dont_expect_reply{};
+    // Tag denoting that the variant shall embed the other variant as its value, instead of creating a copy
+    struct embed_variant_t { explicit embed_variant_t() = default; };
+    inline constexpr embed_variant_t embed_variant{};
+
+    // Helper for static assert
+    template <class... _T> constexpr bool always_false = false;
+
+    // Helper operator+ for concatenation of `std::array`s
+    template <typename _T, std::size_t _N1, std::size_t _N2>
+    constexpr std::array<_T, _N1 + _N2> operator+(std::array<_T, _N1> lhs, std::array<_T, _N2> rhs);
+
+    // Template specializations for getting D-Bus signatures from C++ types
+    template <typename _T>
+    constexpr auto signature_of_v = signature_of<_T>::value;
+
+    template <typename _T, typename _Enable>
+    struct signature_of
+    {
+        static constexpr bool is_valid = false;
+        static constexpr bool is_trivial_dbus_type = false;
+
+        static constexpr void* value = []
+        {
+            // See using-sdbus-c++.md, section "Extending sdbus-c++ type system",
+            // on how to teach sdbus-c++ about your custom types
+            static_assert(always_false<_T>, "Unsupported D-Bus type (specialize `signature_of` for your custom types)");
+        };
+    };
+
+    template <typename _T>
+    struct signature_of<const _T> : signature_of<_T>
+    {};
+
+    template <typename _T>
+    struct signature_of<volatile _T> : signature_of<_T>
+    {};
+
+    template <typename _T>
+    struct signature_of<const volatile _T> : signature_of<_T>
+    {};
+
+    template <typename _T>
+    struct signature_of<_T&> : signature_of<_T>
+    {};
+
+    template <typename _T>
+    struct signature_of<_T&&> : signature_of<_T>
+    {};
+
+    template <>
+    struct signature_of<void>
+    {
+        static constexpr std::array<char, 0> value{};
+        static constexpr bool is_valid = true;
+        static constexpr bool is_trivial_dbus_type = false;
+    };
+
+    template <>
+    struct signature_of<bool>
+    {
+        static constexpr std::array value{'b'};
+        static constexpr bool is_valid = true;
+        static constexpr bool is_trivial_dbus_type = true;
+    };
+
+    template <>
+    struct signature_of<uint8_t>
+    {
+        static constexpr std::array value{'y'};
+        static constexpr bool is_valid = true;
+        static constexpr bool is_trivial_dbus_type = true;
+    };
+
+    template <>
+    struct signature_of<int16_t>
+    {
+        static constexpr std::array value{'n'};
+        static constexpr bool is_valid = true;
+        static constexpr bool is_trivial_dbus_type = true;
+    };
+
+    template <>
+    struct signature_of<uint16_t>
+    {
+        static constexpr std::array value{'q'};
+        static constexpr bool is_valid = true;
+        static constexpr bool is_trivial_dbus_type = true;
+    };
+
+    template <>
+    struct signature_of<int32_t>
+    {
+        static constexpr std::array value{'i'};
+        static constexpr bool is_valid = true;
+        static constexpr bool is_trivial_dbus_type = true;
+    };
+
+    template <>
+    struct signature_of<uint32_t>
+    {
+        static constexpr std::array value{'u'};
+        static constexpr bool is_valid = true;
+        static constexpr bool is_trivial_dbus_type = true;
+    };
+
+    template <>
+    struct signature_of<int64_t>
+    {
+        static constexpr std::array value{'x'};
+        static constexpr bool is_valid = true;
+        static constexpr bool is_trivial_dbus_type = true;
+    };
+
+    template <>
+    struct signature_of<uint64_t>
+    {
+        static constexpr std::array value{'t'};
+        static constexpr bool is_valid = true;
+        static constexpr bool is_trivial_dbus_type = true;
+    };
+
+    template <>
+    struct signature_of<double>
+    {
+        static constexpr std::array value{'d'};
+        static constexpr bool is_valid = true;
+        static constexpr bool is_trivial_dbus_type = true;
+    };
+
+    template <>
+    struct signature_of<std::string>
+    {
+        static constexpr std::array value{'s'};
+        static constexpr bool is_valid = true;
+        static constexpr bool is_trivial_dbus_type = false;
+    };
+
+    template <>
+    struct signature_of<std::string_view> : signature_of<std::string>
+    {};
+
+    template <>
+    struct signature_of<char*> : signature_of<std::string>
+    {};
+
+    template <>
+    struct signature_of<const char*> : signature_of<std::string>
+    {};
+
+    template <std::size_t _N>
+    struct signature_of<char[_N]> : signature_of<std::string>
+    {};
+
+    template <std::size_t _N>
+    struct signature_of<const char[_N]> : signature_of<std::string>
+    {};
+
+    template <>
+    struct signature_of<BusName> : signature_of<std::string>
+    {};
+
+    template <>
+    struct signature_of<InterfaceName> : signature_of<std::string>
+    {};
+
+    template <>
+    struct signature_of<MemberName> : signature_of<std::string>
+    {};
+
+    template <typename... _ValueTypes>
+    struct signature_of<Struct<_ValueTypes...>>
+    {
+        static constexpr std::array contents = (signature_of_v<_ValueTypes> + ...);
+        static constexpr std::array value = std::array{'('} + contents + std::array{')'};
+        static constexpr char type_value{'r'}; /* Not actually used in signatures on D-Bus, see specs */
+        static constexpr bool is_valid = true;
+        static constexpr bool is_trivial_dbus_type = false;
+    };
+
+    template <>
+    struct signature_of<Variant>
+    {
+        static constexpr std::array value{'v'};
+        static constexpr bool is_valid = true;
+        static constexpr bool is_trivial_dbus_type = false;
+    };
+
+    template <typename... Elements>
+    struct signature_of<std::variant<Elements...>> : signature_of<Variant>
+    {};
+
+    template <>
+    struct signature_of<ObjectPath>
+    {
+        static constexpr std::array value{'o'};
+        static constexpr bool is_valid = true;
+        static constexpr bool is_trivial_dbus_type = false;
+    };
+
+    template <>
+    struct signature_of<Signature>
+    {
+        static constexpr std::array value{'g'};
+        static constexpr bool is_valid = true;
+        static constexpr bool is_trivial_dbus_type = false;
+    };
+
+    template <>
+    struct signature_of<UnixFd>
+    {
+        static constexpr std::array value{'h'};
+        static constexpr bool is_valid = true;
+        static constexpr bool is_trivial_dbus_type = false;
+    };
+
+    template <typename _T1, typename _T2>
+    struct signature_of<DictEntry<_T1, _T2>>
+    {
+        static constexpr std::array value = std::array{'{'} + signature_of_v<std::tuple<_T1, _T2>> + std::array{'}'};
+        static constexpr char type_value{'e'}; /* Not actually used in signatures on D-Bus, see specs */
+        static constexpr bool is_valid = true;
+        static constexpr bool is_trivial_dbus_type = false;
+    };
+
+    template <typename _Element, typename _Allocator>
+    struct signature_of<std::vector<_Element, _Allocator>>
+    {
+        static constexpr std::array value = std::array{'a'} + signature_of_v<_Element>;
+        static constexpr bool is_valid = true;
+        static constexpr bool is_trivial_dbus_type = false;
+    };
+
+    template <typename _Element, std::size_t _Size>
+    struct signature_of<std::array<_Element, _Size>> : signature_of<std::vector<_Element>>
+    {
+    };
+
+#ifdef __cpp_lib_span
+    template <typename _Element, std::size_t _Extent>
+    struct signature_of<std::span<_Element, _Extent>> : signature_of<std::vector<_Element>>
+    {
+    };
+#endif
+
+    template <typename _Enum> // is_const_v and is_volatile_v to avoid ambiguity conflicts with const and volatile specializations of signature_of
+    struct signature_of<_Enum, typename std::enable_if_t<std::is_enum_v<_Enum> && !std::is_const_v<_Enum> && !std::is_volatile_v<_Enum>>>
+        : signature_of<std::underlying_type_t<_Enum>>
+    {};
+
+    template <typename _Key, typename _Value, typename _Compare, typename _Allocator>
+    struct signature_of<std::map<_Key, _Value, _Compare, _Allocator>>
+    {
+        static constexpr std::array value = std::array{'a'} + signature_of_v<DictEntry<_Key, _Value>>;
+        static constexpr bool is_valid = true;
+        static constexpr bool is_trivial_dbus_type = false;
+    };
+
+    template <typename _Key, typename _Value, typename _Hash, typename _KeyEqual, typename _Allocator>
+    struct signature_of<std::unordered_map<_Key, _Value, _Hash, _KeyEqual, _Allocator>>
+        : signature_of<std::map<_Key, _Value>>
+    {
+    };
+
+    template <typename... _Types>
+    struct signature_of<std::tuple<_Types...>> // A simple concatenation of signatures of _Types
+    {
+        static constexpr std::array value = (std::array<char, 0>{} + ... + signature_of_v<_Types>);
+        static constexpr bool is_valid = false;
+        static constexpr bool is_trivial_dbus_type = false;
+    };
+
+    // To simplify conversions of arrays to C strings
+    template <typename _T, std::size_t _N>
+    constexpr auto as_null_terminated(std::array<_T, _N> arr)
+    {
+        return arr + std::array<_T, 1>{0};
+    }
+
+    // Function traits implementation inspired by (c) kennytm,
+    // https://github.com/kennytm/utils/blob/master/traits.hpp
+    template <typename _Type>
+    struct function_traits : function_traits<decltype(&_Type::operator())>
+    {};
+
+    template <typename _Type>
+    struct function_traits<const _Type> : function_traits<_Type>
+    {};
+
+    template <typename _Type>
+    struct function_traits<_Type&> : function_traits<_Type>
+    {};
+
+    template <typename _ReturnType, typename... _Args>
+    struct function_traits_base
+    {
+        typedef _ReturnType result_type;
+        typedef std::tuple<_Args...> arguments_type;
+        typedef std::tuple<std::decay_t<_Args>...> decayed_arguments_type;
+
+        typedef _ReturnType function_type(_Args...);
+
+        static constexpr std::size_t arity = sizeof...(_Args);
+
+//        template <size_t _Idx, typename _Enabled = void>
+//        struct arg;
+//
+//        template <size_t _Idx>
+//        struct arg<_Idx, std::enable_if_t<(_Idx < arity)>>
+//        {
+//            typedef std::tuple_element_t<_Idx, arguments_type> type;
+//        };
+//
+//        template <size_t _Idx>
+//        struct arg<_Idx, std::enable_if_t<!(_Idx < arity)>>
+//        {
+//            typedef void type;
+//        };
+
+        template <size_t _Idx>
+        struct arg
+        {
+            typedef std::tuple_element_t<_Idx, std::tuple<_Args...>> type;
+        };
+
+        template <size_t _Idx>
+        using arg_t = typename arg<_Idx>::type;
+    };
+
+    template <typename _ReturnType, typename... _Args>
+    struct function_traits<_ReturnType(_Args...)> : function_traits_base<_ReturnType, _Args...>
+    {
+        static constexpr bool is_async = false;
+        static constexpr bool has_error_param = false;
+    };
+
+    template <typename... _Args>
+    struct function_traits<void(std::optional<Error>, _Args...)> : function_traits_base<void, _Args...>
+    {
+        static constexpr bool has_error_param = true;
+    };
+
+    template <typename... _Args, typename... _Results>
+    struct function_traits<void(Result<_Results...>, _Args...)> : function_traits_base<std::tuple<_Results...>, _Args...>
+    {
+        static constexpr bool is_async = true;
+        using async_result_t = Result<_Results...>;
+    };
+
+    template <typename... _Args, typename... _Results>
+    struct function_traits<void(Result<_Results...>&&, _Args...)> : function_traits_base<std::tuple<_Results...>, _Args...>
+    {
+        static constexpr bool is_async = true;
+        using async_result_t = Result<_Results...>;
+    };
+
+    template <typename _ReturnType, typename... _Args>
+    struct function_traits<_ReturnType(*)(_Args...)> : function_traits<_ReturnType(_Args...)>
+    {};
+
+    template <typename _ClassType, typename _ReturnType, typename... _Args>
+    struct function_traits<_ReturnType(_ClassType::*)(_Args...)> : function_traits<_ReturnType(_Args...)>
+    {
+        typedef _ClassType& owner_type;
+    };
+
+    template <typename _ClassType, typename _ReturnType, typename... _Args>
+    struct function_traits<_ReturnType(_ClassType::*)(_Args...) const> : function_traits<_ReturnType(_Args...)>
+    {
+        typedef const _ClassType& owner_type;
+    };
+
+    template <typename _ClassType, typename _ReturnType, typename... _Args>
+    struct function_traits<_ReturnType(_ClassType::*)(_Args...) volatile> : function_traits<_ReturnType(_Args...)>
+    {
+        typedef volatile _ClassType& owner_type;
+    };
+
+    template <typename _ClassType, typename _ReturnType, typename... _Args>
+    struct function_traits<_ReturnType(_ClassType::*)(_Args...) const volatile> : function_traits<_ReturnType(_Args...)>
+    {
+        typedef const volatile _ClassType& owner_type;
+    };
+
+    template <typename FunctionType>
+    struct function_traits<std::function<FunctionType>> : function_traits<FunctionType>
+    {};
+
+    template <class _Function>
+    constexpr auto is_async_method_v = function_traits<_Function>::is_async;
+
+    template <class _Function>
+    constexpr auto has_error_param_v = function_traits<_Function>::has_error_param;
+
+    template <typename _FunctionType>
+    using function_arguments_t = typename function_traits<_FunctionType>::arguments_type;
+
+    template <typename _FunctionType, size_t _Idx>
+    using function_argument_t = typename function_traits<_FunctionType>::template arg_t<_Idx>;
+
+    template <typename _FunctionType>
+    constexpr auto function_argument_count_v = function_traits<_FunctionType>::arity;
+
+    template <typename _FunctionType>
+    using function_result_t = typename function_traits<_FunctionType>::result_type;
+
+    template <typename _Function>
+    struct tuple_of_function_input_arg_types
+    {
+        typedef typename function_traits<_Function>::decayed_arguments_type type;
+    };
+
+    template <typename _Function>
+    using tuple_of_function_input_arg_types_t = typename tuple_of_function_input_arg_types<_Function>::type;
+
+    template <typename _Function>
+    struct tuple_of_function_output_arg_types
+    {
+        typedef typename function_traits<_Function>::result_type type;
+    };
+
+    template <typename _Function>
+    using tuple_of_function_output_arg_types_t = typename tuple_of_function_output_arg_types<_Function>::type;
+
+    template <typename _Function>
+    struct signature_of_function_input_arguments : signature_of<tuple_of_function_input_arg_types_t<_Function>>
+    {
+        static std::string value_as_string()
+        {
+            constexpr auto signature = as_null_terminated(signature_of_v<tuple_of_function_input_arg_types_t<_Function>>);
+            return signature.data();
+        }
+    };
+
+    template <typename _Function>
+    inline auto signature_of_function_input_arguments_v = signature_of_function_input_arguments<_Function>::value_as_string();
+
+    template <typename _Function>
+    struct signature_of_function_output_arguments : signature_of<tuple_of_function_output_arg_types_t<_Function>>
+    {
+        static std::string value_as_string()
+        {
+            constexpr auto signature = as_null_terminated(signature_of_v<tuple_of_function_output_arg_types_t<_Function>>);
+            return signature.data();
+        }
+    };
+
+    template <typename _Function>
+    inline auto signature_of_function_output_arguments_v = signature_of_function_output_arguments<_Function>::value_as_string();
+
+    // std::future stuff for return values of async calls
+    template <typename... _Args> struct future_return
+    {
+        typedef std::tuple<_Args...> type;
+    };
+
+    template <> struct future_return<>
+    {
+        typedef void type;
+    };
+
+    template <typename _Type> struct future_return<_Type>
+    {
+        typedef _Type type;
+    };
+
+    template <typename... _Args>
+    using future_return_t = typename future_return<_Args...>::type;
+
+    // Credit: Piotr Skotnicki (https://stackoverflow.com/a/57639506)
+    template <typename, typename>
+    constexpr bool is_one_of_variants_types = false;
+
+    template <typename... _VariantTypes, typename _QueriedType>
+    constexpr bool is_one_of_variants_types<std::variant<_VariantTypes...>, _QueriedType>
+        = (std::is_same_v<_QueriedType, _VariantTypes> || ...);
+
+    // Wrapper (tag) denoting we want to serialize user-defined struct
+    // into a D-Bus message as a dictionary of strings to variants.
+    template <typename _Struct>
+    struct as_dictionary
+    {
+        explicit as_dictionary(const _Struct& s) : m_struct(s) {}
+        const _Struct& m_struct;
+    };
+
+    template <typename _Type>
+    const _Type& as_dictionary_if_struct(const _Type& object)
+    {
+        return object; // identity in case _Type is not struct (user-defined structs shall provide an overload)
+    }
+
+    // By default, the dict-as-struct deserialization strategy is strict.
+    // Strict means that every key of the deserialized dictionary must have its counterpart member in the struct, otherwise an exception is thrown.
+    // Relaxed means that a key that does not have a matching struct member is silently ignored.
+    // The behavior can be overridden for user-defined struct by specializing this variable template.
+    template <typename _Struct>
+    constexpr auto strict_dict_as_struct_deserialization_v = true;
+
+    // By default, the struct-as-dict serialization strategy is single-level only (as opposed to nested).
+    // Single-level means that only the specific struct is serialized as a dictionary, serializing members that are structs always as structs.
+    // Nested means that the struct *and* its members that are structs are all serialized as a dictionary. If nested strategy is also
+    // defined for the nested struct, then the same behavior applies for that struct, recursively.
+    // The behavior can be overridden for user-defined struct by specializing this variable template.
+    template <typename _Struct>
+    constexpr auto nested_struct_as_dict_serialization_v = false;
+
+    namespace detail
+    {
+        template <class _Function, class _Tuple, typename... _Args, std::size_t... _I>
+        constexpr decltype(auto) apply_impl( _Function&& f
+                                           , Result<_Args...>&& r
+                                           , _Tuple&& t
+                                           , std::index_sequence<_I...> )
+        {
+            return std::forward<_Function>(f)(std::move(r), std::get<_I>(std::forward<_Tuple>(t))...);
+        }
+
+        template <class _Function, class _Tuple, std::size_t... _I>
+        decltype(auto) apply_impl( _Function&& f
+                                 , std::optional<Error> e
+                                 , _Tuple&& t
+                                 , std::index_sequence<_I...> )
+        {
+            return std::forward<_Function>(f)(std::move(e), std::get<_I>(std::forward<_Tuple>(t))...);
+        }
+
+        // For non-void returning functions, apply_impl simply returns function return value (a tuple of values).
+        // For void-returning functions, apply_impl returns an empty tuple.
+        template <class _Function, class _Tuple, std::size_t... _I>
+        constexpr decltype(auto) apply_impl( _Function&& f
+                                           , _Tuple&& t
+                                           , std::index_sequence<_I...> )
+        {
+            if constexpr (!std::is_void_v<function_result_t<_Function>>)
+                return std::forward<_Function>(f)(std::get<_I>(std::forward<_Tuple>(t))...);
+            else
+                return std::forward<_Function>(f)(std::get<_I>(std::forward<_Tuple>(t))...), std::tuple<>{};
+        }
+    }
+
+    // Convert tuple `t' of values into a list of arguments
+    // and invoke function `f' with those arguments.
+    template <class _Function, class _Tuple>
+    constexpr decltype(auto) apply(_Function&& f, _Tuple&& t)
+    {
+        return detail::apply_impl( std::forward<_Function>(f)
+                                 , std::forward<_Tuple>(t)
+                                 , std::make_index_sequence<std::tuple_size<std::decay_t<_Tuple>>::value>{} );
+    }
+
+    // Convert tuple `t' of values into a list of arguments
+    // and invoke function `f' with those arguments.
+    template <class _Function, class _Tuple, typename... _Args>
+    constexpr decltype(auto) apply(_Function&& f, Result<_Args...>&& r, _Tuple&& t)
+    {
+        return detail::apply_impl( std::forward<_Function>(f)
+                                 , std::move(r)
+                                 , std::forward<_Tuple>(t)
+                                 , std::make_index_sequence<std::tuple_size<std::decay_t<_Tuple>>::value>{} );
+    }
+
+    // Convert tuple `t' of values into a list of arguments
+    // and invoke function `f' with those arguments.
+    template <class _Function, class _Tuple>
+    decltype(auto) apply(_Function&& f, std::optional<Error> e, _Tuple&& t)
+    {
+        return detail::apply_impl( std::forward<_Function>(f)
+                                 , std::move(e)
+                                 , std::forward<_Tuple>(t)
+                                 , std::make_index_sequence<std::tuple_size<std::decay_t<_Tuple>>::value>{} );
+    }
+
+    // Convenient concatenation of arrays
+    template <typename _T, std::size_t _N1, std::size_t _N2>
+    constexpr std::array<_T, _N1 + _N2> operator+(std::array<_T, _N1> lhs, std::array<_T, _N2> rhs)
+    {
+        std::array<_T, _N1 + _N2> result{};
+        std::size_t index = 0;
+
+        for (auto& el : lhs) {
+            result[index] = std::move(el);
+            ++index;
+        }
+        for (auto& el : rhs) {
+            result[index] = std::move(el);
+            ++index;
+        }
+
+        return result;
+    }
+
+}
+
+#endif /* SDBUS_CXX_TYPETRAITS_H_ */
diff --git a/3rdParty/sdbus-cpp/include/sdbus-c++/Types.h b/3rdParty/sdbus-cpp/include/sdbus-c++/Types.h
new file mode 100644
index 0000000000..b75e3faa1f
--- /dev/null
+++ b/3rdParty/sdbus-cpp/include/sdbus-c++/Types.h
@@ -0,0 +1,597 @@
+/**
+ * (C) 2016 - 2021 KISTLER INSTRUMENTE AG, Winterthur, Switzerland
+ * (C) 2016 - 2024 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
+ *
+ * @file Types.h
+ *
+ * Created on: Nov 23, 2016
+ * Project: sdbus-c++
+ * Description: High-level D-Bus IPC C++ library based on sd-bus
+ *
+ * This file is part of sdbus-c++.
+ *
+ * sdbus-c++ is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * sdbus-c++ is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with sdbus-c++. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef SDBUS_CXX_TYPES_H_
+#define SDBUS_CXX_TYPES_H_
+
+#include <sdbus-c++/Message.h>
+#include <sdbus-c++/TypeTraits.h>
+
+#include <cstring>
+#include <cstddef>
+#include <memory>
+#include <string>
+#include <tuple>
+#include <type_traits>
+#include <typeinfo>
+#include <utility>
+
+namespace sdbus {
+
+    /********************************************//**
+     * @class Variant
+     *
+     * Variant can hold value of any D-Bus-supported type.
+     *
+     * Note: Even though thread-aware, Variant objects are not thread-safe.
+     * Some const methods are conceptually const, but not physically const,
+     * thus are not thread-safe. This is by design: normally, clients
+     * should process a single Variant object in a single thread at a time.
+     * Otherwise they need to take care of synchronization by themselves.
+     *
+     ***********************************************/
+    class Variant
+    {
+    public:
+        Variant();
+
+        template <typename _ValueType>
+        explicit Variant(const _ValueType& value) : Variant()
+        {
+            msg_.openVariant<_ValueType>();
+            msg_ << value;
+            msg_.closeVariant();
+            msg_.seal();
+        }
+
+        Variant(const Variant& value, embed_variant_t) : Variant()
+        {
+            msg_.openVariant<Variant>();
+            msg_ << value;
+            msg_.closeVariant();
+            msg_.seal();
+        }
+
+        template <typename _Struct>
+        explicit Variant(const as_dictionary<_Struct>& value) : Variant()
+        {
+            msg_.openVariant<std::map<std::string, Variant>>();
+            msg_ << as_dictionary(value.m_struct);
+            msg_.closeVariant();
+            msg_.seal();
+        }
+
+        template <typename... _Elements>
+        Variant(const std::variant<_Elements...>& value)
+            : Variant()
+        {
+            msg_ << value;
+            msg_.seal();
+        }
+
+        template <typename _ValueType>
+        _ValueType get() const
+        {
+            msg_.rewind(false);
+
+            msg_.enterVariant<_ValueType>();
+            _ValueType val;
+            msg_ >> val;
+            msg_.exitVariant();
+            return val;
+        }
+
+        // Only allow conversion operator for true D-Bus type representations in C++
+        template <typename _ValueType, typename = std::enable_if_t<signature_of<_ValueType>::is_valid>>
+        explicit operator _ValueType() const
+        {
+            return get<_ValueType>();
+        }
+
+        template <typename... _Elements>
+        operator std::variant<_Elements...>() const
+        {
+            std::variant<_Elements...> result;
+            msg_.rewind(false);
+            msg_ >> result;
+            return result;
+        }
+
+        template <typename _Type>
+        bool containsValueOfType() const
+        {
+            constexpr auto signature = as_null_terminated(signature_of_v<_Type>);
+            return std::strcmp(signature.data(), peekValueType()) == 0;
+        }
+
+        bool isEmpty() const;
+
+        void serializeTo(Message& msg) const;
+        void deserializeFrom(Message& msg);
+        const char* peekValueType() const;
+
+    private:
+        mutable PlainMessage msg_{};
+    };
+
+    /********************************************//**
+     * @class Struct
+     *
+     * Representation of struct D-Bus type
+     *
+     * Struct implements tuple protocol, i.e. it's a tuple-like class.
+     * It can be used with std::get<>(), std::tuple_element,
+     * std::tuple_size and in structured bindings.
+     *
+     ***********************************************/
+    template <typename... _ValueTypes>
+    class Struct
+        : public std::tuple<_ValueTypes...>
+    {
+    public:
+        using std::tuple<_ValueTypes...>::tuple;
+
+        Struct() = default;
+
+        explicit Struct(const std::tuple<_ValueTypes...>& t)
+            : std::tuple<_ValueTypes...>(t)
+        {
+        }
+
+        template <std::size_t _I>
+        auto& get()
+        {
+            return std::get<_I>(*this);
+        }
+
+        template <std::size_t _I>
+        const auto& get() const
+        {
+            return std::get<_I>(*this);
+        }
+    };
+
+    template <typename... _Elements>
+    Struct(_Elements...) -> Struct<_Elements...>;
+
+    template<typename... _Elements>
+    constexpr Struct<std::decay_t<_Elements>...>
+    make_struct(_Elements&&... args)
+    {
+        typedef Struct<std::decay_t<_Elements>...> result_type;
+        return result_type(std::forward<_Elements>(args)...);
+    }
+
+    /********************************************//**
+     * @class ObjectPath
+     *
+     * Strong type representing the D-Bus object path
+     *
+     ***********************************************/
+    class ObjectPath : public std::string
+    {
+    public:
+        ObjectPath() = default;
+        explicit ObjectPath(std::string value)
+            : std::string(std::move(value))
+        {}
+        explicit ObjectPath(const char* value)
+            : std::string(value)
+        {}
+
+        using std::string::operator=;
+    };
+
+    /********************************************//**
+     * @class BusName
+     *
+     * Strong type representing the D-Bus bus/service/connection name
+     *
+     ***********************************************/
+    class BusName : public std::string
+    {
+    public:
+        BusName() = default;
+        explicit BusName(std::string value)
+            : std::string(std::move(value))
+        {}
+        explicit BusName(const char* value)
+            : std::string(value)
+        {}
+
+        using std::string::operator=;
+    };
+
+    using ServiceName = BusName;
+    using ConnectionName = BusName;
+
+    /********************************************//**
+     * @class InterfaceName
+     *
+     * Strong type representing the D-Bus interface name
+     *
+     ***********************************************/
+    class InterfaceName : public std::string
+    {
+    public:
+        InterfaceName() = default;
+        explicit InterfaceName(std::string value)
+            : std::string(std::move(value))
+        {}
+        explicit InterfaceName(const char* value)
+            : std::string(value)
+        {}
+
+        using std::string::operator=;
+    };
+
+    /********************************************//**
+     * @class MemberName
+     *
+     * Strong type representing the D-Bus member name
+     *
+     ***********************************************/
+    class MemberName : public std::string
+    {
+    public:
+        MemberName() = default;
+        explicit MemberName(std::string value)
+                : std::string(std::move(value))
+        {}
+        explicit MemberName(const char* value)
+                : std::string(value)
+        {}
+
+        using std::string::operator=;
+    };
+
+    using MethodName = MemberName;
+    using SignalName = MemberName;
+    using PropertyName = MemberName;
+
+    /********************************************//**
+     * @class Signature
+     *
+     * Strong type representing the D-Bus object path
+     *
+     ***********************************************/
+    class Signature : public std::string
+    {
+    public:
+        Signature() = default;
+        explicit Signature(std::string value)
+            : std::string(std::move(value))
+        {}
+        explicit Signature(const char* value)
+            : std::string(value)
+        {}
+
+        using std::string::operator=;
+    };
+
+    /********************************************//**
+     * @struct UnixFd
+     *
+     * UnixFd is a representation of file descriptor D-Bus type that owns
+     * the underlying fd, provides access to it, and closes the fd when
+     * the UnixFd goes out of scope.
+     *
+     * UnixFd can be default constructed (owning invalid fd), or constructed from
+     * an explicitly provided fd by either duplicating or adopting that fd as-is.
+     *
+     ***********************************************/
+    class UnixFd
+    {
+    public:
+        UnixFd() = default;
+
+        explicit UnixFd(int fd)
+            : fd_(checkedDup(fd))
+        {
+        }
+
+        UnixFd(int fd, adopt_fd_t)
+            : fd_(fd)
+        {
+        }
+
+        UnixFd(const UnixFd& other)
+        {
+            *this = other;
+        }
+
+        UnixFd& operator=(const UnixFd& other)
+        {
+            if (this == &other)
+            {
+                return *this;
+            }
+            close();
+            fd_ = checkedDup(other.fd_);
+            return *this;
+        }
+
+        UnixFd(UnixFd&& other)
+        {
+            *this = std::move(other);
+        }
+
+        UnixFd& operator=(UnixFd&& other)
+        {
+            if (this == &other)
+            {
+                return *this;
+            }
+            close();
+            fd_ = std::exchange(other.fd_, -1);
+            return *this;
+        }
+
+        ~UnixFd()
+        {
+            close();
+        }
+
+        [[nodiscard]] int get() const
+        {
+            return fd_;
+        }
+
+        void reset(int fd = -1)
+        {
+            *this = UnixFd{fd};
+        }
+
+        void reset(int fd, adopt_fd_t)
+        {
+            *this = UnixFd{fd, adopt_fd};
+        }
+
+        int release()
+        {
+            return std::exchange(fd_, -1);
+        }
+
+        [[nodiscard]] bool isValid() const
+        {
+            return fd_ >= 0;
+        }
+
+    private:
+        /// Closes file descriptor, but does not set it to -1.
+        void close();
+
+        /// Returns negative argument unchanged.
+        /// Otherwise, call ::dup and throw on failure.
+        static int checkedDup(int fd);
+
+        int fd_ = -1;
+    };
+
+    /********************************************//**
+     * @typedef DictEntry
+     *
+     * DictEntry is implemented as std::pair, a standard
+     * value_type in STL(-like) associative containers.
+     *
+     ***********************************************/
+    template<typename _T1, typename _T2>
+    using DictEntry = std::pair<_T1, _T2>;
+
+}
+
+// Making sdbus::Struct implement the tuple-protocol, i.e. be a tuple-like type
+template <size_t _I, typename... _ValueTypes>
+struct std::tuple_element<_I, sdbus::Struct<_ValueTypes...>>
+    : std::tuple_element<_I, std::tuple<_ValueTypes...>>
+{};
+template <typename... _ValueTypes>
+struct std::tuple_size<sdbus::Struct<_ValueTypes...>>
+    : std::tuple_size<std::tuple<_ValueTypes...>>
+{};
+
+/********************************************//**
+ * @name SDBUSCPP_REGISTER_STRUCT
+ *
+ * A convenient way to extend sdbus-c++ type system with user-defined structs.
+ *
+ * The macro teaches sdbus-c++ to recognize the user-defined struct
+ * as a valid C++ representation of a D-Bus Struct type, and enables
+ * clients to use their struct conveniently instead of the (too
+ * generic and less expressive) `sdbus::Struct<...>` in sdbus-c++ API.
+ *
+ * It also enables to serialize a user-defined struct as an a{sv} dictionary,
+ * and to deserialize an a{sv} dictionary into the user-defined struct.
+ *
+ * The first argument is the struct type name and the remaining arguments
+ * are names of struct members. Members must be of types supported by
+ * sdbus-c++ (or of user-defined types that sdbus-c++ was taught to support).
+ * Members can be other structs (nesting is supported).
+ * The macro must be placed in the global namespace.
+ *
+ * For example, given the user-defined struct `ABC`:
+ *
+ * namespace foo {
+ *     struct ABC
+ *     {
+ *         int number;
+ *         std::string name;
+ *         std::vector<double> data;
+ *     };
+ * }
+ *
+ * one can teach sdbus-c++ about the contents of this struct simply with:
+ *
+ * SDBUSCPP_REGISTER_STRUCT(foo::ABC, number, name, data);
+ *
+ * Up to 16 struct members are supported by the macro.
+ *
+ ***********************************************/
+#define SDBUSCPP_REGISTER_STRUCT(STRUCT, ...)                                                                                                           \
+    namespace sdbus {                                                                                                                                   \
+        static_assert(SDBUSCPP_PP_NARG(__VA_ARGS__) <= 16,                                                                                              \
+                     "Not more than 16 struct members are supported, please open an issue if you need more");                                           \
+                                                                                                                                                        \
+        template <>                                                                                                                                     \
+        struct signature_of<STRUCT>                                                                                                                     \
+            : signature_of<sdbus::Struct<SDBUSCPP_STRUCT_MEMBER_TYPES(STRUCT, __VA_ARGS__)>>                                                            \
+        {};                                                                                                                                             \
+                                                                                                                                                        \
+        inline auto as_dictionary_if_struct(const STRUCT& object)                                                                                       \
+        {                                                                                                                                               \
+            return as_dictionary<STRUCT>(object);                                                                                                       \
+        }                                                                                                                                               \
+                                                                                                                                                        \
+        inline sdbus::Message& operator<<(sdbus::Message& msg, const STRUCT& items)                                                                     \
+        {                                                                                                                                               \
+            return msg << sdbus::Struct{std::forward_as_tuple(SDBUSCPP_STRUCT_MEMBERS(items, __VA_ARGS__))};                                            \
+        }                                                                                                                                               \
+                                                                                                                                                        \
+        inline Message& operator<<(Message& msg, const as_dictionary<STRUCT>& s)                                                                        \
+        {                                                                                                                                               \
+            if constexpr (!nested_struct_as_dict_serialization_v<STRUCT>)                                                                               \
+                return msg.serializeDictionary<std::string, Variant>({SDBUSCPP_STRUCT_MEMBERS_AS_DICT_ENTRIES(s.m_struct, __VA_ARGS__)});               \
+            else                                                                                                                                        \
+                return msg.serializeDictionary<std::string, Variant>({SDBUSCPP_STRUCT_MEMBERS_AS_NESTED_DICT_ENTRIES(s.m_struct, __VA_ARGS__)});        \
+        }                                                                                                                                               \
+                                                                                                                                                        \
+        inline Message& operator>>(Message& msg, STRUCT& s)                                                                                             \
+        {                                                                                                                                               \
+            /* First, try to deserialize as a struct */                                                                                                 \
+            if (msg.peekType().first == signature_of<STRUCT>::type_value)                                                                               \
+            {                                                                                                                                           \
+                Struct sdbusStruct{std::forward_as_tuple(SDBUSCPP_STRUCT_MEMBERS(s, __VA_ARGS__))};                                                     \
+                return msg >> sdbusStruct;                                                                                                              \
+            }                                                                                                                                           \
+                                                                                                                                                        \
+            /* Otherwise try to deserialize as a dictionary of strings to variants */                                                                   \
+                                                                                                                                                        \
+            return msg.deserializeDictionary<std::string, Variant>([&s](const auto& dictEntry)                                                          \
+            {                                                                                                                                           \
+                const std::string& key = dictEntry.first; /* Intentionally not using structured bindings */                                             \
+                const Variant& value = dictEntry.second;                                                                                                \
+                                                                                                                                                        \
+                using namespace std::string_literals;                                                                                                   \
+                /* This also handles members which are structs serialized as dict of strings to variants, recursively */                                \
+                SDBUSCPP_FIND_AND_DESERIALIZE_STRUCT_MEMBERS(s, __VA_ARGS__)                                                                            \
+                SDBUS_THROW_ERROR_IF( strict_dict_as_struct_deserialization_v<STRUCT>                                                                   \
+                                    , ("Failed to deserialize struct from a dictionary: could not find field '"s += key) += "' in struct 'my::Struct'"  \
+                                    , EINVAL );                                                                                                         \
+            });                                                                                                                                         \
+        }                                                                                                                                               \
+    }                                                                                                                                                   \
+    /**/
+
+/********************************************//**
+ * @name SDBUSCPP_ENABLE_RELAXED_DICT2STRUCT_DESERIALIZATION
+ *
+ * Enables relaxed deserialization of an a{sv} dictionary into a user-defined struct STRUCT.
+ *
+ * The default (strict) deserialization mode is that if there are entries in the dictionary
+ * which do not have a corresponding field in the struct, an exception is thrown.
+ * In the relaxed mode, such entries are silently skipped.
+ *
+ * The macro can only be used in combination with SDBUSCPP_REGISTER_STRUCT macro,
+ * and must be placed before SDBUSCPP_REGISTER_STRUCT macro.
+ ***********************************************/
+#define SDBUSCPP_ENABLE_RELAXED_DICT2STRUCT_DESERIALIZATION(STRUCT)                                             \
+    template <>                                                                                                 \
+    constexpr auto sdbus::strict_dict_as_struct_deserialization_v<STRUCT> = false;                              \
+    /**/
+
+/********************************************//**
+ * @name SDBUSCPP_ENABLE_NESTED_STRUCT2DICT_SERIALIZATION
+ *
+ * Enables nested serialization of user-defined struct STRUCT as an a{sv} dictionary.
+ *
+ * By default, STRUCT fields which are structs themselves are serialized as D-Bus structs.
+ * This macro tells sdbus-c++ to also serialize nested structs, in a recursive fashion,
+ * as a{sv} dictionaries.
+ *
+ * The macro can only be used in combination with SDBUSCPP_REGISTER_STRUCT macro,
+ * and must be placed before SDBUSCPP_REGISTER_STRUCT macro.
+ ***********************************************/
+#define SDBUSCPP_ENABLE_NESTED_STRUCT2DICT_SERIALIZATION(STRUCT)                                                \
+    template <>                                                                                                 \
+    constexpr auto sdbus::nested_struct_as_dict_serialization_v<STRUCT> = true                                  \
+    /**/
+
+/*!
+ * @cond SDBUSCPP_INTERNAL
+ *
+ * Internal helper preprocessor facilities
+ */
+#define SDBUSCPP_STRUCT_MEMBERS(STRUCT, ...)                                                                                                                    \
+    SDBUSCPP_PP_CAT(SDBUSCPP_FOR_EACH_, SDBUSCPP_PP_NARG(__VA_ARGS__))(SDBUSCPP_STRUCT_MEMBER, SDBUSCPP_PP_COMMA, STRUCT, __VA_ARGS__)                          \
+    /**/
+#define SDBUSCPP_STRUCT_MEMBER(STRUCT, MEMBER) STRUCT.MEMBER
+
+#define SDBUSCPP_STRUCT_MEMBER_TYPES(STRUCT, ...)                                                                                                               \
+    SDBUSCPP_PP_CAT(SDBUSCPP_FOR_EACH_, SDBUSCPP_PP_NARG(__VA_ARGS__))(SDBUSCPP_STRUCT_MEMBER_TYPE, SDBUSCPP_PP_COMMA, STRUCT, __VA_ARGS__)                     \
+    /**/
+#define SDBUSCPP_STRUCT_MEMBER_TYPE(STRUCT, MEMBER) decltype(STRUCT::MEMBER)
+
+#define SDBUSCPP_STRUCT_MEMBERS_AS_DICT_ENTRIES(STRUCT, ...)                                                                                                    \
+    SDBUSCPP_PP_CAT(SDBUSCPP_FOR_EACH_, SDBUSCPP_PP_NARG(__VA_ARGS__))(SDBUSCPP_STRUCT_MEMBER_AS_DICT_ENTRY, SDBUSCPP_PP_COMMA, STRUCT, __VA_ARGS__)            \
+    /**/
+#define SDBUSCPP_STRUCT_MEMBER_AS_DICT_ENTRY(STRUCT, MEMBER) {#MEMBER, Variant{STRUCT.MEMBER}}
+
+#define SDBUSCPP_STRUCT_MEMBERS_AS_NESTED_DICT_ENTRIES(STRUCT, ...)                                                                                             \
+    SDBUSCPP_PP_CAT(SDBUSCPP_FOR_EACH_, SDBUSCPP_PP_NARG(__VA_ARGS__))(SDBUSCPP_STRUCT_MEMBER_AS_NESTED_DICT_ENTRY, SDBUSCPP_PP_COMMA, STRUCT, __VA_ARGS__)     \
+    /**/
+#define SDBUSCPP_STRUCT_MEMBER_AS_NESTED_DICT_ENTRY(STRUCT, MEMBER) {#MEMBER, Variant{as_dictionary_if_struct(STRUCT.MEMBER)}}
+
+#define SDBUSCPP_FIND_AND_DESERIALIZE_STRUCT_MEMBERS(STRUCT, ...)                                                                                               \
+    SDBUSCPP_PP_CAT(SDBUSCPP_FOR_EACH_, SDBUSCPP_PP_NARG(__VA_ARGS__))(SDBUSCPP_FIND_AND_DESERIALIZE_STRUCT_MEMBER, SDBUSCPP_PP_SPACE, STRUCT, __VA_ARGS__)     \
+    /**/
+#define SDBUSCPP_FIND_AND_DESERIALIZE_STRUCT_MEMBER(STRUCT, MEMBER) if (key == #MEMBER) STRUCT.MEMBER = value.get<decltype(STRUCT.MEMBER)>(); else
+
+#define SDBUSCPP_FOR_EACH_1(M, D, S, M1) M(S, M1)
+#define SDBUSCPP_FOR_EACH_2(M, D, S, M1, M2) M(S, M1) D M(S, M2)
+#define SDBUSCPP_FOR_EACH_3(M, D, S, M1, M2, M3) M(S, M1) D M(S, M2) D M(S, M3)
+#define SDBUSCPP_FOR_EACH_4(M, D, S, M1, M2, M3, M4) M(S, M1) D M(S, M2) D M(S, M3) D M(S, M4)
+#define SDBUSCPP_FOR_EACH_5(M, D, S, M1, M2, M3, M4, M5) M(S, M1) D M(S, M2) D M(S, M3) D M(S, M4) D M(S, M5)
+#define SDBUSCPP_FOR_EACH_6(M, D, S, M1, M2, M3, M4, M5, M6) M(S, M1) D M(S, M2) D M(S, M3) D M(S, M4) D M(S, M5) D M(S, M6)
+#define SDBUSCPP_FOR_EACH_7(M, D, S, M1, M2, M3, M4, M5, M6, M7) M(S, M1) D M(S, M2) D M(S, M3) D M(S, M4) D M(S, M5) D M(S, M6) D M(S, M7)
+#define SDBUSCPP_FOR_EACH_8(M, D, S, M1, M2, M3, M4, M5, M6, M7, M8) M(S, M1) D M(S, M2) D M(S, M3) D M(S, M4) D M(S, M5) D M(S, M6) D M(S, M7) D M(S, M8)
+#define SDBUSCPP_FOR_EACH_9(M, D, S, M1, M2, M3, M4, M5, M6, M7, M8, M9) M(S, M1) D M(S, M2) D M(S, M3) D M(S, M4) D M(S, M5) D M(S, M6) D M(S, M7) D M(S, M8) D M(S, M9)
+#define SDBUSCPP_FOR_EACH_10(M, D, S, M1, M2, M3, M4, M5, M6, M7, M8, M9, M10) M(S, M1) D M(S, M2) D M(S, M3) D M(S, M4) D M(S, M5) D M(S, M6) D M(S, M7) D M(S, M8) D M(S, M9) D M(S, M10)
+#define SDBUSCPP_FOR_EACH_11(M, D, S, M1, M2, M3, M4, M5, M6, M7, M8, M9, M10, M11) M(S, M1) D M(S, M2) D M(S, M3) D M(S, M4) D M(S, M5) D M(S, M6) D M(S, M7) D M(S, M8) D M(S, M9) D M(S, M10) D M(S, M11)
+#define SDBUSCPP_FOR_EACH_12(M, D, S, M1, M2, M3, M4, M5, M6, M7, M8, M9, M10, M11, M12) M(S, M1) D M(S, M2) D M(S, M3) D M(S, M4) D M(S, M5) D M(S, M6) D M(S, M7) D M(S, M8) D M(S, M9) D M(S, M10) D M(S, M11) D M(S, M12)
+#define SDBUSCPP_FOR_EACH_13(M, D, S, M1, M2, M3, M4, M5, M6, M7, M8, M9, M10, M11, M12, M13) M(S, M1) D M(S, M2) D M(S, M3) D M(S, M4) D M(S, M5) D M(S, M6) D M(S, M7) D M(S, M8) D M(S, M9) D M(S, M10) D M(S, M11) D M(S, M12) D M(S, M13)
+#define SDBUSCPP_FOR_EACH_14(M, D, S, M1, M2, M3, M4, M5, M6, M7, M8, M9, M10, M11, M12, M13, M14) M(S, M1) D M(S, M2) D M(S, M3) D M(S, M4) D M(S, M5) D M(S, M6) D M(S, M7) D M(S, M8) D M(S, M9) D M(S, M10) D M(S, M11) D M(S, M12) D M(S, M13) D M(S, M14)
+#define SDBUSCPP_FOR_EACH_15(M, D, S, M1, M2, M3, M4, M5, M6, M7, M8, M9, M10, M11, M12, M13, M14, M15) M(S, M1) D M(S, M2) D M(S, M3) D M(S, M4) D M(S, M5) D M(S, M6) D M(S, M7) D M(S, M8) D M(S, M9) D M(S, M10) D M(S, M11) D M(S, M12) D M(S, M13) D M(S, M14) D M(S, M15)
+#define SDBUSCPP_FOR_EACH_16(M, D, S, M1, M2, M3, M4, M5, M6, M7, M8, M9, M10, M11, M12, M13, M14, M15, M16) M(S, M1) D M(S, M2) D M(S, M3) D M(S, M4) D M(S, M5) D M(S, M6) D M(S, M7) D M(S, M8) D M(S, M9) D M(S, M10) D M(S, M11) D M(S, M12) D M(S, M13) D M(S, M14) D M(S, M15) D M(S, M16)
+
+#define SDBUSCPP_PP_CAT(X, Y) SDBUSCPP_PP_CAT_IMPL(X, Y)
+#define SDBUSCPP_PP_CAT_IMPL(X, Y) X##Y
+#define SDBUSCPP_PP_NARG(...) SDBUSCPP_PP_NARG_IMPL(__VA_ARGS__, 32, 31, 30, 29, 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0)
+#define SDBUSCPP_PP_NARG_IMPL(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _N, ...) _N
+
+#define SDBUSCPP_PP_COMMA ,
+#define SDBUSCPP_PP_SPACE
+
+#endif /* SDBUS_CXX_TYPES_H_ */
diff --git a/3rdParty/sdbus-cpp/include/sdbus-c++/VTableItems.h b/3rdParty/sdbus-cpp/include/sdbus-c++/VTableItems.h
new file mode 100644
index 0000000000..019a57b82d
--- /dev/null
+++ b/3rdParty/sdbus-cpp/include/sdbus-c++/VTableItems.h
@@ -0,0 +1,112 @@
+/**
+ * (C) 2016 - 2024 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
+ *
+ * @file VTableItems.h
+ *
+ * Created on: Dec 14, 2023
+ * Project: sdbus-c++
+ * Description: High-level D-Bus IPC C++ library based on sd-bus
+ *
+ * This file is part of sdbus-c++.
+ *
+ * sdbus-c++ is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * sdbus-c++ is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with sdbus-c++. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef SDBUS_CXX_VTABLEITEMS_H_
+#define SDBUS_CXX_VTABLEITEMS_H_
+
+#include <sdbus-c++/Flags.h>
+#include <sdbus-c++/Types.h>
+#include <sdbus-c++/TypeTraits.h>
+
+#include <string>
+#include <variant>
+#include <vector>
+
+namespace sdbus {
+
+    struct MethodVTableItem
+    {
+        template <typename _Function> MethodVTableItem& implementedAs(_Function&& callback);
+        MethodVTableItem& withInputParamNames(std::vector<std::string> names);
+        template <typename... _String> MethodVTableItem& withInputParamNames(_String... names);
+        MethodVTableItem& withOutputParamNames(std::vector<std::string> names);
+        template <typename... _String> MethodVTableItem& withOutputParamNames(_String... names);
+        MethodVTableItem& markAsDeprecated();
+        MethodVTableItem& markAsPrivileged();
+        MethodVTableItem& withNoReply();
+
+        MethodName name;
+        Signature inputSignature;
+        std::vector<std::string> inputParamNames;
+        Signature outputSignature;
+        std::vector<std::string> outputParamNames;
+        method_callback callbackHandler;
+        Flags flags;
+    };
+
+    MethodVTableItem registerMethod(MethodName methodName);
+    MethodVTableItem registerMethod(std::string methodName);
+
+    struct SignalVTableItem
+    {
+        template <typename... _Args> SignalVTableItem& withParameters();
+        template <typename... _Args> SignalVTableItem& withParameters(std::vector<std::string> names);
+        template <typename... _Args, typename... _String> SignalVTableItem& withParameters(_String... names);
+        SignalVTableItem& markAsDeprecated();
+
+        SignalName name;
+        Signature signature;
+        std::vector<std::string> paramNames;
+        Flags flags;
+    };
+
+    SignalVTableItem registerSignal(SignalName signalName);
+    SignalVTableItem registerSignal(std::string signalName);
+
+    struct PropertyVTableItem
+    {
+        template <typename _Function> PropertyVTableItem& withGetter(_Function&& callback);
+        template <typename _Function> PropertyVTableItem& withSetter(_Function&& callback);
+        PropertyVTableItem& markAsDeprecated();
+        PropertyVTableItem& markAsPrivileged();
+        PropertyVTableItem& withUpdateBehavior(Flags::PropertyUpdateBehaviorFlags behavior);
+
+        PropertyName name;
+        Signature signature;
+        property_get_callback getter;
+        property_set_callback setter;
+        Flags flags;
+    };
+
+    PropertyVTableItem registerProperty(PropertyName propertyName);
+    PropertyVTableItem registerProperty(std::string propertyName);
+
+    struct InterfaceFlagsVTableItem
+    {
+        InterfaceFlagsVTableItem& markAsDeprecated();
+        InterfaceFlagsVTableItem& markAsPrivileged();
+        InterfaceFlagsVTableItem& withNoReplyMethods();
+        InterfaceFlagsVTableItem& withPropertyUpdateBehavior(Flags::PropertyUpdateBehaviorFlags behavior);
+
+        Flags flags;
+    };
+
+    InterfaceFlagsVTableItem setInterfaceFlags();
+
+    using VTableItem = std::variant<MethodVTableItem, SignalVTableItem, PropertyVTableItem, InterfaceFlagsVTableItem>;
+
+} // namespace sdbus
+
+#endif /* SDBUS_CXX_VTABLEITEMS_H_ */
diff --git a/3rdParty/sdbus-cpp/include/sdbus-c++/VTableItems.inl b/3rdParty/sdbus-cpp/include/sdbus-c++/VTableItems.inl
new file mode 100644
index 0000000000..127006dfef
--- /dev/null
+++ b/3rdParty/sdbus-cpp/include/sdbus-c++/VTableItems.inl
@@ -0,0 +1,301 @@
+/**
+ * (C) 2016 - 2024 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
+ *
+ * @file VTableItems.inl
+ *
+ * Created on: Dec 14, 2023
+ * Project: sdbus-c++
+ * Description: High-level D-Bus IPC C++ library based on sd-bus
+ *
+ * This file is part of sdbus-c++.
+ *
+ * sdbus-c++ is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * sdbus-c++ is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with sdbus-c++. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef SDBUS_CPP_VTABLEITEMS_INL_
+#define SDBUS_CPP_VTABLEITEMS_INL_
+
+#include <sdbus-c++/Error.h>
+#include <sdbus-c++/TypeTraits.h>
+
+#include <string>
+#include <type_traits>
+#include <vector>
+
+namespace sdbus {
+
+    /*** -------------------- ***/
+    /***  Method VTable Item  ***/
+    /*** -------------------- ***/
+
+    template <typename _Function>
+    MethodVTableItem& MethodVTableItem::implementedAs(_Function&& callback)
+    {
+        inputSignature = signature_of_function_input_arguments_v<_Function>;
+        outputSignature = signature_of_function_output_arguments_v<_Function>;
+        callbackHandler = [callback = std::forward<_Function>(callback)](MethodCall call)
+        {
+            // Create a tuple of callback input arguments' types, which will be used
+            // as a storage for the argument values deserialized from the message.
+            tuple_of_function_input_arg_types_t<_Function> inputArgs;
+
+            // Deserialize input arguments from the message into the tuple.
+            call >> inputArgs;
+
+            if constexpr (!is_async_method_v<_Function>)
+            {
+                // Invoke callback with input arguments from the tuple.
+                auto ret = sdbus::apply(callback, inputArgs);
+
+                // Store output arguments to the reply message and send it back.
+                auto reply = call.createReply();
+                reply << ret;
+                reply.send();
+            }
+            else
+            {
+                // Invoke callback with input arguments from the tuple and with result object to be set later
+                using AsyncResult = typename function_traits<_Function>::async_result_t;
+                sdbus::apply(callback, AsyncResult{std::move(call)}, std::move(inputArgs));
+            }
+        };
+
+        return *this;
+    }
+
+    inline MethodVTableItem& MethodVTableItem::withInputParamNames(std::vector<std::string> names)
+    {
+        inputParamNames = std::move(names);
+
+        return *this;
+    }
+
+    template <typename... _String>
+    inline MethodVTableItem& MethodVTableItem::withInputParamNames(_String... names)
+    {
+        static_assert(std::conjunction_v<std::is_convertible<_String, std::string>...>, "Parameter names must be (convertible to) strings");
+
+        return withInputParamNames({names...});
+    }
+
+    inline MethodVTableItem& MethodVTableItem::withOutputParamNames(std::vector<std::string> names)
+    {
+        outputParamNames = std::move(names);
+
+        return *this;
+    }
+
+    template <typename... _String>
+    inline MethodVTableItem& MethodVTableItem::withOutputParamNames(_String... names)
+    {
+        static_assert(std::conjunction_v<std::is_convertible<_String, std::string>...>, "Parameter names must be (convertible to) strings");
+
+        return withOutputParamNames({names...});
+    }
+
+    inline MethodVTableItem& MethodVTableItem::markAsDeprecated()
+    {
+        flags.set(Flags::DEPRECATED);
+
+        return *this;
+    }
+
+    inline MethodVTableItem& MethodVTableItem::markAsPrivileged()
+    {
+        flags.set(Flags::PRIVILEGED);
+
+        return *this;
+    }
+
+    inline MethodVTableItem& MethodVTableItem::withNoReply()
+    {
+        flags.set(Flags::METHOD_NO_REPLY);
+
+        return *this;
+    }
+
+    inline MethodVTableItem registerMethod(MethodName methodName)
+    {
+        return {std::move(methodName), {}, {}, {}, {}, {}, {}};
+    }
+
+    inline MethodVTableItem registerMethod(std::string methodName)
+    {
+        return registerMethod(MethodName{std::move(methodName)});
+    }
+
+    /*** -------------------- ***/
+    /***  Signal VTable Item  ***/
+    /*** -------------------- ***/
+
+    template <typename... _Args>
+    inline SignalVTableItem& SignalVTableItem::withParameters()
+    {
+        signature = signature_of_function_input_arguments_v<void(_Args...)>;
+
+        return *this;
+    }
+
+    template <typename... _Args>
+    inline SignalVTableItem& SignalVTableItem::withParameters(std::vector<std::string> names)
+    {
+        paramNames = std::move(names);
+
+        return withParameters<_Args...>();
+    }
+
+    template <typename... _Args, typename... _String>
+    inline SignalVTableItem& SignalVTableItem::withParameters(_String... names)
+    {
+        static_assert(std::conjunction_v<std::is_convertible<_String, std::string>...>, "Parameter names must be (convertible to) strings");
+        static_assert(sizeof...(_Args) == sizeof...(_String), "Numbers of signal parameters and their names don't match");
+
+        return withParameters<_Args...>({names...});
+    }
+
+    inline SignalVTableItem& SignalVTableItem::markAsDeprecated()
+    {
+        flags.set(Flags::DEPRECATED);
+
+        return *this;
+    }
+
+    inline SignalVTableItem registerSignal(SignalName signalName)
+    {
+        return {std::move(signalName), {}, {}, {}};
+    }
+
+    inline SignalVTableItem registerSignal(std::string signalName)
+    {
+        return registerSignal(SignalName{std::move(signalName)});
+    }
+
+    /*** -------------------- ***/
+    /*** Property VTable Item ***/
+    /*** -------------------- ***/
+
+    template <typename _Function>
+    inline PropertyVTableItem& PropertyVTableItem::withGetter(_Function&& callback)
+    {
+        static_assert(function_argument_count_v<_Function> == 0, "Property getter function must not take any arguments");
+        static_assert(!std::is_void<function_result_t<_Function>>::value, "Property getter function must return property value");
+
+        if (signature.empty())
+            signature = signature_of_function_output_arguments_v<_Function>;
+
+        getter = [callback = std::forward<_Function>(callback)](PropertyGetReply& reply)
+        {
+            // Get the propety value and serialize it into the pre-constructed reply message
+            reply << callback();
+        };
+
+        return *this;
+    }
+
+    template <typename _Function>
+    inline PropertyVTableItem& PropertyVTableItem::withSetter(_Function&& callback)
+    {
+        static_assert(function_argument_count_v<_Function> == 1, "Property setter function must take one parameter - the property value");
+        static_assert(std::is_void<function_result_t<_Function>>::value, "Property setter function must not return any value");
+
+        if (signature.empty())
+            signature = signature_of_function_input_arguments_v<_Function>;
+
+        setter = [callback = std::forward<_Function>(callback)](PropertySetCall call)
+        {
+            // Default-construct property value
+            using property_type = function_argument_t<_Function, 0>;
+            std::decay_t<property_type> property;
+
+            // Deserialize property value from the incoming call message
+            call >> property;
+
+            // Invoke setter with the value
+            callback(property);
+        };
+
+        return *this;
+    }
+
+    inline PropertyVTableItem& PropertyVTableItem::markAsDeprecated()
+    {
+        flags.set(Flags::DEPRECATED);
+
+        return *this;
+    }
+
+    inline PropertyVTableItem& PropertyVTableItem::markAsPrivileged()
+    {
+        flags.set(Flags::PRIVILEGED);
+
+        return *this;
+    }
+
+    inline PropertyVTableItem& PropertyVTableItem::withUpdateBehavior(Flags::PropertyUpdateBehaviorFlags behavior)
+    {
+        flags.set(behavior);
+
+        return *this;
+    }
+
+    inline PropertyVTableItem registerProperty(PropertyName propertyName)
+    {
+        return {std::move(propertyName), {}, {}, {}, {}};
+    }
+
+    inline PropertyVTableItem registerProperty(std::string propertyName)
+    {
+        return registerProperty(PropertyName{std::move(propertyName)});
+    }
+
+    /*** --------------------------- ***/
+    /*** Interface Flags VTable Item ***/
+    /*** --------------------------- ***/
+
+    inline InterfaceFlagsVTableItem& InterfaceFlagsVTableItem::markAsDeprecated()
+    {
+        flags.set(Flags::DEPRECATED);
+
+        return *this;
+    }
+
+    inline InterfaceFlagsVTableItem& InterfaceFlagsVTableItem::markAsPrivileged()
+    {
+        flags.set(Flags::PRIVILEGED);
+
+        return *this;
+    }
+
+    inline InterfaceFlagsVTableItem& InterfaceFlagsVTableItem::withNoReplyMethods()
+    {
+        flags.set(Flags::METHOD_NO_REPLY);
+
+        return *this;
+    }
+
+    inline InterfaceFlagsVTableItem& InterfaceFlagsVTableItem::withPropertyUpdateBehavior(Flags::PropertyUpdateBehaviorFlags behavior)
+    {
+        flags.set(behavior);
+
+        return *this;
+    }
+
+    inline InterfaceFlagsVTableItem setInterfaceFlags()
+    {
+        return {};
+    }
+
+} // namespace sdbus
+
+#endif /* SDBUS_CPP_VTABLEITEMS_INL_ */
diff --git a/3rdParty/sdbus-cpp/include/sdbus-c++/sdbus-c++.h b/3rdParty/sdbus-cpp/include/sdbus-c++/sdbus-c++.h
new file mode 100644
index 0000000000..8bc3fe69d4
--- /dev/null
+++ b/3rdParty/sdbus-cpp/include/sdbus-c++/sdbus-c++.h
@@ -0,0 +1,38 @@
+/**
+ * (C) 2016 - 2021 KISTLER INSTRUMENTE AG, Winterthur, Switzerland
+ * (C) 2016 - 2024 Stanislav Angelovic <stanislav.angelovic@protonmail.com>
+ *
+ * @file sdbus-c++.h
+ *
+ * Created on: Jan 19, 2017
+ * Project: sdbus-c++
+ * Description: High-level D-Bus IPC C++ library based on sd-bus
+ *
+ * This file is part of sdbus-c++.
+ *
+ * sdbus-c++ is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * sdbus-c++ is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with sdbus-c++. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <sdbus-c++/IConnection.h>
+#include <sdbus-c++/IObject.h>
+#include <sdbus-c++/IProxy.h>
+#include <sdbus-c++/AdaptorInterfaces.h>
+#include <sdbus-c++/ProxyInterfaces.h>
+#include <sdbus-c++/StandardInterfaces.h>
+#include <sdbus-c++/Message.h>
+#include <sdbus-c++/MethodResult.h>
+#include <sdbus-c++/Types.h>
+#include <sdbus-c++/TypeTraits.h>
+#include <sdbus-c++/Error.h>
+#include <sdbus-c++/Flags.h>
diff --git a/3rdParty/sdbus-cpp/lib/cmake/sdbus-c++/sdbus-c++-config-version.cmake b/3rdParty/sdbus-cpp/lib/cmake/sdbus-c++/sdbus-c++-config-version.cmake
new file mode 100644
index 0000000000..a9711194e3
--- /dev/null
+++ b/3rdParty/sdbus-cpp/lib/cmake/sdbus-c++/sdbus-c++-config-version.cmake
@@ -0,0 +1,65 @@
+# This is a basic version file for the Config-mode of find_package().
+# It is used by write_basic_package_version_file() as input file for configure_file()
+# to create a version-file which can be installed along a config.cmake file.
+#
+# The created file sets PACKAGE_VERSION_EXACT if the current version string and
+# the requested version string are exactly the same and it sets
+# PACKAGE_VERSION_COMPATIBLE if the current version is >= requested version,
+# but only if the requested major version is the same as the current one.
+# The variable CVF_VERSION must be set before calling configure_file().
+
+
+set(PACKAGE_VERSION "2.2.1")
+
+if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
+  set(PACKAGE_VERSION_COMPATIBLE FALSE)
+else()
+
+  if("2.2.1" MATCHES "^([0-9]+)\\.")
+    set(CVF_VERSION_MAJOR "${CMAKE_MATCH_1}")
+    if(NOT CVF_VERSION_MAJOR VERSION_EQUAL 0)
+      string(REGEX REPLACE "^0+" "" CVF_VERSION_MAJOR "${CVF_VERSION_MAJOR}")
+    endif()
+  else()
+    set(CVF_VERSION_MAJOR "2.2.1")
+  endif()
+
+  if(PACKAGE_FIND_VERSION_RANGE)
+    # both endpoints of the range must have the expected major version
+    math (EXPR CVF_VERSION_MAJOR_NEXT "${CVF_VERSION_MAJOR} + 1")
+    if (NOT PACKAGE_FIND_VERSION_MIN_MAJOR STREQUAL CVF_VERSION_MAJOR
+        OR ((PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "INCLUDE" AND NOT PACKAGE_FIND_VERSION_MAX_MAJOR STREQUAL CVF_VERSION_MAJOR)
+          OR (PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "EXCLUDE" AND NOT PACKAGE_FIND_VERSION_MAX VERSION_LESS_EQUAL CVF_VERSION_MAJOR_NEXT)))
+      set(PACKAGE_VERSION_COMPATIBLE FALSE)
+    elseif(PACKAGE_FIND_VERSION_MIN_MAJOR STREQUAL CVF_VERSION_MAJOR
+        AND ((PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "INCLUDE" AND PACKAGE_VERSION VERSION_LESS_EQUAL PACKAGE_FIND_VERSION_MAX)
+        OR (PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "EXCLUDE" AND PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION_MAX)))
+      set(PACKAGE_VERSION_COMPATIBLE TRUE)
+    else()
+      set(PACKAGE_VERSION_COMPATIBLE FALSE)
+    endif()
+  else()
+    if(PACKAGE_FIND_VERSION_MAJOR STREQUAL CVF_VERSION_MAJOR)
+      set(PACKAGE_VERSION_COMPATIBLE TRUE)
+    else()
+      set(PACKAGE_VERSION_COMPATIBLE FALSE)
+    endif()
+
+    if(PACKAGE_FIND_VERSION STREQUAL PACKAGE_VERSION)
+      set(PACKAGE_VERSION_EXACT TRUE)
+    endif()
+  endif()
+endif()
+
+
+# if the installed or the using project don't have CMAKE_SIZEOF_VOID_P set, ignore it:
+if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "" OR "8" STREQUAL "")
+  return()
+endif()
+
+# check that the installed version has the same 32/64bit-ness as the one which is currently searching:
+if(NOT CMAKE_SIZEOF_VOID_P STREQUAL "8")
+  math(EXPR installedBits "8 * 8")
+  set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)")
+  set(PACKAGE_VERSION_UNSUITABLE TRUE)
+endif()
diff --git a/3rdParty/sdbus-cpp/lib/cmake/sdbus-c++/sdbus-c++-config.cmake b/3rdParty/sdbus-cpp/lib/cmake/sdbus-c++/sdbus-c++-config.cmake
new file mode 100644
index 0000000000..a3a9a5f805
--- /dev/null
+++ b/3rdParty/sdbus-cpp/lib/cmake/sdbus-c++/sdbus-c++-config.cmake
@@ -0,0 +1,28 @@
+
+####### Expanded from @PACKAGE_INIT@ by configure_package_config_file() #######
+####### Any changes to this file will be overwritten by the next CMake run ####
+####### The input file was sdbus-c++-config.cmake.in                            ########
+
+get_filename_component(PACKAGE_PREFIX_DIR "${CMAKE_CURRENT_LIST_DIR}/../../../" ABSOLUTE)
+
+macro(set_and_check _var _file)
+  set(${_var} "${_file}")
+  if(NOT EXISTS "${_file}")
+    message(FATAL_ERROR "File or directory ${_file} referenced by variable ${_var} does not exist !")
+  endif()
+endmacro()
+
+macro(check_required_components _NAME)
+  foreach(comp ${${_NAME}_FIND_COMPONENTS})
+    if(NOT ${_NAME}_${comp}_FOUND)
+      if(${_NAME}_FIND_REQUIRED_${comp})
+        set(${_NAME}_FOUND FALSE)
+      endif()
+    endif()
+  endforeach()
+endmacro()
+
+####################################################################################
+
+include("${CMAKE_CURRENT_LIST_DIR}/sdbus-c++-targets.cmake")
+check_required_components("sdbus-c++")
diff --git a/3rdParty/sdbus-cpp/lib/cmake/sdbus-c++/sdbus-c++-targets-release.cmake b/3rdParty/sdbus-cpp/lib/cmake/sdbus-c++/sdbus-c++-targets-release.cmake
new file mode 100644
index 0000000000..d21aa91bdc
--- /dev/null
+++ b/3rdParty/sdbus-cpp/lib/cmake/sdbus-c++/sdbus-c++-targets-release.cmake
@@ -0,0 +1,19 @@
+#----------------------------------------------------------------
+# Generated CMake target import file for configuration "Release".
+#----------------------------------------------------------------
+
+# Commands may need to know the format version.
+set(CMAKE_IMPORT_FILE_VERSION 1)
+
+# Import target "SDBusCpp::sdbus-c++" for configuration "Release"
+set_property(TARGET SDBusCpp::sdbus-c++ APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
+set_target_properties(SDBusCpp::sdbus-c++ PROPERTIES
+  IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "C;CXX"
+  IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/libsdbus-c++.a"
+  )
+
+list(APPEND _cmake_import_check_targets SDBusCpp::sdbus-c++ )
+list(APPEND _cmake_import_check_files_for_SDBusCpp::sdbus-c++ "${_IMPORT_PREFIX}/lib/libsdbus-c++.a" )
+
+# Commands beyond this point should not need to know the version.
+set(CMAKE_IMPORT_FILE_VERSION)
diff --git a/3rdParty/sdbus-cpp/lib/cmake/sdbus-c++/sdbus-c++-targets.cmake b/3rdParty/sdbus-cpp/lib/cmake/sdbus-c++/sdbus-c++-targets.cmake
new file mode 100644
index 0000000000..aeb772a44e
--- /dev/null
+++ b/3rdParty/sdbus-cpp/lib/cmake/sdbus-c++/sdbus-c++-targets.cmake
@@ -0,0 +1,114 @@
+# Generated by CMake
+
+if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.8)
+   message(FATAL_ERROR "CMake >= 3.0.0 required")
+endif()
+if(CMAKE_VERSION VERSION_LESS "3.0.0")
+   message(FATAL_ERROR "CMake >= 3.0.0 required")
+endif()
+cmake_policy(PUSH)
+cmake_policy(VERSION 3.0.0...4.1)
+#----------------------------------------------------------------
+# Generated CMake target import file.
+#----------------------------------------------------------------
+
+# Commands may need to know the format version.
+set(CMAKE_IMPORT_FILE_VERSION 1)
+
+# Protect against multiple inclusion, which would fail when already imported targets are added once more.
+set(_cmake_targets_defined "")
+set(_cmake_targets_not_defined "")
+set(_cmake_expected_targets "")
+foreach(_cmake_expected_target IN ITEMS SDBusCpp::sdbus-c++ SDBusCpp::sdbus-c++-objlib)
+  list(APPEND _cmake_expected_targets "${_cmake_expected_target}")
+  if(TARGET "${_cmake_expected_target}")
+    list(APPEND _cmake_targets_defined "${_cmake_expected_target}")
+  else()
+    list(APPEND _cmake_targets_not_defined "${_cmake_expected_target}")
+  endif()
+endforeach()
+unset(_cmake_expected_target)
+if(_cmake_targets_defined STREQUAL _cmake_expected_targets)
+  unset(_cmake_targets_defined)
+  unset(_cmake_targets_not_defined)
+  unset(_cmake_expected_targets)
+  unset(CMAKE_IMPORT_FILE_VERSION)
+  cmake_policy(POP)
+  return()
+endif()
+if(NOT _cmake_targets_defined STREQUAL "")
+  string(REPLACE ";" ", " _cmake_targets_defined_text "${_cmake_targets_defined}")
+  string(REPLACE ";" ", " _cmake_targets_not_defined_text "${_cmake_targets_not_defined}")
+  message(FATAL_ERROR "Some (but not all) targets in this export set were already defined.\nTargets Defined: ${_cmake_targets_defined_text}\nTargets not yet defined: ${_cmake_targets_not_defined_text}\n")
+endif()
+unset(_cmake_targets_defined)
+unset(_cmake_targets_not_defined)
+unset(_cmake_expected_targets)
+
+
+# Compute the installation prefix relative to this file.
+get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
+get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
+get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
+get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
+if(_IMPORT_PREFIX STREQUAL "/")
+  set(_IMPORT_PREFIX "")
+endif()
+
+# Create imported target SDBusCpp::sdbus-c++
+add_library(SDBusCpp::sdbus-c++ STATIC IMPORTED)
+
+set_target_properties(SDBusCpp::sdbus-c++ PROPERTIES
+  INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include"
+  INTERFACE_LINK_LIBRARIES "\$<LINK_ONLY:SDBusCpp::sdbus-c++-objlib>"
+)
+
+# Create imported target SDBusCpp::sdbus-c++-objlib
+add_library(SDBusCpp::sdbus-c++-objlib INTERFACE IMPORTED)
+
+set_target_properties(SDBusCpp::sdbus-c++-objlib PROPERTIES
+  INTERFACE_LINK_LIBRARIES "PkgConfig::Systemd;Threads::Threads"
+)
+
+# Load information for each installed configuration.
+file(GLOB _cmake_config_files "${CMAKE_CURRENT_LIST_DIR}/sdbus-c++-targets-*.cmake")
+foreach(_cmake_config_file IN LISTS _cmake_config_files)
+  include("${_cmake_config_file}")
+endforeach()
+unset(_cmake_config_file)
+unset(_cmake_config_files)
+
+# Cleanup temporary variables.
+set(_IMPORT_PREFIX)
+
+# Loop over all imported files and verify that they actually exist
+foreach(_cmake_target IN LISTS _cmake_import_check_targets)
+  if(CMAKE_VERSION VERSION_LESS "3.28"
+      OR NOT DEFINED _cmake_import_check_xcframework_for_${_cmake_target}
+      OR NOT IS_DIRECTORY "${_cmake_import_check_xcframework_for_${_cmake_target}}")
+    foreach(_cmake_file IN LISTS "_cmake_import_check_files_for_${_cmake_target}")
+      if(NOT EXISTS "${_cmake_file}")
+        message(FATAL_ERROR "The imported target \"${_cmake_target}\" references the file
+   \"${_cmake_file}\"
+but this file does not exist.  Possible reasons include:
+* The file was deleted, renamed, or moved to another location.
+* An install or uninstall procedure did not complete successfully.
+* The installation package was faulty and contained
+   \"${CMAKE_CURRENT_LIST_FILE}\"
+but not all the files it references.
+")
+      endif()
+    endforeach()
+  endif()
+  unset(_cmake_file)
+  unset("_cmake_import_check_files_for_${_cmake_target}")
+endforeach()
+unset(_cmake_target)
+unset(_cmake_import_check_targets)
+
+# This file does not depend on other imported targets which have
+# been exported from the same project but in a separate export set.
+
+# Commands beyond this point should not need to know the version.
+set(CMAKE_IMPORT_FILE_VERSION)
+cmake_policy(POP)
diff --git a/3rdParty/sdbus-cpp/lib/libsdbus-c++-aarch64.a b/3rdParty/sdbus-cpp/lib/libsdbus-c++-aarch64.a
new file mode 100644
index 0000000000..88c2de56f3
Binary files /dev/null and b/3rdParty/sdbus-cpp/lib/libsdbus-c++-aarch64.a differ
diff --git a/3rdParty/sdbus-cpp/lib/libsdbus-c++-x86_64.a b/3rdParty/sdbus-cpp/lib/libsdbus-c++-x86_64.a
new file mode 100644
index 0000000000..3e8cd171ef
Binary files /dev/null and b/3rdParty/sdbus-cpp/lib/libsdbus-c++-x86_64.a differ
diff --git a/3rdParty/sdbus-cpp/lib/pkgconfig/sdbus-c++.pc b/3rdParty/sdbus-cpp/lib/pkgconfig/sdbus-c++.pc
new file mode 100644
index 0000000000..94c8362764
--- /dev/null
+++ b/3rdParty/sdbus-cpp/lib/pkgconfig/sdbus-c++.pc
@@ -0,0 +1,11 @@
+prefix=/usr/local
+exec_prefix=/usr/local
+libdir=/usr/local/lib
+includedir=/usr/local/include
+
+Name: sdbus-c++
+Description: C++ library on top of sd-bus, a systemd D-Bus library
+Requires: libsystemd
+Version: 2.2.1
+Libs: -L${libdir} -lsdbus-c++
+Cflags: -I${includedir}
diff --git a/3rdPartyBinaries/Sleepy.dll b/3rdPartyBinaries/Sleepy.dll
deleted file mode 100644
index 3d7b601fed..0000000000
Binary files a/3rdPartyBinaries/Sleepy.dll and /dev/null differ
diff --git a/3rdPartyBinaries/Sleepy.lib b/3rdPartyBinaries/Sleepy.lib
deleted file mode 100644
index 8943da6e92..0000000000
Binary files a/3rdPartyBinaries/Sleepy.lib and /dev/null differ
diff --git a/3rdPartyBinaries/discord_social_sdk_linux.zip b/3rdPartyBinaries/discord_social_sdk_linux.zip
new file mode 100644
index 0000000000..a53f377992
Binary files /dev/null and b/3rdPartyBinaries/discord_social_sdk_linux.zip differ
diff --git a/3rdPartyBinaries/discord_social_sdk_mac.zip b/3rdPartyBinaries/discord_social_sdk_mac.zip
new file mode 100644
index 0000000000..054f9cde58
Binary files /dev/null and b/3rdPartyBinaries/discord_social_sdk_mac.zip differ
diff --git a/3rdPartyBinaries/discord_social_sdk_win.zip b/3rdPartyBinaries/discord_social_sdk_win.zip
new file mode 100644
index 0000000000..796621e6b2
Binary files /dev/null and b/3rdPartyBinaries/discord_social_sdk_win.zip differ
diff --git a/3rdPartyBinaries/dpp-cacert.md b/3rdPartyBinaries/dpp-cacert.md
new file mode 100644
index 0000000000..2106be39be
--- /dev/null
+++ b/3rdPartyBinaries/dpp-cacert.md
@@ -0,0 +1,17 @@
+# DPP CA certificate bundle
+
+`dpp-cacert.pem` is the Mozilla root CA bundle published by curl:
+https://curl.se/docs/caextract.html
+
+The bundle is distributed under the Mozilla Public License 2.0:
+https://www.mozilla.org/MPL/2.0/
+
+Builds with DPP enabled deploy this file beside the SerialPrograms executable
+on Windows, Linux, and macOS (inside `SerialPrograms.app/Contents/MacOS` on macOS).
+At startup, SerialPrograms sets SSL_CERT_FILE to that deployed bundle unless
+the caller already configured SSL_CERT_FILE. Missing or unreadable bundles
+are logged.
+
+To refresh the bundle, download https://curl.se/ca/cacert.pem to a temporary
+file, verify that it contains PEM certificates, then replace dpp-cacert.pem.
+Rebuild to deploy the new copy and restart SerialPrograms to reload it.
diff --git a/3rdPartyBinaries/dpp-cacert.pem b/3rdPartyBinaries/dpp-cacert.pem
new file mode 100644
index 0000000000..4b694a502b
--- /dev/null
+++ b/3rdPartyBinaries/dpp-cacert.pem
@@ -0,0 +1,2950 @@
+##
+## Bundle of CA Root Certificates
+##
+## Certificate data from Mozilla as of: Fri Sep 25 03:12:01 2026 GMT
+##
+## Find updated versions here: https://curl.se/docs/caextract.html
+##
+## This is a bundle of X.509 certificates of public Certificate Authorities
+## (CA). These were automatically extracted from Mozilla's root certificates
+## file (certdata.txt).  This file can be found in the mozilla source tree:
+## https://raw.githubusercontent.com/mozilla-firefox/firefox/refs/heads/release/security/nss/lib/ckfw/builtins/certdata.txt
+##
+## It contains the certificates in PEM format and therefore
+## can be directly used with curl / libcurl / php_curl, or with
+## an Apache+mod_ssl webserver for SSL client authentication.
+## Configure this file as the SSLCACertificateFile.
+##
+## Conversion done with mk-ca-bundle.pl version 1.33.
+## SHA256: beb7e6dfe6499926e52c075c27bcfbe4c957f8609c575b3860273ae2806f63eb
+##
+
+
+COMODO ECC Certification Authority
+==================================
+-----BEGIN CERTIFICATE-----
+MIICiTCCAg+gAwIBAgIQH0evqmIAcFBUTAGem2OZKjAKBggqhkjOPQQDAzCBhTELMAkGA1UEBhMC
+R0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UE
+ChMRQ09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBFQ0MgQ2VydGlmaWNhdGlvbiBB
+dXRob3JpdHkwHhcNMDgwMzA2MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBhTELMAkGA1UEBhMCR0Ix
+GzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UEChMR
+Q09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBFQ0MgQ2VydGlmaWNhdGlvbiBBdXRo
+b3JpdHkwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQDR3svdcmCFYX7deSRFtSrYpn1PlILBs5BAH+X
+4QokPB0BBO490o0JlwzgdeT6+3eKKvUDYEs2ixYjFq0JcfRK9ChQtP6IHG4/bC8vCVlbpVsLM5ni
+wz2J+Wos77LTBumjQjBAMB0GA1UdDgQWBBR1cacZSBm8nZ3qQUfflMRId5nTeTAOBgNVHQ8BAf8E
+BAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAKBggqhkjOPQQDAwNoADBlAjEA7wNbeqy3eApyt4jf/7VG
+FAkK+qDmfQjGGoe9GKhzvSbKYAydzpmfz1wPMOG+FDHqAjAU9JM8SaczepBGR7NjfRObTrdvGDeA
+U/7dIOA1mjbRxwG55tzd8/8dLDoWV9mSOdY=
+-----END CERTIFICATE-----
+
+NetLock Arany (Class Gold) Főtanúsítvány
+========================================
+-----BEGIN CERTIFICATE-----
+MIIEFTCCAv2gAwIBAgIGSUEs5AAQMA0GCSqGSIb3DQEBCwUAMIGnMQswCQYDVQQGEwJIVTERMA8G
+A1UEBwwIQnVkYXBlc3QxFTATBgNVBAoMDE5ldExvY2sgS2Z0LjE3MDUGA1UECwwuVGFuw7pzw610
+dsOhbnlraWFkw7NrIChDZXJ0aWZpY2F0aW9uIFNlcnZpY2VzKTE1MDMGA1UEAwwsTmV0TG9jayBB
+cmFueSAoQ2xhc3MgR29sZCkgRsWRdGFuw7pzw610dsOhbnkwHhcNMDgxMjExMTUwODIxWhcNMjgx
+MjA2MTUwODIxWjCBpzELMAkGA1UEBhMCSFUxETAPBgNVBAcMCEJ1ZGFwZXN0MRUwEwYDVQQKDAxO
+ZXRMb2NrIEtmdC4xNzA1BgNVBAsMLlRhbsO6c8OtdHbDoW55a2lhZMOzayAoQ2VydGlmaWNhdGlv
+biBTZXJ2aWNlcykxNTAzBgNVBAMMLE5ldExvY2sgQXJhbnkgKENsYXNzIEdvbGQpIEbFkXRhbsO6
+c8OtdHbDoW55MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxCRec75LbRTDofTjl5Bu
+0jBFHjzuZ9lk4BqKf8owyoPjIMHj9DrTlF8afFttvzBPhCf2nx9JvMaZCpDyD/V/Q4Q3Y1GLeqVw
+/HpYzY6b7cNGbIRwXdrzAZAj/E4wqX7hJ2Pn7WQ8oLjJM2P+FpD/sLj916jAwJRDC7bVWaaeVtAk
+H3B5r9s5VA1lddkVQZQBr17s9o3x/61k/iCa11zr/qYfCGSji3ZVrR47KGAuhyXoqq8fxmRGILdw
+fzzeSNuWU7c5d+Qa4scWhHaXWy+7GRWF+GmF9ZmnqfI0p6m2pgP8b4Y9VHx2BJtr+UBdADTHLpl1
+neWIA6pN+APSQnbAGwIDAKiLo0UwQzASBgNVHRMBAf8ECDAGAQH/AgEEMA4GA1UdDwEB/wQEAwIB
+BjAdBgNVHQ4EFgQUzPpnk/C2uNClwB7zU/2MU9+D15YwDQYJKoZIhvcNAQELBQADggEBAKt/7hwW
+qZw8UQCgwBEIBaeZ5m8BiFRhbvG5GK1Krf6BQCOUL/t1fC8oS2IkgYIL9WHxHG64YTjrgfpioTta
+YtOUZcTh5m2C+C8lcLIhJsFyUR+MLMOEkMNaj7rP9KdlpeuY0fsFskZ1FSNqb4VjMIDw1Z4fKRzC
+bLBQWV2QWzuoDTDPv31/zvGdg73JRm4gpvlhUbohL3u+pRVjodSVh/GeufOJ8z2FuLjbvrW5Kfna
+NwUASZQDhETnv0Mxz3WLJdH0pmT1kvarBes96aULNmLazAZfNou2XjG4Kvte9nHfRCaexOYNkbQu
+dZWAUWpLMKawYqGT8ZvYzsRjdT9ZR7E=
+-----END CERTIFICATE-----
+
+Microsec e-Szigno Root CA 2009
+==============================
+-----BEGIN CERTIFICATE-----
+MIIECjCCAvKgAwIBAgIJAMJ+QwRORz8ZMA0GCSqGSIb3DQEBCwUAMIGCMQswCQYDVQQGEwJIVTER
+MA8GA1UEBwwIQnVkYXBlc3QxFjAUBgNVBAoMDU1pY3Jvc2VjIEx0ZC4xJzAlBgNVBAMMHk1pY3Jv
+c2VjIGUtU3ppZ25vIFJvb3QgQ0EgMjAwOTEfMB0GCSqGSIb3DQEJARYQaW5mb0BlLXN6aWduby5o
+dTAeFw0wOTA2MTYxMTMwMThaFw0yOTEyMzAxMTMwMThaMIGCMQswCQYDVQQGEwJIVTERMA8GA1UE
+BwwIQnVkYXBlc3QxFjAUBgNVBAoMDU1pY3Jvc2VjIEx0ZC4xJzAlBgNVBAMMHk1pY3Jvc2VjIGUt
+U3ppZ25vIFJvb3QgQ0EgMjAwOTEfMB0GCSqGSIb3DQEJARYQaW5mb0BlLXN6aWduby5odTCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOn4j/NjrdqG2KfgQvvPkd6mJviZpWNwrZuuyjNA
+fW2WbqEORO7hE52UQlKavXWFdCyoDh2Tthi3jCyoz/tccbna7P7ofo/kLx2yqHWH2Leh5TvPmUpG
+0IMZfcChEhyVbUr02MelTTMuhTlAdX4UfIASmFDHQWe4oIBhVKZsTh/gnQ4H6cm6M+f+wFUoLAKA
+pxn1ntxVUwOXewdI/5n7N4okxFnMUBBjjqqpGrCEGob5X7uxUG6k0QrM1XF+H6cbfPVTbiJfyyvm
+1HxdrtbCxkzlBQHZ7Vf8wSN5/PrIJIOV87VqUQHQd9bpEqH5GoP7ghu5sJf0dgYzQ0mg/wu1+rUC
+AwEAAaOBgDB+MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTLD8bf
+QkPMPcu1SCOhGnqmKrs0aDAfBgNVHSMEGDAWgBTLD8bfQkPMPcu1SCOhGnqmKrs0aDAbBgNVHREE
+FDASgRBpbmZvQGUtc3ppZ25vLmh1MA0GCSqGSIb3DQEBCwUAA4IBAQDJ0Q5eLtXMs3w+y/w9/w0o
+lZMEyL/azXm4Q5DwpL7v8u8hmLzU1F0G9u5C7DBsoKqpyvGvivo/C3NqPuouQH4frlRheesuCDfX
+I/OMn74dseGkddug4lQUsbocKaQY9hK6ohQU4zE1yED/t+AFdlfBHFny+L/k7SViXITwfn4fs775
+tyERzAMBVnCnEJIeGzSBHq2cGsMEPO0CYdYeBvNfOofyK/FFh+U9rNHHV4S9a67c2Pm2G2JwCz02
+yULyMtd6YebS2z3PyKnJm9zbWETXbzivf3jTo60adbocwTZ8jx5tHMN1Rq41Bab2XD0h7lbwyYIi
+LXpUq3DDfSJlgnCW
+-----END CERTIFICATE-----
+
+GlobalSign Root CA - R3
+=======================
+-----BEGIN CERTIFICATE-----
+MIIDXzCCAkegAwIBAgILBAAAAAABIVhTCKIwDQYJKoZIhvcNAQELBQAwTDEgMB4GA1UECxMXR2xv
+YmFsU2lnbiBSb290IENBIC0gUjMxEzARBgNVBAoTCkdsb2JhbFNpZ24xEzARBgNVBAMTCkdsb2Jh
+bFNpZ24wHhcNMDkwMzE4MTAwMDAwWhcNMjkwMzE4MTAwMDAwWjBMMSAwHgYDVQQLExdHbG9iYWxT
+aWduIFJvb3QgQ0EgLSBSMzETMBEGA1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2ln
+bjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMwldpB5BngiFvXAg7aEyiie/QV2EcWt
+iHL8RgJDx7KKnQRfJMsuS+FggkbhUqsMgUdwbN1k0ev1LKMPgj0MK66X17YUhhB5uzsTgHeMCOFJ
+0mpiLx9e+pZo34knlTifBtc+ycsmWQ1z3rDI6SYOgxXG71uL0gRgykmmKPZpO/bLyCiR5Z2KYVc3
+rHQU3HTgOu5yLy6c+9C7v/U9AOEGM+iCK65TpjoWc4zdQQ4gOsC0p6Hpsk+QLjJg6VfLuQSSaGjl
+OCZgdbKfd/+RFO+uIEn8rUAVSNECMWEZXriX7613t2Saer9fwRPvm2L7DWzgVGkWqQPabumDk3F2
+xmmFghcCAwEAAaNCMEAwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYE
+FI/wS3+oLkUkrk1Q+mOai97i3Ru8MA0GCSqGSIb3DQEBCwUAA4IBAQBLQNvAUKr+yAzv95ZURUm7
+lgAJQayzE4aGKAczymvmdLm6AC2upArT9fHxD4q/c2dKg8dEe3jgr25sbwMpjjM5RcOO5LlXbKr8
+EpbsU8Yt5CRsuZRj+9xTaGdWPoO4zzUhw8lo/s7awlOqzJCK6fBdRoyV3XpYKBovHd7NADdBj+1E
+bddTKJd+82cEHhXXipa0095MJ6RMG3NzdvQXmcIfeg7jLQitChws/zyrVQ4PkX4268NXSb7hLi18
+YIvDQVETI53O9zJrlAGomecsMx86OyXShkDOOyyGeMlhLxS67ttVb9+E7gUJTb0o2HLO02JQZR7r
+kpeDMdmztcpHWD9f
+-----END CERTIFICATE-----
+
+Izenpe.com
+==========
+-----BEGIN CERTIFICATE-----
+MIIF8TCCA9mgAwIBAgIQALC3WhZIX7/hy/WL1xnmfTANBgkqhkiG9w0BAQsFADA4MQswCQYDVQQG
+EwJFUzEUMBIGA1UECgwLSVpFTlBFIFMuQS4xEzARBgNVBAMMCkl6ZW5wZS5jb20wHhcNMDcxMjEz
+MTMwODI4WhcNMzcxMjEzMDgyNzI1WjA4MQswCQYDVQQGEwJFUzEUMBIGA1UECgwLSVpFTlBFIFMu
+QS4xEzARBgNVBAMMCkl6ZW5wZS5jb20wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDJ
+03rKDx6sp4boFmVqscIbRTJxldn+EFvMr+eleQGPicPK8lVx93e+d5TzcqQsRNiekpsUOqHnJJAK
+ClaOxdgmlOHZSOEtPtoKct2jmRXagaKH9HtuJneJWK3W6wyyQXpzbm3benhB6QiIEn6HLmYRY2xU
++zydcsC8Lv/Ct90NduM61/e0aL6i9eOBbsFGb12N4E3GVFWJGjMxCrFXuaOKmMPsOzTFlUFpfnXC
+PCDFYbpRR6AgkJOhkEvzTnyFRVSa0QUmQbC1TR0zvsQDyCV8wXDbO/QJLVQnSKwv4cSsPsjLkkxT
+OTcj7NMB+eAJRE1NZMDhDVqHIrytG6P+JrUV86f8hBnp7KGItERphIPzidF0BqnMC9bC3ieFUCbK
+F7jJeodWLBoBHmy+E60QrLUk9TiRodZL2vG70t5HtfG8gfZZa88ZU+mNFctKy6lvROUbQc/hhqfK
+0GqfvEyNBjNaooXlkDWgYlwWTvDjovoDGrQscbNYLN57C9saD+veIR8GdwYDsMnvmfzAuU8Lhij+
+0rnq49qlw0dpEuDb8PYZi+17cNcC1u2HGCgsBCRMd+RIihrGO5rUD8r6ddIBQFqNeb+Lz0vPqhbB
+leStTIo+F5HUsWLlguWABKQDfo2/2n+iD5dPDNMN+9fR5XJ+HMh3/1uaD7euBUbl8agW7EekFwID
+AQABo4H2MIHzMIGwBgNVHREEgagwgaWBD2luZm9AaXplbnBlLmNvbaSBkTCBjjFHMEUGA1UECgw+
+SVpFTlBFIFMuQS4gLSBDSUYgQTAxMzM3MjYwLVJNZXJjLlZpdG9yaWEtR2FzdGVpeiBUMTA1NSBG
+NjIgUzgxQzBBBgNVBAkMOkF2ZGEgZGVsIE1lZGl0ZXJyYW5lbyBFdG9yYmlkZWEgMTQgLSAwMTAx
+MCBWaXRvcmlhLUdhc3RlaXowDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0O
+BBYEFB0cZQ6o8iV7tJHP5LGx5r1VdGwFMA0GCSqGSIb3DQEBCwUAA4ICAQB4pgwWSp9MiDrAyw6l
+Fn2fuUhfGI8NYjb2zRlrrKvV9pF9rnHzP7MOeIWblaQnIUdCSnxIOvVFfLMMjlF4rJUT3sb9fbga
+kEyrkgPH7UIBzg/YsfqikuFgba56awmqxinuaElnMIAkejEWOVt+8Rwu3WwJrfIxwYJOubv5vr8q
+hT/AQKM6WfxZSzwoJNu0FXWuDYi6LnPAvViH5ULy617uHjAimcs30cQhbIHsvm0m5hzkQiCeR7Cs
+g1lwLDXWrzY0tM07+DKo7+N4ifuNRSzanLh+QBxh5z6ikixL8s36mLYp//Pye6kfLqCTVyvehQP5
+aTfLnnhqBbTFMXiJ7HqnheG5ezzevh55hM6fcA5ZwjUukCox2eRFekGkLhObNA5me0mrZJfQRsN5
+nXJQY6aYWwa9SG3YOYNw6DXwBdGqvOPbyALqfP2C2sJbUjWumDqtujWTI6cfSN01RpiyEGjkpTHC
+ClguGYEQyVB1/OpaFs4R1+7vUIgtYf8/QnMFlEPVjjxOAToZpR9GTnfQXeWBIiGH/pR9hNiTrdZo
+Q0iy2+tzJOeRf1SktoA+naM8THLCV8Sg1Mw4J87VBp6iSNnpn86CcDaTmjvfliHjWbcM2pE38P1Z
+WrOZyGlsQyYBNWNgVYkDOnXYukrZVP/u3oDYLdE41V4tC5h9Pmzb/CaIxw==
+-----END CERTIFICATE-----
+
+Go Daddy Root Certificate Authority - G2
+========================================
+-----BEGIN CERTIFICATE-----
+MIIDxTCCAq2gAwIBAgIBADANBgkqhkiG9w0BAQsFADCBgzELMAkGA1UEBhMCVVMxEDAOBgNVBAgT
+B0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxGjAYBgNVBAoTEUdvRGFkZHkuY29tLCBJbmMu
+MTEwLwYDVQQDEyhHbyBEYWRkeSBSb290IENlcnRpZmljYXRlIEF1dGhvcml0eSAtIEcyMB4XDTA5
+MDkwMTAwMDAwMFoXDTM3MTIzMTIzNTk1OVowgYMxCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdBcml6
+b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMRowGAYDVQQKExFHb0RhZGR5LmNvbSwgSW5jLjExMC8G
+A1UEAxMoR28gRGFkZHkgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkgLSBHMjCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAL9xYgjx+lk09xvJGKP3gElY6SKDE6bFIEMBO4Tx5oVJnyfq
+9oQbTqC023CYxzIBsQU+B07u9PpPL1kwIuerGVZr4oAH/PMWdYA5UXvl+TW2dE6pjYIT5LY/qQOD
++qK+ihVqf94Lw7YZFAXK6sOoBJQ7RnwyDfMAZiLIjWltNowRGLfTshxgtDj6AozO091GB94KPutd
+fMh8+7ArU6SSYmlRJQVhGkSBjCypQ5Yj36w6gZoOKcUcqeldHraenjAKOc7xiID7S13MMuyFYkMl
+NAJWJwGRtDtwKj9useiciAF9n9T521NtYJ2/LOdYq7hfRvzOxBsDPAnrSTFcaUaz4EcCAwEAAaNC
+MEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFDqahQcQZyi27/a9
+BUFuIMGU2g/eMA0GCSqGSIb3DQEBCwUAA4IBAQCZ21151fmXWWcDYfF+OwYxdS2hII5PZYe096ac
+vNjpL9DbWu7PdIxztDhC2gV7+AJ1uP2lsdeu9tfeE8tTEH6KRtGX+rcuKxGrkLAngPnon1rpN5+r
+5N9ss4UXnT3ZJE95kTXWXwTrgIOrmgIttRD02JDHBHNA7XIloKmf7J6raBKZV8aPEjoJpL1E/QYV
+N8Gb5DKj7Tjo2GTzLH4U/ALqn83/B2gX2yKQOC16jdFU8WnjXzPKej17CuPKf1855eJ1usV2GDPO
+LPAvTK33sefOT6jEm0pUBsV/fdUID+Ic/n4XuKxe9tQWskMJDE32p2u0mYRlynqI4uJEvlz36hz1
+-----END CERTIFICATE-----
+
+Starfield Root Certificate Authority - G2
+=========================================
+-----BEGIN CERTIFICATE-----
+MIID3TCCAsWgAwIBAgIBADANBgkqhkiG9w0BAQsFADCBjzELMAkGA1UEBhMCVVMxEDAOBgNVBAgT
+B0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxJTAjBgNVBAoTHFN0YXJmaWVsZCBUZWNobm9s
+b2dpZXMsIEluYy4xMjAwBgNVBAMTKVN0YXJmaWVsZCBSb290IENlcnRpZmljYXRlIEF1dGhvcml0
+eSAtIEcyMB4XDTA5MDkwMTAwMDAwMFoXDTM3MTIzMTIzNTk1OVowgY8xCzAJBgNVBAYTAlVTMRAw
+DgYDVQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxTdGFyZmllbGQg
+VGVjaG5vbG9naWVzLCBJbmMuMTIwMAYDVQQDEylTdGFyZmllbGQgUm9vdCBDZXJ0aWZpY2F0ZSBB
+dXRob3JpdHkgLSBHMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL3twQP89o/8ArFv
+W59I2Z154qK3A2FWGMNHttfKPTUuiUP3oWmb3ooa/RMgnLRJdzIpVv257IzdIvpy3Cdhl+72WoTs
+bhm5iSzchFvVdPtrX8WJpRBSiUZV9Lh1HOZ/5FSuS/hVclcCGfgXcVnrHigHdMWdSL5stPSksPNk
+N3mSwOxGXn/hbVNMYq/NHwtjuzqd+/x5AJhhdM8mgkBj87JyahkNmcrUDnXMN/uLicFZ8WJ/X7Nf
+ZTD4p7dNdloedl40wOiWVpmKs/B/pM293DIxfJHP4F8R+GuqSVzRmZTRouNjWwl2tVZi4Ut0HZbU
+JtQIBFnQmA4O5t78w+wfkPECAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
+AQYwHQYDVR0OBBYEFHwMMh+n2TB/xH1oo2Kooc6rB1snMA0GCSqGSIb3DQEBCwUAA4IBAQARWfol
+TwNvlJk7mh+ChTnUdgWUXuEok21iXQnCoKjUsHU48TRqneSfioYmUeYs0cYtbpUgSpIB7LiKZ3sx
+4mcujJUDJi5DnUox9g61DLu34jd/IroAow57UvtruzvE03lRTs2Q9GcHGcg8RnoNAX3FWOdt5oUw
+F5okxBDgBPfg8n/Uqgr/Qh037ZTlZFkSIHc40zI+OIF1lnP6aI+xy84fxez6nH7PfrHxBy22/L/K
+pL/QlwVKvOoYKAKQvVR4CSFx09F9HdkWsKlhPdAKACL8x3vLCWRFCztAgfd9fDL1mMpYjn0q7pBZ
+c2T5NnReJaH1ZgUufzkVqSr7UIuOhWn0
+-----END CERTIFICATE-----
+
+Starfield Services Root Certificate Authority - G2
+==================================================
+-----BEGIN CERTIFICATE-----
+MIID7zCCAtegAwIBAgIBADANBgkqhkiG9w0BAQsFADCBmDELMAkGA1UEBhMCVVMxEDAOBgNVBAgT
+B0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxJTAjBgNVBAoTHFN0YXJmaWVsZCBUZWNobm9s
+b2dpZXMsIEluYy4xOzA5BgNVBAMTMlN0YXJmaWVsZCBTZXJ2aWNlcyBSb290IENlcnRpZmljYXRl
+IEF1dGhvcml0eSAtIEcyMB4XDTA5MDkwMTAwMDAwMFoXDTM3MTIzMTIzNTk1OVowgZgxCzAJBgNV
+BAYTAlVTMRAwDgYDVQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxT
+dGFyZmllbGQgVGVjaG5vbG9naWVzLCBJbmMuMTswOQYDVQQDEzJTdGFyZmllbGQgU2VydmljZXMg
+Um9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkgLSBHMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBANUMOsQq+U7i9b4Zl1+OiFOxHz/Lz58gE20pOsgPfTz3a3Y4Y9k2YKibXlwAgLIvWX/2
+h/klQ4bnaRtSmpDhcePYLQ1Ob/bISdm28xpWriu2dBTrz/sm4xq6HZYuajtYlIlHVv8loJNwU4Pa
+hHQUw2eeBGg6345AWh1KTs9DkTvnVtYAcMtS7nt9rjrnvDH5RfbCYM8TWQIrgMw0R9+53pBlbQLP
+LJGmpufehRhJfGZOozptqbXuNC66DQO4M99H67FrjSXZm86B0UVGMpZwh94CDklDhbZsc7tk6mFB
+rMnUVN+HL8cisibMn1lUaJ/8viovxFUcdUBgF4UCVTmLfwUCAwEAAaNCMEAwDwYDVR0TAQH/BAUw
+AwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFJxfAN+qAdcwKziIorhtSpzyEZGDMA0GCSqG
+SIb3DQEBCwUAA4IBAQBLNqaEd2ndOxmfZyMIbw5hyf2E3F/YNoHN2BtBLZ9g3ccaaNnRbobhiCPP
+E95Dz+I0swSdHynVv/heyNXBve6SbzJ08pGCL72CQnqtKrcgfU28elUSwhXqvfdqlS5sdJ/PHLTy
+xQGjhdByPq1zqwubdQxtRbeOlKyWN7Wg0I8VRw7j6IPdj/3vQQF3zCepYoUz8jcI73HPdwbeyBkd
+iEDPfUYd/x7H4c7/I9vG+o1VTqkC50cRRj70/b17KSa7qWFiNyi2LSr2EIZkyXCn0q23KXB56jza
+YyWf/Wi3MOxw+3WKt21gZ7IeyLnp2KhvAotnDU0mV3HaIPzBSlCNsSi6
+-----END CERTIFICATE-----
+
+Certum Trusted Network CA
+=========================
+-----BEGIN CERTIFICATE-----
+MIIDuzCCAqOgAwIBAgIDBETAMA0GCSqGSIb3DQEBBQUAMH4xCzAJBgNVBAYTAlBMMSIwIAYDVQQK
+ExlVbml6ZXRvIFRlY2hub2xvZ2llcyBTLkEuMScwJQYDVQQLEx5DZXJ0dW0gQ2VydGlmaWNhdGlv
+biBBdXRob3JpdHkxIjAgBgNVBAMTGUNlcnR1bSBUcnVzdGVkIE5ldHdvcmsgQ0EwHhcNMDgxMDIy
+MTIwNzM3WhcNMjkxMjMxMTIwNzM3WjB+MQswCQYDVQQGEwJQTDEiMCAGA1UEChMZVW5pemV0byBU
+ZWNobm9sb2dpZXMgUy5BLjEnMCUGA1UECxMeQ2VydHVtIENlcnRpZmljYXRpb24gQXV0aG9yaXR5
+MSIwIAYDVQQDExlDZXJ0dW0gVHJ1c3RlZCBOZXR3b3JrIENBMIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEA4/t9o3K6wvDJFIf1awFO4W5AB7ptJ11/91sts1rHUV+rpDKmYYe2bg+G0jAC
+l/jXaVehGDldamR5xgFZrDwxSjh80gTSSyjoIF87B6LMTXPb865Px1bVWqeWifrzq2jUI4ZZJ88J
+J7ysbnKDHDBy3+Ci6dLhdHUZvSqeexVUBBvXQzmtVSjF4hq79MDkrjhJM8x2hZ85RdKknvISjFH4
+fOQtf/WsX+sWn7Et0brMkUJ3TCXJkDhv2/DM+44el1k+1WBO5gUo7Ul5E0u6SNsv+XLTOcr+H9g0
+cvW0QM8xAcPs3hEtF10fuFDRXhmnad4HMyjKUJX5p1TLVIZQRan5SQIDAQABo0IwQDAPBgNVHRMB
+Af8EBTADAQH/MB0GA1UdDgQWBBQIds3LB/8k9sXN7buQvOKEN0Z19zAOBgNVHQ8BAf8EBAMCAQYw
+DQYJKoZIhvcNAQEFBQADggEBAKaorSLOAT2mo/9i0Eidi15ysHhE49wcrwn9I0j6vSrEuVUEtRCj
+jSfeC4Jj0O7eDDd5QVsisrCaQVymcODU0HfLI9MA4GxWL+FpDQ3Zqr8hgVDZBqWo/5U30Kr+4rP1
+mS1FhIrlQgnXdAIv94nYmem8J9RHjboNRhx3zxSkHLmkMcScKHQDNP8zGSal6Q10tz6XxnboJ5aj
+Zt3hrvJBW8qYVoNzcOSGGtIxQbovvi0TWnZvTuhOgQ4/WwMioBK+ZlgRSssDxLQqKi2WF+A5VLxI
+03YnnZotBqbJ7DnSq9ufmgsnAjUpsUCV5/nonFWIGUbWtzT1fs45mtk48VH3Tyw=
+-----END CERTIFICATE-----
+
+TWCA Root Certification Authority
+=================================
+-----BEGIN CERTIFICATE-----
+MIIDezCCAmOgAwIBAgIBATANBgkqhkiG9w0BAQUFADBfMQswCQYDVQQGEwJUVzESMBAGA1UECgwJ
+VEFJV0FOLUNBMRAwDgYDVQQLDAdSb290IENBMSowKAYDVQQDDCFUV0NBIFJvb3QgQ2VydGlmaWNh
+dGlvbiBBdXRob3JpdHkwHhcNMDgwODI4MDcyNDMzWhcNMzAxMjMxMTU1OTU5WjBfMQswCQYDVQQG
+EwJUVzESMBAGA1UECgwJVEFJV0FOLUNBMRAwDgYDVQQLDAdSb290IENBMSowKAYDVQQDDCFUV0NB
+IFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQCwfnK4pAOU5qfeCTiRShFAh6d8WWQUe7UREN3+v9XAu1bihSX0NXIP+FPQQeFEAcK0HMMx
+QhZHhTMidrIKbw/lJVBPhYa+v5guEGcevhEFhgWQxFnQfHgQsIBct+HHK3XLfJ+utdGdIzdjp9xC
+oi2SBBtQwXu4PhvJVgSLL1KbralW6cH/ralYhzC2gfeXRfwZVzsrb+RH9JlF/h3x+JejiB03HFyP
+4HYlmlD4oFT/RJB2I9IyxsOrBr/8+7/zrX2SYgJbKdM1o5OaQ2RgXbL6Mv87BK9NQGr5x+PvI/1r
+y+UPizgN7gr8/g+YnzAx3WxSZfmLgb4i4RxYA7qRG4kHAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIB
+BjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRqOFsmjd6LWvJPelSDGRjjCDWmujANBgkqhkiG
+9w0BAQUFAAOCAQEAPNV3PdrfibqHDAhUaiBQkr6wQT25JmSDCi/oQMCXKCeCMErJk/9q56YAf4lC
+mtYR5VPOL8zy2gXE/uJQxDqGfczafhAJO5I1KlOy/usrBdlsXebQ79NqZp4VKIV66IIArB6nCWlW
+QtNoURi+VJq/REG6Sb4gumlc7rh3zc5sH62Dlhh9DrUUOYTxKOkto557HnpyWoOzeW/vtPzQCqVY
+T0bf+215WfKEIlKuD8z7fDvnaspHYcN6+NOSBB+4IIThNlQWx0DeO4pz3N/GCUzf7Nr/1FNCocny
+Yh0igzyXxfkZYiesZSLX0zzG5Y6yU8xJzrww/nsOM5D77dIUkR8Hrw==
+-----END CERTIFICATE-----
+
+Security Communication RootCA2
+==============================
+-----BEGIN CERTIFICATE-----
+MIIDdzCCAl+gAwIBAgIBADANBgkqhkiG9w0BAQsFADBdMQswCQYDVQQGEwJKUDElMCMGA1UEChMc
+U0VDT00gVHJ1c3QgU3lzdGVtcyBDTy4sTFRELjEnMCUGA1UECxMeU2VjdXJpdHkgQ29tbXVuaWNh
+dGlvbiBSb290Q0EyMB4XDTA5MDUyOTA1MDAzOVoXDTI5MDUyOTA1MDAzOVowXTELMAkGA1UEBhMC
+SlAxJTAjBgNVBAoTHFNFQ09NIFRydXN0IFN5c3RlbXMgQ08uLExURC4xJzAlBgNVBAsTHlNlY3Vy
+aXR5IENvbW11bmljYXRpb24gUm9vdENBMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+ANAVOVKxUrO6xVmCxF1SrjpDZYBLx/KWvNs2l9amZIyoXvDjChz335c9S672XewhtUGrzbl+dp++
++T42NKA7wfYxEUV0kz1XgMX5iZnK5atq1LXaQZAQwdbWQonCv/Q4EpVMVAX3NuRFg3sUZdbcDE3R
+3n4MqzvEFb46VqZab3ZpUql6ucjrappdUtAtCms1FgkQhNBqyjoGADdH5H5XTz+L62e4iKrFvlNV
+spHEfbmwhRkGeC7bYRr6hfVKkaHnFtWOojnflLhwHyg/i/xAXmODPIMqGplrz95Zajv8bxbXH/1K
+EOtOghY6rCcMU/Gt1SSwawNQwS08Ft1ENCcadfsCAwEAAaNCMEAwHQYDVR0OBBYEFAqFqXdlBZh8
+QIH4D5csOPEK7DzPMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEB
+CwUAA4IBAQBMOqNErLlFsceTfsgLCkLfZOoc7llsCLqJX2rKSpWeeo8HxdpFcoJxDjrSzG+ntKEj
+u/Ykn8sX/oymzsLS28yN/HH8AynBbF0zX2S2ZTuJbxh2ePXcokgfGT+Ok+vx+hfuzU7jBBJV1uXk
+3fs+BXziHV7Gp7yXT2g69ekuCkO2r1dcYmh8t/2jioSgrGK+KwmHNPBqAbubKVY8/gA3zyNs8U6q
+tnRGEmyR7jTV7JqR50S+kDFy1UkC9gLl9B/rfNmWVan/7Ir5mUf/NVoCqgTLiluHcSmRvaS0eg29
+mvVXIwAHIRc/SjnRBUkLp7Y3gaVdjKozXoEofKd9J+sAro03
+-----END CERTIFICATE-----
+
+Actalis Authentication Root CA
+==============================
+-----BEGIN CERTIFICATE-----
+MIIFuzCCA6OgAwIBAgIIVwoRl0LE48wwDQYJKoZIhvcNAQELBQAwazELMAkGA1UEBhMCSVQxDjAM
+BgNVBAcMBU1pbGFuMSMwIQYDVQQKDBpBY3RhbGlzIFMucC5BLi8wMzM1ODUyMDk2NzEnMCUGA1UE
+AwweQWN0YWxpcyBBdXRoZW50aWNhdGlvbiBSb290IENBMB4XDTExMDkyMjExMjIwMloXDTMwMDky
+MjExMjIwMlowazELMAkGA1UEBhMCSVQxDjAMBgNVBAcMBU1pbGFuMSMwIQYDVQQKDBpBY3RhbGlz
+IFMucC5BLi8wMzM1ODUyMDk2NzEnMCUGA1UEAwweQWN0YWxpcyBBdXRoZW50aWNhdGlvbiBSb290
+IENBMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAp8bEpSmkLO/lGMWwUKNvUTufClrJ
+wkg4CsIcoBh/kbWHuUA/3R1oHwiD1S0eiKD4j1aPbZkCkpAW1V8IbInX4ay8IMKx4INRimlNAJZa
+by/ARH6jDuSRzVju3PvHHkVH3Se5CAGfpiEd9UEtL0z9KK3giq0itFZljoZUj5NDKd45RnijMCO6
+zfB9E1fAXdKDa0hMxKufgFpbOr3JpyI/gCczWw63igxdBzcIy2zSekciRDXFzMwujt0q7bd9Zg1f
+YVEiVRvjRuPjPdA1YprbrxTIW6HMiRvhMCb8oJsfgadHHwTrozmSBp+Z07/T6k9QnBn+locePGX2
+oxgkg4YQ51Q+qDp2JE+BIcXjDwL4k5RHILv+1A7TaLndxHqEguNTVHnd25zS8gebLra8Pu2Fbe8l
+EfKXGkJh90qX6IuxEAf6ZYGyojnP9zz/GPvG8VqLWeICrHuS0E4UT1lF9gxeKF+w6D9Fz8+vm2/7
+hNN3WpVvrJSEnu68wEqPSpP4RCHiMUVhUE4Q2OM1fEwZtN4Fv6MGn8i1zeQf1xcGDXqVdFUNaBr8
+EBtiZJ1t4JWgw5QHVw0U5r0F+7if5t+L4sbnfpb2U8WANFAoWPASUHEXMLrmeGO89LKtmyuy/uE5
+jF66CyCU3nuDuP/jVo23Eek7jPKxwV2dpAtMK9myGPW1n0sCAwEAAaNjMGEwHQYDVR0OBBYEFFLY
+iDrIn3hm7YnzezhwlMkCAjbQMA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAUUtiIOsifeGbt
+ifN7OHCUyQICNtAwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBCwUAA4ICAQALe3KHwGCmSUyI
+WOYdiPcUZEim2FgKDk8TNd81HdTtBjHIgT5q1d07GjLukD0R0i70jsNjLiNmsGe+b7bAEzlgqqI0
+JZN1Ut6nna0Oh4lScWoWPBkdg/iaKWW+9D+a2fDzWochcYBNy+A4mz+7+uAwTc+G02UQGRjRlwKx
+K3JCaKygvU5a2hi/a5iB0P2avl4VSM0RFbnAKVy06Ij3Pjaut2L9HmLecHgQHEhb2rykOLpn7VU+
+Xlff1ANATIGk0k9jpwlCCRT8AKnCgHNPLsBA2RF7SOp6AsDT6ygBJlh0wcBzIm2Tlf05fbsq4/aC
+4yyXX04fkZT6/iyj2HYauE2yOE+b+h1IYHkm4vP9qdCa6HCPSXrW5b0KDtst842/6+OkfcvHlXHo
+2qN8xcL4dJIEG4aspCJTQLas/kx2z/uUMsA1n3Y/buWQbqCmJqK4LL7RK4X9p2jIugErsWx0Hbhz
+lefut8cl8ABMALJ+tguLHPPAUJ4lueAI3jZm/zel0btUZCzJJ7VLkn5l/9Mt4blOvH+kQSGQQXem
+OR/qnuOf0GZvBeyqdn6/axag67XH/JJULysRJyU3eExRarDzzFhdFPFqSBX/wge2sY0PjlxQRrM9
+vwGYT7JZVEc+NHt4bVaTLnPqZih4zR0Uv6CPLy64Lo7yFIrM6bV8+2ydDKXhlg==
+-----END CERTIFICATE-----
+
+Buypass Class 2 Root CA
+=======================
+-----BEGIN CERTIFICATE-----
+MIIFWTCCA0GgAwIBAgIBAjANBgkqhkiG9w0BAQsFADBOMQswCQYDVQQGEwJOTzEdMBsGA1UECgwU
+QnV5cGFzcyBBUy05ODMxNjMzMjcxIDAeBgNVBAMMF0J1eXBhc3MgQ2xhc3MgMiBSb290IENBMB4X
+DTEwMTAyNjA4MzgwM1oXDTQwMTAyNjA4MzgwM1owTjELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1
+eXBhc3MgQVMtOTgzMTYzMzI3MSAwHgYDVQQDDBdCdXlwYXNzIENsYXNzIDIgUm9vdCBDQTCCAiIw
+DQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANfHXvfBB9R3+0Mh9PT1aeTuMgHbo4Yf5FkNuud1
+g1Lr6hxhFUi7HQfKjK6w3Jad6sNgkoaCKHOcVgb/S2TwDCo3SbXlzwx87vFKu3MwZfPVL4O2fuPn
+9Z6rYPnT8Z2SdIrkHJasW4DptfQxh6NR/Md+oW+OU3fUl8FVM5I+GC911K2GScuVr1QGbNgGE41b
+/+EmGVnAJLqBcXmQRFBoJJRfuLMR8SlBYaNByyM21cHxMlAQTn/0hpPshNOOvEu/XAFOBz3cFIqU
+CqTqc/sLUegTBxj6DvEr0VQVfTzh97QZQmdiXnfgolXsttlpF9U6r0TtSsWe5HonfOV116rLJeff
+awrbD02TTqigzXsu8lkBarcNuAeBfos4GzjmCleZPe4h6KP1DBbdi+w0jpwqHAAVF41og9JwnxgI
+zRFo1clrUs3ERo/ctfPYV3Me6ZQ5BL/T3jjetFPsaRyifsSP5BtwrfKi+fv3FmRmaZ9JUaLiFRhn
+Bkp/1Wy1TbMz4GHrXb7pmA8y1x1LPC5aAVKRCfLf6o3YBkBjqhHk/sM3nhRSP/TizPJhk9H9Z2vX
+Uq6/aKtAQ6BXNVN48FP4YUIHZMbXb5tMOA1jrGKvNouicwoN9SG9dKpN6nIDSdvHXx1iY8f93ZHs
+M+71bbRuMGjeyNYmsHVee7QHIJihdjK4TWxPAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wHQYD
+VR0OBBYEFMmAd+BikoL1RpzzuvdMw964o605MA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQsF
+AAOCAgEAU18h9bqwOlI5LJKwbADJ784g7wbylp7ppHR/ehb8t/W2+xUbP6umwHJdELFx7rxP462s
+A20ucS6vxOOto70MEae0/0qyexAQH6dXQbLArvQsWdZHEIjzIVEpMMpghq9Gqx3tOluwlN5E40EI
+osHsHdb9T7bWR9AUC8rmyrV7d35BH16Dx7aMOZawP5aBQW9gkOLo+fsicdl9sz1Gv7SEr5AcD48S
+aq/v7h56rgJKihcrdv6sVIkkLE8/trKnToyokZf7KcZ7XC25y2a2t6hbElGFtQl+Ynhw/qlqYLYd
+DnkM/crqJIByw5c/8nerQyIKx+u2DISCLIBrQYoIwOula9+ZEsuK1V6ADJHgJgg2SMX6OBE1/yWD
+LfJ6v9r9jv6ly0UsH8SIU653DtmadsWOLB2jutXsMq7Aqqz30XpN69QH4kj3Io6wpJ9qzo6ysmD0
+oyLQI+uUWnpp3Q+/QFesa1lQ2aOZ4W7+jQF5JyMV3pKdewlNWudLSDBaGOYKbeaP4NK75t98biGC
+wWg5TbSYWGZizEqQXsP6JwSxeRV0mcy+rSDeJmAc61ZRpqPq5KM/p/9h3PFaTWwyI0PurKju7koS
+CTxdccK+efrCh2gdC/1cacwG0Jp9VJkqyTkaGa9LKkPzY11aWOIv4x3kqdbQCtCev9eBCfHJxyYN
+rJgWVqA=
+-----END CERTIFICATE-----
+
+Buypass Class 3 Root CA
+=======================
+-----BEGIN CERTIFICATE-----
+MIIFWTCCA0GgAwIBAgIBAjANBgkqhkiG9w0BAQsFADBOMQswCQYDVQQGEwJOTzEdMBsGA1UECgwU
+QnV5cGFzcyBBUy05ODMxNjMzMjcxIDAeBgNVBAMMF0J1eXBhc3MgQ2xhc3MgMyBSb290IENBMB4X
+DTEwMTAyNjA4Mjg1OFoXDTQwMTAyNjA4Mjg1OFowTjELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1
+eXBhc3MgQVMtOTgzMTYzMzI3MSAwHgYDVQQDDBdCdXlwYXNzIENsYXNzIDMgUm9vdCBDQTCCAiIw
+DQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAKXaCpUWUOOV8l6ddjEGMnqb8RB2uACatVI2zSRH
+sJ8YZLya9vrVediQYkwiL944PdbgqOkcLNt4EemOaFEVcsfzM4fkoF0LXOBXByow9c3EN3coTRiR
+5r/VUv1xLXA+58bEiuPwKAv0dpihi4dVsjoT/Lc+JzeOIuOoTyrvYLs9tznDDgFHmV0ST9tD+leh
+7fmdvhFHJlsTmKtdFoqwNxxXnUX/iJY2v7vKB3tvh2PX0DJq1l1sDPGzbjniazEuOQAnFN44wOwZ
+ZoYS6J1yFhNkUsepNxz9gjDthBgd9K5c/3ATAOux9TN6S9ZV+AWNS2mw9bMoNlwUxFFzTWsL8TQH
+2xc519woe2v1n/MuwU8XKhDzzMro6/1rqy6any2CbgTUUgGTLT2G/H783+9CHaZr77kgxve9oKeV
+/afmiSTYzIw0bOIjL9kSGiG5VZFvC5F5GQytQIgLcOJ60g7YaEi7ghM5EFjp2CoHxhLbWNvSO1UQ
+RwUVZ2J+GGOmRj8JDlQyXr8NYnon74Do29lLBlo3WiXQCBJ31G8JUJc9yB3D34xFMFbG02SrZvPA
+Xpacw8Tvw3xrizp5f7NJzz3iiZ+gMEuFuZyUJHmPfWupRWgPK9Dx2hzLabjKSWJtyNBjYt1gD1iq
+j6G8BaVmos8bdrKEZLFMOVLAMLrwjEsCsLa3AgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wHQYD
+VR0OBBYEFEe4zf/lb+74suwvTg75JbCOPGvDMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQsF
+AAOCAgEAACAjQTUEkMJAYmDv4jVM1z+s4jSQuKFvdvoWFqRINyzpkMLyPPgKn9iB5btb2iUspKdV
+cSQy9sgL8rxq+JOssgfCX5/bzMiKqr5qb+FJEMwx14C7u8jYog5kV+qi9cKpMRXSIGrs/CIBKM+G
+uIAeqcwRpTzyFrNHnfzSgCHEy9BHcEGhyoMZCCxt8l13nIoUE9Q2HJLw5QY33KbmkJs4j1xrG0aG
+Q0JfPgEHU1RdZX33inOhmlRaHylDFCfChQ+1iHsaO5S3HWCntZznKWlXWpuTekMwGwPXYshApqr8
+ZORK15FTAaggiG6cX0S5y2CBNOxv033aSF/rtJC8LakcC6wc1aJoIIAE1vyxjy+7SjENSoYc6+I2
+KSb12tjE8nVhz36udmNKekBlk4f4HoCMhuWG1o8O/FMsYOgWYRqiPkN7zTlgVGr18okmAWiDSKIz
+6MkEkbIRNBE+6tBDGR8Dk5AM/1E9V/RBbuHLoL7ryWPNbczk+DaqaJ3tvV2XcEQNtg413OEMXbug
+UZTLfhbrES+jkkXITHHZvMmZUldGL1DPvTVp9D0VzgalLA8+9oG6lLvDu79leNKGef9JOxqDDPDe
+eOzI8k1MGt6CKfjBWtrt7uYnXuhF0J0cUahoq0Tj0Itq4/g7u9xN12TyUb7mqqta6THuBrxzvxNi
+Cp/HuZc=
+-----END CERTIFICATE-----
+
+T-TeleSec GlobalRoot Class 3
+============================
+-----BEGIN CERTIFICATE-----
+MIIDwzCCAqugAwIBAgIBATANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UEBhMCREUxKzApBgNVBAoM
+IlQtU3lzdGVtcyBFbnRlcnByaXNlIFNlcnZpY2VzIEdtYkgxHzAdBgNVBAsMFlQtU3lzdGVtcyBU
+cnVzdCBDZW50ZXIxJTAjBgNVBAMMHFQtVGVsZVNlYyBHbG9iYWxSb290IENsYXNzIDMwHhcNMDgx
+MDAxMTAyOTU2WhcNMzMxMDAxMjM1OTU5WjCBgjELMAkGA1UEBhMCREUxKzApBgNVBAoMIlQtU3lz
+dGVtcyBFbnRlcnByaXNlIFNlcnZpY2VzIEdtYkgxHzAdBgNVBAsMFlQtU3lzdGVtcyBUcnVzdCBD
+ZW50ZXIxJTAjBgNVBAMMHFQtVGVsZVNlYyBHbG9iYWxSb290IENsYXNzIDMwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQC9dZPwYiJvJK7genasfb3ZJNW4t/zN8ELg63iIVl6bmlQdTQyK
+9tPPcPRStdiTBONGhnFBSivwKixVA9ZIw+A5OO3yXDw/RLyTPWGrTs0NvvAgJ1gORH8EGoel15YU
+NpDQSXuhdfsaa3Ox+M6pCSzyU9XDFES4hqX2iys52qMzVNn6chr3IhUciJFrf2blw2qAsCTz34ZF
+iP0Zf3WHHx+xGwpzJFu5ZeAsVMhg02YXP+HMVDNzkQI6pn97djmiH5a2OK61yJN0HZ65tOVgnS9W
+0eDrXltMEnAMbEQgqxHY9Bn20pxSN+f6tsIxO0rUFJmtxxr1XV/6B7h8DR/Wgx6zAgMBAAGjQjBA
+MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBS1A/d2O2GCahKqGFPr
+AyGUv/7OyjANBgkqhkiG9w0BAQsFAAOCAQEAVj3vlNW92nOyWL6ukK2YJ5f+AbGwUgC4TeQbIXQb
+fsDuXmkqJa9c1h3a0nnJ85cp4IaH3gRZD/FZ1GSFS5mvJQQeyUapl96Cshtwn5z2r3Ex3XsFpSzT
+ucpH9sry9uetuUg/vBa3wW306gmv7PO15wWeph6KU1HWk4HMdJP2udqmJQV0eVp+QD6CSyYRMG7h
+P0HHRwA11fXT91Q+gT3aSWqas+8QPebrb9HIIkfLzM8BMZLZGOMivgkeGj5asuRrDFR6fUNOuIml
+e9eiPZaGzPImNC1qkp2aGtAw4l1OBLBfiyB+d8E9lYLRRpo7PHi4b6HQDWSieB4pTpPDpFQUWw==
+-----END CERTIFICATE-----
+
+D-TRUST Root Class 3 CA 2 2009
+==============================
+-----BEGIN CERTIFICATE-----
+MIIEMzCCAxugAwIBAgIDCYPzMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNVBAYTAkRFMRUwEwYDVQQK
+DAxELVRydXN0IEdtYkgxJzAlBgNVBAMMHkQtVFJVU1QgUm9vdCBDbGFzcyAzIENBIDIgMjAwOTAe
+Fw0wOTExMDUwODM1NThaFw0yOTExMDUwODM1NThaME0xCzAJBgNVBAYTAkRFMRUwEwYDVQQKDAxE
+LVRydXN0IEdtYkgxJzAlBgNVBAMMHkQtVFJVU1QgUm9vdCBDbGFzcyAzIENBIDIgMjAwOTCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANOySs96R+91myP6Oi/WUEWJNTrGa9v+2wBoqOAD
+ER03UAifTUpolDWzU9GUY6cgVq/eUXjsKj3zSEhQPgrfRlWLJ23DEE0NkVJD2IfgXU42tSHKXzlA
+BF9bfsyjxiupQB7ZNoTWSPOSHjRGICTBpFGOShrvUD9pXRl/RcPHAY9RySPocq60vFYJfxLLHLGv
+KZAKyVXMD9O0Gu1HNVpK7ZxzBCHQqr0ME7UAyiZsxGsMlFqVlNpQmvH/pStmMaTJOKDfHR+4CS7z
+p+hnUquVH+BGPtikw8paxTGA6Eian5Rp/hnd2HN8gcqW3o7tszIFZYQ05ub9VxC1X3a/L7AQDcUC
+AwEAAaOCARowggEWMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFP3aFMSfMN4hvR5COfyrYyNJ
+4PGEMA4GA1UdDwEB/wQEAwIBBjCB0wYDVR0fBIHLMIHIMIGAoH6gfIZ6bGRhcDovL2RpcmVjdG9y
+eS5kLXRydXN0Lm5ldC9DTj1ELVRSVVNUJTIwUm9vdCUyMENsYXNzJTIwMyUyMENBJTIwMiUyMDIw
+MDksTz1ELVRydXN0JTIwR21iSCxDPURFP2NlcnRpZmljYXRlcmV2b2NhdGlvbmxpc3QwQ6BBoD+G
+PWh0dHA6Ly93d3cuZC10cnVzdC5uZXQvY3JsL2QtdHJ1c3Rfcm9vdF9jbGFzc18zX2NhXzJfMjAw
+OS5jcmwwDQYJKoZIhvcNAQELBQADggEBAH+X2zDI36ScfSF6gHDOFBJpiBSVYEQBrLLpME+bUMJm
+2H6NMLVwMeniacfzcNsgFYbQDfC+rAF1hM5+n02/t2A7nPPKHeJeaNijnZflQGDSNiH+0LS4F9p0
+o3/U37CYAqxva2ssJSRyoWXuJVrl5jLn8t+rSfrzkGkj2wTZ51xY/GXUl77M/C4KzCUqNQT4YJEV
+dT1B/yMfGchs64JTBKbkTCJNjYy6zltz7GRUUG3RnFX7acM2w4y8PIWmawomDeCTmGCufsYkl4ph
+X5GOZpIJhzbNi5stPvZR1FDUWSi9g/LMKHtThm3YJohw1+qRzT65ysCQblrGXnRl11z+o+I=
+-----END CERTIFICATE-----
+
+D-TRUST Root Class 3 CA 2 EV 2009
+=================================
+-----BEGIN CERTIFICATE-----
+MIIEQzCCAyugAwIBAgIDCYP0MA0GCSqGSIb3DQEBCwUAMFAxCzAJBgNVBAYTAkRFMRUwEwYDVQQK
+DAxELVRydXN0IEdtYkgxKjAoBgNVBAMMIUQtVFJVU1QgUm9vdCBDbGFzcyAzIENBIDIgRVYgMjAw
+OTAeFw0wOTExMDUwODUwNDZaFw0yOTExMDUwODUwNDZaMFAxCzAJBgNVBAYTAkRFMRUwEwYDVQQK
+DAxELVRydXN0IEdtYkgxKjAoBgNVBAMMIUQtVFJVU1QgUm9vdCBDbGFzcyAzIENBIDIgRVYgMjAw
+OTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJnxhDRwui+3MKCOvXwEz75ivJn9gpfS
+egpnljgJ9hBOlSJzmY3aFS3nBfwZcyK3jpgAvDw9rKFs+9Z5JUut8Mxk2og+KbgPCdM03TP1YtHh
+zRnp7hhPTFiu4h7WDFsVWtg6uMQYZB7jM7K1iXdODL/ZlGsTl28So/6ZqQTMFexgaDbtCHu39b+T
+7WYxg4zGcTSHThfqr4uRjRxWQa4iN1438h3Z0S0NL2lRp75mpoo6Kr3HGrHhFPC+Oh25z1uxav60
+sUYgovseO3Dvk5h9jHOW8sXvhXCtKSb8HgQ+HKDYD8tSg2J87otTlZCpV6LqYQXY+U3EJ/pure35
+11H3a6UCAwEAAaOCASQwggEgMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFNOUikxiEyoZLsyv
+cop9NteaHNxnMA4GA1UdDwEB/wQEAwIBBjCB3QYDVR0fBIHVMIHSMIGHoIGEoIGBhn9sZGFwOi8v
+ZGlyZWN0b3J5LmQtdHJ1c3QubmV0L0NOPUQtVFJVU1QlMjBSb290JTIwQ2xhc3MlMjAzJTIwQ0El
+MjAyJTIwRVYlMjAyMDA5LE89RC1UcnVzdCUyMEdtYkgsQz1ERT9jZXJ0aWZpY2F0ZXJldm9jYXRp
+b25saXN0MEagRKBChkBodHRwOi8vd3d3LmQtdHJ1c3QubmV0L2NybC9kLXRydXN0X3Jvb3RfY2xh
+c3NfM19jYV8yX2V2XzIwMDkuY3JsMA0GCSqGSIb3DQEBCwUAA4IBAQA07XtaPKSUiO8aEXUHL7P+
+PPoeUSbrh/Yp3uDx1MYkCenBz1UbtDDZzhr+BlGmFaQt77JLvyAoJUnRpjZ3NOhk31KxEcdzes05
+nsKtjHEh8lprr988TlWvsoRlFIm5d8sqMb7Po23Pb0iUMkZv53GMoKaEGTcH8gNFCSuGdXzfX2lX
+ANtu2KZyIktQ1HWYVt+3GP9DQ1CuekR78HlR10M9p9OB0/DJT7naxpeG0ILD5EJt/rDiZE4OJudA
+NCa1CInXCGNjOCd1HjPqbqjdn5lPdE2BiYBL3ZqXKVwvvoFBuYz/6n1gBp7N1z3TLqMVvKjmJuVv
+w9y4AyHqnxbxLFS1
+-----END CERTIFICATE-----
+
+CA Disig Root R2
+================
+-----BEGIN CERTIFICATE-----
+MIIFaTCCA1GgAwIBAgIJAJK4iNuwisFjMA0GCSqGSIb3DQEBCwUAMFIxCzAJBgNVBAYTAlNLMRMw
+EQYDVQQHEwpCcmF0aXNsYXZhMRMwEQYDVQQKEwpEaXNpZyBhLnMuMRkwFwYDVQQDExBDQSBEaXNp
+ZyBSb290IFIyMB4XDTEyMDcxOTA5MTUzMFoXDTQyMDcxOTA5MTUzMFowUjELMAkGA1UEBhMCU0sx
+EzARBgNVBAcTCkJyYXRpc2xhdmExEzARBgNVBAoTCkRpc2lnIGEucy4xGTAXBgNVBAMTEENBIERp
+c2lnIFJvb3QgUjIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCio8QACdaFXS1tFPbC
+w3OeNcJxVX6B+6tGUODBfEl45qt5WDza/3wcn9iXAng+a0EE6UG9vgMsRfYvZNSrXaNHPWSb6Wia
+xswbP7q+sos0Ai6YVRn8jG+qX9pMzk0DIaPY0jSTVpbLTAwAFjxfGs3Ix2ymrdMxp7zo5eFm1tL7
+A7RBZckQrg4FY8aAamkw/dLukO8NJ9+flXP04SXabBbeQTg06ov80egEFGEtQX6sx3dOy1FU+16S
+GBsEWmjGycT6txOgmLcRK7fWV8x8nhfRyyX+hk4kLlYMeE2eARKmK6cBZW58Yh2EhN/qwGu1pSqV
+g8NTEQxzHQuyRpDRQjrOQG6Vrf/GlK1ul4SOfW+eioANSW1z4nuSHsPzwfPrLgVv2RvPN3YEyLRa
+5Beny912H9AZdugsBbPWnDTYltxhh5EF5EQIM8HauQhl1K6yNg3ruji6DOWbnuuNZt2Zz9aJQfYE
+koopKW1rOhzndX0CcQ7zwOe9yxndnWCywmZgtrEE7snmhrmaZkCo5xHtgUUDi/ZnWejBBhG93c+A
+Ak9lQHhcR1DIm+YfgXvkRKhbhZri3lrVx/k6RGZL5DJUfORsnLMOPReisjQS1n6yqEm70XooQL6i
+Fh/f5DcfEXP7kAplQ6INfPgGAVUzfbANuPT1rqVCV3w2EYx7XsQDnYx5nQIDAQABo0IwQDAPBgNV
+HRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUtZn4r7CU9eMg1gqtzk5WpC5u
+Qu0wDQYJKoZIhvcNAQELBQADggIBACYGXnDnZTPIgm7ZnBc6G3pmsgH2eDtpXi/q/075KMOYKmFM
+tCQSin1tERT3nLXK5ryeJ45MGcipvXrA1zYObYVybqjGom32+nNjf7xueQgcnYqfGopTpti72TVV
+sRHFqQOzVju5hJMiXn7B9hJSi+osZ7z+Nkz1uM/Rs0mSO9MpDpkblvdhuDvEK7Z4bLQjb/D907Je
+dR+Zlais9trhxTF7+9FGs9K8Z7RiVLoJ92Owk6Ka+elSLotgEqv89WBW7xBci8QaQtyDW2QOy7W8
+1k/BfDxujRNt+3vrMNDcTa/F1balTFtxyegxvug4BkihGuLq0t4SOVga/4AOgnXmt8kHbA7v/zjx
+mHHEt38OFdAlab0inSvtBfZGR6ztwPDUO+Ls7pZbkBNOHlY667DvlruWIxG68kOGdGSVyCh13x01
+utI3gzhTODY7z2zp+WsO0PsE6E9312UBeIYMej4hYvF/Y3EMyZ9E26gnonW+boE+18DrG5gPcFw0
+sorMwIUY6256s/daoQe/qUKS82Ail+QUoQebTnbAjn39pCXHR+3/H3OszMOl6W8KjptlwlCFtaOg
+UxLMVYdh84GuEEZhvUQhuMI9dM9+JDX6HAcOmz0iyu8xL4ysEr3vQCj8KWefshNPZiTEUxnpHikV
+7+ZtsH8tZ/3zbBt1RqPlShfppNcL
+-----END CERTIFICATE-----
+
+ACCVRAIZ1
+=========
+-----BEGIN CERTIFICATE-----
+MIIH0zCCBbugAwIBAgIIXsO3pkN/pOAwDQYJKoZIhvcNAQEFBQAwQjESMBAGA1UEAwwJQUNDVlJB
+SVoxMRAwDgYDVQQLDAdQS0lBQ0NWMQ0wCwYDVQQKDARBQ0NWMQswCQYDVQQGEwJFUzAeFw0xMTA1
+MDUwOTM3MzdaFw0zMDEyMzEwOTM3MzdaMEIxEjAQBgNVBAMMCUFDQ1ZSQUlaMTEQMA4GA1UECwwH
+UEtJQUNDVjENMAsGA1UECgwEQUNDVjELMAkGA1UEBhMCRVMwggIiMA0GCSqGSIb3DQEBAQUAA4IC
+DwAwggIKAoICAQCbqau/YUqXry+XZpp0X9DZlv3P4uRm7x8fRzPCRKPfmt4ftVTdFXxpNRFvu8gM
+jmoYHtiP2Ra8EEg2XPBjs5BaXCQ316PWywlxufEBcoSwfdtNgM3802/J+Nq2DoLSRYWoG2ioPej0
+RGy9ocLLA76MPhMAhN9KSMDjIgro6TenGEyxCQ0jVn8ETdkXhBilyNpAlHPrzg5XPAOBOp0KoVdD
+aaxXbXmQeOW1tDvYvEyNKKGno6e6Ak4l0Squ7a4DIrhrIA8wKFSVf+DuzgpmndFALW4ir50awQUZ
+0m/A8p/4e7MCQvtQqR0tkw8jq8bBD5L/0KIV9VMJcRz/RROE5iZe+OCIHAr8Fraocwa48GOEAqDG
+WuzndN9wrqODJerWx5eHk6fGioozl2A3ED6XPm4pFdahD9GILBKfb6qkxkLrQaLjlUPTAYVtjrs7
+8yM2x/474KElB0iryYl0/wiPgL/AlmXz7uxLaL2diMMxs0Dx6M/2OLuc5NF/1OVYm3z61PMOm3WR
+5LpSLhl+0fXNWhn8ugb2+1KoS5kE3fj5tItQo05iifCHJPqDQsGH+tUtKSpacXpkatcnYGMN285J
+9Y0fkIkyF/hzQ7jSWpOGYdbhdQrqeWZ2iE9x6wQl1gpaepPluUsXQA+xtrn13k/c4LOsOxFwYIRK
+Q26ZIMApcQrAZQIDAQABo4ICyzCCAscwfQYIKwYBBQUHAQEEcTBvMEwGCCsGAQUFBzAChkBodHRw
+Oi8vd3d3LmFjY3YuZXMvZmlsZWFkbWluL0FyY2hpdm9zL2NlcnRpZmljYWRvcy9yYWl6YWNjdjEu
+Y3J0MB8GCCsGAQUFBzABhhNodHRwOi8vb2NzcC5hY2N2LmVzMB0GA1UdDgQWBBTSh7Tj3zcnk1X2
+VuqB5TbMjB4/vTAPBgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFNKHtOPfNyeTVfZW6oHlNsyM
+Hj+9MIIBcwYDVR0gBIIBajCCAWYwggFiBgRVHSAAMIIBWDCCASIGCCsGAQUFBwICMIIBFB6CARAA
+QQB1AHQAbwByAGkAZABhAGQAIABkAGUAIABDAGUAcgB0AGkAZgBpAGMAYQBjAGkA8wBuACAAUgBh
+AO0AegAgAGQAZQAgAGwAYQAgAEEAQwBDAFYAIAAoAEEAZwBlAG4AYwBpAGEAIABkAGUAIABUAGUA
+YwBuAG8AbABvAGcA7QBhACAAeQAgAEMAZQByAHQAaQBmAGkAYwBhAGMAaQDzAG4AIABFAGwAZQBj
+AHQAcgDzAG4AaQBjAGEALAAgAEMASQBGACAAUQA0ADYAMAAxADEANQA2AEUAKQAuACAAQwBQAFMA
+IABlAG4AIABoAHQAdABwADoALwAvAHcAdwB3AC4AYQBjAGMAdgAuAGUAczAwBggrBgEFBQcCARYk
+aHR0cDovL3d3dy5hY2N2LmVzL2xlZ2lzbGFjaW9uX2MuaHRtMFUGA1UdHwROMEwwSqBIoEaGRGh0
+dHA6Ly93d3cuYWNjdi5lcy9maWxlYWRtaW4vQXJjaGl2b3MvY2VydGlmaWNhZG9zL3JhaXphY2N2
+MV9kZXIuY3JsMA4GA1UdDwEB/wQEAwIBBjAXBgNVHREEEDAOgQxhY2N2QGFjY3YuZXMwDQYJKoZI
+hvcNAQEFBQADggIBAJcxAp/n/UNnSEQU5CmH7UwoZtCPNdpNYbdKl02125DgBS4OxnnQ8pdpD70E
+R9m+27Up2pvZrqmZ1dM8MJP1jaGo/AaNRPTKFpV8M9xii6g3+CfYCS0b78gUJyCpZET/LtZ1qmxN
+YEAZSUNUY9rizLpm5U9EelvZaoErQNV/+QEnWCzI7UiRfD+mAM/EKXMRNt6GGT6d7hmKG9Ww7Y49
+nCrADdg9ZuM8Db3VlFzi4qc1GwQA9j9ajepDvV+JHanBsMyZ4k0ACtrJJ1vnE5Bc5PUzolVt3OAJ
+TS+xJlsndQAJxGJ3KQhfnlmstn6tn1QwIgPBHnFk/vk4CpYY3QIUrCPLBhwepH2NDd4nQeit2hW3
+sCPdK6jT2iWH7ehVRE2I9DZ+hJp4rPcOVkkO1jMl1oRQQmwgEh0q1b688nCBpHBgvgW1m54ERL5h
+I6zppSSMEYCUWqKiuUnSwdzRp+0xESyeGabu4VXhwOrPDYTkF7eifKXeVSUG7szAh1xA2syVP1Xg
+Nce4hL60Xc16gwFy7ofmXx2utYXGJt/mwZrpHgJHnyqobalbz+xFd3+YJ5oyXSrjhO7FmGYvliAd
+3djDJ9ew+f7Zfc3Qn48LFFhRny+Lwzgt3uiP1o2HpPVWQxaZLPSkVrQ0uGE3ycJYgBugl6H8WY3p
+EfbRD0tVNEYqi4Y7
+-----END CERTIFICATE-----
+
+TWCA Global Root CA
+===================
+-----BEGIN CERTIFICATE-----
+MIIFQTCCAymgAwIBAgICDL4wDQYJKoZIhvcNAQELBQAwUTELMAkGA1UEBhMCVFcxEjAQBgNVBAoT
+CVRBSVdBTi1DQTEQMA4GA1UECxMHUm9vdCBDQTEcMBoGA1UEAxMTVFdDQSBHbG9iYWwgUm9vdCBD
+QTAeFw0xMjA2MjcwNjI4MzNaFw0zMDEyMzExNTU5NTlaMFExCzAJBgNVBAYTAlRXMRIwEAYDVQQK
+EwlUQUlXQU4tQ0ExEDAOBgNVBAsTB1Jvb3QgQ0ExHDAaBgNVBAMTE1RXQ0EgR2xvYmFsIFJvb3Qg
+Q0EwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCwBdvI64zEbooh745NnHEKH1Jw7W2C
+nJfF10xORUnLQEK1EjRsGcJ0pDFfhQKX7EMzClPSnIyOt7h52yvVavKOZsTuKwEHktSz0ALfUPZV
+r2YOy+BHYC8rMjk1Ujoog/h7FsYYuGLWRyWRzvAZEk2tY/XTP3VfKfChMBwqoJimFb3u/Rk28OKR
+Q4/6ytYQJ0lM793B8YVwm8rqqFpD/G2Gb3PpN0Wp8DbHzIh1HrtsBv+baz4X7GGqcXzGHaL3SekV
+tTzWoWH1EfcFbx39Eb7QMAfCKbAJTibc46KokWofwpFFiFzlmLhxpRUZyXx1EcxwdE8tmx2RRP1W
+KKD+u4ZqyPpcC1jcxkt2yKsi2XMPpfRaAok/T54igu6idFMqPVMnaR1sjjIsZAAmY2E2TqNGtz99
+sy2sbZCilaLOz9qC5wc0GZbpuCGqKX6mOL6OKUohZnkfs8O1CWfe1tQHRvMq2uYiN2DLgbYPoA/p
+yJV/v1WRBXrPPRXAb94JlAGD1zQbzECl8LibZ9WYkTunhHiVJqRaCPgrdLQABDzfuBSO6N+pjWxn
+kjMdwLfS7JLIvgm/LCkFbwJrnu+8vyq8W8BQj0FwcYeyTbcEqYSjMq+u7msXi7Kx/mzhkIyIqJdI
+zshNy/MGz19qCkKxHh53L46g5pIOBvwFItIm4TFRfTLcDwIDAQABoyMwITAOBgNVHQ8BAf8EBAMC
+AQYwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAgEAXzSBdu+WHdXltdkCY4QWwa6g
+cFGn90xHNcgL1yg9iXHZqjNB6hQbbCEAwGxCGX6faVsgQt+i0trEfJdLjbDorMjupWkEmQqSpqsn
+LhpNgb+E1HAerUf+/UqdM+DyucRFCCEK2mlpc3INvjT+lIutwx4116KD7+U4x6WFH6vPNOw/KP4M
+8VeGTslV9xzU2KV9Bnpv1d8Q34FOIWWxtuEXeZVFBs5fzNxGiWNoRI2T9GRwoD2dKAXDOXC4Ynsg
+/eTb6QihuJ49CcdP+yz4k3ZB3lLg4VfSnQO8d57+nile98FRYB/e2guyLXW3Q0iT5/Z5xoRdgFlg
+lPx4mI88k1HtQJAH32RjJMtOcQWh15QaiDLxInQirqWm2BJpTGCjAu4r7NRjkgtevi92a6O2JryP
+A9gK8kxkRr05YuWW6zRjESjMlfGt7+/cgFhI6Uu46mWs6fyAtbXIRfmswZ/ZuepiiI7E8UuDEq3m
+i4TWnsLrgxifarsbJGAzcMzs9zLzXNl5fe+epP7JI8Mk7hWSsT2RTyaGvWZzJBPqpK5jwa19hAM8
+EHiGG3njxPPyBJUgriOCxLM6AGK/5jYk4Ve6xx6QddVfP5VhK8E7zeWzaGHQRiapIVJpLesux+t3
+zqY6tQMzT3bR51xUAV3LePTJDL/PEo4XLSNolOer/qmyKwbQBM0=
+-----END CERTIFICATE-----
+
+T-TeleSec GlobalRoot Class 2
+============================
+-----BEGIN CERTIFICATE-----
+MIIDwzCCAqugAwIBAgIBATANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UEBhMCREUxKzApBgNVBAoM
+IlQtU3lzdGVtcyBFbnRlcnByaXNlIFNlcnZpY2VzIEdtYkgxHzAdBgNVBAsMFlQtU3lzdGVtcyBU
+cnVzdCBDZW50ZXIxJTAjBgNVBAMMHFQtVGVsZVNlYyBHbG9iYWxSb290IENsYXNzIDIwHhcNMDgx
+MDAxMTA0MDE0WhcNMzMxMDAxMjM1OTU5WjCBgjELMAkGA1UEBhMCREUxKzApBgNVBAoMIlQtU3lz
+dGVtcyBFbnRlcnByaXNlIFNlcnZpY2VzIEdtYkgxHzAdBgNVBAsMFlQtU3lzdGVtcyBUcnVzdCBD
+ZW50ZXIxJTAjBgNVBAMMHFQtVGVsZVNlYyBHbG9iYWxSb290IENsYXNzIDIwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQCqX9obX+hzkeXaXPSi5kfl82hVYAUdAqSzm1nzHoqvNK38DcLZ
+SBnuaY/JIPwhqgcZ7bBcrGXHX+0CfHt8LRvWurmAwhiCFoT6ZrAIxlQjgeTNuUk/9k9uN0goOA/F
+vudocP05l03Sx5iRUKrERLMjfTlH6VJi1hKTXrcxlkIF+3anHqP1wvzpesVsqXFP6st4vGCvx970
+2cu+fjOlbpSD8DT6IavqjnKgP6TeMFvvhk1qlVtDRKgQFRzlAVfFmPHmBiiRqiDFt1MmUUOyCxGV
+WOHAD3bZwI18gfNycJ5v/hqO2V81xrJvNHy+SE/iWjnX2J14np+GPgNeGYtEotXHAgMBAAGjQjBA
+MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBS/WSA2AHmgoCJrjNXy
+YdK4LMuCSjANBgkqhkiG9w0BAQsFAAOCAQEAMQOiYQsfdOhyNsZt+U2e+iKo4YFWz827n+qrkRk4
+r6p8FU3ztqONpfSO9kSpp+ghla0+AGIWiPACuvxhI+YzmzB6azZie60EI4RYZeLbK4rnJVM3YlNf
+vNoBYimipidx5joifsFvHZVwIEoHNN/q/xWA5brXethbdXwFeilHfkCoMRN3zUA7tFFHei4R40cR
+3p1m0IvVVGb6g1XqfMIpiRvpb7PO4gWEyS8+eIVibslfwXhjdFjASBgMmTnrpMwatXlajRWc2BQN
+9noHV8cigwUtPJslJj0Ys6lDfMjIq2SPDqO/nBudMNva0Bkuqjzx+zOAduTNrRlPBSeOE6Fuwg==
+-----END CERTIFICATE-----
+
+QuoVadis Root CA 1 G3
+=====================
+-----BEGIN CERTIFICATE-----
+MIIFYDCCA0igAwIBAgIUeFhfLq0sGUvjNwc1NBMotZbUZZMwDQYJKoZIhvcNAQELBQAwSDELMAkG
+A1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHjAcBgNVBAMTFVF1b1ZhZGlzIFJv
+b3QgQ0EgMSBHMzAeFw0xMjAxMTIxNzI3NDRaFw00MjAxMTIxNzI3NDRaMEgxCzAJBgNVBAYTAkJN
+MRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMR4wHAYDVQQDExVRdW9WYWRpcyBSb290IENBIDEg
+RzMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCgvlAQjunybEC0BJyFuTHK3C3kEakE
+PBtVwedYMB0ktMPvhd6MLOHBPd+C5k+tR4ds7FtJwUrVu4/sh6x/gpqG7D0DmVIB0jWerNrwU8lm
+PNSsAgHaJNM7qAJGr6Qc4/hzWHa39g6QDbXwz8z6+cZM5cOGMAqNF34168Xfuw6cwI2H44g4hWf6
+Pser4BOcBRiYz5P1sZK0/CPTz9XEJ0ngnjybCKOLXSoh4Pw5qlPafX7PGglTvF0FBM+hSo+LdoIN
+ofjSxxR3W5A2B4GbPgb6Ul5jxaYA/qXpUhtStZI5cgMJYr2wYBZupt0lwgNm3fME0UDiTouG9G/l
+g6AnhF4EwfWQvTA9xO+oabw4m6SkltFi2mnAAZauy8RRNOoMqv8hjlmPSlzkYZqn0ukqeI1RPToV
+7qJZjqlc3sX5kCLliEVx3ZGZbHqfPT2YfF72vhZooF6uCyP8Wg+qInYtyaEQHeTTRCOQiJ/GKubX
+9ZqzWB4vMIkIG1SitZgj7Ah3HJVdYdHLiZxfokqRmu8hqkkWCKi9YSgxyXSthfbZxbGL0eUQMk1f
+iyA6PEkfM4VZDdvLCXVDaXP7a3F98N/ETH3Goy7IlXnLc6KOTk0k+17kBL5yG6YnLUlamXrXXAkg
+t3+UuU/xDRxeiEIbEbfnkduebPRq34wGmAOtzCjvpUfzUwIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
+AQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUo5fW816iEOGrRZ88F2Q87gFwnMwwDQYJKoZI
+hvcNAQELBQADggIBABj6W3X8PnrHX3fHyt/PX8MSxEBd1DKquGrX1RUVRpgjpeaQWxiZTOOtQqOC
+MTaIzen7xASWSIsBx40Bz1szBpZGZnQdT+3Btrm0DWHMY37XLneMlhwqI2hrhVd2cDMT/uFPpiN3
+GPoajOi9ZcnPP/TJF9zrx7zABC4tRi9pZsMbj/7sPtPKlL92CiUNqXsCHKnQO18LwIE6PWThv6ct
+Tr1NxNgpxiIY0MWscgKCP6o6ojoilzHdCGPDdRS5YCgtW2jgFqlmgiNR9etT2DGbe+m3nUvriBbP
++V04ikkwj+3x6xn0dxoxGE1nVGwvb2X52z3sIexe9PSLymBlVNFxZPT5pqOBMzYzcfCkeF9OrYMh
+3jRJjehZrJ3ydlo28hP0r+AJx2EqbPfgna67hkooby7utHnNkDPDs3b69fBsnQGQ+p6Q9pxyz0fa
+wx/kNSBT8lTR32GDpgLiJTjehTItXnOQUl1CxM49S+H5GYQd1aJQzEH7QRTDvdbJWqNjZgKAvQU6
+O0ec7AAmTPWIUb+oI38YB7AL7YsmoWTTYUrrXJ/es69nA7Mf3W1daWhpq1467HxpvMc7hU6eFbm0
+FU/DlXpY18ls6Wy58yljXrQs8C097Vpl4KlbQMJImYFtnh8GKjwStIsPm6Ik8KaN1nrgS7ZklmOV
+hMJKzRwuJIczYOXD
+-----END CERTIFICATE-----
+
+QuoVadis Root CA 2 G3
+=====================
+-----BEGIN CERTIFICATE-----
+MIIFYDCCA0igAwIBAgIURFc0JFuBiZs18s64KztbpybwdSgwDQYJKoZIhvcNAQELBQAwSDELMAkG
+A1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHjAcBgNVBAMTFVF1b1ZhZGlzIFJv
+b3QgQ0EgMiBHMzAeFw0xMjAxMTIxODU5MzJaFw00MjAxMTIxODU5MzJaMEgxCzAJBgNVBAYTAkJN
+MRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMR4wHAYDVQQDExVRdW9WYWRpcyBSb290IENBIDIg
+RzMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQChriWyARjcV4g/Ruv5r+LrI3HimtFh
+ZiFfqq8nUeVuGxbULX1QsFN3vXg6YOJkApt8hpvWGo6t/x8Vf9WVHhLL5hSEBMHfNrMWn4rjyduY
+NM7YMxcoRvynyfDStNVNCXJJ+fKH46nafaF9a7I6JaltUkSs+L5u+9ymc5GQYaYDFCDy54ejiK2t
+oIz/pgslUiXnFgHVy7g1gQyjO/Dh4fxaXc6AcW34Sas+O7q414AB+6XrW7PFXmAqMaCvN+ggOp+o
+MiwMzAkd056OXbxMmO7FGmh77FOm6RQ1o9/NgJ8MSPsc9PG/Srj61YxxSscfrf5BmrODXfKEVu+l
+V0POKa2Mq1W/xPtbAd0jIaFYAI7D0GoT7RPjEiuA3GfmlbLNHiJuKvhB1PLKFAeNilUSxmn1uIZo
+L1NesNKqIcGY5jDjZ1XHm26sGahVpkUG0CM62+tlXSoREfA7T8pt9DTEceT/AFr2XK4jYIVz8eQQ
+sSWu1ZK7E8EM4DnatDlXtas1qnIhO4M15zHfeiFuuDIIfR0ykRVKYnLP43ehvNURG3YBZwjgQQvD
+6xVu+KQZ2aKrr+InUlYrAoosFCT5v0ICvybIxo/gbjh9Uy3l7ZizlWNof/k19N+IxWA1ksB8aRxh
+lRbQ694Lrz4EEEVlWFA4r0jyWbYW8jwNkALGcC4BrTwV1wIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
+AQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU7edvdlq/YOxJW8ald7tyFnGbxD0wDQYJKoZI
+hvcNAQELBQADggIBAJHfgD9DCX5xwvfrs4iP4VGyvD11+ShdyLyZm3tdquXK4Qr36LLTn91nMX66
+AarHakE7kNQIXLJgapDwyM4DYvmL7ftuKtwGTTwpD4kWilhMSA/ohGHqPHKmd+RCroijQ1h5fq7K
+pVMNqT1wvSAZYaRsOPxDMuHBR//47PERIjKWnML2W2mWeyAMQ0GaW/ZZGYjeVYg3UQt4XAoeo0L9
+x52ID8DyeAIkVJOviYeIyUqAHerQbj5hLja7NQ4nlv1mNDthcnPxFlxHBlRJAHpYErAK74X9sbgz
+dWqTHBLmYF5vHX/JHyPLhGGfHoJE+V+tYlUkmlKY7VHnoX6XOuYvHxHaU4AshZ6rNRDbIl9qxV6X
+U/IyAgkwo1jwDQHVcsaxfGl7w/U2Rcxhbl5MlMVerugOXou/983g7aEOGzPuVBj+D77vfoRrQ+Nw
+mNtddbINWQeFFSM51vHfqSYP1kjHs6Yi9TM3WpVHn3u6GBVv/9YUZINJ0gpnIdsPNWNgKCLjsZWD
+zYWm3S8P52dSbrsvhXz1SnPnxT7AvSESBT/8twNJAlvIJebiVDj1eYeMHVOyToV7BjjHLPj4sHKN
+JeV3UvQDHEimUF+IIDBu8oJDqz2XhOdT+yHBTw8imoa4WSr2Rz0ZiC3oheGe7IUIarFsNMkd7Egr
+O3jtZsSOeWmD3n+M
+-----END CERTIFICATE-----
+
+QuoVadis Root CA 3 G3
+=====================
+-----BEGIN CERTIFICATE-----
+MIIFYDCCA0igAwIBAgIULvWbAiin23r/1aOp7r0DoM8Sah0wDQYJKoZIhvcNAQELBQAwSDELMAkG
+A1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHjAcBgNVBAMTFVF1b1ZhZGlzIFJv
+b3QgQ0EgMyBHMzAeFw0xMjAxMTIyMDI2MzJaFw00MjAxMTIyMDI2MzJaMEgxCzAJBgNVBAYTAkJN
+MRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMR4wHAYDVQQDExVRdW9WYWRpcyBSb290IENBIDMg
+RzMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCzyw4QZ47qFJenMioKVjZ/aEzHs286
+IxSR/xl/pcqs7rN2nXrpixurazHb+gtTTK/FpRp5PIpM/6zfJd5O2YIyC0TeytuMrKNuFoM7pmRL
+Mon7FhY4futD4tN0SsJiCnMK3UmzV9KwCoWdcTzeo8vAMvMBOSBDGzXRU7Ox7sWTaYI+FrUoRqHe
+6okJ7UO4BUaKhvVZR74bbwEhELn9qdIoyhA5CcoTNs+cra1AdHkrAj80//ogaX3T7mH1urPnMNA3
+I4ZyYUUpSFlob3emLoG+B01vr87ERRORFHAGjx+f+IdpsQ7vw4kZ6+ocYfx6bIrc1gMLnia6Et3U
+VDmrJqMz6nWB2i3ND0/kA9HvFZcba5DFApCTZgIhsUfei5pKgLlVj7WiL8DWM2fafsSntARE60f7
+5li59wzweyuxwHApw0BiLTtIadwjPEjrewl5qW3aqDCYz4ByA4imW0aucnl8CAMhZa634RylsSqi
+Md5mBPfAdOhx3v89WcyWJhKLhZVXGqtrdQtEPREoPHtht+KPZ0/l7DxMYIBpVzgeAVuNVejH38DM
+dyM0SXV89pgR6y3e7UEuFAUCf+D+IOs15xGsIs5XPd7JMG0QA4XN8f+MFrXBsj6IbGB/kE+V9/Yt
+rQE5BwT6dYB9v0lQ7e/JxHwc64B+27bQ3RP+ydOc17KXqQIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
+AQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUxhfQvKjqAkPyGwaZXSuQILnXnOQwDQYJKoZI
+hvcNAQELBQADggIBADRh2Va1EodVTd2jNTFGu6QHcrxfYWLopfsLN7E8trP6KZ1/AvWkyaiTt3px
+KGmPc+FSkNrVvjrlt3ZqVoAh313m6Tqe5T72omnHKgqwGEfcIHB9UqM+WXzBusnIFUBhynLWcKzS
+t/Ac5IYp8M7vaGPQtSCKFWGafoaYtMnCdvvMujAWzKNhxnQT5WvvoxXqA/4Ti2Tk08HS6IT7SdEQ
+TXlm66r99I0xHnAUrdzeZxNMgRVhvLfZkXdxGYFgu/BYpbWcC/ePIlUnwEsBbTuZDdQdm2NnL9Du
+DcpmvJRPpq3t/O5jrFc/ZSXPsoaP0Aj/uHYUbt7lJ+yreLVTubY/6CD50qi+YUbKh4yE8/nxoGib
+Ih6BJpsQBJFxwAYf3KDTuVan45gtf4Od34wrnDKOMpTwATwiKp9Dwi7DmDkHOHv8XgBCH/MyJnmD
+hPbl8MFREsALHgQjDFSlTC9JxUrRtm5gDWv8a4uFJGS3iQ6rJUdbPM9+Sb3H6QrG2vd+DhcI00iX
+0HGS8A85PjRqHH3Y8iKuu2n0M7SmSFXRDw4m6Oy2Cy2nhTXN/VnIn9HNPlopNLk9hM6xZdRZkZFW
+dSHBd575euFgndOtBBj0fOtek49TSiIp+EgrPk2GrFt/ywaZWWDYWGWVjUTR939+J399roD1B0y2
+PpxxVJkES/1Y+Zj0
+-----END CERTIFICATE-----
+
+DigiCert Assured ID Root G2
+===========================
+-----BEGIN CERTIFICATE-----
+MIIDljCCAn6gAwIBAgIQC5McOtY5Z+pnI7/Dr5r0SzANBgkqhkiG9w0BAQsFADBlMQswCQYDVQQG
+EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSQw
+IgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgRzIwHhcNMTMwODAxMTIwMDAwWhcNMzgw
+MTE1MTIwMDAwWjBlMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQL
+ExB3d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgRzIw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDZ5ygvUj82ckmIkzTz+GoeMVSAn61UQbVH
+35ao1K+ALbkKz3X9iaV9JPrjIgwrvJUXCzO/GU1BBpAAvQxNEP4HteccbiJVMWWXvdMX0h5i89vq
+bFCMP4QMls+3ywPgym2hFEwbid3tALBSfK+RbLE4E9HpEgjAALAcKxHad3A2m67OeYfcgnDmCXRw
+VWmvo2ifv922ebPynXApVfSr/5Vh88lAbx3RvpO704gqu52/clpWcTs/1PPRCv4o76Pu2ZmvA9OP
+YLfykqGxvYmJHzDNw6YuYjOuFgJ3RFrngQo8p0Quebg/BLxcoIfhG69Rjs3sLPr4/m3wOnyqi+Rn
+lTGNAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMB0GA1UdDgQWBBTO
+w0q5mVXyuNtgv6l+vVa1lzan1jANBgkqhkiG9w0BAQsFAAOCAQEAyqVVjOPIQW5pJ6d1Ee88hjZv
+0p3GeDgdaZaikmkuOGybfQTUiaWxMTeKySHMq2zNixya1r9I0jJmwYrA8y8678Dj1JGG0VDjA9tz
+d29KOVPt3ibHtX2vK0LRdWLjSisCx1BL4GnilmwORGYQRI+tBev4eaymG+g3NJ1TyWGqolKvSnAW
+hsI6yLETcDbYz+70CjTVW0z9B5yiutkBclzzTcHdDrEcDcRjvq30FPuJ7KJBDkzMyFdA0G4Dqs0M
+jomZmWzwPDCvON9vvKO+KSAnq3T/EyJ43pdSVR6DtVQgA+6uwE9W3jfMw3+qBCe703e4YtsXfJwo
+IhNzbM8m9Yop5w==
+-----END CERTIFICATE-----
+
+DigiCert Assured ID Root G3
+===========================
+-----BEGIN CERTIFICATE-----
+MIICRjCCAc2gAwIBAgIQC6Fa+h3foLVJRK/NJKBs7DAKBggqhkjOPQQDAzBlMQswCQYDVQQGEwJV
+UzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSQwIgYD
+VQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgRzMwHhcNMTMwODAxMTIwMDAwWhcNMzgwMTE1
+MTIwMDAwWjBlMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
+d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgRzMwdjAQ
+BgcqhkjOPQIBBgUrgQQAIgNiAAQZ57ysRGXtzbg/WPuNsVepRC0FFfLvC/8QdJ+1YlJfZn4f5dwb
+RXkLzMZTCp2NXQLZqVneAlr2lSoOjThKiknGvMYDOAdfVdp+CW7if17QRSAPWXYQ1qAk8C3eNvJs
+KTmjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMB0GA1UdDgQWBBTL0L2p4ZgF
+UaFNN6KDec6NHSrkhDAKBggqhkjOPQQDAwNnADBkAjAlpIFFAmsSS3V0T8gj43DydXLefInwz5Fy
+YZ5eEJJZVrmDxxDnOOlYJjZ91eQ0hjkCMHw2U/Aw5WJjOpnitqM7mzT6HtoQknFekROn3aRukswy
+1vUhZscv6pZjamVFkpUBtA==
+-----END CERTIFICATE-----
+
+DigiCert Global Root G2
+=======================
+-----BEGIN CERTIFICATE-----
+MIIDjjCCAnagAwIBAgIQAzrx5qcRqaC7KGSxHQn65TANBgkqhkiG9w0BAQsFADBhMQswCQYDVQQG
+EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSAw
+HgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBHMjAeFw0xMzA4MDExMjAwMDBaFw0zODAxMTUx
+MjAwMDBaMGExCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3
+dy5kaWdpY2VydC5jb20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IEcyMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuzfNNNx7a8myaJCtSnX/RrohCgiN9RlUyfuI2/Ou8jqJ
+kTx65qsGGmvPrC3oXgkkRLpimn7Wo6h+4FR1IAWsULecYxpsMNzaHxmx1x7e/dfgy5SDN67sH0NO
+3Xss0r0upS/kqbitOtSZpLYl6ZtrAGCSYP9PIUkY92eQq2EGnI/yuum06ZIya7XzV+hdG82MHauV
+BJVJ8zUtluNJbd134/tJS7SsVQepj5WztCO7TG1F8PapspUwtP1MVYwnSlcUfIKdzXOS0xZKBgyM
+UNGPHgm+F6HmIcr9g+UQvIOlCsRnKPZzFBQ9RnbDhxSJITRNrw9FDKZJobq7nMWxM4MphQIDAQAB
+o0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjAdBgNVHQ4EFgQUTiJUIBiV5uNu
+5g/6+rkS7QYXjzkwDQYJKoZIhvcNAQELBQADggEBAGBnKJRvDkhj6zHd6mcY1Yl9PMWLSn/pvtsr
+F9+wX3N3KjITOYFnQoQj8kVnNeyIv/iPsGEMNKSuIEyExtv4NeF22d+mQrvHRAiGfzZ0JFrabA0U
+WTW98kndth/Jsw1HKj2ZL7tcu7XUIOGZX1NGFdtom/DzMNU+MeKNhJ7jitralj41E6Vf8PlwUHBH
+QRFXGU7Aj64GxJUTFy8bJZ918rGOmaFvE7FBcf6IKshPECBV1/MUReXgRPTqh5Uykw7+U0b6LJ3/
+iyK5S9kJRaTepLiaWN0bfVKfjllDiIGknibVb63dDcY3fe0Dkhvld1927jyNxF1WW6LZZm6zNTfl
+MrY=
+-----END CERTIFICATE-----
+
+DigiCert Global Root G3
+=======================
+-----BEGIN CERTIFICATE-----
+MIICPzCCAcWgAwIBAgIQBVVWvPJepDU1w6QP1atFcjAKBggqhkjOPQQDAzBhMQswCQYDVQQGEwJV
+UzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSAwHgYD
+VQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBHMzAeFw0xMzA4MDExMjAwMDBaFw0zODAxMTUxMjAw
+MDBaMGExCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5k
+aWdpY2VydC5jb20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IEczMHYwEAYHKoZIzj0C
+AQYFK4EEACIDYgAE3afZu4q4C/sLfyHS8L6+c/MzXRq8NOrexpu80JX28MzQC7phW1FGfp4tn+6O
+YwwX7Adw9c+ELkCDnOg/QW07rdOkFFk2eJ0DQ+4QE2xy3q6Ip6FrtUPOZ9wj/wMco+I+o0IwQDAP
+BgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjAdBgNVHQ4EFgQUs9tIpPmhxdiuNkHMEWNp
+Yim8S8YwCgYIKoZIzj0EAwMDaAAwZQIxAK288mw/EkrRLTnDCgmXc/SINoyIJ7vmiI1Qhadj+Z4y
+3maTD/HMsQmP3Wyr+mt/oAIwOWZbwmSNuJ5Q3KjVSaLtx9zRSX8XAbjIho9OjIgrqJqpisXRAL34
+VOKa5Vt8sycX
+-----END CERTIFICATE-----
+
+DigiCert Trusted Root G4
+========================
+-----BEGIN CERTIFICATE-----
+MIIFkDCCA3igAwIBAgIQBZsbV56OITLiOQe9p3d1XDANBgkqhkiG9w0BAQwFADBiMQswCQYDVQQG
+EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSEw
+HwYDVQQDExhEaWdpQ2VydCBUcnVzdGVkIFJvb3QgRzQwHhcNMTMwODAxMTIwMDAwWhcNMzgwMTE1
+MTIwMDAwWjBiMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
+d3cuZGlnaWNlcnQuY29tMSEwHwYDVQQDExhEaWdpQ2VydCBUcnVzdGVkIFJvb3QgRzQwggIiMA0G
+CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC/5pBzaN675F1KPDAiMGkz7MKnJS7JIT3yithZwuEp
+pz1Yq3aaza57G4QNxDAf8xukOBbrVsaXbR2rsnnyyhHS5F/WBTxSD1Ifxp4VpX6+n6lXFllVcq9o
+k3DCsrp1mWpzMpTREEQQLt+C8weE5nQ7bXHiLQwb7iDVySAdYyktzuxeTsiT+CFhmzTrBcZe7Fsa
+vOvJz82sNEBfsXpm7nfISKhmV1efVFiODCu3T6cw2Vbuyntd463JT17lNecxy9qTXtyOj4DatpGY
+QJB5w3jHtrHEtWoYOAMQjdjUN6QuBX2I9YI+EJFwq1WCQTLX2wRzKm6RAXwhTNS8rhsDdV14Ztk6
+MUSaM0C/CNdaSaTC5qmgZ92kJ7yhTzm1EVgX9yRcRo9k98FpiHaYdj1ZXUJ2h4mXaXpI8OCiEhtm
+mnTK3kse5w5jrubU75KSOp493ADkRSWJtppEGSt+wJS00mFt6zPZxd9LBADMfRyVw4/3IbKyEbe7
+f/LVjHAsQWCqsWMYRJUadmJ+9oCw++hkpjPRiQfhvbfmQ6QYuKZ3AeEPlAwhHbJUKSWJbOUOUlFH
+dL4mrLZBdd56rF+NP8m800ERElvlEFDrMcXKchYiCd98THU/Y+whX8QgUWtvsauGi0/C1kVfnSD8
+oR7FwI+isX4KJpn15GkvmB0t9dmpsh3lGwIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1Ud
+DwEB/wQEAwIBhjAdBgNVHQ4EFgQU7NfjgtJxXWRM3y5nP+e6mK4cD08wDQYJKoZIhvcNAQEMBQAD
+ggIBALth2X2pbL4XxJEbw6GiAI3jZGgPVs93rnD5/ZpKmbnJeFwMDF/k5hQpVgs2SV1EY+CtnJYY
+ZhsjDT156W1r1lT40jzBQ0CuHVD1UvyQO7uYmWlrx8GnqGikJ9yd+SeuMIW59mdNOj6PWTkiU0Tr
+yF0Dyu1Qen1iIQqAyHNm0aAFYF/opbSnr6j3bTWcfFqK1qI4mfN4i/RN0iAL3gTujJtHgXINwBQy
+7zBZLq7gcfJW5GqXb5JQbZaNaHqasjYUegbyJLkJEVDXCLG4iXqEI2FCKeWjzaIgQdfRnGTZ6iah
+ixTXTBmyUEFxPT9NcCOGDErcgdLMMpSEDQgJlxxPwO5rIHQw0uA5NBCFIRUBCOhVMt5xSdkoF1BN
+5r5N0XWs0Mr7QbhDparTwwVETyw2m+L64kW4I1NsBm9nVX9GtUw/bihaeSbSpKhil9Ie4u1Ki7wb
+/UdKDd9nZn6yW0HQO+T0O/QEY+nvwlQAUaCKKsnOeMzV6ocEGLPOr0mIr/OSmbaz5mEP0oUA51Aa
+5BuVnRmhuZyxm7EAHu/QD09CbMkKvO5D+jpxpchNJqU1/YldvIViHTLSoCtU7ZpXwdv6EM8Zt4tK
+G48BtieVU+i2iW1bvGjUI+iLUaJW+fCmgKDWHrO8Dw9TdSmq6hN35N6MgSGtBxBHEa2HPQfRdbzP
+82Z+
+-----END CERTIFICATE-----
+
+COMODO RSA Certification Authority
+==================================
+-----BEGIN CERTIFICATE-----
+MIIF2DCCA8CgAwIBAgIQTKr5yttjb+Af907YWwOGnTANBgkqhkiG9w0BAQwFADCBhTELMAkGA1UE
+BhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgG
+A1UEChMRQ09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBSU0EgQ2VydGlmaWNhdGlv
+biBBdXRob3JpdHkwHhcNMTAwMTE5MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBhTELMAkGA1UEBhMC
+R0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UE
+ChMRQ09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBSU0EgQ2VydGlmaWNhdGlvbiBB
+dXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCR6FSS0gpWsawNJN3Fz0Rn
+dJkrN6N9I3AAcbxT38T6KhKPS38QVr2fcHK3YX/JSw8Xpz3jsARh7v8Rl8f0hj4K+j5c+ZPmNHrZ
+FGvnnLOFoIJ6dq9xkNfs/Q36nGz637CC9BR++b7Epi9Pf5l/tfxnQ3K9DADWietrLNPtj5gcFKt+
+5eNu/Nio5JIk2kNrYrhV/erBvGy2i/MOjZrkm2xpmfh4SDBF1a3hDTxFYPwyllEnvGfDyi62a+pG
+x8cgoLEfZd5ICLqkTqnyg0Y3hOvozIFIQ2dOciqbXL1MGyiKXCJ7tKuY2e7gUYPDCUZObT6Z+pUX
+2nwzV0E8jVHtC7ZcryxjGt9XyD+86V3Em69FmeKjWiS0uqlWPc9vqv9JWL7wqP/0uK3pN/u6uPQL
+OvnoQ0IeidiEyxPx2bvhiWC4jChWrBQdnArncevPDt09qZahSL0896+1DSJMwBGB7FY79tOi4lu3
+sgQiUpWAk2nojkxl8ZEDLXB0AuqLZxUpaVICu9ffUGpVRr+goyhhf3DQw6KqLCGqR84onAZFdr+C
+GCe01a60y1Dma/RMhnEw6abfFobg2P9A3fvQQoh/ozM6LlweQRGBY84YcWsr7KaKtzFcOmpH4MN5
+WdYgGq/yapiqcrxXStJLnbsQ/LBMQeXtHT1eKJ2czL+zUdqnR+WEUwIDAQABo0IwQDAdBgNVHQ4E
+FgQUu69+Aj36pvE8hI6t7jiY7NkyMtQwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8w
+DQYJKoZIhvcNAQEMBQADggIBAArx1UaEt65Ru2yyTUEUAJNMnMvlwFTPoCWOAvn9sKIN9SCYPBMt
+rFaisNZ+EZLpLrqeLppysb0ZRGxhNaKatBYSaVqM4dc+pBroLwP0rmEdEBsqpIt6xf4FpuHA1sj+
+nq6PK7o9mfjYcwlYRm6mnPTXJ9OV2jeDchzTc+CiR5kDOF3VSXkAKRzH7JsgHAckaVd4sjn8OoSg
+tZx8jb8uk2IntznaFxiuvTwJaP+EmzzV1gsD41eeFPfR60/IvYcjt7ZJQ3mFXLrrkguhxuhoqEwW
+sRqZCuhTLJK7oQkYdQxlqHvLI7cawiiFwxv/0Cti76R7CZGYZ4wUAc1oBmpjIXUDgIiKboHGhfKp
+pC3n9KUkEEeDys30jXlYsQab5xoq2Z0B15R97QNKyvDb6KkBPvVWmckejkk9u+UJueBPSZI9FoJA
+zMxZxuY67RIuaTxslbH9qh17f4a+Hg4yRvv7E491f0yLS0Zj/gA0QHDBw7mh3aZw4gSzQbzpgJHq
+ZJx64SIDqZxubw5lT2yHh17zbqD5daWbQOhTsiedSrnAdyGN/4fy3ryM7xfft0kL0fJuMAsaDk52
+7RH89elWsn2/x20Kk4yl0MC2Hb46TpSi125sC8KKfPog88Tk5c0NqMuRkrF8hey1FGlmDoLnzc7I
+LaZRfyHBNVOFBkpdn627G190
+-----END CERTIFICATE-----
+
+USERTrust RSA Certification Authority
+=====================================
+-----BEGIN CERTIFICATE-----
+MIIF3jCCA8agAwIBAgIQAf1tMPyjylGoG7xkDjUDLTANBgkqhkiG9w0BAQwFADCBiDELMAkGA1UE
+BhMCVVMxEzARBgNVBAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0plcnNleSBDaXR5MR4wHAYDVQQK
+ExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNVBAMTJVVTRVJUcnVzdCBSU0EgQ2VydGlmaWNh
+dGlvbiBBdXRob3JpdHkwHhcNMTAwMjAxMDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBiDELMAkGA1UE
+BhMCVVMxEzARBgNVBAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0plcnNleSBDaXR5MR4wHAYDVQQK
+ExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNVBAMTJVVTRVJUcnVzdCBSU0EgQ2VydGlmaWNh
+dGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCAEmUXNg7D2wiz
+0KxXDXbtzSfTTK1Qg2HiqiBNCS1kCdzOiZ/MPans9s/B3PHTsdZ7NygRK0faOca8Ohm0X6a9fZ2j
+Y0K2dvKpOyuR+OJv0OwWIJAJPuLodMkYtJHUYmTbf6MG8YgYapAiPLz+E/CHFHv25B+O1ORRxhFn
+RghRy4YUVD+8M/5+bJz/Fp0YvVGONaanZshyZ9shZrHUm3gDwFA66Mzw3LyeTP6vBZY1H1dat//O
++T23LLb2VN3I5xI6Ta5MirdcmrS3ID3KfyI0rn47aGYBROcBTkZTmzNg95S+UzeQc0PzMsNT79uq
+/nROacdrjGCT3sTHDN/hMq7MkztReJVni+49Vv4M0GkPGw/zJSZrM233bkf6c0Plfg6lZrEpfDKE
+Y1WJxA3Bk1QwGROs0303p+tdOmw1XNtB1xLaqUkL39iAigmTYo61Zs8liM2EuLE/pDkP2QKe6xJM
+lXzzawWpXhaDzLhn4ugTncxbgtNMs+1b/97lc6wjOy0AvzVVdAlJ2ElYGn+SNuZRkg7zJn0cTRe8
+yexDJtC/QV9AqURE9JnnV4eeUB9XVKg+/XRjL7FQZQnmWEIuQxpMtPAlR1n6BB6T1CZGSlCBst6+
+eLf8ZxXhyVeEHg9j1uliutZfVS7qXMYoCAQlObgOK6nyTJccBz8NUvXt7y+CDwIDAQABo0IwQDAd
+BgNVHQ4EFgQUU3m/WqorSs9UgOHYm8Cd8rIDZsswDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQF
+MAMBAf8wDQYJKoZIhvcNAQEMBQADggIBAFzUfA3P9wF9QZllDHPFUp/L+M+ZBn8b2kMVn54CVVeW
+FPFSPCeHlCjtHzoBN6J2/FNQwISbxmtOuowhT6KOVWKR82kV2LyI48SqC/3vqOlLVSoGIG1VeCkZ
+7l8wXEskEVX/JJpuXior7gtNn3/3ATiUFJVDBwn7YKnuHKsSjKCaXqeYalltiz8I+8jRRa8YFWSQ
+Eg9zKC7F4iRO/Fjs8PRF/iKz6y+O0tlFYQXBl2+odnKPi4w2r78NBc5xjeambx9spnFixdjQg3IM
+8WcRiQycE0xyNN+81XHfqnHd4blsjDwSXWXavVcStkNr/+XeTWYRUc+ZruwXtuhxkYzeSf7dNXGi
+FSeUHM9h4ya7b6NnJSFd5t0dCy5oGzuCr+yDZ4XUmFF0sbmZgIn/f3gZXHlKYC6SQK5MNyosycdi
+yA5d9zZbyuAlJQG03RoHnHcAP9Dc1ew91Pq7P8yF1m9/qS3fuQL39ZeatTXaw2ewh0qpKJ4jjv9c
+J2vhsE/zB+4ALtRZh8tSQZXq9EfX7mRBVXyNWQKV3WKdwrnuWih0hKWbt5DHDAff9Yk2dDLWKMGw
+sAvgnEzDHNb842m1R0aBL6KCq9NjRHDEjf8tM7qtj3u1cIiuPhnPQCjY/MiQu12ZIvVS5ljFH4gx
+Q+6IHdfGjjxDah2nGN59PRbxYvnKkKj9
+-----END CERTIFICATE-----
+
+USERTrust ECC Certification Authority
+=====================================
+-----BEGIN CERTIFICATE-----
+MIICjzCCAhWgAwIBAgIQXIuZxVqUxdJxVt7NiYDMJjAKBggqhkjOPQQDAzCBiDELMAkGA1UEBhMC
+VVMxEzARBgNVBAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0plcnNleSBDaXR5MR4wHAYDVQQKExVU
+aGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNVBAMTJVVTRVJUcnVzdCBFQ0MgQ2VydGlmaWNhdGlv
+biBBdXRob3JpdHkwHhcNMTAwMjAxMDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBiDELMAkGA1UEBhMC
+VVMxEzARBgNVBAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0plcnNleSBDaXR5MR4wHAYDVQQKExVU
+aGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNVBAMTJVVTRVJUcnVzdCBFQ0MgQ2VydGlmaWNhdGlv
+biBBdXRob3JpdHkwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQarFRaqfloI+d61SRvU8Za2EurxtW2
+0eZzca7dnNYMYf3boIkDuAUU7FfO7l0/4iGzzvfUinngo4N+LZfQYcTxmdwlkWOrfzCjtHDix6Ez
+nPO/LlxTsV+zfTJ/ijTjeXmjQjBAMB0GA1UdDgQWBBQ64QmG1M8ZwpZ2dEl23OA1xmNjmjAOBgNV
+HQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAKBggqhkjOPQQDAwNoADBlAjA2Z6EWCNzklwBB
+HU6+4WMBzzuqQhFkoJ2UOQIReVx7Hfpkue4WQrO/isIJxOzksU0CMQDpKmFHjFJKS04YcPbWRNZu
+9YO6bVi9JNlWSOrvxKJGgYhqOkbRqZtNyWHa0V1Xahg=
+-----END CERTIFICATE-----
+
+GlobalSign ECC Root CA - R5
+===========================
+-----BEGIN CERTIFICATE-----
+MIICHjCCAaSgAwIBAgIRYFlJ4CYuu1X5CneKcflK2GwwCgYIKoZIzj0EAwMwUDEkMCIGA1UECxMb
+R2xvYmFsU2lnbiBFQ0MgUm9vdCBDQSAtIFI1MRMwEQYDVQQKEwpHbG9iYWxTaWduMRMwEQYDVQQD
+EwpHbG9iYWxTaWduMB4XDTEyMTExMzAwMDAwMFoXDTM4MDExOTAzMTQwN1owUDEkMCIGA1UECxMb
+R2xvYmFsU2lnbiBFQ0MgUm9vdCBDQSAtIFI1MRMwEQYDVQQKEwpHbG9iYWxTaWduMRMwEQYDVQQD
+EwpHbG9iYWxTaWduMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAER0UOlvt9Xb/pOdEh+J8LttV7HpI6
+SFkc8GIxLcB6KP4ap1yztsyX50XUWPrRd21DosCHZTQKH3rd6zwzocWdTaRvQZU4f8kehOvRnkmS
+h5SHDDqFSmafnVmTTZdhBoZKo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAd
+BgNVHQ4EFgQUPeYpSJvqB8ohREom3m7e0oPQn1kwCgYIKoZIzj0EAwMDaAAwZQIxAOVpEslu28Yx
+uglB4Zf4+/2a4n0Sye18ZNPLBSWLVtmg515dTguDnFt2KaAJJiFqYgIwcdK1j1zqO+F4CYWodZI7
+yFz9SO8NdCKoCOJuxUnOxwy8p2Fp8fc74SrL+SvzZpA3
+-----END CERTIFICATE-----
+
+IdenTrust Commercial Root CA 1
+==============================
+-----BEGIN CERTIFICATE-----
+MIIFYDCCA0igAwIBAgIQCgFCgAAAAUUjyES1AAAAAjANBgkqhkiG9w0BAQsFADBKMQswCQYDVQQG
+EwJVUzESMBAGA1UEChMJSWRlblRydXN0MScwJQYDVQQDEx5JZGVuVHJ1c3QgQ29tbWVyY2lhbCBS
+b290IENBIDEwHhcNMTQwMTE2MTgxMjIzWhcNMzQwMTE2MTgxMjIzWjBKMQswCQYDVQQGEwJVUzES
+MBAGA1UEChMJSWRlblRydXN0MScwJQYDVQQDEx5JZGVuVHJ1c3QgQ29tbWVyY2lhbCBSb290IENB
+IDEwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCnUBneP5k91DNG8W9RYYKyqU+PZ4ld
+hNlT3Qwo2dfw/66VQ3KZ+bVdfIrBQuExUHTRgQ18zZshq0PirK1ehm7zCYofWjK9ouuU+ehcCuz/
+mNKvcbO0U59Oh++SvL3sTzIwiEsXXlfEU8L2ApeN2WIrvyQfYo3fw7gpS0l4PJNgiCL8mdo2yMKi
+1CxUAGc1bnO/AljwpN3lsKImesrgNqUZFvX9t++uP0D1bVoE/c40yiTcdCMbXTMTEl3EASX2MN0C
+XZ/g1Ue9tOsbobtJSdifWwLziuQkkORiT0/Br4sOdBeo0XKIanoBScy0RnnGF7HamB4HWfp1IYVl
+3ZBWzvurpWCdxJ35UrCLvYf5jysjCiN2O/cz4ckA82n5S6LgTrx+kzmEB/dEcH7+B1rlsazRGMzy
+NeVJSQjKVsk9+w8YfYs7wRPCTY/JTw436R+hDmrfYi7LNQZReSzIJTj0+kuniVyc0uMNOYZKdHzV
+WYfCP04MXFL0PfdSgvHqo6z9STQaKPNBiDoT7uje/5kdX7rL6B7yuVBgwDHTc+XvvqDtMwt0viAg
+xGds8AgDelWAf0ZOlqf0Hj7h9tgJ4TNkK2PXMl6f+cB7D3hvl7yTmvmcEpB4eoCHFddydJxVdHix
+uuFucAS6T6C6aMN7/zHwcz09lCqxC0EOoP5NiGVreTO01wIDAQABo0IwQDAOBgNVHQ8BAf8EBAMC
+AQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU7UQZwNPwBovupHu+QucmVMiONnYwDQYJKoZI
+hvcNAQELBQADggIBAA2ukDL2pkt8RHYZYR4nKM1eVO8lvOMIkPkp165oCOGUAFjvLi5+U1KMtlwH
+6oi6mYtQlNeCgN9hCQCTrQ0U5s7B8jeUeLBfnLOic7iPBZM4zY0+sLj7wM+x8uwtLRvM7Kqas6pg
+ghstO8OEPVeKlh6cdbjTMM1gCIOQ045U8U1mwF10A0Cj7oV+wh93nAbowacYXVKV7cndJZ5t+qnt
+ozo00Fl72u1Q8zW/7esUTTHHYPTa8Yec4kjixsU3+wYQ+nVZZjFHKdp2mhzpgq7vmrlR94gjmmmV
+YjzlVYA211QC//G5Xc7UI2/YRYRKW2XviQzdFKcgyxilJbQN+QHwotL0AMh0jqEqSI5l2xPE4iUX
+feu+h1sXIFRRk0pTAwvsXcoz7WL9RccvW9xYoIA55vrX/hMUpu09lEpCdNTDd1lzzY9GvlU47/ro
+kTLql1gEIt44w8y8bckzOmoKaT+gyOpyj4xjhiO9bTyWnpXgSUyqorkqG5w2gXjtw+hG4iZZRHUe
+2XWJUc0QhJ1hYMtd+ZciTY6Y5uN/9lu7rs3KSoFrXgvzUeF0K+l+J6fZmUlO+KWA2yUPHGNiiskz
+Z2s8EIPGrd6ozRaOjfAHN3Gf8qv8QfXBi+wAN10J5U6A7/qxXDgGpRtK4dw4LTzcqx+QGtVKnO7R
+cGzM7vRX+Bi6hG6H
+-----END CERTIFICATE-----
+
+IdenTrust Public Sector Root CA 1
+=================================
+-----BEGIN CERTIFICATE-----
+MIIFZjCCA06gAwIBAgIQCgFCgAAAAUUjz0Z8AAAAAjANBgkqhkiG9w0BAQsFADBNMQswCQYDVQQG
+EwJVUzESMBAGA1UEChMJSWRlblRydXN0MSowKAYDVQQDEyFJZGVuVHJ1c3QgUHVibGljIFNlY3Rv
+ciBSb290IENBIDEwHhcNMTQwMTE2MTc1MzMyWhcNMzQwMTE2MTc1MzMyWjBNMQswCQYDVQQGEwJV
+UzESMBAGA1UEChMJSWRlblRydXN0MSowKAYDVQQDEyFJZGVuVHJ1c3QgUHVibGljIFNlY3RvciBS
+b290IENBIDEwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC2IpT8pEiv6EdrCvsnduTy
+P4o7ekosMSqMjbCpwzFrqHd2hCa2rIFCDQjrVVi7evi8ZX3yoG2LqEfpYnYeEe4IFNGyRBb06tD6
+Hi9e28tzQa68ALBKK0CyrOE7S8ItneShm+waOh7wCLPQ5CQ1B5+ctMlSbdsHyo+1W/CD80/HLaXI
+rcuVIKQxKFdYWuSNG5qrng0M8gozOSI5Cpcu81N3uURF/YTLNiCBWS2ab21ISGHKTN9T0a9SvESf
+qy9rg3LvdYDaBjMbXcjaY8ZNzaxmMc3R3j6HEDbhuaR672BQssvKplbgN6+rNBM5Jeg5ZuSYeqoS
+mJxZZoY+rfGwyj4GD3vwEUs3oERte8uojHH01bWRNszwFcYr3lEXsZdMUD2xlVl8BX0tIdUAvwFn
+ol57plzy9yLxkA2T26pEUWbMfXYD62qoKjgZl3YNa4ph+bz27nb9cCvdKTz4Ch5bQhyLVi9VGxyh
+LrXHFub4qjySjmm2AcG1hp2JDws4lFTo6tyePSW8Uybt1as5qsVATFSrsrTZ2fjXctscvG29ZV/v
+iDUqZi/u9rNl8DONfJhBaUYPQxxp+pu10GFqzcpL2UyQRqsVWaFHVCkugyhfHMKiq3IXAAaOReyL
+4jM9f9oZRORicsPfIsbyVtTdX5Vy7W1f90gDW/3FKqD2cyOEEBsB5wIDAQABo0IwQDAOBgNVHQ8B
+Af8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU43HgntinQtnbcZFrlJPrw6PRFKMw
+DQYJKoZIhvcNAQELBQADggIBAEf63QqwEZE4rU1d9+UOl1QZgkiHVIyqZJnYWv6IAcVYpZmxI1Qj
+t2odIFflAWJBF9MJ23XLblSQdf4an4EKwt3X9wnQW3IV5B4Jaj0z8yGa5hV+rVHVDRDtfULAj+7A
+mgjVQdZcDiFpboBhDhXAuM/FSRJSzL46zNQuOAXeNf0fb7iAaJg9TaDKQGXSc3z1i9kKlT/YPyNt
+GtEqJBnZhbMX73huqVjRI9PHE+1yJX9dsXNw0H8GlwmEKYBhHfpe/3OsoOOJuBxxFcbeMX8S3OFt
+m6/n6J91eEyrRjuazr8FGF1NFTwWmhlQBJqymm9li1JfPFgEKCXAZmExfrngdbkaqIHWchezxQMx
+NRF4eKLg6TCMf4DfWN88uieW4oA0beOY02QnrEh+KHdcxiVhJfiFDGX6xDIvpZgF5PgLZxYWxoK4
+Mhn5+bl53B/N66+rDt0b20XkeucC4pVd/GnwU2lhlXV5C15V5jgclKlZM57IcXR5f1GJtshquDDI
+ajjDbp7hNxbqBWJMWxJH7ae0s1hWx0nzfxJoCTFx8G34Tkf71oXuxVhAGaQdp/lLQzfcaFpPz+vC
+ZHTetBXZ9FRUGi8c15dxVJCO2SCdUyt/q4/i6jC8UDfv8Ue1fXwsBOxonbRJRBD0ckscZOf85muQ
+3Wl9af0AVqW3rLatt8o+Ae+c
+-----END CERTIFICATE-----
+
+CFCA EV ROOT
+============
+-----BEGIN CERTIFICATE-----
+MIIFjTCCA3WgAwIBAgIEGErM1jANBgkqhkiG9w0BAQsFADBWMQswCQYDVQQGEwJDTjEwMC4GA1UE
+CgwnQ2hpbmEgRmluYW5jaWFsIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MRUwEwYDVQQDDAxDRkNB
+IEVWIFJPT1QwHhcNMTIwODA4MDMwNzAxWhcNMjkxMjMxMDMwNzAxWjBWMQswCQYDVQQGEwJDTjEw
+MC4GA1UECgwnQ2hpbmEgRmluYW5jaWFsIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MRUwEwYDVQQD
+DAxDRkNBIEVWIFJPT1QwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDXXWvNED8fBVnV
+BU03sQ7smCuOFR36k0sXgiFxEFLXUWRwFsJVaU2OFW2fvwwbwuCjZ9YMrM8irq93VCpLTIpTUnrD
+7i7es3ElweldPe6hL6P3KjzJIx1qqx2hp/Hz7KDVRM8Vz3IvHWOX6Jn5/ZOkVIBMUtRSqy5J35DN
+uF++P96hyk0g1CXohClTt7GIH//62pCfCqktQT+x8Rgp7hZZLDRJGqgG16iI0gNyejLi6mhNbiyW
+ZXvKWfry4t3uMCz7zEasxGPrb382KzRzEpR/38wmnvFyXVBlWY9ps4deMm/DGIq1lY+wejfeWkU7
+xzbh72fROdOXW3NiGUgthxwG+3SYIElz8AXSG7Ggo7cbcNOIabla1jj0Ytwli3i/+Oh+uFzJlU9f
+py25IGvPa931DfSCt/SyZi4QKPaXWnuWFo8BGS1sbn85WAZkgwGDg8NNkt0yxoekN+kWzqotaK8K
+gWU6cMGbrU1tVMoqLUuFG7OA5nBFDWteNfB/O7ic5ARwiRIlk9oKmSJgamNgTnYGmE69g60dWIol
+hdLHZR4tjsbftsbhf4oEIRUpdPA+nJCdDC7xij5aqgwJHsfVPKPtl8MeNPo4+QgO48BdK4PRVmrJ
+tqhUUy54Mmc9gn900PvhtgVguXDbjgv5E1hvcWAQUhC5wUEJ73IfZzF4/5YFjQIDAQABo2MwYTAf
+BgNVHSMEGDAWgBTj/i39KNALtbq2osS/BqoFjJP7LzAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB
+/wQEAwIBBjAdBgNVHQ4EFgQU4/4t/SjQC7W6tqLEvwaqBYyT+y8wDQYJKoZIhvcNAQELBQADggIB
+ACXGumvrh8vegjmWPfBEp2uEcwPenStPuiB/vHiyz5ewG5zz13ku9Ui20vsXiObTej/tUxPQ4i9q
+ecsAIyjmHjdXNYmEwnZPNDatZ8POQQaIxffu2Bq41gt/UP+TqhdLjOztUmCypAbqTuv0axn96/Ua
+4CUqmtzHQTb3yHQFhDmVOdYLO6Qn+gjYXB74BGBSESgoA//vU2YApUo0FmZ8/Qmkrp5nGm9BC2sG
+E5uPhnEFtC+NiWYzKXZUmhH4J/qyP5Hgzg0b8zAarb8iXRvTvyUFTeGSGn+ZnzxEk8rUQElsgIfX
+BDrDMlI1Dlb4pd19xIsNER9Tyx6yF7Zod1rg1MvIB671Oi6ON7fQAUtDKXeMOZePglr4UeWJoBjn
+aH9dCi77o0cOPaYjesYBx4/IXr9tgFa+iiS6M+qf4TIRnvHST4D2G0CvOJ4RUHlzEhLN5mydLIhy
+PDCBBpEi6lmt2hkuIsKNuYyH4Ga8cyNfIWRjgEj1oDwYPZTISEEdQLpe/v5WOaHIz16eGWRGENoX
+kbcFgKyLmZJ956LYBws2J+dIeWCKw9cTXPhyQN9Ky8+ZAAoACxGV2lZFA4gKn2fQ1XmxqI1AbQ3C
+ekD6819kR5LLU7m7Wc5P/dAVUwHY3+vZ5nbv0CO7O6l5s9UCKc2Jo5YPSjXnTkLAdc0Hz+Ys63su
+-----END CERTIFICATE-----
+
+OISTE WISeKey Global Root GB CA
+===============================
+-----BEGIN CERTIFICATE-----
+MIIDtTCCAp2gAwIBAgIQdrEgUnTwhYdGs/gjGvbCwDANBgkqhkiG9w0BAQsFADBtMQswCQYDVQQG
+EwJDSDEQMA4GA1UEChMHV0lTZUtleTEiMCAGA1UECxMZT0lTVEUgRm91bmRhdGlvbiBFbmRvcnNl
+ZDEoMCYGA1UEAxMfT0lTVEUgV0lTZUtleSBHbG9iYWwgUm9vdCBHQiBDQTAeFw0xNDEyMDExNTAw
+MzJaFw0zOTEyMDExNTEwMzFaMG0xCzAJBgNVBAYTAkNIMRAwDgYDVQQKEwdXSVNlS2V5MSIwIAYD
+VQQLExlPSVNURSBGb3VuZGF0aW9uIEVuZG9yc2VkMSgwJgYDVQQDEx9PSVNURSBXSVNlS2V5IEds
+b2JhbCBSb290IEdCIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2Be3HEokKtaX
+scriHvt9OO+Y9bI5mE4nuBFde9IllIiCFSZqGzG7qFshISvYD06fWvGxWuR51jIjK+FTzJlFXHtP
+rby/h0oLS5daqPZI7H17Dc0hBt+eFf1Biki3IPShehtX1F1Q/7pn2COZH8g/497/b1t3sWtuuMlk
+9+HKQUYOKXHQuSP8yYFfTvdv37+ErXNku7dCjmn21HYdfp2nuFeKUWdy19SouJVUQHMD9ur06/4o
+Qnc/nSMbsrY9gBQHTC5P99UKFg29ZkM3fiNDecNAhvVMKdqOmq0NpQSHiB6F4+lT1ZvIiwNjeOvg
+GUpuuy9rM2RYk61pv48b74JIxwIDAQABo1EwTzALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB
+/zAdBgNVHQ4EFgQUNQ/INmNe4qPs+TtmFc5RUuORmj0wEAYJKwYBBAGCNxUBBAMCAQAwDQYJKoZI
+hvcNAQELBQADggEBAEBM+4eymYGQfp3FsLAmzYh7KzKNbrghcViXfa43FK8+5/ea4n32cZiZBKpD
+dHij40lhPnOMTZTg+XHEthYOU3gf1qKHLwI5gSk8rxWYITD+KJAAjNHhy/peyP34EEY7onhCkRd0
+VQreUGdNZtGn//3ZwLWoo4rOZvUPQ82nK1d7Y0Zqqi5S2PTt4W2tKZB4SLrhI6qjiey1q5bAtEui
+HZeeevJuQHHfaPFlTc58Bd9TZaml8LGXBHAVRgOY1NK/VLSgWH1Sb9pWJmLU2NuJMW8c8CLC02Ic
+Nc1MaRVUGpCY3useX8p3x8uOPUNpnJpY0CQ73xtAln41rYHHTnG6iBM=
+-----END CERTIFICATE-----
+
+SZAFIR ROOT CA2
+===============
+-----BEGIN CERTIFICATE-----
+MIIDcjCCAlqgAwIBAgIUPopdB+xV0jLVt+O2XwHrLdzk1uQwDQYJKoZIhvcNAQELBQAwUTELMAkG
+A1UEBhMCUEwxKDAmBgNVBAoMH0tyYWpvd2EgSXpiYSBSb3psaWN6ZW5pb3dhIFMuQS4xGDAWBgNV
+BAMMD1NaQUZJUiBST09UIENBMjAeFw0xNTEwMTkwNzQzMzBaFw0zNTEwMTkwNzQzMzBaMFExCzAJ
+BgNVBAYTAlBMMSgwJgYDVQQKDB9LcmFqb3dhIEl6YmEgUm96bGljemVuaW93YSBTLkEuMRgwFgYD
+VQQDDA9TWkFGSVIgUk9PVCBDQTIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3vD5Q
+qEvNQLXOYeeWyrSh2gwisPq1e3YAd4wLz32ohswmUeQgPYUM1ljj5/QqGJ3a0a4m7utT3PSQ1hNK
+DJA8w/Ta0o4NkjrcsbH/ON7Dui1fgLkCvUqdGw+0w8LBZwPd3BucPbOw3gAeqDRHu5rr/gsUvTaE
+2g0gv/pby6kWIK05YO4vdbbnl5z5Pv1+TW9NL++IDWr63fE9biCloBK0TXC5ztdyO4mTp4CEHCdJ
+ckm1/zuVnsHMyAHs6A6KCpbns6aH5db5BSsNl0BwPLqsdVqc1U2dAgrSS5tmS0YHF2Wtn2yIANwi
+ieDhZNRnvDF5YTy7ykHNXGoAyDw4jlivAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0P
+AQH/BAQDAgEGMB0GA1UdDgQWBBQuFqlKGLXLzPVvUPMjX/hd56zwyDANBgkqhkiG9w0BAQsFAAOC
+AQEAtXP4A9xZWx126aMqe5Aosk3AM0+qmrHUuOQn/6mWmc5G4G18TKI4pAZw8PRBEew/R40/cof5
+O/2kbytTAOD/OblqBw7rHRz2onKQy4I9EYKL0rufKq8h5mOGnXkZ7/e7DDWQw4rtTw/1zBLZpD67
+oPwglV9PJi8RI4NOdQcPv5vRtB3pEAT+ymCPoky4rc/hkA/NrgrHXXu3UNLUYfrVFdvXn4dRVOul
+4+vJhaAlIDf7js4MNIThPIGyd05DpYhfhmehPea0XGG2Ptv+tyjFogeutcrKjSoS75ftwjCkySp6
++/NNIxuZMzSgLvWpCz/UXeHPhJ/iGcJfitYgHuNztw==
+-----END CERTIFICATE-----
+
+Certum Trusted Network CA 2
+===========================
+-----BEGIN CERTIFICATE-----
+MIIF0jCCA7qgAwIBAgIQIdbQSk8lD8kyN/yqXhKN6TANBgkqhkiG9w0BAQ0FADCBgDELMAkGA1UE
+BhMCUEwxIjAgBgNVBAoTGVVuaXpldG8gVGVjaG5vbG9naWVzIFMuQS4xJzAlBgNVBAsTHkNlcnR1
+bSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEkMCIGA1UEAxMbQ2VydHVtIFRydXN0ZWQgTmV0d29y
+ayBDQSAyMCIYDzIwMTExMDA2MDgzOTU2WhgPMjA0NjEwMDYwODM5NTZaMIGAMQswCQYDVQQGEwJQ
+TDEiMCAGA1UEChMZVW5pemV0byBUZWNobm9sb2dpZXMgUy5BLjEnMCUGA1UECxMeQ2VydHVtIENl
+cnRpZmljYXRpb24gQXV0aG9yaXR5MSQwIgYDVQQDExtDZXJ0dW0gVHJ1c3RlZCBOZXR3b3JrIENB
+IDIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC9+Xj45tWADGSdhhuWZGc/IjoedQF9
+7/tcZ4zJzFxrqZHmuULlIEub2pt7uZld2ZuAS9eEQCsn0+i6MLs+CRqnSZXvK0AkwpfHp+6bJe+o
+CgCXhVqqndwpyeI1B+twTUrWwbNWuKFBOJvR+zF/j+Bf4bE/D44WSWDXBo0Y+aomEKsq09DRZ40b
+Rr5HMNUuctHFY9rnY3lEfktjJImGLjQ/KUxSiyqnwOKRKIm5wFv5HdnnJ63/mgKXwcZQkpsCLL2p
+uTRZCr+ESv/f/rOf69me4Jgj7KZrdxYq28ytOxykh9xGc14ZYmhFV+SQgkK7QtbwYeDBoz1mo130
+GO6IyY0XRSmZMnUCMe4pJshrAua1YkV/NxVaI2iJ1D7eTiew8EAMvE0Xy02isx7QBlrd9pPPV3WZ
+9fqGGmd4s7+W/jTcvedSVuWz5XV710GRBdxdaeOVDUO5/IOWOZV7bIBaTxNyxtd9KXpEulKkKtVB
+Rgkg/iKgtlswjbyJDNXXcPiHUv3a76xRLgezTv7QCdpw75j6VuZt27VXS9zlLCUVyJ4ueE742pye
+hizKV/Ma5ciSixqClnrDvFASadgOWkaLOusm+iPJtrCBvkIApPjW/jAux9JG9uWOdf3yzLnQh1vM
+BhBgu4M1t15n3kfsmUjxpKEV/q2MYo45VU85FrmxY53/twIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
+AQH/MB0GA1UdDgQWBBS2oVQ5AsOgP46KvPrU+Bym0ToO/TAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZI
+hvcNAQENBQADggIBAHGlDs7k6b8/ONWJWsQCYftMxRQXLYtPU2sQF/xlhMcQSZDe28cmk4gmb3DW
+Al45oPePq5a1pRNcgRRtDoGCERuKTsZPpd1iHkTfCVn0W3cLN+mLIMb4Ck4uWBzrM9DPhmDJ2vuA
+L55MYIR4PSFk1vtBHxgP58l1cb29XN40hz5BsA72udY/CROWFC/emh1auVbONTqwX3BNXuMp8SMo
+clm2q8KMZiYcdywmdjWLKKdpoPk79SPdhRB0yZADVpHnr7pH1BKXESLjokmUbOe3lEu6LaTaM4tM
+pkT/WjzGHWTYtTHkpjx6qFcL2+1hGsvxznN3Y6SHb0xRONbkX8eftoEq5IVIeVheO/jbAoJnwTnb
+w3RLPTYe+SmTiGhbqEQZIfCn6IENLOiTNrQ3ssqwGyZ6miUfmpqAnksqP/ujmv5zMnHCnsZy4Ypo
+J/HkD7TETKVhk/iXEAcqMCWpuchxuO9ozC1+9eB+D4Kob7a6bINDd82Kkhehnlt4Fj1F4jNy3eFm
+ypnTycUm/Q1oBEauttmbjL4ZvrHG8hnjXALKLNhvSgfZyTXaQHXyxKcZb55CEJh15pWLYLztxRLX
+is7VmFxWlgPF7ncGNf/P5O4/E2Hu29othfDNrp2yGAlFw5Khchf8R7agCyzxxN5DaAhqXzvwdmP7
+zAYspsbiDrW5viSP
+-----END CERTIFICATE-----
+
+Hellenic Academic and Research Institutions RootCA 2015
+=======================================================
+-----BEGIN CERTIFICATE-----
+MIIGCzCCA/OgAwIBAgIBADANBgkqhkiG9w0BAQsFADCBpjELMAkGA1UEBhMCR1IxDzANBgNVBAcT
+BkF0aGVuczFEMEIGA1UEChM7SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0
+aW9ucyBDZXJ0LiBBdXRob3JpdHkxQDA+BgNVBAMTN0hlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNl
+YXJjaCBJbnN0aXR1dGlvbnMgUm9vdENBIDIwMTUwHhcNMTUwNzA3MTAxMTIxWhcNNDAwNjMwMTAx
+MTIxWjCBpjELMAkGA1UEBhMCR1IxDzANBgNVBAcTBkF0aGVuczFEMEIGA1UEChM7SGVsbGVuaWMg
+QWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBDZXJ0LiBBdXRob3JpdHkxQDA+BgNV
+BAMTN0hlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1dGlvbnMgUm9vdENBIDIw
+MTUwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDC+Kk/G4n8PDwEXT2QNrCROnk8Zlrv
+bTkBSRq0t89/TSNTt5AA4xMqKKYx8ZEA4yjsriFBzh/a/X0SWwGDD7mwX5nh8hKDgE0GPt+sr+eh
+iGsxr/CL0BgzuNtFajT0AoAkKAoCFZVedioNmToUW/bLy1O8E00BiDeUJRtCvCLYjqOWXjrZMts+
+6PAQZe104S+nfK8nNLspfZu2zwnI5dMK/IhlZXQK3HMcXM1AsRzUtoSMTFDPaI6oWa7CJ06CojXd
+FPQf/7J31Ycvqm59JCfnxssm5uX+Zwdj2EUN3TpZZTlYepKZcj2chF6IIbjV9Cz82XBST3i4vTwr
+i5WY9bPRaM8gFH5MXF/ni+X1NYEZN9cRCLdmvtNKzoNXADrDgfgXy5I2XdGj2HUb4Ysn6npIQf1F
+GQatJ5lOwXBH3bWfgVMS5bGMSF0xQxfjjMZ6Y5ZLKTBOhE5iGV48zpeQpX8B653g+IuJ3SWYPZK2
+fu/Z8VFRfS0myGlZYeCsargqNhEEelC9MoS+L9xy1dcdFkfkR2YgP/SWxa+OAXqlD3pk9Q0Yh9mu
+iNX6hME6wGkoLfINaFGq46V3xqSQDqE3izEjR8EJCOtu93ib14L8hCCZSRm2Ekax+0VVFqmjZayc
+Bw/qa9wfLgZy7IaIEuQt218FL+TwA9MmM+eAws1CoRc0CwIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
+AQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUcRVnyMjJvXVdctA4GGqd83EkVAswDQYJKoZI
+hvcNAQELBQADggIBAHW7bVRLqhBYRjTyYtcWNl0IXtVsyIe9tC5G8jH4fOpCtZMWVdyhDBKg2mF+
+D1hYc2Ryx+hFjtyp8iY/xnmMsVMIM4GwVhO+5lFc2JsKT0ucVlMC6U/2DWDqTUJV6HwbISHTGzrM
+d/K4kPFox/la/vot9L/J9UUbzjgQKjeKeaO04wlshYaT/4mWJ3iBj2fjRnRUjtkNaeJK9E10A/+y
+d+2VZ5fkscWrv2oj6NSU4kQoYsRL4vDY4ilrGnB+JGGTe08DMiUNRSQrlrRGar9KC/eaj8GsGsVn
+82800vpzY4zvFrCopEYq+OsS7HK07/grfoxSwIuEVPkvPuNVqNxmsdnhX9izjFk0WaSrT2y7Hxjb
+davYy5LNlDhhDgcGH0tGEPEVvo2FXDtKK4F5D7Rpn0lQl033DlZdwJVqwjbDG2jJ9SrcR5q+ss7F
+Jej6A7na+RZukYT1HCjI/CbM1xyQVqdfbzoEvM14iQuODy+jqk+iGxI9FghAD/FGTNeqewjBCvVt
+J94Cj8rDtSvK6evIIVM4pcw72Hc3MKJP2W/R8kCtQXoXxdZKNYm3QdV8hn9VTYNKpXMgwDqvkPGa
+JI7ZjnHKe7iG2rKPmT4dEw0SEe7Uq/DpFXYC5ODfqiAeW2GFZECpkJcNrVPSWh2HagCXZWK0vm9q
+p/UsQu0yrbYhnr68
+-----END CERTIFICATE-----
+
+Hellenic Academic and Research Institutions ECC RootCA 2015
+===========================================================
+-----BEGIN CERTIFICATE-----
+MIICwzCCAkqgAwIBAgIBADAKBggqhkjOPQQDAjCBqjELMAkGA1UEBhMCR1IxDzANBgNVBAcTBkF0
+aGVuczFEMEIGA1UEChM7SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9u
+cyBDZXJ0LiBBdXRob3JpdHkxRDBCBgNVBAMTO0hlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJj
+aCBJbnN0aXR1dGlvbnMgRUNDIFJvb3RDQSAyMDE1MB4XDTE1MDcwNzEwMzcxMloXDTQwMDYzMDEw
+MzcxMlowgaoxCzAJBgNVBAYTAkdSMQ8wDQYDVQQHEwZBdGhlbnMxRDBCBgNVBAoTO0hlbGxlbmlj
+IEFjYWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1dGlvbnMgQ2VydC4gQXV0aG9yaXR5MUQwQgYD
+VQQDEztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIEVDQyBSb290
+Q0EgMjAxNTB2MBAGByqGSM49AgEGBSuBBAAiA2IABJKgQehLgoRc4vgxEZmGZE4JJS+dQS8KrjVP
+dJWyUWRrjWvmP3CV8AVER6ZyOFB2lQJajq4onvktTpnvLEhvTCUp6NFxW98dwXU3tNf6e3pCnGoK
+Vlp8aQuqgAkkbH7BRqNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0O
+BBYEFLQiC4KZJAEOnLvkDv2/+5cgk5kqMAoGCCqGSM49BAMCA2cAMGQCMGfOFmI4oqxiRaeplSTA
+GiecMjvAwNW6qef4BENThe5SId6d9SWDPp5YSy/XZxMOIQIwBeF1Ad5o7SofTUwJCA3sS61kFyjn
+dc5FZXIhF8siQQ6ME5g4mlRtm8rifOoCWCKR
+-----END CERTIFICATE-----
+
+ISRG Root X1
+============
+-----BEGIN CERTIFICATE-----
+MIIFazCCA1OgAwIBAgIRAIIQz7DSQONZRGPgu2OCiwAwDQYJKoZIhvcNAQELBQAwTzELMAkGA1UE
+BhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2VhcmNoIEdyb3VwMRUwEwYDVQQD
+EwxJU1JHIFJvb3QgWDEwHhcNMTUwNjA0MTEwNDM4WhcNMzUwNjA0MTEwNDM4WjBPMQswCQYDVQQG
+EwJVUzEpMCcGA1UEChMgSW50ZXJuZXQgU2VjdXJpdHkgUmVzZWFyY2ggR3JvdXAxFTATBgNVBAMT
+DElTUkcgUm9vdCBYMTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAK3oJHP0FDfzm54r
+Vygch77ct984kIxuPOZXoHj3dcKi/vVqbvYATyjb3miGbESTtrFj/RQSa78f0uoxmyF+0TM8ukj1
+3Xnfs7j/EvEhmkvBioZxaUpmZmyPfjxwv60pIgbz5MDmgK7iS4+3mX6UA5/TR5d8mUgjU+g4rk8K
+b4Mu0UlXjIB0ttov0DiNewNwIRt18jA8+o+u3dpjq+sWT8KOEUt+zwvo/7V3LvSye0rgTBIlDHCN
+Aymg4VMk7BPZ7hm/ELNKjD+Jo2FR3qyHB5T0Y3HsLuJvW5iB4YlcNHlsdu87kGJ55tukmi8mxdAQ
+4Q7e2RCOFvu396j3x+UCB5iPNgiV5+I3lg02dZ77DnKxHZu8A/lJBdiB3QW0KtZB6awBdpUKD9jf
+1b0SHzUvKBds0pjBqAlkd25HN7rOrFleaJ1/ctaJxQZBKT5ZPt0m9STJEadao0xAH0ahmbWnOlFu
+hjuefXKnEgV4We0+UXgVCwOPjdAvBbI+e0ocS3MFEvzG6uBQE3xDk3SzynTnjh8BCNAw1FtxNrQH
+usEwMFxIt4I7mKZ9YIqioymCzLq9gwQbooMDQaHWBfEbwrbwqHyGO0aoSCqI3Haadr8faqU9GY/r
+OPNk3sgrDQoo//fb4hVC1CLQJ13hef4Y53CIrU7m2Ys6xt0nUW7/vGT1M0NPAgMBAAGjQjBAMA4G
+A1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBR5tFnme7bl5AFzgAiIyBpY
+9umbbjANBgkqhkiG9w0BAQsFAAOCAgEAVR9YqbyyqFDQDLHYGmkgJykIrGF1XIpu+ILlaS/V9lZL
+ubhzEFnTIZd+50xx+7LSYK05qAvqFyFWhfFQDlnrzuBZ6brJFe+GnY+EgPbk6ZGQ3BebYhtF8GaV
+0nxvwuo77x/Py9auJ/GpsMiu/X1+mvoiBOv/2X/qkSsisRcOj/KKNFtY2PwByVS5uCbMiogziUwt
+hDyC3+6WVwW6LLv3xLfHTjuCvjHIInNzktHCgKQ5ORAzI4JMPJ+GslWYHb4phowim57iaztXOoJw
+TdwJx4nLCgdNbOhdjsnvzqvHu7UrTkXWStAmzOVyyghqpZXjFaH3pO3JLF+l+/+sKAIuvtd7u+Nx
+e5AW0wdeRlN8NwdCjNPElpzVmbUq4JUagEiuTDkHzsxHpFKVK7q4+63SM1N95R1NbdWhscdCb+ZA
+JzVcoyi3B43njTOQ5yOf+1CceWxG1bQVs5ZufpsMljq4Ui0/1lvh+wjChP4kqKOJ2qxq4RgqsahD
+YVvTH9w7jXbyLeiNdd8XM2w9U/t7y0Ff/9yi0GE44Za4rF2LN9d11TPAmRGunUHBcnWEvgJBQl9n
+JEiU0Zsnvgc/ubhPgXRR4Xq37Z0j4r7g1SgEEzwxA57demyPxgcYxn/eR44/KJ4EBs+lVDR3veyJ
+m+kXQ99b21/+jh5Xos1AnX5iItreGCc=
+-----END CERTIFICATE-----
+
+AC RAIZ FNMT-RCM
+================
+-----BEGIN CERTIFICATE-----
+MIIFgzCCA2ugAwIBAgIPXZONMGc2yAYdGsdUhGkHMA0GCSqGSIb3DQEBCwUAMDsxCzAJBgNVBAYT
+AkVTMREwDwYDVQQKDAhGTk1ULVJDTTEZMBcGA1UECwwQQUMgUkFJWiBGTk1ULVJDTTAeFw0wODEw
+MjkxNTU5NTZaFw0zMDAxMDEwMDAwMDBaMDsxCzAJBgNVBAYTAkVTMREwDwYDVQQKDAhGTk1ULVJD
+TTEZMBcGA1UECwwQQUMgUkFJWiBGTk1ULVJDTTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoC
+ggIBALpxgHpMhm5/yBNtwMZ9HACXjywMI7sQmkCpGreHiPibVmr75nuOi5KOpyVdWRHbNi63URcf
+qQgfBBckWKo3Shjf5TnUV/3XwSyRAZHiItQDwFj8d0fsjz50Q7qsNI1NOHZnjrDIbzAzWHFctPVr
+btQBULgTfmxKo0nRIBnuvMApGGWn3v7v3QqQIecaZ5JCEJhfTzC8PhxFtBDXaEAUwED653cXeuYL
+j2VbPNmaUtu1vZ5Gzz3rkQUCwJaydkxNEJY7kvqcfw+Z374jNUUeAlz+taibmSXaXvMiwzn15Cou
+08YfxGyqxRxqAQVKL9LFwag0Jl1mpdICIfkYtwb1TplvqKtMUejPUBjFd8g5CSxJkjKZqLsXF3mw
+WsXmo8RZZUc1g16p6DULmbvkzSDGm0oGObVo/CK67lWMK07q87Hj/LaZmtVC+nFNCM+HHmpxffnT
+tOmlcYF7wk5HlqX2doWjKI/pgG6BU6VtX7hI+cL5NqYuSf+4lsKMB7ObiFj86xsc3i1w4peSMKGJ
+47xVqCfWS+2QrYv6YyVZLag13cqXM7zlzced0ezvXg5KkAYmY6252TUtB7p2ZSysV4999AeU14EC
+ll2jB0nVetBX+RvnU0Z1qrB5QstocQjpYL05ac70r8NWQMetUqIJ5G+GR4of6ygnXYMgrwTJbFaa
+i0b1AgMBAAGjgYMwgYAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYE
+FPd9xf3E6Jobd2Sn9R2gzL+HYJptMD4GA1UdIAQ3MDUwMwYEVR0gADArMCkGCCsGAQUFBwIBFh1o
+dHRwOi8vd3d3LmNlcnQuZm5tdC5lcy9kcGNzLzANBgkqhkiG9w0BAQsFAAOCAgEAB5BK3/MjTvDD
+nFFlm5wioooMhfNzKWtN/gHiqQxjAb8EZ6WdmF/9ARP67Jpi6Yb+tmLSbkyU+8B1RXxlDPiyN8+s
+D8+Nb/kZ94/sHvJwnvDKuO+3/3Y3dlv2bojzr2IyIpMNOmqOFGYMLVN0V2Ue1bLdI4E7pWYjJ2cJ
+j+F3qkPNZVEI7VFY/uY5+ctHhKQV8Xa7pO6kO8Rf77IzlhEYt8llvhjho6Tc+hj507wTmzl6NLrT
+Qfv6MooqtyuGC2mDOL7Nii4LcK2NJpLuHvUBKwrZ1pebbuCoGRw6IYsMHkCtA+fdZn71uSANA+iW
++YJF1DngoABd15jmfZ5nc8OaKveri6E6FO80vFIOiZiaBECEHX5FaZNXzuvO+FB8TxxuBEOb+dY7
+Ixjp6o7RTUaN8Tvkasq6+yO3m/qZASlaWFot4/nUbQ4mrcFuNLwy+AwF+mWj2zs3gyLp1txyM/1d
+8iC9djwj2ij3+RvrWWTV3F9yfiD8zYm1kGdNYno/Tq0dwzn+evQoFt9B9kiABdcPUXmsEKvU7ANm
+5mqwujGSQkBqvjrTcuFqN1W8rB2Vt2lh8kORdOag0wokRqEIr9baRRmW1FMdW4R58MD3R++Lj8UG
+rp1MYp3/RgT408m2ECVAdf4WqslKYIYvuu8wd+RU4riEmViAqhOLUTpPSPaLtrM=
+-----END CERTIFICATE-----
+
+Amazon Root CA 1
+================
+-----BEGIN CERTIFICATE-----
+MIIDQTCCAimgAwIBAgITBmyfz5m/jAo54vB4ikPmljZbyjANBgkqhkiG9w0BAQsFADA5MQswCQYD
+VQQGEwJVUzEPMA0GA1UEChMGQW1hem9uMRkwFwYDVQQDExBBbWF6b24gUm9vdCBDQSAxMB4XDTE1
+MDUyNjAwMDAwMFoXDTM4MDExNzAwMDAwMFowOTELMAkGA1UEBhMCVVMxDzANBgNVBAoTBkFtYXpv
+bjEZMBcGA1UEAxMQQW1hem9uIFJvb3QgQ0EgMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBALJ4gHHKeNXjca9HgFB0fW7Y14h29Jlo91ghYPl0hAEvrAIthtOgQ3pOsqTQNroBvo3bSMgH
+FzZM9O6II8c+6zf1tRn4SWiw3te5djgdYZ6k/oI2peVKVuRF4fn9tBb6dNqcmzU5L/qwIFAGbHrQ
+gLKm+a/sRxmPUDgH3KKHOVj4utWp+UhnMJbulHheb4mjUcAwhmahRWa6VOujw5H5SNz/0egwLX0t
+dHA114gk957EWW67c4cX8jJGKLhD+rcdqsq08p8kDi1L93FcXmn/6pUCyziKrlA4b9v7LWIbxcce
+VOF34GfID5yHI9Y/QCB/IIDEgEw+OyQmjgSubJrIqg0CAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB
+/zAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0OBBYEFIQYzIU07LwMlJQuCFmcx7IQTgoIMA0GCSqGSIb3
+DQEBCwUAA4IBAQCY8jdaQZChGsV2USggNiMOruYou6r4lK5IpDB/G/wkjUu0yKGX9rbxenDIU5PM
+CCjjmCXPI6T53iHTfIUJrU6adTrCC2qJeHZERxhlbI1Bjjt/msv0tadQ1wUsN+gDS63pYaACbvXy
+8MWy7Vu33PqUXHeeE6V/Uq2V8viTO96LXFvKWlJbYK8U90vvo/ufQJVtMVT8QtPHRh8jrdkPSHCa
+2XV4cdFyQzR1bldZwgJcJmApzyMZFo6IQ6XU5MsI+yMRQ+hDKXJioaldXgjUkK642M4UwtBV8ob2
+xJNDd2ZhwLnoQdeXeGADbkpyrqXRfboQnoZsG4q5WTP468SQvvG5
+-----END CERTIFICATE-----
+
+Amazon Root CA 2
+================
+-----BEGIN CERTIFICATE-----
+MIIFQTCCAymgAwIBAgITBmyf0pY1hp8KD+WGePhbJruKNzANBgkqhkiG9w0BAQwFADA5MQswCQYD
+VQQGEwJVUzEPMA0GA1UEChMGQW1hem9uMRkwFwYDVQQDExBBbWF6b24gUm9vdCBDQSAyMB4XDTE1
+MDUyNjAwMDAwMFoXDTQwMDUyNjAwMDAwMFowOTELMAkGA1UEBhMCVVMxDzANBgNVBAoTBkFtYXpv
+bjEZMBcGA1UEAxMQQW1hem9uIFJvb3QgQ0EgMjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoC
+ggIBAK2Wny2cSkxKgXlRmeyKy2tgURO8TW0G/LAIjd0ZEGrHJgw12MBvIITplLGbhQPDW9tK6Mj4
+kHbZW0/jTOgGNk3Mmqw9DJArktQGGWCsN0R5hYGCrVo34A3MnaZMUnbqQ523BNFQ9lXg1dKmSYXp
+N+nKfq5clU1Imj+uIFptiJXZNLhSGkOQsL9sBbm2eLfq0OQ6PBJTYv9K8nu+NQWpEjTj82R0Yiw9
+AElaKP4yRLuH3WUnAnE72kr3H9rN9yFVkE8P7K6C4Z9r2UXTu/Bfh+08LDmG2j/e7HJV63mjrdvd
+fLC6HM783k81ds8P+HgfajZRRidhW+mez/CiVX18JYpvL7TFz4QuK/0NURBs+18bvBt+xa47mAEx
+kv8LV/SasrlX6avvDXbR8O70zoan4G7ptGmh32n2M8ZpLpcTnqWHsFcQgTfJU7O7f/aS0ZzQGPSS
+btqDT6ZjmUyl+17vIWR6IF9sZIUVyzfpYgwLKhbcAS4y2j5L9Z469hdAlO+ekQiG+r5jqFoz7Mt0
+Q5X5bGlSNscpb/xVA1wf+5+9R+vnSUeVC06JIglJ4PVhHvG/LopyboBZ/1c6+XUyo05f7O0oYtlN
+c/LMgRdg7c3r3NunysV+Ar3yVAhU/bQtCSwXVEqY0VThUWcI0u1ufm8/0i2BWSlmy5A5lREedCf+
+3euvAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMB0GA1UdDgQWBBSw
+DPBMMPQFWAJI/TPlUq9LhONmUjANBgkqhkiG9w0BAQwFAAOCAgEAqqiAjw54o+Ci1M3m9Zh6O+oA
+A7CXDpO8Wqj2LIxyh6mx/H9z/WNxeKWHWc8w4Q0QshNabYL1auaAn6AFC2jkR2vHat+2/XcycuUY
++gn0oJMsXdKMdYV2ZZAMA3m3MSNjrXiDCYZohMr/+c8mmpJ5581LxedhpxfL86kSk5Nrp+gvU5LE
+YFiwzAJRGFuFjWJZY7attN6a+yb3ACfAXVU3dJnJUH/jWS5E4ywl7uxMMne0nxrpS10gxdr9HIcW
+xkPo1LsmmkVwXqkLN1PiRnsn/eBG8om3zEK2yygmbtmlyTrIQRNg91CMFa6ybRoVGld45pIq2WWQ
+gj9sAq+uEjonljYE1x2igGOpm/HlurR8FLBOybEfdF849lHqm/osohHUqS0nGkWxr7JOcQ3AWEbW
+aQbLU8uz/mtBzUF+fUwPfHJ5elnNXkoOrJupmHN5fLT0zLm4BwyydFy4x2+IoZCn9Kr5v2c69BoV
+Yh63n749sSmvZ6ES8lgQGVMDMBu4Gon2nL2XA46jCfMdiyHxtN/kHNGfZQIG6lzWE7OE76KlXIx3
+KadowGuuQNKotOrN8I1LOJwZmhsoVLiJkO/KdYE+HvJkJMcYr07/R54H9jVlpNMKVv/1F2Rs76gi
+JUmTtt8AF9pYfl3uxRuw0dFfIRDH+fO6AgonB8Xx1sfT4PsJYGw=
+-----END CERTIFICATE-----
+
+Amazon Root CA 3
+================
+-----BEGIN CERTIFICATE-----
+MIIBtjCCAVugAwIBAgITBmyf1XSXNmY/Owua2eiedgPySjAKBggqhkjOPQQDAjA5MQswCQYDVQQG
+EwJVUzEPMA0GA1UEChMGQW1hem9uMRkwFwYDVQQDExBBbWF6b24gUm9vdCBDQSAzMB4XDTE1MDUy
+NjAwMDAwMFoXDTQwMDUyNjAwMDAwMFowOTELMAkGA1UEBhMCVVMxDzANBgNVBAoTBkFtYXpvbjEZ
+MBcGA1UEAxMQQW1hem9uIFJvb3QgQ0EgMzBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABCmXp8ZB
+f8ANm+gBG1bG8lKlui2yEujSLtf6ycXYqm0fc4E7O5hrOXwzpcVOho6AF2hiRVd9RFgdszflZwjr
+Zt6jQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMB0GA1UdDgQWBBSrttvXBp43
+rDCGB5Fwx5zEGbF4wDAKBggqhkjOPQQDAgNJADBGAiEA4IWSoxe3jfkrBqWTrBqYaGFy+uGh0Psc
+eGCmQ5nFuMQCIQCcAu/xlJyzlvnrxir4tiz+OpAUFteMYyRIHN8wfdVoOw==
+-----END CERTIFICATE-----
+
+Amazon Root CA 4
+================
+-----BEGIN CERTIFICATE-----
+MIIB8jCCAXigAwIBAgITBmyf18G7EEwpQ+Vxe3ssyBrBDjAKBggqhkjOPQQDAzA5MQswCQYDVQQG
+EwJVUzEPMA0GA1UEChMGQW1hem9uMRkwFwYDVQQDExBBbWF6b24gUm9vdCBDQSA0MB4XDTE1MDUy
+NjAwMDAwMFoXDTQwMDUyNjAwMDAwMFowOTELMAkGA1UEBhMCVVMxDzANBgNVBAoTBkFtYXpvbjEZ
+MBcGA1UEAxMQQW1hem9uIFJvb3QgQ0EgNDB2MBAGByqGSM49AgEGBSuBBAAiA2IABNKrijdPo1MN
+/sGKe0uoe0ZLY7Bi9i0b2whxIdIA6GO9mif78DluXeo9pcmBqqNbIJhFXRbb/egQbeOc4OO9X4Ri
+83BkM6DLJC9wuoihKqB1+IGuYgbEgds5bimwHvouXKNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNV
+HQ8BAf8EBAMCAYYwHQYDVR0OBBYEFNPsxzplbszh2naaVvuc84ZtV+WBMAoGCCqGSM49BAMDA2gA
+MGUCMDqLIfG9fhGt0O9Yli/W651+kI0rz2ZVwyzjKKlwCkcO8DdZEv8tmZQoTipPNU0zWgIxAOp1
+AE47xDqUEpHJWEadIRNyp4iciuRMStuW1KyLa2tJElMzrdfkviT8tQp21KW8EA==
+-----END CERTIFICATE-----
+
+TUBITAK Kamu SM SSL Kok Sertifikasi - Surum 1
+=============================================
+-----BEGIN CERTIFICATE-----
+MIIEYzCCA0ugAwIBAgIBATANBgkqhkiG9w0BAQsFADCB0jELMAkGA1UEBhMCVFIxGDAWBgNVBAcT
+D0dlYnplIC0gS29jYWVsaTFCMEAGA1UEChM5VHVya2l5ZSBCaWxpbXNlbCB2ZSBUZWtub2xvamlr
+IEFyYXN0aXJtYSBLdXJ1bXUgLSBUVUJJVEFLMS0wKwYDVQQLEyRLYW11IFNlcnRpZmlrYXN5b24g
+TWVya2V6aSAtIEthbXUgU00xNjA0BgNVBAMTLVRVQklUQUsgS2FtdSBTTSBTU0wgS29rIFNlcnRp
+ZmlrYXNpIC0gU3VydW0gMTAeFw0xMzExMjUwODI1NTVaFw00MzEwMjUwODI1NTVaMIHSMQswCQYD
+VQQGEwJUUjEYMBYGA1UEBxMPR2ViemUgLSBLb2NhZWxpMUIwQAYDVQQKEzlUdXJraXllIEJpbGlt
+c2VsIHZlIFRla25vbG9qaWsgQXJhc3Rpcm1hIEt1cnVtdSAtIFRVQklUQUsxLTArBgNVBAsTJEth
+bXUgU2VydGlmaWthc3lvbiBNZXJrZXppIC0gS2FtdSBTTTE2MDQGA1UEAxMtVFVCSVRBSyBLYW11
+IFNNIFNTTCBLb2sgU2VydGlmaWthc2kgLSBTdXJ1bSAxMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAr3UwM6q7a9OZLBI3hNmNe5eA027n/5tQlT6QlVZC1xl8JoSNkvoBHToP4mQ4t4y8
+6Ij5iySrLqP1N+RAjhgleYN1Hzv/bKjFxlb4tO2KRKOrbEz8HdDc72i9z+SqzvBV96I01INrN3wc
+wv61A+xXzry0tcXtAA9TNypN9E8Mg/uGz8v+jE69h/mniyFXnHrfA2eJLJ2XYacQuFWQfw4tJzh0
+3+f92k4S400VIgLI4OD8D62K18lUUMw7D8oWgITQUVbDjlZ/iSIzL+aFCr2lqBs23tPcLG07xxO9
+WSMs5uWk99gL7eqQQESolbuT1dCANLZGeA4fAJNG4e7p+exPFwIDAQABo0IwQDAdBgNVHQ4EFgQU
+ZT/HiobGPN08VFw1+DrtUgxHV8gwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wDQYJ
+KoZIhvcNAQELBQADggEBACo/4fEyjq7hmFxLXs9rHmoJ0iKpEsdeV31zVmSAhHqT5Am5EM2fKifh
+AHe+SMg1qIGf5LgsyX8OsNJLN13qudULXjS99HMpw+0mFZx+CFOKWI3QSyjfwbPfIPP54+M638yc
+lNhOT8NrF7f3cuitZjO1JVOr4PhMqZ398g26rrnZqsZr+ZO7rqu4lzwDGrpDxpa5RXI4s6ehlj2R
+e37AIVNMh+3yC1SVUZPVIqUNivGTDj5UDrDYyU7c8jEyVupk+eq1nRZmQnLzf9OxMUP8pI4X8W0j
+q5Rm+K37DwhuJi1/FwcJsoz7UMCflo3Ptv0AnVoUmr8CRPXBwp8iXqIPoeM=
+-----END CERTIFICATE-----
+
+GDCA TrustAUTH R5 ROOT
+======================
+-----BEGIN CERTIFICATE-----
+MIIFiDCCA3CgAwIBAgIIfQmX/vBH6nowDQYJKoZIhvcNAQELBQAwYjELMAkGA1UEBhMCQ04xMjAw
+BgNVBAoMKUdVQU5HIERPTkcgQ0VSVElGSUNBVEUgQVVUSE9SSVRZIENPLixMVEQuMR8wHQYDVQQD
+DBZHRENBIFRydXN0QVVUSCBSNSBST09UMB4XDTE0MTEyNjA1MTMxNVoXDTQwMTIzMTE1NTk1OVow
+YjELMAkGA1UEBhMCQ04xMjAwBgNVBAoMKUdVQU5HIERPTkcgQ0VSVElGSUNBVEUgQVVUSE9SSVRZ
+IENPLixMVEQuMR8wHQYDVQQDDBZHRENBIFRydXN0QVVUSCBSNSBST09UMIICIjANBgkqhkiG9w0B
+AQEFAAOCAg8AMIICCgKCAgEA2aMW8Mh0dHeb7zMNOwZ+Vfy1YI92hhJCfVZmPoiC7XJjDp6L3TQs
+AlFRwxn9WVSEyfFrs0yw6ehGXTjGoqcuEVe6ghWinI9tsJlKCvLriXBjTnnEt1u9ol2x8kECK62p
+OqPseQrsXzrj/e+APK00mxqriCZ7VqKChh/rNYmDf1+uKU49tm7srsHwJ5uu4/Ts765/94Y9cnrr
+pftZTqfrlYwiOXnhLQiPzLyRuEH3FMEjqcOtmkVEs7LXLM3GKeJQEK5cy4KOFxg2fZfmiJqwTTQJ
+9Cy5WmYqsBebnh52nUpmMUHfP/vFBu8btn4aRjb3ZGM74zkYI+dndRTVdVeSN72+ahsmUPI2JgaQ
+xXABZG12ZuGR224HwGGALrIuL4xwp9E7PLOR5G62xDtw8mySlwnNR30YwPO7ng/Wi64HtloPzgsM
+R6flPri9fcebNaBhlzpBdRfMK5Z3KpIhHtmVdiBnaM8Nvd/WHwlqmuLMc3GkL30SgLdTMEZeS1SZ
+D2fJpcjyIMGC7J0R38IC+xo70e0gmu9lZJIQDSri3nDxGGeCjGHeuLzRL5z7D9Ar7Rt2ueQ5Vfj4
+oR24qoAATILnsn8JuLwwoC8N9VKejveSswoAHQBUlwbgsQfZxw9cZX08bVlX5O2ljelAU58VS6Bx
+9hoh49pwBiFYFIeFd3mqgnkCAwEAAaNCMEAwHQYDVR0OBBYEFOLJQJ9NzuiaoXzPDj9lxSmIahlR
+MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEBCwUAA4ICAQDRSVfg
+p8xoWLoBDysZzY2wYUWsEe1jUGn4H3++Fo/9nesLqjJHdtJnJO29fDMylyrHBYZmDRd9FBUb1Ov9
+H5r2XpdptxolpAqzkT9fNqyL7FeoPueBihhXOYV0GkLH6VsTX4/5COmSdI31R9KrO9b7eGZONn35
+6ZLpBN79SWP8bfsUcZNnL0dKt7n/HipzcEYwv1ryL3ml4Y0M2fmyYzeMN2WFcGpcWwlyua1jPLHd
++PwyvzeG5LuOmCd+uh8W4XAR8gPfJWIyJyYYMoSf/wA6E7qaTfRPuBRwIrHKK5DOKcFw9C+df/KQ
+HtZa37dG/OaG+svgIHZ6uqbL9XzeYqWxi+7egmaKTjowHz+Ay60nugxe19CxVsp3cbK1daFQqUBD
+F8Io2c9Si1vIY9RCPqAzekYu9wogRlR+ak8x8YF+QnQ4ZXMn7sZ8uI7XpTrXmKGcjBBV09tL7ECQ
+8s1uV9JiDnxXk7Gnbc2dg7sq5+W2O3FYrf3RRbxake5TFW/TRQl1brqQXR4EzzffHqhmsYzmIGrv
+/EhOdJhCrylvLmrH+33RZjEizIYAfmaDDEL0vTSSwxrqT8p+ck0LcIymSLumoRT2+1hEmRSuqguT
+aaApJUqlyyvdimYHFngVV3Eb7PVHhPOeMTd61X8kreS8/f3MboPoDKi3QWwH3b08hpcv0g==
+-----END CERTIFICATE-----
+
+SSL.com Root Certification Authority RSA
+========================================
+-----BEGIN CERTIFICATE-----
+MIIF3TCCA8WgAwIBAgIIeyyb0xaAMpkwDQYJKoZIhvcNAQELBQAwfDELMAkGA1UEBhMCVVMxDjAM
+BgNVBAgMBVRleGFzMRAwDgYDVQQHDAdIb3VzdG9uMRgwFgYDVQQKDA9TU0wgQ29ycG9yYXRpb24x
+MTAvBgNVBAMMKFNTTC5jb20gUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSBSU0EwHhcNMTYw
+MjEyMTczOTM5WhcNNDEwMjEyMTczOTM5WjB8MQswCQYDVQQGEwJVUzEOMAwGA1UECAwFVGV4YXMx
+EDAOBgNVBAcMB0hvdXN0b24xGDAWBgNVBAoMD1NTTCBDb3Jwb3JhdGlvbjExMC8GA1UEAwwoU1NM
+LmNvbSBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IFJTQTCCAiIwDQYJKoZIhvcNAQEBBQAD
+ggIPADCCAgoCggIBAPkP3aMrfcvQKv7sZ4Wm5y4bunfh4/WvpOz6Sl2RxFdHaxh3a3by/ZPkPQ/C
+Fp4LZsNWlJ4Xg4XOVu/yFv0AYvUiCVToZRdOQbngT0aXqhvIuG5iXmmxX9sqAn78bMrzQdjt0Oj8
+P2FI7bADFB0QDksZ4LtO7IZl/zbzXmcCC52GVWH9ejjt/uIZALdvoVBidXQ8oPrIJZK0bnoix/ge
+oeOy3ZExqysdBP+lSgQ36YWkMyv94tZVNHwZpEpox7Ko07fKoZOI68GXvIz5HdkihCR0xwQ9aqkp
+k8zruFvh/l8lqjRYyMEjVJ0bmBHDOJx+PYZspQ9AhnwC9FwCTyjLrnGfDzrIM/4RJTXq/LrFYD3Z
+fBjVsqnTdXgDciLKOsMf7yzlLqn6niy2UUb9rwPW6mBo6oUWNmuF6R7As93EJNyAKoFBbZQ+yODJ
+gUEAnl6/f8UImKIYLEJAs/lvOCdLToD0PYFH4Ih86hzOtXVcUS4cK38acijnALXRdMbX5J+tB5O2
+UzU1/Dfkw/ZdFr4hc96SCvigY2q8lpJqPvi8ZVWb3vUNiSYE/CUapiVpy8JtynziWV+XrOvvLsi8
+1xtZPCvM8hnIk2snYxnP/Okm+Mpxm3+T/jRnhE6Z6/yzeAkzcLpmpnbtG3PrGqUNxCITIJRWCk4s
+bE6x/c+cCbqiM+2HAgMBAAGjYzBhMB0GA1UdDgQWBBTdBAkHovV6fVJTEpKV7jiAJQ2mWTAPBgNV
+HRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFN0ECQei9Xp9UlMSkpXuOIAlDaZZMA4GA1UdDwEB/wQE
+AwIBhjANBgkqhkiG9w0BAQsFAAOCAgEAIBgRlCn7Jp0cHh5wYfGVcpNxJK1ok1iOMq8bs3AD/CUr
+dIWQPXhq9LmLpZc7tRiRux6n+UBbkflVma8eEdBcHadm47GUBwwyOabqG7B52B2ccETjit3E+ZUf
+ijhDPwGFpUenPUayvOUiaPd7nNgsPgohyC0zrL/FgZkxdMF1ccW+sfAjRfSda/wZY52jvATGGAsl
+u1OJD7OAUN5F7kR/q5R4ZJjT9ijdh9hwZXT7DrkT66cPYakylszeu+1jTBi7qUD3oFRuIIhxdRjq
+erQ0cuAjJ3dctpDqhiVAq+8zD8ufgr6iIPv2tS0a5sKFsXQP+8hlAqRSAUfdSSLBv9jra6x+3uxj
+MxW3IwiPxg+NQVrdjsW5j+VFP3jbutIbQLH+cU0/4IGiul607BXgk90IH37hVZkLId6Tngr75qNJ
+vTYw/ud3sqB1l7UtgYgXZSD32pAAn8lSzDLKNXz1PQ/YK9f1JmzJBjSWFupwWRoyeXkLtoh/D1JI
+Pb9s2KJELtFOt3JY04kTlf5Eq/jXixtunLwsoFvVagCvXzfh1foQC5ichucmj87w7G6KVwuA406y
+wKBjYZC6VWg3dGq2ktufoYYitmUnDuy2n0Jg5GfCtdpBC8TTi2EbvPofkSvXRAdeuims2cXp71NI
+WuuA8ShYIc2wBlX7Jz9TkHCpBB5XJ7k=
+-----END CERTIFICATE-----
+
+SSL.com Root Certification Authority ECC
+========================================
+-----BEGIN CERTIFICATE-----
+MIICjTCCAhSgAwIBAgIIdebfy8FoW6gwCgYIKoZIzj0EAwIwfDELMAkGA1UEBhMCVVMxDjAMBgNV
+BAgMBVRleGFzMRAwDgYDVQQHDAdIb3VzdG9uMRgwFgYDVQQKDA9TU0wgQ29ycG9yYXRpb24xMTAv
+BgNVBAMMKFNTTC5jb20gUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSBFQ0MwHhcNMTYwMjEy
+MTgxNDAzWhcNNDEwMjEyMTgxNDAzWjB8MQswCQYDVQQGEwJVUzEOMAwGA1UECAwFVGV4YXMxEDAO
+BgNVBAcMB0hvdXN0b24xGDAWBgNVBAoMD1NTTCBDb3Jwb3JhdGlvbjExMC8GA1UEAwwoU1NMLmNv
+bSBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IEVDQzB2MBAGByqGSM49AgEGBSuBBAAiA2IA
+BEVuqVDEpiM2nl8ojRfLliJkP9x6jh3MCLOicSS6jkm5BBtHllirLZXI7Z4INcgn64mMU1jrYor+
+8FsPazFSY0E7ic3s7LaNGdM0B9y7xgZ/wkWV7Mt/qCPgCemB+vNH06NjMGEwHQYDVR0OBBYEFILR
+hXMw5zUE044CkvvlpNHEIejNMA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAUgtGFczDnNQTT
+jgKS++Wk0cQh6M0wDgYDVR0PAQH/BAQDAgGGMAoGCCqGSM49BAMCA2cAMGQCMG/n61kRpGDPYbCW
+e+0F+S8Tkdzt5fxQaxFGRrMcIQBiu77D5+jNB5n5DQtdcj7EqgIwH7y6C+IwJPt8bYBVCpk+gA0z
+5Wajs6O7pdWLjwkspl1+4vAHCGht0nxpbl/f5Wpl
+-----END CERTIFICATE-----
+
+SSL.com EV Root Certification Authority RSA R2
+==============================================
+-----BEGIN CERTIFICATE-----
+MIIF6zCCA9OgAwIBAgIIVrYpzTS8ePYwDQYJKoZIhvcNAQELBQAwgYIxCzAJBgNVBAYTAlVTMQ4w
+DAYDVQQIDAVUZXhhczEQMA4GA1UEBwwHSG91c3RvbjEYMBYGA1UECgwPU1NMIENvcnBvcmF0aW9u
+MTcwNQYDVQQDDC5TU0wuY29tIEVWIFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgUlNBIFIy
+MB4XDTE3MDUzMTE4MTQzN1oXDTQyMDUzMDE4MTQzN1owgYIxCzAJBgNVBAYTAlVTMQ4wDAYDVQQI
+DAVUZXhhczEQMA4GA1UEBwwHSG91c3RvbjEYMBYGA1UECgwPU1NMIENvcnBvcmF0aW9uMTcwNQYD
+VQQDDC5TU0wuY29tIEVWIFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgUlNBIFIyMIICIjAN
+BgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAjzZlQOHWTcDXtOlG2mvqM0fNTPl9fb69LT3w23jh
+hqXZuglXaO1XPqDQCEGD5yhBJB/jchXQARr7XnAjssufOePPxU7Gkm0mxnu7s9onnQqG6YE3Bf7w
+cXHswxzpY6IXFJ3vG2fThVUCAtZJycxa4bH3bzKfydQ7iEGonL3Lq9ttewkfokxykNorCPzPPFTO
+Zw+oz12WGQvE43LrrdF9HSfvkusQv1vrO6/PgN3B0pYEW3p+pKk8OHakYo6gOV7qd89dAFmPZiw+
+B6KjBSYRaZfqhbcPlgtLyEDhULouisv3D5oi53+aNxPN8k0TayHRwMwi8qFG9kRpnMphNQcAb9Zh
+CBHqurj26bNg5U257J8UZslXWNvNh2n4ioYSA0e/ZhN2rHd9NCSFg83XqpyQGp8hLH94t2S42Oim
+9HizVcuE0jLEeK6jj2HdzghTreyI/BXkmg3mnxp3zkyPuBQVPWKchjgGAGYS5Fl2WlPAApiiECto
+RHuOec4zSnaqW4EWG7WK2NAAe15itAnWhmMOpgWVSbooi4iTsjQc2KRVbrcc0N6ZVTsj9CLg+Slm
+JuwgUHfbSguPvuUCYHBBXtSuUDkiFCbLsjtzdFVHB3mBOagwE0TlBIqulhMlQg+5U8Sb/M3kHN48
++qvWBkofZ6aYMBzdLNvcGJVXZsb/XItW9XcCAwEAAaNjMGEwDwYDVR0TAQH/BAUwAwEB/zAfBgNV
+HSMEGDAWgBT5YLvU49U09rj1BoAlp3PbRmmonjAdBgNVHQ4EFgQU+WC71OPVNPa49QaAJadz20Zp
+qJ4wDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEBCwUAA4ICAQBWs47LCp1Jjr+kxJG7ZhcFUZh1
+++VQLHqe8RT6q9OKPv+RKY9ji9i0qVQBDb6Thi/5Sm3HXvVX+cpVHBK+Rw82xd9qt9t1wkclf7nx
+Y/hoLVUE0fKNsKTPvDxeH3jnpaAgcLAExbf3cqfeIg29MyVGjGSSJuM+LmOW2puMPfgYCdcDzH2G
+guDKBAdRUNf/ktUM79qGn5nX67evaOI5JpS6aLe/g9Pqemc9YmeuJeVy6OLk7K4S9ksrPJ/psEDz
+OFSz/bdoyNrGj1E8svuR3Bznm53htw1yj+KkxKl4+esUrMZDBcJlOSgYAsOCsp0FvmXtll9ldDz7
+CTUue5wT/RsPXcdtgTpWD8w74a8CLyKsRspGPKAcTNZEtF4uXBVmCeEmKf7GUmG6sXP/wwyc5Wxq
+lD8UykAWlYTzWamsX0xhk23RO8yilQwipmdnRC652dKKQbNmC1r7fSOl8hqw/96bg5Qu0T/fkreR
+rwU7ZcegbLHNYhLDkBvjJc40vG93drEQw/cFGsDWr3RiSBd3kmmQYRzelYB0VI8YHMPzA9C/pEN1
+hlMYegouCRw2n5H9gooiS9EOUCXdywMMF8mDAAhONU2Ki+3wApRmLER/y5UnlhetCTCstnEXbosX
+9hwJ1C07mKVx01QT2WDz9UtmT/rx7iASjbSsV7FFY6GsdqnC+w==
+-----END CERTIFICATE-----
+
+SSL.com EV Root Certification Authority ECC
+===========================================
+-----BEGIN CERTIFICATE-----
+MIIClDCCAhqgAwIBAgIILCmcWxbtBZUwCgYIKoZIzj0EAwIwfzELMAkGA1UEBhMCVVMxDjAMBgNV
+BAgMBVRleGFzMRAwDgYDVQQHDAdIb3VzdG9uMRgwFgYDVQQKDA9TU0wgQ29ycG9yYXRpb24xNDAy
+BgNVBAMMK1NTTC5jb20gRVYgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSBFQ0MwHhcNMTYw
+MjEyMTgxNTIzWhcNNDEwMjEyMTgxNTIzWjB/MQswCQYDVQQGEwJVUzEOMAwGA1UECAwFVGV4YXMx
+EDAOBgNVBAcMB0hvdXN0b24xGDAWBgNVBAoMD1NTTCBDb3Jwb3JhdGlvbjE0MDIGA1UEAwwrU1NM
+LmNvbSBFViBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IEVDQzB2MBAGByqGSM49AgEGBSuB
+BAAiA2IABKoSR5CYG/vvw0AHgyBO8TCCogbR8pKGYfL2IWjKAMTH6kMAVIbc/R/fALhBYlzccBYy
+3h+Z1MzFB8gIH2EWB1E9fVwHU+M1OIzfzZ/ZLg1KthkuWnBaBu2+8KGwytAJKaNjMGEwHQYDVR0O
+BBYEFFvKXuXe0oGqzagtZFG22XKbl+ZPMA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAUW8pe
+5d7SgarNqC1kUbbZcpuX5k8wDgYDVR0PAQH/BAQDAgGGMAoGCCqGSM49BAMCA2gAMGUCMQCK5kCJ
+N+vp1RPZytRrJPOwPYdGWBrssd9v+1a6cGvHOMzosYxPD/fxZ3YOg9AeUY8CMD32IygmTMZgh5Mm
+m7I1HrrW9zzRHM76JTymGoEVW/MSD2zuZYrJh6j5B+BimoxcSg==
+-----END CERTIFICATE-----
+
+GlobalSign Root CA - R6
+=======================
+-----BEGIN CERTIFICATE-----
+MIIFgzCCA2ugAwIBAgIORea7A4Mzw4VlSOb/RVEwDQYJKoZIhvcNAQEMBQAwTDEgMB4GA1UECxMX
+R2xvYmFsU2lnbiBSb290IENBIC0gUjYxEzARBgNVBAoTCkdsb2JhbFNpZ24xEzARBgNVBAMTCkds
+b2JhbFNpZ24wHhcNMTQxMjEwMDAwMDAwWhcNMzQxMjEwMDAwMDAwWjBMMSAwHgYDVQQLExdHbG9i
+YWxTaWduIFJvb3QgQ0EgLSBSNjETMBEGA1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFs
+U2lnbjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAJUH6HPKZvnsFMp7PPcNCPG0RQss
+grRIxutbPK6DuEGSMxSkb3/pKszGsIhrxbaJ0cay/xTOURQh7ErdG1rG1ofuTToVBu1kZguSgMpE
+3nOUTvOniX9PeGMIyBJQbUJmL025eShNUhqKGoC3GYEOfsSKvGRMIRxDaNc9PIrFsmbVkJq3MQbF
+vuJtMgamHvm566qjuL++gmNQ0PAYid/kD3n16qIfKtJwLnvnvJO7bVPiSHyMEAc4/2ayd2F+4OqM
+PKq0pPbzlUoSB239jLKJz9CgYXfIWHSw1CM69106yqLbnQneXUQtkPGBzVeS+n68UARjNN9rkxi+
+azayOeSsJDa38O+2HBNXk7besvjihbdzorg1qkXy4J02oW9UivFyVm4uiMVRQkQVlO6jxTiWm05O
+WgtH8wY2SXcwvHE35absIQh1/OZhFj931dmRl4QKbNQCTXTAFO39OfuD8l4UoQSwC+n+7o/hbguy
+CLNhZglqsQY6ZZZZwPA1/cnaKI0aEYdwgQqomnUdnjqGBQCe24DWJfncBZ4nWUx2OVvq+aWh2IMP
+0f/fMBH5hc8zSPXKbWQULHpYT9NLCEnFlWQaYw55PfWzjMpYrZxCRXluDocZXFSxZba/jJvcE+kN
+b7gu3GduyYsRtYQUigAZcIN5kZeR1BonvzceMgfYFGM8KEyvAgMBAAGjYzBhMA4GA1UdDwEB/wQE
+AwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBSubAWjkxPioufi1xzWx/B/yGdToDAfBgNV
+HSMEGDAWgBSubAWjkxPioufi1xzWx/B/yGdToDANBgkqhkiG9w0BAQwFAAOCAgEAgyXt6NH9lVLN
+nsAEoJFp5lzQhN7craJP6Ed41mWYqVuoPId8AorRbrcWc+ZfwFSY1XS+wc3iEZGtIxg93eFyRJa0
+lV7Ae46ZeBZDE1ZXs6KzO7V33EByrKPrmzU+sQghoefEQzd5Mr6155wsTLxDKZmOMNOsIeDjHfrY
+BzN2VAAiKrlNIC5waNrlU/yDXNOd8v9EDERm8tLjvUYAGm0CuiVdjaExUd1URhxN25mW7xocBFym
+Fe944Hn+Xds+qkxV/ZoVqW/hpvvfcDDpw+5CRu3CkwWJ+n1jez/QcYF8AOiYrg54NMMl+68KnyBr
+3TsTjxKM4kEaSHpzoHdpx7Zcf4LIHv5YGygrqGytXm3ABdJ7t+uA/iU3/gKbaKxCXcPu9czc8FB1
+0jZpnOZ7BN9uBmm23goJSFmH63sUYHpkqmlD75HHTOwY3WzvUy2MmeFe8nI+z1TIvWfspA9MRf/T
+uTAjB0yPEL+GltmZWrSZVxykzLsViVO6LAUP5MSeGbEYNNVMnbrt9x+vJJUEeKgDu+6B5dpffItK
+oZB0JaezPkvILFa9x8jvOOJckvB595yEunQtYQEgfn7R8k8HWV+LLUNS60YMlOH1Zkd5d9VUWx+t
+JDfLRVpOoERIyNiwmcUVhAn21klJwGW45hpxbqCo8YLoRT5s1gLXCmeDBVrJpBA=
+-----END CERTIFICATE-----
+
+OISTE WISeKey Global Root GC CA
+===============================
+-----BEGIN CERTIFICATE-----
+MIICaTCCAe+gAwIBAgIQISpWDK7aDKtARb8roi066jAKBggqhkjOPQQDAzBtMQswCQYDVQQGEwJD
+SDEQMA4GA1UEChMHV0lTZUtleTEiMCAGA1UECxMZT0lTVEUgRm91bmRhdGlvbiBFbmRvcnNlZDEo
+MCYGA1UEAxMfT0lTVEUgV0lTZUtleSBHbG9iYWwgUm9vdCBHQyBDQTAeFw0xNzA1MDkwOTQ4MzRa
+Fw00MjA1MDkwOTU4MzNaMG0xCzAJBgNVBAYTAkNIMRAwDgYDVQQKEwdXSVNlS2V5MSIwIAYDVQQL
+ExlPSVNURSBGb3VuZGF0aW9uIEVuZG9yc2VkMSgwJgYDVQQDEx9PSVNURSBXSVNlS2V5IEdsb2Jh
+bCBSb290IEdDIENBMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAETOlQwMYPchi82PG6s4nieUqjFqdr
+VCTbUf/q9Akkwwsin8tqJ4KBDdLArzHkdIJuyiXZjHWd8dvQmqJLIX4Wp2OQ0jnUsYd4XxiWD1Ab
+NTcPasbc2RNNpI6QN+a9WzGRo1QwUjAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAd
+BgNVHQ4EFgQUSIcUrOPDnpBgOtfKie7TrYy0UGYwEAYJKwYBBAGCNxUBBAMCAQAwCgYIKoZIzj0E
+AwMDaAAwZQIwJsdpW9zV57LnyAyMjMPdeYwbY9XJUpROTYJKcx6ygISpJcBMWm1JKWB4E+J+SOtk
+AjEA2zQgMgj/mkkCtojeFK9dbJlxjRo/i9fgojaGHAeCOnZT/cKi7e97sIBPWA9LUzm9
+-----END CERTIFICATE-----
+
+UCA Global G2 Root
+==================
+-----BEGIN CERTIFICATE-----
+MIIFRjCCAy6gAwIBAgIQXd+x2lqj7V2+WmUgZQOQ7zANBgkqhkiG9w0BAQsFADA9MQswCQYDVQQG
+EwJDTjERMA8GA1UECgwIVW5pVHJ1c3QxGzAZBgNVBAMMElVDQSBHbG9iYWwgRzIgUm9vdDAeFw0x
+NjAzMTEwMDAwMDBaFw00MDEyMzEwMDAwMDBaMD0xCzAJBgNVBAYTAkNOMREwDwYDVQQKDAhVbmlU
+cnVzdDEbMBkGA1UEAwwSVUNBIEdsb2JhbCBHMiBSb290MIICIjANBgkqhkiG9w0BAQEFAAOCAg8A
+MIICCgKCAgEAxeYrb3zvJgUno4Ek2m/LAfmZmqkywiKHYUGRO8vDaBsGxUypK8FnFyIdK+35KYmT
+oni9kmugow2ifsqTs6bRjDXVdfkX9s9FxeV67HeToI8jrg4aA3++1NDtLnurRiNb/yzmVHqUwCoV
+8MmNsHo7JOHXaOIxPAYzRrZUEaalLyJUKlgNAQLx+hVRZ2zA+te2G3/RVogvGjqNO7uCEeBHANBS
+h6v7hn4PJGtAnTRnvI3HLYZveT6OqTwXS3+wmeOwcWDcC/Vkw85DvG1xudLeJ1uK6NjGruFZfc8o
+LTW4lVYa8bJYS7cSN8h8s+1LgOGN+jIjtm+3SJUIsUROhYw6AlQgL9+/V087OpAh18EmNVQg7Mc/
+R+zvWr9LesGtOxdQXGLYD0tK3Cv6brxzks3sx1DoQZbXqX5t2Okdj4q1uViSukqSKwxW/YDrCPBe
+KW4bHAyvj5OJrdu9o54hyokZ7N+1wxrrFv54NkzWbtA+FxyQF2smuvt6L78RHBgOLXMDj6DlNaBa
+4kx1HXHhOThTeEDMg5PXCp6dW4+K5OXgSORIskfNTip1KnvyIvbJvgmRlld6iIis7nCs+dwp4wwc
+OxJORNanTrAmyPPZGpeRaOrvjUYG0lZFWJo8DA+DuAUlwznPO6Q0ibd5Ei9Hxeepl2n8pndntd97
+8XplFeRhVmUCAwEAAaNCMEAwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0O
+BBYEFIHEjMz15DD/pQwIX4wVZyF0Ad/fMA0GCSqGSIb3DQEBCwUAA4ICAQATZSL1jiutROTL/7lo
+5sOASD0Ee/ojL3rtNtqyzm325p7lX1iPyzcyochltq44PTUbPrw7tgTQvPlJ9Zv3hcU2tsu8+Mg5
+1eRfB70VVJd0ysrtT7q6ZHafgbiERUlMjW+i67HM0cOU2kTC5uLqGOiiHycFutfl1qnN3e92mI0A
+Ds0b+gO3joBYDic/UvuUospeZcnWhNq5NXHzJsBPd+aBJ9J3O5oUb3n09tDh05S60FdRvScFDcH9
+yBIw7m+NESsIndTUv4BFFJqIRNow6rSn4+7vW4LVPtateJLbXDzz2K36uGt/xDYotgIVilQsnLAX
+c47QN6MUPJiVAAwpBVueSUmxX8fjy88nZY41F7dXyDDZQVu5FLbowg+UMaeUmMxq67XhJ/UQqAHo
+jhJi6IjMtX9Gl8CbEGY4GjZGXyJoPd/JxhMnq1MGrKI8hgZlb7F+sSlEmqO6SWkoaY/X5V+tBIZk
+bxqgDMUIYs6Ao9Dz7GjevjPHF1t/gMRMTLGmhIrDO7gJzRSBuhjjVFc2/tsvfEehOjPI+Vg7RE+x
+ygKJBJYoaMVLuCaJu9YzL1DV/pqJuhgyklTGW+Cd+V7lDSKb9triyCGyYiGqhkCyLmTTX8jjfhFn
+RR8F/uOi77Oos/N9j/gMHyIfLXC0uAE0djAA5SN4p1bXUB+K+wb1whnw0A==
+-----END CERTIFICATE-----
+
+UCA Extended Validation Root
+============================
+-----BEGIN CERTIFICATE-----
+MIIFWjCCA0KgAwIBAgIQT9Irj/VkyDOeTzRYZiNwYDANBgkqhkiG9w0BAQsFADBHMQswCQYDVQQG
+EwJDTjERMA8GA1UECgwIVW5pVHJ1c3QxJTAjBgNVBAMMHFVDQSBFeHRlbmRlZCBWYWxpZGF0aW9u
+IFJvb3QwHhcNMTUwMzEzMDAwMDAwWhcNMzgxMjMxMDAwMDAwWjBHMQswCQYDVQQGEwJDTjERMA8G
+A1UECgwIVW5pVHJ1c3QxJTAjBgNVBAMMHFVDQSBFeHRlbmRlZCBWYWxpZGF0aW9uIFJvb3QwggIi
+MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCpCQcoEwKwmeBkqh5DFnpzsZGgdT6o+uM4AHrs
+iWogD4vFsJszA1qGxliG1cGFu0/GnEBNyr7uaZa4rYEwmnySBesFK5pI0Lh2PpbIILvSsPGP2KxF
+Rv+qZ2C0d35qHzwaUnoEPQc8hQ2E0B92CvdqFN9y4zR8V05WAT558aopO2z6+I9tTcg1367r3CTu
+eUWnhbYFiN6IXSV8l2RnCdm/WhUFhvMJHuxYMjMR83dksHYf5BA1FxvyDrFspCqjc/wJHx4yGVMR
+59mzLC52LqGj3n5qiAno8geK+LLNEOfic0CTuwjRP+H8C5SzJe98ptfRr5//lpr1kXuYC3fUfugH
+0mK1lTnj8/FtDw5lhIpjVMWAtuCeS31HJqcBCF3RiJ7XwzJE+oJKCmhUfzhTA8ykADNkUVkLo4KR
+el7sFsLzKuZi2irbWWIQJUoqgQtHB0MGcIfS+pMRKXpITeuUx3BNr2fVUbGAIAEBtHoIppB/TuDv
+B0GHr2qlXov7z1CymlSvw4m6WC31MJixNnI5fkkE/SmnTHnkBVfblLkWU41Gsx2VYVdWf6/wFlth
+WG82UBEL2KwrlRYaDh8IzTY0ZRBiZtWAXxQgXy0MoHgKaNYs1+lvK9JKBZP8nm9rZ/+I8U6laUpS
+NwXqxhaN0sSZ0YIrO7o1dfdRUVjzyAfd5LQDfwIDAQABo0IwQDAdBgNVHQ4EFgQU2XQ65DA9DfcS
+3H5aBZ8eNJr34RQwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAYYwDQYJKoZIhvcNAQEL
+BQADggIBADaNl8xCFWQpN5smLNb7rhVpLGsaGvdftvkHTFnq88nIua7Mui563MD1sC3AO6+fcAUR
+ap8lTwEpcOPlDOHqWnzcSbvBHiqB9RZLcpHIojG5qtr8nR/zXUACE/xOHAbKsxSQVBcZEhrxH9cM
+aVr2cXj0lH2RC47skFSOvG+hTKv8dGT9cZr4QQehzZHkPJrgmzI5c6sq1WnIeJEmMX3ixzDx/BR4
+dxIOE/TdFpS/S2d7cFOFyrC78zhNLJA5wA3CXWvp4uXViI3WLL+rG761KIcSF3Ru/H38j9CHJrAb
++7lsq+KePRXBOy5nAliRn+/4Qh8st2j1da3Ptfb/EX3C8CSlrdP6oDyp+l3cpaDvRKS+1ujl5BOW
+F3sGPjLtx7dCvHaj2GU4Kzg1USEODm8uNBNA4StnDG1KQTAYI1oyVZnJF+A83vbsea0rWBmirSwi
+GpWOvpaQXUJXxPkUAzUrHC1RVwinOt4/5Mi0A3PCwSaAuwtCH60NryZy2sy+s6ODWA2CxR9GUeOc
+GMyNm43sSet1UNWMKFnKdDTajAshqx7qG+XH/RU+wBeq+yNuJkbL+vmxcmtpzyKEC2IPrNkZAJSi
+djzULZrtBJ4tBmIQN1IchXIbJ+XMxjHsN+xjWZsLHXbMfjKaiJUINlK73nZfdklJrX+9ZSCyycEr
+dhh2n1ax
+-----END CERTIFICATE-----
+
+Certigna Root CA
+================
+-----BEGIN CERTIFICATE-----
+MIIGWzCCBEOgAwIBAgIRAMrpG4nxVQMNo+ZBbcTjpuEwDQYJKoZIhvcNAQELBQAwWjELMAkGA1UE
+BhMCRlIxEjAQBgNVBAoMCURoaW15b3RpczEcMBoGA1UECwwTMDAwMiA0ODE0NjMwODEwMDAzNjEZ
+MBcGA1UEAwwQQ2VydGlnbmEgUm9vdCBDQTAeFw0xMzEwMDEwODMyMjdaFw0zMzEwMDEwODMyMjda
+MFoxCzAJBgNVBAYTAkZSMRIwEAYDVQQKDAlEaGlteW90aXMxHDAaBgNVBAsMEzAwMDIgNDgxNDYz
+MDgxMDAwMzYxGTAXBgNVBAMMEENlcnRpZ25hIFJvb3QgQ0EwggIiMA0GCSqGSIb3DQEBAQUAA4IC
+DwAwggIKAoICAQDNGDllGlmx6mQWDoyUJJV8g9PFOSbcDO8WV43X2KyjQn+Cyu3NW9sOty3tRQgX
+stmzy9YXUnIo245Onoq2C/mehJpNdt4iKVzSs9IGPjA5qXSjklYcoW9MCiBtnyN6tMbaLOQdLNyz
+KNAT8kxOAkmhVECe5uUFoC2EyP+YbNDrihqECB63aCPuI9Vwzm1RaRDuoXrC0SIxwoKF0vJVdlB8
+JXrJhFwLrN1CTivngqIkicuQstDuI7pmTLtipPlTWmR7fJj6o0ieD5Wupxj0auwuA0Wv8HT4Ks16
+XdG+RCYyKfHx9WzMfgIhC59vpD++nVPiz32pLHxYGpfhPTc3GGYo0kDFUYqMwy3OU4gkWGQwFsWq
+4NYKpkDfePb1BHxpE4S80dGnBs8B92jAqFe7OmGtBIyT46388NtEbVncSVmurJqZNjBBe3YzIoej
+wpKGbvlw7q6Hh5UbxHq9MfPU0uWZ/75I7HX1eBYdpnDBfzwboZL7z8g81sWTCo/1VTp2lc5ZmIoJ
+lXcymoO6LAQ6l73UL77XbJuiyn1tJslV1c/DeVIICZkHJC1kJWumIWmbat10TWuXekG9qxf5kBdI
+jzb5LdXF2+6qhUVB+s06RbFo5jZMm5BX7CO5hwjCxAnxl4YqKE3idMDaxIzb3+KhF1nOJFl0Mdp/
+/TBt2dzhauH8XwIDAQABo4IBGjCCARYwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYw
+HQYDVR0OBBYEFBiHVuBud+4kNTxOc5of1uHieX4rMB8GA1UdIwQYMBaAFBiHVuBud+4kNTxOc5of
+1uHieX4rMEQGA1UdIAQ9MDswOQYEVR0gADAxMC8GCCsGAQUFBwIBFiNodHRwczovL3d3d3cuY2Vy
+dGlnbmEuZnIvYXV0b3JpdGVzLzBtBgNVHR8EZjBkMC+gLaArhilodHRwOi8vY3JsLmNlcnRpZ25h
+LmZyL2NlcnRpZ25hcm9vdGNhLmNybDAxoC+gLYYraHR0cDovL2NybC5kaGlteW90aXMuY29tL2Nl
+cnRpZ25hcm9vdGNhLmNybDANBgkqhkiG9w0BAQsFAAOCAgEAlLieT/DjlQgi581oQfccVdV8AOIt
+OoldaDgvUSILSo3L6btdPrtcPbEo/uRTVRPPoZAbAh1fZkYJMyjhDSSXcNMQH+pkV5a7XdrnxIxP
+TGRGHVyH41neQtGbqH6mid2PHMkwgu07nM3A6RngatgCdTer9zQoKJHyBApPNeNgJgH60BGM+RFq
+7q89w1DTj18zeTyGqHNFkIwgtnJzFyO+B2XleJINugHA64wcZr+shncBlA2c5uk5jR+mUYyZDDl3
+4bSb+hxnV29qao6pK0xXeXpXIs/NX2NGjVxZOob4Mkdio2cNGJHc+6Zr9UhhcyNZjgKnvETq9Emd
+8VRY+WCv2hikLyhF3HqgiIZd8zvn/yk1gPxkQ5Tm4xxvvq0OKmOZK8l+hfZx6AYDlf7ej0gcWtSS
+6Cvu5zHbugRqh5jnxV/vfaci9wHYTfmJ0A6aBVmknpjZbyvKcL5kwlWj9Omvw5Ip3IgWJJk8jSaY
+tlu3zM63Nwf9JtmYhST/WSMDmu2dnajkXjjO11INb9I/bbEFa0nOipFGc/T2L/Coc3cOZayhjWZS
+aX5LaAzHHjcng6WMxwLkFM1JAbBzs/3GkDpv0mztO+7skb6iQ12LAEpmJURw3kAP+HwV96LOPNde
+E4yBFxgX0b3xdxA61GU5wSesVywlVP+i2k+KYTlerj1KjL0=
+-----END CERTIFICATE-----
+
+emSign Root CA - G1
+===================
+-----BEGIN CERTIFICATE-----
+MIIDlDCCAnygAwIBAgIKMfXkYgxsWO3W2DANBgkqhkiG9w0BAQsFADBnMQswCQYDVQQGEwJJTjET
+MBEGA1UECxMKZW1TaWduIFBLSTElMCMGA1UEChMcZU11ZGhyYSBUZWNobm9sb2dpZXMgTGltaXRl
+ZDEcMBoGA1UEAxMTZW1TaWduIFJvb3QgQ0EgLSBHMTAeFw0xODAyMTgxODMwMDBaFw00MzAyMTgx
+ODMwMDBaMGcxCzAJBgNVBAYTAklOMRMwEQYDVQQLEwplbVNpZ24gUEtJMSUwIwYDVQQKExxlTXVk
+aHJhIFRlY2hub2xvZ2llcyBMaW1pdGVkMRwwGgYDVQQDExNlbVNpZ24gUm9vdCBDQSAtIEcxMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAk0u76WaK7p1b1TST0Bsew+eeuGQzf2N4aLTN
+LnF115sgxk0pvLZoYIr3IZpWNVrzdr3YzZr/k1ZLpVkGoZM0Kd0WNHVO8oG0x5ZOrRkVUkr+PHB1
+cM2vK6sVmjM8qrOLqs1D/fXqcP/tzxE7lM5OMhbTI0Aqd7OvPAEsbO2ZLIvZTmmYsvePQbAyeGHW
+DV/D+qJAkh1cF+ZwPjXnorfCYuKrpDhMtTk1b+oDafo6VGiFbdbyL0NVHpENDtjVaqSW0RM8LHhQ
+6DqS0hdW5TUaQBw+jSztOd9C4INBdN+jzcKGYEho42kLVACL5HZpIQ15TjQIXhTCzLG3rdd8cIrH
+hQIDAQABo0IwQDAdBgNVHQ4EFgQU++8Nhp6w492pufEhF38+/PB3KxowDgYDVR0PAQH/BAQDAgEG
+MA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAFn/8oz1h31xPaOfG1vR2vjTnGs2
+vZupYeveFix0PZ7mddrXuqe8QhfnPZHr5X3dPpzxz5KsbEjMwiI/aTvFthUvozXGaCocV685743Q
+NcMYDHsAVhzNixl03r4PEuDQqqE/AjSxcM6dGNYIAwlG7mDgfrbESQRRfXBgvKqy/3lyeqYdPV8q
++Mri/Tm3R7nrft8EI6/6nAYH6ftjk4BAtcZsCjEozgyfz7MjNYBBjWzEN3uBL4ChQEKF6dk4jeih
+U80Bv2noWgbyRQuQ+q7hv53yrlc8pa6yVvSLZUDp/TGBLPQ5Cdjua6e0ph0VpZj3AYHYhX3zUVxx
+iN66zB+Afko=
+-----END CERTIFICATE-----
+
+emSign ECC Root CA - G3
+=======================
+-----BEGIN CERTIFICATE-----
+MIICTjCCAdOgAwIBAgIKPPYHqWhwDtqLhDAKBggqhkjOPQQDAzBrMQswCQYDVQQGEwJJTjETMBEG
+A1UECxMKZW1TaWduIFBLSTElMCMGA1UEChMcZU11ZGhyYSBUZWNobm9sb2dpZXMgTGltaXRlZDEg
+MB4GA1UEAxMXZW1TaWduIEVDQyBSb290IENBIC0gRzMwHhcNMTgwMjE4MTgzMDAwWhcNNDMwMjE4
+MTgzMDAwWjBrMQswCQYDVQQGEwJJTjETMBEGA1UECxMKZW1TaWduIFBLSTElMCMGA1UEChMcZU11
+ZGhyYSBUZWNobm9sb2dpZXMgTGltaXRlZDEgMB4GA1UEAxMXZW1TaWduIEVDQyBSb290IENBIC0g
+RzMwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQjpQy4LRL1KPOxst3iAhKAnjlfSU2fySU0WXTsuwYc
+58Byr+iuL+FBVIcUqEqy6HyC5ltqtdyzdc6LBtCGI79G1Y4PPwT01xySfvalY8L1X44uT6EYGQIr
+MgqCZH0Wk9GjQjBAMB0GA1UdDgQWBBR8XQKEE9TMipuBzhccLikenEhjQjAOBgNVHQ8BAf8EBAMC
+AQYwDwYDVR0TAQH/BAUwAwEB/zAKBggqhkjOPQQDAwNpADBmAjEAvvNhzwIQHWSVB7gYboiFBS+D
+CBeQyh+KTOgNG3qxrdWBCUfvO6wIBHxcmbHtRwfSAjEAnbpV/KlK6O3t5nYBQnvI+GDZjVGLVTv7
+jHvrZQnD+JbNR6iC8hZVdyR+EhCVBCyj
+-----END CERTIFICATE-----
+
+emSign Root CA - C1
+===================
+-----BEGIN CERTIFICATE-----
+MIIDczCCAlugAwIBAgILAK7PALrEzzL4Q7IwDQYJKoZIhvcNAQELBQAwVjELMAkGA1UEBhMCVVMx
+EzARBgNVBAsTCmVtU2lnbiBQS0kxFDASBgNVBAoTC2VNdWRocmEgSW5jMRwwGgYDVQQDExNlbVNp
+Z24gUm9vdCBDQSAtIEMxMB4XDTE4MDIxODE4MzAwMFoXDTQzMDIxODE4MzAwMFowVjELMAkGA1UE
+BhMCVVMxEzARBgNVBAsTCmVtU2lnbiBQS0kxFDASBgNVBAoTC2VNdWRocmEgSW5jMRwwGgYDVQQD
+ExNlbVNpZ24gUm9vdCBDQSAtIEMxMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAz+up
+ufGZBczYKCFK83M0UYRWEPWgTywS4/oTmifQz/l5GnRfHXk5/Fv4cI7gklL35CX5VIPZHdPIWoU/
+Xse2B+4+wM6ar6xWQio5JXDWv7V7Nq2s9nPczdcdioOl+yuQFTdrHCZH3DspVpNqs8FqOp099cGX
+OFgFixwR4+S0uF2FHYP+eF8LRWgYSKVGczQ7/g/IdrvHGPMF0Ybzhe3nudkyrVWIzqa2kbBPrH4V
+I5b2P/AgNBbeCsbEBEV5f6f9vtKppa+cxSMq9zwhbL2vj07FOrLzNBL834AaSaTUqZX3noleooms
+lMuoaJuvimUnzYnu3Yy1aylwQ6BpC+S5DwIDAQABo0IwQDAdBgNVHQ4EFgQU/qHgcB4qAzlSWkK+
+XJGFehiqTbUwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQAD
+ggEBAMJKVvoVIXsoounlHfv4LcQ5lkFMOycsxGwYFYDGrK9HWS8mC+M2sO87/kOXSTKZEhVb3xEp
+/6tT+LvBeA+snFOvV71ojD1pM/CjoCNjO2RnIkSt1XHLVip4kqNPEjE2NuLe/gDEo2APJ62gsIq1
+NnpSob0n9CAnYuhNlCQT5AoE6TyrLshDCUrGYQTlSTR+08TI9Q/Aqum6VF7zYytPT1DU/rl7mYw9
+wC68AivTxEDkigcxHpvOJpkT+xHqmiIMERnHXhuBUDDIlhJu58tBf5E7oke3VIAb3ADMmpDqw8NQ
+BmIMMMAVSKeoWXzhriKi4gp6D/piq1JM4fHfyr6DDUI=
+-----END CERTIFICATE-----
+
+emSign ECC Root CA - C3
+=======================
+-----BEGIN CERTIFICATE-----
+MIICKzCCAbGgAwIBAgIKe3G2gla4EnycqDAKBggqhkjOPQQDAzBaMQswCQYDVQQGEwJVUzETMBEG
+A1UECxMKZW1TaWduIFBLSTEUMBIGA1UEChMLZU11ZGhyYSBJbmMxIDAeBgNVBAMTF2VtU2lnbiBF
+Q0MgUm9vdCBDQSAtIEMzMB4XDTE4MDIxODE4MzAwMFoXDTQzMDIxODE4MzAwMFowWjELMAkGA1UE
+BhMCVVMxEzARBgNVBAsTCmVtU2lnbiBQS0kxFDASBgNVBAoTC2VNdWRocmEgSW5jMSAwHgYDVQQD
+ExdlbVNpZ24gRUNDIFJvb3QgQ0EgLSBDMzB2MBAGByqGSM49AgEGBSuBBAAiA2IABP2lYa57JhAd
+6bciMK4G9IGzsUJxlTm801Ljr6/58pc1kjZGDoeVjbk5Wum739D+yAdBPLtVb4OjavtisIGJAnB9
+SMVK4+kiVCJNk7tCDK93nCOmfddhEc5lx/h//vXyqaNCMEAwHQYDVR0OBBYEFPtaSNCAIEDyqOkA
+B2kZd6fmw/TPMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MAoGCCqGSM49BAMDA2gA
+MGUCMQC02C8Cif22TGK6Q04ThHK1rt0c3ta13FaPWEBaLd4gTCKDypOofu4SQMfWh0/434UCMBwU
+ZOR8loMRnLDRWmFLpg9J0wD8ofzkpf9/rdcw0Md3f76BB1UwUCAU9Vc4CqgxUQ==
+-----END CERTIFICATE-----
+
+Hongkong Post Root CA 3
+=======================
+-----BEGIN CERTIFICATE-----
+MIIFzzCCA7egAwIBAgIUCBZfikyl7ADJk0DfxMauI7gcWqQwDQYJKoZIhvcNAQELBQAwbzELMAkG
+A1UEBhMCSEsxEjAQBgNVBAgTCUhvbmcgS29uZzESMBAGA1UEBxMJSG9uZyBLb25nMRYwFAYDVQQK
+Ew1Ib25na29uZyBQb3N0MSAwHgYDVQQDExdIb25na29uZyBQb3N0IFJvb3QgQ0EgMzAeFw0xNzA2
+MDMwMjI5NDZaFw00MjA2MDMwMjI5NDZaMG8xCzAJBgNVBAYTAkhLMRIwEAYDVQQIEwlIb25nIEtv
+bmcxEjAQBgNVBAcTCUhvbmcgS29uZzEWMBQGA1UEChMNSG9uZ2tvbmcgUG9zdDEgMB4GA1UEAxMX
+SG9uZ2tvbmcgUG9zdCBSb290IENBIDMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCz
+iNfqzg8gTr7m1gNt7ln8wlffKWihgw4+aMdoWJwcYEuJQwy51BWy7sFOdem1p+/l6TWZ5Mwc50tf
+jTMwIDNT2aa71T4Tjukfh0mtUC1Qyhi+AViiE3CWu4mIVoBc+L0sPOFMV4i707mV78vH9toxdCim
+5lSJ9UExyuUmGs2C4HDaOym71QP1mbpV9WTRYA6ziUm4ii8F0oRFKHyPaFASePwLtVPLwpgchKOe
+sL4jpNrcyCse2m5FHomY2vkALgbpDDtw1VAliJnLzXNg99X/NWfFobxeq81KuEXryGgeDQ0URhLj
+0mRiikKYvLTGCAj4/ahMZJx2Ab0vqWwzD9g/KLg8aQFChn5pwckGyuV6RmXpwtZQQS4/t+TtbNe/
+JgERohYpSms0BpDsE9K2+2p20jzt8NYt3eEV7KObLyzJPivkaTv/ciWxNoZbx39ri1UbSsUgYT2u
+y1DhCDq+sI9jQVMwCFk8mB13umOResoQUGC/8Ne8lYePl8X+l2oBlKN8W4UdKjk60FSh0Tlxnf0h
++bV78OLgAo9uliQlLKAeLKjEiafv7ZkGL7YKTE/bosw3Gq9HhS2KX8Q0NEwA/RiTZxPRN+ZItIsG
+xVd7GYYKecsAyVKvQv83j+GjHno9UKtjBucVtT+2RTeUN7F+8kjDf8V1/peNRY8apxpyKBpADwID
+AQABo2MwYTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAfBgNVHSMEGDAWgBQXnc0e
+i9Y5K3DTXNSguB+wAPzFYTAdBgNVHQ4EFgQUF53NHovWOStw01zUoLgfsAD8xWEwDQYJKoZIhvcN
+AQELBQADggIBAFbVe27mIgHSQpsY1Q7XZiNc4/6gx5LS6ZStS6LG7BJ8dNVI0lkUmcDrudHr9Egw
+W62nV3OZqdPlt9EuWSRY3GguLmLYauRwCy0gUCCkMpXRAJi70/33MvJJrsZ64Ee+bs7Lo3I6LWld
+y8joRTnU+kLBEUx3XZL7av9YROXrgZ6voJmtvqkBZss4HTzfQx/0TW60uhdG/H39h4F5ag0zD/ov
++BS5gLNdTaqX4fnkGMX41TiMJjz98iji7lpJiCzfeT2OnpA8vUFKOt1b9pq0zj8lMH8yfaIDlNDc
+eqFS3m6TjRgm/VWsvY+b0s+v54Ysyx8Jb6NvqYTUc79NoXQbTiNg8swOqn+knEwlqLJmOzj/2ZQw
+9nKEvmhVEA/GcywWaZMH/rFF7buiVWqw2rVKAiUnhde3t4ZEFolsgCs+l6mc1X5VTMbeRRAc6uk7
+nwNT7u56AQIWeNTowr5GdogTPyK7SBIdUgC0An4hGh6cJfTzPV4e0hz5sy229zdcxsshTrD3mUcY
+hcErulWuBurQB7Lcq9CClnXO0lD+mefPL5/ndtFhKvshuzHQqp9HpLIiyhY6UFfEW0NnxWViA0kB
+60PZ2Pierc+xYw5F9KBaLJstxabArahH9CdMOA0uG0k7UvToiIMrVCjU8jVStDKDYmlkDJGcn5fq
+dBb9HxEGmpv0
+-----END CERTIFICATE-----
+
+Microsoft ECC Root Certificate Authority 2017
+=============================================
+-----BEGIN CERTIFICATE-----
+MIICWTCCAd+gAwIBAgIQZvI9r4fei7FK6gxXMQHC7DAKBggqhkjOPQQDAzBlMQswCQYDVQQGEwJV
+UzEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMTYwNAYDVQQDEy1NaWNyb3NvZnQgRUND
+IFJvb3QgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IDIwMTcwHhcNMTkxMjE4MjMwNjQ1WhcNNDIwNzE4
+MjMxNjA0WjBlMQswCQYDVQQGEwJVUzEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMTYw
+NAYDVQQDEy1NaWNyb3NvZnQgRUNDIFJvb3QgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IDIwMTcwdjAQ
+BgcqhkjOPQIBBgUrgQQAIgNiAATUvD0CQnVBEyPNgASGAlEvaqiBYgtlzPbKnR5vSmZRogPZnZH6
+thaxjG7efM3beaYvzrvOcS/lpaso7GMEZpn4+vKTEAXhgShC48Zo9OYbhGBKia/teQ87zvH2RPUB
+eMCjVDBSMA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBTIy5lycFIM
++Oa+sgRXKSrPQhDtNTAQBgkrBgEEAYI3FQEEAwIBADAKBggqhkjOPQQDAwNoADBlAjBY8k3qDPlf
+Xu5gKcs68tvWMoQZP3zVL8KxzJOuULsJMsbG7X7JNpQS5GiFBqIb0C8CMQCZ6Ra0DvpWSNSkMBaR
+eNtUjGUBiudQZsIxtzm6uBoiB078a1QWIP8rtedMDE2mT3M=
+-----END CERTIFICATE-----
+
+Microsoft RSA Root Certificate Authority 2017
+=============================================
+-----BEGIN CERTIFICATE-----
+MIIFqDCCA5CgAwIBAgIQHtOXCV/YtLNHcB6qvn9FszANBgkqhkiG9w0BAQwFADBlMQswCQYDVQQG
+EwJVUzEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMTYwNAYDVQQDEy1NaWNyb3NvZnQg
+UlNBIFJvb3QgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IDIwMTcwHhcNMTkxMjE4MjI1MTIyWhcNNDIw
+NzE4MjMwMDIzWjBlMQswCQYDVQQGEwJVUzEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9u
+MTYwNAYDVQQDEy1NaWNyb3NvZnQgUlNBIFJvb3QgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IDIwMTcw
+ggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDKW76UM4wplZEWCpW9R2LBifOZNt9GkMml
+7Xhqb0eRaPgnZ1AzHaGm++DlQ6OEAlcBXZxIQIJTELy/xztokLaCLeX0ZdDMbRnMlfl7rEqUrQ7e
+S0MdhweSE5CAg2Q1OQT85elss7YfUJQ4ZVBcF0a5toW1HLUX6NZFndiyJrDKxHBKrmCk3bPZ7Pw7
+1VdyvD/IybLeS2v4I2wDwAW9lcfNcztmgGTjGqwu+UcF8ga2m3P1eDNbx6H7JyqhtJqRjJHTOoI+
+dkC0zVJhUXAoP8XFWvLJjEm7FFtNyP9nTUwSlq31/niol4fX/V4ggNyhSyL71Imtus5Hl0dVe49F
+yGcohJUcaDDv70ngNXtk55iwlNpNhTs+VcQor1fznhPbRiefHqJeRIOkpcrVE7NLP8TjwuaGYaRS
+MLl6IE9vDzhTyzMMEyuP1pq9KsgtsRx9S1HKR9FIJ3Jdh+vVReZIZZ2vUpC6W6IYZVcSn2i51BVr
+lMRpIpj0M+Dt+VGOQVDJNE92kKz8OMHY4Xu54+OU4UZpyw4KUGsTuqwPN1q3ErWQgR5WrlcihtnJ
+0tHXUeOrO8ZV/R4O03QK0dqq6mm4lyiPSMQH+FJDOvTKVTUssKZqwJz58oHhEmrARdlns87/I6KJ
+ClTUFLkqqNfs+avNJVgyeY+QW5g5xAgGwax/Dj0ApQIDAQABo1QwUjAOBgNVHQ8BAf8EBAMCAYYw
+DwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUCctZf4aycI8awznjwNnpv7tNsiMwEAYJKwYBBAGC
+NxUBBAMCAQAwDQYJKoZIhvcNAQEMBQADggIBAKyvPl3CEZaJjqPnktaXFbgToqZCLgLNFgVZJ8og
+6Lq46BrsTaiXVq5lQ7GPAJtSzVXNUzltYkyLDVt8LkS/gxCP81OCgMNPOsduET/m4xaRhPtthH80
+dK2Jp86519efhGSSvpWhrQlTM93uCupKUY5vVau6tZRGrox/2KJQJWVggEbbMwSubLWYdFQl3JPk
++ONVFT24bcMKpBLBaYVu32TxU5nhSnUgnZUP5NbcA/FZGOhHibJXWpS2qdgXKxdJ5XbLwVaZOjex
+/2kskZGT4d9Mozd2TaGf+G0eHdP67Pv0RR0Tbc/3WeUiJ3IrhvNXuzDtJE3cfVa7o7P4NHmJweDy
+AmH3pvwPuxwXC65B2Xy9J6P9LjrRk5Sxcx0ki69bIImtt2dmefU6xqaWM/5TkshGsRGRxpl/j8nW
+ZjEgQRCHLQzWwa80mMpkg/sTV9HB8Dx6jKXB/ZUhoHHBk2dxEuqPiAppGWSZI1b7rCoucL5mxAyE
+7+WL85MB+GqQk2dLsmijtWKP6T+MejteD+eMuMZ87zf9dOLITzNy4ZQ5bb0Sr74MTnB8G2+NszKT
+c0QWbej09+CVgI+WXTik9KveCjCHk9hNAHFiRSdLOkKEW39lt2c0Ui2cFmuqqNh7o0JMcccMyj6D
+5KbvtwEwXlGjefVwaaZBRA+GsCyRxj3qrg+E
+-----END CERTIFICATE-----
+
+e-Szigno Root CA 2017
+=====================
+-----BEGIN CERTIFICATE-----
+MIICQDCCAeWgAwIBAgIMAVRI7yH9l1kN9QQKMAoGCCqGSM49BAMCMHExCzAJBgNVBAYTAkhVMREw
+DwYDVQQHDAhCdWRhcGVzdDEWMBQGA1UECgwNTWljcm9zZWMgTHRkLjEXMBUGA1UEYQwOVkFUSFUt
+MjM1ODQ0OTcxHjAcBgNVBAMMFWUtU3ppZ25vIFJvb3QgQ0EgMjAxNzAeFw0xNzA4MjIxMjA3MDZa
+Fw00MjA4MjIxMjA3MDZaMHExCzAJBgNVBAYTAkhVMREwDwYDVQQHDAhCdWRhcGVzdDEWMBQGA1UE
+CgwNTWljcm9zZWMgTHRkLjEXMBUGA1UEYQwOVkFUSFUtMjM1ODQ0OTcxHjAcBgNVBAMMFWUtU3pp
+Z25vIFJvb3QgQ0EgMjAxNzBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABJbcPYrYsHtvxie+RJCx
+s1YVe45DJH0ahFnuY2iyxl6H0BVIHqiQrb1TotreOpCmYF9oMrWGQd+HWyx7xf58etqjYzBhMA8G
+A1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSHERUI0arBeAyxr87GyZDv
+vzAEwDAfBgNVHSMEGDAWgBSHERUI0arBeAyxr87GyZDvvzAEwDAKBggqhkjOPQQDAgNJADBGAiEA
+tVfd14pVCzbhhkT61NlojbjcI4qKDdQvfepz7L9NbKgCIQDLpbQS+ue16M9+k/zzNY9vTlp8tLxO
+svxyqltZ+efcMQ==
+-----END CERTIFICATE-----
+
+certSIGN Root CA G2
+===================
+-----BEGIN CERTIFICATE-----
+MIIFRzCCAy+gAwIBAgIJEQA0tk7GNi02MA0GCSqGSIb3DQEBCwUAMEExCzAJBgNVBAYTAlJPMRQw
+EgYDVQQKEwtDRVJUU0lHTiBTQTEcMBoGA1UECxMTY2VydFNJR04gUk9PVCBDQSBHMjAeFw0xNzAy
+MDYwOTI3MzVaFw00MjAyMDYwOTI3MzVaMEExCzAJBgNVBAYTAlJPMRQwEgYDVQQKEwtDRVJUU0lH
+TiBTQTEcMBoGA1UECxMTY2VydFNJR04gUk9PVCBDQSBHMjCCAiIwDQYJKoZIhvcNAQEBBQADggIP
+ADCCAgoCggIBAMDFdRmRfUR0dIf+DjuW3NgBFszuY5HnC2/OOwppGnzC46+CjobXXo9X69MhWf05
+N0IwvlDqtg+piNguLWkh59E3GE59kdUWX2tbAMI5Qw02hVK5U2UPHULlj88F0+7cDBrZuIt4Imfk
+abBoxTzkbFpG583H+u/E7Eu9aqSs/cwoUe+StCmrqzWaTOTECMYmzPhpn+Sc8CnTXPnGFiWeI8Mg
+wT0PPzhAsP6CRDiqWhqKa2NYOLQV07YRaXseVO6MGiKscpc/I1mbySKEwQdPzH/iV8oScLumZfNp
+dWO9lfsbl83kqK/20U6o2YpxJM02PbyWxPFsqa7lzw1uKA2wDrXKUXt4FMMgL3/7FFXhEZn91Qqh
+ngLjYl/rNUssuHLoPj1PrCy7Lobio3aP5ZMqz6WryFyNSwb/EkaseMsUBzXgqd+L6a8VTxaJW732
+jcZZroiFDsGJ6x9nxUWO/203Nit4ZoORUSs9/1F3dmKh7Gc+PoGD4FapUB8fepmrY7+EF3fxDTvf
+95xhszWYijqy7DwaNz9+j5LP2RIUZNoQAhVB/0/E6xyjyfqZ90bp4RjZsbgyLcsUDFDYg2WD7rlc
+z8sFWkz6GZdr1l0T08JcVLwyc6B49fFtHsufpaafItzRUZ6CeWRgKRM+o/1Pcmqr4tTluCRVLERL
+iohEnMqE0yo7AgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1Ud
+DgQWBBSCIS1mxteg4BXrzkwJd8RgnlRuAzANBgkqhkiG9w0BAQsFAAOCAgEAYN4auOfyYILVAzOB
+ywaK8SJJ6ejqkX/GM15oGQOGO0MBzwdw5AgeZYWR5hEit/UCI46uuR59H35s5r0l1ZUa8gWmr4UC
+b6741jH/JclKyMeKqdmfS0mbEVeZkkMR3rYzpMzXjWR91M08KCy0mpbqTfXERMQlqiCA2ClV9+BB
+/AYm/7k29UMUA2Z44RGx2iBfRgB4ACGlHgAoYXhvqAEBj500mv/0OJD7uNGzcgbJceaBxXntC6Z5
+8hMLnPddDnskk7RI24Zf3lCGeOdA5jGokHZwYa+cNywRtYK3qq4kNFtyDGkNzVmf9nGvnAvRCjj5
+BiKDUyUM/FHE5r7iOZULJK2v0ZXkltd0ZGtxTgI8qoXzIKNDOXZbbFD+mpwUHmUUihW9o4JFWklW
+atKcsWMy5WHgUyIOpwpJ6st+H6jiYoD2EEVSmAYY3qXNL3+q1Ok+CHLsIwMCPKaq2LxndD0UF/tU
+Sxfj03k9bWtJySgOLnRQvwzZRjoQhsmnP+mg7H/rpXdYaXHmgwo38oZJar55CJD2AhZkPuXaTH4M
+NMn5X7azKFGnpyuqSfqNZSlO42sTp5SjLVFteAxEy9/eCG/Oo2Sr05WE1LlSVHJ7liXMvGnjSG4N
+0MedJ5qq+BOS3R7fY581qRY27Iy4g/Q9iY/NtBde17MXQRBdJ3NghVdJIgc=
+-----END CERTIFICATE-----
+
+NAVER Global Root Certification Authority
+=========================================
+-----BEGIN CERTIFICATE-----
+MIIFojCCA4qgAwIBAgIUAZQwHqIL3fXFMyqxQ0Rx+NZQTQ0wDQYJKoZIhvcNAQEMBQAwaTELMAkG
+A1UEBhMCS1IxJjAkBgNVBAoMHU5BVkVSIEJVU0lORVNTIFBMQVRGT1JNIENvcnAuMTIwMAYDVQQD
+DClOQVZFUiBHbG9iYWwgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0xNzA4MTgwODU4
+NDJaFw0zNzA4MTgyMzU5NTlaMGkxCzAJBgNVBAYTAktSMSYwJAYDVQQKDB1OQVZFUiBCVVNJTkVT
+UyBQTEFURk9STSBDb3JwLjEyMDAGA1UEAwwpTkFWRVIgR2xvYmFsIFJvb3QgQ2VydGlmaWNhdGlv
+biBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC21PGTXLVAiQqrDZBb
+UGOukJR0F0Vy1ntlWilLp1agS7gvQnXp2XskWjFlqxcX0TM62RHcQDaH38dq6SZeWYp34+hInDEW
++j6RscrJo+KfziFTowI2MMtSAuXaMl3Dxeb57hHHi8lEHoSTGEq0n+USZGnQJoViAbbJAh2+g1G7
+XNr4rRVqmfeSVPc0W+m/6imBEtRTkZazkVrd/pBzKPswRrXKCAfHcXLJZtM0l/aM9BhK4dA9WkW2
+aacp+yPOiNgSnABIqKYPszuSjXEOdMWLyEz59JuOuDxp7W87UC9Y7cSw0BwbagzivESq2M0UXZR4
+Yb8ObtoqvC8MC3GmsxY/nOb5zJ9TNeIDoKAYv7vxvvTWjIcNQvcGufFt7QSUqP620wbGQGHfnZ3z
+VHbOUzoBppJB7ASjjw2i1QnK1sua8e9DXcCrpUHPXFNwcMmIpi3Ua2FzUCaGYQ5fG8Ir4ozVu53B
+A0K6lNpfqbDKzE0K70dpAy8i+/Eozr9dUGWokG2zdLAIx6yo0es+nPxdGoMuK8u180SdOqcXYZai
+cdNwlhVNt0xz7hlcxVs+Qf6sdWA7G2POAN3aCJBitOUt7kinaxeZVL6HSuOpXgRM6xBtVNbv8ejy
+YhbLgGvtPe31HzClrkvJE+2KAQHJuFFYwGY6sWZLxNUxAmLpdIQM201GLQIDAQABo0IwQDAdBgNV
+HQ4EFgQU0p+I36HNLL3s9TsBAZMzJ7LrYEswDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMB
+Af8wDQYJKoZIhvcNAQEMBQADggIBADLKgLOdPVQG3dLSLvCkASELZ0jKbY7gyKoNqo0hV4/GPnrK
+21HUUrPUloSlWGB/5QuOH/XcChWB5Tu2tyIvCZwTFrFsDDUIbatjcu3cvuzHV+YwIHHW1xDBE1UB
+jCpD5EHxzzp6U5LOogMFDTjfArsQLtk70pt6wKGm+LUx5vR1yblTmXVHIloUFcd4G7ad6Qz4G3bx
+hYTeodoS76TiEJd6eN4MUZeoIUCLhr0N8F5OSza7OyAfikJW4Qsav3vQIkMsRIz75Sq0bBwcupTg
+E34h5prCy8VCZLQelHsIJchxzIdFV4XTnyliIoNRlwAYl3dqmJLJfGBs32x9SuRwTMKeuB330DTH
+D8z7p/8Dvq1wkNoL3chtl1+afwkyQf3NosxabUzyqkn+Zvjp2DXrDige7kgvOtB5CTh8piKCk5XQ
+A76+AqAF3SAi428diDRgxuYKuQl1C/AH6GmWNcf7I4GOODm4RStDeKLRLBT/DShycpWbXgnbiUSY
+qqFJu3FS8r/2/yehNq+4tneI3TqkbZs0kNwUXTC/t+sX5Ie3cdCh13cV1ELX8vMxmV2b3RZtP+oG
+I/hGoiLtk/bdmuYqh7GYVPEi92tF4+KOdh2ajcQGjTa3FPOdVGm3jjzVpG2Tgbet9r1ke8LJaDmg
+kpzNNIaRkPpkUZ3+/uul9XXeifdy
+-----END CERTIFICATE-----
+
+AC RAIZ FNMT-RCM SERVIDORES SEGUROS
+===================================
+-----BEGIN CERTIFICATE-----
+MIICbjCCAfOgAwIBAgIQYvYybOXE42hcG2LdnC6dlTAKBggqhkjOPQQDAzB4MQswCQYDVQQGEwJF
+UzERMA8GA1UECgwIRk5NVC1SQ00xDjAMBgNVBAsMBUNlcmVzMRgwFgYDVQRhDA9WQVRFUy1RMjgy
+NjAwNEoxLDAqBgNVBAMMI0FDIFJBSVogRk5NVC1SQ00gU0VSVklET1JFUyBTRUdVUk9TMB4XDTE4
+MTIyMDA5MzczM1oXDTQzMTIyMDA5MzczM1oweDELMAkGA1UEBhMCRVMxETAPBgNVBAoMCEZOTVQt
+UkNNMQ4wDAYDVQQLDAVDZXJlczEYMBYGA1UEYQwPVkFURVMtUTI4MjYwMDRKMSwwKgYDVQQDDCNB
+QyBSQUlaIEZOTVQtUkNNIFNFUlZJRE9SRVMgU0VHVVJPUzB2MBAGByqGSM49AgEGBSuBBAAiA2IA
+BPa6V1PIyqvfNkpSIeSX0oNnnvBlUdBeh8dHsVnyV0ebAAKTRBdp20LHsbI6GA60XYyzZl2hNPk2
+LEnb80b8s0RpRBNm/dfF/a82Tc4DTQdxz69qBdKiQ1oKUm8BA06Oi6NCMEAwDwYDVR0TAQH/BAUw
+AwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFAG5L++/EYZg8k/QQW6rcx/n0m5JMAoGCCqG
+SM49BAMDA2kAMGYCMQCuSuMrQMN0EfKVrRYj3k4MGuZdpSRea0R7/DjiT8ucRRcRTBQnJlU5dUoD
+zBOQn5ICMQD6SmxgiHPz7riYYqnOK8LZiqZwMR2vsJRM60/G49HzYqc8/5MuB1xJAWdpEgJyv+c=
+-----END CERTIFICATE-----
+
+GlobalSign Root R46
+===================
+-----BEGIN CERTIFICATE-----
+MIIFWjCCA0KgAwIBAgISEdK7udcjGJ5AXwqdLdDfJWfRMA0GCSqGSIb3DQEBDAUAMEYxCzAJBgNV
+BAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMRwwGgYDVQQDExNHbG9iYWxTaWduIFJv
+b3QgUjQ2MB4XDTE5MDMyMDAwMDAwMFoXDTQ2MDMyMDAwMDAwMFowRjELMAkGA1UEBhMCQkUxGTAX
+BgNVBAoTEEdsb2JhbFNpZ24gbnYtc2ExHDAaBgNVBAMTE0dsb2JhbFNpZ24gUm9vdCBSNDYwggIi
+MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCsrHQy6LNl5brtQyYdpokNRbopiLKkHWPd08Es
+CVeJOaFV6Wc0dwxu5FUdUiXSE2te4R2pt32JMl8Nnp8semNgQB+msLZ4j5lUlghYruQGvGIFAha/
+r6gjA7aUD7xubMLL1aa7DOn2wQL7Id5m3RerdELv8HQvJfTqa1VbkNud316HCkD7rRlr+/fKYIje
+2sGP1q7Vf9Q8g+7XFkyDRTNrJ9CG0Bwta/OrffGFqfUo0q3v84RLHIf8E6M6cqJaESvWJ3En7YEt
+bWaBkoe0G1h6zD8K+kZPTXhc+CtI4wSEy132tGqzZfxCnlEmIyDLPRT5ge1lFgBPGmSXZgjPjHvj
+K8Cd+RTyG/FWaha/LIWFzXg4mutCagI0GIMXTpRW+LaCtfOW3T3zvn8gdz57GSNrLNRyc0NXfeD4
+12lPFzYE+cCQYDdF3uYM2HSNrpyibXRdQr4G9dlkbgIQrImwTDsHTUB+JMWKmIJ5jqSngiCNI/on
+ccnfxkF0oE32kRbcRoxfKWMxWXEM2G/CtjJ9++ZdU6Z+Ffy7dXxd7Pj2Fxzsx2sZy/N78CsHpdls
+eVR2bJ0cpm4O6XkMqCNqo98bMDGfsVR7/mrLZqrcZdCinkqaByFrgY/bxFn63iLABJzjqls2k+g9
+vXqhnQt2sQvHnf3PmKgGwvgqo6GDoLclcqUC4wIDAQABo0IwQDAOBgNVHQ8BAf8EBAMCAYYwDwYD
+VR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUA1yrc4GHqMywptWU4jaWSf8FmSwwDQYJKoZIhvcNAQEM
+BQADggIBAHx47PYCLLtbfpIrXTncvtgdokIzTfnvpCo7RGkerNlFo048p9gkUbJUHJNOxO97k4Vg
+JuoJSOD1u8fpaNK7ajFxzHmuEajwmf3lH7wvqMxX63bEIaZHU1VNaL8FpO7XJqti2kM3S+LGteWy
+gxk6x9PbTZ4IevPuzz5i+6zoYMzRx6Fcg0XERczzF2sUyQQCPtIkpnnpHs6i58FZFZ8d4kuaPp92
+CC1r2LpXFNqD6v6MVenQTqnMdzGxRBF6XLE+0xRFFRhiJBPSy03OXIPBNvIQtQ6IbbjhVp+J3pZm
+OUdkLG5NrmJ7v2B0GbhWrJKsFjLtrWhV/pi60zTe9Mlhww6G9kuEYO4Ne7UyWHmRVSyBQ7N0H3qq
+JZ4d16GLuc1CLgSkZoNNiTW2bKg2SnkheCLQQrzRQDGQob4Ez8pn7fXwgNNgyYMqIgXQBztSvwye
+qiv5u+YfjyW6hY0XHgL+XVAEV8/+LbzvXMAaq7afJMbfc2hIkCwU9D9SGuTSyxTDYWnP4vkYxboz
+nxSjBF25cfe1lNj2M8FawTSLfJvdkzrnE6JwYZ+vj+vYxXX4M2bUdGc6N3ec592kD3ZDZopD8p/7
+DEJ4Y9HiD2971KE9dJeFt0g5QdYg/NA6s/rob8SKunE3vouXsXgxT7PntgMTzlSdriVZzH81Xwj3
+QEUxeCp6
+-----END CERTIFICATE-----
+
+GlobalSign Root E46
+===================
+-----BEGIN CERTIFICATE-----
+MIICCzCCAZGgAwIBAgISEdK7ujNu1LzmJGjFDYQdmOhDMAoGCCqGSM49BAMDMEYxCzAJBgNVBAYT
+AkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMRwwGgYDVQQDExNHbG9iYWxTaWduIFJvb3Qg
+RTQ2MB4XDTE5MDMyMDAwMDAwMFoXDTQ2MDMyMDAwMDAwMFowRjELMAkGA1UEBhMCQkUxGTAXBgNV
+BAoTEEdsb2JhbFNpZ24gbnYtc2ExHDAaBgNVBAMTE0dsb2JhbFNpZ24gUm9vdCBFNDYwdjAQBgcq
+hkjOPQIBBgUrgQQAIgNiAAScDrHPt+ieUnd1NPqlRqetMhkytAepJ8qUuwzSChDH2omwlwxwEwkB
+jtjqR+q+soArzfwoDdusvKSGN+1wCAB16pMLey5SnCNoIwZD7JIvU4Tb+0cUB+hflGddyXqBPCCj
+QjBAMA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBQxCpCPtsad0kRL
+gLWi5h+xEk8blTAKBggqhkjOPQQDAwNoADBlAjEA31SQ7Zvvi5QCkxeCmb6zniz2C5GMn0oUsfZk
+vLtoURMMA/cVi4RguYv/Uo7njLwcAjA8+RHUjE7AwWHCFUyqqx0LMV87HOIAl0Qx5v5zli/altP+
+CAezNIm8BZ/3Hobui3A=
+-----END CERTIFICATE-----
+
+ANF Secure Server Root CA
+=========================
+-----BEGIN CERTIFICATE-----
+MIIF7zCCA9egAwIBAgIIDdPjvGz5a7EwDQYJKoZIhvcNAQELBQAwgYQxEjAQBgNVBAUTCUc2MzI4
+NzUxMDELMAkGA1UEBhMCRVMxJzAlBgNVBAoTHkFORiBBdXRvcmlkYWQgZGUgQ2VydGlmaWNhY2lv
+bjEUMBIGA1UECxMLQU5GIENBIFJhaXoxIjAgBgNVBAMTGUFORiBTZWN1cmUgU2VydmVyIFJvb3Qg
+Q0EwHhcNMTkwOTA0MTAwMDM4WhcNMzkwODMwMTAwMDM4WjCBhDESMBAGA1UEBRMJRzYzMjg3NTEw
+MQswCQYDVQQGEwJFUzEnMCUGA1UEChMeQU5GIEF1dG9yaWRhZCBkZSBDZXJ0aWZpY2FjaW9uMRQw
+EgYDVQQLEwtBTkYgQ0EgUmFpejEiMCAGA1UEAxMZQU5GIFNlY3VyZSBTZXJ2ZXIgUm9vdCBDQTCC
+AiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANvrayvmZFSVgpCjcqQZAZ2cC4Ffc0m6p6zz
+BE57lgvsEeBbphzOG9INgxwruJ4dfkUyYA8H6XdYfp9qyGFOtibBTI3/TO80sh9l2Ll49a2pcbnv
+T1gdpd50IJeh7WhM3pIXS7yr/2WanvtH2Vdy8wmhrnZEE26cLUQ5vPnHO6RYPUG9tMJJo8gN0pcv
+B2VSAKduyK9o7PQUlrZXH1bDOZ8rbeTzPvY1ZNoMHKGESy9LS+IsJJ1tk0DrtSOOMspvRdOoiXse
+zx76W0OLzc2oD2rKDF65nkeP8Nm2CgtYZRczuSPkdxl9y0oukntPLxB3sY0vaJxizOBQ+OyRp1RM
+VwnVdmPF6GUe7m1qzwmd+nxPrWAI/VaZDxUse6mAq4xhj0oHdkLePfTdsiQzW7i1o0TJrH93PB0j
+7IKppuLIBkwC/qxcmZkLLxCKpvR/1Yd0DVlJRfbwcVw5Kda/SiOL9V8BY9KHcyi1Swr1+KuCLH5z
+JTIdC2MKF4EA/7Z2Xue0sUDKIbvVgFHlSFJnLNJhiQcND85Cd8BEc5xEUKDbEAotlRyBr+Qc5RQe
+8TZBAQIvfXOn3kLMTOmJDVb3n5HUA8ZsyY/b2BzgQJhdZpmYgG4t/wHFzstGH6wCxkPmrqKEPMVO
+Hj1tyRRM4y5Bu8o5vzY8KhmqQYdOpc5LMnndkEl/AgMBAAGjYzBhMB8GA1UdIwQYMBaAFJxf0Gxj
+o1+TypOYCK2Mh6UsXME3MB0GA1UdDgQWBBScX9BsY6Nfk8qTmAitjIelLFzBNzAOBgNVHQ8BAf8E
+BAMCAYYwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAgEATh65isagmD9uw2nAalxJ
+UqzLK114OMHVVISfk/CHGT0sZonrDUL8zPB1hT+L9IBdeeUXZ701guLyPI59WzbLWoAAKfLOKyzx
+j6ptBZNscsdW699QIyjlRRA96Gejrw5VD5AJYu9LWaL2U/HANeQvwSS9eS9OICI7/RogsKQOLHDt
+dD+4E5UGUcjohybKpFtqFiGS3XNgnhAY3jyB6ugYw3yJ8otQPr0R4hUDqDZ9MwFsSBXXiJCZBMXM
+5gf0vPSQ7RPi6ovDj6MzD8EpTBNO2hVWcXNyglD2mjN8orGoGjR0ZVzO0eurU+AagNjqOknkJjCb
+5RyKqKkVMoaZkgoQI1YS4PbOTOK7vtuNknMBZi9iPrJyJ0U27U1W45eZ/zo1PqVUSlJZS2Db7v54
+EX9K3BR5YLZrZAPbFYPhor72I5dQ8AkzNqdxliXzuUJ92zg/LFis6ELhDtjTO0wugumDLmsx2d1H
+hk9tl5EuT+IocTUW0fJz/iUrB0ckYyfI+PbZa/wSMVYIwFNCr5zQM378BvAxRAMU8Vjq8moNqRGy
+g77FGr8H6lnco4g175x2MjxNBiLOFeXdntiP2t7SxDnlF4HPOEfrf4htWRvfn0IUrn7PqLBmZdo3
+r5+qPeoott7VMVgWglvquxl1AnMaykgaIZOQCo6ThKd9OyMYkomgjaw=
+-----END CERTIFICATE-----
+
+Certum EC-384 CA
+================
+-----BEGIN CERTIFICATE-----
+MIICZTCCAeugAwIBAgIQeI8nXIESUiClBNAt3bpz9DAKBggqhkjOPQQDAzB0MQswCQYDVQQGEwJQ
+TDEhMB8GA1UEChMYQXNzZWNvIERhdGEgU3lzdGVtcyBTLkEuMScwJQYDVQQLEx5DZXJ0dW0gQ2Vy
+dGlmaWNhdGlvbiBBdXRob3JpdHkxGTAXBgNVBAMTEENlcnR1bSBFQy0zODQgQ0EwHhcNMTgwMzI2
+MDcyNDU0WhcNNDMwMzI2MDcyNDU0WjB0MQswCQYDVQQGEwJQTDEhMB8GA1UEChMYQXNzZWNvIERh
+dGEgU3lzdGVtcyBTLkEuMScwJQYDVQQLEx5DZXJ0dW0gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkx
+GTAXBgNVBAMTEENlcnR1bSBFQy0zODQgQ0EwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAATEKI6rGFtq
+vm5kN2PkzeyrOvfMobgOgknXhimfoZTy42B4mIF4Bk3y7JoOV2CDn7TmFy8as10CW4kjPMIRBSqn
+iBMY81CE1700LCeJVf/OTOffph8oxPBUw7l8t1Ot68KjQjBAMA8GA1UdEwEB/wQFMAMBAf8wHQYD
+VR0OBBYEFI0GZnQkdjrzife81r1HfS+8EF9LMA4GA1UdDwEB/wQEAwIBBjAKBggqhkjOPQQDAwNo
+ADBlAjADVS2m5hjEfO/JUG7BJw+ch69u1RsIGL2SKcHvlJF40jocVYli5RsJHrpka/F2tNQCMQC0
+QoSZ/6vnnvuRlydd3LBbMHHOXjgaatkl5+r3YZJW+OraNsKHZZYuciUvf9/DE8k=
+-----END CERTIFICATE-----
+
+Certum Trusted Root CA
+======================
+-----BEGIN CERTIFICATE-----
+MIIFwDCCA6igAwIBAgIQHr9ZULjJgDdMBvfrVU+17TANBgkqhkiG9w0BAQ0FADB6MQswCQYDVQQG
+EwJQTDEhMB8GA1UEChMYQXNzZWNvIERhdGEgU3lzdGVtcyBTLkEuMScwJQYDVQQLEx5DZXJ0dW0g
+Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkxHzAdBgNVBAMTFkNlcnR1bSBUcnVzdGVkIFJvb3QgQ0Ew
+HhcNMTgwMzE2MTIxMDEzWhcNNDMwMzE2MTIxMDEzWjB6MQswCQYDVQQGEwJQTDEhMB8GA1UEChMY
+QXNzZWNvIERhdGEgU3lzdGVtcyBTLkEuMScwJQYDVQQLEx5DZXJ0dW0gQ2VydGlmaWNhdGlvbiBB
+dXRob3JpdHkxHzAdBgNVBAMTFkNlcnR1bSBUcnVzdGVkIFJvb3QgQ0EwggIiMA0GCSqGSIb3DQEB
+AQUAA4ICDwAwggIKAoICAQDRLY67tzbqbTeRn06TpwXkKQMlzhyC93yZn0EGze2jusDbCSzBfN8p
+fktlL5On1AFrAygYo9idBcEq2EXxkd7fO9CAAozPOA/qp1x4EaTByIVcJdPTsuclzxFUl6s1wB52
+HO8AU5853BSlLCIls3Jy/I2z5T4IHhQqNwuIPMqw9MjCoa68wb4pZ1Xi/K1ZXP69VyywkI3C7Te2
+fJmItdUDmj0VDT06qKhF8JVOJVkdzZhpu9PMMsmN74H+rX2Ju7pgE8pllWeg8xn2A1bUatMn4qGt
+g/BKEiJ3HAVz4hlxQsDsdUaakFjgao4rpUYwBI4Zshfjvqm6f1bxJAPXsiEodg42MEx51UGamqi4
+NboMOvJEGyCI98Ul1z3G4z5D3Yf+xOr1Uz5MZf87Sst4WmsXXw3Hw09Omiqi7VdNIuJGmj8PkTQk
+fVXjjJU30xrwCSss0smNtA0Aq2cpKNgB9RkEth2+dv5yXMSFytKAQd8FqKPVhJBPC/PgP5sZ0jeJ
+P/J7UhyM9uH3PAeXjA6iWYEMspA90+NZRu0PqafegGtaqge2Gcu8V/OXIXoMsSt0Puvap2ctTMSY
+njYJdmZm/Bo/6khUHL4wvYBQv3y1zgD2DGHZ5yQD4OMBgQ692IU0iL2yNqh7XAjlRICMb/gv1SHK
+HRzQ+8S1h9E6Tsd2tTVItQIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBSM+xx1
+vALTn04uSNn5YFSqxLNP+jAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQENBQADggIBAEii1QAL
+LtA/vBzVtVRJHlpr9OTy4EA34MwUe7nJ+jW1dReTagVphZzNTxl4WxmB82M+w85bj/UvXgF2Ez8s
+ALnNllI5SW0ETsXpD4YN4fqzX4IS8TrOZgYkNCvozMrnadyHncI013nR03e4qllY/p0m+jiGPp2K
+h2RX5Rc64vmNueMzeMGQ2Ljdt4NR5MTMI9UGfOZR0800McD2RrsLrfw9EAUqO0qRJe6M1ISHgCq8
+CYyqOhNf6DR5UMEQGfnTKB7U0VEwKbOukGfWHwpjscWpxkIxYxeU72nLL/qMFH3EQxiJ2fAyQOaA
+4kZf5ePBAFmo+eggvIksDkc0C+pXwlM2/KfUrzHN/gLldfq5Jwn58/U7yn2fqSLLiMmq0Uc9Nneo
+WWRrJ8/vJ8HjJLWG965+Mk2weWjROeiQWMODvA8s1pfrzgzhIMfatz7DP78v3DSk+yshzWePS/Tj
+6tQ/50+6uaWTRRxmHyH6ZF5v4HaUMst19W7l9o/HuKTMqJZ9ZPskWkoDbGs4xugDQ5r3V7mzKWmT
+OPQD8rv7gmsHINFSH5pkAnuYZttcTVoP0ISVoDwUQwbKytu4QTbaakRnh6+v40URFWkIsr4WOZck
+bxJF0WddCajJFdr60qZfE2Efv4WstK2tBZQIgx51F9NxO5NQI1mg7TyRVJ12AMXDuDjb
+-----END CERTIFICATE-----
+
+TunTrust Root CA
+================
+-----BEGIN CERTIFICATE-----
+MIIFszCCA5ugAwIBAgIUEwLV4kBMkkaGFmddtLu7sms+/BMwDQYJKoZIhvcNAQELBQAwYTELMAkG
+A1UEBhMCVE4xNzA1BgNVBAoMLkFnZW5jZSBOYXRpb25hbGUgZGUgQ2VydGlmaWNhdGlvbiBFbGVj
+dHJvbmlxdWUxGTAXBgNVBAMMEFR1blRydXN0IFJvb3QgQ0EwHhcNMTkwNDI2MDg1NzU2WhcNNDQw
+NDI2MDg1NzU2WjBhMQswCQYDVQQGEwJUTjE3MDUGA1UECgwuQWdlbmNlIE5hdGlvbmFsZSBkZSBD
+ZXJ0aWZpY2F0aW9uIEVsZWN0cm9uaXF1ZTEZMBcGA1UEAwwQVHVuVHJ1c3QgUm9vdCBDQTCCAiIw
+DQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMPN0/y9BFPdDCA61YguBUtB9YOCfvdZn56eY+hz
+2vYGqU8ftPkLHzmMmiDQfgbU7DTZhrx1W4eI8NLZ1KMKsmwb60ksPqxd2JQDoOw05TDENX37Jk0b
+bjBU2PWARZw5rZzJJQRNmpA+TkBuimvNKWfGzC3gdOgFVwpIUPp6Q9p+7FuaDmJ2/uqdHYVy7BG7
+NegfJ7/Boce7SBbdVtfMTqDhuazb1YMZGoXRlJfXyqNlC/M4+QKu3fZnz8k/9YosRxqZbwUN/dAd
+gjH8KcwAWJeRTIAAHDOFli/LQcKLEITDCSSJH7UP2dl3RxiSlGBcx5kDPP73lad9UKGAwqmDrViW
+VSHbhlnUr8a83YFuB9tgYv7sEG7aaAH0gxupPqJbI9dkxt/con3YS7qC0lH4Zr8GRuR5KiY2eY8f
+Tpkdso8MDhz/yV3A/ZAQprE38806JG60hZC/gLkMjNWb1sjxVj8agIl6qeIbMlEsPvLfe/ZdeikZ
+juXIvTZxi11Mwh0/rViizz1wTaZQmCXcI/m4WEEIcb9PuISgjwBUFfyRbVinljvrS5YnzWuioYas
+DXxU5mZMZl+QviGaAkYt5IPCgLnPSz7ofzwB7I9ezX/SKEIBlYrilz0QIX32nRzFNKHsLA4KUiwS
+VXAkPcvCFDVDXSdOvsC9qnyW5/yeYa1E0wCXAgMBAAGjYzBhMB0GA1UdDgQWBBQGmpsfU33x9aTI
+04Y+oXNZtPdEITAPBgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFAaamx9TffH1pMjThj6hc1m0
+90QhMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQsFAAOCAgEAqgVutt0Vyb+zxiD2BkewhpMl
+0425yAA/l/VSJ4hxyXT968pk21vvHl26v9Hr7lxpuhbI87mP0zYuQEkHDVneixCwSQXi/5E/S7fd
+Ao74gShczNxtr18UnH1YeA32gAm56Q6XKRm4t+v4FstVEuTGfbvE7Pi1HE4+Z7/FXxttbUcoqgRY
+YdZ2vyJ/0Adqp2RT8JeNnYA/u8EH22Wv5psymsNUk8QcCMNE+3tjEUPRahphanltkE8pjkcFwRJp
+adbGNjHh/PqAulxPxOu3Mqz4dWEX1xAZufHSCe96Qp1bWgvUxpVOKs7/B9dPfhgGiPEZtdmYu65x
+xBzndFlY7wyJz4sfdZMaBBSSSFCp61cpABbjNhzI+L/wM9VBD8TMPN3pM0MBkRArHtG5Xc0yGYuP
+jCB31yLEQtyEFpslbei0VXF/sHyz03FJuc9SpAQ/3D2gu68zngowYI7bnV2UqL1g52KAdoGDDIzM
+MEZJ4gzSqK/rYXHv5yJiqfdcZGyfFoxnNidF9Ql7v/YQCvGwjVRDjAS6oz/v4jXH+XTgbzRB0L9z
+ZVcg+ZtnemZoJE6AZb0QmQZZ8mWvuMZHu/2QeItBcy6vVR/cO5JyboTT0GFMDcx2V+IthSIVNg3r
+AZ3r2OvEhJn7wAzMMujjd9qDRIueVSjAi1jTkD5OGwDxFa2DK5o=
+-----END CERTIFICATE-----
+
+HARICA TLS RSA Root CA 2021
+===========================
+-----BEGIN CERTIFICATE-----
+MIIFpDCCA4ygAwIBAgIQOcqTHO9D88aOk8f0ZIk4fjANBgkqhkiG9w0BAQsFADBsMQswCQYDVQQG
+EwJHUjE3MDUGA1UECgwuSGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9u
+cyBDQTEkMCIGA1UEAwwbSEFSSUNBIFRMUyBSU0EgUm9vdCBDQSAyMDIxMB4XDTIxMDIxOTEwNTUz
+OFoXDTQ1MDIxMzEwNTUzN1owbDELMAkGA1UEBhMCR1IxNzA1BgNVBAoMLkhlbGxlbmljIEFjYWRl
+bWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1dGlvbnMgQ0ExJDAiBgNVBAMMG0hBUklDQSBUTFMgUlNB
+IFJvb3QgQ0EgMjAyMTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAIvC569lmwVnlskN
+JLnQDmT8zuIkGCyEf3dRywQRNrhe7Wlxp57kJQmXZ8FHws+RFjZiPTgE4VGC/6zStGndLuwRo0Xu
+a2s7TL+MjaQenRG56Tj5eg4MmOIjHdFOY9TnuEFE+2uva9of08WRiFukiZLRgeaMOVig1mlDqa2Y
+Ulhu2wr7a89o+uOkXjpFc5gH6l8Cct4MpbOfrqkdtx2z/IpZ525yZa31MJQjB/OCFks1mJxTuy/K
+5FrZx40d/JiZ+yykgmvwKh+OC19xXFyuQnspiYHLA6OZyoieC0AJQTPb5lh6/a6ZcMBaD9YThnEv
+dmn8kN3bLW7R8pv1GmuebxWMevBLKKAiOIAkbDakO/IwkfN4E8/BPzWr8R0RI7VDIp4BkrcYAuUR
+0YLbFQDMYTfBKnya4dC6s1BG7oKsnTH4+yPiAwBIcKMJJnkVU2DzOFytOOqBAGMUuTNe3QvboEUH
+GjMJ+E20pwKmafTCWQWIZYVWrkvL4N48fS0ayOn7H6NhStYqE613TBoYm5EPWNgGVMWX+Ko/IIqm
+haZ39qb8HOLubpQzKoNQhArlT4b4UEV4AIHrW2jjJo3Me1xR9BQsQL4aYB16cmEdH2MtiKrOokWQ
+CPxrvrNQKlr9qEgYRtaQQJKQCoReaDH46+0N0x3GfZkYVVYnZS6NRcUk7M7jAgMBAAGjQjBAMA8G
+A1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFApII6ZgpJIKM+qTW8VX6iVNvRLuMA4GA1UdDwEB/wQE
+AwIBhjANBgkqhkiG9w0BAQsFAAOCAgEAPpBIqm5iFSVmewzVjIuJndftTgfvnNAUX15QvWiWkKQU
+EapobQk1OUAJ2vQJLDSle1mESSmXdMgHHkdt8s4cUCbjnj1AUz/3f5Z2EMVGpdAgS1D0NTsY9FVq
+QRtHBmg8uwkIYtlfVUKqrFOFrJVWNlar5AWMxajaH6NpvVMPxP/cyuN+8kyIhkdGGvMA9YCRotxD
+QpSbIPDRzbLrLFPCU3hKTwSUQZqPJzLB5UkZv/HywouoCjkxKLR9YjYsTewfM7Z+d21+UPCfDtcR
+j88YxeMn/ibvBZ3PzzfF0HvaO7AWhAw6k9a+F9sPPg4ZeAnHqQJyIkv3N3a6dcSFA1pj1bF1BcK5
+vZStjBWZp5N99sXzqnTPBIWUmAD04vnKJGW/4GKvyMX6ssmeVkjaef2WdhW+o45WxLM0/L5H9MG0
+qPzVMIho7suuyWPEdr6sOBjhXlzPrjoiUevRi7PzKzMHVIf6tLITe7pTBGIBnfHAT+7hOtSLIBD6
+Alfm78ELt5BGnBkpjNxvoEppaZS3JGWg/6w/zgH7IS79aPib8qXPMThcFarmlwDB31qlpzmq6YR/
+PFGoOtmUW4y/Twhx5duoXNTSpv4Ao8YWxw/ogM4cKGR0GQjTQuPOAF1/sdwTsOEFy9EgqoZ0njnn
+kf3/W9b3raYvAwtt41dU63ZTGI0RmLo=
+-----END CERTIFICATE-----
+
+HARICA TLS ECC Root CA 2021
+===========================
+-----BEGIN CERTIFICATE-----
+MIICVDCCAdugAwIBAgIQZ3SdjXfYO2rbIvT/WeK/zjAKBggqhkjOPQQDAzBsMQswCQYDVQQGEwJH
+UjE3MDUGA1UECgwuSGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBD
+QTEkMCIGA1UEAwwbSEFSSUNBIFRMUyBFQ0MgUm9vdCBDQSAyMDIxMB4XDTIxMDIxOTExMDExMFoX
+DTQ1MDIxMzExMDEwOVowbDELMAkGA1UEBhMCR1IxNzA1BgNVBAoMLkhlbGxlbmljIEFjYWRlbWlj
+IGFuZCBSZXNlYXJjaCBJbnN0aXR1dGlvbnMgQ0ExJDAiBgNVBAMMG0hBUklDQSBUTFMgRUNDIFJv
+b3QgQ0EgMjAyMTB2MBAGByqGSM49AgEGBSuBBAAiA2IABDgI/rGgltJ6rK9JOtDA4MM7KKrxcm1l
+AEeIhPyaJmuqS7psBAqIXhfyVYf8MLA04jRYVxqEU+kw2anylnTDUR9YSTHMmE5gEYd103KUkE+b
+ECUqqHgtvpBBWJAVcqeht6NCMEAwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUyRtTgRL+BNUW
+0aq8mm+3oJUZbsowDgYDVR0PAQH/BAQDAgGGMAoGCCqGSM49BAMDA2cAMGQCMBHervjcToiwqfAi
+rcJRQO9gcS3ujwLEXQNwSaSS6sUUiHCm0w2wqsosQJz76YJumgIwK0eaB8bRwoF8yguWGEEbo/Qw
+CZ61IygNnxS2PFOiTAZpffpskcYqSUXm7LcT4Tps
+-----END CERTIFICATE-----
+
+Autoridad de Certificacion Firmaprofesional CIF A62634068
+=========================================================
+-----BEGIN CERTIFICATE-----
+MIIGFDCCA/ygAwIBAgIIG3Dp0v+ubHEwDQYJKoZIhvcNAQELBQAwUTELMAkGA1UEBhMCRVMxQjBA
+BgNVBAMMOUF1dG9yaWRhZCBkZSBDZXJ0aWZpY2FjaW9uIEZpcm1hcHJvZmVzaW9uYWwgQ0lGIEE2
+MjYzNDA2ODAeFw0xNDA5MjMxNTIyMDdaFw0zNjA1MDUxNTIyMDdaMFExCzAJBgNVBAYTAkVTMUIw
+QAYDVQQDDDlBdXRvcmlkYWQgZGUgQ2VydGlmaWNhY2lvbiBGaXJtYXByb2Zlc2lvbmFsIENJRiBB
+NjI2MzQwNjgwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDKlmuO6vj78aI14H9M2uDD
+Utd9thDIAl6zQyrET2qyyhxdKJp4ERppWVevtSBC5IsP5t9bpgOSL/UR5GLXMnE42QQMcas9UX4P
+B99jBVzpv5RvwSmCwLTaUbDBPLutN0pcyvFLNg4kq7/DhHf9qFD0sefGL9ItWY16Ck6WaVICqjaY
+7Pz6FIMMNx/Jkjd/14Et5cS54D40/mf0PmbR0/RAz15iNA9wBj4gGFrO93IbJWyTdBSTo3OxDqqH
+ECNZXyAFGUftaI6SEspd/NYrspI8IM/hX68gvqB2f3bl7BqGYTM+53u0P6APjqK5am+5hyZvQWyI
+plD9amML9ZMWGxmPsu2bm8mQ9QEM3xk9Dz44I8kvjwzRAv4bVdZO0I08r0+k8/6vKtMFnXkIoctX
+MbScyJCyZ/QYFpM6/EfY0XiWMR+6KwxfXZmtY4laJCB22N/9q06mIqqdXuYnin1oKaPnirjaEbsX
+LZmdEyRG98Xi2J+Of8ePdG1asuhy9azuJBCtLxTa/y2aRnFHvkLfuwHb9H/TKI8xWVvTyQKmtFLK
+bpf7Q8UIJm+K9Lv9nyiqDdVF8xM6HdjAeI9BZzwelGSuewvF6NkBiDkal4ZkQdU7hwxu+g/GvUgU
+vzlN1J5Bto+WHWOWk9mVBngxaJ43BjuAiUVhOSPHG0SjFeUc+JIwuwIDAQABo4HvMIHsMB0GA1Ud
+DgQWBBRlzeurNR4APn7VdMActHNHDhpkLzASBgNVHRMBAf8ECDAGAQH/AgEBMIGmBgNVHSAEgZ4w
+gZswgZgGBFUdIAAwgY8wLwYIKwYBBQUHAgEWI2h0dHA6Ly93d3cuZmlybWFwcm9mZXNpb25hbC5j
+b20vY3BzMFwGCCsGAQUFBwICMFAeTgBQAGEAcwBlAG8AIABkAGUAIABsAGEAIABCAG8AbgBhAG4A
+bwB2AGEAIAA0ADcAIABCAGEAcgBjAGUAbABvAG4AYQAgADAAOAAwADEANzAOBgNVHQ8BAf8EBAMC
+AQYwDQYJKoZIhvcNAQELBQADggIBAHSHKAIrdx9miWTtj3QuRhy7qPj4Cx2Dtjqn6EWKB7fgPiDL
+4QjbEwj4KKE1soCzC1HA01aajTNFSa9J8OA9B3pFE1r/yJfY0xgsfZb43aJlQ3CTkBW6kN/oGbDb
+LIpgD7dvlAceHabJhfa9NPhAeGIQcDq+fUs5gakQ1JZBu/hfHAsdCPKxsIl68veg4MSPi3i1O1il
+I45PVf42O+AMt8oqMEEgtIDNrvx2ZnOorm7hfNoD6JQg5iKj0B+QXSBTFCZX2lSX3xZEEAEeiGaP
+cjiT3SC3NL7X8e5jjkd5KAb881lFJWAiMxujX6i6KtoaPc1A6ozuBRWV1aUsIC+nmCjuRfzxuIgA
+LI9C2lHVnOUTaHFFQ4ueCyE8S1wF3BqfmI7avSKecs2tCsvMo2ebKHTEm9caPARYpoKdrcd7b/+A
+lun4jWq9GJAd/0kakFI3ky88Al2CdgtR5xbHV/g4+afNmyJU72OwFW1TZQNKXkqgsqeOSQBZONXH
+9IBk9W6VULgRfhVwOEqwf9DEMnDAGf/JOC0ULGb0QkTmVXYbgBVX/8Cnp6o5qtjTcNAuuuuUavpf
+NIbnYrX9ivAwhZTJryQCL2/W3Wf+47BVTwSYT6RBVuKT0Gro1vP7ZeDOdcQxWQzugsgMYDNKGbqE
+ZycPvEJdvSRUDewdcAZfpLz6IHxV
+-----END CERTIFICATE-----
+
+vTrus ECC Root CA
+=================
+-----BEGIN CERTIFICATE-----
+MIICDzCCAZWgAwIBAgIUbmq8WapTvpg5Z6LSa6Q75m0c1towCgYIKoZIzj0EAwMwRzELMAkGA1UE
+BhMCQ04xHDAaBgNVBAoTE2lUcnVzQ2hpbmEgQ28uLEx0ZC4xGjAYBgNVBAMTEXZUcnVzIEVDQyBS
+b290IENBMB4XDTE4MDczMTA3MjY0NFoXDTQzMDczMTA3MjY0NFowRzELMAkGA1UEBhMCQ04xHDAa
+BgNVBAoTE2lUcnVzQ2hpbmEgQ28uLEx0ZC4xGjAYBgNVBAMTEXZUcnVzIEVDQyBSb290IENBMHYw
+EAYHKoZIzj0CAQYFK4EEACIDYgAEZVBKrox5lkqqHAjDo6LN/llWQXf9JpRCux3NCNtzslt188+c
+ToL0v/hhJoVs1oVbcnDS/dtitN9Ti72xRFhiQgnH+n9bEOf+QP3A2MMrMudwpremIFUde4BdS49n
+TPEQo0IwQDAdBgNVHQ4EFgQUmDnNvtiyjPeyq+GtJK97fKHbH88wDwYDVR0TAQH/BAUwAwEB/zAO
+BgNVHQ8BAf8EBAMCAQYwCgYIKoZIzj0EAwMDaAAwZQIwV53dVvHH4+m4SVBrm2nDb+zDfSXkV5UT
+QJtS0zvzQBm8JsctBp61ezaf9SXUY2sAAjEA6dPGnlaaKsyh2j/IZivTWJwghfqrkYpwcBE4YGQL
+YgmRWAD5Tfs0aNoJrSEGGJTO
+-----END CERTIFICATE-----
+
+vTrus Root CA
+=============
+-----BEGIN CERTIFICATE-----
+MIIFVjCCAz6gAwIBAgIUQ+NxE9izWRRdt86M/TX9b7wFjUUwDQYJKoZIhvcNAQELBQAwQzELMAkG
+A1UEBhMCQ04xHDAaBgNVBAoTE2lUcnVzQ2hpbmEgQ28uLEx0ZC4xFjAUBgNVBAMTDXZUcnVzIFJv
+b3QgQ0EwHhcNMTgwNzMxMDcyNDA1WhcNNDMwNzMxMDcyNDA1WjBDMQswCQYDVQQGEwJDTjEcMBoG
+A1UEChMTaVRydXNDaGluYSBDby4sTHRkLjEWMBQGA1UEAxMNdlRydXMgUm9vdCBDQTCCAiIwDQYJ
+KoZIhvcNAQEBBQADggIPADCCAgoCggIBAL1VfGHTuB0EYgWgrmy3cLRB6ksDXhA/kFocizuwZots
+SKYcIrrVQJLuM7IjWcmOvFjai57QGfIvWcaMY1q6n6MLsLOaXLoRuBLpDLvPbmyAhykUAyyNJJrI
+ZIO1aqwTLDPxn9wsYTwaP3BVm60AUn/PBLn+NvqcwBauYv6WTEN+VRS+GrPSbcKvdmaVayqwlHeF
+XgQPYh1jdfdr58tbmnDsPmcF8P4HCIDPKNsFxhQnL4Z98Cfe/+Z+M0jnCx5Y0ScrUw5XSmXX+6KA
+YPxMvDVTAWqXcoKv8R1w6Jz1717CbMdHflqUhSZNO7rrTOiwCcJlwp2dCZtOtZcFrPUGoPc2BX70
+kLJrxLT5ZOrpGgrIDajtJ8nU57O5q4IikCc9Kuh8kO+8T/3iCiSn3mUkpF3qwHYw03dQ+A0Em5Q2
+AXPKBlim0zvc+gRGE1WKyURHuFE5Gi7oNOJ5y1lKCn+8pu8fA2dqWSslYpPZUxlmPCdiKYZNpGvu
+/9ROutW04o5IWgAZCfEF2c6Rsffr6TlP9m8EQ5pV9T4FFL2/s1m02I4zhKOQUqqzApVg+QxMaPnu
+1RcN+HFXtSXkKe5lXa/R7jwXC1pDxaWG6iSe4gUH3DRCEpHWOXSuTEGC2/KmSNGzm/MzqvOmwMVO
+9fSddmPmAsYiS8GVP1BkLFTltvA8Kc9XAgMBAAGjQjBAMB0GA1UdDgQWBBRUYnBj8XWEQ1iO0RYg
+scasGrz2iTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQsFAAOC
+AgEAKbqSSaet8PFww+SX8J+pJdVrnjT+5hpk9jprUrIQeBqfTNqK2uwcN1LgQkv7bHbKJAs5EhWd
+nxEt/Hlk3ODg9d3gV8mlsnZwUKT+twpw1aA08XXXTUm6EdGz2OyC/+sOxL9kLX1jbhd47F18iMjr
+jld22VkE+rxSH0Ws8HqA7Oxvdq6R2xCOBNyS36D25q5J08FsEhvMKar5CKXiNxTKsbhm7xqC5PD4
+8acWabfbqWE8n/Uxy+QARsIvdLGx14HuqCaVvIivTDUHKgLKeBRtRytAVunLKmChZwOgzoy8sHJn
+xDHO2zTlJQNgJXtxmOTAGytfdELSS8VZCAeHvsXDf+eW2eHcKJfWjwXj9ZtOyh1QRwVTsMo554Wg
+icEFOwE30z9J4nfrI8iIZjs9OXYhRvHsXyO466JmdXTBQPfYaJqT4i2pLr0cox7IdMakLXogqzu4
+sEb9b91fUlV1YvCXoHzXOP0l382gmxDPi7g4Xl7FtKYCNqEeXxzP4padKar9mK5S4fNBUvupLnKW
+nyfjqnN9+BojZns7q2WwMgFLFT49ok8MKzWixtlnEjUwzXYuFrOZnk1PTi07NEPhmg4NpGaXutIc
+SkwsKouLgU9xGqndXHt7CMUADTdA43x7VF8vhV929vensBxXVsFy6K2ir40zSbofitzmdHxghm+H
+l3s=
+-----END CERTIFICATE-----
+
+ISRG Root X2
+============
+-----BEGIN CERTIFICATE-----
+MIICGzCCAaGgAwIBAgIQQdKd0XLq7qeAwSxs6S+HUjAKBggqhkjOPQQDAzBPMQswCQYDVQQGEwJV
+UzEpMCcGA1UEChMgSW50ZXJuZXQgU2VjdXJpdHkgUmVzZWFyY2ggR3JvdXAxFTATBgNVBAMTDElT
+UkcgUm9vdCBYMjAeFw0yMDA5MDQwMDAwMDBaFw00MDA5MTcxNjAwMDBaME8xCzAJBgNVBAYTAlVT
+MSkwJwYDVQQKEyBJbnRlcm5ldCBTZWN1cml0eSBSZXNlYXJjaCBHcm91cDEVMBMGA1UEAxMMSVNS
+RyBSb290IFgyMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEzZvVn4CDCuwJSvMWSj5cz3es3mcFDR0H
+ttwW+1qLFNvicWDEukWVEYmO6gbf9yoWHKS5xcUy4APgHoIYOIvXRdgKam7mAHf7AlF9ItgKbppb
+d9/w+kHsOdx1ymgHDB/qo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNV
+HQ4EFgQUfEKWrt5LSDv6kviejM9ti6lyN5UwCgYIKoZIzj0EAwMDaAAwZQIwe3lORlCEwkSHRhtF
+cP9Ymd70/aTSVaYgLXTWNLxBo1BfASdWtL4ndQavEi51mI38AjEAi/V3bNTIZargCyzuFJ0nN6T5
+U6VR5CmD1/iQMVtCnwr1/q4AaOeMSQ+2b1tbFfLn
+-----END CERTIFICATE-----
+
+HiPKI Root CA - G1
+==================
+-----BEGIN CERTIFICATE-----
+MIIFajCCA1KgAwIBAgIQLd2szmKXlKFD6LDNdmpeYDANBgkqhkiG9w0BAQsFADBPMQswCQYDVQQG
+EwJUVzEjMCEGA1UECgwaQ2h1bmdod2EgVGVsZWNvbSBDby4sIEx0ZC4xGzAZBgNVBAMMEkhpUEtJ
+IFJvb3QgQ0EgLSBHMTAeFw0xOTAyMjIwOTQ2MDRaFw0zNzEyMzExNTU5NTlaME8xCzAJBgNVBAYT
+AlRXMSMwIQYDVQQKDBpDaHVuZ2h3YSBUZWxlY29tIENvLiwgTHRkLjEbMBkGA1UEAwwSSGlQS0kg
+Um9vdCBDQSAtIEcxMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA9B5/UnMyDHPkvRN0
+o9QwqNCuS9i233VHZvR85zkEHmpwINJaR3JnVfSl6J3VHiGh8Ge6zCFovkRTv4354twvVcg3Px+k
+wJyz5HdcoEb+d/oaoDjq7Zpy3iu9lFc6uux55199QmQ5eiY29yTw1S+6lZgRZq2XNdZ1AYDgr/SE
+YYwNHl98h5ZeQa/rh+r4XfEuiAU+TCK72h8q3VJGZDnzQs7ZngyzsHeXZJzA9KMuH5UHsBffMNsA
+GJZMoYFL3QRtU6M9/Aes1MU3guvklQgZKILSQjqj2FPseYlgSGDIcpJQ3AOPgz+yQlda22rpEZfd
+hSi8MEyr48KxRURHH+CKFgeW0iEPU8DtqX7UTuybCeyvQqww1r/REEXgphaypcXTT3OUM3ECoWqj
+1jOXTyFjHluP2cFeRXF3D4FdXyGarYPM+l7WjSNfGz1BryB1ZlpK9p/7qxj3ccC2HTHsOyDry+K4
+9a6SsvfhhEvyovKTmiKe0xRvNlS9H15ZFblzqMF8b3ti6RZsR1pl8w4Rm0bZ/W3c1pzAtH2lsN0/
+Vm+h+fbkEkj9Bn8SV7apI09bA8PgcSojt/ewsTu8mL3WmKgMa/aOEmem8rJY5AIJEzypuxC00jBF
+8ez3ABHfZfjcK0NVvxaXxA/VLGGEqnKG/uY6fsI/fe78LxQ+5oXdUG+3Se0CAwEAAaNCMEAwDwYD
+VR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU8ncX+l6o/vY9cdVouslGDDjYr7AwDgYDVR0PAQH/BAQD
+AgGGMA0GCSqGSIb3DQEBCwUAA4ICAQBQUfB13HAE4/+qddRxosuej6ip0691x1TPOhwEmSKsxBHi
+7zNKpiMdDg1H2DfHb680f0+BazVP6XKlMeJ45/dOlBhbQH3PayFUhuaVevvGyuqcSE5XCV0vrPSl
+tJczWNWseanMX/mF+lLFjfiRFOs6DRfQUsJ748JzjkZ4Bjgs6FzaZsT0pPBWGTMpWmWSBUdGSquE
+wx4noR8RkpkndZMPvDY7l1ePJlsMu5wP1G4wB9TcXzZoZjmDlicmisjEOf6aIW/Vcobpf2Lll07Q
+JNBAsNB1CI69aO4I1258EHBGG3zgiLKecoaZAeO/n0kZtCW+VmWuF2PlHt/o/0elv+EmBYTksMCv
+5wiZqAxeJoBF1PhoL5aPruJKHJwWDBNvOIf2u8g0X5IDUXlwpt/L9ZlNec1OvFefQ05rLisY+Gpz
+jLrFNe85akEez3GoorKGB1s6yeHvP2UEgEcyRHCVTjFnanRbEEV16rCf0OY1/k6fi8wrkkVbbiVg
+hUbN0aqwdmaTd5a+g744tiROJgvM7XpWGuDpWsZkrUx6AEhEL7lAuxM+vhV4nYWBSipX3tUZQ9rb
+yltHhoMLP7YNdnhzeSJesYAfz77RP1YQmCuVh6EfnWQUYDksswBVLuT1sw5XxJFBAJw/6KXf6vb/
+yPCtbVKoF6ubYfwSUTXkJf2vqmqGOQ==
+-----END CERTIFICATE-----
+
+GlobalSign ECC Root CA - R4
+===========================
+-----BEGIN CERTIFICATE-----
+MIIB3DCCAYOgAwIBAgINAgPlfvU/k/2lCSGypjAKBggqhkjOPQQDAjBQMSQwIgYDVQQLExtHbG9i
+YWxTaWduIEVDQyBSb290IENBIC0gUjQxEzARBgNVBAoTCkdsb2JhbFNpZ24xEzARBgNVBAMTCkds
+b2JhbFNpZ24wHhcNMTIxMTEzMDAwMDAwWhcNMzgwMTE5MDMxNDA3WjBQMSQwIgYDVQQLExtHbG9i
+YWxTaWduIEVDQyBSb290IENBIC0gUjQxEzARBgNVBAoTCkdsb2JhbFNpZ24xEzARBgNVBAMTCkds
+b2JhbFNpZ24wWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAS4xnnTj2wlDp8uORkcA6SumuU5BwkW
+ymOxuYb4ilfBV85C+nOh92VC/x7BALJucw7/xyHlGKSq2XE/qNS5zowdo0IwQDAOBgNVHQ8BAf8E
+BAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUVLB7rUW44kB/+wpu+74zyTyjhNUwCgYI
+KoZIzj0EAwIDRwAwRAIgIk90crlgr/HmnKAWBVBfw147bmF0774BxL4YSFlhgjICICadVGNA3jdg
+UM/I2O2dgq43mLyjj0xMqTQrbO/7lZsm
+-----END CERTIFICATE-----
+
+GTS Root R1
+===========
+-----BEGIN CERTIFICATE-----
+MIIFVzCCAz+gAwIBAgINAgPlk28xsBNJiGuiFzANBgkqhkiG9w0BAQwFADBHMQswCQYDVQQGEwJV
+UzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3Qg
+UjEwHhcNMTYwNjIyMDAwMDAwWhcNMzYwNjIyMDAwMDAwWjBHMQswCQYDVQQGEwJVUzEiMCAGA1UE
+ChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3QgUjEwggIiMA0G
+CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC2EQKLHuOhd5s73L+UPreVp0A8of2C+X0yBoJx9vaM
+f/vo27xqLpeXo4xL+Sv2sfnOhB2x+cWX3u+58qPpvBKJXqeqUqv4IyfLpLGcY9vXmX7wCl7raKb0
+xlpHDU0QM+NOsROjyBhsS+z8CZDfnWQpJSMHobTSPS5g4M/SCYe7zUjwTcLCeoiKu7rPWRnWr4+w
+B7CeMfGCwcDfLqZtbBkOtdh+JhpFAz2weaSUKK0PfyblqAj+lug8aJRT7oM6iCsVlgmy4HqMLnXW
+nOunVmSPlk9orj2XwoSPwLxAwAtcvfaHszVsrBhQf4TgTM2S0yDpM7xSma8ytSmzJSq0SPly4cpk
+9+aCEI3oncKKiPo4Zor8Y/kB+Xj9e1x3+naH+uzfsQ55lVe0vSbv1gHR6xYKu44LtcXFilWr06zq
+kUspzBmkMiVOKvFlRNACzqrOSbTqn3yDsEB750Orp2yjj32JgfpMpf/VjsPOS+C12LOORc92wO1A
+K/1TD7Cn1TsNsYqiA94xrcx36m97PtbfkSIS5r762DL8EGMUUXLeXdYWk70paDPvOmbsB4om3xPX
+V2V4J95eSRQAogB/mqghtqmxlbCluQ0WEdrHbEg8QOB+DVrNVjzRlwW5y0vtOUucxD/SVRNuJLDW
+cfr0wbrM7Rv1/oFB2ACYPTrIrnqYNxgFlQIDAQABo0IwQDAOBgNVHQ8BAf8EBAMCAYYwDwYDVR0T
+AQH/BAUwAwEB/zAdBgNVHQ4EFgQU5K8rJnEaK0gnhS9SZizv8IkTcT4wDQYJKoZIhvcNAQEMBQAD
+ggIBAJ+qQibbC5u+/x6Wki4+omVKapi6Ist9wTrYggoGxval3sBOh2Z5ofmmWJyq+bXmYOfg6LEe
+QkEzCzc9zolwFcq1JKjPa7XSQCGYzyI0zzvFIoTgxQ6KfF2I5DUkzps+GlQebtuyh6f88/qBVRRi
+ClmpIgUxPoLW7ttXNLwzldMXG+gnoot7TiYaelpkttGsN/H9oPM47HLwEXWdyzRSjeZ2axfG34ar
+J45JK3VmgRAhpuo+9K4l/3wV3s6MJT/KYnAK9y8JZgfIPxz88NtFMN9iiMG1D53Dn0reWVlHxYci
+NuaCp+0KueIHoI17eko8cdLiA6EfMgfdG+RCzgwARWGAtQsgWSl4vflVy2PFPEz0tv/bal8xa5me
+LMFrUKTX5hgUvYU/Z6tGn6D/Qqc6f1zLXbBwHSs09dR2CQzreExZBfMzQsNhFRAbd03OIozUhfJF
+fbdT6u9AWpQKXCBfTkBdYiJ23//OYb2MI3jSNwLgjt7RETeJ9r/tSQdirpLsQBqvFAnZ0E6yove+
+7u7Y/9waLd64NnHi/Hm3lCXRSHNboTXns5lndcEZOitHTtNCjv0xyBZm2tIMPNuzjsmhDYAPexZ3
+FL//2wmUspO8IFgV6dtxQ/PeEMMA3KgqlbbC1j+Qa3bbbP6MvPJwNQzcmRk13NfIRmPVNnGuV/u3
+gm3c
+-----END CERTIFICATE-----
+
+GTS Root R3
+===========
+-----BEGIN CERTIFICATE-----
+MIICCTCCAY6gAwIBAgINAgPluILrIPglJ209ZjAKBggqhkjOPQQDAzBHMQswCQYDVQQGEwJVUzEi
+MCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3QgUjMw
+HhcNMTYwNjIyMDAwMDAwWhcNMzYwNjIyMDAwMDAwWjBHMQswCQYDVQQGEwJVUzEiMCAGA1UEChMZ
+R29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3QgUjMwdjAQBgcqhkjO
+PQIBBgUrgQQAIgNiAAQfTzOHMymKoYTey8chWEGJ6ladK0uFxh1MJ7x/JlFyb+Kf1qPKzEUURout
+736GjOyxfi//qXGdGIRFBEFVbivqJn+7kAHjSxm65FSWRQmx1WyRRK2EE46ajA2ADDL24CejQjBA
+MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBTB8Sa6oC2uhYHP0/Eq
+Er24Cmf9vDAKBggqhkjOPQQDAwNpADBmAjEA9uEglRR7VKOQFhG/hMjqb2sXnh5GmCCbn9MN2azT
+L818+FsuVbu/3ZL3pAzcMeGiAjEA/JdmZuVDFhOD3cffL74UOO0BzrEXGhF16b0DjyZ+hOXJYKaV
+11RZt+cRLInUue4X
+-----END CERTIFICATE-----
+
+GTS Root R4
+===========
+-----BEGIN CERTIFICATE-----
+MIICCTCCAY6gAwIBAgINAgPlwGjvYxqccpBQUjAKBggqhkjOPQQDAzBHMQswCQYDVQQGEwJVUzEi
+MCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3QgUjQw
+HhcNMTYwNjIyMDAwMDAwWhcNMzYwNjIyMDAwMDAwWjBHMQswCQYDVQQGEwJVUzEiMCAGA1UEChMZ
+R29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3QgUjQwdjAQBgcqhkjO
+PQIBBgUrgQQAIgNiAATzdHOnaItgrkO4NcWBMHtLSZ37wWHO5t5GvWvVYRg1rkDdc/eJkTBa6zzu
+hXyiQHY7qca4R9gq55KRanPpsXI5nymfopjTX15YhmUPoYRlBtHci8nHc8iMai/lxKvRHYqjQjBA
+MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBSATNbrdP9JNqPV2Py1
+PsVq8JQdjDAKBggqhkjOPQQDAwNpADBmAjEA6ED/g94D9J+uHXqnLrmvT/aDHQ4thQEd0dlq7A/C
+r8deVl5c1RxYIigL9zC2L7F8AjEA8GE8p/SgguMh1YQdc4acLa/KNJvxn7kjNuK8YAOdgLOaVsjh
+4rsUecrNIdSUtUlD
+-----END CERTIFICATE-----
+
+Telia Root CA v2
+================
+-----BEGIN CERTIFICATE-----
+MIIFdDCCA1ygAwIBAgIPAWdfJ9b+euPkrL4JWwWeMA0GCSqGSIb3DQEBCwUAMEQxCzAJBgNVBAYT
+AkZJMRowGAYDVQQKDBFUZWxpYSBGaW5sYW5kIE95ajEZMBcGA1UEAwwQVGVsaWEgUm9vdCBDQSB2
+MjAeFw0xODExMjkxMTU1NTRaFw00MzExMjkxMTU1NTRaMEQxCzAJBgNVBAYTAkZJMRowGAYDVQQK
+DBFUZWxpYSBGaW5sYW5kIE95ajEZMBcGA1UEAwwQVGVsaWEgUm9vdCBDQSB2MjCCAiIwDQYJKoZI
+hvcNAQEBBQADggIPADCCAgoCggIBALLQPwe84nvQa5n44ndp586dpAO8gm2h/oFlH0wnrI4AuhZ7
+6zBqAMCzdGh+sq/H1WKzej9Qyow2RCRj0jbpDIX2Q3bVTKFgcmfiKDOlyzG4OiIjNLh9vVYiQJ3q
+9HsDrWj8soFPmNB06o3lfc1jw6P23pLCWBnglrvFxKk9pXSW/q/5iaq9lRdU2HhE8Qx3FZLgmEKn
+pNaqIJLNwaCzlrI6hEKNfdWV5Nbb6WLEWLN5xYzTNTODn3WhUidhOPFZPY5Q4L15POdslv5e2QJl
+tI5c0BE0312/UqeBAMN/mUWZFdUXyApT7GPzmX3MaRKGwhfwAZ6/hLzRUssbkmbOpFPlob/E2wnW
+5olWK8jjfN7j/4nlNW4o6GwLI1GpJQXrSPjdscr6bAhR77cYbETKJuFzxokGgeWKrLDiKca5JLNr
+RBH0pUPCTEPlcDaMtjNXepUugqD0XBCzYYP2AgWGLnwtbNwDRm41k9V6lS/eINhbfpSQBGq6WT0E
+BXWdN6IOLj3rwaRSg/7Qa9RmjtzG6RJOHSpXqhC8fF6CfaamyfItufUXJ63RDolUK5X6wK0dmBR4
+M0KGCqlztft0DbcbMBnEWg4cJ7faGND/isgFuvGqHKI3t+ZIpEYslOqodmJHixBTB0hXbOKSTbau
+BcvcwUpej6w9GU7C7WB1K9vBykLVAgMBAAGjYzBhMB8GA1UdIwQYMBaAFHKs5DN5qkWH9v2sHZ7W
+xy+G2CQ5MB0GA1UdDgQWBBRyrOQzeapFh/b9rB2e1scvhtgkOTAOBgNVHQ8BAf8EBAMCAQYwDwYD
+VR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAgEAoDtZpwmUPjaE0n4vOaWWl/oRrfxn83EJ
+8rKJhGdEr7nv7ZbsnGTbMjBvZ5qsfl+yqwE2foH65IRe0qw24GtixX1LDoJt0nZi0f6X+J8wfBj5
+tFJ3gh1229MdqfDBmgC9bXXYfef6xzijnHDoRnkDry5023X4blMMA8iZGok1GTzTyVR8qPAs5m4H
+eW9q4ebqkYJpCh3DflminmtGFZhb069GHWLIzoBSSRE/yQQSwxN8PzuKlts8oB4KtItUsiRnDe+C
+y748fdHif64W1lZYudogsYMVoe+KTTJvQS8TUoKU1xrBeKJR3Stwbbca+few4GeXVtt8YVMJAygC
+QMez2P2ccGrGKMOF6eLtGpOg3kuYooQ+BXcBlj37tCAPnHICehIv1aO6UXivKitEZU61/Qrowc15
+h2Er3oBXRb9n8ZuRXqWk7FlIEA04x7D6w0RtBPV4UBySllva9bguulvP5fBqnUsvWHMtTy3EHD70
+sz+rFQ47GUGKpMFXEmZxTPpT41frYpUJnlTd0cI8Vzy9OK2YZLe4A5pTVmBds9hCG1xLEooc6+t9
+xnppxyd/pPiL8uSUZodL6ZQHCRJ5irLrdATczvREWeAWysUsWNc8e89ihmpQfTU2Zqf7N+cox9jQ
+raVplI/owd8k+BsHMYeB2F326CjYSlKArBPuUBQemMc=
+-----END CERTIFICATE-----
+
+D-TRUST BR Root CA 1 2020
+=========================
+-----BEGIN CERTIFICATE-----
+MIIC2zCCAmCgAwIBAgIQfMmPK4TX3+oPyWWa00tNljAKBggqhkjOPQQDAzBIMQswCQYDVQQGEwJE
+RTEVMBMGA1UEChMMRC1UcnVzdCBHbWJIMSIwIAYDVQQDExlELVRSVVNUIEJSIFJvb3QgQ0EgMSAy
+MDIwMB4XDTIwMDIxMTA5NDUwMFoXDTM1MDIxMTA5NDQ1OVowSDELMAkGA1UEBhMCREUxFTATBgNV
+BAoTDEQtVHJ1c3QgR21iSDEiMCAGA1UEAxMZRC1UUlVTVCBCUiBSb290IENBIDEgMjAyMDB2MBAG
+ByqGSM49AgEGBSuBBAAiA2IABMbLxyjR+4T1mu9CFCDhQ2tuda38KwOE1HaTJddZO0Flax7mNCq7
+dPYSzuht56vkPE4/RAiLzRZxy7+SmfSk1zxQVFKQhYN4lGdnoxwJGT11NIXe7WB9xwy0QVK5buXu
+QqOCAQ0wggEJMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFHOREKv/VbNafAkl1bK6CKBrqx9t
+MA4GA1UdDwEB/wQEAwIBBjCBxgYDVR0fBIG+MIG7MD6gPKA6hjhodHRwOi8vY3JsLmQtdHJ1c3Qu
+bmV0L2NybC9kLXRydXN0X2JyX3Jvb3RfY2FfMV8yMDIwLmNybDB5oHegdYZzbGRhcDovL2RpcmVj
+dG9yeS5kLXRydXN0Lm5ldC9DTj1ELVRSVVNUJTIwQlIlMjBSb290JTIwQ0ElMjAxJTIwMjAyMCxP
+PUQtVHJ1c3QlMjBHbWJILEM9REU/Y2VydGlmaWNhdGVyZXZvY2F0aW9ubGlzdDAKBggqhkjOPQQD
+AwNpADBmAjEAlJAtE/rhY/hhY+ithXhUkZy4kzg+GkHaQBZTQgjKL47xPoFWwKrY7RjEsK70Pvom
+AjEA8yjixtsrmfu3Ubgko6SUeho/5jbiA1czijDLgsfWFBHVdWNbFJWcHwHP2NVypw87
+-----END CERTIFICATE-----
+
+D-TRUST EV Root CA 1 2020
+=========================
+-----BEGIN CERTIFICATE-----
+MIIC2zCCAmCgAwIBAgIQXwJB13qHfEwDo6yWjfv/0DAKBggqhkjOPQQDAzBIMQswCQYDVQQGEwJE
+RTEVMBMGA1UEChMMRC1UcnVzdCBHbWJIMSIwIAYDVQQDExlELVRSVVNUIEVWIFJvb3QgQ0EgMSAy
+MDIwMB4XDTIwMDIxMTEwMDAwMFoXDTM1MDIxMTA5NTk1OVowSDELMAkGA1UEBhMCREUxFTATBgNV
+BAoTDEQtVHJ1c3QgR21iSDEiMCAGA1UEAxMZRC1UUlVTVCBFViBSb290IENBIDEgMjAyMDB2MBAG
+ByqGSM49AgEGBSuBBAAiA2IABPEL3YZDIBnfl4XoIkqbz52Yv7QFJsnL46bSj8WeeHsxiamJrSc8
+ZRCC/N/DnU7wMyPE0jL1HLDfMxddxfCxivnvubcUyilKwg+pf3VlSSowZ/Rk99Yad9rDwpdhQntJ
+raOCAQ0wggEJMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFH8QARY3OqQo5FD4pPfsazK2/umL
+MA4GA1UdDwEB/wQEAwIBBjCBxgYDVR0fBIG+MIG7MD6gPKA6hjhodHRwOi8vY3JsLmQtdHJ1c3Qu
+bmV0L2NybC9kLXRydXN0X2V2X3Jvb3RfY2FfMV8yMDIwLmNybDB5oHegdYZzbGRhcDovL2RpcmVj
+dG9yeS5kLXRydXN0Lm5ldC9DTj1ELVRSVVNUJTIwRVYlMjBSb290JTIwQ0ElMjAxJTIwMjAyMCxP
+PUQtVHJ1c3QlMjBHbWJILEM9REU/Y2VydGlmaWNhdGVyZXZvY2F0aW9ubGlzdDAKBggqhkjOPQQD
+AwNpADBmAjEAyjzGKnXCXnViOTYAYFqLwZOZzNnbQTs7h5kXO9XMT8oi96CAy/m0sRtW9XLS/BnR
+AjEAkfcwkz8QRitxpNA7RJvAKQIFskF3UfN5Wp6OFKBOQtJbgfM0agPnIjhQW+0ZT0MW
+-----END CERTIFICATE-----
+
+DigiCert TLS ECC P384 Root G5
+=============================
+-----BEGIN CERTIFICATE-----
+MIICGTCCAZ+gAwIBAgIQCeCTZaz32ci5PhwLBCou8zAKBggqhkjOPQQDAzBOMQswCQYDVQQGEwJV
+UzEXMBUGA1UEChMORGlnaUNlcnQsIEluYy4xJjAkBgNVBAMTHURpZ2lDZXJ0IFRMUyBFQ0MgUDM4
+NCBSb290IEc1MB4XDTIxMDExNTAwMDAwMFoXDTQ2MDExNDIzNTk1OVowTjELMAkGA1UEBhMCVVMx
+FzAVBgNVBAoTDkRpZ2lDZXJ0LCBJbmMuMSYwJAYDVQQDEx1EaWdpQ2VydCBUTFMgRUNDIFAzODQg
+Um9vdCBHNTB2MBAGByqGSM49AgEGBSuBBAAiA2IABMFEoc8Rl1Ca3iOCNQfN0MsYndLxf3c1Tzvd
+lHJS7cI7+Oz6e2tYIOyZrsn8aLN1udsJ7MgT9U7GCh1mMEy7H0cKPGEQQil8pQgO4CLp0zVozptj
+n4S1mU1YoI71VOeVyaNCMEAwHQYDVR0OBBYEFMFRRVBZqz7nLFr6ICISB4CIfBFqMA4GA1UdDwEB
+/wQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MAoGCCqGSM49BAMDA2gAMGUCMQCJao1H5+z8blUD2Wds
+Jk6Dxv3J+ysTvLd6jLRl0mlpYxNjOyZQLgGheQaRnUi/wr4CMEfDFXuxoJGZSZOoPHzoRgaLLPIx
+AJSdYsiJvRmEFOml+wG4DXZDjC5Ty3zfDBeWUA==
+-----END CERTIFICATE-----
+
+DigiCert TLS RSA4096 Root G5
+============================
+-----BEGIN CERTIFICATE-----
+MIIFZjCCA06gAwIBAgIQCPm0eKj6ftpqMzeJ3nzPijANBgkqhkiG9w0BAQwFADBNMQswCQYDVQQG
+EwJVUzEXMBUGA1UEChMORGlnaUNlcnQsIEluYy4xJTAjBgNVBAMTHERpZ2lDZXJ0IFRMUyBSU0E0
+MDk2IFJvb3QgRzUwHhcNMjEwMTE1MDAwMDAwWhcNNDYwMTE0MjM1OTU5WjBNMQswCQYDVQQGEwJV
+UzEXMBUGA1UEChMORGlnaUNlcnQsIEluYy4xJTAjBgNVBAMTHERpZ2lDZXJ0IFRMUyBSU0E0MDk2
+IFJvb3QgRzUwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCz0PTJeRGd/fxmgefM1eS8
+7IE+ajWOLrfn3q/5B03PMJ3qCQuZvWxX2hhKuHisOjmopkisLnLlvevxGs3npAOpPxG02C+JFvuU
+AT27L/gTBaF4HI4o4EXgg/RZG5Wzrn4DReW+wkL+7vI8toUTmDKdFqgpwgscONyfMXdcvyej/Ces
+tyu9dJsXLfKB2l2w4SMXPohKEiPQ6s+d3gMXsUJKoBZMpG2T6T867jp8nVid9E6P/DsjyG244gXa
+zOvswzH016cpVIDPRFtMbzCe88zdH5RDnU1/cHAN1DrRN/BsnZvAFJNY781BOHW8EwOVfH/jXOnV
+DdXifBBiqmvwPXbzP6PosMH976pXTayGpxi0KcEsDr9kvimM2AItzVwv8n/vFfQMFawKsPHTDU9q
+TXeXAaDxZre3zu/O7Oyldcqs4+Fj97ihBMi8ez9dLRYiVu1ISf6nL3kwJZu6ay0/nTvEF+cdLvvy
+z6b84xQslpghjLSR6Rlgg/IwKwZzUNWYOwbpx4oMYIwo+FKbbuH2TbsGJJvXKyY//SovcfXWJL5/
+MZ4PbeiPT02jP/816t9JXkGPhvnxd3lLG7SjXi/7RgLQZhNeXoVPzthwiHvOAbWWl9fNff2C+MIk
+wcoBOU+NosEUQB+cZtUMCUbW8tDRSHZWOkPLtgoRObqME2wGtZ7P6wIDAQABo0IwQDAdBgNVHQ4E
+FgQUUTMc7TZArxfTJc1paPKvTiM+s0EwDgYDVR0PAQH/BAQDAgGGMA8GA1UdEwEB/wQFMAMBAf8w
+DQYJKoZIhvcNAQEMBQADggIBAGCmr1tfV9qJ20tQqcQjNSH/0GEwhJG3PxDPJY7Jv0Y02cEhJhxw
+GXIeo8mH/qlDZJY6yFMECrZBu8RHANmfGBg7sg7zNOok992vIGCukihfNudd5N7HPNtQOa27PShN
+lnx2xlv0wdsUpasZYgcYQF+Xkdycx6u1UQ3maVNVzDl92sURVXLFO4uJ+DQtpBflF+aZfTCIITfN
+MBc9uPK8qHWgQ9w+iUuQrm0D4ByjoJYJu32jtyoQREtGBzRj7TG5BO6jm5qu5jF49OokYTurWGT/
+u4cnYiWB39yhL/btp/96j1EuMPikAdKFOV8BmZZvWltwGUb+hmA+rYAQCd05JS9Yf7vSdPD3Rh9G
+OUrYU9DzLjtxpdRv/PNn5AeP3SYZ4Y1b+qOTEZvpyDrDVWiakuFSdjjo4bq9+0/V77PnSIMx8IIh
+47a+p6tv75/fTM8BuGJqIz3nCU2AG3swpMPdB380vqQmsvZB6Akd4yCYqjdP//fx4ilwMUc/dNAU
+FvohigLVigmUdy7yWSiLfFCSCmZ4OIN1xLVaqBHG5cGdZlXPU8Sv13WFqUITVuwhd4GTWgzqltlJ
+yqEI8pc7bZsEGCREjnwB8twl2F6GmrE52/WRMmrRpnCKovfepEWFJqgejF0pW8hL2JpqA15w8oVP
+bEtoL8pU9ozaMv7Da4M/OMZ+
+-----END CERTIFICATE-----
+
+Certainly Root R1
+=================
+-----BEGIN CERTIFICATE-----
+MIIFRzCCAy+gAwIBAgIRAI4P+UuQcWhlM1T01EQ5t+AwDQYJKoZIhvcNAQELBQAwPTELMAkGA1UE
+BhMCVVMxEjAQBgNVBAoTCUNlcnRhaW5seTEaMBgGA1UEAxMRQ2VydGFpbmx5IFJvb3QgUjEwHhcN
+MjEwNDAxMDAwMDAwWhcNNDYwNDAxMDAwMDAwWjA9MQswCQYDVQQGEwJVUzESMBAGA1UEChMJQ2Vy
+dGFpbmx5MRowGAYDVQQDExFDZXJ0YWlubHkgUm9vdCBSMTCCAiIwDQYJKoZIhvcNAQEBBQADggIP
+ADCCAgoCggIBANA21B/q3avk0bbm+yLA3RMNansiExyXPGhjZjKcA7WNpIGD2ngwEc/csiu+kr+O
+5MQTvqRoTNoCaBZ0vrLdBORrKt03H2As2/X3oXyVtwxwhi7xOu9S98zTm/mLvg7fMbedaFySpvXl
+8wo0tf97ouSHocavFwDvA5HtqRxOcT3Si2yJ9HiG5mpJoM610rCrm/b01C7jcvk2xusVtyWMOvwl
+DbMicyF0yEqWYZL1LwsYpfSt4u5BvQF5+paMjRcCMLT5r3gajLQ2EBAHBXDQ9DGQilHFhiZ5shGI
+XsXwClTNSaa/ApzSRKft43jvRl5tcdF5cBxGX1HpyTfcX35pe0HfNEXgO4T0oYoKNp43zGJS4YkN
+KPl6I7ENPT2a/Z2B7yyQwHtETrtJ4A5KVpK8y7XdeReJkd5hiXSSqOMyhb5OhaRLWcsrxXiOcVTQ
+AjeZjOVJ6uBUcqQRBi8LjMFbvrWhsFNunLhgkR9Za/kt9JQKl7XsxXYDVBtlUrpMklZRNaBA2Cnb
+rlJ2Oy0wQJuK0EJWtLeIAaSHO1OWzaMWj/Nmqhexx2DgwUMFDO6bW2BvBlyHWyf5QBGenDPBt+U1
+VwV/J84XIIwc/PH72jEpSe31C4SnT8H2TsIonPru4K8H+zMReiFPCyEQtkA6qyI6BJyLm4SGcprS
+p6XEtHWRqSsjAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1Ud
+DgQWBBTgqj8ljZ9EXME66C6ud0yEPmcM9DANBgkqhkiG9w0BAQsFAAOCAgEAuVevuBLaV4OPaAsz
+HQNTVfSVcOQrPbA56/qJYv331hgELyE03fFo8NWWWt7CgKPBjcZq91l3rhVkz1t5BXdm6ozTaw3d
+8VkswTOlMIAVRQdFGjEitpIAq5lNOo93r6kiyi9jyhXWx8bwPWz8HA2YEGGeEaIi1wrykXprOQ4v
+MMM2SZ/g6Q8CRFA3lFV96p/2O7qUpUzpvD5RtOjKkjZUbVwlKNrdrRT90+7iIgXr0PK3aBLXWopB
+GsaSpVo7Y0VPv+E6dyIvXL9G+VoDhRNCX8reU9ditaY1BMJH/5n9hN9czulegChB8n3nHpDYT3Y+
+gjwN/KUD+nsa2UUeYNrEjvn8K8l7lcUq/6qJ34IxD3L/DCfXCh5WAFAeDJDBlrXYFIW7pw0WwfgH
+JBu6haEaBQmAupVjyTrsJZ9/nbqkRxWbRHDxakvWOF5D8xh+UG7pWijmZeZ3Gzr9Hb4DJqPb1OG7
+fpYnKx3upPvaJVQTA945xsMfTZDsjxtK0hzthZU4UHlG1sGQUDGpXJpuHfUzVounmdLyyCwzk5Iw
+x06MZTMQZBf9JBeW0Y3COmor6xOLRPIh80oat3df1+2IpHLlOR+Vnb5nwXARPbv0+Em34yaXOp/S
+X3z7wJl8OSngex2/DaeP0ik0biQVy96QXr8axGbqwua6OV+KmalBWQewLK8=
+-----END CERTIFICATE-----
+
+Certainly Root E1
+=================
+-----BEGIN CERTIFICATE-----
+MIIB9zCCAX2gAwIBAgIQBiUzsUcDMydc+Y2aub/M+DAKBggqhkjOPQQDAzA9MQswCQYDVQQGEwJV
+UzESMBAGA1UEChMJQ2VydGFpbmx5MRowGAYDVQQDExFDZXJ0YWlubHkgUm9vdCBFMTAeFw0yMTA0
+MDEwMDAwMDBaFw00NjA0MDEwMDAwMDBaMD0xCzAJBgNVBAYTAlVTMRIwEAYDVQQKEwlDZXJ0YWlu
+bHkxGjAYBgNVBAMTEUNlcnRhaW5seSBSb290IEUxMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAE3m/4
+fxzf7flHh4axpMCK+IKXgOqPyEpeKn2IaKcBYhSRJHpcnqMXfYqGITQYUBsQ3tA3SybHGWCA6TS9
+YBk2QNYphwk8kXr2vBMj3VlOBF7PyAIcGFPBMdjaIOlEjeR2o0IwQDAOBgNVHQ8BAf8EBAMCAQYw
+DwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU8ygYy2R17ikq6+2uI1g4hevIIgcwCgYIKoZIzj0E
+AwMDaAAwZQIxALGOWiDDshliTd6wT99u0nCK8Z9+aozmut6Dacpps6kFtZaSF4fC0urQe87YQVt8
+rgIwRt7qy12a7DLCZRawTDBcMPPaTnOGBtjOiQRINzf43TNRnXCve1XYAS59BWQOhriR
+-----END CERTIFICATE-----
+
+Security Communication ECC RootCA1
+==================================
+-----BEGIN CERTIFICATE-----
+MIICODCCAb6gAwIBAgIJANZdm7N4gS7rMAoGCCqGSM49BAMDMGExCzAJBgNVBAYTAkpQMSUwIwYD
+VQQKExxTRUNPTSBUcnVzdCBTeXN0ZW1zIENPLixMVEQuMSswKQYDVQQDEyJTZWN1cml0eSBDb21t
+dW5pY2F0aW9uIEVDQyBSb290Q0ExMB4XDTE2MDYxNjA1MTUyOFoXDTM4MDExODA1MTUyOFowYTEL
+MAkGA1UEBhMCSlAxJTAjBgNVBAoTHFNFQ09NIFRydXN0IFN5c3RlbXMgQ08uLExURC4xKzApBgNV
+BAMTIlNlY3VyaXR5IENvbW11bmljYXRpb24gRUNDIFJvb3RDQTEwdjAQBgcqhkjOPQIBBgUrgQQA
+IgNiAASkpW9gAwPDvTH00xecK4R1rOX9PVdu12O/5gSJko6BnOPpR27KkBLIE+CnnfdldB9sELLo
+5OnvbYUymUSxXv3MdhDYW72ixvnWQuRXdtyQwjWpS4g8EkdtXP9JTxpKULGjQjBAMB0GA1UdDgQW
+BBSGHOf+LaVKiwj+KBH6vqNm+GBZLzAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAK
+BggqhkjOPQQDAwNoADBlAjAVXUI9/Lbu9zuxNuie9sRGKEkz0FhDKmMpzE2xtHqiuQ04pV1IKv3L
+snNdo4gIxwwCMQDAqy0Obe0YottT6SXbVQjgUMzfRGEWgqtJsLKB7HOHeLRMsmIbEvoWTSVLY70e
+N9k=
+-----END CERTIFICATE-----
+
+BJCA Global Root CA1
+====================
+-----BEGIN CERTIFICATE-----
+MIIFdDCCA1ygAwIBAgIQVW9l47TZkGobCdFsPsBsIDANBgkqhkiG9w0BAQsFADBUMQswCQYDVQQG
+EwJDTjEmMCQGA1UECgwdQkVJSklORyBDRVJUSUZJQ0FURSBBVVRIT1JJVFkxHTAbBgNVBAMMFEJK
+Q0EgR2xvYmFsIFJvb3QgQ0ExMB4XDTE5MTIxOTAzMTYxN1oXDTQ0MTIxMjAzMTYxN1owVDELMAkG
+A1UEBhMCQ04xJjAkBgNVBAoMHUJFSUpJTkcgQ0VSVElGSUNBVEUgQVVUSE9SSVRZMR0wGwYDVQQD
+DBRCSkNBIEdsb2JhbCBSb290IENBMTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAPFm
+CL3ZxRVhy4QEQaVpN3cdwbB7+sN3SJATcmTRuHyQNZ0YeYjjlwE8R4HyDqKYDZ4/N+AZspDyRhyS
+sTphzvq3Rp4Dhtczbu33RYx2N95ulpH3134rhxfVizXuhJFyV9xgw8O558dnJCNPYwpj9mZ9S1Wn
+P3hkSWkSl+BMDdMJoDIwOvqfwPKcxRIqLhy1BDPapDgRat7GGPZHOiJBhyL8xIkoVNiMpTAK+BcW
+yqw3/XmnkRd4OJmtWO2y3syJfQOcs4ll5+M7sSKGjwZteAf9kRJ/sGsciQ35uMt0WwfCyPQ10WRj
+eulumijWML3mG90Vr4TqnMfK9Q7q8l0ph49pczm+LiRvRSGsxdRpJQaDrXpIhRMsDQa4bHlW/KNn
+MoH1V6XKV0Jp6VwkYe/iMBhORJhVb3rCk9gZtt58R4oRTklH2yiUAguUSiz5EtBP6DF+bHq/pj+b
+OT0CFqMYs2esWz8sgytnOYFcuX6U1WTdno9uruh8W7TXakdI136z1C2OVnZOz2nxbkRs1CTqjSSh
+GL+9V/6pmTW12xB3uD1IutbB5/EjPtffhZ0nPNRAvQoMvfXnjSXWgXSHRtQpdaJCbPdzied9v3pK
+H9MiyRVVz99vfFXQpIsHETdfg6YmV6YBW37+WGgHqel62bno/1Afq8K0wM7o6v0PvY1NuLxxAgMB
+AAGjQjBAMB0GA1UdDgQWBBTF7+3M2I0hxkjk49cULqcWk+WYATAPBgNVHRMBAf8EBTADAQH/MA4G
+A1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQsFAAOCAgEAUoKsITQfI/Ki2Pm4rzc2IInRNwPWaZ+4
+YRC6ojGYWUfo0Q0lHhVBDOAqVdVXUsv45Mdpox1NcQJeXyFFYEhcCY5JEMEE3KliawLwQ8hOnThJ
+dMkycFRtwUf8jrQ2ntScvd0g1lPJGKm1Vrl2i5VnZu69mP6u775u+2D2/VnGKhs/I0qUJDAnyIm8
+60Qkmss9vk/Ves6OF8tiwdneHg56/0OGNFK8YT88X7vZdrRTvJez/opMEi4r89fO4aL/3Xtw+zuh
+TaRjAv04l5U/BXCga99igUOLtFkNSoxUnMW7gZ/NfaXvCyUeOiDbHPwfmGcCCtRzRBPbUYQaVQNW
+4AB+dAb/OMRyHdOoP2gxXdMJxy6MW2Pg6Nwe0uxhHvLe5e/2mXZgLR6UcnHGCyoyx5JO1UbXHfmp
+GQrI+pXObSOYqgs4rZpWDW+N8TEAiMEXnM0ZNjX+VVOg4DwzX5Ze4jLp3zO7Bkqp2IRzznfSxqxx
+4VyjHQy7Ct9f4qNx2No3WqB4K/TUfet27fJhcKVlmtOJNBir+3I+17Q9eVzYH6Eze9mCUAyTF6ps
+3MKCuwJXNq+YJyo5UOGwifUll35HaBC07HPKs5fRJNz2YqAo07WjuGS3iGJCz51TzZm+ZGiPTx4S
+SPfSKcOYKMryMguTjClPPGAyzQWWYezyr/6zcCwupvI=
+-----END CERTIFICATE-----
+
+BJCA Global Root CA2
+====================
+-----BEGIN CERTIFICATE-----
+MIICJTCCAaugAwIBAgIQLBcIfWQqwP6FGFkGz7RK6zAKBggqhkjOPQQDAzBUMQswCQYDVQQGEwJD
+TjEmMCQGA1UECgwdQkVJSklORyBDRVJUSUZJQ0FURSBBVVRIT1JJVFkxHTAbBgNVBAMMFEJKQ0Eg
+R2xvYmFsIFJvb3QgQ0EyMB4XDTE5MTIxOTAzMTgyMVoXDTQ0MTIxMjAzMTgyMVowVDELMAkGA1UE
+BhMCQ04xJjAkBgNVBAoMHUJFSUpJTkcgQ0VSVElGSUNBVEUgQVVUSE9SSVRZMR0wGwYDVQQDDBRC
+SkNBIEdsb2JhbCBSb290IENBMjB2MBAGByqGSM49AgEGBSuBBAAiA2IABJ3LgJGNU2e1uVCxA/jl
+SR9BIgmwUVJY1is0j8USRhTFiy8shP8sbqjV8QnjAyEUxEM9fMEsxEtqSs3ph+B99iK++kpRuDCK
+/eHeGBIK9ke35xe/J4rUQUyWPGCWwf0VHKNCMEAwHQYDVR0OBBYEFNJKsVF/BvDRgh9Obl+rg/xI
+1LCRMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMAoGCCqGSM49BAMDA2gAMGUCMBq8
+W9f+qdJUDkpd0m2xQNz0Q9XSSpkZElaA94M04TVOSG0ED1cxMDAtsaqdAzjbBgIxAMvMh1PLet8g
+UXOQwKhbYdDFUDn9hf7B43j4ptZLvZuHjw/l1lOWqzzIQNph91Oj9w==
+-----END CERTIFICATE-----
+
+Sectigo Public Server Authentication Root E46
+=============================================
+-----BEGIN CERTIFICATE-----
+MIICOjCCAcGgAwIBAgIQQvLM2htpN0RfFf51KBC49DAKBggqhkjOPQQDAzBfMQswCQYDVQQGEwJH
+QjEYMBYGA1UEChMPU2VjdGlnbyBMaW1pdGVkMTYwNAYDVQQDEy1TZWN0aWdvIFB1YmxpYyBTZXJ2
+ZXIgQXV0aGVudGljYXRpb24gUm9vdCBFNDYwHhcNMjEwMzIyMDAwMDAwWhcNNDYwMzIxMjM1OTU5
+WjBfMQswCQYDVQQGEwJHQjEYMBYGA1UEChMPU2VjdGlnbyBMaW1pdGVkMTYwNAYDVQQDEy1TZWN0
+aWdvIFB1YmxpYyBTZXJ2ZXIgQXV0aGVudGljYXRpb24gUm9vdCBFNDYwdjAQBgcqhkjOPQIBBgUr
+gQQAIgNiAAR2+pmpbiDt+dd34wc7qNs9Xzjoq1WmVk/WSOrsfy2qw7LFeeyZYX8QeccCWvkEN/U0
+NSt3zn8gj1KjAIns1aeibVvjS5KToID1AZTc8GgHHs3u/iVStSBDHBv+6xnOQ6OjQjBAMB0GA1Ud
+DgQWBBTRItpMWfFLXyY4qp3W7usNw/upYTAOBgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB
+/zAKBggqhkjOPQQDAwNnADBkAjAn7qRaqCG76UeXlImldCBteU/IvZNeWBj7LRoAasm4PdCkT0RH
+lAFWovgzJQxC36oCMB3q4S6ILuH5px0CMk7yn2xVdOOurvulGu7t0vzCAxHrRVxgED1cf5kDW21U
+SAGKcw==
+-----END CERTIFICATE-----
+
+Sectigo Public Server Authentication Root R46
+=============================================
+-----BEGIN CERTIFICATE-----
+MIIFijCCA3KgAwIBAgIQdY39i658BwD6qSWn4cetFDANBgkqhkiG9w0BAQwFADBfMQswCQYDVQQG
+EwJHQjEYMBYGA1UEChMPU2VjdGlnbyBMaW1pdGVkMTYwNAYDVQQDEy1TZWN0aWdvIFB1YmxpYyBT
+ZXJ2ZXIgQXV0aGVudGljYXRpb24gUm9vdCBSNDYwHhcNMjEwMzIyMDAwMDAwWhcNNDYwMzIxMjM1
+OTU5WjBfMQswCQYDVQQGEwJHQjEYMBYGA1UEChMPU2VjdGlnbyBMaW1pdGVkMTYwNAYDVQQDEy1T
+ZWN0aWdvIFB1YmxpYyBTZXJ2ZXIgQXV0aGVudGljYXRpb24gUm9vdCBSNDYwggIiMA0GCSqGSIb3
+DQEBAQUAA4ICDwAwggIKAoICAQCTvtU2UnXYASOgHEdCSe5jtrch/cSV1UgrJnwUUxDaef0rty2k
+1Cz66jLdScK5vQ9IPXtamFSvnl0xdE8H/FAh3aTPaE8bEmNtJZlMKpnzSDBh+oF8HqcIStw+Kxwf
+GExxqjWMrfhu6DtK2eWUAtaJhBOqbchPM8xQljeSM9xfiOefVNlI8JhD1mb9nxc4Q8UBUQvX4yMP
+FF1bFOdLvt30yNoDN9HWOaEhUTCDsG3XME6WW5HwcCSrv0WBZEMNvSE6Lzzpng3LILVCJ8zab5vu
+ZDCQOc2TZYEhMbUjUDM3IuM47fgxMMxF/mL50V0yeUKH32rMVhlATc6qu/m1dkmU8Sf4kaWD5Qaz
+Yw6A3OASVYCmO2a0OYctyPDQ0RTp5A1NDvZdV3LFOxxHVp3i1fuBYYzMTYCQNFu31xR13NgESJ/A
+wSiItOkcyqex8Va3e0lMWeUgFaiEAin6OJRpmkkGj80feRQXEgyDet4fsZfu+Zd4KKTIRJLpfSYF
+plhym3kT2BFfrsU4YjRosoYwjviQYZ4ybPUHNs2iTG7sijbt8uaZFURww3y8nDnAtOFr94MlI1fZ
+EoDlSfB1D++N6xybVCi0ITz8fAr/73trdf+LHaAZBav6+CuBQug4urv7qv094PPK306Xlynt8xhW
+6aWWrL3DkJiy4Pmi1KZHQ3xtzwIDAQABo0IwQDAdBgNVHQ4EFgQUVnNYZJX5khqwEioEYnmhQBWI
+IUkwDgYDVR0PAQH/BAQDAgGGMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEMBQADggIBAC9c
+mTz8Bl6MlC5w6tIyMY208FHVvArzZJ8HXtXBc2hkeqK5Duj5XYUtqDdFqij0lgVQYKlJfp/imTYp
+E0RHap1VIDzYm/EDMrraQKFz6oOht0SmDpkBm+S8f74TlH7Kph52gDY9hAaLMyZlbcp+nv4fjFg4
+exqDsQ+8FxG75gbMY/qB8oFM2gsQa6H61SilzwZAFv97fRheORKkU55+MkIQpiGRqRxOF3yEvJ+M
+0ejf5lG5Nkc/kLnHvALcWxxPDkjBJYOcCj+esQMzEhonrPcibCTRAUH4WAP+JWgiH5paPHxsnnVI
+84HxZmduTILA7rpXDhjvLpr3Etiga+kFpaHpaPi8TD8SHkXoUsCjvxInebnMMTzD9joiFgOgyY9m
+pFuiTdaBJQbpdqQACj7LzTWb4OE4y2BThihCQRxEV+ioratF4yUQvNs+ZUH7G6aXD+u5dHn5Hrwd
+Vw1Hr8Mvn4dGp+smWg9WY7ViYG4A++MnESLn/pmPNPW56MORcr3Ywx65LvKRRFHQV80MNNVIIb/b
+E/FmJUNS0nAiNs2fxBx1IK1jcmMGDw4nztJqDby1ORrp0XZ60Vzk50lJLVU3aPAaOpg+VBeHVOmm
+J1CJeyAvP/+/oYtKR5j/K3tJPsMpRmAYQqszKbrAKbkTidOIijlBO8n9pu0f9GBj39ItVQGL
+-----END CERTIFICATE-----
+
+SSL.com TLS RSA Root CA 2022
+============================
+-----BEGIN CERTIFICATE-----
+MIIFiTCCA3GgAwIBAgIQb77arXO9CEDii02+1PdbkTANBgkqhkiG9w0BAQsFADBOMQswCQYDVQQG
+EwJVUzEYMBYGA1UECgwPU1NMIENvcnBvcmF0aW9uMSUwIwYDVQQDDBxTU0wuY29tIFRMUyBSU0Eg
+Um9vdCBDQSAyMDIyMB4XDTIyMDgyNTE2MzQyMloXDTQ2MDgxOTE2MzQyMVowTjELMAkGA1UEBhMC
+VVMxGDAWBgNVBAoMD1NTTCBDb3Jwb3JhdGlvbjElMCMGA1UEAwwcU1NMLmNvbSBUTFMgUlNBIFJv
+b3QgQ0EgMjAyMjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANCkCXJPQIgSYT41I57u
+9nTPL3tYPc48DRAokC+X94xI2KDYJbFMsBFMF3NQ0CJKY7uB0ylu1bUJPiYYf7ISf5OYt6/wNr/y
+7hienDtSxUcZXXTzZGbVXcdotL8bHAajvI9AI7YexoS9UcQbOcGV0insS657Lb85/bRi3pZ7Qcac
+oOAGcvvwB5cJOYF0r/c0WRFXCsJbwST0MXMwgsadugL3PnxEX4MN8/HdIGkWCVDi1FW24IBydm5M
+R7d1VVm0U3TZlMZBrViKMWYPHqIbKUBOL9975hYsLfy/7PO0+r4Y9ptJ1O4Fbtk085zx7AGL0SDG
+D6C1vBdOSHtRwvzpXGk3R2azaPgVKPC506QVzFpPulJwoxJF3ca6TvvC0PeoUidtbnm1jPx7jMEW
+TO6Af77wdr5BUxIzrlo4QqvXDz5BjXYHMtWrifZOZ9mxQnUjbvPNQrL8VfVThxc7wDNY8VLS+YCk
+8OjwO4s4zKTGkH8PnP2L0aPP2oOnaclQNtVcBdIKQXTbYxE3waWglksejBYSd66UNHsef8JmAOSq
+g+qKkK3ONkRN0VHpvB/zagX9wHQfJRlAUW7qglFA35u5CCoGAtUjHBPW6dvbxrB6y3snm/vg1UYk
+7RBLY0ulBY+6uB0rpvqR4pJSvezrZ5dtmi2fgTIFZzL7SAg/2SW4BCUvAgMBAAGjYzBhMA8GA1Ud
+EwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAU+y437uOEeicuzRk1sTN8/9REQrkwHQYDVR0OBBYEFPsu
+N+7jhHonLs0ZNbEzfP/UREK5MA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAgEAjYlt
+hEUY8U+zoO9opMAdrDC8Z2awms22qyIZZtM7QbUQnRC6cm4pJCAcAZli05bg4vsMQtfhWsSWTVTN
+j8pDU/0quOr4ZcoBwq1gaAafORpR2eCNJvkLTqVTJXojpBzOCBvfR4iyrT7gJ4eLSYwfqUdYe5by
+iB0YrrPRpgqU+tvT5TgKa3kSM/tKWTcWQA673vWJDPFs0/dRa1419dvAJuoSc06pkZCmF8NsLzjU
+o3KUQyxi4U5cMj29TH0ZR6LDSeeWP4+a0zvkEdiLA9z2tmBVGKaBUfPhqBVq6+AL8BQx1rmMRTqo
+ENjwuSfr98t67wVylrXEj5ZzxOhWc5y8aVFjvO9nHEMaX3cZHxj4HCUp+UmZKbaSPaKDN7Egkaib
+MOlqbLQjk2UEqxHzDh1TJElTHaE/nUiSEeJ9DU/1172iWD54nR4fK/4huxoTtrEoZP2wAgDHbICi
+vRZQIA9ygV/MlP+7mea6kMvq+cYMwq7FGc4zoWtcu358NFcXrfA/rs3qr5nsLFR+jM4uElZI7xc7
+P0peYNLcdDa8pUNjyw9bowJWCZ4kLOGGgYz+qxcs+sjiMho6/4UIyYOf8kpIEFR3N+2ivEC+5BB0
+9+Rbu7nzifmPQdjH5FCQNYA+HLhNkNPU98OwoX6EyneSMSy4kLGCenROmxMmtNVQZlR4rmA=
+-----END CERTIFICATE-----
+
+SSL.com TLS ECC Root CA 2022
+============================
+-----BEGIN CERTIFICATE-----
+MIICOjCCAcCgAwIBAgIQFAP1q/s3ixdAW+JDsqXRxDAKBggqhkjOPQQDAzBOMQswCQYDVQQGEwJV
+UzEYMBYGA1UECgwPU1NMIENvcnBvcmF0aW9uMSUwIwYDVQQDDBxTU0wuY29tIFRMUyBFQ0MgUm9v
+dCBDQSAyMDIyMB4XDTIyMDgyNTE2MzM0OFoXDTQ2MDgxOTE2MzM0N1owTjELMAkGA1UEBhMCVVMx
+GDAWBgNVBAoMD1NTTCBDb3Jwb3JhdGlvbjElMCMGA1UEAwwcU1NMLmNvbSBUTFMgRUNDIFJvb3Qg
+Q0EgMjAyMjB2MBAGByqGSM49AgEGBSuBBAAiA2IABEUpNXP6wrgjzhR9qLFNoFs27iosU8NgCTWy
+JGYmacCzldZdkkAZDsalE3D07xJRKF3nzL35PIXBz5SQySvOkkJYWWf9lCcQZIxPBLFNSeR7T5v1
+5wj4A4j3p8OSSxlUgaNjMGEwDwYDVR0TAQH/BAUwAwEB/zAfBgNVHSMEGDAWgBSJjy+j6CugFFR7
+81a4Jl9nOAuc0DAdBgNVHQ4EFgQUiY8vo+groBRUe/NWuCZfZzgLnNAwDgYDVR0PAQH/BAQDAgGG
+MAoGCCqGSM49BAMDA2gAMGUCMFXjIlbp15IkWE8elDIPDAI2wv2sdDJO4fscgIijzPvX6yv/N33w
+7deedWo1dlJF4AIxAMeNb0Igj762TVntd00pxCAgRWSGOlDGxK0tk/UYfXLtqc/ErFc2KAhl3zx5
+Zn6g6g==
+-----END CERTIFICATE-----
+
+Atos TrustedRoot Root CA ECC TLS 2021
+=====================================
+-----BEGIN CERTIFICATE-----
+MIICFTCCAZugAwIBAgIQPZg7pmY9kGP3fiZXOATvADAKBggqhkjOPQQDAzBMMS4wLAYDVQQDDCVB
+dG9zIFRydXN0ZWRSb290IFJvb3QgQ0EgRUNDIFRMUyAyMDIxMQ0wCwYDVQQKDARBdG9zMQswCQYD
+VQQGEwJERTAeFw0yMTA0MjIwOTI2MjNaFw00MTA0MTcwOTI2MjJaMEwxLjAsBgNVBAMMJUF0b3Mg
+VHJ1c3RlZFJvb3QgUm9vdCBDQSBFQ0MgVExTIDIwMjExDTALBgNVBAoMBEF0b3MxCzAJBgNVBAYT
+AkRFMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEloZYKDcKZ9Cg3iQZGeHkBQcfl+3oZIK59sRxUM6K
+DP/XtXa7oWyTbIOiaG6l2b4siJVBzV3dscqDY4PMwL502eCdpO5KTlbgmClBk1IQ1SQ4AjJn8ZQS
+b+/Xxd4u/RmAo0IwQDAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBR2KCXWfeBmmnoJsmo7jjPX
+NtNPojAOBgNVHQ8BAf8EBAMCAYYwCgYIKoZIzj0EAwMDaAAwZQIwW5kp85wxtolrbNa9d+F851F+
+uDrNozZffPc8dz7kUK2o59JZDCaOMDtuCCrCp1rIAjEAmeMM56PDr9NJLkaCI2ZdyQAUEv049OGY
+a3cpetskz2VAv9LcjBHo9H1/IISpQuQo
+-----END CERTIFICATE-----
+
+Atos TrustedRoot Root CA RSA TLS 2021
+=====================================
+-----BEGIN CERTIFICATE-----
+MIIFZDCCA0ygAwIBAgIQU9XP5hmTC/srBRLYwiqipDANBgkqhkiG9w0BAQwFADBMMS4wLAYDVQQD
+DCVBdG9zIFRydXN0ZWRSb290IFJvb3QgQ0EgUlNBIFRMUyAyMDIxMQ0wCwYDVQQKDARBdG9zMQsw
+CQYDVQQGEwJERTAeFw0yMTA0MjIwOTIxMTBaFw00MTA0MTcwOTIxMDlaMEwxLjAsBgNVBAMMJUF0
+b3MgVHJ1c3RlZFJvb3QgUm9vdCBDQSBSU0EgVExTIDIwMjExDTALBgNVBAoMBEF0b3MxCzAJBgNV
+BAYTAkRFMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAtoAOxHm9BYx9sKOdTSJNy/BB
+l01Z4NH+VoyX8te9j2y3I49f1cTYQcvyAh5x5en2XssIKl4w8i1mx4QbZFc4nXUtVsYvYe+W/CBG
+vevUez8/fEc4BKkbqlLfEzfTFRVOvV98r61jx3ncCHvVoOX3W3WsgFWZkmGbzSoXfduP9LVq6hdK
+ZChmFSlsAvFr1bqjM9xaZ6cF4r9lthawEO3NUDPJcFDsGY6wx/J0W2tExn2WuZgIWWbeKQGb9Cpt
+0xU6kGpn8bRrZtkh68rZYnxGEFzedUlnnkL5/nWpo63/dgpnQOPF943HhZpZnmKaau1Fh5hnstVK
+PNe0OwANwI8f4UDErmwh3El+fsqyjW22v5MvoVw+j8rtgI5Y4dtXz4U2OLJxpAmMkokIiEjxQGMY
+sluMWuPD0xeqqxmjLBvk1cbiZnrXghmmOxYsL3GHX0WelXOTwkKBIROW1527k2gV+p2kHYzygeBY
+Br3JtuP2iV2J+axEoctr+hbxx1A9JNr3w+SH1VbxT5Aw+kUJWdo0zuATHAR8ANSbhqRAvNncTFd+
+rrcztl524WWLZt+NyteYr842mIycg5kDcPOvdO3GDjbnvezBc6eUWsuSZIKmAMFwoW4sKeFYV+xa
+fJlrJaSQOoD0IJ2azsct+bJLKZWD6TWNp0lIpw9MGZHQ9b8Q4HECAwEAAaNCMEAwDwYDVR0TAQH/
+BAUwAwEB/zAdBgNVHQ4EFgQUdEmZ0f+0emhFdcN+tNzMzjkz2ggwDgYDVR0PAQH/BAQDAgGGMA0G
+CSqGSIb3DQEBDAUAA4ICAQAjQ1MkYlxt/T7Cz1UAbMVWiLkO3TriJQ2VSpfKgInuKs1l+NsW4AmS
+4BjHeJi78+xCUvuppILXTdiK/ORO/auQxDh1MoSf/7OwKwIzNsAQkG8dnK/haZPso0UvFJ/1TCpl
+Q3IM98P4lYsU84UgYt1UU90s3BiVaU+DR3BAM1h3Egyi61IxHkzJqM7F78PRreBrAwA0JrRUITWX
+AdxfG/F851X6LWh3e9NpzNMOa7pNdkTWwhWaJuywxfW70Xp0wmzNxbVe9kzmWy2B27O3Opee7c9G
+slA9hGCZcbUztVdF5kJHdWoOsAgMrr3e97sPWD2PAzHoPYJQyi9eDF20l74gNAf0xBLh7tew2Vkt
+afcxBPTy+av5EzH4AXcOPUIjJsyacmdRIXrMPIWo6iFqO9taPKU0nprALN+AnCng33eU0aKAQv9q
+TFsR0PXNor6uzFFcw9VUewyu1rkGd4Di7wcaaMxZUa1+XGdrudviB0JbuAEFWDlN5LuYo7Ey7Nmj
+1m+UI/87tyll5gfp77YZ6ufCOB0yiJA8EytuzO+rdwY0d4RPcuSBhPm5dDTedk+SKlOxJTnbPP/l
+PqYO5Wue/9vsL3SD3460s6neFE3/MaNFcyT6lSnMEpcEoji2jbDwN/zIIX8/syQbPYtuzE2wFg2W
+HYMfRsCbvUOZ58SWLs5fyQ==
+-----END CERTIFICATE-----
+
+TrustAsia Global Root CA G3
+===========================
+-----BEGIN CERTIFICATE-----
+MIIFpTCCA42gAwIBAgIUZPYOZXdhaqs7tOqFhLuxibhxkw8wDQYJKoZIhvcNAQEMBQAwWjELMAkG
+A1UEBhMCQ04xJTAjBgNVBAoMHFRydXN0QXNpYSBUZWNobm9sb2dpZXMsIEluYy4xJDAiBgNVBAMM
+G1RydXN0QXNpYSBHbG9iYWwgUm9vdCBDQSBHMzAeFw0yMTA1MjAwMjEwMTlaFw00NjA1MTkwMjEw
+MTlaMFoxCzAJBgNVBAYTAkNOMSUwIwYDVQQKDBxUcnVzdEFzaWEgVGVjaG5vbG9naWVzLCBJbmMu
+MSQwIgYDVQQDDBtUcnVzdEFzaWEgR2xvYmFsIFJvb3QgQ0EgRzMwggIiMA0GCSqGSIb3DQEBAQUA
+A4ICDwAwggIKAoICAQDAMYJhkuSUGwoqZdC+BqmHO1ES6nBBruL7dOoKjbmzTNyPtxNST1QY4Sxz
+lZHFZjtqz6xjbYdT8PfxObegQ2OwxANdV6nnRM7EoYNl9lA+sX4WuDqKAtCWHwDNBSHvBm3dIZwZ
+Q0WhxeiAysKtQGIXBsaqvPPW5vxQfmZCHzyLpnl5hkA1nyDvP+uLRx+PjsXUjrYsyUQE49RDdT/V
+P68czH5GX6zfZBCK70bwkPAPLfSIC7Epqq+FqklYqL9joDiR5rPmd2jE+SoZhLsO4fWvieylL1Ag
+dB4SQXMeJNnKziyhWTXAyB1GJ2Faj/lN03J5Zh6fFZAhLf3ti1ZwA0pJPn9pMRJpxx5cynoTi+jm
+9WAPzJMshH/x/Gr8m0ed262IPfN2dTPXS6TIi/n1Q1hPy8gDVI+lhXgEGvNz8teHHUGf59gXzhqc
+D0r83ERoVGjiQTz+LISGNzzNPy+i2+f3VANfWdP3kXjHi3dqFuVJhZBFcnAvkV34PmVACxmZySYg
+WmjBNb9Pp1Hx2BErW+Canig7CjoKH8GB5S7wprlppYiU5msTf9FkPz2ccEblooV7WIQn3MSAPmea
+mseaMQ4w7OYXQJXZRe0Blqq/DPNL0WP3E1jAuPP6Z92bfW1K/zJMtSU7/xxnD4UiWQWRkUF3gdCF
+TIcQcf+eQxuulXUtgQIDAQABo2MwYTAPBgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFEDk5PIj
+7zjKsK5Xf/IhMBY027ySMB0GA1UdDgQWBBRA5OTyI+84yrCuV3/yITAWNNu8kjAOBgNVHQ8BAf8E
+BAMCAQYwDQYJKoZIhvcNAQEMBQADggIBACY7UeFNOPMyGLS0XuFlXsSUT9SnYaP4wM8zAQLpw6o1
+D/GUE3d3NZ4tVlFEbuHGLige/9rsR82XRBf34EzC4Xx8MnpmyFq2XFNFV1pF1AWZLy4jVe5jaN/T
+G3inEpQGAHUNcoTpLrxaatXeL1nHo+zSh2bbt1S1JKv0Q3jbSwTEb93mPmY+KfJLaHEih6D4sTNj
+duMNhXJEIlU/HHzp/LgV6FL6qj6jITk1dImmasI5+njPtqzn59ZW/yOSLlALqbUHM/Q4X6RJpstl
+cHboCoWASzY9M/eVVHUl2qzEc4Jl6VL1XP04lQJqaTDFHApXB64ipCz5xUG3uOyfT0gA+QEEVcys
++TIxxHWVBqB/0Y0n3bOppHKH/lmLmnp0Ft0WpWIp6zqW3IunaFnT63eROfjXy9mPX1onAX1daBli
+2MjN9LdyR75bl87yraKZk62Uy5P2EgmVtqvXO9A/EcswFi55gORngS1d7XB4tmBZrOFdRWOPyN9y
+aFvqHbgB8X7754qz41SgOAngPN5C8sLtLpvzHzW2NtjjgKGLzZlkD8Kqq7HK9W+eQ42EVJmzbsAS
+ZthwEPEGNTNDqJwuuhQxzhB/HIbjj9LV+Hfsm6vxL2PZQl/gZ4FkkfGXL/xuJvYz+NO1+MRiqzFR
+JQJ6+N1rZdVtTTDIZbpoFGWsJwt0ivKH
+-----END CERTIFICATE-----
+
+TrustAsia Global Root CA G4
+===========================
+-----BEGIN CERTIFICATE-----
+MIICVTCCAdygAwIBAgIUTyNkuI6XY57GU4HBdk7LKnQV1tcwCgYIKoZIzj0EAwMwWjELMAkGA1UE
+BhMCQ04xJTAjBgNVBAoMHFRydXN0QXNpYSBUZWNobm9sb2dpZXMsIEluYy4xJDAiBgNVBAMMG1Ry
+dXN0QXNpYSBHbG9iYWwgUm9vdCBDQSBHNDAeFw0yMTA1MjAwMjEwMjJaFw00NjA1MTkwMjEwMjJa
+MFoxCzAJBgNVBAYTAkNOMSUwIwYDVQQKDBxUcnVzdEFzaWEgVGVjaG5vbG9naWVzLCBJbmMuMSQw
+IgYDVQQDDBtUcnVzdEFzaWEgR2xvYmFsIFJvb3QgQ0EgRzQwdjAQBgcqhkjOPQIBBgUrgQQAIgNi
+AATxs8045CVD5d4ZCbuBeaIVXxVjAd7Cq92zphtnS4CDr5nLrBfbK5bKfFJV4hrhPVbwLxYI+hW8
+m7tH5j/uqOFMjPXTNvk4XatwmkcN4oFBButJ+bAp3TPsUKV/eSm4IJijYzBhMA8GA1UdEwEB/wQF
+MAMBAf8wHwYDVR0jBBgwFoAUpbtKl86zK3+kMd6Xg1mDpm9xy94wHQYDVR0OBBYEFKW7SpfOsyt/
+pDHel4NZg6ZvccveMA4GA1UdDwEB/wQEAwIBBjAKBggqhkjOPQQDAwNnADBkAjBe8usGzEkxn0AA
+bbd+NvBNEU/zy4k6LHiRUKNbwMp1JvK/kF0LgoxgKJ/GcJpo5PECMFxYDlZ2z1jD1xCMuo6u47xk
+dUfFVZDj/bpV6wfEU6s3qe4hsiFbYI89MvHVI5TWWA==
+-----END CERTIFICATE-----
+
+Telekom Security TLS ECC Root 2020
+==================================
+-----BEGIN CERTIFICATE-----
+MIICQjCCAcmgAwIBAgIQNjqWjMlcsljN0AFdxeVXADAKBggqhkjOPQQDAzBjMQswCQYDVQQGEwJE
+RTEnMCUGA1UECgweRGV1dHNjaGUgVGVsZWtvbSBTZWN1cml0eSBHbWJIMSswKQYDVQQDDCJUZWxl
+a29tIFNlY3VyaXR5IFRMUyBFQ0MgUm9vdCAyMDIwMB4XDTIwMDgyNTA3NDgyMFoXDTQ1MDgyNTIz
+NTk1OVowYzELMAkGA1UEBhMCREUxJzAlBgNVBAoMHkRldXRzY2hlIFRlbGVrb20gU2VjdXJpdHkg
+R21iSDErMCkGA1UEAwwiVGVsZWtvbSBTZWN1cml0eSBUTFMgRUNDIFJvb3QgMjAyMDB2MBAGByqG
+SM49AgEGBSuBBAAiA2IABM6//leov9Wq9xCazbzREaK9Z0LMkOsVGJDZos0MKiXrPk/OtdKPD/M1
+2kOLAoC+b1EkHQ9rK8qfwm9QMuU3ILYg/4gND21Ju9sGpIeQkpT0CdDPf8iAC8GXs7s1J8nCG6NC
+MEAwHQYDVR0OBBYEFONyzG6VmUex5rNhTNHLq+O6zd6fMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0P
+AQH/BAQDAgEGMAoGCCqGSM49BAMDA2cAMGQCMHVSi7ekEE+uShCLsoRbQuHmKjYC2qBuGT8lv9pZ
+Mo7k+5Dck2TOrbRBR2Diz6fLHgIwN0GMZt9Ba9aDAEH9L1r3ULRn0SyocddDypwnJJGDSA3PzfdU
+ga/sf+Rn27iQ7t0l
+-----END CERTIFICATE-----
+
+Telekom Security TLS RSA Root 2023
+==================================
+-----BEGIN CERTIFICATE-----
+MIIFszCCA5ugAwIBAgIQIZxULej27HF3+k7ow3BXlzANBgkqhkiG9w0BAQwFADBjMQswCQYDVQQG
+EwJERTEnMCUGA1UECgweRGV1dHNjaGUgVGVsZWtvbSBTZWN1cml0eSBHbWJIMSswKQYDVQQDDCJU
+ZWxla29tIFNlY3VyaXR5IFRMUyBSU0EgUm9vdCAyMDIzMB4XDTIzMDMyODEyMTY0NVoXDTQ4MDMy
+NzIzNTk1OVowYzELMAkGA1UEBhMCREUxJzAlBgNVBAoMHkRldXRzY2hlIFRlbGVrb20gU2VjdXJp
+dHkgR21iSDErMCkGA1UEAwwiVGVsZWtvbSBTZWN1cml0eSBUTFMgUlNBIFJvb3QgMjAyMzCCAiIw
+DQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAO01oYGA88tKaVvC+1GDrib94W7zgRJ9cUD/h3VC
+KSHtgVIs3xLBGYSJwb3FKNXVS2xE1kzbB5ZKVXrKNoIENqil/Cf2SfHVcp6R+SPWcHu79ZvB7JPP
+GeplfohwoHP89v+1VmLhc2o0mD6CuKyVU/QBoCcHcqMAU6DksquDOFczJZSfvkgdmOGjup5czQRx
+UX11eKvzWarE4GC+j4NSuHUaQTXtvPM6Y+mpFEXX5lLRbtLevOP1Czvm4MS9Q2QTps70mDdsipWo
+l8hHD/BeEIvnHRz+sTugBTNoBUGCwQMrAcjnj02r6LX2zWtEtefdi+zqJbQAIldNsLGyMcEWzv/9
+FIS3R/qy8XDe24tsNlikfLMR0cN3f1+2JeANxdKz+bi4d9s3cXFH42AYTyS2dTd4uaNir73Jco4v
+zLuu2+QVUhkHM/tqty1LkCiCc/4YizWN26cEar7qwU02OxY2kTLvtkCJkUPg8qKrBC7m8kwOFjQg
+rIfBLX7JZkcXFBGk8/ehJImr2BrIoVyxo/eMbcgByU/J7MT8rFEz0ciD0cmfHdRHNCk+y7AO+oML
+KFjlKdw/fKifybYKu6boRhYPluV75Gp6SG12mAWl3G0eQh5C2hrgUve1g8Aae3g1LDj1H/1Joy7S
+WWO/gLCMk3PLNaaZlSJhZQNg+y+TS/qanIA7AgMBAAGjYzBhMA4GA1UdDwEB/wQEAwIBBjAdBgNV
+HQ4EFgQUtqeXgj10hZv3PJ+TmpV5dVKMbUcwDwYDVR0TAQH/BAUwAwEB/zAfBgNVHSMEGDAWgBS2
+p5eCPXSFm/c8n5OalXl1UoxtRzANBgkqhkiG9w0BAQwFAAOCAgEAqMxhpr51nhVQpGv7qHBFfLp+
+sVr8WyP6Cnf4mHGCDG3gXkaqk/QeoMPhk9tLrbKmXauw1GLLXrtm9S3ul0A8Yute1hTWjOKWi0Fp
+kzXmuZlrYrShF2Y0pmtjxrlO8iLpWA1WQdH6DErwM807u20hOq6OcrXDSvvpfeWxm4bu4uB9tPcy
+/SKE8YXJN3nptT+/XOR0so8RYgDdGGah2XsjX/GO1WfoVNpbOms2b/mBsTNHM3dA+VKq3dSDz4V4
+mZqTuXNnQkYRIer+CqkbGmVps4+uFrb2S1ayLfmlyOw7YqPta9BO1UAJpB+Y1zqlklkg5LB9zVtz
+aL1txKITDmcZuI1CfmwMmm6gJC3VRRvcxAIU/oVbZZfKTpBQCHpCNfnqwmbU+AGuHrS+w6jv/naa
+oqYfRvaE7fzbzsQCzndILIyy7MMAo+wsVRjBfhnu4S/yrYObnqsZ38aKL4x35bcF7DvB7L6Gs4a8
+wPfc5+pbrrLMtTWGS9DiP7bY+A4A7l3j941Y/8+LN+ljX273CXE2whJdV/LItM3z7gLfEdxquVeE
+HVlNjM7IDiPCtyaaEBRx/pOyiriA8A4QntOoUAw3gi/q4Iqd4Sw5/7W0cwDk90imc6y/st53BIe0
+o82bNSQ3+pCTE4FCxpgmdTdmQRCsu/WU48IxK63nI1bMNSWSs1A=
+-----END CERTIFICATE-----
+
+TWCA CYBER Root CA
+==================
+-----BEGIN CERTIFICATE-----
+MIIFjTCCA3WgAwIBAgIQQAE0jMIAAAAAAAAAATzyxjANBgkqhkiG9w0BAQwFADBQMQswCQYDVQQG
+EwJUVzESMBAGA1UEChMJVEFJV0FOLUNBMRAwDgYDVQQLEwdSb290IENBMRswGQYDVQQDExJUV0NB
+IENZQkVSIFJvb3QgQ0EwHhcNMjIxMTIyMDY1NDI5WhcNNDcxMTIyMTU1OTU5WjBQMQswCQYDVQQG
+EwJUVzESMBAGA1UEChMJVEFJV0FOLUNBMRAwDgYDVQQLEwdSb290IENBMRswGQYDVQQDExJUV0NB
+IENZQkVSIFJvb3QgQ0EwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDG+Moe2Qkgfh1s
+Ts6P40czRJzHyWmqOlt47nDSkvgEs1JSHWdyKKHfi12VCv7qze33Kc7wb3+szT3vsxxFavcokPFh
+V8UMxKNQXd7UtcsZyoC5dc4pztKFIuwCY8xEMCDa6pFbVuYdHNWdZsc/34bKS1PE2Y2yHer43CdT
+o0fhYcx9tbD47nORxc5zb87uEB8aBs/pJ2DFTxnk684iJkXXYJndzk834H/nY62wuFm40AZoNWDT
+Nq5xQwTxaWV4fPMf88oon1oglWa0zbfuj3ikRRjpJi+NmykosaS3Om251Bw4ckVYsV7r8Cibt4LK
+/c/WMw+f+5eesRycnupfXtuq3VTpMCEobY5583WSjCb+3MX2w7DfRFlDo7YDKPYIMKoNM+HvnKkH
+IuNZW0CP2oi3aQiotyMuRAlZN1vH4xfyIutuOVLF3lSnmMlLIJXcRolftBL5hSmO68gnFSDAS9TM
+fAxsNAwmmyYxpjyn9tnQS6Jk/zuZQXLB4HCX8SS7K8R0IrGsayIyJNN4KsDAoS/xUgXJP+92ZuJF
+2A09rZXIx4kmyA+upwMu+8Ff+iDhcK2wZSA3M2Cw1a/XDBzCkHDXShi8fgGwsOsVHkQGzaRP6AzR
+wyAQ4VRlnrZR0Bp2a0JaWHY06rc3Ga4udfmW5cFZ95RXKSWNOkyrTZpB0F8mAwIDAQABo2MwYTAO
+BgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAfBgNVHSMEGDAWgBSdhWEUfMFib5do5E83
+QOGt4A1WNzAdBgNVHQ4EFgQUnYVhFHzBYm+XaORPN0DhreANVjcwDQYJKoZIhvcNAQEMBQADggIB
+AGSPesRiDrWIzLjHhg6hShbNcAu3p4ULs3a2D6f/CIsLJc+o1IN1KriWiLb73y0ttGlTITVX1olN
+c79pj3CjYcya2x6a4CD4bLubIp1dhDGaLIrdaqHXKGnK/nZVekZn68xDiBaiA9a5F/gZbG0jAn/x
+X9AKKSM70aoK7akXJlQKTcKlTfjF/biBzysseKNnTKkHmvPfXvt89YnNdJdhEGoHK4Fa0o635yDR
+IG4kqIQnoVesqlVYL9zZyvpoBJ7tRCT5dEA7IzOrg1oYJkK2bVS1FmAwbLGg+LhBoF1JSdJlBTrq
+/p1hvIbZv97Tujqxf36SNI7JAG7cmL3c7IAFrQI932XtCwP39xaEBDG6k5TY8hL4iuO/Qq+n1M0R
+FxbIQh0UqEL20kCGoE8jypZFVmAGzbdVAaYBlGX+bgUJurSkquLvWL69J1bY73NxW0Qz8ppy6rBe
+Pm6pUlvscG21h483XjyMnM7k8M4MZ0HMzvaAq07MTFb1wWFZk7Q+ptq4NxKfKjLji7gh7MMrZQzv
+It6IKTtM1/r+t+FHvpw+PoP7UV31aPcuIYXcv/Fa4nzXxeSDwWrruoBa3lwtcHb4yOWHh8qgnaHl
+IhInD0Q9HWzq1MKLL295q39QpsQZp6F6t5b5wR9iWqJDB0BeJsas7a5wFsWqynKKTbDPAYsDP27X
+-----END CERTIFICATE-----
+
+SecureSign Root CA14
+====================
+-----BEGIN CERTIFICATE-----
+MIIFcjCCA1qgAwIBAgIUZNtaDCBO6Ncpd8hQJ6JaJ90t8sswDQYJKoZIhvcNAQEMBQAwUTELMAkG
+A1UEBhMCSlAxIzAhBgNVBAoTGkN5YmVydHJ1c3QgSmFwYW4gQ28uLCBMdGQuMR0wGwYDVQQDExRT
+ZWN1cmVTaWduIFJvb3QgQ0ExNDAeFw0yMDA0MDgwNzA2MTlaFw00NTA0MDgwNzA2MTlaMFExCzAJ
+BgNVBAYTAkpQMSMwIQYDVQQKExpDeWJlcnRydXN0IEphcGFuIENvLiwgTHRkLjEdMBsGA1UEAxMU
+U2VjdXJlU2lnbiBSb290IENBMTQwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDF0nqh
+1oq/FjHQmNE6lPxauG4iwWL3pwon71D2LrGeaBLwbCRjOfHw3xDG3rdSINVSW0KZnvOgvlIfX8xn
+bacuUKLBl422+JX1sLrcneC+y9/3OPJH9aaakpUqYllQC6KxNedlsmGy6pJxaeQp8E+BgQQ8sqVb
+1MWoWWd7VRxJq3qdwudzTe/NCcLEVxLbAQ4jeQkHO6Lo/IrPj8BGJJw4J+CDnRugv3gVEOuGTgpa
+/d/aLIJ+7sr2KeH6caH3iGicnPCNvg9JkdjqOvn90Ghx2+m1K06Ckm9mH+Dw3EzsytHqunQG+bOE
+kJTRX45zGRBdAuVwpcAQ0BB8b8VYSbSwbprafZX1zNoCr7gsfXmPvkPx+SgojQlD+Ajda8iLLCSx
+jVIHvXiby8posqTdDEx5YMaZ0ZPxMBoH064iwurO8YQJzOAUbn8/ftKChazcqRZOhaBgy/ac18iz
+ju3Gm5h1DVXoX+WViwKkrkMpKBGk5hIwAUt1ax5mnXkvpXYvHUC0bcl9eQjs0Wq2XSqypWa9a4X0
+dFbD9ed1Uigspf9mR6XU/v6eVL9lfgHWMI+lNpyiUBzuOIABSMbHdPTGrMNASRZhdCyvjG817XsY
+AFs2PJxQDcqSMxDxJklt33UkN4Ii1+iW/RVLApY+B3KVfqs9TC7XyvDf4Fg/LS8EmjijAQIDAQAB
+o0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUBpOjCl4oaTeq
+YR3r6/wtbyPk86AwDQYJKoZIhvcNAQEMBQADggIBAJaAcgkGfpzMkwQWu6A6jZJOtxEaCnFxEM0E
+rX+lRVAQZk5KQaID2RFPeje5S+LGjzJmdSX7684/AykmjbgWHfYfM25I5uj4V7Ibed87hwriZLoA
+ymzvftAj63iP/2SbNDefNWWipAA9EiOWWF3KY4fGoweITedpdopTzfFP7ELyk+OZpDc8h7hi2/Ds
+Hzc/N19DzFGdtfCXwreFamgLRB7lUe6TzktuhsHSDCRZNhqfLJGP4xjblJUK7ZGqDpncllPjYYPG
+FrojutzdfhrGe0K22VoF3Jpf1d+42kd92jjbrDnVHmtsKheMYc2xbXIBw8MgAGJoFjHVdqqGuw6q
+nsb58Nn4DSEC5MUoFlkRudlpcyqSeLiSV5sI8jrlL5WwWLdrIBRtFO8KvH7YVdiI2i/6GaX7i+B/
+OfVyK4XELKzvGUWSTLNhB9xNH27SgRNcmvMSZ4PPmz+Ln52kuaiWA3rF7iDeM9ovnhp6dB7h7sxa
+OgTdsxoEqBRjrLdHEoOabPXm6RUVkRqEGQ6UROcSjiVbgGcZ3GOTEAtlLor6CZpO2oYofaphNdgO
+pygau1LgePhsumywbrmHXumZNTfxPWQrqaA0k89jL9WB365jJ6UeTo3cKXhZ+PmhIIynJkBugnLN
+eLLIjzwec+fBH7/PzqUqm9tEZDKgu39cJRNItX+S
+-----END CERTIFICATE-----
+
+SecureSign Root CA15
+====================
+-----BEGIN CERTIFICATE-----
+MIICIzCCAamgAwIBAgIUFhXHw9hJp75pDIqI7fBw+d23PocwCgYIKoZIzj0EAwMwUTELMAkGA1UE
+BhMCSlAxIzAhBgNVBAoTGkN5YmVydHJ1c3QgSmFwYW4gQ28uLCBMdGQuMR0wGwYDVQQDExRTZWN1
+cmVTaWduIFJvb3QgQ0ExNTAeFw0yMDA0MDgwODMyNTZaFw00NTA0MDgwODMyNTZaMFExCzAJBgNV
+BAYTAkpQMSMwIQYDVQQKExpDeWJlcnRydXN0IEphcGFuIENvLiwgTHRkLjEdMBsGA1UEAxMUU2Vj
+dXJlU2lnbiBSb290IENBMTUwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQLUHSNZDKZmbPSYAi4Io5G
+dCx4wCtELW1fHcmuS1Iggz24FG1Th2CeX2yF2wYUleDHKP+dX+Sq8bOLbe1PL0vJSpSRZHX+AezB
+2Ot6lHhWGENfa4HL9rzatAy2KZMIaY+jQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQD
+AgEGMB0GA1UdDgQWBBTrQciu/NWeUUj1vYv0hyCTQSvT9DAKBggqhkjOPQQDAwNoADBlAjEA2S6J
+fl5OpBEHvVnCB96rMjhTKkZEBhd6zlHp4P9mLQlO4E/0BdGF9jVg3PVys0Z9AjBEmEYagoUeYWmJ
+SwdLZrWeqrqgHkHZAXQ6bkU6iYAZezKYVWOr62Nuk22rGwlgMU4=
+-----END CERTIFICATE-----
+
+D-TRUST BR Root CA 2 2023
+=========================
+-----BEGIN CERTIFICATE-----
+MIIFqTCCA5GgAwIBAgIQczswBEhb2U14LnNLyaHcZjANBgkqhkiG9w0BAQ0FADBIMQswCQYDVQQG
+EwJERTEVMBMGA1UEChMMRC1UcnVzdCBHbWJIMSIwIAYDVQQDExlELVRSVVNUIEJSIFJvb3QgQ0Eg
+MiAyMDIzMB4XDTIzMDUwOTA4NTYzMVoXDTM4MDUwOTA4NTYzMFowSDELMAkGA1UEBhMCREUxFTAT
+BgNVBAoTDEQtVHJ1c3QgR21iSDEiMCAGA1UEAxMZRC1UUlVTVCBCUiBSb290IENBIDIgMjAyMzCC
+AiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAK7/CVmRgApKaOYkP7in5Mg6CjoWzckjYaCT
+cfKri3OPoGdlYNJUa2NRb0kz4HIHE304zQaSBylSa053bATTlfrdTIzZXcFhfUvnKLNEgXtRr90z
+sWh81k5M/itoucpmacTsXld/9w3HnDY25QdgrMBM6ghs7wZ8T1soegj8k12b9py0i4a6Ibn08OhZ
+WiihNIQaJZG2tY/vsvmA+vk9PBFy2OMvhnbFeSzBqZCTRphny4NqoFAjpzv2gTng7fC5v2Xx2Mt6
+++9zA84A9H3X4F07ZrjcjrqDy4d2A/wl2ecjbwb9Z/Pg/4S8R7+1FhhGaRTMBffb00msa8yr5LUL
+QyReS2tNZ9/WtT5PeB+UcSTq3nD88ZP+npNa5JRal1QMNXtfbO4AHyTsA7oC9Xb0n9Sa7YUsOCIv
+x9gvdhFP/Wxc6PWOJ4d/GUohR5AdeY0cW/jPSoXk7bNbjb7EZChdQcRurDhaTyN0dKkSw/bSuREV
+MweR2Ds3OmMwBtHFIjYoYiMQ4EbMl6zWK11kJNXuHA7e+whadSr2Y23OC0K+0bpwHJwh5Q8xaRfX
+/Aq03u2AnMuStIv13lmiWAmlY0cL4UEyNEHZmrHZqLAbWt4NDfTisl01gLmB1IRpkQLLddCNxbU9
+CZEJjxShFHR5PtbJFR2kWVki3PaKRT08EtY+XTIvAgMBAAGjgY4wgYswDwYDVR0TAQH/BAUwAwEB
+/zAdBgNVHQ4EFgQUZ5Dw1t61GNVGKX5cq/ieCLxklRAwDgYDVR0PAQH/BAQDAgEGMEkGA1UdHwRC
+MEAwPqA8oDqGOGh0dHA6Ly9jcmwuZC10cnVzdC5uZXQvY3JsL2QtdHJ1c3RfYnJfcm9vdF9jYV8y
+XzIwMjMuY3JsMA0GCSqGSIb3DQEBDQUAA4ICAQA097N3U9swFrktpSHxQCF16+tIFoE9c+CeJyrr
+d6kTpGoKWloUMz1oH4Guaf2Mn2VsNELZLdB/eBaxOqwjMa1ef67nriv6uvw8l5VAk1/DLQOj7aRv
+U9f6QA4w9QAgLABMjDu0ox+2v5Eyq6+SmNMW5tTRVFxDWy6u71cqqLRvpO8NVhTaIasgdp4D/Ca4
+nj8+AybmTNudX0KEPUUDAxxZiMrcLmEkWqTqJwtzEr5SswrPMhfiHocaFpVIbVrg0M8JkiZmkdij
+YQ6qgYF/6FKC0ULn4B0Y+qSFNueG4A3rvNTJ1jxD8V1Jbn6Bm2m1iWKPiFLY1/4nwSPFyysCu7Ff
+/vtDhQNGvl3GyiEm/9cCnnRK3PgTFbGBVzbLZVzRHTF36SXDw7IyN9XxmAnkbWOACKsGkoHU6XCP
+pz+y7YaMgmo1yEJagtFSGkUPFaUA8JR7ZSdXOUPPfH/mvTWze/EZTN46ls/pdu4D58JDUjxqgejB
+WoC9EV2Ta/vH5mQ/u2kc6d0li690yVRAysuTEwrt+2aSEcr1wPrYg1UDfNPFIkZ1cGt5SAYqgpq/
+5usWDiJFAbzdNpQ0qTUmiteXue4Icr80knCDgKs4qllo3UCkGJCy89UDyibK79XH4I9TjvAA46jt
+n/mtd+ArY0+ew+43u3gJhJ65bvspmZDogNOfJA==
+-----END CERTIFICATE-----
+
+TrustAsia TLS ECC Root CA
+=========================
+-----BEGIN CERTIFICATE-----
+MIICMTCCAbegAwIBAgIUNnThTXxlE8msg1UloD5Sfi9QaMcwCgYIKoZIzj0EAwMwWDELMAkGA1UE
+BhMCQ04xJTAjBgNVBAoTHFRydXN0QXNpYSBUZWNobm9sb2dpZXMsIEluYy4xIjAgBgNVBAMTGVRy
+dXN0QXNpYSBUTFMgRUNDIFJvb3QgQ0EwHhcNMjQwNTE1MDU0MTU2WhcNNDQwNTE1MDU0MTU1WjBY
+MQswCQYDVQQGEwJDTjElMCMGA1UEChMcVHJ1c3RBc2lhIFRlY2hub2xvZ2llcywgSW5jLjEiMCAG
+A1UEAxMZVHJ1c3RBc2lhIFRMUyBFQ0MgUm9vdCBDQTB2MBAGByqGSM49AgEGBSuBBAAiA2IABLh/
+pVs/AT598IhtrimY4ZtcU5nb9wj/1WrgjstEpvDBjL1P1M7UiFPoXlfXTr4sP/MSpwDpguMqWzJ8
+S5sUKZ74LYO1644xST0mYekdcouJtgq7nDM1D9rs3qlKH8kzsaNCMEAwDwYDVR0TAQH/BAUwAwEB
+/zAdBgNVHQ4EFgQULIVTu7FDzTLqnqOH/qKYqKaT6RAwDgYDVR0PAQH/BAQDAgEGMAoGCCqGSM49
+BAMDA2gAMGUCMFRH18MtYYZI9HlaVQ01L18N9mdsd0AaRuf4aFtOJx24mH1/k78ITcTaRTChD15K
+eAIxAKORh/IRM4PDwYqROkwrULG9IpRdNYlzg8WbGf60oenUoWa2AaU2+dhoYSi3dOGiMQ==
+-----END CERTIFICATE-----
+
+TrustAsia TLS RSA Root CA
+=========================
+-----BEGIN CERTIFICATE-----
+MIIFgDCCA2igAwIBAgIUHBjYz+VTPyI1RlNUJDxsR9FcSpwwDQYJKoZIhvcNAQEMBQAwWDELMAkG
+A1UEBhMCQ04xJTAjBgNVBAoTHFRydXN0QXNpYSBUZWNobm9sb2dpZXMsIEluYy4xIjAgBgNVBAMT
+GVRydXN0QXNpYSBUTFMgUlNBIFJvb3QgQ0EwHhcNMjQwNTE1MDU0MTU3WhcNNDQwNTE1MDU0MTU2
+WjBYMQswCQYDVQQGEwJDTjElMCMGA1UEChMcVHJ1c3RBc2lhIFRlY2hub2xvZ2llcywgSW5jLjEi
+MCAGA1UEAxMZVHJ1c3RBc2lhIFRMUyBSU0EgUm9vdCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIP
+ADCCAgoCggIBAMMWuBtqpERz5dZO9LnPWwvB0ZqB9WOwj0PBuwhaGnrhB3YmH49pVr7+NmDQDIPN
+lOrnxS1cLwUWAp4KqC/lYCZUlviYQB2srp10Zy9U+5RjmOMmSoPGlbYJQ1DNDX3eRA5gEk9bNb2/
+mThtfWza4mhzH/kxpRkQcwUqwzIZheo0qt1CHjCNP561HmHVb70AcnKtEj+qpklz8oYVlQwQX1Fk
+zv93uMltrOXVmPGZLmzjyUT5tUMnCE32ft5EebuyjBza00tsLtbDeLdM1aTk2tyKjg7/D8OmYCYo
+zza/+lcK7Fs/6TAWe8TbxNRkoDD75f0dcZLdKY9BWN4ArTr9PXwaqLEX8E40eFgl1oUh63kd0Nyr
+z2I8sMeXi9bQn9P+PN7F4/w6g3CEIR0JwqH8uyghZVNgepBtljhb//HXeltt08lwSUq6HTrQUNoy
+IBnkiz/r1RYmNzz7dZ6wB3C4FGB33PYPXFIKvF1tjVEK2sUYyJtt3LCDs3+jTnhMmCWr8n4uIF6C
+FabW2I+s5c0yhsj55NqJ4js+k8UTav/H9xj8Z7XvGCxUq0DTbE3txci3OE9kxJRMT6DNrqXGJyV1
+J23G2pyOsAWZ1SgRxSHUuPzHlqtKZFlhaxP8S8ySpg+kUb8OWJDZgoM5pl+z+m6Ss80zDoWo8SnT
+q1mt1tve1CuBAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFLgHkXlcBvRG/XtZ
+ylomkadFK/hTMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQwFAAOCAgEAIZtqBSBdGBanEqT3
+Rz/NyjuujsCCztxIJXgXbODgcMTWltnZ9r96nBO7U5WS/8+S4PPFJzVXqDuiGev4iqME3mmL5Dw8
+veWv0BIb5Ylrc5tvJQJLkIKvQMKtuppgJFqBTQUYo+IzeXoLH5Pt7DlK9RME7I10nYEKqG/odv6L
+TytpEoYKNDbdgptvT+Bz3Ul/KD7JO6NXBNiT2Twp2xIQaOHEibgGIOcberyxk2GaGUARtWqFVwHx
+tlotJnMnlvm5P1vQiJ3koP26TpUJg3933FEFlJ0gcXax7PqJtZwuhfG5WyRasQmr2soaB82G39tp
+27RIGAAtvKLEiUUjpQ7hRGU+isFqMB3iYPg6qocJQrmBktwliJiJ8Xw18WLK7nn4GS/+X/jbh87q
+qA8MpugLoDzga5SYnH+tBuYc6kIQX+ImFTw3OffXvO645e8D7r0i+yiGNFjEWn9hongPXvPKnbwb
+PKfILfanIhHKA9jnZwqKDss1jjQ52MjqjZ9k4DewbNfFj8GQYSbbJIweSsCI3zWQzj8C9GRh3sfI
+B5XeMhg6j6JCQCTl1jNdfK7vsU1P1FeQNWrcrgSXSYk0ly4wBOeY99sLAZDBHwo/+ML+TvrbmnNz
+FrwFuHnYWa8G5z9nODmxfKuU4CkUpijy323imttUQ/hHWKNddBWcwauwxzQ=
+-----END CERTIFICATE-----
+
+D-TRUST EV Root CA 2 2023
+=========================
+-----BEGIN CERTIFICATE-----
+MIIFqTCCA5GgAwIBAgIQaSYJfoBLTKCnjHhiU19abzANBgkqhkiG9w0BAQ0FADBIMQswCQYDVQQG
+EwJERTEVMBMGA1UEChMMRC1UcnVzdCBHbWJIMSIwIAYDVQQDExlELVRSVVNUIEVWIFJvb3QgQ0Eg
+MiAyMDIzMB4XDTIzMDUwOTA5MTAzM1oXDTM4MDUwOTA5MTAzMlowSDELMAkGA1UEBhMCREUxFTAT
+BgNVBAoTDEQtVHJ1c3QgR21iSDEiMCAGA1UEAxMZRC1UUlVTVCBFViBSb290IENBIDIgMjAyMzCC
+AiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANiOo4mAC7JXUtypU0w3uX9jFxPvp1sjW2l1
+sJkKF8GLxNuo4MwxusLyzV3pt/gdr2rElYfXR8mV2IIEUD2BCP/kPbOx1sWy/YgJ25yE7CUXFId/
+MHibaljJtnMoPDT3mfd/06b4HEV8rSyMlD/YZxBTfiLNTiVR8CUkNRFeEMbsh2aJgWi6zCudR3Mf
+vc2RpHJqnKIbGKBv7FD0fUDCqDDPvXPIEysQEx6Lmqg6lHPTGGkKSv/BAQP/eX+1SH977ugpbzZM
+lWGG2Pmic4ruri+W7mjNPU0oQvlFKzIbRlUWaqZLKfm7lVa/Rh3sHZMdwGWyH6FDrlaeoLGPaxK3
+YG14C8qKXO0elg6DpkiVjTujIcSuWMYAsoS0I6SWhjW42J7YrDRJmGOVxcttSEfi8i4YHtAxq910
+7PncjLgcjmgjutDzUNzPZY9zOjLHfP7KgiJPvo5iR2blzYfi6NUPGJ/lBHJLRjwQ8kTCZFZxTnXo
+nMkmdMV9WdEKWw9t/p51HBjGGjp82A0EzM23RWV6sY+4roRIPrN6TagD4uJ+ARZZaBhDM7DS3LAa
+QzXupdqpRlyuhoFBAUp0JuyfBr/CBTdkdXgpaP3F9ev+R/nkhbDhezGdpn9yo7nELC7MmVcOIQxF
+AZRl62UJxmMiCzNJkkg8/M3OsD6Onov4/knFNXJHAgMBAAGjgY4wgYswDwYDVR0TAQH/BAUwAwEB
+/zAdBgNVHQ4EFgQUqvyREBuHkV8Wub9PS5FeAByxMoAwDgYDVR0PAQH/BAQDAgEGMEkGA1UdHwRC
+MEAwPqA8oDqGOGh0dHA6Ly9jcmwuZC10cnVzdC5uZXQvY3JsL2QtdHJ1c3RfZXZfcm9vdF9jYV8y
+XzIwMjMuY3JsMA0GCSqGSIb3DQEBDQUAA4ICAQCTy6UfmRHsmg1fLBWTxj++EI14QvBukEdHjqOS
+Mo1wj/Zbjb6JzkcBahsgIIlbyIIQbODnmaprxiqgYzWRaoUlrRc4pZt+UPJ26oUFKidBK7GB0aL2
+QHWpDsvxVUjY7NHss+jOFKE17MJeNRqrphYBBo7q3C+jisosketSjl8MmxfPy3MHGcRqwnNU73xD
+UmPBEcrCRbH0O1P1aa4846XerOhUt7KR/aypH/KH5BfGSah82ApB9PI+53c0BFLd6IHyTS9URZ0V
+4U/M5d40VxDJI3IXcI1QcB9WbMy5/zpaT2N6w25lBx2Eof+pDGOJbbJAiDnXH3dotfyc1dZnaVuo
+dNv8ifYbMvekJKZ2t0dT741Jj6m2g1qllpBFYfXeA08mD6iL8AOWsKwV0HFaanuU5nCT2vFp4LJi
+TZ6P/4mdm13NRemUAiKN4DV/6PEEeXFsVIP4M7kFMhtYVRFP0OUnR3Hs7dpn1mKmS00PaaLJvOwi
+S5THaJQXfuKOKD62xur1NGyfN4gHONuGcfrNlUhDbqNPgofXNJhuS5N5YHVpD/Aa1VP6IQzCP+k/
+HxiMkl14p3ZnGbuy6n/pcAlWVqOwDAstNl7F6cTVg8uGF5csbBNvh1qvSaYd2804BC5f4ko1Di1L
++KIkBI3Y4WNeApI02phhXBxvWHZks/wCuPWdCg==
+-----END CERTIFICATE-----
+
+SwissSign RSA TLS Root CA 2022 - 1
+==================================
+-----BEGIN CERTIFICATE-----
+MIIFkzCCA3ugAwIBAgIUQ/oMX04bgBhE79G0TzUfRPSA7cswDQYJKoZIhvcNAQELBQAwUTELMAkG
+A1UEBhMCQ0gxFTATBgNVBAoTDFN3aXNzU2lnbiBBRzErMCkGA1UEAxMiU3dpc3NTaWduIFJTQSBU
+TFMgUm9vdCBDQSAyMDIyIC0gMTAeFw0yMjA2MDgxMTA4MjJaFw00NzA2MDgxMTA4MjJaMFExCzAJ
+BgNVBAYTAkNIMRUwEwYDVQQKEwxTd2lzc1NpZ24gQUcxKzApBgNVBAMTIlN3aXNzU2lnbiBSU0Eg
+VExTIFJvb3QgQ0EgMjAyMiAtIDEwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDLKmji
+C8NXvDVjvHClO/OMPE5Xlm7DTjak9gLKHqquuN6orx122ro10JFwB9+zBvKK8i5VUXu7LCTLf5Im
+gKO0lPaCoaTo+nUdWfMHamFk4saMla+ju45vVs9xzF6BYQ1t8qsCLqSX5XH8irCRIFucdFJtrhUn
+WXjyCcplDn/L9Ovn3KlMd/YrFgSVrpxxpT8q2kFC5zyEEPThPYxr4iuRR1VPuFa+Rd4iUU1OKNlf
+GUEGjw5NBuBwQCMBauTLE5tzrE0USJIt/m2n+IdreXXhvhCxqohAWVTXz8TQm0SzOGlkjIHRI36q
+OTw7D59Ke4LKa2/KIj4x0LDQKhySio/YGZxH5D4MucLNvkEM+KRHBdvBFzA4OmnczcNpI/2aDwLO
+EGrOyvi5KaM2iYauC8BPY7kGWUleDsFpswrzd34unYyzJ5jSmY0lpx+Gs6ZUcDj8fV3oT4MM0ZPl
+EuRU2j7yrTrePjxF8CgPBrnh25d7mUWe3f6VWQQvdT/TromZhqwUtKiE+shdOxtYk8EXlFXIC+OC
+eYSf8wCENO7cMdWP8vpPlkwGqnj73mSiI80fPsWMvDdUDrtaclXvyFu1cvh43zcgTFeRc5JzrBh3
+Q4IgaezprClG5QtO+DdziZaKHG29777YtvTKwP1H8K4LWCDFyB02rpeNUIMmJCn3nTsPBQIDAQAB
+o2MwYTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAfBgNVHSMEGDAWgBRvjmKLk0Ow
+4UD2p8P98Q+4DxU4pTAdBgNVHQ4EFgQUb45ii5NDsOFA9qfD/fEPuA8VOKUwDQYJKoZIhvcNAQEL
+BQADggIBAKwsKUF9+lz1GpUYvyypiqkkVHX1uECry6gkUSsYP2OprphWKwVDIqO310aewCoSPY6W
+lkDfDDOLazeROpW7OSltwAJsipQLBwJNGD77+3v1dj2b9l4wBlgzHqp41eZUBDqyggmNzhYzWUUo
+8aWjlw5DI/0LIICQ/+Mmz7hkkeUFjxOgdg3XNwwQiJb0Pr6VvfHDffCjw3lHC1ySFWPtUnWK50Zp
+y1FVCypM9fJkT6lc/2cyjlUtMoIcgC9qkfjLvH4YoiaoLqNTKIftV+Vlek4ASltOU8liNr3Cjlvr
+zG4ngRhZi0Rjn9UMZfQpZX+RLOV/fuiJz48gy20HQhFRJjKKLjpHE7iNvUcNCfAWpO2Whi4Z2L6M
+OuhFLhG6rlrnub+xzI/goP+4s9GFe3lmozm1O2bYQL7Pt2eLSMkZJVX8vY3PXtpOpvJpzv1/THfQ
+wUY1mFwjmwJFQ5Ra3bxHrSL+ul4vkSkphnsh3m5kt8sNjzdbowhq6/TdAo9QAwKxuDdollDruF/U
+KIqlIgyKhPBZLtU30WHlQnNYKoH3dtvi4k0NX/a3vgW0rk4N3hY9A4GzJl5LuEsAz/+MF7psYC0n
+hzck5npgL7XTgwSqT0N1osGDsieYK7EOgLrAhV5Cud+xYJHT6xh+cHiudoO+cVrQkOPKwRYlZ0rw
+tnu64ZzZ
+-----END CERTIFICATE-----
+
+OISTE Server Root ECC G1
+========================
+-----BEGIN CERTIFICATE-----
+MIICNTCCAbqgAwIBAgIQI/nD1jWvjyhLH/BU6n6XnTAKBggqhkjOPQQDAzBLMQswCQYDVQQGEwJD
+SDEZMBcGA1UECgwQT0lTVEUgRm91bmRhdGlvbjEhMB8GA1UEAwwYT0lTVEUgU2VydmVyIFJvb3Qg
+RUNDIEcxMB4XDTIzMDUzMTE0NDIyOFoXDTQ4MDUyNDE0NDIyN1owSzELMAkGA1UEBhMCQ0gxGTAX
+BgNVBAoMEE9JU1RFIEZvdW5kYXRpb24xITAfBgNVBAMMGE9JU1RFIFNlcnZlciBSb290IEVDQyBH
+MTB2MBAGByqGSM49AgEGBSuBBAAiA2IABBcv+hK8rBjzCvRE1nZCnrPoH7d5qVi2+GXROiFPqOuj
+vqQycvO2Ackr/XeFblPdreqqLiWStukhEaivtUwL85Zgmjvn6hp4LrQ95SjeHIC6XG4N2xml4z+c
+KrhAS93mT6NjMGEwDwYDVR0TAQH/BAUwAwEB/zAfBgNVHSMEGDAWgBQ3TYhlz/w9itWj8UnATgwQ
+b0K0nDAdBgNVHQ4EFgQUN02IZc/8PYrVo/FJwE4MEG9CtJwwDgYDVR0PAQH/BAQDAgGGMAoGCCqG
+SM49BAMDA2kAMGYCMQCpKjAd0MKfkFFRQD6VVCHNFmb3U2wIFjnQEnx/Yxvf4zgAOdktUyBFCxxg
+ZzFDJe0CMQCSia7pXGKDYmH5LVerVrkR3SW+ak5KGoJr3M/TvEqzPNcum9v4KGm8ay3sMaE641c=
+-----END CERTIFICATE-----
+
+OISTE Server Root RSA G1
+========================
+-----BEGIN CERTIFICATE-----
+MIIFgzCCA2ugAwIBAgIQVaXZZ5Qoxu0M+ifdWwFNGDANBgkqhkiG9w0BAQwFADBLMQswCQYDVQQG
+EwJDSDEZMBcGA1UECgwQT0lTVEUgRm91bmRhdGlvbjEhMB8GA1UEAwwYT0lTVEUgU2VydmVyIFJv
+b3QgUlNBIEcxMB4XDTIzMDUzMTE0MzcxNloXDTQ4MDUyNDE0MzcxNVowSzELMAkGA1UEBhMCQ0gx
+GTAXBgNVBAoMEE9JU1RFIEZvdW5kYXRpb24xITAfBgNVBAMMGE9JU1RFIFNlcnZlciBSb290IFJT
+QSBHMTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAKqu9KuCz/vlNwvn1ZatkOhLKdxV
+YOPMvLO8LZK55KN68YG0nnJyQ98/qwsmtO57Gmn7KNByXEptaZnwYx4M0rH/1ow00O7brEi56rAU
+jtgHqSSY3ekJvqgiG1k50SeH3BzN+Puz6+mTeO0Pzjd8JnduodgsIUzkik/HEzxux9UTl7Ko2yRp
+g1bTacuCErudG/L4NPKYKyqOBGf244ehHa1uzjZ0Dl4zO8vbUZeUapU8zhhabkvG/AePLhq5Svdk
+NCncpo1Q4Y2LS+VIG24ugBA/5J8bZT8RtOpXaZ+0AOuFJJkk9SGdl6r7NH8CaxWQrbueWhl/pIzY
++m0o/DjH40ytas7ZTpOSjswMZ78LS5bOZmdTaMsXEY5Z96ycG7mOaES3GK/m5Q9l3JUJsJMStR8+
+lKXHiHUhsd4JJCpM4rzsTGdHwimIuQq6+cF0zowYJmXa92/GjHtoXAvuY8BeS/FOzJ8vD+HomnqT
+8eDI278n5mUpezbgMxVz8p1rhAhoKzYHKyfMeNhqhw5HdPSqoBNdZH702xSu+zrkL8Fl47l6QGzw
+Brd7KJvX4V84c5Ss2XCTLdyEr0YconosP4EmQufU2MVshGYRi3drVByjtdgQ8K4p92cIiBdcuJd5
+z+orKu5YM+Vt6SmqZQENghPsJQtdLEByFSnTkCz3GkPVavBpAgMBAAGjYzBhMA8GA1UdEwEB/wQF
+MAMBAf8wHwYDVR0jBBgwFoAU8snBDw1jALvsRQ5KH7WxszbNDo0wHQYDVR0OBBYEFPLJwQ8NYwC7
+7EUOSh+1sbM2zQ6NMA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQwFAAOCAgEANGd5sjrG5T33
+I3K5Ce+SrScfoE4KsvXaFwyihdJ+klH9FWXXXGtkFu6KRcoMQzZENdl//nk6HOjG5D1rd9QhEOP2
+8yBOqb6J8xycqd+8MDoX0TJD0KqKchxRKEzdNsjkLWd9kYccnbz8qyiWXmFcuCIzGEgWUOrKL+ml
+Sdx/PKQZvDatkuK59EvV6wit53j+F8Bdh3foZ3dPAGav9LEDOr4SfEE15fSmG0eLy3n31r8Xbk5l
+8PjaV8GUgeV6Vg27Rn9vkf195hfkgSe7BYhW3SCl95gtkRlpMV+bMPKZrXJAlszYd2abtNUOshD+
+FKrDgHGdPY3ofRRsYWSGRqbXVMW215AWRqWFyp464+YTFrYVI8ypKVL9AMb2kI5Wj4kI3Zaq5tNq
+qYY19tVFeEJKRvwDyF7YZvZFZSS0vod7VSCd9521Kvy5YhnLbDuv0204bKt7ph6N/Ome/msVuduC
+msuY33OhkKCgxeDoAaijFJzIwZqsFVAzje18KotzlUBDJvyBpCpfOZC3J8tRd/iWkx7P8nd9H0aT
+olkelUTFLXVksNb54Dxp6gS1HAviRkRNQzuXSXERvSS2wq1yVAb+axj5d9spLFKebXd7Yv0PTY6Y
+MjAwcRLWJTXjn/hvnLXrahut6hDTlhZyBiElxky8j3C7DOReIoMt0r7+hVu05L0=
+-----END CERTIFICATE-----
+
+e-Szigno TLS Root CA 2023
+=========================
+-----BEGIN CERTIFICATE-----
+MIICzzCCAjGgAwIBAgINAOhvGHvWOWuYSkmYCjAKBggqhkjOPQQDBDB1MQswCQYDVQQGEwJIVTER
+MA8GA1UEBwwIQnVkYXBlc3QxFjAUBgNVBAoMDU1pY3Jvc2VjIEx0ZC4xFzAVBgNVBGEMDlZBVEhV
+LTIzNTg0NDk3MSIwIAYDVQQDDBllLVN6aWdubyBUTFMgUm9vdCBDQSAyMDIzMB4XDTIzMDcxNzE0
+MDAwMFoXDTM4MDcxNzE0MDAwMFowdTELMAkGA1UEBhMCSFUxETAPBgNVBAcMCEJ1ZGFwZXN0MRYw
+FAYDVQQKDA1NaWNyb3NlYyBMdGQuMRcwFQYDVQRhDA5WQVRIVS0yMzU4NDQ5NzEiMCAGA1UEAwwZ
+ZS1Temlnbm8gVExTIFJvb3QgQ0EgMjAyMzCBmzAQBgcqhkjOPQIBBgUrgQQAIwOBhgAEAGgP36J8
+PKp0iGEKjcJMpQEiFNT3YHdCnAo4YKGMZz6zY+n6kbCLS+Y53wLCMAFSAL/fjO1ZrTJlqwlZULUZ
+wmgcAOAFX9pQJhzDrAQixTpN7+lXWDajwRlTEArRzT/vSzUaQ49CE0y5LBqcvjC2xN7cS53kpDzL
+Ltmt3999Cd8ukv+ho2MwYTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4E
+FgQUWYQCYlpGePVd3I8KECgj3NXW+0UwHwYDVR0jBBgwFoAUWYQCYlpGePVd3I8KECgj3NXW+0Uw
+CgYIKoZIzj0EAwQDgYsAMIGHAkIBLdqu9S54tma4n7Zwf2Z0z+yOfP7AAXmazlIC58PRDHpty7Ve
+7hekm9sEdu4pKeiv+62sUvTXK9Z3hBC9xdIoaDQCQTV2WnXzkoYI9bIeCvZlC9p2x1L/Cx6AcCIw
+wzPbGO2E14vs7dOoY4G1VnxHx1YwlGhza9IuqbnZLBwpvQy6uWWL
+-----END CERTIFICATE-----
+
+SECOM TLS RSA Root CA 2024
+==========================
+-----BEGIN CERTIFICATE-----
+MIIFmjCCA4KgAwIBAgIJAO6JNNDLgOCyMA0GCSqGSIb3DQEBDAUAMFoxCzAJBgNVBAYTAkpQMSYw
+JAYDVQQKEx1TRUNPTSBUcnVzdCBTeXN0ZW1zIENvLiwgTHRkLjEjMCEGA1UEAxMaU0VDT00gVExT
+IFJTQSBSb290IENBIDIwMjQwHhcNMjQwMTMxMDUxMTU1WhcNNDkwMTE0MDUxMTU1WjBaMQswCQYD
+VQQGEwJKUDEmMCQGA1UEChMdU0VDT00gVHJ1c3QgU3lzdGVtcyBDby4sIEx0ZC4xIzAhBgNVBAMT
+GlNFQ09NIFRMUyBSU0EgUm9vdCBDQSAyMDI0MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKC
+AgEA4TjizUwzxbInq8Tx11gaFYNk5fO+34y7TyM4neh0UgL5JIZbJNLTz2x//L/B71+5m6X6nGIr
+7d4lFJBGtjO677hXOz93zkcWaUTm3VbOAjBlt4YWxlcccBHXuZ7o3Q+4R+ormrBdHeJ1CTUEG8tt
+QbKIl3G7OZYbnH8/pP8cjPub/0kDVNuMzp7xsVRROOisQt53fMoJLlYgoebbuMphOqMCtjkJ7R6e
+fEMfLp8UAVi9ZaLRn76ET/CJkk925nduuufC4BatS4mnXFmxN0vUXb0ij9B8O/D8gixQEsVSD4GK
+8FWRPh3bVd/6bzdkHGJjy21XI0yejVomZUbRrOfNuz0boPGV1pt18fFC39IHQEth3OFqb5NDO3L+
+A9bNqTgAyUgRmIn4ucgDc/Ri/Km3V51ueZjy1/yk0qwJVadAVVrCt56iNeXOyEvzJADGgDQ8E1Pd
+aqct8Cynz/47ReQM62vFYO08wcQkrjmX/tesiko1V1yyaf6EfPzUFzmaGy9xvkCwdbm15EdTolOj
+E0H2Vb5/APDOyCFEokiYGmXTLdAUl0wKZ4IyjkHGzy0jhpaXEXE/GJcEvI6VzEchjaBL03EJ0h9p
+G4OqeIOycKvAo3A+TbetyfsrgYyHzU0a7/qUjGat1AAq1nVljMpKqpinPTsf/d9H39FTUeJL7Tpz
+zjUCAwEAAaNjMGEwHQYDVR0OBBYEFCzrchKOWHdkNRVWNQFXB6l9DTbmMB8GA1UdIwQYMBaAFCzr
+chKOWHdkNRVWNQFXB6l9DTbmMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MA0GCSqG
+SIb3DQEBDAUAA4ICAQAVwsvluSafaez5tFPR/hRTBzRxEyMMQF3XJXCVi3yegZyKoec7hmE6jx2Z
+M8KgM1kn2yJRwFXHX8zUW9nBLEDWc4wuE8LrlZqhGZM9pJQXGmGzResDJV6JgRBna+j4sA1M7yId
+lvL0sAfFXFCTRaWTD4E1V99RLrFzWfTcC+e180hDuNMpqOEo46+lMeW/Wvh7ifOQs+kiK0O2gHxQ
+DNxslSavnCs4V7l8HRDJ2La10o70Bo7VLzf1W8MBvv0VTnxB+NjT5qTAbhGFh9Gvp4BaJpmdUf0C
+5CEP6dbQlfgxWfzYr69yVT6dPQB+GFEaY03IMY+AcBCs+om1fNxrQXt9zoofMBNFbLhvpNH/JsXW
+dGUzfNbO12uswTa5wah8LB18FTQN2/zPHYmvBEoLuyUgZ09VNLJo5YA0kXItVYkLjMe2SixzK4sc
+UHv81IK99I91DWx7FwMVKw2xgFp+ZLYB2dnpQQrqwlW64glHUcK2N9BDsnjLSxeZ+UPECh9RxH4W
+AcKiZW+cqaKMmhP2WBfR4IcR7NOL32ml11ds87hhV1CZWWFCJAcCidYZz6CZa8exzHojP9SB5RH0
+/v1KdHAisqhSjtJl/UIAHIQ48elOn8wrTdFap4Yb5aHglmMeNx+fAIhDluWVfxTO7H4dTPU+SFVR
+MLAh+wwKZfqb94nMeQ==
+-----END CERTIFICATE-----
+
+SECOM TLS ECC Root CA 2024
+==========================
+-----BEGIN CERTIFICATE-----
+MIICTDCCAdGgAwIBAgIJAIF6LO+PI3pEMAoGCCqGSM49BAMDMFoxCzAJBgNVBAYTAkpQMSYwJAYD
+VQQKEx1TRUNPTSBUcnVzdCBTeXN0ZW1zIENvLiwgTHRkLjEjMCEGA1UEAxMaU0VDT00gVExTIEVD
+QyBSb290IENBIDIwMjQwHhcNMjQwMTMxMDU1MjM0WhcNNDkwMTE0MDU1MjM0WjBaMQswCQYDVQQG
+EwJKUDEmMCQGA1UEChMdU0VDT00gVHJ1c3QgU3lzdGVtcyBDby4sIEx0ZC4xIzAhBgNVBAMTGlNF
+Q09NIFRMUyBFQ0MgUm9vdCBDQSAyMDI0MHYwEAYHKoZIzj0CAQYFK4EEACIDYgAE7NzFMtu9dzQX
+SNC12fabk0+GlC5finB3R7XaZonRUd20aFiWObtuNBCLUZSfk6QXAE55BjEXsXQ/NG8yUqicXjsu
+9ksDK3JZBgCwLOVh6+nwJXTvso/dEj/GUYH5mBdoo2MwYTAdBgNVHQ4EFgQUO3YReyl04k4GTFaC
+QNAhL3qzydUwHwYDVR0jBBgwFoAUO3YReyl04k4GTFaCQNAhL3qzydUwDgYDVR0PAQH/BAQDAgEG
+MA8GA1UdEwEB/wQFMAMBAf8wCgYIKoZIzj0EAwMDaQAwZgIxAN3ib8fi1pMYtAPjMilB5e5/H+t5
+CL0xPL+cZ5oTTZuSCjpAn1v7F/VAr8bFxQXAowIxAKsBVO1ACFp7skwzPvdv1EUY5a897WGLT4lb
++bjxFAWyl8wDcZJdwGZ/pAHxt1AJ1g==
+-----END CERTIFICATE-----
+
+Telia EC TLS Root CA v3
+=======================
+-----BEGIN CERTIFICATE-----
+MIICMjCCAbegAwIBAgIPAYvSIlRjTQSLbOVHH9K1MAoGCCqGSM49BAMDMEoxCzAJBgNVBAYTAlNF
+MRkwFwYDVQQKDBBUZWxpYSBDb21wYW55IEFCMSAwHgYDVQQDDBdUZWxpYSBFQyBUTFMgUm9vdCBD
+QSB2MzAeFw0yMzExMTUwODU1MjZaFw00ODA1MjMxMTAwMDBaMEoxCzAJBgNVBAYTAlNFMRkwFwYD
+VQQKDBBUZWxpYSBDb21wYW55IEFCMSAwHgYDVQQDDBdUZWxpYSBFQyBUTFMgUm9vdCBDQSB2MzB2
+MBAGByqGSM49AgEGBSuBBAAiA2IABMHIlhVDLbmFKUpW0iK4dpryT6emYOeS31JPwWnWPmkWRrAk
+TbPX40sQfHI9mpR7Rbktu3ngg6W+BBSXSechtMCnBmWXj/EaVlmV5cY1jD2HoTfhBQ3AacpCNMLJ
+K4NpZaNjMGEwHwYDVR0jBBgwFoAU1GToQ4g6cy/QGnGCNgtehd7H3kMwHQYDVR0OBBYEFNRk6EOI
+OnMv0BpxgjYLXoXex95DMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MAoGCCqGSM49
+BAMDA2kAMGYCMQCXAUdS/9bbJ8A1JYaGf/bWt/s7Ta0ot5Ulno8OjSNYRWQIlS4tVWldvTAVA7he
+OFgCMQCvKr8+Z2Rn+OBr5UHzlgBObpad1LuwNTRcdNgUJxIWadcki+UBLEi1/AURKV5md2M=
+-----END CERTIFICATE-----
+
+Telia RSA TLS Root CA v3
+========================
+-----BEGIN CERTIFICATE-----
+MIIFgjCCA2qgAwIBAgIPAYvSUKtCVSxHWr2h3BrFMA0GCSqGSIb3DQEBDAUAMEsxCzAJBgNVBAYT
+AlNFMRkwFwYDVQQKDBBUZWxpYSBDb21wYW55IEFCMSEwHwYDVQQDDBhUZWxpYSBSU0EgVExTIFJv
+b3QgQ0EgdjMwHhcNMjMxMTE1MDk0NzQyWhcNNDgwNTIzMTEwMDAwWjBLMQswCQYDVQQGEwJTRTEZ
+MBcGA1UECgwQVGVsaWEgQ29tcGFueSBBQjEhMB8GA1UEAwwYVGVsaWEgUlNBIFRMUyBSb290IENB
+IHYzMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAsV89KG19hCf4S1Fvk8D3TyDERhmc
+vx8F7Kmb4WATx3ije1id3KHxRE0TKmcNCbAQ57bvHFEYa4hR2l20VjVadExqOW+2ld99MbEiO+jR
+VOz+BbxLxJnmGwCqI+BfuTjjVReDxsxjQvjgBsClaO/sm5i70nlZcWGRtIkvWDK3NNkT5RtwXc/O
+8NTFVpbUqT6cRjIj3olAblR+lRf4Ffy5o+Q9fabjYn9Z9S4itruElcEFf9Ljk7fwdTycT/rvJW9w
+/B3G2a3r0f/zXNOVruIBcqE6pkSospACU2bG42fYKrbM/GWnp7u+p9Frz4jaNwpb4YHuEeS8Brat
+NcP8X62jXIvvKHxlsMDJCnb4U8JzFOLsU6mohVY58BdZrvi0Gk9UOuqmgoG6dskHoksjZTlK61D/
+InzmEoA1yAYJFDVysjRxDUOu9cAwANbqmq77WIFL6BpnZgVqPtMfG6wN8BrTKdapvilVsYR59BFg
+IsAVBMxrGh+W+QcvmJafUpASvlArKvVG2FI4i6PiLjSBT0+6F6EQLrYqefOQF/fBNEXb+njUQ0SU
+VrAqtH4Y+OjCI/a4/JJQppxeemZcQ0SUShgiI5AM5xHO5iyaUrTjYH4zxUz9j+1FEbDH/xpstr1g
+XBykspup+hRTaJcbA+UbpJqtWZndAPddJmt6YJQ+dU3pDu8CAwEAAaNjMGEwHwYDVR0jBBgwFoAU
+sMep0t2yKFZzBJSMFFxIbzdSkqgwHQYDVR0OBBYEFLDHqdLdsihWcwSUjBRcSG83UpKoMA4GA1Ud
+DwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBDAUAA4ICAQBdYzFsNGDRk7bR
+/AgRKq+5637YuOW+w6uhpoS0VnKMUpyHCwku86hEvqivakPtfmlm4bFwt++sb/8OXsWBqtfbXMaB
+NDTZl8XRMJuLWOW2JrbKkRzgG0eBUcvsadG1rrhbmZqYvFXaAZO7o4TdOZzxhBB5GOAWWXB3Iera
+NP4J63zyo9n8Gqw3sJBG44em5hoYjBffP+npibyslnslRi4L6xHsCYj/Pab+OlqbMCB6v+sTCLeE
+IukRVzoR9aQ45pEK7Z1QBnSsbAKQtss0JKD9d/mX143H1xePjPhTXlv5JCkhrcj+SShz0P9+EHoW
+e6m9lyUEOIVn0rp+yVJWNbmyDv3VkwFxHC1ApSQsgSimjGQ4wtr6cSmordYxkV+Ro8lOIIhRksXP
+yDk27gW6IjUXCkZKpxFjkL3jiBSc8SkxnwCWtXg8xwNwdFVNBGLCCuJnsneYXjJNqzRqUcoGwzsv
+F3Qi/ZnHUNvISdevlgIAXL4Wvrxaqvoa01wB+GCfs57RTGE4TvAGhKNKus8K3hRT1BSpigzMIRzS
+xtAOrqPN6j//QSmW9f8Jcncri4j2ihSpVrFU0NdNkMhZeAKidTFPsxCVFuW4Aniz7jqiw5sWtjbQ
+rlW035izIEU4sYwQoC1Nx0Svy+mMTRai50LqFQ+A1/Hq6xHHDNx7CI83d23Erw==
+-----END CERTIFICATE-----
diff --git a/3rdPartyBinaries/dpp.dll b/3rdPartyBinaries/dpp.dll
deleted file mode 100644
index c53f63be66..0000000000
Binary files a/3rdPartyBinaries/dpp.dll and /dev/null differ
diff --git a/3rdPartyBinaries/dpp.lib b/3rdPartyBinaries/dpp.lib
index d83210bd47..dd100a742f 100644
Binary files a/3rdPartyBinaries/dpp.lib and b/3rdPartyBinaries/dpp.lib differ
diff --git a/3rdPartyBinaries/dpp_debug/dpp.dll b/3rdPartyBinaries/dpp_debug/dpp.dll
new file mode 100644
index 0000000000..917bf2d156
Binary files /dev/null and b/3rdPartyBinaries/dpp_debug/dpp.dll differ
diff --git a/3rdPartyBinaries/dpp_release/dpp.dll b/3rdPartyBinaries/dpp_release/dpp.dll
new file mode 100644
index 0000000000..cde60457c1
Binary files /dev/null and b/3rdPartyBinaries/dpp_release/dpp.dll differ
diff --git a/3rdPartyBinaries/dppd.lib b/3rdPartyBinaries/dppd.lib
deleted file mode 100644
index 4a41c40394..0000000000
Binary files a/3rdPartyBinaries/dppd.lib and /dev/null differ
diff --git a/3rdPartyBinaries/libcrypto-1_1-x64.dll b/3rdPartyBinaries/libcrypto-1_1-x64.dll
index 8a06122706..19a42c9d29 100644
Binary files a/3rdPartyBinaries/libcrypto-1_1-x64.dll and b/3rdPartyBinaries/libcrypto-1_1-x64.dll differ
diff --git a/3rdPartyBinaries/libdpp-10.1.6-linux-x64.deb b/3rdPartyBinaries/libdpp-10.1.6-linux-x64.deb
new file mode 100644
index 0000000000..2e20260e96
Binary files /dev/null and b/3rdPartyBinaries/libdpp-10.1.6-linux-x64.deb differ
diff --git a/3rdPartyBinaries/libdpp@10.1.6.rb b/3rdPartyBinaries/libdpp@10.1.6.rb
new file mode 100644
index 0000000000..7727b37d9f
--- /dev/null
+++ b/3rdPartyBinaries/libdpp@10.1.6.rb
@@ -0,0 +1,45 @@
+class LibdppAT1016 < Formula
+  desc "C++ Discord API Bot Library"
+  homepage "https://github.com/brainboxdotcc/DPP"
+  url "https://github.com/brainboxdotcc/DPP/releases/download/v10.1.6/DPP-10.1.6.tar.gz"
+  sha256 "65cf9e5fbc7b40e3fadaf742fa87da9cdede46651e35007c7b45cb765bfc17ba"
+  license "Apache-2.0"
+
+  depends_on "cmake" => :build
+  depends_on xcode: ["12.0", :build]
+  depends_on "libsodium"
+  depends_on "openssl@3"
+  depends_on "opus"
+  depends_on "pkg-config"
+
+  uses_from_macos "zlib"
+
+  def install
+    system "cmake", "-S", ".", "-B", "build", *std_cmake_args
+    system "cmake", "--build", "build"
+    system "cmake", "--install", "build"
+  end
+
+  test do
+    (testpath/"test.cpp").write <<~EOS
+      #include <dpp/dpp.h>
+
+      int main() {
+        dpp::cluster bot("invalid_token");
+
+        bot.on_log(dpp::utility::cout_logger());
+
+        try {
+          bot.start(dpp::st_wait);
+        }
+        catch(dpp::invalid_token_exception& e) {
+          std::cout << "Invalid token." << std::endl;
+          return 0;
+        }
+        return 0;
+      }
+    EOS
+    system ENV.cxx, "-std=c++20", "-L#{lib}", "-I#{include}", "test.cpp", "-o", "test", "-ldpp"
+    assert_equal "Invalid token.", shell_output("./test").strip
+  end
+end
diff --git a/3rdPartyBinaries/libssl-1_1-x64.dll b/3rdPartyBinaries/libssl-1_1-x64.dll
index 139496c89f..b484de93ff 100644
Binary files a/3rdPartyBinaries/libssl-1_1-x64.dll and b/3rdPartyBinaries/libssl-1_1-x64.dll differ
diff --git a/3rdPartyBinaries/onnxruntime-osx-arm64-1.23.2.tgz b/3rdPartyBinaries/onnxruntime-osx-arm64-1.23.2.tgz
new file mode 100644
index 0000000000..a18526a0f5
Binary files /dev/null and b/3rdPartyBinaries/onnxruntime-osx-arm64-1.23.2.tgz differ
diff --git a/3rdPartyBinaries/onnxruntime-osx-x86_64-1.23.2.tgz b/3rdPartyBinaries/onnxruntime-osx-x86_64-1.23.2.tgz
new file mode 100644
index 0000000000..529c66ca0a
Binary files /dev/null and b/3rdPartyBinaries/onnxruntime-osx-x86_64-1.23.2.tgz differ
diff --git a/3rdPartyBinaries/onnxruntime.dll b/3rdPartyBinaries/onnxruntime.dll
new file mode 100644
index 0000000000..1bf52798da
Binary files /dev/null and b/3rdPartyBinaries/onnxruntime.dll differ
diff --git a/3rdPartyBinaries/onnxruntime.lib b/3rdPartyBinaries/onnxruntime.lib
new file mode 100644
index 0000000000..1dfac2ebc2
Binary files /dev/null and b/3rdPartyBinaries/onnxruntime.lib differ
diff --git a/3rdPartyBinaries/onnxruntime_providers_shared.dll b/3rdPartyBinaries/onnxruntime_providers_shared.dll
new file mode 100644
index 0000000000..cbb87898f7
Binary files /dev/null and b/3rdPartyBinaries/onnxruntime_providers_shared.dll differ
diff --git a/3rdPartyBinaries/onnxruntime_providers_shared.lib b/3rdPartyBinaries/onnxruntime_providers_shared.lib
new file mode 100644
index 0000000000..d1dfd2b3cf
Binary files /dev/null and b/3rdPartyBinaries/onnxruntime_providers_shared.lib differ
diff --git a/3rdPartyBinaries/opencv_world4120.lib b/3rdPartyBinaries/opencv_world4120.lib
new file mode 100644
index 0000000000..a30738b3db
Binary files /dev/null and b/3rdPartyBinaries/opencv_world4120.lib differ
diff --git a/3rdPartyBinaries/opencv_world4120.zip b/3rdPartyBinaries/opencv_world4120.zip
new file mode 100644
index 0000000000..8cebd7aaed
Binary files /dev/null and b/3rdPartyBinaries/opencv_world4120.zip differ
diff --git a/3rdPartyBinaries/opencv_world4120d.lib b/3rdPartyBinaries/opencv_world4120d.lib
new file mode 100644
index 0000000000..7894b2a691
Binary files /dev/null and b/3rdPartyBinaries/opencv_world4120d.lib differ
diff --git a/3rdPartyBinaries/opencv_world4120d.zip b/3rdPartyBinaries/opencv_world4120d.zip
new file mode 100644
index 0000000000..09edc243d7
Binary files /dev/null and b/3rdPartyBinaries/opencv_world4120d.zip differ
diff --git a/3rdPartyBinaries/opencv_world460.dll b/3rdPartyBinaries/opencv_world460.dll
deleted file mode 100644
index bca44e4ecb..0000000000
Binary files a/3rdPartyBinaries/opencv_world460.dll and /dev/null differ
diff --git a/3rdPartyBinaries/opencv_world460.lib b/3rdPartyBinaries/opencv_world460.lib
deleted file mode 100644
index 13cf98ea70..0000000000
Binary files a/3rdPartyBinaries/opencv_world460.lib and /dev/null differ
diff --git a/3rdPartyBinaries/opencv_world460d.lib b/3rdPartyBinaries/opencv_world460d.lib
deleted file mode 100644
index cd2f425523..0000000000
Binary files a/3rdPartyBinaries/opencv_world460d.lib and /dev/null differ
diff --git a/3rdPartyBinaries/opencv_world460d.zip b/3rdPartyBinaries/opencv_world460d.zip
deleted file mode 100644
index 092cf2b076..0000000000
Binary files a/3rdPartyBinaries/opencv_world460d.zip and /dev/null differ
diff --git a/3rdPartyBinaries/tesseractPA.dll b/3rdPartyBinaries/tesseractPA.dll
index fc9ce8b981..2ed2029b32 100644
Binary files a/3rdPartyBinaries/tesseractPA.dll and b/3rdPartyBinaries/tesseractPA.dll differ
diff --git a/3rdPartyBinaries/tesseractPA.lib b/3rdPartyBinaries/tesseractPA.lib
index d68d86348a..ca8d05faf9 100644
Binary files a/3rdPartyBinaries/tesseractPA.lib and b/3rdPartyBinaries/tesseractPA.lib differ
diff --git a/AGENTS.md b/AGENTS.md
new file mode 100644
index 0000000000..3fc0e4cd52
--- /dev/null
+++ b/AGENTS.md
@@ -0,0 +1,172 @@
+# AGENTS.md
+
+Guidance for AI coding agents working in this repository.
+For how to write a new automation program, see also `CodingAgentContext/AutomationProgramPatterns.md`.
+
+## What this project is
+
+This is the Pokémon Automation Computer Control (CC) program. It is an open-source
+application that automates Pokémon (and other) games on Nintendo Switch using microcontroller
+controller hardware, computer vision, OCR, and machine learning.
+
+## Repo layout
+
+- `Common/` — shared code. `Common/Cpp` is Qt-free standard C++ (the foundation of the
+  project; keep it Qt-free except documented seams). `Common/Qt` holds Qt-specific helpers.
+- `SerialPrograms/` — the application: `SerialPrograms/Source` (code), `SerialPrograms/cmake`
+  (CMake modules), `SerialPrograms/bin` (build output).
+- `Packages/` — **not part of this repo**: the separate `PokemonAutomation/Packages` repo
+  (downloadable resources in `Packages/DownloadedResources`, firmware, tooling). CMake clones
+  it into `Packages/` automatically at configure time if it is missing (`clone_packages`).
+- `3rdParty/`, `3rdParty-Core/` — vendored dependencies (compiled as external includes; MSVC
+  builds use `/external:W0`).
+- `CodingAgentContext/` — agent-facing notes on writing new automation programs.
+- Test images/fixtures live in a **separate repo**: `PokemonAutomation/CommandLineTests`.
+  At test time it is checked out next to the program; `GlobalAutoPaths` detects the
+  `CommandLineTests/` (or `UnitTestResources/`) folder and loads test files relative to it.
+- Documentation lives in a **separate repo**: `PokemonAutomation/pokemonautomation.github.io`
+  (MkDocs, published at https://pokemonautomation.github.io). `docs/Developer/` is the
+  developer guide (build setup, button commands, image matching, parallel routines, tests).
+  `docs/Programs/<Game>/<Program>.md` is each program's user page; the `.html` path in a
+  program's descriptor (e.g. `Programs/NintendoSwitch/PreventSleep.html`) names that file.
+  Clone it next to this repo to read it locally, check it before writing new guidance here,
+  and update a program's page there when a change alters what its users do.
+
+## Programs vs. infra
+
+The codebase splits into **programs** (individual automation programs) and **infra**
+(everything else: `CommonFramework`, `CommonTools`, `Common/Cpp`, `Controllers`, ...).
+Programs live in:
+
+- `SerialPrograms/Source/VideoGames/`
+- `SerialPrograms/Source/Pokemon/` (not yet moved into `VideoGames/`)
+- `SerialPrograms/Source/PokemonBDSP/` (not yet moved into `VideoGames/`)
+- Console-generic (non-game-specific) programs under `SerialPrograms/Source/NintendoSwitch/`:
+  its `Inference/`, `Options/`, `Programs/`, and `DevPrograms/` subfolders are programs;
+  the rest of that folder (`Commands/`, `Controllers/`, `Framework/`, console state/handles, ...)
+  is infra.
+
+Infra has a much higher quality standard than programs because of its large blast radius,
+and it requires strict human review. New AI-generated code must meet that bar; filler and
+low-quality "AI slop" are not acceptable.
+
+## Hard rules
+
+### Qt
+
+The long-term goal is to reduce the Qt footprint in preparation for a future migration away
+from Qt.
+
+- Qt is **forbidden** in program code (the three program folders above).
+- Qt is **strongly discouraged** in non-UI infra. Use it only when the alternative is a lot
+  of new code or would pull in a library the project doesn't already use.
+- Qt is generally **unavoidable** for UI code (widgets, panels, windows).
+
+### Filesystem
+
+Direct use of `std::filesystem` is **banned**: its native encoding is ambiguous (UTF-8 bytes
+on Linux, UTF-16 on Windows), while this project defines `char*`/`std::string` as UTF-8.
+Use the wrappers in `Common/Cpp/Filesystem/` instead: `Filesystem::` functions, `Path`,
+`FileIO`, `file_to_string()`. Rationale is documented in the header comment of
+`Common/Cpp/Filesystem/FilePath.h`.
+
+### Concurrency (Qt thread-adoption bug on Windows)
+
+Qt > 6.8.3 on Windows can hang when raw `std::thread`s coexist with Qt event loops
+("thread adoption" bug: QTBUG-131892, see project issue #570; see
+`Common/Cpp/Concurrency/Qt6.9ThreadBugWorkaround.h`). Therefore:
+
+- Don't use `std::thread` manually, and don't use `Common/Cpp/Concurrency/Thread`
+  directly either: `Thread` leaks the thread (a consequence of the Qt adoption-bug
+  workaround), so only the thread pool implementations are allowed to use it. Pools
+  reuse their worker threads, which keeps the leaked-thread count down to the peak
+  number of concurrent tasks (the pools still leak all of their threads on exit).
+  Run all background work on the app-level pools in
+  `SerialPrograms/Source/CommonFramework/Tools/GlobalThreadPools.h`.
+- Don't use `std::mutex` / `std::condition_variable` directly. Use the
+  `PokemonAutomation::Mutex` / `ConditionVariable` wrappers in `Common/Cpp/Concurrency/`.
+- `std::async` is banned (it may spawn a new thread under the hood).
+
+Some legacy files still use `std::thread`/`std::mutex` directly; don't add new uses, and
+migrate a file to the wrappers when you're already touching it and it's straightforward.
+
+### UI / state separation
+
+- UI state lives in a *session* (or `UiState`) class — e.g. `PanelSession` (a program
+  instance), `VideoOverlaySession`, or the `UiState<...>` option classes. These hold **all**
+  program data and logic and are fully thread-safe/asynchronous.
+- The actual UI lives in `Widget` classes that attach to the session. The session always
+  outlives the UI. Keep state in the session; widgets never own program state.
+- The indirection is `Common/Cpp/UiWrapper.h`: state classes inherit `UiState<T>` and the UI
+  is produced by a factory registered in `UiState<T>::m_ui_factory` (called via
+  `make_ui_component()`). This lets state compile and run with no UI at all (headless) and
+  keeps the door open for migrating to a different UI library.
+
+## Building and testing
+
+- CMake >= 3.24, C++23. Dependencies: Qt 6.10.2 (with `qtmultimedia` + `qtserialport`),
+  OpenCV 4, ONNX Runtime, Tesseract. Linux CI builds with Ninja; Windows with MSVC.
+- Configure/build from `SerialPrograms/` with the CMake presets in
+  `SerialPrograms/CMakePresets.json` (Ninja, C++23, automoc on), e.g. `cmake --preset default`
+  then `cmake --build --preset default`; platform-specific setup is documented in
+  `SerialPrograms/BuildInstructions/`.
+- `-DPA_CORE_ONLY=ON` builds only the GUI-free core (no Qt/OpenCV) — a quick way to
+  compile-check `Common/Cpp` changes.
+- New source files must be added to the explicit list in
+  `SerialPrograms/cmake/SourceFiles.cmake`; they are not picked up automatically.
+- MSVC builds pass `/W4 /WX` — **every compiler warning is an error** (clang-cl, GCC, and
+  clang also build in CI with strict flags).
+- No tab characters in source (CI has a "Check for Tabs" job).
+- Run the test suite by launching the built binary with `--command-line-test-mode` from
+  `SerialPrograms/bin` (no GUI). Requirements (see the test steps in
+  `.github/workflows/cpp-ci-serial-programs-base.yml` and `SerialPrograms/Source/Tests/CommandLineTests.h`):
+  - `PokemonAutomation/CommandLineTests` checked out next to the program (test images).
+  - `PaddleOCRDetection` resources unzipped from `Packages/DownloadedResources/` into the
+    program's downloaded-resources folder (`SerialPrograms/bin/DownloadedResources/` on
+    Windows/Linux; `~/Library/Application Support/SerialPrograms/DownloadedResources` on macOS).
+  - Headless Linux: `QT_QPA_PLATFORM=offscreen` and
+    `TESSDATA_PREFIX=<bin>/Resources/Tesseract`.
+- Test framework: test classes derive `UnitTest` (`Common/Cpp/TestRunners/UnitTest.h`) and are
+  collected via per-module `add_tests(UnitTestDatabase&)` — see
+  `SerialPrograms/Source/Tests/CommandLineTests.h`.
+
+## Conventions
+
+- `char*` / `std::string` are UTF-8. Use `Common/Cpp/Strings/` (`StringTools`, `Unicode`)
+  for text processing.
+- File headers: `/*  Title \n * \n *  From: https://github.com/PokemonAutomation/ \n * \n */`;
+  include guards are `PokemonAutomation_<Name>_H`.
+- **Line endings: the codebase is overwhelmingly CRLF** (there is no `.gitattributes`
+  normalization; `* -text`). Preserve each file's existing line endings when editing — do
+  not re-normalize a file to LF, it produces a whole-file diff.
+- Errors/cancellation: use `CommonFramework/Exceptions/` (`OperationFailedException`,
+  `ProgramFinishedException`, ... — typically via `throw_and_log`) and
+  `Common/Cpp/CancellableScope.h` (`CancellableScope::throw_if_cancelled()` in loops).
+- File paths: use the macros from `CommonFramework/GlobalAutoPaths.h` (`RESOURCE_PATH()`,
+  `USER_FILE_PATH()`, `DOWNLOADED_RESOURCE_PATH()`, ...) rather than hardcoding locations.
+
+### Control flow formatting
+
+- Put the opening brace on the same line as `if`, `else if`, `for`, `while`, or `switch`,
+  with **no space between the closing `)` and `{`**: `if (condition){`, not `if (condition) {`.
+  Write `}else if (condition){` and `}else{` without spaces around `else`'s braces.
+- Always use braces and multiline bodies for conditionals and loops, even for a single
+  statement. Do not write `if (condition) return;` or `if (condition){ return; }`.
+  Put the body on its own indented line and the closing brace on its own line (except when
+  followed by `else` / `else if`). The same rule applies to one-statement loop bodies.
+- Follow these rules in new or edited control flow even when nearby legacy code differs.
+  Avoid reformatting unrelated code.
+
+```cpp
+if (condition){
+    do_something();
+}else if (other_condition){
+    do_something_else();
+}else{
+    handle_default();
+}
+
+for (size_t i = 0; i < count; i++){
+    process(i);
+}
+```
\ No newline at end of file
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 0000000000..86be98f316
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,175 @@
+# Contributing to the Pokemon Automation Codebase
+
+Thanks for your interest in helping! This guide explains how to get help and send a change.
+For coding guidelines — how to build and test, and the project's hard rules (Qt, filesystem,
+threading, line endings, ...) — see [AGENTS.md](AGENTS.md). It was written for AI coding
+agents, but it applies to human contributors too.
+
+We welcome bug fixes, new programs, and new features to existing programs.
+
+## Getting Help
+
+Ask questions on our [Discord server](https://discord.gg/cQ4gWxN). Discussion about the
+program is usually in #automation-chat and #automation-help.
+
+## By Kind of Change
+
+- **New program:** pitch it in Discord first. A new program is a lot of code the
+  maintainers have to live with, so we want to agree on the idea and its scope before it
+  is written. Follow the patterns in `CodingAgentContext/AutomationProgramPatterns.md`.
+- **Improvement to an existing program:** usually fine to just send as a PR.
+- **Bug fix or improvement in shared code** (inference, navigation, controllers,
+  `CommonFramework`, `Common/Cpp`, ...): shared code has a much higher quality bar because
+  of its blast radius. Check which programs use the code you are touching, and make sure
+  the change is correct for all of them.
+- **Big changes or refactors:** pitch them in Discord first, and keep them out of
+  behavior-change PRs — no unprompted refactoring of infra inside a fix or feature.
+
+## Size and Shape
+
+- One fix or one feature per PR; keep diffs small.
+- Moves and refactors go in their own PR, separate from behavior changes.
+- We prefer smaller PRs over bigger PRs.
+
+## Testing
+
+- CI builds on Windows (clang-cl) with `/W4 /WX` — every compiler warning is an error — in
+  addition to Linux/clang. Warnings that a macOS or Linux build does not report are caught
+  there, so assume the strictest flags apply.
+- Unit tests are welcome for logic changes (the test suite runs in CI and in the GUI's
+  "Unit Test Runner" program).
+- Tests are strongly recommended for new inference classes. Include images that should
+  be detected and, where practical, images that should not be detected.
+- Tests are especially important when changing an existing inference class to fix a
+  detection problem. You likely already have an image that demonstrates the failure.
+  Add it as a regression test that fails before the fix and passes afterward, so the
+  same problem can be caught if it returns. Run the existing tests for the affected
+  inference code to check that the change preserves other expected behavior.
+- Test images are stored in the separate
+  [CommandLineTests repository](https://github.com/PokemonAutomation/CommandLineTests).
+  Add images there and the corresponding test code and test cases in this repository.
+- If you also tested on real hardware, say so in the PR description: what you ran, and for how
+  long.
+
+## Limits and Response Time
+
+- Our devs work on the repo in their free time, so reviews can take a week or more — don't
+  open more PRs while waiting on one.
+- New contributors are asked to have at most two PRs open at any time; **drafts count**
+  toward that limit. Work that is stacked on not-yet-merged work can live in your fork
+  until it is ready.
+- The limit is for ramping up: It lifts once you become a regular and trusted contributor.
+
+## Using AI
+
+Due to the advance of AI technology, many GitHub repo maintainers are overwhelmed with AI
+generated PRs. We have the following policy as a response:
+
+- If you use AI, you need to understand what the AI writes and can defend its decisions.
+- Run and test the change yourself before sending it.
+- Don't let an agent open PRs or reply to reviews on your behalf.
+- When sending a pull request (PR), don't let AI generate a long description. Write your
+  own PR description or edit an AI generated one. Keep it short, easy to read and on the
+  point, and mention that a tool helped and which one.
+- [AGENTS.md](AGENTS.md) contains the project's build/test steps and hard rules, so coding
+  agents follow the same rules as human contributors.
+
+## Coding Conventions and Program Patterns
+
+Follow the conventions of nearby code. The notes below cover formatting and the recurring
+patterns used by automation programs; the hard rules in [AGENTS.md](AGENTS.md) also apply.
+For background, see the wiki's [development knowledge guide](https://pokemonautomation.github.io/Developer/Knowledge.html)
+and [Git contribution guide](https://pokemonautomation.github.io/Developer/Git.html).
+
+### Formatting and Naming
+
+- Use four spaces for indentation, no tabs, and preserve the file's existing line endings
+  (usually CRLF). Avoid reformatting unrelated code.
+- Always use braces and multiline bodies for conditionals and loops, even for a single
+  statement; do not write single-line `if` statements, with or without braces. Do not use
+  `goto`. Put opening braces on the same line with no space between `)` and `{`, as in
+  `if (condition){`; write `}else{` and `}else if (condition){`. See the explicit
+  [control flow formatting rules](AGENTS.md#control-flow-formatting).
+- Types generally use `PascalCase`; functions and local variables use `snake_case`.
+  Ordinary member variables generally use an `m_` prefix. Program option members use
+  `UPPER_SNAKE_CASE`, such as `NUM_ROUNDS` or `GO_HOME_WHEN_DONE`, even when mutable.
+- Game files use names such as `PokemonLZA_RestaurantFarmer.h` and `.cpp`, under the
+  corresponding game namespace inside `PokemonAutomation::NintendoSwitch`. Follow the
+  existing file-header and `PokemonAutomation_<Name>_H` include-guard conventions.
+- Follow [Include Sort Order](CodingAgentContext/IncludeOrder.md): library and framework
+  headers precede game headers, and same-folder headers come last. A `.cpp` file's own
+  header is normally last. The guide covers exceptions, including panel lists whose
+  includes follow registration order. Include what you use and remove unused includes.
+
+### Program Structure and Reuse
+
+- A typical single-console program has a `ProgramName_Descriptor` derived from
+  `SingleSwitchProgramDescriptor` and a `ProgramName` derived from
+  `SingleSwitchProgramInstance`, with `using Descriptor = ProgramName_Descriptor`.
+  The descriptor holds metadata and creates statistics; the instance holds options and
+  implements `program(env, context)`. Use the corresponding multi-console framework when
+  needed. See [Automation Program Patterns](CodingAgentContext/AutomationProgramPatterns.md)
+  for a basic scaffold, and current programs for the APIs in use.
+- Keep the main loop readable by extracting meaningful steps into helpers. Reuse existing
+  navigation, battle, box, and inference routines before adding another implementation.
+  Helpers used by several programs belong in a shared game module. Document their starting
+  screen, ending screen, return values, and failure behavior so callers can compose them.
+- Keep screen recognition in `Inference/`, reusable option definitions in `Options/`, and
+  program orchestration in `Programs/`. A screen detector typically implements
+  `StaticScreenDetector`; a watcher, often using `DetectorToFinder`, adds detection over
+  time. Use existing image, OCR, and overlay helpers rather than embedding detection code
+  in the main program loop.
+- Program code must remain Qt-free. Use the option and session abstractions instead of
+  creating widgets or storing program state in UI objects. Follow the UI/state separation
+  rules in [AGENTS.md](AGENTS.md) when working on shared infrastructure.
+- Add new source and header files to
+  [SourceFiles.cmake](SerialPrograms/cmake/SourceFiles.cmake). Register a new program in its
+  game's `*_Panels.cpp`; current single-console panels use
+  `make_SingleSwitchProgram<ProgramName>()`.
+
+### Options, Statistics, and Notifications
+
+- Use the existing option types, initialize them in the constructor, and register them with
+  `PA_ADD_OPTION`. Give options clear labels, useful defaults, and bounds where applicable.
+  Choose `LockMode` deliberately: unlock an option during a run only if the program safely
+  handles changes. When several decisions depend on one value, read it once for that step.
+- Use the descriptor's `StatsTracker` and its atomic counters for progress and errors;
+  call `env.update_stats()` at meaningful progress points. Use `env.log()` or the console
+  logger for messages that help explain the current action or a failure.
+- Use the framework's notification options and send helpers for status, completion, and
+  errors. Reuse options such as `GoHomeWhenDoneOption` and `DeferredStopButtonOption` where
+  appropriate. A deferred stop should be checked at a safe boundary, with its
+  `ResetOnExit` guard so the button state is reset even if the run throws.
+
+### Controller Commands and Feedback
+
+- Send input through the controller context and existing `pbf_*` / `ssf_*` helpers.
+  Prefer explicit durations such as `160ms` or `10s` so the units are clear.
+  Commands are queued: use `context.wait_for_all_requests()` before making a decision that depends on those commands having finished.
+- For programs with feedback, use detectors and `wait_until()` / `run_until()` to recognize
+  game states and drive transitions. Handle both detected states and the no-detection
+  result. Keep delays needed for animation or movement, and explain unusual timings or
+  game-specific assumptions.
+- Give waits and recovery attempts a timeout or retry limit, and report failure when it
+  is reached. Use cancellable waits such as `context.wait_for()`; CPU-only loops that do
+  not otherwise reach a cancellation point must check `throw_if_cancelled()`. Follow
+  [AGENTS.md](AGENTS.md) for thread pools and synchronization.
+
+### Errors and Recovery
+
+- Use the project's exceptions for failures. For an unexpected game state, use
+  `OperationFailedException` or `OperationFailedExceptionWithScreenshot` as appropriate,
+  with a message describing the action and what failed. Preserve screenshots or other
+  diagnostic context when useful.
+- Recover from `OperationFailedException` only where there is a concrete recovery action,
+  such as returning to a known screen and retrying. Bound repeated recovery attempts and
+  propagate the failure when recovery is exhausted. If a catch only records statistics or
+  diagnostics, rethrow afterward. Let cancellation and `ProgramFinishedException` propagate;
+  do not swallow them in a general retry loop.
+- Before sending a change, remove obsolete commented-out code and temporary debugging
+  output. Explain non-obvious game behavior and helper contracts in comments.
+
+## License
+
+By contributing, you agree that your code is released under the MIT license, unless the
+file says otherwise. See [README.md](README.md) for the dependency license rules.
diff --git a/Cleanup.cmd b/Cleanup.cmd
index b8b14980e5..f76cb710ad 100644
--- a/Cleanup.cmd
+++ b/Cleanup.cmd
@@ -1,17 +1,8 @@
 
+rd /s /q "build"
 rd /s /q "..\build-SerialPrograms*"
 
-::cd %~dp0\ClientProject
-::@call Cleanup.cmd
-
-cd %~dp0\NativePrograms
-@call Cleanup.cmd
-
-cd %~dp0\HexGenerator
-@call Cleanup.cmd
-
-cd %~dp0\HexGeneratorLauncher
-@call Cleanup.cmd
+del 3rdPartyBinaries\opencv_world460d.dll
 
 cd %~dp0\SerialPrograms
 @call Cleanup.cmd
@@ -28,3 +19,7 @@ rd /s /q "..\build-SerialPrograms-Desktop_Qt_6_3_2_MSVC2019_64bit-Debug"
 rd /s /q "..\build-SerialPrograms-Desktop_Qt_6_3_2_MSVC2019_64bit-RelWithDebInfo"
 rd /s /q "..\build-SerialPrograms-Desktop_Qt_6_4_0_MSVC2019_64bit-Debug"
 rd /s /q "..\build-SerialPrograms-Desktop_Qt_6_4_0_MSVC2019_64bit-RelWithDebInfo"
+rd /s /q "..\build-SerialPrograms-Desktop_Qt_6_5_2_MSVC2019_64bit-Debug"
+rd /s /q "..\build-SerialPrograms-Desktop_Qt_6_5_2_MSVC2019_64bit-RelWithDebInfo"
+rd /s /q "..\build-SerialPrograms-Desktop_Qt_6_5_3_MSVC2019_64bit-Debug"
+rd /s /q "..\build-SerialPrograms-Desktop_Qt_6_5_3_MSVC2019_64bit-RelWithDebInfo"
diff --git a/ClientSource/Common.mk b/ClientSource/Common.mk
deleted file mode 100644
index 61b0ba785b..0000000000
--- a/ClientSource/Common.mk
+++ /dev/null
@@ -1,34 +0,0 @@
-SOURCE_ROOT := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
-OUTPUT_ROOT := $(SOURCE_ROOT)/../Linux
-
-CC=g++
-
-CFLAGS := -I $(SOURCE_ROOT) -std=c++17 -fno-rtti -Wall -O2 -g -ggdb
-CFLAGS += -lpthread
-
-
-dump:
-	echo $(SOURCES)
-
-clean:
-	rm -r $(OUTPUT_ROOT)
-
-all: device-logger
-
-.DEFAULT_GOAL := all
-
-
-CFLAGS_DEVICELOGGER := $(CFLAGS)
-OUTPUT_DEVICELOGGER := $(OUTPUT_ROOT)/device-logger
--include $(addprefix $(OUTPUT_DEVICELOGGER)/, $(SOURCES:.cpp=.d))
-$(OUTPUT_DEVICELOGGER)/%.o: $(SOURCE_ROOT)/%.cpp
-	mkdir -p $(shell dirname $@)
-	$(CC) $< $(CFLAGS_DEVICELOGGER) -c  -o $@
-	$(CC) $< $(CFLAGS_DEVICELOGGER) -MM -MT $@ > $(@:.o=.d)
-	@cp -f $(@:.o=.d) $(@:.o=.d.tmp)
-	@sed -e 's/.*://' -e 's/\\$$//' < $(@:.o=.d.tmp) | fmt -1 | \
-	 sed -e 's/^ *//' -e 's/$$/:/' >> $(@:.o=.d)
-	@rm -f $(@:.o=.d.tmp)
-device-logger: $(addprefix $(OUTPUT_DEVICELOGGER)/, $(SOURCES:.cpp=.o))
-
-
diff --git a/ClientSource/Connection/BotBase.cpp b/ClientSource/Connection/BotBase.cpp
deleted file mode 100644
index 3277bb491c..0000000000
--- a/ClientSource/Connection/BotBase.cpp
+++ /dev/null
@@ -1,71 +0,0 @@
-/*  Pokemon Automation Bot-Base Interface
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "BotBaseMessage.h"
-#include "BotBase.h"
-
-//#include <iostream>
-//using std::cout;
-//using std::endl;
-
-namespace PokemonAutomation{
-
-
-BotBaseContext::BotBaseContext(BotBase& botbase)
-    : m_botbase(botbase)
-{}
-BotBaseContext::BotBaseContext(CancellableScope& parent, BotBase& botbase)
-    : m_botbase(botbase)
-{
-    attach(parent);
-}
-BotBaseContext::~BotBaseContext(){
-    detach();
-}
-
-void BotBaseContext::wait_for_all_requests() const{
-    m_lifetime_sanitizer.check_usage();
-    m_botbase.wait_for_all_requests(this);
-}
-void BotBaseContext::cancel_now(){
-    m_lifetime_sanitizer.check_usage();
-    CancellableScope::cancel(nullptr);
-    m_botbase.stop_all_commands();
-}
-void BotBaseContext::cancel_lazy(){
-    m_lifetime_sanitizer.check_usage();
-    CancellableScope::cancel(nullptr);
-    m_botbase.next_command_interrupt();
-}
-
-bool BotBaseContext::cancel(std::exception_ptr exception) noexcept{
-    m_lifetime_sanitizer.check_usage();
-    if (CancellableScope::cancel(std::move(exception))){
-        return true;
-    }
-    try{
-        m_botbase.stop_all_commands();
-    }catch (...){}
-    return false;
-}
-
-bool BotBaseContext::try_issue_request(const BotBaseRequest& request) const{
-    m_lifetime_sanitizer.check_usage();
-    return m_botbase.try_issue_request(request, this);
-}
-void BotBaseContext::issue_request(const BotBaseRequest& request) const{
-    m_lifetime_sanitizer.check_usage();
-    m_botbase.issue_request(request, this);
-}
-
-BotBaseMessage BotBaseContext::issue_request_and_wait(const BotBaseRequest& request) const{
-    m_lifetime_sanitizer.check_usage();
-    return m_botbase.issue_request_and_wait(request, this);
-}
-
-
-
-}
diff --git a/ClientSource/Connection/BotBase.h b/ClientSource/Connection/BotBase.h
deleted file mode 100644
index 97beb2d954..0000000000
--- a/ClientSource/Connection/BotBase.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/*  Pokemon Automation Bot-Base Interface
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_AbstractBotBase_H
-#define PokemonAutomation_AbstractBotBase_H
-
-#include "Common/Cpp/CancellableScope.h"
-#include "Common/Cpp/LifetimeSanitizer.h"
-
-namespace PokemonAutomation{
-
-class Logger;
-struct BotBaseMessage;
-class BotBaseRequest;
-
-
-
-class BotBase{
-public:
-    enum class State{
-        RUNNING,
-        STOPPING,
-        STOPPED,
-//        ERROR,
-    };
-
-public:
-    virtual ~BotBase() = default;
-
-    virtual Logger& logger() = 0;
-    virtual State state() const = 0;
-
-    //  Waits for all pending requests to finish.
-    virtual void wait_for_all_requests(const Cancellable* cancelled = nullptr) = 0;
-
-    //  Stop all pending commands. This wipes the command queue on both sides
-    //  and stops any currently executing command.
-    virtual bool try_stop_all_commands() = 0;
-    virtual void stop_all_commands() = 0;
-
-    //  Tell the device that the next command should replace the command queue.
-    //
-    //  So once the next command is issued, it will stop all ongoing commands
-    //  and run the new command instead.
-    //
-    //  Once this function is called, all commands before it are no longer
-    //  guaranteed to finish even if no command interrupts it.
-    virtual bool try_next_command_interrupt() = 0;
-    virtual void next_command_interrupt() = 0;
-
-public:
-    virtual bool try_issue_request(
-        const BotBaseRequest& request,
-        const Cancellable* cancelled = nullptr
-    ) = 0;
-    virtual void issue_request(
-        const BotBaseRequest& request,
-        const Cancellable* cancelled = nullptr
-    ) = 0;
-    virtual BotBaseMessage issue_request_and_wait(
-        const BotBaseRequest& request,
-        const Cancellable* cancelled = nullptr
-    ) = 0;
-
-};
-
-
-
-//  A wrapper for BotBase that allows for asynchronous cancelling.
-class BotBaseContext final : public CancellableScope{
-public:
-    BotBaseContext(BotBase& botbase);
-    BotBaseContext(CancellableScope& parent, BotBase& botbase);
-    virtual ~BotBaseContext();
-
-
-    void wait_for_all_requests() const;
-
-    //  Don't use this unless you really need to.
-    BotBase& botbase() const{ return m_botbase; }
-
-    //  Stop all commands in this context now.
-    void cancel_now();
-
-    //  Stop the commands in this context, but do it lazily.
-    //  Still will stop new commands from being issued to the device,
-    //  and will tell the device that the next command that is issued
-    //  should replace the command queue.
-    //  This cancel is used when you need continuity from an ongoing
-    //  sequence.
-    void cancel_lazy();
-
-
-    virtual bool cancel(std::exception_ptr exception) noexcept override;
-
-
-public:
-    bool try_issue_request(const BotBaseRequest& request) const;
-    void issue_request(const BotBaseRequest& request) const;
-    BotBaseMessage issue_request_and_wait(const BotBaseRequest& request) const;
-
-
-private:
-    BotBase& m_botbase;
-    LifetimeSanitizer m_lifetime_sanitizer;
-};
-
-
-
-
-
-}
-
-
-#endif
-
diff --git a/ClientSource/Connection/BotBaseMessage.h b/ClientSource/Connection/BotBaseMessage.h
deleted file mode 100644
index 91e91f61e7..0000000000
--- a/ClientSource/Connection/BotBaseMessage.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*  Bot-Base Message
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_BotBaseMessage_H
-#define PokemonAutomation_BotBaseMessage_H
-
-#include <stdint.h>
-#include <cstring>
-#include <string>
-#include "Common/Cpp/Exceptions.h"
-#include "Common/Cpp/LifetimeSanitizer.h"
-
-namespace PokemonAutomation{
-
-
-struct BotBaseMessage{
-    uint8_t type;
-    std::string body;
-
-    LifetimeSanitizer sanitizer;
-
-    BotBaseMessage() = default;
-    BotBaseMessage(uint8_t p_type, std::string p_body)
-        : type(p_type)
-        , body(std::move(p_body))
-    {}
-
-    template <typename Params>
-    BotBaseMessage(uint8_t p_type, const Params& params)
-        : type(p_type)
-        , body((char*)&params, sizeof(params))
-    {}
-
-    template <uint8_t MessageType, typename MessageBody>
-    void convert(Logger& logger, MessageBody& params) const{
-        sanitizer.check_usage();
-        if (type != MessageType){
-            throw SerialProtocolException(
-                logger, PA_CURRENT_FUNCTION,
-                "Received incorrect response type: " + std::to_string(type)
-            );
-        }
-        if (body.size() != sizeof(MessageBody)){
-            throw SerialProtocolException(
-                logger, PA_CURRENT_FUNCTION,
-                "Received incorrect response size: " + std::to_string(body.size())
-            );
-        }
-        memcpy(&params, body.c_str(), body.size());
-        sanitizer.check_usage();
-    }
-
-};
-
-class BotBaseRequest{
-public:
-    BotBaseRequest(bool is_command)
-        : m_is_command(is_command)
-    {}
-    virtual ~BotBaseRequest() = default;
-    virtual BotBaseMessage message() const = 0;
-
-    bool is_command() const{ return m_is_command; }
-
-private:
-    bool m_is_command;
-};
-
-
-
-
-
-
-}
-#endif
diff --git a/ClientSource/Connection/MessageLogger.cpp b/ClientSource/Connection/MessageLogger.cpp
deleted file mode 100644
index 30b4b10a08..0000000000
--- a/ClientSource/Connection/MessageLogger.cpp
+++ /dev/null
@@ -1,100 +0,0 @@
-/*  Message Logger
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Microcontroller/MessageProtocol.h"
-#include "Common/NintendoSwitch/NintendoSwitch_Protocol_PushButtons.h"
-#include "ClientSource/Libraries/MessageConverter.h"
-#include "BotBaseMessage.h"
-#include "MessageLogger.h"
-
-namespace PokemonAutomation{
-
-
-//void MessageLogger::log(std::string msg){
-//    log(msg);
-//}
-void MessageLogger::on_send(const BotBaseMessage& message, bool is_retransmit){
-    bool print = false;
-    do{
-        if (is_retransmit){
-            print = true;
-        }
-        if (PABB_MSG_IS_REQUEST(message.type)){
-            print = true;
-        }
-        if (PABB_MSG_IS_COMMAND(message.type)){
-            print = true;
-        }
-        if (message.type == PABB_MSG_REQUEST_CLOCK){
-            print = false;
-        }
-#if 0
-        if (message.type == PABB_MSG_CONTROLLER_STATE){
-            pabb_controller_state body;
-            memcpy(&body, message.body.c_str(), sizeof(pabb_controller_state));
-            print = body.ticks >= 5;
-        }
-#endif
-
-        if (m_log_everything.load(std::memory_order_relaxed)){
-            print = true;
-        }
-
-    }while (false);
-    if (!print){
-        return;
-    }
-    std::string str = message_to_string(message);
-    if (str.empty()){
-        return;
-    }
-    if (is_retransmit){
-        log("Re-Send: " + str);
-    }else{
-        log("Sending: " + str);
-    }
-}
-void MessageLogger::on_recv(const BotBaseMessage& message){
-    bool print = false;
-    do{
-        if (PABB_MSG_IS_ERROR(message.type)){
-            print = true;
-        }
-        if (PABB_MSG_IS_INFO(message.type)){
-            print = true;
-        }
-
-        if (m_log_everything.load(std::memory_order_relaxed)){
-            print = true;
-        }
-
-    }while (false);
-    if (!print){
-        return;
-    }
-    log("Receive: " + message_to_string(message));
-}
-
-
-
-SerialLogger::SerialLogger(Logger& logger, bool log_everything)
-    : MessageLogger(log_everything)
-    , m_logger(logger)
-{}
-void SerialLogger::log(const char* msg, Color color){
-    m_logger.log(msg, color);
-}
-void SerialLogger::log(const std::string& msg, Color color){
-    m_logger.log(msg, color);
-}
-void SerialLogger::log(std::string msg){
-    m_logger.log(msg, COLOR_DARKGREEN);
-}
-
-
-
-
-}
diff --git a/ClientSource/Connection/MessageLogger.h b/ClientSource/Connection/MessageLogger.h
deleted file mode 100644
index 8fb56f4640..0000000000
--- a/ClientSource/Connection/MessageLogger.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*  Message Logger
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_MessageLogger_H
-#define PokemonAutomation_MessageLogger_H
-
-#include <atomic>
-#include "Common/Cpp/AbstractLogger.h"
-#include "MessageSniffer.h"
-
-namespace PokemonAutomation{
-
-
-class MessageLogger : public MessageSniffer{
-public:
-    MessageLogger(bool log_everything = false)
-        : m_log_everything_owner(log_everything)
-        , m_log_everything(m_log_everything_owner)
-    {}
-    MessageLogger(std::atomic<bool>& log_everything)
-        : m_log_everything_owner(false)
-        , m_log_everything(log_everything)
-    {}
-
-
-//    virtual void log(std::string msg) override;
-    virtual void on_send(const BotBaseMessage& message, bool is_retransmit) override;
-    virtual void on_recv(const BotBaseMessage& message) override;
-
-private:
-    std::atomic<bool> m_log_everything_owner;
-    std::atomic<bool>& m_log_everything;
-};
-
-
-
-class SerialLogger : public Logger, public MessageLogger{
-public:
-    SerialLogger(Logger& logger, bool log_everything);
-
-    virtual void log(const char* msg, Color color = Color()) override;
-    virtual void log(const std::string& msg, Color color = Color()) override;
-    virtual void log(std::string msg) override;
-
-private:
-    Logger& m_logger;
-};
-
-
-
-
-}
-#endif
diff --git a/ClientSource/Connection/MessageSniffer.h b/ClientSource/Connection/MessageSniffer.h
deleted file mode 100644
index 19763b912a..0000000000
--- a/ClientSource/Connection/MessageSniffer.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*  Message Sniffer
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_MessageSniffer_H
-#define PokemonAutomation_MessageSniffer_H
-
-#include <string>
-#include "Common/Compiler.h"
-
-namespace PokemonAutomation{
-
-struct BotBaseMessage;
-
-
-class MessageSniffer{
-public:
-    virtual void log(std::string msg){}
-    virtual void on_send(const BotBaseMessage& message, bool is_retransmit){}
-    virtual void on_recv(const BotBaseMessage& message){}
-};
-
-
-
-}
-#endif
diff --git a/ClientSource/Connection/PABotBase.cpp b/ClientSource/Connection/PABotBase.cpp
deleted file mode 100644
index 70c1be6bb3..0000000000
--- a/ClientSource/Connection/PABotBase.cpp
+++ /dev/null
@@ -1,829 +0,0 @@
-/*  Pokemon Automation Bot Base
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- */
-
-#include <algorithm>
-#include "Common/Cpp/Exceptions.h"
-#include "Common/Cpp/PanicDump.h"
-#include "Common/Cpp/Concurrency/SpinPause.h"
-#include "Common/Microcontroller/MessageProtocol.h"
-#include "Common/Microcontroller/DeviceRoutines.h"
-#include "PABotBase.h"
-
-//#include <iostream>
-//using std::cout;
-//using std::endl;
-
-// #define DEBUG_STACK_TRACE
-
-#ifdef DEBUG_STACK_TRACE
-
-#if defined(__APPLE__)
-#include <execinfo.h>
-#include <stdio.h>
-#endif
-
-#endif // DEBUG_STACK_TRACE
-
-namespace PokemonAutomation{
-
-
-
-PABotBase::PABotBase(
-    Logger& logger,
-    std::unique_ptr<StreamConnection> connection,
-    MessageLogger* message_logger,
-    std::chrono::milliseconds retransmit_delay
-)
-    : PABotBaseConnection(logger, std::move(connection))
-    , m_logger(logger)
-    , m_send_seq(1)
-    , m_retransmit_delay(retransmit_delay)
-    , m_last_ack(current_time())
-    , m_state(State::RUNNING)
-    , m_error(false)
-    , m_retransmit_thread(run_with_catch, "PABotBase::retransmit_thread()", [this]{ retransmit_thread(); })
-{
-    set_sniffer(message_logger);
-}
-PABotBase::~PABotBase(){
-    stop();
-    while (m_state.load(std::memory_order_acquire) != State::STOPPED){
-        pause();
-    }
-}
-
-size_t PABotBase::inflight_requests(){
-    m_sanitizer.check_usage();
-
-    //  Must be called under m_state_lock.
-
-    size_t ret = m_pending_requests.size();
-    for (const auto& item : m_pending_commands){
-        if (item.second.state == AckState::NOT_ACKED){
-            ret++;
-        }
-    }
-    return ret;
-}
-
-void PABotBase::connect(){
-    m_sanitizer.check_usage();
-
-    pabb_MsgAckRequest response;
-    issue_request_and_wait(
-        Microcontroller::DeviceRequest_seqnum_reset(), nullptr
-    ).convert<PABB_MSG_ACK_REQUEST>(logger(), response);
-}
-void PABotBase::stop(){
-    m_sanitizer.check_usage();
-
-    //  Make sure only one thread can get in here.
-    State expected = State::RUNNING;
-    if (!m_state.compare_exchange_strong(expected, State::STOPPING)){
-        return;
-    }
-
-    //  Wake everyone up.
-    {
-        std::lock_guard<std::mutex> lg(m_sleep_lock);
-        m_cv.notify_all();
-    }
-    m_retransmit_thread.join();
-
-    {
-        SpinLockGuard lg(m_state_lock, "PABotBase::stop()");
-
-        //  Send a stop request, but don't wait for a response that we may never
-        //  receive.
-        pabb_MsgRequestStop params;
-        uint64_t seqnum = m_send_seq;
-        seqnum_t seqnum_s = (seqnum_t)seqnum;
-        memcpy(&params, &seqnum_s, sizeof(seqnum_t));
-//        try_issue_request<PABB_MSG_REQUEST_STOP>(params);
-//        m_state.store(State::STOPPING, std::memory_order_release);
-        BotBaseMessage stop_request(PABB_MSG_REQUEST_STOP, std::string((char*)&params, sizeof(params)));
-        send_message(stop_request, false);
-    }
-
-    //  Must call this to stop the receiver thread from making any more async
-    //  calls into this class which touch its fields.
-    safely_stop();
-
-    //  Now the receiver thread is dead. Nobody else is touching this class so
-    //  it is safe to destruct.
-    m_state.store(State::STOPPED, std::memory_order_release);
-}
-
-void PABotBase::wait_for_all_requests(const Cancellable* cancelled){
-    m_sanitizer.check_usage();
-
-    std::unique_lock<std::mutex> lg(m_sleep_lock);
-    m_logger.log("Waiting for all requests to finish...", COLOR_DARKGREEN);
-    while (true){
-        if (cancelled != nullptr && cancelled->cancelled()){
-            throw OperationCancelledException();
-        }
-        if (m_state.load(std::memory_order_acquire) != State::RUNNING){
-            throw InvalidConnectionStateException();
-        }
-        {
-            SpinLockGuard lg1(m_state_lock, "PABotBase::wait_for_all_requests()");
-#if 0
-            m_logger.log(
-                "Waiting for all requests to finish... (Requests: " +
-                std::to_string(m_pending_requests.size()) +
-                ", Commands: " + std::to_string(m_pending_commands.size()) + ")",
-                COLOR_DARKGREEN
-            );
-#endif
-            if (m_pending_requests.empty() && m_pending_commands.empty()){
-                break;
-            }
-        }
-        m_cv.wait(lg);
-    }
-
-//    m_logger.log("Waiting for all requests to finish... Completed.", COLOR_DARKGREEN);
-}
-
-bool PABotBase::try_stop_all_commands(){
-
-#ifdef DEBUG_STACK_TRACE
-    cout << __FILE__ << ":" << __LINE__ <<  " PABotBase::try_stop_all_commands()" << endl;
-    cout << "-----------------------------------------------------------------------------------------" << endl;
-#if defined(__APPLE__)
-    void* callstack[128];
-    int i, frames = backtrace(callstack, 128);
-    char** strs = backtrace_symbols(callstack, frames);
-    for (i = 0; i < frames; ++i) {
-        cout << strs[i] << endl;
-    }
-    free(strs);
-#endif
-    cout << "-----------------------------------------------------------------------------------------" << endl;
-#endif
-
-    m_sanitizer.check_usage();
-
-    uint64_t seqnum = try_issue_request(nullptr, Microcontroller::DeviceRequest_request_stop(), true, MAX_PENDING_REQUESTS);
-    if (seqnum != 0){
-        clear_all_active_commands(seqnum);
-        return true;
-    }else{
-        return false;
-    }
-}
-void PABotBase::stop_all_commands(){
-
-#ifdef DEBUG_STACK_TRACE
-    cout << __FILE__ << ":" << __LINE__ <<  " PABotBase::stop_all_commands()" << endl;
-    cout << "-----------------------------------------------------------------------------------------" << endl;
-#if defined(__APPLE__)
-    void* callstack[128];
-    int i, frames = backtrace(callstack, 128);
-    char** strs = backtrace_symbols(callstack, frames);
-    for (i = 0; i < frames; ++i) {
-        cout << strs[i] << endl;
-    }
-    free(strs);
-#endif
-    cout << "-----------------------------------------------------------------------------------------" << endl;
-#endif
-
-    m_sanitizer.check_usage();
-
-    uint64_t seqnum = issue_request(nullptr, Microcontroller::DeviceRequest_request_stop(), true);
-    clear_all_active_commands(seqnum);
-}
-bool PABotBase::try_next_command_interrupt(){
-    m_sanitizer.check_usage();
-
-    uint64_t seqnum = try_issue_request(nullptr, Microcontroller::DeviceRequest_next_command_interrupt(), true, MAX_PENDING_REQUESTS);
-    if (seqnum != 0){
-        clear_all_active_commands(seqnum);
-        return true;
-    }else{
-        return false;
-    }
-}
-void PABotBase::next_command_interrupt(){
-    m_sanitizer.check_usage();
-
-    uint64_t seqnum = issue_request(nullptr, Microcontroller::DeviceRequest_next_command_interrupt(), true);
-    clear_all_active_commands(seqnum);
-}
-void PABotBase::clear_all_active_commands(uint64_t seqnum){
-    m_sanitizer.check_usage();
-
-    //  Remove all commands at or before the specified seqnum.
-    std::lock_guard<std::mutex> lg0(m_sleep_lock);
-    SpinLockGuard lg1(m_state_lock, "PABotBase::next_command_interrupt()");
-    m_logger.log("Clearing all active commands... (Commands: " + std::to_string(m_pending_commands.size()) + ")", COLOR_DARKGREEN);
-
-//    if (m_pending_commands.size() > 2){
-//        cout << "asdf" << endl;
-//    }
-
-    if (!m_pending_commands.empty()){
-        //  Remove all active commands up to the seqnum.
-        while (true){
-            auto iter = m_pending_commands.begin();
-            if (iter == m_pending_commands.end() || iter->first > seqnum){
-                break;
-            }
-            iter->second.sanitizer.check_usage();
-            m_pending_commands.erase(iter);
-        }
-    }
-
-    m_cv.notify_all();
-}
-template <typename Map>
-uint64_t PABotBase::infer_full_seqnum(const Map& map, seqnum_t seqnum) const{
-    m_sanitizer.check_usage();
-
-    //  The protocol uses a 32-bit seqnum that wraps around. For our purposes of
-    //  retransmits, we use a full 64-bit seqnum to maintain sorting order
-    //  across the wrap-arounds.
-
-    //  Since the oldest unacked messaged will never be more than 63 (MAX_SEQNUM_GAP)
-    //  requests old, there is no ambiguity on which request is being referred
-    //  to with just the lower 32 bits.
-    //  Here we infer the upper 32 bits of the seqnum to obtain the full 64-bit
-    //  seqnum that we need to index our map.
-
-    //  This needs to be called inside the lock. Furthermore, the map must not
-    //  be empty. If it is empty, we know we don't have it and can drop it
-    //  before we even call this function.
-
-    //  Figure out the upper 32 bits of the seqnum.
-    uint64_t lo = map.begin()->first;
-    uint64_t hi = map.rbegin()->first;
-    uint64_t lo_candidate = (lo & 0xffffffff00000000) | seqnum;
-    uint64_t hi_candidate = (hi & 0xffffffff00000000) | seqnum;
-    return lo_candidate >= lo
-        ? lo_candidate
-        : hi_candidate;
-}
-
-uint64_t PABotBase::oldest_live_seqnum() const{
-    m_sanitizer.check_usage();
-
-    //  Must call under state lock.
-    uint64_t oldest = m_send_seq;
-    if (!m_pending_requests.empty()){
-        oldest = std::min(oldest, m_pending_requests.begin()->first);
-    }
-    if (!m_pending_commands.empty()){
-        oldest = std::min(oldest, m_pending_commands.begin()->first);
-    }
-    return oldest;
-}
-
-template <typename Params>
-void PABotBase::process_ack_request(BotBaseMessage message){
-    m_sanitizer.check_usage();
-
-    if (message.body.size() != sizeof(Params)){
-        m_sniffer->log("Ignoring message with invalid size.");
-        return;
-    }
-    const Params* params = (const Params*)message.body.c_str();
-    seqnum_t seqnum = params->seqnum;
-
-    AckState state;
-    {
-        SpinLockGuard lg(m_state_lock, "PABotBase::process_ack_request()");
-
-        if (m_pending_requests.empty()){
-            m_sniffer->log("Unexpected request ack message: seqnum = " + std::to_string(seqnum));
-            return;
-        }
-
-        uint64_t full_seqnum = infer_full_seqnum(m_pending_requests, seqnum);
-        std::map<uint64_t, PendingRequest>::iterator iter = m_pending_requests.find(full_seqnum);
-        if (iter == m_pending_requests.end()){
-            m_sniffer->log("Unexpected request ack message: seqnum = " + std::to_string(seqnum));
-            return;
-        }
-        iter->second.sanitizer.check_usage();
-
-        state = iter->second.state;
-        if (state == AckState::NOT_ACKED){
-            if (iter->second.silent_remove){
-                m_pending_requests.erase(iter);
-            }else{
-                iter->second.state = AckState::ACKED;
-                iter->second.ack = std::move(message);
-            }
-        }
-    }
-
-    m_last_ack.store(current_time(), std::memory_order_release);
-
-    switch (state){
-    case AckState::NOT_ACKED:
-        {
-            std::lock_guard<std::mutex> lg(m_sleep_lock);
-            m_cv.notify_all();
-        }
-        return;
-    case AckState::ACKED:
-        m_sniffer->log("Duplicate request ack message: seqnum = " + std::to_string(seqnum));
-        return;
-    case AckState::FINISHED:
-        m_sniffer->log("Request ack on command finish: seqnum = " + std::to_string(seqnum));
-        return;
-    }
-}
-template <typename Params>
-void PABotBase::process_ack_command(BotBaseMessage message){
-    m_sanitizer.check_usage();
-
-    if (message.body.size() != sizeof(Params)){
-        m_sniffer->log("Ignoring message with invalid size.");
-        return;
-    }
-    const Params* params = (const Params*)message.body.c_str();
-    seqnum_t seqnum = params->seqnum;
-
-    SpinLockGuard lg(m_state_lock, "PABotBase::process_ack_command()");
-
-    if (m_pending_commands.empty()){
-        m_sniffer->log("Unexpected command ack message: seqnum = " + std::to_string(seqnum));
-        return;
-    }
-
-    uint64_t full_seqnum = infer_full_seqnum(m_pending_commands, seqnum);
-    auto iter = m_pending_commands.find(full_seqnum);
-    if (iter == m_pending_commands.end()){
-        m_sniffer->log("Unexpected command ack message: seqnum = " + std::to_string(seqnum));
-        return;
-    }
-    iter->second.sanitizer.check_usage();
-
-    m_last_ack.store(current_time(), std::memory_order_release);
-
-    switch (iter->second.state){
-    case AckState::NOT_ACKED:
-//        std::cout << "acked: " << full_seqnum << std::endl;
-        iter->second.state = AckState::ACKED;
-        iter->second.ack = std::move(message);
-        return;
-    case AckState::ACKED:
-        m_sniffer->log("Duplicate command ack message: seqnum = " + std::to_string(seqnum));
-        return;
-    case AckState::FINISHED:
-        m_sniffer->log("Command ack on finished command: seqnum = " + std::to_string(seqnum));
-        return;
-    }
-}
-template <typename Params>
-void PABotBase::process_command_finished(BotBaseMessage message){
-    m_sanitizer.check_usage();
-
-    if (message.body.size() != sizeof(Params)){
-        m_sniffer->log("Ignoring message with invalid size.");
-        return;
-    }
-    const Params* params = (const Params*)message.body.c_str();
-    seqnum_t seqnum = params->seqnum;
-    seqnum_t command_seqnum = params->seq_of_original_command;
-
-    //  Send the ack first.
-    pabb_MsgAckRequest ack;
-    ack.seqnum = seqnum;
-//    m_send_queue.emplace_back((uint8_t)PABB_MSG_ACK, std::string((char*)&ack, sizeof(ack)));
-
-    std::lock_guard<std::mutex> lg0(m_sleep_lock);
-    SpinLockGuard lg1(m_state_lock, "PABotBase::process_command_finished() - 0");
-
-    send_message(BotBaseMessage(PABB_MSG_ACK_REQUEST, std::string((char*)&ack, sizeof(ack))), false);
-
-    if (m_pending_commands.empty()){
-        m_sniffer->log(
-            "Unexpected command finished message: seqnum = " + std::to_string(seqnum) +
-            ", command_seqnum = " + std::to_string(command_seqnum)
-        );
-        return;
-    }
-
-    uint64_t full_seqnum = infer_full_seqnum(m_pending_commands, command_seqnum);
-    auto iter = m_pending_commands.find(full_seqnum);
-    if (iter == m_pending_commands.end()){
-        m_sniffer->log(
-            "Unexpected command finished message: seqnum = " + std::to_string(seqnum) +
-            ", command_seqnum = " + std::to_string(command_seqnum)
-        );
-        return;
-    }
-    iter->second.sanitizer.check_usage();
-
-    switch (iter->second.state){
-    case AckState::NOT_ACKED:
-    case AckState::ACKED:
-        iter->second.state = AckState::FINISHED;
-        iter->second.ack = std::move(message);
-        if (iter->second.silent_remove){
-            m_pending_commands.erase(iter);
-        }
-        m_cv.notify_all();
-        return;
-    case AckState::FINISHED:
-        m_sniffer->log("Duplicate command finish: seqnum = " + std::to_string(seqnum));
-        return;
-    }
-}
-void PABotBase::on_recv_message(BotBaseMessage message){
-    m_sanitizer.check_usage();
-
-    switch (message.type){
-    case PABB_MSG_ACK_COMMAND:
-        process_ack_command<pabb_MsgAckCommand>(std::move(message));
-        return;
-    case PABB_MSG_ACK_REQUEST:
-        process_ack_request<pabb_MsgAckRequest>(std::move(message));
-        return;
-    case PABB_MSG_ACK_REQUEST_I8:
-        process_ack_request<pabb_MsgAckRequestI8>(std::move(message));
-        return;
-    case PABB_MSG_ACK_REQUEST_I16:
-        process_ack_request<pabb_MsgAckRequestI16>(std::move(message));
-        return;
-    case PABB_MSG_ACK_REQUEST_I32:
-        process_ack_request<pabb_MsgAckRequestI32>(std::move(message));
-        return;
-    case PABB_MSG_ERROR_MISSED_REQUEST:{
-        if (message.body.size() != sizeof(pabb_MsgInfoMissedRequest)){
-            m_sniffer->log("Ignoring message with invalid size.");
-            return;
-        }
-        const pabb_MsgInfoMissedRequest* params = (const pabb_MsgInfoMissedRequest*)message.body.c_str();
-        if (params->seqnum == 1){
-            m_logger.log("Serial connection has been interrupted.", COLOR_RED);
-            m_error.store(true, std::memory_order_release);
-            std::lock_guard<std::mutex> lg0(m_sleep_lock);
-            m_cv.notify_all();
-        }
-        return;
-    }
-    case PABB_MSG_REQUEST_COMMAND_FINISHED:{
-        process_command_finished<pabb_MsgRequestCommandFinished>(std::move(message));
-        return;
-    }
-    }
-}
-
-void PABotBase::retransmit_thread(){
-    m_sanitizer.check_usage();
-
-//    cout << "retransmit_thread()" << endl;
-    auto last_sent = current_time();
-    while (m_state.load(std::memory_order_acquire) == State::RUNNING){
-        auto now = current_time();
-
-        if (now - last_sent < m_retransmit_delay){
-            std::unique_lock<std::mutex> lg(m_sleep_lock);
-            if (m_state.load(std::memory_order_acquire) != State::RUNNING){
-                break;
-            }
-            if (m_error.load(std::memory_order_acquire)){
-                break;
-            }
-            m_cv.wait_for(lg, m_retransmit_delay);
-            continue;
-        }
-
-        //  Process retransmits.
-        SpinLockGuard lg(m_state_lock, "PABotBase::retransmit_thread()");
-//        std::cout << "retransmit_thread - m_pending_messages.size(): " << m_pending_messages.size() << std::endl;
-//        cout << "m_pending_messages.size()" << endl;
-
-        //  Retransmit
-        //      Iterate through all pending requests and retransmit them in
-        //  chronological order. Skip the ones that are new.
-        for (auto& item : m_pending_requests){
-            item.second.sanitizer.check_usage();
-            if (
-                item.second.state == AckState::NOT_ACKED &&
-                current_time() - item.second.first_sent >= m_retransmit_delay
-            ){
-                send_message(item.second.request, true);
-            }
-        }
-        for (auto& item : m_pending_commands){
-            item.second.sanitizer.check_usage();
-            if (
-                item.second.state == AckState::NOT_ACKED &&
-                current_time() - item.second.first_sent >= m_retransmit_delay
-            ){
-                send_message(item.second.request, true);
-            }
-        }
-        last_sent = current_time();
-    }
-//    cout << "retransmit_thread() - exit" << endl;
-}
-
-
-
-
-uint64_t PABotBase::try_issue_request(
-    const Cancellable* cancelled,
-    const BotBaseRequest& request, bool silent_remove,
-    size_t queue_limit
-){
-    m_sanitizer.check_usage();
-
-    BotBaseMessage message = request.message();
-    if (message.body.size() < sizeof(uint32_t)){
-        throw InternalProgramError(&m_logger, PA_CURRENT_FUNCTION, "Message is too short.");
-    }
-    if (message.body.size() > PABB_MAX_MESSAGE_SIZE){
-        throw InternalProgramError(&m_logger, PA_CURRENT_FUNCTION, "Message is too long.");
-    }
-
-    SpinLockGuard lg(m_state_lock, "PABotBase::try_issue_request()");
-    if (cancelled != nullptr && cancelled->cancelled()){
-        throw OperationCancelledException();
-    }
-
-    State state = m_state.load(std::memory_order_acquire);
-    if (state != State::RUNNING){
-        throw InvalidConnectionStateException();
-    }
-    if (m_error.load(std::memory_order_acquire)){
-        throw ConnectionException(&m_logger, "Serial connection was interrupted.");
-    }
-
-    //  Too many unacked requests in flight.
-    if (inflight_requests() >= queue_limit){
-        m_logger.log("Message throttled due to too many inflight requests.");
-        return 0;
-    }
-
-    //  Don't get too far ahead of the oldest seqnum.
-    uint64_t seqnum = m_send_seq;
-    if (seqnum - oldest_live_seqnum() > MAX_SEQNUM_GAP){
-        return 0;
-    }
-
-    seqnum_t seqnum_s = (seqnum_t)seqnum;
-    memcpy(&message.body[0], &seqnum_s, sizeof(seqnum_t));
-
-    std::pair<std::map<uint64_t, PendingRequest>::iterator, bool> ret = m_pending_requests.emplace(
-        std::piecewise_construct,
-        std::forward_as_tuple(seqnum),
-        std::forward_as_tuple()
-    );
-    if (!ret.second){
-        throw InternalProgramError(&m_logger, PA_CURRENT_FUNCTION, "Duplicate sequence number: " + std::to_string(seqnum));
-    }
-
-    m_send_seq = seqnum + 1;
-
-    PendingRequest& handle = ret.first->second;
-
-    handle.silent_remove = silent_remove;
-    handle.request = std::move(message);
-    handle.first_sent = current_time();
-
-    send_message(handle.request, false);
-
-    return seqnum;
-}
-uint64_t PABotBase::try_issue_command(
-    const Cancellable* cancelled,
-    const BotBaseRequest& request, bool silent_remove,
-    size_t queue_limit
-){
-    m_sanitizer.check_usage();
-
-    BotBaseMessage message = request.message();
-    if (message.body.size() < sizeof(uint32_t)){
-        throw InternalProgramError(&m_logger, PA_CURRENT_FUNCTION, "Message is too short.");
-    }
-    if (message.body.size() > PABB_MAX_MESSAGE_SIZE){
-        throw InternalProgramError(&m_logger, PA_CURRENT_FUNCTION, "Message is too long.");
-    }
-
-    SpinLockGuard lg(m_state_lock, "PABotBase::try_issue_command()");
-    if (cancelled != nullptr && cancelled->cancelled()){
-        throw OperationCancelledException();
-    }
-
-    State state = m_state.load(std::memory_order_acquire);
-    if (state != State::RUNNING){
-        throw InvalidConnectionStateException();
-    }
-    if (m_error.load(std::memory_order_acquire)){
-        throw ConnectionException(&m_logger, "Serial connection was interrupted.");
-    }
-
-    //  Command queue is full.
-    if (m_pending_commands.size() >= queue_limit){
-//        cout << "Command queue is full" << endl;
-        return 0;
-    }
-
-    //  Too many unacked requests in flight.
-    if (inflight_requests() >= queue_limit){
-        m_logger.log("Message throttled due to too many inflight requests.");
-        return 0;
-    }
-
-    //  Don't get too far ahead of the oldest seqnum.
-    uint64_t seqnum = m_send_seq;
-    if (seqnum - oldest_live_seqnum() > MAX_SEQNUM_GAP){
-        return 0;
-    }
-
-    seqnum_t seqnum_s = (seqnum_t)seqnum;
-    memcpy(&message.body[0], &seqnum_s, sizeof(seqnum_t));
-
-    std::pair<std::map<uint64_t, PendingCommand>::iterator, bool> ret = m_pending_commands.emplace(
-        std::piecewise_construct,
-        std::forward_as_tuple(seqnum),
-        std::forward_as_tuple()
-    );
-    if (!ret.second){
-        throw InternalProgramError(&m_logger, PA_CURRENT_FUNCTION, "Duplicate sequence number: " + std::to_string(seqnum));
-    }
-
-    m_send_seq = seqnum + 1;
-
-    PendingCommand& handle = ret.first->second;
-
-    handle.silent_remove = silent_remove;
-    handle.request = std::move(message);
-    handle.first_sent = current_time();
-
-    send_message(handle.request, false);
-
-    return seqnum;
-}
-uint64_t PABotBase::issue_request(
-    const Cancellable* cancelled,
-    const BotBaseRequest& request, bool silent_remove
-){
-    m_sanitizer.check_usage();
-
-    //  Issue a request or a command and return.
-    //
-    //  If it cannot be issued (because we're over the limits), this function
-    //  will wait until it can be issued.
-    //
-    //  The "silent_remove" parameter determines what to do when the
-    //  ack (for a request) or a finish (for a command) is received.
-    //
-    //  If (silent_remove = true), the receiving thread will remove the request
-    //  from the map and do nothing else. This is for async commands.
-    //
-    //  If (silent_remove = false), the receiving thread will not remove the
-    //  request. Instead, it will notify whatever thread is waiting for the
-    //  result. That waiting thread will process the return value (if any) and
-    //  remove the request from the map. This is for synchronous commands where
-    //  the function waits for the command to finish before returning.
-    //
-
-    while (true){
-        uint64_t seqnum = try_issue_request(cancelled, request, silent_remove, MAX_PENDING_REQUESTS);
-        if (seqnum != 0){
-            return seqnum;
-        }
-        std::unique_lock<std::mutex> lg(m_sleep_lock);
-        if (cancelled != nullptr && cancelled->cancelled()){
-            throw OperationCancelledException();
-        }
-        if (m_state.load(std::memory_order_acquire) != State::RUNNING){
-            throw InvalidConnectionStateException();
-        }
-        if (m_error.load(std::memory_order_acquire)){
-            throw ConnectionException(&m_logger, "Serial connection was interrupted.");
-        }
-        m_cv.wait(lg);
-    }
-}
-uint64_t PABotBase::issue_command(
-    const Cancellable* cancelled,
-    const BotBaseRequest& request, bool silent_remove
-){
-    m_sanitizer.check_usage();
-
-    //  Issue a request or a command and return.
-    //
-    //  If it cannot be issued (because we're over the limits), this function
-    //  will wait until it can be issued.
-    //
-    //  The "silent_remove" parameter determines what to do when the
-    //  ack (for a request) or a finish (for a command) is received.
-    //
-    //  If (silent_remove = true), the receiving thread will remove the request
-    //  from the map and do nothing else. This is for async commands.
-    //
-    //  If (silent_remove = false), the receiving thread will not remove the
-    //  request. Instead, it will notify whatever thread is waiting for the
-    //  result. That waiting thread will process the return value (if any) and
-    //  remove the request from the map. This is for synchronous commands where
-    //  the function waits for the command to finish before returning.
-    //
-
-    while (true){
-        uint64_t seqnum = try_issue_command(cancelled, request, silent_remove, MAX_PENDING_REQUESTS);
-        if (seqnum != 0){
-            return seqnum;
-        }
-        std::unique_lock<std::mutex> lg(m_sleep_lock);
-        if (cancelled != nullptr && cancelled->cancelled()){
-            throw OperationCancelledException();
-        }
-        if (m_state.load(std::memory_order_acquire) != State::RUNNING){
-            throw InvalidConnectionStateException();
-        }
-        if (m_error.load(std::memory_order_acquire)){
-            throw ConnectionException(&m_logger, "Serial connection was interrupted.");
-        }
-        m_cv.wait(lg);
-    }
-}
-
-bool PABotBase::try_issue_request(
-    const BotBaseRequest& request,
-    const Cancellable* cancelled
-){
-    m_sanitizer.check_usage();
-
-    if (!request.is_command()){
-        return try_issue_request(cancelled, request, true, MAX_PENDING_REQUESTS) != 0;
-    }else{
-        return try_issue_command(cancelled, request, true, MAX_PENDING_REQUESTS) != 0;
-    }
-}
-void PABotBase::issue_request(
-    const BotBaseRequest& request,
-    const Cancellable* cancelled
-){
-    m_sanitizer.check_usage();
-
-    if (!request.is_command()){
-        issue_request(cancelled, request, true);
-    }else{
-        issue_command(cancelled, request, true);
-    }
-}
-
-BotBaseMessage PABotBase::issue_request_and_wait(
-    const BotBaseRequest& request,
-    const Cancellable* cancelled
-){
-    m_sanitizer.check_usage();
-
-    if (request.is_command()){
-        throw InternalProgramError(&m_logger, PA_CURRENT_FUNCTION, "This function only supports requests.");
-    }
-
-    uint64_t seqnum = issue_request(cancelled, request, false);
-    return wait_for_request(seqnum);
-}
-BotBaseMessage PABotBase::wait_for_request(uint64_t seqnum){
-    m_sanitizer.check_usage();
-
-    std::unique_lock<std::mutex> lg(m_sleep_lock);
-    while (true){
-        {
-            SpinLockGuard slg(m_state_lock, "PABotBase::issue_request_and_wait()");
-            auto iter = m_pending_requests.find(seqnum);
-            if (iter == m_pending_requests.end()){
-                throw OperationCancelledException();
-            }
-            iter->second.sanitizer.check_usage();
-
-            State state = m_state.load(std::memory_order_acquire);
-            if (state != State::RUNNING){
-                m_pending_requests.erase(iter);
-                m_cv.notify_all();
-                throw InvalidConnectionStateException();
-            }
-            if (m_error.load(std::memory_order_acquire)){
-                m_pending_requests.erase(iter);
-                m_cv.notify_all();
-                throw ConnectionException(&m_logger, "Serial connection was interrupted.");
-            }
-            if (iter->second.state == AckState::ACKED){
-                BotBaseMessage ret = std::move(iter->second.ack);
-                m_pending_requests.erase(iter);
-                m_cv.notify_all();
-                return ret;
-            }
-        }
-        m_cv.wait(lg);
-    }
-}
-
-
-
-
-}
diff --git a/ClientSource/Connection/PABotBase.h b/ClientSource/Connection/PABotBase.h
deleted file mode 100644
index 3b90f44efa..0000000000
--- a/ClientSource/Connection/PABotBase.h
+++ /dev/null
@@ -1,200 +0,0 @@
-/*  Pokemon Automation Bot Base
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- *      This is the main PABotBase class.
- * 
- *  This class represents a connection to a single PABotBase instance running on
- *  a user specified COM port. You can have multiple instances of this class if
- *  you are connecting to multiple devices at once.
- * 
- *  This class implements the full communication protocol. So you directly
- *  invoke commands from this class which will be passed on to the Arduino/Teensy.
- * 
- *  Requests and commands may be asynchronous. They may return before the device
- *  executes it.
- * 
- * 
- *      Note that button commands will only work if the device is running PABotBase
- *  and is not already running a command. The regular programs do not listen to
- *  button press requests since they are already running their own program.
- * 
- */
-
-#ifndef PokemonAutomation_PABotBase_H
-#define PokemonAutomation_PABotBase_H
-
-#include <string.h>
-#include <map>
-#include <atomic>
-#include <condition_variable>
-#include <thread>
-#include "Common/Cpp/AbstractLogger.h"
-#include "Common/Cpp/Concurrency/SpinLock.h"
-#include "ClientSource/Connection/MessageLogger.h"
-#include "ClientSource/Connection/PABotBaseConnection.h"
-#include "BotBase.h"
-#include "BotBaseMessage.h"
-
-
-namespace PokemonAutomation{
-
-
-class PABotBase : public BotBase, private PABotBaseConnection{
-    static const size_t MAX_PENDING_REQUESTS = PABB_DEVICE_QUEUE_SIZE;
-    static const seqnum_t MAX_SEQNUM_GAP = (seqnum_t)-1 >> 2;
-
-public:
-    PABotBase(
-        Logger& logger,
-        std::unique_ptr<StreamConnection> connection,
-        MessageLogger* message_logger = nullptr,
-        std::chrono::milliseconds retransmit_delay = std::chrono::milliseconds(PABB_RETRANSMIT_DELAY_MILLIS)
-    );
-    virtual ~PABotBase();
-
-    using PABotBaseConnection::set_sniffer;
-
-    void connect();
-    void stop();
-
-    std::chrono::time_point<std::chrono::system_clock> last_ack() const{
-        return m_last_ack.load(std::memory_order_acquire);
-    }
-
-    virtual Logger& logger() override{
-        return m_logger;
-    }
-    virtual State state() const override{
-        return m_state.load(std::memory_order_acquire);
-    }
-
-public:
-    //  Basic Requests
-
-    virtual void wait_for_all_requests(const Cancellable* cancelled = nullptr) override;
-
-    virtual bool try_stop_all_commands() override;
-    virtual void stop_all_commands() override;
-
-    virtual bool try_next_command_interrupt() override;
-    virtual void next_command_interrupt() override;
-
-
-public:
-    //  For Command Implementations
-
-//    using BotBase::try_issue_request;
-    using BotBase::issue_request;
-    using BotBase::issue_request_and_wait;
-
-
-private:
-    enum class AckState{
-        NOT_ACKED,
-        ACKED,
-        FINISHED,
-    };
-    struct PendingRequest{
-        AckState state = AckState::NOT_ACKED;
-        bool silent_remove;
-        BotBaseMessage request;
-        BotBaseMessage ack;
-        WallClock first_sent;
-        LifetimeSanitizer sanitizer;
-    };
-    struct PendingCommand{
-        AckState state = AckState::NOT_ACKED;
-        bool silent_remove;
-        BotBaseMessage request;
-        BotBaseMessage ack;
-        WallClock first_sent;
-        LifetimeSanitizer sanitizer;
-    };
-
-    template <typename Map>
-    uint64_t infer_full_seqnum(const Map& map, seqnum_t seqnum) const;
-
-    uint64_t oldest_live_seqnum() const;
-
-    template <typename Params> void process_ack_request(BotBaseMessage message);
-    template <typename Params> void process_ack_command(BotBaseMessage message);
-
-    template <typename Params> void process_command_finished(BotBaseMessage message);
-    virtual void on_recv_message(BotBaseMessage message) override;
-
-    void clear_all_active_commands(uint64_t seqnum);
-
-    void retransmit_thread();
-
-private:
-    size_t inflight_requests();
-
-    //  Returns the seqnum of the request. If failed, returns zero.
-    uint64_t try_issue_request(
-        const Cancellable* cancelled,
-        const BotBaseRequest& request, bool silent_remove,
-        size_t queue_limit
-    );
-    uint64_t try_issue_command(
-        const Cancellable* cancelled,
-        const BotBaseRequest& request, bool silent_remove,
-        size_t queue_limit
-    );
-
-    //  Returns the seqnum of the request.
-    uint64_t issue_request(
-        const Cancellable* cancelled,
-        const BotBaseRequest& request, bool silent_remove
-    );
-    uint64_t issue_command(
-        const Cancellable* cancelled,
-        const BotBaseRequest& request, bool silent_remove
-    );
-
-    virtual bool try_issue_request(
-        const BotBaseRequest& request,
-        const Cancellable* cancelled
-    ) override;
-    virtual void issue_request(
-        const BotBaseRequest& request,
-        const Cancellable* cancelled
-    ) override;
-    virtual BotBaseMessage issue_request_and_wait(
-        const BotBaseRequest& request,
-        const Cancellable* cancelled
-    ) override;
-
-    BotBaseMessage wait_for_request(uint64_t seqnum);
-
-private:
-    Logger& m_logger;
-
-    uint64_t m_send_seq;
-    std::chrono::milliseconds m_retransmit_delay;
-    std::atomic<std::chrono::time_point<std::chrono::system_clock>> m_last_ack;
-
-    std::map<uint64_t, PendingRequest> m_pending_requests;
-    std::map<uint64_t, PendingCommand> m_pending_commands;
-
-    //  If you need both locks, always acquire m_sleep_lock first!
-    SpinLock m_state_lock;
-    std::mutex m_sleep_lock;
-
-    std::condition_variable m_cv;
-    std::atomic<State> m_state;
-    std::atomic<bool> m_error;
-    std::thread m_retransmit_thread;
-
-    LifetimeSanitizer m_sanitizer;
-};
-
-
-
-
-
-
-
-}
-
-#endif
diff --git a/ClientSource/Connection/PABotBaseConnection.cpp b/ClientSource/Connection/PABotBaseConnection.cpp
deleted file mode 100644
index 790ccdc541..0000000000
--- a/ClientSource/Connection/PABotBaseConnection.cpp
+++ /dev/null
@@ -1,148 +0,0 @@
-/*  Pokemon Automation Bot Base - Client Example
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- */
-
-#include "Common/CRC32.h"
-#include "Common/Microcontroller/MessageProtocol.h"
-#include "ClientSource/Libraries/Logging.h"
-#include "ClientSource/Libraries/MessageConverter.h"
-#include "BotBaseMessage.h"
-#include "PABotBaseConnection.h"
-
-#include <iostream>
-using std::cout;
-using std::endl;
-
-namespace PokemonAutomation{
-
-MessageSniffer null_sniffer;
-
-PABotBaseConnection::PABotBaseConnection(Logger& logger, std::unique_ptr<StreamConnection> connection)
-    : m_connection(std::move(connection))
-    , m_logger(logger)
-    , m_sniffer(&null_sniffer)
-{
-    m_connection->add_listener(*this);
-}
-PABotBaseConnection::~PABotBaseConnection(){
-    if (m_connection){
-        safely_stop();
-    }
-}
-void PABotBaseConnection::safely_stop(){
-    if (m_connection){
-        m_connection->stop();
-        m_connection.reset();
-    }
-}
-
-
-void PABotBaseConnection::set_sniffer(MessageSniffer* sniffer){
-    if (sniffer == nullptr){
-        sniffer = &null_sniffer;
-    }
-    m_sniffer = sniffer;
-}
-
-
-void PABotBaseConnection::send_zeros(uint8_t bytes){
-    if (!m_connection){
-        return;
-    }
-
-    char ch = 0;
-    for (uint8_t c = 0; c < bytes; c++){
-        m_connection->send(&ch, 1);
-//        Sleep(10);
-    }
-}
-void PABotBaseConnection::send_message(const BotBaseMessage& message, bool is_retransmit){
-    if (!m_connection){
-        return;
-    }
-
-//    log("Sending: " + message_to_string(type, msg));
-    m_sniffer->on_send(message, is_retransmit);
-
-    size_t total_bytes = PABB_PROTOCOL_OVERHEAD + message.body.size();
-    if (total_bytes > PABB_MAX_PACKET_SIZE){
-        throw InternalProgramError(&m_logger, PA_CURRENT_FUNCTION, "Message is too long.");
-    }
-
-    std::string buffer;
-    buffer += ~(uint8_t)total_bytes;
-    buffer += message.type;
-    buffer += message.body;
-    buffer += std::string(sizeof(uint32_t), 0);
-    pabb_crc32_write_to_message(&buffer[0], buffer.size());
-
-    m_connection->send(&buffer[0], buffer.size());
-}
-
-
-void PABotBaseConnection::on_recv(const void* data, size_t bytes){
-    //  Push into receive buffer.
-    for (size_t c = 0; c < bytes; c++){
-        m_recv_buffer.emplace_back(((const char*)data)[c]);
-    }
-
-    while (!m_recv_buffer.empty()){
-        uint8_t length = ~m_recv_buffer[0];
-
-        if (m_recv_buffer[0] == 0){
-            m_sniffer->log("Skipping zero byte.");
-            m_recv_buffer.pop_front();
-            continue;
-        }
-
-        //  Message is too short.
-        if (length < PABB_PROTOCOL_OVERHEAD){
-            m_sniffer->log("Message is too short: bytes = " + std::to_string(length));
-            m_recv_buffer.pop_front();
-            continue;
-        }
-
-        //  Message is too long.
-        if (length > PABB_MAX_PACKET_SIZE){
-            m_sniffer->log("Message is too long: bytes = " + std::to_string(length));
-            m_recv_buffer.pop_front();
-            continue;
-        }
-
-        //  Message is incomplete.
-        if (length > m_recv_buffer.size()){
-            return;
-        }
-
-        std::string message(m_recv_buffer.begin(), m_recv_buffer.begin() + length);
-
-        //  Verify checksum
-        {
-            //  Calculate checksum.
-            uint32_t checksumA = pabb_crc32(0xffffffff, &message[0], length - sizeof(uint32_t));
-
-            //  Read the checksum from the message.
-            uint32_t checksumE = ((uint32_t*)(&message[0] + length))[-1];
-
-            //  Compare
-//            std::cout << checksumA << " / " << checksumE << std::endl;
-            if (checksumA != checksumE){
-                m_sniffer->log("Invalid Checksum: bytes = " + std::to_string(length));
-//                std::cout << checksumA << " / " << checksumE << std::endl;
-//                log(message_to_string(message[1], &message[2], length - PABB_PROTOCOL_OVERHEAD));
-                m_recv_buffer.pop_front();
-                continue;
-            }
-        }
-        m_recv_buffer.erase(m_recv_buffer.begin(), m_recv_buffer.begin() + length);
-
-        BotBaseMessage msg(message[1], std::string(&message[2], length - PABB_PROTOCOL_OVERHEAD));
-        m_sniffer->on_recv(msg);
-        on_recv_message(std::move(msg));
-    }
-}
-
-
-}
diff --git a/ClientSource/Connection/PABotBaseConnection.h b/ClientSource/Connection/PABotBaseConnection.h
deleted file mode 100644
index 60bc8d6d69..0000000000
--- a/ClientSource/Connection/PABotBaseConnection.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*  PABotBase Connection
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- *      This class wraps a raw SerialConnection object and applies the
- *  communication protocol on top of it. It automatically throws out bad
- *  messsages and passes only the relevant message body onto the child
- *  listener class.
- * 
- *  This class does not handle retransmissions.
- * 
- */
-
-#ifndef PokemonAutomation_PABotBaseConnection_H
-#define PokemonAutomation_PABotBaseConnection_H
-
-#include <memory>
-#include <string>
-#include <deque>
-#include "Common/Compiler.h"
-#include "Common/Microcontroller/MessageProtocol.h"
-#include "BotBase.h"
-#include "MessageSniffer.h"
-#include "StreamInterface.h"
-
-namespace PokemonAutomation{
-
-
-//  None the functions in this class are thread-safe. It is up to
-//  the child class to wrap and make them thread-safe.
-class PABotBaseConnection : public StreamListener{
-public:
-    PABotBaseConnection(Logger& logger, std::unique_ptr<StreamConnection> connection);
-    virtual ~PABotBaseConnection();
-
-    void set_sniffer(MessageSniffer* sniffer);
-
-public:
-    void send_zeros(uint8_t bytes = PABB_MAX_PACKET_SIZE);
-    void send_message(const BotBaseMessage& message, bool is_retransmit);
-
-protected:
-    //  Not thread-safe with sends.
-    void safely_stop();
-
-private:
-    virtual void on_recv(const void* data, size_t bytes) override;
-    virtual void on_recv_message(BotBaseMessage message) = 0;
-
-private:
-    std::unique_ptr<StreamConnection> m_connection;
-    std::deque<char> m_recv_buffer;
-
-protected:
-    Logger& m_logger;
-    MessageSniffer* m_sniffer;
-};
-
-
-
-}
-
-#endif
diff --git a/ClientSource/Connection/SerialConnection.h b/ClientSource/Connection/SerialConnection.h
deleted file mode 100644
index 6844b3a7e0..0000000000
--- a/ClientSource/Connection/SerialConnection.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*  Serial Connection
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- */
-
-#ifndef PokemonAutomation_SerialConnection_H
-#define PokemonAutomation_SerialConnection_H
-
-#ifdef _WIN32
-#include "SerialConnectionWinAPI.h"
-#else
-#include "SerialConnectionPOSIX.h"
-#endif
-
-#endif
diff --git a/ClientSource/Connection/SerialConnectionPOSIX.h b/ClientSource/Connection/SerialConnectionPOSIX.h
deleted file mode 100644
index 969978e8df..0000000000
--- a/ClientSource/Connection/SerialConnectionPOSIX.h
+++ /dev/null
@@ -1,170 +0,0 @@
-/*  Serial Connection for POSIX
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- */
-
-#ifndef PokemonAutomation_SerialConnectionPOSIX_H
-#define PokemonAutomation_SerialConnectionPOSIX_H
-
-#include <string>
-#include <atomic>
-#include <thread>
-#include <fcntl.h>
-#include <termios.h>
-#include <unistd.h>
-#include "Common/Cpp/Exceptions.h"
-#include "Common/Cpp/PanicDump.h"
-#include "Common/Cpp/Concurrency/SpinLock.h"
-#include "StreamInterface.h"
-
-namespace PokemonAutomation{
-
-class SerialConnection : public StreamConnection{
-public:
-    //  UTF-8
-    SerialConnection(const std::string& name, uint32_t baud_rate)
-        : m_exit(false)
-    {
-        speed_t baud = B9600;
-        switch (baud_rate){
-        case 9600:   baud = B9600;   break;
-        case 19200:  baud = B19200;  break;
-        case 38400:  baud = B38400;  break;
-        case 57600:  baud = B57600;  break;
-        case 115200: baud = B115200; break;
-        default:
-            throw ConnectionException(nullptr, "Unsupported Baud Rate: " + std::to_string(baud_rate));
-        }
-//        std::cout << "desired baud = " << baud << std::endl;
-
-        m_fd = open(name.c_str(), O_RDWR | O_NOCTTY | O_NDELAY);
-        if (m_fd == -1){
-            int error = errno;
-            std::string str = "Unable to open serial connection. Error = " + std::to_string(error);
-            if (error == EACCES){
-                str += " (permission denied)\nPlease run as sudo.";
-            }
-            throw ConnectionException(nullptr, std::move(str));
-        }
-
-        struct termios options;
-        if (tcgetattr(m_fd, &options) == -1){
-            int error = errno;
-            throw ConnectionException(nullptr, "tcgetattr() failed. Error = " + std::to_string(error));
-        }
-//        std::cout << "read baud = " << cfgetispeed(&options) << std::endl;
-//        std::cout << "write baud = " << cfgetospeed(&options) << std::endl;
-
-        //  Baud Rate
-        if (cfsetispeed(&options, baud) == -1){
-            int error = errno;
-            throw ConnectionException(nullptr, "cfsetispeed() failed. Error = " + std::to_string(error));
-        }
-        if (cfsetospeed(&options, baud) == -1){
-            int error = errno;
-            throw ConnectionException(nullptr, "cfsetospeed() failed. Error = " + std::to_string(error));
-        }
-//        std::cout << "write baud = " << cfgetispeed(&options) << std::endl;
-//        std::cout << "write baud = " << cfgetospeed(&options) << std::endl;
-
-#if 0
-        std::cout << "BRKINT  = " << (options.c_iflag & BRKINT) << std::endl;
-        std::cout << "ICRNL   = " << (options.c_iflag & ICRNL) << std::endl;
-        std::cout << "IMAXBEL = " << (options.c_iflag & IMAXBEL) << std::endl;
-        std::cout << "OPOST   = " << (options.c_oflag & OPOST) << std::endl;
-        std::cout << "ONLCR   = " << (options.c_oflag & ONLCR) << std::endl;
-        std::cout << "ISIG    = " << (options.c_lflag & ISIG) << std::endl;
-        std::cout << "ICANON  = " << (options.c_lflag & ICANON) << std::endl;
-        std::cout << "ECHO    = " << (options.c_lflag & ECHO) << std::endl;
-        std::cout << "ECHOE   = " << (options.c_lflag & ECHOE) << std::endl;
-#endif
-#if 1
-        //  8 bits, no parity, 1 stop bit
-        options.c_cflag &= ~PARENB;
-        options.c_cflag &= ~CSTOPB;
-        options.c_cflag &= ~CSIZE;
-        options.c_cflag |= CS8;
-#endif
-#if 1
-        //  Override all of Linux's stupid text defaults.
-        options.c_iflag &= ~BRKINT;
-        options.c_iflag &= ~ICRNL;
-        options.c_iflag &= ~(IXON | IXOFF);
-        options.c_iflag &= ~IMAXBEL;
-        options.c_oflag &= ~OPOST;
-        options.c_oflag &= ~ONLCR;
-        options.c_lflag &= ~ISIG;
-        options.c_lflag &= ~ICANON;
-        options.c_lflag &= ~ECHO;
-        options.c_lflag &= ~ECHOE;
-#endif
-
-        if (tcsetattr(m_fd, TCSANOW, &options) == -1){
-            int error = errno;
-            throw ConnectionException(nullptr, "tcsetattr() failed. Error = " + std::to_string(error));
-        }
-
-        if (tcgetattr(m_fd, &options) == -1){
-            int error = errno;
-            throw ConnectionException(nullptr, "tcgetattr() failed. Error = " + std::to_string(error));
-        }
-        if (cfgetispeed(&options) != baud){
-//            std::cout << "actual baud = " << cfgetispeed(&options) << std::endl;
-            throw ConnectionException(nullptr, "Unable to set input baud rate.");
-        }
-        if (cfgetospeed(&options) != baud){
-//            std::cout << "actual baud = " << cfgetospeed(&options) << std::endl;
-            throw ConnectionException(nullptr, "Unable to set output baud rate.");
-        }
-
-        //  Start receiver thread.
-        try{
-            m_listener = std::thread(run_with_catch, "SerialConnection::SerialConnection()", [this]{ recv_loop(); });
-        }catch (...){
-            close(m_fd);
-            throw;
-        }
-    }
-
-    virtual ~SerialConnection(){
-        if (!m_exit.load(std::memory_order_acquire)){
-            stop();
-        }
-    }
-
-    virtual void stop() final{
-        m_exit.store(true, std::memory_order_release);
-        close(m_fd);
-        m_listener.join();
-    }
-
-private:
-    virtual void send(const void* data, size_t bytes){
-        SpinLockGuard lg(m_send_lock, "SerialConnection::send()");
-        bytes = write(m_fd, data, bytes);
-    }
-
-    void recv_loop(){
-        char buffer[32];
-        while (!m_exit.load(std::memory_order_acquire)){
-            int actual = read(m_fd, buffer, sizeof(buffer));
-            if (actual > 0){
-                on_recv(buffer, actual);
-            }
-        }
-    }
-    
-
-
-private:
-    int m_fd;
-    std::atomic<bool> m_exit;
-    SpinLock m_send_lock;
-    std::thread m_listener;
-};
-
-
-}
-
-#endif
diff --git a/ClientSource/Connection/SerialConnectionWinAPI.h b/ClientSource/Connection/SerialConnectionWinAPI.h
deleted file mode 100644
index 6600e73611..0000000000
--- a/ClientSource/Connection/SerialConnectionWinAPI.h
+++ /dev/null
@@ -1,213 +0,0 @@
-/*  Serial Connection for Windows
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- */
-
-#ifndef PokemonAutomation_SerialConnectionWinAPI_H
-#define PokemonAutomation_SerialConnectionWinAPI_H
-
-#include <string>
-#include <atomic>
-#include <thread>
-#include <windows.h>
-#include "Common/Compiler.h"
-#include "Common/Cpp/Exceptions.h"
-#include "Common/Cpp/Unicode.h"
-#include "Common/Cpp/PanicDump.h"
-#include "Common/Cpp/Concurrency/SpinLock.h"
-#include "Common/Cpp/Concurrency/SpinPause.h"
-#include "ClientSource/Libraries/Logging.h"
-#include "StreamInterface.h"
-
-namespace PokemonAutomation{
-
-class SerialConnection : public StreamConnection{
-public:
-    //  UTF-8
-    SerialConnection(const std::string& name, uint32_t baud_rate)
-        : SerialConnection(name, utf8_to_wstr(name), baud_rate)
-    {}
-    SerialConnection(const std::string& name, const std::wstring& wname, uint32_t baud_rate)
-        : m_exit(false)
-    {
-        m_handle = CreateFileW(
-            (L"\\\\.\\" + wname).c_str(),
-            GENERIC_READ | GENERIC_WRITE,
-            0, 0,
-            OPEN_EXISTING,
-            FILE_ATTRIBUTE_NORMAL,
-            0
-        );
-        if (m_handle == INVALID_HANDLE_VALUE){
-            DWORD error = GetLastError();
-            throw ConnectionException(nullptr, "Unable to open serial connection (" + name + "). Error = " + std::to_string(error));
-        }
-
-        DCB serial_params{0};
-        serial_params.DCBlength = sizeof(serial_params);
-
-        if (!GetCommState(m_handle, &serial_params)){
-            DWORD error = GetLastError();
-            CloseHandle(m_handle);
-            throw ConnectionException(nullptr, "GetCommState() failed. Error = " + std::to_string(error));
-        }
-//        cout << "BaudRate = " << (int)serial_params.BaudRate << endl;
-//        cout << "ByteSize = " << (int)serial_params.ByteSize << endl;
-//        cout << "StopBits = " << (int)serial_params.StopBits << "0 means 1 bit" << endl;
-//        cout << "Parity   = " << (int)serial_params.Parity << endl;
-        serial_params.BaudRate = baud_rate;
-        serial_params.ByteSize = 8;
-        serial_params.StopBits = 0;
-        serial_params.Parity = 0;
-        if (!SetCommState(m_handle, &serial_params)){
-            DWORD error = GetLastError();
-            CloseHandle(m_handle);
-            throw ConnectionException(nullptr, "SetCommState() failed. Error = " + std::to_string(error));
-        }
-
-#if 1
-        COMMTIMEOUTS timeouts{0};
-        if (!GetCommTimeouts(m_handle, &timeouts)){
-            DWORD error = GetLastError();
-            CloseHandle(m_handle);
-            throw ConnectionException(nullptr, "GetCommTimeouts() failed. Error = " + std::to_string(error));
-        }
-
-        //std::cout << "ReadIntervalTimeout = " << timeouts.ReadIntervalTimeout << std::endl;
-        //std::cout << "ReadTotalTimeoutMultiplier = " << timeouts.ReadTotalTimeoutMultiplier << std::endl;
-        //std::cout << "ReadTotalTimeoutConstant = " << timeouts.ReadTotalTimeoutConstant << std::endl;
-        //std::cout << "WriteTotalTimeoutMultiplier = " << timeouts.WriteTotalTimeoutMultiplier << std::endl;
-        //std::cout << "WriteTotalTimeoutConstant = " << timeouts.WriteTotalTimeoutConstant << std::endl;
-
-#if 1
-        timeouts = COMMTIMEOUTS{(DWORD)-1, 0, 0, 0, 100};
-#else
-        //  Need to set a read timer. In some cases, a pending ReadFile() call
-        //  will block a WriteFile() call until it returns - leading to a
-        //  deadlock if the device isn't sending any information.
-        timeouts.ReadIntervalTimeout = 0;
-        timeouts.ReadTotalTimeoutMultiplier = 0;
-        timeouts.ReadTotalTimeoutConstant = 1;
-#endif
-        if (!SetCommTimeouts(m_handle, &timeouts)){
-            DWORD error = GetLastError();
-            CloseHandle(m_handle);
-            throw ConnectionException(nullptr, "SetCommTimeouts() failed. Error = " + std::to_string(error));
-        }
-#endif
-
-        //  Start receiver thread.
-        try{
-            m_listener = std::thread(run_with_catch, "SerialConnection::SerialConnection()", [this]{ recv_loop(); });
-        }catch (...){
-            CloseHandle(m_handle);
-            throw;
-        }
-    }
-    virtual ~SerialConnection(){
-        if (!m_exit.load(std::memory_order_acquire)){
-            stop();
-        }
-    }
-
-    virtual void stop() final{
-        m_exit.store(true, std::memory_order_release);
-        CloseHandle(m_handle);
-        m_listener.join();
-    }
-
-private:
-    void clear_error(){
-        DWORD comm_error;
-        if (ClearCommError(m_handle, &comm_error, nullptr) == 0){
-            DWORD error = GetLastError();
-            log("ClearCommError() failed. Error = " + std::to_string(error));
-        }
-        log("ClearCommError error flag = " + std::to_string(comm_error));
-    }
-
-
-    virtual void send(const void* data, size_t bytes){
-        SpinLockGuard lg(m_send_lock, "SerialConnection::send()");
-#if 0
-        for (size_t c = 0; c < bytes; c++){
-            std::cout << "Send: " << (int)((const char*)data)[c] << std::endl;
-        }
-#endif
-
-//        std::cout << "start write" << std::endl;
-//        auto start = current_time();
-        DWORD written;
-        if (WriteFile(m_handle, data, (DWORD)bytes, &written, nullptr) == 0 || bytes != written){
-            DWORD error = GetLastError();
-            log(
-                "Failed to write: " + std::to_string(written) +
-                " / " + std::to_string(bytes) +
-                ", error = " + std::to_string(error)
-            );
-            clear_error();
-        }
-//        auto stop = current_time();
-//        cout << "WriteFile() : " << std::chrono::duration_cast<std::chrono::milliseconds>(stop - start).count() << endl;
-
-//        std::cout << "end send()" << std::endl;
-    }
-
-    void recv_loop(){
-//        std::lock_guard<std::mutex> lg(m_send_lock);
-        char buffer[32];
-        auto last_recv = current_time();
-        while (!m_exit.load(std::memory_order_acquire)){
-//            auto start = current_time();
-//            std::cout << "start read" << std::endl;
-            DWORD read;
-            if (ReadFile(m_handle, buffer, 32, &read, nullptr) == 0){
-                DWORD error = GetLastError();
-                log("ReadFile() failed. Error = " + std::to_string(error));
-                clear_error();
-            }
-//            auto stop = current_time();
-//            cout << "ReadFile() : " << std::chrono::duration_cast<std::chrono::milliseconds>(stop - start).count() << endl;
-//            std::cout << "read = " << read << std::endl;
-//            set_timouts();
-#if 0
-            for (size_t c = 0; c < read; c++){
-                cout << "Recv: " << (int)buffer[c] << endl;
-            }
-#endif
-            if (read != 0){
-                on_recv(buffer, read);
-                last_recv = current_time();
-                continue;
-            }
-
-
-#if 1
-//            auto start = current_time();
-            Sleep(1);
-//            auto stop = current_time();
-#else
-            auto now = current_time();
-            uint64_t millis_since_last_recv = std::chrono::duration_cast<std::chrono::milliseconds>(now - last_recv).count();
-            if (millis_since_last_recv > 100){
-                Sleep(1);
-            }else{
-                pause();
-            }
-#endif
-        }
-    }
-
-private:
-    HANDLE m_handle;
-    std::atomic<bool> m_exit;
-    SpinLock m_send_lock;
-    std::thread m_listener;
-};
-
-
-
-}
-
-#endif
diff --git a/ClientSource/Connection/StreamInterface.h b/ClientSource/Connection/StreamInterface.h
deleted file mode 100644
index 6352772c1b..0000000000
--- a/ClientSource/Connection/StreamInterface.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*  Stream Connection Interface
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- */
-
-#ifndef PokemonAutomation_StreamInterface_H
-#define PokemonAutomation_StreamInterface_H
-
-#include <mutex>
-#include <set>
-
-namespace PokemonAutomation{
-
-
-class StreamListener{
-public:
-    virtual void on_recv(const void* data, size_t bytes) = 0;
-};
-
-
-class StreamConnection{
-public:
-    virtual ~StreamConnection(){}
-    virtual void stop() = 0;
-
-    void add_listener(StreamListener& listener){
-        std::lock_guard<std::mutex> lg(m_listener_lock);
-        m_listeners.insert(&listener);
-    }
-    void remove_listener(StreamListener& listener){
-        std::lock_guard<std::mutex> lg(m_listener_lock);
-        m_listeners.erase(&listener);
-    }
-
-    virtual void send(const void* data, size_t bytes) = 0;
-
-protected:
-    void on_recv(const void* data, size_t bytes){
-        std::lock_guard<std::mutex> lg(m_listener_lock);
-        for (StreamListener* listener : m_listeners){
-            listener->on_recv(data, bytes);
-        }
-    }
-
-protected:
-    std::mutex m_listener_lock;
-    std::set<StreamListener*> m_listeners;
-};
-
-
-
-
-}
-
-#endif
diff --git a/ClientSource/Libraries/Logging.cpp b/ClientSource/Libraries/Logging.cpp
deleted file mode 100644
index d60e9f1865..0000000000
--- a/ClientSource/Libraries/Logging.cpp
+++ /dev/null
@@ -1,67 +0,0 @@
-/*  Pokemon Automation Bot Base - Client Example
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- */
-
-#include <chrono>
-#include <sstream>
-#include <iostream>
-#include <mutex>
-#include "Common/Cpp/PrettyPrint.h"
-#include "Logging.h"
-
-namespace PokemonAutomation{
-
-std::string current_time_to_str(){
-    //  Based off of: https://stackoverflow.com/questions/15957805/extract-year-month-day-etc-from-stdchronotime-point-in-c
-
-    using namespace std;
-    using namespace std::chrono;
-    typedef duration<int, ratio_multiply<hours::period, ratio<24> >::type> days;
-    system_clock::time_point now = system_clock::now();
-    system_clock::duration tp = now.time_since_epoch();
-    days d = duration_cast<days>(tp);
-    tp -= d;
-    hours h = duration_cast<hours>(tp);
-    tp -= h;
-    minutes m = duration_cast<minutes>(tp);
-    tp -= m;
-    seconds s = duration_cast<seconds>(tp);
-    tp -= s;
-    auto micros = 1000000 * tp.count() * system_clock::duration::period::num / system_clock::duration::period::den;
-    time_t tt = system_clock::to_time_t(now);
-//    tm utc_tm = *gmtime(&tt);
-    tm local_tm = *localtime(&tt);
-
-    std::ostringstream ss;
-    ss << local_tm.tm_year + 1900 << '-';
-    ss << tostr_padded(2, local_tm.tm_mon + 1) << '-';
-    ss << tostr_padded(2, local_tm.tm_mday) << ' ';
-    ss << tostr_padded(2, local_tm.tm_hour) << ':';
-    ss << tostr_padded(2, local_tm.tm_min) << ':';
-    ss << tostr_padded(2, local_tm.tm_sec) << '.';
-    ss << tostr_padded(6, micros);
-
-    return ss.str();
-}
-
-
-
-
-std::mutex logging_lock;
-
-void log(const std::ostringstream& ss){
-    log(ss.str());
-}
-void log(const std::string& msg){
-    std::lock_guard<std::mutex> lg(logging_lock);
-    std::cout << current_time_to_str() << " - " << msg << std::endl;
-}
-
-
-
-
-
-}
-
diff --git a/ClientSource/Libraries/Logging.h b/ClientSource/Libraries/Logging.h
deleted file mode 100644
index a79a298d69..0000000000
--- a/ClientSource/Libraries/Logging.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*  Pokemon Automation Bot Base - Client Example
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- */
-
-#ifndef PokemonAutomation_Logging_H
-#define PokemonAutomation_Logging_H
-
-#include <string>
-#include <sstream>
-
-namespace PokemonAutomation{
-
-
-void log(const std::ostringstream& ss);
-void log(const std::string& msg);
-
-std::string current_time_to_str();
-
-
-
-}
-#endif
diff --git a/ClientSource/Libraries/MessageConverter.cpp b/ClientSource/Libraries/MessageConverter.cpp
deleted file mode 100644
index 017256736e..0000000000
--- a/ClientSource/Libraries/MessageConverter.cpp
+++ /dev/null
@@ -1,354 +0,0 @@
-/*  Message Pretty Printing
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- */
-
-#include <set>
-#include <map>
-#include <sstream>
-#include "Common/Microcontroller/MessageProtocol.h"
-#include "Common/Cpp/Exceptions.h"
-#include "Common/NintendoSwitch/NintendoSwitch_Protocol_PushButtons.h"
-#include "Common/PokemonSwSh/PokemonProgramIDs.h"
-#include "ClientSource/Connection/BotBaseMessage.h"
-#include "MessageConverter.h"
-
-namespace PokemonAutomation{
-
-
-std::map<uint8_t, MessageConverter>& converter_map(){
-    static std::map<uint8_t, MessageConverter> converters;
-    return converters;
-}
-void register_message_converter(uint8_t type, MessageConverter converter){
-    std::map<uint8_t, MessageConverter>& converters = converter_map();
-    auto iter = converters.find(type);
-    if (iter != converters.end()){
-        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Duplicate message type.");
-    }
-    converters[type] = converter;
-}
-
-
-int register_message_converters_framework_errors(){
-    register_message_converter(
-        PABB_MSG_ERROR_READY,
-        [](const std::string& body){
-            std::ostringstream ss;
-            ss << "PABB_MSG_ERROR_READY - ";
-            if (body.size() != 0){ ss << "(invalid size)" << std::endl; return ss.str(); }
-            return ss.str();
-        }
-    );
-    register_message_converter(
-        PABB_MSG_ERROR_INVALID_MESSAGE,
-        [](const std::string& body){
-            std::ostringstream ss;
-            ss << "PABB_MSG_ERROR_INVALID_MESSAGE - ";
-            if (body.size() != sizeof(pabb_MsgInfoInvalidMessage)){ ss << "(invalid size)" << std::endl; return ss.str(); }
-            const auto* params = (const pabb_MsgInfoInvalidMessage*)body.c_str();
-            ss << "length = " << (unsigned)params->message_length;
-            return ss.str();
-        }
-    );
-    register_message_converter(
-        PABB_MSG_ERROR_CHECKSUM_MISMATCH,
-        [](const std::string& body){
-            std::ostringstream ss;
-            ss << "PABB_MSG_ERROR_CHECKSUM_MISMATCH - ";
-            if (body.size() != sizeof(pabb_MsgInfoChecksumMismatch)){ ss << "(invalid size)" << std::endl; return ss.str(); }
-            const auto* params = (const pabb_MsgInfoChecksumMismatch*)body.c_str();
-            ss << "length = " << (unsigned)params->message_length;
-            return ss.str();
-        }
-    );
-    register_message_converter(
-        PABB_MSG_ERROR_INVALID_TYPE,
-        [](const std::string& body){
-            std::ostringstream ss;
-            ss << "PABB_MSG_ERROR_INVALID_TYPE - ";
-            if (body.size() != sizeof(pabb_MsgInfoInvalidType)){ ss << "(invalid size)" << std::endl; return ss.str(); }
-            const auto* params = (const pabb_MsgInfoInvalidType*)body.c_str();
-            ss << "type = " << (unsigned)params->type;
-            return ss.str();
-        }
-    );
-    register_message_converter(
-        PABB_MSG_ERROR_INVALID_REQUEST,
-        [](const std::string& body){
-            std::ostringstream ss;
-            ss << "PABB_MSG_ERROR_INVALID_REQUEST - ";
-            if (body.size() != sizeof(pabb_MsgInfoInvalidRequest)){ ss << "(invalid size)" << std::endl; return ss.str(); }
-            const auto* params = (const pabb_MsgInfoInvalidRequest*)body.c_str();
-            ss << "seqnum = " << (uint64_t)params->seqnum;
-            return ss.str();
-        }
-    );
-    register_message_converter(
-        PABB_MSG_ERROR_MISSED_REQUEST,
-        [](const std::string& body){
-            std::ostringstream ss;
-            ss << "PABB_MSG_ERROR_MISSED_REQUEST - ";
-            if (body.size() != sizeof(pabb_MsgInfoMissedRequest)){ ss << "(invalid size)" << std::endl; return ss.str(); }
-            const auto* params = (const pabb_MsgInfoMissedRequest*)body.c_str();
-            ss << "seqnum = " << (uint64_t)params->seqnum;
-            return ss.str();
-        }
-    );
-    register_message_converter(
-        PABB_MSG_ERROR_COMMAND_DROPPED,
-        [](const std::string& body){
-            std::ostringstream ss;
-            ss << "PABB_MSG_ERROR_COMMAND_DROPPED - ";
-            if (body.size() != sizeof(pabb_MsgInfoCommandDropped)){ ss << "(invalid size)" << std::endl; return ss.str(); }
-            const auto* params = (const pabb_MsgInfoCommandDropped*)body.c_str();
-            ss << "seqnum = " << (uint64_t)params->seqnum;
-            return ss.str();
-        }
-    );
-    register_message_converter(
-        PABB_MSG_ERROR_WARNING,
-        [](const std::string& body){
-            std::ostringstream ss;
-            ss << "PABB_MSG_ERROR_WARNING - ";
-            if (body.size() != sizeof(pabb_MsgInfoWARNING)){ ss << "(invalid size)" << std::endl; return ss.str(); }
-            const auto* params = (const pabb_MsgInfoWARNING*)body.c_str();
-            ss << "error code = " << (unsigned)params->error_code;
-            switch (params->error_code){
-            case 1:
-                ss << " (Device was slow to respond to USB request.)";
-                break;
-            }
-            return ss.str();
-        }
-    );
-    return 0;
-}
-int register_message_converters_framework_acks(){
-    register_message_converter(
-        PABB_MSG_ACK_COMMAND,
-        [](const std::string& body){
-            std::ostringstream ss;
-            ss << "PABB_MSG_ACK_COMMAND - ";
-            if (body.size() != sizeof(pabb_MsgAckCommand)){ ss << "(invalid size)" << std::endl; return ss.str(); }
-            const auto* params = (const pabb_MsgAckCommand*)body.c_str();
-            ss << "seqnum = " << (uint64_t)params->seqnum;
-            return ss.str();
-        }
-    );
-    register_message_converter(
-        PABB_MSG_ACK_REQUEST,
-        [](const std::string& body){
-            std::ostringstream ss;
-            ss << "PABB_MSG_ACK_REQUEST - ";
-            if (body.size() != sizeof(pabb_MsgAckRequest)){ ss << "(invalid size)" << std::endl; return ss.str(); }
-            const auto* params = (const pabb_MsgAckRequest*)body.c_str();
-            ss << "seqnum = " << (uint64_t)params->seqnum;
-            return ss.str();
-        }
-    );
-    register_message_converter(
-        PABB_MSG_ACK_REQUEST_I8,
-        [](const std::string& body){
-            std::ostringstream ss;
-            ss << "PABB_MSG_ACK_REQUEST_I8 - ";
-            if (body.size() != sizeof(pabb_MsgAckRequestI8)){ ss << "(invalid size)" << std::endl; return ss.str(); }
-            const auto* params = (const pabb_MsgAckRequestI8*)body.c_str();
-            ss << "seqnum = " << (uint64_t)params->seqnum;
-            ss << ", message = " << (unsigned)params->data;
-            return ss.str();
-        }
-    );
-    register_message_converter(
-        PABB_MSG_ACK_REQUEST_I16,
-        [](const std::string& body){
-            std::ostringstream ss;
-            ss << "PABB_MSG_ACK_REQUEST_I16 - ";
-            if (body.size() != sizeof(pabb_MsgAckRequestI16)){ ss << "(invalid size)" << std::endl; return ss.str(); }
-            const auto* params = (const pabb_MsgAckRequestI16*)body.c_str();
-            ss << "seqnum = " << (uint64_t)params->seqnum;
-            ss << ", message = " << (unsigned)params->data;
-            return ss.str();
-        }
-    );
-    register_message_converter(
-        PABB_MSG_ACK_REQUEST_I32,
-        [](const std::string& body){
-            std::ostringstream ss;
-            ss << "PABB_MSG_ACK_REQUEST_I32 - ";
-            if (body.size() != sizeof(pabb_MsgAckRequestI32)){ ss << "(invalid size)" << std::endl; return ss.str(); }
-            const auto* params = (const pabb_MsgAckRequestI32*)body.c_str();
-            ss << "seqnum = " << (uint64_t)params->seqnum;
-            ss << ", message = " << params->data;
-            return ss.str();
-        }
-    );
-    return 0;
-}
-int register_message_converters_framework_requests(){
-    register_message_converter(
-        PABB_MSG_SEQNUM_RESET,
-        [](const std::string& body){
-            std::ostringstream ss;
-            ss << "PABB_MSG_SEQNUM_RESET - ";
-            if (body.size() != sizeof(pabb_MsgInfoSeqnumReset)){ ss << "(invalid size)" << std::endl; return ss.str(); }
-            const auto* params = (const pabb_MsgInfoSeqnumReset*)body.c_str();
-            ss << "seqnum = " << (uint64_t)params->seqnum;
-            return ss.str();
-        }
-    );
-    register_message_converter(
-        PABB_MSG_REQUEST_PROTOCOL_VERSION,
-        [](const std::string& body){
-            std::ostringstream ss;
-            ss << "PABB_MSG_REQUEST_PROTOCOL_VERSION - ";
-            if (body.size() != sizeof(pabb_MsgRequestProtocolVersion)){ ss << "(invalid size)" << std::endl; return ss.str(); }
-            const auto* params = (const pabb_MsgRequestProtocolVersion*)body.c_str();
-            ss << "seqnum = " << (uint64_t)params->seqnum;
-            return ss.str();
-        }
-    );
-    register_message_converter(
-        PABB_MSG_REQUEST_PROGRAM_VERSION,
-        [](const std::string& body){
-            std::ostringstream ss;
-            ss << "PABB_MSG_REQUEST_PROGRAM_VERSION - ";
-            if (body.size() != sizeof(pabb_MsgRequestProgramVersion)){ ss << "(invalid size)" << std::endl; return ss.str(); }
-            const auto* params = (const pabb_MsgRequestProgramVersion*)body.c_str();
-            ss << "seqnum = " << (uint64_t)params->seqnum;
-            return ss.str();
-        }
-    );
-    register_message_converter(
-        PABB_MSG_REQUEST_PROGRAM_ID,
-        [](const std::string& body){
-            std::ostringstream ss;
-            ss << "PABB_MSG_REQUEST_PROGRAM_ID - ";
-            if (body.size() != sizeof(pabb_MsgRequestProgramID)){ ss << "(invalid size)" << std::endl; return ss.str(); }
-            const auto* params = (const pabb_MsgRequestProgramID*)body.c_str();
-            ss << "seqnum = " << (uint64_t)params->seqnum;
-            return ss.str();
-        }
-    );
-    register_message_converter(
-        PABB_MSG_REQUEST_CLOCK,
-        [](const std::string& body){
-            std::ostringstream ss;
-            ss << "PABB_MSG_REQUEST_CLOCK - ";
-            if (body.size() != sizeof(pabb_system_clock)){ ss << "(invalid size)" << std::endl; return ss.str(); }
-            const auto* params = (const pabb_system_clock*)body.c_str();
-            ss << "seqnum = " << (uint64_t)params->seqnum;
-            return ss.str();
-        }
-    );
-    register_message_converter(
-        PABB_MSG_REQUEST_COMMAND_FINISHED,
-        [](const std::string& body){
-            std::ostringstream ss;
-            ss << "PABB_MSG_REQUEST_COMMAND_FINISHED - ";
-            if (body.size() != sizeof(pabb_MsgRequestCommandFinished)){ ss << "(invalid size)" << std::endl; return ss.str(); }
-            const auto* params = (const pabb_MsgRequestCommandFinished*)body.c_str();
-            ss << "seqnum = " << (uint64_t)params->seqnum;
-            ss << ", seq_of_original_command = " << (unsigned)params->seq_of_original_command;
-            ss << ", finish_time = " << params->finish_time;
-            return ss.str();
-        }
-    );
-    register_message_converter(
-        PABB_MSG_REQUEST_STOP,
-        [](const std::string& body){
-            std::ostringstream ss;
-            ss << "PABB_MSG_REQUEST_STOP - ";
-            if (body.size() != sizeof(pabb_MsgRequestStop)){ ss << "(invalid size)" << std::endl; return ss.str(); }
-            const auto* params = (const pabb_MsgRequestStop*)body.c_str();
-            ss << "seqnum = " << (uint64_t)params->seqnum;
-            return ss.str();
-        }
-    );
-    register_message_converter(
-        PABB_MSG_REQUEST_NEXT_CMD_INTERRUPT,
-        [](const std::string& body){
-            std::ostringstream ss;
-            ss << "PABB_MSG_REQUEST_NEXT_CMD_INTERRUPT - ";
-            if (body.size() != sizeof(pabb_MsgRequestStop)){ ss << "(invalid size)" << std::endl; return ss.str(); }
-            const auto* params = (const pabb_MsgRequestStop*)body.c_str();
-            ss << "seqnum = " << (uint64_t)params->seqnum;
-            return ss.str();
-        }
-    );
-    register_message_converter(
-        PABB_MSG_COMMAND_END_PROGRAM_CALLBACK,
-        [](const std::string& body){
-            std::ostringstream ss;
-            ss << "end_program_callback() - ";
-            if (body.size() != sizeof(pabb_end_program_callback)){ ss << "(invalid size)" << std::endl; return ss.str(); }
-            const auto* params = (const pabb_end_program_callback*)body.c_str();
-            ss << "seqnum = " << (uint64_t)params->seqnum;
-            return ss.str();
-        }
-    );
-    register_message_converter(
-        PABB_MSG_COMMAND_SET_LED_STATE,
-        [](const std::string& body){
-            std::ostringstream ss;
-            ss << "PABB_MSG_COMMAND_SET_LED_STATE - ";
-            if (body.size() != sizeof(pabb_MsgCommandSetLeds)){ ss << "(invalid size)" << std::endl; return ss.str(); }
-            const auto* params = (const pabb_MsgCommandSetLeds*)body.c_str();
-            ss << "seqnum = " << (uint64_t)params->seqnum;
-            ss << ", on = " << params->on;
-            return ss.str();
-        }
-    );
-    return 0;
-}
-int register_message_converters_custom_info(){
-    register_message_converter(
-        PABB_MSG_INFO_I32,
-        [](const std::string& body){
-            std::ostringstream ss;
-            ss << "PABB_MSG_INFO_I32 - ";
-            if (body.size() != sizeof(pabb_MsgInfoI32)){ ss << "(invalid size)" << std::endl; return ss.str(); }
-            const auto* params = (const pabb_MsgInfoI32*)body.c_str();
-            ss << "tag = " << (unsigned)params->tag;
-            ss << ", data = " << params->data;
-            return ss.str();
-        }
-    );
-    return 0;
-}
-
-
-int init_MessageLogger =
-    register_message_converters_framework_errors() +
-    register_message_converters_framework_acks() +
-    register_message_converters_framework_requests() +
-    register_message_converters_custom_info();
-
-
-std::string message_to_string(const BotBaseMessage& message){
-    const std::map<uint8_t, MessageConverter>& converters = converter_map();
-    auto iter = converters.find(message.type);
-    if (iter == converters.end()){
-        std::ostringstream ss;
-        ss << "Unknown Message Type " << (unsigned)message.type << ": length = " << message.body.size();
-        return ss.str();
-    }
-    return iter->second(message.body);
-}
-
-
-std::string program_name(uint8_t id){
-    switch (id){
-    case PABB_PID_UNSPECIFIED:              return "Unknown";
-    case PABB_PID_PABOTBASE_12KB:           return "PABotBase-12KB";
-    case PABB_PID_PABOTBASE_31KB:           return "PABotBase-31KB";
-    default: return "Unknown ID";
-    }
-}
-
-
-
-
-}
-
diff --git a/ClientSource/Libraries/MessageConverter.h b/ClientSource/Libraries/MessageConverter.h
deleted file mode 100644
index 2bdf4e6f38..0000000000
--- a/ClientSource/Libraries/MessageConverter.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*  Message Pretty Printing
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- */
-
-#include <string>
-#include "ClientSource/Connection/BotBase.h"
-
-namespace PokemonAutomation{
-
-
-using MessageConverter = std::string (*)(const std::string& body);
-void register_message_converter(uint8_t type, MessageConverter converter);
-
-std::string message_to_string(const BotBaseMessage& message);
-
-
-std::string program_name(uint8_t id);
-
-
-}
-
diff --git a/ClientSource/Libraries/Utilities.cpp b/ClientSource/Libraries/Utilities.cpp
deleted file mode 100644
index d5944a21d2..0000000000
--- a/ClientSource/Libraries/Utilities.cpp
+++ /dev/null
@@ -1,96 +0,0 @@
-/*  Utilities
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- */
-
-#include <iostream>
-#include "Common/Cpp/Exception.h"
-#include "Common/Cpp/PrettyPrint.h"
-#include "Common/Microcontroller/DeviceRoutines.h"
-#include "Common/NintendoSwitch/NintendoSwitch_Tools.h"
-#include "Common/NintendoSwitch/NintendoSwitch_Device.h"
-#include "Common/NintendoSwitch/NintendoSwitch_PushButtons.h"
-#include "Common/PokemonSwSh/PokemonProgramIDs.h"
-#include "ClientSource/Connection/SerialConnection.h"
-#include "ClientSource/Libraries/MessageConverter.h"
-//#include "Libraries/Logging.h"
-#include "Utilities.h"
-
-namespace PokemonAutomation{
-
-
-std::unique_ptr<PABotBase> start_connection(
-    bool require_pabotbase,
-    const std::string& device_name,
-    MessageLogger* logger
-){
-    //  First open a serial connection to the device.
-    std::unique_ptr<PABotBase> pabotbase;
-    if (device_name.empty()){
-        std::string name;
-        std::cout << "Please enter the name of the serial connection." << std::endl;
-        std::cout << std::endl;
-#if _WIN32
-        std::cout << "If you don't know what it is, go to Device Manager -> Ports (COM & LPT)" << std::endl;
-        std::cout << "The name should be something like, \"COM5\"." << std::endl;
-#else
-        std::cout << "If you don't know what it is, type \"ls /sys/class/tty\" to list them." << std::endl;
-        std::cout << "The name should be something like, \"/dev/ttyUSB0\"." << std::endl;
-#endif
-        std::cout << std::endl;
-        std::cout << "Device Name: ";
-        std::cin >> name;
-        std::cout << std::endl;
-        std::cout << std::endl;
-        pabotbase = std::make_unique<PABotBase>(
-            std::make_unique<SerialConnection>(name, PABB_BAUD_RATE), logger
-        );
-    }else{
-        pabotbase = std::make_unique<PABotBase>(
-            std::make_unique<SerialConnection>(device_name, PABB_BAUD_RATE), logger
-        );
-    }
-
-    std::cout << "Connecting to device..." << std::endl;
-    pabotbase->connect();
-
-
-    //  Make sure the device is using the same protocol version as us.
-    std::cout << "Verifying protocol compatibility..." << std::endl;
-    uint32_t version = Microcontroller::protocol_version(*pabotbase);
-    uint32_t version_hi = version / 100;
-    uint32_t version_lo = version % 100;
-    if (version_hi != PABB_PROTOCOL_VERSION / 100 || version_lo < PABB_PROTOCOL_VERSION % 100){
-        PA_THROW_StringException(
-            "Incompatible version. Client: " + std::to_string(PABB_PROTOCOL_VERSION) + ", Device: " + std::to_string(version)
-        );
-    }
-    std::cout << std::endl;
-
-
-    //  Fetch some random information about what's running on the device.
-    uint8_t program_id = Microcontroller::program_id(*pabotbase);
-    std::cout << "Program ID:       " << (unsigned)program_id << " (" << program_name(program_id) << ")" << std::endl;
-
-    uint32_t program_version = Microcontroller::program_version(*pabotbase);
-    std::cout << "Program Version:  " << program_version << std::endl;
-
-    uint32_t wallclock = NintendoSwitch::system_clock(*pabotbase);
-    std::cout << "Device Up Time:   " << NintendoSwitch::ticks_to_time(wallclock) << std::endl;
-    std::cout << std::endl;
-
-
-    //  If we're running an actual program, the device needs to be running PABotBase to work.
-    if (require_pabotbase && (int)program_id_to_botbase_level(program_id) >= (int)PABB_PID_PABOTBASE_12KB){
-        PA_THROW_StringException("The device must be running PABotBase for this program to work.");
-    }
-
-//    std::cout << "Begin Message Logging..." << std::endl;
-//    pabotbase->set_sniffer(logger);
-
-    return pabotbase;
-}
-
-
-}
diff --git a/ClientSource/Libraries/Utilities.h b/ClientSource/Libraries/Utilities.h
deleted file mode 100644
index 464037fc5f..0000000000
--- a/ClientSource/Libraries/Utilities.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*  Utilities
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- */
-
-#include <memory>
-#include "ClientSource/Connection/PABotBase.h"
-
-namespace PokemonAutomation{
-
-
-//  Helpers
-std::unique_ptr<PABotBase> start_connection(
-    bool require_pabotbase,
-    const std::string& device_name = "",
-    MessageLogger* logger = nullptr
-);
-
-
-
-}
diff --git a/ClientSource/Main.cpp b/ClientSource/Main.cpp
deleted file mode 100644
index dbc6502ff0..0000000000
--- a/ClientSource/Main.cpp
+++ /dev/null
@@ -1,94 +0,0 @@
-/*  Pokemon Automation Bot Base Client
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- */
-
-#include <ctime>
-#include <string>
-#include <iostream>
-
-#if 0
-#include <Windows.h>
-#include "Common/Clientside/AsyncDispatcher.h"
-using std::cout;
-using std::endl;
-#endif
-
-namespace PokemonAutomation{
-
-//  Device Logger
-void device_logger              (const std::string& device_name = "");
-
-//  Sample Programs
-void program_TurboA             (const std::string& device_name = "");
-void program_ClothingBuyer      (const std::string& device_name = "");
-void program_BallThrower        (const std::string& device_name = "");
-void program_BeamReset          (const std::string& device_name = "");
-void program_FriendDelete       (const std::string& device_name = "");
-void program_DateSpam_WattFarmer(const std::string& device_name = "");
-
-void sandbox(const std::string& device_name);
-
-}
-
-
-int main(){
-    using namespace PokemonAutomation;
-
-#if 0
-    try{
-        AsyncDispatcher runner;
-        auto task0 = runner.dispatch([]{
-            cout << "asdf" << endl;
-            Sleep(500);
-//            throw 10;
-        });
-        auto task1 = runner.dispatch([]{
-            cout << "qwer" << endl;
-            Sleep(500);
-//            throw 20;
-        });
-        Sleep(1000);
-
-        task0->wait();
-        task1->wait();
-
-    }catch (int x){
-        cout << x << endl;
-    }catch (...){
-        cout << "rethrow" << endl;
-    }
-#endif
-
-
-
-    try{
-        //  By default, this program runs the logging program.
-        device_logger();
-
-        //  You can also run programs directly from the computer.
-//        program_TurboA();
-//        program_ClothingBuyer();
-//        program_BallThrower();
-//        program_BeamReset();
-//        program_FriendDelete();
-//        program_DateSpam_WattFarmer();
-
-//        sandbox("");
-    }catch (const char* str){
-        std::cout << std::endl;
-        std::cout << "Exception: " << str << std::endl;
-    }catch (const std::string& str){
-        std::cout << std::endl;
-        std::cout << "Exception: " << str << std::endl;
-    }catch (...){
-        std::cout << std::endl;
-        std::cout << "Unknown Exception" << std::endl;
-    }
-    std::cout << std::endl;
-
-#if _WIN32
-    system("pause");
-#endif
-}
diff --git a/ClientSource/Objects.mk b/ClientSource/Objects.mk
deleted file mode 100644
index cb60278a2a..0000000000
--- a/ClientSource/Objects.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-ifndef SourceRoot
-
-CURRENT :=
-CURRENT += CommonFramework/CRC32.cpp
-CURRENT += CommonFramework/FrameworkSettings.cpp
-CURRENT += CommonPokemon/PokemonSettings.cpp
-CURRENT += Libraries/Logging.cpp
-CURRENT += Libraries/MessageConverter.cpp
-CURRENT += Libraries/PushButtons.cpp
-CURRENT += Libraries/PokemonRoutines.cpp
-CURRENT += Libraries/Utilities.cpp
-CURRENT += Connection/Unicode.cpp
-CURRENT += Connection/PABotBaseConnection.cpp
-CURRENT += Connection/PABotBase.cpp
-CURRENT += Programs/DeviceLogger.cpp
-CURRENT += Programs/TurboA.cpp
-CURRENT += Programs/ClothingBuyer.cpp
-CURRENT += Programs/BallThrower.cpp
-CURRENT += Programs/BeamReset.cpp
-CURRENT += Programs/FriendDelete.cpp
-CURRENT += Programs/DateSpam-WattFarmer.cpp
-
-SOURCES := $(SOURCES) $(addprefix $(CURRENT_DIR)/, $(CURRENT))
-endif
diff --git a/ClientSource/Programs/BallThrower.cpp b/ClientSource/Programs/BallThrower.cpp
deleted file mode 100644
index e8eea67abe..0000000000
--- a/ClientSource/Programs/BallThrower.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-/*  Ball Thrower
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- *  This program is identical to BallThrower in the Arduino programs.
- *  Please follow the same start instructions.
- * 
- */
-
-#include <iostream>
-#include "Common/NintendoSwitch/FrameworkSettings.h"
-#include "Common/NintendoSwitch/NintendoSwitch_PushButtons.h"
-#include "Common/PokemonSwSh/PokemonSettings.h"
-#include "Common/PokemonSwSh/PokemonSwShGameEntry.h"
-#include "ClientSource/Libraries/Utilities.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-
-
-void program_BallThrower(const std::string& device_name){
-    std::cout << "Starting PABotBase - Ballthrower..." << std::endl;
-    std::cout << std::endl;
-    std::unique_ptr<PABotBase> pabotbase = start_connection(true, device_name);
-//    global_connection = pabotbase.get();
-
-    std::cout << "Begin Message Logging..." << std::endl;
-    MessageLogger logger;
-    pabotbase->set_sniffer(&logger);
-
-
-
-    //  Start Program
-    start_program_flash(*pabotbase, CONNECT_CONTROLLER_DELAY);
-    grip_menu_connect_go_home(*pabotbase);
-    pbf_press_button(*pabotbase, BUTTON_HOME, 10, HOME_TO_GAME_DELAY);
-
-    while (true){
-        pbf_press_button(*pabotbase, BUTTON_X, 50, 50);
-        pbf_press_button(*pabotbase, BUTTON_A, 50, 50);
-        pbf_mash_button(*pabotbase, BUTTON_B, 100);
-    }
-
-//    pbf_press_button(*pabotbase, BUTTON_HOME, 10, GAME_TO_HOME_DELAY_SAFE);
-//    end_program_callback(*pabotbase);
-//    end_program_loop(*pabotbase);
-}
-
-
-}
-}
diff --git a/ClientSource/Programs/BeamReset.cpp b/ClientSource/Programs/BeamReset.cpp
deleted file mode 100644
index 3b23ab1be0..0000000000
--- a/ClientSource/Programs/BeamReset.cpp
+++ /dev/null
@@ -1,79 +0,0 @@
-/*  Beam Reset
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- *  This program is identical to BeamReset in the Arduino programs.
- *  Please follow the same start instructions.
- * 
- */
-
-#include <iostream>
-#include "Common/NintendoSwitch/FrameworkSettings.h"
-#include "Common/NintendoSwitch/NintendoSwitch_Device.h"
-#include "Common/NintendoSwitch/NintendoSwitch_PushButtons.h"
-#include "Common/PokemonSwSh/PokemonSettings.h"
-#include "Common/PokemonSwSh/PokemonSwShGameEntry.h"
-#include "ClientSource/Libraries/Utilities.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-
-
-
-//  Wait in the Home menu for this long before resetting the game.
-const uint16_t DELAY_BEFORE_RESET   =   5 * TICKS_PER_SECOND;
-
-//  Talking to the den has an extra line in German. Set this to true if this
-//  is the case.
-const bool EXTRA_LINE   =   false;
-
-
-
-
-void program_BeamReset(const std::string& device_name){
-    std::cout << "Starting PABotBase - BeamReset..." << std::endl;
-    std::cout << std::endl;
-    std::unique_ptr<PABotBase> pabotbase = start_connection(true, device_name);
-//    global_connection = pabotbase.get();
-
-    std::cout << "Begin Message Logging..." << std::endl;
-    MessageLogger logger;
-    pabotbase->set_sniffer(&logger);
-
-
-    //  Start Program
-    start_program_flash(*pabotbase, CONNECT_CONTROLLER_DELAY);
-    grip_menu_connect_go_home(*pabotbase);
-
-    resume_game_front_of_den_nowatts(*pabotbase, TOLERATE_SYSTEM_UPDATE_MENU_SLOW);
-    pbf_mash_button(*pabotbase, BUTTON_B, 100);
-
-    while (true){
-        //  Talk to den.
-        pbf_press_button(*pabotbase, BUTTON_A, 10, 450);
-        if (EXTRA_LINE){
-            pbf_press_button(*pabotbase, BUTTON_A, 10, 300);
-        }
-        pbf_press_button(*pabotbase, BUTTON_A, 10, 300);
-
-        //  Drop wishing piece.
-        pbf_press_button(*pabotbase, BUTTON_A, 10, 70);
-        pbf_press_button(*pabotbase, BUTTON_HOME, 10, GAME_TO_HOME_DELAY_FAST);
-
-        for (uint16_t c = 0; c < 4; c++){
-            pbf_press_button(*pabotbase, BUTTON_HOME, 10, 10);
-            pbf_press_button(*pabotbase, BUTTON_HOME, 10, 220);
-        }
-        pbf_wait(*pabotbase, DELAY_BEFORE_RESET);
-
-        reset_game_from_home(*pabotbase, TOLERATE_SYSTEM_UPDATE_MENU_SLOW);
-    }
-
-    end_program_callback(*pabotbase);
-    end_program_loop(*pabotbase);
-}
-
-
-
-}
-}
diff --git a/ClientSource/Programs/ClothingBuyer.cpp b/ClientSource/Programs/ClothingBuyer.cpp
deleted file mode 100644
index 53a81c2c10..0000000000
--- a/ClientSource/Programs/ClothingBuyer.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-/*  Clothing Buyer
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- *  This program is identical to ClothingBuyer in the Arduino programs.
- *  Please follow the same start instructions.
- * 
- */
-
-#include <iostream>
-#include "Common/NintendoSwitch/FrameworkSettings.h"
-#include "Common/NintendoSwitch/NintendoSwitch_Device.h"
-#include "Common/NintendoSwitch/NintendoSwitch_PushButtons.h"
-#include "Common/PokemonSwSh/PokemonSettings.h"
-#include "Common/PokemonSwSh/PokemonSwShGameEntry.h"
-#include "ClientSource/Libraries/Utilities.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-
-
-
-//  Rotate categories. This will allow the program to eventually buy out the
-//  entire store, but it will take a lot longer than doing separate runs on
-//  each category individually.
-const bool CATEGORY_ROTATION    =   true;
-
-
-
-void program_ClothingBuyer(const std::string& device_name){
-    std::cout << "Starting PABotBase - ClothingBuyer..." << std::endl;
-    std::cout << std::endl;
-    std::unique_ptr<PABotBase> pabotbase = start_connection(true, device_name);
-//    global_connection = pabotbase.get();
-
-    std::cout << "Begin Message Logging..." << std::endl;
-    MessageLogger logger;
-    pabotbase->set_sniffer(&logger);
-
-
-    //  Start Program
-    start_program_flash(*pabotbase, CONNECT_CONTROLLER_DELAY);
-    grip_menu_connect_go_home(*pabotbase);
-    resume_game_no_interact(*pabotbase, TOLERATE_SYSTEM_UPDATE_MENU_FAST);
-
-    while (true){
-        pbf_press_button(*pabotbase, BUTTON_A, 10, 90);
-        if (CATEGORY_ROTATION){
-            pbf_press_dpad(*pabotbase, DPAD_RIGHT, 10, 40);
-        }
-        pbf_press_button(*pabotbase, BUTTON_A, 10, 90);
-        pbf_press_button(*pabotbase, BUTTON_A, 10, 90);
-        pbf_press_dpad(*pabotbase, DPAD_DOWN, 10, 40);
-    }
-}
-
-
-
-}
-}
diff --git a/ClientSource/Programs/DateSpam-WattFarmer.cpp b/ClientSource/Programs/DateSpam-WattFarmer.cpp
deleted file mode 100644
index b3107ba477..0000000000
--- a/ClientSource/Programs/DateSpam-WattFarmer.cpp
+++ /dev/null
@@ -1,85 +0,0 @@
-/*  Watt Farmer
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- *  This program is identical to DateSpam-WattFarmer in the Arduino programs.
- *  Please follow the same start instructions.
- * 
- */
-
-#include <iostream>
-#include "Common/NintendoSwitch/FrameworkSettings.h"
-#include "Common/NintendoSwitch/NintendoSwitch_Device.h"
-#include "Common/NintendoSwitch/NintendoSwitch_PushButtons.h"
-#include "Common/PokemonSwSh/PokemonSettings.h"
-#include "Common/PokemonSwSh/PokemonSwShDateSpam.h"
-#include "ClientSource/Libraries/Utilities.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-
-
-
-//  Grab watts this many times. You can set this number if you're also date
-//  skipping to a particular den frame and you don't want to overshoot it.
-//
-//  Be aware that this program isn't intended to be an accurate date skipper.
-//  It will occasionally miss frames causing it to fall short.
-const uint32_t SKIPS            =   33334;
-
-//  Save the game every this number of iterations.
-//  If set to zero, no saving is done.
-const uint16_t SAVE_ITERATIONS  =   0;
-
-
-
-void program_DateSpam_WattFarmer(const std::string& device_name){
-    std::cout << "Starting PABotBase - DateSpam-WattFarmer..." << std::endl;
-    std::cout << std::endl;
-    std::unique_ptr<PABotBase> pabotbase = start_connection(true, device_name);
-//    global_connection = pabotbase.get();
-
-    std::cout << "Begin Message Logging..." << std::endl;
-    MessageLogger logger;
-    pabotbase->set_sniffer(&logger);
-
-
-
-    start_program_flash(*pabotbase, CONNECT_CONTROLLER_DELAY);
-    grip_menu_connect_go_home(*pabotbase);
-
-    uint8_t year = MAX_YEAR;
-    uint16_t save_count = 0;
-    for (uint32_t c = 0; c < SKIPS; c++){
-//        pabb_send_info_i32(c);
-        log("Frames Skipped: " + std::to_string(c));
-        home_roll_date_enter_game_autorollback(*pabotbase, &year);
-        pbf_mash_button(*pabotbase, BUTTON_B, 90);
-
-        pbf_press_button(*pabotbase, BUTTON_A, 5, 5);
-        pbf_mash_button(*pabotbase, BUTTON_B, 215);
-
-        if (SAVE_ITERATIONS != 0){
-            save_count++;
-            if (save_count >= SAVE_ITERATIONS){
-                save_count = 0;
-                pbf_mash_button(*pabotbase, BUTTON_B, 2 * TICKS_PER_SECOND);
-                pbf_press_button(*pabotbase, BUTTON_X, 20, OVERWORLD_TO_MENU_DELAY);
-                pbf_press_button(*pabotbase, BUTTON_R, 20, 2 * TICKS_PER_SECOND);
-                pbf_press_button(*pabotbase, BUTTON_ZL, 20, 3 * TICKS_PER_SECOND);
-            }
-        }
-
-        //  Tap HOME and quickly spam B. The B spamming ensures that we don't
-        //  accidentally update the system if the system update window pops up.
-        pbf_press_button(*pabotbase, BUTTON_HOME, 10, 5);
-        pbf_mash_button(*pabotbase, BUTTON_B, GAME_TO_HOME_DELAY_FAST - 15);
-    }
-
-    end_program_callback(*pabotbase);
-    end_program_loop(*pabotbase);
-}
-
-
-}
-}
diff --git a/ClientSource/Programs/DeviceLogger.cpp b/ClientSource/Programs/DeviceLogger.cpp
deleted file mode 100644
index 97677cebe9..0000000000
--- a/ClientSource/Programs/DeviceLogger.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-/*  Device Logger
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- *      Run this program and it will automatically begin logging status updates
- *  from whatever program is running on the device.
- * 
- */
-
-#include <iostream>
-#include "Common/NintendoSwitch/NintendoSwitch_PushButtons.h"
-#include "ClientSource/Libraries/Utilities.h"
-
-namespace PokemonAutomation{
-
-
-void device_logger(const std::string& device_name){
-    std::cout << "Starting Device Logger..." << std::endl;
-    std::cout << std::endl;
-    std::unique_ptr<PABotBase> pabotbase = start_connection(false, device_name);
-//    global_connection = pabotbase.get();
-
-    std::cout << "Begin Message Logging..." << std::endl;
-    MessageLogger logger;
-    pabotbase->set_sniffer(&logger);
-
-
-    //  Wait Forever
-    while (true){
-        std::string x;
-        std::cin >> x;
-    }
-}
-
-
-}
diff --git a/ClientSource/Programs/FriendDelete.cpp b/ClientSource/Programs/FriendDelete.cpp
deleted file mode 100644
index 1582a3cdaa..0000000000
--- a/ClientSource/Programs/FriendDelete.cpp
+++ /dev/null
@@ -1,71 +0,0 @@
-/*  Friend Delete
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- *  This program is identical to FriendDelete in the Arduino programs.
- *  Please follow the same start instructions.
- * 
- */
-
-#include <iostream>
-#include "Common/NintendoSwitch/FrameworkSettings.h"
-#include "Common/NintendoSwitch/NintendoSwitch_Device.h"
-#include "Common/NintendoSwitch/NintendoSwitch_PushButtons.h"
-#include "Common/PokemonSwSh/PokemonSettings.h"
-#include "ClientSource/Libraries/Utilities.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-
-
-
-//  Set to a large number to delete all friends.
-const uint16_t FRIENDS_TO_DELETE    =   3;
-
-//  Instead of deleting friends, block them.
-const bool BLOCK_FRIENDS            =   false;
-
-//  Timings: You may need to increase if your internet is slow.
-const uint16_t VIEW_FRIEND_DELAY    =   2 * TICKS_PER_SECOND;   //  Delay from opening a friend to when you can press buttons.
-const uint16_t DELETE_FRIEND_DELAY  =   4 * TICKS_PER_SECOND;   //  Delay to delete the friend.
-const uint16_t FINISH_DELETE_DELAY  =   2 * TICKS_PER_SECOND;   //  Delay after deleting a friend.
-
-
-
-void program_FriendDelete(const std::string& device_name){
-    std::cout << "Starting PABotBase - FriendDelete..." << std::endl;
-    std::cout << std::endl;
-    std::unique_ptr<PABotBase> pabotbase = start_connection(true, device_name);
-//    global_connection = pabotbase.get();
-
-    std::cout << "Begin Message Logging..." << std::endl;
-    MessageLogger logger;
-    pabotbase->set_sniffer(&logger);
-
-
-    //  Start Program
-    start_program_flash(*pabotbase, CONNECT_CONTROLLER_DELAY);
-    pbf_press_button(*pabotbase, BUTTON_A, 5, 5);
-
-    for (uint16_t c = 0; c < FRIENDS_TO_DELETE; c++){
-        pbf_press_button(*pabotbase, BUTTON_A, 5, VIEW_FRIEND_DELAY);       //  View friend
-        pbf_press_dpad(*pabotbase, DPAD_DOWN, 5, 5);
-        pbf_press_button(*pabotbase, BUTTON_A, 10, 90);                     //  Click on Options
-        if (BLOCK_FRIENDS){
-            pbf_press_dpad(*pabotbase, DPAD_DOWN, 5, 5);
-        }
-        pbf_press_button(*pabotbase, BUTTON_A, 10, 90);                     //  Click on Remove/Block Friend
-        if (BLOCK_FRIENDS){
-            pbf_press_button(*pabotbase, BUTTON_A, 5, VIEW_FRIEND_DELAY);   //  Confirm 
-        }
-        pbf_press_button(*pabotbase, BUTTON_A, 5, DELETE_FRIEND_DELAY);     //  Confirm 
-        pbf_press_button(*pabotbase, BUTTON_A, 5, FINISH_DELETE_DELAY);     //  Finish delete friend.
-    }
-
-    end_program_callback(*pabotbase);
-    end_program_loop(*pabotbase);
-}
-
-
-}
-}
diff --git a/ClientSource/Programs/TurboA.cpp b/ClientSource/Programs/TurboA.cpp
deleted file mode 100644
index 0dcdda35da..0000000000
--- a/ClientSource/Programs/TurboA.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-/*  Turbo A
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- *  This program is identical to TurboA in the Arduino programs.
- *  Please follow the same start instructions.
- * 
- */
-
-#include <iostream>
-#include "Common/NintendoSwitch/FrameworkSettings.h"
-#include "Common/NintendoSwitch/NintendoSwitch_PushButtons.h"
-#include "Common/PokemonSwSh/PokemonSettings.h"
-#include "Common/PokemonSwSh/PokemonSwShGameEntry.h"
-#include "ClientSource/Libraries/Utilities.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-
-
-void program_TurboA(const std::string& device_name){
-    std::cout << "Starting PABotBase - TurboA..." << std::endl;
-    std::cout << std::endl;
-    std::unique_ptr<PABotBase> pabotbase = start_connection(true, device_name);
-//    global_connection = pabotbase.get();
-
-    std::cout << "Begin Message Logging..." << std::endl;
-    MessageLogger logger;
-    pabotbase->set_sniffer(&logger);
-
-
-    //  Start Program
-    start_program_flash(*pabotbase, CONNECT_CONTROLLER_DELAY);
-    grip_menu_connect_go_home(*pabotbase);
-    resume_game_no_interact(*pabotbase, TOLERATE_SYSTEM_UPDATE_MENU_FAST);
-
-    while (true){
-        pbf_press_button(*pabotbase, BUTTON_A, 5, 5);
-    }
-}
-
-
-}
-}
diff --git a/ClientSource/README.md b/ClientSource/README.md
deleted file mode 100644
index c2d0b7d839..0000000000
--- a/ClientSource/README.md
+++ /dev/null
@@ -1,28 +0,0 @@
-# ClientSource
-
-Source code for client-side (PC-side) of PABotBase.
-
-## How to Build
-
-These instructions will build the Device Logger. To change programs, edit [`Main.cpp`](../ClientSource/Main.cpp#L33).
-
-**Windows:**
-1. Install Visual Studio 2019 with C++.
-2. Navigate to [`ClientProject/`](../ClientProject).
-3. Open `PokemonAutomationClient.sln` with Visual Studio.
-4. Press F7 to compile or F5 to build and run.
- 
- This will create a folder inside `ClientProject` that will contain the binary.
-
-
-**Linux:**
-1. Install `make` and `g++`.
-2. Navigate to [`ClientSource`](../ClientSource).
-3. Type `make` and hit enter.
- 
- This will create a folder named `Linux` next to `ClientSource` that contains all the binaries and build artifacts.
- 
-
-**Mac:**
-
-Not officially supported yet, but the Linux steps might work with little to no modifications.
diff --git a/ClientSource/makefile b/ClientSource/makefile
deleted file mode 100644
index 66217354c6..0000000000
--- a/ClientSource/makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-#include SourceRoot.mk
-
-SOURCE_ROOT := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
-
-include Objects.mk
-include Common.mk
-
-device-logger: $(addprefix $(OUTPUT_DEVICELOGGER)/, $(SOURCES:.cpp=.o))
-	mkdir -p $(OUTPUT_ROOT)/Binaries/
-	$(CC) Main.cpp $^ $(CFLAGS_DEVICELOGGER) -o $(OUTPUT_ROOT)/Binaries/$@
-
diff --git a/CodingAgentContext/AutomationProgramPatterns.md b/CodingAgentContext/AutomationProgramPatterns.md
new file mode 100644
index 0000000000..fee4a67712
--- /dev/null
+++ b/CodingAgentContext/AutomationProgramPatterns.md
@@ -0,0 +1,160 @@
+# Automation Program Patterns
+
+## Basic Program Structure (for Single-Switch Programs)
+
+### Required Files
+```
+GameName_ProgramName.h      // Header with class declarations
+GameName_ProgramName.cpp    // Implementation
+```
+Example game names: `PokemonLA`, `PokemonSwSh`, `PokemonSV`, `PokemonBDSP`
+
+### Core Classes
+```cpp
+class ProgramName_Descriptor : public SingleSwitchProgramDescriptor
+class ProgramName : public SingleSwitchProgramInstance
+```
+
+## Essential Includes
+
+### Header (.h)
+```cpp
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+```
+
+### Implementation (.cpp)
+```cpp
+#include "CommonFramework/Exceptions/ProgramFinishedException.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+```
+
+## Example Program Options
+
+### Common Option Types
+```cpp
+SimpleIntegerOption<uint16_t> NUM_BOXES(
+    "<b>Number of Boxes:</b>",
+    LockMode::LOCK_WHILE_RUNNING,
+    5, 1, 30  // default, min, max
+);
+
+BooleanCheckBoxOption ENABLE_FEATURE(
+    "<b>Enable Feature:</b>",
+    LockMode::LOCK_WHILE_RUNNING,
+    true
+);
+```
+
+### Register Options
+```cpp
+PA_ADD_OPTION(NUM_BOXES);
+PA_ADD_OPTION(ENABLE_FEATURE);
+```
+
+## Notifications
+
+### Declaration (in .h)
+```cpp
+EventNotificationOption NOTIFICATION_STATUS_UPDATE;
+EventNotificationsOption NOTIFICATIONS;
+```
+
+### Initialization (in constructor)
+```cpp
+NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
+, NOTIFICATIONS({
+    &NOTIFICATION_STATUS_UPDATE,
+    &NOTIFICATION_PROGRAM_FINISH,
+    &NOTIFICATION_ERROR_FATAL,
+})
+```
+
+### Sending Notifications
+```cpp
+send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
+send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+send_program_fatal_error_notification(env, NOTIFICATION_ERROR_FATAL, "Error message");
+```
+
+## Controller Input
+
+### Button Presses
+```cpp
+pbf_press_button(context, BUTTON_A, 10, 100);  // button, hold_time, release_time
+pbf_press_dpad(context, DPAD_DOWN, 20, 50);
+context.wait_for_all_requests();  // wait for button to finish execution
+```
+
+### Delays
+```cpp
+context.wait_for(std::chrono::milliseconds(1000));
+```
+
+## Main Program Function Pattern
+
+### Simplest Program
+```cpp
+void ProgramName::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    // button presses and inference routines
+}
+```
+
+## Looping Program with Ability to Recover from Minor Error
+
+```cpp
+while(true){
+    try{
+        // Initialization logic
+
+        env.update_stats();
+        send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
+
+        // Main program logic
+
+        send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+    }catch(ProgramFinishedException&){ // an exception indicating the program has finished
+        env.update_stats();
+        send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+        throw;
+    }catch(OperationFailedException& e){ // an exception indicating an error somewhere in the loop
+        if(...){ // if we can recover from it
+            // execute recover logic (usually is restarting the game)
+            continue;
+        }
+        // we cannot recover from the exception. Throw the exception to the higher level to
+        // trigger fatal error noticiation and cleanup.
+        throw;
+    }
+}
+```
+
+
+## Program Registration
+
+### In GameName_Panels.cpp
+```cpp
+// Add include
+#include "Programs/Category/GameName_ProgramName.h"
+
+// Add to make_panels()
+ret.emplace_back(make_single_switch_program<ProgramName_Descriptor, ProgramName>());
+```
+Examples: `PokemonLA_Panels.cpp`, `PokemonSwSh_Panels.cpp`, `PokemonSV_Panels.cpp`
+
+## Descriptor Configuration
+
+```cpp
+ProgramName_Descriptor::ProgramName_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "GameName:ProgramName",                // Unique ID
+        STRING_POKEMON + " [GameName]", "Display Name",  // Category, Name
+        "ComputerControl/blob/master/Wiki/...",     // Wiki URL
+        "Brief description.",                       // Description
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,                     // or NONE
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+```
\ No newline at end of file
diff --git a/CodingAgentContext/IncludeOrder.md b/CodingAgentContext/IncludeOrder.md
new file mode 100644
index 0000000000..45be0c312d
--- /dev/null
+++ b/CodingAgentContext/IncludeOrder.md
@@ -0,0 +1,67 @@
+# Include Sort Order
+
+The include order convention is roughly as follows:
+
+1. Absolute path includes go first. An absolute path is relative to either the repo root or one of the include directories that's passed as a compiler flag.
+2. Relative paths. These will always be relative to the same folder as the current file. Backwards includes (`../`) are banned outside of code that is shared with firmware.
+3. Includes in the same folder (with no `/`) will be sorted last.
+
+For files that are within the same category above, sort them according to this natural order:
+
+- Standard C includes (`stdin.h`)
+- Standard C++ includes (`vector`)
+- OS-specific includes ('Windows.h')
+- Non-Qt 3rd party. (`immintrin.h`, `opencv.hpp`, etc...)
+- Qt (`QWidget`)
+- `3rdParty-Core`
+- `3rdParty`
+- `Common/Compiler.h`
+- `Common/Cpp/`
+- `Common/Qt/`
+- `Common/CRC32/`
+- `Common/PABotBase2/`
+- `Common/*` (everything else)
+- `Kernels/`
+- `CommonFramework/`
+- `CommonTools/`
+- `ML/`
+- `Tests/`
+- `ComputerPrograms/`
+- `ControllerInput/`
+- `Controllers/`
+- `GameConsole/`
+- `Integrations/`
+- `NintendoSwitch/`
+- `Pokemon/`
+- `PokemonBDSP/`
+- `VideoGames/`
+- `VideoGames/PokemonHome/`
+- `VideoGames/PokemonLGPE/`
+- `VideoGames/PokemonSwSh/`
+- `VideoGames/PokemonLA/`
+- `VideoGames/PokemonSV/`
+- `VideoGames/PokemonLZA/`
+- `VideoGames/PokemonFRLG/`
+- `VideoGames/PokemonPokopia/`
+- `VideoGames/PokemonRSE/`
+- `VideoGames/ZeldaTotK/`
+
+This list is not exhaustive.
+
+The pattern is that directories with fewer dependencies are at top (core libraries), while those with more dependencies (apps) are at the bottom. Naturally, a .cpp's own header will almost always be the last include. The order within `VideoGames/` is in approximate order of release date with Pokemon games sorted first.
+
+Include orders within each bullet are not specified, though many of them also have natural suborderings.
+
+
+**Debugging Exception:**
+
+Files that are actively being debugged may have this after all the includes. If the `<iostream>` not being used for non-debugging code, then leave this pattern intact and do not pull it into the sorted includes above.
+```
+#include <iostream>
+using std::cout;
+using std::endl;
+```
+
+**List Exception:**
+
+For files that consist of long lists of things that map 1-to-1 with a header (such as a panel list file), the include order of the list should match the order they are used in the file.
diff --git a/Common/CRC32.c b/Common/CRC32.c
deleted file mode 100644
index 509f728116..0000000000
--- a/Common/CRC32.c
+++ /dev/null
@@ -1,133 +0,0 @@
-/*  CRC32
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- */
-
-#include "CRC32.h"
-
-uint32_t pabb_crc32_byte_basic(uint32_t crc, uint8_t byte){
-    crc ^= byte;
-    crc = (crc & 1) ? (crc >> 1) ^ 0x82f63b78 : crc >> 1;
-    crc = (crc & 1) ? (crc >> 1) ^ 0x82f63b78 : crc >> 1;
-    crc = (crc & 1) ? (crc >> 1) ^ 0x82f63b78 : crc >> 1;
-    crc = (crc & 1) ? (crc >> 1) ^ 0x82f63b78 : crc >> 1;
-    crc = (crc & 1) ? (crc >> 1) ^ 0x82f63b78 : crc >> 1;
-    crc = (crc & 1) ? (crc >> 1) ^ 0x82f63b78 : crc >> 1;
-    crc = (crc & 1) ? (crc >> 1) ^ 0x82f63b78 : crc >> 1;
-    crc = (crc & 1) ? (crc >> 1) ^ 0x82f63b78 : crc >> 1;
-    return crc;
-}
-uint32_t pabb_crc32_basic(uint32_t crc, const void* data, size_t length){
-    const char* ptr = (const char*)data;
-    for (size_t c = 0; c < length; c++){
-        crc = pabb_crc32_byte_basic(crc, ptr[c]);
-    }
-    return crc;
-}
-
-
-#if __AVR__
-#include <avr/pgmspace.h>
-#else
-#define PROGMEM
-#endif
-#ifdef __AVR_ATmega16U2__
-//  4-bit table
-const uint32_t PROGMEM CRC32_TABLE4[] = {
-    0x00000000, 0x105ec76f, 0x20bd8ede, 0x30e349b1,
-    0x417b1dbc, 0x5125dad3, 0x61c69362, 0x7198540d,
-    0x82f63b78, 0x92a8fc17, 0xa24bb5a6, 0xb21572c9,
-    0xc38d26c4, 0xd3d3e1ab, 0xe330a81a, 0xf36e6f75,
-};
-void iterate_table(uint32_t* crc, uint8_t nibble){
-#if __AVR__
-    uint32_t entry;
-    memcpy_P(&entry, CRC32_TABLE4 + (((uint8_t)*crc ^ nibble) & 0x0f), sizeof(uint32_t));
-    *crc = entry ^ (*crc >> 4);
-#else
-    *crc = CRC32_TABLE4[((uint8_t)*crc ^ nibble) & 0x0f] ^ (*crc >> 4);
-#endif
-}
-//uint32_t pabb_crc32_byte_table(uint32_t crc, uint8_t byte){
-//    iterate_table(&crc, byte);
-//    iterate_table(&crc, byte >> 4);
-//    return crc;
-//}
-uint32_t pabb_crc32_table(uint32_t crc, const void* str, size_t length){
-    const char* ptr = (const char*)str;
-    for (size_t c = 0; c < length; c++){
-//        crc = pabb_crc32_byte_table(crc, ptr[c]);
-        uint8_t byte = ptr[c];
-        iterate_table(&crc, byte);
-        iterate_table(&crc, byte >> 4);
-    }
-    return crc;
-}
-#else
-//  8-bit table is too much of a memory hog for atmega16u2. :(
-const uint32_t PROGMEM CRC32_TABLE8[] = {
-    0x00000000, 0xf26b8303, 0xe13b70f7, 0x1350f3f4, 0xc79a971f, 0x35f1141c, 0x26a1e7e8, 0xd4ca64eb,
-    0x8ad958cf, 0x78b2dbcc, 0x6be22838, 0x9989ab3b, 0x4d43cfd0, 0xbf284cd3, 0xac78bf27, 0x5e133c24,
-    0x105ec76f, 0xe235446c, 0xf165b798, 0x030e349b, 0xd7c45070, 0x25afd373, 0x36ff2087, 0xc494a384,
-    0x9a879fa0, 0x68ec1ca3, 0x7bbcef57, 0x89d76c54, 0x5d1d08bf, 0xaf768bbc, 0xbc267848, 0x4e4dfb4b,
-    0x20bd8ede, 0xd2d60ddd, 0xc186fe29, 0x33ed7d2a, 0xe72719c1, 0x154c9ac2, 0x061c6936, 0xf477ea35,
-    0xaa64d611, 0x580f5512, 0x4b5fa6e6, 0xb93425e5, 0x6dfe410e, 0x9f95c20d, 0x8cc531f9, 0x7eaeb2fa,
-    0x30e349b1, 0xc288cab2, 0xd1d83946, 0x23b3ba45, 0xf779deae, 0x05125dad, 0x1642ae59, 0xe4292d5a,
-    0xba3a117e, 0x4851927d, 0x5b016189, 0xa96ae28a, 0x7da08661, 0x8fcb0562, 0x9c9bf696, 0x6ef07595,
-    0x417b1dbc, 0xb3109ebf, 0xa0406d4b, 0x522bee48, 0x86e18aa3, 0x748a09a0, 0x67dafa54, 0x95b17957,
-    0xcba24573, 0x39c9c670, 0x2a993584, 0xd8f2b687, 0x0c38d26c, 0xfe53516f, 0xed03a29b, 0x1f682198,
-    0x5125dad3, 0xa34e59d0, 0xb01eaa24, 0x42752927, 0x96bf4dcc, 0x64d4cecf, 0x77843d3b, 0x85efbe38,
-    0xdbfc821c, 0x2997011f, 0x3ac7f2eb, 0xc8ac71e8, 0x1c661503, 0xee0d9600, 0xfd5d65f4, 0x0f36e6f7,
-    0x61c69362, 0x93ad1061, 0x80fde395, 0x72966096, 0xa65c047d, 0x5437877e, 0x4767748a, 0xb50cf789,
-    0xeb1fcbad, 0x197448ae, 0x0a24bb5a, 0xf84f3859, 0x2c855cb2, 0xdeeedfb1, 0xcdbe2c45, 0x3fd5af46,
-    0x7198540d, 0x83f3d70e, 0x90a324fa, 0x62c8a7f9, 0xb602c312, 0x44694011, 0x5739b3e5, 0xa55230e6,
-    0xfb410cc2, 0x092a8fc1, 0x1a7a7c35, 0xe811ff36, 0x3cdb9bdd, 0xceb018de, 0xdde0eb2a, 0x2f8b6829,
-    0x82f63b78, 0x709db87b, 0x63cd4b8f, 0x91a6c88c, 0x456cac67, 0xb7072f64, 0xa457dc90, 0x563c5f93,
-    0x082f63b7, 0xfa44e0b4, 0xe9141340, 0x1b7f9043, 0xcfb5f4a8, 0x3dde77ab, 0x2e8e845f, 0xdce5075c,
-    0x92a8fc17, 0x60c37f14, 0x73938ce0, 0x81f80fe3, 0x55326b08, 0xa759e80b, 0xb4091bff, 0x466298fc,
-    0x1871a4d8, 0xea1a27db, 0xf94ad42f, 0x0b21572c, 0xdfeb33c7, 0x2d80b0c4, 0x3ed04330, 0xccbbc033,
-    0xa24bb5a6, 0x502036a5, 0x4370c551, 0xb11b4652, 0x65d122b9, 0x97baa1ba, 0x84ea524e, 0x7681d14d,
-    0x2892ed69, 0xdaf96e6a, 0xc9a99d9e, 0x3bc21e9d, 0xef087a76, 0x1d63f975, 0x0e330a81, 0xfc588982,
-    0xb21572c9, 0x407ef1ca, 0x532e023e, 0xa145813d, 0x758fe5d6, 0x87e466d5, 0x94b49521, 0x66df1622,
-    0x38cc2a06, 0xcaa7a905, 0xd9f75af1, 0x2b9cd9f2, 0xff56bd19, 0x0d3d3e1a, 0x1e6dcdee, 0xec064eed,
-    0xc38d26c4, 0x31e6a5c7, 0x22b65633, 0xd0ddd530, 0x0417b1db, 0xf67c32d8, 0xe52cc12c, 0x1747422f,
-    0x49547e0b, 0xbb3ffd08, 0xa86f0efc, 0x5a048dff, 0x8ecee914, 0x7ca56a17, 0x6ff599e3, 0x9d9e1ae0,
-    0xd3d3e1ab, 0x21b862a8, 0x32e8915c, 0xc083125f, 0x144976b4, 0xe622f5b7, 0xf5720643, 0x07198540,
-    0x590ab964, 0xab613a67, 0xb831c993, 0x4a5a4a90, 0x9e902e7b, 0x6cfbad78, 0x7fab5e8c, 0x8dc0dd8f,
-    0xe330a81a, 0x115b2b19, 0x020bd8ed, 0xf0605bee, 0x24aa3f05, 0xd6c1bc06, 0xc5914ff2, 0x37faccf1,
-    0x69e9f0d5, 0x9b8273d6, 0x88d28022, 0x7ab90321, 0xae7367ca, 0x5c18e4c9, 0x4f48173d, 0xbd23943e,
-    0xf36e6f75, 0x0105ec76, 0x12551f82, 0xe03e9c81, 0x34f4f86a, 0xc69f7b69, 0xd5cf889d, 0x27a40b9e,
-    0x79b737ba, 0x8bdcb4b9, 0x988c474d, 0x6ae7c44e, 0xbe2da0a5, 0x4c4623a6, 0x5f16d052, 0xad7d5351,
-};
-uint32_t pabb_crc32_byte_table(uint32_t crc, uint8_t byte){
-    uint32_t entry;
-#if __AVR__
-    memcpy_P(&entry, CRC32_TABLE8 + ((uint8_t)crc ^ byte), sizeof(uint32_t));
-#else
-    entry = CRC32_TABLE8[(uint8_t)crc ^ byte];
-#endif
-    return entry ^ (crc >> 8);
-}
-uint32_t pabb_crc32_table(uint32_t crc, const void* data, size_t length){
-    const char* ptr = (const char*)data;
-    for (size_t c = 0; c < length; c++){
-        uint32_t entry;
-#if __AVR__
-        memcpy_P(&entry, CRC32_TABLE8 + ((uint8_t)crc ^ (uint8_t)ptr[c]), sizeof(uint32_t));
-#else
-        entry = CRC32_TABLE8[(uint8_t)crc ^ (uint8_t)ptr[c]];
-#endif
-        crc = entry ^ (crc >> 8);
-    }
-    return crc;
-}
-#endif
-
-
-
-void pabb_crc32_write_to_message(const void* data, size_t full_message_length){
-    const char* ptr = (const char*)data;
-    size_t length_before_crc = full_message_length - sizeof(uint32_t);
-    *(uint32_t*)(ptr + length_before_crc) = pabb_crc32(0xffffffff, ptr, length_before_crc);
-}
diff --git a/Common/CRC32.cpp b/Common/CRC32.cpp
deleted file mode 100644
index 0e5b87c740..0000000000
--- a/Common/CRC32.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-
-#include "CRC32.c"
diff --git a/Common/CRC32.h b/Common/CRC32.h
deleted file mode 100644
index 858d521baf..0000000000
--- a/Common/CRC32.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*  CRC32
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- */
-
-#ifndef PokemonAutomation_CRC32_H
-#define PokemonAutomation_CRC32_H
-
-#include <stddef.h>
-#include <stdint.h>
-
-
-//  Basic Implementation
-uint32_t pabb_crc32_basic(uint32_t crc, const void* data, size_t length);
-
-//  Table Implementation
-uint32_t pabb_crc32_table(uint32_t crc, const void* data, size_t length);
-
-//  SSE4.2
-#if _M_IX86 || _M_X64
-#include <nmmintrin.h>
-#include "Common/Compiler.h"
-PA_FORCE_INLINE uint32_t pabb_crc32_SSE42(uint32_t crc, const void* data, size_t length){
-    const char* ptr = (const char*)data;
-    for (size_t c = 0; c < length; c++){
-        crc = _mm_crc32_u8(crc, ptr[c]);
-    }
-    return crc;
-}
-#endif
-
-
-#if _M_IX86 || _M_X64
-#define pabb_crc32      pabb_crc32_SSE42
-#elif __AVR__
-#define pabb_crc32      pabb_crc32_table
-#else
-#define pabb_crc32      pabb_crc32_basic
-#endif
-
-void pabb_crc32_write_to_message(const void* data, size_t full_message_length);
-
-
-#endif
diff --git a/Common/CRC32/pabb_CRC32.c b/Common/CRC32/pabb_CRC32.c
new file mode 100644
index 0000000000..cfbbd8eb1a
--- /dev/null
+++ b/Common/CRC32/pabb_CRC32.c
@@ -0,0 +1,14 @@
+/*  CRC32
+ * 
+ *  From: https://github.com/PokemonAutomation/
+ * 
+ */
+
+#if 0
+#elif _M_IX86 || _M_X64 || __i386__ || __x86_64__
+#include "pabb_CRC32_x86_SSE4.1.h"
+#elif __AVR__
+#include "pabb_CRC32_AVR8.c"
+#else
+#include "pabb_CRC32_Basic.c"
+#endif
diff --git a/Common/CRC32/pabb_CRC32.h b/Common/CRC32/pabb_CRC32.h
new file mode 100644
index 0000000000..70c7c19fec
--- /dev/null
+++ b/Common/CRC32/pabb_CRC32.h
@@ -0,0 +1,21 @@
+/*  CRC32
+ * 
+ *  From: https://github.com/PokemonAutomation/
+ * 
+ */
+
+#ifndef PokemonAutomation_Common_CRC32_H
+#define PokemonAutomation_Common_CRC32_H
+
+
+#if 0
+#elif _M_IX86 || _M_X64 || __i386__ || __x86_64__
+#include "pabb_CRC32_x86_SSE4.1.h"
+#elif __AVR__
+#include "pabb_CRC32_AVR8.h"
+#else
+#include "pabb_CRC32_Basic.h"
+#endif
+
+
+#endif
diff --git a/Common/CRC32/pabb_CRC32_AVR8.c b/Common/CRC32/pabb_CRC32_AVR8.c
new file mode 100644
index 0000000000..3b805ba9a7
--- /dev/null
+++ b/Common/CRC32/pabb_CRC32_AVR8.c
@@ -0,0 +1,60 @@
+/*  CRC32
+ * 
+ *  From: https://github.com/PokemonAutomation/
+ * 
+ */
+
+#include "pabb_CRC32_AVR8.h"
+
+//  8-bit table
+const uint32_t PROGMEM PABB_CRC32C_TABLE8[] = {
+    0x00000000, 0xf26b8303, 0xe13b70f7, 0x1350f3f4, 0xc79a971f, 0x35f1141c, 0x26a1e7e8, 0xd4ca64eb,
+    0x8ad958cf, 0x78b2dbcc, 0x6be22838, 0x9989ab3b, 0x4d43cfd0, 0xbf284cd3, 0xac78bf27, 0x5e133c24,
+    0x105ec76f, 0xe235446c, 0xf165b798, 0x030e349b, 0xd7c45070, 0x25afd373, 0x36ff2087, 0xc494a384,
+    0x9a879fa0, 0x68ec1ca3, 0x7bbcef57, 0x89d76c54, 0x5d1d08bf, 0xaf768bbc, 0xbc267848, 0x4e4dfb4b,
+    0x20bd8ede, 0xd2d60ddd, 0xc186fe29, 0x33ed7d2a, 0xe72719c1, 0x154c9ac2, 0x061c6936, 0xf477ea35,
+    0xaa64d611, 0x580f5512, 0x4b5fa6e6, 0xb93425e5, 0x6dfe410e, 0x9f95c20d, 0x8cc531f9, 0x7eaeb2fa,
+    0x30e349b1, 0xc288cab2, 0xd1d83946, 0x23b3ba45, 0xf779deae, 0x05125dad, 0x1642ae59, 0xe4292d5a,
+    0xba3a117e, 0x4851927d, 0x5b016189, 0xa96ae28a, 0x7da08661, 0x8fcb0562, 0x9c9bf696, 0x6ef07595,
+    0x417b1dbc, 0xb3109ebf, 0xa0406d4b, 0x522bee48, 0x86e18aa3, 0x748a09a0, 0x67dafa54, 0x95b17957,
+    0xcba24573, 0x39c9c670, 0x2a993584, 0xd8f2b687, 0x0c38d26c, 0xfe53516f, 0xed03a29b, 0x1f682198,
+    0x5125dad3, 0xa34e59d0, 0xb01eaa24, 0x42752927, 0x96bf4dcc, 0x64d4cecf, 0x77843d3b, 0x85efbe38,
+    0xdbfc821c, 0x2997011f, 0x3ac7f2eb, 0xc8ac71e8, 0x1c661503, 0xee0d9600, 0xfd5d65f4, 0x0f36e6f7,
+    0x61c69362, 0x93ad1061, 0x80fde395, 0x72966096, 0xa65c047d, 0x5437877e, 0x4767748a, 0xb50cf789,
+    0xeb1fcbad, 0x197448ae, 0x0a24bb5a, 0xf84f3859, 0x2c855cb2, 0xdeeedfb1, 0xcdbe2c45, 0x3fd5af46,
+    0x7198540d, 0x83f3d70e, 0x90a324fa, 0x62c8a7f9, 0xb602c312, 0x44694011, 0x5739b3e5, 0xa55230e6,
+    0xfb410cc2, 0x092a8fc1, 0x1a7a7c35, 0xe811ff36, 0x3cdb9bdd, 0xceb018de, 0xdde0eb2a, 0x2f8b6829,
+    0x82f63b78, 0x709db87b, 0x63cd4b8f, 0x91a6c88c, 0x456cac67, 0xb7072f64, 0xa457dc90, 0x563c5f93,
+    0x082f63b7, 0xfa44e0b4, 0xe9141340, 0x1b7f9043, 0xcfb5f4a8, 0x3dde77ab, 0x2e8e845f, 0xdce5075c,
+    0x92a8fc17, 0x60c37f14, 0x73938ce0, 0x81f80fe3, 0x55326b08, 0xa759e80b, 0xb4091bff, 0x466298fc,
+    0x1871a4d8, 0xea1a27db, 0xf94ad42f, 0x0b21572c, 0xdfeb33c7, 0x2d80b0c4, 0x3ed04330, 0xccbbc033,
+    0xa24bb5a6, 0x502036a5, 0x4370c551, 0xb11b4652, 0x65d122b9, 0x97baa1ba, 0x84ea524e, 0x7681d14d,
+    0x2892ed69, 0xdaf96e6a, 0xc9a99d9e, 0x3bc21e9d, 0xef087a76, 0x1d63f975, 0x0e330a81, 0xfc588982,
+    0xb21572c9, 0x407ef1ca, 0x532e023e, 0xa145813d, 0x758fe5d6, 0x87e466d5, 0x94b49521, 0x66df1622,
+    0x38cc2a06, 0xcaa7a905, 0xd9f75af1, 0x2b9cd9f2, 0xff56bd19, 0x0d3d3e1a, 0x1e6dcdee, 0xec064eed,
+    0xc38d26c4, 0x31e6a5c7, 0x22b65633, 0xd0ddd530, 0x0417b1db, 0xf67c32d8, 0xe52cc12c, 0x1747422f,
+    0x49547e0b, 0xbb3ffd08, 0xa86f0efc, 0x5a048dff, 0x8ecee914, 0x7ca56a17, 0x6ff599e3, 0x9d9e1ae0,
+    0xd3d3e1ab, 0x21b862a8, 0x32e8915c, 0xc083125f, 0x144976b4, 0xe622f5b7, 0xf5720643, 0x07198540,
+    0x590ab964, 0xab613a67, 0xb831c993, 0x4a5a4a90, 0x9e902e7b, 0x6cfbad78, 0x7fab5e8c, 0x8dc0dd8f,
+    0xe330a81a, 0x115b2b19, 0x020bd8ed, 0xf0605bee, 0x24aa3f05, 0xd6c1bc06, 0xc5914ff2, 0x37faccf1,
+    0x69e9f0d5, 0x9b8273d6, 0x88d28022, 0x7ab90321, 0xae7367ca, 0x5c18e4c9, 0x4f48173d, 0xbd23943e,
+    0xf36e6f75, 0x0105ec76, 0x12551f82, 0xe03e9c81, 0x34f4f86a, 0xc69f7b69, 0xd5cf889d, 0x27a40b9e,
+    0x79b737ba, 0x8bdcb4b9, 0x988c474d, 0x6ae7c44e, 0xbe2da0a5, 0x4c4623a6, 0x5f16d052, 0xad7d5351,
+};
+
+
+void pabb_crc32c_byte(uint32_t* crc, uint8_t data){
+    uint32_t entry;
+    memcpy_P(&entry, &PABB_CRC32C_TABLE8[(uint8_t)*crc ^ data], sizeof(uint32_t));
+    *crc = entry ^ (*crc >> 8);
+}
+void pabb_crc32c_buffer(uint32_t* crc, const void* data, uint8_t length){
+    const uint8_t* ptr = (const uint8_t*)data;
+    while (length--){
+        uint32_t entry;
+        memcpy_P(&entry, &PABB_CRC32C_TABLE8[(uint8_t)*crc ^ *ptr], sizeof(uint32_t));
+        *crc = entry ^ (*crc >> 8);
+        ptr++;
+    }
+}
+
diff --git a/Common/CRC32/pabb_CRC32_AVR8.h b/Common/CRC32/pabb_CRC32_AVR8.h
new file mode 100644
index 0000000000..7445fa4346
--- /dev/null
+++ b/Common/CRC32/pabb_CRC32_AVR8.h
@@ -0,0 +1,39 @@
+/*  CRC32
+ * 
+ *  From: https://github.com/PokemonAutomation/
+ * 
+ */
+
+#ifndef PokemonAutomation_Common_CRC32_AVR8_H
+#define PokemonAutomation_Common_CRC32_AVR8_H
+
+#include <stdint.h>
+#include <avr/pgmspace.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+
+//
+//  These implement the CRC32c with polynomial 0x11EDC6F41.
+//
+extern const PROGMEM uint32_t PABB_CRC32C_TABLE8[];
+
+void pabb_crc32c_buffer(uint32_t* crc, const void* data, uint8_t length);
+
+static inline void pabb_crc32c_write_to_message(uint32_t seed, void* data, size_t full_message_length){
+    char* ptr = (char*)data;
+    size_t length_before_crc = full_message_length - sizeof(uint32_t);
+    uint32_t* crc = (uint32_t*)(ptr + length_before_crc);
+    *crc = seed;
+    pabb_crc32c_buffer(crc, ptr, length_before_crc);
+}
+
+
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/Common/CRC32/pabb_CRC32_Basic.c b/Common/CRC32/pabb_CRC32_Basic.c
new file mode 100644
index 0000000000..e0e4a56b57
--- /dev/null
+++ b/Common/CRC32/pabb_CRC32_Basic.c
@@ -0,0 +1,57 @@
+/*  CRC32
+ * 
+ *  From: https://github.com/PokemonAutomation/
+ * 
+ */
+
+#include "pabb_CRC32_Basic.h"
+
+//  8-bit table
+const uint32_t PABB_CRC32C_TABLE8[] = {
+    0x00000000, 0xf26b8303, 0xe13b70f7, 0x1350f3f4, 0xc79a971f, 0x35f1141c, 0x26a1e7e8, 0xd4ca64eb,
+    0x8ad958cf, 0x78b2dbcc, 0x6be22838, 0x9989ab3b, 0x4d43cfd0, 0xbf284cd3, 0xac78bf27, 0x5e133c24,
+    0x105ec76f, 0xe235446c, 0xf165b798, 0x030e349b, 0xd7c45070, 0x25afd373, 0x36ff2087, 0xc494a384,
+    0x9a879fa0, 0x68ec1ca3, 0x7bbcef57, 0x89d76c54, 0x5d1d08bf, 0xaf768bbc, 0xbc267848, 0x4e4dfb4b,
+    0x20bd8ede, 0xd2d60ddd, 0xc186fe29, 0x33ed7d2a, 0xe72719c1, 0x154c9ac2, 0x061c6936, 0xf477ea35,
+    0xaa64d611, 0x580f5512, 0x4b5fa6e6, 0xb93425e5, 0x6dfe410e, 0x9f95c20d, 0x8cc531f9, 0x7eaeb2fa,
+    0x30e349b1, 0xc288cab2, 0xd1d83946, 0x23b3ba45, 0xf779deae, 0x05125dad, 0x1642ae59, 0xe4292d5a,
+    0xba3a117e, 0x4851927d, 0x5b016189, 0xa96ae28a, 0x7da08661, 0x8fcb0562, 0x9c9bf696, 0x6ef07595,
+    0x417b1dbc, 0xb3109ebf, 0xa0406d4b, 0x522bee48, 0x86e18aa3, 0x748a09a0, 0x67dafa54, 0x95b17957,
+    0xcba24573, 0x39c9c670, 0x2a993584, 0xd8f2b687, 0x0c38d26c, 0xfe53516f, 0xed03a29b, 0x1f682198,
+    0x5125dad3, 0xa34e59d0, 0xb01eaa24, 0x42752927, 0x96bf4dcc, 0x64d4cecf, 0x77843d3b, 0x85efbe38,
+    0xdbfc821c, 0x2997011f, 0x3ac7f2eb, 0xc8ac71e8, 0x1c661503, 0xee0d9600, 0xfd5d65f4, 0x0f36e6f7,
+    0x61c69362, 0x93ad1061, 0x80fde395, 0x72966096, 0xa65c047d, 0x5437877e, 0x4767748a, 0xb50cf789,
+    0xeb1fcbad, 0x197448ae, 0x0a24bb5a, 0xf84f3859, 0x2c855cb2, 0xdeeedfb1, 0xcdbe2c45, 0x3fd5af46,
+    0x7198540d, 0x83f3d70e, 0x90a324fa, 0x62c8a7f9, 0xb602c312, 0x44694011, 0x5739b3e5, 0xa55230e6,
+    0xfb410cc2, 0x092a8fc1, 0x1a7a7c35, 0xe811ff36, 0x3cdb9bdd, 0xceb018de, 0xdde0eb2a, 0x2f8b6829,
+    0x82f63b78, 0x709db87b, 0x63cd4b8f, 0x91a6c88c, 0x456cac67, 0xb7072f64, 0xa457dc90, 0x563c5f93,
+    0x082f63b7, 0xfa44e0b4, 0xe9141340, 0x1b7f9043, 0xcfb5f4a8, 0x3dde77ab, 0x2e8e845f, 0xdce5075c,
+    0x92a8fc17, 0x60c37f14, 0x73938ce0, 0x81f80fe3, 0x55326b08, 0xa759e80b, 0xb4091bff, 0x466298fc,
+    0x1871a4d8, 0xea1a27db, 0xf94ad42f, 0x0b21572c, 0xdfeb33c7, 0x2d80b0c4, 0x3ed04330, 0xccbbc033,
+    0xa24bb5a6, 0x502036a5, 0x4370c551, 0xb11b4652, 0x65d122b9, 0x97baa1ba, 0x84ea524e, 0x7681d14d,
+    0x2892ed69, 0xdaf96e6a, 0xc9a99d9e, 0x3bc21e9d, 0xef087a76, 0x1d63f975, 0x0e330a81, 0xfc588982,
+    0xb21572c9, 0x407ef1ca, 0x532e023e, 0xa145813d, 0x758fe5d6, 0x87e466d5, 0x94b49521, 0x66df1622,
+    0x38cc2a06, 0xcaa7a905, 0xd9f75af1, 0x2b9cd9f2, 0xff56bd19, 0x0d3d3e1a, 0x1e6dcdee, 0xec064eed,
+    0xc38d26c4, 0x31e6a5c7, 0x22b65633, 0xd0ddd530, 0x0417b1db, 0xf67c32d8, 0xe52cc12c, 0x1747422f,
+    0x49547e0b, 0xbb3ffd08, 0xa86f0efc, 0x5a048dff, 0x8ecee914, 0x7ca56a17, 0x6ff599e3, 0x9d9e1ae0,
+    0xd3d3e1ab, 0x21b862a8, 0x32e8915c, 0xc083125f, 0x144976b4, 0xe622f5b7, 0xf5720643, 0x07198540,
+    0x590ab964, 0xab613a67, 0xb831c993, 0x4a5a4a90, 0x9e902e7b, 0x6cfbad78, 0x7fab5e8c, 0x8dc0dd8f,
+    0xe330a81a, 0x115b2b19, 0x020bd8ed, 0xf0605bee, 0x24aa3f05, 0xd6c1bc06, 0xc5914ff2, 0x37faccf1,
+    0x69e9f0d5, 0x9b8273d6, 0x88d28022, 0x7ab90321, 0xae7367ca, 0x5c18e4c9, 0x4f48173d, 0xbd23943e,
+    0xf36e6f75, 0x0105ec76, 0x12551f82, 0xe03e9c81, 0x34f4f86a, 0xc69f7b69, 0xd5cf889d, 0x27a40b9e,
+    0x79b737ba, 0x8bdcb4b9, 0x988c474d, 0x6ae7c44e, 0xbe2da0a5, 0x4c4623a6, 0x5f16d052, 0xad7d5351,
+};
+
+
+void pabb_crc32c_byte(uint32_t* crc, uint8_t data){
+    *crc = PABB_CRC32C_TABLE8[(uint8_t)*crc ^ data] ^ (*crc >> 8);
+}
+void pabb_crc32c_buffer(uint32_t* crc, const void* data, size_t length){
+    const uint8_t* ptr = (const uint8_t*)data;
+    uint32_t tmp = *crc;
+    while (length--){
+        tmp = PABB_CRC32C_TABLE8[(uint8_t)tmp ^ (uint8_t)*ptr] ^ (tmp >> 8);
+        ptr++;
+    }
+    *crc = tmp;
+}
diff --git a/Common/CRC32/pabb_CRC32_Basic.h b/Common/CRC32/pabb_CRC32_Basic.h
new file mode 100644
index 0000000000..7e69aa94e7
--- /dev/null
+++ b/Common/CRC32/pabb_CRC32_Basic.h
@@ -0,0 +1,39 @@
+/*  CRC32
+ * 
+ *  From: https://github.com/PokemonAutomation/
+ * 
+ */
+
+#ifndef PokemonAutomation_Common_CRC32_Basic_H
+#define PokemonAutomation_Common_CRC32_Basic_H
+
+#include <stdint.h>
+#include <string.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+
+//
+//  These implement the CRC32c with polynomial 0x11EDC6F41.
+//
+
+extern const uint32_t PABB_CRC32C_TABLE8[];
+
+void pabb_crc32c_buffer(uint32_t* crc, const void* data, size_t length);
+
+static inline void pabb_crc32c_write_to_message(uint32_t crc, void* data, size_t full_message_length){
+    char* ptr = (char*)data;
+    size_t length_before_crc = full_message_length - sizeof(uint32_t);
+    pabb_crc32c_buffer(&crc, ptr, length_before_crc);
+    memcpy(ptr + length_before_crc, &crc, sizeof(uint32_t));
+}
+
+
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/Common/CRC32/pabb_CRC32_x86_SSE4.1.h b/Common/CRC32/pabb_CRC32_x86_SSE4.1.h
new file mode 100644
index 0000000000..56ad94572c
--- /dev/null
+++ b/Common/CRC32/pabb_CRC32_x86_SSE4.1.h
@@ -0,0 +1,45 @@
+/*  CRC32
+ * 
+ *  From: https://github.com/PokemonAutomation/
+ * 
+ */
+
+#ifndef PokemonAutomation_Common_CRC32_SSE41_H
+#define PokemonAutomation_Common_CRC32_SSE41_H
+
+#include <stdint.h>
+#include <string.h>
+#include <nmmintrin.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+
+//
+//  These implement the CRC32c with polynomial 0x11EDC6F41.
+//
+
+static inline void pabb_crc32c_buffer(uint32_t* crc, const void* data, size_t length){
+    uint32_t tmp = *crc;
+    const char* ptr = (const char*)data;
+    for (size_t c = 0; c < length; c++){
+        tmp = _mm_crc32_u8(tmp, ptr[c]);
+    }
+    *crc = tmp;
+}
+
+static inline void pabb_crc32c_write_to_message(uint32_t crc, void* data, size_t full_message_length){
+    char* ptr = (char*)data;
+    size_t length_before_crc = full_message_length - sizeof(uint32_t);
+    pabb_crc32c_buffer(&crc, ptr, length_before_crc);
+    memcpy(ptr + length_before_crc, &crc, sizeof(uint32_t));
+}
+
+
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/Common/Compiler.h b/Common/Compiler.h
index 2bdbb2faef..89c031075b 100644
--- a/Common/Compiler.h
+++ b/Common/Compiler.h
@@ -1,6 +1,6 @@
 /*  Compiler Specifics
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -8,7 +8,9 @@
 #define PokemonAutomation_Compiler_H
 
 //#include <stddef.h>
+#ifdef __cplusplus
 namespace PokemonAutomation{
+#endif
 
 
 #define PA_ALIGNMENT    64
@@ -19,11 +21,14 @@ namespace PokemonAutomation{
 
 #define PA_NO_INLINE        __declspec(noinline)
 #define PA_FORCE_INLINE     inline __forceinline
+
+#ifdef __cplusplus
 template <typename type> using r_ptr  = type *__restrict;
 template <typename type> using c_ptr  = type const*__restrict;
 template <typename type> using r_ref  = type &__restrict;
 template <typename type> using c_ref  = type const&__restrict;
 template <typename type> using r_rref = type &&__restrict;
+#endif
 
 //using ssize_t = ptrdiff_t;
 
@@ -40,11 +45,14 @@ template <typename type> using r_rref = type &&__restrict;
 
 #define PA_NO_INLINE        __attribute__ ((noinline))
 #define PA_FORCE_INLINE     inline __attribute__ ((always_inline))
+
+#ifdef __cplusplus
 template <typename type> using r_ptr  = type *__restrict__;
 template <typename type> using c_ptr  = type const*__restrict__;
 template <typename type> using r_ref  = type &__restrict__;
 template <typename type> using c_ref  = type const&__restrict__;
 template <typename type> using r_rref = type &&__restrict__;
+#endif
 
 // Align a struct on x-byte boundary.
 // It's the minimum alignment for a struct or a struct member.
@@ -66,5 +74,7 @@ template <typename type> using r_rref = type &&__restrict__;
 
 
 
+#ifdef __cplusplus
 }
 #endif
+#endif
diff --git a/Common/ControllerStates/NintendoSwitch_OemController_State.cpp b/Common/ControllerStates/NintendoSwitch_OemController_State.cpp
new file mode 100644
index 0000000000..a6b885ff9a
--- /dev/null
+++ b/Common/ControllerStates/NintendoSwitch_OemController_State.cpp
@@ -0,0 +1,51 @@
+/*  Nintendo Switch - OEM Controller State
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+
+#include <string.h>
+#include "NintendoSwitch_OemController_State.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+
+const OemController_RumbleState OemController_RumbleState_NEUTRAL_STATE = {
+    .left = {0x00, 0x01, 0x40, 0x40},
+    .right = {0x00, 0x01, 0x40, 0x40},
+};
+
+
+
+extern const OemController_State0x3f OemController_State0x3f_NEUTRAL_STATE = {
+    .button0 = 0,
+    .button1 = 0,
+    .dpad = 8,
+    .left_joystick = {0x00, 0x80, 0x00, 0x80},
+    .right_joystick = {0x00, 0x80, 0x00, 0x80},
+};
+
+const OemController_State0x30 OemController_State0x30_NEUTRAL_STATE = {
+    .buttons = {
+        .button3 = 0,
+        .button4 = 0,
+        .button5 = 0,
+        .left_joystick = {0x00, 0x08, 0x80},
+        .right_joystick = {0x00, 0x08, 0x80},
+        .vibrator = 0x00,
+    },
+    .gyro = {},
+};
+
+bool OemController_State0x30_equals(
+    const OemController_State0x30* state0,
+    const OemController_State0x30* state1
+){
+    return memcmp(state0, state1, sizeof(OemController_State0x30)) == 0;
+}
+
+
+}
+}
diff --git a/Common/ControllerStates/NintendoSwitch_OemController_State.h b/Common/ControllerStates/NintendoSwitch_OemController_State.h
new file mode 100644
index 0000000000..8939d735f0
--- /dev/null
+++ b/Common/ControllerStates/NintendoSwitch_OemController_State.h
@@ -0,0 +1,111 @@
+/*  Nintendo Switch - OEM Controller State
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_NintendoSwitch_OemController_State_H
+#define PokemonAutomation_NintendoSwitch_OemController_State_H
+
+#include <stdbool.h>
+#include <stdint.h>
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+
+
+//
+//  Console <-> Controller
+//
+
+
+struct OemController_RumbleState{
+    uint8_t left[4];
+    uint8_t right[4];
+};
+
+extern const OemController_RumbleState OemController_RumbleState_NEUTRAL_STATE;
+
+
+//
+//  Report 0x3f (no longer used)
+//
+
+struct OemController_State0x3f{
+    uint8_t button0;
+    uint8_t button1;
+    uint8_t dpad;
+    uint8_t left_joystick[4];
+    uint8_t right_joystick[4];
+};
+
+extern const OemController_State0x3f OemController_State0x3f_NEUTRAL_STATE;
+
+
+//
+//  Report 0x30
+//
+
+struct OemController_State0x30_Buttons{
+    uint8_t button3;
+    uint8_t button4;
+    uint8_t button5;
+    uint8_t left_joystick[3];
+    uint8_t right_joystick[3];
+    uint8_t vibrator;
+};
+
+struct OemController_State0x30_Gyro{
+    int16_t accel_x;
+    int16_t accel_y;
+    int16_t accel_z;
+    int16_t rotation_x;
+    int16_t rotation_y;
+    int16_t rotation_z;
+};
+
+struct OemController_State0x30_GyroX3{
+    OemController_State0x30_Gyro time0;
+    OemController_State0x30_Gyro time1;
+    OemController_State0x30_Gyro time2;
+};
+
+struct OemController_State0x30{
+    OemController_State0x30_Buttons buttons;
+    OemController_State0x30_GyroX3 gyro;
+};
+
+extern const OemController_State0x30 OemController_State0x30_NEUTRAL_STATE;
+
+bool OemController_State0x30_equals(
+    const OemController_State0x30* state0,
+    const OemController_State0x30* state1
+);
+
+
+//
+//  Controller <-> CC
+//
+
+struct OemController_Status{
+    //  Bit 0: Connected
+    //  Bit 1: Ready
+    //  Bit 2: Paired
+    uint8_t status;
+
+    uint8_t player_lights;
+
+    uint8_t paired_mac_address[6];
+};
+
+enum class DisconnectReason{
+    HOST_SHUTDOWN,
+    CONNECTION_REJECTED,
+};
+
+
+
+}
+}
+#endif
diff --git a/Common/ControllerStates/NintendoSwitch_WiredController_State.c b/Common/ControllerStates/NintendoSwitch_WiredController_State.c
new file mode 100644
index 0000000000..45fc0b2e90
--- /dev/null
+++ b/Common/ControllerStates/NintendoSwitch_WiredController_State.c
@@ -0,0 +1,26 @@
+/*  Nintendo Switch - Wired Controller State
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <string.h>
+#include "NintendoSwitch_WiredController_State.h"
+
+
+const pabb_NintendoSwitch_WiredController_State pabb_NintendoSwitch_WiredController_State_NEUTRAL_STATE = {
+    .buttons0           =   0,
+    .buttons1           =   0,
+    .dpad_byte          =   8,
+    .left_joystick_x    =   128,
+    .left_joystick_y    =   128,
+    .right_joystick_x   =   128,
+    .right_joystick_y   =   128,
+};
+
+bool pabb_NintendoSwitch_WiredController_State_equals(
+    const pabb_NintendoSwitch_WiredController_State* state0,
+    const pabb_NintendoSwitch_WiredController_State* state1
+){
+    return memcmp(state0, state1, sizeof(pabb_NintendoSwitch_WiredController_State)) == 0;
+}
diff --git a/Common/ControllerStates/NintendoSwitch_WiredController_State.h b/Common/ControllerStates/NintendoSwitch_WiredController_State.h
new file mode 100644
index 0000000000..48c6a72a03
--- /dev/null
+++ b/Common/ControllerStates/NintendoSwitch_WiredController_State.h
@@ -0,0 +1,54 @@
+/*  Nintendo Switch - Wired Controller State
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_NintendoSwitch_WiredController_State_H
+#define PokemonAutomation_NintendoSwitch_WiredController_State_H
+
+#include <stdbool.h>
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+//
+//  Console <-> Controller
+//
+
+typedef struct{
+    uint8_t buttons0;
+    uint8_t buttons1;
+    uint8_t dpad_byte;
+    uint8_t left_joystick_x;
+    uint8_t left_joystick_y;
+    uint8_t right_joystick_x;
+    uint8_t right_joystick_y;
+} pabb_NintendoSwitch_WiredController_State;
+
+extern const pabb_NintendoSwitch_WiredController_State pabb_NintendoSwitch_WiredController_State_NEUTRAL_STATE;
+
+bool pabb_NintendoSwitch_WiredController_State_equals(
+    const pabb_NintendoSwitch_WiredController_State* state0,
+    const pabb_NintendoSwitch_WiredController_State* state1
+);
+
+
+//
+//  Controller <-> CC
+//
+
+typedef struct{
+    //  Bit 0: Connected
+    uint8_t status;
+} pabb_NintendoSwitch_WiredController_Status;
+
+
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/Common/ControllerStates/StandardHid_Keyboard_State.c b/Common/ControllerStates/StandardHid_Keyboard_State.c
new file mode 100644
index 0000000000..a61b724242
--- /dev/null
+++ b/Common/ControllerStates/StandardHid_Keyboard_State.c
@@ -0,0 +1,18 @@
+/*  Standard HID Keyboard
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <string.h>
+#include "StandardHid_Keyboard_State.h"
+
+
+const pabb_HID_Keyboard_State pabb_HID_Keyboard_State_NEUTRAL_STATE = {0};
+
+bool pabb_HID_Keyboard_State_equals(
+    const pabb_HID_Keyboard_State* state0,
+    const pabb_HID_Keyboard_State* state1
+){
+    return memcmp(state0, state1, sizeof(pabb_HID_Keyboard_State)) == 0;
+}
diff --git a/Common/ControllerStates/StandardHid_Keyboard_State.h b/Common/ControllerStates/StandardHid_Keyboard_State.h
new file mode 100644
index 0000000000..8032bedc5b
--- /dev/null
+++ b/Common/ControllerStates/StandardHid_Keyboard_State.h
@@ -0,0 +1,57 @@
+/*  Standard HID Keyboard
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_StandardHid_Keyboard_State_H
+#define PokemonAutomation_StandardHid_Keyboard_State_H
+
+#include <stdbool.h>
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+//
+//  Console <-> Controller
+//
+
+typedef struct{
+    uint8_t data;
+} pabb_HID_Keyboard_LockLEDs;
+
+
+typedef struct{
+    uint8_t modifiers;
+    uint8_t reserved;
+    uint8_t key[6];
+} pabb_HID_Keyboard_State;
+
+extern const pabb_HID_Keyboard_State pabb_HID_Keyboard_State_NEUTRAL_STATE;
+
+bool pabb_HID_Keyboard_State_equals(
+    const pabb_HID_Keyboard_State* state0,
+    const pabb_HID_Keyboard_State* state1
+);
+
+
+//
+//  Controller <-> CC
+//
+
+typedef struct{
+    //  Bit 0: Connected
+    //  Bit 4: Num Lock
+    //  Bit 5: Caps Lock
+    //  Bit 6: Scroll Lock
+    uint8_t status;
+} pabb_HID_Keyboard_Status;
+
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/Common/Cpp/AbstractLogger.h b/Common/Cpp/AbstractLogger.h
deleted file mode 100644
index 1c7fee3ab3..0000000000
--- a/Common/Cpp/AbstractLogger.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*  Abstract Logger
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_AbstractLogger_H
-#define PokemonAutomation_AbstractLogger_H
-
-#include <string>
-#include "Color.h"
-
-namespace PokemonAutomation{
-
-
-class Logger{
-public:
-    virtual void log(const std::string& msg, Color color = Color()) = 0;
-    virtual void log(std::string&& msg, Color color = Color()){
-        log((const std::string&)msg, color);
-    }
-    virtual void log(const char* msg, Color color = Color()){
-        log(std::string(msg), color);
-    }
-};
-
-
-}
-#endif
diff --git a/Common/Cpp/BitmapConversion.cpp b/Common/Cpp/BitmapConversion.cpp
new file mode 100644
index 0000000000..b32a3e92da
--- /dev/null
+++ b/Common/Cpp/BitmapConversion.cpp
@@ -0,0 +1,151 @@
+// Base64 Originally from René Nyffenegger's public domain base64 code
+// (https://renenyffenegger.ch/notes/development/Base64/Encoding-and-decoding-base-64-with-cpp/)
+//
+// These changes were made:
+// 1. String input/output interface
+// 2. Proper padding handling
+// 3. Explicit character validation
+
+#include "BitmapConversion.h"
+
+static const std::string BASE64_CHARS = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+                                        "abcdefghijklmnopqrstuvwxyz"
+                                        "0123456789+/";
+
+bool is_base64(unsigned char c){
+  return (isalnum(c) || (c == '+') || (c == '/'));
+}
+
+bool base64_encode(std::string &out, const std::string &in){
+  int i = 0, j = 0;
+  unsigned char char_array_3[3];
+  unsigned char char_array_4[4];
+  out.clear();
+
+  for (auto c : in){
+    char_array_3[i++] = c;
+    if (i == 3){
+      char_array_4[0] = (char_array_3[0] & 0xfc) >> 2;
+      char_array_4[1] =
+          ((char_array_3[0] & 0x03) << 4) + ((char_array_3[1] & 0xf0) >> 4);
+      char_array_4[2] =
+          ((char_array_3[1] & 0x0f) << 2) + ((char_array_3[2] & 0xc0) >> 6);
+      char_array_4[3] = char_array_3[2] & 0x3f;
+
+      for (i = 0; i < 4; i++)
+        out += BASE64_CHARS[char_array_4[i]];
+      i = 0;
+    }
+  }
+
+  if (i){
+    for (j = i; j < 3; j++)
+      char_array_3[j] = '\0';
+
+    char_array_4[0] = (char_array_3[0] & 0xfc) >> 2;
+    char_array_4[1] =
+        ((char_array_3[0] & 0x03) << 4) + ((char_array_3[1] & 0xf0) >> 4);
+    char_array_4[2] =
+        ((char_array_3[1] & 0x0f) << 2) + ((char_array_3[2] & 0xc0) >> 6);
+
+    for (j = 0; j < i + 1; j++)
+      out += BASE64_CHARS[char_array_4[j]];
+
+    while (i++ < 3)
+      out += '=';
+  }
+
+  return true;
+}
+
+bool base64_decode(std::string &out, const std::string &in){
+  int i = 0, j = 0;
+  unsigned char char_array_4[4], char_array_3[3];
+  out.clear();
+
+  for (auto c : in){
+    if (c == '=')
+      break;
+
+    if (!is_base64(c))
+      return false;
+
+    char_array_4[i++] = c;
+    if (i == 4){
+      for (i = 0; i < 4; i++)
+        char_array_4[i] = (unsigned char)BASE64_CHARS.find(char_array_4[i]);
+
+      char_array_3[0] =
+          (char_array_4[0] << 2) + ((char_array_4[1] & 0x30) >> 4);
+      char_array_3[1] =
+          ((char_array_4[1] & 0x0f) << 4) + ((char_array_4[2] & 0x3c) >> 2);
+      char_array_3[2] = ((char_array_4[2] & 0x03) << 6) + char_array_4[3];
+
+      for (i = 0; i < 3; i++)
+        out += char_array_3[i];
+      i = 0;
+    }
+  }
+
+  if (i){
+    for (j = i; j < 4; j++)
+      char_array_4[j] = 0;
+
+    for (j = 0; j < 4; j++)
+      char_array_4[j] = (unsigned char)BASE64_CHARS.find(char_array_4[j]);
+
+    char_array_3[0] = (char_array_4[0] << 2) + ((char_array_4[1] & 0x30) >> 4);
+    char_array_3[1] =
+        ((char_array_4[1] & 0x0f) << 4) + ((char_array_4[2] & 0x3c) >> 2);
+
+    for (j = 0; j < i - 1; j++)
+      out += char_array_3[j];
+  }
+
+  return true;
+}
+
+std::string pack_bits_to_string(const std::vector<bool> &vec){
+  std::string packed;
+  if (vec.empty())
+    return packed;
+
+  packed.reserve((vec.size() + 7) / 8);
+  for (size_t i = 0; i < vec.size(); i += 8){
+    unsigned char byte = 0;
+    for (size_t j = 0; j < 8 && (i + j) < vec.size(); ++j){
+      if (vec[i + j]){
+        byte |= (1 << (7 - j));
+      }
+    }
+    packed.push_back(byte);
+  }
+  return packed;
+}
+
+std::vector<bool> unpack_bits_from_string(const std::string &packed,
+                                          size_t original_size){
+  std::vector<bool> vec;
+  vec.reserve(original_size);
+  for (size_t i = 0; i < packed.size(); ++i){
+    unsigned char byte = packed[i];
+    for (int j = 7; j >= 0 && vec.size() < original_size; --j){
+      vec.push_back((byte >> j) & 1);
+    }
+  }
+  return vec;
+}
+
+std::string pack_bit_vector_to_base64(const std::vector<bool> &vec){
+  std::string packed = pack_bits_to_string(vec);
+  std::string b64;
+  base64_encode(b64, packed);
+  return b64;
+}
+
+std::vector<bool> unpack_bit_vector_from_base64(const std::string &b64,
+                                                size_t original_size){
+  std::string packed;
+  base64_decode(packed, b64);
+  return unpack_bits_from_string(packed, original_size);
+}
diff --git a/Common/Cpp/BitmapConversion.h b/Common/Cpp/BitmapConversion.h
new file mode 100644
index 0000000000..4d390de75a
--- /dev/null
+++ b/Common/Cpp/BitmapConversion.h
@@ -0,0 +1,32 @@
+/*  Bitmap Conversion
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  Functions to:
+ *  - convert vector<bool> to string and back
+ *  - convert vector<bool> to base64 string and back.
+ * 
+ *  The Base64 algorithm is originally from René Nyffenegger's public domain base64 code
+ *  (https://renenyffenegger.ch/notes/development/Base64/Encoding-and-decoding-base-64-with-cpp/)
+ *
+ *  These changes were made:
+ *  1. String input/output interface
+ *  2. Proper padding handling
+ *  3. Explicit character validation
+ */
+
+#ifndef PokemonAutomation_BitmapCompression_H
+#define PokemonAutomation_BitmapCompression_H
+
+#include <string>
+#include <vector>
+
+std::string pack_bits_to_string(const std::vector<bool> &vec);
+
+std::vector<bool> unpack_bits_from_string(const std::string &packed, size_t original_size);
+
+std::string pack_bit_vector_to_base64(const std::vector<bool> &vec);
+
+std::vector<bool> unpack_bit_vector_from_base64(const std::string &b64, size_t original_size);
+
+#endif
diff --git a/Common/Cpp/CancellableScope.cpp b/Common/Cpp/CancellableScope.cpp
index 4e75277dba..e890ffe575 100644
--- a/Common/Cpp/CancellableScope.cpp
+++ b/Common/Cpp/CancellableScope.cpp
@@ -1,17 +1,18 @@
 /*  Cancellable Scope
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include <exception>
 #include <set>
 #include <atomic>
-#include <mutex>
-#include <condition_variable>
-#include "Exceptions.h"
+#include "Common/Cpp/Concurrency/Mutex.h"
+#include "Common/Cpp/Concurrency/ConditionVariable.h"
 #include "Containers/Pimpl.tpp"
 #include "Concurrency/SpinLock.h"
+#include "Exceptions.h"
+#include "ListenerSet.h"
 #include "CancellableScope.h"
 
 //#include <iostream>
@@ -21,16 +22,24 @@
 namespace PokemonAutomation{
 
 
-struct CancellableData{
-    CancellableData()
+struct Cancellable::Data{
+    Data()
         : cancelled(false)
     {}
     std::atomic<bool> cancelled;
     mutable SpinLock lock;
-    std::exception_ptr exception;
+    std::exception_ptr cancel_reason;
+    ListenerSet<Cancellable::CancelListener> m_listeners;
 };
 
 
+void Cancellable::add_cancel_listener(CancelListener& listener){
+    m_impl->m_listeners.add(listener);
+}
+void Cancellable::remove_cancel_listener(CancelListener& listener) noexcept{
+    m_impl->m_listeners.remove(listener);
+}
+
 
 Cancellable::Cancellable()
     : m_impl(CONSTRUCT_TOKEN)
@@ -42,57 +51,73 @@ Cancellable::~Cancellable(){
 //    cout << "Deleting: " << this << endl;
 }
 CancellableScope* Cancellable::scope() const{
-    m_sanitizer.check_usage();
+    auto scope_check = m_sanitizer.check_scope();
     return m_scope;
 }
 bool Cancellable::cancelled() const noexcept{
-    m_sanitizer.check_usage();
+    auto scope_check = m_sanitizer.check_scope();
     return m_impl->cancelled.load(std::memory_order_acquire);
 }
-bool Cancellable::cancel(std::exception_ptr exception) noexcept{
-    m_sanitizer.check_usage();
-    CancellableData& data(*m_impl);
-    SpinLockGuard lg(data.lock);
-    if (exception && !data.exception){
-        data.exception = std::move(exception);
+std::exception_ptr Cancellable::cancel_reason() const{
+    auto scope_check = m_sanitizer.check_scope();
+    ReadSpinLock lg(m_impl->lock);
+    return m_impl->cancel_reason;
+}
+bool Cancellable::cancel(std::exception_ptr reason) noexcept{
+    auto scope_check = m_sanitizer.check_scope();
+    Data& data(*m_impl);
+    WriteSpinLock lg(data.lock);
+    if (reason && !data.cancel_reason){
+        data.cancel_reason = std::move(reason);
     }
-    if (data.cancelled.load(std::memory_order_acquire)){
+    if (data.cancelled.load(std::memory_order_relaxed)){
         return true;
     }
-    return data.cancelled.exchange(true, std::memory_order_relaxed);
+    data.cancelled.store(true, std::memory_order_release);
+//    if (data.cancelled.exchange(true, std::memory_order_relaxed)){
+//        return true;
+//    }
+    if (!m_impl->m_listeners.empty()){
+        m_impl->m_listeners.run_method(
+            &CancelListener::on_cancellable_cancel,
+            *this,
+            data.cancel_reason
+        );
+    }
+    return false;
 }
 void Cancellable::throw_if_cancelled() const{
-    m_sanitizer.check_usage();
-    const CancellableData& data(*m_impl);
+    auto scope_check = m_sanitizer.check_scope();
+    const Data& data(*m_impl);
     if (!data.cancelled.load(std::memory_order_acquire)){
         return;
     }
-    SpinLockGuard lg(data.lock);
-    if (data.exception){
-        std::rethrow_exception(data.exception);
+    ReadSpinLock lg(data.lock);
+    if (data.cancel_reason){
+        std::rethrow_exception(data.cancel_reason);
     }else{
         throw OperationCancelledException();
     }
 }
 bool Cancellable::throw_if_cancelled_with_exception() const{
-    m_sanitizer.check_usage();
-    const CancellableData& data(*m_impl);
+    auto scope_check = m_sanitizer.check_scope();
+    const Data& data(*m_impl);
     if (!data.cancelled.load(std::memory_order_acquire)){
         return false;
     }
-    SpinLockGuard lg(data.lock);
-    if (data.exception){
-        std::rethrow_exception(data.exception);
+    ReadSpinLock lg(data.lock);
+    if (data.cancel_reason){
+        std::rethrow_exception(data.cancel_reason);
     }
     return true;
 }
 void Cancellable::attach(CancellableScope& scope){
-    m_sanitizer.check_usage();
+    auto scope_check = m_sanitizer.check_scope();
     m_scope = &scope;
     scope += *this;
 }
 void Cancellable::detach() noexcept{
-    m_sanitizer.check_usage();
+    auto scope_check = m_sanitizer.check_scope();
     if (m_scope){
         *m_scope -= *this;
     }
@@ -102,11 +127,11 @@ void Cancellable::detach() noexcept{
 
 
 
-struct CancellableScopeData{
+struct CancellableScope::Data{
     std::set<Cancellable*> children;
 
-    std::mutex lock;
-    std::condition_variable cv;
+    Mutex lock;
+    ConditionVariable cv;
 };
 
 
@@ -121,12 +146,12 @@ bool CancellableScope::cancel(std::exception_ptr exception) noexcept{
     if (Cancellable::cancel(exception)){
         return true;
     }
-    CancellableScopeData& data(*m_impl);
+    Data& data(*m_impl);
     std::lock_guard lg(data.lock);
     for (Cancellable* child : data.children){
 //        cout << "Canceling: " << child << endl;
 //        cout << "Canceling: " << child->name() << endl;
-        child->m_sanitizer.check_usage();
+        auto scope_check = child->m_sanitizer.check_scope();
         child->cancel(exception);
     }
 //    cout << "Done Canceling" << endl;
@@ -135,15 +160,15 @@ bool CancellableScope::cancel(std::exception_ptr exception) noexcept{
     return false;
 }
 void CancellableScope::wait_for(std::chrono::milliseconds duration){
-    m_sanitizer.check_usage();
+    auto scope_check = m_sanitizer.check_scope();
     wait_until(current_time() + duration);
 }
 void CancellableScope::wait_until(WallClock stop){
-    m_sanitizer.check_usage();
+    auto scope_check = m_sanitizer.check_scope();
     throw_if_cancelled();
-    CancellableScopeData& data(*m_impl);
+    Data& data(*m_impl);
     {
-        std::unique_lock<std::mutex> lg(data.lock);
+        std::unique_lock<Mutex> lg(data.lock);
         data.cv.wait_until(
             lg, stop,
             [this, stop]{
@@ -154,11 +179,11 @@ void CancellableScope::wait_until(WallClock stop){
     throw_if_cancelled();
 }
 void CancellableScope::wait_until_cancel(){
-    m_sanitizer.check_usage();
+    auto scope_check = m_sanitizer.check_scope();
     throw_if_cancelled();
-    CancellableScopeData& data(*m_impl);
+    Data& data(*m_impl);
     {
-        std::unique_lock<std::mutex> lg(data.lock);
+        std::unique_lock<Mutex> lg(data.lock);
         data.cv.wait(
             lg,
             [this]{
@@ -170,17 +195,17 @@ void CancellableScope::wait_until_cancel(){
 }
 void CancellableScope::operator+=(Cancellable& cancellable){
 //    cout << "Attaching: " << &cancellable << endl;
-    m_sanitizer.check_usage();
-    CancellableScopeData& data(*m_impl);
-    std::lock_guard<std::mutex> lg(data.lock);
+    auto scope_check = m_sanitizer.check_scope();
+    Data& data(*m_impl);
+    std::lock_guard<Mutex> lg(data.lock);
     throw_if_cancelled();
     data.children.insert(&cancellable);
 }
 void CancellableScope::operator-=(Cancellable& cancellable){
 //    cout << "Detaching: " << &cancellable << endl;
-    m_sanitizer.check_usage();
-    CancellableScopeData& data(*m_impl);
-    std::lock_guard<std::mutex> lg(data.lock);
+    auto scope_check = m_sanitizer.check_scope();
+    Data& data(*m_impl);
+    std::lock_guard<Mutex> lg(data.lock);
     data.children.erase(&cancellable);
 }
 
diff --git a/Common/Cpp/CancellableScope.h b/Common/Cpp/CancellableScope.h
index 935e295795..125f80210a 100644
--- a/Common/Cpp/CancellableScope.h
+++ b/Common/Cpp/CancellableScope.h
@@ -1,6 +1,6 @@
 /*  Cancellable Scope
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  *      A cancellable scope is a node with a tree. If "cancel()" is called on
  *  a scope, only the scope and all child scopes will be canceled. Parents are
@@ -41,10 +41,20 @@ class CancellableScope;
 
 
 
-struct CancellableData;
 class Cancellable{
     Cancellable(const Cancellable&) = delete;
     void operator=(const Cancellable&) = delete;
+public:
+    struct CancelListener{
+        virtual void on_cancellable_cancel(
+            Cancellable& cancellable,
+            std::exception_ptr reason
+        ) = 0;
+    };
+    void add_cancel_listener(CancelListener& listener);
+    void remove_cancel_listener(CancelListener& listener) noexcept;
+
+
 public:
     virtual ~Cancellable();
 
@@ -53,6 +63,7 @@ class Cancellable{
     CancellableScope* scope() const;
 
     bool cancelled() const noexcept;
+    std::exception_ptr cancel_reason() const;
 
     //  Throw an exception if this object has been cancelled.
     //  If there is no exception, it throws OperationCancelledException.
@@ -61,11 +72,11 @@ class Cancellable{
 
     //  If object has not been cancelled, return false.
     //  If object has been cancelled with no exception, return true.
-    //  If object has been cancelled with exception, rethrow the exception.
+    //  If object has been cancelled with an exception, rethrow the exception.
     bool throw_if_cancelled_with_exception() const;
 
     //  Returns true if it was already cancelled.
-    virtual bool cancel(std::exception_ptr exception) noexcept;
+    virtual bool cancel(std::exception_ptr reason) noexcept;
 
 
 protected:
@@ -99,19 +110,19 @@ class Cancellable{
 
 private:
     CancellableScope* m_scope = nullptr;
-    Pimpl<CancellableData> m_impl;
+    struct Data;
+    Pimpl<Data> m_impl;
 public:
     LifetimeSanitizer m_sanitizer;
 };
 
 
 
-struct CancellableScopeData;
 class CancellableScope : public Cancellable{
 public:
     virtual ~CancellableScope() override;
 
-    virtual bool cancel(std::exception_ptr exception) noexcept override;
+    virtual bool cancel(std::exception_ptr exception = nullptr) noexcept override;
 
     void wait_for(std::chrono::milliseconds duration);
     void wait_until(WallClock stop);
@@ -126,7 +137,8 @@ class CancellableScope : public Cancellable{
     void operator-=(Cancellable& cancellable);
 
 private:
-    Pimpl<CancellableScopeData> m_impl;
+    struct Data;
+    Pimpl<Data> m_impl;
     LifetimeSanitizer m_sanitizer;
 };
 
diff --git a/Common/Cpp/Color.cpp b/Common/Cpp/Color.cpp
new file mode 100644
index 0000000000..c03bbc3845
--- /dev/null
+++ b/Common/Cpp/Color.cpp
@@ -0,0 +1,27 @@
+/*  Color
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *      A very lightweight color class to avoid pulling in <QColor>.
+ *
+ */
+
+#include <sstream>
+#include <iomanip>
+#include "Color.h"
+
+namespace PokemonAutomation{
+
+std::string Color::to_string() const{
+    std::ostringstream os;
+    os << "[0x" << std::internal << std::setfill('0');
+    os << std::hex << std::uppercase << std::setw(8) << m_argb << std::dec;
+    os << " A=" << std::setw(2) << int(alpha());
+    os << " R=" << std::setw(2) << int(red());
+    os << " G=" << std::setw(2) << int(green());
+    os << " B=" << std::setw(2) << int(blue()) << "]";
+    return os.str();
+}
+
+}
+
diff --git a/Common/Cpp/Color.h b/Common/Cpp/Color.h
index 307de70005..c843d9df94 100644
--- a/Common/Cpp/Color.h
+++ b/Common/Cpp/Color.h
@@ -1,6 +1,6 @@
 /*  Color
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  *      A very lightweight color class to avoid pulling in <QColor>.
  *
@@ -10,15 +10,16 @@
 #define PokemonAutomation_Color_H
 
 #include <stdint.h>
+#include <string>
 
 namespace PokemonAutomation{
 
 
-constexpr inline uint32_t combine_argb(uint8_t a, uint8_t r, uint8_t g, uint8_t b) {
+constexpr inline uint32_t combine_argb(uint8_t a, uint8_t r, uint8_t g, uint8_t b){
     return (((uint32_t)a << 8 | r) << 8 | g) << 8 | b;
 }
 
-constexpr inline uint32_t combine_rgb(uint8_t r, uint8_t g, uint8_t b) {
+constexpr inline uint32_t combine_rgb(uint8_t r, uint8_t g, uint8_t b){
     return (((uint32_t)255 << 8 | r) << 8 | g) << 8 | b;
 }
 
@@ -39,12 +40,21 @@ class Color{
     bool operator<(Color color) const{
         return m_argb < color.m_argb;
     }
+    bool operator==(Color color) const{
+        return m_argb == color.m_argb;
+    }
+    bool operator!=(Color color) const{
+        return m_argb != color.m_argb;
+    }
 
     uint8_t alpha   () const { return (uint8_t)(m_argb >> 24); }
     uint8_t red     () const { return (uint8_t)(m_argb >> 16); }
     uint8_t green   () const { return (uint8_t)(m_argb >>  8); }
     uint8_t blue    () const { return (uint8_t)(m_argb >>  0); }
 
+    // Example: "[0xFFFDBD00 A=255 R=253 G=189 B=00]"
+    std::string to_string() const;
+
 private:
     uint32_t m_argb;
 };
@@ -70,6 +80,8 @@ constexpr Color COLOR_PURPLE(0xff8a2be2);
 constexpr Color COLOR_DARKGREEN(0xff008000);
 constexpr Color COLOR_DARKCYAN(0xff008080);
 
+constexpr Color COLOR_GREEN2(0xff00aa00);
+
 
 
 
diff --git a/Common/Cpp/ColoredText.cpp b/Common/Cpp/ColoredText.cpp
new file mode 100644
index 0000000000..4df41625e3
--- /dev/null
+++ b/Common/Cpp/ColoredText.cpp
@@ -0,0 +1,53 @@
+/*  Colored Text
+ * 
+ *  From: https://github.com/PokemonAutomation/
+ * 
+ */
+
+#include "ColoredText.h"
+
+namespace PokemonAutomation{
+
+
+#if 1
+Color theme_friendly_darkblue(){
+    if (CURRENT_THEME == UiThemeMode::DARK_MODE){
+        return Color(0xff0080ff);
+    }
+    return COLOR_DARK_BLUE;
+}
+#endif
+std::string html_color_text(const std::string& text, Color color){
+    if (color == Color()){
+        return text;
+    }
+    const char HEX[] = "0123456789abcdef";
+    uint32_t rgb = (uint32_t)color;
+    std::string str;
+    str += HEX[(rgb >> 20) & 15];
+    str += HEX[(rgb >> 16) & 15];
+    str += HEX[(rgb >> 12) & 15];
+    str += HEX[(rgb >>  8) & 15];
+    str += HEX[(rgb >>  4) & 15];
+    str += HEX[(rgb >>  0) & 15];
+    return "<font color=#" + str + ">" + text + "</font>";
+}
+std::string make_text_url(const std::string& url, const std::string& text){
+#if 0
+    switch (CURRENT_THEME){
+    case 0:
+        return "<a href=\"" + url + "\">" + text + "</a>";
+    case 1:
+        return "<a href=\"" + url + "\" style=\"color: #0080ff\">" + text + "</a>";
+    }
+    throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Invalid theme #.");
+#endif
+    return "<a href=\"" + url + "\" style=\"color: #0080ff\">" + text + "</a>";
+}
+
+
+
+
+
+
+}
diff --git a/Common/Cpp/ColoredText.h b/Common/Cpp/ColoredText.h
new file mode 100644
index 0000000000..963e2b0401
--- /dev/null
+++ b/Common/Cpp/ColoredText.h
@@ -0,0 +1,28 @@
+/*  Colored Text
+ * 
+ *  From: https://github.com/PokemonAutomation/
+ * 
+ */
+
+#ifndef PokemonAutomation_ColoredText_H
+#define PokemonAutomation_ColoredText_H
+
+#include <string>
+#include "Common/Cpp/Color.h"
+
+namespace PokemonAutomation{
+
+enum class UiThemeMode{
+    DEFAULT_MODE,
+    DARK_MODE,
+};
+
+inline UiThemeMode CURRENT_THEME = UiThemeMode::DEFAULT_MODE;
+
+Color theme_friendly_darkblue();
+std::string html_color_text(const std::string& text, Color color);
+std::string make_text_url(const std::string& url, const std::string& text);
+
+}
+#endif
+
diff --git a/Common/Cpp/Concurrency/AsyncDispatcher.cpp b/Common/Cpp/Concurrency/AsyncDispatcher.cpp
deleted file mode 100644
index 10a440be50..0000000000
--- a/Common/Cpp/Concurrency/AsyncDispatcher.cpp
+++ /dev/null
@@ -1,195 +0,0 @@
-/*  Thread Pool
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- */
-
-#include "Common/Cpp/PanicDump.h"
-#include "AsyncDispatcher.h"
-
-//#include <iostream>
-//using std::cout;
-//using std::endl;
-
-namespace PokemonAutomation{
-
-
-AsyncTask::~AsyncTask(){
-    std::unique_lock<std::mutex> lg(m_lock);
-    m_cv.wait(lg, [this]{ return m_finished; });
-}
-void AsyncTask::rethrow_exceptions(){
-    if (!m_stopped_with_error.load(std::memory_order_acquire)){
-        return;
-    }
-    std::unique_lock<std::mutex> lg(m_lock);
-    if (m_exception){
-        std::rethrow_exception(m_exception);
-    }
-}
-void AsyncTask::wait_and_rethrow_exceptions(){
-    std::unique_lock<std::mutex> lg(m_lock);
-    m_cv.wait(lg, [this]{ return m_finished; });
-    if (m_exception){
-        std::rethrow_exception(m_exception);
-    }
-}
-void AsyncTask::signal(){
-    std::lock_guard<std::mutex> lg(m_lock);
-    m_finished = true;
-    m_cv.notify_all();
-}
-
-
-#if 0
-AsyncDispatcher::AsyncDispatcher(size_t starting_threads)
-    : AsyncDispatcher(nullptr, starting_threads)
-{}
-#endif
-AsyncDispatcher::AsyncDispatcher(std::function<void()>&& new_thread_callback, size_t starting_threads)
-    : m_new_thread_callback(std::move(new_thread_callback))
-    , m_stopping(false)
-    , m_busy_count(0)
-{
-    for (size_t c = 0; c < starting_threads; c++){
-        m_threads.emplace_back(run_with_catch, "AsyncDispatcher::thread_loop()", [this]{ thread_loop(); });
-    }
-}
-AsyncDispatcher::~AsyncDispatcher(){
-    {
-        std::lock_guard<std::mutex> lg(m_lock);
-        m_stopping = true;
-        m_cv.notify_all();
-    }
-    for (std::thread& thread : m_threads){
-        thread.join();
-    }
-    for (AsyncTask* task : m_queue){
-        task->signal();
-    }
-}
-
-void AsyncDispatcher::ensure_threads(size_t threads){
-    std::lock_guard<std::mutex> lg(m_lock);
-    while (m_threads.size() < threads){
-        m_threads.emplace_back(run_with_catch, "AsyncDispatcher::thread_loop()", [this]{ thread_loop(); });
-    }
-}
-
-void AsyncDispatcher::dispatch_task(AsyncTask& task){
-//    cout << "dispatch_task() - enter" << endl;
-    std::lock_guard<std::mutex> lg(m_lock);
-
-    //  Enqueue task.
-    m_queue.emplace_back(&task);
-
-    //  Make sure a thread is ready for it.
-    if (m_queue.size() > m_threads.size() - m_busy_count){
-        m_threads.emplace_back(run_with_catch, "AsyncDispatcher::thread_loop()", [this]{ thread_loop(); });
-    }
-
-    m_cv.notify_one();
-//    cout << "dispatch_task() - exit" << endl;
-}
-
-std::unique_ptr<AsyncTask> AsyncDispatcher::dispatch(std::function<void()>&& func){
-    std::unique_ptr<AsyncTask> task(new AsyncTask(std::move(func)));
-    dispatch_task(*task);
-//    cout << "dispatch_task - 1() - exit" << endl;
-    return task;
-}
-void AsyncDispatcher::run_in_parallel(
-    size_t s, size_t e,
-    const std::function<void(size_t index)>& func
-){
-    if (s >= e){
-        return;
-    }
-
-    //  Build tasks.
-    std::vector<std::unique_ptr<AsyncTask>> tasks;
-    for (size_t index = 0; s + index < e; index++){
-        size_t local_index = s + index;
-        tasks.emplace_back(new AsyncTask(
-            [&func, local_index]{ func(local_index); }
-        ));
-    }
-
-    {
-        std::lock_guard<std::mutex> lg(m_lock);
-
-        //  Enqueue tasks.
-        for (std::unique_ptr<AsyncTask>& task : tasks){
-            m_queue.emplace_back(task.get());
-        }
-
-        //  Make sure there are enough threads.
-        while (m_queue.size() > m_threads.size() - m_busy_count){
-            m_threads.emplace_back(run_with_catch, "AsyncDispatcher::thread_loop()", [this]{ thread_loop(); });
-        }
-
-        for (size_t c = 0; c < tasks.size(); c++){
-            m_cv.notify_one();
-        }
-    }
-
-    //  Wait
-//    cout << "begin wait()" << endl;
-    for (std::unique_ptr<AsyncTask>& task : tasks){
-        task->wait_and_rethrow_exceptions();
-    }
-//    cout << "end wait()" << endl;
-}
-
-
-
-void AsyncDispatcher::thread_loop(){
-    if (m_new_thread_callback){
-        m_new_thread_callback();
-    }
-    bool busy = false;
-    while (true){
-        AsyncTask* task;
-        {
-            std::unique_lock<std::mutex> lg(m_lock);
-            if (busy){
-                m_busy_count--;
-                busy = false;
-            }
-
-            if (m_stopping){
-                return;
-            }
-            if (m_queue.empty()){
-                m_cv.wait(lg);
-                continue;
-            }
-
-            task = m_queue.front();
-            m_queue.pop_front();
-
-            busy = true;
-            m_busy_count++;
-        }
-
-        try{
-            task->m_task();
-        }catch (...){
-            task->m_exception = std::current_exception();
-            task->m_stopped_with_error.store(true, std::memory_order_release);
-//            cout << "Task threw an exception." << endl;
-//            std::lock_guard<std::mutex> lg(m_lock);
-//            for (AsyncTask* t : m_queue){
-//                t->signal();
-//            }
-        }
-        task->signal();
-    }
-}
-
-
-
-
-
-}
-
diff --git a/Common/Cpp/Concurrency/AsyncDispatcher.h b/Common/Cpp/Concurrency/AsyncDispatcher.h
deleted file mode 100644
index 900af25721..0000000000
--- a/Common/Cpp/Concurrency/AsyncDispatcher.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/*  Async Task Runner
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- *      This class is meant for asynchronous tasks, not for parallel computation.
- * This class will always spawn enough threads run all tasks in parallel.
- *
- * If you need to spam a bunch of compute tasks in parallel, use ParallelTaskRunner.
- *
- */
-
-#ifndef PokemonAutomation_AsyncDispatcher_H
-#define PokemonAutomation_AsyncDispatcher_H
-
-#include <vector>
-#include <deque>
-#include <functional>
-#include <atomic>
-#include <mutex>
-#include <condition_variable>
-#include <thread>
-
-namespace PokemonAutomation{
-
-
-class AsyncTask{
-public:
-    //  Wait for the task to finish before destructing. Doesn't rethrow exceptions.
-    ~AsyncTask();
-
-    //  If the task ended with an exception, rethrow it here.
-    //  This does not clear the exception.
-    void rethrow_exceptions();
-
-    //  Wait for the task to finish. Will rethrow any exceptions.
-    void wait_and_rethrow_exceptions();
-
-
-private:
-    template <class... Args>
-    AsyncTask(Args&&... args)
-        : m_task(std::forward<Args>(args)...)
-        , m_finished(false)
-        , m_stopped_with_error(false)
-    {}
-    void signal();
-
-private:
-    friend class FireForgetDispatcher;
-    friend class AsyncDispatcher;
-    friend class ParallelTaskRunner;
-
-    std::function<void()> m_task;
-    bool m_finished;
-    std::atomic<bool> m_stopped_with_error;
-    std::exception_ptr m_exception;
-    std::mutex m_lock;
-    std::condition_variable m_cv;
-};
-
-
-
-class AsyncDispatcher{
-public:
-//    AsyncDispatcher(size_t starting_threads);
-    AsyncDispatcher(std::function<void()>&& new_thread_callback, size_t starting_threads);
-    ~AsyncDispatcher();
-
-    //  Ensure a certain # of threads so they don't need to be lazily created.
-    void ensure_threads(size_t threads);
-
-    //  Dispatch the specified task and return a handle to it.
-    //  Call "handle->wait()" to wait for the task to finish.
-    std::unique_ptr<AsyncTask> dispatch(std::function<void()>&& func);
-
-    //  Run the specified lambda for indices [s, e) in parallel.
-    void run_in_parallel(
-        size_t s, size_t e,
-        const std::function<void(size_t index)>& func
-    );
-
-private:
-    void dispatch_task(AsyncTask& task);
-    void thread_loop();
-
-private:
-    std::function<void()> m_new_thread_callback;
-    std::deque<AsyncTask*> m_queue;
-    std::vector<std::thread> m_threads;
-    bool m_stopping;
-    size_t m_busy_count;
-    std::mutex m_lock;
-    std::condition_variable m_cv;
-};
-
-
-
-
-}
-
-#endif
diff --git a/Common/Cpp/Concurrency/AsyncTask.h b/Common/Cpp/Concurrency/AsyncTask.h
new file mode 100644
index 0000000000..bfd7c11893
--- /dev/null
+++ b/Common/Cpp/Concurrency/AsyncTask.h
@@ -0,0 +1,115 @@
+/*  Async Task
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_AsyncTask_H
+#define PokemonAutomation_AsyncTask_H
+
+#include <memory>
+
+#define PA_SANITIZE_AsyncTask
+
+#ifdef PA_SANITIZE_AsyncTask
+#include "Common/Cpp/LifetimeSanitizer.h"
+#endif
+
+namespace PokemonAutomation{
+
+
+class AsyncTaskCore{
+public:
+    virtual ~AsyncTaskCore() = default;
+    virtual bool is_finished() const noexcept = 0;
+    virtual void wait_and_rethrow_exceptions() = 0;
+
+public:
+    //  These should only be called inside a parallel framework.
+    //  These are not thread-safe with each other.
+    virtual void report_started() noexcept = 0;
+    virtual void report_cancelled() noexcept = 0;
+    virtual void run() noexcept = 0;
+};
+
+
+
+class AsyncTask{
+public:
+    AsyncTask(const AsyncTask&) = delete;
+    void operator=(const AsyncTask&) = delete;
+    AsyncTask(AsyncTask&&) = default;
+    AsyncTask& operator=(AsyncTask&&) = default;
+
+    //  If the task has already started, this will wait for it to finish.
+    //  This will not rethrow exceptions.
+    ~AsyncTask() = default;
+
+
+public:
+    AsyncTask()
+        : m_sanitizer("AsyncTask")
+    {}
+    AsyncTask(std::unique_ptr<AsyncTaskCore> task)
+        : m_task(std::move(task))
+        , m_sanitizer("AsyncTask")
+    {}
+
+    operator bool() const{
+        return (bool)m_task;
+    }
+    AsyncTaskCore* core(){
+        return m_task.get();
+    }
+    bool is_finished() const noexcept{
+#ifdef PA_SANITIZE_AsyncTask
+        auto scope = m_sanitizer.check_scope();
+#endif
+        return m_task->is_finished();
+    }
+
+    //  Wait for the task to finish. Will ignore any exceptions.
+    void wait_and_ignore_exceptions() noexcept{
+        m_task.reset();
+    }
+
+    //  Wait for the task to finish. Will rethrow any exceptions.
+    void wait_and_rethrow_exceptions(){
+#ifdef PA_SANITIZE_AsyncTask
+        auto scope = m_sanitizer.check_scope();
+#endif
+        m_task->wait_and_rethrow_exceptions();
+    }
+
+
+public:
+    //  These should only be called inside a parallel framework.
+    //  These are not thread-safe with each other.
+    void report_started(){
+#ifdef PA_SANITIZE_AsyncTask
+        auto scope = m_sanitizer.check_scope();
+#endif
+        m_task->report_started();
+    }
+    void report_cancelled() noexcept{
+        m_sanitizer.check_usage();
+        m_task->report_cancelled();
+    }
+    void run() noexcept{
+        m_sanitizer.check_usage();
+        m_task->run();
+    }
+
+
+private:
+    std::unique_ptr<AsyncTaskCore> m_task;
+
+#ifdef PA_SANITIZE_AsyncTask
+    LifetimeSanitizer m_sanitizer;
+#endif
+};
+
+
+
+}
+#endif
diff --git a/Common/Cpp/Concurrency/Backends/AsyncTask_Default.h b/Common/Cpp/Concurrency/Backends/AsyncTask_Default.h
new file mode 100644
index 0000000000..6e83ebde75
--- /dev/null
+++ b/Common/Cpp/Concurrency/Backends/AsyncTask_Default.h
@@ -0,0 +1,117 @@
+/*  Async Task (Default)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_AsyncTask_Default_H
+#define PokemonAutomation_AsyncTask_Default_H
+
+#include <functional>
+#include <atomic>
+#include <exception>
+#include "Common/Cpp/Concurrency/SpinPause.h"
+#include "Common/Cpp/Concurrency/Mutex.h"
+#include "Common/Cpp/Concurrency/ConditionVariable.h"
+#include "Common/Cpp/Concurrency/AsyncTask.h"
+
+namespace PokemonAutomation{
+
+
+
+class AsyncTask_Cpp : public AsyncTaskCore{
+public:
+    enum class State{
+        NOT_STARTED,
+        RUNNING,
+        FINISHED,
+        SAFE_TO_DESTRUCT,
+    };
+
+
+public:
+    //  If the task has already started, this will wait for it to finish.
+    //  This will not rethrow exceptions.
+    virtual ~AsyncTask_Cpp(){
+        State state = m_state.load(std::memory_order_acquire);
+        if (state == State::NOT_STARTED || state == State::SAFE_TO_DESTRUCT){
+//            cout << "Already Done: " << (int)state << endl;
+            return;
+        }
+
+        {
+            std::unique_lock<Mutex> lg(m_lock);
+            m_cv.wait(lg, [this]{
+                return m_state.load(std::memory_order_relaxed) != State::RUNNING;
+            });
+        }
+
+        while (m_state.load(std::memory_order_acquire) != State::SAFE_TO_DESTRUCT){
+            pause();
+        }
+    }
+    AsyncTask_Cpp(std::function<void()> task)
+        : m_task(std::move(task))
+        , m_state(State::NOT_STARTED)
+    {}
+
+    virtual bool is_finished() const noexcept override{
+        State state = m_state.load(std::memory_order_acquire);
+        return state == State::FINISHED || state == State::SAFE_TO_DESTRUCT;
+    }
+
+    //  Wait for the task to finish. Will rethrow any exceptions.
+    virtual void wait_and_rethrow_exceptions() override{
+        if (!is_finished()){
+            std::unique_lock<Mutex> lg(m_lock);
+            m_cv.wait(lg, [this]{ return is_finished(); });
+        }
+        if (m_exception){
+            std::rethrow_exception(m_exception);
+        }
+    }
+
+
+public:
+    //  These should only be called inside a parallel framework.
+    //  These are not thread-safe with each other.
+    virtual void report_started() noexcept override{
+        m_state.store(State::RUNNING, std::memory_order_release);
+    }
+    virtual void report_cancelled() noexcept override{
+        {
+            m_state.store(State::FINISHED, std::memory_order_release);
+            {
+                std::lock_guard<Mutex> lg(m_lock);
+            }
+            m_cv.notify_all();
+        }
+        m_state.store(State::SAFE_TO_DESTRUCT, std::memory_order_release);
+    }
+    virtual void run() noexcept override{
+        {
+            try{
+                m_task();
+            }catch (...){
+                std::lock_guard<Mutex> lg(m_lock);
+                m_exception = std::current_exception();
+            }
+        }
+        report_cancelled();
+    }
+
+
+private:
+    std::function<void()> m_task;
+    std::atomic<State> m_state;
+
+    std::exception_ptr m_exception;
+
+    mutable Mutex m_lock;
+    ConditionVariable m_cv;
+};
+
+
+
+}
+#endif
diff --git a/Common/Cpp/Concurrency/Backends/ThreadPool_Default.cpp b/Common/Cpp/Concurrency/Backends/ThreadPool_Default.cpp
new file mode 100644
index 0000000000..297ba275cb
--- /dev/null
+++ b/Common/Cpp/Concurrency/Backends/ThreadPool_Default.cpp
@@ -0,0 +1,290 @@
+/*  Thread Pool (Default)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <thread>
+#include "Common/Cpp/PanicDump.h"
+#include "Common/Cpp/Concurrency/ReverseLockGuard.h"
+#include "AsyncTask_Default.h"
+#include "ThreadPool_Default.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+
+
+
+ThreadPool_Default::ThreadPool_Default(
+    std::function<void()>&& new_thread_callback,
+    size_t starting_threads,
+    size_t max_threads
+)
+    : m_new_thread_callback(std::move(new_thread_callback))
+    , m_max_threads(max_threads == 0 ? std::thread::hardware_concurrency() : max_threads)
+    , m_stopping(false)
+    , m_busy_count(0)
+{
+    for (size_t c = 0; c < starting_threads; c++){
+        spawn_thread();
+    }
+}
+ThreadPool_Default::~ThreadPool_Default(){
+    stop();
+}
+void ThreadPool_Default::stop(){
+    {
+        std::lock_guard<Mutex> lg(m_lock);
+        if (m_stopping) return;
+        m_stopping = true;
+        m_thread_cv.notify_all();
+//        m_dispatch_cv.notify_all();
+    }
+    for (ThreadData& thread : m_threads){
+        if (thread.thread.joinable()){
+            thread.thread.join();
+        }
+    }
+
+    // DO NOT JOIN AGAIN IN DESTRUCTOR
+    m_threads.clear();
+
+    for (auto& task : m_queue){
+        task->report_cancelled();
+    }
+
+    // DO NOT CLEAR AGAIN IN DESTRUCTOR
+    m_queue.clear();
+}
+
+
+void ThreadPool_Default::ensure_threads(size_t threads){
+    std::lock_guard<Mutex> lg(m_lock);
+    while (m_threads.size() < threads){
+        spawn_thread();
+    }
+}
+#if 0
+void ThreadPoolCore::wait_for_everything(){
+    std::unique_lock<Mutex> lg(m_lock);
+    m_dispatch_cv.wait(lg, [this]{
+        return m_queue.size() + m_busy_count == 0;
+    });
+}
+#endif
+
+
+
+
+WallDuration ThreadPool_Default::cpu_time() const{
+    //  TODO: Don't lock the entire queue.
+    WallDuration ret = WallDuration::zero();
+    std::lock_guard<Mutex> lg(m_lock);
+    for (const ThreadData& thread : m_threads){
+//        ret += thread_cpu_time(thread.handle);
+        ret += thread.runtime.total();
+    }
+    return ret;
+}
+
+AsyncTask ThreadPool_Default::dispatch(std::function<void()>&& func){
+    AsyncTask task;
+    {
+        std::unique_lock<Mutex> lg(m_lock);
+        AsyncTaskCore*& ptr = m_queue.emplace_back();
+        try{
+            task = AsyncTask(std::make_unique<AsyncTask_Cpp>(std::move(func)));
+            ptr = task.core();
+            ptr->report_started();
+
+            //  Spawn threads to pick up the work. Without this, a pool that
+            //  has not reached its maximum thread count (or has no threads
+            //  at all, as the global pools start out) would never grow, and
+            //  with no threads the notify_one() below would wake nothing and
+            //  the task would never run.
+            spawn_threads();
+        }catch (...){
+            m_queue.pop_back();
+            throw;
+        }
+    }
+    m_thread_cv.notify_one();
+    return task;
+}
+AsyncTask ThreadPool_Default::dispatch_now_blocking(std::function<void()>&& func){
+    AsyncTask task;
+    {
+        std::unique_lock<Mutex> lg(m_lock);
+
+        m_dispatch_cv.wait(lg, [this]{
+            return m_queue.size() + m_busy_count < m_max_threads;
+        });
+
+        //  Enqueue task.
+        AsyncTaskCore*& ptr = m_queue.emplace_back();
+        try{
+            spawn_threads();
+            task = AsyncTask(std::make_unique<AsyncTask_Cpp>(std::move(func)));
+            ptr = task.core();
+            ptr->report_started();
+        }catch (...){
+            m_queue.pop_back();
+            throw;
+        }
+    }
+    m_thread_cv.notify_one();
+    return task;
+}
+AsyncTask ThreadPool_Default::try_dispatch_now(std::function<void()>& func){
+    AsyncTask task;
+    {
+        std::lock_guard<Mutex> lg(m_lock);
+
+        if (m_queue.size() + m_busy_count >= m_max_threads){
+            return AsyncTask();
+        }
+
+        //  Enqueue task.
+        AsyncTaskCore*& ptr = m_queue.emplace_back();
+        try{
+            spawn_threads();
+            task = AsyncTask(std::make_unique<AsyncTask_Cpp>(std::move(func)));
+            ptr = task.core();
+            ptr->report_started();
+        }catch (...){
+            m_queue.pop_back();
+            throw;
+        }
+    }
+    m_thread_cv.notify_one();
+    return task;
+}
+
+
+void ThreadPool_Default::run_in_parallel(
+    const std::function<void(size_t index)>& func,
+    size_t start, size_t end,
+    size_t block_size
+){
+    if (start >= end){
+        return;
+    }
+    size_t total = end - start;
+
+    if (block_size == 0){
+        block_size = total / m_max_threads / 16;
+        if (block_size == 0){
+            block_size = 1;
+        }
+    }
+    block_size = std::min(block_size, total);
+//    cout << "block_size = " << block_size << endl;
+
+    size_t blocks = (total + block_size - 1) / block_size;
+
+    //  Prepare all the tasks.
+    std::vector<AsyncTask> tasks;
+    for (size_t c = 0; c < blocks; c++){
+        tasks.emplace_back(
+            std::make_unique<AsyncTask_Cpp>([=, &func]{
+                size_t s = start + c * block_size;
+                size_t e = std::min(s + block_size, end);
+//                cout << "Running: [" << s << "," << e << ")" << endl;
+                for (; s < e; s++){
+                    func(s);
+                }
+            })
+        );
+    }
+
+    {
+        //  Enqueue all the tasks.
+        std::unique_lock<Mutex> lg(m_lock);
+        for (AsyncTask& task : tasks){
+            m_queue.emplace_back(task.core())->report_started();
+            m_thread_cv.notify_one();
+        }
+        spawn_threads();
+
+//        //  Don't do this since this thread might be of a different priority.
+//        //  Nevermind: Recursive calls can deadlock if every thread is waiting.
+#if 1
+        //  Use this thread to process the queue until our tasks are done.
+        while (!m_queue.empty() && !tasks.back().is_finished()){
+            AsyncTaskCore* task = m_queue.front();
+            m_queue.pop_front();
+
+            ReverseLockGuard<Mutex> lg0(m_lock);
+            task->run();
+        }
+#endif
+    }
+
+    //  Wait for everything to finish.
+    for (AsyncTask& task : tasks){
+        task.wait_and_rethrow_exceptions();
+    }
+}
+
+
+
+void ThreadPool_Default::spawn_thread(){
+    //  Must call under lock.
+    ThreadData& handle = m_threads.emplace_back();
+    try{
+        handle.thread = Thread([&, this]{
+            run_with_catch(
+                "ParallelTaskRunner::thread_loop()",
+                [&, this]{ thread_loop(handle); }
+            );
+        });
+    }catch (...){
+        m_threads.pop_back();
+        throw;
+    }
+}
+void ThreadPool_Default::spawn_threads(){
+    while (m_threads.size() < std::min(m_queue.size() + m_busy_count, m_max_threads)){
+        spawn_thread();
+    }
+}
+void ThreadPool_Default::thread_loop(ThreadData& data){
+    data.handle = current_thread_handle();
+
+    if (m_new_thread_callback){
+        m_new_thread_callback();
+    }
+
+    data.runtime.start();
+
+    std::unique_lock<Mutex> lg(m_lock);
+    m_busy_count++;
+    while (!m_stopping){
+//        cout << "m_queue... " << m_queue.size() << endl;
+        if (m_queue.empty()){
+            data.runtime.stop();
+            m_busy_count--;
+            m_dispatch_cv.notify_all();
+//            cout << "waiting... " << m_busy_count << endl;
+            m_thread_cv.wait(lg);
+//            cout << "waking... " << m_busy_count << endl;
+            m_busy_count++;
+            data.runtime.start();
+            continue;
+        }
+
+        AsyncTaskCore* task = m_queue.front();
+        m_queue.pop_front();
+
+        ReverseLockGuard<Mutex> lg0(m_lock);
+        task->run();
+    }
+}
+
+
+
+
+}
diff --git a/Common/Cpp/Concurrency/Backends/ThreadPool_Default.h b/Common/Cpp/Concurrency/Backends/ThreadPool_Default.h
new file mode 100644
index 0000000000..b2944c630f
--- /dev/null
+++ b/Common/Cpp/Concurrency/Backends/ThreadPool_Default.h
@@ -0,0 +1,93 @@
+/*  Thread Pool (Default)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_ThreadPoolCore_H
+#define PokemonAutomation_ThreadPoolCore_H
+
+#include <functional>
+#include <deque>
+#include "Common/Cpp/Stopwatch.h"
+#include "Common/Cpp/Concurrency/Mutex.h"
+#include "Common/Cpp/Concurrency/ConditionVariable.h"
+#include "Common/Cpp/Concurrency/Thread.h"
+#include "Common/Cpp/CpuUtilization/CpuUtilization.h"
+#include "Common/Cpp/Concurrency/AsyncTask.h"
+#include "Common/Cpp/Concurrency/ThreadPool.h"
+
+namespace PokemonAutomation{
+
+
+
+
+class ThreadPool_Default final : public ThreadPool{
+public:
+    ThreadPool_Default(
+        std::function<void()>&& new_thread_callback,
+        size_t starting_threads,
+        size_t max_threads = (size_t)-1
+    );
+    ~ThreadPool_Default();
+
+    virtual void stop() override;
+    virtual void ensure_threads(size_t threads) override;
+
+//    void wait_for_everything();
+
+
+public:
+    virtual size_t current_threads() const override{
+        std::lock_guard<Mutex> lg(m_lock);
+        return m_threads.size();
+    }
+    virtual size_t max_threads() const override{
+        return m_max_threads;
+    }
+    virtual WallDuration cpu_time() const override;
+
+
+public:
+    [[nodiscard]] virtual AsyncTask dispatch(std::function<void()>&& func) override;
+    [[nodiscard]] virtual AsyncTask dispatch_now_blocking(std::function<void()>&& func) override;
+    [[nodiscard]] virtual AsyncTask try_dispatch_now(std::function<void()>& func) override;
+
+    virtual void run_in_parallel(
+        const std::function<void(size_t index)>& func,
+        size_t start, size_t end,
+        size_t block_size = 0
+    ) override;
+
+
+private:
+    struct ThreadData{
+        Thread thread;
+        ThreadHandle handle;
+        Stopwatch runtime;
+    };
+
+    void spawn_thread();
+    void spawn_threads();
+    void thread_loop(ThreadData& data);
+
+
+private:
+    std::function<void()> m_new_thread_callback;
+    size_t m_max_threads;
+    std::deque<AsyncTaskCore*> m_queue;
+
+    std::deque<ThreadData> m_threads;
+
+    bool m_stopping;
+    size_t m_busy_count;
+    mutable Mutex m_lock;
+    ConditionVariable m_thread_cv;
+    ConditionVariable m_dispatch_cv;
+};
+
+
+
+
+}
+#endif
diff --git a/Common/Cpp/Concurrency/Backends/Thread_Qt.tpp b/Common/Cpp/Concurrency/Backends/Thread_Qt.tpp
new file mode 100644
index 0000000000..860c4505c7
--- /dev/null
+++ b/Common/Cpp/Concurrency/Backends/Thread_Qt.tpp
@@ -0,0 +1,133 @@
+/*  Thread (C++)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <iostream>
+#include <QCoreApplication>
+#include <QThread>
+#include "Common/Cpp/Containers/Pimpl.tpp"
+#include "Common/Cpp/Concurrency/Qt6.9ThreadBugWorkaround.h"
+#include "Common/Cpp/Concurrency/Thread.h"
+
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+
+
+
+
+// PIMPL implementation - hides std::thread from header
+struct Thread::Data : public QThread{
+    Data(std::function<void()>&& function)
+        : m_function(std::move(function))
+//        , m_finished(false)
+    {
+        start();
+    }
+    ~Data(){
+//        cout << "quitting: " << this << endl;
+        quit();
+//        cout << "waiting: " << this << endl;
+//        while (!m_finished.load(std::memory_order_acquire)){
+//            wait(1000);
+//        }
+
+        //  What the fuck?!?! This hangs on Qt6.9 even after run() returns!
+        wait();
+
+#if 0
+#ifndef PA_ENABLE_QT_ADOPTION_WORKAROUND
+        wait();
+#else
+        while (m_finished.load(std::memory_order_acquire));
+        if (wait(1000)){
+            return;
+        }
+        std::cout << "QThread did not quit in a timely manner... It is likely hung..." << std::endl;
+        abort();
+#endif
+#endif
+
+        //
+        //  On further investigation, wait() hangs because the Qt6.9 thread
+        //  adoption bug affects not just std::thread, but its own as well.
+        //
+        //  When this QThread ends, the handle adopts one of the video backend
+        //  threads which do not join. Thus it hangs here.
+        //
+
+//        cout << "finished: " << this << endl;
+    }
+
+    virtual void run() override{
+//        cout << "starting: " << this << endl;
+        m_function();
+//        m_finished.store(true, std::memory_order_acquire);
+//        cout << "exiting: " << this << endl;
+    }
+
+    std::function<void()> m_function;
+
+    std::atomic<bool> m_finished;
+};
+
+
+
+
+// Move semantics - same as std::thread (move-only, no copy)
+Thread::Thread(Thread&&) = default;
+Thread& Thread::operator=(Thread&&) = default;
+
+// CRITICAL: Destructor automatically joins thread (unlike std::thread)
+// - std::thread calls std::terminate() if destroyed while joinable (crashes!)
+// - This Thread safely waits for thread to complete before destroying
+// - Makes Thread safer and more convenient to use in RAII patterns
+Thread::~Thread(){
+    join();
+}
+
+// Default constructor - creates empty Thread with no underlying thread
+Thread::Thread() = default;
+
+// Main constructor - starts thread immediately with given function
+// - Uses CONSTRUCT_TOKEN to construct Pimpl<Data> with Data constructor
+// - Thread starts running immediately (same as std::thread behavior)
+Thread::Thread(std::function<void()>&& function)
+    : m_data(CONSTRUCT_TOKEN, std::move(function))
+{}
+
+void Thread::join(){
+    // Early return if Thread is default-constructed, moved-from or already joined
+    if (!m_data){
+        return;
+    }
+
+#ifdef PA_ENABLE_QT_ADOPTION_WORKAROUND
+    //  Exit the thread.
+    m_data->quit();
+
+    //  But instead of waiting and joining (which will hang), we leak it intentionally.
+    std::cout << "Intentionally leaking QThread to work around Qt6.9 thread adoption bug..." << std::endl;
+    m_data.release();
+#endif
+
+    // Clear the Pimpl data, marking this Thread as joined/empty
+    // After this, operator bool() returns false and join() becomes no-op
+    m_data.clear();
+}
+
+
+// Check if thread is joinable (same semantics as std::thread::joinable)
+// - Returns false if Thread is default-constructed, moved-from
+// - Returns false after join() completes (m_data is cleared)
+// - Otherwise delegates to underlying std::thread::joinable()
+bool Thread::joinable() const{
+    return m_data;
+}
+
+
+
+}
diff --git a/Common/Cpp/Concurrency/Backends/Thread_StdThread.tpp b/Common/Cpp/Concurrency/Backends/Thread_StdThread.tpp
new file mode 100644
index 0000000000..b3e42146f8
--- /dev/null
+++ b/Common/Cpp/Concurrency/Backends/Thread_StdThread.tpp
@@ -0,0 +1,76 @@
+/*  Thread (std::thread)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *      This is a simple wrapper over std::thread.
+ *
+ */
+
+#include <thread>
+#include "Common/Cpp/Containers/Pimpl.tpp"
+#include "Common/Cpp/Concurrency/Thread.h"
+
+namespace PokemonAutomation{
+
+
+
+
+// PIMPL implementation - hides std::thread from header
+struct Thread::Data{
+    std::thread m_thread;
+
+    Data(std::function<void()>&& function)
+        : m_thread(std::move(function))
+    {}
+};
+
+
+
+
+// Move semantics - same as std::thread (move-only, no copy)
+Thread::Thread(Thread&&) = default;
+Thread& Thread::operator=(Thread&&) = default;
+
+// CRITICAL: Destructor automatically joins thread (unlike std::thread)
+// - std::thread calls std::terminate() if destroyed while joinable (crashes!)
+// - This Thread safely waits for thread to complete before destroying
+// - Makes Thread safer and more convenient to use in RAII patterns
+Thread::~Thread(){
+    join();
+}
+
+// Default constructor - creates empty Thread with no underlying thread
+Thread::Thread() = default;
+
+// Main constructor - starts thread immediately with given function
+// - Uses CONSTRUCT_TOKEN to construct Pimpl<Data> with Data constructor
+// - Thread starts running immediately (same as std::thread behavior)
+Thread::Thread(std::function<void()>&& function)
+    : m_data(CONSTRUCT_TOKEN, std::move(function))
+{}
+
+void Thread::join(){
+    // Early return if Thread is default-constructed, moved-from or already joined
+    if (!m_data){
+        return;
+    }
+
+    m_data->m_thread.join();
+
+    // Clear the Pimpl data, marking this Thread as joined/empty
+    // After this, operator bool() returns false and join() becomes no-op
+    m_data.clear();
+}
+
+
+// Check if thread is joinable (same semantics as std::thread::joinable)
+// - Returns false if Thread is default-constructed, moved-from
+// - Returns false after join() completes (m_data is cleared)
+// - Otherwise delegates to underlying std::thread::joinable()
+bool Thread::joinable() const{
+    return m_data && m_data->m_thread.joinable();
+}
+
+
+
+}
diff --git a/Common/Cpp/Concurrency/Backends/Thread_StdThreadDetach.tpp b/Common/Cpp/Concurrency/Backends/Thread_StdThreadDetach.tpp
new file mode 100644
index 0000000000..4f78e38949
--- /dev/null
+++ b/Common/Cpp/Concurrency/Backends/Thread_StdThreadDetach.tpp
@@ -0,0 +1,112 @@
+/*  Thread (std::thread detach)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  This class is a wrapper for std::thread that tries to work around Qt thread issue at 6.9+:
+ *      https://github.com/PokemonAutomation/Arduino-Source/issues/570
+ *      https://bugreports.qt.io/browse/QTBUG-131892
+ *
+ */
+
+#include <thread>
+#include "Common/Cpp/Containers/Pimpl.tpp"
+#include "Common/Cpp/Concurrency/Thread.h"
+
+namespace PokemonAutomation{
+
+
+
+
+// PIMPL implementation - hides std::thread from header
+struct Thread::Data{
+//    std::mutex m_lock;
+//    std::condition_variable m_cv;
+    std::atomic<bool> m_stopped;
+
+    std::thread m_thread;
+
+    Data(std::function<void()>&& function)
+        : m_stopped(false)
+        , m_thread(
+            [this, function = std::move(function)]{
+                function();
+//                std::lock_guard<std::mutex> lg(m_lock);
+//                m_stopped = true;
+//                m_cv.notify_all();
+                m_stopped.store(true, std::memory_order_release);
+            }
+        )
+    {}
+};
+
+
+
+
+// Move semantics - same as std::thread (move-only, no copy)
+Thread::Thread(Thread&&) = default;
+Thread& Thread::operator=(Thread&&) = default;
+
+// CRITICAL: Destructor automatically joins thread (unlike std::thread)
+// - std::thread calls std::terminate() if destroyed while joinable (crashes!)
+// - This Thread safely waits for thread to complete before destroying
+// - Makes Thread safer and more convenient to use in RAII patterns
+Thread::~Thread(){
+    join();
+}
+
+// Default constructor - creates empty Thread with no underlying thread
+Thread::Thread() = default;
+
+// Main constructor - starts thread immediately with given function
+// - Uses CONSTRUCT_TOKEN to construct Pimpl<Data> with Data constructor
+// - Thread starts running immediately (same as std::thread behavior)
+Thread::Thread(std::function<void()>&& function)
+    : m_data(CONSTRUCT_TOKEN, std::move(function))
+{}
+
+void Thread::join(){
+    // Early return if Thread is default-constructed, moved-from or already joined
+    if (!m_data){
+        return;
+    }
+
+    Data& data = m_data;
+
+
+    // ========================================================================
+    // ATTEMPTED WORKAROUND CODE FOR Qt 6.9+ BUG
+    // ========================================================================
+
+    //
+    //  Even std::condition_variable is broken!
+    //
+//    std::unique_lock<std::mutex> lg(data.m_lock);
+//    data.m_cv.wait(lg, [&data]{
+//        return data.m_stopped;
+//    });
+
+    while (!data.m_stopped.load(std::memory_order_acquire)){
+        std::this_thread::sleep_for(std::chrono::milliseconds(1));
+    }
+
+    //  Here we detach() instead of join() due to Qt bug.
+    //  It is safe because the thread no longer touches anything in this class.
+    data.m_thread.detach();
+
+    // Clear the Pimpl data, marking this Thread as joined/empty
+    // After this, operator bool() returns false and join() becomes no-op
+    m_data.clear();
+}
+
+
+// Check if thread is joinable (same semantics as std::thread::joinable)
+// - Returns false if Thread is default-constructed, moved-from
+// - Returns false after join() completes (m_data is cleared)
+// - Otherwise delegates to underlying std::thread::joinable()
+bool Thread::joinable() const{
+    return m_data && m_data->m_thread.joinable();
+}
+
+
+
+}
diff --git a/Common/Cpp/Concurrency/BusyPeriodicRunner.cpp b/Common/Cpp/Concurrency/BusyPeriodicRunner.cpp
new file mode 100644
index 0000000000..a11055c42c
--- /dev/null
+++ b/Common/Cpp/Concurrency/BusyPeriodicRunner.cpp
@@ -0,0 +1,216 @@
+/*  Busy Periodic Scheduler
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "BusyPeriodicRunner.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+
+
+size_t PeriodicScheduler::events() const{
+    return m_events.size();
+}
+bool PeriodicScheduler::add_event(void* event, std::chrono::milliseconds period, WallClock start){
+    auto ret = m_events.emplace(event, PeriodicEvent{m_callback_id, period});
+    if (!ret.second){
+        //  Already exists. Do nothing.
+        return false;
+    }
+
+    //  Now add to schedule. Need to ensure strong exception safety.
+    try{
+        m_schedule.emplace(start, SingleEvent{m_callback_id, event});
+    }catch (...){
+        m_events.erase(ret.first);
+        throw;
+    }
+
+    m_callback_id++;
+    return true;
+}
+void PeriodicScheduler::remove_event(void* event){
+    //  No need to remove from scheduler since it will be skipped over automatically.
+    m_events.erase(event);
+}
+WallClock PeriodicScheduler::next_event() const{
+    auto iter = m_schedule.begin();
+    if (iter == m_schedule.end()){
+        return WallClock::max();
+    }
+    return iter->first;
+}
+void* PeriodicScheduler::request_next_event(WallClock timestamp){
+    while (true){
+        auto iter0 = m_schedule.begin();
+
+        //  Schedule is empty.
+        if (iter0 == m_schedule.end()){
+            return nullptr;
+        }
+
+        //  Next event isn't due.
+        if (timestamp < iter0->first){
+            return nullptr;
+        }
+
+        //  Current SingleEvent refers to a no longer existing PeriodicEvent.
+        SingleEvent event = iter0->second;
+        auto iter1 = m_events.find(event.event);
+        if (iter1 == m_events.end() || event.id != iter1->second.id){
+            m_schedule.erase(iter0);
+            continue;
+        }
+
+        //  Schedule the next event first so that we retain strong exception safety if it throws.
+        WallClock next = std::max(iter0->first + iter1->second.period, timestamp);
+        m_schedule.emplace(next, iter0->second);
+
+        //  Now remove the current event.
+        m_schedule.erase(iter0);
+
+        return event.event;
+    }
+}
+
+
+
+
+
+
+#if 0
+class ScopedCounter{
+public:
+    ScopedCounter(std::atomic<size_t>& counter)
+        : m_counter(counter)
+    {
+        counter++;
+    }
+    ~ScopedCounter(){
+        m_counter--;
+    }
+
+private:
+    std::atomic<size_t>& m_counter;
+};
+#endif
+
+
+
+
+
+BusyPeriodicRunner::BusyPeriodicRunner(ThreadPool& thread_pool)
+    : m_thread_pool(thread_pool)
+    , m_pending_waits(0)
+{}
+bool BusyPeriodicRunner::add_event(void* event, std::chrono::milliseconds period, WallClock start){
+    throw_if_cancelled();
+
+    m_pending_waits++;
+    std::lock_guard<Mutex> lg(m_lock);
+    m_pending_waits--;
+
+    //  Thread not started yet. Do this first for strong exception safety.
+    if (!m_runner){
+        m_runner = m_thread_pool.dispatch_now_blocking([this]{ thread_loop(); });
+    }
+
+    bool ret = m_scheduler.add_event(event, period, start);
+    m_cv.notify_all();
+    return ret;
+}
+void BusyPeriodicRunner::remove_event(void* event){
+    m_pending_waits++;
+    std::lock_guard<Mutex> lg(m_lock);
+    m_pending_waits--;
+    m_scheduler.remove_event(event);
+    m_cv.notify_all();
+
+    if (m_scheduler.events() == 0){
+        WriteSpinLock lg1(m_stats_lock);
+        m_utilization.push_idle();
+    }
+}
+bool BusyPeriodicRunner::cancel(std::exception_ptr exception) noexcept{
+    if (Cancellable::cancel(std::move(exception))){
+        return true;
+    }
+    std::lock_guard<Mutex> lg(m_lock);
+    m_cv.notify_all();
+    return false;
+}
+void BusyPeriodicRunner::thread_loop(){
+    bool is_back_to_back = false;
+    std::unique_lock<Mutex> lg(m_lock);
+    WallClock last_check_timestamp = current_time();
+    WallDuration idle_since_last_check = WallDuration(0);
+    while (true){
+        if (cancelled()){
+            return;
+        }
+
+        //  If anyone is trying to get the lock, yield now.
+        if (m_pending_waits.load(std::memory_order_acquire) != 0){
+            m_cv.wait(lg, [this]{ return m_pending_waits.load(std::memory_order_acquire) == 0; });
+        }
+
+        WallClock now = current_time();
+
+        {
+            WriteSpinLock lg1(m_stats_lock);
+            m_utilization.push_event(now - last_check_timestamp - idle_since_last_check, now);
+        }
+        last_check_timestamp = now;
+        idle_since_last_check = WallDuration(0);
+//        cout << m_utilization.utilization() << endl;
+
+        void* event = m_scheduler.request_next_event(now);
+
+        //  Event is available now. Run it.
+        if (event != nullptr){
+            run(event, is_back_to_back);
+            is_back_to_back = true;
+            continue;
+        }
+        is_back_to_back = false;
+
+        //  Wait for next scheduled event.
+        WallClock next = m_scheduler.next_event();
+
+        if (cancelled()){
+            return;
+        }
+
+        WallClock start = current_time();
+        if (next < WallClock::max()){
+            m_cv.wait_until(lg, next);
+        }else{
+            m_cv.wait(lg);
+        }
+        WallClock end = current_time();
+        idle_since_last_check += end - start;
+    }
+}
+void BusyPeriodicRunner::stop_thread() noexcept{
+    BusyPeriodicRunner::cancel(nullptr);
+    m_runner.wait_and_ignore_exceptions();
+}
+
+double BusyPeriodicRunner::current_utilization() const{
+    ReadSpinLock lg(m_stats_lock);
+    return m_utilization.utilization();
+}
+
+
+
+
+
+
+
+
+}
diff --git a/Common/Cpp/Concurrency/BusyPeriodicRunner.h b/Common/Cpp/Concurrency/BusyPeriodicRunner.h
new file mode 100644
index 0000000000..64b4940e49
--- /dev/null
+++ b/Common/Cpp/Concurrency/BusyPeriodicRunner.h
@@ -0,0 +1,112 @@
+/*  Busy Periodic Runner
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *      Periodically call a set of callbacks at custom intervals.
+ *
+ */
+
+#ifndef PokemonAutomation_BusyPeriodicRunner_H
+#define PokemonAutomation_BusyPeriodicRunner_H
+
+#include <chrono>
+#include <map>
+#include "Common/Cpp/Time.h"
+#include "Common/Cpp/EventRateTracker.h"
+#include "Common/Cpp/CancellableScope.h"
+#include "Common/Cpp/Concurrency/SpinLock.h"
+#include "Common/Cpp/Concurrency/Mutex.h"
+#include "Common/Cpp/Concurrency/ConditionVariable.h"
+#include "Common/Cpp/Concurrency/AsyncTask.h"
+#include "Common/Cpp/Concurrency/ThreadPool.h"
+
+namespace PokemonAutomation{
+
+
+//
+//  This is the raw (unprotected) data structure that tracks all the events
+//  and determines what event should be fired next and when.
+//
+class PeriodicScheduler{
+public:
+    size_t events() const;
+
+    //  Returns true if event was successfully added.
+    bool add_event(void* event, std::chrono::milliseconds period, WallClock start = current_time());
+    void remove_event(void* event);
+
+    //  Returns the next scheduled event. If no events are scheduled, returns WallClock::max().
+    WallClock next_event() const;
+
+    //  If an event is before the current timestamp, return it and reschedule for next period.
+    //  If nothing is before the current timestamp, return nullptr.
+    void* request_next_event(WallClock timestamp = current_time());
+
+private:
+    //  "id" is needed to solve the ABA problem if the same pointer is removed/re-added.
+    struct PeriodicEvent{
+        uint64_t id;
+        std::chrono::milliseconds period;
+    };
+    struct SingleEvent{
+        uint64_t id;
+        void* event;
+    };
+
+private:
+    uint64_t m_callback_id = 0;
+    std::map<void*, PeriodicEvent> m_events;
+    std::multimap<WallClock, SingleEvent> m_schedule;
+};
+
+
+
+//
+//  This is the actual callback runner class that will run the callbacks
+//  at their specified periods.
+//
+//  Adding and removing callbacks is thread-safe.
+//
+class BusyPeriodicRunner : public Cancellable{
+public:
+    virtual bool cancel(std::exception_ptr exception) noexcept override;
+
+    double current_utilization() const;
+
+protected:
+    BusyPeriodicRunner(ThreadPool& thread_pool);
+    bool add_event(void* event, std::chrono::milliseconds period, WallClock start = current_time());
+    void remove_event(void* event);
+
+    //  Run the event. "is_back_to_back" is true if there was no wait between
+    //  this event and the previous one.
+    //  This can be used is a performance hint to the child class to reuse
+    //  state for two close-in-time events or to determine if the inference
+    //  is too slow to keep up.
+    virtual void run(void* event, bool is_back_to_back) noexcept = 0;
+
+private:
+    void thread_loop();
+protected:
+    void stop_thread() noexcept;
+
+private:
+    ThreadPool& m_thread_pool;
+
+    std::atomic<size_t> m_pending_waits;
+    Mutex m_lock;
+    ConditionVariable m_cv;
+
+    mutable SpinLock m_stats_lock;
+    UtilizationTracker m_utilization;
+
+    PeriodicScheduler m_scheduler;
+
+    AsyncTask m_runner;
+};
+
+
+
+
+}
+#endif
diff --git a/Common/Cpp/Concurrency/ConditionVariable.h b/Common/Cpp/Concurrency/ConditionVariable.h
new file mode 100644
index 0000000000..4c979b92a4
--- /dev/null
+++ b/Common/Cpp/Concurrency/ConditionVariable.h
@@ -0,0 +1,126 @@
+/*  Condition Variable
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Concurrency_ConditionVariable_H
+#define PokemonAutomation_Concurrency_ConditionVariable_H
+
+#include "Qt6.9ThreadBugWorkaround.h"
+
+//  Note from Kuro (2026/08/15): I think it's ok to disable this workaround for
+//  mutex and conditional_variable since we're completely leaking the thread.
+//  So the parasitic adoption should dangle these sync classes.
+#if 0 //def PA_ENABLE_QT_ADOPTION_WORKAROUND
+
+#include <mutex>
+#include <QWaitCondition>
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+
+class ConditionVariable{
+public:
+    void notify_one(){
+        m_cv.notify_one();
+    }
+    void notify_all(){
+        m_cv.notify_all();
+    }
+
+    void wait(std::unique_lock<QMutex>& lock){
+        m_cv.wait(lock.mutex());
+    }
+    template <class Predicate>
+    void wait(std::unique_lock<QMutex>& lock, Predicate pred){
+        while (!pred()){
+            m_cv.wait(lock.mutex());
+        }
+    }
+
+    template <class Rep, class Period>
+    bool wait_for(
+        std::unique_lock<QMutex>& lock,
+        const std::chrono::duration<Rep, Period>& rel_time
+    ){
+        return m_cv.wait(lock.mutex(), rel_time);
+    }
+    template <class Rep, class Period, class Predicate>
+    bool wait_for(
+        std::unique_lock<QMutex>& lock,
+        const std::chrono::duration<Rep, Period>& rel_time,
+        Predicate pred
+    ){
+        if (rel_time == std::chrono::duration<Rep, Period>::max()){
+            while (!pred()){
+                m_cv.wait(lock.mutex());
+            }
+            return true;
+        }
+        auto abs_time = std::chrono::system_clock::now() + rel_time;
+        while (true){
+            if (pred()){
+                return true;
+            }
+            if (!m_cv.wait(lock.mutex(), abs_time - std::chrono::system_clock::now())){
+                return false;
+            }
+        }
+    }
+
+    template <class Clock, class Duration>
+    std::cv_status wait_until(
+        std::unique_lock<QMutex>& lock,
+        const std::chrono::time_point<Clock, Duration>& abs_time
+    ){
+        if (abs_time == std::chrono::time_point<Clock, Duration>::max()){
+            m_cv.wait(lock.mutex());
+            return std::cv_status::no_timeout;
+        }
+        return m_cv.wait(lock.mutex(), abs_time - std::chrono::system_clock::now())
+            ? std::cv_status::no_timeout
+            : std::cv_status::timeout;
+    }
+    template <class Clock, class Duration, class Predicate>
+    bool wait_until(
+        std::unique_lock<QMutex>& lock,
+        const std::chrono::time_point<Clock, Duration>& abs_time,
+        Predicate pred
+    ){
+        if (abs_time == std::chrono::time_point<Clock, Duration>::max()){
+            while (!pred()){
+                m_cv.wait(lock.mutex());
+            }
+            return true;
+        }
+        while (true){
+            if (pred()){
+                return true;
+            }
+            if (!m_cv.wait(lock.mutex(), abs_time - std::chrono::system_clock::now())){
+                return false;
+            }
+        }
+    }
+
+
+private:
+    QWaitCondition m_cv;
+};
+
+}
+
+#else
+
+#include <condition_variable>
+namespace PokemonAutomation{
+    using ConditionVariable = std::condition_variable;
+}
+
+#endif
+
+#endif
diff --git a/Common/Cpp/Concurrency/FireForgetDispatcher.cpp b/Common/Cpp/Concurrency/FireForgetDispatcher.cpp
index da1044bb99..10e1a8a0cb 100644
--- a/Common/Cpp/Concurrency/FireForgetDispatcher.cpp
+++ b/Common/Cpp/Concurrency/FireForgetDispatcher.cpp
@@ -1,16 +1,16 @@
 /*  Fire and Forget Runner
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include "Common/Cpp/Exceptions.h"
+//#include "Common/Cpp/Exceptions.h"
 #include "Common/Cpp/PanicDump.h"
 #include "FireForgetDispatcher.h"
 
-#include <iostream>
-using std::cout;
-using std::endl;
+//#include <iostream>
+//using std::cout;
+//using std::endl;
 
 namespace PokemonAutomation{
 
@@ -22,32 +22,45 @@ FireForgetDispatcher global_dispatcher;
 FireForgetDispatcher::FireForgetDispatcher()
     : m_stopping(false)
 {}
-FireForgetDispatcher::~FireForgetDispatcher(){
+
+void FireForgetDispatcher::stop(){
     {
-        std::lock_guard<std::mutex> lg(m_lock);
+        std::lock_guard<Mutex> lg(m_lock);
+        // like with the other thread option, make sure we're not double stopping
+        if (m_stopping) return;
         m_stopping = true;
         m_cv.notify_all();
     }
-    if (m_thread.joinable()){
-        m_thread.join();
-    }
+    m_thread.join();
+}
+
+FireForgetDispatcher::~FireForgetDispatcher(){
+    stop();
 }
+
 void FireForgetDispatcher::dispatch(std::function<void()>&& func){
-    std::lock_guard<std::mutex> lg(m_lock);
+    std::lock_guard<Mutex> lg(m_lock);
     m_queue.emplace_back(std::move(func));
     m_cv.notify_one();
 
     //  Lazy create thread.
-    if (!m_thread.joinable()){
-        m_thread = std::thread(run_with_catch, "FireForgetDispatcher::thread_loop()", [this]{ thread_loop(); });
+    if (m_thread){
+        return;
     }
+
+    m_thread = Thread([this]{
+        run_with_catch(
+            "FireForgetDispatcher::thread_loop()",
+            [this]{ thread_loop(); }
+        );
+    });
 }
 
 void FireForgetDispatcher::thread_loop(){
     while (true){
         std::function<void()> task;
         {
-            std::unique_lock<std::mutex> lg(m_lock);
+            std::unique_lock<Mutex> lg(m_lock);
             if (m_stopping){
                 return;
             }
diff --git a/Common/Cpp/Concurrency/FireForgetDispatcher.h b/Common/Cpp/Concurrency/FireForgetDispatcher.h
index b4810f1096..3364284ad7 100644
--- a/Common/Cpp/Concurrency/FireForgetDispatcher.h
+++ b/Common/Cpp/Concurrency/FireForgetDispatcher.h
@@ -1,6 +1,6 @@
 /*  Fire and Forget Runner
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -9,9 +9,9 @@
 
 #include <deque>
 #include <functional>
-#include <mutex>
-#include <condition_variable>
-#include <thread>
+#include "Mutex.h"
+#include "ConditionVariable.h"
+#include "Thread.h"
 
 namespace PokemonAutomation{
 
@@ -25,16 +25,18 @@ class FireForgetDispatcher{
     //  Call "handle->wait()" to wait for the task to finish.
     void dispatch(std::function<void()>&& func);
 
+    void stop();
+
 
 private:
     void thread_loop();
 
 private:
     std::deque<std::function<void()>> m_queue;
-    std::thread m_thread;
+    Thread m_thread;
     bool m_stopping;
-    std::mutex m_lock;
-    std::condition_variable m_cv;
+    Mutex m_lock;
+    ConditionVariable m_cv;
 };
 
 
diff --git a/Common/Cpp/Concurrency/Mutex.h b/Common/Cpp/Concurrency/Mutex.h
new file mode 100644
index 0000000000..189f8fdcdf
--- /dev/null
+++ b/Common/Cpp/Concurrency/Mutex.h
@@ -0,0 +1,42 @@
+/*  Mutex
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Concurrency_Mutex_H
+#define PokemonAutomation_Concurrency_Mutex_H
+
+#include "Qt6.9ThreadBugWorkaround.h"
+
+//  Note from Kuro (2026/08/15): I think it's ok to disable this workaround for
+//  mutex and conditional_variable since we're completely leaking the thread.
+//  So the parasitic adoption should dangle these sync classes.
+#if 0 //def PA_ENABLE_QT_ADOPTION_WORKAROUND
+
+#include <mutex>
+#include <QMutex>
+#include <QRecursiveMutex>
+namespace PokemonAutomation{
+    using Mutex = QMutex;
+    using RecursiveMutex = QRecursiveMutex;
+}
+
+#else
+
+#include <mutex>
+namespace PokemonAutomation{
+    using Mutex = std::mutex;
+    using RecursiveMutex = std::recursive_mutex;
+}
+
+#endif
+
+
+namespace PokemonAutomation{
+    template <typename LockType>
+    using LockGuard = std::lock_guard<LockType>;
+}
+
+
+#endif
diff --git a/Common/Cpp/Concurrency/ParallelTaskRunner.cpp b/Common/Cpp/Concurrency/ParallelTaskRunner.cpp
deleted file mode 100644
index 9d0c842b2b..0000000000
--- a/Common/Cpp/Concurrency/ParallelTaskRunner.cpp
+++ /dev/null
@@ -1,124 +0,0 @@
-/*  Parallel Task Runner
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#if _WIN32
-#include <Windows.h>
-#endif
-#include "Common/Cpp/PanicDump.h"
-#include "ParallelTaskRunner.h"
-
-namespace PokemonAutomation{
-
-
-
-ParallelTaskRunner::ParallelTaskRunner(
-    std::function<void()>&& new_thread_callback,
-    size_t starting_threads,
-    size_t max_threads
-)
-    : m_new_thread_callback(std::move(new_thread_callback))
-    , m_max_threads(max_threads == 0 ? std::thread::hardware_concurrency() : max_threads)
-    , m_stopping(false)
-    , m_busy_count(0)
-{
-    for (size_t c = 0; c < starting_threads; c++){
-        m_threads.emplace_back(run_with_catch, "ParallelTaskRunner::thread_loop()", [this]{ thread_loop(); });
-    }
-}
-ParallelTaskRunner::~ParallelTaskRunner(){
-    {
-        std::lock_guard<std::mutex> lg(m_lock);
-        m_stopping = true;
-        m_thread_cv.notify_all();
-//        m_dispatch_cv.notify_all();
-    }
-    for (std::thread& thread : m_threads){
-        thread.join();
-    }
-    for (auto& task : m_queue){
-        task->signal();
-    }
-}
-
-void ParallelTaskRunner::wait_for_everything(){
-    std::unique_lock<std::mutex> lg(m_lock);
-    m_dispatch_cv.wait(lg, [this]{
-        return m_queue.size() + m_busy_count == 0;
-    });
-}
-
-std::shared_ptr<AsyncTask> ParallelTaskRunner::dispatch(std::function<void()>&& func){
-    std::shared_ptr<AsyncTask> task(new AsyncTask(std::move(func)));
-
-    std::unique_lock<std::mutex> lg(m_lock);
-
-    m_dispatch_cv.wait(lg, [this]{
-        return m_queue.size() + m_busy_count < m_max_threads;
-    });
-
-    //  Enqueue task.
-    m_queue.emplace_back(task);
-
-    if (m_queue.size() + m_busy_count > m_threads.size()){
-        m_threads.emplace_back(run_with_catch, "ParallelTaskRunner::thread_loop()", [this]{ thread_loop(); });
-    }
-
-    m_thread_cv.notify_one();
-
-    return task;
-}
-
-
-void ParallelTaskRunner::thread_loop(){
-//#if _WIN32
-//    SetThreadPriority(GetCurrentThread(), THREAD_PRIORITY_IDLE);
-//#endif
-    if (m_new_thread_callback){
-        m_new_thread_callback();
-    }
-
-    bool busy = false;
-    while (true){
-        std::shared_ptr<AsyncTask> task;
-        {
-            std::unique_lock<std::mutex> lg(m_lock);
-            if (busy){
-                m_busy_count--;
-                busy = false;
-                m_dispatch_cv.notify_all();
-            }
-
-            if (m_stopping){
-                return;
-            }
-            if (m_queue.empty()){
-                m_thread_cv.wait(lg);
-                continue;
-            }
-
-            task = m_queue.front();
-            m_queue.pop_front();
-
-            busy = true;
-            m_busy_count++;
-        }
-
-        try{
-            task->m_task();
-        }catch (...){
-            task->m_exception = std::current_exception();
-//            std::lock_guard<std::mutex> lg(m_lock);
-//            for (std::shared_ptr<AsyncTask>& t : m_queue){
-//                t->signal();
-//            }
-        }
-        task->signal();
-    }
-}
-
-
-
-}
diff --git a/Common/Cpp/Concurrency/ParallelTaskRunner.h b/Common/Cpp/Concurrency/ParallelTaskRunner.h
deleted file mode 100644
index 01472d023f..0000000000
--- a/Common/Cpp/Concurrency/ParallelTaskRunner.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*  Parallel Task Runner
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_ParallelTaskRunner_H
-#define PokemonAutomation_ParallelTaskRunner_H
-
-#include "AsyncDispatcher.h"
-
-namespace PokemonAutomation{
-
-
-class ParallelTaskRunner{
-public:
-    ParallelTaskRunner(
-        std::function<void()>&& new_thread_callback,
-        size_t starting_threads,
-        size_t max_threads
-    );
-    ~ParallelTaskRunner();
-
-    void wait_for_everything();
-
-    std::shared_ptr<AsyncTask> dispatch(std::function<void()>&& func);
-
-
-private:
-//    void dispatch_task(AsyncTask& task);
-    void thread_loop();
-
-
-private:
-    std::function<void()> m_new_thread_callback;
-    size_t m_max_threads;
-    std::deque<std::shared_ptr<AsyncTask>> m_queue;
-    std::vector<std::thread> m_threads;
-    bool m_stopping;
-    size_t m_busy_count;
-    std::mutex m_lock;
-    std::condition_variable m_thread_cv;
-    std::condition_variable m_dispatch_cv;
-};
-
-
-
-
-
-}
-#endif
diff --git a/Common/Cpp/Concurrency/PeriodicRunner.cpp b/Common/Cpp/Concurrency/PeriodicRunner.cpp
new file mode 100644
index 0000000000..efe61c61a0
--- /dev/null
+++ b/Common/Cpp/Concurrency/PeriodicRunner.cpp
@@ -0,0 +1,199 @@
+/*  Periodic Runner
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Tools/GlobalThreadPools.h"
+#include "PeriodicRunner.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+
+
+
+PeriodicRunner::PeriodicRunner()
+    : m_stopping(false)
+    , m_thread(
+        GlobalThreadPools::unlimited_normal().dispatch_now_blocking([this]{
+            thread_body();
+        })
+    )
+{}
+PeriodicRunner::~PeriodicRunner(){
+    stop();
+}
+void PeriodicRunner::stop(){
+    if (!m_thread){
+        return;
+    }
+    {
+        std::lock_guard<Mutex> lg(m_lock);
+        m_stopping = true;
+    }
+    m_cv.notify_all();
+    m_thread.wait_and_ignore_exceptions();
+}
+
+
+void PeriodicRunner::update_next(
+    std::multimap<WallClock, std::map<Runnable*, Entry>::iterator>::iterator schedule_iter,
+    WallClock next_run_time
+) noexcept{
+    //  Move the node. This should never throw.
+    auto node = m_schedule.extract(schedule_iter);
+    node.key() = next_run_time;
+    node.mapped()->second.next = next_run_time;
+    m_schedule.insert(std::move(node));
+}
+
+
+void PeriodicRunner::trigger_run_now(Runnable& runnable) noexcept{
+    {
+        WallClock next = current_time();
+        std::lock_guard<Mutex> lg(m_lock);
+
+        auto runnable_iter = m_runnables.find(&runnable);
+        if (runnable_iter == m_runnables.end()){
+            return;
+        }
+
+        //  Already running right now!
+        if (!runnable_iter->second.busy){
+            return;
+        }
+
+        //  Find the corresponding schedule entry.
+        auto schedule_iter = m_schedule.find(runnable_iter->second.next);
+        while (true){
+            if (schedule_iter == m_schedule.end()){
+                //  Should be impossible.
+                return;
+            }
+            if (schedule_iter->second->first == &runnable){
+                break;
+            }
+            ++schedule_iter;
+        }
+
+        update_next(schedule_iter, next);
+    }
+    m_cv.notify_all();
+}
+void PeriodicRunner::add_runnable(Runnable& runnable, WallDuration period){
+    {
+        std::lock_guard<Mutex> lg(m_lock);
+
+        WallClock next = current_time();
+
+        auto ret = m_runnables.emplace(
+            std::piecewise_construct,
+            std::forward_as_tuple(&runnable),
+            std::forward_as_tuple(period)
+        );
+        if (!ret.second){
+            return;
+        }
+
+        try{
+            m_schedule.emplace(next, ret.first);
+        }catch (...){
+            m_runnables.erase(ret.first);
+            throw;
+        }
+    }
+    m_cv.notify_all();
+}
+void PeriodicRunner::remove_runnable(Runnable& runnable) noexcept{
+    while (true){
+        std::lock_guard<Mutex> lg(m_lock);
+
+        auto iter = m_runnables.find(&runnable);
+        if (iter == m_runnables.end()){
+            return;
+        }
+
+        if (!iter->second.busy){
+            m_schedule.erase(iter->second.next);
+            m_runnables.erase(iter);
+            break;
+        }
+    }
+}
+void PeriodicRunner::edit_duration(Runnable& runnable, WallDuration period) noexcept{
+    {
+        WallClock next = current_time() + period;
+        std::lock_guard<Mutex> lg(m_lock);
+
+        auto runnable_iter = m_runnables.find(&runnable);
+        if (runnable_iter == m_runnables.end()){
+            return;
+        }
+
+        runnable_iter->second.period = period;
+
+        //  Already running right now!
+        if (!runnable_iter->second.busy){
+            return;
+        }
+
+        //  Find the corresponding schedule entry.
+        auto schedule_iter = m_schedule.find(runnable_iter->second.next);
+//        cout << "Edit - Next = " << std::chrono::duration_cast<Milliseconds>(runnable_iter->second.next - current_time()).count() << endl;
+        while (true){
+            if (schedule_iter == m_schedule.end()){
+                //  Should be impossible.
+                return;
+            }
+            if (schedule_iter->second->first == &runnable){
+                break;
+            }
+            ++schedule_iter;
+        }
+
+        update_next(schedule_iter, next);
+//        cout << "Edit - Next = " << std::chrono::duration_cast<Milliseconds>(runnable_iter->second.next - current_time()).count() << endl;
+    }
+    m_cv.notify_all();
+}
+
+void PeriodicRunner::thread_body(){
+    while (!m_stopping){
+        std::unique_lock<Mutex> lg(m_lock);
+        auto schedule_iter = m_schedule.begin();
+        if (schedule_iter == m_schedule.end()){
+            m_cv.wait(lg);
+            continue;
+        }
+
+        WallClock fire_time = schedule_iter->first;
+//        cout << std::chrono::duration_cast<Milliseconds>(current_time() - fire_time).count() << endl;
+        if (fire_time > current_time()){
+            m_cv.wait_until(lg, fire_time);
+            continue;
+        }
+
+        auto runnable_iter = schedule_iter->second;
+
+        WallClock next = fire_time + runnable_iter->second.period;
+//        cout << "Period = " << std::chrono::duration_cast<Milliseconds>(runnable_iter->second.period).count() << endl;
+//        cout << "Next = " << std::chrono::duration_cast<Milliseconds>(next - current_time()).count() << endl;
+        update_next(schedule_iter, next);
+
+        runnable_iter->second.busy = true;
+        m_lock.unlock();
+        runnable_iter->first->run();
+        m_lock.lock();
+        runnable_iter->second.busy = false;
+    }
+}
+
+
+
+
+
+
+}
diff --git a/Common/Cpp/Concurrency/PeriodicRunner.h b/Common/Cpp/Concurrency/PeriodicRunner.h
new file mode 100644
index 0000000000..1ec481dfa3
--- /dev/null
+++ b/Common/Cpp/Concurrency/PeriodicRunner.h
@@ -0,0 +1,75 @@
+/*  Periodic Runner
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PeriodicRunner_H
+#define PokemonAutomation_PeriodicRunner_H
+
+#include <map>
+#include "Common/Cpp/Time.h"
+#include "Common/Cpp/Concurrency/Mutex.h"
+#include "Common/Cpp/Concurrency/ConditionVariable.h"
+#include "Common/Cpp/Concurrency/AsyncTask.h"
+
+namespace PokemonAutomation{
+
+
+
+class PeriodicRunner{
+public:
+    struct Runnable{
+        virtual void run() noexcept = 0;
+    };
+
+
+public:
+    PeriodicRunner();
+    ~PeriodicRunner();
+
+    void stop();
+
+    void trigger_run_now(Runnable& runnable) noexcept;
+
+    void add_runnable(Runnable& runnable, WallDuration period);
+    void remove_runnable(Runnable& runnable) noexcept;
+    void edit_duration(Runnable& runnable, WallDuration period) noexcept;
+
+
+private:
+    void thread_body();
+
+
+private:
+    struct Entry{
+        WallDuration period;
+        WallClock next;
+        bool busy;
+
+        Entry(WallDuration p_period)
+            : period(p_period)
+            , next(current_time())
+            , busy(false)
+        {}
+    };
+    void update_next(
+        std::multimap<WallClock, std::map<Runnable*, Entry>::iterator>::iterator schedule_iter,
+        WallClock next_run_time
+    ) noexcept;
+
+    Mutex m_lock;
+    ConditionVariable m_cv;
+
+    std::map<Runnable*, Entry> m_runnables;
+    std::multimap<WallClock, std::map<Runnable*, Entry>::iterator> m_schedule;
+
+    bool m_stopping;
+    AsyncTask m_thread;
+};
+
+
+
+
+}
+#endif
diff --git a/Common/Cpp/Concurrency/PeriodicScheduler.cpp b/Common/Cpp/Concurrency/PeriodicScheduler.cpp
deleted file mode 100644
index 0a5c6c31f5..0000000000
--- a/Common/Cpp/Concurrency/PeriodicScheduler.cpp
+++ /dev/null
@@ -1,216 +0,0 @@
-/*  Periodic Scheduler
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "PeriodicScheduler.h"
-
-#include <iostream>
-using std::cout;
-using std::endl;
-
-namespace PokemonAutomation{
-
-
-size_t PeriodicScheduler::events() const{
-    return m_events.size();
-}
-bool PeriodicScheduler::add_event(void* event, std::chrono::milliseconds period, WallClock start){
-    auto ret = m_events.emplace(event, PeriodicEvent{m_callback_id, period});
-    if (!ret.second){
-        //  Already exists. Do nothing.
-        return false;
-    }
-
-    //  Now add to schedule. Need to ensure strong exception safety.
-    try{
-        m_schedule.emplace(start, SingleEvent{m_callback_id, event});
-    }catch (...){
-        m_events.erase(ret.first);
-        throw;
-    }
-
-    m_callback_id++;
-    return true;
-}
-void PeriodicScheduler::remove_event(void* event){
-    //  No need to remove from scheduler since it will be skipped over automatically.
-    m_events.erase(event);
-}
-WallClock PeriodicScheduler::next_event() const{
-    auto iter = m_schedule.begin();
-    if (iter == m_schedule.end()){
-        return WallClock::max();
-    }
-    return iter->first;
-}
-void* PeriodicScheduler::request_next_event(WallClock timestamp){
-    while (true){
-        auto iter0 = m_schedule.begin();
-
-        //  Schedule is empty.
-        if (iter0 == m_schedule.end()){
-            return nullptr;
-        }
-
-        //  Next event isn't due.
-        if (timestamp < iter0->first){
-            return nullptr;
-        }
-
-        //  Current SingleEvent refers to a no longer existing PeriodicEvent.
-        SingleEvent event = iter0->second;
-        auto iter1 = m_events.find(event.event);
-        if (iter1 == m_events.end() || event.id != iter1->second.id){
-            m_schedule.erase(iter0);
-            continue;
-        }
-
-        //  Schedule the next event first so that we retain strong exception safety if it throws.
-        WallClock next = std::max(iter0->first + iter1->second.period, timestamp);
-        m_schedule.emplace(next, iter0->second);
-
-        //  Now remove the current event.
-        m_schedule.erase(iter0);
-
-        return event.event;
-    }
-}
-
-
-
-
-
-
-#if 0
-class ScopedCounter{
-public:
-    ScopedCounter(std::atomic<size_t>& counter)
-        : m_counter(counter)
-    {
-        counter++;
-    }
-    ~ScopedCounter(){
-        m_counter--;
-    }
-
-private:
-    std::atomic<size_t>& m_counter;
-};
-#endif
-
-
-
-
-
-PeriodicRunner::PeriodicRunner(AsyncDispatcher& dispatcher)
-    : m_dispatcher(dispatcher)
-    , m_pending_waits(0)
-{}
-bool PeriodicRunner::add_event(void* event, std::chrono::milliseconds period, WallClock start){
-    throw_if_cancelled();
-
-    m_pending_waits++;
-    std::lock_guard<std::mutex> lg(m_lock);
-    m_pending_waits--;
-
-    //  Thread not started yet. Do this first for strong exception safety.
-    if (!m_runner){
-        m_runner = m_dispatcher.dispatch([this]{ thread_loop(); });
-    }
-
-    bool ret = m_scheduler.add_event(event, period, start);
-    m_cv.notify_all();
-    return ret;
-}
-void PeriodicRunner::remove_event(void* event){
-    m_pending_waits++;
-    std::lock_guard<std::mutex> lg(m_lock);
-    m_pending_waits--;
-    m_scheduler.remove_event(event);
-    m_cv.notify_all();
-
-    if (m_scheduler.events() == 0){
-        SpinLockGuard lg1(m_stats_lock);
-        m_utilization.push_idle();
-    }
-}
-bool PeriodicRunner::cancel(std::exception_ptr exception) noexcept{
-    if (Cancellable::cancel(std::move(exception))){
-        return true;
-    }
-    std::lock_guard<std::mutex> lg(m_lock);
-    m_cv.notify_all();
-    return false;
-}
-void PeriodicRunner::thread_loop(){
-    bool is_back_to_back = false;
-    std::unique_lock<std::mutex> lg(m_lock);
-    WallClock last_check_timestamp = current_time();
-    WallClock::duration idle_since_last_check = WallClock::duration(0);
-    while (true){
-        if (cancelled()){
-            return;
-        }
-
-        //  If anyone is trying to get the lock, yield now.
-        if (m_pending_waits.load(std::memory_order_acquire) != 0){
-            m_cv.wait(lg, [this]{ return m_pending_waits.load(std::memory_order_acquire) == 0; });
-        }
-
-        WallClock now = current_time();
-
-        {
-            SpinLockGuard lg1(m_stats_lock);
-            m_utilization.push_event(now - last_check_timestamp - idle_since_last_check, now);
-        }
-        last_check_timestamp = now;
-        idle_since_last_check = WallClock::duration(0);
-//        cout << m_utilization.utilization() << endl;
-
-        void* event = m_scheduler.request_next_event(now);
-
-        //  Event is available now. Run it.
-        if (event != nullptr){
-            run(event, is_back_to_back);
-            is_back_to_back = true;
-            continue;
-        }
-        is_back_to_back = false;
-
-        //  Wait for next scheduled event.
-        WallClock next = m_scheduler.next_event();
-
-        if (cancelled()){
-            return;
-        }
-
-        WallClock start = current_time();
-        if (next < WallClock::max()){
-            m_cv.wait_until(lg, next);
-        }else{
-            m_cv.wait(lg);
-        }
-        WallClock end = current_time();
-        idle_since_last_check += end - start;
-    }
-}
-void PeriodicRunner::stop_thread(){
-    PeriodicRunner::cancel(nullptr);
-    m_runner.reset();
-}
-
-double PeriodicRunner::current_utilization() const{
-    SpinLockGuard lg(m_stats_lock);
-    return m_utilization.utilization();
-}
-
-
-
-
-
-
-
-
-}
diff --git a/Common/Cpp/Concurrency/PeriodicScheduler.h b/Common/Cpp/Concurrency/PeriodicScheduler.h
deleted file mode 100644
index d3b37385c5..0000000000
--- a/Common/Cpp/Concurrency/PeriodicScheduler.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/*  Periodic Scheduler
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- *      Periodically call a set of callbacks at custom intervals.
- *
- */
-
-#ifndef PokemonAutomation_PeriodicScheduler_H
-#define PokemonAutomation_PeriodicScheduler_H
-
-#include <chrono>
-#include <map>
-#include <mutex>
-#include <condition_variable>
-#include "Common/Cpp/Time.h"
-#include "Common/Cpp/EventRateTracker.h"
-#include "Common/Cpp/CancellableScope.h"
-#include "Common/Cpp/Concurrency/SpinLock.h"
-#include "AsyncDispatcher.h"
-
-namespace PokemonAutomation{
-
-
-//
-//  This is the raw (unprotected) data structure that tracks all the events
-//  and determines what event should be fired next and when.
-//
-class PeriodicScheduler{
-public:
-    size_t events() const;
-
-    //  Returns true if event was successfully added.
-    bool add_event(void* event, std::chrono::milliseconds period, WallClock start = current_time());
-    void remove_event(void* event);
-
-    //  Returns the next scheduled event. If no events are scheduled, returns WallClock::max().
-    WallClock next_event() const;
-
-    //  If an event is before the current timestamp, return it and reschedule for next period.
-    //  If nothing is before the current timestamp, return nullptr.
-    void* request_next_event(WallClock timestamp = current_time());
-
-private:
-    //  "id" is needed to solve the ABA problem if the same pointer is removed/re-added.
-    struct PeriodicEvent{
-        uint64_t id;
-        std::chrono::milliseconds period;
-    };
-    struct SingleEvent{
-        uint64_t id;
-        void* event;
-    };
-
-private:
-    uint64_t m_callback_id = 0;
-    std::map<void*, PeriodicEvent> m_events;
-    std::multimap<WallClock, SingleEvent> m_schedule;
-};
-
-
-
-//
-//  This is the actual callback runner class that will run the callbacks
-//  at their specified periods.
-//
-//  Adding and removing callbacks is thread-safe.
-//
-class PeriodicRunner : public Cancellable{
-public:
-    virtual bool cancel(std::exception_ptr exception) noexcept override;
-
-    double current_utilization() const;
-
-protected:
-    PeriodicRunner(AsyncDispatcher& dispatcher);
-    bool add_event(void* event, std::chrono::milliseconds period, WallClock start = current_time());
-    void remove_event(void* event);
-
-    //  Run the event. "is_back_to_back" is true if there was no wait between
-    //  this event and the previous one.
-    //  This can be used is a performance hint to the child class to reuse
-    //  state for two close-in-time events or to determine if the inference
-    //  is too slow to keep up.
-    virtual void run(void* event, bool is_back_to_back) noexcept = 0;
-
-private:
-    void thread_loop();
-protected:
-    void stop_thread();
-
-private:
-    AsyncDispatcher& m_dispatcher;
-
-    std::atomic<size_t> m_pending_waits;
-    std::mutex m_lock;
-    std::condition_variable m_cv;
-
-    mutable SpinLock m_stats_lock;
-    UtilizationTracker m_utilization;
-
-    PeriodicScheduler m_scheduler;
-
-    std::unique_ptr<AsyncTask> m_runner;
-};
-
-
-
-
-}
-#endif
diff --git a/Common/Cpp/Concurrency/Qt6.9ThreadBugWorkaround.h b/Common/Cpp/Concurrency/Qt6.9ThreadBugWorkaround.h
new file mode 100644
index 0000000000..8b2b9f4c91
--- /dev/null
+++ b/Common/Cpp/Concurrency/Qt6.9ThreadBugWorkaround.h
@@ -0,0 +1,26 @@
+/*  Mutex
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Concurrency_Qt69ThreadBugWorkaround_H
+#define PokemonAutomation_Concurrency_Qt69ThreadBugWorkaround_H
+
+//#define PA_ENABLE_QT_ADOPTION_WORKAROUND
+
+
+#ifdef QT_CORE_LIB
+
+#include <QtGlobal>
+
+#if _WIN32 && (QT_VERSION_MAJOR * 1000000 + QT_VERSION_MINOR * 1000 + QT_VERSION_PATCH) > 6008003
+
+#define PA_ENABLE_QT_ADOPTION_WORKAROUND
+
+#endif
+
+#endif
+
+
+#endif
diff --git a/Common/Cpp/Concurrency/ReverseLockGuard.h b/Common/Cpp/Concurrency/ReverseLockGuard.h
new file mode 100644
index 0000000000..312a3a7312
--- /dev/null
+++ b/Common/Cpp/Concurrency/ReverseLockGuard.h
@@ -0,0 +1,40 @@
+/*  Reverse Lock Guard
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_ReverseLockGuard_H
+#define PokemonAutomation_ReverseLockGuard_H
+
+#include "Common/Cpp/Exceptions.h"
+
+namespace PokemonAutomation{
+
+
+template <class Mutex>
+class ReverseLockGuard{
+public:
+    ReverseLockGuard(Mutex& lock)
+        : m_lock(lock)
+    {
+        if (lock.try_lock()){
+            throw InternalProgramError(
+                nullptr, PA_CURRENT_FUNCTION,
+                "Attempted to unlock an already unlocked lock."
+            );
+        }
+        lock.unlock();
+    }
+    ~ReverseLockGuard(){
+        m_lock.lock();
+    }
+
+
+private:
+    Mutex& m_lock;
+};
+
+
+}
+#endif
diff --git a/Common/Cpp/Concurrency/ScheduledTaskRunner.cpp b/Common/Cpp/Concurrency/ScheduledTaskRunner.cpp
index 6ade1d40d5..488d95bac7 100644
--- a/Common/Cpp/Concurrency/ScheduledTaskRunner.cpp
+++ b/Common/Cpp/Concurrency/ScheduledTaskRunner.cpp
@@ -1,6 +1,6 @@
 /*  Scheduled Task Runner
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  *      Run tasks at their scheduled times.
  *
@@ -16,37 +16,55 @@ namespace PokemonAutomation{
 
 
 
+ScheduledTaskRunner::ScheduledTaskRunner(ThreadPool& thread_pool)
+    : m_stopped(false)
+    , m_runner(thread_pool.dispatch_now_blocking([this]{ thread_loop(); }))
+{
+//    cout << "ScheduledTaskRunner: (Constructor): " << this << endl;
+}
 ScheduledTaskRunner::~ScheduledTaskRunner(){
+    stop();
+}
+void ScheduledTaskRunner::stop() noexcept{
+    if (!m_runner){
+        return;
+    }
 //    ScheduledTaskRunner::cancel(nullptr);
     {
-        std::lock_guard<std::mutex> lg(m_lock);
+        std::lock_guard<Mutex> lg(m_lock);
+//        cout << "ScheduledTaskRunner: (Destructor - start): " << this << endl;
         m_stopped = true;
-        m_cv.notify_all();
     }
-    m_runner.reset();
+    m_cv.notify_all();
+    m_runner.wait_and_ignore_exceptions();
+//    cout << "ScheduledTaskRunner: (Destructor - end):   " << this << endl;
 }
-ScheduledTaskRunner::ScheduledTaskRunner(AsyncDispatcher& dispatcher)
-    : m_stopped(false)
-    , m_runner(dispatcher.dispatch([this]{ thread_loop(); }))
-{}
+
+
 size_t ScheduledTaskRunner::size() const{
-    std::lock_guard<std::mutex> lg(m_lock);
+    std::lock_guard<Mutex> lg(m_lock);
     return m_schedule.size();
 }
 WallClock ScheduledTaskRunner::next_event() const{
-    std::lock_guard<std::mutex> lg(m_lock);
-    if (m_schedule.empty()){
+    std::lock_guard<Mutex> lg(m_lock);
+    if (m_stopped || m_schedule.empty()){
         return WallClock::max();
     }
     return m_schedule.begin()->first;
 }
 void ScheduledTaskRunner::add_event(WallClock time, std::function<void()> callback){
-    std::lock_guard<std::mutex> lg(m_lock);
+    std::lock_guard<Mutex> lg(m_lock);
+    if (m_stopped){
+        return;
+    }
     m_schedule.emplace(time, std::move(callback));
     m_cv.notify_all();
 }
 void ScheduledTaskRunner::add_event(std::chrono::milliseconds time_from_now, std::function<void()> callback){
-    std::lock_guard<std::mutex> lg(m_lock);
+    std::lock_guard<Mutex> lg(m_lock);
+    if (m_stopped){
+        return;
+    }
     m_schedule.emplace(current_time() + time_from_now, std::move(callback));
     m_cv.notify_all();
 }
@@ -55,13 +73,14 @@ bool ScheduledTaskRunner::cancel(std::exception_ptr exception) noexcept{
     if (Cancellable::cancel(std::move(exception))){
         return true;
     }
-    std::lock_guard<std::mutex> lg(m_lock);
+    std::lock_guard<Mutex> lg(m_lock);
     m_cv.notify_all();
     return false;
 }
 #endif
 void ScheduledTaskRunner::thread_loop(){
-    std::unique_lock<std::mutex> lg(m_lock);
+    std::unique_lock<Mutex> lg(m_lock);
+//    cout << "ScheduledTaskRunner: (Starting thread loop): " << this << endl;
 //    WallClock last_check_timestamp = current_time();
     while (!m_stopped){
 #if 0
@@ -71,7 +90,9 @@ void ScheduledTaskRunner::thread_loop(){
 #endif
 
         if (m_schedule.empty()){
+//            cout << "ScheduledTaskRunner: (Sleeping): " << this << endl;
             m_cv.wait(lg);
+//            cout << "ScheduledTaskRunner: (Waking): " << this << endl;
             continue;
         }
 
@@ -81,11 +102,15 @@ void ScheduledTaskRunner::thread_loop(){
             m_cv.wait_until(lg, item->first);
             continue;
         }
+//        cout << "ScheduledTaskRunner: (task - start): " << this << endl;
         lg.unlock();
         item->second();
         lg.lock();
+//        cout << "ScheduledTaskRunner: (task - end): " << this << endl;
         m_schedule.erase(item);
     }
+//    cout << "ScheduledTaskRunner: (Clearing schedule): " << this << endl;
+    m_schedule.clear();
 }
 
 
diff --git a/Common/Cpp/Concurrency/ScheduledTaskRunner.h b/Common/Cpp/Concurrency/ScheduledTaskRunner.h
index 5f8d686085..45b4bc19a0 100644
--- a/Common/Cpp/Concurrency/ScheduledTaskRunner.h
+++ b/Common/Cpp/Concurrency/ScheduledTaskRunner.h
@@ -1,6 +1,6 @@
 /*  Scheduled Task Runner
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  *      Run tasks at their scheduled times.
  *
@@ -12,15 +12,19 @@
 #include <map>
 #include "Common/Cpp/Time.h"
 //#include "Common/Cpp/CancellableScope.h"
-#include "Common/Cpp/Concurrency/AsyncDispatcher.h"
+#include "Common/Cpp/Concurrency/Mutex.h"
+#include "Common/Cpp/Concurrency/ConditionVariable.h"
+#include "Common/Cpp/Concurrency/AsyncTask.h"
+#include "Common/Cpp/Concurrency/ThreadPool.h"
 
 namespace PokemonAutomation{
 
 
 class ScheduledTaskRunner{
 public:
+    ScheduledTaskRunner(ThreadPool& thread_pool);
     ~ScheduledTaskRunner();
-    ScheduledTaskRunner(AsyncDispatcher& dispatcher);
+    void stop() noexcept;
 
     //  Returns the # of events in the schedule.
     size_t size() const;
@@ -38,13 +42,13 @@ class ScheduledTaskRunner{
     void thread_loop();
 
 private:
-    mutable std::mutex m_lock;
-    std::condition_variable m_cv;
+    mutable Mutex m_lock;
+    ConditionVariable m_cv;
     bool m_stopped;
 
     std::multimap<WallClock, std::function<void()>> m_schedule;
 
-    std::unique_ptr<AsyncTask> m_runner;
+    AsyncTask m_runner;
 };
 
 
diff --git a/Common/Cpp/Concurrency/SpinLock.cpp b/Common/Cpp/Concurrency/SpinLock.cpp
index 5b68bb9057..b0d91e6058 100644
--- a/Common/Cpp/Concurrency/SpinLock.cpp
+++ b/Common/Cpp/Concurrency/SpinLock.cpp
@@ -1,59 +1,137 @@
 /*  Spin Lock
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
+
+#include <thread>
+#include <iostream>
 #include "Common/Cpp/CpuId/CpuId.h"
+#include "SpinPause.h"
+#include "SpinLock.h"
 
-#if _WIN32 && defined PA_ARCH_x86
+#if 0
+#elif defined _WIN32 && defined PA_ARCH_x86
 #include <intrin.h>
+uint64_t cpu_clock(){
+    return __rdtsc();
+}
+#elif defined PA_ARCH_x86
+uint64_t cpu_clock(){
+    unsigned int lo, hi;
+    __asm__ volatile ("rdtsc" : "=a" (lo), "=d" (hi));
+    return ((uint64_t)hi << 32) | lo;
+}
+#elif defined PA_ARCH_arm64
+//  The ARM equivalent of rdtsc: the generic timer's virtual counter. It can be
+//  read in user space without entering the kernel.
+uint64_t cpu_clock(){
+    uint64_t value;
+    __asm__ volatile ("mrs %0, cntvct_el0" : "=r" (value));
+    return value;
+}
+#else
+#define PA_NO_CPU_CLOCK
 #endif
 
-#include "SpinPause.h"
-#include "SpinLock.h"
+namespace PokemonAutomation{
 
-#include <iostream>
-using std::cout;
-using std::endl;
 
-namespace PokemonAutomation{
 
 
-void SpinLock::spin_acquire(){
-    bool state = false;
-    if (m_locked.compare_exchange_weak(state, true)){
-        return;
-    }
-    do{
+void SpinLockMRSW::internal_acquire_read() noexcept{
+//    cout << "SpinLockMRSW::internal_acquire_read()" << endl;
+
+    //  Yield to the OS every 1000 failed iterations (but not immediately).
+    size_t failed_iterations = 0;
+    while (true){
         pause();
-        state = false;
-    }while (m_locked.load(std::memory_order_acquire) || !m_locked.compare_exchange_weak(state, true));
+        size_t state = m_readers.load(std::memory_order_acquire);
+        if (state != (size_t)-1 && m_readers.compare_exchange_weak(state, state + 1)){
+            return;
+        }
+        if (++failed_iterations >= 1000){
+            std::this_thread::yield();
+            failed_iterations = 0;
+        }
+    }
 }
+void SpinLockMRSW::internal_acquire_write() noexcept{
+//    cout << "SpinLockMRSW::internal_acquire_write()" << endl;
 
-void SpinLock::spin_acquire(const char* label){
-#if _WIN32 && defined PA_ARCH_x86
-    bool state = false;
-    if (m_locked.compare_exchange_weak(state, true)){
-//        cout << "early" << endl;
-//        printf("early\n");
-        return;
+    //  Yield to the OS every 1000 failed iterations (but not immediately).
+    size_t failed_iterations = 0;
+    while (true){
+        pause();
+        size_t state = m_readers.load(std::memory_order_acquire);
+        if (state == 0 && m_readers.compare_exchange_weak(state, (size_t)-1)){
+            return;
+        }
+        if (++failed_iterations >= 1000){
+            std::this_thread::yield();
+            failed_iterations = 0;
+        }
     }
-    uint64_t start = __rdtsc();
-    do{
-//        cout << "late" << endl;
-//        printf("late\n");
+}
+void SpinLockMRSW::internal_acquire_read(const char* label) noexcept{
+//    cout << "SpinLockMRSW::internal_acquire_read()" << endl;
+
+#ifdef PA_NO_CPU_CLOCK
+    internal_acquire_read();
+#else
+    uint64_t start = cpu_clock();
+    //  Yield to the OS every 1000 failed iterations (but not immediately).
+    size_t failed_iterations = 0;
+    while (true){
         pause();
-        if (__rdtsc() - start > 10000000000){
-            cout << "Slow SpinLock: " << label << endl;
-            start = __rdtsc();
+        size_t state = m_readers.load(std::memory_order_acquire);
+        if (state != (size_t)-1 && m_readers.compare_exchange_weak(state, state + 1)){
+            return;
         }
-        state = false;
-    }while (m_locked.load(std::memory_order_acquire) || !m_locked.compare_exchange_weak(state, true));
+        if (cpu_clock() - start > 10000000000){
+            try{
+                std::cout << "Slow ReadSpinLock: " << label << std::endl;
+            }catch (...){}
+            start = cpu_clock();
+        }
+        if (++failed_iterations >= 1000){
+            std::this_thread::yield();
+            failed_iterations = 0;
+        }
+    }
+#endif
+}
+void SpinLockMRSW::internal_acquire_write(const char* label) noexcept{
+//    cout << "SpinLockMRSW::internal_acquire_write()" << endl;
+
+#ifdef PA_NO_CPU_CLOCK
+    internal_acquire_write();
 #else
-    spin_acquire();
+    uint64_t start = cpu_clock();
+    //  Yield to the OS every 1000 failed iterations (but not immediately).
+    size_t failed_iterations = 0;
+    while (true){
+        pause();
+        if (cpu_clock() - start > 10000000000){
+            try{
+                std::cout << "Slow WriteSpinLock: " << label << std::endl;
+            }catch (...){}
+            start = cpu_clock();
+        }
+        size_t state = m_readers.load(std::memory_order_acquire);
+        if (state == 0 && m_readers.compare_exchange_weak(state, (size_t)-1)){
+            return;
+        }
+        if (++failed_iterations >= 1000){
+            std::this_thread::yield();
+            failed_iterations = 0;
+        }
+    }
 #endif
 }
 
 
+
+
 }
diff --git a/Common/Cpp/Concurrency/SpinLock.h b/Common/Cpp/Concurrency/SpinLock.h
index 796d82b42b..c97a4099c9 100644
--- a/Common/Cpp/Concurrency/SpinLock.h
+++ b/Common/Cpp/Concurrency/SpinLock.h
@@ -1,6 +1,6 @@
 /*  Spin Lock
  * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  * 
  */
 
@@ -8,44 +8,130 @@
 #define PokemonAutomation_SpinLock_H
 
 #include <atomic>
+#include "Common/Compiler.h"
 
 namespace PokemonAutomation{
 
 
-class SpinLock{
+
+//
+//  This is a simple multi-reader/single-writer (MRSW) spin lock.
+//  Fairness is not guaranteed. Multiple readers can starve a writer indefinitely.
+//
+//  As a spin lock, this is optimized for low contention.
+//
+
+class SpinLockMRSW{
 public:
-    SpinLock() : m_locked(false) {}
+    SpinLockMRSW() : m_readers(0) {}
+
+    PA_FORCE_INLINE void acquire_read(const char* label = nullptr){
+        //  Optimization: Assume unlocked
+        size_t state = 0;
+        if (m_readers.compare_exchange_weak(state, 1)){
+            return;
+        }
+        if (state != (size_t)-1 && m_readers.compare_exchange_weak(state, state + 1)){
+            return;
+        }
+
+        //  Only if we fail do we enter the (slow) retry logic.
+        if (label == nullptr){
+            internal_acquire_read();
+        }else{
+            internal_acquire_read(label);
+        }
+    }
+    PA_FORCE_INLINE void acquire_write(const char* label = nullptr){
+        //  Optimization: Assume unlocked
+        size_t state = 0;
+        if (m_readers.compare_exchange_weak(state, (size_t)-1)){
+            return;
+        }
+
+        //  Only if we fail do we enter the (slow) retry logic.
+        if (label == nullptr){
+            internal_acquire_write();
+        }else{
+            internal_acquire_write(label);
+        }
+    }
+
+    PA_FORCE_INLINE bool try_acquire_write(){
+        size_t state = 0;
+        return m_readers.compare_exchange_strong(state, (size_t)-1);
+    }
+
+    PA_FORCE_INLINE void unlock_read(){
+        m_readers.fetch_sub(1);
+    }
+    PA_FORCE_INLINE void unlock_write(){
+        m_readers.store(0, std::memory_order_release);
+    }
+
+private:
+    void internal_acquire_read() noexcept;
+    void internal_acquire_write() noexcept;
+    void internal_acquire_read(const char* label) noexcept;
+    void internal_acquire_write(const char* label) noexcept;
+
+private:
+    //  0           =   unlocked
+    //  positive    =   # of readers holding lock
+    //  -1          =   write locked
+    std::atomic<size_t> m_readers;
+};
 
-    void spin_acquire();
-    void spin_acquire(const char* label);
 
-    void unlock(){
-        m_locked.store(false, std::memory_order_release);
+class ReadSpinLock{
+public:
+    ReadSpinLock(const ReadSpinLock&) = delete;
+    void operator=(const ReadSpinLock&) = delete;
+
+    PA_FORCE_INLINE ReadSpinLock(
+        SpinLockMRSW& lock,
+        const char* label = "(unnamed lock)"
+    )
+        : m_lock(lock)
+    {
+        lock.acquire_read(label);
+    }
+    PA_FORCE_INLINE ~ReadSpinLock(){
+        m_lock.unlock_read();
     }
 
 private:
-    std::atomic<bool> m_locked;
+    SpinLockMRSW& m_lock;
 };
 
 
-class SpinLockGuard{
+class WriteSpinLock{
 public:
-    SpinLockGuard(const SpinLockGuard&) = delete;
-    void operator=(const SpinLockGuard&) = delete;
+    WriteSpinLock(const WriteSpinLock&) = delete;
+    void operator=(const WriteSpinLock&) = delete;
 
-    SpinLockGuard(SpinLock& lock, const char* label = "(unnamed lock)")
+    PA_FORCE_INLINE WriteSpinLock(
+        SpinLockMRSW& lock,
+        const char* label = "(unnamed lock)"
+    )
         : m_lock(lock)
     {
-        lock.spin_acquire(label);
+        lock.acquire_write(label);
     }
-    ~SpinLockGuard(){
-        m_lock.unlock();
+    PA_FORCE_INLINE ~WriteSpinLock(){
+        m_lock.unlock_write();
     }
 
 private:
-    SpinLock& m_lock;
+    SpinLockMRSW& m_lock;
 };
 
 
+using SpinLock = SpinLockMRSW;
+//using SpinLockGuard = WriteSpinLock;
+
+
+
+
 }
 #endif
diff --git a/Common/Cpp/Concurrency/SpinPause.h b/Common/Cpp/Concurrency/SpinPause.h
index daa5ce1c0e..6a7c060754 100644
--- a/Common/Cpp/Concurrency/SpinPause.h
+++ b/Common/Cpp/Concurrency/SpinPause.h
@@ -1,6 +1,6 @@
 /*  Spin Pause
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -19,6 +19,14 @@ namespace PokemonAutomation{
         _mm_pause();
     }
 }
+#elif __aarch64__ || __arm64__
+//  The ARM "yield" hint, equivalent to x86's "pause": it tells the processor
+//  that the current thread is in a spin-wait loop.
+namespace PokemonAutomation{
+    PA_FORCE_INLINE void pause(){
+        __asm__ volatile ("yield");
+    }
+}
 #else
 namespace PokemonAutomation{
     PA_FORCE_INLINE void pause(){}
diff --git a/Common/Cpp/Concurrency/Thread.cpp b/Common/Cpp/Concurrency/Thread.cpp
new file mode 100644
index 0000000000..d33c718df6
--- /dev/null
+++ b/Common/Cpp/Concurrency/Thread.cpp
@@ -0,0 +1,14 @@
+/*  Thread
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Qt6.9ThreadBugWorkaround.h"
+
+#ifdef PA_ENABLE_QT_ADOPTION_WORKAROUND
+#include "Backends/Thread_Qt.tpp"
+//#include "Backends/Thread_StdThreadDetach.tpp"
+#else
+#include "Backends/Thread_StdThread.tpp"
+#endif
diff --git a/Common/Cpp/Concurrency/Thread.h b/Common/Cpp/Concurrency/Thread.h
new file mode 100644
index 0000000000..759d8b3707
--- /dev/null
+++ b/Common/Cpp/Concurrency/Thread.h
@@ -0,0 +1,73 @@
+/*  Thread
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *
+ *  This class is a wrapper for std::thread that tries to work around Qt thread issue at 6.9+:
+ *      https://github.com/PokemonAutomation/Arduino-Source/issues/570
+ *      https://bugreports.qt.io/browse/QTBUG-131892
+ *
+ *  Same usage as std::thread except automatic join on destruction:
+ *     - std::thread: Calls std::terminate() if destroyed while joinable (unsafe!)
+ *     - Thread: Automatically calls join() in destructor (safe, prevents crashes)
+ *  Thread also allows multiple join() calls from the main thread where Thread is created.
+ *  Subsequent join() calls will just be no-op.
+ *
+ *  It still has the same caveat:
+ *     - Unsafe when calling bool(), join() or joinable() from multiple threads at same time.
+ *       Prefer to call them from the main thread where Thread is created.
+ */
+
+#ifndef PokemonAutomation_Concurrency_Thread_H
+#define PokemonAutomation_Concurrency_Thread_H
+
+#include <functional>
+#include "Common/Cpp/Containers/Pimpl.h"
+
+namespace PokemonAutomation{
+
+
+class Thread{
+public:
+    // Destructor - automatically joins thread (RAII safety)
+    ~Thread();
+
+    // Move-only semantics (same as std::thread)
+    Thread(Thread&&);
+    Thread& operator=(Thread&&);
+
+public:
+    // Default constructor - creates empty Thread with no underlying thread
+    Thread();
+
+    // Constructor - starts thread immediately with given function like std::thread
+    // Function is moved (not copied) for efficiency
+    Thread(std::function<void()>&& function);
+
+    // Returns true if Thread has valid data (not default-constructed or moved-from)
+    // and not joined.
+    operator bool() const{
+        return m_data;
+    }
+
+    // Join thread - waits for completion (can call multiple times safely).
+    void join();
+
+    // Check if thread has valid data (not default-constructed or moved-from) and
+    // is joinable (active and not yet joined).
+    bool joinable() const;
+
+private:
+    enum class State;  // Reserved for future use
+
+    // PIMPL data - defined in .cpp to hide implementation details
+    struct Data;
+    Pimpl<Data> m_data;
+};
+
+
+
+
+
+}
+#endif
diff --git a/Common/Cpp/Concurrency/ThreadPool.h b/Common/Cpp/Concurrency/ThreadPool.h
new file mode 100644
index 0000000000..29ea2cf01c
--- /dev/null
+++ b/Common/Cpp/Concurrency/ThreadPool.h
@@ -0,0 +1,69 @@
+/*  Thread Pool
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *      This is a thread pool for compute-heavy tasks.
+ *
+ *  This thread pool has a limited number of threads and should only be used for
+ *  compute-heavy tasks that do not block or yield. A blocked thread will still
+ *  count towards the thread limit.
+ *
+ *  Because the # of threads is capped, it is safe to spam this thread pool with
+ *  lots of smaller tasks.
+ *
+ */
+
+#ifndef PokemonAutomation_ThreadPool_H
+#define PokemonAutomation_ThreadPool_H
+
+#include <functional>
+#include "Common/Cpp/Time.h"
+
+namespace PokemonAutomation{
+
+class AsyncTask;
+
+
+class ThreadPool{
+public:
+    virtual void stop() = 0;
+    virtual void ensure_threads(size_t threads) = 0;
+
+public:
+    virtual size_t current_threads() const = 0;
+    virtual size_t max_threads() const = 0;
+    virtual WallDuration cpu_time() const = 0;
+
+public:
+    //  As of this writing, tasks dispatched earlier are not allowed to block
+    //  on tasks that are dispatched later as it may cause a deadlock.
+
+    //  Dispatch the function and return immediately.
+    //  The function is not guaranteed to begin running immediately.
+    [[nodiscard]] virtual AsyncTask dispatch(std::function<void()>&& func) = 0;
+
+    //  Dispatch the function and begin running now.
+    //  If there are no threads available, it waits until there are.
+    //  This function will not return until the function has begin running.
+    [[nodiscard]] virtual AsyncTask dispatch_now_blocking(std::function<void()>&& func) = 0;
+
+    //  Try to dispatch the function and begin running now.
+    //  Returns null if no threads are available. "func" will be moved-from only on success.
+    //  This function returns immediately.
+    [[nodiscard]] virtual AsyncTask try_dispatch_now(std::function<void()>& func) = 0;
+
+    //  Run function for all the indices [start, end).
+    //  Lower indices are not allowed to block on higher indices.
+    virtual void run_in_parallel(
+        const std::function<void(size_t index)>& func,
+        size_t start, size_t end,
+        size_t block_size = 0
+    ) = 0;
+};
+
+
+
+
+
+}
+#endif
diff --git a/Common/Cpp/Concurrency/Watchdog.cpp b/Common/Cpp/Concurrency/Watchdog.cpp
index c347d0ca8e..e737aabc4f 100644
--- a/Common/Cpp/Concurrency/Watchdog.cpp
+++ b/Common/Cpp/Concurrency/Watchdog.cpp
@@ -1,6 +1,6 @@
 /*  Watchdog
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -16,17 +16,25 @@ namespace PokemonAutomation{
 
 
 
+Watchdog::Watchdog(ThreadPool& thread_pool)
+    : m_thread(thread_pool.dispatch_now_blocking(
+        [this]{ thread_body(); })
+    )
+{}
 Watchdog::~Watchdog(){
+    stop();
+}
+void Watchdog::stop() noexcept{
+    if (!m_thread){
+        return;
+    }
     {
-        std::lock_guard<std::mutex> lg(m_sleep_lock);
+        std::lock_guard<Mutex> lg(m_sleep_lock);
         m_stopped = true;
-        m_cv.notify_all();
     }
-    m_thread.join();
+    m_cv.notify_all();
+    m_thread.wait_and_ignore_exceptions();
 }
-Watchdog::Watchdog()
-    : m_thread(&Watchdog::thread_body, this)
-{}
 
 
 void Watchdog::add(WatchdogCallback& callback, std::chrono::milliseconds period){
@@ -34,7 +42,7 @@ void Watchdog::add(WatchdogCallback& callback, std::chrono::milliseconds period)
 
     WallClock now = current_time();
     {
-        SpinLockGuard slg(m_state_lock);
+        WriteSpinLock slg(m_state_lock);
 
         auto iter = m_callbacks.find(&callback);
         if (iter == m_callbacks.end()){
@@ -58,34 +66,40 @@ void Watchdog::add(WatchdogCallback& callback, std::chrono::milliseconds period)
     }
 
     if (signal){
-        std::lock_guard<std::mutex> wlg(m_sleep_lock);
+        std::lock_guard<Mutex> wlg(m_sleep_lock);
         m_cv.notify_all();
     }
 }
-void Watchdog::remove(WatchdogCallback& callback){
+void Watchdog::remove(WatchdogCallback& callback) noexcept{
     while (true){
-        {
-            SpinLockGuard slg(m_state_lock);
-            auto iter_c = m_callbacks.find(&callback);
-            if (iter_c == m_callbacks.end()){
-                return;
-            }
-
-            std::mutex& entry_lock = iter_c->second.lock;
-            if (entry_lock.try_lock()){
-                //  Remove from the schedule first.
-                auto iter_s = iter_c->second.iter;
-                m_schedule.erase(iter_s);
-
-                //  Unlock and remove from callback set.
-                entry_lock.unlock();
-                m_callbacks.erase(iter_c);
-                return;
-            }
+        if (try_remove(callback)){
+            return;
         }
         pause();
     }
 }
+bool Watchdog::try_remove(WatchdogCallback& callback) noexcept{
+    WriteSpinLock slg(m_state_lock);
+    auto iter_c = m_callbacks.find(&callback);
+    if (iter_c == m_callbacks.end()){
+        return true;
+    }
+
+    Mutex& entry_lock = iter_c->second.lock;
+    if (!entry_lock.try_lock()){
+        return false;
+    }
+
+    //  Remove from the schedule first.
+    auto iter_s = iter_c->second.iter;
+    m_schedule.erase(iter_s);
+
+    //  Unlock and remove from callback set.
+    entry_lock.unlock();
+    m_callbacks.erase(iter_c);
+
+    return true;
+}
 
 
 
@@ -113,7 +127,7 @@ void Watchdog::delay(WatchdogCallback& callback, WallClock next_call){
 
     WallClock now = current_time();
     {
-        SpinLockGuard slg(m_state_lock);
+        WriteSpinLock slg(m_state_lock);
         auto iter = m_callbacks.find(&callback);
         if (iter == m_callbacks.end()){
             return;
@@ -127,7 +141,7 @@ void Watchdog::delay(WatchdogCallback& callback, WallClock next_call){
     }
 
     if (signal){
-        std::lock_guard<std::mutex> wlg(m_sleep_lock);
+        std::lock_guard<Mutex> wlg(m_sleep_lock);
         m_cv.notify_all();
     }
 }
@@ -143,7 +157,7 @@ void Watchdog::thread_body(){
     WallClock wake_time = WallClock::min();
     while (true){
         {
-            std::unique_lock<std::mutex> wlg(m_sleep_lock);
+            std::unique_lock<Mutex> wlg(m_sleep_lock);
             if (m_stopped){
                 break;
             }
@@ -161,11 +175,11 @@ void Watchdog::thread_body(){
 
         WallClock now = current_time();
 
-        std::unique_lock<std::mutex> elg;
+        std::unique_lock<Mutex> elg;
         Entry* entry;
         CallbackMap::iterator iter_c;
         {
-            SpinLockGuard slg(m_state_lock);
+            WriteSpinLock slg(m_state_lock);
 
             //  Nothing scheduled.
             if (m_schedule.empty()){
@@ -186,7 +200,7 @@ void Watchdog::thread_body(){
             }else{
                 //  Ready to run.
                 entry = &iter_c->second;
-                elg = std::unique_lock<std::mutex>(entry->lock);
+                elg = std::unique_lock<Mutex>(entry->lock);
             }
         }
 //        cout << "Running..." << endl;
@@ -202,7 +216,7 @@ void Watchdog::thread_body(){
             std::cerr << "Watchdog callback threw an exception." << std::endl;
         }
 
-        SpinLockGuard slg(m_state_lock);
+        WriteSpinLock slg(m_state_lock);
         update_unprotected(iter_c, current_time() + entry->period);
 //        entry->lock.unlock();
 
diff --git a/Common/Cpp/Concurrency/Watchdog.h b/Common/Cpp/Concurrency/Watchdog.h
index 34532f8015..8327a9403b 100644
--- a/Common/Cpp/Concurrency/Watchdog.h
+++ b/Common/Cpp/Concurrency/Watchdog.h
@@ -1,6 +1,6 @@
 /*  Watchdog
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  *      This class runs callbacks at specified intervals. The user can also
  *  delay the next call.
@@ -15,11 +15,12 @@
 #define PokemonAutomation_Watchdog_H
 
 #include <map>
-#include <mutex>
-#include <thread>
-#include <condition_variable>
 #include "Common/Cpp/Time.h"
 #include "Common/Cpp/Concurrency/SpinLock.h"
+#include "Common/Cpp/Concurrency/Mutex.h"
+#include "Common/Cpp/Concurrency/ConditionVariable.h"
+#include "Common/Cpp/Concurrency/AsyncTask.h"
+#include "Common/Cpp/Concurrency/ThreadPool.h"
 
 namespace PokemonAutomation{
 
@@ -32,14 +33,17 @@ struct WatchdogCallback{
 
 class Watchdog{
 public:
+    Watchdog(ThreadPool& thread_pool);
     ~Watchdog();
-    Watchdog();
+
+    void stop() noexcept;
 
     //  Add a callback which will be called at the specified period.
     //  If callback already exists, the period will be overwritten and the next
     //  call will be set to (now + period).
     void add(WatchdogCallback& callback, std::chrono::milliseconds period);
-    void remove(WatchdogCallback& callback);
+    void remove(WatchdogCallback& callback) noexcept;
+    bool try_remove(WatchdogCallback& callback) noexcept;
 
     //  Delay the specified callback. If the callback is current running, this
     //  function does nothing.
@@ -66,7 +70,7 @@ class Watchdog{
         WatchdogCallback& callback;
         std::chrono::milliseconds period;
         Schedule::iterator iter;
-        std::mutex lock;
+        Mutex lock;
 
         Entry(
             WatchdogCallback& p_callback,
@@ -89,10 +93,10 @@ class Watchdog{
 
     //  Nothing should ever acquire both locks at once.
     SpinLock m_state_lock;
-    std::mutex m_sleep_lock;
+    Mutex m_sleep_lock;
 
-    std::condition_variable m_cv;
-    std::thread m_thread;
+    ConditionVariable m_cv;
+    AsyncTask m_thread;
 };
 
 
diff --git a/Common/Cpp/Containers/AlignedMalloc.cpp b/Common/Cpp/Containers/AlignedMalloc.cpp
index 6ab30b4b8d..c97cda272c 100644
--- a/Common/Cpp/Containers/AlignedMalloc.cpp
+++ b/Common/Cpp/Containers/AlignedMalloc.cpp
@@ -1,6 +1,6 @@
 /*  Aligned Malloc
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  *  Copy-edited from:
  *      https://github.com/Mysticial/y-cruncher/blob/master/trunk/Source/PublicLibs/BasicLibs/Memory/AlignedMalloc.cpp
diff --git a/Common/Cpp/Containers/AlignedMalloc.h b/Common/Cpp/Containers/AlignedMalloc.h
index 54f8c0d0f7..3cf9487373 100644
--- a/Common/Cpp/Containers/AlignedMalloc.h
+++ b/Common/Cpp/Containers/AlignedMalloc.h
@@ -1,6 +1,6 @@
 /*  Aligned Malloc
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/Common/Cpp/Containers/AlignedVector.h b/Common/Cpp/Containers/AlignedVector.h
index bfd56ee5d0..23eae89a4a 100644
--- a/Common/Cpp/Containers/AlignedVector.h
+++ b/Common/Cpp/Containers/AlignedVector.h
@@ -1,6 +1,6 @@
 /*  Aligned Vector
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -18,13 +18,15 @@ class AlignedVector{
     ~AlignedVector();
     AlignedVector(AlignedVector&& x) noexcept;
     void operator=(AlignedVector&& x) noexcept;
-    AlignedVector(const AlignedVector&);
-    void operator=(const AlignedVector&);
+    AlignedVector(const AlignedVector& x);
+    void operator=(const AlignedVector& x);
 
 public:
     AlignedVector();
     AlignedVector(size_t items);
 
+    void clear() noexcept;
+
 public:
     size_t empty() const{ return m_size == 0; }
     size_t size() const{ return m_size; }
@@ -42,8 +44,6 @@ class AlignedVector{
     void emplace_back(Args&&... args);
     void pop_back();
 
-    void clear();
-
     const Object* begin() const;
     Object* begin();
     const Object* end() const;
diff --git a/Common/Cpp/Containers/AlignedVector.tpp b/Common/Cpp/Containers/AlignedVector.tpp
index e13e4c306f..4507c0fc5b 100644
--- a/Common/Cpp/Containers/AlignedVector.tpp
+++ b/Common/Cpp/Containers/AlignedVector.tpp
@@ -11,6 +11,7 @@
 #include <new>
 #include <type_traits>
 #include <utility>
+#include <algorithm>
 #include "Common/Compiler.h"
 #include "AlignedMalloc.h"
 #include "AlignedVector.h"
@@ -55,11 +56,14 @@ AlignedVector<Object>::AlignedVector(const AlignedVector& x)
         size_t half = m_capacity / 2;
         if (half >= x.m_size){
             m_capacity = half;
-        } else{
+        }else{
             break;
         }
     }
-    m_ptr = (Object*)aligned_malloc(m_capacity * sizeof(Object), 64);
+    m_ptr = (Object*)aligned_malloc(
+        m_capacity * sizeof(Object),
+        std::max<size_t>(alignof(Object), 64)
+    );
     if (m_ptr == nullptr){
         throw std::bad_alloc();
     }
@@ -119,6 +123,17 @@ AlignedVector<Object>::AlignedVector(size_t items){
     }
 }
 
+template <typename Object>
+void AlignedVector<Object>::clear() noexcept{
+    if constexpr (std::is_trivially_constructible<Object>::value){
+        m_size = 0;
+    }else{
+        while (m_size > 0){
+            pop_back();
+        }
+    }
+}
+
 template <typename Object>
 template <class... Args>
 void AlignedVector<Object>::emplace_back(Args&&... args){
@@ -132,16 +147,6 @@ template <typename Object>
 void AlignedVector<Object>::pop_back(){
     m_ptr[--m_size].~Object();
 }
-template <typename Object>
-void AlignedVector<Object>::clear(){
-    if constexpr (std::is_trivially_constructible<Object>::value){
-        m_size = 0;
-    }else{
-        while (m_size > 0){
-            pop_back();
-        }
-    }
-}
 
 template <typename Object>
 PA_NO_INLINE void AlignedVector<Object>::expand(){
diff --git a/Common/Cpp/Containers/BoxSet.h b/Common/Cpp/Containers/BoxSet.h
index b5d811310f..2956c90b51 100644
--- a/Common/Cpp/Containers/BoxSet.h
+++ b/Common/Cpp/Containers/BoxSet.h
@@ -1,6 +1,6 @@
 /*  Box Set
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  *      This class is experimental. It currently doesn't actually accomplish
  *  what it was intended for.
diff --git a/Common/Cpp/Containers/CircularBuffer (disabled).cpp b/Common/Cpp/Containers/CircularBuffer (disabled).cpp
index 9fb17320dd..a702ef8e24 100644
--- a/Common/Cpp/Containers/CircularBuffer (disabled).cpp	
+++ b/Common/Cpp/Containers/CircularBuffer (disabled).cpp	
@@ -1,6 +1,6 @@
 /*  Circular Buffer
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/Common/Cpp/Containers/CircularBuffer (disabled).h b/Common/Cpp/Containers/CircularBuffer (disabled).h
index 09cfbb089e..94290eda4a 100644
--- a/Common/Cpp/Containers/CircularBuffer (disabled).h	
+++ b/Common/Cpp/Containers/CircularBuffer (disabled).h	
@@ -1,11 +1,11 @@
 /*  Circular Buffer
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#ifndef PokemonAutomation_CircularBuffer_H
-#define PokemonAutomation_CircularBuffer_H
+#ifndef PokemonAutomation_CircularBuffer_disabled_H
+#define PokemonAutomation_CircularBuffer_disabled_H
 
 #include <stdint.h>
 #include "AlignedVector.h"
diff --git a/Common/Cpp/Containers/CircularBuffer.h b/Common/Cpp/Containers/CircularBuffer.h
new file mode 100644
index 0000000000..488dac8392
--- /dev/null
+++ b/Common/Cpp/Containers/CircularBuffer.h
@@ -0,0 +1,215 @@
+/*  Circular Buffer
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_CircularBuffer_H
+#define PokemonAutomation_CircularBuffer_H
+
+#include <new>
+#include <utility>
+#include "Common/Cpp/Exceptions.h"
+#include "Common/Cpp/Containers/AlignedMalloc.h"
+
+namespace PokemonAutomation{
+
+
+
+template <typename Object>
+class CircularBuffer{
+public:
+    ~CircularBuffer();
+    CircularBuffer(CircularBuffer&& x) noexcept;
+    void operator=(CircularBuffer&& x) noexcept;
+    CircularBuffer(const CircularBuffer& x);
+    void operator=(const CircularBuffer& x);
+
+public:
+    CircularBuffer();
+    CircularBuffer(size_t capacity);
+
+    void clear() noexcept;
+
+    size_t empty() const{ return m_front == m_back; }
+    size_t full() const{ return m_back - m_front >= m_capacity; }
+    size_t size() const{ return m_back - m_front; }
+
+    const Object& front() const;
+          Object& front();
+    const Object& operator[](size_t index) const;
+          Object& operator[](size_t index);
+
+
+    template <class... Args>
+    Object& push_back(Args&&... args);
+    template <class... Args>
+    Object* try_push_back(Args&&... args);
+    void pop_front();
+
+private:
+    size_t m_capacity;
+    size_t m_front;
+    size_t m_back;
+    Object* m_ptr;
+};
+
+
+
+template <typename Object>
+CircularBuffer<Object>::~CircularBuffer(){
+    clear();
+    aligned_free(m_ptr);
+}
+template <typename Object>
+CircularBuffer<Object>::CircularBuffer(CircularBuffer&& x) noexcept
+    : m_capacity(x.m_capacity)
+    , m_front(x.m_front)
+    , m_back(x.m_back)
+    , m_ptr(x.m_ptr)
+{
+    x.m_capacity = 0;
+    x.m_front = 0;
+    x.m_back = 0;
+    x.m_ptr = nullptr;
+}
+template <typename Object>
+void CircularBuffer<Object>::operator=(CircularBuffer&& x) noexcept{
+    if (this == &x){
+        return;
+    }
+    clear();
+    aligned_free(m_ptr);
+    m_capacity = x.m_capacity;
+    m_front = x.m_front;
+    m_back = x.m_back;
+    m_ptr = x.m_ptr;
+    x.m_capacity = 0;
+    x.m_front = 0;
+    x.m_back = 0;
+    x.m_ptr = nullptr;
+}
+template <typename Object>
+CircularBuffer<Object>::CircularBuffer(const CircularBuffer& x)
+    : CircularBuffer(x.m_capacity)
+{
+    size_t size = x.size();
+    for (size_t c = 0; c < size; c++){
+        push_back(x[c]);
+    }
+}
+template <typename Object>
+void CircularBuffer<Object>::operator=(const CircularBuffer& x){
+    if (this == &x){
+        return;
+    }
+    CircularBuffer tmp(x);
+    *this = std::move(tmp);
+}
+
+template <typename Object>
+CircularBuffer<Object>::CircularBuffer()
+    : m_capacity(0)
+    , m_front(0)
+    , m_back(0)
+    , m_ptr(nullptr)
+{}
+template <typename Object>
+CircularBuffer<Object>::CircularBuffer(size_t capacity)
+    : m_capacity(capacity)
+    , m_front(0)
+    , m_back(0)
+    , m_ptr(nullptr)
+{
+    if (capacity == 0){
+        return;
+    }
+    m_ptr = (Object*)aligned_malloc(capacity * sizeof(Object), alignof(Object));
+    if (m_ptr == nullptr){
+        throw std::bad_alloc();
+    }
+}
+
+template <typename Object>
+void CircularBuffer<Object>::clear() noexcept{
+    while (m_back > m_front){
+        pop_front();
+    }
+}
+
+
+template <typename Object>
+const Object& CircularBuffer<Object>::front() const{
+    return m_ptr[m_front];
+}
+template <typename Object>
+Object& CircularBuffer<Object>::front(){
+    return m_ptr[m_front];
+}
+template <typename Object>
+const Object& CircularBuffer<Object>::operator[](size_t index) const{
+    index += m_front;
+    if (index >= m_capacity){
+        index -= m_capacity;
+    }
+    return m_ptr[index];
+}
+template <typename Object>
+Object& CircularBuffer<Object>::operator[](size_t index){
+    index += m_front;
+    if (index >= m_capacity){
+        index -= m_capacity;
+    }
+    return m_ptr[index];
+}
+
+template <typename Object>
+template <class... Args>
+Object& CircularBuffer<Object>::push_back(Args&&... args){
+    if (m_back - m_front >= m_capacity){
+        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "CircularBuffer: Attempted to push while full.");
+    }
+    size_t back = m_back;
+    if (back >= m_capacity){
+        back -= m_capacity;
+    }
+    new (m_ptr + back) Object(std::forward<Args>(args)...);
+    m_back++;
+    return m_ptr[back];
+}
+template <typename Object>
+template <class... Args>
+Object* CircularBuffer<Object>::try_push_back(Args&&... args){
+    if (m_back - m_front >= m_capacity){
+        return nullptr;
+    }
+    size_t back = m_back;
+    if (back >= m_capacity){
+        back -= m_capacity;
+    }
+    new (m_ptr + back) Object(std::forward<Args>(args)...);
+    m_back++;
+    return &m_ptr[back];
+}
+
+template <typename Object>
+void CircularBuffer<Object>::pop_front(){
+    if (m_front == m_back){
+        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "CircularBuffer: Attempted to pop while empty.");
+    }
+    size_t front = m_front;
+    m_ptr[front].~Object();
+    front++;
+    size_t diff = front >= m_capacity ? m_capacity : 0;
+    m_front = front - diff;
+    m_back -= diff;
+}
+
+
+
+
+
+
+
+}
+#endif
diff --git a/Common/Cpp/Containers/DllSafeString.h b/Common/Cpp/Containers/DllSafeString.h
index 8071dc9933..f5b5528bdd 100644
--- a/Common/Cpp/Containers/DllSafeString.h
+++ b/Common/Cpp/Containers/DllSafeString.h
@@ -1,6 +1,6 @@
 /*  DLL Safe String
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/Common/Cpp/Containers/FixedLimitVector.h b/Common/Cpp/Containers/FixedLimitVector.h
index affce0a5f6..f1e7343301 100644
--- a/Common/Cpp/Containers/FixedLimitVector.h
+++ b/Common/Cpp/Containers/FixedLimitVector.h
@@ -1,6 +1,6 @@
 /*  Fixed Limit Vector
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  *      A non-copyable, non-movable vector whose buffer cannot be resized.
  *  It supports emplace_back() and pop_back(). All elements are unchanged
@@ -19,6 +19,7 @@
 #define PokemonAutomation_FixedLimitVector_H
 
 #include <stddef.h>
+#include "AlignedMalloc.h"
 
 namespace PokemonAutomation{
 
@@ -27,10 +28,10 @@ template <typename Object>
 class FixedLimitVector{
 public:
     ~FixedLimitVector();
-    FixedLimitVector(const FixedLimitVector&) = delete;
-    void operator=(const FixedLimitVector&) = delete;
-    FixedLimitVector(FixedLimitVector&& x);
-    void operator=(FixedLimitVector&& x);
+    FixedLimitVector(const FixedLimitVector& x);
+    void operator=(const FixedLimitVector& x);
+    FixedLimitVector(FixedLimitVector&& x) noexcept;
+    void operator=(FixedLimitVector&& x) noexcept;
 
 public:
     FixedLimitVector();
@@ -73,7 +74,15 @@ class FixedLimitVector{
 //  Implementations
 
 template <typename Object>
-FixedLimitVector<Object>::FixedLimitVector(FixedLimitVector&& x)
+FixedLimitVector<Object>::~FixedLimitVector(){
+    while (m_size > 0){
+        pop_back();
+    }
+    aligned_free(m_data);
+}
+
+template <typename Object>
+FixedLimitVector<Object>::FixedLimitVector(FixedLimitVector&& x) noexcept
     : m_data(x.m_data)
     , m_size(x.m_size)
     , m_capacity(x.m_capacity)
@@ -83,7 +92,7 @@ FixedLimitVector<Object>::FixedLimitVector(FixedLimitVector&& x)
     x.m_capacity = 0;
 }
 template <typename Object>
-void FixedLimitVector<Object>::operator=(FixedLimitVector&& x){
+void FixedLimitVector<Object>::operator=(FixedLimitVector&& x) noexcept{
     reset();
     m_data = x.m_data;
     m_size = x.m_size;
@@ -100,6 +109,10 @@ FixedLimitVector<Object>::FixedLimitVector()
     , m_capacity(0)
 {}
 
+template <typename Object>
+void FixedLimitVector<Object>::pop_back(){
+    m_data[--m_size].~Object();
+}
 
 
 
diff --git a/Common/Cpp/Containers/FixedLimitVector.tpp b/Common/Cpp/Containers/FixedLimitVector.tpp
index 3eac2f6b4d..f3900a55a7 100644
--- a/Common/Cpp/Containers/FixedLimitVector.tpp
+++ b/Common/Cpp/Containers/FixedLimitVector.tpp
@@ -18,11 +18,20 @@ namespace PokemonAutomation{
 //  Rule of 5
 
 template <typename Object>
-FixedLimitVector<Object>::~FixedLimitVector(){
-    while (m_size > 0){
-        pop_back();
+FixedLimitVector<Object>::FixedLimitVector(const FixedLimitVector& x)
+    : FixedLimitVector(x.capacity())
+{
+    for (const Object& obj : x){
+        emplace_back(obj);
     }
-    aligned_free(m_data);
+}
+template <typename Object>
+void FixedLimitVector<Object>::operator=(const FixedLimitVector& x){
+    if (this == &x){
+        return;
+    }
+    FixedLimitVector tmp(x);
+    operator=(std::move(tmp));
 }
 
 
@@ -78,10 +87,6 @@ bool FixedLimitVector<Object>::emplace_back(Args&&... args){
         return false;
     }
 }
-template <typename Object>
-void FixedLimitVector<Object>::pop_back(){
-    m_data[--m_size].~Object();
-}
 
 
 
diff --git a/Common/Cpp/Containers/GuardPageBuffer.cpp b/Common/Cpp/Containers/GuardPageBuffer.cpp
new file mode 100644
index 0000000000..4665b76270
--- /dev/null
+++ b/Common/Cpp/Containers/GuardPageBuffer.cpp
@@ -0,0 +1,130 @@
+/*  Guard Page Buffer
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <new>
+#include "Common/Cpp/Exceptions.h"
+#include "GuardPageBuffer.h"
+
+#ifdef _WIN32
+#include <Windows.h>
+#else
+#include <sys/mman.h>
+#include <unistd.h>
+#endif
+
+namespace PokemonAutomation{
+
+
+
+//  Return the OS page size in bytes: the unit in which the OS maps memory and
+//  sets access rights. It is 4 KB on x86 Windows and Linux, and 16 KB on
+//  Apple Silicon macOS.
+static size_t page_size(){
+#ifdef _WIN32
+    SYSTEM_INFO info;
+    GetSystemInfo(&info);
+    return info.dwPageSize;
+#else
+    return (size_t)sysconf(_SC_PAGESIZE);
+#endif
+}
+
+
+
+GuardPageMemory::~GuardPageMemory(){
+    release();
+}
+
+//  Take over the pages of "x". Afterwards "x" owns no memory, so its
+//  destructor does nothing.
+GuardPageMemory::GuardPageMemory(GuardPageMemory&& x) noexcept
+    : m_base(x.m_base)
+    , m_mapped_bytes(x.m_mapped_bytes)
+    , m_data(x.m_data)
+{
+    x.m_base = nullptr;
+    x.m_mapped_bytes = 0;
+    x.m_data = nullptr;
+}
+void GuardPageMemory::operator=(GuardPageMemory&& x) noexcept{
+    if (this == &x){
+        return;
+    }
+    release();
+    m_base = x.m_base;
+    m_mapped_bytes = x.m_mapped_bytes;
+    m_data = x.m_data;
+    x.m_base = nullptr;
+    x.m_mapped_bytes = 0;
+    x.m_data = nullptr;
+}
+
+//  Unmap the pages if this object still owns them. The destructor calls it,
+//  and so does the move assignment before it takes the pages of another
+//  object.
+void GuardPageMemory::release() noexcept{
+    if (m_base == nullptr){
+        return;
+    }
+#ifdef _WIN32
+    VirtualFree(m_base, 0, MEM_RELEASE);
+#else
+    munmap(m_base, m_mapped_bytes);
+#endif
+    m_base = nullptr;
+}
+
+//  Map the data pages and the guard page, then place the data so that it ends
+//  at the guard page:
+//  1. Round the data size up to whole pages. Add alignment - 1 bytes first,
+//     so that rounding the start down to "alignment" stays inside the mapping.
+//  2. Map all the pages as read-write (mmap() or VirtualAlloc()). New pages
+//     from the OS are all zero, so the buffer starts as zero bytes.
+//  3. Make the last page no-access (mprotect() with PROT_NONE, or
+//     VirtualProtect() with PAGE_NOACCESS). This is the guard page.
+//  4. Put the start of the data at guard - bytes, rounded down to "alignment".
+//  Example with 4096-byte pages, bytes = 72 and alignment = 4: it maps 1 data
+//  page and 1 guard page, and the data starts at byte 4024 of the first page,
+//  so the data ends at byte 4096, where the guard page starts.
+//  If a step fails, it unmaps what it mapped and throws std::bad_alloc.
+GuardPageMemory::GuardPageMemory(size_t bytes, size_t alignment){
+    if (alignment == 0 || (alignment & (alignment - 1)) != 0){
+        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Alignment must be a power of two.");
+    }
+
+    size_t page = page_size();
+    size_t data_pages = (bytes + alignment - 1 + page - 1) / page;
+    m_mapped_bytes = (data_pages + 1) * page;
+
+#ifdef _WIN32
+    m_base = VirtualAlloc(nullptr, m_mapped_bytes, MEM_RESERVE | MEM_COMMIT, PAGE_READWRITE);
+    if (m_base == nullptr){
+        throw std::bad_alloc();
+    }
+    char* guard = (char*)m_base + data_pages * page;
+    DWORD old_protect;
+    if (!VirtualProtect(guard, page, PAGE_NOACCESS, &old_protect)){
+        VirtualFree(m_base, 0, MEM_RELEASE);
+        throw std::bad_alloc();
+    }
+#else
+    m_base = mmap(nullptr, m_mapped_bytes, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+    if (m_base == MAP_FAILED){
+        throw std::bad_alloc();
+    }
+    char* guard = (char*)m_base + data_pages * page;
+    if (mprotect(guard, page, PROT_NONE) != 0){
+        munmap(m_base, m_mapped_bytes);
+        throw std::bad_alloc();
+    }
+#endif
+
+    m_data = (void*)((size_t)(guard - bytes) & ~(alignment - 1));
+}
+
+
+
+}
diff --git a/Common/Cpp/Containers/GuardPageBuffer.h b/Common/Cpp/Containers/GuardPageBuffer.h
new file mode 100644
index 0000000000..019581baa2
--- /dev/null
+++ b/Common/Cpp/Containers/GuardPageBuffer.h
@@ -0,0 +1,137 @@
+/*  Guard Page Buffer
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  A test-only array that crashes on any access past its end. Unit tests of
+ *  SIMD kernels use it to catch reads and writes past the end of a buffer.
+ *
+ */
+
+#ifndef PokemonAutomation_GuardPageBuffer_H
+#define PokemonAutomation_GuardPageBuffer_H
+
+#include <stddef.h>
+#include <type_traits>
+
+namespace PokemonAutomation{
+
+
+//  The memory behind `GuardPageBuffer`, without an element type.
+//
+//  It maps enough whole pages from the OS for "bytes" bytes (plus the room to
+//  round the start down to "alignment"), and then one more page that it marks
+//  as no-access: the guard page. `data()` points to the first byte of the
+//  data, placed so that the data ends right before the guard page.
+//
+//  The memory starts as all zero bytes, and the destructor unmaps it. It can
+//  be moved but not copied. A moved-from object owns no memory.
+//
+//  Throws std::bad_alloc if the OS cannot map or protect the pages, and
+//  InternalProgramError if "alignment" is not a power of two.
+class GuardPageMemory{
+public:
+    ~GuardPageMemory();
+    GuardPageMemory(GuardPageMemory&& x) noexcept;
+    void operator=(GuardPageMemory&& x) noexcept;
+    GuardPageMemory(const GuardPageMemory&) = delete;
+    void operator=(const GuardPageMemory&) = delete;
+
+public:
+    GuardPageMemory(size_t bytes, size_t alignment = 1);
+
+    //  First byte of the data. The data ends right before the guard page
+    //  when "bytes" is a multiple of "alignment".
+    void* data() const{ return m_data; }
+
+private:
+    void release() noexcept;
+
+private:
+    void* m_base;           //  Start of the mapped pages, or nullptr after a move.
+    size_t m_mapped_bytes;  //  Size of the mapping, guard page included.
+    void* m_data;           //  What `data()` returns.
+};
+
+
+
+//  A fixed-size array for unit tests whose last element sits right before a
+//  guard page: a page of memory that the program is not allowed to read or
+//  write. Any access just past the end of the array crashes the test at once.
+//
+//  Why it exists: SIMD kernels work on whole vectors (for example, 16 floats
+//  with AVX-512) and need special code for the last few elements, the "tail".
+//  A tail that loads or stores a full vector touches memory past the end of
+//  the buffer. With a normal heap buffer like `AlignedVector`, that memory
+//  usually belongs to the heap, so nothing happens. The test only crashes on
+//  the rare run where the buffer happens to end next to an unmapped page.
+//  That is how an over-read in the AVX-512 `AudioChannelMixer` tail crashed
+//  CI only now and then. With a GuardPageBuffer, every such run crashes.
+//
+//  How it works: `GuardPageMemory` maps whole pages and makes the last page
+//  no-access. The array is placed so that its end touches that page.
+//  Example with 4 KB pages and `GuardPageBuffer<float> buffer(18)`:
+//  1. The data needs 18 * 4 = 72 bytes, so it maps 1 data page and 1 guard
+//     page (8 KB in total).
+//  2. `buffer.data()` points 72 bytes before the guard page.
+//  3. `buffer[17]` is the last valid element. Reading `buffer[18]`, or a
+//     16-float vector load at `buffer.data() + 16`, crashes.
+//
+//  Where it is used: the kernel unit tests use it for the input and output
+//  buffers of the kernels under test, for example in
+//  `Kernels_AudioChannelMixer_TestInfra.cpp`. `GuardPageImageRGB32` in
+//  `Tests/GuardPageImage.h` uses it for images.
+//
+//  Limits:
+//  - Only trivial types like float and uint32_t. The elements are not
+//    constructed or destroyed, and they start as zero bytes.
+//  - Only accesses after the end are caught, not accesses before the start.
+//  - By default, `data()` is only aligned to alignof(Object). For a kernel
+//    that needs aligned pointers, pass a larger "alignment", for example
+//    PA_ALIGNMENT (64 bytes) for `fft_abs()`. The start is then rounded
+//    down, which can leave a gap of up to alignment - 1 bytes before the
+//    guard page. Accesses in that gap are not caught, so use sizes that are
+//    a multiple of the alignment when you can.
+//  - Each buffer maps at least 2 pages with a system call, so it is slower
+//    than a heap buffer and only meant for tests.
+//
+//  Throws std::bad_alloc if the OS cannot map or protect the pages, and
+//  InternalProgramError if "alignment" is not a power of two.
+template <typename Object>
+class GuardPageBuffer{
+    static_assert(
+        std::is_trivially_default_constructible_v<Object> &&
+        std::is_trivially_destructible_v<Object>,
+        "GuardPageBuffer only holds trivial types. The elements start as zero bytes."
+    );
+
+public:
+    //  Map "size" elements, all zero bytes. "alignment" is the alignment of
+    //  `data()` in bytes and must be a power of two. Example:
+    //  `GuardPageBuffer<float> real(length, PA_ALIGNMENT)` gives `fft_abs()`
+    //  the 64-byte aligned input that it requires.
+    GuardPageBuffer(size_t size, size_t alignment = alignof(Object))
+        : m_memory(size * sizeof(Object), alignment)
+        , m_size(size)
+    {}
+
+    //  Number of elements, as given to the constructor.
+    size_t size() const{ return m_size; }
+
+    //  Element access without a bounds check. An index at or just past
+    //  size() reads the guard page and crashes, which is what tests want.
+    const Object& operator[](size_t index) const{ return data()[index]; }
+          Object& operator[](size_t index)      { return data()[index]; }
+
+    //  Pointer to the first element, to give to the kernel under test.
+    const Object* data() const{ return (const Object*)m_memory.data(); }
+          Object* data()      { return (Object*)m_memory.data(); }
+
+private:
+    GuardPageMemory m_memory;
+    size_t m_size;
+};
+
+
+
+}
+#endif
diff --git a/Common/Cpp/Containers/Pimpl.h b/Common/Cpp/Containers/Pimpl.h
index 1b2a340432..9855a6aec4 100644
--- a/Common/Cpp/Containers/Pimpl.h
+++ b/Common/Cpp/Containers/Pimpl.h
@@ -1,6 +1,6 @@
 /*  Pimpl
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -36,10 +36,19 @@ class Pimpl{
     template <class... Args>
     void reset(Args&&... args);
 
+    Type* release(){
+        Type* ret = m_ptr;
+        m_ptr = nullptr;
+        return ret;
+    }
+
 
 public:
     operator bool() const{ return m_ptr != nullptr; }
 
+    operator const Type&() const{ return *m_ptr; }
+    operator       Type&()      { return *m_ptr; }
+
     const Type& operator*() const   { return *m_ptr; }
           Type& operator*()         { return *m_ptr; }
 
@@ -62,15 +71,6 @@ Pimpl<Type>::Pimpl(Pimpl&& x) noexcept
 {
     x.m_ptr = nullptr;
 }
-template <typename Type>
-void Pimpl<Type>::operator=(Pimpl&& x) noexcept{
-    if (this == &x){
-        return;
-    }
-    delete m_ptr;
-    m_ptr = x.m_ptr;
-    x.m_ptr = nullptr;
-}
 
 
 
diff --git a/Common/Cpp/Containers/Pimpl.tpp b/Common/Cpp/Containers/Pimpl.tpp
index ad58e8b80a..24f18d4b26 100644
--- a/Common/Cpp/Containers/Pimpl.tpp
+++ b/Common/Cpp/Containers/Pimpl.tpp
@@ -34,6 +34,15 @@ void Pimpl<Type>::operator=(const Pimpl& x){
     m_ptr = copy;
     delete ptr;
 }
+template <typename Type>
+void Pimpl<Type>::operator=(Pimpl&& x) noexcept{
+    if (this == &x){
+        return;
+    }
+    delete m_ptr;
+    m_ptr = x.m_ptr;
+    x.m_ptr = nullptr;
+}
 
 template <typename Type>
 template <class... Args>
diff --git a/Common/Cpp/Containers/SparseArray.cpp b/Common/Cpp/Containers/SparseArray.cpp
new file mode 100644
index 0000000000..317a4cbfa7
--- /dev/null
+++ b/Common/Cpp/Containers/SparseArray.cpp
@@ -0,0 +1,199 @@
+/*  Sparse Array
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <string.h>
+#include "SparseArray.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+
+
+
+void SparseArray::write(size_t address, size_t bytes, const void* data){
+    if (m_data.empty()){
+        m_data.emplace(
+            std::piecewise_construct,
+            std::forward_as_tuple(address),
+            std::forward_as_tuple((char*)data, (char*)data + bytes)
+        );
+        return;
+    }
+
+    //  Below bottom.
+    size_t top = address + bytes;
+    size_t lowest = m_data.begin()->first;
+    if (top < lowest){
+        m_data.emplace(
+            std::piecewise_construct,
+            std::forward_as_tuple(address),
+            std::forward_as_tuple((char*)data, (char*)data + bytes)
+        );
+        return;
+    }
+
+    //  Above top.
+    size_t highest = m_data.rbegin()->first + m_data.rbegin()->second.size();
+    if (highest < address){
+        m_data.emplace(
+            std::piecewise_construct,
+            std::forward_as_tuple(address),
+            std::forward_as_tuple((char*)data, (char*)data + bytes)
+        );
+        return;
+    }
+
+    //  Get the first and last blocks that will be affected.
+    auto lower = m_data.upper_bound(address);
+    if (lower != m_data.begin()){
+        --lower;
+    }
+    if (lower->first + lower->second.size() < address){
+        ++lower;
+    }
+    auto upper = m_data.lower_bound(top);
+    if (upper != m_data.begin()){
+        --upper;
+    }
+
+    lowest = lower->first;
+    highest = upper->first + upper->second.size();
+    if (lower == upper && lowest <= address && top <= highest){
+        //  Completely inside.
+        memcpy(lower->second.data() + address - lowest, data, bytes);
+        return;
+    }
+
+    lowest = std::min(lowest, address);
+    highest = std::max(highest, top);
+
+    std::string block(highest - lowest, 0);
+
+    //  Copy in the partial blocks.
+    bool one_block = lower == upper;
+    {
+        size_t shift = lower->first - lowest;
+        memcpy(
+            block.data() + shift,
+            lower->second.data(),
+            lower->second.size()
+        );
+    }
+    if (!one_block){
+        size_t shift = highest - upper->first - upper->second.size();
+        memcpy(
+            block.data() + block.size() - upper->second.size() - shift,
+            upper->second.data(),
+            upper->second.size()
+        );
+    }
+
+//    cout << "lower = " << lower->first << endl;
+//    cout << "upper = " << upper->first << endl;
+//    cout << "lowest  = " << lowest << endl;
+//    cout << "highest = " << highest << endl;
+
+    //  Copy the newly written block.
+    memcpy(block.data() + address - lowest, data, bytes);
+
+//    cout << std::string((char*)block.data(), block.size()) << endl;
+
+    //  Insert into table.
+    if (lower->first == lowest){
+//        cout << "replace" << endl;
+        lower->second = std::move(block);
+        ++lower;
+    }else{
+//        cout << "add" << endl;
+        auto iter = m_data.emplace(
+            std::piecewise_construct,
+            std::forward_as_tuple(lowest),
+            std::forward_as_tuple(std::move(block))
+        ).first;
+        m_data.erase(lower);
+        ++iter;
+        lower = iter;
+    }
+
+    //  Remove all the blocks that it touched.
+    if (!one_block){
+        while (lower != upper){
+            lower = m_data.erase(lower);
+        }
+        m_data.erase(lower);
+    }
+}
+void SparseArray::read(size_t address, size_t bytes, void* data) const{
+    if (m_data.empty()){
+        return;
+    }
+
+    //  Below bottom.
+    size_t top = address + bytes;
+    size_t lowest = m_data.begin()->first;
+    if (top < lowest){
+        return;
+    }
+
+    //  Above top.
+    size_t highest = m_data.rbegin()->first + m_data.rbegin()->second.size();
+    if (highest < address){
+        return;
+    }
+
+    auto lower = m_data.upper_bound(address);
+    if (lower != m_data.begin()){
+        --lower;
+    }
+
+    while (lower != m_data.end() && bytes > 0){
+        size_t block = lower->first;
+        if (block >= top){
+            break;
+        }
+
+//        cout << "bytes = " << bytes << endl;
+//        cout << "address = " << address << endl;
+//        cout << "block = " << block << endl;
+
+        const char* ptr = lower->second.data();
+        size_t len = lower->second.size();
+
+        if (block < address){
+//            cout << "block is before" << endl;
+            size_t shift = address - block;
+            block = address;
+            ptr += shift;
+            len -= shift;   //  Cannot go negative since it's guaranteed to overlap with region.
+        }
+        if (block > address){
+//            cout << "block is later" << endl;
+            size_t shift = block - address;
+//            cout << "shift = " << shift << endl;
+            address = block;
+            data = (char*)data + shift;
+            bytes -= shift; //  Cannot go negative since it's guaranteed to overlap with block.
+        }
+
+        len = std::min(len, bytes);
+
+//        cout << "len = " << len << endl;
+
+        memcpy(data, ptr, len);
+        data = (char*)data + len;
+        address += len;
+        bytes -= len;
+        ++lower;
+    }
+
+}
+
+
+
+
+}
diff --git a/Common/Cpp/Containers/SparseArray.h b/Common/Cpp/Containers/SparseArray.h
new file mode 100644
index 0000000000..045f453f04
--- /dev/null
+++ b/Common/Cpp/Containers/SparseArray.h
@@ -0,0 +1,68 @@
+/*  Sparse Array
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_SparseArray_H
+#define PokemonAutomation_SparseArray_H
+
+#include <string.h>
+#include <string>
+#include <map>
+
+namespace PokemonAutomation{
+
+
+struct SparseArrayBlock{
+    size_t address;
+    std::string data;
+
+    SparseArrayBlock(size_t p_address, const char* str)
+        : address(p_address)
+        , data(str, str + strlen(str))
+    {}
+    SparseArrayBlock(size_t p_address, std::initializer_list<char> p_data)
+        : address(p_address)
+        , data(p_data)
+    {}
+};
+
+
+class SparseArray{
+public:
+    SparseArray() = default;
+    SparseArray(std::initializer_list<SparseArrayBlock> list){
+        for (auto& item : list){
+            write(item.address, item.data.size(), item.data.data());
+        }
+    }
+
+    void write(size_t address, size_t bytes, const void* data);
+    void read(size_t address, size_t bytes, void* data) const;
+
+#if 1
+    std::string dump() const{
+        std::string ret;
+        for (const auto& item : m_data){
+            ret += "{";
+            ret += std::to_string(item.first);
+            ret += " : ";
+            ret += std::to_string(item.first + item.second.size());
+            ret += "} = ";
+            ret += item.second;
+            ret += "\n";
+        }
+        return ret;
+    }
+#endif
+
+private:
+    std::map<size_t, std::string> m_data;
+};
+
+
+
+
+}
+#endif
diff --git a/Common/Cpp/CpuId/CpuId.cpp b/Common/Cpp/CpuId/CpuId.cpp
index 00e0813b98..ea6c5d522b 100644
--- a/Common/Cpp/CpuId/CpuId.cpp
+++ b/Common/Cpp/CpuId/CpuId.cpp
@@ -13,7 +13,7 @@
 #include "CpuId_arm64.tpp"
 #else
 
-namespace PokemonAutomation {
+namespace PokemonAutomation{
 
 const char* PA_ARCH_STRING = "Unknown";
 
@@ -30,12 +30,12 @@ const std::vector<CpuCapabilityOption>& AVAILABLE_CAPABILITIES(){
 
 #endif
 
-namespace PokemonAutomation {
+namespace PokemonAutomation{
 
 CPU_Features CPU_CAPABILITY_CURRENT = CPU_CAPABILITY_NATIVE;
 
-IntegerEnumDatabase make_CAPABILITIES_DATABASE(){
-    IntegerEnumDatabase ret;
+IntegerEnumDropdownDatabase make_CAPABILITIES_DATABASE(){
+    IntegerEnumDropdownDatabase ret;
     size_t c = 0;
     for (const CpuCapabilityOption& item : AVAILABLE_CAPABILITIES()){
         ret.add(c, item.slug, item.display, item.available);
@@ -43,8 +43,8 @@ IntegerEnumDatabase make_CAPABILITIES_DATABASE(){
     }
     return ret;
 };
-const IntegerEnumDatabase& CAPABILITIES_DATABASE(){
-    static const IntegerEnumDatabase database = make_CAPABILITIES_DATABASE();
+const IntegerEnumDropdownDatabase& CAPABILITIES_DATABASE(){
+    static const IntegerEnumDropdownDatabase database = make_CAPABILITIES_DATABASE();
     return database;
 }
 
diff --git a/Common/Cpp/CpuId/CpuId.h b/Common/Cpp/CpuId/CpuId.h
index d6650be9be..5c817ccd11 100644
--- a/Common/Cpp/CpuId/CpuId.h
+++ b/Common/Cpp/CpuId/CpuId.h
@@ -7,13 +7,13 @@
 #ifndef PokemonAutomation_CpuId_H
 #define PokemonAutomation_CpuId_H
 
-#include "Common/Cpp/EnumDatabase.h"
+#include "Common/Cpp/Options/EnumDropdownDatabase.h"
 
 #if 0
 #elif _M_IX86 || _M_X64 || __i386__ || __x86_64__
 #define PA_ARCH_x86 1
 #include "CpuId_x86.h"
-#elif __arm64__
+#elif __arm64__ || __aarch64__
 #define PA_ARCH_arm64 1
 #include "CpuId_arm64.h"
 #else
@@ -67,7 +67,7 @@ struct CpuCapabilityOption{
 const std::vector<CpuCapabilityOption>& AVAILABLE_CAPABILITIES();
 // An enum database to select `CpuCapabilityOption`.
 // This database is built by `AVAILABLE_CAPABILITIES()`, used for UI of choosing CPU instructions.
-const IntegerEnumDatabase& CAPABILITIES_DATABASE();
+const IntegerEnumDropdownDatabase& CAPABILITIES_DATABASE();
 
 
 
diff --git a/Common/Cpp/CpuId/CpuId_arm64.tpp b/Common/Cpp/CpuId/CpuId_arm64.tpp
index a897a16a42..4d19a4a11d 100644
--- a/Common/Cpp/CpuId/CpuId_arm64.tpp
+++ b/Common/Cpp/CpuId/CpuId_arm64.tpp
@@ -6,7 +6,10 @@
 
 
 #include <stdint.h>
+#ifdef __APPLE__
 #include <sys/sysctl.h>
+#endif
+#include <iostream>
 
 #include "CpuId.h"
 
@@ -17,15 +20,29 @@ const char* PA_ARCH_STRING = "arm64";
 
 uint64_t detect_NEON()
 {
+#ifdef __APPLE__
     // https://developer.apple.com/documentation/kernel/1387446-sysctlbyname/determining_instruction_set_characteristics
+    // But this developer webpage may be out of date.
+
     uint64_t available = 0;
     size_t size = sizeof(available);
 
-    if (sysctlbyname("hw.optional.AdvSIMD", &available, &size, NULL, 0) < 0)
-    {
-        perror("sysctl");
+    // Since certain macOS version "hw.optional.AdvSIMD" no longer works, so to be safe
+    // we check all three sysctl attributes.
+    if (sysctlbyname("hw.optional.AdvSIMD", &available, &size, NULL, 0) < 0){
+        if (sysctlbyname("hw.optional.neon", &available, &size, NULL, 0) < 0){
+            if (sysctlbyname("hw.optional.arm.AdvSIMD", &available, &size, NULL, 0) < 0){
+                std::cerr << "Error querying ARM SIMD set availability using macOS sysctl API" << std::endl;
+                return 0;
+            }
+        }
     }
     return available;
+#else
+    // On Linux aarch64, AdvSIMD (NEON) is part of the mandatory ARMv8-A baseline,
+    // so it is always available.
+    return 1;
+#endif
 }
 
 CPU_Features& CPU_Features::set_to_current(){
diff --git a/Common/Cpp/CpuUtilization/CpuUtilization.cpp b/Common/Cpp/CpuUtilization/CpuUtilization.cpp
new file mode 100644
index 0000000000..b8a43481ca
--- /dev/null
+++ b/Common/Cpp/CpuUtilization/CpuUtilization.cpp
@@ -0,0 +1,15 @@
+/*  CPU Utilization
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+
+
+#if _WIN32
+#include "CpuUtilization_Windows.tpp"
+#endif
+
+#if defined(__linux) || defined(__APPLE__)
+#include "CpuUtilization_Linux.tpp"
+#endif
diff --git a/Common/Cpp/CpuUtilization/CpuUtilization.h b/Common/Cpp/CpuUtilization/CpuUtilization.h
new file mode 100644
index 0000000000..5c63594e87
--- /dev/null
+++ b/Common/Cpp/CpuUtilization/CpuUtilization.h
@@ -0,0 +1,21 @@
+/*  CPU Utilization
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_CpuUtilization_H
+#define PokemonAutomation_CpuUtilization_H
+
+
+#if _WIN32
+#include "CpuUtilization_Windows.h"
+#elif defined(__linux) || defined(__APPLE__)
+#include "CpuUtilization_Linux.h"
+#else
+#error "Unsupported platform."
+#endif
+
+
+
+#endif
diff --git a/Common/Cpp/CpuUtilization/CpuUtilization_Linux.h b/Common/Cpp/CpuUtilization/CpuUtilization_Linux.h
new file mode 100644
index 0000000000..5fd22b923b
--- /dev/null
+++ b/Common/Cpp/CpuUtilization/CpuUtilization_Linux.h
@@ -0,0 +1,54 @@
+/*  CPU Utilization (Linux)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_CpuUtilization_Linux_H
+#define PokemonAutomation_CpuUtilization_Linux_H
+
+#include <pthread.h>
+#include <sys/time.h>
+#include "Common/Cpp/Time.h"
+//#include "CpuUtilization.h"
+
+namespace PokemonAutomation{
+
+
+
+class ThreadHandle{
+public:
+    pthread_t handle;
+};
+ThreadHandle current_thread_handle();
+// Get the cpu time of the thread.
+// This function must be called in the same process the thread belongs to.
+WallDuration thread_cpu_time(const ThreadHandle& handle);
+
+
+
+class SystemCpuTime{
+public:
+    static SystemCpuTime now();
+    static size_t vcores();
+
+    bool is_valid() const{
+        return m_usec != 0 || m_sec != 0;
+    }
+
+    std::chrono::microseconds operator-(const SystemCpuTime& x) const;
+
+private:
+    void set_to_now();
+    static size_t read_cores();
+
+private:
+    time_t m_sec = 0;
+    suseconds_t m_usec = 0;
+};
+
+
+
+
+}
+#endif
diff --git a/Common/Cpp/CpuUtilization/CpuUtilization_Linux.tpp b/Common/Cpp/CpuUtilization/CpuUtilization_Linux.tpp
new file mode 100644
index 0000000000..5cd4b0b0f0
--- /dev/null
+++ b/Common/Cpp/CpuUtilization/CpuUtilization_Linux.tpp
@@ -0,0 +1,99 @@
+/*  CPU Utilization (Linux)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <thread>
+#include <sys/resource.h>
+#include <sys/types.h>
+#include <unistd.h>
+#include <sched.h>
+#include "CpuUtilization_Linux.h"
+
+#if defined(__APPLE__)
+#include <libproc.h>
+#endif
+
+namespace PokemonAutomation{
+
+
+
+ThreadHandle current_thread_handle(){
+    return ThreadHandle{pthread_self()};
+}
+WallDuration thread_cpu_time(const ThreadHandle& handle){
+    uint64_t nanos = 0;
+
+#if defined(__APPLE__)
+    uint64_t tid = 0;
+    pthread_threadid_np(handle.handle, &tid);
+    struct proc_threadinfo pth;
+    if (PROC_PIDTHREADINFO_SIZE ==
+        proc_pidinfo(
+            getpid(),
+            PROC_PIDTHREADID64INFO,
+            tid,
+            &pth,
+            PROC_PIDTHREADINFO_SIZE
+        )
+    ){
+        nanos = pth.pth_user_time + pth.pth_system_time; // user time + system time in ns
+    }else{
+        return WallDuration::min();
+    }
+
+#else
+    clockid_t clockid;
+    int error = pthread_getcpuclockid(handle.handle, &clockid);
+    if (error){
+        return WallDuration::min();
+    }
+
+    struct timespec ts;
+    if (clock_gettime(clockid, &ts) == -1){
+        return WallDuration::min();
+    }
+
+    nanos = (uint64_t)ts.tv_sec * 1000000000 + ts.tv_nsec;
+#endif
+
+    return std::chrono::duration_cast<WallDuration>(std::chrono::nanoseconds(nanos));
+}
+
+
+
+
+
+
+std::chrono::microseconds SystemCpuTime::operator-(const SystemCpuTime& x) const{
+    return std::chrono::microseconds((m_sec - x.m_sec) * 1000000ull + (m_usec - x.m_usec));
+}
+SystemCpuTime SystemCpuTime::now(){
+    SystemCpuTime ret;
+    ret.set_to_now();
+    return ret;
+}
+size_t SystemCpuTime::vcores(){
+    static size_t cores = read_cores();
+    return cores;
+}
+void SystemCpuTime::set_to_now(){
+    struct rusage ru;
+    if (getrusage(RUSAGE_SELF, &ru) == -1){
+        m_sec = 0;
+        m_usec = 0;
+    }else{
+        m_sec = ru.ru_utime.tv_sec + ru.ru_stime.tv_sec;
+        m_usec = ru.ru_utime.tv_usec + ru.ru_stime.tv_usec;
+    }
+}
+size_t SystemCpuTime::read_cores(){
+    return std::thread::hardware_concurrency();
+}
+
+
+
+
+
+}
diff --git a/Common/Cpp/CpuUtilization/CpuUtilization_Windows.h b/Common/Cpp/CpuUtilization/CpuUtilization_Windows.h
new file mode 100644
index 0000000000..933d3f26a5
--- /dev/null
+++ b/Common/Cpp/CpuUtilization/CpuUtilization_Windows.h
@@ -0,0 +1,70 @@
+/*  CPU Utilization (Windows)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_CpuUtilization_Windows_H
+#define PokemonAutomation_CpuUtilization_Windows_H
+
+#include <memory>
+#include "Common/Cpp/Time.h"
+//#include "CpuUtilization.h"
+
+namespace PokemonAutomation{
+
+
+
+class WinApiHandleHolder;
+
+class ThreadHandle{
+public:
+    ThreadHandle(ThreadHandle&& x);
+    ThreadHandle& operator=(ThreadHandle&& x);
+    ThreadHandle(const ThreadHandle& x);
+    ThreadHandle& operator=(const ThreadHandle& x);
+    ~ThreadHandle();
+
+    ThreadHandle(std::shared_ptr<WinApiHandleHolder> ptr = nullptr);
+
+    std::shared_ptr<WinApiHandleHolder> m_ptr;
+};
+ThreadHandle current_thread_handle();
+WallDuration thread_cpu_time(const ThreadHandle& handle);
+
+
+
+
+
+class SystemCpuTime{
+public:
+    static SystemCpuTime now();
+    static size_t vcores();
+
+    bool is_valid() const{
+        return m_kernel != 0;
+    }
+
+    std::chrono::microseconds operator-(const SystemCpuTime& x) const{
+        uint64_t idle = m_idle - x.m_idle;
+        uint64_t kernel = m_kernel - x.m_kernel;
+        uint64_t user = m_user - x.m_user;
+        uint64_t total_utilization = kernel + user - idle;
+        return std::chrono::microseconds(total_utilization / 10);
+    }
+
+private:
+    void set_to_now();
+    static size_t read_cores();
+
+private:
+    uint64_t m_idle = 0;
+    uint64_t m_kernel = 0;
+    uint64_t m_user = 0;
+};
+
+
+
+
+}
+#endif
diff --git a/Common/Cpp/CpuUtilization/CpuUtilization_Windows.tpp b/Common/Cpp/CpuUtilization/CpuUtilization_Windows.tpp
new file mode 100644
index 0000000000..942e81ba49
--- /dev/null
+++ b/Common/Cpp/CpuUtilization/CpuUtilization_Windows.tpp
@@ -0,0 +1,121 @@
+/*  CPU Utilization (Windows)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <Windows.h>
+#include "CpuUtilization_Windows.h"
+
+namespace PokemonAutomation{
+
+
+
+class WinApiHandleHolder{
+public:
+    WinApiHandleHolder(const WinApiHandleHolder& x) = delete;
+    void operator=(const WinApiHandleHolder& x) = delete;
+    ~WinApiHandleHolder(){
+        CloseHandle(m_handle);
+    }
+    WinApiHandleHolder(HANDLE handle)
+        : m_handle(handle)
+    {}
+    operator HANDLE() const{
+        return m_handle;
+    }
+
+private:
+    HANDLE m_handle;
+};
+
+
+
+
+
+ThreadHandle::ThreadHandle(ThreadHandle&& x) = default;
+ThreadHandle& ThreadHandle::operator=(ThreadHandle&& x) = default;
+ThreadHandle::ThreadHandle(const ThreadHandle& x) = default;
+ThreadHandle& ThreadHandle::operator=(const ThreadHandle& x) = default;
+ThreadHandle::~ThreadHandle() = default;
+ThreadHandle::ThreadHandle(std::shared_ptr<WinApiHandleHolder> ptr)
+    : m_ptr(std::move(ptr))
+{}
+
+
+
+ThreadHandle current_thread_handle(){
+    DWORD id = GetCurrentThreadId();
+    HANDLE handle = OpenThread(THREAD_QUERY_LIMITED_INFORMATION, false, id);
+//    cout << handle << endl;
+    if (handle == NULL){
+        return ThreadHandle();
+    }
+    return ThreadHandle{std::make_shared<WinApiHandleHolder>(handle)};
+}
+WallDuration thread_cpu_time(const ThreadHandle& handle){
+    FILETIME creation_time;
+    FILETIME exit_time;
+    FILETIME kernel_time;
+    FILETIME user_time;
+
+    if (!handle.m_ptr){
+        return WallDuration::min();
+    }
+
+    if (!GetThreadTimes(*handle.m_ptr, &creation_time, &exit_time, &kernel_time, &user_time)){
+        return WallDuration::min();
+    }
+
+    uint64_t nanos = user_time.dwLowDateTime + ((uint64_t)user_time.dwHighDateTime << 32);
+    nanos *= 100;
+    return std::chrono::duration_cast<WallDuration>(std::chrono::nanoseconds(nanos));
+}
+
+
+
+
+
+
+
+
+SystemCpuTime SystemCpuTime::now(){
+    SystemCpuTime ret;
+    ret.set_to_now();
+    return ret;
+}
+size_t SystemCpuTime::vcores(){
+    static size_t cores = read_cores();
+    return cores;
+}
+void SystemCpuTime::set_to_now(){
+    FILETIME idle_time, kernel_time, user_time;
+    if (GetSystemTimes(&idle_time, &kernel_time, &user_time)){
+        m_idle = idle_time.dwLowDateTime + ((uint64_t)idle_time.dwHighDateTime << 32);
+        m_kernel = kernel_time.dwLowDateTime + ((uint64_t)kernel_time.dwHighDateTime << 32);
+        m_user = user_time.dwLowDateTime + ((uint64_t)user_time.dwHighDateTime << 32);
+    }else{
+        m_idle = 0;
+        m_kernel = 0;
+        m_user = 0;
+    }
+}
+size_t SystemCpuTime::read_cores(){
+    size_t cores = 0;
+    WORD total_groups = GetActiveProcessorGroupCount();
+    for (WORD group = 0; group < total_groups; group++){
+        DWORD processors_within_group = GetActiveProcessorCount(group);
+        cores += processors_within_group;
+    }
+    return cores;
+}
+
+
+
+
+
+
+
+
+
+}
diff --git a/Common/Cpp/Cryptography/SHA256.cpp b/Common/Cpp/Cryptography/SHA256.cpp
new file mode 100644
index 0000000000..6d487a9662
--- /dev/null
+++ b/Common/Cpp/Cryptography/SHA256.cpp
@@ -0,0 +1,148 @@
+/* SHA256
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <string.h>
+#include "SHA256.h"
+
+namespace PokemonAutomation{
+
+
+uint32_t byte_swap32(uint32_t x){
+    x = ((x & 0x0000ffff) <<  16) | ((x & 0xffff0000) >> 16);
+    x = ((x & 0x00ff00ff) <<   8) | ((x & 0xff00ff00) >>  8);
+    return x;
+}
+uint32_t rotate_right32(uint32_t x, int bits){
+    return (x >> bits) | (x << (32 - bits));
+}
+
+
+const uint32_t SHA256::ROUND_CONSTANTS[64] = {
+    0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5, 0x3956c25b, 0x59f111f1, 0x923f82a4, 0xab1c5ed5,
+    0xd807aa98, 0x12835b01, 0x243185be, 0x550c7dc3, 0x72be5d74, 0x80deb1fe, 0x9bdc06a7, 0xc19bf174,
+    0xe49b69c1, 0xefbe4786, 0x0fc19dc6, 0x240ca1cc, 0x2de92c6f, 0x4a7484aa, 0x5cb0a9dc, 0x76f988da,
+    0x983e5152, 0xa831c66d, 0xb00327c8, 0xbf597fc7, 0xc6e00bf3, 0xd5a79147, 0x06ca6351, 0x14292967,
+    0x27b70a85, 0x2e1b2138, 0x4d2c6dfc, 0x53380d13, 0x650a7354, 0x766a0abb, 0x81c2c92e, 0x92722c85,
+    0xa2bfe8a1, 0xa81a664b, 0xc24b8b70, 0xc76c51a3, 0xd192e819, 0xd6990624, 0xf40e3585, 0x106aa070,
+    0x19a4c116, 0x1e376c08, 0x2748774c, 0x34b0bcb5, 0x391c0cb3, 0x4ed8aa4a, 0x5b9cca4f, 0x682e6ff3,
+    0x748f82ee, 0x78a5636f, 0x84c87814, 0x8cc70208, 0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2,
+};
+void SHA256::reset(){
+    m_bytes_loaded = 0;
+    m_bytes_in_buffer = 0;
+    m_hash[0] = 0x6a09e667;
+    m_hash[1] = 0xbb67ae85;
+    m_hash[2] = 0x3c6ef372;
+    m_hash[3] = 0xa54ff53a;
+    m_hash[4] = 0x510e527f;
+    m_hash[5] = 0x9b05688c;
+    m_hash[6] = 0x1f83d9ab;
+    m_hash[7] = 0x5be0cd19;
+}
+void SHA256::push(const void* data, size_t bytes){
+    const uint8_t* ptr = reinterpret_cast<const uint8_t*>(data);
+    for (; bytes > 0; bytes--){
+        m_bytes_loaded++;
+        m_buffer[m_bytes_in_buffer++] = *ptr++;
+        if (m_bytes_in_buffer == 64){
+            push_block();
+            m_bytes_in_buffer = 0;
+        }
+    }
+}
+void SHA256::push_block(){
+    uint32_t w[64];
+    for (int i = 0; i < 16; i++){
+        w[i] = byte_swap32(m_words[i]);
+    }
+
+    for (int i = 16; i < 64; i++){
+        uint32_t s0 = rotate_right32(w[i - 15],  7) ^ rotate_right32(w[i - 15], 18) ^ (w[i - 15] >>  3);
+        uint32_t s1 = rotate_right32(w[i -  2], 17) ^ rotate_right32(w[i -  2], 19) ^ (w[i -  2] >> 10);
+        w[i] = w[i - 16] + s0 + w[i - 7] + s1;
+    }
+
+    uint32_t a = m_hash[0];
+    uint32_t b = m_hash[1];
+    uint32_t c = m_hash[2];
+    uint32_t d = m_hash[3];
+    uint32_t e = m_hash[4];
+    uint32_t f = m_hash[5];
+    uint32_t g = m_hash[6];
+    uint32_t h = m_hash[7];
+    for (int i = 0; i < 64; i++){
+        uint32_t s0 = rotate_right32(e,  6) ^ rotate_right32(e, 11) ^ rotate_right32(e, 25);
+        uint32_t x0 = (e & f) ^ (~e & g);
+        uint32_t t0 = h + s0 + x0 + ROUND_CONSTANTS[i] + w[i];
+        uint32_t s1 = rotate_right32(a,  2) ^ rotate_right32(a, 13) ^ rotate_right32(a, 22);
+        uint32_t x1 = (a & b) ^ (a & c) ^ (b & c);
+        uint32_t t1 = s1 + x1;
+        h = g;
+        g = f;
+        f = e;
+        e = d + t0;
+        d = c;
+        c = b;
+        b = a;
+        a = t0 + t1;
+    }
+
+    m_hash[0] += a;
+    m_hash[1] += b;
+    m_hash[2] += c;
+    m_hash[3] += d;
+    m_hash[4] += e;
+    m_hash[5] += f;
+    m_hash[6] += g;
+    m_hash[7] += h;
+}
+void SHA256::finish(){
+    m_buffer[m_bytes_in_buffer++] = 0x80;
+    memset(m_buffer + m_bytes_in_buffer, 0, 64 - m_bytes_in_buffer);
+
+    if (m_bytes_in_buffer > 56){
+        push_block();
+        memset(m_buffer, 0, 64);
+    }
+
+    uint64_t bits = m_bytes_loaded * 8;
+    m_words[15] = byte_swap32((uint32_t)bits);
+    m_words[14] = byte_swap32((uint32_t)(bits >> 32));
+    push_block();
+}
+
+
+const void* SHA256::get_hash_raw() const{
+    return m_hash;
+}
+void SHA256::get_hash_raw(void* raw_hash) const{
+    memcpy(raw_hash, m_hash, sizeof(m_hash));
+}
+std::string SHA256::get_hash_hex() const{
+    const char HEX_DIGITS[] = "0123456789abcdef";
+
+    std::string out;
+    for (int c = 0; c < 8; c++){
+        char buf[8];
+        uint32_t word = m_hash[c];
+        buf[7] = HEX_DIGITS[(word >>  0) & 0xf];
+        buf[6] = HEX_DIGITS[(word >>  4) & 0xf];
+        buf[5] = HEX_DIGITS[(word >>  8) & 0xf];
+        buf[4] = HEX_DIGITS[(word >> 12) & 0xf];
+        buf[3] = HEX_DIGITS[(word >> 16) & 0xf];
+        buf[2] = HEX_DIGITS[(word >> 20) & 0xf];
+        buf[1] = HEX_DIGITS[(word >> 24) & 0xf];
+        buf[0] = HEX_DIGITS[(word >> 28) & 0xf];
+        out.append(buf, 8);
+    }
+    return out;
+}
+
+
+
+
+
+}
diff --git a/Common/Cpp/Cryptography/SHA256.h b/Common/Cpp/Cryptography/SHA256.h
new file mode 100644
index 0000000000..0d4796d913
--- /dev/null
+++ b/Common/Cpp/Cryptography/SHA256.h
@@ -0,0 +1,45 @@
+/* SHA256
+ *
+ *  From: https://github.com/PokemonAutomation/
+ * 
+ */
+
+#ifndef PokemonAutomation_Cryptography_SHA256_H
+#define PokemonAutomation_Cryptography_SHA256_H
+
+#include <stdint.h>
+#include <string>
+
+namespace PokemonAutomation{
+
+
+
+class SHA256{
+    uint32_t m_hash[8];
+    uint64_t m_bytes_loaded;
+    uint32_t m_bytes_in_buffer;
+    union{
+        uint8_t m_buffer[64];
+        uint32_t m_words[16];
+    };
+
+public:
+    SHA256(){ reset(); }
+
+    const void* get_hash_raw() const;
+    void get_hash_raw(void* raw_hash) const;
+    std::string get_hash_hex() const;
+
+    void reset();
+    void push(const void* data, size_t bytes);
+    void finish();
+
+private:
+    static const uint32_t ROUND_CONSTANTS[64];
+    void push_block();
+};
+
+
+
+}
+#endif
diff --git a/Common/Cpp/DateTime.h b/Common/Cpp/DateTime.h
new file mode 100644
index 0000000000..7706d8f0cf
--- /dev/null
+++ b/Common/Cpp/DateTime.h
@@ -0,0 +1,48 @@
+/*  DateTime
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_DateTime_H
+#define PokemonAutomation_DateTime_H
+
+#include <stdint.h>
+
+namespace PokemonAutomation{
+
+
+struct DateTime{
+    //  Negative means invalid or cannot read.
+    int16_t year = -1;
+    int8_t month = -1;
+    int8_t day = -1;
+    int8_t hour = -1;
+    int8_t minute = -1;
+    int8_t second = -1;
+
+    bool operator<(const DateTime& x) const{
+        if (year != x.year) return year < x.year;
+        if (month != x.month) return month < x.month;
+        if (day != x.day) return day < x.day;
+        if (hour != x.hour) return hour < x.hour;
+        if (minute != x.minute) return minute < x.minute;
+        if (second != x.second) return second < x.second;
+        return false;
+    }
+    bool operator>(const DateTime& x) const{
+        return x < *this;
+    }
+    bool operator==(const DateTime& x) const{
+        return year == x.year
+            && month == x.month
+            && day == x.day
+            && hour == x.hour
+            && minute == x.minute
+            && second == x.second;
+    }
+};
+
+
+}
+#endif
diff --git a/Common/Cpp/EarlyShutdown.h b/Common/Cpp/EarlyShutdown.h
new file mode 100644
index 0000000000..ebfca6a947
--- /dev/null
+++ b/Common/Cpp/EarlyShutdown.h
@@ -0,0 +1,44 @@
+/*  Early Shutdown
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_EarlyShutdown_H
+#define PokemonAutomation_EarlyShutdown_H
+
+#include "Logging/AbstractLogger.h"
+
+namespace PokemonAutomation{
+
+
+template <typename Lambda>
+void blocking_shutdown(
+    Logger& logger,
+    const char* name,
+    Lambda try_shutdown
+) noexcept{
+    try{
+        std::string str("Shutting down ");
+        str += name;
+        str += "...";
+        logger.log(str);
+        if (try_shutdown()){
+            return;
+        }
+        str = "~";
+        str += name;
+        str += "(): Failed to shutdown on first attempt. Retrying...";
+        logger.log(str, COLOR_RED);
+        while (!try_shutdown());
+    }catch (...){}
+}
+
+
+struct TryShutdownable{
+    virtual bool try_shutdown() noexcept = 0;
+};
+
+
+}
+#endif
diff --git a/Common/Cpp/EnumDatabase.cpp b/Common/Cpp/EnumDatabase.cpp
deleted file mode 100644
index 03d43e8c89..0000000000
--- a/Common/Cpp/EnumDatabase.cpp
+++ /dev/null
@@ -1,129 +0,0 @@
-/*  Named Enum
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <vector>
-#include <map>
-#include "Exceptions.h"
-#include "Common/Cpp/LifetimeSanitizer.h"
-#include "Containers/Pimpl.tpp"
-#include "Containers/FixedLimitVector.tpp"
-#include "EnumDatabase.h"
-
-#include <iostream>
-using std::cout;
-using std::endl;
-
-namespace PokemonAutomation{
-
-
-
-class IntegerEnumDatabaseImpl{
-public:
-    void add(EnumEntry entry){
-        m_sanitizer.check_usage();
-        size_t enum_value = entry.enum_value;
-        m_list.emplace_back(enum_value);
-
-        auto ret = m_map.emplace(enum_value, std::move(entry));
-        if (!ret.second){
-            throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Duplicate Enum: " + std::to_string(enum_value));
-        }
-
-        auto ret1 = m_slug_to_enum.emplace(ret.first->second.slug, &ret.first->second);
-        if (!ret1.second){
-            throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Duplicate Enum Slug: " + ret.first->second.slug);
-        }
-
-        auto ret2 = m_display_to_enum.emplace(ret.first->second.display, &ret.first->second);
-        if (!ret2.second){
-            throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Duplicate Enum Display: " + ret.first->second.display);
-        }
-    }
-
-    const EnumEntry* find(size_t value) const{
-        m_sanitizer.check_usage();
-        auto iter = m_map.find(value);
-        if (iter == m_map.end()){
-            return nullptr;
-        }
-        return &iter->second;
-    }
-    const EnumEntry* find_slug(const std::string& slug) const{
-        m_sanitizer.check_usage();
-        auto iter = m_slug_to_enum.find(slug);
-        if (iter == m_slug_to_enum.end()){
-            return nullptr;
-        }
-        return iter->second;
-    }
-    const EnumEntry* find_display(const std::string& display) const{
-        m_sanitizer.check_usage();
-        auto iter = m_display_to_enum.find(display);
-        if (iter == m_display_to_enum.end()){
-            return nullptr;
-        }
-        return iter->second;
-    }
-
-    FixedLimitVector<size_t> all_values() const{
-        m_sanitizer.check_usage();
-        FixedLimitVector<size_t> ret(m_map.size());
-        for (const auto& item : m_map){
-            ret.emplace_back(item.first);
-        }
-        return ret;
-    }
-
-private:
-    using Node = typename std::map<size_t, EnumEntry>::const_iterator;
-    std::vector<size_t> m_list;
-    std::map<size_t, EnumEntry> m_map;
-    std::map<std::string, const EnumEntry*> m_slug_to_enum;
-    std::map<std::string, const EnumEntry*> m_display_to_enum;
-
-    LifetimeSanitizer m_sanitizer;
-};
-
-
-
-IntegerEnumDatabase::IntegerEnumDatabase(IntegerEnumDatabase&& x) = default;
-IntegerEnumDatabase& IntegerEnumDatabase::operator=(IntegerEnumDatabase&& x) = default;
-IntegerEnumDatabase::~IntegerEnumDatabase() = default;
-
-IntegerEnumDatabase::IntegerEnumDatabase(void*){}
-IntegerEnumDatabase::IntegerEnumDatabase()
-    : m_core(CONSTRUCT_TOKEN)
-{}
-IntegerEnumDatabase::IntegerEnumDatabase(std::initializer_list<EnumEntry> list)
-    : m_core(CONSTRUCT_TOKEN)
-{
-    size_t index = 0;
-    for (auto iter = list.begin(); iter != list.end(); ++iter, index++){
-        add(iter->enum_value, std::move(iter->slug), std::move(iter->display), iter->enabled);
-    }
-}
-void IntegerEnumDatabase::add(EnumEntry entry){
-    m_core->add(entry);
-}
-const EnumEntry* IntegerEnumDatabase::find(size_t value) const{
-    return m_core->find(value);
-}
-const EnumEntry* IntegerEnumDatabase::find_slug(const std::string& slug) const{
-    return m_core->find_slug(slug);
-}
-const EnumEntry* IntegerEnumDatabase::find_display(const std::string& display) const{
-    return m_core->find_display(display);
-}
-FixedLimitVector<size_t> IntegerEnumDatabase::all_values() const{
-    return m_core->all_values();
-}
-
-
-template class FixedLimitVector<size_t>;
-
-
-
-}
diff --git a/Common/Cpp/EnumDatabase.h b/Common/Cpp/EnumDatabase.h
deleted file mode 100644
index 5015cc6629..0000000000
--- a/Common/Cpp/EnumDatabase.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/*  Enum Database
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- *      A database that goes with an enum.
- *
- *  This database contains information about the enum such as the display names
- *  and serialization slugs.
- *
- *  This database is used to initialize an EnumDropdownCell/Option.
- *
- */
-
-#ifndef PokemonAutomation_EnumDatabase_H
-#define PokemonAutomation_EnumDatabase_H
-
-#include <string>
-#include "Containers/Pimpl.h"
-#include "Containers/FixedLimitVector.h"
-
-namespace PokemonAutomation{
-
-class IntegerEnumDatabaseImpl;
-
-
-
-
-struct EnumEntry{
-    size_t enum_value;  //  Integer value of the enum.
-    std::string slug;
-    std::string display;
-    bool enabled = true;
-};
-
-
-//  This is the typeless database that uses an integer for the enum value.
-class IntegerEnumDatabase{
-public:
-    IntegerEnumDatabase(IntegerEnumDatabase&& x);
-    IntegerEnumDatabase& operator=(IntegerEnumDatabase&& x);
-    IntegerEnumDatabase(const IntegerEnumDatabase& x) = delete;
-    IntegerEnumDatabase& operator=(const IntegerEnumDatabase& x) = delete;
-    ~IntegerEnumDatabase();
-
-public:
-    IntegerEnumDatabase();      //  Constructs empty database.
-    IntegerEnumDatabase(std::initializer_list<EnumEntry> list);
-
-    void add(EnumEntry entry);
-    void add(size_t value, std::string slug, std::string display, bool enabled){
-        add(EnumEntry{value, std::move(slug), std::move(display), enabled});
-    }
-
-    //  Find an enum. Returns null if not in the database.
-    const EnumEntry* find(size_t value) const;
-    const EnumEntry* find_slug(const std::string& slug) const;
-    const EnumEntry* find_display(const std::string& display) const;
-
-    //  Returns the integer enum values of everything in the database.
-    FixedLimitVector<size_t> all_values() const;
-
-protected:
-    IntegerEnumDatabase(void*); //  Constructs null database.
-private:
-    Pimpl<IntegerEnumDatabaseImpl> m_core;
-};
-
-
-
-//  This is the type-safe database for your specific enum.
-template <typename EnumType>
-class EnumDatabase : public IntegerEnumDatabase{
-public:
-    struct Entry{
-        EnumType value;
-        std::string slug;
-        std::string display;
-        bool enabled = true;
-    };
-
-//public:
-//    EnumDatabase(EnumDatabase&& x) = default;
-//    EnumDatabase& operator=(EnumDatabase&& x) = default;
-
-public:
-    EnumDatabase() : IntegerEnumDatabase() {}
-    EnumDatabase(std::initializer_list<Entry> list){
-        size_t index = 0;
-        for (auto iter = list.begin(); iter != list.end(); ++iter, index++){
-            add(iter->value, std::move(iter->slug), std::move(iter->display), iter->enabled);
-        }
-    }
-
-    void add(EnumType value, std::string slug, std::string display, bool enabled){
-        IntegerEnumDatabase::add(EnumEntry{(size_t)value, std::move(slug), std::move(display), enabled});
-    }
-
-    //  Find an enum. Returns null if not in the database.
-    const EnumEntry* find(EnumType value) const{
-        return IntegerEnumDatabase::find((size_t)value);
-    }
-    EnumType find_slug(const std::string& slug) const{
-        return (EnumType)IntegerEnumDatabase::find_slug(slug);
-    }
-    EnumType find_display(const std::string& display) const{
-        return (EnumType)IntegerEnumDatabase::find_display(display);
-    }
-
-protected:
-    EnumDatabase(void*) : IntegerEnumDatabase(nullptr) {}
-};
-
-
-
-
-
-}
-#endif
diff --git a/Common/Cpp/EnumStringMap.h b/Common/Cpp/EnumStringMap.h
new file mode 100644
index 0000000000..0a30e069ad
--- /dev/null
+++ b/Common/Cpp/EnumStringMap.h
@@ -0,0 +1,69 @@
+/*  Enum Database
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_EnumStringMap_H
+#define PokemonAutomation_EnumStringMap_H
+
+#include <string>
+#include <initializer_list>
+#include <map>
+#include "Common/Cpp/Exceptions.h"
+
+namespace PokemonAutomation{
+
+
+
+template <typename EnumType>
+class EnumStringMap{
+public:
+    EnumStringMap(std::initializer_list<std::pair<const EnumType, std::string>> x){
+        for (const std::pair<const EnumType, std::string>& item : x){
+            m_enum_to_string.emplace(item);
+            auto ret =  m_string_to_enum.emplace(item.second, item.first);
+            if (!ret.second){
+                throw InternalProgramError(
+                    nullptr, PA_CURRENT_FUNCTION,
+                    "Duplicate Enum String: " + item.second
+                );
+            }
+        }
+    }
+
+    const std::string& get_string(EnumType type) const{
+        auto iter = m_enum_to_string.find(type);
+        if (iter == m_enum_to_string.end()){
+            throw ParseException("Invalid Enum: " + std::to_string((uint64_t)type));
+        }
+        return iter->second;
+    }
+    EnumType get_enum(const std::string& str) const{
+        auto iter = m_string_to_enum.find(str);
+        if (iter == m_string_to_enum.end()){
+            throw ParseException("Invalid Enum String: " + str);
+        }
+        return iter->second;
+    }
+    EnumType get_enum(const std::string& str, EnumType default_value) const{
+        auto iter = m_string_to_enum.find(str);
+        return iter == m_string_to_enum.end() ? default_value : iter->second;
+    }
+
+    auto begin() const{
+        return m_enum_to_string.begin();
+    }
+    auto end() const{
+        return m_enum_to_string.end();
+    }
+
+private:
+    std::map<EnumType, std::string> m_enum_to_string;
+    std::map<std::string, EnumType> m_string_to_enum;
+};
+
+
+
+}
+#endif
diff --git a/Common/Cpp/EventRateTracker.h b/Common/Cpp/EventRateTracker.h
index 6cdb677bf3..ba43d0aa53 100644
--- a/Common/Cpp/EventRateTracker.h
+++ b/Common/Cpp/EventRateTracker.h
@@ -1,6 +1,6 @@
 /*  Event Rate Tracker
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -58,13 +58,13 @@ class EventRateTracker{
 
 class UtilizationTracker{
 public:
-    UtilizationTracker(WallClock::duration window = std::chrono::milliseconds(1000))
+    UtilizationTracker(WallDuration window = std::chrono::milliseconds(1000))
         : m_window(window)
         , m_min_window(window / 2)
         , m_running_usage(0)
     {}
 
-    void push_event(WallClock::duration usage_since_last, WallClock timestamp = current_time()){
+    void push_event(WallDuration usage_since_last, WallClock timestamp = current_time()){
         WallClock threshold = timestamp - m_window;
         while (m_history.size() > 1){
             if (m_history.front().timestamp >= threshold){
@@ -78,13 +78,13 @@ class UtilizationTracker{
     }
     void push_idle(){
         m_history.clear();
-        m_running_usage = WallClock::duration(0);
+        m_running_usage = WallDuration(0);
     }
 
     size_t events_in_window() const{
         return m_history.size();
     }
-    WallClock::duration usage_in_window() const{
+    WallDuration usage_in_window() const{
         return m_running_usage;
     }
     double utilization() const{
@@ -107,14 +107,14 @@ class UtilizationTracker{
 private:
     struct Entry{
         WallClock timestamp;
-        WallClock::duration usage;
+        WallDuration usage;
     };
 
-    WallClock::duration m_window;
-    WallClock::duration m_min_window;
+    WallDuration m_window;
+    WallDuration m_min_window;
 
     std::deque<Entry> m_history;
-    WallClock::duration m_running_usage;
+    WallDuration m_running_usage;
 };
 
 
diff --git a/Common/Cpp/Exceptions.cpp b/Common/Cpp/Exceptions.cpp
index 566cbf9327..b3047022c0 100644
--- a/Common/Cpp/Exceptions.cpp
+++ b/Common/Cpp/Exceptions.cpp
@@ -1,16 +1,20 @@
 /*  Exceptions
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include <iostream>
+#include <format>
 #include "Exceptions.h"
 
 namespace PokemonAutomation{
 
 
 
+void Exception::log(Logger& logger) const{
+    logger.log(std::string(name()) + ": " + message(), COLOR_RED);
+}
 std::string Exception::message() const{
     return "";
 }
@@ -25,15 +29,23 @@ std::string Exception::to_str() const{
 }
 
 
+ParseException::ParseException(std::string message_string)
+    : m_message(std::move(message_string))
+{
+    std::string str = ParseException::name();
+    str += ": " + message();
+    std::cerr << str << std::endl;
+}
+
 
 
-FileException::FileException(Logger* logger, const char* location, std::string message, std::string file)
+FileException::FileException(Logger* logger, const char* location, std::string message_string, std::string file)
     : m_location(location)
-    , m_message(std::move(message))
+    , m_message(std::move(message_string))
     , m_file(std::move(file))
 {
     std::string str = FileException::name();
-    str += ": " + m_message;
+    str += ": " + message();
     if (logger != nullptr){
         logger->log(str, COLOR_RED);
     }else{
@@ -41,7 +53,15 @@ FileException::FileException(Logger* logger, const char* location, std::string m
     }
 }
 std::string FileException::message() const{
-    return m_message + "\nFile: " + m_file + "\nLocation: " + m_location;
+    std::string ret = m_message;
+    if (!m_file.empty()){
+        ret += "\nFile: " + m_file;
+    }
+    if (m_location != nullptr){
+        ret += "\nLocation: ";
+        ret += m_location;
+    }
+    return ret;
 }
 
 
@@ -111,9 +131,23 @@ std::string UserSetupError::message() const{
 }
 
 
+MLModelSessionCreationError::MLModelSessionCreationError(Logger* logger, std::string model_path)
+    : m_model_path(model_path)
+{
+    if (logger){
+        logger->log(message());
+    }else{
+        std::cerr << message() << std::endl;
+    }
+}
 
-
-
+std::string MLModelSessionCreationError::message() const{
+    return std::format(
+        "Failed to create a model session from {}. "
+        "Probably failure loading the model or not enough GPU memory. Also, ensure that the corresponding ONNX model has been downloaded.",
+        m_model_path
+    );
+}
 
 
 
diff --git a/Common/Cpp/Exceptions.h b/Common/Cpp/Exceptions.h
index c4ecdbbd9f..3f46d895cb 100644
--- a/Common/Cpp/Exceptions.h
+++ b/Common/Cpp/Exceptions.h
@@ -1,18 +1,34 @@
 /*  Exceptions
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifndef PokemonAutomation_Exceptions_H
 #define PokemonAutomation_Exceptions_H
 
+#include <utility>
 #include "Common/Compiler.h"
-#include "AbstractLogger.h"
+#include "Logging/AbstractLogger.h"
 
 namespace PokemonAutomation{
 
 
+
+enum class ErrorReportMode{
+    NO_ERROR_REPORT,
+    SEND_ERROR_REPORT,
+};
+
+
+template <typename ExceptionType, class... Args>
+[[noreturn]] void throw_and_log(Logger& logger, Args&&... args){
+    ExceptionType exception(std::forward<Args>(args)...);
+    exception.log(logger);
+    throw exception;
+}
+
+
 //  Definitions:
 //      Catch:   To catch the exception using a try-catch.
 //      Consume: To catch the exception and not rethrow it.
@@ -22,6 +38,8 @@ namespace PokemonAutomation{
 class Exception{
 public:
     virtual ~Exception() = default;
+
+    virtual void log(Logger& logger) const;
     virtual const char* name() const = 0;
     virtual std::string message() const;
     virtual std::string to_str() const;
@@ -43,7 +61,11 @@ class ProgramCancelledException : public Exception{
 //    - Non-infra are allowed to catch and rethrow this exception.
 class InvalidConnectionStateException : public Exception{
 public:
+    InvalidConnectionStateException(std::string message) : m_message(std::move(message)) {}
     virtual const char* name() const override{ return "InvalidConnectionStateException"; }
+    virtual std::string message() const override{ return m_message; }
+protected:
+    std::string m_message;
 };
 
 
@@ -62,7 +84,7 @@ class OperationCancelledException : public Exception{
 class ParseException : public Exception{
 public:
     ParseException() = default;
-    ParseException(std::string message) : m_message(std::move(message)) {}
+    ParseException(std::string message);
     virtual const char* name() const override{ return "ParseException"; }
     virtual std::string message() const override{ return m_message; }
 protected:
@@ -106,6 +128,7 @@ class SerialProtocolException : public Exception{
 //  These are thrown for logic errors. They are always bugs.
 class InternalProgramError : public Exception{
 public:
+    // location: use `PA_CURRENT_FUNCTION`
     InternalProgramError(Logger* logger, const char* location, std::string message);
     virtual const char* name() const override{ return "InternalProgramError"; }
     virtual std::string message() const override;
@@ -137,6 +160,20 @@ class UserSetupError : public Exception{
 };
 
 
+//  These are thrown if failed to create an ML model session. They
+//  are usually due to unable to load ML model files or not enough GPU
+//  memory.
+class MLModelSessionCreationError : public Exception{
+public:
+    // If logger is not nullptr, call logger to write error message in the constructor.
+    // Otherwise, write error message to std::cerr.
+    MLModelSessionCreationError(Logger* logger, std::string model_path);
+    virtual const char* name() const override{ return "MLModelCreationError"; }
+    virtual std::string message() const override;
+private:
+    std::string m_model_path;
+};
+
 
 
 
diff --git a/Common/Cpp/ExpressionEvaluator.cpp b/Common/Cpp/ExpressionEvaluator.cpp
new file mode 100644
index 0000000000..b246d43983
--- /dev/null
+++ b/Common/Cpp/ExpressionEvaluator.cpp
@@ -0,0 +1,348 @@
+/*  Simple (and incomplete) Expression Evaluator
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <limits>
+#include <string>
+#include <map>
+#include <vector>
+#include "Common/Cpp/Exceptions.h"
+#include "ExpressionEvaluator.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+
+
+bool is_whitespace(char ch){
+    switch (ch){
+    case ' ': return true;
+    case '\t': return true;
+    case '\r': return true;
+    case '\n': return true;
+    case '\0': return true;
+    }
+    return false;
+}
+bool is_digit(char ch){
+    return '0' <= ch && ch <= '9';
+}
+bool is_symbol(char ch){
+    if ('a' <= ch && ch <= 'z'){
+        return true;
+    }
+    if ('A' <= ch && ch <= 'Z'){
+        return true;
+    }
+    if (ch == '_'){
+        return true;
+    }
+    return false;
+}
+bool skip_whitespace(const char*& str){
+    while (true){
+        char ch = *str;
+        if (ch == '\0'){
+            return true;
+        }
+        if (!is_whitespace(ch)){
+            return false;
+        }
+        str++;
+    }
+}
+
+template <typename T>
+T checked_multiply(T x, T y){
+    if (x == 0 || y == 0){
+        return 0;
+    }
+    T ret = x * y;
+    if (ret / x != y){
+        throw ParseException("Overflow");
+    }
+    return ret;
+}
+template <typename T>
+T checked_add(T x, T y){
+    if constexpr (std::is_unsigned_v<T>){
+        T ret = x + y;
+        if (ret < x){
+            throw ParseException("Overflow");
+        }
+        return ret;
+    }else{
+        if (x >= 0 && std::numeric_limits<T>::max() - x < y){
+            throw ParseException("Overflow");
+        }
+        if (x < 0 && y < std::numeric_limits<T>::min() - x){
+            throw ParseException("Overflow");
+        }
+        return x + y;
+    }
+}
+template <typename T>
+T checked_sub(T x, T y){
+    if (x >= 0 && x - std::numeric_limits<T>::max() > y){
+        throw ParseException("Overflow");
+    }
+    if (x < 0 && y > x - std::numeric_limits<T>::min()){
+        throw ParseException("Overflow");
+    }
+    return x - y;
+}
+
+template <typename T>
+T parse_integer(const char*& str){
+    const char* ptr = str;
+
+    T x = 0;
+    while (true){
+        char ch = *str;
+        if (is_whitespace(ch)){
+            return x;
+        }
+        if (is_digit(ch)){
+            x = checked_multiply<T>(x, 10);
+            x = checked_add<T>(x, ch - '0');
+            str++;
+            continue;
+        }
+        switch (ch){
+        case '+':
+        case '-':
+        case '*':
+        case ')':
+            return x;
+        }
+        if (is_symbol(ch)){
+            return x;
+        }
+        throw ParseException(std::string("Invalid integer: ") + ptr);
+    }
+}
+std::string parse_symbol(const char*& str){
+    const char* ptr = str;
+
+    std::string ret;
+    ret += *str++;
+    while (true){
+        char ch = *str;
+        if (is_whitespace(ch)){
+            return ret;
+        }
+        if (is_symbol(ch)){
+            ret += ch;
+            str++;
+            continue;
+        }
+        if (is_digit(ch)){
+            ret += ch;
+            str++;
+            continue;
+        }
+        switch (ch){
+        case '+':
+        case '-':
+        case '*':
+        case ')':
+            return ret;
+        }
+        throw ParseException(std::string("Invalid symbol: ") + ptr);
+    }
+}
+
+uint8_t precedence(char ch){
+    switch (ch){
+    case '+':
+    case '-':
+        return 0;
+    case '*':
+        return 1;
+    }
+    throw ParseException(std::string("Invalid operator: ") + ch);
+}
+
+int64_t parse_expression(
+    const std::map<std::string, int64_t>& variables,
+    const std::string& expression
+){
+    const char* str = expression.c_str();
+
+    std::vector<std::pair<char, uint64_t>> num;
+    std::vector<char> op;
+
+    size_t consecutive_values = 0;
+    while (true){
+        //  Consecutive values is an implied multiply.
+        if (consecutive_values > 1){
+            consecutive_values = 0;
+            op.push_back('*');
+            while (op.size() >= 2){
+                char top = op.back();
+                char next = op[op.size() - 2];
+                uint8_t p_top  = precedence(top);
+                uint8_t p_next = precedence(next);
+                if (p_top > p_next){
+                    break;
+                }
+                op.pop_back();
+                op.pop_back();
+                num.emplace_back(next, 0);
+                op.push_back(top);
+                if (p_top == p_next){
+                    break;
+                }
+            }
+            continue;
+        }
+
+        if (skip_whitespace(str)){
+            break;
+        }
+        char ch = *str;
+//        cout << "ch = " << ch << endl;
+
+
+        if (is_digit(ch)){
+            consecutive_values++;
+            num.emplace_back('\0', parse_integer<uint64_t>(str));
+            continue;
+        }
+        if (is_symbol(ch)){
+            consecutive_values++;
+            std::string symbol = parse_symbol(str);
+            auto iter = variables.find(symbol);
+            if (iter == variables.end()){
+                throw ParseException("Undefined Symbol: " + symbol);
+            }
+            num.emplace_back('\0', iter->second);
+            continue;
+        }
+        if (ch == '+' || ch == '-' || ch == '*'){
+            consecutive_values = 0;
+            op.push_back(ch);
+            str++;
+            while (op.size() >= 2){
+                char top = op.back();
+                char next = op[op.size() - 2];
+                uint8_t p_top  = precedence(top);
+                uint8_t p_next = precedence(next);
+                if (p_top > p_next){
+                    break;
+                }
+                op.pop_back();
+                op.pop_back();
+                num.emplace_back(next, 0);
+                op.push_back(top);
+                if (p_top == p_next){
+                    break;
+                }
+            }
+            continue;
+        }
+    //    if (ch == '('){
+    //
+    //    }
+    //    if (ch == ')'){
+    //
+    //    }
+        throw ParseException("Invalid expression: " + expression);
+    }
+
+    while (!op.empty()){
+        num.emplace_back(op.back(), 0);
+        op.pop_back();
+    }
+
+#if 0
+    cout << "operands: ";
+    for (const auto& item : num){
+        if (item.first == 0){
+            cout << item.second << " ";
+        }else{
+            cout << item.first << " ";
+        }
+    }
+    cout << endl;
+    //cout << "operators: ";
+    //for (const auto& item : op){
+    //    cout << item << " ";
+    //}
+    //cout << endl;
+#endif
+
+    std::vector<int64_t> stack;
+    for (const auto& item : num){
+        if (item.first == 0){
+            stack.push_back(item.second);
+            num.pop_back();
+            continue;
+        }
+        switch (item.first){
+        case '+':{
+            if (stack.size() < 2){
+                throw ParseException("Invalid expression: unexpected +");
+            }
+            int64_t x = stack[stack.size() - 2];
+            int64_t y = stack[stack.size() - 1];
+            stack.pop_back();
+            stack.pop_back();
+
+            x = checked_add(x, y);
+            stack.push_back(x);
+            continue;
+        }
+        case '-':{
+            if (stack.size() == 0){
+                throw ParseException("Invalid expression: unexpected -");
+            }
+
+            // If we have at least two integers (x, y) in the stack, perform x - y
+            // If we have only one integer y in the stack, perform - y (by leaving x = 0)
+
+            int64_t y = stack[stack.size() - 1];
+            stack.pop_back();
+
+            int64_t x = 0;
+            if (stack.size() > 0){
+                x = stack[stack.size() - 1];
+                stack.pop_back();
+            }
+            x = checked_sub(x, y);
+            stack.push_back(x);
+            continue;
+        }
+        case '*':{
+            if (stack.size() < 2){
+                throw ParseException("Invalid expression: unexpected *");
+            }
+            int64_t x = stack[stack.size() - 2];
+            int64_t y = stack[stack.size() - 1];
+            stack.pop_back();
+            stack.pop_back();
+            x = checked_multiply(x, y);
+            stack.push_back(x);
+            continue;
+        }
+        }
+        throw ParseException("Invalid operator.");
+    }
+    if (stack.size() != 1){
+        throw ParseException("Invalid expression.");
+    }
+
+    return stack[0];
+}
+
+
+
+
+
+}
+
+
diff --git a/Common/Cpp/ExpressionEvaluator.h b/Common/Cpp/ExpressionEvaluator.h
new file mode 100644
index 0000000000..5f6be982d7
--- /dev/null
+++ b/Common/Cpp/ExpressionEvaluator.h
@@ -0,0 +1,22 @@
+/*  Simple (and incomplete) Expression Evaluator
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <stdint.h>
+#include <string>
+#include <map>
+
+namespace PokemonAutomation{
+
+
+
+int64_t parse_expression(
+    const std::map<std::string, int64_t>& variables,
+    const std::string& expression
+);
+
+
+
+}
diff --git a/Common/Cpp/Filesystem/FileIO.cpp b/Common/Cpp/Filesystem/FileIO.cpp
new file mode 100644
index 0000000000..a8a0f0f8e1
--- /dev/null
+++ b/Common/Cpp/Filesystem/FileIO.cpp
@@ -0,0 +1,251 @@
+/*  File IO
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <cstdio>
+#include "Common/Cpp/Exceptions.h"
+#include "FileIO.h"
+
+#ifdef _WIN32
+#include <stdio.h>   //  _wfopen, _ftelli64, _fseeki64
+#endif
+
+namespace PokemonAutomation{
+
+
+//  Convert FileMode flags to C-style mode string.
+//  Returns the appropriate mode string for fopen/wfopen.
+static const char* mode_to_string(FileMode mode){
+    bool read   = has_flag(mode, FileMode::READ);
+    bool write  = has_flag(mode, FileMode::WRITE);
+    bool append = has_flag(mode, FileMode::APPEND);
+    bool binary = has_flag(mode, FileMode::BINARY);
+
+    //  Determine base mode
+    if (append){
+        //  Append mode (with optional read)
+        if (read){
+            return binary ? "a+b" : "a+";
+        }else{
+            return binary ? "ab" : "a";
+        }
+    }else if (write){
+        //  Write mode (truncate, with optional read)
+        if (read){
+            return binary ? "w+b" : "w+";
+        }else{
+            return binary ? "wb" : "w";
+        }
+    }else if (read){
+        //  Read-only mode
+        return binary ? "rb" : "r";
+    }
+
+    //  Default to read binary if no mode specified
+    return "rb";
+}
+
+#ifdef _WIN32
+//  Convert FileMode flags to wide C-style mode string for Windows.
+static const wchar_t* mode_to_wstring(FileMode mode){
+    bool read   = has_flag(mode, FileMode::READ);
+    bool write  = has_flag(mode, FileMode::WRITE);
+    bool append = has_flag(mode, FileMode::APPEND);
+    bool binary = has_flag(mode, FileMode::BINARY);
+
+    if (append){
+        if (read){
+            return binary ? L"a+b" : L"a+";
+        }else{
+            return binary ? L"ab" : L"a";
+        }
+    }else if (write){
+        if (read){
+            return binary ? L"w+b" : L"w+";
+        }else{
+            return binary ? L"wb" : L"w";
+        }
+    }else if (read){
+        return binary ? L"rb" : L"r";
+    }
+
+    return L"rb";
+}
+#endif
+
+
+FileIO::~FileIO(){
+    close();
+}
+
+FileIO::FileIO(const Filesystem::Path& path, FileMode mode)
+    : m_file(nullptr)
+{
+    open(path, mode);
+}
+
+FileIO::FileIO(FileIO&& other) noexcept
+    : m_file(other.m_file)
+{
+    other.m_file = nullptr;
+}
+
+FileIO& FileIO::operator=(FileIO&& other) noexcept{
+    if (this != &other){
+        close();
+        m_file = other.m_file;
+        other.m_file = nullptr;
+    }
+    return *this;
+}
+
+bool FileIO::open(const Filesystem::Path& path, FileMode mode){
+    //  Close existing file if open
+    close();
+
+#ifdef _WIN32
+    //  Windows: Use _wfopen for Unicode path support.
+    //  std::filesystem::path::c_str() returns wchar_t* on Windows.
+    const wchar_t* wmode = mode_to_wstring(mode);
+    m_file = _wfopen(path.stdpath().c_str(), wmode);
+#else
+    //  POSIX (macOS, Linux): Use fopen with UTF-8 path.
+    //  These systems natively support UTF-8 in file paths.
+    const char* cmode = mode_to_string(mode);
+    m_file = fopen(path.string().c_str(), cmode);
+#endif
+
+    return m_file != nullptr;
+}
+
+void FileIO::close(){
+    if (m_file){
+        fclose((FILE*)m_file);
+        m_file = nullptr;
+    }
+}
+
+size_t FileIO::write(const void* data, size_t size){
+    if (!m_file || size == 0){
+        return 0;
+    }
+    return fwrite(data, 1, size, (FILE*)m_file);
+}
+
+size_t FileIO::read(void* buffer, size_t size){
+    if (!m_file || size == 0){
+        return 0;
+    }
+    return fread(buffer, 1, size, (FILE*)m_file);
+}
+
+bool FileIO::flush(){
+    if (!m_file){
+        return false;
+    }
+    return fflush((FILE*)m_file) == 0;
+}
+
+
+int64_t FileIO::tell() const{
+    if (!m_file){
+        return -1;
+    }
+#ifdef _WIN32
+    //  Windows: Use _ftelli64() for 64-bit file positions.
+    //  ftell() returns long which is 32-bit on Windows, limiting to 2GB files.
+    return _ftelli64((FILE*)m_file);
+#else
+    //  POSIX: Use ftello() which returns off_t (64-bit on 64-bit systems).
+    return static_cast<int64_t>(ftello((FILE*)m_file));
+#endif
+}
+
+bool FileIO::seek(int64_t offset, int whence){
+    if (!m_file){
+        return false;
+    }
+#ifdef _WIN32
+    //  Windows: Use _fseeki64() for 64-bit file positions.
+    return _fseeki64((FILE*)m_file, offset, whence) == 0;
+#else
+    //  POSIX: Use fseeko() which accepts off_t (64-bit on 64-bit systems).
+    return fseeko((FILE*)m_file, static_cast<off_t>(offset), whence) == 0;
+#endif
+}
+
+
+
+
+
+
+void string_to_file(const std::string& filename, const std::string& str){
+    std::string json_out = "\xef\xbb\xbf";
+    //  Convert to CRLF.
+    char previous = 0;
+    for (char ch : str){
+        if (ch == '\n' && previous != '\r'){
+            json_out += '\r';
+        }
+        json_out += ch;
+        previous = ch;
+    }
+
+    FileIO file;
+    if (!file.open(filename, FileMode::WRITE | FileMode::BINARY)){
+        throw FileException(nullptr, PA_CURRENT_FUNCTION, "Unable to create file.", filename);
+    }
+    if (file.write(json_out.c_str(), json_out.size()) != json_out.size()){
+        throw FileException(nullptr, PA_CURRENT_FUNCTION, "Unable to write file.", filename);
+    }
+    file.close();
+}
+
+
+std::string file_to_string(const std::string& filename){
+    std::string ret;
+    if (!file_to_string(filename, ret)){
+        throw FileException(nullptr, PA_CURRENT_FUNCTION, "Unable to open file.", filename);
+    }
+    return ret;
+}
+
+
+bool file_to_string(const std::string& filename, std::string& content){
+    FileIO file;
+    if (!file.open(filename, FileMode::READ | FileMode::BINARY)){
+        return false;
+    }
+
+    char buffer[4096];
+
+    std::string ret;
+    while (true){
+        size_t actual = file.read(buffer, sizeof(buffer));
+        ret += std::string(buffer, actual);
+        if (actual < sizeof(buffer)){
+            break;
+        }
+    }
+    content = std::move(ret);
+    return true;
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}
diff --git a/Common/Cpp/Filesystem/FileIO.h b/Common/Cpp/Filesystem/FileIO.h
new file mode 100644
index 0000000000..87f8d0fdb4
--- /dev/null
+++ b/Common/Cpp/Filesystem/FileIO.h
@@ -0,0 +1,139 @@
+/*  File IO
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *
+ *  Cross-platform file I/O wrapper using C-style FILE* for better performance
+ *  than std::ofstream while maintaining Unicode path support on all platforms.
+ *
+ *  On Windows, uses _wfopen() to handle Unicode paths correctly.
+ *  On POSIX systems (macOS, Linux), uses fopen() with UTF-8 paths.
+ */
+
+#ifndef PokemonAutomation_Filesystem_FileIO_H
+#define PokemonAutomation_Filesystem_FileIO_H
+
+#include <string>
+#include "FilePath.h"
+
+namespace PokemonAutomation{
+
+
+//  Open mode flags for FileIO.
+//  Can be combined with bitwise OR.
+enum class FileMode{
+    READ        = 1 << 0,   //  Open for reading
+    WRITE       = 1 << 1,   //  Open for writing (truncates existing file)
+    APPEND      = 1 << 2,   //  Open for appending (writes go to end of file)
+    BINARY      = 1 << 3,   //  Open in binary mode (no newline translation)
+};
+
+inline FileMode operator|(FileMode a, FileMode b){
+    return static_cast<FileMode>(static_cast<int>(a) | static_cast<int>(b));
+}
+inline FileMode operator&(FileMode a, FileMode b){
+    return static_cast<FileMode>(static_cast<int>(a) & static_cast<int>(b));
+}
+inline bool has_flag(FileMode mode, FileMode flag){
+    return (static_cast<int>(mode) & static_cast<int>(flag)) != 0;
+}
+
+
+//  RAII wrapper around FILE* providing cross-platform Unicode path support
+//  and better performance than std::ofstream.
+//
+//  Example usage:
+//      FileIO file;
+//      if (file.open(path, FileMode::APPEND | FileMode::BINARY)){
+//          file.write(data.data(), data.size());
+//          file.flush();
+//      }
+//
+class FileIO{
+public:
+    FileIO() = default;
+    ~FileIO();
+
+    //  Construct and open a file with the given path and mode.
+    //  Check is_open() to verify success.
+    FileIO(const Filesystem::Path& path, FileMode mode);
+
+    //  Non-copyable
+    FileIO(const FileIO&) = delete;
+    FileIO& operator=(const FileIO&) = delete;
+
+    //  Movable
+    FileIO(FileIO&& other) noexcept;
+    FileIO& operator=(FileIO&& other) noexcept;
+
+public:
+    //  Open a file with the given path and mode.
+    //  Returns true on success, false on failure.
+    //  If a file is already open, it will be closed first.
+    bool open(const Filesystem::Path& path, FileMode mode);
+
+    //  Close the file. Safe to call multiple times.
+    void close();
+
+    //  Check if a file is currently open.
+    bool is_open() const{
+        return m_file != nullptr;
+    }
+
+public:
+    //  Write data to the file.
+    //  Returns the number of bytes written.
+    size_t write(const void* data, size_t size);
+
+    //  Write a string to the file.
+    //  Returns the number of bytes written.
+    size_t write(const std::string& str){
+        return write(str.data(), str.size());
+    }
+
+    //  Read data from the file into buffer.
+    //  Returns the number of bytes read.
+    size_t read(void* buffer, size_t size);
+
+    //  Flush buffered data to disk.
+    //  Returns true on success.
+    bool flush();
+
+public:
+    //  Get current file position.
+    //  Returns -1 on error.
+    int64_t tell() const;
+
+    //  Seek to a position in the file.
+    //  whence: SEEK_SET (beginning), SEEK_CUR (current), SEEK_END (end), defined in header <cstdio>.
+    //  Returns true on success.
+    bool seek(int64_t offset, int whence);
+
+private:
+    void* m_file = nullptr;
+};
+
+
+
+
+
+void string_to_file(const std::string& filename, const std::string& str);
+
+//  Load file from `filename` into a string
+//  If unable to open the file, FileException is thrown
+std::string file_to_string(const std::string& filename);
+
+//  Load file from `filename` into a string. Return true if the file can be read successfully
+bool file_to_string(const std::string& filename, std::string& content);
+
+
+
+
+
+
+
+
+
+
+}
+#endif
diff --git a/Common/Cpp/Filesystem/FilePath.cpp b/Common/Cpp/Filesystem/FilePath.cpp
new file mode 100644
index 0000000000..e8c6e9cad4
--- /dev/null
+++ b/Common/Cpp/Filesystem/FilePath.cpp
@@ -0,0 +1,77 @@
+/*  File Path
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <iostream>
+#include "Common/Cpp/Strings/Unicode.h"
+#include "FilePath.h"
+
+namespace PokemonAutomation{
+namespace Filesystem{
+
+
+
+
+Path::Path(const char* path)
+    : m_path(utf8_to_utf8(path))
+{}
+Path::Path(const std::string& path)
+    : m_path(utf8_to_utf8(path))
+{}
+
+std::string Path::string() const{
+    return utf8_to_str(m_path.u8string());
+}
+
+
+
+
+
+
+
+std::string Path::string_slash_normalized() const{
+    std::string ret = utf8_to_str(m_path.u8string());
+#if _WIN32
+    std::replace(ret.begin(), ret.end(), '\\', '/');
+#endif
+    return ret;
+}
+std::u8string Path::u8string_slash_normalized() const{
+    std::u8string ret = m_path.u8string();
+#if _WIN32
+    std::replace(ret.begin(), ret.end(), '\\', '/');
+#endif
+    return ret;
+}
+
+
+
+
+Path& Path::operator+=(const Path& x){
+    m_path += x.m_path;
+    return *this;
+}
+Path operator+(const Path& x, const Path& y){
+    std::filesystem::path ret = x;
+    ret += y.m_path;
+    return ret;
+}
+Path& Path::operator/=(const Path& x){
+    m_path /= x.m_path;
+    return *this;
+}
+Path operator/(const Path& x, const Path& y){
+    return x.m_path / y.m_path;
+}
+
+
+std::ostream& operator<<(std::ostream& stream, const Path& x){
+    return stream << x.m_path;
+}
+
+
+
+}
+}
diff --git a/Common/Cpp/Filesystem/FilePath.h b/Common/Cpp/Filesystem/FilePath.h
new file mode 100644
index 0000000000..476b9ce36b
--- /dev/null
+++ b/Common/Cpp/Filesystem/FilePath.h
@@ -0,0 +1,152 @@
+/*  File Path
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *
+ *  We disllow direct use of "std::filesystem" because it's too easy to mess up
+ *  Unicode support.
+ *
+ *  In this project, we define "char*" and "std::string" as UTF-8. But this is
+ *  not what happens in Windows as it uses ANSI or whatever the locale is.
+ *
+ *  This applies to all standard library functions as well as Window's own APIs.
+ *
+ *  Therefore, we cannot pass "char*"/"std::string" into any libraries. But this
+ *  is too easy to do accidentally.
+ *
+ *  Therefore, we ban the direct use of "std::filesystem" in our code base and
+ *  wrap them instead.
+ *
+ */
+
+#ifndef PokemonAutomation_Filesystem_FilePath_H
+#define PokemonAutomation_Filesystem_FilePath_H
+
+#include <filesystem>
+#include <iosfwd>
+
+namespace PokemonAutomation{
+namespace Filesystem{
+
+
+
+class Path{
+public:
+    Path() = default;
+    Path(std::filesystem::path path)
+        : m_path(std::move(path))
+    {}
+
+    //  Construct assuming input path is UTF-8 encoding.
+    Path(const char* path);
+    //  Construct assuming input path is UTF-8 encoding.
+    Path(const std::string& path);
+
+    //  Construct from UTF-8 string.
+    Path(std::u8string path)
+        : m_path(std::move(path))
+    {}
+
+    //  Clear path
+    void clear(){
+        m_path.clear();
+    }
+
+
+public:
+    //  Implicit conversion to the C++ std::filesystem::path so it can be passed to other library functions.
+    operator const std::filesystem::path&() const{
+        return m_path;
+    }
+    //  Explicit conversion to the C++ std::filesystem::path so it can be passed to other library functions.
+    const std::filesystem::path& stdpath() const{
+        return m_path;
+    }
+
+
+public:
+    bool empty() const{
+        return m_path.empty();
+    }
+
+    //  Return path string as UTF-8.
+    std::string string() const;
+    std::string string_slash_normalized() const;
+    //  Return path string as UTF-8.
+    std::u8string u8string() const{
+        return m_path.u8string();
+    }
+    std::u8string u8string_slash_normalized() const;
+
+    //  Return the generic-format filename component of the path.
+    Path filename() const{
+        return m_path.filename();
+    }
+    //  Return the path to the parent directory.
+    //  "/var/tmp/example.txt" -> "/var/tmp"
+    //  "/var/tmp/." -> "/var/tmp"
+    //  "/" -> "/"
+    Path parent_path() const{
+        return m_path.parent_path();
+    }
+    //  Return the filename identified by the generic-format path stripped of its extension.
+    //  "/foo/bar.txt" -> "bar"
+    //  "/foo/bar" -> "bar"
+    //  "/foo/.bar" -> ".bar"
+    //  "foo.bar.baz.tar" -> "foo.bar.baz"
+    //  "/foo/." -> "."
+    //  "/foo/.." -> ".."
+    Path stem() const{
+        return m_path.stem();
+    }
+    //  Return the extension of the filename component.
+    //  "/foo/bar.txt" -> ".txt"
+    //  "/foo/bar." -> "."
+    //  "/foo/bar" -> ""
+    //  "/foo/.bar" -> ""
+    //  "/foo/..bar" -> ".bar"
+    //  "/foo/." -> ""
+    //  "/foo/.." -> ""
+    Path extension() const{
+        return m_path.extension();
+    }
+
+    Path lexically_normal() const{
+        return m_path.lexically_normal();
+    }
+
+
+public:
+    Path& replace_extension(const Path& replacement = Path()){
+        m_path.replace_extension(replacement);
+        return *this;
+    }
+
+
+public:
+    friend bool operator==(const Path& x, const Path& y){
+        return x.m_path == y.m_path;
+    }
+
+    //  Connect two path components.
+    Path& operator+=(const Path& x);
+    friend Path operator+(const Path& x, const Path& y);
+
+    //  Connect two path components with "/"
+    Path& operator/=(const Path& x);
+    friend Path operator/(const Path& x, const Path& y);
+
+    friend std::ostream& operator<<(std::ostream& stream, const Path& x);
+
+
+private:
+    std::filesystem::path m_path;
+};
+
+
+
+
+
+}
+}
+#endif
diff --git a/Common/Cpp/Filesystem/Filesystem.cpp b/Common/Cpp/Filesystem/Filesystem.cpp
new file mode 100644
index 0000000000..9925ebd69a
--- /dev/null
+++ b/Common/Cpp/Filesystem/Filesystem.cpp
@@ -0,0 +1,227 @@
+/*  Filesystem
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <algorithm>
+#include <cctype>
+#include <cstdint>
+#include <cstdio>
+#include <random>
+#include <vector>
+#include "CompileTimeBackends.h"
+#include "FilePath.h"
+#include "Filesystem.h"
+
+#ifdef _WIN32
+#include <io.h>
+#include <process.h>
+#else
+#include <unistd.h>
+#endif
+
+#ifdef PA_FILE_SYSTEM_BACKEND_OS_SPECIFIC
+#if 0
+#elif _WIN32
+#include "Filesystem_Windows.h"
+#elif __linux__
+#include "Filesystem_Linux.h"
+#elif __APPLE__
+#include "Filesystem_Mac.h"
+#else
+#error "No file backend specified."
+#endif
+#endif
+
+#ifdef PA_FILE_SYSTEM_BACKEND_Qt
+#include "Filesystem_Qt.h"
+#endif
+
+namespace PokemonAutomation{
+namespace Filesystem{
+
+
+
+Path absolute(const Path& path){
+    return std::filesystem::absolute(path.stdpath());
+}
+
+bool exists(const Path& path){
+    return std::filesystem::exists(path.stdpath());
+}
+
+bool create_directories(const Path& path){
+    return std::filesystem::create_directories(path.stdpath());
+}
+
+bool remove(const Path& path){
+    return std::filesystem::remove(path);
+}
+std::uintmax_t remove_all(const Path& path){
+    return std::filesystem::remove_all(path.stdpath());
+}
+
+bool copy_file(const Path& from, const Path& to){
+    return std::filesystem::copy_file(from.stdpath(), to.stdpath());
+}
+
+std::uintmax_t file_size(const Path& path){
+    return std::filesystem::file_size(path.stdpath());
+}
+
+std::uintmax_t file_size(const Path& path, std::error_code& ec){
+    return std::filesystem::file_size(path.stdpath(), ec);
+}
+
+void rename(const Path& old_path, const Path& new_path){
+    std::filesystem::rename(old_path.stdpath(), new_path.stdpath());
+}
+
+void rename(const Path& old_path, const Path& new_path, std::error_code& ec){
+    std::filesystem::rename(old_path.stdpath(), new_path.stdpath(), ec);
+}
+
+Path current_path(){
+    return std::filesystem::current_path();
+}
+
+void set_current_path(const Path& path){
+    std::filesystem::current_path(path.stdpath());
+}
+void set_current_path(const Path& path, std::error_code& ec){
+    std::filesystem::current_path(path.stdpath(), ec);
+}
+
+Path relative(const Path& path, std::error_code& ec){
+    std::error_code local_ec;
+    std::filesystem::path ret = std::filesystem::relative(path.stdpath(), local_ec);
+    if (local_ec){
+        ec = local_ec;
+        std::filesystem::path abs = std::filesystem::absolute(path.stdpath(), ec);
+        if (!ec){
+            ret = abs;
+        }
+    }else{
+        ec.clear();
+    }
+    return ret;
+}
+
+bool is_directory(const Path& path){
+    std::error_code ec;
+    return std::filesystem::is_directory(path.stdpath(), ec);
+}
+bool is_regular_file(const Path& path){
+    std::error_code ec;
+    return std::filesystem::is_regular_file(path.stdpath(), ec);
+}
+
+
+std::vector<Path> list_directory(const Path& path, bool recursive){
+    std::vector<Path> ret;
+    std::error_code ec;
+    auto add_entry = [](std::vector<Path>& ret, const std::filesystem::path& p){
+        const std::string name = p.filename().string();
+        if (!name.empty() && name.front() != '.'){
+            ret.emplace_back(Path(p));
+        }
+    };
+    if (recursive){
+        std::filesystem::recursive_directory_iterator it(
+            path.stdpath(),
+            std::filesystem::directory_options::skip_permission_denied,
+            ec
+        );
+        if (ec){
+            return ret;
+        }
+        std::filesystem::recursive_directory_iterator end;
+        for (;;){
+            if (it == end){
+                break;
+            }
+            add_entry(ret, it->path());
+            it.increment(ec);
+            if (ec){
+                break;
+            }
+        }
+    }else{
+        std::filesystem::directory_iterator it(
+            path.stdpath(),
+            std::filesystem::directory_options::skip_permission_denied,
+            ec
+        );
+        if (ec){
+            return ret;
+        }
+        std::filesystem::directory_iterator end;
+        for (;;){
+            if (it == end){
+                break;
+            }
+            add_entry(ret, it->path());
+            it.increment(ec);
+            if (ec){
+                break;
+            }
+        }
+    }
+    //  Sort by name, case-insensitively (matches Qt's QDir::Name ordering).
+    auto lower_name = [](const Path& p){
+        std::string name = p.filename().string();
+        std::transform(name.begin(), name.end(), name.begin(),
+            [](unsigned char c){ return (char)std::tolower(c); }
+        );
+        return name;
+    };
+    std::sort(ret.begin(), ret.end(), [&lower_name](const Path& a, const Path& b){
+        return lower_name(a) < lower_name(b);
+    });
+    return ret;
+}
+
+#ifdef _WIN32
+bool is_readable(const Path& path){
+    return _waccess(path.stdpath().c_str(), 4) == 0;
+}
+bool is_writable(const Path& path){
+    return _waccess(path.stdpath().c_str(), 2) == 0;
+}
+#else
+bool is_readable(const Path& path){
+    return ::access(path.string().c_str(), R_OK) == 0;
+}
+bool is_writable(const Path& path){
+    return ::access(path.string().c_str(), W_OK) == 0;
+}
+#endif
+
+
+Path unique_temp_path(const Path& path){
+    std::string suffix = ".tmp-";
+#ifdef _WIN32
+    suffix += std::to_string((unsigned int)_getpid());
+#else
+    suffix += std::to_string((unsigned int)getpid());
+#endif
+    unsigned int rand = std::random_device{}();
+    char rand_str[16];
+    std::snprintf(rand_str, sizeof(rand_str), "-%08x", rand);
+    suffix += rand_str;
+    return path.parent_path() / Path(path.filename().string() + suffix);
+}
+
+Path application_binary_name(){
+    return application_binary_path().filename();
+}
+Path application_binary_directory(){
+    return application_binary_path().parent_path();
+}
+
+
+
+
+}
+}
diff --git a/Common/Cpp/Filesystem/Filesystem.h b/Common/Cpp/Filesystem/Filesystem.h
new file mode 100644
index 0000000000..21d350f014
--- /dev/null
+++ b/Common/Cpp/Filesystem/Filesystem.h
@@ -0,0 +1,130 @@
+/*  Filesystem
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *
+ *  We disllow direct use of "std::filesystem" because it's too easy to mess up
+ *  Unicode support.
+ *
+ *  In this project, we define "char*" and "std::string" as UTF-8. But this is
+ *  not what happens in Windows as it uses ANSI or whatever the locale is.
+ *
+ *  This applies to all standard library functions as well as Window's own APIs.
+ *
+ *  Therefore, we cannot pass "char*"/"std::string" into any libraries. But this
+ *  is too easy to do accidentally.
+ *
+ *  Therefore, we ban the direct use of "std::filesystem" in our code base and
+ *  wrap them instead.
+ *
+ */
+
+#ifndef PokemonAutomation_Filesystem_Filesystem_H
+#define PokemonAutomation_Filesystem_Filesystem_H
+
+#include <cstdint>
+#include <vector>
+#include "FilePath.h"
+
+namespace PokemonAutomation{
+namespace Filesystem{
+
+
+Path absolute(const Path& path);
+
+//  Whether a path exists.
+bool exists(const Path& path);
+
+//  Create every missing directory along the path.
+//  If all related directories already exist, return false. Otherwise return true.
+bool create_directories(const Path& path);
+
+//  Delete the contents of the path (if it is a directory) and the contents of all its subdirectories, recursively.
+//  Then delete the file/directory of path itself. Symlinks are not followed (symlink is removed, not its target).
+bool remove(const Path& path);
+std::uintmax_t remove_all(const Path& path);
+
+//  Copy a file.
+bool copy_file(const Path& from, const Path& to);
+
+//  Return the size of a file in bytes.
+//  Throw std::filesystem::filesystem_error on underlying OS API errors
+std::uintmax_t file_size(const Path& path);
+
+//  Return the size of a file in bytes.
+//  If an error occurs, set `ec`. Execute `ec.clear()` if no errors occur.
+std::uintmax_t file_size(const Path& path, std::error_code& ec);
+
+//  Rename a file or directory.
+//  Throw std::filesystem::filesystem_error on underlying OS API errors
+void rename(const Path& old_path, const Path& new_path);
+
+//  Rename a file or directory.
+//  If an error occurs, set `ec`. Execute `ec.clear()` if no errors occur.
+void rename(const Path& old_path, const Path& new_path, std::error_code& ec);
+
+
+//  The current working directory.
+Path current_path();
+
+//  Change the current working directory.
+void set_current_path(const Path& path);
+void set_current_path(const Path& path, std::error_code& ec);
+
+//  The path relative to the current working directory.
+//  If no relative path can be formed (e.g. different drives on Windows),
+//  return the absolute path and set `ec`. Execute `ec.clear()` if a relative path was formed.
+Path relative(const Path& path, std::error_code& ec);
+
+//  Whether the path is a directory.
+bool is_directory(const Path& path);
+
+//  Whether the path is a regular file.
+bool is_regular_file(const Path& path);
+
+//  List the entries (files and directories) directly inside the directory at `path`.
+//  Hidden entries (names starting with '.') are excluded. If `recursive` is true,
+//  entries in all subdirectories are also listed.
+//  Entries are returned sorted by name, case-insensitively.
+//  Returns an empty list if `path` does not exist, is not a directory,
+//  or cannot be read (matches Qt's QDir::entryInfoList behavior of failing silently).
+std::vector<Path> list_directory(const Path& path, bool recursive = false);
+
+//  Whether the current user can read the file/directory at `path`.
+bool is_readable(const Path& path);
+
+//  Whether the current user can write the file/directory at `path`.
+bool is_writable(const Path& path);
+
+//  A unique temporary file path in the same directory as `path`, for atomic writes
+//  (write to the temporary path, then rename() onto `path`).
+//  No file is created; the caller is responsible for creating it and for
+//  deleting it if the operation fails.
+Path unique_temp_path(const Path& path);
+
+//  The path to the actual binary that is running.
+Path application_binary_name();
+Path application_binary_path();
+Path application_binary_directory();
+
+//  Path to where the application is installed.
+//  All immutable resources are relative to this.
+Path application_install_path();
+
+//  Path to where the application saves its output/settings.
+Path application_scratch_path();
+
+
+// Set a profile for program settings (/UserSettings/PROFILE_NAME/) on MacOS.
+// Have to run the program with command-line argument "open -n PATH_TO_APP --args --profile PROFILE_NAME" to set the profile and launch a new window.
+// This allows multiple instances of the program to run since settings are no longer shared.
+#if defined(__APPLE__)
+void set_startup_profile(int& argc, char* argv[]);
+const std::string& STARTUP_PROFILE();
+#endif
+
+
+
+}
+}
+#endif
diff --git a/Common/Cpp/Filesystem/Filesystem_Linux.h b/Common/Cpp/Filesystem/Filesystem_Linux.h
new file mode 100644
index 0000000000..818c9f75a1
--- /dev/null
+++ b/Common/Cpp/Filesystem/Filesystem_Linux.h
@@ -0,0 +1,106 @@
+/*  Filesystem
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <limits.h>
+#include <vector>
+#include <sstream>
+#include <fstream>
+#include <unistd.h>
+#include "Common/Cpp/Strings/StringTools.h"
+#include "FilePath.h"
+#include "Filesystem.h"
+
+namespace PokemonAutomation{
+namespace Filesystem{
+
+
+Path application_binary_path(){
+    char buffer[PATH_MAX];
+    ssize_t count = readlink("/proc/self/exe", buffer, PATH_MAX);
+    if (count != -1){
+        return Path(std::string(buffer, count));
+    }
+    return Path();
+}
+Path application_install_path(){
+    // Check for AppImage environment variables to find the root directory, if running as an AppImage.
+    // PA_APPIMAGE_DIR is set by Azure via a patched AppRun script.
+    {
+        char* dir = std::getenv("PA_APPIMAGE_DIR");
+        if (dir != nullptr){
+            return dir;
+        }
+    }
+    {
+        char* path = std::getenv("APPIMAGE");
+        if (path != nullptr){
+            return std::filesystem::absolute(path).parent_path().lexically_normal();
+        }
+    }
+    {
+        char* app_dir = std::getenv("APPDIR");
+        if (app_dir != nullptr){
+            std::ifstream mount_info(Filesystem::Path("/proc/self/mountinfo").stdpath());
+            if (mount_info.is_open()){
+                std::string line;
+                while (std::getline(mount_info, line)){
+                    size_t dash_sep = line.find(" - ");
+                    if (dash_sep == std::string::npos){
+                        continue;
+                    }
+
+                    // 1. Extract and tokenize the "pre" segment (before " - ")
+                    std::vector<std::string> pre;
+                    {
+                        std::string pre_str = line.substr(0, dash_sep);
+                        std::stringstream ss(pre_str);
+                        std::string token;
+                        while (ss >> token){
+                            pre.push_back(token);
+                        }
+                    }
+
+                    // 2. Extract and tokenize the "post" segment (after " - ")
+                    std::vector<std::string> post;
+                    {
+                        std::string post_str = line.substr(dash_sep + 3);
+                        std::stringstream ss(post_str);
+                        std::string token;
+                        while (ss >> token){
+                            post.push_back(token);
+                        }
+                    }
+
+                    // 3. Validation bounds check
+                    if (pre.size() < 5 || post.size() < 2){
+                        continue;
+                    }
+
+                    // 4. Clean out octal space encodings using standard string operations
+                    std::string mount_point = StringTools::replace(pre[4], "\\040", " ");
+                    std::string source = StringTools::replace(post[1], "\\040", " ");
+
+                    if (mount_point == app_dir && source.ends_with(".AppImage")){
+                        Filesystem::Path dir_path = Filesystem::Path(source).parent_path();
+                        Filesystem::Path abs_path = Filesystem::absolute(dir_path);
+                        return abs_path.lexically_normal();
+                    }
+                }
+            }
+        }
+    }
+
+    //  Fallback
+    return application_binary_directory();
+}
+Path application_scratch_path(){
+    return current_path().string_slash_normalized() + "/";
+}
+
+
+
+}
+}
diff --git a/Common/Cpp/Filesystem/Filesystem_Mac.h b/Common/Cpp/Filesystem/Filesystem_Mac.h
new file mode 100644
index 0000000000..a9dbc281ab
--- /dev/null
+++ b/Common/Cpp/Filesystem/Filesystem_Mac.h
@@ -0,0 +1,155 @@
+/*  Filesystem
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <limits.h>
+#include <vector>
+#include <unistd.h>
+#include <libproc.h>
+#include <mach-o/dyld.h>
+#include <CoreFoundation/CoreFoundation.h>
+#include <CoreFoundation/CFBundle.h>
+#include "FilePath.h"
+#include "Filesystem.h"
+
+namespace PokemonAutomation{
+namespace Filesystem{
+
+
+
+static std::string g_startup_profile;
+
+void set_startup_profile(int& argc, char* argv[]){
+    for (int i = 1; i + 1 < argc; i++){
+        if (strcmp(argv[i], "--profile") == 0){
+            std::string profile = argv[i + 1];
+            for (char c : profile){
+                if (!(std::isalpha(c) || std::isdigit(c)) && c != u'_' && c != u'-') c = u'_';
+            }
+            g_startup_profile = std::move(profile);
+            // Shift everything after --profile <name> down by 2.
+            for (int j = i; j + 2 < argc; j++){
+                argv[j] = argv[j + 2];
+            }
+            argc -= 2;
+            return;
+        }
+    }
+}
+
+const std::string& STARTUP_PROFILE(){
+    return g_startup_profile;
+}
+
+
+// Helper function to safely get the current executable's name on macOS
+std::string get_macos_executable_name(){
+    char path_buffer[PROC_PIDPATHINFO_MAXSIZE];
+    pid_t pid = getpid();
+
+    if (proc_pidpath(pid, path_buffer, sizeof(path_buffer)) > 0){
+        Filesystem::Path full_path(path_buffer);
+        return full_path.filename().string(); // Returns the binary name (e.g., "SerialPrograms")
+    }
+
+    return "UnknownApp"; // Worst-case fallback
+}
+
+
+
+
+
+
+
+
+
+Path application_binary_path(){
+    char buffer[PATH_MAX];
+    uint32_t size = sizeof(buffer);
+    if (_NSGetExecutablePath(buffer, &size) == 0){
+        return std::filesystem::canonical(std::filesystem::path(buffer));
+    }
+    return Path();
+}
+
+
+
+std::filesystem::path CFString_to_path(CFStringRef cfString){
+    if (!cfString){
+        return {};
+    }
+
+    // 1. Get the exact buffer size needed for the file system representation
+    CFIndex maxLength = CFStringGetMaximumSizeOfFileSystemRepresentation(cfString);
+
+    // 2. Allocate a buffer to store the raw file system bytes
+    std::vector<char> buffer(maxLength);
+
+    // 3. Extract the file system representation directly into the buffer
+    if (CFStringGetFileSystemRepresentation(cfString, buffer.data(), buffer.size())){
+        return std::filesystem::path(buffer.data());
+    }
+
+    // Fallback: If file-system specific translation failed, try standard UTF-8 text extraction
+    CFIndex length = CFStringGetLength(cfString);
+    CFIndex maxSize = CFStringGetMaximumSizeForEncoding(length, kCFStringEncodingUTF8) + 1;
+    std::vector<char> fallbackBuffer(maxSize);
+
+    if (CFStringGetCString(cfString, fallbackBuffer.data(), fallbackBuffer.size(), kCFStringEncodingUTF8)){
+        return std::filesystem::path(fallbackBuffer.data());
+    }
+
+    return {};
+}
+Path application_install_path(){
+    //  Use CFBundle to find the .app bundle path.
+    //  Change working directory to the folder that hosts the .app bundle.
+    CFURLRef bundleURL = CFBundleCopyBundleURL(CFBundleGetMainBundle());
+    if (bundleURL){
+        CFStringRef cfPath = CFURLCopyFileSystemPath(bundleURL, kCFURLPOSIXPathStyle);
+        CFRelease(bundleURL);
+        if (cfPath){
+            std::filesystem::path bundlePath = CFString_to_path(cfPath);
+            CFRelease(cfPath);
+            if (bundlePath.extension() == ".app"){
+                return std::filesystem::absolute(bundlePath).parent_path().lexically_normal();
+            }
+        }
+    }
+
+    //  Fallback
+    return application_binary_directory();
+}
+Path application_scratch_path(){
+    // 1. Replicate Home folder resolution (~/)
+    const char* home_env = std::getenv("HOME");
+    Filesystem::Path app_support_path;
+
+    if (home_env != nullptr){
+        app_support_path = Filesystem::Path(home_env);
+    }else{
+        app_support_path = Filesystem::current_path();
+    }
+
+    // 2. Replicate standard macOS AppDataLocation structure programmatically
+    std::string app_name = get_macos_executable_name();
+    app_support_path = app_support_path / "Library" / "Application Support" / app_name;
+
+    // 3. Append your profile path
+    if (!g_startup_profile.empty()){
+        app_support_path /= "Profiles";
+        app_support_path /= g_startup_profile;
+    }
+
+    // 4. Create directory structure
+    Filesystem::create_directories(app_support_path);
+
+    return app_support_path.string() + "/";
+}
+
+
+
+}
+}
diff --git a/Common/Cpp/Filesystem/Filesystem_Qt.h b/Common/Cpp/Filesystem/Filesystem_Qt.h
new file mode 100644
index 0000000000..ca575f807d
--- /dev/null
+++ b/Common/Cpp/Filesystem/Filesystem_Qt.h
@@ -0,0 +1,29 @@
+/*  Filesystem
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <QCoreApplication>
+#include "FilePath.h"
+#include "Filesystem.h"
+
+namespace PokemonAutomation{
+namespace Filesystem{
+
+
+Path application_binary_path(){
+    QString application_dir_path = qApp->applicationFilePath();
+    return Path(application_dir_path.toStdString());
+}
+Path application_install_path(){
+    return application_binary_directory();
+}
+Path application_scratch_path(){
+    return current_path().string_slash_normalized() + "/";
+}
+
+
+
+}
+}
diff --git a/Common/Cpp/Filesystem/Filesystem_Windows.h b/Common/Cpp/Filesystem/Filesystem_Windows.h
new file mode 100644
index 0000000000..5d9481055a
--- /dev/null
+++ b/Common/Cpp/Filesystem/Filesystem_Windows.h
@@ -0,0 +1,30 @@
+/*  Filesystem
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <Windows.h>
+#include "FilePath.h"
+#include "Filesystem.h"
+
+namespace PokemonAutomation{
+namespace Filesystem{
+
+
+Path application_binary_path(){
+    wchar_t buffer[MAX_PATH];
+    GetModuleFileNameW(nullptr, buffer, MAX_PATH);
+    return std::filesystem::path(buffer);
+}
+Path application_install_path(){
+    return application_binary_directory();
+}
+Path application_scratch_path(){
+    return current_path().string_slash_normalized() + "/";
+}
+
+
+
+}
+}
diff --git a/Common/Cpp/Hardware/FloatingPointMode.h b/Common/Cpp/Hardware/FloatingPointMode.h
new file mode 100644
index 0000000000..3295adfc2f
--- /dev/null
+++ b/Common/Cpp/Hardware/FloatingPointMode.h
@@ -0,0 +1,106 @@
+/*  Floating-Point Mode
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  Turn on flush-to-zero for denormal floats on the current thread.
+ *
+ *  Denormal (subnormal) floats are nonzero values too small for the normal float
+ *  format: below about 1.2e-38 for float. Intel CPUs handle many operations on one
+ *  in microcode, which is many times slower than normal float math. AMD and Apple
+ *  CPUs pay much less. The large PaddleOCR model for Chinese and Japanese produces
+ *  them: on the Mac Intel CI runner (an i7-8700B), each of those OCR tests took
+ *  35-185 s, and under 5 s with flush-to-zero.
+ *
+ *  With flush-to-zero, the CPU treats denormal inputs as zero and rounds denormal
+ *  results to zero. Model inference doesn't need values that small.
+ *
+ *  This program turns it on only while ONNX Runtime runs a model:
+ *  - on ONNX Runtime's own thread pool, with `SetGlobalDenormalAsZero()` in
+ *    ML/Models/ML_OrtEnv.cpp, and
+ *  - on the thread that calls `Run()`, for the length of the call, with
+ *    `FlushDenormalsToZeroScope`.
+ *  All other code keeps the default floating-point behavior.
+ *
+ *  The mode belongs to each thread:
+ *  - x86-64: the FTZ and DAZ bits of MXCSR, which control SSE and AVX math.
+ *  - ARM64 (GCC and Clang): the FZ bit of FPCR, which controls scalar and NEON math.
+ *  - Anywhere else, these functions do nothing.
+ *
+ */
+
+#ifndef PokemonAutomation_Hardware_FloatingPointMode_H
+#define PokemonAutomation_Hardware_FloatingPointMode_H
+
+#include <stdint.h>
+#if defined(__x86_64__) || defined(_M_X64)
+#include <xmmintrin.h>
+#endif
+
+namespace PokemonAutomation{
+
+
+// Return the current thread's floating-point control register, so it can be
+// restored later with `set_floating_point_control()`.
+inline uint64_t get_floating_point_control(){
+#if defined(__x86_64__) || defined(_M_X64)
+    return _mm_getcsr();
+#elif defined(__aarch64__)
+    uint64_t fpcr;
+    __asm__ __volatile__("mrs %0, fpcr" : "=r"(fpcr));
+    return fpcr;
+#else
+    return 0;
+#endif
+}
+
+// Restore a value returned by `get_floating_point_control()`.
+inline void set_floating_point_control(uint64_t value){
+#if defined(__x86_64__) || defined(_M_X64)
+    _mm_setcsr((unsigned int)value);
+#elif defined(__aarch64__)
+    __asm__ __volatile__("msr fpcr, %0" : : "r"(value));
+#else
+    (void)value;
+#endif
+}
+
+// Turn on flush-to-zero for denormal floats on the current thread, until the
+// thread ends or the mode is changed again. Prefer `FlushDenormalsToZeroScope`,
+// which restores the previous mode.
+inline void enable_flush_denormals_to_zero(){
+#if defined(__x86_64__) || defined(_M_X64)
+    //  0x8000: FTZ, flush denormal results to zero.
+    //  0x0040: DAZ, treat denormal inputs as zero.
+    _mm_setcsr(_mm_getcsr() | 0x8040);
+#elif defined(__aarch64__)
+    //  Bit 24: FZ, flush denormal inputs and results to zero.
+    set_floating_point_control(get_floating_point_control() | ((uint64_t)1 << 24));
+#endif
+}
+
+
+// Turn on flush-to-zero on the current thread for this object's lifetime, then
+// restore the previous mode. Wrap each ONNX Runtime `Run()` call in one: ONNX
+// Runtime runs part of each inference on the calling thread, which can be any
+// thread in this program, and its own thread pool doesn't cover that part.
+class FlushDenormalsToZeroScope{
+public:
+    FlushDenormalsToZeroScope(const FlushDenormalsToZeroScope&) = delete;
+    void operator=(const FlushDenormalsToZeroScope&) = delete;
+
+    FlushDenormalsToZeroScope()
+        : m_saved(get_floating_point_control())
+    {
+        enable_flush_denormals_to_zero();
+    }
+    ~FlushDenormalsToZeroScope(){
+        set_floating_point_control(m_saved);
+    }
+
+private:
+    uint64_t m_saved;
+};
+
+
+}
+#endif
diff --git a/Common/Cpp/Hardware/Hardware.cpp b/Common/Cpp/Hardware/Hardware.cpp
new file mode 100644
index 0000000000..2f04cac5fb
--- /dev/null
+++ b/Common/Cpp/Hardware/Hardware.cpp
@@ -0,0 +1,38 @@
+/*  Hardware
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+#include "Common/Cpp/CpuId/CpuId.h"
+
+#if _M_IX86 || _M_X64 || __i386__ || __x86_64__
+#include "Hardware_x86.tpp"
+#endif
+
+#if _WIN32
+#ifdef PA_ARCH_x86
+#include "Hardware_x86_Windows.tpp"
+#endif
+#endif
+
+#if defined(__linux) || defined(__APPLE__)
+#ifdef PA_ARCH_x86
+#include "Hardware_x86_Linux.tpp"
+#elif PA_ARCH_arm64
+#ifdef __APPLE__
+#include "Hardware_arm64_Mac.tpp"
+#else
+#include "Hardware_arm64_Linux.tpp"
+#endif
+#endif
+#endif
+
+
+namespace PokemonAutomation{
+
+
+
+
+
+
+}
diff --git a/Common/Cpp/Hardware/Hardware.h b/Common/Cpp/Hardware/Hardware.h
new file mode 100644
index 0000000000..fbbe681796
--- /dev/null
+++ b/Common/Cpp/Hardware/Hardware.h
@@ -0,0 +1,38 @@
+/*  Hardware
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Hardware_H
+#define PokemonAutomation_Hardware_H
+
+#include <string>
+
+
+namespace PokemonAutomation{
+
+
+
+
+std::string get_processor_name();
+struct ProcessorSpecs{
+    std::string name;
+    size_t threads = 0;
+    size_t cores = 0;
+    size_t sockets = 0;
+    size_t numa_nodes = 0;
+    size_t base_frequency = 0;
+};
+ProcessorSpecs get_processor_specs();
+
+
+
+
+
+
+
+
+
+}
+#endif
diff --git a/Common/Cpp/Hardware/Hardware_arm64_Linux.tpp b/Common/Cpp/Hardware/Hardware_arm64_Linux.tpp
new file mode 100644
index 0000000000..4e50794c02
--- /dev/null
+++ b/Common/Cpp/Hardware/Hardware_arm64_Linux.tpp
@@ -0,0 +1,76 @@
+/*  Hardware (arm64 Linux)
+ *
+ *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *
+ *  Used for Linux aarch64 environment.
+ */
+
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <string>
+#include <fstream>
+#include <thread>
+#include "Hardware.h"
+
+namespace PokemonAutomation{
+
+
+// Linux: /proc/cpuinfo does not have a "Model name" line on ARM kernels,
+// so fall back to the SoC "Hardware" line, and finally the kernel name.
+
+static std::string cpuinfo_value(const std::string& file_path, const std::string& key){
+    std::ifstream file(file_path);
+    std::string line;
+    while (std::getline(file, line)){
+        if (line.rfind(key, 0) == 0){
+            size_t pos = line.find(": ");
+            if (pos == std::string::npos){
+                return "";
+            }
+            return line.substr(pos + 2);
+        }
+    }
+    return "";
+}
+
+uint64_t get_cpu_freq(){
+    // /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq is in kHz.
+    std::string max_freq = cpuinfo_value("/sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq", "");
+    if (!max_freq.empty()){
+        return (uint64_t)atoll(max_freq.c_str()) * 1000ULL;
+    }
+
+    // Fallback: "cpu MHz" in /proc/cpuinfo.
+    std::string mhz = cpuinfo_value("/proc/cpuinfo", "cpu MHz");
+    if (!mhz.empty()){
+        return (uint64_t)(atof(mhz.c_str()) * 1000000.);
+    }
+
+    return 0;
+}
+
+std::string get_processor_name(){
+    std::string name = cpuinfo_value("/proc/cpuinfo", "Model name");
+    if (name.empty()){
+        name = cpuinfo_value("/proc/cpuinfo", "Hardware");
+    }
+    if (name.empty()){
+        name = "aarch64";
+    }
+    return name;
+}
+
+
+ProcessorSpecs get_processor_specs(){
+    ProcessorSpecs specs;
+    specs.name = get_processor_name();
+    specs.base_frequency = get_cpu_freq();
+    specs.threads = std::thread::hardware_concurrency();
+
+    return specs;
+}
+
+
+}
diff --git a/Common/Cpp/Hardware/Hardware_arm64_Mac.tpp b/Common/Cpp/Hardware/Hardware_arm64_Mac.tpp
new file mode 100644
index 0000000000..dec0c974e1
--- /dev/null
+++ b/Common/Cpp/Hardware/Hardware_arm64_Mac.tpp
@@ -0,0 +1,51 @@
+/*  Hardware (arm64 Mac)
+ *
+ *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *
+ *  Used for Apple M-series (macOS) environment.
+ */
+
+
+#include <stdio.h>
+#include <stdint.h>
+#include <thread>
+#include <sys/sysctl.h>
+#include "Hardware.h"
+
+namespace PokemonAutomation{
+
+
+uint64_t get_cpu_freq()
+{
+    uint64_t freq = 0;
+    size_t size = sizeof(freq);
+
+    if (sysctlbyname("hw.cpufrequency", &freq, &size, NULL, 0) < 0)
+    {
+        perror("sysctl");
+    }
+    return freq;
+}
+
+std::string get_processor_name(){
+    char name_buffer[100] = "";
+    size_t size = 100;
+    if (sysctlbyname("machdep.cpu.brand_string", name_buffer, &size, NULL, 0) < 0)
+    {
+        perror("sysctl");
+    }
+    return name_buffer;
+}
+
+
+ProcessorSpecs get_processor_specs(){
+    ProcessorSpecs specs;
+    specs.name = get_processor_name();
+    specs.base_frequency = get_cpu_freq();
+    specs.threads = std::thread::hardware_concurrency();
+
+    return specs;
+}
+
+
+}
diff --git a/Common/Cpp/Hardware/Hardware_x86.tpp b/Common/Cpp/Hardware/Hardware_x86.tpp
new file mode 100644
index 0000000000..3f10cbdfcc
--- /dev/null
+++ b/Common/Cpp/Hardware/Hardware_x86.tpp
@@ -0,0 +1,52 @@
+/*  Environment (x86)
+ *
+ *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *
+ */
+
+#include "Common/Cpp/CpuId/CpuId_x86.h"
+#include "Hardware.h"
+
+namespace PokemonAutomation{
+
+
+uint64_t x86_measure_rdtsc_ticks_per_sec();
+
+
+void x86_CleanCPUName(char name[49]){
+    size_t c0 = 0;
+    size_t c1 = 0;
+    bool space_flag = true;
+    while (c1 < 48){
+        if (space_flag && name[c1] == ' '){
+            c1++;
+            continue;
+        }
+        space_flag = name[c1] == ' ';
+        name[c0++] = name[c1++];
+    }
+
+    while (c0 < 48){
+        name[c0++] = '\0';
+    }
+}
+std::string get_processor_name(){
+    union{
+        uint32_t reg[12];
+        char name[49];
+    };
+    x86_cpuid(reg + 0, 0x80000002, 0);
+    x86_cpuid(reg + 4, 0x80000003, 0);
+    x86_cpuid(reg + 8, 0x80000004, 0);
+
+    x86_CleanCPUName(name);
+    return name;
+}
+uint64_t x86_rdtsc_ticks_per_sec(){
+    static uint64_t cached = x86_measure_rdtsc_ticks_per_sec();
+    return cached;
+}
+
+
+
+}
diff --git a/Common/Cpp/Hardware/Hardware_x86_Linux.tpp b/Common/Cpp/Hardware/Hardware_x86_Linux.tpp
new file mode 100644
index 0000000000..4ec1b925f1
--- /dev/null
+++ b/Common/Cpp/Hardware/Hardware_x86_Linux.tpp
@@ -0,0 +1,119 @@
+/*  Environment (x86 Linux)
+ *
+ *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *
+ */
+
+#include <set>
+#include <map>
+#include <thread>
+#include <fstream>
+#include <iostream>
+#include <sys/types.h>
+#include <unistd.h>
+#include <sched.h>
+#include "Common/Cpp/Exceptions.h"
+#include "Common/Cpp/Time.h"
+#include "CommonFramework/Logging/Logger.h"
+#include "Hardware.h"
+
+#ifndef cpuid_H
+#define cpuid_H
+#include <cpuid.h>
+#endif
+
+namespace PokemonAutomation{
+
+
+uint64_t x86_rdtsc(){
+    unsigned int lo, hi;
+    __asm__ volatile ("rdtsc" : "=a" (lo), "=d" (hi));
+    return ((uint64_t)hi << 32) | lo;
+}
+
+
+
+uint64_t x86_measure_rdtsc_ticks_per_sec(){
+//    Time::WallClock w_start = Time::WallClock::Now();
+    auto w_start = current_time();
+    uint64_t r_start = x86_rdtsc();
+    while (current_time() - w_start < std::chrono::microseconds(62500));
+    auto w_end = current_time();
+//    while (w_start.SecondsElapsed() < 0.0625);
+//    Time::WallClock w_end = Time::WallClock::Now();
+    uint64_t r_end = x86_rdtsc();
+
+    auto elapsed = std::chrono::duration_cast<std::chrono::microseconds>(w_end - w_start);
+    double seconds = (double)elapsed.count() / 1000000.;
+
+    return (uint64_t)((double)(r_end - r_start) / seconds);
+}
+
+
+
+
+
+ProcessorSpecs get_processor_specs(){
+    ProcessorSpecs specs;
+    specs.name = get_processor_name();
+    specs.base_frequency = x86_rdtsc_ticks_per_sec();
+    specs.threads = std::thread::hardware_concurrency();
+
+#ifdef __linux
+    //  Cores + Sockets
+    {
+//        std::set<int> cores;
+        std::set<int> sockets;
+
+        int current_socket = 0;
+        std::map<int, std::set<int>> cores_per_socket;
+
+        std::ifstream file("/proc/cpuinfo");
+        std::string line;
+        while (std::getline(file, line)){
+            if (line.find("physical id") == 0){
+                size_t pos = line.find(": ");
+                if (pos == std::string::npos){
+                    throw InternalSystemError(nullptr, PA_CURRENT_FUNCTION, "Unable to parse: /proc/cpuinfo");
+                }
+                current_socket = atoi(&line[pos + 2]);
+                sockets.insert(current_socket);
+            }
+            if (line.find("core id") == 0){
+                size_t pos = line.find(": ");
+                if (pos == std::string::npos){
+                    throw InternalSystemError(nullptr, PA_CURRENT_FUNCTION, "Unable to parse: /proc/cpuinfo");
+                }
+//                specs.threads++;
+                int core = atoi(&line[pos + 2]);
+                cores_per_socket[current_socket].insert(core);
+//                cores.insert(core);
+            }
+        }
+        specs.sockets = sockets.size();
+        specs.cores = 0;
+        for (const auto& socket : cores_per_socket){
+            specs.cores += socket.second.size();
+        }
+    }
+
+    //  NUMA Nodes
+    {
+        std::set<int> nodes;
+
+        std::ifstream file("/proc/zoneinfo");
+        std::string line;
+        while (std::getline(file, line)){
+            if (line.find("Node ") == 0){
+                nodes.insert(atoi(&line[5]));
+            }
+        }
+        specs.numa_nodes = nodes.size();
+    }
+#endif
+
+    return specs;
+}
+
+
+}
diff --git a/Common/Cpp/Hardware/Hardware_x86_Windows.tpp b/Common/Cpp/Hardware/Hardware_x86_Windows.tpp
new file mode 100644
index 0000000000..c84088fc96
--- /dev/null
+++ b/Common/Cpp/Hardware/Hardware_x86_Windows.tpp
@@ -0,0 +1,142 @@
+/*  Environment (x86 Windows)
+ *
+ *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *
+ */
+
+#include <Windows.h>
+
+#if __GNUC__
+#ifndef cpuid_H
+#define cpuid_H
+#include <cpuid.h>
+#endif
+#endif
+
+#include <map>
+#include <thread>
+#include <nmmintrin.h>
+#include "Common/Cpp/Exceptions.h"
+#include "Hardware.h"
+
+namespace PokemonAutomation{
+
+
+uint64_t x86_rdtsc(){
+    return __rdtsc();
+}
+
+
+uint64_t x86_measure_rdtsc_ticks_per_sec(){
+    HANDLE thread = GetCurrentThread();
+
+    GROUP_AFFINITY before_affinity;
+    if (GetThreadGroupAffinity(thread, &before_affinity) == 0){
+        throw InternalSystemError(nullptr, PA_CURRENT_FUNCTION, "GetThreadGroupAffinity() failed: Unable to read thread affinity.");
+    }
+
+    KAFFINITY t = 1;
+    while ((t & before_affinity.Mask) == 0){
+        t <<= 1;
+    }
+
+    GROUP_AFFINITY placeholder;
+    GROUP_AFFINITY new_affinity = before_affinity;
+    new_affinity.Mask = t;
+    if (SetThreadGroupAffinity(thread, &new_affinity, &placeholder) == 0){
+        throw InternalSystemError(nullptr, PA_CURRENT_FUNCTION, "SetThreadGroupAffinity() failed: Unable to set Affinity Mask.");
+
+    }
+
+    LARGE_INTEGER frequency;
+    if (!QueryPerformanceFrequency(&frequency)){
+        throw InternalSystemError(nullptr, PA_CURRENT_FUNCTION, "QueryPerformanceFrequency() failed: Unable to measure clock speed.");
+    }
+    uint64_t freq = frequency.QuadPart;
+    freq >>= 4;
+
+
+    uint64_t start_cycles = __rdtsc();
+
+    LARGE_INTEGER start_timer;
+    if (!QueryPerformanceCounter(&start_timer)){
+        throw InternalSystemError(nullptr, PA_CURRENT_FUNCTION, "QueryPerformanceCounter() failed: Unable to measure clock speed.");
+    }
+    LARGE_INTEGER current_timer;
+    do {
+        if (!QueryPerformanceCounter(&current_timer)){
+            throw InternalSystemError(nullptr, PA_CURRENT_FUNCTION, "QueryPerformanceCounter() failed: Unable to measure clock speed.");
+        }
+    }while ((uint64_t)current_timer.QuadPart - (uint64_t)start_timer.QuadPart < freq);
+
+    uint64_t end_cycles = __rdtsc();
+
+    if (SetThreadGroupAffinity(thread, &before_affinity, &placeholder) == 0){
+        throw InternalSystemError(nullptr, PA_CURRENT_FUNCTION, "SetThreadGroupAffinity() failed: Unable to set Affinity Mask.");
+    }
+
+    double cycle_dif = (double)(end_cycles - start_cycles);
+    double timer_dif = (double)((uint64_t)current_timer.QuadPart - (uint64_t)start_timer.QuadPart);
+
+    return (uint64_t)(cycle_dif / timer_dif * frequency.QuadPart);
+}
+
+
+
+
+
+ProcessorSpecs get_processor_specs(){
+    ProcessorSpecs specs;
+    specs.name = get_processor_name();
+    specs.base_frequency = x86_rdtsc_ticks_per_sec();
+
+    DWORD bytes = 0;
+    GetLogicalProcessorInformationEx(LOGICAL_PROCESSOR_RELATIONSHIP::RelationAll, nullptr, &bytes);
+    if (GetLastError() != ERROR_INSUFFICIENT_BUFFER){
+        throw InternalSystemError(nullptr, PA_CURRENT_FUNCTION, "GetLogicalProcessorInformationEx() failed.");
+    }
+
+    std::vector<char> ptr(bytes);
+    if (!GetLogicalProcessorInformationEx(LOGICAL_PROCESSOR_RELATIONSHIP::RelationAll, (SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX*)ptr.data(), &bytes)){
+        throw InternalSystemError(nullptr, PA_CURRENT_FUNCTION, "GetLogicalProcessorInformationEx() failed.");
+    }
+
+    std::map<size_t, KAFFINITY> group_masks;
+
+    for (size_t c = 0; c < bytes;){
+        const SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX& info = *(const SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX*)(ptr.data() + c);
+        switch (info.Relationship){
+        case LOGICAL_PROCESSOR_RELATIONSHIP::RelationProcessorCore:
+            for (size_t g = 0; g < info.Processor.GroupCount; g++){
+                const GROUP_AFFINITY& affinity = info.Processor.GroupMask[g];
+                group_masks[affinity.Group] |= affinity.Mask;
+            }
+            specs.cores++;
+            break;
+        case LOGICAL_PROCESSOR_RELATIONSHIP::RelationProcessorPackage:
+            specs.sockets++;
+            break;
+        case LOGICAL_PROCESSOR_RELATIONSHIP::RelationNumaNode:
+            specs.numa_nodes++;
+            break;
+        default:;
+        }
+        c += info.Size;
+    }
+
+    if (group_masks.size() == 0){
+        specs.threads = std::thread::hardware_concurrency();
+    }else{
+        for (const auto& group : group_masks){
+            specs.threads += _mm_popcnt_u64(group.second);
+        }
+    }
+
+    return specs;
+}
+
+
+
+
+
+}
diff --git a/Common/Cpp/ImageResolution.cpp b/Common/Cpp/ImageResolution.cpp
index 73e01de3ee..4a3e2f3b79 100644
--- a/Common/Cpp/ImageResolution.cpp
+++ b/Common/Cpp/ImageResolution.cpp
@@ -1,6 +1,6 @@
 /*  Image Resolution
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/Common/Cpp/ImageResolution.h b/Common/Cpp/ImageResolution.h
index 524d5361fe..ab72588308 100644
--- a/Common/Cpp/ImageResolution.h
+++ b/Common/Cpp/ImageResolution.h
@@ -1,6 +1,6 @@
 /*  Image Resolution
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/Common/Cpp/Json/JsonArray.cpp b/Common/Cpp/Json/JsonArray.cpp
index 9b5ae4ee57..962dc3a403 100644
--- a/Common/Cpp/Json/JsonArray.cpp
+++ b/Common/Cpp/Json/JsonArray.cpp
@@ -1,9 +1,10 @@
 /*  JSON Array
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
+#include "Common/Cpp/Filesystem/FileIO.h"
 #include "JsonArray.h"
 #include "JsonTools.h"
 
@@ -37,5 +38,19 @@ void JsonArray::dump(const std::string& filename, int indent) const{
 }
 
 
+const JsonValue& JsonArray::operator[](size_t index) const{
+    if (index >= m_data.size()){
+        throw JsonParseException("", m_data.size(), index);
+    }
+    return m_data[index];
+}
+JsonValue& JsonArray::operator[](size_t index){
+    if (index >= m_data.size()){
+        throw JsonParseException("", m_data.size(), index);
+    }
+    return m_data[index];
+}
+
+
 
 }
diff --git a/Common/Cpp/Json/JsonArray.h b/Common/Cpp/Json/JsonArray.h
index b266bcc0d5..8165e12e35 100644
--- a/Common/Cpp/Json/JsonArray.h
+++ b/Common/Cpp/Json/JsonArray.h
@@ -1,6 +1,6 @@
 /*  JSON Array
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -26,6 +26,24 @@ class JsonArray{
 public:
     JsonArray clone() const;
 
+    //  Structurally compare two arrays.
+    friend bool operator==(const JsonArray& x, const JsonArray& y){
+        if (x.m_data.size() != y.m_data.size()){
+            return false;
+        }
+        auto itx = x.m_data.cbegin();
+        auto ity = y.m_data.cbegin();
+        for (; itx != x.m_data.cend(); ++itx, ++ity){
+            if (!(*itx == *ity)){
+                return false;
+            }
+        }
+        return true;
+    }
+    friend bool operator!=(const JsonArray& x, const JsonArray& y){
+        return !(x == y);
+    }
+
 public:
     std::string dump(int indent = 4) const;
     void dump(const std::string& filename, int indent = 4) const;
@@ -33,8 +51,8 @@ class JsonArray{
     bool    empty   () const{ return m_data.empty(); }
     size_t  size    () const{ return m_data.size(); }
 
-    const JsonValue& operator[](size_t index) const{ return m_data[index]; }
-          JsonValue& operator[](size_t index)      { return m_data[index]; }
+    const JsonValue& operator[](size_t index) const;
+          JsonValue& operator[](size_t index)      ;
 
     void push_back(JsonValue&& x){ m_data.emplace_back(std::move(x)); }
 
diff --git a/Common/Cpp/Json/JsonObject.cpp b/Common/Cpp/Json/JsonObject.cpp
index d340de7041..aab62c8bfc 100644
--- a/Common/Cpp/Json/JsonObject.cpp
+++ b/Common/Cpp/Json/JsonObject.cpp
@@ -1,9 +1,10 @@
 /*  JSON Object
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
+#include "Common/Cpp/Filesystem/FileIO.h"
 #include "JsonObject.h"
 #include "JsonTools.h"
 
@@ -35,63 +36,63 @@ bool JsonObject::get_boolean_throw(const std::string& key, const std::string& fi
     if (iter == m_data.end()){
         throw JsonParseException(filename, key);
     }
-    return iter->second.get_boolean_throw(filename);
+    return iter->second.to_boolean_throw(filename);
 }
 int64_t JsonObject::get_integer_throw(const std::string& key, const std::string& filename) const{
     auto iter = m_data.find(key);
     if (iter == m_data.end()){
         throw JsonParseException(filename, key);
     }
-    return iter->second.get_integer_throw(filename);
+    return iter->second.to_integer_throw(filename);
 }
 double JsonObject::get_double_throw(const std::string& key, const std::string& filename) const{
     auto iter = m_data.find(key);
     if (iter == m_data.end()){
         throw JsonParseException(filename, key);
     }
-    return iter->second.get_double_throw(filename);
+    return iter->second.to_double_throw(filename);
 }
 const std::string& JsonObject::get_string_throw(const std::string& key, const std::string& filename) const{
     auto iter = m_data.find(key);
     if (iter == m_data.end()){
         throw JsonParseException(filename, key);
     }
-    return iter->second.get_string_throw(filename);
+    return iter->second.to_string_throw(filename);
 }
 std::string& JsonObject::get_string_throw(const std::string& key, const std::string& filename){
     auto iter = m_data.find(key);
     if (iter == m_data.end()){
         throw JsonParseException(filename, key);
     }
-    return iter->second.get_string_throw(filename);
+    return iter->second.to_string_throw(filename);
 }
 const JsonArray& JsonObject::get_array_throw(const std::string& key, const std::string& filename) const{
     auto iter = m_data.find(key);
     if (iter == m_data.end()){
         throw JsonParseException(filename, key);
     }
-    return iter->second.get_array_throw(filename);
+    return iter->second.to_array_throw(filename);
 }
 JsonArray& JsonObject::get_array_throw(const std::string& key, const std::string& filename){
     auto iter = m_data.find(key);
     if (iter == m_data.end()){
         throw JsonParseException(filename, key);
     }
-    return iter->second.get_array_throw(filename);
+    return iter->second.to_array_throw(filename);
 }
 const JsonObject& JsonObject::get_object_throw(const std::string& key, const std::string& filename) const{
     auto iter = m_data.find(key);
     if (iter == m_data.end()){
         throw JsonParseException(filename, key);
     }
-    return iter->second.get_object_throw(filename);
+    return iter->second.to_object_throw(filename);
 }
 JsonObject& JsonObject::get_object_throw(const std::string& key, const std::string& filename){
     auto iter = m_data.find(key);
     if (iter == m_data.end()){
         throw JsonParseException(filename, key);
     }
-    return iter->second.get_object_throw(filename);
+    return iter->second.to_object_throw(filename);
 }
 const JsonValue& JsonObject::get_value_throw(const std::string& key, const std::string& filename) const{
     auto iter = m_data.find(key);
@@ -117,42 +118,42 @@ const std::string* JsonObject::get_string(const std::string& key) const{
     if (iter == m_data.end()){
         return nullptr;
     }
-    return iter->second.get_string();
+    return iter->second.to_string();
 }
 std::string* JsonObject::get_string(const std::string& key){
     auto iter = m_data.find(key);
     if (iter == m_data.end()){
         return nullptr;
     }
-    return iter->second.get_string();
+    return iter->second.to_string();
 }
 const JsonArray* JsonObject::get_array(const std::string& key) const{
     auto iter = m_data.find(key);
     if (iter == m_data.end()){
         return nullptr;
     }
-    return iter->second.get_array();
+    return iter->second.to_array();
 }
 JsonArray* JsonObject::get_array(const std::string& key){
     auto iter = m_data.find(key);
     if (iter == m_data.end()){
         return nullptr;
     }
-    return iter->second.get_array();
+    return iter->second.to_array();
 }
 const JsonObject* JsonObject::get_object(const std::string& key) const{
     auto iter = m_data.find(key);
     if (iter == m_data.end()){
         return nullptr;
     }
-    return iter->second.get_object();
+    return iter->second.to_object();
 }
 JsonObject* JsonObject::get_object(const std::string& key){
     auto iter = m_data.find(key);
     if (iter == m_data.end()){
         return nullptr;
     }
-    return iter->second.get_object();
+    return iter->second.to_object();
 }
 const JsonValue* JsonObject::get_value(const std::string& key) const{
     auto iter = m_data.find(key);
@@ -171,27 +172,24 @@ JsonValue* JsonObject::get_value(const std::string& key){
 
 
 
-#if 0
-
 //  Read with defaults.
 
-bool JsonObject::to_boolean(const std::string& key, bool default_value) const{
+bool JsonObject::get_boolean_default(const std::string& key, bool default_value) const{
     read_boolean(default_value, key);
     return default_value;
 }
-int64_t JsonObject::to_integer(const std::string& key, int64_t default_value) const{
+int64_t JsonObject::get_integer_default(const std::string& key, int64_t default_value) const{
     read_integer(default_value, key);
     return default_value;
 }
-double JsonObject::to_double(const std::string& key, double default_value) const{
+double JsonObject::get_double_default(const std::string& key, double default_value) const{
     read_float(default_value, key);
     return default_value;
 }
-std::string JsonObject::to_string(const std::string& key, const char* default_value) const{
+std::string JsonObject::get_string_default(const std::string& key, const char* default_value) const{
     const std::string* str = get_string(key);
     return str == nullptr ? default_value : *str;
 }
-#endif
 
 
 
diff --git a/Common/Cpp/Json/JsonObject.h b/Common/Cpp/Json/JsonObject.h
index 5a666c28e7..421c702bbd 100644
--- a/Common/Cpp/Json/JsonObject.h
+++ b/Common/Cpp/Json/JsonObject.h
@@ -1,6 +1,6 @@
 /*  JSON Object
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -18,6 +18,25 @@ class JsonObject{
     JsonObject() = default;
     JsonObject(JsonObject&& x) = default;
     JsonObject& operator=(JsonObject&& x) = default;
+
+    //  Structurally compare two objects.
+    friend bool operator==(const JsonObject& x, const JsonObject& y){
+        if (x.m_data.size() != y.m_data.size()){
+            return false;
+        }
+        auto itx = x.m_data.cbegin();
+        auto ity = y.m_data.cbegin();
+        for (; itx != x.m_data.cend(); ++itx, ++ity){
+            if (itx->first != ity->first || !(itx->second == ity->second)){
+                return false;
+            }
+        }
+        return true;
+    }
+    friend bool operator!=(const JsonObject& x, const JsonObject& y){
+        return !(x == y);
+    }
+
 private:
     //  Private to avoid accidental copying.
     JsonObject(const JsonObject& x);
@@ -60,13 +79,11 @@ class JsonObject{
     const JsonValue*    get_value   (const std::string& key) const;
           JsonValue*    get_value   (const std::string& key);
 
-#if 0
     //  Convert to the specified type. If the type doesn't match, return the default.
-    bool        to_boolean  (const std::string& key, bool default_value = false) const;
-    int64_t     to_integer  (const std::string& key, int64_t default_value = 0) const;
-    double      to_double   (const std::string& key, double default_value = 0) const;
-    std::string to_string   (const std::string& key, const char* default_value = "") const;
-#endif
+    bool        get_boolean_default (const std::string& key, bool default_value = false) const;
+    int64_t     get_integer_default (const std::string& key, int64_t default_value = 0) const;
+    double      get_double_default  (const std::string& key, double default_value = 0) const;
+    std::string get_string_default  (const std::string& key, const char* default_value = "") const;
 
     //  Attempt to read this value at the specified key.
     //  If the key exists and the type matches, the value is assigned to "value" and returns true.
diff --git a/Common/Cpp/Json/JsonTools.cpp b/Common/Cpp/Json/JsonTools.cpp
index 61920bee35..24313a92c7 100644
--- a/Common/Cpp/Json/JsonTools.cpp
+++ b/Common/Cpp/Json/JsonTools.cpp
@@ -1,13 +1,9 @@
 /*  JSON Tools
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include <QJsonValue>
-#include <QJsonArray>
-#include <QJsonObject>
-#include <QFile>
 #include "Common/Cpp/Exceptions.h"
 #include "JsonTools.h"
 #include "JsonArray.h"
@@ -17,36 +13,6 @@ namespace PokemonAutomation{
 
 
 
-void string_to_file(const std::string& filename, const std::string& str){
-    std::string json_out = "\xef\xbb\xbf";
-    //  Convert to CRLF.
-    char previous = 0;
-    for (char ch : str){
-        if (ch == '\n' && previous != '\r'){
-            json_out += '\r';
-        }
-        json_out += ch;
-        previous = ch;
-    }
-
-    QFile file(QString::fromStdString(filename));
-    if (!file.open(QFile::WriteOnly)){
-        throw FileException(nullptr, PA_CURRENT_FUNCTION, "Unable to create file.", filename);
-    }
-    if (file.write(json_out.c_str(), json_out.size()) != (int)json_out.size()){
-        throw FileException(nullptr, PA_CURRENT_FUNCTION, "Unable to write file.", filename);
-    }
-    file.close();
-}
-std::string file_to_string(const std::string& filename){
-    QFile file(QString::fromStdString(filename));
-    if (!file.open(QFile::ReadOnly)){
-        throw FileException(nullptr, PA_CURRENT_FUNCTION, "Unable to open file.", filename);
-    }
-    return file.readAll().toStdString();
-}
-
-
 
 
 JsonValue from_nlohmann(const nlohmann::json& json){
@@ -112,14 +78,14 @@ nlohmann::json to_nlohmann(const JsonValue& json){
     }
     if (json.is_array()){
         nlohmann::json::array_t ret;
-        for (const auto& item : *json.get_array()){
+        for (const auto& item : *json.to_array()){
             ret.emplace_back(to_nlohmann(item));
         }
         return ret;
     }
     if (json.is_object()){
         nlohmann::json ret;
-        for (const auto& item : *json.get_object()){
+        for (const auto& item : *json.to_object()){
             ret[item.first] = to_nlohmann(item.second);
         }
         return ret;
@@ -128,84 +94,6 @@ nlohmann::json to_nlohmann(const JsonValue& json){
 }
 
 
-JsonValue from_QJson(const QJsonValue& json){
-    if (json.isNull()){
-        return JsonValue();
-    }
-    if (json.isBool()){
-        return JsonValue(json.toBool());
-    }
-    if (json.isDouble()){
-        double value = json.toDouble();
-        return value == (int64_t)value
-            ? JsonValue(json.toInt())
-            : JsonValue(value);
-    }
-    if (json.isString()){
-        return JsonValue(json.toString().toStdString());
-    }
-    if (json.isArray()){
-        JsonArray array;
-        for (QJsonValueRef item : json.toArray()){
-            array.push_back(from_QJson(item));
-        }
-        return array;
-    }
-    if (json.isObject()){
-        QJsonObject obj = json.toObject();
-        JsonObject object;
-        for (auto it = obj.begin(); it != obj.end(); ++it){
-            object[it.key().toStdString()] = from_QJson(it.value());
-        }
-        return object;
-    }
-    return JsonValue();
-}
-QJsonValue to_QJson(const JsonValue& json){
-    if (json.is_null()){
-        return QJsonValue();
-    }
-    {
-        bool value;
-        if (json.read_boolean(value)){
-            return value;
-        }
-    }
-    {
-        qint64 value;
-        if (json.read_integer(value)){
-            return value;
-        }
-    }
-    {
-        double value;
-        if (json.read_float(value)){
-            return value;
-        }
-    }
-    {
-        std::string value;
-        if (json.read_string(value)){
-            return QString::fromStdString(value);
-        }
-    }
-    if (json.is_array()){
-        QJsonArray ret;
-        for (const auto& item : *json.get_array()){
-            ret.append(to_QJson(item));
-        }
-        return ret;
-    }
-    if (json.is_object()){
-        QJsonObject ret;
-        for (const auto& item : *json.get_object()){
-            ret.insert(QString::fromStdString(item.first), to_QJson(item.second));
-        }
-        return ret;
-    }
-    return QJsonValue();
-}
-
 
 
 
diff --git a/Common/Cpp/Json/JsonTools.h b/Common/Cpp/Json/JsonTools.h
index 28ea1a37b5..93b77b526c 100644
--- a/Common/Cpp/Json/JsonTools.h
+++ b/Common/Cpp/Json/JsonTools.h
@@ -1,30 +1,21 @@
 /*  JSON Tools
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifndef PokemonAutomation_Common_Json_JsonTools_H
 #define PokemonAutomation_Common_Json_JsonTools_H
 
-#include <vector>
-#include "3rdParty/nlohmann/json.hpp"
+#include "3rdParty-Core/nlohmann/json.hpp"
 #include "JsonValue.h"
 
-class QJsonValue;
-
 namespace PokemonAutomation{
 
 
-void string_to_file(const std::string& filename, const std::string& str);
-std::string file_to_string(const std::string& filename);
-
 JsonValue from_nlohmann(const nlohmann::json& json);
 nlohmann::json to_nlohmann(const JsonValue& json);
 
-JsonValue from_QJson(const QJsonValue& json);
-QJsonValue to_QJson(const JsonValue& json);
-
 
 }
 #endif
diff --git a/Common/Cpp/Json/JsonValue.cpp b/Common/Cpp/Json/JsonValue.cpp
index 5bdb5af73d..d7d99df846 100644
--- a/Common/Cpp/Json/JsonValue.cpp
+++ b/Common/Cpp/Json/JsonValue.cpp
@@ -1,15 +1,20 @@
 /*  JSON Value
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include "3rdParty/nlohmann/json.hpp"
+#include "3rdParty-Core/nlohmann/json.hpp"
+#include "Common/Cpp/Filesystem/FileIO.h"
 #include "JsonValue.h"
 #include "JsonArray.h"
 #include "JsonObject.h"
 #include "JsonTools.h"
 
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
 namespace PokemonAutomation{
 
 
@@ -38,6 +43,17 @@ JsonParseException::JsonParseException(
         m_message += filename;
     }
 }
+JsonParseException::JsonParseException(
+    const std::string& filename,
+    size_t size, size_t index
+)
+    : ParseException("Index Out-of-Bounds: size = " + std::to_string(size) + ", index = " + std::to_string(index))
+{
+    if (!filename.empty()){
+        m_message += "\n\n";
+        m_message += filename;
+    }
+}
 JsonParseException::JsonParseException(
     const std::string& filename,
     const std::string& key
@@ -185,19 +201,19 @@ JsonValue::JsonValue(JsonObject&& x)
 
 //  Get with exception.
 
-bool JsonValue::get_boolean_throw(const std::string& filename) const{
+bool JsonValue::to_boolean_throw(const std::string& filename) const{
     if (m_type == JsonType::BOOLEAN){
         return u.m_bool;
     }
     throw JsonParseException(filename, JsonType::BOOLEAN, m_type);
 }
-int64_t JsonValue::get_integer_throw(const std::string& filename) const{
+int64_t JsonValue::to_integer_throw(const std::string& filename) const{
     if (m_type == JsonType::INTEGER){
         return u.m_integer;
     }
     throw JsonParseException(filename, JsonType::INTEGER, m_type);
 }
-double JsonValue::get_double_throw(const std::string& filename) const{
+double JsonValue::to_double_throw(const std::string& filename) const{
     if (m_type == JsonType::INTEGER){
         return (double)u.m_integer;
     }
@@ -206,37 +222,37 @@ double JsonValue::get_double_throw(const std::string& filename) const{
     }
     throw JsonParseException(filename, JsonType::FLOAT, m_type);
 }
-const std::string& JsonValue::get_string_throw(const std::string& filename) const{
+const std::string& JsonValue::to_string_throw(const std::string& filename) const{
     if (m_type == JsonType::STRING){
         return *u.m_string;
     }
     throw JsonParseException(filename, JsonType::STRING, m_type);
 }
-std::string& JsonValue::get_string_throw(const std::string& filename){
+std::string& JsonValue::to_string_throw(const std::string& filename){
     if (m_type == JsonType::STRING){
         return *u.m_string;
     }
     throw JsonParseException(filename, JsonType::STRING, m_type);
 }
-const JsonArray& JsonValue::get_array_throw(const std::string& filename) const{
+const JsonArray& JsonValue::to_array_throw(const std::string& filename) const{
     if (m_type == JsonType::ARRAY){
         return *u.m_array;
     }
     throw JsonParseException(filename, JsonType::ARRAY, m_type);
 }
-JsonArray& JsonValue::get_array_throw(const std::string& filename){
+JsonArray& JsonValue::to_array_throw(const std::string& filename){
     if (m_type == JsonType::ARRAY){
         return *u.m_array;
     }
     throw JsonParseException(filename, JsonType::ARRAY, m_type);
 }
-const JsonObject& JsonValue::get_object_throw(const std::string& filename) const{
+const JsonObject& JsonValue::to_object_throw(const std::string& filename) const{
     if (m_type == JsonType::OBJECT){
         return *u.m_object;
     }
     throw JsonParseException(filename, JsonType::OBJECT, m_type);
 }
-JsonObject& JsonValue::get_object_throw(const std::string& filename){
+JsonObject& JsonValue::to_object_throw(const std::string& filename){
     if (m_type == JsonType::OBJECT){
         return *u.m_object;
     }
@@ -247,28 +263,28 @@ JsonObject& JsonValue::get_object_throw(const std::string& filename){
 
 //  Get pointer.
 
-const std::string* JsonValue::get_string() const{
+const std::string* JsonValue::to_string() const{
     if (m_type != JsonType::STRING){
         return nullptr;
     }
     return u.m_string;
 }
-std::string* JsonValue::get_string(){
+std::string* JsonValue::to_string(){
     if (m_type != JsonType::STRING){
         return nullptr;
     }
     return u.m_string;
 }
-const JsonArray* JsonValue::get_array() const{
+const JsonArray* JsonValue::to_array() const{
     return m_type == JsonType::ARRAY ? u.m_array : nullptr;
 }
-JsonArray* JsonValue::get_array(){
+JsonArray* JsonValue::to_array(){
     return m_type == JsonType::ARRAY ? u.m_array : nullptr;
 }
-const JsonObject* JsonValue::get_object() const{
+const JsonObject* JsonValue::to_object() const{
     return m_type == JsonType::OBJECT ? u.m_object : nullptr;
 }
-JsonObject* JsonValue::get_object(){
+JsonObject* JsonValue::to_object(){
     return m_type == JsonType::OBJECT ? u.m_object : nullptr;
 }
 
@@ -276,19 +292,19 @@ JsonObject* JsonValue::get_object(){
 
 //  Get with default.
 
-bool JsonValue::get_boolean_default(bool default_value) const{
+bool JsonValue::to_boolean_default(bool default_value) const{
     if (m_type == JsonType::BOOLEAN){
         return u.m_bool;
     }
     return default_value;
 }
-int64_t JsonValue::get_integer_default(int64_t default_value) const{
+int64_t JsonValue::to_integer_default(int64_t default_value) const{
     if (m_type == JsonType::INTEGER){
         return u.m_integer;
     }
     return default_value;
 }
-double JsonValue::get_double_default(double default_value) const{
+double JsonValue::to_double_default(double default_value) const{
     if (m_type == JsonType::INTEGER){
         return (double)u.m_integer;
     }
@@ -297,7 +313,7 @@ double JsonValue::get_double_default(double default_value) const{
     }
     return default_value;
 }
-std::string JsonValue::get_string_default(const char* default_value) const{
+std::string JsonValue::to_string_default(const char* default_value) const{
     if (m_type == JsonType::STRING){
         return *u.m_string;
     }
@@ -351,11 +367,42 @@ bool JsonValue::read_string(std::string& value) const{
 
 
 
+//  Equality.
+
+bool operator==(const JsonValue& x, const JsonValue& y){
+    if (x.m_type != y.m_type){
+        return false;
+    }
+    switch (x.m_type){
+    case JsonType::EMPTY:
+        return true;
+    case JsonType::BOOLEAN:
+        return x.u.m_bool == y.u.m_bool;
+    case JsonType::INTEGER:
+        return x.u.m_integer == y.u.m_integer;
+    case JsonType::FLOAT:
+        return x.u.m_float == y.u.m_float;
+    case JsonType::STRING:
+        return *x.u.m_string == *y.u.m_string;
+    case JsonType::ARRAY:
+        return *x.u.m_array == *y.u.m_array;
+    case JsonType::OBJECT:
+        return *x.u.m_object == *y.u.m_object;
+    }
+    return false;
+}
+bool operator!=(const JsonValue& x, const JsonValue& y){
+    return !(x == y);
+}
+
+
+
 JsonValue parse_json(const std::string& str){
     return from_nlohmann(nlohmann::json::parse(str, nullptr, false));
 }
-JsonValue load_json_file(const std::string& str){
-    return parse_json(file_to_string(str));
+JsonValue load_json_file(const std::string& filename){
+    std::string str = file_to_string(filename);
+    return parse_json(str);
 }
 std::string JsonValue::dump(int indent) const{
     return to_nlohmann(*this).dump(indent);
diff --git a/Common/Cpp/Json/JsonValue.h b/Common/Cpp/Json/JsonValue.h
index 1a5ef16a12..0ad4d1efe3 100644
--- a/Common/Cpp/Json/JsonValue.h
+++ b/Common/Cpp/Json/JsonValue.h
@@ -1,6 +1,6 @@
 /*  JSON Value
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -36,6 +36,10 @@ class JsonParseException : public ParseException{
         JsonType expected_type,
         JsonType actual_type
     );
+    JsonParseException( //  Out-of-bounds index.
+        const std::string& filename,
+        size_t size, size_t index
+    );
     JsonParseException( //  Missing Key
         const std::string& filename,
         const std::string& key
@@ -68,6 +72,11 @@ class JsonValue{
 public:
     JsonValue clone() const;
 
+    //  Structurally compare two values.
+    //  (Defined in JsonValue.cpp; requires the complete types of JsonArray/JsonObject.)
+    friend bool operator==(const JsonValue& x, const JsonValue& y);
+    friend bool operator!=(const JsonValue& x, const JsonValue& y);
+
 public:
     JsonValue() = default;
     JsonValue(bool x);
@@ -101,31 +110,31 @@ class JsonValue{
     bool is_object  () const{ return m_type == JsonType::OBJECT; }
 
     //  Get the value. Throws if the type doesn't match.
-    bool                get_boolean_throw   (const std::string& filename = std::string()) const;
-    int64_t             get_integer_throw   (const std::string& filename = std::string()) const;
-    double              get_double_throw    (const std::string& filename = std::string()) const;
-    const std::string&  get_string_throw    (const std::string& filename = std::string()) const;
-          std::string&  get_string_throw    (const std::string& filename = std::string());
-    const JsonArray&    get_array_throw     (const std::string& filename = std::string()) const;
-          JsonArray&    get_array_throw     (const std::string& filename = std::string());
-    const JsonObject&   get_object_throw    (const std::string& filename = std::string()) const;
-          JsonObject&   get_object_throw    (const std::string& filename = std::string());
+    bool                to_boolean_throw(const std::string& filename = std::string()) const;
+    int64_t             to_integer_throw(const std::string& filename = std::string()) const;
+    double              to_double_throw (const std::string& filename = std::string()) const;
+    const std::string&  to_string_throw (const std::string& filename = std::string()) const;
+          std::string&  to_string_throw (const std::string& filename = std::string());
+    const JsonArray&    to_array_throw  (const std::string& filename = std::string()) const;
+          JsonArray&    to_array_throw  (const std::string& filename = std::string());
+    const JsonObject&   to_object_throw (const std::string& filename = std::string()) const;
+          JsonObject&   to_object_throw (const std::string& filename = std::string());
 
     //  Get a pointer to the data for this value.
     //  If the type matches, returns the pointer.
     //  If the type does match, returns nullptr.
-    const std::string*  get_string  () const;
-          std::string*  get_string  ();
-    const JsonArray*    get_array   () const;
-          JsonArray*    get_array   ();
-    const JsonObject*   get_object  () const;
-          JsonObject*   get_object  ();
+    const std::string*  to_string   () const;
+          std::string*  to_string   ();
+    const JsonArray*    to_array    () const;
+          JsonArray*    to_array    ();
+    const JsonObject*   to_object   () const;
+          JsonObject*   to_object   ();
 
     //  Convert to the specified type. If the type doesn't match, return the default.
-    bool        get_boolean_default (bool default_value = false) const;
-    int64_t     get_integer_default (int64_t default_value = 0) const;
-    double      get_double_default  (double default_value = 0) const;
-    std::string get_string_default  (const char* default_value = "") const;
+    bool        to_boolean_default (bool default_value = false) const;
+    int64_t     to_integer_default (int64_t default_value = 0) const;
+    double      to_double_default  (double default_value = 0) const;
+    std::string to_string_default  (const char* default_value = "") const;
 
     //  Attempt to read this value as a specific type.
     //  If the type matches, the value is assigned to "value" and returns true.
@@ -156,8 +165,15 @@ class JsonValue{
     } u;
 };
 
+// Given a string as a raw JSON, parse it into a `JsonValue`.
+// If there is error parsing the JSON, it will not throw exception.
+// The input string is usually loaded directly from a JSON file.
+// You can call JsonTools.h:file_to_string() to load a file as a raw JSON string.
 JsonValue parse_json(const std::string& str);
-JsonValue load_json_file(const std::string& str);
+// Load file from `filename` and parse it into a `JsonValue`.
+// If unable to open the file, FileException is thrown
+// If there is error parsing the JSON, it will not throw exception.
+JsonValue load_json_file(const std::string& filename);
 
 
 template <typename Type>
diff --git a/Common/Cpp/LifetimeSanitizer.cpp b/Common/Cpp/LifetimeSanitizer.cpp
index 70527c6ee3..bd742f6806 100644
--- a/Common/Cpp/LifetimeSanitizer.cpp
+++ b/Common/Cpp/LifetimeSanitizer.cpp
@@ -1,179 +1,239 @@
 /*  Lifetime Sanitizer
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include <set>
+//#include <exception>
 #include <atomic>
 #include <iostream>
 #include "Concurrency/SpinLock.h"
 #include "LifetimeSanitizer.h"
 
-//#define PA_SANITIZER_PRINT_ALL
+#ifdef _WIN32
+#include <Windows.h>
+#endif
+
+
 
 namespace PokemonAutomation{
 
 
 #ifdef PA_SANITIZER_ENABLE
+//#define PA_SANITIZER_PRINT_ALL
 
-constexpr uint64_t SANITIZER_TOKEN = 0x7db76f7a6a834ef0;
 
-SpinLock sanitizer_lock;
-std::set<const LifetimeSanitizer*> sanitizer_map;
+std::atomic<bool> LifetimeSanitizer_disabled(false);
 
 
-std::atomic<bool> LifetimeSanitizer_enabled(true);
-bool LifetimeSanitizer_has_been_disabled = false;
+struct LifetimeSanitizerFields{
+    std::set<std::string> filter;
 
-void LifetimeSanitizer::set_enabled(bool enabled){
-    if (enabled){
-        LifetimeSanitizer_enabled.store(true, std::memory_order_relaxed);
-        return;
-    }
-    SpinLockGuard lg(sanitizer_lock);
-    LifetimeSanitizer_has_been_disabled = true;
-    LifetimeSanitizer_enabled.store(false, std::memory_order_relaxed);
+    SpinLock lock;
+    std::set<const LifetimeSanitizer*> map;
+
+    LifetimeSanitizerFields()
+        : filter({
+//            "MultiSwitchProgramSession",
+//            "MultiSwitchProgramWidget2",
+//            "VideoSource",
+//            "AsyncTask",
+//            "ControllerOption",
+        })
+    {}
+};
+
+LifetimeSanitizerFields& sanitizer_fields(){
+    static LifetimeSanitizerFields fields;
+    return fields;
 }
 
 
 
 
 
-LifetimeSanitizer::LifetimeSanitizer()
-    : m_token(SANITIZER_TOKEN)
-    , m_self(this)
-{
-    if (!LifetimeSanitizer_enabled.load(std::memory_order_relaxed)){
-        return;
-    }
+void LifetimeSanitizer::disable(){
+    WriteSpinLock lg(sanitizer_fields().lock);
+    LifetimeSanitizer_disabled.store(true, std::memory_order_relaxed);
+    sanitizer_fields().map.clear();
+}
+
+PA_NO_INLINE void LifetimeSanitizer::terminate_with_dump(){
+    //  Intentionally crash the program here and let the crash dump deal with
+    //  the error reporting.
 
-    SpinLockGuard lg(sanitizer_lock);
-#ifdef PA_SANITIZER_PRINT_ALL
-    std::cout << "LifetimeSanitizer - Allocating: " << this << std::endl;
+#ifdef _WIN32
+    Sleep(500);
 #endif
-    auto iter = sanitizer_map.find(this);
-    if (iter == sanitizer_map.end()){
-        sanitizer_map.insert(this);
-        return;
-    }
-    std::cerr << "LifetimeSanitizer - Double allocation: " << this << std::endl;
-    std::terminate();
+
+    std::cerr << (char*)nullptr << std::endl;
 }
-LifetimeSanitizer::~LifetimeSanitizer(){
-    void* self = m_self;
-    m_self = nullptr;
-    if (!LifetimeSanitizer_enabled.load(std::memory_order_relaxed)){
-        return;
-    }
-    if (m_token != SANITIZER_TOKEN || self != this){
-        std::cerr << "LifetimeSanitizer - Free non-existant: " << this << std::endl;
-        std::terminate();
-    }
 
-    SpinLockGuard lg(sanitizer_lock);
-#ifdef PA_SANITIZER_PRINT_ALL
-    std::cout << "LifetimeSanitizer - Freeing: " << this << std::endl;
-#endif
-    auto iter = sanitizer_map.find(this);
-    if (iter != sanitizer_map.end()){
-        sanitizer_map.erase(this);
+
+
+
+LifetimeSanitizer::LifetimeSanitizer(const char* name){
+    if (LifetimeSanitizer_disabled.load(std::memory_order_relaxed)){
         return;
     }
-
-    //  Skip this check if we've been disabled before in case there's stuff we
-    //  haven't tracked.
-    if (LifetimeSanitizer_has_been_disabled){
+    internal_construct(name);
+}
+LifetimeSanitizer::~LifetimeSanitizer(){
+    if (LifetimeSanitizer_disabled.load(std::memory_order_relaxed)){
         return;
     }
-
-    std::cerr << "LifetimeSanitizer - Free non-existant: " << this << std::endl;
-    std::terminate();
+    internal_destruct();
 }
 
 
-
-LifetimeSanitizer::LifetimeSanitizer(LifetimeSanitizer&& x)
-    : m_token(SANITIZER_TOKEN)
-    , m_self(this)
-{
-    if (!LifetimeSanitizer_enabled.load(std::memory_order_relaxed)){
+LifetimeSanitizer::LifetimeSanitizer(LifetimeSanitizer&& x){
+    if (LifetimeSanitizer_disabled.load(std::memory_order_relaxed)){
         return;
     }
     x.check_usage();
-
-    SpinLockGuard lg(sanitizer_lock);
-#ifdef PA_SANITIZER_PRINT_ALL
-    std::cout << "LifetimeSanitizer - Allocating (move-construct): " << this << std::endl;
-#endif
-    auto iter = sanitizer_map.find(this);
-    if (iter == sanitizer_map.end()){
-        sanitizer_map.insert(this);
-        return;
-    }
-    std::cerr << "LifetimeSanitizer - Double allocation: " << this << std::endl;
-    std::terminate();
+    internal_construct(x.m_name);
 }
 void LifetimeSanitizer::operator=(LifetimeSanitizer&& x){
-    if (!LifetimeSanitizer_enabled.load(std::memory_order_relaxed)){
+    if (LifetimeSanitizer_disabled.load(std::memory_order_relaxed)){
         return;
     }
     check_usage();
     x.check_usage();
 }
-
-
-
 LifetimeSanitizer::LifetimeSanitizer(const LifetimeSanitizer& x){
-    if (!LifetimeSanitizer_enabled.load(std::memory_order_relaxed)){
+    if (LifetimeSanitizer_disabled.load(std::memory_order_relaxed)){
         return;
     }
     x.check_usage();
-
-    SpinLockGuard lg(sanitizer_lock);
-#ifdef PA_SANITIZER_PRINT_ALL
-    std::cout << "LifetimeSanitizer - Allocating (copy-construct): " << this << std::endl;
-#endif
-    auto iter = sanitizer_map.find(this);
-    if (iter == sanitizer_map.end()){
-        sanitizer_map.insert(this);
-        return;
-    }
-    std::cerr << "LifetimeSanitizer - Double allocation: " << this << std::endl;
-    std::terminate();
+    internal_construct(x.m_name);
 }
 void LifetimeSanitizer::operator=(const LifetimeSanitizer& x){
+    if (LifetimeSanitizer_disabled.load(std::memory_order_relaxed)){
+        return;
+    }
     check_usage();
     x.check_usage();
 }
 
+
+
 void LifetimeSanitizer::check_usage() const{
-    if (!LifetimeSanitizer_enabled.load(std::memory_order_relaxed)){
+    if (LifetimeSanitizer_disabled.load(std::memory_order_relaxed)){
         return;
     }
 
+    LifetimeSanitizerFields& fields = sanitizer_fields();
+
+    ReadSpinLock lg(fields.lock);
+    auto iter = fields.map.find(this);
+    if (iter == fields.map.end()){
+        std::cerr << "Use non-existent: " << this << std::endl;
+        terminate_with_dump();
+    }
+    if (fields.filter.contains(m_name)){
+        std::cout << "LifetimeSanitizer - Using: " << this << " : " << m_name << std::endl;
+    }
     if (m_token != SANITIZER_TOKEN || m_self != this){
-        std::cerr << "Use non-existant: " << this << std::endl;
-        std::terminate();
+        std::cerr << "Use corrupted: " << this << " : " << m_name << std::endl;
+        terminate_with_dump();
     }
-
-    if (LifetimeSanitizer_has_been_disabled){
+}
+void LifetimeSanitizer::start_using() const{
+    if (LifetimeSanitizer_disabled.load(std::memory_order_relaxed)){
         return;
     }
 
-    SpinLockGuard lg(sanitizer_lock);
-#ifdef PA_SANITIZER_PRINT_ALL
-    std::cout << "LifetimeSanitizer - Using: " << this << std::endl;
-#endif
-    auto iter = sanitizer_map.find(this);
-    if (iter != sanitizer_map.end()){
+    LifetimeSanitizerFields& fields = sanitizer_fields();
+
+    ReadSpinLock lg(fields.lock);
+    auto iter = fields.map.find(this);
+    if (iter == fields.map.end()){
+        std::cerr << "Start using non-existent: " << this << std::endl;
+        terminate_with_dump();
+    }
+    if (fields.filter.contains(m_name)){
+        std::cout << "LifetimeSanitizer - Start using: " << this << " : " << m_name << std::endl;
+    }
+    if (m_token != SANITIZER_TOKEN || m_self != this){
+        std::cerr << "Start using corrupted: " << this << " : " << m_name << std::endl;
+        terminate_with_dump();
+    }
+    m_use_counter++;
+}
+void LifetimeSanitizer::done_using() const{
+    if (LifetimeSanitizer_disabled.load(std::memory_order_relaxed)){
         return;
     }
-    std::cerr << "Use non-existant: " << this << std::endl;
-    std::terminate();
+
+    LifetimeSanitizerFields& fields = sanitizer_fields();
+
+    ReadSpinLock lg(fields.lock);
+    auto iter = fields.map.find(this);
+    if (iter == fields.map.end()){
+        std::cerr << "Done using non-existent: " << this << std::endl;
+        terminate_with_dump();
+    }
+    if (fields.filter.contains(m_name)){
+        std::cout << "LifetimeSanitizer - Done using: " << this << " : " << m_name << std::endl;
+    }
+    if (m_token != SANITIZER_TOKEN || m_self != this){
+        std::cerr << "Done using corrupted: " << this << " : " << m_name << std::endl;
+        terminate_with_dump();
+    }
+    m_use_counter--;
 }
 
+
+void LifetimeSanitizer::internal_construct(const char* name){
+    LifetimeSanitizerFields& fields = sanitizer_fields();
+
+    WriteSpinLock lg(fields.lock);
+    if (fields.filter.contains(name)){
+        std::cout << "LifetimeSanitizer - Allocating: " << this << " : " << name << std::endl;
+    }
+
+    auto iter = fields.map.find(this);
+    if (iter != fields.map.end()){
+        std::cerr << "LifetimeSanitizer - Double allocation: " << this << " : " << name << std::endl;
+        terminate_with_dump();
+    }
+    fields.map.insert(this);
+
+    m_token = SANITIZER_TOKEN;
+    m_self = this;
+    m_name = name;
+}
+void LifetimeSanitizer::internal_destruct(){
+    LifetimeSanitizerFields& fields = sanitizer_fields();
+
+    WriteSpinLock lg(fields.lock);
+    if (fields.filter.contains(m_name)){
+        std::cout << "LifetimeSanitizer - Freeing: " << this << " : " << m_name << std::endl;
+    }
+
+    auto iter = fields.map.find(this);
+    if (iter == fields.map.end()){
+        std::cerr << "LifetimeSanitizer - Free non-existent: " << this << " : " << m_name << std::endl;
+        terminate_with_dump();
+    }
+    fields.map.erase(this);
+
+    if (m_token != SANITIZER_TOKEN || m_self != this){
+        std::cerr << "LifetimeSanitizer - Free non-existent: " << this << " : " << m_name << std::endl;
+        terminate_with_dump();
+    }
+    if (m_use_counter != 0){
+        std::cerr << "LifetimeSanitizer - Freeing while in-use: " << this << " : " << m_name << std::endl;
+        terminate_with_dump();
+    }
+    m_self = nullptr;
+}
 #endif
 
 
+
+
+
+
 }
diff --git a/Common/Cpp/LifetimeSanitizer.h b/Common/Cpp/LifetimeSanitizer.h
index dd5cce5f31..9e0ff56aa1 100644
--- a/Common/Cpp/LifetimeSanitizer.h
+++ b/Common/Cpp/LifetimeSanitizer.h
@@ -1,6 +1,6 @@
 /*  Lifetime Sanitizer
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -8,39 +8,93 @@
 #define PokemonAutomation_LifetimeSanitizer_H
 
 #include <stdint.h>
+#include <cstddef>
 
 #define PA_SANITIZER_ENABLE
 
 namespace PokemonAutomation{
 
 
+#ifdef PA_SANITIZER_ENABLE
+
 
 class LifetimeSanitizer{
+    static constexpr uint64_t SANITIZER_TOKEN = 0x7db76f7a6a834ef0;
+
+
 public:
-#ifdef PA_SANITIZER_ENABLE
-    LifetimeSanitizer();
-    ~LifetimeSanitizer();
+    //  Rule of 5
 
+    ~LifetimeSanitizer();
     LifetimeSanitizer(LifetimeSanitizer&& x);
     void operator=(LifetimeSanitizer&& x);
-
     LifetimeSanitizer(const LifetimeSanitizer& x);
     void operator=(const LifetimeSanitizer& x);
 
+
+public:
+    //  Constructor
+
+    LifetimeSanitizer(const char* name = "(unnamed class)");
+
+
+public:
+    //  Misc.
+
+    class CheckScope{
+    public:
+        CheckScope(const LifetimeSanitizer& parent)
+            : m_parent(parent)
+        {
+            parent.check_usage();
+        }
+        ~CheckScope(){
+            m_parent.check_usage();
+        }
+
+    private:
+        const LifetimeSanitizer& m_parent;
+    };
+
     void check_usage() const;
-    static void set_enabled(bool enabled);
+    void start_using() const;
+    void done_using() const;
+    CheckScope check_scope() const{
+        return CheckScope(*this);
+    }
+
+    static void disable();
+
+
+private:
+    static void terminate_with_dump();
+    void internal_construct(const char* name);
+    void internal_destruct();
 
-#else
-    void check_usage() const{}
-    static void set_enabled(bool enabled){}
-#endif
 
 private:
     uint64_t m_token;
     void* m_self;
+    const char* m_name;
+    mutable size_t m_use_counter = 0;
 };
 
 
+#else
+class LifetimeSanitizer{
+public:
+    LifetimeSanitizer(const char* = ""){}
+
+    void check_usage() const{}
+    static void disable(){}
+
+    struct CheckScope{};
+    CheckScope check_scope() const{
+        return CheckScope();
+    }
+};
+#endif
+
 
 
 }
diff --git a/Common/Cpp/ListenerSet.cpp b/Common/Cpp/ListenerSet.cpp
new file mode 100644
index 0000000000..7f1589cbd1
--- /dev/null
+++ b/Common/Cpp/ListenerSet.cpp
@@ -0,0 +1,584 @@
+/*  Listener Set
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <algorithm>
+#include <atomic>
+#include <chrono>
+#include <map>
+#include <stdexcept>
+#include <string>
+#include <thread>
+#include <vector>
+#include "Concurrency/Mutex.h"
+#include "TestRunners/UnitTestDatabase.h"
+#include "ListenerSet.h"
+
+namespace PokemonAutomation{
+
+namespace{
+
+
+
+//
+//  Records the order in which listeners were called, so tests can compare it
+//  against the expected call order.
+//
+class CallLog{
+public:
+    void record(const std::string& name){
+        LockGuard<Mutex> lg(m_lock);
+        m_log += name;
+    }
+    std::string take(){
+        LockGuard<Mutex> lg(m_lock);
+        std::string ret = std::move(m_log);
+        m_log.clear();
+        return ret;
+    }
+
+private:
+    Mutex m_lock;
+    std::string m_log;
+};
+
+
+
+//
+//  A listener that records its name into the shared call log, optionally
+//  throwing. The map-based storage in the tests keeps these objects (and so
+//  their addresses, which the ListenerSet keys on) stable.
+//
+struct TestListener{
+    std::string name;
+    CallLog& log;
+    bool throws = false;
+
+    TestListener(std::string p_name, CallLog& p_log)
+        : name(std::move(p_name))
+        , log(p_log)
+    {}
+
+    void ping(){
+        log.record(name);
+        if (throws){
+            throw std::runtime_error("boom");
+        }
+    }
+};
+
+
+
+//
+//  A listener whose callback can be made to block until released, for testing
+//  removal of a listener that is currently running.
+//
+struct BlockingListener{
+    std::atomic<bool> entered{false};
+    std::atomic<bool> finished{false};
+    std::atomic<bool> release{false};
+
+    void ping(){
+        entered.store(true, std::memory_order_release);
+        while (!release.load(std::memory_order_acquire)){
+            std::this_thread::sleep_for(std::chrono::milliseconds(1));
+        }
+        //  Set inside the callback, before the node's lock is released:
+        //  any remove() that returns has waited on that lock, so it is
+        //  guaranteed to observe a finished callback.
+        finished.store(true, std::memory_order_release);
+    }
+};
+
+
+
+//
+//  Collects the first failure of a test so the test can report one message.
+//
+class Checker{
+public:
+    bool ok() const{
+        return m_error.empty();
+    }
+    const std::string& error() const{
+        return m_error;
+    }
+    void expect(bool cond, std::string message){
+        if (!cond && m_error.empty()){
+            m_error = std::move(message);
+        }
+    }
+
+private:
+    std::string m_error;
+};
+
+
+
+//
+//  A model of the call order that tests keep in sync with a ListenerSet and
+//  compare against after every operation.
+//
+class Model{
+public:
+    void add(Checker& c, const char* tag, const std::string& name, bool front){
+        auto iter = m_listeners.find(name);
+        if (iter == m_listeners.end()){
+            m_listeners.emplace(name, TestListener(name, m_log));
+            if (front){
+                m_order.insert(m_order.begin(), name);
+            }else{
+                m_order.push_back(name);
+            }
+        }
+        TestListener& listener = m_listeners.at(name);
+        if (front){
+            set.push_front(listener);
+        }else{
+            set.push_back(listener);
+        }
+        check(c, tag);
+    }
+    void remove(Checker& c, const char* tag, const std::string& name){
+        auto iter = m_listeners.find(name);
+        if (iter != m_listeners.end()){
+            TestListener& listener = iter->second;
+            set.remove(listener);
+            m_listeners.erase(iter);
+            m_order.erase(std::find(m_order.begin(), m_order.end(), name));
+        }
+        check(c, tag);
+    }
+    void check(Checker& c, const char* tag){
+        set.run_method(&TestListener::ping);
+        std::string actual = m_log.take();
+        std::string expected;
+        for (auto& n : m_order){
+            expected += n;
+        }
+        c.expect(
+            actual == expected,
+            std::string(tag) + ": expected call order '" + expected + "', got '" + actual + "'"
+        );
+        c.expect(
+            set.count_unique() == m_order.size(),
+            std::string(tag) + ": count_unique() is " + std::to_string(set.count_unique())
+                + ", expected " + std::to_string(m_order.size())
+        );
+        c.expect(
+            set.empty() == m_order.empty(),
+            std::string(tag) + ": empty() disagrees with the expected call order"
+        );
+    }
+
+private:
+    CallLog m_log;
+    std::vector<std::string> m_order;
+    std::map<std::string, TestListener> m_listeners;
+    ListenerSet<TestListener> set;
+};
+
+
+
+//
+//  Insertions and removals at every position of the linked list: the first
+//  node, the last node, the middle, and the only node, plus dedup semantics
+//  and re-adding listeners after they were removed (fresh nodes).
+//
+class Test_ListenerSet_Ordering : public UnitTest{
+public:
+    Test_ListenerSet_Ordering()
+        : UnitTest("Common::ListenerSet - Ordering and dedup")
+    {}
+
+    virtual UnitTestResult run(Logger& logger, CancellableScope& scope) const override{
+        Checker c;
+        Model m;
+
+        //  Insertion into an empty set: the new node becomes head and tail.
+        m.add(c, "add() to empty", "a", false);
+        m.add(c, "push_front() to empty", "b", true);
+        m.add(c, "push_back() after two", "c", false);
+
+        //  Dedup: re-adding a present listener is a no-op and does not change
+        //  the call order.
+        m.add(c, "add() present at back", "a", false);
+        m.add(c, "push_front() present at front", "b", true);
+        m.add(c, "push_back() present at back", "c", false);
+
+        //  Grow at both ends, then remove from the front, back, and middle.
+        m.add(c, "push_front()", "d", true);
+        m.add(c, "push_back()", "e", false);
+        m.remove(c, "remove() front of 5", "d");
+        m.remove(c, "remove() back of 4", "e");
+        m.remove(c, "remove() middle of 3", "a");
+        m.remove(c, "remove() new front", "b");
+        m.remove(c, "remove() only node", "c");
+
+        //  Removing a listener that was never added is a no-op.
+        m.remove(c, "remove() never-added", "x");
+
+        //  Re-adding after removal creates fresh nodes: make sure the list
+        //  links up cleanly from scratch.
+        m.add(c, "add() after emptying", "a", false);
+        m.add(c, "push_front() after emptying", "b", true);
+        m.add(c, "dedup front", "a", true);
+        m.add(c, "dedup back", "b", false);
+        m.remove(c, "remove() back", "a");
+        m.remove(c, "remove() front", "b");
+
+        //  Repeatedly grow and shrink at both ends: the head and tail
+        //  pointers must stay consistent across many fresh allocations.
+        for (int round = 0; round < 3; round++){
+            m.add(c, "grow front", "f", true);
+            m.add(c, "grow back", "g", false);
+            m.remove(c, "shrink front", "f");
+            m.remove(c, "shrink back", "g");
+        }
+
+        if (!c.ok()){
+            return UnitTestResult(c.error());
+        }
+        return true;
+    }
+};
+
+
+
+//
+//  try_remove() is non-blocking: it succeeds when the listener is absent or
+//  idle, and fails when the listener is currently inside a callback.
+//
+class Test_ListenerSet_TryRemove : public UnitTest{
+public:
+    Test_ListenerSet_TryRemove()
+        : UnitTest("Common::ListenerSet - try_remove()")
+    {}
+
+    virtual UnitTestResult run(Logger& logger, CancellableScope& scope) const override{
+        Checker c;
+        CallLog log;
+        ListenerSet<TestListener> set(true);
+        std::map<std::string, TestListener> storage;
+        auto listener = [&](const char* name) -> TestListener&{
+            auto iter = storage.find(name);
+            if (iter == storage.end()){
+                iter = storage.emplace(name, TestListener(name, log)).first;
+            }
+            return iter->second;
+        };
+
+        //  Absent listener: nothing to remove, returns true.
+        c.expect(
+            set.try_remove(listener("a")),
+            "try_remove() of an absent listener should return true"
+        );
+
+        set.add(listener("a"));
+        set.add(listener("b"));
+        c.expect(
+            set.try_remove(listener("a")),
+            "try_remove() of an idle listener should return true"
+        );
+        c.expect(
+            set.count_unique() == 1,
+            "count_unique() should be 1 after a successful try_remove()"
+        );
+        c.expect(
+            set.try_remove(listener("a")),
+            "try_remove() of an already-removed listener should return true"
+        );
+
+        //  While a listener is inside its callback, its node lock is held, so
+        //  try_remove() must fail without blocking.
+        BlockingListener b;
+        ListenerSet<BlockingListener> set2(true);
+        set2.add(b);
+        std::thread runner([&]{
+            set2.run_method(&BlockingListener::ping);
+        });
+        while (!b.entered.load(std::memory_order_acquire)){
+            std::this_thread::sleep_for(std::chrono::milliseconds(1));
+        }
+        c.expect(
+            !set2.try_remove(b),
+            "try_remove() while the listener is inside its callback should return false"
+        );
+        c.expect(
+            set2.count_unique() == 1,
+            "the listener should still be registered while its callback is running"
+        );
+
+        b.release.store(true, std::memory_order_release);
+        runner.join();
+        c.expect(
+            set2.try_remove(b),
+            "try_remove() after the callback finished should return true"
+        );
+        c.expect(set2.empty(), "the set should be empty after the final try_remove()");
+
+        if (!c.ok()){
+            return UnitTestResult(c.error());
+        }
+        return true;
+    }
+};
+
+
+
+//
+//  remove() of a listener that is currently running: it must block until the
+//  callback finishes, only then remove the listener, and the callback must
+//  run to completion.
+//
+class Test_ListenerSet_RemoveRunningListener : public UnitTest{
+public:
+    Test_ListenerSet_RemoveRunningListener()
+        : UnitTest("Common::ListenerSet - remove() of a running listener")
+    {}
+
+    virtual UnitTestResult run(Logger& logger, CancellableScope& scope) const override{
+        Checker c;
+        BlockingListener b;
+        ListenerSet<BlockingListener> set(true);
+        set.add(b);
+
+        std::thread runner([&]{
+            set.run_method(&BlockingListener::ping);
+        });
+        while (!b.entered.load(std::memory_order_acquire)){
+            std::this_thread::sleep_for(std::chrono::milliseconds(1));
+        }
+
+        //  remove() must block until the running callback finishes.
+        std::thread remover([&]{
+            set.remove(b);
+        });
+
+        //  Give the remover time to start and block on the node's lock.
+        std::this_thread::sleep_for(std::chrono::milliseconds(100));
+        c.expect(
+            set.count_unique() == 1,
+            "the listener should still be registered while remove() waits for its callback"
+        );
+        c.expect(
+            !b.finished.load(std::memory_order_acquire),
+            "the callback should still be running"
+        );
+
+        b.release.store(true, std::memory_order_release);
+        runner.join();
+        remover.join();
+
+        //  remove() can only acquire the node's lock after the callback
+        //  released it, and "finished" is stored inside the callback,
+        //  so by the time remove() returns the callback has completed.
+        c.expect(
+            b.finished.load(std::memory_order_acquire),
+            "remove() should only return after the callback finished"
+        );
+        c.expect(set.empty(), "the set should be empty after remove()");
+        c.expect(
+            set.count_unique() == 0,
+            "count_unique() should be 0 after remove()"
+        );
+
+        //  A second remove() of the now-absent listener is a no-op.
+        set.remove(b);
+        c.expect(set.empty(), "the set should still be empty after a second remove()");
+
+        if (!c.ok()){
+            return UnitTestResult(c.error());
+        }
+        return true;
+    }
+};
+
+
+
+//
+//  Exception semantics: a listener that throws does not stop the rest of the
+//  listeners from running, and the first exception is rethrown.
+//
+class Test_ListenerSet_Exceptions : public UnitTest{
+public:
+    Test_ListenerSet_Exceptions()
+        : UnitTest("Common::ListenerSet - Exception propagation")
+    {}
+
+    virtual UnitTestResult run(Logger& logger, CancellableScope& scope) const override{
+        Checker c;
+        CallLog log;
+        std::map<std::string, TestListener> storage;
+        auto listener = [&](const char* name, bool throws) -> TestListener&{
+            auto iter = storage.emplace(name, TestListener(name, log)).first;
+            iter->second.throws = throws;
+            return iter->second;
+        };
+
+        //  run_method(): the middle listener throws; the others still run.
+        {
+            ListenerSet<TestListener> set(true);
+            set.add(listener("a", false));
+            set.add(listener("b", true));
+            set.add(listener("c", false));
+            std::string err;
+            try{
+                set.run_method(&TestListener::ping);
+            }catch (std::runtime_error& e){
+                err = e.what();
+            }
+            c.expect(
+                err == "boom",
+                "run_method() should rethrow the exception, got '" + err + "'"
+            );
+            c.expect(
+                log.take() == "abc",
+                "all listeners should run even though one threw"
+            );
+        }
+
+        //  run_on_all(): the first listener throws via the lambda; the rest
+        //  still run.
+        {
+            ListenerSet<TestListener> set(true);
+            set.add(listener("d", false));
+            set.add(listener("e", false));
+            std::string err;
+            try{
+                set.run_on_all([&](TestListener& l){
+                    log.record(l.name);
+                    if (l.name == "d"){
+                        throw std::runtime_error("first");
+                    }
+                    if (l.name == "e"){
+                        throw std::runtime_error("second");
+                    }
+                    return false;
+                });
+            }catch (std::runtime_error& e){
+                err = e.what();
+            }
+            c.expect(
+                err == "first",
+                "run_on_all() should rethrow the first exception, got '" + err + "'"
+            );
+            c.expect(
+                log.take() == "de",
+                "all listeners should run even though two threw"
+            );
+        }
+
+        //  Early stop still applies when the exception happens later.
+        {
+            ListenerSet<TestListener> set(true);
+            set.add(listener("f", false));
+            set.add(listener("g", false));
+            set.run_on_all([&](TestListener& l){
+                log.record(l.name);
+                return true;
+            });
+            c.expect(
+                log.take() == "f",
+                "run_on_all() should stop after a lambda returns true"
+            );
+        }
+
+        if (!c.ok()){
+            return UnitTestResult(c.error());
+        }
+        return true;
+    }
+};
+
+
+
+//
+//  Stress: many threads concurrently add and remove shared listeners while
+//  callbacks are running, to shake out the intrusive pointer bookkeeping.
+//
+class Test_ListenerSet_ConcurrentChurn : public UnitTest{
+public:
+    static constexpr int LISTENER_COUNT = 16;
+    static constexpr int WORKER_COUNT = 4;
+    static constexpr int RUN_ITERATIONS = 300;
+
+    Test_ListenerSet_ConcurrentChurn()
+        : UnitTest("Common::ListenerSet - Concurrent add/remove")
+    {
+        m_threads = WORKER_COUNT;
+    }
+
+    virtual UnitTestResult run(Logger& logger, CancellableScope& scope) const override{
+        Checker c;
+        CallLog log;
+        ListenerSet<TestListener> set(true);
+        std::map<std::string, TestListener> storage;
+        for (int i = 0; i < LISTENER_COUNT; i++){
+            std::string name = "L" + std::to_string(i);
+            storage.emplace(name, TestListener(name, log));
+        }
+
+        std::atomic<bool> stop{false};
+        auto worker = [&](int id){
+            int i = 0;
+            while (!stop.load(std::memory_order_relaxed)){
+                auto iter = storage.find("L" + std::to_string(i % LISTENER_COUNT));
+                TestListener& listener = iter->second;
+                if ((id + i) % 2 == 0){
+                    set.add(listener);
+                }else{
+                    set.remove(listener);
+                }
+                i++;
+            }
+        };
+        std::vector<std::thread> workers;
+        for (int id = 0; id < WORKER_COUNT; id++){
+            workers.emplace_back(worker, id);
+        }
+        for (int i = 0; i < RUN_ITERATIONS; i++){
+            set.run_on_all([&](TestListener& l){
+                log.record(l.name);
+                return false;
+            });
+        }
+        stop.store(true, std::memory_order_relaxed);
+        for (auto& w : workers){
+            w.join();
+        }
+        for (auto& item : storage){
+            set.remove(item.second);
+        }
+        c.expect(set.empty(), "all listeners should have been removed");
+        c.expect(
+            set.count_unique() == 0,
+            "count_unique() should be 0 after all listeners were removed"
+        );
+
+        if (!c.ok()){
+            return UnitTestResult(c.error());
+        }
+        return true;
+    }
+};
+
+
+
+} // anonymous namespace
+
+
+
+void add_tests_ListenerSet(UnitTestDatabase& database){
+    database.add<Test_ListenerSet_Ordering>();
+    database.add<Test_ListenerSet_TryRemove>();
+    database.add<Test_ListenerSet_RemoveRunningListener>();
+    database.add<Test_ListenerSet_Exceptions>();
+    database.add<Test_ListenerSet_ConcurrentChurn>();
+}
+
+
+
+}
diff --git a/Common/Cpp/ListenerSet.h b/Common/Cpp/ListenerSet.h
new file mode 100644
index 0000000000..0c9ff9becc
--- /dev/null
+++ b/Common/Cpp/ListenerSet.h
@@ -0,0 +1,445 @@
+/*  Listener Set
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_ListenerSet_H
+#define PokemonAutomation_ListenerSet_H
+
+#include <exception>
+#include <map>
+#include <atomic>
+#include <iostream>
+#include "Common/Cpp/Concurrency/SpinLock.h"
+
+
+//#define PA_DEBUG_ListenerSet
+
+
+#ifdef PA_DEBUG_ListenerSet
+#include "Common/Cpp/LifetimeSanitizer.h"
+#endif
+
+
+namespace PokemonAutomation{
+
+class UnitTestDatabase;
+
+
+template <typename ListenerType>
+class ListenerSet{
+public:
+    ListenerSet(bool suppress_lock_prints = false);
+
+    bool empty() const{
+        return m_count.load(std::memory_order_acquire) == 0;
+    }
+    size_t count_unique() const{
+        return m_count.load(std::memory_order_acquire);
+    }
+
+    //
+    //  Add a new listener. This is always safe as it will never fail unless it
+    //  throws. Deadlocking is not possible since there's only one local lock.
+    //
+
+    //  Add a new listener to the front of the call order, so it fires before
+    //  all existing listeners.
+    void push_front(ListenerType& listener);
+
+    //  Add a new listener to the back of the call order, so it fires after all
+    //  existing listeners.
+    void push_back(ListenerType& listener);
+
+    //  Same as "push_back()".
+    void add(ListenerType& listener);
+
+    //  Remove a listener. This will block if the listener being removed is
+    //  running a callback from this class.
+    //
+    //  Therefore, this will deadlock if a listener tries to remove itself from
+    //  inside its own callback.
+    void remove(ListenerType& listener) noexcept;
+
+    //  Remove a listener (non-blocking). This will return false if it needs to
+    //  wait. This function is always safe and will never deadlock.
+    //
+    //  This is intended as a safety outlet for possible self-removal. If the
+    //  removal fails because it is a self-removal, it returns false so you can
+    //  handle it higher up the stack.
+    //
+    //  Given that listeners typically remove themselves in their destructor,
+    //  self-removals where a callback tries to remove itself are never safe
+    //  since the class will be destructed while still deep in the call stack
+    //  of its own method.
+    bool try_remove(ListenerType& listener) noexcept;
+
+
+public:
+    //  Run the method on every listener.
+    template <typename Function, class... Args>
+    void run_method(Function function, Args&&... args);
+
+    //  Run lambda on every listener.
+    //  If lambda returns true, stop immediately.
+    template <typename Lambda>
+    void run_on_all(Lambda&& lambda);
+
+
+private:
+    //  The data structure here is an intrusive map where the nodes form a
+    //  linked-list. The map provides a fast way to add/remove listeners while
+    //  the linked-list is the main method of iterating the listeners. The
+    //  nodes are the map's values, so their addresses are stable, and the
+    //  linked-list pointers are formed within them.
+    //
+    //  Since the map is the backing structure, adding or removing a listener
+    //  is a single map node allocation/deallocation: there is never a window
+    //  where the two structures can disagree, and the insert is strongly
+    //  exception-safe without any try-catch (if the map's single allocation
+    //  throws, nothing has been modified yet).
+    //
+    //  Iterating listeners to fire callbacks is completely thread-safe as they
+    //  do not modify the structure of the container. OTOH, adding/removing does
+    //  modify the data structure.
+    //
+    //  "m_lock" protects the structure of container. You cannot change the
+    //  map or the linked list without holding this lock. When iterating the
+    //  nodes to fire callbacks, you must hold this lock when moving from one
+    //  node to the next to prevent the pointer from changing under you.
+    //
+    //  To prevent a listener from being removed while its callback is running,
+    //  there is a lock on each node. The contract for removing is a listener is
+    //  that when "remove_listener()" returns, this class holds no more
+    //  references to it and thus the listener is safe to destroy.
+    //
+    struct Node{
+        SpinLock lock;
+        ListenerType& listener;
+
+        //  Linked-list pointers, formed within the map's values.
+        Node* next = nullptr;
+        Node* prev = nullptr;
+
+#ifdef PA_DEBUG_ListenerSet
+        LifetimeSanitizer sanitizer;
+#endif
+
+        Node(ListenerType& p_listener)
+            : listener(p_listener)
+#ifdef PA_DEBUG_ListenerSet
+            , sanitizer("Node")
+#endif
+        {}
+    };
+
+    //  Shared implementation of add()/push_front()/push_back(). Inserts
+    //  "listener" at the front or back of the call order. If the listener is
+    //  already present, this is a no-op and the call order is not changed.
+    void insert(ListenerType& listener, bool front, const char* label);
+
+    //  Unlink "node" from the linked-list. The caller must hold "m_lock" and
+    //  "node.lock" (write). The map entry is left in place.
+    void unlink_node(Node& node);
+
+
+private:
+    //  Optimization. Keep an atomic version of the count. This will let us
+    //  skip the lock when there are no listeners.
+    std::atomic<size_t> m_count;
+
+    const bool m_suppress_lock_prints;
+    mutable SpinLock m_lock;
+
+    Node* m_head = nullptr;
+    Node* m_tail = nullptr;
+    std::map<ListenerType*, Node> m_listeners;
+
+#ifdef PA_DEBUG_ListenerSet
+    LifetimeSanitizer m_sanitizer;
+#endif
+};
+
+
+
+
+
+template <typename ListenerType>
+ListenerSet<ListenerType>::ListenerSet(bool suppress_lock_prints)
+    : m_suppress_lock_prints(suppress_lock_prints)
+{}
+
+template <typename ListenerType>
+void ListenerSet<ListenerType>::insert(ListenerType& listener, bool front, const char* label){
+#ifdef PA_DEBUG_ListenerSet
+    auto scope = m_sanitizer.check_scope();
+#endif
+    WriteSpinLock lg(m_lock, m_suppress_lock_prints ? nullptr : label);
+
+    //  This is the only allocation for the whole operation. If it throws, the
+    //  map is unchanged and the linked-list pointers have not been touched
+    //  yet, so the structure is left consistent (strong exception safety).
+    auto ret = m_listeners.emplace(
+        std::piecewise_construct,
+        std::forward_as_tuple(&listener),
+        std::forward_as_tuple(listener)
+    );
+    if (!ret.second){
+        return;
+    }
+
+    Node& node = ret.first->second;
+
+#ifdef PA_DEBUG_ListenerSet
+    node.sanitizer.check_usage();
+#endif
+    if (front){
+        node.prev = nullptr;
+        node.next = m_head;
+        if (m_head != nullptr){
+#ifdef PA_DEBUG_ListenerSet
+            m_head->sanitizer.check_usage();
+#endif
+            m_head->prev = &node;
+        }else{
+            m_tail = &node;
+        }
+        m_head = &node;
+    }else{
+        node.prev = m_tail;
+        node.next = nullptr;
+        if (m_tail != nullptr){
+#ifdef PA_DEBUG_ListenerSet
+            m_tail->sanitizer.check_usage();
+#endif
+            m_tail->next = &node;
+        }else{
+            m_head = &node;
+        }
+        m_tail = &node;
+    }
+    m_count.store(m_listeners.size(), std::memory_order_release);
+}
+
+template <typename ListenerType>
+void ListenerSet<ListenerType>::push_front(ListenerType& listener){
+    insert(listener, true, "ListenerSet::push_front()");
+}
+template <typename ListenerType>
+void ListenerSet<ListenerType>::push_back(ListenerType& listener){
+    insert(listener, false, "ListenerSet::push_back()");
+}
+template <typename ListenerType>
+void ListenerSet<ListenerType>::add(ListenerType& listener){
+    insert(listener, false, "ListenerSet::add()");
+}
+
+template <typename ListenerType>
+void ListenerSet<ListenerType>::unlink_node(Node& node){
+    if (node.prev != nullptr){
+#ifdef PA_DEBUG_ListenerSet
+        node.prev->sanitizer.check_usage();
+#endif
+        node.prev->next = node.next;
+    }else{
+        m_head = node.next;
+    }
+    if (node.next != nullptr){
+#ifdef PA_DEBUG_ListenerSet
+        node.next->sanitizer.check_usage();
+#endif
+        node.next->prev = node.prev;
+    }else{
+        m_tail = node.prev;
+    }
+}
+
+template <typename ListenerType>
+void ListenerSet<ListenerType>::remove(ListenerType& listener) noexcept{
+#ifdef PA_DEBUG_ListenerSet
+    auto scope = m_sanitizer.check_scope();
+#endif
+
+//    bool printed = false;
+
+    while (true){
+        WriteSpinLock lg(m_lock, m_suppress_lock_prints ? nullptr : "ListenerSet::remove()");
+        auto iter = m_listeners.find(&listener);
+        if (iter == m_listeners.end()){
+            return;
+        }
+
+        Node& node = iter->second;
+
+#ifdef PA_DEBUG_ListenerSet
+        node.sanitizer.check_usage();
+#endif
+
+        if (!node.lock.try_acquire_write()){
+#if 0
+            if (!printed){
+                try{
+                    std::cout << "ListenerSet::remove(): Retry inner." << std::endl;
+                }catch (...){}
+                printed = true;
+            }
+#endif
+            continue;
+        }
+
+//        std::cout << "node = " << &node.sanitizer << " : " << &node.prev->sanitizer << " : " << &node.next->sanitizer << std::endl;
+
+        unlink_node(node);
+
+#ifdef PA_DEBUG_ListenerSet
+        node.sanitizer.check_usage();
+#endif
+
+        m_listeners.erase(iter);
+        m_count.store(m_listeners.size(), std::memory_order_release);
+        return;
+    }
+}
+
+
+
+template <typename ListenerType>
+bool ListenerSet<ListenerType>::try_remove(ListenerType& listener) noexcept{
+#ifdef PA_DEBUG_ListenerSet
+    auto scope = m_sanitizer.check_scope();
+#endif
+    if (!m_lock.try_acquire_write()){
+        return false;
+    }
+    auto iter = m_listeners.find(&listener);
+    if (iter == m_listeners.end()){
+        m_lock.unlock_write();
+        return true;
+    }
+
+    Node& node = iter->second;
+    if (!node.lock.try_acquire_write()){
+        try{
+            std::cout << "ListenerSet::try_remove(): Fail inner." << std::endl;
+        }catch (...){}
+        m_lock.unlock_write();
+        return false;
+    }
+
+#ifdef PA_DEBUG_ListenerSet
+    node.sanitizer.check_usage();
+#endif
+
+    unlink_node(node);
+
+#ifdef PA_DEBUG_ListenerSet
+    node.sanitizer.check_usage();
+#endif
+
+    m_listeners.erase(iter);
+    m_count.store(m_listeners.size(), std::memory_order_release);
+    m_lock.unlock_write();
+    return true;
+}
+
+
+
+template <typename ListenerType>
+template <typename Function, class... Args>
+void ListenerSet<ListenerType>::run_method(Function function, Args&&... args){
+#ifdef PA_DEBUG_ListenerSet
+    auto scope = m_sanitizer.check_scope();
+#endif
+    if (empty()){
+        return;
+    }
+    std::exception_ptr err;
+
+    m_lock.acquire_read();
+
+    Node* node = m_head;
+    while (node != nullptr){
+        {
+            ReadSpinLock lg(node->lock, m_suppress_lock_prints ? nullptr : "ListenerSet::run_method()");
+
+#ifdef PA_DEBUG_ListenerSet
+            node->sanitizer.check_usage();
+#endif
+            m_lock.unlock_read();
+            try{
+                (node->listener.*function)(std::forward<Args>(args)...);
+            }catch (...){
+                if (!err){
+                    err = std::current_exception();
+                }
+            }
+            m_lock.acquire_read();
+        }
+#ifdef PA_DEBUG_ListenerSet
+        node->sanitizer.check_usage();
+#endif
+        node = node->next;
+    }
+
+    m_lock.unlock_read();
+    if (err){
+        std::rethrow_exception(err);
+    }
+}
+
+
+template <typename ListenerType>
+template <typename Lambda>
+void ListenerSet<ListenerType>::run_on_all(Lambda&& lambda){
+#ifdef PA_DEBUG_ListenerSet
+    auto scope = m_sanitizer.check_scope();
+#endif
+    if (empty()){
+        return;
+    }
+    std::exception_ptr err;
+
+    m_lock.acquire_read();
+
+    Node* node = m_head;
+    while (node != nullptr){
+        bool return_now = false;
+        {
+            ReadSpinLock lg(node->lock, m_suppress_lock_prints ? nullptr : "ListenerSet::run_on_all()");
+
+#ifdef PA_DEBUG_ListenerSet
+            node->sanitizer.check_usage();
+#endif
+            m_lock.unlock_read();
+            try{
+                return_now = lambda(node->listener);
+            }catch (...){
+                if (!err){
+                    err = std::current_exception();
+                }
+            }
+            m_lock.acquire_read();
+        }
+        if (return_now){
+            break;
+        }
+#ifdef PA_DEBUG_ListenerSet
+        node->sanitizer.check_usage();
+#endif
+        node = node->next;
+    }
+
+    m_lock.unlock_read();
+    if (err){
+        std::rethrow_exception(err);
+    }
+}
+
+void add_tests_ListenerSet(UnitTestDatabase& database);
+
+
+
+
+}
+#endif
diff --git a/Common/Cpp/Logging/AbstractLogger.h b/Common/Cpp/Logging/AbstractLogger.h
new file mode 100644
index 0000000000..884d3eac24
--- /dev/null
+++ b/Common/Cpp/Logging/AbstractLogger.h
@@ -0,0 +1,36 @@
+/*  Abstract Logger
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_AbstractLogger_H
+#define PokemonAutomation_AbstractLogger_H
+
+#include <string>
+#include "Common/Cpp/Color.h"
+
+namespace PokemonAutomation{
+
+
+struct LogLine{
+    Color color;
+    std::string text;
+};
+
+
+// Abstract base class as a logger interface
+class Logger{
+public:
+    virtual void log(const std::string& msg, Color color = Color()) = 0;
+    virtual void log(std::string&& msg, Color color = Color()){
+        log((const std::string&)msg, color);
+    }
+    virtual void log(const char* msg, Color color = Color()){
+        log(std::string(msg), color);
+    }
+};
+
+
+}
+#endif
diff --git a/Common/Cpp/Logging/FileLogger.cpp b/Common/Cpp/Logging/FileLogger.cpp
new file mode 100644
index 0000000000..76252a1f78
--- /dev/null
+++ b/Common/Cpp/Logging/FileLogger.cpp
@@ -0,0 +1,191 @@
+/*  File Logger
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <iostream>
+#include "Common/Cpp/PrettyPrint.h"
+#include "Common/Cpp/Filesystem/FilePath.h"
+#include "Common/Cpp/Filesystem/Filesystem.h"
+#include "FileLogger.h"
+
+namespace PokemonAutomation{
+
+
+FileLogger::FileLogger(ThreadPool& thread_pool, FileLoggerConfig config)
+    : m_config(std::move(config))
+    , m_stopping(false)
+{
+    Filesystem::Path file_path(m_config.file_path);
+    bool exists = Filesystem::exists(file_path);
+    m_file.open(file_path, FileMode::APPEND | FileMode::BINARY);
+
+    if (!exists && m_file.is_open()){
+        // Write UTF-8 BOM to new files
+        const char bom[] = "\xef\xbb\xbf";
+        m_file.write(bom, 3);
+        std::cout << "Write log to new file " << file_path << std::endl;
+    }else{
+        std::cout << "Write log to existing file " << file_path << std::endl;
+    }
+
+    m_thread = thread_pool.dispatch_now_blocking([this]{
+        thread_loop();
+    });
+}
+FileLogger::~FileLogger(){
+    stop();
+}
+void FileLogger::stop() noexcept{
+    if (!m_thread){
+        return;
+    }
+    {
+        std::lock_guard<Mutex> lg(m_lock);
+        m_stopping = true;
+    }
+    m_cv.notify_all();
+    m_thread.wait_and_ignore_exceptions();
+}
+
+
+
+void FileLogger::log(const std::string& msg, Color color){
+    std::unique_lock<Mutex> lg(m_lock);
+    m_cv.wait(lg, [this]{ return m_queue.size() < m_config.max_queue_size; });
+    m_queue.emplace_back(msg, color);
+    m_cv.notify_all();
+}
+
+void FileLogger::log(std::string&& msg, Color color){
+    std::unique_lock<Mutex> lg(m_lock);
+    m_cv.wait(lg, [this]{ return m_queue.size() < m_config.max_queue_size; });
+    m_queue.emplace_back(std::move(msg), color);
+    m_cv.notify_all();
+}
+
+std::string FileLogger::normalize_newlines(const std::string& msg){
+    std::string str;
+    size_t index = 0;
+
+    while (true){
+        auto pos = msg.find("\r\n", index);
+        if (pos == std::string::npos){
+            str += msg.substr(index, pos);
+            break;
+        }else{
+            str += msg.substr(index, pos - index);
+            str += "\n";
+            index = pos + 2;
+        }
+    }
+
+    if (!str.empty() && str.back() == '\n'){
+        str.pop_back();
+    }
+
+    return str;
+}
+
+std::string FileLogger::to_file_str(const std::string& msg){
+    // Replace all newlines with \r\n for the log file (Windows compatibility).
+    std::string str;
+    for (char ch : msg){
+        if (ch == '\n'){
+            str += "\r\n";
+            continue;
+        }
+        str += ch;
+    }
+    str += "\r\n";
+    return str;
+}
+
+void FileLogger::internal_log(const std::string& msg, Color color){
+    std::string line = normalize_newlines(msg);
+
+    // Write to file
+    if (m_file.is_open()){
+        std::string file_str = to_file_str(line);
+        m_file.write(file_str);
+        // Flush every time so if the program crashes we will still have the latest log in the log file
+        m_file.flush();
+    }
+}
+
+void FileLogger::thread_loop(){
+    size_t file_size_check_counter = 100;
+    std::unique_lock<Mutex> lg(m_lock);
+    while (true){
+        m_cv.wait(lg, [&]{
+            return m_stopping || !m_queue.empty();
+        });
+//        cout << "m_stopping = " << m_stopping << ", m_queue.size() = " << m_queue.size() << endl;
+        if (m_stopping && m_queue.empty()){
+            break;
+        }
+        auto& item = m_queue.front();
+        std::string msg = std::move(item.first);
+        Color color = item.second;
+        m_queue.pop_front();
+
+        lg.unlock();
+        if (++file_size_check_counter >= 100){
+            file_size_check_counter = 0;
+            // We call Filesystem::file_size() to check file size, which may be slow.
+            // So we only check every 100 lines.
+            // The counter is initialized to be 100 so we always have a check at start
+            // of the program so if the log file becomes too large from a previous session
+            // we will be able to rotate it.
+            rotate_log_file();
+        }
+        internal_log(msg, color);
+        lg.lock();
+
+        if (m_queue.size() <= m_config.max_queue_size / 2){
+            m_cv.notify_all();
+        }
+    }
+}
+
+void FileLogger::rotate_log_file(){
+    if (!m_file.is_open()){
+        return;
+    }
+
+    // Check file size
+    Filesystem::Path file_path(m_config.file_path);
+    std::error_code ec;
+    auto size = Filesystem::file_size(file_path, ec);
+    if (ec || size < m_config.max_file_size_bytes){
+        return;
+    }
+
+    // Close current file
+    m_file.close();
+
+    // Generate backup filename: <basename>-<timestamp>.log
+    std::string stem = file_path.stem().string();
+    std::string extension = file_path.extension().string();
+
+    std::string backup_filename = stem + "-" + now_to_filestring() + extension;
+    Filesystem::Path backup_path = file_path.parent_path() / Filesystem::Path(backup_filename);
+
+    // Rename current file to backup
+    Filesystem::rename(file_path, backup_path, ec);
+    if (ec){
+        std::cerr << "Failed to rename log file: " << ec.message() << std::endl;
+    }
+
+    // Re-open the file (creates a new, empty file)
+    bool exists = Filesystem::exists(file_path);
+    m_file.open(file_path, FileMode::APPEND | FileMode::BINARY);
+    if (!exists && m_file.is_open()){
+        const char bom[] = "\xef\xbb\xbf";
+        m_file.write(bom, 3);
+    }
+}
+
+
+}
diff --git a/Common/Cpp/Logging/FileLogger.h b/Common/Cpp/Logging/FileLogger.h
new file mode 100644
index 0000000000..3d3b9ccc71
--- /dev/null
+++ b/Common/Cpp/Logging/FileLogger.h
@@ -0,0 +1,86 @@
+/*  File Logger
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  A Qt-free file logger that writes log messages to a file with optional
+ *  log rotation. Supports listeners for UI integration (e.g., displaying
+ *  logs in a Qt window without coupling the core logger to Qt).
+ */
+
+#ifndef PokemonAutomation_Logging_FileLogger_H
+#define PokemonAutomation_Logging_FileLogger_H
+
+#include <deque>
+#include "Common/Cpp/Concurrency/Mutex.h"
+#include "Common/Cpp/Concurrency/ConditionVariable.h"
+#include "Common/Cpp/Concurrency/AsyncTask.h"
+#include "Common/Cpp/Concurrency/ThreadPool.h"
+#include "Common/Cpp/Filesystem/FileIO.h"
+#include "AbstractLogger.h"
+
+namespace PokemonAutomation{
+
+
+// Configuration for the FileLogger.
+struct FileLoggerConfig{
+    std::string file_path;                          // Path to the log file, assuming UTF-8
+    size_t max_queue_size = 10000;                  // Max pending log entries before blocking
+    size_t max_file_size_bytes = 50 * 1024 * 1024;  // Max file size before rotation (50MB default)
+    size_t last_log_max_lines = 10000;              // Max lines to keep in memory for get_last()
+};
+
+
+// A file logger that:
+// 1. Writes log messages to a file asynchronously via a background thread
+// 2. Supports log rotation when the file exceeds a configured size
+// 3. Notifies registered listeners when a log message is written (for UI integration)
+// 4. Keeps track of recent log lines for retrieval via get_last()
+//
+// The Listener interface allows Qt GUI components to receive log messages
+// without the core logger depending on Qt.
+class FileLogger : public Logger{
+public:
+    // Construct a FileLogger with the given configuration.
+    // The log file is created if it doesn't exist, or appended to if it does.
+    // A UTF-8 BOM is written to new files.
+    FileLogger(ThreadPool& thread_pool, FileLoggerConfig config);
+
+    ~FileLogger();
+    void stop() noexcept;
+
+    // Logger interface implementation
+    virtual void log(const std::string& msg, Color color = Color()) override;
+    virtual void log(std::string&& msg, Color color = Color()) override;
+
+private:
+    // Normalize newlines: convert \r\n to \n, remove trailing newline.
+    static std::string normalize_newlines(const std::string& msg);
+
+    // Convert message to file format (with \r\n line endings for Windows compatibility).
+    static std::string to_file_str(const std::string& msg);
+
+    // Internal log processing (called from background thread).
+    void internal_log(const std::string& msg, Color color);
+
+    // Background thread loop that processes the log queue.
+    void thread_loop();
+
+    // Rotate the log file if it exceeds the configured max size.
+    // Renames the current file to "<basename>-<timestamp>.log" and creates a new file.
+    void rotate_log_file();
+
+private:
+    FileLoggerConfig m_config;
+    FileIO m_file;
+
+    mutable Mutex m_lock;
+    ConditionVariable m_cv;
+    bool m_stopping;
+    std::deque<std::pair<std::string, Color>> m_queue;
+
+    AsyncTask m_thread;
+};
+
+
+}
+#endif
diff --git a/Common/Cpp/Logging/GlobalLogger.cpp b/Common/Cpp/Logging/GlobalLogger.cpp
new file mode 100644
index 0000000000..b1ee51d98a
--- /dev/null
+++ b/Common/Cpp/Logging/GlobalLogger.cpp
@@ -0,0 +1,30 @@
+/*  Global Logger
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "MultiOutputLogger.h"
+#include "LastLogTracker.h"
+#include "GlobalLogger.h"
+
+namespace PokemonAutomation{
+
+
+Logger& global_logger_raw(){
+    return global_multi_logger();
+}
+
+LastLogTracker& global_last_log_history(){
+    static LastLogTracker tracker;
+    return tracker;
+}
+
+MultiOutputLogger& global_multi_logger(){
+    static MultiOutputLogger logger;
+    return logger;
+}
+
+
+
+}
diff --git a/Common/Cpp/Logging/GlobalLogger.h b/Common/Cpp/Logging/GlobalLogger.h
new file mode 100644
index 0000000000..0114dbde59
--- /dev/null
+++ b/Common/Cpp/Logging/GlobalLogger.h
@@ -0,0 +1,39 @@
+/*  Global Logger
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  Provides a global file logger instance for application-wide logging.
+ *  This is a Qt-free logger that can be used before Qt is initialized.
+ */
+
+#ifndef PokemonAutomation_Logging_GlobalLogger_H
+#define PokemonAutomation_Logging_GlobalLogger_H
+
+#include "AbstractLogger.h"
+
+namespace PokemonAutomation{
+
+
+class LastLogTracker;
+
+
+// Return a global raw `FileLogger`. `FileLogger` is defined in FileLogger.h.
+// "raw" here means the logger does not add any timestamp or tags to the incoming log lines.
+//
+// To initialize the global logger, implement `FileLoggerConfig make_global_config()` at
+// Main.cpp to return the config for the global logger. If this function is not implemented,
+// the program will not compile.
+Logger& global_logger_raw();
+
+
+LastLogTracker& global_last_log_history();
+
+
+//  This is the same as above, but is pre-casted to the actual type.
+//  Use this during setup to add all the logger listeners.
+class MultiOutputLogger;
+MultiOutputLogger& global_multi_logger();
+
+
+}
+#endif
diff --git a/Common/Cpp/Logging/LastLogTracker.cpp b/Common/Cpp/Logging/LastLogTracker.cpp
new file mode 100644
index 0000000000..d77563c9e6
--- /dev/null
+++ b/Common/Cpp/Logging/LastLogTracker.cpp
@@ -0,0 +1,43 @@
+/*  Last Log Tracker
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "LastLogTracker.h"
+
+namespace PokemonAutomation{
+
+
+void LastLogTracker::log(const std::string& msg, Color color){
+    WriteSpinLock lg(m_lock);
+    m_lines.emplace_back(color, msg);
+    while (m_lines.size() > m_max_lines){
+        m_lines.pop_front();
+    }
+}
+void LastLogTracker::log(std::string&& msg, Color color){
+    WriteSpinLock lg(m_lock);
+    m_lines.emplace_back(color, std::move(msg));
+    while (m_lines.size() > m_max_lines){
+        m_lines.pop_front();
+    }
+}
+void LastLogTracker::log(const char* msg, Color color){
+    WriteSpinLock lg(m_lock);
+    m_lines.emplace_back(color, msg);
+    while (m_lines.size() > m_max_lines){
+        m_lines.pop_front();
+    }
+}
+
+std::vector<LogLine> LastLogTracker::get_recent(size_t lines) const{
+    ReadSpinLock lg(m_lock);
+    if (lines < m_lines.size()){
+        return std::vector<LogLine>(m_lines.begin(), m_lines.begin() + lines);
+    }
+    return std::vector<LogLine>(m_lines.begin(), m_lines.end());
+}
+
+
+}
diff --git a/Common/Cpp/Logging/LastLogTracker.h b/Common/Cpp/Logging/LastLogTracker.h
new file mode 100644
index 0000000000..50f49a71c3
--- /dev/null
+++ b/Common/Cpp/Logging/LastLogTracker.h
@@ -0,0 +1,47 @@
+/*  Last Log Tracker
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  A simple ring buffer that stores the last N log lines. Thread-safe reads
+ *  require external synchronization (the caller must hold the appropriate lock).
+ */
+
+#ifndef PokemonAutomation_Logging_LastLogTracker_H
+#define PokemonAutomation_Logging_LastLogTracker_H
+
+#include <deque>
+#include <vector>
+#include "Common/Cpp/Concurrency/SpinLock.h"
+#include "AbstractLogger.h"
+
+namespace PokemonAutomation{
+
+
+// A bounded queue that keeps track of the most recent log lines.
+// When the queue exceeds max_lines, the oldest lines are discarded.
+// This class is NOT thread-safe; callers must provide external synchronization.
+class LastLogTracker : public Logger{
+public:
+    LastLogTracker(size_t max_lines = 10000)
+        : m_max_lines(max_lines)
+    {}
+
+    // Add a log line to the tracker. If the tracker exceeds max_lines,
+    // the oldest lines are removed.
+    virtual void log(const std::string& msg, Color color = Color()) override;
+    virtual void log(std::string&& msg, Color color = Color()) override;
+    virtual void log(const char* msg, Color color = Color()) override;
+
+    // Return a copy of all stored log lines, oldest first.
+    std::vector<LogLine> get_recent(size_t lines) const;
+
+private:
+    const size_t m_max_lines;
+
+    mutable SpinLock m_lock;
+    std::deque<LogLine> m_lines;
+};
+
+
+}
+#endif
diff --git a/Common/Cpp/Logging/MultiOutputLogger.h b/Common/Cpp/Logging/MultiOutputLogger.h
new file mode 100644
index 0000000000..90d7c887c6
--- /dev/null
+++ b/Common/Cpp/Logging/MultiOutputLogger.h
@@ -0,0 +1,51 @@
+/*  Multi-Output Logger
+ *
+ *  From: https://github.com/PokemonAutomation/
+ */
+
+#ifndef PokemonAutomation_Logging_MultiOutputLogger_H
+#define PokemonAutomation_Logging_MultiOutputLogger_H
+
+#include "Common/Cpp/ListenerSet.h"
+#include "AbstractLogger.h"
+
+namespace PokemonAutomation{
+
+
+
+class MultiOutputLogger : public Logger{
+public:
+    MultiOutputLogger()
+        : m_listeners(true)
+    {}
+
+    void add_listener(Logger& logger){
+        m_listeners.add(logger);
+    }
+    void remove_listener(Logger& logger){
+        m_listeners.remove(logger);
+    }
+
+public:
+    virtual void log(const std::string& msg, Color color = Color()){
+        m_listeners.run_method(
+            (void (Logger::*)(const std::string&, Color))&Logger::log,
+            msg, color
+        );
+    }
+    virtual void log(const char* msg, Color color = Color()){
+        m_listeners.run_method(
+            (void (Logger::*)(const char* msg, Color))&Logger::log,
+            msg, color
+        );
+    }
+
+
+private:
+    ListenerSet<Logger> m_listeners;
+};
+
+
+
+}
+#endif
diff --git a/Common/Cpp/Logging/OutputRedirector.cpp b/Common/Cpp/Logging/OutputRedirector.cpp
new file mode 100644
index 0000000000..26703759ff
--- /dev/null
+++ b/Common/Cpp/Logging/OutputRedirector.cpp
@@ -0,0 +1,49 @@
+/*  Output Redirector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "OutputRedirector.h"
+
+namespace PokemonAutomation{
+
+
+OutputRedirector::OutputRedirector(std::ostream& stream, Logger& logger, std::string tag, Color color)
+    : m_stream(stream)
+    , m_old_buf(stream.rdbuf())
+    , m_logger(logger, std::move(tag))
+    , m_color(color)
+{
+    stream.rdbuf(this);
+}
+
+OutputRedirector::~OutputRedirector(){
+    m_stream.rdbuf(m_old_buf);
+}
+
+OutputRedirector::int_type OutputRedirector::overflow(int_type ch){
+    WriteSpinLock lg(m_lock, nullptr);
+    m_old_buf->sputc((char)ch);
+    m_old_buf->pubsync();
+    m_buffer += (char)ch;
+    if (ch == '\n'){
+        m_logger.log(m_buffer, m_color);
+        m_buffer.clear();
+    }
+    return ch;
+}
+
+std::streamsize OutputRedirector::xsputn(const char_type* s, std::streamsize count){
+    WriteSpinLock lg(m_lock, nullptr);
+    m_old_buf->sputn(s, count);
+    m_buffer.append(s, count);
+    if (!m_buffer.empty() && m_buffer.back() == '\n'){
+        m_logger.log(m_buffer, m_color);
+        m_buffer.clear();
+    }
+    return count;
+}
+
+
+}
diff --git a/Common/Cpp/Logging/OutputRedirector.h b/Common/Cpp/Logging/OutputRedirector.h
new file mode 100644
index 0000000000..c15193e467
--- /dev/null
+++ b/Common/Cpp/Logging/OutputRedirector.h
@@ -0,0 +1,52 @@
+/*  Output Redirector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  Redirects a std::ostream (like std::cout or std::cerr) to a Logger.
+ *  Each line written to the stream is captured and logged with a tag and color.
+ */
+
+#ifndef PokemonAutomation_Logging_OutputRedirector_H
+#define PokemonAutomation_Logging_OutputRedirector_H
+
+#include <streambuf>
+#include <ostream>
+#include "Common/Cpp/Concurrency/SpinLock.h"
+#include "Common/Cpp/Color.h"
+#include "TaggedLogger.h"
+
+namespace PokemonAutomation{
+
+
+// Redirects output from a std::ostream to a Logger.
+// Lines are buffered until a newline is encountered, then logged with a tag.
+//
+// Example usage:
+//   FileLogger file_logger(config);
+//   OutputRedirector cout_redirect(std::cout, file_logger, "stdout", COLOR_WHITE);
+//   std::cout << "Hello World" << std::endl;  // Gets logged to file_logger
+//
+// The original stream buffer is restored when the OutputRedirector is destroyed.
+class OutputRedirector : public std::basic_streambuf<char>{
+public:
+    // Construct an OutputRedirector that captures output from the given stream
+    // and logs it to the given logger with the specified tag and color.
+    OutputRedirector(std::ostream& stream, Logger& logger, std::string tag, Color color);
+    ~OutputRedirector();
+
+private:
+    virtual int_type overflow(int_type ch) override;
+    virtual std::streamsize xsputn(const char_type* s, std::streamsize count) override;
+
+private:
+    SpinLock m_lock;
+    std::ostream& m_stream;
+    std::streambuf* m_old_buf;
+    TaggedLogger m_logger;
+    Color m_color;
+    std::string m_buffer;
+};
+
+
+}
+#endif
diff --git a/Common/Cpp/Logging/TaggedLogger.cpp b/Common/Cpp/Logging/TaggedLogger.cpp
new file mode 100644
index 0000000000..2840349cb7
--- /dev/null
+++ b/Common/Cpp/Logging/TaggedLogger.cpp
@@ -0,0 +1,35 @@
+/*  Tagged Logger
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Time.h"
+#include "TaggedLogger.h"
+
+namespace PokemonAutomation{
+
+
+TaggedLogger::TaggedLogger(Logger& logger, std::string tag)
+    : m_logger(logger)
+{
+    m_tags.emplace_back(std::move(tag));
+}
+TaggedLogger::TaggedLogger(TaggedLogger& logger, std::string tag)
+    : m_logger(logger.base_logger())
+    , m_tags(logger.m_tags)
+{
+    m_tags.emplace_back(std::move(tag));
+}
+
+void TaggedLogger::log(const std::string& msg, Color color){
+    std::string str = current_time_to_str() + " - ";
+    for (const std::string& tag : m_tags){
+        str += "[" + tag + "]";
+    }
+    str += ": " + msg;
+    m_logger.log(std::move(str), color);
+}
+
+
+}
diff --git a/Common/Cpp/Logging/TaggedLogger.h b/Common/Cpp/Logging/TaggedLogger.h
new file mode 100644
index 0000000000..2513b4c34d
--- /dev/null
+++ b/Common/Cpp/Logging/TaggedLogger.h
@@ -0,0 +1,49 @@
+/*  Tagged Logger
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  A logger wrapper that prepends a timestamp and tag to each log message.
+ *  Useful for categorizing log output from different components.
+ */
+
+#ifndef PokemonAutomation_Logging_TaggedLogger_H
+#define PokemonAutomation_Logging_TaggedLogger_H
+
+#include <string>
+#include <vector>
+#include "AbstractLogger.h"
+
+namespace PokemonAutomation{
+
+
+// Wrapper around another logger to prepend a timestamp and tag string to each message.
+// Format: "<timestamp> - [<tag>]: <message>"
+//
+// Example usage:
+//   FileLogger file_logger(config);
+//   TaggedLogger tagged(file_logger, "Network");
+//   tagged.log("Connection established");
+//   // Output: "2024-01-15 10:30:45.123 - [Network]: Connection established"
+class TaggedLogger : public Logger{
+public:
+    //  Construct a TaggedLogger that wraps the given base logger.
+    //  All log messages will be prefixed with a timestamp and the given tag.
+    TaggedLogger(Logger& logger, std::string tag);
+
+    //  Constructs a TaggedLogger from an existing one by appending another tag.
+    TaggedLogger(TaggedLogger& logger, std::string tag);
+
+    //  Get the underlying base logger.
+    Logger& base_logger(){ return m_logger; }
+
+    //  Logger interface: prepends timestamp and tag, then forwards to base logger.
+    virtual void log(const std::string& msg, Color color = Color()) override;
+
+private:
+    Logger& m_logger;
+    std::vector<std::string> m_tags;
+};
+
+
+}
+#endif
diff --git a/Common/Cpp/MemoryUtilization/MemoryUtilization.cpp b/Common/Cpp/MemoryUtilization/MemoryUtilization.cpp
new file mode 100644
index 0000000000..785e01b539
--- /dev/null
+++ b/Common/Cpp/MemoryUtilization/MemoryUtilization.cpp
@@ -0,0 +1,31 @@
+/*  Memory Utilization
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+
+#include "MemoryUtilization.h"
+
+#if 0
+
+#elif _WIN32
+#include "MemoryUtilization_Windows.tpp"
+
+#elif __APPLE__
+#include "MemoryUtilization_Mac.tpp"
+
+#elif __linux
+#include "MemoryUtilization_Linux.tpp"
+
+#else
+
+namespace PokemonAutomation{
+    MemoryUsage process_memory_usage(){
+        return MemoryUsage{};
+    }
+}
+
+#endif
+
+
diff --git a/Common/Cpp/MemoryUtilization/MemoryUtilization.h b/Common/Cpp/MemoryUtilization/MemoryUtilization.h
new file mode 100644
index 0000000000..bd793995b8
--- /dev/null
+++ b/Common/Cpp/MemoryUtilization/MemoryUtilization.h
@@ -0,0 +1,29 @@
+/*  Memory Utilization
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_MemoryUtilization_H
+#define PokemonAutomation_MemoryUtilization_H
+
+#include <cstddef>
+
+namespace PokemonAutomation{
+
+
+struct MemoryUsage{
+    size_t total_system_memory = 0; // in bytes
+    size_t total_used_system_memory = 0;  // in bytes
+    size_t process_physical_memory = 0;  // in bytes
+    size_t process_virtual_memory = 0;  // in bytes
+};
+
+
+MemoryUsage process_memory_usage();
+
+
+}
+
+
+#endif
\ No newline at end of file
diff --git a/Common/Cpp/MemoryUtilization/MemoryUtilization_Linux.tpp b/Common/Cpp/MemoryUtilization/MemoryUtilization_Linux.tpp
new file mode 100644
index 0000000000..6472024595
--- /dev/null
+++ b/Common/Cpp/MemoryUtilization/MemoryUtilization_Linux.tpp
@@ -0,0 +1,130 @@
+/*  Memory Utilization
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_MemoryUtilization_Linux_TPP
+#define PokemonAutomation_MemoryUtilization_Linux_TPP
+
+#include <stdint.h>
+#include <utility>
+#include <string>
+#include <fstream>
+#include <iostream>
+#include <unistd.h>
+#include "MemoryUtilization.h"
+
+namespace PokemonAutomation{
+
+
+
+uint64_t parse_integer(const char*& ptr){
+    uint64_t ret = 0;
+
+    //  Skip the white space.
+    while (true){
+        char ch = *ptr;
+        switch (ch){
+        case '\0':
+            return ret;
+        case ' ':
+        case '\t':
+            ptr++;
+            continue;
+        default:;
+        }
+        break;
+    }
+
+    //  Parse the integer.
+    while (true){
+        char ch = *ptr++;
+        if (ch < '0' || ch > '9'){
+            break;
+        }
+        ret *= 10;
+        ret += ch - '0';
+    }
+
+    return ret;
+}
+
+MemoryUsage process_memory_usage(){
+    MemoryUsage usage;
+
+    uint64_t page_size = sysconf(_SC_PAGE_SIZE);
+
+    usage.total_system_memory = (uint64_t)sysconf(_SC_PHYS_PAGES) * page_size;
+
+    {
+        uint64_t bytes = 0;
+
+#if 1
+        const std::string TOKEN = "MemAvailable:";
+
+        std::ifstream file("/proc/meminfo");
+        std::string line;
+        while (std::getline(file, line)){
+//            cout << line << endl;
+
+            size_t pos = line.find(TOKEN);
+            if (pos == std::string::npos){
+                continue;
+            }
+
+            //  Skip the token.
+            pos += TOKEN.size();
+
+            const char* ptr = &line[pos];
+            bytes = parse_integer(ptr) * 1024;
+
+            break;
+        }
+#endif
+
+        if (bytes == 0){
+            bytes = (uint64_t)sysconf(_SC_AVPHYS_PAGES) * page_size;
+        }
+        bytes = std::min(bytes, usage.total_system_memory);
+
+        usage.total_used_system_memory = usage.total_system_memory - bytes;
+    }
+
+    uint64_t swapped = 0;
+    {
+        const std::string VmRSS = "VmRSS:";
+        const std::string VmSwap = "VmSwap:";
+
+        pid_t current_pid = getpid();
+        std::ifstream file("/proc/" + std::to_string(current_pid) + "/status");
+        std::string line;
+        while (std::getline(file, line)){
+//            cout << line << endl;
+
+            size_t pos = line.find(VmRSS);
+            if (pos != std::string::npos){
+                pos += VmRSS.size();
+                const char* ptr = &line[pos];
+                usage.process_physical_memory = parse_integer(ptr) * 1024;
+                continue;
+            }
+            pos = line.find(VmSwap);
+            if (pos != std::string::npos){
+                pos += VmSwap.size();
+                const char* ptr = &line[pos];
+                swapped = parse_integer(ptr) * 1024;
+                continue;
+            }
+        }
+        usage.process_virtual_memory = usage.process_physical_memory + swapped;
+    }
+
+    return usage;
+}
+
+
+
+
+}
+#endif
diff --git a/Common/Cpp/MemoryUtilization/MemoryUtilization_Mac.tpp b/Common/Cpp/MemoryUtilization/MemoryUtilization_Mac.tpp
new file mode 100644
index 0000000000..b2d70c680f
--- /dev/null
+++ b/Common/Cpp/MemoryUtilization/MemoryUtilization_Mac.tpp
@@ -0,0 +1,159 @@
+/*  Memory Utilization
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_MemoryUtilization_Mac_TPP
+#define PokemonAutomation_MemoryUtilization_Mac_TPP
+
+#include <iostream>
+#include <sys/types.h>
+#include <sys/sysctl.h>
+#include <mach/mach.h>
+#include <mach/mach_host.h>
+#include <mach/mach_vm.h>
+#include <mach/vm_statistics.h>
+
+#include "MemoryUtilization.h"
+
+namespace PokemonAutomation{
+
+
+
+/**
+ * @brief Retrieves and analyzes the virtual memory regions of the current process.
+ */
+void analyze_vm_regions(){
+    kern_return_t kr;
+    mach_port_t task = mach_task_self();
+
+    mach_vm_address_t address = 0;
+    mach_vm_size_t size = 0;
+
+    vm_region_basic_info_data_64_t info;
+    mach_msg_type_number_t info_count = VM_REGION_BASIC_INFO_COUNT_64;
+
+    mach_port_t object_name;
+
+    // Total virtual memory usage
+    mach_vm_size_t total_size = 0;
+
+    std::cout << "Analyzing virtual memory regions for current process..." << std::endl;
+
+    // Loop through all virtual memory regions
+    while (true){
+        kr = mach_vm_region(task, &address, &size, VM_REGION_BASIC_INFO_64, (vm_region_info_t)&info, &info_count, &object_name);
+
+        if (kr == KERN_INVALID_ADDRESS){
+            // Reached the end of the address space
+            break;
+        }else if (kr != KERN_SUCCESS){
+            std::cerr << "mach_vm_region failed with error: " << kr << std::endl;
+            break;
+        }
+
+        // Add region size to total
+        total_size += size;
+
+        // Print details of the current region
+        std::cout << "Region at address " << (void*)address
+                  << ", size " << size << " bytes"
+                  << ", protection: ";
+
+        if (info.protection & VM_PROT_READ){
+            std::cout << "R";
+        }
+        if (info.protection & VM_PROT_WRITE){
+            std::cout << "W";
+        }
+        if (info.protection & VM_PROT_EXECUTE){
+            std::cout << "X";
+        }
+        std::cout << std::endl;
+
+        // Move to the next region
+        address += size;
+    }
+
+    std::cout << "\nTotal virtual memory allocated: " << total_size << " bytes" << std::endl;
+    std::cout << "Approximately " << (double)total_size / 1048576.0 << " MB" << std::endl;
+}
+
+
+
+MemoryUsage process_memory_usage(){
+    MemoryUsage usage;
+    static int64_t physical_memory = 0;
+    if (physical_memory == 0){
+        int mib[] = {CTL_HW, HW_MEMSIZE};
+        size_t length = sizeof(physical_memory);
+        if (sysctl(mib, 2, &physical_memory, &length, NULL, 0) != 0){
+            std::cerr << "Error calling sysctl()." << std::endl;
+        }
+    }
+    usage.total_system_memory = physical_memory;
+    {
+        task_vm_info_data_t tvi;
+        mach_msg_type_number_t count = TASK_VM_INFO_COUNT;
+        if(KERN_SUCCESS == task_info(mach_task_self(), TASK_VM_INFO, (task_info_t) &tvi, &count))
+        {
+            usage.process_physical_memory = tvi.resident_size; // resident_size = internal + external + reusable
+        }else{
+            std::cerr << "Failed to get task info." << std::endl;
+        }
+    }
+    {
+        mach_vm_size_t size = 0;
+        vm_region_extended_info_data_t info;
+        mach_msg_type_number_t count = VM_REGION_EXTENDED_INFO_COUNT;
+        mach_port_t object_name;
+        unsigned int pages_swapped_out = 0;
+
+        for (mach_vm_address_t address = 0;; address += size){
+            auto kr = mach_vm_region(mach_task_self(), &address, &size, VM_REGION_EXTENDED_INFO, (vm_region_info_t)&info, &count, &object_name);
+            if (kr != KERN_SUCCESS){
+                if (kr == KERN_INVALID_ADDRESS) { // end of the address space
+                    break;
+                }
+                std::cerr << "mach_vm_region failed with error: " << mach_error_string(kr) << std::endl;
+                break;
+            }
+            pages_swapped_out += info.pages_swapped_out;
+            address += size;
+        }
+        usage.process_virtual_memory = usage.process_physical_memory + (size_t)pages_swapped_out * (size_t)vm_page_size;
+    }
+    // ref: https://github.com/htop-dev/htop/blob/main/darwin/Platform.c
+    #ifdef __arm64__
+    {
+        vm_statistics64_data_t vm_stats;
+        mach_msg_type_number_t count = HOST_VM_INFO64_COUNT;
+        if (KERN_SUCCESS == host_statistics64(mach_host_self(), HOST_VM_INFO64, (host_info_t)&vm_stats, &count)){
+            auto used = vm_stats.active_count + vm_stats.inactive_count +
+              vm_stats.speculative_count + vm_stats.wire_count + vm_stats.compressor_page_count
+              - vm_stats.purgeable_count - vm_stats.external_page_count;
+            usage.total_used_system_memory = (size_t)used * (size_t)vm_page_size;
+        }else{
+            std::cerr << "Failed to get host statistics64." << std::endl;
+        }
+    }
+    #else
+    {
+        vm_statistics_data_t vm_stats;
+        mach_msg_type_number_t count = HOST_VM_INFO_COUNT;
+        if (KERN_SUCCESS == host_statistics(mach_host_self(), HOST_VM_INFO, (host_info_t)&vm_stats, &count)){
+            usage.total_used_system_memory = (size_t)(vm_stats.active_count + vm_stats.wire_count) * (size_t)vm_page_size;
+        }else{
+            std::cerr << "Failed to get host statistics." << std::endl;
+        }
+    }
+    #endif
+    return usage;
+}
+
+
+
+
+}
+#endif
diff --git a/Common/Cpp/MemoryUtilization/MemoryUtilization_Windows.tpp b/Common/Cpp/MemoryUtilization/MemoryUtilization_Windows.tpp
new file mode 100644
index 0000000000..96e17ecd38
--- /dev/null
+++ b/Common/Cpp/MemoryUtilization/MemoryUtilization_Windows.tpp
@@ -0,0 +1,54 @@
+/*  Memory Utilization
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_MemoryUtilization_Mac_TPP
+#define PokemonAutomation_MemoryUtilization_Mac_TPP
+
+#include <Windows.h>
+#include <psapi.h>
+#include "MemoryUtilization.h"
+
+namespace PokemonAutomation{
+
+
+
+MemoryUsage process_memory_usage(){
+    MemoryUsage ret;
+    {
+        MEMORYSTATUSEX data;
+        data.dwLength = sizeof(data);
+        if (GlobalMemoryStatusEx(&data)){
+            ret.total_system_memory = data.ullTotalPhys;
+            ret.total_used_system_memory = data.ullTotalPhys - data.ullAvailPhys;
+        }
+    }
+    {
+        PROCESS_MEMORY_COUNTERS_EX2 data;
+        if (GetProcessMemoryInfo(
+            GetCurrentProcess(),
+            (PROCESS_MEMORY_COUNTERS*)&data,
+            sizeof(data)
+        )){
+            if (data.cb >= sizeof(PROCESS_MEMORY_COUNTERS_EX2)){
+                ret.process_physical_memory = data.PrivateWorkingSetSize;
+            }else{
+                ret.process_physical_memory = data.WorkingSetSize;
+            }
+            ret.process_virtual_memory = data.PagefileUsage;
+        }
+    }
+    {
+        ULONGLONG data;
+        if (GetPhysicallyInstalledSystemMemory(&data)){
+            ret.total_system_memory = data * 1024;
+        }
+    }
+    return ret;
+}
+
+
+}
+#endif
diff --git a/Common/Cpp/MoveOnlyFunction.h b/Common/Cpp/MoveOnlyFunction.h
new file mode 100644
index 0000000000..9cc71f3422
--- /dev/null
+++ b/Common/Cpp/MoveOnlyFunction.h
@@ -0,0 +1,118 @@
+/*  Move-Only Function
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  A callable wrapper that can be moved but not copied.
+ *
+ *  Prefer this over std::function for a callback that has one owner.
+ *  Copying a std::function copies its callable, so a stateful lambda
+ *  silently splits into two independent states. And std::function cannot
+ *  hold a lambda that captures a move-only object (e.g. std::unique_ptr).
+ *
+ *  This is std::move_only_function (C++23) where the standard library has
+ *  it. Apple's libc++ (Xcode 26 / Apple Clang 21) does not, so this header
+ *  has a minimal fallback for the plain "R(Args...)" signature. Delete the
+ *  fallback once every supported compiler defines
+ *  __cpp_lib_move_only_function.
+ *
+ */
+
+#ifndef PokemonAutomation_MoveOnlyFunction_H
+#define PokemonAutomation_MoveOnlyFunction_H
+
+#include <version>
+#include <functional>
+
+#ifndef __cpp_lib_move_only_function
+#include <cstddef>
+#include <memory>
+#include <type_traits>
+#include <utility>
+#endif
+
+namespace PokemonAutomation{
+
+
+
+#ifdef __cpp_lib_move_only_function
+
+template <typename Signature>
+using MoveOnlyFunction = std::move_only_function<Signature>;
+
+#else
+
+template <typename Signature>
+class MoveOnlyFunction;
+
+template <typename R, typename... Args>
+class MoveOnlyFunction<R(Args...)>{
+public:
+    MoveOnlyFunction() noexcept = default;
+    MoveOnlyFunction(std::nullptr_t) noexcept {}
+
+    template <typename Function>
+        requires (
+            !std::is_same_v<std::remove_cvref_t<Function>, MoveOnlyFunction> &&
+            std::is_invocable_r_v<R, std::decay_t<Function>&, Args...>
+        )
+    MoveOnlyFunction(Function&& function){
+        using Stored = std::decay_t<Function>;
+        //  Like std::move_only_function, a null function pointer makes an
+        //  empty wrapper.
+        if constexpr (std::is_pointer_v<Stored> || std::is_member_pointer_v<Stored>){
+            if (function == nullptr){
+                return;
+            }
+        }
+        m_callable = std::make_unique<Holder<Stored>>(std::forward<Function>(function));
+    }
+
+    MoveOnlyFunction(MoveOnlyFunction&&) noexcept = default;
+    MoveOnlyFunction& operator=(MoveOnlyFunction&&) noexcept = default;
+    MoveOnlyFunction(const MoveOnlyFunction&) = delete;
+    MoveOnlyFunction& operator=(const MoveOnlyFunction&) = delete;
+
+    explicit operator bool() const noexcept{
+        return m_callable != nullptr;
+    }
+    friend bool operator==(const MoveOnlyFunction& function, std::nullptr_t) noexcept{
+        return !function;
+    }
+
+    //  Calling an empty wrapper is undefined, as for std::move_only_function.
+    R operator()(Args... args){
+        return m_callable->call(std::forward<Args>(args)...);
+    }
+
+
+private:
+    class Callable{
+    public:
+        virtual ~Callable() = default;
+        virtual R call(Args&&... args) = 0;
+    };
+
+    template <typename Stored>
+    class Holder final : public Callable{
+    public:
+        template <typename Source>
+        explicit Holder(Source&& source)
+            : m_stored(std::forward<Source>(source))
+        {}
+        virtual R call(Args&&... args) override{
+            return std::invoke_r<R>(m_stored, std::forward<Args>(args)...);
+        }
+
+    private:
+        Stored m_stored;
+    };
+
+    std::unique_ptr<Callable> m_callable;
+};
+
+#endif
+
+
+
+}
+#endif
diff --git a/Common/Cpp/MoveOnlyFunction_Tests.cpp b/Common/Cpp/MoveOnlyFunction_Tests.cpp
new file mode 100644
index 0000000000..992dda8fd7
--- /dev/null
+++ b/Common/Cpp/MoveOnlyFunction_Tests.cpp
@@ -0,0 +1,190 @@
+/*  Move-Only Function Tests
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <format>
+#include <memory>
+#include <string>
+#include <type_traits>
+#include <utility>
+#include "TestRunners/UnitTestDatabase.h"
+#include "MoveOnlyFunction.h"
+#include "MoveOnlyFunction_Tests.h"
+
+namespace PokemonAutomation{
+namespace{
+
+
+
+//  Copying would fork a stateful callable, so it must not compile.
+static_assert(!std::is_copy_constructible_v<MoveOnlyFunction<void()>>);
+static_assert(!std::is_copy_assignable_v<MoveOnlyFunction<void()>>);
+static_assert(std::is_nothrow_move_constructible_v<MoveOnlyFunction<void()>>);
+
+
+
+std::string expected_int(const char* what, int expected, int actual){
+    return std::format("{}: expected {}, got {}", what, expected, actual);
+}
+
+
+
+class Test_MoveOnlyFunction_MoveOnlyCapture : public UnitTest{
+public:
+    Test_MoveOnlyFunction_MoveOnlyCapture()
+        : UnitTest("Common::MoveOnlyFunction - Move-only capture")
+    {}
+
+    virtual UnitTestResult run(Logger& logger, CancellableScope& scope) const override{
+        auto value = std::make_unique<int>(42);
+        MoveOnlyFunction<int(int)> function = [value = std::move(value)](int add){
+            return *value + add;
+        };
+        int actual = function(1);
+        if (actual != 43){
+            return UnitTestResult(expected_int("call with a unique_ptr capture", 43, actual));
+        }
+
+        MoveOnlyFunction<int(int)> moved = std::move(function);
+        actual = moved(2);
+        if (actual != 44){
+            return UnitTestResult(expected_int("call after a move", 44, actual));
+        }
+        return true;
+    }
+};
+
+
+
+class Test_MoveOnlyFunction_StateNotForked : public UnitTest{
+public:
+    Test_MoveOnlyFunction_StateNotForked()
+        : UnitTest("Common::MoveOnlyFunction - Moving keeps one state")
+    {}
+
+    virtual UnitTestResult run(Logger& logger, CancellableScope& scope) const override{
+        MoveOnlyFunction<int()> counter = [count = 0]() mutable{
+            return ++count;
+        };
+        int actual = counter();
+        if (actual != 1){
+            return UnitTestResult(expected_int("first call", 1, actual));
+        }
+
+        //  The moved-to wrapper continues the same count.
+        MoveOnlyFunction<int()> constructed = std::move(counter);
+        actual = constructed();
+        if (actual != 2){
+            return UnitTestResult(expected_int("call after a move construction", 2, actual));
+        }
+
+        MoveOnlyFunction<int()> assigned;
+        assigned = std::move(constructed);
+        actual = assigned();
+        if (actual != 3){
+            return UnitTestResult(expected_int("call after a move assignment", 3, actual));
+        }
+        return true;
+    }
+};
+
+
+
+int return_seven(){
+    return 7;
+}
+
+class Test_MoveOnlyFunction_Empty : public UnitTest{
+public:
+    Test_MoveOnlyFunction_Empty()
+        : UnitTest("Common::MoveOnlyFunction - Empty is false")
+    {}
+
+    virtual UnitTestResult run(Logger& logger, CancellableScope& scope) const override{
+        MoveOnlyFunction<int()> defaulted;
+        if (defaulted){
+            return UnitTestResult("default constructed: expected empty, got non-empty");
+        }
+        MoveOnlyFunction<int()> from_nullptr = nullptr;
+        if (from_nullptr){
+            return UnitTestResult("constructed from nullptr: expected empty, got non-empty");
+        }
+        int (*null_pointer)() = nullptr;
+        MoveOnlyFunction<int()> from_null_pointer = null_pointer;
+        if (from_null_pointer){
+            return UnitTestResult("constructed from a null function pointer: expected empty, got non-empty");
+        }
+
+        MoveOnlyFunction<int()> from_pointer = &return_seven;
+        if (!from_pointer){
+            return UnitTestResult("constructed from a function pointer: expected non-empty, got empty");
+        }
+        int actual = from_pointer();
+        if (actual != 7){
+            return UnitTestResult(expected_int("call through a function pointer", 7, actual));
+        }
+        return true;
+    }
+};
+
+
+
+class Test_MoveOnlyFunction_Reassignment : public UnitTest{
+public:
+    Test_MoveOnlyFunction_Reassignment()
+        : UnitTest("Common::MoveOnlyFunction - Reassignment")
+    {}
+
+    virtual UnitTestResult run(Logger& logger, CancellableScope& scope) const override{
+        //  The use count shows whether the wrapper still holds the first
+        //  callable.
+        auto token = std::make_shared<int>(1);
+        MoveOnlyFunction<int()> function = [token]{
+            return *token;
+        };
+        int actual = function();
+        if (actual != 1){
+            return UnitTestResult(expected_int("first callable", 1, actual));
+        }
+
+        function = []{
+            return 2;
+        };
+        actual = function();
+        if (actual != 2){
+            return UnitTestResult(expected_int("call after reassignment", 2, actual));
+        }
+        actual = (int)token.use_count();
+        if (actual != 1){
+            return UnitTestResult(expected_int("token owners after reassignment", 1, actual));
+        }
+
+        function = nullptr;
+        if (function){
+            return UnitTestResult("assigned nullptr: expected empty, got non-empty");
+        }
+        if (function != nullptr){
+            return UnitTestResult("assigned nullptr: expected == nullptr, got != nullptr");
+        }
+        return true;
+    }
+};
+
+
+
+} // anonymous namespace
+
+
+
+void add_tests_MoveOnlyFunction(UnitTestDatabase& database){
+    database.add<Test_MoveOnlyFunction_MoveOnlyCapture>();
+    database.add<Test_MoveOnlyFunction_StateNotForked>();
+    database.add<Test_MoveOnlyFunction_Empty>();
+    database.add<Test_MoveOnlyFunction_Reassignment>();
+}
+
+
+
+}
diff --git a/Common/Cpp/MoveOnlyFunction_Tests.h b/Common/Cpp/MoveOnlyFunction_Tests.h
new file mode 100644
index 0000000000..c43f518bdc
--- /dev/null
+++ b/Common/Cpp/MoveOnlyFunction_Tests.h
@@ -0,0 +1,21 @@
+/*  Move-Only Function Tests
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_MoveOnlyFunction_Tests_H
+#define PokemonAutomation_MoveOnlyFunction_Tests_H
+
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+
+namespace PokemonAutomation{
+
+
+
+void add_tests_MoveOnlyFunction(UnitTestDatabase& database);
+
+
+
+}
+#endif
diff --git a/Common/Cpp/Options/BatchOption.cpp b/Common/Cpp/Options/BatchOption.cpp
index 9148258b1f..a3747e0ad6 100644
--- a/Common/Cpp/Options/BatchOption.cpp
+++ b/Common/Cpp/Options/BatchOption.cpp
@@ -1,12 +1,11 @@
 /*  Batch Option
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include <string>
 #include <vector>
-#include "Common/Compiler.h"
 #include "Common/Cpp/Containers/Pimpl.tpp"
 #include "Common/Cpp/Containers/FixedLimitVector.tpp"
 #include "Common/Cpp/Json/JsonValue.h"
@@ -28,27 +27,27 @@ struct BatchOption::Data{
 
 
 BatchOption::~BatchOption() = default;
-BatchOption::BatchOption(LockWhileRunning lock_while_program_is_running, bool horizontal)
-    : ConfigOption(lock_while_program_is_running)
+BatchOption::BatchOption(LockMode lock_while_program_is_running, bool horizontal)
+    : UiState<BatchOption, ConfigOption>(lock_while_program_is_running)
     , m_data(CONSTRUCT_TOKEN, horizontal)
 {}
 void BatchOption::add_option(ConfigOption& option, std::string serialization_string){
     m_data->m_options.emplace_back(&option, std::move(serialization_string));
 }
 
-void BatchOption::load_json(const JsonValue& json){
-    const JsonObject* obj = json.get_object();
-    if (obj == nullptr){
-        return;
-    }
-    for (auto& item : m_data->m_options){
-        if (!item.second.empty()){
-            const JsonValue* value = obj->get_value(item.second);
-            if (value){
-                item.first->load_json(*value);
-            }
+std::string BatchOption::check_validity() const{
+    for (const auto& item : m_data->m_options){
+        std::string error = item.first->check_validity();
+        if (!error.empty()){
+            return error;
         }
     }
+    return std::string();
+}
+void BatchOption::restore_defaults(){
+    for (const auto& item : m_data->m_options){
+        item.first->restore_defaults();
+    }
 }
 JsonValue BatchOption::to_json() const{
     JsonObject obj;
@@ -59,21 +58,21 @@ JsonValue BatchOption::to_json() const{
     }
     return obj;
 }
-
-std::string BatchOption::check_validity() const{
-    for (const auto& item : m_data->m_options){
-        std::string error = item.first->check_validity();
-        if (!error.empty()){
-            return error;
-        }
+void BatchOption::load_json(const JsonValue& json){
+    const JsonObject* obj = json.to_object();
+    if (obj == nullptr){
+        return;
     }
-    return std::string();
-}
-void BatchOption::restore_defaults(){
-    for (const auto& item : m_data->m_options){
-        item.first->restore_defaults();
+    for (auto& item : m_data->m_options){
+        if (!item.second.empty()){
+            const JsonValue* value = obj->get_value(item.second);
+            if (value){
+                item.first->load_json(*value);
+            }
+        }
     }
 }
+
 void BatchOption::reset_state(){
     for (const auto& item : m_data->m_options){
         item.first->reset_state();
diff --git a/Common/Cpp/Options/BatchOption.h b/Common/Cpp/Options/BatchOption.h
index 2af3f75a47..c8ac257570 100644
--- a/Common/Cpp/Options/BatchOption.h
+++ b/Common/Cpp/Options/BatchOption.h
@@ -1,6 +1,6 @@
 /*  Batch Option
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -14,10 +14,10 @@
 namespace PokemonAutomation{
 
 // A ConfigOption that groups one or more options.
-class BatchOption : public ConfigOption{
+class BatchOption : public UiState<BatchOption, ConfigOption>{
 public:
     ~BatchOption();
-    BatchOption(LockWhileRunning lock_while_program_is_running, bool horizontal = false);
+    BatchOption(LockMode lock_while_program_is_running, bool horizontal = false);
 
 public:
     //  This is not thread-safe with the rest of this class. You must
@@ -29,17 +29,16 @@ class BatchOption : public ConfigOption{
 
 
 public:
-    virtual void load_json(const JsonValue& json) override;
+    virtual std::string check_validity() const override;
+    virtual void restore_defaults() override;
     virtual JsonValue to_json() const override;
+    virtual void load_json(const JsonValue& json) override;
 
-    std::string check_validity() const override;
-    virtual void restore_defaults() override;
-    virtual void reset_state() override;
 
+public:
+    virtual void reset_state() override;
     virtual void report_program_state(bool program_is_running) override;
 
-    virtual ConfigWidget* make_QtWidget(QWidget& parent) override;
-
     bool horizontal() const;
     FixedLimitVector<ConfigOption*> options() const;
 
diff --git a/Common/Cpp/Options/BooleanCheckBoxOption.cpp b/Common/Cpp/Options/BooleanCheckBoxOption.cpp
index 55562a9f6e..729da64a1f 100644
--- a/Common/Cpp/Options/BooleanCheckBoxOption.cpp
+++ b/Common/Cpp/Options/BooleanCheckBoxOption.cpp
@@ -1,6 +1,6 @@
 /*  Boolean Option
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -16,6 +16,8 @@
 namespace PokemonAutomation{
 
 
+
+
 struct BooleanCheckBoxCell::Data{
     const bool m_default;
     std::atomic<bool> m_current;
@@ -28,21 +30,21 @@ struct BooleanCheckBoxCell::Data{
 
 BooleanCheckBoxCell::~BooleanCheckBoxCell() = default;
 BooleanCheckBoxCell::BooleanCheckBoxCell(const BooleanCheckBoxCell& x)
-    : ConfigOption(x)
+    : UiState<BooleanCheckBoxCell, ConfigOption>(x)
     , m_data(CONSTRUCT_TOKEN, x.default_value(), x.current_value())
 {}
 BooleanCheckBoxCell::BooleanCheckBoxCell(
-    LockWhileRunning lock_while_running,
+    LockMode lock_while_running,
     bool default_value, bool current_value
 )
-    : ConfigOption(lock_while_running)
+    : UiState<BooleanCheckBoxCell, ConfigOption>(lock_while_running)
     , m_data(CONSTRUCT_TOKEN, default_value, current_value)
 {}
 BooleanCheckBoxCell::BooleanCheckBoxCell(
-    LockWhileRunning lock_while_running,
+    LockMode lock_while_running,
     bool default_value
 )
-    : ConfigOption(lock_while_running)
+    : UiState<BooleanCheckBoxCell, ConfigOption>(lock_while_running)
     , m_data(CONSTRUCT_TOKEN, default_value, default_value)
 {}
 
@@ -57,39 +59,40 @@ BooleanCheckBoxCell::operator bool() const{
 }
 void BooleanCheckBoxCell::operator=(bool x){
     if (x != m_data->m_current.exchange(x, std::memory_order_relaxed)){
-        report_value_changed();
+        report_value_changed(this);
     }
 }
+
+void BooleanCheckBoxCell::restore_defaults(){
+    *this = m_data->m_default;
+}
+JsonValue BooleanCheckBoxCell::to_json() const{
+    return (bool)*this;
+}
 void BooleanCheckBoxCell::load_json(const JsonValue& json){
     bool value;
     if (json.read_boolean(value)){
         *this = value;
     }
 }
-JsonValue BooleanCheckBoxCell::to_json() const{
-    return (bool)*this;
-}
-void BooleanCheckBoxCell::restore_defaults(){
-    *this = m_data->m_default;
-}
 
 
 
 
 BooleanCheckBoxOption::BooleanCheckBoxOption(
     std::string label,
-    LockWhileRunning lock_while_running,
+    LockMode lock_while_running,
     bool default_value
 )
-    : BooleanCheckBoxCell(lock_while_running, default_value)
+    : UiState<BooleanCheckBoxOption, BooleanCheckBoxCell>(lock_while_running, default_value)
     , m_label(std::move(label))
 {}
 BooleanCheckBoxOption::BooleanCheckBoxOption(
     std::string label,
-    LockWhileRunning lock_while_running,
+    LockMode lock_while_running,
     bool default_value, bool value
 )
-    : BooleanCheckBoxCell(lock_while_running, default_value, value)
+    : UiState<BooleanCheckBoxOption, BooleanCheckBoxCell>(lock_while_running, default_value, value)
     , m_label(std::move(label))
 {}
 
diff --git a/Common/Cpp/Options/BooleanCheckBoxOption.h b/Common/Cpp/Options/BooleanCheckBoxOption.h
index 537ad080c0..7aa91d08cd 100644
--- a/Common/Cpp/Options/BooleanCheckBoxOption.h
+++ b/Common/Cpp/Options/BooleanCheckBoxOption.h
@@ -1,6 +1,6 @@
 /*  Boolean Option
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -14,18 +14,19 @@ namespace PokemonAutomation{
 
 
 
-class BooleanCheckBoxCell : public ConfigOption{
+class BooleanCheckBoxCell : public UiState<BooleanCheckBoxCell, ConfigOption>{
 public:
     ~BooleanCheckBoxCell();
     BooleanCheckBoxCell(const BooleanCheckBoxCell& x);
     BooleanCheckBoxCell(
-        LockWhileRunning lock_while_running,
+        LockMode lock_while_running,
         bool default_value, bool current_value
     );
 
+
 public:
     BooleanCheckBoxCell(
-        LockWhileRunning lock_while_running,
+        LockMode lock_while_running,
         bool default_value
     );
 
@@ -35,12 +36,12 @@ class BooleanCheckBoxCell : public ConfigOption{
     operator bool() const;
     void operator=(bool x);
 
-    virtual void load_json(const JsonValue& json) override;
-    virtual JsonValue to_json() const override;
 
+public:
     virtual void restore_defaults() override;
+    virtual JsonValue to_json() const override;
+    virtual void load_json(const JsonValue& json) override;
 
-    virtual ConfigWidget* make_QtWidget(QWidget& parent) override;
 
 protected:
     struct Data;
@@ -50,24 +51,23 @@ class BooleanCheckBoxCell : public ConfigOption{
 
 
 
-class BooleanCheckBoxOption : public BooleanCheckBoxCell{
+class BooleanCheckBoxOption : public UiState<BooleanCheckBoxOption, BooleanCheckBoxCell>{
 public:
     BooleanCheckBoxOption(const BooleanCheckBoxOption& x) = delete;
     BooleanCheckBoxOption(
         std::string label,
-        LockWhileRunning lock_while_running,
+        LockMode lock_while_running,
         bool default_value
     );
     BooleanCheckBoxOption(
         std::string label,
-        LockWhileRunning lock_while_running,
+        LockMode lock_while_running,
         bool default_value, bool value
     );
 
     const std::string& label() const{ return m_label; }
     using BooleanCheckBoxCell::operator=;
 
-    virtual ConfigWidget* make_QtWidget(QWidget& parent) override;
 
 private:
     const std::string m_label;
diff --git a/Common/Cpp/Options/BoxFloatOption.cpp b/Common/Cpp/Options/BoxFloatOption.cpp
new file mode 100644
index 0000000000..2927db3f4d
--- /dev/null
+++ b/Common/Cpp/Options/BoxFloatOption.cpp
@@ -0,0 +1,225 @@
+/*  Box Float Option
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Containers/Pimpl.tpp"
+#include "Common/Cpp/Concurrency/SpinLock.h"
+#include "Common/Cpp/Json/JsonObject.h"
+#include "BoxFloatOption.h"
+
+namespace PokemonAutomation{
+
+
+
+struct BoxFloatOption::Data{
+    std::string m_label;
+    double m_default_x;
+    double m_default_y;
+    double m_default_width;
+    double m_default_height;
+
+    double m_x;
+    double m_y;
+    double m_width;
+    double m_height;
+
+    mutable SpinLock m_lock;
+};
+
+
+
+BoxFloatOption::~BoxFloatOption() = default;
+BoxFloatOption::BoxFloatOption(
+    std::string label,
+    LockMode lock_while_running,
+    double default_x,
+    double default_y,
+    double default_width,
+    double default_height
+)
+    : UiState<BoxFloatOption, ConfigOption>(lock_while_running)
+    , m_data(CONSTRUCT_TOKEN)
+{
+    Data& self = *m_data;
+
+    self.m_label = std::move(label);
+
+    set_all(default_x, default_y, default_width, default_height);
+
+    self.m_default_x = self.m_x;
+    self.m_default_y = self.m_y;
+    self.m_default_width = self.m_width;
+    self.m_default_height = self.m_height;
+}
+const std::string& BoxFloatOption::label() const{
+    return m_data->m_label;
+}
+double BoxFloatOption::x() const{
+    return m_data->m_x;
+}
+double BoxFloatOption::y() const{
+    return m_data->m_y;
+}
+double BoxFloatOption::width() const{
+    return m_data->m_width;
+}
+double BoxFloatOption::height() const{
+    return m_data->m_height;
+}
+
+
+bool BoxFloatOption::sanitize(double& x, double& y, double& width, double& height) const{
+    bool changed = false;
+
+    if (x < 0.0){
+        x = 0.0;
+        changed = true;
+    }
+    if (x > 1.0){
+        x = 1.0;
+        changed = true;
+    }
+
+    if (y < 0.0){
+        y = 0.0;
+        changed = true;
+    }
+    if (y > 1.0){
+        y = 1.0;
+        changed = true;
+    }
+
+    if (width < 0.0){
+        width = 0.0;
+        changed = true;
+    }
+    if (width > 1.0){
+        width = 1.0;
+        changed = true;
+    }
+
+    if (height < 0.0){
+        height = 0.0;
+        changed = true;
+    }
+    if (height > 1.0){
+        height = 1.0;
+        changed = true;
+    }
+
+    if (x + width > 1.00000000001){
+        width = 1.0 - x;
+        changed = true;
+    }
+    if (y + height > 1.00000000001){
+        height = 1.0 - y;
+        changed = true;
+    }
+
+    return changed;
+}
+void BoxFloatOption::get_all(double& x, double& y, double& width, double& height) const{
+    const Data& self = *m_data;
+
+    ReadSpinLock lg(self.m_lock);
+    x = self.m_x;
+    y = self.m_y;
+    width = self.m_width;
+    height = self.m_height;
+}
+void BoxFloatOption::set_all(double x, double y, double width, double height){
+    sanitize(x, y, width, height);
+
+    Data& self = *m_data;
+    bool changed = false;
+
+    {
+        WriteSpinLock lg(self.m_lock);
+
+        changed |= self.m_x != x;
+        changed |= self.m_y != y;
+        changed |= self.m_width != width;
+        changed |= self.m_height != height;
+
+        self.m_x = x;
+        self.m_y = y;
+        self.m_width = width;
+        self.m_height = height;
+    }
+
+    if (changed){
+        report_value_changed(this);
+    }
+}
+
+
+std::string BoxFloatOption::check_validity() const{
+    double x, y, width, height;
+    get_all(x, y, width, height);
+
+    if (x < 0 || x > 1.0){
+        return "x must be between 0.0 and 1.0.";
+    }
+    if (y < 0 || y > 1.0){
+        return "y must be between 0.0 and 1.0.";
+    }
+    if (width < 0 || width > 1.0){
+        return "width must be between 0.0 and 1.0.";
+    }
+    if (height < 0 || height > 1.0){
+        return "height must be between 0.0 and 1.0.";
+    }
+    if (x + width > 1.00000000001){
+        return "x + width must be <= 1.0.";
+    }
+    if (y + height > 1.00000000001){
+        return "y + height must be <= 1.0.";
+    }
+
+    return std::string();
+}
+void BoxFloatOption::restore_defaults(){
+    Data& self = *m_data;
+    set_all(
+        self.m_default_x,
+        self.m_default_y,
+        self.m_default_width,
+        self.m_default_height
+    );
+}
+JsonValue BoxFloatOption::to_json() const{
+    double x, y, width, height;
+    get_all(x, y, width, height);
+
+    JsonObject ret;
+    ret["x"] = std::to_string(x);
+    ret["y"] = std::to_string(y);
+    ret["width"] = std::to_string(width);
+    ret["height"] = std::to_string(height);
+    return ret;
+}
+void BoxFloatOption::load_json(const JsonValue& json){
+    const JsonObject* obj = json.to_object();
+    if (obj == nullptr){
+        return;
+    }
+
+    double x, y, width, height;
+    get_all(x, y, width, height);
+
+    obj->read_float(x, "x");
+    obj->read_float(y, "y");
+    obj->read_float(width, "width");
+    obj->read_float(height, "height");
+
+    set_all(x, y, width, height);
+}
+
+
+
+
+
+}
+
diff --git a/Common/Cpp/Options/BoxFloatOption.h b/Common/Cpp/Options/BoxFloatOption.h
new file mode 100644
index 0000000000..c1f0a1b911
--- /dev/null
+++ b/Common/Cpp/Options/BoxFloatOption.h
@@ -0,0 +1,56 @@
+/*  Box Float Option
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Options_BoxFloatOption_H
+#define PokemonAutomation_Options_BoxFloatOption_H
+
+#include "Common/Cpp/Containers/Pimpl.h"
+#include "Common/Cpp/Options/ConfigOption.h"
+
+namespace PokemonAutomation{
+
+
+class BoxFloatOption : public UiState<BoxFloatOption, ConfigOption>{
+public:
+    ~BoxFloatOption();
+    BoxFloatOption(
+        std::string label,
+        LockMode lock_while_running,
+        double default_x,
+        double default_y,
+        double default_width,
+        double default_height
+    );
+
+    const std::string& label() const;
+    double x() const;
+    double y() const;
+    double width() const;
+    double height() const;
+
+    //  Returns true if a value was changed.
+    bool sanitize(double& x, double& y, double& width, double& height) const;
+
+    void get_all(double& x, double& y, double& width, double& height) const;
+    void set_all(double x, double y, double width, double height);
+
+
+public:
+    virtual std::string check_validity() const override;
+    virtual void restore_defaults() override;
+    virtual JsonValue to_json() const override;
+    virtual void load_json(const JsonValue& json) override;
+
+
+private:
+    struct Data;
+    Pimpl<Data> m_data;
+};
+
+
+
+}
+#endif
diff --git a/Common/Cpp/Options/ButtonOption.cpp b/Common/Cpp/Options/ButtonOption.cpp
new file mode 100644
index 0000000000..65f4e0a57e
--- /dev/null
+++ b/Common/Cpp/Options/ButtonOption.cpp
@@ -0,0 +1,242 @@
+/*  Button Option
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <set>
+#include <atomic>
+#include "Common/Cpp/Containers/Pimpl.tpp"
+#include "Common/Cpp/Concurrency/SpinLock.h"
+#include "Common/Cpp/Strings/StringTools.h"
+//#include "Common/Cpp/Json/JsonValue.h"
+#include "ButtonOption.h"
+
+namespace PokemonAutomation{
+
+
+struct ButtonCell::Data{
+    std::atomic<Enabled> m_state;
+
+    mutable SpinLock m_text_lock;
+    std::string m_text;
+
+    std::atomic<int> m_button_height;
+    std::atomic<int> m_text_size;
+
+    mutable SpinLock m_listener_lock;
+    std::set<ButtonListener*> m_listeners;
+
+    Data(
+        Enabled state,
+        std::string text,
+        int button_height,
+        int text_size
+    )
+        : m_state(state)
+        , m_text(std::move(text))
+        , m_button_height(button_height)
+        , m_text_size(text_size)
+    {}
+
+    std::string text() const{
+        ReadSpinLock lg(m_text_lock);
+        return m_text;
+    }
+};
+
+ButtonCell::~ButtonCell() = default;
+ButtonCell::ButtonCell(const ButtonCell& x)
+    : UiState<ButtonCell, ConfigOption>(x)
+    , m_data(
+        CONSTRUCT_TOKEN,
+        x.m_data->m_state,
+        x.m_data->text(),
+        x.m_data->m_button_height.load(std::memory_order_relaxed),
+        x.m_data->m_text_size.load(std::memory_order_relaxed)
+    )
+{}
+ButtonCell::ButtonCell(
+    std::string text,
+    int button_height,
+    int text_size
+)
+    : UiState<ButtonCell, ConfigOption>(LockMode::UNLOCK_WHILE_RUNNING)
+    , m_data(CONSTRUCT_TOKEN, ButtonCell::ENABLED, std::move(text), button_height, text_size)
+{}
+ButtonCell::ButtonCell(
+    Enabled state,
+    std::string text,
+    int button_height,
+    int text_size
+)
+    : UiState<ButtonCell, ConfigOption>(LockMode::UNLOCK_WHILE_RUNNING)
+    , m_data(CONSTRUCT_TOKEN, state, std::move(text), button_height, text_size)
+{}
+
+void ButtonCell::add_listener(ButtonListener& listener){
+    WriteSpinLock lg(m_data->m_listener_lock);
+    m_data->m_listeners.insert(&listener);
+}
+void ButtonCell::remove_listener(ButtonListener& listener){
+    WriteSpinLock lg(m_data->m_listener_lock);
+    m_data->m_listeners.erase(&listener);
+}
+
+bool ButtonCell::is_enabled() const{
+    return m_data->m_state.load(std::memory_order_relaxed) == Enabled::ENABLED;
+}
+void ButtonCell::set_enabled(bool enabled){
+    Enabled e = enabled ? ENABLED : DISABLED;
+    if (e != m_data->m_state.exchange(e, std::memory_order_relaxed)){
+        report_value_changed(this);
+    }
+}
+std::string ButtonCell::text() const{
+    return m_data->text();
+}
+int ButtonCell::button_height() const{
+    return m_data->m_button_height.load(std::memory_order_relaxed);
+}
+int ButtonCell::text_size() const{
+    return m_data->m_text_size.load(std::memory_order_relaxed);
+}
+void ButtonCell::set_text(std::string text){
+    {
+        WriteSpinLock lg(m_data->m_text_lock);
+        if (text == m_data->m_text){
+            return;
+        }
+        m_data->m_text = std::move(text);
+    }
+    report_value_changed(this);
+}
+
+void ButtonCell::press_button(){
+    ReadSpinLock lg(m_data->m_listener_lock);
+    for (ButtonListener* listener : m_data->m_listeners){
+        listener->on_press(*this);
+    }
+}
+
+
+
+
+
+
+struct ButtonOption::Data{
+    mutable SpinLock m_label_lock;
+    std::string m_label;
+
+    Data(std::string label)
+        : m_label(std::move(label))
+    {}
+};
+
+
+ButtonOption::~ButtonOption() = default;
+ButtonOption::ButtonOption(
+    std::string label,
+    std::string text,
+    int button_height,
+    int text_size
+)
+    : UiState<ButtonOption, ButtonCell>(std::move(text), button_height, text_size)
+    , m_data(CONSTRUCT_TOKEN, std::move(label))
+{}
+ButtonOption::ButtonOption(
+    std::string label,
+    Enabled state,
+    std::string text,
+    int button_height,
+    int text_size
+)
+    : UiState<ButtonOption, ButtonCell>(state, std::move(text), button_height, text_size)
+    , m_data(CONSTRUCT_TOKEN, std::move(label))
+{}
+
+
+std::string ButtonOption::label() const{
+    ReadSpinLock lg(m_data->m_label_lock);
+    return m_data->m_label;
+}
+void ButtonOption::set_label(std::string label){
+    {
+        WriteSpinLock lg(m_data->m_label_lock);
+        if (label == m_data->m_label){
+            return;
+        }
+        m_data->m_label = std::move(label);
+    }
+    report_value_changed(this);
+}
+
+
+
+
+
+struct DeferredStopButtonOption::Data{
+    std::atomic<bool> m_stop_requested;
+    std::string m_ready_text;
+    std::string m_pressed_text;
+
+    Data(const std::string& iteration_name)
+        : m_stop_requested(false)
+        , m_ready_text("Stop after Current " + StringTools::capitalize(iteration_name))
+        , m_pressed_text("Program will stop after current " + StringTools::uncapitalize(iteration_name) + "...")
+    {}
+};
+
+
+DeferredStopButtonOption::ResetOnExit::ResetOnExit(DeferredStopButtonOption& button)
+    : m_button(button)
+{
+    button.reset_and_ready();
+}
+
+DeferredStopButtonOption::ResetOnExit::~ResetOnExit(){
+    m_button.set_idle();
+}
+
+
+DeferredStopButtonOption::~DeferredStopButtonOption(){
+}
+
+DeferredStopButtonOption::DeferredStopButtonOption(
+    const std::string& iteration_name,
+    int button_height,
+    int text_size
+)
+    : ButtonOption(
+        "<b>Stop after current " + StringTools::uncapitalize(iteration_name) + ":",
+        ButtonCell::DISABLED,
+        "Stop after Current " + StringTools::capitalize(iteration_name),
+        button_height,
+        text_size
+    )
+    , m_data(CONSTRUCT_TOKEN, iteration_name)
+{}
+
+bool DeferredStopButtonOption::should_stop() const{
+    return m_data->m_stop_requested.load(std::memory_order_relaxed);
+}
+
+void DeferredStopButtonOption::reset_and_ready(){
+    m_data->m_stop_requested.store(false, std::memory_order_relaxed);
+    this->set_enabled(true);
+    this->set_text(m_data->m_ready_text);
+}
+
+void DeferredStopButtonOption::set_idle(){
+    this->set_enabled(false);
+    this->set_text(m_data->m_ready_text);
+}
+
+void DeferredStopButtonOption::press_button(){
+    m_data->m_stop_requested.store(true, std::memory_order_relaxed);
+    this->set_enabled(false);
+    this->set_text(m_data->m_pressed_text);
+}
+
+
+}
diff --git a/Common/Cpp/Options/ButtonOption.h b/Common/Cpp/Options/ButtonOption.h
new file mode 100644
index 0000000000..911078b169
--- /dev/null
+++ b/Common/Cpp/Options/ButtonOption.h
@@ -0,0 +1,158 @@
+/*  Button Option
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Options_ButtonOption_H
+#define PokemonAutomation_Options_ButtonOption_H
+
+#include "Common/Cpp/Containers/Pimpl.h"
+#include "Common/Cpp/Options/ConfigOption.h"
+
+namespace PokemonAutomation{
+
+class ButtonCell;
+
+struct ButtonListener{
+    virtual void on_press(ButtonCell& button) = 0;
+};
+
+
+class ButtonCell : public UiState<ButtonCell, ConfigOption>{
+public:
+    enum Enabled : bool{
+        DISABLED,
+        ENABLED,
+    };
+
+
+public:
+    virtual ~ButtonCell();
+    ButtonCell(const ButtonCell& x);
+    ButtonCell(
+        std::string text,
+        int button_height = 0,
+        int text_size = 0
+    );
+    ButtonCell(
+        Enabled state,
+        std::string text,
+        int button_height = 0,
+        int text_size = 0
+    );
+
+    using ConfigOption::add_listener;
+    using ConfigOption::remove_listener;
+    void add_listener(ButtonListener& listener);
+    void remove_listener(ButtonListener& listener);
+
+
+public:
+    bool is_enabled() const;
+    void set_enabled(bool enabled);
+
+    std::string text() const;
+    void set_text(std::string text);
+
+    int button_height() const;
+    int text_size() const;
+
+    virtual void press_button();
+
+
+protected:
+    struct Data;
+    Pimpl<Data> m_data;
+};
+
+
+
+class ButtonOption : public UiState<ButtonOption, ButtonCell>{
+public:
+    virtual ~ButtonOption();
+    ButtonOption(const ButtonOption& x) = delete;
+    ButtonOption(
+        std::string label,  // the description of the button, shown on the left side of the button
+        std::string text,   // the text appearing on the button
+        int button_height = 0,
+        int text_size = 0
+    );
+    ButtonOption(
+        std::string label,  // the description of the button, shown on the left side of the button
+        Enabled state,
+        std::string text,   // the text appearing on the button
+        int button_height = 0,
+        int text_size = 0
+    );
+
+    std::string label() const;
+    void set_label(std::string label);
+
+
+private:
+    struct Data;
+    Pimpl<Data> m_data;
+};
+
+
+
+//  A button that allows graceful stopping after completing the iteration in a looping program.
+//  This button manages its own state and can be queried to determine if a stop has been requested
+//  by user.
+//
+//  Usage:
+//    1. Add as a member: DeferredStopButtonOption STOP_BUTTON;
+//    2. In constructor: PA_ADD_OPTION(STOP_BUTTON);
+//    3. At program start:
+//       DeferredStopButtonOption::ResetOnExit reset_on_exit(STOP_BUTTON);
+//    4. In main loop: if (STOP_BUTTON.should_stop()) break;
+//    5. On program exit: ResetOnExit will automatically reset the button via RAII
+class DeferredStopButtonOption : public ButtonOption{
+public:
+    virtual ~DeferredStopButtonOption();
+    DeferredStopButtonOption(const DeferredStopButtonOption& x) = delete;
+
+    //  iteration_name: The name of the unit of work (e.g., "Batch", "Round", "Iteration")
+    //  Used to construct button text like "Stop after Current Batch"
+    //  Can be capitalized or uncapitalized.
+    DeferredStopButtonOption(
+        const std::string& iteration_name = "Iteration",
+        int button_height = 0,
+        int text_size = 16
+    );
+
+    //  RAII guard to automatically reset button when program exits
+    //  Define this guard at beginning of a program running session.
+    class ResetOnExit{
+    public:
+        ResetOnExit(DeferredStopButtonOption& button);
+        ~ResetOnExit();
+    private:
+        DeferredStopButtonOption& m_button;
+    };
+
+    //  Called by the program to check if user has pressed the button to
+    //  request a stop.
+    bool should_stop() const;
+
+    virtual void press_button() override;
+
+private:
+    //  Reset the button to be ready to press during a program run.
+    //  This is usually called by ResetOnExit.
+    void reset_and_ready();
+
+    //  Set button to idle statle after whena program finishes running.
+    //  This is usually called by ResetOnExit.
+    void set_idle();
+
+    friend ResetOnExit;
+    struct Data;
+    Pimpl<Data> m_data;
+};
+
+
+
+}
+#endif
diff --git a/Common/Cpp/Options/CheckboxDropdownDatabase.h b/Common/Cpp/Options/CheckboxDropdownDatabase.h
new file mode 100644
index 0000000000..b9d4578e33
--- /dev/null
+++ b/Common/Cpp/Options/CheckboxDropdownDatabase.h
@@ -0,0 +1,93 @@
+/*  Checkbox Dropdown Database
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *      A database that goes with a checkbox dropdown menu.
+ *
+ *  This database contains information about the enum such as the display names
+ *  and serialization slugs.
+ *
+ *  This database is used to initialize an CheckboxDropdownCell/Option.
+ *
+ */
+
+#ifndef PokemonAutomation_Options_CheckboxDropdownDatabase_H
+#define PokemonAutomation_Options_CheckboxDropdownDatabase_H
+
+#include <vector>
+#include <map>
+#include "Common/Cpp/Exceptions.h"
+
+namespace PokemonAutomation{
+
+
+
+template <typename FlagEnum>
+struct FlagEnumEntry{
+    FlagEnum value;
+    std::string slug;
+    std::string display;
+};
+
+
+template <typename FlagEnum>
+class CheckboxDropdownDatabase{
+    using Entry = FlagEnumEntry<FlagEnum>;
+
+public:
+    CheckboxDropdownDatabase() = default;
+    CheckboxDropdownDatabase(std::initializer_list<Entry> list){
+        for (auto iter = list.begin(); iter != list.end(); ++iter){
+            add(iter->value, std::move(iter->slug), std::move(iter->display));
+        }
+    }
+
+    //  Warning, these functions do not have strong exception safety!
+    //  If these throw, this class will be in a bad state.
+    void add(Entry entry){
+        Entry& e = m_list.emplace_back(std::move(entry));
+
+        auto ret = m_slug_to_enum.emplace(e.slug, &e);
+        if (!ret.second){
+            throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Duplicate Enum Slug: " + e.slug);
+        }
+    }
+    void add(FlagEnum value, std::string slug, std::string display){
+        add(Entry{value, std::move(slug), std::move(display)});
+    }
+
+
+public:
+    size_t size() const{
+        return m_list.size();
+    }
+    const Entry& operator[](size_t index) const{
+        return m_list[index];
+    }
+    const FlagEnum* find_slug(const std::string& slug) const{
+        auto iter = m_slug_to_enum.find(slug);
+        if (iter == m_slug_to_enum.end()){
+            return nullptr;
+        }
+        return &iter->second->value;
+    }
+
+public:
+    auto begin() const{
+        return m_list.begin();
+    }
+    auto end() const{
+        return m_list.end();
+    }
+
+
+private:
+    std::vector<Entry> m_list;
+    std::map<std::string, const Entry*> m_slug_to_enum;
+};
+
+
+
+
+}
+#endif
diff --git a/Common/Cpp/Options/CheckboxDropdownOption.cpp b/Common/Cpp/Options/CheckboxDropdownOption.cpp
new file mode 100644
index 0000000000..0c9a307e07
--- /dev/null
+++ b/Common/Cpp/Options/CheckboxDropdownOption.cpp
@@ -0,0 +1,11 @@
+/*  Checkbox Dropdown Option
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+
+namespace PokemonAutomation{
+
+
+}
diff --git a/Common/Cpp/Options/CheckboxDropdownOption.h b/Common/Cpp/Options/CheckboxDropdownOption.h
new file mode 100644
index 0000000000..d6607a3ba2
--- /dev/null
+++ b/Common/Cpp/Options/CheckboxDropdownOption.h
@@ -0,0 +1,125 @@
+/*  Checkbox Dropdown Option
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *      Same as EnumDropdown, but allows multiple selections.
+ *
+ */
+
+#ifndef PokemonAutomation_Options_CheckboxDropdownOption_H
+#define PokemonAutomation_Options_CheckboxDropdownOption_H
+
+#include "Common/Cpp/Concurrency/SpinLock.h"
+#include "ConfigOption.h"
+
+namespace PokemonAutomation{
+
+
+template <typename FlagEnum>
+class CheckboxDropdownDatabase;
+
+
+class CheckboxDropdownBase : public UiState<CheckboxDropdownBase, ConfigOption>{
+public:
+    CheckboxDropdownBase(std::string label)
+        : m_label(std::move(label))
+    {}
+
+    virtual std::string current_label() const = 0;
+    virtual size_t size() const = 0;
+    virtual const std::string& name_at_index(size_t index) const = 0;
+
+    virtual bool operator[](size_t index) const = 0;
+    virtual void set_index(size_t index) = 0;
+    virtual void clear_index(size_t index) = 0;
+    virtual void toggle_index(size_t index) = 0;
+
+
+protected:
+    std::string m_label;
+};
+
+
+
+template <typename FlagEnum>
+class CheckboxDropdownCell : public CheckboxDropdownBase{
+    using Database = CheckboxDropdownDatabase<FlagEnum>;
+
+public:
+    //  If "label" is not empty, it will always display that on the dropdown.
+    //  If "label" is empty, it will display the checked items instead.
+    CheckboxDropdownCell(
+        std::string label,
+        const Database& database,
+        LockMode lock_while_running,
+        FlagEnum default_value
+    );
+    CheckboxDropdownCell(
+        std::string label,
+        const Database& database,
+        LockMode lock_while_running,
+        FlagEnum default_value, FlagEnum current_value
+    );
+    CheckboxDropdownCell(
+        std::string label,
+        Database&& database,
+        LockMode lock_while_running,
+        FlagEnum default_value
+    ) = delete;
+    CheckboxDropdownCell(
+        std::string label,
+        Database&& database,
+        LockMode lock_while_running,
+        FlagEnum default_value, FlagEnum current_value
+    ) = delete;
+
+    FlagEnum default_value() const{
+        return m_default;
+    }
+    FlagEnum current_value() const;
+    operator FlagEnum() const{
+        return current_value();
+    }
+
+
+public:
+    bool is_set(FlagEnum value) const;
+
+    void replace_all(FlagEnum value);
+    void clear();
+
+    void set_flag(FlagEnum value);
+    void clear_flag(FlagEnum value);
+    void toggle_flag(FlagEnum value);
+
+
+public:
+    virtual std::string current_label() const override;
+    virtual size_t size() const override;
+    virtual const std::string& name_at_index(size_t index) const override;
+
+    virtual bool operator[](size_t index) const override;
+    virtual void set_index(size_t index) override;
+    virtual void clear_index(size_t index) override;
+    virtual void toggle_index(size_t index) override;
+
+
+public:
+    virtual void restore_defaults() override;
+    virtual JsonValue to_json() const override;
+    virtual void load_json(const JsonValue& json) override;
+
+
+private:
+    const Database& m_database;
+    const FlagEnum m_default;
+
+    mutable SpinLock m_lock;
+    FlagEnum m_current;
+};
+
+
+
+
+}
+#endif
diff --git a/Common/Cpp/Options/CheckboxDropdownOption.tpp b/Common/Cpp/Options/CheckboxDropdownOption.tpp
new file mode 100644
index 0000000000..8858447f7f
--- /dev/null
+++ b/Common/Cpp/Options/CheckboxDropdownOption.tpp
@@ -0,0 +1,195 @@
+/*  Checkbox Dropdown Option
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *      Same as EnumDropdown, but allows multiple selections.
+ *
+ */
+
+#ifndef PokemonAutomation_Options_CheckboxDropdownOption_TPP
+#define PokemonAutomation_Options_CheckboxDropdownOption_TPP
+
+#include "Common/Cpp/Json/JsonArray.h"
+#include "CheckboxDropdownDatabase.h"
+#include "CheckboxDropdownOption.h"
+
+namespace PokemonAutomation{
+
+
+
+template <typename FlagEnum>
+CheckboxDropdownCell<FlagEnum>::CheckboxDropdownCell(
+    std::string label,
+    const Database& database,
+    LockMode lock_while_running,
+    FlagEnum default_value
+)
+    : CheckboxDropdownBase(std::move(label))
+    , m_database(database)
+    , m_default(default_value)
+    , m_current(default_value)
+{}
+template <typename FlagEnum>
+CheckboxDropdownCell<FlagEnum>::CheckboxDropdownCell(
+    std::string label,
+    const Database& database,
+    LockMode lock_while_running,
+    FlagEnum default_value, FlagEnum current_value
+)
+    : CheckboxDropdownBase(std::move(label))
+    , m_database(database)
+    , m_default(default_value)
+    , m_current(current_value)
+{}
+
+
+template <typename FlagEnum>
+FlagEnum CheckboxDropdownCell<FlagEnum>::current_value() const{
+    ReadSpinLock lg(m_lock, PA_CURRENT_FUNCTION);
+    return m_current;
+}
+
+
+template <typename FlagEnum>
+std::string CheckboxDropdownCell<FlagEnum>::current_label() const{
+    ReadSpinLock lg(m_lock, PA_CURRENT_FUNCTION);
+    if (!m_label.empty()){
+        return m_label;
+    }
+
+    std::string ret;
+    bool first = true;
+    for (const FlagEnumEntry<FlagEnum>& entry : m_database){
+        if (is_empty(m_current & entry.value)){
+            continue;
+        }
+        if (!first){
+            ret += ", ";
+        }
+        first = false;
+
+        ret += entry.display;
+    }
+
+    if (ret.size() > 30){
+        ret = "( ... )";
+    }
+
+    return ret;
+}
+template <typename FlagEnum>
+bool CheckboxDropdownCell<FlagEnum>::is_set(FlagEnum value) const{
+    ReadSpinLock lg(m_lock, PA_CURRENT_FUNCTION);
+    return !is_empty(value & m_current);
+}
+template <typename FlagEnum>
+void CheckboxDropdownCell<FlagEnum>::replace_all(FlagEnum value){
+    {
+        WriteSpinLock lg(m_lock, PA_CURRENT_FUNCTION);
+        if (m_current == value){
+            return;
+        }
+        m_current = value;
+    }
+    report_value_changed(this);
+}
+template <typename FlagEnum>
+void CheckboxDropdownCell<FlagEnum>::clear(){
+    replace_all(empty_value((FlagEnum*)nullptr));
+}
+template <typename FlagEnum>
+void CheckboxDropdownCell<FlagEnum>::set_flag(FlagEnum value){
+    {
+        WriteSpinLock lg(m_lock, PA_CURRENT_FUNCTION);
+        if (!is_empty(m_current & value)){
+            return;
+        }
+        m_current |= value;
+    }
+    report_value_changed(this);
+}
+template <typename FlagEnum>
+void CheckboxDropdownCell<FlagEnum>::clear_flag(FlagEnum value){
+    {
+        WriteSpinLock lg(m_lock, PA_CURRENT_FUNCTION);
+        if (is_empty(m_current & value)){
+            return;
+        }
+        m_current |= value;
+        m_current ^= value;
+    }
+    report_value_changed(this);
+}
+template <typename FlagEnum>
+void CheckboxDropdownCell<FlagEnum>::toggle_flag(FlagEnum value){
+    {
+        WriteSpinLock lg(m_lock, PA_CURRENT_FUNCTION);
+        m_current ^= value;
+    }
+    report_value_changed(this);
+}
+
+template <typename FlagEnum>
+size_t CheckboxDropdownCell<FlagEnum>::size() const{
+    return m_database.size();
+}
+template <typename FlagEnum>
+const std::string& CheckboxDropdownCell<FlagEnum>::name_at_index(size_t index) const{
+    return m_database[index].display;
+}
+template <typename FlagEnum>
+bool CheckboxDropdownCell<FlagEnum>::operator[](size_t index) const{
+    return is_set(m_database[index].value);
+}
+template <typename FlagEnum>
+void CheckboxDropdownCell<FlagEnum>::set_index(size_t index){
+    set_flag(m_database[index].value);
+}
+template <typename FlagEnum>
+void CheckboxDropdownCell<FlagEnum>::clear_index(size_t index){
+    clear_flag(m_database[index].value);
+}
+template <typename FlagEnum>
+void CheckboxDropdownCell<FlagEnum>::toggle_index(size_t index){
+    toggle_flag(m_database[index].value);
+}
+
+
+
+
+template <typename FlagEnum>
+void CheckboxDropdownCell<FlagEnum>::restore_defaults(){
+    WriteSpinLock lg(m_lock, PA_CURRENT_FUNCTION);
+    m_current = m_default;
+}
+template <typename FlagEnum>
+JsonValue CheckboxDropdownCell<FlagEnum>::to_json() const{
+    JsonArray ret;
+    for (const FlagEnumEntry<FlagEnum>& value : m_database){
+        if (is_set(value.value)){
+            ret.push_back(value.slug);
+        }
+    }
+    return ret;
+}
+template <typename FlagEnum>
+void CheckboxDropdownCell<FlagEnum>::load_json(const JsonValue& json){
+    m_current = empty_value((FlagEnum*)nullptr);
+    const JsonArray& array = json.to_array_throw();
+    for (const JsonValue& item : array){
+        const std::string slug = item.to_string_throw();
+        const FlagEnum* flag = m_database.find_slug(slug);
+        if (flag){
+            m_current |= *flag;
+        }
+    }
+}
+
+
+
+
+
+
+
+}
+#endif
diff --git a/Common/Cpp/Options/ColorOption.cpp b/Common/Cpp/Options/ColorOption.cpp
new file mode 100644
index 0000000000..9624e0ea35
--- /dev/null
+++ b/Common/Cpp/Options/ColorOption.cpp
@@ -0,0 +1,157 @@
+/*  Color Option
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Json/JsonValue.h"
+ #include "ColorOption.h"
+
+namespace PokemonAutomation{
+
+
+ColorCell::ColorCell(const ColorCell& x)
+    : UiState<ColorCell, ConfigOption>(x)
+    , m_default_value(x.m_default_value)
+    , m_current_value(x)
+{}
+ColorCell::ColorCell(
+    LockMode lock_while_running,
+    bool has_alpha,
+    uint32_t default_value, uint32_t current_value
+)
+    : UiState<ColorCell, ConfigOption>(lock_while_running)
+    , m_has_alpha(has_alpha)
+    , m_default_value(default_value)
+    , m_current_value(current_value)
+{
+    if (!m_has_alpha){
+        m_default_value &= 0x00ffffff;
+        m_current_value &= 0x00ffffff;
+    }
+}
+uint32_t ColorCell::default_value() const{
+    return m_default_value;
+}
+std::string ColorCell::to_str() const{
+    return color_to_str(*this, m_has_alpha);
+}
+std::string ColorCell::color_to_str(uint32_t color, bool has_alpha){
+    static const char HEX_DIGITS[] = "0123456789ABCDEF";
+    std::string str;
+    if (has_alpha){
+        str += HEX_DIGITS[(color >> 28) & 0xf];
+        str += HEX_DIGITS[(color >> 24) & 0xf];
+    }
+    str += HEX_DIGITS[(color >> 20) & 0xf];
+    str += HEX_DIGITS[(color >> 16) & 0xf];
+    str += HEX_DIGITS[(color >> 12) & 0xf];
+    str += HEX_DIGITS[(color >>  8) & 0xf];
+    str += HEX_DIGITS[(color >>  4) & 0xf];
+    str += HEX_DIGITS[(color >>  0) & 0xf];
+    return str;
+}
+ColorCell::operator uint32_t() const{
+    return m_current_value.load(std::memory_order_relaxed);
+}
+void ColorCell::set(uint32_t x){
+    if (!m_has_alpha){
+        x &= 0x00ffffff;
+    }
+    if (x != m_current_value.exchange(x, std::memory_order_relaxed)){
+        report_value_changed(this);
+    }
+}
+void ColorCell::set(const std::string& str){
+    size_t max_digits = m_has_alpha ? 8 : 6;
+
+    uint32_t x = 0;
+    size_t count = 0;
+    for (char ch : str){
+        if (count >= max_digits){
+            break;
+        }
+        switch (ch){
+        case '\0':
+            break;
+        case '-':
+        case ':':
+        case ' ':
+            continue;
+        }
+
+        if ('0' <= ch && ch <= '9'){
+            x <<= 4;
+            x |= ch - '0';
+            count++;
+            continue;
+        }
+        if ('a' <= ch && ch <= 'f'){
+            x <<= 4;
+            x |= ch - 'a' + 10;
+            count++;
+            continue;
+        }
+        if ('A' <= ch && ch <= 'F'){
+            x <<= 4;
+            x |= ch - 'A' + 10;
+            count++;
+            continue;
+        }
+
+        break;
+    }
+    if (!m_has_alpha){
+        x &= 0x00ffffff;
+    }
+    set(x);
+}
+
+void ColorCell::restore_defaults(){
+    set(m_default_value);
+}
+JsonValue ColorCell::to_json() const{
+    return (uint32_t)*this;
+}
+void ColorCell::load_json(const JsonValue& json){
+    uint32_t value;
+    if (!json.read_integer(value)){
+        return;
+    }
+    set(value);
+}
+
+
+
+
+
+ColorOption::ColorOption(
+    std::string label,
+    LockMode lock_while_running,
+    bool has_alpha,
+    uint32_t default_value, uint32_t current_value
+)
+    : UiState<ColorOption, ColorCell>(lock_while_running, has_alpha, default_value, current_value)
+    , m_label(std::move(label))
+{}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}
diff --git a/Common/Cpp/Options/ColorOption.h b/Common/Cpp/Options/ColorOption.h
new file mode 100644
index 0000000000..0b26d449eb
--- /dev/null
+++ b/Common/Cpp/Options/ColorOption.h
@@ -0,0 +1,67 @@
+/*  Color Option
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_ColorOption_H
+#define PokemonAutomation_ColorOption_H
+
+#include <atomic>
+#include "Common/Cpp/Options/ConfigOption.h"
+
+namespace PokemonAutomation{
+
+
+
+class ColorCell : public UiState<ColorCell, ConfigOption>{
+public:
+    ColorCell(const ColorCell& x);
+    ColorCell(
+        LockMode lock_while_running,
+        bool has_alpha,
+        uint32_t default_value, uint32_t current_value
+    );
+
+    uint32_t default_value() const;
+    std::string to_str() const;
+    static std::string color_to_str(uint32_t color, bool has_alpha);
+
+    operator uint32_t() const;
+    void set(uint32_t x);
+    void set(const std::string& str);
+
+
+public:
+    virtual void restore_defaults() override;
+    virtual JsonValue to_json() const override;
+    virtual void load_json(const JsonValue& json) override;
+
+
+private:
+    bool m_has_alpha;
+    uint32_t m_default_value;
+    std::atomic<uint32_t> m_current_value;
+};
+
+
+class ColorOption : public UiState<ColorOption, ColorCell>{
+public:
+    ColorOption(
+        std::string label,
+        LockMode lock_while_running,
+        bool has_alpha,
+        uint32_t default_value, uint32_t current_value
+    );
+
+    const std::string& label() const{ return m_label; }
+
+
+private:
+    const std::string m_label;
+};
+
+
+
+}
+#endif
diff --git a/Common/Cpp/Options/ConfigOption.cpp b/Common/Cpp/Options/ConfigOption.cpp
index 1e718e1940..421a5b22ff 100644
--- a/Common/Cpp/Options/ConfigOption.cpp
+++ b/Common/Cpp/Options/ConfigOption.cpp
@@ -1,13 +1,13 @@
 /*  Config Option
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include <set>
+#include <atomic>
+#include "Common/Cpp/ListenerSet.h"
 #include "Common/Cpp/Containers/Pimpl.tpp"
 #include "Common/Cpp/Json/JsonValue.h"
-#include "Common/Cpp/Concurrency/SpinLock.h"
 #include "ConfigOption.h"
 
 //#include <iostream>
@@ -18,13 +18,13 @@ namespace PokemonAutomation{
 
 
 struct ConfigOption::Data{
-    mutable SpinLock lock;
-    bool lock_while_program_is_running;
+    const LockMode lock_mode;
     std::atomic<ConfigOptionState> visibility;
-    std::set<Listener*> listeners;
 
-    Data(bool p_lock_while_program_is_running, ConfigOptionState p_visibility)
-        : lock_while_program_is_running(p_lock_while_program_is_running)
+    ListenerSet<Listener> listeners;
+    
+    Data(LockMode p_lock_mode, ConfigOptionState p_visibility)
+        : lock_mode(p_lock_mode)
         , visibility(p_visibility)
     {}
 
@@ -49,66 +49,66 @@ struct ConfigOption::Data{
 
 ConfigOption::~ConfigOption() = default;
 ConfigOption::ConfigOption(const ConfigOption& x)
-    : m_data(CONSTRUCT_TOKEN, x.lock_while_program_is_running(), x.visibility())
+    : m_data(CONSTRUCT_TOKEN, x.lock_mode(), x.visibility())
 {}
 
 ConfigOption::ConfigOption()
-    : m_data(CONSTRUCT_TOKEN, true, ConfigOptionState::ENABLED)
+    : m_data(CONSTRUCT_TOKEN, LockMode::LOCK_WHILE_RUNNING, ConfigOptionState::ENABLED)
 {}
-ConfigOption::ConfigOption(LockWhileRunning lock_while_program_is_running)
-    : m_data(CONSTRUCT_TOKEN, lock_while_program_is_running == LockWhileRunning::LOCKED, ConfigOptionState::ENABLED)
+ConfigOption::ConfigOption(LockMode lock_mode)
+    : m_data(CONSTRUCT_TOKEN, lock_mode, ConfigOptionState::ENABLED)
 {}
 ConfigOption::ConfigOption(ConfigOptionState visibility)
-    : m_data(CONSTRUCT_TOKEN, true, visibility)
+    : m_data(CONSTRUCT_TOKEN, LockMode::LOCK_WHILE_RUNNING, visibility)
 {}
 
 void ConfigOption::add_listener(Listener& listener){
-    m_lifetime_sanitizer.check_usage();
+    auto scope = m_lifetime_sanitizer.check_scope();
     Data& data = *m_data;
-    SpinLockGuard lg(data.lock);
-    data.listeners.insert(&listener);
+    data.listeners.add(listener);
 }
 void ConfigOption::remove_listener(Listener& listener){
-    m_lifetime_sanitizer.check_usage();
+    auto scope = m_lifetime_sanitizer.check_scope();
     Data& data = *m_data;
-    SpinLockGuard lg(data.lock);
-    data.listeners.erase(&listener);
+    data.listeners.remove(listener);
 }
 size_t ConfigOption::total_listeners() const{
-    m_lifetime_sanitizer.check_usage();
+    auto scope = m_lifetime_sanitizer.check_scope();
     const Data& data = *m_data;
-    SpinLockGuard lg(data.lock);
-    return data.listeners.size();
+    return data.listeners.count_unique();
 }
 
 
 
 
 
-void ConfigOption::load_json(const JsonValue& json){
+std::string ConfigOption::check_validity() const{
     m_lifetime_sanitizer.check_usage();
+    return std::string();
 }
-JsonValue ConfigOption::to_json() const{
+void ConfigOption::restore_defaults(){
     m_lifetime_sanitizer.check_usage();
-    return JsonValue();
 }
-bool ConfigOption::lock_while_program_is_running() const{
+JsonValue ConfigOption::to_json() const{
     m_lifetime_sanitizer.check_usage();
-    return m_data->lock_while_program_is_running;
+    return JsonValue();
 }
-std::string ConfigOption::check_validity() const{
+void ConfigOption::load_json(const JsonValue& json){
     m_lifetime_sanitizer.check_usage();
-    return std::string();
 }
-void ConfigOption::restore_defaults(){
+
+
+
+LockMode ConfigOption::lock_mode() const{
     m_lifetime_sanitizer.check_usage();
+    return m_data->lock_mode;
 }
 ConfigOptionState ConfigOption::visibility() const{
     m_lifetime_sanitizer.check_usage();
     return m_data->visibility.load(std::memory_order_relaxed);
 }
 void ConfigOption::set_visibility(ConfigOptionState visibility){
-    m_lifetime_sanitizer.check_usage();
+    auto scope = m_lifetime_sanitizer.check_scope();
     if (m_data->set_visibility(visibility)){
         report_visibility_changed();
     }
@@ -116,33 +116,24 @@ void ConfigOption::set_visibility(ConfigOptionState visibility){
 
 
 void ConfigOption::report_visibility_changed(){
-    m_lifetime_sanitizer.check_usage();
+    auto scope = m_lifetime_sanitizer.check_scope();
     Data& data = *m_data;
-    SpinLockGuard lg(data.lock);
-    for (Listener* listener : data.listeners){
-        listener->visibility_changed();
-    }
+    data.listeners.run_method(&Listener::on_config_visibility_changed);
 }
 void ConfigOption::report_program_state(bool program_is_running){
-    m_lifetime_sanitizer.check_usage();
+    auto scope = m_lifetime_sanitizer.check_scope();
     Data& data = *m_data;
-    SpinLockGuard lg(data.lock);
-    for (Listener* listener : data.listeners){
-        listener->program_state_changed(program_is_running);
-    }
+    data.listeners.run_method(&Listener::on_program_state_changed, program_is_running);
 }
-void ConfigOption::report_value_changed(){
-    m_lifetime_sanitizer.check_usage();
+void ConfigOption::report_value_changed(void* object){
+    auto scope = m_lifetime_sanitizer.check_scope();
     Data& data = *m_data;
-    SpinLockGuard lg(data.lock);
-//    cout << "listeners = " << data.listeners.size() << endl;
-    for (Listener* listener : data.listeners){
-        listener->value_changed();
-    }
+    data.listeners.run_method(&Listener::on_config_value_changed, object);
 }
 
 
 
 
 
+
 }
diff --git a/Common/Cpp/Options/ConfigOption.h b/Common/Cpp/Options/ConfigOption.h
index d26a2f33a8..3d51d03683 100644
--- a/Common/Cpp/Options/ConfigOption.h
+++ b/Common/Cpp/Options/ConfigOption.h
@@ -1,6 +1,6 @@
 /*  Config Option
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -11,8 +11,7 @@
 #include "Common/Compiler.h"
 #include "Common/Cpp/LifetimeSanitizer.h"
 #include "Common/Cpp/Containers/Pimpl.h"
-
-class QWidget;
+#include "Common/Cpp/UiWrapper.h"
 
 namespace PokemonAutomation{
 
@@ -20,33 +19,52 @@ class JsonValue;
 class ConfigWidget;
 
 
-enum class LockWhileRunning{
-    UNLOCKED,
-    LOCKED,
+enum class LockMode{
+    UNLOCK_WHILE_RUNNING,
+    LOCK_WHILE_RUNNING,
+    READ_ONLY,
 };
 enum class ConfigOptionState{
     ENABLED,
-    DISABLED,
+    DISABLED, // aka locked
     HIDDEN,
 };
 
 
-// An option of a program, like the number of boxes of eggs to hatch,
-// the number of frames to skip, or what type of pokeballs to throw.
-// It is responsible for setting the UI (by calling make_ui()) of this option.
+// Abstract base class for An option of a program, like the number of boxes of
+// eggs to hatch, the number of frames to skip, or what type of pokeballs to throw.
+// It is responsible for setting the UI (by calling make_QtWidget()) of this option.
 // It also uses load_json() and to_json() to load and save the option to
 // a json file, so that the program can remember what user has selected.
-class ConfigOption{
+class ConfigOption : public UiState<>{
 public:
+    // the objects that listen to changes on the ConfigOption should inherit
+    // this Listener struct and call ConfigOption::add_listener() to add themselves
+    // to the listener set.
+    // Afterwards, whenever the config state is changed, all added listeners'
+    // corresponding member functions (e.g. value_changed()) will get called by
+    // the config option.
     struct Listener{
-        virtual void value_changed(){}
-        virtual void visibility_changed(){}
-        virtual void program_state_changed(bool program_is_running){}
+        //  When the config option value is changed, all added listeners' 
+        //  value_changed() will get called. 
+        //  object: the object that initiated the change. e.g. If the user changes
+        //  a UI content, object would be the UI option that is changed. This is
+        //  mainly used to avoid infinite loops. So if the initial change triggers
+        //  the original UI option's value_changed() get called, it will know that
+        //  object == this and therefore a loop is formed.
+        virtual void on_config_value_changed(void* object){}
+        //  When the config UI visibility is changed, all added listeners'
+        //  visibility_changed() will get called.
+        virtual void on_config_visibility_changed(){}
+        //  When the program state is changed, all added listeners'
+        //  program_state_changed() will get called.
+        virtual void on_program_state_changed(bool program_is_running){}
     };
     void add_listener(Listener& listener);
     void remove_listener(Listener& listener);
     size_t total_listeners() const;
 
+
 public:
     virtual ~ConfigOption();
     ConfigOption(ConfigOption&&) = delete;
@@ -54,36 +72,56 @@ class ConfigOption{
 protected:
     ConfigOption(const ConfigOption& x);
 
+
 public:
     ConfigOption();
-    ConfigOption(LockWhileRunning lock_while_program_is_running);
+    ConfigOption(LockMode lock_mode);
     ConfigOption(ConfigOptionState visibility);
 
-//    //  Deep copy this entire config. This will not copy listeners.
-//    //  Returns null if config cannot be copied.
-//    virtual std::unique_ptr<ConfigOption> clone() const = 0;
 
-    virtual void load_json(const JsonValue& json);
+public:
+    //  Returns error message if invalid. Otherwise returns empty string.
+    virtual std::string check_validity() const;
+    virtual void restore_defaults();
     virtual JsonValue to_json() const;
+    virtual void load_json(const JsonValue& json);
 
+
+public:
     //  Lifetime sanitizer
     void check_usage() const{
         m_lifetime_sanitizer.check_usage();
     }
+    LifetimeSanitizer::CheckScope check_scope() const{
+        return m_lifetime_sanitizer.check_scope();
+    }
 
-public:
-    bool lock_while_program_is_running() const;
 
-    //  Returns error message if invalid. Otherwise returns empty string.
-    virtual std::string check_validity() const;
+public:
+    //  Return the lock mode: how locking works on this option. It can be:
+    //  - UNLOCK_WHILE_RUNNING,
+    //  - LOCK_WHILE_RUNNING,
+    //  - READ_ONLY, (aka always locked)
+    //  This value is const throughout the ConfigOption lifetime. It is set
+    //  when constructing the ConfigOption.
+    LockMode lock_mode() const;
 
-    virtual void restore_defaults();
 
     //  This is called by the framework at the start of a program to reset any
     //  transient state that the option object may have.
     virtual void reset_state(){};
 
+    //  Thread-safe: return the current visibility state. It can be:
+    //  - ENABLED
+    //  - DISABLED
+    //  - HIDDEN
     ConfigOptionState visibility() const;
+    //  Thread-safe: set the option's visibility state. It can be:
+    //  - ENABLED
+    //  - DISABLED
+    //  - HIDDEN
+    //  If visibility changed, all attached listeners' on_config_visibility_changed()
+    //  will be called.
     virtual void set_visibility(ConfigOptionState visibility);
 
 
@@ -97,14 +135,12 @@ class ConfigOption{
     //  the user while the program is running.
     virtual void report_program_state(bool program_is_running);
 
+
 protected:
     //  Report that the value of this config has changed. This will be pushed to
     //  all listeners.
-    void report_value_changed();
-
+    void report_value_changed(void* object);
 
-public:
-    virtual ConfigWidget* make_QtWidget(QWidget& parent) = 0;
 
 private:
     struct Data;
@@ -116,5 +152,7 @@ class ConfigOption{
 
 
 
+
+
 }
 #endif
diff --git a/Common/Cpp/Options/DateOption.cpp b/Common/Cpp/Options/DateOption.cpp
index 083b8bfc61..9888d6a3a3 100644
--- a/Common/Cpp/Options/DateOption.cpp
+++ b/Common/Cpp/Options/DateOption.cpp
@@ -1,121 +1,194 @@
 /*  Date
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
+#include "Common/Cpp/Exceptions.h"
 #include "Common/Cpp/Json/JsonValue.h"
-#include "Common/Cpp/Json/JsonArray.h"
+//#include "Common/Cpp/Json/JsonArray.h"
+#include "Common/Cpp/Json/JsonObject.h"
 #include "DateOption.h"
 
 namespace PokemonAutomation{
 
 
 
-DateOption::DateOption(
-    std::string label,
-    QDate min_value, QDate max_value,
-    QDate default_value
+
+bool DateTimeCell::is_valid(const DateTime& date) const{
+    if (date.year < 0){
+        return false;
+    }
+    if (date.month < 0){
+        return false;
+    }
+    if (date.day < 0){
+        return false;
+    }
+
+    if (m_level < DATE_HOUR_MIN){
+        return true;
+    }
+
+    if (date.hour < 0){
+        return false;
+    }
+    if (date.minute < 0){
+        return false;
+    }
+
+    if (m_level < DATE_HOUR_MIN_SEC){
+        return true;
+    }
+
+    if (date.second < 0){
+        return false;
+    }
+
+    return true;
+}
+
+DateTimeCell::DateTimeCell(
+    LockMode lock_while_running,
+    Level level,
+    const DateTime& min_value, const DateTime& max_value,
+    const DateTime& default_value
 )
-    : m_label(std::move(label))
+    : UiState<DateTimeCell, ConfigOption>(lock_while_running)
+    , m_level(level)
     , m_min_value(min_value)
     , m_max_value(max_value)
     , m_default(default_value)
     , m_current(default_value)
-{}
-#if 0
-std::unique_ptr<ConfigOption> DateOption::clone() const{
-    std::unique_ptr<DateOption> ret(new DateOption(m_label, m_min_value, m_max_value, m_default));
-    ret->m_current = m_current;
-    return ret;
+{
+    if (!is_valid(min_value)){
+        throw InternalProgramError(nullptr, "DateTimeCell()", "Date is invalid.");
+    }
+    if (!is_valid(max_value)){
+        throw InternalProgramError(nullptr, "DateTimeCell()", "Date is invalid.");
+    }
+    if (!is_valid(default_value)){
+        throw InternalProgramError(nullptr, "DateTimeCell()", "Date is invalid.");
+    }
 }
-#endif
-
 
-DateOption::operator QDate() const{
-    SpinLockGuard lg(m_lock);
+DateTimeCell::operator DateTime() const{
+    ReadSpinLock lg(m_lock, PA_CURRENT_FUNCTION);
     return m_current;
 }
-QDate DateOption::get() const{
-    SpinLockGuard lg(m_lock);
+DateTime DateTimeCell::get() const{
+    ReadSpinLock lg(m_lock, PA_CURRENT_FUNCTION);
     return m_current;
 }
-std::string DateOption::set(QDate x){
+std::string DateTimeCell::set(const DateTime& x){
     std::string err = check_validity(x);
     if (!err.empty()){
         return err;
     }
     {
-        SpinLockGuard lg(m_lock);
+        WriteSpinLock lg(m_lock, PA_CURRENT_FUNCTION);
+        if (x == m_current){
+            return std::string();
+        }
         m_current = x;
     }
-    report_value_changed();
+    report_value_changed(this);
     return std::string();
 }
 
-QDate DateOption::from_json(const JsonValue& json){
-    const JsonArray* array = json.get_array();
-    if (array == nullptr || array->size() != 3){
-        return QDate();
-    }
-    int year, month, day;
-    if (!(*array)[0].read_integer(year)){
-        return QDate();
-    }
-    if (!(*array)[1].read_integer(month)){
-        return QDate();
-    }
-    if (!(*array)[2].read_integer(day)){
-        return QDate();
-    }
-    QDate date(year, month, day);
-    if (!date.isValid()){
-        return QDate();
+std::string DateTimeCell::check_validity(const DateTime& x) const{
+    if (x < m_min_value || x > m_max_value){
+        return "Invalid date.";
     }
-    return date;
+    return std::string();
 }
-JsonValue DateOption::to_json(const QDate& date){
-    JsonArray array;
-    array.push_back(date.year());
-    array.push_back(date.month());
-    array.push_back(date.day());
-    return array;
+std::string DateTimeCell::check_validity() const{
+    ReadSpinLock lg(m_lock, PA_CURRENT_FUNCTION);
+    return check_validity(m_current);
 }
-void DateOption::load_json(const JsonValue& json){
-    QDate date = from_json(json);
-    if (!date.isValid() || !check_validity(date).empty()){
-        return;
-    }
-    {
-        SpinLockGuard lg(m_lock);
-        m_current = date;
-    }
-    report_value_changed();
+void DateTimeCell::restore_defaults(){
+    set(m_default);
 }
-JsonValue DateOption::to_json() const{
-    return to_json(m_current);
+JsonValue DateTimeCell::to_json(const DateTime& date){
+    JsonObject ret;
+    if (date.year   >= 0) ret["Year"  ] = date.year;
+    if (date.month  >= 0) ret["Month" ] = date.month;
+    if (date.day    >= 0) ret["Day"   ] = date.day;
+    if (date.hour   >= 0) ret["Hour"  ] = date.hour;
+    if (date.minute >= 0) ret["Minute"] = date.minute;
+    if (date.second >= 0) ret["Second"] = date.second;
+    return ret;
 }
+DateTime DateTimeCell::from_json(const JsonValue& json){
+    DateTime ret;
 
-std::string DateOption::check_validity(QDate x) const{
-    if (x < m_min_value || x > m_max_value){
-        return "Invalid Switch date.";
+    const JsonObject* object = json.to_object();
+    if (object == nullptr){
+        return ret;
     }
-    return std::string();
+
+    object->read_integer(ret.year, "Year", 0, 9999);
+    object->read_integer(ret.month, "Month", 1, 12);
+    object->read_integer(ret.day, "Day", 1, 31);
+    object->read_integer(ret.hour, "Hour", 0, 23);
+    object->read_integer(ret.minute, "Minute", 0, 59);
+    object->read_integer(ret.second, "Second", 0, 59);
+
+    return ret;
 }
-std::string DateOption::check_validity() const{
-    SpinLockGuard lg(m_lock);
-    return check_validity(m_current);
+JsonValue DateTimeCell::to_json() const{
+    DateTime current;
+    {
+        ReadSpinLock lg(m_lock, PA_CURRENT_FUNCTION);
+        current = m_current;
+    }
+    return to_json(current);
 }
-void DateOption::restore_defaults(){
+void DateTimeCell::load_json(const JsonValue& json){
+    DateTime date = from_json(json);
+    if (!is_valid(date) || !check_validity(date).empty()){
+        return;
+    }
     {
-        SpinLockGuard lg(m_lock);
-        m_current = m_default;
+        WriteSpinLock lg(m_lock, PA_CURRENT_FUNCTION);
+        m_current = date;
     }
-    report_value_changed();
+    report_value_changed(this);
 }
 
 
 
 
+DateTimeOption::DateTimeOption(
+    std::string label,
+    LockMode lock_while_running,
+    Level level,
+    const DateTime& min_value, const DateTime& max_value,
+    const DateTime& default_value
+)
+    : UiState<DateTimeOption, DateTimeCell>(
+        lock_while_running,
+        level,
+        min_value,
+        max_value,
+        default_value
+    )
+    , m_label(std::move(label))
+{}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 }
diff --git a/Common/Cpp/Options/DateOption.h b/Common/Cpp/Options/DateOption.h
index 994d0769bc..02321231cc 100644
--- a/Common/Cpp/Options/DateOption.h
+++ b/Common/Cpp/Options/DateOption.h
@@ -1,60 +1,92 @@
 /*  Date Option
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifndef PokemonAutomation_Options_DateOption_H
 #define PokemonAutomation_Options_DateOption_H
 
-#include <QDate>
+#include "Common/Cpp/DateTime.h"
 #include "Common/Cpp/Concurrency/SpinLock.h"
 #include "Common/Cpp/Options/ConfigOption.h"
 
 namespace PokemonAutomation{
 
 
-class DateOption : public ConfigOption{
+
+class DateTimeCell : public UiState<DateTimeCell, ConfigOption>{
 public:
-    DateOption(
-        std::string label,
-        QDate min_value, QDate max_value,
-        QDate default_value
+    enum Level{
+        DATE,
+        DATE_HOUR_MIN,
+        DATE_HOUR_MIN_SEC,
+    };
+
+public:
+    DateTimeCell(
+        LockMode lock_while_running,
+        Level level,
+        const DateTime& min_value, const DateTime& max_value,
+        const DateTime& default_value
     );
-//    virtual std::unique_ptr<ConfigOption> clone() const override;
 
-    const std::string& label() const{ return m_label; }
-    const QDate& min_value() const{ return m_min_value; }
-    const QDate& max_value() const{ return m_max_value; }
-    const QDate& default_value() const{ return m_default; }
+    Level level() const{ return m_level; }
+    const DateTime& min_value() const{ return m_min_value; }
+    const DateTime& max_value() const{ return m_max_value; }
+    const DateTime& default_value() const{ return m_default; }
 
-    operator QDate() const;
-    QDate get() const;
-    std::string set(QDate x);
+    operator DateTime() const;
+    DateTime get() const;
+    std::string set(const DateTime& x);
 
-    static QDate from_json(const JsonValue& json);
-    static JsonValue to_json(const QDate& date);
 
-    virtual void load_json(const JsonValue& json) override;
+public:
+    virtual void restore_defaults() override;
+    std::string check_validity(const DateTime& x) const;
+    virtual std::string check_validity() const override;
+
+
+public:
+    static JsonValue to_json(const DateTime& date);
+    static DateTime from_json(const JsonValue& json);
+
     virtual JsonValue to_json() const override;
+    virtual void load_json(const JsonValue& json) override;
 
-    std::string check_validity(QDate x) const;
-    virtual std::string check_validity() const override;
-    virtual void restore_defaults() override;
 
-    virtual ConfigWidget* make_QtWidget(QWidget& parent) override;
+private:
+    bool is_valid(const DateTime& date) const;
+
 
 private:
-    const std::string m_label;
-    const QDate m_min_value;
-    const QDate m_max_value;
-    const QDate m_default;
+    const Level m_level;
+    const DateTime m_min_value;
+    const DateTime m_max_value;
+    const DateTime m_default;
 
     mutable SpinLock m_lock;
-    QDate m_current;
+    DateTime m_current;
 };
 
 
+class DateTimeOption : public UiState<DateTimeOption, DateTimeCell>{
+public:
+    DateTimeOption(
+        std::string label,
+        LockMode lock_while_running,
+        Level level,
+        const DateTime& min_value, const DateTime& max_value,
+        const DateTime& default_value
+    );
+
+    const std::string& label() const{ return m_label; }
+
+
+private:
+    const std::string m_label;
+};
+
 
 
 }
diff --git a/Common/Cpp/Options/EditableTableOption.cpp b/Common/Cpp/Options/EditableTableOption.cpp
index 072e92a48b..ccd40fe4e2 100644
--- a/Common/Cpp/Options/EditableTableOption.cpp
+++ b/Common/Cpp/Options/EditableTableOption.cpp
@@ -1,6 +1,6 @@
 /*  Editable Table Option
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -17,8 +17,14 @@
 namespace PokemonAutomation{
 
 
-EditableTableRow::EditableTableRow()
-    : m_index((size_t)0 - 1)
+
+//EditableTableRow::EditableTableRow(void*)
+//    : m_parent(nullptr)
+//    , m_index((size_t)0 - 1)
+//{}
+EditableTableRow::EditableTableRow(EditableTableOption& parent_table)
+    : m_parent_table(parent_table)
+    , m_index((size_t)0 - 1)
 {}
 void EditableTableRow::add_option(ConfigOption& option, std::string serialization_string){
     m_options.emplace_back(std::move(serialization_string), &option);
@@ -28,7 +34,7 @@ void EditableTableRow::load_json(const JsonValue& json){
         m_options[0].second->load_json(json);
         return;
     }
-    const JsonObject* obj = json.get_object();
+    const JsonObject* obj = json.to_object();
     if (obj == nullptr){
         return;
     }
@@ -76,72 +82,56 @@ std::vector<ConfigOption*> EditableTableRow::make_cells(){
 
 EditableTableOption::EditableTableOption(
     std::string label,
-    LockWhileRunning lock_while_running,
+    LockMode lock_while_running,
     std::vector<std::unique_ptr<EditableTableRow>> default_value
 )
-    : ConfigOption(lock_while_running)
+    : UiState<EditableTableOption, ConfigOption>(lock_while_running)
     , m_label(std::move(label))
     , m_enable_saveload(true)
+    , m_max_rows_before_hiding_by_default(10)
     , m_default(std::move(default_value))
 {
     restore_defaults();
 }
 EditableTableOption::EditableTableOption(
     std::string label,
-    LockWhileRunning lock_while_running,
+    LockMode lock_while_running,
     bool enable_saveload,
+    size_t max_rows_before_hiding_by_default,
     std::vector<std::unique_ptr<EditableTableRow>> default_value
 )
-    : ConfigOption(lock_while_running)
+    : UiState<EditableTableOption, ConfigOption>(lock_while_running)
     , m_label(std::move(label))
     , m_enable_saveload(enable_saveload)
+    , m_max_rows_before_hiding_by_default(max_rows_before_hiding_by_default)
     , m_default(std::move(default_value))
 {
     restore_defaults();
 }
+void EditableTableOption::set_default(std::vector<std::unique_ptr<EditableTableRow>> default_value){
+    WriteSpinLock lg(m_default_lock);
+    m_default = std::move(default_value);
+}
 size_t EditableTableOption::current_rows() const{
-    SpinLockGuard lg(m_lock);
+    ReadSpinLock lg(m_current_lock);
     return m_current.size();
 }
 std::vector<std::shared_ptr<EditableTableRow>> EditableTableOption::current_refs() const{
-    SpinLockGuard lg(m_lock);
+    ReadSpinLock lg(m_current_lock);
     return m_current;
 }
 
 void EditableTableOption::clear(){
-    SpinLockGuard lg(m_lock);
-    m_current.clear();
-}
-void EditableTableOption::load_json(const JsonValue& json){
-    const JsonArray* array = json.get_array();
-    if (array == nullptr){
-        return;
-    }
     {
-        SpinLockGuard lg(m_lock);
-        std::vector<std::shared_ptr<EditableTableRow>> table;
-        for (const auto& item : *array){
-            std::unique_ptr<EditableTableRow> row = make_row();
-            row->m_seqnum = m_seqnum++;
-            row->m_index = table.size();
-            table.emplace_back(std::move(row));
-            table.back()->load_json(item);
-        }
-        m_current = std::move(table);
+        WriteSpinLock lg(m_current_lock);
+        m_current.clear();
     }
-    report_value_changed();
-}
-JsonValue EditableTableOption::to_json() const{
-    SpinLockGuard lg(m_lock);
-    JsonArray array;
-    for (const std::shared_ptr<EditableTableRow>& row : m_current){
-        array.push_back(row->to_json());
-    }
-    return array;
+    report_value_changed(this);
 }
 
+
 std::string EditableTableOption::check_validity() const{
-    SpinLockGuard lg(m_lock);
+    ReadSpinLock lg(m_current_lock);
     for (const std::shared_ptr<EditableTableRow>& item : m_current){
         std::string error = item->check_validity();
         if (!error.empty()){
@@ -153,22 +143,80 @@ std::string EditableTableOption::check_validity() const{
 void EditableTableOption::restore_defaults(){
     {
         std::vector<std::shared_ptr<EditableTableRow>> tmp;
-        SpinLockGuard lg(m_lock);
-        for (const std::unique_ptr<EditableTableRow>& item : m_default){
-            tmp.emplace_back(item->clone());
-            tmp.back()->m_seqnum = m_seqnum++;
-            tmp.back()->m_index = tmp.size() - 1;
+        {
+            ReadSpinLock lg(m_default_lock);
+
+            //  Pre-allocate seqnums.
+            uint64_t seqnum = m_seqnum.fetch_add(m_default.size());
+
+            //  Build table outside of lock first.
+            //  If the table is built inside of the lock, you can get issues with deadlock.
+            //  (see load_json() for more details)
+            for (const std::unique_ptr<EditableTableRow>& item : m_default){
+                tmp.emplace_back(item->clone());
+                tmp.back()->m_seqnum = seqnum++;
+                tmp.back()->m_index = tmp.size() - 1;
+            }
         }
+
+        //  Now commit the table inside the lock.
+        WriteSpinLock lg(m_current_lock);
         m_current = std::move(tmp);
     }
-    report_value_changed();
+    report_value_changed(this);
+}
+JsonValue EditableTableOption::to_json() const{
+    ReadSpinLock lg(m_current_lock);
+    JsonArray array;
+    for (const std::shared_ptr<EditableTableRow>& row : m_current){
+        array.push_back(row->to_json());
+    }
+    return array;
 }
+void EditableTableOption::load_json(const JsonValue& json){
+//    cout << "EditableTableOption::load_json(): " << this << endl;
+
+    const JsonArray* array = json.to_array();
+    if (array == nullptr){
+        return;
+    }
+    {
+        //  Pre-allocate seqnums.
+        uint64_t seqnum = m_seqnum.fetch_add(array->size());
+
+        //  Build table outside of lock first.
+        //  If the table is built inside of the lock, you can get issues with deadlock. 
+        //  The reason for this is that during the construction of the new table, 
+        //  the listeners get triggered. Specifically, the row elements trigger
+        //  their own Row.report_value_changed(), which may then propagate up with Table.report_value_changed(). 
+        //  If the table's listener includes any functions that accesses the table (e.g. current_refs()),
+        //  then this can result in deadlock since current_refs() can't access the table 
+        //  until the table is finished building and releases the lock. 
+        //  But the table can't finish building until current_refs() finishes.
+        //  Building the table outside of the lock bypasses this issue since the listeners won't be 
+        //  triggered in the first place.
+        std::vector<std::shared_ptr<EditableTableRow>> table;
+        for (const auto& item : *array){
+            std::unique_ptr<EditableTableRow> row = make_row();
+            row->m_seqnum = seqnum++;
+            row->m_index = table.size();
+            table.emplace_back(std::move(row));
+            table.back()->load_json(item);
+        }
+
+        //  Now commit the table inside the lock.
+        WriteSpinLock lg(m_current_lock);
+        m_current = std::move(table);
+    }
+    report_value_changed(this);
+}
+
 
 
 
 void EditableTableOption::insert_row(size_t index, std::unique_ptr<EditableTableRow> row){
     {
-        SpinLockGuard lg(m_lock);
+        WriteSpinLock lg(m_current_lock);
         index = std::min(index, m_current.size());
         row->m_seqnum = m_seqnum++;
         m_current.insert(m_current.begin() + index, std::move(row));
@@ -177,34 +225,45 @@ void EditableTableOption::insert_row(size_t index, std::unique_ptr<EditableTable
             m_current[c]->m_index.store(c, std::memory_order_relaxed);
         }
     }
-    report_value_changed();
+    report_value_changed(this);
+}
+void EditableTableOption::append_row(std::unique_ptr<EditableTableRow> row){
+    insert_row((size_t)-1, std::move(row));
 }
 void EditableTableOption::clone_row(const EditableTableRow& row){
     {
-        SpinLockGuard lg(m_lock);
         size_t index = row.m_index;
         if (index == (size_t)0 - 1){
 //            cout << "EditableTableOptionCore::clone_row(): Orphaned row" << endl;
             return;
         }
+
+        //  Copy the row first.
+        //  If the row is cloned inside of the lock, you can get issues with deadlock.
+        //  (see load_json() for more details)            
         std::unique_ptr<EditableTableRow> new_row = row.clone();
         new_row->m_seqnum = m_seqnum++;
+
+        //  Now add it to the table.
+        WriteSpinLock lg(m_current_lock);
+        index = std::min(index, m_current.size());
         m_current.insert(m_current.begin() + index, std::move(new_row));
         size_t stop = m_current.size();
         for (size_t c = index; c < stop; c++){
             m_current[c]->m_index.store(c, std::memory_order_relaxed);
         }
     }
-    report_value_changed();
+    report_value_changed(this);
 }
 void EditableTableOption::remove_row(EditableTableRow& row){
     {
-        SpinLockGuard lg(m_lock);
         size_t index = row.m_index;
         if (index == (size_t)0 - 1){
 //            cout << "EditableTableOptionCore::remove_row(): Orphaned row" << endl;
             return;
         }
+
+        WriteSpinLock lg(m_current_lock);
         auto iter = m_current.begin() + index;
         (*iter)->m_index.store((size_t)0 - 1, std::memory_order_relaxed);
         m_current.erase(iter);
@@ -213,7 +272,7 @@ void EditableTableOption::remove_row(EditableTableRow& row){
             m_current[c]->m_index.store(c, std::memory_order_relaxed);
         }
     }
-    report_value_changed();
+    report_value_changed(this);
 }
 
 
diff --git a/Common/Cpp/Options/EditableTableOption.h b/Common/Cpp/Options/EditableTableOption.h
index d4eac5a2d8..c1ef0a6980 100644
--- a/Common/Cpp/Options/EditableTableOption.h
+++ b/Common/Cpp/Options/EditableTableOption.h
@@ -1,6 +1,6 @@
 /*  Editable Table Option
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -14,17 +14,24 @@
 
 namespace PokemonAutomation{
 
+class EditableTableOption;
+
 
 //  Represents a row of the table. Users should subclass this and add all the
 //  configs/fields that is in the row.
 class EditableTableRow{
 public:
     virtual ~EditableTableRow() = default;
-    EditableTableRow();
+//    EditableTableRow(void* = nullptr);
+    EditableTableRow(EditableTableOption& parent_table);
 
     //  Duplicate/deep-copy the entire row. Does not copy over listeners.
     virtual std::unique_ptr<EditableTableRow> clone() const = 0;
 
+    EditableTableOption& parent() const{
+        return m_parent_table;
+    }
+
     virtual void load_json(const JsonValue& json);
     virtual JsonValue to_json() const;
 
@@ -47,6 +54,8 @@ class EditableTableRow{
 private:
     friend class EditableTableOption;
 
+    EditableTableOption& m_parent_table;
+
     //  A unique # for this row within its table.
     uint64_t m_seqnum = 0;
 
@@ -61,21 +70,29 @@ class EditableTableRow{
 
 
 //  This is the table itself.
-class EditableTableOption : public ConfigOption{
+class EditableTableOption : public UiState<EditableTableOption, ConfigOption>{
 public:
     EditableTableOption(
         std::string label,
-        LockWhileRunning lock_while_running,
+        LockMode lock_while_running,
         std::vector<std::unique_ptr<EditableTableRow>> default_value = {}
     );
     EditableTableOption(
         std::string label,
-        LockWhileRunning lock_while_running,
+        LockMode lock_while_running,
         bool enable_saveload,
+        size_t max_rows_before_hiding_by_default,
         std::vector<std::unique_ptr<EditableTableRow>> default_value = {}
     );
+    void set_default(std::vector<std::unique_ptr<EditableTableRow>> default_value);
 
+
+public:
     const std::string& label() const{ return m_label; }
+    bool expand_by_default() const{ return current_rows() < m_max_rows_before_hiding_by_default; }
+    const std::vector<std::unique_ptr<EditableTableRow>>& defaults() const{
+        return m_default;
+    }
 
     //  Returns the # of rows at this moment of time.
     //  Since this value can be out-of-date before you return, do not use
@@ -86,11 +103,15 @@ class EditableTableOption : public ConfigOption{
     //  These reference are live in that they may be asynchronously changed.
     std::vector<std::shared_ptr<EditableTableRow>> current_refs() const;
 
+//    SpinLock& get_lock() const{
+//        return m_current_lock;
+//    }
+
     //  Return a copy of the entire table at the exact moment this is called.
     template <typename RowType>
     std::vector<std::unique_ptr<RowType>> copy_snapshot() const{
         std::vector<std::unique_ptr<RowType>> ret;
-        SpinLockGuard lg(m_lock);
+        ReadSpinLock lg(m_current_lock);
         ret.reserve(m_current.size());
         for (auto& item : m_current){
             std::unique_ptr<EditableTableRow> parent = item->clone();
@@ -102,7 +123,7 @@ class EditableTableOption : public ConfigOption{
     template <typename RowType, typename RowSnapshotType>
     std::vector<RowSnapshotType> snapshot() const{
         std::vector<RowSnapshotType> ret;
-        SpinLockGuard lg(m_lock);
+        ReadSpinLock lg(m_current_lock);
         ret.reserve(m_current.size());
         for (auto& item : m_current){
             RowType& row = static_cast<RowType&>(*item);
@@ -111,34 +132,57 @@ class EditableTableOption : public ConfigOption{
         return ret;
     }
 
+    //  Lambda returns a boolean. False to continue running. True to stop.
+    template <typename RowType, typename Lambda>
+    void run_on_all_rows(Lambda function) const{
+        ReadSpinLock lg(m_current_lock);
+        for (auto& item : m_current){
+            if (function(static_cast<const RowType&>(*item))){
+                return;
+            }
+        }
+    }
+    template <typename RowType, typename Lambda>
+    void run_on_all_rows(Lambda function){
+        ReadSpinLock lg(m_current_lock);
+        for (auto& item : m_current){
+            if (function(static_cast<RowType&>(*item))){
+                return;
+            }
+        }
+    }
+
     void clear();
 
-    virtual void load_json(const JsonValue& json) override;
-    virtual JsonValue to_json() const override;
 
+public:
     virtual std::string check_validity() const override;
     virtual void restore_defaults() override final;
+    virtual JsonValue to_json() const override;
+    virtual void load_json(const JsonValue& json) override;
+
 
 public:
     bool saveload_enabled() const{ return m_enable_saveload; }
     virtual std::vector<std::string> make_header() const = 0;
-    virtual std::unique_ptr<EditableTableRow> make_row() const = 0;
+    virtual std::unique_ptr<EditableTableRow> make_row() = 0;
 
     //  Undefined behavior to call these on rows that aren't part of the table.
     void insert_row(size_t index, std::unique_ptr<EditableTableRow> row);
+    void append_row(std::unique_ptr<EditableTableRow> row);
     void clone_row(const EditableTableRow& row);
     void remove_row(EditableTableRow& row);
 
-public:
-    virtual ConfigWidget* make_QtWidget(QWidget& parent) override;
 
 private:
     const std::string m_label;
     const bool m_enable_saveload;
-    const std::vector<std::unique_ptr<EditableTableRow>> m_default;
+    const size_t m_max_rows_before_hiding_by_default;
+    mutable SpinLock m_default_lock;
+    std::vector<std::unique_ptr<EditableTableRow>> m_default;
 
-    mutable SpinLock m_lock;
-    uint64_t m_seqnum = 0;
+    mutable SpinLock m_current_lock;
+    std::atomic<uint64_t> m_seqnum = 0;
     std::vector<std::shared_ptr<EditableTableRow>> m_current;
 };
 
@@ -158,8 +202,14 @@ class EditableTableOption_t : public EditableTableOption{
         return EditableTableOption::snapshot<RowType, RowSnapshotType>();
     }
 
-    virtual std::unique_ptr<EditableTableRow> make_row() const override{
-        return std::unique_ptr<EditableTableRow>(new RowType());
+    //  Lambda returns a boolean. False to continue running. True to stop.
+    template <typename Lambda>
+    void run_on_all_rows(Lambda function){
+        EditableTableOption::run_on_all_rows<RowType>(std::move(function));
+    }
+
+    virtual std::unique_ptr<EditableTableRow> make_row() override{
+        return std::unique_ptr<EditableTableRow>(new RowType(*this));
     }
 };
 
diff --git a/Common/Cpp/Options/EnumDropdownDatabase.cpp b/Common/Cpp/Options/EnumDropdownDatabase.cpp
new file mode 100644
index 0000000000..70bf260820
--- /dev/null
+++ b/Common/Cpp/Options/EnumDropdownDatabase.cpp
@@ -0,0 +1,152 @@
+/*  Named Enum
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <vector>
+#include <map>
+#include "Common/Cpp/Exceptions.h"
+#include "Common/Cpp/LifetimeSanitizer.h"
+#include "Common/Cpp/Containers/Pimpl.tpp"
+#include "Common/Cpp/Containers/FixedLimitVector.tpp"
+#include "EnumDropdownDatabase.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+
+
+
+class IntegerEnumDropdownDatabaseImpl{
+public:
+    void add(EnumEntry entry){
+        auto scope_check = m_sanitizer.check_scope();
+        size_t enum_value = entry.enum_value;
+        m_list.emplace_back(enum_value);
+
+        auto ret = m_map.emplace(enum_value, std::move(entry));
+        if (!ret.second){
+            throw InternalProgramError(
+                nullptr,
+                PA_CURRENT_FUNCTION,
+                "Duplicate Enum: " + std::to_string(enum_value)
+            );
+        }
+
+        auto ret1 = m_slug_to_enum.emplace(ret.first->second.slug, &ret.first->second);
+        if (!ret1.second){
+            throw InternalProgramError(
+                nullptr,
+                PA_CURRENT_FUNCTION,
+                "Duplicate Enum Slug: " + ret.first->second.slug
+            );
+        }
+
+        auto ret2 = m_display_to_enum.emplace(ret.first->second.display, &ret.first->second);
+        if (!ret2.second){
+            throw InternalProgramError(
+                nullptr,
+                PA_CURRENT_FUNCTION,
+                "Duplicate Enum Display: " + ret.first->second.display
+            );
+        }
+    }
+
+    const EnumEntry* find(size_t value) const{
+        auto scope_check = m_sanitizer.check_scope();
+        auto iter = m_map.find(value);
+        if (iter == m_map.end()){
+            return nullptr;
+        }
+        return &iter->second;
+    }
+    const EnumEntry* find_slug(const std::string& slug) const{
+        auto scope_check = m_sanitizer.check_scope();
+        auto iter = m_slug_to_enum.find(slug);
+        if (iter == m_slug_to_enum.end()){
+            return nullptr;
+        }
+        return iter->second;
+    }
+    const EnumEntry* find_display(const std::string& display) const{
+        auto scope_check = m_sanitizer.check_scope();
+        auto iter = m_display_to_enum.find(display);
+        if (iter == m_display_to_enum.end()){
+            return nullptr;
+        }
+        return iter->second;
+    }
+
+    FixedLimitVector<size_t> all_values() const{
+        auto scope_check = m_sanitizer.check_scope();
+        FixedLimitVector<size_t> ret(m_map.size());
+        for (const auto& item : m_map){
+            ret.emplace_back(item.first);
+        }
+        return ret;
+    }
+
+private:
+    using Node = typename std::map<size_t, EnumEntry>::const_iterator;
+    std::vector<size_t> m_list;
+    std::map<size_t, EnumEntry> m_map;
+    std::map<std::string, const EnumEntry*> m_slug_to_enum;
+    std::map<std::string, const EnumEntry*> m_display_to_enum;
+
+    LifetimeSanitizer m_sanitizer;
+};
+
+
+
+IntegerEnumDropdownDatabase::IntegerEnumDropdownDatabase(IntegerEnumDropdownDatabase&& x) = default;
+IntegerEnumDropdownDatabase& IntegerEnumDropdownDatabase::operator=(IntegerEnumDropdownDatabase&& x) = default;
+IntegerEnumDropdownDatabase::~IntegerEnumDropdownDatabase() = default;
+
+IntegerEnumDropdownDatabase::IntegerEnumDropdownDatabase(void*){}
+IntegerEnumDropdownDatabase::IntegerEnumDropdownDatabase()
+    : m_core(CONSTRUCT_TOKEN)
+{}
+IntegerEnumDropdownDatabase::IntegerEnumDropdownDatabase(std::initializer_list<EnumEntry> list)
+    : m_core(CONSTRUCT_TOKEN)
+{
+    for (auto iter = list.begin(); iter != list.end(); ++iter){
+        add(
+            iter->enum_value,
+            std::move(iter->slug),
+            std::move(iter->display),
+            iter->enabled
+        );
+    }
+}
+void IntegerEnumDropdownDatabase::add(EnumEntry entry){
+    m_core->add(entry);
+}
+const EnumEntry* IntegerEnumDropdownDatabase::find(size_t value) const{
+    return m_core->find(value);
+}
+const EnumEntry* IntegerEnumDropdownDatabase::find_slug(const std::string& slug) const{
+    return m_core->find_slug(slug);
+}
+const EnumEntry* IntegerEnumDropdownDatabase::find_display(const std::string& display) const{
+    return m_core->find_display(display);
+}
+FixedLimitVector<size_t> IntegerEnumDropdownDatabase::all_values() const{
+    return m_core->all_values();
+}
+IntegerEnumDropdownDatabase create_integer_enum_dropdown_database(const std::vector<std::string>& slugs){
+    IntegerEnumDropdownDatabase database;
+    for (size_t i = 0; i < slugs.size(); i++){
+        // display name is the same as slug
+        database.add(i, slugs[i], slugs[i]);
+    }
+    return database;
+}
+
+template class FixedLimitVector<size_t>;
+
+
+
+}
diff --git a/Common/Cpp/Options/EnumDropdownDatabase.h b/Common/Cpp/Options/EnumDropdownDatabase.h
new file mode 100644
index 0000000000..5a293c5642
--- /dev/null
+++ b/Common/Cpp/Options/EnumDropdownDatabase.h
@@ -0,0 +1,145 @@
+/*  Enum Database
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *      A database that goes with an enum.
+ *
+ *  This database contains information about the enum such as the display names
+ *  and serialization slugs.
+ *
+ *  This database is used to initialize an EnumDropdownCell/Option.
+ *
+ */
+
+#ifndef PokemonAutomation_Options_EnumDropdownDatabase_H
+#define PokemonAutomation_Options_EnumDropdownDatabase_H
+
+#include <string>
+#include <vector>
+#include "Common/Cpp/Containers/Pimpl.h"
+#include "Common/Cpp/Containers/FixedLimitVector.h"
+
+namespace PokemonAutomation{
+
+class IntegerEnumDropdownDatabaseImpl;
+
+
+
+
+struct EnumEntry{
+    size_t enum_value;  //  Integer value of the enum.
+    std::string slug;
+    std::string display;
+    bool enabled = true;
+};
+
+
+//  This is the typeless database that uses an integer for the enum value.
+class IntegerEnumDropdownDatabase{
+public:
+    IntegerEnumDropdownDatabase(IntegerEnumDropdownDatabase&& x);
+    IntegerEnumDropdownDatabase& operator=(IntegerEnumDropdownDatabase&& x);
+    IntegerEnumDropdownDatabase(const IntegerEnumDropdownDatabase& x) = delete;
+    IntegerEnumDropdownDatabase& operator=(const IntegerEnumDropdownDatabase& x) = delete;
+    ~IntegerEnumDropdownDatabase();
+
+public:
+    IntegerEnumDropdownDatabase();      //  Constructs empty database.
+    IntegerEnumDropdownDatabase(std::initializer_list<EnumEntry> list);
+
+    //  Warning, these functions do not have strong exception safety!
+    //  If these throw, this class will be in a bad state.
+    void add(EnumEntry entry);
+    void add(size_t value, std::string slug, std::string display, bool enabled = true){
+        add(EnumEntry{value, std::move(slug), std::move(display), enabled});
+    }
+
+    //  Find an enum. Returns null if not in the database.
+    const EnumEntry* find(size_t value) const;
+    const EnumEntry* find_slug(const std::string& slug) const;
+    const EnumEntry* find_display(const std::string& display) const;
+
+    //  Returns the integer enum values of everything in the database.
+    FixedLimitVector<size_t> all_values() const;
+
+protected:
+    IntegerEnumDropdownDatabase(void*); //  Constructs null database.
+private:
+    Pimpl<IntegerEnumDropdownDatabaseImpl> m_core;
+};
+
+// Create a simple StringSelectDatabase from a list of slugs.
+// The display names of each entry will be the same as their slugs and enum_values will be their indices.
+IntegerEnumDropdownDatabase create_integer_enum_dropdown_database(const std::vector<std::string>& slugs);
+
+
+
+//  This is the type-safe database for your specific enum.
+template <typename EnumType>
+class EnumDropdownDatabase : public IntegerEnumDropdownDatabase{
+public:
+    struct Entry{
+        EnumType value;
+        std::string slug;
+        std::string display;
+        bool enabled = true;
+    };
+
+//public:
+//    EnumDropdownDatabase(EnumDropdownDatabase&& x) = default;
+//    EnumDropdownDatabase& operator=(EnumDropdownDatabase&& x) = default;
+
+public:
+    EnumDropdownDatabase() : IntegerEnumDropdownDatabase() {}
+    EnumDropdownDatabase(std::initializer_list<Entry> list){
+        for (auto iter = list.begin(); iter != list.end(); ++iter){
+            add(
+                iter->value,
+                std::move(iter->slug),
+                std::move(iter->display),
+                iter->enabled
+            );
+        }
+    }
+
+    //  Warning, these functions do not have strong exception safety!
+    //  If these throw, this class will be in a bad state.
+    void add(
+        EnumType value,
+        std::string slug,
+        std::string display,
+        bool enabled
+    ){
+        IntegerEnumDropdownDatabase::add(
+            EnumEntry{
+                (size_t)value,
+                std::move(slug),
+                std::move(display),
+                enabled
+            }
+        );
+    }
+
+    //  Find an enum. Returns null if not in the database.
+    const EnumEntry* find(EnumType value) const{
+        return IntegerEnumDropdownDatabase::find((size_t)value);
+    }
+#if 0
+    EnumType find_slug(const std::string& slug) const{
+        return (EnumType)IntegerEnumDropdownDatabase::find_slug(slug);
+    }
+    EnumType find_display(const std::string& display) const{
+        return (EnumType)IntegerEnumDropdownDatabase::find_display(display);
+    }
+#endif
+
+protected:
+    EnumDropdownDatabase(void*) : IntegerEnumDropdownDatabase(nullptr) {}
+};
+
+
+
+
+
+}
+#endif
diff --git a/Common/Cpp/Options/EnumDropdownOption.cpp b/Common/Cpp/Options/EnumDropdownOption.cpp
index 5321d74071..0c621b263e 100644
--- a/Common/Cpp/Options/EnumDropdownOption.cpp
+++ b/Common/Cpp/Options/EnumDropdownOption.cpp
@@ -1,6 +1,6 @@
 /*  Enum Dropdown Option
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -9,15 +9,21 @@
 #include "Common/Cpp/Json/JsonValue.h"
 #include "EnumDropdownOption.h"
 
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
 namespace PokemonAutomation{
 
 
+
+
 struct IntegerEnumDropdownCell::Data{
-    const IntegerEnumDatabase& m_database;
+    const IntegerEnumDropdownDatabase& m_database;
     const size_t m_default;
     std::atomic<size_t> m_current;
 
-    Data(const IntegerEnumDatabase& database, size_t default_value, size_t current_value)
+    Data(const IntegerEnumDropdownDatabase& database, size_t default_value, size_t current_value)
         : m_database(database)
         , m_default(default_value)
         , m_current(current_value)
@@ -29,15 +35,15 @@ struct IntegerEnumDropdownCell::Data{
 
 IntegerEnumDropdownCell::~IntegerEnumDropdownCell() = default;
 IntegerEnumDropdownCell::IntegerEnumDropdownCell(const IntegerEnumDropdownCell& x)
-    : ConfigOption(x)
+    : UiState<IntegerEnumDropdownCell, ConfigOption>(x)
     , m_data(CONSTRUCT_TOKEN, x.database(), x.default_value(), x.current_value())
 {}
 IntegerEnumDropdownCell::IntegerEnumDropdownCell(
-    const IntegerEnumDatabase& database,
-    LockWhileRunning lock_while_running,
+    const IntegerEnumDropdownDatabase& database,
+    LockMode lock_while_running,
     size_t default_value, size_t current_value
 )
-    : ConfigOption(lock_while_running)
+    : UiState<IntegerEnumDropdownCell, ConfigOption>(lock_while_running)
     , m_data(CONSTRUCT_TOKEN, database, default_value, current_value)
 {
     if (database.find(default_value) == nullptr){
@@ -48,11 +54,11 @@ IntegerEnumDropdownCell::IntegerEnumDropdownCell(
     }
 }
 IntegerEnumDropdownCell::IntegerEnumDropdownCell(
-    const IntegerEnumDatabase& database,
-    LockWhileRunning lock_while_running,
+    const IntegerEnumDropdownDatabase& database,
+    LockMode lock_while_running,
     size_t default_value
 )
-    : ConfigOption(lock_while_running)
+    : UiState<IntegerEnumDropdownCell, ConfigOption>(lock_while_running)
     , m_data(CONSTRUCT_TOKEN, database, default_value, default_value)
 {
     if (database.find(default_value) == nullptr){
@@ -70,15 +76,27 @@ bool IntegerEnumDropdownCell::set_value(size_t value){
     if (data.m_database.find(value) == nullptr){
         return false;
     }
-    data.m_current.store(value, std::memory_order_relaxed);
-    report_value_changed();
+//    cout << "value = " << value << ", current = " << data.m_current.load() << endl;
+    if (value != data.m_current.exchange(value, std::memory_order_relaxed)){
+        report_value_changed(this);
+    }
     return true;
 }
-const IntegerEnumDatabase& IntegerEnumDropdownCell::database() const{
+const IntegerEnumDropdownDatabase& IntegerEnumDropdownCell::database() const{
     return m_data->m_database;
 }
+
+
+
+void IntegerEnumDropdownCell::restore_defaults(){
+    set_value(m_data->m_default);
+}
+JsonValue IntegerEnumDropdownCell::to_json() const{
+    const Data& data = *m_data;
+    return data.m_database.find(data.m_current.load(std::memory_order_relaxed))->slug;
+}
 void IntegerEnumDropdownCell::load_json(const JsonValue& json){
-    const std::string* str = json.get_string();
+    const std::string* str = json.to_string();
     if (str == nullptr){
         return;
     }
@@ -86,25 +104,16 @@ void IntegerEnumDropdownCell::load_json(const JsonValue& json){
     const EnumEntry* entry = data.m_database.find_slug(*str);
     if (entry != nullptr && entry->enabled){
         data.m_current.store(entry->enum_value, std::memory_order_relaxed);
-        report_value_changed();
+        report_value_changed(this);
     }
 
     //  Backward compatibility with display names.
     entry = data.m_database.find_display(*str);
     if (entry != nullptr && entry->enabled){
         data.m_current.store(entry->enum_value, std::memory_order_relaxed);
-        report_value_changed();
+        report_value_changed(this);
     }
 }
-JsonValue IntegerEnumDropdownCell::to_json() const{
-    const Data& data = *m_data;
-    return data.m_database.find(data.m_current.load(std::memory_order_relaxed))->slug;
-}
-void IntegerEnumDropdownCell::restore_defaults(){
-    Data& data = *m_data;
-    data.m_current.store(data.m_default, std::memory_order_relaxed);
-    report_value_changed();
-}
 
 
 
diff --git a/Common/Cpp/Options/EnumDropdownOption.h b/Common/Cpp/Options/EnumDropdownOption.h
index 1110d8b01e..05ab4ff091 100644
--- a/Common/Cpp/Options/EnumDropdownOption.h
+++ b/Common/Cpp/Options/EnumDropdownOption.h
@@ -1,6 +1,6 @@
 /*  Enum Dropdown Option
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  *      A simple dropdown menu for enums.
  *
@@ -12,38 +12,39 @@
 #ifndef PokemonAutomation_Options_EnumDropdownOption_H
 #define PokemonAutomation_Options_EnumDropdownOption_H
 
-#include "Common/Cpp/EnumDatabase.h"
 #include "Common/Cpp/Containers/Pimpl.h"
 #include "ConfigOption.h"
+#include "EnumDropdownDatabase.h"
 
 namespace PokemonAutomation{
 
 
 //  This is the typeless class that uses an integer for the enum value.
-class IntegerEnumDropdownCell : public ConfigOption{
+class IntegerEnumDropdownCell : public UiState<IntegerEnumDropdownCell, ConfigOption>{
 public:
     ~IntegerEnumDropdownCell();
     IntegerEnumDropdownCell(const IntegerEnumDropdownCell& x);
 
+
 public:
     IntegerEnumDropdownCell(
-        const IntegerEnumDatabase& database,
-        LockWhileRunning lock_while_running,
+        const IntegerEnumDropdownDatabase& database,
+        LockMode lock_while_running,
         size_t default_value, size_t current_value
     );
     IntegerEnumDropdownCell(
-        const IntegerEnumDatabase& database,
-        LockWhileRunning lock_while_running,
+        const IntegerEnumDropdownDatabase& database,
+        LockMode lock_while_running,
         size_t default_value
     );
 
     //  Constructing from inlined database is not supported for cell.
-    IntegerEnumDropdownCell(IntegerEnumDatabase&& database,
-        LockWhileRunning lock_while_running,
+    IntegerEnumDropdownCell(IntegerEnumDropdownDatabase&& database,
+                            LockMode lock_while_running,
         size_t default_value, size_t current_value
     ) = delete;
-    IntegerEnumDropdownCell(IntegerEnumDatabase&& database,
-        LockWhileRunning lock_while_running,
+    IntegerEnumDropdownCell(IntegerEnumDropdownDatabase&& database,
+                            LockMode lock_while_running,
         size_t default_value
     ) = delete;
 
@@ -52,14 +53,14 @@ class IntegerEnumDropdownCell : public ConfigOption{
 
     virtual bool set_value(size_t value);
 
-    const IntegerEnumDatabase& database() const;
+    const IntegerEnumDropdownDatabase& database() const;
 
-    virtual void load_json(const JsonValue& json) override;
-    virtual JsonValue to_json() const override;
 
+public:
     virtual void restore_defaults() override;
+    virtual JsonValue to_json() const override;
+    virtual void load_json(const JsonValue& json) override;
 
-    virtual ConfigWidget* make_QtWidget(QWidget& parent) override;
 
 private:
     struct Data;
@@ -72,8 +73,8 @@ template <typename EnumType>
 class EnumDropdownCell : public IntegerEnumDropdownCell{
 public:
     EnumDropdownCell(
-        const EnumDatabase<EnumType>& database,
-        LockWhileRunning lock_while_running,
+        const EnumDropdownDatabase<EnumType>& database,
+        LockMode lock_while_running,
         EnumType default_value
     )
         : IntegerEnumDropdownCell(database, lock_while_running, (size_t)default_value)
@@ -81,8 +82,8 @@ class EnumDropdownCell : public IntegerEnumDropdownCell{
 
     //  Constructing from inlined database is not supported for cell.
     EnumDropdownCell(
-        EnumDatabase<EnumType>&& database,
-        LockWhileRunning lock_while_running,
+        EnumDropdownDatabase<EnumType>&& database,
+        LockMode lock_while_running,
         EnumType default_value
     ) = delete;
 
@@ -106,32 +107,40 @@ class EnumDropdownCell : public IntegerEnumDropdownCell{
 
 
 
-class IntegerEnumDropdownOption : private IntegerEnumDatabase, public IntegerEnumDropdownCell{
+class IntegerEnumDropdownOption
+    : private IntegerEnumDropdownDatabase
+    , public UiState<IntegerEnumDropdownOption, IntegerEnumDropdownCell>{
 public:
     IntegerEnumDropdownOption(const IntegerEnumDropdownOption& x) = delete;
     IntegerEnumDropdownOption(
         std::string label,
-        const IntegerEnumDatabase& database,
-        LockWhileRunning lock_while_running,
+        const IntegerEnumDropdownDatabase& database,
+        LockMode lock_while_running,
         size_t default_value
     )
-        : IntegerEnumDatabase(nullptr)
-        , IntegerEnumDropdownCell(database, lock_while_running, default_value)
+        : IntegerEnumDropdownDatabase(nullptr)
+        , UiState<IntegerEnumDropdownOption, IntegerEnumDropdownCell>(database, lock_while_running, default_value)
         , m_label(std::move(label))
     {}
+    // you can construct IntegerEnumDropdownDatabase using initializer list:
+    // {
+    //      {0, "<slug_0>", "Display Name 0"},
+    //      {1, "<slug 1>", "Display Name 1"},
+    //      {2, "<slug 2>", "Display Name 2"},
+    // }
     IntegerEnumDropdownOption(
         std::string label,
-        IntegerEnumDatabase&& database,
-        LockWhileRunning lock_while_running,
+        IntegerEnumDropdownDatabase&& database,
+        LockMode lock_while_running,
         size_t default_value
     )
-        : IntegerEnumDatabase(std::move(database))
-        , IntegerEnumDropdownCell(*this, lock_while_running, default_value)
+        : IntegerEnumDropdownDatabase(std::move(database))
+        , UiState<IntegerEnumDropdownOption, IntegerEnumDropdownCell>(*this, lock_while_running, default_value)
         , m_label(std::move(label))
     {}
 
     const std::string& label() const{ return m_label; }
-    virtual ConfigWidget* make_QtWidget(QWidget& parent) override;
+
 
 private:
     const std::string m_label;
@@ -144,16 +153,16 @@ class EnumDropdownOption : public IntegerEnumDropdownOption{
 public:
     EnumDropdownOption(
         std::string label,
-        const EnumDatabase<EnumType>& database,
-        LockWhileRunning lock_while_running,
+        const EnumDropdownDatabase<EnumType>& database,
+        LockMode lock_while_running,
         EnumType default_value
     )
         : IntegerEnumDropdownOption(std::move(label), database, lock_while_running, (size_t)default_value)
     {}
     EnumDropdownOption(
         std::string label,
-        EnumDatabase<EnumType>&& database,
-        LockWhileRunning lock_while_running,
+        EnumDropdownDatabase<EnumType>&& database,
+        LockMode lock_while_running,
         EnumType default_value
     )
         : IntegerEnumDropdownOption(std::move(label), std::move(database), lock_while_running, (size_t)default_value)
diff --git a/Common/Cpp/Options/FixedCodeOption.cpp b/Common/Cpp/Options/FixedCodeOption.cpp
index feb63b45e5..4c7e25bc84 100644
--- a/Common/Cpp/Options/FixedCodeOption.cpp
+++ b/Common/Cpp/Options/FixedCodeOption.cpp
@@ -1,6 +1,6 @@
 /*  Fixed Code Option
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -17,6 +17,8 @@
 namespace PokemonAutomation{
 
 
+
+
 struct FixedCodeOption::Data{
     std::string m_label;
     const size_t m_digits;
@@ -62,11 +64,11 @@ size_t FixedCodeOption::digits() const{
 }
 
 FixedCodeOption::operator const std::string&() const{
-    SpinLockGuard lg(m_data->m_lock);
+    ReadSpinLock lg(m_data->m_lock);
     return m_data->m_current;
 }
 const std::string& FixedCodeOption::get() const{
-    SpinLockGuard lg(m_data->m_lock);
+    ReadSpinLock lg(m_data->m_lock);
     return m_data->m_current;
 }
 std::string FixedCodeOption::set(std::string x){
@@ -75,42 +77,19 @@ std::string FixedCodeOption::set(std::string x){
         return error;
     }
     {
-        SpinLockGuard lg(m_data->m_lock);
+        WriteSpinLock lg(m_data->m_lock);
         if (m_data->m_current == x){
             return std::string();
         }
         m_data->m_current = std::move(x);
     }
-    report_value_changed();
+    report_value_changed(this);
     return std::string();
 }
 
-void FixedCodeOption::load_json(const JsonValue& json){
-    const std::string* str = json.get_string();
-    if (str == nullptr){
-        return;
-    }
-    {
-        SpinLockGuard lg(m_data->m_lock);
-        m_data->m_current = *str;
-    }
-    report_value_changed();
-}
-JsonValue FixedCodeOption::to_json() const{
-    SpinLockGuard lg(m_data->m_lock);
-    return m_data->m_current;
-}
-
-void FixedCodeOption::to_str(uint8_t* code) const{
-    SpinLockGuard lg(m_data->m_lock);
-    std::string qstr = sanitize_code(8, m_data->m_current);
-    for (int c = 0; c < 8; c++){
-        code[c] = qstr[c] - '0';
-    }
-}
 
 std::string FixedCodeOption::check_validity() const{
-    SpinLockGuard lg(m_data->m_lock);
+    ReadSpinLock lg(m_data->m_lock);
     return check_validity(m_data->m_current);
 }
 std::string FixedCodeOption::check_validity(const std::string& x) const{
@@ -118,11 +97,37 @@ std::string FixedCodeOption::check_validity(const std::string& x) const{
 }
 void FixedCodeOption::restore_defaults(){
     {
-        SpinLockGuard lg(m_data->m_lock);
+        WriteSpinLock lg(m_data->m_lock);
+        if (m_data->m_current == m_data->m_default){
+            return;
+        }
         m_data->m_current = m_data->m_default;
     }
-    report_value_changed();
+    report_value_changed(this);
 }
+JsonValue FixedCodeOption::to_json() const{
+    ReadSpinLock lg(m_data->m_lock);
+    return m_data->m_current;
+}
+void FixedCodeOption::load_json(const JsonValue& json){
+    const std::string* str = json.to_string();
+    if (str == nullptr){
+        return;
+    }
+    {
+        WriteSpinLock lg(m_data->m_lock);
+        m_data->m_current = *str;
+    }
+    report_value_changed(this);
+}
+
+std::string FixedCodeOption::to_str() const{
+    {
+        ReadSpinLock lg(m_data->m_lock);
+        return sanitize_code(8, m_data->m_current);
+    }
+}
+
 
 
 
diff --git a/Common/Cpp/Options/FixedCodeOption.h b/Common/Cpp/Options/FixedCodeOption.h
index 5fc0ed2264..3288d33965 100644
--- a/Common/Cpp/Options/FixedCodeOption.h
+++ b/Common/Cpp/Options/FixedCodeOption.h
@@ -1,6 +1,6 @@
 /*  Fixed Code Option
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -13,7 +13,7 @@
 namespace PokemonAutomation{
 
 
-class FixedCodeOption : public ConfigOption{
+class FixedCodeOption : public UiState<FixedCodeOption, ConfigOption>{
 public:
     ~FixedCodeOption();
     FixedCodeOption(
@@ -29,16 +29,16 @@ class FixedCodeOption : public ConfigOption{
     operator const std::string&() const;
     const std::string& get() const;
     std::string set(std::string x);
-    void to_str(uint8_t* code) const;
+    std::string to_str() const;
 
-    virtual std::string check_validity() const override;
+
+public:
     std::string check_validity(const std::string& x) const;
+    virtual std::string check_validity() const override;
     virtual void restore_defaults() override;
-
-    virtual void load_json(const JsonValue& json) override;
     virtual JsonValue to_json() const override;
+    virtual void load_json(const JsonValue& json) override;
 
-    virtual ConfigWidget* make_QtWidget(QWidget& parent) override;
 
 private:
     struct Data;
diff --git a/Common/Cpp/Options/FloatingPointOption.cpp b/Common/Cpp/Options/FloatingPointOption.cpp
index 6ddfba2d30..71d1d6e7ca 100644
--- a/Common/Cpp/Options/FloatingPointOption.cpp
+++ b/Common/Cpp/Options/FloatingPointOption.cpp
@@ -1,6 +1,6 @@
 /*  Floating-Point Option
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -19,6 +19,8 @@
 namespace PokemonAutomation{
 
 
+
+
 struct FloatingPointCell::Data{
     const double m_min_value;
     const double m_max_value;
@@ -40,27 +42,26 @@ struct FloatingPointCell::Data{
 
 FloatingPointCell::~FloatingPointCell() = default;
 FloatingPointCell::FloatingPointCell(const FloatingPointCell& x)
-    : ConfigOption(x)
-    , m_data(CONSTRUCT_TOKEN, x.min_value(), x.max_value(), x.default_value(), x.default_value())
-    , m_label(x.m_label)
+    : UiState<FloatingPointCell, ConfigOption>(x)
+    , m_data(CONSTRUCT_TOKEN, x.min_value(), x.max_value(), x.default_value(), x)
 {}
 FloatingPointCell::FloatingPointCell(
-    LockWhileRunning lock_while_running,
+    LockMode lock_while_running,
     double min_value, double max_value,
     double default_value, double current_value
 )
-    : ConfigOption(lock_while_running)
+    : UiState<FloatingPointCell, ConfigOption>(lock_while_running)
     , m_data(CONSTRUCT_TOKEN, min_value, max_value, default_value, current_value)
 {}
 
 
 FloatingPointCell::FloatingPointCell(
-    LockWhileRunning lock_while_running,
+    LockMode lock_while_running,
     double default_value,
     double min_value,
     double max_value
 )
-    : ConfigOption(lock_while_running)
+    : UiState<FloatingPointCell, ConfigOption>(lock_while_running)
     , m_data(CONSTRUCT_TOKEN, min_value, max_value, default_value, default_value)
 {}
 
@@ -86,28 +87,24 @@ std::string FloatingPointCell::set(double x){
         return err;
     }
     if (x != m_data->m_current.exchange(x, std::memory_order_relaxed)){
-        report_value_changed();
+        report_value_changed(this);
     }
     return err;
 }
-
-void FloatingPointCell::load_json(const JsonValue& json){
-    double value;
-    if (!json.read_float(value)){
-        return;
+void FloatingPointCell::set_and_sanitize(double x){
+    if (std::isnan(x)){
+        x = 0;
     }
-    Data& data = *m_data;
-    value = std::max(value, data.m_min_value);
-    value = std::min(value, data.m_max_value);
-    if (std::isnan(value)){
-        value = data.m_default;
+    const Data& data = *m_data;
+    x = std::max(x, data.m_min_value);
+    x = std::min(x, data.m_max_value);
+    if (x != m_data->m_current.exchange(x, std::memory_order_relaxed)){
+        report_value_changed(this);
     }
-    set(value);
-}
-JsonValue FloatingPointCell::to_json() const{
-    return (double)*this;
 }
 
+
+
 std::string FloatingPointCell::check_validity(double x) const{
     const Data& data = *m_data;
     if (x < data.m_min_value){
@@ -129,6 +126,23 @@ std::string FloatingPointCell::check_validity() const{
 void FloatingPointCell::restore_defaults(){
     set(m_data->m_default);
 }
+JsonValue FloatingPointCell::to_json() const{
+    return (double)*this;
+}
+void FloatingPointCell::load_json(const JsonValue& json){
+    double value;
+    if (!json.read_float(value)){
+        return;
+    }
+    Data& data = *m_data;
+    value = std::max(value, data.m_min_value);
+    value = std::min(value, data.m_max_value);
+    if (std::isnan(value)){
+        value = data.m_default;
+    }
+    set(value);
+}
+
 
 
 
@@ -136,12 +150,17 @@ void FloatingPointCell::restore_defaults(){
 
 FloatingPointOption::FloatingPointOption(
     std::string label,
-    LockWhileRunning lock_while_running,
+    LockMode lock_while_running,
     double default_value,
     double min_value,
     double max_value
 )
-    : FloatingPointCell(lock_while_running, default_value, min_value, max_value)
+    : UiState<FloatingPointOption, FloatingPointCell>(
+        lock_while_running,
+        default_value,
+        min_value,
+        max_value
+    )
     , m_label(std::move(label))
 {}
 
diff --git a/Common/Cpp/Options/FloatingPointOption.h b/Common/Cpp/Options/FloatingPointOption.h
index b3e17f817e..ef293df719 100644
--- a/Common/Cpp/Options/FloatingPointOption.h
+++ b/Common/Cpp/Options/FloatingPointOption.h
@@ -1,6 +1,6 @@
 /*  Floating-Point Option
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -14,19 +14,19 @@
 namespace PokemonAutomation{
 
 
-class FloatingPointCell : public ConfigOption{
+class FloatingPointCell : public UiState<FloatingPointCell, ConfigOption>{
 public:
     ~FloatingPointCell();
     FloatingPointCell(const FloatingPointCell& x);
     FloatingPointCell(
-        LockWhileRunning lock_while_running,
+        LockMode lock_while_running,
         double min_value, double max_value,
         double default_value, double current_value
     );
 
 public:
     FloatingPointCell(
-        LockWhileRunning lock_while_running,
+        LockMode lock_while_running,
         double default_value,
         double min_value = -std::numeric_limits<double>::max(),
         double max_value = std::numeric_limits<double>::max()
@@ -38,30 +38,30 @@ class FloatingPointCell : public ConfigOption{
 
     operator double() const;
     std::string set(double x);
+    void set_and_sanitize(double x);
 
-    virtual void load_json(const JsonValue& json) override;
-    virtual JsonValue to_json() const override;
 
+public:
     std::string check_validity(double x) const;
     virtual std::string check_validity() const override;
     virtual void restore_defaults() override;
+    virtual JsonValue to_json() const override;
+    virtual void load_json(const JsonValue& json) override;
 
-    virtual ConfigWidget* make_QtWidget(QWidget& parent) override;
 
 private:
     struct Data;
     Pimpl<Data> m_data;
-    const std::string m_label;
 };
 
 
-class FloatingPointOption : public FloatingPointCell{
+class FloatingPointOption : public UiState<FloatingPointOption, FloatingPointCell>{
 public:
     FloatingPointOption(const FloatingPointOption& x) = delete;
 
     FloatingPointOption(
         std::string label,
-        LockWhileRunning lock_while_running,
+        LockMode lock_while_running,
         double default_value,
         double min_value = -std::numeric_limits<double>::max(),
         double max_value = std::numeric_limits<double>::max()
@@ -69,7 +69,6 @@ class FloatingPointOption : public FloatingPointCell{
 
     const std::string& label() const{ return m_label; }
 
-    virtual ConfigWidget* make_QtWidget(QWidget& parent) override;
 
 private:
     const std::string m_label;
diff --git a/Common/Cpp/Options/GroupOption.cpp b/Common/Cpp/Options/GroupOption.cpp
index 7aca3dfa3e..861798c17b 100644
--- a/Common/Cpp/Options/GroupOption.cpp
+++ b/Common/Cpp/Options/GroupOption.cpp
@@ -1,11 +1,10 @@
 /*  Group Option
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include <atomic>
-#include "Common/Compiler.h"
 #include "Common/Cpp/Containers/Pimpl.tpp"
 #include "Common/Cpp/Json/JsonValue.h"
 #include "Common/Cpp/Json/JsonObject.h"
@@ -18,21 +17,26 @@
 namespace PokemonAutomation{
 
 
+
 struct GroupOption::Data{
     const std::string m_label;
-    const bool m_toggleable;
-    const bool m_default_enabled;
+    const EnableMode m_enable_mode;
+    const bool m_show_restore_defaults_button;
+    const bool m_default_expanded;
+
     std::atomic<bool> m_enabled;
 
     Data(
         std::string label,
-        bool toggleable,
-        bool enabled
+        EnableMode enable_mode,
+        bool show_restore_defaults_button,
+        bool default_expanded
     )
         : m_label(std::move(label))
-        , m_toggleable(toggleable)
-        , m_default_enabled(enabled)
-        , m_enabled(enabled)
+        , m_enable_mode(enable_mode)
+        , m_show_restore_defaults_button(show_restore_defaults_button)
+        , m_default_expanded(default_expanded)
+        , m_enabled(enable_mode != EnableMode::DEFAULT_DISABLED)
     {}
 };
 
@@ -40,56 +44,77 @@ struct GroupOption::Data{
 GroupOption::~GroupOption() = default;
 GroupOption::GroupOption(
     std::string label,
-    LockWhileRunning lock_while_program_is_running,
-    bool toggleable,
-    bool enabled
+    LockMode lock_while_program_is_running,
+    EnableMode enable_mode,
+    bool show_restore_defaults_button,
+    bool default_expanded
 )
-    : BatchOption(lock_while_program_is_running)
-    , m_data(CONSTRUCT_TOKEN, std::move(label), toggleable, enabled)
+    : UiState<GroupOption, BatchOption>(lock_while_program_is_running)
+    , m_data(
+        CONSTRUCT_TOKEN,
+        std::move(label),
+        enable_mode,
+        show_restore_defaults_button,
+        default_expanded
+    )
 {}
 
 const std::string GroupOption::label() const{
     return m_data->m_label;
 }
 bool GroupOption::toggleable() const{
-    return m_data->m_toggleable;
+    return m_data->m_enable_mode != EnableMode::ALWAYS_ENABLED;
+}
+bool GroupOption::default_expanded() const{
+    return m_data->m_default_expanded;
 }
 bool GroupOption::enabled() const{
     return m_data->m_enabled.load(std::memory_order_relaxed);
 }
 void GroupOption::set_enabled(bool enabled){
-    m_data->m_enabled.store(enabled, std::memory_order_relaxed);
-    report_value_changed();
-    on_set_enabled(enabled);
+    if (enabled != m_data->m_enabled.exchange(enabled, std::memory_order_relaxed)){
+        report_value_changed(this);
+        on_set_enabled(enabled);
+    }
+}
+bool GroupOption::restore_defaults_button_enabled() const{
+    return m_data->m_show_restore_defaults_button;
+}
+
+void GroupOption::restore_defaults(){
+    BatchOption::restore_defaults();
+    if (toggleable()){
+        bool default_value = m_data->m_enable_mode == EnableMode::DEFAULT_ENABLED;
+        if (default_value != m_data->m_enabled.exchange(default_value, std::memory_order_relaxed)){
+            report_value_changed(this);
+            on_set_enabled(default_value);
+        }
+    }
+}
+JsonValue GroupOption::to_json() const{
+    JsonObject obj = std::move(*BatchOption::to_json().to_object());
+    if (toggleable()){
+        obj["Enabled"] = m_data->m_enabled.load(std::memory_order_relaxed);
+    }
+    return obj;
 }
 void GroupOption::load_json(const JsonValue& json){
     BatchOption::load_json(json);
-    const JsonObject* obj = json.get_object();
+    const JsonObject* obj = json.to_object();
     if (obj == nullptr){
         return;
     }
-    if (m_data->m_toggleable){
+    if (toggleable()){
         bool enabled;
         if (obj->read_boolean(enabled, "Enabled")){
             if (enabled != m_data->m_enabled.exchange(enabled, std::memory_order_relaxed)){
-                report_value_changed();
+                report_value_changed(this);
             }
             on_set_enabled(enabled);
         }
     }
 }
-JsonValue GroupOption::to_json() const{
-    JsonObject obj = std::move(*BatchOption::to_json().get_object());
-    if (m_data->m_toggleable){
-        obj["Enabled"] = m_data->m_enabled.load(std::memory_order_relaxed);
-    }
-    return obj;
-}
-void GroupOption::restore_defaults(){
-    m_data->m_enabled.store(m_data->m_default_enabled, std::memory_order_relaxed);
-    BatchOption::restore_defaults();
-    on_set_enabled(m_data->m_default_enabled);
-}
+
 void GroupOption::on_set_enabled(bool enabled){}
 
 
diff --git a/Common/Cpp/Options/GroupOption.h b/Common/Cpp/Options/GroupOption.h
index 379cc46305..5bd793aa4c 100644
--- a/Common/Cpp/Options/GroupOption.h
+++ b/Common/Cpp/Options/GroupOption.h
@@ -1,6 +1,6 @@
 /*  Group Option
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -13,32 +13,45 @@
 namespace PokemonAutomation{
 
 
-class GroupOption : public BatchOption{
+class GroupOption : public UiState<GroupOption, BatchOption>{
 public:
+    enum class EnableMode{
+        ALWAYS_ENABLED,
+        DEFAULT_DISABLED,
+        DEFAULT_ENABLED,
+    };
+
     ~GroupOption();
     GroupOption(
         std::string label,
-        LockWhileRunning lock_while_program_is_running,
-        bool toggleable = false,
-        bool enabled = true
+        LockMode lock_while_program_is_running,
+        EnableMode enable_mode = EnableMode::ALWAYS_ENABLED,
+        bool show_restore_defaults_button = false,
+        bool default_expanded = true
     );
 
     const std::string label() const;
+
     bool toggleable() const;
+    bool default_expanded() const;
+
     bool enabled() const;
     void set_enabled(bool enabled);
 
-    virtual void load_json(const JsonValue& json) override;
-    virtual JsonValue to_json() const override;
+    bool restore_defaults_button_enabled() const;
 
+
+public:
     virtual void restore_defaults() override;
+    virtual JsonValue to_json() const override;
+    virtual void load_json(const JsonValue& json) override;
 
-    virtual ConfigWidget* make_QtWidget(QWidget& parent) override;
 
 public:
     //  Callbacks
     virtual void on_set_enabled(bool enabled);
 
+
 private:
     struct Data;
     Pimpl<Data> m_data;
diff --git a/Common/Cpp/Options/IntegerRangeOption.cpp b/Common/Cpp/Options/IntegerRangeOption.cpp
new file mode 100644
index 0000000000..30ad7bd3aa
--- /dev/null
+++ b/Common/Cpp/Options/IntegerRangeOption.cpp
@@ -0,0 +1,254 @@
+/*  Integer Range Option
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *      This option is thread-safe.
+ *
+ */
+#include <atomic>
+#include "Common/Cpp/Exceptions.h"
+#include "Common/Cpp/Json/JsonValue.h"
+#include "Common/Cpp/Json/JsonArray.h"
+#include "Common/Cpp/Containers/Pimpl.tpp"
+#include "Common/Cpp/Concurrency/SpinLock.h"
+#include "IntegerRangeOption.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+
+
+
+template <typename Type>
+struct IntegerRangeCell<Type>::Data{
+    const Type m_lo_min_value;
+    const Type m_lo_max_value;
+    const Type m_hi_min_value;
+    const Type m_hi_max_value;
+    const Type m_lo_default;
+    const Type m_hi_default;
+
+    mutable SpinLock m_lock;
+    std::atomic<Type> m_lo_current;
+    std::atomic<Type> m_hi_current;
+
+    Data(
+        Type lo_min_value, Type lo_max_value, Type lo_default_value, Type lo_current_value,
+        Type hi_min_value, Type hi_max_value, Type hi_default_value, Type hi_current_value
+    )
+        : m_lo_min_value(lo_min_value), m_lo_max_value(lo_max_value)
+        , m_hi_min_value(hi_min_value), m_hi_max_value(hi_max_value)
+        , m_lo_default(lo_default_value)
+        , m_hi_default(hi_default_value)
+        , m_lo_current(lo_current_value)
+        , m_hi_current(hi_current_value)
+    {
+        if (lo_min_value > lo_max_value ||
+            hi_min_value > hi_max_value ||
+            lo_min_value > hi_min_value ||
+            lo_max_value > hi_max_value ||
+            lo_max_value < hi_min_value
+        ){
+            throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Limits are incompatible.");
+        }
+        if (!(lo_min_value <= lo_default_value && lo_default_value <= lo_max_value)){
+            throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Low default is out of range.");
+        }
+        if (!(hi_min_value <= hi_default_value && hi_default_value <= hi_max_value)){
+            throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "High default is out of range.");
+        }
+        if (lo_default_value > hi_default_value){
+            throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Default values are incompatible.");
+        }
+        if (lo_current_value > hi_current_value){
+            throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Current values are incompatible.");
+        }
+    }
+};
+
+
+
+template <typename Type>
+IntegerRangeCell<Type>::~IntegerRangeCell() = default;
+template <typename Type>
+IntegerRangeCell<Type>::IntegerRangeCell(const IntegerRangeCell& x)
+    : UiState<IntegerRangeCell<Type>, ConfigOption>(x)
+    , m_data(
+        CONSTRUCT_TOKEN,
+        x.lo_min_value(), x.lo_max_value(), x.lo_default_value(), x.lo_current_value(),
+        x.hi_min_value(), x.hi_max_value(), x.hi_default_value(), x.hi_current_value()
+    )
+{}
+template <typename Type>
+IntegerRangeCell<Type>::IntegerRangeCell(
+    LockMode lock_while_running,
+    Type lo_min_value, Type lo_max_value, Type lo_default_value, Type lo_current_value,
+    Type hi_min_value, Type hi_max_value, Type hi_default_value, Type hi_current_value
+)
+    : UiState<IntegerRangeCell<Type>, ConfigOption>(lock_while_running)
+    , m_data(
+        CONSTRUCT_TOKEN,
+        lo_min_value, lo_max_value, lo_default_value, lo_current_value,
+        hi_min_value, hi_max_value, hi_default_value, hi_current_value
+    )
+{}
+
+template <typename Type>
+Type IntegerRangeCell<Type>::lo_min_value() const{
+    return m_data->m_lo_min_value;
+}
+template <typename Type>
+Type IntegerRangeCell<Type>::lo_max_value() const{
+    return m_data->m_lo_max_value;
+}
+template <typename Type>
+Type IntegerRangeCell<Type>::lo_default_value() const{
+    return m_data->m_lo_default;
+}
+template <typename Type>
+Type IntegerRangeCell<Type>::hi_min_value() const{
+    return m_data->m_hi_min_value;
+
+}
+template <typename Type>
+Type IntegerRangeCell<Type>::hi_max_value() const{
+    return m_data->m_hi_max_value;
+}
+template <typename Type>
+Type IntegerRangeCell<Type>::hi_default_value() const{
+    return m_data->m_hi_default;
+}
+
+template <typename Type>
+Type IntegerRangeCell<Type>::lo_current_value() const{
+    return m_data->m_lo_current.load(std::memory_order_relaxed);
+}
+template <typename Type>
+Type IntegerRangeCell<Type>::hi_current_value() const{
+    return m_data->m_hi_current.load(std::memory_order_relaxed);
+}
+template <typename Type>
+void IntegerRangeCell<Type>::current_values(Type& lo, Type& hi) const{
+    ReadSpinLock lg(m_data->m_lock);
+    lo = lo_current_value();
+    hi = hi_current_value();
+}
+
+template <typename Type>
+void IntegerRangeCell<Type>::set_lo(Type lo){
+    lo = std::max(lo, lo_min_value());
+    lo = std::min(lo, lo_max_value());
+
+    Type current_lo;
+    {
+        WriteSpinLock lg(m_data->m_lock);
+        current_lo = lo_current_value();
+        if (hi_current_value() < lo){
+            m_data->m_hi_current.store(lo, std::memory_order_relaxed);
+        }
+        if (current_lo != lo){
+            m_data->m_lo_current.store(lo, std::memory_order_relaxed);
+        }
+    }
+    //  It is impossible for hi to change without also changing lo. So we only
+    //  need to check for lo. If this condition fails, we were already in a bad
+    //  state to begin with.
+    if (current_lo != lo){
+        this->report_value_changed(this);
+    }
+}
+template <typename Type>
+void IntegerRangeCell<Type>::set_hi(Type hi){
+    hi = std::max(hi, hi_min_value());
+    hi = std::min(hi, hi_max_value());
+
+    Type current_hi;
+    {
+        WriteSpinLock lg(m_data->m_lock);
+        current_hi = hi_current_value();
+        if (lo_current_value() > hi){
+            m_data->m_lo_current.store(hi, std::memory_order_relaxed);
+        }
+        if (current_hi != hi){
+            m_data->m_hi_current.store(hi, std::memory_order_relaxed);
+        }
+    }
+    //  It is impossible for lo to change without also changing hi. So we only
+    //  need to check for hi. If this condition fails, we were already in a bad
+    //  state to begin with.
+    if (current_hi != hi){
+        this->report_value_changed(this);
+    }
+}
+template <typename Type>
+void IntegerRangeCell<Type>::set(Type lo, Type hi){
+    lo = std::max(lo, lo_min_value());
+    lo = std::min(lo, lo_max_value());
+    hi = std::max(hi, hi_min_value());
+    hi = std::min(hi, hi_max_value());
+    hi = std::max(hi, lo);
+
+    Type current_lo, current_hi;
+    {
+        WriteSpinLock lg(m_data->m_lock);
+        current_lo = lo_current_value();
+        current_hi = hi_current_value();
+        if (current_lo != lo){
+            m_data->m_lo_current.store(lo, std::memory_order_relaxed);
+        }
+        if (current_hi != hi){
+            m_data->m_hi_current.store(hi, std::memory_order_relaxed);
+        }
+    }
+    if (current_lo != lo || current_hi != hi){
+        this->report_value_changed(this);
+    }
+}
+
+template <typename Type>
+void IntegerRangeCell<Type>::set(const IntegerRangeCell& option){
+    Type lo, hi;
+    option.current_values(lo, hi);
+    set(lo, hi);
+    current_values(lo, hi);
+}
+
+template <typename Type>
+void IntegerRangeCell<Type>::restore_defaults(){
+    set(m_data->m_lo_default, m_data->m_hi_default);
+}
+template <typename Type>
+JsonValue IntegerRangeCell<Type>::to_json() const{
+    Type lo, hi;
+    current_values(lo, hi);
+    JsonArray array;
+    array.push_back(lo);
+    array.push_back(hi);
+    return array;
+}
+template <typename Type>
+void IntegerRangeCell<Type>::load_json(const JsonValue& json){
+    const JsonArray* array = json.to_array();
+    if (array == nullptr || array->size() != 2){
+        return;
+    }
+    set(
+        (Type)(*array)[0].to_integer_default(m_data->m_lo_default),
+        (Type)(*array)[1].to_integer_default(m_data->m_hi_default)
+    );
+}
+
+
+
+
+
+
+
+template class IntegerRangeCell<uint8_t>;
+
+
+
+}
+
diff --git a/Common/Cpp/Options/IntegerRangeOption.h b/Common/Cpp/Options/IntegerRangeOption.h
new file mode 100644
index 0000000000..0824d05a78
--- /dev/null
+++ b/Common/Cpp/Options/IntegerRangeOption.h
@@ -0,0 +1,66 @@
+/*  Integer Range Option
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *      This option is thread-safe.
+ *
+ */
+
+#ifndef PokemonAutomation_Options_IntegerRangeOption_H
+#define PokemonAutomation_Options_IntegerRangeOption_H
+
+#include "Common/Cpp/Containers/Pimpl.h"
+#include "ConfigOption.h"
+
+namespace PokemonAutomation{
+
+
+template <typename Type>
+class IntegerRangeCell : public UiState<IntegerRangeCell<Type>, ConfigOption>{
+public:
+    ~IntegerRangeCell();
+    IntegerRangeCell(const IntegerRangeCell& x);
+    IntegerRangeCell(
+        LockMode lock_while_running,
+        Type lo_min_value, Type lo_max_value, Type lo_default_value, Type lo_current_value,
+        Type hi_min_value, Type hi_max_value, Type hi_default_value, Type hi_current_value
+    );
+
+    Type lo_min_value() const;
+    Type lo_max_value() const;
+    Type lo_default_value() const;
+
+    Type hi_min_value() const;
+    Type hi_max_value() const;
+    Type hi_default_value() const;
+
+    Type lo_current_value() const;
+    Type hi_current_value() const;
+    void current_values(Type& lo, Type& hi) const;
+
+    virtual void set_lo(Type x);
+    virtual void set_hi(Type x);
+    virtual void set(Type lo, Type hi);
+    virtual void set(const IntegerRangeCell& option);
+
+
+public:
+//    std::string check_validity(Type x) const;
+//    virtual std::string check_validity() const override;
+    virtual void restore_defaults() override;
+    virtual JsonValue to_json() const override;
+    virtual void load_json(const JsonValue& json) override;
+
+
+protected:
+    struct Data;
+    Pimpl<Data> m_data;
+};
+
+
+
+
+
+}
+#endif
+
diff --git a/Common/Cpp/Options/KeyboardLayoutOption.cpp b/Common/Cpp/Options/KeyboardLayoutOption.cpp
new file mode 100644
index 0000000000..c83a0baaa6
--- /dev/null
+++ b/Common/Cpp/Options/KeyboardLayoutOption.cpp
@@ -0,0 +1,38 @@
+/*  Keyboard Layout Option
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "KeyboardLayoutOption.h"
+
+namespace PokemonAutomation{
+
+
+
+
+KeyboardLayoutOption::~KeyboardLayoutOption() = default;
+
+KeyboardLayoutOption::KeyboardLayoutOption(
+    std::string label,
+    LockMode lock_while_running,
+    KeyboardLayout default_value
+)
+    : EnumDropdownOption<KeyboardLayout>(
+        std::move(label),
+        {
+            {KeyboardLayout::QWERTY, "qwerty", "QWERTY"},
+            {KeyboardLayout::AZERTY, "azerty", "AZERTY"},
+        },
+        lock_while_running,
+        default_value
+    )
+{}
+
+
+
+
+
+}
+
+
diff --git a/Common/Cpp/Options/KeyboardLayoutOption.h b/Common/Cpp/Options/KeyboardLayoutOption.h
new file mode 100644
index 0000000000..d2e5ab3859
--- /dev/null
+++ b/Common/Cpp/Options/KeyboardLayoutOption.h
@@ -0,0 +1,38 @@
+/*  Keyboard Layout Option
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Options_KeyboardLayoutOption_H
+#define PokemonAutomation_Options_KeyboardLayoutOption_H
+
+#include "EnumDropdownOption.h"
+
+namespace PokemonAutomation{
+
+
+enum class KeyboardLayout{
+    QWERTY,
+    AZERTY,
+};
+
+
+class KeyboardLayoutOption : public EnumDropdownOption<KeyboardLayout>{
+public:
+    ~KeyboardLayoutOption();
+    KeyboardLayoutOption(
+        std::string label,
+        LockMode lock_while_running,
+        KeyboardLayout default_value
+    );
+
+
+};
+
+
+
+
+
+}
+#endif
diff --git a/Common/Cpp/Options/MacAddressOption.cpp b/Common/Cpp/Options/MacAddressOption.cpp
new file mode 100644
index 0000000000..27b81137c8
--- /dev/null
+++ b/Common/Cpp/Options/MacAddressOption.cpp
@@ -0,0 +1,146 @@
+/*  MAC Address Option
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <string.h>
+#include <vector>
+#include "Common/Cpp/Containers/Pimpl.tpp"
+#include "Common/Cpp/Concurrency/Mutex.h"
+#include "Common/Cpp/Json/JsonValue.h"
+#include "MacAddressOption.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+
+
+
+
+std::string write_MAC_address(size_t length, const uint8_t* address){
+    static const char HEX_DIGITS[] = "0123456789ABCDEF";
+    std::string ret;
+    for (size_t c = 0; c < length; c++){
+        if (!ret.empty()){
+            ret += "-";
+        }
+        ret += HEX_DIGITS[address[c] >> 4];
+        ret += HEX_DIGITS[address[c] & 0xf];
+    }
+    return ret;
+}
+void parse_MAC_address(size_t length, uint8_t* address, const std::string& str){
+    memset(address, 0, length);
+    size_t current_index = 0;
+    for (char ch : str){
+        if (current_index >= 2*length){
+            return;
+        }
+        if ('0' <= ch && ch <= '9'){
+            ch -= '0';
+        }else if ('a' <= ch && ch <= 'f'){
+            ch += 10 - 'a';
+        }else if ('A' <= ch && ch <= 'F'){
+            ch += 10 - 'A';
+        }else{
+            continue;
+        }
+        address[current_index / 2] |= ch << 4*(1 - current_index % 2);
+        current_index++;
+    }
+}
+
+
+
+struct MacAddressCell::Data{
+    mutable Mutex m_lock;
+    std::vector<uint8_t> m_current;
+
+    Data(size_t bytes, const uint8_t* current)
+        : m_current(bytes)
+    {
+        if (current != nullptr){
+            memcpy(m_current.data(), current, bytes);
+        }
+    }
+};
+
+
+
+MacAddressCell::~MacAddressCell() = default;
+MacAddressCell::MacAddressCell(const MacAddressCell& x)
+    : UiState<MacAddressCell, ConfigOption>(x)
+    , m_data(CONSTRUCT_TOKEN, x.m_data->m_current.size(), x.m_data->m_current.data())
+{}
+void MacAddressCell::operator=(const MacAddressCell& x){
+    if (bytes() != x.bytes()){
+        throw InternalProgramError(
+            nullptr, PA_CURRENT_FUNCTION,
+            "Attempt to assign a MAC address is mismatching size."
+        );
+    }
+    {
+        std::scoped_lock<Mutex, Mutex> lg(m_data->m_lock, x.m_data->m_lock);
+        memcpy(m_data->m_current.data(), x.m_data->m_current.data(), bytes());
+    }
+    report_value_changed(this);
+}
+MacAddressCell::MacAddressCell(
+    LockMode lock_while_running,
+    size_t bytes,
+    uint8_t* current_value
+)
+    : UiState<MacAddressCell, ConfigOption>(lock_while_running)
+    , m_data(CONSTRUCT_TOKEN, bytes, current_value)
+{}
+
+
+size_t MacAddressCell::bytes() const{
+    return m_data->m_current.size();
+}
+std::string MacAddressCell::to_string() const{
+    std::lock_guard<Mutex> lg(m_data->m_lock);
+    return write_MAC_address(m_data->m_current.size(), m_data->m_current.data());
+}
+void MacAddressCell::current_value(uint8_t* address) const{
+    std::lock_guard<Mutex> lg(m_data->m_lock);
+    memcpy(address, m_data->m_current.data(), m_data->m_current.size());
+}
+void MacAddressCell::set(const uint8_t* address){
+    {
+        std::lock_guard<Mutex> lg(m_data->m_lock);
+        if (memcmp(m_data->m_current.data(), address, m_data->m_current.size()) == 0){
+            return;
+        }
+        memcpy(m_data->m_current.data(), address, m_data->m_current.size());
+    }
+    report_value_changed(this);
+}
+void MacAddressCell::set(const std::string& address){
+    std::vector<uint8_t> new_value(m_data->m_current.size());
+    parse_MAC_address(new_value.size(), new_value.data(), address);
+    set(new_value.data());
+}
+
+
+bool MacAddressCell::operator==(const uint8_t* address) const{
+    std::lock_guard<Mutex> lg(m_data->m_lock);
+    return memcmp(m_data->m_current.data(), address, m_data->m_current.size()) == 0;
+}
+
+
+void MacAddressCell::load_json(const JsonValue& json){
+    set(json.to_string_default());
+}
+JsonValue MacAddressCell::to_json() const{
+    return to_string();
+}
+
+
+
+
+
+}
diff --git a/Common/Cpp/Options/MacAddressOption.h b/Common/Cpp/Options/MacAddressOption.h
new file mode 100644
index 0000000000..92d7289eb2
--- /dev/null
+++ b/Common/Cpp/Options/MacAddressOption.h
@@ -0,0 +1,62 @@
+/*  MAC Address Option
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *      This option is thread-safe.
+ *
+ */
+
+#ifndef PokemonAutomation_Options_MacAddressOption_H
+#define PokemonAutomation_Options_MacAddressOption_H
+
+#include "Common/Cpp/Containers/Pimpl.h"
+#include "ConfigOption.h"
+
+namespace PokemonAutomation{
+
+
+std::string write_MAC_address(size_t length, const uint8_t* address);
+void parse_MAC_address(size_t length, uint8_t* address, const std::string& str);
+
+
+class MacAddressCell : public UiState<MacAddressCell, ConfigOption>{
+public:
+    ~MacAddressCell();
+    MacAddressCell(const MacAddressCell& x);
+    void operator=(const MacAddressCell& x);
+    MacAddressCell(
+        LockMode lock_while_running,
+        size_t bytes,
+        uint8_t* current_value
+    );
+
+
+public:
+    size_t bytes() const;
+    std::string to_string() const;
+
+    //  Buffer must be long enough.
+
+    void current_value(uint8_t* address) const;
+    void set(const uint8_t* address);
+    void set(const std::string& address);
+
+    bool operator==(const uint8_t* address) const;
+
+    virtual void load_json(const JsonValue& json) override;
+    virtual JsonValue to_json() const override;
+
+
+protected:
+    struct Data;
+    Pimpl<Data> m_data;
+};
+
+
+
+
+
+
+}
+#endif
+
diff --git a/Common/Cpp/Options/PathOption.cpp b/Common/Cpp/Options/PathOption.cpp
new file mode 100644
index 0000000000..718b103cab
--- /dev/null
+++ b/Common/Cpp/Options/PathOption.cpp
@@ -0,0 +1,139 @@
+/*  Path Option
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Containers/Pimpl.tpp"
+#include "Common/Cpp/Concurrency/SpinLock.h"
+#include "Common/Cpp/Json/JsonValue.h"
+#include "PathOption.h"
+
+namespace PokemonAutomation{
+
+
+
+struct PathCell::Data{
+    const std::string m_default;
+    const std::string m_filter_string;
+    const std::string m_placeholder_text;
+    const bool m_is_directory;
+
+    std::atomic<bool> m_locked;
+
+    mutable SpinLock m_lock;
+    std::string m_current;
+
+    Data(
+        std::string default_value,
+        std::string filter_string,
+        std::string placeholder_text,
+        bool is_directory
+    )
+        : m_default(std::move(default_value))
+        , m_filter_string(std::move(filter_string))
+        , m_placeholder_text(std::move(placeholder_text))
+        , m_is_directory(is_directory)
+        , m_current(m_default)
+    {}
+};
+
+
+PathCell::~PathCell() = default;
+PathCell::PathCell(
+    LockMode lock_while_program_is_running,
+    std::string default_value,
+    std::string filter_string,
+    std::string placeholder_text,
+    bool is_directory
+)
+    : UiState<PathCell, ConfigOption>(lock_while_program_is_running)
+    , m_data(CONSTRUCT_TOKEN, std::move(default_value), std::move(filter_string), std::move(placeholder_text), is_directory)
+{}
+
+const std::string& PathCell::placeholder_text() const{
+    return m_data->m_placeholder_text;
+}
+const std::string PathCell::default_value() const{
+    return m_data->m_default;
+}
+const std::string& PathCell::filter_string() const{
+    return m_data->m_filter_string;
+}
+bool PathCell::is_directory() const{
+    return m_data->m_is_directory;
+}
+
+
+bool PathCell::is_locked() const{
+    return m_data->m_locked.load(std::memory_order_relaxed);
+}
+void PathCell::set_locked(bool locked){
+    if (locked == is_locked()){
+        return;
+    }
+    m_data->m_locked.store(locked, std::memory_order_relaxed);
+    report_visibility_changed();
+}
+
+
+PathCell::operator std::string() const{
+    ReadSpinLock lg(m_data->m_lock);
+    return m_data->m_current;
+}
+void PathCell::set(std::string x){
+    sanitize(x);
+    {
+        WriteSpinLock lg(m_data->m_lock);
+        if (m_data->m_current == x){
+            return;
+        }
+        m_data->m_current = std::move(x);
+    }
+    report_value_changed(this);
+}
+
+
+void PathCell::restore_defaults(){
+    set(m_data->m_default);
+}
+JsonValue PathCell::to_json() const{
+    ReadSpinLock lg(m_data->m_lock);
+    return m_data->m_current;
+}
+void PathCell::load_json(const JsonValue& json){
+    const std::string* str = json.to_string();
+    if (str == nullptr){
+        return;
+    }
+    set(*str);
+}
+
+
+
+
+PathOption::PathOption(
+    std::string label,
+    LockMode lock_while_program_is_running,
+    std::string default_value,
+    std::string filter_string,
+    std::string placeholder_text,
+    bool is_directory
+)
+     : UiState<PathOption, PathCell>(
+        lock_while_program_is_running,
+        default_value,
+        filter_string,
+        placeholder_text,
+        is_directory
+    )
+     , m_label(std::move(label))
+{}
+
+
+
+
+
+
+
+}
diff --git a/Common/Cpp/Options/PathOption.h b/Common/Cpp/Options/PathOption.h
new file mode 100644
index 0000000000..b372be89a5
--- /dev/null
+++ b/Common/Cpp/Options/PathOption.h
@@ -0,0 +1,79 @@
+/*  Path Option
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Options_PathOption_H
+#define PokemonAutomation_Options_PathOption_H
+
+#include "Common/Cpp/Containers/Pimpl.h"
+#include "Common/Cpp/Options/ConfigOption.h"
+
+namespace PokemonAutomation{
+
+
+class PathCell : public UiState<PathCell, ConfigOption>{
+public:
+    ~PathCell();
+    PathCell(
+        LockMode lock_while_program_is_running,
+        std::string default_value,
+        std::string filter_string, // e.g. "*.json"
+        std::string placeholder_text,
+        bool is_directory = false
+    );
+
+    const std::string& placeholder_text() const;
+    const std::string default_value() const;
+    const std::string& filter_string() const;
+    bool is_directory() const;
+
+
+    bool is_locked() const;
+    void set_locked(bool locked);
+
+    operator std::string() const;
+    void set(std::string x);
+
+
+public:
+    virtual void restore_defaults() override;
+    virtual JsonValue to_json() const override;
+    virtual void load_json(const JsonValue& json) override;
+
+
+protected:
+    virtual void sanitize(std::string& str){}
+
+
+private:
+    struct Data;
+    Pimpl<Data> m_data;
+};
+
+
+class PathOption : public UiState<PathOption, PathCell>{
+public:
+    PathOption(
+        std::string label,
+        LockMode lock_while_program_is_running,
+        std::string default_value,
+        std::string filter_string,
+        std::string placeholder_text,
+        bool is_directory = false
+    );
+
+    const std::string& label() const{ return m_label; }
+
+
+private:
+    const std::string m_label;
+};
+
+
+
+
+}
+#endif
+
diff --git a/Common/Cpp/Options/RandomCodeOption.cpp b/Common/Cpp/Options/RandomCodeOption.cpp
index 212d958ce9..9f35771315 100644
--- a/Common/Cpp/Options/RandomCodeOption.cpp
+++ b/Common/Cpp/Options/RandomCodeOption.cpp
@@ -1,16 +1,13 @@
 /*  Random Code Option
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
-
-#include <time.h>
 #include "Common/Cpp/Containers/Pimpl.tpp"
 #include "Common/Cpp/Concurrency/SpinLock.h"
 #include "Common/Cpp/Json/JsonValue.h"
 #include "Common/Cpp/Json/JsonObject.h"
 #include "Common/Qt/CodeValidator.h"
-#include "Common/Qt/Options/ConfigWidget.h"
 #include "RandomCodeOption.h"
 
 namespace PokemonAutomation{
@@ -42,16 +39,18 @@ std::string RaidCodeOption::check_validity() const{
 bool RaidCodeOption::code_enabled() const{
     return m_random_digits != 0 || m_code.size() > 0;
 }
-bool RaidCodeOption::get_code(uint8_t* code) const{
+std::string RaidCodeOption::get_code() const{
     if (!code_enabled()){
-        return false;
+        return "";
     }
+    std::string code;
+    code.resize(8);
     if (m_random_digits == 0){
         std::string qstr = sanitize_code(8, m_code);
         for (int c = 0; c < 8; c++){
-            code[c] = qstr[c] - '0';
+            code[c] = qstr[c];
         }
-        return true;
+        return code;
     }
     srand((unsigned)time(nullptr));
     for (uint8_t c = 0; c < m_random_digits; c++){
@@ -59,12 +58,12 @@ bool RaidCodeOption::get_code(uint8_t* code) const{
         do{
             x = rand() & 0x0f;
         }while (x >= 10);
-        code[c] = x;
+        code[c] = x + '0';
     }
     for (size_t c = m_random_digits; c < m_digits; c++){
         code[c] = code[c - 1];
     }
-    return true;
+    return code;
 }
 bool RaidCodeOption::operator==(const RaidCodeOption& x) const{
     return
@@ -121,39 +120,11 @@ const std::string& RandomCodeOption::label() const{
     return m_data->m_label;
 }
 
-void RandomCodeOption::load_json(const JsonValue& json){
-    const JsonObject* obj = json.get_object();
-    if (obj == nullptr){
-        return;
-    }
-
-    RaidCodeOption code(m_data->m_default.total_digits());
-
-    obj->read_integer(code.m_random_digits, "RandomDigits");
-
-    std::string str;
-    if (obj->read_string(str, "RaidCode")){
-        code.m_code = str;
-    }
-
-    {
-        SpinLockGuard lg(m_data->m_lock);
-        m_data->m_current = code;
-    }
-    report_value_changed();
-}
-JsonValue RandomCodeOption::to_json() const{
-    SpinLockGuard lg(m_data->m_lock);
-    JsonObject obj;
-    obj["RandomDigits"] = m_data->m_current.m_random_digits;
-    obj["RaidCode"] = m_data->m_current.m_code;
-    return obj;
-}
 
 
 
 RandomCodeOption::operator RaidCodeOption() const{
-    SpinLockGuard lg(m_data->m_lock);
+    ReadSpinLock lg(m_data->m_lock);
     return m_data->m_current;
 }
 std::string RandomCodeOption::set(RaidCodeOption code){
@@ -162,33 +133,62 @@ std::string RandomCodeOption::set(RaidCodeOption code){
         return error;
     }
     {
-        SpinLockGuard lg(m_data->m_lock);
+        WriteSpinLock lg(m_data->m_lock);
         if (m_data->m_current == code){
             return std::string();
         }
         m_data->m_current = code;
     }
-    report_value_changed();
+    report_value_changed(this);
     return std::string();
 }
 bool RandomCodeOption::code_enabled() const{
-    SpinLockGuard lg(m_data->m_lock);
+    ReadSpinLock lg(m_data->m_lock);
     return m_data->m_current.code_enabled();
 }
-bool RandomCodeOption::get_code(uint8_t* code) const{
-    SpinLockGuard lg(m_data->m_lock);
-    return m_data->m_current.get_code(code);
+std::string RandomCodeOption::get_code() const{
+    ReadSpinLock lg(m_data->m_lock);
+    return m_data->m_current.get_code();
 }
 
+
+JsonValue RandomCodeOption::to_json() const{
+    ReadSpinLock lg(m_data->m_lock);
+    JsonObject obj;
+    obj["RandomDigits"] = m_data->m_current.m_random_digits;
+    obj["RaidCode"] = m_data->m_current.m_code;
+    return obj;
+}
+void RandomCodeOption::load_json(const JsonValue& json){
+    const JsonObject* obj = json.to_object();
+    if (obj == nullptr){
+        return;
+    }
+
+    RaidCodeOption code(m_data->m_default.total_digits());
+
+    obj->read_integer(code.m_random_digits, "RandomDigits");
+
+    std::string str;
+    if (obj->read_string(str, "RaidCode")){
+        code.m_code = str;
+    }
+
+    {
+        WriteSpinLock lg(m_data->m_lock);
+        m_data->m_current = code;
+    }
+    report_value_changed(this);
+}
 std::string RandomCodeOption::check_validity() const{
     return m_data->m_current.check_validity();
 }
 void RandomCodeOption::restore_defaults(){
     {
-        SpinLockGuard lg(m_data->m_lock);
+        WriteSpinLock lg(m_data->m_lock);
         m_data->m_current = m_data->m_default;
     }
-    report_value_changed();
+    report_value_changed(this);
 }
 
 
diff --git a/Common/Cpp/Options/RandomCodeOption.h b/Common/Cpp/Options/RandomCodeOption.h
index fb3784dfb3..1b5e09d6b9 100644
--- a/Common/Cpp/Options/RandomCodeOption.h
+++ b/Common/Cpp/Options/RandomCodeOption.h
@@ -1,6 +1,6 @@
 /*  Random Code Option
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -25,7 +25,7 @@ class RaidCodeOption{
 
     std::string check_validity() const;
     bool code_enabled() const;
-    bool get_code(uint8_t* code) const;
+    std::string get_code() const;
 
     bool operator==(const RaidCodeOption& x) const;
 
@@ -37,28 +37,28 @@ class RaidCodeOption{
 
 
 
-class RandomCodeOption : public ConfigOption{
+class RandomCodeOption : public UiState<RandomCodeOption, ConfigOption>{
 public:
     ~RandomCodeOption();
     RandomCodeOption(size_t total_digits);
     RandomCodeOption(std::string label, size_t total_digits, size_t random_digits, std::string code_string);
 //    virtual std::unique_ptr<ConfigOption> clone() const override;
 
-    virtual void load_json(const JsonValue& json) override;
-    virtual JsonValue to_json() const override;
-
     const std::string& label() const;
 
     operator RaidCodeOption() const;
     std::string set(RaidCodeOption code);
 
     bool code_enabled() const;
-    bool get_code(uint8_t* code) const;
+    std::string get_code() const;
+
 
+public:
     virtual std::string check_validity() const override;
     virtual void restore_defaults() override;
+    virtual void load_json(const JsonValue& json) override;
+    virtual JsonValue to_json() const override;
 
-    virtual ConfigWidget* make_QtWidget(QWidget& parent) override;
 
 private:
     struct Data;
diff --git a/Common/Cpp/Options/SimpleIntegerOption.cpp b/Common/Cpp/Options/SimpleIntegerOption.cpp
index 817329c04c..5de6067e36 100644
--- a/Common/Cpp/Options/SimpleIntegerOption.cpp
+++ b/Common/Cpp/Options/SimpleIntegerOption.cpp
@@ -1,41 +1,42 @@
 /*  Simple Integer Option
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include <limits>
 #include <atomic>
+#include "Common/Cpp/Exceptions.h"
 #include "Common/Cpp/Containers/Pimpl.tpp"
 #include "Common/Cpp/Json/JsonValue.h"
 #include "SimpleIntegerOption.h"
 
-#include "Common/Qt/Options/SimpleIntegerWidget.h"
-
 namespace PokemonAutomation{
 
 
 
-
-template <typename Type>
-ConfigWidget* SimpleIntegerCell<Type>::make_QtWidget(QWidget& parent){
-    return new SimpleIntegerCellWidget<Type>(parent, *this);
-}
-template <typename Type>
-ConfigWidget* SimpleIntegerOption<Type>::make_QtWidget(QWidget& parent){
-    return new SimpleIntegerOptionWidget<Type>(parent, *this);
+uint64_t SimpleIntegerCellBase::sanitize(uint64_t x){
+    if (x > (uint64_t)std::numeric_limits<NativeType>::max()){
+        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Integer Overflow");
+    }
+    return x;
 }
 
 
 
-template <typename Type>
-struct SimpleIntegerCell<Type>::Data{
-    const Type m_min_value;
-    const Type m_max_value;
-    const Type m_default;
-    std::atomic<Type> m_current;
 
-    Data(Type min_value, Type max_value, Type default_value, Type value)
+
+struct SimpleIntegerCellBase::Data{
+    const NativeType m_min_value;
+    const NativeType m_max_value;
+    const NativeType m_default;
+    std::atomic<NativeType> m_current;
+
+    Data(
+        NativeType min_value, NativeType max_value,
+        NativeType default_value,
+        NativeType value
+    )
         : m_min_value(min_value)
         , m_max_value(max_value)
         , m_default(default_value)
@@ -46,96 +47,84 @@ struct SimpleIntegerCell<Type>::Data{
 
 
 
-template <typename Type>
-SimpleIntegerCell<Type>::~SimpleIntegerCell() = default;
-template <typename Type>
-SimpleIntegerCell<Type>::SimpleIntegerCell(const SimpleIntegerCell& x)
-    : ConfigOption(x)
+SimpleIntegerCellBase::~SimpleIntegerCellBase() = default;
+SimpleIntegerCellBase::SimpleIntegerCellBase(const SimpleIntegerCellBase& x)
+    : UiState<SimpleIntegerCellBase, ConfigOption>(x)
     , m_data(CONSTRUCT_TOKEN, x.min_value(), x.max_value(), x.default_value(), x.current_value())
 {}
-template <typename Type>
-SimpleIntegerCell<Type>::SimpleIntegerCell(
-    LockWhileRunning lock_while_running,
-    Type min_value, Type max_value,
-    Type default_value, Type current_value
+SimpleIntegerCellBase::SimpleIntegerCellBase(
+    LockMode lock_while_running,
+    NativeType min_value, NativeType max_value,
+    NativeType default_value, NativeType current_value
 )
-    : ConfigOption(lock_while_running)
+    : UiState<SimpleIntegerCellBase, ConfigOption>(lock_while_running)
     , m_data(CONSTRUCT_TOKEN, min_value, max_value, default_value, current_value)
 {}
 
-template <typename Type>
-SimpleIntegerCell<Type>::SimpleIntegerCell(
-    LockWhileRunning lock_while_running,
-    Type default_value
+SimpleIntegerCellBase::SimpleIntegerCellBase(
+    LockMode lock_while_running,
+    NativeType default_value
 )
-    : ConfigOption(lock_while_running)
-    , m_data(CONSTRUCT_TOKEN, std::numeric_limits<Type>::min(), std::numeric_limits<Type>::max(), default_value, default_value)
+    : UiState<SimpleIntegerCellBase, ConfigOption>(lock_while_running)
+    , m_data(
+        CONSTRUCT_TOKEN,
+        std::numeric_limits<NativeType>::min(),
+        std::numeric_limits<NativeType>::max(),
+        default_value,
+        default_value
+    )
 {}
-template <typename Type>
-SimpleIntegerCell<Type>::SimpleIntegerCell(
-    LockWhileRunning lock_while_running,
-    Type default_value, Type min_value
+SimpleIntegerCellBase::SimpleIntegerCellBase(
+    LockMode lock_while_running,
+    NativeType default_value, NativeType min_value
 )
-    : ConfigOption(lock_while_running)
-    , m_data(CONSTRUCT_TOKEN, min_value, std::numeric_limits<Type>::max(), default_value, default_value)
+    : UiState<SimpleIntegerCellBase, ConfigOption>(lock_while_running)
+    , m_data(
+        CONSTRUCT_TOKEN,
+        min_value,
+        std::numeric_limits<NativeType>::max(),
+        default_value,
+        default_value
+    )
 {}
-template <typename Type>
-SimpleIntegerCell<Type>::SimpleIntegerCell(
-    LockWhileRunning lock_while_running,
-    Type default_value, Type min_value, Type max_value
+SimpleIntegerCellBase::SimpleIntegerCellBase(
+    LockMode lock_while_running,
+    NativeType default_value, NativeType min_value, NativeType max_value
 )
-    : ConfigOption(lock_while_running)
+    : UiState<SimpleIntegerCellBase, ConfigOption>(lock_while_running)
     , m_data(CONSTRUCT_TOKEN, min_value, max_value, default_value, default_value)
 {}
 
-template <typename Type>
-Type SimpleIntegerCell<Type>::min_value() const{
+SimpleIntegerCellBase::NativeType SimpleIntegerCellBase::min_value() const{
     return m_data->m_min_value;
 }
-template <typename Type>
-Type SimpleIntegerCell<Type>::max_value() const{
+SimpleIntegerCellBase::NativeType SimpleIntegerCellBase::max_value() const{
     return m_data->m_max_value;
 }
-template <typename Type>
-Type SimpleIntegerCell<Type>::default_value() const{
+SimpleIntegerCellBase::NativeType SimpleIntegerCellBase::default_value() const{
     return m_data->m_default;
 }
-template <typename Type>
-Type SimpleIntegerCell<Type>::current_value() const{
+SimpleIntegerCellBase::NativeType SimpleIntegerCellBase::current_value() const{
     return m_data->m_current.load(std::memory_order_relaxed);
 }
-template <typename Type>
-SimpleIntegerCell<Type>::operator Type() const{
-    return m_data->m_current.load(std::memory_order_relaxed);
-}
-template <typename Type>
-std::string SimpleIntegerCell<Type>::set(Type x){
+//SimpleIntegerCellBase::operator NativeType() const{
+//    return m_data->m_current.load(std::memory_order_relaxed);
+//}
+std::string SimpleIntegerCellBase::set(NativeType x){
     std::string err = check_validity(x);
     if (!err.empty()){
         return err;
     }
-    if ((Type)*this == x){
+    if (current_value() == x){
         return std::string();
     }
     if (x != m_data->m_current.exchange(x, std::memory_order_relaxed)){
-        report_value_changed();
+        this->report_value_changed(this);
     }
     return std::string();
 }
-template <typename Type>
-void SimpleIntegerCell<Type>::load_json(const JsonValue& json){
-    Type value;
-    if (json.read_integer(value, m_data->m_min_value, m_data->m_max_value)){
-        set(value);
-    }
-}
-template <typename Type>
-JsonValue SimpleIntegerCell<Type>::to_json() const{
-    return (Type)*this;
-}
 
-template <typename Type>
-std::string SimpleIntegerCell<Type>::check_validity(Type x) const{
+std::string SimpleIntegerCellBase::check_validity(NativeType x) const{
     if (x < m_data->m_min_value){
         return "Value too small: min = " + std::to_string(m_data->m_min_value) + ", value = " + std::to_string(x);
     }
@@ -144,54 +133,77 @@ std::string SimpleIntegerCell<Type>::check_validity(Type x) const{
     }
     return std::string();
 }
-template <typename Type>
-std::string SimpleIntegerCell<Type>::check_validity() const{
-    return check_validity(*this);
+std::string SimpleIntegerCellBase::check_validity() const{
+    return check_validity(current_value());
 }
-template <typename Type>
-void SimpleIntegerCell<Type>::restore_defaults(){
+void SimpleIntegerCellBase::restore_defaults(){
     set(m_data->m_default);
 }
+void SimpleIntegerCellBase::load_json(const JsonValue& json){
+    NativeType value;
+    if (json.read_integer(value, m_data->m_min_value, m_data->m_max_value)){
+        set(value);
+    }
+}
+JsonValue SimpleIntegerCellBase::to_json() const{
+    return current_value();
+}
+
+
 
 
 
 
 
-template <typename Type>
-SimpleIntegerOption<Type>::SimpleIntegerOption(
+SimpleIntegerOptionBase::SimpleIntegerOptionBase(
     std::string label,
-    LockWhileRunning lock_while_running,
-    Type min_value, Type max_value,
-    Type default_value, Type current_value
+    LockMode lock_while_running,
+    NativeType min_value, NativeType max_value,
+    NativeType default_value, NativeType current_value
 )
-    : SimpleIntegerCell<Type>(lock_while_running, min_value, max_value, default_value, current_value)
+    : UiState<SimpleIntegerOptionBase, SimpleIntegerCellBase>(
+        lock_while_running,
+        min_value,
+        max_value,
+        default_value,
+        current_value
+    )
     , m_label(std::move(label))
 {}
-template <typename Type>
-SimpleIntegerOption<Type>::SimpleIntegerOption(
+SimpleIntegerOptionBase::SimpleIntegerOptionBase(
     std::string label,
-    LockWhileRunning lock_while_running,
-    Type default_value
+    LockMode lock_while_running,
+    NativeType default_value
 )
-    : SimpleIntegerCell<Type>(lock_while_running, default_value)
+    : UiState<SimpleIntegerOptionBase, SimpleIntegerCellBase>(
+        lock_while_running,
+        default_value
+    )
     , m_label(std::move(label))
 {}
-template <typename Type>
-SimpleIntegerOption<Type>::SimpleIntegerOption(
+SimpleIntegerOptionBase::SimpleIntegerOptionBase(
     std::string label,
-    LockWhileRunning lock_while_running,
-    Type default_value, Type min_value
+    LockMode lock_while_running,
+    NativeType default_value, NativeType min_value
 )
-    : SimpleIntegerCell<Type>(lock_while_running, default_value, min_value)
+    : UiState<SimpleIntegerOptionBase, SimpleIntegerCellBase>(
+        lock_while_running,
+        default_value,
+        min_value
+    )
     , m_label(std::move(label))
 {}
-template <typename Type>
-SimpleIntegerOption<Type>::SimpleIntegerOption(
+SimpleIntegerOptionBase::SimpleIntegerOptionBase(
     std::string label,
-    LockWhileRunning lock_while_running,
-    Type default_value, Type min_value, Type max_value
+    LockMode lock_while_running,
+    NativeType default_value, NativeType min_value, NativeType max_value
 )
-    : SimpleIntegerCell<Type>(lock_while_running, default_value, min_value, max_value)
+    : UiState<SimpleIntegerOptionBase, SimpleIntegerCellBase>(
+        lock_while_running,
+        default_value,
+        min_value,
+        max_value
+    )
     , m_label(std::move(label))
 {}
 
@@ -199,20 +211,4 @@ SimpleIntegerOption<Type>::SimpleIntegerOption(
 
 
 
-
-
-template class SimpleIntegerCell<uint8_t>;
-template class SimpleIntegerCell<uint16_t>;
-template class SimpleIntegerCell<uint32_t>;
-template class SimpleIntegerCell<uint64_t>;
-template class SimpleIntegerCell<int8_t>;
-
-template class SimpleIntegerOption<uint8_t>;
-template class SimpleIntegerOption<uint16_t>;
-template class SimpleIntegerOption<uint32_t>;
-template class SimpleIntegerOption<uint64_t>;
-template class SimpleIntegerOption<int8_t>;
-
-
-
 }
diff --git a/Common/Cpp/Options/SimpleIntegerOption.h b/Common/Cpp/Options/SimpleIntegerOption.h
index f8919b4680..694d02208d 100644
--- a/Common/Cpp/Options/SimpleIntegerOption.h
+++ b/Common/Cpp/Options/SimpleIntegerOption.h
@@ -1,6 +1,6 @@
 /*  Simple Integer Option
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  *      This option is thread-safe.
  *
@@ -9,59 +9,92 @@
 #ifndef PokemonAutomation_Options_SimpleIntegerOption_H
 #define PokemonAutomation_Options_SimpleIntegerOption_H
 
-#include "Common/Cpp/Containers/Pimpl.h"
-#include "ConfigOption.h"
+#include "SimpleIntegerOptionBase.h"
 
 namespace PokemonAutomation{
 
 
 
 template <typename Type>
-class SimpleIntegerCell : public ConfigOption{
+class SimpleIntegerCell : public SimpleIntegerCellBase{
 public:
-    ~SimpleIntegerCell();
-    SimpleIntegerCell(const SimpleIntegerCell& x);
+    SimpleIntegerCell(const SimpleIntegerCell& x)
+        : SimpleIntegerCellBase(x)
+    {}
     SimpleIntegerCell(
-        LockWhileRunning lock_while_running,
+        LockMode lock_while_running,
         Type min_value, Type max_value,
         Type default_value, Type current_value
-    );
+    )
+        : SimpleIntegerCellBase(
+            lock_while_running,
+            sanitize(min_value),
+            sanitize(max_value),
+            sanitize(default_value),
+            sanitize(current_value)
+        )
+    {}
+
 
 public:
     SimpleIntegerCell(
-        LockWhileRunning lock_while_running,
+        LockMode lock_while_running,
         Type default_value
-    );
+    )
+        : SimpleIntegerCellBase(
+            lock_while_running,
+            sanitize(default_value)
+        )
+    {}
     SimpleIntegerCell(
-        LockWhileRunning lock_while_running,
+        LockMode lock_while_running,
         Type default_value, Type min_value
-    );
+    )
+        : SimpleIntegerCellBase(
+            lock_while_running,
+            sanitize(default_value),
+            sanitize(min_value)
+        )
+    {}
     SimpleIntegerCell(
-        LockWhileRunning lock_while_running,
+        LockMode lock_while_running,
         Type default_value, Type min_value, Type max_value
-    );
-
-    Type min_value() const;
-    Type max_value() const;
-    Type default_value() const;
-    Type current_value() const;
-
-    operator Type() const;
-    virtual std::string set(Type x);
-
-    virtual void load_json(const JsonValue& json) override;
-    virtual JsonValue to_json() const override;
-
-    std::string check_validity(Type x) const;
-    virtual std::string check_validity() const override;
-    virtual void restore_defaults() override;
-
-public:
-    virtual ConfigWidget* make_QtWidget(QWidget& parent) override;
-
-protected:
-    struct Data;
-    Pimpl<Data> m_data;
+    )
+        : SimpleIntegerCellBase(
+            lock_while_running,
+            sanitize(default_value),
+            sanitize(min_value),
+            sanitize(max_value)
+        )
+    {}
+
+    Type min_value() const{
+        return (Type)SimpleIntegerCellBase::min_value();
+    }
+    Type max_value() const{
+        return (Type)SimpleIntegerCellBase::max_value();
+    }
+    Type default_value() const{
+        return (Type)SimpleIntegerCellBase::default_value();
+    }
+    Type current_value() const{
+        return (Type)SimpleIntegerCellBase::current_value();
+    }
+
+    operator Type() const{
+        return (Type)SimpleIntegerCellBase::current_value();
+    }
+    std::string set(Type x){
+        return SimpleIntegerCellBase::set(x);
+    }
+
+    using SimpleIntegerCellBase::check_validity;
+    using SimpleIntegerCellBase::restore_defaults;
+    using SimpleIntegerCellBase::to_json;
+    using SimpleIntegerCellBase::load_json;
+    std::string check_validity(Type x) const{
+        return SimpleIntegerCellBase::check_validity(x);
+    }
 };
 
 
@@ -69,38 +102,100 @@ class SimpleIntegerCell : public ConfigOption{
 
 
 template <typename Type>
-class SimpleIntegerOption : public SimpleIntegerCell<Type>{
+class SimpleIntegerOption : public SimpleIntegerOptionBase{
 public:
     SimpleIntegerOption(const SimpleIntegerOption& x) = delete;
     SimpleIntegerOption(
         std::string label,
-        LockWhileRunning lock_while_running,
+        LockMode lock_while_running,
         Type min_value, Type max_value,
         Type default_value, Type current_value
-    );
+    )
+        : SimpleIntegerOptionBase(
+            std::move(label),
+            lock_while_running,
+            sanitize(min_value),
+            sanitize(max_value),
+            sanitize(default_value),
+            sanitize(current_value)
+        )
+    {}
+
 
 public:
-    SimpleIntegerOption(std::string label,
-        LockWhileRunning lock_while_running,
+    SimpleIntegerOption(
+        std::string label,
+        LockMode lock_while_running,
         Type default_value
-    );
-    SimpleIntegerOption(std::string label,
-        LockWhileRunning lock_while_running,
+    )
+        : SimpleIntegerOptionBase(
+            std::move(label),
+            lock_while_running,
+            sanitize(default_value)
+        )
+    {}
+    SimpleIntegerOption(
+        std::string label,
+        LockMode lock_while_running,
         Type default_value, Type min_value
-    );
-    SimpleIntegerOption(std::string label,
-        LockWhileRunning lock_while_running,
+    )
+        : SimpleIntegerOptionBase(
+            std::move(label),
+            lock_while_running,
+            sanitize(default_value),
+            sanitize(min_value)
+        )
+    {}
+    SimpleIntegerOption(
+        std::string label,
+        LockMode lock_while_running,
         Type default_value, Type min_value, Type max_value
-    );
+    )
+        : SimpleIntegerOptionBase(
+            std::move(label),
+            lock_while_running,
+            sanitize(default_value),
+            sanitize(min_value),
+            sanitize(max_value)
+        )
+    {}
+
+    using SimpleIntegerOptionBase::label;
+
+    Type min_value() const{
+        return (Type)SimpleIntegerCellBase::min_value();
+    }
+    Type max_value() const{
+        return (Type)SimpleIntegerCellBase::max_value();
+    }
+    Type default_value() const{
+        return (Type)SimpleIntegerCellBase::default_value();
+    }
+    Type current_value() const{
+        return (Type)SimpleIntegerCellBase::current_value();
+    }
+
+    operator Type() const{
+        return (Type)SimpleIntegerCellBase::current_value();
+    }
+    std::string set(Type x){
+        return SimpleIntegerCellBase::set(x);
+    }
+
+    using SimpleIntegerCellBase::load_json;
+    using SimpleIntegerCellBase::to_json;
+    std::string check_validity(Type x) const{
+        return SimpleIntegerCellBase::check_validity(x);
+    }
+    using SimpleIntegerCellBase::check_validity;
+    using SimpleIntegerCellBase::restore_defaults;
+};
+
+
+
 
-    const std::string& label() const{ return m_label; }
 
-public:
-    virtual ConfigWidget* make_QtWidget(QWidget& parent) override;
 
-private:
-    const std::string m_label;
-};
 
 
 
diff --git a/Common/Cpp/Options/SimpleIntegerOptionBase.h b/Common/Cpp/Options/SimpleIntegerOptionBase.h
new file mode 100644
index 0000000000..85e0164cb7
--- /dev/null
+++ b/Common/Cpp/Options/SimpleIntegerOptionBase.h
@@ -0,0 +1,118 @@
+/*  Simple Integer Option
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *      This option is thread-safe.
+ *
+ */
+
+#ifndef PokemonAutomation_Options_SimpleIntegerOptionBase_H
+#define PokemonAutomation_Options_SimpleIntegerOptionBase_H
+
+#include "Common/Cpp/Containers/Pimpl.h"
+#include "ConfigOption.h"
+
+namespace PokemonAutomation{
+
+
+class SimpleIntegerCellBase : public UiState<SimpleIntegerCellBase, ConfigOption>{
+public:
+    using NativeType = int64_t;
+
+public:
+    ~SimpleIntegerCellBase();
+    SimpleIntegerCellBase(const SimpleIntegerCellBase& x);
+    SimpleIntegerCellBase(
+        LockMode lock_while_running,
+        NativeType min_value, NativeType max_value,
+        NativeType default_value, NativeType current_value
+    );
+
+
+public:
+    SimpleIntegerCellBase(
+        LockMode lock_while_running,
+        NativeType default_value
+    );
+    SimpleIntegerCellBase(
+        LockMode lock_while_running,
+        NativeType default_value, NativeType min_value
+    );
+    SimpleIntegerCellBase(
+        LockMode lock_while_running,
+        NativeType default_value, NativeType min_value, NativeType max_value
+    );
+
+    NativeType min_value() const;
+    NativeType max_value() const;
+    NativeType default_value() const;
+    NativeType current_value() const;
+
+//    operator NativeType() const;
+    std::string set(NativeType x);
+
+
+public:
+    std::string check_validity(NativeType x) const;
+    virtual std::string check_validity() const override;
+    virtual void restore_defaults() override;
+    virtual JsonValue to_json() const override;
+    virtual void load_json(const JsonValue& json) override;
+
+
+protected:
+    template <typename Type>
+    static Type sanitize(Type x){
+        return x;
+    }
+    static uint64_t sanitize(uint64_t x);
+
+
+protected:
+    struct Data;
+    Pimpl<Data> m_data;
+};
+
+
+
+
+
+class SimpleIntegerOptionBase : public UiState<SimpleIntegerOptionBase, SimpleIntegerCellBase>{
+public:
+    SimpleIntegerOptionBase(const SimpleIntegerOptionBase& x) = delete;
+    SimpleIntegerOptionBase(
+        std::string label,
+        LockMode lock_while_running,
+        NativeType min_value, NativeType max_value,
+        NativeType default_value, NativeType current_value
+    );
+
+
+public:
+    SimpleIntegerOptionBase(
+        std::string label,
+        LockMode lock_while_running,
+        NativeType default_value
+    );
+    SimpleIntegerOptionBase(
+        std::string label,
+        LockMode lock_while_running,
+        NativeType default_value, NativeType min_value
+    );
+    SimpleIntegerOptionBase(
+        std::string label,
+        LockMode lock_while_running,
+        NativeType default_value, NativeType min_value, NativeType max_value
+    );
+
+    const std::string& label() const{ return m_label; }
+
+
+private:
+    const std::string m_label;
+};
+
+
+
+}
+#endif
diff --git a/Common/Cpp/Options/StaticTableOption.cpp b/Common/Cpp/Options/StaticTableOption.cpp
index 663da0815b..dfc4be564a 100644
--- a/Common/Cpp/Options/StaticTableOption.cpp
+++ b/Common/Cpp/Options/StaticTableOption.cpp
@@ -1,6 +1,6 @@
 /*  Static Table Option
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -19,25 +19,28 @@
 namespace PokemonAutomation{
 
 
+
 StaticTableRow::StaticTableRow(std::string slug)
     : m_slug(std::move(slug))
 {}
 void StaticTableRow::add_option(ConfigOption& option, std::string serialization_string){
     m_options.emplace_back(std::move(serialization_string), &option);
 }
-void StaticTableRow::load_json(const JsonValue& json){
-    const JsonObject* obj = json.get_object();
-    if (obj == nullptr){
-        return;
-    }
-    for (auto& item : m_options){
-        if (!item.first.empty()){
-            const JsonValue* value = obj->get_value(item.first);
-            if (value){
-                item.second->load_json(*value);
-            }
+
+
+std::string StaticTableRow::check_validity() const{
+    for (const auto& item : m_options){
+        std::string error = item.second->check_validity();
+        if (!error.empty()){
+            return error;
         }
     }
+    return std::string();
+}
+void StaticTableRow::restore_defaults(){
+    for (const auto& item : m_options){
+        item.second->restore_defaults();
+    }
 }
 JsonValue StaticTableRow::to_json() const{
     JsonObject obj;
@@ -48,18 +51,18 @@ JsonValue StaticTableRow::to_json() const{
     }
     return obj;
 }
-std::string StaticTableRow::check_validity() const{
-    for (const auto& item : m_options){
-        std::string error = item.second->check_validity();
-        if (!error.empty()){
-            return error;
-        }
+void StaticTableRow::load_json(const JsonValue& json){
+    const JsonObject* obj = json.to_object();
+    if (obj == nullptr){
+        return;
     }
-    return std::string();
-}
-void StaticTableRow::restore_defaults(){
-    for (const auto& item : m_options){
-        item.second->restore_defaults();
+    for (auto& item : m_options){
+        if (!item.first.empty()){
+            const JsonValue* value = obj->get_value(item.first);
+            if (value){
+                item.second->load_json(*value);
+            }
+        }
     }
 }
 void StaticTableRow::report_program_state(bool program_is_running){
@@ -160,13 +163,13 @@ struct StaticTableOption::Data{
             throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Attempted to use an unfinalized table.");
         }
 
-        const JsonArray* array = json.get_array();
+        const JsonArray* array = json.to_array();
         if (array == nullptr){
             return;
         }
 
         for (const auto& item : *array){
-            const JsonObject* obj = item.get_object();
+            const JsonObject* obj = item.to_object();
             if (obj == nullptr){
                 continue;
             }
@@ -189,7 +192,7 @@ struct StaticTableOption::Data{
         JsonArray array;
         for (const StaticTableRow* row : m_table){
             JsonValue val = row->to_json();
-            val.get_object_throw()["slug"] = row->slug();
+            val.to_object_throw()["slug"] = row->slug();
             array.push_back(std::move(val));
         }
         return array;
@@ -214,10 +217,10 @@ struct StaticTableOption::Data{
 StaticTableOption::~StaticTableOption() = default;
 StaticTableOption::StaticTableOption(
     std::string label,
-    LockWhileRunning lock_while_program_is_running,
+    LockMode lock_while_program_is_running,
     bool enable_saveload
 )
-    : ConfigOption(lock_while_program_is_running)
+    : UiState<StaticTableOption, ConfigOption>(lock_while_program_is_running)
     , m_data(CONSTRUCT_TOKEN, std::move(label), enable_saveload)
 {}
 void StaticTableOption::add_row(std::unique_ptr<StaticTableRow> row){
diff --git a/Common/Cpp/Options/StaticTableOption.h b/Common/Cpp/Options/StaticTableOption.h
index 39ab3bfe5a..eb5461d423 100644
--- a/Common/Cpp/Options/StaticTableOption.h
+++ b/Common/Cpp/Options/StaticTableOption.h
@@ -1,6 +1,6 @@
 /*  Static Table Option
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -26,13 +26,14 @@ class StaticTableRow{
 
     const std::string& slug() const{ return m_slug; }
 
-    virtual void load_json(const JsonValue& json);
-    virtual JsonValue to_json() const;
+    void report_program_state(bool program_is_running);
+
 
+public:
     virtual std::string check_validity() const;
     virtual void restore_defaults();
-
-    void report_program_state(bool program_is_running);
+    virtual JsonValue to_json() const;
+    virtual void load_json(const JsonValue& json);
 
 
 protected:
@@ -57,12 +58,12 @@ class StaticTableRow{
 
 
 //  This is the table itself.
-class StaticTableOption : public ConfigOption{
+class StaticTableOption : public UiState<StaticTableOption, ConfigOption>{
 public:
     ~StaticTableOption();
     StaticTableOption(
         std::string label,
-        LockWhileRunning lock_while_program_is_running,
+        LockMode lock_while_program_is_running,
         bool enable_saveload = true
     );
 protected:
@@ -91,8 +92,6 @@ class StaticTableOption : public ConfigOption{
     bool saveload_enabled() const;
     virtual std::vector<std::string> make_header() const = 0;
 
-public:
-    virtual ConfigWidget* make_QtWidget(QWidget& parent) override;
 
 private:
     struct Data;
@@ -100,16 +99,6 @@ class StaticTableOption : public ConfigOption{
 };
 
 
-#if 0
-//  Convenience helper class that's type-aware.
-template <typename RowType>
-class StaticTableOption_t : public StaticTableOption{
-public:
-    using StaticTableOption::StaticTableOption;
-
-
-};
-#endif
 
 
 
diff --git a/Common/Cpp/Options/StaticTextOption.cpp b/Common/Cpp/Options/StaticTextOption.cpp
index 966b794d59..11c4e5d8d0 100644
--- a/Common/Cpp/Options/StaticTextOption.cpp
+++ b/Common/Cpp/Options/StaticTextOption.cpp
@@ -1,6 +1,6 @@
 /*  Static Text
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -27,7 +27,7 @@ struct StaticTextOption::Data{
 
 StaticTextOption::~StaticTextOption() = default;
 StaticTextOption::StaticTextOption(std::string label, bool text_wrapping)
-    : ConfigOption(LockWhileRunning::UNLOCKED)
+    : UiState<StaticTextOption, ConfigOption>(LockMode::UNLOCK_WHILE_RUNNING)
     , m_data(CONSTRUCT_TOKEN, std::move(label), text_wrapping)
 {}
 #if 0
@@ -39,18 +39,21 @@ bool StaticTextOption::text_wrapping() const{
     return m_data->m_text_wrapping;
 }
 std::string StaticTextOption::text() const{
-    SpinLockGuard lg(m_data->m_lock);
+    ReadSpinLock lg(m_data->m_lock);
     return m_data->m_text;
 }
 void StaticTextOption::set_text(std::string label){
     {
-        SpinLockGuard lg(m_data->m_lock);
+        WriteSpinLock lg(m_data->m_lock);
+        if (label == m_data->m_text){
+            return;
+        }
         m_data->m_text = std::move(label);
     }
-    report_value_changed();
+    report_value_changed(this);
 }
 void StaticTextOption::load_json(const JsonValue&){
-    report_value_changed();
+    report_value_changed(this);
 }
 JsonValue StaticTextOption::to_json() const{
     return JsonValue();
@@ -80,18 +83,21 @@ bool SectionDividerOption::text_wrapping() const{
     return m_data->m_text_wrapping;
 }
 std::string SectionDividerOption::text() const{
-    SpinLockGuard lg(m_data->m_lock);
+    ReadSpinLock lg(m_data->m_lock);
     return m_data->m_text;
 }
 void SectionDividerOption::set_text(std::string label){
     {
-        SpinLockGuard lg(m_data->m_lock);
+        WriteSpinLock lg(m_data->m_lock);
+        if (label == m_data->m_text){
+            return;
+        }
         m_data->m_text = std::move(label);
     }
-    report_value_changed();
+    report_value_changed(this);
 }
 void SectionDividerOption::load_json(const JsonValue&){
-    report_value_changed();
+    report_value_changed(this);
 }
 JsonValue SectionDividerOption::to_json() const{
     return JsonValue();
diff --git a/Common/Cpp/Options/StaticTextOption.h b/Common/Cpp/Options/StaticTextOption.h
index 0a6ffe5107..b65dae1297 100644
--- a/Common/Cpp/Options/StaticTextOption.h
+++ b/Common/Cpp/Options/StaticTextOption.h
@@ -1,6 +1,6 @@
 /*  Static Text Option
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -14,7 +14,7 @@ namespace PokemonAutomation{
 
 
 
-class StaticTextOption : public ConfigOption{
+class StaticTextOption : public UiState<StaticTextOption, ConfigOption>{
 public:
     ~StaticTextOption();
     StaticTextOption(std::string label, bool text_wrapping = true);
@@ -23,12 +23,12 @@ class StaticTextOption : public ConfigOption{
     std::string text() const;
     void set_text(std::string label);
 
-    virtual void load_json(const JsonValue& json) override;
-    virtual JsonValue to_json() const override;
 
+public:
     virtual void restore_defaults() override{}
+    virtual void load_json(const JsonValue& json) override;
+    virtual JsonValue to_json() const override;
 
-    virtual ConfigWidget* make_QtWidget(QWidget& parent) override;
 
 private:
     struct Data;
@@ -37,7 +37,7 @@ class StaticTextOption : public ConfigOption{
 
 
 
-class SectionDividerOption : public ConfigOption{
+class SectionDividerOption : public UiState<SectionDividerOption, ConfigOption>{
 public:
     ~SectionDividerOption();
     SectionDividerOption(std::string label, bool text_wrapping = true);
@@ -51,7 +51,6 @@ class SectionDividerOption : public ConfigOption{
 
     virtual void restore_defaults() override{}
 
-    virtual ConfigWidget* make_QtWidget(QWidget& parent) override;
 
 private:
     struct Data;
diff --git a/Common/Cpp/Options/StringOption.cpp b/Common/Cpp/Options/StringOption.cpp
index cebe9b5660..e23be45f8a 100644
--- a/Common/Cpp/Options/StringOption.cpp
+++ b/Common/Cpp/Options/StringOption.cpp
@@ -1,6 +1,6 @@
 /*  String Option
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -12,10 +12,14 @@
 namespace PokemonAutomation{
 
 
+
 struct StringCell::Data{
     const bool m_is_password;
     const std::string m_default;
     const std::string m_placeholder_text;
+    const bool m_report_all_text_changes;
+
+    std::atomic<bool> m_locked;
 
     mutable SpinLock m_lock;
     std::string m_current;
@@ -23,11 +27,13 @@ struct StringCell::Data{
     Data(
         bool is_password,
         std::string default_value,
-        std::string placeholder_text
+        std::string placeholder_text,
+        bool report_all_text_changes
     )
         : m_is_password(is_password)
         , m_default(std::move(default_value))
         , m_placeholder_text(std::move(placeholder_text))
+        , m_report_all_text_changes(report_all_text_changes)
         , m_current(m_default)
     {}
 };
@@ -36,25 +42,14 @@ struct StringCell::Data{
 StringCell::~StringCell() = default;
 StringCell::StringCell(
     bool is_password,
-    LockWhileRunning lock_while_program_is_running,
+    LockMode lock_while_program_is_running,
     std::string default_value,
-    std::string placeholder_text
+    std::string placeholder_text,
+    bool signal_all_text_changes
 )
-    : ConfigOption(lock_while_program_is_running)
-    , m_data(CONSTRUCT_TOKEN, is_password, std::move(default_value), std::move(placeholder_text))
+    : UiState<StringCell, ConfigOption>(lock_while_program_is_running)
+    , m_data(CONSTRUCT_TOKEN, is_password, std::move(default_value), std::move(placeholder_text), signal_all_text_changes)
 {}
-#if 0
-std::unique_ptr<ConfigOption> StringCell::clone() const{
-    std::unique_ptr<StringCell> ret(new StringCell(
-        m_is_password,
-        m_label,
-        m_default,
-        m_placeholder_text
-    ));
-    ret->m_current = m_current;
-    return ret;
-}
-#endif
 
 bool StringCell::is_password() const{
     return m_data->m_is_password;
@@ -65,31 +60,48 @@ const std::string& StringCell::placeholder_text() const{
 const std::string StringCell::default_value() const{
     return m_data->m_default;
 }
+bool StringCell::signal_all_text_changes() const{
+    return m_data->m_report_all_text_changes;
+}
+
+
+bool StringCell::is_locked() const{
+    return m_data->m_locked.load(std::memory_order_relaxed);
+}
+void StringCell::set_locked(bool locked){
+    if (locked == is_locked()){
+        return;
+    }
+    m_data->m_locked.store(locked, std::memory_order_relaxed);
+    report_visibility_changed();
+}
+
 
 StringCell::operator std::string() const{
-    SpinLockGuard lg(m_data->m_lock);
+    ReadSpinLock lg(m_data->m_lock);
     return m_data->m_current;
 }
 void StringCell::set(std::string x){
+    sanitize(x);
     {
-        SpinLockGuard lg(m_data->m_lock);
+        WriteSpinLock lg(m_data->m_lock);
         if (m_data->m_current == x){
             return;
         }
         m_data->m_current = std::move(x);
     }
-    report_value_changed();
+    report_value_changed(this);
 }
 
 void StringCell::load_json(const JsonValue& json){
-    const std::string* str = json.get_string();
-    if (str == nullptr) {
+    const std::string* str = json.to_string();
+    if (str == nullptr){
         return;
     }
     set(*str);
 }
 JsonValue StringCell::to_json() const{
-    SpinLockGuard lg(m_data->m_lock);
+    ReadSpinLock lg(m_data->m_lock);
     return m_data->m_current;
 }
 
@@ -102,11 +114,18 @@ void StringCell::restore_defaults(){
 StringOption::StringOption(
     bool is_password,
     std::string label,
-    LockWhileRunning lock_while_program_is_running,
+    LockMode lock_while_program_is_running,
     std::string default_value,
-    std::string placeholder_text
+    std::string placeholder_text,
+    bool signal_all_text_changes
 )
-     : StringCell(is_password, lock_while_program_is_running, default_value, placeholder_text)
+     : UiState<StringOption, StringCell>(
+        is_password,
+        lock_while_program_is_running,
+        default_value,
+        placeholder_text,
+        signal_all_text_changes
+    )
      , m_label(std::move(label))
 {}
 
diff --git a/Common/Cpp/Options/StringOption.h b/Common/Cpp/Options/StringOption.h
index 7c3c5849f5..5ceb0164be 100644
--- a/Common/Cpp/Options/StringOption.h
+++ b/Common/Cpp/Options/StringOption.h
@@ -1,6 +1,6 @@
 /*  String Option
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -13,20 +13,24 @@
 namespace PokemonAutomation{
 
 
-class StringCell : public ConfigOption{
+class StringCell : public UiState<StringCell, ConfigOption>{
 public:
     ~StringCell();
     StringCell(
         bool is_password,
-        LockWhileRunning lock_while_program_is_running,
+        LockMode lock_while_program_is_running,
         std::string default_value,
-        std::string placeholder_text
+        std::string placeholder_text,
+        bool signal_all_text_changes = false
     );
-//    virtual std::unique_ptr<ConfigOption> clone() const override;
 
     bool is_password() const;
     const std::string& placeholder_text() const;
     const std::string default_value() const;
+    bool signal_all_text_changes() const;
+
+    bool is_locked() const;
+    void set_locked(bool locked);
 
     operator std::string() const;
     void set(std::string x);
@@ -36,7 +40,10 @@ class StringCell : public ConfigOption{
 
     virtual void restore_defaults() override;
 
-    virtual ConfigWidget* make_QtWidget(QWidget& parent) override;
+
+protected:
+    virtual void sanitize(std::string& str){}
+
 
 private:
     struct Data;
@@ -44,19 +51,19 @@ class StringCell : public ConfigOption{
 };
 
 
-class StringOption : public StringCell{
+class StringOption : public UiState<StringOption, StringCell>{
 public:
     StringOption(
         bool is_password,
         std::string label,
-        LockWhileRunning lock_while_program_is_running,
+        LockMode lock_while_program_is_running,
         std::string default_value,
-        std::string placeholder_text
+        std::string placeholder_text,
+        bool signal_all_text_changes = false
     );
 
     const std::string& label() const{ return m_label; }
 
-    virtual ConfigWidget* make_QtWidget(QWidget& parent) override;
 
 private:
     const std::string m_label;
diff --git a/Common/Cpp/Options/TextEditOption.cpp b/Common/Cpp/Options/TextEditOption.cpp
index 6191982d19..8d7765cc6d 100644
--- a/Common/Cpp/Options/TextEditOption.cpp
+++ b/Common/Cpp/Options/TextEditOption.cpp
@@ -1,10 +1,9 @@
 /*  Text Edit
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
-
-#include <set>
+#include "Common/Cpp/ListenerSet.h"
 #include "Common/Cpp/Containers/Pimpl.tpp"
 #include "Common/Cpp/Concurrency/SpinLock.h"
 #include "Common/Cpp/Json/JsonValue.h"
@@ -13,15 +12,17 @@
 namespace PokemonAutomation{
 
 
+
 struct TextEditOption::Data{
-    const std::string m_label;
+    std::string m_label;
     const std::string m_default;
     const std::string m_placeholder_text;
     const bool m_report_all_text_changes;
 
     mutable SpinLock m_lock;
     std::string m_current;
-    std::set<FocusListener*> listeners;
+    ListenerSet<FocusListener> focus_listeners;
+    ListenerSet<AppendListener> append_listeners;
 
     Data(
         std::string label,
@@ -37,33 +38,36 @@ struct TextEditOption::Data{
     {}
 };
 
-void TextEditOption::add_listener(FocusListener& listener){
+void TextEditOption::add_focus_listener(FocusListener& listener){
     Data& data = *m_data;
-    SpinLockGuard lg(data.m_lock);
-    data.listeners.insert(&listener);
+    data.focus_listeners.add(listener);
 }
-void TextEditOption::remove_listener(FocusListener& listener){
+void TextEditOption::remove_focus_listener(FocusListener& listener){
     Data& data = *m_data;
-    SpinLockGuard lg(data.m_lock);
-    data.listeners.erase(&listener);
+    data.focus_listeners.remove(listener);
 }
 void TextEditOption::report_focus_in(){
     Data& data = *m_data;
-    SpinLockGuard lg(data.m_lock);
-    for (FocusListener* listener : data.listeners){
-        listener->focus_in();
-    }
+    data.focus_listeners.run_method(&FocusListener::focus_in);
+}
+void TextEditOption::add_append_listener(AppendListener& listener){
+    Data& data = *m_data;
+    data.append_listeners.add(listener);
+}
+void TextEditOption::remove_append_listener(AppendListener& listener){
+    Data& data = *m_data;
+    data.append_listeners.remove(listener);
 }
 
 TextEditOption::~TextEditOption() = default;
 TextEditOption::TextEditOption(
     std::string label,
-    LockWhileRunning lock_while_program_is_running,
+    LockMode lock_while_program_is_running,
     std::string default_value,
     std::string placeholder_text,
     bool signal_all_text_changes
 )
-    : ConfigOption(lock_while_program_is_running)
+    : UiState<TextEditOption, ConfigOption>(lock_while_program_is_running)
     , m_data(CONSTRUCT_TOKEN, std::move(label), std::move(default_value), std::move(placeholder_text), signal_all_text_changes)
 {}
 #if 0
@@ -74,9 +78,17 @@ std::unique_ptr<ConfigOption> TextEditOption::clone() const{
 }
 #endif
 
-const std::string& TextEditOption::label() const{
+std::string TextEditOption::label() const{
+    ReadSpinLock lg(m_data->m_lock);
     return m_data->m_label;
 }
+void TextEditOption::set_label(std::string label){
+    {
+        ReadSpinLock lg(m_data->m_lock);
+        m_data->m_label = std::move(label);
+    }
+    report_value_changed(this);
+}
 const std::string& TextEditOption::placeholder_text() const{
     return m_data->m_placeholder_text;
 }
@@ -85,35 +97,46 @@ bool TextEditOption::signal_all_text_changes() const{
 }
 
 TextEditOption::operator std::string() const{
-    SpinLockGuard lg(m_data->m_lock);
+    ReadSpinLock lg(m_data->m_lock);
     return m_data->m_current;
 }
 void TextEditOption::set(std::string x){
     {
-        SpinLockGuard lg(m_data->m_lock);
+        WriteSpinLock lg(m_data->m_lock);
         if (m_data->m_current == x){
             return;
         }
         m_data->m_current = std::move(x);
     }
-    report_value_changed();
+    report_value_changed(this);
+}
+void TextEditOption::append(const std::string& x){
+    if (x.empty()){
+        return;
+    }
+    {
+        WriteSpinLock lg(m_data->m_lock);
+        m_data->m_current += x;
+    }
+    m_data->append_listeners.run_method(&AppendListener::on_append, x);
+    report_value_changed(this);
 }
 
 
+void TextEditOption::restore_defaults(){
+    set(m_data->m_default);
+}
+JsonValue TextEditOption::to_json() const{
+    ReadSpinLock lg(m_data->m_lock);
+    return m_data->m_current;
+}
 void TextEditOption::load_json(const JsonValue& json){
-    const std::string* str = json.get_string();
+    const std::string* str = json.to_string();
     if (str == nullptr){
         return;
     }
     set(*str);
 }
-JsonValue TextEditOption::to_json() const{
-    SpinLockGuard lg(m_data->m_lock);
-    return m_data->m_current;
-}
-void TextEditOption::restore_defaults(){
-    set(m_data->m_default);
-}
 
 
 
diff --git a/Common/Cpp/Options/TextEditOption.h b/Common/Cpp/Options/TextEditOption.h
index 40e707e510..be382f19fe 100644
--- a/Common/Cpp/Options/TextEditOption.h
+++ b/Common/Cpp/Options/TextEditOption.h
@@ -1,6 +1,6 @@
 /*  Text Edit Option
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -13,41 +13,51 @@
 namespace PokemonAutomation{
 
 
-class TextEditOption : public ConfigOption{
+class TextEditOption : public UiState<TextEditOption, ConfigOption>{
 public:
     //  Listeners for when the user focuses on this box.
     struct FocusListener{
-        virtual void focus_in(){}
+        virtual void focus_in() = 0;
     };
-    void add_listener(FocusListener& listener);
-    void remove_listener(FocusListener& listener);
-
+    void add_focus_listener(FocusListener& listener);
+    void remove_focus_listener(FocusListener& listener);
     void report_focus_in();
 
+    struct AppendListener{
+        virtual void on_append(std::string text) = 0;
+    };
+    void add_append_listener(AppendListener& listener);
+    void remove_append_listener(AppendListener& listener);
+
+
 public:
     ~TextEditOption();
     TextEditOption(
         std::string label,
-        LockWhileRunning lock_while_program_is_running,
+        LockMode lock_while_program_is_running,
         std::string default_value,
         std::string placeholder_text,
         bool signal_all_text_changes = false
     );
 //    virtual std::unique_ptr<ConfigOption> clone() const override;
 
-    const std::string& label() const;
+    std::string label() const;
+    void set_label(std::string label);
+
     const std::string& placeholder_text() const;
     bool signal_all_text_changes() const;
 
     operator std::string() const;
     void set(std::string x);
 
-    virtual void load_json(const JsonValue& json) override;
-    virtual JsonValue to_json() const override;
+    void append(const std::string& x);
+
 
+public:
     virtual void restore_defaults() override;
+    virtual JsonValue to_json() const override;
+    virtual void load_json(const JsonValue& json) override;
 
-    virtual ConfigWidget* make_QtWidget(QWidget& parent) override;
 
 private:
     struct Data;
diff --git a/Common/Cpp/Options/TimeDurationOption.cpp b/Common/Cpp/Options/TimeDurationOption.cpp
new file mode 100644
index 0000000000..ddd3b1f83c
--- /dev/null
+++ b/Common/Cpp/Options/TimeDurationOption.cpp
@@ -0,0 +1,321 @@
+/*  Time Duration Option
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/PrettyPrint.h"
+#include "Common/Cpp/ExpressionEvaluator.h"
+#include "Common/Cpp/Json/JsonValue.h"
+#include "Common/Cpp/Containers/Pimpl.tpp"
+#include "Common/Cpp/Concurrency/SpinLock.h"
+#include "TimeDurationOption.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+
+
+
+template <typename Type>
+struct TimeDurationCell<Type>::Data{
+    const std::string m_units;
+    const bool m_show_summary;
+    const Type m_min_value;
+    const Type m_max_value;
+    const std::string m_default;
+
+    mutable SpinLock m_lock;
+    std::string m_current;
+    Type m_value;
+    std::string m_error;
+
+    Data(
+        std::string units, bool show_summary,
+        Type min_value, Type max_value,
+        std::string default_value
+    )
+        : m_units(units)
+        , m_show_summary(show_summary)
+        , m_min_value(min_value)
+        , m_max_value(max_value)
+        , m_default(std::move(default_value))
+        , m_current(m_default)
+        , m_value(0)
+    {
+        m_error = process(m_current, m_value);
+    }
+
+    static std::map<std::string, int64_t> make_symbol_map(){
+        std::map<std::string, int64_t> map;
+
+        auto self = std::chrono::duration_cast<std::chrono::nanoseconds>(Type(1)).count();
+        auto microseconds = std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::microseconds(1)).count();
+        auto milliseconds = std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::milliseconds(1)).count();
+        auto seconds = std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::seconds(1)).count();
+        auto minutes = std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::minutes(1)).count();
+        auto hours = std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::hours(1)).count();
+        auto days = std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::days(1)).count();
+        auto weeks = days * 7;
+        auto years = std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::years(1)).count();
+
+        if (self <= microseconds){
+            map["us"] = map["microsecond"] = map["microseconds"] = microseconds / self;
+        }
+        if (self <= milliseconds){
+            map["ms"] = map["millisecond"] = map["milliseconds"] = milliseconds / self;
+        }
+        if (self <= seconds){
+            map["s"] = map["secs"] = map["second"] = map["seconds"] = seconds / self;
+        }
+        if (self <= minutes){
+            map["min"] = map["minute"] = map["minutes"] = minutes / self;
+        }
+        if (self <= hours){
+            map["h"] = map["hour"] = map["hours"] = hours / self;
+        }
+        if (self <= days){
+            map["d"] = map["day"] = map["days"] = days / self;
+        }
+        if (self <= weeks){
+            map["w"] = map["week"] = map["weeks"] = weeks / self;
+        }
+        if (self <= years){
+            map["y"] = map["year"] = map["years"] = years / self;
+        }
+
+        return map;
+    }
+
+    std::string process(const std::string& text, Type& value) const{
+        if (text.empty()){
+            return "Expression is empty.";
+        }
+
+        static const std::map<std::string, int64_t> SYMBOLS = make_symbol_map();
+
+        using Rep = typename Type::rep;
+        Rep parsed;
+        try{
+            parsed = parse_expression(SYMBOLS, text);
+        }catch (const ParseException& str){
+            return str.message();
+        }
+        // std::cout << "value = " << parsed << " " << m_min_value << " " << m_max_value << std::endl;
+
+        if (Type(parsed) < m_min_value){
+            return "Overflow: Number is too small.";
+        }
+        if (Type(parsed) > m_max_value){
+            return "Overflow: Number is too large.";
+        }
+        value = (Type)parsed;
+        return std::string();
+    }
+};
+
+
+
+
+
+template <typename Type>
+TimeDurationCell<Type>::~TimeDurationCell() = default;
+template <typename Type>
+TimeDurationCell<Type>::TimeDurationCell(
+    std::string units, bool show_summary,
+    LockMode lock_while_running,
+    Type min_value, Type max_value,
+    std::string default_value
+)
+    : UiState<TimeDurationCell<Type>, ConfigOption>(lock_while_running)
+    , m_data(
+        CONSTRUCT_TOKEN,
+        std::move(units), show_summary,
+        min_value, max_value,
+        std::move(default_value)
+    )
+{}
+
+template <typename Type>
+TimeDurationCell<Type>::TimeDurationCell(
+    std::string units,
+    LockMode lock_while_running,
+    std::string default_value
+)
+    : UiState<TimeDurationCell<Type>, ConfigOption>(lock_while_running)
+    , m_data(
+        CONSTRUCT_TOKEN,
+        std::move(units), true,
+        Type(0), Type::max(),
+        std::move(default_value)
+    )
+{}
+template <typename Type>
+TimeDurationCell<Type>::TimeDurationCell(
+    std::string units,
+    LockMode lock_while_running,
+    Type min_value,
+    std::string default_value
+)
+    : UiState<TimeDurationCell<Type>, ConfigOption>(lock_while_running)
+    , m_data(
+        CONSTRUCT_TOKEN,
+        std::move(units), true,
+        min_value, Type::max(),
+        std::move(default_value)
+    )
+{}
+
+template <typename Type>
+TimeDurationCell<Type>::TimeDurationCell(
+    std::string units,
+    LockMode lock_while_running,
+    Type min_value, Type max_value,
+    std::string default_value
+)
+    : UiState<TimeDurationCell<Type>, ConfigOption>(lock_while_running)
+    , m_data(
+        CONSTRUCT_TOKEN,
+        std::move(units), true,
+        min_value, max_value,
+        std::move(default_value)
+    )
+{}
+
+
+template <typename Type>
+const std::string& TimeDurationCell<Type>::units() const{
+    return m_data->m_units;
+}
+template <typename Type>
+bool TimeDurationCell<Type>::show_summary() const{
+    return m_data->m_show_summary;
+}
+template <typename Type>
+Type TimeDurationCell<Type>::min_value() const{
+    return m_data->m_min_value;
+}
+template <typename Type>
+Type TimeDurationCell<Type>::max_value() const{
+    return m_data->m_max_value;
+}
+template <typename Type>
+const std::string& TimeDurationCell<Type>::default_value() const{
+    return m_data->m_default;
+}
+template <typename Type>
+std::string TimeDurationCell<Type>::current_text() const{
+    const Data& data = *m_data;
+    ReadSpinLock lg(data.m_lock);
+    return data.m_current;
+}
+template <typename Type>
+Type TimeDurationCell<Type>::get() const{
+    const Data& data = *m_data;
+    ReadSpinLock lg(data.m_lock);
+    return data.m_value;
+}
+template <typename Type>
+std::string TimeDurationCell<Type>::set(std::string text){
+    Data& data = *m_data;
+    Type value(0);
+    std::string error;
+    {
+        WriteSpinLock lg(data.m_lock);
+        if (data.m_current == text){
+            return std::string();
+        }
+        error = data.process(text, value);
+        data.m_current = std::move(text);
+        data.m_value = value;
+        data.m_error.clear();
+    }
+    this->report_value_changed(this);
+    return error;
+}
+
+template <typename Type>
+std::string TimeDurationCell<Type>::time_string() const{
+    const Data& data = *m_data;
+    ReadSpinLock lg(data.m_lock);
+    if (!data.m_error.empty()){
+        return "<font color=\"red\">" + data.m_error + "</font>";
+    }
+    return time_string(data.m_current);
+}
+template <typename Type>
+std::string TimeDurationCell<Type>::time_string(const std::string& text) const{
+    const Data& data = *m_data;
+    Type value{};
+    std::string error = data.process(text, value);
+    if (!error.empty()){
+        return "<font color=\"red\">" + error + "</font>";
+    }
+
+    constexpr auto self = std::chrono::duration_cast<std::chrono::nanoseconds>(Type(1)).count();
+    constexpr auto milliseconds = std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::milliseconds(1)).count();
+    if constexpr (self >= milliseconds){
+        return duration_to_string(std::chrono::duration_cast<Milliseconds>(value));
+    }else{
+        return tostr_u_commas(value.count()) + " " + m_data->m_units;
+    }
+}
+
+
+template <typename Type>
+std::string TimeDurationCell<Type>::check_validity() const{
+    const Data& data = *m_data;
+    ReadSpinLock lg(data.m_lock);
+    return data.m_error;
+}
+template <typename Type>
+void TimeDurationCell<Type>::restore_defaults(){
+    Data& data = *m_data;
+    {
+        WriteSpinLock lg(data.m_lock);
+        data.m_current = data.m_default;
+        data.m_error = data.process(data.m_current, data.m_value);
+    }
+    this->report_value_changed(this);
+}
+template <typename Type>
+JsonValue TimeDurationCell<Type>::to_json() const{
+    const Data& data = *m_data;
+    ReadSpinLock lg(data.m_lock);
+    return data.m_current;
+}
+template <typename Type>
+void TimeDurationCell<Type>::load_json(const JsonValue& json){
+    Data& data = *m_data;
+    const std::string* str = json.to_string();
+    if (str == nullptr){
+        return;
+    }
+    {
+        WriteSpinLock lg(data.m_lock);
+        data.m_current = *str;
+        data.m_error = data.process(data.m_current, data.m_value);
+    }
+    this->report_value_changed(this);
+}
+
+
+
+
+
+
+
+
+template class TimeDurationCell<std::chrono::milliseconds>;
+template class TimeDurationCell<std::chrono::microseconds>;
+template class TimeDurationOption<std::chrono::milliseconds>;
+template class TimeDurationOption<std::chrono::microseconds>;
+
+
+
+
+
+
+}
diff --git a/Common/Cpp/Options/TimeDurationOption.h b/Common/Cpp/Options/TimeDurationOption.h
new file mode 100644
index 0000000000..c31a0a06af
--- /dev/null
+++ b/Common/Cpp/Options/TimeDurationOption.h
@@ -0,0 +1,150 @@
+/*  Time Duration Option
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Options_TimeDurationOption_H
+#define PokemonAutomation_Options_TimeDurationOption_H
+
+#include "Common/Cpp/Time.h"
+#include "Common/Cpp/Containers/Pimpl.h"
+#include "Common/Cpp/Options/ConfigOption.h"
+
+namespace PokemonAutomation{
+
+
+template <typename Type>
+class TimeDurationCell : public UiState<TimeDurationCell<Type>, ConfigOption>{
+public:
+    ~TimeDurationCell();
+    TimeDurationCell(const TimeDurationCell& x) = delete;
+    TimeDurationCell(
+        std::string units, bool show_summary,
+        LockMode lock_while_running,
+        Type min_value, Type max_value,
+        std::string default_value
+    );
+
+public:
+    TimeDurationCell(
+        std::string units,
+        LockMode lock_while_running,
+        std::string default_value
+    );
+    TimeDurationCell(
+        std::string units,
+        LockMode lock_while_running,
+        Type min_value,
+        std::string default_value
+    );
+    TimeDurationCell(
+        std::string units,
+        LockMode lock_while_running,
+        Type min_value, Type max_value,
+        std::string default_value
+    );
+
+
+public:
+    const std::string& units() const;
+    bool show_summary() const;
+    Type min_value() const;
+    Type max_value() const;
+    const std::string& default_value() const;
+    std::string current_text() const;
+
+    template <class Rep, class Period>
+    operator std::chrono::duration<Rep, Period>() const{
+        return std::chrono::duration_cast<std::chrono::duration<Rep, Period>>(get());
+    }
+
+    Type get() const;
+    std::string set(std::string text);
+
+
+public:
+    //  Get the description text using the current value.
+    std::string time_string() const;
+
+    //  Get the description text if you were to set the box to this value.
+    std::string time_string(const std::string& text) const;
+
+
+public:
+    virtual std::string check_validity() const override;
+    virtual void restore_defaults() override;
+    virtual JsonValue to_json() const override;
+    virtual void load_json(const JsonValue& json) override;
+
+
+protected:
+    struct Data;
+    Pimpl<Data> m_data;
+};
+
+
+
+template <typename Type>
+class TimeDurationOption : public UiState<TimeDurationOption<Type>, TimeDurationCell<Type>>{
+public:
+    template <class... Args>
+    TimeDurationOption(std::string label, Args&&... args)
+        : UiState<TimeDurationOption<Type>, TimeDurationCell<Type>>(
+            std::forward<Args>(args)...
+        )
+        , m_label(std::move(label))
+    {}
+
+    const std::string& label() const{ return m_label; }
+
+
+private:
+    const std::string m_label;
+};
+
+
+
+
+
+
+
+
+
+class MillisecondsCell : public TimeDurationCell<std::chrono::milliseconds>{
+public:
+    template <class... Args>
+    MillisecondsCell(Args&&... args)
+        : TimeDurationCell<std::chrono::milliseconds>("milliseconds", std::forward<Args>(args)...)
+    {}
+};
+class MillisecondsOption : public TimeDurationOption<std::chrono::milliseconds>{
+public:
+    template <class... Args>
+    MillisecondsOption(std::string label, Args&&... args)
+        : TimeDurationOption<std::chrono::milliseconds>(
+            std::move(label),
+            "milliseconds",
+            std::forward<Args>(args)...
+        )
+    {}
+};
+
+
+
+class MicrosecondsOption : public TimeDurationOption<std::chrono::microseconds>{
+public:
+    template <class... Args>
+    MicrosecondsOption(std::string label, Args&&... args)
+        : TimeDurationOption<std::chrono::microseconds>(
+            std::move(label),
+            "microseconds",
+            std::forward<Args>(args)...
+        )
+    {}
+};
+
+
+
+}
+#endif
diff --git a/Common/Cpp/Options/TimeExpressionOption.cpp b/Common/Cpp/Options/TimeExpressionOption.cpp
deleted file mode 100644
index 1220e04846..0000000000
--- a/Common/Cpp/Options/TimeExpressionOption.cpp
+++ /dev/null
@@ -1,345 +0,0 @@
-/*  Time Expression Option
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <limits>
-#include "Common/Cpp/Exceptions.h"
-#include "Common/Cpp/PrettyPrint.h"
-#include "Common/Cpp/Containers/Pimpl.tpp"
-#include "Common/Cpp/Concurrency/SpinLock.h"
-#include "Common/Cpp/Json/JsonValue.h"
-#include "Common/Qt/ExpressionEvaluator.h"
-#include "Common/Qt/Options/TimeExpressionWidget.h"
-#include "TimeExpressionOption.h"
-
-namespace PokemonAutomation{
-
-
-
-std::string ticks_to_time(double ticks_per_second, int64_t ticks){
-    const double SECOND = ticks_per_second;
-    const double MINUTE = SECOND * 60;
-    const double HOUR = MINUTE * 60;
-    const double DAY = HOUR * 24;
-
-    std::string str;
-    str += tostr_u_commas(ticks);
-    str += " tick";
-    // Compute absolute value of the ticks:
-    uint64_t abs_ticks = 0;
-    // int64_t range from [-2^63, 2^63-1], so if ticks is -2^63, abs(ticks) will overflow.
-    // This if-statement handles this case.
-    if (ticks == std::numeric_limits<int64_t>::min()){
-        abs_ticks = uint64_t(std::numeric_limits<int64_t>::max()) + 1;
-    } else{
-        abs_ticks = std::abs(ticks);
-    }
-    if (abs_ticks != 1){
-        str += "s";
-    }
-    str += " (";
-    if (ticks < 0){
-        str += "-";
-    }
-    if (abs_ticks < MINUTE * 2){
-        str += tostr_fixed((double)abs_ticks / SECOND, 3);
-        str += " seconds";
-    }else if (abs_ticks < HOUR * 2){
-        str += tostr_fixed((double)abs_ticks / MINUTE, 3);
-        str += " minutes";
-    }else if (abs_ticks < DAY * 2){
-        str += tostr_fixed((double)abs_ticks / HOUR, 3);
-        str += " hours";
-    }else{
-        str += tostr_fixed((double)abs_ticks / DAY, 3);
-        str += " days";
-    }
-    str += ")";
-    return str;
-}
-
-
-
-
-template <typename Type>
-struct TimeExpressionCell<Type>::Data{
-    const double m_ticks_per_second;
-    const Type m_min_value;
-    const Type m_max_value;
-    const std::string m_default;
-
-    mutable SpinLock m_lock;
-    std::string m_current;
-    Type m_value;
-    std::string m_error;
-
-    Data(
-        double ticks_per_second, Type min_value, Type max_value,
-        std::string default_value
-    )
-        : m_ticks_per_second(ticks_per_second)
-        , m_min_value(min_value)
-        , m_max_value(max_value)
-        , m_default(std::move(default_value))
-        , m_current(m_default)
-        , m_value(0)
-    {
-        m_error = process(m_current, m_value);
-    }
-
-    std::string process(const std::string& text, Type& value) const{
-        if (text.empty()){
-            return "Expression is empty.";
-        }
-        int32_t parsed;
-        try{
-            parsed = parse_ticks_i32(text);
-        }catch (const ParseException& str){
-            return str.message();
-        }
-        // std::cout << "value = " << parsed << " " << m_min_value << " " << m_max_value << std::endl;
-
-        if (parsed < (int64_t)m_min_value){
-            return "Overflow: Number is too small.";
-        }
-        if (parsed > (int64_t)m_max_value){
-            return "Overflow: Number is too large.";
-        }
-        value = (Type)parsed;
-        return std::string();
-    }
-};
-
-
-template <typename Type>
-TimeExpressionCell<Type>::~TimeExpressionCell() = default;
-template <typename Type>
-TimeExpressionCell<Type>::TimeExpressionCell(
-    LockWhileRunning lock_while_running,
-    double ticks_per_second,
-    Type min_value, Type max_value,
-    std::string default_value
-)
-    : ConfigOption(lock_while_running)
-    , m_data(
-        CONSTRUCT_TOKEN,
-        ticks_per_second,
-        min_value, max_value,
-        std::move(default_value)
-    )
-{}
-
-template <typename Type>
-TimeExpressionCell<Type>::TimeExpressionCell(
-    LockWhileRunning lock_while_running,
-    double ticks_per_second,
-    std::string default_value
-)
-    : ConfigOption(lock_while_running)
-    , m_data(
-        CONSTRUCT_TOKEN,
-        ticks_per_second,
-        std::numeric_limits<Type>::min(), std::numeric_limits<Type>::max(),
-        std::move(default_value)
-    )
-{}
-template <typename Type>
-TimeExpressionCell<Type>::TimeExpressionCell(
-    LockWhileRunning lock_while_running,
-    double ticks_per_second,
-    Type min_value,
-    std::string default_value
-)
-    : ConfigOption(lock_while_running)
-    , m_data(
-        CONSTRUCT_TOKEN,
-        ticks_per_second,
-        min_value, std::numeric_limits<Type>::max(),
-        std::move(default_value)
-    )
-{}
-
-template <typename Type>
-double TimeExpressionCell<Type>::ticks_per_second() const{
-    return m_data->m_ticks_per_second;
-}
-template <typename Type>
-Type TimeExpressionCell<Type>::min_value() const{
-    return m_data->m_min_value;
-}
-template <typename Type>
-Type TimeExpressionCell<Type>::max_value() const{
-    return m_data->m_max_value;
-}
-template <typename Type>
-const std::string& TimeExpressionCell<Type>::default_value() const{
-    return m_data->m_default;
-}
-template <typename Type>
-std::string TimeExpressionCell<Type>::current_text() const{
-    const Data& data = *m_data;
-    SpinLockGuard lg(data.m_lock);
-    return data.m_current;
-}
-template <typename Type>
-TimeExpressionCell<Type>::operator Type() const{
-    const Data& data = *m_data;
-    SpinLockGuard lg(data.m_lock);
-    return data.m_value;
-}
-template <typename Type>
-Type TimeExpressionCell<Type>::get() const{
-    const Data& data = *m_data;
-    SpinLockGuard lg(data.m_lock);
-    return data.m_value;
-}
-template <typename Type>
-std::string TimeExpressionCell<Type>::set(std::string text){
-    Data& data = *m_data;
-    Type value = 0;
-    std::string error;
-    {
-        SpinLockGuard lg(data.m_lock);
-        if (data.m_current == text){
-            return std::string();
-        }
-        error = data.process(text, value);
-        data.m_current = std::move(text);
-        data.m_value = value;
-        data.m_error.clear();
-    }
-    report_value_changed();
-    return error;
-}
-template <typename Type>
-std::string TimeExpressionCell<Type>::time_string() const{
-    const Data& data = *m_data;
-    SpinLockGuard lg(data.m_lock);
-    if (!data.m_error.empty()){
-        return "<font color=\"red\">" + data.m_error + "</font>";
-    }
-    return ticks_to_time(data.m_ticks_per_second, data.m_value);
-}
-
-template <typename Type>
-void TimeExpressionCell<Type>::load_json(const JsonValue& json){
-    Data& data = *m_data;
-    const std::string* str = json.get_string();
-    if (str == nullptr){
-        return;
-    }
-    {
-        SpinLockGuard lg(data.m_lock);
-        data.m_current = *str;
-        data.m_error = data.process(data.m_current, data.m_value);
-    }
-    report_value_changed();
-}
-template <typename Type>
-JsonValue TimeExpressionCell<Type>::to_json() const{
-    const Data& data = *m_data;
-    SpinLockGuard lg(data.m_lock);
-    return data.m_current;
-}
-
-template <typename Type>
-std::string TimeExpressionCell<Type>::check_validity() const{
-    const Data& data = *m_data;
-    SpinLockGuard lg(data.m_lock);
-    return data.m_error;
-}
-template <typename Type>
-void TimeExpressionCell<Type>::restore_defaults(){
-    Data& data = *m_data;
-    {
-        SpinLockGuard lg(data.m_lock);
-        data.m_current = data.m_default;
-        data.m_error = data.process(data.m_current, data.m_value);
-    }
-    report_value_changed();
-}
-
-
-
-
-template <typename Type>
-TimeExpressionOption<Type>::TimeExpressionOption(
-    std::string label,
-    LockWhileRunning lock_while_running,
-    double ticks_per_second,
-    Type min_value, Type max_value,
-    std::string default_value
-)
-    : TimeExpressionCell<Type>(
-        lock_while_running,
-        ticks_per_second,
-        min_value, max_value,
-        std::move(default_value)
-    )
-    , m_label(std::move(label))
-{}
-template <typename Type>
-TimeExpressionOption<Type>::TimeExpressionOption(
-    std::string label,
-    LockWhileRunning lock_while_running,
-    double ticks_per_second,
-    std::string default_value
-)
-    : TimeExpressionCell<Type>(
-        lock_while_running,
-        ticks_per_second,
-        std::move(default_value)
-    )
-    , m_label(std::move(label))
-{}
-template <typename Type>
-TimeExpressionOption<Type>::TimeExpressionOption(
-    std::string label,
-    LockWhileRunning lock_while_running,
-    double ticks_per_second,
-    Type min_value,
-    std::string default_value
-)
-    : TimeExpressionCell<Type>(
-        lock_while_running,
-        ticks_per_second,
-        min_value,
-        std::move(default_value)
-    )
-    , m_label(std::move(label))
-{}
-
-
-
-
-
-
-
-template <typename Type>
-ConfigWidget* TimeExpressionCell<Type>::make_QtWidget(QWidget& parent){
-    return new TimeExpressionCellWidget<Type>(parent, *this);
-}
-
-template <typename Type>
-ConfigWidget* TimeExpressionOption<Type>::make_QtWidget(QWidget& parent){
-    return new TimeExpressionOptionWidget<Type>(parent, *this);
-}
-
-
-template class TimeExpressionCell<uint8_t>;
-template class TimeExpressionCell<uint16_t>;
-template class TimeExpressionCell<uint32_t>;
-template class TimeExpressionCell<int16_t>;
-template class TimeExpressionCell<int32_t>;
-
-template class TimeExpressionOption<uint8_t>;
-template class TimeExpressionOption<uint16_t>;
-template class TimeExpressionOption<uint32_t>;
-template class TimeExpressionOption<int16_t>;
-template class TimeExpressionOption<int32_t>;
-
-
-
-}
diff --git a/Common/Cpp/Options/TimeExpressionOption.h b/Common/Cpp/Options/TimeExpressionOption.h
deleted file mode 100644
index f5568108cb..0000000000
--- a/Common/Cpp/Options/TimeExpressionOption.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/*  Time Expression Option
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_Options_TimeExpressionOption_H
-#define PokemonAutomation_Options_TimeExpressionOption_H
-
-#include "Common/Cpp/Containers/Pimpl.h"
-#include "Common/Cpp/Options/ConfigOption.h"
-
-namespace PokemonAutomation{
-
-
-std::string ticks_to_time(double ticks_per_second, int64_t ticks);
-
-
-
-template <typename Type>
-class TimeExpressionCell : public ConfigOption{
-public:
-    ~TimeExpressionCell();
-    TimeExpressionCell(const TimeExpressionCell& x) = delete;
-    TimeExpressionCell(
-        LockWhileRunning lock_while_running,
-        double ticks_per_second,
-        Type min_value, Type max_value,
-        std::string default_value
-    );
-
-public:
-    TimeExpressionCell(
-        LockWhileRunning lock_while_running,
-        double ticks_per_second,
-        std::string default_value
-    );
-    TimeExpressionCell(
-        LockWhileRunning lock_while_running,
-        double ticks_per_second,
-        Type min_value,
-        std::string default_value
-    );
-
-    double ticks_per_second() const;
-    Type min_value() const;
-    Type max_value() const;
-    const std::string& default_value() const;
-    std::string current_text() const;
-
-    operator Type() const;
-    Type get() const;
-    std::string set(std::string text);
-
-    std::string time_string() const;
-
-    virtual void load_json(const JsonValue& json) override;
-    virtual JsonValue to_json() const override;
-
-    virtual std::string check_validity() const override;
-    virtual void restore_defaults() override;
-
-    virtual ConfigWidget* make_QtWidget(QWidget& parent) override;
-
-protected:
-    struct Data;
-    Pimpl<Data> m_data;
-};
-
-
-
-template <typename Type>
-class TimeExpressionOption : public TimeExpressionCell<Type>{
-public:
-    TimeExpressionOption(const TimeExpressionOption& x) = delete;
-    TimeExpressionOption(
-        std::string label,
-        LockWhileRunning lock_while_running,
-        double ticks_per_second,
-        Type min_value, Type max_value,
-        std::string default_value
-    );
-
-public:
-    TimeExpressionOption(
-        std::string label,
-        LockWhileRunning lock_while_running,
-        double ticks_per_second,
-        std::string default_value
-    );
-    TimeExpressionOption(
-        std::string label,
-        LockWhileRunning lock_while_running,
-        double ticks_per_second,
-        Type min_value,
-        std::string default_value
-    );
-
-    const std::string& label() const{ return m_label; }
-
-    virtual ConfigWidget* make_QtWidget(QWidget& parent) override;
-
-private:
-    const std::string m_label;
-};
-
-
-
-
-}
-#endif
-
-
diff --git a/Common/Cpp/PanicDump.cpp b/Common/Cpp/PanicDump.cpp
index 4d44386f7a..893ad9136f 100644
--- a/Common/Cpp/PanicDump.cpp
+++ b/Common/Cpp/PanicDump.cpp
@@ -1,11 +1,10 @@
 /*  Panic Dumping
  * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  * 
  */
 
 #include "Common/Cpp/Exceptions.h"
-#include "ClientSource/Libraries/Logging.h"
 #include "PrettyPrint.h"
 #include "PanicDump.h"
 
@@ -33,7 +32,7 @@ void panic_dump(const char* location, const char* message){
 
 
 void run_with_catch(const char* location, std::function<void()>&& lambda){
-#if 0
+#ifdef _WIN32
     lambda();
 #else
     try{
@@ -60,3 +59,4 @@ void run_with_catch(const char* location, std::function<void()>&& lambda){
 
 
 }
+
diff --git a/Common/Cpp/PanicDump.h b/Common/Cpp/PanicDump.h
index 26a5f05ad5..886cf1a47f 100644
--- a/Common/Cpp/PanicDump.h
+++ b/Common/Cpp/PanicDump.h
@@ -1,15 +1,13 @@
 /*  Panic Dumping
  * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  * 
  */
 
 #ifndef PokemonAutomation_PanicDumping_H
 #define PokemonAutomation_PanicDumping_H
 
-#include <string>
 #include <functional>
-#include "ClientSource/Connection/BotBase.h"
 
 namespace PokemonAutomation{
 
diff --git a/Common/Cpp/PixelRGB32.h b/Common/Cpp/PixelRGB32.h
new file mode 100644
index 0000000000..3a51449895
--- /dev/null
+++ b/Common/Cpp/PixelRGB32.h
@@ -0,0 +1,51 @@
+/*  Pixel: RGB32
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  Perform a filter over an image and replace pixels that match the filter.
+ *
+ */
+
+#ifndef PokemonAutomation_Pixel_RGB32_H
+#define PokemonAutomation_Pixel_RGB32_H
+
+#include <stdint.h>
+
+namespace PokemonAutomation{
+
+
+
+
+
+union PixelRGB32{
+    struct{
+        uint8_t blue;
+        uint8_t green;
+        uint8_t red;
+        uint8_t alpha;
+    } parts;
+    uint32_t u32;
+
+    PixelRGB32(uint32_t value)
+        : u32(value)
+    {}
+    PixelRGB32(uint8_t red, uint8_t green, uint8_t blue){
+        parts.alpha = 0xff;
+        parts.red = red;
+        parts.green = green;
+        parts.blue = blue;
+    }
+    PixelRGB32(uint8_t alpha, uint8_t red, uint8_t green, uint8_t blue){
+        parts.alpha = alpha;
+        parts.red = red;
+        parts.green = green;
+        parts.blue = blue;
+    }
+};
+
+
+
+
+
+}
+#endif
diff --git a/Common/Cpp/PrettyPrint.cpp b/Common/Cpp/PrettyPrint.cpp
index 3fd12bafc0..7b05535e0a 100644
--- a/Common/Cpp/PrettyPrint.cpp
+++ b/Common/Cpp/PrettyPrint.cpp
@@ -1,11 +1,10 @@
 /*  Pretty Printing
  * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  * 
  */
-
-#include <stdio.h>
 #include <chrono>
+#include <format>
 #include <sstream>
 #include <iomanip>
 #include "Exceptions.h"
@@ -49,20 +48,143 @@ std::string tostr_u_commas(int64_t x){
 
     return out;
 }
+
+
+inline std::string byte_prefix(size_t index){
+    static const char* BYTE_NAMES[] = {
+        " bytes",
+        " KiB",
+        " MiB",
+        " GiB",
+        " TiB",
+        " PiB",
+        " EiB",
+        " ZiB",
+        " YiB",
+    };
+    constexpr size_t SUFFIX_SIZE = sizeof(BYTE_NAMES) / sizeof(const char*);
+
+    if (index < SUFFIX_SIZE){
+        return BYTE_NAMES[index];
+    }
+
+    return " * 2^" + std::to_string(index) + "0";
+}
+
+template <typename IntegerType>
+std::string tostr_ui_bytes(IntegerType bytes){
+    //  Prints out bytes in one of the following forms:
+    //  0.xx suffix
+    //  x.xx suffix
+    //  xx.x suffix
+    //   xxx suffix
+
+    //  Conditions:
+    //      "bytes" must be non-negative
+
+    std::string out;
+    if (bytes < 1000){
+        //  Downcast to a more efficient type.
+        uint32_t sbytes = (uint32_t)bytes;
+        if (bytes < 10){
+//            out += " ";
+        }
+        out += std::to_string(sbytes);
+        out += byte_prefix(0);
+        return out;
+    }
+
+    size_t suffix_index = 1;
+    while (bytes >= 1024000){
+        bytes >>= 10;
+        suffix_index++;
+    }
+
+    //  Downcast to a more efficient type.
+    uint32_t sbytes = (uint32_t)bytes;
+
+    sbytes *= 1000;
+    sbytes >>= 10;
+
+    //  .xxx
+    if (sbytes < 995){
+        sbytes += 5;
+        sbytes /= 10;
+
+        out += "0.";
+        out += std::to_string(sbytes);
+        out += byte_prefix(suffix_index);
+        return out;
+    }
+
+    //  x.xx
+    if (sbytes < 9995){
+        sbytes += 5;
+        sbytes /= 10;
+
+        out += std::to_string(sbytes / 100);
+        sbytes %= 100;
+        out += ".";
+        if (sbytes >= 10){
+            out += std::to_string(sbytes);
+        }else{
+            out += "0";
+            out += std::to_string(sbytes);
+        }
+        out += byte_prefix(suffix_index);
+        return out;
+    }
+
+    //  xx.x or (0.98)
+    if (sbytes < 99950){
+        sbytes += 50;
+        sbytes /= 100;
+
+        out += std::to_string(sbytes / 10);
+        sbytes %= 10;
+        out += ".";
+        out += std::to_string(sbytes);
+        out += byte_prefix(suffix_index);
+        return out;
+    }
+
+    //  xxx or (1.00)
+    {
+        sbytes += 500;
+        sbytes /= 1000;
+
+//        out += " ";
+        out += std::to_string(sbytes);
+        out += byte_prefix(suffix_index);
+        return out;
+    }
+}
+std::string tostr_bytes(uint64_t bytes){
+    return tostr_ui_bytes(bytes);
+}
+
+
+
 std::string tostr_default(double x){
-    std::ostringstream ss;
-    ss << x;
-    return ss.str();
+    return std::format("{:.6g}", x);
 }
 std::string tostr_fixed(double x, int precision){
-    std::ostringstream out;
-    out << std::setprecision(precision);
-    out << std::fixed;
-    out << x;
-    return out.str();
+    return std::format("{:.{}f}", x, precision);
+}
+
+std::string tostr_fixed_no_trailing_zero(double x, int precision){
+    std::string str = std::format("{:.{}f}", x, precision);
+    if (str.find('.') != std::string::npos){
+        str.erase(str.find_last_not_of('0') + 1, std::string::npos);
+        if (str.back() == '.'){
+            str.pop_back();
+        }
+    }
+    return str;
 }
 
 
+
 std::string now_to_filestring(){
 #if _WIN32 && _MSC_VER
 #pragma warning(disable:4996)
@@ -121,6 +243,9 @@ std::string duration_to_string(std::chrono::milliseconds milliseconds){
     const uint64_t MINUTE = SECOND * 60;
     const uint64_t HOUR = MINUTE * 60;
     const uint64_t DAY = HOUR * 24;
+    const uint64_t WEEK = DAY * 7;
+    const uint64_t YEARS = std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::years(1)).count();
+    const uint64_t MILLION_YEARS = YEARS * 1000000;
 
     uint64_t ticks = milliseconds.count();
 
@@ -134,9 +259,18 @@ std::string duration_to_string(std::chrono::milliseconds milliseconds){
     }else if (ticks < DAY * 2){
         str += tostr_fixed((double)ticks / HOUR, 3);
         str += " hours";
-    }else{
+    }else if (ticks < WEEK * 2){
         str += tostr_fixed((double)ticks / DAY, 3);
         str += " days";
+    }else if (ticks < YEARS * 2){
+        str += tostr_fixed((double)ticks / WEEK, 3);
+        str += " weeks";
+    }else if (ticks < MILLION_YEARS){
+        str += tostr_fixed((double)ticks / YEARS, 3);
+        str += " years";
+    }else{
+        str += tostr_fixed((double)ticks / MILLION_YEARS, 3);
+        str += " million years";
     }
     return str;
 }
@@ -149,8 +283,28 @@ std::string tostr_hex(uint64_t x){
     ss << std::hex << x;
     return ss.str();
 }
+std::string tostr_hex_padded(size_t digits, uint64_t x){
+    std::string str = tostr_hex(x);
+    if (digits > str.size()){
+        str = std::string(digits - str.size(), '0') + str;
+    }
+    return str;
+}
 
 
+std::string tostr_hexbytes(const void* data, size_t length){
+    static const char HEX_DIGITS[] = "0123456789abcdef";
+    const uint8_t* ptr = (const uint8_t*)data;
+    std::string ret;
+    for (size_t c = 0; c < length; c++){
+        if (c > 0){
+            ret += " ";
+        }
+        ret += HEX_DIGITS[ptr[c] >> 4];
+        ret += HEX_DIGITS[ptr[c] & 0xf];
+    }
+    return ret;
+}
 
 
 
diff --git a/Common/Cpp/PrettyPrint.h b/Common/Cpp/PrettyPrint.h
index 0ec8261a6f..3f83542883 100644
--- a/Common/Cpp/PrettyPrint.h
+++ b/Common/Cpp/PrettyPrint.h
@@ -1,6 +1,6 @@
 /*  Pretty Printing
  * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  * 
  */
 
@@ -15,10 +15,17 @@ namespace PokemonAutomation{
 
 std::string tostr_padded(size_t digits, uint64_t x);
 std::string tostr_u_commas(int64_t x);
+std::string tostr_bytes(uint64_t bytes);
 
+// Convert double to string using the default precision on ostream.
 std::string tostr_default(double x);
+// Convert double to string with fixed precision.
+// The precision specifies the number of digits after the decimal point.
 std::string tostr_fixed(double x, int precision);
 
+// Convert double to string with fixed precision, without trailing zeros.
+std::string tostr_fixed_no_trailing_zero(double x, int precision);
+
 // Format current time to a string to be used as filenames.
 // e.g. "20220320-044444408355"
 std::string now_to_filestring();
@@ -28,6 +35,9 @@ std::string set_to_str(const std::set<std::string>& set);
 std::string duration_to_string(std::chrono::milliseconds milliseconds);
 
 std::string tostr_hex(uint64_t x);
+std::string tostr_hex_padded(size_t digits, uint64_t x);
+
+std::string tostr_hexbytes(const void* data, size_t length);
 
 }
 #endif
diff --git a/Common/Cpp/PrintDebuggers.h b/Common/Cpp/PrintDebuggers.h
index 558f2b93f0..07a761ee10 100644
--- a/Common/Cpp/PrintDebuggers.h
+++ b/Common/Cpp/PrintDebuggers.h
@@ -1,6 +1,6 @@
 /*  Print Debuggers
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -8,6 +8,7 @@
 #define PokemonAutomation_PrintDebuggers_H
 
 #include <iostream>
+
 using std::cout;
 using std::endl;
 
diff --git a/Common/Cpp/Rectangle.h b/Common/Cpp/Rectangle.h
index f1b4564079..86621b1e6a 100644
--- a/Common/Cpp/Rectangle.h
+++ b/Common/Cpp/Rectangle.h
@@ -1,6 +1,6 @@
 /*  Rectangle
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/Common/Cpp/RecursiveThrottler.h b/Common/Cpp/RecursiveThrottler.h
new file mode 100644
index 0000000000..238f7473d9
--- /dev/null
+++ b/Common/Cpp/RecursiveThrottler.h
@@ -0,0 +1,57 @@
+/*  Recursive Throttler
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  Used to suppress recursive logging.
+ *  Log only at the top level. And limit to 1 thread at a time.
+ *
+ */
+
+#ifndef PokemonAutomation_RecursiveThrottler_H
+#define PokemonAutomation_RecursiveThrottler_H
+
+#include <mutex>
+#include "Common/Cpp/Concurrency/Mutex.h"
+
+namespace PokemonAutomation{
+
+class RecursiveThrottler{
+public:
+    //  Returns true if ok to run. (not throttled)
+    operator bool() const{
+        std::lock_guard<RecursiveMutex> lg(m_lock);
+        return m_depth == 0;
+    }
+
+private:
+    friend class ThrottleScope;
+    mutable RecursiveMutex m_lock;
+    size_t m_depth = 0;
+};
+
+class ThrottleScope{
+    ThrottleScope(const ThrottleScope&) = delete;
+    void operator=(const ThrottleScope&) = delete;
+public:
+    ThrottleScope(RecursiveThrottler& throttler)
+        : m_throttler(throttler)
+        , m_guard(throttler.m_lock)
+    {
+        throttler.m_depth++;
+    }
+    ~ThrottleScope(){
+        m_throttler.m_depth--;
+    }
+
+    //  Returns true if ok to run. (not throttled)
+    operator bool() const{
+        return m_throttler.m_depth == 1;
+    }
+
+private:
+    RecursiveThrottler& m_throttler;
+    std::lock_guard<RecursiveMutex> m_guard;
+};
+
+}
+#endif
diff --git a/Common/Cpp/SIMDDebuggers.h b/Common/Cpp/SIMDDebuggers.h
index 1be8b20eea..1f422ca401 100644
--- a/Common/Cpp/SIMDDebuggers.h
+++ b/Common/Cpp/SIMDDebuggers.h
@@ -1,6 +1,6 @@
 /*  SIMD Debuggers
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -8,9 +8,9 @@
 #define PokemonAutomation_SIMDDebuggers_H
 
 #include <stdint.h>
+#include <iostream>
 #include <emmintrin.h>
 
-#include <iostream>
 using std::cout;
 using std::endl;
 
diff --git a/Common/Cpp/ScopeExit.h b/Common/Cpp/ScopeExit.h
new file mode 100644
index 0000000000..344caf3284
--- /dev/null
+++ b/Common/Cpp/ScopeExit.h
@@ -0,0 +1,31 @@
+/*  ScopeExit
+ *
+ *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *
+ */
+
+#ifndef PokemonAutomation_ScopeExit_h
+#define PokemonAutomation_ScopeExit_h
+
+#include <functional>
+
+namespace PokemonAutomation{
+class ScopeExit{
+    ScopeExit(const ScopeExit&) = delete;
+    void operator=(const ScopeExit&) = delete;
+
+public:
+    template <typename Lambda>
+    ScopeExit(Lambda&& lambda)
+        : m_lambda(std::move(lambda))
+    {}
+    ~ScopeExit(){
+        m_lambda();
+    }
+
+private:
+    std::function<void()> m_lambda;
+};
+
+}
+#endif
\ No newline at end of file
diff --git a/Common/Cpp/SerialConnection/SerialConnection.cpp b/Common/Cpp/SerialConnection/SerialConnection.cpp
new file mode 100644
index 0000000000..962844f673
--- /dev/null
+++ b/Common/Cpp/SerialConnection/SerialConnection.cpp
@@ -0,0 +1,23 @@
+/*  Serial Connection
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <iostream>
+#include "Common/Cpp/Time.h"
+#include "Common/Cpp/Concurrency/Mutex.h"
+
+namespace PokemonAutomation{
+
+
+Mutex serial_logging_lock;
+
+
+void serial_debug_log(const std::string& msg){
+    std::lock_guard<Mutex> lg(serial_logging_lock);
+    std::cout << current_time_to_str() << " - " << msg << std::endl;
+}
+
+
+}
diff --git a/Common/Cpp/SerialConnection/SerialConnection.h b/Common/Cpp/SerialConnection/SerialConnection.h
new file mode 100644
index 0000000000..612a1f94d6
--- /dev/null
+++ b/Common/Cpp/SerialConnection/SerialConnection.h
@@ -0,0 +1,16 @@
+/*  Serial Connection
+ * 
+ *  From: https://github.com/PokemonAutomation/
+ * 
+ */
+
+#ifndef PokemonAutomation_SerialConnection_H
+#define PokemonAutomation_SerialConnection_H
+
+#ifdef _WIN32
+#include "SerialConnectionWinAPI.h"
+#else
+#include "SerialConnectionPOSIX.h"
+#endif
+
+#endif
diff --git a/Common/Cpp/SerialConnection/SerialConnectionPOSIX.h b/Common/Cpp/SerialConnection/SerialConnectionPOSIX.h
new file mode 100644
index 0000000000..90a6bab388
--- /dev/null
+++ b/Common/Cpp/SerialConnection/SerialConnectionPOSIX.h
@@ -0,0 +1,354 @@
+/*  Serial Connection for POSIX
+ * 
+ *  From: https://github.com/PokemonAutomation/
+ * 
+ */
+
+#ifndef PokemonAutomation_SerialConnectionPOSIX_H
+#define PokemonAutomation_SerialConnectionPOSIX_H
+
+#include <errno.h>
+#include <string>
+#include <atomic>
+#include <fcntl.h>
+#include <termios.h>
+#include <unistd.h>
+#include <sys/ioctl.h>
+#include "Common/Cpp/Exceptions.h"
+#include "Common/Cpp/PanicDump.h"
+#include "Common/Cpp/Concurrency/SpinLock.h"
+#include "Common/Cpp/Concurrency/AsyncTask.h"
+#include "Common/Cpp/Concurrency/ThreadPool.h"
+#include "Common/Cpp/StreamConnections/PushingStreamConnections.h"
+
+namespace PokemonAutomation{
+
+void serial_debug_log(const std::string& msg);
+
+
+
+class SerialConnection : public UnreliableStreamConnectionPushing{
+public:
+    //  UTF-8
+    SerialConnection(
+        ThreadPool& thread_pool,
+        const std::string& name,
+        uint32_t baud_rate
+    )
+        : m_exit(false)
+    {
+//        std::cout << "desired baud = " << baud << std::endl;
+
+        if (name.starts_with("/dev/")){
+            m_fd = open(name.c_str(), O_RDWR | O_NOCTTY);
+        }else{
+            m_fd = open(("/dev/"+name).c_str(), O_RDWR | O_NOCTTY);
+        }
+        if (m_fd == -1){
+            int error = errno;
+            std::string str = "Unable to open serial connection. Error = " + std::to_string(error);
+            if (error == EACCES){
+                str += " (permission denied)\nPlease run as sudo.";
+            }
+            throw ConnectionException(nullptr, std::move(str));
+        }
+
+        set_baud_rate(baud_rate);
+
+#if 0
+        int flags;
+        if (ioctl(m_fd, TIOCMGET, &flags) >= 0){
+            //  Set the bitmasks for DTR and RTS
+            flags |= TIOCM_DTR;
+            flags |= TIOCM_RTS;
+            ioctl(m_fd, TIOCMSET, &flags);
+        }
+#endif
+
+        //  Start receiver thread.
+        try{
+            m_listener = thread_pool.dispatch_now_blocking([this]{
+                run_with_catch(
+                    "SerialConnection::SerialConnection()",
+                    [this]{ recv_loop(); }
+                );
+            });
+        }catch (...){
+            close(m_fd);
+            throw;
+        }
+    }
+
+    virtual ~SerialConnection(){
+        if (!m_exit.load(std::memory_order_acquire)){
+            stop();
+        }
+    }
+
+    virtual void stop() noexcept final{
+        m_exit.store(true, std::memory_order_release);
+        close(m_fd);
+        m_listener.wait_and_ignore_exceptions();
+    }
+
+    void set_baud_rate(uint32_t baud_rate){
+#ifdef __APPLE__
+        speed_t baud = baud_rate;
+#else
+        speed_t baud = B9600;
+        switch (baud_rate){
+        case 9600:   baud = B9600;   break;
+        case 19200:  baud = B19200;  break;
+        case 38400:  baud = B38400;  break;
+        case 57600:  baud = B57600;  break;
+        case 115200: baud = B115200; break;
+        case 230400: baud = B230400; break;
+        case 460800: baud = B460800; break;
+        case 500000: baud = B500000; break;
+        case 576000: baud = B576000; break;
+        case 921600: baud = B921600; break;
+        case 1000000: baud = B1000000; break;
+        case 1152000: baud = B1152000; break;
+        case 1500000: baud = B1500000; break;
+        case 2000000: baud = B2000000; break;
+        case 2500000: baud = B2500000; break;
+        case 3000000: baud = B3000000; break;
+        case 3500000: baud = B3500000; break;
+        case 4000000: baud = B4000000; break;
+        default:
+            throw ConnectionException(nullptr, "Unsupported Baud Rate: " + std::to_string(baud_rate));
+        }
+#endif
+
+        struct termios options;
+        if (tcgetattr(m_fd, &options) == -1){
+            int error = errno;
+            throw ConnectionException(nullptr, "tcgetattr() failed. Error = " + std::to_string(error));
+        }
+//        std::cout << "read baud = " << cfgetispeed(&options) << std::endl;
+//        std::cout << "write baud = " << cfgetospeed(&options) << std::endl;
+
+        //  Baud Rate
+        if (cfsetispeed(&options, baud) == -1){
+            int error = errno;
+            throw ConnectionException(nullptr, "cfsetispeed() failed. Error = " + std::to_string(error));
+        }
+        if (cfsetospeed(&options, baud) == -1){
+            int error = errno;
+            throw ConnectionException(nullptr, "cfsetospeed() failed. Error = " + std::to_string(error));
+        }
+
+#if 0
+        std::cout << "BRKINT  = " << (options.c_iflag & BRKINT) << std::endl;
+        std::cout << "ICRNL   = " << (options.c_iflag & ICRNL) << std::endl;
+        std::cout << "IMAXBEL = " << (options.c_iflag & IMAXBEL) << std::endl;
+        std::cout << "OPOST   = " << (options.c_oflag & OPOST) << std::endl;
+        std::cout << "ONLCR   = " << (options.c_oflag & ONLCR) << std::endl;
+        std::cout << "ISIG    = " << (options.c_lflag & ISIG) << std::endl;
+        std::cout << "ICANON  = " << (options.c_lflag & ICANON) << std::endl;
+        std::cout << "ECHO    = " << (options.c_lflag & ECHO) << std::endl;
+        std::cout << "ECHOE   = " << (options.c_lflag & ECHOE) << std::endl;
+#endif
+        //  Disable hangup on close.
+        options.c_lflag &= ~HUPCL;
+
+        //  Configure for raw binary mode (8 bits, no parity, 1 stop bit)
+        // No parity
+        options.c_cflag &= ~PARENB;
+        // 1 stop bit
+        options.c_cflag &= ~CSTOPB;
+        // Clear size bits
+        options.c_cflag &= ~CSIZE;
+        // 8 data bits
+        options.c_cflag |= CS8;
+        // Ignore modem control lines. Important for USB-to-serial adapters (Arduino, etc.) that don't have real modem signals.
+        // Without this, the port may wait for carrier detect.
+        options.c_cflag |= CLOCAL;
+        // Enable receiver. Should be on by default, but some systems don't enable it automatically.
+        options.c_cflag |= CREAD;
+
+        //  Disable all input processing for raw binary mode.
+        //  This prevents POSIX from treating the data as text and mangling it.
+
+        // Don't send SIGINT on break
+        options.c_iflag &= ~BRKINT;
+        // Don't strip 8th bit. Critical for binary data
+        options.c_iflag &= ~ISTRIP;
+        // Don't map CR to NL
+        options.c_iflag &= ~ICRNL;
+        // Disable XON/XOFF flow control (input & output)
+        options.c_iflag &= ~(IXON | IXOFF);
+        // Don't ring bell on full input buffer
+        options.c_iflag &= ~IMAXBEL;
+
+        // Disable output processing
+        options.c_oflag &= ~OPOST;
+        // Don't map NL to CR-NL
+        options.c_oflag &= ~ONLCR;
+
+        // Disable all local processing for raw binary mode
+
+        // Don't generate signals
+        options.c_lflag &= ~ISIG;
+        // Disable canonical (line-based) mode
+        options.c_lflag &= ~ICANON;
+        // Don't echo input
+        options.c_lflag &= ~ECHO;
+        // Don't erase character echo
+        options.c_lflag &= ~ECHOE;
+        // Disable extended input processing
+        options.c_lflag &= ~IEXTEN;
+
+        //  Set blocking read with timeout so read() waits for data but can exit periodically
+        //  to check m_exit flag. VMIN=0 with VTIME>0 means: wait up to VTIME for data,
+        //  return 0 if timeout, or return immediately if any data arrives.
+        // Minimum characters to read (0 = return after timeout)
+        options.c_cc[VMIN] = 0;
+        // Read timeout in deciseconds (1 = 100ms)
+        options.c_cc[VTIME] = 1;
+
+        if (tcsetattr(m_fd, TCSANOW, &options) == -1){
+            int error = errno;
+            throw ConnectionException(nullptr, "tcsetattr() failed. Error = " + std::to_string(error));
+        }
+
+        if (tcgetattr(m_fd, &options) == -1){
+            int error = errno;
+            throw ConnectionException(nullptr, "tcgetattr() failed. Error = " + std::to_string(error));
+        }
+        if (cfgetispeed(&options) != baud){
+//            std::cout << "actual baud = " << cfgetispeed(&options) << std::endl;
+            throw ConnectionException(nullptr, "Unable to set input baud rate.");
+        }
+        if (cfgetospeed(&options) != baud){
+//            std::cout << "actual baud = " << cfgetospeed(&options) << std::endl;
+            throw ConnectionException(nullptr, "Unable to set output baud rate.");
+        }
+    }
+
+    void get_control_state(bool& dtr, bool& rts){
+        int flags;
+        if (ioctl(m_fd, TIOCMGET, &flags) < 0){
+            int error = errno;
+            throw ConnectionException(nullptr, "ioctl() failed. Error = " + std::to_string(error));
+        }
+
+        dtr = flags & TIOCM_DTR;
+        rts = flags & TIOCM_RTS;
+    }
+    void set_control_state(bool dtr, bool rts){
+        int flags;
+        if (ioctl(m_fd, TIOCMGET, &flags) >= 0){
+            //  Set the bitmasks for DTR and RTS
+            flags |= dtr ? TIOCM_DTR : 0;
+            flags |= rts ? TIOCM_RTS : 0;
+            ioctl(m_fd, TIOCMSET, &flags);
+        }
+    }
+
+
+private:
+    // Send data, retrying until all bytes are sent or connection is closed.
+    // If write() returns 0 or negative, retry until success.
+    // Send the specified data to the serial port. Returns the # of bytes actually sent.
+    // This function is blocking and will only return when one of the following happens:
+    // 1. The data is fully sent out. (in which it will return bytes)
+    // 2. There is an error. (returns less than bytes)
+    // 3. The SerialConnection instance is getting destructed from a different thread.
+    // If consecutive connection errors reache 100, throw ConnectionException.
+    virtual size_t unreliable_send(const void* data, size_t bytes) noexcept override{
+        WriteSpinLock lg(m_send_lock, "SerialConnection::send()");
+
+        const char* ptr = (const char*)data;
+        size_t remaining = bytes;
+
+        while (remaining > 0 && !m_exit.load(std::memory_order_acquire)){
+            ssize_t sent = write(m_fd, ptr, remaining);
+
+            if (sent > 0){
+                // Successfully wrote some bytes
+                ptr += sent;
+                remaining -= sent;
+            }else{
+                // sent <= 0: either EAGAIN/EWOULDBLOCK or error
+                int error = errno;
+                if (error == EAGAIN || error == EWOULDBLOCK){
+                    // Device not ready, sleep briefly and retry
+                    usleep(1000);  // 1ms
+                }else{
+                    // Real error occurred
+                    try{
+                        process_error(
+                            "Failed to write: " + std::to_string(bytes - remaining) +
+                            " / " + std::to_string(bytes) +
+                            ", error = " + std::to_string(error)
+                        );
+                    }catch (...){}
+                    return bytes - remaining;
+                }
+            }
+        }
+
+        if (remaining == 0){
+            m_consecutive_errors.store(0, std::memory_order_release);
+        }
+
+        return bytes - remaining;
+    }
+
+    // Dedicated receive thread that loops to block waiting for data. When data is 
+    // received on the serial port, the loop immidiately calls `on_recv` to notify
+    // listeners attached to the class to process data.
+    // This thread ends when the class is destructed.
+    //
+    // Details:
+    // read() blocks up to 100ms (VTIME=1) waiting for data to arrive.
+    // If data arrives, calls `on_recv()` to process data and loops to check m_eixt.
+    // If no data after timeout, it returns 0 and loops to check m_exit.
+    // This loop runs indefinitely until m_exit is set.
+    void recv_loop(){
+        char buffer[32];
+        while (!m_exit.load(std::memory_order_acquire)){
+            ssize_t actual = read(m_fd, buffer, sizeof(buffer));
+            if (actual > 0){
+                m_consecutive_errors.store(0, std::memory_order_release);
+                on_unreliable_recv(buffer, actual);
+            }else if (actual < 0){
+                // Read error occurred
+                int error = errno;
+                process_error("read serial POSIX() failed. Error = " + std::to_string(error));
+                usleep(1000);
+            }
+            // actual == 0: timeout, no data received - just loop again to check m_exit
+        }
+    }
+    
+
+private:
+    void process_error(const std::string& message){
+        WriteSpinLock lg(m_error_lock);
+
+        const size_t consecutive_errors = m_consecutive_errors.fetch_add(1);
+
+        if (consecutive_errors <= 100){
+            serial_debug_log(message);
+        }
+        if (consecutive_errors == 100){
+            serial_debug_log("Further error messages will be suppressed.");
+        }
+    }
+
+
+private:
+    int m_fd;
+    std::atomic<bool> m_exit;
+    std::atomic<size_t> m_consecutive_errors;
+    SpinLock m_send_lock;
+    SpinLock m_error_lock;
+    AsyncTask m_listener;
+};
+
+
+}
+
+#endif
diff --git a/Common/Cpp/SerialConnection/SerialConnectionWinAPI.h b/Common/Cpp/SerialConnection/SerialConnectionWinAPI.h
new file mode 100644
index 0000000000..5afc22be7d
--- /dev/null
+++ b/Common/Cpp/SerialConnection/SerialConnectionWinAPI.h
@@ -0,0 +1,287 @@
+/*  Serial Connection for Windows
+ * 
+ *  From: https://github.com/PokemonAutomation/
+ * 
+ */
+
+#ifndef PokemonAutomation_SerialConnectionWinAPI_H
+#define PokemonAutomation_SerialConnectionWinAPI_H
+
+#include <string>
+#include <atomic>
+#include <windows.h>
+#include "Common/Cpp/Time.h"
+#include "Common/Cpp/Exceptions.h"
+#include "Common/Cpp/PanicDump.h"
+#include "Common/Cpp/Strings/Unicode.h"
+#include "Common/Cpp/Concurrency/SpinLock.h"
+#include "Common/Cpp/Concurrency/AsyncTask.h"
+#include "Common/Cpp/Concurrency/ThreadPool.h"
+#include "Common/Cpp/StreamConnections/PushingStreamConnections.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+
+void serial_debug_log(const std::string& msg);
+
+
+
+class SerialConnection : public UnreliableStreamConnectionPushing{
+public:
+    //  UTF-8
+    SerialConnection(
+        ThreadPool& thread_pool,
+        const std::string& name,
+        uint32_t baud_rate
+    )
+        : SerialConnection(thread_pool, name, utf8_to_wstr(name), baud_rate)
+    {}
+    SerialConnection(
+        ThreadPool& thread_pool,
+        const std::string& name,
+        const std::wstring& wname,
+        uint32_t baud_rate
+    )
+        : m_exit(false)
+        , m_consecutive_errors(0)
+    {
+        m_handle = CreateFileW(
+            (L"\\\\.\\" + wname).c_str(),
+            GENERIC_READ | GENERIC_WRITE,
+            0, 0,
+            OPEN_EXISTING,
+            FILE_ATTRIBUTE_NORMAL,
+            0
+        );
+        if (m_handle == INVALID_HANDLE_VALUE){
+            DWORD error = GetLastError();
+            throw ConnectionException(nullptr, "Unable to open serial connection (" + name + "). Error = " + std::to_string(error));
+        }
+
+        set_baud_rate(baud_rate);
+
+#if 1
+        COMMTIMEOUTS timeouts{};
+        if (!GetCommTimeouts(m_handle, &timeouts)){
+            DWORD error = GetLastError();
+            CloseHandle(m_handle);
+            throw ConnectionException(nullptr, "GetCommTimeouts() failed. Error = " + std::to_string(error));
+        }
+
+        //std::cout << "ReadIntervalTimeout = " << timeouts.ReadIntervalTimeout << std::endl;
+        //std::cout << "ReadTotalTimeoutMultiplier = " << timeouts.ReadTotalTimeoutMultiplier << std::endl;
+        //std::cout << "ReadTotalTimeoutConstant = " << timeouts.ReadTotalTimeoutConstant << std::endl;
+        //std::cout << "WriteTotalTimeoutMultiplier = " << timeouts.WriteTotalTimeoutMultiplier << std::endl;
+        //std::cout << "WriteTotalTimeoutConstant = " << timeouts.WriteTotalTimeoutConstant << std::endl;
+
+#if 1
+        timeouts = COMMTIMEOUTS{(DWORD)-1, 0, 0, 0, 100};
+#else
+        //  Need to set a read timer. In some cases, a pending ReadFile() call
+        //  will block a WriteFile() call until it returns - leading to a
+        //  deadlock if the device isn't sending any information.
+        timeouts.ReadIntervalTimeout = 0;
+        timeouts.ReadTotalTimeoutMultiplier = 0;
+        timeouts.ReadTotalTimeoutConstant = 1;
+#endif
+        if (!SetCommTimeouts(m_handle, &timeouts)){
+            DWORD error = GetLastError();
+            CloseHandle(m_handle);
+            throw ConnectionException(nullptr, "SetCommTimeouts() failed. Error = " + std::to_string(error));
+        }
+#endif
+
+        //  Start receiver thread.
+        try{
+            m_listener = thread_pool.dispatch_now_blocking([this]{
+                run_with_catch(
+                    "SerialConnection::SerialConnection()",
+                    [this]{ recv_loop(); }
+                );
+            });
+        }catch (...){
+            CloseHandle(m_handle);
+            throw;
+        }
+    }
+    virtual ~SerialConnection(){
+        if (!m_exit.load(std::memory_order_acquire)){
+            stop();
+        }
+    }
+
+    virtual void stop() noexcept final{
+        m_exit.store(true, std::memory_order_release);
+        CloseHandle(m_handle);
+        m_listener.wait_and_ignore_exceptions();
+    }
+
+    void set_baud_rate(uint32_t baud_rate){
+        DCB serial_params{};
+        serial_params.DCBlength = sizeof(serial_params);
+
+        if (!GetCommState(m_handle, &serial_params)){
+            DWORD error = GetLastError();
+            CloseHandle(m_handle);
+            throw ConnectionException(nullptr, "GetCommState() failed. Error = " + std::to_string(error));
+        }
+//        cout << "BaudRate = " << (int)serial_params.BaudRate << endl;
+//        cout << "ByteSize = " << (int)serial_params.ByteSize << endl;
+//        cout << "StopBits = " << (int)serial_params.StopBits << "0 means 1 bit" << endl;
+//        cout << "Parity   = " << (int)serial_params.Parity << endl;
+        serial_params.BaudRate = baud_rate;
+        serial_params.ByteSize = 8;
+        serial_params.StopBits = 0;
+        serial_params.Parity = 0;
+        if (!SetCommState(m_handle, &serial_params)){
+            DWORD error = GetLastError();
+            CloseHandle(m_handle);
+            throw ConnectionException(nullptr, "SetCommState() failed. Error = " + std::to_string(error));
+        }
+    }
+
+    void get_control_state(bool& dtr, bool& rts){
+        DCB serial_params{};
+        serial_params.DCBlength = sizeof(serial_params);
+        if (!GetCommState(m_handle, &serial_params)){
+            DWORD error = GetLastError();
+            CloseHandle(m_handle);
+            throw ConnectionException(nullptr, "GetCommState() failed. Error = " + std::to_string(error));
+        }
+
+        dtr = serial_params.fDtrControl != DTR_CONTROL_DISABLE;
+        rts = serial_params.fRtsControl != RTS_CONTROL_DISABLE;
+    }
+    void set_control_state(bool dtr, bool rts){
+#if 1
+        DCB serial_params{};
+        serial_params.DCBlength = sizeof(serial_params);
+        if (GetCommState(m_handle, &serial_params)){
+            serial_params.fDtrControl = dtr ? DTR_CONTROL_ENABLE : DTR_CONTROL_DISABLE;
+            serial_params.fRtsControl = rts ? RTS_CONTROL_ENABLE : RTS_CONTROL_DISABLE;
+            SetCommState(m_handle, &serial_params);
+        }
+#endif
+    }
+
+
+private:
+    void process_error(const std::string& message){
+        WriteSpinLock lg(m_error_lock);
+
+        size_t consecutive_errors = m_consecutive_errors.fetch_add(1);
+
+//        serial_debug_log(message);
+
+        std::string clear_error;
+        DWORD comm_error;
+        if (ClearCommError(m_handle, &comm_error, nullptr) == 0){
+            DWORD error = GetLastError();
+            clear_error = "ClearCommError() failed. Error = " + std::to_string(error);
+        }else{
+            clear_error = "ClearCommError error flag = " + std::to_string(comm_error);
+        }
+
+        if (consecutive_errors <= 100){
+            serial_debug_log(message);
+        }
+        if (consecutive_errors == 100){
+            serial_debug_log("Further error messages will be suppressed.");
+        }
+    }
+
+
+    virtual size_t unreliable_send(const void* data, size_t bytes) noexcept override{
+        WriteSpinLock lg(m_send_lock, "SerialConnection::send()");
+#if 0
+        for (size_t c = 0; c < bytes; c++){
+            std::cout << "Send: " << (int)((const char*)data)[c] << std::endl;
+        }
+#endif
+
+//        std::cout << "start write" << std::endl;
+//        auto start = current_time();
+        DWORD written;
+        if (WriteFile(m_handle, data, (DWORD)bytes, &written, nullptr) != 0 && bytes == written){
+            m_consecutive_errors.store(0, std::memory_order_release);
+            return written;
+        }
+
+        DWORD error = GetLastError();
+        try{
+            process_error(
+                "Failed to write: " + std::to_string(written) +
+                " / " + std::to_string(bytes) +
+                ", error = " + std::to_string(error)
+            );
+        }catch (...){}
+//        auto stop = current_time();
+//        cout << "WriteFile() : " << std::chrono::duration_cast<std::chrono::milliseconds>(stop - start).count() << endl;
+
+//        std::cout << "end send()" << std::endl;
+
+        return written;
+    }
+
+    void recv_loop(){
+//        std::lock_guard<Mutex> lg(m_send_lock);
+        char buffer[32];
+        auto last_recv = current_time();
+        while (!m_exit.load(std::memory_order_acquire)){
+//            auto start = current_time();
+//            std::cout << "start read" << std::endl;
+            DWORD read;
+            if (ReadFile(m_handle, buffer, 32, &read, nullptr) == 0){
+                DWORD error = GetLastError();
+                process_error("ReadFile() failed. Error = " + std::to_string(error));
+            }
+//            auto stop = current_time();
+//            cout << "ReadFile() : " << std::chrono::duration_cast<std::chrono::milliseconds>(stop - start).count() << endl;
+//            std::cout << "read = " << read << std::endl;
+//            set_timouts();
+#if 0
+            for (size_t c = 0; c < read; c++){
+                cout << "Recv: " << (int)buffer[c] << endl;
+            }
+#endif
+            if (read != 0){
+                m_consecutive_errors.store(0, std::memory_order_release);
+                on_unreliable_recv(buffer, read);
+                last_recv = current_time();
+                continue;
+            }
+
+
+#if 1
+//            auto start = current_time();
+            Sleep(1);
+//            auto stop = current_time();
+#else
+            auto now = current_time();
+            uint64_t millis_since_last_recv = std::chrono::duration_cast<std::chrono::milliseconds>(now - last_recv).count();
+            if (millis_since_last_recv > 100){
+                Sleep(1);
+            }else{
+                pause();
+            }
+#endif
+        }
+    }
+
+private:
+    HANDLE m_handle;
+    std::atomic<bool> m_exit;
+    std::atomic<size_t> m_consecutive_errors;
+    SpinLock m_send_lock;
+    SpinLock m_error_lock;
+    AsyncTask m_listener;
+};
+
+
+
+}
+
+#endif
diff --git a/Common/Cpp/Sockets/AbstractClientSocket.h b/Common/Cpp/Sockets/AbstractClientSocket.h
new file mode 100644
index 0000000000..f7555db105
--- /dev/null
+++ b/Common/Cpp/Sockets/AbstractClientSocket.h
@@ -0,0 +1,104 @@
+/*  Abstract Client Socket
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Sockets_AbstractClientSocket_H
+#define PokemonAutomation_Sockets_AbstractClientSocket_H
+
+#include <chrono>
+#include <string>
+#include "Common/Cpp/ListenerSet.h"
+
+namespace PokemonAutomation{
+
+
+
+class AbstractClientSocket{
+public:
+    enum class State{
+        NOT_RUNNING,
+        CONNECTING,
+        CONNECTED,
+        DESTRUCTING,
+    };
+
+    struct Listener{
+        //  Called at the start of the receiver thread. This can be used to set
+        //  the thread priority of the thread.
+        virtual void on_thread_start(){}
+
+        //  Called when a connection attempt finishes.
+        //  If successful, "error_message" is empty.
+        //  Otherwise, it contains the error message.
+        virtual void on_connect_finished(const std::string& error_message){}
+
+        //  Called when the socket receives data from the server.
+        virtual void on_receive_data(const void* data, size_t bytes){}
+
+        //  Called when an established connection is lost (the server closed
+        //  the connection or a socket error occurred). It is not called by
+        //  "close()".
+        virtual void on_disconnect(const std::string& error_message){}
+    };
+
+    void add_listener(Listener& listener){
+        m_listeners.add(listener);
+    }
+    void remove_listener(Listener& listener){
+        m_listeners.remove(listener);
+    }
+
+
+public:
+    AbstractClientSocket()
+        : m_state(State::NOT_RUNNING)
+    {}
+    virtual ~AbstractClientSocket() = default;
+
+    State state() const{
+        return m_state.load(std::memory_order_relaxed);
+    }
+
+    //  Stops the connection and returns the socket to State::NOT_RUNNING
+    //  so "connect()" can be called again. This is safe to call multiple
+    //  times.
+    //
+    //  It cancels any in-flight operations: no further
+    //  "Listener::on_receive_data" callbacks are started (one already
+    //  running is allowed to finish), and an in-flight "send()" returns
+    //  promptly with the number of bytes actually written so far (best
+    //  effort). A "send()" that is already racing "close()" may still
+    //  complete.
+    //
+    //  This blocks until the receive thread has exited, so it must not be
+    //  called from within a listener callback.
+    virtual void close() noexcept = 0;
+    virtual void connect(const std::string& address, uint16_t port) = 0;
+
+    //  Sends data on the active connection. This blocks until every byte
+    //  has been written, the connection is lost, "close()" is called, or
+    //  "timeout" elapses. "std::chrono::milliseconds::max()" (the default)
+    //  waits indefinitely. Returns the number of bytes actually written,
+    //  which may be less than "bytes" if the deadline elapsed, the
+    //  connection was lost, or "close()" cancelled the send. If there is
+    //  no active connection, returns 0.
+    virtual size_t send(
+        const void* data,
+        size_t bytes,
+        std::chrono::milliseconds timeout = std::chrono::milliseconds::max()
+    ) = 0;
+
+
+protected:
+    std::atomic<State> m_state;
+    ListenerSet<Listener> m_listeners;
+};
+
+
+
+
+
+}
+#endif
diff --git a/Common/Cpp/Sockets/AbstractServerSocket.h b/Common/Cpp/Sockets/AbstractServerSocket.h
new file mode 100644
index 0000000000..bedb12560e
--- /dev/null
+++ b/Common/Cpp/Sockets/AbstractServerSocket.h
@@ -0,0 +1,126 @@
+/*  Abstract Server Socket
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  A minimal TCP server: it listens on a port and handles one connection
+ *  at a time. The implementation uses one worker thread for the accept
+ *  loop and one worker thread (from the thread pool) per active
+ *  connection.
+ *
+ */
+
+#ifndef PokemonAutomation_Sockets_AbstractServerSocket_H
+#define PokemonAutomation_Sockets_AbstractServerSocket_H
+
+#include <chrono>
+#include <string>
+#include "Common/Cpp/ListenerSet.h"
+
+namespace PokemonAutomation{
+
+
+
+class AbstractServerSocket{
+public:
+    enum class State{
+        NOT_RUNNING,
+        LISTENING,
+        CONNECTED,
+        DESTRUCTING,
+    };
+
+    struct Listener{
+        //  Called at the start of the thread that will handle a connection.
+        //  This can be used to set the thread priority of the thread.
+        virtual void on_thread_start(){}
+
+        //  Called when "start()" finishes.
+        //  If successful, "error_message" is empty.
+        //  Otherwise, it contains the error message.
+        virtual void on_listen_finished(const std::string& error_message){}
+
+        //  Called when a client connects.
+        virtual void on_connect(){}
+
+        //  Called when an incoming connection was rejected because a
+        //  client is already connected.
+        virtual void on_connect_rejected(){}
+
+        //  Called when the server receives data from the client.
+        virtual void on_receive_data(const void* data, size_t bytes){}
+
+        //  Called when the active connection is lost (the client closed
+        //  the connection or a socket error occurred). It is not called
+        //  by "close()" or "close_connection()".
+        virtual void on_disconnect(const std::string& error_message){}
+    };
+
+    void add_listener(Listener& listener){
+        m_listeners.add(listener);
+    }
+    void remove_listener(Listener& listener){
+        m_listeners.remove(listener);
+    }
+
+
+public:
+    AbstractServerSocket()
+        : m_state(State::NOT_RUNNING)
+    {}
+    virtual ~AbstractServerSocket() = default;
+
+    State state() const{
+        return m_state.load(std::memory_order_relaxed);
+    }
+
+    //  Binds to "address" and listens on "port". Use "0.0.0.0" to accept
+    //  connections on all interfaces. The result is reported through
+    //  "Listener::on_listen_finished", after which the state is
+    //  State::LISTENING on success or State::NOT_RUNNING on failure.
+    virtual void start(const std::string& address, uint16_t port) = 0;
+
+    //  Closes the active connection, if any, and keeps listening. Unlike
+    //  "close()", this does not wait for the worker threads, so it is safe
+    //  to call from within a listener callback. "Listener::on_disconnect"
+    //  is not called for the connection closed this way.
+    //
+    //  It cancels any in-flight "send()" the same way "close()" does: the
+    //  send returns promptly with the number of bytes actually written so
+    //  far (best effort).
+    virtual void close_connection() = 0;
+
+    //  Stops the server: it stops accepting new connections, closes the
+    //  active connection, and returns the socket to State::NOT_RUNNING so
+    //  "start()" can be called again. This is safe to call multiple times.
+    //
+    //  It cancels any in-flight "send()": the send returns promptly with
+    //  the number of bytes actually written so far (best effort).
+    //
+    //  This blocks until the worker threads have exited, so it must not be
+    //  called from within a listener callback (which runs on one of those
+    //  threads).
+    virtual void close() noexcept = 0;
+
+    //  Sends data to the active connection. This blocks until every byte
+    //  has been written, the connection is lost, "close()"/
+    //  "close_connection()" is called, or "timeout" elapses.
+    //  "std::chrono::milliseconds::max()" (the default) waits indefinitely.
+    //  Returns the number of bytes actually written, which may be less
+    //  than "bytes" if the deadline elapsed, the connection was lost, or
+    //  the send was cancelled. If there is no active connection, returns 0.
+    virtual size_t send(
+        const void* data,
+        size_t bytes,
+        std::chrono::milliseconds timeout = std::chrono::milliseconds::max()
+    ) = 0;
+
+
+protected:
+    std::atomic<State> m_state;
+    ListenerSet<Listener> m_listeners;
+};
+
+
+
+}
+#endif
diff --git a/Common/Cpp/Sockets/ClientSocket.cpp b/Common/Cpp/Sockets/ClientSocket.cpp
new file mode 100644
index 0000000000..63b00b8fed
--- /dev/null
+++ b/Common/Cpp/Sockets/ClientSocket.cpp
@@ -0,0 +1,13 @@
+/*  Client Socket
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+
+namespace PokemonAutomation{
+
+
+
+
+}
diff --git a/Common/Cpp/Sockets/ClientSocket.h b/Common/Cpp/Sockets/ClientSocket.h
new file mode 100644
index 0000000000..a4748630ed
--- /dev/null
+++ b/Common/Cpp/Sockets/ClientSocket.h
@@ -0,0 +1,28 @@
+/*  Client Socket
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_ClientSocket_H
+#define PokemonAutomation_ClientSocket_H
+
+
+
+#ifdef _WIN32
+#include "ClientSocket_WinSocket.h"
+//#include "ClientSocket_Qt.h"
+namespace PokemonAutomation{
+    using ClientSocket = ClientSocket_WinSocket;
+//    using ClientSocket = ClientSocket_Qt;
+}
+#else
+#include "ClientSocket_POSIX.h"
+namespace PokemonAutomation{
+    using ClientSocket = ClientSocket_POSIX;
+}
+#endif
+
+
+
+#endif
diff --git a/Common/Cpp/Sockets/ClientSocket_POSIX.cpp b/Common/Cpp/Sockets/ClientSocket_POSIX.cpp
new file mode 100644
index 0000000000..95472483af
--- /dev/null
+++ b/Common/Cpp/Sockets/ClientSocket_POSIX.cpp
@@ -0,0 +1,381 @@
+/*  Client Socket (POSIX)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#if !_WIN32
+
+#include <poll.h>
+#include <signal.h>
+#include <iostream>
+#include <cerrno>
+#include <cstring>
+#include <sys/socket.h>
+#include <fcntl.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <unistd.h>
+#include "Common/Cpp/Concurrency/ThreadPool.h"
+#include "ClientSocket_POSIX.h"
+
+namespace PokemonAutomation{
+
+
+ClientSocket_POSIX::ClientSocket_POSIX(ThreadPool& thread_pool)
+    : m_thread_pool(thread_pool)
+{
+    // Ignore SIGPIPE. Handle errors via errno instead
+    signal(SIGPIPE, SIG_IGN);
+}
+void ClientSocket_POSIX::close() noexcept{
+    AsyncTask thread;
+    {
+        std::lock_guard<Mutex> lg(m_lock);
+        if (m_state.load(std::memory_order_relaxed) == State::NOT_RUNNING && !m_thread){
+            //  Never connected, or already fully closed.
+            return;
+        }
+        m_state.store(State::DESTRUCTING, std::memory_order_release);
+        m_cv.notify_all();
+        thread = std::move(m_thread);
+    }
+
+    thread.wait_and_ignore_exceptions();
+
+    {
+        std::lock_guard<Mutex> lg(m_lock);
+        close_socket_locked();
+        m_state.store(State::NOT_RUNNING, std::memory_order_release);
+        m_cv.notify_all();
+    }
+}
+
+void ClientSocket_POSIX::connect(const std::string& address, uint16_t port){
+    std::string error;
+    {
+        std::lock_guard<Mutex> lg(m_lock);
+        if (m_state.load(std::memory_order_relaxed) != State::NOT_RUNNING){
+            return;
+        }
+
+        //  A socket whose previous connection has ended cannot be
+        //  reconnected, so always start from a fresh socket.
+        close_socket_locked();
+
+        int socket = ::socket(AF_INET, SOCK_STREAM, 0);
+        if (socket == -1){
+            error = "socket() failed: " + std::string(strerror(errno));
+        }else{
+            int flags = fcntl(socket, F_GETFL, 0);
+            if (flags == -1 || fcntl(socket, F_SETFL, flags | O_NONBLOCK) == -1){
+                error = "fcntl() failed: " + std::string(strerror(errno));
+                ::close(socket);
+            }else{
+                m_socket.store(socket, std::memory_order_release);
+            }
+        }
+        if (!error.empty()){
+            m_error = error;
+            return;
+        }
+
+        m_state.store(State::CONNECTING, std::memory_order_relaxed);
+    }
+    if (!error.empty()){
+        m_listeners.run_method(&Listener::on_connect_finished, error);
+        return;
+    }
+
+    //  Use the plain dispatch() rather than dispatch_now_blocking():
+    //  connect() may be called from a thread that is itself running on
+    //  this pool, and blocking here until a pool thread is free could
+    //  deadlock a capped pool. The returned AsyncTask still lets
+    //  close() join the receive thread.
+    try{
+        m_thread = m_thread_pool.dispatch([=, this]{
+            thread_loop(address, port);
+        });
+    }catch (...){
+        {
+            std::lock_guard<Mutex> lg(m_lock);
+            m_error = "Failed to start the receive thread.";
+            close_socket_locked();
+            m_state.store(State::NOT_RUNNING, std::memory_order_relaxed);
+        }
+        m_listeners.run_method(&Listener::on_connect_finished, m_error);
+        throw;
+    }
+}
+void ClientSocket_POSIX::close_socket_locked(){
+    int socket = m_socket.exchange(-1, std::memory_order_acquire);
+    if (socket == -1){
+        return;
+    }
+    if (::close(socket) != 0){
+        try{
+            std::cout << "Failed close(): errno = " << errno << " (" << strerror(errno) << ")" << std::endl;
+        }catch (...){}
+    }
+}
+
+size_t ClientSocket_POSIX::send(const void* data, size_t bytes, std::chrono::milliseconds timeout){
+    const char* ptr = (const char*)data;
+    size_t sent = 0;
+
+    //  "time_point::max()" (the infinite default) is never reached; using
+    //  it also avoids overflowing "now() + timeout".
+    const std::chrono::steady_clock::time_point deadline =
+        (timeout == std::chrono::milliseconds::max())
+            ? std::chrono::steady_clock::time_point::max()
+            : std::chrono::steady_clock::now() + timeout;
+
+    while (bytes > 0 && state() == State::CONNECTED){
+        if (std::chrono::steady_clock::now() >= deadline){
+            //  The deadline elapsed with bytes still unwritten; the
+            //  connection is still fine, so just report the partial count.
+            return sent;
+        }
+        int socket = m_socket.load(std::memory_order_acquire);
+        if (socket == -1){
+            return sent;
+        }
+
+        constexpr int BLOCK_SIZE = (int)1 << 30;
+        size_t current = std::min<size_t>(bytes, BLOCK_SIZE);
+        ssize_t current_sent = ::send(socket, ptr, (int)current, MSG_DONTWAIT | MSG_NOSIGNAL);
+        if (current_sent != -1){
+            //  send() may return after writing only part of the
+            //  buffer (macOS does this when the kernel's send
+            //  buffer is full); loop until everything has been
+            //  written, the same way the Qt backend does.
+            sent += current_sent;
+            ptr += current_sent;
+            bytes -= current_sent;
+            continue;
+        }
+
+        int error = errno;
+//            cout << "error = " << error << endl;
+
+        std::unique_lock<Mutex> lg(m_lock);
+        if (state() == State::DESTRUCTING){
+            break;
+        }
+
+        switch (error){
+        case EAGAIN:
+#if EAGAIN != EWOULDBLOCK
+        case EWOULDBLOCK:
+#endif
+            break;
+        case EPIPE:
+        case ECONNRESET:
+        case ENOTCONN:
+            m_error = "Connection closed: " + std::string(strerror(error));
+            return sent;
+        default:
+            m_error = "Send error (errno " + std::to_string(error) + "): " + std::string(strerror(error));
+            return sent;
+        }
+
+        m_cv.wait_for(lg, std::chrono::milliseconds(1));
+    }
+    return sent;
+}
+
+void ClientSocket_POSIX::connection_lost_locked(
+    std::unique_lock<Mutex>& lg,
+    const std::string& error_message,
+    bool was_connected
+){
+    m_error = error_message;
+    m_state.store(State::NOT_RUNNING, std::memory_order_release);
+    close_socket_locked();
+    lg.unlock();
+
+    if (was_connected){
+        m_listeners.run_method(&Listener::on_disconnect, error_message);
+    }else{
+        m_listeners.run_method(&Listener::on_connect_finished, error_message);
+    }
+}
+
+void ClientSocket_POSIX::thread_loop(std::string address, uint16_t port){
+    try{
+        thread_loop_internal(std::move(address), port);
+    }catch (...){
+        try{
+            std::cout << "ClientSocket_POSIX(): An exception was thrown from the receive thread." << std::endl;
+        }catch (...){}
+    }
+}
+void ClientSocket_POSIX::thread_loop_internal(std::string address, uint16_t port){
+    m_listeners.run_method(&Listener::on_thread_start);
+
+    {
+        sockaddr_in server;
+        std::memset(&server, 0, sizeof(server));
+        server.sin_family = AF_INET;
+        server.sin_port = htons(port);
+        server.sin_addr.s_addr = inet_addr(address.c_str());
+
+        //  Connect
+        int socket;
+        {
+            std::lock_guard<Mutex> lg(m_lock);
+            socket = m_socket.load(std::memory_order_acquire);
+        }
+        if (socket == -1){
+            return;
+        }
+
+        bool in_progress = false;
+        while (true){
+            //  The lock must not be held across the connect wait: a
+            //  connect to a host that drops SYNs can take the kernel
+            //  over two minutes to fail, and "close()" needs the lock to
+            //  set DESTRUCTING. Hold it only for the state check (the
+            //  same way the server's accept loop does it).
+            {
+                std::lock_guard<Mutex> lg(m_lock);
+                if (m_state.load(std::memory_order_relaxed) == State::DESTRUCTING){
+                    return;
+                }
+            }
+
+            if (!in_progress){
+                int ret = ::connect(socket, (struct sockaddr*)&server, sizeof(server));
+                if (ret == 0){
+                    break;
+                }
+
+                int error = errno;
+//                    cout << "error = " << error << endl;
+                if (error != EAGAIN && error != EALREADY && error != EINPROGRESS){
+                    std::unique_lock<Mutex> lg(m_lock);
+                    if (error == ETIMEDOUT){
+                        connection_lost_locked(lg, "Connection timed out.", false);
+                    }else{
+                        connection_lost_locked(lg, "Connect error (errno " + std::to_string(error) + "): " + std::string(strerror(error)), false);
+                    }
+                    return;
+                }
+                in_progress = true;
+            }
+
+            //  While the connect is in progress, calling connect() again
+            //  returns EISCONN, so instead wait for the socket to become
+            //  writable, then check SO_ERROR for the result.
+            pollfd pf;
+            pf.fd = socket;
+            pf.events = POLLOUT;
+            pf.revents = 0;
+            int pret = poll(&pf, 1, 10);
+            if (pret == -1){
+                if (errno != EINTR){
+                    std::unique_lock<Mutex> lg(m_lock);
+                    connection_lost_locked(lg, "poll() error: " + std::string(strerror(errno)), false);
+                    return;
+                }
+                continue;
+            }
+            if (pret == 0){
+                continue;
+            }
+
+            int so_error = 0;
+            socklen_t slen = sizeof(so_error);
+            if (getsockopt(socket, SOL_SOCKET, SO_ERROR, &so_error, &slen) != 0){
+                so_error = errno;
+            }
+            if (so_error == 0){
+                break;
+            }
+            std::unique_lock<Mutex> lg(m_lock);
+            if (so_error == ETIMEDOUT){
+                connection_lost_locked(lg, "Connection timed out.", false);
+            }else if (so_error == ECONNREFUSED){
+                connection_lost_locked(lg, "Connection refused.", false);
+            }else{
+                connection_lost_locked(lg, "Connect error (errno " + std::to_string(so_error) + "): " + std::string(strerror(so_error)), false);
+            }
+            return;
+        }
+
+        {
+            std::lock_guard<Mutex> lg(m_lock);
+            //  "close()" may have set DESTRUCTING while the connect was
+            //  in progress. Keep that state so the receive loop exits
+            //  immediately instead of marking the socket CONNECTED.
+            if (m_state.load(std::memory_order_relaxed) != State::DESTRUCTING){
+                m_state.store(State::CONNECTED, std::memory_order_relaxed);
+            }
+        }
+    }
+
+    m_listeners.run_method(&Listener::on_connect_finished, "");
+
+
+    constexpr size_t BUFFER_SIZE = 4096;
+    char buffer[BUFFER_SIZE];
+
+    while (true){
+        ssize_t bytes;
+        int error = 0;
+        {
+            std::unique_lock<Mutex> lg(m_lock);
+            State state = m_state.load(std::memory_order_relaxed);
+            if (state == State::DESTRUCTING){
+                return;
+            }
+
+            int socket = m_socket.load(std::memory_order_acquire);
+            if (socket == -1){
+                return;
+            }
+
+            bytes = ::recv(socket, buffer, BUFFER_SIZE, 0);
+//                cout << "error = " << error << endl;
+            if (bytes == -1){
+                error = errno;
+            }
+        }
+
+        if (bytes > 0){
+            m_listeners.run_method(&Listener::on_receive_data, buffer, bytes);
+            continue;
+        }
+
+        std::unique_lock<Mutex> lg(m_lock);
+        if (state() == State::DESTRUCTING){
+            return;
+        }
+
+        if (bytes == 0){
+            connection_lost_locked(lg, "Connection closed by server.", true);
+            return;
+        }
+
+        if (bytes == -1){
+            switch (error){
+            case EAGAIN:
+#if EAGAIN != EWOULDBLOCK
+            case EWOULDBLOCK:
+#endif
+                break;
+            default:
+                connection_lost_locked(lg, "Receive error (errno " + std::to_string(error) + "): " + std::string(strerror(error)), true);
+                return;
+            }
+        }
+
+        m_cv.wait_for(lg, std::chrono::milliseconds(1));
+    }
+
+}
+
+
+
+}
+#endif
diff --git a/Common/Cpp/Sockets/ClientSocket_POSIX.h b/Common/Cpp/Sockets/ClientSocket_POSIX.h
new file mode 100644
index 0000000000..d88beaed21
--- /dev/null
+++ b/Common/Cpp/Sockets/ClientSocket_POSIX.h
@@ -0,0 +1,86 @@
+/*  Client Socket (POSIX)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_ClientSocket_POSIX_H
+#define PokemonAutomation_ClientSocket_POSIX_H
+
+#include <atomic>
+#include <chrono>
+#include "Common/Cpp/Concurrency/Mutex.h"
+#include "Common/Cpp/Concurrency/ConditionVariable.h"
+#include "Common/Cpp/Concurrency/AsyncTask.h"
+#include "AbstractClientSocket.h"
+
+namespace PokemonAutomation{
+
+
+class ThreadPool;
+
+
+
+class ClientSocket_POSIX final : public AbstractClientSocket{
+public:
+    ClientSocket_POSIX(ThreadPool& thread_pool);
+
+    virtual ~ClientSocket_POSIX(){
+        close();
+    }
+
+    //  Stops the receive thread, closes the socket, and returns the socket to
+    //  State::NOT_RUNNING so "connect()" can be called again. This is safe to
+    //  call multiple times.
+    //
+    //  It cancels an in-flight "send()": the send loop re-checks the state
+    //  every iteration, and "close()" notifies it, so the send returns within
+    //  a millisecond with the bytes written so far.
+    //
+    //  This blocks until the receive thread has exited, so it must not be
+    //  called from within a listener callback (which runs on that thread).
+    virtual void close() noexcept override;
+
+    virtual void connect(const std::string& address, uint16_t port) override;
+
+    virtual size_t send(
+        const void* data,
+        size_t bytes,
+        std::chrono::milliseconds timeout = std::chrono::milliseconds::max()
+    ) override;
+
+
+private:
+    //  Closes the underlying socket, if any. Requires "m_lock" to be held.
+    void close_socket_locked();
+
+    //  A connection ended on its own (the connect attempt failed, the server
+    //  closed the connection, or a socket error occurred). This returns the
+    //  socket to State::NOT_RUNNING so "connect()" can be called again, and
+    //  fires the appropriate callback outside of "m_lock".
+    //  Requires "lg" to be locked. It unlocks it.
+    void connection_lost_locked(
+        std::unique_lock<Mutex>& lg,
+        const std::string& error_message,
+        bool was_connected
+    );
+
+    void thread_loop(std::string address, uint16_t port);
+    void thread_loop_internal(std::string address, uint16_t port);
+
+
+private:
+    ThreadPool& m_thread_pool;
+    std::atomic<int> m_socket{-1};
+
+    std::string m_error;
+
+    mutable Mutex m_lock;
+    ConditionVariable m_cv;
+    AsyncTask m_thread;
+};
+
+
+
+}
+#endif
diff --git a/Common/Cpp/Sockets/ClientSocket_Qt.cpp b/Common/Cpp/Sockets/ClientSocket_Qt.cpp
new file mode 100644
index 0000000000..768d2cfec5
--- /dev/null
+++ b/Common/Cpp/Sockets/ClientSocket_Qt.cpp
@@ -0,0 +1,389 @@
+/*  Client Socket (Qt)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <chrono>
+#include <algorithm>
+#include <QSharedPointer>
+#include <QTimer>
+#include <QTcpSocket>
+#include "Common/Qt/QtThreadPool.h"
+#include "Common/Qt/GlobalThreadPoolsQt.h"
+#include "ClientSocket_Qt.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+
+
+
+void ClientSocket_Qt::close() noexcept{
+    QTcpSocket* socket;
+    {
+        std::lock_guard<Mutex> lg(m_lock);
+        if (m_socket == nullptr){
+            //  Never connected, or already closed.
+            return;
+        }
+        m_state.store(State::DESTRUCTING, std::memory_order_release);
+        m_success_pending = false;
+        socket = m_socket;
+        m_socket = nullptr;
+    }
+
+    //  Cancel the in-flight "send()" calls so their callers return
+    //  promptly with the best-effort byte count, instead of waiting for
+    //  the event thread to finish the writes.
+    cancel_inflight_sends();
+
+    //  Destroy the socket on its event thread. This blocks until the
+    //  destruction has happened. A queued "send()" call still runs before
+    //  the destruction (the event loop is FIFO), but it is already
+    //  cancelled and finishes without writing.
+    GlobalThreadPools::qt_event_threadpool().remove_object(socket);
+
+    std::lock_guard<Mutex> lg(m_lock);
+    m_state.store(State::NOT_RUNNING, std::memory_order_release);
+}
+void ClientSocket_Qt::connect(const std::string& address, uint16_t port){
+    QTcpSocket* old_socket;
+    {
+        std::lock_guard<Mutex> lg(m_lock);
+        if (m_state.load(std::memory_order_relaxed) != State::NOT_RUNNING){
+            return;
+        }
+        old_socket = m_socket;
+        m_socket = nullptr;
+    }
+    if (old_socket != nullptr){
+        //  Cancel the in-flight sends before destroying the socket: a
+        //  call still queued is discarded with the socket, and its
+        //  caller must not be left waiting for a "done" that never
+        //  comes.
+        cancel_inflight_sends();
+
+        //  Destroy the socket from the previous connection. This blocks
+        //  until the destruction has happened.
+        GlobalThreadPools::qt_event_threadpool().remove_object(old_socket);
+    }
+
+    //  A new QTcpSocket for every connection. A socket whose connection
+    //  has ended cannot be reconnected.
+    QTcpSocket* socket = static_cast<QTcpSocket*>(
+        GlobalThreadPools::qt_event_threadpool().add_object(
+            [this]{ return make_socket(); }
+        )
+    );
+    {
+        std::lock_guard<Mutex> lg(m_lock);
+        m_socket = socket;
+        m_success_pending = false;
+        m_state.store(State::CONNECTING, std::memory_order_release);
+    }
+
+    emit internal_connect(address, port);
+}
+
+size_t ClientSocket_Qt::send(const void* data, size_t bytes, std::chrono::milliseconds timeout){
+    QTcpSocket* socket;
+    {
+        std::lock_guard<Mutex> lg(m_lock);
+        socket = m_socket;
+    }
+    if (socket == nullptr || state() != State::CONNECTED){
+        return 0;
+    }
+
+    QSharedPointer<SendData> send_data = QSharedPointer<SendData>::create();
+    send_data->packet.assign((const char*)data, bytes);
+    //  "time_point::max()" (the infinite default) is never reached; using
+    //  it also avoids overflowing "now() + timeout".
+    send_data->deadline =
+        (timeout == std::chrono::milliseconds::max())
+            ? std::chrono::steady_clock::time_point::max()
+            : std::chrono::steady_clock::now() + timeout;
+
+    //  Register the send atomically with respect to "close()"/"connect()":
+    //  both detach "m_socket" under this same lock before they cancel the
+    //  in-flight sends. The packet copy above can take a while for large
+    //  payloads, so without this re-check a send could register *after*
+    //  "close()" already cancelled an (empty) list and queued the socket's
+    //  destruction: its "internal_send" call would then be posted after the
+    //  destruction event, Qt would silently discard it, and the wait below
+    //  (unbounded for the infinite default timeout) would never end. With
+    //  the re-check, a send either registers before the cancel (and gets
+    //  cancelled, waking the wait below) or sees the detached socket and
+    //  returns without queueing anything.
+    bool registered;
+    {
+        std::lock_guard<Mutex> lg(m_lock);
+        registered = (m_socket != nullptr);
+        if (registered){
+            m_inflight_sends.push_back(send_data);
+        }
+    }
+    if (!registered){
+        return 0;
+    }
+
+    emit internal_send(send_data);
+
+    //  Wait for the socket's event thread to finish writing the packet,
+    //  or for "close()"/"connect()" to cancel the send. A finite
+    //  "timeout" waits for the deadline plus 1 s of queueing margin: the
+    //  write loop stops at the deadline, so anything beyond that is just
+    //  the queued call waiting to start.
+    //
+    //  The infinite default waits without a time bound. The registration
+    //  above is atomic with the "close()"/"connect()" detach, so "done" is
+    //  set by either the event-thread write loop (which stops at the
+    //  deadline, on a socket error, or when Qt's userspace buffer accepts
+    //  the packet; it runs before the queued socket destruction, since the
+    //  event loop is FIFO) or by "close()"/"connect()" cancelling the
+    //  registered send - even when Qt discards the queued write loop with
+    //  the socket - so the wait always ends. The shared ownership keeps
+    //  the packet alive until the queued call runs (or is discarded with
+    //  the socket).
+    {
+        std::unique_lock<Mutex> lg(send_data->lock);
+        if (timeout == std::chrono::milliseconds::max()){
+            send_data->cv.wait(
+                lg,
+                [&send_data]{ return send_data->done; }
+            );
+        }else{
+            send_data->cv.wait_for(
+                lg,
+                timeout + std::chrono::milliseconds(1000),
+                [&send_data]{ return send_data->done; }
+            );
+        }
+    }
+
+    return send_data->bytes_sent;
+}
+
+void ClientSocket_Qt::cancel_inflight_sends(){
+    std::vector<QSharedPointer<SendData>> cancelled;
+    {
+        std::lock_guard<Mutex> lg(m_lock);
+        cancelled = std::move(m_inflight_sends);
+    }
+    for (const auto& send_data : cancelled){
+        {
+            std::lock_guard<Mutex> lg(send_data->lock);
+            send_data->cancelled = true;
+            send_data->done = true;
+        }
+        send_data->cv.notify_all();
+    }
+}
+
+void ClientSocket_Qt::connection_failed(const std::string& error_message){
+    bool as_connect_failure;
+    {
+        std::lock_guard<Mutex> lg(m_lock);
+        State state = m_state.load(std::memory_order_relaxed);
+        if (state == State::CONNECTING){
+            as_connect_failure = true;
+        }else if (state == State::CONNECTED){
+            as_connect_failure = m_success_pending;
+        }else{
+            return;
+        }
+        m_success_pending = false;
+        m_state.store(State::NOT_RUNNING, std::memory_order_release);
+    }
+
+    if (as_connect_failure){
+        m_listeners.run_method(&Listener::on_connect_finished, error_message);
+    }else{
+        m_listeners.run_method(&Listener::on_disconnect, error_message);
+    }
+}
+
+
+std::unique_ptr<QTcpSocket> ClientSocket_Qt::make_socket(){
+    auto socket = std::make_unique<QTcpSocket>();
+
+    QObject::connect(
+        socket.get(), &QTcpSocket::connected,
+        socket.get(), [this, sock = socket.get()]{
+            bool pending_success;
+            {
+                std::lock_guard<Mutex> lg(m_lock);
+                pending_success =
+                    (m_state.load(std::memory_order_relaxed) == State::CONNECTING);
+                if (pending_success){
+                    m_state.store(State::CONNECTED, std::memory_order_release);
+                    m_success_pending = true;
+                }
+            }
+            if (!pending_success){
+                return;
+            }
+
+            //  On some platforms Qt emits "connected" optimistically,
+            //  before the connection attempt is definitively settled - a
+            //  refused connection emits "connected" and then immediately
+            //  "errorOccurred". So only report success once a short grace
+            //  period has passed without an error.
+            QTimer::singleShot(
+                50, sock,
+                [this]{
+                    bool fire;
+                    {
+                        std::lock_guard<Mutex> lg(m_lock);
+                        fire = m_success_pending;
+                        fire &= m_state.load(std::memory_order_relaxed) == State::CONNECTED;
+                        if (fire){
+                            m_success_pending = false;
+                        }
+                    }
+                    if (fire){
+                        m_listeners.run_method(&Listener::on_connect_finished, "");
+                    }
+                }
+            );
+        }
+    );
+    QObject::connect(
+        socket.get(), &QTcpSocket::disconnected,
+        socket.get(), [this, sock = socket.get()]{
+            //  If a socket error caused this disconnect, "errorOccurred"
+            //  has already reported it and changed the state, so this
+            //  only produces a callback for a clean close.
+            std::string message;
+            if (sock->error() != QAbstractSocket::SocketError::UnknownSocketError){
+                message = sock->errorString().toStdString();
+            }else{
+                message = "Connection closed by server.";
+            }
+            connection_failed(message);
+        }
+    );
+    QObject::connect(
+        socket.get(), &QTcpSocket::errorOccurred,
+        socket.get(), [this, sock = socket.get()](QAbstractSocket::SocketError){
+            connection_failed(sock->errorString().toStdString());
+        }
+    );
+    QObject::connect(
+        socket.get(), &QTcpSocket::readyRead,
+        socket.get(), [this, sock = socket.get()]{
+            //  readyRead only fires once per delivery, and more than one
+            //  buffer's worth of data may be waiting, so read until the
+            //  socket has no more data available.
+            while (true){
+                qint64 available = sock->bytesAvailable();
+                if (available <= 0){
+                    break;
+                }
+
+                constexpr size_t BUFFER_SIZE = 4096;
+                char buffer[BUFFER_SIZE];
+                qint64 bytes = sock->read(buffer, std::min<qint64>(BUFFER_SIZE, available));
+                if (bytes <= 0){
+                    break;
+                }
+
+                m_listeners.run_method(&Listener::on_receive_data, buffer, bytes);
+            }
+        }
+    );
+    QObject::connect(
+        this, &ClientSocket_Qt::internal_connect,
+        socket.get(), [this, sock = socket.get()](const std::string& address, uint16_t port){
+            std::lock_guard<Mutex> lg(m_lock);
+            if (m_state.load(std::memory_order_relaxed) == State::DESTRUCTING){
+                return;
+            }
+            sock->connectToHost(QHostAddress(QString::fromStdString(address)), port);
+        }
+    );
+    QObject::connect(
+        this, &ClientSocket_Qt::internal_send,
+        socket.get(), [this, sock = socket.get()](QSharedPointer<SendData> send_data){
+            {
+                std::lock_guard<Mutex> lg(send_data->lock);
+                if (send_data->cancelled){
+                    //  "close()"/"connect()" already cancelled this send
+                    //  and woken its caller; finish without writing.
+                    return;
+                }
+            }
+
+            size_t bytes_sent = 0;
+            {
+                const char* ptr = send_data->packet.data();
+                size_t remaining = send_data->packet.size();
+                //  The deadline keeps a peer that never reads from pinning
+                //  this event thread forever (which would also block
+                //  "close()" on it).
+                while (
+                    remaining > 0
+                    && sock->state() == QAbstractSocket::ConnectedState
+                    && std::chrono::steady_clock::now() < send_data->deadline
+                ){
+                    {
+                        std::lock_guard<Mutex> lg(send_data->lock);
+                        if (send_data->cancelled){
+                            //  "close()" cancelled the send mid-write; its
+                            //  caller has already been woken with the
+                            //  count written so far.
+                            break;
+                        }
+                    }
+                    qint64 current_sent = sock->write(ptr, remaining);
+                    if (current_sent <= 0){
+                        //  The kernel's send buffer is full. Wait for
+                        //  some of it to drain, then try again.
+                        sock->waitForBytesWritten(10);
+                        continue;
+                    }
+                    ptr += current_sent;
+                    remaining -= (size_t)current_sent;
+                    //  Track the running count, so a "close()" that
+                    //  cancels this send mid-write reports the bytes
+                    //  written so far.
+                    {
+                        std::lock_guard<Mutex> lg(send_data->lock);
+                        send_data->bytes_sent = send_data->packet.size() - remaining;
+                    }
+                }
+                bytes_sent = send_data->packet.size() - remaining;
+            }
+
+            {
+                std::lock_guard<Mutex> lg(m_lock);
+                //  "close()"/"connect()" may already have claimed this
+                //  send; only remove it if it still owns its slot.
+                m_inflight_sends.erase(
+                    std::remove(
+                        m_inflight_sends.begin(),
+                        m_inflight_sends.end(),
+                        send_data
+                    ),
+                    m_inflight_sends.end()
+                );
+            }
+
+            {
+                std::lock_guard<Mutex> lg(send_data->lock);
+                send_data->bytes_sent = bytes_sent;
+                send_data->done = true;
+            }
+            send_data->cv.notify_all();
+        }
+    );
+
+    return socket;
+}
+
+
+
+}
diff --git a/Common/Cpp/Sockets/ClientSocket_Qt.h b/Common/Cpp/Sockets/ClientSocket_Qt.h
new file mode 100644
index 0000000000..2e7c0f6918
--- /dev/null
+++ b/Common/Cpp/Sockets/ClientSocket_Qt.h
@@ -0,0 +1,128 @@
+/*  Client Socket (Qt)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_ClientSocket_Qt_H
+#define PokemonAutomation_ClientSocket_Qt_H
+
+#include <chrono>
+#include <string>
+#include <vector>
+#include <QObject>
+#include <QSharedPointer>
+#include "Common/Cpp/Concurrency/Mutex.h"
+#include "Common/Cpp/Concurrency/ConditionVariable.h"
+#include "AbstractClientSocket.h"
+
+class QTcpSocket;
+
+namespace PokemonAutomation{
+
+
+class ThreadPool;
+
+
+class ClientSocket_Qt final : public QObject, public AbstractClientSocket{
+    Q_OBJECT
+
+    struct SendData{
+        std::string packet;
+        //  The event-thread write loop stops at this deadline, so a send
+        //  that can never complete (a peer that never reads) cannot pin
+        //  the socket's event thread forever and block "close()". "max()"
+        //  means no deadline (the infinite default).
+        std::chrono::steady_clock::time_point deadline = std::chrono::steady_clock::time_point::max();
+        //  The running byte count: the write loop updates it as it goes,
+        //  so "close()" cancelling the send mid-write can report the
+        //  bytes written so far (best effort).
+        size_t bytes_sent = 0;
+        //  Set by "close()"/"connect()" when they cancel the send; the
+        //  queued write loop then finishes without writing.
+        bool cancelled = false;
+        //  Set when the event-thread write loop finishes or when
+        //  "close()"/"connect()" cancel the send.
+        bool done = false;
+
+        Mutex lock;
+        ConditionVariable cv;
+    };
+
+
+public:
+    ClientSocket_Qt(ThreadPool&){}
+
+    virtual ~ClientSocket_Qt(){
+        close();
+    }
+
+    //  Stops the connection, destroys the QTcpSocket, and returns the socket
+    //  to State::NOT_RUNNING so "connect()" can be called again. This blocks
+    //  until the QTcpSocket has been destroyed, so any in-flight listener
+    //  callback is finished by the time it returns. It is safe to call
+    //  multiple times.
+    //
+    //  It cancels the in-flight "send()" calls: their callers return
+    //  promptly with the number of bytes actually written so far (best
+    //  effort), instead of waiting for the event thread to finish them.
+    //
+    //  This must not be called from within a listener callback, since the
+    //  callbacks run on the QTcpSocket's event thread and this destroys the
+    //  socket that is running them.
+    virtual void close() noexcept override;
+
+    virtual void connect(const std::string& address, uint16_t port) override;
+
+    virtual size_t send(
+        const void* data,
+        size_t bytes,
+        std::chrono::milliseconds timeout = std::chrono::milliseconds::max()
+    ) override;
+
+
+signals:
+    void internal_connect(const std::string& address, uint16_t port);
+    void internal_send(QSharedPointer<SendData> send_data);
+
+
+private:
+    //  The connection attempt or the connection itself ended in a failure.
+    //  This fires the appropriate callback and returns the socket to
+    //  State::NOT_RUNNING so "connect()" can be called again. If the
+    //  connection was only tentatively confirmed (see the "connected" slot
+    //  below), it is still reported as a failed connect attempt. Only the
+    //  first of the (errorOccurred, disconnected) signals for a given
+    //  failure fires a callback.
+    //  Runs on the QTcpSocket's event thread.
+    void connection_failed(const std::string& error_message);
+
+    //  Cancels the in-flight "send()" calls: marks them done so their
+    //  callers return promptly with the bytes written so far (best
+    //  effort). The queued write loops finish without writing. The
+    //  shared ownership keeps each packet alive until its queued call
+    //  runs (or is discarded with the socket).
+    void cancel_inflight_sends();
+
+    std::unique_ptr<QTcpSocket> make_socket();
+
+
+private:
+    Mutex m_lock;
+
+    QTcpSocket* m_socket = nullptr;
+    bool m_success_pending = false;
+
+    //  The "send()" calls that are queued on the event thread but not
+    //  finished yet, so that "close()"/"connect()" can cancel them (and
+    //  wake their callers) before the socket is destroyed. The write
+    //  loops remove their entry when they finish. Protected by m_lock.
+    std::vector<QSharedPointer<SendData>> m_inflight_sends;
+};
+
+
+
+
+
+}
+#endif
diff --git a/Common/Cpp/Sockets/ClientSocket_WinSocket.cpp b/Common/Cpp/Sockets/ClientSocket_WinSocket.cpp
new file mode 100644
index 0000000000..a815d7f5b6
--- /dev/null
+++ b/Common/Cpp/Sockets/ClientSocket_WinSocket.cpp
@@ -0,0 +1,380 @@
+/*  Client Socket (Windows)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifdef _WIN32
+
+#include "Common/Cpp/Concurrency/ThreadPool.h"
+#include "ClientSocket_WinSocket.h"
+
+#pragma comment(lib, "Ws2_32.lib")
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+
+
+void ClientSocket_WinSocket::close() noexcept{
+    AsyncTask thread;
+    {
+        std::lock_guard<Mutex> lg(m_lock);
+        if (m_state.load(std::memory_order_relaxed) == State::NOT_RUNNING && !m_thread){
+            //  Never connected, or already fully closed.
+            return;
+        }
+        m_state.store(State::DESTRUCTING, std::memory_order_release);
+        m_cv.notify_all();
+        thread = std::move(m_thread);
+    }
+
+    thread.wait_and_ignore_exceptions();
+
+    {
+        std::lock_guard<Mutex> lg(m_lock);
+        close_socket_locked();
+        m_state.store(State::NOT_RUNNING, std::memory_order_release);
+        m_cv.notify_all();
+    }
+}
+void ClientSocket_WinSocket::connect(const std::string& address, uint16_t port){
+    std::string error;
+    {
+        std::lock_guard<Mutex> lg(m_lock);
+        if (m_state.load(std::memory_order_relaxed) != State::NOT_RUNNING){
+            return;
+        }
+
+        //  A socket whose previous connection has ended cannot be
+        //  reconnected, so always start from a fresh socket.
+        close_socket_locked();
+
+        ensure_wsa_started();
+
+        SOCKET socket = ::socket(AF_INET, SOCK_STREAM, 0);
+        if (socket == INVALID_SOCKET){
+            error = "socket() failed: WSA Error Code: " + std::to_string(WSAGetLastError());
+        }else{
+            u_long non_blocking = 1;
+            if (ioctlsocket(socket, FIONBIO, &non_blocking) != 0){
+                error = "ioctlsocket() failed: WSA Error Code: " + std::to_string(WSAGetLastError());
+                ::closesocket(socket);
+            }else{
+                m_socket.store(socket, std::memory_order_release);
+            }
+        }
+        if (!error.empty()){
+            m_error = error;
+            return;
+        }
+
+        m_state.store(State::CONNECTING, std::memory_order_relaxed);
+    }
+    if (!error.empty()){
+        m_listeners.run_method(&Listener::on_connect_finished, error);
+        return;
+    }
+
+    //  Use the plain dispatch() rather than dispatch_now_blocking():
+    //  connect() may be called from a thread that is itself running on
+    //  this pool, and blocking here until a pool thread is free could
+    //  deadlock a capped pool. The returned AsyncTask still lets
+    //  close() join the receive thread.
+    try{
+        m_thread = m_thread_pool.dispatch([=, this]{
+            thread_loop(address, port);
+        });
+    }catch (...){
+        {
+            std::lock_guard<Mutex> lg(m_lock);
+            m_error = "Failed to start the receive thread.";
+            close_socket_locked();
+            m_state.store(State::NOT_RUNNING, std::memory_order_relaxed);
+        }
+        m_listeners.run_method(&Listener::on_connect_finished, m_error);
+        throw;
+    }
+}
+
+
+size_t ClientSocket_WinSocket::send(const void* data, size_t bytes, std::chrono::milliseconds timeout){
+    const char* ptr = (const char*)data;
+    size_t sent = 0;
+
+    //  "time_point::max()" (the infinite default) is never reached; using
+    //  it also avoids overflowing "now() + timeout".
+    const std::chrono::steady_clock::time_point deadline =
+        (timeout == std::chrono::milliseconds::max())
+            ? std::chrono::steady_clock::time_point::max()
+            : std::chrono::steady_clock::now() + timeout;
+
+    while (bytes > 0 && state() == State::CONNECTED){
+        if (std::chrono::steady_clock::now() >= deadline){
+            //  The deadline elapsed with bytes still unwritten; the
+            //  connection is still fine, so just report the partial count.
+            return sent;
+        }
+        SOCKET socket = m_socket.load(std::memory_order_acquire);
+        if (socket == INVALID_SOCKET){
+            return sent;
+        }
+
+        constexpr size_t BLOCK_SIZE = (size_t)1 << 30;
+        int current = (int)std::min<size_t>(bytes, BLOCK_SIZE);
+        int current_sent = ::send(socket, ptr, current, 0);
+        if (current_sent != SOCKET_ERROR){
+            //  A partial send is not an error: advance and keep looping
+            //  until everything is written or the deadline/state ends
+            //  the send, the same way the POSIX and Qt backends do.
+            sent += current_sent;
+            ptr += current_sent;
+            bytes -= current_sent;
+            continue;
+        }
+
+        int error = WSAGetLastError();
+//            cout << "error = " << error << endl;
+
+        std::unique_lock<Mutex> lg(m_lock);
+        if (state() == State::DESTRUCTING){
+            break;
+        }
+
+        switch (error){
+        case WSAEWOULDBLOCK:
+            break;
+        default:
+            m_error = "WSA Error Code: " + std::to_string(error);
+            return sent;
+        }
+
+        m_cv.wait_for(lg, std::chrono::milliseconds(1));
+    }
+    return sent;
+}
+
+
+void ClientSocket_WinSocket::ensure_wsa_started(){
+    static std::once_flag flag;
+    std::call_once(flag, [](){
+        WSADATA wsa_data;
+        int ret = WSAStartup(MAKEWORD(2, 2), &wsa_data);
+        if (ret != 0){
+            try{
+                std::cout << "WSAStartup() failed: WSA Error Code = " << ret << std::endl;
+            }catch (...){}
+        }
+    });
+}
+void ClientSocket_WinSocket::close_socket_locked(){
+    SOCKET socket = m_socket.exchange(INVALID_SOCKET, std::memory_order_acquire);
+    if (socket == INVALID_SOCKET){
+        return;
+    }
+    if (::closesocket(socket) != 0){
+        try{
+            std::cout << "Failed closesocket(): WSA Error Code = " + std::to_string(WSAGetLastError()) << std::endl;
+        }catch (...){}
+    }
+}
+
+void ClientSocket_WinSocket::connection_lost_locked(
+    std::unique_lock<Mutex>& lg,
+    const std::string& error_message,
+    bool was_connected
+){
+    m_error = error_message;
+    m_state.store(State::NOT_RUNNING, std::memory_order_release);
+    close_socket_locked();
+    lg.unlock();
+
+    if (was_connected){
+        m_listeners.run_method(&Listener::on_disconnect, error_message);
+    }else{
+        m_listeners.run_method(&Listener::on_connect_finished, error_message);
+    }
+}
+
+void ClientSocket_WinSocket::thread_loop(const std::string& address, uint16_t port){
+    try{
+        thread_loop_internal(address, port);
+    }catch (...){
+        try{
+            std::cout << "ClientSocket_WinSocket(): An exception was thrown from the receive thread." << std::endl;
+        }catch (...){}
+    }
+}
+
+
+void ClientSocket_WinSocket::thread_loop_internal(const std::string& address, uint16_t port){
+    m_listeners.run_method(&Listener::on_thread_start);
+
+    {
+        sockaddr_in server;
+        server.sin_family = AF_INET;
+        server.sin_port = htons(port);
+        server.sin_addr.s_addr = inet_addr(address.c_str());
+
+        //  Connect
+        SOCKET socket;
+        {
+            std::lock_guard<Mutex> lg(m_lock);
+            socket = m_socket.load(std::memory_order_acquire);
+        }
+        if (socket == INVALID_SOCKET){
+            return;
+        }
+
+        bool in_progress = false;
+        while (true){
+            //  The lock must not be held across the connect wait: a
+            //  connect to a host that drops SYNs can take the kernel
+            //  tens of seconds to fail, and "close()" needs the lock to
+            //  set DESTRUCTING. Hold it only for the state check (the
+            //  same way the server's accept loop does it).
+            {
+                std::lock_guard<Mutex> lg(m_lock);
+                if (m_state.load(std::memory_order_relaxed) == State::DESTRUCTING){
+                    return;
+                }
+            }
+
+            if (!in_progress){
+                int ret = ::connect(socket, (struct sockaddr*)&server, sizeof(server));
+                if (ret != SOCKET_ERROR){
+                    break;
+                }
+
+                int error = WSAGetLastError();
+//                    cout << "error = " << error << endl;
+                if (error != WSAEWOULDBLOCK && error != WSAEINPROGRESS){
+                    std::unique_lock<Mutex> lg(m_lock);
+                    if (error == WSAETIMEDOUT){
+                        connection_lost_locked(lg, "Connection timed out.", false);
+                    }else{
+                        connection_lost_locked(lg, "WSA Error Code: " + std::to_string(error), false);
+                    }
+                    return;
+                }
+                in_progress = true;
+            }
+
+            //  Once the connect is in progress, calling connect() again
+            //  is not safe on Windows: when the attempt fails, the
+            //  second connect() returns WSAEINVAL instead of starting a
+            //  new attempt. So wait for the socket to become writable
+            //  and read the result with getsockopt(SO_ERROR).
+            fd_set write_set;
+            FD_ZERO(&write_set);
+            FD_SET(socket, &write_set);
+            timeval tv;
+            tv.tv_sec = 0;
+            tv.tv_usec = 10000;
+            int ret = ::select(0, nullptr, &write_set, nullptr, &tv);
+            if (ret == SOCKET_ERROR){
+                int error = WSAGetLastError();
+                if (error != WSAEINTR){
+                    std::unique_lock<Mutex> lg(m_lock);
+                    connection_lost_locked(lg, "select() failed: WSA Error Code: " + std::to_string(error), false);
+                    return;
+                }
+                continue;
+            }
+            if (ret == 0){
+                continue;
+            }
+
+            int so_error = 0;
+            int so_len = sizeof(so_error);
+            if (getsockopt(socket, SOL_SOCKET, SO_ERROR, (char*)&so_error, &so_len) == SOCKET_ERROR){
+                so_error = WSAGetLastError();
+            }
+            if (so_error == 0){
+                break;
+            }
+            std::unique_lock<Mutex> lg(m_lock);
+            if (so_error == WSAETIMEDOUT){
+                connection_lost_locked(lg, "Connection timed out.", false);
+            }else if (so_error == WSAECONNREFUSED){
+                connection_lost_locked(lg, "Connection refused.", false);
+            }else{
+                connection_lost_locked(lg, "WSA Error Code: " + std::to_string(so_error), false);
+            }
+            return;
+        }
+
+        {
+            std::lock_guard<Mutex> lg(m_lock);
+            //  "close()" may have set DESTRUCTING while the connect was
+            //  in progress. Keep that state so the receive loop exits
+            //  immediately instead of marking the socket CONNECTED.
+            if (m_state.load(std::memory_order_relaxed) != State::DESTRUCTING){
+                m_state.store(State::CONNECTED, std::memory_order_relaxed);
+            }
+        }
+    }
+
+    m_listeners.run_method(&Listener::on_connect_finished, "");
+
+
+    constexpr size_t BUFFER_SIZE = 4096;
+    char buffer[BUFFER_SIZE];
+
+    while (true){
+        int bytes;
+        int error = 0;
+        {
+            State state = m_state.load(std::memory_order_relaxed);
+            if (state == State::DESTRUCTING){
+                return;
+            }
+
+            SOCKET socket = m_socket.load(std::memory_order_acquire);
+            if (socket == INVALID_SOCKET){
+                return;
+            }
+
+            bytes = ::recv(socket, buffer, BUFFER_SIZE, 0);
+            if (bytes == SOCKET_ERROR){
+                error = WSAGetLastError();
+            }
+        }
+
+        if (bytes > 0){
+            m_listeners.run_method(&Listener::on_receive_data, buffer, bytes);
+            continue;
+        }
+
+        std::unique_lock<Mutex> lg(m_lock);
+        if (state() == State::DESTRUCTING){
+            return;
+        }
+
+        if (bytes == 0){
+            connection_lost_locked(lg, "Connection closed by server.", true);
+            return;
+        }
+
+        if (bytes == SOCKET_ERROR){
+            switch (error){
+            case WSAEWOULDBLOCK:
+                break;
+            default:
+                connection_lost_locked(lg, "Connection lost: WSA Error Code: " + std::to_string(error), true);
+                return;
+            }
+        }
+
+        m_cv.wait_for(lg, std::chrono::milliseconds(1));
+    }
+
+}
+
+
+
+
+}
+#endif
diff --git a/Common/Cpp/Sockets/ClientSocket_WinSocket.h b/Common/Cpp/Sockets/ClientSocket_WinSocket.h
new file mode 100644
index 0000000000..a67f01e683
--- /dev/null
+++ b/Common/Cpp/Sockets/ClientSocket_WinSocket.h
@@ -0,0 +1,97 @@
+/*  Client Socket (Windows)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_ClientSocket_WinSocket_H
+#define PokemonAutomation_ClientSocket_WinSocket_H
+
+#include <atomic>
+#include <chrono>
+#include <mutex>
+#include <winsock2.h>
+#include "Common/Cpp/Concurrency/Mutex.h"
+#include "Common/Cpp/Concurrency/ConditionVariable.h"
+#include "Common/Cpp/Concurrency/AsyncTask.h"
+#include "AbstractClientSocket.h"
+
+namespace PokemonAutomation{
+
+
+class ThreadPool;
+
+
+
+class ClientSocket_WinSocket final : public AbstractClientSocket{
+public:
+    ClientSocket_WinSocket(ThreadPool& thread_pool)
+        : m_thread_pool(thread_pool)
+    {}
+
+    virtual ~ClientSocket_WinSocket(){
+        close();
+    }
+
+    //  Stops the receive thread, closes the socket, and returns the socket to
+    //  State::NOT_RUNNING so "connect()" can be called again. This is safe to
+    //  call multiple times.
+    //
+    //  It cancels an in-flight "send()": the send loop re-checks the state
+    //  every iteration, and "close()" notifies it, so the send returns within
+    //  a millisecond with the bytes written so far.
+    //
+    //  This blocks until the receive thread has exited, so it must not be
+    //  called from within a listener callback (which runs on that thread).
+    virtual void close() noexcept override;
+
+    virtual void connect(const std::string& address, uint16_t port) override;
+
+    virtual size_t send(
+        const void* data,
+        size_t bytes,
+        std::chrono::milliseconds timeout = std::chrono::milliseconds::max()
+    ) override;
+
+
+private:
+    //  Winsock has to be started before any of its functions can be used, and
+    //  nothing else in the program calls WSAStartup, so call it exactly once
+    //  before the first socket is created. We deliberately never call
+    //  WSACleanup: it is a process-wide, reference-counted operation, and
+    //  other parts of the process (Qt) may be using Winsock as well.
+    static void ensure_wsa_started();
+
+    //  Closes the underlying socket, if any. Requires "m_lock" to be held.
+    void close_socket_locked();
+
+    //  A connection ended on its own (the connect attempt failed, the server
+    //  closed the connection, or a socket error occurred). This returns the
+    //  socket to State::NOT_RUNNING so "connect()" can be called again, and
+    //  fires the appropriate callback outside of "m_lock".
+    //  Requires "lg" to be locked. It unlocks it.
+    void connection_lost_locked(
+        std::unique_lock<Mutex>& lg,
+        const std::string& error_message,
+        bool was_connected
+    );
+
+    void thread_loop(const std::string& address, uint16_t port);
+    void thread_loop_internal(const std::string& address, uint16_t port);
+
+
+private:
+    ThreadPool& m_thread_pool;
+    std::atomic<SOCKET> m_socket{INVALID_SOCKET};
+
+    std::string m_error;
+
+    mutable Mutex m_lock;
+    ConditionVariable m_cv;
+    AsyncTask m_thread;
+};
+
+
+
+}
+#endif
diff --git a/Common/Cpp/Sockets/ServerSocket_POSIX.cpp b/Common/Cpp/Sockets/ServerSocket_POSIX.cpp
new file mode 100644
index 0000000000..47736e751b
--- /dev/null
+++ b/Common/Cpp/Sockets/ServerSocket_POSIX.cpp
@@ -0,0 +1,505 @@
+/*  Server Socket (POSIX)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#if !_WIN32
+
+#include <cerrno>
+#include <csignal>
+#include <cstring>
+#include <chrono>
+#include <thread>
+#include <poll.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include "Common/Cpp/Concurrency/ThreadPool.h"
+#include "ServerSocket_POSIX.h"
+
+namespace PokemonAutomation{
+
+ServerSocket_POSIX::ServerSocket_POSIX(ThreadPool& thread_pool)
+    : m_thread_pool(thread_pool)
+{
+    // Ignore SIGPIPE. Handle errors via errno instead
+    signal(SIGPIPE, SIG_IGN);
+}
+
+void ServerSocket_POSIX::start(const std::string& address, uint16_t port){
+    uint64_t generation = 0;
+    {
+        std::lock_guard<Mutex> lg(m_lock);
+        if (m_starting ||
+            m_state.load(std::memory_order_relaxed) != State::NOT_RUNNING
+        ){
+            return;
+        }
+        m_starting = true;
+        m_generation++;
+        generation = m_generation;
+    }
+
+    //  Use the plain dispatch() rather than dispatch_now_blocking():
+    //  start() may be called from a thread that is itself running on
+    //  this pool, and blocking here until a pool thread is free could
+    //  deadlock a capped pool.
+    try{
+        AsyncTask task = m_thread_pool.dispatch([=, this]{
+            accept_thread_loop(address, port, generation);
+        });
+        {
+            //  Append, never replace: replacing the slot would destroy
+            //  the previous task's AsyncTask, and its destructor blocks
+            //  until that task has finished. A task from an earlier
+            //  start() may still be running when this start() runs (the
+            //  caller's wait timed out while the pool was starved). It
+            //  notices its stale generation when it gets scheduled and
+            //  exits without listening, so it only has to outlive this
+            //  call; close() joins the whole list.
+            std::lock_guard<Mutex> lg(m_task_lock);
+            m_accept_threads.push_back(std::move(task));
+        }
+    }catch (...){
+        {
+            std::lock_guard<Mutex> lg(m_lock);
+            m_starting = false;
+            m_cv.notify_all();
+        }
+        m_listeners.run_method(
+            &Listener::on_listen_finished,
+            "Failed to start the listener thread."
+        );
+        throw;
+    }
+
+    {
+        std::lock_guard<Mutex> lg(m_lock);
+        m_starting = false;
+        m_cv.notify_all();
+    }
+}
+
+void ServerSocket_POSIX::close_connection(){
+    int socket;
+    {
+        std::lock_guard<Mutex> lg(m_lock);
+        if (m_state.load(std::memory_order_relaxed) != State::CONNECTED){
+            return;
+        }
+        m_close_requested = true;
+        m_state.store(State::LISTENING, std::memory_order_release);
+        socket = m_client;
+    }
+    if (socket != -1){
+        //  Tells the connection thread to stop; it closes the socket
+        //  itself. This is safe to call from within a listener callback.
+        ::shutdown(socket, SHUT_RDWR);
+    }
+}
+
+void ServerSocket_POSIX::close() noexcept{
+    {
+        std::unique_lock<Mutex> lg(m_lock);
+        //  Wait for an in-progress start() to publish the listener task
+        //  before we take the task slots.
+        m_cv.wait(lg, [&]{ return !m_starting; });
+        if (m_state.load(std::memory_order_relaxed) != State::NOT_RUNNING){
+            m_close_requested = true;
+            m_state.store(State::DESTRUCTING, std::memory_order_release);
+            m_closing++;
+        }
+    }
+
+    bool drain = false;
+    {
+        std::lock_guard<Mutex> lg(m_lock);
+        drain = (m_closing == 1);
+    }
+    if (!drain){
+        //  Either nothing was running (m_closing == 0), or another
+        //  close() is already draining the threads (m_closing > 1).
+        //  In the second case, wait for it to finish.
+        std::unique_lock<Mutex> lg(m_lock);
+        m_cv.wait(lg, [&]{
+            return m_state.load(std::memory_order_relaxed) == State::NOT_RUNNING;
+        });
+        return;
+    }
+
+    AsyncTask client_thread;
+    std::vector<AsyncTask> accept_threads;
+    {
+        //  m_task_lock, not m_lock: moving the tasks out destroys the
+        //  old AsyncTask objects, and their destructors wait for the
+        //  tasks to finish - which they can only do if they can acquire
+        //  m_lock.
+        std::lock_guard<Mutex> lg(m_task_lock);
+        accept_threads.swap(m_accept_threads);
+        client_thread = std::move(m_client_thread);
+        m_client_thread = AsyncTask();
+    }
+
+    //  The threads notice the new state within a few milliseconds and
+    //  close their own sockets.
+    for (auto& task : accept_threads){
+        task.wait_and_ignore_exceptions();
+    }
+    client_thread.wait_and_ignore_exceptions();
+
+    {
+        std::lock_guard<Mutex> lg(m_lock);
+        m_state.store(State::NOT_RUNNING, std::memory_order_release);
+        m_close_requested = false;
+        m_closing = 0;
+        m_cv.notify_all();
+    }
+}
+
+size_t ServerSocket_POSIX::send(const void* data, size_t bytes, std::chrono::milliseconds timeout){
+    int socket;
+    {
+        std::lock_guard<Mutex> lg(m_lock);
+        socket = m_state.load(std::memory_order_relaxed) == State::CONNECTED
+            ? m_client
+            : -1;
+    }
+    if (socket == -1){
+        return 0;
+    }
+
+    const char* ptr = (const char*)data;
+    size_t sent = 0;
+
+    //  "time_point::max()" (the infinite default) is never reached; using
+    //  it also avoids overflowing "now() + timeout".
+    const std::chrono::steady_clock::time_point deadline =
+        (timeout == std::chrono::milliseconds::max())
+            ? std::chrono::steady_clock::time_point::max()
+            : std::chrono::steady_clock::now() + timeout;
+
+    while (bytes > 0){
+        {
+            std::lock_guard<Mutex> lg(m_lock);
+            if (m_state.load(std::memory_order_relaxed) != State::CONNECTED){
+                return sent;
+            }
+        }
+        if (std::chrono::steady_clock::now() >= deadline){
+            //  The deadline elapsed with bytes still unwritten; the
+            //  connection is still fine, so just report the partial count.
+            return sent;
+        }
+
+        constexpr size_t BLOCK_SIZE = 1 << 30;
+        size_t current = std::min(BLOCK_SIZE, bytes);
+        ssize_t current_sent = ::send(socket, ptr, current, MSG_DONTWAIT | MSG_NOSIGNAL);
+        if (current_sent != -1){
+            sent += (size_t)current_sent;
+            ptr += current_sent;
+            bytes -= (size_t)current_sent;
+            continue;
+        }
+
+        int error = errno;
+        switch (error){
+        case EAGAIN:
+#if EAGAIN != EWOULDBLOCK
+        case EWOULDBLOCK:
+#endif
+            std::this_thread::sleep_for(std::chrono::milliseconds(1));
+            continue;
+        default:
+            //  EPIPE, ECONNRESET, or any other error: the connection is
+            //  gone.
+            return sent;
+        }
+    }
+
+    return sent;
+}
+
+void ServerSocket_POSIX::report_listen_finished(uint64_t generation, const std::string& error){
+    bool current;
+    {
+        std::lock_guard<Mutex> lg(m_lock);
+        current = (m_generation == generation);
+    }
+    if (current){
+        m_listeners.run_method(&Listener::on_listen_finished, error);
+    }
+}
+
+void ServerSocket_POSIX::accept_thread_loop(std::string address, uint16_t port, uint64_t generation){
+    int listen_socket = ::socket(AF_INET, SOCK_STREAM, 0);
+    if (listen_socket == -1){
+        m_listeners.run_method(
+            &Listener::on_listen_finished,
+            "Failed to create the socket: " + std::string(strerror(errno))
+        );
+        return;
+    }
+
+    int yes = 1;
+    setsockopt(listen_socket, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof(yes));
+
+    sockaddr_in server;
+    std::memset(&server, 0, sizeof(server));
+    server.sin_family = AF_INET;
+    server.sin_port = htons(port);
+    server.sin_addr.s_addr = inet_addr(address.c_str());
+
+    if (bind(listen_socket, (struct sockaddr*)&server, sizeof(server)) == -1){
+        int error = errno;
+        ::close(listen_socket);
+        report_listen_finished(
+            generation,
+            "Failed to bind the socket: " + std::string(strerror(error))
+        );
+        return;
+    }
+
+    if (::listen(listen_socket, 16) == -1){
+        int error = errno;
+        ::close(listen_socket);
+        report_listen_finished(
+            generation,
+            "Failed to listen on the socket: " + std::string(strerror(error))
+        );
+        return;
+    }
+
+    std::string start_error;
+    bool superseded = false;
+    {
+        std::lock_guard<Mutex> lg(m_lock);
+        superseded = (m_generation != generation);
+        if (superseded ||
+            m_state.load(std::memory_order_relaxed) == State::DESTRUCTING
+        ){
+            //  A newer start() or close() won the race.
+            start_error = "The server was replaced or closed before it could start listening.";
+        }else{
+            m_listen = listen_socket;
+            listen_socket = -1;
+            m_state.store(State::LISTENING, std::memory_order_release);
+        }
+    }
+    if (listen_socket != -1){
+        ::close(listen_socket);
+    }
+
+    if (superseded){
+        //  The attempt that started this task gave up on it while it was
+        //  still starting up (its wait timed out). A newer attempt owns
+        //  the listeners now; reporting this result would only confuse
+        //  that attempt, so exit without touching them.
+        return;
+    }
+
+    m_listeners.run_method(&Listener::on_listen_finished, start_error);
+    if (!start_error.empty()){
+        return;
+    }
+
+    //  Accept loop. Runs for the whole lifetime of the server: it keeps
+    //  polling while a connection is active, and rejects new clients in
+    //  the meantime.
+    while (true){
+        int listen;
+        {
+            std::lock_guard<Mutex> lg(m_lock);
+            State state = m_state.load(std::memory_order_relaxed);
+            if (state == State::DESTRUCTING ||
+                state == State::NOT_RUNNING ||
+                m_generation != generation
+            ){
+                break;
+            }
+            listen = m_listen;
+        }
+
+        pollfd pf;
+        pf.fd = listen;
+        pf.events = POLLIN;
+        pf.revents = 0;
+        int ret = ::poll(&pf, 1, 10);
+        if (ret == -1){
+            if (errno == EINTR){
+                continue;
+            }
+            break;
+        }
+        if (ret == 0){
+            continue;
+        }
+
+        int client_socket = ::accept(listen, nullptr, nullptr);
+        if (client_socket == -1){
+            continue;
+        }
+
+        bool rejected = false;
+        bool accepted = false;
+        {
+            std::lock_guard<Mutex> lg(m_lock);
+            State state = m_state.load(std::memory_order_relaxed);
+            if (state == State::DESTRUCTING || state == State::NOT_RUNNING){
+                ::close(client_socket);
+                break;
+            }
+            if (state == State::CONNECTED){
+                //  A client is already connected: reject this one.
+                ::close(client_socket);
+                rejected = true;
+            }else{
+                fcntl(client_socket, F_SETFL, O_NONBLOCK);
+                m_client = client_socket;
+                m_close_requested = false;
+                m_state.store(State::CONNECTED, std::memory_order_release);
+                accepted = true;
+            }
+        }
+
+        if (accepted){
+            //  Start the connection thread without holding m_lock.
+            //  The assignment to m_client_thread destroys the previous
+            //  connection task's AsyncTask, whose destructor waits for
+            //  that task to finish - and that task may be blocked on
+            //  m_lock.
+            try{
+                AsyncTask task = m_thread_pool.dispatch([this]{
+                    connection_thread_loop();
+                });
+                std::lock_guard<Mutex> lg(m_task_lock);
+                m_client_thread = std::move(task);
+            }catch (...){
+                //  The connection thread could not be started. Drop
+                //  this connection and keep listening.
+                std::lock_guard<Mutex> lg(m_lock);
+                ::close(client_socket);
+                m_client = -1;
+                m_state.store(State::LISTENING, std::memory_order_release);
+            }
+        }
+
+        if (rejected){
+            m_listeners.run_method(&Listener::on_connect_rejected);
+        }
+    }
+
+    int listen;
+    {
+        std::lock_guard<Mutex> lg(m_lock);
+        listen = m_listen;
+        m_listen = -1;
+    }
+    if (listen != -1){
+        ::close(listen);
+    }
+}
+
+void ServerSocket_POSIX::connection_thread_loop(){
+    m_listeners.run_method(&Listener::on_thread_start);
+
+    int socket;
+    bool active;
+    {
+        std::lock_guard<Mutex> lg(m_lock);
+        socket = m_client;
+        active = (m_state.load(std::memory_order_relaxed) == State::CONNECTED);
+        if (!active && m_client == socket){
+            m_client = -1;
+        }
+    }
+    if (!active){
+        //  The connection was closed before this thread started.
+        ::close(socket);
+        return;
+    }
+
+    m_listeners.run_method(&Listener::on_connect);
+
+    constexpr size_t BUFFER_SIZE = 4096;
+    char buffer[BUFFER_SIZE];
+    std::string error;
+
+    while (true){
+        {
+            std::lock_guard<Mutex> lg(m_lock);
+            if (m_state.load(std::memory_order_relaxed) != State::CONNECTED){
+                break;
+            }
+        }
+
+        //  The socket is non-blocking, so this returns immediately. It is
+        //  deliberately called without holding m_lock: the state check
+        //  above and the result handling below are the only parts that
+        //  need the lock, and no socket call should stretch it.
+        ssize_t bytes = ::recv(socket, buffer, BUFFER_SIZE, 0);
+
+        if (bytes > 0){
+            //  A new connection may have taken over while we were
+            //  reading: only dispatch the data if we still are the
+            //  active connection.
+            bool still_active;
+            {
+                std::lock_guard<Mutex> lg(m_lock);
+                still_active = (m_client == socket);
+            }
+            if (!still_active){
+                break;
+            }
+            m_listeners.run_method(&Listener::on_receive_data, buffer, bytes);
+            continue;
+        }
+
+        if (bytes == -1){
+            int error_no = errno;
+            if (error_no == EAGAIN){
+                //  No data yet.
+                std::this_thread::sleep_for(std::chrono::milliseconds(1));
+                continue;
+            }
+#if EAGAIN != EWOULDBLOCK
+            if (error_no == EWOULDBLOCK){
+                std::this_thread::sleep_for(std::chrono::milliseconds(1));
+                continue;
+            }
+#endif
+            if (error_no == EINTR){
+                continue;
+            }
+            error = "Receive error (errno " + std::to_string(error_no) + "): " + std::string(strerror(error_no));
+        }else if (bytes == 0){
+            error = "Connection closed by client.";
+        }
+        break;
+    }
+
+    bool report_disconnect;
+    {
+        std::lock_guard<Mutex> lg(m_lock);
+        report_disconnect = false;
+        if (m_client == socket){
+            //  Still the active connection (or it was closed before a
+            //  new one took over): we own the socket and the state.
+            m_client = -1;
+            if (m_state.load(std::memory_order_relaxed) == State::CONNECTED){
+                m_state.store(State::LISTENING, std::memory_order_release);
+                report_disconnect = !m_close_requested;
+            }
+        }
+    }
+    ::close(socket);
+    if (report_disconnect){
+        m_listeners.run_method(&Listener::on_disconnect, error);
+    }
+}
+
+}
+
+#endif
diff --git a/Common/Cpp/Sockets/ServerSocket_POSIX.h b/Common/Cpp/Sockets/ServerSocket_POSIX.h
new file mode 100644
index 0000000000..00f0549cd6
--- /dev/null
+++ b/Common/Cpp/Sockets/ServerSocket_POSIX.h
@@ -0,0 +1,101 @@
+/*  Server Socket (POSIX)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_ServerSocket_POSIX_H
+#define PokemonAutomation_ServerSocket_POSIX_H
+
+#include <string>
+#include <vector>
+#include <atomic>
+#include <chrono>
+#include "Common/Cpp/Concurrency/AsyncTask.h"
+#include "Common/Cpp/Concurrency/ConditionVariable.h"
+#include "Common/Cpp/Concurrency/Mutex.h"
+#include "AbstractServerSocket.h"
+
+namespace PokemonAutomation{
+
+class ThreadPool;
+
+
+class ServerSocket_POSIX final : public AbstractServerSocket{
+public:
+
+    ServerSocket_POSIX(ThreadPool& thread_pool);
+
+    virtual ~ServerSocket_POSIX(){
+        close();
+    }
+
+    virtual void start(const std::string& address, uint16_t port) override;
+
+    //  Closes the active connection and keeps listening. The connection
+    //  thread stops and closes the socket itself; an in-flight "send()" is
+    //  cancelled and returns promptly with the bytes written so far (the
+    //  send loop re-checks the state every iteration). Safe to call from
+    //  within a listener callback.
+    virtual void close_connection() override;
+
+    //  Stops the server. It cancels any in-flight "send()" the same way
+    //  "close_connection()" does, and blocks until the worker threads have
+    //  exited, so it must not be called from within a listener callback.
+    virtual void close() noexcept override;
+
+    virtual size_t send(
+        const void* data,
+        size_t bytes,
+        std::chrono::milliseconds timeout = std::chrono::milliseconds::max()
+    ) override;
+
+
+private:
+
+    void accept_thread_loop(std::string address, uint16_t port, uint64_t generation);
+    void connection_thread_loop();
+
+    //  "on_listen_finished" callback, but only for a task that still owns
+    //  the server. A task whose generation is stale (a newer start() ran
+    //  while it was still starting up) must stay silent, or its result
+    //  would corrupt the attempt that replaced it.
+    void report_listen_finished(uint64_t generation, const std::string& error);
+
+
+private:
+    ThreadPool& m_thread_pool;
+    Mutex m_lock;
+    ConditionVariable m_cv;
+    bool m_starting = false;
+    int m_closing = 0;
+
+    //  Increments on every start(). The accept task captures its own
+    //  generation so that a task left behind by a timed-out attempt can
+    //  tell it was replaced when it finally gets scheduled.
+    uint64_t m_generation = 0;
+
+    //  Protects m_accept_threads and m_client_thread. Kept separate from
+    //  m_lock because the task's lifetime interacts with it: joining a
+    //  task waits for it to exit, and exiting requires m_lock. Holding
+    //  m_lock while a task slot is destroyed would deadlock, so slot
+    //  operations happen under m_task_lock with m_lock released.
+    Mutex m_task_lock;
+
+    int m_listen = -1;
+    int m_client = -1;
+    bool m_close_requested = false;
+
+    //  One task per start() call. start() must never destroy the previous
+    //  task's AsyncTask here: its destructor blocks until the task has
+    //  finished, and a task from an earlier attempt may still be running
+    //  (the caller's wait timed out while the pool was starved). close()
+    //  joins the whole list.
+    std::vector<AsyncTask> m_accept_threads;
+    AsyncTask m_client_thread;
+};
+
+
+
+}
+#endif
diff --git a/Common/Cpp/Sockets/ServerSocket_Qt.cpp b/Common/Cpp/Sockets/ServerSocket_Qt.cpp
new file mode 100644
index 0000000000..ff3ac18120
--- /dev/null
+++ b/Common/Cpp/Sockets/ServerSocket_Qt.cpp
@@ -0,0 +1,522 @@
+/*  Server Socket (Qt)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <chrono>
+#include <algorithm>
+#include <QTcpServer>
+#include <QTcpSocket>
+#include <QThread>
+#include "Common/Qt/QtThreadPool.h"
+#include "Common/Qt/GlobalThreadPoolsQt.h"
+#include "ServerSocket_Qt.h"
+
+namespace PokemonAutomation{
+
+void ServerSocket_Qt::start(const std::string& address, uint16_t port){
+    bool starting;
+    {
+        std::lock_guard<Mutex> lg(m_lock);
+        starting =
+            (m_state.load(std::memory_order_relaxed) == State::NOT_RUNNING)
+            && m_server == nullptr
+            && !m_starting;
+        //  Only claim the "starting" flag when we actually start: a
+        //  rejected call (server already running or already started) must
+        //  not leave "m_starting" true - "close()" waits on
+        //  "!m_starting", so a stale flag would deadlock the destructor.
+        //  (This happens when a test's start-retry loop calls start() on
+        //  a server whose first listen failed: "m_server" is set even on
+        //  a failed listen, so the retry is rejected here.)
+        if (starting){
+            m_starting = true;
+        }
+    }
+    if (!starting){
+        return;
+    }
+
+    m_listen_error = "";
+    QTcpServer* server = nullptr;
+    try{
+        server = static_cast<QTcpServer*>(
+            GlobalThreadPools::qt_event_threadpool().add_object(
+                [this, address, port]{
+                    return make_server(address, port);
+                }
+            )
+        );
+    }catch (...){
+        {
+            std::lock_guard<Mutex> lg(m_lock);
+            m_starting = false;
+            m_cv.notify_all();
+        }
+        m_listeners.run_method(&Listener::on_listen_finished, "Failed to start the listener.");
+        throw;
+    }
+    bool listening = false;
+    bool destructing = false;
+    {
+        std::lock_guard<Mutex> lg(m_lock);
+        m_starting = false;
+        destructing =
+            (m_state.load(std::memory_order_relaxed) == State::DESTRUCTING);
+        m_server = server;
+        if (destructing){
+            //  "close()" is already in progress: it will destroy the
+            //  server we just created. Leave the state for it.
+        }else{
+            listening = m_listen_error.empty();
+            m_state.store(
+                listening ? State::LISTENING : State::NOT_RUNNING,
+                std::memory_order_release
+            );
+        }
+        m_cv.notify_all();
+    }
+
+    if (!destructing && !listening){
+        //  The listen failed. Destroy the server now, leaving the object
+        //  exactly as it was before this start() (no "m_server", state
+        //  NOT_RUNNING), so the caller's start-retry loop can immediately
+        //  try another port. The other backends behave the same: a failed
+        //  listen leaves no listener behind. If "close()" raced us, it has
+        //  already claimed "m_server", and the pool's lookup makes the
+        //  second destruction a no-op.
+        GlobalThreadPools::qt_event_threadpool().remove_object(server);
+        std::lock_guard<Mutex> lg(m_lock);
+        m_server = nullptr;
+    }
+
+    m_listeners.run_method(&Listener::on_listen_finished, m_listen_error);
+}
+
+void ServerSocket_Qt::close_connection(){
+    QThread* event_thread;
+    {
+        std::lock_guard<Mutex> lg(m_lock);
+        event_thread = m_event_thread;
+        if (m_server == nullptr){
+            //  Not running.
+            return;
+        }
+    }
+
+    //  Cancel the in-flight "send()" calls so their callers return
+    //  promptly with the best-effort byte count. (The connection itself
+    //  is closed by the queued call below.)
+    cancel_inflight_sends();
+
+    QSharedPointer<CloseCompletion> completion = QSharedPointer<CloseCompletion>::create();
+    emit internal_close_connection(completion);
+
+    //  If called from a thread other than the server's event thread, the
+    //  call is queued: wait until it has run, so the state is up to date
+    //  when this returns (same as the POSIX backend). If called from the
+    //  event thread (e.g. a listener callback), the call ran directly and
+    //  this does not block.
+    //
+    //  The shared ownership makes the timeout safe: if it expires, the
+    //  queued call's own copy keeps the completion alive until it runs.
+    if (QThread::currentThread() != event_thread){
+        std::unique_lock<Mutex> lg(completion->lock);
+        completion->cv.wait_for(
+            lg,
+            std::chrono::seconds(5),
+            [&completion]{ return completion->done; }
+        );
+    }
+}
+void ServerSocket_Qt::close() noexcept{
+    QTcpServer* server;
+    {
+        std::lock_guard<Mutex> lg(m_lock);
+        if (m_server == nullptr && !m_starting){
+            //  Never started, or already closed.
+            return;
+        }
+        m_close_requested = true;
+        m_state.store(State::DESTRUCTING, std::memory_order_release);
+    }
+
+    //  Cancel the in-flight "send()" calls so their callers return
+    //  promptly with the best-effort byte count.
+    cancel_inflight_sends();
+
+    //  Wait for an in-flight "start()" to finish so we destroy the
+    //  server it creates.
+    {
+        std::unique_lock<Mutex> lg(m_lock);
+        m_cv.wait(lg, [this]{
+            return !m_starting;
+        });
+        server = m_server;
+        m_server = nullptr;
+        m_socket = nullptr;
+    }
+    if (server == nullptr){
+        //  "start()" failed or was never reached: nothing to destroy.
+        std::lock_guard<Mutex> lg(m_lock);
+        m_state.store(State::NOT_RUNNING, std::memory_order_release);
+        m_close_requested = false;
+        return;
+    }
+
+    //  Destroy the server on its event thread. This blocks until the
+    //  destruction has happened.
+    GlobalThreadPools::qt_event_threadpool().remove_object(server);
+
+    std::lock_guard<Mutex> lg(m_lock);
+    m_state.store(State::NOT_RUNNING, std::memory_order_release);
+    m_close_requested = false;
+}
+
+size_t ServerSocket_Qt::send(const void* data, size_t bytes, std::chrono::milliseconds timeout){
+    QTcpSocket* socket;
+    {
+        std::lock_guard<Mutex> lg(m_lock);
+        socket = m_state.load(std::memory_order_relaxed) == State::CONNECTED
+            ? m_socket
+            : nullptr;
+    }
+    if (socket == nullptr){
+        return 0;
+    }
+
+    QSharedPointer<SendData> send_data = QSharedPointer<SendData>::create();
+    send_data->packet.assign((const char*)data, bytes);
+    //  "time_point::max()" (the infinite default) is never reached; using
+    //  it also avoids overflowing "now() + timeout".
+    send_data->deadline =
+        (timeout == std::chrono::milliseconds::max())
+            ? std::chrono::steady_clock::time_point::max()
+            : std::chrono::steady_clock::now() + timeout;
+
+    //  Register the send atomically with respect to "close()"/
+    //  "close_connection()": "close()" sets the state to DESTRUCTING and
+    //  detaches the socket under this same lock before it cancels the
+    //  in-flight sends. The packet copy above can take a while for large
+    //  payloads, so without this re-check a send could register *after*
+    //  "close()" already cancelled the (empty) list and queued the
+    //  server's destruction: its "internal_send" call would then be
+    //  posted after the destruction event, Qt would silently discard it,
+    //  and the wait below (unbounded for the infinite default timeout)
+    //  would never end. With the re-check, a send either registers
+    //  before the cancel (and gets cancelled, waking the wait below) or
+    //  sees the detached socket and returns without queueing anything.
+    bool registered;
+    {
+        std::lock_guard<Mutex> lg(m_lock);
+        registered =
+            m_state.load(std::memory_order_relaxed) == State::CONNECTED
+            && m_socket != nullptr;
+        if (registered){
+            m_inflight_sends.push_back(send_data);
+        }
+    }
+    if (!registered){
+        return 0;
+    }
+
+    emit internal_send(send_data);
+
+    //  Wait for the server's event thread to finish writing the packet,
+    //  or for "close()"/"close_connection()" to cancel the send. A
+    //  finite "timeout" waits for the deadline plus 1 s of queueing
+    //  margin: the write loop stops at the deadline, so anything beyond
+    //  that is just the queued call waiting to start.
+    //
+    //  The infinite default waits without a time bound. The registration
+    //  above is atomic with the "close()"/"close_connection()" detach, so
+    //  "done" is set by either the event-thread write loop (which stops
+    //  at the deadline, on a socket error, or when Qt's userspace buffer
+    //  accepts the packet; it runs before the queued server destruction,
+    //  since the event loop is FIFO) or by "close()"/"close_connection()"
+    //  cancelling the registered send - even when Qt discards the queued
+    //  write loop with the server - so the wait always ends. The shared
+    //  ownership keeps the packet alive until the queued call runs (or
+    //  is discarded with the server).
+    {
+        std::unique_lock<Mutex> lg(send_data->lock);
+        if (timeout == std::chrono::milliseconds::max()){
+            send_data->cv.wait(
+                lg,
+                [&send_data]{ return send_data->done; }
+            );
+        }else{
+            send_data->cv.wait_for(
+                lg,
+                timeout + std::chrono::milliseconds(1000),
+                [&send_data]{ return send_data->done; }
+            );
+        }
+    }
+
+    return send_data->bytes_sent;
+}
+
+void ServerSocket_Qt::cancel_inflight_sends(){
+    std::vector<QSharedPointer<SendData>> cancelled;
+    {
+        std::lock_guard<Mutex> lg(m_lock);
+        cancelled = std::move(m_inflight_sends);
+    }
+    for (const auto& send_data : cancelled){
+        {
+            std::lock_guard<Mutex> lg(send_data->lock);
+            send_data->cancelled = true;
+            send_data->done = true;
+        }
+        send_data->cv.notify_all();
+    }
+}
+
+void ServerSocket_Qt::on_new_connection(){
+    QTcpServer* server;
+    {
+        std::lock_guard<Mutex> lg(m_lock);
+        server = m_server;
+    }
+    if (server == nullptr){
+        return;
+    }
+
+    while (true){
+        QTcpSocket* sock = server->nextPendingConnection();
+        if (sock == nullptr){
+            break;
+        }
+        //  The connection socket lives with the server, so "close()"
+        //  destroys it on the event thread.
+        sock->setParent(server);
+
+        bool accepted;
+        bool rejected;
+        {
+            std::lock_guard<Mutex> lg(m_lock);
+            State state = m_state.load(std::memory_order_relaxed);
+            if (state == State::CONNECTED){
+                //  A client is already connected: reject this one.
+                accepted = false;
+                rejected = true;
+            }else if (state != State::LISTENING){
+                //  The server is shutting down.
+                accepted = false;
+                rejected = false;
+            }else{
+                m_socket = sock;
+                m_close_requested = false;
+                m_state.store(State::CONNECTED, std::memory_order_release);
+                accepted = true;
+                rejected = false;
+            }
+        }
+
+        if (!accepted){
+            if (rejected){
+                m_listeners.run_method(&Listener::on_connect_rejected);
+            }
+            sock->abort();
+            continue;
+        }
+
+        QObject::connect(
+            sock, &QAbstractSocket::readyRead,
+            sock, [this, sock]{
+                //  readyRead only fires once per delivery, and more than
+                //  one buffer's worth of data may be waiting, so read
+                //  until the socket has no more data available.
+                while (true){
+                    qint64 available = sock->bytesAvailable();
+                    if (available <= 0){
+                        break;
+                    }
+
+                    constexpr size_t BUFFER_SIZE = 4096;
+                    char buffer[BUFFER_SIZE];
+                    qint64 bytes = sock->read(buffer, std::min<qint64>(BUFFER_SIZE, available));
+                    if (bytes <= 0){
+                        break;
+                    }
+
+                    m_listeners.run_method(&Listener::on_receive_data, buffer, bytes);
+                }
+            }
+        );
+        QObject::connect(
+            sock, &QAbstractSocket::disconnected,
+            sock, [this, sock]{
+                connection_lost(sock, "Connection closed by client.");
+            }
+        );
+        QObject::connect(
+            sock, &QAbstractSocket::errorOccurred,
+            sock, [this, sock](QAbstractSocket::SocketError){
+                connection_lost(sock, sock->errorString().toStdString());
+            }
+        );
+
+        m_listeners.run_method(&Listener::on_connect);
+    }
+}
+
+void ServerSocket_Qt::connection_lost(QTcpSocket* sock, const std::string& error_message){
+    bool report;
+    {
+        std::lock_guard<Mutex> lg(m_lock);
+        if (m_socket != sock){
+            //  Already replaced or closed; the first callback wins.
+            return;
+        }
+        report =
+            !m_close_requested
+            && m_state.load(std::memory_order_relaxed) == State::CONNECTED;
+        m_socket = nullptr;
+        if (m_state.load(std::memory_order_relaxed) == State::CONNECTED){
+            m_state.store(State::LISTENING, std::memory_order_release);
+        }
+    }
+
+    if (report){
+        m_listeners.run_method(&Listener::on_disconnect, error_message);
+    }
+}
+
+void ServerSocket_Qt::on_close_connection(QSharedPointer<CloseCompletion> completion){
+    QTcpSocket* sock;
+    {
+        std::lock_guard<Mutex> lg(m_lock);
+        if (m_socket != nullptr){
+            m_close_requested = true;
+            m_state.store(State::LISTENING, std::memory_order_release);
+            sock = m_socket;
+            m_socket = nullptr;
+        }else{
+            sock = nullptr;
+        }
+    }
+    if (sock != nullptr){
+        sock->abort();
+    }
+
+    {
+        std::lock_guard<Mutex> lg(completion->lock);
+        completion->done = true;
+    }
+    completion->cv.notify_all();
+}
+
+void ServerSocket_Qt::on_send(QSharedPointer<SendData> send_data){
+    QTcpSocket* sock;
+    {
+        std::lock_guard<Mutex> lg(m_lock);
+        sock = m_socket;
+    }
+
+    {
+        std::lock_guard<Mutex> lg(send_data->lock);
+        if (send_data->cancelled){
+            //  "close()"/"close_connection()" already cancelled this
+            //  send and woken its caller; finish without writing.
+            return;
+        }
+    }
+
+    size_t bytes_sent = 0;
+    if (sock != nullptr){
+        const char* ptr = send_data->packet.data();
+        size_t remaining = send_data->packet.size();
+        //  The deadline keeps a client that never reads from pinning this
+        //  event thread forever (which would also block "close()").
+        while (
+            remaining > 0
+            && sock->state() == QAbstractSocket::ConnectedState
+            && std::chrono::steady_clock::now() < send_data->deadline
+        ){
+            {
+                std::lock_guard<Mutex> lg(send_data->lock);
+                if (send_data->cancelled){
+                    //  Cancelled mid-write; the caller has already been
+                    //  woken with the count written so far.
+                    break;
+                }
+            }
+            qint64 current_sent = sock->write(ptr, remaining);
+            if (current_sent <= 0){
+                //  The kernel's send buffer is full. Wait for some of it
+                //  to drain, then try again.
+                sock->waitForBytesWritten(10);
+                continue;
+            }
+            ptr += current_sent;
+            remaining -= (size_t)current_sent;
+            //  Track the running count, so a close that cancels this
+            //  send mid-write reports the bytes written so far.
+            {
+                std::lock_guard<Mutex> lg(send_data->lock);
+                send_data->bytes_sent = send_data->packet.size() - remaining;
+            }
+        }
+        bytes_sent = send_data->packet.size() - remaining;
+    }
+
+    {
+        std::lock_guard<Mutex> lg(m_lock);
+        //  "close()"/"close_connection()" may already have claimed this
+        //  send; only remove it if it still owns its slot.
+        m_inflight_sends.erase(
+            std::remove(
+                m_inflight_sends.begin(),
+                m_inflight_sends.end(),
+                send_data
+            ),
+            m_inflight_sends.end()
+        );
+    }
+
+    {
+        std::lock_guard<Mutex> lg(send_data->lock);
+        send_data->bytes_sent = bytes_sent;
+        send_data->done = true;
+    }
+    send_data->cv.notify_all();
+}
+
+std::unique_ptr<QTcpServer> ServerSocket_Qt::make_server(const std::string& address, uint16_t port){
+    auto server = std::make_unique<QTcpServer>();
+    if (!server->listen(QHostAddress(QString::fromStdString(address)), port)){
+        std::lock_guard<Mutex> lg(m_lock);
+        m_listen_error = server->errorString().toStdString();
+    }
+
+    {
+        std::lock_guard<Mutex> lg(m_lock);
+        m_event_thread = QThread::currentThread();
+    }
+
+    QObject::connect(
+        this, &ServerSocket_Qt::internal_send,
+        server.get(), [this](QSharedPointer<SendData> send_data){
+            on_send(send_data);
+        }
+    );
+    QObject::connect(
+        this, &ServerSocket_Qt::internal_close_connection,
+        server.get(), [this](QSharedPointer<CloseCompletion> completion){
+            on_close_connection(completion);
+        }
+    );
+    QObject::connect(
+        server.get(), &QTcpServer::newConnection,
+        server.get(), [this]{
+            on_new_connection();
+        }
+    );
+
+    return server;
+}
+
+}
diff --git a/Common/Cpp/Sockets/ServerSocket_Qt.h b/Common/Cpp/Sockets/ServerSocket_Qt.h
new file mode 100644
index 0000000000..0fab4731ee
--- /dev/null
+++ b/Common/Cpp/Sockets/ServerSocket_Qt.h
@@ -0,0 +1,165 @@
+/*  Server Socket (Qt)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_ServerSocket_Qt_H
+#define PokemonAutomation_ServerSocket_Qt_H
+
+#include <chrono>
+#include <string>
+#include <atomic>
+#include <vector>
+#include <QObject>
+#include <QSharedPointer>
+#include "Common/Cpp/Concurrency/Mutex.h"
+#include "Common/Cpp/Concurrency/ConditionVariable.h"
+#include "AbstractServerSocket.h"
+
+class QThread;
+class QTcpServer;
+class QTcpSocket;
+
+namespace PokemonAutomation{
+
+
+class ThreadPool;
+
+
+class ServerSocket_Qt final : public QObject, public AbstractServerSocket{
+    Q_OBJECT
+
+    //  Carries shared ownership (the signals pass it by value) so that a call still
+    //  queued when the caller times out, or when "close()" destroys the server and
+    //  Qt discards the pending call, keeps the payload alive exactly as long as the
+    //  event itself: the handler's copy outlives a timed-out caller, and a
+    //  discarded event leaves the caller's copy as the last reference.
+    struct SendData{
+        std::string packet;
+        //  The event-thread write loop stops at this deadline, so a send
+        //  that can never complete (a client that never reads) cannot pin
+        //  the server's event thread forever and block "close()". "max()"
+        //  means no deadline (the infinite default).
+        std::chrono::steady_clock::time_point deadline = std::chrono::steady_clock::time_point::max();
+        //  The running byte count: the write loop updates it as it goes,
+        //  so "close()"/"close_connection()" cancelling the send mid-write
+        //  can report the bytes written so far (best effort).
+        size_t bytes_sent = 0;
+        //  Set by "close()"/"close_connection()" when they cancel the
+        //  send; the queued write loop then finishes without writing.
+        bool cancelled = false;
+        //  Set when the event-thread write loop finishes or when
+        //  "close()"/"close_connection()" cancel the send.
+        bool done = false;
+
+        Mutex lock;
+        ConditionVariable cv;
+    };
+
+    //  Synchronizes "close_connection()" with the QTcpServer's event thread when
+    //  called from another thread. Lifetime as SendData.
+    struct CloseCompletion{
+        Mutex lock;
+        ConditionVariable cv;
+        bool done = false;
+    };
+
+public:
+    ServerSocket_Qt(ThreadPool&){}
+
+    virtual ~ServerSocket_Qt(){
+        close();
+    }
+
+    //  Binds to "address" and listens on "port" on the Qt event thread. This
+    //  blocks until the QTcpServer has been created on that thread.
+    virtual void start(const std::string& address, uint16_t port) override;
+
+    //  Closes the active connection, if any, and keeps listening. It
+    //  cancels the in-flight "send()" calls: their callers return
+    //  promptly with the number of bytes actually written so far (best
+    //  effort). It is safe to call from within a listener callback.
+    virtual void close_connection() override;
+
+    //  Stops the server, destroys the QTcpServer (and its connection
+    //  socket), and returns the socket to State::NOT_RUNNING so "start()"
+    //  can be called again. This blocks until the QTcpServer has been
+    //  destroyed, so any in-flight listener callback is finished by the
+    //  time it returns. It is safe to call multiple times.
+    //
+    //  It cancels the in-flight "send()" calls the same way
+    //  "close_connection()" does: their callers return promptly with the
+    //  number of bytes actually written so far (best effort).
+    //
+    //  This must not be called from within a listener callback, since the
+    //  callbacks run on the QTcpServer's event thread and this destroys the
+    //  server that is running them.
+    virtual void close() noexcept override;
+
+    virtual size_t send(
+        const void* data,
+        size_t bytes,
+        std::chrono::milliseconds timeout = std::chrono::milliseconds::max()
+    ) override;
+
+
+signals:
+    void internal_send(QSharedPointer<SendData> send_data);
+    void internal_close_connection(QSharedPointer<CloseCompletion> completion);
+
+
+private:
+    //  Runs on the QTcpServer's event thread.
+    void on_new_connection();
+
+    //  The active connection ended, or was aborted by "close_connection()".
+    //  Only the first of the (errorOccurred, disconnected) signals for a
+    //  given connection fires a callback, and "on_disconnect" is not fired
+    //  for a connection closed by "close_connection()" or "close()".
+    //  Runs on the QTcpServer's event thread.
+    void connection_lost(QTcpSocket* sock, const std::string& error_message);
+
+    //  Runs on the QTcpServer's event thread.
+    void on_close_connection(QSharedPointer<CloseCompletion> completion);
+
+    //  Runs on the QTcpServer's event thread. The context object is the
+    //  server, so the call still runs if the connection socket has already
+    //  been aborted, and it just reports 0 bytes in that case.
+    void on_send(QSharedPointer<SendData> send_data);
+
+    //  Cancels the in-flight "send()" calls: marks them done so their
+    //  callers return promptly with the bytes written so far (best
+    //  effort). The queued write loops finish without writing. The
+    //  shared ownership keeps each packet alive until its queued call
+    //  runs (or is discarded with the server).
+    void cancel_inflight_sends();
+
+    std::unique_ptr<QTcpServer> make_server(const std::string& address, uint16_t port);
+
+private:
+    Mutex m_lock;
+    ConditionVariable m_cv;
+
+    QTcpServer* m_server = nullptr;
+    QTcpSocket* m_socket = nullptr;
+    QThread* m_event_thread = nullptr;
+    bool m_close_requested = false;
+    bool m_starting = false;
+
+    //  The "send()" calls that are queued on the event thread but not
+    //  finished yet, so that "close()"/"close_connection()" can cancel
+    //  them (and wake their callers) before the socket is destroyed. The
+    //  write loops remove their entry when they finish. Protected by
+    //  m_lock.
+    std::vector<QSharedPointer<SendData>> m_inflight_sends;
+
+    //  Written on the event thread by "make_server()", read after
+    //  "add_object()" has returned.
+    std::string m_listen_error;
+};
+
+
+
+}
+#endif
\ No newline at end of file
diff --git a/Common/Cpp/Sockets/ServerSocket_WinSocket.cpp b/Common/Cpp/Sockets/ServerSocket_WinSocket.cpp
new file mode 100644
index 0000000000..b269dc69a7
--- /dev/null
+++ b/Common/Cpp/Sockets/ServerSocket_WinSocket.cpp
@@ -0,0 +1,519 @@
+/*  Server Socket (Windows)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifdef _WIN32
+
+#include <cstring>
+#include <mutex>
+#include <chrono>
+#include <thread>
+#include <iostream>
+#include <algorithm>
+#include <winsock2.h>
+#include "Common/Cpp/Concurrency/ThreadPool.h"
+#include "ServerSocket_WinSocket.h"
+
+#pragma comment(lib, "Ws2_32.lib")
+
+namespace PokemonAutomation{
+
+void ServerSocket_WinSocket::ensure_wsa_started(){
+    static std::once_flag flag;
+    std::call_once(flag, [](){
+        WSADATA wsa_data;
+        int ret = WSAStartup(MAKEWORD(2, 2), &wsa_data);
+        if (ret != 0){
+            try{
+                std::cout << "WSAStartup() failed: WSA Error Code = " << ret << std::endl;
+            }catch (...){}
+        }
+    });
+}
+
+void ServerSocket_WinSocket::start(const std::string& address, uint16_t port){
+    //  Winsock has to be started before any of its functions can be
+    //  used. Call it here, on the calling thread, so it is done before
+    //  any socket is created (a client created right after "start()"
+    //  must be able to use Winsock even before the listener thread has
+    //  run).
+    ensure_wsa_started();
+
+    uint64_t generation = 0;
+    {
+        std::lock_guard<Mutex> lg(m_lock);
+        if (m_starting ||
+            m_state.load(std::memory_order_relaxed) != State::NOT_RUNNING
+        ){
+            return;
+        }
+        m_starting = true;
+        m_generation++;
+        generation = m_generation;
+    }
+
+    //  Use the plain dispatch() rather than dispatch_now_blocking():
+    //  start() may be called from a thread that is itself running on
+    //  this pool, and blocking here until a pool thread is free could
+    //  deadlock a capped pool.
+    try{
+        AsyncTask task = m_thread_pool.dispatch([=, this]{
+            accept_thread_loop(address, port, generation);
+        });
+        {
+            //  Append, never replace: replacing the slot would destroy
+            //  the previous task's AsyncTask, and its destructor blocks
+            //  until that task has finished. A task from an earlier
+            //  start() may still be running when this start() runs (the
+            //  caller's wait timed out while the pool was starved). It
+            //  notices its stale generation when it gets scheduled and
+            //  exits without listening, so it only has to outlive this
+            //  call; close() joins the whole list.
+            std::lock_guard<Mutex> lg(m_task_lock);
+            m_accept_threads.push_back(std::move(task));
+        }
+    }catch (...){
+        {
+            std::lock_guard<Mutex> lg(m_lock);
+            m_starting = false;
+            m_cv.notify_all();
+        }
+        m_listeners.run_method(
+            &Listener::on_listen_finished,
+            "Failed to start the listener thread."
+        );
+        throw;
+    }
+
+    {
+        std::lock_guard<Mutex> lg(m_lock);
+        m_starting = false;
+        m_cv.notify_all();
+    }
+}
+
+void ServerSocket_WinSocket::close_connection(){
+    SOCKET socket;
+    {
+        std::lock_guard<Mutex> lg(m_lock);
+        if (m_state.load(std::memory_order_relaxed) != State::CONNECTED){
+            return;
+        }
+        m_close_requested = true;
+        m_state.store(State::LISTENING, std::memory_order_release);
+        socket = m_client;
+    }
+    if (socket != INVALID_SOCKET){
+        //  Tells the connection thread to stop; it closes the socket
+        //  itself. This is safe to call from within a listener callback.
+        ::shutdown(socket, SD_BOTH);
+    }
+}
+
+void ServerSocket_WinSocket::close() noexcept{
+    {
+        std::unique_lock<Mutex> lg(m_lock);
+        //  Wait for an in-progress start() to publish the listener task
+        //  before we take the task slots.
+        m_cv.wait(lg, [&]{ return !m_starting; });
+        if (m_state.load(std::memory_order_relaxed) != State::NOT_RUNNING){
+            m_close_requested = true;
+            m_state.store(State::DESTRUCTING, std::memory_order_release);
+            m_closing++;
+        }
+    }
+
+    bool drain = false;
+    {
+        std::lock_guard<Mutex> lg(m_lock);
+        drain = (m_closing == 1);
+    }
+    if (!drain){
+        //  Either nothing was running (m_closing == 0), or another
+        //  close() is already draining the threads (m_closing > 1).
+        //  In the second case, wait for it to finish.
+        std::unique_lock<Mutex> lg(m_lock);
+        m_cv.wait(lg, [&]{
+            return m_state.load(std::memory_order_relaxed) == State::NOT_RUNNING;
+        });
+        return;
+    }
+
+    std::vector<AsyncTask> accept_threads;
+    AsyncTask client_thread;
+    {
+        //  m_task_lock, not m_lock: moving the tasks out destroys the
+        //  old AsyncTask objects, and their destructors wait for the
+        //  tasks to finish - which they can only do if they can acquire
+        //  m_lock.
+        std::lock_guard<Mutex> lg(m_task_lock);
+        accept_threads.swap(m_accept_threads);
+        client_thread = std::move(m_client_thread);
+        m_client_thread = AsyncTask();
+    }
+
+    //  The threads notice the new state within a few milliseconds and
+    //  close their own sockets.
+    for (auto& task : accept_threads){
+        task.wait_and_ignore_exceptions();
+    }
+    client_thread.wait_and_ignore_exceptions();
+
+    {
+        std::lock_guard<Mutex> lg(m_lock);
+        m_state.store(State::NOT_RUNNING, std::memory_order_release);
+        m_close_requested = false;
+        m_closing = 0;
+        m_cv.notify_all();
+    }
+}
+
+size_t ServerSocket_WinSocket::send(const void* data, size_t bytes, std::chrono::milliseconds timeout){
+    SOCKET socket;
+    {
+        std::lock_guard<Mutex> lg(m_lock);
+        socket = m_state.load(std::memory_order_relaxed) == State::CONNECTED
+            ? m_client
+            : INVALID_SOCKET;
+    }
+    if (socket == INVALID_SOCKET){
+        return 0;
+    }
+
+    const char* ptr = (const char*)data;
+    size_t sent = 0;
+
+    //  "time_point::max()" (the infinite default) is never reached; using
+    //  it also avoids overflowing "now() + timeout".
+    const std::chrono::steady_clock::time_point deadline =
+        (timeout == std::chrono::milliseconds::max())
+            ? std::chrono::steady_clock::time_point::max()
+            : std::chrono::steady_clock::now() + timeout;
+
+    while (bytes > 0){
+        {
+            std::lock_guard<Mutex> lg(m_lock);
+            if (m_state.load(std::memory_order_relaxed) != State::CONNECTED){
+                return sent;
+            }
+        }
+        if (std::chrono::steady_clock::now() >= deadline){
+            //  The deadline elapsed with bytes still unwritten; the
+            //  connection is still fine, so just report the partial count.
+            return sent;
+        }
+
+        //  "::send" takes an "int" length, so chunk the send the same
+        //  way the WinSocket client does; sending a payload larger than
+        //  2 GiB in one call would wrap the length negative.
+        constexpr size_t BLOCK_SIZE = (size_t)1 << 30;
+        const int current = (int)std::min<size_t>(bytes, BLOCK_SIZE);
+        int current_sent = ::send(socket, ptr, current, 0);
+        if (current_sent != SOCKET_ERROR){
+            sent += (size_t)current_sent;
+            ptr += current_sent;
+            bytes -= (size_t)current_sent;
+            continue;
+        }
+
+        int error = WSAGetLastError();
+        if (error == WSAEWOULDBLOCK || error == WSAEINPROGRESS){
+            std::this_thread::sleep_for(std::chrono::milliseconds(1));
+            continue;
+        }
+
+        //  WSAECONNRESET, WSAENOTCONN, or any other error: the
+        //  connection is gone.
+        return sent;
+    }
+
+    return sent;
+}
+
+void ServerSocket_WinSocket::report_listen_finished(uint64_t generation, const std::string& error){
+    bool current;
+    {
+        std::lock_guard<Mutex> lg(m_lock);
+        current = (m_generation == generation);
+    }
+    if (current){
+        m_listeners.run_method(&Listener::on_listen_finished, error);
+    }
+}
+
+void ServerSocket_WinSocket::accept_thread_loop(std::string address, uint16_t port, uint64_t generation){
+    SOCKET listen_socket = ::socket(AF_INET, SOCK_STREAM, 0);
+    if (listen_socket == INVALID_SOCKET){
+        report_listen_finished(
+            generation,
+            "socket() failed: WSA Error Code: " + std::to_string(WSAGetLastError())
+        );
+        return;
+    }
+
+    //  No SO_REUSEADDR: on Windows, that option lets another
+    //  socket bind to the same address and port, so a second
+    //  server could steal our port.
+    u_long non_blocking = 1;
+    ioctlsocket(listen_socket, FIONBIO, &non_blocking);
+
+    sockaddr_in server;
+    std::memset(&server, 0, sizeof(server));
+    server.sin_family = AF_INET;
+    server.sin_port = htons(port);
+    server.sin_addr.s_addr = inet_addr(address.c_str());
+
+    if (bind(listen_socket, (struct sockaddr*)&server, sizeof(server)) == SOCKET_ERROR){
+        int error = WSAGetLastError();
+        ::closesocket(listen_socket);
+        report_listen_finished(
+            generation,
+            "bind() failed: WSA Error Code: " + std::to_string(error)
+        );
+        return;
+    }
+
+    if (::listen(listen_socket, 16) == SOCKET_ERROR){
+        int error = WSAGetLastError();
+        ::closesocket(listen_socket);
+        report_listen_finished(
+            generation,
+            "listen() failed: WSA Error Code: " + std::to_string(error)
+        );
+        return;
+    }
+
+    std::string start_error;
+    bool superseded = false;
+    {
+        std::lock_guard<Mutex> lg(m_lock);
+        superseded = m_generation != generation;
+        if (superseded ||
+            m_state.load(std::memory_order_relaxed) == State::DESTRUCTING
+        ){
+            //  A newer start() or close() won the race.
+            start_error = "The server was replaced or closed before it could start listening.";
+        }else{
+            m_listen = listen_socket;
+            listen_socket = INVALID_SOCKET;
+            m_state.store(State::LISTENING, std::memory_order_release);
+        }
+    }
+    if (listen_socket != INVALID_SOCKET){
+        ::closesocket(listen_socket);
+    }
+
+    if (superseded){
+        //  The attempt that started this task gave up on it while it was
+        //  still starting up (its wait timed out). A newer attempt owns
+        //  the listeners now; reporting this result would only confuse
+        //  that attempt, so exit without touching them.
+        return;
+    }
+
+    m_listeners.run_method(&Listener::on_listen_finished, start_error);
+    if (!start_error.empty()){
+        return;
+    }
+
+    //  Accept loop. Runs for the whole lifetime of the server: it keeps
+    //  polling while a connection is active, and rejects new clients in
+    //  the meantime.
+    while (true){
+        SOCKET listen;
+        {
+            std::lock_guard<Mutex> lg(m_lock);
+            State state = m_state.load(std::memory_order_relaxed);
+            if (state == State::DESTRUCTING ||
+                state == State::NOT_RUNNING ||
+                m_generation != generation
+            ){
+                break;
+            }
+            listen = m_listen;
+        }
+
+        fd_set read_set;
+        FD_ZERO(&read_set);
+        FD_SET(listen, &read_set);
+        timeval tv;
+        tv.tv_sec = 0;
+        tv.tv_usec = 10000;
+        int ret = ::select(0, &read_set, nullptr, nullptr, &tv);
+        if (ret == SOCKET_ERROR){
+            if (WSAGetLastError() == WSAEINTR){
+                continue;
+            }
+            break;
+        }
+        if (ret == 0){
+            continue;
+        }
+
+        SOCKET client_socket = ::accept(listen, nullptr, nullptr);
+        if (client_socket == INVALID_SOCKET){
+            int error = WSAGetLastError();
+            if (error == WSAEWOULDBLOCK || error == WSAEINPROGRESS){
+                continue;
+            }
+            break;
+        }
+
+        bool rejected = false;
+        bool accepted = false;
+        {
+            std::lock_guard<Mutex> lg(m_lock);
+            State state = m_state.load(std::memory_order_relaxed);
+            if (state == State::DESTRUCTING || state == State::NOT_RUNNING){
+                ::closesocket(client_socket);
+                break;
+            }
+            if (state == State::CONNECTED){
+                //  A client is already connected: reject this one.
+                ::closesocket(client_socket);
+                rejected = true;
+            }else{
+                u_long client_non_blocking = 1;
+                ioctlsocket(client_socket, FIONBIO, &client_non_blocking);
+                m_client = client_socket;
+                m_close_requested = false;
+                m_state.store(State::CONNECTED, std::memory_order_release);
+                accepted = true;
+            }
+        }
+
+        if (accepted){
+            //  Start the connection thread without holding m_lock.
+            //  The assignment to m_client_thread destroys the previous
+            //  connection task's AsyncTask, whose destructor waits for
+            //  that task to finish - and that task may be blocked on
+            //  m_lock.
+            try{
+                AsyncTask task = m_thread_pool.dispatch([this]{
+                    connection_thread_loop();
+                });
+                std::lock_guard<Mutex> lg(m_task_lock);
+                m_client_thread = std::move(task);
+            }catch (...){
+                //  The connection thread could not be started. Drop
+                //  this connection and keep listening.
+                std::lock_guard<Mutex> lg(m_lock);
+                ::closesocket(client_socket);
+                m_client = INVALID_SOCKET;
+                m_state.store(State::LISTENING, std::memory_order_release);
+            }
+        }
+
+        if (rejected){
+            m_listeners.run_method(&Listener::on_connect_rejected);
+        }
+    }
+
+    SOCKET listen;
+    {
+        std::lock_guard<Mutex> lg(m_lock);
+        listen = m_listen;
+        m_listen = INVALID_SOCKET;
+    }
+    if (listen != INVALID_SOCKET){
+        ::closesocket(listen);
+    }
+}
+
+void ServerSocket_WinSocket::connection_thread_loop(){
+    m_listeners.run_method(&Listener::on_thread_start);
+
+    SOCKET socket;
+    bool active;
+    {
+        std::lock_guard<Mutex> lg(m_lock);
+        socket = m_client;
+        active = (m_state.load(std::memory_order_relaxed) == State::CONNECTED);
+        if (!active && m_client == socket){
+            m_client = INVALID_SOCKET;
+        }
+    }
+    if (!active){
+        //  The connection was closed before this thread started.
+        ::closesocket(socket);
+        return;
+    }
+
+    m_listeners.run_method(&Listener::on_connect);
+
+    constexpr size_t BUFFER_SIZE = 4096;
+    char buffer[BUFFER_SIZE];
+    std::string error;
+
+    while (true){
+        {
+            std::lock_guard<Mutex> lg(m_lock);
+            if (m_state.load(std::memory_order_relaxed) != State::CONNECTED){
+                break;
+            }
+        }
+
+        //  The socket is non-blocking, so this returns immediately. It is
+        //  deliberately called without holding m_lock: the state check
+        //  above and the result handling below are the only parts that
+        //  need the lock, and no socket call should stretch it.
+        int bytes = ::recv(socket, buffer, (int)BUFFER_SIZE, 0);
+
+        if (bytes > 0){
+            //  A new connection may have taken over while we were
+            //  reading: only dispatch the data if we still are the
+            //  active connection.
+            bool still_active;
+            {
+                std::lock_guard<Mutex> lg(m_lock);
+                still_active = (m_client == socket);
+            }
+            if (!still_active){
+                break;
+            }
+            m_listeners.run_method(&Listener::on_receive_data, buffer, (size_t)bytes);
+            continue;
+        }
+
+        if (bytes == SOCKET_ERROR){
+            int error_no = WSAGetLastError();
+            if (error_no == WSAEWOULDBLOCK || error_no == WSAEINPROGRESS){
+                //  No data yet.
+                std::this_thread::sleep_for(std::chrono::milliseconds(1));
+                continue;
+            }
+            if (error_no == WSAEINTR){
+                continue;
+            }
+            error = "Receive error (WSA Error Code " + std::to_string(error_no) + ")";
+        }else if (bytes == 0){
+            error = "Connection closed by client.";
+        }
+        break;
+    }
+
+    bool report_disconnect;
+    {
+        std::lock_guard<Mutex> lg(m_lock);
+        report_disconnect = false;
+        if (m_client == socket){
+            //  Still the active connection (or it was closed before a
+            //  new one took over): we own the socket and the state.
+            m_client = INVALID_SOCKET;
+            if (m_state.load(std::memory_order_relaxed) == State::CONNECTED){
+                m_state.store(State::LISTENING, std::memory_order_release);
+                report_disconnect = !m_close_requested;
+            }
+        }
+    }
+    ::closesocket(socket);
+    if (report_disconnect){
+        m_listeners.run_method(&Listener::on_disconnect, error);
+    }
+}
+
+}
+
+#endif
diff --git a/Common/Cpp/Sockets/ServerSocket_WinSocket.h b/Common/Cpp/Sockets/ServerSocket_WinSocket.h
new file mode 100644
index 0000000000..e12074c2af
--- /dev/null
+++ b/Common/Cpp/Sockets/ServerSocket_WinSocket.h
@@ -0,0 +1,110 @@
+/*  Server Socket (Windows)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_ServerSocket_WinSocket_H
+#define PokemonAutomation_ServerSocket_WinSocket_H
+
+#include <string>
+#include <vector>
+#include <atomic>
+#include <chrono>
+#include <winsock2.h>
+#include "Common/Cpp/Concurrency/AsyncTask.h"
+#include "Common/Cpp/Concurrency/ConditionVariable.h"
+#include "Common/Cpp/Concurrency/Mutex.h"
+#include "AbstractServerSocket.h"
+
+namespace PokemonAutomation{
+
+
+class ThreadPool;
+
+
+
+class ServerSocket_WinSocket final : public AbstractServerSocket{
+public:
+    ServerSocket_WinSocket(ThreadPool& thread_pool)
+        : m_thread_pool(thread_pool)
+    {}
+    virtual ~ServerSocket_WinSocket(){
+        close();
+    }
+
+    virtual void start(const std::string& address, uint16_t port) override;
+
+    //  Closes the active connection and keeps listening. The connection
+    //  thread stops and closes the socket itself; an in-flight "send()" is
+    //  cancelled and returns promptly with the bytes written so far (the
+    //  send loop re-checks the state every iteration). Safe to call from
+    //  within a listener callback.
+    virtual void close_connection() override;
+
+    //  Stops the server. It cancels any in-flight "send()" the same way
+    //  "close_connection()" does, and blocks until the worker threads have
+    //  exited, so it must not be called from within a listener callback.
+    virtual void close() noexcept override;
+
+    virtual size_t send(
+        const void* data,
+        size_t bytes,
+        std::chrono::milliseconds timeout = std::chrono::milliseconds::max()
+    ) override;
+
+
+private:
+    //  Winsock has to be started before any of its functions can be used, and
+    //  nothing else in the program calls WSAStartup, so call it exactly once
+    //  before the first socket is created. We deliberately never call
+    //  WSACleanup: it is a process-wide, reference-counted operation, and
+    //  other parts of the process (Qt) may be using Winsock as well.
+    static void ensure_wsa_started();
+
+    void accept_thread_loop(std::string address, uint16_t port, uint64_t generation);
+    void connection_thread_loop();
+
+    //  "on_listen_finished" callback, but only for a task that still owns
+    //  the server. A task whose generation is stale (a newer start() ran
+    //  while it was still starting up) must stay silent, or its result
+    //  would corrupt the attempt that replaced it.
+    void report_listen_finished(uint64_t generation, const std::string& error);
+
+
+private:
+    ThreadPool& m_thread_pool;
+    Mutex m_lock;
+    ConditionVariable m_cv;
+    bool m_starting = false;
+    int m_closing = 0;
+
+    //  Increments on every start(). The accept task captures its own
+    //  generation so that a task left behind by a timed-out attempt can
+    //  tell it was replaced when it finally gets scheduled.
+    uint64_t m_generation = 0;
+
+    //  Protects m_accept_threads and m_client_thread. Kept separate from
+    //  m_lock because the task's lifetime interacts with it: joining a
+    //  task waits for it to exit, and exiting requires m_lock. Holding
+    //  m_lock while a task slot is destroyed would deadlock, so slot
+    //  operations happen under m_task_lock with m_lock released.
+    Mutex m_task_lock;
+
+    SOCKET m_listen = INVALID_SOCKET;
+    SOCKET m_client = INVALID_SOCKET;
+    bool m_close_requested = false;
+
+    //  One task per start() call. start() must never destroy the previous
+    //  task's AsyncTask here: its destructor blocks until the task has
+    //  finished, and a task from an earlier attempt may still be running
+    //  (the caller's wait timed out while the pool was starved). close()
+    //  joins the whole list.
+    std::vector<AsyncTask> m_accept_threads;
+    AsyncTask m_client_thread;
+};
+
+
+
+}
+#endif
diff --git a/Common/Cpp/Sockets/Sockets_Tests.cpp b/Common/Cpp/Sockets/Sockets_Tests.cpp
new file mode 100644
index 0000000000..d4e2c014e9
--- /dev/null
+++ b/Common/Cpp/Sockets/Sockets_Tests.cpp
@@ -0,0 +1,2362 @@
+/*  Sockets Tests
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  Loopback tests that combine a ClientSocket and a ServerSocket against
+ *  each other on 127.0.0.1. The test logic is written against the abstract
+ *  classes, and is instantiated for every backend that compiles on the
+ *  current platform (Qt: always, POSIX: on non-Windows, WinSocket: on
+ *  Windows; each backend lands in its own PR), so that every platform
+ *  runs 2 of the 3 backends and CI as a whole covers all 3.
+ *
+ */
+
+#include <atomic>
+#include <chrono>
+#include <cstdint>
+#include <cstring>
+#include <functional>
+#include <mutex>
+#include <random>
+#include <string>
+#include <thread>
+#include <type_traits>
+#include <vector>
+#include "Common/Cpp/Concurrency/AsyncTask.h"
+#include "Common/Cpp/Concurrency/ConditionVariable.h"
+#include "Common/Cpp/Concurrency/Mutex.h"
+#include "Common/Cpp/Concurrency/ThreadPool.h"
+#include "Common/Cpp/Sockets/ClientSocket_Qt.h"
+#include "Common/Cpp/Sockets/ServerSocket_Qt.h"
+#ifndef _WIN32
+#include "Common/Cpp/Sockets/ClientSocket_POSIX.h"
+#include "Common/Cpp/Sockets/ServerSocket_POSIX.h"
+#endif
+#ifdef _WIN32
+#include "Common/Cpp/Sockets/ClientSocket_WinSocket.h"
+#include "Common/Cpp/Sockets/ServerSocket_WinSocket.h"
+#endif
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "Sockets_Tests.h"
+
+namespace PokemonAutomation{
+
+namespace{
+
+
+struct Waiter{
+    Mutex lock;
+    ConditionVariable cv;
+
+    bool wait_for(std::chrono::milliseconds timeout, const std::function<bool()>& pred){
+        std::unique_lock<Mutex> lg(lock);
+        return cv.wait_for(lg, timeout, pred);
+    }
+
+    void notify(){
+        std::lock_guard<Mutex> lg(lock);
+        cv.notify_all();
+    }
+};
+
+
+struct ClientListener : AbstractClientSocket::Listener{
+    Waiter waiter;
+    std::atomic<int> connect_finished{0};
+    std::string last_connect_error;
+    std::atomic<int> disconnected{0};
+    std::string last_disconnect_error;
+    std::vector<uint8_t> received;
+
+    virtual void on_connect_finished(const std::string& error_message) override{
+        connect_finished++;
+        last_connect_error = error_message;
+        waiter.notify();
+    }
+
+    virtual void on_receive_data(const void* data, size_t bytes) override{
+        const uint8_t* ptr = (const uint8_t*)data;
+        received.insert(received.end(), ptr, ptr + bytes);
+        waiter.notify();
+    }
+
+    virtual void on_disconnect(const std::string& error_message) override{
+        disconnected++;
+        last_disconnect_error = error_message;
+        waiter.notify();
+    }
+};
+
+
+struct ServerListener : AbstractServerSocket::Listener{
+    Waiter waiter;
+    std::atomic<int> listen_finished{0};
+    std::string last_listen_error;
+    std::atomic<int> connected{0};
+    std::atomic<int> rejected{0};
+    std::atomic<int> disconnected{0};
+    std::string last_disconnect_error;
+    std::atomic<uint64_t> bytes_received{0};
+
+    //  When set, received data is echoed back to the client.
+    AbstractServerSocket* server = nullptr;
+
+    virtual void on_listen_finished(const std::string& error_message) override{
+        listen_finished++;
+        last_listen_error = error_message;
+        waiter.notify();
+    }
+
+    virtual void on_connect() override{
+        connected++;
+        waiter.notify();
+    }
+
+    virtual void on_connect_rejected() override{
+        rejected++;
+        waiter.notify();
+    }
+
+    virtual void on_receive_data(const void* data, size_t bytes) override{
+        bytes_received += bytes;
+        if (server != nullptr){
+            server->send(data, bytes);
+        }
+        waiter.notify();
+    }
+
+    virtual void on_disconnect(const std::string& error_message) override{
+        disconnected++;
+        last_disconnect_error = error_message;
+        waiter.notify();
+    }
+};
+
+
+//  The parallel test runner can starve threads for long stretches on
+//  loaded CI machines, where wall-clock assertions then fail tests that
+//  would pass on a healthy machine. A small fixed workload (a 32 MB
+//  copy plus a 100 ms sleep) should take well under a second on a
+//  healthy core; if it takes more than 2 s, the calling thread is being
+//  starved, and the timing assertions of the test that called this
+//  cannot be trusted - that test should skip instead of fail.
+bool timing_unreliable(){
+    const size_t SIZE = 32u << 20;
+    std::vector<uint8_t> src(SIZE, 0x5A), dst(SIZE);
+    const auto t0 = std::chrono::steady_clock::now();
+    std::memcpy(dst.data(), src.data(), SIZE);
+    std::this_thread::sleep_for(std::chrono::milliseconds(100));
+    return std::chrono::steady_clock::now() - t0 > std::chrono::seconds(2);
+}
+
+
+//  Shared budget for the connect/listen/data waits below: long enough
+//  that a moderately loaded machine can make it, short enough that a
+//  real regression is still reported within the CI timeouts.
+constexpr std::chrono::seconds SOCKET_TEST_WAIT{60};
+
+
+template <typename ClientSocketType, typename ServerSocketType>
+class TestSockets : public UnitTest{
+public:
+    TestSockets(ThreadPool& thread_pool, std::string name)
+        : UnitTest(std::move(name))
+        , m_thread_pool(thread_pool)
+    {
+        m_threads = 2;
+    }
+
+
+protected:
+    bool start_server(ServerSocketType& server, ServerListener& listener, uint16_t& port) const{
+        //  "listen_finished" is never reset between attempts, so each
+        //  attempt records where the counter stands and waits for it to
+        //  advance. Waiting on "> 0" instead would return immediately on a
+        //  later attempt - with the previous attempt's stale result - and
+        //  the loop could hand back a port the server is not actually
+        //  listening on (the previous attempt's start() was rejected
+        //  because the server was already running on the other port).
+        for (int attempt = 0; attempt < 8; attempt++){
+            uint16_t candidate;
+            {
+                std::lock_guard<Mutex> lg(m_rng_lock);
+                candidate = (uint16_t)(40000 + m_rng() % 20000);
+            }
+            const int finished_before = listener.listen_finished.load();
+            server.start("127.0.0.1", candidate);
+            if (!listener.waiter.wait_for(
+                SOCKET_TEST_WAIT,
+                [finished_before, &listener]{
+                    return listener.listen_finished.load() > finished_before;
+                }
+            )){
+                continue;
+            }
+            if (listener.last_listen_error.empty()){
+                port = candidate;
+                return true;
+            }
+        }
+        return false;
+    }
+
+    bool connect_client(
+        ClientSocketType& client,
+        ClientListener& listener,
+        uint16_t port,
+        int expected_connect
+    ) const{
+        client.connect("127.0.0.1", port);
+        return listener.waiter.wait_for(
+            SOCKET_TEST_WAIT,
+            [&listener, expected_connect]{
+                return listener.connect_finished.load() >= expected_connect;
+            }
+        );
+    }
+
+protected:
+    ThreadPool& m_thread_pool;
+
+private:
+    mutable Mutex m_rng_lock;
+    mutable std::mt19937 m_rng{std::random_device{}()};
+};
+
+
+//  Connect, send a packet, verify the echo, disconnect, and check that the
+//  server observed both the connect and the disconnect.
+template <typename ClientSocketType, typename ServerSocketType>
+class Test_Sockets_Echo : public TestSockets<ClientSocketType, ServerSocketType>{
+public:
+    using TestSockets<ClientSocketType, ServerSocketType>::TestSockets;
+
+    virtual UnitTestResult run(Logger& logger, CancellableScope& scope) const override{
+        if (timing_unreliable()){
+            return UnitTestResult(
+                UnitTestResult::SKIPPED,
+                "Machine too starved for a timing-sensitive socket test (timing_unreliable())."
+            );
+        }
+        ServerSocketType server(this->m_thread_pool);
+        ServerListener server_listener;
+        server_listener.server = &server;
+        server.add_listener(server_listener);
+
+        uint16_t port;
+        if (!this->start_server(server, server_listener, port)){
+            //  A listen-phase failure on a starved machine is the
+            //  machine's fault, not the socket's.
+            if (timing_unreliable()){
+                return UnitTestResult(
+                    UnitTestResult::SKIPPED,
+                    "The server did not start listening on a starved machine."
+                );
+            }
+            return "Failed to start the server";
+        }
+
+        bool ok = false;
+        std::string error;
+        {
+            ClientSocketType client(this->m_thread_pool);
+            ClientListener client_listener;
+            client.add_listener(client_listener);
+
+            if (!this->connect_client(client, client_listener, port, 1)){
+                error = "The client did not finish connecting";
+            }else if (!client_listener.last_connect_error.empty()){
+                error = "The client failed to connect: " + client_listener.last_connect_error;
+            }else if (!server_listener.waiter.wait_for(
+                SOCKET_TEST_WAIT,
+                [&server_listener]{ return server_listener.connected.load() >= 1; }
+            )){
+                error = "The server did not call on_connect";
+            }else if (client.send("hello world", 11) != 11){
+                error = "The client did not send all 11 bytes";
+            }else if (!server_listener.waiter.wait_for(
+                SOCKET_TEST_WAIT,
+                [&server_listener]{ return server_listener.bytes_received.load() >= 11; }
+            )){
+                error = "The server did not receive the data";
+            }else if (!client_listener.waiter.wait_for(
+                SOCKET_TEST_WAIT,
+                [&client_listener]{ return client_listener.received.size() >= 11; }
+            )){
+                error = "The client did not receive the echo";
+            }else if (std::memcmp(client_listener.received.data(), "hello world", 11) != 0){
+                error = "The echo data was corrupted";
+            }else{
+                ok = true;
+            }
+
+            client.close();
+        }
+
+        if (!server_listener.waiter.wait_for(
+            SOCKET_TEST_WAIT,
+            [&server_listener]{ return server_listener.disconnected.load() >= 1; }
+        )){
+            error = "The server did not call on_disconnect";
+        }
+
+        server.close();
+
+        if (!ok && !error.empty()){
+            return error;
+        }
+        return true;
+    }
+};
+
+
+//  Zero-length sends must be a valid no-op that returns 0 without
+//  touching the connection.
+template <typename ClientSocketType, typename ServerSocketType>
+class Test_Sockets_ZeroLengthSend : public TestSockets<ClientSocketType, ServerSocketType>{
+public:
+    using TestSockets<ClientSocketType, ServerSocketType>::TestSockets;
+
+    virtual UnitTestResult run(Logger& logger, CancellableScope& scope) const override{
+        if (timing_unreliable()){
+            return UnitTestResult(
+                UnitTestResult::SKIPPED,
+                "Machine too starved for a timing-sensitive socket test (timing_unreliable())."
+            );
+        }
+        ServerSocketType server(this->m_thread_pool);
+        ServerListener server_listener;
+        server_listener.server = &server;
+        server.add_listener(server_listener);
+
+        uint16_t port;
+        if (!this->start_server(server, server_listener, port)){
+            //  A listen-phase failure on a starved machine is the
+            //  machine's fault, not the socket's.
+            if (timing_unreliable()){
+                return UnitTestResult(
+                    UnitTestResult::SKIPPED,
+                    "The server did not start listening on a starved machine."
+                );
+            }
+            return "Failed to start the server";
+        }
+
+        bool ok = false;
+        std::string error;
+        {
+            ClientSocketType client(this->m_thread_pool);
+            ClientListener client_listener;
+            client.add_listener(client_listener);
+
+            if (!this->connect_client(client, client_listener, port, 1)){
+                error = "The client did not finish connecting";
+            }else if (client.send("", 0) != 0){
+                error = "A zero-length client send did not return 0";
+            }else if (server.send("", 0) != 0){
+                error = "A zero-length server send did not return 0";
+            }else{
+                //  The connection must still be usable afterwards.
+                if (client.send("ping", 4) != 4){
+                    error = "The client did not send all 4 bytes after a zero-length send";
+                }else if (!server_listener.waiter.wait_for(
+                    SOCKET_TEST_WAIT,
+                    [&server_listener]{ return server_listener.bytes_received.load() >= 4; }
+                )){
+                    error = "The server did not receive the data";
+                }else if (!client_listener.waiter.wait_for(
+                    SOCKET_TEST_WAIT,
+                    [&client_listener]{ return client_listener.received.size() >= 4; }
+                )){
+                    error = "The client did not receive the echo";
+                }else if (std::memcmp(client_listener.received.data(), "ping", 4) != 0){
+                    error = "The echo data was corrupted";
+                }else{
+                    ok = true;
+                }
+            }
+
+            client.close();
+        }
+
+        server.close();
+
+        if (!ok && !error.empty()){
+            return error;
+        }
+        return true;
+    }
+};
+
+
+//  Transfer a megabyte each way (the server echoes it back) and verify the
+//  data integrity.
+template <typename ClientSocketType, typename ServerSocketType>
+class Test_Sockets_LargeTransfer : public TestSockets<ClientSocketType, ServerSocketType>{
+public:
+    using TestSockets<ClientSocketType, ServerSocketType>::TestSockets;
+
+    virtual UnitTestResult run(Logger& logger, CancellableScope& scope) const override{
+        if (timing_unreliable()){
+            return UnitTestResult(
+                UnitTestResult::SKIPPED,
+                "Machine too starved for a timing-sensitive socket test (timing_unreliable())."
+            );
+        }
+        constexpr size_t SIZE = 1 << 20;
+        std::vector<uint8_t> payload(SIZE);
+        for (size_t i = 0; i < SIZE; i++){
+            payload[i] = (uint8_t)(i % 251);
+        }
+
+        ServerSocketType server(this->m_thread_pool);
+        ServerListener server_listener;
+        server_listener.server = &server;
+        server.add_listener(server_listener);
+
+        uint16_t port;
+        if (!this->start_server(server, server_listener, port)){
+            //  A listen-phase failure on a starved machine is the
+            //  machine's fault, not the socket's.
+            if (timing_unreliable()){
+                return UnitTestResult(
+                    UnitTestResult::SKIPPED,
+                    "The server did not start listening on a starved machine."
+                );
+            }
+            return "Failed to start the server";
+        }
+
+        bool ok = false;
+        std::string error;
+        {
+            ClientSocketType client(this->m_thread_pool);
+            ClientListener client_listener;
+            client.add_listener(client_listener);
+
+            if (!this->connect_client(client, client_listener, port, 1)){
+                error = "The client did not finish connecting";
+            }else if (!server_listener.waiter.wait_for(
+                SOCKET_TEST_WAIT,
+                [&server_listener]{ return server_listener.connected.load() >= 1; }
+            )){
+                error = "The server did not call on_connect";
+            }else if (client.send(payload.data(), payload.size()) != payload.size()){
+                error = "The client did not send all " + std::to_string(payload.size()) + " bytes";
+            }else if (!server_listener.waiter.wait_for(
+                std::chrono::seconds(30),
+                [&server_listener]{ return server_listener.bytes_received.load() >= SIZE; }
+            )){
+                error = "The server did not receive all the data";
+            }else if (!client_listener.waiter.wait_for(
+                std::chrono::seconds(30),
+                [&client_listener]{ return client_listener.received.size() >= SIZE; }
+            )){
+                error = "The client did not receive all the echo data";
+            }else if (std::memcmp(client_listener.received.data(), payload.data(), SIZE) != 0){
+                error = "The echo data was corrupted";
+            }else{
+                ok = true;
+            }
+
+            client.close();
+        }
+
+        server.close();
+
+        if (!ok && !error.empty()){
+            return error;
+        }
+        return true;
+    }
+};
+
+
+//  Rapidly connect and disconnect many times. Each cycle transfers a
+//  packet to make sure the new connection actually works.
+template <typename ClientSocketType, typename ServerSocketType>
+class Test_Sockets_RapidReconnect : public TestSockets<ClientSocketType, ServerSocketType>{
+public:
+    using TestSockets<ClientSocketType, ServerSocketType>::TestSockets;
+
+    virtual UnitTestResult run(Logger& logger, CancellableScope& scope) const override{
+        if (timing_unreliable()){
+            return UnitTestResult(
+                UnitTestResult::SKIPPED,
+                "Machine too starved for a timing-sensitive socket test (timing_unreliable())."
+            );
+        }
+        constexpr int CYCLES = 50;
+
+        ServerSocketType server(this->m_thread_pool);
+        ServerListener server_listener;
+        server_listener.server = &server;
+        server.add_listener(server_listener);
+
+        uint16_t port;
+        if (!this->start_server(server, server_listener, port)){
+            //  A listen-phase failure on a starved machine is the
+            //  machine's fault, not the socket's.
+            if (timing_unreliable()){
+                return UnitTestResult(
+                    UnitTestResult::SKIPPED,
+                    "The server did not start listening on a starved machine."
+                );
+            }
+            return "Failed to start the server";
+        }
+
+        bool ok = false;
+        std::string error;
+        size_t expected_echo = 0;
+        {
+            ClientSocketType client(this->m_thread_pool);
+            ClientListener client_listener;
+            client.add_listener(client_listener);
+
+            for (int cycle = 0; cycle < CYCLES; cycle++){
+                int cycle_no = cycle + 1;
+
+                if (!this->connect_client(client, client_listener, port, cycle_no)){
+                    error = "The client did not finish connecting (cycle " + std::to_string(cycle_no) + ")";
+                    break;
+                }
+                if (!client_listener.last_connect_error.empty()){
+                    error = "The client failed to connect (cycle " + std::to_string(cycle_no) + "): " + client_listener.last_connect_error;
+                    break;
+                }
+                if (!server_listener.waiter.wait_for(
+                    SOCKET_TEST_WAIT,
+                    [&server_listener, cycle_no]{ return server_listener.connected.load() >= cycle_no; }
+                )){
+                    error = "The server did not call on_connect (cycle " + std::to_string(cycle_no) + ")";
+                    break;
+                }
+
+                std::string packet = "cycle " + std::to_string(cycle_no);
+                expected_echo += packet.size();
+                if (client.send(packet.data(), packet.size()) != packet.size()){
+                    error = "The client did not send the packet (cycle " + std::to_string(cycle_no) + ")";
+                    break;
+                }
+                if (!client_listener.waiter.wait_for(
+                    SOCKET_TEST_WAIT,
+                    [&client_listener, expected_echo]{ return client_listener.received.size() >= expected_echo; }
+                )){
+                    error = "The client did not receive the echo (cycle " + std::to_string(cycle_no) + ")";
+                    break;
+                }
+
+                client.close();
+                if (!server_listener.waiter.wait_for(
+                    SOCKET_TEST_WAIT,
+                    [&server_listener, cycle_no]{ return server_listener.disconnected.load() >= cycle_no; }
+                )){
+                    error = "The server did not call on_disconnect (cycle " + std::to_string(cycle_no) + ")";
+                    break;
+                }
+            }
+
+            if (error.empty()){
+                ok = true;
+            }
+            client.close();
+        }
+
+        server.close();
+
+        if (!ok && !error.empty()){
+            return error;
+        }
+        return true;
+    }
+};
+
+
+//  Send a large packet while the server closes the connection underneath
+//  it: the send must finish (returning however much was written), the
+//  server must go back to listening, and the client must observe the
+//  disconnect. Then the server must accept a new connection.
+template <typename ClientSocketType, typename ServerSocketType>
+class Test_Sockets_SendCloseRace : public TestSockets<ClientSocketType, ServerSocketType>{
+public:
+    using TestSockets<ClientSocketType, ServerSocketType>::TestSockets;
+
+    virtual UnitTestResult run(Logger& logger, CancellableScope& scope) const override{
+        if (timing_unreliable()){
+            return UnitTestResult(
+                UnitTestResult::SKIPPED,
+                "Machine too starved for a timing-sensitive socket test (timing_unreliable())."
+            );
+        }
+        constexpr size_t SIZE = 1 << 20;
+        std::vector<uint8_t> payload(SIZE, 0xAB);
+
+        ServerSocketType server(this->m_thread_pool);
+        ServerListener server_listener;
+        server_listener.server = &server;
+        server.add_listener(server_listener);
+
+        uint16_t port;
+        if (!this->start_server(server, server_listener, port)){
+            //  A listen-phase failure on a starved machine is the
+            //  machine's fault, not the socket's.
+            if (timing_unreliable()){
+                return UnitTestResult(
+                    UnitTestResult::SKIPPED,
+                    "The server did not start listening on a starved machine."
+                );
+            }
+            return "Failed to start the server";
+        }
+
+        bool ok = false;
+        std::string error;
+        {
+            ClientSocketType client(this->m_thread_pool);
+            ClientListener client_listener;
+            client.add_listener(client_listener);
+
+            if (!this->connect_client(client, client_listener, port, 1)){
+                //  A connect-phase failure on a starved machine is the
+                //  machine's fault, not the socket's.
+                if (timing_unreliable()){
+                    return UnitTestResult(
+                        UnitTestResult::SKIPPED,
+                        "The client did not finish connecting on a starved machine."
+                    );
+                }
+                error = "The client did not finish connecting";
+            }else if (!server_listener.waiter.wait_for(
+                SOCKET_TEST_WAIT,
+                [&server_listener]{ return server_listener.connected.load() >= 1; }
+            )){
+                if (timing_unreliable()){
+                    return UnitTestResult(
+                        UnitTestResult::SKIPPED,
+                        "The server did not call on_connect on a starved machine."
+                    );
+                }
+                error = "The server did not call on_connect";
+            }else{
+                std::atomic<size_t> bytes_sent{0};
+                AsyncTask send_task = this->m_thread_pool.dispatch([&client, &payload, &bytes_sent]{
+                    bytes_sent = client.send(payload.data(), payload.size());
+                });
+
+                //  Give the send a head start, then cut the connection from
+                //  the server side.
+                std::this_thread::sleep_for(std::chrono::milliseconds(20));
+                server.close_connection();
+
+                send_task.wait_and_ignore_exceptions();
+
+                //  close_connection() may return with the close still
+                //  pending on a starved event thread (Qt backend), so
+                //  poll for the resulting LISTENING state within the
+                //  shared budget before judging it.
+                {
+                    const auto s0 = std::chrono::steady_clock::now();
+                    while (server.state() != AbstractServerSocket::State::LISTENING
+                        && std::chrono::steady_clock::now() - s0 < SOCKET_TEST_WAIT){
+                        std::this_thread::sleep_for(std::chrono::milliseconds(10));
+                    }
+                }
+                if (server.state() != AbstractServerSocket::State::LISTENING){
+                    if (timing_unreliable()){
+                        return UnitTestResult(
+                            UnitTestResult::SKIPPED,
+                            "The server is not LISTENING after close_connection() on a starved machine."
+                        );
+                    }
+                    error = "The server is not listening after close_connection()";
+                }else if (!client_listener.waiter.wait_for(
+                    SOCKET_TEST_WAIT,
+                    [&client_listener]{ return client_listener.disconnected.load() >= 1; }
+                )){
+                    error = "The client did not observe the disconnect";
+                }else if (bytes_sent.load() > SIZE){
+                    error = "The client reported sending more bytes than the packet size";
+                }else{
+                    //  The server must accept a new connection.
+                    if (!this->connect_client(client, client_listener, port, 2)){
+                        error = "The client did not reconnect";
+                    }else if (!client_listener.last_connect_error.empty()){
+                        error = "The client failed to reconnect: " + client_listener.last_connect_error;
+                    }else if (!server_listener.waiter.wait_for(
+                        SOCKET_TEST_WAIT,
+                        [&server_listener]{ return server_listener.connected.load() >= 2; }
+                    )){
+                        error = "The server did not accept the new connection";
+                    }else if (client.send("x", 1) != 1){
+                        error = "The new connection does not work";
+                    }else{
+                        ok = true;
+                    }
+                }
+            }
+
+            client.close();
+        }
+
+        server.close();
+
+        if (!ok && !error.empty()){
+            return error;
+        }
+        return true;
+    }
+};
+
+
+//  While a client is connected, a second client must be rejected, and the
+//  first client must keep working.
+template <typename ClientSocketType, typename ServerSocketType>
+class Test_Sockets_RejectSecondClient : public TestSockets<ClientSocketType, ServerSocketType>{
+public:
+    using TestSockets<ClientSocketType, ServerSocketType>::TestSockets;
+
+    virtual UnitTestResult run(Logger& logger, CancellableScope& scope) const override{
+        if (timing_unreliable()){
+            return UnitTestResult(
+                UnitTestResult::SKIPPED,
+                "Machine too starved for a timing-sensitive socket test (timing_unreliable())."
+            );
+        }
+        ServerSocketType server(this->m_thread_pool);
+        ServerListener server_listener;
+        server_listener.server = &server;
+        server.add_listener(server_listener);
+
+        uint16_t port;
+        if (!this->start_server(server, server_listener, port)){
+            //  A listen-phase failure on a starved machine is the
+            //  machine's fault, not the socket's.
+            if (timing_unreliable()){
+                return UnitTestResult(
+                    UnitTestResult::SKIPPED,
+                    "The server did not start listening on a starved machine."
+                );
+            }
+            return "Failed to start the server";
+        }
+
+        bool ok = false;
+        std::string error;
+        {
+            ClientSocketType client_a(this->m_thread_pool);
+            ClientListener client_a_listener;
+            client_a.add_listener(client_a_listener);
+
+            ClientSocketType client_b(this->m_thread_pool);
+            ClientListener client_b_listener;
+            client_b.add_listener(client_b_listener);
+
+            if (!this->connect_client(client_a, client_a_listener, port, 1)){
+                error = "Client A did not finish connecting";
+            }else if (!server_listener.waiter.wait_for(
+                SOCKET_TEST_WAIT,
+                [&server_listener]{ return server_listener.connected.load() >= 1; }
+            )){
+                error = "The server did not call on_connect";
+            }else{
+                client_b.connect("127.0.0.1", port);
+                if (!server_listener.waiter.wait_for(
+                    SOCKET_TEST_WAIT,
+                    [&server_listener]{ return server_listener.rejected.load() >= 1; }
+                )){
+                    error = "The server did not reject the second client";
+                }else{
+                    //  The first client must keep working.
+                    if (client_a.send("still here?", 11) != 11){
+                        error = "Client A did not send all 11 bytes";
+                    }else if (!client_a_listener.waiter.wait_for(
+                        SOCKET_TEST_WAIT,
+                        [&client_a_listener]{ return client_a_listener.received.size() >= 11; }
+                    )){
+                        error = "Client A did not receive the echo";
+                    }else if (std::memcmp(client_a_listener.received.data(), "still here?", 11) != 0){
+                        error = "The echo data was corrupted";
+                    }else{
+                        //  Client B must have got a final answer to its
+                        //  connect attempt, whatever it was.
+                        if (!client_b_listener.waiter.wait_for(
+                            SOCKET_TEST_WAIT,
+                            [&client_b_listener]{ return client_b_listener.connect_finished.load() >= 1; }
+                        )){
+                            error = "Client B did not finish its connect attempt";
+                        }else{
+                            ok = true;
+                        }
+                    }
+                }
+            }
+
+            client_a.close();
+            client_b.close();
+        }
+
+        server.close();
+
+        if (!ok && !error.empty()){
+            return error;
+        }
+        return true;
+    }
+};
+
+
+//  Starting a second server on an already-bound port must fail through
+//  on_listen_finished and leave the server not running.
+template <typename ClientSocketType, typename ServerSocketType>
+class Test_Sockets_PortInUse : public TestSockets<ClientSocketType, ServerSocketType>{
+public:
+    using TestSockets<ClientSocketType, ServerSocketType>::TestSockets;
+
+    virtual UnitTestResult run(Logger& logger, CancellableScope& scope) const override{
+        if (timing_unreliable()){
+            return UnitTestResult(
+                UnitTestResult::SKIPPED,
+                "Machine too starved for a timing-sensitive socket test (timing_unreliable())."
+            );
+        }
+        ServerSocketType server(this->m_thread_pool);
+        ServerListener server_listener;
+        server_listener.server = &server;
+        server.add_listener(server_listener);
+
+        uint16_t port;
+        if (!this->start_server(server, server_listener, port)){
+            //  A listen-phase failure on a starved machine is the
+            //  machine's fault, not the socket's.
+            if (timing_unreliable()){
+                return UnitTestResult(
+                    UnitTestResult::SKIPPED,
+                    "The server did not start listening on a starved machine."
+                );
+            }
+            return "Failed to start the server";
+        }
+
+        ServerSocketType second_server(this->m_thread_pool);
+        ServerListener second_listener;
+        second_server.add_listener(second_listener);
+        second_server.start("127.0.0.1", port);
+        if (!second_listener.waiter.wait_for(
+            SOCKET_TEST_WAIT,
+            [&second_listener]{ return second_listener.listen_finished.load() > 0; }
+        )){
+            server.close();
+            return "The second server did not report its start";
+        }
+        if (second_listener.last_listen_error.empty()){
+            server.close();
+            second_server.close();
+            return "The second server succeeded on a port that is already in use";
+        }
+        if (second_server.state() != AbstractServerSocket::State::NOT_RUNNING){
+            server.close();
+            second_server.close();
+            return "The second server is not NOT_RUNNING after a failed start";
+        }
+
+        //  The original server must still work.
+        bool ok = false;
+        {
+            ClientSocketType client(this->m_thread_pool);
+            ClientListener client_listener;
+            client.add_listener(client_listener);
+
+            if (!this->connect_client(client, client_listener, port, 1)){
+                ok = false;
+            }else if (client.send("ok", 2) != 2){
+                ok = false;
+            }else if (!client_listener.waiter.wait_for(
+                SOCKET_TEST_WAIT,
+                [&client_listener]{ return client_listener.received.size() >= 2; }
+            )){
+                ok = false;
+            }else{
+                ok = true;
+            }
+
+            client.close();
+        }
+
+        server.close();
+        second_server.close();
+
+        if (!ok){
+            return "The original server stopped working";
+        }
+        return true;
+    }
+};
+
+
+//  Qt backend only. Stall the server's event thread for longer than the 5 s
+//  completion wait (by blocking inside an on_receive_data callback, which
+//  runs on that thread). close_connection() must then time out and return
+//  cleanly, and the queued handler, which runs after the caller has gone
+//  back, must be able to complete: the completion's shared ownership keeps
+//  it alive until then. Previously this was a stack-use-after-return: the
+//  handler wrote to the dead stack-local CloseCompletion.
+class Test_Sockets_Qt_CompletionLifetime : public UnitTest{
+public:
+    Test_Sockets_Qt_CompletionLifetime(ThreadPool& thread_pool, std::string name)
+        : UnitTest(std::move(name))
+        , m_thread_pool(thread_pool)
+    {
+        m_threads = 2;
+    }
+
+    virtual UnitTestResult run(Logger& logger, CancellableScope& scope) const override{
+        if (timing_unreliable()){
+            return UnitTestResult(
+                UnitTestResult::SKIPPED,
+                "Machine too starved for a timing-sensitive socket test (timing_unreliable())."
+            );
+        }
+        //  Blocks the event thread while it receives data.
+        struct StallListener : AbstractServerSocket::Listener{
+            virtual void on_receive_data(const void*, size_t) override{
+                std::this_thread::sleep_for(std::chrono::seconds(6));
+            }
+        };
+
+        ServerSocket_Qt server(m_thread_pool);
+        ServerListener server_listener;
+        server_listener.server = &server;
+        server.add_listener(server_listener);
+        StallListener stall_listener;
+        server.add_listener(stall_listener);
+
+        uint16_t port = 0;
+        {
+            std::mt19937 rng{std::random_device{}()};
+            for (int attempt = 0; attempt < 8; attempt++){
+                uint16_t candidate = (uint16_t)(40000 + rng() % 20000);
+                server.start("127.0.0.1", candidate);
+                if (server_listener.waiter.wait_for(
+                    std::chrono::seconds(5),
+                    [&server_listener]{ return server_listener.listen_finished.load() > 0; }
+                ) && server_listener.last_listen_error.empty()){
+                    port = candidate;
+                    break;
+                }
+            }
+        }
+        if (port == 0){
+            return "Failed to start the server";
+        }
+
+        bool ok = false;
+        std::string error;
+        {
+            ClientSocket_Qt client(m_thread_pool);
+            ClientListener client_listener;
+            client.add_listener(client_listener);
+            client.connect("127.0.0.1", port);
+            if (!client_listener.waiter.wait_for(
+                std::chrono::seconds(5),
+                [&client_listener]{ return client_listener.connect_finished.load() >= 1; }
+            )){
+                error = "The client did not finish connecting";
+            }else if (!server_listener.waiter.wait_for(
+                std::chrono::seconds(5),
+                [&server_listener]{ return server_listener.connected.load() >= 1; }
+            )){
+                error = "The server did not call on_connect";
+            }else{
+                //  One byte in: the event thread blocks in on_receive_data for 6 s.
+                char byte = 'x';
+                if (client.send(&byte, 1) != 1){
+                    error = "The client did not send the byte";
+                }else{
+                    std::this_thread::sleep_for(std::chrono::milliseconds(300));
+
+                    auto start = std::chrono::steady_clock::now();
+                    server.close_connection();
+                    auto waited = std::chrono::steady_clock::now() - start;
+                    if (waited < std::chrono::seconds(4) || waited >= std::chrono::seconds(8)){
+                        error = "close_connection() did not time out as expected (" +
+                            std::to_string(
+                                (long long)std::chrono::duration_cast<std::chrono::milliseconds>(waited).count()
+                            ) + " ms)";
+                    }else{
+                        //  Wait for the stall to finish so the late handler actually
+                        //  runs, then check that it restored the state.
+                        std::this_thread::sleep_for(std::chrono::seconds(6));
+                        if (server.state() != AbstractServerSocket::State::LISTENING){
+                            error = "The late handler did not restore LISTENING";
+                        }else{
+                            ok = true;
+                        }
+                    }
+                }
+            }
+
+            client.close();
+        }
+
+        server.close();
+
+        if (!ok && !error.empty()){
+            return error;
+        }
+        return true;
+    }
+
+private:
+    ThreadPool& m_thread_pool;
+};
+
+
+//  Verifies the Qt client's close()-cancels-sends guarantee under an
+//  event-thread stall: with the event thread blocked for 6 s in
+//  on_receive_data, a "send()" started on the calling thread is queued
+//  behind the stall, so "close()" is the only thing that can end it.
+//  "close()" must cancel it so the send's caller is woken promptly with
+//  a best-effort byte count, instead of the send's own bound expiring.
+class Test_Sockets_Qt_CloseCancelsSend : public UnitTest{
+public:
+    Test_Sockets_Qt_CloseCancelsSend(ThreadPool& thread_pool, std::string name)
+        : UnitTest(std::move(name))
+        , m_thread_pool(thread_pool)
+    {
+        m_threads = 2;
+    }
+
+    virtual UnitTestResult run(Logger& logger, CancellableScope& scope) const override{
+        if (timing_unreliable()){
+            return UnitTestResult(
+                UnitTestResult::SKIPPED,
+                "Machine too starved for a timing-sensitive socket test (timing_unreliable())."
+            );
+        }
+
+        //  Blocks the client's event thread for 6 s on the first data,
+        //  and flags it when the block starts.
+        struct StallingClientListener : AbstractClientSocket::Listener{
+            Waiter waiter;
+            std::atomic<bool> stall_started{false};
+
+            virtual void on_receive_data(const void*, size_t) override{
+                stall_started.store(true, std::memory_order_release);
+                waiter.notify();
+                std::this_thread::sleep_for(std::chrono::seconds(6));
+            }
+        };
+
+        ServerSocket_Qt server(m_thread_pool);
+        ServerListener server_listener;
+        server_listener.server = &server;
+        server.add_listener(server_listener);
+
+        uint16_t port = 0;
+        {
+            std::mt19937 rng{std::random_device{}()};
+            for (int attempt = 0; attempt < 8; attempt++){
+                uint16_t candidate = (uint16_t)(40000 + rng() % 20000);
+                server.start("127.0.0.1", candidate);
+                if (server_listener.waiter.wait_for(
+                    SOCKET_TEST_WAIT,
+                    [&server_listener]{ return server_listener.listen_finished.load() > 0; }
+                ) && server_listener.last_listen_error.empty()){
+                    port = candidate;
+                    break;
+                }
+            }
+        }
+        if (port == 0){
+            if (timing_unreliable()){
+                return UnitTestResult(
+                    UnitTestResult::SKIPPED,
+                    "The server did not start listening on a starved machine."
+                );
+            }
+            return "Failed to start the server";
+        }
+
+        bool ok = false;
+        std::string error;
+        {
+            ClientSocket_Qt client(m_thread_pool);
+            ClientListener client_listener;
+            StallingClientListener stall_listener;
+            client.add_listener(client_listener);
+            client.add_listener(stall_listener);
+            client.connect("127.0.0.1", port);
+            if (!client_listener.waiter.wait_for(
+                SOCKET_TEST_WAIT,
+                [&client_listener]{ return client_listener.connect_finished.load() >= 1; }
+            )){
+                if (timing_unreliable()){
+                    return UnitTestResult(
+                        UnitTestResult::SKIPPED,
+                        "The client did not finish connecting on a starved machine."
+                    );
+                }
+                error = "The client did not finish connecting";
+            }else if (!server_listener.waiter.wait_for(
+                SOCKET_TEST_WAIT,
+                [&server_listener]{ return server_listener.connected.load() >= 1; }
+            )){
+                if (timing_unreliable()){
+                    return UnitTestResult(
+                        UnitTestResult::SKIPPED,
+                        "The server did not call on_connect on a starved machine."
+                    );
+                }
+                error = "The server did not call on_connect";
+            }else{
+                //  One byte out: the server echoes it back, and the echo
+                //  blocks the client's event thread in on_receive_data
+                //  for 6 s.
+                char byte = 'x';
+                if (client.send(&byte, 1) != 1){
+                    error = "The client did not send the byte";
+                }else if (!stall_listener.waiter.wait_for(
+                    SOCKET_TEST_WAIT,
+                    [&stall_listener]{ return stall_listener.stall_started.load(); }
+                )){
+                    error = "The client's event thread did not reach the stall";
+                }else{
+                    //  The event thread is now blocked for 6 s; anything
+                    //  queued to it waits behind the stall. This send
+                    //  (on the test thread, so it is queued well before
+                    //  the close below) will queue behind the stall, and
+                    //  the close() from the worker thread is the only
+                    //  thing that can end it.
+                    constexpr size_t SIZE = 1 << 20;
+                    std::vector<uint8_t> payload(SIZE, 0xAB);
+
+                    auto close_start = std::chrono::steady_clock::time_point::max();
+                    long long close_ms = 0;
+                    AsyncTask close_task = m_thread_pool.dispatch(
+                        [&client, &close_start, &close_ms]{
+                            //  Give the send a head start so it is in
+                            //  flight when close() runs.
+                            std::this_thread::sleep_for(std::chrono::milliseconds(300));
+                            auto t0 = std::chrono::steady_clock::now();
+                            close_start = t0;
+                            client.close();
+                            close_ms = std::chrono::duration_cast<std::chrono::milliseconds>(
+                                std::chrono::steady_clock::now() - t0
+                            ).count();
+                        }
+                    );
+
+                    size_t sent = client.send(payload.data(), payload.size());
+                    const auto send_end = std::chrono::steady_clock::now();
+
+                    close_task.wait_and_ignore_exceptions();
+
+                    //  The send must have been woken by the cancel: it
+                    //  returns within a few milliseconds of close()
+                    //  starting, no matter when close() itself got to
+                    //  run. (Without cancellation it would only wake
+                    //  when the 6 s stall ends and the queued write
+                    //  finally runs.)
+                    const long long cancel_lag = std::chrono::duration_cast<std::chrono::milliseconds>(
+                        send_end - close_start
+                    ).count();
+
+                    if (sent == payload.size()){
+                        //  The event thread caught up before close() and
+                        //  the send completed on its own: the
+                        //  cancellation was not exercised, so there is
+                        //  nothing to assert on the send's timing.
+                        if (close_ms > 60000){
+                            if (timing_unreliable()){
+                                return UnitTestResult(
+                                    UnitTestResult::SKIPPED,
+                                    "close() did not finish within 60 s on a starved machine."
+                                );
+                            }
+                            error = "close() did not finish within 60 s (" + std::to_string(close_ms) + " ms)";
+                        }else{
+                            ok = true;
+                        }
+                    }else if (cancel_lag < 0){
+                        //  The send returned before close() even started:
+                        //  it was never in flight, so the test's premise
+                        //  did not hold.
+                        error = "The send returned (" + std::to_string(sent) + " bytes) before close() even started";
+                    }else if (cancel_lag > 2000){
+                        if (timing_unreliable()){
+                            return UnitTestResult(
+                                UnitTestResult::SKIPPED,
+                                "send() was not woken promptly by close() on a starved machine."
+                            );
+                        }
+                        error = "send() did not return promptly after close() cancelled it (lag " + std::to_string(cancel_lag) + " ms)";
+                    }else if (close_ms > 60000){
+                        if (timing_unreliable()){
+                            return UnitTestResult(
+                                UnitTestResult::SKIPPED,
+                                "close() did not finish within 60 s on a starved machine."
+                            );
+                        }
+                        error = "close() did not finish within 60 s (" + std::to_string(close_ms) + " ms)";
+                    }else{
+                        ok = true;
+                    }
+                }
+            }
+
+            client.close();
+        }
+
+        server.close();
+
+        if (!ok && !error.empty()){
+            return error;
+        }
+        return true;
+    }
+
+private:
+    ThreadPool& m_thread_pool;
+};
+
+
+//  Verifies the Qt server's close_connection()-cancels-sends guarantee
+//  under an event-thread stall: with the event thread blocked for 6 s
+//  in on_receive_data, a "send()" started on the calling thread is
+//  queued behind the stall, so "close_connection()" is the only thing
+//  that can end it. It must cancel the send so the send's caller is
+//  woken promptly with a best-effort byte count, instead of the
+//  send's own bound expiring.
+class Test_Sockets_Qt_CloseConnectionCancelsSend : public UnitTest{
+public:
+    Test_Sockets_Qt_CloseConnectionCancelsSend(ThreadPool& thread_pool, std::string name)
+        : UnitTest(std::move(name))
+        , m_thread_pool(thread_pool)
+    {
+        m_threads = 2;
+    }
+
+    virtual UnitTestResult run(Logger& logger, CancellableScope& scope) const override{
+        if (timing_unreliable()){
+            return UnitTestResult(
+                UnitTestResult::SKIPPED,
+                "Machine too starved for a timing-sensitive socket test (timing_unreliable())."
+            );
+        }
+
+        //  Blocks the server's event thread for 6 s on the first data,
+        //  and flags it when the block starts. Only the first burst
+        //  stalls: the Qt server delivers the rest of the trigger 4096
+        //  bytes at a time, and every other burst stalling the event
+        //  thread for 6 s would queue the close behind minutes of stalls.
+        struct StallingServerListener : AbstractServerSocket::Listener{
+            Waiter waiter;
+            std::atomic<bool> stall_started{false};
+
+            virtual void on_receive_data(const void*, size_t) override{
+                if (!stall_started.exchange(true, std::memory_order_acq_rel)){
+                    waiter.notify();
+                    std::this_thread::sleep_for(std::chrono::seconds(6));
+                }
+            }
+        };
+
+        ServerSocket_Qt server(m_thread_pool);
+        ServerListener server_listener;
+        server.add_listener(server_listener);
+        StallingServerListener stall_listener;
+        server.add_listener(stall_listener);
+
+        uint16_t port = 0;
+        {
+            std::mt19937 rng{std::random_device{}()};
+            for (int attempt = 0; attempt < 8; attempt++){
+                uint16_t candidate = (uint16_t)(40000 + rng() % 20000);
+                server.start("127.0.0.1", candidate);
+                if (server_listener.waiter.wait_for(
+                    SOCKET_TEST_WAIT,
+                    [&server_listener]{ return server_listener.listen_finished.load() > 0; }
+                ) && server_listener.last_listen_error.empty()){
+                    port = candidate;
+                    break;
+                }
+            }
+        }
+        if (port == 0){
+            if (timing_unreliable()){
+                return UnitTestResult(
+                    UnitTestResult::SKIPPED,
+                    "The server did not start listening on a starved machine."
+                );
+            }
+            return "Failed to start the server";
+        }
+
+        bool ok = false;
+        std::string error;
+        {
+            ClientSocket_Qt client(m_thread_pool);
+            ClientListener client_listener;
+            client.add_listener(client_listener);
+            client.connect("127.0.0.1", port);
+            if (!client_listener.waiter.wait_for(
+                SOCKET_TEST_WAIT,
+                [&client_listener]{ return client_listener.connect_finished.load() >= 1; }
+            )){
+                if (timing_unreliable()){
+                    return UnitTestResult(
+                        UnitTestResult::SKIPPED,
+                        "The client did not finish connecting on a starved machine."
+                    );
+                }
+                error = "The client did not finish connecting";
+            }else if (!server_listener.waiter.wait_for(
+                SOCKET_TEST_WAIT,
+                [&server_listener]{ return server_listener.connected.load() >= 1; }
+            )){
+                if (timing_unreliable()){
+                    return UnitTestResult(
+                        UnitTestResult::SKIPPED,
+                        "The server did not call on_connect on a starved machine."
+                    );
+                }
+                error = "The server did not call on_connect";
+            }else{
+                //  One burst in: the server's on_receive_data blocks its
+                //  event thread for 6 s.
+                constexpr size_t TRIGGER_SIZE = 1 << 18;
+                std::vector<uint8_t> trigger(TRIGGER_SIZE, 0xCD);
+                if (client.send(trigger.data(), trigger.size()) != TRIGGER_SIZE){
+                    error = "The client did not send the trigger";
+                }else if (!stall_listener.waiter.wait_for(
+                    SOCKET_TEST_WAIT,
+                    [&stall_listener]{ return stall_listener.stall_started.load(); }
+                )){
+                    error = "The server's event thread did not reach the stall";
+                }else{
+                    //  The event thread is now blocked for 6 s; anything
+                    //  queued to it waits behind the stall. This send
+                    //  (on the test thread, so it is queued well before
+                    //  the close below) will queue behind the stall, and
+                    //  the close_connection() from the worker thread is
+                    //  the only thing that can end it.
+                    constexpr size_t SIZE = 1 << 20;
+                    std::vector<uint8_t> payload(SIZE, 0xAB);
+
+                    auto close_start = std::chrono::steady_clock::time_point::max();
+                    long long close_ms = 0;
+                    AsyncTask close_task = m_thread_pool.dispatch(
+                        [&server, &close_start, &close_ms]{
+                            //  Give the send a head start so it is in
+                            //  flight when close_connection() runs.
+                            std::this_thread::sleep_for(std::chrono::milliseconds(300));
+                            auto t0 = std::chrono::steady_clock::now();
+                            close_start = t0;
+                            server.close_connection();
+                            close_ms = std::chrono::duration_cast<std::chrono::milliseconds>(
+                                std::chrono::steady_clock::now() - t0
+                            ).count();
+                        }
+                    );
+
+                    size_t sent = server.send(payload.data(), payload.size());
+                    const auto send_end = std::chrono::steady_clock::now();
+
+                    close_task.wait_and_ignore_exceptions();
+
+                    //  The send must have been woken by the cancel: it
+                    //  returns within a few milliseconds of
+                    //  close_connection() starting, no matter when
+                    //  close_connection() itself got to run. (Without
+                    //  cancellation it would only wake when the 6 s
+                    //  stall ends and the queued write finally runs.)
+                    const long long cancel_lag = std::chrono::duration_cast<std::chrono::milliseconds>(
+                        send_end - close_start
+                    ).count();
+
+                    if (sent == payload.size()){
+                        //  The event thread caught up before
+                        //  close_connection() and the send completed on
+                        //  its own: the cancellation was not exercised,
+                        //  so there is nothing to assert on the send's
+                        //  timing.
+                        if (close_ms > 60000){
+                            if (timing_unreliable()){
+                                return UnitTestResult(
+                                    UnitTestResult::SKIPPED,
+                                    "close_connection() did not finish within 60 s on a starved machine."
+                                );
+                            }
+                            error = "close_connection() did not finish within 60 s (" + std::to_string(close_ms) + " ms)";
+                        }else{
+                            ok = true;
+                        }
+                    }else if (cancel_lag < 0){
+                        //  The send returned before close_connection()
+                        //  even started: it was never in flight, so the
+                        //  test's premise did not hold.
+                        error = "The send returned (" + std::to_string(sent) + " bytes) before close_connection() even started";
+                    }else if (cancel_lag > 2000){
+                        if (timing_unreliable()){
+                            return UnitTestResult(
+                                UnitTestResult::SKIPPED,
+                                "send() was not woken promptly by close_connection() on a starved machine."
+                            );
+                        }
+                        error = "send() did not return promptly after close_connection() cancelled it (lag " + std::to_string(cancel_lag) + " ms)";
+                    }else if (close_ms > 60000){
+                        if (timing_unreliable()){
+                            return UnitTestResult(
+                                UnitTestResult::SKIPPED,
+                                "close_connection() did not finish within 60 s on a starved machine."
+                            );
+                        }
+                        error = "close_connection() did not finish within 60 s (" + std::to_string(close_ms) + " ms)";
+                    }else{
+                        //  close_connection() may return with the close
+                        //  still pending on the (stalled) event thread,
+                        //  so poll for the resulting LISTENING state
+                        //  within the shared budget before judging it.
+                        const auto s0 = std::chrono::steady_clock::now();
+                        while (server.state() != AbstractServerSocket::State::LISTENING
+                            && std::chrono::steady_clock::now() - s0 < SOCKET_TEST_WAIT){
+                            std::this_thread::sleep_for(std::chrono::milliseconds(10));
+                        }
+                        if (server.state() != AbstractServerSocket::State::LISTENING){
+                            if (timing_unreliable()){
+                                return UnitTestResult(
+                                    UnitTestResult::SKIPPED,
+                                    "The server is not LISTENING after close_connection() on a starved machine."
+                                );
+                            }
+                            error = "The server is not LISTENING after close_connection()";
+                        }else{
+                            ok = true;
+                        }
+                    }
+                }
+            }
+
+            client.close();
+        }
+
+        server.close();
+
+        if (!ok && !error.empty()){
+            return error;
+        }
+        return true;
+    }
+
+private:
+    ThreadPool& m_thread_pool;
+};
+
+//  The peer accepts the connection but stalls reading: a send() with a
+//  deadline must stop at the deadline with a partial count, and
+//  close() must still be able to finish afterwards (on the Qt backend
+//  the in-flight write stops at the deadline, releasing the socket's
+//  event thread, which is what close() has to run on).
+//
+//  The stall lasts 70 s - longer than the 60 s send threshold below -
+//  so the peer is still stalled for the whole duration of every send in
+//  the retry loop. It is interruptible ("stop"), so shutting the peer
+//  down does not wait for it.
+//
+//  An OS with unusually large autotuned socket buffers (observed on
+//  Windows CI, where the kernel buffered the entire 256 MB payload
+//  against a non-reading peer) lets the first send "complete" by parking
+//  the data in the kernel. Those buffers are now full, so a follow-up
+//  send to the same stalled peer cannot complete and must stop at the
+//  deadline with a partial count; the loop retries until that happens
+//  (up to 4 times, i.e. unless the OS can buffer over 1 GiB).
+//
+//  Note: QTcpSocket::write() accepts the whole payload into Qt's internal
+//  buffer and reports it as written, so kernel backpressure never reaches
+//  the Qt write loop and the send legitimately "completes" there; a
+//  retry cannot exercise the deadline on that backend. On that backend
+//  only the timing and close() behavior are asserted.
+//
+//  Timing tolerance: if the machine is too starved for wall-clock
+//  assertions to be trusted (timing_unreliable()), the test skips
+//  instead of failing - at start, at each threshold crossing, and on
+//  connect/listen-phase failures.
+template <typename ClientSocketType, typename ServerSocketType>
+class Test_Sockets_ClientSendTimeout : public TestSockets<ClientSocketType, ServerSocketType>{
+public:
+    using TestSockets<ClientSocketType, ServerSocketType>::TestSockets;
+
+    virtual UnitTestResult run(Logger& logger, CancellableScope& scope) const override{
+        if (timing_unreliable()){
+            return UnitTestResult(
+                UnitTestResult::SKIPPED,
+                "Machine too starved for a timing-sensitive socket test (timing_unreliable())."
+            );
+        }
+        constexpr bool QT = std::is_same_v<ClientSocketType, ClientSocket_Qt>;
+
+        //  Stalls the server's reading for 12 s on the first data (or
+        //  until "stop" is set), keeping the client's send buffer full
+        //  for the duration of the send test.
+        struct StallingServerListener : ServerListener{
+            std::atomic<bool> stalled{false};
+            std::atomic<bool> stop{false};
+
+            ~StallingServerListener(){
+                stop.store(true, std::memory_order_release);
+            }
+
+            virtual void on_receive_data(const void* data, size_t bytes) override{
+                if (!stalled.exchange(true)){
+                    const auto end = std::chrono::steady_clock::now() + std::chrono::seconds(70);
+                    while (std::chrono::steady_clock::now() < end
+                        && !stop.load(std::memory_order_acquire)){
+                        std::this_thread::sleep_for(std::chrono::milliseconds(10));
+                    }
+                }
+                ServerListener::on_receive_data(data, bytes);
+            }
+        };
+
+        ServerSocketType server(this->m_thread_pool);
+        StallingServerListener server_listener;
+        server.add_listener(server_listener);
+
+        uint16_t port;
+        if (!this->start_server(server, server_listener, port)){
+            //  A listen-phase failure on a starved machine is the
+            //  machine's fault, not the socket's.
+            if (timing_unreliable()){
+                return UnitTestResult(
+                    UnitTestResult::SKIPPED,
+                    "The server did not start listening on a starved machine."
+                );
+            }
+            return "Failed to start the server";
+        }
+
+        bool ok = false;
+        std::string error;
+        {
+            ClientSocketType client(this->m_thread_pool);
+            ClientListener client_listener;
+            client.add_listener(client_listener);
+
+            if (!this->connect_client(client, client_listener, port, 1)){
+                //  A connect-phase failure on a starved machine is the
+                //  machine's fault, not the socket's.
+                if (timing_unreliable()){
+                    return UnitTestResult(
+                        UnitTestResult::SKIPPED,
+                        "The client did not finish connecting on a starved machine."
+                    );
+                }
+                error = "The client did not finish connecting";
+            }else if (!server_listener.waiter.wait_for(
+                SOCKET_TEST_WAIT,
+                [&server_listener]{ return server_listener.connected.load() >= 1; }
+            )){
+                if (timing_unreliable()){
+                    return UnitTestResult(
+                        UnitTestResult::SKIPPED,
+                        "The server did not call on_connect on a starved machine."
+                    );
+                }
+                error = "The server did not call on_connect";
+            }else{
+                //  Far larger than the kernel send/receive buffering that
+                //  the send loop can rely on being absent, so the send
+                //  must stop on the stalled reader (see the comment on
+                //  the class for the large-buffer OS case).
+                constexpr size_t SIZE = 1 << 28;
+                std::vector<uint8_t> payload(SIZE, 0xAB);
+
+                //  The deadline is 100 ms, but this test also allocates
+                //  and moves 256 MB (the Qt backend additionally copies it
+                //  into its packet buffer), and on a loaded CI runner that
+                //  page traffic - or the calling thread being descheduled
+                //  - can take seconds. The pre-fix behavior was an infinite
+                //  hang, so the threshold only has to prove boundedness;
+                //  60 s keeps the test meaningful while tolerating
+                //  extremely loaded CI runners.
+                int completed = 0;
+                while (true){
+                    auto t0 = std::chrono::steady_clock::now();
+                    size_t sent = client.send(
+                        payload.data(),
+                        payload.size(),
+                        std::chrono::milliseconds(100)
+                    );
+                    auto send_ms = std::chrono::duration_cast<std::chrono::milliseconds>(
+                        std::chrono::steady_clock::now() - t0
+                    ).count();
+
+                    if (send_ms > 60000){
+                        //  A slow send on a starved machine is the
+                        //  machine's fault, not the deadline's.
+                        if (timing_unreliable()){
+                            return UnitTestResult(
+                                UnitTestResult::SKIPPED,
+                                "send() took " + std::to_string(send_ms) + " ms on a starved machine."
+                            );
+                        }
+                        error = "send() did not return within 60 s of its 100 ms deadline (" + std::to_string(send_ms) + " ms)";
+                        break;
+                    }else if (sent < payload.size()){
+                        //  The deadline engaged with bytes left unwritten.
+                        break;
+                    }else if (QT){
+                        //  Qt's "completion" is its userspace buffer, not
+                        //  kernel delivery; a retry cannot exercise the
+                        //  deadline on that backend.
+                        break;
+                    }
+
+                    //  The whole payload was written, so the kernel's
+                    //  socket buffers absorbed it (unusually large
+                    //  autotuned buffers). They are now full, so the
+                    //  next send to the same stalled peer cannot
+                    //  complete.
+                    if (++completed >= 4){
+                        error = "All 4 sends of 256 MB completed: the OS buffered over 1 GiB against the stalled peer, so the deadline cannot be verified";
+                        break;
+                    }
+                }
+
+                if (error.empty()){
+                    //  A zero-length send round-trips a queued call through
+                    //  the socket's event thread (on the Qt backend, the
+                    //  thread that close() has to wait on). The infinite
+                    //  default is the canary: it returns in ~0 ms on a
+                    //  healthy event thread, and for the full 5 s internal
+                    //  safety wait if that thread is starved. (A finite
+                    //  timeout cannot be used: the caller-side wait is
+                    //  capped at "timeout + 1 s", so the control could
+                    //  never expose a starved event thread.)
+                    const auto z0 = std::chrono::steady_clock::now();
+                    client.send("", 0);
+                    const long long control_ms = std::chrono::duration_cast<std::chrono::milliseconds>(
+                        std::chrono::steady_clock::now() - z0
+                    ).count();
+
+                    auto c0 = std::chrono::steady_clock::now();
+                    client.close();
+                    auto close_ms = std::chrono::duration_cast<std::chrono::milliseconds>(
+                        std::chrono::steady_clock::now() - c0
+                    ).count();
+                    if (close_ms > 60000){
+                        if (control_ms > 2000 || timing_unreliable()){
+                            return UnitTestResult(
+                                UnitTestResult::SKIPPED,
+                                "close() took " + std::to_string(close_ms) + " ms on a starved machine."
+                            );
+                        }
+                        error = "close() did not finish after the timed-out send (" + std::to_string(close_ms) + " ms)";
+                    }else if (client.state() != AbstractClientSocket::State::NOT_RUNNING){
+                        error = "The client is not NOT_RUNNING after close()";
+                    }else{
+                        ok = true;
+                    }
+                }
+            }
+            client.close();
+        }
+
+        //  Release the stalled reader so the server's close() (which
+        //  joins its connection thread, currently inside the stall) does
+        //  not wait for it.
+        server_listener.stop.store(true, std::memory_order_release);
+
+        server.close();
+
+        if (!ok && !error.empty()){
+            return error;
+        }
+        return true;
+    }
+};
+
+
+
+//  The client accepts the connection but stalls reading: the server's
+//  send() with a deadline must stop at the deadline with a partial
+//  count, and close_connection() must still be able to finish afterwards
+//  (on the Qt backend the in-flight write stops at the deadline, releasing
+//  the server's event thread, which is what close_connection() has to run
+//  on).
+//
+//  The stall lasts 70 s - longer than the 60 s send threshold below -
+//  so the peer is still stalled for the whole duration of every send in
+//  the retry loop. It is interruptible ("stop"), so shutting the peer
+//  down does not wait for it.
+//
+//  An OS with unusually large autotuned socket buffers (observed on
+//  Windows CI, where the kernel buffered the entire 256 MB payload
+//  against a non-reading peer) lets the first send "complete" by parking
+//  the data in the kernel. Those buffers are now full, so a follow-up
+//  send to the same stalled peer cannot complete and must stop at the
+//  deadline with a partial count; the loop retries until that happens
+//  (up to 4 times, i.e. unless the OS can buffer over 1 GiB).
+//
+//  Note: QTcpSocket::write() accepts the whole payload into Qt's internal
+//  buffer and reports it as written, so kernel backpressure never reaches
+//  the Qt write loop and the send legitimately "completes" there; a
+//  retry cannot exercise the deadline on that backend. On that backend
+//  only the timing and close_connection() behavior are asserted.
+//
+//  Timing tolerance: if the machine is too starved for wall-clock
+//  assertions to be trusted (timing_unreliable()), the test skips
+//  instead of failing - at start, at each threshold crossing, and on
+//  connect/listen-phase failures.
+template <typename ClientSocketType, typename ServerSocketType>
+class Test_Sockets_ServerSendTimeout : public TestSockets<ClientSocketType, ServerSocketType>{
+public:
+    using TestSockets<ClientSocketType, ServerSocketType>::TestSockets;
+
+    virtual UnitTestResult run(Logger& logger, CancellableScope& scope) const override{
+        if (timing_unreliable()){
+            return UnitTestResult(
+                UnitTestResult::SKIPPED,
+                "Machine too starved for a timing-sensitive socket test (timing_unreliable())."
+            );
+        }
+        constexpr bool QT = std::is_same_v<ServerSocketType, ServerSocket_Qt>;
+
+        //  Stalls the client's reading for 12 s on the first data (or
+        //  until "stop" is set), keeping the server's send buffer full
+        //  for the duration of the send test.
+        struct StallingClientListener : ClientListener{
+            std::atomic<bool> stalled{false};
+            std::atomic<bool> stop{false};
+
+            ~StallingClientListener(){
+                stop.store(true, std::memory_order_release);
+            }
+
+            virtual void on_receive_data(const void* data, size_t bytes) override{
+                if (!stalled.exchange(true)){
+                    const auto end = std::chrono::steady_clock::now() + std::chrono::seconds(70);
+                    while (std::chrono::steady_clock::now() < end
+                        && !stop.load(std::memory_order_acquire)){
+                        std::this_thread::sleep_for(std::chrono::milliseconds(10));
+                    }
+                }
+                ClientListener::on_receive_data(data, bytes);
+            }
+        };
+
+        ServerSocketType server(this->m_thread_pool);
+        ServerListener server_listener;
+        server.add_listener(server_listener);
+
+        uint16_t port;
+        if (!this->start_server(server, server_listener, port)){
+            //  A listen-phase failure on a starved machine is the
+            //  machine's fault, not the socket's.
+            if (timing_unreliable()){
+                return UnitTestResult(
+                    UnitTestResult::SKIPPED,
+                    "The server did not start listening on a starved machine."
+                );
+            }
+            return "Failed to start the server";
+        }
+
+        bool ok = false;
+        std::string error;
+        {
+            ClientSocketType client(this->m_thread_pool);
+            StallingClientListener client_listener;
+            client.add_listener(client_listener);
+
+            if (!this->connect_client(client, client_listener, port, 1)){
+                //  A connect-phase failure on a starved machine is the
+                //  machine's fault, not the socket's.
+                if (timing_unreliable()){
+                    return UnitTestResult(
+                        UnitTestResult::SKIPPED,
+                        "The client did not finish connecting on a starved machine."
+                    );
+                }
+                error = "The client did not finish connecting";
+            }else if (!server_listener.waiter.wait_for(
+                SOCKET_TEST_WAIT,
+                [&server_listener]{ return server_listener.connected.load() >= 1; }
+            )){
+                if (timing_unreliable()){
+                    return UnitTestResult(
+                        UnitTestResult::SKIPPED,
+                        "The server did not call on_connect on a starved machine."
+                    );
+                }
+                error = "The server did not call on_connect";
+            }else{
+                //  Far larger than the kernel send/receive buffering that
+                //  the send loop can rely on being absent, so the send
+                //  must stop on the stalled reader (see the comment on
+                //  the class for the large-buffer OS case).
+                constexpr size_t SIZE = 1 << 28;
+                std::vector<uint8_t> payload(SIZE, 0xAB);
+
+                //  The deadline is 100 ms, but this test also allocates
+                //  and moves 256 MB (the Qt backend additionally copies it
+                //  into its packet buffer), and on a loaded CI runner that
+                //  page traffic - or the calling thread being descheduled
+                //  - can take seconds. The pre-fix behavior was an infinite
+                //  hang, so the threshold only has to prove boundedness;
+                //  60 s keeps the test meaningful while tolerating
+                //  extremely loaded CI runners.
+                int completed = 0;
+                while (true){
+                    auto t0 = std::chrono::steady_clock::now();
+                    size_t sent = server.send(
+                        payload.data(),
+                        payload.size(),
+                        std::chrono::milliseconds(100)
+                    );
+                    auto send_ms = std::chrono::duration_cast<std::chrono::milliseconds>(
+                        std::chrono::steady_clock::now() - t0
+                    ).count();
+
+                    if (send_ms > 60000){
+                        //  A slow send on a starved machine is the
+                        //  machine's fault, not the deadline's.
+                        if (timing_unreliable()){
+                            return UnitTestResult(
+                                UnitTestResult::SKIPPED,
+                                "send() took " + std::to_string(send_ms) + " ms on a starved machine."
+                            );
+                        }
+                        error = "send() did not return within 60 s of its 100 ms deadline (" + std::to_string(send_ms) + " ms)";
+                        break;
+                    }else if (sent < payload.size()){
+                        //  The deadline engaged with bytes left unwritten.
+                        break;
+                    }else if (QT){
+                        //  Qt's "completion" is its userspace buffer, not
+                        //  kernel delivery; a retry cannot exercise the
+                        //  deadline on that backend.
+                        break;
+                    }
+
+                    //  The whole payload was written, so the kernel's
+                    //  socket buffers absorbed it (unusually large
+                    //  autotuned buffers). They are now full, so the
+                    //  next send to the same stalled peer cannot
+                    //  complete.
+                    if (++completed >= 4){
+                        error = "All 4 sends of 256 MB completed: the OS buffered over 1 GiB against the stalled peer, so the deadline cannot be verified";
+                        break;
+                    }
+                }
+
+                if (error.empty()){
+                    //  A zero-length send round-trips a queued call through
+                    //  the server's event thread (on the Qt backend, the
+                    //  thread that close_connection() has to wait on). The
+                    //  infinite default is the canary: it returns in ~0 ms
+                    //  on a healthy event thread, and for the full 5 s
+                    //  internal safety wait if that thread is starved.
+                    //  (A finite timeout cannot be used: the caller-side
+                    //  wait is capped at "timeout + 1 s", so the control
+                    //  could never expose a starved event thread.)
+                    const auto z0 = std::chrono::steady_clock::now();
+                    server.send("", 0);
+                    const long long control_ms = std::chrono::duration_cast<std::chrono::milliseconds>(
+                        std::chrono::steady_clock::now() - z0
+                    ).count();
+
+                    auto c0 = std::chrono::steady_clock::now();
+                    server.close_connection();
+                    auto close_ms = std::chrono::duration_cast<std::chrono::milliseconds>(
+                        std::chrono::steady_clock::now() - c0
+                    ).count();
+                    if (close_ms > 60000){
+                        if (control_ms > 2000 || timing_unreliable()){
+                            return UnitTestResult(
+                                UnitTestResult::SKIPPED,
+                                "close_connection() took " + std::to_string(close_ms) + " ms on a starved machine."
+                            );
+                        }
+                        error = "close_connection() did not finish after the timed-out send (" + std::to_string(close_ms) + " ms)";
+                    }else{
+                        //  close_connection() queues the close onto the
+                        //  server's event thread and stops waiting after
+                        //  its internal 5 s bound, so on a starved event
+                        //  thread the close may still be pending when it
+                        //  returns. The queued close does run once the
+                        //  event thread gets to it, so poll for the
+                        //  resulting LISTENING state within the shared
+                        //  budget instead of failing on a not-yet-applied
+                        //  close.
+                        const auto s0 = std::chrono::steady_clock::now();
+                        while (server.state() != AbstractServerSocket::State::LISTENING
+                            && std::chrono::steady_clock::now() - s0 < SOCKET_TEST_WAIT){
+                            std::this_thread::sleep_for(std::chrono::milliseconds(10));
+                        }
+                        if (server.state() != AbstractServerSocket::State::LISTENING){
+                            if (control_ms > 2000 || timing_unreliable()){
+                                return UnitTestResult(
+                                    UnitTestResult::SKIPPED,
+                                    "The server is not LISTENING after close_connection() on a starved machine."
+                                );
+                            }
+                            error = "The server is not LISTENING after close_connection()";
+                        }else{
+                            ok = true;
+                        }
+                    }
+                }
+            }
+
+            //  Release the stalled reader so the client's close() (which
+            //  joins its receive thread, currently inside the stall) does
+            //  not wait for it.
+            client_listener.stop.store(true, std::memory_order_release);
+            client.close();
+        }
+
+        server.close();
+
+        if (!ok && !error.empty()){
+            return error;
+        }
+        return true;
+    }
+};
+
+
+//  Verifies the close()-cancels-sends contract (see the docs on
+//  "AbstractClientSocket::close()"): the server never reads, so the
+//  256 MB send stays in flight, and "close()" has to end it. The send
+//  must return promptly with a best-effort byte count; the threshold
+//  only has to prove boundedness (the behavior without cancellation is
+//  an infinite hang), so it tolerates extremely loaded CI runners.
+template <typename ClientSocketType, typename ServerSocketType>
+class Test_Sockets_CloseCancelsSend : public TestSockets<ClientSocketType, ServerSocketType>{
+public:
+    Test_Sockets_CloseCancelsSend(ThreadPool& thread_pool, std::string name)
+        : TestSockets<ClientSocketType, ServerSocketType>(thread_pool, std::move(name))
+    {
+        //  The 256 MiB payload below, plus a transient 256 MiB copy in the
+        //  Qt backend's in-flight send data (overreported on the other
+        //  backends, which don't copy the payload).
+        this->m_memory = 2ull * (1ull << 28);
+    }
+
+    virtual UnitTestResult run(Logger& logger, CancellableScope& scope) const override{
+        if (timing_unreliable()){
+            return UnitTestResult(
+                UnitTestResult::SKIPPED,
+                "Machine too starved for a timing-sensitive socket test (timing_unreliable())."
+            );
+        }
+
+        //  Stalls the server's reading for 70 s on the first data (or
+        //  until "stop" is set), keeping the client's send in flight.
+        struct StallingServerListener : ServerListener{
+            std::atomic<bool> stalled{false};
+            std::atomic<bool> stop{false};
+
+            ~StallingServerListener(){
+                stop.store(true, std::memory_order_release);
+            }
+
+            virtual void on_receive_data(const void* data, size_t bytes) override{
+                if (!stalled.exchange(true)){
+                    const auto end = std::chrono::steady_clock::now() + std::chrono::seconds(70);
+                    while (std::chrono::steady_clock::now() < end
+                        && !stop.load(std::memory_order_acquire)){
+                        std::this_thread::sleep_for(std::chrono::milliseconds(10));
+                    }
+                }
+                ServerListener::on_receive_data(data, bytes);
+            }
+        };
+
+        ServerSocketType server(this->m_thread_pool);
+        StallingServerListener server_listener;
+        server.add_listener(server_listener);
+
+        uint16_t port;
+        if (!this->start_server(server, server_listener, port)){
+            //  A listen-phase failure on a starved machine is the
+            //  machine's fault, not the socket's.
+            if (timing_unreliable()){
+                return UnitTestResult(
+                    UnitTestResult::SKIPPED,
+                    "The server did not start listening on a starved machine."
+                );
+            }
+            return "Failed to start the server";
+        }
+
+        bool ok = false;
+        std::string error;
+        {
+            ClientSocketType client(this->m_thread_pool);
+            ClientListener client_listener;
+            client.add_listener(client_listener);
+
+            if (!this->connect_client(client, client_listener, port, 1)){
+                //  A connect-phase failure on a starved machine is the
+                //  machine's fault, not the socket's.
+                if (timing_unreliable()){
+                    return UnitTestResult(
+                        UnitTestResult::SKIPPED,
+                        "The client did not finish connecting on a starved machine."
+                    );
+                }
+                error = "The client did not finish connecting";
+            }else if (!server_listener.waiter.wait_for(
+                SOCKET_TEST_WAIT,
+                [&server_listener]{ return server_listener.connected.load() >= 1; }
+            )){
+                if (timing_unreliable()){
+                    return UnitTestResult(
+                        UnitTestResult::SKIPPED,
+                        "The server did not call on_connect on a starved machine."
+                    );
+                }
+                error = "The server did not call on_connect";
+            }else{
+                //  Far larger than the kernel send/receive buffering, so
+                //  the send stays in flight against the stalled reader.
+                //  (On an OS that buffered the whole payload anyway, the
+                //  send completes before close() and the test still
+                //  passes, just without exercising the cancel.)
+                constexpr size_t SIZE = 1 << 28;
+                std::vector<uint8_t> payload(SIZE, 0xAB);
+
+                size_t sent = 0;
+                auto send_start = std::chrono::steady_clock::now();
+                AsyncTask send_task = this->m_thread_pool.dispatch(
+                    [&client, &payload, &sent]{
+                        sent = client.send(payload.data(), payload.size());
+                    }
+                );
+
+                //  Give the send a head start so it is in flight when
+                //  close() runs, then cancel it.
+                std::this_thread::sleep_for(std::chrono::milliseconds(100));
+
+                auto close_start = std::chrono::steady_clock::now();
+                client.close();
+                const long long close_ms = std::chrono::duration_cast<std::chrono::milliseconds>(
+                    std::chrono::steady_clock::now() - close_start
+                ).count();
+
+                send_task.wait_and_ignore_exceptions();
+                const long long send_ms = std::chrono::duration_cast<std::chrono::milliseconds>(
+                    std::chrono::steady_clock::now() - send_start
+                ).count();
+
+                if (send_ms > 60000){
+                    //  A send that is not ended by close() on a starved
+                    //  machine is the machine's fault, not the
+                    //  cancellation's.
+                    if (timing_unreliable()){
+                        return UnitTestResult(
+                            UnitTestResult::SKIPPED,
+                            "send() did not return within 60 s of close() on a starved machine."
+                        );
+                    }
+                    error = "send() did not return within 60 s of close() (" + std::to_string(send_ms) + " ms)";
+                }else if (close_ms > 60000){
+                    if (timing_unreliable()){
+                        return UnitTestResult(
+                            UnitTestResult::SKIPPED,
+                            "close() did not finish within 60 s on a starved machine."
+                        );
+                    }
+                    error = "close() did not finish within 60 s (" + std::to_string(close_ms) + " ms)";
+                }else if (sent > payload.size()){
+                    error = "send() reported more bytes (" + std::to_string(sent) + ") than the payload size";
+                }else{
+                    ok = true;
+                }
+            }
+
+            client.close();
+        }
+
+        //  Release the stalled reader so the server's close() (which
+        //  joins its connection thread, currently inside the stall) does
+        //  not wait for it.
+        server_listener.stop.store(true, std::memory_order_release);
+
+        server.close();
+
+        if (!ok && !error.empty()){
+            return error;
+        }
+        return true;
+    }
+};
+
+
+//  Verifies the close_connection()-cancels-sends contract (see the
+//  docs on "AbstractServerSocket::close_connection()"): the client
+//  never reads, so the 256 MB send stays in flight, and
+//  "close_connection()" has to end it. The send must return promptly
+//  with a best-effort byte count, and the server has to be back to
+//  LISTENING; the thresholds only have to prove boundedness, so they
+//  tolerate extremely loaded CI runners.
+template <typename ClientSocketType, typename ServerSocketType>
+class Test_Sockets_CloseConnectionCancelsSend : public TestSockets<ClientSocketType, ServerSocketType>{
+public:
+    Test_Sockets_CloseConnectionCancelsSend(ThreadPool& thread_pool, std::string name)
+        : TestSockets<ClientSocketType, ServerSocketType>(thread_pool, std::move(name))
+    {
+        //  The 256 MiB payload below, plus a transient 256 MiB copy in the
+        //  Qt backend's in-flight send data (overreported on the other
+        //  backends, which don't copy the payload).
+        this->m_memory = 2ull * (1ull << 28);
+    }
+
+    virtual UnitTestResult run(Logger& logger, CancellableScope& scope) const override{
+        if (timing_unreliable()){
+            return UnitTestResult(
+                UnitTestResult::SKIPPED,
+                "Machine too starved for a timing-sensitive socket test (timing_unreliable())."
+            );
+        }
+
+        //  Stalls the client's reading for 70 s on the first data (or
+        //  until "stop" is set), keeping the server's send in flight.
+        struct StallingClientListener : ClientListener{
+            std::atomic<bool> stalled{false};
+            std::atomic<bool> stop{false};
+
+            ~StallingClientListener(){
+                stop.store(true, std::memory_order_release);
+            }
+
+            virtual void on_receive_data(const void* data, size_t bytes) override{
+                if (!stalled.exchange(true)){
+                    const auto end = std::chrono::steady_clock::now() + std::chrono::seconds(70);
+                    while (std::chrono::steady_clock::now() < end
+                        && !stop.load(std::memory_order_acquire)){
+                        std::this_thread::sleep_for(std::chrono::milliseconds(10));
+                    }
+                }
+                ClientListener::on_receive_data(data, bytes);
+            }
+        };
+
+        ServerSocketType server(this->m_thread_pool);
+        ServerListener server_listener;
+        server.add_listener(server_listener);
+
+        uint16_t port;
+        if (!this->start_server(server, server_listener, port)){
+            //  A listen-phase failure on a starved machine is the
+            //  machine's fault, not the socket's.
+            if (timing_unreliable()){
+                return UnitTestResult(
+                    UnitTestResult::SKIPPED,
+                    "The server did not start listening on a starved machine."
+                );
+            }
+            return "Failed to start the server";
+        }
+
+        bool ok = false;
+        std::string error;
+        {
+            ClientSocketType client(this->m_thread_pool);
+            StallingClientListener client_listener;
+            client.add_listener(client_listener);
+
+            if (!this->connect_client(client, client_listener, port, 1)){
+                //  A connect-phase failure on a starved machine is the
+                //  machine's fault, not the socket's.
+                if (timing_unreliable()){
+                    return UnitTestResult(
+                        UnitTestResult::SKIPPED,
+                        "The client did not finish connecting on a starved machine."
+                    );
+                }
+                error = "The client did not finish connecting";
+            }else if (!server_listener.waiter.wait_for(
+                SOCKET_TEST_WAIT,
+                [&server_listener]{ return server_listener.connected.load() >= 1; }
+            )){
+                if (timing_unreliable()){
+                    return UnitTestResult(
+                        UnitTestResult::SKIPPED,
+                        "The server did not call on_connect on a starved machine."
+                    );
+                }
+                error = "The server did not call on_connect";
+            }else{
+                //  Far larger than the kernel send/receive buffering, so
+                //  the send stays in flight against the stalled reader.
+                //  (On an OS that buffered the whole payload anyway, the
+                //  send completes before close_connection() and the test
+                //  still passes, just without exercising the cancel.)
+                constexpr size_t SIZE = 1 << 28;
+                std::vector<uint8_t> payload(SIZE, 0xAB);
+
+                size_t sent = 0;
+                auto send_start = std::chrono::steady_clock::now();
+                AsyncTask send_task = this->m_thread_pool.dispatch(
+                    [&server, &payload, &sent]{
+                        sent = server.send(payload.data(), payload.size());
+                    }
+                );
+
+                //  Give the send a head start so it is in flight when
+                //  close_connection() runs, then cancel it.
+                std::this_thread::sleep_for(std::chrono::milliseconds(100));
+
+                auto close_start = std::chrono::steady_clock::now();
+                server.close_connection();
+                const long long close_ms = std::chrono::duration_cast<std::chrono::milliseconds>(
+                    std::chrono::steady_clock::now() - close_start
+                ).count();
+
+                send_task.wait_and_ignore_exceptions();
+                const long long send_ms = std::chrono::duration_cast<std::chrono::milliseconds>(
+                    std::chrono::steady_clock::now() - send_start
+                ).count();
+
+                if (send_ms > 60000){
+                    //  A send that is not ended by close_connection() on
+                    //  a starved machine is the machine's fault, not the
+                    //  cancellation's.
+                    if (timing_unreliable()){
+                        return UnitTestResult(
+                            UnitTestResult::SKIPPED,
+                            "send() did not return within 60 s of close_connection() on a starved machine."
+                        );
+                    }
+                    error = "send() did not return within 60 s of close_connection() (" + std::to_string(send_ms) + " ms)";
+                }else if (close_ms > 60000){
+                    if (timing_unreliable()){
+                        return UnitTestResult(
+                            UnitTestResult::SKIPPED,
+                            "close_connection() did not finish within 60 s on a starved machine."
+                        );
+                    }
+                    error = "close_connection() did not finish within 60 s (" + std::to_string(close_ms) + " ms)";
+                }else if (sent > payload.size()){
+                    error = "send() reported more bytes (" + std::to_string(sent) + ") than the payload size";
+                }else{
+                    //  close_connection() may return with the close still
+                    //  pending on a starved event thread (Qt backend), so
+                    //  poll for the resulting LISTENING state within the
+                    //  shared budget before judging it.
+                    const auto s0 = std::chrono::steady_clock::now();
+                    while (server.state() != AbstractServerSocket::State::LISTENING
+                        && std::chrono::steady_clock::now() - s0 < SOCKET_TEST_WAIT){
+                        std::this_thread::sleep_for(std::chrono::milliseconds(10));
+                    }
+                    if (server.state() != AbstractServerSocket::State::LISTENING){
+                        if (timing_unreliable()){
+                            return UnitTestResult(
+                                UnitTestResult::SKIPPED,
+                                "The server is not LISTENING after close_connection() on a starved machine."
+                            );
+                        }
+                        error = "The server is not LISTENING after close_connection()";
+                    }else{
+                        ok = true;
+                    }
+                }
+            }
+
+            //  Release the stalled reader so the client's close() (which
+            //  joins its receive thread, currently inside the stall) does
+            //  not wait for it.
+            client_listener.stop.store(true, std::memory_order_release);
+            client.close();
+        }
+
+        server.close();
+
+        if (!ok && !error.empty()){
+            return error;
+        }
+        return true;
+    }
+};
+
+
+
+template <typename ClientSocketType, typename ServerSocketType>
+void add_socket_tests(UnitTestDatabase& database, ThreadPool& thread_pool, const char* backend_name){
+    const std::string prefix = "Sockets (" + std::string(backend_name) + ") - ";
+
+    database.add<Test_Sockets_Echo<ClientSocketType, ServerSocketType>>(
+        thread_pool, prefix + "Client/server echo round trip"
+    );
+    database.add<Test_Sockets_ZeroLengthSend<ClientSocketType, ServerSocketType>>(
+        thread_pool, prefix + "Zero-length send"
+    );
+    database.add<Test_Sockets_LargeTransfer<ClientSocketType, ServerSocketType>>(
+        thread_pool, prefix + "Large transfer"
+    );
+    database.add<Test_Sockets_RapidReconnect<ClientSocketType, ServerSocketType>>(
+        thread_pool, prefix + "Rapid reconnect"
+    );
+    database.add<Test_Sockets_SendCloseRace<ClientSocketType, ServerSocketType>>(
+        thread_pool, prefix + "Send/close race"
+    );
+    database.add<Test_Sockets_RejectSecondClient<ClientSocketType, ServerSocketType>>(
+        thread_pool, prefix + "Reject a second client"
+    );
+    database.add<Test_Sockets_PortInUse<ClientSocketType, ServerSocketType>>(
+        thread_pool, prefix + "Port in use"
+    );
+    database.add<Test_Sockets_ClientSendTimeout<ClientSocketType, ServerSocketType>>(
+        thread_pool, prefix + "Client send() timeout against a stalled peer"
+    );
+    database.add<Test_Sockets_ServerSendTimeout<ClientSocketType, ServerSocketType>>(
+        thread_pool, prefix + "Server send() timeout against a stalled peer"
+    );
+    database.add<Test_Sockets_CloseCancelsSend<ClientSocketType, ServerSocketType>>(
+        thread_pool, prefix + "close() cancels an in-flight send"
+    );
+    database.add<Test_Sockets_CloseConnectionCancelsSend<ClientSocketType, ServerSocketType>>(
+        thread_pool, prefix + "close_connection() cancels an in-flight send"
+    );
+}
+
+
+
+} // anonymous namespace
+
+
+void add_tests_Sockets(UnitTestDatabase& database, ThreadPool& thread_pool){
+    add_socket_tests<ClientSocket_Qt, ServerSocket_Qt>(database, thread_pool, "Qt");
+
+    //  Qt-specific: the completion-lifetime guarantee is only at risk in the
+    //  Qt backend (a queued call can outlive its caller there).
+    database.add<Test_Sockets_Qt_CompletionLifetime>(
+        thread_pool,
+        "Sockets (Qt) - Completion lifetime under event-thread stall"
+    );
+
+    database.add<Test_Sockets_Qt_CloseCancelsSend>(
+        thread_pool,
+        "Sockets (Qt) - close() cancels a send queued behind an event-thread stall"
+    );
+
+    database.add<Test_Sockets_Qt_CloseConnectionCancelsSend>(
+        thread_pool,
+        "Sockets (Qt) - close_connection() cancels a send queued behind an event-thread stall"
+    );
+
+#ifndef _WIN32
+    add_socket_tests<ClientSocket_POSIX, ServerSocket_POSIX>(database, thread_pool, "POSIX");
+#endif
+#ifdef _WIN32
+    add_socket_tests<ClientSocket_WinSocket, ServerSocket_WinSocket>(database, thread_pool, "WinSocket");
+#endif
+}
+
+
+
+}
diff --git a/Common/Cpp/Sockets/Sockets_Tests.h b/Common/Cpp/Sockets/Sockets_Tests.h
new file mode 100644
index 0000000000..beb497aa6b
--- /dev/null
+++ b/Common/Cpp/Sockets/Sockets_Tests.h
@@ -0,0 +1,28 @@
+/*  Sockets Tests
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Sockets_Tests_H
+#define PokemonAutomation_Sockets_Tests_H
+
+namespace PokemonAutomation{
+
+class ThreadPool;
+class UnitTestDatabase;
+
+
+//  Loopback tests that combine a ClientSocket and a ServerSocket against
+//  each other on 127.0.0.1: echo round trip, zero-length sends, a large
+//  transfer, rapid reconnects, a send/close race, connection rejection,
+//  and a port-in-use start failure. Each scenario runs for every backend
+//  that compiles on the current platform (Qt: always, POSIX: non-Windows,
+//  WinSocket: Windows). `thread_pool` runs the sockets and the test
+//  workers; it must be a long-lived pool (e.g.
+//  `GlobalThreadPools::unlimited_normal()`).
+void add_tests_Sockets(UnitTestDatabase& database, ThreadPool& thread_pool);
+
+
+}
+#endif
diff --git a/Common/Cpp/SparseRegion.cpp b/Common/Cpp/SparseRegion.cpp
new file mode 100644
index 0000000000..22dba68a6e
--- /dev/null
+++ b/Common/Cpp/SparseRegion.cpp
@@ -0,0 +1,193 @@
+/*  Sparse Region
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  This file is taken from:
+ *  https://github.com/Mysticial/y-cruncher/blob/master/trunk/Source/PublicLibs/BasicLibs/SparseRegion.h
+ *
+ *  File taken with permission from Mysticial (founder of both projects).
+ *
+ */
+
+#include <vector>
+#include <sstream>
+#include "Common/Cpp/Exceptions.h"
+#include "SparseRegion.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+
+
+
+template <typename Type>
+Type parse_ui(const char* str){
+    Type x = 0;
+    char ch = *str++;
+    while (ch >= '0' && ch <= '9'){
+        x *= 10;
+        x += ch - '0';
+        ch = *str++;
+    }
+    return x;
+}
+
+
+
+template <typename Type>
+Region<Type>::Region(Type is, Type ie)
+    : s(is), e(ie)
+{
+    if (e <= s){
+//        cout << "s = " << s << ", e = " << e << endl;
+        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "s < e");
+    }
+}
+template <typename Type>
+Region<Type> Region<Type>::parse_str(const std::string& str, bool inclusive_end){
+    const char* ptr = str.c_str();
+
+    //  Skip to the first digit.
+    while (true){
+        char ch = *ptr;
+        if (ch == '\0'){
+            throw ParseException("Unexpected end of string.");
+        }
+        if ('0' <= ch && ch <= '9'){
+            break;
+        }
+        ptr++;
+    }
+
+    //  Parse the range.
+    std::string substr = ptr;
+
+    Type s = parse_ui<Type>(substr.c_str());
+    Type e = s;
+    Type pos = substr.find('-');
+    if (pos != std::string::npos){
+        e = parse_ui<Type>(&substr[pos + 1]);
+    }
+
+    if (inclusive_end){
+        e++;
+    }
+
+    return Region(s, e);
+}
+template <typename Type>
+bool Region<Type>::operator==(const Region& x) const{
+    return s == x.s && e == x.e;
+}
+
+
+
+
+template <typename Type>
+SparseRegion<Type>::SparseRegion(const std::string& str, bool inclusive_end){
+    std::istringstream stream(str);
+    std::string token;
+    std::vector<std::string> tokens;
+
+    while (std::getline(stream, token, ' ')){
+        *this |= Region<Type>::parse_str(token, inclusive_end);
+    }
+}
+
+template <typename Type>
+bool SparseRegion<Type>::operator==(const Region<Type>& region) const{
+    if (m_ranges.size() != 1){
+        return false;
+    }
+    auto iter = m_ranges.begin();
+    return Region<Type>(iter->first, iter->second) == region;
+}
+
+
+template <typename Type>
+void SparseRegion<Type>::operator|=(const Region<Type>& region){
+    using Iterator = typename std::map<Type, Type>::iterator;
+
+    Type s = region.s;
+    Type e = region.e;
+
+    auto ret = m_ranges.emplace(s, e);
+    Iterator node = ret.first;
+
+    //  Node already exists. Merge with it.
+    if (!ret.second){
+        e = std::max(e, node->second);
+        node->second = e;
+    }
+
+    //  If previous node exists, attempt to merge with it.
+    if (node != m_ranges.begin()){
+        Iterator prev = node;
+        --prev;
+        if (prev->second >= s){
+            //  Merge with previous node.
+            s = prev->first;
+            e = std::max(e, prev->second);
+            prev->second = e;
+            m_ranges.erase(node);
+            node = prev;
+        }
+    }
+
+    //  Attempt to merge with later nodes.
+    while (true){
+        Iterator next = node;
+        ++next;
+
+        //  No next node.
+        if (next == m_ranges.end()){
+            return;
+        }
+
+        //  Next node does not touch current node.
+        if (e < next->first){
+            return;
+        }
+
+        //  Merge with next node.
+        e = std::max(e, next->second);
+        node->second = e;
+        m_ranges.erase(next);
+    }
+}
+
+
+template <typename Type>
+std::string SparseRegion<Type>::tostr(bool inclusive_end) const{
+    std::string ret;
+    for (const auto& item : m_ranges){
+        if (!ret.empty()){
+            ret += ", ";
+        }
+        ret += std::to_string(item.first);
+        if (item.second - item.first != 1){
+            ret += "-";
+            ret += std::to_string(inclusive_end ? item.second - 1 : item.second);
+        }
+    }
+    return ret;
+}
+template <typename Type>
+std::string SparseRegion<Type>::dump() const{
+    std::string ret("Sparse Region:");
+    for (const auto& item : m_ranges){
+        ret += "    [" + std::to_string(item.first) + ", " + std::to_string(item.second) + ")\n";
+    }
+    return ret;
+}
+
+
+
+template struct Region<size_t>;
+template class SparseRegion<size_t>;
+
+
+
+}
diff --git a/Common/Cpp/SparseRegion.h b/Common/Cpp/SparseRegion.h
new file mode 100644
index 0000000000..b4bc25be65
--- /dev/null
+++ b/Common/Cpp/SparseRegion.h
@@ -0,0 +1,68 @@
+/*  Sparse Region
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  This file is taken from:
+ *  https://github.com/Mysticial/y-cruncher/blob/master/trunk/Source/PublicLibs/BasicLibs/SparseRegion.h
+ *
+ *  File taken with permission from Mysticial (founder of both projects).
+ *
+ */
+
+#ifndef PokemonAutomation_SparseRegion_H
+#define PokemonAutomation_SparseRegion_H
+
+#include <string>
+#include <map>
+
+namespace PokemonAutomation{
+
+
+template <typename Type>
+struct Region{
+    const Type s;
+    const Type e;
+
+    Region(Type is, Type ie);
+    static Region parse_str(const std::string& str, bool inclusive_end);
+    bool operator==(const Region& x) const;
+};
+
+
+template <typename Type>
+class SparseRegion{
+public:
+    SparseRegion() = default;
+    SparseRegion(const Region<Type>& region){
+        m_ranges[region.s] = region.e;
+    }
+    SparseRegion(const std::string& str, bool inclusive_end);
+
+    bool empty() const{
+        return m_ranges.empty();
+    }
+
+    bool operator==(const Region<Type>& region) const;
+    void operator|=(const Region<Type>& region);
+
+    std::string tostr(bool inclusive_end) const;
+    std::string dump() const;
+
+public:
+    auto cbegin() const{ return m_ranges.cbegin(); }
+    auto begin () const{ return m_ranges.cbegin(); }
+    auto begin ()      { return m_ranges.begin(); }
+    auto cend  () const{ return m_ranges.cend(); }
+    auto end   () const{ return m_ranges.cend(); }
+    auto end   ()      { return m_ranges.end(); }
+
+private:
+    std::map<Type, Type> m_ranges;
+};
+
+
+
+
+
+}
+#endif
diff --git a/Common/Cpp/Stopwatch.h b/Common/Cpp/Stopwatch.h
new file mode 100644
index 0000000000..746dcdb2ba
--- /dev/null
+++ b/Common/Cpp/Stopwatch.h
@@ -0,0 +1,54 @@
+/*  Stop Watch
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_VideoPipeline_Stopwatch_H
+#define PokemonAutomation_VideoPipeline_Stopwatch_H
+
+#include "Time.h"
+
+namespace PokemonAutomation{
+
+
+class Stopwatch{
+public:
+    Stopwatch()
+        : m_total(WallDuration::zero())
+        , m_last_start(WallClock::max())
+    {}
+
+    void start(){
+//        cout << "start" << endl;
+        if (m_last_start != WallClock::max()){
+            return;
+        }
+        m_last_start = current_time();
+    }
+    void stop(){
+//        cout << "stop" << endl;
+        if (m_last_start == WallClock::max()){
+            return;
+        }
+        m_total += current_time() - m_last_start;
+        m_last_start = WallClock::max();
+    }
+    WallDuration total() const{
+        WallDuration ret = m_total;
+        if (m_last_start != WallClock::max()){
+            ret += current_time() - m_last_start;
+        }
+//        cout << "total: " << std::chrono::duration_cast<Milliseconds>(ret).count() << endl;
+        return ret;
+    }
+
+private:
+    WallDuration m_total;
+    WallClock m_last_start;
+};
+
+
+
+}
+#endif
diff --git a/Common/Cpp/StreamConnections/MockDevice.cpp b/Common/Cpp/StreamConnections/MockDevice.cpp
new file mode 100644
index 0000000000..ecf42d80a5
--- /dev/null
+++ b/Common/Cpp/StreamConnections/MockDevice.cpp
@@ -0,0 +1,273 @@
+/*  Mock Device
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <string.h>
+#include <iostream>
+#include "Common/Cpp/Exceptions.h"
+#include "Common/PABotBase2/ReliableConnectionLayer/PABotBase2_ConnectionDebug.h"
+#include "MockDevice.h"
+
+using std::cout;
+using std::endl;
+
+#if 1
+#define PABB2_DROP_HOST_TO_DEVICE   0.01
+#define PABB2_DROP_DEVICE_TO_HOST   0.01
+#else
+#define PABB2_DROP_HOST_TO_DEVICE   0
+#define PABB2_DROP_DEVICE_TO_HOST   0
+#endif
+
+namespace PokemonAutomation{
+
+//extern Mutex print_lock;
+
+
+
+MockDevice::MockDevice(ThreadPool& thread_pool)
+    : m_device_side_connection(*this)
+    , m_host_side_connection(*this)
+    , m_connection(m_device_side_connection)
+    , m_stopping(false)
+{
+    m_device_thread = thread_pool.dispatch_now_blocking([this]{ device_thread(); });
+    m_host_thread = thread_pool.dispatch_now_blocking([this]{ host_recv_thread(); });
+}
+MockDevice::~MockDevice(){
+    m_stopping.store(true, std::memory_order_release);
+    {
+        std::lock_guard<Mutex> lg(m_device_lock);
+    }
+    {
+        std::lock_guard<Mutex> lg(m_host_lock);
+    }
+    m_device_cv.notify_all();
+    m_host_cv.notify_all();
+    m_device_thread.wait_and_ignore_exceptions();
+    m_host_thread.wait_and_ignore_exceptions();
+}
+void MockDevice::print() const{
+    std::lock_guard<Mutex> lg(m_device_lock);
+    std::lock_guard<Mutex> lg1(m_print_lock);
+    m_connection.stream_coalescer().print(true);
+}
+
+
+size_t MockDevice::DeviceSideConnection::unreliable_send(const void* data, size_t bytes) noexcept{
+    MockDevice& parent = m_parent;
+    {
+        WriteSpinLock lg(parent.m_device_to_host_lock);
+//        cout << "MockDevice::device_send_serial()" << endl;
+        if (parent.m_device_to_host_line.size() >= parent.m_device_to_host_capacity){
+            return 0;
+        }
+
+        if ((rand() % 100) / 100. < PABB2_DROP_DEVICE_TO_HOST){
+            std::lock_guard<Mutex> lg1(parent.m_print_lock);
+            cout << "**Intentionally Dropping Packet: device -> host**" << endl;
+            return 0;
+        }
+
+        bytes = std::min(bytes, parent.m_device_to_host_capacity - parent.m_device_to_host_line.size());
+        parent.m_device_to_host_line.insert(
+            parent.m_device_to_host_line.end(),
+            (const uint8_t*)data,
+            (const uint8_t*)data + bytes
+        );
+
+        if ((rand() % 100) / 100. < PABB2_DROP_DEVICE_TO_HOST){
+            std::lock_guard<Mutex> lg1(parent.m_print_lock);
+            cout << "**Intentionally Corrupting Packet: device -> host**" << endl;
+            parent.m_device_to_host_line[rand() % parent.m_device_to_host_line.size()] = 0;
+        }
+    }
+    {
+        std::lock_guard<Mutex> lg(parent.m_host_lock);
+    }
+    parent.m_host_cv.notify_all();
+    return bytes;
+}
+size_t MockDevice::DeviceSideConnection::unreliable_recv(void* data, size_t max_bytes, const WallDuration& timeout) noexcept{
+    MockDevice& parent = m_parent;
+    WriteSpinLock lg(parent.m_host_to_device_lock);
+    size_t bytes = std::min(max_bytes, parent.m_host_to_device_line.size());
+    auto iter0 = parent.m_host_to_device_line.begin();
+    auto iter1 = iter0 + bytes;
+    std::copy(iter0, iter1, (uint8_t*)data);
+    parent.m_host_to_device_line.erase(iter0, iter1);
+
+//    {
+//        std::lock_guard<Mutex> lg1(PokemonAutomation::print_lock);
+//        cout << "device_read_serial(): attempt = " << max_bytes << ", actual = " << bytes << endl;
+//    }
+
+//    if (bytes > 0){
+//        PacketHeader_check((const PABotBase2::PacketHeader*)data, true);
+//    }
+
+    return bytes;
+}
+
+
+size_t MockDevice::HostSideConnection::unreliable_send(const void* data, size_t bytes) noexcept{
+    MockDevice& parent = m_parent;
+    {
+        WriteSpinLock lg(parent.m_host_to_device_lock);
+//        cout << "MockDevice::send(const void* data, size_t bytes)" << endl;
+
+#if 0
+        if (((const PABotBase2::PacketHeader*)data)->magic_number != 0x81){
+            cout << "corrupted packet!" << endl;
+            PABotBase2::PacketHeader_print((const PABotBase2::PacketHeader*)data, true);
+        }
+        PABotBase2::PacketHeader_check((const PABotBase2::PacketHeader*)data, true);
+#endif
+
+        if ((rand() % 100) / 100. < PABB2_DROP_HOST_TO_DEVICE){
+            std::lock_guard<Mutex> lg1(parent.m_print_lock);
+            cout << "**Intentionally Dropping Packet: host -> device**" << endl;
+            return 0;
+        }
+
+        if (parent.m_host_to_device_line.size() >= parent.m_host_to_device_capacity){
+            return 0;
+        }
+
+//        bytes = std::min(bytes, m_host_to_device_capacity - m_host_to_device_line.size());
+//        cout << "MockDevice::send(): " << bytes << endl;
+
+        parent.m_host_to_device_line.insert(
+            parent.m_host_to_device_line.end(),
+            (const uint8_t*)data,
+            (const uint8_t*)data + bytes
+        );
+
+        if ((rand() % 100) / 100. < PABB2_DROP_HOST_TO_DEVICE){
+            std::lock_guard<Mutex> lg1(parent.m_print_lock);
+            cout << "**Intentionally Corrupting Packet: host -> device**" << endl;
+            parent.m_host_to_device_line[rand() % parent.m_host_to_device_line.size()] = 0;
+        }
+    }
+    {
+        std::lock_guard<Mutex> lg(parent.m_device_lock);
+//        cout << "MockDevice::send(const void* data, size_t bytes) - notifying" << endl;
+    }
+    parent.m_device_cv.notify_all();
+    return bytes;
+}
+
+void MockDevice::push_expected_stream_data(const void* data, size_t bytes){
+    {
+        std::lock_guard<Mutex> lg(m_device_lock);
+
+        m_expected_host_to_device_stream.insert(
+            m_expected_host_to_device_stream.end(),
+            (const uint8_t*)data,
+            (const uint8_t*)data + bytes
+        );
+    }
+    verify_stream_data();
+}
+size_t MockDevice::verify_stream_data(){
+    std::lock_guard<Mutex> lg(m_device_lock);
+    size_t bytes = m_expected_host_to_device_stream.size();
+
+    std::vector<uint8_t> actual(bytes);
+    size_t read = m_connection.reliable_recv(actual.data(), bytes);
+
+    if (read == 0){
+        return bytes;
+    }
+
+
+#if 0
+    {
+        std::lock_guard<Mutex> lg1(m_print_lock);
+        cout << "read = " << read << endl;
+    }
+#endif
+
+
+    std::vector<uint8_t> expected(
+        m_expected_host_to_device_stream.begin(),
+        m_expected_host_to_device_stream.begin() + read
+    );
+
+    m_expected_host_to_device_stream.erase(
+        m_expected_host_to_device_stream.begin(),
+        m_expected_host_to_device_stream.begin() + read
+    );
+
+    bool matched = memcmp(actual.data(), expected.data(), read) == 0;
+
+    std::lock_guard<Mutex> lg1(m_print_lock);
+    if (matched){
+#if 0
+        cout << "Matched: Bytes = " << read
+             << ", Remaining = " << m_expected_host_to_device_stream.size()
+             << ", Matched = "
+             << std::string((const char*)actual.data(), read)
+             << endl;
+#endif
+    }else{
+        cout << "MISMATCH: Expected = "
+             << std::string((const char*)expected.data(), read)
+             << ", Actual = "
+             << std::string((const char*)actual.data(), read)
+             << endl;
+        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Mismatch");
+    }
+    return m_expected_host_to_device_stream.size();
+}
+
+
+
+
+void MockDevice::device_thread(){
+    std::unique_lock<Mutex> lg(m_device_lock);
+    while (!m_stopping.load(std::memory_order_relaxed)){
+        m_connection.run_send_events(Milliseconds(0));
+        m_connection.run_recv_events(Milliseconds(0));
+        m_device_cv.wait_for(lg, Milliseconds(10));
+    }
+}
+void MockDevice::host_recv_thread(){
+    while (!m_stopping.load(std::memory_order_relaxed)){
+        std::vector<uint8_t> data;
+        {
+            std::unique_lock<Mutex> lg0(m_host_lock);
+            {
+                WriteSpinLock lg1(m_device_to_host_lock);
+                data = std::vector<uint8_t>(m_device_to_host_line.begin(), m_device_to_host_line.end());
+                m_device_to_host_line.clear();
+            }
+//            cout << "data.size() = " << data.size() << endl;
+            if (data.empty()){
+                m_host_cv.wait(lg0);
+                continue;
+            }
+        }
+//        cout << "Passing data to host: " << data.size() << endl;
+        m_host_side_connection.on_unreliable_recv(data.data(), data.size());
+    }
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}
diff --git a/Common/Cpp/StreamConnections/MockDevice.h b/Common/Cpp/StreamConnections/MockDevice.h
new file mode 100644
index 0000000000..b1eaef53cd
--- /dev/null
+++ b/Common/Cpp/StreamConnections/MockDevice.h
@@ -0,0 +1,106 @@
+/*  Mock Device
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_MockDevice_H
+#define PokemonAutomation_MockDevice_H
+
+#include <deque>
+#include "Common/Cpp/StreamConnections/PollingStreamConnections.h"
+#include "Common/Cpp/StreamConnections/PushingStreamConnections.h"
+#include "Common/Cpp/Concurrency/Mutex.h"
+#include "Common/Cpp/Concurrency/ConditionVariable.h"
+#include "Common/Cpp/Concurrency/AsyncTask.h"
+#include "Common/Cpp/Concurrency/ThreadPool.h"
+#include "Common/PABotBase2/ReliableConnectionLayer/PABotBase2FW_ReliableStreamConnection.h"
+
+namespace PokemonAutomation{
+
+
+
+
+class MockDevice{
+public:
+    MockDevice(ThreadPool& thread_pool);
+    ~MockDevice();
+
+    void print() const;
+
+    Mutex& print_lock() const{
+        return m_print_lock;
+    }
+
+    UnreliableStreamConnectionPolling& device_side_connection(){
+        return m_device_side_connection;
+    }
+
+    UnreliableStreamConnectionPushing& host_side_connection(){
+        return m_host_side_connection;
+    }
+
+
+public:
+    //  Call from host.
+
+    void push_expected_stream_data(const void* data, size_t bytes);
+    size_t verify_stream_data();
+
+
+private:
+    void device_thread();
+    void host_recv_thread();
+
+
+private:
+    class DeviceSideConnection : public UnreliableStreamConnectionPolling{
+    public:
+        DeviceSideConnection(MockDevice& parent) : m_parent(parent) {}
+        virtual size_t unreliable_send(const void* data, size_t bytes) noexcept override;
+        virtual size_t unreliable_recv(void* data, size_t max_bytes, const WallDuration& timeout) noexcept override;
+    private:
+        MockDevice& m_parent;
+    };
+
+    class HostSideConnection : public UnreliableStreamConnectionPushing{
+    public:
+        HostSideConnection(MockDevice& parent) : m_parent(parent) {}
+        virtual size_t unreliable_send(const void* data, size_t bytes) noexcept override;
+        using UnreliableStreamConnectionPushing::on_unreliable_recv;
+    private:
+        MockDevice& m_parent;
+    };
+
+    DeviceSideConnection m_device_side_connection;
+    HostSideConnection m_host_side_connection;
+
+    PABotBase2::ReliableStreamConnectionFW m_connection;
+
+    SpinLock m_device_to_host_lock;
+    size_t m_device_to_host_capacity = 1024;
+    std::deque<uint8_t> m_device_to_host_line;
+
+    SpinLock m_host_to_device_lock;
+    size_t m_host_to_device_capacity = 1024;
+    std::deque<uint8_t> m_host_to_device_line;
+
+    std::deque<uint8_t> m_expected_host_to_device_stream;
+
+    std::atomic<bool> m_stopping;
+
+    mutable Mutex m_device_lock;
+    ConditionVariable m_device_cv;
+    AsyncTask m_device_thread;
+
+    mutable Mutex m_host_lock;
+    ConditionVariable m_host_cv;
+    AsyncTask m_host_thread;
+
+    mutable Mutex m_print_lock;
+};
+
+
+
+}
+#endif
diff --git a/Common/Cpp/StreamConnections/PollingStreamConnections.h b/Common/Cpp/StreamConnections/PollingStreamConnections.h
new file mode 100644
index 0000000000..dee5f01626
--- /dev/null
+++ b/Common/Cpp/StreamConnections/PollingStreamConnections.h
@@ -0,0 +1,81 @@
+/*  Polling Stream Connection
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_StreamConnections_PollingStreamConnections_H
+#define PokemonAutomation_StreamConnections_PollingStreamConnections_H
+
+#include <stddef.h>
+#include "StreamInterface.h"
+
+#ifdef PABB2_FIRMWARE
+#include "PabbTime.h"
+#else
+#include "Common/Cpp/Time.h"
+#endif
+
+namespace PokemonAutomation{
+
+
+class UnreliableStreamConnectionPolling : public UnreliableStreamSender{
+public:
+    virtual size_t unreliable_recv(void* data, size_t max_bytes, const WallDuration& timeout) noexcept = 0;
+};
+
+
+class ReliableStreamConnectionPolling{
+public:
+    virtual void lock() noexcept = 0;
+    virtual void unlock() noexcept = 0;
+
+    //
+    //  These 3 functions are not thread/IRQ safe with anything else.
+    //  If needed call these under the lock above.
+    //
+
+    //  Enqueue the specified data into the uncommitted stream.
+    //  On success, returns true.
+    //  On fail, return false and aborts all uncommitted sends.
+    virtual bool enqueue_uncommitted_reliable_sends(const void* data, size_t bytes) noexcept = 0;
+
+    //  Cancels all uncommitted sends.
+    virtual void abort_uncommitted_reliable_sends() noexcept = 0;
+
+    //  Commits all uncommitted sends to stream.
+    virtual void commit_uncommitted_reliable_sends() noexcept = 0;
+
+
+public:
+    virtual bool reliable_send_all_or_nothing(const void* data, size_t bytes) noexcept{
+        lock();
+        bool success = enqueue_uncommitted_reliable_sends(data, bytes);
+        if (success){
+            commit_uncommitted_reliable_sends();
+        }
+        unlock();
+        return success;
+    }
+
+
+public:
+    //  If (data == nullptr), throw away the data.
+    virtual size_t reliable_recv(void* data, size_t max_bytes) = 0;
+
+    virtual bool reset_flag_set() const{ return false; }
+    virtual void clear_reset_flag(){}
+
+    virtual bool run_send_events(const WallDuration& timeout) noexcept{
+        return false;
+    }
+    virtual bool run_recv_events(const WallDuration& timeout) noexcept{
+        return false;
+    }
+};
+
+
+
+
+}
+#endif
diff --git a/Common/Cpp/StreamConnections/PushingStreamConnections.h b/Common/Cpp/StreamConnections/PushingStreamConnections.h
new file mode 100644
index 0000000000..1b4344e5b6
--- /dev/null
+++ b/Common/Cpp/StreamConnections/PushingStreamConnections.h
@@ -0,0 +1,75 @@
+/*  Pushing Stream Connection
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_StreamConnections_PushingStreamConnections_H
+#define PokemonAutomation_StreamConnections_PushingStreamConnections_H
+
+#include "Common/Cpp/Time.h"
+#include "Common/Cpp/ListenerSet.h"
+#include "StreamInterface.h"
+
+namespace PokemonAutomation{
+
+class Cancellable;
+
+
+class StreamConnectionPushing{
+public:
+    virtual ~StreamConnectionPushing(){}
+    virtual void stop() noexcept{};
+
+    void add_listener(StreamListener& listener){
+        m_listeners.add(listener);
+    }
+    void remove_listener(StreamListener& listener) noexcept{
+        m_listeners.remove(listener);
+    }
+
+protected:
+    ListenerSet<StreamListener> m_listeners;
+};
+
+
+class UnreliableStreamConnectionPushing : public StreamConnectionPushing, public UnreliableStreamSender{
+protected:
+    void on_unreliable_recv(const void* data, size_t bytes){
+        m_listeners.run_method(&StreamListener::on_recv, data, bytes);
+    }
+};
+
+
+class ReliableStreamConnectionPushing : public StreamConnectionPushing{
+public:
+    //  Throws exception if cancelled or connection is dead.
+    virtual void reliable_send_all_or_nothing(
+        Cancellable* cancellable,
+        const void* data, size_t bytes
+    ) = 0;
+
+    //  Returns false if cannot send within timeout.
+    //  Throws exception if cancelled or connection is dead.
+    [[nodiscard]] virtual bool reliable_send_all_or_nothing(
+        Cancellable* cancellable,
+        const void* data, size_t bytes,
+        WallClock deadline
+    ) = 0;
+
+    //  Wait until the remote has acked everything sent so far.
+    //  Returns false if this doesn't happen within the timeout.
+    //  Throws exception if connection is dead.
+    virtual bool wait_for_pending(WallDuration timeout) = 0;
+
+protected:
+    void on_reliable_recv(const void* data, size_t bytes){
+        m_listeners.run_method(&StreamListener::on_recv, data, bytes);
+    }
+};
+
+
+
+
+}
+#endif
diff --git a/Common/Cpp/StreamConnections/ReliableStreamConnection.cpp b/Common/Cpp/StreamConnections/ReliableStreamConnection.cpp
new file mode 100644
index 0000000000..10fcee4968
--- /dev/null
+++ b/Common/Cpp/StreamConnections/ReliableStreamConnection.cpp
@@ -0,0 +1,521 @@
+/*  Reliable Stream Connection
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+//#include "Common/Cpp/PrettyPrint.h"
+//#include "Common/Cpp/Exceptions.h"
+#include "Common/Cpp/StreamConnections/PABotBase2_MessageDumper.h"
+#include "Common/PABotBase2/ConnectionLayer/PABotBase2_ConnectionDebug.h"
+#include "ReliableStreamConnection.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+
+
+
+ReliableStreamConnection::ReliableStreamConnection(
+    CancellableScope* parent,
+    Logger& logger, bool log_everything,
+    ThreadPool& thread_pool,
+    UnreliableStreamConnectionPushing& unreliable_connection,
+    WallDuration retransmit_timeout,
+    Mutex* print_lock
+)
+    : m_logger(logger)
+    , m_unreliable_connection(unreliable_connection)
+    , m_retransmit_timeout(retransmit_timeout)
+    , m_print_lock(print_lock)
+    , m_reliable_sender(*this, 20)
+    , m_log_everything(log_everything)
+//    , m_version_verified(false)
+    , m_remote_protocol_compatible(false)
+    , m_remote_protocol(0)
+    , m_remote_slot_capacity(1)
+    , m_remote_buffer_capacity(PABB2_PacketSender_BUFFER_SIZE)
+{
+    m_retransmit_thread = thread_pool.dispatch_now_blocking(
+        [this]{ retransmit_thread(); }
+    );
+
+    m_unreliable_connection.add_listener(*this);
+    if (parent){
+        attach(*parent);
+    }
+}
+
+ReliableStreamConnection::~ReliableStreamConnection(){
+    cancel(nullptr);
+    detach();
+    m_unreliable_connection.remove_listener(*this);
+    m_retransmit_thread.wait_and_ignore_exceptions();
+}
+
+bool ReliableStreamConnection::cancel(std::exception_ptr exception) noexcept{
+    if (Cancellable::cancel(std::move(exception))){
+        return true;
+    }
+    {
+        std::lock_guard<Mutex> lg(m_lock);
+        m_error = "Connection has been closed.";
+    }
+    m_cv.notify_all();
+    return false;
+}
+size_t ReliableStreamConnection::pending() const{
+    std::unique_lock<Mutex> lg(m_lock);
+    return m_reliable_sender.slots_used();
+}
+void ReliableStreamConnection::wait_for_pending(){
+    std::unique_lock<Mutex> lg(m_lock);
+    m_cv.wait(lg, [this]{
+        return this->cancelled() || m_reliable_sender.slots_used() == 0;
+    });
+    throw_if_cancelled();
+}
+
+
+
+//
+//  StreamSender/StreamListener
+//
+
+void ReliableStreamConnection::reliable_send(const void* data, size_t bytes){
+    const char* ptr = (const char*)data;
+    std::unique_lock<Mutex> lg(m_lock);
+    while (bytes > 0){
+        throw_if_cancelled();
+        if (m_reliable_sender.slots_used() >= m_remote_slot_capacity){
+            m_cv.wait(lg);
+        }
+        size_t sent = m_reliable_sender.send_stream(ptr, bytes);
+        ptr += sent;
+        bytes -= sent;
+    }
+}
+void ReliableStreamConnection::on_recv(const void* data, size_t bytes){
+#if 0
+    if (m_print_lock){
+        std::lock_guard<Mutex> lg(*m_print_lock);
+        cout << "ReliableStreamConnection::on_recv(): " << bytes << endl;
+    }
+#endif
+    m_parser.push_bytes(*this, (const uint8_t*)data, bytes);
+}
+
+
+
+//
+//  PABotBase2::StreamConnection
+//
+
+size_t ReliableStreamConnection::unreliable_send(const void* data, size_t bytes){
+    const PacketHeader* header = (const PacketHeader*)data;
+    uint8_t opcode = header->opcode & PABB2_CONNECTION_OPCODE_MASK;
+    bool retransmit = header->opcode & PABB2_CONNECTION_RETRANSMIT_FLAG;
+
+    bool always_log =
+        opcode != PABB2_CONNECTION_OPCODE_ASK_STREAM_DATA &&
+        opcode != PABB2_CONNECTION_OPCODE_RET_STREAM_DATA;
+
+    if (retransmit){
+        m_logger.log(
+            "[RSC]: Re-send: " + tostr(header),
+            COLOR_ORANGE
+        );
+    }else if (m_log_everything || always_log){
+        m_logger.log(
+            "[RSC]: Sending: " + tostr(header),
+            COLOR_DARKGREEN
+        );
+//        PABotBase2::PacketHeader_print(header, true);   //  REMOVE
+    }
+//    cout << "ReliableStreamConnection::unreliable_send() - before send" << endl;
+    return m_unreliable_connection.unreliable_send(data, bytes);
+}
+
+
+
+//
+//  Send Path
+//
+
+void ReliableStreamConnection::reset(){
+    {
+        std::lock_guard<Mutex> lg(m_lock);
+        m_reliable_sender.reset();
+        m_parser.reset();
+        m_stream_coalescer.reset();
+        throw_if_cancelled();
+        m_reliable_sender.send_packet(PABB2_CONNECTION_OPCODE_ASK_RESET, 0, nullptr);
+    }
+    m_cv.notify_all();
+    wait_for_pending();
+}
+
+bool ReliableStreamConnection::try_send_request(uint8_t opcode){
+    std::lock_guard<Mutex> lg(m_lock);
+//    cout << "Sending: " << tostr_hex(opcode) << endl;
+    throw_if_cancelled();
+    if (m_reliable_sender.slots_used() >= m_remote_slot_capacity){
+        return 0;
+    }
+    return m_reliable_sender.send_packet(opcode, 0, nullptr);
+}
+void ReliableStreamConnection::send_request(uint8_t opcode){
+    std::unique_lock<Mutex> lg(m_lock);
+    while (true){
+        throw_if_cancelled();
+        if (m_reliable_sender.slots_used() < m_remote_slot_capacity &&
+            m_reliable_sender.send_packet(opcode, 0, nullptr)
+        ){
+            return;
+        }
+        m_cv.wait(lg);
+    }
+}
+
+void ReliableStreamConnection::print() const{
+    std::unique_lock<Mutex> lg(m_lock);
+    m_reliable_sender.print(true);
+//    StreamCoalescer_print(&m_stream_coalescer, true);
+}
+
+
+void ReliableStreamConnection::send_ack(uint8_t seqnum, uint8_t opcode){
+    //  Must call inside lock.
+    struct{
+        PacketHeader header;
+        uint8_t crc[sizeof(uint32_t)];
+    } packet;
+    packet.header.magic_number = PABB2_CONNECTION_MAGIC_NUMBER;
+    packet.header.seqnum = seqnum;
+    packet.header.packet_bytes = sizeof(packet);
+    packet.header.opcode = opcode;
+    pabb_crc32_write_to_message(&packet, sizeof(packet));
+    unreliable_send(&packet, sizeof(packet));
+}
+void ReliableStreamConnection::send_ack_u16(uint8_t seqnum, uint8_t opcode, uint16_t data){
+    //  Must call inside lock.
+    struct{
+        PacketHeader_Ack_u16 header;
+        uint8_t crc[sizeof(uint32_t)];
+    } packet;
+    packet.header.magic_number = PABB2_CONNECTION_MAGIC_NUMBER;
+    packet.header.seqnum = seqnum;
+    packet.header.packet_bytes = sizeof(packet);
+    packet.header.opcode = opcode;
+    packet.header.data = data;
+    pabb_crc32_write_to_message(&packet, sizeof(packet));
+    unreliable_send(&packet, sizeof(packet));
+}
+
+void ReliableStreamConnection::retransmit_thread(){
+    WallClock next_retransmit = current_time() + m_retransmit_timeout;
+    while (true){
+        std::unique_lock<Mutex> lg(m_lock);
+        if (this->cancelled()){
+            break;
+        }
+
+        m_cv.wait_until(lg, next_retransmit);
+
+        if (this->cancelled()){
+            break;
+        }
+        if (m_reliable_sender.slots_used() == 0){
+            continue;
+        }
+        if (current_time() < next_retransmit){
+            continue;
+        }
+
+//        cout << "running retransmits" << endl;
+
+#if 1
+        if (!m_reliable_sender.iterate_retransmits()){
+//            cout << "nothing to do" << endl;
+            next_retransmit = current_time() + m_retransmit_timeout;
+        }else{
+//            cout << "did something" << endl;
+        }
+#else
+        next_retransmit = current_time() + m_retransmit_timeout;
+#endif
+    }
+}
+
+
+
+//
+//  PABotBase2::PacketRunner
+//
+
+void ReliableStreamConnection::on_packet(const PacketHeader* packet){
+    uint8_t status = packet->magic_number;
+
+//    {
+//        std::lock_guard<Mutex> lg(PokemonAutomation::print_lock);
+//        cout << "on_packet(): seqnum = [" << (int)packet->seqnum << "], opcode = " << (int)packet->opcode << endl;
+//    }
+
+//    cout << "on_packet(): ";
+//    PABotBase2::print_bytes(packet, packet->packet_bytes, false);
+//    cout << endl;
+
+    //
+    //  Process the packet status.
+    //
+
+    switch (status){
+    case PABB2_PacketParser_RESULT_VALID:
+        break;
+    case PABB2_PacketParser_RESULT_INVALID:
+        m_logger.log(
+            "[RSC]: INVALID PACKET: Received invalid packet from device.",
+            COLOR_RED
+        );
+        return;
+    case PABB2_PacketParser_RESULT_CHECKSUM_FAIL:
+        m_logger.log(
+            "[RSC]: CHECKSUM MISMATCH: Received bad data from device: bytes = " + std::to_string(packet->packet_bytes),
+//            "[RSC]: CHECKSUM MISMATCH: Received bad data from device: bytes = " + tostr(packet),
+            COLOR_RED
+        );
+        return;
+    default:
+        m_logger.log(
+            "[RSC]: Internal Error: Packet parser returned invalid code: " + std::to_string(status),
+            COLOR_RED
+        );
+        return;
+    }
+
+
+
+    //
+    //  Process the packet itself.
+    //
+
+    if (m_log_everything){
+        m_logger.log("[RSC]: Receive: " + tostr(packet), COLOR_PURPLE);
+    }
+
+    uint8_t opcode = packet->opcode & PABB2_CONNECTION_OPCODE_MASK;
+    switch (opcode){
+    case PABB2_CONNECTION_OPCODE_INVALID_LENGTH:
+        m_logger.log(
+            "[RSC]: PABB2_CONNECTION_OPCODE_INVALID_LENGTH: Device reported an invalid message length.",
+            COLOR_RED
+        );
+        return;
+    case PABB2_CONNECTION_OPCODE_INVALID_CHECKSUM_FAIL:
+        m_logger.log(
+            "[RSC]: PABB2_CONNECTION_OPCODE_INVALID_CHECKSUM_FAIL: Device reported a checksum mismatch.",
+            COLOR_RED
+        );
+        return;
+    case PABB2_CONNECTION_OPCODE_UNKNOWN_OPCODE:
+        process_UNKNOWN_OPCODE(packet);
+        return;
+    case PABB2_CONNECTION_OPCODE_ASK_STREAM_DATA:
+        process_ASK_STREAM_DATA(packet);
+        return;
+    case PABB2_CONNECTION_OPCODE_RET_STREAM_DATA:
+        process_RET_STREAM_DATA(packet);
+        return;
+    case PABB2_CONNECTION_OPCODE_RET_RESET:
+        process_RET_RESET(packet);
+        return;
+    case PABB2_CONNECTION_OPCODE_RET_VERSION:
+        process_RET_VERSION(packet);
+        return;
+    case PABB2_CONNECTION_OPCODE_RET_PACKET_SIZE:
+        process_RET_PACKET_SIZE(packet);
+        return;
+    case PABB2_CONNECTION_OPCODE_RET_BUFFER_SLOTS:
+        process_RET_BUFFER_SLOTS(packet);
+        return;
+    case PABB2_CONNECTION_OPCODE_INFO:
+    case PABB2_CONNECTION_OPCODE_INFO_U8:
+    case PABB2_CONNECTION_OPCODE_INFO_U16:
+    case PABB2_CONNECTION_OPCODE_INFO_U32:
+//        cout << "Received ack" << endl;
+        if (!m_log_everything){
+            m_logger.log("[RSC]: Receive: " + tostr(packet), COLOR_PURPLE);
+        }
+        return;
+    default:
+        m_logger.log(
+            "[RSC]: UNKNOWN OPCODE: Device send an unknown opcode: " + std::to_string(packet->opcode),
+            COLOR_RED
+        );
+        return;
+    }
+}
+void ReliableStreamConnection::process_UNKNOWN_OPCODE(const PacketHeader* packet){
+    std::lock_guard<Mutex> lg(m_lock);
+    if (packet->packet_bytes < sizeof(PacketHeader_Ack_u8) + sizeof(uint32_t)){
+        m_error = "Unknown opcode packet is too small: " + std::to_string(packet->packet_bytes);
+        m_logger.log("[RSC]: " + m_error, COLOR_RED);
+        return;
+    }
+
+    const PacketHeader_Ack_u8* message = (const PacketHeader_Ack_u8*)packet;
+    m_logger.log(
+        "[RSC]: PABB2_CONNECTION_OPCODE_INVALID_OPCODE: Device reported an invalid opcode: " +
+        std::to_string(message->data),
+        COLOR_RED
+    );
+}
+void ReliableStreamConnection::process_RET_RESET(const PacketHeader* packet){
+    {
+        std::lock_guard<Mutex> lg(m_lock);
+        m_reliable_sender.remove(packet->seqnum);
+    }
+    m_cv.notify_all();
+}
+void ReliableStreamConnection::process_RET_VERSION(const PacketHeader* packet){
+//    m_logger.log(tostr(packet), COLOR_DARKGREEN);
+    do{
+        std::lock_guard<Mutex> lg(m_lock);
+        if (packet->packet_bytes < sizeof(PacketHeader_Ack_u32) + sizeof(uint32_t)){
+            m_error = "Version response is too small: " + std::to_string(packet->packet_bytes);
+            m_logger.log("[RSC]: " + m_error, COLOR_RED);
+            break;
+        }
+        m_reliable_sender.remove(packet->seqnum);
+
+        const PacketHeader_Ack_u32* message = (const PacketHeader_Ack_u32*)packet;
+        uint32_t protocol = message->data;
+        m_remote_protocol = protocol;
+        std::string str = "Remote Protocol: " + std::to_string(protocol);
+        uint32_t major_version = protocol / 100;
+        uint32_t minor_version = protocol % 100;
+        m_remote_protocol_compatible =
+            major_version == PABB2_CONNECTION_PROTOCOL_VERSION / 100 &&
+            minor_version >= PABB2_CONNECTION_PROTOCOL_VERSION % 100;
+        if (!m_remote_protocol_compatible){
+            m_error = str + " (incompatible)";
+            m_logger.log("[RSC]: " + m_error, COLOR_RED);
+            break;
+        }
+
+        m_logger.log("[RSC]: " + str + " (compatible)", COLOR_BLUE);
+        m_reliable_sender.remove(packet->seqnum);
+
+    }while (false);
+    m_cv.notify_all();
+}
+void ReliableStreamConnection::process_RET_PACKET_SIZE(const PacketHeader* packet){
+    if (packet->packet_bytes < sizeof(PacketHeader_Ack_u16) + sizeof(uint32_t)){
+        m_logger.log(
+            "[RSC]: Packet size response is too small: " + std::to_string(packet->packet_bytes),
+            COLOR_RED
+        );
+        return;
+    }
+    const PacketHeader_Ack_u16* message = (const PacketHeader_Ack_u16*)packet;
+    m_logger.log(
+        "[RSC]: Setting Packet Size to: " + std::to_string(message->data),
+        COLOR_BLUE
+    );
+    {
+        std::lock_guard<Mutex> lg(m_lock);
+        m_reliable_sender.remove(packet->seqnum);
+        m_reliable_sender.set_max_packet_size((uint8_t)message->data);
+    }
+    m_cv.notify_all();
+}
+void ReliableStreamConnection::process_RET_BUFFER_SLOTS(const PacketHeader* packet){
+    if (packet->packet_bytes < sizeof(PacketHeader_Ack_u8) + sizeof(uint32_t)){
+        m_logger.log(
+            "[RSC]: Buffer slot response is too small: " + std::to_string(packet->packet_bytes),
+            COLOR_RED
+        );
+        return;
+    }
+    const PacketHeader_Ack_u8* message = (const PacketHeader_Ack_u8*)packet;
+    m_logger.log(
+        "[RSC]: Setting Buffer Slots to: " + std::to_string(message->data),
+        COLOR_BLUE
+    );
+    {
+        std::lock_guard<Mutex> lg(m_lock);
+        m_reliable_sender.remove(packet->seqnum);
+        m_remote_slot_capacity = std::min<uint8_t>(message->data, PABB2_PacketSender_SLOTS);
+    }
+    m_cv.notify_all();
+}
+void ReliableStreamConnection::process_RET_BUFFER_BYTES(const PacketHeader* packet){
+    if (packet->packet_bytes < sizeof(PacketHeader_Ack_u16) + sizeof(uint32_t)){
+        m_logger.log(
+            "[RSC]: Buffer slot response is too small: " + std::to_string(packet->packet_bytes),
+            COLOR_RED
+        );
+        return;
+    }
+    const PacketHeader_Ack_u16* message = (const PacketHeader_Ack_u16*)packet;
+    m_logger.log(
+        "[RSC]: Setting Buffer Slots to: " + std::to_string(message->data),
+        COLOR_BLUE
+    );
+    {
+        std::lock_guard<Mutex> lg(m_lock);
+        m_reliable_sender.remove(packet->seqnum);
+        m_remote_buffer_capacity = std::min<uint16_t>(message->data, PABB2_PacketSender_BUFFER_SIZE);
+    }
+    m_cv.notify_all();
+}
+
+
+void ReliableStreamConnection::process_ASK_STREAM_DATA(const PacketHeader* packet){
+//    cout << "process_ASK_STREAM_DATA()" << endl;
+    if (packet->packet_bytes < sizeof(PacketHeaderData) + sizeof(uint32_t)){
+        m_logger.log(
+            "[RSC]: Received stream packet that is too small: " + std::to_string(packet->packet_bytes),
+            COLOR_RED
+        );
+        return;
+    }
+    {
+        std::lock_guard<Mutex> lg(m_lock);
+        if (!m_stream_coalescer.push_stream((const PacketHeaderData*)packet)){
+//            cout << "push_stream() failed" << endl;
+            return;
+        }
+//        cout << "Calling: send_ack_u16()" << endl;
+        send_ack_u16(
+            packet->seqnum,
+            PABB2_CONNECTION_OPCODE_RET_STREAM_DATA,
+            m_stream_coalescer.free_bytes()
+        );
+
+        char buffer[4096];
+//        m_stream_coalescer.print(false);
+        size_t bytes = m_stream_coalescer.read(buffer, sizeof(buffer));
+//        cout << "bytes = " << bytes << endl;
+        if (bytes != 0){
+            on_reliable_recv(buffer, bytes);
+        }
+    }
+//    m_cv.notify_all();
+}
+void ReliableStreamConnection::process_RET_STREAM_DATA(const PacketHeader* packet){
+    {
+        std::lock_guard<Mutex> lg(m_lock);
+//        pabb2_PacketSender_print(&m_reliable_sender, true);
+        m_reliable_sender.remove(packet->seqnum);
+//        pabb2_PacketSender_print(&m_reliable_sender, true);
+    }
+    m_cv.notify_all();
+}
+
+
+
+
+
+}
diff --git a/Common/Cpp/StreamConnections/ReliableStreamConnection.h b/Common/Cpp/StreamConnections/ReliableStreamConnection.h
new file mode 100644
index 0000000000..adc03bacf4
--- /dev/null
+++ b/Common/Cpp/StreamConnections/ReliableStreamConnection.h
@@ -0,0 +1,154 @@
+/*  Reliable Stream Connection
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_ReliableStreamConnection_H
+#define PokemonAutomation_ReliableStreamConnection_H
+
+#include "Common/Cpp/Time.h"
+#include "Common/Cpp/CancellableScope.h"
+#include "Common/Cpp/Logging/AbstractLogger.h"
+#include "Common/Cpp/Concurrency/Mutex.h"
+#include "Common/Cpp/Concurrency/ConditionVariable.h"
+#include "Common/Cpp/Concurrency/AsyncTask.h"
+#include "Common/Cpp/Concurrency/ThreadPool.h"
+#include "Common/Cpp/StreamConnections/PushingStreamConnections.h"
+#include "Common/PABotBase2/ConnectionLayer/PABotBase2_PacketSender.h"
+#include "Common/PABotBase2/ConnectionLayer/PABotBase2_PacketParser.h"
+#include "Common/PABotBase2/ConnectionLayer/PABotBase2_StreamCoalescer.h"
+
+namespace PokemonAutomation{
+
+
+
+class ReliableStreamConnection final
+    : public CancellableScope
+    , public ReliableStreamConnectionPushing
+    , private UnreliableStreamSender
+    , private PABotBase2::PacketRunner
+    , private StreamListener
+{
+    using PacketHeader = PABotBase2::PacketHeader;
+    using PacketHeader_Ack_u8 = PABotBase2::PacketHeader_Ack_u8;
+    using PacketHeader_Ack_u16 = PABotBase2::PacketHeader_Ack_u16;
+    using PacketHeader_Ack_u32 = PABotBase2::PacketHeader_Ack_u32;
+    using PacketHeaderData = PABotBase2::PacketHeaderData;
+
+public:
+    ReliableStreamConnection(
+        CancellableScope* parent,
+        Logger& logger, bool log_everything,
+        ThreadPool& thread_pool,
+        UnreliableStreamConnectionPushing& unreliable_connection,
+        WallDuration retransmit_timeout = Milliseconds(100),
+        Mutex* print_lock = nullptr
+    );
+    ~ReliableStreamConnection();
+
+    virtual void stop() override{
+        cancel(nullptr);
+    }
+    virtual bool cancel(std::exception_ptr exception) noexcept override;
+
+    void reset();
+
+    bool remote_protocol_is_compatible() const{
+        return m_remote_protocol_compatible;
+    }
+    uint32_t remote_protocol() const{
+        return m_remote_protocol;
+    }
+    const std::string& error_string() const{
+        return m_error;
+    }
+
+    size_t pending() const;
+    void wait_for_pending();
+
+
+public:
+    //  Send in-band
+
+    bool try_send_request(uint8_t opcode);
+    void send_request(uint8_t opcode);
+
+    void send_stream(const void* data, size_t bytes){
+        reliable_send(data, bytes);
+    }
+
+
+public:
+    //  Debugging
+
+    void print() const;
+    Mutex* print_lock() const{
+        return m_print_lock;
+    }
+
+
+
+private:
+    //  Send
+
+    void send_ack(uint8_t seqnum, uint8_t opcode);
+    void send_ack_u16(uint8_t seqnum, uint8_t opcode, uint16_t data);
+
+    void retransmit_thread();
+
+
+private:
+    virtual void reliable_send(const void* data, size_t bytes) override;
+    virtual void on_recv(const void* data, size_t bytes) override;
+    virtual size_t unreliable_send(const void* data, size_t bytes) override;
+
+
+private:
+    //  Virtuals: PABotBase2::PacketRunner
+
+    virtual void on_packet(const PacketHeader* packet) override;
+
+    void process_UNKNOWN_OPCODE(const PacketHeader* packet);
+    void process_RET_RESET(const PacketHeader* packet);
+    void process_RET_VERSION(const PacketHeader* packet);
+    void process_RET_PACKET_SIZE(const PacketHeader* packet);
+    void process_RET_BUFFER_SLOTS(const PacketHeader* packet);
+    void process_RET_BUFFER_BYTES(const PacketHeader* packet);
+
+    void process_ASK_STREAM_DATA(const PacketHeader* packet);
+    void process_RET_STREAM_DATA(const PacketHeader* packet);
+
+
+private:
+    Logger& m_logger;
+    UnreliableStreamConnectionPushing& m_unreliable_connection;
+    const WallDuration m_retransmit_timeout;
+    Mutex* m_print_lock;
+
+    PABotBase2::PacketSender m_reliable_sender;
+    PABotBase2::PacketParser m_parser;
+    PABotBase2::StreamCoalescer m_stream_coalescer;
+
+    bool m_log_everything;
+
+    bool m_remote_protocol_compatible;
+    uint32_t m_remote_protocol;
+
+//    std::atomic<bool> m_version_verified;
+    uint8_t m_remote_slot_capacity;
+    uint16_t m_remote_buffer_capacity;
+
+    std::string m_error;
+
+    mutable Mutex m_lock;
+    ConditionVariable m_cv;
+
+    AsyncTask m_retransmit_thread;
+};
+
+
+
+
+}
+#endif
diff --git a/Common/Cpp/StreamConnections/StreamInterface.h b/Common/Cpp/StreamConnections/StreamInterface.h
new file mode 100644
index 0000000000..c006aafae5
--- /dev/null
+++ b/Common/Cpp/StreamConnections/StreamInterface.h
@@ -0,0 +1,27 @@
+/*  Stream Interface
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_StreamConnections_StreamInterface_H
+#define PokemonAutomation_StreamConnections_StreamInterface_H
+
+namespace PokemonAutomation{
+
+
+struct UnreliableStreamSender{
+    virtual size_t unreliable_send(const void* data, size_t bytes) noexcept = 0;
+};
+
+
+struct StreamSender{
+    virtual size_t send(const void* data, size_t bytes) = 0;
+};
+struct StreamListener{
+    virtual void on_recv(const void* data, size_t bytes) = 0;
+};
+
+
+}
+#endif
diff --git a/Common/Cpp/StreamConverters.cpp b/Common/Cpp/StreamConverters.cpp
index a3227a184c..123d5b053d 100644
--- a/Common/Cpp/StreamConverters.cpp
+++ b/Common/Cpp/StreamConverters.cpp
@@ -1,17 +1,17 @@
 /*  Stream Converters
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include <string.h>
-#include "Exceptions.h"
+#include <iostream>
 #include "Containers/AlignedVector.tpp"
+#include "Exceptions.h"
 #include "StreamConverters.h"
 
-#include <iostream>
-using std::cout;
-using std::endl;
+//using std::cout;
+//using std::endl;
 
 namespace PokemonAutomation{
 
@@ -27,13 +27,13 @@ StreamConverter::StreamConverter(
     , m_buffer(object_size_out * buffer_capacity)
 {}
 StreamConverter::~StreamConverter(){}
-void StreamConverter::add_listener(StreamListener& listener){
+void StreamConverter::add_listener(ObjectStreamListener& listener){
     if (listener.object_size != m_object_size_out){
         throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Mismatching object size.");
     }
     m_listeners.insert(&listener);
 }
-void StreamConverter::remove_listener(StreamListener& listener){
+void StreamConverter::remove_listener(ObjectStreamListener& listener){
     m_listeners.erase(&listener);
 }
 void StreamConverter::push_objects(const void* data, size_t objects){
@@ -42,7 +42,7 @@ void StreamConverter::push_objects(const void* data, size_t objects){
         convert(m_buffer.data(), data, block);
         data = (char*)data + block * m_object_size_in;
         objects -= block;
-        for (StreamListener* listener : m_listeners){
+        for (ObjectStreamListener* listener : m_listeners){
             listener->on_objects(m_buffer.data(), block);
         }
     }
@@ -64,13 +64,13 @@ MisalignedStreamConverter::MisalignedStreamConverter(
     , m_buffer(object_size_out * buffer_capacity)
 {}
 MisalignedStreamConverter::~MisalignedStreamConverter(){}
-void MisalignedStreamConverter::add_listener(StreamListener& listener){
+void MisalignedStreamConverter::add_listener(ObjectStreamListener& listener){
     if (listener.object_size != m_object_size_out){
         throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Mismatching object size.");
     }
     m_listeners.insert(&listener);
 }
-void MisalignedStreamConverter::remove_listener(StreamListener& listener){
+void MisalignedStreamConverter::remove_listener(ObjectStreamListener& listener){
     m_listeners.erase(&listener);
 }
 void MisalignedStreamConverter::push_bytes(const void* data, size_t bytes){
@@ -108,7 +108,7 @@ void MisalignedStreamConverter::push_bytes(const void* data, size_t bytes){
         bytes -= block * m_object_size_in;
         stored += block;
         objects -= block;
-        for (StreamListener* listener : m_listeners){
+        for (ObjectStreamListener* listener : m_listeners){
             listener->on_objects(m_buffer.data(), stored);
         }
         stored = 0;
diff --git a/Common/Cpp/StreamConverters.h b/Common/Cpp/StreamConverters.h
index 96e12e31c5..41dc785d00 100644
--- a/Common/Cpp/StreamConverters.h
+++ b/Common/Cpp/StreamConverters.h
@@ -1,6 +1,6 @@
 /*  Stream Converters
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -13,12 +13,12 @@
 namespace PokemonAutomation{
 
 
-class StreamListener{
+class ObjectStreamListener{
 public:
-    StreamListener(size_t p_object_size)
+    ObjectStreamListener(size_t p_object_size)
         : object_size(p_object_size)
     {}
-    virtual ~StreamListener() = default;
+    virtual ~ObjectStreamListener() = default;
     virtual void on_objects(const void* data, size_t objects) = 0;
 
     const size_t object_size;
@@ -28,8 +28,8 @@ class StreamListener{
 
 class StreamConverter{
 public:
-    void add_listener(StreamListener& listener);
-    void remove_listener(StreamListener& listener);
+    void add_listener(ObjectStreamListener& listener);
+    void remove_listener(ObjectStreamListener& listener);
 
 public:
     StreamConverter(
@@ -51,7 +51,7 @@ class StreamConverter{
     size_t m_buffer_capacity;
     AlignedVector<char> m_buffer;
 
-    std::set<StreamListener*> m_listeners;
+    std::set<ObjectStreamListener*> m_listeners;
 };
 
 
@@ -60,8 +60,8 @@ class StreamConverter{
 //  alignment, convert it to a stream of objects B.
 class MisalignedStreamConverter{
 public:
-    void add_listener(StreamListener& listener);
-    void remove_listener(StreamListener& listener);
+    void add_listener(ObjectStreamListener& listener);
+    void remove_listener(ObjectStreamListener& listener);
 
 public:
     MisalignedStreamConverter(
@@ -86,7 +86,7 @@ class MisalignedStreamConverter{
     size_t m_buffer_capacity;
     AlignedVector<char> m_buffer;
 
-    std::set<StreamListener*> m_listeners;
+    std::set<ObjectStreamListener*> m_listeners;
 };
 
 
diff --git a/Common/Cpp/StringTools.cpp b/Common/Cpp/StringTools.cpp
deleted file mode 100644
index 6e1784406e..0000000000
--- a/Common/Cpp/StringTools.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-/*  String Tools
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "StringTools.h"
-
-namespace PokemonAutomation{
-namespace StringTools{
-
-
-std::string replace(const std::string& str, const std::string& desired, const std::string& replace_with){
-    std::string ret;
-    size_t index = 0;
-    while (index < str.size()){
-        size_t pos = str.find(desired, index);
-        if (pos == std::string::npos){
-            break;
-        }
-        ret += str.substr(index, pos - index);
-        ret += replace_with;
-        index = pos + desired.size();
-    }
-    ret += str.substr(index);
-    return ret;;
-}
-
-
-
-
-}
-}
diff --git a/Common/Cpp/StringTools.h b/Common/Cpp/StringTools.h
deleted file mode 100644
index 89db2124ae..0000000000
--- a/Common/Cpp/StringTools.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*  String Tools
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_StringTools_H
-#define PokemonAutomation_StringTools_H
-
-#include <string>
-
-namespace PokemonAutomation{
-namespace StringTools{
-
-
-std::string replace(const std::string& str, const std::string& desired, const std::string& replace_with);
-
-
-
-}
-}
-#endif
diff --git a/Common/Cpp/Strings/StringTools.cpp b/Common/Cpp/Strings/StringTools.cpp
new file mode 100644
index 0000000000..590cc82cf6
--- /dev/null
+++ b/Common/Cpp/Strings/StringTools.cpp
@@ -0,0 +1,137 @@
+/*  String Tools
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <stdint.h>
+#include <cctype>
+#include <stdexcept>
+#include <vector>
+#include "StringTools.h"
+
+namespace PokemonAutomation{
+namespace StringTools{
+
+
+std::string replace(
+    const std::string& str,
+    const std::string& desired,
+    const std::string& replace_with
+){
+    std::string ret;
+    size_t index = 0;
+    while (index < str.size()){
+        size_t pos = str.find(desired, index);
+        if (pos == std::string::npos){
+            break;
+        }
+        ret += str.substr(index, pos - index);
+        ret += replace_with;
+        index = pos + desired.size();
+    }
+    ret += str.substr(index);
+    return ret;;
+}
+
+std::string strip(const std::string& str){
+    size_t first = str.find_first_not_of(" \t\n\r"); // Find first non-whitespace character
+    if (std::string::npos == first) { // If the string is all whitespace or empty
+        return ""; // Return an empty string
+    }
+    size_t last = str.find_last_not_of(" \t\n\r"); // Find last non-whitespace character
+    return str.substr(first, (last - first + 1)); // Extract the trimmed substring
+}
+
+size_t to_size_t(const std::string& str){
+    try{
+        int num = std::stoi(str);
+        return static_cast<size_t>(num);
+    }catch (const std::invalid_argument&){
+        return SIZE_MAX;
+    }catch (const std::out_of_range&){
+        return SIZE_MAX;
+    }
+}
+
+std::vector<std::string> split(const std::string& str, const std::string& delimiter){
+    std::vector<std::string> tokens;
+    size_t start = 0;
+    size_t end = str.find(delimiter);
+
+    while (end != std::string::npos){
+        tokens.push_back(str.substr(start, end - start));
+        start = end + delimiter.length();
+        end = str.find(delimiter, start);
+    }
+
+    tokens.push_back(str.substr(start));
+    return tokens;
+}
+std::vector<std::string_view> split(const std::string_view& str, const std::string& delimiter){
+    std::vector<std::string_view> tokens;
+    size_t start = 0;
+    size_t end = str.find(delimiter);
+
+    while (end != std::string::npos){
+        tokens.push_back(str.substr(start, end - start));
+        start = end + delimiter.length();
+        end = str.find(delimiter, start);
+    }
+
+    tokens.push_back(str.substr(start));
+    return tokens;
+}
+
+std::string capitalize(const std::string& str){
+    if (str.empty()){
+        return str;
+    }
+    std::string result = str;
+    bool new_word = true;
+    for (size_t i = 0; i < result.size(); i++){
+        if (std::isspace(result[i])){
+            new_word = true;
+        }else if (new_word){
+            result[i] = (char)std::toupper(result[i]);
+            new_word = false;
+        }
+    }
+    return result;
+}
+
+std::string uncapitalize(const std::string& str){
+    if (str.empty()){
+        return str;
+    }
+    std::string result = str;
+    bool new_word = true;
+    for (size_t i = 0; i < result.size(); i++){
+        if (std::isspace(result[i])){
+            new_word = true;
+        }else if (new_word){
+            result[i] = (char)std::tolower(result[i]);
+            new_word = false;
+        }
+    }
+    return result;
+}
+
+
+bool ends_with_ci(const std::string& str, const std::string& suffix){
+    if (suffix.size() > str.size()){
+        return false;
+    }
+    for (size_t i = 0; i < suffix.size(); i++){
+        char a = str[str.size() - suffix.size() + i];
+        char b = suffix[i];
+        if (std::tolower((unsigned char)a) != std::tolower((unsigned char)b)){
+            return false;
+        }
+    }
+    return true;
+}
+
+
+}
+}
diff --git a/Common/Cpp/Strings/StringTools.h b/Common/Cpp/Strings/StringTools.h
new file mode 100644
index 0000000000..f781da5a0e
--- /dev/null
+++ b/Common/Cpp/Strings/StringTools.h
@@ -0,0 +1,48 @@
+/*  String Tools
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_StringTools_H
+#define PokemonAutomation_StringTools_H
+
+#include <string>
+#include <string_view>
+#include <vector>
+
+namespace PokemonAutomation{
+namespace StringTools{
+
+
+std::string replace(
+    const std::string& str,
+    const std::string& desired,
+    const std::string& replace_with
+);
+
+// Trim leading and trailing white spaces
+std::string strip(const std::string& str);
+
+// Parse str to size_t. Return SIZE_MAX if parsing fails
+size_t to_size_t(const std::string& str);
+
+// Break a string with a delimiter sub-string.
+// e.g. split("a; b; c", "; ") -> ["a", "b", "c"]
+// Note, if the string ends with a delimiter, the last element in the returned vector is an empty sub-string.
+// e.g. split("a; b; ", "; ") -> ["a", "b", ""]
+std::vector<std::string> split(const std::string& str, const std::string& delimiter);
+std::vector<std::string_view> split(const std::string_view& str, const std::string& delimiter);
+
+// Capitalize each word in str. Words are separated by space characters.
+std::string capitalize(const std::string& str);
+// Uncapitalize each word in str. Words are separated by space characters.
+std::string uncapitalize(const std::string& str);
+
+// Whether str ends with suffix, case-insensitively.
+bool ends_with_ci(const std::string& str, const std::string& suffix);
+
+
+}
+}
+#endif
diff --git a/Common/Cpp/Strings/Unicode.cpp b/Common/Cpp/Strings/Unicode.cpp
new file mode 100644
index 0000000000..98366644cf
--- /dev/null
+++ b/Common/Cpp/Strings/Unicode.cpp
@@ -0,0 +1,251 @@
+/*  Unicode
+ * 
+ *  From: https://github.com/PokemonAutomation/
+ * 
+ */
+
+#include <cstdint>
+#include "Unicode.h"
+
+namespace PokemonAutomation{
+
+
+const uint32_t MAX_CODEPOINT = 0x10ffff;
+const uint32_t REPLACEMENT = 0xfffd;
+
+//
+//  UTF-8
+//
+void utf8_skip_to_next_codepoint(const char*& str){
+    while (true){
+        str++;
+        unsigned ch = str[0];
+        if ((ch & 0x80u) == 0){
+            return;
+        }
+        if ((ch & 0xc0u) == 0xc0u){
+            return;
+        }
+    }
+}
+uint32_t utf8_to_unicode(const char*& str){
+    unsigned char ch = str[0];
+    if (ch <= 0x7f){
+        str++;
+        return ch;
+    }
+
+    uint32_t codepoint;
+
+    if (ch < 0xc0){
+        utf8_skip_to_next_codepoint(str);
+        return REPLACEMENT;
+    }
+
+    int bytes = 0;
+    bytes = ch <= 0xf7 ? 4 : bytes;
+    bytes = ch <= 0xef ? 3 : bytes;
+    bytes = ch <= 0xdf ? 2 : bytes;
+
+    if (bytes == 0){
+        utf8_skip_to_next_codepoint(str);
+        return REPLACEMENT;
+    }
+
+    ch &= ((unsigned char)1 << (7 - bytes)) - 1;
+    codepoint = ch;
+
+    for (int c = 1; c < bytes; c++){
+        ch = str[c];
+        if ((ch & 0xc0) != 0x80){
+            utf8_skip_to_next_codepoint(str);
+            return REPLACEMENT;
+        }
+        codepoint <<= 6;
+        codepoint |= ch & 0x3f;
+    }
+
+    if (codepoint > MAX_CODEPOINT){
+        utf8_skip_to_next_codepoint(str);
+        return REPLACEMENT;
+    }
+
+    str += bytes;
+    return codepoint;
+}
+
+template <typename CharType>
+void append_to_utf8(
+    std::basic_string<CharType>& str,
+    uint32_t codepoint,
+    const CharType* replacement
+){
+    if (codepoint <= 0x7f){
+        str += (char)codepoint;
+        return;
+    }
+    if (codepoint > MAX_CODEPOINT){
+        str += replacement;
+        return;
+    }
+
+    int bytes = 0;
+    bytes = codepoint <= 0x001fffff ? 4 : bytes;
+    bytes = codepoint <= 0x0000ffff ? 3 : bytes;
+    bytes = codepoint <= 0x000007ff ? 2 : bytes;
+    str.reserve(str.size() + bytes);
+
+    if (bytes == 0){
+        str += replacement;
+        return;
+    }
+
+    int shift = (bytes - 1) * 6;
+    unsigned char ch = ((1 << bytes) - 1) << (8 - bytes);
+    ch |= codepoint >> shift;
+    str += ch;
+    codepoint <<= 32 - shift;
+
+    for (int c = 1; c < bytes; c++){
+        str += 0x80 | (codepoint >> 26);
+        codepoint <<= 6;
+    }
+}
+
+
+
+//
+//  UTF-16
+//
+uint32_t utf16_to_unicode(const char16_t*& str){
+    uint32_t H = str[0];
+    if (H < 0xd800 || H > 0xdfff){
+        str++;
+        return H;
+    }
+
+    if (H < 0xd800 || 0xdc00 <= H){
+        str++;
+        return REPLACEMENT;
+    }
+
+    uint32_t L = str[1];
+    if (L < 0xdc00 || 0xe000 <= L){
+        str++;
+        return REPLACEMENT;
+    }
+
+    H = (uint32_t)(H - 0xd800) << 10;
+    L = str[1] - 0xdc00;
+
+    str += 2;
+    return (L | H) + 0x10000;
+}
+void append_to_utf16(std::u16string& str, uint32_t codepoint){
+    if (codepoint < 0xffff){
+        str += (char16_t)codepoint;
+        return;
+    }
+    str.reserve(str.size() + 2);
+
+    codepoint -= 0x10000;
+    str += (char16_t)(codepoint >> 10) + 0xd800;
+    str += (char16_t)(codepoint & 0x3ff) + 0xdc00;
+}
+
+
+
+//
+//  Conversions
+//
+
+std::u8string utf8_to_utf8(const std::string& str){
+    return std::u8string(str.begin(), str.end());
+}
+std::string utf8_to_str(const std::u8string& str){
+    return std::string(str.begin(), str.end());
+}
+
+std::u16string utf8_to_utf16(const std::string& str){
+    std::u16string out;
+    const char* utf8 = str.c_str();
+    const char* stop = utf8 + str.size();
+    while (utf8 < stop){
+        append_to_utf16(out, utf8_to_unicode(utf8));
+    }
+    return out;
+}
+std::u16string utr8_to_utf16(const std::u8string& str){
+    std::u16string out;
+    const char* utf8 = (const char*)str.c_str();
+    const char* stop = utf8 + str.size();
+    while (utf8 < stop){
+        append_to_utf16(out, utf8_to_unicode(utf8));
+    }
+    return out;
+}
+std::string utr16_to_str(const std::u16string& str){
+    std::string out;
+    const char16_t* utf16 = str.c_str();
+    const char16_t* stop = utf16 + str.size();
+    while (utf16 < stop){
+        append_to_utf8(out, utf16_to_unicode(utf16), "\xef\xbf\xbd");
+    }
+    return out;
+}
+std::u8string utr16_to_utf8(const std::u16string& str){
+    std::u8string out;
+    const char16_t* utf16 = str.c_str();
+    const char16_t* stop = utf16 + str.size();
+    while (utf16 < stop){
+        append_to_utf8(out, utf16_to_unicode(utf16), u8"\ufffd");
+    }
+    return out;
+}
+
+std::u32string utf8_to_utf32(const std::string& str){
+    std::u32string out;
+    const char* utf8 = str.c_str();
+    const char* stop = utf8 + str.size();
+    while (utf8 < stop){
+        out += utf8_to_unicode(utf8);
+    }
+    return out;
+}
+std::u32string utf8_to_utf32(const std::u8string& str){
+    std::u32string out;
+    const char* utf8 = (const char*)str.c_str();
+    const char* stop = utf8 + str.size();
+    while (utf8 < stop){
+        out += utf8_to_unicode(utf8);
+    }
+    return out;
+}
+std::string utf32_to_str(const std::u32string& str){
+    std::string out;
+    for (char32_t ch : str){
+        append_to_utf8(out, ch, "\xef\xbf\xbd");
+    }
+    return out;
+}
+std::u8string utf32_to_utf8(const std::u32string& str){
+    std::u8string out;
+    for (char32_t ch : str){
+        append_to_utf8(out, ch, u8"\ufffd");
+    }
+    return out;
+}
+
+
+
+#ifdef _WIN32
+std::wstring utf8_to_wstr(const std::string& str){
+    std::u16string tmp(utf8_to_utf16(str));
+    return std::wstring(tmp.begin(), tmp.end());
+}
+#endif
+
+
+
+}
+
diff --git a/Common/Cpp/Strings/Unicode.h b/Common/Cpp/Strings/Unicode.h
new file mode 100644
index 0000000000..84c1c845f9
--- /dev/null
+++ b/Common/Cpp/Strings/Unicode.h
@@ -0,0 +1,42 @@
+/*  Unicode
+ * 
+ *  From: https://github.com/PokemonAutomation/
+ * 
+ */
+
+#ifndef PokemonAutomation_Unicode_H
+#define PokemonAutomation_Unicode_H
+
+#include <string>
+
+namespace PokemonAutomation{
+
+
+
+//
+//  char* and std::string are UTF-8.
+//
+
+std::u8string utf8_to_utf8(const std::string& str);
+std::string utf8_to_str(const std::u8string& str);
+
+std::u16string utf8_to_utf16(const std::string& str);
+std::u16string utr8_to_utf16(const std::u8string& str);
+std::string utr16_to_str(const std::u16string& str);
+std::u8string utr16_to_utf8(const std::u16string& str);
+
+std::u32string utf8_to_utf32(const std::string& str);
+std::u32string utf8_to_utf32(const std::u8string& str);
+std::string utf32_to_str(const std::u32string& str);
+std::u8string utf32_to_utf8(const std::u32string& str);
+
+
+
+#ifdef _WIN32
+std::wstring utf8_to_wstr(const std::string& str);
+#endif
+
+
+
+}
+#endif
diff --git a/Common/Cpp/TestRunners/ParallelUnitTestRunner.cpp b/Common/Cpp/TestRunners/ParallelUnitTestRunner.cpp
new file mode 100644
index 0000000000..50c8024bee
--- /dev/null
+++ b/Common/Cpp/TestRunners/ParallelUnitTestRunner.cpp
@@ -0,0 +1,244 @@
+/*  Parallel Unit Test
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <thread>
+#include "Common/Cpp/Exceptions.h"
+#include "Common/Cpp/PrettyPrint.h"
+#include "Common/Cpp/MemoryUtilization/MemoryUtilization.h"
+#include "Common/Cpp/Concurrency/ReverseLockGuard.h"
+#include "ParallelUnitTestRunner.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+
+
+
+
+UnitTestRunner::~UnitTestRunner(){
+    detach();
+}
+UnitTestRunner::UnitTestRunner(
+    CancellableScope* parent,
+    Logger& logger,
+    ThreadPool& thread_pool,
+    uint64_t max_memory,
+    size_t max_threads
+)
+    : m_logger(logger)
+    , m_thread_pool(thread_pool)
+    , m_max_memory(max_memory)
+    , m_max_threads(max_threads)
+{
+    if (m_max_memory == 0){
+        MemoryUsage memory = process_memory_usage();
+        m_max_memory = memory.total_system_memory - memory.total_used_system_memory;
+    }
+    if (m_max_threads == 0){
+        m_max_threads = std::thread::hardware_concurrency() * 2;
+    }
+    if (parent){
+        attach(*parent);
+    }
+}
+
+
+void UnitTestRunner::add_test(std::shared_ptr<const UnitTest> test){
+    throw_if_cancelled();
+
+    if (test->name().empty()){
+        InternalProgramError(&m_logger, PA_CURRENT_FUNCTION, "Test name cannot be null.");
+    }
+
+    {
+        std::lock_guard<Mutex> lg(m_lock);
+        if (m_test_by_name.contains(test->name())){
+            InternalProgramError(&m_logger, PA_CURRENT_FUNCTION, "Duplicate Test Name: " + test->name());
+        }
+        auto iter0 = m_test_by_name.end();
+        auto iter1 = m_test_by_total_memory.end();
+        auto iter2 = m_test_by_per_thread_memory.end();
+        try{
+            iter0 = m_test_by_name.emplace(test->name(), PendingEntry{}).first;
+            iter1 = m_test_by_total_memory.emplace(test->memory(), test->name());
+            iter2 = m_test_by_per_thread_memory.emplace((double)test->memory() / test->threads(), test->name());
+            iter0->second.test = std::move(test);
+            iter0->second.iter_total = iter1;
+            iter0->second.iter_density = iter2;
+        }catch (...){
+            if (iter0 != m_test_by_name.end()){
+                m_test_by_name.erase(iter0);
+            }
+            if (iter1 != m_test_by_total_memory.end()){
+                m_test_by_total_memory.erase(iter1);
+            }
+            if (iter2 != m_test_by_per_thread_memory.end()){
+                m_test_by_per_thread_memory.erase(iter2);
+            }
+            throw;
+        }
+    }
+
+    m_cv.notify_all();
+}
+
+void UnitTestRunner::run(){
+    m_logger.log(
+        "Starting UnitTestRunner with:"
+        "\n    Max Memory: " + tostr_bytes(m_max_memory) +
+        "\n    Max Threads: " + tostr_u_commas(m_max_threads)
+    );
+//    cout << "thread_loop() - start" << endl;
+    std::unique_lock<Mutex> lg(m_lock);
+    while (!cancelled()){
+        if (m_test_by_name.empty()){
+            break;
+        }
+
+        //  If nothing is running, always run the thing that uses the most memory.
+        if (m_currently_running.empty()){
+            dispatch_test(m_test_by_total_memory.rbegin()->second);
+            continue;
+        }
+
+        //  We are over the resource limit. Don't run anything.
+        if (m_current_memory >= m_max_memory || m_current_threads >= m_max_threads){
+            m_cv.wait(lg);
+            continue;
+        }
+
+        //  Try to run the test that uses the most memory.
+        {
+            const std::string& name = m_test_by_total_memory.rbegin()->second;
+            PendingEntry& entry = m_test_by_name.find(name)->second;
+            if (m_current_memory + entry.test->memory() <= m_max_memory &&
+                m_current_threads + entry.test->threads() <= m_max_threads
+            ){
+                dispatch_test(name);
+                continue;
+            }
+        }
+
+        //  Try run the smallest memory/thread ratio.
+        {
+            const std::string& name = m_test_by_per_thread_memory.begin()->second;
+            PendingEntry& entry = m_test_by_name.find(name)->second;
+            if (m_current_memory + entry.test->memory() <= m_max_memory &&
+                m_current_threads + entry.test->threads() <= m_max_threads
+            ){
+                dispatch_test(name);
+                continue;
+            }
+        }
+
+        //  Can't run anything.
+        m_cv.wait(lg);
+    }
+
+    //  Wait for everything running to finish.
+    m_cv.wait(lg, [this]{
+        if (!m_currently_running.empty()){
+            return false;
+        }
+        if (!cancelled() && !m_test_by_name.empty()){
+            return false;
+        }
+        return true;
+    });
+    m_completed.clear();
+}
+
+bool UnitTestRunner::cancel(std::exception_ptr reason) noexcept{
+    if (CancellableScope::cancel(reason)){
+        return true;
+    }
+    {
+        std::lock_guard<Mutex> lg(m_lock);
+    }
+    m_cv.notify_all();
+    return false;
+}
+
+
+
+
+void UnitTestRunner::dispatch_test(const std::string& name){
+    //  Must be called under the lock.
+
+//    cout << "dispatch_test() - start" << endl;
+    auto iter = m_test_by_name.find(name);
+    PendingEntry& entry = iter->second;
+
+    auto iter_current = m_currently_running.emplace(name, std::move(entry.test)).first;
+    DispatchedEntry& node = iter_current->second;
+
+    const UnitTest& test = *iter_current->second.test;
+    m_current_memory += test.memory();
+    m_current_threads += test.threads();
+
+    {
+        ReverseLockGuard<Mutex> lg(m_lock);
+        node.task = m_thread_pool.dispatch_now_blocking([this, iter_current]{
+            const UnitTest& test = *iter_current->second.test;
+            UnitTestResult result;
+            try{
+                m_logger.log("Starting: " + test.name());
+                result = test.run(m_logger, *this);
+            }catch (Exception& e){
+                result = UnitTestResult(UnitTestResult::FAILED, e.to_str());
+            }catch (std::bad_alloc&){
+                result = UnitTestResult::OOM;
+            }catch (std::exception& e){
+                result = UnitTestResult(UnitTestResult::FAILED, e.what());
+            }catch (...){
+                result = UnitTestResult(UnitTestResult::FAILED, "Unknown exception.");
+            }
+
+            switch (result.result){
+            case UnitTestResult::NOT_RUN:
+            case UnitTestResult::PASSED:
+                m_logger.log("Passed: " + test.name(), COLOR_BLUE);
+                break;
+            case UnitTestResult::FAILED:
+                m_logger.log("Failed: " + test.name() + ", Message: " + result.message, COLOR_RED);
+                break;
+            case UnitTestResult::SKIPPED:
+                m_logger.log("Skipped: " + test.name(), COLOR_ORANGE);
+                break;
+            case UnitTestResult::OOM:
+                m_logger.log("Out-of-Memory: " + test.name(), COLOR_ORANGE);
+                break;
+            }
+
+            m_listeners.run_method(
+                &Listener::on_test_finished,
+                std::move(iter_current->second.test),
+                std::move(result)
+            );
+
+            {
+                std::lock_guard<Mutex> lg(m_lock);
+                auto node = m_currently_running.extract(iter_current);
+                m_completed.insert(std::move(node));
+                m_current_memory -= test.memory();
+                m_current_threads -= test.threads();
+            }
+            m_cv.notify_all();
+        });
+    }
+
+    m_test_by_total_memory.erase(entry.iter_total);
+    m_test_by_per_thread_memory.erase(entry.iter_density);
+    m_test_by_name.erase(iter);
+//    cout << "dispatch_test() - end" << endl;
+}
+
+
+
+
+}
diff --git a/Common/Cpp/TestRunners/ParallelUnitTestRunner.h b/Common/Cpp/TestRunners/ParallelUnitTestRunner.h
new file mode 100644
index 0000000000..6be19a603e
--- /dev/null
+++ b/Common/Cpp/TestRunners/ParallelUnitTestRunner.h
@@ -0,0 +1,120 @@
+/*  Parallel Unit Test
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_ParallelUnitTestRunner_H
+#define PokemonAutomation_ParallelUnitTestRunner_H
+
+#include <map>
+#include "Common/Cpp/Logging/AbstractLogger.h"
+#include "Common/Cpp/ListenerSet.h"
+#include "Common/Cpp/CancellableScope.h"
+#include "Common/Cpp/Concurrency/Mutex.h"
+#include "Common/Cpp/Concurrency/ConditionVariable.h"
+#include "Common/Cpp/Concurrency/AsyncTask.h"
+#include "Common/Cpp/Concurrency/ThreadPool.h"
+#include "UnitTest.h"
+
+namespace PokemonAutomation{
+
+
+
+class UnitTestRunner final : public CancellableScope{
+public:
+    struct Listener{
+        virtual void on_test_finished(
+            std::shared_ptr<const UnitTest> test,
+            UnitTestResult result
+        ) = 0;
+    };
+    void add_listener(Listener& listener){
+        m_listeners.add(listener);
+    }
+    void remove_listener(Listener& listener){
+        m_listeners.remove(listener);
+    }
+
+
+public:
+    ~UnitTestRunner();
+    UnitTestRunner(
+        Logger& logger,
+        ThreadPool& thread_pool,
+        uint64_t max_memory = 0,
+        size_t max_threads = 0
+    )
+        : UnitTestRunner(nullptr, logger, thread_pool, max_memory, max_threads)
+    {}
+    UnitTestRunner(
+        CancellableScope& parent,
+        Logger& logger,
+        ThreadPool& thread_pool,
+        uint64_t max_memory = 0,
+        size_t max_threads = 0
+    )
+        : UnitTestRunner(&parent, logger, thread_pool, max_memory, max_threads)
+    {}
+    UnitTestRunner(
+        CancellableScope* parent,
+        Logger& logger,
+        ThreadPool& thread_pool,
+        uint64_t max_memory = 0,
+        size_t max_threads = 0
+    );
+
+    template <typename TestType, class... Args>
+    void add_test(Args&&... args){
+        add_test(std::make_shared<const TestType>(std::forward<Args>(args)...));
+    }
+    void add_test(std::shared_ptr<const UnitTest> test);
+
+
+public:
+    void run();
+
+    virtual bool cancel(std::exception_ptr reason) noexcept override;
+
+
+private:
+    void dispatch_test(const std::string& name);
+
+
+private:
+    Logger& m_logger;
+    ThreadPool& m_thread_pool;
+
+    uint64_t m_max_memory = 0;
+    size_t m_max_threads = 1;
+
+    Mutex m_lock;
+    ConditionVariable m_cv;
+
+    uint64_t m_current_memory = 0;
+    size_t m_current_threads = 0;
+
+    struct PendingEntry{
+        std::shared_ptr<const UnitTest> test;
+        std::multimap<uint64_t, std::string>::iterator iter_total;
+        std::multimap<double, std::string>::iterator iter_density;
+    };
+    struct DispatchedEntry{
+        std::shared_ptr<const UnitTest> test;
+        AsyncTask task;
+    };
+
+    std::map<std::string, DispatchedEntry> m_completed;
+    std::map<std::string, DispatchedEntry> m_currently_running;
+    std::map<std::string, PendingEntry> m_test_by_name;
+    std::multimap<uint64_t, std::string> m_test_by_total_memory;
+    std::multimap<double, std::string> m_test_by_per_thread_memory;
+
+    ListenerSet<Listener> m_listeners;
+};
+
+
+
+
+}
+#endif
diff --git a/Common/Cpp/TestRunners/TestImageDistortionManager.cpp b/Common/Cpp/TestRunners/TestImageDistortionManager.cpp
new file mode 100644
index 0000000000..eddcf2fd3c
--- /dev/null
+++ b/Common/Cpp/TestRunners/TestImageDistortionManager.cpp
@@ -0,0 +1,237 @@
+/*  Test Image Distortion Manager
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <algorithm>
+#include <atomic>
+#include <cmath>
+#include <memory>
+#include "Common/Cpp/Exceptions.h"
+#include "Common/Cpp/Concurrency/Mutex.h"
+#include "Common/Cpp/Filesystem/FilePath.h"
+#include "Common/Cpp/Json/JsonValue.h"
+#include "Common/Cpp/Json/JsonArray.h"
+#include "Common/Cpp/Json/JsonObject.h"
+#include "TestImageDistortionManager.h"
+
+namespace PokemonAutomation{
+
+
+namespace{
+
+
+//  Read a transform written as 3 rows of 4 numbers, one row per output channel (see `ColorTransform3x4`),
+//  e.g. the identity [[1, 0, 0, 0], [0, 1, 0, 0], [0, 0, 1, 0]].
+//  `label` and `filename` are only used in error messages.
+//  Throws ParseException if `json` isn't 3 rows of 4 numbers.
+ColorTransform3x4 read_transform(const JsonValue& json, const std::string& label, const std::string& filename){
+    const JsonArray& rows = json.to_array_throw(filename);
+    if (rows.size() != 3){
+        throw ParseException("The transform of \"" + label + "\" in " + filename + " must have 3 rows.");
+    }
+    ColorTransform3x4 ret;
+    for (size_t r = 0; r < 3; r++){
+        const JsonArray& row = rows[r].to_array_throw(filename);
+        if (row.size() != 4){
+            throw ParseException("Each row of the transform of \"" + label + "\" in " + filename + " must have 4 numbers.");
+        }
+        for (size_t c = 0; c < 4; c++){
+            ret[r][c] = row[c].to_double_throw(filename);
+        }
+    }
+    return ret;
+}
+
+//  Return `path` with ".", ".." and repeated separators resolved, and '/' as separator, e.g.
+//  "PokemonLA/./Map//a.png" -> "PokemonLA/Map/a.png". It's purely textual with no filesystem query.
+std::string normalized_path(const std::string& path){
+    return Filesystem::Path(path).lexically_normal().string_slash_normalized();
+}
+
+//  Return the transform that undoes `transform`: if out = M * in + b, then in = M^-1 * out - M^-1 * b.
+//  M^-1 is computed from the adjugate: each entry is a 2x2 cofactor of M divided by det(M).
+//  Throws ParseException if M can't be inverted, which a real capture card's transform never is.
+ColorTransform3x4 invert(const ColorTransform3x4& transform, const std::string& label){
+    const ColorTransform3x4& m = transform;
+
+    //  Cofactors of the first row, which also give the determinant.
+    const double c00 = m[1][1] * m[2][2] - m[1][2] * m[2][1];
+    const double c01 = m[1][2] * m[2][0] - m[1][0] * m[2][2];
+    const double c02 = m[1][0] * m[2][1] - m[1][1] * m[2][0];
+    const double det = m[0][0] * c00 + m[0][1] * c01 + m[0][2] * c02;
+    if (std::abs(det) < 1e-6){
+        throw ParseException("The transform of \"" + label + "\" can't be inverted.");
+    }
+
+    ColorTransform3x4 ret;
+    ret[0][0] = c00 / det;
+    ret[1][0] = c01 / det;
+    ret[2][0] = c02 / det;
+    ret[0][1] = (m[0][2] * m[2][1] - m[0][1] * m[2][2]) / det;
+    ret[1][1] = (m[0][0] * m[2][2] - m[0][2] * m[2][0]) / det;
+    ret[2][1] = (m[0][1] * m[2][0] - m[0][0] * m[2][1]) / det;
+    ret[0][2] = (m[0][1] * m[1][2] - m[0][2] * m[1][1]) / det;
+    ret[1][2] = (m[0][2] * m[1][0] - m[0][0] * m[1][2]) / det;
+    ret[2][2] = (m[0][0] * m[1][1] - m[0][1] * m[1][0]) / det;
+    for (size_t r = 0; r < 3; r++){
+        ret[r][3] = -(ret[r][0] * m[0][3] + ret[r][1] * m[1][3] + ret[r][2] * m[2][3]);
+    }
+    return ret;
+}
+
+//  Return the transform that applies `first` and then `second`:
+//      second(first(x)) = M2 * (M1 * x + b1) + b2 = (M2 * M1) * x + (M2 * b1 + b2)
+//  Colors aren't clipped to 0-255 between the two steps, unlike applying them one at a time.
+ColorTransform3x4 compose(const ColorTransform3x4& first, const ColorTransform3x4& second){
+    ColorTransform3x4 ret;
+    for (size_t r = 0; r < 3; r++){
+        for (size_t c = 0; c < 4; c++){
+            double sum = c == 3 ? second[r][3] : 0;
+            for (size_t k = 0; k < 3; k++){
+                sum += second[r][k] * first[k][c];
+            }
+            ret[r][c] = sum;
+        }
+    }
+    return ret;
+}
+
+
+}
+
+
+
+TestImageDistortionManager::TestImageDistortionManager(const std::string& test_repo_path){
+    const std::string folder = normalized_path(test_repo_path + "/") + "CaptureCardCalibration/";
+
+    //  Capture setup label -> the transform from the true colors to the colors that setup captures.
+    std::map<std::string, ColorTransform3x4> setup_transforms;
+    {
+        const std::string filename = folder + "color_profile_to_transform.json";
+        const JsonValue json = load_json_file(filename);
+        for (const auto& item : json.to_object_throw(filename)){
+            setup_transforms.emplace(item.first, read_transform(item.second, item.first, filename));
+        }
+    }
+
+    std::vector<ColorTransform3x4> target_transforms;
+    {
+        const std::string filename = folder + "color_profile_extremes.json";
+        const JsonValue json = load_json_file(filename);
+        for (const auto& item : json.to_object_throw(filename)){
+            m_test_distortion_labels.emplace_back(item.first);
+            target_transforms.emplace_back(read_transform(item.second, item.first, filename));
+        }
+    }
+
+    {
+        const std::string filename = folder + "test_image_labels.json";
+        const JsonValue json = load_json_file(filename);
+        for (const auto& item : json.to_object_throw(filename)){
+            const std::string& label = item.second.to_string_throw(filename);
+            if (label == "Unknown"){
+                continue;
+            }
+            if (!setup_transforms.contains(label)){
+                throw ParseException(
+                    "The test image \"" + item.first + "\" in " + filename + " has the distortion label \"" + label +
+                    "\", which has no transform in color_profile_to_transform.json."
+                );
+            }
+            m_image_labels.emplace(item.first, label);
+        }
+    }
+
+    //  For each capture setup used by a test image, combine undoing its distortion with applying
+    //  each test distortion. E.g. for an image captured with "Win-CheapCard" and the test distortion
+    //  "Win-MYPIN", the combined transform turns the cheap card's colors into MYPIN's colors.
+    for (const auto& item : m_image_labels){
+        const std::string& label = item.second;
+        if (m_transforms.contains(label)){
+            continue;
+        }
+        const ColorTransform3x4 undo = invert(setup_transforms.at(label), label);
+        std::vector<std::optional<ColorTransform3x4>>& per_test_time_transform = m_transforms[label];
+        for (size_t c = 0; c < m_test_distortion_labels.size(); c++){
+            if (label == m_test_distortion_labels[c]){
+                per_test_time_transform.emplace_back(std::nullopt);
+            }else{
+                per_test_time_transform.emplace_back(compose(undo, target_transforms[c]));
+            }
+        }
+    }
+}
+
+
+size_t TestImageDistortionManager::num_applicable_distortions(const std::vector<std::string>& image_paths) const{
+    for (const std::string& path : image_paths){
+        if (image_label(path) != nullptr){
+            return num_test_distortions();
+        }
+    }
+    return 0;
+}
+
+
+const ColorTransform3x4* TestImageDistortionManager::transform(
+    const std::string& image_path,
+    const std::string& input_label
+) const{
+    auto test_labels = std::find(m_test_distortion_labels.begin(), m_test_distortion_labels.end(), input_label);
+    if (test_labels == m_test_distortion_labels.end()){
+        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Unknown test distortion label: " + input_label);
+    }
+    const std::string* label = image_label(image_path);
+    if (label == nullptr){
+        return nullptr;
+    }
+    const std::optional<ColorTransform3x4>& ret = m_transforms.at(*label)[test_labels - m_test_distortion_labels.begin()];
+    return ret ? &*ret : nullptr;
+}
+
+
+const std::string* TestImageDistortionManager::image_label(const std::string& image_path) const{
+    const Filesystem::Path path(image_path);
+    if (static_cast<const std::filesystem::path&>(path).is_absolute()){
+        throw InternalProgramError(
+            nullptr, PA_CURRENT_FUNCTION,
+            "Test image paths must be relative to the test repo folder: " + image_path
+        );
+    }
+    auto iter = m_image_labels.find(normalized_path(image_path));
+    return iter == m_image_labels.end() ? nullptr : &iter->second;
+}
+
+
+
+
+namespace{
+
+//  The global manager, published by `initialize_test_image_distortions()` and read by the tests,
+//  which can run on any thread.
+std::atomic<const TestImageDistortionManager*> global_manager(nullptr);
+
+}
+
+
+void initialize_test_image_distortions(const std::string& test_repo_path){
+    static Mutex lock;
+    static std::unique_ptr<const TestImageDistortionManager> manager;
+
+    std::lock_guard<Mutex> lg(lock);
+    if (manager){
+        return;
+    }
+    manager = std::make_unique<const TestImageDistortionManager>(test_repo_path);
+    global_manager.store(manager.get(), std::memory_order_release);
+}
+
+const TestImageDistortionManager* test_image_distortion_manager(){
+    return global_manager.load(std::memory_order_acquire);
+}
+
+
+
+}
diff --git a/Common/Cpp/TestRunners/TestImageDistortionManager.h b/Common/Cpp/TestRunners/TestImageDistortionManager.h
new file mode 100644
index 0000000000..ab53fa45d5
--- /dev/null
+++ b/Common/Cpp/TestRunners/TestImageDistortionManager.h
@@ -0,0 +1,114 @@
+/*  Test Image Distortion Manager
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  Each user runs the automation program through a different capture card, OS and Switch video setting.
+ *  A visual detector that passes on one test image can fail for another setting.
+ *
+ *  The CaptureCardCalibration/ folder in the CommandLineTests repo measures these color distortions
+ *  (see the README.md there). This manager loads its JSON files:
+ *  - color_profile_to_transform.json: distortion label (e.g. "Win-MYPIN") -> 3x4 color transform.
+ *  - color_profile_extremes.json: the few "extreme" distortion labels that tests run with.
+ *  - test_image_labels.json: test image path (relative to the repo) -> distortion label of the setup
+ *    it was captured with, or "Unknown".
+ *
+ *  For a test image with a known distortion label, the manager provides the color transform to
+ *  other extreme distortions. So one test image can cover more of the measured color range.
+ *
+ *  It is used by SerialPrograms/Source/Tests/ImageUnitTest.cpp.
+ */
+
+#ifndef PokemonAutomation_TestImageDistortionManager_H
+#define PokemonAutomation_TestImageDistortionManager_H
+
+#include <array>
+#include <map>
+#include <optional>
+#include <string>
+#include <vector>
+
+namespace PokemonAutomation{
+
+
+
+//  An affine color transform on RGB values in 0-255, with one row per output channel:
+//      R' = m[0][0] * R + m[0][1] * G + m[0][2] * B + m[0][3]
+//      G' = m[1][0] * R + m[1][1] * G + m[1][2] * B + m[1][3]
+//      B' = m[2][0] * R + m[2][1] * G + m[2][2] * B + m[2][3]
+using ColorTransform3x4 = std::array<std::array<double, 4>, 3>;
+
+
+
+class TestImageDistortionManager{
+public:
+    //  Load the calibration files from "<test_repo_path>/CaptureCardCalibration/".
+    //  `test_repo_path` is the CommandLineTests repo folder, i.e. `UNIT_TEST_RESOURCE_PATH()`.
+    //  The test image paths given to the other functions are relative to that folder,
+    //  e.g. "PokemonLA/StatusInfoScreenDetector/WinMyPin/eng_geodude_NotShiny_NotAlpha_Male.png".
+    //  Throws FileException if a file can't be read, and ParseException if a file isn't in the expected
+    //  format, a label has no transform, or a test image's transform can't be inverted.
+    explicit TestImageDistortionManager(const std::string& test_repo_path);
+
+    //  The number of distortions to apply during testing
+    size_t num_test_distortions() const{
+        return m_test_distortion_labels.size();
+    }
+
+    //  The label name of each test distortion at `index` (`index` < `num_test_distortions()`)
+    const std::string& test_distortion_label(size_t index) const{
+        return m_test_distortion_labels[index];
+    }
+
+    //  How many test distortions can a test based on images from `image_paths` run.
+    //  `image_paths` are relative to the test repo folder. Throws InternalProgramError if one is absolute.
+    //  It returns `num_test_distortions()` if at least one of the images has a known distortion label, otherwise 0.
+    size_t num_applicable_distortions(const std::vector<std::string>& image_paths) const;
+
+    //  The transform that makes the test image at `image_path` (relative to the test repo folder) look as if it was
+    //  captured through the setup with label `distortion_label`: it undoes the distortion of the setup the
+    //  image was captured with and then applies the distortion of `distortion_label`.
+    //  Returns nullptr if the image should be used as it is: it isn't a test image with a known setup,
+    //  or it was captured with the `distortion_label` setup itself.
+    //  Throws InternalProgramError if `distortion_label` isn't one of the test labels, or if
+    //  `image_path` is an absolute path.
+    const ColorTransform3x4* transform(const std::string& image_path, const std::string& distortion_label) const;
+
+private:
+    //  Return the distortion label of the test image at `image_path` (relative to the test repo
+    //  folder), or nullptr if the image has no known label.
+    //  Throws InternalProgramError if `image_path` is an absolute path, which would never match.
+    const std::string* image_label(const std::string& image_path) const;
+
+
+private:
+    std::vector<std::string> m_test_distortion_labels;
+
+    //  Relative test image path -> distortion label of the setup it was captured with.
+    //  Images labeled "Unknown" are left out.
+    std::map<std::string, std::string> m_image_labels;
+
+    //  distortion label -> a transform vector of size `m_test_distortion_labels`.
+    //  For a key `distortion_label` , the vector of location `i` is the combined transform to transform pixels on an image captured
+    //  under distortion, `m_test_distortion_labels[i]` into pixels under distortion `distortion_label`.
+    //  The transform is "combined"  because it combines the transform that undistorts the image and the transform that re-distorts it to the
+    //  key distortion label.
+    //  One transform can be std::nullopt if the combined transform is just an identity transform, aka the source and target distortion
+    //  is the same.
+    std::map<std::string, std::vector<std::optional<ColorTransform3x4>>> m_transforms;
+};
+
+
+
+//  Load the global `TestImageDistortionManager` from `test_repo_path` (see its constructor).
+//  Call this before running the tests. Once loaded, later calls do nothing.
+//  Throws like the constructor of `TestImageDistortionManager`, and stays uninitialized if it does.
+void initialize_test_image_distortions(const std::string& test_repo_path);
+
+//  The global `TestImageDistortionManager`, or nullptr if `initialize_test_image_distortions()`
+//  hasn't loaded it.
+const TestImageDistortionManager* test_image_distortion_manager();
+
+
+
+}
+#endif
diff --git a/Common/Cpp/TestRunners/UnitTest.h b/Common/Cpp/TestRunners/UnitTest.h
new file mode 100644
index 0000000000..a0ec8fcfef
--- /dev/null
+++ b/Common/Cpp/TestRunners/UnitTest.h
@@ -0,0 +1,99 @@
+/*  Unit Test
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_UnitTest_H
+#define PokemonAutomation_UnitTest_H
+
+#include <memory>
+#include <string>
+#include "Common/Cpp/Logging/AbstractLogger.h"
+
+namespace PokemonAutomation{
+
+class CancellableScope;
+
+
+
+struct UnitTestResult{
+    enum Result{
+        NOT_RUN,
+        PASSED,
+        FAILED,
+        SKIPPED,
+        OOM,
+    };
+    Result result;
+    std::string message;
+
+    UnitTestResult()
+        : result(NOT_RUN)
+    {}
+    UnitTestResult(bool pass)
+        : result(pass ? PASSED : FAILED)
+    {}
+    UnitTestResult(const char* p_message)
+        : result(FAILED)
+        , message(p_message)
+    {}
+    UnitTestResult(std::string p_message)
+        : result(FAILED)
+        , message(std::move(p_message))
+    {}
+    UnitTestResult(Result p_result, std::string p_message = "")
+        : result(p_result)
+        , message(std::move(p_message))
+    {}
+};
+
+
+
+class UnitTest{
+public:
+    virtual ~UnitTest() = default;
+    UnitTest(std::string name)
+        : m_name(std::move(name))
+    {}
+
+
+    template <typename TestType, class... Args>
+    static std::unique_ptr<UnitTest> make(Args&&... args){
+        return std::make_unique<TestType>(std::forward<Args>(args)...);
+    }
+
+    const std::string& name() const{
+        return m_name;
+    }
+    uint64_t memory() const{
+        return m_memory;
+    }
+    size_t threads() const{
+        return m_threads;
+    }
+
+    virtual UnitTestResult run(Logger& logger, CancellableScope& scope) const = 0;
+
+
+protected:
+    const std::string m_name;
+    uint64_t m_memory = 0;
+    size_t m_threads = 1;
+};
+
+
+
+
+
+//  Forward Declaration
+class UnitTestDatabase;
+
+
+
+
+
+
+
+}
+#endif
diff --git a/Common/Cpp/TestRunners/UnitTestDatabase.h b/Common/Cpp/TestRunners/UnitTestDatabase.h
new file mode 100644
index 0000000000..5af8c71f2b
--- /dev/null
+++ b/Common/Cpp/TestRunners/UnitTestDatabase.h
@@ -0,0 +1,59 @@
+/*  Unit Test Database
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_UnitTestDatabase_H
+#define PokemonAutomation_UnitTestDatabase_H
+
+#include <map>
+#include "Common/Cpp/Exceptions.h"
+#include "UnitTest.h"
+
+namespace PokemonAutomation{
+
+
+class UnitTestDatabase{
+public:
+    template <typename TestType, class... Args>
+    void add(Args&&... args){
+        *this += std::make_shared<TestType>(std::forward<Args>(args)...);
+    }
+    void operator+=(std::shared_ptr<const UnitTest> test){
+        if (!m_database.emplace(test->name(), std::move(test)).second){
+            throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Duplicate Test Name: " + test->name());
+        }
+    }
+    void operator+=(const UnitTestDatabase& database){
+        for (const auto& item : database.m_database){
+            if (m_database.contains(item.first)){
+                throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Duplicate Test Name: " + item.first);
+            }
+        }
+        std::map<std::string, std::shared_ptr<const UnitTest>> copy = database.m_database;
+        while (!copy.empty()){
+            auto node = copy.extract(copy.begin());
+            m_database.insert(std::move(node));
+        }
+    }
+
+public:
+    auto find(const std::string& name) const{
+        return m_database.find(name);
+    }
+    auto begin() const{
+        return m_database.begin();
+    }
+    auto end() const{
+        return m_database.end();
+    }
+
+private:
+    std::map<std::string, std::shared_ptr<const UnitTest>> m_database;
+};
+
+
+
+}
+#endif
diff --git a/Common/Cpp/Time.cpp b/Common/Cpp/Time.cpp
index a506d214d0..35a0474a9b 100644
--- a/Common/Cpp/Time.cpp
+++ b/Common/Cpp/Time.cpp
@@ -1,13 +1,77 @@
 /*  Time
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
+#include <ctime>
+//#include <format>
+#include <sstream>
+#include "Common/Cpp/PrettyPrint.h"
 #include "Time.h"
 
 namespace PokemonAutomation{
 
 
 
+std::string current_time_to_str(){
+    //  Based off of: https://stackoverflow.com/questions/15957805/extract-year-month-day-etc-from-stdchronotime-point-in-c
+
+    using namespace std;
+    using namespace std::chrono;
+    typedef duration<int, ratio_multiply<hours::period, ratio<24> >::type> days;
+    system_clock::time_point now = system_clock::now();
+    system_clock::duration tp = now.time_since_epoch();
+    days d = duration_cast<days>(tp);
+    tp -= d;
+    hours h = duration_cast<hours>(tp);
+    tp -= h;
+    minutes m = duration_cast<minutes>(tp);
+    tp -= m;
+    seconds s = duration_cast<seconds>(tp);
+    tp -= s;
+    auto micros = 1000000 * tp.count() * system_clock::duration::period::num / system_clock::duration::period::den;
+    time_t tt = system_clock::to_time_t(now);
+//    tm utc_tm = *gmtime(&tt);
+    tm local_tm = *localtime(&tt);
+
+    std::ostringstream ss;
+    ss << local_tm.tm_year + 1900 << '-';
+    ss << tostr_padded(2, local_tm.tm_mon + 1) << '-';
+    ss << tostr_padded(2, local_tm.tm_mday) << ' ';
+    ss << tostr_padded(2, local_tm.tm_hour) << ':';
+    ss << tostr_padded(2, local_tm.tm_min) << ':';
+    ss << tostr_padded(2, local_tm.tm_sec) << '.';
+    ss << tostr_padded(6, micros);
+
+    return ss.str();
+}
+
+
+
+uint16_t current_year(){
+#if 0
+    //  This requires C++20. (https://stackoverflow.com/a/58152002)
+    return (uint16_t)std::atoi(
+        std::format("{:%Y}", std::chrono::system_clock::now())
+    );
+#endif
+
+#if 1
+    //  This is not thread-safe. (https://stackoverflow.com/a/58153628)
+    //  (Thread-safe on Windows because it uses TLS, but unclear on other platforms.)
+    std::time_t t = std::time(nullptr);
+    std::tm* info = std::localtime(&t);
+    return (uint16_t)(info->tm_year + 1900);
+#endif
+
+#if 0
+    //  This is wrong. (https://stackoverflow.com/a/67459754)
+    time_t current_time = time(nullptr);
+    return (uint16_t)(1970 + current_time / 31537970);
+#endif
+}
+
+
+
 }
diff --git a/Common/Cpp/Time.h b/Common/Cpp/Time.h
index e029abe528..7ee147510e 100644
--- a/Common/Cpp/Time.h
+++ b/Common/Cpp/Time.h
@@ -1,6 +1,6 @@
 /*  Time
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -8,6 +8,7 @@
 #define PokemonAutomation_Time_H
 
 #include <chrono>
+#include "Common/Compiler.h"
 
 namespace PokemonAutomation{
 
@@ -15,13 +16,34 @@ namespace PokemonAutomation{
 using WallClock = std::chrono::system_clock::time_point;
 using WallDuration = std::chrono::system_clock::duration;
 
+constexpr PA_FORCE_INLINE WallDuration milliseconds_to_duration(int64_t milliseconds){
+    return std::chrono::milliseconds(milliseconds);
+}
+
+PA_FORCE_INLINE bool wrapsafe_cmplt(WallClock x, WallClock y){
+    return x < y;
+}
+PA_FORCE_INLINE bool wrapsafe_cmpgt(WallClock x, WallClock y){
+    return x > y;
+}
+PA_FORCE_INLINE bool wrapsafe_cmple(WallClock x, WallClock y){
+    return x <= y;
+}
+PA_FORCE_INLINE bool wrapsafe_cmpge(WallClock x, WallClock y){
+    return x >= y;
+}
+
+
 using Milliseconds = std::chrono::milliseconds;
 using Seconds = std::chrono::seconds;
 
 inline WallClock current_time(){
     return std::chrono::system_clock::now();
 }
+std::string current_time_to_str();
+
 
+uint16_t current_year();
 
 
 }
diff --git a/Common/Cpp/UiWrapper.h b/Common/Cpp/UiWrapper.h
new file mode 100644
index 0000000000..d8b92400c1
--- /dev/null
+++ b/Common/Cpp/UiWrapper.h
@@ -0,0 +1,179 @@
+/*  UI Wrapper
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_UiWrapper_H
+#define PokemonAutomation_UiWrapper_H
+
+#include <typeinfo>
+#include "Common/Cpp/Exceptions.h"
+
+namespace PokemonAutomation{
+
+
+
+class UiComponent{
+public:
+    UiComponent(const UiComponent& x) = delete;
+    void operator=(const UiComponent& x) = delete;
+
+    UiComponent() = default;
+    virtual ~UiComponent() = default;
+};
+
+
+
+//  Lightweight smart pointer to avoid pulling in <memory>.
+class UiWrapper{
+public:
+    ~UiWrapper(){
+        if (m_owns){
+            delete m_component;
+        }
+    }
+    UiWrapper(UiWrapper&& x)
+        : m_owns(x.m_owns)
+        , m_component(x.m_component)
+    {
+        x.m_component = nullptr;
+    }
+    void operator=(UiWrapper&& x){
+        if (this == &x){
+            return;
+        }
+        if (m_owns){
+            delete m_component;
+        }
+        m_owns = x.m_owns;
+        m_component = x.m_component;
+        x.m_component = nullptr;
+    }
+    UiWrapper(const UiWrapper& x) = delete;
+    void operator=(const UiWrapper& x) = delete;
+
+
+public:
+    UiWrapper()
+        : m_owns(false)
+        , m_component(nullptr)
+    {}
+    UiWrapper(bool take_ownership, UiComponent* component)
+        : m_owns(take_ownership)
+        , m_component(component)
+    {}
+
+    bool is_owning() const{
+        return m_owns;
+    }
+    UiComponent* release(){
+        m_owns = false;
+        return m_component;
+    }
+
+
+public:
+    operator bool() const{
+        return m_component != nullptr;
+    }
+
+    const UiComponent& operator*() const{
+        return *m_component;
+    }
+    UiComponent& operator*(){
+        return *m_component;
+    }
+
+    const UiComponent* operator->() const{
+        return m_component;
+    }
+    UiComponent* operator->(){
+        return m_component;
+    }
+
+    const UiComponent* get() const{
+        return m_component;
+    }
+    UiComponent* get(){
+        return m_component;
+    }
+
+
+private:
+    bool m_owns;
+    UiComponent* m_component;
+};
+
+
+
+
+
+template <typename UiStateType>
+using UiFactory = UiWrapper (*)(UiStateType& state, void* params);
+
+
+
+//
+//  This is a convenience class that implementations should inherit from instead
+//  of directly inheriting from ConfigOption or another option type.
+//
+//  This provides the per-type UI factory as well as the "make_ui_component"
+//  override. This saves a ton of copy-paste as those are the same eveywhere.
+//
+
+template <typename... Args>
+class UiState;
+
+
+template <>
+class UiState<>{
+public:
+    virtual UiWrapper make_ui_component(void* params) = 0;
+};
+
+
+template <typename Type>
+class UiState<Type> : public UiState<>{
+public:
+    virtual UiWrapper make_ui_component(void* params){
+        if (m_ui_factory){
+            return m_ui_factory(static_cast<Type&>(*this), params);
+        }
+        throw InternalProgramError(
+            nullptr,
+            PA_CURRENT_FUNCTION,
+            std::string("UI component not registered for type: ") + typeid(Type).name()
+        );
+    }
+
+    static UiFactory<Type> m_ui_factory;
+};
+
+template <typename Type>
+UiFactory<Type> UiState<Type>::m_ui_factory;
+
+
+
+template <typename Type, typename ParentType>
+class UiState<Type, ParentType> : public ParentType{
+public:
+    using ParentType::ParentType;
+
+    virtual UiWrapper make_ui_component(void* params) override{
+        if (m_ui_factory){
+            return m_ui_factory(static_cast<Type&>(*this), params);
+        }
+        return UiWrapper();
+    }
+
+    static UiFactory<Type> m_ui_factory;
+};
+
+template <typename Type, typename ParentType>
+UiFactory<Type> UiState<Type, ParentType>::m_ui_factory;
+
+
+
+}
+#endif
diff --git a/Common/Cpp/Unicode.cpp b/Common/Cpp/Unicode.cpp
deleted file mode 100644
index a1fbfc8880..0000000000
--- a/Common/Cpp/Unicode.cpp
+++ /dev/null
@@ -1,104 +0,0 @@
-/*  Unicode
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- */
-
-#include "Unicode.h"
-
-namespace PokemonAutomation{
-
-
-const uint32_t MAX_CODEPOINT = 0x10ffff;
-const uint32_t REPLACEMENT = 0xfffd;
-
-void utf8_skip_to_next_codepoint(const char*& str){
-    while (true){
-        str++;
-        unsigned ch = str[0];
-        if ((ch & 0x80u) == 0){
-            return;
-        }
-        if ((ch & 0xc0u) == 0xc0u){
-            return;
-        }
-    }
-}
-uint32_t utf8_to_unicode(const char*& str){
-    unsigned char ch = str[0];
-    if (ch <= 0x7f){
-        str++;
-        return ch;
-    }
-
-    uint32_t codepoint;
-
-    if (ch < 0xc0){
-        utf8_skip_to_next_codepoint(str);
-        return REPLACEMENT;
-    }
-
-    int bytes = 0;
-    bytes = ch <= 0xf7 ? 4 : bytes;
-    bytes = ch <= 0xef ? 3 : bytes;
-    bytes = ch <= 0xdf ? 2 : bytes;
-
-    if (bytes == 0){
-        utf8_skip_to_next_codepoint(str);
-        return REPLACEMENT;
-    }
-
-    ch &= ((unsigned char)1 << (7 - bytes)) - 1;
-    codepoint = ch;
-
-    for (int c = 1; c < bytes; c++){
-        ch = str[c];
-        if ((ch & 0xc0) != 0x80){
-            utf8_skip_to_next_codepoint(str);
-            return REPLACEMENT;
-        }
-        codepoint <<= 6;
-        codepoint |= ch & 0x3f;
-    }
-
-    if (codepoint > MAX_CODEPOINT){
-        utf8_skip_to_next_codepoint(str);
-        return REPLACEMENT;
-    }
-
-    str += bytes;
-    return codepoint;
-}
-void append_to_utf16(std::u16string& str, uint32_t codepoint){
-    if (codepoint < 0xffff){
-        str += (char16_t)codepoint;
-        return;
-    }
-    str.reserve(str.size() + 2);
-
-    codepoint -= 0x10000;
-    str += (char16_t)(codepoint >> 10) + 0xd800;
-    str += (char16_t)(codepoint & 0x3ff) + 0xdc00;
-}
-
-std::u16string utf8_to_utf16(const std::string& str){
-    std::u16string out;
-    const char* utf8 = str.c_str();
-    const char* stop = utf8 + str.size();
-    while (utf8 < stop){
-        append_to_utf16(out, utf8_to_unicode(utf8));
-    }
-    return out;
-}
-
-#ifdef _WIN32
-std::wstring utf8_to_wstr(const std::string& str){
-    std::u16string tmp(utf8_to_utf16(str));
-    return std::wstring(tmp.begin(), tmp.end());
-}
-#endif
-
-
-
-}
-
diff --git a/Common/Cpp/Unicode.h b/Common/Cpp/Unicode.h
deleted file mode 100644
index 03e4667220..0000000000
--- a/Common/Cpp/Unicode.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*  Unicode
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- */
-
-#ifndef PokemonAutomation_Unicode_H
-#define PokemonAutomation_Unicode_H
-
-#include <string>
-
-namespace PokemonAutomation{
-
-std::u16string utf8_to_utf16(const std::string& str);
-
-#ifdef _WIN32
-std::wstring utf8_to_wstr(const std::string& str);
-#endif
-
-}
-#endif
diff --git a/Common/Cpp/ValueDebouncer.h b/Common/Cpp/ValueDebouncer.h
index a5568e0577..a12e865e71 100644
--- a/Common/Cpp/ValueDebouncer.h
+++ b/Common/Cpp/ValueDebouncer.h
@@ -1,6 +1,6 @@
 /*  Value Debouncer
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  *      This class is used to debounce a resizing loop in Qt with widgets of
  *  fixed aspect ratio.
diff --git a/Common/Microcontroller/DeviceRoutines.cpp b/Common/Microcontroller/DeviceRoutines.cpp
deleted file mode 100644
index 98a2f8fb5f..0000000000
--- a/Common/Microcontroller/DeviceRoutines.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-/*  Device Routines
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "DeviceRoutines.h"
-
-namespace PokemonAutomation{
-namespace Microcontroller{
-
-
-uint32_t protocol_version(BotBase& botbase){
-    pabb_MsgAckRequestI32 response;
-    botbase.issue_request_and_wait(
-        DeviceRequest_protocol_version()
-    ).convert<PABB_MSG_ACK_REQUEST_I32>(botbase.logger(), response);
-    return response.data;
-}
-uint32_t program_version(BotBase& botbase){
-    pabb_MsgAckRequestI32 response;
-    botbase.issue_request_and_wait(
-        DeviceRequest_program_version()
-    ).convert<PABB_MSG_ACK_REQUEST_I32>(botbase.logger(), response);
-    return response.data;
-}
-uint8_t program_id(BotBase& botbase){
-    pabb_MsgAckRequestI8 response;
-    botbase.issue_request_and_wait(
-        DeviceRequest_program_id()
-    ).convert<PABB_MSG_ACK_REQUEST_I8>(botbase.logger(), response);
-    return response.data;
-}
-
-
-}
-}
diff --git a/Common/Microcontroller/DeviceRoutines.h b/Common/Microcontroller/DeviceRoutines.h
deleted file mode 100644
index ed6fb81690..0000000000
--- a/Common/Microcontroller/DeviceRoutines.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/*  Device Routines
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_DeviceRoutines_H
-#define PokemonAutomation_DeviceRoutines_H
-
-#include "MessageProtocol.h"
-#include "ClientSource/Connection/BotBase.h"
-#include "ClientSource/Connection/BotBaseMessage.h"
-
-namespace PokemonAutomation{
-namespace Microcontroller{
-
-uint32_t protocol_version(BotBase& botbase);
-uint32_t program_version(BotBase& botbase);
-uint8_t program_id(BotBase& botbase);
-
-
-class DeviceRequest_seqnum_reset : public BotBaseRequest{
-public:
-    pabb_MsgInfoSeqnumReset params;
-    DeviceRequest_seqnum_reset()
-        : BotBaseRequest(false)
-    {}
-    virtual BotBaseMessage message() const override{
-        return BotBaseMessage(PABB_MSG_SEQNUM_RESET, params);
-    }
-};
-class DeviceRequest_request_stop : public BotBaseRequest{
-public:
-    pabb_MsgRequestProtocolVersion params;
-    DeviceRequest_request_stop()
-        : BotBaseRequest(false)
-    {}
-    virtual BotBaseMessage message() const override{
-        return BotBaseMessage(PABB_MSG_REQUEST_STOP, params);
-    }
-};
-class DeviceRequest_next_command_interrupt : public BotBaseRequest{
-public:
-    pabb_MsgRequestNextCmdInterrupt params;
-    DeviceRequest_next_command_interrupt()
-        : BotBaseRequest(false)
-    {}
-    virtual BotBaseMessage message() const override{
-        return BotBaseMessage(PABB_MSG_REQUEST_NEXT_CMD_INTERRUPT, params);
-    }
-};
-class DeviceRequest_protocol_version : public BotBaseRequest{
-public:
-    pabb_MsgRequestProtocolVersion params;
-    DeviceRequest_protocol_version()
-        : BotBaseRequest(false)
-    {}
-    virtual BotBaseMessage message() const override{
-        return BotBaseMessage(PABB_MSG_REQUEST_PROTOCOL_VERSION, params);
-    }
-};
-class DeviceRequest_program_version : public BotBaseRequest{
-public:
-    pabb_MsgRequestProgramVersion params;
-    DeviceRequest_program_version()
-        : BotBaseRequest(false)
-    {}
-    virtual BotBaseMessage message() const override{
-        return BotBaseMessage(PABB_MSG_REQUEST_PROGRAM_VERSION, params);
-    }
-};
-class DeviceRequest_program_id : public BotBaseRequest{
-public:
-    pabb_MsgRequestProgramID params;
-    DeviceRequest_program_id()
-        : BotBaseRequest(false)
-    {}
-    virtual BotBaseMessage message() const override{
-        return BotBaseMessage(PABB_MSG_REQUEST_PROGRAM_ID, params);
-    }
-};
-
-
-
-}
-}
-#endif
diff --git a/Common/Microcontroller/MessageProtocol.h b/Common/Microcontroller/MessageProtocol.h
deleted file mode 100644
index d33f5ee373..0000000000
--- a/Common/Microcontroller/MessageProtocol.h
+++ /dev/null
@@ -1,328 +0,0 @@
-/*  Message Protocol
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- * 
- *      Pokemon Automation Bot-Base implements reliable data transmissions over
- *  serial communication. This is done by checksumming messages along with a
- *  protocol that is tolerant to data drops.
- * 
- *  This file describes the message protocol. The data being transmitted is raw
- *  binary and not is readable text.
- * 
- * 
- *  Message Format:
- *      byte 0: Length of the entire message. (bits are inverted)
- *      byte 1: Message Type
- *      byte X: Optional data of variable length.
- *      Last 4 bytes: CRC32C of the entire message except these last 4 bytes.
- * 
- *      Thus there are 6 bytes of overhead for each message.
- * 
- * 
- *  There are currently 4 categories of message types:
- * 
- *      1.  Info: These are simple one-way messages. They do not need to be
- *          acked and may be dropped without adversely affecting anything.
- * 
- *      2.  Ack/Response: These are messages sent in response to an earlier
- *          message that was received.
- * 
- *      3.  Request: The sender requests the receiver to do something simple.
- *          The receiver must respond with an ack.
- * 
- *          This is used for things that take no clock time. For example, querying
- *          for program identifiers, turning on/off LEDs, or setting flags in the
- *          program to change its behavior in the future.
- * 
- *      4.  Command: The sender requests the receiver to do a large asynchronous
- *          operation. The receiver must ack this message. Once the command is
- *          finished, the receiver must send a request message back to the sender
- *          to indicate that the command is finished.
- * 
- *          This is used for issuing button presses or other subroutines that
- *          consume time.
- * 
- * 
- *  General Protocol:
- * 
- *      1.  Every time you send a new request/command message, you increment
- *          your sequence number (seqnum) by 1.
- * 
- *      2.  If you receive an invalid message (bad length or bad checksum), ignore
- *          the first byte and attempt to parse the next byte as the start of a
- *          new message.
- * 
- *      3.  If you receive a zero for the 1st byte of a message, ignore it and
- *          attempt to parse the next byte as the start of a new message.
- * 
- *      4.  At any point, you can send a bunch of zero bytes. This will cause
- *          the receiver to re-synchronize.
- * 
- *      5.  If you receive a request/command message, you must send the appropriate
- *          ack/response message using the same seqnum.
- * 
- *      6.  If you receive a command message, you must first ack the message itself.
- *          Once the command is finished, you must send a request referencing the
- *          command to indicate that it is finished. You will receive an ack for
- *          this short (finishing) command, and if you don't, send it again until
- *          you do. If the command finishes immediately, you can skip the ack and
- *          just send the finish request.
- * 
- *      7.  If you send a request/command message and don't get a response after
- *          a time limit, you should resend the message with the same seqnum.
- * 
- *      8.  If you receive a request/command that has a seqnum ahead of what you
- *          are expecting, it means an earlier request/command was dropped.
- *          Do not process the request/command since you will lose ordering.
- * 
- *      9.  If you receive a request/command that has an old seqnum, it is a
- *          retransmit. Send an ack for it, but don't process it again. (idempotency)
- * 
- * 
- *  Failure Analysis:
- * 
- *      -   Corrupted messages will either fail checksum or will have an invalid
- *          length/type. These are simply ignored and dropped.
- * 
- *      -   If either sender or receiver gets out-of-sync and loses track of
- *          message boundaries, it will eventually find the boundary again by
- *          simply trying to parse every byte as the start of a new message and
- *          verifying the length and CRC.
- * 
- *      -   If a request/command is dropped, no ack will be received. The sender
- *          will eventually send the command again. (#7)
- * 
- *      -   If an ack is dropped, the sender will eventually resend the
- *          request/command again. The receiver will see the duplicate
- *          request/command and ack it. But the receiver will not process it
- *          again to preserve idempotency. (#9)
- * 
- *  The current protocol guarantees that all commands are processed in order
- *  exactly once. Requests are not guaranteed to process in order and may execute
- *  more than once so they should be idempotent.
- * 
- *  The protocol also allows both sides to queue up requests and commands.
- *  In other words, it is possible to send multiple requests/commands at once
- *  without waiting for the individual acks.
- * 
- * 
- *  PABotBase Specifics:
- * 
- *      -   PABotBase can queue up to 4 commands. If it receives any commands
- *          while the queue is full, it drops it and responds with
- *          "PABB_MSG_ERROR_COMMAND_DROPPED". (Any command that results in a
- *          button press or a wait is a long command.)
- * 
- *      -   PABotBase can still handle other messages while it is running a long
- *          command.
- * 
- */
-
-#ifndef PokemonAutomation_MessageProtocol_H
-#define PokemonAutomation_MessageProtocol_H
-
-#include <stdbool.h>
-#include <stdint.h>
-
-#if _WIN32
-#pragma pack(push, 1)
-#define PABB_PACK
-#else
-#define PABB_PACK   __attribute__((packed))
-#endif
-
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-
-//  This macro isn't part of the protocol. But it specifies the size of the
-//  command queue on the device. This can be used as a hint by the client to
-//  avoid overloading the device. This has no effect on correctness since the
-//  device will automatically drop commands when the command queue fills up or
-//  if it can't process serial messages quickly enough.
-#define PABB_DEVICE_QUEUE_SIZE          4   //  Must be a power-of-two.
-
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-
-//  Protocol Version:
-//
-//      Backwards incompatible changes will increase by 100 or more.
-//      Backwards compatible changes will increase by 1.
-//
-//      (version / 100) must be the same on both server and client.
-//      (version % 100) can be higher on server than client.
-//
-#define PABB_PROTOCOL_VERSION           2021052613
-
-//  Program versioning doesn't matter. It's just for informational purposes.
-#define PABB_PROGRAM_VERSION            2023012300
-
-#define PABB_BAUD_RATE                  115200
-#define PABB_RETRANSMIT_DELAY_MILLIS    80
-
-#define PABB_MAX_MESSAGE_SIZE           12
-#define PABB_PROTOCOL_OVERHEAD          (2 + sizeof(uint32_t))
-#define PABB_MAX_PACKET_SIZE            (PABB_MAX_MESSAGE_SIZE + PABB_PROTOCOL_OVERHEAD)
-
-typedef uint32_t seqnum_t;
-
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-//  Basic Message Types
-
-#define PABB_MSG_IS_ERROR(x)        (((x) & 0xf0) == 0x00)  //  Framework errors between 0x00 - 0x0f.
-#define PABB_MSG_IS_ACK(x)          (((x) & 0xf0) == 0x10)  //  Acks between 0x10 - 0x1f.
-#define PABB_MSG_IS_INFO(x)         (((x) & 0xe0) == 0x20)  //  Custom info between 0x20 - 0x3f.
-#define PABB_MSG_IS_REQUEST(x)      (((x) & 0xc0) == 0x40)  //  Requests between 0x40 - 0x7f.
-#define PABB_MSG_IS_COMMAND(x)      ((x) >= 0x80)           //  Commands between 0x80 - 0xff.
-
-#define PABB_MSG_IS_REQUEST_OR_COMMAND(x)   ((x) >= 0x40)
-
-////////////////////////////////////////////////////////////////////////////////
-//  Framework Errors
-#define PABB_MSG_ERROR_READY                    0x00
-//  No Parameters
-
-#define PABB_MSG_ERROR_INVALID_MESSAGE          0x01
-typedef struct{
-    uint8_t message_length;
-} PABB_PACK pabb_MsgInfoInvalidMessage;
-
-#define PABB_MSG_ERROR_CHECKSUM_MISMATCH        0x02
-typedef struct{
-    uint8_t message_length;
-} PABB_PACK pabb_MsgInfoChecksumMismatch;
-
-#define PABB_MSG_ERROR_INVALID_TYPE             0x03
-typedef struct{
-    uint8_t type;
-} PABB_PACK pabb_MsgInfoInvalidType;
-
-#define PABB_MSG_ERROR_INVALID_REQUEST          0x04
-typedef struct{
-    seqnum_t seqnum;
-} PABB_PACK pabb_MsgInfoInvalidRequest;
-
-#define PABB_MSG_ERROR_MISSED_REQUEST           0x05
-typedef struct{
-    seqnum_t seqnum;
-} PABB_PACK pabb_MsgInfoMissedRequest;
-
-#define PABB_MSG_ERROR_COMMAND_DROPPED          0x06
-typedef struct{
-    seqnum_t seqnum;
-} PABB_PACK pabb_MsgInfoCommandDropped;
-
-#define PABB_MSG_ERROR_WARNING                  0x07
-typedef struct{
-    uint16_t error_code;
-} PABB_PACK pabb_MsgInfoWARNING;
-
-////////////////////////////////////////////////////////////////////////////////
-//  Ack
-#define PABB_MSG_ACK_COMMAND                    0x10
-typedef struct{
-    seqnum_t seqnum;
-} PABB_PACK pabb_MsgAckCommand;
-
-#define PABB_MSG_ACK_REQUEST                    0x11
-typedef struct{
-    seqnum_t seqnum;
-} PABB_PACK pabb_MsgAckRequest;
-
-#define PABB_MSG_ACK_REQUEST_I8                 0x12
-typedef struct{
-    seqnum_t seqnum;
-    uint8_t data;
-} PABB_PACK pabb_MsgAckRequestI8;
-
-#define PABB_MSG_ACK_REQUEST_I16                0x13
-typedef struct{
-    seqnum_t seqnum;
-    uint16_t data;
-} PABB_PACK pabb_MsgAckRequestI16;
-
-#define PABB_MSG_ACK_REQUEST_I32                0x14
-typedef struct{
-    seqnum_t seqnum;
-    uint32_t data;
-} PABB_PACK pabb_MsgAckRequestI32;
-
-////////////////////////////////////////////////////////////////////////////////
-//  Requests
-#define PABB_MSG_SEQNUM_RESET                   0x40
-//  After you send this message, the next seqnum you should use is (seqnum + 1).
-typedef struct{
-    seqnum_t seqnum;
-} PABB_PACK pabb_MsgInfoSeqnumReset;
-
-#define PABB_MSG_REQUEST_PROTOCOL_VERSION       0x41
-typedef struct{
-    seqnum_t seqnum;
-} PABB_PACK pabb_MsgRequestProtocolVersion;
-
-#define PABB_MSG_REQUEST_PROGRAM_VERSION        0x42
-typedef struct{
-    seqnum_t seqnum;
-} PABB_PACK pabb_MsgRequestProgramVersion;
-
-#define PABB_MSG_REQUEST_PROGRAM_ID             0x43
-typedef struct{
-    seqnum_t seqnum;
-} PABB_PACK pabb_MsgRequestProgramID;
-
-#define PABB_MSG_REQUEST_CLOCK                  0x44
-typedef struct{
-    seqnum_t seqnum;
-} PABB_PACK pabb_system_clock;
-
-#define PABB_MSG_REQUEST_COMMAND_FINISHED       0x45
-//  When you receive this message, you must ack it with PABB_MSG_ACK_REQUEST.
-typedef struct{
-    seqnum_t seqnum;
-    seqnum_t seq_of_original_command;
-    uint32_t finish_time;
-} PABB_PACK pabb_MsgRequestCommandFinished;
-
-#define PABB_MSG_REQUEST_STOP                   0x46
-typedef struct{
-    seqnum_t seqnum;
-} PABB_PACK pabb_MsgRequestStop;
-
-#define PABB_MSG_REQUEST_NEXT_CMD_INTERRUPT     0x47
-typedef struct{
-    seqnum_t seqnum;
-} PABB_PACK pabb_MsgRequestNextCmdInterrupt;
-
-////////////////////////////////////////////////////////////////////////////////
-//  Custom Info
-
-#define PABB_MSG_INFO_I32                       0x20
-typedef struct{
-    uint8_t tag;
-    uint32_t data;
-} PABB_PACK pabb_MsgInfoI32;
-
-////////////////////////////////////////////////////////////////////////////////
-//  Commands
-
-#define PABB_MSG_COMMAND_END_PROGRAM_CALLBACK   0x80
-typedef struct{
-    seqnum_t seqnum;
-} PABB_PACK pabb_end_program_callback;
-
-#define PABB_MSG_COMMAND_SET_LED_STATE          0x81
-typedef struct{
-    seqnum_t seqnum;
-    bool on;
-} PABB_PACK pabb_MsgCommandSetLeds;
-
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-
-#if _WIN32
-#pragma pack(pop)
-#endif
-
-#endif
diff --git a/Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h b/Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h
deleted file mode 100644
index 5147a9d7dd..0000000000
--- a/Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*  Controller Types and Definitions
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- */
-
-#ifndef PokemonAutomation_NintendoSwitch_ControllerDefs_H
-#define PokemonAutomation_NintendoSwitch_ControllerDefs_H
-
-#include <stdbool.h>
-#include <stdint.h>
-
-//  One second = 125 ticks. Thus each tick is 8 milliseconds.
-#define TICKS_PER_SECOND    125
-
-//  Buttons
-#define Button              uint16_t
-#define BUTTON_Y            ((uint16_t)1 <<  0)
-#define BUTTON_B            ((uint16_t)1 <<  1)
-#define BUTTON_A            ((uint16_t)1 <<  2)
-#define BUTTON_X            ((uint16_t)1 <<  3)
-#define BUTTON_L            ((uint16_t)1 <<  4)
-#define BUTTON_R            ((uint16_t)1 <<  5)
-#define BUTTON_ZL           ((uint16_t)1 <<  6)
-#define BUTTON_ZR           ((uint16_t)1 <<  7)
-#define BUTTON_MINUS        ((uint16_t)1 <<  8)
-#define BUTTON_PLUS         ((uint16_t)1 <<  9)
-#define BUTTON_LCLICK       ((uint16_t)1 << 10)
-#define BUTTON_RCLICK       ((uint16_t)1 << 11)
-#define BUTTON_HOME         ((uint16_t)1 << 12)
-#define BUTTON_CAPTURE      ((uint16_t)1 << 13)
-
-//  Dpad
-#define DpadPosition        uint8_t
-#define DPAD_UP             0
-#define DPAD_UP_RIGHT       1
-#define DPAD_RIGHT          2
-#define DPAD_DOWN_RIGHT     3
-#define DPAD_DOWN           4
-#define DPAD_DOWN_LEFT      5
-#define DPAD_LEFT           6
-#define DPAD_UP_LEFT        7
-#define DPAD_NONE           8
-
-//  Joysticks
-#define STICK_MIN           0x00
-#define STICK_CENTER        0x80
-#define STICK_MAX           0xff
-
-
-#endif
diff --git a/Common/NintendoSwitch/NintendoSwitch_Protocol_DigitEntry.h b/Common/NintendoSwitch/NintendoSwitch_Protocol_DigitEntry.h
deleted file mode 100644
index 3a10815adc..0000000000
--- a/Common/NintendoSwitch/NintendoSwitch_Protocol_DigitEntry.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*  Digit Entry
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- */
-
-#ifndef PokemonAutomation_NintendoSwitch_Protocol_SwitchDigitEntry_H
-#define PokemonAutomation_NintendoSwitch_Protocol_SwitchDigitEntry_H
-
-#ifdef __AVR__
-#include "NativePrograms/NintendoSwitch/Framework/Master.h"
-#endif
-#include "Common/Microcontroller/MessageProtocol.h"
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-//  Protocols
-#if _WIN32
-#pragma pack(push, 1)
-#define PABB_PACK
-#else
-#define PABB_PACK   __attribute__((packed))
-#endif
-////////////////////////////////////////////////////////////////////////////////
-
-#define PABB_MSG_COMMAND_ENTER_DIGITS                           0xa1
-typedef struct{
-    seqnum_t seqnum;
-    uint8_t count;
-    uint8_t digit_pairs[6];
-} PABB_PACK pabb_enter_digits;
-
-////////////////////////////////////////////////////////////////////////////////
-#if _WIN32
-#pragma pack(pop)
-#endif
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-#endif
-
diff --git a/Common/NintendoSwitch/NintendoSwitch_Protocol_PushButtons.h b/Common/NintendoSwitch/NintendoSwitch_Protocol_PushButtons.h
deleted file mode 100644
index d8950778db..0000000000
--- a/Common/NintendoSwitch/NintendoSwitch_Protocol_PushButtons.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/*  Pokemon Automation Push Button Framework
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- */
-
-#ifndef PokemonAutomation_NintendoSwitch_Protocol_PushButtons_H
-#define PokemonAutomation_NintendoSwitch_Protocol_PushButtons_H
-
-//#ifdef __AVR__
-//#include "NativePrograms/NintendoSwitch/Framework/Master.h"
-//#endif
-#include "Common/Microcontroller/MessageProtocol.h"
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-
-#if _WIN32
-#pragma pack(push, 1)
-#define PABB_PACK
-#else
-#define PABB_PACK   __attribute__((packed))
-#endif
-
-
-#define PABB_MSG_COMMAND_PBF_WAIT                   0x90
-typedef struct{
-    seqnum_t seqnum;
-    uint16_t ticks;
-} PABB_PACK pabb_pbf_wait;
-
-#define PABB_MSG_COMMAND_PBF_PRESS_BUTTON           0x91
-typedef struct{
-    seqnum_t seqnum;
-    Button button;
-    uint16_t hold_ticks;
-    uint16_t release_ticks;
-} PABB_PACK pabb_pbf_press_button;
-
-#define PABB_MSG_COMMAND_PBF_PRESS_DPAD             0x92
-typedef struct{
-    seqnum_t seqnum;
-    DpadPosition dpad;
-    uint16_t hold_ticks;
-    uint16_t release_ticks;
-} PABB_PACK pabb_pbf_press_dpad;
-
-#define PABB_MSG_COMMAND_PBF_MOVE_JOYSTICK_L        0x93
-#define PABB_MSG_COMMAND_PBF_MOVE_JOYSTICK_R        0x94
-typedef struct{
-    seqnum_t seqnum;
-    uint8_t x;
-    uint8_t y;
-    uint16_t hold_ticks;
-    uint16_t release_ticks;
-} PABB_PACK pabb_pbf_move_joystick;
-
-#define PABB_MSG_COMMAND_MASH_BUTTON                0x95
-typedef struct{
-    seqnum_t seqnum;
-    Button button;
-    uint16_t ticks;
-} PABB_PACK pabb_pbf_mash_button;
-
-#define PABB_MSG_CONTROLLER_STATE                   0x9f
-typedef struct{
-    seqnum_t seqnum;
-    Button button;
-    DpadPosition dpad;
-    uint8_t left_joystick_x;
-    uint8_t left_joystick_y;
-    uint8_t right_joystick_x;
-    uint8_t right_joystick_y;
-    uint8_t ticks;
-} PABB_PACK pabb_controller_state;
-
-
-#if _WIN32
-#pragma pack(pop)
-#endif
-
-#endif
diff --git a/Common/NintendoSwitch/NintendoSwitch_Protocol_Routines.h b/Common/NintendoSwitch/NintendoSwitch_Protocol_Routines.h
deleted file mode 100644
index 5eeca3ae6e..0000000000
--- a/Common/NintendoSwitch/NintendoSwitch_Protocol_Routines.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*  General Routines
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- */
-
-#ifndef PokemonAutomation_NintendoSwitch_Protocol_Routines_H
-#define PokemonAutomation_NintendoSwitch_Protocol_Routines_H
-
-#ifdef __AVR__
-#include "NativePrograms/NintendoSwitch/Framework/Master.h"
-#endif
-#include "Common/Microcontroller/MessageProtocol.h"
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-//  Protocols
-#if _WIN32
-#pragma pack(push, 1)
-#define PABB_PACK
-#else
-#define PABB_PACK   __attribute__((packed))
-#endif
-////////////////////////////////////////////////////////////////////////////////
-
-#define PABB_MSG_COMMAND_CLOSE_GAME                             0xb2
-typedef struct{
-    seqnum_t seqnum;
-} PABB_PACK pabb_close_game;
-
-////////////////////////////////////////////////////////////////////////////////
-#if _WIN32
-#pragma pack(pop)
-#endif
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-#endif
-
diff --git a/Common/NintendoSwitch/NintendoSwitch_Protocol_ScalarButtons.h b/Common/NintendoSwitch/NintendoSwitch_Protocol_ScalarButtons.h
deleted file mode 100644
index aaa33b7d2b..0000000000
--- a/Common/NintendoSwitch/NintendoSwitch_Protocol_ScalarButtons.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*  Pokemon Automation Scalar Button Framework
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- */
-
-#ifndef PokemonAutomation_NintendoSwitch_Protocol_ScalarButtons_H
-#define PokemonAutomation_NintendoSwitch_Protocol_ScalarButtons_H
-
-#include "Common/Microcontroller/MessageProtocol.h"
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-
-#if _WIN32
-#pragma pack(push, 1)
-#define PABB_PACK
-#else
-#define PABB_PACK   __attribute__((packed))
-#endif
-
-
-#define PABB_MSG_COMMAND_DEBUG_I32              0xf0
-typedef struct{
-    seqnum_t seqnum;
-    uint32_t data;
-} PABB_PACK pabb_command_debug;
-
-#define PABB_MSG_COMMAND_SSF_FLUSH_PIPELINE     0xf1
-typedef struct{
-    seqnum_t seqnum;
-} PABB_PACK pabb_ssf_flush_pipeline;
-
-#define PABB_MSG_COMMAND_SSF_DO_NOTHING         0xf2
-typedef struct{
-    seqnum_t seqnum;
-    uint16_t ticks;
-} PABB_PACK pabb_ssf_do_nothing;
-
-
-#define PABB_MSG_COMMAND_SSF_PRESS_BUTTON       0xf3
-typedef struct{
-    seqnum_t seqnum;
-    Button button;
-    uint16_t delay;
-    uint16_t hold;
-    uint8_t cool;
-} PABB_PACK pabb_ssf_press_button;
-
-
-#define PABB_MSG_COMMAND_SSF_PRESS_DPAD         0xf4
-typedef struct{
-    seqnum_t seqnum;
-    DpadPosition position;
-    uint16_t delay;
-    uint16_t hold;
-    uint8_t cool;
-} PABB_PACK pabb_ssf_press_dpad;
-
-
-#define PABB_MSG_COMMAND_SSF_PRESS_JOYSTICK_L   0xf5
-#define PABB_MSG_COMMAND_SSF_PRESS_JOYSTICK_R   0xf6
-typedef struct{
-    seqnum_t seqnum;
-    uint8_t x;
-    uint8_t y;
-    uint16_t delay;
-    uint16_t hold;
-    uint8_t cool;
-} PABB_PACK pabb_ssf_press_joystick;
-
-#define PABB_MSG_COMMAND_SSF_MASH1_BUTTON       0xf7
-typedef struct{
-    seqnum_t seqnum;
-    Button button;
-    uint16_t ticks;
-} PABB_PACK pabb_ssf_mash1_button;
-
-#define PABB_MSG_COMMAND_SSF_MASH2_BUTTON       0xf8
-typedef struct{
-    seqnum_t seqnum;
-    Button button0;
-    Button button1;
-    uint16_t ticks;
-} PABB_PACK pabb_ssf_mash2_button;
-
-#define PABB_MSG_COMMAND_SSF_MASH_AZS           0xf9
-typedef struct{
-    seqnum_t seqnum;
-    uint16_t ticks;
-} PABB_PACK pabb_ssf_mash_AZs;
-
-#define PABB_MSG_COMMAND_SSF_SCROLL             0xfa
-#define ssf_ScrollDirection     uint16_t
-typedef struct{
-    seqnum_t seqnum;
-    ssf_ScrollDirection direction;
-    uint16_t delay;
-    uint16_t hold;
-    uint8_t cool;
-} PABB_PACK pabb_ssf_issue_scroll;
-
-
-#if _WIN32
-#pragma pack(pop)
-#endif
-
-#endif
diff --git a/Common/NintendoSwitch/NintendoSwitch_SlotDatabase.h b/Common/NintendoSwitch/NintendoSwitch_SlotDatabase.h
deleted file mode 100644
index 6e91d0585a..0000000000
--- a/Common/NintendoSwitch/NintendoSwitch_SlotDatabase.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*  Slot Database
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_NintendoSwitch_SlotDatabase_H
-#define PokemonAutomation_NintendoSwitch_SlotDatabase_H
-
-#include "Common/Cpp/EnumDatabase.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-
-
-inline const IntegerEnumDatabase& GameSlot_Database(){
-    static const IntegerEnumDatabase database({
-        {1, "game1", "Game 1"},
-        {2, "game2", "Game 2"},
-    });
-    return database;
-}
-inline const IntegerEnumDatabase& UserSlot_Database(){
-    static const IntegerEnumDatabase database({
-        {1, "user1", "User 1"},
-        {2, "user2", "User 2"},
-        {3, "user3", "User 3"},
-        {4, "user4", "User 4"},
-        {5, "user5", "User 5"},
-        {6, "user6", "User 6"},
-        {7, "user7", "User 7"},
-        {8, "user8", "User 8"},
-    });
-    return database;
-}
-
-
-}
-}
-#endif
diff --git a/Common/PABotBase2/Controllers/PABotBase2_Controller_HID_Keyboard.h b/Common/PABotBase2/Controllers/PABotBase2_Controller_HID_Keyboard.h
new file mode 100644
index 0000000000..e3d396e77f
--- /dev/null
+++ b/Common/PABotBase2/Controllers/PABotBase2_Controller_HID_Keyboard.h
@@ -0,0 +1,46 @@
+/*  HID Keyboard
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PABotBase2_Controller_HID_Keyboard_H
+#define PokemonAutomation_PABotBase2_Controller_HID_Keyboard_H
+
+#include "../../ControllerStates/StandardHid_Keyboard_State.h"
+#include "../PABotBase2_MessageProtocol.h"
+
+#if _WIN32
+#pragma pack(push, 1)
+#define PABB_PACK
+#elif __GNUC__
+#define PABB_PACK   __attribute__((packed))
+#else
+#define PABB_PACK
+#endif
+
+namespace PokemonAutomation{
+namespace PABotBase2{
+
+
+
+#define PABB2_MESSAGE_CMD_HID_KEYBOARD_STATE            0x82
+struct PABB_PACK pabb2_Message_Command_HID_Keyboard_State : MessageHeader{
+    uint16_t milliseconds;
+    pabb_HID_Keyboard_State report;
+};
+
+
+
+
+}
+}
+
+
+
+#if _WIN32
+#pragma pack(pop)
+#endif
+
+
+#endif
diff --git a/Common/PABotBase2/Controllers/PABotBase2_Controller_NS1_OemController.h b/Common/PABotBase2/Controllers/PABotBase2_Controller_NS1_OemController.h
new file mode 100644
index 0000000000..a9b3ed364e
--- /dev/null
+++ b/Common/PABotBase2/Controllers/PABotBase2_Controller_NS1_OemController.h
@@ -0,0 +1,77 @@
+/*  PABotBase2 NS1 OEM Controller
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PABotBase2_Controller_NS1_OemController_H
+#define PokemonAutomation_PABotBase2_Controller_NS1_OemController_H
+
+#include "../../ControllerStates/NintendoSwitch_OemController_State.h"
+#include "../PABotBase2_MessageProtocol.h"
+
+#if _WIN32
+#pragma pack(push, 1)
+#define PABB_PACK
+#elif __GNUC__
+#define PABB_PACK   __attribute__((packed))
+#else
+#define PABB_PACK
+#endif
+
+namespace PokemonAutomation{
+namespace PABotBase2{
+
+
+struct PABB_NintendoSwitch_ControllerColors{
+    uint8_t body[3];
+    uint8_t buttons[3];
+    uint8_t left_grip[3];
+    uint8_t right_grip[3];
+};
+
+
+#define PABB2_MESSAGE_REQ_NS1_OEM_CONTROLLER_READ_SPI        0x91
+#define PABB2_MESSAGE_REQ_NS1_OEM_CONTROLLER_WRITE_SPI       0x92
+struct PABB_PACK Message_NS1_OemController_Spi : MessageHeader{
+    uint32_t controller_type;
+    uint32_t address;
+    uint8_t bytes;
+};
+
+
+#define PABB2_MESSAGE_REQ_NS1_OEM_CONTROLLER_PLAYER_LIGHTS      0x93
+#define PABB2_MESSAGE_INFO_NS1_OEM_CONTROLLER_PLAYER_LIGHTS     0x94
+#define PABB2_MESSAGE_INFO_NS1_OEM_CONTROLLER_USB_DISALLOWED    0x95
+#define PABB2_MESSAGE_INFO_NS1_OEM_CONTROLLER_RUMBLE            0x96
+struct PABB_PACK Message_Feedback_NS1_OemController_Rumble : MessageHeader{
+    NintendoSwitch::OemController_RumbleState data;
+};
+
+
+#define PABB2_MESSAGE_CMD_NS1_OEM_CONTROLLER_BUTTONS            0x97
+struct PABB_PACK Message_Command_NS1_OemController_Buttons : MessageHeader{
+    uint16_t milliseconds;
+    NintendoSwitch::OemController_State0x30_Buttons buttons;
+};
+
+
+#define PABB2_MESSAGE_CMD_NS1_OEM_CONTROLLER_FULL_STATE         0x98
+struct PABB_PACK Message_Command_NS1_OemController_FullState : MessageHeader{
+    uint16_t milliseconds;
+    NintendoSwitch::OemController_State0x30 state;
+};
+
+
+
+}
+}
+
+
+
+#if _WIN32
+#pragma pack(pop)
+#endif
+
+
+#endif
diff --git a/Common/PABotBase2/Controllers/PABotBase2_Controller_NS_WiredController.h b/Common/PABotBase2/Controllers/PABotBase2_Controller_NS_WiredController.h
new file mode 100644
index 0000000000..67c7e5b348
--- /dev/null
+++ b/Common/PABotBase2/Controllers/PABotBase2_Controller_NS_WiredController.h
@@ -0,0 +1,46 @@
+/*  PABotBase2 NS Wired Controller
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PABotBase2_Controller_NS_WiredController_H
+#define PokemonAutomation_PABotBase2_Controller_NS_WiredController_H
+
+#include "../../ControllerStates/NintendoSwitch_WiredController_State.h"
+#include "../PABotBase2_MessageProtocol.h"
+
+#if _WIN32
+#pragma pack(push, 1)
+#define PABB_PACK
+#elif __GNUC__
+#define PABB_PACK   __attribute__((packed))
+#else
+#define PABB_PACK
+#endif
+
+namespace PokemonAutomation{
+namespace PABotBase2{
+
+
+
+#define PABB2_MESSAGE_CMD_NS_WIRED_CONTROLLER_STATE     0x90
+struct PABB_PACK pabb2_Message_Command_NS_WiredController_State : MessageHeader{
+    uint16_t milliseconds;
+    pabb_NintendoSwitch_WiredController_State report;
+};
+
+
+
+
+}
+}
+
+
+
+#if _WIN32
+#pragma pack(pop)
+#endif
+
+
+#endif
diff --git a/Common/PABotBase2/PABotBase2CC_MessageDumper.cpp b/Common/PABotBase2/PABotBase2CC_MessageDumper.cpp
new file mode 100644
index 0000000000..b36cb60227
--- /dev/null
+++ b/Common/PABotBase2/PABotBase2CC_MessageDumper.cpp
@@ -0,0 +1,638 @@
+/*  PABotBase2 Message Dumper
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Exceptions.h"
+#include "Common/Cpp/PrettyPrint.h"
+#include "PABotBase2CC_MessageDumper.h"
+
+namespace PokemonAutomation{
+namespace PABotBase2{
+
+
+std::string tostr(const PacketHeader* header){
+    //  TODO: Make sure packets are large enough before reading them.
+
+    std::string str;
+    if (header->opcode & PABB2_CONNECTION_RETRANSMIT_FLAG){
+        str += "(Retransmit) ";
+    }
+    switch (header->opcode & PABB2_CONNECTION_OPCODE_MASK){
+    case PABB2_CONNECTION_OPCODE_INVALID:
+        str += "PABB2_CONNECTION_OPCODE_INVALID: seqnum = ";
+        str += std::to_string(header->seqnum);
+        return str;
+
+    case PABB2_CONNECTION_OPCODE_ASK_RESET:
+        str += "PABB2_CONNECTION_OPCODE_ASK_RESET: seqnum = ";
+        str += std::to_string(header->seqnum);
+        return str;
+    case PABB2_CONNECTION_OPCODE_RET_RESET:
+        str += "PABB2_CONNECTION_OPCODE_RET_RESET: seqnum = ";
+        str += std::to_string(header->seqnum);
+        return str;
+
+    case PABB2_CONNECTION_OPCODE_ASK_VERSION:
+        str += "PABB2_CONNECTION_OPCODE_ASK_VERSION: seqnum = ";
+        str += std::to_string(header->seqnum);
+        return str;
+    case PABB2_CONNECTION_OPCODE_RET_VERSION:
+        str += "PABB2_CONNECTION_OPCODE_RET_VERSION: seqnum = ";
+        str += std::to_string(header->seqnum);
+        str += ", version = " + std::to_string(((const PacketHeader_u32*)header)->data);
+        return str;
+
+    case PABB2_CONNECTION_OPCODE_ASK_PACKET_SIZE:
+        str += "PABB2_CONNECTION_OPCODE_ASK_PACKET_SIZE: seqnum = ";
+        str += std::to_string(header->seqnum);
+        return str;
+    case PABB2_CONNECTION_OPCODE_RET_PACKET_SIZE:
+        str += "PABB2_CONNECTION_OPCODE_RET_PACKET_SIZE: seqnum = ";
+        str += std::to_string(header->seqnum);
+        str += ", bytes = " + std::to_string(((const PacketHeader_u32*)header)->data);
+        return str;
+
+    case PABB2_CONNECTION_OPCODE_ASK_BUFFER_SLOTS:
+        str += "PABB2_CONNECTION_OPCODE_ASK_BUFFER_SLOTS: seqnum = ";
+        str += std::to_string(header->seqnum);
+        return str;
+    case PABB2_CONNECTION_OPCODE_RET_BUFFER_SLOTS:
+        str += "PABB2_CONNECTION_OPCODE_RET_BUFFER_SLOTS: seqnum = ";
+        str += std::to_string(header->seqnum);
+        str += ", slots = " + std::to_string(((const PacketHeader_u32*)header)->data);
+        return str;
+
+    case PABB2_CONNECTION_OPCODE_ASK_BUFFER_BYTES:
+        str += "PABB2_CONNECTION_OPCODE_ASK_BUFFER_BYTES: seqnum = ";
+        str += std::to_string(header->seqnum);
+        return str;
+    case PABB2_CONNECTION_OPCODE_RET_BUFFER_BYTES:
+        str += "PABB2_CONNECTION_OPCODE_RET_BUFFER_BYTES: seqnum = ";
+        str += std::to_string(header->seqnum);
+        str += ", bytes = " + std::to_string(((const PacketHeader_u32*)header)->data);
+        return str;
+
+    case PABB2_CONNECTION_OPCODE_ASK_STREAM_DATA:
+        str += "PABB2_CONNECTION_OPCODE_ASK_STREAM_DATA: seqnum = ";
+        str += std::to_string(header->seqnum);
+        str += ", offset = " + std::to_string(((const PacketHeaderData*)header)->stream_offset);
+        str += ", bytes = " + std::to_string(header->packet_bytes - sizeof(PacketHeaderData) - sizeof(uint32_t));
+        return str;
+    case PABB2_CONNECTION_OPCODE_RET_STREAM_DATA:
+        str += "PABB2_CONNECTION_OPCODE_RET_STREAM_REQUEST: seqnum = ";
+        str += std::to_string(header->seqnum);
+        return str;
+    case PABB2_CONNECTION_OPCODE_ASK_STREAM_REQUEST:
+        str += "PABB2_CONNECTION_OPCODE_RET_STREAM: seqnum = ";
+        str += std::to_string(header->seqnum);
+        str += ", offset = " + std::to_string(((const PacketHeaderData*)header)->stream_offset);
+        return str;
+
+    case PABB2_CONNECTION_OPCODE_INFO_STREAM_DEAD:
+        str += "PABB2_CONNECTION_OPCODE_INFO_STREAM_DEAD: seqnum = ";
+        str += std::to_string(header->seqnum);
+        str += ", offset = " + std::to_string(((const PacketHeaderData*)header)->stream_offset);
+        return str;
+    case PABB2_CONNECTION_OPCODE_INFO_STREAM_NOT_READY:
+        str += "PABB2_CONNECTION_OPCODE_INFO_STREAM_NOT_READY: seqnum = ";
+        str += std::to_string(header->seqnum);
+        return str;
+    case PABB2_CONNECTION_OPCODE_INFO_STREAM_SEND_FULL:
+        str += "PABB2_CONNECTION_OPCODE_INFO_STREAM_SEND_FULL: seqnum = ";
+        str += std::to_string(header->seqnum);
+        return str;
+    case PABB2_CONNECTION_OPCODE_INFO_STREAM_RECV_FULL:
+        str += "PABB2_CONNECTION_OPCODE_INFO_STREAM_RECV_FULL: seqnum = ";
+        str += std::to_string(header->seqnum);
+        return str;
+
+    case PABB2_CONNECTION_OPCODE_INFO:
+        str += "PABB2_CONNECTION_OPCODE_INFO: seqnum = ";
+        str += std::to_string(header->seqnum);
+        return str;
+    case PABB2_CONNECTION_OPCODE_INFO_H32:
+        str += "PABB2_CONNECTION_OPCODE_INFO_H32: seqnum = ";
+        str += std::to_string(header->seqnum);
+        str += ", data = " + tostr_hex(((const PacketHeader_u32*)header)->data);
+        return str;
+    case PABB2_CONNECTION_OPCODE_INFO_U32:
+        str += "PABB2_CONNECTION_OPCODE_INFO_U32: seqnum = ";
+        str += std::to_string(header->seqnum);
+        str += ", data = " + std::to_string(((const PacketHeader_u32*)header)->data);
+        return str;
+    case PABB2_CONNECTION_OPCODE_INFO_I32:
+        str += "PABB2_CONNECTION_OPCODE_INFO_I32: seqnum = ";
+        str += std::to_string(header->seqnum);
+        str += ", data = " + std::to_string((int32_t)((const PacketHeader_u32*)header)->data);
+        return str;
+    case PABB2_CONNECTION_OPCODE_INFO_BINARY:{
+        str += "LOG_BIN: ";
+        str += tostr_hexbytes(header + 1, header->packet_bytes - sizeof(PacketHeader) - sizeof(uint32_t));
+        return str;
+    }
+    case PABB2_CONNECTION_OPCODE_INFO_STR:
+        str += "LOG_STR: ";
+        str += std::string(
+            (const char*)(header + 1),
+            header->packet_bytes - sizeof(PacketHeader) - sizeof(uint32_t)
+        );
+        return str;
+    case PABB2_CONNECTION_OPCODE_INFO_LABEL_H32:{
+        const PacketHeader_u32* packet = (const PacketHeader_u32*)header;
+        str += "LOG_H32: ";
+        str += std::string(
+            (const char*)(packet + 1),
+            header->packet_bytes - sizeof(PacketHeader_u32) - sizeof(uint32_t)
+        );
+        str += ": 0x" + tostr_hex(packet->data);
+        return str;
+    }
+    case PABB2_CONNECTION_OPCODE_INFO_LABEL_U32:{
+        const PacketHeader_u32* packet = (const PacketHeader_u32*)header;
+        str += "LOG_U32: ";
+        str += std::string(
+            (const char*)(packet + 1),
+            header->packet_bytes - sizeof(PacketHeader_u32) - sizeof(uint32_t)
+        );
+        str += ": " + std::to_string(packet->data);
+        return str;
+    }
+    case PABB2_CONNECTION_OPCODE_INFO_LABEL_I32:{
+        const PacketHeader_u32* packet = (const PacketHeader_u32*)header;
+        str += "LOG_I32: ";
+        str += std::string(
+            (const char*)(packet + 1),
+            header->packet_bytes - sizeof(PacketHeader_u32) - sizeof(uint32_t)
+        );
+        str += ": " + std::to_string((int32_t)packet->data);
+        return str;
+    }
+
+    case PABB2_CONNECTION_OPCODE_INVALID_LENGTH:
+        str += "PABB2_CONNECTION_OPCODE_INVALID_LENGTH: seqnum = ";
+        str += std::to_string(header->seqnum);
+        return str;
+    case PABB2_CONNECTION_OPCODE_INVALID_CHECKSUM_FAIL:
+        str += "PABB2_CONNECTION_OPCODE_INVALID_CHECKSUM_FAIL: seqnum = ";
+        str += std::to_string(header->seqnum);
+        return str;
+    case PABB2_CONNECTION_OPCODE_UNKNOWN_OPCODE:
+        str += "PABB2_CONNECTION_OPCODE_UNKNOWN_OPCODE: seqnum = ";
+        str += std::to_string(header->seqnum);
+        return str;
+    }
+    return "Unknown Packet Opcode: 0x" + tostr_hex(header->opcode);
+}
+
+
+
+
+std::string MessagePrinter::tostr(const MessageHeader* message) const{
+    std::string ret ="(0x" + tostr_hex(message->opcode) + ") " + message_name + ": ";
+    if (message->message_bytes < min_length ||
+        message->message_bytes > max_length
+    ){
+        return ret + "**(invalid length = " + std::to_string(message->message_bytes) + ")**";
+    }
+    return ret + to_str(message);
+}
+
+
+
+MessageLogger::MessageLogger(){
+    add_message<MessageHeader>(
+        "PABB2_MESSAGE_OPCODE_INVALID",
+        PABB2_MESSAGE_OPCODE_INVALID,
+        true,
+        [](const MessageHeader* message){
+            std::string str;
+            str += "id = " + std::to_string(message->id);
+            return str;
+        }
+    );
+    add_message_min_length<MessageHeader>(
+        "LOG_STR",
+        PABB2_MESSAGE_OPCODE_LOG_STRING,
+        true,
+        [](const MessageHeader* message){
+            std::string str;
+            str += std::string(
+                (const char*)(message + 1),
+                message->message_bytes - sizeof(MessageHeader)
+            );
+            return str;
+        }
+    );
+    add_message_min_length<Message_u32>(
+        "LOG_H32",
+        PABB2_MESSAGE_OPCODE_LOG_LABEL_H32,
+        true,
+        [](const Message_u32* message){
+            std::string str;
+            str += std::string(
+                (const char*)(message + 1),
+                message->message_bytes - sizeof(Message_u32)
+            );
+            str += ": " + tostr_hex(message->data);
+            return str;
+        }
+    );
+    add_message_min_length<Message_u32>(
+        "LOG_U32",
+        PABB2_MESSAGE_OPCODE_LOG_LABEL_U32,
+        true,
+        [](const Message_u32* message){
+            std::string str;
+            str += std::string(
+                (const char*)(message + 1),
+                message->message_bytes - sizeof(Message_u32)
+            );
+            str += ": " + std::to_string(message->data);
+            return str;
+        }
+    );
+    add_message_min_length<Message_u32>(
+        "LOG_I32",
+        PABB2_MESSAGE_OPCODE_LOG_LABEL_I32,
+        true,
+        [](const Message_u32* message){
+            std::string str;
+            str += std::string(
+                (const char*)(message + 1),
+                message->message_bytes - sizeof(Message_u32)
+            );
+            str += ": " + std::to_string((int32_t)message->data);
+            return str;
+        }
+    );
+
+
+    add_message<MessageHeader>(
+        "PABB2_MESSAGE_OPCODE_RET",
+        PABB2_MESSAGE_OPCODE_RET,
+        false,
+        [](const MessageHeader* message){
+            std::string str;
+            str += "id = " + std::to_string(message->id);
+            return str;
+        }
+    );
+    add_message<MessageHeader>(
+        "PABB2_MESSAGE_OPCODE_REQUEST_DROPPED",
+        PABB2_MESSAGE_OPCODE_REQUEST_DROPPED,
+        true,
+        [](const MessageHeader* message){
+            std::string str;
+            str += "id = " + std::to_string(message->id);
+            return str;
+        }
+    );
+    add_message<Message_u32>(
+        "PABB2_MESSAGE_OPCODE_RET_U32",
+        PABB2_MESSAGE_OPCODE_RET_U32,
+        false,
+        [](const Message_u32* message){
+            std::string str;
+            str += "id = " + std::to_string(message->id);
+            str += ", data = " + std::to_string(message->data);
+            return str;
+        }
+    );
+    add_message_min_length<MessageHeader>(
+        "PABB2_MESSAGE_OPCODE_RET_DATA",
+        PABB2_MESSAGE_OPCODE_RET_DATA,
+        false,
+        [](const MessageHeader* header){
+            std::string str;
+            str += "id = " + std::to_string(header->id);
+            str += ", data = " + tostr_hexbytes(header + 1, header->message_bytes - sizeof(MessageHeader));
+            return str;
+        }
+    );
+    add_message_min_length<Message_u32>(
+        "PABB2_MESSAGE_OPCODE_RET_U32_DATA",
+        PABB2_MESSAGE_OPCODE_RET_U32_DATA,
+        false,
+        [](const Message_u32* header){
+            std::string str;
+            str += "id = " + std::to_string(header->id);
+            str += ", u32 = " + std::to_string(header->data);
+            str += ", data = " + tostr_hexbytes(header + 1, header->message_bytes - sizeof(Message_u32));
+            return str;
+        }
+    );
+
+
+    add_message<MessageHeader>(
+        "PABB2_MESSAGE_OPCODE_PROTOCOL_VERSION",
+        PABB2_MESSAGE_OPCODE_PROTOCOL_VERSION,
+        true,
+        [](const MessageHeader* header){
+            std::string str;
+            str += "id = " + std::to_string(header->id);
+            return str;
+        }
+    );
+    add_message<MessageHeader>(
+        "PABB2_MESSAGE_OPCODE_FIRMWARE_VERSION",
+        PABB2_MESSAGE_OPCODE_FIRMWARE_VERSION,
+        true,
+        [](const MessageHeader* header){
+            std::string str;
+            str += "id = " + std::to_string(header->id);
+            return str;
+        }
+    );
+    add_message<MessageHeader>(
+        "PABB2_MESSAGE_OPCODE_DEVICE_IDENTIFIER",
+        PABB2_MESSAGE_OPCODE_DEVICE_IDENTIFIER,
+        true,
+        [](const MessageHeader* header){
+            std::string str;
+            str += "id = " + std::to_string(header->id);
+            return str;
+        }
+    );
+    add_message<MessageHeader>(
+        "PABB2_MESSAGE_OPCODE_DEVICE_NAME",
+        PABB2_MESSAGE_OPCODE_DEVICE_NAME,
+        true,
+        [](const MessageHeader* header){
+            std::string str;
+            str += "id = " + std::to_string(header->id);
+            return str;
+        }
+    );
+    add_message<MessageHeader>(
+        "PABB2_MESSAGE_OPCODE_CONTROLLER_LIST",
+        PABB2_MESSAGE_OPCODE_CONTROLLER_LIST,
+        true,
+        [](const MessageHeader* header){
+            std::string str;
+            str += "id = " + std::to_string(header->id);
+            return str;
+        }
+    );
+    add_message<Message_u32>(
+        "PABB2_MESSAGE_OPCODE_SET_LOGGING_FLAG",
+        PABB2_MESSAGE_OPCODE_SET_LOGGING_FLAG,
+        true,
+        [](const Message_u32* message){
+            std::string str;
+            str += "id = " + std::to_string(message->id);
+            str += ", flag = " + tostr_hex(message->data);
+            return str;
+        }
+    );
+    add_message<MessageHeader>(
+        "PABB2_MESSAGE_OPCODE_CQ_CAPACITY",
+        PABB2_MESSAGE_OPCODE_CQ_CAPACITY,
+        true,
+        [](const MessageHeader* header){
+            std::string str;
+            str += "id = " + std::to_string(header->id);
+            return str;
+        }
+    );
+
+
+    add_message<MessageHeader>(
+        "PABB2_MESSAGE_OPCODE_REQUEST_SESSION_NUM",
+        PABB2_MESSAGE_OPCODE_REQUEST_SESSION_NUM,
+        true,
+        [](const MessageHeader* header){
+            std::string str;
+            str += "id = " + std::to_string(header->id);
+            return str;
+        }
+    );
+    add_message<MessageHeader>(
+        "PABB2_MESSAGE_OPCODE_REQUEST_STATUS",
+        PABB2_MESSAGE_OPCODE_REQUEST_STATUS,
+        false,
+        [](const MessageHeader* header){
+            std::string str;
+            str += "id = " + std::to_string(header->id);
+            return str;
+        }
+    );
+    add_message<MessageHeader>(
+        "PABB2_MESSAGE_OPCODE_READ_CONTROLLER_MODE",
+        PABB2_MESSAGE_OPCODE_READ_CONTROLLER_MODE,
+        true,
+        [](const MessageHeader* header){
+            std::string str;
+            str += "id = " + std::to_string(header->id);
+            return str;
+        }
+    );
+    add_message<Message_u32>(
+        "PABB2_MESSAGE_OPCODE_CHANGE_CONTROLLER_MODE",
+        PABB2_MESSAGE_OPCODE_CHANGE_CONTROLLER_MODE,
+        true,
+        [](const Message_u32* message){
+            std::string str;
+            str += "id = " + std::to_string(message->id);
+            str += ", controller = " + tostr_hex(message->data);
+            return str;
+        }
+    );
+    add_message<Message_u32>(
+        "PABB2_MESSAGE_OPCODE_RESET_TO_CONTROLLER",
+        PABB2_MESSAGE_OPCODE_RESET_TO_CONTROLLER,
+        true,
+        [](const Message_u32* message){
+            std::string str;
+            str += "id = " + std::to_string(message->id);
+            str += ", controller = " + tostr_hex(message->data);
+            return str;
+        }
+    );
+    add_message<Message_u32>(
+        "PABB2_MESSAGE_OPCODE_CONTROLLER_MAC_ADDRESS",
+        PABB2_MESSAGE_OPCODE_CONTROLLER_MAC_ADDRESS,
+        true,
+        [](const Message_u32* message){
+            std::string str;
+            str += "id = " + std::to_string(message->id);
+            str += ", controller = " + tostr_hex(message->data);
+            return str;
+        }
+    );
+    add_message<Message_u32>(
+        "PABB2_MESSAGE_OPCODE_PAIRED_MAC_ADDRESS",
+        PABB2_MESSAGE_OPCODE_PAIRED_MAC_ADDRESS,
+        false,
+        [](const Message_u32* message){
+            std::string str;
+            str += "id = " + std::to_string(message->id);
+            str += ", controller = " + tostr_hex(message->data);
+            return str;
+        }
+    );
+    add_message<Message_u32>(
+        "PABB2_MESSAGE_OPCODE_CONSOLE_DISCONNECT",
+        PABB2_MESSAGE_OPCODE_CONSOLE_DISCONNECT,
+        true,
+        [](const Message_u32* message){
+            std::string str;
+            str += "id = " + std::to_string(message->id);
+            str += ", reason = " + tostr_hex(message->data);
+            return str;
+        }
+    );
+
+    add_message<MessageHeader>(
+        "PABB2_MESSAGE_OPCODE_CQ_COMMAND_DROPPED",
+        PABB2_MESSAGE_OPCODE_CQ_COMMAND_DROPPED,
+        true,
+        [](const MessageHeader* header){
+            std::string str;
+            str += "id = " + std::to_string(header->id);
+            return str;
+        }
+    );
+    add_message<MessageHeader>(
+        "PABB2_MESSAGE_OPCODE_CQ_CANCEL",
+        PABB2_MESSAGE_OPCODE_CQ_CANCEL,
+        false,
+        [](const MessageHeader* header){
+            return std::string();
+        }
+    );
+    add_message<MessageHeader>(
+        "PABB2_MESSAGE_OPCODE_CQ_REPLACE_ON_NEXT",
+        PABB2_MESSAGE_OPCODE_CQ_REPLACE_ON_NEXT,
+        false,
+        [](const MessageHeader* header){
+            return std::string();
+        }
+    );
+    add_message<Message_u32>(
+        "PABB2_MESSAGE_OPCODE_CQ_COMMAND_FINISHED",
+        PABB2_MESSAGE_OPCODE_CQ_COMMAND_FINISHED,
+        false,
+        [](const Message_u32* message){
+            std::string str;
+            str += "id = " + std::to_string(message->id);
+            str += ", timestamp = " + std::to_string(message->data);
+            return str;
+        }
+    );
+}
+
+
+
+void MessageLogger::add_message(
+    const char* message_name,
+    uint8_t opcode,
+    uint16_t min_length,
+    uint16_t max_length,
+    std::function<bool(const MessageHeader*)> should_log,
+    std::function<std::string(const MessageHeader*)> to_str
+){
+    std::lock_guard<Mutex> lg(m_lock);
+    auto ret = m_converters.emplace(
+        opcode,
+        MessagePrinter{
+            message_name,
+            min_length,
+            max_length,
+            std::move(should_log),
+            std::move(to_str)
+        }
+    );
+    if (ret.second){
+        return;
+    }
+#if 0
+    throw InternalProgramError(
+        nullptr,
+        PA_CURRENT_FUNCTION,
+        "Duplicate opcode: " + std::to_string(opcode)
+    );
+#endif
+}
+
+
+
+
+std::string MessageLogger::to_str(const MessageHeader* message) const{
+    std::lock_guard<Mutex> lg(m_lock);
+    uint8_t opcode = message->opcode;
+    auto iter = m_converters.find(opcode);
+    if (iter == m_converters.end()){
+        return "(0x" + tostr_hex(opcode) + "): Unknown Opcode";
+    }
+    return std::string(iter->second.message_name) + ": " + iter->second.to_str(message);
+}
+void MessageLogger::log_send(
+    Logger& logger,
+    bool always_log,
+    const MessageHeader* message,
+    Color color
+) const noexcept{
+    std::lock_guard<Mutex> lg(m_lock);
+    try{
+        auto iter = m_converters.find(message->opcode);
+        if (iter == m_converters.end()){
+            logger.log(
+                "[MLC]: Sending: (0x" + tostr_hex(message->opcode) + "): Unknown Opcode",
+                COLOR_RED
+            );
+            return;
+        }
+        if (always_log || iter->second.should_log(message)){
+            logger.log(
+                "[MLC]: Sending: " + iter->second.tostr(message),
+                color
+            );
+        }
+    }catch (...){}
+}
+void MessageLogger::log_recv(
+    Logger& logger,
+    bool always_log,
+    const MessageHeader* message,
+    Color color
+) const noexcept{
+    std::lock_guard<Mutex> lg(m_lock);
+    try{
+        auto iter = m_converters.find(message->opcode);
+        if (iter == m_converters.end()){
+            logger.log(
+                "[MLC]: Receive: (0x" + tostr_hex(message->opcode) + ") Unknown Opcode",
+                COLOR_RED
+            );
+            return;
+        }
+        if (always_log || iter->second.should_log(message)){
+            logger.log(
+                "[MLC]: Receive: " + iter->second.tostr(message),
+                color
+            );
+        }
+    }catch (...){}
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}
+}
diff --git a/Common/PABotBase2/PABotBase2CC_MessageDumper.h b/Common/PABotBase2/PABotBase2CC_MessageDumper.h
new file mode 100644
index 0000000000..e92946b08a
--- /dev/null
+++ b/Common/PABotBase2/PABotBase2CC_MessageDumper.h
@@ -0,0 +1,143 @@
+/*  PABotBase2 Message Dumper
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PABotBase2_MessageDumper_H
+#define PokemonAutomation_PABotBase2_MessageDumper_H
+
+#include <string>
+#include <map>
+#include <functional>
+#include "Common/Cpp/Logging/AbstractLogger.h"
+#include "Common/Cpp/Concurrency/Mutex.h"
+#include "ReliableConnectionLayer/PABotBase2_PacketProtocol.h"
+#include "PABotBase2_MessageProtocol.h"
+
+namespace PokemonAutomation{
+namespace PABotBase2{
+
+
+std::string tostr(const PacketHeader* header);
+
+
+
+struct MessagePrinter{
+    const char* message_name;
+    uint16_t min_length;
+    uint16_t max_length;
+    std::function<bool(const MessageHeader*)> should_log;
+    std::function<std::string(const MessageHeader*)> to_str;
+
+    std::string tostr(const MessageHeader* message) const;
+};
+
+
+class MessageLogger{
+public:
+    MessageLogger();
+
+    void add_message(
+        const char* message_name,
+        uint8_t opcode,
+        uint16_t min_length,
+        uint16_t max_length,
+        std::function<bool(const MessageHeader*)> should_log,
+        std::function<std::string(const MessageHeader*)> to_str
+    );
+    template <typename MessageType>
+    void add_message(
+        const char* message_name,
+        uint8_t opcode,
+        bool always_print,
+        std::string(*tostr)(const MessageType*)
+    ){
+        add_message(
+            message_name, opcode,
+            sizeof(MessageType), sizeof(MessageType),
+            [=](const MessageHeader*){ return always_print; },
+            [=](const MessageHeader* header){
+                return tostr((const MessageType*)header);
+            }
+        );
+    }
+    template <typename MessageType>
+    void add_message(
+        const char* message_name,
+        uint8_t opcode,
+        bool(*should_print)(const MessageType*),
+        std::string(*tostr)(const MessageType*)
+    ){
+        add_message(
+            message_name, opcode,
+            sizeof(MessageType), sizeof(MessageType),
+            [=](const MessageHeader* header){
+                return should_print((const MessageType*)header);
+            },
+            [=](const MessageHeader* header){
+                return tostr((const MessageType*)header);
+            }
+        );
+    }
+    template <typename MessageType>
+    void add_message_min_length(
+        const char* message_name,
+        uint8_t opcode,
+        bool always_print,
+        std::string(*tostr)(const MessageType*)
+    ){
+        add_message(
+            message_name, opcode,
+            sizeof(MessageType), (uint16_t)-1,
+            [=](const MessageHeader*){ return always_print; },
+            [=](const MessageHeader* header){
+                return tostr((const MessageType*)header);
+            }
+        );
+    }
+    template <typename MessageType>
+    void add_message_min_length(
+        const char* message_name,
+        uint8_t opcode,
+        bool(*should_print)(const MessageType*),
+        std::string(*tostr)(const MessageType*)
+    ){
+        add_message(
+            message_name, opcode,
+            sizeof(MessageType), (uint16_t)-1,
+            [=](const MessageHeader* header){
+                return should_print((const MessageType*)header);
+            },
+            [=](const MessageHeader* header){
+                return tostr((const MessageType*)header);
+            }
+        );
+    }
+
+    std::string to_str(const MessageHeader* message) const;
+    void log_send(
+        Logger& logger,
+        bool always_log,
+        const MessageHeader* message,
+        Color color = COLOR_DARKGREEN
+    ) const noexcept;
+    void log_recv(
+        Logger& logger,
+        bool always_log,
+        const MessageHeader* message,
+        Color color = COLOR_PURPLE
+    ) const noexcept;
+
+
+private:
+    mutable Mutex m_lock;
+    std::map<uint8_t, MessagePrinter> m_converters;
+};
+
+
+
+
+}
+}
+#endif
diff --git a/Common/PABotBase2/PABotBase2_MessageProtocol.h b/Common/PABotBase2/PABotBase2_MessageProtocol.h
new file mode 100644
index 0000000000..53ca6d7747
--- /dev/null
+++ b/Common/PABotBase2/PABotBase2_MessageProtocol.h
@@ -0,0 +1,82 @@
+/*  PABotBase2 Message Protocol
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PABotBase2_MessageProtocol_H
+#define PokemonAutomation_PABotBase2_MessageProtocol_H
+
+#include <stdint.h>
+
+#if _WIN32
+#pragma pack(push, 1)
+#define PABB_PACK
+#elif __GNUC__
+#define PABB_PACK   __attribute__((packed))
+#else
+#define PABB_PACK
+#endif
+
+namespace PokemonAutomation{
+namespace PABotBase2{
+
+
+
+#define PABB2_MESSAGE_PROTOCOL_VERSION      2026061804
+
+
+struct PABB_PACK MessageHeader{
+    uint16_t message_bytes;
+    uint8_t opcode;
+    uint8_t id;
+};
+struct PABB_PACK Message_u32 : MessageHeader{
+    uint32_t data;
+};
+
+#define PABB2_MESSAGE_OPCODE_INVALID                0x00
+#define PABB2_MESSAGE_OPCODE_LOG_STRING             0x01
+#define PABB2_MESSAGE_OPCODE_LOG_LABEL_H32          0x02
+#define PABB2_MESSAGE_OPCODE_LOG_LABEL_U32          0x03
+#define PABB2_MESSAGE_OPCODE_LOG_LABEL_I32          0x04
+
+#define PABB2_MESSAGE_OPCODE_REQUEST_DROPPED        0x10
+#define PABB2_MESSAGE_OPCODE_RET                    0x11
+#define PABB2_MESSAGE_OPCODE_RET_U32                0x12
+#define PABB2_MESSAGE_OPCODE_RET_DATA               0x13
+#define PABB2_MESSAGE_OPCODE_RET_U32_DATA           0x14
+
+#define PABB2_MESSAGE_OPCODE_PROTOCOL_VERSION       0x20
+#define PABB2_MESSAGE_OPCODE_FIRMWARE_VERSION       0x21
+#define PABB2_MESSAGE_OPCODE_DEVICE_IDENTIFIER      0x22
+#define PABB2_MESSAGE_OPCODE_DEVICE_NAME            0x23
+#define PABB2_MESSAGE_OPCODE_CONTROLLER_LIST        0x24
+#define PABB2_MESSAGE_OPCODE_SET_LOGGING_FLAG       0x25
+#define PABB2_MESSAGE_OPCODE_CQ_CAPACITY            0x26
+
+#define PABB2_MESSAGE_OPCODE_REQUEST_SESSION_NUM    0x30
+#define PABB2_MESSAGE_OPCODE_REQUEST_STATUS         0x31
+#define PABB2_MESSAGE_OPCODE_READ_CONTROLLER_MODE   0x32
+#define PABB2_MESSAGE_OPCODE_CHANGE_CONTROLLER_MODE 0x33
+#define PABB2_MESSAGE_OPCODE_RESET_TO_CONTROLLER    0x34
+#define PABB2_MESSAGE_OPCODE_CONTROLLER_MAC_ADDRESS 0x35
+#define PABB2_MESSAGE_OPCODE_PAIRED_MAC_ADDRESS     0x36
+#define PABB2_MESSAGE_OPCODE_CONSOLE_DISCONNECT     0x37
+
+#define PABB2_MESSAGE_OPCODE_CQ_COMMAND_DROPPED     0x40
+#define PABB2_MESSAGE_OPCODE_CQ_CANCEL              0x41
+#define PABB2_MESSAGE_OPCODE_CQ_REPLACE_ON_NEXT     0x42
+#define PABB2_MESSAGE_OPCODE_CQ_COMMAND_FINISHED    0x43
+
+
+}
+}
+
+
+#if _WIN32
+#pragma pack(pop)
+#endif
+
+
+#endif
diff --git a/Common/PABotBase2/ReliableConnectionLayer/PABotBase2CC_ReliableStreamConnection.cpp b/Common/PABotBase2/ReliableConnectionLayer/PABotBase2CC_ReliableStreamConnection.cpp
new file mode 100644
index 0000000000..7535edc001
--- /dev/null
+++ b/Common/PABotBase2/ReliableConnectionLayer/PABotBase2CC_ReliableStreamConnection.cpp
@@ -0,0 +1,600 @@
+/*  Reliable Stream Connection (CC)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/PrettyPrint.h"
+#include "Common/CRC32/pabb_CRC32.h"
+//#include "Common/Cpp/Exceptions.h"
+#include "Common/PABotBase2/PABotBase2CC_MessageDumper.h"
+#include "CommonTools/Random.h"
+//#include "PABotBase2_ConnectionDebug.h"
+#include "PABotBase2CC_ReliableStreamConnection.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace PABotBase2{
+
+
+
+ReliableStreamConnection::ReliableStreamConnection(
+    CancellableScope* parent,
+    Logger& logger, bool log_everything,
+    ThreadPool& thread_pool,
+    UnreliableStreamConnectionPushing& unreliable_connection,
+    WallDuration retransmit_timeout,
+    Mutex* print_lock
+)
+    : m_logger(logger)
+    , m_unreliable_connection(unreliable_connection)
+    , m_retransmit_timeout(retransmit_timeout)
+    , m_print_lock(print_lock)
+    , m_reliable_sender(*this, 24, random_u32())
+    , m_log_everything(log_everything)
+//    , m_version_verified(false)
+    , m_remote_protocol_compatible(false)
+    , m_remote_protocol(0)
+    , m_max_unacked_packets(1)
+    , m_max_unacked_bytes(PABB2_PacketSender_BUFFER_SIZE)
+{
+    m_retransmit_thread = thread_pool.dispatch_now_blocking(
+        [this]{ retransmit_thread(); }
+    );
+
+    try{
+        m_unreliable_connection.add_listener(*this);
+        if (parent){
+            attach(*parent);
+        }
+    }catch (...){
+        stop();
+        throw;
+    }
+}
+
+ReliableStreamConnection::~ReliableStreamConnection(){
+    stop();
+}
+void ReliableStreamConnection::stop() noexcept{
+    if (cancel(nullptr)){
+        return;
+    }
+    detach();
+    m_unreliable_connection.remove_listener(*this);
+    m_retransmit_thread.wait_and_ignore_exceptions();
+}
+
+bool ReliableStreamConnection::cancel(std::exception_ptr exception) noexcept{
+    if (Cancellable::cancel(std::move(exception))){
+        return true;
+    }
+    {
+        std::lock_guard<Mutex> lg(m_lock);
+        m_error = "Connection has been closed.";
+    }
+    m_cv.notify_all();
+    return false;
+}
+size_t ReliableStreamConnection::pending() const{
+    std::unique_lock<Mutex> lg(m_lock);
+    return m_reliable_sender.slots_used();
+}
+bool ReliableStreamConnection::wait_for_pending(WallDuration timeout){
+    std::unique_lock<Mutex> lg(m_lock);
+    if (timeout == WallDuration::max()){
+        m_cv.wait(lg, [this]{
+            return this->cancelled() || m_reliable_sender.slots_used() == 0;
+        });
+    }else{
+        m_cv.wait_for(lg, timeout, [this]{
+            return this->cancelled() || m_reliable_sender.slots_used() == 0;
+        });
+    }
+    throw_if_cancelled();
+    return m_reliable_sender.slots_used() == 0;
+}
+
+
+
+//
+//  StreamSender/StreamListener
+//
+
+void ReliableStreamConnection::reliable_send_all_or_nothing(
+    Cancellable* cancellable,
+    const void* data, size_t bytes
+){
+    const char* ptr = (const char*)data;
+    std::unique_lock<Mutex> lg(m_lock);
+    while (true){
+        throw_if_cancelled();
+        if (cancellable){
+            cancellable->throw_if_cancelled();
+        }
+        if (m_reliable_sender.slots_used() >= m_max_unacked_packets){
+            m_cv.wait(lg);
+            continue;
+        }
+        if (m_reliable_sender.send_stream_all_or_nothing(ptr, bytes)){
+            return;
+        }
+        m_cv.wait(lg);
+    }
+}
+bool ReliableStreamConnection::reliable_send_all_or_nothing(
+    Cancellable* cancellable,
+    const void* data, size_t bytes,
+    WallClock deadline
+){
+    const char* ptr = (const char*)data;
+    std::unique_lock<Mutex> lg(m_lock);
+    do{
+        throw_if_cancelled();
+        if (cancellable){
+            cancellable->throw_if_cancelled();
+        }
+        if (m_reliable_sender.slots_used() >= m_max_unacked_packets){
+            m_cv.wait_until(lg, deadline);
+            continue;
+        }
+        if (m_reliable_sender.send_stream_all_or_nothing(ptr, bytes)){
+            return true;
+        }
+        m_cv.wait_until(lg, deadline);
+    }while (current_time() < deadline);
+    return false;
+}
+void ReliableStreamConnection::on_recv(const void* data, size_t bytes){
+#if 0
+    if (m_print_lock){
+        std::lock_guard<Mutex> lg(*m_print_lock);
+        cout << "ReliableStreamConnection::on_recv(): " << bytes << endl;
+    }
+#endif
+    m_parser.push_bytes(
+        *this,
+        m_reliable_sender.session_id(),
+        (const uint8_t*)data, bytes
+    );
+}
+
+
+
+//
+//  PABotBase2::StreamConnection
+//
+
+size_t ReliableStreamConnection::unreliable_send(const void* data, size_t bytes) noexcept{
+    const PacketHeader* header = (const PacketHeader*)data;
+    uint8_t opcode = header->opcode & PABB2_CONNECTION_OPCODE_MASK;
+    bool retransmit = header->opcode & PABB2_CONNECTION_RETRANSMIT_FLAG;
+
+    bool always_log =
+        opcode != PABB2_CONNECTION_OPCODE_ASK_STREAM_DATA &&
+        opcode != PABB2_CONNECTION_OPCODE_RET_STREAM_DATA;
+
+    try{
+        if (retransmit){
+            m_logger.log(
+                "[RSC]: Re-send: (0x" + tostr_hex(header->opcode) + ") " + tostr(header),
+                COLOR_ORANGE
+            );
+        }else if (m_log_everything || always_log){
+            m_logger.log(
+                "[RSC]: Sending: (0x" + tostr_hex(header->opcode) + ") " + tostr(header),
+                COLOR_DARKGREEN
+            );
+//            PABotBase2::PacketHeader_print(header, true);
+        }
+    }catch (...){}
+//    cout << "ReliableStreamConnection::unreliable_send() - before send" << endl;
+    return m_unreliable_connection.unreliable_send(data, bytes);
+}
+
+void ReliableStreamConnection::on_cancellable_cancel(
+    Cancellable& cancellable,
+    std::exception_ptr reason
+){
+    std::lock_guard<Mutex> lg(m_lock);
+    m_cv.notify_all();
+}
+
+
+
+//
+//  Send Path
+//
+
+bool ReliableStreamConnection::reset(WallDuration timeout){
+    {
+        std::lock_guard<Mutex> lg(m_lock);
+        if (m_reliable_sender.session_id() == 0xffffffff){
+            m_reliable_sender.reset(random_u32());
+        }else{
+            m_reliable_sender.reset(m_reliable_sender.session_id() + 1);
+        }
+        m_logger.log("Session ID: 0x" + tostr_hex(m_reliable_sender.session_id()));
+        m_parser.reset();
+        m_stream_coalescer.reset();
+        throw_if_cancelled();
+        m_reliable_sender.send_reset();
+    }
+    m_cv.notify_all();
+    return wait_for_pending(timeout);
+}
+
+bool ReliableStreamConnection::try_send_request(uint8_t opcode){
+    std::lock_guard<Mutex> lg(m_lock);
+//    cout << "Sending: " << tostr_hex(opcode) << endl;
+    throw_if_cancelled();
+    if (m_reliable_sender.slots_used() >= m_max_unacked_packets){
+        return 0;
+    }
+    return m_reliable_sender.send_packet(opcode, 0, nullptr);
+}
+void ReliableStreamConnection::send_request(uint8_t opcode){
+    std::unique_lock<Mutex> lg(m_lock);
+    while (true){
+        throw_if_cancelled();
+        if (m_reliable_sender.slots_used() < m_max_unacked_packets &&
+            m_reliable_sender.send_packet(opcode, 0, nullptr)
+        ){
+            return;
+        }
+        m_cv.wait(lg);
+    }
+}
+
+void ReliableStreamConnection::print() const{
+    std::unique_lock<Mutex> lg(m_lock);
+    m_reliable_sender.print(true);
+//    StreamCoalescer_print(&m_stream_coalescer, true);
+}
+
+
+void ReliableStreamConnection::send_ack(uint8_t seqnum, uint8_t opcode){
+    //  Must call inside lock.
+    struct{
+        PacketHeader header;
+        uint8_t crc[sizeof(uint32_t)];
+    } packet;
+    packet.header.magic_number = PABB2_CONNECTION_MAGIC_NUMBER;
+    packet.header.seqnum = seqnum;
+    packet.header.packet_bytes = sizeof(packet);
+    packet.header.opcode = opcode;
+    pabb_crc32c_write_to_message(m_reliable_sender.session_id(), &packet, sizeof(packet));
+    unreliable_send(&packet, sizeof(packet));
+}
+void ReliableStreamConnection::send_ack_u32(uint8_t seqnum, uint8_t opcode, uint32_t data){
+    //  Must call inside lock.
+    struct{
+        PacketHeader_u32 header;
+        uint8_t crc[sizeof(uint32_t)];
+    } packet;
+    packet.header.magic_number = PABB2_CONNECTION_MAGIC_NUMBER;
+    packet.header.seqnum = seqnum;
+    packet.header.packet_bytes = sizeof(packet);
+    packet.header.opcode = opcode;
+    packet.header.data = data;
+    pabb_crc32c_write_to_message(m_reliable_sender.session_id(), &packet, sizeof(packet));
+    unreliable_send(&packet, sizeof(packet));
+}
+
+void ReliableStreamConnection::retransmit_thread(){
+    WallClock next_retransmit = current_time() + m_retransmit_timeout;
+    std::unique_lock<Mutex> lg(m_lock);
+    while (true){
+        if (this->cancelled()){
+            break;
+        }
+
+        if (m_reliable_sender.slots_used() == 0){
+            m_cv.wait(lg);
+        }else{
+            m_cv.wait_until(lg, next_retransmit);
+        }
+
+        if (this->cancelled()){
+            break;
+        }
+        if (current_time() < next_retransmit){
+            continue;
+        }
+
+//        cout << "running retransmits" << endl;
+
+#if 1
+        if (!m_reliable_sender.iterate_retransmits()){
+//            cout << "nothing to do" << endl;
+            next_retransmit = current_time() + m_retransmit_timeout;
+        }else{
+//            cout << "did something" << endl;
+        }
+#else
+        next_retransmit = current_time() + m_retransmit_timeout;
+#endif
+    }
+}
+
+
+
+//
+//  PABotBase2::PacketRunner
+//
+
+void ReliableStreamConnection::on_packet(const PacketHeader* packet){
+    uint8_t status = packet->magic_number;
+
+//    {
+//        std::lock_guard<std::mutex> lg(PokemonAutomation::print_lock);
+//        cout << "on_packet(): seqnum = [" << (int)packet->seqnum << "], opcode = " << (int)packet->opcode << endl;
+//    }
+
+//    cout << "on_packet(): ";
+//    PABotBase2::print_bytes(packet, packet->packet_bytes, false);
+//    cout << endl;
+
+    //
+    //  Process the packet status.
+    //
+
+    switch (status){
+    case PABB2_PacketParser_RESULT_VALID:
+        break;
+    case PABB2_PacketParser_RESULT_INVALID:
+        m_logger.log(
+            "[RSC]: INVALID PACKET: Received invalid packet from device.",
+            COLOR_RED
+        );
+        return;
+    case PABB2_PacketParser_RESULT_CHECKSUM_FAIL:
+        m_logger.log(
+            "[RSC]: CHECKSUM MISMATCH: Received bad data from device: bytes = " + std::to_string(packet->packet_bytes),
+//            "[RSC]: CHECKSUM MISMATCH: Received bad data from device: bytes = " + tostr(packet),
+            COLOR_RED
+        );
+        return;
+    default:
+        m_logger.log(
+            "[RSC]: Internal Error: Packet parser returned invalid code: " + std::to_string(status),
+            COLOR_RED
+        );
+        return;
+    }
+
+
+
+    //
+    //  Process the packet itself.
+    //
+
+    if (m_log_everything){
+        m_logger.log("[RSC]: Receive: (0x" + tostr_hex(packet->opcode) + ") " + tostr(packet), COLOR_PURPLE);
+    }
+
+    uint8_t opcode = packet->opcode & PABB2_CONNECTION_OPCODE_MASK;
+    switch (opcode){
+    case PABB2_CONNECTION_OPCODE_INVALID_LENGTH:
+        m_logger.log(
+            "[RSC]: PABB2_CONNECTION_OPCODE_INVALID_LENGTH: Device reported an invalid message length.",
+            COLOR_RED
+        );
+        return;
+    case PABB2_CONNECTION_OPCODE_INVALID_CHECKSUM_FAIL:
+        m_logger.log(
+            "[RSC]: PABB2_CONNECTION_OPCODE_INVALID_CHECKSUM_FAIL: Device reported a checksum mismatch.",
+            COLOR_RED
+        );
+        return;
+    case PABB2_CONNECTION_OPCODE_UNKNOWN_OPCODE:
+        process_UNKNOWN_OPCODE(packet);
+        return;
+    case PABB2_CONNECTION_OPCODE_ASK_STREAM_DATA:
+        process_ASK_STREAM_DATA(packet);
+        return;
+    case PABB2_CONNECTION_OPCODE_RET_STREAM_DATA:
+        process_RET_STREAM_DATA(packet);
+        return;
+    case PABB2_CONNECTION_OPCODE_RET_RESET:
+        process_RET_RESET(packet);
+        return;
+    case PABB2_CONNECTION_OPCODE_RET_VERSION:
+        process_RET_VERSION(packet);
+        return;
+    case PABB2_CONNECTION_OPCODE_RET_PACKET_SIZE:
+        process_RET_PACKET_SIZE(packet);
+        return;
+    case PABB2_CONNECTION_OPCODE_RET_BUFFER_SLOTS:
+        process_RET_BUFFER_SLOTS(packet);
+        return;
+    case PABB2_CONNECTION_OPCODE_INFO_STREAM_DEAD:
+    case PABB2_CONNECTION_OPCODE_INFO_STREAM_NOT_READY:
+    case PABB2_CONNECTION_OPCODE_INFO_STREAM_SEND_FULL:
+    case PABB2_CONNECTION_OPCODE_INFO_STREAM_RECV_FULL:
+    case PABB2_CONNECTION_OPCODE_INFO:
+    case PABB2_CONNECTION_OPCODE_INFO_H32:
+    case PABB2_CONNECTION_OPCODE_INFO_U32:
+    case PABB2_CONNECTION_OPCODE_INFO_I32:
+    case PABB2_CONNECTION_OPCODE_INFO_BINARY:
+    case PABB2_CONNECTION_OPCODE_INFO_STR:
+    case PABB2_CONNECTION_OPCODE_INFO_LABEL_H32:
+    case PABB2_CONNECTION_OPCODE_INFO_LABEL_U32:
+    case PABB2_CONNECTION_OPCODE_INFO_LABEL_I32:
+//    case PABB2_CONNECTION_OPCODE_WRONG_SESSION:
+//        cout << "Received ack" << endl;
+        if (!m_log_everything){
+            m_logger.log("[RSC]: Receive: (0x" + tostr_hex(packet->opcode) + ") " + tostr(packet), COLOR_PURPLE);
+        }
+        return;
+    default:
+        m_logger.log(
+            "[RSC]: UNKNOWN OPCODE: Device sent an unknown opcode: 0x" + tostr_hex(packet->opcode),
+            COLOR_RED
+        );
+        return;
+    }
+}
+void ReliableStreamConnection::process_UNKNOWN_OPCODE(const PacketHeader* packet){
+    std::lock_guard<Mutex> lg(m_lock);
+    if (packet->packet_bytes < sizeof(PacketHeader_u32) + sizeof(uint32_t)){
+        m_error = "Unknown opcode packet is too small: " + std::to_string(packet->packet_bytes);
+        m_logger.log("[RSC]: " + m_error, COLOR_RED);
+        return;
+    }
+
+    const PacketHeader_u32* message = (const PacketHeader_u32*)packet;
+    m_logger.log(
+        "[RSC]: PABB2_CONNECTION_OPCODE_INVALID_OPCODE: Device reported an invalid opcode: " +
+        std::to_string(message->data),
+        COLOR_RED
+    );
+}
+void ReliableStreamConnection::process_RET_RESET(const PacketHeader* packet){
+    {
+        std::lock_guard<Mutex> lg(m_lock);
+        m_reliable_sender.remove(packet->seqnum);
+    }
+    m_cv.notify_all();
+}
+void ReliableStreamConnection::process_RET_VERSION(const PacketHeader* packet){
+//    m_logger.log(tostr(packet), COLOR_DARKGREEN);
+    do{
+        std::lock_guard<Mutex> lg(m_lock);
+        if (packet->packet_bytes < sizeof(PacketHeader_u32) + sizeof(uint32_t)){
+            m_error = "Version response is too small: " + std::to_string(packet->packet_bytes);
+            m_logger.log("[RSC]: " + m_error, COLOR_RED);
+            break;
+        }
+        m_reliable_sender.remove(packet->seqnum);
+
+        const PacketHeader_u32* message = (const PacketHeader_u32*)packet;
+        uint32_t protocol = message->data;
+        m_remote_protocol = protocol;
+        std::string str = "Remote Protocol: " + std::to_string(protocol);
+        uint32_t major_version = protocol / 100;
+        uint32_t minor_version = protocol % 100;
+        m_remote_protocol_compatible =
+            major_version == PABB2_CONNECTION_PROTOCOL_VERSION / 100 &&
+            minor_version >= PABB2_CONNECTION_PROTOCOL_VERSION % 100;
+        if (!m_remote_protocol_compatible){
+            m_error = str + " (incompatible)";
+            m_logger.log("[RSC]: " + m_error, COLOR_RED);
+            break;
+        }
+
+        m_logger.log("[RSC]: " + str + " (compatible)", COLOR_BLUE);
+        m_reliable_sender.remove(packet->seqnum);
+
+    }while (false);
+    m_cv.notify_all();
+}
+void ReliableStreamConnection::process_RET_PACKET_SIZE(const PacketHeader* packet){
+    if (packet->packet_bytes < sizeof(PacketHeader_u32) + sizeof(uint32_t)){
+        m_logger.log(
+            "[RSC]: Packet size response is too small: " + std::to_string(packet->packet_bytes),
+            COLOR_RED
+        );
+        return;
+    }
+    const PacketHeader_u32* message = (const PacketHeader_u32*)packet;
+    m_logger.log(
+        "[RSC]: Setting Packet Size: " + std::to_string(message->data) + " bytes",
+        COLOR_BLUE
+    );
+    {
+        std::lock_guard<Mutex> lg(m_lock);
+        m_reliable_sender.remove(packet->seqnum);
+        m_reliable_sender.set_max_packet_size((uint8_t)message->data);
+    }
+    m_cv.notify_all();
+}
+void ReliableStreamConnection::process_RET_BUFFER_SLOTS(const PacketHeader* packet){
+    if (packet->packet_bytes < sizeof(PacketHeader_u32) + sizeof(uint32_t)){
+        m_logger.log(
+            "[RSC]: Buffer slot response is too small: " + std::to_string(packet->packet_bytes),
+            COLOR_RED
+        );
+        return;
+    }
+    const PacketHeader_u32* message = (const PacketHeader_u32*)packet;
+    {
+        std::lock_guard<Mutex> lg(m_lock);
+        m_reliable_sender.remove(packet->seqnum);
+        m_max_unacked_packets = (uint8_t)std::min<uint32_t>(message->data, PABB2_PacketSender_REORDER_WINDOW);
+    }
+    m_logger.log(
+        "[RSC]: Setting Reorder Window: " + std::to_string(m_max_unacked_packets) + " slots",
+        COLOR_BLUE
+    );
+    m_cv.notify_all();
+}
+void ReliableStreamConnection::process_RET_BUFFER_BYTES(const PacketHeader* packet){
+    if (packet->packet_bytes < sizeof(PacketHeader_u32) + sizeof(uint32_t)){
+        m_logger.log(
+            "[RSC]: Buffer slot response is too small: " + std::to_string(packet->packet_bytes),
+            COLOR_RED
+        );
+        return;
+    }
+    const PacketHeader_u32* message = (const PacketHeader_u32*)packet;
+    {
+        std::lock_guard<Mutex> lg(m_lock);
+        m_reliable_sender.remove(packet->seqnum);
+        m_max_unacked_bytes = (uint8_t)std::min<uint32_t>(message->data, PABB2_PacketSender_BUFFER_SIZE);
+    }
+    m_logger.log(
+        "[RSC]: Setting Reorder Window: " + std::to_string(m_max_unacked_bytes) + " bytes",
+        COLOR_BLUE
+    );
+    m_cv.notify_all();
+}
+
+
+void ReliableStreamConnection::process_ASK_STREAM_DATA(const PacketHeader* packet){
+//    cout << "process_ASK_STREAM_DATA()" << endl;
+    if (packet->packet_bytes < sizeof(PacketHeaderData) + sizeof(uint32_t)){
+        m_logger.log(
+            "[RSC]: Received stream packet that is too small: " + std::to_string(packet->packet_bytes),
+            COLOR_RED
+        );
+        return;
+    }
+    if (!m_stream_coalescer.push_stream((const PacketHeaderData*)packet)){
+//        cout << "push_stream() failed" << endl;
+        return;
+    }
+//    cout << "Calling: send_ack_u16()" << endl;
+    {
+        std::lock_guard<Mutex> lg(m_lock);
+        send_ack_u32(
+            packet->seqnum,
+            PABB2_CONNECTION_OPCODE_RET_STREAM_DATA,
+            m_stream_coalescer.free_bytes()
+        );
+    }
+
+    char buffer[4096];
+//    m_stream_coalescer.print(false);
+    size_t bytes = m_stream_coalescer.read(buffer, sizeof(buffer));
+//    cout << "bytes = " << bytes << endl;
+    if (bytes != 0){
+        on_reliable_recv(buffer, bytes);
+    }
+}
+void ReliableStreamConnection::process_RET_STREAM_DATA(const PacketHeader* packet){
+    {
+        std::lock_guard<Mutex> lg(m_lock);
+        m_reliable_sender.remove(packet->seqnum);
+    }
+    m_cv.notify_all();
+}
+
+
+
+
+}
+}
diff --git a/Common/PABotBase2/ReliableConnectionLayer/PABotBase2CC_ReliableStreamConnection.h b/Common/PABotBase2/ReliableConnectionLayer/PABotBase2CC_ReliableStreamConnection.h
new file mode 100644
index 0000000000..13b9b8a526
--- /dev/null
+++ b/Common/PABotBase2/ReliableConnectionLayer/PABotBase2CC_ReliableStreamConnection.h
@@ -0,0 +1,163 @@
+/*  Reliable Stream Connection (CC)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PABotBase2CC_ReliableStreamConnection_H
+#define PokemonAutomation_PABotBase2CC_ReliableStreamConnection_H
+
+#include "Common/Cpp/Time.h"
+#include "Common/Cpp/CancellableScope.h"
+#include "Common/Cpp/Logging/AbstractLogger.h"
+#include "Common/Cpp/Concurrency/Mutex.h"
+#include "Common/Cpp/Concurrency/ConditionVariable.h"
+#include "Common/Cpp/Concurrency/AsyncTask.h"
+#include "Common/Cpp/Concurrency/ThreadPool.h"
+#include "Common/Cpp/StreamConnections/PushingStreamConnections.h"
+#include "PABotBase2_PacketSender.h"
+#include "PABotBase2_PacketParser.h"
+#include "PABotBase2_StreamCoalescer.h"
+
+namespace PokemonAutomation{
+namespace PABotBase2{
+
+
+
+class ReliableStreamConnection final
+    : public CancellableScope
+    , public ReliableStreamConnectionPushing
+    , private UnreliableStreamSender
+    , private PacketRunner
+    , private StreamListener
+    , private Cancellable::CancelListener
+{
+public:
+    ReliableStreamConnection(
+        CancellableScope* parent,
+        Logger& logger, bool log_everything,
+        ThreadPool& thread_pool,
+        UnreliableStreamConnectionPushing& unreliable_connection,
+        WallDuration retransmit_timeout = Milliseconds(100),
+        Mutex* print_lock = nullptr
+    );
+    ~ReliableStreamConnection();
+
+    virtual void stop() noexcept override;
+    virtual bool cancel(std::exception_ptr exception) noexcept override;
+
+    bool reset(WallDuration timeout = WallDuration::max());
+
+    bool remote_protocol_is_compatible() const{
+        return m_remote_protocol_compatible;
+    }
+    uint32_t remote_protocol() const{
+        return m_remote_protocol;
+    }
+    const std::string& error_string() const{
+        return m_error;
+    }
+
+    size_t pending() const;
+    virtual bool wait_for_pending(WallDuration timeout = WallDuration::max()) override;
+
+
+public:
+    //  Send in-band
+
+    bool try_send_request(uint8_t opcode);
+    void send_request(uint8_t opcode);
+
+    void send_stream(const void* data, size_t bytes){
+        reliable_send_all_or_nothing(nullptr, data, bytes);
+    }
+
+
+public:
+    //  Debugging
+
+    void print() const;
+    Mutex* print_lock() const{
+        return m_print_lock;
+    }
+
+
+
+private:
+    //  Send
+
+    void send_ack(uint8_t seqnum, uint8_t opcode);
+    void send_ack_u32(uint8_t seqnum, uint8_t opcode, uint32_t data);
+
+    void retransmit_thread();
+
+
+private:
+    virtual void reliable_send_all_or_nothing(
+        Cancellable* cancellable,
+        const void* data, size_t bytes
+    ) override;
+    virtual bool reliable_send_all_or_nothing(
+        Cancellable* cancellable,
+        const void* data, size_t bytes,
+        WallClock deadline
+    ) override;
+    virtual void on_recv(const void* data, size_t bytes) override;
+    virtual size_t unreliable_send(const void* data, size_t bytes) noexcept override;
+
+
+private:
+    virtual void on_cancellable_cancel(
+        Cancellable& cancellable,
+        std::exception_ptr reason
+    ) override;
+
+
+private:
+    //  Virtuals: PacketRunner
+
+    virtual void on_packet(const PacketHeader* packet) override;
+
+    void process_UNKNOWN_OPCODE(const PacketHeader* packet);
+    void process_RET_RESET(const PacketHeader* packet);
+    void process_RET_VERSION(const PacketHeader* packet);
+    void process_RET_PACKET_SIZE(const PacketHeader* packet);
+    void process_RET_BUFFER_SLOTS(const PacketHeader* packet);
+    void process_RET_BUFFER_BYTES(const PacketHeader* packet);
+
+    void process_ASK_STREAM_DATA(const PacketHeader* packet);
+    void process_RET_STREAM_DATA(const PacketHeader* packet);
+
+
+private:
+    Logger& m_logger;
+    UnreliableStreamConnectionPushing& m_unreliable_connection;
+    const WallDuration m_retransmit_timeout;
+    Mutex* m_print_lock;
+
+    PacketSender m_reliable_sender;
+    PacketParser m_parser;
+    StreamCoalescer m_stream_coalescer;
+
+    bool m_log_everything;
+
+    bool m_remote_protocol_compatible;
+    uint32_t m_remote_protocol;
+
+//    std::atomic<bool> m_version_verified;
+    uint8_t m_max_unacked_packets;
+    uint16_t m_max_unacked_bytes;
+
+    std::string m_error;
+
+    mutable Mutex m_lock;
+    ConditionVariable m_cv;
+
+    AsyncTask m_retransmit_thread;
+};
+
+
+
+}
+}
+#endif
diff --git a/Common/PABotBase2/ReliableConnectionLayer/PABotBase2FW_ReliableStreamConnection.cpp b/Common/PABotBase2/ReliableConnectionLayer/PABotBase2FW_ReliableStreamConnection.cpp
new file mode 100644
index 0000000000..7280efbd27
--- /dev/null
+++ b/Common/PABotBase2/ReliableConnectionLayer/PABotBase2FW_ReliableStreamConnection.cpp
@@ -0,0 +1,277 @@
+/*  PABotBase2 Reliable Stream Connection
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <string.h>
+#include <algorithm>
+#include "PABotBase2FW_ReliableStreamConnection.h"
+
+#ifdef PABB2_SUPPORTS_PRINTF_LOGGING
+#include <stdio.h>
+#endif
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+#ifdef __GNUC__
+#pragma GCC diagnostic ignored "-Wtype-limits"
+#endif
+#ifdef __clang__
+#pragma GCC diagnostic ignored "-Wtautological-constant-out-of-range-compare"
+#endif
+
+namespace PokemonAutomation{
+namespace PABotBase2{
+
+
+ReliableStreamConnectionFW::ReliableStreamConnectionFW(UnreliableStreamConnectionPolling& unreliable_connection)
+    : m_unreliable_connection(unreliable_connection)
+    , m_reliable_sender(unreliable_connection, (uint8_t)(PABB2_MAX_INCOMING_PACKET_SIZE % 256))
+    , m_last_retransmit(current_time())
+{}
+
+
+
+bool ReliableStreamConnectionFW::enqueue_uncommitted_reliable_sends(const void* data, size_t bytes) noexcept{
+    if (!m_stream_ready){
+        m_reliable_sender.send_oob_packet_empty(0, PABB2_CONNECTION_OPCODE_INFO_STREAM_NOT_READY);
+#ifdef PABB2_SUPPORTS_PRINTF_LOGGING
+        printf("Stream not ready...\n");
+#endif
+        return false;
+    }
+    if (m_reliable_sender.enqueue_uncommitted_send_stream(data, bytes)){
+        m_send_is_currently_full = false;
+        return true;
+    }
+    if (!m_send_is_currently_full){
+        m_send_is_currently_full = true;
+        m_reliable_sender.send_oob_packet_empty(0, PABB2_CONNECTION_OPCODE_INFO_STREAM_SEND_FULL);
+#ifdef PABB2_SUPPORTS_PRINTF_LOGGING
+        printf("Send stream is full...\n");
+#endif
+    }
+    return false;
+}
+void ReliableStreamConnectionFW::abort_uncommitted_reliable_sends() noexcept{
+    m_reliable_sender.abort_uncommitted_send_stream();
+}
+void ReliableStreamConnectionFW::commit_uncommitted_reliable_sends() noexcept{
+    m_reliable_sender.commit_uncommitted_send_stream();
+}
+
+
+
+
+void ReliableStreamConnectionFW::send_oob_info_u32(uint32_t data){
+    send_oob_packet_u32(0, PABB2_CONNECTION_OPCODE_INFO_U32, data);
+}
+void ReliableStreamConnectionFW::send_oob_info_binary(const void* data, uint8_t bytes){
+    const size_t MAX_LENGTH = 256 - sizeof(PacketHeader) - sizeof(uint32_t);
+    LockGuard<Mutex> lg(m_sender_lock);
+    m_reliable_sender.send_oob_packet_data(
+        0, PABB2_CONNECTION_OPCODE_INFO_BINARY,
+        (uint8_t)std::min<uint8_t>(bytes, MAX_LENGTH), data
+    );
+}
+void ReliableStreamConnectionFW::send_oob_info_str(const char* str){
+    const size_t MAX_LENGTH = 256 - sizeof(PacketHeader) - sizeof(uint32_t);
+    size_t len = strlen(str);
+    LockGuard<Mutex> lg(m_sender_lock);
+    m_reliable_sender.send_oob_packet_data(
+        0, PABB2_CONNECTION_OPCODE_INFO_STR,
+        (uint8_t)std::min(len, MAX_LENGTH), str
+    );
+}
+void ReliableStreamConnectionFW::send_oob_info_label_i32(uint8_t opcode, const char* str, uint32_t data){
+    const size_t MAX_LENGTH = 256 - sizeof(PacketHeader_u32) - sizeof(uint32_t);
+    size_t len = strlen(str);
+    LockGuard<Mutex> lg(m_sender_lock);
+    m_reliable_sender.send_oob_packet_u32_data(
+        0, opcode,
+        data,
+        (uint8_t)std::min(len, MAX_LENGTH), str
+    );
+}
+
+
+void ReliableStreamConnectionFW::send_oob_packet_empty(uint8_t seqnum, uint8_t opcode) noexcept{
+    LockGuard<Mutex> lg(m_sender_lock);
+    m_reliable_sender.send_oob_packet_empty(seqnum, opcode);
+}
+void ReliableStreamConnectionFW::send_oob_packet_u32(uint8_t seqnum, uint8_t opcode, const uint32_t& data) noexcept{
+    LockGuard<Mutex> lg(m_sender_lock);
+    m_reliable_sender.send_oob_packet_u32(seqnum, opcode, data);
+}
+
+
+
+bool ReliableStreamConnectionFW::run_send_events(const WallDuration& timeout) noexcept{
+    constexpr WallDuration POLL_RATE = milliseconds_to_duration(PABB2_ReliableConnectionFW_POLL_MS);
+
+    WallClock now = current_time();
+    WallClock next_retransmit = m_last_retransmit + POLL_RATE;
+    if (wrapsafe_cmplt(now, next_retransmit)){
+        return false;
+    }
+
+    m_last_retransmit = now;
+
+    LockGuard<Mutex> lg(m_sender_lock);
+    return m_reliable_sender.iterate_retransmits();
+}
+bool ReliableStreamConnectionFW::run_recv_events(const WallDuration& timeout) noexcept{
+    //  If we have unacked sends, we cap the wait time since those may need to
+    //  be retransmitted.
+    static constexpr WallDuration POLL_RATE = milliseconds_to_duration(PABB2_ReliableConnectionFW_POLL_MS);
+
+    const WallDuration* adjusted_timeout = &timeout;
+    if (timeout > POLL_RATE){
+        LockGuard<Mutex> lg(m_sender_lock);
+        if (m_reliable_sender.slots_used() != 0){
+            adjusted_timeout = &POLL_RATE;
+        }
+    }
+
+    const PacketHeader* header = m_parser.pull_bytes(
+        m_unreliable_connection,
+        m_reliable_sender.session_id(),
+        *adjusted_timeout
+    );
+    if (header == nullptr){
+        return false;
+    }
+
+    m_packets_received++;
+
+    //  Check the packet status.
+    switch (header->magic_number){
+    case PABB2_PacketParser_RESULT_VALID:
+        break;
+    case PABB2_PacketParser_RESULT_INVALID:
+//        printf("PABB2_PacketParser_RESULT_INVALID\n");
+        send_oob_packet_empty(
+            header->seqnum,
+            PABB2_CONNECTION_OPCODE_INVALID_LENGTH
+        );
+        return true;
+    case PABB2_PacketParser_RESULT_CHECKSUM_FAIL:
+#ifdef PABB2_SUPPORTS_PRINTF_LOGGING
+        printf("PABB2_PacketParser_RESULT_CHECKSUM_FAIL\n");
+#endif
+        send_oob_packet_empty(
+            header->seqnum,
+            PABB2_CONNECTION_OPCODE_INVALID_CHECKSUM_FAIL
+        );
+//        cout << "CRC error:";
+//        PacketHeader_print(packet, true);
+        return true;
+    default:
+//        printf("Internal Error: Unrecognized packet state.\n");
+        return true;
+    }
+
+//    printf("Device Received: %d\n", packet->opcode);
+
+    //  Now handle the different opcodes.
+    uint8_t opcode = header->opcode & PABB2_CONNECTION_OPCODE_MASK;
+    switch (opcode){
+    case PABB2_CONNECTION_OPCODE_ASK_RESET:{
+        if (header->packet_bytes < sizeof(PacketHeader_u32)){
+            return true;
+        }
+
+        const PacketHeader_u32* packet = (const PacketHeader_u32*)header;
+
+#ifdef PABB2_SUPPORTS_PRINTF_LOGGING
+        printf("Resetting to session ID: %zx\n", (size_t)packet->data);
+#endif
+        m_stream_ready = false;
+        m_send_is_currently_full = false;
+        m_reliable_sender.reset(packet->data);
+        m_parser.reset();
+        m_stream_coalescer.reset();
+        m_stream_coalescer.push_packet(0);
+#ifdef PABB2_FIRMWARE
+        issue_reset_to_all();
+#endif
+        send_oob_packet_empty(
+            header->seqnum,
+            PABB2_CONNECTION_OPCODE_RET_RESET
+        );
+        return true;
+    }
+    case PABB2_CONNECTION_OPCODE_ASK_VERSION:
+        m_stream_coalescer.push_packet(header->seqnum);
+        send_oob_packet_u32(
+            header->seqnum,
+            PABB2_CONNECTION_OPCODE_RET_VERSION,
+            PABB2_CONNECTION_PROTOCOL_VERSION
+        );
+        return true;
+    case PABB2_CONNECTION_OPCODE_ASK_PACKET_SIZE:
+        m_stream_coalescer.push_packet(header->seqnum);
+        send_oob_packet_u32(
+            header->seqnum,
+            PABB2_CONNECTION_OPCODE_RET_PACKET_SIZE,
+            PABB2_MAX_INCOMING_PACKET_SIZE
+        );
+        return true;
+    case PABB2_CONNECTION_OPCODE_ASK_BUFFER_SLOTS:
+        m_stream_coalescer.push_packet(header->seqnum);
+        send_oob_packet_u32(
+            header->seqnum,
+            PABB2_CONNECTION_OPCODE_RET_BUFFER_SLOTS,
+            PABB2_StreamCoalescer_REORDER_WINDOW
+        );
+        return true;
+    case PABB2_CONNECTION_OPCODE_ASK_BUFFER_BYTES:
+        m_stream_coalescer.push_packet(header->seqnum);
+        send_oob_packet_u32(
+            header->seqnum,
+            PABB2_CONNECTION_OPCODE_RET_BUFFER_BYTES,
+            PABB2_StreamCoalescer_BUFFER_SIZE
+        );
+        return true;
+    case PABB2_CONNECTION_OPCODE_REBOOT_TO_BOOTLOADER:
+        if (m_reboot_to_bootloader){
+            m_reboot_to_bootloader();
+        }
+        return true;
+
+    case PABB2_CONNECTION_OPCODE_ASK_STREAM_DATA:
+        m_stream_ready = true;
+        if (!m_stream_coalescer.push_stream((const PacketHeaderData*)header)){
+            send_oob_info_label_u32("Push Stream Failed", m_stream_coalescer.free_bytes());
+            return true;
+        }
+        send_oob_packet_u32(
+            header->seqnum,
+            PABB2_CONNECTION_OPCODE_RET_STREAM_DATA,
+            m_stream_coalescer.free_bytes()
+        );
+        return true;
+    case PABB2_CONNECTION_OPCODE_RET_STREAM_DATA:{
+        LockGuard<Mutex> lg(m_sender_lock);
+        m_reliable_sender.remove(header->seqnum);
+        return true;
+    }
+    default:
+        send_oob_packet_u32(
+            header->seqnum,
+            PABB2_CONNECTION_OPCODE_UNKNOWN_OPCODE,
+            header->opcode
+        );
+    }
+
+    return true;
+}
+
+
+
+
+}
+}
diff --git a/Common/PABotBase2/ReliableConnectionLayer/PABotBase2FW_ReliableStreamConnection.h b/Common/PABotBase2/ReliableConnectionLayer/PABotBase2FW_ReliableStreamConnection.h
new file mode 100644
index 0000000000..7394b2bae8
--- /dev/null
+++ b/Common/PABotBase2/ReliableConnectionLayer/PABotBase2FW_ReliableStreamConnection.h
@@ -0,0 +1,137 @@
+/*  PABotBase2 Reliable Stream Connection (FW)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PABotBase2FW_ReliableStreamConnection_H
+#define PokemonAutomation_PABotBase2FW_ReliableStreamConnection_H
+
+#include "Common/Cpp/StreamConnections/PollingStreamConnections.h"
+#include "PABotBase2_PacketSender.h"
+#include "PABotBase2_PacketParser.h"
+#include "PABotBase2_StreamCoalescer.h"
+
+#ifndef PABB2_ReliableConnectionFW_POLL_MS
+#define PABB2_ReliableConnectionFW_POLL_MS      50
+#endif
+
+#ifdef PABB2_FIRMWARE
+#include "PabbTime.h"
+#include "LocalMutex.h"
+#include "Tools/ResetListener.h"
+#else
+#include "Common/Cpp/Time.h"
+#include "Common/Cpp/Concurrency/Mutex.h"
+#endif
+
+namespace PokemonAutomation{
+namespace PABotBase2{
+
+
+
+class ReliableStreamConnectionFW final
+    : public ReliableStreamConnectionPolling
+#ifdef PABB2_FIRMWARE
+    , public ResetRunner
+#endif
+{
+public:
+    ReliableStreamConnectionFW(UnreliableStreamConnectionPolling& unreliable_connection);
+
+    void set_reboot_to_bootloader_callback(void(*reboot_to_bootloader)()){
+        m_reboot_to_bootloader = reboot_to_bootloader;
+    }
+
+    size_t packets_received() const{
+        return m_packets_received;
+    }
+    bool has_unacked_sends() const{
+        return m_reliable_sender.slots_used() != 0;
+    }
+
+
+public:
+    virtual void lock() noexcept override{
+        m_sender_lock.lock();
+    }
+    virtual void unlock() noexcept override{
+        m_sender_lock.unlock();
+    }
+
+    //  Must be called under the lock above.
+    virtual bool enqueue_uncommitted_reliable_sends(const void* data, size_t bytes) noexcept override;
+    virtual void abort_uncommitted_reliable_sends() noexcept override;
+    virtual void commit_uncommitted_reliable_sends() noexcept override;
+
+
+public:
+    virtual size_t reliable_recv(void* data, size_t bytes) override{
+        return m_stream_coalescer.read(data, bytes);
+    }
+
+    virtual bool run_send_events(const WallDuration& timeout) noexcept override;
+    virtual bool run_recv_events(const WallDuration& timeout) noexcept override;
+
+
+public:
+    //  Send out-of-band messages.
+    //  These are not part of the reliable protocol and may be dropped.
+
+    void send_oob_info_u32(uint32_t data);
+    void send_oob_info_binary(const void* data, uint8_t bytes);
+    void send_oob_info_str(const char* str);
+    void send_oob_info_label_h32(const char* str, const uint32_t& data){
+        send_oob_info_label_i32(PABB2_CONNECTION_OPCODE_INFO_LABEL_H32, str, data);
+    }
+    void send_oob_info_label_u32(const char* str, const uint32_t& data){
+        send_oob_info_label_i32(PABB2_CONNECTION_OPCODE_INFO_LABEL_U32, str, data);
+    }
+    void send_oob_info_label_i32(const char* str, const int32_t& data){
+        send_oob_info_label_i32(PABB2_CONNECTION_OPCODE_INFO_LABEL_I32, str, data);
+    }
+
+
+public:
+    //  For debugging
+    const StreamCoalescer& stream_coalescer() const{
+        return m_stream_coalescer;
+    }
+
+
+private:
+    void send_oob_info_label_i32(uint8_t opcode, const char* str, uint32_t data);
+
+    void send_oob_packet_empty(uint8_t seqnum, uint8_t opcode) noexcept;
+    void send_oob_packet_u32(uint8_t seqnum, uint8_t opcode, const uint32_t& data) noexcept;
+
+
+private:
+    UnreliableStreamConnectionPolling& m_unreliable_connection;
+    PacketSender m_reliable_sender;
+    PacketParser m_parser;
+    StreamCoalescer m_stream_coalescer;
+
+    WallClock m_last_retransmit;
+
+    size_t m_packets_received = 0;
+
+    bool m_send_is_currently_full = false;
+
+    //  Don't allow any stream traffic until CC is ready.
+    //  The MLC layer will get stuck in a bad state if we end up between packets.
+    bool m_stream_ready = false;
+
+    Mutex m_sender_lock;
+    void(*m_reboot_to_bootloader)() = nullptr;
+};
+
+
+
+
+
+
+
+}
+}
+#endif
diff --git a/Common/PABotBase2/ReliableConnectionLayer/PABotBase2_ConnectionDebug.cpp b/Common/PABotBase2/ReliableConnectionLayer/PABotBase2_ConnectionDebug.cpp
new file mode 100644
index 0000000000..79315b76fc
--- /dev/null
+++ b/Common/PABotBase2/ReliableConnectionLayer/PABotBase2_ConnectionDebug.cpp
@@ -0,0 +1,180 @@
+/*  PABotBase2 Connection Sender (Debug)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <iostream>
+#include "Common/CRC32/pabb_CRC32.h"
+#include "PABotBase2_PacketSender.h"
+#include "PABotBase2_StreamCoalescer.h"
+#include "PABotBase2_ConnectionDebug.h"
+
+namespace PokemonAutomation{
+namespace PABotBase2{
+
+
+void print_bytes(const void* data, size_t bytes, bool ascii){
+    const char* ptr = (const char*)data;
+
+    if (ascii){
+        for (size_t c = 0; c < bytes; c++){
+            std::cout << ptr[c];
+        }
+        return;
+    }
+
+    const char HEX[] = "0123456789abcdef";
+    for (size_t c = 0; c < bytes; c++){
+        uint8_t byte = ptr[c];
+        if (32 <= byte && byte <= 126){
+            std::cout << HEX[byte >> 4] << HEX[byte & 0xf] << "(" << byte << ") ";
+        }else{
+            std::cout << HEX[byte >> 4] << HEX[byte & 0xf] << " ";
+        }
+    }
+}
+
+void PacketHeader_print(const PacketHeader* packet, bool ascii){
+    uint8_t packet_bytes = packet->packet_bytes;
+    std::cout << "{" << std::endl;
+    std::cout << "    magic:  0x" << std::hex << (int)packet->magic_number << std::dec << std::endl;
+    std::cout << "    seqnum: " << (int)packet->seqnum << std::endl;
+    std::cout << "    bytes:  " << (int)packet->packet_bytes << std::endl;
+    std::cout << "    opcode: 0x" << std::hex << (int)packet->opcode << std::dec << std::endl;
+    if (packet_bytes < sizeof(PacketHeader) + sizeof(uint32_t)){
+        std::cout << "    ** invalid length **\n}" << std::endl;
+        return;
+    }
+
+    uint32_t expected_crc32;
+    memcpy(
+        &expected_crc32,
+        (const uint8_t*)packet + packet_bytes - sizeof(uint32_t),
+        sizeof(uint32_t)
+    );
+    uint32_t actual_crc32 = 0xffffffff;
+    uint8_t magic_number = PABB2_CONNECTION_MAGIC_NUMBER;
+    pabb_crc32c_buffer(&actual_crc32, &magic_number, 1);
+    pabb_crc32c_buffer(&actual_crc32, (const uint8_t*)packet + 1, packet_bytes - sizeof(uint32_t) - 1);
+    std::cout << "    CRC32:  0x" << std::hex << actual_crc32 << " / 0x" << expected_crc32 << std::dec;
+    if (actual_crc32 != expected_crc32){
+        std::cout << "    (** mismatch **)";
+    }
+    std::cout << std::endl;
+
+    switch (packet->opcode){
+    case PABB2_CONNECTION_OPCODE_ASK_STREAM_DATA:{
+        const size_t OVERHEAD = sizeof(PacketHeaderData) + sizeof(uint32_t);
+        const PacketHeaderData* stream_packet = (const PacketHeaderData*)packet;
+        if (packet_bytes < OVERHEAD){
+            std::cout << "    ** invalid length **" << std::endl;
+            break;
+        }
+        std::cout << "    offset: " << stream_packet->stream_offset << std::endl;
+        std::cout << "    data:   ";
+        print_bytes(stream_packet + 1, packet_bytes - OVERHEAD, ascii);
+        std::cout << std::endl;
+        break;
+    }
+    default:
+        std::cout << "    (unknown opcode)" << std::endl;
+    }
+    std::cout << "}" << std::endl;
+}
+bool PacketHeader_check(const PacketHeader* packet, bool ascii){
+    uint8_t packet_bytes = packet->packet_bytes;
+
+    uint32_t expected_crc32;
+    memcpy(
+        &expected_crc32,
+        (const uint8_t*)packet + packet_bytes - sizeof(uint32_t),
+        sizeof(uint32_t)
+    );
+    uint32_t actual_crc32 = 0xffffffff;
+    uint8_t magic_number = PABB2_CONNECTION_MAGIC_NUMBER;
+    pabb_crc32c_buffer(&actual_crc32, &magic_number, 1);
+    pabb_crc32c_buffer(&actual_crc32, (const uint8_t*)packet + 1, packet_bytes - sizeof(uint32_t) - 1);
+    if (actual_crc32 == expected_crc32){
+        return true;
+    }
+
+    if (false){
+        std::cout << "PacketHeader_check(): CRC mismatch" << std::endl;
+        PacketHeader_print(packet, ascii);
+//        system("pause");
+    }
+    return false;
+}
+
+
+void PacketSender::print(bool ascii) const{
+    std::cout << "---- ConnectionSender ---- (Start)" << std::endl;
+    std::cout << "Slot Head:             " << (int)m_slot_head << std::endl;
+    std::cout << "Slot Tail:             " << (int)m_slot_tail << std::endl;
+    std::cout << "Slot Tail (resv):      " << (int)m_slot_tail_uncommitted << std::endl;
+    std::cout << "Buffer Head:           " << m_buffer_head << std::endl;
+    std::cout << "Buffer Tail:           " << m_buffer_tail << std::endl;
+    std::cout << "Buffer Tail (resv):    " << m_buffer_tail_uncommitted << std::endl;
+    std::cout << "Stream Offset:         " << m_stream_offset << std::endl;
+    std::cout << "Stream Offset (resv):  " << m_stream_offset_uncommitted << std::endl;
+    std::cout << "Retransmit Seqnum:     " << (int)m_retransmit_seqnum << std::endl;
+    for (uint8_t seqnum = m_slot_head; seqnum != m_slot_tail; seqnum++){
+        size_t offset = m_offsets[seqnum & SLOT_MASK];
+        std::cout << "Offset: " << offset << std::endl;
+        PacketHeader_print((const PacketHeader*)(m_buffer + offset), ascii);
+    }
+    std::cout << "---- ConnectionSender ---- (End)" << std::endl;
+}
+
+
+void StreamCoalescer::print(bool ascii) const{
+    std::cout << "---- StreamCoalescer ---- (Start)" << std::endl;
+    std::cout << "Slot Head:         " << (int)m_slot_head << std::endl;
+    std::cout << "Slot Tail:         " << (int)m_slot_tail << std::endl;
+    std::cout << "Stream Free:       " << m_stream_free << std::endl;
+    std::cout << "Stream Head:       " << m_stream_head << std::endl;
+    std::cout << "Stream Tail:       " << m_stream_tail << std::endl;
+    for (uint8_t seqnum = m_slot_head; seqnum != m_slot_tail; seqnum++){
+        uint8_t index = seqnum & SLOT_MASK;
+        uint8_t size = m_lengths[index];
+        std::cout << "    [" << (int)seqnum << "]: ";
+        if (size == 0){
+            std::cout << std::endl;
+            continue;
+        }
+        if (size == 0xff){
+            std::cout << " non-stream" << std::endl;
+            continue;
+        }
+
+        uint16_t offset_e = m_end_offsets[index];
+        uint16_t offset_s = offset_e - size;
+        std::cout << "[" << offset_s << ":" << offset_e << "] => ";
+
+        offset_s &= BUFFER_MASK;
+        offset_e &= BUFFER_MASK;
+
+        if (offset_s < offset_e){
+            print_bytes(m_buffer + offset_s, size, ascii);
+        }else{
+        uint8_t block = (uint8_t)(PABB2_StreamCoalescer_BUFFER_SIZE - offset_s);
+            print_bytes(m_buffer + offset_s, block, ascii);
+            print_bytes(m_buffer, size - block, ascii);
+        }
+        std::cout << std::endl;
+    }
+    std::cout << "---- StreamCoalescer ---- (End)" << std::endl;
+}
+
+
+
+
+
+
+
+
+
+
+}
+}
diff --git a/Common/PABotBase2/ReliableConnectionLayer/PABotBase2_ConnectionDebug.h b/Common/PABotBase2/ReliableConnectionLayer/PABotBase2_ConnectionDebug.h
new file mode 100644
index 0000000000..52a8c47ac4
--- /dev/null
+++ b/Common/PABotBase2/ReliableConnectionLayer/PABotBase2_ConnectionDebug.h
@@ -0,0 +1,25 @@
+/*  PABotBase2 Connection (Debug)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PABotBase2_ReliableConnectionLayer_ConnectionDebug_H
+#define PokemonAutomation_PABotBase2_ReliableConnectionLayer_ConnectionDebug_H
+
+#include <cstddef>
+#include "PABotBase2_PacketProtocol.h"
+
+namespace PokemonAutomation{
+namespace PABotBase2{
+
+
+void print_bytes(const void* data, size_t bytes, bool ascii);
+void PacketHeader_print(const PacketHeader* packet, bool ascii);
+bool PacketHeader_check(const PacketHeader* packet, bool ascii);
+
+
+
+}
+}
+#endif
diff --git a/Common/PABotBase2/ReliableConnectionLayer/PABotBase2_PacketParser.cpp b/Common/PABotBase2/ReliableConnectionLayer/PABotBase2_PacketParser.cpp
new file mode 100644
index 0000000000..dd1e0b3ffb
--- /dev/null
+++ b/Common/PABotBase2/ReliableConnectionLayer/PABotBase2_PacketParser.cpp
@@ -0,0 +1,256 @@
+/*  PABotBase2 Packet Parser
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/CRC32/pabb_CRC32.h"
+#include "PABotBase2_PacketParser.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+//#include "PABotBase2_ConnectionDebug.h"
+
+#ifdef __GNUC__
+#pragma GCC diagnostic ignored "-Wtype-limits"
+#endif
+#ifdef __clang__
+#pragma GCC diagnostic ignored "-Wtautological-constant-out-of-range-compare"
+#endif
+
+namespace PokemonAutomation{
+namespace PABotBase2{
+
+
+const PacketHeader* PacketParser::pull_bytes(
+    UnreliableStreamConnectionPolling& connection,
+    const uint32_t& session_id,
+    WallDuration timeout
+){
+    const uint8_t MIN_PACKET_SIZE = sizeof(PacketHeader) + sizeof(uint32_t);
+
+    while (true){
+        uint8_t index = m_index;
+
+        //  Already have the entire header.
+        if (index >= MIN_PACKET_SIZE){
+            break;
+        }
+
+        //  Read enough to finish the header.
+        m_index += (uint8_t)connection.unreliable_recv(
+            m_buffer + index,
+            MIN_PACKET_SIZE - index,
+            timeout
+        );
+        timeout = milliseconds_to_duration(0);
+
+        //  Header is still incomplete.
+        if (m_index < MIN_PACKET_SIZE){
+//            cout << "Incomplete header: " << (int)m_index << endl;
+            return NULL;
+        }
+
+        //  Valid magic byte.
+        uint8_t* buffer = m_buffer;
+        if (buffer[0] == PABB2_CONNECTION_MAGIC_NUMBER){
+            break;
+        }
+
+        //  Search for the magic byte in the remaining buffer.
+        uint8_t c = 0;
+        while (true){
+            c++;
+
+            //  Magic byte never found.
+            if (c == MIN_PACKET_SIZE){
+                break;
+            }
+
+            //  Magic byte found.
+            if (buffer[c] == PABB2_CONNECTION_MAGIC_NUMBER){
+                //  Shift the buffer up so that the magic byte is at the start.
+                memmove(m_buffer, m_buffer + c, MIN_PACKET_SIZE - c);
+                break;
+            }
+        }
+
+        m_index -= c;
+    }
+
+    //  At this point, we have a complete and valid header.
+
+    PacketHeader* header = (PacketHeader*)m_buffer;
+
+    uint8_t packet_bytes = header->packet_bytes;
+    if (packet_bytes < MIN_PACKET_SIZE || packet_bytes > PABB2_MAX_INCOMING_PACKET_SIZE){
+//        cout << "Invalid length: " << (int)packet_bytes << endl;
+
+        //  Invalid length.
+        header->magic_number = PABB2_PacketParser_RESULT_INVALID;
+        m_index = 0;
+
+        return header;
+    }
+
+    //  Valid length.
+
+    //  Read enough to finish the packet.
+    if (m_index < packet_bytes){
+        uint8_t index = m_index;
+        m_index += (uint8_t)connection.unreliable_recv(
+            m_buffer + index,
+            packet_bytes - index,
+            timeout
+        );
+//        timeout = milliseconds_to_duration(0);
+    }
+
+    //  Packet is incomplete.
+    if (m_index < packet_bytes){
+//        printf("Incomplete Packet: %d\n", packet_bytes);
+        return NULL;
+    }
+
+    //  Verify the CRC.
+
+    uint32_t actual_crc = header->opcode == PABB2_CONNECTION_OPCODE_ASK_RESET
+        ? 0xffffffff
+        : session_id;
+    pabb_crc32c_buffer(&actual_crc, m_buffer, packet_bytes - sizeof(uint32_t));
+
+    uint32_t expected_crc;
+    memcpy(
+        &expected_crc,
+        m_buffer + packet_bytes - sizeof(uint32_t),
+        sizeof(uint32_t)
+    );
+
+//    cout << actual_crc << " / " << expected_crc << endl;
+
+    header->magic_number = actual_crc == expected_crc
+        ? PABB2_PacketParser_RESULT_VALID
+        : PABB2_PacketParser_RESULT_CHECKSUM_FAIL;
+
+    m_index = 0;
+
+    return header;
+}
+
+void PacketParser::push_bytes(
+    PacketRunner& packet_runner,
+    const uint32_t& session_id,
+    const uint8_t* data, size_t bytes
+){
+//    cout << std::string((const char*)data, bytes) << endl;
+
+//    cout << "pabb2_PacketParser_push_bytes(): " << bytes << endl;
+
+//    cout << "push_bytes(): ";
+//    PABotBase2::print_bytes(data, bytes, false);
+//    cout << endl;
+
+    const uint8_t MIN_PACKET_SIZE = sizeof(PacketHeader) + sizeof(uint32_t);
+
+    uint8_t index = m_index;
+
+    while (bytes > 0){
+//        cout << "index = " << (int)index << ", bytes left = " << bytes << endl;
+//        cout << "bytes left: " << bytes << endl;
+        if (index == 0 && data[0] != PABB2_CONNECTION_MAGIC_NUMBER){
+//            cout << "Skipping invalid start of packet." << endl;
+            data++;
+            bytes--;
+            continue;
+        }
+
+        if (index < MIN_PACKET_SIZE){
+//            cout << "Header is Incomplete: " << (int)index << endl;
+            uint8_t bytes_needed_to_finish_header = MIN_PACKET_SIZE - index;
+            if (bytes < bytes_needed_to_finish_header){
+//                cout << "Not enough data to complete header: " << (int)index << endl;
+                memcpy(m_buffer + index, data, bytes);
+                index += (uint8_t)bytes;
+                break;
+            }
+            memcpy(m_buffer + index, data, bytes_needed_to_finish_header);
+            data += bytes_needed_to_finish_header;
+            bytes -= bytes_needed_to_finish_header;
+            index += bytes_needed_to_finish_header;
+        }
+
+        PacketHeader* header = (PacketHeader*)m_buffer;
+
+        size_t packet_bytes = header->packet_bytes;
+        if (packet_bytes == 0){
+            packet_bytes = 256;
+        }
+        if (packet_bytes < MIN_PACKET_SIZE || packet_bytes > PABB2_MAX_INCOMING_PACKET_SIZE){
+//            cout << "Invalid length: " << (int)packet_bytes << endl;
+
+            //  Invalid length.
+            header->magic_number = PABB2_PacketParser_RESULT_INVALID;
+
+        }else{
+//            cout << "Valid length: " << (int)packet_bytes << endl;
+
+            //  Valid length.
+
+            uint8_t bytes_needed_to_finish_packet = (uint8_t)(packet_bytes - index);
+
+//            cout << "bytes = " << (int)bytes << ", bytes_needed_to_finish_packet = " << (int)bytes_needed_to_finish_packet << endl;
+
+            if (bytes < bytes_needed_to_finish_packet){
+                memcpy(m_buffer + index, data, bytes);
+                index += (uint8_t)bytes;
+                break;
+            }
+
+            memcpy(m_buffer + index, data, bytes_needed_to_finish_packet);
+            data += bytes_needed_to_finish_packet;
+            bytes -= bytes_needed_to_finish_packet;
+
+            //  Verify the CRC.
+
+            uint32_t actual_crc = header->opcode == PABB2_CONNECTION_OPCODE_ASK_RESET
+                ? 0xffffffff
+                : session_id;
+            pabb_crc32c_buffer(&actual_crc, m_buffer, packet_bytes - sizeof(uint32_t));
+
+            uint32_t expected_crc;
+            memcpy(&expected_crc, m_buffer + packet_bytes - sizeof(uint32_t), sizeof(uint32_t));
+
+//            cout << actual_crc << " / " << expected_crc << endl;
+
+            header->magic_number = actual_crc == expected_crc
+                ? PABB2_PacketParser_RESULT_VALID
+                : PABB2_PacketParser_RESULT_CHECKSUM_FAIL;
+        }
+
+        packet_runner.on_packet(header);
+        index = 0;
+    }
+
+    m_index = index;
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}
+}
diff --git a/Common/PABotBase2/ReliableConnectionLayer/PABotBase2_PacketParser.h b/Common/PABotBase2/ReliableConnectionLayer/PABotBase2_PacketParser.h
new file mode 100644
index 0000000000..52ccedc4de
--- /dev/null
+++ b/Common/PABotBase2/ReliableConnectionLayer/PABotBase2_PacketParser.h
@@ -0,0 +1,93 @@
+/*  PABotBase2 Packet Parser
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PABotBase2_ReliableConnectionLayer_PacketParser_H
+#define PokemonAutomation_PABotBase2_ReliableConnectionLayer_PacketParser_H
+
+#include "Common/Cpp/StreamConnections/PollingStreamConnections.h"
+#include "PABotBase2_PacketProtocol.h"
+
+#ifdef PABB2_SIZING_OVERRIDE
+#include "PABotBase2_Config.h"
+#else
+
+//  Maximum size of incoming packet + overhead.
+//  Min Size: sizeof(largest header) + sizeof(uint32_t) + 1
+//  Max Size: 256
+#ifndef PABB2_MAX_INCOMING_PACKET_SIZE
+#define PABB2_MAX_INCOMING_PACKET_SIZE      ((uint16_t)256)
+#endif
+
+#endif
+
+namespace PokemonAutomation{
+namespace PABotBase2{
+
+
+
+
+#define PABB2_PacketParser_RESULT_VALID             0
+#define PABB2_PacketParser_RESULT_INVALID           1
+#define PABB2_PacketParser_RESULT_CHECKSUM_FAIL     2
+
+
+struct PacketRunner{
+    virtual void on_packet(const PacketHeader* data) = 0;
+};
+
+
+struct PacketParser{
+public:
+    PacketParser()
+        : m_index(0)
+    {}
+    void reset(){
+        m_index = 0;
+    }
+
+
+public:
+    //
+    //  Parse packets by consuming data by pulling from a reader.
+    //
+    //  Returns NULL if more data is needed.
+    //  Returns the packet header on a completed/invalid packet.
+    //  (return_value->magic_number) indicates the status of the packet.
+    //
+    //  This will never read more than is necessary unless there
+    //  is an error.
+    //
+    const PacketHeader* pull_bytes(
+        UnreliableStreamConnectionPolling& connection,
+        const uint32_t& session_id,
+        WallDuration timeout
+    );
+
+    //
+    //  Parse packets by consuming data from an existing buffer.
+    //  This will consume all the bytes you give it and may call
+    //  "packet_runner" multiple times.
+    //
+    void push_bytes(
+        PacketRunner& packet_runner,
+        const uint32_t& session_id,
+        const uint8_t* data, size_t bytes
+    );
+
+
+private:
+    uint8_t m_index;
+    uint8_t m_buffer[PABB2_MAX_INCOMING_PACKET_SIZE];
+};
+
+
+
+
+
+
+}
+}
+#endif
diff --git a/Common/PABotBase2/ReliableConnectionLayer/PABotBase2_PacketProtocol.h b/Common/PABotBase2/ReliableConnectionLayer/PABotBase2_PacketProtocol.h
new file mode 100644
index 0000000000..e87c9bad57
--- /dev/null
+++ b/Common/PABotBase2/ReliableConnectionLayer/PABotBase2_PacketProtocol.h
@@ -0,0 +1,124 @@
+/*  PABotBase2 Packet Protocol
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PABotBase2_ReliableConnectionLayer_PacketProtocol_H
+#define PokemonAutomation_PABotBase2_ReliableConnectionLayer_PacketProtocol_H
+
+#include <stdbool.h>
+#include <stdint.h>
+
+#if _WIN32
+#pragma pack(push, 1)
+#define PABB_PACK
+#elif __GNUC__
+#define PABB_PACK   __attribute__((packed))
+#else
+#define PABB_PACK
+#endif
+
+namespace PokemonAutomation{
+namespace PABotBase2{
+
+//
+//  The currently supported baud rates are:
+//      -   115200
+//      -   921600
+//
+//  You can use any hardware/OS compatible baud-rate you want, but you must add
+//  it to the search list on CC-side.
+//
+
+#define PABB2_CONNECTION_MAGIC_NUMBER               0x81
+#define PABB2_CONNECTION_PROTOCOL_VERSION           2026061800
+
+
+#define PABB2_CONNECTION_RETRANSMIT_FLAG            0x80
+#define PABB2_CONNECTION_OPCODE_MASK                0x7f
+
+#define PABB2_CONNECTION_OPCODE_INVALID             0x00
+
+
+//
+//  Packets
+//
+
+using SessionId = uint32_t;
+
+struct PABB_PACK PacketHeader{
+    uint8_t magic_number;
+    uint8_t seqnum;
+    uint8_t packet_bytes;
+    uint8_t opcode;
+};
+
+struct PABB_PACK PacketHeader_u32 : PacketHeader{
+    uint32_t data;
+};
+
+
+
+//
+//  Requests (acks required)
+//
+
+#define PABB2_CONNECTION_OPCODE_ASK_RESET               0x01
+#define PABB2_CONNECTION_OPCODE_RET_RESET               0x41
+
+#define PABB2_CONNECTION_OPCODE_ASK_VERSION             0x02
+#define PABB2_CONNECTION_OPCODE_RET_VERSION             0x42
+
+#define PABB2_CONNECTION_OPCODE_ASK_PACKET_SIZE         0x03
+#define PABB2_CONNECTION_OPCODE_RET_PACKET_SIZE         0x43
+
+#define PABB2_CONNECTION_OPCODE_ASK_BUFFER_SLOTS        0x04
+#define PABB2_CONNECTION_OPCODE_RET_BUFFER_SLOTS        0x44
+
+#define PABB2_CONNECTION_OPCODE_ASK_BUFFER_BYTES        0x05
+#define PABB2_CONNECTION_OPCODE_RET_BUFFER_BYTES        0x45
+
+#define PABB2_CONNECTION_OPCODE_REBOOT_TO_BOOTLOADER    0x06    //  No ack needed
+
+#define PABB2_CONNECTION_OPCODE_ASK_STREAM_DATA         0x12
+#define PABB2_CONNECTION_OPCODE_RET_STREAM_DATA         0x52
+#define PABB2_CONNECTION_OPCODE_ASK_STREAM_REQUEST      0x13    //  Unused for now.
+struct PABB_PACK PacketHeaderData : PacketHeader{
+    uint16_t stream_offset;
+};
+
+
+
+//
+//  Out-of-band Info (no acks needed)
+//
+
+#define PABB2_CONNECTION_OPCODE_INFO_STREAM_DEAD        0x10
+#define PABB2_CONNECTION_OPCODE_INFO_STREAM_NOT_READY   0x11
+#define PABB2_CONNECTION_OPCODE_INFO_STREAM_SEND_FULL   0x18
+#define PABB2_CONNECTION_OPCODE_INFO_STREAM_RECV_FULL   0x19
+
+#define PABB2_CONNECTION_OPCODE_INFO                    0x20
+#define PABB2_CONNECTION_OPCODE_INFO_H32                0x21
+#define PABB2_CONNECTION_OPCODE_INFO_U32                0x22
+#define PABB2_CONNECTION_OPCODE_INFO_I32                0x23
+#define PABB2_CONNECTION_OPCODE_INFO_BINARY             0x24
+#define PABB2_CONNECTION_OPCODE_INFO_STR                0x25
+#define PABB2_CONNECTION_OPCODE_INFO_LABEL_H32          0x26
+#define PABB2_CONNECTION_OPCODE_INFO_LABEL_U32          0x27
+#define PABB2_CONNECTION_OPCODE_INFO_LABEL_I32          0x28
+
+#define PABB2_CONNECTION_OPCODE_INVALID_LENGTH          0x30
+#define PABB2_CONNECTION_OPCODE_INVALID_CHECKSUM_FAIL   0x31
+#define PABB2_CONNECTION_OPCODE_UNKNOWN_OPCODE          0x32
+
+
+}
+}
+
+#if _WIN32
+#pragma pack(pop)
+#endif
+
+#endif
diff --git a/Common/PABotBase2/ReliableConnectionLayer/PABotBase2_PacketSender.cpp b/Common/PABotBase2/ReliableConnectionLayer/PABotBase2_PacketSender.cpp
new file mode 100644
index 0000000000..51ba52a64c
--- /dev/null
+++ b/Common/PABotBase2/ReliableConnectionLayer/PABotBase2_PacketSender.cpp
@@ -0,0 +1,484 @@
+/*  PABotBase2 Packet Sender
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <string.h>
+#include "Common/Compiler.h"
+#include "Common/CRC32/pabb_CRC32.h"
+#include "PABotBase2_PacketSender.h"
+
+//#include <stdio.h>
+//#include "PABotBase2_ConnectionDebug.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace PABotBase2{
+
+
+PacketSender::PacketSender(
+    UnreliableStreamSender& connection,
+    uint8_t max_packet_size
+)
+    : m_connection(connection)
+    , m_max_packet_size(max_packet_size)
+{
+    reset(0);
+}
+PacketSender::PacketSender(
+    UnreliableStreamSender& connection,
+    uint8_t max_packet_size,
+    SessionId session_id
+)
+    : m_connection(connection)
+    , m_max_packet_size(max_packet_size)
+{
+    reset(session_id);
+}
+void PacketSender::reset(const SessionId& session_id){
+    memcpy(&m_session_id, &session_id, sizeof(SessionId));
+    m_slot_head = 0;
+    m_slot_tail = 0;
+    m_slot_tail_uncommitted = 0;
+    m_retransmit_seqnum = 0;
+    m_stream_corrupted = false;
+    m_stream_offset = 0;
+    m_stream_offset_uncommitted = 0;
+    m_buffer_head = 0;
+    m_buffer_tail = 0;
+    m_buffer_tail_uncommitted = 0;
+}
+
+
+
+
+PA_NO_INLINE void PacketSender::send_oob_packet_empty(uint8_t seqnum, uint8_t opcode) noexcept{
+    struct{
+        PacketHeader header;
+        uint8_t crc32[sizeof(uint32_t)];
+    } packet;
+    packet.header.magic_number = PABB2_CONNECTION_MAGIC_NUMBER;
+    packet.header.seqnum = seqnum;
+    packet.header.packet_bytes = sizeof(packet);
+    packet.header.opcode = opcode;
+    pabb_crc32c_write_to_message(m_session_id, &packet, sizeof(packet));
+    m_connection.unreliable_send(&packet, sizeof(packet));
+}
+PA_NO_INLINE void PacketSender::send_oob_packet_u32(uint8_t seqnum, uint8_t opcode, const uint32_t& data) noexcept{
+    struct{
+        PacketHeader_u32 header;
+        uint8_t crc32[sizeof(uint32_t)];
+    } packet;
+    packet.header.magic_number = PABB2_CONNECTION_MAGIC_NUMBER;
+    packet.header.seqnum = seqnum;
+    packet.header.packet_bytes = sizeof(packet);
+    packet.header.opcode = opcode;
+    memcpy(&packet.header.data, &data, sizeof(uint32_t));
+    pabb_crc32c_write_to_message(m_session_id, &packet, sizeof(packet));
+    m_connection.unreliable_send(&packet, sizeof(packet));
+}
+PA_NO_INLINE void PacketSender::send_oob_packet_data(
+    uint8_t seqnum, uint8_t opcode,
+    uint8_t bytes, const void* data
+) noexcept{
+    PacketHeader header;
+    header.magic_number = PABB2_CONNECTION_MAGIC_NUMBER;
+    header.seqnum = seqnum;
+    header.packet_bytes = sizeof(PacketHeader) + sizeof(uint32_t) + bytes;
+    header.opcode = opcode;
+    uint32_t crc = m_session_id;
+    pabb_crc32c_buffer(&crc, &header, sizeof(PacketHeader));
+    pabb_crc32c_buffer(&crc, data, bytes);
+    m_connection.unreliable_send(&header, sizeof(header));
+    m_connection.unreliable_send(data, bytes);
+    m_connection.unreliable_send(&crc, sizeof(uint32_t));
+}
+PA_NO_INLINE void PacketSender::send_oob_packet_u32_data(
+    uint8_t seqnum, uint8_t opcode,
+    const uint32_t& u32,
+    uint8_t bytes, const void* data
+) noexcept{
+    PacketHeader_u32 header;
+    header.magic_number = PABB2_CONNECTION_MAGIC_NUMBER;
+    header.seqnum = seqnum;
+    header.packet_bytes = sizeof(PacketHeader_u32) + sizeof(uint32_t) + bytes;
+    header.opcode = opcode;
+    memcpy(&header.data, &u32, sizeof(uint32_t));
+    uint32_t crc = m_session_id;
+    pabb_crc32c_buffer(&crc, &header, sizeof(PacketHeader_u32));
+    pabb_crc32c_buffer(&crc, data, bytes);
+    m_connection.unreliable_send(&header, sizeof(header));
+    m_connection.unreliable_send(data, bytes);
+    m_connection.unreliable_send(&crc, sizeof(uint32_t));
+}
+
+
+
+
+bool PacketSender::remove(uint8_t seqnum) noexcept{
+//    {
+//        std::lock_guard<std::mutex> lg(print_lock);
+//        cout << "PacketSender::remove(" << this << "): " << (int)seqnum << endl;
+//    }
+
+    //  Too far in the future.
+    if ((uint8_t)(seqnum - m_slot_head) >= REORDER_WINDOW){
+        return false;
+    }
+
+    //  Too far in the past.
+    if ((uint8_t)(m_slot_tail - seqnum) > REORDER_WINDOW){
+        return false;
+    }
+
+    //  Mark the slot has invalid.
+    {
+        size_t offset = m_offsets[seqnum & SLOT_MASK];
+        PacketHeader* packet = (PacketHeader*)(m_buffer + offset);
+        packet->opcode = PABB2_CONNECTION_OPCODE_INVALID;
+    }
+
+    //  Not the front.
+    if (seqnum != m_slot_head){
+        return true;
+    }
+
+    //  Clear out all acked requests from the front of the queue.
+    while (true){
+        seqnum++;
+        m_slot_head = seqnum;
+
+        //  Queue is empty.
+        if (seqnum == m_slot_tail){
+            m_buffer_head = 0;
+            m_buffer_tail = 0;
+            m_buffer_tail_uncommitted = 0;
+            return true;
+        }
+
+        size_t offset = m_offsets[seqnum & SLOT_MASK];
+        m_buffer_head = offset;
+
+        PacketHeader* packet = (PacketHeader*)(m_buffer + offset);
+
+        //  Packet hasn't been acked yet. We can't go further.
+        if (packet->opcode != PABB2_CONNECTION_OPCODE_INVALID){
+            return true;
+        }
+    }
+}
+
+void PacketSender::send_reset() noexcept{
+    PacketHeader_u32* packet = (PacketHeader_u32*)reserve_packet(
+        PABB2_CONNECTION_OPCODE_ASK_RESET,
+        sizeof(PacketHeader_u32) - sizeof(PacketHeader)
+    );
+    if (packet == NULL){
+        return;
+    }
+
+    memcpy(&packet->data, &m_session_id, sizeof(uint32_t));
+
+    //  We temporarily change the session ID to 0xffffffff
+    //  so that the CRC is generated correctly.
+    uint32_t tmp = m_session_id;
+    m_session_id = 0xffffffff;
+
+    commit_packet(packet);
+
+    m_session_id = tmp;
+
+}
+bool PacketSender::send_packet(
+    uint8_t opcode, uint8_t extra_bytes, const void* extra_data
+) noexcept{
+    PacketHeader* packet = reserve_packet(opcode, extra_bytes);
+    if (packet == NULL){
+        return false;
+    }
+    memcpy(packet + 1, extra_data, extra_bytes);
+    commit_packet(packet);
+    return true;
+}
+
+PacketHeader* PacketSender::reserve_packet(
+    uint8_t opcode, uint8_t extra_bytes
+) noexcept{
+    //  No slots available.
+    uint8_t slots_used = m_slot_tail - m_slot_head;
+    if (slots_used == REORDER_WINDOW){
+        return NULL;
+    }
+
+    uint8_t packet_bytes = extra_bytes + sizeof(PacketHeader) + sizeof(uint32_t);
+
+    size_t buffer_head = m_buffer_head;
+    size_t buffer_tail = m_buffer_tail;
+
+    size_t capacity;
+    size_t offset;
+
+    if (slots_used == 0){
+        //  We're empty. Rewind both to zero.
+        capacity = PABB2_PacketSender_BUFFER_SIZE;
+        offset = 0;
+        buffer_tail = 0;
+        m_buffer_head = 0;
+        m_buffer_tail = 0;
+        m_buffer_tail_uncommitted = 0;
+    }else{
+        offset = buffer_tail;
+
+        if (buffer_head >= buffer_tail){
+            capacity = buffer_head - buffer_tail;
+        }else{
+            capacity = PABB2_PacketSender_BUFFER_SIZE - buffer_tail;
+            if (capacity < packet_bytes){
+                offset = 0;
+                capacity = buffer_head;
+                buffer_tail = 0;
+            }
+        }
+    }
+
+    //  There is no contiguous space large enough.
+    if (capacity < packet_bytes){
+        return NULL;
+    }
+
+    buffer_tail += packet_bytes;
+    if (buffer_tail == PABB2_PacketSender_BUFFER_SIZE){
+        buffer_tail = 0;
+    }
+    m_buffer_tail = buffer_tail;
+
+    m_offsets[m_slot_tail & SLOT_MASK] = offset;
+
+    PacketHeader* ret = (PacketHeader*)(m_buffer + offset);
+
+    ret->magic_number = PABB2_CONNECTION_MAGIC_NUMBER;
+    ret->seqnum = m_slot_tail++;
+    ret->packet_bytes = packet_bytes;
+    ret->opcode = opcode;
+    m_slot_tail_uncommitted = m_slot_tail;
+
+    return ret;
+}
+void PacketSender::commit_packet(PacketHeader* packet) noexcept{
+    pabb_crc32c_write_to_message(m_session_id, packet, packet->packet_bytes);
+
+    m_connection.unreliable_send(packet, packet->packet_bytes);
+
+    //  In order to save memory, we repurpose the magic number as a timer to
+    //  track when it should be retransmitted. However, it will be set back to
+    //  the magic number when sent.
+    packet->magic_number = m_retransmit_seqnum;
+}
+
+
+
+bool PacketSender::iterate_retransmits() noexcept{
+    uint8_t head = m_slot_head;
+    uint8_t tail = m_slot_tail;
+
+    //  Queue is empty.
+    if (head == tail){
+        return false;
+    }
+
+    uint8_t seqnum = m_retransmit_seqnum;
+
+    while (head != tail){
+        size_t offset = m_offsets[head & SLOT_MASK];
+        PacketHeader* packet = (PacketHeader*)(m_buffer + offset);
+
+        //  Already acked.
+        if (packet->opcode == PABB2_CONNECTION_OPCODE_INVALID){
+#if 0
+            printf("Already Acked\n");
+            fflush(stdout);
+#endif
+            head++;
+            continue;
+        }
+
+        //  Not old enough.
+        if ((uint8_t)(seqnum - packet->magic_number) < PABB2_PacketSender_RETRANSMIT_COUNTER){
+#if 0
+            printf("Not old enough: seqnum = %d, packet = %d\n", seqnum, packet->magic_number);
+            fflush(stdout);
+#endif
+            head++;
+            continue;
+        }
+
+        packet->opcode |= PABB2_CONNECTION_RETRANSMIT_FLAG;
+        packet->magic_number = PABB2_CONNECTION_MAGIC_NUMBER;
+        uint8_t packet_bytes = packet->packet_bytes;
+        pabb_crc32c_write_to_message(m_session_id, packet, packet_bytes);
+
+#if 0
+        printf("Retransmitting: %u\n", packet->seqnum);
+        fflush(stdout);
+#endif
+
+        m_connection.unreliable_send(
+            packet,
+            packet_bytes == 0
+                ? (size_t)256
+                : (size_t)packet_bytes
+        );
+        packet->magic_number = seqnum;
+        return true;
+    }
+
+    //  Increment counter only if we did nothing.
+    m_retransmit_seqnum = seqnum + 1;
+
+    return false;
+}
+
+
+
+
+
+bool PacketSender::enqueue_uncommitted_send_stream(const void* data, size_t bytes) noexcept{
+    if (m_stream_corrupted){
+        return false;
+    }
+
+    //  256 is explicitly supported and is expressed as 0.
+    size_t max_packet_size = m_max_packet_size == 0
+        ? 256
+        : m_max_packet_size;
+
+    while (bytes > 0){
+        //  No slots available.
+        uint8_t slots_used = m_slot_tail_uncommitted - m_slot_head;
+        if (slots_used == REORDER_WINDOW){
+            break;
+        }
+
+        const size_t OVERHEAD = sizeof(PacketHeaderData) + sizeof(uint32_t);
+
+
+        size_t capacity;
+        size_t offset;
+
+        if (slots_used == 0){
+//            printf("slots used: %u\n", slots_used);
+            //  We're empty. Rewind both to zero.
+            capacity = PABB2_PacketSender_BUFFER_SIZE;
+            offset = 0;
+            m_buffer_tail_uncommitted = 0;
+        }else{
+            offset = m_buffer_tail_uncommitted;
+
+            if (m_buffer_head >= m_buffer_tail_uncommitted){
+                capacity = m_buffer_head - m_buffer_tail_uncommitted;
+            }else{
+                capacity = PABB2_PacketSender_BUFFER_SIZE - m_buffer_tail_uncommitted;
+                if (capacity <= OVERHEAD){
+                    offset = 0;
+                    capacity = m_buffer_head;
+                    m_buffer_tail_uncommitted = 0;
+                }
+            }
+        }
+
+        //  There is no contiguous space large enough.
+        if (capacity <= OVERHEAD){
+            break;
+        }
+
+        if (capacity > max_packet_size){
+            capacity = max_packet_size;
+        }
+
+        size_t current = bytes;
+        if (current > capacity - OVERHEAD){
+            current = capacity - OVERHEAD;
+        }
+
+        size_t packet_bytes = current + OVERHEAD;
+
+//        printf("buffer_tail: %zu, packet_bytes: %zu\n", buffer_tail, packet_bytes);
+
+        m_buffer_tail_uncommitted += packet_bytes;
+        if (m_buffer_tail_uncommitted == PABB2_PacketSender_BUFFER_SIZE){
+            m_buffer_tail_uncommitted = 0;
+        }
+//        printf("self->buffer_tail: %zu\n", self->buffer_tail);
+
+        m_offsets[m_slot_tail_uncommitted & SLOT_MASK] = offset;
+
+        //  Build the packet header.
+        PacketHeaderData* packet = (PacketHeaderData*)(m_buffer + offset);
+        packet->magic_number = PABB2_CONNECTION_MAGIC_NUMBER;
+        packet->seqnum = m_slot_tail_uncommitted++;
+        packet->packet_bytes = (uint8_t)packet_bytes;  //  256 overflows to 0
+        packet->opcode = PABB2_CONNECTION_OPCODE_ASK_STREAM_DATA;
+        memcpy(&packet->stream_offset, &m_stream_offset_uncommitted, sizeof(uint16_t));   //  May be misaligned.
+
+        //  Copy stream data.
+        memcpy(packet + 1, data, current);
+        m_stream_offset_uncommitted += (uint16_t)current;
+
+        //  Build CRC
+        pabb_crc32c_write_to_message(m_session_id, packet, packet_bytes);
+
+        data = (const char*)data + current;
+        bytes -= current;
+    }
+
+    if (bytes == 0){
+        return true;
+    }
+    abort_uncommitted_send_stream();
+    return false;
+}
+void PacketSender::abort_uncommitted_send_stream() noexcept{
+    m_slot_tail_uncommitted = m_slot_tail;
+    m_buffer_tail_uncommitted = m_buffer_tail;
+    m_stream_offset_uncommitted = m_stream_offset;
+}
+void PacketSender::commit_uncommitted_send_stream() noexcept{
+    //  Able to send. Commit the sends.
+    m_buffer_tail = m_buffer_tail_uncommitted;
+    m_stream_offset = m_stream_offset_uncommitted;
+
+    while (m_slot_tail != m_slot_tail_uncommitted){
+        size_t offset = m_offsets[m_slot_tail++ & SLOT_MASK];
+        PacketHeader* packet = (PacketHeader*)(m_buffer + offset);
+
+        //  Send
+//        cout << "Send: " << (unsigned)packet->seqnum << ", Bytes: " << (unsigned)packet->packet_bytes << endl;
+        m_connection.unreliable_send(
+            packet,
+            packet->packet_bytes == 0 ? 256 : packet->packet_bytes
+        );
+
+        //  Set the retransmit timer.
+        packet->magic_number = m_retransmit_seqnum;
+    }
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}
+}
diff --git a/Common/PABotBase2/ReliableConnectionLayer/PABotBase2_PacketSender.h b/Common/PABotBase2/ReliableConnectionLayer/PABotBase2_PacketSender.h
new file mode 100644
index 0000000000..4bfb5260f5
--- /dev/null
+++ b/Common/PABotBase2/ReliableConnectionLayer/PABotBase2_PacketSender.h
@@ -0,0 +1,218 @@
+/*  PABotBase2 Packet Sender
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PABotBase2_ReliableConnectionLayer_PacketSender_H
+#define PokemonAutomation_PABotBase2_ReliableConnectionLayer_PacketSender_H
+
+#include "Common/Cpp/StreamConnections/StreamInterface.h"
+#include "PABotBase2_PacketProtocol.h"
+
+#ifdef PABB2_SIZING_OVERRIDE
+#include "PABotBase2_Config.h"
+#else
+
+//  Must be power-of-two. (max 128)
+#ifndef PABB2_PacketSender_SLOT_CAPACITY
+#define PABB2_PacketSender_SLOT_CAPACITY        128
+#endif
+
+//  Must fit into size_t.
+#ifndef PABB2_PacketSender_BUFFER_SIZE
+#define PABB2_PacketSender_BUFFER_SIZE          16384
+#endif
+
+#ifndef PABB2_PacketSender_RETRANSMIT_COUNTER
+#define PABB2_PacketSender_RETRANSMIT_COUNTER   2
+#endif
+
+#endif
+
+
+#ifndef PABB2_PacketSender_REORDER_WINDOW
+#define PABB2_PacketSender_REORDER_WINDOW       PABB2_PacketSender_SLOT_CAPACITY
+#endif
+
+
+namespace PokemonAutomation{
+namespace PABotBase2{
+
+
+
+
+class PacketSender{
+    static constexpr uint8_t REORDER_WINDOW = PABB2_PacketSender_REORDER_WINDOW;
+    static constexpr uint8_t SLOT_CAPACITY = PABB2_PacketSender_SLOT_CAPACITY;
+    static constexpr uint8_t SLOT_MASK = SLOT_CAPACITY - 1;
+    static_assert((SLOT_CAPACITY & SLOT_MASK) == 0, "Must be power-of-two.");
+    static_assert(REORDER_WINDOW <= SLOT_CAPACITY, "Reorder window cannot be larger than capacity.");
+
+public:
+    PacketSender(
+        UnreliableStreamSender& connection,
+        uint8_t max_packet_size
+    );
+    PacketSender(
+        UnreliableStreamSender& connection,
+        uint8_t max_packet_size,
+        SessionId session_id
+    );
+    void reset(const SessionId& session_id);
+
+    void set_max_packet_size(uint8_t max_packet_size){
+        m_max_packet_size = max_packet_size;
+    }
+
+    const SessionId& session_id() const{
+        return m_session_id;
+    }
+    uint8_t slots_used() const{
+        return m_slot_tail - m_slot_head;
+    }
+
+    void print(bool ascii) const;
+
+
+public:
+    //
+    //  Out-of-band messages that bypass the queue and go out as-is.
+    //  These may be dropped.
+    //
+    void send_oob_packet_empty(uint8_t seqnum, uint8_t opcode) noexcept;
+    void send_oob_packet_u32(uint8_t seqnum, uint8_t opcode, const uint32_t& data) noexcept;
+    void send_oob_packet_data(
+        uint8_t seqnum, uint8_t opcode,
+        uint8_t bytes, const void* data
+    ) noexcept;
+    void send_oob_packet_u32_data(
+        uint8_t seqnum, uint8_t opcode,
+        const uint32_t& u32,
+        uint8_t bytes, const void* data
+    ) noexcept;
+
+
+public:
+    void declare_stream_corrupted(){
+        m_stream_corrupted = true;
+    }
+
+    //  Remove the packet corresponding to the specified seqnum from the queue.
+    //  Returns true is successful, false if seqnum is not in the queue.
+    bool remove(uint8_t seqnum) noexcept;
+
+    void send_reset() noexcept;
+
+    //
+    //  Send a packet with the specified opcode and extra data after the header.
+    //  Returns true if successful. (enters the queue)
+    //
+    bool send_packet(uint8_t opcode, uint8_t extra_bytes, const void* extra_data) noexcept;
+
+    //
+    //  Send a single packet in two parts:
+    //      1.  Reserve a buffer to fill with the packet.
+    //      2.  Commit the packet to the queue.
+    //
+    //  On success, "reserve()" will return a pointer to the packet to be filled.
+    //  All fields of the packet header are already filled and should not be
+    //  modified by the user. The user should only populate the bytes that follow
+    //  the header.
+    //
+    //  On fail, reserve will return a null pointer. No changes are made to the
+    //  queue on failure. Failures will happen if there is insufficient space in
+    //  the queue.
+    //
+    //  "commit()" will add the packet to the queue. It will add the CRC checksum
+    //  so you don't need to do it yourself.
+    //
+    //  If "reserve()" succeeds, it must be followed by "commit()" before any other
+    //  function can be called on this queue. It is undefined behavior to separate
+    //  "reserve()" and "commit()" with another function on the same queue.
+    //
+    PacketHeader* reserve_packet(uint8_t opcode, uint8_t extra_bytes) noexcept;
+    void commit_packet(PacketHeader* packet) noexcept;
+
+
+    //  Returns true if something was retransmitted.
+    bool iterate_retransmits() noexcept;
+
+
+public:
+    //
+    //  All-or-nothing (Atomic) Stream Sends
+    //
+    //  This lets you push a bunch of data into the stream from different
+    //  sources. Then you can atomic commit them such that they either all or
+    //  nothing goes in.
+    //
+    //  This lets you incrementally construct a large message and not worry
+    //  about it being half-sent if the sender runs out of space.
+    //
+
+    bool enqueue_uncommitted_send_stream(const void* data, size_t bytes) noexcept;
+    void abort_uncommitted_send_stream() noexcept;
+    void commit_uncommitted_send_stream() noexcept;
+
+    //
+    //  Send the specified data on the data stream.
+    //  Returns true if success.
+    //
+    bool send_stream_all_or_nothing(const void* data, size_t bytes) noexcept{
+        if (!enqueue_uncommitted_send_stream(data, bytes)){
+            return false;
+        }
+        commit_uncommitted_send_stream();
+        return true;
+    }
+
+
+private:
+    UnreliableStreamSender& m_connection;
+
+    SessionId m_session_id;
+
+    uint8_t m_max_packet_size;  //  0 = 256 bytes
+
+    uint8_t m_slot_head;
+    uint8_t m_slot_tail;
+    uint8_t m_slot_tail_uncommitted;
+
+    //  A timer that increments each time "pabb2_PacketSender_iterate_retransmits()"
+    //  is called and nothing is re-transmitted.
+    uint8_t m_retransmit_seqnum;
+
+    bool m_stream_corrupted;
+
+    //  If non-zero, it indicates we are in the middle of sending stream bytes.
+    //  The current packet must be finished before sending anything else.
+//    uint8_t m_pending_stream;
+
+    uint16_t m_stream_offset;
+    uint16_t m_stream_offset_uncommitted;
+
+    //  (buffer_head == buffer_tail) is ambiguous between empty and full.
+    //  However, queue empty also has (slot_head == slot_tail).
+    size_t m_buffer_head;
+    size_t m_buffer_tail;
+    size_t m_buffer_tail_uncommitted;
+
+    //  These store the offsets within the buffer where the packet starts.
+    size_t m_offsets[SLOT_CAPACITY];
+
+    uint8_t m_buffer[PABB2_PacketSender_BUFFER_SIZE];
+};
+
+
+
+
+
+
+
+
+
+
+}
+}
+#endif
diff --git a/Common/PABotBase2/ReliableConnectionLayer/PABotBase2_StreamCoalescer.cpp b/Common/PABotBase2/ReliableConnectionLayer/PABotBase2_StreamCoalescer.cpp
new file mode 100644
index 0000000000..5975a3af97
--- /dev/null
+++ b/Common/PABotBase2/ReliableConnectionLayer/PABotBase2_StreamCoalescer.cpp
@@ -0,0 +1,259 @@
+/*  PABotBase2 Stream Coalescer
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <string.h>
+#include "PABotBase2_StreamCoalescer.h"
+
+//#include <stdio.h>
+//#include "PABotBase2_ConnectionDebug.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+#ifdef __GNUC__
+#pragma GCC diagnostic ignored "-Wtype-limits"
+#endif
+#ifdef __clang__
+#pragma GCC diagnostic ignored "-Wtautological-constant-out-of-range-compare"
+#endif
+
+namespace PokemonAutomation{
+namespace PABotBase2{
+
+
+
+void StreamCoalescer::reset(){
+    m_slot_head = 0;
+    m_slot_tail = 0;
+    m_stream_free = 0;
+    m_stream_head = 0;
+    m_stream_tail = 0;
+    memset(m_lengths, 0, sizeof(m_lengths));
+}
+
+
+void StreamCoalescer::write_buffer(
+    const void* data,
+    uint16_t stream_offset, uint8_t bytes
+){
+    if (bytes == 0){
+        return;
+    }
+
+    uint16_t stream_offset_s = stream_offset;
+    uint16_t stream_offset_e = stream_offset + bytes;
+
+    stream_offset_s &= BUFFER_MASK;
+    stream_offset_e &= BUFFER_MASK;
+
+    if (stream_offset_s < stream_offset_e){
+        memcpy(m_buffer + stream_offset_s, data, bytes);
+    }else{
+        //  Wrap around
+        uint8_t block = (uint8_t)(BUFFER_SIZE - stream_offset_s);
+        memcpy(m_buffer + stream_offset_s, data, block);
+        memcpy(m_buffer, (const uint8_t*)data + block, bytes - block);
+    }
+}
+void StreamCoalescer::read_buffer(
+    void* data,
+    uint16_t stream_offset, uint16_t bytes
+) const{
+    if (bytes == 0){
+        return;
+    }
+
+    uint16_t stream_offset_s = stream_offset;
+    uint16_t stream_offset_e = stream_offset + bytes;
+
+    stream_offset_s &= BUFFER_MASK;
+    stream_offset_e &= BUFFER_MASK;
+
+    if (stream_offset_s < stream_offset_e){
+        memcpy(data, m_buffer + stream_offset_s, bytes);
+    }else{
+        //  Wrap around
+        uint16_t block = BUFFER_SIZE - stream_offset_s;
+        memcpy(data, m_buffer + stream_offset_s, block);
+        memcpy((uint8_t*)data + block, m_buffer, bytes - block);
+    }
+}
+void StreamCoalescer::advance_slot_head(){
+//    printf("pabb2_StreamCoalescer_pop_leading_finished()\n");
+
+    while (m_slot_head != m_slot_tail){
+        uint8_t index = m_slot_head & SLOT_MASK;
+//        printf("slot[%d] = %d\n", slot_head, *slot);
+
+        //  Slot is a hole. Cannot continue.
+        if (m_lengths[index] == 0){
+            break;
+        }
+
+        //  Update offset only if it's a stream packet.
+        if (m_lengths[index] != 0xff){
+            m_stream_head = m_end_offsets[index];
+        }
+
+        m_lengths[index] = 0;
+
+        m_slot_head++;
+    }
+}
+
+
+uint16_t StreamCoalescer::free_bytes() const{
+    if (m_stream_tail == m_stream_free){
+        //  Empty buffer. The stream pointers are monotonic 16-bit offsets
+        //  and the in-buffer extent is bounded to BUFFER_SIZE (< 2^16), so
+        //  the tail can only coincide with the free pointer when no data is
+        //  in the buffer. (A full buffer keeps the tail one BUFFER_SIZE
+        //  ahead, and the formula below correctly reports 0 there.)
+        //  Slots are popped as soon as their data is in the buffer, so the
+        //  absence of pending slots does NOT mean the buffer is empty.
+        return BUFFER_SIZE;
+    }
+    return (m_stream_free - m_stream_tail) & BUFFER_MASK;
+}
+
+void StreamCoalescer::push_packet(uint8_t seqnum){
+    uint8_t slot_head = m_slot_head;
+
+//    printf("enter ---------------------\n");
+//    pabb2_StreamCoalescer_print(self, false);
+
+//    printf("pabb2_StreamCoalescer_push_packet(%p): seqnum = %d, slot_head = %d\n", self, seqnum, slot_head);
+
+    //  Either before (old retransmit) or too far in future.
+    if ((uint8_t)(seqnum - slot_head) >= REORDER_WINDOW){
+//        printf("Device: Packet is out of range.\n");
+        return;
+    }
+
+    //  Extend the tail if needed.
+    uint8_t slot_tail = m_slot_tail;
+    if ((uint8_t)(seqnum - slot_tail) < REORDER_WINDOW){
+        slot_tail = seqnum + 1;
+        m_slot_tail = slot_tail;
+    }
+
+    //  Mark slot as done.
+    uint8_t index = seqnum & SLOT_MASK;
+    m_lengths[index] = 0xff;
+
+    //  Pop all finished slots at the head of the queue.
+    advance_slot_head();
+
+
+//    printf("exit ---------------------\n");
+//    pabb2_StreamCoalescer_print(self, false);
+}
+
+bool StreamCoalescer::push_stream(const PacketHeaderData* packet){
+    advance_slot_head();
+
+    uint8_t stream_size = packet->packet_bytes - sizeof(PacketHeaderData) - sizeof(uint32_t);
+
+    //  Zero does not fall through cleanly. So handle it here.
+    if (stream_size == 0){
+//        printf("Device: stream_size == 0\n");
+        push_packet(packet->seqnum);
+        return true;
+    }
+
+    //  Data is larger than the entire buffer.
+    if (stream_size > BUFFER_SIZE){
+//        printf("Device: stream_size > BUFFER_SIZE\n");
+        return false;
+    }
+
+    uint8_t seqnum = packet->seqnum;
+
+//    {
+//        std::lock_guard<std::mutex> lg(print_lock);
+//        cout << (int)packet->seqnum << " : " << packet->stream_offset << endl;
+//    }
+
+    //  Either before (old retransmit) or too far in future.
+    {
+        uint8_t diff = seqnum - m_slot_head;
+//        printf("seqnum = %d, slot_head = %d\n", seqnum, slot_head);
+        if (diff >= REORDER_WINDOW){
+//            printf("seqnum = %d, slot_head = %d\n", seqnum, slot_head);
+//            printf("Device: In the past or too far ahead.\n");
+            //  Negative means we're in the past and we can just ack.
+            return diff & 0x80;
+        }
+    }
+
+    uint16_t stream_offset_s = packet->stream_offset;
+    uint16_t stream_offset_e = stream_offset_s + stream_size;
+
+    //  Too far ahead that it's beyond our window.
+    if ((uint16_t)(stream_offset_e - m_stream_free) > BUFFER_SIZE){
+//        printf("Device: To far in future.\n");
+        return false;
+    }
+
+    //  Extend the tail if needed.
+    uint8_t slot_tail = m_slot_tail;
+    if ((uint8_t)(seqnum - slot_tail) < REORDER_WINDOW){
+        slot_tail = seqnum + 1;
+        m_slot_tail = slot_tail;
+    }
+    uint16_t stream_tail = m_stream_tail;
+    if ((uint16_t)(stream_offset_e - stream_tail) < BUFFER_SIZE){
+        stream_tail = stream_offset_e;
+        m_stream_tail = stream_tail;
+    }
+
+    uint8_t index = seqnum & SLOT_MASK;
+    m_lengths[index] = stream_size;
+    m_end_offsets[index] = stream_offset_e;
+
+//    cout << "index = " << (int)index << ", stream_offset_s = " << stream_offset_s << ", bytes = " << (int)stream_size << endl;
+    write_buffer(packet + 1, stream_offset_s, stream_size);
+
+    return true;
+}
+
+size_t StreamCoalescer::read(void* data, size_t max_bytes){
+    advance_slot_head();
+
+    uint16_t read = m_stream_head - m_stream_free;
+//    if (read > 0){
+//        printf("read = %d, head = %d, free = %d\n", read, m_stream_head, m_stream_free);
+//    }
+    if (read > max_bytes){
+        read = (uint16_t)max_bytes;
+    }
+    if (data != nullptr){
+        read_buffer(data, m_stream_free, read);
+    }
+    m_stream_free += read;
+
+    return read;
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}
+}
diff --git a/Common/PABotBase2/ReliableConnectionLayer/PABotBase2_StreamCoalescer.h b/Common/PABotBase2/ReliableConnectionLayer/PABotBase2_StreamCoalescer.h
new file mode 100644
index 0000000000..68b50f5cfb
--- /dev/null
+++ b/Common/PABotBase2/ReliableConnectionLayer/PABotBase2_StreamCoalescer.h
@@ -0,0 +1,131 @@
+/*  PABotBase2 Stream Coalescer
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PABotBase2_ReliableConnectionLayer_StreamCoalescer_H
+#define PokemonAutomation_PABotBase2_ReliableConnectionLayer_StreamCoalescer_H
+
+#include "PABotBase2_PacketProtocol.h"
+
+#ifdef PABB2_SIZING_OVERRIDE
+#include "PABotBase2_Config.h"
+#else
+
+//  Must be power-of-two. (max 128)
+#ifndef PABB2_StreamCoalescer_SLOT_CAPACITY
+#define PABB2_StreamCoalescer_SLOT_CAPACITY      128
+#endif
+
+//  Must be power-of-two, fits into uint16_t. (max 32768)
+#ifndef PABB2_StreamCoalescer_BUFFER_SIZE
+#define PABB2_StreamCoalescer_BUFFER_SIZE   16384
+#endif
+
+#endif
+
+
+#ifndef PABB2_StreamCoalescer_REORDER_WINDOW
+#define PABB2_StreamCoalescer_REORDER_WINDOW     PABB2_StreamCoalescer_SLOT_CAPACITY
+#endif
+
+
+namespace PokemonAutomation{
+namespace PABotBase2{
+
+
+
+class StreamCoalescer{
+    static constexpr uint8_t REORDER_WINDOW = PABB2_StreamCoalescer_REORDER_WINDOW;
+    static constexpr uint8_t SLOT_CAPACITY = PABB2_StreamCoalescer_SLOT_CAPACITY;
+    static constexpr uint8_t SLOT_MASK = SLOT_CAPACITY - 1;
+    static constexpr uint16_t BUFFER_SIZE = PABB2_StreamCoalescer_BUFFER_SIZE;
+    static constexpr uint16_t BUFFER_MASK = BUFFER_SIZE - 1;
+    static_assert((SLOT_CAPACITY & SLOT_MASK) == 0, "Must be power-of-two.");
+    static_assert((BUFFER_SIZE & BUFFER_MASK) == 0, "Must be power-of-two.");
+    static_assert(REORDER_WINDOW <= SLOT_CAPACITY, "Reorder window cannot be larger than capacity.");
+
+
+public:
+    StreamCoalescer(){
+        reset();
+    }
+    void reset();
+
+    void print(bool ascii) const;
+
+
+public:
+    uint16_t free_bytes() const;
+
+    void push_packet(uint8_t seqnum);
+
+    //  Returns true if the packet has been received and can be acked.
+    bool push_stream(const PacketHeaderData* packet);
+
+    //
+    //  Read data from the stream.
+    //
+    //  Returns the # of bytes actually read.
+    //  Returning less than "max_bytes" indicates the stream is out of usable data.
+    //
+    size_t read(void* data, size_t max_bytes);
+
+
+private:
+    void write_buffer(
+        const void* data,
+        uint16_t stream_offset, uint8_t bytes
+    );
+    void read_buffer(
+        void* data, //  Null means throw away the output.
+        uint16_t stream_offset, uint16_t bytes
+    ) const;
+    void advance_slot_head();
+
+
+public:
+    //
+    //  "tail" furthest into the future and marks where the next write should be.
+    //
+    //  "head" is the oldest hole in the coalescer. It may temporarily not be
+    //  a hole, it just means it hasn't been advanced forward yet.
+    //
+    //  "free" is the oldest offset in the coalescer. Reads start here. It is
+    //  named "free" because everything below this is empty and can be reused
+    //  for new data.
+    //
+    //  Everything in the range [free, head) is valid data that hasn't been
+    //  read yet.
+    //
+    uint8_t m_slot_head;
+    uint8_t m_slot_tail;
+
+    uint16_t m_stream_free;
+    uint16_t m_stream_head;
+    uint16_t m_stream_tail;
+
+    //  0       =   Not received yet.
+    //  0-254   =   Received stream packet. # is the size.
+    //  255     =   Received non-stream packet.
+    uint8_t m_lengths[SLOT_CAPACITY];
+
+    //  0xffff = non-stream packet
+    uint16_t m_end_offsets[SLOT_CAPACITY];
+
+    uint8_t m_buffer[BUFFER_SIZE];
+};
+
+
+
+
+
+
+
+
+
+
+}
+}
+#endif
diff --git a/Common/PokemonSwSh/PokemonProgramIDs.h b/Common/PokemonSwSh/PokemonProgramIDs.h
deleted file mode 100644
index 203ec1a62c..0000000000
--- a/Common/PokemonSwSh/PokemonProgramIDs.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/*  Program IDs for Serial Communication
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- */
-
-#ifndef PokemonAutomation_ProgramIDs_H
-#define PokemonAutomation_ProgramIDs_H
-
-
-#define PABB_PID_UNSPECIFIED                                0x00
-#define PABB_PID_PABOTBASE_12KB                             0x08
-#define PABB_PID_PABOTBASE_31KB                             0x09
-
-
-
-#endif
diff --git a/Common/PokemonSwSh/PokemonSwSh_FossilTable.h b/Common/PokemonSwSh/PokemonSwSh_FossilTable.h
deleted file mode 100644
index 2b96a85323..0000000000
--- a/Common/PokemonSwSh/PokemonSwSh_FossilTable.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/*  Fossil Table
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_FossilTableOption_H
-#define PokemonAutomation_PokemonSwSh_FossilTableOption_H
-
-#include "Common/Cpp/Options/SimpleIntegerOption.h"
-#include "Common/Cpp/Options/EnumDropdownOption.h"
-#include "Common/Cpp/Options/EditableTableOption.h"
-#include "Common/NintendoSwitch/NintendoSwitch_SlotDatabase.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-enum class Fossil{
-    Dracozolt   =   0,
-    Arctozolt   =   1,
-    Dracovish   =   2,
-    Arctovish   =   3,
-};
-
-
-class FossilGame : public EditableTableRow{
-private:
-    static const EnumDatabase<Fossil>& Fossil_Database(){
-        static const EnumDatabase<Fossil> database({
-            {Fossil::Dracozolt, "dracozolt", "Dracozolt"},
-            {Fossil::Arctozolt, "arctozolt", "Arctozolt"},
-            {Fossil::Dracovish, "dracovish", "Dracovish"},
-            {Fossil::Arctovish, "arctovish", "Arctovish"},
-        });
-        return database;
-    }
-
-public:
-    FossilGame()
-        : game_slot(GameSlot_Database(), LockWhileRunning::LOCKED, 1)
-        , user_slot(UserSlot_Database(), LockWhileRunning::LOCKED, 1)
-        , fossil(Fossil_Database(), LockWhileRunning::LOCKED, Fossil::Dracovish)
-        , revives(LockWhileRunning::LOCKED, 960, 0, 965)
-    {
-        PA_ADD_OPTION(game_slot);
-        PA_ADD_OPTION(user_slot);
-        PA_ADD_OPTION(fossil);
-        PA_ADD_OPTION(revives);
-    }
-    FossilGame(uint8_t p_game_slot, uint8_t p_user_slot, Fossil p_fossil, uint16_t p_revives)
-        : FossilGame()
-    {
-        game_slot.set_value(p_game_slot);
-        user_slot.set_value(p_user_slot);
-        fossil.set(p_fossil);
-        revives.set(p_revives);
-    }
-    virtual std::unique_ptr<EditableTableRow> clone() const override{
-        std::unique_ptr<FossilGame> ret(new FossilGame());
-        ret->game_slot.set_value(game_slot.current_value());
-        ret->user_slot.set_value(user_slot.current_value());
-        ret->fossil.set(fossil);
-        ret->revives.set(revives);
-        return ret;
-    }
-
-public:
-    IntegerEnumDropdownCell game_slot;
-    IntegerEnumDropdownCell user_slot;
-    EnumDropdownCell<Fossil> fossil;
-    SimpleIntegerCell<uint16_t> revives;
-};
-
-
-class FossilTable : public EditableTableOption_t<FossilGame>{
-public:
-    FossilTable()
-        : EditableTableOption_t<FossilGame>(
-            "<b>Game List:</b>",
-            LockWhileRunning::LOCKED,
-            make_defaults()
-        )
-    {}
-    virtual std::vector<std::string> make_header() const override{
-        return std::vector<std::string>{
-            "Game",
-            "User",
-            "Fossil",
-            "Revives"
-        };
-    }
-
-    static std::vector<std::unique_ptr<EditableTableRow>> make_defaults(){
-        std::vector<std::unique_ptr<EditableTableRow>> ret;
-        ret.emplace_back(new FossilGame(1, 1, Fossil::Dracovish, 960));
-        return ret;
-    }
-};
-
-
-
-
-}
-}
-}
-#endif
diff --git a/Common/PokemonSwSh/PokemonSwSh_MultiHostTable.h b/Common/PokemonSwSh/PokemonSwSh_MultiHostTable.h
deleted file mode 100644
index 798c6c72a1..0000000000
--- a/Common/PokemonSwSh/PokemonSwSh_MultiHostTable.h
+++ /dev/null
@@ -1,139 +0,0 @@
-/*  Multi-Host Table
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_MultiHostTableOption_H
-#define PokemonAutomation_PokemonSwSh_MultiHostTableOption_H
-
-#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
-#include "Common/Cpp/Options/SimpleIntegerOption.h"
-#include "Common/Cpp/Options/TimeExpressionOption.h"
-#include "Common/Cpp/Options/EnumDropdownOption.h"
-#include "Common/Cpp/Options/EditableTableOption.h"
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-#include "Common/NintendoSwitch/NintendoSwitch_SlotDatabase.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-class MultiHostSlot : public EditableTableRow{
-public:
-    MultiHostSlot(bool raid_code_option)
-        : m_raid_code_option(raid_code_option)
-        , game_slot(GameSlot_Database(), LockWhileRunning::LOCKED, 1)
-        , user_slot(UserSlot_Database(), LockWhileRunning::LOCKED, 1)
-        , skips(LockWhileRunning::LOCKED, 3, 0, 7)
-        , backup_save(LockWhileRunning::LOCKED, false)
-        , always_catchable(LockWhileRunning::LOCKED, true)
-        , use_raid_code(LockWhileRunning::LOCKED, true)
-        , accept_FRs(LockWhileRunning::LOCKED, true)
-        , move_slot(LockWhileRunning::LOCKED, 0, 0, 4)
-        , dynamax(LockWhileRunning::LOCKED, true)
-        , post_raid_delay(LockWhileRunning::LOCKED, TICKS_PER_SECOND, "0 * TICKS_PER_SECOND")
-    {
-        PA_ADD_OPTION(game_slot);
-        PA_ADD_OPTION(user_slot);
-        PA_ADD_OPTION(skips);
-        PA_ADD_OPTION(backup_save);
-        PA_ADD_OPTION(always_catchable);
-        if (raid_code_option){
-            PA_ADD_OPTION(use_raid_code);
-        }
-        PA_ADD_OPTION(accept_FRs);
-        PA_ADD_OPTION(move_slot);
-        PA_ADD_OPTION(dynamax);
-        PA_ADD_OPTION(post_raid_delay);
-    }
-
-
-
-    virtual std::unique_ptr<EditableTableRow> clone() const override{
-        std::unique_ptr<MultiHostSlot> ret(new MultiHostSlot(m_raid_code_option));
-        ret->game_slot.set_value(game_slot.current_value());
-        ret->user_slot.set_value(user_slot.current_value());
-        ret->skips.set(skips);
-        ret->backup_save = (bool)backup_save;
-        ret->always_catchable = (bool)always_catchable;
-        ret->use_raid_code = (bool)use_raid_code;
-        ret->accept_FRs = (bool)accept_FRs;
-        ret->move_slot.set(move_slot);
-        ret->dynamax = (bool)dynamax;
-        ret->post_raid_delay.set(post_raid_delay.current_text());
-        return ret;
-    }
-
-private:
-    const bool m_raid_code_option;
-public:
-    IntegerEnumDropdownCell game_slot;
-    IntegerEnumDropdownCell user_slot;
-    SimpleIntegerCell<uint8_t> skips;
-    BooleanCheckBoxCell backup_save;
-    BooleanCheckBoxCell always_catchable;
-    BooleanCheckBoxCell use_raid_code;
-    BooleanCheckBoxCell accept_FRs;
-    SimpleIntegerCell<uint8_t> move_slot;
-    BooleanCheckBoxCell dynamax;
-    TimeExpressionCell<uint16_t> post_raid_delay;
-};
-
-
-
-class MultiHostTable : public EditableTableOption{
-public:
-    MultiHostTable(bool raid_code_option)
-        : EditableTableOption("<b>Game List:</b>", LockWhileRunning::LOCKED)
-        , m_raid_code_option(raid_code_option)
-    {}
-    std::vector<std::unique_ptr<MultiHostSlot>> copy_snapshot() const{
-        return EditableTableOption::copy_snapshot<MultiHostSlot>();
-    }
-    virtual std::vector<std::string> make_header() const override{
-        if (m_raid_code_option){
-            return std::vector<std::string>{
-                "Game",
-                "User",
-                "Skips",
-                "Backup Save",
-                "Always Catchable",
-                "Use Raid Code",
-                "Accept FRs",
-                "1st Move",
-                "Dynamax",
-                "Post Raid Delay",
-            };
-        }else{
-            return std::vector<std::string>{
-                "Game",
-                "User",
-                "Skips",
-                "Backup Save",
-                "Always Catchable",
-                "Accept FRs",
-                "1st Move",
-                "Dynamax",
-                "Post Raid Delay",
-            };
-        }
-    }
-    virtual std::unique_ptr<EditableTableRow> make_row() const override{
-        return std::unique_ptr<EditableTableRow>(new MultiHostSlot(m_raid_code_option));
-    }
-
-private:
-    bool m_raid_code_option;
-};
-
-
-
-
-
-
-}
-}
-}
-#endif
diff --git a/Common/PokemonSwSh/PokemonSwSh_Protocol_AutoHosts.h b/Common/PokemonSwSh/PokemonSwSh_Protocol_AutoHosts.h
deleted file mode 100644
index 30f97f39cf..0000000000
--- a/Common/PokemonSwSh/PokemonSwSh_Protocol_AutoHosts.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*  Auto Host Routines
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_Protocol_AutoHosts_H
-#define PokemonAutomation_PokemonSwSh_Protocol_AutoHosts_H
-
-#ifdef __AVR__
-#include "NativePrograms/NintendoSwitch/Framework/Master.h"
-#endif
-#include "Common/Microcontroller/MessageProtocol.h"
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-//  Message Protocols
-#if _WIN32
-#pragma pack(push, 1)
-#define PABB_PACK
-#else
-#define PABB_PACK   __attribute__((packed))
-#endif
-////////////////////////////////////////////////////////////////////////////////
-
-#define PABB_MSG_COMMAND_CONNECT_TO_INTERNET                    0xbb
-typedef struct{
-    seqnum_t seqnum;
-    uint16_t open_ycomm_delay;
-    uint16_t connect_to_internet_delay;
-} PABB_PACK pabb_connect_to_internet;
-
-#define PABB_MSG_COMMAND_HOME_TO_ADD_FRIENDS                    0xbc
-typedef struct{
-    seqnum_t seqnum;
-    uint8_t user_slot;
-    uint8_t scroll_down;
-    bool fix_cursor;
-} PABB_PACK pabb_home_to_add_friends;
-
-////////////////////////////////////////////////////////////////////////////////
-#if _WIN32
-#pragma pack(pop)
-#endif
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-#endif
-
diff --git a/Common/PokemonSwSh/PokemonSwSh_Protocol_DateSpam.h b/Common/PokemonSwSh/PokemonSwSh_Protocol_DateSpam.h
deleted file mode 100644
index e19a119144..0000000000
--- a/Common/PokemonSwSh/PokemonSwSh_Protocol_DateSpam.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*  Date Spamming Routines
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_Protocol_DateSpam_H
-#define PokemonAutomation_PokemonSwSh_Protocol_DateSpam_H
-
-#ifdef __AVR__
-#include "NativePrograms/NintendoSwitch/Framework/Master.h"
-#endif
-#include "Common/Microcontroller/MessageProtocol.h"
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-//  Protocols
-#if _WIN32
-#pragma pack(push, 1)
-#define PABB_PACK
-#else
-#define PABB_PACK   __attribute__((packed))
-#endif
-////////////////////////////////////////////////////////////////////////////////
-
-#define PABB_MSG_COMMAND_HOME_TO_DATE_TIME                      0xb4
-typedef struct{
-    seqnum_t seqnum;
-    bool to_date_change;
-    bool fast;
-} PABB_PACK pabb_home_to_date_time;
-
-#define PABB_MSG_COMMAND_NEUTRAL_DATE_SKIP                      0xb5
-typedef struct{
-    seqnum_t seqnum;
-} PABB_PACK pabb_neutral_date_skip;
-
-#define PABB_MSG_COMMAND_ROLL_DATE_FORWARD_1                    0xb6
-typedef struct{
-    seqnum_t seqnum;
-    bool fast;
-} PABB_PACK pabb_roll_date_forward_1;
-
-#define PABB_MSG_COMMAND_ROLL_DATE_BACKWARD_N                   0xb7
-typedef struct{
-    seqnum_t seqnum;
-    uint8_t skips;
-    bool fast;
-} PABB_PACK pabb_roll_date_backward_N;
-
-#define PABB_MSG_COMMAND_HOME_ROLL_DATE_ENTER_GAME              0xb8
-typedef struct{
-    seqnum_t seqnum;
-    bool rollback_year;
-} PABB_PACK pabb_home_roll_date_enter_game;
-
-#define PABB_MSG_COMMAND_TOUCH_DATE_FROM_HOME                   0xb9
-typedef struct{
-    seqnum_t seqnum;
-    uint16_t settings_to_home_delay;
-} PABB_PACK pabb_touch_date_from_home;
-
-#define PABB_MSG_COMMAND_ROLLBACK_HOURS_FROM_HOME               0xba
-typedef struct{
-    seqnum_t seqnum;
-    uint8_t hours;
-    uint16_t settings_to_home_delay;
-} PABB_PACK pabb_rollback_hours_from_home;
-
-////////////////////////////////////////////////////////////////////////////////
-#if _WIN32
-#pragma pack(pop)
-#endif
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-#endif
-
diff --git a/Common/PokemonSwSh/PokemonSwSh_Protocol_DaySkippers.h b/Common/PokemonSwSh/PokemonSwSh_Protocol_DaySkippers.h
deleted file mode 100644
index 3ea2abcd94..0000000000
--- a/Common/PokemonSwSh/PokemonSwSh_Protocol_DaySkippers.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*  Day Skippers
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- *      This file requires (PABB_PABOTBASE_LEVEL >= 31).
- * 
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_Protocol_DaySkippers_H
-#define PokemonAutomation_PokemonSwSh_Protocol_DaySkippers_H
-
-#ifdef __AVR__
-#include "NativePrograms/NintendoSwitch/Framework/Master.h"
-#endif
-#include "Common/Microcontroller/MessageProtocol.h"
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-//  Protocols
-#if _WIN32
-#pragma pack(push, 1)
-#define PABB_PACK
-#else
-#define PABB_PACK   __attribute__((packed))
-#endif
-////////////////////////////////////////////////////////////////////////////////
-
-#define PABB_MSG_COMMAND_SKIPPER_INIT_VIEW                      0xbd
-typedef struct{
-    seqnum_t seqnum;
-} PABB_PACK pabb_skipper_init_view;
-
-#define PABB_MSG_COMMAND_SKIPPER_AUTO_RECOVERY                  0xbe
-typedef struct{
-    seqnum_t seqnum;
-} PABB_PACK pabb_skipper_auto_recovery;
-
-#define PABB_MSG_COMMAND_SKIPPER_ROLLBACK_YEAR_FULL             0xbf
-typedef struct{
-    seqnum_t seqnum;
-    bool date_us;
-} PABB_PACK pabb_skipper_rollback_year_full;
-
-#define PABB_MSG_COMMAND_SKIPPER_ROLLBACK_YEAR_SYNC             0xc0
-typedef struct{
-    seqnum_t seqnum;
-} PABB_PACK pabb_skipper_rollback_year_sync;
-
-#define PABB_MSG_COMMAND_SKIPPER_INCREMENT_DAY                  0xc1
-typedef struct{
-    seqnum_t seqnum;
-    bool date_us;
-} PABB_PACK pabb_skipper_increment_day;
-
-#define PABB_MSG_COMMAND_SKIPPER_INCREMENT_MONTH                0xc2
-typedef struct{
-    seqnum_t seqnum;
-    uint8_t days;
-} PABB_PACK pabb_skipper_increment_month;
-
-#define PABB_MSG_COMMAND_SKIPPER_INCREMENT_ALL                  0xc3
-typedef struct{
-    seqnum_t seqnum;
-} PABB_PACK pabb_skipper_increment_all;
-
-#define PABB_MSG_COMMAND_SKIPPER_INCREMENT_ALL_ROLLBACK         0xc4
-typedef struct{
-    seqnum_t seqnum;
-} PABB_PACK pabb_skipper_increment_all_rollback;
-
-////////////////////////////////////////////////////////////////////////////////
-#if _WIN32
-#pragma pack(pop)
-#endif
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-#endif
-
diff --git a/Common/PokemonSwSh/PokemonSwSh_Protocol_EggRoutines.h b/Common/PokemonSwSh/PokemonSwSh_Protocol_EggRoutines.h
deleted file mode 100644
index f3db1073be..0000000000
--- a/Common/PokemonSwSh/PokemonSwSh_Protocol_EggRoutines.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*  Egg Routines
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- *      This file requires (PABB_PABOTBASE_LEVEL >= 31).
- * 
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_Protocol_EggRoutines_H
-#define PokemonAutomation_PokemonSwSh_Protocol_EggRoutines_H
-
-#ifdef __AVR__
-#include "NativePrograms/NintendoSwitch/Framework/Master.h"
-#endif
-#include "Common/Microcontroller/MessageProtocol.h"
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-
-#define TRAVEL_TO_SPIN_SPOT_DURATION    (300)
-#define TRAVEL_BACK_TO_LADY_DURATION    (30 + 260 + (620) + 120 + 120 * 0)
-
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-//  Protocols
-#if _WIN32
-#pragma pack(push, 1)
-#define PABB_PACK
-#else
-#define PABB_PACK   __attribute__((packed))
-#endif
-////////////////////////////////////////////////////////////////////////////////
-
-#define PABB_MSG_COMMAND_EGG_FETCHER_LOOP                       0xc5
-typedef struct{
-    seqnum_t seqnum;
-} PABB_PACK pabb_eggfetcher_loop;
-
-#define PABB_MSG_COMMAND_MOVE_WHILE_MASHING_B                   0xc6
-typedef struct{
-    seqnum_t seqnum;
-    uint16_t duration;
-} PABB_PACK pabb_move_while_mashing_B;
-
-#define PABB_MSG_COMMAND_SPIN_AND_MASH_A                        0xc7
-typedef struct{
-    seqnum_t seqnum;
-    uint16_t duration;
-} PABB_PACK pabb_spin_and_mash_A;
-
-#define PABB_MSG_COMMAND_TRAVEL_TO_SPIN_LOCATION                0xc8
-typedef struct{
-    seqnum_t seqnum;
-} PABB_PACK pabb_travel_to_spin_location;
-
-#define PABB_MSG_COMMAND_TRAVEL_BACK_TO_LADY                    0xc9
-typedef struct{
-    seqnum_t seqnum;
-} PABB_PACK pabb_travel_back_to_lady;
-
-////////////////////////////////////////////////////////////////////////////////
-#if _WIN32
-#pragma pack(pop)
-#endif
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-#endif
-
diff --git a/Common/PokemonSwSh/PokemonSwSh_Protocol_GameEntry.h b/Common/PokemonSwSh/PokemonSwSh_Protocol_GameEntry.h
deleted file mode 100644
index 831b8daf65..0000000000
--- a/Common/PokemonSwSh/PokemonSwSh_Protocol_GameEntry.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*  Game Entry Routines
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_Protocol_GameEntry_H
-#define PokemonAutomation_PokemonSwSh_Protocol_GameEntry_H
-
-#ifdef __AVR__
-#include "NativePrograms/NintendoSwitch/Framework/Master.h"
-#endif
-#include "Common/Microcontroller/MessageProtocol.h"
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-//  Protocols
-#if _WIN32
-#pragma pack(push, 1)
-#define PABB_PACK
-#else
-#define PABB_PACK   __attribute__((packed))
-#endif
-////////////////////////////////////////////////////////////////////////////////
-
-#define PABB_MSG_COMMAND_SETTINGS_TO_ENTER_GAME_DEN_LOBBY       0xb0
-typedef struct{
-    seqnum_t seqnum;
-    bool tolerate_update_menu;
-    bool fast;
-    uint16_t enter_switch_pokemon_delay;
-    uint16_t exit_switch_pokemon_delay;
-} PABB_PACK pabb_settings_to_enter_game_den_lobby;
-
-#define PABB_MSG_COMMAND_ENTER_GAME                             0xb1
-typedef struct{
-    seqnum_t seqnum;
-    bool backup_save;
-    uint16_t enter_game_mash;
-    uint16_t enter_game_wait;
-} PABB_PACK pabb_enter_game;
-
-#define PABB_MSG_COMMAND_FAST_RESET_GAME                        0xb3
-typedef struct{
-    seqnum_t seqnum;
-    uint16_t start_game_mash;
-    uint16_t start_game_wait;
-    uint16_t enter_game_mash;
-    uint16_t enter_game_wait;
-} PABB_PACK pabb_fast_reset_game;
-
-////////////////////////////////////////////////////////////////////////////////
-#if _WIN32
-#pragma pack(pop)
-#endif
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-#endif
-
diff --git a/Common/PokemonSwSh/PokemonSwSh_Protocol_Misc.h b/Common/PokemonSwSh/PokemonSwSh_Protocol_Misc.h
deleted file mode 100644
index 2f007910ed..0000000000
--- a/Common/PokemonSwSh/PokemonSwSh_Protocol_Misc.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*  Misc. Routines
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_Protocol_Misc_H
-#define PokemonAutomation_PokemonSwSh_Protocol_Misc_H
-
-#ifdef __AVR__
-#include "NativePrograms/NintendoSwitch/Framework/Master.h"
-#endif
-#include "Common/Microcontroller/MessageProtocol.h"
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-//  Protocols
-#if _WIN32
-#pragma pack(push, 1)
-#define PABB_PACK
-#else
-#define PABB_PACK   __attribute__((packed))
-#endif
-////////////////////////////////////////////////////////////////////////////////
-
-#define PABB_MSG_COMMAND_MASH_A                                 0xa0
-typedef struct{
-    seqnum_t seqnum;
-    uint16_t ticks;
-} PABB_PACK pabb_mashA;
-
-#define PABB_MSG_COMMAND_IOA_BACKOUT                            0xa2
-typedef struct{
-    seqnum_t seqnum;
-    uint16_t pokemon_to_menu_delay;
-} PABB_PACK pabb_IoA_backout;
-
-////////////////////////////////////////////////////////////////////////////////
-#if _WIN32
-#pragma pack(pop)
-#endif
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-#endif
-
diff --git a/Common/Qt/AutoHeightTable.cpp b/Common/Qt/AutoHeightTable.cpp
index 5698918124..184645bdf3 100644
--- a/Common/Qt/AutoHeightTable.cpp
+++ b/Common/Qt/AutoHeightTable.cpp
@@ -1,6 +1,6 @@
 /*  QTableWidth with auto-adjusting height.
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -16,7 +16,7 @@ void AutoHeightTableWidget::update_height(){
     int total_height = 5;
     total_height += this->horizontalHeader()->height();
     total_height += this->horizontalScrollBar()->height();
-    for (int c = 0; c < rows; c++) {
+    for (int c = 0; c < rows; c++){
         total_height += this->verticalHeader()->sectionSize(c);
     }
 //    cout << total_height << endl;
diff --git a/Common/Qt/AutoHeightTable.h b/Common/Qt/AutoHeightTable.h
index d4116ef22a..4027cc2f7b 100644
--- a/Common/Qt/AutoHeightTable.h
+++ b/Common/Qt/AutoHeightTable.h
@@ -1,6 +1,6 @@
 /*  QTableWidth with auto-adjusting height.
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/Common/Qt/AutoWidthLineEdit.cpp b/Common/Qt/AutoWidthLineEdit.cpp
index a4cf119c4b..71ec8ced0e 100644
--- a/Common/Qt/AutoWidthLineEdit.cpp
+++ b/Common/Qt/AutoWidthLineEdit.cpp
@@ -1,6 +1,6 @@
 /*  QLineEdit with auto-width sizing.
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/Common/Qt/AutoWidthLineEdit.h b/Common/Qt/AutoWidthLineEdit.h
index 1306d85383..6fb423c3fc 100644
--- a/Common/Qt/AutoWidthLineEdit.h
+++ b/Common/Qt/AutoWidthLineEdit.h
@@ -1,6 +1,6 @@
 /*  QLineEdit with auto-width sizing.
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/Common/Qt/CheckboxDropdown.h b/Common/Qt/CheckboxDropdown.h
new file mode 100644
index 0000000000..df4ca8956a
--- /dev/null
+++ b/Common/Qt/CheckboxDropdown.h
@@ -0,0 +1,105 @@
+/*  Command Row
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_CheckboxDropdown_H
+#define PokemonAutomation_CheckboxDropdown_H
+
+#include <QEvent>
+#include <QAbstractItemView>
+#include <QStandardItemModel>
+#include <QComboBox>
+
+namespace PokemonAutomation{
+
+class CheckboxDropdownItem : public QObject, public QStandardItem{
+    Q_OBJECT
+public:
+    using QStandardItem::QStandardItem;
+
+    void setChecked(bool checked){
+        if (checked){
+            this->setCheckState(Qt::Checked);
+        }else{
+            this->setCheckState(Qt::Unchecked);
+        }
+    }
+    bool checked() const{
+        return this->checkState() == Qt::Checked;
+    }
+
+signals:
+    void checkStateChanged(Qt::CheckState state);
+};
+
+
+
+
+class CheckboxDropdown : public QComboBox{
+    Q_OBJECT
+public:
+    CheckboxDropdown(QWidget* parent, const QString& label)
+        : QComboBox(parent)
+    {
+        m_model = new QStandardItemModel(this);
+        this->setModel(m_model);
+
+        QComboBox::addItem(label);
+
+        this->view()->viewport()->installEventFilter(this);
+    }
+
+    CheckboxDropdownItem* addItem(const QString& text, Qt::CheckState = Qt::Unchecked){
+        CheckboxDropdownItem* item = new CheckboxDropdownItem(text);
+        item->setCheckable(true);
+        item->setCheckState(Qt::Unchecked);
+        m_model->appendRow(item);
+        m_items.emplace_back(item);
+        return item;
+    }
+
+
+public:
+    size_t size() const{
+        return m_items.size();
+    }
+    CheckboxDropdownItem* operator[](size_t index) const{
+        return m_items[index];
+    }
+
+    void setLabel(const QString& label){
+        setItemText(0, label);
+    }
+
+    virtual void wheelEvent(QWheelEvent* event) override{
+        QWidget::wheelEvent(event);
+    }
+    virtual bool eventFilter(QObject* obj, QEvent* event) override{
+//        cout << "eventFilter()" << endl;
+        if (event->type() != QEvent::MouseButtonRelease){
+            return QComboBox::eventFilter(obj, event);
+        }
+        int index = view()->currentIndex().row();
+        if (index <= 0){
+            return QComboBox::eventFilter(obj, event);
+        }
+        if (itemData(index, Qt::CheckStateRole) == Qt::Checked){
+            setItemData(index, Qt::Unchecked, Qt::CheckStateRole);
+            emit m_items[index - 1]->checkStateChanged(Qt::Unchecked);
+        }else{
+            setItemData(index, Qt::Checked, Qt::CheckStateRole);
+            emit m_items[index - 1]->checkStateChanged(Qt::Checked);
+        }
+        return true;
+    }
+
+private:
+    QStandardItemModel* m_model;
+    std::vector<CheckboxDropdownItem*> m_items;
+};
+
+
+}
+#endif
diff --git a/Common/Qt/CodeValidator.cpp b/Common/Qt/CodeValidator.cpp
index 5514e6f106..1cc9b5bf0f 100644
--- a/Common/Qt/CodeValidator.cpp
+++ b/Common/Qt/CodeValidator.cpp
@@ -1,6 +1,6 @@
 /*  Raid/Trade Code Validator
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/Common/Qt/CodeValidator.h b/Common/Qt/CodeValidator.h
index 0110da8d93..4fe73b3c58 100644
--- a/Common/Qt/CodeValidator.h
+++ b/Common/Qt/CodeValidator.h
@@ -1,6 +1,6 @@
 /*  Raid/Trade Code Validator
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/Common/Qt/CollapsibleGroupBox.cpp b/Common/Qt/CollapsibleGroupBox.cpp
index cc955d6cb9..8f718b48cc 100644
--- a/Common/Qt/CollapsibleGroupBox.cpp
+++ b/Common/Qt/CollapsibleGroupBox.cpp
@@ -1,98 +1,204 @@
 /*  Collapsible Group Box
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include <QVBoxLayout>
-#include <QToolButton>
-#include <QGroupBox>
+#include <QAbstractButton>
+#include <QKeyEvent>
+#include <QPainter>
+#include <QStyle>
+#include <QStyleOption>
 #include "CollapsibleGroupBox.h"
 
-#include <iostream>
-using std::cout;
-using std::endl;
-
 namespace PokemonAutomation{
 
+namespace{
+
+constexpr int HEADER_PADDING = 8;
+constexpr int ARROW_SIZE = 12;
+constexpr int ARROW_SPACING = 6;
+constexpr int CONTENT_INDENT = HEADER_PADDING + ARROW_SIZE + ARROW_SPACING;
+
+class SectionHeader : public QAbstractButton{
+public:
+    SectionHeader(QWidget* parent, const QString& title, Qt::Orientation orientation)
+        : QAbstractButton(parent)
+        , m_orientation(orientation)
+    {
+        setText(title);
+        setCheckable(true);
+        setFocusPolicy(Qt::StrongFocus);
+        setAttribute(Qt::WA_Hover);
+        setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
+        QFont header_font = font();
+        header_font.setBold(true);
+        setFont(header_font);
+    }
 
-CollapsibleGroupBox::CollapsibleGroupBox(QWidget& parent, const QString& title, bool expanded)
-    : QGroupBox(title, &parent)
-    , m_widget(nullptr)
-{
-    this->setCheckable(true);
-    this->setChecked(expanded);
-    new QVBoxLayout(this);
-    set_expanded(expanded);
-
-    connect(
-        this, &QGroupBox::toggled,
-        this, [this](bool on){
-            set_expanded(on);
+    QSize sizeHint() const override{
+        QSize size(
+            CONTENT_INDENT + fontMetrics().horizontalAdvance(text()) + HEADER_PADDING,
+            qMax(ARROW_SIZE, fontMetrics().height()) + 2 * HEADER_PADDING
+        );
+        if (compact()){
+            size.transpose();
         }
-    );
-}
-void CollapsibleGroupBox::set_expanded(bool expanded){
-    if (expanded){
-        this->setFlat(false);
-        this->layout()->setContentsMargins(6, 6, 6, 6);
-    }else{
-        this->setFlat(true);
-        this->layout()->setContentsMargins(0, 0, 0, 0);
+        return size;
+    }
+    QSize minimumSizeHint() const override{
+        if (compact()){
+            return sizeHint();
+        }
+        return QSize(CONTENT_INDENT + HEADER_PADDING, sizeHint().height());
     }
-    if (m_widget != nullptr){
-        m_widget->setVisible(expanded);
+
+private:
+    bool compact() const{
+        return m_orientation == Qt::Horizontal && !isChecked();
     }
-}
 
-QWidget* CollapsibleGroupBox::widget(){
-    return m_widget;
-}
-void CollapsibleGroupBox::set_widget(QWidget* widget){
-    delete m_widget;
-    if (widget != nullptr){
-        widget->setParent(this);
-        m_widget = widget;
-        this->layout()->addWidget(widget);
+    const Qt::Orientation m_orientation;
+
+protected:
+    bool event(QEvent* event) override{
+        if (event->type() == QEvent::HoverEnter || event->type() == QEvent::HoverLeave){
+            update();
+        }
+        return QAbstractButton::event(event);
     }
-}
 
+    void paintEvent(QPaintEvent*) override{
+        QStyleOption option;
+        option.initFrom(this);
+        QPainter painter(this);
+
+        painter.fillRect(rect(), option.palette.brush(QPalette::Button));
+        //  Some themes use the same color for Button and Window.
+        QColor shade = option.palette.color(QPalette::Mid);
+        shade.setAlpha(24);
+        painter.fillRect(rect(), shade);
+        if (isEnabled() && (underMouse() || isDown())){
+            QColor hover = option.palette.color(QPalette::Highlight);
+            hover.setAlpha(isDown() ? 55 : 25);
+            painter.fillRect(rect(), hover);
+        }
+
+        painter.setPen(option.palette.color(QPalette::Mid));
+        painter.drawLine(0, height() - 1, width() - 1, height() - 1);
+        if (hasFocus()){
+            painter.setPen(option.palette.color(QPalette::Highlight));
+            painter.drawRect(rect().adjusted(0, 0, -1, -1));
+        }
+
+        option.rect = QStyle::visualRect(layoutDirection(), rect(), QRect(
+            compact() ? (width() - ARROW_SIZE) / 2 : HEADER_PADDING,
+            compact() ? HEADER_PADDING : (height() - ARROW_SIZE) / 2,
+            ARROW_SIZE, ARROW_SIZE
+        ));
+        QStyle::PrimitiveElement arrow = QStyle::PE_IndicatorArrowRight;
+        if (isChecked()){
+            arrow = m_orientation == Qt::Horizontal
+                ? QStyle::PE_IndicatorArrowLeft : QStyle::PE_IndicatorArrowDown;
+        }
+        style()->drawPrimitive(
+            arrow, &option, &painter, this
+        );
+
+        QRect text_rect = QStyle::visualRect(layoutDirection(), rect(), rect().adjusted(
+            CONTENT_INDENT, 0, -HEADER_PADDING, 0
+        ));
+        if (compact()){
+            //  Read the collapsed title from top to bottom beneath the arrow.
+            painter.translate(width(), CONTENT_INDENT);
+            painter.rotate(90);
+            text_rect = QRect(0, 0, height() - CONTENT_INDENT - HEADER_PADDING, width());
+        }
+        style()->drawItemText(
+            &painter, text_rect, Qt::AlignVCenter | Qt::AlignLeading | Qt::TextShowMnemonic,
+            option.palette, isEnabled(),
+            fontMetrics().elidedText(text(), Qt::ElideRight, qMax(0, text_rect.width())),
+            QPalette::ButtonText
+        );
+    }
+};
+
+}
 
 
-#if 0
-CollapsibleGroupBox::CollapsibleGroupBox(QWidget& parent, const QString& title)
+CollapsibleGroupBox::CollapsibleGroupBox(
+    QWidget& parent, const QString& title, bool expanded, Qt::Orientation orientation
+)
     : QWidget(&parent)
+    , m_header(new SectionHeader(this, title, orientation))
+    , m_content(new QWidget(this))
+    , m_widget(nullptr)
+    , m_orientation(orientation)
 {
+    setProperty("backgroundContainer", true);
+    m_content->setProperty("backgroundContainer", true);
     QVBoxLayout* layout = new QVBoxLayout(this);
     layout->setContentsMargins(0, 0, 0, 0);
+    layout->setSpacing(0);
+
+    m_header->setChecked(expanded);
+    layout->addWidget(m_header);
+    layout->addWidget(m_content, orientation == Qt::Horizontal ? 1 : 0);
+    if (orientation == Qt::Horizontal){
+        //  Keep the reopen button at the top of the collapsed sidebar.
+        layout->addStretch(0);
+    }
 
-    m_arrow = new QToolButton(this);
-    m_arrow->setStyleSheet("QToolButton {border: none;}");
-    m_arrow->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
-    m_arrow->setArrowType(Qt::ArrowType::DownArrow);
-    m_arrow->setText(title);
-    m_arrow->setCheckable(true);
-    m_arrow->setChecked(true);
-    layout->addWidget(m_arrow);
+    QVBoxLayout* content_layout = new QVBoxLayout(m_content);
+    if (orientation == Qt::Horizontal){
+        content_layout->setContentsMargins(0, HEADER_PADDING, 0, 0);
+    }else{
+        content_layout->setContentsMargins(HEADER_PADDING, HEADER_PADDING, HEADER_PADDING, HEADER_PADDING);
+    }
+    content_layout->setSpacing(0);
 
-    m_box = new QGroupBox(this);
-    layout->addWidget(m_box);
+    set_expanded(expanded);
 
     connect(
-        m_arrow, &QToolButton::toggled,
-        this, [m_arrow, m_box](bool on){
-            m_arrow->setArrowType(on ? Qt::ArrowType::DownArrow : Qt::ArrowType::RightArrow);
-            m_box->setVisible(on);
+        m_header, &QAbstractButton::toggled,
+        this, [this](bool on){
+            set_expanded(on);
         }
     );
 }
-QWidget* CollapsibleGroupBox::box(){
-    return m_box;
+void CollapsibleGroupBox::set_expanded(bool expanded){
+    m_content->setVisible(expanded && m_widget != nullptr);
+    if (m_orientation == Qt::Horizontal){
+        static_cast<QVBoxLayout*>(layout())->setStretch(2, expanded ? 0 : 1);
+        m_header->setToolTip((expanded ? tr("Collapse %1") : tr("Expand %1")).arg(m_header->text()));
+        m_header->updateGeometry();
+        if (expanded){
+            setMinimumWidth(0);
+            setMaximumWidth(QWIDGETSIZE_MAX);
+        }else{
+            setFixedWidth(m_header->sizeHint().width());
+        }
+        updateGeometry();
+    }
 }
-#endif
-
-
 
+QWidget* CollapsibleGroupBox::widget(){
+    return m_widget;
+}
+void CollapsibleGroupBox::set_widget(QWidget* widget){
+    if (widget == m_widget){
+        return;
+    }
 
+    delete m_widget;
+    m_widget = widget;
+    if (widget != nullptr){
+        widget->setParent(m_content);
+        m_content->layout()->addWidget(widget);
+        widget->show();
+    }
+    set_expanded(m_header->isChecked());
+}
 
 }
diff --git a/Common/Qt/CollapsibleGroupBox.h b/Common/Qt/CollapsibleGroupBox.h
index 88bdac8aef..3f2f2db182 100644
--- a/Common/Qt/CollapsibleGroupBox.h
+++ b/Common/Qt/CollapsibleGroupBox.h
@@ -1,6 +1,6 @@
 /*  Collapsible Group Box
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -8,15 +8,19 @@
 #define PokemonAutomation_CollapsibleGroupBox_H
 
 #include <QWidget>
-#include <QGroupBox>
 
-class QToolButton;
+class QString;
+class QAbstractButton;
 
 namespace PokemonAutomation{
 
-class CollapsibleGroupBox : public QGroupBox{
+class CollapsibleGroupBox : public QWidget{
 public:
-    CollapsibleGroupBox(QWidget& parent, const QString& title, bool expanded = true);
+    //  Horizontal sections collapse to a narrow header with a vertical title.
+    CollapsibleGroupBox(
+        QWidget& parent, const QString& title, bool expanded = true,
+        Qt::Orientation orientation = Qt::Vertical
+    );
 
     QWidget* widget();
     void set_widget(QWidget* widget);
@@ -24,26 +28,11 @@ class CollapsibleGroupBox : public QGroupBox{
 private:
     void set_expanded(bool expanded);
 
+    QAbstractButton* m_header;
+    QWidget* m_content;
     QWidget* m_widget;
+    const Qt::Orientation m_orientation;
 };
 
-
-
-
-#if 0
-class CollapsibleGroupBox : public QWidget{
-public:
-    explicit CollapsibleGroupBox(QWidget& parent, const QString& title);
-    QWidget* box();
-
-private:
-    QToolButton* m_arrow;
-    QGroupBox* m_box;
-
-};
-#endif
-
-
-
 }
 #endif
diff --git a/Common/Qt/ExpressionEvaluator.cpp b/Common/Qt/ExpressionEvaluator.cpp
deleted file mode 100644
index 59db8d9408..0000000000
--- a/Common/Qt/ExpressionEvaluator.cpp
+++ /dev/null
@@ -1,299 +0,0 @@
-/*  Simple (and incomplete) Expression Evaluator
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <string>
-#include <map>
-#include <vector>
-#include "Common/Cpp/Exceptions.h"
-#include "ExpressionEvaluator.h"
-
-namespace PokemonAutomation{
-
-
-bool is_whitespace(char ch){
-    switch (ch){
-    case ' ': return true;
-    case '\t': return true;
-    case '\r': return true;
-    case '\n': return true;
-    case '\0': return true;
-    }
-    return false;
-}
-bool is_digit(char ch){
-    return '0' <= ch && ch <= '9';
-}
-bool is_symbol(char ch){
-    if ('a' <= ch && ch <= 'z'){
-        return true;
-    }
-    if ('A' <= ch && ch <= 'Z'){
-        return true;
-    }
-    if (ch == '_'){
-        return true;
-    }
-    return false;
-}
-bool skip_whitespace(const char*& str){
-    while (true){
-        char ch = *str;
-        if (ch == '\0'){
-            return true;
-        }
-        if (!is_whitespace(ch)){
-            return false;
-        }
-        str++;
-    }
-}
-uint32_t parse_integer(const char*& str){
-    const char* ptr = str;
-
-    uint64_t x = 0;
-    while (true){
-        char ch = *str;
-        if (is_whitespace(ch)){
-            return (uint32_t)x;
-        }
-        if (is_digit(ch)){
-            x *= 10;
-            x += ch - '0';
-            if ((uint32_t)x != x){
-                throw ParseException(std::string("Number is too large: ") + ptr);
-            }
-            str++;
-            continue;
-        }
-        switch (ch){
-        case '+':
-        case '-':
-        case '*':
-        case ')':
-            return (uint32_t)x;
-        }
-        throw ParseException(std::string("Invalid integer: ") + ptr);
-    }
-}
-std::string parse_symbol(const char*& str){
-    const char* ptr = str;
-
-    std::string ret;
-    ret += *str++;
-    while (true){
-        char ch = *str;
-        if (is_whitespace(ch)){
-            return ret;
-        }
-        if (is_symbol(ch)){
-            ret += ch;
-            str++;
-            continue;
-        }
-        if (is_digit(ch)){
-            ret += ch;
-            str++;
-            continue;
-        }
-        switch (ch){
-        case '+':
-        case '-':
-        case '*':
-        case ')':
-            return ret;
-        }
-        throw ParseException(std::string("Invalid symbol: ") + ptr);
-    }
-}
-
-uint8_t precedence(char ch){
-    switch (ch){
-    case '+':
-    case '-':
-        return 0;
-    case '*':
-        return 1;
-    }
-    throw ParseException(std::string("Invalid operator: ") + ch);
-}
-
-int32_t parse_expression(
-    const std::map<std::string, int64_t>& variables,
-    const std::string& expression
-){
-    const char* str = expression.c_str();
-
-    std::vector<std::pair<char, uint64_t>> num;
-    std::vector<char> op;
-
-    while (true){
-        if (skip_whitespace(str)){
-            break;
-        }
-        char ch = *str;
-//        cout << "ch = " << ch << endl;
-        if (is_digit(ch)){
-            num.emplace_back('\0', parse_integer(str));
-            continue;
-        }
-        if (is_symbol(ch)){
-            std::string symbol = parse_symbol(str);
-            auto iter = variables.find(symbol);
-            if (iter == variables.end()){
-                throw ParseException("Undefined symbol: " + symbol);
-            }
-            num.emplace_back('\0', iter->second);
-            continue;
-        }
-        if (ch == '+' || ch == '-' || ch == '*'){
-            op.push_back(ch);
-            str++;
-            while (op.size() >= 2){
-                char top = op.back();
-                char next = op[op.size() - 2];
-                uint8_t p_top  = precedence(top);
-                uint8_t p_next = precedence(next);
-                if (p_top > p_next){
-                    break;
-                }
-                op.pop_back();
-                op.pop_back();
-                num.emplace_back(next, 0);
-                op.push_back(top);
-                if (p_top == p_next){
-                    break;
-                }
-            }
-            continue;
-        }
-    //    if (ch == '('){
-    //
-    //    }
-    //    if (ch == ')'){
-    //
-    //    }
-        throw ParseException("Invalid expression: " + expression);
-    }
-
-    while (!op.empty()){
-        num.emplace_back(op.back(), 0);
-        op.pop_back();
-    }
-
-#if 0
-    cout << "operands: ";
-    for (const auto& item : num){
-        if (item.first == 0){
-            cout << item.second << " ";
-        }else{
-            cout << item.first << " ";
-        }
-    }
-    cout << endl;
-    //cout << "operators: ";
-    //for (const auto& item : op){
-    //    cout << item << " ";
-    //}
-    //cout << endl;
-#endif
-
-    std::vector<int64_t> stack;
-    for (const auto& item : num){
-        if (item.first == 0){
-            stack.push_back(item.second);
-            num.pop_back();
-            continue;
-        }
-        switch (item.first){
-        case '+':{
-            if (stack.size() < 2){
-                throw ParseException("Invalid expression: unexpected +");
-            }
-            int64_t x = stack[stack.size() - 2];
-            int64_t y = stack[stack.size() - 1];
-            stack.pop_back();
-            stack.pop_back();
-            x += y;
-            if ((int32_t)x != x){
-                throw ParseException("Overflow");
-            }
-            stack.push_back(x);
-            continue;
-        }
-        case '-':{
-            if (stack.size() == 0){
-                throw ParseException("Invalid expression: unexpected -");
-            }
-
-            // If we have at least two integers (x, y) in the stack, perform x - y
-            // If we have only one integer y in the stack, perform - y (by leaving x = 0)
-
-            int64_t y = stack[stack.size() - 1];
-            stack.pop_back();
-
-            int64_t x = 0;
-            if (stack.size() > 0){
-                x = stack[stack.size() - 1];
-                stack.pop_back();
-            }
-            x -= y;
-            if ((int32_t)x != x){
-                throw ParseException("Overflow");
-            }
-            stack.push_back(x);
-            continue;
-        }
-        case '*':{
-            if (stack.size() < 2){
-                throw ParseException("Invalid expression: unexpected *");
-            }
-            int64_t x = stack[stack.size() - 2];
-            int64_t y = stack[stack.size() - 1];
-            stack.pop_back();
-            stack.pop_back();
-            x *= y;
-            if ((int32_t)x != x){
-                throw ParseException("Overflow");
-            }
-            stack.push_back(x);
-            continue;
-        }
-        }
-        throw ParseException("Invalid operator.");
-    }
-    if (stack.size() != 1){
-        throw ParseException("Invalid expression.");
-    }
-
-    return (int32_t)stack[0];
-}
-
-const std::map<std::string, int64_t>& SYMBOLS(){
-    static const std::map<std::string, int64_t> SYMBOLS{
-        {"TICKS_PER_SECOND", 125},
-    };
-    return SYMBOLS;
-}
-
-
-uint32_t parse_ticks_ui32(const std::string& expression){
-    int32_t x = parse_expression(SYMBOLS(), expression);
-    if (x < 0){
-        throw ParseException("Value cannot be negative.");
-    }
-    return x;
-}
-
-
-int32_t parse_ticks_i32(const std::string& expression){
-    int32_t x = parse_expression(SYMBOLS(), expression);
-    return x;
-}
-
-
-}
-
-
diff --git a/Common/Qt/ExpressionEvaluator.h b/Common/Qt/ExpressionEvaluator.h
deleted file mode 100644
index ee8090e2a1..0000000000
--- a/Common/Qt/ExpressionEvaluator.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/*  Simple (and incomplete) Expression Evaluator
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <stdint.h>
-#include <string>
-
-namespace PokemonAutomation{
-
-uint32_t parse_ticks_ui32(const std::string& expression);
-
-int32_t parse_ticks_i32(const std::string& expression);
-
-
-}
diff --git a/Common/Qt/GlobalThreadPoolsQt.cpp b/Common/Qt/GlobalThreadPoolsQt.cpp
new file mode 100644
index 0000000000..4b4a3bfe24
--- /dev/null
+++ b/Common/Qt/GlobalThreadPoolsQt.cpp
@@ -0,0 +1,28 @@
+/*  Global Thread Pools (Qt)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "GlobalThreadPoolsQt.h"
+
+namespace PokemonAutomation{
+namespace GlobalThreadPools{
+
+
+
+QtWorkerThreadPool& qt_worker_threadpool(){
+    static QtWorkerThreadPool pool;
+    return pool;
+}
+
+
+QtEventThreadPool& qt_event_threadpool(){
+    static QtEventThreadPool pool;
+    return pool;
+}
+
+
+
+}
+}
diff --git a/Common/Qt/GlobalThreadPoolsQt.h b/Common/Qt/GlobalThreadPoolsQt.h
new file mode 100644
index 0000000000..2673751bbf
--- /dev/null
+++ b/Common/Qt/GlobalThreadPoolsQt.h
@@ -0,0 +1,32 @@
+/*  Global Thread Pools (Qt)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  On Windows it is not safe to call into Qt from std::thread.
+ *
+ *  If we need to call into Qt signals/slots from std::thread, dispatch to this
+ *  thread pool instead.
+ *
+ */
+
+#ifndef PokemonAutomation_CommonTools_GlobalThreadPoolsQt_H
+#define PokemonAutomation_CommonTools_GlobalThreadPoolsQt_H
+
+#include "Common/Qt/QtThreadPool.h"
+
+namespace PokemonAutomation{
+namespace GlobalThreadPools{
+
+
+//  Temporary and only used for audio template loading.
+//  Hopefully we can remove this in the near future.
+QtWorkerThreadPool& qt_worker_threadpool();
+
+
+QtEventThreadPool& qt_event_threadpool();
+
+
+
+}
+}
+#endif
diff --git a/Common/Qt/NoWheelComboBox.h b/Common/Qt/NoWheelComboBox.h
index 127f0bfc05..0b990f3aa9 100644
--- a/Common/Qt/NoWheelComboBox.h
+++ b/Common/Qt/NoWheelComboBox.h
@@ -1,6 +1,6 @@
-/*  ComboBox without mouse wheel scrolling.
+/*  ComboBox without mouse wheel scrolling. Also, the height has been set to be more compact.
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -8,15 +8,39 @@
 #define PokemonAutomation_NoWheelComboBox_H
 
 #include <QComboBox>
+#include <QAbstractItemView>
+#include <QStyledItemDelegate>
 
 //#define PA_ENABLE_SIZE_CACHING
 
 namespace PokemonAutomation{
 
 
-class NoWheelComboBox : public QComboBox{
+class HeightDelegate : public QStyledItemDelegate{
 public:
-    using QComboBox::QComboBox;
+    using QStyledItemDelegate::QStyledItemDelegate;
+    QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const override {
+        QSize s = QStyledItemDelegate::sizeHint(option, index);
+        int vertical_padding = 2;
+        s.setHeight(option.fontMetrics.height() + vertical_padding);
+        return s;
+    }
+};
+
+
+class NoWheelCompactComboBox : public QComboBox{
+public:
+    explicit NoWheelCompactComboBox(QWidget* parent = nullptr) : QComboBox(parent){
+        // Set the height for every line in the dropdown
+        this->view()->setItemDelegate(new HeightDelegate(this));
+
+        // this->setStyleSheet("QAbstractItemView::item { height: 100px; }");
+        
+        // Optional: Force a standard list view to ensure the stylesheet 
+        // is respected on all platforms (like Windows/macOS)
+        // #include <QListView>
+        // this->setView(new QListView()); 
+    }
 
     void update_size_cache(){
 #ifdef PA_ENABLE_SIZE_CACHING
diff --git a/Common/Qt/Options/BatchWidget.cpp b/Common/Qt/Options/BatchWidget.cpp
index 14ea8d4031..c7ced97007 100644
--- a/Common/Qt/Options/BatchWidget.cpp
+++ b/Common/Qt/Options/BatchWidget.cpp
@@ -1,6 +1,6 @@
 /*  Batch Option
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -11,10 +11,9 @@
 namespace PokemonAutomation{
 
 
+template class RegisterUiStateQtWidget<BatchWidget>;
+
 
-ConfigWidget* BatchOption::make_QtWidget(QWidget& parent){
-    return new BatchWidget(parent, *this);
-}
 
 
 
@@ -38,7 +37,7 @@ BatchWidget::BatchWidget(QWidget& parent, BatchOption& value)
     }
 
     for (auto& item : value.options()){
-        m_options.emplace_back(item->make_QtWidget(parent));
+        m_options.emplace_back(ConfigWidget::make_from_option(*item, &parent));
         if (value.horizontal()){
             m_options.back()->widget().setContentsMargins(3, 0, 3, 0);
         }else{
@@ -54,7 +53,7 @@ void BatchWidget::update_value(){
         item->update_value();
     }
 }
-void BatchWidget::value_changed(){
+void BatchWidget::on_config_value_changed(void* object){
     QMetaObject::invokeMethod(this, [this]{
         update_value();
     }, Qt::QueuedConnection);
diff --git a/Common/Qt/Options/BatchWidget.h b/Common/Qt/Options/BatchWidget.h
index 04d29a09b9..c4a25d962f 100644
--- a/Common/Qt/Options/BatchWidget.h
+++ b/Common/Qt/Options/BatchWidget.h
@@ -1,6 +1,6 @@
 /*  Batch Option
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -14,14 +14,18 @@
 namespace PokemonAutomation{
 
 
-
+//  A Widget to hold multiple derived classes of ConfigWidget.
+//  Construct using a BatchOption.
 class BatchWidget : public QWidget, public ConfigWidget{
+public:
+    using ParentState = BatchOption;
+
 public:
     ~BatchWidget();
     BatchWidget(QWidget& parent, BatchOption& value);
 
     virtual void update_value() override;
-    virtual void value_changed() override;
+    virtual void on_config_value_changed(void* object) override;
 
 protected:
     BatchOption& m_value;
diff --git a/Common/Qt/Options/BooleanCheckBoxWidget.cpp b/Common/Qt/Options/BooleanCheckBoxWidget.cpp
index 3014cafde2..38d60176b2 100644
--- a/Common/Qt/Options/BooleanCheckBoxWidget.cpp
+++ b/Common/Qt/Options/BooleanCheckBoxWidget.cpp
@@ -1,6 +1,6 @@
 /*  Boolean Option
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -13,13 +13,9 @@ namespace PokemonAutomation{
 
 
 
+template class RegisterUiStateQtWidget<BooleanCheckBoxCellWidget>;
+template class RegisterUiStateQtWidget<BooleanCheckBoxOptionWidget>;
 
-ConfigWidget* BooleanCheckBoxCell::make_QtWidget(QWidget& parent){
-    return new BooleanCheckBoxCellWidget(parent, *this);
-}
-ConfigWidget* BooleanCheckBoxOption::make_QtWidget(QWidget& parent){
-    return new BooleanCheckBoxOptionWidget(parent, *this);
-}
 
 
 
@@ -38,12 +34,21 @@ BooleanCheckBoxCellWidget::BooleanCheckBoxCellWidget(QWidget& parent, BooleanChe
     m_box = new QCheckBox(this);
     m_box->setChecked(m_value);
     layout->addWidget(m_box);
+#if QT_VERSION < 0x060700
     connect(
         m_box, &QCheckBox::stateChanged,
         this, [this](int){
             m_value = m_box->isChecked();
         }
     );
+#else
+    connect(
+        m_box, &QCheckBox::checkStateChanged,
+        this, [this](Qt::CheckState){
+            m_value = m_box->isChecked();
+        }
+    );
+#endif
     value.add_listener(*this);
 }
 void BooleanCheckBoxCellWidget::update_value(){
@@ -51,7 +56,7 @@ void BooleanCheckBoxCellWidget::update_value(){
         m_box->setChecked(m_value);
     }
 }
-void BooleanCheckBoxCellWidget::value_changed(){
+void BooleanCheckBoxCellWidget::on_config_value_changed(void* object){
     QMetaObject::invokeMethod(this, [this]{
         update_value();
     }, Qt::QueuedConnection);
@@ -74,16 +79,28 @@ BooleanCheckBoxOptionWidget::BooleanCheckBoxOptionWidget(QWidget& parent, Boolea
     layout->setContentsMargins(0, 0, 0, 0);
     QLabel* text = new QLabel(QString::fromStdString(m_value.label()), this);
     text->setWordWrap(true);
+    text->setTextFormat(Qt::RichText);
+    text->setTextInteractionFlags(Qt::TextBrowserInteraction);
+    text->setOpenExternalLinks(true);
     layout->addWidget(text, 3);
     m_box = new QCheckBox(this);
     m_box->setChecked(m_value);
     layout->addWidget(m_box, 1);
+#if QT_VERSION < 0x060700
     connect(
         m_box, &QCheckBox::stateChanged,
         this, [this](int){
             m_value = m_box->isChecked();
         }
     );
+#else
+    connect(
+        m_box, &QCheckBox::checkStateChanged,
+        this, [this](int){
+            m_value = m_box->isChecked();
+        }
+    );
+#endif
     value.add_listener(*this);
 }
 void BooleanCheckBoxOptionWidget::update_value(){
@@ -91,7 +108,7 @@ void BooleanCheckBoxOptionWidget::update_value(){
         m_box->setChecked(m_value);
     }
 }
-void BooleanCheckBoxOptionWidget::value_changed(){
+void BooleanCheckBoxOptionWidget::on_config_value_changed(void* object){
     QMetaObject::invokeMethod(m_box, [this]{
         update_value();
     }, Qt::QueuedConnection);
diff --git a/Common/Qt/Options/BooleanCheckBoxWidget.h b/Common/Qt/Options/BooleanCheckBoxWidget.h
index 7b2545a1b9..dcd5513fdb 100644
--- a/Common/Qt/Options/BooleanCheckBoxWidget.h
+++ b/Common/Qt/Options/BooleanCheckBoxWidget.h
@@ -1,6 +1,6 @@
 /*  Boolean Option
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -8,20 +8,23 @@
 #define PokemonAutomation_BooleanCheckBoxWidget_H
 
 #include <QCheckBox>
-#include "ConfigWidget.h"
 #include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "ConfigWidget.h"
 
 namespace PokemonAutomation{
 
 
 
 class BooleanCheckBoxCellWidget : public QWidget, public ConfigWidget{
+public:
+    using ParentState = BooleanCheckBoxCell;
+
 public:
     ~BooleanCheckBoxCellWidget();
     BooleanCheckBoxCellWidget(QWidget& parent, BooleanCheckBoxCell& value);
 
     virtual void update_value() override;
-    virtual void value_changed() override;
+    virtual void on_config_value_changed(void* object) override;
 
 private:
     BooleanCheckBoxCell& m_value;
@@ -32,12 +35,15 @@ class BooleanCheckBoxCellWidget : public QWidget, public ConfigWidget{
 
 
 class BooleanCheckBoxOptionWidget : public QWidget, public ConfigWidget{
+public:
+    using ParentState = BooleanCheckBoxOption;
+
 public:
     ~BooleanCheckBoxOptionWidget();
     BooleanCheckBoxOptionWidget(QWidget& parent, BooleanCheckBoxOption& value);
 
     virtual void update_value() override;
-    virtual void value_changed() override;
+    virtual void on_config_value_changed(void* object) override;
 
 private:
     BooleanCheckBoxOption& m_value;
diff --git a/Common/Qt/Options/BoxFloatWidget.cpp b/Common/Qt/Options/BoxFloatWidget.cpp
new file mode 100644
index 0000000000..31f72d50bc
--- /dev/null
+++ b/Common/Qt/Options/BoxFloatWidget.cpp
@@ -0,0 +1,208 @@
+/*  Box Float Option
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <QHBoxLayout>
+#include <QVBoxLayout>
+#include <QLabel>
+#include "Common/Cpp/Strings/StringTools.h"
+#include "BoxFloatWidget.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+
+
+template class RegisterUiStateQtWidget<BoxFloatWidget>;
+
+
+
+
+
+
+BoxFloatWidget::~BoxFloatWidget(){
+    m_value.remove_listener(*this);
+}
+
+BoxFloatWidget::BoxFloatWidget(QWidget& parent, BoxFloatOption& value)
+    : QWidget(&parent)
+    , ConfigWidget(value, *this)
+    , m_value(value)
+{
+    QHBoxLayout* layout = new QHBoxLayout(this);
+    layout->setContentsMargins(0, 0, 0, 0);
+
+    QLabel* text = new QLabel(QString::fromStdString(value.label()), this);
+    text->setWordWrap(true);
+    text->setTextFormat(Qt::RichText);
+    text->setTextInteractionFlags(Qt::TextBrowserInteraction);
+    text->setOpenExternalLinks(true);
+    layout->addWidget(text, 1);
+
+    double x, y, width, height;
+    m_value.get_all(x, y, width, height);
+
+    QVBoxLayout* right_side = new QVBoxLayout();
+    layout->addLayout(right_side, 1);
+
+    QHBoxLayout* coordinates = new QHBoxLayout();
+    right_side->addLayout(coordinates);
+
+    m_x = new QLineEdit( this);
+    m_y = new QLineEdit(this);
+    m_width = new QLineEdit(this);
+    m_height = new QLineEdit(this);
+
+    coordinates->addWidget(new QLabel("X = ", this));
+    coordinates->addWidget(m_x);
+    coordinates->addWidget(new QLabel("Y = ", this));
+    coordinates->addWidget(m_y);
+    coordinates->addWidget(new QLabel("Width = ", this));
+    coordinates->addWidget(m_width);
+    coordinates->addWidget(new QLabel("Height = ", this));
+    coordinates->addWidget(m_height);
+
+    QHBoxLayout* array = new QHBoxLayout();
+    right_side->addLayout(array);
+
+    m_array = new QLineEdit(this);
+    array->addWidget(new QLabel("Array = ", this));
+    array->addWidget(m_array);
+
+    BoxFloatWidget::update_value();
+
+    connect(
+        m_x, &QLineEdit::editingFinished,
+        this, [this]{
+            bool ok;
+            double current = m_x->text().toDouble(&ok);
+
+            double x, y, width, height;
+            m_value.get_all(x, y, width, height);
+            x = current;
+
+            bool redraw = m_value.sanitize(x, y, width, height);
+            m_value.set_all(x, y, width, height);
+
+            if (redraw){
+                update_value();
+            }
+        }
+    );
+    connect(
+        m_y, &QLineEdit::editingFinished,
+        this, [this](){
+            bool ok;
+            double current = m_y->text().toDouble(&ok);
+
+            double x, y, width, height;
+            m_value.get_all(x, y, width, height);
+            y = current;
+
+            bool redraw = m_value.sanitize(x, y, width, height);
+            m_value.set_all(x, y, width, height);
+
+            if (redraw){
+                update_value();
+            }
+        }
+    );
+    connect(
+        m_width, &QLineEdit::editingFinished,
+        this, [this](){
+            bool ok;
+            double current = m_width->text().toDouble(&ok);
+
+            double x, y, width, height;
+            m_value.get_all(x, y, width, height);
+            width = current;
+
+            bool redraw = m_value.sanitize(x, y, width, height);
+            m_value.set_all(x, y, width, height);
+
+            if (redraw){
+                update_value();
+            }
+        }
+    );
+    connect(
+        m_height, &QLineEdit::editingFinished,
+        this, [this](){
+            bool ok;
+            double current = m_height->text().toDouble(&ok);
+
+            double x, y, width, height;
+            m_value.get_all(x, y, width, height);
+            height = current;
+
+            bool redraw = m_value.sanitize(x, y, width, height);
+            m_value.set_all(x, y, width, height);
+
+            if (redraw){
+                update_value();
+            }
+        }
+    );
+    connect(
+        m_array, &QLineEdit::editingFinished,
+        this, [this](){
+            std::vector<std::string> all_coords = StringTools::split(m_array->text().toStdString(), ", ");
+            if (all_coords.size() != 4){
+                return;
+            }
+
+            double x = std::stod(all_coords[0]);
+            double y = std::stod(all_coords[1]);
+            double width = std::stod(all_coords[2]);
+            double height = std::stod(all_coords[3]);
+
+            bool redraw = m_value.sanitize(x, y, width, height);
+            m_value.set_all(x, y, width, height);
+
+            if (redraw){
+                update_value();
+            }
+        }
+    );
+
+    value.add_listener(*this);
+}
+
+
+void BoxFloatWidget::update_value(){
+    double x, y, width, height;
+    m_value.get_all(x, y, width, height);
+
+    std::string str_x = std::to_string(x);
+    std::string str_y = std::to_string(y);
+    std::string str_w = std::to_string(width);
+    std::string str_h = std::to_string(height);
+
+    m_x->setText(QString::fromStdString(str_x));
+    m_y->setText(QString::fromStdString(str_y));
+    m_width->setText(QString::fromStdString(str_w));
+    m_height->setText(QString::fromStdString(str_h));
+
+    std::string box_coord_string;
+    box_coord_string += str_x;
+    box_coord_string += ", ";
+    box_coord_string += str_y;
+    box_coord_string += ", ";
+    box_coord_string += str_w;
+    box_coord_string += ", ";
+    box_coord_string += str_h;
+    m_array->setText(QString::fromStdString(box_coord_string));
+}
+void BoxFloatWidget::on_config_value_changed(void* object){
+    QMetaObject::invokeMethod(this, [this]{
+        update_value();
+    }, Qt::QueuedConnection);
+}
+
+
+
+}
diff --git a/Common/Qt/Options/BoxFloatWidget.h b/Common/Qt/Options/BoxFloatWidget.h
new file mode 100644
index 0000000000..971af5473a
--- /dev/null
+++ b/Common/Qt/Options/BoxFloatWidget.h
@@ -0,0 +1,42 @@
+/*  Box Float Option
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_BoxFloatWidget_H
+#define PokemonAutomation_BoxFloatWidget_H
+
+#include <QLineEdit>
+#include "Common/Cpp/Options/BoxFloatOption.h"
+#include "ConfigWidget.h"
+
+namespace PokemonAutomation{
+
+
+class BoxFloatWidget : public QWidget, public ConfigWidget{
+public:
+    using ParentState = BoxFloatOption;
+
+public:
+    ~BoxFloatWidget();
+    BoxFloatWidget(QWidget& parent, BoxFloatOption& value);
+
+    virtual void update_value() override;
+    virtual void on_config_value_changed(void* object) override;
+
+private:
+    BoxFloatOption& m_value;
+    QLineEdit* m_x;
+    QLineEdit* m_y;
+    QLineEdit* m_width;
+    QLineEdit* m_height;
+    QLineEdit* m_array;
+};
+
+
+
+
+
+}
+#endif
diff --git a/Common/Qt/Options/ButtonWidget.cpp b/Common/Qt/Options/ButtonWidget.cpp
new file mode 100644
index 0000000000..d5f2f9726d
--- /dev/null
+++ b/Common/Qt/Options/ButtonWidget.cpp
@@ -0,0 +1,144 @@
+/*  Boolean Option
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <iostream>
+#include <QHBoxLayout>
+#include <QLabel>
+#include "ButtonWidget.h"
+
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+
+
+template class RegisterUiStateQtWidget<ButtonCellWidget>;
+template class RegisterUiStateQtWidget<ButtonOptionWidget>;
+
+
+
+
+ButtonCellWidget::~ButtonCellWidget(){
+    m_value.remove_listener(*this);
+}
+ButtonCellWidget::ButtonCellWidget(QWidget& parent, ButtonCell& value)
+    : QPushButton(&parent)
+    , ConfigWidget(value, *this)
+    , m_value(value)
+{
+    ButtonCellWidget::update_value();
+
+//    cout << "height = " << this->height() << endl;
+
+    connect(
+        this, &QPushButton::pressed,
+        this, [this]{
+            m_value.press_button();
+//            cout << "Press: " << this->font().pointSize() << endl;
+//            cout << "height = " << this->height() << endl;
+        }
+    );
+    value.add_listener(*this);
+}
+
+void ButtonCellWidget::update_value(){
+    this->setText(QString::fromStdString(m_value.text()));
+
+    int button_size = m_value.button_height();
+    if (button_size > 0){
+        this->setFixedHeight(button_size);
+    }
+
+    int text_size = m_value.text_size();
+    if (text_size > 0){
+        QFont font = this->font();
+        font.setPointSize(text_size);
+//        font.setPointSize(16);
+        this->setFont(font);
+//        cout << "Post set: " << this->font().pointSize() << endl;
+    }
+//    cout << "Update: " << this->font().pointSize() << endl;
+}
+void ButtonCellWidget::on_config_value_changed(void* object){
+    QMetaObject::invokeMethod(this, [this]{
+        update_value();
+    }, Qt::QueuedConnection);
+}
+
+
+
+
+
+
+ButtonOptionWidget::~ButtonOptionWidget(){
+    m_value.remove_listener(*this);
+}
+ButtonOptionWidget::ButtonOptionWidget(QWidget& parent, ButtonOption& value)
+    : QWidget(&parent)
+    , ConfigWidget(value, *this)
+    , m_value(value)
+    , m_label(new QLabel(this))
+    , m_button(new QPushButton(this))
+{
+    QHBoxLayout* layout = new QHBoxLayout(this);
+    layout->setContentsMargins(0, 0, 0, 0);
+
+    m_label->setWordWrap(true);
+    m_label->setTextFormat(Qt::RichText);
+    m_label->setTextInteractionFlags(Qt::TextBrowserInteraction);
+    m_label->setOpenExternalLinks(true);
+    layout->addWidget(m_label);
+
+    layout->addWidget(m_button);
+
+    ButtonOptionWidget::update_value();
+
+//    cout << "height = " << this->height() << endl;
+
+    connect(
+        m_button, &QPushButton::pressed,
+        this, [this]{
+            m_value.press_button();
+//            cout << "Press: " << this->font().pointSize() << endl;
+//            cout << "height = " << this->height() << endl;
+        }
+    );
+    value.add_listener(*this);
+}
+
+
+void ButtonOptionWidget::update_value(){
+    m_label->setText(QString::fromStdString(m_value.label()));
+    m_button->setEnabled(m_value.is_enabled());
+    m_button->setText(QString::fromStdString(m_value.text()));
+
+    int button_size = m_value.button_height();
+    if (button_size > 0){
+        m_button->setFixedHeight(button_size);
+    }
+
+    int text_size = m_value.text_size();
+    if (text_size > 0){
+        QFont font = m_button->font();
+        font.setPointSize(text_size);
+//        font.setPointSize(16);
+        m_button->setFont(font);
+//        cout << "Post set: " << this->font().pointSize() << endl;
+    }
+//    cout << "Update: " << this->font().pointSize() << endl;
+}
+void ButtonOptionWidget::on_config_value_changed(void* object){
+    QMetaObject::invokeMethod(this, [this]{
+        update_value();
+    }, Qt::QueuedConnection);
+}
+
+
+
+
+
+
+}
diff --git a/Common/Qt/Options/ButtonWidget.h b/Common/Qt/Options/ButtonWidget.h
new file mode 100644
index 0000000000..ed5c8e668a
--- /dev/null
+++ b/Common/Qt/Options/ButtonWidget.h
@@ -0,0 +1,60 @@
+/*  Button Widget
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Options_ButtonWidget_H
+#define PokemonAutomation_Options_ButtonWidget_H
+
+#include <QWidget>
+#include <QLabel>
+#include <QPushButton>
+#include "Common/Cpp/Options/ButtonOption.h"
+#include "ConfigWidget.h"
+
+namespace PokemonAutomation{
+
+
+
+class ButtonCellWidget : public QPushButton, public ConfigWidget{
+public:
+    using ParentState = ButtonCell;
+
+public:
+    ~ButtonCellWidget();
+    ButtonCellWidget(QWidget& parent, ButtonCell& value);
+
+    virtual void update_value() override;
+    virtual void on_config_value_changed(void* object) override;
+
+private:
+    ButtonCell& m_value;
+};
+
+
+
+
+
+class ButtonOptionWidget : public QWidget, public ConfigWidget{
+public:
+    using ParentState = ButtonOption;
+
+public:
+    ~ButtonOptionWidget();
+    ButtonOptionWidget(QWidget& parent, ButtonOption& value);
+
+    virtual void update_value() override;
+    virtual void on_config_value_changed(void* object) override;
+
+private:
+    ButtonOption& m_value;
+    QLabel* m_label;
+    QPushButton* m_button;
+};
+
+
+
+
+}
+#endif
diff --git a/Common/Qt/Options/CheckboxDropdownWidget.cpp b/Common/Qt/Options/CheckboxDropdownWidget.cpp
new file mode 100644
index 0000000000..be480b192c
--- /dev/null
+++ b/Common/Qt/Options/CheckboxDropdownWidget.cpp
@@ -0,0 +1,60 @@
+/*  Checkbox Dropdown Option
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CheckboxDropdownWidget.h"
+
+namespace PokemonAutomation{
+
+
+template class RegisterUiStateQtWidget<CheckboxDropdownCellWidget>;
+
+
+
+
+CheckboxDropdownCellWidget::~CheckboxDropdownCellWidget(){
+    m_value.remove_listener(*this);
+}
+CheckboxDropdownCellWidget::CheckboxDropdownCellWidget(QWidget& parent, CheckboxDropdownBase& value)
+    : CheckboxDropdown(&parent, QString::fromStdString(value.current_label()))
+    , ConfigWidget(value, *this)
+    , m_value(value)
+{
+    size_t total_items = value.size();
+    for (size_t index = 0; index < total_items; index++){
+        CheckboxDropdownItem* item = addItem(QString::fromStdString(value.name_at_index(index)));
+        connect(
+            item, &CheckboxDropdownItem::checkStateChanged,
+            this, [&value, index](Qt::CheckState state){
+                if (state == Qt::Checked){
+                    value.set_index(index);
+                }else{
+                    value.clear_index(index);
+                }
+            }
+        );
+    }
+
+    CheckboxDropdownCellWidget::update_value();
+
+    m_value.add_listener(*this);
+}
+
+void CheckboxDropdownCellWidget::update_value(){
+    setLabel(QString::fromStdString(m_value.current_label()));
+    size_t total_items = CheckboxDropdown::size();
+    for (size_t index = 0; index < total_items; index++){
+        (*this)[index]->setChecked(m_value[index]);
+    }
+}
+void CheckboxDropdownCellWidget::on_config_value_changed(void* object){
+    QMetaObject::invokeMethod(this, [this]{
+        update_value();
+    }, Qt::QueuedConnection);
+}
+
+
+
+}
diff --git a/Common/Qt/Options/CheckboxDropdownWidget.h b/Common/Qt/Options/CheckboxDropdownWidget.h
new file mode 100644
index 0000000000..03289bf6fa
--- /dev/null
+++ b/Common/Qt/Options/CheckboxDropdownWidget.h
@@ -0,0 +1,35 @@
+/*  Checkbox Dropdown Option
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Options_CheckboxDropdownWidget_H
+#define PokemonAutomation_Options_CheckboxDropdownWidget_H
+
+#include "Common/Cpp/Options/CheckboxDropdownOption.h"
+#include "Common/Qt/CheckboxDropdown.h"
+#include "ConfigWidget.h"
+
+namespace PokemonAutomation{
+
+
+class CheckboxDropdownCellWidget : public CheckboxDropdown, public ConfigWidget{
+public:
+    using ParentState = CheckboxDropdownBase;
+
+public:
+    ~CheckboxDropdownCellWidget();
+    CheckboxDropdownCellWidget(QWidget& parent, CheckboxDropdownBase& value);
+
+    virtual void update_value() override;
+    virtual void on_config_value_changed(void* object) override;
+
+protected:
+    CheckboxDropdownBase& m_value;
+};
+
+
+
+}
+#endif
diff --git a/Common/Qt/Options/ColorWidget.cpp b/Common/Qt/Options/ColorWidget.cpp
new file mode 100644
index 0000000000..313ab77f86
--- /dev/null
+++ b/Common/Qt/Options/ColorWidget.cpp
@@ -0,0 +1,101 @@
+/*  Color Widget
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <QLabel>
+#include <QLineEdit>
+#include "QHBoxLayout"
+#include "ColorWidget.h"
+
+namespace PokemonAutomation{
+
+
+template class RegisterUiStateQtWidget<ColorCellWidget>;
+template class RegisterUiStateQtWidget<ColorOptionWidget>;
+
+
+
+
+
+ColorCellWidget::~ColorCellWidget(){
+    m_value.remove_listener(*this);
+}
+ColorCellWidget::ColorCellWidget(QWidget& parent, ColorCell& value)
+    : QWidget(&parent)
+    , ConfigWidget(value, *this)
+    , m_value(value)
+{
+    QHBoxLayout* layout = new QHBoxLayout(this);
+    layout->setContentsMargins(0, 0, 5, 0);
+
+    QString str = QString::fromStdString(value.to_str());
+
+    m_line_edit = new QLineEdit(str, this);
+    m_line_edit->setFixedWidth(60);
+    layout->addWidget(m_line_edit);
+
+    m_box = new QLabel(this);
+    m_box->setTextFormat(Qt::RichText);
+    layout->addWidget(m_box);
+
+    ColorCellWidget::update_value();
+
+    connect(
+        m_line_edit, &QLineEdit::editingFinished,
+        this, [this](){
+            m_value.set(m_line_edit->text().toStdString());
+            update_value();
+        }
+    );
+
+    m_value.add_listener(*this);
+}
+void ColorCellWidget::update_value(){
+    QString str = QString::fromStdString(m_value.to_str());
+    m_line_edit->setText(str);
+    m_box->setText("<font color=\"#" + str + "\">&#x2b24;</font>");
+}
+void ColorCellWidget::on_config_value_changed(void* object){
+    QMetaObject::invokeMethod(this, [this]{
+        update_value();
+    }, Qt::QueuedConnection);
+}
+
+
+
+
+
+
+ColorOptionWidget::~ColorOptionWidget(){
+    m_value.remove_listener(*this);
+}
+ColorOptionWidget::ColorOptionWidget(QWidget& parent, ColorOption& value)
+    : QWidget(&parent)
+    , ConfigWidget(value, *this)
+    , m_cell(new ColorCellWidget(*this, value))
+{
+    QHBoxLayout* layout = new QHBoxLayout(this);
+    layout->setContentsMargins(0, 0, 0, 0);
+    QLabel* text = new QLabel(QString::fromStdString(value.label()), this);
+    text->setWordWrap(true);
+    text->setTextFormat(Qt::RichText);
+    text->setTextInteractionFlags(Qt::TextBrowserInteraction);
+    text->setOpenExternalLinks(true);
+    layout->addWidget(text, 1);
+    layout->addWidget(m_cell, 1);
+    value.add_listener(*this);
+}
+void ColorOptionWidget::update_value(){
+    m_cell->update_value();
+}
+void ColorOptionWidget::on_config_value_changed(void* object){
+    m_cell->on_config_value_changed(object);
+}
+
+
+
+
+
+}
diff --git a/Common/Qt/Options/ColorWidget.h b/Common/Qt/Options/ColorWidget.h
new file mode 100644
index 0000000000..d91e56f94f
--- /dev/null
+++ b/Common/Qt/Options/ColorWidget.h
@@ -0,0 +1,59 @@
+/*  Color Widget
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_ColorWidget_H
+#define PokemonAutomation_ColorWidget_H
+
+#include <QWidget>
+#include "Common/Cpp/Options/ColorOption.h"
+#include "ConfigWidget.h"
+
+class QLabel;
+class QLineEdit;
+
+namespace PokemonAutomation{
+
+
+
+class ColorCellWidget : public QWidget, public ConfigWidget{
+public:
+    using ParentState = ColorCell;
+
+public:
+    ~ColorCellWidget();
+    ColorCellWidget(QWidget& parent, ColorCell& value);
+
+    virtual void update_value() override;
+    virtual void on_config_value_changed(void* object) override;
+
+
+private:
+    ColorCell& m_value;
+    QLineEdit* m_line_edit;
+    QLabel* m_box;
+};
+
+
+class ColorOptionWidget : public QWidget, public ConfigWidget{
+public:
+    using ParentState = ColorOption;
+
+public:
+    ~ColorOptionWidget();
+    ColorOptionWidget(QWidget& parent, ColorOption& value);
+
+    virtual void update_value() override;
+    virtual void on_config_value_changed(void* object) override;
+
+private:
+    ColorCellWidget* m_cell;
+};
+
+
+
+
+}
+#endif
diff --git a/Common/Qt/Options/ConfigWidget.cpp b/Common/Qt/Options/ConfigWidget.cpp
index bedc65ce92..efcb3f1175 100644
--- a/Common/Qt/Options/ConfigWidget.cpp
+++ b/Common/Qt/Options/ConfigWidget.cpp
@@ -1,6 +1,6 @@
 /*  Config Option
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -14,6 +14,15 @@
 namespace PokemonAutomation{
 
 
+
+ConfigWidget* ConfigWidget::make_from_option(ConfigOption& option, QWidget* parent){
+    UiWrapper wrapper = option.make_ui_component(parent);
+    return dynamic_cast<ConfigWidget*>(wrapper.release());
+}
+
+
+
+
 ConfigWidget::~ConfigWidget(){
     m_value.remove_listener(*this);
 }
@@ -27,11 +36,17 @@ ConfigWidget::ConfigWidget(ConfigOption& m_value, QWidget& widget)
     , m_widget(&widget)
 {
 //    cout << "ConfigWidget::ConfigWidget(): " << (int)m_value.visibility() << endl;
+    // Plain QWidget option wrappers are layout containers. Keep native input
+    // controls (QLineEdit, QCheckBox, etc.) on their normal theme surfaces.
+    if (widget.metaObject() == &QWidget::staticMetaObject){
+        widget.setProperty("backgroundContainer", true);
+    }
     m_program_is_running = false;
     ConfigWidget::update_visibility();
     m_value.add_listener(*this);
 }
 void ConfigWidget::update_visibility(){
+    auto scope = m_value.check_scope();
     m_value.check_usage();
     if (m_widget == nullptr){
         return;
@@ -45,7 +60,12 @@ void ConfigWidget::update_visibility(){
 //    cout << "ConfigWidget::update_visibility(): " << (int)m_value.visibility() << endl;
     switch (m_value.visibility()){
     case ConfigOptionState::ENABLED:
-        m_widget->setEnabled(!m_value.lock_while_program_is_running() || !m_program_is_running);
+        // setEnable(false) only happens when the lock mode is LOCK_WHILE_RUNNING and the program is running.
+        // Ideally we should handle lock mode READ_ONLY here too, but m_widget as a QWidget does not have such
+        // function. Only some of its derived classes, like QLineEdit, can call setReadOnly().
+        // So here we treat READ_ONLY as enabled and let derived classes of ConfigWidget that have the
+        // functionality to set read-only (e.g. StringOptionWidget) to handle READ_ONLY.
+        m_widget->setEnabled(m_value.lock_mode() != LockMode::LOCK_WHILE_RUNNING || !m_program_is_running);
         m_widget->setVisible(true);
         break;
     case ConfigOptionState::DISABLED:
@@ -59,24 +79,24 @@ void ConfigWidget::update_visibility(){
     }
 }
 void ConfigWidget::update_visibility(bool program_is_running){
-    m_value.check_usage();
+    auto scope = m_value.check_scope();
     m_program_is_running = program_is_running;
     update_visibility();
 }
 void ConfigWidget::update_all(bool program_is_running){
-    m_value.check_usage();
+    auto scope = m_value.check_scope();
     update_value();
     update_visibility(program_is_running);
 }
 
-void ConfigWidget::visibility_changed(){
-    m_value.check_usage();
+void ConfigWidget::on_config_visibility_changed(){
+    auto scope = m_value.check_scope();
     QMetaObject::invokeMethod(m_widget, [this]{
         update_visibility();
     }, Qt::QueuedConnection);
 }
-void ConfigWidget::program_state_changed(bool program_is_running){
-    m_value.check_usage();
+void ConfigWidget::on_program_state_changed(bool program_is_running){
+    auto scope = m_value.check_scope();
     QMetaObject::invokeMethod(m_widget, [this, program_is_running]{
         update_visibility(program_is_running);
     }, Qt::QueuedConnection);
diff --git a/Common/Qt/Options/ConfigWidget.h b/Common/Qt/Options/ConfigWidget.h
index 8cf30b8d8a..0e68477833 100644
--- a/Common/Qt/Options/ConfigWidget.h
+++ b/Common/Qt/Options/ConfigWidget.h
@@ -1,6 +1,6 @@
 /*  Config Option
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -8,11 +8,27 @@
 #define PokemonAutomation_ConfigWidget_H
 
 #include "Common/Cpp/Options/ConfigOption.h"
+#include "Common/Qt/UiStateQtWidget.h"
 
 namespace PokemonAutomation{
 
 
-class ConfigWidget : protected ConfigOption::Listener{
+//  Base class for all config widgets that control a program option.
+//
+//  It is intuitive to let ConfigWidget inherit QWidget, base class of Qt UI element,
+//  But some derived classes of ConfigWidget, e.g. StringCellWidget, needs to inherit
+//  QWidget's derived classes, e.g. QLineEdit. To avoid nasty diamond inheritance,
+//  ConfigWidget does not inherit QWidget. User has to call ConfigWidget::widget()
+//  to get the actual QWidget.
+//
+//  ConfigWidget's derived classes need to inherit a QWidget or its derived class
+//  and pass *this as the widget in ConfigWidget(m_valuie, widget) so a ConfigWidget
+//  pointer can get the actual QWidget.
+class ConfigWidget : public UiComponentQtWidget, protected ConfigOption::Listener{
+public:
+    static ConfigWidget* make_from_option(ConfigOption& option, QWidget* parent);
+
+
 public:
     virtual ~ConfigWidget();
     ConfigWidget(ConfigOption& m_value);
@@ -21,17 +37,31 @@ class ConfigWidget : protected ConfigOption::Listener{
     const ConfigOption& option() const{ return m_value; }
     ConfigOption& option(){ return m_value; }
 
-    QWidget& widget(){ return *m_widget; }
+    QWidget& widget() override{ return *m_widget; }
 
     //  Needs to be called on the UI thread.
     virtual void update_value(){}
+    //  Needs to be called on the UI thread. Update QWidget's visibility based on
+    //  ConfigOption m_value's visibility setting.
+    //  Note this function is unable to set READ_ONLY visibility state. The derived
+    //  classes of ConfigWidget who have the functionality to set read-only should
+    //  overwrite on_config_visibility_changed() to handle that.
     virtual void update_visibility();
     void update_visibility(bool program_is_running);
     void update_all(bool program_is_running);
 
+
 protected:
-    virtual void visibility_changed() override;
-    virtual void program_state_changed(bool program_is_running) override;
+    //  Overwrite ConfigOption::Listener::on_config_visibility_changed().
+    //  Called when the listened config option's visibility is changed.
+    //  This function invokes this->update_visibility() on the Qt UI thread.
+    //  Note due to update_visibility() is unable to set READ_ONLY visbility state.
+    //  It is up to the derived classes of ConfigWidget who have the functionality
+    //  to set read-only (e.g. StringOptionWidget) to overwrite this function to
+    //  handle read-only.
+    virtual void on_config_visibility_changed() override;
+    virtual void on_program_state_changed(bool program_is_running) override;
+
 
 protected:
     ConfigOption& m_value;
@@ -41,5 +71,6 @@ class ConfigWidget : protected ConfigOption::Listener{
 
 
 
+
 }
 #endif
diff --git a/Common/Qt/Options/DateWidget.cpp b/Common/Qt/Options/DateWidget.cpp
index a53437b39b..4a81adfed1 100644
--- a/Common/Qt/Options/DateWidget.cpp
+++ b/Common/Qt/Options/DateWidget.cpp
@@ -1,62 +1,127 @@
 /*  Date Option
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include <QHBoxLayout>
 #include <QLabel>
-#include <QDateEdit>
 #include "DateWidget.h"
 
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
 namespace PokemonAutomation{
 
 
 
-ConfigWidget* DateOption::make_QtWidget(QWidget& parent){
-    return new DateWidget(parent, *this);
+template class RegisterUiStateQtWidget<DateTimeCellWidget>;
+template class RegisterUiStateQtWidget<DateTimeOptionWidget>;
+
+
+
+
+
+QDateTime DateTime_to_QDateTime(const DateTime& date){
+    return QDateTime(
+        QDate(date.year, date.month, date.day),
+        QTime(
+            std::max<int>(date.hour, 0),
+            std::max<int>(date.minute, 0),
+            std::max<int>(date.second, 0)
+        )
+    );
+}
+DateTime QDateTime_to_DateTime(const QDateTime& date, DateTimeOption::Level level){
+    DateTime ret;
+    QDate qdate = date.date();
+    ret.year = (int16_t)qdate.year();
+    ret.month = (int8_t)qdate.month();
+    ret.day = (int8_t)qdate.day();
+
+    if (level < DateTimeOption::DATE_HOUR_MIN){
+        return ret;
+    }
+
+    QTime qtime = date.time();
+    ret.hour = (int8_t)qtime.hour();
+    ret.minute = (int8_t)qtime.minute();
+
+    if (level < DateTimeOption::DATE_HOUR_MIN_SEC){
+        return ret;
+    }
+
+    ret.second = (int8_t)qtime.second();
+
+    return ret;
 }
 
 
 
-DateWidget::~DateWidget(){
+DateTimeCellWidget::~DateTimeCellWidget(){
     m_value.remove_listener(*this);
 }
-DateWidget::DateWidget(QWidget& parent, DateOption& value)
-    : QWidget(&parent)
+DateTimeCellWidget::DateTimeCellWidget(QWidget& parent, DateTimeCell& value)
+    : QDateTimeEdit(DateTime_to_QDateTime(value.get()), &parent)
     , ConfigWidget(value, *this)
     , m_value(value)
 {
-    QHBoxLayout* layout = new QHBoxLayout(this);
-    layout->setContentsMargins(0, 0, 0, 0);
-    QLabel* text = new QLabel(QString::fromStdString(value.label()), this);
-    text->setWordWrap(true);
-    layout->addWidget(text, 1);
+    switch (value.level()){
+    case DateTimeOption::DATE:
+        this->setDisplayFormat("MMMM d, yyyy");
+        break;
+    case DateTimeOption::DATE_HOUR_MIN:
+        this->setDisplayFormat("MMMM d, yyyy hh:mm");
+        break;
+    case DateTimeOption::DATE_HOUR_MIN_SEC:
+        this->setDisplayFormat("MMMM d, yyyy hh:mm:ss");
+        break;
+    }
+    this->setMinimumDateTime(DateTime_to_QDateTime(value.min_value()));
+    this->setMaximumDateTime(DateTime_to_QDateTime(value.max_value()));
 
-    m_date_edit = new QDateEdit(m_value.get());
-    layout->addWidget(m_date_edit, 1);
-    m_date_edit->setDisplayFormat("MMMM d, yyyy");
-    m_date_edit->setMinimumDate(value.min_value());
-    m_date_edit->setMaximumDate(value.max_value());
+//    cout << "Max time = " << m_date_edit->maximumTime().toString().toStdString() << endl;
 
     connect(
-        m_date_edit, &QDateEdit::dateChanged,
-        this, [this](const QDate& date){
-            m_value.set(date);
+        this, &QDateTimeEdit::dateTimeChanged,
+        this, [this](const QDateTime& date){
+            m_value.set(QDateTime_to_DateTime(date, m_value.level()));
         }
     );
 
     value.add_listener(*this);
 }
-void DateWidget::update_value(){
-    m_date_edit->setDate(m_value.get());
+void DateTimeCellWidget::update_value(){
+    this->setDateTime(DateTime_to_QDateTime(m_value.get()));
 }
-void DateWidget::value_changed(){
-    QMetaObject::invokeMethod(m_date_edit, [this]{
+void DateTimeCellWidget::on_config_value_changed(void* object){
+    QMetaObject::invokeMethod(this, [this]{
         update_value();
     }, Qt::QueuedConnection);
 }
 
 
 
+DateTimeOptionWidget::DateTimeOptionWidget(QWidget& parent, DateTimeOption& value)
+    : QWidget(&parent)
+    , ConfigWidget(value, *this)
+{
+    QHBoxLayout* layout = new QHBoxLayout(this);
+    layout->setContentsMargins(0, 0, 0, 0);
+    QLabel* text = new QLabel(QString::fromStdString(value.label()), this);
+    text->setWordWrap(true);
+    text->setTextFormat(Qt::RichText);
+    text->setTextInteractionFlags(Qt::TextBrowserInteraction);
+    text->setOpenExternalLinks(true);
+    layout->addWidget(text, 1);
+
+    m_date_edit = new DateTimeCellWidget(*this, value);
+    layout->addWidget(m_date_edit, 1);
+}
+
+
+
+
+
 }
diff --git a/Common/Qt/Options/DateWidget.h b/Common/Qt/Options/DateWidget.h
index 8de4883088..a2bc03fcf5 100644
--- a/Common/Qt/Options/DateWidget.h
+++ b/Common/Qt/Options/DateWidget.h
@@ -1,6 +1,6 @@
 /*  Date Option
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -8,29 +8,45 @@
 #define PokemonAutomation_Options_DateWidget_H
 
 #include <QWidget>
+#include <QDateTimeEdit>
 #include "Common/Cpp/Options/DateOption.h"
 #include "ConfigWidget.h"
 
-class QDateEdit;
-
 namespace PokemonAutomation{
 
 
 
-class DateWidget : public QWidget, public ConfigWidget{
+class DateTimeCellWidget : public QDateTimeEdit, public ConfigWidget{
+public:
+    using ParentState = DateTimeCell;
+
 public:
-    ~DateWidget();
-    DateWidget(QWidget& parent, DateOption& value);
+    ~DateTimeCellWidget();
+    DateTimeCellWidget(QWidget& parent, DateTimeCell& value);
+
+    virtual void wheelEvent(QWheelEvent* event) override{
+        QWidget::wheelEvent(event);
+    }
 
     virtual void update_value() override;
-    virtual void value_changed() override;
+    virtual void on_config_value_changed(void* object) override;
 
 private:
-    DateOption& m_value;
-    QDateEdit* m_date_edit;
+    DateTimeCell& m_value;
 };
 
 
+class DateTimeOptionWidget : public QWidget, public ConfigWidget{
+public:
+    using ParentState = DateTimeOption;
+
+public:
+    DateTimeOptionWidget(QWidget& parent, DateTimeOption& value);
+
+private:
+    DateTimeCellWidget* m_date_edit;
+};
+
 
 }
 #endif
diff --git a/Common/Qt/Options/EditableTableWidget.cpp b/Common/Qt/Options/EditableTableWidget.cpp
index e5ed64380a..d5d0e02729 100644
--- a/Common/Qt/Options/EditableTableWidget.cpp
+++ b/Common/Qt/Options/EditableTableWidget.cpp
@@ -1,15 +1,15 @@
 /*  Editable Table Widget
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include <QFileDialog>
 #include <QVBoxLayout>
 #include <QHeaderView>
-#include <QScrollBar>
 #include <QLabel>
 #include <QPushButton>
+#include <QMessageBox>
 #include "Common/Cpp/Json/JsonValue.h"
 #include "Common/Qt/AutoHeightTable.h"
 #include "EditableTableWidget.h"
@@ -21,8 +21,12 @@
 namespace PokemonAutomation{
 
 
-ConfigWidget* EditableTableOption::make_QtWidget(QWidget& parent){
-    return new EditableTableWidget(parent, *this);
+template class RegisterUiStateQtWidget<EditableTableWidget>;
+
+
+
+void EditableTableWidget::Label::mouseDoubleClickEvent(QMouseEvent* event){
+    m_parent->mouseDoubleClickEvent(event);
 }
 
 
@@ -35,66 +39,43 @@ EditableTableWidget::EditableTableWidget(QWidget& parent, EditableTableOption& v
     : QWidget(&parent)
     , ConfigWidget(value, *this)
     , m_value(value)
-    , m_table(nullptr)
 {
     QVBoxLayout* layout = new QVBoxLayout(this);
     layout->setContentsMargins(0, 0, 0, 0);
 
-    QLabel* label = new QLabel(QString::fromStdString(value.label()), this);
-    label->setWordWrap(true);
-    layout->addWidget(label);
-
-    m_table = new AutoHeightTableWidget(this);
-    layout->addWidget(m_table, 0, Qt::AlignTop);
-//    m_table->setMouseTracking(false);
-
-    QStringList header;
-    for (const std::string& name : m_value.make_header()){
-        header << QString::fromStdString(name);
+    if (!value.label().empty()){
+        Label* label = new Label(QString::fromStdString(value.label()), this);
+        label->m_parent = this;
+        label->setWordWrap(true);
+        label->setTextFormat(Qt::RichText);
+        label->setTextInteractionFlags(Qt::TextBrowserInteraction);
+        label->setOpenExternalLinks(true);
+        layout->addWidget(label);
     }
-    header << "" << "" << "";
-    m_table->setColumnCount(header.size());
-    m_table->setHorizontalHeaderLabels(header);
 
-    QFont font;
-    font.setBold(true);
-    m_table->horizontalHeader()->setFont(font);
-//    m_table->horizontalHeader()->setSectionResizeMode(QHeaderView::ResizeToContents);
-    m_table->horizontalHeader()->setSectionResizeMode(QHeaderView::Interactive);
-
-    //  Add row button.
     {
-        int row = m_table->rowCount();
-        m_table->insertRow(row);
-
-        QPushButton* button = new QPushButton(m_table);
-        button->setText("Add Row");
-        m_table->setCellWidget(row, 0, button);
-        connect(
-            button, &QPushButton::clicked,
-            this, [this](bool){
-                int index = (int)m_current.size();
-                m_value.insert_row(index, m_value.make_row());
-            }
-        );
+        m_expand_text = new QWidget(this);
+        m_expand_text->setLayout(new QVBoxLayout());
+        m_expand_text->layout()->addWidget(new QLabel("<font color=\"orange\">(double click to expand table)</font>", this));
+        m_expand_text->setVisible(false);
+        layout->addWidget(m_expand_text);
     }
 
-    EditableTableWidget::update_value();
-//    EditableTableWidget2::value_changed();
-
-//    m_table->resizeColumnsToContents();
-//    m_table->resizeRowsToContents();
-    m_table->update_height();
-
+    if (value.expand_by_default()){
+        m_expand_text->setVisible(false);
+        make_table();
+    }else{
+        m_expand_text->setVisible(true);
+    }
 
     if (value.saveload_enabled()){
         QHBoxLayout* buttons = new QHBoxLayout();
         layout->addLayout(buttons);
         {
-            QPushButton* load_button = new QPushButton("Load Table", this);
-            buttons->addWidget(load_button, 1);
+            QPushButton* button = new QPushButton("Load Table", this);
+            buttons->addWidget(button, 1);
             connect(
-                load_button, &QPushButton::clicked,
+                button, &QPushButton::clicked,
                 this, [this, &value](bool){
                     std::string path = QFileDialog::getOpenFileName(
                         this,
@@ -103,15 +84,24 @@ EditableTableWidget::EditableTableWidget(QWidget& parent, EditableTableOption& v
                     if (path.empty()){
                         return;
                     }
-                    value.load_json(load_json_file(path));
+                    try{
+                        value.load_json(load_json_file(path));
+                    }catch (Exception& e){
+                        QMessageBox::warning(
+                            nullptr,
+                            "Failed to load JSON.",
+                            QString::fromStdString(e.message())
+                        );
+                    }
+
                 }
             );
         }
         {
-            QPushButton* save_button = new QPushButton("Save Table", this);
-            buttons->addWidget(save_button, 1);
+            QPushButton* button = new QPushButton("Save Table", this);
+            buttons->addWidget(button, 1);
             connect(
-                save_button, &QPushButton::clicked,
+                button, &QPushButton::clicked,
                 this, [this, &value](bool){
                     std::string path = QFileDialog::getSaveFileName(
                         this,
@@ -125,6 +115,29 @@ EditableTableWidget::EditableTableWidget(QWidget& parent, EditableTableOption& v
                 }
             );
         }
+        {
+            QPushButton* button = new QPushButton(
+                value.defaults().empty()
+                    ? "Clear Table"
+                    : "Restore Defaults",
+                this
+            );
+            buttons->addWidget(button, 1);
+            connect(
+                button, &QPushButton::clicked,
+                this, [&value](bool){
+                    QMessageBox::StandardButton button = QMessageBox::question(
+                        nullptr,
+                        "Restore Defaults",
+                        "Are you sure you wish to this table back to defaults? This will wipe the current table.",
+                        QMessageBox::Ok | QMessageBox::Cancel
+                    );
+                    if (button == QMessageBox::Ok){
+                        value.restore_defaults();
+                    }
+                }
+            );
+        }
         buttons->addStretch(2);
     }
 
@@ -132,8 +145,24 @@ EditableTableWidget::EditableTableWidget(QWidget& parent, EditableTableOption& v
 }
 
 void EditableTableWidget::update_value(){
+    if (m_table == nullptr){
+        m_current.clear();
+        return;
+    }
+
+    //  Refresh the header in case that changed.
+    QStringList header;
+    for (const std::string& name : m_value.make_header()){
+        header << QString::fromStdString(name);
+    }
+    header << "" << "" << "";
+
+    m_table->setColumnCount(int(header.size()));
+    m_table->setHorizontalHeaderLabels(header);
+
+    //  Now update the table.
     std::vector<std::shared_ptr<EditableTableRow>> latest = m_value.current_refs();
-//    cout << "latest.size() = " << latest.size() << endl;
+//    cout << "m_current.size() = " << m_current.size() << ", latest.size() = " << latest.size() << endl;
 
 //    //  Adding cells to a table overwrites their visibility. Store all the cells
 //    //  here so we can correct their visibility later.
@@ -175,13 +204,19 @@ void EditableTableWidget::update_value(){
             continue;
         }
 
-        //  Add the row from the new list.
-        m_table->insertRow((int)index_new);
+            //  Add the row from the new list.
+            m_table->insertRow((int)index_new);
 
         //  Populate widgets.
         {
             EditableTableRow& row = *latest[index_new];
             std::vector<ConfigOption*> cells = row.make_cells();
+            if (cells.size() > (size_t)m_table->columnCount()){
+                throw InternalProgramError(
+                    nullptr, PA_CURRENT_FUNCTION,
+                    "Table is wider than the header."
+                );
+            }
             int c = 0;
             int stop = (int)cells.size();
             for (; c < stop; c++){
@@ -189,10 +224,12 @@ void EditableTableWidget::update_value(){
                 //  QTableWidget for some reason forces the visibility of its
                 //  cells to visible.
 //                cout << "make cell widget" << endl;
-                QWidget* widget = &cells[c]->make_QtWidget(*m_table)->widget();
+                QWidget* widget = &ConfigWidget::make_from_option(*cells[c], m_table)->widget();
                 QWidget* cell_widget = new QWidget(this);
                 QVBoxLayout* layout = new QVBoxLayout(cell_widget);
                 layout->setContentsMargins(0, 0, 0, 0);
+//                cell_widget->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+                widget->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
                 layout->addWidget(widget);
 //                cell_widgets.emplace_back(widget);
                 m_table->setCellWidget((int)index_new, c, cell_widget);
@@ -229,26 +266,83 @@ void EditableTableWidget::update_value(){
     }
 #endif
 }
-void EditableTableWidget::value_changed(){
-    QMetaObject::invokeMethod(m_table, [this]{
+void EditableTableWidget::on_config_value_changed(void* object){
+    QMetaObject::invokeMethod(this, [this]{
         update_value();
     }, Qt::QueuedConnection);
 }
 void EditableTableWidget::update_sizes(){
 //    cout << "update_sizes()" << endl;
-    QMetaObject::invokeMethod(m_table, [this]{
-//        cout << "before = " << m_table->cellWidget(0, 1)->width() << endl;
-        m_table->resizeColumnsToContents();
-        m_table->resizeRowsToContents();
-        m_table->update_height();
-//        cout << "after = " << m_table->cellWidget(0, 1)->width() << endl;
+    QMetaObject::invokeMethod(this, [this]{
+        if (m_table != nullptr){
+            m_table->resizeColumnsToContents();
+            m_table->resizeRowsToContents();
+            m_table->update_height();
+        }
     }, Qt::QueuedConnection);
 }
 
 
+void EditableTableWidget::mouseDoubleClickEvent(QMouseEvent* event){
+    if (m_table){
+        m_expand_text->setVisible(true);
+        delete m_table;
+        m_table = nullptr;
+        m_current.clear();
+        return;
+    }
 
+    m_expand_text->setVisible(false);
+    make_table();
+}
+
+
+void EditableTableWidget::make_table(){
+    m_table = new AutoHeightTableWidget(this);
+    QVBoxLayout* layout = static_cast<QVBoxLayout*>(this->layout());
+    layout->insertWidget(layout->count() - 1, m_table, 0, Qt::AlignTop);
+//    m_table->setMouseTracking(false);
+
+    QStringList header;
+    for (const std::string& name : m_value.make_header()){
+        header << QString::fromStdString(name);
+    }
+    header << "" << "" << "";
+    m_table->setColumnCount(int(header.size()));
+    m_table->setHorizontalHeaderLabels(header);
+
+    QFont font;
+    font.setBold(true);
+    m_table->horizontalHeader()->setFont(font);
+//    m_table->horizontalHeader()->setSectionResizeMode(QHeaderView::ResizeToContents);
+    m_table->horizontalHeader()->setSectionResizeMode(QHeaderView::Interactive);
+
+    //  Add row button.
+    {
+        int row = m_table->rowCount();
+        m_table->insertRow(row);
+
+        QPushButton* button = new QPushButton(m_table);
+        button->setText("Add Row");
+        m_table->setCellWidget(row, 0, button);
+        connect(
+            button, &QPushButton::clicked,
+            this, [this](bool){
+                int index = (int)m_current.size();
+                m_value.insert_row(index, m_value.make_row());
+            }
+        );
+    }
+
+    EditableTableWidget::update_value();
+//    EditableTableWidget2::value_changed();
+
+//    m_table->resizeColumnsToContents();
+//    m_table->resizeRowsToContents();
+    m_table->update_height();
+}
 QWidget* EditableTableWidget::make_clone_button(EditableTableRow& row){
-    QPushButton* button = new QPushButton(m_table);
+    QPushButton* button = new QPushButton(this);
 
     QFont font;
     font.setBold(true);
@@ -266,7 +360,7 @@ QWidget* EditableTableWidget::make_clone_button(EditableTableRow& row){
     return button;
 }
 QWidget* EditableTableWidget::make_insert_button(EditableTableRow& row){
-    QPushButton* button = new QPushButton(m_table);
+    QPushButton* button = new QPushButton(this);
 
     QFont font;
     font.setBold(true);
@@ -284,7 +378,7 @@ QWidget* EditableTableWidget::make_insert_button(EditableTableRow& row){
     return button;
 }
 QWidget* EditableTableWidget::make_delete_button(EditableTableRow& row){
-    QPushButton* button = new QPushButton(m_table);
+    QPushButton* button = new QPushButton(this);
 
     QFont font;
     font.setBold(true);
diff --git a/Common/Qt/Options/EditableTableWidget.h b/Common/Qt/Options/EditableTableWidget.h
index ce26c2ab80..03d19ea16a 100644
--- a/Common/Qt/Options/EditableTableWidget.h
+++ b/Common/Qt/Options/EditableTableWidget.h
@@ -1,6 +1,6 @@
 /*  Editable Table Widget
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -8,6 +8,7 @@
 #define PokemonAutomation_Options_EditableTableWidget_H
 
 #include <QWidget>
+#include <QLabel>
 #include "Common/Cpp/Options/EditableTableOption.h"
 #include "ConfigWidget.h"
 
@@ -17,23 +18,38 @@ class AutoHeightTableWidget;
 
 
 class EditableTableWidget : public QWidget, public ConfigWidget{
+public:
+    using ParentState = EditableTableOption;
+
 public:
     ~EditableTableWidget();
     EditableTableWidget(QWidget& parent, EditableTableOption& value);
 
     virtual void update_value() override;
-    virtual void value_changed() override;
+    virtual void on_config_value_changed(void* object) override;
 
     void update_sizes();
 
 private:
+    virtual void mouseDoubleClickEvent(QMouseEvent* event) override;
+
+    void make_table();
     QWidget* make_clone_button(EditableTableRow& row);
     QWidget* make_insert_button(EditableTableRow& row);
     QWidget* make_delete_button(EditableTableRow& row);
 
+    class Label : public QLabel{
+    public:
+        using QLabel::QLabel;
+        virtual void mouseDoubleClickEvent(QMouseEvent* event) override;
+
+        EditableTableWidget* m_parent;
+    };
+
 private:
     EditableTableOption& m_value;
-    AutoHeightTableWidget* m_table;
+    AutoHeightTableWidget* m_table = nullptr;
+    QWidget* m_expand_text = nullptr;
     std::vector<std::shared_ptr<EditableTableRow>> m_current;
 };
 
diff --git a/Common/Qt/Options/EnumDropdownWidget.cpp b/Common/Qt/Options/EnumDropdownWidget.cpp
index 7614d1474a..1a82c4821c 100644
--- a/Common/Qt/Options/EnumDropdownWidget.cpp
+++ b/Common/Qt/Options/EnumDropdownWidget.cpp
@@ -1,6 +1,6 @@
 /*  Enum Dropdown Option
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -13,12 +13,8 @@
 namespace PokemonAutomation{
 
 
-ConfigWidget* IntegerEnumDropdownCell::make_QtWidget(QWidget& parent){
-    return new EnumDropdownCellWidget(parent, *this);
-}
-ConfigWidget* IntegerEnumDropdownOption::make_QtWidget(QWidget& parent){
-    return new EnumDropdownOptionWidget(parent, *this);
-}
+template class RegisterUiStateQtWidget<EnumDropdownCellWidget>;
+template class RegisterUiStateQtWidget<EnumDropdownOptionWidget>;
 
 
 
@@ -26,10 +22,12 @@ EnumDropdownCellWidget::~EnumDropdownCellWidget(){
     m_value.remove_listener(*this);
 }
 EnumDropdownCellWidget::EnumDropdownCellWidget(QWidget& parent, IntegerEnumDropdownCell& value)
-    : NoWheelComboBox(&parent)
+    : NoWheelCompactComboBox(&parent)
     , ConfigWidget(value, *this)
     , m_value(value)
 {
+//    this->setFrame(false);
+
     for (const auto& item : value.database().all_values()){
         int index = this->count();
         m_value_to_index[item] = index;
@@ -70,7 +68,7 @@ EnumDropdownCellWidget::EnumDropdownCellWidget(QWidget& parent, IntegerEnumDropd
 void EnumDropdownCellWidget::update_value(){
     this->setCurrentIndex(m_value_to_index[m_value.current_value()]);
 }
-void EnumDropdownCellWidget::value_changed(){
+void EnumDropdownCellWidget::on_config_value_changed(void* object){
     QMetaObject::invokeMethod(this, [this]{
         update_value();
     }, Qt::QueuedConnection);
diff --git a/Common/Qt/Options/EnumDropdownWidget.h b/Common/Qt/Options/EnumDropdownWidget.h
index ec1e18a8c6..b7fbcb76c9 100644
--- a/Common/Qt/Options/EnumDropdownWidget.h
+++ b/Common/Qt/Options/EnumDropdownWidget.h
@@ -1,6 +1,6 @@
 /*  Enum Dropdown Option
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -8,20 +8,23 @@
 #define PokemonAutomation_Options_EnumDropdownWidget_H
 
 #include <map>
-#include "Common/Qt/NoWheelComboBox.h"
 #include "Common/Cpp/Options/EnumDropdownOption.h"
+#include "Common/Qt/NoWheelComboBox.h"
 #include "ConfigWidget.h"
 
 namespace PokemonAutomation{
 
 
-class EnumDropdownCellWidget : public NoWheelComboBox, public ConfigWidget{
+class EnumDropdownCellWidget : public NoWheelCompactComboBox, public ConfigWidget{
+public:
+    using ParentState = IntegerEnumDropdownCell;
+
 public:
     ~EnumDropdownCellWidget();
     EnumDropdownCellWidget(QWidget& parent, IntegerEnumDropdownCell& value);
 
     virtual void update_value() override;
-    virtual void value_changed() override;
+    virtual void on_config_value_changed(void* object) override;
 
 protected:
     IntegerEnumDropdownCell& m_value;
@@ -31,6 +34,9 @@ class EnumDropdownCellWidget : public NoWheelComboBox, public ConfigWidget{
 
 
 class EnumDropdownOptionWidget : public QWidget, public ConfigWidget{
+public:
+    using ParentState = IntegerEnumDropdownOption;
+
 public:
     EnumDropdownOptionWidget(QWidget& parent, IntegerEnumDropdownOption& value);
 
diff --git a/Common/Qt/Options/FixedCodeWidget.cpp b/Common/Qt/Options/FixedCodeWidget.cpp
index 29398b7160..2da70c080e 100644
--- a/Common/Qt/Options/FixedCodeWidget.cpp
+++ b/Common/Qt/Options/FixedCodeWidget.cpp
@@ -1,6 +1,6 @@
 /*  Fixed Code Option
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -14,9 +14,7 @@
 namespace PokemonAutomation{
 
 
-ConfigWidget* FixedCodeOption::make_QtWidget(QWidget& parent){
-    return new FixedCodeWidget(parent, *this);
-}
+template class RegisterUiStateQtWidget<FixedCodeWidget>;
 
 
 
@@ -76,7 +74,7 @@ FixedCodeWidget::FixedCodeWidget(QWidget& parent, FixedCodeOption& value)
 void FixedCodeWidget::update_value(){
     m_box->setText(QString::fromStdString(m_value));
 }
-void FixedCodeWidget::value_changed(){
+void FixedCodeWidget::on_config_value_changed(void* object){
     QMetaObject::invokeMethod(m_box, [this]{
         update_value();
     }, Qt::QueuedConnection);
diff --git a/Common/Qt/Options/FixedCodeWidget.h b/Common/Qt/Options/FixedCodeWidget.h
index 5583d43379..499cbc9e04 100644
--- a/Common/Qt/Options/FixedCodeWidget.h
+++ b/Common/Qt/Options/FixedCodeWidget.h
@@ -1,6 +1,6 @@
 /*  Fixed Code Option
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -17,12 +17,15 @@ namespace PokemonAutomation{
 
 
 class FixedCodeWidget : public QWidget, public ConfigWidget{
+public:
+    using ParentState = FixedCodeOption;
+
 public:
     ~FixedCodeWidget();
     FixedCodeWidget(QWidget& parent, FixedCodeOption& value);
 
     virtual void update_value() override;
-    virtual void value_changed() override;
+    virtual void on_config_value_changed(void* object) override;
 
 private:
     std::string sanitized_code(const std::string& text) const;
diff --git a/Common/Qt/Options/FloatingPointWidget.cpp b/Common/Qt/Options/FloatingPointWidget.cpp
index 5badb8bf9b..ec91dfd02f 100644
--- a/Common/Qt/Options/FloatingPointWidget.cpp
+++ b/Common/Qt/Options/FloatingPointWidget.cpp
@@ -1,25 +1,25 @@
 /*  Floating-Point Option
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include <QHBoxLayout>
 #include <QLabel>
 #include <QLineEdit>
+#include "Common/Cpp/PrettyPrint.h"
 #include "ConfigWidget.h"
 #include "FloatingPointWidget.h"
 
-namespace PokemonAutomation{
+//#include <iostream>
+//using std::cout;
+//using std::endl;
 
+namespace PokemonAutomation{
 
 
-ConfigWidget* FloatingPointCell::make_QtWidget(QWidget& parent){
-    return new FloatingPointCellWidget(parent, *this);
-}
-ConfigWidget* FloatingPointOption::make_QtWidget(QWidget& parent){
-    return new FloatingPointOptionWidget(parent, *this);
-}
+template class RegisterUiStateQtWidget<FloatingPointCellWidget>;
+template class RegisterUiStateQtWidget<FloatingPointOptionWidget>;
 
 
 
@@ -27,7 +27,7 @@ ConfigWidget* FloatingPointOption::make_QtWidget(QWidget& parent){
 FloatingPointCellWidget::~FloatingPointCellWidget(){
     m_value.remove_listener(*this);
 }
-FloatingPointCellWidget::FloatingPointCellWidget(QWidget& parent, FloatingPointCell& value)
+FloatingPointCellWidget::FloatingPointCellWidget(QWidget& parent, FloatingPointCell& value, bool sanitize)
     : QLineEdit(QString::number(value, 'f'), &parent)
     , ConfigWidget(value, *this)
     , m_value(value)
@@ -48,25 +48,31 @@ FloatingPointCellWidget::FloatingPointCellWidget(QWidget& parent, FloatingPointC
     );
     connect(
         this, &QLineEdit::editingFinished,
-        this, [this](){
+        this, [this, sanitize](){
             bool ok;
             double current = this->text().toDouble(&ok);
             QPalette palette;
-            if (ok && m_value.check_validity(current).empty()){
-                palette.setColor(QPalette::Text, Qt::black);
+            palette.setColor(QPalette::Text, Qt::black);
+            if (sanitize){
+                m_value.set_and_sanitize(current);
             }else{
-                palette.setColor(QPalette::Text, Qt::red);
+                if (!ok || !m_value.check_validity(current).empty()){
+                    palette.setColor(QPalette::Text, Qt::red);
+                }
+                m_value.set(current);
             }
             this->setPalette(palette);
-            m_value.set(current);
+
+            //  Always update the UI.
+            on_config_value_changed(this);
         }
     );
     value.add_listener(*this);
 }
 void FloatingPointCellWidget::update_value(){
-    this->setText(QString::number(m_value, 'f'));
+    this->setText(QString::fromStdString(tostr_fixed_no_trailing_zero(m_value, 6)));
 }
-void FloatingPointCellWidget::value_changed(){
+void FloatingPointCellWidget::on_config_value_changed(void* object){
     QMetaObject::invokeMethod(this, [this]{
         update_value();
     }, Qt::QueuedConnection);
@@ -87,15 +93,18 @@ FloatingPointOptionWidget::FloatingPointOptionWidget(QWidget& parent, FloatingPo
     layout->setContentsMargins(0, 0, 0, 0);
     QLabel* text = new QLabel(QString::fromStdString(value.label()), this);
     text->setWordWrap(true);
+    text->setTextFormat(Qt::RichText);
+    text->setTextInteractionFlags(Qt::TextBrowserInteraction);
+    text->setOpenExternalLinks(true);
     layout->addWidget(text, 1);
-    m_cell = new FloatingPointCellWidget(*this, value);
+    m_cell = new FloatingPointCellWidget(*this, value, false);
     layout->addWidget(m_cell, 1);
     value.add_listener(*this);
 }
 void FloatingPointOptionWidget::update_value(){
     m_cell->update_value();
 }
-void FloatingPointOptionWidget::value_changed(){
+void FloatingPointOptionWidget::on_config_value_changed(void* object){
     QMetaObject::invokeMethod(this, [this]{
         update_value();
     }, Qt::QueuedConnection);
diff --git a/Common/Qt/Options/FloatingPointWidget.h b/Common/Qt/Options/FloatingPointWidget.h
index 8213ce3b29..6517c0b57b 100644
--- a/Common/Qt/Options/FloatingPointWidget.h
+++ b/Common/Qt/Options/FloatingPointWidget.h
@@ -1,6 +1,6 @@
 /*  Floating-Point Option
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -15,12 +15,15 @@ namespace PokemonAutomation{
 
 
 class FloatingPointCellWidget : public QLineEdit, public ConfigWidget{
+public:
+    using ParentState = FloatingPointCell;
+
 public:
     ~FloatingPointCellWidget();
-    FloatingPointCellWidget(QWidget& parent, FloatingPointCell& value);
+    FloatingPointCellWidget(QWidget& parent, FloatingPointCell& value, bool sanitize = true);
 
     virtual void update_value() override;
-    virtual void value_changed() override;
+    virtual void on_config_value_changed(void* object) override;
 
 private:
     FloatingPointCell& m_value;
@@ -28,12 +31,15 @@ class FloatingPointCellWidget : public QLineEdit, public ConfigWidget{
 
 
 class FloatingPointOptionWidget : public QWidget, public ConfigWidget{
+public:
+    using ParentState = FloatingPointOption;
+
 public:
     ~FloatingPointOptionWidget();
     FloatingPointOptionWidget(QWidget& parent, FloatingPointOption& value);
 
     virtual void update_value() override;
-    virtual void value_changed() override;
+    virtual void on_config_value_changed(void* object) override;
 
 private:
     FloatingPointCellWidget* m_cell;
diff --git a/Common/Qt/Options/GroupWidget.cpp b/Common/Qt/Options/GroupWidget.cpp
index 128bbda020..c73dd95787 100644
--- a/Common/Qt/Options/GroupWidget.cpp
+++ b/Common/Qt/Options/GroupWidget.cpp
@@ -1,12 +1,14 @@
 /*  Group Option
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include <QVBoxLayout>
 #include <QLabel>
+#include <QPushButton>
 #include <QGroupBox>
+#include <QMessageBox>
 //#include "Common/Compiler.h"
 #include "GroupWidget.h"
 
@@ -17,10 +19,10 @@
 namespace PokemonAutomation{
 
 
+template class RegisterUiStateQtWidget<GroupWidget>;
+
+
 
-ConfigWidget* GroupOption::make_QtWidget(QWidget& parent){
-    return new GroupWidget(parent, *this);
-}
 
 
 GroupWidget::~GroupWidget(){
@@ -55,22 +57,20 @@ GroupWidget::GroupWidget(QWidget& parent, GroupOption& value)
     group_layout->setAlignment(Qt::AlignTop);
     group_layout->setContentsMargins(0, 10, 0, 0);
 
-    m_expand_text = new QWidget(m_group_box);
-    m_expand_text->setLayout(new QVBoxLayout());
-    m_expand_text->layout()->addWidget(new QLabel("(double click to expand)", this));
-    m_expand_text->setVisible(false);
-    group_layout->addWidget(m_expand_text);
-
-
-    m_options_holder = new QWidget(m_group_box);
-    group_layout->addWidget(m_options_holder);
-    m_options_layout = new QVBoxLayout(m_options_holder);
-    m_options_layout->setContentsMargins(0, 0, 0, 0);
+    {
+        m_expand_text = new QWidget(m_group_box);
+        m_expand_text->setProperty("backgroundContainer", true);
+        m_expand_text->setLayout(new QVBoxLayout());
+        m_expand_text->layout()->addWidget(new QLabel("<font color=\"orange\">(double click to expand)</font>", this));
+        m_expand_text->setVisible(false);
+        group_layout->addWidget(m_expand_text);
+    }
 
-    for (auto& item : value.options()){
-        m_options.emplace_back(item->make_QtWidget(parent));
-        m_options.back()->widget().setContentsMargins(5, 5, 5, 5);
-        m_options_layout->addWidget(&m_options.back()->widget());
+    if (value.default_expanded()){
+        m_expand_text->setVisible(false);
+        make_options();
+    }else{
+        m_expand_text->setVisible(true);
     }
 
     connect(
@@ -84,6 +84,49 @@ GroupWidget::GroupWidget(QWidget& parent, GroupOption& value)
     value.add_listener(*this);
 }
 
+void GroupWidget::make_options(){
+    QVBoxLayout* group_layout = static_cast<QVBoxLayout*>(m_group_box->layout());
+
+    m_options_holder = new QWidget(m_group_box);
+    m_options_holder->setProperty("backgroundContainer", true);
+    group_layout->addWidget(m_options_holder);
+    QVBoxLayout* options_layout = new QVBoxLayout(m_options_holder);
+    options_layout->setContentsMargins(0, 0, 0, 0);
+
+    m_options.clear();
+    for (auto& item : m_value.options()){
+        m_options.emplace_back(ConfigWidget::make_from_option(*item, this));
+        m_options.back()->widget().setContentsMargins(5, 5, 5, 5);
+        options_layout->addWidget(&m_options.back()->widget());
+    }
+
+    if (m_value.restore_defaults_button_enabled()){
+        m_restore_defaults_button = new QPushButton("Restore Defaults", this);
+        m_restore_defaults_button->setContentsMargins(5, 5, 5, 5);
+        QHBoxLayout* row = new QHBoxLayout();
+        options_layout->addLayout(row);
+        row->addWidget(m_restore_defaults_button, 1);
+        row->addStretch(3);
+        connect(
+            m_restore_defaults_button, &QPushButton::clicked,
+            this, [this](bool on){
+                QMessageBox::StandardButton button = QMessageBox::question(
+                    nullptr,
+                    "Restore Defaults",
+                    "Are you sure you wish to restore this section back to defaults?",
+                    QMessageBox::Ok | QMessageBox::Cancel
+                );
+                if (button == QMessageBox::Ok){
+                    m_value.restore_defaults();
+                }
+            }
+        );
+    }
+
+}
+
+
+
 #if 0
 void GroupWidget::set_options_enabled(bool enabled){
     for (ConfigWidget* item : m_options){
@@ -99,16 +142,23 @@ void GroupWidget::update_value(){
         item->update_value();
     }
 }
-void GroupWidget::value_changed(){
+void GroupWidget::on_config_value_changed(void* object){
 //    cout << "GroupWidget::value_changed()" << endl;
     QMetaObject::invokeMethod(this, [this]{
         update_value();
     }, Qt::QueuedConnection);
 }
 void GroupWidget::mouseDoubleClickEvent(QMouseEvent*){
-    m_expand_text->setVisible(m_expanded);
-    m_expanded = !m_expanded;
-    m_options_holder->setVisible(m_expanded);
+    if (m_options_holder){
+        m_expand_text->setVisible(true);
+        m_options.clear();
+        delete m_options_holder;
+        m_options_holder = nullptr;
+        return;
+    }
+
+    m_expand_text->setVisible(false);
+    make_options();
 }
 
 
diff --git a/Common/Qt/Options/GroupWidget.h b/Common/Qt/Options/GroupWidget.h
index cb49829dca..82adfe4330 100644
--- a/Common/Qt/Options/GroupWidget.h
+++ b/Common/Qt/Options/GroupWidget.h
@@ -1,24 +1,28 @@
 /*  Group Option
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include <QWidget>
-#include "ConfigWidget.h"
 #include "Common/Cpp/Options/GroupOption.h"
+#include "ConfigWidget.h"
 
 #ifndef PokemonAutomation_Options_GroupWidget_H
 #define PokemonAutomation_Options_GroupWidget_H
 
 class QVBoxLayout;
 class QGroupBox;
+class QPushButton;
 
 namespace PokemonAutomation{
 
 
 
 class GroupWidget : public QWidget, public ConfigWidget{
+public:
+    using ParentState = GroupOption;
+
 public:
     ~GroupWidget();
     GroupWidget(QWidget& parent, GroupOption& value);
@@ -26,19 +30,20 @@ class GroupWidget : public QWidget, public ConfigWidget{
 //    void set_options_enabled(bool enabled);
 
     virtual void update_value() override;
-    virtual void value_changed() override;
+    virtual void on_config_value_changed(void* object) override;
 
 private:
     virtual void mouseDoubleClickEvent(QMouseEvent* event) override;
 
+    void make_options();
+
 protected:
     GroupOption& m_value;
     QGroupBox* m_group_box;
-    QWidget* m_expand_text;
-    QWidget* m_options_holder;
+    QWidget* m_expand_text = nullptr;
+    QWidget* m_options_holder = nullptr;
     std::vector<ConfigWidget*> m_options;
-    bool m_expanded = true;
-    QVBoxLayout* m_options_layout;
+    QPushButton* m_restore_defaults_button = nullptr;
 };
 
 
diff --git a/Common/Qt/Options/IntegerRangeWidget.cpp b/Common/Qt/Options/IntegerRangeWidget.cpp
new file mode 100644
index 0000000000..90ea350b34
--- /dev/null
+++ b/Common/Qt/Options/IntegerRangeWidget.cpp
@@ -0,0 +1,96 @@
+/*  Integer Range Option
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <QHBoxLayout>
+#include <QLabel>
+#include <QLineEdit>
+#include "ConfigWidget.h"
+#include "IntegerRangeWidget.h"
+
+namespace PokemonAutomation{
+
+
+template <typename Type>
+IntegerRangeCellWidget<Type>::~IntegerRangeCellWidget(){
+    m_value.remove_listener(*this);
+}
+template <typename Type>
+IntegerRangeCellWidget<Type>::IntegerRangeCellWidget(QWidget& parent, IntegerRangeCell<Type>& value)
+    : QWidget(&parent)
+    , ConfigWidget(value, *this)
+    , m_value(value)
+{
+    QHBoxLayout* layout = new QHBoxLayout(this);
+
+    m_lo = new QLineEdit(this);
+    m_hi = new QLineEdit(this);
+    layout->addWidget(m_lo);
+    layout->addWidget(new QLabel(" - ", this));
+    layout->addWidget(m_hi);
+
+    Type lo, hi;
+    value.current_values(lo, hi);
+    m_lo->setText(QString::number(lo));
+    m_hi->setText(QString::number(hi));
+
+    if (sizeof(Type) <= 1){
+        m_lo->setMaximumWidth(30);
+        m_hi->setMaximumWidth(30);
+    }
+
+    connect(
+        m_lo, &QLineEdit::editingFinished,
+        this, [this](){
+            bool ok;
+            if (std::is_unsigned_v<Type>){
+                uint64_t current = m_lo->text().toULongLong(&ok);
+                m_value.set_lo((Type)current);
+            }else{
+                uint64_t current = m_lo->text().toLongLong(&ok);
+                m_value.set_lo((Type)current);
+            }
+        }
+    );
+    connect(
+        m_hi, &QLineEdit::editingFinished,
+        this, [this](){
+            bool ok;
+            if (std::is_unsigned_v<Type>){
+                uint64_t current = m_hi->text().toULongLong(&ok);
+                m_value.set_hi((Type)current);
+            }else{
+                uint64_t current = m_hi->text().toLongLong(&ok);
+                m_value.set_hi((Type)current);
+            }
+        }
+    );
+
+    value.add_listener(*this);
+}
+template <typename Type>
+void IntegerRangeCellWidget<Type>::update_value(){
+    Type lo, hi;
+    m_value.current_values(lo, hi);
+    m_lo->setText(QString::number(lo));
+    m_hi->setText(QString::number(hi));
+}
+template <typename Type>
+void IntegerRangeCellWidget<Type>::on_config_value_changed(void* object){
+    QMetaObject::invokeMethod(this, [this]{
+        update_value();
+    }, Qt::QueuedConnection);
+}
+
+
+
+template class IntegerRangeCellWidget<uint8_t>;
+
+template class RegisterUiStateQtWidget<IntegerRangeCellWidget<uint8_t>>;
+
+
+
+
+}
diff --git a/Common/Qt/Options/IntegerRangeWidget.h b/Common/Qt/Options/IntegerRangeWidget.h
new file mode 100644
index 0000000000..c2bdfbda10
--- /dev/null
+++ b/Common/Qt/Options/IntegerRangeWidget.h
@@ -0,0 +1,42 @@
+/*  Integer Range Option
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_IntegerRangeWidget_H
+#define PokemonAutomation_IntegerRangeWidget_H
+
+#include <QLineEdit>
+#include "Common/Cpp/Options/IntegerRangeOption.h"
+#include "ConfigWidget.h"
+
+namespace PokemonAutomation{
+
+
+
+template <typename Type>
+class IntegerRangeCellWidget : public QWidget, public ConfigWidget{
+public:
+    using ParentState = IntegerRangeCell<Type>;
+
+public:
+    ~IntegerRangeCellWidget();
+    IntegerRangeCellWidget(QWidget& parent, IntegerRangeCell<Type>& value);
+
+    virtual void update_value() override;
+    virtual void on_config_value_changed(void* object) override;
+
+private:
+    IntegerRangeCell<Type>& m_value;
+    QLineEdit* m_lo;
+    QLineEdit* m_hi;
+};
+
+
+
+
+
+
+}
+#endif
diff --git a/Common/Qt/Options/MacAddressWidget.cpp b/Common/Qt/Options/MacAddressWidget.cpp
new file mode 100644
index 0000000000..097154c712
--- /dev/null
+++ b/Common/Qt/Options/MacAddressWidget.cpp
@@ -0,0 +1,54 @@
+/*  MAC Address Option
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <QLineEdit>
+#include "ConfigWidget.h"
+#include "MacAddressWidget.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+
+
+template class RegisterUiStateQtWidget<MacAddressCellWidget>;
+
+
+
+MacAddressCellWidget::~MacAddressCellWidget(){
+    m_value.remove_listener(*this);
+}
+
+MacAddressCellWidget::MacAddressCellWidget(QWidget& parent, MacAddressCell& value)
+    : QLineEdit(QString::fromStdString(value.to_string()), &parent)
+    , ConfigWidget(value, *this)
+    , m_value(value)
+{
+//    cout << "sizeHint() = " << this->sizeHint().width() << endl;
+
+    this->setReadOnly(value.lock_mode() == LockMode::READ_ONLY);
+
+    connect(
+        this, &QLineEdit::editingFinished,
+        this, [this](){
+            m_value.set(this->text().toStdString());
+        }
+    );
+    value.add_listener(*this);
+}
+void MacAddressCellWidget::update_value(){
+    this->setText(QString::fromStdString(m_value.to_string()));
+}
+void MacAddressCellWidget::on_config_value_changed(void* object){
+    QMetaObject::invokeMethod(this, [this]{
+        update_value();
+    }, Qt::QueuedConnection);
+}
+
+
+
+}
diff --git a/Common/Qt/Options/MacAddressWidget.h b/Common/Qt/Options/MacAddressWidget.h
new file mode 100644
index 0000000000..67af9e3534
--- /dev/null
+++ b/Common/Qt/Options/MacAddressWidget.h
@@ -0,0 +1,38 @@
+/*  MAC Address option
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_MacAddressWidget_H
+#define PokemonAutomation_MacAddressWidget_H
+
+#include <QLineEdit>
+#include "Common/Cpp/Options/MacAddressOption.h"
+#include "ConfigWidget.h"
+
+namespace PokemonAutomation{
+
+
+
+
+class MacAddressCellWidget : public QLineEdit, public ConfigWidget{
+public:
+    using ParentState = MacAddressCell;
+
+public:
+    ~MacAddressCellWidget();
+    MacAddressCellWidget(QWidget& parent, MacAddressCell& value);
+
+    virtual void update_value() override;
+    virtual void on_config_value_changed(void* object) override;
+
+private:
+    MacAddressCell& m_value;
+};
+
+
+
+
+}
+#endif
diff --git a/Common/Qt/Options/PathWidget.cpp b/Common/Qt/Options/PathWidget.cpp
new file mode 100644
index 0000000000..ebf214e425
--- /dev/null
+++ b/Common/Qt/Options/PathWidget.cpp
@@ -0,0 +1,201 @@
+/*  Path Option
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <QHBoxLayout>
+#include <QLabel>
+#include <QLineEdit>
+#include <QPushButton>
+#include <QFileDialog>
+#include "PathWidget.h"
+
+namespace PokemonAutomation{
+
+
+template class RegisterUiStateQtWidget<PathCellWidget>;
+template class RegisterUiStateQtWidget<PathOptionWidget>;
+
+
+
+
+PathCellWidget::~PathCellWidget(){
+    m_value.remove_listener(*this);
+}
+PathCellWidget::PathCellWidget(QWidget& parent, PathCell& value)
+    : QWidget(&parent)
+    , ConfigWidget(value, *this)
+    , m_value(value)
+{
+    QHBoxLayout* layout = new QHBoxLayout(this);
+    layout->setContentsMargins(0, 0, 0, 0);
+
+    m_line_edit = new QLineEdit(QString::fromStdString(value), this);
+    m_line_edit->setPlaceholderText(QString::fromStdString(value.placeholder_text()));
+    m_line_edit->setReadOnly(value.lock_mode() == LockMode::READ_ONLY || m_value.is_locked());
+    layout->addWidget(m_line_edit, 1);
+
+    m_browse_button = new QPushButton("Browse...", this);
+    m_browse_button->setEnabled(value.lock_mode() != LockMode::READ_ONLY && !m_value.is_locked());
+    layout->addWidget(m_browse_button);
+
+    connect(
+        m_line_edit, &QLineEdit::editingFinished,
+        this, [this](){
+            m_value.set(m_line_edit->text().toStdString());
+        }
+    );
+
+    connect(
+        m_browse_button, &QPushButton::clicked,
+        this, [this](){
+            browse_file();
+        }
+    );
+
+    m_value.add_listener(*this);
+}
+
+void PathCellWidget::browse_file(){
+    QString current_path = m_line_edit->text();
+    QString file_path = m_value.is_directory()
+        ? QFileDialog::getExistingDirectory(this, "Select Directory", current_path)
+        : QFileDialog::getOpenFileName(
+            this,
+            "Select File",
+            current_path,
+            QString::fromStdString(m_value.filter_string())
+        );
+
+    if (!file_path.isEmpty()){
+        m_line_edit->setText(file_path);
+        m_value.set(file_path.toStdString());
+    }
+}
+
+void PathCellWidget::update_value(){
+    m_line_edit->setText(QString::fromStdString(m_value));
+}
+void PathCellWidget::on_config_value_changed(void* object){
+    QMetaObject::invokeMethod(this, [this]{
+        update_value();
+    }, Qt::QueuedConnection);
+}
+void PathCellWidget::on_config_visibility_changed(){
+    this->setEnabled(true);
+    QMetaObject::invokeMethod(this, [this]{
+        const ConfigOptionState visibility = m_value.visibility();
+        m_line_edit->setReadOnly(visibility != ConfigOptionState::ENABLED ||
+            m_value.lock_mode() == LockMode::READ_ONLY || m_value.is_locked());
+        m_browse_button->setEnabled(visibility == ConfigOptionState::ENABLED &&
+            m_value.lock_mode() != LockMode::READ_ONLY && !m_value.is_locked());
+        switch (visibility){
+        case ConfigOptionState::ENABLED:
+        case ConfigOptionState::DISABLED:
+            this->setVisible(true);
+            break;
+        case ConfigOptionState::HIDDEN:
+            this->setVisible(false);
+            break;
+        }
+    }, Qt::QueuedConnection);
+}
+
+
+
+
+PathOptionWidget::~PathOptionWidget(){
+    m_value.remove_listener(*this);
+}
+PathOptionWidget::PathOptionWidget(QWidget& parent, PathOption& value)
+    : QWidget(&parent)
+    , ConfigWidget(value, *this)
+    , m_value(value)
+{
+    QHBoxLayout* layout = new QHBoxLayout(this);
+    layout->setContentsMargins(0, 0, 0, 0);
+    QLabel* text = new QLabel(QString::fromStdString(value.label()), this);
+    text->setWordWrap(true);
+    layout->addWidget(text, 1);
+
+    QHBoxLayout* controls = new QHBoxLayout();
+    controls->setContentsMargins(0, 0, 0, 0);
+    layout->addLayout(controls, 1);
+
+    m_line_edit = new QLineEdit(QString::fromStdString(m_value), this);
+    m_line_edit->setPlaceholderText(QString::fromStdString(value.placeholder_text()));
+    m_line_edit->setReadOnly(value.lock_mode() == LockMode::READ_ONLY);
+    controls->addWidget(m_line_edit, 1);
+
+    m_browse_button = new QPushButton("Browse...", this);
+    m_browse_button->setEnabled(value.lock_mode() != LockMode::READ_ONLY);
+    controls->addWidget(m_browse_button, 0);
+
+    connect(
+        m_line_edit, &QLineEdit::editingFinished,
+        this, [this](){
+            m_value.set(m_line_edit->text().toStdString());
+        }
+    );
+
+    connect(
+        m_browse_button, &QPushButton::clicked,
+        this, [this](){
+            browse_file();
+        }
+    );
+
+    m_value.add_listener(*this);
+}
+
+void PathOptionWidget::browse_file(){
+    QString current_path = m_line_edit->text();
+    QString file_path = m_value.is_directory()
+        ? QFileDialog::getExistingDirectory(this, "Select Directory", current_path)
+        : QFileDialog::getOpenFileName(
+            this,
+            "Select File",
+            current_path,
+            QString::fromStdString(m_value.filter_string())
+        );
+
+    if (!file_path.isEmpty()){
+        m_line_edit->setText(file_path);
+        m_value.set(file_path.toStdString());
+    }
+}
+
+void PathOptionWidget::update_value(){
+    m_line_edit->setText(QString::fromStdString(m_value));
+}
+void PathOptionWidget::on_config_value_changed(void* object){
+    QMetaObject::invokeMethod(m_line_edit, [this]{
+        update_value();
+    }, Qt::QueuedConnection);
+}
+void PathOptionWidget::on_config_visibility_changed(){
+    this->setEnabled(true);
+    QMetaObject::invokeMethod(this, [this]{
+        const ConfigOptionState visibility = m_value.visibility();
+        m_line_edit->setReadOnly(visibility != ConfigOptionState::ENABLED ||
+            m_value.lock_mode() == LockMode::READ_ONLY || m_value.is_locked());
+        m_browse_button->setEnabled(visibility == ConfigOptionState::ENABLED &&
+            m_value.lock_mode() != LockMode::READ_ONLY && !m_value.is_locked());
+        switch (visibility){
+        case ConfigOptionState::ENABLED:
+        case ConfigOptionState::DISABLED:
+            this->setVisible(true);
+            break;
+        case ConfigOptionState::HIDDEN:
+            this->setVisible(false);
+            break;
+        }
+    }, Qt::QueuedConnection);
+}
+
+
+
+
+
+}
diff --git a/Common/Qt/Options/PathWidget.h b/Common/Qt/Options/PathWidget.h
new file mode 100644
index 0000000000..8c38ae1ae5
--- /dev/null
+++ b/Common/Qt/Options/PathWidget.h
@@ -0,0 +1,67 @@
+/*  Path Option
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Options_PathWidget_H
+#define PokemonAutomation_Options_PathWidget_H
+
+#include <QLineEdit>
+#include <QPushButton>
+#include "Common/Cpp/Options/PathOption.h"
+#include "ConfigWidget.h"
+
+namespace PokemonAutomation{
+
+
+
+class PathCellWidget : public QWidget, public ConfigWidget{
+public:
+    using ParentState = PathCell;
+
+public:
+    ~PathCellWidget();
+    PathCellWidget(QWidget& parent, PathCell& value);
+
+    virtual void update_value() override;
+    virtual void on_config_value_changed(void* object) override;
+    virtual void on_config_visibility_changed() override;
+
+private:
+    void browse_file();
+
+    PathCell& m_value;
+    QLineEdit* m_line_edit;
+    QPushButton* m_browse_button;
+};
+
+
+
+class PathOptionWidget : public QWidget, public ConfigWidget{
+public:
+    using ParentState = PathOption;
+
+public:
+    ~PathOptionWidget();
+    PathOptionWidget(QWidget& parent, PathOption& value);
+
+    virtual void update_value() override;
+    virtual void on_config_value_changed(void* object) override;
+    virtual void on_config_visibility_changed() override;
+
+private:
+    void browse_file();
+
+    PathOption& m_value;
+    QLineEdit* m_line_edit;
+    QPushButton* m_browse_button;
+};
+
+
+
+
+
+}
+#endif
+
diff --git a/Common/Qt/Options/RandomCodeWidget.cpp b/Common/Qt/Options/RandomCodeWidget.cpp
index c1c4fe68a8..d47255fe16 100644
--- a/Common/Qt/Options/RandomCodeWidget.cpp
+++ b/Common/Qt/Options/RandomCodeWidget.cpp
@@ -1,6 +1,6 @@
 /*  Random Code Option
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -15,10 +15,9 @@
 namespace PokemonAutomation{
 
 
+template class RegisterUiStateQtWidget<RandomCodeWidget>;
+
 
-ConfigWidget* RandomCodeOption::make_QtWidget(QWidget& parent){
-    return new RandomCodeWidget(parent, *this);
-}
 
 
 RandomCodeWidget::~RandomCodeWidget(){
@@ -133,7 +132,7 @@ void RandomCodeWidget::update_value(){
     m_box_code->setText(QString::fromStdString(current.code_string()));
     update_labels();
 }
-void RandomCodeWidget::value_changed(){
+void RandomCodeWidget::on_config_value_changed(void* object){
     QMetaObject::invokeMethod(this, [this]{
         update_value();
     }, Qt::QueuedConnection);
diff --git a/Common/Qt/Options/RandomCodeWidget.h b/Common/Qt/Options/RandomCodeWidget.h
index be5663efa3..cbc3a36918 100644
--- a/Common/Qt/Options/RandomCodeWidget.h
+++ b/Common/Qt/Options/RandomCodeWidget.h
@@ -1,6 +1,6 @@
 /*  Random Code Option
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -19,12 +19,15 @@ namespace PokemonAutomation{
 
 
 class RandomCodeWidget : public QWidget, public ConfigWidget{
+public:
+    using ParentState = RandomCodeOption;
+
 public:
     ~RandomCodeWidget();
     RandomCodeWidget(QWidget& parent, RandomCodeOption& value);
 
     virtual void update_value() override;
-    virtual void value_changed() override;
+    virtual void on_config_value_changed(void* object) override;
 
 private:
     std::string sanitized_code(const std::string& text) const;
diff --git a/Common/Qt/Options/SimpleIntegerWidget.cpp b/Common/Qt/Options/SimpleIntegerWidget.cpp
index f1f12f2c01..5db4f209a0 100644
--- a/Common/Qt/Options/SimpleIntegerWidget.cpp
+++ b/Common/Qt/Options/SimpleIntegerWidget.cpp
@@ -1,6 +1,6 @@
 /*  Simple Integer Option
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -19,21 +19,23 @@ namespace PokemonAutomation{
 
 
 
-template <typename Type>
-SimpleIntegerCellWidget<Type>::~SimpleIntegerCellWidget(){
+SimpleIntegerCellWidget::~SimpleIntegerCellWidget(){
     m_value.remove_listener(*this);
 }
-template <typename Type>
-SimpleIntegerCellWidget<Type>::SimpleIntegerCellWidget(QWidget& parent, SimpleIntegerCell<Type>& value)
-    : QLineEdit(QString::number(value), &parent)
+SimpleIntegerCellWidget::SimpleIntegerCellWidget(QWidget& parent, SimpleIntegerCellBase& value)
+    : QLineEdit(QString::number(value.current_value()), &parent)
     , ConfigWidget(value, *this)
     , m_value(value)
 {
+//    cout << "sizeHint() = " << this->sizeHint().width() << endl;
+
+    this->setReadOnly(value.lock_mode() == LockMode::READ_ONLY);
+
     connect(
         this, &QLineEdit::textChanged,
         this, [this](const QString& text){
             bool ok;
-            Type current = (Type)text.toLong(&ok);
+            NativeType current = (NativeType)text.toLong(&ok);
             QPalette palette;
             if (ok && m_value.check_validity(current).empty()){
                 palette.setColor(QPalette::Text, Qt::black);
@@ -47,29 +49,27 @@ SimpleIntegerCellWidget<Type>::SimpleIntegerCellWidget(QWidget& parent, SimpleIn
         this, &QLineEdit::editingFinished,
         this, [this](){
             bool ok;
-            if (std::is_unsigned_v<Type>){
+            if (std::is_unsigned_v<NativeType>){
                 uint64_t current = this->text().toULongLong(&ok);
                 current = std::max<uint64_t>(current, m_value.min_value());
                 current = std::min<uint64_t>(current, m_value.max_value());
                 this->setText(QString::number(current));
-                m_value.set((Type)current);
+                m_value.set((NativeType)current);
             }else{
                 int64_t current = this->text().toLongLong(&ok);
                 current = std::max<int64_t>(current, m_value.min_value());
                 current = std::min<int64_t>(current, m_value.max_value());
                 this->setText(QString::number(current));
-                m_value.set((Type)current);
+                m_value.set((NativeType)current);
             }
         }
     );
     value.add_listener(*this);
 }
-template <typename Type>
-void SimpleIntegerCellWidget<Type>::update_value(){
-    this->setText(QString::number(m_value));
+void SimpleIntegerCellWidget::update_value(){
+    this->setText(QString::number(m_value.current_value()));
 }
-template <typename Type>
-void SimpleIntegerCellWidget<Type>::value_changed(){
+void SimpleIntegerCellWidget::on_config_value_changed(void* object){
     QMetaObject::invokeMethod(this, [this]{
         update_value();
     }, Qt::QueuedConnection);
@@ -81,46 +81,35 @@ void SimpleIntegerCellWidget<Type>::value_changed(){
 
 
 
-template <typename Type>
-SimpleIntegerOptionWidget<Type>::~SimpleIntegerOptionWidget(){
+SimpleIntegerOptionWidget::~SimpleIntegerOptionWidget(){
     m_value.remove_listener(*this);
 }
-template <typename Type>
-SimpleIntegerOptionWidget<Type>::SimpleIntegerOptionWidget(QWidget& parent, SimpleIntegerOption<Type>& value)
+SimpleIntegerOptionWidget::SimpleIntegerOptionWidget(QWidget& parent, SimpleIntegerOptionBase& value)
     : QWidget(&parent)
     , ConfigWidget(value, *this)
-    , m_cell(new SimpleIntegerCellWidget<Type>(*this, value))
+    , m_cell(new SimpleIntegerCellWidget(*this, value))
 {
     QHBoxLayout* layout = new QHBoxLayout(this);
     layout->setContentsMargins(0, 0, 0, 0);
     QLabel* text = new QLabel(QString::fromStdString(value.label()), this);
     text->setWordWrap(true);
+    text->setTextFormat(Qt::RichText);
+    text->setTextInteractionFlags(Qt::TextBrowserInteraction);
+    text->setOpenExternalLinks(true);
     layout->addWidget(text, 1);
     layout->addWidget(m_cell, 1);
     value.add_listener(*this);
 }
-template <typename Type>
-void SimpleIntegerOptionWidget<Type>::update_value(){
+void SimpleIntegerOptionWidget::update_value(){
     m_cell->update_value();
 }
-template <typename Type>
-void SimpleIntegerOptionWidget<Type>::value_changed(){
-    m_cell->value_changed();
+void SimpleIntegerOptionWidget::on_config_value_changed(void* object){
+    m_cell->on_config_value_changed(object);
 }
 
 
 
-template class SimpleIntegerCellWidget<uint8_t>;
-template class SimpleIntegerCellWidget<uint16_t>;
-template class SimpleIntegerCellWidget<uint32_t>;
-template class SimpleIntegerCellWidget<uint64_t>;
-template class SimpleIntegerCellWidget<int8_t>;
 
-template class SimpleIntegerOptionWidget<uint8_t>;
-template class SimpleIntegerOptionWidget<uint16_t>;
-template class SimpleIntegerOptionWidget<uint32_t>;
-template class SimpleIntegerOptionWidget<uint64_t>;
-template class SimpleIntegerOptionWidget<int8_t>;
 
 
 }
diff --git a/Common/Qt/Options/SimpleIntegerWidget.h b/Common/Qt/Options/SimpleIntegerWidget.h
index ea523f4aef..43fa9bde1a 100644
--- a/Common/Qt/Options/SimpleIntegerWidget.h
+++ b/Common/Qt/Options/SimpleIntegerWidget.h
@@ -1,6 +1,6 @@
 /*  Simple Integer Option
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -8,39 +8,45 @@
 #define PokemonAutomation_SimpleIntegerWidget_H
 
 #include <QLineEdit>
-#include "ConfigWidget.h"
 #include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "ConfigWidget.h"
 
 namespace PokemonAutomation{
 
 
 
-template <typename Type>
 class SimpleIntegerCellWidget : public QLineEdit, public ConfigWidget{
+public:
+    using ParentState = SimpleIntegerCellBase;
+    using NativeType = ParentState::NativeType;
+
 public:
     ~SimpleIntegerCellWidget();
-    SimpleIntegerCellWidget(QWidget& parent, SimpleIntegerCell<Type>& value);
+    SimpleIntegerCellWidget(QWidget& parent, SimpleIntegerCellBase& value);
 
     virtual void update_value() override;
-    virtual void value_changed() override;
+    virtual void on_config_value_changed(void* object) override;
 
 private:
-    SimpleIntegerCell<Type>& m_value;
+    SimpleIntegerCellBase& m_value;
 };
 
 
 
-template <typename Type>
 class SimpleIntegerOptionWidget : public QWidget, public ConfigWidget{
+public:
+    using ParentState = SimpleIntegerOptionBase;
+    using NativeType = ParentState::NativeType;
+
 public:
     ~SimpleIntegerOptionWidget();
-    SimpleIntegerOptionWidget(QWidget& parent, SimpleIntegerOption<Type>& value);
+    SimpleIntegerOptionWidget(QWidget& parent, SimpleIntegerOptionBase& value);
 
     virtual void update_value() override;
-    virtual void value_changed() override;
+    virtual void on_config_value_changed(void* object) override;
 
 private:
-    SimpleIntegerCellWidget<Type>* m_cell;
+    SimpleIntegerCellWidget* m_cell;
 };
 
 
diff --git a/Common/Qt/Options/StaticTableWidget.cpp b/Common/Qt/Options/StaticTableWidget.cpp
index 966fc79b65..b7036b5bfc 100644
--- a/Common/Qt/Options/StaticTableWidget.cpp
+++ b/Common/Qt/Options/StaticTableWidget.cpp
@@ -1,30 +1,27 @@
 /*  Static Table Widget
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include <QFileDialog>
 #include <QVBoxLayout>
 #include <QHeaderView>
-#include <QScrollBar>
 #include <QLabel>
 #include <QPushButton>
-#include <QTableWidget>
 #include "Common/Cpp/Json/JsonValue.h"
 #include "Common/Qt/AutoHeightTable.h"
 #include "StaticTableWidget.h"
 
-#include <iostream>
-using std::cout;
-using std::endl;
+//#include <iostream>
+//using std::cout;
+//using std::endl;
 
 namespace PokemonAutomation{
 
 
-ConfigWidget* StaticTableOption::make_QtWidget(QWidget& parent){
-    return new StaticTableWidget(parent, *this);
-}
+template class RegisterUiStateQtWidget<StaticTableWidget>;
+
 
 
 
@@ -54,7 +51,7 @@ StaticTableWidget::StaticTableWidget(QWidget& parent, StaticTableOption& value)
     for (const std::string& name : m_value.make_header()){
         header << QString::fromStdString(name);
     }
-    m_table->setColumnCount(header.size());
+    m_table->setColumnCount((int)header.size());
     m_table->setRowCount((int)table.size());
     m_table->setHorizontalHeaderLabels(header);
 
@@ -64,10 +61,22 @@ StaticTableWidget::StaticTableWidget(QWidget& parent, StaticTableOption& value)
 //    m_table->horizontalHeader()->setSectionResizeMode(QHeaderView::ResizeToContents);
     m_table->horizontalHeader()->setSectionResizeMode(QHeaderView::Interactive);
 
+//    cout << "m_table: " << m_table->rowCount() << " x " << m_table->columnCount() << endl;
+
     for (size_t r = 0; r < table.size(); r++){
         std::vector<ConfigOption*> cells = table[r]->make_cells();
+        if (cells.size() > (size_t)m_table->columnCount()){
+            throw InternalProgramError(
+                nullptr, PA_CURRENT_FUNCTION,
+                "Table is wider than the header."
+            );
+        }
         for (size_t c = 0; c < cells.size(); c++){
-            m_table->setCellWidget((int)r, (int)c, &cells[c]->make_QtWidget(*this)->widget());
+//            cout << "setCellWidget: " << r << ", " << c << endl;
+            m_table->setCellWidget(
+                (int)r, (int)c,
+                &ConfigWidget::make_from_option(*cells[c], m_table)->widget()
+            );
         }
     }
 
diff --git a/Common/Qt/Options/StaticTableWidget.h b/Common/Qt/Options/StaticTableWidget.h
index 0330a7a2f8..d1661937a5 100644
--- a/Common/Qt/Options/StaticTableWidget.h
+++ b/Common/Qt/Options/StaticTableWidget.h
@@ -1,6 +1,6 @@
 /*  Static Table Widget
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -17,6 +17,9 @@ class AutoHeightTableWidget;
 
 
 class StaticTableWidget : public QWidget, public ConfigWidget{
+public:
+    using ParentState = StaticTableOption;
+
 public:
     ~StaticTableWidget();
     StaticTableWidget(QWidget& parent, StaticTableOption& value);
diff --git a/Common/Qt/Options/StaticTextWidget.cpp b/Common/Qt/Options/StaticTextWidget.cpp
index bf49b73473..d8f6380a36 100644
--- a/Common/Qt/Options/StaticTextWidget.cpp
+++ b/Common/Qt/Options/StaticTextWidget.cpp
@@ -1,6 +1,6 @@
 /*  Static Text Option
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -12,13 +12,8 @@
 namespace PokemonAutomation{
 
 
-
-ConfigWidget* StaticTextOption::make_QtWidget(QWidget& parent){
-    return new StaticTextWidget(parent, *this);
-}
-ConfigWidget* SectionDividerOption::make_QtWidget(QWidget& parent){
-    return new SectionDividerWidget(parent, *this);
-}
+template class RegisterUiStateQtWidget<StaticTextWidget>;
+template class RegisterUiStateQtWidget<SectionDividerWidget>;
 
 
 
@@ -45,7 +40,7 @@ StaticTextWidget::StaticTextWidget(QWidget& parent, StaticTextOption& value)
 void StaticTextWidget::update_value(){
     m_text->setText(QString::fromStdString(m_value.text()));
 }
-void StaticTextWidget::value_changed(){
+void StaticTextWidget::on_config_value_changed(void* object){
     QMetaObject::invokeMethod(m_text, [this]{
         update_value();
     }, Qt::QueuedConnection);
@@ -78,7 +73,7 @@ SectionDividerWidget::SectionDividerWidget(QWidget& parent, SectionDividerOption
 void SectionDividerWidget::update_value(){
     m_text->setText(QString::fromStdString(m_value.text()));
 }
-void SectionDividerWidget::value_changed(){
+void SectionDividerWidget::on_config_value_changed(void* object){
     QMetaObject::invokeMethod(m_text, [this]{
         update_value();
     }, Qt::QueuedConnection);
diff --git a/Common/Qt/Options/StaticTextWidget.h b/Common/Qt/Options/StaticTextWidget.h
index 82fd712b60..ac9653ad2a 100644
--- a/Common/Qt/Options/StaticTextWidget.h
+++ b/Common/Qt/Options/StaticTextWidget.h
@@ -1,6 +1,6 @@
 /*  Static Text Option
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -18,12 +18,15 @@ namespace PokemonAutomation{
 
 
 class StaticTextWidget : public QWidget, public ConfigWidget{
+public:
+    using ParentState = StaticTextOption;
+
 public:
     ~StaticTextWidget();
     StaticTextWidget(QWidget& parent, StaticTextOption& value);
 
     virtual void update_value() override;
-    virtual void value_changed() override;
+    virtual void on_config_value_changed(void* object) override;
 
 private:
     StaticTextOption& m_value;
@@ -32,12 +35,15 @@ class StaticTextWidget : public QWidget, public ConfigWidget{
 
 
 class SectionDividerWidget : public QWidget, public ConfigWidget{
+public:
+    using ParentState = SectionDividerOption;
+
 public:
     ~SectionDividerWidget();
     SectionDividerWidget(QWidget& parent, SectionDividerOption& value);
 
     virtual void update_value() override;
-    virtual void value_changed() override;
+    virtual void on_config_value_changed(void* object) override;
 
 private:
     SectionDividerOption& m_value;
diff --git a/Common/Qt/Options/StringWidget.cpp b/Common/Qt/Options/StringWidget.cpp
index f5e302c183..8a21bf6cab 100644
--- a/Common/Qt/Options/StringWidget.cpp
+++ b/Common/Qt/Options/StringWidget.cpp
@@ -1,6 +1,6 @@
 /*  String Option
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -9,16 +9,16 @@
 #include <QLineEdit>
 #include "StringWidget.h"
 
+// #include <iostream>
+// using std::cout;
+// using std::endl;
+
 namespace PokemonAutomation{
 
 
-ConfigWidget* StringCell::make_QtWidget(QWidget& parent){
-    return new StringCellWidget(parent, *this);
-}
+template class RegisterUiStateQtWidget<StringCellWidget>;
+template class RegisterUiStateQtWidget<StringOptionWidget>;
 
-ConfigWidget* StringOption::make_QtWidget(QWidget& parent){
-    return new StringOptionWidget(parent, *this);
-}
 
 
 
@@ -32,6 +32,7 @@ StringCellWidget::StringCellWidget(QWidget& parent, StringCell& value)
 {
     this->setPlaceholderText(QString::fromStdString(value.placeholder_text()));
 
+    this->setReadOnly(value.lock_mode() == LockMode::READ_ONLY || m_value.is_locked());
     if (m_value.is_password()){
         this->setEchoMode(QLineEdit::PasswordEchoOnEdit);
     }
@@ -42,17 +43,49 @@ StringCellWidget::StringCellWidget(QWidget& parent, StringCell& value)
             m_value.set(this->text().toStdString());
         }
     );
+    if (m_value.signal_all_text_changes()){
+        connect(
+            this, &QLineEdit::textChanged,
+            [this]{
+                std::string old_value = (std::string)m_value;
+                std::string text = this->text().toStdString();
+                if (old_value == text){
+                    return;
+                }
+                m_value.set(std::move(text));
+            }
+        );
+    }
 
     m_value.add_listener(*this);
 }
 void StringCellWidget::update_value(){
     this->setText(QString::fromStdString(m_value));
 }
-void StringCellWidget::value_changed(){
+void StringCellWidget::on_config_value_changed(void* object){
     QMetaObject::invokeMethod(this, [this]{
         update_value();
     }, Qt::QueuedConnection);
 }
+void StringCellWidget::on_config_visibility_changed(){
+    // Overwrite ConfigWidget::on_config_visibility_changed() because ConfigWidget cannot handle
+    // READ_ONLY state.
+    this->setEnabled(true);
+    QMetaObject::invokeMethod(this, [this]{
+        const ConfigOptionState visibility = m_value.visibility();
+        this->setReadOnly(visibility != ConfigOptionState::ENABLED || 
+            m_value.lock_mode() == LockMode::READ_ONLY || m_value.is_locked());
+        switch (visibility){
+        case ConfigOptionState::ENABLED:
+        case ConfigOptionState::DISABLED:
+            this->setVisible(true);
+            break;
+        case ConfigOptionState::HIDDEN:
+            this->setVisible(false);
+            break;
+        }
+    }, Qt::QueuedConnection);
+}
 
 
 
@@ -75,6 +108,7 @@ StringOptionWidget::StringOptionWidget(QWidget& parent, StringOption& value)
     m_box->setPlaceholderText(QString::fromStdString(value.placeholder_text()));
     layout->addWidget(m_box, 1);
 
+    m_box->setReadOnly(value.lock_mode() == LockMode::READ_ONLY);
     if (m_value.is_password()){
         m_box->setEchoMode(QLineEdit::PasswordEchoOnEdit);
     }
@@ -85,18 +119,49 @@ StringOptionWidget::StringOptionWidget(QWidget& parent, StringOption& value)
             m_value.set(m_box->text().toStdString());
         }
     );
+    if (m_value.signal_all_text_changes()){
+        connect(
+            m_box, &QLineEdit::textChanged,
+            [this]{
+                const std::string old_value = (std::string)m_value;
+                std::string text = m_box->text().toStdString();
+                if (old_value == text){
+                    return;
+                }
+                m_value.set(std::move(text));
+            }
+        );
+    }
 
     m_value.add_listener(*this);
 }
 void StringOptionWidget::update_value(){
     m_box->setText(QString::fromStdString(m_value));
 }
-void StringOptionWidget::value_changed(){
+void StringOptionWidget::on_config_value_changed(void* object){
     QMetaObject::invokeMethod(m_box, [this]{
         update_value();
     }, Qt::QueuedConnection);
 }
-
+void StringOptionWidget::on_config_visibility_changed(){
+    // Overwrite ConfigWidget::on_config_visibility_changed() because ConfigWidget cannot handle
+    // READ_ONLY state.
+    this->setEnabled(true);
+    QMetaObject::invokeMethod(this, [this]{
+        const ConfigOptionState visibility = m_value.visibility();
+        m_box->setReadOnly(visibility != ConfigOptionState::ENABLED || 
+            m_value.lock_mode() == LockMode::READ_ONLY || m_value.is_locked());
+        switch (visibility){
+        case ConfigOptionState::ENABLED:
+        case ConfigOptionState::DISABLED:
+            this->setVisible(true);
+            break;
+        case ConfigOptionState::HIDDEN:
+            this->setVisible(false);
+            break;
+        }
+    }, Qt::QueuedConnection);
+}
 
 
 
diff --git a/Common/Qt/Options/StringWidget.h b/Common/Qt/Options/StringWidget.h
index a74d817cef..41dab33928 100644
--- a/Common/Qt/Options/StringWidget.h
+++ b/Common/Qt/Options/StringWidget.h
@@ -1,6 +1,6 @@
 /*  String Option
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -16,12 +16,16 @@ namespace PokemonAutomation{
 
 
 class StringCellWidget : public QLineEdit, public ConfigWidget{
+public:
+    using ParentState = StringCell;
+
 public:
     ~StringCellWidget();
     StringCellWidget(QWidget& parent, StringCell& value);
 
     virtual void update_value() override;
-    virtual void value_changed() override;
+    virtual void on_config_value_changed(void* object) override;
+    virtual void on_config_visibility_changed() override;
 
 private:
     StringCell& m_value;
@@ -30,12 +34,16 @@ class StringCellWidget : public QLineEdit, public ConfigWidget{
 
 
 class StringOptionWidget : public QWidget, public ConfigWidget{
+public:
+    using ParentState = StringOption;
+
 public:
     ~StringOptionWidget();
     StringOptionWidget(QWidget& parent, StringOption& value);
 
     virtual void update_value() override;
-    virtual void value_changed() override;
+    virtual void on_config_value_changed(void* object) override;
+    virtual void on_config_visibility_changed() override;
 
 private:
     StringOption& m_value;
diff --git a/Common/Qt/Options/TextEditWidget.cpp b/Common/Qt/Options/TextEditWidget.cpp
index a910711dcd..2c3a27bb96 100644
--- a/Common/Qt/Options/TextEditWidget.cpp
+++ b/Common/Qt/Options/TextEditWidget.cpp
@@ -1,10 +1,9 @@
 /*  Text Edit Option
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include <QStyle>
 #include <QVBoxLayout>
 #include <QLabel>
 #include <QTextEdit>
@@ -17,10 +16,7 @@
 namespace PokemonAutomation{
 
 
-
-ConfigWidget* TextEditOption::make_QtWidget(QWidget& parent){
-    return new TextEditWidget(parent, *this);
-}
+template class RegisterUiStateQtWidget<TextEditWidget>;
 
 
 
@@ -45,9 +41,9 @@ class TextEditWidget::Box : public QTextEdit{
             connect(
                 this, &QTextEdit::textChanged,
                 [this]{
-                    std::string new_value = (std::string)m_parent.m_value;
+                    const std::string old_value = (std::string)m_parent.m_value;
                     std::string text = this->toPlainText().toStdString();
-                    if (new_value == text){
+                    if (old_value == text){
                         return;
                     }
 //                    cout << new_value << " : " << text << endl;
@@ -86,30 +82,56 @@ TextEditWidget::TextEditWidget(QWidget& parent, TextEditOption& value)
     , ConfigWidget(value, *this)
     , m_value(value)
 {
+
     QVBoxLayout* layout = new QVBoxLayout(this);
     layout->setContentsMargins(0, 0, 0, 0);
-    QLabel* label = new QLabel(QString::fromStdString(value.label()), this);
-    label->setWordWrap(true);
-    layout->addWidget(label);
+    m_label = new QLabel(QString::fromStdString(value.label()), this);
+    m_label->setWordWrap(true);
+    layout->addWidget(m_label);
     m_box = new Box(*this);
     m_box->setText(QString::fromStdString(value));
+    if (value.lock_mode() == LockMode::READ_ONLY){
+        m_box->setReadOnly(true);
+    }
     layout->addWidget(m_box);
 
     m_value.ConfigOption::add_listener(*this);
 }
 void TextEditWidget::update_value(){
-    std::string new_value = (std::string)m_value;
-    std::string text = m_box->toPlainText().toStdString();
-    if (new_value == text){
-        return;
+    {
+        std::string new_value = m_value.label();
+        std::string text = m_label->text().toStdString();
+        if (new_value != text){
+            m_label->setText(QString::fromStdString(new_value));
+        }
+    }
+    {
+        std::string new_value = (std::string)m_value;
+        std::string text = m_box->toPlainText().toStdString();
+        if (new_value != text){
+            m_box->setText(QString::fromStdString(new_value));
+        }
     }
-    m_box->setText(QString::fromStdString(m_value));
 }
-void TextEditWidget::value_changed(){
+void TextEditWidget::on_config_value_changed(void* object){
+    //  This function gets called every time the contents changes.
+    //  For large contents where the only update is an incremental append,
+    //  this is very efficient. Thus we supporess the full update if the
+    //  previous update is an append.
     QMetaObject::invokeMethod(m_box, [this]{
+        if (m_pending_append){
+            m_pending_append = false;
+            return;
+        }
         update_value();
     }, Qt::QueuedConnection);
 }
+void TextEditWidget::on_append(std::string text){
+    QMetaObject::invokeMethod(m_box, [this, text = std::move(text)]{
+        m_box->append(QString::fromStdString(text));
+        m_pending_append = true;
+    }, Qt::QueuedConnection);
+}
 
 
 
diff --git a/Common/Qt/Options/TextEditWidget.h b/Common/Qt/Options/TextEditWidget.h
index 98a47e9787..91d1ffb66c 100644
--- a/Common/Qt/Options/TextEditWidget.h
+++ b/Common/Qt/Options/TextEditWidget.h
@@ -1,6 +1,6 @@
 /*  Text Edit Option
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -11,25 +11,33 @@
 #include "Common/Cpp/Options/TextEditOption.h"
 #include "ConfigWidget.h"
 
+class QLabel;
 class QTextEdit;
 
 namespace PokemonAutomation{
 
 
 
-class TextEditWidget : public QWidget, public ConfigWidget{
+class TextEditWidget : public QWidget, public ConfigWidget, public TextEditOption::AppendListener{
+public:
+    using ParentState = TextEditOption;
+
 public:
     ~TextEditWidget();
     TextEditWidget(QWidget& parent, TextEditOption& value);
 
     virtual void update_value() override;
-    virtual void value_changed() override;
+    virtual void on_config_value_changed(void* object) override;
+    virtual void on_append(std::string text) override;
 
 private:
     class Box;
 
     TextEditOption& m_value;
+    QLabel* m_label;
     QTextEdit* m_box;
+
+    bool m_pending_append = false;
 };
 
 
diff --git a/Common/Qt/Options/TimeDurationWidget.cpp b/Common/Qt/Options/TimeDurationWidget.cpp
new file mode 100644
index 0000000000..7973c29ffc
--- /dev/null
+++ b/Common/Qt/Options/TimeDurationWidget.cpp
@@ -0,0 +1,174 @@
+/*  Time Duration Option
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <QHBoxLayout>
+#include <QLabel>
+#include <QLineEdit>
+#include "TimeDurationWidget.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+
+
+
+template <typename Type>
+TimeDurationCellWidget<Type>::~TimeDurationCellWidget(){
+    m_value.remove_listener(*this);
+}
+template <typename Type>
+TimeDurationCellWidget<Type>::TimeDurationCellWidget(QWidget& parent, TimeDurationCell<Type>& value)
+    : QLineEdit(QString::fromStdString(value.current_text()), &parent)
+    , ConfigWidget(value, *this)
+    , m_value(value)
+{
+    this->setToolTip(QString::fromStdString(
+        "Time duration in " + value.units() +
+        "<br><br>"
+        "For controller timings, this will be rounded "
+        "up to the tick size of the controller."
+        "<br><br>"
+        "The tick size for wired controllers is usually 8ms and are very precise."
+        "<br><br>"
+        "Wireless controllers have larger tick sizes and are imprecise due to wireless communication latency."
+    ));
+
+    connect(
+        this, &QLineEdit::editingFinished,
+        this, [this](){
+            m_value.set(this->text().toStdString());
+        }
+    );
+
+    value.add_listener(*this);
+}
+template <typename Type>
+void TimeDurationCellWidget<Type>::update_value(){
+    this->setText(QString::fromStdString(m_value.current_text()));
+}
+template <typename Type>
+void TimeDurationCellWidget<Type>::on_config_value_changed(void* object){
+    QMetaObject::invokeMethod(this, [this]{
+        this->update_value();
+    }, Qt::QueuedConnection);
+}
+
+
+
+
+
+template <typename Type>
+TimeDurationOptionWidget<Type>::~TimeDurationOptionWidget(){
+    m_value.remove_listener(*this);
+}
+template <typename Type>
+TimeDurationOptionWidget<Type>::TimeDurationOptionWidget(QWidget& parent, TimeDurationOption<Type>& value)
+    : QWidget(&parent)
+    , ConfigWidget(value, *this)
+    , m_value(value)
+{
+
+    QHBoxLayout* layout = new QHBoxLayout(this);
+    layout->setContentsMargins(0, 0, 0, 0);
+    QLabel* text = new QLabel(QString::fromStdString(m_value.label()), this);
+    text->setWordWrap(true);
+    text->setTextFormat(Qt::RichText);
+    text->setTextInteractionFlags(Qt::TextBrowserInteraction);
+    text->setOpenExternalLinks(true);
+    layout->addWidget(text, 1);
+    QVBoxLayout* rows = new QVBoxLayout();
+    layout->addLayout(rows, 1);
+
+    QHBoxLayout* row0 = new QHBoxLayout();
+    rows->addLayout(row0);
+    QHBoxLayout* row1 = new QHBoxLayout();
+    rows->addLayout(row1);
+
+    m_box = new QLineEdit(QString::fromStdString(m_value.current_text()), this);
+    row0->addWidget(m_box);
+    if (value.show_summary()){
+        row0->addWidget(new QLabel(QString::fromStdString(value.units()), this));
+    }
+    m_box->setToolTip(QString::fromStdString(
+        "Time duration in " + value.units() +
+        "<br><br>"
+        "For controller timings, this will be rounded "
+        "up to the tick size of the controller."
+        "<br><br>"
+        "The tick size for wired controllers is usually 8ms and are very precise."
+        "<br><br>"
+        "Wireless controllers have larger tick sizes and are imprecise due to wireless communication latency."
+    ));
+
+    m_description = nullptr;
+    if (value.show_summary()){
+        m_description = new QLabel(QString::fromStdString(m_value.time_string()), this);
+        m_description->setAlignment(Qt::AlignHCenter);
+        row1->addWidget(m_description);
+    }
+
+    connect(
+        m_box, &QLineEdit::editingFinished,
+        this, [this](){
+            std::string error = m_value.set(m_box->text().toStdString());
+            if (m_description == nullptr){
+                return;
+            }
+            if (error.empty()){
+                m_description->setText(QString::fromStdString(m_value.time_string()));
+            }else{
+                m_description->setText(QString::fromStdString("<font color=\"red\">" + error + "</font>"));
+            }
+        }
+    );
+#if 0
+    connect(
+        m_box, &QLineEdit::textChanged,
+        this, [this, m_description](){
+            if (m_description == nullptr){
+                return;
+            }
+            std::string text = m_value.time_string(m_box->text().toStdString());
+            m_description->setText(QString::fromStdString(text));
+        }
+    );
+#endif
+
+    value.add_listener(*this);
+}
+template <typename Type>
+void TimeDurationOptionWidget<Type>::update_value(){
+    std::string text = m_value.current_text();
+    m_box->setText(QString::fromStdString(text));
+    m_description->setText(QString::fromStdString(m_value.time_string()));
+}
+template <typename Type>
+void TimeDurationOptionWidget<Type>::on_config_value_changed(void* object){
+    QMetaObject::invokeMethod(m_box, [this]{
+        this->update_value();
+    }, Qt::QueuedConnection);
+}
+
+
+
+
+
+template class TimeDurationCellWidget<std::chrono::milliseconds>;
+template class TimeDurationCellWidget<std::chrono::microseconds>;
+template class TimeDurationOptionWidget<std::chrono::milliseconds>;
+template class TimeDurationOptionWidget<std::chrono::microseconds>;
+
+
+template class RegisterUiStateQtWidget<TimeDurationCellWidget<std::chrono::milliseconds>>;
+template class RegisterUiStateQtWidget<TimeDurationCellWidget<std::chrono::microseconds>>;
+template class RegisterUiStateQtWidget<TimeDurationOptionWidget<std::chrono::milliseconds>>;
+template class RegisterUiStateQtWidget<TimeDurationOptionWidget<std::chrono::microseconds>>;
+
+
+
+}
diff --git a/Common/Qt/Options/TimeDurationWidget.h b/Common/Qt/Options/TimeDurationWidget.h
new file mode 100644
index 0000000000..9d656543dd
--- /dev/null
+++ b/Common/Qt/Options/TimeDurationWidget.h
@@ -0,0 +1,58 @@
+/*  Time Duration Option
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Options_TimeDurationWidget_H
+#define PokemonAutomation_Options_TimeDurationWidget_H
+
+#include <QLineEdit>
+#include "Common/Cpp/Options/TimeDurationOption.h"
+#include "ConfigWidget.h"
+
+class QLabel;
+
+namespace PokemonAutomation{
+
+
+
+template <typename Type>
+class TimeDurationCellWidget : public QLineEdit, public ConfigWidget{
+public:
+    using ParentState = TimeDurationCell<Type>;
+
+public:
+    ~TimeDurationCellWidget();
+    TimeDurationCellWidget(QWidget& parent, TimeDurationCell<Type>& value);
+
+    virtual void update_value() override;
+    virtual void on_config_value_changed(void* object) override;
+
+private:
+    TimeDurationCell<Type>& m_value;
+};
+
+
+
+template <typename Type>
+class TimeDurationOptionWidget : public QWidget, public ConfigWidget{
+public:
+    using ParentState = TimeDurationOption<Type>;
+
+public:
+    ~TimeDurationOptionWidget();
+    TimeDurationOptionWidget(QWidget& parent, TimeDurationOption<Type>& value);
+
+    virtual void update_value() override;
+    virtual void on_config_value_changed(void* object) override;
+
+private:
+    TimeDurationOption<Type>& m_value;
+    QLineEdit* m_box;
+    QLabel* m_description;
+};
+
+
+}
+#endif
diff --git a/Common/Qt/Options/TimeExpressionWidget.cpp b/Common/Qt/Options/TimeExpressionWidget.cpp
deleted file mode 100644
index 57d136aa2a..0000000000
--- a/Common/Qt/Options/TimeExpressionWidget.cpp
+++ /dev/null
@@ -1,125 +0,0 @@
-/*  Time Expression Option
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QLineEdit>
-#include "TimeExpressionWidget.h"
-
-namespace PokemonAutomation{
-
-
-
-template <typename Type>
-TimeExpressionCellWidget<Type>::~TimeExpressionCellWidget(){
-    m_value.remove_listener(*this);
-}
-template <typename Type>
-TimeExpressionCellWidget<Type>::TimeExpressionCellWidget(QWidget& parent, TimeExpressionCell<Type>& value)
-    : QLineEdit(QString::fromStdString(value.current_text()), &parent)
-    , ConfigWidget(value, *this)
-    , m_value(value)
-{
-    connect(
-        this, &QLineEdit::textChanged,
-        this, [this](const QString& text){
-            std::string error = m_value.set(text.toStdString());
-        }
-    );
-
-    value.add_listener(*this);
-}
-template <typename Type>
-void TimeExpressionCellWidget<Type>::update_value(){
-    this->setText(QString::fromStdString(m_value.current_text()));
-}
-template <typename Type>
-void TimeExpressionCellWidget<Type>::value_changed(){
-    QMetaObject::invokeMethod(this, [this]{
-        this->update_value();
-    }, Qt::QueuedConnection);
-}
-
-
-
-
-
-template <typename Type>
-TimeExpressionOptionWidget<Type>::~TimeExpressionOptionWidget(){
-    m_value.remove_listener(*this);
-}
-template <typename Type>
-TimeExpressionOptionWidget<Type>::TimeExpressionOptionWidget(QWidget& parent, TimeExpressionOption<Type>& value)
-    : QWidget(&parent)
-    , ConfigWidget(value, *this)
-    , m_value(value)
-{
-    QHBoxLayout* layout = new QHBoxLayout(this);
-    layout->setContentsMargins(0, 0, 0, 0);
-    QLabel* text = new QLabel(QString::fromStdString(m_value.label()), this);
-    text->setWordWrap(true);
-    layout->addWidget(text, 1);
-    QVBoxLayout* rows = new QVBoxLayout();
-    layout->addLayout(rows, 1);
-
-    QHBoxLayout* row0 = new QHBoxLayout();
-    rows->addLayout(row0);
-    QHBoxLayout* row1 = new QHBoxLayout();
-    rows->addLayout(row1);
-
-    m_box = new QLineEdit(QString::fromStdString(m_value.current_text()), this);
-    row0->addWidget(m_box);
-    row0->addWidget(new QLabel("ticks", this));
-
-    QLabel* seconds = new QLabel(QString::fromStdString(m_value.time_string()), this);
-    seconds->setAlignment(Qt::AlignHCenter);
-    row1->addWidget(seconds);
-
-    connect(
-        m_box, &QLineEdit::editingFinished,
-        this, [this, seconds](){
-            std::string error = m_value.set(m_box->text().toStdString());
-            if (error.empty()){
-                seconds->setText(QString::fromStdString(m_value.time_string()));
-            }else{
-                seconds->setText(QString::fromStdString("<font color=\"red\">" + error + "</font>"));
-            }
-        }
-    );
-
-    value.add_listener(*this);
-}
-template <typename Type>
-void TimeExpressionOptionWidget<Type>::update_value(){
-    m_box->setText(QString::fromStdString(m_value.current_text()));
-}
-template <typename Type>
-void TimeExpressionOptionWidget<Type>::value_changed(){
-    QMetaObject::invokeMethod(m_box, [this]{
-        this->update_value();
-    }, Qt::QueuedConnection);
-}
-
-
-
-
-
-template class TimeExpressionCellWidget<uint8_t>;
-template class TimeExpressionCellWidget<uint16_t>;
-template class TimeExpressionCellWidget<uint32_t>;
-template class TimeExpressionCellWidget<int16_t>;
-template class TimeExpressionCellWidget<int32_t>;
-
-template class TimeExpressionOptionWidget<uint8_t>;
-template class TimeExpressionOptionWidget<uint16_t>;
-template class TimeExpressionOptionWidget<uint32_t>;
-template class TimeExpressionOptionWidget<int16_t>;
-template class TimeExpressionOptionWidget<int32_t>;
-
-
-
-
-}
diff --git a/Common/Qt/Options/TimeExpressionWidget.h b/Common/Qt/Options/TimeExpressionWidget.h
deleted file mode 100644
index a37d4022c2..0000000000
--- a/Common/Qt/Options/TimeExpressionWidget.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*  Time Expression Option
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_Options_TimeExpressionWidget_H
-#define PokemonAutomation_Options_TimeExpressionWidget_H
-
-#include <QLineEdit>
-#include "Common/Cpp/Options/TimeExpressionOption.h"
-#include "ConfigWidget.h"
-
-namespace PokemonAutomation{
-
-
-
-template <typename Type>
-class TimeExpressionCellWidget : public QLineEdit, public ConfigWidget{
-public:
-    ~TimeExpressionCellWidget();
-    TimeExpressionCellWidget(QWidget& parent, TimeExpressionCell<Type>& value);
-
-    virtual void update_value() override;
-    virtual void value_changed() override;
-
-private:
-    TimeExpressionCell<Type>& m_value;
-};
-
-
-
-template <typename Type>
-class TimeExpressionOptionWidget : public QWidget, public ConfigWidget{
-public:
-    ~TimeExpressionOptionWidget();
-    TimeExpressionOptionWidget(QWidget& parent, TimeExpressionOption<Type>& value);
-
-    virtual void update_value() override;
-    virtual void value_changed() override;
-
-private:
-    TimeExpressionOption<Type>& m_value;
-    QLineEdit* m_box;
-};
-
-
-}
-#endif
diff --git a/Common/Qt/QtThreadPool.cpp b/Common/Qt/QtThreadPool.cpp
new file mode 100644
index 0000000000..83dd110116
--- /dev/null
+++ b/Common/Qt/QtThreadPool.cpp
@@ -0,0 +1,286 @@
+/*  QtThreadPool
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Concurrency/Qt6.9ThreadBugWorkaround.h"
+#include "Common/Cpp/Concurrency/SpinPause.h"
+#include "QtThreadPool.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+
+
+
+class QtWorkerThread : private QThread{
+public:
+    QtWorkerThread(QtWorkerThreadPool& parent)
+        : m_parent(parent)
+    {
+        start();
+    }
+    ~QtWorkerThread(){
+//        cout << "~QtWorkerThread() - start" << endl;
+        m_cv.notify_all();
+        quit();
+        QtWorkerThread::wait();
+        QThread::wait();
+//        cout << "~QtWorkerThread() - end" << endl;
+    }
+
+    void run_unprotected(std::function<void()> lambda){
+        m_lambda = std::move(lambda);
+        m_cv.notify_all();
+    }
+    void wait(){
+        std::unique_lock<Mutex> lg(m_parent.m_lock);
+        m_cv.wait(lg, [this]{ return m_lambda == nullptr; });
+    }
+
+
+private:
+    virtual void run() override{
+//        exec();
+        while (true){
+            {
+                std::unique_lock<Mutex> lg(m_parent.m_lock);
+                if (m_parent.m_stopping){
+                    break;
+                }
+                if (m_lambda == nullptr){
+                    m_cv.wait(lg);
+                    continue;
+                }
+            }
+            m_lambda();
+            {
+                std::lock_guard<Mutex> lg(m_parent.m_lock);
+                m_lambda = nullptr;
+                m_parent.m_available_threads.emplace_back(this);
+                m_cv.notify_all();
+            }
+        }
+//        cout << "Thread ending..." << endl;
+    }
+
+    QtWorkerThreadPool& m_parent;
+    std::function<void()> m_lambda;
+    ConditionVariable m_cv;
+};
+
+
+
+
+QtWorkerThreadPool::QtWorkerThreadPool() = default;
+QtWorkerThreadPool::~QtWorkerThreadPool(){
+    stop();
+}
+
+void QtWorkerThreadPool::stop(){
+    {
+        std::lock_guard<Mutex> lg(m_lock);
+        m_stopping = true;
+    }
+    m_cv.notify_all();
+#ifdef PA_ENABLE_QT_ADOPTION_WORKAROUND
+    //  Leak all the threads because they can't be joined without hanging.
+    for (std::unique_ptr<QtWorkerThread>& thread : m_threads){
+        thread.release();
+    }
+#endif
+    m_threads.clear();
+}
+
+
+void QtWorkerThreadPool::dispatch(std::function<void()> lambda){
+    if (lambda == nullptr){
+        return;
+    }
+    QtWorkerThread* thread;
+    {
+        std::unique_lock<Mutex> lg(m_lock);
+        if (m_available_threads.empty()){
+            m_available_threads.reserve(m_threads.size() + 1);
+            auto& new_thread = m_threads.emplace_back(std::make_unique<QtWorkerThread>(*this));
+            m_available_threads.emplace_back(new_thread.get());
+        }
+        thread = m_available_threads.back();
+        thread->run_unprotected(std::move(lambda));
+    }
+}
+void QtWorkerThreadPool::run_and_wait(std::function<void()> lambda){
+    if (lambda == nullptr){
+        return;
+    }
+    QtWorkerThread* thread;
+    {
+        std::unique_lock<Mutex> lg(m_lock);
+        if (m_available_threads.empty()){
+            m_available_threads.reserve(m_threads.size() + 1);
+            auto& new_thread = m_threads.emplace_back(std::make_unique<QtWorkerThread>(*this));
+            m_available_threads.emplace_back(new_thread.get());
+        }
+        thread = m_available_threads.back();
+        thread->run_unprotected(std::move(lambda));
+    }
+    thread->wait();
+}
+
+
+
+
+
+
+
+
+QtEventThread::QtEventThread(){
+    start();
+
+    //  Wait for the thread to fully start up and construct the body.
+    while (m_dummy.load(std::memory_order_acquire) == nullptr){
+        pause();
+    }
+}
+QtEventThread::~QtEventThread(){
+    m_dummy.store(nullptr, std::memory_order_relaxed);
+    quit();
+    wait();
+}
+QObject* QtEventThread::add_object(std::function<std::unique_ptr<QObject>()> factory){
+    m_pending_factory = std::move(factory);
+    QMetaObject::invokeMethod(m_dummy.load(std::memory_order_relaxed), [this]{
+        add_object_internal();
+    });
+    std::unique_lock<Mutex> lg(m_lock);
+    m_cv.wait(lg, [this]{ return m_object != nullptr; });
+    return m_object.get();
+}
+void QtEventThread::remove_object(){
+    QMetaObject::invokeMethod(m_dummy.load(std::memory_order_relaxed), [this]{
+        remove_object_internal();
+    });
+    std::unique_lock<Mutex> lg(m_lock);
+    m_cv.wait(lg, [this]{ return m_object == nullptr; });
+}
+void QtEventThread::run(){
+    setPriority(QThread::TimeCriticalPriority);
+
+    QObject dummy;
+    m_dummy.store(&dummy, std::memory_order_release);
+    exec();
+
+    //  Wait until we are in the destructor before destroying the body.
+    while (m_dummy.load(std::memory_order_acquire) != nullptr){
+        pause();
+    }
+}
+void QtEventThread::add_object_internal(){
+    {
+        std::lock_guard<Mutex> lg(m_lock);
+//        cout << "constructing on: " << std::this_thread::get_id() << endl;
+        m_object = m_pending_factory();
+        m_pending_factory = nullptr;
+    }
+    m_cv.notify_all();
+}
+void QtEventThread::remove_object_internal(){
+    {
+        std::lock_guard<Mutex> lg(m_lock);
+//        cout << "destructing on: " << std::this_thread::get_id() << endl;
+        m_object.reset();
+    }
+    m_cv.notify_all();
+}
+
+
+
+
+
+
+QtEventThreadPool::~QtEventThreadPool(){
+    stop();
+}
+void QtEventThreadPool::stop(){
+#ifdef PA_ENABLE_QT_ADOPTION_WORKAROUND
+    //  Leak all the threads because they can't be joined without hanging.
+    for (std::unique_ptr<QtEventThread>& thread : m_threads){
+        thread.release();
+    }
+#endif
+    m_threads.clear();
+    m_available_threads.clear();
+}
+
+
+
+
+QObject* QtEventThreadPool::add_object(std::function<std::unique_ptr<QObject>()> factory){
+    //  `get_thread()` hands out an idle thread exclusively to this call. It only goes
+    //  back to `m_available_threads` once `remove_object()` has destroyed our object.
+    QtEventThread& thread = get_thread();
+    QObject* ret = thread.add_object(std::move(factory));
+    try{
+        //  `m_objects` is shared with every other add/remove call, so it must only be
+        //  touched under `m_lock`.
+        std::lock_guard<Mutex> lg(m_lock);
+        m_objects[ret] = &thread;
+    }catch (...){
+        thread.remove_object();
+        std::lock_guard<Mutex> lg(m_lock);
+        m_available_threads.emplace_back(&thread);
+        throw;
+    }
+    return ret;
+}
+void QtEventThreadPool::remove_object(QObject* object) noexcept{
+    //  Take the object out of `m_objects` *before* destroying it. Once it's destroyed,
+    //  its address may be reused right away by a new object created on another thread
+    //  by a concurrent `add_object()`. If the stale entry were still in the map, that
+    //  `add_object()` would overwrite it with its own thread, and we would then hand
+    //  that busy thread back to `m_available_threads`, where the next `add_object()`
+    //  would replace (destroy) the new object while it is still in use.
+    QtEventThread* thread;
+    {
+        std::lock_guard<Mutex> lg(m_lock);
+        auto iter = m_objects.find(object);
+        if (iter == m_objects.end()){
+            return;
+        }
+        thread = iter->second;
+        m_objects.erase(iter);
+    }
+
+    //  Destroy the object on its own thread. The thread is still exclusively ours, so
+    //  nobody else can be using it.
+    thread->remove_object();
+
+    //  Only now is the thread idle and safe to hand out again.
+    std::lock_guard<Mutex> lg(m_lock);
+    m_available_threads.emplace_back(thread);
+}
+
+QtEventThread& QtEventThreadPool::get_thread(){
+    std::lock_guard<Mutex> lg(m_lock);
+    if (m_available_threads.empty()){
+        m_available_threads.reserve(m_threads.size() + 1);
+        QtEventThread* new_thread = m_threads.emplace_back(
+            std::make_unique<QtEventThread>()
+        ).get();
+        m_available_threads.emplace_back(new_thread);
+    }
+    QtEventThread* ret = m_available_threads.back();
+//    cout << "QtEventThreadPool: " << m_threads.size() << ", using = " << ret << endl;
+    m_available_threads.pop_back();
+    return *ret;
+}
+
+
+
+
+
+
+}
diff --git a/Common/Qt/QtThreadPool.h b/Common/Qt/QtThreadPool.h
new file mode 100644
index 0000000000..1e3b4d31e4
--- /dev/null
+++ b/Common/Qt/QtThreadPool.h
@@ -0,0 +1,125 @@
+/*  QtThreadPool
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_QtThreadPool_H
+#define PokemonAutomation_QtThreadPool_H
+
+#include <vector>
+#include <deque>
+#include <map>
+#include <QThread>
+#include "Common/Cpp/Concurrency/Mutex.h"
+#include "Common/Cpp/Concurrency/ConditionVariable.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+
+
+class QtWorkerThread;
+class QtEventThread;
+
+
+//
+//  A simple work-running thread pool.
+//  This is functionally the same as Common/Cpp/Concurrency/ThreadPool.h,
+//  except that these are Qt threads and it is safe to run signal/slots off them.
+//
+//  This is deprecated and will be removed in the future.
+//
+class QtWorkerThreadPool{
+public:
+    QtWorkerThreadPool();
+    ~QtWorkerThreadPool();
+    void stop();
+
+    void dispatch(std::function<void()> lambda);
+    void run_and_wait(std::function<void()> lambda);
+
+
+private:
+    friend class QtWorkerThread;
+
+    std::vector<std::unique_ptr<QtWorkerThread>> m_threads;
+    std::vector<QtWorkerThread*> m_available_threads;
+    bool m_stopping = false;
+
+    Mutex m_lock;
+    ConditionVariable m_cv;
+};
+
+
+
+
+
+class QtEventThread : public QThread{
+    Q_OBJECT
+
+public:
+    QtEventThread();
+    ~QtEventThread();
+
+    QObject* add_object(std::function<std::unique_ptr<QObject>()> factory);
+    void remove_object();
+
+public:
+    virtual void run() override;
+
+private:
+    void add_object_internal();
+    void remove_object_internal();
+
+private:
+    Mutex m_lock;
+    ConditionVariable m_cv;
+
+    std::atomic<QObject*> m_dummy;
+
+    std::function<std::unique_ptr<QObject>()> m_pending_factory;
+    std::unique_ptr<QObject> m_object;
+};
+
+
+
+
+//
+//  This thread pool serves no purpose than to move objects into dedicated
+//  threads so their event loop processing does not conflict with anything
+//  else. Stuff like Qt video and audio will do this.
+//
+class QtEventThreadPool : public QObject{
+public:
+    ~QtEventThreadPool();
+    void stop();
+
+    //  Construct an object on a dedicated thread.
+    //  You pass it a factory. It returns a pointer to the object.
+    QObject* add_object(std::function<std::unique_ptr<QObject>()> factory);
+
+    //  Remove and destruct the object.
+    void remove_object(QObject* object) noexcept;
+
+
+private:
+    QtEventThread& get_thread();
+
+
+private:
+    std::map<QObject*, QtEventThread*> m_objects;
+
+    Mutex m_lock;
+
+    std::vector<std::unique_ptr<QtEventThread>> m_threads;
+    std::vector<QtEventThread*> m_available_threads;
+};
+
+
+
+
+}
+#endif
diff --git a/Common/Qt/QtThreadPool_Tests.cpp b/Common/Qt/QtThreadPool_Tests.cpp
new file mode 100644
index 0000000000..e2b7d8e51e
--- /dev/null
+++ b/Common/Qt/QtThreadPool_Tests.cpp
@@ -0,0 +1,150 @@
+/*  QtThreadPool Tests
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <map>
+#include <string>
+#include <thread>
+#include <QObject>
+#include "Common/Cpp/Concurrency/Mutex.h"
+#include "Common/Cpp/Concurrency/ThreadPool.h"
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "GlobalThreadPoolsQt.h"
+#include "QtThreadPool.h"
+#include "QtThreadPool_Tests.h"
+
+namespace PokemonAutomation{
+
+
+namespace{
+
+// Registry of the currently alive `TrackedObject`s and which worker owns each one.
+// Objects register themselves on construction and unregister on destruction, so the
+// test can tell whether an object it still owns was destroyed behind its back without
+// ever touching freed memory.
+struct LiveObjectRegistry{
+    Mutex lock;
+    std::map<const QObject*, size_t> owners;
+
+    bool is_owned_by(const QObject* object, size_t owner){
+        std::lock_guard<Mutex> lg(lock);
+        auto iter = owners.find(object);
+        return iter != owners.end() && iter->second == owner;
+    }
+};
+
+class TrackedObject : public QObject{
+public:
+    TrackedObject(LiveObjectRegistry& registry, size_t owner)
+        : m_registry(registry)
+    {
+        std::lock_guard<Mutex> lg(m_registry.lock);
+        m_registry.owners[this] = owner;
+    }
+    ~TrackedObject(){
+        std::lock_guard<Mutex> lg(m_registry.lock);
+        m_registry.owners.erase(this);
+    }
+
+private:
+    LiveObjectRegistry& m_registry;
+};
+
+} // anonymous namespace
+
+
+
+// Many workers concurrently add an object to the global `QtEventThreadPool`, check that
+// it's still alive and still theirs, then remove it. This is the access pattern of many
+// console sessions (e.g. parallel unit tests) each creating and destroying their
+// `AudioPassthroughPairQtThread`, which lives on the pool.
+//
+// It catches races where the pool hands a busy event thread to a new owner. The new
+// owner's `add_object()` then replaces, and so destroys, the object still in use by
+// the previous owner, which shows up here as an object disappearing from the registry
+// while its worker still owns it.
+class Test_QtEventThreadPool_ConcurrentAddRemove : public UnitTest{
+public:
+    static constexpr size_t WORKERS = 8;
+    static constexpr size_t ITERATIONS = 300;
+
+    Test_QtEventThreadPool_ConcurrentAddRemove(ThreadPool& thread_pool)
+        : UnitTest("Common::QtEventThreadPool - Concurrent add/remove")
+        , m_thread_pool(thread_pool)
+    {
+        m_threads = WORKERS;
+    }
+
+    virtual UnitTestResult run(Logger& logger, CancellableScope& scope) const override{
+        LiveObjectRegistry registry;
+
+        //  Use the real global pool rather than a private one. On Windows a pool's
+        //  `stop()` intentionally leaks its threads (Qt 6.9 thread adoption workaround,
+        //  see `PA_ENABLE_QT_ADOPTION_WORKAROUND`), so a private pool would leave
+        //  running event threads behind after every test run.
+        QtEventThreadPool& pool = GlobalThreadPools::qt_event_threadpool();
+
+        Mutex error_lock;
+        std::string first_error;
+        auto report_error = [&](std::string error){
+            std::lock_guard<Mutex> lg(error_lock);
+            if (first_error.empty()){
+                first_error = std::move(error);
+            }
+        };
+
+        auto worker = [&](size_t owner){
+            for (size_t c = 0; c < ITERATIONS; c++){
+                QObject* object = pool.add_object([&]{
+                    return std::make_unique<TrackedObject>(registry, owner);
+                });
+                if (!registry.is_owned_by(object, owner)){
+                    report_error("Worker " + std::to_string(owner) + ": object not alive right after add_object().");
+                    return;
+                }
+
+                //  Give other workers a chance to add and remove their objects.
+                std::this_thread::yield();
+
+                if (!registry.is_owned_by(object, owner)){
+                    report_error("Worker " + std::to_string(owner) + ": object destroyed by another worker.");
+                    return;
+                }
+                pool.remove_object(object);
+            }
+        };
+
+        //  Run the workers on a long-lived thread pool. `run_in_parallel()` only returns
+        //  once every worker has finished, so they can safely use the locals above.
+        //  Don't use `Thread` for this: on Windows its `join()` doesn't wait (it leaks
+        //  the thread to work around the Qt 6.9 thread adoption bug), so the workers
+        //  would keep running after this function returns and its locals are gone.
+        m_thread_pool.run_in_parallel(
+            [&](size_t owner){ worker(owner); },
+            0, WORKERS, 1
+        );
+
+        if (!first_error.empty()){
+            return UnitTestResult(first_error);
+        }
+        std::lock_guard<Mutex> lg(registry.lock);
+        if (!registry.owners.empty()){
+            return UnitTestResult(std::to_string(registry.owners.size()) + " objects were never destroyed.");
+        }
+        return true;
+    }
+
+private:
+    ThreadPool& m_thread_pool;
+};
+
+
+
+void add_tests_QtEventThreadPool(UnitTestDatabase& database, ThreadPool& thread_pool){
+    database.add<Test_QtEventThreadPool_ConcurrentAddRemove>(thread_pool);
+}
+
+
+}
diff --git a/Common/Qt/QtThreadPool_Tests.h b/Common/Qt/QtThreadPool_Tests.h
new file mode 100644
index 0000000000..9af8b978b5
--- /dev/null
+++ b/Common/Qt/QtThreadPool_Tests.h
@@ -0,0 +1,24 @@
+/*  QtThreadPool Tests
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_QtThreadPool_Tests_H
+#define PokemonAutomation_QtThreadPool_Tests_H
+
+namespace PokemonAutomation{
+
+class ThreadPool;
+class UnitTestDatabase;
+
+
+// Stress tests for `QtEventThreadPool`: many threads concurrently adding and removing
+// objects, checking that no thread's object is ever destroyed by another thread.
+// `thread_pool` runs the concurrent workers. It must be a long-lived pool (e.g.
+// `GlobalThreadPools::computation_normal()`), see the test for why.
+void add_tests_QtEventThreadPool(UnitTestDatabase& database, ThreadPool& thread_pool);
+
+
+}
+#endif
diff --git a/Common/Qt/Redispatch.cpp b/Common/Qt/Redispatch.cpp
index 80f4abab14..b5c499e148 100644
--- a/Common/Qt/Redispatch.cpp
+++ b/Common/Qt/Redispatch.cpp
@@ -1,15 +1,19 @@
 /*  Redispatch
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include <mutex>
-#include <condition_variable>
 #include <QThread>
 #include <QApplication>
+#include "Common/Cpp/Concurrency/Mutex.h"
+#include "Common/Cpp/Concurrency/ConditionVariable.h"
 #include "Redispatch.h"
 
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
 namespace PokemonAutomation{
 
 
@@ -22,24 +26,37 @@ void queue_on_main_thread(std::function<void()> lambda){
 
 
 void run_on_main_thread_and_wait(std::function<void()> lambda){
-    if (QCoreApplication::instance()->thread() == QThread::currentThread()){
+    run_on_object_thread_and_wait(QCoreApplication::instance(), std::move(lambda));
+}
+
+void run_on_object_thread_and_wait(QObject* object, std::function<void()> lambda){
+    if (object->thread() == QThread::currentThread()){
         lambda();
         return;
     }
 
-    std::mutex lock;
-    std::condition_variable cv;
+//    static int c = 0;
+//    c++;
+
+    Mutex lock;
+    ConditionVariable cv;
     bool done = false;
-    QMetaObject::invokeMethod(QCoreApplication::instance(), [&]{
+//    cout << c << ": " << "Invoking..." << endl;
+    QMetaObject::invokeMethod(object, [&]{
+//        cout << c << ": " << "Running Lambda..." << endl;
         lambda();
-        std::lock_guard<std::mutex> lg(lock);
+//        cout << c << ": " << "Running Lambda... Done" << endl;
+        std::lock_guard<Mutex> lg(lock);
         done = true;
         cv.notify_all();
     });
-    std::unique_lock<std::mutex> lg(lock);
+//    cout << c << ": " << "Invoking... Done" << endl;
+    std::unique_lock<Mutex> lg(lock);
+//    cout << c << ": " << "Waiting..." << endl;
     cv.wait(lg, [&]{ return done; });
 }
 
 
 
+
 }
diff --git a/Common/Qt/Redispatch.h b/Common/Qt/Redispatch.h
index 0d3682ede0..aeb0774536 100644
--- a/Common/Qt/Redispatch.h
+++ b/Common/Qt/Redispatch.h
@@ -1,6 +1,6 @@
 /*  Redispatch
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -9,14 +9,18 @@
 
 #include <functional>
 
+class QObject;
+
 namespace PokemonAutomation{
 
 
-//  Disable these since they are dangerous.
-//void dispatch_to_main_thread(std::function<void()> lambda);
-//void queue_on_main_thread(std::function<void()> lambda);
+//  Be careful with these due to re-entrancy and object lifetime.
+void dispatch_to_main_thread(std::function<void()> lambda);
+void queue_on_main_thread(std::function<void()> lambda);
+
 
 void run_on_main_thread_and_wait(std::function<void()> lambda);
+void run_on_object_thread_and_wait(QObject* object, std::function<void()> lambda);
 
 
 
diff --git a/Common/Qt/ShutdownWithEvents.h b/Common/Qt/ShutdownWithEvents.h
new file mode 100644
index 0000000000..fc2c00d138
--- /dev/null
+++ b/Common/Qt/ShutdownWithEvents.h
@@ -0,0 +1,43 @@
+/*  Shutdown with Events
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_ShutdownWithEvents_H
+#define PokemonAutomation_ShutdownWithEvents_H
+
+#include <QApplication>
+#include "Common/Cpp/Logging/AbstractLogger.h"
+
+namespace PokemonAutomation{
+
+
+template <typename Lambda>
+void shutdown_with_events(
+    Logger& logger,
+    const char* name,
+    Lambda try_shutdown
+) noexcept{
+    try{
+        std::string str("Shutting down ");
+        str += name;
+        str += "...";
+        logger.log(str);
+        if (try_shutdown()){
+            return;
+        }
+        str = "~";
+        str += name;
+        str += "(): Failed to shutdown on first attempt. Retrying...";
+        logger.log(str, COLOR_RED);
+        do{
+            QApplication::processEvents();
+        }while (!try_shutdown());
+    }catch (...){}
+}
+
+
+
+}
+#endif
diff --git a/Common/Qt/SpinWaitWithEvents.h b/Common/Qt/SpinWaitWithEvents.h
new file mode 100644
index 0000000000..5b535dfbae
--- /dev/null
+++ b/Common/Qt/SpinWaitWithEvents.h
@@ -0,0 +1,46 @@
+/*  SpinWaitWithEvents
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_SpinWaitWithEvents_H
+#define PokemonAutomation_SpinWaitWithEvents_H
+
+#include <atomic>
+#include <QApplication>
+#include "Common/Cpp/Concurrency/SpinPause.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+
+
+class SpinWaitWithEvents{
+public:
+    SpinWaitWithEvents()
+        : m_finished(false)
+    {}
+    void process_events_while_waiting() const{
+        if (m_finished.load(std::memory_order_acquire)){
+            return;
+        }
+        do{
+            QApplication::processEvents();
+            pause();
+        }while (!m_finished.load(std::memory_order_acquire));
+    }
+    void signal(){
+        m_finished.store(true, std::memory_order_release);
+    }
+
+private:
+    std::atomic<bool> m_finished;
+};
+
+
+
+}
+#endif
diff --git a/Common/Qt/StringToolsQt.cpp b/Common/Qt/StringToolsQt.cpp
index 23ef10aa88..df13d1aac4 100644
--- a/Common/Qt/StringToolsQt.cpp
+++ b/Common/Qt/StringToolsQt.cpp
@@ -1,10 +1,9 @@
 /*  String Tools (Qt)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include <sstream>
 #include <QString>
 #include "StringToolsQt.h"
 
@@ -12,14 +11,6 @@ namespace PokemonAutomation{
 
 
 
-std::u32string to_utf32(const std::string& str){
-    return QString::fromStdString(str).toStdU32String();
-}
-std::string to_utf8(const std::u32string& str){
-    return QString::fromStdU32String(str).toStdString();
-}
-
-
 std::string to_lower(const std::string& str){
     return QString::fromStdString(str).toLower().toStdString();
 }
diff --git a/Common/Qt/StringToolsQt.h b/Common/Qt/StringToolsQt.h
index d0533de1d3..250af1d9ae 100644
--- a/Common/Qt/StringToolsQt.h
+++ b/Common/Qt/StringToolsQt.h
@@ -1,6 +1,6 @@
 /*  String Tools (Qt)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -12,8 +12,8 @@
 namespace PokemonAutomation{
 
 
-std::u32string to_utf32(const std::string& str);
-std::string to_utf8(const std::u32string& str);
+//std::u32string to_utf32(const std::string& str);
+//std::string to_utf8(const std::u32string& str);
 
 std::string to_lower(const std::string& str);
 void to_lower(std::u32string& str);
diff --git a/Common/Qt/TimeQt.cpp b/Common/Qt/TimeQt.cpp
index eb9b7861da..6973f78799 100644
--- a/Common/Qt/TimeQt.cpp
+++ b/Common/Qt/TimeQt.cpp
@@ -1,10 +1,11 @@
 /*  Time Tools (Qt)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include <QDateTime>
+#include <QTimeZone>
 #include "Common/Cpp/Exceptions.h"
 #include "Common/Cpp/PrettyPrint.h"
 #include "TimeQt.h"
@@ -17,7 +18,7 @@ std::string to_utc_time_str(WallClock time){
 #if 0
     time_t tt = std::chrono::system_clock::to_time_t(time);
     static SpinLock lock;
-    SpinLockGuard lg(lock);
+    WriteSpinLock lg(lock);
     std::tm* utc = gmtime(&tt);
     std::string str;
     str += std::to_string(utc->tm_year + 1900);
@@ -45,7 +46,7 @@ std::string to_utc_time_str(WallClock time){
 #endif
 
     int64_t secs_since_epoch = std::chrono::duration_cast<std::chrono::seconds>(time.time_since_epoch()).count();
-    QDateTime qdatetime = QDateTime::fromSecsSinceEpoch(secs_since_epoch, Qt::UTC);
+    QDateTime qdatetime = QDateTime::fromSecsSinceEpoch(secs_since_epoch, QTimeZone::utc());
     QDate qdate = qdatetime.date();
     QTime qtime = qdatetime.time();
     std::string str;
@@ -142,7 +143,7 @@ WallClock parse_utc_time_str(const std::string& str){
         throw ParseException("Invalid time.");
     }
 
-    QDateTime qdatetime(qdate, qtime, Qt::UTC);
+    QDateTime qdatetime(qdate, qtime, QTimeZone::utc());
     int64_t secs_since_epoch = qdatetime.toSecsSinceEpoch();
 
     return WallClock{} + std::chrono::seconds(secs_since_epoch);
@@ -150,5 +151,29 @@ WallClock parse_utc_time_str(const std::string& str){
 
 
 
+int64_t to_seconds_since_epoch(const DateTime& date){
+    QDate qdate(date.year, date.month, date.day);
+    QTime qtime(date.hour, date.minute, date.second);
+    QDateTime qdatetime(qdate, qtime, QTimeZone::utc());
+    int64_t secs_since_epoch = qdatetime.toSecsSinceEpoch();
+    return secs_since_epoch;
+}
+DateTime from_seconds_since_epoch(int64_t seconds_since_epoch){
+    QDateTime qdatetime = QDateTime::fromSecsSinceEpoch(seconds_since_epoch, QTimeZone::utc());
+    QDate qdate = qdatetime.date();
+    QTime qtime = qdatetime.time();
+    return DateTime{
+        (int16_t)qdate.year(),
+        (int8_t)qdate.month(),
+        (int8_t)qdate.day(),
+        (int8_t)qtime.hour(),
+        (int8_t)qtime.minute(),
+        (int8_t)qtime.second(),
+    };
+}
+
+
+
+
 
 }
diff --git a/Common/Qt/TimeQt.h b/Common/Qt/TimeQt.h
index f7cf0436f1..13f81e108b 100644
--- a/Common/Qt/TimeQt.h
+++ b/Common/Qt/TimeQt.h
@@ -1,6 +1,6 @@
 /*  Time Tools (Qt)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -9,6 +9,7 @@
 
 #include <string>
 #include "Common/Cpp/Time.h"
+#include "Common/Cpp/DateTime.h"
 
 namespace PokemonAutomation{
 
@@ -16,6 +17,8 @@ namespace PokemonAutomation{
 std::string to_utc_time_str(WallClock time);
 WallClock parse_utc_time_str(const std::string& str);
 
+int64_t to_seconds_since_epoch(const DateTime& date);
+DateTime from_seconds_since_epoch(int64_t seconds_since_epoch);
 
 
 }
diff --git a/Common/Qt/UiStateQtWidget.h b/Common/Qt/UiStateQtWidget.h
new file mode 100644
index 0000000000..fd096587ae
--- /dev/null
+++ b/Common/Qt/UiStateQtWidget.h
@@ -0,0 +1,47 @@
+/*  Ui State Qt Widget
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_UiStateQtWidget_H
+#define PokemonAutomation_UiStateQtWidget_H
+
+#include "Common/Cpp/UiWrapper.h"
+
+class QWidget;
+
+namespace PokemonAutomation{
+
+
+class UiComponentQtWidget : public UiComponent{
+public:
+    virtual QWidget& widget() = 0;
+};
+
+
+template <typename UiWidgetType>
+class RegisterUiStateQtWidget{
+    using UiStateType = typename UiWidgetType::ParentState;
+
+public:
+    RegisterUiStateQtWidget(){
+        UiStateType::m_ui_factory = [](UiStateType& state, void* params){
+            QWidget* parent = (QWidget*)params;
+            return UiWrapper(
+                parent == nullptr,  //  Do not take ownership if it has a parent.
+                new UiWidgetType(*parent, state)
+            );
+        };
+    }
+
+    static RegisterUiStateQtWidget initializer;
+};
+
+template <typename UiWidgetType>
+RegisterUiStateQtWidget<UiWidgetType> RegisterUiStateQtWidget<UiWidgetType>::initializer;
+
+
+
+}
+#endif
diff --git a/Common/Qt/WidgetStackFixedAspectRatio.cpp b/Common/Qt/WidgetStackFixedAspectRatio.cpp
index 5987585bef..70fc2c693e 100644
--- a/Common/Qt/WidgetStackFixedAspectRatio.cpp
+++ b/Common/Qt/WidgetStackFixedAspectRatio.cpp
@@ -1,6 +1,6 @@
 /*  Widget Stack Fixed Aspect Ratio
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -38,6 +38,11 @@ WidgetStackFixedAspectRatio::WidgetStackFixedAspectRatio(
 void WidgetStackFixedAspectRatio::add_widget(QWidget& widget){
     widget.setParent(m_stack_holder);
     m_widgets.insert(&widget);
+    widget.show();
+}
+void WidgetStackFixedAspectRatio::remove_widget(QWidget* widget){
+    m_widgets.erase(widget);
+    delete widget;
 }
 double WidgetStackFixedAspectRatio::sanitize_aspect_ratio(double aspect_ratio) const{
     if (aspect_ratio == 0 || std::isnan(aspect_ratio)){
diff --git a/Common/Qt/WidgetStackFixedAspectRatio.h b/Common/Qt/WidgetStackFixedAspectRatio.h
index 02ab518d4e..c49b95a068 100644
--- a/Common/Qt/WidgetStackFixedAspectRatio.h
+++ b/Common/Qt/WidgetStackFixedAspectRatio.h
@@ -1,6 +1,6 @@
 /*  Widget Stack Fixed Aspect Ratio
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -35,6 +35,7 @@ class WidgetStackFixedAspectRatio : public QWidget{
     void set_all(SizePolicy size_policy, double aspect_ratio);
 
     void add_widget(QWidget& widget);
+    void remove_widget(QWidget* widget);
 
     virtual void resizeEvent(QResizeEvent* event) override;
 
diff --git a/Common/SerialPABotBase/SerialPABotBase_Messages_HID_Keyboard.h b/Common/SerialPABotBase/SerialPABotBase_Messages_HID_Keyboard.h
new file mode 100644
index 0000000000..77761387a5
--- /dev/null
+++ b/Common/SerialPABotBase/SerialPABotBase_Messages_HID_Keyboard.h
@@ -0,0 +1,46 @@
+/*  SerialPABotBase Messages (HID Keyboard)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_SerialPABotBase_Messages_HID_Keyboard_H
+#define PokemonAutomation_SerialPABotBase_Messages_HID_Keyboard_H
+
+#include "../ControllerStates/StandardHid_Keyboard_State.h"
+#include "SerialPABotBase_Protocol.h"
+
+#if _WIN32
+#pragma pack(push, 1)
+#define PABB_PACK
+#elif __GNUC__
+#define PABB_PACK   __attribute__((packed))
+#else
+#define PABB_PACK
+#endif
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+#define PABB_MSG_COMMAND_HID_KEYBOARD_STATE     0x82
+typedef struct{
+    seqnum_t seqnum;
+    uint16_t milliseconds;
+    pabb_HID_Keyboard_State report;
+} PABB_PACK pabb_Message_Command_HID_Keyboard_State;
+
+
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#if _WIN32
+#pragma pack(pop)
+#endif
+
+#endif
diff --git a/Common/SerialPABotBase/SerialPABotBase_Messages_NS1_OemControllers.h b/Common/SerialPABotBase/SerialPABotBase_Messages_NS1_OemControllers.h
new file mode 100644
index 0000000000..c75c6dc839
--- /dev/null
+++ b/Common/SerialPABotBase/SerialPABotBase_Messages_NS1_OemControllers.h
@@ -0,0 +1,102 @@
+/*  SerialPABotBase Messages (Nintendo Switch 1 OEM Controllers)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_SerialPABotBase_Messages_NS1_OemControllers_H
+#define PokemonAutomation_SerialPABotBase_Messages_NS1_OemControllers_H
+
+#include "../ControllerStates/NintendoSwitch_OemController_State.h"
+#include "SerialPABotBase_Protocol.h"
+
+#if _WIN32
+#pragma pack(push, 1)
+#define PABB_PACK
+#elif __GNUC__
+#define PABB_PACK   __attribute__((packed))
+#else
+#define PABB_PACK
+#endif
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+
+typedef struct{
+    uint8_t body[3];
+    uint8_t buttons[3];
+    uint8_t left_grip[3];
+    uint8_t right_grip[3];
+} PABB_NintendoSwitch_ControllerColors;
+
+
+
+
+
+#define PABB_MSG_INFO_NS1_OEM_CONTROLLER_RUMBLE             0x30
+typedef struct{
+    OemController_RumbleState rumble;
+} PABB_PACK pabb_MsgInfo_NS1_OemController_Rumble;
+
+#define PABB_MSG_INFO_NS1_OEM_CONTROLLER_USB_DISALLOWED     0x31
+
+
+
+#define PABB_MSG_REQUEST_NS1_OEM_CONTROLLER_READ_SPI        0x60
+typedef struct{
+    seqnum_t seqnum;
+    uint32_t controller_type;
+    uint32_t address;
+    uint8_t bytes;
+} PABB_PACK pabb_Message_NS1_OemController_ReadSpi;
+
+#define PABB_MSG_REQUEST_NS1_OEM_CONTROLLER_WRITE_SPI       0x61
+typedef struct{
+    seqnum_t seqnum;
+    uint32_t controller_type;
+    uint32_t address;
+    uint8_t bytes;
+} PABB_PACK pabb_Message_NS1_OemController_WriteSpi;
+
+#define PABB_MSG_REQUEST_NS1_OEM_CONTROLLER_PLAYER_LIGHTS   0x62
+typedef struct{
+    seqnum_t seqnum;
+    uint32_t controller_type;
+} PABB_PACK pabb_MsgInfo_NS1_OemController_PlayerLights;
+
+
+
+#define PABB_MSG_COMMAND_NS1_OEM_CONTROLLER_BUTTONS         0xa0
+typedef struct{
+    seqnum_t seqnum;
+    uint16_t milliseconds;
+    pabb_NintendoSwitch_OemController_State0x30_Buttons buttons;
+} PABB_PACK pabb_Message_Command_NS1_OemController_Buttons;
+
+
+#define PABB_MSG_COMMAND_NS1_OEM_CONTROLLER_FULL_STATE      0xa1
+typedef struct{
+    seqnum_t seqnum;
+    uint16_t milliseconds;
+    pabb_NintendoSwitch_OemController_State0x30 state;
+} PABB_PACK pabb_Message_Command_NS1_OemController_FullState;
+
+
+
+
+#ifdef __cplusplus
+}
+#endif
+
+
+
+#if _WIN32
+#pragma pack(pop)
+#endif
+
+
+#endif
diff --git a/Common/SerialPABotBase/SerialPABotBase_Messages_NS_WiredController.h b/Common/SerialPABotBase/SerialPABotBase_Messages_NS_WiredController.h
new file mode 100644
index 0000000000..b2d139f946
--- /dev/null
+++ b/Common/SerialPABotBase/SerialPABotBase_Messages_NS_WiredController.h
@@ -0,0 +1,46 @@
+/*  SerialPABotBase Messages (Nintendo Switch Wired Controller)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_SerialPABotBase_Messages_NS_WiredController_H
+#define PokemonAutomation_SerialPABotBase_Messages_NS_WiredController_H
+
+#include "../ControllerStates/NintendoSwitch_WiredController_State.h"
+#include "SerialPABotBase_Protocol.h"
+
+#if _WIN32
+#pragma pack(push, 1)
+#define PABB_PACK
+#elif __GNUC__
+#define PABB_PACK   __attribute__((packed))
+#else
+#define PABB_PACK
+#endif
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+#define PABB_MSG_COMMAND_NS_WIRED_CONTROLLER_STATE      0x90
+typedef struct{
+    seqnum_t seqnum;
+    uint16_t milliseconds;
+    pabb_NintendoSwitch_WiredController_State report;
+} PABB_PACK pabb_Message_Command_NS_WiredController_State;
+
+
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#if _WIN32
+#pragma pack(pop)
+#endif
+
+#endif
diff --git a/Common/SerialPABotBase/SerialPABotBase_Protocol.h b/Common/SerialPABotBase/SerialPABotBase_Protocol.h
new file mode 100644
index 0000000000..fd7951fb28
--- /dev/null
+++ b/Common/SerialPABotBase/SerialPABotBase_Protocol.h
@@ -0,0 +1,406 @@
+/*  Serial PABotBase Message Protocol
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *
+ *      Pokemon Automation Bot-Base implements reliable data transmissions over
+ *  serial communication. This is done by checksumming messages along with a
+ *  protocol that is tolerant to data drops.
+ *
+ *  This file describes the message protocol. The data being transmitted is raw
+ *  binary and not is readable text.
+ *
+ *
+ *  Message Format:
+ *      byte 0: Length of the entire message. (bits are inverted)
+ *      byte 1: Message Type
+ *      byte X: Optional data of variable length.
+ *      Last 4 bytes: CRC32C of the entire message except these last 4 bytes.
+ *
+ *      Thus there are 6 bytes of overhead for each message.
+ *
+ *
+ *  There are currently 4 categories of message types:
+ *
+ *      1.  Info: These are simple one-way messages. They do not need to be
+ *          acked and may be dropped without adversely affecting anything.
+ *
+ *      2.  Ack/Response: These are messages sent in response to an earlier
+ *          message that was received.
+ *
+ *      3.  Request: The sender requests the receiver to do something simple.
+ *          The receiver must respond with an ack.
+ *
+ *          This is used for things that take no clock time. For example, querying
+ *          for program identifiers, turning on/off LEDs, or setting flags in the
+ *          program to change its behavior in the future.
+ *
+ *      4.  Command: The sender requests the receiver to do a large asynchronous
+ *          operation. The receiver must ack this message. Once the command is
+ *          finished, the receiver must send a request message back to the sender
+ *          to indicate that the command is finished.
+ *
+ *          This is used for issuing button presses or other subroutines that
+ *          consume time.
+ *
+ *
+ *  General Protocol:
+ *
+ *      1.  Every time you send a new request/command message, you increment
+ *          your sequence number (seqnum) by 1.
+ *
+ *      2.  If you receive an invalid message (bad length or bad checksum), ignore
+ *          the first byte and attempt to parse the next byte as the start of a
+ *          new message.
+ *
+ *      3.  If you receive a zero for the 1st byte of a message, ignore it and
+ *          attempt to parse the next byte as the start of a new message.
+ *
+ *      4.  At any point, you can send a bunch of zero bytes. This will cause
+ *          the receiver to re-synchronize.
+ *
+ *      5.  If you receive a request/command message, you must send the appropriate
+ *          ack/response message using the same seqnum.
+ *
+ *      6.  If you receive a command message, you must first ack the message itself.
+ *          Once the command is finished, you must send a request referencing the
+ *          command to indicate that it is finished. You will receive an ack for
+ *          this short (finishing) command, and if you don't, send it again until
+ *          you do. If the command finishes immediately, you can skip the ack and
+ *          just send the finish request.
+ *
+ *      7.  If you send a request/command message and don't get a response after
+ *          a time limit, you should resend the message with the same seqnum.
+ *
+ *      8.  If you receive a request/command that has a seqnum ahead of what you
+ *          are expecting, it means an earlier request/command was dropped.
+ *          Do not process the request/command since you will lose ordering.
+ *
+ *      9.  If you receive a request/command that has an old seqnum, it is a
+ *          retransmit. Send an ack for it, but don't process it again. (idempotency)
+ *
+ *
+ *  Failure Analysis:
+ *
+ *      -   Corrupted messages will either fail checksum or will have an invalid
+ *          length/type. These are simply ignored and dropped.
+ *
+ *      -   If either sender or receiver gets out-of-sync and loses track of
+ *          message boundaries, it will eventually find the boundary again by
+ *          simply trying to parse every byte as the start of a new message and
+ *          verifying the length and CRC.
+ *
+ *      -   If a request/command is dropped, no ack will be received. The sender
+ *          will eventually send the command again. (#7)
+ *
+ *      -   If an ack is dropped, the sender will eventually resend the
+ *          request/command again. The receiver will see the duplicate
+ *          request/command and ack it. But the receiver will not process it
+ *          again to preserve idempotency. (#9)
+ *
+ *  The current protocol guarantees that all commands are processed in order
+ *  exactly once. Requests are not guaranteed to process in order and may execute
+ *  more than once so they should be idempotent.
+ *
+ *  The protocol also allows both sides to queue up requests and commands.
+ *  In other words, it is possible to send multiple requests/commands at once
+ *  without waiting for the individual acks.
+ *
+ *
+ *  PABotBase Specifics:
+ *
+ *      -   PABotBase can queue up to 4 commands. If it receives any commands
+ *          while the queue is full, it drops it and responds with
+ *          "PABB_MSG_ERROR_COMMAND_DROPPED". (Any command that results in a
+ *          button press or a wait is a long command.)
+ *
+ *      -   PABotBase can still handle other messages while it is running a long
+ *          command.
+ *
+ */
+
+#ifndef PokemonAutomation_SerialPABotBase_Protocol_H
+#define PokemonAutomation_SerialPABotBase_Protocol_H
+
+#include <stdbool.h>
+#include <stdint.h>
+
+#if _WIN32
+#pragma pack(push, 1)
+#define PABB_PACK
+#elif __GNUC__
+#define PABB_PACK   __attribute__((packed))
+#else
+#define PABB_PACK
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+////////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////
+
+#define PABB_BAUD_RATE                  115200
+#define PABB_PROTOCOL_OVERHEAD          (2 + sizeof(uint32_t))
+#define PABB_PROTOCOL_MAX_PACKET_SIZE   64
+
+//  Must be a power-of-two.
+#define PABB_DEVICE_MINIMUM_QUEUE_SIZE  4
+
+typedef uint32_t seqnum_t;
+
+////////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////
+//  Basic Message Types
+
+#define PABB_MSG_IS_ERROR(x)        (((x) & 0xf0) == 0x00)  //  Framework errors between 0x00 - 0x0f.
+#define PABB_MSG_IS_ACK(x)          (((x) & 0xf0) == 0x10)  //  Acks between 0x10 - 0x1f.
+#define PABB_MSG_IS_INFO(x)         (((x) & 0xe0) == 0x20)  //  Custom info between 0x20 - 0x3f.
+#define PABB_MSG_IS_REQUEST(x)      (((x) & 0xc0) == 0x40)  //  Requests between 0x40 - 0x7f.
+#define PABB_MSG_IS_COMMAND(x)      ((x) >= 0x80)           //  Commands between 0x80 - 0xff.
+
+#define PABB_MSG_IS_REQUEST_OR_COMMAND(x)   ((x) >= 0x40)
+
+////////////////////////////////////////////////////////////////////////////////
+//  Framework Errors
+#define PABB_MSG_ERROR_READY                    0x00
+//  No Parameters
+
+#define PABB_MSG_ERROR_INVALID_MESSAGE          0x01
+typedef struct{
+    uint8_t message_length;
+} PABB_PACK pabb_MsgInfoInvalidMessage;
+
+#define PABB_MSG_ERROR_CHECKSUM_MISMATCH        0x02
+typedef struct{
+    uint8_t message_length;
+} PABB_PACK pabb_MsgInfoChecksumMismatch;
+
+#define PABB_MSG_ERROR_INVALID_TYPE             0x03
+typedef struct{
+    uint8_t type;
+} PABB_PACK pabb_MsgInfoInvalidType;
+
+#define PABB_MSG_ERROR_INVALID_REQUEST          0x04
+typedef struct{
+    seqnum_t seqnum;
+} PABB_PACK pabb_MsgInfoInvalidRequest;
+
+#define PABB_MSG_ERROR_MISSED_REQUEST           0x05
+typedef struct{
+    seqnum_t seqnum;
+} PABB_PACK pabb_MsgInfoMissedRequest;
+
+#define PABB_MSG_ERROR_COMMAND_DROPPED          0x06
+typedef struct{
+    seqnum_t seqnum;
+} PABB_PACK pabb_MsgInfoCommandDropped;
+
+#define PABB_MSG_ERROR_WARNING                  0x07
+typedef struct{
+    uint16_t error_code;
+} PABB_PACK pabb_MsgInfoWARNING;
+
+#define PABB_MSG_ERROR_DISCONNECTED             0x08
+typedef struct{
+    uint16_t error_code;
+} PABB_PACK pabb_MsgInfoDisconnected;
+
+////////////////////////////////////////////////////////////////////////////////
+//  Ack
+
+#define PABB_MSG_ACK_COMMAND                    0x10
+typedef struct{
+    seqnum_t seqnum;
+} PABB_PACK pabb_MsgAckCommand;
+
+#define PABB_MSG_ACK_REQUEST                    0x11
+typedef struct{
+    seqnum_t seqnum;
+} PABB_PACK pabb_MsgAckRequest;
+
+#define PABB_MSG_ACK_REQUEST_I8                 0x12
+typedef struct{
+    seqnum_t seqnum;
+    uint8_t data;
+} PABB_PACK pabb_MsgAckRequestI8;
+
+#define PABB_MSG_ACK_REQUEST_I16                0x13
+typedef struct{
+    seqnum_t seqnum;
+    uint16_t data;
+} PABB_PACK pabb_MsgAckRequestI16;
+
+#define PABB_MSG_ACK_REQUEST_I32                0x14
+typedef struct{
+    seqnum_t seqnum;
+    uint32_t data;
+} PABB_PACK pabb_MsgAckRequestI32;
+
+#define PABB_MSG_ACK_REQUEST_DATA               0x1f
+typedef struct{
+    seqnum_t seqnum;
+} PABB_PACK pabb_MsgAckRequestData;
+
+////////////////////////////////////////////////////////////////////////////////
+//  Custom Info
+
+#define PABB_MSG_INFO_I32                       0x20
+typedef struct{
+    uint8_t tag;
+    uint32_t data;
+} PABB_PACK pabb_MsgInfoI32;
+
+#define PABB_MSG_INFO_DATA                      0x21
+typedef struct{
+    uint32_t tag;
+} PABB_PACK pabb_MsgInfoData;
+
+#define PABB_MSG_INFO_STRING                    0x23
+
+#define PABB_MSG_INFO_I32_LABEL                 0x24
+#define PABB_MSG_INFO_H32_LABEL                 0x25
+typedef struct{
+    uint32_t value;
+} PABB_PACK pabb_MsgInfoI32Label;
+
+typedef uint8_t pabb_DeviceResetReason;
+#define PABB_DeviceResetReason_UNKNOWN          0x00
+#define PABB_DeviceResetReason_OTHER            0x01
+#define PABB_DeviceResetReason_POWER_ON         0x02
+#define PABB_DeviceResetReason_MANUAL           0x03
+#define PABB_DeviceResetReason_BROWNOUT         0x04
+#define PABB_DeviceResetReason_CRASH            0x05
+
+#define PABB_MSG_INFO_DEVICE_RESET_REASON       0x26
+typedef struct{
+    pabb_DeviceResetReason reason;
+    uint32_t native_code;
+} PABB_PACK pabb_MsgDeviceReset;
+
+////////////////////////////////////////////////////////////////////////////////
+//  Static Requests
+
+#define PABB_MSG_SEQNUM_RESET                   0x40
+//  After you send this message, the next seqnum you should use is (seqnum + 1).
+typedef struct{
+    seqnum_t seqnum;
+} PABB_PACK pabb_MsgInfoSeqnumReset;
+
+#define PABB_MSG_REQUEST_PROTOCOL_VERSION       0x41
+typedef struct{
+    seqnum_t seqnum;
+} PABB_PACK pabb_MsgRequestProtocolVersion;
+
+#define PABB_MSG_REQUEST_PROGRAM_VERSION        0x42
+typedef struct{
+    seqnum_t seqnum;
+} PABB_PACK pabb_MsgRequestProgramVersion;
+
+#define PABB_MSG_REQUEST_PROGRAM_ID             0x43
+typedef struct{
+    seqnum_t seqnum;
+} PABB_PACK pabb_MsgRequestProgramID;
+
+#define PABB_MSG_REQUEST_PROGRAM_NAME           0x44
+typedef struct{
+    seqnum_t seqnum;
+} PABB_PACK pabb_MsgRequestProgramName;
+
+#define PABB_MSG_REQUEST_CONTROLLER_LIST        0x45
+typedef struct{
+    seqnum_t seqnum;
+} PABB_PACK pabb_MsgRequestControllerList;
+
+#define PABB_MSG_REQUEST_QUEUE_SIZE             0x46
+typedef struct{
+    seqnum_t seqnum;
+} PABB_PACK pabb_MsgRequestQueueSize;
+
+////////////////////////////////////////////////////////////////////////////////
+//  Mode Requests
+
+#define PABB_MSG_REQUEST_READ_CONTROLLER_MODE   0x47
+typedef struct{
+    seqnum_t seqnum;
+} PABB_PACK pabb_MsgRequestReadControllerMode;
+
+#define PABB_MSG_REQUEST_CHANGE_CONTROLLER_MODE 0x48    //  Change controller and keep settings.
+#define PABB_MSG_REQUEST_RESET_TO_CONTROLLER    0x49    //  Change controller and wipe settings. (unpair from host)
+typedef struct{
+    seqnum_t seqnum;
+    uint32_t controller_id;
+} PABB_PACK pabb_MsgRequestChangeControllerMode;
+
+////////////////////////////////////////////////////////////////////////////////
+//  Command Queue Requests
+
+#define PABB_MSG_REQUEST_COMMAND_FINISHED       0x4a
+//  When you receive this message, you must ack it with PABB_MSG_ACK_REQUEST.
+typedef struct{
+    seqnum_t seqnum;
+    seqnum_t seq_of_original_command;
+    uint32_t finish_time;
+} PABB_PACK pabb_MsgRequestCommandFinished;
+
+#define PABB_MSG_REQUEST_STOP                   0x4b
+typedef struct{
+    seqnum_t seqnum;
+} PABB_PACK pabb_MsgRequestStop;
+
+#define PABB_MSG_REQUEST_NEXT_CMD_INTERRUPT     0x4c
+typedef struct{
+    seqnum_t seqnum;
+} PABB_PACK pabb_MsgRequestNextCmdInterrupt;
+
+////////////////////////////////////////////////////////////////////////////////
+//  Other Requests
+
+#define PABB_MSG_REQUEST_CLOCK                  0x4f    //  Deprecated
+typedef struct{
+    seqnum_t seqnum;
+} PABB_PACK pabb_system_clock;
+
+#define PABB_MSG_REQUEST_STATUS                 0x50
+typedef struct{
+    seqnum_t seqnum;
+} PABB_PACK pabb_Message_RequestStatus;
+
+#define PABB_MSG_REQUEST_READ_MAC_ADDRESS       0x51
+typedef struct{
+    seqnum_t seqnum;
+    uint32_t mode;
+} PABB_PACK pabb_MsgRequestReadMacAddress;
+
+#define PABB_MSG_REQUEST_PAIRED_MAC_ADDRESS     0x52
+typedef struct{
+    seqnum_t seqnum;
+    uint32_t mode;
+} PABB_PACK pabb_MsgRequestPairedMacAddress;
+
+////////////////////////////////////////////////////////////////////////////////
+//  Commands
+
+//  These are no longer supported by anything.
+
+#if 0
+#define PABB_MSG_COMMAND_SET_LED_STATE          0x81
+typedef struct{
+    seqnum_t seqnum;
+    bool on;
+} PABB_PACK pabb_MsgCommandSetLeds;
+#endif
+
+////////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#if _WIN32
+#pragma pack(pop)
+#endif
+
+#endif
diff --git a/Common/SerialPABotBase/SerialPABotBase_Protocol_IDs.h b/Common/SerialPABotBase/SerialPABotBase_Protocol_IDs.h
new file mode 100644
index 0000000000..ef632881fc
--- /dev/null
+++ b/Common/SerialPABotBase/SerialPABotBase_Protocol_IDs.h
@@ -0,0 +1,69 @@
+/*  SerialPABotBase Protocol IDs
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_SerialPABotBase_Protocol_IDs_H
+#define PokemonAutomation_SerialPABotBase_Protocol_IDs_H
+
+#include <stdint.h>
+
+//
+//  Program IDs
+//
+
+typedef uint8_t pabb_ProgramID;
+
+#define PABB_PID_UNSPECIFIED                                0x00
+
+//  New AVR8
+#define PABB_PID_PABOTBASE_ArduinoUnoR3                     0x01
+#define PABB_PID_PABOTBASE_ArduinoLeonardo                  0x02
+#define PABB_PID_PABOTBASE_ProMicro                         0x03
+#define PABB_PID_PABOTBASE_Teensy2                          0x04
+#define PABB_PID_PABOTBASE_TeensyPP2                        0x05
+
+//  Misc.
+#define PABB_PID_PABOTBASE_CH552                            0x0a
+
+//  ESP32
+#define PABB_PID_PABOTBASE_ESP32                            0x10
+#define PABB_PID_PABOTBASE_ESP32S3                          0x12
+
+//  Raspberry Pi
+#define PABB_PID_PABOTBASE_RP2040                           0x20
+#define PABB_PID_PABOTBASE_RP2350                           0x21
+#define PABB_PID_PABOTBASE_Pico1W                           0x24
+#define PABB_PID_PABOTBASE_Pico2W                           0x25
+
+
+//
+//  Controller IDs
+//
+
+typedef uint32_t pabb_ControllerID;
+
+#define PABB_CID_NONE                                       0
+
+#define PABB_CID_StandardHid_Keyboard                       0x0100
+
+#define PABB_CID_NintendoSwitch_WiredController             0x1000
+#define PABB_CID_NintendoSwitch2_WiredController            0x1010
+
+#define PABB_CID_NintendoSwitch_WiredProController          0x1100
+#define PABB_CID_NintendoSwitch_WiredLeftJoycon             0x1101
+#define PABB_CID_NintendoSwitch_WiredRightJoycon            0x1102
+#define PABB_CID_NintendoSwitch_WirelessProController       0x1180
+#define PABB_CID_NintendoSwitch_WirelessLeftJoycon          0x1181
+#define PABB_CID_NintendoSwitch_WirelessRightJoycon         0x1182
+
+#define PABB_CID_NintendoSwitch2_WiredProController         0x1200
+#define PABB_CID_NintendoSwitch2_WiredLeftJoycon            0x1201
+#define PABB_CID_NintendoSwitch2_WiredRightJoycon           0x1202
+#define PABB_CID_NintendoSwitch2_WirelessProController      0x1280
+#define PABB_CID_NintendoSwitch2_WirelessLeftJoycon         0x1281
+#define PABB_CID_NintendoSwitch2_WirelessRightJoycon        0x1282
+
+
+#endif
diff --git a/GeneratorConfig/BuildWindows.cmd b/GeneratorConfig/BuildWindows.cmd
deleted file mode 100644
index f5298700c8..0000000000
--- a/GeneratorConfig/BuildWindows.cmd
+++ /dev/null
@@ -1,71 +0,0 @@
-::@echo off
-
-set board=%1
-set category=%2
-set program=%3
-
-cd /D "%~dp0"
-cd "../NativePrograms/%category%"
-
-
-if [%board%] == [ArduinoUnoR3] (
-    set MCU=atmega16u2
-)
-if [%board%] == [ProMicro] (
-    set MCU=atmega32u4
-)
-if [%board%] == [Teensy2] (
-    set MCU=atmega32u4
-)
-if [%board%] == [TeensyPP2] (
-    set MCU=at90usb1286
-)
-
-:: Check MCU Compatibility
-if exist "obj\*.o" (
-    echo Existing build found. Checking MCU compatibility.
-    if not exist obj\build-%MCU% (
-        echo Incompatible MCU, cleaning...
-        @call !Cleanup.cmd >NUL 2>&1
-    ) else (
-        echo Existing build is compatible.
-    )
-) else (
-    echo No build found, continuing...
-)
-copy NUL obj\build-%MCU% > NUL
-
-
-del "%program%.hex"
-del "../%program%.hex"
-
-
-:: Just in case the PATH is messed up, but is installed in the usual place.
-set PATH=%PATH%C:\WinAVR-20100110\bin;
-set PATH=%PATH%C:\WinAVR-20100110\utils\bin;
-
-
-echo Checking make command...
-echo.
-make -v
-echo.
-echo.
-if %errorlevel% NEQ 0 (
-    echo make not found. Please install WinAVR.
-    echo.
-::    pause
-    exit
-)
-
-make BOARD_TYPE="%board%" TARGET="%program%"
-
-del "%program%.map"
-del "%program%.eep"
-del "%program%.bin"
-del "%program%.lss"
-del "%program%.sym"
-del "%program%.tmp"
-
-move "%program%.hex" "../../%category%-%program%-%board%.hex"
-
-::pause
\ No newline at end of file
diff --git a/GeneratorConfig/Categories.json b/GeneratorConfig/Categories.json
deleted file mode 100644
index 45b6df74d3..0000000000
--- a/GeneratorConfig/Categories.json
+++ /dev/null
@@ -1,24 +0,0 @@
-[
-    {
-        "Name": "NintendoSwitch",
-        "Display": "General",
-        "Settings": [ "FrameworkSettings" ]
-    },
-    {
-        "Name": "PokemonSwSh",
-        "Display": "Sword/Shield",
-        "Settings": [ "PokemonSwSh_Settings" ]
-    },
-    {
-        "Name": "PokemonBDSP",
-        "Display": "BDSP",
-        "Settings": [ "PokemonBDSP_Settings" ]
-    },
-    {
-        "Name": "PokemonSV",
-        "Display": "SV",
-        "Settings": [ "PokemonSV_Settings" ]
-    }
-]
-
-
diff --git a/GeneratorConfig/NintendoSwitch/CustomProgram.json b/GeneratorConfig/NintendoSwitch/CustomProgram.json
deleted file mode 100644
index ca7cf01162..0000000000
--- a/GeneratorConfig/NintendoSwitch/CustomProgram.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "0-ProgramName": "CustomProgram",
-    "1-Documentation": "Microcontroller/blob/master/Wiki/Programs/NintendoSwitch/CustomProgram.md",
-    "2-Description": "Write your own program by editing \"NativePrograms/PokemonSwShPrograms/CustomProgram_Core.c\".<br>(This example is just a copy of TurboA.)",
-    "3-Parameters": [
-    ]
-}
diff --git a/GeneratorConfig/NintendoSwitch/FrameworkSettings.json b/GeneratorConfig/NintendoSwitch/FrameworkSettings.json
deleted file mode 100644
index 23a2daaa7f..0000000000
--- a/GeneratorConfig/NintendoSwitch/FrameworkSettings.json
+++ /dev/null
@@ -1,57 +0,0 @@
-{
-    "0-ConfigName": "FrameworkSettings",
-    "1-ConfigPath": "NintendoSwitch",
-    "2-Documentation": "Microcontroller/blob/master/Wiki/Programs/NintendoSwitch/FrameworkSettings.md",
-    "3-Description": "Global Framework Settings",
-    "4-Header": "Libraries/FrameworkSettings.h",
-    "5-Options": [
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Connection Controller Delay:</b><br>Wait this long before starting the program. The LEDs normally flash during this time.",
-            "02-Declaration": "uint16_t CONNECT_CONTROLLER_DELAY",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "5 * TICKS_PER_SECOND",
-            "99-Current": "5 * TICKS_PER_SECOND"
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Settings to Home Delay:</b><br>Delay from pressing home anywhere in the settings to return to the home menu.",
-            "02-Declaration": "uint16_t SETTINGS_TO_HOME_DELAY",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "120",
-            "99-Current": "120"
-        },
-        {
-            "00-Type": "BooleanCheckBox",
-            "01-Label": "<b>Start Game Requires Internet:</b><br>Set this to true if starting the game requires checking the internet. Otherwise, programs that require soft-resetting may not work properly.",
-            "02-Declaration": "bool START_GAME_REQUIRES_INTERNET",
-            "98-Default": false,
-            "99-Current": false
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Start Game Internet Check Delay:</b><br>If starting the game requires checking the internet, wait this long for it.",
-            "02-Declaration": "uint16_t START_GAME_INTERNET_CHECK_DELAY",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "3 * TICKS_PER_SECOND",
-            "99-Current": "3 * TICKS_PER_SECOND"
-        },
-        {
-            "00-Type": "BooleanCheckBox",
-            "01-Label": "<b>Tolerate System Update Menu (fast):</b><br>Some programs can bypass the system update menu at little performance cost. Setting this to true enables this.",
-            "02-Declaration": "bool TOLERATE_SYSTEM_UPDATE_MENU_FAST",
-            "98-Default": true,
-            "99-Current": true
-        },
-        {
-            "00-Type": "BooleanCheckBox",
-            "01-Label": "<b>Tolerate System Update Menu (slow):</b><br>Some programs can bypass the system update menu, but will take a noticeable performance hit. Setting this to true enables this.",
-            "02-Declaration": "bool TOLERATE_SYSTEM_UPDATE_MENU_SLOW",
-            "98-Default": false,
-            "99-Current": false
-        }
-    ]
-}
diff --git a/GeneratorConfig/NintendoSwitch/FriendDelete.json b/GeneratorConfig/NintendoSwitch/FriendDelete.json
deleted file mode 100644
index 0ca9a77fe9..0000000000
--- a/GeneratorConfig/NintendoSwitch/FriendDelete.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-    "0-ProgramName": "FriendDelete",
-    "1-Documentation": "Microcontroller/blob/master/Wiki/Programs/NintendoSwitch/FriendDelete.md",
-    "2-Description": "Mass delete/block all those unwanted friends.",
-    "3-Parameters": [
-        {
-            "00-Type": "SimpleInteger",
-            "01-Label": "<b>Number of Friends to Delete:</b>",
-            "02-Declaration": "const uint16_t FRIENDS_TO_DELETE",
-            "03-MinValue": 0,
-            "04-MaxValue": 300,
-            "98-Default": 3,
-            "99-Current": 3
-        },
-        {
-            "00-Type": "BooleanCheckBox",
-            "01-Label": "<b>Block Friends:</b><br>Block instead of delete!",
-            "02-Declaration": "const bool BLOCK_FRIENDS",
-            "98-Default": false,
-            "99-Current": false
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>View Friend Delay:</b><br>Delay from opening a friend to when you can press buttons.",
-            "02-Declaration": "const uint16_t VIEW_FRIEND_DELAY",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "2 * TICKS_PER_SECOND",
-            "99-Current": "2 * TICKS_PER_SECOND"
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Delete Friend Delay:</b><br>Delay to delete the friend.",
-            "02-Declaration": "const uint16_t DELETE_FRIEND_DELAY",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "8 * TICKS_PER_SECOND",
-            "99-Current": "8 * TICKS_PER_SECOND"
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Finish Delete Delay:</b><br>Delay after deleting a friend.",
-            "02-Declaration": "const uint16_t FINISH_DELETE_DELAY",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "2 * TICKS_PER_SECOND",
-            "99-Current": "2 * TICKS_PER_SECOND"
-        }
-    ]
-}
diff --git a/GeneratorConfig/NintendoSwitch/PABotBase.json b/GeneratorConfig/NintendoSwitch/PABotBase.json
deleted file mode 100644
index 173416719b..0000000000
--- a/GeneratorConfig/NintendoSwitch/PABotBase.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "0-ProgramName": "PABotBase",
-    "1-Documentation": "Microcontroller/blob/master/Wiki/Programs/NintendoSwitch/PABotBase.md",
-    "2-Description": "Control your Arduino/Teensy (and therefore your Switch) from a computer.",
-    "3-Parameters": [
-    ]
-}
diff --git a/GeneratorConfig/NintendoSwitch/TurboA.json b/GeneratorConfig/NintendoSwitch/TurboA.json
deleted file mode 100644
index bdb3dce0cf..0000000000
--- a/GeneratorConfig/NintendoSwitch/TurboA.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "0-ProgramName": "TurboA",
-    "1-Documentation": "Microcontroller/blob/master/Wiki/Programs/NintendoSwitch/TurboA.md",
-    "2-Description": "Endlessly mash A.",
-    "3-Parameters": [
-    ]
-}
diff --git a/GeneratorConfig/PokemonBDSP/EggFetcher.json b/GeneratorConfig/PokemonBDSP/EggFetcher.json
deleted file mode 100644
index 7dde226fa9..0000000000
--- a/GeneratorConfig/PokemonBDSP/EggFetcher.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-    "0-ProgramName": "EggFetcher",
-    "1-Documentation": "Microcontroller/blob/master/Wiki/Programs/PokemonBDSP/EggFetcher.md",
-    "2-Description": "Fetch eggs without hatching them.",
-    "3-Parameters": [
-        {
-            "00-Type": "EnumDropdown",
-            "01-Label": "<b>Bike Shortcut:</b>",
-            "02-Declaration": "const ShortcutDirection BIKE_SHORTCUT_DIRECTION",
-            "03-Options": [
-                [
-                    "SHORTCUT_UP",
-                    "Up"
-                ],
-                [
-                    "SHORTCUT_RIGHT",
-                    "Right"
-                ],
-                [
-                    "SHORTCUT_DOWN",
-                    "Down"
-                ],
-                [
-                    "SHORTCUT_LEFT",
-                    "Left"
-                ]
-            ],
-            "98-Default": "SHORTCUT_UP",
-            "99-Current": "SHORTCUT_UP"
-        },
-        {
-            "00-Type": "SimpleInteger",
-            "01-Label": "<b>Fetch this many times:</b><br>This puts a limit on how many eggs you can get so you don't make a mess of your boxes for fetching too many.",
-            "02-Declaration": "const uint16_t MAX_FETCH_ATTEMPTS",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": 2000,
-            "99-Current": 2000
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Travel Time per Fetch:</b><br>Fetch an egg after traveling for this long.",
-            "02-Declaration": "const uint16_t TRAVEL_TIME_PER_FETCH",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "15 * TICKS_PER_SECOND",
-            "99-Current": "15 * TICKS_PER_SECOND"
-        }
-    ]
-}
diff --git a/GeneratorConfig/PokemonBDSP/EggHatcher.json b/GeneratorConfig/PokemonBDSP/EggHatcher.json
deleted file mode 100644
index e865cbc9f1..0000000000
--- a/GeneratorConfig/PokemonBDSP/EggHatcher.json
+++ /dev/null
@@ -1,86 +0,0 @@
-{
-    "0-ProgramName": "EggHatcher",
-    "1-Documentation": "Microcontroller/blob/master/Wiki/Programs/PokemonBDSP/EggHatcher.md",
-    "2-Description": "Hatch eggs from boxes.",
-    "3-Parameters": [
-        {
-            "00-Type": "SimpleInteger",
-            "01-Label": "<b>Boxes to Hatch:</b>",
-            "02-Declaration": "const uint8_t BOXES_TO_HATCH",
-            "03-MinValue": 0,
-            "04-MaxValue": 32,
-            "98-Default": 3,
-            "99-Current": 3
-        },
-        {
-            "00-Type": "EnumDropdown",
-            "01-Label": "<b>Step Count:</b><br>Lookup the # of steps on Serebii.",
-            "02-Declaration": "const uint16_t STEPS_TO_HATCH",
-            "03-Options": [
-                [
-                    "1280",
-                    "1280"
-                ],
-                [
-                    "2560",
-                    "2560"
-                ],
-                [
-                    "3840",
-                    "3840"
-                ],
-                [
-                    "5120",
-                    "5120"
-                ],
-                [
-                    "6400",
-                    "6400"
-                ],
-                [
-                    "7680",
-                    "7680"
-                ],
-                [
-                    "8960",
-                    "8960"
-                ],
-                [
-                    "10240",
-                    "10240"
-                ]
-            ],
-            "98-Default": "5120",
-            "99-Current": "5120"
-        },
-        {
-            "00-Type": "BooleanCheckBox",
-            "01-Label": "<b>Save and Reset:</b><br>After hatching a box, save the game and reset. This will recover from game crashes.",
-            "02-Declaration": "const bool SAVE_AND_RESET",
-            "98-Default": true,
-            "99-Current": true
-        },
-        {
-            "00-Type": "Divider",
-            "01-Label": "<font size=4><b>Advanced Options:</b> You should not need to touch anything below here.</font>"
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Safety Time:</b><br>Additional time added to the spinning.",
-            "02-Declaration": "const uint16_t SAFETY_TIME",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "10 * TICKS_PER_SECOND",
-            "99-Current": "10 * TICKS_PER_SECOND"
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Hatch Delay:</b><br>Total animation time for hatching 5 eggs when there are no shinies.",
-            "02-Declaration": "const uint16_t HATCH_DELAY",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "105 * TICKS_PER_SECOND",
-            "99-Current": "105 * TICKS_PER_SECOND"
-        }
-    ]
-}
diff --git a/GeneratorConfig/PokemonBDSP/MassRelease.json b/GeneratorConfig/PokemonBDSP/MassRelease.json
deleted file mode 100644
index ca7084c34c..0000000000
--- a/GeneratorConfig/PokemonBDSP/MassRelease.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "0-ProgramName": "MassRelease",
-    "1-Documentation": "Microcontroller/blob/master/Wiki/Programs/PokemonBDSP/MassRelease.md",
-    "2-Description": "Mass release boxes of Pokémon.",
-    "3-Parameters": [
-        {
-            "00-Type": "SimpleInteger",
-            "01-Label": "<b>Number of Boxes to Release:</b>",
-            "02-Declaration": "const uint8_t BOXES_TO_RELEASE",
-            "03-MinValue": 0,
-            "04-MaxValue": 40,
-            "98-Default": 2,
-            "99-Current": 2
-        },
-        {
-            "00-Type": "BooleanCheckBox",
-            "01-Label": "<b>Dodge System Update Window:</b>",
-            "02-Declaration": "const bool DODGE_SYSTEM_UPDATE_WINDOW",
-            "98-Default": false,
-            "99-Current": false
-        }
-    ]
-}
diff --git a/GeneratorConfig/PokemonBDSP/PokemonBDSP_Settings.json b/GeneratorConfig/PokemonBDSP/PokemonBDSP_Settings.json
deleted file mode 100644
index 9ad5e19765..0000000000
--- a/GeneratorConfig/PokemonBDSP/PokemonBDSP_Settings.json
+++ /dev/null
@@ -1,164 +0,0 @@
-{
-    "0-ConfigName": "PokemonSettings",
-    "1-ConfigPath": "PokemonBDSP",
-    "2-Documentation": "Microcontroller/blob/master/Wiki/Programs/PokemonBDSP/PokemonSettings.md",
-    "3-Description": "Global Pokémon Settings",
-    "4-Header": "Libraries/PokemonBDSP_Settings.h",
-    "5-Options": [
-        {
-            "00-Type": "Divider",
-            "01-Label": "<font size=5><b>Advanced Options:</b></font> You shouldn't need to touch anything below here."
-        },
-        {
-            "00-Type": "Divider",
-            "01-Label": "<font size=4><b>General Timings:</b></font>"
-        },
-        {
-            "00-Type": "Divider",
-            "01-Label": "<font size=4><b>Menu Navigation Timings:</b></font>"
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Overworld to Menu Delay:</b><br>Delay to bring up the menu when pressing X in the overworld.",
-            "02-Declaration": "uint16_t PokemonBDSP_OVERWORLD_TO_MENU_DELAY",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "250",
-            "99-Current": "250"
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Menu to Overworld Delay:</b><br>Delay to go from menu back to overworld.",
-            "02-Declaration": "uint16_t PokemonBDSP_MENU_TO_OVERWORLD_DELAY",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "250",
-            "99-Current": "250"
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Game to Home Delay:</b><br>Delay from pressing home to entering the the Switch home menu.",
-            "02-Declaration": "uint16_t PokemonBDSP_GAME_TO_HOME_DELAY",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "125",
-            "99-Current": "125"
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Home to Game Delay:</b><br>Delay to enter game from home menu.",
-            "02-Declaration": "uint16_t PokemonBDSP_HOME_TO_GAME_DELAY",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "3 * TICKS_PER_SECOND",
-            "99-Current": "3 * TICKS_PER_SECOND"
-        },
-        {
-            "00-Type": "Divider",
-            "01-Label": "<font size=4><b>Start Game Timings:</b></font>"
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>1. Start Game Mash:</b><br>Mash A for this long to start the game.",
-            "02-Declaration": "uint16_t PokemonBDSP_START_GAME_MASH",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "2 * TICKS_PER_SECOND",
-            "99-Current": "2 * TICKS_PER_SECOND"
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>2. Start Game Wait:</b><br>Wait this long for the game to load.",
-            "02-Declaration": "uint16_t PokemonBDSP_START_GAME_WAIT",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "40 * TICKS_PER_SECOND",
-            "99-Current": "40 * TICKS_PER_SECOND"
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>3. Enter Game Mash:</b><br>Mash A for this long to enter the game.",
-            "02-Declaration": "uint16_t PokemonBDSP_ENTER_GAME_MASH",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "5 * TICKS_PER_SECOND",
-            "99-Current": "5 * TICKS_PER_SECOND"
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>4. Enter Game Wait:</b><br>Wait this long for the game to enter the overworld.",
-            "02-Declaration": "uint16_t PokemonBDSP_ENTER_GAME_WAIT",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "30 * TICKS_PER_SECOND",
-            "99-Current": "30 * TICKS_PER_SECOND"
-        },
-        {
-            "00-Type": "Divider",
-            "01-Label": "<font size=4><b>Box Timings:</b></font> (for egg programs)"
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Box Scroll Delay:</b><br>Delay to move the cursor.",
-            "02-Declaration": "uint16_t PokemonBDSP_BOX_SCROLL_DELAY",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "30",
-            "99-Current": "30"
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Box Change Delay:</b><br>Delay to change boxes.",
-            "02-Declaration": "uint16_t PokemonBDSP_BOX_CHANGE_DELAY",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "200",
-            "99-Current": "200"
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Box Pickup/Drop Delay:</b><br>Delay to pickup/drop Pokémon.",
-            "02-Declaration": "uint16_t PokemonBDSP_BOX_PICKUP_DROP_DELAY",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "50",
-            "99-Current": "50"
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Menu To Pokémon Delay:</b><br>Delay to enter Pokémon menu.",
-            "02-Declaration": "uint16_t PokemonBDSP_MENU_TO_POKEMON_DELAY",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "300",
-            "99-Current": "300"
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Pokémon to Box Delay:</b><br>Delay to enter box system.",
-            "02-Declaration": "uint16_t PokemonBDSP_POKEMON_TO_BOX_DELAY",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "300",
-            "99-Current": "300"
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Box to Pokémon Delay:</b><br>Delay to exit box system.",
-            "02-Declaration": "uint16_t PokemonBDSP_BOX_TO_POKEMON_DELAY",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "250",
-            "99-Current": "250"
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Pokémon to Menu Delay:</b><br>Delay to return to menu.",
-            "02-Declaration": "uint16_t PokemonBDSP_POKEMON_TO_MENU_DELAY",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "250",
-            "99-Current": "250"
-        }
-    ]
-}
diff --git a/GeneratorConfig/PokemonSV/EggCombined.json b/GeneratorConfig/PokemonSV/EggCombined.json
deleted file mode 100644
index 65ed271bbf..0000000000
--- a/GeneratorConfig/PokemonSV/EggCombined.json
+++ /dev/null
@@ -1,93 +0,0 @@
-{
-    "0-ProgramName": "EggCombined",
-    "1-Documentation": "Microcontroller/blob/master/Wiki/Programs/PokemonSV/EggCombined.md",
-    "2-Description": "Make sandwiches, collect and hatch eggs.",
-    "3-Parameters": [
-        {
-            "00-Type": "BooleanCheckBox",
-            "01-Label": "<b>Use Sweet Herba Mystica:</b>",
-            "02-Declaration": "const bool USE_HM",
-            "98-Default": true,
-            "99-Current": false
-        },
-        {
-            "00-Type": "SimpleInteger",
-            "01-Label": "<b>Maximum amount of sandwiches to make:</b>",
-            "02-Declaration": "const uint16_t MAX_SAND",
-            "03-MinValue": 1,
-            "04-MaxValue": 999,
-            "98-Default": 100,
-            "99-Current": 1
-        },
-        {
-            "00-Type": "SimpleInteger",
-            "01-Label": "<b>Boxes to Hatch:</b>",
-            "02-Declaration": "const uint8_t BOXES_TO_HATCH",
-            "03-MinValue": 1,
-            "04-MaxValue": 32,
-            "98-Default": 2,
-            "99-Current": 1
-        },
-        {
-            "00-Type": "EnumDropdown",
-            "01-Label": "<b>Step Count:</b><br>Lookup the # of steps on Serebii.",
-            "02-Declaration": "const uint16_t STEPS_TO_HATCH",
-            "03-Options": [
-                [
-                    "1280",
-                    "1280"
-                ],
-                [
-                    "2560",
-                    "2560"
-                ],
-                [
-                    "3840",
-                    "3840"
-                ],
-                [
-                    "5120",
-                    "5120"
-                ],
-                [
-                    "6400",
-                    "6400"
-                ],
-                [
-                    "7680",
-                    "7680"
-                ],
-                [
-                    "8960",
-                    "8960"
-                ],
-                [
-                    "10240",
-                    "10240"
-                ]
-            ],
-            "98-Default": "5120",
-            "99-Current": "5120"
-        },
-        {
-            "00-Type": "BooleanCheckBox",
-            "01-Label": "<b>Has cloned rider:</b>",
-            "02-Declaration": "const bool HAS_CLONED_RIDER",
-            "98-Default": false,
-            "99-Current": false
-        },
-        {
-            "00-Type": "Divider",
-            "01-Label": "<font size=4><b>Additional Safety Options:</b> You should not need to touch anything below here.</font>"
-        },
-        {
-            "00-Type": "FloatingPoint",
-            "01-Label": "<b>Safety Coefficient:</b><br>Hatching time multiplier, increase if program is prematurely ending hatches.",
-            "02-Declaration": "const float SAFETY_COEFF",
-            "03-MinValue": 0.0,
-            "04-MaxValue": 2.0,
-            "98-Default": 1.1,
-            "99-Current": 1.1
-        }
-    ]
-}
\ No newline at end of file
diff --git a/GeneratorConfig/PokemonSV/EggFetcher.json b/GeneratorConfig/PokemonSV/EggFetcher.json
deleted file mode 100644
index 3762f13919..0000000000
--- a/GeneratorConfig/PokemonSV/EggFetcher.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "0-ProgramName": "EggFetcher",
-    "1-Documentation": "Microcontroller/blob/master/Wiki/Programs/PokemonSV/EggFetcher.md",
-    "2-Description": "Fetches eggs using egg power sandwiches!",
-    "3-Parameters": [
-        {
-            "00-Type": "BooleanCheckBox",
-            "01-Label": "<b>Use Sweet Herba Mystica:</b>",
-            "02-Declaration": "const bool USE_HM",
-            "98-Default": true,
-            "99-Current": true
-        },
-        {
-            "00-Type": "SimpleInteger",
-            "01-Label": "<b>Maximum amount of sandwiches to make:</b>",
-            "02-Declaration": "const uint16_t MAX_SAND",
-            "03-MinValue": 1,
-            "04-MaxValue": 999,
-            "98-Default": 5,
-            "99-Current": 5
-        }
-    ]
-}
diff --git a/GeneratorConfig/PokemonSV/EggHatcher.json b/GeneratorConfig/PokemonSV/EggHatcher.json
deleted file mode 100644
index 69c030324f..0000000000
--- a/GeneratorConfig/PokemonSV/EggHatcher.json
+++ /dev/null
@@ -1,77 +0,0 @@
-{
-    "0-ProgramName": "EggHatcher",
-    "1-Documentation": "Microcontroller/blob/master/Wiki/Programs/PokemonSV/EggHatcher.md",
-    "2-Description": "Hatch eggs from boxes.",
-    "3-Parameters": [
-        {
-            "00-Type": "SimpleInteger",
-            "01-Label": "<b>Boxes to Hatch:</b>",
-            "02-Declaration": "const uint8_t BOXES_TO_HATCH",
-            "03-MinValue": 1,
-            "04-MaxValue": 32,
-            "98-Default": 2,
-            "99-Current": 2
-        },
-        {
-            "00-Type": "EnumDropdown",
-            "01-Label": "<b>Step Count:</b><br>Lookup the # of steps on Serebii.",
-            "02-Declaration": "const uint16_t STEPS_TO_HATCH",
-            "03-Options": [
-                [
-                    "1280",
-                    "1280"
-                ],
-                [
-                    "2560",
-                    "2560"
-                ],
-                [
-                    "3840",
-                    "3840"
-                ],
-                [
-                    "5120",
-                    "5120"
-                ],
-                [
-                    "6400",
-                    "6400"
-                ],
-                [
-                    "7680",
-                    "7680"
-                ],
-                [
-                    "8960",
-                    "8960"
-                ],
-                [
-                    "10240",
-                    "10240"
-                ]
-            ],
-            "98-Default": "5120",
-            "99-Current": "5120"
-        },
-        {
-            "00-Type": "BooleanCheckBox",
-            "01-Label": "<b>Has cloned rider:</b>",
-            "02-Declaration": "const bool HAS_CLONED_RIDER",
-            "98-Default": false,
-            "99-Current": false
-        },
-        {
-            "00-Type": "Divider",
-            "01-Label": "<font size=4><b>Additional Safety Options:</b> You should not need to touch anything below here.</font>"
-        },
-        {
-            "00-Type": "FloatingPoint",
-            "01-Label": "<b>Safety Coefficient:</b><br>Hatching time multiplier, increase if program is prematurely ending hatches.",
-            "02-Declaration": "const float SAFETY_COEFF",
-            "03-MinValue": 0.0,
-            "04-MaxValue": 2.0,
-            "98-Default": 1.1,
-            "99-Current": 1.1
-        }
-    ]
-}
\ No newline at end of file
diff --git a/GeneratorConfig/PokemonSV/ItemDupe.json b/GeneratorConfig/PokemonSV/ItemDupe.json
deleted file mode 100644
index 1fdcd0cd8e..0000000000
--- a/GeneratorConfig/PokemonSV/ItemDupe.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "0-ProgramName": "ItemDupe",
-    "1-Documentation": "Microcontroller/blob/master/Wiki/Programs/PokemonSV/ItemDupe.md",
-    "2-Description": "Duplicate Items in Pokemon Scarlet and Violet.",
-    "3-Parameters": [
-    ]
-}
diff --git a/GeneratorConfig/PokemonSV/MassPurchase.json b/GeneratorConfig/PokemonSV/MassPurchase.json
deleted file mode 100644
index dedc776a73..0000000000
--- a/GeneratorConfig/PokemonSV/MassPurchase.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-    "0-ProgramName": "MassPurchase",
-    "1-Documentation": "Microcontroller/blob/master/Wiki/Programs/PokemonSV/MassPurchase.md",
-    "2-Description": "Purchase a Specified Amount of Items",
-    "3-Parameters": [
-        {
-            "00-Type": "BooleanCheckBox",
-            "01-Label": "<b>Pay with LP:</b>",
-            "02-Declaration": "const bool PAY_LP",
-            "98-Default": false,
-            "99-Current": false
-        },
-        {
-            "00-Type": "SimpleInteger",
-            "01-Label": "<b>Items to Buy:</b><br>Starting from the item your cursor is on this many items will be purchased.",
-            "02-Declaration": "const uint16_t ITEMS",
-            "03-MinValue": 1,
-            "04-MaxValue": 100,
-            "98-Default": 50,
-            "99-Current": 50
-        },
-        {
-            "00-Type": "SimpleInteger",
-            "01-Label": "<b>Quantity to Buy:</b><br>This many of each Item will be purchased (Set to 0 for Max Purchasable).",
-            "02-Declaration": "const uint16_t QUANTITY",
-            "03-MinValue": 0,
-            "04-MaxValue": 998,
-            "98-Default": 0,
-            "99-Current": 0
-        }
-    ]
-}
diff --git a/GeneratorConfig/PokemonSV/MassRelease.json b/GeneratorConfig/PokemonSV/MassRelease.json
deleted file mode 100644
index 32c7178e51..0000000000
--- a/GeneratorConfig/PokemonSV/MassRelease.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "0-ProgramName": "MassRelease",
-    "1-Documentation": "Microcontroller/blob/master/Wiki/Programs/PokemonSV/MassRelease.md",
-    "2-Description": "Automatically Release Boxes of Pokemon",
-    "3-Parameters": [
-        {
-            "00-Type": "SimpleInteger",
-            "01-Label": "<b>Pokemon to Release:</b>",
-            "02-Declaration": "const uint16_t RELEASE",
-            "03-MinValue": 1,
-            "04-MaxValue": 960,
-            "98-Default": 60,
-            "99-Current": 60
-        }
-    ]
-}
diff --git a/GeneratorConfig/PokemonSV/PokemonSV_Settings.json b/GeneratorConfig/PokemonSV/PokemonSV_Settings.json
deleted file mode 100644
index 4b2fd2382d..0000000000
--- a/GeneratorConfig/PokemonSV/PokemonSV_Settings.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "0-ConfigName": "PokemonSettings",
-    "1-ConfigPath": "PokemonSCVI",
-    "2-Documentation": "",
-    "3-Description": "Global Pokémon Settings",
-    "4-Header": "Libraries/PokemonSCVI_Settings.h",
-    "5-Options": [
-    ]
-}
diff --git a/GeneratorConfig/PokemonSV/RoamingGimmighoulFarmer.json b/GeneratorConfig/PokemonSV/RoamingGimmighoulFarmer.json
deleted file mode 100644
index be88150fe7..0000000000
--- a/GeneratorConfig/PokemonSV/RoamingGimmighoulFarmer.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "0-ProgramName": "RoamingGimmighoulFarmer",
-    "1-Documentation": "Microcontroller/blob/master/Wiki/Programs/PokemonSV/RoamingGimmighoulFarmer.md",
-    "2-Description": "Farm Gimmighoul Coins for evolution.",
-    "3-Parameters": [
-        {
-            "00-Type": "SimpleInteger",
-            "01-Label": "<b>Number of Attempts:</b><br>Number of collection attempts to try.",
-            "02-Declaration": "const uint16_t SKIPS",
-            "03-MinValue": 1,
-            "04-MaxValue": 100000,
-            "98-Default": 5000,
-            "99-Current": 5000
-        }
-    ]
-}
diff --git a/GeneratorConfig/PokemonSwSh/AutoHost-MultiGame.json b/GeneratorConfig/PokemonSwSh/AutoHost-MultiGame.json
deleted file mode 100644
index b498867858..0000000000
--- a/GeneratorConfig/PokemonSwSh/AutoHost-MultiGame.json
+++ /dev/null
@@ -1,132 +0,0 @@
-{
-    "0-ProgramName": "AutoHost-MultiGame",
-    "1-Documentation": "Microcontroller/blob/master/Wiki/Programs/PokemonSwSh/AutoHost-MultiGame.md",
-    "2-Description": "Run AutoHost-Rolling across multiple game saves. (Up to 16 dens!)",
-    "3-Parameters": [
-        {
-            "00-Type": "RandomCode",
-            "01-Label": "<b>Raid Code:</b><br>Blank for no raid code. Set random digits to zero for a fixed code. Otherwise, it is the # of leading random digits.",
-            "02-DeclarationRandom": "const uint8_t RANDOM_DIGITS",
-            "03-DeclarationCode": "const char* RAID_CODE",
-            "04-Digits": 8,
-            "05-DefaultRandom": 0,
-            "06-DefaultCode": "1280 0000",
-            "07-CurrentRandom": 0,
-            "08-CurrentCode": "1280 0000"
-        },
-        {
-            "00-Type": "BooleanCheckBox",
-            "01-Label": "<b>Host Online:</b>",
-            "02-Declaration": "const bool HOST_ONLINE",
-            "98-Default": true,
-            "99-Current": true
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Lobby Wait Delay:</b><br>Wait this long before starting raid. Start time is 3 minutes minus this number.",
-            "02-Declaration": "const uint16_t LOBBY_WAIT_DELAY",
-            "03-MinValue": 0,
-            "04-MaxValue": 22500,
-            "98-Default": "60 * TICKS_PER_SECOND",
-            "99-Current": "60 * TICKS_PER_SECOND"
-        },
-        {
-            "00-Type": "MultiHostTable",
-            "01-Label": "<b>Game List:</b>",
-            "02-Declaration": "const RollingAutoHostSlot GAME_LIST[]",
-            "98-Default": [
-                {
-                    "accept_FRs": true,
-                    "always_catchable": true,
-                    "backup_save": false,
-                    "dynamax": true,
-                    "game_slot": 1,
-                    "move_slot": 0,
-                    "post_raid_delay": "0 * TICKS_PER_SECOND",
-                    "skips": 3,
-                    "user_slot": 1
-                }
-            ],
-            "99-Current": [
-                {
-                    "accept_FRs": true,
-                    "always_catchable": true,
-                    "backup_save": false,
-                    "dynamax": true,
-                    "game_slot": 1,
-                    "move_slot": 0,
-                    "post_raid_delay": "0 * TICKS_PER_SECOND",
-                    "skips": 3,
-                    "user_slot": 1
-                }
-            ]
-        },
-        {
-            "00-Type": "SimpleInteger",
-            "01-Label": "<b>Forward Friend Accept:</b><br>Accept FRs this many raids in the future.",
-            "02-Declaration": "const uint8_t FR_FORWARD_ACCEPT",
-            "03-MinValue": 0,
-            "04-MaxValue": 255,
-            "98-Default": 1,
-            "99-Current": 1
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Rollover Prevention:</b><br>Prevent the den from rolling over by periodically touching the date. If set to zero, this feature is disabled. If skips is non-zero, this feature is also disabled.",
-            "02-Declaration": "const uint32_t TOUCH_DATE_INTERVAL",
-            "03-MinValue": 0,
-            "04-MaxValue": 2147483647,
-            "98-Default": "4 * 3600 * TICKS_PER_SECOND",
-            "99-Current": "4 * 3600 * TICKS_PER_SECOND"
-        },
-        {
-            "00-Type": "Divider",
-            "01-Label": "<font size=4><b>Internet Settings:</b> Increase these if your internet is slow.</font>"
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Connect to Internet Delay:</b><br>Time from \"Connect to Internet\" to when you're ready to enter den.",
-            "02-Declaration": "const uint16_t CONNECT_TO_INTERNET_DELAY",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "20 * TICKS_PER_SECOND",
-            "99-Current": "20 * TICKS_PER_SECOND"
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Enter Online Den Delay:</b><br>\"Communicating\" when entering den while online.",
-            "02-Declaration": "const uint16_t ENTER_ONLINE_DEN_DELAY",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "8 * TICKS_PER_SECOND",
-            "99-Current": "8 * TICKS_PER_SECOND"
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Open Online Den Delay:</b><br>Delay from \"Invite Others\" to when the clock starts ticking.",
-            "02-Declaration": "const uint16_t OPEN_ONLINE_DEN_LOBBY_DELAY",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "8 * TICKS_PER_SECOND",
-            "99-Current": "8 * TICKS_PER_SECOND"
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Raid Start to Exit Delay:</b><br>Time from start raid to reset. (when not selecting move)",
-            "02-Declaration": "const uint16_t RAID_START_TO_EXIT_DELAY",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "15 * TICKS_PER_SECOND",
-            "99-Current": "15 * TICKS_PER_SECOND"
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Delay to Select Move:</b><br>This + above = time from start raid to select move.",
-            "02-Declaration": "const uint16_t DELAY_TO_SELECT_MOVE",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "32 * TICKS_PER_SECOND",
-            "99-Current": "32 * TICKS_PER_SECOND"
-        }
-    ]
-}
diff --git a/GeneratorConfig/PokemonSwSh/AutoHost-Rolling.json b/GeneratorConfig/PokemonSwSh/AutoHost-Rolling.json
deleted file mode 100644
index 91566e1494..0000000000
--- a/GeneratorConfig/PokemonSwSh/AutoHost-Rolling.json
+++ /dev/null
@@ -1,179 +0,0 @@
-{
-    "0-ProgramName": "AutoHost-Rolling",
-    "1-Documentation": "Microcontroller/blob/master/Wiki/Programs/PokemonSwSh/AutoHost-Rolling.md",
-    "2-Description": "Roll N days, host, SR and repeat. Also supports hard-locks and soft-locks.",
-    "3-Parameters": [
-        {
-            "00-Type": "RandomCode",
-            "01-Label": "<b>Raid Code:</b><br>Blank for no raid code. Set random digits to zero for a fixed code. Otherwise, it is the # of leading random digits.",
-            "02-DeclarationRandom": "const uint8_t RANDOM_DIGITS",
-            "03-DeclarationCode": "const char* RAID_CODE",
-            "04-Digits": 8,
-            "05-DefaultRandom": 0,
-            "06-DefaultCode": "1280 0000",
-            "07-CurrentRandom": 0,
-            "08-CurrentCode": "1280 0000"
-        },
-        {
-            "00-Type": "SimpleInteger",
-            "01-Label": "<b>Day Skips:</b>",
-            "02-Declaration": "const uint8_t SKIPS",
-            "03-MinValue": 0,
-            "04-MaxValue": 255,
-            "98-Default": 3,
-            "99-Current": 3
-        },
-        {
-            "00-Type": "BooleanCheckBox",
-            "01-Label": "<b>Load Backup Save:</b><br>For backup save soft-locking method.",
-            "02-Declaration": "const bool BACKUP_SAVE",
-            "98-Default": false,
-            "99-Current": false
-        },
-        {
-            "00-Type": "BooleanCheckBox",
-            "01-Label": "<b>Host Online:</b>",
-            "02-Declaration": "const bool HOST_ONLINE",
-            "98-Default": true,
-            "99-Current": true
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Lobby Wait Delay:</b><br>Wait this long before starting raid. Start time is 3 minutes minus this number.",
-            "02-Declaration": "const uint16_t LOBBY_WAIT_DELAY",
-            "03-MinValue": 0,
-            "04-MaxValue": 22500,
-            "98-Default": "60 * TICKS_PER_SECOND",
-            "99-Current": "60 * TICKS_PER_SECOND"
-        },
-        {
-            "00-Type": "EnumDropdown",
-            "01-Label": "<b>Pokémon Catchability</b>",
-            "02-Declaration": "const Catchability CATCHABILITY",
-            "03-Options": [
-                [
-                    "ALWAYS_CATCHABLE",
-                    "Always Catchable"
-                ],
-                [
-                    "MAYBE_UNCATCHABLE",
-                    "Maybe Uncatchable"
-                ],
-                [
-                    "ALWAYS_UNCATCHABLE",
-                    "Always Uncatchable"
-                ]
-            ],
-            "98-Default": "ALWAYS_CATCHABLE",
-            "99-Current": "ALWAYS_CATCHABLE"
-        },
-        {
-            "00-Type": "SimpleInteger",
-            "01-Label": "<b>Friend Request Accept Slot:</b><br>Zero disables friend accepts.",
-            "02-Declaration": "const uint8_t FRIEND_ACCEPT_USER_SLOT",
-            "03-MinValue": 0,
-            "04-MaxValue": 8,
-            "98-Default": 0,
-            "99-Current": 0
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Extra Delay Between Raids:</b><br>May aid in farming.",
-            "02-Declaration": "const uint16_t EXTRA_DELAY_BETWEEN_RAIDS",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "0 * TICKS_PER_SECOND",
-            "99-Current": "0 * TICKS_PER_SECOND"
-        },
-        {
-            "00-Type": "SimpleInteger",
-            "01-Label": "<b>Troll hosting:</b><br>Zero disables the troll hosting mode, 1 attacks the first ally, 2 attacks the second, 3 attacks the third. Dynamaxing will disable this option.",
-            "02-Declaration": "const uint8_t TROLL_HOSTING",
-            "03-MinValue": 0,
-            "04-MaxValue": 3,
-            "98-Default": 0,
-            "99-Current": 0
-        },
-        {
-            "00-Type": "SimpleInteger",
-            "01-Label": "<b>1st Move Select Slot:</b><br>Zero disables 1st move select.",
-            "02-Declaration": "const uint8_t MOVE_SLOT",
-            "03-MinValue": 0,
-            "04-MaxValue": 4,
-            "98-Default": 0,
-            "99-Current": 0
-        },
-        {
-            "00-Type": "BooleanCheckBox",
-            "01-Label": "<b>1st Move Dynamax:</b> (requires 1st move select)<br>Dynamax on first move. (only applies if above option is non-zero)",
-            "02-Declaration": "const bool DYNAMAX",
-            "98-Default": true,
-            "99-Current": true
-        },
-        {
-            "00-Type": "BooleanCheckBox",
-            "01-Label": "<b>Alternate Games:</b><br>Alternate hosting between 1st and 2nd games. Host from both Sword and Shield.",
-            "02-Declaration": "const bool ALTERNATE_GAMES",
-            "98-Default": false,
-            "99-Current": false
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Rollover Prevention:</b><br>Prevent the den from rolling over by periodically touching the date. If set to zero, this feature is disabled. If skips is non-zero, this feature is also disabled.",
-            "02-Declaration": "const uint32_t TOUCH_DATE_INTERVAL",
-            "03-MinValue": 0,
-            "04-MaxValue": 2147483647,
-            "98-Default": "4 * 3600 * TICKS_PER_SECOND",
-            "99-Current": "4 * 3600 * TICKS_PER_SECOND"
-        },
-        {
-            "00-Type": "Divider",
-            "01-Label": "<font size=4><b>Internet Settings:</b> Increase these if your internet is slow.</font>"
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Connect to Internet Delay:</b><br>Time from \"Connect to Internet\" to when you're ready to enter den.",
-            "02-Declaration": "const uint16_t CONNECT_TO_INTERNET_DELAY",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "20 * TICKS_PER_SECOND",
-            "99-Current": "20 * TICKS_PER_SECOND"
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Enter Online Den Delay:</b><br>\"Communicating\" when entering den while online.",
-            "02-Declaration": "const uint16_t ENTER_ONLINE_DEN_DELAY",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "8 * TICKS_PER_SECOND",
-            "99-Current": "8 * TICKS_PER_SECOND"
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Open Online Den Delay:</b><br>Delay from \"Invite Others\" to when the clock starts ticking.",
-            "02-Declaration": "const uint16_t OPEN_ONLINE_DEN_LOBBY_DELAY",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "8 * TICKS_PER_SECOND",
-            "99-Current": "8 * TICKS_PER_SECOND"
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Raid Start to Exit Delay:</b><br>Time from start raid to reset. (when not selecting move)",
-            "02-Declaration": "const uint16_t RAID_START_TO_EXIT_DELAY",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "15 * TICKS_PER_SECOND",
-            "99-Current": "15 * TICKS_PER_SECOND"
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Delay to Select Move:</b><br>This + above = time from start raid to select move.",
-            "02-Declaration": "const uint16_t DELAY_TO_SELECT_MOVE",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "32 * TICKS_PER_SECOND",
-            "99-Current": "32 * TICKS_PER_SECOND"
-        }
-    ]
-}
diff --git a/GeneratorConfig/PokemonSwSh/BallThrower.json b/GeneratorConfig/PokemonSwSh/BallThrower.json
deleted file mode 100644
index 6fce9e276a..0000000000
--- a/GeneratorConfig/PokemonSwSh/BallThrower.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "0-ProgramName": "BallThrower",
-    "1-Documentation": "Microcontroller/blob/master/Wiki/Programs/PokemonSwSh/BallThrower.md",
-    "2-Description": "Blindly throw balls at the opposing Pokémon until it catches.",
-    "3-Parameters": [
-    ]
-}
diff --git a/GeneratorConfig/PokemonSwSh/BeamReset.json b/GeneratorConfig/PokemonSwSh/BeamReset.json
deleted file mode 100644
index 6bc3f3b5af..0000000000
--- a/GeneratorConfig/PokemonSwSh/BeamReset.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "0-ProgramName": "BeamReset",
-    "1-Documentation": "Microcontroller/blob/master/Wiki/Programs/PokemonSwSh/BeamReset.md",
-    "2-Description": "Reset a beam until you see a purple beam.",
-    "3-Parameters": [
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Delay before Reset:</b>",
-            "02-Declaration": "const uint16_t DELAY_BEFORE_RESET",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "5 * TICKS_PER_SECOND",
-            "99-Current": "5 * TICKS_PER_SECOND"
-        },
-        {
-            "00-Type": "BooleanCheckBox",
-            "01-Label": "<b>Extra Line:</b><br>(German has an extra line of text.)",
-            "02-Declaration": "const bool EXTRA_LINE",
-            "98-Default": false,
-            "99-Current": false
-        }
-    ]
-}
diff --git a/GeneratorConfig/PokemonSwSh/ClothingBuyer.json b/GeneratorConfig/PokemonSwSh/ClothingBuyer.json
deleted file mode 100644
index 67ae5f6510..0000000000
--- a/GeneratorConfig/PokemonSwSh/ClothingBuyer.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "0-ProgramName": "ClothingBuyer",
-    "1-Documentation": "Microcontroller/blob/master/Wiki/Programs/PokemonSwSh/ClothingBuyer.md",
-    "2-Description": "Buy out all the clothing in a store.",
-    "3-Parameters": [
-        {
-            "00-Type": "BooleanCheckBox",
-            "01-Label": "<b>Rotate Categories:</b><br>This slows down the program, but ensures it will cover all categories.",
-            "02-Declaration": "const bool CATEGORY_ROTATION",
-            "98-Default": true,
-            "99-Current": true
-        }
-    ]
-}
diff --git a/GeneratorConfig/PokemonSwSh/CurryHunter.json b/GeneratorConfig/PokemonSwSh/CurryHunter.json
deleted file mode 100644
index b47ffb8b80..0000000000
--- a/GeneratorConfig/PokemonSwSh/CurryHunter.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-    "0-ProgramName": "CurryHunter",
-    "1-Documentation": "Microcontroller/blob/master/Wiki/Programs/PokemonSwSh/CurryHunter.md",
-    "2-Description": "Cooks curry to attract Pokémon to your camp. This is a beta version.",
-    "3-Parameters": [
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Walk up Delay:</b><br>Wait this long for the Pokémon to walk up to you.",
-            "02-Declaration": "const uint16_t WALK_UP_DELAY",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "2 * TICKS_PER_SECOND",
-            "99-Current": "2 * TICKS_PER_SECOND"
-        },
-        {
-            "00-Type": "BooleanCheckBox",
-            "01-Label": "<b>Take Videos:</b><br>Take a video after each cooking iteration. This will spam your album with videos.",
-            "02-Declaration": "const bool TAKE_VIDEO",
-            "98-Default": false,
-            "99-Current": false
-        },
-        {
-            "00-Type": "SimpleInteger",
-            "01-Label": "<b>Iterations:</b><br># of cooking attempts.",
-            "02-Declaration": "const uint32_t ITERATIONS",
-            "03-MinValue": 0,
-            "04-MaxValue": 2147483647,
-            "98-Default": 999,
-            "99-Current": 999
-        }
-    ]
-}
diff --git a/GeneratorConfig/PokemonSwSh/DateSpam-BerryFarmer.json b/GeneratorConfig/PokemonSwSh/DateSpam-BerryFarmer.json
deleted file mode 100644
index 715f4ba89e..0000000000
--- a/GeneratorConfig/PokemonSwSh/DateSpam-BerryFarmer.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-    "0-ProgramName": "DateSpam-BerryFarmer",
-    "1-Documentation": "Microcontroller/blob/master/Wiki/Programs/PokemonSwSh/DateSpam-BerryFarmer.md",
-    "2-Description": "Farm berries.",
-    "3-Parameters": [
-        {
-            "00-Type": "SimpleInteger",
-            "01-Label": "<b>Number of Fetch Attempts:</b>",
-            "02-Declaration": "const uint32_t SKIPS",
-            "03-MinValue": 0,
-            "04-MaxValue": 2147483647,
-            "98-Default": 100000,
-            "99-Current": 100000
-        },
-        {
-            "00-Type": "SimpleInteger",
-            "01-Label": "<b>Save Every this Many Fetches:</b><br>(zero disables saving)",
-            "02-Declaration": "const uint16_t SAVE_ITERATIONS",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": 0,
-            "99-Current": 0
-        }
-    ]
-}
diff --git a/GeneratorConfig/PokemonSwSh/DateSpam-DailyHighlightFarmer.json b/GeneratorConfig/PokemonSwSh/DateSpam-DailyHighlightFarmer.json
deleted file mode 100644
index 742ea58ca8..0000000000
--- a/GeneratorConfig/PokemonSwSh/DateSpam-DailyHighlightFarmer.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-    "0-ProgramName": "DateSpam-DailyHighlightFarmer",
-    "1-Documentation": "Microcontroller/blob/master/Wiki/Programs/PokemonSwSh/DateSpam-DailyHighlightFarmer.md",
-    "2-Description": "Farm the daily highlight watt trader in Crown Tundra.",
-    "3-Parameters": [
-        {
-            "00-Type": "SimpleInteger",
-            "01-Label": "<b>Number of Purchase Attempts:</b>",
-            "02-Declaration": "const uint32_t SKIPS",
-            "03-MinValue": 0,
-            "04-MaxValue": 2147483647,
-            "98-Default": 100000,
-            "99-Current": 100000
-        },
-        {
-            "00-Type": "SimpleInteger",
-            "01-Label": "<b>Save Every this Many Fetches:</b><br>(zero disables saving)",
-            "02-Declaration": "const uint16_t SAVE_ITERATIONS",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": 0,
-            "99-Current": 0
-        }
-    ]
-}
diff --git a/GeneratorConfig/PokemonSwSh/DateSpam-LotoFarmer.json b/GeneratorConfig/PokemonSwSh/DateSpam-LotoFarmer.json
deleted file mode 100644
index c2bb24b1b6..0000000000
--- a/GeneratorConfig/PokemonSwSh/DateSpam-LotoFarmer.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-    "0-ProgramName": "DateSpam-LotoFarmer",
-    "1-Documentation": "Microcontroller/blob/master/Wiki/Programs/PokemonSwSh/DateSpam-LotoFarmer.md",
-    "2-Description": "Farm the Loto ID.",
-    "3-Parameters": [
-        {
-            "00-Type": "SimpleInteger",
-            "01-Label": "<b>Number of Loto Attempts:</b>",
-            "02-Declaration": "const uint32_t SKIPS",
-            "03-MinValue": 0,
-            "04-MaxValue": 2147483647,
-            "98-Default": 100000,
-            "99-Current": 100000
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Mash B for this long to exit the dialog:</b><br>(Some languages like German need to increase this.)",
-            "02-Declaration": "const uint16_t MASH_B_DURATION",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "9 * TICKS_PER_SECOND",
-            "99-Current": "9 * TICKS_PER_SECOND"
-        }
-    ]
-}
diff --git a/GeneratorConfig/PokemonSwSh/DateSpam-StowOnSideFarmer.json b/GeneratorConfig/PokemonSwSh/DateSpam-StowOnSideFarmer.json
deleted file mode 100644
index 386adf4fc0..0000000000
--- a/GeneratorConfig/PokemonSwSh/DateSpam-StowOnSideFarmer.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-    "0-ProgramName": "DateSpam-StowOnSideFarmer",
-    "1-Documentation": "Microcontroller/blob/master/Wiki/Programs/PokemonSwSh/DateSpam-StowOnSideFarmer.md",
-    "2-Description": "Farm the Stow-on-Side items dealer.",
-    "3-Parameters": [
-        {
-            "00-Type": "SimpleInteger",
-            "01-Label": "<b>Number of Purchase Attempts:</b>",
-            "02-Declaration": "const uint32_t SKIPS",
-            "03-MinValue": 0,
-            "04-MaxValue": 2147483647,
-            "98-Default": 100000,
-            "99-Current": 100000
-        },
-        {
-            "00-Type": "SimpleInteger",
-            "01-Label": "<b>Save Every this Many Purchases:</b><br>(zero disables saving)",
-            "02-Declaration": "const uint16_t SAVE_ITERATIONS",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": 0,
-            "99-Current": 0
-        }
-    ]
-}
diff --git a/GeneratorConfig/PokemonSwSh/DateSpam-WattFarmer.json b/GeneratorConfig/PokemonSwSh/DateSpam-WattFarmer.json
deleted file mode 100644
index c509f8e4df..0000000000
--- a/GeneratorConfig/PokemonSwSh/DateSpam-WattFarmer.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-    "0-ProgramName": "DateSpam-WattFarmer",
-    "1-Documentation": "Microcontroller/blob/master/Wiki/Programs/PokemonSwSh/DateSpam-WattFarmer.md",
-    "2-Description": "Farm watts. (6.9 seconds/fetch, 1 million watts/hour)",
-    "3-Parameters": [
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Exit Grip Menu Delay:</b> Wait this long after leaving the grip menu to allow for the Switch to reestablish local connection.",
-            "02-Declaration": "const uint16_t GRIP_MENU_WAIT",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "5 * TICKS_PER_SECOND",
-            "99-Current": "5 * TICKS_PER_SECOND"
-        },
-        {
-            "00-Type": "SimpleInteger",
-            "01-Label": "<b>Number of Fetch Attempts:</b>",
-            "02-Declaration": "const uint32_t SKIPS",
-            "03-MinValue": 0,
-            "04-MaxValue": 2147483647,
-            "98-Default": 33334,
-            "99-Current": 33334
-        },
-        {
-            "00-Type": "SimpleInteger",
-            "01-Label": "<b>Save Every this Many Fetches:</b><br>(zero disables saving): ",
-            "02-Declaration": "const uint16_t SAVE_ITERATIONS",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": 0,
-            "99-Current": 0
-        }
-    ]
-}
diff --git a/GeneratorConfig/PokemonSwSh/DaySkipperEU.json b/GeneratorConfig/PokemonSwSh/DaySkipperEU.json
deleted file mode 100644
index f0596c45d6..0000000000
--- a/GeneratorConfig/PokemonSwSh/DaySkipperEU.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    "0-ProgramName": "DaySkipperEU",
-    "1-Documentation": "Microcontroller/blob/master/Wiki/Programs/PokemonSwSh/DaySkipperEU.md",
-    "2-Description": "A day skipper for EU date format that.  (~7500 skips/hour)",
-    "3-Parameters": [
-        {
-            "00-Type": "SimpleInteger",
-            "01-Label": "<b>Number of Frame Skips:</b>",
-            "02-Declaration": "const uint32_t SKIPS",
-            "03-MinValue": 0,
-            "04-MaxValue": 2147483647,
-            "98-Default": 10,
-            "99-Current": 10
-        },
-        {
-            "00-Type": "SimpleInteger",
-            "01-Label": "<b>Real Life Year:</b>",
-            "02-Declaration": "const uint16_t REAL_LIFE_YEAR",
-            "03-MinValue": 2000,
-            "04-MaxValue": 2060,
-            "98-Default": 2023,
-            "99-Current": 2023
-        },
-        {
-            "00-Type": "Divider",
-            "01-Label": "<font size=4><b>Advanced Options:</b> You should not need to touch anything below here.</font>"
-        },
-        {
-            "00-Type": "SimpleInteger",
-            "01-Label": "<b>Auto-Correct Interval:</b><br>Run auto-recovery every this # of skips. Zero disables the auto-corrections.",
-            "02-Declaration": "const uint16_t CORRECTION_SKIPS",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": 1000,
-            "99-Current": 1000
-        }
-    ]
-}
diff --git a/GeneratorConfig/PokemonSwSh/DaySkipperJPN-7.8k.json b/GeneratorConfig/PokemonSwSh/DaySkipperJPN-7.8k.json
deleted file mode 100644
index c6613c3f89..0000000000
--- a/GeneratorConfig/PokemonSwSh/DaySkipperJPN-7.8k.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-    "0-ProgramName": "DaySkipperJPN-7.8k",
-    "1-Documentation": "Microcontroller/blob/master/Wiki/Programs/PokemonSwSh/DaySkipperJPN-7.8k.md",
-    "2-Description": "A faster, but less reliable Japanese date skipper. (7800 skips/hour)",
-    "3-Parameters": [
-        {
-            "00-Type": "SimpleInteger",
-            "01-Label": "<b>Number of Frame Skips:</b>",
-            "02-Declaration": "const uint32_t SKIPS",
-            "03-MinValue": 0,
-            "04-MaxValue": 2147483647,
-            "98-Default": 10,
-            "99-Current": 10
-        },
-        {
-            "00-Type": "SwitchDate",
-            "01-Label": "<b>Start Date:</b>",
-            "02-Declaration": "const Date START_DATE",
-            "98-Default": [
-                2000,
-                1,
-                1
-            ],
-            "99-Current": [
-                2000,
-                1,
-                1
-            ]
-        },
-        {
-            "00-Type": "Divider",
-            "01-Label": "<font size=4><b>Advanced Options:</b> You should not need to touch anything below here.</font>"
-        },
-        {
-            "00-Type": "SimpleInteger",
-            "01-Label": "<b>Auto-Correct Interval:</b><br>Run auto-recovery every this # of skips. Zero disables the auto-corrections.",
-            "02-Declaration": "const uint16_t CORRECTION_SKIPS",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": 1000,
-            "99-Current": 1000
-        }
-    ]
-}
diff --git a/GeneratorConfig/PokemonSwSh/DaySkipperJPN.json b/GeneratorConfig/PokemonSwSh/DaySkipperJPN.json
deleted file mode 100644
index 0d7293385a..0000000000
--- a/GeneratorConfig/PokemonSwSh/DaySkipperJPN.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "0-ProgramName": "DaySkipperJPN",
-    "1-Documentation": "Microcontroller/blob/master/Wiki/Programs/PokemonSwSh/DaySkipperJPN.md",
-    "2-Description": "A day skipper for Japanese date format. (7600 skips/hour)",
-    "3-Parameters": [
-        {
-            "00-Type": "SimpleInteger",
-            "01-Label": "<b>Number of Frame Skips:</b>",
-            "02-Declaration": "const uint32_t SKIPS",
-            "03-MinValue": 0,
-            "04-MaxValue": 2147483647,
-            "98-Default": 10,
-            "99-Current": 10
-        },
-        {
-            "00-Type": "Divider",
-            "01-Label": "<font size=4><b>Advanced Options:</b> You should not need to touch anything below here.</font>"
-        },
-        {
-            "00-Type": "SimpleInteger",
-            "01-Label": "<b>Auto-Correct Interval:</b><br>Run auto-recovery every this # of skips. Zero disables the auto-corrections.",
-            "02-Declaration": "const uint16_t CORRECTION_SKIPS",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": 1000,
-            "99-Current": 1000
-        }
-    ]
-}
diff --git a/GeneratorConfig/PokemonSwSh/DaySkipperUS.json b/GeneratorConfig/PokemonSwSh/DaySkipperUS.json
deleted file mode 100644
index 2aeb9cb095..0000000000
--- a/GeneratorConfig/PokemonSwSh/DaySkipperUS.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    "0-ProgramName": "DaySkipperUS",
-    "1-Documentation": "Microcontroller/blob/master/Wiki/Programs/PokemonSwSh/DaySkipperUS.md",
-    "2-Description": "A day skipper for US date format that.  (~7100 skips/hour)",
-    "3-Parameters": [
-        {
-            "00-Type": "SimpleInteger",
-            "01-Label": "<b>Number of Frame Skips:</b>",
-            "02-Declaration": "const uint32_t SKIPS",
-            "03-MinValue": 0,
-            "04-MaxValue": 2147483647,
-            "98-Default": 10,
-            "99-Current": 10
-        },
-        {
-            "00-Type": "SimpleInteger",
-            "01-Label": "<b>Real Life Year:</b>",
-            "02-Declaration": "const uint16_t REAL_LIFE_YEAR",
-            "03-MinValue": 2000,
-            "04-MaxValue": 2060,
-            "98-Default": 2023,
-            "99-Current": 2023
-        },
-        {
-            "00-Type": "Divider",
-            "01-Label": "<font size=4><b>Advanced Options:</b> You should not need to touch anything below here.</font>"
-        },
-        {
-            "00-Type": "SimpleInteger",
-            "01-Label": "<b>Auto-Correct Interval:</b><br>Run auto-recovery every this # of skips. Zero disables the auto-corrections.",
-            "02-Declaration": "const uint16_t CORRECTION_SKIPS",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": 500,
-            "99-Current": 500
-        }
-    ]
-}
diff --git a/GeneratorConfig/PokemonSwSh/DenRoller.json b/GeneratorConfig/PokemonSwSh/DenRoller.json
deleted file mode 100644
index 24d916fe4c..0000000000
--- a/GeneratorConfig/PokemonSwSh/DenRoller.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-    "0-ProgramName": "DenRoller",
-    "1-Documentation": "Microcontroller/blob/master/Wiki/Programs/PokemonSwSh/DenRoller.md",
-    "2-Description": "Roll den to the N'th day, SR and repeat.",
-    "3-Parameters": [
-        {
-            "00-Type": "SimpleInteger",
-            "01-Label": "<b>Number of Skips:</b>",
-            "02-Declaration": "const uint8_t SKIPS",
-            "03-MinValue": 0,
-            "04-MaxValue": 60,
-            "98-Default": 3,
-            "99-Current": 3
-        },
-        {
-            "00-Type": "EnumDropdown",
-            "01-Label": "<b>Pokémon Catchability</b>",
-            "02-Declaration": "const Catchability CATCHABILITY",
-            "03-Options": [
-                [
-                    "ALWAYS_CATCHABLE",
-                    "Always Catchable"
-                ],
-                [
-                    "MAYBE_UNCATCHABLE",
-                    "Maybe Uncatchable"
-                ],
-                [
-                    "ALWAYS_UNCATCHABLE",
-                    "Always Uncatchable"
-                ]
-            ],
-            "98-Default": "ALWAYS_CATCHABLE",
-            "99-Current": "ALWAYS_CATCHABLE"
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>View Time before Reset:</b>",
-            "02-Declaration": "const uint16_t VIEW_TIME",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "5 * TICKS_PER_SECOND",
-            "99-Current": "5 * TICKS_PER_SECOND"
-        }
-    ]
-}
diff --git a/GeneratorConfig/PokemonSwSh/EggCombined2.json b/GeneratorConfig/PokemonSwSh/EggCombined2.json
deleted file mode 100644
index 683fb03183..0000000000
--- a/GeneratorConfig/PokemonSwSh/EggCombined2.json
+++ /dev/null
@@ -1,114 +0,0 @@
-{
-    "0-ProgramName": "EggCombined2",
-    "1-Documentation": "Microcontroller/blob/master/Wiki/Programs/PokemonSwSh/EggCombined2.md",
-    "2-Description": "Fetch and hatch eggs at the same time. (Fastest - 1700 eggs/day for 5120-step)",
-    "3-Parameters": [
-        {
-            "00-Type": "SimpleInteger",
-            "01-Label": "<b>Boxes to Hatch:</b>",
-            "02-Declaration": "const uint8_t BOXES_TO_HATCH",
-            "03-MinValue": 0,
-            "04-MaxValue": 32,
-            "98-Default": 32,
-            "99-Current": 32
-        },
-        {
-            "00-Type": "EnumDropdown",
-            "01-Label": "<b>Step Count:</b><br>Lookup the # of steps on Serebii.",
-            "02-Declaration": "const uint16_t STEPS_TO_HATCH",
-            "03-Options": [
-                [
-                    "1280",
-                    "1280"
-                ],
-                [
-                    "2560",
-                    "2560"
-                ],
-                [
-                    "3840",
-                    "3840"
-                ],
-                [
-                    "5120",
-                    "5120"
-                ],
-                [
-                    "6400",
-                    "6400"
-                ],
-                [
-                    "7680",
-                    "7680"
-                ],
-                [
-                    "8960",
-                    "8960"
-                ],
-                [
-                    "10240",
-                    "10240"
-                ],
-                [
-                    "20480",
-                    "20480"
-                ],
-                [
-                    "30720",
-                    "30720"
-                ]
-            ],
-            "98-Default": "5120",
-            "99-Current": "5120"
-        },
-        {
-            "00-Type": "FloatingPoint",
-            "01-Label": "<b>Fetches per Batch:</b><br>For each batch of eggs, attempt this many egg fetches.",
-            "02-Declaration": "const float FETCHES_PER_BATCH",
-            "03-MinValue": 0,
-            "04-MaxValue": 7,
-            "98-Default": 6,
-            "99-Current": 6
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Rollover Prevention:</b><br>Prevent a den from rolling over by periodically touching the date. If set to zero, this feature is disabled.",
-            "02-Declaration": "const uint32_t TOUCH_DATE_INTERVAL",
-            "03-MinValue": 0,
-            "04-MaxValue": 2147483647,
-            "98-Default": "4 * 3600 * TICKS_PER_SECOND",
-            "99-Current": "4 * 3600 * TICKS_PER_SECOND"
-        },
-        {
-            "00-Type": "Divider",
-            "01-Label": "<font size=4><b>Advanced Options:</b> You should not need to touch anything below here.</font>"
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Safety Time:</b><br>Additional time added to the spinning.",
-            "02-Declaration": "const uint16_t SAFETY_TIME",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "8 * TICKS_PER_SECOND",
-            "99-Current": "8 * TICKS_PER_SECOND"
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Early Hatch Safety:</b><br>Eggs will not hatch early by more than this period.",
-            "02-Declaration": "const uint16_t EARLY_HATCH_SAFETY",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "5 * TICKS_PER_SECOND",
-            "99-Current": "5 * TICKS_PER_SECOND"
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Hatch Delay:</b><br>Total animation time for hatching 5 eggs when there are no shinies.",
-            "02-Declaration": "const uint16_t HATCH_DELAY",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "88 * TICKS_PER_SECOND",
-            "99-Current": "88 * TICKS_PER_SECOND"
-        }
-    ]
-}
diff --git a/GeneratorConfig/PokemonSwSh/EggFetcher2.json b/GeneratorConfig/PokemonSwSh/EggFetcher2.json
deleted file mode 100644
index 4f5d190e4d..0000000000
--- a/GeneratorConfig/PokemonSwSh/EggFetcher2.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "0-ProgramName": "EggFetcher2",
-    "1-Documentation": "Microcontroller/blob/master/Wiki/Programs/PokemonSwSh/EggFetcher2.md",
-    "2-Description": "Fetch eggs without hatching them.",
-    "3-Parameters": [
-        {
-            "00-Type": "SimpleInteger",
-            "01-Label": "<b>Fetch this many times:</b><br>This puts a limit on how many eggs you can get so you don't make a mess of your boxes for fetching too many.",
-            "02-Declaration": "const uint16_t MAX_FETCH_ATTEMPTS",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": 2000,
-            "99-Current": 2000
-        }
-    ]
-}
diff --git a/GeneratorConfig/PokemonSwSh/EggHatcher.json b/GeneratorConfig/PokemonSwSh/EggHatcher.json
deleted file mode 100644
index 088c0ba7e9..0000000000
--- a/GeneratorConfig/PokemonSwSh/EggHatcher.json
+++ /dev/null
@@ -1,79 +0,0 @@
-{
-    "0-ProgramName": "EggHatcher",
-    "1-Documentation": "Microcontroller/blob/master/Wiki/Programs/PokemonSwSh/EggHatcher.md",
-    "2-Description": "Hatch eggs from boxes.",
-    "3-Parameters": [
-        {
-            "00-Type": "SimpleInteger",
-            "01-Label": "<b>Boxes to Hatch:</b>",
-            "02-Declaration": "const uint8_t BOXES_TO_HATCH",
-            "03-MinValue": 0,
-            "04-MaxValue": 32,
-            "98-Default": 3,
-            "99-Current": 3
-        },
-        {
-            "00-Type": "EnumDropdown",
-            "01-Label": "<b>Step Count:</b><br>Lookup the # of steps on Serebii.",
-            "02-Declaration": "const uint16_t STEPS_TO_HATCH",
-            "03-Options": [
-                [
-                    "1280",
-                    "1280"
-                ],
-                [
-                    "2560",
-                    "2560"
-                ],
-                [
-                    "3840",
-                    "3840"
-                ],
-                [
-                    "5120",
-                    "5120"
-                ],
-                [
-                    "6400",
-                    "6400"
-                ],
-                [
-                    "7680",
-                    "7680"
-                ],
-                [
-                    "8960",
-                    "8960"
-                ],
-                [
-                    "10240",
-                    "10240"
-                ]
-            ],
-            "98-Default": "5120",
-            "99-Current": "5120"
-        },
-        {
-            "00-Type": "Divider",
-            "01-Label": "<font size=4><b>Advanced Options:</b> You should not need to touch anything below here.</font>"
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Safety Time:</b><br>Additional time added to the spinning.",
-            "02-Declaration": "const uint16_t SAFETY_TIME",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "8 * TICKS_PER_SECOND",
-            "99-Current": "8 * TICKS_PER_SECOND"
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Hatch Delay:</b><br>Total animation time for hatching 5 eggs when there are no shinies.",
-            "02-Declaration": "const uint16_t HATCH_DELAY",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "88 * TICKS_PER_SECOND",
-            "99-Current": "88 * TICKS_PER_SECOND"
-        }
-    ]
-}
diff --git a/GeneratorConfig/PokemonSwSh/EggSuperCombined2.json b/GeneratorConfig/PokemonSwSh/EggSuperCombined2.json
deleted file mode 100644
index d58c681a86..0000000000
--- a/GeneratorConfig/PokemonSwSh/EggSuperCombined2.json
+++ /dev/null
@@ -1,132 +0,0 @@
-{
-    "0-ProgramName": "EggSuperCombined2",
-    "1-Documentation": "Microcontroller/blob/master/Wiki/Programs/PokemonSwSh/EggSuperCombined2.md",
-    "2-Description": "Mass release breedjects, then run EggCombined2.",
-    "3-Parameters": [
-        {
-            "00-Type": "SimpleInteger",
-            "01-Label": "<b>Boxes to Release:</b><br>Start by releasing this many boxes.",
-            "02-Declaration": "const uint8_t BOXES_TO_RELEASE",
-            "03-MinValue": 0,
-            "04-MaxValue": 32,
-            "98-Default": 2,
-            "99-Current": 2
-        },
-        {
-            "00-Type": "SimpleInteger",
-            "01-Label": "<b>Boxes to Skip:</b><br>Then skip this many boxes.",
-            "02-Declaration": "const uint8_t BOXES_TO_SKIP",
-            "03-MinValue": 0,
-            "04-MaxValue": 32,
-            "98-Default": 1,
-            "99-Current": 1
-        },
-        {
-            "00-Type": "SimpleInteger",
-            "01-Label": "<b>Boxes to Hatch:</b>",
-            "02-Declaration": "const uint8_t BOXES_TO_HATCH",
-            "03-MinValue": 0,
-            "04-MaxValue": 32,
-            "98-Default": 31,
-            "99-Current": 31
-        },
-        {
-            "00-Type": "EnumDropdown",
-            "01-Label": "<b>Step Count:</b><br>Lookup the # of steps on Serebii.",
-            "02-Declaration": "const uint16_t STEPS_TO_HATCH",
-            "03-Options": [
-                [
-                    "1280",
-                    "1280"
-                ],
-                [
-                    "2560",
-                    "2560"
-                ],
-                [
-                    "3840",
-                    "3840"
-                ],
-                [
-                    "5120",
-                    "5120"
-                ],
-                [
-                    "6400",
-                    "6400"
-                ],
-                [
-                    "7680",
-                    "7680"
-                ],
-                [
-                    "8960",
-                    "8960"
-                ],
-                [
-                    "10240",
-                    "10240"
-                ],
-                [
-                    "20480",
-                    "20480"
-                ],
-                [
-                    "30720",
-                    "30720"
-                ]
-            ],
-            "98-Default": "5120",
-            "99-Current": "5120"
-        },
-        {
-            "00-Type": "FloatingPoint",
-            "01-Label": "<b>Fetches per Batch:</b><br>For each batch of eggs, attempt this many egg fetches.",
-            "02-Declaration": "const float FETCHES_PER_BATCH",
-            "03-MinValue": 0,
-            "04-MaxValue": 7,
-            "98-Default": 6,
-            "99-Current": 6
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Rollover Prevention:</b><br>Prevent a den from rolling over by periodically touching the date. If set to zero, this feature is disabled.",
-            "02-Declaration": "const uint32_t TOUCH_DATE_INTERVAL",
-            "03-MinValue": 0,
-            "04-MaxValue": 2147483647,
-            "98-Default": "4 * 3600 * TICKS_PER_SECOND",
-            "99-Current": "4 * 3600 * TICKS_PER_SECOND"
-        },
-        {
-            "00-Type": "Divider",
-            "01-Label": "<font size=4><b>Advanced Options:</b> You should not need to touch anything below here.</font>"
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Safety Time:</b><br>Additional time added to the spinning.",
-            "02-Declaration": "const uint16_t SAFETY_TIME",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "8 * TICKS_PER_SECOND",
-            "99-Current": "8 * TICKS_PER_SECOND"
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Early Hatch Safety:</b><br>Eggs will not hatch early by more than this period.",
-            "02-Declaration": "const uint16_t EARLY_HATCH_SAFETY",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "5 * TICKS_PER_SECOND",
-            "99-Current": "5 * TICKS_PER_SECOND"
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Hatch Delay:</b><br>Total animation time for hatching 5 eggs when there are no shinies.",
-            "02-Declaration": "const uint16_t HATCH_DELAY",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "88 * TICKS_PER_SECOND",
-            "99-Current": "88 * TICKS_PER_SECOND"
-        }
-    ]
-}
diff --git a/GeneratorConfig/PokemonSwSh/EventBeamFinder.json b/GeneratorConfig/PokemonSwSh/EventBeamFinder.json
deleted file mode 100644
index ae94864830..0000000000
--- a/GeneratorConfig/PokemonSwSh/EventBeamFinder.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "0-ProgramName": "EventBeamFinder",
-    "1-Documentation": "Microcontroller/blob/master/Wiki/Programs/PokemonSwSh/EventBeamFinder.md",
-    "2-Description": "Drop wishing pieces until you find an event den.",
-    "3-Parameters": [
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Wait time in Den:</b>",
-            "02-Declaration": "const uint16_t WAIT_TIME_IN_DEN",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "5 * TICKS_PER_SECOND",
-            "99-Current": "5 * TICKS_PER_SECOND"
-        }
-    ]
-}
diff --git a/GeneratorConfig/PokemonSwSh/FastCodeEntry.json b/GeneratorConfig/PokemonSwSh/FastCodeEntry.json
deleted file mode 100644
index 094ddc29e3..0000000000
--- a/GeneratorConfig/PokemonSwSh/FastCodeEntry.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "0-ProgramName": "FastCodeEntry",
-    "1-Documentation": "Microcontroller/blob/master/Wiki/Programs/PokemonSwSh/FastCodeEntry.md",
-    "2-Description": "Force your way into raids by entering 8-digit codes in under 1 second.",
-    "3-Parameters": [
-        {
-            "00-Type": "FixedCode",
-            "01-Label": "<b>Raid Code:</b>",
-            "02-Declaration": "const char* RAID_CODE",
-            "03-Digits": 8,
-            "98-Default": "9107 3091",
-            "99-Current": "9107 3091"
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Initial Delay:</b><br>Wait this long before entering the code.",
-            "02-Declaration": "const uint16_t INITIAL_DELAY",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "0 * TICKS_PER_SECOND",
-            "99-Current": "0 * TICKS_PER_SECOND"
-        }
-    ]
-}
diff --git a/GeneratorConfig/PokemonSwSh/GodEggDuplication.json b/GeneratorConfig/PokemonSwSh/GodEggDuplication.json
deleted file mode 100644
index 08f930483d..0000000000
--- a/GeneratorConfig/PokemonSwSh/GodEggDuplication.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-    "0-ProgramName": "GodEggDuplication",
-    "1-Documentation": "Microcontroller/blob/master/Wiki/Programs/PokemonSwSh/GodEggDuplication.md",
-    "2-Description": "Mass duplicate Pokémon with the God Egg.",
-    "3-Parameters": [
-        {
-            "00-Type": "SimpleInteger",
-            "01-Label": "<b>Fetch this many times:</b>",
-            "02-Declaration": "const uint16_t MAX_FETCH_ATTEMPTS",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": 1000,
-            "99-Current": 1000
-        },
-        {
-            "00-Type": "SimpleInteger",
-            "01-Label": "<b>Party Round Robin:</b><br>Cycle through this many party members.",
-            "02-Declaration": "const uint8_t PARTY_ROUND_ROBIN",
-            "03-MinValue": 1,
-            "04-MaxValue": 6,
-            "98-Default": 6,
-            "99-Current": 6
-        }
-    ]
-}
diff --git a/GeneratorConfig/PokemonSwSh/GodEggItemDupe.json b/GeneratorConfig/PokemonSwSh/GodEggItemDupe.json
deleted file mode 100644
index 1d3e4de16f..0000000000
--- a/GeneratorConfig/PokemonSwSh/GodEggItemDupe.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-    "0-ProgramName": "GodEggItemDupe",
-    "1-Documentation": "Microcontroller/blob/master/Wiki/Programs/PokemonSwSh/GodEggItemDuplication.md",
-    "2-Description": "Mass duplicate items with the God Egg.",
-    "3-Parameters": [
-        {
-            "00-Type": "SimpleInteger",
-            "01-Label": "<b>Fetch this many times:</b>",
-            "02-Declaration": "const uint16_t MAX_FETCH_ATTEMPTS",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": 1000,
-            "99-Current": 1000
-        },
-        {
-            "00-Type": "SimpleInteger",
-            "01-Label": "<b>Party Round Robin:</b><br>Cycle through this many party members.",
-            "02-Declaration": "const uint8_t PARTY_ROUND_ROBIN",
-            "03-MinValue": 1,
-            "04-MaxValue": 6,
-            "98-Default": 6,
-            "99-Current": 6
-        },
-        {
-            "00-Type": "BooleanCheckBox",
-            "01-Label": "<b>Detach before Release:</b><br>Needed for items like Rusted Sword/Shield.",
-            "02-Declaration": "const bool DETACH_BEFORE_RELEASE",
-            "98-Default": false,
-            "99-Current": false
-        }
-    ]
-}
diff --git a/GeneratorConfig/PokemonSwSh/MassRelease.json b/GeneratorConfig/PokemonSwSh/MassRelease.json
deleted file mode 100644
index 09ddff511a..0000000000
--- a/GeneratorConfig/PokemonSwSh/MassRelease.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "0-ProgramName": "MassRelease",
-    "1-Documentation": "Microcontroller/blob/master/Wiki/Programs/PokemonSwSh/MassRelease.md",
-    "2-Description": "Mass release boxes of Pokémon.",
-    "3-Parameters": [
-        {
-            "00-Type": "SimpleInteger",
-            "01-Label": "<b>Number of Boxes to Release:</b>",
-            "02-Declaration": "const uint8_t BOXES_TO_RELEASE",
-            "03-MinValue": 0,
-            "04-MaxValue": 32,
-            "98-Default": 2,
-            "99-Current": 2
-        },
-        {
-            "00-Type": "BooleanCheckBox",
-            "01-Label": "<b>Dodge System Update Window:</b>",
-            "02-Declaration": "const bool DODGE_SYSTEM_UPDATE_WINDOW",
-            "98-Default": false,
-            "99-Current": false
-        }
-    ]
-}
diff --git a/GeneratorConfig/PokemonSwSh/MultiGameFossil.json b/GeneratorConfig/PokemonSwSh/MultiGameFossil.json
deleted file mode 100644
index 34255feba9..0000000000
--- a/GeneratorConfig/PokemonSwSh/MultiGameFossil.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-    "0-ProgramName": "MultiGameFossil",
-    "1-Documentation": "Microcontroller/blob/master/Wiki/Programs/PokemonSwSh/MultiGameFossil.md",
-    "2-Description": "Revive fossils. Supports multiple saves so you can go afk for longer than 5 hours.",
-    "3-Parameters": [
-        {
-            "00-Type": "FossilTable",
-            "01-Label": "<b>Game List:</b>",
-            "02-Declaration": "const Batch BATCH[]",
-            "98-Default": [
-                {
-                    "fossil": "Dracovish",
-                    "game_slot": 1,
-                    "revives": 960,
-                    "user_slot": 1
-                }
-            ],
-            "99-Current": [
-                {
-                    "fossil": "Dracovish",
-                    "game_slot": 1,
-                    "revives": 960,
-                    "user_slot": 1
-                }
-            ]
-        }
-    ]
-}
diff --git a/GeneratorConfig/PokemonSwSh/PokemonSwSh_Settings.json b/GeneratorConfig/PokemonSwSh/PokemonSwSh_Settings.json
deleted file mode 100644
index 6deb5e9541..0000000000
--- a/GeneratorConfig/PokemonSwSh/PokemonSwSh_Settings.json
+++ /dev/null
@@ -1,323 +0,0 @@
-{
-    "0-ConfigName": "PokemonSwSh_Settings",
-    "1-ConfigPath": "PokemonSwSh",
-    "2-Documentation": "Microcontroller/blob/master/Wiki/Programs/PokemonSwSh/PokemonSettings.md",
-    "3-Description": "Global Pokémon Settings",
-    "4-Header": "Libraries/PokemonSwSh_Settings.h",
-    "5-Options": [
-        {
-            "00-Type": "Divider",
-            "01-Label": "<font size=4><b>Egg Options:</b></font>"
-        },
-        {
-            "00-Type": "BooleanCheckBox",
-            "01-Label": "<b>Auto-Deposit:</b><br>true = Send Pokémon to boxes is \"Automatic\".<br>false = Send Pokémon to boxes is \"Manual\".",
-            "02-Declaration": "bool PokemonSwSh_AUTO_DEPOSIT",
-            "98-Default": true,
-            "99-Current": true
-        },
-        {
-            "00-Type": "BooleanCheckBox",
-            "01-Label": "<b>Egg Fetch Extra Line:</b><br>true = The daycare lady has an extra line of text in Japanese. Set this to true if you are running any of the egg programs in a Japanese game.",
-            "02-Declaration": "bool PokemonSwSh_EGG_FETCH_EXTRA_LINE",
-            "98-Default": false,
-            "99-Current": false
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Fetch Egg Mash Delay:</b><br>Time needed to mash B to fetch an egg and return to overworld when auto-deposit is on.",
-            "02-Declaration": "uint16_t PokemonSwSh_FETCH_EGG_MASH_DELAY",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "800",
-            "99-Current": "800"
-        },
-        {
-            "00-Type": "Divider",
-            "01-Label": "<font size=4><b>Den Options:</b></font>"
-        },
-        {
-            "00-Type": "BooleanCheckBox",
-            "01-Label": "<b>Dodge Uncatchable Prompt Fast:</b><br>Which method to use to bypass the uncatchable Pokémon prompt?<br>true = Use a fast (but potentially unreliable) method.<br>false = Use a slower (by about 5 seconds) method.",
-            "02-Declaration": "bool PokemonSwSh_DODGE_UNCATCHABLE_PROMPT_FAST",
-            "98-Default": false,
-            "99-Current": false
-        },
-        {
-            "00-Type": "Divider",
-            "01-Label": "<font size=5><b>Advanced Options:</b></font> You shouldn't need to touch anything below here."
-        },
-        {
-            "00-Type": "Divider",
-            "01-Label": "<font size=4><b>General Timings:</b></font>"
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Auto-FR Duration:</b><br>Time to accept friend requests before returning to den lobby.",
-            "02-Declaration": "uint16_t PokemonSwSh_AUTO_FR_DURATION",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "8 * TICKS_PER_SECOND",
-            "99-Current": "8 * TICKS_PER_SECOND"
-        },
-        {
-            "00-Type": "Divider",
-            "01-Label": "<font size=4><b>Menu Navigation Timings:</b></font>"
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Overworld to Menu Delay:</b><br>Delay to bring up the menu when pressing X in the overworld.",
-            "02-Declaration": "uint16_t PokemonSwSh_OVERWORLD_TO_MENU_DELAY",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "120",
-            "99-Current": "120"
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Menu to Overworld Delay:</b><br>Delay to go from menu back to overworld.",
-            "02-Declaration": "uint16_t PokemonSwSh_MENU_TO_OVERWORLD_DELAY",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "250",
-            "99-Current": "250"
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Game to Home Delay (fast):</b><br>Delay from pressing home to entering the the Switch home menu. This affects the speed of date-spamming programs.",
-            "02-Declaration": "uint16_t PokemonSwSh_GAME_TO_HOME_DELAY_FAST",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "100",
-            "99-Current": "100"
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Game to Home Delay (safe):</b><br>Delay from pressing home to entering the the Switch home menu. This affects the speed of date-spamming programs.",
-            "02-Declaration": "uint16_t PokemonSwSh_GAME_TO_HOME_DELAY_SAFE",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "125",
-            "99-Current": "125"
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Home to Game Delay:</b><br>Delay to enter game from home menu.",
-            "02-Declaration": "uint16_t PokemonSwSh_HOME_TO_GAME_DELAY",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "3 * TICKS_PER_SECOND",
-            "99-Current": "3 * TICKS_PER_SECOND"
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Open Y-COMM Delay:</b><br>Time needed to open Y-COMM.",
-            "02-Declaration": "uint16_t PokemonSwSh_OPEN_YCOMM_DELAY",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "200",
-            "99-Current": "200"
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Enter Profile Delay:</b><br>Delay to enter your Switch profile.",
-            "02-Declaration": "uint16_t PokemonSwSh_ENTER_PROFILE_DELAY",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "2 * TICKS_PER_SECOND",
-            "99-Current": "2 * TICKS_PER_SECOND"
-        },
-        {
-            "00-Type": "Divider",
-            "01-Label": "<font size=4><b>Start Game Timings:</b></font>"
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>1. Start Game Mash:</b><br>Mash A for this long to start the game.",
-            "02-Declaration": "uint16_t PokemonSwSh_START_GAME_MASH",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "2 * TICKS_PER_SECOND",
-            "99-Current": "2 * TICKS_PER_SECOND"
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>2. Start Game Wait:</b><br>Wait this long for the game to load.",
-            "02-Declaration": "uint16_t PokemonSwSh_START_GAME_WAIT",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "20 * TICKS_PER_SECOND",
-            "99-Current": "20 * TICKS_PER_SECOND"
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>3. Enter Game Mash:</b><br>Mash A for this long to enter the game.",
-            "02-Declaration": "uint16_t PokemonSwSh_ENTER_GAME_MASH",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "3 * TICKS_PER_SECOND",
-            "99-Current": "3 * TICKS_PER_SECOND"
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>4. Enter Game Wait:</b><br>Wait this long for the game to enter the overworld.",
-            "02-Declaration": "uint16_t PokemonSwSh_ENTER_GAME_WAIT",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "11 * TICKS_PER_SECOND",
-            "99-Current": "11 * TICKS_PER_SECOND"
-        },
-        {
-            "00-Type": "Divider",
-            "01-Label": "<font size=4><b>Den Timings:</b></font>"
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Enter Offline Game Delay:</b><br>Time needed to enter a den on final button press.",
-            "02-Declaration": "uint16_t PokemonSwSh_ENTER_OFFLINE_DEN_DELAY",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "125",
-            "99-Current": "125"
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Re-enter Den Delay:</b><br>Time from exiting den after a day-skip to when you can collect watts and re-enter it.",
-            "02-Declaration": "uint16_t PokemonSwSh_REENTER_DEN_DELAY",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "5 * TICKS_PER_SECOND",
-            "99-Current": "5 * TICKS_PER_SECOND"
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Collect Watts Delay (offline):</b>",
-            "02-Declaration": "uint16_t PokemonSwSh_COLLECT_WATTS_OFFLINE_DELAY",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "80",
-            "99-Current": "80"
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Collect Watts Delay (online):</b>",
-            "02-Declaration": "uint16_t PokemonSwSh_COLLECT_WATTS_ONLINE_DELAY",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "3 * TICKS_PER_SECOND",
-            "99-Current": "3 * TICKS_PER_SECOND"
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Uncatchable Prompt Delay:</b><br>Time needed to bypass uncatchable Pokémon prompt.",
-            "02-Declaration": "uint16_t PokemonSwSh_UNCATCHABLE_PROMPT_DELAY",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "110",
-            "99-Current": "110"
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Open Local Den Lobby Delay:</b><br>Time needed to open a den lobby on local connection.",
-            "02-Declaration": "uint16_t PokemonSwSh_OPEN_LOCAL_DEN_LOBBY_DELAY",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "3 * TICKS_PER_SECOND",
-            "99-Current": "3 * TICKS_PER_SECOND"
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Enter Switch Pokémon:</b><br>Time needed to enter Switch Pokémon.",
-            "02-Declaration": "uint16_t PokemonSwSh_ENTER_SWITCH_POKEMON",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "4 * TICKS_PER_SECOND",
-            "99-Current": "4 * TICKS_PER_SECOND"
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Exit Switch Pokémon:</b><br>Time needed to exit Switch Pokémon back to den lobby.",
-            "02-Declaration": "uint16_t PokemonSwSh_EXIT_SWITCH_POKEMON",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "3 * TICKS_PER_SECOND",
-            "99-Current": "3 * TICKS_PER_SECOND"
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Full Lobby Timer:</b><br>Always 3 minutes.",
-            "02-Declaration": "uint16_t PokemonSwSh_FULL_LOBBY_TIMER",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "180 * TICKS_PER_SECOND",
-            "99-Current": "180 * TICKS_PER_SECOND"
-        },
-        {
-            "00-Type": "Divider",
-            "01-Label": "<font size=4><b>Box Timings:</b></font> (for egg programs)"
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Box Scroll Delay:</b><br>Delay to move the cursor.",
-            "02-Declaration": "uint16_t PokemonSwSh_BOX_SCROLL_DELAY",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "20",
-            "99-Current": "20"
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Box Change Delay:</b><br>Delay to change boxes.",
-            "02-Declaration": "uint16_t PokemonSwSh_BOX_CHANGE_DELAY",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "80",
-            "99-Current": "80"
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Box Pickup/Drop Delay:</b><br>Delay to pickup/drop Pokémon.",
-            "02-Declaration": "uint16_t PokemonSwSh_BOX_PICKUP_DROP_DELAY",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "90",
-            "99-Current": "90"
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Menu To Pokémon Delay:</b><br>Delay to enter Pokémon menu.",
-            "02-Declaration": "uint16_t PokemonSwSh_MENU_TO_POKEMON_DELAY",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "300",
-            "99-Current": "300"
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Pokémon to Box Delay:</b><br>Delay to enter box system.",
-            "02-Declaration": "uint16_t PokemonSwSh_POKEMON_TO_BOX_DELAY",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "300",
-            "99-Current": "300"
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Box to Pokémon Delay:</b><br>Delay to exit box system.",
-            "02-Declaration": "uint16_t PokemonSwSh_BOX_TO_POKEMON_DELAY",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "250",
-            "99-Current": "250"
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Pokémon to Menu Delay:</b><br>Delay to return to menu.",
-            "02-Declaration": "uint16_t PokemonSwSh_POKEMON_TO_MENU_DELAY",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "250",
-            "99-Current": "250"
-        }
-    ]
-}
diff --git a/GeneratorConfig/PokemonSwSh/ShinyHunt-Regi.json b/GeneratorConfig/PokemonSwSh/ShinyHunt-Regi.json
deleted file mode 100644
index 5e008a9089..0000000000
--- a/GeneratorConfig/PokemonSwSh/ShinyHunt-Regi.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-    "0-ProgramName": "ShinyHunt-Regi",
-    "1-Documentation": "Microcontroller/blob/master/Wiki/Programs/PokemonSwSh/ShinyHunt-Regi.md",
-    "2-Description": "Hunt for shiny Regi golem legendaries.",
-    "3-Parameters": [
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>View Time before Reset:</b>",
-            "02-Declaration": "const uint16_t WAIT_TIME",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "15 * TICKS_PER_SECOND",
-            "99-Current": "15 * TICKS_PER_SECOND"
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Rollover Prevention:</b><br>Prevent a den from rolling over by<br>periodically touching the date.<br><br>If set to zero, this feature is disabled.",
-            "02-Declaration": "const uint32_t TOUCH_DATE_INTERVAL",
-            "03-MinValue": 0,
-            "04-MaxValue": 2147483647,
-            "98-Default": "4 * 3600 * TICKS_PER_SECOND",
-            "99-Current": "4 * 3600 * TICKS_PER_SECOND"
-        }
-    ]
-}
diff --git a/GeneratorConfig/PokemonSwSh/ShinyHunt-SwordsOfJustice.json b/GeneratorConfig/PokemonSwSh/ShinyHunt-SwordsOfJustice.json
deleted file mode 100644
index 3d2c368464..0000000000
--- a/GeneratorConfig/PokemonSwSh/ShinyHunt-SwordsOfJustice.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-    "0-ProgramName": "ShinyHunt-SwordsOfJustice",
-    "1-Documentation": "Microcontroller/blob/master/Wiki/Programs/PokemonSwSh/ShinyHunt-SwordsOfJustice.md",
-    "2-Description": "Hunt for shiny Swords of Justice legendaries.",
-    "3-Parameters": [
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Exit Camp Delay:</b><br>Increase this number if you want to give yourself more time before running.",
-            "02-Declaration": "const uint16_t EXIT_CAMP_TO_RUN_DELAY",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "19 * TICKS_PER_SECOND",
-            "99-Current": "19 * TICKS_PER_SECOND"
-        },
-        {
-            "00-Type": "SimpleInteger",
-            "01-Label": "<b>Time Rollback (in hours):</b><br>Periodically roll back the time to keep the weather the same. If set to zero, this feature is disabled.",
-            "02-Declaration": "const uint8_t TIME_ROLLBACK_HOURS",
-            "03-MinValue": 0,
-            "04-MaxValue": 11,
-            "98-Default": 1,
-            "99-Current": 1
-        },
-        {
-            "00-Type": "Divider",
-            "01-Label": "<font size=4><b>Advanced Options:</b> You should not need to touch anything below here.</font>"
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Enter Camp Delay:</b>",
-            "02-Declaration": "const uint16_t ENTER_CAMP_DELAY",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "8 * TICKS_PER_SECOND",
-            "99-Current": "8 * TICKS_PER_SECOND"
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Run Delay:</b>",
-            "02-Declaration": "const uint16_t RUN_DELAY",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "5 * TICKS_PER_SECOND",
-            "99-Current": "5 * TICKS_PER_SECOND"
-        }
-    ]
-}
diff --git a/GeneratorConfig/PokemonSwSh/ShinyHuntUnattended-IoATrade.json b/GeneratorConfig/PokemonSwSh/ShinyHuntUnattended-IoATrade.json
deleted file mode 100644
index a7692b8ba9..0000000000
--- a/GeneratorConfig/PokemonSwSh/ShinyHuntUnattended-IoATrade.json
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-    "0-ProgramName": "ShinyHuntUnattended-IoATrade",
-    "1-Documentation": "Microcontroller/blob/master/Wiki/Programs/PokemonSwSh/ShinyHuntUnattended-IoATrade.md",
-    "2-Description": "Hunt for shiny Isle of Armor trade. Stop when a shiny is found.",
-    "3-Parameters": [
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Start to Run Delay:</b><br>This needs to be carefully calibrated.",
-            "02-Declaration": "const uint16_t START_TO_RUN_DELAY",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "1260",
-            "99-Current": "1260"
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Rollover Prevention:</b><br>Prevent a den from rolling over by periodically touching the date. If set to zero, this feature is disabled.",
-            "02-Declaration": "const uint32_t TOUCH_DATE_INTERVAL",
-            "03-MinValue": 0,
-            "04-MaxValue": 2147483647,
-            "98-Default": "4 * 3600 * TICKS_PER_SECOND",
-            "99-Current": "4 * 3600 * TICKS_PER_SECOND"
-        },
-        {
-            "00-Type": "Divider",
-            "01-Label": "<font size=4><b>Advanced Options:</b> You should not need to touch anything below here.</font>"
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Fly Duration:</b>",
-            "02-Declaration": "const uint16_t FLY_DURATION",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "800",
-            "99-Current": "800"
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Move to Beartic Duration:</b>",
-            "02-Declaration": "const uint16_t MOVE_DURATION",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "300",
-            "99-Current": "300"
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Mash to Trade Delay:</b><br>Time to perform the trade.",
-            "02-Declaration": "const uint16_t MASH_TO_TRADE_DELAY",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "30 * TICKS_PER_SECOND",
-            "99-Current": "30 * TICKS_PER_SECOND"
-        }
-    ]
-}
diff --git a/GeneratorConfig/PokemonSwSh/ShinyHuntUnattended-Regi.json b/GeneratorConfig/PokemonSwSh/ShinyHuntUnattended-Regi.json
deleted file mode 100644
index b00deeb04a..0000000000
--- a/GeneratorConfig/PokemonSwSh/ShinyHuntUnattended-Regi.json
+++ /dev/null
@@ -1,76 +0,0 @@
-{
-    "0-ProgramName": "ShinyHuntUnattended-Regi",
-    "1-Documentation": "Microcontroller/blob/master/Wiki/Programs/PokemonSwSh/ShinyHuntUnattended-Regi.md",
-    "2-Description": "Hunt for shiny Regis. Stop when a shiny is found.",
-    "3-Parameters": [
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Start to Run Delay:</b><br>This needs to be carefully calibrated.",
-            "02-Declaration": "const uint16_t START_TO_RUN_DELAY",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "1990",
-            "99-Current": "1990"
-        },
-        {
-            "00-Type": "EnumDropdown",
-            "01-Label": "<b>Name of Regi:</b>",
-            "02-Declaration": "const RegiGolem REGI_NAME",
-            "03-Options": [
-                [
-                    "Regirock",
-                    "Regirock"
-                ],
-                [
-                    "Regice",
-                    "Regice"
-                ],
-                [
-                    "Registeel",
-                    "Registeel"
-                ],
-                [
-                    "Regieleki",
-                    "Regieleki"
-                ],
-                [
-                    "Regidrago",
-                    "Regidrago"
-                ]
-            ],
-            "98-Default": "Registeel",
-            "99-Current": "Registeel"
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Rollover Prevention:</b><br>Prevent a den from rolling over by periodically touching the date. If set to zero, this feature is disabled.",
-            "02-Declaration": "const uint32_t TOUCH_DATE_INTERVAL",
-            "03-MinValue": 0,
-            "04-MaxValue": 2147483647,
-            "98-Default": "4 * 3600 * TICKS_PER_SECOND",
-            "99-Current": "4 * 3600 * TICKS_PER_SECOND"
-        },
-        {
-            "00-Type": "Divider",
-            "01-Label": "<font size=4><b>Advanced Options:</b> You should not need to touch anything below here.</font>"
-        },
-        {
-            "00-Type": "SimpleInteger",
-            "01-Label": "<b>Correction Interval:</b><br>Periodically leave the building to fix broken lights. Zero disables these corrections.",
-            "02-Declaration": "const uint16_t CORRECTION_INTERVAL",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": 20,
-            "99-Current": 20
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Transition Delay:</b><br>Time to enter/exit the building.",
-            "02-Declaration": "const uint16_t TRANSITION_DELAY",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "5 * TICKS_PER_SECOND",
-            "99-Current": "5 * TICKS_PER_SECOND"
-        }
-    ]
-}
diff --git a/GeneratorConfig/PokemonSwSh/ShinyHuntUnattended-Regigigas.json b/GeneratorConfig/PokemonSwSh/ShinyHuntUnattended-Regigigas.json
deleted file mode 100644
index db3d251e27..0000000000
--- a/GeneratorConfig/PokemonSwSh/ShinyHuntUnattended-Regigigas.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    "0-ProgramName": "ShinyHuntUnattended-Regigigas",
-    "1-Documentation": "Microcontroller/blob/master/Wiki/Programs/PokemonSwSh/ShinyHuntUnattended-Regigigas.md",
-    "2-Description": "Hunt for shiny Regigigas. Stop when a shiny is found.",
-    "3-Parameters": [
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Start to Attack Delay:</b><br>This needs to be carefully calibrated.",
-            "02-Declaration": "const uint16_t START_TO_ATTACK_DELAY",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "3720",
-            "99-Current": "3720"
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Rollover Prevention:</b><br>Prevent a den from rolling over by periodically touching the date. If set to zero, this feature is disabled.",
-            "02-Declaration": "const uint32_t TOUCH_DATE_INTERVAL",
-            "03-MinValue": 0,
-            "04-MaxValue": 2147483647,
-            "98-Default": "4 * 3600 * TICKS_PER_SECOND",
-            "99-Current": "4 * 3600 * TICKS_PER_SECOND"
-        },
-        {
-            "00-Type": "Divider",
-            "01-Label": "<font size=4><b>Advanced Options:</b> You should not need to touch anything below here.</font>"
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>End Battle Delay:</b>",
-            "02-Declaration": "const uint16_t END_BATTLE_DELAY",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "22 * TICKS_PER_SECOND",
-            "99-Current": "22 * TICKS_PER_SECOND"
-        }
-    ]
-}
diff --git a/GeneratorConfig/PokemonSwSh/ShinyHuntUnattended-Regigigas2.json b/GeneratorConfig/PokemonSwSh/ShinyHuntUnattended-Regigigas2.json
deleted file mode 100644
index 328e61008b..0000000000
--- a/GeneratorConfig/PokemonSwSh/ShinyHuntUnattended-Regigigas2.json
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-    "0-ProgramName": "ShinyHuntUnattended-Regigigas2",
-    "1-Documentation": "Microcontroller/blob/master/Wiki/Programs/PokemonSwSh/ShinyHuntUnattended-Regigigas2.md",
-    "2-Description": "A new version of the Regigigas program that is faster.",
-    "3-Parameters": [
-        {
-            "00-Type": "SimpleInteger",
-            "01-Label": "<b>Reversal PP:</b><br>The amount of Reversal PP you are saved with.",
-            "02-Declaration": "const uint8_t REVERSAL_PP",
-            "03-MinValue": 0,
-            "04-MaxValue": 255,
-            "98-Default": 24,
-            "99-Current": 24
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Start to Attack Delay:</b><br>This needs to be carefully calibrated.",
-            "02-Declaration": "const uint16_t START_TO_ATTACK_DELAY",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "3720",
-            "99-Current": "3720"
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Rollover Prevention:</b><br>Prevent a den from rolling over by periodically touching the date. If set to zero, this feature is disabled.",
-            "02-Declaration": "const uint32_t TOUCH_DATE_INTERVAL",
-            "03-MinValue": 0,
-            "04-MaxValue": 2147483647,
-            "98-Default": "4 * 3600 * TICKS_PER_SECOND",
-            "99-Current": "4 * 3600 * TICKS_PER_SECOND"
-        },
-        {
-            "00-Type": "Divider",
-            "01-Label": "<font size=4><b>Advanced Options:</b> You should not need to touch anything below here.</font>"
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Attack to Catch Delay:</b><br>Increase this if you seem to be catching Regigigas very often.",
-            "02-Declaration": "const uint16_t ATTACK_TO_CATCH_DELAY",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "9 * TICKS_PER_SECOND",
-            "99-Current": "9 * TICKS_PER_SECOND"
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Catch to Overworld Delay:</b>",
-            "02-Declaration": "const uint16_t CATCH_TO_OVERWORLD_DELAY",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "8 * TICKS_PER_SECOND",
-            "99-Current": "8 * TICKS_PER_SECOND"
-        }
-    ]
-}
diff --git a/GeneratorConfig/PokemonSwSh/ShinyHuntUnattended-StrongSpawn.json b/GeneratorConfig/PokemonSwSh/ShinyHuntUnattended-StrongSpawn.json
deleted file mode 100644
index cce41332f2..0000000000
--- a/GeneratorConfig/PokemonSwSh/ShinyHuntUnattended-StrongSpawn.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-    "0-ProgramName": "ShinyHuntUnattended-StrongSpawn",
-    "1-Documentation": "Microcontroller/blob/master/Wiki/Programs/PokemonSwSh/ShinyHuntUnattended-StrongSpawn.md",
-    "2-Description": "Hunt for shiny strong spawns. Stop when a shiny is found.",
-    "3-Parameters": [
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Enter Game to Run Delay:</b><br>This needs to be carefully calibrated.",
-            "02-Declaration": "const uint16_t ENTER_GAME_TO_RUN_DELAY",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "2280",
-            "99-Current": "2280"
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Start Game Wait Delay:</b><br>Decrease this if your game starts quickly.",
-            "02-Declaration": "const uint16_t PokemonSwSh_START_GAME_WAIT_DELAY",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "20 * TICKS_PER_SECOND",
-            "99-Current": "20 * TICKS_PER_SECOND"
-        },
-        {
-            "00-Type": "SimpleInteger",
-            "01-Label": "<b>Time Rollback (in hours):</b><br>Periodically roll back the time to keep the weather the same. If set to zero, this feature is disabled.",
-            "02-Declaration": "const uint8_t TIME_ROLLBACK_HOURS",
-            "03-MinValue": 0,
-            "04-MaxValue": 11,
-            "98-Default": 1,
-            "99-Current": 1
-        }
-    ]
-}
diff --git a/GeneratorConfig/PokemonSwSh/ShinyHuntUnattended-SwordsOfJustice.json b/GeneratorConfig/PokemonSwSh/ShinyHuntUnattended-SwordsOfJustice.json
deleted file mode 100644
index ddd765a224..0000000000
--- a/GeneratorConfig/PokemonSwSh/ShinyHuntUnattended-SwordsOfJustice.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-    "0-ProgramName": "ShinyHuntUnattended-SwordsOfJustice",
-    "1-Documentation": "Microcontroller/blob/master/Wiki/Programs/PokemonSwSh/ShinyHuntUnattended-SwordsOfJustice.md",
-    "2-Description": "Hunt for shiny SOJs. Stop when a shiny is found.",
-    "3-Parameters": [
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Exit Camp to Run Delay:</b><br>This needs to be carefully calibrated.",
-            "02-Declaration": "const uint16_t EXIT_CAMP_TO_RUN_DELAY",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "1890",
-            "99-Current": "1890"
-        },
-        {
-            "00-Type": "BooleanCheckBox",
-            "01-Label": "<b>Airplane Mode:</b><br>Enable if airplane mode is on.",
-            "02-Declaration": "const bool AIRPLANE_MODE",
-            "98-Default": false,
-            "99-Current": false
-        },
-        {
-            "00-Type": "SimpleInteger",
-            "01-Label": "<b>Time Rollback (in hours):</b><br>Periodically roll back the time to keep the weather the same. If set to zero, this feature is disabled.",
-            "02-Declaration": "const uint8_t TIME_ROLLBACK_HOURS",
-            "03-MinValue": 0,
-            "04-MaxValue": 11,
-            "98-Default": 1,
-            "99-Current": 1
-        },
-        {
-            "00-Type": "Divider",
-            "01-Label": "<font size=4><b>Advanced Options:</b> You should not need to touch anything below here.</font>"
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Enter Camp Delay:</b>",
-            "02-Declaration": "const uint16_t ENTER_CAMP_DELAY",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "8 * TICKS_PER_SECOND",
-            "99-Current": "8 * TICKS_PER_SECOND"
-        }
-    ]
-}
diff --git a/GeneratorConfig/PokemonSwSh/SurpriseTrade.json b/GeneratorConfig/PokemonSwSh/SurpriseTrade.json
deleted file mode 100644
index 7d0038787d..0000000000
--- a/GeneratorConfig/PokemonSwSh/SurpriseTrade.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-    "0-ProgramName": "SurpriseTrade",
-    "1-Documentation": "Microcontroller/blob/master/Wiki/Programs/PokemonSwSh/SurpriseTrade.md",
-    "2-Description": "Surprise trade away boxes of Pokémon.",
-    "3-Parameters": [
-        {
-            "00-Type": "SimpleInteger",
-            "01-Label": "<b>Number of Boxes to Trade:</b>",
-            "02-Declaration": "const uint8_t BOXES_TO_TRADE",
-            "03-MinValue": 0,
-            "04-MaxValue": 255,
-            "98-Default": 2,
-            "99-Current": 2
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Time to wait for a Trade Partner:</b>",
-            "02-Declaration": "const uint16_t INITIAL_WAIT",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "30 * TICKS_PER_SECOND",
-            "99-Current": "30 * TICKS_PER_SECOND"
-        },
-        {
-            "00-Type": "Divider",
-            "01-Label": "<font size=4><b>Advanced Options:</b> You should not need to touch anything below here.</font>"
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Trade Animation Time:</b>",
-            "02-Declaration": "const uint16_t TRADE_ANIMATION",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "23 * TICKS_PER_SECOND",
-            "99-Current": "23 * TICKS_PER_SECOND"
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Evolve Delay:</b>",
-            "02-Declaration": "const uint16_t EVOLVE_DELAY",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "30 * TICKS_PER_SECOND",
-            "99-Current": "30 * TICKS_PER_SECOND"
-        }
-    ]
-}
diff --git a/GeneratorConfig/PokemonSwSh/TradeBot.json b/GeneratorConfig/PokemonSwSh/TradeBot.json
deleted file mode 100644
index a86291038a..0000000000
--- a/GeneratorConfig/PokemonSwSh/TradeBot.json
+++ /dev/null
@@ -1,89 +0,0 @@
-{
-    "0-ProgramName": "TradeBot",
-    "1-Documentation": "Microcontroller/blob/master/Wiki/Programs/PokemonSwSh/TradeBot.md",
-    "2-Description": "Surprise trade with a code for hosting giveaways.",
-    "3-Parameters": [
-        {
-            "00-Type": "FixedCode",
-            "01-Label": "<b>Trade Code:</b>",
-            "02-Declaration": "const char* TRADE_CODE",
-            "03-Digits": 8,
-            "98-Default": "1280 0000",
-            "99-Current": "1280 0000"
-        },
-        {
-            "00-Type": "SimpleInteger",
-            "01-Label": "<b>Number of Boxes to Trade:</b>",
-            "02-Declaration": "const uint8_t BOXES_TO_TRADE",
-            "03-MinValue": 0,
-            "04-MaxValue": 255,
-            "98-Default": 2,
-            "99-Current": 2
-        },
-        {
-            "00-Type": "BooleanCheckBox",
-            "01-Label": "<b>Link Trade Extra Line:</b><br>Set this if you are playing in German.",
-            "02-Declaration": "const bool LINK_TRADE_EXTRA_LINE",
-            "98-Default": false,
-            "99-Current": false
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Time to wait for a Trade Partner:</b>",
-            "02-Declaration": "const uint16_t SEARCH_DELAY",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "20 * TICKS_PER_SECOND",
-            "99-Current": "20 * TICKS_PER_SECOND"
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Time to wait for Partner to Confirm:</b>",
-            "02-Declaration": "const uint16_t CONFIRM_DELAY",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "10 * TICKS_PER_SECOND",
-            "99-Current": "10 * TICKS_PER_SECOND"
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Time for Trade to Start:</b>",
-            "02-Declaration": "const uint16_t TRADE_START",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "10 * TICKS_PER_SECOND",
-            "99-Current": "10 * TICKS_PER_SECOND"
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Communication Window:</b>",
-            "02-Declaration": "const uint16_t TRADE_COMMUNICATION",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "20 * TICKS_PER_SECOND",
-            "99-Current": "20 * TICKS_PER_SECOND"
-        },
-        {
-            "00-Type": "Divider",
-            "01-Label": "<font size=4><b>Advanced Options:</b> You should not need to touch anything below here.</font>"
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Trade Animation Time:</b>",
-            "02-Declaration": "const uint16_t TRADE_ANIMATION",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "23 * TICKS_PER_SECOND",
-            "99-Current": "23 * TICKS_PER_SECOND"
-        },
-        {
-            "00-Type": "TimeExpression",
-            "01-Label": "<b>Evolve Delay:</b>",
-            "02-Declaration": "const uint16_t EVOLVE_DELAY",
-            "03-MinValue": 0,
-            "04-MaxValue": 65535,
-            "98-Default": "30 * TICKS_PER_SECOND",
-            "99-Current": "30 * TICKS_PER_SECOND"
-        }
-    ]
-}
diff --git a/HexGenerator/.gitignore b/HexGenerator/.gitignore
deleted file mode 100644
index 0ce9f9d50f..0000000000
--- a/HexGenerator/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-.qmake.stash
-Makefile
-Settings.json
-HexGenerator
-moc_MainWindow.cpp
-moc_RightPanel.cpp
-moc_predefs.h
-Logs/
diff --git a/HexGenerator/Cleanup.cmd b/HexGenerator/Cleanup.cmd
deleted file mode 100644
index 9ffb642e47..0000000000
--- a/HexGenerator/Cleanup.cmd
+++ /dev/null
@@ -1,13 +0,0 @@
-cd %~dp0
-
-del .qmake.stash
-del *.log
-del Makefile*
-del object_script.*
-del users*
-del HexGenerator.pro.user
-del Settings.json
-
-rd /s /q "debug\"
-rd /s /q "release\"
-rd /s /q "GeneratorConfig\"
diff --git a/HexGenerator/HexGenerator.pro b/HexGenerator/HexGenerator.pro
deleted file mode 100644
index 775ef4b1ce..0000000000
--- a/HexGenerator/HexGenerator.pro
+++ /dev/null
@@ -1,143 +0,0 @@
-QT       += core gui
-
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
-
-CONFIG += c++17
-CONFIG -= app_bundle
-INCLUDEPATH += ../
-INCLUDEPATH += Source/
-
-#QMAKE_CFLAGS += -MT
-#QMAKE_CFLAGS_RELEASE -= -MD
-#QMAKE_CXXFLAGS += -MT
-#QMAKE_CXXFLAGS_RELEASE -= -MD
-
-# You can make your code fail to compile if it uses deprecated APIs.
-# In order to do so, uncomment the following line.
-#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
-
-win32-msvc{
-    QMAKE_CXXFLAGS += /std:c++latest
-}
-
-SOURCES += \
-    ../Common/Cpp/Concurrency/SpinLock.cpp \
-    ../Common/Cpp/Containers/AlignedMalloc.cpp \
-    ../Common/Cpp/EnumDatabase.cpp \
-    ../Common/Cpp/Exceptions.cpp \
-    ../Common/Cpp/Json/JsonArray.cpp \
-    ../Common/Cpp/Json/JsonObject.cpp \
-    ../Common/Cpp/Json/JsonTools.cpp \
-    ../Common/Cpp/Json/JsonValue.cpp \
-    ../Common/Cpp/LifetimeSanitizer.cpp \
-    ../Common/Cpp/Options/BooleanCheckBoxOption.cpp \
-    ../Common/Cpp/Options/ConfigOption.cpp \
-    ../Common/Cpp/Options/DateOption.cpp \
-    ../Common/Cpp/Options/EditableTableOption.cpp \
-    ../Common/Cpp/Options/EnumDropdownOption.cpp \
-    ../Common/Cpp/Options/FloatingPointOption.cpp \
-    ../Common/Cpp/Options/SimpleIntegerOption.cpp \
-    ../Common/Cpp/Options/TimeExpressionOption.cpp \
-    ../Common/Cpp/PrettyPrint.cpp \
-    ../Common/Cpp/Unicode.cpp \
-    ../Common/Qt/AutoHeightTable.cpp \
-    ../Common/Qt/CodeValidator.cpp \
-    ../Common/Qt/ExpressionEvaluator.cpp \
-    ../Common/Qt/Options/BooleanCheckBoxWidget.cpp \
-    ../Common/Qt/Options/ConfigWidget.cpp \
-    ../Common/Qt/Options/DateWidget.cpp \
-    ../Common/Qt/Options/EditableTableWidget.cpp \
-    ../Common/Qt/Options/EnumDropdownWidget.cpp \
-    ../Common/Qt/Options/FloatingPointWidget.cpp \
-    ../Common/Qt/Options/SimpleIntegerWidget.cpp \
-    ../Common/Qt/Options/TimeExpressionWidget.cpp \
-    Source/Main.cpp \
-    Source/Options/BooleanCheckBox.cpp \
-    Source/Options/ConfigItem.cpp \
-    Source/Options/Date.cpp \
-    Source/Options/Divider.cpp \
-    Source/Options/EnumDropdown.cpp \
-    Source/Options/FixedCodeOption.cpp \
-    Source/Options/FloatingPoint.cpp \
-    Source/Options/FossilTableOption.cpp \
-    Source/Options/MultiHostTable.cpp \
-    Source/Options/RandomCodeOption.cpp \
-    Source/Options/SimpleInteger.cpp \
-    Source/Options/SingleStatementOption.cpp \
-    Source/Options/TimeExpression.cpp \
-    Source/Panels/ConfigSet.cpp \
-    Source/Panels/JsonProgram.cpp \
-    Source/Panels/JsonSettings.cpp \
-    Source/Panels/PanelList.cpp \
-    Source/Panels/PanelLists.cpp \
-    Source/Panels/Program.cpp \
-    Source/Tools/CommandRunner.cpp \
-    Source/Tools/MiscTools.cpp \
-    Source/Tools/PersistentSettings.cpp \
-    Source/UI/BoardList.cpp \
-    Source/UI/MainWindow.cpp
-
-HEADERS += \
-    ../Common/Cpp/Containers/AlignedMalloc.h \
-    ../Common/Cpp/Containers/Pimpl.h \
-    ../Common/Cpp/Containers/Pimpl.tpp \
-    ../Common/Cpp/EnumDatabase.h \
-    ../Common/Cpp/Exceptions.h \
-    ../Common/Cpp/Json/JsonArray.h \
-    ../Common/Cpp/Json/JsonObject.h \
-    ../Common/Cpp/Json/JsonTools.h \
-    ../Common/Cpp/Json/JsonValue.h \
-    ../Common/Cpp/LifetimeSanitizer.h \
-    ../Common/Cpp/Options/BooleanCheckBoxOption.h \
-    ../Common/Cpp/Options/ConfigOption.h \
-    ../Common/Cpp/Options/DateOption.h \
-    ../Common/Cpp/Options/EditableTableOption.h \
-    ../Common/Cpp/Options/EnumDropdownOption.h \
-    ../Common/Cpp/Options/FloatingPointOption.h \
-    ../Common/Cpp/Options/SimpleIntegerOption.h \
-    ../Common/Cpp/Options/TimeExpressionOption.h \
-    ../Common/Cpp/PrettyPrint.h \
-    ../Common/Cpp/Unicode.h \
-    ../Common/NintendoSwitch/NintendoSwitch_SlotDatabase.h \
-    ../Common/PokemonSwSh/PokemonSwSh_FossilTable.h \
-    ../Common/PokemonSwSh/PokemonSwSh_MultiHostTable.h \
-    ../Common/Qt/AutoHeightTable.h \
-    ../Common/Qt/CodeValidator.h \
-    ../Common/Qt/ExpressionEvaluator.h \
-    ../Common/Qt/Options/BooleanCheckBoxWidget.h \
-    ../Common/Qt/Options/ConfigWidget.h \
-    ../Common/Qt/Options/DateWidget.h \
-    ../Common/Qt/Options/EditableTableWidget.h \
-    ../Common/Qt/Options/EnumDropdownWidget.h \
-    ../Common/Qt/Options/FloatingPointWidget.h \
-    ../Common/Qt/Options/SimpleIntegerWidget.h \
-    ../Common/Qt/Options/TimeExpressionWidget.h \
-    Source/Options/BooleanCheckBox.h \
-    Source/Options/ConfigItem.h \
-    Source/Options/Date.h \
-    Source/Options/Divider.h \
-    Source/Options/EnumDropdown.h \
-    Source/Options/FixedCodeOption.h \
-    Source/Options/FloatingPoint.h \
-    Source/Options/FossilTableOption.h \
-    Source/Options/MultiHostTable.h \
-    Source/Options/RandomCodeOption.h \
-    Source/Options/SimpleInteger.h \
-    Source/Options/SingleStatementOption.h \
-    Source/Options/TimeExpression.h \
-    Source/Panels/ConfigSet.h \
-    Source/Panels/JsonProgram.h \
-    Source/Panels/JsonSettings.h \
-    Source/Panels/PanelList.h \
-    Source/Panels/PanelLists.h \
-    Source/Panels/Program.h \
-    Source/Panels/RightPanel.h \
-    Source/Tools/PersistentSettings.h \
-    Source/Tools/Tools.h \
-    Source/UI/BoardList.h \
-    Source/UI/MainWindow.h
-
-# Default rules for deployment.
-qnx: target.path = /tmp/$${TARGET}/bin
-else: unix:!android: target.path = /opt/$${TARGET}/bin
-!isEmpty(target.path): INSTALLS += target
diff --git a/HexGenerator/README.md b/HexGenerator/README.md
deleted file mode 100644
index 0ff5672f1c..0000000000
--- a/HexGenerator/README.md
+++ /dev/null
@@ -1,40 +0,0 @@
-# Hex Generator
-
-Source code for the hex generator UI.
-
-## How to Build
-
-**Windows:**
-
-1. Install Qt Creator.
-    1. Download the [Qt 5.12.10 Offline Installer](https://www.qt.io/offline-installers). [Direct download.](http://download.qt.io/official_releases/qt/5.12/5.12.10/qt-opensource-windows-x86-5.12.10.exe)
-    2. Disconnect from the internet.
-    3. Run the installer.
-    4. When prompted to select components, at minimum choose the following: ![](Qt-Install-Settings.png)
-2. Setup the project.
-    1. Run Qt.
-    2. Click on `Projects` -> `Open`.
-    3. Navigate to [`GeneratorSource`](../GeneratorSource) and select `HexGenerator.pro`.
-    4. It will then ask you to configure the project. Select `Desktop Qt 5.12.10 MinGW 32-bit`.
-    5. Navigate to `Projects`.
-    6. For both build configurations `Debug` and `Release`, uncheck "Shadow Build."
-3. Click the green arrow on the bottom left corner to build and run.
-
-Depending on what you are building (Debug or Release), the binary will be created inside either `GeneratorSource/debug/` or `GeneratorSource/release`. Note that at first, you will not be able to run this binary by just double-clicking since they will be missing .dll dependencies. The binary will only run when all the files in [`Deployment`](../Deployment) are in the same directory or on the search `PATH`.
-
-**Linux:**
- - Not supported yet.
- 
-
-**Mac:**
-
-1. Install Qt 5
-    1. `brew install qt@5`
-2. Build from source
-    1. `cd` to this source directory
-    2. run `qmake` from `qt@5`: `/opt/homebrew/Cellar/qt@5/5.15.8_2/bin/qmake` to generate `Makefile`
-    3. run `make -j 10`
-    4. the resulted binary `HexGenerator` would be in current directory
-3. Cleanup
-    1. run `make clean` to cleanup compiled files
-    2. run `make distclean` to cleanup everything including `Makefile` itself
diff --git a/HexGenerator/Source/Main.cpp b/HexGenerator/Source/Main.cpp
deleted file mode 100644
index d4216bc3fe..0000000000
--- a/HexGenerator/Source/Main.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-
-#include <memory>
-#include <vector>
-#include <iostream>
-#include <QApplication>
-#include <QDir>
-#include <QMessageBox>
-#include "Tools/PersistentSettings.h"
-#include "UI/MainWindow.h"
-
-//using std::cout;
-//using std::endl;
-
-//#include <QFile>
-
-namespace PokemonAutomation{
-namespace HexGenerator{
-
-QApplication* application = nullptr;
-
-}
-}
-
-using namespace PokemonAutomation;
-using namespace HexGenerator;
-
-int main(int argc, char *argv[])
-{
-    QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
-    auto app = std::make_unique<QApplication>(argc, argv);
-    application = app.get();
-
-    settings.load();
-
-    if (!QDir(QString::fromStdString(settings.path + CONFIG_FOLDER_NAME)).exists()){
-        QMessageBox box;
-        box.critical(
-            nullptr, "Error",
-            "Unable to find source directory.\r\nPlease unzip the package if you haven't already."
-        );
-    }
-
-    for (QChar ch : settings.path){
-        if (ch.unicode() >= 128){
-            QMessageBox box;
-            box.critical(
-                nullptr, "Error",
-                QString::fromStdString(
-                    "Unicode characters found in the path name. Please move the folder to a place with only English characters.\r\n"
-                    "GNU Make does not work with filepaths containing non-ASCII characters.\r\n"
-                    "\r\n"
-                    "Path: " + settings.path
-                )
-            );
-            break;
-        }
-    }
-
-    MainWindow w;
-    w.show();
-    int ret = app->exec();
-    settings.write();
-    return ret;
-}
diff --git a/HexGenerator/Source/Options/BooleanCheckBox.cpp b/HexGenerator/Source/Options/BooleanCheckBox.cpp
deleted file mode 100644
index ca462c2af9..0000000000
--- a/HexGenerator/Source/Options/BooleanCheckBox.cpp
+++ /dev/null
@@ -1,67 +0,0 @@
-/*  BooleanCheckBox
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QCheckBox>
-#include "Common/Cpp/Json/JsonObject.h"
-#include "Common/Cpp/Json/JsonTools.h"
-#include "Common/Qt/Options/ConfigWidget.h"
-#include "Tools/Tools.h"
-#include "BooleanCheckBox.h"
-
-namespace PokemonAutomation{
-namespace HexGenerator{
-
-
-const std::string BooleanCheckBox::OPTION_TYPE = "BooleanCheckBox";
-
-int BooleanCheckBox_init = register_option(
-    BooleanCheckBox::OPTION_TYPE,
-        [](const JsonObject& obj){
-        return std::unique_ptr<ConfigItem>(
-            new BooleanCheckBox(obj)
-        );
-    }
-);
-
-
-BooleanCheckBox::BooleanCheckBox(const JsonObject& obj)
-    : SingleStatementOption(obj)
-    , m_option(
-        SingleStatementOption::m_label,
-        LockWhileRunning::LOCKED,
-        obj.get_value_throw(JSON_DEFAULT).get_boolean_throw()
-    )
-{
-    m_option = obj.get_value_throw(JSON_CURRENT).get_boolean_throw();
-}
-void BooleanCheckBox::restore_defaults(){
-    m_option.restore_defaults();
-}
-JsonObject BooleanCheckBox::to_json() const{
-    JsonObject root = SingleStatementOption::to_json();
-    root[JSON_DEFAULT] = m_option.default_value();
-    root[JSON_CURRENT] = (bool)m_option;
-    return root;
-}
-std::string BooleanCheckBox::to_cpp() const{
-    std::string str;
-    str += m_declaration;
-    str += " = ";
-    str += m_option ? "true" : "false";
-    str += ";\r\n";
-    return str;
-}
-QWidget* BooleanCheckBox::make_ui(QWidget& parent){
-    return &m_option.make_QtWidget(parent)->widget();
-}
-
-
-
-
-}
-}
diff --git a/HexGenerator/Source/Options/BooleanCheckBox.h b/HexGenerator/Source/Options/BooleanCheckBox.h
deleted file mode 100644
index df0519ea16..0000000000
--- a/HexGenerator/Source/Options/BooleanCheckBox.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*  BooleanCheckBox
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_BooleanCheckBox_H
-#define PokemonAutomation_BooleanCheckBox_H
-
-#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
-#include "SingleStatementOption.h"
-
-namespace PokemonAutomation{
-namespace HexGenerator{
-
-
-class BooleanCheckBox : public SingleStatementOption{
-public:
-    static const std::string OPTION_TYPE;
-
-public:
-    BooleanCheckBox(const JsonObject& obj);
-
-    virtual const std::string& type() const override{ return OPTION_TYPE; }
-    virtual void restore_defaults() override;
-
-    virtual JsonObject to_json() const override;
-    virtual std::string to_cpp() const override;
-
-    virtual QWidget* make_ui(QWidget& parent) override;
-
-private:
-    BooleanCheckBoxOption m_option;
-};
-
-
-
-
-}
-}
-#endif
diff --git a/HexGenerator/Source/Options/ConfigItem.cpp b/HexGenerator/Source/Options/ConfigItem.cpp
deleted file mode 100644
index 1b742c3c5d..0000000000
--- a/HexGenerator/Source/Options/ConfigItem.cpp
+++ /dev/null
@@ -1,57 +0,0 @@
-/*  Config Item
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <QtGlobal>
-#include "Common/Cpp/Exceptions.h"
-#include "Common/Cpp/Json/JsonObject.h"
-#include "Tools/Tools.h"
-#include "ConfigItem.h"
-
-namespace PokemonAutomation{
-namespace HexGenerator{
-
-
-const std::string ConfigItem::JSON_TYPE     = "00-Type";
-const std::string ConfigItem::JSON_LABEL    = "01-Label";
-
-ConfigItem::ConfigItem(const JsonObject& obj)
-    : m_label(obj.get_string_throw(JSON_LABEL))
-{}
-
-JsonObject ConfigItem::to_json() const{
-    JsonObject root;
-    root[JSON_TYPE] = type();
-    root[JSON_LABEL] = m_label;
-    return root;
-}
-
-
-
-std::map<std::string, OptionMaker>& OPTION_FACTORIES(){
-    static std::map<std::string, OptionMaker> map;
-    return map;
-}
-std::unique_ptr<ConfigItem> parse_option(const JsonObject& obj){
-    std::string type = obj.get_string_throw(ConfigItem::JSON_TYPE);
-    std::map<std::string, OptionMaker>& map = OPTION_FACTORIES();
-    auto iter = map.find(type);
-    if (iter == map.end()){
-        throw ParseException("Unknown option type: " + type);
-    }
-    return iter->second(obj);
-}
-int register_option(const std::string& name, OptionMaker fp){
-    std::map<std::string, OptionMaker>& map = OPTION_FACTORIES();
-    if (!map.emplace(name, fp).second){
-        throw ParseException("Duplicate option name.");
-    }
-    return 0;
-}
-
-
-
-}
-}
diff --git a/HexGenerator/Source/Options/ConfigItem.h b/HexGenerator/Source/Options/ConfigItem.h
deleted file mode 100644
index 72aeaa2159..0000000000
--- a/HexGenerator/Source/Options/ConfigItem.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*  Config Item
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_ConfigItem_H
-#define PokemonAutomation_ConfigItem_H
-
-#include <memory>
-#include <QWidget>
-
-namespace PokemonAutomation{
-    class JsonObject;
-namespace HexGenerator{
-
-
-
-class ConfigItem{
-public:
-    static const std::string JSON_TYPE;
-    static const std::string JSON_LABEL;
-
-public:
-    ConfigItem(const JsonObject& obj);
-    virtual ~ConfigItem() = default;
-
-    virtual const std::string& type() const = 0;
-
-    //  Returns error message if invalid. Otherwise returns empty string.
-    virtual std::string check_validity() const{ return std::string(); }
-
-    virtual void restore_defaults(){}
-
-    virtual JsonObject to_json() const;
-    virtual std::string to_cpp() const{ return ""; }
-
-    virtual QWidget* make_ui(QWidget& parent) = 0;
-
-
-
-
-protected:
-    std::string m_label;
-};
-
-
-
-std::unique_ptr<ConfigItem> parse_option(const JsonObject& obj);
-
-using OptionMaker = std::unique_ptr<ConfigItem> (*)(const JsonObject& obj);
-int register_option(const std::string& name, OptionMaker fp);
-
-
-}
-}
-#endif
diff --git a/HexGenerator/Source/Options/Date.cpp b/HexGenerator/Source/Options/Date.cpp
deleted file mode 100644
index 13ac67f6c9..0000000000
--- a/HexGenerator/Source/Options/Date.cpp
+++ /dev/null
@@ -1,80 +0,0 @@
-/*  Switch Date
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QDateEdit>
-#include "Common/Cpp/Json/JsonValue.h"
-#include "Common/Cpp/Json/JsonObject.h"
-#include "Common/Cpp/Json/JsonTools.h"
-#include "Common/Qt/Options/ConfigWidget.h"
-#include "Tools/Tools.h"
-#include "Date.h"
-
-namespace PokemonAutomation{
-namespace HexGenerator{
-
-
-const std::string SwitchDate::OPTION_TYPE = "SwitchDate";
-
-
-int SwitchDate_init = register_option(
-    SwitchDate::OPTION_TYPE,
-        [](const JsonObject& obj){
-        return std::unique_ptr<ConfigItem>(
-            new SwitchDate(obj)
-        );
-    }
-);
-
-SwitchDate::SwitchDate(const JsonObject& obj)
-    : SingleStatementOption(obj)
-    , m_option(
-        SingleStatementOption::m_label,
-        QDate(2000, 1, 1), QDate(2060, 12, 31),
-        DateOption::from_json(obj.get_value_throw(JSON_DEFAULT))
-    )
-{
-    m_option.set(DateOption::from_json(obj.get_value_throw(JSON_CURRENT)));
-}
-std::string SwitchDate::check_validity() const{
-    return m_option.check_validity();
-}
-void SwitchDate::restore_defaults(){
-    m_option.restore_defaults();
-}
-JsonObject SwitchDate::to_json() const{
-    JsonObject root = SingleStatementOption::to_json();
-    root[JSON_DEFAULT] = DateOption::to_json(m_option.default_value());
-    root[JSON_CURRENT] = m_option.to_json();
-    return root;
-}
-std::string SwitchDate::to_cpp() const{
-    QDate date = m_option;
-
-    std::string str;
-    str += m_declaration;
-    str += " = {";
-    str += std::to_string(date.year());
-    str += ", ";
-    str += std::to_string(date.month());
-    str += ", ";
-    str += std::to_string(date.day());
-    str += "};\r\n";
-    return str;
-}
-QWidget* SwitchDate::make_ui(QWidget& parent){
-    return &m_option.make_QtWidget(parent)->widget();
-}
-
-
-
-
-}
-}
-
-
-
diff --git a/HexGenerator/Source/Options/Date.h b/HexGenerator/Source/Options/Date.h
deleted file mode 100644
index b28b9d095a..0000000000
--- a/HexGenerator/Source/Options/Date.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*  Switch Date
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_SwitchDate_H
-#define PokemonAutomation_SwitchDate_H
-
-#include "Common/Cpp/Options/DateOption.h"
-#include "SingleStatementOption.h"
-
-namespace PokemonAutomation{
-namespace HexGenerator{
-
-
-class SwitchDate : public SingleStatementOption{
-public:
-    static const std::string OPTION_TYPE;
-
-public:
-    SwitchDate(const JsonObject& obj);
-
-    virtual const std::string& type() const override{ return OPTION_TYPE; }
-    virtual std::string check_validity() const override;
-    virtual void restore_defaults() override;
-
-    virtual JsonObject to_json() const override;
-    virtual std::string to_cpp() const override;
-
-    virtual QWidget* make_ui(QWidget& parent) override;
-
-private:
-    DateOption m_option;
-};
-
-
-}
-}
-#endif
-
-
diff --git a/HexGenerator/Source/Options/Divider.cpp b/HexGenerator/Source/Options/Divider.cpp
deleted file mode 100644
index f532c6fe31..0000000000
--- a/HexGenerator/Source/Options/Divider.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-/*  Divider
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QCheckBox>
-#include "Tools/Tools.h"
-#include "Divider.h"
-
-namespace PokemonAutomation{
-namespace HexGenerator{
-
-
-const std::string Divider::OPTION_TYPE = "Divider";
-const std::string Divider::JSON_TEXT = "Text";
-
-int Divider_init = register_option(
-    Divider::OPTION_TYPE,
-        [](const JsonObject& obj){
-        return std::unique_ptr<ConfigItem>(
-            new Divider(obj)
-        );
-    }
-);
-
-
-Divider::Divider(const JsonObject& obj)
-    : ConfigItem(obj)
-{}
-QWidget* Divider::make_ui(QWidget& parent){
-    return new DividerUI(parent, m_label);
-}
-
-
-DividerUI::DividerUI(QWidget& parent, const std::string& label)
-    : QWidget(&parent)
-{
-    QVBoxLayout* layout = new QVBoxLayout(this);
-
-    QFrame* frame = new QFrame(this);
-    layout->addWidget(frame);
-    frame->setFrameShape(QFrame::HLine);
-
-    QLabel* text = new QLabel(QString::fromStdString(label), this);
-    layout->addWidget(text);
-    text->setWordWrap(true);
-}
-DividerUI::~DividerUI(){
-
-}
-
-
-
-}
-}
diff --git a/HexGenerator/Source/Options/Divider.h b/HexGenerator/Source/Options/Divider.h
deleted file mode 100644
index 11257e07a6..0000000000
--- a/HexGenerator/Source/Options/Divider.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*  Divider
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- *      This isn't a real option. It's just a line divider between groups of options.
- */
-
-#ifndef PokemonAutomation_Divider_H
-#define PokemonAutomation_Divider_H
-
-#include "ConfigItem.h"
-
-namespace PokemonAutomation{
-namespace HexGenerator{
-
-
-class Divider : public ConfigItem{
-public:
-    static const std::string OPTION_TYPE;
-    static const std::string JSON_TEXT;
-
-public:
-    Divider(const JsonObject& obj);
-
-    virtual const std::string& type() const override{ return OPTION_TYPE; }
-    virtual QWidget* make_ui(QWidget& parent) override;
-
-private:
-    friend class BooleanCheckBoxUI;
-};
-
-
-
-class DividerUI : public QWidget{
-public:
-    DividerUI(QWidget& parent, const std::string& label);
-    ~DividerUI();
-};
-
-
-}
-}
-#endif
diff --git a/HexGenerator/Source/Options/EnumDropdown.cpp b/HexGenerator/Source/Options/EnumDropdown.cpp
deleted file mode 100644
index 5bf1263f59..0000000000
--- a/HexGenerator/Source/Options/EnumDropdown.cpp
+++ /dev/null
@@ -1,135 +0,0 @@
-/*  EnumDropdown
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <vector>
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QComboBox>
-#include "Common/Cpp/Exceptions.h"
-#include "Common/Cpp/Json/JsonValue.h"
-#include "Common/Cpp/Json/JsonArray.h"
-#include "Common/Cpp/Json/JsonObject.h"
-#include "Tools/Tools.h"
-#include "EnumDropdown.h"
-
-namespace PokemonAutomation{
-namespace HexGenerator{
-
-
-const std::string EnumDropdown::OPTION_TYPE = "EnumDropdown";
-const std::string EnumDropdown::JSON_OPTIONS = "03-Options";
-
-
-int EnumDropdown_init = register_option(
-    EnumDropdown::OPTION_TYPE,
-        [](const JsonObject& obj){
-        return std::unique_ptr<ConfigItem>(
-            new EnumDropdown(obj)
-        );
-    }
-);
-
-
-EnumDropdown::EnumDropdown(const JsonObject& obj)
-    : SingleStatementOption(obj)
-{
-    const JsonArray& options = obj.get_array_throw(JSON_OPTIONS);
-    for (const auto& option : options){
-        const JsonArray& pair = option.get_array_throw();
-        if (pair.size() != 2){
-            throw ParseException("Config Error - Enum pairs should be 2 elements: " + JSON_OPTIONS);
-        }
-        m_options.emplace_back(
-            pair[0].get_string_throw(),
-            pair[1].get_string_throw()
-        );
-    }
-    for (size_t c = 0; c < m_options.size(); c++){
-        if (!m_map.emplace(m_options[c].first, c).second){
-            throw ParseException("Config Error - Duplicate option token.");
-        }
-    }
-    {
-        auto iter = m_map.find(obj.get_string_throw(JSON_DEFAULT));
-        if (iter == m_map.end()){
-            throw ParseException("Config Error - Unrecognized token.");
-        }
-        m_default = iter->second;
-    }
-    {
-        auto iter = m_map.find(obj.get_string_throw(JSON_CURRENT));
-        if (iter == m_map.end()){
-            throw ParseException("Config Error - Unrecognized token.");
-        }
-        m_current = iter->second;
-    }
-}
-
-void EnumDropdown::restore_defaults(){
-    m_current = m_default;
-}
-JsonObject EnumDropdown::to_json() const{
-    JsonObject root = SingleStatementOption::to_json();
-    {
-        JsonArray options;
-        for (const auto& option : m_options){
-            JsonArray pair;
-            pair.push_back(option.first);
-            pair.push_back(option.second);
-            options.push_back(std::move(pair));
-        }
-        root[JSON_OPTIONS] = std::move(options);
-    }
-    root[JSON_DEFAULT] = m_options[m_default].first;
-    root[JSON_CURRENT] = m_options[m_current].first;
-    return root;
-}
-std::string EnumDropdown::to_cpp() const{
-    std::string str;
-    str += m_declaration;
-    str += " = ";
-    str += m_options[m_current].first;
-    str += ";\r\n";
-    return str;
-}
-QWidget* EnumDropdown::make_ui(QWidget& parent){
-    return new EnumDropdownUI(parent, *this, m_label);
-}
-
-
-EnumDropdownUI::EnumDropdownUI(QWidget& parent, EnumDropdown& value, const std::string& label)
-    : QWidget(&parent)
-    , m_value(value)
-{
-    QHBoxLayout* layout = new QHBoxLayout(this);
-    QLabel* text = new QLabel(QString::fromStdString(label), this);
-    layout->addWidget(text);
-    text->setWordWrap(true);
-    QComboBox* box = new QComboBox(this);
-    layout->addWidget(box);
-    for (const auto& item : m_value.m_options){
-        box->addItem(QString::fromStdString(item.second));
-    }
-    box->setCurrentIndex(m_value.m_current);
-    connect(
-        box, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
-        this, [&](int index){ m_value.m_current = index; }
-    );
-}
-EnumDropdownUI::~EnumDropdownUI(){
-
-}
-
-
-
-
-}
-}
-
-
-
-
-
diff --git a/HexGenerator/Source/Options/EnumDropdown.h b/HexGenerator/Source/Options/EnumDropdown.h
deleted file mode 100644
index 379b958cf1..0000000000
--- a/HexGenerator/Source/Options/EnumDropdown.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*  Enum Dropdown
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_EnumDropdown_H
-#define PokemonAutomation_EnumDropdown_H
-
-#include <vector>
-#include <map>
-#include "SingleStatementOption.h"
-
-namespace PokemonAutomation{
-namespace HexGenerator{
-
-
-class EnumDropdown : public SingleStatementOption{
-public:
-    static const std::string OPTION_TYPE;
-    static const std::string JSON_OPTIONS;
-
-public:
-    EnumDropdown(const std::string& declaration, const std::string& label, size_t default_value);
-    EnumDropdown(const JsonObject& obj);
-
-    virtual const std::string& type() const override{ return OPTION_TYPE; }
-    virtual void restore_defaults() override;
-
-    virtual JsonObject to_json() const override;
-    virtual std::string to_cpp() const override;
-
-    virtual QWidget* make_ui(QWidget& parent) override;
-
-private:
-    friend class EnumDropdownUI;
-    std::vector<std::pair<std::string, std::string>> m_options;
-    std::map<std::string, size_t> m_map;
-    size_t m_default;
-    size_t m_current;
-};
-
-
-
-class EnumDropdownUI : public QWidget{
-public:
-    EnumDropdownUI(QWidget& parent, EnumDropdown& value, const std::string& label);
-    ~EnumDropdownUI();
-private:
-    EnumDropdown& m_value;
-};
-
-
-
-}
-}
-#endif
-
-
diff --git a/HexGenerator/Source/Options/FixedCodeOption.cpp b/HexGenerator/Source/Options/FixedCodeOption.cpp
deleted file mode 100644
index 87e5f7486b..0000000000
--- a/HexGenerator/Source/Options/FixedCodeOption.cpp
+++ /dev/null
@@ -1,115 +0,0 @@
-/*  FixedCode
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QLineEdit>
-#include "Common/Cpp/Exceptions.h"
-#include "Common/Cpp/Json/JsonObject.h"
-#include "Common/Qt/CodeValidator.h"
-#include "FixedCodeOption.h"
-
-namespace PokemonAutomation{
-namespace HexGenerator{
-
-
-const std::string FixedCode::OPTION_TYPE = "FixedCode";
-const std::string FixedCode::JSON_DIGITS = "03-Digits";
-
-int FixedCode_init = register_option(
-    FixedCode::OPTION_TYPE,
-        [](const JsonObject& obj){
-        return std::unique_ptr<ConfigItem>(
-            new FixedCode(obj)
-        );
-    }
-);
-
-
-FixedCode::FixedCode(const JsonObject& obj)
-    : SingleStatementOption(obj)
-    , m_digits(obj.get_integer_throw(JSON_DIGITS))
-    , m_default(obj.get_string_throw(JSON_DEFAULT))
-    , m_current(obj.get_string_throw(JSON_CURRENT))
-{
-    if (!validate_code(m_digits, m_default)){
-        throw ParseException("Invalid code.");
-    }
-    if (!validate_code(m_digits, m_current)){
-        throw ParseException("Invalid code.");
-    }
-}
-void FixedCode::restore_defaults(){
-    m_current = m_default;
-}
-std::string FixedCode::check_validity() const{
-    return validate_code(m_digits, m_current) ? std::string() : "Code is invalid.";
-}
-JsonObject FixedCode::to_json() const{
-    JsonObject root = SingleStatementOption::to_json();
-    root[JSON_DIGITS] = m_digits;
-    root[JSON_DEFAULT] = m_default;
-    root[JSON_CURRENT] = m_current;
-    return root;
-}
-std::string FixedCode::to_cpp() const{
-    std::string str;
-    str += m_declaration;
-    str += " = \"";
-    str += m_current;
-    str += "\";\r\n";
-    return str;
-}
-QWidget* FixedCode::make_ui(QWidget& parent){
-    return new FixedCodeUI(parent, *this, m_label);
-}
-
-
-
-std::string FixedCodeUI::sanitized_code(const std::string& text){
-    std::string message;
-    try{
-        message = "Code: " + sanitize_code(m_value.m_digits, text);
-    }catch (const ParseException& e){
-        message = "<font color=\"red\">" + e.message() + "</font>";
-    }
-    return message;
-}
-
-FixedCodeUI::FixedCodeUI(QWidget& parent, FixedCode& value, const std::string& label)
-    : QWidget(&parent)
-    , m_value(value)
-{
-    QHBoxLayout* layout = new QHBoxLayout(this);
-    QLabel* text = new QLabel(QString::fromStdString(label), this);
-    layout->addWidget(text, 1);
-    text->setWordWrap(true);
-
-    QVBoxLayout* right = new QVBoxLayout();
-    layout->addLayout(right, 1);
-
-    QLineEdit* box = new QLineEdit(QString::fromStdString(m_value.m_current), this);
-    right->addWidget(box);
-    QLabel* under_text = new QLabel(QString::fromStdString(sanitized_code(m_value.m_current)), this);
-    right->addWidget(under_text);
-    under_text->setWordWrap(true);
-
-    connect(
-        box, &QLineEdit::textChanged,
-        this, [=](const QString& text){
-            m_value.m_current = text.toStdString();
-            under_text->setText(QString::fromStdString(sanitized_code(m_value.m_current)));
-        }
-    );
-}
-FixedCodeUI::~FixedCodeUI(){
-
-}
-
-
-
-}
-}
diff --git a/HexGenerator/Source/Options/FixedCodeOption.h b/HexGenerator/Source/Options/FixedCodeOption.h
deleted file mode 100644
index f99dc4fdbb..0000000000
--- a/HexGenerator/Source/Options/FixedCodeOption.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*  FixedCode
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_FixedCode_H
-#define PokemonAutomation_FixedCode_H
-
-#include "SingleStatementOption.h"
-
-namespace PokemonAutomation{
-namespace HexGenerator{
-
-
-class FixedCode : public SingleStatementOption{
-public:
-    static const std::string OPTION_TYPE;
-    static const std::string JSON_DIGITS;
-
-public:
-    FixedCode(const JsonObject& obj);
-
-    virtual const std::string& type() const override{ return OPTION_TYPE; }
-    virtual std::string check_validity() const override;
-    virtual void restore_defaults() override;
-
-    virtual JsonObject to_json() const override;
-    virtual std::string to_cpp() const override;
-
-    virtual QWidget* make_ui(QWidget& parent) override;
-
-private:
-    friend class FixedCodeUI;
-    size_t m_digits;
-    std::string m_default;
-    std::string m_current;
-};
-
-
-
-class FixedCodeUI : public QWidget{
-public:
-    FixedCodeUI(QWidget& parent, FixedCode& value, const std::string& label);
-    ~FixedCodeUI();
-
-private:
-    std::string sanitized_code(const std::string& text);
-
-private:
-    FixedCode& m_value;
-};
-
-
-
-}
-}
-#endif
diff --git a/HexGenerator/Source/Options/FloatingPoint.cpp b/HexGenerator/Source/Options/FloatingPoint.cpp
deleted file mode 100644
index 0f492ff031..0000000000
--- a/HexGenerator/Source/Options/FloatingPoint.cpp
+++ /dev/null
@@ -1,79 +0,0 @@
-/*  Floating Point
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QDoubleValidator>
-#include <QLineEdit>
-#include "Common/Cpp/Json/JsonValue.h"
-#include "Common/Cpp/Json/JsonObject.h"
-#include "Common/Cpp/Json/JsonTools.h"
-#include "Common/Qt/Options/ConfigWidget.h"
-#include "Tools/Tools.h"
-#include "FloatingPoint.h"
-
-namespace PokemonAutomation{
-namespace HexGenerator{
-
-
-const std::string FloatingPoint::OPTION_TYPE = "FloatingPoint";
-const std::string FloatingPoint::JSON_MIN_VALUE = "03-MinValue";
-const std::string FloatingPoint::JSON_MAX_VALUE = "04-MaxValue";
-
-
-int FloatingPoint_init = register_option(
-    FloatingPoint::OPTION_TYPE,
-        [](const JsonObject& obj){
-        return std::unique_ptr<ConfigItem>(
-            new FloatingPoint(obj)
-        );
-    }
-);
-
-FloatingPoint::FloatingPoint(const JsonObject& obj)
-    : SingleStatementOption(obj)
-    , m_option(
-        SingleStatementOption::m_label,
-        LockWhileRunning::LOCKED,
-        obj.get_double_throw(JSON_DEFAULT),
-        obj.get_double_throw(JSON_MIN_VALUE),
-        obj.get_double_throw(JSON_MAX_VALUE)
-    )
-{
-    m_option.set(obj.get_double_throw(JSON_CURRENT));
-}
-std::string FloatingPoint::check_validity() const{
-    return m_option.check_validity();
-}
-void FloatingPoint::restore_defaults(){
-    m_option.restore_defaults();
-}
-JsonObject FloatingPoint::to_json() const{
-    JsonObject root = SingleStatementOption::to_json();
-    root[JSON_MIN_VALUE] = m_option.min_value();
-    root[JSON_MAX_VALUE] = m_option.max_value();
-    root[JSON_DEFAULT] = m_option.default_value();
-    root[JSON_CURRENT] = (double)m_option;
-    return root;
-}
-std::string FloatingPoint::to_cpp() const{
-    std::string str;
-    str += m_declaration;
-    str += " = ";
-    str += std::to_string(m_option);
-    str += ";\r\n";
-    return str;
-}
-QWidget* FloatingPoint::make_ui(QWidget& parent){
-    return &m_option.make_QtWidget(parent)->widget();
-}
-
-
-
-
-}
-}
-
diff --git a/HexGenerator/Source/Options/FloatingPoint.h b/HexGenerator/Source/Options/FloatingPoint.h
deleted file mode 100644
index 4d39f63081..0000000000
--- a/HexGenerator/Source/Options/FloatingPoint.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*  Floating Point
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_SimpleInteger_H
-#define PokemonAutomation_SimpleInteger_H
-
-#include "Common/Cpp/Options/FloatingPointOption.h"
-#include "SingleStatementOption.h"
-
-namespace PokemonAutomation{
-namespace HexGenerator{
-
-
-
-class FloatingPoint : public SingleStatementOption{
-public:
-    static const std::string OPTION_TYPE;
-    static const std::string JSON_MIN_VALUE;
-    static const std::string JSON_MAX_VALUE;
-
-public:
-    FloatingPoint(const JsonObject& obj);
-
-    virtual const std::string& type() const override{ return OPTION_TYPE; }
-    virtual std::string check_validity() const override;
-    virtual void restore_defaults() override;
-
-    virtual JsonObject to_json() const override;
-    virtual std::string to_cpp() const override;
-
-    virtual QWidget* make_ui(QWidget& parent) override;
-
-private:
-    FloatingPointOption m_option;
-};
-
-
-
-}
-}
-#endif
-
-
diff --git a/HexGenerator/Source/Options/FossilTableOption.cpp b/HexGenerator/Source/Options/FossilTableOption.cpp
deleted file mode 100644
index 8d6af31d39..0000000000
--- a/HexGenerator/Source/Options/FossilTableOption.cpp
+++ /dev/null
@@ -1,94 +0,0 @@
-/*  Fossil Table
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <map>
-#include <QVBoxLayout>
-#include <QLabel>
-#include <QTableWidget>
-#include <QHeaderView>
-#include "Common/Cpp/Json/JsonValue.h"
-#include "Common/Cpp/Json/JsonObject.h"
-#include "Common/Cpp/Json/JsonTools.h"
-#include "Common/Qt/Options/ConfigWidget.h"
-#include "Tools/Tools.h"
-#include "FossilTableOption.h"
-
-namespace PokemonAutomation{
-namespace HexGenerator{
-
-
-const std::string FossilTable::OPTION_TYPE      = "FossilTable";
-
-
-const std::vector<std::string> FossilTable::FOSSIL_LIST{
-    "Dracozolt",
-    "Arctozolt",
-    "Dracovish",
-    "Arctovish",
-};
-
-
-int FossilTable_init = register_option(
-    FossilTable::OPTION_TYPE,
-        [](const JsonObject& obj){
-        return std::unique_ptr<ConfigItem>(
-            new FossilTable(obj)
-        );
-    }
-);
-
-
-FossilTable::FossilTable(const JsonObject& obj)
-    : SingleStatementOption(obj)
-{
-    m_table.load_json(obj.get_value_throw(JSON_CURRENT));
-}
-std::string FossilTable::check_validity() const{
-    return m_table.check_validity();
-}
-void FossilTable::restore_defaults(){
-    m_table.restore_defaults();
-}
-JsonObject FossilTable::to_json() const{
-    JsonObject root = SingleStatementOption::to_json();
-    root[JSON_CURRENT] = m_table.to_json();
-    return root;
-}
-std::string FossilTable::to_cpp() const{
-    std::string str;
-    str += m_declaration;
-    str += " = {\r\n";
-    std::vector<std::unique_ptr<NintendoSwitch::PokemonSwSh::FossilGame>> list = m_table.copy_snapshot();
-    for (size_t c = 0; c < list.size(); c++){
-        const NintendoSwitch::PokemonSwSh::FossilGame& item = *list[c];
-        str += "    {";
-        str += std::to_string(item.game_slot.current_value());
-        str += ", ";
-        str += std::to_string(item.user_slot.current_value());
-        str += ", ";
-        str += FOSSIL_LIST[item.fossil.current_value()];
-        str += ", ";
-        str += std::to_string(item.revives);
-        str += "},\r\n";
-    }
-    str += "    {},\r\n";
-    str += "};\r\n";
-    return str;
-}
-QWidget* FossilTable::make_ui(QWidget& parent){
-    return &m_table.make_QtWidget(parent)->widget();
-}
-
-
-
-
-
-
-
-}
-}
-
-
diff --git a/HexGenerator/Source/Options/FossilTableOption.h b/HexGenerator/Source/Options/FossilTableOption.h
deleted file mode 100644
index 09d615a9f4..0000000000
--- a/HexGenerator/Source/Options/FossilTableOption.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*  Fossil Table
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_FossilTable_H
-#define PokemonAutomation_FossilTable_H
-
-#include <vector>
-#include <QTableWidget>
-#include <QComboBox>
-#include <QLineEdit>
-#include <QPushButton>
-#include "Common/PokemonSwSh/PokemonSwSh_FossilTable.h"
-#include "SingleStatementOption.h"
-
-namespace PokemonAutomation{
-namespace HexGenerator{
-
-
-#if 1
-class FossilTable : public SingleStatementOption{
-public:
-    static const std::string OPTION_TYPE;
-
-    static const std::vector<std::string> FOSSIL_LIST;
-
-public:
-    FossilTable(const JsonObject& obj);
-
-    virtual const std::string& type() const override{ return OPTION_TYPE; }
-    virtual std::string check_validity() const override;
-    virtual void restore_defaults() override;
-
-    virtual JsonObject to_json() const override;
-    virtual std::string to_cpp() const override;
-
-    virtual QWidget* make_ui(QWidget& parent) override;
-
-private:
-    friend class FossilTableUI;
-    NintendoSwitch::PokemonSwSh::FossilTable m_table;
-};
-#endif
-
-
-
-
-}
-}
-#endif
diff --git a/HexGenerator/Source/Options/MultiHostTable.cpp b/HexGenerator/Source/Options/MultiHostTable.cpp
deleted file mode 100644
index 89bc556a31..0000000000
--- a/HexGenerator/Source/Options/MultiHostTable.cpp
+++ /dev/null
@@ -1,91 +0,0 @@
-/*  Multi-Host Table
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <QVBoxLayout>
-#include <QLabel>
-#include <QTableWidget>
-#include <QHeaderView>
-#include <QComboBox>
-#include <QLineEdit>
-#include <QScrollBar>
-#include "Common/Cpp/Json/JsonValue.h"
-#include "Common/Cpp/Json/JsonArray.h"
-#include "Common/Cpp/Json/JsonObject.h"
-#include "Common/Cpp/Json/JsonTools.h"
-#include "Common/Qt/Options/ConfigWidget.h"
-#include "Common/Qt/ExpressionEvaluator.h"
-#include "Tools/Tools.h"
-#include "MultiHostTable.h"
-
-//#include <iostream>
-//using namespace std;
-
-namespace PokemonAutomation{
-namespace HexGenerator{
-
-
-const std::string MultiHostTable::OPTION_TYPE = "MultiHostTable";
-
-int MultiHostTable_init = register_option(
-    MultiHostTable::OPTION_TYPE,
-        [](const JsonObject& obj){
-        return std::unique_ptr<ConfigItem>(
-            new MultiHostTable(obj)
-        );
-    }
-);
-
-
-MultiHostTable::MultiHostTable(const JsonObject& obj)
-    : SingleStatementOption(obj)
-    , m_table(false)
-{
-    m_table.load_json(obj.get_value_throw(JSON_CURRENT));
-}
-std::string MultiHostTable::check_validity() const{
-    return m_table.check_validity();
-}
-void MultiHostTable::restore_defaults(){
-    m_table.restore_defaults();
-}
-JsonObject MultiHostTable::to_json() const{
-    JsonObject root = SingleStatementOption::to_json();
-    root[JSON_CURRENT] = m_table.to_json();
-    return root;
-}
-std::string MultiHostTable::to_cpp() const{
-    std::string str;
-    str += m_declaration;
-    str += " = {\r\n";
-    std::vector<std::unique_ptr<NintendoSwitch::PokemonSwSh::MultiHostSlot>> list = m_table.copy_snapshot();
-    for (size_t c = 0; c < list.size(); c++){
-        const NintendoSwitch::PokemonSwSh::MultiHostSlot& item = *list[c];
-        str += "    {\r\n";
-        str += std::string("        .game_slot        = ") + std::to_string(item.game_slot.current_value()) + ",\r\n";
-        str += std::string("        .user_slot        = ") + std::to_string(item.user_slot.current_value()) + ",\r\n";
-        str += std::string("        .skips            = ") + std::to_string(item.skips) + ",\r\n";
-        str += std::string("        .backup_save      = ") + (item.backup_save ? "true" : "false") + ",\r\n";
-        str += std::string("        .always_catchable = ") + (item.always_catchable ? "true" : "false") + ",\r\n";
-        str += std::string("        .accept_FRs       = ") + (item.accept_FRs ? "true" : "false") + ",\r\n";
-        str += std::string("        .move_slot        = ") + std::to_string(item.move_slot) + ",\r\n";
-        str += std::string("        .dynamax          = ") + (item.dynamax ? "true" : "false") + ",\r\n";
-        str += std::string("        .post_raid_delay  = ") + item.post_raid_delay.current_text() + ",\r\n";
-        str += "    },\r\n";
-    }
-    str += "    {},\r\n";
-    str += "};\r\n";
-    return str;
-}
-QWidget* MultiHostTable::make_ui(QWidget& parent){
-    return &m_table.make_QtWidget(parent)->widget();
-}
-
-
-
-}
-}
-
-
diff --git a/HexGenerator/Source/Options/MultiHostTable.h b/HexGenerator/Source/Options/MultiHostTable.h
deleted file mode 100644
index 53e15e449e..0000000000
--- a/HexGenerator/Source/Options/MultiHostTable.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*  Multi-Host Table
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_MultiHostTable_H
-#define PokemonAutomation_MultiHostTable_H
-
-#include <vector>
-#include <QTableWidget>
-#include <QComboBox>
-#include <QCheckBox>
-#include <QPushButton>
-#include "Common/PokemonSwSh/PokemonSwSh_MultiHostTable.h"
-#include "SingleStatementOption.h"
-
-namespace PokemonAutomation{
-namespace HexGenerator{
-
-
-class MultiHostTable : public SingleStatementOption{
-public:
-    static const std::string OPTION_TYPE;
-
-public:
-    MultiHostTable(const JsonObject& obj);
-
-    virtual const std::string& type() const override{ return OPTION_TYPE; }
-    virtual std::string check_validity() const override;
-    virtual void restore_defaults() override;
-
-    virtual JsonObject to_json() const override;
-    virtual std::string to_cpp() const override;
-
-    virtual QWidget* make_ui(QWidget& parent) override;
-
-private:
-    friend class MultiHostTableUI;
-    NintendoSwitch::PokemonSwSh::MultiHostTable m_table;
-};
-
-
-
-}
-}
-#endif
diff --git a/HexGenerator/Source/Options/RandomCodeOption.cpp b/HexGenerator/Source/Options/RandomCodeOption.cpp
deleted file mode 100644
index 9ec63feac5..0000000000
--- a/HexGenerator/Source/Options/RandomCodeOption.cpp
+++ /dev/null
@@ -1,210 +0,0 @@
-/*  RandomCode
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <QHBoxLayout>
-#include <QLineEdit>
-#include <QIntValidator>
-#include "Common/Cpp/Exceptions.h"
-#include "Common/Cpp/Json/JsonObject.h"
-#include "Common/Qt/CodeValidator.h"
-#include "RandomCodeOption.h"
-
-namespace PokemonAutomation{
-namespace HexGenerator{
-
-
-const std::string RandomCode::OPTION_TYPE               = "RandomCode";
-const std::string RandomCode::JSON_DECLARATION_RANDOM   = "02-DeclarationRandom";
-const std::string RandomCode::JSON_DECLARATION_CODE     = "03-DeclarationCode";
-const std::string RandomCode::JSON_DIGITS               = "04-Digits";
-const std::string RandomCode::JSON_DEFAULT_RANDOM       = "05-DefaultRandom";
-const std::string RandomCode::JSON_DEFAULT_CODE         = "06-DefaultCode";
-const std::string RandomCode::JSON_CURRENT_RANDOM       = "07-CurrentRandom";
-const std::string RandomCode::JSON_CURRENT_CODE         = "08-CurrentCode";
-
-int RandomCode_init = register_option(
-    RandomCode::OPTION_TYPE,
-        [](const JsonObject& obj){
-        return std::unique_ptr<ConfigItem>(
-            new RandomCode(obj)
-        );
-    }
-);
-
-
-RandomCode::RandomCode(const JsonObject& obj)
-    : ConfigItem(obj)
-    , m_declaration_random(obj.get_string_throw(JSON_DECLARATION_RANDOM))
-    , m_declaration_code(obj.get_string_throw(JSON_DECLARATION_CODE))
-    , m_digits(obj.get_integer_throw(JSON_DIGITS))
-    , m_default_random(obj.get_integer_throw(JSON_DEFAULT_RANDOM))
-    , m_default_code(obj.get_string_throw(JSON_DEFAULT_CODE))
-    , m_current_random(obj.get_integer_throw(JSON_CURRENT_RANDOM))
-    , m_current_code(obj.get_string_throw(JSON_CURRENT_CODE))
-{
-    if (m_default_random > m_digits){
-        m_default_random = m_digits;
-    }
-    if (m_current_random > m_digits){
-        m_current_random = m_digits;
-    }
-    if (!validate_code(m_digits, m_default_code)){
-        throw ParseException("Invalid code.");
-    }
-    if (!validate_code(m_digits, m_current_code)){
-        throw ParseException("Invalid code.");
-    }
-}
-void RandomCode::restore_defaults(){
-    m_current_random = m_default_random;
-    m_current_code = m_default_code;
-}
-std::string RandomCode::check_validity() const{
-    if (m_current_random == 0){
-        return validate_code(m_digits, m_current_code)
-            ? std::string()
-            : "Code is invalid.";
-    }else{
-        return m_current_random <= m_digits
-            ? std::string()
-            : "Random digits cannot be greater than " + std::to_string(m_digits) + ".";
-    }
-}
-JsonObject RandomCode::to_json() const{
-    JsonObject root = ConfigItem::to_json();
-    root[JSON_DECLARATION_RANDOM] = m_declaration_random;
-    root[JSON_DECLARATION_CODE] = m_declaration_code;
-    root[JSON_DIGITS] = m_digits;
-    root[JSON_DEFAULT_RANDOM] = m_default_random;
-    root[JSON_DEFAULT_CODE] = m_default_code;
-    root[JSON_CURRENT_RANDOM] = m_current_random;
-    root[JSON_CURRENT_CODE] = m_current_code;
-    return root;
-}
-std::string RandomCode::to_cpp() const{
-    std::string str;
-
-    str += m_declaration_random;
-    str += " = " + std::to_string(m_current_random);
-    str += ";\r\n";
-
-    str += m_declaration_code;
-    str += " = \"";
-    str += m_current_code;
-    str += "\";\r\n";
-
-    return str;
-}
-QWidget* RandomCode::make_ui(QWidget& parent){
-    return new RandomCodeUI(parent, *this, m_label);
-}
-
-
-std::string RandomCodeUI::sanitized_code(const std::string& text) const{
-    if (text.empty()){
-        return "<font color=\"blue\">No Raid Code</font>";
-    }
-    std::string message;
-    try{
-        message = "Fixed Raid Code: " + sanitize_code(m_value.m_digits, text);
-    }catch (const ParseException& e){
-        message = "<font color=\"red\">" + e.message() + "</font>";
-    }
-    return message;
-}
-std::string RandomCodeUI::random_code_string() const{
-    std::string str;
-    char ch = 'A' - 1;
-    size_t c = 0;
-    for (; c < m_value.m_current_random; c++){
-        ch++;
-        str += ch;
-    }
-    for (; c < m_value.m_digits; c++){
-        str += ch;
-    }
-    return str;
-}
-void RandomCodeUI::update_labels(){
-    if (m_value.m_current_random == 0){
-        m_label_code->setText("Raid Code: ");
-        m_under_text->setText(QString::fromStdString(sanitized_code(m_value.m_current_code)));
-    }else{
-        m_label_code->setText("RNG Seed: ");
-        m_under_text->setText(QString::fromStdString("Random Code: " + random_code_string()));
-    }
-}
-
-RandomCodeUI::RandomCodeUI(QWidget& parent, RandomCode& value, const std::string& label)
-    : QWidget(&parent)
-    , m_value(value)
-{
-    QHBoxLayout* layout = new QHBoxLayout(this);
-    QLabel* text = new QLabel(QString::fromStdString(label), this);
-    layout->addWidget(text, 1);
-    text->setWordWrap(true);
-
-    QVBoxLayout* right = new QVBoxLayout();
-    layout->addLayout(right, 1);
-
-    QLineEdit* box_random;
-    {
-        QHBoxLayout* box_row = new QHBoxLayout();
-        right->addLayout(box_row);
-
-        box_row->addWidget(new QLabel("Random Digits: ", this), 1);
-
-        box_random = new QLineEdit(QString::number(m_value.m_current_random), this);
-        box_row->addWidget(box_random, 1);
-        box_random->setValidator(new QIntValidator(0, m_value.m_digits, this));
-    }
-    QLineEdit* box_code;
-    {
-        QHBoxLayout* box_row = new QHBoxLayout();
-        right->addLayout(box_row);
-
-        m_label_code = new QLabel("Raid Code: ", this);
-        box_row->addWidget(m_label_code, 1);
-
-        box_code = new QLineEdit(QString::fromStdString(m_value.m_current_code), this);
-        box_row->addWidget(box_code, 1);
-    }
-    m_under_text = new QLabel(QString::fromStdString(sanitized_code(m_value.m_current_code)), this);
-    right->addWidget(m_under_text);
-    update_labels();
-
-    connect(
-        box_random, &QLineEdit::textChanged,
-        this, [=](const QString& text){
-            int read = text.toInt();
-            if (read < 0){
-                read = 0;
-                box_random->setText(QString::number(read));
-            }
-            if (read > (int)m_value.m_digits){
-                read = (int)m_value.m_digits;
-                box_random->setText(QString::number(read));
-            }
-            m_value.m_current_random = read;
-            update_labels();
-        }
-    );
-    connect(
-        box_code, &QLineEdit::textChanged,
-        this, [=](const QString& text){
-            m_value.m_current_code = text.toStdString();
-            update_labels();
-        }
-    );
-}
-RandomCodeUI::~RandomCodeUI(){
-
-}
-
-
-
-}
-}
diff --git a/HexGenerator/Source/Options/RandomCodeOption.h b/HexGenerator/Source/Options/RandomCodeOption.h
deleted file mode 100644
index 0bc7d33f49..0000000000
--- a/HexGenerator/Source/Options/RandomCodeOption.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*  RandomCode
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_RandomCode_H
-#define PokemonAutomation_RandomCode_H
-
-#include <QLabel>
-#include "ConfigItem.h"
-
-namespace PokemonAutomation{
-namespace HexGenerator{
-
-
-class RandomCode : public ConfigItem{
-public:
-    static const std::string OPTION_TYPE;
-    static const std::string JSON_DECLARATION_RANDOM;
-    static const std::string JSON_DECLARATION_CODE;
-    static const std::string JSON_DIGITS;
-    static const std::string JSON_DEFAULT_RANDOM;
-    static const std::string JSON_DEFAULT_CODE;
-    static const std::string JSON_CURRENT_RANDOM;
-    static const std::string JSON_CURRENT_CODE;
-
-public:
-    RandomCode(const JsonObject& obj);
-
-    virtual const std::string& type() const override{ return OPTION_TYPE; }
-    virtual std::string check_validity() const override;
-    virtual void restore_defaults() override;
-
-    virtual JsonObject to_json() const override;
-    virtual std::string to_cpp() const override;
-
-    virtual QWidget* make_ui(QWidget& parent) override;
-
-private:
-    friend class RandomCodeUI;
-    std::string m_declaration_random;
-    std::string m_declaration_code;
-    size_t m_digits;
-    size_t m_default_random;
-    std::string m_default_code;
-    size_t m_current_random;
-    std::string m_current_code;
-};
-
-
-
-class RandomCodeUI : public QWidget{
-public:
-    RandomCodeUI(QWidget& parent, RandomCode& value, const std::string& label);
-    virtual ~RandomCodeUI();
-
-private:
-    std::string sanitized_code(const std::string& text) const;
-    std::string random_code_string() const;
-    void update_labels();
-
-private:
-    RandomCode& m_value;
-    QLabel* m_label_code;
-    QLabel* m_under_text;
-};
-
-
-
-}
-}
-#endif
diff --git a/HexGenerator/Source/Options/SimpleInteger.cpp b/HexGenerator/Source/Options/SimpleInteger.cpp
deleted file mode 100644
index 8ccc8dd361..0000000000
--- a/HexGenerator/Source/Options/SimpleInteger.cpp
+++ /dev/null
@@ -1,80 +0,0 @@
-/*  Simple Integer
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Cpp/Json/JsonValue.h"
-#include "Common/Cpp/Json/JsonObject.h"
-#include "Common/Cpp/Json/JsonTools.h"
-#include "Common/Qt/Options/ConfigWidget.h"
-#include "Tools/Tools.h"
-#include "SimpleInteger.h"
-
-namespace PokemonAutomation{
-namespace HexGenerator{
-
-
-const std::string SimpleInteger::OPTION_TYPE = "SimpleInteger";
-const std::string SimpleInteger::JSON_MIN_VALUE = "03-MinValue";
-const std::string SimpleInteger::JSON_MAX_VALUE = "04-MaxValue";
-
-
-int SimpleInteger_init = register_option(
-    SimpleInteger::OPTION_TYPE,
-        [](const JsonObject& obj){
-        return std::unique_ptr<ConfigItem>(
-            new SimpleInteger(obj)
-        );
-    }
-);
-
-SimpleInteger::SimpleInteger(const JsonObject& obj)
-    : SingleStatementOption(obj)
-    , m_option(
-        SingleStatementOption::m_label,
-        LockWhileRunning::LOCKED,
-        obj.get_integer_throw(JSON_DEFAULT),
-        obj.get_integer_throw(JSON_MIN_VALUE),
-        obj.get_integer_throw(JSON_MAX_VALUE)
-    )
-{
-    m_option.set((uint32_t)obj.get_integer_throw(JSON_CURRENT));
-}
-std::string SimpleInteger::check_validity() const{
-    return m_option.check_validity();
-}
-void SimpleInteger::restore_defaults(){
-    m_option.restore_defaults();
-}
-JsonObject SimpleInteger::to_json() const{
-    JsonObject root = SingleStatementOption::to_json();
-    root[JSON_MIN_VALUE] = m_option.min_value();
-    root[JSON_MAX_VALUE] = m_option.max_value();
-    root[JSON_DEFAULT] = m_option.default_value();
-    root[JSON_CURRENT] = (uint32_t)m_option;
-    return root;
-}
-std::string SimpleInteger::to_cpp() const{
-    std::string str;
-    str += m_declaration;
-    str += " = ";
-    str += std::to_string(m_option);
-    str += ";\r\n";
-    return str;
-}
-QWidget* SimpleInteger::make_ui(QWidget& parent){
-    return &m_option.make_QtWidget(parent)->widget();
-}
-
-
-
-
-
-}
-}
-
-
-
-
-
diff --git a/HexGenerator/Source/Options/SimpleInteger.h b/HexGenerator/Source/Options/SimpleInteger.h
deleted file mode 100644
index 132d03c213..0000000000
--- a/HexGenerator/Source/Options/SimpleInteger.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*  Simple Integer
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_SimpleInteger_H
-#define PokemonAutomation_SimpleInteger_H
-
-#include "Common/Cpp/Options/SimpleIntegerOption.h"
-#include "SingleStatementOption.h"
-
-namespace PokemonAutomation{
-namespace HexGenerator{
-
-
-class SimpleInteger : public SingleStatementOption{
-public:
-    static const std::string OPTION_TYPE;
-    static const std::string JSON_MIN_VALUE;
-    static const std::string JSON_MAX_VALUE;
-
-public:
-    SimpleInteger(const JsonObject& obj);
-
-    virtual const std::string& type() const override{ return OPTION_TYPE; }
-    virtual std::string check_validity() const override;
-    virtual void restore_defaults() override;
-
-    virtual JsonObject to_json() const override;
-    virtual std::string to_cpp() const override;
-
-    virtual QWidget* make_ui(QWidget& parent) override;
-
-private:
-    SimpleIntegerOption<uint32_t> m_option;
-};
-
-
-
-}
-}
-#endif
-
-
diff --git a/HexGenerator/Source/Options/SingleStatementOption.cpp b/HexGenerator/Source/Options/SingleStatementOption.cpp
deleted file mode 100644
index 3324d71085..0000000000
--- a/HexGenerator/Source/Options/SingleStatementOption.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-/*  Configurable Option
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <map>
-#include "Common/Cpp/Json/JsonObject.h"
-#include "Tools/Tools.h"
-#include "SingleStatementOption.h"
-
-namespace PokemonAutomation{
-namespace HexGenerator{
-
-const std::string SingleStatementOption::JSON_DECLARATION  = "02-Declaration";
-const std::string SingleStatementOption::JSON_DEFAULT      = "98-Default";
-const std::string SingleStatementOption::JSON_CURRENT      = "99-Current";
-
-SingleStatementOption::SingleStatementOption(const JsonObject& obj)
-    : ConfigItem(obj)
-    , m_declaration(obj.get_string_throw(JSON_DECLARATION))
-{}
-
-JsonObject SingleStatementOption::to_json() const{
-    JsonObject root = ConfigItem::to_json();
-    root[JSON_DECLARATION] = m_declaration;
-    return root;
-}
-
-
-
-}
-}
-
-
-
-
-
-
-
diff --git a/HexGenerator/Source/Options/SingleStatementOption.h b/HexGenerator/Source/Options/SingleStatementOption.h
deleted file mode 100644
index 2f0435d70a..0000000000
--- a/HexGenerator/Source/Options/SingleStatementOption.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*  Single-Statement Option
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_SingleStatementOption_H
-#define PokemonAutomation_SingleStatementOption_H
-
-#include <memory>
-#include <QWidget>
-#include "ConfigItem.h"
-
-namespace PokemonAutomation{
-namespace HexGenerator{
-
-
-class SingleStatementOption : public ConfigItem{
-public:
-    static const std::string JSON_DECLARATION;
-    static const std::string JSON_DEFAULT;
-    static const std::string JSON_CURRENT;
-
-public:
-    SingleStatementOption(const JsonObject& obj);
-
-    virtual JsonObject to_json() const;
-
-protected:
-    std::string m_declaration;
-};
-
-
-
-}
-}
-#endif
diff --git a/HexGenerator/Source/Options/TimeExpression.cpp b/HexGenerator/Source/Options/TimeExpression.cpp
deleted file mode 100644
index a7c6028545..0000000000
--- a/HexGenerator/Source/Options/TimeExpression.cpp
+++ /dev/null
@@ -1,83 +0,0 @@
-/*  Time Option
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QLineEdit>
-#include "Common/Cpp/PrettyPrint.h"
-#include "Common/Cpp/Json/JsonValue.h"
-#include "Common/Cpp/Json/JsonObject.h"
-#include "Common/Cpp/Json/JsonTools.h"
-#include "Common/Qt/ExpressionEvaluator.h"
-#include "Common/Qt/Options/ConfigWidget.h"
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-#include "Tools/Tools.h"
-#include "TimeExpression.h"
-
-namespace PokemonAutomation{
-namespace HexGenerator{
-
-
-const std::string TimeExpression::OPTION_TYPE = "TimeExpression";
-const std::string TimeExpression::JSON_MIN_VALUE = "03-MinValue";
-const std::string TimeExpression::JSON_MAX_VALUE = "04-MaxValue";
-
-
-int TimeExpression_init = register_option(
-    TimeExpression::OPTION_TYPE,
-        [](const JsonObject& obj){
-        return std::unique_ptr<ConfigItem>(
-            new TimeExpression(obj)
-        );
-    }
-);
-
-
-TimeExpression::TimeExpression(const JsonObject& obj)
-    : SingleStatementOption(obj)
-    , m_option(
-        SingleStatementOption::m_label,
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        obj.get_integer_throw(JSON_MIN_VALUE),
-        obj.get_integer_throw(JSON_MAX_VALUE),
-        obj.get_string_throw(JSON_DEFAULT)
-    )
-{
-    m_option.set(obj.get_string_throw(JSON_CURRENT));
-}
-
-std::string TimeExpression::check_validity() const{
-    return m_option.check_validity();
-}
-void TimeExpression::restore_defaults(){
-    m_option.restore_defaults();
-}
-JsonObject TimeExpression::to_json() const{
-    JsonObject root = SingleStatementOption::to_json();
-    root[JSON_MIN_VALUE] = m_option.min_value();
-    root[JSON_MAX_VALUE] = m_option.max_value();
-    root[JSON_DEFAULT] = m_option.default_value();
-    root[JSON_CURRENT] = m_option.current_text();
-    return root;
-}
-std::string TimeExpression::to_cpp() const{
-    std::string str;
-    str += m_declaration;
-    str += " = ";
-    str += std::to_string(m_option.get());
-    str += ";\r\n";
-    return str;
-}
-QWidget* TimeExpression::make_ui(QWidget& parent){
-    return &m_option.make_QtWidget(parent)->widget();
-}
-
-
-
-
-}
-}
diff --git a/HexGenerator/Source/Options/TimeExpression.h b/HexGenerator/Source/Options/TimeExpression.h
deleted file mode 100644
index 8ad611f9d0..0000000000
--- a/HexGenerator/Source/Options/TimeExpression.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*  Time Option
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_TimeOption_H
-#define PokemonAutomation_TimeOption_H
-
-#include "Common/Cpp/Options/TimeExpressionOption.h"
-#include "SingleStatementOption.h"
-
-namespace PokemonAutomation{
-namespace HexGenerator{
-
-
-class TimeExpression : public SingleStatementOption{
-public:
-    static const std::string OPTION_TYPE;
-    static const std::string JSON_MIN_VALUE;
-    static const std::string JSON_MAX_VALUE;
-
-public:
-    TimeExpression(const JsonObject& obj);
-
-    virtual const std::string& type() const override{ return OPTION_TYPE; }
-    std::string check_validity() const override;
-    virtual void restore_defaults() override;
-
-    virtual JsonObject to_json() const override;
-    virtual std::string to_cpp() const override;
-
-    virtual QWidget* make_ui(QWidget& parent) override;
-
-private:
-    TimeExpressionOption<uint32_t> m_option;
-};
-
-
-
-
-}
-}
-#endif
-
-
diff --git a/HexGenerator/Source/Panels/ConfigSet.cpp b/HexGenerator/Source/Panels/ConfigSet.cpp
deleted file mode 100644
index 11ec3d2c78..0000000000
--- a/HexGenerator/Source/Panels/ConfigSet.cpp
+++ /dev/null
@@ -1,164 +0,0 @@
-/*  Parent Class for all Configuration Files
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <QFile>
-#include <QWidget>
-#include <QVBoxLayout>
-#include <QLabel>
-#include <QPushButton>
-#include <QMessageBox>
-#include "Common/Cpp/Exceptions.h"
-#include "Common/Cpp/Json/JsonArray.h"
-#include "Common/Cpp/Json/JsonObject.h"
-#include "Tools/Tools.h"
-#include "Tools/PersistentSettings.h"
-#include "UI/MainWindow.h"
-#include "ConfigSet.h"
-
-namespace PokemonAutomation{
-namespace HexGenerator{
-
-
-const std::string ConfigSet::JSON_CONFIG_NAME   = "0-ConfigName";
-const std::string ConfigSet::JSON_CONFIG_PATH   = "1-ConfigPath";
-const std::string ConfigSet::JSON_DOCUMENTATION = "2-Documentation";
-const std::string ConfigSet::JSON_DESCRIPTION   = "3-Description";
-const std::string ConfigSet::JSON_HEADER        = "4-Header";
-const std::string ConfigSet::JSON_OPTIONS       = "5-Options";
-
-ConfigSet::ConfigSet(std::string category, const JsonObject& obj)
-    : RightPanel(
-        std::move(category),
-        obj.get_string_throw(JSON_CONFIG_NAME),
-        obj.get_string_throw(JSON_DOCUMENTATION)
-    )
-    , m_path(obj.get_string_throw(JSON_CONFIG_PATH))
-    , m_description(obj.get_string_throw(JSON_DESCRIPTION))
-    , m_header(obj.get_string_throw(JSON_HEADER))
-{}
-
-JsonObject ConfigSet::to_json() const{
-    JsonObject root;
-    root[JSON_CONFIG_NAME] = m_name;
-    root[JSON_CONFIG_PATH] = m_path;
-    root[JSON_DOCUMENTATION] = m_name;
-    root[JSON_DESCRIPTION] = m_description;
-    root[JSON_HEADER] = m_header;
-    root[JSON_OPTIONS] = options_json();
-    return root;
-}
-std::string ConfigSet::to_cfile() const{
-    std::string body;
-    body += "//  This file is generated by the UI. There's no point in editing.\r\n";
-    body += "#include \"";
-    body += m_header;
-    body += "\"\r\n";
-    body += options_cpp();
-    return body;
-}
-std::string ConfigSet::save_json() const{
-    std::string name = settings.path + CONFIG_FOLDER_NAME + "/" + m_category + "/" + m_name + ".json";
-    to_json().dump(name);
-    return name;
-}
-std::string ConfigSet::save_cfile() const{
-    std::string name = settings.path + SOURCE_FOLDER_NAME + "/" + m_path + "/"+ m_name + ".c";
-    std::string cpp = to_cfile();
-    QFile file(QString::fromStdString(name));
-    if (!file.open(QFile::WriteOnly)){
-        throw FileException(nullptr, PA_CURRENT_FUNCTION, "Unable to create source file.", name);
-    }
-    if (file.write(cpp.c_str(), cpp.size()) != cpp.size()){
-        throw FileException(nullptr, PA_CURRENT_FUNCTION, "Unable to write source file.", name);
-    }
-    file.close();
-    return name;
-}
-
-
-QWidget* ConfigSet::make_ui(MainWindow& parent){
-    QWidget* box = new QWidget(&parent);
-    QVBoxLayout* layout = new QVBoxLayout(box);
-    layout->setMargin(0);
-//    layout->setAlignment(Qt::AlignTop);
-    layout->addWidget(new QLabel(QString::fromStdString("<b><font size=4>Name:</font></b> " + m_name)));
-    {
-        QLabel* text = new QLabel(QString::fromStdString("<b><font size=4>Description:</font></b> " + m_description));
-        layout->addWidget(text);
-        text->setWordWrap(true);
-    }
-    {
-        std::string path = GITHUB_REPO + m_doc_link;
-        QLabel* text = new QLabel(QString::fromStdString("<font size=4><a href=\"" + path + "\">Online Documentation for " + m_name + "</a></font>"));
-        layout->addWidget(text);
-        text->setTextFormat(Qt::RichText);
-        text->setTextInteractionFlags(Qt::TextBrowserInteraction);
-        text->setOpenExternalLinks(true);
-    }
-    layout->addWidget(make_options_body(*box), Qt::AlignBottom);
-
-    QHBoxLayout* row = new QHBoxLayout();
-    layout->addLayout(row);
-    {
-        QPushButton* button = new QPushButton("Save Settings", box);
-        connect(
-            button, &QPushButton::clicked,
-            this, [&](bool){
-                try{
-                    std::string json = save_json();
-                    std::string cfile = save_cfile();
-                    QMessageBox box;
-                    box.information(nullptr, "Success!", QString::fromStdString("Settings saved to:\n" + json + "\n" + cfile));
-                }catch (const Exception& e){
-                    QMessageBox box;
-                    box.critical(nullptr, "Error", QString::fromStdString(e.message()));
-                    return;
-                }
-            }
-        );
-        row->addWidget(button);
-    }
-    {
-        QPushButton* button = new QPushButton("Restore Defaults", box);
-        connect(
-            button, &QPushButton::clicked,
-            this, [&](bool){
-                restore_defaults();
-                parent.change_panel(*this);
-            }
-        );
-        row->addWidget(button);
-    }
-#if 0
-    {
-        QPushButton* button = new QPushButton("Save and generate .hex file!", box);
-        QFont font = button->font();
-        font.setPointSize(16);
-        button->setFont(font);
-        connect(
-            button, &QPushButton::clicked,
-            this, [&](bool){
-//                save_and_build(mcu_list.get_MCU());
-            }
-        );
-        layout->addWidget(button);
-    }
-#endif
-    return box;
-}
-
-
-
-JsonArray ConfigSet::options_json() const{
-    return JsonArray();
-}
-
-
-
-}
-}
-
-
diff --git a/HexGenerator/Source/Panels/ConfigSet.h b/HexGenerator/Source/Panels/ConfigSet.h
deleted file mode 100644
index 2eecd59fd5..0000000000
--- a/HexGenerator/Source/Panels/ConfigSet.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*  Parent Class for all Configuration Files
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_ConfigSet_H
-#define PokemonAutomation_ConfigSet_H
-
-#include <QObject>
-#include "RightPanel.h"
-
-namespace PokemonAutomation{
-    class JsonArray;
-    class JsonObject;
-namespace HexGenerator{
-
-
-
-class ConfigSet : public RightPanel{
-public:
-    static const std::string JSON_CONFIG_NAME;
-    static const std::string JSON_CONFIG_PATH;
-    static const std::string JSON_DOCUMENTATION;
-    static const std::string JSON_DESCRIPTION;
-    static const std::string JSON_HEADER;
-    static const std::string JSON_OPTIONS;
-
-public:
-    ConfigSet(std::string category, const JsonObject& obj);
-
-    const std::string& description() const{ return m_description; }
-
-    //  Returns error message if invalid. Otherwise returns empty string.
-    virtual std::string check_validity() const{ return std::string(); }
-
-    virtual void restore_defaults(){}
-
-    JsonObject to_json() const;
-    std::string to_cfile() const;
-
-    std::string save_json() const;
-    std::string save_cfile() const;
-
-    virtual QWidget* make_ui(MainWindow& parent) override;
-
-protected:
-    virtual QWidget* make_options_body(QWidget& parent) = 0;
-    virtual JsonArray options_json() const;
-    virtual std::string options_cpp() const{ return ""; }
-
-private:
-    std::string m_path;
-    std::string m_description;
-    std::string m_header;
-};
-
-
-}
-}
-#endif
diff --git a/HexGenerator/Source/Panels/JsonProgram.cpp b/HexGenerator/Source/Panels/JsonProgram.cpp
deleted file mode 100644
index 313e43c732..0000000000
--- a/HexGenerator/Source/Panels/JsonProgram.cpp
+++ /dev/null
@@ -1,91 +0,0 @@
-/*  Program from JSON File.
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <QScrollArea>
-#include <QVBoxLayout>
-#include <QLabel>
-#include "Common/Cpp/Exceptions.h"
-#include "Common/Cpp/Json/JsonArray.h"
-#include "Common/Cpp/Json/JsonObject.h"
-#include "Tools/Tools.h"
-#include "JsonProgram.h"
-
-namespace PokemonAutomation{
-namespace HexGenerator{
-
-
-Program_JsonFile::Program_JsonFile(std::string category, const std::string& filepath)
-    : Program_JsonFile(std::move(category), load_json_file(filepath).get_object_throw())
-{}
-Program_JsonFile::Program_JsonFile(std::string category, const JsonObject& obj)
-    : Program(std::move(category), obj)
-{
-    for (const auto& item : obj.get_array_throw(JSON_PARAMETERS)){
-        m_options.emplace_back(parse_option(item.get_object_throw()));
-    }
-}
-
-std::string Program_JsonFile::check_validity() const{
-    for (const auto& item : m_options){
-        std::string error = item->check_validity();
-        if (!error.empty()){
-            return error;
-        }
-    }
-    return std::string();
-}
-void Program_JsonFile::restore_defaults(){
-    for (const auto& item : m_options){
-        item->restore_defaults();
-    }
-}
-
-JsonArray Program_JsonFile::parameters_json() const{
-    JsonArray params;
-    for (const auto& item : m_options){
-        params.push_back(item->to_json());
-    }
-    return params;
-}
-std::string Program_JsonFile::parameters_cpp() const{
-    std::string str;
-    for (const auto& item : m_options){
-        str += item->to_cpp();
-    }
-    return str;
-}
-
-QWidget* Program_JsonFile::make_options_body(QWidget& parent){
-    QScrollArea* scroll = new QScrollArea(&parent);
-    scroll->setWidgetResizable(true);
-
-    QWidget* box = new QWidget(scroll);
-    box->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
-
-    QVBoxLayout* layout = new QVBoxLayout(box);
-    box->setLayout(layout);
-
-    if (m_options.empty()){
-        QLabel* label = new QLabel("There are no program-specific options for this program.");
-        label->setAlignment(Qt::AlignCenter);
-        layout->addWidget(label);
-    }else{
-        layout->setAlignment(Qt::AlignTop);
-    }
-
-    scroll->setWidget(box);
-
-    for (const auto& item : m_options){
-        QWidget* widget = item->make_ui(*box);
-//        m_widgets.emplace_back(widget);
-        layout->addWidget(widget);
-    }
-    return scroll;
-}
-
-
-}
-}
diff --git a/HexGenerator/Source/Panels/JsonProgram.h b/HexGenerator/Source/Panels/JsonProgram.h
deleted file mode 100644
index 6c0b8c071f..0000000000
--- a/HexGenerator/Source/Panels/JsonProgram.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*  Program from JSON File.
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <memory>
-#include <vector>
-#include "Options/ConfigItem.h"
-#include "Program.h"
-
-namespace PokemonAutomation{
-namespace HexGenerator{
-
-
-class Program_JsonFile : public Program{
-public:
-    Program_JsonFile(std::string category, const std::string& filepath);
-    Program_JsonFile(std::string category, const JsonObject& obj);
-
-    virtual std::string check_validity() const override;
-    virtual void restore_defaults() override;
-
-    virtual JsonArray parameters_json() const override;
-    virtual std::string parameters_cpp() const override;
-
-    virtual QWidget* make_options_body(QWidget& parent) override;
-
-private:
-    std::vector<std::unique_ptr<ConfigItem>> m_options;
-//    std::vector<QWidget*> m_widgets;
-};
-
-
-
-}
-}
diff --git a/HexGenerator/Source/Panels/JsonSettings.cpp b/HexGenerator/Source/Panels/JsonSettings.cpp
deleted file mode 100644
index 7cf7222592..0000000000
--- a/HexGenerator/Source/Panels/JsonSettings.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-/*  Settings from JSON File.
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <QScrollArea>
-#include <QVBoxLayout>
-#include <QLabel>
-#include "Common/Cpp/Exceptions.h"
-#include "Common/Cpp/Json/JsonArray.h"
-#include "Common/Cpp/Json/JsonObject.h"
-#include "Tools/Tools.h"
-#include "JsonSettings.h"
-
-namespace PokemonAutomation{
-namespace HexGenerator{
-
-
-Settings_JsonFile::Settings_JsonFile(std::string category, const std::string& filepath)
-    : Settings_JsonFile(std::move(category), load_json_file(filepath).get_object_throw(filepath))
-{}
-Settings_JsonFile::Settings_JsonFile(std::string category, const JsonObject& obj)
-    : ConfigSet(std::move(category), obj)
-{
-    for (const auto& item : obj.get_array_throw(JSON_OPTIONS)){
-        const JsonObject& obj = item.get_object_throw();
-        m_options.emplace_back(parse_option(obj));
-    }
-}
-
-std::string Settings_JsonFile::check_validity() const{
-    for (const auto& item : m_options){
-        std::string error = item->check_validity();
-        if (!error.empty()){
-            return error;
-        }
-    }
-    return std::string();
-}
-void Settings_JsonFile::restore_defaults(){
-    for (const auto& item : m_options){
-        item->restore_defaults();
-    }
-}
-
-JsonArray Settings_JsonFile::options_json() const{
-    JsonArray params;
-    for (const auto& item : m_options){
-        params.push_back(item->to_json());
-    }
-    return params;
-}
-std::string Settings_JsonFile::options_cpp() const{
-    std::string str;
-    for (const auto& item : m_options){
-        str += item->to_cpp();
-    }
-    return str;
-}
-
-QWidget* Settings_JsonFile::make_options_body(QWidget& parent){
-    QScrollArea* scroll = new QScrollArea(&parent);
-    scroll->setWidgetResizable(true);
-
-    QWidget* box = new QWidget(scroll);
-    box->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
-
-    QVBoxLayout* layout = new QVBoxLayout(box);
-    layout->setAlignment(Qt::AlignTop);
-    box->setLayout(layout);
-
-    scroll->setWidget(box);
-
-    for (const auto& item : m_options){
-        QWidget* widget = item->make_ui(*box);
-//        m_widgets.emplace_back(widget);
-        layout->addWidget(widget);
-    }
-    return scroll;
-}
-
-
-
-}
-}
-
-
diff --git a/HexGenerator/Source/Panels/JsonSettings.h b/HexGenerator/Source/Panels/JsonSettings.h
deleted file mode 100644
index f0eb8d9017..0000000000
--- a/HexGenerator/Source/Panels/JsonSettings.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*  Settings from JSON File.
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <memory>
-#include <vector>
-#include "Options/ConfigItem.h"
-#include "ConfigSet.h"
-
-namespace PokemonAutomation{
-    class JsonArray;
-namespace HexGenerator{
-
-
-
-class Settings_JsonFile : public ConfigSet{
-public:
-    Settings_JsonFile(std::string category, const std::string& filepath);
-    Settings_JsonFile(std::string category, const JsonObject& obj);
-
-    virtual std::string check_validity() const override;
-    virtual void restore_defaults() override;
-
-    virtual JsonArray options_json() const override;
-    virtual std::string options_cpp() const override;
-
-    virtual QWidget* make_options_body(QWidget& parent) override;
-
-private:
-    std::vector<std::unique_ptr<ConfigItem>> m_options;
-};
-
-
-}
-}
diff --git a/HexGenerator/Source/Panels/PanelList.cpp b/HexGenerator/Source/Panels/PanelList.cpp
deleted file mode 100644
index 0ca90ecd7c..0000000000
--- a/HexGenerator/Source/Panels/PanelList.cpp
+++ /dev/null
@@ -1,120 +0,0 @@
-/*  Panel List
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <QFile>
-#include <QTextStream>
-#include "Common/Cpp/Exceptions.h"
-#include "Common/Cpp/Json/JsonArray.h"
-#include "Common/Cpp/Json/JsonObject.h"
-#include "Tools/PersistentSettings.h"
-#include "UI/MainWindow.h"
-#include "JsonSettings.h"
-#include "JsonProgram.h"
-#include "PanelList.h"
-
-#include <iostream>
-using std::cout;
-using std::endl;
-
-namespace PokemonAutomation{
-namespace HexGenerator{
-
-PanelList::PanelList(QWidget& parent, MainWindow& window, const JsonValue& json)
-    : QListWidget(&parent)
-    , m_window(window)
-{
-    const JsonObject& category = json.get_object_throw();
-
-    const std::string& category_name = category.get_string_throw("Name");
-    m_display_name = category.get_string_throw("Display");
-
-    //  Populate Settings
-//    std::vector<QString> settings_list;
-    bool first = true;
-    for (const auto& item : category.get_array_throw("Settings")){
-        const std::string& setting = item.get_string_throw();
-//        settings.emplace_back(setting.toString());
-//        m_list.emplace_back();
-//        cout << setting.toUtf8().data() << endl;
-        try{
-            std::string path = settings.path + CONFIG_FOLDER_NAME + "/" + category_name + "/" + setting + ".json";
-            std::unique_ptr<RightPanel> config(new Settings_JsonFile(category_name, path));
-//            m_list.emplace_back(std::move(config));
-            const std::string& name = config->name();
-            if (!m_map.emplace(name, std::move(config)).second){
-                throw ParseException("Duplicate: Program name");
-            }
-            if (first){
-                addItem("---- Settings ----");
-                QListWidgetItem* list_item = this->item(this->count() - 1);
-                QFont font = list_item->font();
-                font.setBold(true);
-                list_item->setFont(font);
-                first = false;
-            }
-            addItem(QString::fromStdString(name));
-        }catch (const Exception& e){
-            cout << "Error: " << e.message() << endl;
-        }
-    }
-
-    //  Populate Programs
-    std::string path = settings.path + SOURCE_FOLDER_NAME + "/" + category_name + "/ProgramList.txt";
-    QFile file(QString::fromStdString(path));
-    if (file.open(QFile::ReadOnly)){
-        cout << "File = " << path << endl;
-        QTextStream stream(&file);
-        while (!stream.atEnd()){
-            std::string line = stream.readLine().toStdString();
-            if (line.empty()){
-                continue;
-            }
-            cout << "Open: " << line << endl;
-
-            //  Divider
-            if (line[0] == '-'){
-                addItem(QString::fromStdString(line));
-                QListWidgetItem* list_item = this->item(this->count() - 1);
-                QFont font = list_item->font();
-                font.setBold(true);
-                list_item->setFont(font);
-                continue;
-            }
-
-            //  Program
-            try{
-                std::string path = settings.path + CONFIG_FOLDER_NAME + "/" + category_name + "/" + line + ".json";
-                std::unique_ptr<RightPanel> config(new Program_JsonFile(category_name, path));
-//                m_list.emplace_back(std::move(config));
-                const std::string& name = config->name();
-                if (!m_map.emplace(name, std::move(config)).second){
-                    throw ParseException("Duplicate: Program name");
-                }
-                addItem(QString::fromStdString(name));
-            }catch (const Exception& e){
-                cout << "Error: " << e.message() << endl;
-            }
-        }
-        file.close();
-    }
-
-
-    connect(this, &QListWidget::itemClicked, this, &PanelList::row_selected);
-}
-
-void PanelList::row_selected(QListWidgetItem* item){
-    auto iter = m_map.find(item->text().toStdString());
-    if (iter == m_map.end()){
-//        std::cout << item->text().toUtf8().data() << std::endl;
-//        PA_THROW_StringException("Invalid program name: " + item->text());
-        return;
-    }
-    m_window.change_panel(*iter->second);
-}
-
-
-}
-}
diff --git a/HexGenerator/Source/Panels/PanelList.h b/HexGenerator/Source/Panels/PanelList.h
deleted file mode 100644
index 7ae30ec509..0000000000
--- a/HexGenerator/Source/Panels/PanelList.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*  Panel List
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PanelList_H
-#define PokemonAutomation_PanelList_H
-
-#include <memory>
-#include <QListWidget>
-#include "ConfigSet.h"
-
-namespace PokemonAutomation{
-    class JsonValue;
-namespace HexGenerator{
-
-
-
-class PanelList : public QListWidget{
-public:
-    PanelList(QWidget& parent, MainWindow& window, const JsonValue& json);
-
-    const std::string& display_name() const{ return m_display_name; }
-
-public slots:
-    void row_selected(QListWidgetItem* item);
-
-private:
-    MainWindow& m_window;
-    std::string m_display_name;
-    std::map<std::string, std::unique_ptr<RightPanel>> m_map;
-};
-
-
-}
-}
-#endif
diff --git a/HexGenerator/Source/Panels/PanelLists.cpp b/HexGenerator/Source/Panels/PanelLists.cpp
deleted file mode 100644
index b574e81976..0000000000
--- a/HexGenerator/Source/Panels/PanelLists.cpp
+++ /dev/null
@@ -1,57 +0,0 @@
-/*  Program Tabs
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <QFile>
-#include <QLabel>
-#include <QMessageBox>
-#include "Common/Cpp/Exceptions.h"
-#include "Common/Cpp/Json/JsonValue.h"
-#include "Common/Cpp/Json/JsonArray.h"
-#include "Tools/PersistentSettings.h"
-#include "PanelList.h"
-#include "PanelLists.h"
-
-//#include <iostream>
-//using std::cout;
-//using std::endl;
-
-namespace PokemonAutomation{
-namespace HexGenerator{
-
-PanelLists::PanelLists(QWidget& parent, MainWindow& window)
-    : QTabWidget(&parent)
-{
-    std::string path = settings.path + CONFIG_FOLDER_NAME + "/Categories.json";
-
-    JsonValue json;
-    try{
-        json = load_json_file(path);
-        for (const auto& item : json.get_array_throw(path)){
-            try{
-                PanelList* tab = new PanelList(*this, window, item);
-                addTab(tab, QString::fromStdString(tab->display_name()));
-                if (tab->count() == 0){
-                    setTabEnabled(this->count() - 1, false);
-                }
-            }catch (Exception&){
-                continue;
-            }
-        }
-    }catch (ParseException&){
-        QMessageBox box;
-        box.critical(nullptr, "Error", "Unable to open program list: " + QString::fromStdString(path));
-        return;
-    }
-
-
-
-
-}
-
-
-}
-}
-
diff --git a/HexGenerator/Source/Panels/PanelLists.h b/HexGenerator/Source/Panels/PanelLists.h
deleted file mode 100644
index 2a1e830f9d..0000000000
--- a/HexGenerator/Source/Panels/PanelLists.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*  Panel Lists
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PanelLists_H
-#define PokemonAutomation_PanelLists_H
-
-#include <QTabWidget>
-
-namespace PokemonAutomation{
-namespace HexGenerator{
-
-
-class MainWindow;
-
-
-class PanelLists : public QTabWidget{
-public:
-    PanelLists(QWidget& parent, MainWindow& window);
-
-private:
-};
-
-
-}
-}
-#endif
diff --git a/HexGenerator/Source/Panels/Program.cpp b/HexGenerator/Source/Panels/Program.cpp
deleted file mode 100644
index 94b5df57d6..0000000000
--- a/HexGenerator/Source/Panels/Program.cpp
+++ /dev/null
@@ -1,256 +0,0 @@
-/*  Parent Class for all Programs
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <iostream>
-using std::cout;
-using std::endl;
-
-#include <QDir>
-#include <QFile>
-#include <QLayout>
-#include <QVBoxLayout>
-#include <QLabel>
-#include <QPushButton>
-#include <QMessageBox>
-#include "Common/Cpp/Exceptions.h"
-#include "Common/Cpp/Json/JsonArray.h"
-#include "Common/Cpp/Json/JsonObject.h"
-#include "Tools/Tools.h"
-#include "Tools/PersistentSettings.h"
-#include "UI/MainWindow.h"
-#include "Program.h"
-
-namespace PokemonAutomation{
-namespace HexGenerator{
-
-
-const std::string Program::JSON_PROGRAM_NAME    = "0-ProgramName";
-const std::string Program::JSON_DOCUMENTATION   = "1-Documentation";
-const std::string Program::JSON_DESCRIPTION     = "2-Description";
-const std::string Program::JSON_PARAMETERS      = "3-Parameters";
-
-
-const std::string Program::BUILD_BUTTON_NORMAL  = "Save and generate .hex file!";
-const std::string Program::BUILD_BUTTON_BUSY    = "Build in progress... Please Wait.";
-
-Program::Program(std::string category, std::string name, std::string description, std::string doc_link)
-    : RightPanel(
-        std::move(category),
-        std::move(name),
-        std::move(doc_link)
-    )
-    , m_description(std::move(description))
-{}
-Program::Program(std::string category, const JsonObject& obj)
-    : RightPanel(
-        std::move(category),
-        obj.get_string_throw(JSON_PROGRAM_NAME),
-        obj.get_string_throw(JSON_DOCUMENTATION)
-    )
-    , m_description(obj.get_string_throw(JSON_DESCRIPTION))
-{}
-Program::~Program(){
-    if (m_builder.joinable()){
-        m_builder.join();
-    }
-}
-
-QWidget* Program::make_options_body(QWidget& parent){
-    QWidget* box = new QWidget(&parent);
-    QVBoxLayout* layout = new QVBoxLayout(box);
-    QLabel* label = new QLabel("There are no program-specific options for this program.");
-    label->setAlignment(Qt::AlignCenter);
-    layout->addWidget(label);
-    return box;
-}
-
-JsonArray Program::parameters_json() const{
-    return JsonArray();
-}
-
-JsonObject Program::to_json() const{
-    JsonObject root;
-    root[JSON_PROGRAM_NAME] = m_name;
-    root[JSON_DOCUMENTATION] = m_doc_link;
-    root[JSON_DESCRIPTION] = m_description;
-    root[JSON_PARAMETERS] = parameters_json();
-    return root;
-}
-std::string Program::to_cfile() const{
-    std::string body;
-    body += "//  This file is generated by the UI. There's no point in editing.\r\n";
-    body += "#include \"";
-    body += "../NativePrograms/";
-    body += m_category;
-    body += "/Programs/";
-    body += m_name;
-    body += ".h\"\r\n";
-    body += parameters_cpp();
-    return body;
-}
-std::string Program::save_json() const{
-//    cout << QCoreApplication::applicationDirPath().toUtf8().data() << endl;
-    std::string name = settings.path + CONFIG_FOLDER_NAME + "/" + m_category + "/" + m_name + ".json";
-    to_json().dump(name);
-    return name;
-}
-std::string Program::save_cfile() const{
-    std::string name = settings.path + SOURCE_FOLDER_NAME + "/" + m_category + "/" + m_name + ".c";
-    std::string cpp = to_cfile();
-    QFile file(QString::fromStdString(name));
-    if (!file.open(QFile::WriteOnly)){
-        throw FileException(nullptr, PA_CURRENT_FUNCTION, "Unable to create source file.", name);
-    }
-    if (file.write(cpp.c_str(), cpp.size()) != cpp.size()){
-        throw FileException(nullptr, PA_CURRENT_FUNCTION, "Unable to write source file.", name);
-    }
-    file.close();
-    return name;
-}
-
-class ButtonRestore{
-public:
-    ButtonRestore(QPushButton* button)
-        : m_button(button)
-    {}
-    ~ButtonRestore(){
-        QPushButton* button = m_button;
-        run_on_main_thread([=]{
-            button->setText(QString::fromStdString(Program::BUILD_BUTTON_NORMAL));
-        });
-    }
-private:
-    QPushButton* m_button;
-};
-
-void Program::save_and_build(const std::string& board){
-//        cout << "asdf" << endl;
-    std::string error = check_validity();
-    if (!error.empty()){
-        QMessageBox box;
-        box.critical(nullptr, "Error", QString::fromStdString(error));
-        return;
-    }
-//    if (!QDir(settings.config_path).exists()){
-//        QMessageBox box;
-//        box.critical(nullptr, "Error", "Source directory not found. Please unzip the package if you haven't already.");
-//        return;
-//    }
-
-    if (m_builder.joinable()){
-        m_builder.join();
-    }
-
-    m_build_button->setText(QString::fromStdString(BUILD_BUTTON_BUSY));
-    m_builder = std::thread([=]{
-        ButtonRestore restore(m_build_button);
-        try{
-            save_json();
-            save_cfile();
-        }catch (const Exception& e){
-            QString error = QString::fromStdString(e.message());
-            run_on_main_thread([=]{
-                QMessageBox box;
-                box.critical(nullptr, "Error", error);
-            });
-            return;
-        }
-
-        //  Build
-        std::string hex_file = settings.path + m_category + "-" + m_name + ("-" + board + ".hex").c_str();
-        std::string log_file = settings.path + LOG_FOLDER_NAME + "/" + m_name + ("-" + board).c_str() + ".log";
-        if (build_hexfile(board, m_category, m_name, hex_file, log_file) != 0){
-            return;
-        }
-
-        //  Report results.
-        run_on_main_thread([=]{
-            if (QFileInfo(QString::fromStdString(hex_file)).exists()){
-                QMessageBox box;
-                box.information(nullptr, "Success!", QString::fromStdString(".hex file has been built!\r\n" + hex_file));
-            }else{
-                QMessageBox box;
-                box.critical(nullptr, "Error", QString::fromStdString(".hex was not built. Please check error log.\r\n" + log_file));
-            }
-        });
-    });
-}
-
-QWidget* Program::make_ui(MainWindow& parent){
-    QWidget* box = new QWidget(&parent);
-    QVBoxLayout* layout = new QVBoxLayout(box);
-    layout->setMargin(0);
-//    layout->setAlignment(Qt::AlignTop);
-    layout->addWidget(new QLabel(QString::fromStdString("<font size=4><b>Name:</b></font> " + m_name)));
-    {
-        QLabel* text = new QLabel(QString::fromStdString("<font size=4><b>Description:</b></font> " + m_description));
-        layout->addWidget(text);
-        text->setWordWrap(true);
-    }
-    {
-        std::string path = GITHUB_REPO + m_doc_link;
-        QLabel* text = new QLabel(QString::fromStdString("<font size=4><a href=\"" + path + "\">Online Documentation for " + m_name + "</a></font>"));
-        layout->addWidget(text);
-        text->setTextFormat(Qt::RichText);
-        text->setTextInteractionFlags(Qt::TextBrowserInteraction);
-        text->setOpenExternalLinks(true);
-    }
-    layout->addWidget(make_options_body(*box), Qt::AlignBottom);
-
-    QHBoxLayout* row = new QHBoxLayout();
-    layout->addLayout(row);
-    {
-        QPushButton* button = new QPushButton("Save Settings", box);
-        connect(
-            button, &QPushButton::clicked,
-            this, [&](bool){
-                try{
-                    std::string name = save_json();
-                    QMessageBox box;
-                    box.information(nullptr, "Success!", QString::fromStdString("Settings saved to: " + name + "\n"));
-                }catch (const char* str){
-                    QMessageBox box;
-                    box.critical(nullptr, "Error", str);
-                    return;
-                }catch (const QString& str){
-                    QMessageBox box;
-                    box.critical(nullptr, "Error", str);
-                    return;
-                }
-            }
-        );
-        row->addWidget(button);
-    }
-    {
-        QPushButton* button = new QPushButton("Restore Defaults", box);
-        connect(
-            button, &QPushButton::clicked,
-            this, [&](bool){
-                restore_defaults();
-                parent.change_panel(*this);
-            }
-        );
-        row->addWidget(button);
-    }
-    {
-        m_build_button = new QPushButton(QString::fromStdString(BUILD_BUTTON_NORMAL), box);
-        QFont font = m_build_button->font();
-        font.setPointSize(16);
-        m_build_button->setFont(font);
-        connect(
-            m_build_button, &QPushButton::clicked,
-            this, [&](bool){
-                save_and_build(parent.current_board());
-            }
-        );
-        layout->addWidget(m_build_button);
-    }
-    return box;
-}
-
-
-}
-}
diff --git a/HexGenerator/Source/Panels/Program.h b/HexGenerator/Source/Panels/Program.h
deleted file mode 100644
index ad389bc499..0000000000
--- a/HexGenerator/Source/Panels/Program.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*  Parent Class for all Programs
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_Program_H
-#define PokemonAutomation_Program_H
-
-#include <thread>
-#include <QObject>
-#include <QPushButton>
-#include "UI/BoardList.h"
-#include "RightPanel.h"
-
-namespace PokemonAutomation{
-    class JsonArray;
-    class JsonObject;
-namespace HexGenerator{
-
-
-
-class Program : public RightPanel{
-public:
-    static const std::string JSON_PROGRAM_NAME;
-    static const std::string JSON_DOCUMENTATION;
-    static const std::string JSON_DESCRIPTION;
-    static const std::string JSON_PARAMETERS;
-
-    static const std::string BUILD_BUTTON_NORMAL;
-    static const std::string BUILD_BUTTON_BUSY;
-
-public:
-    Program(std::string category, std::string name, std::string description, std::string doc_link);
-    Program(std::string category, const JsonObject& obj);
-    ~Program();
-
-    const std::string& description() const{ return m_description; }
-
-    virtual std::string check_validity() const{ return std::string(); }
-    virtual void restore_defaults(){}
-
-    JsonObject to_json() const;
-    std::string to_cfile() const;
-
-    std::string save_json() const;
-    std::string save_cfile() const;
-
-    void save_and_build(const std::string& board);
-
-    virtual QWidget* make_ui(MainWindow& parent) override;
-
-protected:
-    virtual QWidget* make_options_body(QWidget& parent);
-    virtual JsonArray parameters_json() const;
-    virtual std::string parameters_cpp() const{ return ""; }
-
-private:
-    std::string m_description;
-    QPushButton* m_build_button;
-    std::thread m_builder;
-};
-
-
-
-}
-}
-#endif
diff --git a/HexGenerator/Source/Panels/RightPanel.h b/HexGenerator/Source/Panels/RightPanel.h
deleted file mode 100644
index f760bfc223..0000000000
--- a/HexGenerator/Source/Panels/RightPanel.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*  Right-Side Panel Options
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_RightPanel_H
-#define PokemonAutomation_RightPanel_H
-
-#include <QWidget>
-
-namespace PokemonAutomation{
-namespace HexGenerator{
-
-
-class MainWindow;
-
-class RightPanel : public QObject{
-    Q_OBJECT
-
-public:
-    RightPanel(std::string category, std::string name, std::string doc_link)
-        : m_category(std::move(category))
-        , m_name(std::move(name))
-        , m_doc_link(std::move(doc_link))
-    {}
-    virtual ~RightPanel() = default;
-
-    const std::string& category() const{ return m_category; }
-    const std::string& name() const{ return m_name; }
-
-    virtual QWidget* make_ui(MainWindow& parent) = 0;
-
-protected:
-    std::string m_category;
-    std::string m_name;
-    std::string m_doc_link;
-};
-
-
-}
-}
-#endif
diff --git a/HexGenerator/Source/Qt-Install-Settings.png b/HexGenerator/Source/Qt-Install-Settings.png
deleted file mode 100644
index 65a2c648aa..0000000000
Binary files a/HexGenerator/Source/Qt-Install-Settings.png and /dev/null differ
diff --git a/HexGenerator/Source/Tools/CommandRunner.cpp b/HexGenerator/Source/Tools/CommandRunner.cpp
deleted file mode 100644
index fdac5c57f5..0000000000
--- a/HexGenerator/Source/Tools/CommandRunner.cpp
+++ /dev/null
@@ -1,159 +0,0 @@
-/*  Build Command Runner
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <iostream>
-#include <QFile>
-#include <QMessageBox>
-#include "Common/Cpp/Unicode.h"
-#include "Tools/PersistentSettings.h"
-#include "Tools.h"
-
-#if _WIN32
-#include <Windows.h>
-namespace PokemonAutomation{
-namespace HexGenerator{
-
-int build_hexfile(
-    const std::string& board,
-    const std::string& category,
-    const std::string& program_name,
-    const std::string& hex_file,
-    const std::string& log_file
-){
-    QFile file(QString::fromStdString(hex_file));
-    file.remove();
-
-    using PokemonAutomation::utf8_to_wstr;
-    std::string module;
-    for (auto ch : settings.path + CONFIG_FOLDER_NAME + "/BuildWindows.cmd"){
-        module += ch == '/' ? '\\' : ch;
-    }
-
-    STARTUPINFOW si;
-    PROCESS_INFORMATION pi;
-
-    ZeroMemory(&si, sizeof(si));
-    si.cb = sizeof(si);
-    ZeroMemory(&pi, sizeof(pi));
-    std::string command = "\"" + module + "\"";
-    command += " " + board;
-    command += " " + category;
-    command += " " + program_name;
-    command += " > \"" + log_file + "\" 2>&1";
-    std::wstring wpath = utf8_to_wstr(command);
-    bool ret = CreateProcessW(
-        nullptr,
-        &wpath[0],
-        nullptr,
-        nullptr,
-        false,
-        CREATE_NO_WINDOW,
-        nullptr,
-        nullptr,
-        &si,
-        &pi
-    );
-    if (!ret){
-        DWORD code = GetLastError();
-        std::cout << "error = " << code << std::endl;
-        run_on_main_thread([=]{
-            QMessageBox box;
-            box.critical(
-                nullptr, "Error",
-                "Unable to open: " + QString::fromWCharArray(wpath.data()) +
-                "\r\n\r\nError Code: " + QString::number(code)
-            );
-//            box.critical(nullptr, "Error", "Unable to open: " + module + "\r\nError Code: " + QString::number(code));
-        });
-        return 1;
-    }
-    ret = WaitForSingleObject(pi.hProcess, INFINITE);
-    CloseHandle(pi.hProcess);
-    CloseHandle(pi.hThread);
-    return ret;
-}
-
-}
-}
-#elif __APPLE__
-#include <stdio.h>
-#include <unistd.h>
-#include <limits.h>
-namespace PokemonAutomation{
-namespace HexGenerator{
-
-int build_hexfile(
-    const std::string& board,
-    const std::string& category,
-    const std::string& program_name,
-    const std::string& hex_file,
-    const std::string& log_file
-){
-    std::string module_dir = settings.path + SOURCE_FOLDER_NAME + "/" + category;
-    std::string module = "../Scripts/BuildOneUnix.sh ";
-    std::string command = module + board + " " + program_name + " gui > " + log_file + " 2>&1";
-
-    // Since most macs will have the avr tools installed in /usr/local/bin, add it to the path now
-    std::string path = "/usr/local/bin:";
-    path.append(getenv("PATH"));
-    setenv("PATH", path.c_str(), 1);
-
-    QFile file(QString::fromStdString(hex_file));
-    file.remove();
-
-    // Saving our CWD to return to it later
-    char cwd[PATH_MAX];
-    getcwd(cwd, sizeof(cwd));
-
-    // Move to our Device Source directory
-    int cd_mod_dir = chdir(module_dir.c_str());
-    if (cd_mod_dir !=0) {
-        std::cout << "chdir() to " << module_dir << " failed with code " << cd_mod_dir << std::endl;
-        run_on_main_thread([=]{
-            QMessageBox box;
-            box.critical(nullptr, "Error", QString::fromStdString("Failed to change working directory to: " + module_dir));
-        });
-        return 1;
-    }
-
-    FILE* pipe = popen(command.c_str(), "r");
-    if (!pipe) {
-        std::cout << "Failed to create process with command " << command << std::endl;
-        run_on_main_thread([=]{
-            QMessageBox box;
-            box.critical(nullptr, "Error", QString::fromStdString("Failed to create process for " + module));
-        });
-        return 1;
-    };
-
-    int ret = pclose(pipe)/256;
-    if (ret != 0) {
-        std::string msg = "Build process exited with code: " + std::to_string(ret);
-        std::cout << msg << std::endl;
-        run_on_main_thread([=]{
-            QMessageBox box;
-            box.critical(nullptr, "Error",  QString::fromStdString(msg));
-        });
-    }
-
-    int cd_back = chdir(cwd);
-    if ( cd_back !=0) {
-        std::string msg = "Failed to change back to original working directory: code " + std::to_string(cd_back);
-        std::cout << msg << std::endl;
-        run_on_main_thread([=]{
-            QMessageBox box;
-            box.critical(nullptr, "Error", QString::fromStdString(msg));
-        });
-    }
-    return ret;
-}
-
-}
-}
-#else
-#error "Platform not supported."
-#endif
- 
diff --git a/HexGenerator/Source/Tools/MiscTools.cpp b/HexGenerator/Source/Tools/MiscTools.cpp
deleted file mode 100644
index 37a18143a9..0000000000
--- a/HexGenerator/Source/Tools/MiscTools.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-/*  Json Helpers
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <QString>
-#include "Tools.h"
-
-namespace PokemonAutomation{
-namespace HexGenerator{
-
-const std::string STRING_POKEMON = (QString("Pok") + QChar(0xe9) + "mon").toStdString();
-
-
-
-
-
-
-
-//#include <iostream>
-//using namespace std;
-
-
-
-
-}
-}
-
-
-
-
diff --git a/HexGenerator/Source/Tools/PersistentSettings.cpp b/HexGenerator/Source/Tools/PersistentSettings.cpp
deleted file mode 100644
index 29c33ca6ec..0000000000
--- a/HexGenerator/Source/Tools/PersistentSettings.cpp
+++ /dev/null
@@ -1,83 +0,0 @@
-/*  Persistent Settings
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <QDir>
-#include "Common/Cpp/Exceptions.h"
-#include "Common/Cpp/Json/JsonValue.h"
-#include "Common/Cpp/Json/JsonObject.h"
-#include "Tools.h"
-#include "PersistentSettings.h"
-
-#include <iostream>
-using std::cout;
-using std::endl;
-
-namespace PokemonAutomation{
-namespace HexGenerator{
-
-
-const std::string VERSION = "v0.5.21";
-const std::string DISCORD = "https://discord.gg/cQ4gWxN";
-const std::string GITHUB_REPO = "https://github.com/PokemonAutomation/";
-
-const std::string SETTINGS_NAME = "Settings.json";
-const std::string CONFIG_FOLDER_NAME = "GeneratorConfig";
-const std::string SOURCE_FOLDER_NAME = "NativePrograms";
-const std::string LOG_FOLDER_NAME = "Logs";
-
-
-PersistentSettings settings;
-
-
-void PersistentSettings::determine_paths(){
-    path = QCoreApplication::applicationDirPath().toStdString() + "/";
-
-    for (size_t c = 0; c < 3; c++){
-        cout << path << endl;
-//        QFileInfo info(path + SETTINGS_NAME);
-//        if (info.exists() && info.isFile()){
-//            return;
-//        }
-        QDir basedir(QString::fromStdString(path));
-
-        if (!QDir(QString::fromStdString(path + LOG_FOLDER_NAME)).exists()){
-            basedir.mkdir(QString::fromStdString(LOG_FOLDER_NAME));
-        }
-        if (QDir(QString::fromStdString(path + CONFIG_FOLDER_NAME)).exists()){
-            return;
-        }
-        path += "../";
-    }
-
-    path = "";
-//    throw StringExceptionQt("Unable to find working directory.");
-}
-void PersistentSettings::load(){
-    determine_paths();
-    cout << "Root Path: " + path << endl;
-
-    try{
-        std::string full_path = path + SETTINGS_NAME;
-        JsonValue json = load_json_file(full_path);
-        JsonObject& obj = json.get_object_throw(full_path);
-        obj.read_integer(board_index, "Board", 0, 3);
-    }catch (const Exception& e){
-        std::cout << std::string("Error Parsing ") + SETTINGS_NAME + ": " + e.message() << std::endl;
-    }
-}
-
-
-void PersistentSettings::write() const{
-    JsonObject root;
-    root["Board"] = board_index;
-    root.dump("Settings.json");
-}
-
-
-
-}
-}
-
diff --git a/HexGenerator/Source/Tools/PersistentSettings.h b/HexGenerator/Source/Tools/PersistentSettings.h
deleted file mode 100644
index a027d57313..0000000000
--- a/HexGenerator/Source/Tools/PersistentSettings.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*  Persistent Settings
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <QString>
-
-namespace PokemonAutomation{
-namespace HexGenerator{
-
-
-extern const std::string VERSION;
-extern const std::string DISCORD;
-extern const std::string GITHUB_REPO;
-
-extern const std::string SETTINGS_NAME;
-extern const std::string CONFIG_FOLDER_NAME;
-extern const std::string SOURCE_FOLDER_NAME;
-extern const std::string LOG_FOLDER_NAME;
-
-
-class PersistentSettings{
-public:
-    void load();
-    void write() const;
-
-private:
-    void determine_paths();
-
-public:
-    std::string path;
-    size_t board_index = 0;
-
-};
-
-extern PersistentSettings settings;
-
-
-}
-}
diff --git a/HexGenerator/Source/Tools/Tools.h b/HexGenerator/Source/Tools/Tools.h
deleted file mode 100644
index 05881f0341..0000000000
--- a/HexGenerator/Source/Tools/Tools.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*  Various Utilities
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_Tools_H
-#define PokemonAutomation_Tools_H
-
-#include <stdint.h>
-#include <memory>
-#include <string>
-#include <map>
-#include <QApplication>
-#include <QDate>
-
-namespace PokemonAutomation{
-namespace HexGenerator{
-
-
-extern const std::string STRING_POKEMON;
-
-
-
-bool valid_switch_date(const QDate& date);
-
-
-
-//  Build the .hex
-int build_hexfile(
-    const std::string& board,
-    const std::string& category,
-    const std::string& program_name,
-    const std::string& hex_file,
-    const std::string& log_file
-);
-
-
-
-extern QApplication* application;
-
-template <typename Lambda>
-void run_on_main_thread(Lambda&& lambda){
-    QMetaObject::invokeMethod(application, std::move(lambda));
-}
-
-
-}
-}
-#endif
diff --git a/HexGenerator/Source/UI/BoardList.cpp b/HexGenerator/Source/UI/BoardList.cpp
deleted file mode 100644
index 97d1d12c7a..0000000000
--- a/HexGenerator/Source/UI/BoardList.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-/*  Board List
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <vector>
-#include "Tools/PersistentSettings.h"
-#include "BoardList.h"
-
-namespace PokemonAutomation{
-namespace HexGenerator{
-
-
-const std::vector<std::pair<std::string, QString>> BOARD_LIST{
-    {"Teensy2", "Teensy 2.0"},
-    {"TeensyPP2", "Teensy++ 2.0"},
-    {"ProMicro", "Pro Micro"},
-    {"ArduinoLeonardo", "Arduino Leonardo"},
-    {"ArduinoUnoR3", "Arduino Uno R3"},
-};
-
-BoardList::BoardList(QWidget& parent)
-    : QComboBox(&parent)
-{
-    for (const auto& item : BOARD_LIST){
-        addItem(item.second);
-    }
-    setCurrentIndex(settings.board_index);
-
-    connect(
-        this, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
-        this, [&](int index){ settings.board_index = index; }
-    );
-}
-
-const std::string& BoardList::get_board() const{
-    return BOARD_LIST[currentIndex()].first;
-}
-
-
-}
-}
diff --git a/HexGenerator/Source/UI/BoardList.h b/HexGenerator/Source/UI/BoardList.h
deleted file mode 100644
index 3588a7858c..0000000000
--- a/HexGenerator/Source/UI/BoardList.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*  Board List
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_BoardList_H
-#define PokemonAutomation_BoardList_H
-
-#include <QComboBox>
-
-namespace PokemonAutomation{
-namespace HexGenerator{
-
-
-class BoardList : public QComboBox{
-public:
-    BoardList(QWidget& parent);
-    const std::string& get_board() const;
-private:
-};
-
-
-}
-}
-#endif
diff --git a/HexGenerator/Source/UI/MainWindow.cpp b/HexGenerator/Source/UI/MainWindow.cpp
deleted file mode 100644
index 2fc7ba51a1..0000000000
--- a/HexGenerator/Source/UI/MainWindow.cpp
+++ /dev/null
@@ -1,191 +0,0 @@
-/*  Main Window UI
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <QApplication>
-#include <QDir>
-#include <QMenuBar>
-#include <QHBoxLayout>
-#include <QVBoxLayout>
-#include <QGroupBox>
-#include <QLabel>
-#include <QPushButton>
-#include <QMessageBox>
-#include <QDesktopServices>
-#include <QUrl>
-#include "Tools/Tools.h"
-#include "Tools/PersistentSettings.h"
-#include "Panels/PanelLists.h"
-#include "MainWindow.h"
-
-//#include <iostream>
-//using std::cout;
-//using std::endl;
-
-namespace PokemonAutomation{
-namespace HexGenerator{
-
-
-MainWindow::~MainWindow(){
-    //  Close the panel first since it has listeners attached to the panels.
-    close_panel();
-}
-MainWindow::MainWindow(QWidget* parent)
-    : QMainWindow(parent)
-    , m_right_panel_widget(nullptr)
-{
-    if (objectName().isEmpty())
-        setObjectName(QString::fromUtf8("MainWindow"));
-    resize(800, 500);
-    m_centralwidget = new QWidget(this);
-    m_centralwidget->setObjectName(QString::fromUtf8("centralwidget"));
-    setCentralWidget(m_centralwidget);
-    m_menubar = new QMenuBar(this);
-    m_menubar->setObjectName(QString::fromUtf8("menubar"));
-    setMenuBar(m_menubar);
-//    m_statusbar = new QStatusBar(this);
-//    m_statusbar->setObjectName(QString::fromUtf8("statusbar"));
-//    setStatusBar(m_statusbar);
-
-    setWindowTitle(QString::fromStdString(STRING_POKEMON + " Automation .hex Generator (" + VERSION + ")"));
-
-    QMetaObject::connectSlotsByName(this);
-
-    QHBoxLayout* hbox = new QHBoxLayout(m_centralwidget);
-
-    QVBoxLayout* left = new QVBoxLayout();
-    hbox->addLayout(left, 0);
-    left->setAlignment(Qt::AlignTop);
-    left->addWidget(new QLabel("<b><font size=5>Device and Program:</font></b>", this));
-
-
-    QGroupBox* board_box = new QGroupBox("Board Type", m_centralwidget);
-    left->addWidget(board_box, 0);
-    QVBoxLayout* board_layout = new QVBoxLayout(board_box);
-    board_layout->setAlignment(Qt::AlignTop);
-    board_layout->addWidget(m_mcu_list = new BoardList(*this));
-
-    QGroupBox* program_box = new QGroupBox("Program Select", m_centralwidget);
-    left->addWidget(program_box, 1);
-    QVBoxLayout* program_layout = new QVBoxLayout(program_box);
-    program_layout->setAlignment(Qt::AlignTop);
-    program_layout->addWidget(new PanelLists(*program_box, *this));
-
-#if 0
-    left->addSpacerItem(new QSpacerItem(10, 10));
-    left->addWidget(new QLabel("<b>Select a Program:", this));
-    m_program_list = new ProgramListUI(*this);
-    left->addWidget(m_program_list);
-
-    left->addSpacerItem(new QSpacerItem(10, 10));
-    left->addWidget(new QLabel("<b>Global Settings:", this));
-    m_settings_list = new SettingsListUI(*this);
-    left->addWidget(m_settings_list);
-#endif
-
-
-#if 0
-    int width = std::max(
-        m_program_list->text_width(),
-        m_settings_list->text_width()
-    );
-#else
-//    int width = 300;
-#endif
-//    cout << "Width = " << width << endl;
-//    m_program_list->setMaximumWidth(width);
-//    m_settings_list->setMaximumWidth(width);
-
-    QGroupBox* support_box = new QGroupBox(
-        QString::fromStdString("Support (" + STRING_POKEMON + " Automation " + VERSION + ")"),
-        m_centralwidget
-    );
-    left->addWidget(support_box);
-
-    QHBoxLayout* support = new QHBoxLayout();
-    left->addLayout(support);
-//    support->setMargin(0);
-
-    QVBoxLayout* links = new QVBoxLayout();
-    support->addLayout(links);
-
-    {
-        QLabel* discord = new QLabel(this);
-        links->addWidget(discord);
-        discord->setText(QString::fromStdString("<a href=\"" + DISCORD + "\">Discord Server</a>"));
-        discord->setTextFormat(Qt::RichText);
-        discord->setTextInteractionFlags(Qt::TextBrowserInteraction);
-        discord->setOpenExternalLinks(true);
-    }
-    {
-        QLabel* github = new QLabel(this);
-        links->addWidget(github);
-        github->setText(QString::fromStdString("<a href=\"" + GITHUB_REPO + "Microcontroller\">Online Documentation</a>"));
-        github->setTextFormat(Qt::RichText);
-        github->setTextInteractionFlags(Qt::TextBrowserInteraction);
-        github->setOpenExternalLinks(true);
-    }
-    {
-        QLabel* github = new QLabel(this);
-        links->addWidget(github);
-        github->setText(QString::fromStdString("<a href=\"" + GITHUB_REPO + "\">GitHub Repository</a>"));
-        github->setTextFormat(Qt::RichText);
-        github->setTextInteractionFlags(Qt::TextBrowserInteraction);
-        github->setOpenExternalLinks(true);
-    }
-
-    QPushButton* about = new QPushButton("About", this);
-    support->addWidget(about);
-    connect(
-        about, &QPushButton::clicked,
-        this, [&](bool){
-            QMessageBox box;
-            box.information(
-                nullptr,
-                "About",
-                QString::fromStdString(
-                    STRING_POKEMON + " Automation .hex Generator (" + VERSION + ")<br>" +
-                    "Copyright: 2020 - 2021<br>" +
-                    "<br>"
-                    "Made by the " + STRING_POKEMON + " Automation Discord Server.<br>"
-                    "<br>"
-                    "This program uses Qt and dynamically links to unmodified Qt libraries under LGPL.<br>"
-                )
-            );
-        }
-    );
-
-
-    hbox->addSpacerItem(new QSpacerItem(10, 10));
-
-    QVBoxLayout* right = new QVBoxLayout();
-    m_right_panel_layout = right;
-    hbox->addLayout(right, 4);
-    right->setAlignment(Qt::AlignTop);
-    right->addWidget(new QLabel("<b><font size=5>Program Settings:</font></b>", this));
-}
-
-const std::string& MainWindow::current_board() const{
-    return m_mcu_list->get_board();
-}
-void MainWindow::change_panel(RightPanel& panel){
-    close_panel();
-    m_right_panel_widget = panel.make_ui(*this);
-    m_right_panel_layout->addWidget(m_right_panel_widget);
-}
-
-void MainWindow::close_panel(){
-    if (m_right_panel_widget != nullptr){
-        m_right_panel_layout->removeWidget(m_right_panel_widget);
-        delete m_right_panel_widget;
-        m_right_panel_widget = nullptr;
-    }
-}
-
-
-
-
-}
-}
diff --git a/HexGenerator/Source/UI/MainWindow.h b/HexGenerator/Source/UI/MainWindow.h
deleted file mode 100644
index b2100038d3..0000000000
--- a/HexGenerator/Source/UI/MainWindow.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*  Main Window UI
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_MainWindow_H
-#define PokemonAutomation_MainWindow_H
-
-#include <QVBoxLayout>
-#include <QComboBox>
-#include <QMainWindow>
-#include "BoardList.h"
-#include "Panels/RightPanel.h"
-
-namespace PokemonAutomation{
-namespace HexGenerator{
-
-
-class ProgramListUI;
-class SettingsListUI;
-
-class MainWindow : public QMainWindow{
-    Q_OBJECT
-
-public:
-    ~MainWindow();
-    MainWindow(QWidget* parent = nullptr);
-
-    const std::string& current_board() const;
-    void change_panel(RightPanel& panel);
-
-private:
-    void close_panel();
-
-private:
-    QWidget* m_centralwidget;
-    QMenuBar* m_menubar;
-//    QStatusBar* m_statusbar;
-
-    BoardList* m_mcu_list;
-//    ProgramListUI* m_program_list;
-//    SettingsListUI* m_settings_list;
-
-    QVBoxLayout* m_right_panel_layout;
-    QWidget* m_right_panel_widget;
-};
-
-
-
-}
-}
-#endif
diff --git a/HexGeneratorLauncher/Cleanup.cmd b/HexGeneratorLauncher/Cleanup.cmd
deleted file mode 100644
index d5b7dda5f9..0000000000
--- a/HexGeneratorLauncher/Cleanup.cmd
+++ /dev/null
@@ -1,9 +0,0 @@
-cd %~dp0
-
-rd /s /q ".vs\"
-rd /s /q "Debug\"
-rd /s /q "Release\"
-rd /s /q "x64\"
-rd /s /q "GeneratorLauncher\Debug\"
-rd /s /q "GeneratorLauncher\Release\"
-rd /s /q "GeneratorLauncher\x64\"
diff --git a/HexGeneratorLauncher/GeneratorLauncher.sln b/HexGeneratorLauncher/GeneratorLauncher.sln
deleted file mode 100644
index a452d8a065..0000000000
--- a/HexGeneratorLauncher/GeneratorLauncher.sln
+++ /dev/null
@@ -1,31 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.30225.117
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GeneratorLauncher", "GeneratorLauncher\GeneratorLauncher.vcxproj", "{4B2B06BB-6C57-4E0A-A036-CFE1FC577481}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{4B2B06BB-6C57-4E0A-A036-CFE1FC577481}.Debug|x64.ActiveCfg = Debug|x64
-		{4B2B06BB-6C57-4E0A-A036-CFE1FC577481}.Debug|x64.Build.0 = Debug|x64
-		{4B2B06BB-6C57-4E0A-A036-CFE1FC577481}.Debug|x86.ActiveCfg = Debug|Win32
-		{4B2B06BB-6C57-4E0A-A036-CFE1FC577481}.Debug|x86.Build.0 = Debug|Win32
-		{4B2B06BB-6C57-4E0A-A036-CFE1FC577481}.Release|x64.ActiveCfg = Release|x64
-		{4B2B06BB-6C57-4E0A-A036-CFE1FC577481}.Release|x64.Build.0 = Release|x64
-		{4B2B06BB-6C57-4E0A-A036-CFE1FC577481}.Release|x86.ActiveCfg = Release|Win32
-		{4B2B06BB-6C57-4E0A-A036-CFE1FC577481}.Release|x86.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {A88EB38E-03DE-43AC-91CB-DFBC80071328}
-	EndGlobalSection
-EndGlobal
diff --git a/HexGeneratorLauncher/GeneratorLauncher/GeneratorLauncher.vcxproj b/HexGeneratorLauncher/GeneratorLauncher/GeneratorLauncher.vcxproj
deleted file mode 100644
index b76a5bdd41..0000000000
--- a/HexGeneratorLauncher/GeneratorLauncher/GeneratorLauncher.vcxproj
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <VCProjectVersion>16.0</VCProjectVersion>
-    <Keyword>Win32Proj</Keyword>
-    <ProjectGuid>{4b2b06bb-6c57-4e0a-a036-cfe1fc577481}</ProjectGuid>
-    <RootNamespace>GeneratorLauncher</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <SDLCheck>false</SDLCheck>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>false</SDLCheck>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <SDLCheck>false</SDLCheck>
-      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>false</SDLCheck>
-      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\Main.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/HexGeneratorLauncher/GeneratorLauncher/GeneratorLauncher.vcxproj.filters b/HexGeneratorLauncher/GeneratorLauncher/GeneratorLauncher.vcxproj.filters
deleted file mode 100644
index 6832184fba..0000000000
--- a/HexGeneratorLauncher/GeneratorLauncher/GeneratorLauncher.vcxproj.filters
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;c++;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\Main.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/HexGeneratorLauncher/GeneratorLauncher/GeneratorLauncher.vcxproj.user b/HexGeneratorLauncher/GeneratorLauncher/GeneratorLauncher.vcxproj.user
deleted file mode 100644
index 0f14913f3c..0000000000
--- a/HexGeneratorLauncher/GeneratorLauncher/GeneratorLauncher.vcxproj.user
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup />
-</Project>
\ No newline at end of file
diff --git a/HexGeneratorLauncher/Main.cpp b/HexGeneratorLauncher/Main.cpp
deleted file mode 100644
index f9f4d69557..0000000000
--- a/HexGeneratorLauncher/Main.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-
-#include <Windows.h>
-
-int __stdcall WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, char*, int nShowCmd){
-    STARTUPINFOW si;
-    PROCESS_INFORMATION pi;
-
-    ZeroMemory(&si, sizeof(si));
-    si.cb = sizeof(si);
-    ZeroMemory(&pi, sizeof(pi));
-
-    bool ret = CreateProcessW(
-        L"Binaries/HexGenerator.exe",
-        nullptr,
-        nullptr,
-        nullptr,
-        false,
-        0,
-        nullptr,
-        nullptr,
-        &si,
-        &pi
-    );
-    if (!ret){
-        MessageBoxW(nullptr, L"Unable to open: Binaries/HexGenerator.exe", L"Error", MB_ICONERROR);
-        return 1;
-    }
-    ret = WaitForSingleObject(pi.hProcess, INFINITE);
-    CloseHandle(pi.hProcess);
-    CloseHandle(pi.hThread);
-    return ret;
-}
-
diff --git a/HexGeneratorLauncher/README.md b/HexGeneratorLauncher/README.md
deleted file mode 100644
index 6f85e4f6f3..0000000000
--- a/HexGeneratorLauncher/README.md
+++ /dev/null
@@ -1,23 +0,0 @@
-# GeneratorLauncher
-
-This is the Visual Studio project that generates the "PokemonAutomationUI.exe" launcher binary that's distributed in the public releases.
-
-Note that this program triggers AV false positives.
-
-## How to Build
-
-**Windows:**
- - Install Visual Studio 2019 with C++.
- - Navigate to [`GeneratorLauncher/`](../GeneratorLauncher).
- - Open `GeneratorLauncher.sln` with Visual Studio.
- - Press F7 to build.
- 
- This will create a folder inside `GeneratorLauncher` that will contain the binary.
-
-
-**Linux:**
- - Not supported yet.
- 
-
-**Mac:**
- - Not supported yet.
diff --git a/IconResource/IconResource.rc b/IconResource/IconResource.rc
index a841e99b45..e16ba4098e 100644
--- a/IconResource/IconResource.rc
+++ b/IconResource/IconResource.rc
@@ -1 +1 @@
-IDI_ICON1 ICON "icon.ico"
+IDI_ICON1 ICON "icon.ico"
diff --git a/IconResource/SerialPrograms.appdata.xml b/IconResource/SerialPrograms.appdata.xml
new file mode 100644
index 0000000000..1dc6e842ec
--- /dev/null
+++ b/IconResource/SerialPrograms.appdata.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop-application">
+  <id>com.gameautomation.SerialPrograms</id>
+
+  <!-- Metadata -->
+  <metadata_license>CC0-1.0</metadata_license>
+  <project_license>MIT</project_license>
+
+  <!-- Names and descriptions -->
+  <name>SerialPrograms</name>
+  <summary>Game Automation Software</summary>
+  <description>
+    <p>Automate various games using a compatible microcontroller from your computer.</p>
+    <ul>
+      <li>Tick-precise controller inputs</li>
+      <li>Remote control via Discord</li>
+      <li>Machine learning, visual/audio capabilities to accomplish tasks</li>
+    </ul>
+  </description>
+
+  <!-- Icon -->
+  <icon type="cached_file" height="256" width="256">
+    /usr/share/icons/hicolor/256x256/apps/SerialPrograms.png
+  </icon>
+
+  <!-- Launch information -->
+  <launchable type="desktop-id">com.gameautomation.SerialPrograms.desktop</launchable>
+
+  <!-- Categories and keywords -->
+  <categories>
+    <category>Utility</category>
+    <category>HardwareSettings</category>
+  </categories>
+
+  <keywords>
+    <keyword>automation</keyword>
+    <keyword>serial</keyword>
+    <keyword>computer</keyword>
+    <keyword>control</keyword>
+  </keywords>
+
+  <!-- URLs -->
+  <url type="homepage">https://github.com/PokemonAutomation/Arduino-Source</url>
+  <url type="bugtracker">https://github.com/PokemonAutomation/Arduino-Source/issues</url>
+  <url type="help">https://pokemonautomation.github.io</url>
+
+  <!-- Screenshots (optional - add actual screenshot paths if available) -->
+  <!--
+  <screenshots>
+    <screenshot type="default">
+      <image>https://example.com/screenshot1.png</image>
+    </screenshot>
+  </screenshots>
+  -->
+
+  <!-- Release information (update with each release) -->
+  <releases>
+    <release version="0.62.9" date="2026-04-05">
+      <description>
+        <p>Initial AppStream metadata</p>
+      </description>
+    </release>
+  </releases>
+
+</component>
diff --git a/IconResource/SerialPrograms.desktop b/IconResource/SerialPrograms.desktop
new file mode 100644
index 0000000000..acba2a9b45
--- /dev/null
+++ b/IconResource/SerialPrograms.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=SerialPrograms
+Exec=SerialPrograms %U
+TryExec=SerialPrograms
+Icon=SerialPrograms
+Type=Application
+Terminal=false
+Categories=Utility;
+StartupWMClass=SerialPrograms
+X-AppImage-Integrate=false
diff --git a/IconResource/SerialPrograms.png b/IconResource/SerialPrograms.png
new file mode 100644
index 0000000000..905d5bb7cc
Binary files /dev/null and b/IconResource/SerialPrograms.png differ
diff --git a/IconResource/icon.icns b/IconResource/icon.icns
new file mode 100644
index 0000000000..9483d6da0f
Binary files /dev/null and b/IconResource/icon.icns differ
diff --git a/LICENSE b/LICENSE
index 495378a644..0b44e57762 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,21 +1,21 @@
-MIT License
-
-Copyright (c) 2021 Alexander J. Yee
-
-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.
+MIT License
+
+Copyright (c) 2021 Alexander J. Yee
+
+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/NativePrograms/Cleanup.cmd b/NativePrograms/Cleanup.cmd
deleted file mode 100644
index 2e32c2b2db..0000000000
--- a/NativePrograms/Cleanup.cmd
+++ /dev/null
@@ -1,11 +0,0 @@
-
-cd %~dp0\NintendoSwitch
-@call !Cleanup.cmd
-
-cd %~dp0\PokemonSwSh
-@call !Cleanup.cmd
-
-cd %~dp0\PokemonBDSP
-@call !Cleanup.cmd
-
-
diff --git a/NativePrograms/DeviceFramework/Board-at90usb1286-Teensy2.c b/NativePrograms/DeviceFramework/Board-at90usb1286-Teensy2.c
deleted file mode 100644
index e8f695cafa..0000000000
--- a/NativePrograms/DeviceFramework/Board-at90usb1286-Teensy2.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/*  Teensy++ 2.0
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- */
-
-#include <avr/io.h>
-#include "DeviceSettings.h"
-#include "HardwareLED.h"
-
-void setup_leds(void){
-    DDRD |= (1 << 6);
-    onboard_led(false);
-}
-void onboard_led(bool on){
-    if (on){
-        PORTD |= (1 << 6);
-    }else{
-        PORTD &= ~(1 << 6);
-    }
-}
-void flicker_led(void){
-    PORTD ^= (1 << 6);
-}
diff --git a/NativePrograms/DeviceFramework/Board-atmega16u2-ArduinoUnoR3.c b/NativePrograms/DeviceFramework/Board-atmega16u2-ArduinoUnoR3.c
deleted file mode 100644
index 0e7d813517..0000000000
--- a/NativePrograms/DeviceFramework/Board-atmega16u2-ArduinoUnoR3.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/*  Arduino Uno R3
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- */
-
-#include <avr/io.h>
-#include "DeviceSettings.h"
-#include "HardwareLED.h"
-
-void setup_leds(void){
-    const int leds = (1 << 4) | (1 << 5);
-    DDRD  |= leds;
-    PORTD |= leds;
-}
-void onboard_led(bool on){
-    const int leds = (1 << 4) | (1 << 5);
-    if (on){
-        PORTD &= ~leds;
-    }else{
-        PORTD |= leds;
-    }
-}
-void flicker_led(void){
-    uint8_t port = PORTD;
-    
-    port ^= (port ^ (port << 1)) & (1 << 5);
-    port ^= (1 << 4);
-
-    PORTD = port;
-}
diff --git a/NativePrograms/DeviceFramework/Board-atmega32u4-ArduinoLeonardo.c b/NativePrograms/DeviceFramework/Board-atmega32u4-ArduinoLeonardo.c
deleted file mode 100644
index b6e5434e23..0000000000
--- a/NativePrograms/DeviceFramework/Board-atmega32u4-ArduinoLeonardo.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/*  Arduino Leonardo
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- */
-
-#include <avr/io.h>
-#include "DeviceSettings.h"
-#include "HardwareLED.h"
-
-void setup_leds(void){
-    DDRB |= (1 << 0);
-    DDRD |= (1 << 5);
-    DDRC |= (1 << 7);
-    onboard_led(false);
-}
-void onboard_led(bool on){
-    if (on){
-        PORTB &= ~(1 << 0);
-        PORTD &= ~(1 << 5);
-        PORTC |= (1 << 7);
-    }else{
-        PORTB |= (1 << 0);
-        PORTD |= (1 << 5);
-        PORTC &= ~(1 << 7);
-    }
-}
-void flicker_led(void){
-    if (PORTB & 1){
-        PORTB &= ~(1 << 0);
-        PORTC &= ~(1 << 7);
-    }else{
-        PORTB |= (1 << 0);
-        PORTC |= (1 << 7);
-    }
-}
diff --git a/NativePrograms/DeviceFramework/Board-atmega32u4-ProMicro.c b/NativePrograms/DeviceFramework/Board-atmega32u4-ProMicro.c
deleted file mode 100644
index b395f2c504..0000000000
--- a/NativePrograms/DeviceFramework/Board-atmega32u4-ProMicro.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/*  Pro Micro
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- */
-
-#include <avr/io.h>
-#include "DeviceSettings.h"
-#include "HardwareLED.h"
-
-void setup_leds(void){
-    DDRB |= (1 << 0);
-    DDRD |= (1 << 5);
-    onboard_led(false);
-}
-void onboard_led(bool on){
-    if (on){
-        PORTB &= ~(1 << 0);
-        PORTD &= ~(1 << 5);
-    }else{
-        PORTB |= (1 << 0);
-        PORTD |= (1 << 5);
-    }
-}
-void flicker_led(void){
-    if (PORTB & 1){
-        PORTB &= ~(1 << 0);
-        PORTD |= (1 << 5);
-    }else{
-        PORTB |= (1 << 0);
-        PORTD &= ~(1 << 5);
-    }
-}
diff --git a/NativePrograms/DeviceFramework/Board-atmega32u4-Teensy2.c b/NativePrograms/DeviceFramework/Board-atmega32u4-Teensy2.c
deleted file mode 100644
index 65d0484a79..0000000000
--- a/NativePrograms/DeviceFramework/Board-atmega32u4-Teensy2.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/*  Teensy 2.0
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- */
-
-#include <avr/io.h>
-#include "DeviceSettings.h"
-#include "HardwareLED.h"
-
-void setup_leds(void){
-    DDRD |= (1 << 6);
-    onboard_led(false);
-}
-void onboard_led(bool on){
-    if (on){
-        PORTD |= (1 << 6);
-    }else{
-        PORTD &= ~(1 << 6);
-    }
-}
-void flicker_led(void){
-    PORTD ^= (1 << 6);
-}
diff --git a/NativePrograms/DeviceFramework/DeviceSettings.c b/NativePrograms/DeviceFramework/DeviceSettings.c
deleted file mode 100644
index b6b8b58766..0000000000
--- a/NativePrograms/DeviceFramework/DeviceSettings.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/*  Device Settings
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- */
-
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-#include "DeviceSettings.h"
-#include "HardwareLED.h"
-
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-//  User Callbacks
-
-void start_program_callback(void){
-    //  This is run when the program starts. Here you can insert code to
-    //  setup output pins.
-
-    //  This callback should return quickly. Do not hang in here for too long
-    //  or it will delay the start of the program.
-
-    setup_leds();
-}
-void end_program_callback(void){
-    //  This is run when the program finishes. Here you can insert code to
-    //  turn on LEDs or other output pins.
-
-    //  This callback should return quickly. Do not hang in here for too long
-    //  or it will prevent the program from entering its safe end-loop.
-
-    onboard_led(true);
-}
-
diff --git a/NativePrograms/DeviceFramework/DeviceSettings.h b/NativePrograms/DeviceFramework/DeviceSettings.h
deleted file mode 100644
index 3923ee4ea0..0000000000
--- a/NativePrograms/DeviceFramework/DeviceSettings.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*  Device Settings
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- */
-
-#ifndef PokemonAutomation_DeviceSettings_H
-#define PokemonAutomation_DeviceSettings_H
-
-#include <stdbool.h>
-#include <stdint.h>
-
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-//  Board Type (for LEDs)
-
-//#define BOARD_TYPE_UNKNOWN      0
-//#define BOARD_TYPE_UNO          1
-//#define BOARD_TYPE_PRO_MICRO    2
-//#define BOARD_TYPE_TEENSY2      3
-
-//extern const int BOARD_TYPE;
-
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-//  User Callbacks
-
-void start_program_callback(void);
-void end_program_callback(void);
-
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-#endif
diff --git a/NativePrograms/DeviceFramework/HardwareLED.h b/NativePrograms/DeviceFramework/HardwareLED.h
deleted file mode 100644
index 4b20d6a7c8..0000000000
--- a/NativePrograms/DeviceFramework/HardwareLED.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/*  Onboard LEDs
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- */
-
-#ifndef PokemonAutomation_HardwareLED_H
-#define PokemonAutomation_HardwareLED_H
-
-#include <stdbool.h>
-
-void setup_leds(void);
-void onboard_led(bool on);
-void flicker_led(void);
-
-
-#endif
diff --git a/NativePrograms/LUFA/Build/DMBS/.gitignore b/NativePrograms/LUFA/Build/DMBS/.gitignore
deleted file mode 100644
index a909604501..0000000000
--- a/NativePrograms/LUFA/Build/DMBS/.gitignore
+++ /dev/null
@@ -1,9 +0,0 @@
-*.lss
-*.bin
-*.elf
-*.hex
-*.eep
-*.map
-*.o
-*.d
-*.sym
diff --git a/NativePrograms/LUFA/Build/DMBS/DMBS/HID_EEPROM_Loader/HID_EEPROM_Loader.c b/NativePrograms/LUFA/Build/DMBS/DMBS/HID_EEPROM_Loader/HID_EEPROM_Loader.c
deleted file mode 100644
index 7c18ff5df1..0000000000
--- a/NativePrograms/LUFA/Build/DMBS/DMBS/HID_EEPROM_Loader/HID_EEPROM_Loader.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-             DMBS Build System
-      Released into the public domain.
-
-   dean [at] fourwalledcubicle [dot] com
-         www.fourwalledcubicle.com
- */
-
-/** \file
- *
- *  Special application to extract an EEPROM image stored in FLASH memory, and
- *  copy it to the device EEPROM. This application is designed to be used with
- *  the HID build system module of DMBS to program the EEPROM of a target device
- *  that uses the HID bootloader protocol, which does not have native EEPROM
- *  programming support.
- */
-
-#include <avr/io.h>
-#include <avr/eeprom.h>
-#include <avr/pgmspace.h>
-
-/* References to the binary EEPROM data linked in the AVR's FLASH memory space */
-extern const char _binary_InputEEData_bin_start[];
-extern const char _binary_InputEEData_bin_end[];
-extern const char _binary_InputEEData_bin_size[];
-
-/* Friendly names for the embedded binary data stored in FLASH memory space */
-#define InputEEData       _binary_InputEEData_bin_start
-#define InputEEData_size  ((int)_binary_InputEEData_bin_size)
-
-int main(void)
-{
-	/* Copy out the embedded EEPROM data from FLASH to EEPROM memory space */
-	for (uint16_t i = 0; i < InputEEData_size; i++)
-	  eeprom_update_byte((uint8_t*)i, pgm_read_byte(&InputEEData[i]));
-
-	/* Infinite loop once complete */
-	for (;;);
-}
diff --git a/NativePrograms/LUFA/Build/DMBS/DMBS/HID_EEPROM_Loader/makefile b/NativePrograms/LUFA/Build/DMBS/DMBS/HID_EEPROM_Loader/makefile
deleted file mode 100644
index 552dedebad..0000000000
--- a/NativePrograms/LUFA/Build/DMBS/DMBS/HID_EEPROM_Loader/makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-#            DMBS Build System
-#     Released into the public domain.
-#
-#  dean [at] fourwalledcubicle [dot] com
-#        www.fourwalledcubicle.com
-#
-
-# Run "make help" for target help.
-
-MCU          = atmega128
-ARCH         = AVR8
-F_CPU        = 1000000
-OPTIMIZATION = s
-TARGET       = HID_EEPROM_Loader
-SRC          = $(TARGET).c
-CC_FLAGS     =
-LD_FLAGS     =
-OBJECT_FILES = InputEEData.o
-
-# Default target
-all:
-
-# Determine the AVR sub-architecture of the build main application object file
-FIND_AVR_SUBARCH = avr$(shell avr-objdump -f $(TARGET).o | grep architecture | cut -d':' -f3 | cut -d',' -f1)
-
-# Create a linkable object file with the input binary EEPROM data stored in the FLASH section
-InputEEData.o: InputEEData.bin $(TARGET).o $(MAKEFILE_LIST)
-	@echo $(MSG_OBJCPY_CMD) Converting \"$<\" to a object file \"$@\"
-	avr-objcopy -I binary -O elf32-avr -B $(call FIND_AVR_SUBARCH) --rename-section .data=.progmem.data,contents,alloc,readonly,data $< $@
-
-# Include LUFA build script makefiles
-include ../core.mk
-include ../gcc.mk
-include ../hid.mk
diff --git a/NativePrograms/LUFA/Build/DMBS/DMBS/License.txt b/NativePrograms/LUFA/Build/DMBS/DMBS/License.txt
deleted file mode 100644
index fec89a566f..0000000000
--- a/NativePrograms/LUFA/Build/DMBS/DMBS/License.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-             DMBS Build System
-      Released into the public domain.
-
-   dean [at] fourwalledcubicle [dot] com
-         www.fourwalledcubicle.com
-
-
-
-This is free and unencumbered software released into the public domain.
-
-Anyone is free to copy, modify, publish, use, compile, sell, or
-distribute this software, either in source code form or as a compiled
-binary, for any purpose, commercial or non-commercial, and by any
-means.
-
-In jurisdictions that recognize copyright laws, the author or authors
-of this software dedicate any and all copyright interest in the
-software to the public domain. We make this dedication for the benefit
-of the public at large and to the detriment of our heirs and
-successors. We intend this dedication to be an overt act of
-relinquishment in perpetuity of all present and future rights to this
-software under copyright law.
-
-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 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.
-
-For more information, please refer to <http://unlicense.org/>
diff --git a/NativePrograms/LUFA/Build/DMBS/DMBS/ModulesOverview.md b/NativePrograms/LUFA/Build/DMBS/DMBS/ModulesOverview.md
deleted file mode 100644
index 15b51c82f6..0000000000
--- a/NativePrograms/LUFA/Build/DMBS/DMBS/ModulesOverview.md
+++ /dev/null
@@ -1,38 +0,0 @@
-DMBS - Dean's Makefile Build System
-===================================
-
-
-Modules Overview
-----------------
-
-The following modules are currently included:
-
- - [ATPROGRAM](atprogram.md) - Device Programming
- - [AVRDUDE](avrdude.md) - Device Programming
- - [CORE](core.md) - DMBS Core Functionality
- - [CPPCHECK](cppcheck.md) - Static Code Analysis
- - [DFU](dfu.md) - Device Programming
- - [DOXYGEN](doxygen.md) - Automated Source Code Documentation
- - [GCC](gcc.md) - Compiling/Assembling/Linking with GCC
- - [HID](hid.md) - Device Programming
-
-## Importing modules into your project makefile
-
-To use a module, it is recommended to add the following boilerplate to your
-makefile:
-
-    # Include DMBS build script makefiles
-    DMBS_PATH   ?= ../DMBS
-
-Which can then used to indicate the location of your DMBS installation, relative
-to the current directory, when importing modules. For example:
-
-    DMBS_PATH   ?= ../DMBS
-    include $(DMBS_PATH)/core.mk
-    include $(DMBS_PATH)/gcc.mk
-
-Imports the `CORE` and `GCC` modules from DMBS using a single path relative to
-your project's makefile.
-
-If you wish to write your own DMBS module(s),
-[see the documentation here for more details.](WritingYourOwnModules.md)
diff --git a/NativePrograms/LUFA/Build/DMBS/DMBS/WritingYourOwnModules.md b/NativePrograms/LUFA/Build/DMBS/DMBS/WritingYourOwnModules.md
deleted file mode 100644
index c905ac0d8c..0000000000
--- a/NativePrograms/LUFA/Build/DMBS/DMBS/WritingYourOwnModules.md
+++ /dev/null
@@ -1,93 +0,0 @@
-DMBS - Dean's Makefile Build System
-===================================
-
-
-Writing Your Own Modules
-------------------------
-
-A DMBS module consists of the several boilerplate sections, explained below.
-
-## The DMBS module hooks
-
-Your module needs to advertise to DMBS its name, its makefile targets, the
-required and optional variables, and the variables and macros the module
-provides for use elsewhere. This is achieved with the following section:
-
-    DMBS_BUILD_MODULES         += EXAMPLE
-    DMBS_BUILD_TARGETS         += example-target another-target
-    DMBS_BUILD_MANDATORY_VARS  += MANDATORY_NAME ALSO_MANDATORY
-    DMBS_BUILD_OPTIONAL_VARS   += OPTIONAL_NAME ALSO_OPTIONAL
-    DMBS_BUILD_PROVIDED_VARS   += MEANING_OF_LIFE
-    DMBS_BUILD_PROVIDED_MACROS += STRIP_WHITESPACE
-
-The example above declares that this module is called `EXAMPLE`, and exposes the
-listed targets, variable requirements and provides variables and macros.
-
-Your module name and provided variable/macro names must be unique, however you
-can (and should) re-use variable names where appropriate if they apply to
-several modules (such as `ARCH` to specify the project's microcontroller
-architecture). Re-using targets is not recommended, but can be used to extend
-the dependencies of another module's targets.
-
-## Importing the CORE module
-
-Next, your module should always import the DMBS `CORE` module, via the
-following:
-
-    # Import the CORE module of DMBS
-    DMBS_MODULE_PATH := $(patsubst %/,%,$(dir $(lastword $(MAKEFILE_LIST))))
-    include $(DMBS_MODULE_PATH)/core.mk
-
-This ensures that the `make help` target is always available. In addition, the
-`CORE` module exposes some [commonly used macros and variables](core.md) to
-your module.
-
-## Setting optional variable's defaults
-
-If a variable is optional, you should provide a default value. Do this via the
-`?=` operator of `make`, which sets a variable's value if it has not yet been
-set:
-
-    MY_OPTIONAL_VARIABLE ?= some_default_value
-
-## Sanity checking user input
-
-Sanity checks are what make DMBS useful. Where possible, validate user input and
-convert generated errors to human-friendly messages. This can be achieved by
-enforcing that all the declared module mandatory variables have been set by the
-user:
-
-    # Sanity-check values of mandatory user-supplied variables
-    $(foreach MANDATORY_VAR, $(DMBS_BUILD_MANDATORY_VARS), $(call ERROR_IF_UNSET, $(MANDATORY_VAR)))
-
-As well as complaining if they are set, but currently empty:
-
-    $(call ERROR_IF_EMPTY, SOME_MANDATORY_VARIABLE)
-    $(call ERROR_IF_EMPTY, SOME_OPTIONAL_BUT_NON_EMPTY_VARIABLE)
-
-Or even if they are boolean (`Y` or `N`) variables that have an invalid value:
-
-    $(call ERROR_IF_NONBOOL, SOME_BOOL_VARIABLE)
-
-## Adding targets
-
-The meat of a DMBS module is the targets, which are run when the user types
-`make {target name}` from the command line. These can be as complex or simple
-as you like. See the GNU make manual for information on writing make targets.
-
-    example-target:
-        echo "Your DMBS module works!"
-
-## And finally, list the PHONYs
-
-Important in GNU Make is the concept of phony targets; this special directive
-tells make that a given target should never be considered a valid file. Listing
-phonies ensures that, for example, if your module had a target called `build`,
-it would always run when the user types `make build` from the command line, even
-if a file called `build` existed in the user project folder.
-
-You can list module-internal targets here, as well as mark all public targets
-via the module header's `DMBS_BUILD_TARGETS` variable.
-
-    # Phony build targets for this module
-    .PHONY: $(DMBS_BUILD_TARGETS) some-module-internal-target another-internal-target
diff --git a/NativePrograms/LUFA/Build/DMBS/DMBS/atprogram.md b/NativePrograms/LUFA/Build/DMBS/DMBS/atprogram.md
deleted file mode 100644
index b09ea16e3e..0000000000
--- a/NativePrograms/LUFA/Build/DMBS/DMBS/atprogram.md
+++ /dev/null
@@ -1,119 +0,0 @@
-DMBS - Dean's Makefile Build System
-===================================
-
-
-Module: ATPROGRAM
------------------
-
-The ATPROGRAM module provides build targets for use with the official
-`ATPROGRAM` back-end utility distributed with the free
-[Atmel Studio](http://www.atmel.com) software released by Atmel.
-
-## Importing This Module into a Makefile:
-
-To use this module in your application makefile, add the following code to your
-makefile:
-
-    include $(DMBS_PATH)/atprogram.mk
-
-## Prerequisites:
-
-This module requires the `atprogram.exe` utility to be available in your
-system's `PATH` variable. The `atprogram.exe` utility is distributed in Atmel
-Studio (usually) inside the application install folder's `atbackend`
-subdirectory.
-
-## Build Targets:
-
-The following targets are supported by this module:
-
-<table>
- <tbody>
-   <tr>
-    <td>atprogram</td>
-    <td>Program the device FLASH memory with the application's executable data.</td>
-   </tr>
-   <tr>
-    <td>atprogram-ee</td>
-    <td>Program the device EEPROM memory with the application's EEPROM data.</td>
-   </tr>
- </tbody>
-</table>
-
-## Mandatory Variables:
-
-The following variables must be defined (with a `NAME = VALUE` syntax, one
-variable per line) in the user makefile to be able to use this module:
-
-<table>
- <tbody>
-   <tr>
-    <td>MCU</td>
-    <td>Name of the Atmel processor model (e.g. `at90usb1287`).</td>
-   </tr>
-   <tr>
-    <td>TARGET</td>
-    <td>Name of the application output file prefix (e.g. `TestApplication`).</td>
-   </tr>
- </tbody>
-</table>
-
-## Optional Variables:
-
-The following variables may be defined (with a `NAME = VALUE` syntax, one
-variable per line) in the user makefile. If not specified, a default value will
-be assumed.
-
-<table>
- <tbody>
-   <tr>
-    <td>ATPROGRAM_PROGRAMMER</td>
-    <td>Name of the Atmel programmer or debugger tool to communicate with (e.g. `jtagice3`). Default is `atmelice`.</td>
-   </tr>
-   <tr>
-    <td>ATPROGRAM_INTERFACE</td>
-    <td>Name of the programming interface to use when programming the target (e.g. `spi`). Default is `jtag`.</td>
-   </tr>
-   <tr>
-    <td>ATPROGRAM_PORT</td>
-    <td>Name of the communication port to use when when programming with a serially connected tool (e.g. `COM2`). Default is `usb`.</td>
-   </tr>
- </tbody>
-</table>
-
-## Provided Variables:
-
-The following variables may be referenced in a user makefile (via `$(NAME)`
-syntax) if desired, as they are provided by this module.
-
-<table>
- <tbody>
-   <tr>
-    <td>N/A</td>
-    <td>This module provides no variables.</td>
-   </tr>
- </tbody>
-</table>
-
-## Provided Macros:
-
-The following macros may be referenced in a user makefile (via
-`$(call NAME, ARG1, ARG2, ...)` syntax) if desired, as they are provided by
-this module.
-
-<table>
- <tbody>
-   <tr>
-    <td>N/A</td>
-    <td>This module provides no macros.</td>
-   </tr>
- </tbody>
-</table>
-
-## Module Changelog:
-
-The changes to this module since its initial release are listed below, as of the
-DMBS version where the change was made.
-
-### 20160403
-Initial release.
diff --git a/NativePrograms/LUFA/Build/DMBS/DMBS/atprogram.mk b/NativePrograms/LUFA/Build/DMBS/DMBS/atprogram.mk
deleted file mode 100644
index aea2cbd235..0000000000
--- a/NativePrograms/LUFA/Build/DMBS/DMBS/atprogram.mk
+++ /dev/null
@@ -1,66 +0,0 @@
-#
-#            DMBS Build System
-#     Released into the public domain.
-#
-#  dean [at] fourwalledcubicle [dot] com
-#        www.fourwalledcubicle.com
-#
-
-DMBS_BUILD_MODULES         += ATPROGRAM
-DMBS_BUILD_TARGETS         += atprogram atprogram-ee
-DMBS_BUILD_MANDATORY_VARS  += MCU TARGET
-DMBS_BUILD_OPTIONAL_VARS   += ATPROGRAM_PROGRAMMER ATPROGRAM_INTERFACE ATPROGRAM_PORT
-DMBS_BUILD_PROVIDED_VARS   +=
-DMBS_BUILD_PROVIDED_MACROS +=
-
-# Import the CORE module of DMBS
-DMBS_MODULE_PATH := $(patsubst %/,%,$(dir $(lastword $(MAKEFILE_LIST))))
-include $(DMBS_MODULE_PATH)/core.mk
-
-# Default values of optionally user-supplied variables
-ATPROGRAM_PROGRAMMER ?= atmelice
-ATPROGRAM_INTERFACE  ?= jtag
-ATPROGRAM_PORT       ?=
-
-# Sanity check user supplied values
-$(foreach MANDATORY_VAR, $(DMBS_BUILD_MANDATORY_VARS), $(call ERROR_IF_UNSET, $(MANDATORY_VAR)))
-$(call ERROR_IF_EMPTY, MCU)
-$(call ERROR_IF_EMPTY, TARGET)
-$(call ERROR_IF_EMPTY, ATPROGRAM_PROGRAMMER)
-$(call ERROR_IF_EMPTY, ATPROGRAM_INTERFACE)
-
-# Output Messages
-MSG_ATPROGRAM_CMD    := ' [ATPRGRM] :'
-
-# Construct base atprogram command flags
-BASE_ATPROGRAM_FLAGS := --tool $(ATPROGRAM_PROGRAMMER) --interface $(ATPROGRAM_INTERFACE) --device $(MCU)
-ifneq ($(ATPROGRAM_PORT),)
-   BASE_ATPROGRAM_FLAGS += --port $(ATPROGRAM_PORT)
-endif
-
-# Construct the flags to use for the various memory spaces
-ifeq ($(ARCH), AVR8)
-   ATPROGRAM_FLASH_FLAGS  := --chiperase --flash
-   ATPROGRAM_EEPROM_FLAGS := --eeprom
-else ifeq ($(ARCH), XMEGA)
-   ATPROGRAM_FLASH_FLAGS  := --erase --flash
-   ATPROGRAM_EEPROM_FLAGS := --eeprom
-else ifeq ($(ARCH), UC3)
-   ATPROGRAM_FLASH_FLAGS  := --erase
-   ATPROGRAM_EEPROM_FLAGS := --eeprom
-else
-   $(error Unsupported architecture "$(ARCH)")
-endif
-
-# Programs in the target FLASH memory using ATPROGRAM
-atprogram: $(TARGET).elf $(MAKEFILE_LIST)
-	@echo $(MSG_ATPROGRAM_CMD) Programming device \"$(MCU)\" FLASH using \"$(ATPROGRAM_PROGRAMMER)\"
-	atprogram $(BASE_ATPROGRAM_FLAGS) program $(ATPROGRAM_FLASH_FLAGS) --file $<
-
-# Programs in the target EEPROM memory using ATPROGRAM
-atprogram-ee: $(TARGET).elf $(MAKEFILE_LIST)
-	@echo $(MSG_ATPROGRAM_CMD) Programming device \"$(MCU)\" EEPROM using \"$(ATPROGRAM_PROGRAMMER)\"
-	atprogram $(BASE_ATPROGRAM_FLAGS) program $(ATPROGRAM_EEPROM_FLAGS) --file $<
-
-# Phony build targets for this module
-.PHONY: $(DMBS_BUILD_TARGETS)
diff --git a/NativePrograms/LUFA/Build/DMBS/DMBS/avrdude.md b/NativePrograms/LUFA/Build/DMBS/DMBS/avrdude.md
deleted file mode 100644
index 9fcb09a1a3..0000000000
--- a/NativePrograms/LUFA/Build/DMBS/DMBS/avrdude.md
+++ /dev/null
@@ -1,171 +0,0 @@
-DMBS - Dean's Makefile Build System
-===================================
-
-
-Module: AVRDUDE
------------------
-
-The AVRDUDE module provides build targets for use with the official
-open source `AVRDUDE` programmer utility, for the reprogramming of Atmel devices
-using a wide variety of official and non-official programming devices and
-bootloaders.
-
-## Importing This Module into a Makefile:
-
-To use this module in your application makefile, add the following code to your
-makefile:
-
-    include $(DMBS_PATH)/avrdude.mk
-
-## Prerequisites:
-
-This module requires the `avrdude` utility to be available in your
-system's `PATH` variable. The `avrdude` utility is distributed on the project's
-[official site](https://savannah.nongnu.org/projects/avrdude) but is also
-made available in many *nix operating system's package managers.
-
-## Build Targets:
-
-The following targets are supported by this module:
-
-<table>
- <tbody>
-   <tr>
-    <td>avrdude-lfuse</td>
-    <td>Program the device low fuse. Requires AVRDUDE_LFUSE variable set.</td>
-   </tr>
-   <tr>
-    <td>avrdude-hfuse</td>
-    <td>Program the device high fuse. Requires AVRDUDE_HFUSE variable set.</td>
-   </tr>
-   <tr>
-    <td>avrdude-efuse</td>
-    <td>Program the device extended fuse. Requires AVRDUDE_EFUSE variable set.</td>
-   </tr>
-   <tr>
-    <td>avrdude-lock</td>
-    <td>Program the device lock bits. Requires AVRDUDE_LOCK variable set.</td>
-   </tr>
-   <tr>
-    <td>avrdude-fuses</td>
-    <td>Program the device fuses (lfuse, hfuse, efuse, lock bits).</td>
-   </tr>
-   <tr>
-    <td>avrdude</td>
-    <td>Program the device FLASH memory with the application's executable data.</td>
-   </tr>
-   <tr>
-    <td>avrdude-ee</td>
-    <td>Program the device EEPROM memory with the application's EEPROM data.</td>
-   </tr>
-   <tr>
-    <td>avrdude-all</td>
-    <td>Same as avrdude + avrdude-fuses.</td>
-   </tr>
-   <tr>
-    <td>avrdude-all-ee</td>
-    <td>Same as avrdude + avrdude-ee + avrdude-fuses.</td>
-   </tr>
- </tbody>
-</table>
-
-## Mandatory Variables:
-
-The following variables must be defined (with a `NAME = VALUE` syntax, one
-variable per line) in the user makefile to be able to use this module:
-
-<table>
- <tbody>
-   <tr>
-    <td>MCU</td>
-    <td>Name of the Atmel processor model (e.g. `at90usb1287`).</td>
-   </tr>
-   <tr>
-    <td>TARGET</td>
-    <td>Name of the application output file prefix (e.g. `TestApplication`).</td>
-   </tr>
- </tbody>
-</table>
-
-## Optional Variables:
-
-The following variables may be defined (with a `NAME = VALUE` syntax, one
-variable per line) in the user makefile. If not specified, a default value will
-be assumed.
-
-<table>
- <tbody>
-   <tr>
-    <td>AVRDUDE_PROGRAMMER</td>
-    <td>Name of the programmer/debugger tool or bootloader to communicate with (e.g. `jtagicemkii`). Default is `jtagicemkii`.</td>
-   </tr>
-   <tr>
-    <td>AVRDUDE_PORT</td>
-    <td>Name of the communication port to use when when programming with a serially connected tool (e.g. `COM2`). Default is `usb`.</td>
-   </tr>
-   <tr>
-    <td>AVRDUDE_FLAGS</td>
-    <td>Additional flags to pass to `avrdude` when invoking the tool. Default is empty (no additional flags).</td>
-   </tr>
-   <tr>
-    <td>AVRDUDE_MEMORY</td>
-    <td>Memory space to program when executing the `avrdude` target (e.g. 'application` for an XMEGA device). Default is `flash`.</td>
-   </tr>
-   <td>AVRDUDE_BAUD</td>
-   <td>Baud rate to use when executing the `avrdude` target (e.g. '115200` for an Optiboot device). Default is empty.</td>
-  </tr>
-  </tr>
-   <td>AVRDUDE_HFUSE</td>
-   <td>Fuse setting to use when executing the `avrdude-hfuse` target (format: 0x??). Default is empty.</td>
-  </tr>
-  </tr>
-   <td>AVRDUDE_EFUSE</td>
-   <td>Fuse setting to use when executing the `avrdude-efuse` target (format: 0x??). Default is empty.</td>
-  </tr>
-  </tr>
-   <td>AVRDUDE_LFUSE</td>
-   <td>Fuse setting to use when executing the `avrdude-lfuse` target (format: 0x??). Default is empty.</td>
-  </tr>
-  </tr>
-  <td>AVRDUDE_LOCK</td>
-  <td>Bit bits setting to use when executing the `avrdude-lock` target (format: 0x??). Default is empty.</td>
- </tr>
- </tbody>
-</table>
-
-## Provided Variables:
-
-The following variables may be referenced in a user makefile (via `$(NAME)`
-syntax) if desired, as they are provided by this module.
-
-<table>
- <tbody>
-   <tr>
-    <td>N/A</td>
-    <td>This module provides no variables.</td>
-   </tr>
- </tbody>
-</table>
-
-## Provided Macros:
-
-The following macros may be referenced in a user makefile (via
-`$(call NAME, ARG1, ARG2, ...)` syntax) if desired, as they are provided by
-this module.
-
-<table>
- <tbody>
-   <tr>
-    <td>N/A</td>
-    <td>This module provides no macros.</td>
-   </tr>
- </tbody>
-</table>
-
-## Module Changelog:
-
-The changes to this module since its initial release are listed below, as of the
-DMBS version where the change was made.
-
-### 20160403
-Initial release.
diff --git a/NativePrograms/LUFA/Build/DMBS/DMBS/avrdude.mk b/NativePrograms/LUFA/Build/DMBS/DMBS/avrdude.mk
deleted file mode 100644
index deca931808..0000000000
--- a/NativePrograms/LUFA/Build/DMBS/DMBS/avrdude.mk
+++ /dev/null
@@ -1,87 +0,0 @@
-#
-#            DMBS Build System
-#     Released into the public domain.
-#
-#  dean [at] fourwalledcubicle [dot] com
-#        www.fourwalledcubicle.com
-#
-
-DMBS_BUILD_MODULES         += AVRDUDE
-DMBS_BUILD_TARGETS         += avrdude-lfuse avrdude-hfuse avrdude-efuse avrdude-lock avrdude-fuses
-DMBS_BUILD_TARGETS         += avrdude avrdude-ee avrdude-all avrdude-all-ee
-DMBS_BUILD_MANDATORY_VARS  += MCU TARGET
-DMBS_BUILD_OPTIONAL_VARS   += AVRDUDE_PROGRAMMER AVRDUDE_PORT AVRDUDE_FLAGS AVRDUDE_MEMORY AVRDUDE_BAUD
-DMBS_BUILD_OPTIONAL_VARS   += AVRDUDE_LFUSE AVRDUDE_HFUSE AVRDUDE_EUSE AVRDUDE_LOCK
-DMBS_BUILD_PROVIDED_VARS   +=
-DMBS_BUILD_PROVIDED_MACROS +=
-
-# Import the CORE module of DMBS
-DMBS_MODULE_PATH := $(patsubst %/,%,$(dir $(lastword $(MAKEFILE_LIST))))
-include $(DMBS_MODULE_PATH)/core.mk
-
-# Default values of optionally user-supplied variables
-AVRDUDE_PROGRAMMER ?= jtagicemkii
-AVRDUDE_PORT       ?= usb
-AVRDUDE_FLAGS      ?=
-AVRDUDE_MEMORY     ?= flash
-AVRDUDE_LFUSE      ?=
-AVRDUDE_HFUSE      ?=
-AVRDUDE_EFUSE      ?=
-AVRDUDE_LOCK       ?=
-AVRDUDE_BAUD       ?=
-
-# Sanity check user supplied values
-$(foreach MANDATORY_VAR, $(DMBS_BUILD_MANDATORY_VARS), $(call ERROR_IF_UNSET, $(MANDATORY_VAR)))
-$(call ERROR_IF_EMPTY, MCU)
-$(call ERROR_IF_EMPTY, TARGET)
-$(call ERROR_IF_EMPTY, AVRDUDE_PROGRAMMER)
-$(call ERROR_IF_EMPTY, AVRDUDE_PORT)
-
-# Output Messages
-MSG_AVRDUDE_CMD    := ' [AVRDUDE] :'
-
-# Construct base avrdude command flags
-BASE_AVRDUDE_FLAGS := -p $(MCU) -P $(AVRDUDE_PORT) -c $(AVRDUDE_PROGRAMMER)
-ifneq ($(AVRDUDE_BAUD),)
-  BASE_AVRDUDE_FLAGS += -b $(AVRDUDE_BAUD)
-endif
-
-# Programs in the target FLASH memory using AVRDUDE
-avrdude: $(TARGET).hex $(MAKEFILE_LIST)
-	@echo $(MSG_AVRDUDE_CMD) Programming device \"$(MCU)\" FLASH using \"$(AVRDUDE_PROGRAMMER)\" on port \"$(AVRDUDE_PORT)\"
-	avrdude $(BASE_AVRDUDE_FLAGS) -U $(AVRDUDE_MEMORY):w:$< $(AVRDUDE_FLAGS)
-
-# Programs in the target EEPROM memory using AVRDUDE
-avrdude-ee: $(TARGET).eep $(MAKEFILE_LIST)
-	@echo $(MSG_AVRDUDE_CMD) Programming device \"$(MCU)\" EEPROM using \"$(AVRDUDE_PROGRAMMER)\" on port \"$(AVRDUDE_PORT)\"
-	avrdude $(BASE_AVRDUDE_FLAGS) -U eeprom:w:$< $(AVRDUDE_FLAGS)
-
-# Programs in the target fuses using AVRDUDE
-avrdude-lfuse: $(MAKEFILE_LIST)
-	@echo $(MSG_AVRDUDE_CMD) Programming device \"$(MCU)\" low fuse using \"$(AVRDUDE_PROGRAMMER)\" on port \"$(AVRDUDE_PORT)\"
-	$(call ERROR_IF_EMPTY, AVRDUDE_LFUSE)
-	avrdude $(BASE_AVRDUDE_FLAGS) -Ulfuse:w:$(AVRDUDE_LFUSE):m $(AVRDUDE_FLAGS)
-
-avrdude-hfuse: $(MAKEFILE_LIST)
-	@echo $(MSG_AVRDUDE_CMD) Programming device \"$(MCU)\" high fuse using \"$(AVRDUDE_PROGRAMMER)\" on port \"$(AVRDUDE_PORT)\"
-	$(call ERROR_IF_EMPTY, AVRDUDE_HFUSE)
-	avrdude $(BASE_AVRDUDE_FLAGS) -Uhfuse:w:$(AVRDUDE_HFUSE):m $(AVRDUDE_FLAGS)
-
-avrdude-efuse: $(MAKEFILE_LIST)
-	@echo $(MSG_AVRDUDE_CMD) Programming device \"$(MCU)\" extended fuse using \"$(AVRDUDE_PROGRAMMER)\" on port \"$(AVRDUDE_PORT)\"
-	$(call ERROR_IF_EMPTY, AVRDUDE_EFUSE)
-	avrdude $(BASE_AVRDUDE_FLAGS) -Uefuse:w:$(AVRDUDE_EFUSE):m $(AVRDUDE_FLAGS)
-
-avrdude-lock: $(MAKEFILE_LIST)
-	@echo $(MSG_AVRDUDE_CMD) Programming device \"$(MCU)\" lock bits using \"$(AVRDUDE_PROGRAMMER)\" on port \"$(AVRDUDE_PORT)\"
-	$(call ERROR_IF_EMPTY, AVRDUDE_LOCK)
-	avrdude $(BASE_AVRDUDE_FLAGS) -Ulock:w:$(AVRDUDE_LOCK):m $(AVRDUDE_FLAGS)
-
-avrdude-fuses: avrdude-lfuse avrdude-hfuse avrdude-efuse avrdude-lock
-
-avrdude-all: avrdude avrdude-fuses
-
-avrdude-all-ee: avrdude avrdude-ee avrdude-fuses
-
-# Phony build targets for this module
-.PHONY: $(DMBS_BUILD_TARGETS)
diff --git a/NativePrograms/LUFA/Build/DMBS/DMBS/core.md b/NativePrograms/LUFA/Build/DMBS/DMBS/core.md
deleted file mode 100644
index 12f877dd1c..0000000000
--- a/NativePrograms/LUFA/Build/DMBS/DMBS/core.md
+++ /dev/null
@@ -1,136 +0,0 @@
-DMBS - Dean's Makefile Build System
-===================================
-
-
-Module: CORE
-------------
-
-The CORE module provides the core DMBS infrastructure used by other DMBS
-modules, and must always be imported. Additionally, this module provides the
-help system for DMBS.
-
-## Importing This Module into a Makefile:
-
-To use this module in your application makefile, add the following code to your
-makefile:
-
-    include $(DMBS_PATH)/core.mk
-
-## Prerequisites:
-
-None.
-
-## Build Targets:
-
-The following targets are supported by this module:
-
-<table>
- <tbody>
-   <tr>
-    <td>help</td>
-    <td>Show help for the current project, including a list of all available targets, variables and macros from the imported modules.</td>
-   </tr>
-   <tr>
-    <td>list_targets</td>
-    <td>Show a list of all build targets from the imported modules.</td>
-   </tr>
-   <tr>
-    <td>list_modules</td>
-    <td>Show a list of all imported modules.</td>
-   </tr>
-   <tr>
-    <td>list_mandatory</td>
-    <td>Show a list of all mandatory variables from the imported modules.</td>
-   </tr>
-   <tr>
-    <td>list_optional</td>
-    <td>Show a list of all optional variables from the imported modules.</td>
-   </tr>
-   <tr>
-    <td>list_provided</td>
-    <td>Show a list of all variables provided by the imported modules.</td>
-   </tr>
-   <tr>
-    <td>list_macros</td>
-    <td>Show a list of all macros provided by the imported modules.</td>
-   </tr>
- </tbody>
-</table>
-
-## Mandatory Variables:
-
-The following variables must be defined (with a `NAME = VALUE` syntax, one
-variable per line) in the user makefile to be able to use this module:
-
-<table>
- <tbody>
-   <tr>
-    <td>N/A</td>
-    <td>This module has no mandatory variables.</td>
-   </tr>
- </tbody>
-</table>
-
-## Optional Variables:
-
-The following variables may be defined (with a `NAME = VALUE` syntax, one
-variable per line) in the user makefile. If not specified, a default value will
-be assumed.
-
-<table>
- <tbody>
-   <tr>
-    <td>N/A</td>
-    <td>This module has no optional variables.</td>
-   </tr>
- </tbody>
-</table>
-
-## Provided Variables:
-
-The following variables may be referenced in a user makefile (via `$(NAME)`
-syntax) if desired, as they are provided by this module.
-
-<table>
- <tbody>
-   <tr>
-    <td>DMBS_VERSION</td>
-    <td>Current version of this DMBS release, as a ISO 8601 integer (such as `20160403` for `2016-04-03`).</td>
-   </tr>
- </tbody>
-</table>
-
-## Provided Macros:
-
-The following macros may be referenced in a user makefile (via
-`$(call NAME, ARG1, ARG2, ...)` syntax) if desired, as they are provided by
-this module.
-
-<table>
- <tbody>
-   <tr>
-    <td>DMBS_CHECK_VERSION</td>
-    <td>Macro to check the current DMBS version against the first argument and abort if the required version is newer than the current version.</td>
-   </tr>
-   <tr>
-    <td>ERROR_IF_UNSET</td>
-    <td>Macro to check the given makefile variable name passed as the first argument, and abort if it has not been set by any makefile module.</td>
-   </tr>
-   <tr>
-    <td>ERROR_IF_EMPTY</td>
-    <td>Macro to check the given makefile variable name passed as the first argument, and abort if it has an empty value.</td>
-   </tr>
-   <tr>
-    <td>ERROR_IF_NONBOOL</td>
-    <td>Macro to check the given makefile variable name passed as the first argument, and abort if it has a value other than `Y` or `N`.</td>
-   </tr>
- </tbody>
-</table>
-
-## Module Changelog:
-
-The changes to this module since its initial release are listed below, as of the
-DMBS version where the change was made.
-
-### 20160403
-Initial release.
diff --git a/NativePrograms/LUFA/Build/DMBS/DMBS/core.mk b/NativePrograms/LUFA/Build/DMBS/DMBS/core.mk
deleted file mode 100644
index 584b36549b..0000000000
--- a/NativePrograms/LUFA/Build/DMBS/DMBS/core.mk
+++ /dev/null
@@ -1,152 +0,0 @@
-# Include Guard
-ifeq ($(filter CORE, $(DMBS_BUILD_MODULES)),)
-
-#
-#            DMBS Build System
-#     Released into the public domain.
-#
-#  dean [at] fourwalledcubicle [dot] com
-#        www.fourwalledcubicle.com
-#
-
-DMBS_BUILD_MODULES         += CORE
-DMBS_BUILD_TARGETS         += help list_targets list_modules list_mandatory list_optional list_provided list_macros
-DMBS_BUILD_MANDATORY_VARS  +=
-DMBS_BUILD_OPTIONAL_VARS   +=
-DMBS_BUILD_PROVIDED_VARS   += DMBS_VERSION
-DMBS_BUILD_PROVIDED_MACROS += DMBS_CHECK_VERSION ERROR_IF_UNSET ERROR_IF_EMPTY ERROR_IF_NONBOOL
-
-SHELL = /bin/sh
-
-# Current DMBS release version
-DMBS_VERSION       := 20171231
-
-# Macro to check the DMBS version, aborts if the given DMBS version is below the current version
-DMBS_CHECK_VERSION ?= $(if $(filter-out 0, $(shell test $(DMBS_VERSION) -lt $(1); echo $$?)), , $(error DMBS version $(1) or newer required, current version is $(DMBS_VERSION)))
-
-# Macros to use in other modules to check various conditions
-ERROR_IF_UNSET     ?= $(if $(filter undefined, $(origin $(strip $(1)))), $(error Makefile $(strip $(1)) value not set))
-ERROR_IF_EMPTY     ?= $(if $(strip $($(strip $(1)))), , $(error Makefile $(strip $(1)) option cannot be blank))
-ERROR_IF_NONBOOL   ?= $(if $(filter Y N, $($(strip $(1)))), , $(error Makefile $(strip $(1)) option must be Y or N))
-
-# Converts a given input to a printable output using "(None)" if no items are in the list
-CONVERT_TO_PRINTABLE           = $(if $(strip $(1)), $(1), (None))
-
-# Build sorted and filtered lists of the included build module data
-SORTED_DMBS_BUILD_MODULES      = $(sort $(DMBS_BUILD_MODULES))
-SORTED_DMBS_BUILD_TARGETS      = $(sort $(DMBS_BUILD_TARGETS))
-SORTED_DMBS_MANDATORY_VARS     = $(sort $(DMBS_BUILD_MANDATORY_VARS))
-SORTED_DMBS_OPTIONAL_VARS      = $(filter-out $(SORTED_DMBS_MANDATORY_VARS), $(sort $(DMBS_BUILD_OPTIONAL_VARS)))
-SORTED_DMBS_PROVIDED_VARS      = $(sort $(DMBS_BUILD_PROVIDED_VARS))
-SORTED_DMBS_PROVIDED_MACROS    = $(sort $(DMBS_BUILD_PROVIDED_MACROS))
-
-# Create printable versions of the sorted build module data (use "(None)" when no data is available)
-PRINTABLE_DMBS_BUILD_MODULES   = $(call CONVERT_TO_PRINTABLE, $(SORTED_DMBS_BUILD_MODULES))
-PRINTABLE_DMBS_BUILD_TARGETS   = $(call CONVERT_TO_PRINTABLE, $(SORTED_DMBS_BUILD_TARGETS))
-PRINTABLE_DMBS_MANDATORY_VARS  = $(call CONVERT_TO_PRINTABLE, $(SORTED_DMBS_MANDATORY_VARS))
-PRINTABLE_DMBS_OPTIONAL_VARS   = $(call CONVERT_TO_PRINTABLE, $(SORTED_DMBS_OPTIONAL_VARS))
-PRINTABLE_DMBS_PROVIDED_VARS   = $(call CONVERT_TO_PRINTABLE, $(SORTED_DMBS_PROVIDED_VARS))
-PRINTABLE_DMBS_PROVIDED_MACROS = $(call CONVERT_TO_PRINTABLE, $(SORTED_DMBS_PROVIDED_MACROS))
-
-help:
-	@echo "==================================================================="
-	@echo "                       The DMBS Build System                       "
-	@echo "         By Dean Camera { dean @ fourwalledcubicle . com }         "
-	@echo "==================================================================="
-	@echo "DESCRIPTION:                                                       "
-	@echo " This build system is a set of makefile modules for (GNU) Make, to "
-	@echo " provide a simple system for building DMBS powered applications.   "
-	@echo " Each makefile module can be included from within a user makefile, "
-	@echo " to expose the build rules documented in the comments at the top of"
-	@echo " each build module.                                                "
-	@echo "                                                                   "
-	@echo "USAGE:                                                             "
-	@echo " To execute a rule, define all variables indicated in the desired  "
-	@echo " module as a required parameter before including the build module  "
-	@echo " in your project makefile. Parameters marked as optional will      "
-	@echo " assume a default value in the modules if not user-assigned.       "
-	@echo "                                                                   "
-	@echo " By default the target output shows both a friendly summary, as    "
-	@echo " well as the actual invoked command. To suppress the output of the "
-	@echo " invoked commands and show only the friendly command output, run   "
-	@echo " make with the \"-s\" switch added before the target(s).           "
-	@echo "==================================================================="
-	@echo "                                                                   "
-	@echo "  Currently used build system modules in this application:         "
-	@echo "                                                                   "
-	@printf " %b" "$(PRINTABLE_DMBS_BUILD_MODULES:%=   - %\n)"
-	@echo "                                                                   "
-	@echo "                                                                   "
-	@echo "  Currently available build targets in this application:           "
-	@echo "                                                                   "
-	@printf " %b" "$(PRINTABLE_DMBS_BUILD_TARGETS:%=   - %\n)"
-	@echo "                                                                   "
-	@echo "                                                                   "
-	@echo "  Mandatory variables required by the selected build Modules:      "
-	@echo "                                                                   "
-	@printf " %b" "$(PRINTABLE_DMBS_MANDATORY_VARS:%=   - %\n)"
-	@echo "                                                                   "
-	@echo "                                                                   "
-	@echo "  Optional variables required by the selected build Modules:       "
-	@echo "                                                                   "
-	@printf " %b" "$(PRINTABLE_DMBS_OPTIONAL_VARS:%=   - %\n)"
-	@echo "                                                                   "
-	@echo "                                                                   "
-	@echo "  Variables provided by the selected build Modules:                "
-	@echo "                                                                   "
-	@printf " %b" "$(PRINTABLE_DMBS_PROVIDED_VARS:%=   - %\n)"
-	@echo "                                                                   "
-	@echo "                                                                   "
-	@echo "  Macros provided by the selected build Modules:                   "
-	@echo "                                                                   "
-	@printf " %b" "$(PRINTABLE_DMBS_PROVIDED_MACROS:%=   - %\n)"
-	@echo "                                                                   "
-	@echo "==================================================================="
-	@echo "          The DMBS Build System $(DMBS_VERSION) - Making MAKE easier."
-	@echo "==================================================================="
-
-# Lists build modules included by the project makefile, in alphabetical order
-list_modules:
-	@echo Currently Used Build System Modules:
-	@printf " %b" "$(PRINTABLE_DMBS_BUILD_MODULES:%=   - %\n)"
-
-# Lists build targets included by the project makefile, in alphabetical order
-list_targets:
-	@echo Currently Available Build Targets:
-	@printf " %b" "$(PRINTABLE_DMBS_BUILD_TARGETS:%=   - %\n)"
-
-# Lists mandatory variables that must be set by the project makefile, in alphabetical order
-list_mandatory:
-	@echo Mandatory Variables for Included Modules:
-	@printf " %b" "$(PRINTABLE_DMBS_MANDATORY_VARS:%=   - %\n)"
-
-# Lists optional variables that must be set by the project makefile, in alphabetical order
-list_optional:
-	@echo Optional Variables for Included Modules:
-	@printf " %b" "$(PRINTABLE_DMBS_OPTIONAL_VARS:%=   - %\n)"
-
-# Lists variables provided by the included build modules, in alphabetical order
-list_provided:
-	@echo Variables Provided by the Included Modules:
-	@printf " %b" "$(PRINTABLE_DMBS_PROVIDED_VARS:%=   - %\n)"
-
-# Lists macros provided by the included build modules, in alphabetical order
-list_macros:
-	@echo Macros Provided by the Included Modules:
-	@printf " %b" "$(PRINTABLE_DMBS_PROVIDED_MACROS:%=   - %\n)"
-
-# Debugging; "make print-VARNAME" will output the variable VARNAME's value
-print-%:
-	@printf "%s = %s" $(@:print-%=%) $($(@:print-%=%))
-
-# Disable default in-built make rules (those that are needed are explicitly
-# defined, and doing so has performance benefits when recursively building)
-ifeq ($(filter -r,$(MAKEFLAGS)),)
-  MAKEFLAGS += -r
-endif
-.SUFFIXES:
-
-# Phony build targets for this module
-.PHONY: $(DMBS_BUILD_TARGETS)
-
-endif
diff --git a/NativePrograms/LUFA/Build/DMBS/DMBS/cppcheck.md b/NativePrograms/LUFA/Build/DMBS/DMBS/cppcheck.md
deleted file mode 100644
index c13cf71d37..0000000000
--- a/NativePrograms/LUFA/Build/DMBS/DMBS/cppcheck.md
+++ /dev/null
@@ -1,134 +0,0 @@
-DMBS - Dean's Makefile Build System
-===================================
-
-
-Module: CPPCHECK
------------------
-
-The CPPCHECK module provides build targets to perform static analysis of the
-user application, using the open source `cppcheck` tool.
-
-## Importing This Module into a Makefile:
-
-To use this module in your application makefile, add the following code to your
-makefile:
-
-    include $(DMBS_PATH)/cppcheck.mk
-
-## Prerequisites:
-
-This module requires the `cppcheck` utility to be available in your system's
-`PATH` variable. The `cppcheck` utility is distributed on the project's
-[official site](http://cppcheck.sourceforge.net/) but is also
-made available in many *nix operating system's package managers.
-
-## Build Targets:
-
-The following targets are supported by this module:
-
-<table>
- <tbody>
-   <tr>
-    <td>cppcheck</td>
-    <td>Scan the project with CPPCHECK, and show all discovered issues.</td>
-   </tr>
-   <tr>
-    <td>cppcheck-config</td>
-    <td>Check the project with CPPCHECK, to find missing header paths.</td>
-   </tr>
- </tbody>
-</table>
-
-## Mandatory Variables:
-
-The following variables must be defined (with a `NAME = VALUE` syntax, one
-variable per line) in the user makefile to be able to use this module:
-
-<table>
- <tbody>
-   <tr>
-    <td>SRC</td>
-    <td>List of all project source files to scan.</td>
-   </tr>
- </tbody>
-</table>
-
-## Optional Variables:
-
-The following variables may be defined (with a `NAME = VALUE` syntax, one
-variable per line) in the user makefile. If not specified, a default value will
-be assumed.
-
-<table>
- <tbody>
-   <tr>
-    <td>CPPCHECK_INCLUDES</td>
-    <td>Extra include paths to search, for any missing header files. Default is empty (no additional paths).</td>
-   </tr>
-   <tr>
-    <td>CPPCHECK_EXCLUDES</td>
-    <td>List of source files, file paths or path fragments to exclude from the scan. Default is empty (no exclusions).</td>
-   </tr>
-   <tr>
-    <td>CPPCHECK_MSG_TEMPLATE</td>
-    <td>Template for error and warning message output. Default is `{file}:{line}: {severity} ({id}): {message}`.</td>
-   </tr>
-   <tr>
-    <td>CPPCHECK_ENABLE</td>
-    <td>List of CPPCHECK checks to enable. Default is `all`.</td>
-   </tr>
-   <tr>
-    <td>CPPCHECK_SUPPRESS</td>
-    <td>List of CPPCHECK checks to ignore. Default is `variableScope missingInclude`.</td>
-   </tr>
-   <tr>
-    <td>CPPCHECK_FAIL_ON_WARNING</td>
-    <td>Boolean, if `Y` the build will fail if CPPCHECK discovers any errors or warnings. If `N`, fail only on errors. Default is `Y`.</td>
-   </tr>
-   <tr>
-    <td>CPPCHECK_QUIET</td>
-    <td>Boolean, if `Y` CPPCHECK will suppress all output except for discovered errors or warnings. If `N`, scan progress will be emitted. Default is `Y`.</td>
-   </tr>
-   <tr>
-    <td>CPPCHECK_FLAGS_</td>
-    <td>Additional flags to pass to CPPCHECK when scans are started. Default is empty (no additional flags).</td>
-   </tr>
- </tbody>
-</table>
-
-## Provided Variables:
-
-The following variables may be referenced in a user makefile (via `$(NAME)`
-syntax) if desired, as they are provided by this module.
-
-<table>
- <tbody>
-   <tr>
-    <td>N/A</td>
-    <td>This module provides no variables.</td>
-   </tr>
- </tbody>
-</table>
-
-## Provided Macros:
-
-The following macros may be referenced in a user makefile (via
-`$(call NAME, ARG1, ARG2, ...)` syntax) if desired, as they are provided by
-this module.
-
-<table>
- <tbody>
-   <tr>
-    <td>N/A</td>
-    <td>This module provides no macros.</td>
-   </tr>
- </tbody>
-</table>
-
-## Module Changelog:
-
-The changes to this module since its initial release are listed below, as of the
-DMBS version where the change was made.
-
-### 20160403
-Initial release.
diff --git a/NativePrograms/LUFA/Build/DMBS/DMBS/cppcheck.mk b/NativePrograms/LUFA/Build/DMBS/DMBS/cppcheck.mk
deleted file mode 100644
index 1d931fc14c..0000000000
--- a/NativePrograms/LUFA/Build/DMBS/DMBS/cppcheck.mk
+++ /dev/null
@@ -1,64 +0,0 @@
-#
-#            DMBS Build System
-#     Released into the public domain.
-#
-#  dean [at] fourwalledcubicle [dot] com
-#        www.fourwalledcubicle.com
-#
-
-DMBS_BUILD_MODULES         += CPPCHECK
-DMBS_BUILD_TARGETS         += cppcheck cppcheck-config
-DMBS_BUILD_MANDATORY_VARS  += SRC
-DMBS_BUILD_OPTIONAL_VARS   += CPPCHECK_INCLUDES CPPCHECK_EXCLUDES CPPCHECK_MSG_TEMPLATE CPPCHECK_ENABLE \
-                              CPPCHECK_SUPPRESS CPPCHECK_FAIL_ON_WARNING CPPCHECK_QUIET CPPCHECK_FLAGS
-DMBS_BUILD_PROVIDED_VARS   +=
-DMBS_BUILD_PROVIDED_MACROS +=
-
-# Import the CORE module of DMBS
-DMBS_MODULE_PATH := $(patsubst %/,%,$(dir $(lastword $(MAKEFILE_LIST))))
-include $(DMBS_MODULE_PATH)/core.mk
-
-# Default values of optionally user-supplied variables
-CPPCHECK_INCLUDES            ?=
-CPPCHECK_EXCLUDES            ?=
-CPPCHECK_MSG_TEMPLATE        ?= {file}:{line}: {severity} ({id}): {message}
-CPPCHECK_ENABLE              ?= all
-CPPCHECK_SUPPRESS            ?= variableScope missingInclude
-CPPCHECK_FAIL_ON_WARNING     ?= Y
-CPPCHECK_QUIET               ?= Y
-CPPCHECK_FLAGS               ?=
-
-# Sanity check user supplied values
-$(foreach MANDATORY_VAR, $(DMBS_BUILD_MANDATORY_VARS), $(call ERROR_IF_UNSET, $(MANDATORY_VAR)))
-$(call ERROR_IF_EMPTY, SRC)
-$(call ERROR_IF_EMPTY, CPPCHECK_MSG_TEMPLATE)
-$(call ERROR_IF_EMPTY, CPPCHECK_ENABLE)
-$(call ERROR_IF_NONBOOL, CPPCHECK_FAIL_ON_WARNING)
-$(call ERROR_IF_NONBOOL, CPPCHECK_QUIET)
-
-# Build a default argument list for cppcheck
-BASE_CPPCHECK_FLAGS := --template="$(CPPCHECK_MSG_TEMPLATE)" $(CPPCHECK_INCLUDES:%=-I%) $(CPPCHECK_EXCLUDES:%=-i%) --inline-suppr --force --std=c99
-
-# Sanity check parameters and construct additional command line arguments to cppcheck
-ifeq ($(CPPCHECK_FAIL_ON_WARNING), Y)
-   BASE_CPPCHECK_FLAGS += --error-exitcode=1
-endif
-ifeq ($(CPPCHECK_QUIET), Y)
-   BASE_CPPCHECK_FLAGS += --quiet
-endif
-
-# Output Messages
-MSG_CPPCHECK_CMD         := ' [CPPCHECK]:'
-
-# Checks the CPPCheck configuration as used in the user project, to determine if any paths are missing or invalid
-cppcheck-config: $(MAKEFILE_LIST)
-	@echo $(MSG_CPPCHECK_CMD) Checking cppcheck configuration check on source files
-	cppcheck $(BASE_CPPCHECK_FLAGS) --check-config $(CPPCHECK_FLAGS) $(SRC)
-
-# Runs a static analysis using CPPCheck to determine if there are any issues
-cppcheck: $(MAKEFILE_LIST)
-	@echo $(MSG_CPPCHECK_CMD) Performing static analysis on source files
-	cppcheck $(BASE_CPPCHECK_FLAGS) --enable=$(CPPCHECK_ENABLE) $(CPPCHECK_SUPPRESS:%=--suppress=%) $(CPPCHECK_FLAGS) $(SRC)
-
-# Phony build targets for this module
-.PHONY: $(DMBS_BUILD_TARGETS)
diff --git a/NativePrograms/LUFA/Build/DMBS/DMBS/dfu.md b/NativePrograms/LUFA/Build/DMBS/DMBS/dfu.md
deleted file mode 100644
index 8bac7d1b9e..0000000000
--- a/NativePrograms/LUFA/Build/DMBS/DMBS/dfu.md
+++ /dev/null
@@ -1,122 +0,0 @@
-DMBS - Dean's Makefile Build System
-===================================
-
-
-Module: DFU
------------------
-
-The DFU module provides build targets to program a USB connected target running
-a DFU class bootloader, via the official Atmel FLIP utility running via the
-command line, or the open source `DFU-Programmer` tool.
-
-## Importing This Module into a Makefile:
-
-To use this module in your application makefile, add the following code to your
-makefile:
-
-    include $(DMBS_PATH)/dfu.mk
-
-## Prerequisites:
-
-This module requires the `batchisp` utility to be available in your system's
-`PATH` variable. The `batchisp` utility is distributed as part of Atmel's FLIP
-software which can be downloaded from the [official site](http://www.atmel.com).
-
-This module requires the `dfu-programmer` utility to be available in your
-system's `PATH` variable. The `dfu-programmer` utility is distributed from the
-[official project site](https://dfu-programmer.github.io/).
-
-## Build Targets:
-
-The following targets are supported by this module:
-
-<table>
- <tbody>
-   <tr>
-    <td>flip</td>
-    <td>Program the application into the device's flash memory, using Atmel FLIP.</td>
-   </tr>
-   <tr>
-    <td>flip-ee</td>
-    <td>Program the application's EEPROM data into the device's EEPROM memory, using Atmel FLIP.</td>
-   </tr>
-   <tr>
-    <td>dfu</td>
-    <td>Program the application into the device's flash memory, using `dfu-programmer`.</td>
-   </tr>
-   <tr>
-    <td>dfu-ee</td>
-    <td>Program the application's EEPROM data into the device's EEPROM memory, using `dfu-programmer`.</td>
-   </tr>
- </tbody>
-</table>
-
-## Mandatory Variables:
-
-The following variables must be defined (with a `NAME = VALUE` syntax, one
-variable per line) in the user makefile to be able to use this module:
-
-<table>
- <tbody>
-   <tr>
-    <td>MCU</td>
-    <td>Name of the Atmel processor model (e.g. `at90usb1287`).</td>
-   </tr>
-   <tr>
-    <td>TARGET</td>
-    <td>Name of the application output file prefix (e.g. `TestApplication`).</td>
-   </tr>   
- </tbody>
-</table>
-
-## Optional Variables:
-
-The following variables may be defined (with a `NAME = VALUE` syntax, one
-variable per line) in the user makefile. If not specified, a default value will
-be assumed.
-
-<table>
- <tbody>
-   <tr>
-    <td>N/A</td>
-    <td>This module has no optional variables.</td>
-   </tr>
- </tbody>
-</table>
-
-## Provided Variables:
-
-The following variables may be referenced in a user makefile (via `$(NAME)`
-syntax) if desired, as they are provided by this module.
-
-<table>
- <tbody>
-   <tr>
-    <td>N/A</td>
-    <td>This module provides no variables.</td>
-   </tr>
- </tbody>
-</table>
-
-## Provided Macros:
-
-The following macros may be referenced in a user makefile (via
-`$(call NAME, ARG1, ARG2, ...)` syntax) if desired, as they are provided by
-this module.
-
-<table>
- <tbody>
-   <tr>
-    <td>N/A</td>
-    <td>This module provides no macros.</td>
-   </tr>
- </tbody>
-</table>
-
-## Module Changelog:
-
-The changes to this module since its initial release are listed below, as of the
-DMBS version where the change was made.
-
-### 20160403
-Initial release.
diff --git a/NativePrograms/LUFA/Build/DMBS/DMBS/dfu.mk b/NativePrograms/LUFA/Build/DMBS/DMBS/dfu.mk
deleted file mode 100644
index ef17781bc1..0000000000
--- a/NativePrograms/LUFA/Build/DMBS/DMBS/dfu.mk
+++ /dev/null
@@ -1,60 +0,0 @@
-#
-#            DMBS Build System
-#     Released into the public domain.
-#
-#  dean [at] fourwalledcubicle [dot] com
-#        www.fourwalledcubicle.com
-#
-
-DMBS_BUILD_MODULES         += DFU
-DMBS_BUILD_TARGETS         += flip flip-ee dfu dfu-ee
-DMBS_BUILD_MANDATORY_VARS  += MCU TARGET
-DMBS_BUILD_OPTIONAL_VARS   +=
-DMBS_BUILD_PROVIDED_VARS   +=
-DMBS_BUILD_PROVIDED_MACROS +=
-
-# Import the CORE module of DMBS
-DMBS_MODULE_PATH := $(patsubst %/,%,$(dir $(lastword $(MAKEFILE_LIST))))
-include $(DMBS_MODULE_PATH)/core.mk
-
-# Sanity-check values of mandatory user-supplied variables
-$(foreach MANDATORY_VAR, $(DMBS_BUILD_MANDATORY_VARS), $(call ERROR_IF_UNSET, $(MANDATORY_VAR)))
-$(call ERROR_IF_EMPTY, MCU)
-$(call ERROR_IF_EMPTY, TARGET)
-
-# Output Messages
-MSG_COPY_CMD   := ' [CP]      :'
-MSG_REMOVE_CMD := ' [RM]      :'
-MSG_DFU_CMD    := ' [DFU]     :'
-
-# Programs in the target FLASH memory using BATCHISP, the command line tool used by FLIP
-flip: $(TARGET).hex $(MAKEFILE_LIST)
-	@echo $(MSG_DFU_CMD) Programming FLASH with batchisp using \"$<\"
-	batchisp -hardware usb -device $(MCU) -operation erase f loadbuffer $< program
-	batchisp -hardware usb -device $(MCU) -operation start reset 0
-
-# Programs in the target EEPROM memory using BATCHISP, the command line tool used by FLIP
-flip-ee: $(TARGET).eep $(MAKEFILE_LIST)
-	@echo $(MSG_COPY_CMD) Copying EEP file to temporary file \"$<.hex\"
-	cp $< $<.hex
-	@echo $(MSG_DFU_CMD) Programming EEPROM with batchisp using \"$<.hex\"
-	batchisp -hardware usb -device $(MCU) -operation memory EEPROM loadbuffer $<.hex program
-	batchisp -hardware usb -device $(MCU) -operation start reset 0
-	@echo $(MSG_REMOVE_CMD) Removing temporary file \"$<.hex\"
-	rm $<.hex
-
-# Programs in the target FLASH memory using DFU-PROGRAMMER
-dfu: $(TARGET).hex $(MAKEFILE_LIST)
-	@echo $(MSG_DFU_CMD) Programming FLASH with dfu-programmer using \"$<\"
-	dfu-programmer $(MCU) erase
-	dfu-programmer $(MCU) flash $<
-	dfu-programmer $(MCU) reset
-
-# Programs in the target EEPROM memory using DFU-PROGRAMMER
-dfu-ee: $(TARGET).eep $(MAKEFILE_LIST)
-	@echo $(MSG_DFU_CMD) Programming EEPROM with dfu-programmer using \"$<\"
-	dfu-programmer $(MCU) flash --eeprom $<
-	dfu-programmer $(MCU) reset
-
-# Phony build targets for this module
-.PHONY: $(DMBS_BUILD_TARGETS)
diff --git a/NativePrograms/LUFA/Build/DMBS/DMBS/doxygen.md b/NativePrograms/LUFA/Build/DMBS/DMBS/doxygen.md
deleted file mode 100644
index 8b2e337bbf..0000000000
--- a/NativePrograms/LUFA/Build/DMBS/DMBS/doxygen.md
+++ /dev/null
@@ -1,118 +0,0 @@
-DMBS - Dean's Makefile Build System
-===================================
-
-
-Module: DOXYGEN
------------------
-
-The DOXYGEN module provides build targets to automatically generate API
-documentation for a project, using the open-source Doxygen tool.
-
-## Importing This Module into a Makefile:
-
-To use this module in your application makefile, add the following code to your
-makefile:
-
-    include $(DMBS_PATH)/doxygen.mk
-
-## Prerequisites:
-
-This module requires the `doxygen` utility to be available in your system's
-`PATH` variable. The `doxygen` utility is distributed on the project's
-[official site](http://doxygen.org/) but is also
-made available in many *nix operating system's package managers.
-
-## Build Targets:
-
-The following targets are supported by this module:
-
-<table>
- <tbody>
-   <tr>
-    <td>doxygen</td>
-    <td>Generate project documentation, via Doxygen.</td>
-   </tr>
-   <tr>
-    <td>doxygen-create</td>
-    <td>Create a new project Doxygen template, which can then be customized.</td>
-   </tr>
-   <tr>
-    <td>doxygen-upgrade</td>
-    <td>Upgrade an existing project Doxygen template to the latest Doxygen version.</td>
-   </tr>
- </tbody>
-</table>
-
-## Mandatory Variables:
-
-The following variables must be defined (with a `NAME = VALUE` syntax, one
-variable per line) in the user makefile to be able to use this module:
-
-<table>
- <tbody>
-   <tr>
-    <td>N/A</td>
-    <td>This module has no mandatory variables.</td>
-   </tr>
- </tbody>
-</table>
-
-## Optional Variables:
-
-The following variables may be defined (with a `NAME = VALUE` syntax, one
-variable per line) in the user makefile. If not specified, a default value will
-be assumed.
-
-<table>
- <tbody>
-   <tr>
-    <td>DOXYGEN_CONF</td>
-    <td>Name of the Doxygen project configuration file that should be used when generating documentation, or creating/upgrading the configuration file.</td>
-   </tr>
-   <tr>
-    <td>DOXYGEN_FAIL_ON_WARNING</td>
-    <td>Boolean, if `Y` the build will fail if Doxygen encounters any errors or warnings. If `N`, fail only on errors. Default is `Y`.</td>
-   </tr>
-   <tr>
-    <td>DOXYGEN_OVERRIDE_PARAMS</td>
-    <td>List of `NAME=VALUE` parameters which should override the values specified in the project configuration file, when building documentation.</td>
-   </tr>
- </tbody>
-</table>
-
-## Provided Variables:
-
-The following variables may be referenced in a user makefile (via `$(NAME)`
-syntax) if desired, as they are provided by this module.
-
-<table>
- <tbody>
-   <tr>
-    <td>N/A</td>
-    <td>This module provides no variables.</td>
-   </tr>
- </tbody>
-</table>
-
-## Provided Macros:
-
-The following macros may be referenced in a user makefile (via
-`$(call NAME, ARG1, ARG2, ...)` syntax) if desired, as they are provided by
-this module.
-
-<table>
- <tbody>
-   <tr>
-    <td>N/A</td>
-    <td>This module provides no macros.</td>
-   </tr>
- </tbody>
-</table>
-
-## Module Changelog:
-
-The changes to this module since its initial release are listed below, as of the
-DMBS version where the change was made.
-
-### 20160403
-Initial release.
diff --git a/NativePrograms/LUFA/Build/DMBS/DMBS/doxygen.mk b/NativePrograms/LUFA/Build/DMBS/DMBS/doxygen.mk
deleted file mode 100644
index 6568e240b8..0000000000
--- a/NativePrograms/LUFA/Build/DMBS/DMBS/doxygen.mk
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-#            DMBS Build System
-#     Released into the public domain.
-#
-#  dean [at] fourwalledcubicle [dot] com
-#        www.fourwalledcubicle.com
-#
-
-DMBS_BUILD_MODULES         += DOXYGEN
-DMBS_BUILD_TARGETS         += doxygen doxygen-upgrade doxygen-create
-DMBS_BUILD_MANDATORY_VARS  +=
-DMBS_BUILD_OPTIONAL_VARS   += DOXYGEN_CONF DOXYGEN_FAIL_ON_WARNING DOXYGEN_OVERRIDE_PARAMS
-DMBS_BUILD_PROVIDED_VARS   +=
-DMBS_BUILD_PROVIDED_MACROS +=
-
-# Import the CORE module of DMBS
-DMBS_MODULE_PATH := $(patsubst %/,%,$(dir $(lastword $(MAKEFILE_LIST))))
-include $(DMBS_MODULE_PATH)/core.mk
-
-# Default values of optionally user-supplied variables
-DOXYGEN_CONF            ?= doxyfile
-DOXYGEN_FAIL_ON_WARNING ?= Y
-DOXYGEN_OVERRIDE_PARAMS ?= QUIET=YES
-
-# Sanity check user supplied values
-$(foreach MANDATORY_VAR, $(DMBS_BUILD_MANDATORY_VARS), $(call ERROR_IF_UNSET, $(MANDATORY_VAR)))
-$(call ERROR_IF_EMPTY, DOXYGEN_CONF)
-$(call ERROR_IF_NONBOOL, DOXYGEN_FAIL_ON_WARNING)
-
-# Output Messages
-MSG_DOXYGEN_CMD         := ' [DOXYGEN] :'
-
-# Determine Doxygen invocation command
-BASE_DOXYGEN_CMD := ( cat $(DOXYGEN_CONF) $(DOXYGEN_OVERRIDE_PARAMS:%=; echo "%") ) | doxygen -
-ifeq ($(DOXYGEN_FAIL_ON_WARNING), Y)
-   DOXYGEN_CMD := if ( $(BASE_DOXYGEN_CMD) 2>&1 | grep -v "warning: ignoring unsupported tag" ;); then exit 1; fi;
-else
-   DOXYGEN_CMD := $(BASE_DOXYGEN_CMD)
-endif
-
-# Error if the specified Doxygen configuration file does not exist
-$(DOXYGEN_CONF):
-	$(error Doxygen configuration file $@ does not exist)
-
-# Builds the project documentation using the specified configuration file and the DOXYGEN tool
-doxygen: $(DOXYGEN_CONF) $(MAKEFILE_LIST)
-	@echo $(MSG_DOXYGEN_CMD) Configuration file \"$(DOXYGEN_CONF)\" with parameters \"$(DOXYGEN_OVERRIDE_PARAMS)\"
-	$(DOXYGEN_CMD)
-
-# Upgrades an existing Doxygen configuration file to the latest Doxygen template, preserving settings
-doxygen-upgrade: $(DOXYGEN_CONF) $(MAKEFILE_LIST)
-	@echo $(MSG_DOXYGEN_CMD) Upgrading configuration file \"$(DOXYGEN_CONF)\" with latest template
-	doxygen -u $(DOXYGEN_CONF) > /dev/null
-
-# Creates a new Doxygen configuration file with the set file name
-doxygen-create: $(MAKEFILE_LIST)
-	@echo $(MSG_DOXYGEN_CMD) Creating new configuration file \"$(DOXYGEN_CONF)\" with latest template
-	doxygen -g $(DOXYGEN_CONF) > /dev/null
diff --git a/NativePrograms/LUFA/Build/DMBS/DMBS/gcc.md b/NativePrograms/LUFA/Build/DMBS/DMBS/gcc.md
deleted file mode 100644
index 810db2cbc8..0000000000
--- a/NativePrograms/LUFA/Build/DMBS/DMBS/gcc.md
+++ /dev/null
@@ -1,215 +0,0 @@
-DMBS - Dean's Makefile Build System
-===================================
-
-
-Module: GCC
------------------
-
-The GCC module provides build targets to compile a user application, using a
-variant of GCC for a specific target architecture (such as `avr-gcc`).
-
-## Importing This Module into a Makefile:
-
-To use this module in your application makefile, add the following code to your
-makefile:
-
-    include $(DMBS_PATH)/gcc.mk
-
-## Prerequisites:
-
-This module requires the GCC compiler to be installed and available in the
-system's `PATH` variable for the desired target architecture.
-
-## Build Targets:
-
-The following targets are supported by this module:
-
-<table>
- <tbody>
-   <tr>
-    <td>size</td>
-    <td>Show the compiled binary size for the various memory segments.</td>
-   </tr>
-   <tr>
-    <td>symbol-sizes</td>
-    <td>Show the size of each symbol in the compiled binary (useful to find large functions to optimize further).</td>
-   </tr>
-   <tr>
-    <td>all</td>
-    <td>Build application and generate all binary (BIN, ELF, HEX) and auxiliary (LSS, MAP, SYM, etc.) output files.</td>
-   </tr>
-   <tr>
-    <td>lib</td>
-    <td>Generate a static `.a` library from the application code, containing the flash region's data.</td>
-   </tr>
-   <tr>
-    <td>elf</td>
-    <td>Generate an ELF debug file from the application code, containing all region's data.</td>
-   </tr>
-   <tr>
-    <td>bin</td>
-    <td>Generate a flat BIN binary file from the application code, containing the flash region's data.</td>
-   </tr>
-   <tr>
-    <td>hex</td>
-    <td>Generate a pair of Intel HEX files from the application code, containing the flash region's data (HEX) and EEPROM data (EEP).</td>
-   </tr>
-   <tr>
-    <td>lss</td>
-    <td>Generate a LSS listing file showing the disassembly of the compiled application.</td>
-   </tr>
-   <tr>
-    <td>clean</td>
-    <td>Remove all generated project intermediary and binary output files.</td>
-   </tr>
-   <tr>
-    <td>mostlyclean</td>
-    <td>Remove all generated project intermediary output files, but preserve the binary output files.</td>
-   </tr>
- </tbody>
-</table>
-
-## Mandatory Variables:
-
-The following variables must be defined (with a `NAME = VALUE` syntax, one
-variable per line) in the user makefile to be able to use this module:
-
-<table>
- <tbody>
-   <tr>
-    <td>MCU</td>
-    <td>Name of the Atmel processor model (e.g. `at90usb1287`).</td>
-   </tr>
-   <tr>
-    <td>TARGET</td>
-    <td>Name of the application output file prefix (e.g. `TestApplication`).</td>
-   </tr>
-   <tr>
-    <td>ARCH</td>
-    <td>Target device architecture (e.g. `AVR8`).</td>
-   </tr>
-   <tr>
-     <td>SRC</td>
-     <td>List of all project source files (C, C++, ASM).</td>
-   </tr>
- </tbody>
-</table>
-
-## Optional Variables:
-
-The following variables may be defined (with a `NAME = VALUE` syntax, one
-variable per line) in the user makefile. If not specified, a default value will
-be assumed.
-
-<table>
- <tbody>
-   <tr>
-    <td>COMPILER_PATH</td>
-    <td>Path to the compiler to use, in case a specific compiler should be substituted for the one in the system's `PATH` variable. Default is blank (use `PATH` provided compiler).</td>
-   </tr>
-   <tr>
-    <td>OPTIMIZATION</td>
-    <td>Optimization level to use when compiling C and C++ source files. Default is `s` (optimize for smallest size).</td>
-   </tr>
-   <tr>
-    <td>C_STANDARD</td>
-    <td>C language standard used when compiling C language source files. Default is `gnu99` (C99 standard with GNU extensions)./td>
-   </tr>
-   <tr>
-    <td>CPP_STANDARD</td>
-    <td>C++ language standard used when compiling C++ language source files. Default is `gnu++98` (C++98 standard with GNU extensions)./td>
-   </tr>
-   <tr>
-    <td>F_CPU</td>
-    <td>Processor core clock frequency, in Hz. This is used by some architectures for functions such as software spin-loop delays. Default is blank (no value defined).</td>
-   </tr>
-   <tr>
-    <td>C_FLAGS</td>
-    <td>Common GCC flags passed to the compiler for C language (C) input files. Default is blank (no additional flags).</td>
-   </tr>
-   <tr>
-    <td>CPP_FLAGS</td>
-    <td>Common GCC flags passed to the compiler for C++ language (CPP) input files. Default is blank (no additional flags).</td>
-   </tr>
-   <tr>
-    <td>ASM_FLAGS</td>
-    <td>Common GCC flags passed to the assembler for assembly language (S) input files. Default is blank (no additional flags).</td>
-   </tr>
-   <tr>
-    <td>CC_FLAGS</td>
-    <td>Common GCC flags passed to the compiler for all source file types. Default is blank (no additional flags).</td>
-   </tr>
-   <tr>
-    <td>LD_FLAGS</td>
-    <td>Extra flags to pass to the GNU linker when linking the compiled object files into the resulting binary. Default is blank (no additional flags).</td>
-   </tr>
-   <tr>
-    <td>LINKER_RELAXATIONS</td>
-    <td>Boolean, if `Y` linker relaxations will be enabled to slightly reduce the resulting binary's size. Default is `Y`.</td>
-   </tr>
-   <tr>
-    <td>JUMP_TABLES</td>
-    <td>Boolean, if `Y` jump tables will be enabled to slightly reduce the resulting binary's size - note that this can cause incorrect jumps if the binary is relocated after compilation, such as for a bootloader. Default is `N`.</td>
-   </tr>
-   <tr>
-    <td>LTO</td>
-    <td>Boolean, if `Y` link time optimization will be enabled to reduce the resulting binary's size. For larger projects you might also want to add `-mcall-prologues` to the `CC_FLAGS`. Default is `N`.</td>
-   </tr>
-   <tr>
-    <td>OBJDIR</td>
-    <td>Directory to store the intermediate object files, as they are generated from the source files. Default is `obj`.</td>
-   </tr>
-   <tr>
-    <td>OBJECT_FILES</td>
-    <td>List of additional `.o` object files to link into the final binary. Default is blank (no additional objects).</td>
-   </tr>
-   <tr>
-    <td>DEBUG_FORMAT</td>
-    <td>Debug ELF file format to generate. Default is `dwarf-2`.</td>
-   </tr>
-   <tr>
-    <td>DEBUG_LEVEL</td>
-    <td>Level of the debugging information to generate in the compiled object files. Debug is 2 (medium level debugging information).</td>
-   </tr>
- </tbody>
-</table>
-
-## Provided Variables:
-
-The following variables may be referenced in a user makefile (via `$(NAME)`
-syntax) if desired, as they are provided by this module.
-
-<table>
- <tbody>
-   <tr>
-    <td>N/A</td>
-    <td>This module provides no variables.</td>
-   </tr>
- </tbody>
-</table>
-
-## Provided Macros:
-
-The following macros may be referenced in a user makefile (via
-`$(call NAME, ARG1, ARG2, ...)` syntax) if desired, as they are provided by
-this module.
-
-<table>
- <tbody>
-   <tr>
-    <td>N/A</td>
-    <td>This module provides no macros.</td>
-   </tr>
- </tbody>
-</table>
-
-## Module Changelog:
-
-The changes to this module since its initial release are listed below, as of the
-DMBS version where the change was made.
-
-### 20170426
-Added `JUMP_TABLES` optional variable.
-
-### 20160403
-Initial release.
diff --git a/NativePrograms/LUFA/Build/DMBS/DMBS/gcc.mk b/NativePrograms/LUFA/Build/DMBS/DMBS/gcc.mk
deleted file mode 100644
index 9dae81d2a3..0000000000
--- a/NativePrograms/LUFA/Build/DMBS/DMBS/gcc.mk
+++ /dev/null
@@ -1,281 +0,0 @@
-#
-#            DMBS Build System
-#     Released into the public domain.
-#
-#  dean [at] fourwalledcubicle [dot] com
-#        www.fourwalledcubicle.com
-#
-
-DMBS_BUILD_MODULES         += GCC
-DMBS_BUILD_TARGETS         += size symbol-sizes all lib elf bin hex lss clean mostlyclean
-DMBS_BUILD_MANDATORY_VARS  += TARGET ARCH MCU SRC
-DMBS_BUILD_OPTIONAL_VARS   += COMPILER_PATH OPTIMIZATION C_STANDARD CPP_STANDARD F_CPU C_FLAGS
-DMBS_BUILD_OPTIONAL_VARS   += CPP_FLAGS ASM_FLAGS CC_FLAGS LD_FLAGS OBJDIR OBJECT_FILES DEBUG_TYPE
-DMBS_BUILD_OPTIONAL_VARS   += DEBUG_LEVEL LINKER_RELAXATIONS JUMP_TABLES LTO
-DMBS_BUILD_PROVIDED_VARS   +=
-DMBS_BUILD_PROVIDED_MACROS +=
-
-# Import the CORE module of DMBS
-DMBS_MODULE_PATH := $(patsubst %/,%,$(dir $(lastword $(MAKEFILE_LIST))))
-include $(DMBS_MODULE_PATH)/core.mk
-
-# Default values of optionally user-supplied variables
-COMPILER_PATH      ?=
-OPTIMIZATION       ?= s
-F_CPU              ?=
-C_STANDARD         ?= gnu99
-CPP_STANDARD       ?= gnu++98
-C_FLAGS            ?=
-CPP_FLAGS          ?=
-ASM_FLAGS          ?=
-CC_FLAGS           ?=
-OBJDIR             ?= obj
-OBJECT_FILES       ?=
-DEBUG_FORMAT       ?= dwarf-2
-DEBUG_LEVEL        ?= 2
-LINKER_RELAXATIONS ?= Y
-JUMP_TABLES        ?= N
-LTO                ?= N
-
-# Sanity check user supplied values
-$(foreach MANDATORY_VAR, $(DMBS_BUILD_MANDATORY_VARS), $(call ERROR_IF_UNSET, $(MANDATORY_VAR)))
-$(call ERROR_IF_EMPTY, MCU)
-$(call ERROR_IF_EMPTY, TARGET)
-$(call ERROR_IF_EMPTY, ARCH)
-$(call ERROR_IF_EMPTY, OPTIMIZATION)
-$(call ERROR_IF_EMPTY, C_STANDARD)
-$(call ERROR_IF_EMPTY, CPP_STANDARD)
-$(call ERROR_IF_EMPTY, OBJDIR)
-$(call ERROR_IF_EMPTY, DEBUG_FORMAT)
-$(call ERROR_IF_EMPTY, DEBUG_LEVEL)
-$(call ERROR_IF_NONBOOL, LINKER_RELAXATIONS)
-$(call ERROR_IF_NONBOOL, JUMP_TABLES)
-$(call ERROR_IF_NONBOOL, LTO)
-
-# Determine the utility prefix to use for the selected architecture
-ifeq ($(ARCH), AVR8)
-   CROSS        := $(COMPILER_PATH)avr
-else ifeq ($(ARCH), XMEGA)
-   CROSS        := $(COMPILER_PATH)avr
-else ifeq ($(ARCH), UC3)
-   CROSS        := $(COMPILER_PATH)avr32
-else
-   $(error Unsupported architecture "$(ARCH)")
-endif
-
-# Output Messages
-MSG_INFO_MESSAGE := ' [INFO]    :'
-MSG_COMPILE_CMD  := ' [GCC]     :'
-MSG_ASSEMBLE_CMD := ' [GAS]     :'
-MSG_NM_CMD       := ' [NM]      :'
-MSG_REMOVE_CMD   := ' [RM]      :'
-MSG_LINK_CMD     := ' [LNK]     :'
-MSG_ARCHIVE_CMD  := ' [AR]      :'
-MSG_SIZE_CMD     := ' [SIZE]    :'
-MSG_OBJCPY_CMD   := ' [OBJCPY]  :'
-MSG_OBJDMP_CMD   := ' [OBJDMP]  :'
-
-# Convert input source file list to differentiate them by type
-C_SOURCE   := $(filter %.c, $(SRC))
-CPP_SOURCE := $(filter %.cpp, $(SRC))
-ASM_SOURCE := $(filter %.S, $(SRC))
-
-# Create a list of unknown source file types, if any are found throw an error
-UNKNOWN_SOURCE := $(filter-out $(C_SOURCE) $(CPP_SOURCE) $(ASM_SOURCE), $(SRC))
-ifneq ($(UNKNOWN_SOURCE),)
-   $(error Unknown input source file formats: $(UNKNOWN_SOURCE))
-endif
-
-# Convert input source filenames into a list of required output object files
-OBJECT_FILES += $(addsuffix .o, $(basename $(SRC)))
-
-# Check if an output object file directory was specified instead of the input file location
-ifneq ($(OBJDIR),.)
-   # Prefix all the object filenames with the output object file directory path
-   OBJECT_FILES    := $(addprefix $(patsubst %/,%,$(OBJDIR))/, $(notdir $(OBJECT_FILES)))
-
-   # Check if any object file (without path) appears more than once in the object file list
-   ifneq ($(words $(sort $(OBJECT_FILES))), $(words $(OBJECT_FILES)))
-       $(error Cannot build with OBJDIR parameter set - one or more object file name is not unique)
-   endif
-
-   # Create the output object file directory if it does not exist and add it to the virtual path list
-   $(shell mkdir -p $(OBJDIR) 2> /dev/null)
-   VPATH           += $(dir $(SRC))
-endif
-
-# Create a list of dependency files from the list of object files
-DEPENDENCY_FILES := $(OBJECT_FILES:%.o=%.d)
-
-# Create a list of common flags to pass to the compiler/linker/assembler
-BASE_CC_FLAGS    := -pipe -g$(DEBUG_FORMAT) -g$(DEBUG_LEVEL)
-ifneq ($(findstring $(ARCH), AVR8 XMEGA),)
-   BASE_C_FLAGS += -fpack-struct
-   BASE_CC_FLAGS += -mmcu=$(MCU) -fshort-enums -fno-inline-small-functions
-else ifneq ($(findstring $(ARCH), UC3),)
-   BASE_CC_FLAGS += -mpart=$(MCU:at32%=%) -masm-addr-pseudos
-endif
-BASE_CC_FLAGS += -Wall -fno-strict-aliasing -funsigned-char -funsigned-bitfields -ffunction-sections
-BASE_CC_FLAGS += -I.
-BASE_CC_FLAGS += -DARCH=ARCH_$(ARCH)
-ifneq ($(F_CPU),)
-   BASE_CC_FLAGS += -DF_CPU=$(F_CPU)UL
-endif
-ifeq ($(LINKER_RELAXATIONS), Y)
-   BASE_CC_FLAGS += -mrelax
-endif
-ifeq ($(JUMP_TABLES), N)
-   # This flag is required for bootloaders as GCC will emit invalid jump table
-   # assembly code for devices with large amounts of flash; the jump table target
-   # is extracted from FLASH without using the correct ELPM instruction, resulting
-   # in a pseudo-random jump target.
-   BASE_CC_FLAGS += -fno-jump-tables
-endif
-ifeq ($(LTO), Y)
-   # Enable link time optimization to reduce overall flash size.
-   BASE_CC_FLAGS += -flto -fuse-linker-plugin
-   BASE_LD_FLAGS += -flto -fuse-linker-plugin
-endif
-
-# Additional language specific compiler flags
-BASE_C_FLAGS   := -x c -O$(OPTIMIZATION) -std=$(C_STANDARD) -Wstrict-prototypes
-BASE_CPP_FLAGS := -x c++ -O$(OPTIMIZATION) -std=$(CPP_STANDARD) -fno-exceptions -fno-threadsafe-statics
-BASE_ASM_FLAGS := -x assembler-with-cpp
-
-# Create a list of flags to pass to the linker
-BASE_LD_FLAGS := -lm -Wl,-Map=$(TARGET).map,--cref -Wl,--gc-sections
-ifeq ($(LINKER_RELAXATIONS), Y)
-   BASE_LD_FLAGS += -Wl,--relax
-endif
-ifneq ($(findstring $(ARCH), AVR8 XMEGA),)
-   BASE_LD_FLAGS += -mmcu=$(MCU)
-else ifneq ($(findstring $(ARCH), UC3),)
-   BASE_LD_FLAGS += -mpart=$(MCU:at32%=%) --rodata-writable --direct-data
-endif
-
-# Determine flags to pass to the size utility based on its reported features (only invoke if size target required)
-# and on an architecture where this non-standard patch is available
-ifneq ($(ARCH), UC3)
-size: SIZE_MCU_FLAG    := $(shell $(CROSS)-size --help | grep -- --mcu > /dev/null && echo --mcu=$(MCU) )
-size: SIZE_FORMAT_FLAG := $(shell $(CROSS)-size --help | grep -- --format=.*avr > /dev/null && echo -C )
-endif
-
-# Pre-build informational target, to give compiler and project name information when building
-build_begin:
-	@echo $(MSG_INFO_MESSAGE) Begin compilation of project \"$(TARGET)\"...
-	@echo ""
-	@$(CROSS)-gcc --version
-
-# Post-build informational target, to project name information when building has completed
-build_end:
-	@echo $(MSG_INFO_MESSAGE) Finished building project \"$(TARGET)\".
-
-# Prints size information of a compiled application (FLASH, RAM and EEPROM usages)
-size: $(TARGET).elf
-	@echo $(MSG_SIZE_CMD) Determining size of \"$<\"
-	@echo ""
-	$(CROSS)-size $(SIZE_MCU_FLAG) $(SIZE_FORMAT_FLAG) $<
-
-# Prints size information on the symbols within a compiled application in decimal bytes
-symbol-sizes: $(TARGET).elf
-	@echo $(MSG_NM_CMD) Extracting \"$<\" symbols with decimal byte sizes
-	$(CROSS)-nm --size-sort --demangle --radix=d $<
-
-# Cleans intermediary build files, leaving only the compiled application files
-mostlyclean:
-	@echo $(MSG_REMOVE_CMD) Removing object files of \"$(TARGET)\"
-	rm -f $(OBJECT_FILES)
-	@echo $(MSG_REMOVE_CMD) Removing dependency files of \"$(TARGET)\"
-	rm -f $(DEPENDENCY_FILES)
-
-# Cleans all build files, leaving only the original source code
-clean: mostlyclean
-	@echo $(MSG_REMOVE_CMD) Removing output files of \"$(TARGET)\"
-	rm -f $(TARGET).elf $(TARGET).hex $(TARGET).bin $(TARGET).eep $(TARGET).map $(TARGET).lss $(TARGET).sym lib$(TARGET).a
-
-# Performs a complete build of the user application and prints size information afterwards
-all: build_begin elf hex bin lss sym size build_end
-
-# Helper targets, to build a specific type of output file without having to know the project target name
-lib: lib$(TARGET).a
-elf: $(TARGET).elf
-hex: $(TARGET).hex $(TARGET).eep
-bin: $(TARGET).bin
-lss: $(TARGET).lss
-sym: $(TARGET).sym
-
-# Default target to *create* the user application's specified source files; if this rule is executed by
-# make, the input source file doesn't exist and an error needs to be presented to the user
-$(SRC):
-	$(error Source file does not exist: $@)
-
-# Compiles an input C source file and generates an assembly listing for it
-%.s: %.c $(MAKEFILE_LIST)
-	@echo $(MSG_COMPILE_CMD) Generating assembly from C file \"$(notdir $<)\"
-	$(CROSS)-gcc -S $(BASE_CC_FLAGS) $(BASE_C_FLAGS) $(CC_FLAGS) $(C_FLAGS) $($(notdir $<)_FLAGS) $< -o $@
-
-# Compiles an input C++ source file and generates an assembly listing for it
-%.s: %.cpp $(MAKEFILE_LIST)
-	@echo $(MSG_COMPILE_CMD) Generating assembly from C++ file \"$(notdir $<)\"
-	$(CROSS)-gcc -S $(BASE_CC_FLAGS) $(BASE_CPP_FLAGS) $(CC_FLAGS) $(CPP_FLAGS) $($(notdir $<)_FLAGS) $< -o $@
-
-# Compiles an input C source file and generates a linkable object file for it
-$(OBJDIR)/%.o: %.c $(MAKEFILE_LIST)
-	@echo $(MSG_COMPILE_CMD) Compiling C file \"$(notdir $<)\"
-	$(CROSS)-gcc -c $(BASE_CC_FLAGS) $(BASE_C_FLAGS) $(CC_FLAGS) $(C_FLAGS) $($(notdir $<)_FLAGS) -MMD -MP -MF $(@:%.o=%.d) $< -o $@
-
-# Compiles an input C++ source file and generates a linkable object file for it
-$(OBJDIR)/%.o: %.cpp $(MAKEFILE_LIST)
-	@echo $(MSG_COMPILE_CMD) Compiling C++ file \"$(notdir $<)\"
-	$(CROSS)-gcc -c $(BASE_CC_FLAGS) $(BASE_CPP_FLAGS) $(CC_FLAGS) $(CPP_FLAGS) $($(notdir $<)_FLAGS) -MMD -MP -MF $(@:%.o=%.d) $< -o $@
-
-# Assembles an input ASM source file and generates a linkable object file for it
-$(OBJDIR)/%.o: %.S $(MAKEFILE_LIST)
-	@echo $(MSG_ASSEMBLE_CMD) Assembling \"$(notdir $<)\"
-	$(CROSS)-gcc -c $(BASE_CC_FLAGS) $(BASE_ASM_FLAGS) $(CC_FLAGS) $(ASM_FLAGS) $($(notdir $<)_FLAGS) -MMD -MP -MF $(@:%.o=%.d) $< -o $@
-
-# Generates a library archive file from the user application, which can be linked into other applications
-.PRECIOUS  : $(OBJECT_FILES)
-.SECONDARY : %.a
-%.a: $(OBJECT_FILES)
-	@echo $(MSG_ARCHIVE_CMD) Archiving object files into \"$@\"
-	$(CROSS)-ar rcs $@ $(OBJECT_FILES)
-
-# Generates an ELF debug file from the user application, which can be further processed for FLASH and EEPROM data
-# files, or used for programming and debugging directly
-.PRECIOUS  : $(OBJECT_FILES)
-.SECONDARY : %.elf
-%.elf: $(OBJECT_FILES)
-	@echo $(MSG_LINK_CMD) Linking object files into \"$@\"
-	$(CROSS)-gcc $^ -o $@ $(BASE_LD_FLAGS) $(LD_FLAGS)
-
-# Extracts out the loadable FLASH memory data from the project ELF file, and creates an Intel HEX format file of it
-%.hex: %.elf
-	@echo $(MSG_OBJCPY_CMD) Extracting HEX file data from \"$<\"
-	$(CROSS)-objcopy -O ihex -R .eeprom -R .fuse -R .lock -R .signature $< $@
-
-# Extracts out the loadable FLASH memory data from the project ELF file, and creates an Binary format file of it
-%.bin: %.elf
-	@echo $(MSG_OBJCPY_CMD) Extracting BIN file data from \"$<\"
-	$(CROSS)-objcopy -O binary -R .eeprom -R .fuse -R .lock -R .signature $< $@
-
-# Extracts out the loadable EEPROM memory data from the project ELF file, and creates an Intel HEX format file of it
-%.eep: %.elf
-	@echo $(MSG_OBJCPY_CMD) Extracting EEP file data from \"$<\"
-	$(CROSS)-objcopy -O ihex -j .eeprom --set-section-flags=.eeprom="alloc,load" --change-section-lma .eeprom=0 --no-change-warnings $< $@ || exit 0
-
-# Creates an assembly listing file from an input project ELF file, containing interleaved assembly and source data
-%.lss: %.elf
-	@echo $(MSG_OBJDMP_CMD) Extracting LSS file data from \"$<\"
-	$(CROSS)-objdump -h -d -S -z $< > $@
-
-# Creates a symbol file listing the loadable and discarded symbols from an input project ELF file
-%.sym: %.elf
-	@echo $(MSG_NM_CMD) Extracting SYM file data from \"$<\"
-	$(CROSS)-nm -n $< > $@
-
-# Include build dependency files
--include $(DEPENDENCY_FILES)
-
-# Phony build targets for this module
-.PHONY: build_begin build_end $(DMBS_BUILD_TARGETS)
diff --git a/NativePrograms/LUFA/Build/DMBS/DMBS/hid.md b/NativePrograms/LUFA/Build/DMBS/DMBS/hid.md
deleted file mode 100644
index c32ec9fb0c..0000000000
--- a/NativePrograms/LUFA/Build/DMBS/DMBS/hid.md
+++ /dev/null
@@ -1,129 +0,0 @@
-DMBS - Dean's Makefile Build System
-===================================
-
-
-Module: HID
------------------
-
-The HID module provides build targets to program a target running a PJRC Teensy
-or LUFA compatible HID class bootloader.
-
-## Importing This Module into a Makefile:
-
-To use this module in your application makefile, add the following code to your
-makefile:
-
-    include $(DMBS_PATH)/hid.mk
-
-## Prerequisites:
-
-This module requires the `teensy_loader_cli` utility to be available in your
-system's `PATH` variable. The `teensy_loader_cli` utility is distributed in
-a modified form (from PJRC) in the LUFA project's
-[official site](http://www.lufa-lib.org/), but is also
-made available in its original form directly from the 
-[PJRC website](https://www.pjrc.com/teensy/loader_cli.html). Note that the
-original tool works with Teensy boards only, and not LUFA HID bootloader
-devices.
-
-This module requires the `hid_bootloader_cli` utility to be available in your
-system's `PATH` variable. The `hid_bootloader_cli` Python script utility is
-distributed in LUFA project's [official site](http://www.lufa-lib.org/).
-
-This module requires the AVR-GCC compiler to be installed and available in the
-system's `PATH` variable.
-
-## Build Targets:
-
-The following targets are supported by this module:
-
-<table>
- <tbody>
-   <tr>
-    <td>hid</td>
-    <td>Program a LUFA HID class bootloader device, using the `hid_bootloader_cli.py` Python script.</td>
-   </tr>
-   <tr>
-    <td>hid-ee</td>
-    <td>Program a LUFA HID class bootloader device's EEPROM, using the `hid_bootloader_cli.py` Python script and a shim application which is programmed into the target's flash.</td>
-   </tr>
-   <tr>
-    <td>teensy</td>
-    <td>Program a LUFA HID class bootloader device or Teensy board, using the `teensy_loader_cli` tool.</td>
-   </tr>
-   <tr>
-    <td>teensy-ee</td>
-    <td>Program a LUFA HID class bootloader device's EEPROM, using the `teensy_loader_cli` tool and a shim application which is programmed into the target's flash.</td>
-   </tr>
- </tbody>
-</table>
-
-## Mandatory Variables:
-
-The following variables must be defined (with a `NAME = VALUE` syntax, one
-variable per line) in the user makefile to be able to use this module:
-
-<table>
- <tbody>
-   <tr>
-    <td>MCU</td>
-    <td>Name of the Atmel processor model (e.g. `at90usb1287`).</td>
-   </tr>
-   <tr>
-    <td>TARGET</td>
-    <td>Name of the application output file prefix (e.g. `TestApplication`).</td>
-   </tr>   
- </tbody>
-</table>
-
-## Optional Variables:
-
-The following variables may be defined (with a `NAME = VALUE` syntax, one
-variable per line) in the user makefile. If not specified, a default value will
-be assumed.
-
-<table>
- <tbody>
-   <tr>
-    <td>N/A</td>
-    <td>This module has no optional variables.</td>
-   </tr>
- </tbody>
-</table>
-
-## Provided Variables:
-
-The following variables may be referenced in a user makefile (via `$(NAME)`
-syntax) if desired, as they are provided by this module.
-
-<table>
- <tbody>
-   <tr>
-    <td>N/A</td>
-    <td>This module provides no variables.</td>
-   </tr>
- </tbody>
-</table>
-
-## Provided Macros:
-
-The following macros may be referenced in a user makefile (via
-`$(call NAME, ARG1, ARG2, ...)` syntax) if desired, as they are provided by
-this module.
-
-<table>
- <tbody>
-   <tr>
-    <td>N/A</td>
-    <td>This module provides no macros.</td>
-   </tr>
- </tbody>
-</table>
-
-## Module Changelog:
-
-The changes to this module since its initial release are listed below, as of the
-DMBS version where the change was made.
-
-### 20160403
-Initial release.
diff --git a/NativePrograms/LUFA/Build/DMBS/DMBS/hid.mk b/NativePrograms/LUFA/Build/DMBS/DMBS/hid.mk
deleted file mode 100644
index 69a4d91c5b..0000000000
--- a/NativePrograms/LUFA/Build/DMBS/DMBS/hid.mk
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-#            DMBS Build System
-#     Released into the public domain.
-#
-#  dean [at] fourwalledcubicle [dot] com
-#        www.fourwalledcubicle.com
-#
-
-DMBS_BUILD_MODULES         += HID
-DMBS_BUILD_TARGETS         += hid hid-ee teensy teensy-ee
-DMBS_BUILD_MANDATORY_VARS  += MCU TARGET
-DMBS_BUILD_OPTIONAL_VARS   +=
-DMBS_BUILD_PROVIDED_VARS   +=
-DMBS_BUILD_PROVIDED_MACROS +=
-
-# Import the CORE module of DMBS
-DMBS_MODULE_PATH := $(patsubst %/,%,$(dir $(lastword $(MAKEFILE_LIST))))
-include $(DMBS_MODULE_PATH)/core.mk
-
-# Sanity-check values of mandatory user-supplied variables
-$(foreach MANDATORY_VAR, $(DMBS_BUILD_MANDATORY_VARS), $(call ERROR_IF_UNSET, $(MANDATORY_VAR)))
-$(call ERROR_IF_EMPTY, MCU)
-$(call ERROR_IF_EMPTY, TARGET)
-
-# Output Messages
-MSG_HID_BOOTLOADER_CMD := ' [HID]     :'
-MSG_OBJCPY_CMD         := ' [OBJCPY]  :'
-MSG_MAKE_CMD           := ' [MAKE]    :'
-
-# Set MAKE variable if the environment does not already define it
-MAKE ?= make
-
-# Programs in the target FLASH memory using the HID_BOOTLOADER_CLI tool
-hid: $(TARGET).hex $(MAKEFILE_LIST)
-	@echo $(MSG_HID_BOOTLOADER_CMD) Programming FLASH with hid_bootloader_cli using \"$<\"
-	hid_bootloader_cli -mmcu=$(MCU) -v $<
-
-# Programs in the target EEPROM memory using the HID_BOOTLOADER_CLI tool (note: clears target FLASH memory)
-hid-ee: $(TARGET).eep $(MAKEFILE_LIST)
-	@echo $(MSG_OBJCPY_CMD) Converting \"$<\" to a binary file \"InputEEData.bin\"
-	avr-objcopy -I ihex -O binary $< $(DMBS_MODULE_PATH)/HID_EEPROM_Loader/InputEEData.bin
-	@echo $(MSG_MAKE_CMD) Making EEPROM loader application for \"$<\"
-	$(MAKE) -C $(DMBS_MODULE_PATH)/HID_EEPROM_Loader/ MCU=$(MCU) clean hid
-
-# Programs in the target FLASH memory using the TEENSY_BOOTLOADER_CLI tool
-teensy: $(TARGET).hex $(MAKEFILE_LIST)
-	@echo $(MSG_HID_BOOTLOADER_CMD) Programming FLASH with teensy_loader_cli using \"$<\"
-	teensy_loader_cli -mmcu=$(MCU) -v $<
-
-# Programs in the target EEPROM memory using the TEENSY_BOOTLOADER_CLI tool (note: clears target FLASH memory)
-teensy-ee: $(TARGET).hex $(MAKEFILE_LIST)
-	@echo $(MSG_OBJCPY_CMD) Converting \"$<\" to a binary file \"InputEEData.bin\"
-	avr-objcopy -I ihex -O binary $< $(DMBS_MODULE_PATH)/HID_EEPROM_Loader/InputEEData.bin
-	@echo $(MSG_MAKE_CMD) Making EEPROM loader application for \"$<\"
-	$(MAKE) -s -C $(DMBS_MODULE_PATH)/HID_EEPROM_Loader/ MCU=$(MCU) clean teensy
-
-# Phony build targets for this module
-.PHONY: $(DMBS_BUILD_TARGETS)
diff --git a/NativePrograms/LUFA/Build/DMBS/Readme.md b/NativePrograms/LUFA/Build/DMBS/Readme.md
deleted file mode 100644
index 2a02df9355..0000000000
--- a/NativePrograms/LUFA/Build/DMBS/Readme.md
+++ /dev/null
@@ -1,123 +0,0 @@
-DMBS - Dean's Makefile Build System
-===================================
-
-
-Project Overview
-----------------
-
-GNU Make is scary, and it's tough to get the rules right sometimes. Many
-projects get by via simple copy-pasting of old makefiles, resulting in many
-redundant copies of the same old rules. DMBS aims to solve this by providing a
-simple modular set of makefiles which can be included by your project to quickly
-add various build functionality.
-
-This aims to replace the old WinAVR "mfile" makefile template, giving better
-functionality and much simpler user makefiles.
-
-
-Benefits:
-----------------
-
-Apart from much simpler, cleaner makefiles DMBS carries the aim of making the
-process of troubleshooting build issues a little easier. Lots can go wrong, so
-DMBS tries to sanity check its inputs wherever possible, and produce
-human-readable error messages. Forgotten to set a variable? Get a
-`Makefile {X} value not set.` message, rather than a possibly unrelated message.
-Have the wrong filename? See `Source file does not exist: {X}` rather than the
-infamous `No rule to make target {X}` message.
-
-
-Use:
-----------------
-
-A template user makefile is provided in the `Template` directory. DMBS modules
-are included via a GNU Make `include` directive. While the DMBS `core` module is
-always required, you can pick and choose what other modules you wish to add to
-your user project.
-
-[See here for the documentation on the individual modules provided by DMBS.](DMBS/ModulesOverview.md)
-If you're interested in writing your own DMBS module(s), [see here.](DMBS/WritingYourOwnModules.md)
-
-Here's an example user makefile:
-
-	MCU          = atmega128
-	ARCH         = AVR8
-	F_CPU        = 8000000
-	OPTIMIZATION = s
-	TARGET       = Template
-	SRC          = $(TARGET).c
-	CC_FLAGS     =
-	LD_FLAGS     =
-
-	# Default target
-	all:
-
-	# Include DMBS build script makefiles
-	DMBS_PATH   ?= ../DMBS
-	include $(DMBS_PATH)/core.mk
-	include $(DMBS_PATH)/gcc.mk
-	include $(DMBS_PATH)/cppcheck.mk
-	include $(DMBS_PATH)/doxygen.mk
-	include $(DMBS_PATH)/dfu.mk
-	include $(DMBS_PATH)/hid.mk
-	include $(DMBS_PATH)/avrdude.mk
-	include $(DMBS_PATH)/atprogram.mk
-
-Each DMBS module can optionally supply one or more Make variables and macros,
-which you can reference in your user makefile. Additionally, modules can require
-one or more variables to be set by the user makefile, with (in some cases) sane
-defaults used if left out.
-
-As modules are added, you can get a list of available targets by simply typing
-`make help` from the command line. This will produce a formatted list of targets
-as well as mandatory and optional variables and exposed variables and macros.
-
-
-Distribution
-----------------
-
-You can embed DMBS in your project any way you like - some options are:
-1. A git submodule
-2. A source tarball
-3. A manually copied extracted archive
-
-The intention of DMBS is that users can just import it from whatever source
-they like. If your project needs to extend the existing modules in an unusual
-manner, or if you want to provide your own modules, you can include them in
-your project repository (or submit a patch to DMBS if your module is generic
-enough to warrant wide use).
-
-
-License
-----------------
-
-DMBS is released into the public domain, making is suitable for use everywhere,
-by everyone. Contributions are greatly appreciated however, in order to make
-DMBS better for everyone.
-
-The actual license text is as follows:
-
-	This is free and unencumbered software released into the public domain.
-
-	Anyone is free to copy, modify, publish, use, compile, sell, or
-	distribute this software, either in source code form or as a compiled
-	binary, for any purpose, commercial or non-commercial, and by any
-	means.
-
-	In jurisdictions that recognize copyright laws, the author or authors
-	of this software dedicate any and all copyright interest in the
-	software to the public domain. We make this dedication for the benefit
-	of the public at large and to the detriment of our heirs and
-	successors. We intend this dedication to be an overt act of
-	relinquishment in perpetuity of all present and future rights to this
-	software under copyright law.
-
-	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 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.
-
-	For more information, please refer to <http://unlicense.org/>
diff --git a/NativePrograms/LUFA/Build/DMBS/Template/Template.c b/NativePrograms/LUFA/Build/DMBS/Template/Template.c
deleted file mode 100644
index ed5a4898ba..0000000000
--- a/NativePrograms/LUFA/Build/DMBS/Template/Template.c
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
-             DMBS Build System
-      Released into the public domain.
-
-   dean [at] fourwalledcubicle [dot] com
-         www.fourwalledcubicle.com
- */
-
-int main(void)
-{
-	// Application code here.
-}
diff --git a/NativePrograms/LUFA/Build/DMBS/Template/lib/TEMPLATE_LIB/TEMPLATE_LIB.mk b/NativePrograms/LUFA/Build/DMBS/Template/lib/TEMPLATE_LIB/TEMPLATE_LIB.mk
deleted file mode 100644
index 418b21210a..0000000000
--- a/NativePrograms/LUFA/Build/DMBS/Template/lib/TEMPLATE_LIB/TEMPLATE_LIB.mk
+++ /dev/null
@@ -1,50 +0,0 @@
-#
-#            DMBS Build System
-#     Released into the public domain.
-#
-#  dean [at] fourwalledcubicle [dot] com
-#        www.fourwalledcubicle.com
-#
-
-# Include Guard
-ifeq ($(filter TEMPLATE_LIB, $(DMBS_BUILD_MODULES)),)
-
-# Sanity check user supplied DMBS path
-ifndef DMBS_PATH
-$(error Makefile DMBS_PATH option cannot be blank)
-endif
-
-# Location of the current module
-TEMPLATE_LIB_MODULE_PATH := $(patsubst %/,%,$(dir $(lastword $(MAKEFILE_LIST))))
-
-# Import the CORE module of DMBS
-include $(DMBS_PATH)/core.mk
-
-# This module needs to be included before gcc.mk
-ifneq ($(findstring GCC, $(DMBS_BUILD_MODULES)),)
-$(error Include this module before gcc.mk)
-endif
-
-# Help settings
-DMBS_BUILD_MODULES         += TEMPLATE_LIB
-DMBS_BUILD_TARGETS         +=
-DMBS_BUILD_MANDATORY_VARS  += DMBS_PATH
-DMBS_BUILD_OPTIONAL_VARS   +=
-DMBS_BUILD_PROVIDED_VARS   += TEMPLATE_LIB_SRC
-DMBS_BUILD_PROVIDED_MACROS +=
-
-# Sanity check user supplied values
-$(foreach MANDATORY_VAR, $(DMBS_BUILD_MANDATORY_VARS), $(call ERROR_IF_UNSET, $(MANDATORY_VAR)))
-
-# TEMPLATE_LIB Library
-TEMPLATE_LIB_SRC := $(TEMPLATE_LIB_MODULE_PATH)/src/template_lib.c
-
-# Compiler flags and sources
-SRC			       += $(TEMPLATE_LIB_SRC)
-CC_FLAGS           += -DDMBS_MODULE_TEMPLATE_LIB
-CC_FLAGS 	       += -I$(TEMPLATE_LIB_MODULE_PATH)/include/
-
-# Phony build targets for this module
-.PHONY: $(DMBS_BUILD_TARGETS)
-
-endif
diff --git a/NativePrograms/LUFA/Build/DMBS/Template/lib/TEMPLATE_LIB/include/template_lib.h b/NativePrograms/LUFA/Build/DMBS/Template/lib/TEMPLATE_LIB/include/template_lib.h
deleted file mode 100644
index d2c5333372..0000000000
--- a/NativePrograms/LUFA/Build/DMBS/Template/lib/TEMPLATE_LIB/include/template_lib.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-             DMBS Build System
-      Released into the public domain.
-
-   dean [at] fourwalledcubicle [dot] com
-         www.fourwalledcubicle.com
- */
-
-// Include Guard
-#pragma once
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-// Software version
-#define TEMPLATE_LIB_VERSION 100
-
-#include <stdint.h>
-#include <stddef.h>
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/NativePrograms/LUFA/Build/DMBS/Template/lib/TEMPLATE_LIB/src/template_lib.c b/NativePrograms/LUFA/Build/DMBS/Template/lib/TEMPLATE_LIB/src/template_lib.c
deleted file mode 100644
index 25974c924c..0000000000
--- a/NativePrograms/LUFA/Build/DMBS/Template/lib/TEMPLATE_LIB/src/template_lib.c
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
-             DMBS Build System
-      Released into the public domain.
-
-   dean [at] fourwalledcubicle [dot] com
-         www.fourwalledcubicle.com
- */
-
-#include "template_lib.h"
-#include "template_lib_private.h"
diff --git a/NativePrograms/LUFA/Build/DMBS/Template/lib/TEMPLATE_LIB/src/template_lib_private.h b/NativePrograms/LUFA/Build/DMBS/Template/lib/TEMPLATE_LIB/src/template_lib_private.h
deleted file mode 100644
index b324394f42..0000000000
--- a/NativePrograms/LUFA/Build/DMBS/Template/lib/TEMPLATE_LIB/src/template_lib_private.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
-             DMBS Build System
-      Released into the public domain.
-
-   dean [at] fourwalledcubicle [dot] com
-         www.fourwalledcubicle.com
- */
-
-// Include Guard
-#pragma once
-
-#include <stdint.h>
-#include <stddef.h>
-#include <avr/io.h>
diff --git a/NativePrograms/LUFA/Build/DMBS/Template/makefile b/NativePrograms/LUFA/Build/DMBS/Template/makefile
deleted file mode 100644
index fbcc69ecbf..0000000000
--- a/NativePrograms/LUFA/Build/DMBS/Template/makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-#            DMBS Build System
-#     Released into the public domain.
-#
-#  dean [at] fourwalledcubicle [dot] com
-#        www.fourwalledcubicle.com
-#
-
-# Run "make help" for target help.
-
-MCU          = atmega128
-ARCH         = AVR8
-F_CPU        = 8000000
-OPTIMIZATION = s
-TARGET       = Template
-SRC          = $(TARGET).c
-CC_FLAGS     =
-LD_FLAGS     =
-
-# Default target
-all:
-
-# Include libraries and DMBS build script makefiles
-DMBS_PATH   ?= ../DMBS
-LIB_PATH    ?= lib
-
-include $(LIB_PATH)/TEMPLATE_LIB/TEMPLATE_LIB.mk
-
-include $(DMBS_PATH)/core.mk
-include $(DMBS_PATH)/gcc.mk
-include $(DMBS_PATH)/cppcheck.mk
-include $(DMBS_PATH)/doxygen.mk
-include $(DMBS_PATH)/dfu.mk
-include $(DMBS_PATH)/hid.mk
-include $(DMBS_PATH)/avrdude.mk
-include $(DMBS_PATH)/atprogram.mk
diff --git a/NativePrograms/LUFA/Build/LUFA/lufa-gcc.mk b/NativePrograms/LUFA/Build/LUFA/lufa-gcc.mk
deleted file mode 100644
index 050beb1154..0000000000
--- a/NativePrograms/LUFA/Build/LUFA/lufa-gcc.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-#             LUFA Library
-#     Copyright (C) Dean Camera, 2015.
-#
-#  dean [at] fourwalledcubicle [dot] com
-#           www.lufa-lib.org
-#
-
-# Include Guard
-ifeq ($(filter LUFA_GCC, $(DMBS_BUILD_MODULES)),)
-
-DMBS_BUILD_MODULES         += LUFA_GCC
-DMBS_BUILD_TARGETS         +=
-DMBS_BUILD_MANDATORY_VARS  += LUFA_PATH ARCH F_USB
-DMBS_BUILD_OPTIONAL_VARS   += BOARD
-DMBS_BUILD_PROVIDED_VARS   +=
-DMBS_BUILD_PROVIDED_MACROS +=
-
-SHELL = /bin/sh
-
-ERROR_IF_UNSET   ?= $(if $(filter undefined, $(origin $(strip $(1)))), $(error Makefile $(strip $(1)) value not set))
-ERROR_IF_EMPTY   ?= $(if $(strip $($(strip $(1)))), , $(error Makefile $(strip $(1)) option cannot be blank))
-ERROR_IF_NONBOOL ?= $(if $(filter Y N, $($(strip $(1)))), , $(error Makefile $(strip $(1)) option must be Y or N))
-
-# Sanity check user supplied values
-$(call ERROR_IF_EMPTY, LUFA_PATH)
-$(call ERROR_IF_EMPTY, ARCH)
-$(call ERROR_IF_EMPTY, F_USB)
-
-# Default values of optionally user-supplied variables
-BOARD ?= NONE
-
-# Determine the utility prefix to use for the selected architecture
-ifeq ($(ARCH), XMEGA)
-   $(warning The XMEGA device support is currently EXPERIMENTAL (incomplete and/or non-functional), and is included for preview purposes only.)
-else ifeq ($(ARCH), UC3)
-   $(warning The UC3 device support is currently EXPERIMENTAL (incomplete and/or non-functional), and is included for preview purposes only.)
-endif
-
-# Common LUFA C/C++ includes/definitions
-LUFA_CXX_INCLUDES = -I. -I$(patsubst %/,%,$(LUFA_PATH))/..
-LUFA_CXX_DEFINES  = -DARCH=ARCH_$(ARCH) -DBOARD=BOARD_$(BOARD) -DF_USB=$(F_USB)UL
-
-# LUFA specific standard build options
-C_FLAGS   += $(LUFA_CXX_INCLUDES) $(LUFA_CXX_DEFINES) $(LUFA_CXX_FLAGS)
-CPP_FLAGS += $(LUFA_CXX_INCLUDES) $(LUFA_CXX_DEFINES) $(LUFA_CXX_FLAGS)
-
-endif
diff --git a/NativePrograms/LUFA/Build/LUFA/lufa-sources.mk b/NativePrograms/LUFA/Build/LUFA/lufa-sources.mk
deleted file mode 100644
index 3028bbb644..0000000000
--- a/NativePrograms/LUFA/Build/LUFA/lufa-sources.mk
+++ /dev/null
@@ -1,101 +0,0 @@
-#
-#             LUFA Library
-#     Copyright (C) Dean Camera, 2015.
-#
-#  dean [at] fourwalledcubicle [dot] com
-#           www.lufa-lib.org
-#
-
-# Include Guard
-ifeq ($(filter LUFA_SOURCES, $(DMBS_BUILD_MODULES)),)
-
-DMBS_BUILD_MODULES         += LUFA_SOURCES
-DMBS_BUILD_TARGETS         +=
-DMBS_BUILD_MANDATORY_VARS  += LUFA_PATH ARCH
-DMBS_BUILD_OPTIONAL_VARS   +=
-DMBS_BUILD_PROVIDED_VARS   += LUFA_SRC_USB_DEVICE LUFA_SRC_USB_HOST    \
-                              LUFA_SRC_USB LUFA_SRC_USBCLASS_DEVICE    \
-                              LUFA_SRC_USBCLASS_HOST LUFA_SRC_USBCLASS \
-                              LUFA_SRC_TEMPERATURE LUFA_SRC_SERIAL     \
-                              LUFA_SRC_TWI LUFA_SRC_PLATFORM
-DMBS_BUILD_PROVIDED_MACROS +=
-
-SHELL = /bin/sh
-
-ERROR_IF_UNSET   ?= $(if $(filter undefined, $(origin $(strip $(1)))), $(error Makefile $(strip $(1)) value not set))
-ERROR_IF_EMPTY   ?= $(if $(strip $($(strip $(1)))), , $(error Makefile $(strip $(1)) option cannot be blank))
-ERROR_IF_NONBOOL ?= $(if $(filter Y N, $($(strip $(1)))), , $(error Makefile $(strip $(1)) option must be Y or N))
-
-# Sanity check user supplied values
-$(foreach MANDATORY_VAR, $(LUFA_BUILD_MANDATORY_VARS), $(call ERROR_IF_UNSET, $(MANDATORY_VAR)))
-$(call ERROR_IF_EMPTY, LUFA_PATH)
-$(call ERROR_IF_EMPTY, ARCH)
-
-# Allow LUFA_ROOT_PATH to be overridden elsewhere to support legacy LUFA makefiles
-LUFA_ROOT_PATH ?= $(patsubst %/,%,$(LUFA_PATH))
-
-# Construct LUFA module source variables
-LUFA_SRC_USB_COMMON      := $(LUFA_ROOT_PATH)/Drivers/USB/Core/$(ARCH)/USBController_$(ARCH).c   \
-                            $(LUFA_ROOT_PATH)/Drivers/USB/Core/$(ARCH)/USBInterrupt_$(ARCH).c    \
-                            $(LUFA_ROOT_PATH)/Drivers/USB/Core/ConfigDescriptors.c               \
-                            $(LUFA_ROOT_PATH)/Drivers/USB/Core/Events.c                          \
-                            $(LUFA_ROOT_PATH)/Drivers/USB/Core/USBTask.c                         \
-                            $(LUFA_ROOT_PATH)/Drivers/USB/Class/Common/HIDParser.c               \
-
-LUFA_SRC_USB_HOST        := $(LUFA_ROOT_PATH)/Drivers/USB/Core/$(ARCH)/Host_$(ARCH).c            \
-                            $(LUFA_ROOT_PATH)/Drivers/USB/Core/$(ARCH)/Pipe_$(ARCH).c            \
-                            $(LUFA_ROOT_PATH)/Drivers/USB/Core/$(ARCH)/PipeStream_$(ARCH).c      \
-                            $(LUFA_ROOT_PATH)/Drivers/USB/Core/HostStandardReq.c                 \
-                            $(LUFA_SRC_USB_COMMON)
-
-LUFA_SRC_USB_DEVICE      := $(LUFA_ROOT_PATH)/Drivers/USB/Core/$(ARCH)/Device_$(ARCH).c          \
-                            $(LUFA_ROOT_PATH)/Drivers/USB/Core/$(ARCH)/Endpoint_$(ARCH).c        \
-                            $(LUFA_ROOT_PATH)/Drivers/USB/Core/$(ARCH)/EndpointStream_$(ARCH).c  \
-                            $(LUFA_ROOT_PATH)/Drivers/USB/Core/DeviceStandardReq.c               \
-                            $(LUFA_SRC_USB_COMMON)
-
-LUFA_SRC_USBCLASS_DEVICE := $(LUFA_ROOT_PATH)/Drivers/USB/Class/Device/AudioClassDevice.c        \
-                            $(LUFA_ROOT_PATH)/Drivers/USB/Class/Device/CCIDClassDevice.c         \
-                            $(LUFA_ROOT_PATH)/Drivers/USB/Class/Device/CDCClassDevice.c          \
-                            $(LUFA_ROOT_PATH)/Drivers/USB/Class/Device/HIDClassDevice.c          \
-                            $(LUFA_ROOT_PATH)/Drivers/USB/Class/Device/MassStorageClassDevice.c  \
-                            $(LUFA_ROOT_PATH)/Drivers/USB/Class/Device/MIDIClassDevice.c         \
-                            $(LUFA_ROOT_PATH)/Drivers/USB/Class/Device/PrinterClassDevice.c      \
-                            $(LUFA_ROOT_PATH)/Drivers/USB/Class/Device/RNDISClassDevice.c        \
-
-LUFA_SRC_USBCLASS_HOST   := $(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/AndroidAccessoryClassHost.c \
-                            $(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/AudioClassHost.c            \
-                            $(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/CDCClassHost.c              \
-                            $(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/HIDClassHost.c              \
-                            $(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/MassStorageClassHost.c      \
-                            $(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/MIDIClassHost.c             \
-                            $(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/PrinterClassHost.c          \
-                            $(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/RNDISClassHost.c            \
-                            $(LUFA_ROOT_PATH)/Drivers/USB/Class/Host/StillImageClassHost.c
-
-LUFA_SRC_USB             := $(sort $(LUFA_SRC_USB_COMMON) $(LUFA_SRC_USB_HOST) $(LUFA_SRC_USB_DEVICE))
-
-LUFA_SRC_USBCLASS        := $(LUFA_SRC_USBCLASS_DEVICE) $(LUFA_SRC_USBCLASS_HOST)
-
-LUFA_SRC_TEMPERATURE     := $(LUFA_ROOT_PATH)/Drivers/Board/Temperature.c
-
-LUFA_SRC_SERIAL          := $(LUFA_ROOT_PATH)/Drivers/Peripheral/$(ARCH)/Serial_$(ARCH).c
-
-LUFA_SRC_TWI             := $(LUFA_ROOT_PATH)/Drivers/Peripheral/$(ARCH)/TWI_$(ARCH).c
-
-ifeq ($(ARCH), UC3)
-   LUFA_SRC_PLATFORM     := $(LUFA_ROOT_PATH)/Platform/UC3/Exception.S   \
-                            $(LUFA_ROOT_PATH)/Platform/UC3/InterruptManagement.c
-else
-   LUFA_SRC_PLATFORM     :=
-endif
-
-# Build a list of all available module sources
-LUFA_SRC_ALL_FILES   := $(LUFA_SRC_USB)            \
-                        $(LUFA_SRC_USBCLASS)       \
-                        $(LUFA_SRC_TEMPERATURE)    \
-                        $(LUFA_SRC_SERIAL)         \
-                        $(LUFA_SRC_TWI)            \
-                        $(LUFA_SRC_PLATFORM)
-
-endif
diff --git a/NativePrograms/LUFA/Build/lufa_atprogram.mk b/NativePrograms/LUFA/Build/lufa_atprogram.mk
deleted file mode 100644
index 3c1da54006..0000000000
--- a/NativePrograms/LUFA/Build/lufa_atprogram.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-#             LUFA Library
-#     Copyright (C) Dean Camera, 2015.
-#
-#  dean [at] fourwalledcubicle [dot] com
-#           www.lufa-lib.org
-#
-
-DMBS_PATH := $(LUFA_PATH)/Build/DMBS/DMBS
-include $(DMBS_PATH)/atprogram.mk
diff --git a/NativePrograms/LUFA/Build/lufa_avrdude.mk b/NativePrograms/LUFA/Build/lufa_avrdude.mk
deleted file mode 100644
index 82f27d26f7..0000000000
--- a/NativePrograms/LUFA/Build/lufa_avrdude.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-#             LUFA Library
-#     Copyright (C) Dean Camera, 2015.
-#
-#  dean [at] fourwalledcubicle [dot] com
-#           www.lufa-lib.org
-#
-
-DMBS_PATH := $(LUFA_PATH)/Build/DMBS/DMBS
-include $(DMBS_PATH)/avrdude.mk
diff --git a/NativePrograms/LUFA/Build/lufa_build.mk b/NativePrograms/LUFA/Build/lufa_build.mk
deleted file mode 100644
index aeba0b1ea0..0000000000
--- a/NativePrograms/LUFA/Build/lufa_build.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-#             LUFA Library
-#     Copyright (C) Dean Camera, 2015.
-#
-#  dean [at] fourwalledcubicle [dot] com
-#           www.lufa-lib.org
-#
-
-DMBS_PATH      ?= $(LUFA_PATH)/Build/DMBS/DMBS
-DMBS_LUFA_PATH ?= $(LUFA_PATH)/Build/LUFA
-include $(DMBS_PATH)/gcc.mk
-include $(DMBS_LUFA_PATH)/lufa-gcc.mk
diff --git a/NativePrograms/LUFA/Build/lufa_core.mk b/NativePrograms/LUFA/Build/lufa_core.mk
deleted file mode 100644
index fcfe407999..0000000000
--- a/NativePrograms/LUFA/Build/lufa_core.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-#             LUFA Library
-#     Copyright (C) Dean Camera, 2015.
-#
-#  dean [at] fourwalledcubicle [dot] com
-#           www.lufa-lib.org
-#
-
-DMBS_PATH := $(LUFA_PATH)/Build/DMBS/DMBS
-include $(DMBS_PATH)/core.mk
diff --git a/NativePrograms/LUFA/Build/lufa_cppcheck.mk b/NativePrograms/LUFA/Build/lufa_cppcheck.mk
deleted file mode 100644
index ed0b3cecbe..0000000000
--- a/NativePrograms/LUFA/Build/lufa_cppcheck.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-#             LUFA Library
-#     Copyright (C) Dean Camera, 2015.
-#
-#  dean [at] fourwalledcubicle [dot] com
-#           www.lufa-lib.org
-#
-
-DMBS_PATH := $(LUFA_PATH)/Build/DMBS/DMBS
-include $(DMBS_PATH)/cppcheck.mk
diff --git a/NativePrograms/LUFA/Build/lufa_dfu.mk b/NativePrograms/LUFA/Build/lufa_dfu.mk
deleted file mode 100644
index 54c33abee9..0000000000
--- a/NativePrograms/LUFA/Build/lufa_dfu.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-#             LUFA Library
-#     Copyright (C) Dean Camera, 2015.
-#
-#  dean [at] fourwalledcubicle [dot] com
-#           www.lufa-lib.org
-#
-
-DMBS_PATH := $(LUFA_PATH)/Build/DMBS/DMBS
-include $(DMBS_PATH)/dfu.mk
diff --git a/NativePrograms/LUFA/Build/lufa_doxygen.mk b/NativePrograms/LUFA/Build/lufa_doxygen.mk
deleted file mode 100644
index 105d459f32..0000000000
--- a/NativePrograms/LUFA/Build/lufa_doxygen.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-#             LUFA Library
-#     Copyright (C) Dean Camera, 2015.
-#
-#  dean [at] fourwalledcubicle [dot] com
-#           www.lufa-lib.org
-#
-
-DMBS_PATH := $(LUFA_PATH)/Build/DMBS/DMBS
-include $(DMBS_PATH)/doxygen.mk
diff --git a/NativePrograms/LUFA/Build/lufa_hid.mk b/NativePrograms/LUFA/Build/lufa_hid.mk
deleted file mode 100644
index 9e27cfc39f..0000000000
--- a/NativePrograms/LUFA/Build/lufa_hid.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-#             LUFA Library
-#     Copyright (C) Dean Camera, 2015.
-#
-#  dean [at] fourwalledcubicle [dot] com
-#           www.lufa-lib.org
-#
-
-DMBS_PATH := $(LUFA_PATH)/Build/DMBS/DMBS
-include $(DMBS_PATH)/hid.mk
diff --git a/NativePrograms/LUFA/Build/lufa_sources.mk b/NativePrograms/LUFA/Build/lufa_sources.mk
deleted file mode 100644
index 72c1f210f3..0000000000
--- a/NativePrograms/LUFA/Build/lufa_sources.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-#             LUFA Library
-#     Copyright (C) Dean Camera, 2015.
-#
-#  dean [at] fourwalledcubicle [dot] com
-#           www.lufa-lib.org
-#
-
-DMBS_LUFA_PATH ?= $(LUFA_PATH)/Build/LUFA
-include $(DMBS_LUFA_PATH)/lufa-sources.mk
diff --git a/NativePrograms/LUFA/CodeTemplates/DeviceTemplate/Descriptors.c b/NativePrograms/LUFA/CodeTemplates/DeviceTemplate/Descriptors.c
deleted file mode 100644
index 4459c5e961..0000000000
--- a/NativePrograms/LUFA/CodeTemplates/DeviceTemplate/Descriptors.c
+++ /dev/null
@@ -1,180 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *
- *  USB Device Descriptors, for library use when in USB device mode. Descriptors are special
- *  computer-readable structures which the host requests upon device enumeration, to determine
- *  the device's capabilities and functions.
- */
-
-#include "Descriptors.h"
-
-/** Device descriptor structure. This descriptor describes the overall device
- *  characteristics, including the supported USB version, control endpoint size
- *  and the number of device configurations. The descriptor is read out by the
- *  USB host when the enumeration process begins.
- */
-const USB_Descriptor_Device_t DeviceDescriptor =
-{
-	.Header                 = {.Size = sizeof(USB_Descriptor_Device_t), .Type = DTYPE_Device},
-
-	.USBSpecification       = VERSION_BCD(2,0,0),
-	.Class                  = USB_CSCP_NoDeviceClass,
-	.SubClass               = USB_CSCP_NoDeviceSubclass,
-	.Protocol               = USB_CSCP_NoDeviceProtocol,
-
-	.Endpoint0Size          = 64,
-
-	.VendorID               = 0x0000,
-	.ProductID              = 0x0000,
-	.ReleaseNumber          = VERSION_BCD(0,0,2),
-
-	.ManufacturerStrIndex   = 0x01,
-	.ProductStrIndex        = 0x02,
-	.SerialNumStrIndex      = NO_DESCRIPTOR,
-
-	.NumberOfConfigurations = 1
-};
-
-/** Configuration descriptor structure. This descriptor, located in FLASH memory, describes the usage
- *  of the device in one of its supported configurations, including information about any device interfaces
- *  and endpoints. The descriptor is read out by the USB host during the enumeration process when selecting
- *  a configuration so that the host may correctly communicate with the USB device.
- */
-const USB_Descriptor_Configuration_t ConfigurationDescriptor =
-{
-	.Config =
-		{
-			.Header                   = {.Size = sizeof(USB_Descriptor_Configuration_Header_t), .Type = DTYPE_Configuration},
-
-			.TotalConfigurationSize   = sizeof(USB_Descriptor_Configuration_t),
-			.TotalInterfaces          = 0,
-
-			.ConfigurationNumber      = 1,
-			.ConfigurationStrIndex    = NO_DESCRIPTOR,
-
-			.ConfigAttributes         = (USB_CONFIG_ATTR_RESERVED | USB_CONFIG_ATTR_SELFPOWERED),
-
-			.MaxPowerConsumption      = USB_CONFIG_POWER_MA(100)
-		},
-};
-
-/** Language descriptor structure. This descriptor, located in FLASH memory, is returned when the host requests
- *  the string descriptor with index 0 (the first index). It is actually an array of 16-bit integers, which indicate
- *  via the language ID table available at USB.org what languages the device supports for its string descriptors.
- */
-const USB_Descriptor_String_t LanguageString =
-{
-	.Header                 = {.Size = USB_STRING_LEN(1), .Type = DTYPE_String},
-
-	.UnicodeString          = {LANGUAGE_ID_ENG}
-};
-
-/** Manufacturer descriptor string. This is a Unicode string containing the manufacturer's details in human readable
- *  form, and is read out upon request by the host when the appropriate string ID is requested, listed in the Device
- *  Descriptor.
- */
-const USB_Descriptor_String_t ManufacturerString =
-{
-	.Header                 = {.Size = USB_STRING_LEN(14), .Type = DTYPE_String},
-
-	.UnicodeString          = L"Your Name Here"
-};
-
-/** Product descriptor string. This is a Unicode string containing the product's details in human readable form,
- *  and is read out upon request by the host when the appropriate string ID is requested, listed in the Device
- *  Descriptor.
- */
-const USB_Descriptor_String_t ProductString =
-{
-	.Header                 = {.Size = USB_STRING_LEN(15), .Type = DTYPE_String},
-
-	.UnicodeString          = L"LUFA USB Device"
-};
-
-/** This function is called by the library when in device mode, and must be overridden (see library "USB Descriptors"
- *  documentation) by the application code so that the address and size of a requested descriptor can be given
- *  to the USB library. When the device receives a Get Descriptor request on the control endpoint, this function
- *  is called so that the descriptor details can be passed back and the appropriate descriptor sent back to the
- *  USB host.
- */
-uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                    const uint16_t wIndex,
-                                    const void** const DescriptorAddress
-									#if defined(HAS_MULTIPLE_DESCRIPTOR_ADDRESS_SPACES)
-									, uint8_t* const DescriptorMemorySpace
-									#endif
-									)
-{
-	const uint8_t  DescriptorType   = (wValue >> 8);
-	const uint8_t  DescriptorNumber = (wValue & 0xFF);
-
-	const void* Address = NULL;
-	uint16_t    Size    = NO_DESCRIPTOR;
-
-	switch (DescriptorType)
-	{
-		case DTYPE_Device:
-			Address = &DeviceDescriptor;
-			Size    = sizeof(USB_Descriptor_Device_t);
-			break;
-		case DTYPE_Configuration:
-			Address = &ConfigurationDescriptor;
-			Size    = sizeof(USB_Descriptor_Configuration_t);
-			break;
-		case DTYPE_String:
-			switch (DescriptorNumber)
-			{
-				case 0x00:
-					Address = &LanguageString;
-					Size    = pgm_read_byte(&LanguageString.Header.Size);
-					break;
-				case 0x01:
-					Address = &ManufacturerString;
-					Size    = pgm_read_byte(&ManufacturerString.Header.Size);
-					break;
-				case 0x02:
-					Address = &ProductString;
-					Size    = pgm_read_byte(&ProductString.Header.Size);
-					break;
-			}
-
-			break;
-	}
-
-	#if defined(HAS_MULTIPLE_DESCRIPTOR_ADDRESS_SPACES)
-	*DescriptorMemorySpace = MEMSPACE_RAM;
-	#endif
-
-	*DescriptorAddress = Address;
-	return Size;
-}
-
diff --git a/NativePrograms/LUFA/CodeTemplates/DeviceTemplate/Descriptors.h b/NativePrograms/LUFA/CodeTemplates/DeviceTemplate/Descriptors.h
deleted file mode 100644
index 2b73c3f9bc..0000000000
--- a/NativePrograms/LUFA/CodeTemplates/DeviceTemplate/Descriptors.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *
- *  Header file for Descriptors.c.
- */
-
-#ifndef _DESCRIPTORS_H_
-#define _DESCRIPTORS_H_
-
-	/* Includes: */
-		#include <LUFA/Drivers/USB/USB.h>
-
-  /* Macros: */
-    #if (defined(ARCH_HAS_MULTI_ADDRESS_SPACE) && \
-         !(defined(USE_FLASH_DESCRIPTORS) || defined(USE_EEPROM_DESCRIPTORS) || defined(USE_RAM_DESCRIPTORS)))
-      #define HAS_MULTIPLE_DESCRIPTOR_ADDRESS_SPACES
-    #endif
-
-	/* Type Defines: */
-		/** Type define for the device configuration descriptor structure. This must be defined in the
-		 *  application code, as the configuration descriptor contains several sub-descriptors which
-		 *  vary between devices, and which describe the device's usage to the host.
-		 */
-		typedef struct
-		{
-			USB_Descriptor_Configuration_Header_t Config;
-		} USB_Descriptor_Configuration_t;
-
-#endif
-
diff --git a/NativePrograms/LUFA/CodeTemplates/DeviceTemplate/DeviceApplication.c b/NativePrograms/LUFA/CodeTemplates/DeviceTemplate/DeviceApplication.c
deleted file mode 100644
index fae66de81f..0000000000
--- a/NativePrograms/LUFA/CodeTemplates/DeviceTemplate/DeviceApplication.c
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *
- *  Main source file for the USB device application. This file contains the
- *  main tasks of the application and is responsible for the initial
- *  application hardware configuration.
- */
-
-#include "DeviceApplication.h"
-
-/** Main program entry point. This routine contains the overall program flow, including initial
- *  setup of all components and the main program loop.
- */
-int main(void)
-{
-	SetupHardware();
-
-	GlobalInterruptEnable();
-
-	for (;;)
-	{
-		USB_USBTask();
-	}
-}
-
-/** Configures the board hardware and chip peripherals for the demo's functionality. */
-void SetupHardware(void)
-{
-	#if (ARCH == ARCH_AVR8)
-		/* Disable watchdog if enabled by bootloader/fuses */
-		MCUSR &= ~(1 << WDRF);
-		wdt_disable();
-
-		/* Disable clock division */
-		clock_prescale_set(clock_div_1);
-
-		/* Hardware Initialization */
-		USB_Init(USB_MODE_Device, USB_DEVICE_OPT_FULLSPEED | USB_OPT_AUTO_PLL);
-	#elif (ARCH == ARCH_XMEGA)
-		/* Start the PLL to multiply the 2MHz RC oscillator to 32MHz and switch the CPU core to run from it */
-		XMEGACLK_StartPLL(CLOCK_SRC_INT_RC2MHZ, 2000000, F_CPU);
-		XMEGACLK_SetCPUClockSource(CLOCK_SRC_PLL);
-
-		/* Start the 32MHz internal RC oscillator and start the DFLL to increase it to 48MHz using the USB SOF as a reference */
-		XMEGACLK_StartInternalOscillator(CLOCK_SRC_INT_RC32MHZ);
-		XMEGACLK_StartDFLL(CLOCK_SRC_INT_RC32MHZ, DFLL_REF_INT_USBSOF, F_USB);
-
-		PMIC.CTRL = PMIC_LOLVLEN_bm | PMIC_MEDLVLEN_bm | PMIC_HILVLEN_bm;
-
-		/* Hardware Initialization */
-		USB_Init(USB_OPT_RC32MCLKSRC | USB_OPT_BUSEVENT_PRIHIGH);
-	#endif
-}
-
-/** Event handler for the library USB Connection event. */
-void EVENT_USB_Device_Connect(void)
-{
-
-}
-
-/** Event handler for the library USB Disconnection event. */
-void EVENT_USB_Device_Disconnect(void)
-{
-
-}
-
-/** Event handler for the library USB Configuration Changed event. */
-void EVENT_USB_Device_ConfigurationChanged(void)
-{
-
-}
-
-/** Event handler for the library USB Control Request reception event. */
-void EVENT_USB_Device_ControlRequest(void)
-{
-
-}
diff --git a/NativePrograms/LUFA/CodeTemplates/DeviceTemplate/DeviceApplication.h b/NativePrograms/LUFA/CodeTemplates/DeviceTemplate/DeviceApplication.h
deleted file mode 100644
index 9761d0b0d0..0000000000
--- a/NativePrograms/LUFA/CodeTemplates/DeviceTemplate/DeviceApplication.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *
- *  Header file for DeviceApplication.c.
- */
-
-#ifndef _USB_DEVICE_APPLICATION_H_
-#define _USB_DEVICE_APPLICATION_H_
-
-	/* Includes: */
-		#include <avr/io.h>
-		#include <avr/wdt.h>
-		#include <avr/power.h>
-
-		#include <LUFA/Platform/Platform.h>
-		#include <LUFA/Drivers/USB/USB.h>
-
-		#include "Descriptors.h"
-
-	/* Function Prototypes: */
-		void SetupHardware(void);
-
-#endif
-
diff --git a/NativePrograms/LUFA/CodeTemplates/DriverStubs/Board.h b/NativePrograms/LUFA/CodeTemplates/DriverStubs/Board.h
deleted file mode 100644
index aa316b8748..0000000000
--- a/NativePrograms/LUFA/CodeTemplates/DriverStubs/Board.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief LUFA Custom Board Hardware Information Driver (Template)
- *
- *  This is a stub driver header file, for implementing custom board
- *  layout hardware with compatible LUFA board specific drivers. If
- *  the library is configured to use the BOARD_USER board mode, this
- *  driver file should be completed and copied into the "/Board/" folder
- *  inside the application's folder.
- *
- *  This stub is for the board-specific component of the LUFA Board Hardware
- *  information driver.
- */
-
-#ifndef __BOARD_USER_H__
-#define __BOARD_USER_H__
-
-	/* Includes: */
-		// TODO: Add any required includes here
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_BOARD_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/Board.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Indicates the board has hardware Buttons mounted if defined. */
-//			#define BOARD_HAS_BUTTONS
-
-			/** Indicates the board has a hardware Dataflash mounted if defined. */
-//			#define BOARD_HAS_DATAFLASH
-
-			/** Indicates the board has a hardware Joystick mounted if defined. */
-//			#define BOARD_HAS_JOYSTICK
-
-			/** Indicates the board has hardware LEDs mounted if defined. */
-//			#define BOARD_HAS_LEDS
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
diff --git a/NativePrograms/LUFA/CodeTemplates/DriverStubs/Buttons.h b/NativePrograms/LUFA/CodeTemplates/DriverStubs/Buttons.h
deleted file mode 100644
index f464def5a3..0000000000
--- a/NativePrograms/LUFA/CodeTemplates/DriverStubs/Buttons.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief LUFA Custom Board Button Hardware Driver (Template)
- *
- *  This is a stub driver header file, for implementing custom board
- *  layout hardware with compatible LUFA board specific drivers. If
- *  the library is configured to use the BOARD_USER board mode, this
- *  driver file should be completed and copied into the "/Board/" folder
- *  inside the application's folder.
- *
- *  This stub is for the board-specific component of the LUFA Buttons driver,
- *  for the control of physical board-mounted GPIO pushbuttons.
- */
-
-#ifndef __BUTTONS_USER_H__
-#define __BUTTONS_USER_H__
-
-	/* Includes: */
-		// TODO: Add any required includes here
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_BUTTONS_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/Buttons.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Button mask for the first button on the board. */
-			#define BUTTONS_BUTTON1          // TODO: Add mask for first board button here
-
-		/* Inline Functions: */
-		#if !defined(__DOXYGEN__)
-			static inline void Buttons_Init(void)
-			{
-				// TODO: Initialize the appropriate port pins as an inputs here, with pull-ups
-			}
-
-			static inline void Buttons_Disable(void)
-			{
-				// TODO: Clear the appropriate port pins as high impedance inputs here
-			}
-
-			static inline uint8_t Buttons_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
-			static inline uint8_t Buttons_GetStatus(void)
-			{
-				// TODO: Return current button status here, debounced if required
-			}
-		#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
diff --git a/NativePrograms/LUFA/CodeTemplates/DriverStubs/Dataflash.h b/NativePrograms/LUFA/CodeTemplates/DriverStubs/Dataflash.h
deleted file mode 100644
index f602b6e5b2..0000000000
--- a/NativePrograms/LUFA/CodeTemplates/DriverStubs/Dataflash.h
+++ /dev/null
@@ -1,223 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief LUFA Custom Board Dataflash Hardware Driver (Template)
- *
- *  This is a stub driver header file, for implementing custom board
- *  layout hardware with compatible LUFA board specific drivers. If
- *  the library is configured to use the BOARD_USER board mode, this
- *  driver file should be completed and copied into the "/Board/" folder
- *  inside the application's folder.
- *
- *  This stub is for the board-specific component of the LUFA Dataflash
- *  driver.
-*/
-
-#ifndef __DATAFLASH_USER_H__
-#define __DATAFLASH_USER_H__
-
-	/* Includes: */
-		// TODO: Add any required includes here
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_DATAFLASH_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/Dataflash.h instead.
-		#endif
-
-	/* Private Interface - For use in library only: */
-	#if !defined(__DOXYGEN__)
-		/* Macros: */
-			#define DATAFLASH_CHIPCS_MASK                // TODO: Replace this with a mask of all the /CS pins of all Dataflashes
-			#define DATAFLASH_CHIPCS_DDR                 // TODO: Replace with the DDR register name for the board's Dataflash ICs
-			#define DATAFLASH_CHIPCS_PORT                // TODO: Replace with the PORT register name for the board's Dataflash ICs
-	#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Constant indicating the total number of dataflash ICs mounted on the selected board. */
-			#define DATAFLASH_TOTALCHIPS                 1 // TODO: Replace with the number of Dataflashes on the board, max 2
-
-			/** Mask for no dataflash chip selected. */
-			#define DATAFLASH_NO_CHIP                    0
-
-			/** Mask for the first dataflash chip selected. */
-			#define DATAFLASH_CHIP1                      // TODO: Replace with mask with the pin attached to the first Dataflash /CS set
-
-			/** Mask for the second dataflash chip selected. */
-			#define DATAFLASH_CHIP2                      // TODO: Replace with mask with the pin attached to the second Dataflash /CS set
-
-			/** Internal main memory page size for the board's dataflash ICs. */
-			#define DATAFLASH_PAGE_SIZE                  // TODO: Replace with the page size for the Dataflash ICs
-
-			/** Total number of pages inside each of the board's dataflash ICs. */
-			#define DATAFLASH_PAGES                      // TODO: Replace with the total number of pages inside one of the Dataflash ICs
-
-		/* Inline Functions: */
-		#if !defined(__DOXYGEN__)
-			/** Initializes the dataflash driver so that commands and data may be sent to an attached dataflash IC.
-			 *  The microcontroller's SPI driver MUST be initialized before any of the dataflash commands are used.
-			 */
-			static inline void Dataflash_Init(void)
-			{
-				DATAFLASH_CHIPCS_DDR  |= DATAFLASH_CHIPCS_MASK;
-				DATAFLASH_CHIPCS_PORT |= DATAFLASH_CHIPCS_MASK;
-			}
-
-			/** Sends a byte to the currently selected dataflash IC, and returns a byte from the dataflash.
-			 *
-			 *  \param[in] Byte  Byte of data to send to the dataflash
-			 *
-			 *  \return Last response byte from the dataflash
-			 */
-			static inline uint8_t Dataflash_TransferByte(const uint8_t Byte) ATTR_ALWAYS_INLINE;
-			static inline uint8_t Dataflash_TransferByte(const uint8_t Byte)
-			{
-				// TODO
-			}
-
-			/** Sends a byte to the currently selected dataflash IC, and ignores the next byte from the dataflash.
-			 *
-			 *  \param[in] Byte  Byte of data to send to the dataflash
-			 */
-			static inline void Dataflash_SendByte(const uint8_t Byte) ATTR_ALWAYS_INLINE;
-			static inline void Dataflash_SendByte(const uint8_t Byte)
-			{
-				// TODO
-			}
-
-			/** Sends a dummy byte to the currently selected dataflash IC, and returns the next byte from the dataflash.
-			 *
-			 *  \return Last response byte from the dataflash
-			 */
-			static inline uint8_t Dataflash_ReceiveByte(void) ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT;
-			static inline uint8_t Dataflash_ReceiveByte(void)
-			{
-				// TODO
-			}
-
-			/** Determines the currently selected dataflash chip.
-			 *
-			 *  \return Mask of the currently selected Dataflash chip, either \ref DATAFLASH_NO_CHIP if no chip is selected
-			 *          or a DATAFLASH_CHIPn mask (where n is the chip number).
-			 */
-			static inline uint8_t Dataflash_GetSelectedChip(void) ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT;
-			static inline uint8_t Dataflash_GetSelectedChip(void)
-			{
-				return (~DATAFLASH_CHIPCS_PORT & DATAFLASH_CHIPCS_MASK);
-			}
-
-			/** Selects the given dataflash chip.
-			 *
-			 *  \param[in]  ChipMask  Mask of the Dataflash IC to select, in the form of a \c DATAFLASH_CHIPn mask (where n is
-			 *              the chip number).
-			 */
-			static inline void Dataflash_SelectChip(const uint8_t ChipMask) ATTR_ALWAYS_INLINE;
-			static inline void Dataflash_SelectChip(const uint8_t ChipMask)
-			{
-				DATAFLASH_CHIPCS_PORT = ((DATAFLASH_CHIPCS_PORT | DATAFLASH_CHIPCS_MASK) & ~ChipMask);
-			}
-
-			/** Deselects the current dataflash chip, so that no dataflash is selected. */
-			static inline void Dataflash_DeselectChip(void) ATTR_ALWAYS_INLINE;
-			static inline void Dataflash_DeselectChip(void)
-			{
-				Dataflash_SelectChip(DATAFLASH_NO_CHIP);
-			}
-
-			/** Selects a dataflash IC from the given page number, which should range from 0 to
-			 *  ((DATAFLASH_PAGES * DATAFLASH_TOTALCHIPS) - 1). For boards containing only one
-			 *  dataflash IC, this will select DATAFLASH_CHIP1. If the given page number is outside
-			 *  the total number of pages contained in the boards dataflash ICs, all dataflash ICs
-			 *  are deselected.
-			 *
-			 *  \param[in] PageAddress  Address of the page to manipulate, ranging from
-			 *                          0 to ((DATAFLASH_PAGES * DATAFLASH_TOTALCHIPS) - 1).
-			 */
-			static inline void Dataflash_SelectChipFromPage(const uint16_t PageAddress)
-			{
-				Dataflash_DeselectChip();
-
-				if (PageAddress >= (DATAFLASH_PAGES * DATAFLASH_TOTALCHIPS))
-				  return;
-
-				#if (DATAFLASH_TOTALCHIPS == 2)
-					if (PageAddress & 0x01)
-					  Dataflash_SelectChip(DATAFLASH_CHIP2);
-					else
-					  Dataflash_SelectChip(DATAFLASH_CHIP1);
-				#else
-					Dataflash_SelectChip(DATAFLASH_CHIP1);
-				#endif
-			}
-
-			/** Toggles the select line of the currently selected dataflash IC, so that it is ready to receive
-			 *  a new command.
-			 */
-			static inline void Dataflash_ToggleSelectedChipCS(void)
-			{
-				uint8_t SelectedChipMask = Dataflash_GetSelectedChip();
-
-				Dataflash_DeselectChip();
-				Dataflash_SelectChip(SelectedChipMask);
-			}
-
-			/** Spin-loops while the currently selected dataflash is busy executing a command, such as a main
-			 *  memory page program or main memory to buffer transfer.
-			 */
-			static inline void Dataflash_WaitWhileBusy(void)
-			{
-				Dataflash_ToggleSelectedChipCS();
-				Dataflash_SendByte(DF_CMD_GETSTATUS);
-				while (!(Dataflash_ReceiveByte() & DF_STATUS_READY));
-				Dataflash_ToggleSelectedChipCS();
-			}
-
-			/** Sends a set of page and buffer address bytes to the currently selected dataflash IC, for use with
-			 *  dataflash commands which require a complete 24-bit address.
-			 *
-			 *  \param[in] PageAddress  Page address within the selected dataflash IC
-			 *  \param[in] BufferByte   Address within the dataflash's buffer
-			 */
-			static inline void Dataflash_SendAddressBytes(uint16_t PageAddress,
-			                                              const uint16_t BufferByte)
-			{
-				#if (DATAFLASH_TOTALCHIPS == 2)
-					PageAddress >>= 1;
-				#endif
-
-				Dataflash_SendByte(PageAddress >> 5);
-				Dataflash_SendByte((PageAddress << 3) | (BufferByte >> 8));
-				Dataflash_SendByte(BufferByte);
-			}
-		#endif
-
-#endif
-
diff --git a/NativePrograms/LUFA/CodeTemplates/DriverStubs/Joystick.h b/NativePrograms/LUFA/CodeTemplates/DriverStubs/Joystick.h
deleted file mode 100644
index d37f3ca56a..0000000000
--- a/NativePrograms/LUFA/CodeTemplates/DriverStubs/Joystick.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief LUFA Custom Board Joystick Hardware Driver (Template)
- *
- *  This is a stub driver header file, for implementing custom board
- *  layout hardware with compatible LUFA board specific drivers. If
- *  the library is configured to use the BOARD_USER board mode, this
- *  driver file should be completed and copied into the "/Board/" folder
- *  inside the application's folder.
- *
- *  This stub is for the board-specific component of the LUFA Joystick
- *  driver, for a digital four-way (plus button) joystick.
-*/
-
-#ifndef __JOYSTICK_USER_H__
-#define __JOYSTICK_USER_H__
-
-	/* Includes: */
-		// TODO: Add any required includes here
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_JOYSTICK_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/Joystick.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Mask for the joystick being pushed in the left direction. */
-			#define JOY_LEFT                  // TODO: Add mask to indicate joystick left position here
-
-			/** Mask for the joystick being pushed in the right direction. */
-			#define JOY_RIGHT                 // TODO: Add mask to indicate joystick right position here
-
-			/** Mask for the joystick being pushed in the upward direction. */
-			#define JOY_UP                    // TODO: Add mask to indicate joystick up position here
-
-			/** Mask for the joystick being pushed in the downward direction. */
-			#define JOY_DOWN                  // TODO: Add mask to indicate joystick down position here
-
-			/** Mask for the joystick being pushed inward. */
-			#define JOY_PRESS                 // TODO: Add mask to indicate joystick pressed position here
-
-		/* Inline Functions: */
-		#if !defined(__DOXYGEN__)
-			static inline void Joystick_Init(void)
-			{
-				// TODO: Initialize joystick port pins as inputs with pull-ups
-			}
-
-			static inline void Joystick_Disable(void)
-			{
-				// TODO: Clear the joystick pins as high impedance inputs here
-			}
-
-			static inline uint8_t Joystick_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
-			static inline uint8_t Joystick_GetStatus(void)
-			{
-				// TODO: Return current joystick position data which can be obtained by masking against the JOY_* macros
-			}
-		#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
diff --git a/NativePrograms/LUFA/CodeTemplates/DriverStubs/LEDs.h b/NativePrograms/LUFA/CodeTemplates/DriverStubs/LEDs.h
deleted file mode 100644
index da00d86e4a..0000000000
--- a/NativePrograms/LUFA/CodeTemplates/DriverStubs/LEDs.h
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief LUFA Custom Board LED Hardware Driver (Template)
- *
- *  This is a stub driver header file, for implementing custom board
- *  layout hardware with compatible LUFA board specific drivers. If
- *  the library is configured to use the BOARD_USER board mode, this
- *  driver file should be completed and copied into the "/Board/" folder
- *  inside the application's folder.
- *
- *  This stub is for the board-specific component of the LUFA LEDs driver,
- *  for the LEDs (up to four) mounted on most development boards.
-*/
-
-#ifndef __LEDS_USER_H__
-#define __LEDS_USER_H__
-
-	/* Includes: */
-		// TODO: Add any required includes here
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_LEDS_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/LEDS.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** LED mask for the first LED on the board. */
-			#define LEDS_LED1        // TODO: Add mask for first board LED here
-
-			/** LED mask for the second LED on the board. */
-			#define LEDS_LED2        // TODO: Add mask for second board LED here
-
-			/** LED mask for the third LED on the board. */
-			#define LEDS_LED3        // TODO: Add mask for third board LED here
-
-			/** LED mask for the fourth LED on the board. */
-			#define LEDS_LED4        // TODO: Add mask for fourth board LED here
-
-			/** LED mask for all the LEDs on the board. */
-			#define LEDS_ALL_LEDS    (LEDS_LED1 | LEDS_LED2 | LEDS_LED3 | LEDS_LED4)
-
-			/** LED mask for none of the board LEDs. */
-			#define LEDS_NO_LEDS     0
-
-		/* Inline Functions: */
-		#if !defined(__DOXYGEN__)
-			static inline void LEDs_Init(void)
-			{
-				// TODO: Add code to initialize LED port pins as outputs here
-			}
-
-			static inline void LEDs_Disable(void)
-			{
-				// TODO: Clear the LED port pins as high impedance inputs here
-			}
-
-			static inline void LEDs_TurnOnLEDs(const uint8_t LEDMask)
-			{
-				// TODO: Add code to turn on LEDs given in the LEDMask mask here, leave others as-is
-			}
-
-			static inline void LEDs_TurnOffLEDs(const uint8_t LEDMask)
-			{
-				// TODO: Add code to turn off LEDs given in the LEDMask mask here, leave others as-is
-			}
-
-			static inline void LEDs_SetAllLEDs(const uint8_t LEDMask)
-			{
-				// TODO: Add code to turn on only LEDs given in the LEDMask mask here, all others off
-			}
-
-			static inline void LEDs_ChangeLEDs(const uint8_t LEDMask, const uint8_t ActiveMask)
-			{
-				// TODO: Add code to set the Leds in the given LEDMask to the status given in ActiveMask here
-			}
-
-			static inline void LEDs_ToggleLEDs(const uint8_t LEDMask)
-			{
-				// TODO: Add code to toggle the Leds in the given LEDMask, ignoring all others
-			}
-
-			static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT;
-			static inline uint8_t LEDs_GetLEDs(void)
-			{
-				// TODO: Add code to return the current LEDs status' here which can be masked against LED_LED* macros
-			}
-		#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
diff --git a/NativePrograms/LUFA/CodeTemplates/HostTemplate/HostApplication.c b/NativePrograms/LUFA/CodeTemplates/HostTemplate/HostApplication.c
deleted file mode 100644
index 418620b27f..0000000000
--- a/NativePrograms/LUFA/CodeTemplates/HostTemplate/HostApplication.c
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *
- *  Main source file for the USB host application. This file contains the
- *  main tasks of the application and is responsible for the initial
- *  application hardware configuration.
- */
-
-#include "HostApplication.h"
-
-/** Main program entry point. This routine configures the hardware required by the application, then
- *  enters a loop to run the application tasks in sequence.
- */
-int main(void)
-{
-	SetupHardware();
-
-	GlobalInterruptEnable();
-
-	for (;;)
-	{
-		USB_USBTask();
-	}
-}
-
-/** Configures the board hardware and chip peripherals for the demo's functionality. */
-void SetupHardware(void)
-{
-	/* Disable watchdog if enabled by bootloader/fuses */
-	MCUSR &= ~(1 << WDRF);
-	wdt_disable();
-
-	/* Disable clock division */
-	clock_prescale_set(clock_div_1);
-
-	/* Hardware Initialization */
-	USB_Init(USB_MODE_Host, USB_DEVICE_OPT_FULLSPEED | USB_OPT_AUTO_PLL);
-}
-
-/** Event handler for the USB_DeviceAttached event. This indicates that a device has been attached to the host, and
- *  starts the library USB task to begin the enumeration and USB management process.
- */
-void EVENT_USB_Host_DeviceAttached(void)
-{
-
-}
-
-/** Event handler for the USB_DeviceUnattached event. This indicates that a device has been removed from the host, and
- *  stops the library USB task management process.
- */
-void EVENT_USB_Host_DeviceUnattached(void)
-{
-
-}
-
-/** Event handler for the USB_DeviceEnumerationComplete event. This indicates that a device has been successfully
- *  enumerated by the host and is now ready to be used by the application.
- */
-void EVENT_USB_Host_DeviceEnumerationComplete(void)
-{
-	uint16_t ConfigDescriptorSize;
-	uint8_t  ConfigDescriptorData[512];
-
-	if (USB_Host_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, ConfigDescriptorData,
-	                                       sizeof(ConfigDescriptorData)) != HOST_GETCONFIG_Successful)
-	{
-		return;
-	}
-
-	if (USB_Host_SetDeviceConfiguration(1) != HOST_SENDCONTROL_Successful)
-	{
-		return;
-	}
-}
-
-/** Event handler for the USB_HostError event. This indicates that a hardware error occurred while in host mode. */
-void EVENT_USB_Host_HostError(const uint8_t ErrorCode)
-{
-	USB_Disable();
-	for(;;);
-}
-
-/** Event handler for the USB_DeviceEnumerationFailed event. This indicates that a problem occurred while
- *  enumerating an attached USB device.
- */
-void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode,
-                                            const uint8_t SubErrorCode)
-{
-
-}
-
-/* Required callback for retrieving descriptors from a LUFA device - unless the USB_HOST_ONLY configuration
- * option is set, this is still required even in an application that uses host mode only.
- */
-uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-		const uint16_t wIndex,
-		const void** const DescriptorAddress
-#if defined(HAS_MULTIPLE_DESCRIPTOR_ADDRESS_SPACES)
-		, uint8_t* const DescriptorMemorySpace
-#endif
-)
-{
-	return 0;
-}
diff --git a/NativePrograms/LUFA/CodeTemplates/HostTemplate/HostApplication.h b/NativePrograms/LUFA/CodeTemplates/HostTemplate/HostApplication.h
deleted file mode 100644
index a857420676..0000000000
--- a/NativePrograms/LUFA/CodeTemplates/HostTemplate/HostApplication.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *
- *  Header file for HostApplication.c.
- */
-
-#ifndef _USB_HOST_APPLICATION_H_
-#define _USB_HOST_APPLICATION_H_
-
-	/* Includes: */
-		#include <avr/io.h>
-		#include <avr/wdt.h>
-		#include <avr/power.h>
-
-		#include <LUFA/Drivers/USB/USB.h>
-
-	/* Macros: */
-		#if (defined(ARCH_HAS_MULTI_ADDRESS_SPACE) && \
-			 !(defined(USE_FLASH_DESCRIPTORS) || defined(USE_EEPROM_DESCRIPTORS) || defined(USE_RAM_DESCRIPTORS)))
-		  #define HAS_MULTIPLE_DESCRIPTOR_ADDRESS_SPACES
-		#endif
-
-	/* Function Prototypes: */
-		void SetupHardware(void);
-
-#endif
-
diff --git a/NativePrograms/LUFA/CodeTemplates/LUFAConfig.h b/NativePrograms/LUFA/CodeTemplates/LUFAConfig.h
deleted file mode 100644
index 7359ce043c..0000000000
--- a/NativePrograms/LUFA/CodeTemplates/LUFAConfig.h
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief LUFA Library Configuration Header File (Template)
- *
- *  This is a header file which can be used to configure LUFA's
- *  compile time options, as an alternative to the compile time
- *  constants supplied through a makefile. To use this configuration
- *  header, copy this into your project's root directory and supply
- *  the \c USE_LUFA_CONFIG_HEADER token to the compiler so that it is
- *  defined in all compiled source files.
- *
- *  For information on what each token does, refer to the LUFA
- *  manual section "Summary of Compile Tokens".
- */
-
-#ifndef __LUFA_CONFIG_H__
-#define __LUFA_CONFIG_H__
-
-	#if (ARCH == ARCH_AVR8)
-
-		/* Non-USB Related Configuration Tokens: */
-//		#define DISABLE_TERMINAL_CODES
-
-		/* USB Class Driver Related Tokens: */
-//		#define HID_HOST_BOOT_PROTOCOL_ONLY
-//		#define HID_STATETABLE_STACK_DEPTH       {Insert Value Here}
-//		#define HID_USAGE_STACK_DEPTH            {Insert Value Here}
-//		#define HID_MAX_COLLECTIONS              {Insert Value Here}
-//		#define HID_MAX_REPORTITEMS              {Insert Value Here}
-//		#define HID_MAX_REPORT_IDS               {Insert Value Here}
-//		#define NO_CLASS_DRIVER_AUTOFLUSH
-
-		/* General USB Driver Related Tokens: */
-//		#define ORDERED_EP_CONFIG
-//		#define USE_STATIC_OPTIONS               {Insert Value Here}
-//		#define USB_DEVICE_ONLY
-//		#define USB_HOST_ONLY
-//		#define USB_STREAM_TIMEOUT_MS            {Insert Value Here}
-//		#define NO_LIMITED_CONTROLLER_CONNECT
-//		#define NO_SOF_EVENTS
-
-		/* USB Device Mode Driver Related Tokens: */
-//		#define USE_RAM_DESCRIPTORS
-//		#define USE_FLASH_DESCRIPTORS
-//		#define USE_EEPROM_DESCRIPTORS
-//		#define NO_INTERNAL_SERIAL
-//		#define FIXED_CONTROL_ENDPOINT_SIZE      {Insert Value Here}
-//		#define DEVICE_STATE_AS_GPIOR            {Insert Value Here}
-//		#define FIXED_NUM_CONFIGURATIONS         {Insert Value Here}
-//		#define CONTROL_ONLY_DEVICE
-//		#define INTERRUPT_CONTROL_ENDPOINT
-//		#define NO_DEVICE_REMOTE_WAKEUP
-//		#define NO_DEVICE_SELF_POWER
-
-		/* USB Host Mode Driver Related Tokens: */
-//		#define HOST_STATE_AS_GPIOR              {Insert Value Here}
-//		#define USB_HOST_TIMEOUT_MS              {Insert Value Here}
-//		#define HOST_DEVICE_SETTLE_DELAY_MS	     {Insert Value Here}
-//		#define NO_AUTO_VBUS_MANAGEMENT
-//		#define INVERTED_VBUS_ENABLE_LINE
-
-	#elif (ARCH == ARCH_XMEGA)
-
-		/* Non-USB Related Configuration Tokens: */
-//		#define DISABLE_TERMINAL_CODES
-
-		/* USB Class Driver Related Tokens: */
-//		#define HID_HOST_BOOT_PROTOCOL_ONLY
-//		#define HID_STATETABLE_STACK_DEPTH       {Insert Value Here}
-//		#define HID_USAGE_STACK_DEPTH            {Insert Value Here}
-//		#define HID_MAX_COLLECTIONS              {Insert Value Here}
-//		#define HID_MAX_REPORTITEMS              {Insert Value Here}
-//		#define HID_MAX_REPORT_IDS               {Insert Value Here}
-//		#define NO_CLASS_DRIVER_AUTOFLUSH
-
-		/* General USB Driver Related Tokens: */
-//		#define USE_STATIC_OPTIONS               {Insert Value Here}
-//		#define USB_STREAM_TIMEOUT_MS            {Insert Value Here}
-//		#define NO_LIMITED_CONTROLLER_CONNECT
-//		#define NO_SOF_EVENTS
-
-		/* USB Device Mode Driver Related Tokens: */
-//		#define USE_RAM_DESCRIPTORS
-//		#define USE_FLASH_DESCRIPTORS
-//		#define USE_EEPROM_DESCRIPTORS
-//		#define NO_INTERNAL_SERIAL
-//		#define FIXED_CONTROL_ENDPOINT_SIZE      {Insert Value Here}
-//		#define DEVICE_STATE_AS_GPIOR            {Insert Value Here}
-//		#define FIXED_NUM_CONFIGURATIONS         {Insert Value Here}
-//		#define CONTROL_ONLY_DEVICE
-// 		#define MAX_ENDPOINT_INDEX               {Insert Value Here}
-//		#define NO_DEVICE_REMOTE_WAKEUP
-//		#define NO_DEVICE_SELF_POWER
-
-	#elif (ARCH == ARCH_UC3)
-
-		/* Non-USB Related Configuration Tokens: */
-//		#define DISABLE_TERMINAL_CODES
-
-		/* USB Class Driver Related Tokens: */
-//		#define HID_HOST_BOOT_PROTOCOL_ONLY
-//		#define HID_STATETABLE_STACK_DEPTH       {Insert Value Here}
-//		#define HID_USAGE_STACK_DEPTH            {Insert Value Here}
-//		#define HID_MAX_COLLECTIONS              {Insert Value Here}
-//		#define HID_MAX_REPORTITEMS              {Insert Value Here}
-//		#define HID_MAX_REPORT_IDS               {Insert Value Here}
-//		#define NO_CLASS_DRIVER_AUTOFLUSH
-
-		/* General USB Driver Related Tokens: */
-//		#define ORDERED_EP_CONFIG
-//		#define USE_STATIC_OPTIONS               {Insert Value Here}
-//		#define USB_DEVICE_ONLY
-//		#define USB_HOST_ONLY
-//		#define USB_STREAM_TIMEOUT_MS            {Insert Value Here}
-//		#define NO_SOF_EVENTS
-
-		/* USB Device Mode Driver Related Tokens: */
-//		#define NO_INTERNAL_SERIAL
-//		#define FIXED_CONTROL_ENDPOINT_SIZE      {Insert Value Here}
-//		#define FIXED_NUM_CONFIGURATIONS         {Insert Value Here}
-//		#define CONTROL_ONLY_DEVICE
-//		#define INTERRUPT_CONTROL_ENDPOINT
-//		#define NO_DEVICE_REMOTE_WAKEUP
-//		#define NO_DEVICE_SELF_POWER
-
-		/* USB Host Mode Driver Related Tokens: */
-//		#define USB_HOST_TIMEOUT_MS              {Insert Value Here}
-//		#define HOST_DEVICE_SETTLE_DELAY_MS	     {Insert Value Here}
-//		#define NO_AUTO_VBUS_MANAGEMENT
-//		#define INVERTED_VBUS_ENABLE_LINE
-
-	#else
-
-		#error Unsupported architecture for this LUFA configuration file.
-
-	#endif
-#endif
-
diff --git a/NativePrograms/LUFA/CodeTemplates/WindowsINF/LUFA CDC-ACM.inf b/NativePrograms/LUFA/CodeTemplates/WindowsINF/LUFA CDC-ACM.inf
deleted file mode 100644
index f9e2c6f0e6..0000000000
--- a/NativePrograms/LUFA/CodeTemplates/WindowsINF/LUFA CDC-ACM.inf	
+++ /dev/null
@@ -1,64 +0,0 @@
-;     Windows LUFA CDC ACM Setup File
-; Copyright (c) 2000 Microsoft Corporation
-
-[DefaultInstall]
-CopyINF="LUFA CDC-ACM.inf"
-
-[Version]
-Signature="$Windows NT$"
-Class=Ports
-ClassGuid={4D36E978-E325-11CE-BFC1-08002BE10318}
-Provider=%MFGNAME%
-DriverVer=7/1/2012,10.0.0.0
-
-[Manufacturer]
-%MFGNAME%=DeviceList, NTx86, NTamd64, NTia64
-
-[SourceDisksNames]
-
-[SourceDisksFiles]
-
-[DestinationDirs]
-DefaultDestDir=12
-
-[DriverInstall]
-Include=mdmcpq.inf
-CopyFiles=FakeModemCopyFileSection
-AddReg=DriverInstall.AddReg
-
-[DriverInstall.Services]
-Include=mdmcpq.inf
-AddService=usbser, 0x00000002, LowerFilter_Service_Inst
-
-[DriverInstall.AddReg]
-HKR,,EnumPropPages32,,"msports.dll,SerialPortPropPageProvider"
-
-;------------------------------------------------------------------------------
-;  Vendor and Product ID Definitions
-;------------------------------------------------------------------------------
-; When developing your USB device, the VID and PID used in the PC side
-; application program and the firmware on the microcontroller must match.
-; Modify the below line to use your VID and PID.  Use the format as shown below.
-; Note: One INF file can be used for multiple devices with different VID and PIDs.
-; For each supported device, append ",USB\VID_xxxx&PID_yyyy" to the end of the line.
-;------------------------------------------------------------------------------
-[DeviceList]
-%DESCRIPTION%=DriverInstall, USB\VID_03EB&PID_2044
-
-[DeviceList.NTx86]
-%DESCRIPTION%=DriverInstall, USB\VID_03EB&PID_2044
-
-[DeviceList.NTamd64]
-%DESCRIPTION%=DriverInstall, USB\VID_03EB&PID_2044
-
-[DeviceList.NTia64]
-%DESCRIPTION%=DriverInstall, USB\VID_03EB&PID_2044
-
-;------------------------------------------------------------------------------
-;  String Definitions
-;------------------------------------------------------------------------------
-;Modify these strings to customize your device
-;------------------------------------------------------------------------------
-[Strings]
-MFGNAME="http://www.lufa-lib.org"
-DESCRIPTION="LUFA CDC-ACM Virtual Serial Port"
diff --git a/NativePrograms/LUFA/CodeTemplates/WindowsINF/LUFA RNDIS.inf b/NativePrograms/LUFA/CodeTemplates/WindowsINF/LUFA RNDIS.inf
deleted file mode 100644
index 4ad76acea7..0000000000
--- a/NativePrograms/LUFA/CodeTemplates/WindowsINF/LUFA RNDIS.inf	
+++ /dev/null
@@ -1,59 +0,0 @@
-;     Windows LUFA RNDIS Setup File
-; Copyright (c) 2000 Microsoft Corporation
-
-[DefaultInstall]
-CopyINF="LUFA RNDIS.inf"
-
-[Version]
-Signature="$Windows NT$"
-Class=Net
-ClassGuid={4d36e972-e325-11ce-bfc1-08002be10318}
-Provider=%MFGNAME%
-DriverVer=7/1/2012,10.0.0.0
-
-[Manufacturer]
-%MFGNAME%=DeviceList, NTx86, NTamd64, NTia64
-
-[ControlFlags]
-ExcludeFromSelect=*
-
-[DriverInstall]
-Characteristics=0x84 ; NCF_PHYSICAL + NCF_HAS_UI
-BusType=15
-include=netrndis.inf
-needs=Usb_Rndis.ndi
-AddReg=Rndis_AddReg_Vista
-
-[DriverInstall.Services]
-include=netrndis.inf
-needs=Usb_Rndis.ndi.Services
-
-;------------------------------------------------------------------------------
-;  Vendor and Product ID Definitions
-;------------------------------------------------------------------------------
-; When developing your USB device, the VID and PID used in the PC side
-; application program and the firmware on the microcontroller must match.
-; Modify the below line to use your VID and PID.  Use the format as shown below.
-; Note: One INF file can be used for multiple devices with different VID and PIDs.
-; For each supported device, append ",USB\VID_xxxx&PID_yyyy" to the end of the line.
-;------------------------------------------------------------------------------
-[DeviceList]
-%DESCRIPTION%=DriverInstall, USB\VID_03EB&PID_204C
-
-[DeviceList.NTx86]
-%DESCRIPTION%=DriverInstall, USB\VID_03EB&PID_204C
-
-[DeviceList.NTamd64]
-%DESCRIPTION%=DriverInstall, USB\VID_03EB&PID_204C
-
-[DeviceList.NTia64]
-%DESCRIPTION%=DriverInstall, USB\VID_03EB&PID_204C
-
-;------------------------------------------------------------------------------
-;  String Definitions
-;------------------------------------------------------------------------------
-;Modify these strings to customize your device
-;------------------------------------------------------------------------------
-[Strings]
-MFGNAME="http://www.lufa-lib.org"
-DESCRIPTION="LUFA RNDIS USB Ethernet Adapter"
diff --git a/NativePrograms/LUFA/CodeTemplates/makefile_template b/NativePrograms/LUFA/CodeTemplates/makefile_template
deleted file mode 100644
index b57624c725..0000000000
--- a/NativePrograms/LUFA/CodeTemplates/makefile_template
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-#             LUFA Library
-#     Copyright (C) Dean Camera, 2020.
-#
-#  dean [at] fourwalledcubicle [dot] com
-#           www.lufa-lib.org
-#
-# --------------------------------------
-#         LUFA Project Makefile.
-# --------------------------------------
-
-# Run "make help" for target help.
-
-MCU          = at90usb1287
-ARCH         = AVR8
-BOARD        = USBKEY
-F_CPU        = 8000000
-F_USB        = $(F_CPU)
-OPTIMIZATION = s
-TARGET       = Target
-SRC          = $(TARGET).c $(LUFA_SRC_USB) $(LUFA_SRC_USBCLASS) $(LUFA_SRC_PLATFORM)
-LUFA_PATH    = ../../LUFA
-CC_FLAGS     = -DUSE_LUFA_CONFIG_HEADER -IConfig
-LD_FLAGS     =
-
-# Default target
-all:
-
-# Include LUFA-specific DMBS extension modules
-DMBS_LUFA_PATH ?= $(LUFA_PATH)/Build/LUFA
-include $(DMBS_LUFA_PATH)/lufa-sources.mk
-include $(DMBS_LUFA_PATH)/lufa-gcc.mk
-
-# Include common DMBS build system modules
-DMBS_PATH      ?= $(LUFA_PATH)/Build/DMBS/DMBS
-include $(DMBS_PATH)/core.mk
-include $(DMBS_PATH)/cppcheck.mk
-include $(DMBS_PATH)/doxygen.mk
-include $(DMBS_PATH)/dfu.mk
-include $(DMBS_PATH)/gcc.mk
-include $(DMBS_PATH)/hid.mk
-include $(DMBS_PATH)/avrdude.mk
-include $(DMBS_PATH)/atprogram.mk
diff --git a/NativePrograms/LUFA/Common/ArchitectureSpecific.h b/NativePrograms/LUFA/Common/ArchitectureSpecific.h
deleted file mode 100644
index 8f50818158..0000000000
--- a/NativePrograms/LUFA/Common/ArchitectureSpecific.h
+++ /dev/null
@@ -1,185 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Architecture specific definitions relating to specific processor architectures.
- *
- *  \copydetails Group_ArchitectureSpecific
- *
- *  \note Do not include this file directly, rather include the Common.h header file instead to gain this file's
- *        functionality.
- */
-
-/** \ingroup Group_Common
- *  \defgroup Group_ArchitectureSpecific Architecture Specific Definitions
- *  \brief Architecture specific definitions relating to specific processor architectures.
- *
- *  Architecture specific macros, functions and other definitions, which relate to specific architectures. This
- *  definitions may or may not be available in some form on other architectures, and thus should be protected by
- *  preprocessor checks in portable code to prevent compile errors.
- *
- *  @{
- */
-
-#ifndef __LUFA_ARCHSPEC_H__
-#define __LUFA_ARCHSPEC_H__
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_COMMON_H)
-			#error Do not include this file directly. Include LUFA/Common/Common.h instead to gain this functionality.
-		#endif
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			#if (ARCH == ARCH_AVR8) || (ARCH == ARCH_XMEGA) || defined(__DOXYGEN__)
-				#if (ARCH == ARCH_AVR8) || defined(__DOXYGEN__)
-					/** Re-enables the AVR's JTAG bus in software, until a system reset. This will re-enable JTAG debugging
-					 *  interface after is has been disabled in software via \ref JTAG_DISABLE().
-					 *
-					 *  \note This macro is not available for all architectures.
-					 */
-					#define JTAG_ENABLE()               do {                                     \
-					                                        __asm__ __volatile__ (               \
-					                                        "in __tmp_reg__,__SREG__" "\n\t"     \
-					                                        "cli" "\n\t"                         \
-					                                        "out %1, %0" "\n\t"                  \
-					                                        "out __SREG__, __tmp_reg__" "\n\t"   \
-					                                        "out %1, %0" "\n\t"                  \
-					                                        :                                    \
-					                                        : "r" (MCUCR & ~(1 << JTD)),         \
-					                                          "M" (_SFR_IO_ADDR(MCUCR))          \
-					                                        : "r0");                             \
-					                                    } while (0)
-
-					/** Disables the AVR's JTAG bus in software, until a system reset. This will override the current JTAG
-					 *  status as set by the JTAGEN fuse, disabling JTAG debugging and reverting the JTAG pins back to GPIO
-					 *  mode.
-					 *
-					 *  \note This macro is not available for all architectures.
-					 */
-					#define JTAG_DISABLE()              do {                                     \
-					                                        __asm__ __volatile__ (               \
-					                                        "in __tmp_reg__,__SREG__" "\n\t"     \
-					                                        "cli" "\n\t"                         \
-					                                        "out %1, %0" "\n\t"                  \
-					                                        "out __SREG__, __tmp_reg__" "\n\t"   \
-					                                        "out %1, %0" "\n\t"                  \
-					                                        :                                    \
-					                                        : "r" (MCUCR | (1 << JTD)),          \
-					                                          "M" (_SFR_IO_ADDR(MCUCR))          \
-					                                        : "r0");                             \
-					                                    } while (0)
-				#endif
-
-				/** Defines a volatile \c NOP statement which cannot be optimized out by the compiler, and thus can always
-				 *  be set as a breakpoint in the resulting code. Useful for debugging purposes, where the optimizer
-				 *  removes/reorders code to the point where break points cannot reliably be set.
-				 *
-				 *  \note This macro is not available for all architectures.
-				 */
-				#define JTAG_DEBUG_POINT()              __asm__ __volatile__ ("nop" ::)
-
-				/** Defines an explicit JTAG break point in the resulting binary via the assembly \c BREAK statement. When
-				 *  a JTAG is used, this causes the program execution to halt when reached until manually resumed.
-				 *
-				 *  \note This macro is not available for all architectures.
-				 */
-				#define JTAG_DEBUG_BREAK()              __asm__ __volatile__ ("break" ::)
-
-				/** Macro for testing condition "x" and breaking via \ref JTAG_DEBUG_BREAK() if the condition is false.
-				 *
-				 *  \note This macro is not available for all architectures.
-				 *
-				 *  \param[in] Condition  Condition that will be evaluated.
-				*/
-				#define JTAG_ASSERT(Condition)          do {                       \
-				                                            if (!(Condition))      \
-				                                              JTAG_DEBUG_BREAK();  \
-				                                        } while (0)
-
-				/** Macro for testing condition \c "x" and writing debug data to the stdout stream if \c false. The stdout stream
-				 *  must be pre-initialized before this macro is run and linked to an output device, such as the microcontroller's
-				 *  USART peripheral.
-				 *
-				 *  The output takes the form "{FILENAME}: Function {FUNCTION NAME}, Line {LINE NUMBER}: Assertion {Condition} failed."
-				 *
-				 *  \note This macro is not available for all architectures.
-				 *
-				 *  \param[in] Condition  Condition that will be evaluated,
-				 */
-				#define STDOUT_ASSERT(Condition)        do {                                                           \
-				                                            if (!(Condition))                                          \
-				                                              printf_P(PSTR("%s: Function \"%s\", Line %d: "           \
-				                                                            "Assertion \"%s\" failed.\r\n"),           \
-				                                                            __FILE__, __func__, __LINE__, #Condition); \
-				                                        } while (0)
-
-				#if !defined(pgm_read_ptr) || defined(__DOXYGEN__)
-					/** Reads a pointer out of PROGMEM space on the AVR8 architecture. This is a wrapper for the avr-libc
-					 *  \c pgm_read_word() macro with a \c void* cast, so that its value can be assigned directly to a
-					 *  pointer variable or used in pointer arithmetic without further casting in C.
-					 *
-					 *  \note This macro is not available for all architectures.
-					 *
-					 *  \param[in] Address  Address of the pointer to read.
-					 *
-					 *  \return Pointer retrieved from PROGMEM space.
-					 */
-					#define pgm_read_ptr(Address)       (void*)pgm_read_word(Address)
-				#endif
-			#elif (ARCH == ARCH_UC3)
-				#define JTAG_DEBUG_POINT()              __asm__ __volatile__ ("nop" ::)
-				#define JTAG_DEBUG_BREAK()              __asm__ __volatile__ ("breakpoint" ::)
-				#define JTAG_ASSERT(Condition)          do {                                                    \
-				                                            if (!(Condition))                                   \
-				                                              JTAG_DEBUG_BREAK();                               \
-				                                        } while (0)
-				#define STDOUT_ASSERT(Condition)        do {                                                    \
-				                                            if (!(Condition))                                   \
-				                                              printf("%s: Function \"%s\", Line %d: "           \
-				                                                     "Assertion \"%s\" failed.\r\n",            \
-				                                                     __FILE__, __func__, __LINE__, #Condition); \
-				                                        } while (0)
-			#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Common/Architectures.h b/NativePrograms/LUFA/Common/Architectures.h
deleted file mode 100644
index e988996c2c..0000000000
--- a/NativePrograms/LUFA/Common/Architectures.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Supported library architecture defines.
- *
- *  \copydetails Group_Architectures
- *
- *  \note Do not include this file directly, rather include the Common.h header file instead to gain this file's
- *        functionality.
- */
-
-/** \ingroup Group_Common
- *  \defgroup Group_Architectures Hardware Architectures
- *  \brief Supported library architecture defines.
- *
- *  Architecture macros for selecting the desired target microcontroller architecture. One of these values should be
- *  defined as the value of \c ARCH in the user project makefile via the \c -D compiler switch to GCC, to select the
- *  target architecture.
- *
- *  The selected architecture should remain consistent with the makefile \c ARCH value, which is used to select the
- *  underlying driver source files for each architecture.
- *
- *  @{
- */
-
-#ifndef __LUFA_ARCHITECTURES_H__
-#define __LUFA_ARCHITECTURES_H__
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_COMMON_H)
-			#error Do not include this file directly. Include LUFA/Common/Common.h instead to gain this functionality.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Selects the Atmel 8-bit AVR (AT90USB* and ATMEGA*U* chips) architecture. */
-			#define ARCH_AVR8           0
-
-			/** Selects the Atmel 32-bit UC3 AVR (AT32UC3* chips) architecture. */
-			#define ARCH_UC3            1
-
-			/** Selects the Atmel XMEGA AVR (ATXMEGA* chips) architecture. */
-			#define ARCH_XMEGA          2
-
-			#if !defined(__DOXYGEN__)
-				#define ARCH_           ARCH_AVR8
-
-				#if !defined(ARCH)
-					#define ARCH        ARCH_AVR8
-				#endif
-			#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Common/Attributes.h b/NativePrograms/LUFA/Common/Attributes.h
deleted file mode 100644
index 2e26d6bf3b..0000000000
--- a/NativePrograms/LUFA/Common/Attributes.h
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Special function/variable attribute macros.
- *
- *  \copydetails Group_FuncVarAttributes
- *
- *  \note Do not include this file directly, rather include the Common.h header file instead to gain this file's
- *        functionality.
- */
-
-/** \ingroup Group_Common
- *  \defgroup Group_FuncVarAttributes Function/Variable Attributes
- *  \brief Special function/variable attribute macros.
- *
- *  This module contains macros for applying specific attributes to functions and variables to control various
- *  optimizer and code generation features of the compiler. Attributes may be placed in the function prototype
- *  or variable declaration in any order, and multiple attributes can be specified for a single item via a space
- *  separated list.
- *
- *  On incompatible versions of GCC or on other compilers, these macros evaluate to nothing unless they are
- *  critical to the code's function and thus must throw a compile error when used.
- *
- *  @{
- */
-
-#ifndef __LUFA_ATTR_H__
-#define __LUFA_ATTR_H__
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_COMMON_H)
-			#error Do not include this file directly. Include LUFA/Common/Common.h instead to gain this functionality.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			#if (__GNUC__ >= 3) || defined(__DOXYGEN__)
-				/** Indicates to the compiler that the function can not ever return, so that any stack restoring or
-				 *  return code may be omitted by the compiler in the resulting binary.
-				 */
-				#define ATTR_NO_RETURN               __attribute__ ((noreturn))
-
-				/** Indicates that the function returns a value which should not be ignored by the user code. When
-				 *  applied, any ignored return value from calling the function will produce a compiler warning.
-				 */
-				#define ATTR_WARN_UNUSED_RESULT      __attribute__ ((warn_unused_result))
-
-				/** Indicates that the specified parameters of the function are pointers which should never be \c NULL.
-				 *  When applied as a 1-based comma separated list the compiler will emit a warning if the specified
-				 *  parameters are known at compiler time to be \c NULL at the point of calling the function.
-				 */
-				#define ATTR_NON_NULL_PTR_ARG(...)   __attribute__ ((nonnull (__VA_ARGS__)))
-
-				/** Removes any preamble or postamble from the function. When used, the function will not have any
-				 *  register or stack saving code. This should be used with caution, and when used the programmer
-				 *  is responsible for maintaining stack and register integrity.
-				 */
-				#define ATTR_NAKED                   __attribute__ ((naked))
-
-				/** Prevents the compiler from considering a specified function for in-lining. When applied, the given
-				 *  function will not be in-lined under any circumstances.
-				 */
-				#define ATTR_NO_INLINE               __attribute__ ((noinline))
-
-				/** Forces the compiler to inline the specified function. When applied, the given function will be
-				 *  in-lined under all circumstances.
-				 */
-				#define ATTR_ALWAYS_INLINE           __attribute__ ((always_inline))
-
-				/** Indicates that the specified function is pure, in that it has no side-effects other than global
-				 *  or parameter variable access.
-				 */
-				#define ATTR_PURE                    __attribute__ ((pure))
-
-				/** Indicates that the specified function is constant, in that it has no side effects other than
-				 *  parameter access.
-				 */
-				#define ATTR_CONST                   __attribute__ ((const))
-
-				/** Marks a given function as deprecated, which produces a warning if the function is called. */
-				#define ATTR_DEPRECATED              __attribute__ ((deprecated))
-
-				/** Marks a function as a weak reference, which can be overridden by other functions with an
-				 *  identical name (in which case the weak reference is discarded at link time).
-				 */
-				#define ATTR_WEAK                    __attribute__ ((weak))
-			#endif
-
-			/** Forces the compiler to not automatically zero the given global variable on startup, so that the
-			 *  current RAM contents is retained. Under most conditions this value will be random due to the
-			 *  behavior of volatile memory once power is removed, but may be used in some specific circumstances,
-			 *  like the passing of values back after a system watchdog reset.
-			 */
-			#define ATTR_NO_INIT                     __attribute__ ((section (".noinit")))
-
-			/** Places the function in one of the initialization sections, which execute before the main function
-			 *  of the application. Refer to the avr-libc manual for more information on the initialization sections.
-			 *
-			 *  \param[in] SectionIndex  Initialization section number where the function should be placed.
-			 */
-			#define ATTR_INIT_SECTION(SectionIndex)  __attribute__ ((used, naked, section (".init" #SectionIndex )))
-
-			/** Marks a function as an alias for another function.
-			 *
-			 *  \param[in] Func  Name of the function which the given function name should alias.
-			 */
-			#define ATTR_ALIAS(Func)                 __attribute__ ((alias( #Func )))
-
-			/** Marks a variable or struct element for packing into the smallest space available, omitting any
-			 *  alignment bytes usually added between fields to optimize field accesses.
-			 */
-			#define ATTR_PACKED                      __attribute__ ((packed))
-
-			/** Indicates the minimum alignment in bytes for a variable or struct element.
-			 *
-			 *  \param[in] Bytes  Minimum number of bytes the item should be aligned to.
-			 */
-			#define ATTR_ALIGNED(Bytes)              __attribute__ ((aligned(Bytes)))
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Common/BoardTypes.h b/NativePrograms/LUFA/Common/BoardTypes.h
deleted file mode 100644
index 989bfe13b7..0000000000
--- a/NativePrograms/LUFA/Common/BoardTypes.h
+++ /dev/null
@@ -1,260 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Supported pre-made board hardware defines.
- *
- *  \copydetails Group_BoardTypes
- *
- *  \note Do not include this file directly, rather include the Common.h header file instead to gain this file's
- *        functionality.
- */
-
-/** \ingroup Group_Common
- *  \defgroup Group_BoardTypes Board Types
- *  \brief Supported pre-made board hardware defines.
- *
- *  Board macros for indicating the chosen physical board hardware to the library. These macros should be used when
- *  defining the \c BOARD token to the chosen hardware via the \c -D switch in the project makefile. If a custom
- *  board is used, the \ref BOARD_NONE or \ref BOARD_USER values should be selected.
- *
- *  @{
- */
-
-#ifndef __LUFA_BOARDTYPES_H__
-#define __LUFA_BOARDTYPES_H__
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_COMMON_H)
-			#error Do not include this file directly. Include LUFA/Common/Common.h instead to gain this functionality.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Selects the user-defined board drivers, which should be placed in the user project's folder
-			 *  under a directory named \c /Board/. Each board driver should be named identically to the LUFA
-			 *  master board driver (i.e., driver in the \c LUFA/Drivers/Board directory) so that the library
-			 *  can correctly identify it.
-			 */
-			#define BOARD_USER                 0
-
-			/** Disables board drivers when operation will not be adversely affected (e.g. LEDs) - use of board drivers
-			 *  such as the Joystick driver, where the removal would adversely affect the code's operation is still disallowed. */
-			#define BOARD_NONE                 1
-
-			/** Selects the USBKEY specific board drivers, including Temperature, Button, Dataflash, Joystick and LED drivers. */
-			#define BOARD_USBKEY               2
-
-			/** Selects the STK525 specific board drivers, including Temperature, Button, Dataflash, Joystick and LED drivers. */
-			#define BOARD_STK525               3
-
-			/** Selects the STK526 specific board drivers, including Temperature, Button, Dataflash, Joystick and LED drivers. */
-			#define BOARD_STK526               4
-
-			/** Selects the RZUSBSTICK specific board drivers, including the driver for the boards LEDs. */
-			#define BOARD_RZUSBSTICK           5
-
-			/** Selects the ATAVRUSBRF01 specific board drivers, including the driver for the board LEDs. */
-			#define BOARD_ATAVRUSBRF01         6
-
-			/** Selects the BUMBLEB specific board drivers, using the officially recommended peripheral layout. */
-			#define BOARD_BUMBLEB              7
-
-			/** Selects the XPLAIN (Revision 2 or newer) specific board drivers, including LED and Dataflash drivers. */
-			#define BOARD_XPLAIN               8
-
-			/** Selects the XPLAIN (Revision 1) specific board drivers, including LED and Dataflash drivers. */
-			#define BOARD_XPLAIN_REV1          9
-
-			/** Selects the EVK527 specific board drivers, including Temperature, Button, Dataflash, Joystick and LED drivers. */
-			#define BOARD_EVK527               10
-
-			/** Selects the Teensy version 1.x specific board drivers, including the driver for the board LEDs. */
-			#define BOARD_TEENSY               11
-
-			/** Selects the USBTINY MKII specific board drivers, including the Button and LEDs drivers. */
-			#define BOARD_USBTINYMKII          12
-
-			/** Selects the Benito specific board drivers, including the Button and LEDs drivers. */
-			#define BOARD_BENITO               13
-
-			/** Selects the JM-DB-U2 specific board drivers, including the Button and LEDs drivers. */
-			#define BOARD_JMDBU2               14
-
-			/** Selects the Olimex AVR-USB-162 specific board drivers, including the Button and LEDs drivers. */
-			#define BOARD_OLIMEX162            15
-
-			/** Selects the UDIP specific board drivers, including the Button and LEDs drivers. */
-			#define BOARD_UDIP                 16
-
-			/** Selects the BUI specific board drivers, including the driver for the board LEDs. */
-			#define BOARD_BUI                  17
-
-			/** Selects the Arduino Uno specific board drivers, including the driver for the board LEDs. */
-			#define BOARD_UNO                  18
-
-			/** Selects the Busware CUL V3 specific board drivers, including the Button and LEDs drivers. */
-			#define BOARD_CULV3                19
-
-			/** Selects the Blackcat USB JTAG specific board drivers, including the driver for the board LEDs. */
-			#define BOARD_BLACKCAT             20
-
-			/** Selects the Maximus specific board drivers, including the driver for the board LEDs. */
-			#define BOARD_MAXIMUS              21
-
-			/** Selects the Minimus specific board drivers, including the Button and LEDs drivers. */
-			#define BOARD_MINIMUS              22
-
-			/** Selects the Adafruit U4 specific board drivers, including the Button driver. */
-			#define BOARD_ADAFRUITU4           23
-
-			/** Selects the Microsin AVR-USB162 specific board drivers, including the Button and LEDs drivers. */
-			#define BOARD_MICROSIN162          24
-
-			/** Selects the Kernel Concepts USBFOO specific board drivers, including the Button and LEDs drivers. */
-			#define BOARD_USBFOO               25
-
-			/** Selects the Sparkfun ATMEGA8U2 specific board drivers, including the driver for the board LEDs. */
-			#define BOARD_SPARKFUN8U2          26
-
-			/** Selects the Atmel EVK1101 specific board drivers, including the Button, Joystick and LED drivers. */
-			#define BOARD_EVK1101              27
-
-			/** Selects the Busware TUL specific board drivers, including the Button and LED drivers. */
-			#define BOARD_TUL                  28
-
-			/** Selects the Atmel EVK1100 specific board drivers, including the Button, Joystick and LED drivers. */
-			#define BOARD_EVK1100              29
-
-			/** Selects the Atmel EVK1104 specific board drivers, including the Button and LED drivers. */
-			#define BOARD_EVK1104              30
-
-			/** Selects the Atmel XMEGA A3BU Xplained specific board drivers, including Dataflash, Button and LED drivers. */
-			#define BOARD_A3BU_XPLAINED        31
-
-			/** Selects the Teensy version 2.x specific board drivers, including the driver for the board LEDs. */
-			#define BOARD_TEENSY2              32
-
-			/** Selects the USB2AX version 1 and 2 specific board drivers, including the Button and LEDs drivers. */
-			#define BOARD_USB2AX               33
-
-			/** Selects the USB2AX version 3 specific board drivers, including the Button and LEDs drivers. */
-			#define BOARD_USB2AX_V3            34
-
-			/** Selects the Micropendous 32U2 specific board drivers, including the Button and LED drivers. */
-			#define BOARD_MICROPENDOUS_32U2    35
-
-			/** Selects the Micropendous A specific board drivers, including the driver for the board Button. */
-			#define BOARD_MICROPENDOUS_A       36
-
-			/** Selects the Micropendous 1 specific board drivers, including the driver for the board Button. */
-			#define BOARD_MICROPENDOUS_1       37
-
-			/** Selects the Micropendous 2 specific board drivers, including the driver for the board Button. */
-			#define BOARD_MICROPENDOUS_2       38
-
-			/** Selects the Micropendous 3 specific board drivers, including the driver for the board Button. */
-			#define BOARD_MICROPENDOUS_3       39
-
-			/** Selects the Micropendous 4 specific board drivers, including the driver for the board Button. */
-			#define BOARD_MICROPENDOUS_4       40
-
-			/** Selects the Micropendous DIP specific board drivers, including the driver for the board Button. */
-			#define BOARD_MICROPENDOUS_DIP     41
-
-			/** Selects the Micropendous (Arduino-like) revision 1 specific board drivers, including the Button and LED drivers. */
-			#define BOARD_MICROPENDOUS_REV1    42
-
-			/** Selects the Micropendous (Arduino-like) revision 2 specific board drivers, including the Button and LED drivers. */
-			#define BOARD_MICROPENDOUS_REV2    43
-
-			/** Selects the XMEGA B1 Xplained specific board drivers, including the Button and LED drivers. */
-			#define BOARD_B1_XPLAINED          44
-
-			/** Selects the Bitwizard Multio specific board drivers, including the driver for the board LEDs. */
-			#define BOARD_MULTIO               45
-
-			/** Selects the Bitwizard Big-Multio specific board drivers, including the driver for the board LEDs. */
-			#define BOARD_BIGMULTIO            46
-
-			/** Selects the DorkbotPDX Duce specific board drivers, including the driver for the board LEDs. */
-			#define BOARD_DUCE                 47
-
-			/** Selects the Olimex AVR-USB-32U4 specific board drivers, including the Button and LED drivers. */
-			#define BOARD_OLIMEX32U4           48
-
-			/** Selects the Olimex AVR-USB-T32U4 specific board drivers, including the Button and LED drivers. */
-			#define BOARD_OLIMEXT32U4          49
-
-			/** Selects the Olimex AVR-ISP-MK2 specific board drivers, including the Button and LED drivers. */
-			#define BOARD_OLIMEXISPMK2         50
-
-			/** Selects the Arduino Leonardo specific board drivers, including the driver for the board LEDs. */
-			#define BOARD_LEONARDO             51
-
-			/** Selects the UC3-A3 Xplained specific board drivers, including the Button and LED drivers. */
-			#define BOARD_UC3A3_XPLAINED       52
-
-			/** Selects the USB2AX version 3.1 specific board drivers, including the Button and LEDs drivers. */
-			#define BOARD_USB2AX_V31           53
-
-			/** Selects the Stange-ISP specific board drivers, including the Button and LEDs drivers. */
-			#define BOARD_STANGE_ISP           54
-
-			/** Selects the XMEGA C3 XPLAINED specific board drivers, including the Button and LEDs drivers. */
-			#define BOARD_C3_XPLAINED          55
-
-			/** Selects the U2S specific board drivers, including the Button and LEDs drivers. */
-			#define BOARD_U2S                  56
-
-			/** Selects the Arduino YUN specific board drivers, including the driver for the board LEDs. */
-			#define BOARD_YUN                  57
-
-			/** Selects the Arduino Micro specific board drivers, including the driver for the board LEDs. */
-			#define BOARD_MICRO                58
-
-			/** Selects the Pololu A-Star Micro specific board drivers, including the driver for the board LEDs. */
-			#define BOARD_POLOLUMICRO          59
-
-			/** Selects the Atmel Xplained-MINI specific board drivers, including the driver for the board LEDs. */
-			#define BOARD_XPLAINED_MINI        60
-
-			#if !defined(__DOXYGEN__)
-				#define BOARD_                 BOARD_NONE
-
-				#if !defined(BOARD)
-					#define BOARD              BOARD_NONE
-				#endif
-			#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Common/Common.h b/NativePrograms/LUFA/Common/Common.h
deleted file mode 100644
index 3922952b86..0000000000
--- a/NativePrograms/LUFA/Common/Common.h
+++ /dev/null
@@ -1,394 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \dir
- *  \brief Common library header files.
- *
- *  This folder contains header files which are common to all parts of the LUFA library. They may be used freely in
- *  user applications.
- */
-
-/** \file
- *  \brief Common library convenience headers, macros and functions.
- *
- *  \copydetails Group_Common
- */
-
-/** \defgroup Group_Common Common Utility Headers - LUFA/Drivers/Common/Common.h
- *  \brief Common library convenience headers, macros and functions.
- *
- *  Common utility headers containing macros, functions, enums and types which are common to all
- *  aspects of the library.
- *
- *  @{
- */
-
-/** \defgroup Group_GlobalInt Global Interrupt Macros
- *  \brief Convenience macros for the management of interrupts globally within the device.
- *
- *  Macros and functions to create and control global interrupts within the device.
- */
-
-#ifndef __LUFA_COMMON_H__
-#define __LUFA_COMMON_H__
-
-	/* Macros: */
-		#define __INCLUDE_FROM_COMMON_H
-
-	/* Includes: */
-		#include <stdint.h>
-		#include <stdbool.h>
-		#include <string.h>
-		#include <stddef.h>
-
-		#include "Architectures.h"
-		#include "BoardTypes.h"
-		#include "ArchitectureSpecific.h"
-		#include "CompilerSpecific.h"
-		#include "Attributes.h"
-
-		#if defined(USE_LUFA_CONFIG_HEADER)
-			#include "LUFAConfig.h"
-		#endif
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Architecture specific utility includes: */
-		#if defined(__DOXYGEN__)
-			/** Type define for an unsigned integer the same width as the selected architecture's machine register.
-			 *  This is distinct from the non-specific standard int data type, whose width is machine dependant but
-			 *  which may not reflect the actual machine register width on some targets (e.g. AVR8).
-			 */
-			typedef MACHINE_REG_t uint_reg_t;
-		#elif (ARCH == ARCH_AVR8)
-			#include <avr/io.h>
-			#include <avr/interrupt.h>
-			#include <avr/pgmspace.h>
-			#include <avr/eeprom.h>
-			#include <avr/boot.h>
-			#include <math.h>
-			#include <util/delay.h>
-
-			typedef uint8_t uint_reg_t;
-
-			#define ARCH_HAS_EEPROM_ADDRESS_SPACE
-			#define ARCH_HAS_FLASH_ADDRESS_SPACE
-			#define ARCH_HAS_MULTI_ADDRESS_SPACE
-			#define ARCH_LITTLE_ENDIAN
-
-			#include "Endianness.h"
-		#elif (ARCH == ARCH_UC3)
-			#include <avr32/io.h>
-			#include <math.h>
-
-			// === TODO: Find abstracted way to handle these ===
-			#define PROGMEM
-			#define pgm_read_byte(x)         *x
-			#define memcmp_P(...)            memcmp(__VA_ARGS__)
-			#define memcpy_P(...)            memcpy(__VA_ARGS__)
-			#define strlen_P(...)            strlen(__VA_ARGS__)
-			// =================================================
-
-			typedef uint32_t uint_reg_t;
-
-			#define ARCH_BIG_ENDIAN
-
-			#include "Endianness.h"
-		#elif (ARCH == ARCH_XMEGA)
-			#include <avr/io.h>
-			#include <avr/interrupt.h>
-			#include <avr/pgmspace.h>
-			#include <avr/eeprom.h>
-			#include <math.h>
-			#include <util/delay.h>
-
-			typedef uint8_t uint_reg_t;
-
-			#define ARCH_HAS_EEPROM_ADDRESS_SPACE
-			#define ARCH_HAS_FLASH_ADDRESS_SPACE
-			#define ARCH_HAS_MULTI_ADDRESS_SPACE
-			#define ARCH_LITTLE_ENDIAN
-
-			#include "Endianness.h"
-		#else
-			#error Unknown device architecture specified.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			#if !defined(__DOXYGEN__)
-				// Obsolete, retained for compatibility with user code
-				#define MACROS                  do
-				#define MACROE                  while (0)
-			#endif
-
-			/** Convenience macro to determine the larger of two values.
-			 *
-			 *  \attention This macro should only be used with operands that do not have side effects from being evaluated
-			 *             multiple times.
-			 *
-			 *  \param[in] x  First value to compare
-			 *  \param[in] y  First value to compare
-			 *
-			 *  \return The larger of the two input parameters
-			 */
-			#if !defined(MAX) || defined(__DOXYGEN__)
-				#define MAX(x, y)               (((x) > (y)) ? (x) : (y))
-			#endif
-
-			/** Convenience macro to determine the smaller of two values.
-			 *
-			 *  \attention This macro should only be used with operands that do not have side effects from being evaluated
-			 *             multiple times.
-			 *
-			 *  \param[in] x  First value to compare.
-			 *  \param[in] y  First value to compare.
-			 *
-			 *  \return The smaller of the two input parameters
-			 */
-			#if !defined(MIN) || defined(__DOXYGEN__)
-				#define MIN(x, y)               (((x) < (y)) ? (x) : (y))
-			#endif
-
-			#if !defined(STRINGIFY) || defined(__DOXYGEN__)
-				/** Converts the given input into a string, via the C Preprocessor. This macro puts literal quotation
-				 *  marks around the input, converting the source into a string literal.
-				 *
-				 *  \param[in] x  Input to convert into a string literal.
-				 *
-				 *  \return String version of the input.
-				 */
-				#define STRINGIFY(x)            #x
-
-				/** Converts the given input into a string after macro expansion, via the C Preprocessor. This macro puts
-				 *  literal quotation marks around the expanded input, converting the source into a string literal.
-				 *
-				 *  \param[in] x  Input to expand and convert into a string literal.
-				 *
-				 *  \return String version of the expanded input.
-				 */
-				#define STRINGIFY_EXPANDED(x)   STRINGIFY(x)
-			#endif
-
-			#if !defined(CONCAT) || defined(__DOXYGEN__)
-				/** Concatenates the given input into a single token, via the C Preprocessor.
-				 *
-				 *  \param[in] x  First item to concatenate.
-				 *  \param[in] y  Second item to concatenate.
-				 *
-				 *  \return Concatenated version of the input.
-				 */
-				#define CONCAT(x, y)            x ## y
-
-				/** CConcatenates the given input into a single token after macro expansion, via the C Preprocessor.
-				 *
-				 *  \param[in] x  First item to concatenate.
-				 *  \param[in] y  Second item to concatenate.
-				 *
-				 *  \return Concatenated version of the expanded input.
-				 */
-				#define CONCAT_EXPANDED(x, y)   CONCAT(x, y)
-			#endif
-
-			#if !defined(ISR) || defined(__DOXYGEN__)
-				/** Macro for the definition of interrupt service routines, so that the compiler can insert the required
-				 *  prologue and epilogue code to properly manage the interrupt routine without affecting the main thread's
-				 *  state with unintentional side-effects.
-				 *
-				 *  Interrupt handlers written using this macro may still need to be registered with the microcontroller's
-				 *  Interrupt Controller (if present) before they will properly handle incoming interrupt events.
-				 *
-				 *  \note This macro is only supplied on some architectures, where the standard library does not include a valid
-				 *        definition. If an existing definition exists, the alternative definition here will be ignored.
-				 *
-				 *  \ingroup Group_GlobalInt
-				 *
-				 *  \param[in] Name  Unique name of the interrupt service routine.
-				 */
-				#define ISR(Name, ...)          void Name (void) __attribute__((__interrupt__)) __VA_ARGS__; void Name (void)
-			#endif
-
-		/* Inline Functions: */
-			/** Function to reverse the individual bits in a byte - i.e. bit 7 is moved to bit 0, bit 6 to bit 1,
-			 *  etc.
-			 *
-			 *  \param[in] Byte  Byte of data whose bits are to be reversed.
-			 *
-			 *  \return Input data with the individual bits reversed (mirrored).
-			 */
-			static inline uint8_t BitReverse(uint8_t Byte) ATTR_WARN_UNUSED_RESULT ATTR_CONST;
-			static inline uint8_t BitReverse(uint8_t Byte)
-			{
-				Byte = (((Byte & 0xF0) >> 4) | ((Byte & 0x0F) << 4));
-				Byte = (((Byte & 0xCC) >> 2) | ((Byte & 0x33) << 2));
-				Byte = (((Byte & 0xAA) >> 1) | ((Byte & 0x55) << 1));
-
-				return Byte;
-			}
-
-			/** Function to perform a blocking delay for a specified number of milliseconds. The actual delay will be
-			 *  at a minimum the specified number of milliseconds, however due to loop overhead and internal calculations
-			 *  may be slightly higher.
-			 *
-			 *  \param[in] Milliseconds  Number of milliseconds to delay
-			 */
-			static inline void Delay_MS(uint16_t Milliseconds) ATTR_ALWAYS_INLINE;
-			static inline void Delay_MS(uint16_t Milliseconds)
-			{
-				#if (ARCH == ARCH_AVR8)
-				if (GCC_IS_COMPILE_CONST(Milliseconds))
-				{
-					_delay_ms(Milliseconds);
-				}
-				else
-				{
-					while (Milliseconds--)
-					  _delay_ms(1);
-				}
-				#elif (ARCH == ARCH_UC3)
-				while (Milliseconds--)
-				{
-					__builtin_mtsr(AVR32_COUNT, 0);
-					while ((uint32_t)__builtin_mfsr(AVR32_COUNT) < (F_CPU / 1000));
-				}
-				#elif (ARCH == ARCH_XMEGA)
-				if (GCC_IS_COMPILE_CONST(Milliseconds))
-				{
-					_delay_ms(Milliseconds);
-				}
-				else
-				{
-					while (Milliseconds--)
-					  _delay_ms(1);
-				}
-				#endif
-			}
-
-			/** Retrieves a mask which contains the current state of the global interrupts for the device. This
-			 *  value can be stored before altering the global interrupt enable state, before restoring the
-			 *  flag(s) back to their previous values after a critical section using \ref SetGlobalInterruptMask().
-			 *
-			 *  \ingroup Group_GlobalInt
-			 *
-			 *  \return  Mask containing the current Global Interrupt Enable Mask bit(s).
-			 */
-			static inline uint_reg_t GetGlobalInterruptMask(void) ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT;
-			static inline uint_reg_t GetGlobalInterruptMask(void)
-			{
-				GCC_MEMORY_BARRIER();
-
-				#if (ARCH == ARCH_AVR8)
-				return SREG;
-				#elif (ARCH == ARCH_UC3)
-				return __builtin_mfsr(AVR32_SR);
-				#elif (ARCH == ARCH_XMEGA)
-				return SREG;
-				#endif
-			}
-
-			/** Sets the global interrupt enable state of the microcontroller to the mask passed into the function.
-			 *  This can be combined with \ref GetGlobalInterruptMask() to save and restore the Global Interrupt Enable
-			 *  Mask bit(s) of the device after a critical section has completed.
-			 *
-			 *  \ingroup Group_GlobalInt
-			 *
-			 *  \param[in] GlobalIntState  Global Interrupt Enable Mask value to use
-			 */
-			static inline void SetGlobalInterruptMask(const uint_reg_t GlobalIntState) ATTR_ALWAYS_INLINE;
-			static inline void SetGlobalInterruptMask(const uint_reg_t GlobalIntState)
-			{
-				GCC_MEMORY_BARRIER();
-
-				#if (ARCH == ARCH_AVR8)
-				SREG = GlobalIntState;
-				#elif (ARCH == ARCH_UC3)
-				if (GlobalIntState & AVR32_SR_GM)
-				  __builtin_ssrf(AVR32_SR_GM_OFFSET);
-				else
-				  __builtin_csrf(AVR32_SR_GM_OFFSET);
-				#elif (ARCH == ARCH_XMEGA)
-				SREG = GlobalIntState;
-				#endif
-
-				GCC_MEMORY_BARRIER();
-			}
-
-			/** Enables global interrupt handling for the device, allowing interrupts to be handled.
-			 *
-			 *  \ingroup Group_GlobalInt
-			 */
-			static inline void GlobalInterruptEnable(void) ATTR_ALWAYS_INLINE;
-			static inline void GlobalInterruptEnable(void)
-			{
-				GCC_MEMORY_BARRIER();
-
-				#if (ARCH == ARCH_AVR8)
-				sei();
-				#elif (ARCH == ARCH_UC3)
-				__builtin_csrf(AVR32_SR_GM_OFFSET);
-				#elif (ARCH == ARCH_XMEGA)
-				sei();
-				#endif
-
-				GCC_MEMORY_BARRIER();
-			}
-
-			/** Disabled global interrupt handling for the device, preventing interrupts from being handled.
-			 *
-			 *  \ingroup Group_GlobalInt
-			 */
-			static inline void GlobalInterruptDisable(void) ATTR_ALWAYS_INLINE;
-			static inline void GlobalInterruptDisable(void)
-			{
-				GCC_MEMORY_BARRIER();
-
-				#if (ARCH == ARCH_AVR8)
-				cli();
-				#elif (ARCH == ARCH_UC3)
-				__builtin_ssrf(AVR32_SR_GM_OFFSET);
-				#elif (ARCH == ARCH_XMEGA)
-				cli();
-				#endif
-
-				GCC_MEMORY_BARRIER();
-			}
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Common/CompilerSpecific.h b/NativePrograms/LUFA/Common/CompilerSpecific.h
deleted file mode 100644
index 83c72257e6..0000000000
--- a/NativePrograms/LUFA/Common/CompilerSpecific.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Compiler specific definitions for code optimization and correctness.
- *
- *  \copydetails Group_CompilerSpecific
- *
- *  \note Do not include this file directly, rather include the Common.h header file instead to gain this file's
- *        functionality.
- */
-
-/** \ingroup Group_Common
- *  \defgroup Group_CompilerSpecific Compiler Specific Definitions
- *  \brief Compiler specific definitions for code optimization and correctness.
- *
- *  Compiler specific definitions to expose certain compiler features which may increase the level of code optimization
- *  for a specific compiler, or correct certain issues that may be present such as memory barriers for use in conjunction
- *  with atomic variable access.
- *
- *  Where possible, on alternative compilers, these macros will either have no effect, or default to returning a sane value
- *  so that they can be used in existing code without the need for extra compiler checks in the user application code.
- *
- *  @{
- */
-
-#ifndef __LUFA_COMPILERSPEC_H__
-#define __LUFA_COMPILERSPEC_H__
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_COMMON_H)
-			#error Do not include this file directly. Include LUFA/Common/Common.h instead to gain this functionality.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			#if defined(__GNUC__) || defined(__DOXYGEN__)
-				/** Forces GCC to use pointer indirection (via the device's pointer register pairs) when accessing the given
-				 *  struct pointer. In some cases GCC will emit non-optimal assembly code when accessing a structure through
-				 *  a pointer, resulting in a larger binary. When this macro is used on a (non \c const) structure pointer before
-				 *  use, it will force GCC to use pointer indirection on the elements rather than direct store and load
-				 *  instructions.
-				 *
-				 *  \param[in, out] StructPtr  Pointer to a structure which is to be forced into indirect access mode.
-				 */
-				#define GCC_FORCE_POINTER_ACCESS(StructPtr)   __asm__ __volatile__("" : "=b" (StructPtr) : "0" (StructPtr))
-
-				/** Forces GCC to create a memory barrier, ensuring that memory accesses are not reordered past the barrier point.
-				 *  This can be used before ordering-critical operations, to ensure that the compiler does not re-order the resulting
-				 *  assembly output in an unexpected manner on sections of code that are ordering-specific.
-				 */
-				#define GCC_MEMORY_BARRIER()                  __asm__ __volatile__("" ::: "memory");
-
-				/** Determines if the specified value can be determined at compile-time to be a constant value when compiling under GCC.
-				 *
-				 *  \param[in] x  Value to check compile-time constantness of.
-				 *
-				 *  \return Boolean \c true if the given value is known to be a compile time constant, \c false otherwise.
-				 */
-				#define GCC_IS_COMPILE_CONST(x)               __builtin_constant_p(x)
-			#else
-				#define GCC_FORCE_POINTER_ACCESS(StructPtr)
-				#define GCC_MEMORY_BARRIER()
-				#define GCC_IS_COMPILE_CONST(x)               0
-			#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Common/Endianness.h b/NativePrograms/LUFA/Common/Endianness.h
deleted file mode 100644
index 85f8a4c153..0000000000
--- a/NativePrograms/LUFA/Common/Endianness.h
+++ /dev/null
@@ -1,493 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Endianness and Byte Ordering macros and functions.
- *
- *  \copydetails Group_Endianness
- */
-
-/** \ingroup Group_Endianness
- *  \defgroup Group_ByteSwapping Byte Reordering
- *  \brief Macros and functions for forced byte reordering.
- */
-
-/** \ingroup Group_Endianness
- *  \defgroup Group_EndianConversion Endianness Conversion
- *  \brief Macros and functions for automatic endianness conversion.
- */
-
-/** \ingroup Group_Common
- *  \defgroup Group_Endianness Endianness and Byte Ordering
- *  \brief Convenience macros and functions relating to byte (re-)ordering
- *
- *  Common library convenience macros and functions relating to byte (re-)ordering.
- *
- *  @{
- */
-
-#ifndef __LUFA_ENDIANNESS_H__
-#define __LUFA_ENDIANNESS_H__
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_COMMON_H)
-			#error Do not include this file directly. Include LUFA/Common/Common.h instead to gain this functionality.
-		#endif
-
-		#if !(defined(ARCH_BIG_ENDIAN) || defined(ARCH_LITTLE_ENDIAN))
-			#error ARCH_BIG_ENDIAN or ARCH_LITTLE_ENDIAN not set for the specified architecture.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Swaps the byte ordering of a 16-bit value at compile-time. Do not use this macro for swapping byte orderings
-			 *  of dynamic values computed at runtime, use \ref SwapEndian_16() instead. The result of this macro can be used
-			 *  inside struct or other variable initializers outside of a function, something that is not possible with the
-			 *  inline function variant.
-			 *
-			 *  \hideinitializer
-			 *
-			 *  \ingroup Group_ByteSwapping
-			 *
-			 *  \param[in] x  16-bit value whose byte ordering is to be swapped.
-			 *
-			 *  \return Input value with the byte ordering reversed.
-			 */
-			#define SWAPENDIAN_16(x)            (uint16_t)((((x) & 0xFF00) >> 8) | (((x) & 0x00FF) << 8))
-
-			/** Swaps the byte ordering of a 32-bit value at compile-time. Do not use this macro for swapping byte orderings
-			 *  of dynamic values computed at runtime- use \ref SwapEndian_32() instead. The result of this macro can be used
-			 *  inside struct or other variable initializers outside of a function, something that is not possible with the
-			 *  inline function variant.
-			 *
-			 *  \hideinitializer
-			 *
-			 *  \ingroup Group_ByteSwapping
-			 *
-			 *  \param[in] x  32-bit value whose byte ordering is to be swapped.
-			 *
-			 *  \return Input value with the byte ordering reversed.
-			 */
-			#define SWAPENDIAN_32(x)            (uint32_t)((((x) & 0xFF000000UL) >> 24UL) | (((x) & 0x00FF0000UL) >> 8UL) | \
-			                                               (((x) & 0x0000FF00UL) << 8UL)  | (((x) & 0x000000FFUL) << 24UL))
-
-			#if defined(ARCH_BIG_ENDIAN) && !defined(le16_to_cpu)
-				#define le16_to_cpu(x)           SwapEndian_16(x)
-				#define le32_to_cpu(x)           SwapEndian_32(x)
-				#define be16_to_cpu(x)           (x)
-				#define be32_to_cpu(x)           (x)
-				#define cpu_to_le16(x)           SwapEndian_16(x)
-				#define cpu_to_le32(x)           SwapEndian_32(x)
-				#define cpu_to_be16(x)           (x)
-				#define cpu_to_be32(x)           (x)
-				#define LE16_TO_CPU(x)           SWAPENDIAN_16(x)
-				#define LE32_TO_CPU(x)           SWAPENDIAN_32(x)
-				#define BE16_TO_CPU(x)           (x)
-				#define BE32_TO_CPU(x)           (x)
-				#define CPU_TO_LE16(x)           SWAPENDIAN_16(x)
-				#define CPU_TO_LE32(x)           SWAPENDIAN_32(x)
-				#define CPU_TO_BE16(x)           (x)
-				#define CPU_TO_BE32(x)           (x)
-			#elif !defined(le16_to_cpu)
-				/** \name Run-time endianness conversion */
-				/**@{*/
-
-				/** Performs a conversion between a Little Endian encoded 16-bit piece of data and the
-				 *  Endianness of the currently selected CPU architecture.
-				 *
-				 *  On little endian architectures, this macro does nothing.
-				 *
-				 *  \note This macro is designed for run-time conversion of data - for compile-time endianness
-				 *        conversion, use \ref LE16_TO_CPU instead.
-				 *
-				 *  \ingroup Group_EndianConversion
-				 *
-				 *  \param[in] x  Data to perform the endianness conversion on.
-				 *
-				 *  \return Endian corrected version of the input value.
-				 */
-				#define le16_to_cpu(x)           (x)
-
-				/** Performs a conversion between a Little Endian encoded 32-bit piece of data and the
-				 *  Endianness of the currently selected CPU architecture.
-				 *
-				 *  On little endian architectures, this macro does nothing.
-				 *
-				 *  \note This macro is designed for run-time conversion of data - for compile-time endianness
-				 *        conversion, use \ref LE32_TO_CPU instead.
-				 *
-				 *  \ingroup Group_EndianConversion
-				 *
-				 *  \param[in] x  Data to perform the endianness conversion on.
-				 *
-				 *  \return Endian corrected version of the input value.
-				 */
-				#define le32_to_cpu(x)           (x)
-
-				/** Performs a conversion between a Big Endian encoded 16-bit piece of data and the
-				 *  Endianness of the currently selected CPU architecture.
-				 *
-				 *  On big endian architectures, this macro does nothing.
-				 *
-				 *  \note This macro is designed for run-time conversion of data - for compile-time endianness
-				 *        conversion, use \ref BE16_TO_CPU instead.
-				 *
-				 *  \ingroup Group_EndianConversion
-				 *
-				 *  \param[in] x  Data to perform the endianness conversion on.
-				 *
-				 *  \return Endian corrected version of the input value.
-				 */
-				#define be16_to_cpu(x)           SwapEndian_16(x)
-
-				/** Performs a conversion between a Big Endian encoded 32-bit piece of data and the
-				 *  Endianness of the currently selected CPU architecture.
-				 *
-				 *  On big endian architectures, this macro does nothing.
-				 *
-				 *  \note This macro is designed for run-time conversion of data - for compile-time endianness
-				 *        conversion, use \ref BE32_TO_CPU instead.
-				 *
-				 *  \ingroup Group_EndianConversion
-				 *
-				 *  \param[in] x  Data to perform the endianness conversion on.
-				 *
-				 *  \return Endian corrected version of the input value.
-				 */
-				#define be32_to_cpu(x)           SwapEndian_32(x)
-
-				/** Performs a conversion on a natively encoded 16-bit piece of data to ensure that it
-				 *  is in Little Endian format regardless of the currently selected CPU architecture.
-				 *
-				 *  On little endian architectures, this macro does nothing.
-				 *
-				 *  \note This macro is designed for run-time conversion of data - for compile-time endianness
-				 *        conversion, use \ref CPU_TO_LE16 instead.
-				 *
-				 *  \ingroup Group_EndianConversion
-				 *
-				 *  \param[in] x  Data to perform the endianness conversion on.
-				 *
-				 *  \return Endian corrected version of the input value.
-				 */
-				#define cpu_to_le16(x)           (x)
-
-				/** Performs a conversion on a natively encoded 32-bit piece of data to ensure that it
-				 *  is in Little Endian format regardless of the currently selected CPU architecture.
-				 *
-				 *  On little endian architectures, this macro does nothing.
-				 *
-				 *  \note This macro is designed for run-time conversion of data - for compile-time endianness
-				 *        conversion, use \ref CPU_TO_LE32 instead.
-				 *
-				 *  \ingroup Group_EndianConversion
-				 *
-				 *  \param[in] x  Data to perform the endianness conversion on.
-				 *
-				 *  \return Endian corrected version of the input value.
-				 */
-				#define cpu_to_le32(x)           (x)
-
-				/** Performs a conversion on a natively encoded 16-bit piece of data to ensure that it
-				 *  is in Big Endian format regardless of the currently selected CPU architecture.
-				 *
-				 *  On big endian architectures, this macro does nothing.
-				 *
-				 *  \note This macro is designed for run-time conversion of data - for compile-time endianness
-				 *        conversion, use \ref CPU_TO_BE16 instead.
-				 *
-				 *  \ingroup Group_EndianConversion
-				 *
-				 *  \param[in] x  Data to perform the endianness conversion on.
-				 *
-				 *  \return Endian corrected version of the input value.
-				 */
-				#define cpu_to_be16(x)           SwapEndian_16(x)
-
-				/** Performs a conversion on a natively encoded 32-bit piece of data to ensure that it
-				 *  is in Big Endian format regardless of the currently selected CPU architecture.
-				 *
-				 *  On big endian architectures, this macro does nothing.
-				 *
-				 *  \note This macro is designed for run-time conversion of data - for compile-time endianness
-				 *        conversion, use \ref CPU_TO_BE32 instead.
-				 *
-				 *  \ingroup Group_EndianConversion
-				 *
-				 *  \param[in] x  Data to perform the endianness conversion on.
-				 *
-				 *  \return Endian corrected version of the input value.
-				 */
-				#define cpu_to_be32(x)           SwapEndian_32(x)
-
-				/**@}*/
-
-				/** \name Compile-time endianness conversion */
-				/**@{*/
-
-				/** Performs a conversion between a Little Endian encoded 16-bit piece of data and the
-				 *  Endianness of the currently selected CPU architecture.
-				 *
-				 *  On little endian architectures, this macro does nothing.
-				 *
-				 *  \note This macro is designed for compile-time conversion of data - for run time endianness
-				 *        conversion, use \ref le16_to_cpu instead.
-				 *
-				 *  \ingroup Group_EndianConversion
-				 *
-				 *  \param[in] x  Data to perform the endianness conversion on.
-				 *
-				 *  \return Endian corrected version of the input value.
-				 */
-				#define LE16_TO_CPU(x)           (x)
-
-				/** Performs a conversion between a Little Endian encoded 32-bit piece of data and the
-				 *  Endianness of the currently selected CPU architecture.
-				 *
-				 *  On little endian architectures, this macro does nothing.
-				 *
-				 *  \note This macro is designed for compile-time conversion of data - for run time endianness
-				 *        conversion, use \ref le32_to_cpu instead.
-				 *
-				 *  \ingroup Group_EndianConversion
-				 *
-				 *  \param[in] x  Data to perform the endianness conversion on.
-				 *
-				 *  \return Endian corrected version of the input value.
-				 */
-				#define LE32_TO_CPU(x)           (x)
-
-				/** Performs a conversion between a Big Endian encoded 16-bit piece of data and the
-				 *  Endianness of the currently selected CPU architecture.
-				 *
-				 *  On big endian architectures, this macro does nothing.
-				 *
-				 *  \note This macro is designed for compile-time conversion of data - for run-time endianness
-				 *        conversion, use \ref be16_to_cpu instead.
-				 *
-				 *  \ingroup Group_EndianConversion
-				 *
-				 *  \param[in] x  Data to perform the endianness conversion on.
-				 *
-				 *  \return Endian corrected version of the input value.
-				 */
-				#define BE16_TO_CPU(x)           SWAPENDIAN_16(x)
-
-				/** Performs a conversion between a Big Endian encoded 32-bit piece of data and the
-				 *  Endianness of the currently selected CPU architecture.
-				 *
-				 *  On big endian architectures, this macro does nothing.
-				 *
-				 *  \note This macro is designed for compile-time conversion of data - for run-time endianness
-				 *        conversion, use \ref be32_to_cpu instead.
-				 *
-				 *  \ingroup Group_EndianConversion
-				 *
-				 *  \param[in] x  Data to perform the endianness conversion on.
-				 *
-				 *  \return Endian corrected version of the input value.
-				 */
-				#define BE32_TO_CPU(x)           SWAPENDIAN_32(x)
-
-				/** Performs a conversion on a natively encoded 16-bit piece of data to ensure that it
-				 *  is in Little Endian format regardless of the currently selected CPU architecture.
-				 *
-				 *  On little endian architectures, this macro does nothing.
-				 *
-				 *  \note This macro is designed for compile-time conversion of data - for run-time endianness
-				 *        conversion, use \ref cpu_to_le16 instead.
-				 *
-				 *  \ingroup Group_EndianConversion
-				 *
-				 *  \param[in] x  Data to perform the endianness conversion on.
-				 *
-				 *  \return Endian corrected version of the input value.
-				 */
-				#define CPU_TO_LE16(x)           (x)
-
-				/** Performs a conversion on a natively encoded 32-bit piece of data to ensure that it
-				 *  is in Little Endian format regardless of the currently selected CPU architecture.
-				 *
-				 *  On little endian architectures, this macro does nothing.
-				 *
-				 *  \note This macro is designed for compile-time conversion of data - for run-time endianness
-				 *        conversion, use \ref cpu_to_le32 instead.
-				 *
-				 *  \ingroup Group_EndianConversion
-				 *
-				 *  \param[in] x  Data to perform the endianness conversion on.
-				 *
-				 *  \return Endian corrected version of the input value.
-				 */
-				#define CPU_TO_LE32(x)           (x)
-
-				/** Performs a conversion on a natively encoded 16-bit piece of data to ensure that it
-				 *  is in Big Endian format regardless of the currently selected CPU architecture.
-				 *
-				 *  On big endian architectures, this macro does nothing.
-				 *
-				 *  \note This macro is designed for compile-time conversion of data - for run-time endianness
-				 *        conversion, use \ref cpu_to_be16 instead.
-				 *
-				 *  \ingroup Group_EndianConversion
-				 *
-				 *  \param[in] x  Data to perform the endianness conversion on.
-				 *
-				 *  \return Endian corrected version of the input value.
-				 */
-				#define CPU_TO_BE16(x)           SWAPENDIAN_16(x)
-
-				/** Performs a conversion on a natively encoded 32-bit piece of data to ensure that it
-				 *  is in Big Endian format regardless of the currently selected CPU architecture.
-				 *
-				 *  On big endian architectures, this macro does nothing.
-				 *
-				 *  \note This macro is designed for compile-time conversion of data - for run-time endianness
-				 *        conversion, use \ref cpu_to_be32 instead.
-				 *
-				 *  \ingroup Group_EndianConversion
-				 *
-				 *  \param[in] x  Data to perform the endianness conversion on.
-				 *
-				 *  \return Endian corrected version of the input value.
-				 */
-				#define CPU_TO_BE32(x)           SWAPENDIAN_32(x)
-
-				/**@}*/
-			#endif
-
-		/* Inline Functions: */
-			/** Function to reverse the byte ordering of the individual bytes in a 16 bit value.
-			 *
-			 *  \ingroup Group_ByteSwapping
-			 *
-			 *  \param[in] Word  Word of data whose bytes are to be swapped.
-			 *
-			 *  \return Input data with the individual bytes reversed.
-			 */
-			static inline uint16_t SwapEndian_16(const uint16_t Word) ATTR_WARN_UNUSED_RESULT ATTR_CONST ATTR_ALWAYS_INLINE;
-			static inline uint16_t SwapEndian_16(const uint16_t Word)
-			{
-				if (GCC_IS_COMPILE_CONST(Word))
-				  return SWAPENDIAN_16(Word);
-
-				uint8_t Temp;
-
-				union
-				{
-					uint16_t Word;
-					uint8_t  Bytes[2];
-				} Data;
-
-				Data.Word = Word;
-
-				Temp = Data.Bytes[0];
-				Data.Bytes[0] = Data.Bytes[1];
-				Data.Bytes[1] = Temp;
-
-				return Data.Word;
-			}
-
-			/** Function to reverse the byte ordering of the individual bytes in a 32 bit value.
-			 *
-			 *  \ingroup Group_ByteSwapping
-			 *
-			 *  \param[in] DWord  Double word of data whose bytes are to be swapped.
-			 *
-			 *  \return Input data with the individual bytes reversed.
-			 */
-			static inline uint32_t SwapEndian_32(const uint32_t DWord) ATTR_WARN_UNUSED_RESULT ATTR_CONST ATTR_ALWAYS_INLINE;
-			static inline uint32_t SwapEndian_32(const uint32_t DWord)
-			{
-				if (GCC_IS_COMPILE_CONST(DWord))
-				  return SWAPENDIAN_32(DWord);
-
-				uint8_t Temp;
-
-				union
-				{
-					uint32_t DWord;
-					uint8_t  Bytes[4];
-				} Data;
-
-				Data.DWord = DWord;
-
-				Temp = Data.Bytes[0];
-				Data.Bytes[0] = Data.Bytes[3];
-				Data.Bytes[3] = Temp;
-
-				Temp = Data.Bytes[1];
-				Data.Bytes[1] = Data.Bytes[2];
-				Data.Bytes[2] = Temp;
-
-				return Data.DWord;
-			}
-
-			/** Function to reverse the byte ordering of the individual bytes in a n byte value.
-			 *
-			 *  \ingroup Group_ByteSwapping
-			 *
-			 *  \param[in,out] Data    Pointer to a number containing an even number of bytes to be reversed.
-			 *  \param[in]     Length  Length of the data in bytes.
-			 *
-			 *  \return Input data with the individual bytes reversed.
-			 */
-			static inline void SwapEndian_n(void* const Data,
-			                                uint8_t Length) ATTR_NON_NULL_PTR_ARG(1);
-			static inline void SwapEndian_n(void* const Data,
-			                                uint8_t Length)
-			{
-				uint8_t* CurrDataPos = (uint8_t*)Data;
-
-				while (Length > 1)
-				{
-					uint8_t Temp = *CurrDataPos;
-					*CurrDataPos = *(CurrDataPos + Length - 1);
-					*(CurrDataPos + Length - 1) = Temp;
-
-					CurrDataPos++;
-					Length -= 2;
-				}
-			}
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/DoxygenPages/BuildSystem.txt b/NativePrograms/LUFA/DoxygenPages/BuildSystem.txt
deleted file mode 100644
index ef57fcf0c7..0000000000
--- a/NativePrograms/LUFA/DoxygenPages/BuildSystem.txt
+++ /dev/null
@@ -1,281 +0,0 @@
-/** \file
- *
- *  This file contains special DoxyGen information for the generation of the main page and other special
- *  documentation pages. It is not a project source file.
- */
-
-/** \page Page_BuildSystem The LUFA Build System
- *
- *  \section Sec_BuildSystem_Overview Overview of the LUFA Build System
- *  The LUFA build system was originally an attempt at making a set of
- *  re-usable, modular build make files which could be referenced in a LUFA
- *  powered project, to minimize the amount of code required in an
- *  application makefile.
- *
- *  As it turned out to be fairly generic in nature, it was split out into its
- *  own separate project, called DMBS (<i>Dean's Makefile Build System</i>)
- *  which is released into the public domain. LUFA-specific portions of the
- *  LUFA build system extend DMBS, and provide a universal build system for all
- *  LUFA projects.
- *
- *  The latest DMBS project information and documentation can be found at:
- *  https://github.com/abcminiuser/dmbs
- *
- *  DMBS is written in GNU Make, and each module is independent of one-another.
- *
- *  LUFA now uses DMBS for its build system, with some LUFA specific extension
- *  modules.
- *
- *  If you have problems building using LUFA, see \subpage Page_BuildTroubleshooting for resolution steps.
- *
- *  \li \subpage Page_BuildModule_LUFA_SOURCES - The LUFA SOURCES extension module for DMBS
- *  \li \subpage Page_BuildModule_LUFA_GCC - The LUFA GCC extension module for DMBS
- */
-
-/** \page Page_BuildModule_LUFA_SOURCES LUFA SOURCES extension module for DMBS
- *
- *  The LUFA SOURCES extension more for DMBS provides LUFA specific variables
- *  listing the various LUFA source files required to be build by a project for
- *  a given LUFA module. This module gives a way to reference LUFA source files
- *  symbolically, so that changes to the library structure do not break the
- *  library makefile.
- *
- *  To use this module in your application makefile, add the following code:
- *  \code
- *  include $(LUFA_PATH)/Build/LUFA/lufa-sources.mk
- *  \endcode
- *
- *  \section SSec_BuildModule_LUFA_SOURCES_Requirements Requirements
- *  None.
- *
- *  \section SSec_BuildModule_LUFA_SOURCES_Targets Targets
- *
- *  <table>
- *   <tr>
- *    <td><i>None</i></td>
- *   </tr>
- *  </table>
- *
- *  \section SSec_BuildModule_LUFA_SOURCES_MandatoryParams Mandatory Parameters
- *
- *  <table>
- *   <tr>
- *    <td><tt>LUFA_PATH</tt></td>
- *    <td>Path to the LUFA library core, either relative or absolute (e.g. <tt>../LUFA-000000/LUFA/</tt>).</td>
- *   </tr>
- *   <tr>
- *    <td><tt>ARCH</tt></td>
- *    <td>Architecture of the target processor (see \ref Page_DeviceSupport).</td>
- *   </tr>
- *  </table>
- *
- *  \section SSec_BuildModule_LUFA_SOURCES_OptionalParams Optional Parameters
- *
- *  <table>
- *   <tr>
- *    <td><i>None</i></td>
- *   </tr>
- *  </table>
- *
- *  \section SSec_BuildModule_LUFA_SOURCES_ProvidedVariables Module Provided Variables
- *
- *  <table>
- *   <tr>
- *    <td><tt>LUFA_SRC_USB</tt></td>
- *    <td>List of LUFA USB driver source files.</td>
- *   </tr>
- *   <tr>
- *    <td><tt>LUFA_SRC_USBCLASS</tt></td>
- *    <td>List of LUFA USB Class driver source files.</td>
- *   </tr>
- *   <tr>
- *    <td><tt>LUFA_SRC_TEMPERATURE</tt></td>
- *    <td>List of LUFA temperature sensor driver source files.</td>
- *   </tr>
- *   <tr>
- *    <td><tt>LUFA_SRC_SERIAL</tt></td>
- *    <td>List of LUFA Serial U(S)ART driver source files.</td>
- *   </tr>
- *   <tr>
- *    <td><tt>LUFA_SRC_TWI</tt></td>
- *    <td>List of LUFA TWI driver source files.</td>
- *   </tr>
- *   <tr>
- *    <td><tt>LUFA_SRC_PLATFORM</tt></td>
- *    <td>List of LUFA architecture specific platform management source files.</td>
- *   </tr>
- *  </table>
- *
- *  \section SSec_BuildModule_LUFA_SOURCES_ProvidedMacros Module Provided Macros
- *
- *  <table>
- *   <tr>
- *    <td><i>None</i></td>
- *   </tr>
- *  </table>
- */
-
-/** \page Page_BuildModule_LUFA_GCC LUFA GCC extension module for DMBS
- *
- *  The LUFA GCC extension module for the standard DMBS GCC module extends the
- *  latter to support the compilation of LUFA powered projects. It should be
- *  imported into your LUFA powered project makefiles to ensure that the correct
- *  build settings are used for the project's configuration.
- *
- *  To use this module in your application makefile, add the following code:
- *  \code
- *  include $(LUFA_PATH)/Build/LUFA/lufa-gcc.mk
- *  \endcode
- *
- *  \section SSec_BuildModule_LUFA_GCC_Requirements Requirements
- *  This module should be included in your makefile *after* the DMBS GCC module.
- *
- *  \section SSec_BuildModule_LUFA_GCC_Targets Targets
- *
- *  <table>
- *   <tr>
- *    <td><i>None</i></td>
- *   </tr>
- *  </table>
- *
- *  \section SSec_BuildModule_LUFA_GCC_MandatoryParams Mandatory Parameters
- *
- *  <table>
- *   <tr>
- *    <td><tt>LUFA_PATH</tt></td>
- *    <td>Path to the LUFA library core, either relative or absolute (e.g. <tt>../LUFA-000000/LUFA/</tt>).</td>
- *   </tr>
- *  </table>
- *
- *  \section SSec_BuildModule_LUFA_GCC_OptionalParams Optional Parameters
- *
- *  <table>
- *   <tr>
- *    <td><tt>BOARD</tt></td>
- *    <td>LUFA board hardware drivers to use (see \ref Page_DeviceSupport).</td>
- *   </tr>
- *  </table>
- *
- *  \section SSec_BuildModule_LUFA_GCC_ProvidedVariables Module Provided Variables
- *
- *  <table>
- *   <tr>
- *    <td><i>None</i></td>
- *   </tr>
- *  </table>
- *
- *  \section SSec_BuildModule_LUFA_GCC_ProvidedMacros Module Provided Macros
- *
- *  <table>
- *   <tr>
- *    <td><i>None</i></td>
- *   </tr>
- *  </table>
- */
-
-/** \page Page_BuildTroubleshooting Troubleshooting Information
- *
- *  LUFA uses a lot of advanced features of the AVR-GCC compiler, linker, and
- *  surrounding binaries. This can sometimes lead to problems compiling
- *  applications if one of these features is buggy in the version of the tools
- *  used in a build environment. Missing utilities and incorrectly set makefile
- *  configuration options can also result in different errors being produced
- *  when compilation or other operations are attempted. The table below lists a
- *  set of commonly encountered errors and their resolutions.
- *
- *  <table>
- *    <tr>
- *    <th>Problem</th>
- *    <th>Resolution</th>
- *   </tr>
- *   <tr>
- *    <td>Error &quot;<b><tt>relocation truncated to fit: R_AVR_13_PCREL against symbol <i>{X}</i></tt></b>&quot; shown when compiling.</td>
- *    <td>Try compiling with the setting <tt>LINKER_RELAXATIONS=N</tt> in your LUFA Build System 2.0 makefile, or remove the line <tt>-Wl,--relax</tt>
- *        from other makefiles. Alternatively, make sure you have the latest version of the Atmel Toolchain installed for your system.</td>
- *   </tr>
- *   <tr>
- *    <td>Error &quot;<b><tt>error: ld terminated with signal 11 [Segmentation fault]</tt></b>&quot; shown when compiling.</td>
- *    <td>Try compiling with the setting <tt>DEBUG_LEVEL=2</tt> in your LUFA Build System 2.0 makefile, or make sure you are using <tt>binutils</tt> version 2.22 or later.</td>
- *   </tr>
- *   <tr>
- *    <td>Error &quot;<b><tt>EMERGENCY ABORT: INFINITE RECURSION DETECTED</tt></b>&quot; shown when compiling.</td>
- *    <td>Make sure you are using an up to date version of GNU Make when compiling. This error is a safety system added to the mid-level makefiles, to prevent an issue with
- *        GNU make or other variants of Make causing an infinitely recursive build.</td>
- *   </tr>
- *   <tr>
- *    <td>Error &quot;<b><tt>Unsupported architecture &quot;<i>{X}</i>&quot;</tt></b>&quot; shown when compiling.</td>
- *    <td>Ensure your makefile's <tt>ARCH</tt> setting is set to one of the architecture names (case-sensitive) supported by the version of LUFA you are compiling against.</td>
- *   </tr>
- *   <tr>
- *    <td>Error &quot;<b><tt>Makefile <i>{X}</i> value not set</tt></b>&quot; shown when compiling.</td>
- *    <td>The specified Makefile value was not configured in your project's makefile or on the command line, and the nominated setting is required by one or more LUFA
- *        build system modules. Define the value in your project makefile and try again.</td>
- *   </tr>
- *   <tr>
- *    <td>Error &quot;<b><tt>Makefile <i>{X}</i> option cannot be blank</tt></b>&quot; shown when compiling.</td>
- *    <td>The specified Makefile value was configured in your project's makefile or on the command line, but was set to an empty value. For the nominated configuration
- *        option, an empty value is not allowed. Define the nominated setting to a correct non-blank value and try again.</td>
- *   </tr>
- *   <tr>
- *    <td>Error &quot;<b><tt>Makefile <i>{X}</i> option must be Y or N</tt></b>&quot; shown when compiling.</td>
- *    <td>The specified Makefile value was configured in your project's makefile or on the command line, but was set to a value other than a Y (for "Yes") or "N" (for "No").
- *        This configuration option is required to be one of the aforementioned boolean values, and other values are invalid. Set this option to either Y or N and try again.</td>
- *   </tr>
- *   <tr>
- *    <td>Error &quot;<b><tt>Unknown input source file formats: <i>{X}</i></tt></b>&quot; shown when compiling.</td>
- *    <td>The nominated source files, specified in your project's makefile in the <tt>SRC</tt> configuration option, has an extension that the LUFA build system does not
- *        recognise. The file extensions are case sensitive, and must be one of the supported formats (<tt>*.c</tt>, <tt>*.cpp</tt> or <tt>*.S</tt>).</td>
- *   </tr>
- *   <tr>
- *    <td>Error &quot;<b><tt>Cannot build with OBJDIR parameter set - one or more object file name is not unique</tt></b>&quot; shown when compiling.</td>
- *    <td>When a project is built with a non-empty <tt>OBJDIR</tt> object directory name set, all input source files must have unique names, excluding extension and path.
- *        This means that input files that are named identically and differ only by their path or extension are invalid when this mode is used.</td>
- *   </tr>
- *   <tr>
- *    <td>Error &quot;<b><tt>Source file does not exist: <i>{X}</i></tt></b>&quot; shown when compiling.</td>
- *    <td>The nominated input source file, specified in the user project's <tt>SRC</tt> parameter, could not be found. Ensure the source file exists and the absolute or
- *        relative path given in the user project makefile is correct and try again.</td>
- *   </tr>
- *   <tr>
- *    <td>Error &quot;<b><tt>Doxygen configuration file <i>{X}</i> does not exist</tt></b>&quot; shown when upgrading a Doxygen configuration file.</td>
- *    <td>The nominated Doxygen configuration file, specified in the user project's <tt>DOXYGEN_CONF</tt> parameter, could not be found. Ensure the configuration file exists
- *        and the absolute or relative path given in the user project makefile is correct and try again, or run the appropriate makefile target to generate a new configuration
- *        file.</td>
- *   </tr>
- *   <tr>
- *    <td>Error &quot;<b><tt>avr-gcc: error: unrecognized option '<i>{X}</i>'</tt></b>&quot; shown when compiling.</td>
- *    <td>An unrecognised option was supplied to the compiler, usually in the <tt>C_FLAGS</tt>, <tt>CPP_FLAGS</tt>, <tt>ASM_FLAGS</tt> or <tt>CC_FLAGS</tt> configuration
- *        options. The nominated compiler switch may be invalid, or unsupported by the version of AVR-GCC on the host system. Remove the unrecognised flag if invalid, or
- *        upgrade to the latest AVR-GCC. If the option is a valid linker option, use the prefix "-Wl," to ensure it is passed to the linker correctly.</td>
- *   </tr>
- *   <tr>
- *    <td>Error &quot;<b><tt>makefile:{X}: {Y}.mk: No such file or directory</tt></b>&quot; shown when make is invoked.</td>
- *    <td>The path to the nominated makefile module was incorrect. This usually indicates that the makefile <tt>LUFA_PATH</tt> option is not set to a valid relative or
- *        absolute path to the LUFA library core.</td>
- *   </tr>
- *   <tr>
- *    <td>Error &quot;<b><tt>fatal error: LUFAConfig.h: No such file or directory</tt></b>&quot; shown when compiling.</td>
- *    <td>The <tt>USE_LUFA_CONFIG_HEADER</tt> compile time option was set in the user project makefile, but the user supplied <tt>LUFAConfig.h</tt> header could not be
- *        found. Ensure that the directory that contains this configuration file is correctly passed to the compiler via the -I switch in the makefile <tt>CC_FLAGS</tt>
- *        parameter.</td>
- *   </tr>
- *   <tr>
- *    <td>Error &quot;<b><tt>ld.exe: section .apitable_trampolines loaded at <i>{X}</i> overlaps section .text</tt></b>&quot; shown when compiling a bootloader.</td>
- *    <td>The bootloader is compiling too large for the given <tt>FLASH_SIZE_KB</tt> and <tt>BOOT_SECTION_SIZE_KB</tt> parameters set in the bootloader makefile. This
- *        usually indicates that these values are incorrect for the specified device the bootloader is targeting. If these values are correct, a newer version of the
- *        compiler may need to be used to ensure that the bootloader is built within the section size constraints of the target device.</td>
- *   </tr>
- *   <tr>
- *    <td>Error &quot;<b><tt>unknown MCU '<i>{X}</i>' specified</tt></b>&quot; shown when compiling.</td>
- *    <td>The specified microcontroller device model name set in the user application's makefile as the <tt>MCU</tt> parameter is incorrect, or unsupported by the
- *        version of the compiler being used. Make sure the model name is correct, or upgrade to the latest Atmel Toolchain to obtain newer device support.</td>
- *   </tr>
- *   <tr>
- *    <td>Error &quot;<b><tt>undefined reference to `<i>{X}</i>'</tt></b>&quot; shown when compiling.</td>
- *    <td>This is usually caused by a missing source file in the user application's <tt>SRC</tt> configuration parameter. If the indicated symbol is one from the LUFA
- *        library, you may be missing a LUFA source makefile module (see \ref Page_BuildModule_LUFA_SOURCES).</td>
- *   </tr>
- *  </table>
- *
- *  For troubleshooting other errors you encounter, please see \ref Sec_ProjectHelp.
- */
diff --git a/NativePrograms/LUFA/DoxygenPages/BuildingLinkableLibraries.txt b/NativePrograms/LUFA/DoxygenPages/BuildingLinkableLibraries.txt
deleted file mode 100644
index 89b73ff6d4..0000000000
--- a/NativePrograms/LUFA/DoxygenPages/BuildingLinkableLibraries.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-/** \file
- *
- *  This file contains special DoxyGen information for the generation of the main page and other special
- *  documentation pages. It is not a project source file.
- */
-
-/** \page Page_BuildLibrary Building as a Linkable Library
- *
- *  The LUFA library can be built as a proper linkable library (with the extension .a) under AVR-GCC, so that
- *  the library does not need to be recompiled with each revision of a user project. Instructions for creating
- *  a library from a given source tree can be found in the AVR-GCC user manual included in the WinAVR install
- *  /Docs/ directory.
- *
- *  However, building the library is <b>not recommended</b>, as the static (compile-time) options will be
- *  unable to be changed without a recompilation of the LUFA code. Therefore, if the library is to be built
- *  from the LUFA source, it should be made to be application-specific and compiled with the static options
- *  that are required for each project (which should be recorded along with the library).
- *
- *  Normal library use has the library components compiled in at the same point as the application code, as
- *  demonstrated in the library demos and applications. This is the preferred method, as the library is recompiled
- *  each time to ensure that all static options for a particular application are applied.
- */
-
diff --git a/NativePrograms/LUFA/DoxygenPages/ChangeLog.txt b/NativePrograms/LUFA/DoxygenPages/ChangeLog.txt
deleted file mode 100644
index e81b0a5076..0000000000
--- a/NativePrograms/LUFA/DoxygenPages/ChangeLog.txt
+++ /dev/null
@@ -1,1693 +0,0 @@
-/** \file
- *
- *  This file contains special DoxyGen information for the generation of the main page and other special
- *  documentation pages. It is not a project source file.
- */
-
- /** \page Page_ChangeLog Project Changelog
-  *
-  *  \section Sec_ChangeLogXXXXXX Version XXXXXX
-  *  <b>New:</b>
-  *  - Core:
-  *   - The USE_INTERNAL_SERIAL definition can now be overridden by the user to a custom string index (thanks to Nicohood)
-  *   - New CCID class driver and associated demos (thanks to Filipe Rodrigues)
-  *  - Library Applications:
-  *   - Added Microsoft OS Compatibility descriptors to the RNDIS demos for driverless install on Windows 7 and newer
-  *   - Added AVRISP-MKII support for target OSCCAL calibration (thanks to Jacob September)
-  *
-  *  <b>Changed:</b>
-  *  - Core:
-  *   - Moved the functional descriptor types DTYPE_CSInterface and DTYPE_CSEndpoint to their respective CDC and Audio class
-  *     drivers, as they are class-defined rather than general descriptor types.
-  *   - Reduced compiled size of the Endpoint_Discard_Stream() and Endpoint_Null_Stream() functions.
-  *  - Library Applications:
-  *   - Updated Printer class bootloader to not store 32-bit HEX parser flash offsets on small flash devices.
-  *   - Enabled Link Time Optimizations (LTO) on bootloaders to reduce compiled size on newer versions of GCC.
-  *
-  *  <b>Fixed:</b>
-  *  - Core:
-  *   - Fixed DeviceUsesOUTPipe flag not being set correctly in the HID host class driver (thanks to Wolfgang Schnerring)
-  *   - Fixed CDC Device class driver's internal serial stream created by \ref CDC_Device_CreateStream not returning the written
-  *     character after a successful write (thanks to NicoHood)
-  *   - Fixed incorrect endpoint bank setup on the UC3 architecture (thanks to Andrus Aaslaid)
-  *   - Fixed CDC_Device_Send*_P() and CDC_Host_Send*_P() variant functions not compiled out for UC3 architecture
-  *   - Fixed USB_STRING_DESCRIPTOR_ARRAY() not accepting more than two byte long arrays
-  *   - Fixed HID report parser corruption when parsing PUSH and POP report item elements
-  *   - Fixed HID report parser incorrectly decoding 32-bit USAGE elements
-  *   - Fixed control request hangs in the Printer device class driver (thanks to Juergen Borleis)
-  *  - Library Applications:
-  *   - Fixed bootloaders not disabling global interrupts during erase and write operations (thanks to Zoltan)
-  *   - Fixed bootloaders accepting flash writes to the bootloader region (thanks to NicoHood)
-  *   - Fixed bootloaders incorrectly checking the BOOTRST fuse on start (thanks to Braden Kell)
-  *   - Fixed Mass Storage bootloader incorrectly updating the lower nibble of the FAT12 cluster
-  *   - Fixed void pointer arithmetic in the low level RNDIS demo protocol decoders
-  *   - Fixed invalid DHCP server socket creation in the Webserver project
-  *
-  *  \section Sec_ChangeLog170418 Version 170418
-  *  <b>New:</b>
-  *  - Core:
-  *   - Added support for the Pololu A-Star Micro board (thanks to Joh Schneider)
-  *   - Added new \c LUFA_VERSION_RELEASE_TYPE macro to the library version header, to determine release type (thanks to NicoHood)
-  *
-  *  <b>Fixed:</b>
-  *  - Core:
-  *   - The CALLBACK_USB_GetDescriptor() callback function into the user application erroneously had a uint8_t type for the wIndex
-  *     parameter, instead of uint16_t (thanks to Matlo)
-  *   - Fixed broken USE_RAM_DESCRIPTORS compile time option when the FIXED_NUM_CONFIGURATIONS compile time option is not enabled
-  *     in a user application (thanks to Matlo)
-  *   - Fixed missing \c va_end() calls in the HID bootloader CLI app which could cause portability issues
-  *   - Fixed void pointer arithmetic in the \c Serial_SendData() functions for AVR8 and XMEGA architectures
-  *   - Fixed invalid endpoint indexes causing memory corruption in device Clear/Set Feature standard requests (thanks to Peter Popovec)
-  *   - Fixed incorrect serialization in USB_SetHIDReportItemInfo() function (thanks to e-chip)
-  *  - Library Applications:
-  *   - Fixed low level RNDIS demo incorrectly setting the RNDIS state when a null packet filter was requested
-  *   - Fixed void pointer arithmetic in the low level and class driver RNDIS demo protocol decoders
-  *   - Fixed missing entries in several project's Atmel Studio integration files, such as driver INF files
-  *
-  *  <b>Changed:</b>
-  *  - Core:
-  *   - Replaced the LUFA build system with its (compatible) successor, DMBS (Dean's Makefile Build System)
-  *   - Removed obsolete library TAR export and associated documentation
-  *   - Fixed incorrect HID_DESCRIPTOR_KEYBOARD() macro definition (thanks to Eric Tang)
-  *  - Library Applications:
-  *   - Added signed alternative libUSB driver for the AVRISP-MKII clone project, to support Atmel Studio 7 (thanks to Atmel)
-  *   - Removed no longer required LIBUSB_DRIVER_COMPAT and RESET_TOGGLES_LIBUSB_COMPAT configuration options from the AVRISP-MKII
-  *     clone project, as the new libUSB driver works for AVRDUDE and Atmel Studio 7 under Windows
-  *
-  *  \section Sec_ChangeLog151115 Version 151115
-  *  <b>New:</b>
-  *   - Added support for the Atmel Xplained-MINI series of development kits
-  *   - Added new PROGMEM variant send functions to the CDC class device driver (thanks to Stefan Hellermann)
-  *   - Added new PROGMEM variant send functions to the CDC class host driver
-  *   - Added additional Arduino Uno board definitions for the main processor reset (thanks to NicoHood)
-  *   - Added modified DocBook transforms to generate Atmel Studio 6/7 internal help documentation (thanks to Morten Engelhardt Olsen)
-  *
-  *  <b>Changed:</b>
-  *  - Core:
-  *   - The TWI peripheral driver's TWI_WritePacket() and TWI_ReadPacket() functions now takes a 16-bit Length rather than an 8-bit
-  *     length, for longer transfers
-  *  - Library Applications:
-  *   - The CDC, DFU, Mass Storage and Printer class bootloaders will no longer run the user application if the application reset
-  *     vector is blank (thanks to Alex Kazik)
-  *   - The CDC, DFU and Printer class bootloaders are now compatible with the original Atmel XPLAIN and Arduino Leonardo boards
-  *   - The CDC, DFU, Mass Storage and Printer class bootloaders are not compatible with devices with the BOOTRST fuse set and will
-  *     exit automatically unless an external reset was the last reset cause (thanks to Alex Kazik)
-  *   - Added missing force-inline attribute to the endianness utility functions (thanks to Stefan Hellermann)
-  *   - Updated the DFU build system module to use updated EEPROM programming command arguments for dfu-programmer 0.6.2 or newer
-  *
-  *  <b>Fixed:</b>
-  *   - Fixed broken XMEGA serial stream driver due to missing USART base pointer parameter (thanks to William Patterson)
-  *   - Fixed incorrect signature reported in the CDC/DFU bootloaders for the AT90USB82 (thanks to NicoHood)
-  *   - Fixed broken RNDIS demos on Linux machines whose DHCP hosts require a Lease Time option (thanks to Stefan Hellermann)
-  *   - Fixed broken LEDs_Disable() implementation for the Arduino Uno board (thanks to NicoHood)
-  *   - Fixed missing bounds checks and off-by-one in the DFU bootloader signature bytes (thanks to Reuti)
-  *
-  *  \section Sec_ChangeLog140928 Version 140928
-  *  <b>New:</b>
-  *  - Core:
-  *   - Updated the BUILD build system module to add a new COMPILER_PATH optional variable
-  *   - Added Serial_IsSendReady() and Serial_IsSendComplete() functions to the Serial hardware peripheral driver
-  *   - Added support for the Arduino Yun board (ATMEGA32U4 co-processor)
-  *   - Added support for the Arduino Micro board (thanks to Zoltán Szőke)
-  *  - Library Applications:
-  *   - Added new Dual MIDI class driver device demo
-  *
-  *  <b>Changed:</b>
-  *  - Core:
-  *   - The RNDIS device class driver now takes a user-supplied buffer and buffer length for the internal RNDIS
-  *     message management (thanks to Peter Mc Shane)
-  *
-  *  <b>Fixed:</b>
-  *  - Core:
-  *   - Fixed device class driver pipe configuration routines returning success with a partially constructed instance
-  *     when a pipe configuration failed (thanks to Helge Suess)
-  *   - Fixed incorrect XMEGA DFLL reference frequency (thanks to Martin Aakerberg)
-  *   - Fixed possible infinite loop in the control endpoint stream write function (thanks to Clayton Knight)
-  *   - Fixed missing HID report ID prefix on HID class driver GetReport request responses (thanks to Bert van Hall)
-  *   - Fixed incorrect XMEGA USB controller clock division factory for non-Full Speed operation (thanks to Bert van Hall)
-  *   - Fixed the LUFA build system to prevent incorrect code from being generated in newer toolchains when building for larger
-  *     FLASH memory devices (thanks to demultiplexer)
-  *   - Fixed missing parenthesis in the MIDI_EVENT() macro which could cause incorrect results (thanks to hexwab)
-  *   - Fixed mixed capitalization of TWI in the XMEGA TWI driver causing compilation failures (thanks to Jacob Schloss)
-  *   - Fixed broken AVR8 USART-SPI peripheral driver (thanks to Phil Zakielarz)
-  *  - Library Applications:
-  *   - Fixed spurious 0xFE USART byte sent in the USBtoSerial project when the baud rate is changed (thanks to Carl Kjeldsen)
-  *   - Fixed blocking USART reads causing low throughput on slow baud rates in the USBtoSerial project (thanks to Nevada Smith)
-  *   - Fixed USART reception overrun corrupting the internal buffers in the USBtoSerial project (thanks to Nevada Smith)
-  *   - Fixed broken LowLevel Audio Out demo sampling frequency configuration (thanks to Torsten Duwe)
-  *
-  *  \section Sec_ChangeLog140302 Version 140302
-  *  <b>New:</b>
-  *  - Library Applications:
-  *   - Added new Bulk Vendor low level device demo
-  *   - Added new libUSB host Python and NodeJS application examples for the Class driver GenericHID demo (thanks to Laszlo Monda)
-  *   - Added new AVR8 USB option to keep 3.3V regulator enabled (thanks to Michael Hanselmann)
-  *   - Added new USB_STRING_DESCRIPTOR() and USB_STRING_DESCRIPTOR_ARRAY() convenience macros (thanks to Laszlo Monda)
-  *
-  *  <b>Changed:</b>
-  *  - Library Applications:
-  *   - Refactored out USB interface IDs in the demo applications into enums (thanks to Laszlo Monda)
-  *   - AVRISP-MKII Clone Project PDI/TPI frequency increased from 250KHz to 2MHz as it is now stable
-  *   - Increased TPI/PDI handshake delay to 100us from 1us to support targets with high amounts of capacitance on their
-  *     /RESET lines (thanks to Paul Duke)
-  *   - Changed the VERSION_BCD() macro to accept the major/minor/revision values as separate parameters
-  *
-  *  <b>Fixed:</b>
-  *  - Core:
-  *   - Fixed MIDI device class driver MIDI_Device_ReceiveEventPacket() for the XMEGA architecture
-  *  - Library Applications:
-  *   - Fixed incorrect signature bytes returned in the DFU bootloader
-  *
-  *  \section Sec_ChangeLog130901 Version 130901
-  *  <b>New:</b>
-  *  - Core:
-  *   - Added additional MIDI command definitions to the MIDI class driver (thanks to Daniel Dreibrodt)
-  *   - Added new CONCAT() and CONCAT_EXPANDED() convenience macros
-  *   - Added new Printer Device Class driver
-  *   - Added support for the XMEGA C3 Xplained board
-  *   - Added support for the U2S board (thanks to megal0maniac)
-  *   - Added TWI Master driver for the XMEGA architecture (thanks to Michael Janssen)
-  *  - Library Applications:
-  *   - Added new Printer class bootloader
-  *   - Added new Mass Storage class bootloader
-  *   - Added XMEGA support for class driver device demos (where applicable)
-  *   - Added Python host application example for the Generic HID class driver device demo
-  *   - Added Python alternative host application for the HID class bootloader
-  *
-  *  <b>Changed:</b>
-  *  - Core:
-  *   - Updated the BUILD build system module to produce binary BIN files in addition to Intel HEX files
-  *   - Updated the Android Accessory Class to accept version 2 protocol devices (with version 1 functionality)
-  *   - All board drivers now implement dummy functions and constants when BOARD is set to NONE
-  *   - Added missing LEDs to the XMEGA A3BU Xplained board LED driver (thanks to Michael Janssen)
-  *   - Changed board Dataflash drivers to automatically configure the appropriate SPI interface for the selected board
-  *  - Library Applications:
-  *   - Re-added Set Control Line State request handling to the CDC class bootloader to prevent issues with the .NET serial
-  *     class (thanks to Erik Lins)
-  *   - TemperatureDataLogger project dummy RTC mode now tracks real time (thanks to David Lazarus)
-  *
-  *  <b>Fixed:</b>
-  *  - Core:
-  *   - Fixed Low Speed USB devices broken when using the library HID Class driver (thanks to Michael)
-  *   - Fixed possible register corruption in USB Host mode on AVR8 devices when ORDERED_EP_CONFIG is used (thanks to Martin Aakerberg)
-  *   - Fixed Pipe_GetBoundEndpointAddress() returning invalid endpoint directions on AVR8 architecture devices (thanks to decerri)
-  *     under some circumstances
-  *   - Fixed incorrect USB device state set when a suspended LUFA device is woken while addressed but not configured (thanks to Balaji Krishnan)
-  *   - Fixed broken USART SPI driver for the AVR8 architecture due to incorrect initialization
-  *   - Fixed re-enumeration issue of XMEGA architecture targets (thanks to Jaroslav Jedlinsky)
-  *   - Fixed error receiving PIMA events via the Still Image Host class driver
-  *  - Library Applications:
-  *   - Added handler for SCSI_CMD_START_STOP_UNIT in demos using the Mass Storage class, to prevent ejection errors on *nix systems due to an
-  *     unknown SCSI command
-  *   - Fixed incorrect HID report descriptor generated for 16-bit axis ranges by the HID_DESCRIPTOR_MOUSE() and HID_DESCRIPTOR_JOYSTICK()
-  *     macros (thanks to Armory)
-  *   - Fixed incorrect HID report descriptor generated for button multiples of 8 by the HID_DESCRIPTOR_MOUSE() and HID_DESCRIPTOR_JOYSTICK()
-  *     macros
-  *   - Fixed race condition in the DFU class bootloader causing failed device reprogramming in some circumstances (thanks to Luis Mendes)
-  *   - Fixed incorrect time/date configuration data order in the TempDataLogger host application (thanks to David Lazarus)
-  *
-  *  \section Sec_ChangeLog130303 Version 130303
-  *  <b>New:</b>
-  *  - Core:
-  *   - Added support for the Arduino Leonardo board
-  *   - Added support for the Atmel UC3-A3 Xplained board
-  *   - Added support for the Xevelabs USB2AX revision 3.1 board
-  *   - Added support for the Dimex Stange-ISP board (thanks to Gerhard Wesser)
-  *   - Added new \c doxygen_upgrade and \c doxygen_create targets to the DOXYGEN build system module
-  *   - Added new Board Hardware Information board driver
-  *  - Library Applications:
-  *   - Added a different device serial number when the AVRISP-MKII Clone project is in libUSB compatibility mode, so that
-  *     both the libUSB and Jungo drivers can be installed at the same time without having to use a filter driver
-  *
-  *  <b>Changed:</b>
-  *  - Core:
-  *   - Added workaround for broken VBUS detection on AVR8 devices when a bootloader starts the application
-  *     via a software jump without first turning off the OTG pad (thanks to Simon Inns)
-  *  - Library Applications:
-  *   - Increased throughput in the USBtoSerial project now that data transmission is non-blocking (thanks to Joseph Lacerte)
-  *   - Updated bootloader makefiles to remove dependency on the \c bc command line calculator tool
-  *   - Updated AVRISP-MKII Clone Programmer project so that the SCK clock period is saved in EEPROM (thanks to Gerhard Wesser)
-  *   - Changed all *_SendByte() function prototypes to accept a void pointer for the input buffer (thanks to Simon Kuppers)
-  *
-  *  <b>Fixed:</b>
-  *  - Core:
-  *   - Fixed incorrectly issuing STALL response to unsupported control request SETUP packets, rather than in the data/status stage
-  *   - Fixed inverted LEDs_GetLEDs() function implementation for the Benito, Minimus and Arduino UNO boards
-  *   - Fixed missing Windows 32-bit compatibility sections in the LUFA INF driver files (thanks to Christan Beharrell)
-  *   - Fixed logic hole breaking USB operations on a USB controller with only one supported USB mode and no USB_DEVICE_ONLY or USB_HOST_ONLY
-  *     configuration token set
-  *   - Fixed possible rounding in the VERSION_BCD() macros for some 0.01 step increments (thanks to Oliver Zander)
-  *   - Fixed incorrect Dataflash functionality in the USBKEY board if the driver is modified for a single Dataflash chip (thanks to Jonathan Oakley)
-  *   - Fixed incorrect definitions of \c HID_KEYBOARD_LED_KANA, \c HID_KEYBOARD_SC_KEYPAD_EQUAL_SIGN and \c HID_KEYBOARD_SC_KEYPAD_EQUAL_SIGN_AS400
-  *     and added a missing definition for \c HID_KEYBOARD_SC_APPLICATION (thanks to David Monro)
-  *   - Fixed maximum allowed keyboard key code usage of \c 0x65 rather than \c 0xFF for the \c HID_DESCRIPTOR_KEYBOARD() macro (thanks to David Monro)
-  *   - Fixed hardware race condition that could cause failed device enumerations for AVR8 and UC3 architectures (thanks to Mike Beyhs)
-  *   - Fixed incorrect Minimus board LED definitions (thanks to Joonas Lahtinen)
-  *   - Fixed incorrect ordering of the linker options in the build system causing link failures in some cases
-  *   - Fixed bug in the TWI peripheral driver for the AVR8 devices causing incorrect failure codes to be returned in some cases (thanks to Peter K)
-  *   - Fixed swapped LED3 and LED4 masks for the Olimex-32U4 development board LED driver
-  *   - Fixed potential NULL pointer dereference in the HID Host mode Class Driver (thanks to Pavel Kuzmin)
-  *  - Library Applications:
-  *   - Fixed broken RESET_TOGGLES_LIBUSB_COMPAT compile time option in the AVRISP-MKII project
-  *   - Fixed incompatibility in the CDC class bootloader on some systems (thanks to Sylvain Munaut)
-  *   - Fixed lengthy timeouts in the USBtoSerial project if no application on the host is consuming data (thanks to Nicolas Saugnier)
-  *   - Fixed lengthy automatic data flushing in the CDC and MIDI device class drivers
-  *   - Fixed incorrect LED masks for received data display in the Device GenericHID demos (thanks to Denys Berkovskyy)
-  *   - Fixed incorrect output in the HIDReportViewer project when no device is connected (thanks to Pavel Kuzmin)
-  *
-  *  \section Sec_ChangeLog120730 Version 120730
-  *  <b>New:</b>
-  *  - Core:
-  *   - Added new, revamped modular build system with new makefile templates
-  *   - Added support for the BitWizard Multio and Big-Multio boards
-  *   - Added support for the DorkbotPDX Duce board
-  *   - Added support for the Olimex AVR-USB-32U4 board
-  *   - Added support for the Olimex AVR-USB-T32U4 board
-  *   - Added support for the Olimex AVR-ISP-MK2 board
-  *   - Added new Endpoint_ConfigureEndpointTable() function
-  *   - Added new Pipe_ConfigurePipeTable() function
-  *   - Added build test to verify correct compilation of all board drivers using all driver APIs
-  *   - Added build test to verify correct compilation of all bootloaders using all supported devices
-  *   - Added build test to verify that there are no detectable errors in the codebase via static analysis
-  *   - Added new JTAG_ENABLE() macro for the AVR8 architecture
-  *  - Library Applications:
-  *   - Modified the CDC Host demos to set a default CDC Line Encoding on enumerated devices
-  *   - Added Dataflash operational checks and aborts to all projects using the Dataflash to ensure it is working correctly before use
-  *   - Added new SerialToLCD user project contributed by Simon Foster
-  *   - Added new RESET_TOGGLES_LIBUSB_COMPAT compile time option to the AVRISP-MKII clone programmer project (thanks to Robert Spitzenpfeil)
-  *
-  *  <b>Changed:</b>
-  *  - Core:
-  *   - Android Accessory Host property strings changed from a struct of pointer to an array to prevent unaligned access on greater than 8-bit architectures
-  *   - Audio Device Class driver changed to also require the index of the Audio Control interface within the device, for SET/GET/CUR/MIN/MAX/RES property adjustments
-  *   - Removed variable axis support from the HID_DESCRIPTOR_JOYSTICK() macro due to OS incompatibilities, replaced with fixed 3-axis joystick report structure
-  *   - Removed the old pseudo-scheduler from the library as it was unused and deprecated since the 090810 release
-  *   - Endpoint indexes are now specified as full endpoint addresses within the device in device mode, rather than a logical index
-  *   - The Endpoint_ConfigureEndpoint() function no longer takes an endpoint direction as a parameter, as this is now deduced from the specified full endpoint
-  *     address and type
-  *   - The Endpoint_ConfigureEndpoint() function no longer takes a number of banks as a special mask; the number of banks is now specified as an integer parameter
-  *   - Endpoints are now configured via instances of a new struct USB_Endpoint_Table_t in all device mode class drivers, rather than a list of endpoint parameters
-  *   - Pipe indexes are now specified as full pipe addresses within the host in host mode, rather than a logical index
-  *   - The Pipe_ConfigurePipe() function no longer takes an pipe token as a parameter, as this is now deduced from the specified full pipe address and type
-  *   - The Pipe_ConfigurePipe() function no longer takes a number of banks as a special mask; the number of banks is now specified as an integer parameter
-  *   - Pipes are now configured via instances of a new struct USB_Pipe_Table_t in all host mode class drivers, rather than a list of pipe parameters
-  *   - Added support for various assert and debugging macros for the UC3 devices
-  *   - Changed MIDI event structure MIDI_EventPacket_t to use a single field for the combined virtual cable index and command ID, to prevent bitfield packing issues
-  *     on some architectures (thanks to Darren Gibbs)
-  *   - Changed board LED driver implementations of LEDs_ToggleLEDs() for the AVR8 architecture to use the fast PIN register toggle alternative function for speed
-  *  - Library Applications:
-  *   - Raised the guard bits in the AVRISP-MKII clone project when in PDI and TPI to 32, to prevent communication errors on low quality connections to a target
-  *   - Added additional bootloader API data to expose the bootloader start address and class to the DFU and CDC class bootloaders
-  *   - Reverted AVRISP-MKII clone project watchdog based command timeout patch in favour of a hardware timer, to allow for use in devices with WDTRST fuse programmed
-  *   - The library bootloaders will now correctly start the user application after a watchdog-based application start, even if the /HWB line is held low externally
-  *     during the reset phase
-  *   - Increased endpoint polling interval for all demos and projects to 5ms, as 1ms was causing some enumeration issues on some machines (thanks to Riku Salminen)
-  *
-  *  <b>Fixed:</b>
-  *  - Core:
-  *   - Fixed possible enumeration error if the user application selects a pipe other than the default Control pipe between the Powered and Default states of
-  *     the host state machine
-  *   - Fixed incorrect call to the user callback CALLBACK_Audio_Device_GetSetInterfaceProperty() in the Audio Class device driver (thanks to Tiit Ratsep)
-  *   - Fixed compile error for the UC3 architecture when INTERRUPT_CONTROL_ENDPOINT is specified (thanks to Andrus Aaslaid)
-  *   - Fixed compile error if LEDs_Disable() is called and BOARD=NONE is set (thanks to Sam Lin)
-  *   - Fixed inverted LED logic in the OLIMEX162 board LED driver
-  *   - Fixed incorrect response to GET STATUS requests in device mode if NO_DEVICE_SELF_POWER or NO_DEVICE_REMOTE_WAKEUP tokens are defined (thanks to Georg Glock)
-  *   - Fixed inverted LED logic in the USB2AX board LED driver
-  *   - Fixed possible deadlock in the CDC device driver if the USB connection is dropped while the CDC_REQ_SetLineEncoding control request is being processed by
-  *     the stack (thanks to Jonathan Hudgins)
-  *   - Fixed broken MIDI host driver MIDI_Host_ReceiveEventPacket() function due to not unfreezing the MIDI data IN pipe before use (thanks to Michael Brown)
-  *   - Fixed swapped Little Endian/Big Endian endpoint and pipe write code for the UC3 devices (thanks to Andrew Chu)
-  *   - Fixed the JTAG_DISABLE() macro clearing all other bits in MCUSR when called
-  *   - Fixed incorrect Micropendous board LED driver LEDs_SetAllLEDs() and LEDs_ChangeLEDs() function implementations (thanks to MitchJS)
-  *   - Fixed endianess issues in the RNDIS host class driver for UC3 devices (thanks to Andrew Chu)
-  *  - Library Applications:
-  *   - Fixed error in the AVRISP-MKII programmer when ISP mode is used at 64KHz (thanks to Ben R. Porter)
-  *   - Fixed AVRISP-MKII programmer project failing to compile for the U4 chips when VTARGET_ADC_CHANNEL is defined to an invalid channel and NO_VTARGET_DETECT is
-  *     defined (thanks to Steven Morehouse)
-  *   - Fixed AVRISP-MKII programmer project reset line polarity inverted when the generated EEP file is loaded into the USB AVR's EEPROM and avr-dude is used
-  *   - Fixed CDC and DFU bootloaders failing to compile when the bootloader section size is 8KB or more (thanks to Georg Glock)
-  *   - Fixed CDC and DFU bootloaders API function offsets incorrect on some devices (thanks to Rod DeMay)
-  *   - Fixed incorrect DFU version number reported to the host in the  DFU bootloader descriptors (thanks to Georg Glock)
-  *   - Fixed incorrect version hundredths value encoding in VERSION_BCD() macro (thanks to Georg Glock)
-  *   - Fixed invalid configuration descriptor in the low level KeyboardMouse device demo (thanks to Jun Wako)
-  *   - Fixed CDC and DFU bootloaders API page erase and write function failures (thanks to Martin Lambert)
-  *
-  *  \section Sec_ChangeLog120219 Version 120219
-  *  <b>New:</b>
-  *  - Core:
-  *   - Added support for the XMEGA A3BU Xplained board
-  *   - Added support for the new B series XMEGA devices
-  *   - Added support for version 2 of the Teensy boards (thanks to Christoph Redecker)
-  *   - Added support for the USB2AX boards, hardware revision 1-3
-  *   - Added new Android Accessory Host class driver
-  *   - Added new USB_Host_GetDescriptor(), USB_Host_GetDeviceConfiguration() and USB_Host_GetInterfaceAltSetting() functions
-  *   - Added new CALLBACK_Audio_Device_GetSetInterfaceProperty() callback to the Audio Device Class driver
-  *   - Added new LEDs_Disable(), Buttons_Disable() and Joystick_Disable() functions to the board hardware drivers
-  *   - Added support for the Micropendous family of boards (Arduino-like revisions 1 and 2, DIP, 32U2, A, 1, 2, 3 and 4)
-  *   - Added INVERTED_VBUS_ENABLE_LINE and NO_AUTO_VBUS_MANAGEMENT compile time options (thanks to Opendous Inc.)
-  *   - Added support for the Atmel XMEGA B1 Xplained board
-  *   - Added Serial USART peripheral driver for the XMEGA architecture
-  *   - Added Master Mode SPI USART peripheral driver for the XMEGA and AVR8 architectures
-  *   - Added build test to verify correct compilation of as many modules as possible under as many architectures as possible under the C and C++ languages
-  *   - Added build test to verify correct compilation of the USB driver when forced into single USB mode under as many architectures as possible
-  *  - Library Applications:
-  *   - Added User Application APIs to the CDC and DFU class bootloaders
-  *   - Added INVERTED_ISP_MISO compile time option to the AVRISP-MKII clone project (thanks to Chuck Rohs)
-  *   - Added new Android Accessory Host demo (thanks to Opendous Inc.)
-  *
-  *  <b>Changed:</b>
-  *  - Core:
-  *   - When automatic PLL management mode is enabled on the U4 series AVR8 chips, the PLL is now configured for 48MHz and not
-  *     a divided 96MHz, to lower power consumption and to keep the system within the datasheet specs for 3.3V operation (thanks to Scott Vitale)
-  *   - Added Class, ClassDevice, ClassHost and ClassCommon to the internal class driver source filenames to prevent ambiguities
-  *   - Altered the Mass Storage Host class driver so that SCSI data STALLs from the attached device can be recovered from automatically without
-  *     having to reset the Mass Storage interface
-  *   - USB_CONFIG_ATTR_BUSPOWERED constant renamed to USB_CONFIG_ATTR_RESERVED, as this was misnamed (thanks to NXP Semiconductors)
-  *   - Reordered board name definition indexes so that a misspelled BOARD compile option will default to BOARD_USER rather than BOARD_USBKEY
-  *   - Altered the HID class driver to only try to construct at maximum one packet per USB frame, to reduce CPU usage
-  *   - All USB Class Driver configuration struct values are now non-const, to allow for run-time modifications if required before configuring an instance
-  *  - Library Applications:
-  *   - Altered the Mass Storage Host LowLevel demo so that SCSI data STALLs from the attached device can be recovered from automatically without
-  *     having to reset the Mass Storage interface
-  *   - Updated the AVRISP-MKII Clone programmer project to be compatible with the latest version of AVR Studio (version 5.1)
-  *   - Changed the AVRISP-MKII Clone programmer project to report a fixed 3.3V VTARGET voltage on USB AVRs lacking an ADC instead of 5V to prevent
-  *     warnings in AVR Studio 5.1 when programming XMEGA devices
-  *   - Allow serial strings to be generated on the older AVR8 devices which do not explicitly state they contain unique values in the datasheet,
-  *     as this appears to be implemented in hardware
-  *
-  *  <b>Fixed:</b>
-  *  - Core:
-  *   - Fixed ring buffer size limited to 255 elements, instead of the intended 65535 elements.
-  *   - Fixed CDC class drivers not saving and sending all 16-bits of the control line states (thanks to Matthew Swabey)
-  *   - Fixed race conditions in the CDC, HID and Mass Storage class drivers when processing some control requests
-  *   - Fixed misspelled HID_KEYBOARD_MODIFIER_* macros in the HID class driver (thanks to Laszlo Monda)
-  *   - Fixed broken AVR32 endpoint/pipe communications when ORDERED_EP_CONFIG compile time option is not enabled (thanks to Matthias Jahr)
-  *   - Fixed broken compilation for the AVR32 devices if the NO_SOF_EVENTS compile time option was not enabled (thanks to Matthias Jahr)
-  *   - Fixed compiler warning on GCC with \c -wundef compile flag is used (thanks to Georg Glock)
-  *   - Fixed incorrect implementation of LEDs_ToggleLEDs() for the Adafruit-U4 board (thanks to Caroline Saliman)
-  *   - Fixed broken compilation of LUFA under C++ compilers when the Serial peripheral module header file is included in a C++ source file
-  *   - Fixed missing semicolon in the UC3 architecture host pipe functions
-  *   - Fixed failed compilation for the XMEGA architecture if USB_DEVICE_ONLY us not specified
-  *   - Fixed UC3 architecture ignoring the pipe size when Pipe_ConfigurePipe() is called
-  *  - Library Applications:
-  *   - Added reliability patches to the AVRISP-MKII Clone project's PDI/TPI protocols (thanks to Justin Mattair)
-  *   - Fixed AVRISP-MKII Clone compile warning on AVR8 U4 targets even when NO_VTARGET_DETECT is enabled
-  *   - Fixed AVRISP-MKII Clone failing to start application firmware once a TPI programming session is exited
-  *   - Fixed DFU class bootloader not resetting the LED pins as high impedance inputs when a software jump to the user applications is requested
-  *   - Fixed AVRISP-MKII Clone timing out on long programming commands such as programming the EEPROM on an ATMEGA8 (thanks to Martin Kelling)
-  *   - Fixed invalid PID value used in the TempDataLogger project host application (thanks to Anupam Pathak)
-  *
-  *  \section Sec_ChangeLog111009 Version 111009
-  *  <b>New:</b>
-  *  - Core:
-  *   - Added USE_LUFA_CONFIG_HEADER compile time option to include a LUFAConfig.h header in the user director for LUFA configuration
-  *     tokens as an alternative to tokens defined in the project makefile
-  *   - Added new USB_Host_SetInterfaceAltSetting() convenience function for the selection of an interface's alternative setting
-  *   - Added Audio class control request definitions
-  *   - Added new CALLBACK_Audio_Device_GetSetEndpointProperty() callback to the Audio Device Class driver to allow for endpoint control manipulations
-  *     such as data sample rates
-  *   - Added support for the Audio class GET STATUS request in the Audio Device Class driver so that it is correctly ACKed when sent by the host
-  *   - Added new EVENT_Audio_Device_StreamStartStop() event to the Audio Device Class driver to detect stream start/stop events
-  *   - Added board driver support for the Busware TUL board
-  *   - Added board hardware driver support for the EVK1100 board
-  *   - Added board hardware driver support for the EVK1104 board
-  *   - Added new Host mode Audio Class driver
-  *   - Added new SPI_GetCurrentMode() function to the SPI peripheral driver
-  *   - Added RingBuffer_GetFreeCount() function to the Ring Buffer driver
-  *   - Added new HID_Host_SetIdlePeriod() function to the HID Host Class driver
-  *   - Added new USB_Host_ConfigurationNumber global variable to indicate the selected configuration in an attached device
-  *   - Added new USB_Host_GetDeviceStatus() function to the host standard request function set
-  *   - Added AVR USB XMEGA architecture port (currently incomplete/experimental)
-  *   - Added new STRINGIFY() and STRINGIFY_EXPANDED() convenience macros
-  *   - Added new JTAG_DISABLE() macro for the AVR8 architecture
-  *   - Added Device Qualifier standard descriptor structure definitions USB_StdDescriptor_DeviceQualifier_t and USB_Descriptor_DeviceQualifier_t
-  *  - Library Applications:
-  *   - Added RNDIS device mode to the Webserver project
-  *   - Added new incomplete AndroidAccessoryHost Host LowLevel demo
-  *   - Added new HIDReportViewer project
-  *   - Added new MediaControl project
-  *   - Added new AudioInputHost Host ClassDriver demo
-  *   - Added new AudioOutputHost Host ClassDriver demo
-  *   - Added new AudioInputHost Host LowLevel demo
-  *   - Added new AudioOutputHost Host LowLevel demo
-  *   - Added new "checksource" target to all library project makefiles
-  *   - Added new VTARGET_USE_INTERNAL_REF configuration option to the AVRISP-MKII clone project (thanks to Volker Bosch)
-  *
-  *  <b>Changed:</b>
-  *  - Core:
-  *   - Altered the definition of the USB_Audio_Descriptor_Format_t descriptor so that the user is now responsible for supplying
-  *     the supported audio sampling rates, to allow for multiple audio interfaces with different numbers of supported rates and/or
-  *     continuous sample rates
-  *   - Pipe_BoundEndpointNumber() has been renamed to Pipe_GetBoundEndpointAddress(), and now returns the correct endpoint direction
-  *     as part of the endpoint address
-  *   - Renamed global state variables that are specific to a certain USB mode to clearly indicate which mode the variable relates to,
-  *     by changing the USB_* prefix to USB_Device_* or USB_Host_*
-  *   - Removed the HOST_STATE_WaitForDeviceRemoval and HOST_STATE_Suspended host state machine states, as these are no longer required
-  *   - Altered the USB_Host_SetDeviceConfiguration() function to update the global Host state machine state and the new
-  *     USB_Host_ConfigurationNumber global as required
-  *   - Added endian correcting code to the library USB class drivers for multiple architecture support
-  *   - Removed the ENDPOINT_DESCRIPTOR_DIR_* macros, replaced by ENDPOINT_DIR_* instead
-  *   - Renamed the JTAG_DEBUG_ASSERT() macro to JTAG_ASSERT()
-  *   - Added variable number of axis to HID_DESCRIPTOR_JOYSTICK() for multi-axis joysticks above just X and Y
-  *   - Renamed USB_Host_ClearPipeStall() to USB_Host_ClearEndpointStall() as the function works on an endpoint address within the attached device,
-  *     and not a Pipe within the host
-  *   - The MS_Host_ResetMSInterface() now performs a full Mass Storage reset sequence to prevent data corruption in the event of a device
-  *     lock up or timeout (thanks to David Lyons)
-  *   - Added endian-correction to the CDC driver's Line Encoding control request handlers.
-  *  - Library Applications:
-  *   - Modified the Low Level and Class Driver AudioInput and AudioOutput demos to support multiple audio sample rates
-  *   - Updated all host mode demos and projects to use the EVENT_USB_Host_DeviceEnumerationComplete() event callback for device configuration
-  *     instead of manual host state machine manipulations in the main application task
-  *   - Changed the reports in the GenericHID device demos to control the board LEDs, to reduce user confusion over the callback routines
-  *   - Added reliability patches to the AVRISP-MKII Clone project's ISP and PDI/TPI protocols (thanks to Justin Mattair)
-  *
-  *  <b>Fixed:</b>
-  *  - Core:
-  *   - Large number of documentation and code comment corrections (thanks to Andrey from Microsin.ru)
-  *   - Fixed possibility of the AVR's SPI interface being pulled out of master mode if the /SS pin is a input and pulled low (thanks
-  *     to Andrey from Microsin.ru)
-  *   - Fixed compile error when FIXED_CONTROL_ENDPOINT_SIZE compile time option was disabled, and a USE_*_DESCRIPTORS compile time
-  *     option was not enabled on the AVR8s
-  *   - Fixed lack of C++ compatibility in some internal header files causing compile errors when using LUFA in C++ projects
-  *   - Fixed error in the pipe unordered allocation algorithm for the AVR8 devices breaking compatibility with some devices
-  *   - Fixed USB_USBTask not being called internally in stream transfers between packets when Partial Stream Transfers are used
-  *   - Fixed swapped TWI_ADDRESS_READ and TWI_ADDRESS_WRITE values
-  *   - Fixed TWI_ReadPacket() not releasing the TWI bus on read completion
-  *   - Fixed optimization error in the HID Parser item value USB_SetHIDReportItemInfo() and USB_GetHIDReportItemInfo() routines if the report item was
-  *     \c NULL (which should be allowable according to the API)
-  *   - Fixed HID Parser CALLBACK_HIDParser_FilterHIDReportItem() callback function not being passed a cacheable report item pointer
-  *   - Fixed HID Parser's largest report size bit count not including the size of the last parsed report item
-  *   - Fixed HID host driver's largest HID report size count corrupt when the number of report bits exceeds 255
-  *  - Library Applications:
-  *   - Fixed incorrect signature in the CDC and DFU class bootloaders for the ATMEGA8U2
-  *   - Fixed KeyboardHost and KeyboardHostWithParser demos displaying incorrect values when numerical keys were pressed
-  *   - Fixed compile errors in the incomplete BluetoothHost demo application (thanks to Timo Lindfors)
-  *   - Fixed incorrect Dataflash buffer use in the DataflashManager_WriteBlocks_RAM() function of several demos/projects (thanks to Jeremy Willden)
-  *   - Fixed incorrect logging interval (always 500ms longer than requested) in the TempDataLogger project
-  *   - Fixed incorrect buffer size check in the USBtoSerial project (thanks to Yuri A Nikiforov)
-  *   - Fixed port state table corruption in the TCP layer of the RNDIS Ethernet device demos
-  *
-  *  \section Sec_ChangeLog110528 Version 110528
-  *  <b>New:</b>
-  *  - Core:
-  *   - Added new ORDERED_EP_CONFIG compile time option to restrict endpoint/pipe configuration to ascending order
-  *     in exchange for a smaller compiled program binary size
-  *   - Added a new general RingBuff.h miscellaneous ring buffer library driver header
-  *   - Added new GCC_FORCE_POINTER_ACCESS() macro to correct GCC's mishandling of struct pointer accesses
-  *   - Added new GCC_MEMORY_BARRIER() macro to prevent instruction reordering across boundaries
-  *   - Added basic driver example use code to the library documentation
-  *   - Added new Endpoint_Null_Stream() and Pipe_Null_Stream() functions
-  *   - Added new ADC_GET_CHANNEL_MASK() convenience macro
-  *   - Added new HID report item macros (with HID_RI_ prefix) to allow for easy creation and editing of HID report descriptors
-  *   - Added new HID_DESCRIPTOR_MOUSE(), HID_DESCRIPTOR_KEYBOARD(), HID_DESCRIPTOR_JOYSTICK() and HID_DESCRIPTOR_VENDOR() macros
-  *     for easy automatic creation of basic USB HID device reports
-  *   - Added new MAX() and MIN() convenience macros
-  *   - Added new Serial_SendData() function to the Serial driver
-  *   - Added board driver support for the Sparkfun ATMEGA8U2 breakout board
-  *   - Added TWI baud rate prescaler and bit length parameters to the TWI_Init() function (thanks to Thomas Herlinghaus)
-  *   - Internal restructuring for eventual multiple architecture ports
-  *   - Added AVR32 UC3 architecture port (currently incomplete/experimental)
-  *   - Added new architecture independent functions to enable, disable, save and restore the Global Interrupt Enable flags
-  *   - Added new RNDIS Device Class Driver packet send and receive functions
-  *  - Library Applications:
-  *   - Added ability to write protect Mass Storage disk write operations from the host OS
-  *   - Added new MIDIToneGenerator project
-  *   - Added new KeyboardMouseMultiReport Device ClassDriver demo
-  *   - Added new VirtualSerialMassStorage Device ClassDriver demo
-  *   - Added HID class bootloader, compatible with a modified version of the command line Teensy loader from PJRC.com
-  *   - Added LED flashing to the CDC and DFU class bootloaders to indicate when they are running
-  *
-  *  <b>Changed:</b>
-  *  - Core:
-  *   - Unordered Endpoint/Pipe configuration is now allowed once again by default via the previous reconfig workaround
-  *   - Refactored Host mode Class Driver *_Host_ConfigurePipes() routines to be more space efficient when compiled
-  *   - Added new *_ENUMERROR_PipeConfigurationFailed error codes for the *_Host_ConfigurePipes() routines
-  *   - The USARTStream global is now public and documented in the SerialStream module, allowing for the serial USART
-  *     stream to be accessed via its handle rather than via the implicit stdout and stdin streams
-  *   - The FAST_STREAM_TRANSFERS compile time option has been removed due to lack of use and low cost/benefit ratio
-  *   - Altered all endpoint/pipe stream transfers so that the new BytesProcessed parameter now points to a location
-  *     where the number of bytes in the transfer that have been completed can be stored (or NULL if entire transaction
-  *     should be performed in one chunk)
-  *   - The NO_STREAM_CALLBACKS compile time option has now been removed due to the new partial stream transfer feature
-  *   - Changed over all project and demo HID report descriptors to use the new HID report item macros
-  *   - Moved the HIDParser.c source file to the LUFA/Drivers/USB/Class/Common/ directory from the LUFA/Drivers/USB/Class/Host/
-  *   - Added support to the HID parser for extended USAGE items that contain the usage page as well as the usage index
-  *   - Removed the SerialStream driver, rolled functionality into the regular Serial peripheral driver via the new
-  *     Serial_CreateStream() and Serial_CreateBlockingStream() functions
-  *   - Renamed the low level Serial byte send/receive functions, to be consistent with the CDC class driver byte functions
-  *   - Altered the behaviour of the serial byte reception function so that is is non-blocking, and now returns a negative
-  *     value if no character is received (to remain consistent with the CDC class driver byte reception routines)
-  *   - Renamed the PRNT_Host_SendString(), CDC_Host_SendString() and CDC_Device_SendString() functions to *_SendData(), and
-  *     added new versions of the *_SendString() routines that expect a null terminated string instead
-  *   - Renamed all driver termination *_ShutDown() functions to the more logical name *_Disable()
-  *   - Reduced latency for executing the Start-Of-Frame events (if enabled in the user application)
-  *   - Removed Pipe_ClearErrorFlags(), pipe error flags are now automatically cleared when Pipe_ClearError() is called
-  *   - Endpoint_ResetFIFO() renamed to Endpoint_ResetEndpoint(), to be consistent with the Pipe_ResetPipe() function name
-  *   - Implemented on-demand PLL clock generation for the U4, U6 and U7 series USB AVRs when automatic PLL mode is specified
-  *   - F_CLOCK changed to F_USB to be more descriptive, and applicable on future architecture ports
-  *   - Renamed all low level Endpoint_Read_*, Endpoint_Write_* and Endpoint_Discard_* functions to use the number of bits instead of
-  *     a symbolic size (Byte, Word, DWord) so that the function names are applicable and correct across all architectures
-  *   - Renamed all low level Pipe_Read_*, Pipe_Write_* and Pipe_Discard_* functions to use the number of bits instead of
-  *     a symbolic size (Byte, Word, DWord) so that the function names are applicable and correct across all architectures
-  *   - Separated out board drivers by architecture in the library internals for better organisation
-  *  - Library Applications:
-  *   - Changed the XPLAINBridge software UART to use the regular timer CTC mode instead of the alternative CTC mode
-  *     via the Input Capture register, to reduce user confusion
-  *   - Combined page and word ISP programming mode code in the AVRISP-MKII clone project to reduce compiled size and
-  *     increase maintainability of the code
-  *   - Changed over library projects to use the new general ring buffer library driver module
-  *   - Added new high level TWI packet read/write commands, altered behaviour of the TWI_StartTransmission() function
-  *   - Changed TempDataLogger project's DS1307 driver to simplify the function interface and prevent a possible race condition
-  *   - Changed AVRISP-MKII project to use the Watchdog interrupt for command timeouts, to reduce CPU usage and free timer 0
-  *     for other uses
-  *   - Updated the software USART code in the XPLAIN Bridge application so that the incoming bits are sampled at their mid-point
-  *     instead of starting point, to give maximum reliability (thanks to Anton Staaf)
-  *
-  *  <b>Fixed:</b>
-  *  - Core:
-  *   - Fixed broken USBFOO board drivers due to missing BOARD_USBFOO define
-  *   - Fixed HID host class driver incorrectly binding to HID devices that do not have an OUT endpoint
-  *   - Fixed incorrect definition of the HID_KEYBOARD_SC_D constant in the HID class driver (thanks to Opendous Inc.)
-  *   - Fixed incorrect definition of the HID_KEYBOARD_SC_RIGHT_ARROW constant in the HID class driver (thanks to Joby Taffey)
-  *   - Fixed incorrect endpoint initialisation order in the several device demos (thanks to Rick Drolet)
-  *   - Fixed inverted Minimus board LEDs
-  *   - Fixed incorrect byte ordering in the Audio_Device_WriteSample24 function (thanks to WZab)
-  *   - Fixed several functions in the Host mode Still Image Class driver returning an error code from the incorrect
-  *     error code enum (thanks to Daniel Seibert)
-  *   - Fixed ReportID not being removed from the feature/out report data array in the HID class driver when Report IDs are used
-  *   - Fixed incorrect BUTTONS_BUTTON1 definition for the Minimus board
-  *   - Fixed Still Image Host class driver exiting the descriptor search routine prematurely if the data pipes (but not event pipe)
-  *     is found
-  *   - Fixed missing call to Pipe_SetInfiniteINRequests() in the Pipe_ConfigurePipe() routine
-  *   - Fixed Remote Wakeup broken on the AVRs due to the mechanism only operating when the SUSPI bit is set (thanks to Holger Steinhaus)
-  *   - Fixed possible invalid program execution when in host mode if corrupt descriptor lengths are supplied by the attached device
-  *  - Library Applications:
-  *   - Fixed Benito project discarding incoming data from the USB virtual serial port when the USART is busy
-  *   - Fixed broken DFU bootloader, added XPLAIN support for bootloader start when XCK jumpered to ground
-  *   - Fixed broken HID_REQ_GetReport request handler in the Low Level GenericHID demo
-  *   - Fixed possible lost data in the XPLAINBridge, USBtoSerial and Benito projects when the host exceeds the packet
-  *     timeout period on received packets as set by USB_STREAM_TIMEOUT_MS (thanks to Justin Rajewski)
-  *   - Fixed possible programming problem in the AVRISP-MKII clone project when programming specific patterns into a target
-  *     memory space that is only byte (not page) addressable
-  *   - Fixed errors in the incomplete Test and Measurement device demo preventing proper operation (thanks to Pavel Plotnikov)
-  *   - Fixed programming errors in the AVRISP-MKII project when the programming packet is a round multiple of the endpoint bank
-  *     size under avrdude (thanks to Steffan Woltjer)
-  *
-  *
-  *  \section Sec_ChangeLog101122 Version 101122
-  *  <b>New:</b>
-  *  - Core:
-  *    - Added new SCSI_ASENSE_NOT_READY_TO_READY_CHANGE constant to the Mass Storage class driver, to indicate when a previously
-  *      not ready removable medium has now become ready for the host's use (thanks to Martin Degelsegger)
-  *    - Moved the Pipe and Endpoint stream related code to two new USB library core source files EndpointStream.c and PipeStream.c
-  *    - Added new USB_Device_GetFrameNumber() and USB_Host_GetFrameNumber() functions to retrieve the current USB frame number
-  *    - Added new USB_Host_EnableSOFEvents(), USB_Host_DisableSOFEvents() and EVENT_USB_Host_StartOfFrame() for the user application
-  *      handling of USB Start of Frame events while in USB Host mode
-  *    - Added new PRNT_Host_BytesReceived(), PRNT_Host_ReceiveByte(), PRNT_Host_SendByte() and PRNT_Host_Flush() functions to the
-  *      Print Host Class driver
-  *    - Added class specific descriptor alternative struct type defines with standard USB-IF element naming
-  *    - Added new project makefile template to the library and moved board driver stub files into in a new "CodeTemplates" directory
-  *    - Added board hardware driver support for the Adafruit U4 breakout board
-  *    - Added board hardware driver support for the Arduino Uno development board
-  *    - Added board hardware driver support for the Blackcat USB JTAG board (thanks to the PSGroove team)
-  *    - Added board hardware driver support for the Busware BUI development board
-  *    - Added board hardware driver support for the Busware CUL V3 868MHZ radio board (thanks to Dirk Tostmann)
-  *    - Added board hardware driver support for the Kernel Concepts USBFOO development board
-  *    - Added board hardware driver support for the Linnix UDIP development board
-  *    - Added board hardware driver support for the Olimex AVR-USB-162 development board (thanks to Steve Fawcett)
-  *    - Added board hardware driver support for the Maximus board (thanks to the PSGroove team)
-  *    - Added board hardware driver support for the Microsin AVR-USB162 breakout board
-  *    - Added board hardware driver support for the Minimus board (thanks to the PSGroove team)
-  *    - Added new NO_CLASS_DRIVER_AUTOFLUSH compile time option to disable automatic flushing of interfaces when the USB management
-  *      tasks for each driver is called
-  *    - Added standard keyboard HID report scan-code defines (thanks to Laszlo Monda)
-  *    - Added new Pipe_GetBusyBanks(), Endpoint_GetBusyBanks() and Endpoint_AbortPendingIN() functions
-  *  - Library Applications:
-  *    - Added default test tone generation mode to the Device mode AudioInput demos
-  *    - Added new NO_BLOCK_SUPPORT, NO_EEPROM_BYTE_SUPPORT, NO_FLASH_BYTE_SUPPORT and NO_LOCK_BYTE_WRITE_SUPPORT compile time options to the
-  *      CDC class bootloader
-  *    - Added new XCK_RESCUE_CLOCK_ENABLE compile time option to the AVRISP-MKII clone programmer project (thanks to Tom Light)
-  *
-  *  <b>Changed:</b>
-  *  - Core:
-  *    - Removed complicated logic for the Endpoint_ConfigureEndpoint() function to use inlined or function called versions
-  *      depending of if the given bank size is a compile time constant, as the compiler does a better job of optimizing
-  *      with basic code
-  *    - Changed the signature of the CALLBACK_USB_GetDescriptor() callback function so that the descriptor pointer is const, to remove
-  *      the need for extra casting inside the callback (thanks to Jonathan Kollasch)
-  *    - Reduced HOST_DEVICE_SETTLE_DELAY_MS to 1000ms down from 1500ms to improve device compatibility while in USB Host mode
-  *    - Removed the EVENT_USB_InitFailure() event, not specifying a USB mode correctly now defaults to UID selection mode
-  *    - Renamed and moved class driver common constant definitions to make the naming scheme more uniform
-  *    - Moved the USB mode specifier constants into a new enum, so that they are semantically related to one another
-  *    - Renamed ENDPOINT_DOUBLEBANK_SUPPORTED() to ENDPOINT_BANKS_SUPPORTED() and changed it to return the maximum number of supported banks for
-  *      the given endpoint
-  *    - Better algorithm to extract and convert the internal device serial number into a string descriptor (if present)
-  *    - All USB class drivers are now automatically included when LUFA/Drivers/USB.h is included, and no longer need to be separately included
-  *    - The MIDI class drivers now automatically flushes the MIDI interface when the MIDI class driver's USBTask() function is called
-  *    - Renamed the EVENT_USB_Device_UnhandledControlRequest() event to EVENT_USB_Device_ControlRequest() as it is now fired before the library
-  *      request handlers, not afterwards
-  *  - Library Applications:
-  *    - Changed over all device demos to use a clearer algorithm for the configuring of the application's endpoints
-  *    - Added missing DataflashManager_CheckDataflashOperation() function to the MassStorageKeyboard demo, removed redundant
-  *      SCSI_Codes.h file as these values are part of the MassStorage Class Driver
-  *    - Added compile time error to the AVRISP-MKII project when built for the U4 chips, as the default VTARGET detection ADC channel
-  *      does not exist on these chips (thanks to Marco)
-  *    - Changed all Device mode LowLevel demos and Device Class drivers so that the control request is acknowledged and any data
-  *      transferred as quickly as possible without any processing in between sections, so that long callbacks or event handlers will
-  *      not break communications with the host by exceeding the maximum control request stage timeout period
-  *    - Changed over all demos, drivers and internal functions to use the current frame number over the Start of Frame flag where possible
-  *      to free up the Start of Frame flag for interrupt use in the user application
-  *    - All project makefiles now correctly clean intermediate build files from assembly and C++ sources (thanks to Daniel Czigany)
-  *    - Changed default value for the reset polarity parameter in the AVRISP-MKII project so that it defaults to active low drive
-  *    - Changed configuration descriptor parser for all host mode projects and class drivers to ensure better compatibility with devices
-  *    - All LowLevel demos changed to use the constants and types defined in the USB class drivers
-  *    - Changed AudioInput and AudioOutput demos to reload the next sample via an interrupt rather than polling the sample timer
-  *    - Rescue clock of the AVRISP-MKII moved to the AVR's OCR1A pin, so that the clock can be generated at all times
-  *    - Changed ClassDriver MIDI demos to process all incoming events in a loop until the bank becomes empty rather than one at a time
-  *    - Changed LowLevel MIDI demos to only clear the incoming event bank once it has become empty to support packed event packets
-  *
-  *  <b>Fixed:</b>
-  *  - Core:
-  *    - Fixed USB_GetHIDReportItemInfo() function modifying the given report item's data when the report item does not exist
-  *      within the supplied report of a multiple report HID device
-  *    - Fixed critical pipe/endpoint memory allocation issue where the bank memory address space could be silently overlapped
-  *      in the USB controller if the endpoints or pipes were allocated in anything other than ascending order (thanks to Martin Degelsegger)
-  *    - Added LEDs_ToggleLEDs() function to several board LED drivers which were missing it (thanks to Andrei Krainev)
-  *    - Fixed SET FEATURE and CLEAR FEATURE control requests directed at an unconfigured endpoint causing request timeouts
-  *    - Fixed USB_Host_ClearPipeStall() incorrectly determining the endpoint direction from the currently selected pipe
-  *    - Fixed JTAG_DEBUG_POINT() and JTAG_DEBUG_BREAK() macros not compiling under pure C99 standards mode
-  *    - Fixed endpoint selection within the CALLBACK_HID_Device_CreateHIDReport() callback function causing broken GET REPORT requests
-  *    - Fixed incorrect command name for EEPROM memory programming in the makefile dfu-ee target
-  *    - Fixed incorrect LEDs_ChangeLEDs() function in the Benito board LED driver
-  *    - Fixed incorrect USB_DeviceState value when unconfiguring the device without an address set
-  *    - Fixed SPI driver not explicitly setting /SS and MISO pins as inputs when SPI_Init() is called
-  *    - Fixed random enumeration failure while in device mode due to interrupts causing the Set Address request to exceed maximum timings
-  *    - Fixed MIDI_Host_Flush() not aborting early when the specified MIDI host interface was not configured
-  *    - Fixed MIDI class driver send routines silently discarding packets if the endpoint or pipe is busy (thanks to Robin Green)
-  *  - Library Applications:
-  *    - Fixed MassStorage based demos and projects resetting the SCSI sense values before the command is executed, leading to
-  *      missed SCSI sense values when the host retrieves the sense key (thanks to Martin Degelsegger)
-  *    - Fixed USBtoSerial and Benito project SetLineEncoding calls failing if the USART is busy, due to the RX ISR delaying the control
-  *      request handler
-  *    - Fixed LowLevel PrinterHost demo not sending control requests to the attached printer with the correct printer interface wIndex value
-  *    - Fixed incorrect signature reported in the CDC class bootloader for the ATMEGA32U2
-  *    - Fixed BootloaderCDC project failing on some operating systems due to removed Line Encoding options (thanks to Alexey Belyaev)
-  *    - Fixed broken FLASH/EEPROM programming in the AVRISP-MKII clone project when writing in non-paged mode and the polling byte cannot be used
-  *    - Fixed ISR definition conflict in the XPLAIN bridge between the software UART and the AVRISP-MKII ISP modules
-  *    - Fixed USBtoSerial and XPLAINBridge demos discarding data from the PC if the send buffer becomes full
-  *    - Fixed broken input in the MagStripe reader project due to an incorrect HID report descriptor
-  *    - Fixed incorrect PollingIntervalMS values in the demo/project/bootloader endpoint descriptors (thanks to MCS Electronics)
-  *    - Fixed AVRISP-MKII clone project not starting the target's program automatically after exiting TPI programming mode
-  *
-  *
-  *  \section Sec_ChangeLog100807 Version 100807
-  *  <b>New:</b>
-  *  - Added new ADC_DisableChannel() function (thanks to Mich Davis)
-  *  - Added new VTARGET_REF_VOLTS and VTARGET_SCALE_FACTOR compile time defines to the AVRISP-MKII programmer project to set
-  *    the VTARGET reference voltage and scale factor
-  *  - Added new pgm_read_ptr() macro to Common.h for reading of pointers out of flash memory space
-  *  - Added new SWAPENDIAN_16() and SWAPENDIAN_32() macros to Common.h for statically initialized variables at compile time
-  *  - Added new Drivers/USB/LowLevel/Device.c file to house Device mode specific functions that are more complicated than simple macros
-  *  - Added new AVRStudio 4 project files for all library demos, projects and bootloaders
-  *  - Added ability to set the serial baud rate via the user's terminal in the XPLAINBridge project
-  *  - Added new LUFA module variables for the different source modules in the core library makefile to simplify project makefiles
-  *  - Added start of a new Test and Measurement class demo (thanks to Peter Lawrence)
-  *  - Added new SPI_ORDER_* data order masks to the SPI peripheral driver
-  *  - Added support to the AVRISP-MKII project for ISP speeds slower than 125KHz via a new software SPI driver
-  *  - Added support for the new button/LED on the latest model USBTINY-MKII
-  *
-  *  <b>Changed:</b>
-  *  - The RingBuff library code has been replaced in the XPLAINBridge, Benito and USBtoSerial projects with an ultra lightweight
-  *    ring buffer to help improve the reliability of the projects
-  *  - The EEPROM stream read/write functions now use eeprom_update_byte() instead of eeprom_write_byte(), so that only
-  *    changed bytes are written to EEPROM to preserve its lifespan
-  *  - Changed over the AVRISP-MKII and TemperatureDataLogger projects to use eeprom_update_byte() when writing non-volatile
-  *    parameters to EEPROM to preserve its lifespan
-  *  - Removed unused line encoding data and control requests from the CDC Bootloader code, to save space
-  *  - Renamed SERIAL_STREAM_ASSERT() macro to STDOUT_ASSERT()
-  *  - The USB_Device_IsRemoteWakeupSent() and USB_Device_IsUSBSuspended() macros have been deleted, as they are now obsolete
-  *  - Rewrote the implementation of the SwapEndian_16() and SwapEndian_32() functions so that they compile down in most instances to
-  *    minimal loads and stores rather than complicated shifts
-  *  - The software UART in the XPLAINBridge has been largely altered to try to improve upon its performance and reliability
-  *  - The USBtoSerial and Benito projects now flushes received data via a flush timer, so that several bytes can be transmitted at once
-  *  - Removed the automated checking of event names in the demo, project and bootloader makefiles due to inconsistencies between the
-  *    behaviour of the command line tools used to perform the check on each platform
-  *  - Internal USB driver source files renamed and moved to ease future possible architecture ports
-  *  - All internal pseudo-function macros have been converted to true inline functions for type-safety and readability
-  *  - Changed LED indicator masks for the AVRISP-MKII project, so that there are defined roles for each LED
-  *  - Altered the CDC Device and Host Class drivers' receive byte routines, so that no data is indicated by the function returning a
-  *    negative value (thanks to Andreas Paulin)
-  *  - Added auto flushing of OUT data to the CDC Host Class driver's USBTask function to automatically flush the send pipe buffer
-  *
-  *  <b>Fixed:</b>
-  *  - Fixed AVRISP project sending a LOAD EXTENDED ADDRESS command to 128KB AVRs after programming or reading from
-  *    the last page of FLASH (thanks to Gerard Sexton)
-  *  - Fixed AVRISP project not sending a full erase-and-write EEPROM command to XMEGA targets when writing to the EEPROM
-  *    instead of the split write-only command (thanks to Tim Margush)
-  *  - Fixed RNDISEthernet demos crashing when calculating checksums for Ethernet/TCP packets of more than ~500 bytes due to
-  *    an overflow in the checksum calculation loop (thanks to Kevin Malec)
-  *  - Fixed XPLAINBridge project not correctly reading the XMEGA's supply voltage when reporting back to the host
-  *  - Fixed incorrect signature for the ATMEGA32U2 in the DFU bootloader (thanks to Axel Rohde)
-  *  - Fixed internal device serial not being accessible on the ATMEGAXXU2 AVRs (thanks to Axel Rohde)
-  *  - Fixed void pointer arithmetic in ConfigDescriptor.h breaking C++ compatibility (thanks to Michael Hennebry)
-  *  - Fixed broken PDI EEPROM Section Erase functionality in the AVRISP-MKII project
-  *  - Fixed USB_Device_SendRemoteWakeup() not working when the USB clock was frozen during USB bus suspend (thanks to Brian Dickman)
-  *  - Fixed occasional lockup of the AVRISP project due to the timeout extension code incorrectly extending the timeout in
-  *    PDI and TPI programming modes infinitely
-  *  - Fixed HID device class driver still using PrevReportINBuffer for GetReport control requests even when it has been
-  *    set to NULL by the user application (thanks to Axel Rohde)
-  *  - Fixed MIDI_Device_SendEventPacket() not correctly waiting for the endpoint to become ready (thanks to Robin Green)
-  *  - Fixed Benito and USBtoSerial projects not turning off the USART before reconfiguring it, which could cause incorrect
-  *    operation to occur (thanks to Bob Paddock)
-  *  - Fixed Serial peripheral driver not turning off the USART before reconfiguring it, which would cause incorrect operation
-  *    to occur (thanks to Bob Paddock)
-  *  - Fixed software application start command broken in the DFU class bootloader when dfu-programmer is used due to application
-  *    start address corruption
-  *
-  *
-  *  \section Sec_ChangeLog100513 Version 100513
-  *  <b>New:</b>
-  *  - Added incomplete MIDIToneGenerator project
-  *  - Added new Relay Controller Board project (thanks to OBinou)
-  *  - Added board hardware driver support for the Teensy, USBTINY MKII, Benito and JM-DB-U2 lines of third party USB AVR boards
-  *  - Added new ATTR_NO_INIT variable attribute for global variables that should not be automatically cleared on startup
-  *  - Added new ENDPOINT_*_BusSuspended error code to the Endpoint function, so that the stream functions early-abort if the bus
-  *    is suspended before or during a transfer
-  *  - Added new EVENT_CDC_Device_BreakSent() event and CDC_Host_SendBreak() function to the Device and Host CDC Class drivers
-  *  - Added ReportType parameter to the HID device class driver CALLBACK_HID_Device_ProcessHIDReport() function so that FEATURE
-  *    reports from the host to the device can be correctly processed
-  *  - Added ReportType parameter to the HID host class driver HID_Host_SendReportByID() function so that FEATURE reports can be
-  *    issued to the attached device
-  *
-  *  <b>Changed:</b>
-  *  - AVRISP programmer project now has a more robust timeout system
-  *  - Added a timeout value to the TWI_StartTransmission() function, within which the addressed device must respond
-  *  - Webserver project now uses the board LEDs to indicate the current IP configuration state
-  *  - Added ENABLE_TELNET_SERVER compile time option to the Webserver project to disable the TELNET server if desired
-  *  - Increased throughput of the USBtoSerial demo on systems that send multiple bytes per packet (thanks to Opendous Inc.)
-  *  - Double bank CDC endpoints in the XPLAIN Bridge project, re-enable JTAG once the mode selection pin has been sampled.
-  *  - Standardized the naming scheme given to configuration descriptor sub-elements in the Device mode demos, bootloaders
-  *    and projects
-  *  - All Class Driver Host mode demos now correctly set the board LEDs to READY once the enumeration process has completed
-  *  - Added LIBUSB_FILTERDRV_COMPAT compile time option to the AVRISP programmer project to make the code compatible with Windows
-  *    builds of avrdude at the expense of AVRStudio compatibility
-  *  - Removed two-step endpoint/pipe bank clear and switch sequence for smaller, faster endpoint/pipe code
-  *  - The USB_Init() function no longer calls sei() - the user is now responsible for enabling interrupts when they are ready
-  *    for them to be enabled (thanks to Andrei Krainev)
-  *  - The Audio_Device_IsSampleReceived() and Audio_Device_IsReadyForNextSample() functions are now inline, to reduce overhead
-  *  - Removed the cast to uint16_t on the set baud rate in the USBtoSerial project, so that the higher >1M baud rates can be
-  *    selected (thanks to Steffan Woltjer)
-  *  - Removed software PDI and TPI emulation from the AVRISP-MKII clone project as it was very buggy and slow - PDI and TPI must
-  *    now be implemented via separate programming headers
-  *  - The CDC class bootloader now uses a watchdog reset rather than a soft-reset when exited to ensure that all hardware is
-  *    properly reset to their defaults
-  *  - Device mode class driver callbacks are now fired before the control request status stage is sent to prevent the host from
-  *    timing out if another request is immediately fired and the device has a lengthy callback routine
-  *  - The TeensyHID bootloader has been removed, per request from Paul at PJRC
-  *  - The LIBUSB_FILTERDRV_COMPAT compile time option in the XPLAINBridge and AVRISP-MKII projects has been renamed
-  *    LIBUSB_DRIVER_COMPAT, as it applies to all software on all platforms using the libUSB driver
-  *
-  *  <b>Fixed:</b>
-  *  - Fixed possible device lockup when INTERRUPT_CONTROL_ENDPOINT is enabled and the control endpoint is not properly
-  *    selected when the ISR completes
-  *  - Fixed AVRISP-MKII clone project not correctly issuing LOAD EXTENDED ADDRESS commands when the extended address
-  *    boundary is crossed during programming or read back (thanks to Gerard Sexton)
-  *  - Fixed warnings when building the AVRISP-MKII clone project with the ENABLE_XPROG_PROTOCOL compile time option disabled
-  *  - Fixed software PDI/TPI programming mode in the AVRISP project not correctly toggling just the clock pin
-  *  - Fixed TWI_StartTransmission() corrupting the contents of the GPIOR0 register
-  *  - Fixed TWI driver not aborting when faced with no response after attempting to address a device on the bus
-  *  - Fixed ADC routines not correctly returning the last result when multiple channels were read
-  *  - Fixed ADC routines failing to read the extended channels (Channels 8 to 13, Internal Temperature Sensor) on the
-  *    U4 series USB AVR parts
-  *  - Fixed LowLevel MassStorage demo broken on the U2 series USB AVRs due to unsupported double-banked endpoint modes used
-  *  - Fixed compilation error in the AudioInput demos when MICROPHONE_BIASED_TO_HALF_RAIL is defined (thanks to C. Scott Ananian)
-  *  - Fixed incorrect definition of HID_ALIGN_DATA() causing incorrect HID report item data alignment
-  *  - Fixed Still Image Host class driver not resetting the transaction ID when a new session is opened, fixed driver not sending
-  *    a valid session ID to the device
-  *  - Removed invalid dfu and flip related targets from the bootloaders - bootloaders can only be replaced with an external programmer
-  *  - Fixed Set/Clear Feature requests directed to a non-configured endpoint not returning a stall to the host
-  *  - Fixed HID Device Class Driver not allocating a temporary buffer when the host requests a report via the control endpoint and the
-  *    user has set the PrevReportINBuffer driver configuration element to NULL (thanks to Lars Noschinski)
-  *  - Fixed device state not being reset to DEVICE_STATE_Default if the host sets a 0x00 device address
-  *  - Fixed device not stalling configuration requests before the device's address has been set
-  *  - Fixed possibility of internal signature retrieval being corrupted if an interrupt occurs during a signature byte
-  *    read (thanks to Andrei Krainev)
-  *  - Fixed device state not being reset back to the default state if the host sets the address to 0
-  *  - Fixed Set Configuration requests not being stalled until the host has set the device's address
-  *  - Fixed Host mode HID class driver not sending the correct report type when HID_Host_SendReportByID() was called and the
-  *    HID_HOST_BOOT_PROTOCOL_ONLY compile time option is set
-  *  - Fixed INTERRUPT_CONTROL_ENDPOINT compile time option preventing other interrupts from occurring while the control endpoint
-  *    request is being processed, causing possible lockups if a USB interrupt occurs during a transfer
-  *  - Remove incorrect Abstract Call Management class specific descriptor from the CDC demos, bootloaders and projects
-  *
-  *
-  *  \section Sec_ChangeLog100219 Version 100219
-  *
-  *  <b>New:</b>
-  *  - Added TPI programming support for 6-pin ATTINY devices to the AVRISP programmer project (thanks to Tom Light)
-  *  - Added command timeout counter to the AVRISP project so that the device no longer freezes when incorrectly connected
-  *    to a target
-  *  - Added new TemperatureDataLogger application, a USB data logger which writes to the device's dataflash and appears to
-  *    the host as a standard Mass Storage device when inserted
-  *  - Added MIDI event packing support to the MIDI Device and Host mode Class drivers, allowing for multiple MIDI events to
-  *    sent or received in packed form in a single USB packet
-  *  - Added new MIDI send buffer flush routines to the MIDI Device and Host mode Class drivers, to flush packed events
-  *  - Added master mode hardware TWI driver for easy TWI peripheral control
-  *  - Added ADC MUX masks for the standard ADC input channels on all AVR models with an ADC, altered demos to use these masks
-  *    as on some models, the channel number is not identical to its single-ended ADC MUX mask
-  *  - New Webserver project, a RNDIS host USB webserver using the open source uIP TCP/IP network stack and FatFS library
-  *  - New BOARD value option BOARD_NONE (equivalent to not specifying BOARD) which will remove all board hardware drivers which
-  *    do not adversely affect the code operation (currently only the LEDs driver)
-  *  - Added keyboard modifier masks (HID_KEYBOARD_MODIFER_*) and LED report masks (KEYBOARD_LED_*) to the HID class driver and
-  *    Keyboard demos
-  *  - Added .5MHz recovery clock to the AVRISP programmer project when in ISP programming mode to correct mis-set fuses
-  *
-  *  <b>Changed:</b>
-  *  - Slowed down software USART carried PDI programming in the AVRISP project to prevent transmission errors
-  *  - Renamed the AVRISP project folder to AVRISP-MKII to reduce confusion
-  *  - Renamed the RESET_LINE_* makefile tokens in the AVRISP MKII Project to AUX_LINE_*, as they are not always used for target
-  *    reset
-  *  - Changed over the MassStorageKeyboard Class driver device demo to use Start of Frame events rather than a timer to keep track
-  *    of elapsed milliseconds
-  *  - Inlined currently unused (but standardized) maintenance functions in the Device and Host Class drivers to save space
-  *  - The XPLAINBridge project now selects between a USB to Serial bridge and a PDI programmer on startup, reading the JTAG port's
-  *    TDI pin to determine which mode to use
-  *  - Removed the stream example code from the Low Level VirtualSerial demos, as they were buggy and only served to add clutter
-  *
-  *  <b>Fixed:</b>
-  *  - Fixed AVRISP project not able to enter programming mode when ISP protocol is used
-  *  - Fixed AVRISP PDI race condition where the guard time between direction changes could be interpreted as a start bit
-  *  - Fixed ADC_IsReadingComplete() returning an inverted result
-  *  - Fixed blocking CDC streams not aborting when the host is disconnected
-  *  - Fixed XPLAIN board Dataflash driver broken due to incorrect preprocessor commands
-  *  - Fixed inverted XPLAIN LED driver output (LED turned on when it was supposed to be turned off, and vice-versa)
-  *  - Fixed Class Driver struct interface numbers in the KeyboardMouse and VirtualSerialMouse demos (thanks to Renaud Cerrato)
-  *  - Fixed invalid USB controller PLL prescaler values for the ATMEGAxxU2 controllers
-  *  - Fixed lack of support for the ATMEGA32U2 in the DFU and CDC class bootloaders
-  *  - Fixed Benito project not resetting the target AVR automatically when programming has completed
-  *  - Fixed DFU bootloader programming not discarding the correct number of filler bytes from the host when non-aligned programming
-  *    ranges are specified (thanks to Thomas Bleeker)
-  *  - Fixed CDC and RNDIS host demos and class drivers - bidirectional endpoints should use two separate pipes, not one half-duplex pipe
-  *  - Fixed Pipe_IsEndpointBound() not taking the endpoint's direction into account
-  *  - Fixed EEPROM and FLASH ISP programming in the AVRISP project
-  *  - Fixed incorrect values of USB_CONFIG_ATTR_SELFPOWERED and USB_CONFIG_ATTR_REMOTEWAKEUP tokens (thanks to Claus Christensen)
-  *  - Fixed SerialStream driver blocking while waiting for characters to be received instead of returning EOF
-  *  - Fixed SerialStream driver not setting stdin to the created serial stream (thanks to Mike Alexander)
-  *  - Fixed USB_GetHIDReportSize() returning the number of bits in the specified report instead of bytes
-  *  - Fixed AVRISP project not extending the command delay after each successful page/word/byte program
-  *  - Fixed accuracy of the SERIAL_UBBRVAL() and SERIAL_2X_UBBRVAL() macros for higher baud rates (thanks to Renaud Cerrato)
-  *
-  *
-  *  \section Sec_ChangeLog091223 Version 091223
-  *
-  *  <b>New:</b>
-  *  - Added activity LED indicators to the AVRISP project to indicate when the device is busy processing a command
-  *  - The USB target family and allowable USB mode tokens are now public and documented (USB_CAN_BE_*, USB_SERIES_*_AVR)
-  *  - Added new XPLAIN USB to Serial Bridge project (thanks to John Steggall for initial proof-of-concept, David Prentice
-  *    and Peter Danneger for revised software USART code)
-  *  - Added new RNDIS Ethernet Host LowLevel demo
-  *  - Added new RNDIS Ethernet Host Class Driver
-  *  - Added new RNDIS Ethernet Host ClassDriver demo
-  *  - Added CDC_Host_Flush() function to the CDC Host Class driver to flush sent data to the attached device
-  *  - Added PDI programming support for XMEGA devices to the AVRISP programmer project (thanks to Justin Mattair)
-  *  - Added support for the XPLAIN board Dataflash, with new XPLAIN_REV1 board target for the different Dataflash used
-  *    on the first revision boards compared to the one mounted on later revisions
-  *  - Added new HID_ALIGN_DATA() macro to return the pre-retrieved value of a HID report item, left-aligned to a given datatype
-  *  - Added new PreviousValue to the HID Report Parser report item structure, for easy monitoring of previous report item values
-  *  - Added new EVK527 board target
-  *  - Added new USB_Host_GetDeviceStringDescriptor() convenience function
-  *  - Added new LEDNotification project to the library, to give a visual LED notification on new events from the host
-  *  - Added new NO_DEVICE_REMOTE_WAKEUP and NO_DEVICE_SELF_POWER compile time options
-  *
-  *  <b>Changed:</b>
-  *  - Removed code in the Keyboard demos to send zeroed reports between two reports with differing numbers of key codes
-  *    as this relied on non-standard OS driver behaviour to repeat key groups
-  *  - The SCSI_Request_Sense_Response_t and SCSI_Inquiry_Response_t type defines are now part of the Mass Storage Class
-  *    driver common defines, rather than being defined in the Host mode Class driver section only
-  *  - The USB_MODE_HOST token is now defined even when host mode is not available
-  *  - The CALLBACK_HID_Device_CreateHIDReport() HID Device Class driver callback now has a new ReportType parameter to
-  *    indicate the report type to generate
-  *  - All Class Drivers now return false or the "DeviceDisconnected" error code of their respective error enums when a function
-  *    is called when no host/device is connected where possible
-  *  - The HOST_SENDCONTROL_DeviceDisconnect enum value has been renamed to HOST_SENDCONTROL_DeviceDisconnected to be in line
-  *    with the rest of the library error codes
-  *  - Make MIDI device demos also turn off the on board LEDs if MIDI Note On messages are sent with a velocity of zero,
-  *    which some devices use instead of Note Off messages (thanks to Robin Green)
-  *  - The CDC demos are now named "VirtualSerial" instead to indicate the demos' function rather than its implemented USB class,
-  *    to reduce confusion and to be in line with the rest of the LUFA demos
-  *  - The SImage_Host_SendBlockHeader() and SImage_Host_ReceiveBlockHeader() Still Image Host Class driver functions are now public
-  *
-  *  <b>Fixed:</b>
-  *  - Added missing CDC_Host_CreateBlockingStream() function code to the CDC Host Class driver
-  *  - Fixed incorrect values for REPORT_ITEM_TYPE_* enum values causing corrupt data in the HID Host Parser
-  *  - Fixed misnamed SI_Host_USBTask() and SI_Host_ConfigurePipes() functions
-  *  - Fixed broken USB_GetNextDescriptor() function causing the descriptor to jump ahead double the expected amount
-  *  - Fixed Pipe_IsEndpointBound() not masking the given Endpoint Address against PIPE_EPNUM_MASK
-  *  - Fixed host state machine not enabling Auto VBUS mode when HOST_DEVICE_SETTLE_DELAY_MS is set to zero
-  *  - Fixed misnamed Pipe_SetPipeToken() macro for setting a pipe's direction
-  *  - Fixed CDCHost failing on devices with bidirectional endpoints
-  *  - Fixed USB driver failing to define the PLL prescaler mask for the ATMEGA8U2 and ATMEGA16U2
-  *  - Fixed HID Parser not distributing the Usage Min and Usage Max values across an array of report items
-  *  - Fixed Mass Storage Host Class driver and Low Level demo not clearing the error condition if an attached device returns a
-  *    STALL to a GET MAX LUN request (thanks to Martin Luxen)
-  *  - Fixed TeensyHID bootloader not properly shutting down the USB interface to trigger a disconnection on the host before resetting
-  *  - Fixed MassStorageHost Class driver demo not having USB_STREAM_TIMEOUT_MS compile time option set properly to prevent slow
-  *    devices from timing out the data pipes
-  *  - Fixed the definition of the Endpoint_BytesInEndpoint() macro for the U4 series AVR parts
-  *  - Fixed MIDI host Class driver MIDI_Host_SendEventPacket() routine not properly checking for Pipe ready before writing
-  *  - Fixed use of deprecated struct initializers, removed library unused parameter warnings when compiled with -Wextra enabled
-  *  - Fixed Still Image Host Class driver truncating the PIMA response code (thanks to Daniel Seibert)
-  *  - Fixed USB_CurrentMode not being reset to USB_MODE_NONE when the USB interface is shut down and both Host and Device modes can be
-  *    used (thanks to Daniel Levy)
-  *  - Fixed TeensyHID bootloader not enumerating to the host correctly (thanks to Clint Fisher)
-  *  - Fixed AVRISP project timeouts not checking for the correct timeout period (thanks to Carl Ott)
-  *  - Fixed STK525 Dataflash driver using incorrect bit-shifting for Dataflash addresses (thanks to Tim Mitchell)
-  *
-  *
-  *  \section Sec_ChangeLog091122 Version 091122
-  *
-  *  <b>New:</b>
-  *  - Added new Dual Role Keyboard/Mouse demo
-  *  - Added new HID_HOST_BOOT_PROTOCOL_ONLY compile time token to reduce the size of the HID Host Class driver when
-  *    Report protocol is not needed
-  *  - Added new MIDI LowLevel and ClassDriver Host demo, add new MIDI Host Class driver
-  *  - Added new CDC/Mouse ClassDriver device demo
-  *  - Added new Joystick Host ClassDriver and LowLevel demos
-  *  - Added new Printer Host mode Class driver
-  *  - Added new Printer Host mode ClassDriver demo
-  *  - Added optional support for double banked endpoints and pipes in the Device and Host mode Class drivers
-  *  - Added new stream creation function to the CDC Class drivers, to easily make standard I/O streams from CDC Class driver instances
-  *
-  *  <b>Changed:</b>
-  *  - Removed mostly useless "TestApp" demo, as it was mainly useful only for checking for syntax errors in the library
-  *  - MIDI device demos now receive MIDI events from the host and display note ON messages via the board LEDs
-  *  - Cleanups to the Device mode Mass Storage demo application SCSI routines
-  *  - Changed Audio Class driver sample read/write functions to be inline, to reduce the number of cycles needed to transfer
-  *    samples to and from the device (allowing more time for sample processing and output)
-  *  - Audio class Device mode demos now work at both 16MHz and 8MHz, rather than just at 8MHz
-  *  - The previous USBtoSerial demo has been moved into the projects directory, as it was just a modified CDC demo
-  *  - The Endpoint/Pipe functions now use the const qualifier on the input buffer
-  *  - Changed the CALLBACK_HIDParser_FilterHIDReportItem() callback to pass a HID_ReportItem_t rather than just the current
-  *    item's attributes, to expose more information on the item (including it's type, collection path, etc.)
-  *  - Changed MouseHostWithParser demos to check that the report items have a Mouse usage collection as a parent at some point,
-  *    to prevent Joysticks from enumerating with the demo
-  *  - Corrected the name of the misnamed USB_GetDeviceConfigDescriptor() function to USB_Host_GetDeviceConfigDescriptor().
-  *  - Keyboard LowLevel/ClassDriver demos now support multiple simultaneous key presses (up to 6) per report
-  *
-  *  <b>Fixed:</b>
-  *  - Fixed PrinterHost demo returning invalid Device ID data when the attached device does not have a
-  *    device ID (thanks to Andrei Krainev)
-  *  - Changed LUFA_VERSION_INTEGER define to use BCD values, to make comparisons easier
-  *  - Fixed issue in the HID Host class driver's HID_Host_SendReportByID() routine using the incorrect mode (control/pipe)
-  *    to send report to the attached device
-  *  - Fixed ClassDriver AudioOutput device demo not selecting an audio output mode
-  *  - Fixed incorrect SampleFrequencyType value in the AudioInput and AudioOutput ClassDriver demos' descriptors
-  *  - Fixed incorrect event name rule in demo/project/bootloader makefiles
-  *  - Fixed HID device class driver not reselecting the correct endpoint once the user callback routines have been called
-  *  - Corrected HID descriptor in the Joystick Device demos - buttons should be placed outside the pointer collection
-  *  - Fixed HID report parser collection paths invalid due to misplaced semicolon in the free path item search loop
-  *  - Fixed HID host Class driver report send/receive report broken when issued through the control pipe
-  *  - Fixed HOST_STATE_AS_GPIOR compile time option being ignored when in host mode (thanks to David Lyons)
-  *  - Fixed LowLevel Keyboard demo not saving the issues report only after it has been sent to the host
-  *  - Fixed Endpoint_Write_Control_Stream_* functions not sending a terminating IN when given data Length is zero
-  *
-  *
-  *  \section Sec_ChangeLog090924 Version 090924
-  *
-  *  <b>New:</b>
-  *  - Added new host mode class drivers and matching demos to the library for rapid application development
-  *  - Added flag to the HID report parser to indicate if a device has multiple reports
-  *  - Added new EVENT_USB_Device_StartOfFrame() event, controlled by the new USB_Device_EnableSOFEvents() and
-  *    USB_Device_DisableSOFEvents() macros to give bus-synchronized millisecond interrupts when in USB device mode
-  *  - Added new Endpoint_SetEndpointDirection() macro for bidirectional endpoints
-  *  - Added new AVRISP project, a LUFA powered clone of the Atmel AVRISP-MKII programmer
-  *  - Added ShutDown() functions for all hardware peripheral drivers, so that peripherals can be turned off after use
-  *  - Added new CDC_Device_Flush() command to the device mode CDC Class driver to flush Device->Host data
-  *  - Added extra masks to the SPI driver, changed SPI_Init() so that the clock polarity and sample modes can be set
-  *  - Added new callback to the HID report parser, so that the user application can filter only the items it is interested
-  *    in to be stored into the HIDReportInfo structure to save RAM
-  *  - Added support for the officially recommended external peripheral layout for the BUMBLEB board (thanks to Dave Fletcher)
-  *  - Added new Pipe_IsFrozen() macro to determine if the currently selected pipe is frozen
-  *  - Added new USB_GetHIDReportSize() function to the HID report parser to retrieve the size of a given report by its ID
-  *  - Added new combined Mass Storage and Keyboard demo (thanks to Matthias Hullin)
-  *
-  *  <b>Changed:</b>
-  *  - SetIdle requests to the HID device driver with a 0 idle period (send changes only) now only affect the requested
-  *    HID interface within the device, not all HID interfaces
-  *  - Added explicit attribute masks to the device mode demos' descriptors
-  *  - Added return values to the CDC and MIDI class driver transmit functions
-  *  - Optimized Endpoint_Read_Word_* and Pipe_Read_Word_* macros to reduce compiled size
-  *  - Added non-null function parameter pointer restrictions to USB Class drivers to improve user code reliability
-  *  - Added new "Common" section to the class drivers, to hold all mode-independent definitions for clarity
-  *  - Moved SCSI command/sense constants into the Mass Storage Class driver, instead of the user-code
-  *  - Altered the SCSI commands in the LowLevel Mass Storage Host to save on FLASH space by reducing function calls
-  *  - Changed the parameters and behaviour of the USB_GetDeviceConfigDescriptor() function so that it now performs size checks
-  *    and data validations internally, to simplify user code
-  *  - Changed HIDParser to only zero out important values in the Parsed HID Report Item Information structure to save cycles
-  *  - The HID report parser now always processed FEATURE items - HID_ENABLE_FEATURE_PROCESSING token now has no effect
-  *  - The HID report parser now always ignores constant-data items, HID_INCLUDE_CONSTANT_DATA_ITEMS token now has no effect
-  *  - The Benito Programmer project now has its own unique VID/PID pair allocated from the Atmel donated LUFA VID/PID pool
-  *  - Add in new invalid event hook check targets to project makefiles to produce compilation errors when invalid event names
-  *    are used in a project
-  *  - The HID Report Parser now gives information on the total length of each report within a HID interface
-  *  - The USE_NONSTANDARD_DESCRIPTOR_NAMES compile time token has been removed - there are now separate USB_Descriptor_* and
-  *    USB_StdDescriptor_* structures for both the LUFA and standardized element naming conventions so both may be used
-  *
-  *  <b>Fixed:</b>
-  *  - Fixed possible lockup in the CDC device class driver, when the host sends data that is a multiple of the
-  *    endpoint's bank
-  *  - Fixed swapped parameters in the HID state memory copy call while processing a HID PUSH item in the HID report parser
-  *  - Fixed memory corruption HID report parser when too many COLLECTION or PUSH items were processed
-  *  - Fixed HID report parser not resetting the FEATURE item count when a REPORT ID item is encountered
-  *  - Fixed USBtoSerial demos not reading in UDR1 when the USART receives data but the USB interface is not enumerated,
-  *    causing continuous USART receive interrupts
-  *  - Fixed misspelled event name in the Class driver USBtoSerial demo, preventing correct operation
-  *  - Fixed invalid data being returned when a GetStatus request is issued in Device mode with an unhandled data recipient
-  *  - Added hardware USART receive interrupt and software buffering to the Benito project to ensure received data is not
-  *    missed or corrupted
-  *  - Fixed Device mode HID Class driver always sending IN packets, even when nothing to report
-  *  - Fixed Device mode HID Class driver not explicitly initializing the ReportSize parameter to zero before calling callback
-  *    routine, so that ignored callbacks don't cause incorrect data to be sent
-  *  - Fixed StillImageHost not correctly freezing and unfreezing data pipes while waiting for a response block header
-  *  - Fixed error in the PrinterHost demo preventing the full page data from being sent to the attached device (thanks to John Andrews)
-  *  - Fixed CDC based demos and projects' INF driver files under 64 bit versions of Windows (thanks to Ronny Hanson, Thomas Bleeker)
-  *  - Re-add in missing flip, flip-ee, dfu and dfu-ee targets to project makefiles (thanks to Opendous Inc.)
-  *  - Fix allowable F_CPU values comment in project makefiles to more accurately reflect the allowable values on the USB AVRs
-  *  - Fixed DFU and CDC class bootloaders on the series 2 USB AVRs, corrected invalid signatures, added support for the new
-  *    ATMEGAxx2 series 2 variant AVRs to the DFU bootloader
-  *  - Fixed Low Level USBtoSerial demo not storing received characters (thanks to Michael Cooper)
-  *  - Fixed MIDI Device Class driver not sending/receiving MIDI packets of the correct size (thanks to Thomas Bleeker)
-  *
-  *
-  *  \section Sec_ChangeLog090810 Version 090810
-  *
-  *  <b>New:</b>
-  *  - Added new device class drivers and matching demos to the library for rapid application development
-  *  - Added new PrinterHost demo (thanks to John Andrews)
-  *  - Added USB Missile Launcher project, submitted by Dave Fletcher
-  *  - Added new Benito Arduino Programmer project
-  *  - Added incomplete device and host mode demos for later enhancement
-  *  - Updated MassStorage device block write routines to use ping-pong Dataflash buffering to increase throughput by around 30%
-  *  - Error status LEDs shown when device endpoint configuration fails to complete in all demos and projects
-  *  - Added new USB_Host_SetDeviceConfiguration() convenience function for easy configuration selection of devices while in USB
-  *    host mode
-  *  - Added new USB_Host_ClearPipeStall() convenience function to clear a stall condition on an attached device's endpoint
-  *  - Added new USB_Host_GetDeviceDescriptor() convenience function to retrieve the attached device's Device descriptor
-  *  - Added new Endpoint_ClearStatusStage() convenience function to assist with the status stages of control transfers
-  *  - Added new USE_INTERNAL_SERIAL define for using the unique serial numbers in some AVR models as the USB device's serial number,
-  *    added NO_INTERNAL_SERIAL compile time option to turn off new serial number reading code
-  *  - Added new DATAFLASH_CHIP_MASK() macro to the Dataflash driver, which returns the Dataflash select mask for the given chip index
-  *  - Added new HOST_STATE_WaitForDeviceRemoval host state machine state for non-blocking disabling of device communications until the
-  *    device has been removed (for use when an error occurs or communications with the device have completed)
-  *  - Added new FAST_STREAM_TRANSFERS compile time option for faster stream transfers via multiple bytes copied per stream loop
-  *  - Added stdio stream demo code to the CDC device demos, to show how to create standard streams out of the virtual serial ports
-  *  - Added new EEPROM and FLASH buffer versions of the Endpoint and Pipe stream functions
-  *  - Added new USE_FLASH_DESCRIPTORS and FIXED_NUM_CONFIGURATIONS compile time options
-  *  - Added support for the new ATMEGA32U2, ATMEGA16U2 and ATMEGA8U2 AVR models
-  *  - Added new USB_DeviceState variable to keep track of the current Device mode USB state
-  *  - Added new LEDs_ToggleLEDs() function to the LEDs driver
-  *  - Added new Pipe_BoundEndpointNumber() and Pipe_IsEndpointBound() functions
-  *  - Added new DEVICE_STATE_AS_GPIOR and HOST_STATE_AS_GPIOR compile time options
-  *  - Added 404 Not Found errors to the webserver in the RNDIS demos to indicate invalid URLs
-  *
-  *  <b>Changed:</b>
-  *  - Deprecated pseudo-scheduler and removed dynamic memory allocator from the library (first no longer needed and second unused)
-  *  - The device-mode CALLBACK_USB_GetDescriptor() function now has an extra parameter so that the memory space in which the requested
-  *    descriptor is located can be specified. This means that descriptors can now be located in multiple memory spaces within a device.
-  *  - Removed vague USB_IsConnected global - test USB_DeviceState or USB_HostState explicitly to gain previous functionality
-  *  - Removed USB_IsSuspended global - test USB_DeviceState against DEVICE_STATE_Suspended instead
-  *  - Extended USB_GetDeviceConfigDescriptor() routine to require the configuration number within the device to fetch
-  *  - Dataflash_WaitWhileBusy() now always ensures that the dataflash is ready for the next command immediately after returning,
-  *    no need to call Dataflash_ToggleSelectedChipCS() afterwards
-  *  - Low level API MIDI device demo no longer blocks if a note change event is sent while the endpoint is not ready
-  *  - Pipe_GetErrorFlags() now returns additional error flags for overflow and underflow errors
-  *  - Pipe stream functions now automatically set the correct pipe token, so that bidirectional pipes can be used
-  *  - Pipe_ConfigurePipe() now automatically defaults IN pipes to accepting infinite IN requests, this can still be changed by calling
-  *    the existing Pipe_SetFiniteINRequests() function
-  *  - Changed F_USB entries in project makefiles to alias to F_CPU by default, as this is the most common case
-  *  - Host mode demos now use sane terminal escape codes, so that text is always readable and events/program output is visually distinguished
-  *    from one another using foreground colours
-  *  - Internal per-device preprocessing conditions changed to per-device series rather than per-controller group for finer-grain
-  *    internal control
-  *  - Interrupts are no longer disabled during the processing of Control Requests on the default endpoint while in device mode
-  *  - AudioOutput demos now always output to board LEDs, regardless of output mode (removed AUDIO_OUT_LEDS project option)
-  *  - Removed SINGLE_DEVICE_CONFIGURATION compile time option in favor of the new FIXED_NUM_CONFIGURATIONS option so that the exact number
-  *    of device configurations can be defined statically
-  *  - Removed VBUS events, as they are already exposed to the user application via the regular device connection and disconnection events
-  *  - Renamed and altered existing events to properly separate out Host and Device mode events
-  *  - All demos switched over from GNU99 standards mode to C99 standards mode, to reduce the dependencies on GCC-only language extensions
-  *
-  *  <b>Fixed:</b>
-  *  - Changed bootloaders to use FLASHEND rather than the existence of RAMPZ to determine if far FLASH pointers are needed to fix
-  *    bootloaders on some of the USB AVR devices where avr-libc erroneously defines RAMPZ
-  *  - Fixes to MassStorageHost for better device compatibility (increase command timeout, change MassStore_WaitForDataReceived()
-  *    to only unfreeze and check one data pipe at a time) to prevent incorrect device enumerations and freezes while transferring data
-  *  - Make Pipe_ConfigurePipe() mask the given endpoint number against PIPE_EPNUM_MASK to ensure the endpoint IN direction bit is
-  *    cleared to prevent endpoint type corruption
-  *  - Fixed issue opening CDC-ACM ports on hosts when the CDC device tries to send data before the host has set the line encoding
-  *  - Fixed USB_OPT_MANUAL_PLL option being ignored during device disconnects on some models (thanks to Brian Dickman)
-  *  - Fixed documentation mentioning Pipe_GetCurrentToken() function when correct function name is Pipe_GetPipeToken()
-  *  - Fixed ADC driver for the ATMEGA32U4 and ATMEGA16U4 (thanks to Opendous Inc.)
-  *  - Fixed CDCHost demo unfreezing the pipes at the point of configuration, rather than use
-  *  - Fixed MassStorage demo not clearing the reset flag when a Mass Storage Reset is issued while not processing a command
-  *  - Fixed USB_Host_SendControlRequest() not re-suspending the USB bus when initial device ready-wait fails
-  *  - Fixed USB Pad regulator not being disabled on some AVR models when the USB_OPT_REG_DISABLED option is used
-  *  - Fixed Host mode to Device mode UID change not causing a USB Disconnect event when a device was connected
-  *  - Fixed Mouse/Keyboard demos not performing the correct arithmetic on the Idle period at the right times (thanks to Brian Dickman)
-  *  - Fixed GenericHID failing HID class tests due to incorrect Logical Minimum and Logical Maximum values (thanks to Soren Greiner)
-  *  - Fixed incorrect PIPE_EPNUM_MASK mask causing pipe failures on devices with endpoint addresses of 8 and above (thanks to John Andrews)
-  *  - Fixed report data alignment issues in the MouseHostWithParser demo when X and Y movement data size is not a multiple of 8 bits
-  *  - Fixed HID Report Descriptor Parser not correctly resetting internal states when a REPORT ID element is encountered
-  *  - Fixed incorrect BUTTONS_BUTTON1 for the STK526 target
-  *  - Fixed RNDIS demos freezing when more than one connection was attempted simultaneously, causing memory corruption
-  *  - Fixed USBtoSerial demo receiving noise from the USART due to pull-up not being enabled
-  *
-  *
-  *  \section Sec_ChangeLog090605 Version 090605
-  *
-  *  - Fixed bug in RNDISEthernet and DualCDC demos not using the correct USB_ControlRequest structure for control request data
-  *  - Fixed documentation showing incorrect USB mode support on the supported AVRs list
-  *  - Fixed RNDISEthernet not working under Linux due to Linux requiring an "optional" RNDIS request which was unhandled
-  *  - Fixed Mouse and Keyboard device demos not acting in accordance with the HID specification for idle periods (thanks to Brian Dickman)
-  *  - Removed support for endpoint/pipe non-control interrupts; these did not act in the way users expected, and had many subtle issues
-  *  - Fixed Device Mode not handling Set Feature and Clear Feature Chapter 9 requests that are addressed to the device (thanks to Brian Dickman)
-  *  - Moved control endpoint interrupt handling into the library itself, enable via the new INTERRUPT_CONTROL_ENDPOINT token
-  *  - Fixed CDCHost not clearing configured pipes and resetting configured pipes mask when a partially enumerated invalid CDC
-  *    interface is skipped
-  *  - Clarified the size of library tokens which accept integer values in the Compile Time Tokens page, values now use the smallest datatype
-  *    inside the library that is able to hold their defined value to save space
-  *  - Removed DESCRIPTOR_ADDRESS() macro as it was largely superfluous and only served to obfuscate code
-  *  - Rewritten event system to remove all macros, to make user code clearer
-  *  - Fixed incorrect ENDPOINT_EPNUM_MASK mask preventing endpoints above EP3 from being selected (thanks to Jonathan Oakley)
-  *  - Removed STREAM_CALLBACK() macro - callbacks now use regular function definitions to clarify user code
-  *  - Removed DESCRIPTOR_COMPARATOR() macro - comparators should now use regular function definitions to clarify user code
-  *  - USB_IsConnected is now cleared before the USB_Disconnect() event is fired in response to VBUS being removed
-  *  - Fixed incorrect PID value being used in the USBtoSerial project (thanks to Phill)
-  *  - Deleted StdDescriptors.c, renamed USB_GetDescriptor() to CALLBACK_USB_GetDescriptor, moved ConfigDescriptor.c/.h from the
-  *    LUFA/Drivers/USB/Class/ directory to LUFA/Drivers/USB/HighLevel/ in preparation for the new USB class APIs
-  *  - Moved out each demos' functionality library files (e.g. Ring Buffer library) to /Lib directories for a better directory structure
-  *  - Removed Tx interrupt from the USBtoSerial demo; now sends characters via polling to ensure more time for the Rx interrupt
-  *  - Fixed possible enumeration errors from spin-loops which may fail to exit if the USB connection is severed before the exit condition
-  *    becomes true
-  *
-  *
-  *  \section Sec_ChangeLog090510 Version 090510
-  *
-  *  - Added new GenericHIDHost demo
-  *  - Corrections to the KeyboardHost and MouseHost demos' pipe handling to freeze and unfreeze the data pipes at the point of use
-  *  - KeyboardHost, MouseHost and GenericHIDHost demos now save and restore the currently selected pipe inside the pipe ISR
-  *  - Changed GenericHID device demo to use the LUFA scheduler, added INTERRUPT_DATA_ENDPOINT and INTERRUPT_CONTROL_ENDPOINT compile
-  *    time options
-  *  - All comments in the library, bootloaders, demos and projects have now been spell-checked and spelling mistakes/typos corrected
-  *  - Added new PIMA_DATA_SIZE() define to the Still Image Host demo
-  *  - Add call to MassStore_WaitForDataReceived() in MassStore_GetReturnedStatus() to ensure that the CSW has been received in the
-  *    extended MSC timeout period before continuing, to prevent long processing delays from causing the MassStore_GetReturnedStatus()
-  *    to early-abort (thanks to Dmitry Maksimov)
-  *  - Move StdRequestType.h, StreamCallbacks.h, USBMode.h from the LowLevel USB driver directory to the HighLevel USB driver directory,
-  *    where they are more suited
-  *  - Removed all binary constants and replaced with decimal or hexadecimal constants so that unpatched GCC compilers can still build the
-  *    code without having to be itself patched and recompiled first
-  *  - Added preprocessor checks and documentation to the bootloaders giving information about missing SIGNATURE_x defines due to
-  *    outdated avr-libc versions.
-  *  - Added support to the CDCHost demo for devices with multiple CDC interfaces which are not the correct ACM type preceding the desired
-  *    ACM CDC interface
-  *  - Fixed GenericHID demo not starting USB and HID management tasks when not using interrupt driven modes (thanks to Carl Kjeldsen)
-  *  - Fixed RNDISEthenet demo checking the incorrect message field for packet size constraints (thanks to Jonathan Oakley)
-  *  - Fixed WriteNextReport code in the GenericHIDHost demo using incorrect parameter types and not selecting the correct endpoint
-  *  - Adjusted sample CTC timer calculations in the AudioOutput and AudioInput demos to match the CTC calculations in the AVR datasheet,
-  *    and to fix instances where rounding caused the endpoint to underflow (thanks to Robin Theunis)
-  *  - The USB_Host_SendControlRequest() function no longer automatically selects the Control pipe (pipe 0), so that other control type
-  *    pipes can be used with the function
-  *  - The USB Host management task now saves and restores the currently selected pipe before and after the task completes
-  *  - Fixed GenericHIDHost demo report write routine incorrect for control type requests (thanks to Andrei Krainev)
-  *  - Removed Endpoint_ClearCurrentBank() and Pipe_ClearCurrentBank() in favor of new Endpoint_ClearIN(), Endpoint_ClearOUT(),
-  *    Pipe_ClearIN() and Pipe_ClearOUT() macros (done to allow for the detection of packets of zero length)
-  *  - Renamed *_ReadWriteAllowed() macros to *_IsReadWriteAllowed() to remain consistent with the rest of the LUFA API
-  *  - Endpoint_IsSetupReceived() macro has been renamed to Endpoint_IsSETUPReceived(), Endpoint_ClearSetupReceived() macro has been
-  *    renamed to Endpoint_ClearSETUP(), the Pipe_IsSetupSent() macro has been renamed to Pipe_IsSETUPSent() and the
-  *    Pipe_ClearSetupSent() macro is no longer applicable and should be removed - changes made to compliment the new endpoint and pipe
-  *    bank management API
-  *  - Updated all demos, bootloaders and projects to use the new endpoint and pipe management APIs (thanks to Roman Thiel from Curetis AG)
-  *  - Updated library Doxygen documentation, added groups, changed documentation macro functions to real functions for clarity
-  *  - Removed old endpoint and pipe aliased read/write/discard routines which did not have an explicit endian specifier for clarity
-  *  - Removed the ButtLoadTag.h header file, as no one used for its intended purpose anyway
-  *  - Renamed the main Drivers/AT90USBXXX directory to Drivers/Peripheral, renamed the Serial_Stream driver to SerialStream
-  *  - Fixed CDC and USBtoSerial demos freezing where buffers were full while still transmitting or receiving (thanks to Peter Hand)
-  *  - Removed "Host_" section of the function names in ConfigDescriptor.h, as most of the routines can now be used in device mode on the
-  *    device descriptor
-  *  - Renamed functions in the HID parser to have a "USB_" prefix and the acronym "HID" in the name
-  *  - Fixed incorrect HID interface class and subclass values in the Mouse and KeyboardMouse demos (thanks to Brian Dickman)
-  *  - Capitalized the "Descriptor_Search" and "Descriptor_Search_Comp" prefixes of the values in the DSearch_Return_ErrorCodes_t and
-  *    DSearch_Comp_Return_ErrorCodes_t enums
-  *  - Removed "ERROR" from the enum names in the endpoint and pipe stream error code enums
-  *  - Renamed the USB_PowerOnErrorCodes_t enum to USB_InitErrorCodes_t, renamed the POWERON_ERROR_NoUSBModeSpecified enum value to
-  *    USB_INITERROR_NoUSBModeSpecified
-  *  - Renamed USB_PowerOnFail event to USB_InitFailure
-  *  - Renamed OTG.h header functions to be more consistent with the rest of the library API
-  *  - Changed over all deprecated GCC structure tag initializers to the standardized C99 format (thanks to Mike Alexander)
-  *  - USB_HostRequest renamed to USB_ControlRequest, entire control request header is now read into USB_ControlRequest in Device mode
-  *    rather than having the library pass only partially read header data to the application
-  *  - The USB_UnhandledControlPacket event has had its parameters removed, in favor of accessing the new USB_ControlRequest structure
-  *  - The Endpoint control stream functions now correctly send a ZLP to the host when less data than requested is sent
-  *  - Fixed USB_RemoteWakeupEnabled flag never being set (the REMOTE WAKEUP Set Feature request was not being handled)
-  *  - Renamed the FEATURELESS_CONTROL_ONLY_DEVICE compile-time token to CONTROL_ONLY_DEVICE
-  *  - Endpoint configuration is now refined to give better output when all configurations have static inputs - removed the now useless
-  *    STATIC_ENDPOINT_CONFIGURATION compile time token
-  *  - Fixed SPI driver init function not clearing SPI2X bit when not needed
-  *  - Fixed PREVENT ALLOW MEDIUM REMOVAL command issuing in the MassStorageHost demo using incorrect parameters (thanks to Mike Alex)
-  *  - Fixed MassStorageHost demo broken due to an incorrect if statement test in MassStore_GetReturnedStatus()
-  *  - Fixed reversed signature byte ordering in the CDC bootloader (thanks to Johannes Raschke)
-  *  - Changed PIPE_CONTROLPIPE_DEFAULT_SIZE from 8 to 64 to try to prevent problems with faulty devices which do not respect the given
-  *    wLength value when reading in the device descriptor
-  *  - Fixed missing semicolon in the ATAVRUSBRF01 LED board driver code (thanks to Morten Lund)
-  *  - Changed LED board driver code to define dummy LED masks for the first four board LEDs, so that user code can be compiled for boards
-  *    with less than four LEDs without code modifications (thanks to Morten Lund)
-  *  - Changed HWB board driver to Buttons driver, to allow for the support of future boards with more than one mounted GPIO button
-  *  - Serial driver now correctly calculates the baud register value when in double speed mode
-  *  - Init function of the Serial driver is now static inline to product smaller code for the common-case of static init values
-  *
-  *
-  *  \section Sec_ChangeLog090401 Version 090401
-  *
-  *  - Fixed MagStripe project configuration descriptor containing an unused (blank) endpoint descriptor
-  *  - Incorporated makefile changes by Denver Gingerich to retain compatibility with stock (non-WinAVR) AVR-GCC installations
-  *  - Fixed makefile EEPROM programming targets programming FLASH data in addition to EEPROM data
-  *  - LUFA devices now enumerate correctly with LUFA hosts
-  *  - Fixed Configuration Descriptor search routine freezing when a comparator returned a failure
-  *  - Removed HID report item serial dump in the MouseHostWithParser and KeyboardHostWithParser - useful only for debugging, and
-  *    slowed down the enumeration of HID devices too much
-  *  - Increased the number of bits per track which can be read in the MagStripe project to 8192 when compiled for the AT90USBXXX6/7
-  *  - Fixed KeyboardMouse demo discarding the wIndex value in the REQ_GetReport request
-  *  - USBtoSerial demo now discards all Rx data when not connected to a USB host, rather than buffering characters for transmission
-  *    next time the device is attached to a host.
-  *  - Added new F_USB compile time constant to the library and makefiles, to give the raw input clock (used to feed the PLL before any
-  *    clock prescaling is performed) frequency, so that the PLL prescale mask can be determined
-  *  - Changed stream wait timeout counter to be 16-bit, so that very long timeout periods can be set for correct communications with
-  *    badly designed hosts or devices which greatly exceed the USB specification limits
-  *  - Mass Storage Host demo now uses a USB_STREAM_TIMEOUT_MS of two seconds to maintain compatibility with poorly designed devices
-  *  - Function attribute ATTR_ALWAYSINLINE renamed to ATTR_ALWAYS_INLINE to match other function attribute macro naming conventions
-  *  - Added ATTR_ALWAYS_INLINE attribute to several key inlined library components, to ensure they are inlined in all circumstances
-  *  - Removed SetSystemClockPrescaler() macro, the clock_prescale_set() avr-libc macro has been corrected in recent avr-libc versions
-  *  - Fixed incorrect/missing control status stage transfers on demos, bootloaders and applications (thanks to Nate Lawson)
-  *  - The NO_CLEARSET_FEATURE_REQUEST compile time token has been renamed to FEATURELESS_CONTROL_ONLY_DEVICE, and its function expanded
-  *    to also remove parts of the Get Status chapter 9 request to further reduce code usage
-  *  - Makefile updated to include output giving the currently selected BOARD parameter value
-  *  - Board Dataflash driver now allows for dataflash ICs which use different shifts for setting the current page/byte address (thanks
-  *    to Kenneth Clubb)
-  *  - Added DataflashManager_WriteBlocks_RAM() and DataflashManager_ReadBlocks_RAM() functions to the MassStorage demo, to allow for easy
-  *    interfacing with a FAT library for dataflash file level access
-  *  - Corrected CDC class bootloader to fix a few bugs, changed address counter to store x2 addresses for convenience
-  *  - Fixed typos in the SPI driver SPI_SPEED_FCPU_DIV_64 and SPI_SPEED_FCPU_DIV_128 masks (thanks to Markus Zocholl)
-  *  - Keyboard and Mouse device demos (normal, data interrupt and fully interrupt driven) combined into unified keyboard and mouse demos
-  *  - Keyboard and Mouse host demos (normal and data interrupt driven) combined into unified keyboard and mouse demos
-  *  - Removed AVRISP_Programmer project due to code quality concerns
-  *  - Fixed CDC demo not sending an empty packet after each transfer to prevent the host from buffering incoming data
-  *  - Fixed documentation typos and preprocessor checks relating to misspellings of the USE_RAM_DESCRIPTORS token (thanks to Ian Gregg)
-  *  - Fixed USBTask.h not conditionally including HostChapter9.h only when USB_CAN_BE_HOST is defined (thanks to Ian Gregg)
-  *  - Fixed incorrect ADC driver init register manipulation (thanks to Tobias)
-  *  - Added new GenericHID device demo application
-  *  - Fixed Still Image Host SImage_SendData() function not clearing the pipe bank after sending data
-  *
-  *
-  *  \section Sec_ChangeLog090209 Version 090209
-  *
-  *  - PWM timer mode in AudioOut demo changed to Fast PWM for speed
-  *  - Updated Magstripe project to work with the latest hardware revision
-  *  - Fixed library not responding to the BCERRI flag correctly in host mode, leading to device lockups
-  *  - Fixed library handling Get Descriptor requests when not addressed as standard requests to the device or interface (thanks to
-  *    Nate Lawson)
-  *  - Fixed serious data corruption issue in MassStorage demo dataflash write routine
-  *  - Added new NO_CLEARSET_FEATURE_REQUEST compile time token
-  *  - USB task now restores previous global interrupt state after execution, rather than forcing global interrupts to be enabled
-  *  - Fixed USB_DeviceEnumerationComplete event firing after each configuration change, rather than once after the initial configuration
-  *  - Added ENDPOINT_DOUBLEBANK_SUPPORTED() macros to Endpoint.h, altered ENDPOINT_MAX_SIZE() to allow user to specify endpoint
-  *  - ENDPOINT_MAX_ENDPOINTS changed to ENDPOINT_TOTAL_ENDPOINTS, PIPE_MAX_PIPES changed to PIPE_TOTAL_PIPES
-  *  - Endpoint and Pipe non-control stream functions now ensure endpoint or pipe is ready before reading or writing
-  *  - Changed Teensy bootloader to use a watchdog reset when exiting rather than a software jump
-  *  - Fixed integer promotion error in MassStorage and MassStorageHost demos, corrupting read/write transfers
-  *  - SPI_SendByte is now SPI_TransferByte, added new SPI_SendByte and SPI_ReceiveByte functions for fast one-way transfer
-  *  - MassStorage demo changed to use new fast one-way SPI transfers to increase throughput
-  *  - MassStorage handling of Mass Storage Reset class request improved
-  *  - Altered MassStorage demo dataflash block read code for speed
-  *  - Added USB_IsSuspended global flag
-  *  - Simplified internal Dual Mode (OTG) USB library code to reduce code size
-  *  - Extended stream timeout period to 100ms from 50ms
-  *  - Mass Storage Host demo commands now all return an error code from the Pipe_Stream_RW_ErrorCodes_t enum
-  *  - Added SubErrorCode parameter to the USB_DeviceEnumerationFailed event
-  *  - VBUS drop interrupt now disabled during the manual-to-auto VBUS delivery handoff
-  *  - Simplified low level backend so that device/host mode initialization uses the same code paths
-  *  - Added workaround for faulty Mass Storage devices which do not implement the required GET_MAX_LUN request
-  *  - Removed buggy Telnet application from the RNDIS demo
-  *  - Moved Mass Storage class requests in the Mass Storage Host demo to wrapper functions in MassStoreCommands.c
-  *  - Fixed incorrect SCSI command size value in the Request Sense command in MassStoreCommands.c
-  *  - Added SetProtocol request to HID class non-parser Mouse and Keyboard demos to force devices to use the correct Boot Protocol
-  *  - Added new "dfu" and "flip" programming targets to project makefiles
-  *  - HID_PARSE_Sucessful enum member typo corrected to HID_PARSE_Successful
-  *  - Changed COLLECTION item structures in the HID descriptor parser to include the collection's Usage Page value
-  *  - Serial driver now sets Tx line as output, enables pull-up on Rx line
-  *  - Fixed smaller USB AVRs raising multiple connection and disconnection events when NO_LIMITED_CONTROLLER_CONNECT is disabled
-  *  - Added HOST_DEVICE_SETTLE_DELAY_MS to give the host delay after a device is connected before it is enumerated
-  *  - Fixed KeyboardHostWithParser demo linking against the wrong global variables
-  *  - Completed doxygen documentation of remaining library bootloaders, demos and projects
-  *  - Fixed incorrect bootloader start address in the TeensyHID bootloader
-  *  - Added HWB button whole-disk ASCII dump functionality to MassStoreHost demo
-  *  - Replaced printf_P(PSTR("%c"), {Variable}) calls with putchar(<Variable>) for speed and size savings
-  *  - Serial driver now accepts baud rates over 16-bits in size, added double speed flag option
-  *  - Fixed incorrect callback abort return value in Pipe.c
-  *  - Added new flip-ee and dfu-ee makefile targets (courtesy of Opendous Inc.)
-  *  - Removed reboot-on-disconnect code from the TeensyHID bootloader, caused problems on some systems
-  *  - Fixed AudioOutput and AudioInput demos looping on the endpoint data, rather than processing a sample at a time and returning
-  *    each time the task runs to allow for other tasks to execute
-  *  - Added support for the Atmel ATAVRUSBRF01 board
-  *  - Added AVRISP Programmer Project, courtesy of Opendous Inc.
-  *  - Fixed CDC Host demo not searching through both CDC interfaces for endpoints
-  *  - Fixed incorrect Product String descriptor length in the DFU class bootloader
-  *
-  *
-  *  \section Sec_ChangeLog081224 Version 081224
-  *
-  *  - MyUSB name changed to LUFA, the Lightweight USB Framework for AVRs
-  *  - Fixed Mass Storage Host demo's MassStore_SendCommand() delay in the incorrect place
-  *  - Fixed USBtoSerial demo not calling ReconfigureUSART() after a change in the line encoding
-  *  - Fixed infinite loop in host mode Host-to-Device control transfers with data stages
-  *  - HID report parser now supports devices with multiple reports in one interface via Report IDs
-  *  - Fixed RZUSBSTICK board LED driver header incorrect macro definition order causing compile errors
-  *  - Calling USB_Init() when the USB interface is already configured now forces a complete interface reset
-  *    and re-enumeration - fixes MyUSB DFU bootloader not switching to app code correctly when soft reset used
-  *  - Fixed "No newline at end of file" warning when stream callbacks are enabled
-  *  - DFU bootloader now uses fixed signature bytes per device, rather than reading them out dynamically for size
-  *  - Added new FIXED_CONTROL_ENDPOINT_SIZE and USE_SINGLE_DEVICE_CONFIGURATION switches to statically define certain values to
-  *    reduce compiled binary size
-  *  - Added new NO_LIMITED_CONTROLLER_CONNECT switch to prevent the library from trying to determine bus connection
-  *    state from the suspension and wake up events on the smaller USB AVRs
-  *  - Added summary of all library compile time tokens to the documentation
-  *  - Added overview of the LUFA scheduler to the documentation
-  *  - Removed MANUAL_PLL_CONTROL compile time token, replaced with a mask for the USB_Init() Options parameter
-  *  - CDC bootloader now uses the correct non-far or far versions of the pgm_* functions depending on if RAMPZ is defined
-  *  - Doxygen documentation now contains documentation on all the projects, bootloaders and most demos included with the library
-  *  - CDC bootloader now runs user application when USB disconnected rather than waiting for a hard reset
-  *  - MouseHostWithParser and KeyboardHostWithParser now support multiple-report devices
-  *  - RNDIS demo can now close connections correctly using the new TCP_APP_CLOSECONNECTION() macro - used in Webserver
-  *  - Fixed the DFU bootloader, no longer freezes up when certain files are programmed into an AVR, made reading/writing faster
-  *  - Fixed mouse/joystick up/down movements reversed - HID mouse X/Y coordinates use a left-handed coordinate system, not a normal
-  *    right-handed system
-  *  - Added stub code to the CDC and USBtoSerial demos showing how to read and set the RS-232 handshake lines - not currently used in
-  *    the demos, but the example code and supporting defines are now in place
-  *  - Interrupts are now disabled when processing a control request in device mode, to avoid exceeding the strict control request
-  *    timing requirements.
-  *  - All demos now use a central StatusUpdate() function rather than direct calls to the board LED functions, so that the demos can
-  *    easily be altered to show different LED combinations (or do something else entirely) as the demo's status changes
-  *  - Removed LED commands from the CDC bootloader, unused by most AVR910 programming software
-  *  - Fixed RNDIS demo ICMP ping requests echoing back incorrect data
-  *  - Added DHCP server code to RNDIS demo, allowing for hands-free auto configuration on any PC
-  *  - Fixed DFU bootloader PID value for the ATMEGA16U4 AVR
-  *  - Endpoint and Pipe configuration functions now return an error code indicating success or failure
-  *  - USB Reset in device mode now resets and disables all device endpoints
-  *  - Added intermediate states to the host mode state machine, reducing the USB task blocking time to no more than 1ms explicitly per
-  *    invocation when in host mode
-  *  - Added support for the ATMEGA32U6 microcontroller
-  *  - Added STATIC_ENDPOINT_CONFIGURATION compile time option, enabled in the bootloaders to minimize space usage
-  *  - Removed redundant code from the USB device GetStatus() chapter 9 processing routine
-  *  - Added new TeensyHID bootloader, compatible with the Teensy HID protocol (http://www.pjrc.com/teensy/)
-  *  - Versions are now numbered by release dates, rather than arbitrary major/minor revision numbers
-  *  - USB_RemoteWakeupEnabled is now correctly set and cleared by SetFeature and ClearFeature requests from the host
-  *  - Changed prototype of GetDescriptor, so that it now returns the descriptor size (or zero if the descriptor doesn't exist)
-  *    rather than passing the size back to the caller through a parameter and returning a boolean
-  *
-  *
-  *  \section Sec_ChangeLog153 Version 1.5.3 (081002)
-  *
-  *  - Fixed CDC bootloader using pgmspace macros for some descriptors inappropriately
-  *  - Updated all Mouse and Keyboard device demos to include boot protocol support (now works in BIOS)
-  *  - Renamed bootloader directories to remove spaces, which were causing build problems on several OSes
-  *  - Removed serial number strings from all but the MassStore demo where it is required - users were not
-  *    modifying the code to either omit the descriptor or use a unique serial per device causing problems
-  *    when multiple units of the same device were plugged in at the same time
-  *  - AudioOutput and AudioInput demos now correctly silence endpoints when not enabled by the host
-  *  - Added KeyboardMouse demo (Keyboard and Mouse functionality combined into a single demo)
-  *  - Added DriverStubs directory to house board level driver templates, to make MyUSB compatible custom board
-  *    driver creation easier
-  *  - Extended MassStorage demo to support multiple LUNs, 2 by default
-  *  - Fixed incorrect device address mask, preventing the device from enumerating with addresses larger than 63
-  *  - Fixed incorrect data direction mask in the GetStatus standard request, preventing it from being handled
-  *  - Fixed incorrect GetStatus standard request for endpoints, now returns the endpoint STALL status correctly
-  *  - Added in new USB_RemoteWakeupEnabled and USB_CurrentlySelfPowered flags rather than using fixed values
-  *  - Added DualCDC demo to demonstrate the use of Interface Association Descriptors
-  *  - Added pipe NAK detection and clearing API
-  *  - Added pipe status change (NAK, STALL, etc.) interrupt API
-  *  - Fixed MassStorageHost demo so that it no longer freezes randomly when issuing several commands in a row
-  *  - Host demos configuration descriptor routines now return a unique error code when the returned data does
-  *    not have a valid configuration descriptor header
-  *  - Added Endpoint_WaitUntilReady() and Pipe_WaitUntilReady() functions
-  *  - Stream functions now have software timeouts, timeout period can be set by the USB_STREAM_TIMEOUT_MS token
-  *  - All demos now pass the USB.org automated Chapter 9 device compliance tests
-  *  - All HID demos now pass the USB.org automated HID compliance tests
-  *  - Polling interval of the interrupt endpoint in the CDC based demos changed to 0xFF to fix problems on Linux systems
-  *  - Changed stream functions to accept a new callback function, with NO_STREAM_CALLBACKS used to disable all callbacks
-  *  - Mass Storage demo Dataflash management routines changed to use the endpoint stream functions
-  *  - Added AVRStudio project files for each demo in addition to the existing Programmer's Notepad master project file
-  *  - Re-added call to ReconfigureUSART() in USBtoSerial SetLineCoding request, so that baud rate changes
-  *    are reflected in the hardware (change was previously lost)
-  *
-  *
-  *  \section Sec_ChangeLog152 Version 1.5.2 (080731)
-  *
-  *  - Fixed SwapEndian_32() function in Common.h so that it now works correctly (wrong parameter types)
-  *  - Updated RNDIS demo - notification endpoint is no longer blocking so that it works with faulty Linux RNDIS
-  *    implementations (where the notification endpoint is ignored in favor of polling the control endpoint)
-  *  - Fixed incorrect Vendor Description string return size in RNDIS demo for the OID_GEN_VENDOR_DESCRIPTION OID token
-  *  - Added very basic TCP/IP stack and HTTP/TELNET servers to RNDIS demo
-  *  - Fixed DFU bootloader exit causing programming software to complain about failed writes
-  *  - Fixed DFU bootloader EEPROM programming mode wiping first flash page
-  *  - Fixed Clear/Set Feature device standard request processing code (fixing MassStorage demo in the process)
-  *  - Added support for the ATMEGA16U4 AVR microcontroller
-  *  - Library license changed from LGPLv3 to MIT license
-  *
-  *
-  *  \section Sec_ChangeLog151 Version 1.5.1 (080707)
-  *
-  *  - Changed host demos to enable the host function task on the firing of the USB_DeviceEnumerationComplete event
-  *    rather than the USB_DeviceAttached event
-  *  - HID Usage Stack now forcefully cleared after an IN/OUT/FEATURE item has been completely processed to remove
-  *    any referenced but not created usages
-  *  - Changed USB_INT_DisableAllInterrupts() and USB_INT_ClearAllInterrupts(), USB_Host_GetNextDescriptorOfType(),
-  *    USB_Host_GetNextDescriptorOfTypeBefore(), USB_Host_GetNextDescriptorOfTypeAfter() to normal functions (from inline)
-  *  - Fixed USBtoSerial demo not sending data, only receiving
-  *  - Fixed main makefile to make all by default, fixed MagStripe directory case to prevent case-sensitive path problems
-  *  - ConfigDescriptor functions made normal, instead of static inline
-  *  - Pipe/Endpoint *_Ignore_* functions changed to *_Discard_*, old names still present as aliases
-  *  - Fixed ENDPOINT_MAX_SIZE define to be correct on limited USB controller AVRs
-  *  - Changed endpoint and pipe size translation routines to use previous IF/ELSE IF cascade code, new algorithmic
-  *    approach was buggy and caused problems
-  *  - Bootloaders now compile with -fno-inline-small-functions option to reduce code size
-  *  - Audio demos now use correct endpoint sizes for full and limited controller USB AVRs, double banking in all cases
-  *    to be in line with the specification (isochronous endpoints MUST be double banked)
-  *  - Added Interface Association descriptor to StdDescriptors.h, based on the relevant USB2.0 ECN
-  *  - Fixed MIDI demo, corrected Audio Streaming descriptor to follow the MIDI-specific AS structure
-  *  - Fixed HID class demo descriptors so that the HID interface's protocol is 0x00 (required for non-boot protocol HID
-  *    devices) to prevent problems on hosts expecting the boot protocol functions to be supported
-  *  - Added read/write control stream functions to Endpoint.h
-  *  - Fixed AudioOut demo not setting port pins to inputs on USB disconnect properly
-  *  - Added RNDISEthernet demo application
-  *
-  *
-  *  \section Sec_ChangeLog150 Version 1.5.0 (080610)
-  *
-  *  - Fixed MIDI demo, now correctly waits for the endpoint to be ready between multiple note messages
-  *  - Added CDC Host demo application
-  *  - Added KeyboardFullInt demo application
-  *  - Endpoint and Pipe creation routines now mask endpoint/pipe size with the size mask, to remove transaction
-  *    size bits not required for the routines (improves compatibility with devices)
-  *  - Fixed AudioInput demo - now correctly sends sampled audio to the host PC
-  *  - Fixed AudioOutput demo once more -- apparently Windows requires endpoint packets to be >=192 bytes
-  *  - Shrunk round-robin scheduler code slightly via the use of struct pointers rather than array indexes
-  *  - Fixed off-by-one error when determining if the Usage Stack is full inside the HID Report parser
-  *  - Renamed Magstripe.h to MagstripeHW.h and moved driver out of the library and into the MagStripe demo folder
-  *  - Added preprocessor checks to enable C linkage on the library components when used with a C++ compiler
-  *  - Added Still Image Host demo application
-  *  - The USB device task now restores the previously selected endpoint, allowing control requests to be transparently
-  *    handled via interrupts while other endpoints are serviced through polling
-  *  - Fixed device signature being sent in reverse order in the CDC bootloader
-  *  - Host demos now have a separate ConfigDescriptor.c/.h file for configuration descriptor processing
-  *  - HostWithParser demos now have a separate HIDReport.c/.h file for HID report processing and dumping
-  *  - Removed non-mandatory commands from MassStorage demo to save space, fixed SENSE ResponseCode value
-  *  - CDC demos now send empty packets after sending a full one to prevent buffering issues on the host
-  *  - Updated demo descriptors to use VID/PID values donated by Atmel
-  *  - Added DoxyGen documentation to the source files
-  *  - Fixed Serial_IsCharReceived() definition, was previously reversed
-  *  - Removed separate USB_Descriptor_Language_t descriptor, USB_Descriptor_String_t is used instead
-  *  - Removed unused Device Qualifier descriptor structure
-  *  - Renamed the USB_CreateEndpoints event to the more appropriate USB_ConfigurationChanged
-  *  - Fixed MassStorageHost demo reading in the block data in reverse
-  *  - Removed outdated typedefs in StdRequestType.h, superseded by the macro masks
-  *  - Corrected OTG.h is now included when the AVR supports both Host and Device modes, for creating OTG products
-  *  - USB_DeviceEnumerationComplete event is now also fired when in device mode and the host has finished its enumeration
-  *  - Interrupt driven demos now properly restore previously selected endpoint when ISR is complete
-  *  - The value of USB_HOST_TIMEOUT_MS can now be overridden in the user project makefile to a custom fixed timeout value
-  *  - Renamed USB_Host_SOFGeneration_* macros to more friendly USB_Host_SuspendBus(), USB_Host_ResumeBus()
-  *    and USB_Host_IsBusSuspended()
-  *  - Renamed *_*_Is* macros to *_Is* to make all flag checking macros consistent, Pipe_SetInterruptFreq() is now
-  *    Pipe_SetInterruptPeriod() to use the correct terminology
-  *  - UnicodeString member of USB_Descriptor_String_t struct changed to an ordinary int array type, so that the GCC
-  *    Unicode strings (prefixed with an L before the opening quotation mark) can be used instead of explicit arrays
-  *    of ASCII characters
-  *  - Fixed Endpoint/Pipes being configured incorrectly if the maximum endpoint/pipe size for the selected USB AVR
-  *    model was given as the bank size
-  *  - HID device demos now use a true raw array for the HID report descriptor rather than a struct wrapped array
-  *  - Added VERSION_BCD() macro, fixed reported HID and USB version numbers in demo descriptors
-  *  - Cleaned up GetDescriptor device chapter 9 handler function
-  *  - Added GET_REPORT class specific request to HID demos to make them complaint to the HID class
-  *  - Cleaned up setting of USB_IsInitialized and USB_IsConnected values to only when needed
-  *  - Removed Atomic.c and ISRMacro.h; the library was already only compatible with recent avr-lib-c for other reasons
-  *  - All demos and library functions now use USB standardized names for the USB data (bRequest, wLength, etc.)
-  *  - Added USE_NONSTANDARD_DESCRIPTOR_NAMES token to switch back to the non-standard descriptor element names
-  *
-  *
-  *  \section Sec_ChangeLog141 Version 1.4.1 (090519)
-  *
-  *  - Enhanced KeyboardWithParser demo, now prints out pressed alphanumeric characters like the standard demo
-  *  - Fixed MassStorage demo, read/writes using non mode-10 commands now work correctly
-  *  - Corrected version number in Version.h
-  *
-  *
-  *  \section Sec_ChangeLog140 Version 1.4.0 (090505)
-  *
-  *  - Added HID Report Parser API to the library
-  *  - Added Mouse and Keyboard host demo applications, using the new HID report parser engine
-  *  - Added MouseFullInt demo, which demonstrates a fully interrupt (including control requests) mouse device
-  *  - Fixed incorrect length value in the audio control descriptor of the AudioOutput and AudioInput demos
-  *  - Added MIDI device demo application to the library
-  *  - Fixed problem preventing USB devices from being resumed from a suspended state
-  *  - Added new CDC class bootloader to the library, based on the AVR109 bootloader protocol
-  *  - Added header to each demo application indicating the mode, class, subclass, standards used and supported speed
-  *  - Functions expecting endpoint/pipe numbers are no longer automatically masked against ENDPOINT_EPNUM_MASK or
-  *    PIPE_PIPENUM_MASK - this should be manually added to code which requires it
-  *  - Fixed DFU class bootloader - corrected frequency of flash page writes, greatly reducing programming time
-  *  - Renamed AVR_HOST_GetDeviceConfigDescriptor() to USB_Host_GetDeviceConfigDescriptor() and AVR_HOST_GetNextDescriptor()
-  *    to USB_Host_GetNextDescriptor()
-  *  - Added new USB_Host_GetNextDescriptorOfTypeBefore() and USB_Host_GetNextDescriptorOfTypeAfter() routines
-  *  - Moved configuration descriptor routines to MyUSB/Drivers/USB/Class/, new accompanying ConfigDescriptors.c file
-  *  - Added new configuration descriptor comparator API for more powerful descriptor parsing, updated host demos to use the
-  *    new comparator API
-  *  - Fixed MassStorageHost demo capacity printout, and changed data read/write mode from little-endian to the correct
-  *    big-endian for SCSI devices
-  *  - Fixed macro/function naming consistency; USB_HOST is now USB_Host, USB_DEV is now USB_Device
-  *  - Added better error reporting to host demos
-  *  - Added 10 microsecond delay after addressing devices in host mode, to prevent control stalls
-  *
-  *
-  *  \section Sec_ChangeLog132 Version 1.3.2 (080401)
-  *
-  *  - Added call to ReconfigureUSART() in USBtoSerial SetLineCoding request, so that baud rate changes
-  *    are reflected in the hardware
-  *  - Fixed CDC and USBtoSerial demos - Stream commands do not work for control endpoints, and the
-  *    GetLineCoding request had an incorrect RequestType mask preventing it from being processed
-  *  - Improved reliability of the USBtoSerial demo, adding a busy wait while the buffer is full
-  *  - Device control endpoint size is now determined from the device's descriptors rather than being fixed
-  *  - Separated out SPI code into new SPI driver in AT90USBXXX driver directory
-  *  - Bootloader now returns correct PID for the selected USB AVR model, not just the AT90USB128X PID
-  *  - Added support for the RZUSBSTICK board
-  *  - Bicolour driver removed in favor of generic LEDs driver
-  *  - Added support for the ATMEGA32U4 AVR
-  *  - Added MANUAL_PLL_CONTROL compile time option to prevent the USB library from manipulating the PLL
-  *
-  *
-  *  \section Sec_ChangeLog131 Version 1.3.1 (080319)
-  *
-  *  - Fixed USB to Serial demo - class value in the descriptors was incorrect
-  *  - Control endpoint size changed from 64 bytes to 8 bytes to save on USB FIFO RAM and to allow low
-  *    speed mode devices to enumerate properly
-  *  - USB to Serial demo data endpoints changed to dual-banked 16 byte to allow the demo to work
-  *    on USB AVRs with limited USB FIFO RAM
-  *  - Changed demo endpoint numbers to use endpoints 3 and 4 for double banking, to allow limited
-  *    USB device controller AVRs (AT90USB162, AT90USB82) to function correctly
-  *  - Updated Audio Out demo to use timer 1 for AVRs lacking a timer 3 for the PWM output
-  *  - Fixed incorrect USB_DEV_OPT_HIGHSPEED entry in the Mass Storage device demo makefile
-  *  - Optimized Mass Storage demo for a little extra transfer speed
-  *  - Added LED indicators to the Keyboard demo for Caps Lock, Num Lock and Scroll Lock
-  *  - Added Endpoint_Read_Stream, Endpoint_Write_Stream, Pipe_Read_Stream and Pipe_Write_Stream functions
-  *    (including Big and Little Endian variants)
-  *  - Made Dataflash functions inline for speed, removed now empty Dataflash.c driver file
-  *  - Added new SetSystemClockPrescaler() macro (thanks to Joerg Wunsch)
-  *  - Fixed Endpoint_ClearStall() to function correctly on full USB controller AVRs (AT90USBXXX6/7)
-  *  - Endpoint_Setup_In_Clear() and Endpoint_Setup_Out_Clear() no longer set FIFOCON, in line with the
-  *    directives in the datasheet
-  *  - Fixed PLL prescaler defines for all AVR models and frequencies
-  *  - Fixed ENDPOINT_INT_IN and ENDPOINT_INT_OUT definitions
-  *  - Added interrupt driven keyboard and mouse device demos
-  *  - Combined USB_Device_ClearFeature and USB_Device_SetFeature requests into a single routine for code
-  *    size savings
-  *  - Added missing Pipe_GetCurrentPipe() macro to Pipe.h
-  *
-  *
-  *  \section Sec_ChangeLog130 Version 1.3.0 (080307)
-  *
-  *  - Unnecessary control endpoint config removed from device mode
-  *  - Fixed device standard request interpreter accidentally processing some class-specific requests
-  *  - Added USE_RAM_DESCRIPTORS and USE_EEPROM_DESCRIPTORS compile time options to instruct the library
-  *    to use descriptors stored in RAM or EEPROM rather than flash memory
-  *  - All demos now disable watchdog on startup, in case it has been enabled by fuses or the bootloader
-  *  - USB_DEV_OPT_LOWSPEED option now works correctly
-  *  - Added ability to set the USB options statically for a binary size reduction via the USE_STATIC_OPTIONS
-  *    compile time define
-  *  - USB_Init no longer takes a Mode parameter if compiled for a USB device with no host mode option, or
-  *    if forced to a particular mode via the USB_HOST_ONLY or USB_DEVICE_ONLY compile time options
-  *  - USB_Init no longer takes an Options parameter if options statically configured by USE_STATIC_OPTIONS
-  *  - Endpoint_Ignore_* and Pipe_Ignore_* made smaller by making the dummy variable non-volatile so that the
-  *    compiler can throw away the result more efficiently
-  *  - Added in an optional GroupID value to each scheduler entry, so that groups of tasks can once again be
-  *    controlled by the new Scheduler_SetGroupTaskMode() routine
-  *  - Added support for AT90USB162 and AT90USB82 AVR models
-  *  - Added support for the STK525 and STK526 boards
-  *  - Added support for custom board drivers to be supplied by selecting the board type as BOARD_USER, and
-  *    placing board drivers in {Application Directory}/Board/
-  *  - PLL is now stopped and USB clock is frozen when detached from host in device mode, to save power
-  *  - Joystick defines are now in sync with the schematics - orientation will be rotated for the USBKEY
-  *  - Fixed USB_DEV_IsUSBSuspended() - now checks the correct register
-  *  - Fixed data transfers to devices when in host mode
-  *  - Renamed USB_DEV_OPT_HIGHSPEED to USB_DEV_OPT_FULLSPEED and USB_HOST_IsDeviceHighSpeed() to
-  *    USB_HOST_IsDeviceFullSpeed() to be in line with the official USB speed names (to avoid confusion with
-  *    the real high speed mode, which is unavailable on the USB AVRs)
-  *
-  *
-  *  \section Sec_ChangeLog120 Version 1.2.0 (080204)
-  *
-  *  - Added USB_DeviceEnumerationComplete event for host mode
-  *  - Added new Scheduler_Init routine to prepare the scheduler, so that tasks can be started and
-  *    stopped before the scheduler has been started (via Scheduler_Start)
-  *  - Connection events in both Device and Host mode are now interrupt-driven, allowing the USB management
-  *    task to be stopped when the USB is not connected to a host or device
-  *  - All demos updated to stop the USB task when not in use via the appropriate USB events
-  *  - Mass Storage Host demo application updated to function correctly with all USB flash disks
-  *  - Mass Storage Host demo application now prints out the capacity and number of LUNs in the attached
-  *    device, and prints the first block as hexadecimal numbers rather than ASCII characters
-  *  - Endpoint and Pipe clearing routines now clear the Endpoint/Pipe interrupt and status flags
-  *  - Shifted error handling code in the host enum state machine to a single block, to reduce code complexity
-  *  - Added in DESCRIPTOR_TYPE, DESCRIPTOR_SIZE and DESCRIPTOR_CAST macros to make config descriptor processing
-  *    clearer in USB hosts and DESCRIPTOR_ADDRESS for convenience in USB devices
-  *  - Added in alloca macro to common.h, in case the user is using an old version of avr-lib-c missing the macro
-  *
-  *
-  *  \section Sec_ChangeLog110 Version 1.1.0 (080125)
-  *
-  *  - Fixed DCONNI interrupt being enabled accidentally after a USB reset
-  *  - Fixed DDISCI interrupt not being disabled when a device is not connected
-  *  - Added workaround for powerless pull-up devices causing false disconnect interrupts
-  *  - Added USB_DeviceEnumerationFailed event for Host mode
-  *  - AVR_HOST_GetDeviceConfigDescriptor routine no longer modifies ConfigSizePtr if a valid buffer
-  *    pointer is passed
-  *  - Added ALLOCABLE_BYTES to DynAlloc, and added code to make the size of key storage variables
-  *    dependent on size of memory parameters passed in via the user project's makefile
-  *  - Fixed incorrect device reset routine being called in USBTask
-  *  - Devices which do not connect within the standard 300mS are now supported
-  *  - Removed incorrect ATTR_PURE from Scheduler_SetTaskMode(), which was preventing tasks from being
-  *    started/stopped, as well as USB_InitTaskPointer(), which was breaking dual device/host USB projects
-  *  - Changed scheduler to use the task name rather than IDs for setting the task mode, eliminating the
-  *    need to have a task ID list
-  *  - ID transition interrupt now raises the appropriate device/host disconnect event if device attached
-  *  - Fixed double VBUS change (and VBUS -) event when detaching in device mode
-  *  - Added ability to disable ANSI terminal codes by the defining of DISABLE_TERMINAL_CODES in makefile
-  *  - Removed return from ConfigurePipe and ConfigureEndpoint functions - use Pipe_IsConfigured() and
-  *    Endpoint_IsConfigured() after calling the config functions to determine success
-  */
-
diff --git a/NativePrograms/LUFA/DoxygenPages/CompileTimeTokens.txt b/NativePrograms/LUFA/DoxygenPages/CompileTimeTokens.txt
deleted file mode 100644
index 8c4506eb24..0000000000
--- a/NativePrograms/LUFA/DoxygenPages/CompileTimeTokens.txt
+++ /dev/null
@@ -1,223 +0,0 @@
-/** \file
- *
- *  This file contains special DoxyGen information for the generation of the main page and other special
- *  documentation pages. It is not a project source file.
- */
-
-/** \page Page_TokenSummary Summary of Compile Tokens
- *
- *  The following lists all the possible tokens which can be defined in a project makefile, and passed to the
- *  compiler via the -D switch, to alter the LUFA library code. These tokens may alter the library behaviour,
- *  or remove features unused by a given application in order to save flash space.
- *
- *  \note If the \c USE_LUFA_CONFIG_HEADER token is defined, the library will include a header file named \c LUFAConfig.h located
- *        in the user directory where the below compile time tokens may be defined. This allows for an alternative to makefile
- *        defined tokens for configuring the library.
- *
- *  \section Sec_TokenSummary_NonUSBTokens Non USB Related Tokens
- *  This section describes compile tokens which affect non-USB sections of the LUFA library.
- *
- *  \li <b>DISABLE_TERMINAL_CODES</b> - (\ref Group_Terminal) - <i>All Architectures</i> \n
- *      If an application contains ANSI terminal control codes listed in TerminalCodes.h, it might be desired to remove them
- *      at compile time for use with a terminal which is non-ANSI control code aware, without modifying the source code. If
- *      this token is defined, all ANSI control codes in the application code from the TerminalCodes.h header are removed from
- *      the source code at compile time.
- *
- *
- *  \section Sec_TokenSummary_USBClassTokens USB Class Driver Related Tokens
- *  This section describes compile tokens which affect USB class-specific drivers in the LUFA library.
- *
- *  \li <b>HID_HOST_BOOT_PROTOCOL_ONLY</b> - (\ref Group_USBClassHIDHost) - <i>All Architectures</i> \n
- *      By default, the USB HID Host class driver is designed to work with HID devices using either the Boot or Report HID
- *      communication protocols. On devices where the Report protocol is not used (i.e. in applications where only basic
- *      Mouse or Keyboard operation is desired, using boot compatible devices), the code responsible for the Report protocol
- *      mode can be removed to save space in the compiled application by defining this token. When defined, it is still necessary
- *      to explicitly put the attached device into Boot protocol mode via a call to \ref HID_Host_SetBootProtocol().
- *
- *  \li <b>HID_STATETABLE_STACK_DEPTH</b>=<i>x</i> - (\ref Group_HIDParser) - <i>All Architectures</i> \n
- *      HID reports may contain PUSH and POP elements, to store and retrieve the current HID state table onto a stack. This
- *      allows for reports to save the state table before modifying it slightly for a data item, and then restore the previous
- *      state table in a compact manner. This token may be defined to a non-zero 8-bit value to give the maximum depth of the state
- *      table stack. If not defined, this defaults to the value indicated in the HID.h file documentation.
- *
- *  \li <b>HID_USAGE_STACK_DEPTH</b>=<i>x</i> - (\ref Group_HIDParser) - <i>All Architectures</i> \n
- *      HID reports generally contain many USAGE elements, which are assigned to INPUT, OUTPUT and FEATURE items in succession
- *      when multiple items are defined at once (via REPORT COUNT elements). This allows for several items to be defined with
- *      different usages in a compact manner. This token may be defined to a non-zero 8-bit value to set the maximum depth of the
- *      usage stack, indicating the maximum number of USAGE items which can be stored temporarily until the next INPUT, OUTPUT
- *      and FEATURE item. If not defined, this defaults to the value indicated in the HID.h file documentation.
- *
- *  \li <b>HID_MAX_COLLECTIONS</b>=<i>x</i> - (\ref Group_HIDParser) - <i>All Architectures</i> \n
- *      HID reports generally contain several COLLECTION elements, used to group related data items together. Collection information
- *      is stored separately in the processed usage structure (and referred to by the data elements in the structure) to save space.
- *      This token may be defined to a non-zero 8-bit value to set the maximum number of COLLECTION items which can be processed by the
- *      parser into the resultant processed report structure. If not defined, this defaults to the value indicated in the HID.h file
- *      documentation.
- *
- *  \li <b>HID_MAX_REPORTITEMS</b>=<i>x</i> - (\ref Group_HIDParser) - <i>All Architectures</i> \n
- *      All HID reports contain one or more INPUT, OUTPUT and/or FEATURE items describing the data which can be sent to and from the HID
- *      device. Each item has associated usages, bit offsets in the item reports and other associated data indicating the manner in which
- *      the report data should be interpreted by the host. This token may be defined to a non-zero 8-bit value to set the maximum number of
- *      data elements which can be stored in the processed HID report structure, including INPUT, OUTPUT and (if enabled) FEATURE items.
- *      If a item has a multiple count (i.e. a REPORT COUNT of more than 1), each item in the report count is placed separately in the
- *      processed HID report table. If not defined, this defaults to the value indicated in the HID.h file documentation.
- *
- *  \li <b>HID_MAX_REPORT_IDS</b>=<i>x</i> - (\ref Group_HIDParser) - <i>All Architectures</i> \n
- *      HID reports may contain several report IDs, to logically distinguish grouped device data from one another - for example, a combination
- *      keyboard and mouse might use report IDs to separate the keyboard reports from the mouse reports. In order to determine the size of each
- *      report, and thus know how many bytes must be read or written, the size of each report (IN, OUT and FEATURE) must be calculated and
- *      stored. This token may be defined to a non-zero 8-bit value to set the maximum number of report IDs in a device which can be processed
- *      and their sizes calculated/stored into the resultant processed report structure. If not defined, this defaults to the value indicated in
- *      the HID.h file documentation.
- *
- *  \li <b>NO_CLASS_DRIVER_AUTOFLUSH</b> - (\ref Group_USBClassDrivers) - <i>All Architectures</i> \n
- *      Many of the device and host mode class drivers automatically flush any data waiting to be written to an interface, when the corresponding
- *      USB management task is executed. This is usually desirable to ensure that any queued data is sent as soon as possible once and new data is
- *      constructed in the main program loop. However, if flushing is to be controlled manually by the user application via the *_Flush() commands,
- *      the compile time token may be defined in the application's makefile to disable automatic flushing during calls to the class driver USB
- *      management tasks.
- *
- *
- *  \section Sec_TokenSummary_USBTokens General USB Driver Related Tokens
- *  This section describes compile tokens which affect USB driver stack as a whole in the LUFA library.
- *
- *  \li <b>ORDERED_EP_CONFIG</b> - (\ref Group_EndpointManagement , \ref Group_PipeManagement) - <i>AVR8, UC3</i> \n
- *      The USB AVRs do not allow for Endpoints and Pipes to be configured out of order; they <i>must</i> be configured in an ascending order to
- *      prevent data corruption issues. However, by default LUFA employs a workaround to allow for unordered Endpoint/Pipe initialization. This compile
- *      time token may be used to restrict the initialization order to ascending indexes only in exchange for a smaller compiled binary size. Use
- *      caution when applied to applications using the library USB Class drivers; the user application must ensure that all endpoints and pipes are
- *      allocated sequentially.
- *
- *  \li <b>USE_STATIC_OPTIONS</b>=<i>x</i> - (\ref Group_USBManagement) - <i>All Architectures</i> \n
- *      By default, the USB_Init() function accepts dynamic options at runtime to alter the library behaviour, including whether the USB pad
- *      voltage regulator is enabled, and the device speed when in device mode. By defining this token to a mask comprised of the USB options
- *      mask defines usually passed as the Options parameter to USB_Init(), the resulting compiled binary can be decreased in size by removing
- *      the dynamic options code, and replacing it with the statically set options. When defined, the USB_Init() function no longer accepts an
- *      Options parameter.
- *
- *  \li <b>USB_DEVICE_ONLY</b> - (\ref Group_USBManagement) - <i>All Architectures</i> \n
- *      For the USB AVR models supporting both device and host USB modes, the USB_Init() function contains a Mode parameter which specifies the
- *      mode the library should be initialized to. If only device mode is required, the code for USB host mode can be removed from the binary to
- *      save space. When defined, the USB_Init() function no longer accepts a Mode parameter. This define is irrelevant on smaller USB AVRs which
- *      do not support host mode.
- *
- *  \li <b>USB_HOST_ONLY</b> - (\ref Group_USBManagement) - <i>All Architectures</i> \n
- *      Same as USB_DEVICE_ONLY, except the library is fixed to USB host mode rather than USB device mode. Not available on some USB AVR models.
- *
- *  \li <b>USB_STREAM_TIMEOUT_MS</b>=<i>x</i> - (\ref Group_USBManagement) - <i>All Architectures</i> \n
- *      When endpoint and/or pipe stream functions are used, by default there is a timeout between each transfer which the connected device or host
- *      must satisfy, or the stream function aborts the remaining data transfer. This token may be defined to a non-zero 16-bit value to set the timeout
- *      period for stream transfers, specified in milliseconds. If not defined, the default value specified in LowLevel.h is used instead.
- *
- *  \li <b>NO_LIMITED_CONTROLLER_CONNECT</b> - (\ref Group_Events) - <i>AVR8 Only</i> \n
- *      On the smaller USB AVRs, the USB controller lacks VBUS events to determine the physical connection state of the USB bus to a host. In lieu of
- *      VBUS events, the library attempts to determine the connection state via the bus suspension and wake up events instead. This however may be
- *      slightly inaccurate due to the possibility of the host suspending the bus while the device is still connected. If accurate connection status is
- *      required, the VBUS line of the USB connector should be routed to an AVR pin to detect its level, so that the \ref USB_DeviceState global
- *      can be accurately set and the \ref EVENT_USB_Device_Connect() and \ref EVENT_USB_Device_Disconnect() events manually raised by the user application.
- *      When defined, this token disables the library's auto-detection of the connection state by the aforementioned suspension and wake up events.
- *
- *  \li <b>NO_SOF_EVENTS</b> - (\ref Group_Events) - <i>All Architectures</i> \n
- *      By default, there exists a LUFA application event for the start of each USB frame while the USB bus is not suspended in either host or device mode.
- *      This event can be selectively enabled or disabled by calling the appropriate device or host mode function. When this compile time token is defined,
- *      the ability to receive USB Start of Frame events via the \ref EVENT_USB_Device_StartOfFrame() or \ref EVENT_USB_Host_StartOfFrame() events is removed,
- *      reducing the compiled program's binary size.
- *
- *
- *  \section Sec_TokenSummary_USBDeviceTokens USB Device Mode Driver Related Tokens
- *  This section describes compile tokens which affect USB driver stack of the LUFA library when used in Device mode.
- *
- *  \li <b>USE_RAM_DESCRIPTORS</b> - (\ref Group_StdDescriptors) - <i>AVR8 Only</i> \n
- *      Define this token to indicate to the USB driver that all device descriptors are stored in RAM, rather than being located in any one
- *      of the AVR's memory spaces. RAM descriptors may be desirable in applications where the descriptors need to be modified at runtime.
- *
- *  \li <b>USE_FLASH_DESCRIPTORS</b> - (\ref Group_StdDescriptors) - <i>AVR8 Only</i> \n
- *      Similar to USE_RAM_DESCRIPTORS, but all descriptors are stored in the AVR's FLASH memory rather than RAM.
- *
- *  \li <b>USE_EEPROM_DESCRIPTORS</b> - (\ref Group_StdDescriptors) - <i>AVR8 Only</i> \n
- *      Similar to USE_RAM_DESCRIPTORS, but all descriptors are stored in the AVR's EEPROM memory rather than RAM.
- *
- *  \li <b>NO_INTERNAL_SERIAL</b> - (\ref Group_StdDescriptors) - <i>All Architectures</i> \n
- *      Some AVR models contain a unique serial number which can be used as the device serial number, while in device mode. This allows
- *      the host to uniquely identify the device regardless of if it is moved between USB ports on the same computer, allowing allocated
- *      resources (such as drivers, COM Port number allocations) to be preserved. This is not needed in many apps, and so the code that
- *      performs this task can be disabled by defining this option and passing it to the compiler via the -D switch.
- *
- *  \li <b>FIXED_CONTROL_ENDPOINT_SIZE</b>=<i>x</i> - (\ref Group_EndpointManagement) - <i>All Architectures</i> \n
- *      By default, the library determines the size of the control endpoint (when in device mode) by reading the device descriptor.
- *      Normally this reduces the amount of configuration required for the library, allows the value to change dynamically (if
- *      descriptors are stored in EEPROM or RAM rather than flash memory) and reduces code maintenance. However, this token can be
- *      defined to a non-zero value instead to give the size in bytes of the control endpoint, to reduce the size of the compiled
- *      binary.
- *
- *  \li <b>DEVICE_STATE_AS_GPIOR</b> - (\ref Group_Device) - <i>AVR8 Only</i> \n
- *      One of the most frequently used global variables in the stack is the USB_DeviceState global, which indicates the current state of
- *      the Device State Machine. To reduce the amount of code and time required to access and modify this global in an application, this token
- *      may be defined to a value between 0 and 2 to fix the state variable into one of the three general purpose IO registers inside the AVR
- *      reserved for application use. When defined, the corresponding GPIOR register should not be used within the user application except
- *      implicitly via the library APIs.
- *
- *  \li <b>FIXED_NUM_CONFIGURATIONS</b>=<i>x</i> - (\ref Group_Device) - <i>All Architectures</i> \n
- *      By default, the library determines the number of configurations a USB device supports by reading the device descriptor. This reduces
- *      the amount of configuration required to set up the library, and allows the value to change dynamically (if descriptors are stored in
- *      EEPROM or RAM rather than flash memory) and reduces code maintenance. However, this value may be fixed via this token in the project
- *      makefile to reduce the compiled size of the binary at the expense of flexibility.
- *
- *  \li <b>CONTROL_ONLY_DEVICE</b> - (\ref Group_Device) - <i>All Architectures</i> \n
- *      In some limited USB device applications, there are no device endpoints other than the control endpoint; i.e. all device communication
- *      is through control endpoint requests. Defining this token will remove several features related to the selection and control of device
- *      endpoints internally, saving space. Generally, this is usually only useful in (some) bootloaders and is best avoided.
- *
- *  \li <b>MAX_ENDPOINT_INDEX</b> - (\ref Group_Device) - <i>XMEGA Only</i> \n
- *      Defining this value to the highest index (not address - this excludes the direction flag) endpoint within the device will restrict the
- *      number of FIFOs created internally for the endpoint buffers, reducing the total RAM usage.
- *
- *  \li <b>INTERRUPT_CONTROL_ENDPOINT</b> - (\ref Group_USBManagement) - <i>All Architectures</i> \n
- *      Some applications prefer to not call the USB_USBTask() management task regularly while in device mode, as it can complicate code significantly.
- *      Instead, when device mode is used this token can be passed to the library via the -D switch to allow the library to manage the USB control
- *      endpoint entirely via USB controller interrupts asynchronously to the user application. When defined, USB_USBTask() does not need to be called
- *      when in USB device mode.
- *
- *  \li <b>NO_DEVICE_REMOTE_WAKEUP</b> - (\ref Group_Device) - <i>All Architectures</i> \n
- *      Many devices do not require the use of the Remote Wakeup features of USB, used to wake up the USB host when suspended. On these devices,
- *      the code required to manage device Remote Wakeup can be disabled by defining this token and passing it to the library via the -D switch.
- *
- *  \li <b>NO_DEVICE_SELF_POWER</b> - (\ref Group_Device) - <i>All Architectures</i> \n
- *      USB devices may be bus powered, self powered, or a combination of both. When a device can be both bus powered and self powered, the host may
- *      query the device to determine the current power source, via \ref USB_Device_CurrentlySelfPowered. For solely bus powered devices, this global
- *      and the code required to manage it may be disabled by passing this token to the library via the -D switch.
- *
- *
- *  \section Sec_TokenSummary_USBHostTokens USB Host Mode Driver Related Tokens
- *
- *  This section describes compile tokens which affect USB driver stack of the LUFA library when used in Host mode.
- *
- *  \li <b>HOST_STATE_AS_GPIOR</b> - (\ref Group_Host) - <i>AVR8 Only</i> \n
- *      One of the most frequently used global variables in the stack is the USB_HostState global, which indicates the current state of
- *      the Host State Machine. To reduce the amount of code and time required to access and modify this global in an application, this token
- *      may be defined to a value between 0 and 2 to fix the state variable into one of the three general purpose IO registers inside the AVR
- *      reserved for application use. When defined, the corresponding GPIOR register should not be used within the user application except
- *      implicitly via the library APIs.
- *
- *  \li <b>USB_HOST_TIMEOUT_MS</b>=<i>x</i> - (\ref Group_Host) - <i>All Architectures</i> \n
- *      When a control transfer is initiated in host mode to an attached device, a timeout is used to abort the transfer if the attached
- *      device fails to respond within the timeout period. This token may be defined to a non-zero 16-bit value to set the timeout period for
- *      control transfers, specified in milliseconds. If not defined, the default value specified in Host.h is used instead.
- *
- *  \li <b>HOST_DEVICE_SETTLE_DELAY_MS</b>=<i>x</i> - (\ref Group_Host) - <i>All Architectures</i> \n
- *      Some devices require a delay of up to 5 seconds after they are connected to VBUS before the enumeration process can be started, or
- *      they will fail to enumerate correctly. By placing a delay before the enumeration process, it can be ensured that the bus has settled
- *      back to a known idle state before communications occur with the device. This token may be defined to a 16-bit value to set the device
- *      settle period, specified in milliseconds. If not defined, the default value specified in Host.h is used instead.
- *
- *  \li <b>INVERTED_VBUS_ENABLE_LINE</b> - (\ref Group_Host) - <i>All Architectures</i> \n
- *      If enabled, this will indicate that the USB target VBUS line polarity is inverted; i.e. it should be pulled low to enable VBUS to the
- *      target, and pulled high to stop the target VBUS generation.
- *      \n
- *      \attention On AVR8 architecture devices, this compile time option requires \c NO_AUTO_VBUS_MANAGEMENT to be set.
- *
- *  \li <b>NO_AUTO_VBUS_MANAGEMENT</b> - (\ref Group_Host) - <i>All Architectures</i> \n
- *      Disables the automatic management of VBUS to the target, i.e. automatic shut down in the even of an overcurrent situation. When enabled, VBUS
- *      is enabled while the USB controller is initialized in USB Host mode.
- */
-
diff --git a/NativePrograms/LUFA/DoxygenPages/CompilingApps.txt b/NativePrograms/LUFA/DoxygenPages/CompilingApps.txt
deleted file mode 100644
index d133917714..0000000000
--- a/NativePrograms/LUFA/DoxygenPages/CompilingApps.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-/** \file
- *
- *  This file contains special DoxyGen information for the generation of the main page and other special
- *  documentation pages. It is not a project source file.
- */
-
-/** \page Page_CompilingApps Compiling the Demos, Bootloaders and Projects
- *
- *  The following details how to compile the included LUFA demos, applications and bootloaders using AVR-GCC.
- *
- *  \section Sec_CompilingApps_Prerequisites Prerequisites
- *  Before you can compile any of the LUFA library code or demos, you will need a recent distribution of avr-libc (1.6.2+)
- *  and the AVR-GCC (4.2+) compiler. A standard "coreutils" package for your system is also required for command line
- *  compilation of LUFA based applications.
- *
- *  \subsection SSec_CompilingApps_PreqWindows Windows Prerequisites
- *  On Windows, you will need a copy of the latest Atmel Toolchain (<a>http://www.atmel.com/tools/ATMELAVRTOOLCHAINFORWINDOWS.aspx</a>),
- *  either downloaded and installed as a standalone package, or installed as part of Atmel Studio. You will need to ensure
- *  that the "bin" directory of the toolchain is available in your system's <b>PATH</b> environment variable.
- *
- *  In addition, you will need to install a ported version of the ZSH or BASH *nix shells, and a standard set of *nix
- *  utilities such as <i>cut</i>, <i>find</i> and <i>sed</i>. These can be found in the "basic" system package of the
- *  of the MinGW installer (<a>http://www.mingw.org</a>). Once installed, add the "msys\1.0\bin" of the MinGW installation
- *  folder is added to your system's <b>PATH</b> environment variable.
- *
- *  \subsection SSec_CompilingApps_PreqLinux Linux Prerequisites
- *  On Linux systems you will need to install the latest Linux distribution of the standalone Atmel Toolchain from the
- *  Atmel website (<a>http://www.atmel.com/tools/ATMELAVRTOOLCHAINFORLINUX.aspx</a>), or use the latest avr-libc and avr-gcc packages
- *  for your chosen distribution's package manager. For full device support, the Atmel standalone Toolchain package is recommended.
- *
- *  \section Sec_CompilingApps_Compiling Compiling a LUFA Application
- *  Compiling the LUFA demos, applications and/or bootloaders is very simple. LUFA comes with makefile scripts for
- *  each individual demo, bootloader and project folder, as well as scripts in the Demos/, Bootloaders/, Projects/
- *  and the LUFA root directory. Compilation of projects can be started from any of the above directories, with a build
- *  started from an upper directory in the directory structure executing build of all child directories under it. This
- *  means that while a build inside a particular demo directory will build only that particular demo, a build started from
- *  the /Demos/ directory will build all LUFA demo projects sequentially.
- *
- *  To build a project from the source via the command line, the command <b>"make all"</b> should be executed from the command
- *  line in the directory of interest. To remove compiled files (including the binary output, all intermediately files and all
- *  diagnostic output files), execute <b>"make clean"</b>. Once a "make all" has been run and no errors were encountered, the
- *  resulting binary will be located in the generated ".HEX" file. If your project makes use of pre-initialized EEPROM
- *  variables, the generated ".EEP" file will contain the project's EEPROM data.
- *
- *  \see \ref Page_BuildSystem for information on the LUFA build system.
- */
diff --git a/NativePrograms/LUFA/DoxygenPages/ConfiguringApps.txt b/NativePrograms/LUFA/DoxygenPages/ConfiguringApps.txt
deleted file mode 100644
index 6501e54d8c..0000000000
--- a/NativePrograms/LUFA/DoxygenPages/ConfiguringApps.txt
+++ /dev/null
@@ -1,157 +0,0 @@
-/** \file
- *
- *  This file contains special DoxyGen information for the generation of the main page and other special
- *  documentation pages. It is not a project source file.
- */
-
-/** \page Page_ConfiguringApps Configuring the Demos, Bootloaders and Projects
- *
- *  If the target microcontroller model, architecture, clock speed, board or other settings are different from the current
- *  settings, they must be changed and the project recompiled from the source code before being programmed into the microcontroller.
- *  Most project configuration options are located in the <tt>makefile</tt> build script inside each LUFA application's folder,
- *  however some demo or application-specific configuration settings are located in one or more of the source files of the project.
- *  See each project's individual documentation for application-specific configuration values.
- *
- *  Each project "makefile" contains all the script and configuration data required to compile each project. When opened with
- *  any regular basic text editor such as Notepad or WordPad (ensure that the save format is a pure ASCII text format) the
- *  build configuration settings may be altered.
- *
- *  \see \ref Page_BuildSystem for information on the LUFA build system.
- *
- *  \section Sec_ConfiguringApps_AppMakefileParams The Default Application Makefile Template
- *
- *  Below is a copy of the default LUFA application makefile, which can be used as a template for each application.
- *
- *  \verbinclude makefile_template
- *
- *  Inside each makefile, a number of configuration variables are listed with the syntax "<VARIABLE NAME> = <VALUE>". For
- *  each application, the important standard variables which should be altered are:
- *
- *    - <b>MCU</b>, the target processor model
- *    - <b>ARCH</b>, the target microcontroller architecture
- *    - <b>BOARD</b>, the target board hardware
- *    - <b>F_CPU</b>, the target CPU master clock frequency, after any prescaling
- *    - <b>F_USB</b>, the target raw input clock to the USB module of the processor
- *    - <b>OPTIMIZATION</b>, the level of optimization to compile with
- *    - <b>TARGET</b>, the name of the target output binary and other files
- *    - <b>SRC</b>, the list of source files to compile/assemble/link
- *    - <b>LUFA_PATH</b>, the path to the LUFA library core source code
- *    - <b>CC_FLAGS</b>, the common command line flags to pass to the C/C++ compiler, assembler and linker
- *    - <b>LD_FLAGS</b>, the command line flags to pass to the linker
- *
- *  These values should be changed to reflect the build hardware.
- *
- *  \subsection SSec_ConfiguringApps_MCU The MCU Parameter
- *  This parameter indicates the target microcontroller model for the compiled application. This should be set to the model of the target
- *  microcontroller (such as the AT90USB1287, or the ATMEGA32U4), in all lower-case (e.g. "at90usb1287"). Note that not all demos support all the
- *  microcontroller models and architectures, as they may make use of peripherals or modes only present in some devices.
- *
- *  For supported processor models, see \ref Page_DeviceSupport.
- *
- *  \subsection SSec_ConfiguringApps_ARCH The ARCH Parameter
- *  This parameter indicates the target microcontroller architecture the library is to be compiled for. Different microcontroller
- *  architectures require different source files to be compiled into the final binary, and so this option must be set to the correct
- *  architecture for the selected platform.
- *
- *  For supported processor architectures, see \ref Page_DeviceSupport.
- *
- *  \subsection SSec_ConfiguringApps_BOARD The BOARD Parameter
- *  This parameter indicates the target board hardware for the compiled application. Some LUFA library drivers are board-specific,
- *  such as the LED driver, and the library needs to know the layout of the target board. If you are using one of the board models listed
- *  on the main library page, change this parameter to the board name in all UPPER-case.
- *
- *  If you are not using any board-specific drivers in the LUFA library, or you are using a custom board layout, change this to read
- *  "USER" (no quotes) instead of a standard board name. If the USER board type is selected and the application makes use of one or more
- *  board-specific hardware drivers inside the LUFA library, then the appropriate stub drives files should be copied from the \c /CodeTemplates/DriverStubs/
- *  directory into a /Board/ folder inside the application directory, and the stub driver completed with the appropriate code to drive the
- *  custom board's hardware.
- *
- *  For boards with built in hardware driver support within the LUFA library, see \ref Page_DeviceSupport.
- *
- *  \subsection SSec_ConfiguringApps_F_CPU The F_CPU Parameter
- *  This parameter indicates the target microcontroller's main CPU clock frequency, in Hz. This is used by many libraries (and applications) for
- *  timing related purposes, and should reflect the actual CPU speed after any prescaling or adjustments are performed.
- *
- *  \subsection SSec_ConfiguringApps_F_USB The F_USB Parameter
- *  This parameter indicates the raw input clock frequency to the USB module within the microcontroller in Hz. This may be very different on some platforms
- *  to the main CPU clock or other peripheral/bus clocks.
- *
- *    \note On AVR8 platforms, this must be equal to \c 8000000 or \c 16000000.
- *
- *    \note On XMEGA platforms, this must be equal to a multiple of 6000000 from \c 6000000 to \c 48000000.
- *
- *    \note On UC3 platforms, this must be equal to a multiple of 12000000 from \c 12000000 to \c 48000000.
- *
- *  \subsection SSec_ConfiguringApps_OPTIMIZATION The OPTIMIZATION Parameter
- *  This parameter indicates the level of optimization to use when compiling the application. This will allow you to compile with an optimization level
- *  supported by GCC, from <tt>0</tt> (no optimization) to <tt>3</tt> (fastest runtime optimization) or <tt>s</tt> (smallest size).
- *
- *  \subsection SSec_ConfiguringApps_TARGET The TARGET Parameter
- *  This parameter indicates the application target name, which is used as the base filename for the build binary and debugging files. This will be the
- *  name of the output files once linked together into the final application, ready to load into the target.
- *
- *  \subsection SSec_ConfiguringApps_SRC The SRC Parameter
- *  This parameter indicates the source files used to compile the application, as a list of C (<tt>*.c</tt>), C++ (<tt>*.cpp</tt>) and Assembly (<tt>*.S</tt>) files. Note that
- *  all assembly files must end in a <b>capital</b> .S extension, as lowercase .s files are reserved for GCC intermediate files.
- *
- *  \subsection SSec_ConfiguringApps_LUFA_PATH The LUFA_PATH Parameter
- *  As each LUFA program requires the LUFA library source code to compile correctly, the application must know where the LUFA library is located. This
- *  value specifies the path to the LUFA library core. This path may be relative or absolute, however note than even under Windows based systems the
- *  forward-slash (/) path separator must be used.
- *
- *  \subsection SSec_ConfiguringApps_CC_FLAGS The CC_FLAGS Parameter
- *  This parameter lists the compiler flags passed to the C/C++ compiler, the assembler and the linker. These are used as-is directly to GCC and thus
- *  must match GCC's command line options as given in the GCC manual. This variable may be used to define tokens directly on the command line, enable or
- *  disable warnings, adjust the target-specific tuning parameters or other options.
- *
- *  \subsection SSec_ConfiguringApps_LD_FLAGS The LD_FLAGS Parameter
- *  This parameter lists the linker flags passed exclusively to the linker. These are used as-is directly to GCC and thus must match GCC's command line
- *  linker options as given in the GCC manual. This variable may be used to create or relocate custom data sections, or enable linker specific behaviors.
- *
- *
- *  \section Sec_ExampleAppConfig Example Application Makefile Configurations
- *  Below is an example makefile for an AVR8 based AT90USB1287 running at 8MHz, to compile a program called "MyApplication":
- *  \verbatim
-    MCU          = at90usb1287
-    ARCH         = AVR8
-    BOARD        = NONE
-    F_CPU        = 8000000
-    F_USB        = $(F_CPU)
-    OPTIMIZATION = s
-    TARGET       = MyApplication
-    SRC          = MyApplication.c Descriptors.c $(LUFA_SRC_USB) $(LUFA_SRC_USBCLASS)
-    LUFA_PATH    = ../../../../LUFA
-    CC_FLAGS     = -DUSE_LUFA_CONFIG_HEADER -IConfig/
-    LD_FLAGS     =
-    \endverbatim
- *
- *  Below is an example makefile for an XMEGA based ATXMEGA128A1U running at 32MHz, to compile a program called "MyApplication":
- *  \verbatim
-    MCU          = atxmega128a1u
-    ARCH         = XMEGA
-    BOARD        = NONE
-    F_CPU        = 32000000
-    F_USB        = 48000000
-    OPTIMIZATION = s
-    TARGET       = MyApplication
-    SRC          = MyApplication.c Descriptors.c $(LUFA_SRC_USB) $(LUFA_SRC_USBCLASS)
-    LUFA_PATH    = ../../../../LUFA
-    CC_FLAGS     = -DUSE_LUFA_CONFIG_HEADER -IConfig/
-    LD_FLAGS     =
-    \endverbatim
- *
- *  Below is an example makefile for a UC3 based AT32UC3A0512 running at 50MHz, to compile a program called "MyApplication":
- *  \verbatim
-    MCU          = uc3a0512
-    ARCH         = UC3
-    BOARD        = NONE
-    F_CPU        = 50000000
-    F_USB        = 48000000
-    OPTIMIZATION = s
-    TARGET       = MyApplication
-    SRC          = MyApplication.c Descriptors.c $(LUFA_SRC_USB) $(LUFA_SRC_USBCLASS)
-    LUFA_PATH    = ../../../../LUFA
-    CC_FLAGS     = -DUSE_LUFA_CONFIG_HEADER -IConfig/
-    LD_FLAGS     =
-    \endverbatim
- */
diff --git a/NativePrograms/LUFA/DoxygenPages/DevelopingWithLUFA.txt b/NativePrograms/LUFA/DoxygenPages/DevelopingWithLUFA.txt
deleted file mode 100644
index 3b5a14a1b9..0000000000
--- a/NativePrograms/LUFA/DoxygenPages/DevelopingWithLUFA.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-/** \file
- *
- *  This file contains special DoxyGen information for the generation of the main page and other special
- *  documentation pages. It is not a project source file.
- */
-
-/**
- *  \page Page_DevelopingWithLUFA Developing With LUFA
- *
- *  This section of the manual contains information on LUFA development, such as Getting Started information,
- *  information on compile-time tuning of the library and other developer-related sections.
- *
- *  <b>Subsections:</b>
- *  \li \subpage Page_BuildSystem - The LUFA Buildsystem
- *  \li \subpage Page_TokenSummary - Summary of Compile Time Tokens
- *  \li \subpage Page_Migration - Migrating from an Older LUFA Version
- *  \li \subpage Page_VIDPID - Allocated USB VID and PID Values
- *  \li \subpage Page_OSDrivers - Operating System Driver Information
- *  \li \subpage Page_BuildLibrary - Building as a Linkable Library
- *  \li \subpage Page_WritingBoardDrivers - How to Write Custom Board Drivers
- *  \li \subpage Page_SoftwareBootloaderStart - How to jump to the bootloader in software
- */
-
diff --git a/NativePrograms/LUFA/DoxygenPages/DeviceSupport.txt b/NativePrograms/LUFA/DoxygenPages/DeviceSupport.txt
deleted file mode 100644
index a9f61db4ce..0000000000
--- a/NativePrograms/LUFA/DoxygenPages/DeviceSupport.txt
+++ /dev/null
@@ -1,424 +0,0 @@
-/** \file
- *
- *  This file contains special DoxyGen information for the generation of the main page and other special
- *  documentation pages. It is not a project source file.
- */
-
-/**
- *  \page Page_DeviceSupport Device and Hardware Support
- *
- *  <b>Atmel Microcontrollers:</b>
- *  \li \subpage Page_AVR8Support - Atmel AVR8 Support
- *  \li \subpage Page_UC3Support - Atmel AVR32 UC3 Support
- *  \li \subpage Page_XMEGASupport - Atmel XMEGA Support
- */
-
-/**
- *  \page Page_AVR8Support Atmel 8-Bit AVR (AVR8) Support
- *
- *  \section Sec_AVR8Support_Devices Supported Microcontroller Models
- *
- *  Currently supported AVR8 models:
- *
- *  <table>
- *  <tr>
- *   <th width="150px">Part</th>
- *   <th width="150px">USB Device Mode</th>
- *   <th width="150px">USB Host Mode</th>
- *  </tr>
- *  <tr>
- *   <td>AT90USB82</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *   <td bgcolor="#EE0000">No</td>
- *  </tr>
- *  <tr>
- *   <td>ATMEGA8U2</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *   <td bgcolor="#EE0000">No</td>
- *  </tr>
- *  <tr>
- *   <td>AT90USB162</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *   <td bgcolor="#EE0000">No</td>
- *  </tr>
- *  <tr>
- *   <td>ATMEGA16U2</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *   <td bgcolor="#EE0000">No</td>
- *  </tr>
- *  <tr>
- *   <td>ATMEGA16U4</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *   <td bgcolor="#EE0000">No</td>
- *  </tr>
- *  <tr>
- *   <td>ATMEGA32U2</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *   <td bgcolor="#EE0000">No</td>
- *  </tr>
- *  <tr>
- *   <td>ATMEGA32U4</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *   <td bgcolor="#EE0000">No</td>
- *  </tr>
- *  <tr>
- *   <td>AT90USB646</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *   <td bgcolor="#EE0000">No</td>
- *  </tr>
- *  <tr>
- *   <td>AT90USB647</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *  </tr>
- *  <tr>
- *   <td>AT90USB1286</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *   <td bgcolor="#EE0000">No</td>
- *  </tr>
- *  <tr>
- *   <td>AT90USB1287</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *  </tr>
- *  </table>
- *
- *  \section Sec_AVR8Support_Boards Supported Atmel Boards
- *  Currently supported Atmel AVR8 boards (see \ref Group_BoardTypes):
- *   - AT90USBKEY
- *   - ATAVRUSBRF01
- *   - EVK527
- *   - RZUSBSTICK
- *   - STK525
- *   - STK526
- *   - XPLAIN (Original green board, <i>not</i> the newer blue XPLAINED family boards)
- *   - Xplained-MINI
- *
- *  \section Sec_AVR8Support_ThirdParty Supported Third Party Boards
- *  Currently supported third-party boards (see \ref Group_BoardTypes for makefile \c BOARD constant names):
- *   - Adafruit U4 Breakout Board
- *   - Arduino Leonardo
- *   - Arduino Micro
- *   - Arduino Uno
- *   - Arduino Yun
- *   - Bitwizard Multio and Big-Multio
- *   - Busware BUI
- *   - Busware CUL V3
- *   - Busware TUL
- *   - DorkbotPDX Duce
- *   - Fletchtronics Bumble-B (using manufacturer recommended peripheral layout)
- *   - Kernel Concepts USBFOO
- *   - Linnix UDIP
- *   - MattairTech JM-DB-U2
- *   - Maximus USB
- *   - Micropendous Boards (Micropendous-32U2, Micropendous-1, Micropendous-2)
- *   - Microsin AVR-USB162
- *   - Minimus USB
- *   - Olimex AVR-USB-162, AVR-USB-32U4 and AVR-USB-T32U4 Boards
- *   - Olimex AVR-ISP-MK2
- *   - Paranoid Studio's US2AX (V1, V2 and V3 hardware revisions)
- *   - PJRC Teensy (1.x and 2.x versions)
- *   - Pololu A-Star Micro
- *   - Rikus' U2S
- *   - Sparkfun U2 Breakout Board
- *   - Stange ISP Programmer Board
- *   - TCNISO Blackcat USB JTAG
- *   - Tempusdictum Benito
- *   - Tom's USBTINY-MKII (all revisions and versions)
- *   - Custom User Boards (with Board Drivers if desired, see \ref Page_WritingBoardDrivers)
- */
-
-/**
- *  \page Page_UC3Support Atmel 32-Bit UC3 AVR (UC3)
- *
- *  \warning The AVR32 UC3 device support is currently <b>experimental</b>, and is included for preview purposes only.
- *
- *  \section Sec_UC3Support_Devices Supported Microcontroller Models
- *
- *  Currently supported UC3 models:
- *
- *  <table>
- *  <tr>
- *   <th width="150px">Part</th>
- *   <th width="150px">USB Device Mode</th>
- *   <th width="150px">USB Host Mode</th>
- *  </tr>
- *  <tr>
- *   <td>AT32UC3A364</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *  </tr>
- *  <tr>
- *   <td>AT32UC3A364S</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *  </tr>
- *  <tr>
- *   <td>AT32UC3A464</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *  </tr>
- *  <tr>
- *   <td>AT32UC3A464S</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *  </tr>
- *  <tr>
- *   <td>AT32UC3B064</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *  </tr>
- *  <tr>
- *   <td>AT32UC3B164</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *  </tr>
- *  <tr>
- *   <td>AT32UC3A0128</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *  </tr>
- *  <tr>
- *   <td>AT32UC3A1128</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *  </tr>
- *  <tr>
- *   <td>AT32UC3A3128</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *  </tr>
- *  <tr>
- *   <td>AT32UC3A3128S</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *  </tr>
- *  <tr>
- *   <td>AT32UC3A4128</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *  </tr>
- *  <tr>
- *   <td>AT32UC3A4128S</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *  </tr>
- *  <tr>
- *   <td>AT32UC3B0128</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *  </tr>
- *  <tr>
- *   <td>AT32UC3B1128</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *  </tr>
- *  <tr>
- *   <td>AT32UC3A0256</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *  </tr>
- *  <tr>
- *   <td>AT32UC3A1256</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *  </tr>
- *  <tr>
- *   <td>AT32UC3A3256</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *  </tr>
- *  <tr>
- *   <td>AT32UC3A3256S</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *  </tr>
- *  <tr>
- *   <td>AT32UC3A4256</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *  </tr>
- *  <tr>
- *   <td>AT32UC3A4256S</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *  </tr>
- *  <tr>
- *   <td>AT32UC3B0256</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *  </tr>
- *  <tr>
- *   <td>AT32UC3B1256</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *  </tr>
- *  <tr>
- *   <td>AT32UC3A0512</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *  </tr>
- *  <tr>
- *   <td>AT32UC3A1512</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *  </tr>
- *  <tr>
- *   <td>AT32UC3B0512</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *  </tr>
- *  <tr>
- *   <td>AT32UC3B1512</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *  </tr>
- *  </table>
- *
- *  \section Sec_UC3Support_Boards Supported Atmel Boards
- *
- *  Currently supported Atmel UC3 boards (see \ref Group_BoardTypes):
- *   - EVK1100
- *   - EVK1101
- *   - EVK1104
- *   - UC3-A3 Xplained
- *
- *  \section Sec_UC3Support_ThirdParty Supported Third Party Boards
- *
- *  Currently supported third-party boards (see \ref Group_BoardTypes for makefile \c BOARD constant names):
- *   - Custom User Boards (with Board Drivers if desired, see \ref Page_WritingBoardDrivers)
- */
-
-/**
- *  \page Page_XMEGASupport Atmel USB XMEGA AVR (XMEGA)
- *
- *  \warning The XMEGA device support is currently <b>experimental</b> (incomplete and/or non-functional), and is included for preview purposes only.
- *
- *  \section Sec_XMEGASupport_Devices Supported Microcontroller Models
- *
- *  Currently supported XMEGA models:
- *
- *  <table>
- *  <tr>
- *   <th width="150px">Part</th>
- *   <th width="150px">USB Device Mode</th>
- *   <th width="150px">USB Host Mode</th>
- *  </tr>
- *  <tr>
- *   <td>ATXMEGA16A4U</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *   <td bgcolor="#EE0000">No</td>
- *  </tr>
- *  <tr>
- *   <td>ATXMEGA32A4U</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *   <td bgcolor="#EE0000">No</td>
- *  </tr>
- *  <tr>
- *   <td>ATXMEGA64A4U</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *   <td bgcolor="#EE0000">No</td>
- *  </tr>
- *  <tr>
- *   <td>ATXMEGA128A4U</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *   <td bgcolor="#EE0000">No</td>
- *  </tr>
- *  <tr>
- *   <td>ATXMEGA64A3U</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *   <td bgcolor="#EE0000">No</td>
- *  </tr>
- *  <tr>
- *   <td>ATXMEGA128A3U</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *   <td bgcolor="#EE0000">No</td>
- *  </tr>
- *  <tr>
- *   <td>ATXMEGA192A3U</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *   <td bgcolor="#EE0000">No</td>
- *  </tr>
- *  <tr>
- *   <td>ATXMEGA256A3U</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *   <td bgcolor="#EE0000">No</td>
- *  </tr>
- *  <tr>
- *   <td>ATXMEGA256A3BU</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *   <td bgcolor="#EE0000">No</td>
- *  </tr>
- *  <tr>
- *   <td>ATXMEGA128A1U</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *   <td bgcolor="#EE0000">No</td>
- *  </tr>
- *  <tr>
- *   <td>ATXMEGA64B3</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *   <td bgcolor="#EE0000">No</td>
- *  </tr>
- *  <tr>
- *   <td>ATXMEGA128B3</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *   <td bgcolor="#EE0000">No</td>
- *  </tr>
- *  <tr>
- *   <td>ATXMEGA64B1</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *   <td bgcolor="#EE0000">No</td>
- *  </tr>
- *  <tr>
- *   <td>ATXMEGA128B1</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *   <td bgcolor="#EE0000">No</td>
- *  </tr>
- *  <tr>
- *   <td>ATXMEGA64C3</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *   <td bgcolor="#EE0000">No</td>
- *  </tr>
- *  <tr>
- *   <td>ATXMEGA128C3</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *   <td bgcolor="#EE0000">No</td>
- *  </tr>
- *  <tr>
- *   <td>ATXMEGA192C3</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *   <td bgcolor="#EE0000">No</td>
- *  </tr>
- *  <tr>
- *   <td>ATXMEGA256C3</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *   <td bgcolor="#EE0000">No</td>
- *  </tr>
- *  <tr>
- *   <td>ATXMEGA384C3</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *   <td bgcolor="#EE0000">No</td>
- *  </tr>
- *  <tr>
- *   <td>ATXMEGA16C4</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *   <td bgcolor="#EE0000">No</td>
- *  </tr>
- *  <tr>
- *   <td>ATXMEGA32C4</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *   <td bgcolor="#EE0000">No</td>
- *  </tr>
- *  </table>
- *
- *  \section Sec_XMEGASupport_Boards Supported Atmel Boards
- *  Currently supported Atmel XMEGA boards (see \ref Group_BoardTypes):
- *   - XMEGA A3BU Xplained
- *   - XMEGA B1 Xplained
- *   - XMEGA C3 Xplained
- *
- *  \section Sec_XMEGASupport_ThirdParty Supported Third Party Boards
- *  Currently supported third-party boards (see \ref Group_BoardTypes for makefile \c BOARD constant names):
- *   - Custom User Boards (with Board Drivers if desired, see \ref Page_WritingBoardDrivers)
- */
-
diff --git a/NativePrograms/LUFA/DoxygenPages/DirectorySummaries.txt b/NativePrograms/LUFA/DoxygenPages/DirectorySummaries.txt
deleted file mode 100644
index b042246776..0000000000
--- a/NativePrograms/LUFA/DoxygenPages/DirectorySummaries.txt
+++ /dev/null
@@ -1,80 +0,0 @@
-/** \file
- *
- *  This file contains special DoxyGen information for the generation of the main page and other special
- *  documentation pages. It is not a project source file.
- */
-
-/** \dir Platform
- *  \brief Platform specific drivers.
- *
- *  This folder contains platform specific drivers and defines for various supported architectures. These may or may
- *  not be used in a LUFA application, and are provided for convenience purposes.
- *
- *  \dir Drivers
- *  \brief Library hardware and software drivers.
- *
- *  This folder contains all the library hardware and software drivers for each supported board, architecture and
- *  microcontroller model.
- *
- *  \dir Drivers/Misc
- *  \brief Miscellaneous driver files.
- *
- *  This folder contains drivers for aspects other than the USB interface, board hardware or microcontroller peripherals.
- *
- *  \dir Drivers/Peripheral
- *  \brief Microcontroller peripheral driver files.
- *
- *  This folder contains drivers for various low level microcontroller peripherals, usually located on the microcontroller
- *  die within the same physical chip.
- *
- *  \dir Drivers/USB
- *  \brief USB controller peripheral driver files.
- *
- *  This folder contains the complete LUFA USB stack and controller files, including the core driver and stack, as well
- *  as the USB class driver implementations.
- *
- *  \dir Drivers/USB/Core
- *  \brief Core USB driver files.
- *
- *  This folder contains the core USB stack and controller driver files, to correctly implement USB functionality on the
- *  target architecture and microcontroller model. This
- *
- *  \dir Drivers/USB/Class
- *  \brief USB Class helper driver files.
- *
- *  This folder contains drivers for implementing functionality of standardized USB classes. These are not used directly by the library,
- *  but provide a standard and library-maintained way of implementing functionality from some of the defined USB classes without extensive
- *  development effort. Is is recommended that these drivers be used where possible to reduce maintenance of user applications.
- *
- *  \dir Drivers/USB/Class/Device
- *  \brief USB Device Class helper driver files.
- *
- *  Device mode drivers for the standard USB classes.
- *
- *  \dir Drivers/USB/Class/Host
- *  \brief USB Host Class helper driver files.
- *
- *  Host mode drivers for the standard USB classes.
- *
- *  \dir Drivers/Board
- *  \brief Board hardware driver files.
- *
- *  This folder contains drivers for interfacing with the physical hardware on supported commercial boards, primarily from
- *  the Atmel corporation. Header files in this folder should be included in user applications requiring the functionality of
- *  hardware placed on supported boards.
- *
- *  \dir CodeTemplates
- *  \brief Code templates for use in LUFA powered applications.
- *
- *  This contains code templates for board drivers, sample LUFA project makefiles and other similar templates that can be copied into
- *  a LUFA powered application and modified to speed up development.
- *
- *  \dir CodeTemplates/DriverStubs
- *  \brief Driver stub header files for custom boards, to allow the LUFA board drivers to operate.
- *
- *  This contains stub files for the LUFA board drivers. If the LUFA board drivers are used with board hardware other than those
- *  directly supported by the library, the BOARD parameter of the application's makefile can be set to "USER", and these stub files
- *  copied to the "/Board/" directory of the application's folder. When fleshed out with working driver code for the custom board,
- *  the corresponding LUFA board APIs will work correctly with the non-standard board hardware.
- */
-
diff --git a/NativePrograms/LUFA/DoxygenPages/Donating.txt b/NativePrograms/LUFA/DoxygenPages/Donating.txt
deleted file mode 100644
index dd0e82588e..0000000000
--- a/NativePrograms/LUFA/DoxygenPages/Donating.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-/** \file
- *
- *  This file contains special DoxyGen information for the generation of the main page and other special
- *  documentation pages. It is not a project source file.
- */
-
-/**
- *  \page Page_Donating Donating to Support This Project
- *
- *  \image html Images/Author.jpg "Dean Camera, LUFA Developer"
- *
- *  I am a software developer working on LUFA in my spare time. The development and support of this library requires
- *  much effort from myself, as I am the sole developer, maintainer and supporter. Please consider donating a small
- *  amount to support this and my future Open Source projects - All donations are <i>greatly</i> appreciated.
- *
- *  Note that commercial entities can remove the attribution portion of the LUFA license by a one-time fee - see
- *  \ref Page_LicenseInfo for more details (<b>Note: Please do NOT pay this in advance through the donation link below -
- *  contact author for payment details.</b>).
- *
- *  <a href="http://www.fourwalledcubicle.com">Donate to this project (via PayPal)</a> - Thanks in Advance!
- */
-
diff --git a/NativePrograms/LUFA/DoxygenPages/FutureChanges.txt b/NativePrograms/LUFA/DoxygenPages/FutureChanges.txt
deleted file mode 100644
index cab2426001..0000000000
--- a/NativePrograms/LUFA/DoxygenPages/FutureChanges.txt
+++ /dev/null
@@ -1,47 +0,0 @@
-/** \file
- *
- *  This file contains special DoxyGen information for the generation of the main page and other special
- *  documentation pages. It is not a project source file.
- */
-
- /** \page Page_FutureChanges Future Changes
-  *
-  *  Below is a list of future changes which are proposed for the LUFA library, but not yet started/complete.
-  *  This gives an unordered list of future changes which may be available in future releases of the library.
-  *  If you have an item to add to this list, please contact the library author via email, the LUFA mailing list,
-  *  or post your suggestion as an enhancement request to the project bug tracker.
-  *
-  *  <b>Targeted for Future Releases:</b>
-  *  - Code Features
-  *      -# Add hub support when in Host mode for multiple devices
-  *      -# Investigate virtual hubs when in device mode instead of composite devices
-  *      -# Re-add interrupt Pipe/Endpoint support
-  *      -# Update stream APIs to use DMA transfers on supported architectures
-  *      -# Pull out third party libraries into a separate folder and reference them as required
-  *      -# Add a LUFA_YIELD macro for integration into a third-party RTOS
-  *      -# Abstract out Mass Storage byte send/receive to prevent low level API use in projects
-  *      -# Fix HID report parser usage support for array types
-  *      -# Make HOST_DEVICE_SETTLE_DELAY_MS a global variable that can be changed
-  *      -# Add MANDATORY_EVENT_FUNCTIONS compile time option
-  *      -# Add watchdog support to the library and apps/bootloaders
-  *      -# Limit the maximum size of control transfers
-  *  - Testing/Verification
-  *      -# Re-run USBIF test suite on all classes to formally verify operation
-  *      -# Implement automated functional testing of all demos
-  *  - Documentation/Support
-  *      -# Add detailed overviews of how each demo works
-  *      -# Add board overviews
-  *      -# Write LUFA tutorials
-  *  - Demos/Projects
-  *      -# Add class driver support for Test and Measurement class
-  *      -# Add class driver support for EEM class
-  *      -# Add class driver support for ECM class
-  *      -# Add class driver generic HID report host demo
-  *      -# Implement flow control for USB to Serial project
-  *  - Ports
-  *      -# Port all demos to multiple architectures
-  *      -# Finish USB XMEGA port
-  *      -# Add AVR32 UC3C, UC3D and UC3L support
-  *      -# Other (commercial) C compilers
-  */
-
diff --git a/NativePrograms/LUFA/DoxygenPages/GettingStarted.txt b/NativePrograms/LUFA/DoxygenPages/GettingStarted.txt
deleted file mode 100644
index b37081ecc7..0000000000
--- a/NativePrograms/LUFA/DoxygenPages/GettingStarted.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-/** \file
- *
- *  This file contains special DoxyGen information for the generation of the main page and other special
- *  documentation pages. It is not a project source file.
- */
-
-/** \page Page_GettingStarted Getting Started
- *
- *  Getting started with LUFA is easy; read the content below to get on your way to your first LUFA powered application.
- *
- *  \section Sec_DemosOverview The LUFA Demo Applications
- *
- *  Out of the box, LUFA contains a large number of pre-made class demos for you to test, experiment with and
- *  ultimately build upon for your own projects. All the demos (where possible) come pre-configured to build and
- *  run correctly on the AT90USB1287 AVR microcontroller, mounted on the Atmel USBKEY board and running at an 8MHz
- *  master clock. This is due to two reasons; one, it is the hardware the author possesses, and two, it is the most
- *  popular Atmel USB demonstration board to date. To learn how to reconfigure, recompile and program the included
- *  LUFA applications using different settings, see the subsections below.
- *
- *  \section Sec_ClassOrLowLevel Class Driver and Low Level Demos
- *
- *  Most of the included demos in the /Demos/ folder come in both ClassDriver and LowLevel varieties. If you are new
- *  to LUFA, it is highly recommended that you look at the ClassDriver versions first, which use the pre-made USB
- *  Class Drivers (\ref Group_USBClassDrivers) to simplify the use of the standard USB classes in user applications.
- *  These demos give a basic but easy to use interface to the USB class used in the demo application, such as HID or
- *  CDC.
- *
- *  Those needing absolute control over the class implementation can look at the LowLevel demos, which implement the
- *  required USB class directly in the demo application using the lowest level LUFA APIs.
- *
- *
- *  <b>Subsections:</b>
- *  \li \subpage Page_ConfiguringApps - How to Configure the Included Demos, Projects and Bootloaders
- *  \li \subpage Page_CompilingApps - How to Compile the Included Demos, Projects and Bootloaders
- *  \li \subpage Page_ProgrammingApps - How to Program an AVR with the Included Demos, Projects and Bootloaders
- */
-
diff --git a/NativePrograms/LUFA/DoxygenPages/Groups.txt b/NativePrograms/LUFA/DoxygenPages/Groups.txt
deleted file mode 100644
index 340c9510f6..0000000000
--- a/NativePrograms/LUFA/DoxygenPages/Groups.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-/** \file
- *
- *  This file contains special DoxyGen information for the generation of the main page and other special
- *  documentation pages. It is not a project source file.
- */
-
-/** \defgroup Group_BoardDrivers Board Drivers
- *
- *  \brief Functions, macros, variables, enums and types related to the control of physical board hardware.
- */
-
-/** \defgroup Group_PeripheralDrivers On-chip Peripheral Drivers
- *
- *  \brief Functions, macros, variables, enums and types related to the control of AVR subsystems.
- */
-
-/** \defgroup Group_MiscDrivers Miscellaneous Drivers
- *
- *  \brief Miscellaneous driver Functions, macros, variables, enums and types.
- */
-
-/** \defgroup Group_PlatformDrivers_AVR8 AVR8
- *  \ingroup Group_PlatformDrivers
- *
- *  \brief Drivers relating to the AVR8 architecture platform, such as clock setup and interrupt management.
- */
-
-/** \defgroup Group_PlatformDrivers_XMEGA XMEGA
- *  \ingroup Group_PlatformDrivers
- *
- *  \brief Drivers relating to the XMEGA architecture platform, such as clock setup and interrupt management.
- */
-
-/** \defgroup Group_PlatformDrivers_UC3 UC3
- *  \ingroup Group_PlatformDrivers
- *
- *  \brief Drivers relating to the UC3 architecture platform, such as clock setup and interrupt management.
- */
diff --git a/NativePrograms/LUFA/DoxygenPages/Images/Author.jpg b/NativePrograms/LUFA/DoxygenPages/Images/Author.jpg
deleted file mode 100644
index e8f5541a0e..0000000000
Binary files a/NativePrograms/LUFA/DoxygenPages/Images/Author.jpg and /dev/null differ
diff --git a/NativePrograms/LUFA/DoxygenPages/Images/LUFA.png b/NativePrograms/LUFA/DoxygenPages/Images/LUFA.png
deleted file mode 100644
index 54fa1a6643..0000000000
Binary files a/NativePrograms/LUFA/DoxygenPages/Images/LUFA.png and /dev/null differ
diff --git a/NativePrograms/LUFA/DoxygenPages/Images/LUFA_thumb.png b/NativePrograms/LUFA/DoxygenPages/Images/LUFA_thumb.png
deleted file mode 100644
index efa5386778..0000000000
Binary files a/NativePrograms/LUFA/DoxygenPages/Images/LUFA_thumb.png and /dev/null differ
diff --git a/NativePrograms/LUFA/DoxygenPages/KnownIssues.txt b/NativePrograms/LUFA/DoxygenPages/KnownIssues.txt
deleted file mode 100644
index 4d3aac2cb8..0000000000
--- a/NativePrograms/LUFA/DoxygenPages/KnownIssues.txt
+++ /dev/null
@@ -1,263 +0,0 @@
-/** \file
- *
- *  This file contains special DoxyGen information for the generation of the main page and other special
- *  documentation pages. It is not a project source file.
- */
-
- /** \page Page_KnownIssues Known Issues
-  *  The following are known issues present in each official LUFA release. This list should contain all known
-  *  issues in the library. Most of these issues should be corrected in the future release - see
-  *  \ref Page_FutureChanges for a list of planned changes in future releases.
-  *
-  *  \section Sec_KnownIssuesXXXXXX Version XXXXXX
-  *  - AVR8 Architecture
-  *    - No known issues.
-  *  - UC3 Architecture
-  *    \warning The UC3 device support is currently <b>experimental</b> (incomplete and/or non-functional), and is included for preview purposes only. \n
-  *
-  *    - No demos, bootloaders or projects have been ported for the UC3 devices in the current release,
-  *      although the architecture is supported in the LUFA core library.
-  *    - DMA transfers to and from the USB controller are not yet implemented for this release.
-  *    - The UC3C, UC3D and UC3L sub-families of UC3 are not currently supported by the library due to their
-  *      altered USB controller design.
-  *    - The various \c *_CreateStream() functions for creating standard \c <stdio.h> compatible virtual file
-  *      streams are not available on the UC3 architecture, due to a lack of suitable library support.
-  *  - XMEGA Architecture
-  *    \warning The XMEGA device support is currently <b>experimental</b> (incomplete and/or non-functional), and is included for preview purposes only.
-  *
-  *    - Endpoints of more than 64 bytes are not currently supported in this release.
-  *    - Isochronous endpoints are not currently supported in this release. As a result, the audio class
-  *      cannot be used on XMEGA devices.
-  *    - Multiple-bank endpoints are not currently supported in this release.
-  *    - Early silicon revisions of the ATXMEGA128A1U are incompatible with LUFA, due to their various errata
-  *      relating to the USB controller.
-  *  - Architecture Independent
-  *    - The LUFA library is not watchdog aware, and thus timeouts are possible if short periods are used
-  *      and a lengthy USB operation is initiated.
-  *    - No LUFA provided driver INF files for Windows are signed, and thus may fail to install on systems where driver signing is enforced (e.g. Windows 8/10).
-  *  - Build System
-  *    - No known issues.
-  *
-  *  \section Sec_KnownIssues170418 Version 170418
-  *  - AVR8 Architecture
-  *    - No known issues.
-  *  - UC3 Architecture
-  *    \warning The UC3 device support is currently <b>experimental</b> (incomplete and/or non-functional), and is included for preview purposes only. \n
-  *
-  *    - No demos, bootloaders or projects have been ported for the UC3 devices in the current release,
-  *      although the architecture is supported in the LUFA core library.
-  *    - DMA transfers to and from the USB controller are not yet implemented for this release.
-  *    - The UC3C, UC3D and UC3L sub-families of UC3 are not currently supported by the library due to their
-  *      altered USB controller design.
-  *    - The various \c *_CreateStream() functions for creating standard \c <stdio.h> compatible virtual file
-  *      streams are not available on the UC3 architecture, due to a lack of suitable library support.
-  *  - XMEGA Architecture
-  *    \warning The XMEGA device support is currently <b>experimental</b> (incomplete and/or non-functional), and is included for preview purposes only.
-  *
-  *    - Endpoints of more than 64 bytes are not currently supported in this release.
-  *    - Isochronous endpoints are not currently supported in this release. As a result, the audio class
-  *      cannot be used on XMEGA devices.
-  *    - Multiple-bank endpoints are not currently supported in this release.
-  *    - Early silicon revisions of the ATXMEGA128A1U are incompatible with LUFA, due to their various errata
-  *      relating to the USB controller.
-  *  - Architecture Independent
-  *    - The LUFA library is not watchdog aware, and thus timeouts are possible if short periods are used
-  *      and a lengthy USB operation is initiated.
-  *    - No LUFA provided driver INF files for Windows are signed, and thus may fail to install on systems where driver signing is enforced (e.g. Windows 8/10).
-  *  - Build System
-  *    - No known issues.
-  *  - Atmel Studio Integration
-  *    - Not all devices are listed in the "Supported Parts" screen when selecting a device. To select an alternative device, change the "Show Device" drop-down to "All Parts".
-  *    - When switching boards after changing the device selection, a second conflicting \c BOARD symbol definition can be created that prevents successful compilation. To fix, open the project properties window (<i>Project->Project {name} Properties...</i> menu item), click the "Toolchain" tab, click "Symbols" under the "AVR/GNU C Compiler" section and remove the incorrect definition.
-  *
-  *  \section Sec_KnownIssues151115 Version 151115
-  *  - AVR8 Architecture
-  *    - No known issues.
-  *  - UC3 Architecture
-  *    \warning The UC3 device support is currently <b>experimental</b> (incomplete and/or non-functional), and is included for preview purposes only. \n
-  *
-  *    - No demos, bootloaders or projects have been ported for the UC3 devices in the current release,
-  *      although the architecture is supported in the LUFA core library.
-  *    - DMA transfers to and from the USB controller are not yet implemented for this release.
-  *    - The UC3C, UC3D and UC3L sub-families of UC3 are not currently supported by the library due to their
-  *      altered USB controller design.
-  *    - The various \c *_CreateStream() functions for creating standard \c <stdio.h> compatible virtual file
-  *      streams are not available on the UC3 architecture, due to a lack of suitable library support.
-  *  - XMEGA Architecture
-  *    \warning The XMEGA device support is currently <b>experimental</b> (incomplete and/or non-functional), and is included for preview purposes only.
-  *
-  *    - Endpoints of more than 64 bytes are not currently supported in this release.
-  *    - Isochronous endpoints are not currently supported in this release. As a result, the audio class
-  *      cannot be used on XMEGA devices.
-  *    - Multiple-bank endpoints are not currently supported in this release.
-  *    - Early silicon revisions of the ATXMEGA128A1U are incompatible with LUFA, due to their various errata
-  *      relating to the USB controller.
-  *  - Architecture Independent
-  *    - The LUFA library is not watchdog aware, and thus timeouts are possible if short periods are used
-  *      and a lengthy USB operation is initiated.
-  *    - No LUFA provided driver INF files for Windows are signed, and thus may fail to install on systems where driver signing is enforced (e.g. Windows 8).
-  *  - Build System
-  *    - No known issues.
-  *  - Atmel Studio Integration
-  *    - Not all devices are listed in the "Supported Parts" screen when selecting a device. To select an alternative device, change the "Show Device" drop-down to "All Parts".
-  *    - When switching boards after changing the device selection, a second conflicting \c BOARD symbol definition can be created that prevents successful compilation. To fix, open the project properties window (<i>Project->Project {name} Properties...</i> menu item), click the "Toolchain" tab, click "Symbols" under the "AVR/GNU C Compiler" section and remove the incorrect definition.
-  *
-  *  \section Sec_KnownIssues140928 Version 140928
-  *  - AVR8 Architecture
-  *    - No known issues.
-  *  - UC3 Architecture
-  *    \warning The UC3 device support is currently <b>experimental</b> (incomplete and/or non-functional), and is included for preview purposes only. \n
-  *
-  *    - No demos, bootloaders or projects have been ported for the UC3 devices in the current release,
-  *      although the architecture is supported in the LUFA core library.
-  *    - DMA transfers to and from the USB controller are not yet implemented for this release.
-  *    - The UC3C, UC3D and UC3L sub-families of UC3 are not currently supported by the library due to their
-  *      altered USB controller design.
-  *    - The various \c *_CreateStream() functions for creating standard \c <stdio.h> compatible virtual file
-  *      streams are not available on the UC3 architecture, due to a lack of suitable library support.
-  *  - XMEGA Architecture
-  *    \warning The XMEGA device support is currently <b>experimental</b> (incomplete and/or non-functional), and is included for preview purposes only.
-  *
-  *    - Endpoints of more than 64 bytes are not currently supported in this release.
-  *    - Isochronous endpoints are not currently supported in this release. As a result, the audio class
-  *      cannot be used on XMEGA devices.
-  *    - Multiple-bank endpoints are not currently supported in this release.
-  *    - Early silicon revisions of the ATXMEGA128A1U are incompatible with LUFA, due to their various errata
-  *      relating to the USB controller.
-  *  - Architecture Independent
-  *    - The LUFA library is not watchdog aware, and thus timeouts are possible if short periods are used
-  *      and a lengthy USB operation is initiated.
-  *    - No LUFA provided driver INF files for Windows are signed, and thus may fail to install on systems where driver signing is enforced (e.g. Windows 8).
-  *  - Build System
-  *    - No known issues.
-  *  - Atmel Studio Integration
-  *    - Not all devices are listed in the "Supported Parts" screen when selecting a device. To select an alternative device, change the "Show Device" drop-down to "All Parts".
-  *    - When switching boards after changing the device selection, a second conflicting \c BOARD symbol definition can be created that prevents successful compilation. To fix, open the project properties window (<i>Project->Project {name} Properties...</i> menu item), click the "Toolchain" tab, click "Symbols" under the "AVR/GNU C Compiler" section and remove the incorrect definition.
-  *
-  *  \section Sec_KnownIssues140302 Version 140302
-  *  - AVR8 Architecture
-  *    - No known issues.
-  *  - UC3 Architecture
-  *    \warning The UC3 device support is currently <b>experimental</b> (incomplete and/or non-functional), and is included for preview purposes only. \n
-  *
-  *    - No demos, bootloaders or projects have been ported for the UC3 devices in the current release,
-  *      although the architecture is supported in the LUFA core library.
-  *    - DMA transfers to and from the USB controller are not yet implemented for this release.
-  *    - The UC3C, UC3D and UC3L sub-families of UC3 are not currently supported by the library due to their
-  *      altered USB controller design.
-  *    - The various \c *_CreateStream() functions for creating standard \c <stdio.h> compatible virtual file
-  *      streams are not available on the UC3 architecture, due to a lack of suitable library support.
-  *  - XMEGA Architecture
-  *    \warning The XMEGA device support is currently <b>experimental</b> (incomplete and/or non-functional), and is included for preview purposes only.
-  *
-  *    - Endpoints of more than 64 bytes are not currently supported in this release.
-  *    - Isochronous endpoints are not currently supported in this release. As a result, the audio class
-  *      cannot be used on XMEGA devices.
-  *    - Multiple-bank endpoints are not currently supported in this release.
-  *    - Early silicon revisions of the ATXMEGA128A1U are incompatible with LUFA, due to their various errata
-  *      relating to the USB controller.
-  *  - Architecture Independent
-  *    - The LUFA library is not watchdog aware, and thus timeouts are possible if short periods are used
-  *      and a lengthy USB operation is initiated.
-  *    - No LUFA provided driver INF files for Windows are signed, and thus may fail to install on systems where driver signing is enforced (e.g. Windows 8).
-  *  - Build System
-  *    - No known issues.
-  *  - Atmel Studio Integration
-  *    - Not all devices are listed in the "Supported Parts" screen when selecting a device. To select an alternative device, change the "Show Device" drop-down to "All Parts".
-  *    - When switching boards after changing the device selection, a second conflicting BOARD symbol definition can be created that prevents successful compilation. To fix, open the project properties window (<i>Project->Project {name} Properties...</i> menu item), click the Toolchain tab, click "Symbols" under the "AVR/GNU C Compiler" section and remove the incorrect definition.
-  *
-  *  \section Sec_KnownIssues130901 Version 130901
-  *  - AVR8 Architecture
-  *    - No known issues.
-  *  - UC3 Architecture
-  *    \warning The UC3 device support is currently <b>experimental</b> (incomplete and/or non-functional), and is included for preview purposes only. \n
-  *
-  *    - No demos, bootloaders or projects have been ported for the UC3 devices in the current release,
-  *      although the architecture is supported in the LUFA core library.
-  *    - DMA transfers to and from the USB controller are not yet implemented for this release.
-  *    - The UC3C, UC3D and UC3L sub-families of UC3 are not currently supported by the library due to their
-  *      altered USB controller design.
-  *    - The various \c *_CreateStream() functions for creating standard \c <stdio.h> compatible virtual file
-  *      streams are not available on the UC3 architecture, due to a lack of suitable library support.
-  *  - XMEGA Architecture
-  *    \warning The XMEGA device support is currently <b>experimental</b> (incomplete and/or non-functional), and is included for preview purposes only.
-  *
-  *    - Endpoints of more than 64 bytes are not currently supported in this release.
-  *    - Isochronous endpoints are not currently supported in this release. As a result, the audio class
-  *      cannot be used on XMEGA devices.
-  *    - Multiple-bank endpoints are not currently supported in this release.
-  *    - Early silicon revisions of the ATXMEGA128A1U are incompatible with LUFA, due to their various errata
-  *      relating to the USB controller.
-  *  - Architecture Independent
-  *    - The LUFA library is not watchdog aware, and thus timeouts are possible if short periods are used
-  *      and a lengthy USB operation is initiated.
-  *    - No LUFA provided driver INF files for Windows are signed, and thus may fail to install on systems where driver signing is enforced (e.g. Windows 8).
-  *  - Build System
-  *    - No known issues.
-  *  - Atmel Studio Integration
-  *    - Not all devices are listed in the "Supported Parts" screen when selecting a device. To select an alternative device, change the "Show Device" drop-down to "All Parts".
-  *    - When switching boards after changing the device selection, a second conflicting BOARD symbol definition can be created that prevents successful compilation. To fix, open the project properties window (<i>Project->Project {name} Properties...</i> menu item), click the Toolchain tab, click "Symbols" under the "AVR/GNU C Compiler" section and remove the incorrect definition.
-  *
-  *  \section Sec_KnownIssues130303 Version 130303
-  *  - AVR8 Architecture
-  *    - No known issues.
-  *  - UC3 Architecture
-  *    \warning The UC3 device support is currently <b>experimental</b> (incomplete and/or non-functional), and is included for preview purposes only. \n
-  *
-  *    - No demos, bootloaders or projects have been ported for the UC3 devices in the current release,
-  *      although the architecture is supported in the LUFA core library.
-  *    - DMA transfers to and from the USB controller are not yet implemented for this release.
-  *    - The UC3C, UC3D and UC3L sub-families of UC3 are not currently supported by the library due to their
-  *      altered USB controller design.
-  *    - The various \c CreateStream() functions for creating standard \c <stdio.h> compatible virtual file
-  *      streams are not available on the UC3 architecture, due to a lack of suitable library support.
-  *  - XMEGA Architecture
-  *    \warning The XMEGA device support is currently <b>experimental</b> (incomplete and/or non-functional), and is included for preview purposes only.
-  *
-  *    - No demos, bootloaders or projects have been ported for the XMEGA devices in the current release,
-  *      although the architecture is supported in the LUFA core library.
-  *    - Endpoints of more than 64 bytes are not currently supported in this release.
-  *    - Isochronous endpoints are not currently supported in this release. As a result, the audio class
-  *      cannot be used on XMEGA devices.
-  *    - Multiple-bank endpoints are not currently supported in this release.
-  *    - Early revisions of the ATXMEGA128A1U are incompatible with LUFA, due to their various errata
-  *      relating to the USB controller.
-  *  - Architecture Independent
-  *    - The LUFA library is not watchdog aware, and thus timeouts are possible if short periods are used
-  *      and a lengthy USB operation is initiated.
-  *    - No LUFA provided driver INF files for Windows are signed, and thus may fail to install on systems where driver signing is enforced (e.g. Windows 8).
-  *  - Build System
-  *    - No known issues.
-  *
-  *  \section Sec_KnownIssues120730 Version 120730
-  *  - AVR8 Architecture
-  *    - No known issues.
-  *  - UC3 Architecture
-  *    \warning The UC3 device support is currently <b>experimental</b> (incomplete and/or non-functional), and is included for preview purposes only. \n
-  *
-  *    - No demos, bootloaders or projects have been ported for the UC3 devices in the current release,
-  *      although the architecture is supported in the LUFA core library.
-  *    - DMA transfers to and from the USB controller are not yet implemented for this release.
-  *    - The UC3C, UC3D and UC3L sub-families of UC3 are not currently supported by the library due to their
-  *      altered USB controller design.
-  *    - The various \c CreateStream() functions for creating standard \c <stdio.h> compatible virtual file
-  *      streams are not available on the UC3 architecture, due to a lack of suitable library support.
-  *  - XMEGA Architecture
-  *    \warning The XMEGA device support is currently <b>experimental</b> (incomplete and/or non-functional), and is included for preview purposes only.
-  *
-  *    - No demos, bootloaders or projects have been ported for the XMEGA devices in the current release,
-  *      although the architecture is supported in the LUFA core library.
-  *    - Endpoints of more than 64 bytes are not currently supported in this release.
-  *    - Isochronous endpoints are not currently supported in this release. As a result, the audio class
-  *      cannot be used on XMEGA devices.
-  *    - Multiple-bank endpoints are not currently supported in this release.
-  *    - Early revisions of the ATXMEGA128A1U are incompatible with LUFA, due to their various errata
-  *      relating to the USB controller.
-  *  - Architecture Independent
-  *    - The LUFA library is not watchdog aware, and thus timeouts are possible if short periods are used
-  *      and a lengthy USB operation is initiated.
-  *    - No LUFA provided driver INF files for Windows are signed, and thus may fail to install on systems where driver signing is enforced (e.g. Windows 8).
-  *  - Build System
-  *    - No known issues.
-  */
-
diff --git a/NativePrograms/LUFA/DoxygenPages/LUFAPoweredProjects.txt b/NativePrograms/LUFA/DoxygenPages/LUFAPoweredProjects.txt
deleted file mode 100644
index 5989bb117b..0000000000
--- a/NativePrograms/LUFA/DoxygenPages/LUFAPoweredProjects.txt
+++ /dev/null
@@ -1,230 +0,0 @@
-/** \file
- *
- *  This file contains special DoxyGen information for the generation of the main page and other special
- *  documentation pages. It is not a project source file.
- */
-
-/** \page Page_LUFAPoweredProjects User Projects Powered by LUFA
- *
- *  LUFA is currently in use all around the world, in many applications both commercial and non-commercial. Below is a
- *  list of known public LUFA powered projects, which all use the LUFA library in some way. Feel free to visit each project's
- *  home page for more information on each project.
- *
- *  If you have a project that you would like to add to this list, please contact me via the details on the main page of this
- *  documentation.
- *
- *  \section Sec_BoardsUsingLUFA AVR-USB Development Boards Using LUFA
- *
- *  The following is a list of known AVR USB development boards, which recommend using LUFA for the USB stack. Some of these
- *  are open design, and all are available for purchase as completed development boards suitable for project development.
- *
- *  \li Adafruit Atmega32u4 Breakout Board: http://www.adafruit.com/product/296
- *  \li AVR-USB-162, a USBKEY-like development board for the AT90USB162: http://olimex.com/dev/avr-usb-162.html
- *  \li Benito #7, a no-frills USB board: http://www.dorkbotpdx.org/wiki/benito
- *  \li Duce, the successor to the Benito #7: http://dorkbotpdx.org/wiki/duce
- *  \li JM-DB-U2, an ATMEGA32U2 development board: http://u2.mattair.net/index.html
- *  \li Micropendous, an open design/source set of AVR USB development boards: http://micropendous.org/
- *  \li Microsin AVR-USB162 breakout board, a DIY AT90USB162 development board: http://microsin.ru/content/view/685/44/
- *  \li Minimus USB, a board specially designed for PSGroove: http://www.minimususb.com/
- *  \li Nanduino, a do-it-yourself AT90USB162 board: http://www.makestuff.eu/wordpress/?page_id=569
- *  \li Sparkfun ATMEGA8U2 breakout board: http://www.sparkfun.com/products/10277
- *  \li Teensy and Teensy++, two other AVR USB development boards: http://www.pjrc.com/teensy/index.html
- *  \li U2DIL/U4DIL, a set of DIP layout USB AVR boards: http://www.reworld.eu/re/en/products/u2dil/
- *  \li USB2AX, a tiny USB to serial converter board: http://paranoidstudio.assembla.com/wiki/show/paranoidstudio/USB2AX
- *  \li USBFOO 2, AT90USB162 based development board: http://shop.kernelconcepts.de/product_info.php?products_id=102
- *
- *  \section Sec_LUFAProjects Projects Using LUFA (Hobbyist)
- *
- *  The following are known hobbyist projects using LUFA. Most are open source, and show off interesting ways that the LUFA library
- *  can be incorporated into many different applications.
- *
- *  \li Accelerometer Game Joystick: http://www.crictor.co.il/he/episodes/joystick/
- *  \li Adjacent Reality Motion Tracker: http://www.adjacentreality.org/
- *  \li AD9833 based USB Function Generator: http://tuomasnylund.fi/drupal6/content/ad9833-based-usb-function-generator
- *  \li AERY development platform for the AVR32 devices: http://www.aery32.com/
- *  \li AM Radio transmitter: http://amcinnes.info/2012/uc_am_xmit/
- *  \li Arcade Controller: http://fletchtronics.net/arcade-controller-made-petunia
- *  \li Arcade Joystick: http://jamie.lentin.co.uk/embedded/arcade-joystick/
- *  \li AttoBasic AVR BASIC interpreter: http://cappels.org/dproj/AttoBasic_Home/AttoBasic_Home.html
- *  \li AVR USB Modem, a 3G Wireless Modem host: http://code.google.com/p/avrusbmodem/
- *  \li Bicycle POV: http://www.code.google.com/p/bicycleledpov/
- *  \li Bluetooth Explorerbot: http://code.google.com/p/bluetooth-explorerbot/
- *  \li Bus Ninja, an AVR clone of the popular BusPirate project: http://blog.hodgepig.org/busninja/
- *  \li CAMTRIG, a remote Camera Trigger device: http://code.astraw.com/projects/motmot/camtrig
- *  \li ChameleonMini, a smart card emulator: https://github.com/skuep/ChameleonMini
- *  \li CD Driver Emulator Dongle for ISO Files: http://cdemu.blogspot.com/
- *  \li ChipWhisperer, a signal capture device: https://www.assembla.com/spaces/chipwhisperer/wiki/ChipWhisperer_Rev2_Capture_Hardware
- *  \li ClockTamer, a configurable clock generator: http://code.google.com/p/clock-tamer/
- *  \li Collection of alternative Arduino Uno firmwares: http://hunt.net.nz/users/darran/
- *  \li Computer controlled LED matrix (Russian): http://we.easyelectronics.ru/AVR/nebolshoy-primer-s-lufa-hidapi.html
- *  \li CULFW, a 868MHz RF packet encoder/decoder: http://www.koeniglich.de/culfw/culfw.html
- *  \li Dashkey, a custom PC keyboard controller: http://geekhack.org/showwiki.php?title=Island:19096
- *  \li DIY PS3 controller emulator: https://code.google.com/p/diyps3controller/
- *  \li EMuSer, a USB-RS422 adapter for E-Mu samplers: http://www.emxp.net/EMuSer.htm
- *  \li EQ Track, a telescope mount controller: http://sourceforge.net/projects/eqtrack/
- *  \li Estick JTAG, an ARM JTAG debugger: http://code.google.com/p/estick-jtag/
- *  \li "Fingerlicking Wingdinger" (WARNING: Bad language if no Javascript), a MIDI controller: http://noisybox.net/electronics/wingdinger/
- *  \li Flyatar, a real-time fly tracking system: https://github.com/peterpolidoro/Flyatar
- *  \li FootJoy, a 22 button, 6-axis josystick with keyboard and mouse modes: https://bitbucket.org/sirbrialliance/foot-joy/
- *  \li Gamecube controller to USB adapter: https://www.facebook.com/media/set/?set=a.10150202447076304.310536.688776303&l=df53851c50
- *  \li Garmin GPS USB to NMEA standard serial sentence translator: http://github.com/nall/garmin-transmogrifier/tree/master
- *  \li Geiger Counter with USB interface: http://www.hforsten.com/i-made-a-geiger-counter.html
- *  \li Generic HID Device Creator: http://generichid.sourceforge.net/
- *  \li Generic HID Open Source Framework: http://www.waitingforfriday.com/index.php/USB_Generic_HID_Open_Source_Framework_for_Atmel_AVR_and_Windows
- *  \li Ghetto Drum, a MIDI drum controller: http://noisybox.net/art/gdrum/
- *  \li GPS enabled lap timer for vehicles: http://www.assembla.com/code/ironlung/subversion/nodes/trunk/LapTimer
- *  \li GSynth, an 8-bit sound synthesizer: https://github.com/gcielniak/GSynth
- *  \li Gumbi, a Python library and USB GPIO controller: https://code.google.com/p/gumbi/
- *  \li Hardware Volume Control: https://github.com/davidk/hw-volume-control
- *  \li Hiduino, a USB-MIDI replacement firmware for the Arduino Uno: http://code.google.com/p/hiduino/
- *  \li HoodLoader2, an Arduino Uno enhanced USB AVR coprocessor bootloader: https://github.com/NicoHood/HoodLoader2
- *  \li IBM capacitive keybord replacement controller: http://downloads.cornall.co/ibm-capsense-usb-web/ibm-capsense-usb.html
- *  \li Ikea RGB LED USB modification: http://slashhome.se/p/projects/id/ikea_dioder_usb/#project
- *  \li IR electricity meter monitor: http://sourceforge.net/projects/irmetermon/
- *  \li IR Remote to Keyboard decoder: http://netzhansa.blogspot.com/2010/04/our-living-room-hi-fi-setup-needs-mp3.html
- *  \li Jukebox panic button: http://thinkl33t.co.uk/the-panic-button
- *  \li Kinesis replacement firmware: https://github.com/chrisandreae/kinesis-firmware
- *  \li LED Panel controller: http://projects.peterpolidoro.net/caltech/panelscontroller/panelscontroller.htm
- *  \li Linux Secure Storage Dongle: http://github.com/TomMD/teensy
- *  \li LUFA powered DDR dance mat (French): http://logicien-parfait.fr/dokuwiki/doku.php?id=projet:ddr_repair
- *  \li Macintosh SIMM ROM Programmer: https://code.google.com/p/mac-rom-simm-programmer/
- *  \li MakeTV Episode Dispenser: http://www.youtube.com/watch?v=BkWUi18hl3g
- *  \li Mec64,a Commodore 64 keyboard: http://deskthority.net/workshop-f7/mec64-keyboard-t4522.html
- *  \li MidiMonster, a USB-to-MIDI gateway board: http://www.dorkbotpdx.org/wiki/midimonster
- *  \li MIDI Theremin: http://baldwisdom.com/usb-midi-controller-theremin-style-on-arduino-uno/
- *  \li MIDI interface hack of a toy Guitar: http://blog.x37v.info/2011/06/26/toy-guitar-hacked-midi-conroller
- *  \li MiniBloq, a graphical Ardunio programming environment : http://minibloq.org/
- *  \li MiXley, a port of the Teacup 3D printer firmware for the USB AVRs: http://codaset.com/michielh/mixley
- *  \li Mobo 4.3, a USB controlled all band (160-10m) HF SDR transceiver: http://sites.google.com/site/lofturj/mobo4_3
- *  \li Moco, a native Arduino Uno MIDI replacement firmware: http://web.mac.com/kuwatay/morecat_lab./MocoLUFA.html
- *  \li Monash ECSE Smart Packet Radio Testbed: http://www.ecse.monash.edu.au/twiki/bin/view/WSRNLab/SmartPacketRadio
- *  \li Motherboard BIOS flasher: http://www.coreboot.org/InSystemFlasher
- *  \li Multi-button Joystick (French): http://logicien-parfait.fr/dokuwiki/doku.php?id=projet:joystick
- *  \li Music Playing Alarm Clock (Tutorial): http://www.instructables.com/id/Music-Playing-Alarm-Clock/
- *  \li Nehebkau, Laptop Controlled Keyboard and Mouse: http://www.frank-zhao.com/cache/nehebkau.php
- *  \li NeroJTAG, a JTAG dongle: https://github.com/makestuff/neroJtag
- *  \li NES Controller USB modification: https://github.com/nfd/nes_adapter
- *  \li Nikon wireless camera remote control (Norwegian): http://hekta.org/~hpe1119/
- *  \li Nintendo Four-Score, USB NES 4-player controller adapter: http://www.waitingforfriday.com/index.php/Nintendo_Four_Score_USB
- *  \li Numpad keyboard: http://tuomasnylund.fi/drupal6/content/usb-cherry-mx-numpad
- *  \li Opendous-JTAG, an open source ARM JTAG debugger: http://code.google.com/p/opendous-jtag/
- *  \li Openkubus, an open source hardware-based authentication dongle: http://code.google.com/p/openkubus/
- *  \li Orbee, a USB connected RGB Orb for notifications: http://www.franksworkshop.com.au/Electronics/Orbee/Orbee.htm
- *  \li Password keyring: http://owlsan.blogspot.no/2014/06/keyring-project-version-10.html
- *  \li Picade alternative firmware, a retro Arcade controller/cabinet: https://github.com/rktrlng/picade_lufa
- *  \li PPM signal generator over USB: https://github.com/G33KatWork/USBPPM
- *  \li ProdikeysDM, a converter for old Creative Labs Prodikeys DM keyboards for modern systems: https://github.com/hotkeymuc/ProdikeysDM_Adaptor
- *  \li Programmable keyboard controller: http://41j.com/blog/2011/10/a-programmable-keyboard-controller/
- *  \li Programmable XBOX controller: http://richard-burke.dyndns.org/wordpress/pan-galactic-gargantuan-gargle-brain-aka-xbox-360-usb-controller/
- *  \li Project Surface, a touch interface controller for Windows 8: https://code.google.com/p/project-surface/
- *  \li PSGroove, a Playstation 3 Homebrew dongle: http://github.com/psgroove
- *  \li PS/2 to USB adapter: https://github.com/makestuff/p2ukbd
- *  \li RaspiFace, an Arduino platform bridge for the Raspberry Pi: http://www.raspiface.com/
- *  \li Reflow oven controller: http://danstrother.com/2011/01/15/reflow-oven-controller/
- *  \li RFPirate, a RF experimentation platform: https://github.com/ebuller/RF-Pirate
- *  \li RF Power Meter, based on the AD8307 log amp: https://sites.google.com/site/lofturj/ad8307-power-meter
- *  \li RF Transceiver using the MRF49XA: http://alternet.us.com/?page_id=1494
- *  \li SD Card reader: http://elasticsheep.com/2010/04/teensy2-usb-mass-storage-with-an-sd-card/
- *  \li SDR1, a Software Defined Radio firmware: https://code.google.com/p/sdr-mk1/
- *  \li SEGA Megadrive/Genesis Development Cartridge: http://www.makestuff.eu/wordpress/?page_id=398
- *  \li Serial Line bus analyser: http://www.pjrc.com/teensy/projects/SerialAnalyzer.html
- *  \li Simple USB LED Controller (SULC): https://github.com/scottbez1/sulc
- *  \li SNES custom FLASH ROM: http://electrifiedfoolingmachine.co/?page_id=633
- *  \li Smartcard Detective: https://code.google.com/p/smartcarddetective/
- *  \li SmartportVHD Apple II Mass Storage adapter: http://pcedric3.free.fr/SmartportVHD/
- *  \li Single LED Matrix Display: http://guysoft.wordpress.com/2009/10/08/bumble-b/
- *  \li Simple USB LED Controller: https://github.com/scottbez1/sulc
- *  \li Stripe Snoop, a Magnetic Card reader: http://www.ossguy.com/ss_usb/
- *  \li Stylophone, with USB MIDI connectivity: http://www.waitingforfriday.com/index.php/Stylophone_Studio_5
- *  \li Teensy SD Card .WAV file player: http://elasticsheep.com/2010/04/teensy2-usb-wav-player-part-1/
- *  \li Touch It (Fabulously), presumably art: http://touch.it.fa.bulo.us/ly/
- *  \li Touchscreen Input Device: http://capnstech.blogspot.com/2010/07/touchscreen-update.html
- *  \li UDFS, a BBC Micro USB disk filing system: https://github.com/makestuff/udfs
- *  \li Universal USB AVR Module: http://usbavr.bplaced.net/
- *  \li USB Adapter for an old Teletype Printer: www.savel.org/2020/07/11/avr-usb-printer-device-and-teletype/
- *  \li USB2AX, a USB to Dynamixel network adapter: http://paranoidstudio.assembla.com/wiki/show/paranoidstudio/USB2AX
- *  \li USBPass, a USB password keeper: http://sroz.net/projects/usbpass/
- *  \li USB Business Card: http://www.limpkin.fr/index.php?post/2012/09/15/My-new-business-card
- *  \li USB Function Generator: http://tuomasnylund.fi/drupal6/content/ad9833-based-usb-function-generator
- *  \li USB Infrared Receiver/Transmitter: http://vaton4.web2001.cz/
- *  \li USB Interface for Playstation Portable Devices: http://forums.ps2dev.org/viewtopic.php?t=11001
- *  \li USB MIDI to DMX controller: http://github.com/hanshuebner/miDiMX
- *  \li USB Mood Light: https://github.com/hsbp/usb_moodlight
- *  \li USB powered Geiger Counter: http://uhrheber.wordpress.com/2011/04/28/a-usb-powered-geiger-counter-for-the-z2-and-other-computers/
- *  \li Userial, a USB to Serial converter with SPI, I2C and other protocols: http://www.tty1.net/userial/
- *  \li Wii Classic Controller to USB converter: https://github.com/crazyiop/wii-classic-2-usb
- *  \li Wireless MIDI Guitar system: http://www.ise.pw.edu.pl/~wzab/wireless_guitar_system/
- *  \li XBOX 360 Startup Sound Changer: http://www.homebrew-connection.org/change-your-xbox-360-startup-sounds-yourself/
- *  \li Xnormidi, a C MIDI library: http://x37v.info/projects/xnormidi
- *  \li XUM1541, a Commodore 64 floppy drive to USB adapter: http://www.root.org/~nate/c64/xum1541/
- *  \li Zeus, a touch screen computer for music manipulation: http://www.benbengler.com/developments_zeus.html
- *
- *  \section Sec_LUFACommercialProjects Projects Using LUFA (Commercial)
- *
- *  The following is a list of known commercial products using LUFA. Some of these are open source, although many are "black-box"
- *  solutions with no source code given. Those companies which have purchased a Commercial License to LUFA (see \ref Page_LicenseInfo)
- *  are not listed here unless specifically requested.
- *
- *  \li Alphasphere, a MIDI input sphere device for music creation: http://www.alphasphere.com/
- *  \li Arduino Uno and Leonardo, official Arduino boards: http://www.arduino.cc
- *  \li ARPS Locator: http://la3t.hamradio.no/lab//?id=tracker_en
- *  \li AsTeRICS assistive technologies project, HID actuator: http://www.asterics.eu
- *  \li BitFury, a Bitcoin ASIC miner: https://github.com/aauer1/LUFA-BitFury/tree/master/Projects/BitfuryBTC
- *  \li Ceberus, a MadCatz Xbox 360 arcade stick modifier: http://www.phreakmods.com/products/cerberus
- *  \li CFFA3000, a CompactFlash interface for the Apple II: http://www.dreher.net/CFforAppleII
- *  \li ChameleonMini, a RFID monitoring tool: https://github.com/emsec/ChameleonMini/wiki
- *  \li Digital Survey Instruments Magnetometer and Pointer: http://www.digitalsurveyinstruments.com/
- *  \li FinchRobot, a robot designed for educational use: http://www.finchrobot.com/
- *  \li Flysight, a GPS logger for wingsuit pilots: http://flysight.ca/
- *  \li Goldilocks, an Arduino compatible clone: http://feilipu.me/2014/03/08/goldilocks-1284p-arduino-uno-clone/
- *  \li HummingBird Kit, a robotics learning platform: http://www.hummingbirdkit.com/
- *  \li LP1, an AVRISP-MKII Clone AVR Programmer: http://embeddedglow.com/items/LP1/LP1.php
- *  \li Penguino, an Arduino Board With On-Board LUFA Powered Debugger/Programmer: http://wiki.icy.com.au/PenguinoAVR
- *  \li PhatIO, a filesystem based I/O interface: http://www.phatio.com/
- *  \li PIR-1, an IR control interface for consumer electronics: http://www.promixis.com/pir-1.php
- *  \li PIR-4, a USB Connected 4 port IR transmitter: http://promixis.com/pir-4.php
- *  \li PortPilot, a USB device charger with power meter: http://portpilot.net/
- *  \li KeyGlove, an alternative input system: http://www.keyglove.net/
- *  \li Many of Busware's Products: http://www.busware.de/
- *  \li MIDIFighter, a USB-MIDI controller: http://www.midifighter.com/
- *  \li MIDI USB Arduino Shield: http://openpipe.cc/products/midi-usb-shield/
- *  \li Norduino, a wireless Arduino: http://norduino.robomotic.com/norduino-is-now-usb-hid/
- *  \li Olimex AVR-ISP-MK2, an AVRISP-MKII Clone AVR Programmer: https://www.olimex.com/dev/avr-isp-mk2.html
- *  \li Retrode, a USB Games Console Cartridge Reader: http://www.retrode.org
- *  \li RFI21.1EU UHF RFID reader: http://www.metra.cz/rfid/uhf-rfid-ctecky/rfi21-1eu-uhf-rfid-ctecka.htm
- *  \li SmartCardDetective, a Smart Card analysis tool: http://www.smartcarddetective.com/
- *  \li TimelapsePlus, a digital camera time lapse tool: https://github.com/timelapseplus/TimelapsePlus-Firmware
- *  \li USBTINY-MKII, an AVRISP-MKII Clone AVR Programmer: http://tom-itx.no-ip.biz:81/~webpage/boards/USBTiny_Mkii/USBTiny_Mkii_index.php
- *  \li UDS18B20 USB Temperature sensor: http://toughlog.org/uds18b20/
- *  \li VMeter, a USB MIDI touch strip controller: http://www.vmeter.net/
- *  \li XMEGA Development Board, using LUFA as an On-Board Programmer: http://xmega.mattair.net/
- *  \li Zeptoprog, a multifunction AVR programmer: http://www.mattairtech.com/index.php/featured/zeptoprog.html
- *
- *  \section Sec_LUFAPublications Publications Mentioning LUFA
- *  The following are published magazines which have either mentioned or featured the LUFA library.
- *
- *  \li Elektor Magazine, "My First AVR-USB" by Antoine Authier (feature), January 2010 Issue
- *  \li Elektor Magazine, "USB is Cool/Sucks" by Jerry Jacobs and Chris Vossen (minor mention), January 2010 Issue
- *  \li Elektor Magazine, "20 x Open Source" by Jens Nickel, March 2010 Issue
- *  \li Circuit Cellar Magazine, "Advanced USB Design Debugging" by Collin O'Flynn, August 2010 Issue
- *  \li "Some Assembly Required: Assembly Language Programming with the AVR Microcontroller" by Timothy S. Margush
- *  \li Elektor Magazine, "Taming the Beast (2)" by Clemens Valens/Raymond Vermeulen, January 2014 Issue
- *
- *  \section Sec_LUFANotableMentions Other Notable Mentions of LUFA
- *  The following are non-print but notable mentions of the LUFA library.
- *
- *  \li Adafruit "Ask an Engineer", 7th November 2010
- *  \li Arduino 2010 Keynote speech
- *  \li Blackhat 2011 conference, "Exploiting USB Devices with Arduino"
- *  \li Defcon 24 conference, "Universal Serial aBUSe"
- *  \li The Amp Hour podcast blog #11
- *
- *  \section Sec_PortsAndForks Non-Official LUFA Ports and Forks
- *  The following are unofficial forks of the LUFA codebase, which implement different features such as support for
- *  additional architectures.
- *
- *  \li NXP's official LPCOpen "LPCUSBLib" LUFA fork, for LPC devices: http://www.lpcware.com/
- *  \li Kevin Mehall's LUFA port to the NXP LPC13xx: https://github.com/kevinmehall/LUFA-LPC13xx
- *  \li Mark Ding's port for the Silicon Labs SiM3U1xx: https://www.github.com/MarkDing/USB_CDC
- *  \li Mark Ding's port for the Silicon Labs EFM32 Giant Gecko: https://github.com/MarkDing/lufa-efm32
- */
diff --git a/NativePrograms/LUFA/DoxygenPages/LibraryResources.txt b/NativePrograms/LUFA/DoxygenPages/LibraryResources.txt
deleted file mode 100644
index d2eb94f073..0000000000
--- a/NativePrograms/LUFA/DoxygenPages/LibraryResources.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-/** \file
- *
- *  This file contains special DoxyGen information for the generation of the main page and other special
- *  documentation pages. It is not a project source file.
- */
-
-/**
- *  \page Page_Resources Library Resources
- *
- *  \section Sec_UnofficialResources Unofficial Resources
- *  Unofficial Russian LUFA documentation translation: http://microsin.ru/Download.cnt/doc/LUFA/ \n
- *  Tutorial for LUFA USB Control Transfers: http://www.avrbeginners.net/new/tutorials/usb-control-transfers-with-lufa/
- *
- *  \section Sec_ProjectPages LUFA Related Webpages
- *  Project Homepage: http://www.lufa-lib.org \n
- *  Commercial Licenses: http://www.lufa-lib.org/license \n
- *  Author's Website: http://www.fourwalledcubicle.com \n
- *  Development Blog: http://www.fourwalledcubicle.com/blog \n
- *
- *  \section Sec_ProjectHelp Assistance With LUFA
- *  Support Mailing List: http://www.lufa-lib.org/support \n
- *  Author's Email: dean [at] fourwalledcubicle [dot] com \n
- *
- *  \section Sec_InDevelopment Latest In-Development Source Code
- *  Issue Tracker: http://www.lufa-lib.org/tracker \n
- *  Public GIT Repository: http://www.lufa-lib.org/git \n
- *  Latest Repository Source Archive: http://www.lufa-lib.org/latest-archive \n
- *  Commit RSS Feed: http://www.lufa-lib.org/rss \n
- *
- *  \section Sec_USBResources USB Resources
- *  USB-IF Website: http://www.usb.org \n
- */
-
diff --git a/NativePrograms/LUFA/DoxygenPages/LicenseInfo.txt b/NativePrograms/LUFA/DoxygenPages/LicenseInfo.txt
deleted file mode 100644
index 12e7486a76..0000000000
--- a/NativePrograms/LUFA/DoxygenPages/LicenseInfo.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-/** \file
- *
- *  This file contains special DoxyGen information for the generation of the main page and other special
- *  documentation pages. It is not a project source file.
- */
-
-/**
- *  \page Page_LicenseInfo Source Code License
- *
- *  The LUFA library is currently released under the MIT license, included below.
- *
- *  \section Sec_LicenseForHumans License Summary for Human Beings
- *  Everyone is free to use LUFA without payment - even in commercial applications
- *  where the product source code is not publicly disclosed. However, use of the
- *  library must be in accordance with the library license conditions.
- *
- *  If you wish to use LUFA without payment, you <b>must</b> include a copy of the
- *  full license text below with your product or project - on your website, and in
- *  an accompanying manual or other materials for the product. As long as the entire
- *  license text is made available and obvious to the users of your product, you
- *  are free to incorporate the LUFA library into your product without special
- *  additional licensing.
- *
- *  \section Sec_CommercialLicenses Commercial Licensing
- *  In some instances the small requirement for public disclosure of LUFA within a
- *  product is unwanted; in these instances a commercial license is offered up as an
- *  alternative to the standard LUFA license.
- *
- *  Commercial entities can opt out of the public disclosure clause in this license
- *  for a one-time US$1500 payment. This provides a non-exclusive modified MIT
- *  licensed which allows for the free use of the LUFA library, bootloaders and
- *  (where the sole copyright is attributed to Dean Camera) demos without public
- *  disclosure within an organization, in addition to three free hours of consultation
- *  with the library author, and priority support.
- *
- *  Please visit the Commercial License link on \ref Page_Resources for more information on
- *  ordering a commercial license for your company.
- *
- *  \section Sec_LicenseText LUFA License Text
- *
- *  \verbinclude License.txt
- */
-
diff --git a/NativePrograms/LUFA/DoxygenPages/MainPage.txt b/NativePrograms/LUFA/DoxygenPages/MainPage.txt
deleted file mode 100644
index ce351ad3e0..0000000000
--- a/NativePrograms/LUFA/DoxygenPages/MainPage.txt
+++ /dev/null
@@ -1,52 +0,0 @@
-/** \file
- *
- *  This file contains special DoxyGen information for the generation of the main page and other special
- *  documentation pages. It is not a project source file.
- */
-
-/**
- *  \mainpage
- *
- *  \image html Images/LUFA.png
- *  <div align="center"><small><i>Logo design by <a href="http://www.studiomonsoon.com">Studio Monsoon Photography</a></i></small></div>
- *  \n
- *  <div align="center"><a href="http://www.lufa-lib.org">http://www.lufa-lib.org</a></div>
- *  \n
- *
- *  <b>LUFA is donationware. For author and donation information, see \ref Page_Donating.</b>
- *
- *  LUFA is an open-source USB library for the USB-enabled AVR microcontrollers, released under the MIT license (see \ref Page_LicenseInfo).
- *  It supports a large number of USB AVR models and boards (see \ref Page_DeviceSupport). It is designed to provide an easy to use,
- *  feature rich framework for the development of USB peripherals and hosts.
- *
- *  LUFA focuses on the microcontroller side of USB development only; it includes no PC host USB driver development facilities - other projects
- *  such as the Windows Driver Development Kit, Windows USB Device Mode Framework and libusb may be of interest for developing custom OS drivers.
- *  While custom USB devices can be made with LUFA using such tools, the included demos all use the inbuilt OS drivers for each USB class for
- *  simplicity.
- *
- *  The library is currently in a stable release, suitable for download and incorporation into user projects for
- *  both host and device modes. For information about the project progression, see the blog link at \ref Page_Resources.
- *
- *  LUFA is written specifically for the free AVR-GCC compiler, and uses several GCC-only extensions to make the
- *  library API more streamlined and robust. You can download AVR-GCC for free in a convenient windows package,
- *  from the the WinAVR website (see \ref Page_Resources).
- *
- *  The only required AVR peripherals for LUFA is the USB controller itself and interrupts - LUFA does not require the use of the
- *  microcontroller's timers or other hardware, leaving more hardware to the application developer.
- *
- *  Accompanying LUFA in the download package is a set of example demo applications, plus several Bootloaders of different classes
- *  and open source LUFA powered projects.
- *
- *  <b>Subsections:</b>
- *  \li \subpage Page_LicenseInfo - Project source license and commercial use information
- *  \li \subpage Page_Donating - Donating to support this project
- *  \li \subpage Page_DeviceSupport - Current Device and Hardware Support
- *  \li \subpage Page_ChangeLog - Project Changelog
- *  \li \subpage Page_KnownIssues - Known Issues
- *  \li \subpage Page_FutureChanges - Planned Changes to the Library
- *  \li \subpage Page_GettingStarted - Getting started with LUFA
- *  \li \subpage Page_DevelopingWithLUFA - Developing with LUFA
- *  \li \subpage Page_LUFAPoweredProjects - Other Projects Using LUFA
- *  \li \subpage Page_Resources - LUFA and USB Related Resources
- */
-
diff --git a/NativePrograms/LUFA/DoxygenPages/MigrationInformation.txt b/NativePrograms/LUFA/DoxygenPages/MigrationInformation.txt
deleted file mode 100644
index aa77139a58..0000000000
--- a/NativePrograms/LUFA/DoxygenPages/MigrationInformation.txt
+++ /dev/null
@@ -1,722 +0,0 @@
-/** \file
- *
- *  This file contains special DoxyGen information for the generation of the main page and other special
- *  documentation pages. It is not a project source file.
- */
-
-/** \page Page_Migration Migrating from Older Versions
- *
- *  Below is migration information for updating existing projects based on previous versions of the LUFA library
- *  to the next version released. It does not indicate all new additions to the library in each version change, only
- *  areas relevant to making older projects compatible with the API changes of each new release.
- *
- *  \section Sec_MigrationXXXXXX Version XXXXXX
- *  <b>Device Mode</b>
- *   - The \c DTYPE_CSInterface enum value has now been moved to the CDC and Audio drivers, as the constants \c CDC_DTYPE_CSInterface and \c AUDIO_DTYPE_CSInterface.
- *   - The \c DTYPE_CSEndpoint enum value has now been moved to the CDC and Audio drivers, as the constants \c CDC_DTYPE_CSEndpoint and \c AUDIO_DTYPE_CSEndpoint.
- *
- *  \section Sec_Migration170418 Version 170418
- *  <b>Device Mode</b>
- *   - The \c CALLBACK_USB_GetDescriptor() callback function into the user application's \c wIndex parameter is now \c uint16_t, not \c uint8_t.
- *
- *  \section Sec_Migration151115 Migrating from 140928 to 151115
- *  <b>Non-USB Library Components</b>
- *    - The ATPROGRAM LUFA build system module now defaults to the Atmel ICE debugger tool, instead of the Atmel JTAG ICE3.
- *    - The \c Serial_CreateStream() and \c Serial_CreateBlockingStream() functions now require a USART base pointer for XMEGA devices as the first parameter.
- *
- *  \section Sec_Migration140928 Migrating from 140302 to 140928
- *  <b>Device Mode</b>
- *    - The device mode RNDIS class driver now requires a user-supplied buffer and buffer length to operate, rather
- *      than allocating this buffer internally.
- *
- *  \section Sec_Migration140302 Migrating from 130901 to 140302
- *  <b>USB Core</b>
- *    - The \c VERSION_BCD() macro has changed from accepting one floating point parameter to taking three distinct major/minor/revision integer parameters, as
- *      some edge cases caused incorrect parsing of the input float into the final integer BCD encoded value.
- *
- *  <b>Non-USB Library Components</b>
- *    - The \c ATTR_NEVER_INLINE macro, erroneously introduced in a previous release has been removed, as it duplicates the existing \c ATTR_NO_INLINE macro.
- *
- *  <b>Build System</b>
- *    - The default configuration file for Doxygen is now "doxyfile" rather than "Doxygen.conf", to conform to the Doxygen project's own default file name.
- *      Set \c DOXYGEN_CONF to override the new default file name.
- *
- *  \section Sec_Migration130901 Migrating from 130303 to 130901
- *  <b>Non-USB Library Components</b>
- *    - The Board Dataflash \c Dataflash_Init() function now automatically configures the appropriate communication interface.
- *
- *  \section Sec_Migration130303 Migrating from 120730 to 130303
- *  <b>Device Mode</b>
- *    - The \ref HID_KEYBOARD_LED_KANA macro was previously misspelled as \c HID_KEYBOARD_LED_KATANA, and had an incorrect value. User applications requiring this
- *      constant should use the new name, and remove any workarounds for the previously incorrect macro definition.
- *    - The \c HID_KEYBOARD_SC_EQUAL_SIGN macro has been renamed to \ref HID_KEYBOARD_SC_KEYPAD_EQUAL_SIGN, and the previous definition of
- *      \c HID_KEYBOARD_SC_KEYPAD_EQUAL_SIGN has been renamed \ref HID_KEYBOARD_SC_KEYPAD_EQUAL_SIGN_AS400 to conform to the definitions in the HID specification.
- *
- *  <b>Host Mode</b>
- *    - The \ref HID_KEYBOARD_LED_KANA macro was previously misspelled as \c HID_KEYBOARD_LED_KATANA, and had an incorrect value. User applications requiring this
- *      constant should use the new name, and remove any workarounds for the previously incorrect macro definition.
- *    - The \c HID_KEYBOARD_SC_EQUAL_SIGN macro has been renamed to \ref HID_KEYBOARD_SC_KEYPAD_EQUAL_SIGN, and the previous definition of
- *      \c HID_KEYBOARD_SC_KEYPAD_EQUAL_SIGN has been renamed \ref HID_KEYBOARD_SC_KEYPAD_EQUAL_SIGN_AS400 to conform to the definitions in the HID specification.
- *
- *  \section Sec_Migration120730 Migrating from 120219 to 120730
- *  <b>Device Mode</b>
- *    - The device mode Audio Class driver now requires an additional configuration parameter, the Audio Control interface index. Existing applications should
- *      be adjusted to specify the additional configuration parameter.
- *    - The HID_DESCRIPTOR_JOYSTICK() macro no longer takes a variable number of axis as a parameter, due to OS incompatibilities; this macro now uses a fixed
- *      3 axis of data. User applications should update their calls to this macro and their report structures to suit a fixed 3-axis joystick report. If a user
- *      application requires more than 3 axis' of data, a custom report descriptor will need to be constructed by hand.
- *    - The \ref Endpoint_ConfigureEndpoint() function no longer takes in masks for the banks and direction; the number of banks is now an integer argument, and
- *      the direction is obtained from the full endpoint address within the device. Applications calling Endpoint_ConfigureEndpoint() should update their API
- *      call to use a full endpoint address (including ENDPOINT_DIR_IN or ENDPOINT_DIR_OUT direction in the MSB of the endpoint address) and an integer number
- *      of banks.
- *    - All endpoint functions now operate on full endpoint addresses within the device, rather than a directionless endpoint index. Applications should update
- *      their API calls to use full endpoint addresses when required within the device.
- *    - All device mode class drivers have been updated to use a new unified endpoint description structure for all endpoints; existing applications will need
- *      to update their class driver struct instantiation to match the new scheme (see \ref USB_Endpoint_Table_t).
- *    - The \c ENDPOINT_BANKS_SUPPORTED() and \c ENDPOINT_MAX_ENDPOINT_SIZE() macros have been removed, as these do not function correctly with the new addressing
- *      scheme for the endpoint APIs. Please refer to the target device's datasheet for the maximum bank size of each endpoint.
- *    - The MIDI class driver \ref MIDI_EventPacket_t event packet no longer contains separate \c CableIndex and \c Command entries; these have been combined
- *      into a single \c Event element which can be constructed using the new macro \ref MIDI_EVENT(). Existing applications should use the new macro and structure
- *      element name.
- *
- *  <b>Host Mode</b>
- *    - The Android Accessory Host class driver property strings are now a array of \c char* rather than a struct of named pointers. Existing applications
- *      should use C99 Designated Initializers with the property string indexes located in \ref AOA_Strings_t instead.
- *    - The \ref Pipe_ConfigurePipe() function no longer takes in masks for the banks and token; the number of banks is now an integer argument, and the token
- *      is now inferred from the full pipe address within the device, and the pipe type. Applications calling Pipe_ConfigurePipe() should update their API
- *      call to use a full pipe address (including PIPE_DIR_IN or PIPE_DIR_OUT direction in the MSB of the pipe address) and an integer number of banks.
- *    - All pipe functions now operate on full pipe addresses within the device, rather than a directionless pipe index. Applications should update their API
- *      calls to use full pipe addresses when required within the device.
- *    - All host mode class drivers have been updated to use a new unified pipe description structure for all pipes; existing applications will need to update
- *      their class driver struct instantiation to match the new scheme (see \ref USB_Pipe_Table_t).
- *    - The MIDI class driver \ref MIDI_EventPacket_t event packet no longer contains seperate \c CableIndex and \c Command entries; these have been combined
- *      into a single \c Event element which can be constructed using the new macro \ref MIDI_EVENT(). Existing applications should use the new macro and structure
- *      element name.
- *    - The library "LUFA/Drivers/USB/Core/ConfigDescriptor.c" source file has been renamed "LUFA/Drivers/USB/Core/ConfigDescriptors.c" as this was clashing with
- *      files in some low level host mode demo applications, preventing parallel project builds. If you are referencing the project source files directly instead
- *      of using the makefile module names, you will need to adjust your project makefile.
- *
- *  \section Sec_Migration120219 Migrating from 111009 to 120219
- *  <b>USB Core</b>
- *    - The HID_KEYBOARD_MODIFER_* macros in the HID class driver have been corrected to HID_KEYBOARD_MODIFIER_* (note the spelling of "modifier").
- *      Existing applications should switch over to the correctly spelled macro names.
- *    - The names of the USB Device and USB Host class driver files have changed; a new "ClassDevice" and "ClassHost" postfix has been added to the
- *      respective class driver files. Projects referencing the class driver source files by filename rather than the LUFA_SRC_USBCLASS makefile
- *      variable should append these postfixes to the source file names. Projects including the USB class driver dispatch headers directly should either
- *      switch to including the main USB driver header instead, or use the updated header filenames.
- *    - The USB_CONFIG_ATTR_BUSPOWERED constant has been renamed to USB_CONFIG_ATTR_RESERVED, as this was misnamed. All devices must set this bit in
- *      the Configuration descriptor's attributes field. As all devices are assumed to be bus-powered unless stated otherwise with the
- *      USB_CONFIG_ATTR_SELFPOWERED flag a replacement constant for bus powered devices is not provided.
- *
- *  <b>Device Mode</b>
- *    - The device mode Audio class driver now requires a new user application callback, \ref CALLBACK_Audio_Device_GetSetInterfaceProperty().
- *      Existing applications must implement this new callback, however if no audio entities are defined in the audio device's descriptors,
- *      this function may be hard-coded to always return false for previous behaviour to be retained.
- *
- *  \section Sec_Migration111009 Migrating from 110528 to 111009
- *  <b>Non-USB Library Components</b>
- *    - The \c JTAG_DEBUG_ASSERT() macro has been renamed \ref JTAG_ASSERT() to be consistent with \ref STDOUT_ASSERT().
- *
- *  <b>USB Core</b>
- *    - By default, unordered Endpoint and Pipe configuration is now allowed once again, via the previous workaround of
- *      reconfiguring all Endpoints/Pipes in order each time a new Endpoint/Pipe is created. To minimize the compiled program
- *      size, the new \c ORDERED_EP_CONFIG compile time option may be defined in the project makefile to restrict the ordering
- *      in exchange for a smaller compiled binary size.
- *    - The previous \c F_CLOCK symbol, required in the project makefile, has been renamed to \c F_USB. This is due to the previous name
- *      being far too generic for use in future architecture ports, where multiple clock domains are used.
- *
- *  <b>Device Mode</b>
- *    - The Endpoint stream functions now all require a \c BytesProcessed parameter instead of the previous callback parameter.
- *      This should be set to \c NULL to retain previous behaviour of the functions, or point to a location where the number of bytes
- *      processed in the current transaction can be stored. If the \c BytesProcessed parameter is non \c NULL, each time the endpoint
- *      bank becomes full and the packet is sent, the routine will exit with the new \ref ENDPOINT_RWSTREAM_IncompleteTransfer
- *      error code to allow the user application to determine when to send the next chunk of data.
- *    - The \ref CDC_Device_SendString() function now expects a null terminated string instead of an explicit length. Existing code
- *      should use the new \ref CDC_Device_SendData() function, or remove the length parameter from the function call.
- *    - The \c Endpoint_ResetFIFO() function has been renamed to \ref Endpoint_ResetEndpoint(), to make the API function names more
- *      consistent. Existing applications using the old function name should simply replace it with a call to the new function name.
- *    - The \c Endpoint_*_Byte() functions have been renamed Endpoint_*_8() to ensure they are correct across all architectures. Existing
- *      code using these functions should replace the previous function names with the new function names.
- *    - The \c Endpoint_*_Word() functions have been renamed Endpoint_*_16() to ensure they are correct across all architectures. Existing
- *      code using these functions should replace the previous function names with the new function names.
- *    - The \c Endpoint_*_DWord() functions have been renamed Endpoint_*_32() to ensure they are correct across all architectures. Existing
- *      code using these functions should replace the previous function names with the new function names.
- *    - The Device mode RNDIS class driver no longer stores the incoming and outgoing packets in the class driver instance; the user is
- *      now expected to manually define a storage location for the packet data. Packets must now be sent and received manually via a call
- *      to \ref RNDIS_Device_ReadPacket() and/or \ref RNDIS_Device_SendPacket().
- *    - The definition of the Audio class \ref USB_Audio_Descriptor_Format_t has been altered, to remove the fixed singular
- *      audio sample rate in the descriptor definition, and to rename the \c SampleFrequencyType to the more appropriate
- *      \c TotalDiscreteSampleRates. Existing applications will need to add an array of \ref USB_Audio_SampleFreq_t elements
- *      immediately following any \ref USB_Audio_Descriptor_Format_t descriptors, and insert the appropriate sampling rates
- *      supported by the device, as well as rename the descriptor elements to match the updated element names.
- *    - The device mode Audio class driver now requires a new user application callback, \ref CALLBACK_Audio_Device_GetSetEndpointProperty().
- *      Existing applications must implement this new callback, however if multiple sample rates or pitch control is not used,
- *      this function may be hard-coded to always return false for previous behaviour to be retained.
- *    - The \c USB_ConfigurationNumber, \c USB_RemoteWakeupEnabled and \c USB_CurrentlySelfPowered globals have been renamed to
- *      \ref USB_Device_ConfigurationNumber, \ref USB_Device_RemoteWakeupEnabled and \ref USB_Device_CurrentlySelfPowered to clearly indicate
- *      the USB mode they relate to. Existing applications using these variables should rename all references to the previous names.
- *    - The \c ENDPOINT_DESCRIPTOR_DIR_IN and \c ENDPOINT_DESCRIPTOR_DIR_OUT macros have now been replaced by \ref ENDPOINT_DIR_IN and
- *      \ref ENDPOINT_DIR_OUT to improve code clarity.
- *    - The \ref HID_DESCRIPTOR_JOYSTICK() macro now takes an additional (first) parameter indicating the number of axis in the joystick.
- *
- *  <b>Host Mode</b>
- *    - The Pipe stream functions now all require a \c BytesProcessed parameter instead of the previous callback parameter.
- *      This should be set to \c NULL to retain previous behaviour of the functions, or point to a location where the number of bytes
- *      processed in the current transaction can be stored. If the BytesProcessed parameter is non \c NULL, each time the pipe
- *      bank becomes full and the packet is sent, the routine will exit with the new \ref PIPE_RWSTREAM_IncompleteTransfer
- *      error code to allow the user application to determine when to send the next chunk of data.
- *    - The \ref PRNT_Host_SendString() and \ref CDC_Host_SendString() functions now expect a null terminated string instead of an explicit
- *      length. Existing code should use the new \ref PRNT_Host_SendData() and \ref CDC_Host_SendData() functions, or remove the
- *      length parameter from the function call.
- *    - The \c Pipe_ClearErrorFlags() function has been removed, as the pipe error flags are now automatically cleared when the
- *      \ref Pipe_ClearError() function is called.
- *    - The \c Pipe_*_Byte() functions have been renamed Pipe_*_8() to ensure they are correct across all architectures. Existing code using
- *      these functions should replace the previous function names with the new function names.
- *    - The \c Pipe_*_Word() functions have been renamed Pipe_*_16() to ensure they are correct across all architectures. Existing code using
- *      these functions should replace the previous function names with the new function names.
- *    - The \c Pipe_*_DWord() functions have been renamed Pipe_*_32() to ensure they are correct across all architectures. Existing code using
- *      these functions should replace the previous function names with the new function names.
- *    - The \c USB_Host_ClearPipeStall() function has been renamed to USB_Host_ClearEndpointStall(), as it operates on a full endpoint address
- *      within the attached device and not a pipe within the host. Existing code using the old function name should update the function calls and
- *      check for correct usage.
- *
- *  \section Sec_Migration101122 Migrating from 100807 to 101122
- *  <b>USB Core</b>
- *    - A new USB driver source file, \c Drivers/USB/HighLevel/EndpointStream.c now exists. This source file should be added
- *      to all project makefiles using the USB driver of LUFA, or the makefile should be updated to use the new module source
- *      variables.
- *    - A new USB driver source file, \c Drivers/USB/HighLevel/PipeStream.c now exists. This source file should be added to all
- *      project makefiles using the USB driver of LUFA, or the makefile should be updated to use the new module source variables.
- *    - The \c EVENT_USB_InitFailure() event has been removed, as the \ref USB_Init() function will no longer fail; if not USB mode is
- *      specified, the controller will default to UID selection mode.
- *    - The USB mode specifier constants have been moved into a new enum and renamed. Existing projects should use the equivalent
- *      value in the new \ref USB_Modes_t enum.
- *    - All class driver headers are now included as part of the standard \c LUFA/Drivers/USB/USB.h master dispatch header, and should
- *      no longer be included separately. Class driver module source files must still be added as a separate module in the project's
- *      makefile if used.
- *
- *  <b>Device Mode</b>
- *    - Endpoints MUST be allocated in ascending order to ensure that bank corruption does not occur. Ensure that your user application
- *      allocated endpoints in ascending order - or if your application uses the USB device mode class drivers, ensure that each instance's
- *      endpoint indexes are not overlapped with other interface's endpoints.
- *    - The signature for the \ref CALLBACK_USB_GetDescriptor() callback has changed, the \c void** \c const \c DescriptorAddress parameter is
- *      now \c const \c void** \c const \c DescriptorAddress. Existing applications should update their callback signatures to match this, and
- *      eliminate any casting of descriptor pointers to a non \c const pointer.
- *    - The names of the class specific descriptor type defines in the USB Class drivers have changed - refer to the driver documentation
- *      for each class driver for the new class specific descriptor type names.
- *    - The \c ENDPOINT_DOUBLEBANK_SUPPORTED() macro is has been renamed \c ENDPOINT_BANKS_SUPPORTED() and now returns the total number of
- *      banks supported by the given endpoint. Existing code should switch to the new naming scheme, and test that the return value of the
- *      macro is equal to or greater than 2 to regain the previous functionality.
- *    - The \c EVENT_USB_Device_UnhandledControlRequest() event is now named \ref EVENT_USB_Device_ControlRequest() and fires before (not after)
- *      the internal library event handlers. Existing code should rename the event handlers in the user application to match the new event
- *      name, and should ensure that the new execution order does not affect the application's operation.
- *
- *  <b>Host Mode</b>
- *    - Pipes MUST be allocated in ascending order to ensure that bank corruption does not occur. Ensure that your user application
- *      allocated pipes in ascending order - or if your application uses the USB host mode class drivers, ensure that each instance's
- *      pipe indexes are not overlapped with other interface's pipes.
- *    - The \c PRNT_Host_SendData() function has been renamed to \ref PRNT_Host_SendString(). Existing applications should simply
- *      replace all references to the obsolete function name with the new function name.
- *    - The names of the class specific descriptor type defines in the USB Class drivers have changed - refer to the driver documentation
- *      for each class driver for the new class specific descriptor type names.
- *    - The Still Image Host class' function prefix has been changed from \c SImage_ to  \c SI_, to remain consistent with the rest of the
- *      driver's enums, type defines and constants.
- *
- *  \section Sec_Migration100807 Migrating from 100513 to 100807
- *
- *  <b>Non-USB Library Components</b>
- *    - The Dataflash board driver stub file has changed, as dataflash functions previously located in the internal
- *      Dataflash driver of the library have now been moved to the individual board files. Existing drivers can
- *      copy-paste the new functions from the board Dataflash stub driver.
- *
- *  <b>USB Core</b>
- *    - A new USB driver source file, \c Drivers/USB/LowLevel/Device.c now exists. This source file should be added to all project
- *      makefiles using the USB driver of LUFA, or the makefile should be updated to use the new module source variables.
- *    - The \c Drivers/USB/LowLevel/DevChapter9.c source file has moved to \c Drivers/USB/HighLevel/DeviceStandardReq.c - this should
- *      be updated in all project makefiles, or the makefile should be updated to use the new module source variables.
- *    - The \c Drivers/USB/LowLevel/HostChapter9.h source file has moved to \c Drivers/USB/HighLevel/HostStandardReq.c - this should
- *      be updated in all project makefiles, or the makefile should be updated to use the new module source variables.
- *    - The \c Drivers/USB/LowLevel/LowLevel.c source file has moved to \c Drivers/LowLevel/USBController.c - this should be updated
- *      in all project makefiles, or the makefile should be updated to use the new module source variables.
- *
- *  <b>Device Mode</b>
- *    - The \c USB_Device_IsRemoteWakeupSent() macro has been removed, as the remote wakeup request is now fully handled by the
- *      enhanced \ref USB_Device_SendRemoteWakeup() function. Existing code may now discard any checks to \c USB_Device_IsRemoteWakeupSent().
- *    - The \c USB_Device_IsUSBSuspended() macro has been removed, as it is obsolete. Existing code should compare \ref USB_DeviceState
- *      to see if it the device is in the \ref DEVICE_STATE_Suspended state instead.
- *    - The \ref CDC_Device_ReceiveByte() function has changed, and now returns a signed 16-bit integer, with -1 indicating no data was
- *      received. This allows for more efficient coding, as a call to \ref CDC_Device_BytesReceived() is no longer needed if the exact
- *      number of queued bytes received is not needed.
- *
- *  <b>Host Mode</b>
- *    - The \ref CDC_Host_ReceiveByte() function has changed, and now returns a signed 16-bit integer, with -1 indicating no data was
- *      received. This allows for more efficient coding, as a call to \ref CDC_Host_BytesReceived() is no longer needed if the exact
- *      number of queued bytes received is not needed.
- *    - The \ref CDC_Host_USBTask() now calls \ref CDC_Host_Flush() automatically, flushing any queued data to the attached device. Manual
- *      flushing of the interface is no longer needed if the flushes should be in sync with calls to \ref CDC_Host_USBTask().
- *
- *  \section Sec_Migration100513 Migrating from 100219 to 100513
- *
- *  <b>Non-USB Library Components</b>
- *    - The \ref TWI_StartTransmission() function now takes in a timeout period, expressed in milliseconds, within which the addressed
- *      device must respond or the function will abort.
- *
- *  <b>Device Mode</b>
- *    - The \ref USB_Init() function no longer calls \c sei() to enable global interrupts, as the user application may need
- *      to perform other initialization before it is ready to handle global interrupts. The user application is now responsible
- *      for enabling global interrupts before or shortly after calling \ref USB_Init() to ensure that the enumeration process
- *      functions correctly.
- *    - The \c USBInterrupt.c USB driver source file has been relocated from \c LUFA/Drivers/USB/HighLevel/ to \c LUFA/Drivers/USB/LowLevel.
- *      Projects must update their makefile SRC values accordingly.
- *    - The HID Device Class driver's function signature for the \ref CALLBACK_HID_Device_ProcessHIDReport() function has been changed, to
- *      allow for a new \c ReportType parameter. This new parameter must be added in all user applications using the Device mode HID Class
- *      Driver, but may be ignored unless Host-to-Device FEATURE HID reports are used.
- *
- *  <b>Host Mode</b>
- *    - The \ref USB_Init() function no longer calls \c sei() to enable global interrupts, as the user application may need
- *      to perform other initialization before it is ready to handle global interrupts. The user application is now responsible
- *      for enabling global interrupts before or shortly after calling \ref USB_Init() to ensure that the enumeration process
- *      functions correctly.
- *    - The \c USBInterrupt.c USB driver source file has been relocated from \c LUFA/Drivers/USB/HighLevel/ to \c LUFA/Drivers/USB/LowLevel.
- *      Projects must update their makefile \c SRC values accordingly.
- *    - The HID Host Class driver's function signature for the \ref HID_Host_SendReportByID() function has been changed, to allow for a new
- *      ReportType parameter. Existing calls to this function should substitute \c REPORT_ITEM_TYPE_Out as this parameter's value.
- *
- *  \section Sec_Migration100219 Migrating from 091223 to 100219
- *
- *  <b>Non-USB Library Components</b>
- *    - Due to some ADC channels not being identical to their ADC MUX selection masks for single-ended conversions on some AVR models,
- *      the ADC driver now has explicit masks for each of the standard ADC channels (see \ref Group_ADC). These masks should be used
- *      when calling the ADC functions to ensure proper operation across all AVR models. Note that the \ref ADC_SetupChannel() function
- *      is an exception, and should always be called with a channel number rather than a channel mask.
- *
- *  <b>Host Mode</b>
- *    - The MIDI Host Class driver send and receive routines now operate on packed events, where multiple MIDI events may be
- *      packed into a single USB packet. This means that the sending of MIDI events will now be delayed until the MIDI send
- *      pipe bank is full. To override this new behaviour and revert to the previous behaviour, the user application may manually
- *      flush the queued event(s) to the device by calling \ref MIDI_Host_Flush().
- *    - The \ref Pipe_IsEndpointBound() function now takes the endpoint's direction into account, by checking if the MSB of the endpoint's address
- *      is set to denote IN endpoints. If the previous functionality where the direction is to be discounted is required, mask the endpoint
- *      address against the \ref PIPE_EPNUM_MASK token before calling \ref Pipe_IsEndpointBound().
- *
- *  <b>Device Mode</b>
- *    - The MIDI Device Class driver send and receive routines now operate on packed events, where multiple MIDI events may be
- *      packed into a single USB packet. This means that the sending of MIDI events will now be delayed until the MIDI send
- *      endpoint bank is full. To override this new behaviour and revert to the previous behaviour, the user application may manually
- *      flush the queued event(s) to the host by calling \ref MIDI_Device_Flush().
- *
- *  \section Sec_Migration091223 Migrating from 091122 to 091223
- *
- *  <b>Host Mode</b>
- *    - The Still Image Host Class driver \ref SI_Host_USBTask() and \ref SI_Host_ConfigurePipes() functions were misnamed, and are
- *      now named \c SImage_Host_USBTask() and \c SImage_Host_ConfigurePipes() respectively.
- *    - The \c HOST_SENDCONTROL_DeviceDisconnect enum value has been renamed to \ref HOST_SENDCONTROL_DeviceDisconnected to be in
- *      line with the rest of the library error codes.
- *    - The HID Parser item usages no longer contain separate minimum and maximum values, as this was a violation of the HID
- *      specification. Instead, the values are distributed evenly across each item as its usage value, to ensure that all items
- *      can be distinguished from one-another.
- *
- *  <b>Device Mode</b>
- *    - The \ref CALLBACK_HID_Device_CreateHIDReport() HID Device Class driver callback now has a new \c ReportType parameter to
- *      indicate the report type to generate. Existing applications may simply add and ignore this additional parameter.
- *
- *  \section Sec_Migration091122 Migrating from 090924 to 091122
- *
- *  <b>Host Mode</b>
- *    - The \c HID_PARSE_UsageStackOverflow HID parser error constant is now named \ref HID_PARSE_UsageListOverflow
- *    - The \ref CALLBACK_HIDParser_FilterHIDReportItem() HID Parser callback now passes a complete \ref HID_ReportItem_t to the
- *      user application, instead of just its attributes.
- *    - The \c USB_GetDeviceConfigDescriptor() function was incorrectly named and is now called \ref USB_Host_GetDeviceConfigDescriptor().
- *
- *  \section Sec_Migration090924 Migrating from 090810 to 090924
- *
- *  <b>Non-USB Library Components</b>
- *    - The \c ADC_Off() function has been renamed to \c ADC_ShutDown() to be consistent with the rest of the library.
- *    - The \ref SPI_Init() routine's parameters have changed, so that the clock polarity and data sampling modes can be set. See
- *      the \ref SPI_Init() function documentation for more details
- *    - The \ref Dataflash_Init() routine no longer initializes the SPI bus - the SPI bus should be initialized manually via a
- *      call to \ref SPI_Init() before using the Dataflash driver
- *
- *  <b>Host Mode</b>
- *    - The \c USB_GetDeviceConfigDescriptor() function's parameters and behaviour has changed; the user is required to
- *      preallocate the largest allowable buffer, and pass the size of the buffer to the function. This allows for a single
- *      call to the function to retrieve, size check and validate the Configuration Descriptor rather than having the user
- *      application perform these intermediary steps.
- *    - The HID report parser now requires a mandatory callback in the user code, to filter only the items the application
- *      is interested in into the processed HID report item structure to save RAM. See \ref CALLBACK_HIDParser_FilterHIDReportItem().
- *    - The HID report parser now always parses FEATURE and always ignores constant-data items - the \c HID_ENABLE_FEATURE_PROCESSING
- *      and \c HID_INCLUDE_CONSTANT_DATA_ITEMS compile time tokens now have no effect.
- *    - The \c USE_NONSTANDARD_DESCRIPTOR_NAMES compile time token has been removed - there are now separate \c USB_Descriptor_*
- *      and \c USB_StdDescriptor_* structures for both the LUFA and standardized element naming conventions so that both may be used in
- *      the one project. For existing projects using the standardized names, change all code to use the \c USB_StdDescriptor_* variants.
- *
- *  <b>Device Mode</b>
- *    - The \c USE_NONSTANDARD_DESCRIPTOR_NAMES compile time token has been removed - there are now separate \c USB_Descriptor_*
- *      and \c USB_StdDescriptor_* structures for both the LUFA and standardized element naming conventions so that both may be used in
- *      the one project. For existing projects using the standardized names, change all code to use the \c USB_StdDescriptor_* variants.
- *
- *  \section Sec_Migration090810 Migrating from 090605 to 090810
- *
- *  <b>All</b>
- *    - The "Simple Scheduler" has been <i>deprecated</i>, as it was little more than an abstracted loop and caused much confusion.
- *      User applications using the scheduler should switch to regular loops instead. The scheduler code will be removed in a future
- *      release.
- *    - The "Dynamic Memory Block Allocator" has been removed, as it was unused in (and unrelated to) the LUFA library and never
- *      used in user applications.
- *
- *  <b>Non-USB Library Components</b>
- *    - The \c ATTR_NOINLINE function attribute macro has been renamed to \ref ATTR_NO_INLINE to be in line with the rest of the function attribute
- *      macro names.
- *
- *  <b>Library Demos</b>
- *    - Most demos now have a corresponding Class Driver implementation, which uses the new internal library class drivers for the standard
- *      USB classes. This allows for more rapid device and host development, and so should be used in preference to the low level APIs where
- *      possible so that fixes to the class drivers propagate to all applications which use them automatically with each new LUFA release.
- *
- *  <b>Host Mode</b>
- *    - The \c HIDParser.c module has moved from \c LUFA/Drivers/USB/Class/ to \c LUFA/Drivers/USB/Class/Host/.
- *    - The \c USB_GetDeviceConfigDescriptor() function now requires the desired configuration index within the device as its first
- *      parameter, to add support for multi-configuration devices. Existing code should use a configuration index of 1 to indicate the
- *      first configuration descriptor within the device.
- *    - The non-standard "Ready" host state has been removed. Existing \ref HOST_STATE_Configured code should be moved to the end of
- *      the existing \ref HOST_STATE_Addressed state, and the existing HOST_STATE_Ready state code should be moved to the \ref HOST_STATE_Configured
- *      state.
- *    - The \c USB_IsConnected global has been removed, as it is too vague for general use. Test \ref USB_HostState explicitly to ensure the host is
- *      in the desired state instead.
- *    - The USB event names have been changed and their firing conditions changed to properly separate out Host mode events from Device mode
- *      events. See the \ref Group_Events page for details on the new event names and firing conditions.
- *
- *  <b>Device Mode</b>
- *    - The \ref CALLBACK_USB_GetDescriptor() function now takes an extra parameter to specify the descriptor's memory space so that
- *      descriptors in mixed memory spaces can be used. The previous functionality can be returned by defining the \c USE_FLASH_DESCRIPTORS
- *      token in the project makefile to fix all descriptors into FLASH space and remove the extra function parameter.
- *    - The \c USB_IsSuspended global has been removed - test \ref USB_DeviceState against \ref DEVICE_STATE_Suspended instead.
- *    - The \c USB_IsConnected global has been removed, as it is too vague for general use. Test \ref USB_DeviceState explicitly to ensure the device
- *      is in the desired state instead.
- *    - The VBUS events have been removed, as they are already exposed to the user via the \c USB_Connect and \c USB_Disconnect events.
- *    - The USB event names have been changed and their firing conditions changed to properly separate out Host mode events from Device mode
- *      events. See the \ref Group_Events page for details on the new event names and firing conditions.
- *
- *  \section Sec_Migration090605 Migrating from 090510 to 090605
- *
- *  <b>Device Mode</b>
- *    - Support for non-control data endpoint interrupts has been dropped due to many issues in the implementation. All existing
- *      projects using interrupts on non-control endpoints should switch to polling. For control interrupts, the library can
- *      manage the control endpoint via interrupts automatically by compiling with the \c INTERRUPT_CONTROL_ENDPOINT token defined.
- *    - The \c DESCRIPTOR_ADDRESS() macro has been removed. User applications should use normal casts to obtain a descriptor's memory
- *      address.
- *    - The library events system has been rewritten, so that all macros have been removed to allow for clearer user code. See
- *      \ref Group_Events for new API details.
- *    - The \c STREAM_CALLBACK() macro has been removed. User applications should replace all instances of the macro with regular
- *      function signatures of a function accepting no arguments and returning a \c uint8_t value.
- *    - The \c Event_DeviceError() event no longer exists, as its sole caller (unlinked \c USB_GetDescriptor() function) now produces a
- *      compilation error rather than a runtime error. The \c StdDescriptors.c file no longer exists as a result, and should be removed
- *      from project makefiles.
- *    - The \c USB_GetDescriptor() function has been renamed to \ref CALLBACK_USB_GetDescriptor() to be in line with the new \c CALLBACK_
- *      function prefixes for functions which <i>must</i> be implemented in the user application.
- *
- *  <b>Host Mode</b>
- *    - Support for non-control data pipe interrupts has been dropped due to many issues in the implementation. All existing
- *      projects using interrupts on non-control pipes should switch to polling.
- *    - The library events system has been rewritten, so that all macros have been removed to allow for clearer user code. See
- *      \ref Group_Events for new API details.
- *    - The \c STREAM_CALLBACK() macro has been removed. User applications should replace all instances of the macro with regular
- *      function signatures of a function accepting no arguments and returning a \c uint8_t value.
- *    - The \c DESCRIPTOR_COMPARATOR() macro has been removed. User applications should replace all instances of the macro with
- *      regular function signatures of a function accepting a void pointer to the descriptor to test, and returning a \c uint8_t value.
- *
- *  \section Sec_Migration090510 Migrating from 090401 to 090510
- *
- *  <b>All</b>
- *    - The \c ButtLoadTag.h header has been removed, as it was never used for its intended purpose. Projects should either remove all
- *      \c BUTTLOADTAG() elements, or download and extract \c ButtLoadTag.h header from the ButtLoad project.
- *    - The \c Drivers/AT90USBXXX/ directory has been renamed to \c Drivers/Peripheral/.
- *    - The \c Serial_Stream driver has been renamed to \c SerialStream to remain consistent with the rest of the library naming scheme.
- *    - The HWB driver has changed to the \c Buttons driver. See the board Buttons driver documentation for the new API.
- *
- *  <b>Dual Role Mode</b>
- *    - The \c USB_PowerOnFail event has been renamed to \c USB_InitFailure.
- *    - The functions in \c OTG.h have been renamed to remain more consistent with the library API. See the functions in \c OTG.h for more
- *      details.
- *
- *  <b>Device Mode</b>
- *    - The \c Endpoint_ClearCurrentBank() macro has been removed, and is now replaced with the \ref Endpoint_ClearIN(), \ref Endpoint_ClearOUT()
- *      macros. See \c Endpoint.h documentation for more details on the new endpoint management macros.
- *    - The \c Endpoint_ReadWriteAllowed() macro has been renamed to \ref Endpoint_IsReadWriteAllowed() to be more consistent with the rest of
- *      the API naming scheme.
- *    - The \c Endpoint_IsSetupINReady() and \c Endpoint_IsSetupOUTReceived() macros have been renamed to \ref Endpoint_IsINReady() and
- *      \ref Endpoint_IsOUTReceived() respectively.
- *    - The \c Endpoint_IsSetupReceived() macro has been renamed to \ref Endpoint_IsSETUPReceived().
- *    - The \c Endpoint_ClearSetupReceived() macro has been renamed to \ref Endpoint_ClearSETUP().
- *    - All endpoint read/write/discard aliases which did not have an explicitly endianness specifier (such as \c Endpoint_Read_Word()) have
- *      been removed for clarity. Existing projects should use the \c _LE suffix on such calls to use the explicit Little Endian versions.
- *    - The \c USB_UnhandledControlPacket event no longer has any parameters. User code should no longer attempt to read in the remainder of
- *      the Control Request header as all Control Request header data is now preloaded by the library and made available in the
- *      USB_ControlRequest structure.
- *    - The \c FEATURELESS_CONTROL_ONLY_DEVICE token has been renamed to \c CONTROL_ONLY_DEVICE.
- *    - The \c STATIC_ENDPOINT_CONFIGURATION is no longer applicable as the library will apply this optimization when appropriate automatically.
- *    - The values of the \ref Endpoint_Stream_RW_ErrorCodes_t and \ref Endpoint_ControlStream_RW_ErrorCodes_t enums have had the \c ERROR_ portion
- *      of their names removed.
- *
- *  <b>Host Mode</b>
- *    - The \ref USB_Host_SendControlRequest() function no longer automatically selects the Control pipe (pipe 0) to allow it to be used on
- *      other control type pipes. Care should be taken to ensure that the Control pipe is always selected before the function is called
- *      in existing projects where the Control pipe is to be operated on.
- *    - The USB Host management task now saves and restores the currently selected pipe before and after the task runs. Projects no longer
- *      need to manage this manually when calling the USB management task.
- *    - The \c Pipe_ClearCurrentBank() macro has been removed, and is now replaced with the Pipe_ClearIN(), Pipe_ClearOUT() macros. See
- *      Pipe.h documentation for more details on the new pipe management macros.
- *    - The \c Pipe_ReadWriteAllowed() macro has been renamed to \ref Pipe_IsReadWriteAllowed() to be more consistent with the rest of the API
- *      naming scheme.
- *    - The \c Pipe_IsSetupINReceived() and \c Pipe_IsOutReady() macros have been renamed to \ref Pipe_IsINReceived() and \ref Pipe_IsOUTReady()
- *      respectively.
- *    - The new \ref Pipe_ClearSETUP() macro should be used to send SETUP transactions, rather than the previous \c Pipe_ClearSetupOUT() macro.
- *    - The \c Pipe_IsSetupSent() macro has been renamed to \ref Pipe_IsSETUPSent().
- *    - The \c Pipe_ClearSetupSent() macro is no longer applicable and should be removed.
- *    - All pipe read/write/discard aliases which did not have an explicitly endianness specifier (such as \c Pipe_Read_Word()) have
- *      been removed for clarity. Existing projects should use the \c _LE suffix on such calls to use the explicit Little Endian versions.
- *    - The \c Host_IsResetBusDone() macro has been renamed to \c Host_IsBusResetComplete().
- *    - The \c Pipe_Ignore_Word() and \c Pipe_Ignore_DWord() functions have been renamed to \c Pipe_Discard_Word() and \c Pipe_Discard_DWord()
- *      to remain consistent with the rest of the pipe API.
- *    - It is no longer needed to manually include the headers from \c LUFA/Drivers/USB/Class, as they are now included along with the rest
- *      of the USB headers when \c LUFA/Drivers/USB/USB.h is included.
- *    - Functions in the \c ConfigDescriptor.h header file no longer have \c Host_ as part of their names.
- *    - The \c ProcessHIDReport() has been renamed to \ref USB_ProcessHIDReport(), \c GetReportItemInfo() has been renamed to \ref USB_GetHIDReportItemInfo()
- *      and \c SetReportItemInfo() has been renamed to \ref USB_GetHIDReportItemInfo().
- *    - The values of the \ref DSearch_Return_ErrorCodes_t and \ref DSearch_Comp_Return_ErrorCodes_t enums have had their respective \c Descriptor_Search
- *      and \c Descriptor_Search_Comp prefixes changed to all caps.
- *    - The \c USB_HostRequest global has been renamed to \ref USB_ControlRequest, and is used in Device mode also. The \c USB_Host_Request_Header_t
- *      structure type has been renamed to \ref USB_Request_Header_t.
- *    - The values of the \ref Pipe_Stream_RW_ErrorCodes_t enum have had the \c ERROR_ portion of their names removed.
- *
- *  \section Sec_Migration090401 Migrating from 090209 to 090401
- *
- *  <b>All</b>
- *    - LUFA projects must now give the raw input clock frequency (before any prescaling) as a compile time constant \c F_USB,
- *      defined in the project makefile and passed to the compiler via the -D switch.
- *    - The makefile EEPROM programming targets for FLIP and dfu-programmer no longer program in the FLASH data in addition to the
- *      EEPROM data into the device. If both are to be programmed, both the EEPROM and FLASH programming targets must be called.
- *    - As the avr-libc macro has been corrected in recent avr-libc distributions, the \c SetSystemClockPrescaler() macro has been removed.
- *      Include \c <avr/power.h> and call \c clock_prescale_set(clock_div_1); instead on recent avr-libc distributions.
- *
- *  <b>Library Demos</b>
- *    - The USBtoSerial demo now discards all data when not connected to a host, rather than buffering it for later transmission.
- *
- *  <b>Non-USB Library Components</b>
- *    - The \c ATTR_ALWAYSINLINE function attribute macro has been renamed to \ref ATTR_ALWAYS_INLINE.
- *    - Custom board Dataflash drivers now require the implementation of \ref Dataflash_SelectChipFromPage() and \ref Dataflash_SendAddressBytes().
- *
- *  <b>Device Mode</b>
- *    - The \c NO_CLEARSET_FEATURE_REQUEST compile time token has been renamed to \c FEATURELESS_CONTROL_ONLY_DEVICE, and its function expanded
- *      to also remove parts of the Get Status chapter 9 request to further reduce code usage. On all applications currently using the
- *      \c NO_CLEARSET_FEATURE_REQUEST compile time token, it can be replaced with the \c FEATURELESS_CONTROL_ONLY_DEVICE token with no further
- *      modifications required.
- *
- *  \section Sec_Migration090209 Migrating from 081217 to 090209
- *
- *  <b>Device Mode</b>
- *    - The \c ENDPOINT_MAX_ENDPOINTS constant has been renamed to the more appropriate name of \c ENDPOINT_TOTAL_ENDPOINTS.
- *    - The \c USB_STREAM_TIMEOUT_MS stream timeout default period has been extended to 100ms. This can be overridden in the user
- *      makefile if desired to restore the previous 50ms timeout.
- *
- *  <b>Host Mode</b>
- *    - The \c PIPE_MAX_ENDPOINTS constant has been renamed to the more appropriate name of \c PIPE_TOTAL_ENDPOINTS.
- *    - The \c USB_STREAM_TIMEOUT_MS stream timeout default period has been extended to 100ms. This can be overridden in the user
- *      makefile if desired to restore the previous 50ms timeout.
- *    - The \c USB_DeviceEnumerationFailed event now contains a second \c SubErrorCode parameter, giving the error code of the function
- *      which failed.
- *    - The \c HID_PARSE_Sucessful enum member constant name has been corrected to \ref HID_PARSE_Successful.
- *
- *  <b>Non-USB Library Components</b>
- *    - The previous \c SPI_SendByte() functionality is now located in \ref SPI_TransferByte(). \ref SPI_SendByte() now discards the return byte
- *      for speed, to compliment the new \ref SPI_ReceiveByte() function. If bidirectional SPI transfers are required, calls to \ref SPI_SendByte()
- *      should be changed to \ref SPI_TransferByte().
- *    - The serial driver now sets the Tx line as an output explicitly, and enables the pull-up of the Rx line.
- *    - The \ref Serial_Init() and \c SerialStream_Init() functions now take a second \c DoubleSpeed parameter, which indicates if the USART
- *      should be initialized in double speed mode - useful in some circumstances for attaining baud rates not usually possible at the given AVR
- *      clock speed.
- *
- *  \section Sec_Migration171208 Migrating from V1.5.3 to 081217
- *
- *  <b>All</b>
- *    - The MyUSB project name has been changed to LUFA (Lightweight Framework for USB AVRs). All references to MyUSB, including macro names,
- *      have been changed to LUFA.
- *
- *  <b>Library Demos</b>
- *    - The ReconfigureUSART() routine in the USBtoSerial demo was not being called after new line encoding
- *      parameters were set by the host. Projects built on the USBtoSerial code should update to the latest version.
- *    - The HID Parser now supports multiple report (on a single endpoint) HID devices. The MouseHostWithParser and
- *      KeyboardHostWithPaser demos use the updated API functions to function correctly on such devices. Projects
- *      built on either "WithParser" demo should update to the latest code.
- *    - The RNDIS demo TCP stack has been modified so that connections can be properly closed. It is still not
- *      recommended that the MyUSB RNDIS demo TCP/IP stack be used for anything other than demonstration purposes,
- *      as it is neither a full nor a standards compliant implementation.
- *
- *  <b>Non-USB Library Components</b>
- *    - The Serial_IsCharReceived() macro has been changed to the correct spelling of Serial_IsCharReceived() in Serial.h.
- *
- *  <b>Device Mode</b>
- *    - The MANUAL_PLL_CONTROL compile time token has been removed, and replaced with a USB_OPT_MANUAL_PLL mask
- *      to be used in the Options parameter of the USB_Init() function.
- *    - Calling USB_Init() now forces a complete USB interface reset and enumeration, even if the USB interface is
- *      currently initialized.
- *    - Interrupts are now disabled when processing control requests, to avoid problems with interrupts causing the library
- *      or user request processing code to exceed the strict USB timing requirements on control transfers.
- *    - The USB Reset event now resets and disables all device endpoints. If user code depends on endpoints remaining configured
- *      after a Reset event, it should be altered to explicitly re-initialize all user endpoints.
- *    - The prototype for the GetDescriptor function has been changed, as the return value was redundant. The function now
- *      returns the size of the descriptor, rather than passing it back via a parameter, or returns NO_DESCRIPTOR if the specified
- *      descriptor does not exist.
- *    - The NO_DESCRIPTOR_STRING macro has been renamed NO_DESCRIPTOR, and is now also used as a possible return value for the
- *      GetDescriptor function.
- *
- *  <b>Host Mode</b>
- *    - The MANUAL_PLL_CONTROL compile time token has been removed, and replaced with a USB_OPT_MANUAL_PLL mask
- *      to be used in the Options parameter of the USB_Init() function.
- *    - The HID report parser now supports multiple Report IDs. The HID report parser GetReportItemInfo() and
- *      SetReportItemInfo() routines now return a boolean, set if the requested report item was located in the
- *      current report. If sending a report to a multi-report device, the first byte of the report is automatically
- *      set to the report ID of the given report item.
- *    - Calling USB_Init() now forces a complete USB interface reset and enumeration, even if the USB interface is
- *      currently initialized.
- *
- *  \section Sec_Migration152 Migrating from V1.5.2 to V1.5.3
- *
- *  <b>Library Demos</b>
- *    - Previously, all demos contained a serial number string descriptor, filled with all zeros. A serial number
- *      string is required in Mass Storage devices, or devices which are to retain settings when moved between
- *      ports on a machine. As people were not changing the serial number value, this was causing conflicts and so
- *      the serial number descriptor has been removed from all but the Mass Storage demo, which requires it.
- *    - The AudioOut and AudioIn demos did not previously silence their endpoints when the host has deactivated
- *      them. Projects built upon either demo should upgrade to the latest code.
- *    - The FEATURE_ENDPOINT macro has been renamed FEATURE_ENDPOINT_HALT, and is now correctly documented.
- *    - The MassStoreHost demo contained errors which caused it to lock up randomly on certain devices. Projects built
- *      on the MassStoreDemo code should update to the latest version.
- *    - The Interrupt type endpoint in the CDC based demos previously had a polling interval of 0x02, which caused
- *      problems on some Linux systems. This has been changed to 0xFF, projects built on the CDC demos should upgrade
- *      to the latest code.
- *    - The HID keyboard and mouse demos were not previously boot mode compatible. To enable boot mode support, projects
- *      built on the keyboard or mouse demos (or derivatives) should upgrade to the latest code.
- *    - The Mass Storage demo was not previously standards compliant. Projects built on the Mass Storage demo should
- *      upgrade to the latest code.
- *    - The USART was not being reconfigured after the host sent new encoding settings in the USBtoSerial demo. This was
- *      previously discovered and fixed, but the change was lost. Projects built on the USBtoSerial demo should update
- *      to the latest code.
- *
- *  <b>Device Mode</b>
- *    - The endpoint non-control stream functions now have a default timeout of 50ms between packets in the stream.
- *      If this timeout is exceeded, the function returns the new ENDPOINT_RWSTREAM_ERROR_Timeout error value. The
- *      timeout value can be overridden by defining the USB_STREAM_TIMEOUT_MS in the project makefile to the desired
- *      timeout duration in ms.
- *    - Rather than returning fixed values, the flags indicating if the device has Remote Wakeup currently enabled
- *      and/or is self-powered are now accessed and set through the new USB_RemoteWakeupEnabled and
- *      USB_CurrentlySelfPowered macros. See the DevChapter9.h documentation for more details.
- *    - All endpoint stream functions now require an extra Callback function parameter. Existing code may be updated
- *      to either supply NO_STREAM_CALLBACK as the extra parameter, or disable stream callbacks altogether by passing
- *      the token NO_STREAM_CALLBACKS to the compiler using the -D switch.
- *
- *  <b>Host Mode</b>
- *    - The pipe non-control stream functions now have a default timeout of 50ms between packets in the stream.
- *      If this timeout is exceeded, the function returns the new PIPE_RWSTREAM_ERROR_Timeout error value. The
- *      timeout value can be overridden by defining the USB_STREAM_TIMEOUT_MS in the project makefile to the desired
- *      timeout duration in ms.
- *    - CollectionPath_t has been renamed to HID_CollectionPath_t to be more in line with the other HID parser structures.
- *    - All pipe stream functions now require an extra Callback function parameter. Existing code may be updated
- *      to either supply NO_STREAM_CALLBACK as the extra parameter, or disable stream callbacks altogether by passing
- *      the token NO_STREAM_CALLBACKS to the compiler using the -D switch.
- *
- *  \section Sec_Migration151 Migrating from V1.5.1 to V1.5.2
- *
- *  <b>Library Demos</b>
- *    - The RNDIS demo application has been updated so that it is functional on Linux under earlier implementations
- *      of the RNDIS specification, which had non-standard behaviour. Projects built upon the demo should upgrade
- *      to the latest code.
- *    - The DFU class bootloader has had several bugs corrected in this release. It is recommended that where
- *      possible any existing devices upgrade to the latest bootloader code.
- *
- *  \section Sec_Migration150 Migrating from V1.5.0 to V1.5.1
- *
- *  <b>Library Demos</b>
- *    - The USBtoSerial demo was broken in the 1.5.0 release, due to incorrect register polling in place of the
- *      global "Transmitting" flag. The change has been reverted in this release. Projects built upon the demo
- *      should upgrade to the latest code.
- *    - The HID class demos did not implement the mandatory GetReport HID class request. Projects built upon the HID
- *      demos should upgrade to the latest code.
- *    - The HID class demos incorrectly reported themselves as boot-protocol enabled HID devices in their descriptors.
- *      Projects built upon the HID demos should upgrade to the latest code.
- *    - The MIDI device demo had incorrect AudioStreaming interface descriptors. Projects built upon the MIDI demo
- *      should upgrade to the latest code.
- *    - The AudioOut demo did not correctly tristate the speaker pins when USB was disconnected, wasting power.
- *      Projects built upon the AudioOut demo should upgrade to the latest code.
- *
- *  \section Sec_Migration141 Migrating from V1.4.1 to V1.5.0
- *
- *  <b>Library Demos</b>
- *    - Previous versions of the library demos had incorrectly encoded BCD version numbers in the descriptors. To
- *      avoid such mistakes in the future, the VERSION_BCD macro has been added to StdDescriptors.h. Existing
- *      projects should at least manually correct the BCD version numbers, or preferably update the descriptors to
- *      encode the version number in BCD format using the new macro.
- *    - The mandatory GetReport class-specific request was accidentally omitted from previous versions of the demos
- *      based on the Human Interface Device (HID) class. This has been corrected, and any user projects based on the
- *      HID demos should also be updated accordingly.
- *    - The CDC demos now correctly send an empty packet directly after a full packet, to end the transmission.
- *      Failure to do this on projects which always or frequently send full packets will cause buffering issues on
- *      the host OS. All CDC user projects are advised to update their transmission routines in the same manner as
- *      the library CDC demos.
- *    - The previous interrupt-driven Endpoint/Pipe demos did not properly save and restore the currently selected
- *      Endpoint/Pipe when the ISR fired. This has been corrected - user projects based on the interrupt driven
- *      demos should also update to properly save and restore the selected Endpoint/Pipe.
- *
- *  <b>Non-USB Library Components</b>
- *    - The Atomic.h and ISRMacro.h header files in MyUSB/Common have been removed, as the library is now only
- *      compatible with avr-libc library versions newer than the time before the functionality of the deleted
- *      headers was available.
- *
- *  <b>Device Mode</b>
- *    - The GetDescriptor function (see StdDescriptors.h) now has a new prototype, with altered parameter names and
- *      functions. Existing projects will need to update the GetDescriptor implementation to reflect the new API.
- *      The previously split Type and Index parameters are now passed as the original wValue parameter to the
- *      function, to make way for the USB specification wIndex parameter which is <i>not</i> the same as the
- *      previous Index parameter.
- *    - The USB_UnhandledControlPacket event (see Events.h) now has new parameter names, to be in line with the
- *      official USB specification. Existing code will need to be altered to use the new parameter names.
- *    - The USB_CreateEndpoints event (see Events.h) has been renamed to USB_ConfigurationChanged, which is more
- *      appropriate. It fires in an identical manner to the previously named event, thus the only change to be made
- *      is the event name itself in the user project.
- *    - The USB_Descriptor_Language_t structure no longer exists in StdDescriptors.h, as this was a
- *      pseudo-descriptor modeled on the string descriptor. It is replaced by the true USB_Descriptor_String_t type
- *      descriptor as indicated in the USB specification, thus all device code must be updated accordingly.
- *    - The names of several Endpoint macros have been changed to be more consistent with the rest of the library,
- *      with no implementation changes. This means that existing code can be altered to use the new macro names
- *      with no other considerations required. See Endpoint.h for the new macro names.
- *    - The previous version of the MassStorage demo had an incorrect value in the SCSI_Request_Sense_Response_t
- *      structure named SenseData in SCSI.c which caused some problems with some hosts. User projects based on this
- *      demo should correct the structure value to maintain compatibility across multiple OS platforms.
- *    - By default, the descriptor structures use the official USB specification names for the elements. Previous
- *      versions of the library used non-standard (but more verbose) names, which are still usable in the current
- *      and future releases when the correct compile time option is enabled. See the StdDescriptors.h file
- *      documentation for more details.
- *
- *  <b>Host Mode</b>
- *    - The USB_Host_Request_Header_t structure in HostChapter9.h (used for issuing control requests) has had its
- *      members renamed to the official USB specification names for requests. Existing code will need to be updated
- *      to use the new names.
- *    - The names of several Pipe macros have been changed to be more consistent with the rest of the library,
- *      with no implementation changes. This means that existing code can be altered to use the new macro names
- *      with no other considerations required. See Pipe.h for the new macro names.
- *    - By default, the descriptor structures use the official USB specification names for the elements. Previous
- *      versions of the library used non-standard (but more verbose) names, which are still usable in the current
- *      and future releases when the correct compile time option is enabled. See the StdDescriptors.h file
- *      documentation for more details.
- *    - The names of the macros in Host.h for controlling the SOF generation have been renamed, see the Host.h
- *      module documentation for the new macro names.
- *
- *  <b>Dual Role Mode</b>
- *    - The OTG.h header file has been corrected so that the macros now perform their stated functions. Any existing
- *      projects using custom headers to fix the broken OTG header should now be altered to once again use the OTG
- *      header inside the library.
- *    - The USB_DeviceEnumerationComplete event (see Events.h) now also fires in Device mode, when the host has
- *      finished enumerating the device. Projects relying on the event only firing in Host mode should be updated
- *      so that the event action only occurs when the USB_Mode global is set to USB_MODE_HOST.
- */
-
diff --git a/NativePrograms/LUFA/DoxygenPages/OSDrivers.txt b/NativePrograms/LUFA/DoxygenPages/OSDrivers.txt
deleted file mode 100644
index a5bbbaa862..0000000000
--- a/NativePrograms/LUFA/DoxygenPages/OSDrivers.txt
+++ /dev/null
@@ -1,111 +0,0 @@
-/** \file
- *
- *  This file contains special DoxyGen information for the generation of the main page and other special
- *  documentation pages. It is not a project source file.
- */
-
-/** \page Page_OSDrivers Operating System Drivers
- *
- *  Most of the USB classes supported by LUFA are also supported natively in
- *  most operating systems, without extra drivers being required. However, in
- *  some cases, a driver file is required in order for the device to enumerate
- *  and function correctly.
- *
- *  \section Sec_OSClassSupport Operating System USB Class Support
- *  The table below lists the supported LUFA USB classes, and their associated
- *  <i>native</i> support on modern operating systems.
- *
- *  <table>
- *  <tr>
- *   <th width="200px">USB Class</th>
- *   <th width="150px">Android</th>
- *   <th width="150px">Windows</th>
- *   <th width="150px">Linux</th>
- *   <th width="150px">OS X</th>
- *  </tr>
- *  <tr>
- *   <td>Android Open Accessory</td>
- *   <td>2.3.4+</td>
- *   <td>N/A</td>
- *   <td>N/A</td>
- *   <td>N/A</td>
- *  </tr>
- *  <tr>
- *   <td>Audio 1.0</td>
- *   <td>N/A</td>
- *   <td>XP+</td>
- *   <td>2.6.?+</td>
- *   <td>10.?+</td>
- *  </tr>
- *  <tr>
- *   <td>CDC-ACM</td>
- *   <td>N/A</td>
- *   <td>XP+</td>
- *   <td>2.6.?+</td>
- *   <td>10.?+</td>
- *  </tr>
- *  <tr>
- *   <td>HID</td>
- *   <td>3.?+</td>
- *   <td>XP+</td>
- *   <td>2.6.?+</td>
- *   <td>10.?+</td>
- *  </tr>
- *  <tr>
- *   <td>MIDI</td>
- *   <td>N/A</td>
- *   <td>XP+</td>
- *   <td>2.6.?+</td>
- *   <td>10.?+</td>
- *  </tr>
- *  <tr>
- *   <td>Mass Storage</td>
- *   <td>N/A</td>
- *   <td>XP+</td>
- *   <td>2.6.?+</td>
- *   <td>10.?+</td>
- *  </tr>
- *  <tr>
- *   <td>Printer</td>
- *   <td>N/A</td>
- *   <td>XP+</td>
- *   <td>2.6.?+</td>
- *   <td>10.?+</td>
- *  </tr>
- *  <tr>
- *   <td>RNDIS</td>
- *   <td>N/A</td>
- *   <td>XP+</td>
- *   <td>2.6.?+</td>
- *   <td>N/A</td>
- *  </tr>
- *  <tr>
- *   <td>Still Image</td>
- *   <td>N/A</td>
- *   <td>XP+</td>
- *   <td>2.6.?+</td>
- *   <td>10.?+</td>
- *  </tr>
- *  </table>
- *
- *  \section Sec_WinINFTemplates Windows INF Drivers
- *  Windows uses INF driver files to associate a USB device of a specific class,
- *  VID/PID ID pair, Windows Compatibility ID or other characteristic to a kernel
- *  driver. In most cases these files are build into the operating system, and
- *  no special user action or driver files are required for a device using a
- *  standard USB class to enumerate. However, for some classes, a specific INF
- *  driver must be created and given to the operating system for the device to
- *  enumerate.
- *
- *  Those USB classes requiring a custom INF driver file in Windows are listed
- *  below, along with a basic INF template for each class.
- *
- *  \subsection SSec_WinINF_CDC Windows CDC INF Template
- *  This template is required for all CDC-ACM devices on Windows XP or newer.
- *  \verbinclude "WindowsINF/LUFA CDC-ACM.inf"
- *
- *  \subsection SSec_WinINF_RNDIS Windows RNDIS INF Template
- *  This template is required for all RNDIS devices on Windows XP or newer.
- *  \verbinclude "WindowsINF/LUFA RNDIS.inf"
- */
-
diff --git a/NativePrograms/LUFA/DoxygenPages/ProgrammingApps.txt b/NativePrograms/LUFA/DoxygenPages/ProgrammingApps.txt
deleted file mode 100644
index 1af7b08276..0000000000
--- a/NativePrograms/LUFA/DoxygenPages/ProgrammingApps.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-/** \file
- *
- *  This file contains special DoxyGen information for the generation of the main page and other special
- *  documentation pages. It is not a project source file.
- */
-
-/** \page Page_ProgrammingApps Programming an Application into a USB AVR
- *
- *  Once you have built an application, you will need a way to program in the resulting ".HEX" file (and, if your
- *  application uses EEPROM variables with initial values, also a ".EEP" file) into your USB AVR. Normally, the
- *  reprogramming of an AVR device must be performed using a special piece of programming hardware, through one of the
- *  supported AVR programming protocols - ISP, HVSP, HVPP, JTAG, dW or PDI. This can be done through a custom programmer,
- *  a third party programmer, or an official Atmel AVR tool - for more information, see the <a>atmel.com</a> website.
- *
- *  Alternatively, you can use the bootloader. From the Atmel factory, each USB AVR comes preloaded with the Atmel
- *  DFU (Device Firmware Update) class bootloader, a small piece of AVR firmware which allows the remainder of the
- *  AVR to be programmed through a non-standard interface such as the serial USART port, SPI, or (in this case) USB.
- *  Bootloaders have the advantage of not requiring any special hardware for programming, and cannot usually be erased
- *  or broken without an external programming device. They have disadvantages however; they cannot change the fuses of
- *  the AVR (special configuration settings that control the operation of the chip itself) and a small portion of the
- *  AVR's FLASH program memory must be reserved to contain the bootloader firmware, and thus cannot be used by the
- *  loaded application.
- *
- *  If you wish to use the DFU bootloader to program in your application, refer to your DFU programmer's documentation.
- *  Atmel provides a free utility called FLIP which is USB AVR compatible, and an open source (Linux compatible)
- *  alternative exists called "dfu-programmer".
- */
diff --git a/NativePrograms/LUFA/DoxygenPages/SoftwareBootloaderJump.txt b/NativePrograms/LUFA/DoxygenPages/SoftwareBootloaderJump.txt
deleted file mode 100644
index ed7c41faef..0000000000
--- a/NativePrograms/LUFA/DoxygenPages/SoftwareBootloaderJump.txt
+++ /dev/null
@@ -1,71 +0,0 @@
-/** \file
- *
- *  This file contains special DoxyGen information for the generation of the main page and other special
- *  documentation pages. It is not a project source file.
- */
-
-/**
- *  \page Page_SoftwareBootloaderStart Entering the Bootloader via Software
- *
- *  A common requirement of many applications is the ability to jump to the programmed bootloader of a chip
- *  on demand, via the code's firmware (i.e. not as a result of any physical user interaction with the
- *  hardware). This might be required because the device does not have any physical user input, or simply
- *  just to streamline the device upgrade process on the host PC.
- *
- *  The following C code snippets may be used to enter the bootloader upon request by the user application.
- *  By using the watchdog to physically reset the controller, it is ensured that all system hardware is
- *  completely reset to their defaults before the bootloader is run. This is important; since bootloaders
- *  are written to occupy a very limited space, they usually make assumptions about the register states based
- *  on the default values after a hard-reset of the chip.
- *
- *  \section Sec_SoftareBootAVR8 AVR8 Architecture
- *  The following software bootloader jump code is written for the AVR8 architecture.
- *
- *  \code
- *  #include <avr/wdt.h>
- *  #include <avr/io.h>
- *  #include <util/delay.h>
- *
- *  #include <LUFA/Common/Common.h>
- *  #include <LUFA/Drivers/USB/USB.h>
- *
- *  uint32_t Boot_Key ATTR_NO_INIT;
- *
- *  #define MAGIC_BOOT_KEY            0xBADCAFE5
- *  #define BOOTLOADER_START_ADDRESS  ((FLASH_SIZE_BYTES - BOOTLOADER_SEC_SIZE_BYTES) >> 1)
- *
- *  void Bootloader_Jump_Check(void) ATTR_INIT_SECTION(3);
- *  void Bootloader_Jump_Check(void)
- *  {
- *      // If the reset source was the bootloader and the key is correct, clear it and jump to the bootloader
- *      if ((MCUSR & (1 << WDRF)) && (Boot_Key == MAGIC_BOOT_KEY))
- *      {
- *          Boot_Key = 0;
- *          ((void (*)(void))BOOTLOADER_START_ADDRESS)();
- *      }
- *  }
- *
- *  void Jump_To_Bootloader(void)
- *  {
- *      // If USB is used, detach from the bus and reset it
- *      USB_Disable();
- *
- *      // Disable all interrupts
- *      cli();
- *
- *      // Wait two seconds for the USB detachment to register on the host
- *      Delay_MS(2000);
- *
- *      // Set the bootloader key to the magic value and force a reset
- *      Boot_Key = MAGIC_BOOT_KEY;
- *      wdt_enable(WDTO_250MS);
- *      for (;;);
- *  }
- *  \endcode
- *
- *  Note that the bootloader magic key can be any arbitrary value. The <em>FLASH_SIZE_BYTES</em> and
- *  <em>BOOTLOADER_SEC_SIZE_BYTES</em> tokens should be replaced with the total flash size of the AVR
- *  in bytes, and the allocated size of the bootloader section for the target AVR.
- *
- */
-
diff --git a/NativePrograms/LUFA/DoxygenPages/Style/Footer.htm b/NativePrograms/LUFA/DoxygenPages/Style/Footer.htm
deleted file mode 100644
index c6de4e64dd..0000000000
--- a/NativePrograms/LUFA/DoxygenPages/Style/Footer.htm
+++ /dev/null
@@ -1,35 +0,0 @@
-<!--BEGIN GENERATE_TREEVIEW-->
-	<div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->
-		<ul>
-			<li class="footer" style="float:left !important;">
-				$generatedby
-				<a href="http://www.doxygen.org/index.html">
-					<img class="footer" src="$relpath$doxygen.png" alt="doxygen"/>
-				</a>
-				$doxygenversion
-			</li>
-
-			<li class="footer">
-				<a href="http://www.lufa-lib.org" title="LUFA Project Page">LUFA Project Page</a> | <a href="http://www.lufa-lib.org/support" title="LUFA Support List">Support Mailing List</a> | <a href="http://www.lufa-lib.org/donate" title="Donate to Support LUFA">Donate</a> | <a href="http://www.fourwalledcubicle.com" title="Four Walled Cubicle Website">Four Walled Cubicle</a> - LUFA, the Lightweight USB Framework for AVRs
-			</li>
-		</ul>
-	</div>
-<!--END GENERATE_TREEVIEW-->
-<!--BEGIN !GENERATE_TREEVIEW-->
-		<hr class="footer"/>
-		<div class="footer">
-			<span style="float: left;">
-				$generatedby
-				<a href="http://www.doxygen.org/index.html">
-					<img class="footer" src="$relpath$doxygen.png" alt="doxygen"/>
-				</a>
-				$doxygenversion
-			</span>
-
-			<span style="margin-right: 20px; float: right;">
-				<a href="http://www.lufa-lib.org" title="LUFA Project Page">LUFA Project Page</a> | <a href="http://www.lufa-lib.org/support" title="LUFA Support List">Support Mailing List</a> | <a href="http://www.lufa-lib.org/donate" title="Donate to Support LUFA">Donate</a> | <a href="http://www.fourwalledcubicle.com" title="Four Walled Cubicle Website">Four Walled Cubicle</a> - LUFA, the Lightweight USB Framework for AVRs
-			</span>
-		</div>
-<!--END !GENERATE_TREEVIEW-->
-	</body>
-</html>
\ No newline at end of file
diff --git a/NativePrograms/LUFA/DoxygenPages/Style/Style.css b/NativePrograms/LUFA/DoxygenPages/Style/Style.css
deleted file mode 100644
index 10ab2a938e..0000000000
--- a/NativePrograms/LUFA/DoxygenPages/Style/Style.css
+++ /dev/null
@@ -1,93 +0,0 @@
-/* ============================= */
-/*    Page Header Formattings    */
-/* ============================= */
-#titlearea {
-	background-color:#E1E7F4;
-	background-image:url('nav_f.png');
-	background-repeat:repeat-x;
-	color:#20335A;
-	font-weight:bold;
-	text-shadow:0 1px 1px rgba(255, 255, 255, 0.9);
-}
-
-#projectlogo {
-	padding-left: 10px;
-}
-
-/* ============================= */
-/*    General Text Formattings   */
-/* ============================= */
-body,table,div,p,dl {
-	font-family:Lucida Grande, Verdana, Geneva, Arial, sans-serif;
-	font-size:13px;
-	line-height:1.3;
-}
-
-div.header, div.contents p {
-	padding-left:12px;
-}
-
-/* ============================= */
-/* API Documentation Formattings */
-/* ============================= */
-div.contents table.memberdecls, .paramname {
-	font-family:Consolas, Monaco, courier, sans-serif;
-	font-size:105%;
-	padding-right:20px;
-}
-
-/* ============================= */
-/*    HTML Heading Formattings   */
-/* ============================= */
-h1, h2, h3, h4 {
-	font-family:Lucida Grande, Verdana, Geneva, Arial, sans-serif;
-}
-
-h1 {
-	font-size:25px;
-	margin-bottom:10px;
-}
-
-h2 {
-	color:#42657B;
-	font-size:17px;
-}
-
-h3 {
-	font-size:15px;
-}
-
-h4 {
-	font-size:13px;
-}
-
-/* ============================= */
-/*    Code Snippet Formattings   */
-/* ============================= */
-span.keyword {
-	color:#008000;
-}
-
-span.keywordtype {
-	color:#604020;
-}
-
-span.keywordflow {
-	color:#e08000;
-}
-
-span.comment {
-	color:#008000;
-}
-
-span.preprocessor {
-	color:#806020;
-}
-
-span.stringliteral {
-	color:#002080;
-}
-
-span.charliteral {
-	color:#008080;
-}
diff --git a/NativePrograms/LUFA/DoxygenPages/VIDAndPIDValues.txt b/NativePrograms/LUFA/DoxygenPages/VIDAndPIDValues.txt
deleted file mode 100644
index de59e16069..0000000000
--- a/NativePrograms/LUFA/DoxygenPages/VIDAndPIDValues.txt
+++ /dev/null
@@ -1,199 +0,0 @@
-/** \file
- *
- *  This file contains special DoxyGen information for the generation of the main page and other special
- *  documentation pages. It is not a project source file.
- */
-
-/** \page Page_VIDPID VID and PID values
- *
- *  \section Sec_VIDPID_Allocations VID and PID Allocations
- *  The LUFA library uses VID/PID combinations generously donated by Atmel. The following VID/PID combinations
- *  are used within the LUFA demos, and thus may be re-used by derivations of each demo. Free PID values may be
- *  used by future LUFA demo projects.
- *
- *  <b>These VID/PID values should not be used in commercial designs under any circumstances.</b> Private projects
- *  may use the following values freely, but must accept any collisions due to other LUFA derived private projects
- *  sharing identical values. It is suggested that private projects using interfaces compatible with existing
- *  demos share the same VID/PID value.
- *
- *  <table>
- *   <tr>
- *    <th>VID</th>
- *    <th>PID</th>
- *    <th>Usage</th>
- *   </tr>
- *   <tr>
- *    <td>0x03EB</td>
- *    <td>0x2040</td>
- *    <td>Test VID/PID (See \ref Sec_Test_VIDPID)</td>
- *   </tr>
- *   <tr>
- *    <td>0x03EB</td>
- *    <td>0x2041</td>
- *    <td>Mouse Demo Application</td>
- *   </tr>
- *   <tr>
- *    <td>0x03EB</td>
- *    <td>0x2042</td>
- *    <td>Keyboard Demo Application</td>
- *   </tr>
- *   <tr>
- *    <td>0x03EB</td>
- *    <td>0x2043</td>
- *    <td>Joystick Demo Application</td>
- *   </tr>
- *   <tr>
- *    <td>0x03EB</td>
- *    <td>0x2044</td>
- *    <td>CDC Demo Application</td>
- *   </tr>
- *   <tr>
- *    <td>0x03EB</td>
- *    <td>0x2045</td>
- *    <td>Mass Storage Demo Application</td>
- *   </tr>
- *   <tr>
- *    <td>0x03EB</td>
- *    <td>0x2046</td>
- *    <td>Audio Output Demo Application</td>
- *   </tr>
- *   <tr>
- *    <td>0x03EB</td>
- *    <td>0x2047</td>
- *    <td>Audio Input Demo Application</td>
- *   </tr>
- *   <tr>
- *    <td>0x03EB</td>
- *    <td>0x2048</td>
- *    <td>MIDI Demo Application</td>
- *   </tr>
- *   <tr>
- *    <td>0x03EB</td>
- *    <td>0x2049</td>
- *    <td>MagStripe Project</td>
- *   </tr>
- *   <tr>
- *    <td>0x03EB</td>
- *    <td>0x204A</td>
- *    <td>CDC Class Bootloader</td>
- *   </tr>
- *   <tr>
- *    <td>0x03EB</td>
- *    <td>0x204B</td>
- *    <td>USB to Serial Demo Application</td>
- *   </tr>
- *   <tr>
- *    <td>0x03EB</td>
- *    <td>0x204C</td>
- *    <td>RNDIS Demo Application</td>
- *   </tr>
- *   <tr>
- *    <td>0x03EB</td>
- *    <td>0x204D</td>
- *    <td>Combined Keyboard and Mouse Demo Application</td>
- *   </tr>
- *   <tr>
- *    <td>0x03EB</td>
- *    <td>0x204E</td>
- *    <td>Dual CDC Demo Application</td>
- *   </tr>
- *   <tr>
- *    <td>0x03EB</td>
- *    <td>
- *     0x204F
- *    </td>
- *    <td>Generic HID Demo Application</td>
- *   </tr>
- *   <tr>
- *    <td>0x03EB</td>
- *    <td>0x2060</td>
- *    <td>Benito Programmer Project</td>
- *   </tr>
- *   <tr>
- *    <td>0x03EB</td>
- *    <td>0x2061</td>
- *    <td>Combined Mass Storage and Keyboard Demo</td>
- *   </tr>
- *   <tr>
- *    <td>0x03EB</td>
- *    <td>0x2062</td>
- *    <td>Combined CDC and Mouse Demo</td>
- *   </tr>
- *   <tr>
- *    <td>0x03EB</td>
- *    <td>0x2063</td>
- *    <td>Mass Storage/HID Interface Datalogger Project</td>
- *   </tr>
- *   <tr>
- *    <td>0x03EB</td>
- *    <td>0x2064</td>
- *    <td>Interfaceless Control-Only LUFA Devices</td>
- *   </tr>
- *   <tr>
- *    <td>0x03EB</td>
- *    <td>0x2065</td>
- *    <td>Test and Measurement Demo</td>
- *   </tr>
- *   <tr>
- *    <td>0x03EB</td>
- *    <td>
- *     0x2066
- *    </td>
- *    <td>Multiple Report Keyboard/Mouse HID Demo</td>
- *   </tr>
- *   <tr>
- *    <td>0x03EB</td>
- *    <td>0x2067</td>
- *    <td>HID Class Bootloader</td>
- *   </tr>
- *   <tr>
- *    <td>0x03EB</td>
- *    <td>0x2068</td>
- *    <td>Virtual Serial/Mass Storage Demo</td>
- *   </tr>
- *   <tr>
- *    <td>0x03EB</td>
- *    <td>
- *     0x2069
- *    </td>
- *    <td>Webserver Project</td>
- *   </tr>
- *   <tr>
- *    <td>0x03EB</td>
- *    <td>0x206A</td>
- *    <td>Media Control Project</td>
- *   </tr>
- *   <tr>
- *    <td>0x03EB</td>
- *    <td>0x206B</td>
- *    <td>Printer Class Bootloader</td>
- *   </tr>
- *   <tr>
- *    <td>0x03EB</td>
- *    <td>0x206C</td>
- *    <td>Bulk Vendor Demo Application</td>
- *   </tr>
- *   <tr>
- *    <td>0x03EB</td>
- *    <td>0x206D</td>
- *    <td>Dual MIDI Demo Application</td>
- *   </tr>
- *   <tr>
- *    <td>0x03EB</td>
- *    <td>0x206E</td>
- *    <td>CCID Class Demo Application</td>
- *   </tr>
- *   <tr>
- *    <td>0x03EB</td>
- *    <td>0x206F</td>
- *    <td><i>Currently Unallocated</i></td>
- *   </tr>
- *  </table>
- *
- *  \section Sec_Test_VIDPID The Test VID/PID Combination
- *  For use in testing of LUFA powered devices during development only, by non-commercial entities.
- *  All devices must accept collisions on this VID/PID range (from other in-development LUFA devices)
- *  to be resolved by using a unique release number in the Device Descriptor. No devices using this
- *  VID/PID combination may be released to the general public.
- */
-
diff --git a/NativePrograms/LUFA/DoxygenPages/WritingBoardDrivers.txt b/NativePrograms/LUFA/DoxygenPages/WritingBoardDrivers.txt
deleted file mode 100644
index fa113ba2e3..0000000000
--- a/NativePrograms/LUFA/DoxygenPages/WritingBoardDrivers.txt
+++ /dev/null
@@ -1,47 +0,0 @@
-/** \file
- *
- *  This file contains special DoxyGen information for the generation of the main page and other special
- *  documentation pages. It is not a project source file.
- */
-
-/** \page Page_WritingBoardDrivers Writing LUFA Board Drivers
- *
- *  LUFA ships with several basic pre-made board drivers, to control hardware present on the supported board
- *  hardware - such as Dataflash ICs, LEDs, Joysticks, or other hardware peripherals. When compiling an application
- *  which makes use of one or more board drivers located in <i>LUFA/Drivers/Board</i>, you must also indicate which
- *  board hardware you are using in your project makefile. This is done by defining the <tt>BOARD</tt> macro using
- *  the <tt>-D</tt> switch passed to the compiler, with a constant of <tt>BOARD_{Name}</tt>. For example,
- *  <tt>-DBOARD=BOARD_USBKEY</tt> instructs the compiler to use the USBKEY board hardware drivers.
- *
- *  If your application does not use <i>any</i> board level drivers, you can omit the definition of the <tt>BOARD</tt>
- *  macro. However, some users may wish to write their own custom board hardware drivers which are to remain compatible
- *  with the LUFA hardware API. To do this, the <tt>BOARD</tt> macro should be defined to the value <tt>BOARD_USER</tt>.
- *  This indicates that the board level drivers should be located in a folder named "Board" located inside the
- *  application's folder.
- *
- *  When used, the driver stub files located in the <tt>LUFA/CodeTemplates/DriverStubs</tt> folder should be copied to
- *  the user application's <tt>Board/</tt> directory, and filled out to include the values and code needed to control
- *  the custom board hardware. Once done, the existing LUFA board level APIs (accessed in the regular
- *  <tt>LUFA/Drivers/Board/</tt> folder) will redirect to the user board drivers, maintaining code compatibility and
- *  allowing for a different board to be selected through the project makefile with no code changes.
- *
- *  \section Sec_BoardTemplates Board Driver Templates
- *
- *  The templates for each board driver are reproduced below.
- *
- *  \subsection SSec_BoardTemplates_Board Template for USER <Board/Board.h>
- *  \include "DriverStubs/Board.h"
- *
- *  \subsection SSec_BoardTemplates_Buttons Template for USER <Board/Buttons.h>
- *  \include "DriverStubs/Buttons.h"
- *
- *  \subsection SSec_BoardTemplates_Dataflash Template for USER <Board/Dataflash.h>
- *  \include "DriverStubs/Dataflash.h"
- *
- *  \subsection SSec_BoardTemplates_Joystick Template for USER <Board/Joystick.h>
- *  \include "DriverStubs/Joystick.h"
- *
- *  \subsection SSec_BoardTemplates_LEDs Template for USER <Board/LEDs.h>
- *  \include "DriverStubs/LEDs.h"
- */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/ADAFRUITU4/Board.h b/NativePrograms/LUFA/Drivers/Board/AVR8/ADAFRUITU4/Board.h
deleted file mode 100644
index 90005139f4..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/ADAFRUITU4/Board.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific information header for the Adafruit U4 Breakout board.
- *  \copydetails Group_BoardInfo_ADAFRUITU4
- *
- *  \note This file should not be included directly. It is automatically included as needed by the Board driver
- *        dispatch header located in LUFA/Drivers/Board/Board.h.
- */
-
-/** \ingroup Group_BoardInfo
- *  \defgroup Group_BoardInfo_ADAFRUITU4 ADAFRUITU4
- *  \brief Board specific information header for the Adafruit U4 Breakout board.
- *
- *  Board specific information header for the Adafruit U4 Breakout board (http://ladyada.net/products/atmega32u4breakout).
- *
- *  @{
- */
-
-#ifndef __BOARD_ADAFRUITU4_H__
-#define __BOARD_ADAFRUITU4_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-		#include "../../LEDs.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_BOARD_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/Board.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Indicates the board has hardware LEDs mounted. */
-			#define BOARD_HAS_LEDS
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/ADAFRUITU4/LEDs.h b/NativePrograms/LUFA/Drivers/Board/AVR8/ADAFRUITU4/LEDs.h
deleted file mode 100644
index 23654d2bea..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/ADAFRUITU4/LEDs.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific LED driver header for the Adafruit U4 Breakout board.
- *  \copydetails Group_LEDs_ADAFRUITU4
- *
- *  \note This file should not be included directly. It is automatically included as needed by the LEDs driver
- *        dispatch header located in LUFA/Drivers/Board/LEDs.h.
- */
-
-/** \ingroup Group_LEDs
- *  \defgroup Group_LEDs_ADAFRUITU4 ADAFRUITU4
- *  \brief Board specific LED driver header for the Adafruit U4 Breakout board.
- *
- *  Board specific LED driver header for the Adafruit U4 Breakout board (http://ladyada.net/products/atmega32u4breakout).
- *
- *  <table>
- *    <tr><th>Name</th><th>Color</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr>
- *    <tr><td>LEDS_LED1</td><td>Green</td><td>General Indicator</td><td>High</td><td>PORTE.6</td></tr>
- *  </table>
- *
- *  @{
- */
-
-#ifndef __LEDS_ADAFRUITU4_H__
-#define __LEDS_ADAFRUITU4_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_LEDS_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/LEDS.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** LED mask for the first LED on the board. */
-			#define LEDS_LED1        (1 << 6)
-
-			/** LED mask for all the LEDs on the board. */
-			#define LEDS_ALL_LEDS    LEDS_LED1
-
-			/** LED mask for the none of the board LEDs. */
-			#define LEDS_NO_LEDS     0
-
-		/* Inline Functions: */
-		#if !defined(__DOXYGEN__)
-			static inline void LEDs_Init(void)
-			{
-				DDRE  |=  LEDS_ALL_LEDS;
-				PORTE &= ~LEDS_ALL_LEDS;
-         	}
-
-			static inline void LEDs_Disable(void)
-			{
-				DDRE  &= ~LEDS_ALL_LEDS;
-				PORTE &= ~LEDS_ALL_LEDS;
-         	}
-
-			static inline void LEDs_TurnOnLEDs(const uint8_t LEDMask)
-			{
-				PORTE |= LEDMask;
-			}
-
-			static inline void LEDs_TurnOffLEDs(const uint8_t LEDMask)
-			{
-				PORTE &= ~LEDMask;
-			}
-
-			static inline void LEDs_SetAllLEDs(const uint8_t LEDMask)
-			{
-				PORTE  = ((PORTE & ~LEDS_ALL_LEDS) | LEDMask);
-			}
-
-			static inline void LEDs_ChangeLEDs(const uint8_t LEDMask,
-			                                   const uint8_t ActiveMask)
-			{
-				PORTE  = ((PORTE & ~LEDMask) | ActiveMask);
-			}
-
-			static inline void LEDs_ToggleLEDs(const uint8_t LEDMask)
-			{
-				PINE   = LEDMask;
-			}
-
-			static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT;
-			static inline uint8_t LEDs_GetLEDs(void)
-			{
-				return (PORTE & LEDS_ALL_LEDS);
-			}
-		#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/ATAVRUSBRF01/Board.h b/NativePrograms/LUFA/Drivers/Board/AVR8/ATAVRUSBRF01/Board.h
deleted file mode 100644
index c0b856ad25..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/ATAVRUSBRF01/Board.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific information header for the Atmel ATAVRUSBRF01.
- *  \copydetails Group_BoardInfo_ATAVRUSBRF01
- *
- *  \note This file should not be included directly. It is automatically included as needed by the Board driver
- *        dispatch header located in LUFA/Drivers/Board/Board.h.
- */
-
-/** \ingroup Group_BoardInfo
- *  \defgroup Group_BoardInfo_ATAVRUSBRF01 ATAVRUSBRF01
- *  \brief Board specific information header for the Atmel ATAVRUSBRF01.
- *
- *  Board specific information header for the Atmel ATAVRUSBRF01.
- *
- *  @{
- */
-
-#ifndef __BOARD_ATAVRUSBRF01_H__
-#define __BOARD_ATAVRUSBRF01_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-		#include "../../Buttons.h"
-		#include "../../LEDs.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_BOARD_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/Board.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Indicates the board has hardware Buttons mounted. */
-			#define BOARD_HAS_BUTTONS
-
-			/** Indicates the board has hardware LEDs mounted. */
-			#define BOARD_HAS_LEDS
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/ATAVRUSBRF01/Buttons.h b/NativePrograms/LUFA/Drivers/Board/AVR8/ATAVRUSBRF01/Buttons.h
deleted file mode 100644
index c71c59c04e..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/ATAVRUSBRF01/Buttons.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific Buttons driver header for the Atmel ATAVRUSBRF01.
- *  \copydetails Group_Buttons_ATAVRUSBRF01
- *
- *  \note This file should not be included directly. It is automatically included as needed by the Buttons driver
- *        dispatch header located in LUFA/Drivers/Board/Buttons.h.
- */
-
-/** \ingroup Group_Buttons
- *  \defgroup Group_Buttons_ATAVRUSBRF01 ATAVRUSBRF01
- *  \brief Board specific Buttons driver header for the Atmel ATAVRUSBRF01.
- *
- *  Board specific Buttons driver header for the Atmel ATAVRUSBRF01.
- *
- *  <table>
- *    <tr><th>Name</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr>
- *    <tr><td>BUTTONS_BUTTON1</td><td>HWB Button</td><td>Low</td><td>PORTD.7</td></tr>
- *  </table>
- *
- *  @{
- */
-
-#ifndef __BUTTONS_ATAVRUSBRF01_H__
-#define __BUTTONS_ATAVRUSBRF01_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_BUTTONS_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/Buttons.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Button mask for the first button on the board. */
-			#define BUTTONS_BUTTON1      (1 << 7)
-
-		/* Inline Functions: */
-		#if !defined(__DOXYGEN__)
-			static inline void Buttons_Init(void)
-			{
-				DDRD  &= ~BUTTONS_BUTTON1;
-				PORTD |=  BUTTONS_BUTTON1;
-			}
-
-			static inline void Buttons_Disable(void)
-			{
-				DDRD  &= ~BUTTONS_BUTTON1;
-				PORTD &= ~BUTTONS_BUTTON1;
-			}
-
-			static inline uint8_t Buttons_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
-			static inline uint8_t Buttons_GetStatus(void)
-			{
-				return ((PIND & BUTTONS_BUTTON1) ^ BUTTONS_BUTTON1);
-			}
-		#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/ATAVRUSBRF01/LEDs.h b/NativePrograms/LUFA/Drivers/Board/AVR8/ATAVRUSBRF01/LEDs.h
deleted file mode 100644
index 7531e15923..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/ATAVRUSBRF01/LEDs.h
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific LED driver header for the Atmel ATAVRUSBRF01.
- *  \copydetails Group_LEDs_ATAVRUSBRF01
- *
- *  \note This file should not be included directly. It is automatically included as needed by the LEDs driver
- *        dispatch header located in LUFA/Drivers/Board/LEDs.h.
- */
-
-/** \ingroup Group_LEDs
- *  \defgroup Group_LEDs_ATAVRUSBRF01 ATAVRUSBRF01
- *  \brief Board specific LED driver header for the Atmel ATAVRUSBRF01.
- *
- *  Board specific LED driver header for the Atmel ATAVRUSBRF01.
- *
- *  <table>
- *    <tr><th>Name</th><th>Color</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr>
- *    <tr><td>LEDS_LED1</td><td>Green</td><td>RX LED</td><td>High</td><td>PORTD.0</td></tr>
- *    <tr><td>LEDS_LED2</td><td>Red</td><td>TX LED</td><td>High</td><td>PORTD.1</td></tr>
- *  </table>
- *
- *  @{
- */
-
-#ifndef __LEDS_ATAVRUSBRF01_H__
-#define __LEDS_ATAVRUSBRF01_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_LEDS_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/LEDS.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** LED mask for the first LED on the board. */
-			#define LEDS_LED1        (1 << 0)
-
-			/** LED mask for the second LED on the board. */
-			#define LEDS_LED2        (1 << 1)
-
-			/** LED mask for all the LEDs on the board. */
-			#define LEDS_ALL_LEDS    (LEDS_LED1 | LEDS_LED2)
-
-			/** LED mask for none of the board LEDs. */
-			#define LEDS_NO_LEDS     0
-
-		/* Inline Functions: */
-		#if !defined(__DOXYGEN__)
-			static inline void LEDs_Init(void)
-			{
-				DDRD  |=  LEDS_ALL_LEDS;
-				PORTD &= ~LEDS_ALL_LEDS;
-			}
-
-			static inline void LEDs_Disable(void)
-			{
-				DDRD  &= ~LEDS_ALL_LEDS;
-				PORTD &= ~LEDS_ALL_LEDS;
-			}
-
-			static inline void LEDs_TurnOnLEDs(const uint8_t LEDMask)
-			{
-				PORTD |= (LEDMask & LEDS_ALL_LEDS);
-			}
-
-			static inline void LEDs_TurnOffLEDs(const uint8_t LEDMask)
-			{
-				PORTD &= ~(LEDMask & LEDS_ALL_LEDS);
-			}
-
-			static inline void LEDs_SetAllLEDs(const uint8_t LEDMask)
-			{
-				PORTD = (PORTD & ~LEDS_ALL_LEDS) | (LEDMask & LEDS_ALL_LEDS);
-			}
-
-			static inline void LEDs_ChangeLEDs(const uint8_t LEDMask,
-			                                   const uint8_t ActiveMask)
-			{
-				PORTD = ((PORTD & ~LEDMask) | ActiveMask);
-			}
-
-			static inline void LEDs_ToggleLEDs(const uint8_t LEDMask)
-			{
-				PIND  = LEDMask;
-			}
-
-			static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT;
-			static inline uint8_t LEDs_GetLEDs(void)
-			{
-				return (PORTD & LEDS_ALL_LEDS);
-			}
-		#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/BENITO/Board.h b/NativePrograms/LUFA/Drivers/Board/AVR8/BENITO/Board.h
deleted file mode 100644
index afc5ee1b3a..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/BENITO/Board.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific information header for the Tempusdictum Benito.
- *  \copydetails Group_BoardInfo_BENITO
- *
- *  \note This file should not be included directly. It is automatically included as needed by the Board driver
- *        dispatch header located in LUFA/Drivers/Board/Board.h.
- */
-
-/** \ingroup Group_BoardInfo
- *  \defgroup Group_BoardInfo_BENITO BENITO
- *  \brief Board specific information header for the Tempusdictum Benito.
- *
- *  Board specific information header for the Tempusdictum Benito (http://dorkbotpdx.org/wiki/benito).
- *
- *  @{
- */
-
-#ifndef __BOARD_BENITO_H__
-#define __BOARD_BENITO_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-		#include "../../Buttons.h"
-		#include "../../LEDs.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_BOARD_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/Board.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Indicates the board has hardware Buttons mounted. */
-			#define BOARD_HAS_BUTTONS
-
-			/** Indicates the board has hardware LEDs mounted. */
-			#define BOARD_HAS_LEDS
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/BENITO/Buttons.h b/NativePrograms/LUFA/Drivers/Board/AVR8/BENITO/Buttons.h
deleted file mode 100644
index b3c8030fa3..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/BENITO/Buttons.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific Buttons driver header for the Tempusdictum Benito.
- *  \copydetails Group_Buttons_BENITO
- *
- *  \note This file should not be included directly. It is automatically included as needed by the Buttons driver
- *        dispatch header located in LUFA/Drivers/Board/Buttons.h.
- */
-
-/** \ingroup Group_Buttons
- *  \defgroup Group_Buttons_BENITO BENITO
- *  \brief Board specific Buttons driver header for the Tempusdictum Benito.
- *
- *  Board specific Buttons driver header for the Tempusdictum Benito (http://dorkbotpdx.org/wiki/benito).
- *
- *  <table>
- *    <tr><th>Name</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr>
- *    <tr><td>BUTTONS_BUTTON1</td><td>HWB Button</td><td>Low</td><td>PORTD.7</td></tr>
- *  </table>
- *
- *  @{
- */
-
-#ifndef __BUTTONS_BENITO_H__
-#define __BUTTONS_BENITO_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_BUTTONS_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/Buttons.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Button mask for the first button on the board. */
-			#define BUTTONS_BUTTON1      (1 << 7)
-
-		/* Inline Functions: */
-		#if !defined(__DOXYGEN__)
-			static inline void Buttons_Init(void)
-			{
-				DDRD  &= ~BUTTONS_BUTTON1;
-				PORTD |=  BUTTONS_BUTTON1;
-			}
-
-			static inline void Buttons_Disable(void)
-			{
-				DDRD  &= ~BUTTONS_BUTTON1;
-				PORTD &= ~BUTTONS_BUTTON1;
-			}
-
-			static inline uint8_t Buttons_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
-			static inline uint8_t Buttons_GetStatus(void)
-			{
-				return ((PIND & BUTTONS_BUTTON1) ^ BUTTONS_BUTTON1);
-			}
-		#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/BENITO/LEDs.h b/NativePrograms/LUFA/Drivers/Board/AVR8/BENITO/LEDs.h
deleted file mode 100644
index be443ef8cd..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/BENITO/LEDs.h
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific LED driver header for the Tempusdictum Benito.
- *  \copydetails Group_LEDs_BENITO
- *
- *  \note This file should not be included directly. It is automatically included as needed by the LEDs driver
- *        dispatch header located in LUFA/Drivers/Board/LEDs.h.
- */
-
-/** \ingroup Group_LEDs
- *  \defgroup Group_LEDs_BENITO BENITO
- *  \brief Board specific LED driver header for the Tempusdictum Benito.
- *
- *  Board specific LED driver header for the Tempusdictum Benito (http://dorkbotpdx.org/wiki/benito).
- *
- *  <table>
- *    <tr><th>Name</th><th>Color</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr>
- *    <tr><td>LEDS_LED1</td><td>Green</td><td>TX LED</td><td>Low</td><td>PORTC.7</td></tr>
- *    <tr><td>LEDS_LED2</td><td>Red</td><td>RX LED</td><td>Low</td><td>PORTC.6</td></tr>
- *  </table>
- *
- *  @{
- */
-
-#ifndef __LEDS_BENITO_H__
-#define __LEDS_BENITO_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_LEDS_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/LEDS.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** LED mask for the first LED on the board. */
-			#define LEDS_LED1        (1 << 7)
-
-			/** LED mask for the second LED on the board. */
-			#define LEDS_LED2        (1 << 6)
-
-			/** LED mask for all the LEDs on the board. */
-			#define LEDS_ALL_LEDS    (LEDS_LED1 | LEDS_LED2)
-
-			/** LED mask for none of the board LEDs. */
-			#define LEDS_NO_LEDS     0
-
-		/* Inline Functions: */
-		#if !defined(__DOXYGEN__)
-			static inline void LEDs_Init(void)
-			{
-				DDRC  |= LEDS_ALL_LEDS;
-				PORTC |= LEDS_ALL_LEDS;
-			}
-
-			static inline void LEDs_Disable(void)
-			{
-				DDRC  &= ~LEDS_ALL_LEDS;
-				PORTC &= ~LEDS_ALL_LEDS;
-			}
-
-			static inline void LEDs_TurnOnLEDs(const uint8_t LEDMask)
-			{
-				PORTC &= ~LEDMask;
-			}
-
-			static inline void LEDs_TurnOffLEDs(const uint8_t LEDMask)
-			{
-				PORTC |= LEDMask;
-			}
-
-			static inline void LEDs_SetAllLEDs(const uint8_t LEDMask)
-			{
-				PORTC = ((PORTC | LEDS_ALL_LEDS) & ~LEDMask);
-			}
-
-			static inline void LEDs_ChangeLEDs(const uint8_t LEDMask,
-			                                   const uint8_t ActiveMask)
-			{
-				PORTC = ((PORTC | LEDMask) & ~ActiveMask);
-			}
-
-			static inline void LEDs_ToggleLEDs(const uint8_t LEDMask)
-			{
-				PINC  = LEDMask;
-			}
-
-			static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT;
-			static inline uint8_t LEDs_GetLEDs(void)
-			{
-				return (~PORTC & LEDS_ALL_LEDS);
-			}
-		#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/BIGMULTIO/Board.h b/NativePrograms/LUFA/Drivers/Board/AVR8/BIGMULTIO/Board.h
deleted file mode 100644
index 6ac9c68aed..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/BIGMULTIO/Board.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific information header for the Bitwizard Big-Multio.
- *  \copydetails Group_BoardInfo_BIGMULTIO
- *
- *  \note This file should not be included directly. It is automatically included as needed by the Board driver
- *        dispatch header located in LUFA/Drivers/Board/Board.h.
- */
-
-/** \ingroup Group_BoardInfo
- *  \defgroup Group_BoardInfo_BIGMULTIO BIGMULTIO
- *  \brief Board specific information header for the Bitwizard Big-Multio.
- *
- *  Board specific information header for the Bitwizard Big-Multio (http://www.bitwizard.nl/wiki/index.php/Usbbigmultio).
- *
- *  @{
- */
-
-#ifndef __BOARD_BIGMULTIO_H__
-#define __BOARD_BIGMULTIO_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-		#include "../../LEDs.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_BOARD_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/Board.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Indicates the board has hardware LEDs mounted. */
-			#define BOARD_HAS_LEDS
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/BIGMULTIO/LEDs.h b/NativePrograms/LUFA/Drivers/Board/AVR8/BIGMULTIO/LEDs.h
deleted file mode 100644
index 8bd30c2196..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/BIGMULTIO/LEDs.h
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific LED driver header for the Bitwizard Big-Multio.
- *  \copydetails Group_LEDs_BIGMULTIO
- *
- *  \note This file should not be included directly. It is automatically included as needed by the LEDs driver
- *        dispatch header located in LUFA/Drivers/Board/LEDs.h.
- */
-
-/** \ingroup Group_LEDs
- *  \defgroup Group_LEDs_BIGMULTIO BIGMULTIO
- *  \brief Board specific LED driver header for the Bitwizard Big-Multio.
- *
- *  Board specific LED driver header for the Bitwizard Big-Multio (http://www.bitwizard.nl/wiki/index.php/Usbbigmultio).
- *
- *  <table>
- *    <tr><th>Name</th><th>Color</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr>
- *    <tr><td>LEDS_LED1</td><td>Unknown</td><td>LED0</td><td>High</td><td>PORTF.6</td></tr>
- *    <tr><td>LEDS_LED2</td><td>Unknown</td><td>LED1</td><td>High</td><td>PORTF.7</td></tr>
- *    <tr><td>LEDS_LED3</td><td>Unknown</td><td>LED2</td><td>High</td><td>PORTE.2</td></tr>
- *  </table>
- *
- *  @{
- */
-
-#ifndef __LEDS_BIGMULTIO_H__
-#define __LEDS_BIGMULTIO_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_LEDS_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/LEDS.h instead.
-		#endif
-
-	/* Private Interface - For use in library only: */
-	#if !defined(__DOXYGEN__)
-		/* Macros: */
-			#define LEDS_PORTF_LEDS       (LEDS_LED1 | LEDS_LED2)
-			#define LEDS_PORTE_LEDS       LEDS_LED3
-	#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** LED mask for the first LED on the board. */
-			#define LEDS_LED1        (1 << 6)
-
-			/** LED mask for the second LED on the board. */
-			#define LEDS_LED2        (1 << 7)
-
-			/** LED mask for the second LED on the board. */
-			#define LEDS_LED3        (1 << 2)
-
-			/** LED mask for all the LEDs on the board. */
-			#define LEDS_ALL_LEDS    (LEDS_LED1 | LEDS_LED2 | LEDS_LED3)
-
-			/** LED mask for none of the board LEDs. */
-			#define LEDS_NO_LEDS     0
-
-		/* Inline Functions: */
-		#if !defined(__DOXYGEN__)
-			static inline void LEDs_Init(void)
-			{
-				DDRF  |=  LEDS_PORTF_LEDS;
-				DDRE  |=  LEDS_PORTE_LEDS;
-
-				PORTF &= ~LEDS_PORTF_LEDS;
-				PORTE &= ~LEDS_PORTE_LEDS;
-			}
-
-			static inline void LEDs_Disable(void)
-			{
-				DDRF  &= ~LEDS_PORTF_LEDS;
-				DDRE  &= ~LEDS_PORTE_LEDS;
-
-				PORTF &= ~LEDS_PORTF_LEDS;
-				PORTE &= ~LEDS_PORTE_LEDS;
-			}
-
-			static inline void LEDs_TurnOnLEDs(const uint8_t LEDMask)
-			{
-				PORTF |= (LEDMask & LEDS_PORTF_LEDS);
-				PORTE |= (LEDMask & LEDS_PORTE_LEDS);
-			}
-
-			static inline void LEDs_TurnOffLEDs(const uint8_t LEDMask)
-			{
-				PORTF &= ~(LEDMask & LEDS_PORTF_LEDS);
-				PORTE &= ~(LEDMask & LEDS_PORTE_LEDS);
-			}
-
-			static inline void LEDs_SetAllLEDs(const uint8_t LEDMask)
-			{
-				PORTF = (PORTF & ~LEDS_PORTF_LEDS) | (LEDMask & LEDS_PORTF_LEDS);
-				PORTE = (PORTE & ~LEDS_PORTE_LEDS) | (LEDMask & LEDS_PORTE_LEDS);
-			}
-
-			static inline void LEDs_ChangeLEDs(const uint8_t LEDMask,
-			                                   const uint8_t ActiveMask)
-			{
-				PORTF = (PORTF & ~(LEDMask & LEDS_PORTF_LEDS)) | (ActiveMask & LEDS_PORTF_LEDS);
-				PORTE = (PORTE & ~(LEDMask & LEDS_PORTE_LEDS)) | (ActiveMask & LEDS_PORTE_LEDS);
-			}
-
-			static inline void LEDs_ToggleLEDs(const uint8_t LEDMask)
-			{
-				PINF  = (LEDMask & LEDS_PORTF_LEDS);
-				PINE  = (LEDMask & LEDS_PORTE_LEDS);
-			}
-
-			static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT;
-			static inline uint8_t LEDs_GetLEDs(void)
-			{
-				return ((PORTF & LEDS_PORTF_LEDS) | (PORTE & LEDS_PORTE_LEDS));
-			}
-		#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/BLACKCAT/Board.h b/NativePrograms/LUFA/Drivers/Board/AVR8/BLACKCAT/Board.h
deleted file mode 100644
index 4ff738334e..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/BLACKCAT/Board.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific information header for the BLACKCAT USB JTAG.
- *  \copydetails Group_BoardInfo_BLACKCAT
- *
- *  \note This file should not be included directly. It is automatically included as needed by the Board driver
- *        dispatch header located in LUFA/Drivers/Board/Board.h.
- */
-
-/** \ingroup Group_BoardInfo
- *  \defgroup Group_BoardInfo_BLACKCAT BLACKCAT
- *  \brief Board specific information header for the BLACKCAT USB JTAG.
- *
- *  Board specific information header for the TCNISO Blackcat USB JTAG (http://www.embeddedcomputers.net/products/BlackcatUSB).
- *
- *  @{
- */
-
-#ifndef __BOARD_BLACKCAT_H__
-#define __BOARD_BLACKCAT_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-		#include "../../LEDs.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_BOARD_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/Board.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Indicates the board has hardware LEDs mounted. */
-			#define BOARD_HAS_LEDS
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/BLACKCAT/LEDs.h b/NativePrograms/LUFA/Drivers/Board/AVR8/BLACKCAT/LEDs.h
deleted file mode 100644
index 87d35ffd43..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/BLACKCAT/LEDs.h
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific LED driver header for the BLACKCAT USB JTAG.
- *  \copydetails Group_LEDs_BLACKCAT
- *
- *  \note This file should not be included directly. It is automatically included as needed by the LEDs driver
- *        dispatch header located in LUFA/Drivers/Board/LEDs.h.
- */
-
-/** \ingroup Group_LEDs
- *  \defgroup Group_LEDs_BLACKCAT BLACKCAT
- *  \brief Board specific LED driver header for the BLACKCAT USB JTAG.
- *
- *  Board specific LED driver header for the TCNISO Blackcat USB JTAG (http://www.embeddedcomputers.net/products/BlackcatUSB).
- *
- *  <table>
- *    <tr><th>Name</th><th>Color</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr>
- *    <tr><td>LEDS_LED1</td><td>Unknown</td><td>LED0</td><td>High</td><td>PORTD.6</td></tr>
- *    <tr><td>LEDS_LED2</td><td>Unknown</td><td>LED1</td><td>High</td><td>PORTD.3</td></tr>
- *  </table>
- *
- *  @{
- */
-
-#ifndef __LEDS_BLACKCAT_H__
-#define __LEDS_BLACKCAT_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_LEDS_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/LEDS.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** LED mask for the first LED on the board. */
-			#define LEDS_LED1        (1 << 6)
-
-			/** LED mask for the second LED on the board. */
-			#define LEDS_LED2        (1 << 3)
-
-			/** LED mask for all the LEDs on the board. */
-			#define LEDS_ALL_LEDS    (LEDS_LED1 | LEDS_LED2)
-
-			/** LED mask for none of the board LEDs. */
-			#define LEDS_NO_LEDS     0
-
-		/* Inline Functions: */
-		#if !defined(__DOXYGEN__)
-			static inline void LEDs_Init(void)
-			{
-				DDRD  |=  LEDS_ALL_LEDS;
-				PORTD &= ~LEDS_ALL_LEDS;
-			}
-
-			static inline void LEDs_Disable(void)
-			{
-				DDRD  &= ~LEDS_ALL_LEDS;
-				PORTD &= ~LEDS_ALL_LEDS;
-			}
-
-			static inline void LEDs_TurnOnLEDs(const uint8_t LEDMask)
-			{
-				PORTD |= LEDMask;
-			}
-
-			static inline void LEDs_TurnOffLEDs(const uint8_t LEDMask)
-			{
-				PORTD &= ~LEDMask;
-			}
-
-			static inline void LEDs_SetAllLEDs(const uint8_t LEDMask)
-			{
-				PORTD = ((PORTD & ~LEDS_ALL_LEDS) | LEDMask);
-			}
-
-			static inline void LEDs_ChangeLEDs(const uint8_t LEDMask,
-			                                   const uint8_t ActiveMask)
-			{
-				PORTD = ((PORTD & ~LEDMask) | ActiveMask);
-			}
-
-			static inline void LEDs_ToggleLEDs(const uint8_t LEDMask)
-			{
-				PIND  = LEDMask;
-			}
-
-			static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT;
-			static inline uint8_t LEDs_GetLEDs(void)
-			{
-				return (PORTD & LEDS_ALL_LEDS);
-			}
-		#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/BUI/Board.h b/NativePrograms/LUFA/Drivers/Board/AVR8/BUI/Board.h
deleted file mode 100644
index 2f57e1f759..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/BUI/Board.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific information header for the Busware BUI.
- *  \copydetails Group_BoardInfo_BUI
- *
- *  \note This file should not be included directly. It is automatically included as needed by the Board driver
- *        dispatch header located in LUFA/Drivers/Board/Board.h.
- */
-
-/** \ingroup Group_BoardInfo
- *  \defgroup Group_BoardInfo_BUI BUI
- *  \brief Board specific information header for the Busware BUI.
- *
- *  Board specific information header for the Busware BUI (http://www.busware.de/tiki-index.php?page=BUI).
- *
- *  @{
- */
-
-#ifndef __BOARD_BUI_H__
-#define __BOARD_BUI_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-		#include "../../LEDs.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_BOARD_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/Board.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Indicates the board has hardware LEDs mounted. */
-			#define BOARD_HAS_LEDS
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/BUI/LEDs.h b/NativePrograms/LUFA/Drivers/Board/AVR8/BUI/LEDs.h
deleted file mode 100644
index 59cabcd48b..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/BUI/LEDs.h
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific LED driver header for the Busware BUI.
- *  \copydetails Group_LEDs_BUI
- *
- *  \note This file should not be included directly. It is automatically included as needed by the LEDs driver
- *        dispatch header located in LUFA/Drivers/Board/LEDs.h.
- */
-
-/** \ingroup Group_LEDs
- *  \defgroup Group_LEDs_BUI BUI
- *  \brief Board specific LED driver header for the Busware BUI.
- *
- *  Board specific LED driver header for the Busware BUI (http://www.busware.de/tiki-index.php?page=BUI).
- *
- *  <table>
- *    <tr><th>Name</th><th>Color</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr>
- *    <tr><td>LEDS_LED1</td><td>Red</td><td>RGB LED</td><td>High</td><td>PORTC.2</td></tr>
- *    <tr><td>LEDS_LED2</td><td>Green</td><td>RGB LED</td><td>High</td><td>PORTC.3</td></tr>
- *    <tr><td>LEDS_LED3</td><td>Blue</td><td>RGB LED</td><td>High</td><td>PORTC.4</td></tr>
- *  </table>
- *
- *  @{
- */
-
-#ifndef __LEDS_BUI_H__
-#define __LEDS_BUI_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-
-/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_LEDS_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/LEDS.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** LED mask for the first LED on the board. */
-			#define LEDS_LED1        (1 << 2)
-
-			/** LED mask for the second LED on the board. */
-			#define LEDS_LED2        (1 << 3)
-
-			/** LED mask for the third LED on the board. */
-			#define LEDS_LED3        (1 << 4)
-
-			/** LED mask for all the LEDs on the board. */
-			#define LEDS_ALL_LEDS    (LEDS_LED1 | LEDS_LED2 | LEDS_LED3)
-
-			/** LED mask for none of the board LEDs. */
-			#define LEDS_NO_LEDS     0
-
-		/* Inline Functions: */
-		#if !defined(__DOXYGEN__)
-			static inline void LEDs_Init(void)
-			{
-				DDRC  |=  LEDS_ALL_LEDS;
-				PORTC &= ~LEDS_ALL_LEDS;
-			}
-
-			static inline void LEDs_Disable(void)
-			{
-				DDRC  &= ~LEDS_ALL_LEDS;
-				PORTC &= ~LEDS_ALL_LEDS;
-			}
-
-			static inline void LEDs_TurnOnLEDs(const uint8_t LEDMask)
-			{
-				PORTC |= LEDMask;
-			}
-
-			static inline void LEDs_TurnOffLEDs(const uint8_t LEDMask)
-			{
-				PORTC &= ~LEDMask;
-			}
-
-			static inline void LEDs_SetAllLEDs(const uint8_t LEDMask)
-			{
-				PORTC = (PORTC & ~LEDS_ALL_LEDS) | LEDMask;
-			}
-
-			static inline void LEDs_ChangeLEDs(const uint8_t LEDMask,
-			                                   const uint8_t ActiveMask)
-			{
-				PORTC = (PORTC & ~LEDMask) | ActiveMask;
-			}
-
-			static inline void LEDs_ToggleLEDs(const uint8_t LEDMask)
-			{
-				PINC  = LEDMask;
-			}
-
-			static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT;
-			static inline uint8_t LEDs_GetLEDs(void)
-			{
-				return (PORTC & LEDS_ALL_LEDS);
-			}
-		#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/BUMBLEB/Board.h b/NativePrograms/LUFA/Drivers/Board/AVR8/BUMBLEB/Board.h
deleted file mode 100644
index 974632b8b2..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/BUMBLEB/Board.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific information header for the Fletchtronics BUMBLEB.
- *  \copydetails Group_BoardInfo_BUMBLEB
- *
- *  \note This file should not be included directly. It is automatically included as needed by the Board driver
- *        dispatch header located in LUFA/Drivers/Board/Board.h.
- */
-
-/** \ingroup Group_BoardInfo
- *  \defgroup Group_BoardInfo_BUMBLEB BUMBLEB
- *  \brief Board specific information header for the Fletchtronics BUMBLEB.
- *
- *  Board specific information header for the Fletchtronics BUMBLEB (http://fletchtronics.net/bumble-b).
- *
- *  @{
- */
-
-#ifndef __BOARD_BUMBLEB_H__
-#define __BOARD_BUMBLEB_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-		#include "../../Buttons.h"
-		#include "../../Joystick.h"
-		#include "../../LEDs.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_BOARD_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/Board.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Indicates the board has hardware Buttons mounted. */
-			#define BOARD_HAS_BUTTONS
-
-			/** Indicates the board has a hardware Joystick mounted. */
-			#define BOARD_HAS_JOYSTICK
-
-			/** Indicates the board has hardware LEDs mounted. */
-			#define BOARD_HAS_LEDS
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/BUMBLEB/Buttons.h b/NativePrograms/LUFA/Drivers/Board/AVR8/BUMBLEB/Buttons.h
deleted file mode 100644
index eca2e2e4bb..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/BUMBLEB/Buttons.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific Buttons driver header for the Fletchtronics BUMBLEB.
- *  \copydetails Group_Buttons_BUMBLEB
- *
- *  \note This file should not be included directly. It is automatically included as needed by the Buttons driver
- *        dispatch header located in LUFA/Drivers/Board/Buttons.h.
- */
-
-/** \ingroup Group_Buttons
- *  \defgroup Group_Buttons_BUMBLEB BUMBLEB
- *  \brief Board specific Buttons driver header for the Fletchtronics BUMBLEB.
- *
- *  Board specific buttons driver header for the Fletchtronics BUMBLEB (http://fletchtronics.net/bumble-b). The BUMBLEB
- *  third-party board does not include any on-board peripherals, but does have an officially recommended external peripheral
- *  layout for buttons, LEDs and a Joystick.
- *
- *  <table>
- *    <tr><th>Name</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr>
- *    <tr><td>BUTTONS_BUTTON1</td><td>HWB Button</td><td>Low</td><td>PORTD.7</td></tr>
- *  </table>
- *
- *  @{
- */
-
-#ifndef __BUTTONS_BUMBLEB_H__
-#define __BUTTONS_BUMBLEB_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_BUTTONS_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/Buttons.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Button mask for the first button on the board. */
-			#define BUTTONS_BUTTON1      (1 << 7)
-
-		/* Inline Functions: */
-		#if !defined(__DOXYGEN__)
-			static inline void Buttons_Init(void)
-			{
-				DDRD  &= ~BUTTONS_BUTTON1;
-				PORTD |=  BUTTONS_BUTTON1;
-			}
-
-			static inline void Buttons_Disable(void)
-			{
-				DDRD  &= ~BUTTONS_BUTTON1;
-				PORTD &= ~BUTTONS_BUTTON1;
-			}
-
-			static inline uint8_t Buttons_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
-			static inline uint8_t Buttons_GetStatus(void)
-			{
-				return ((PIND & BUTTONS_BUTTON1) ^ BUTTONS_BUTTON1);
-			}
-		#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/BUMBLEB/Joystick.h b/NativePrograms/LUFA/Drivers/Board/AVR8/BUMBLEB/Joystick.h
deleted file mode 100644
index eaa67712f9..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/BUMBLEB/Joystick.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific joystick driver header for the Fletchtronics BUMBLEB.
- *  \copydetails Group_Joystick_BUMBLEB
- *
- *  \note This file should not be included directly. It is automatically included as needed by the joystick driver
- *        dispatch header located in LUFA/Drivers/Board/Joystick.h.
- */
-
-/** \ingroup Group_Joystick
- *  \defgroup Group_Joystick_BUMBLEB BUMBLEB
- *  \brief Board specific joystick driver header for the Fletchtronics BUMBLEB.
- *
- *  Board specific joystick driver header for the Fletchtronics BUMBLEB (http://fletchtronics.net/bumble-b). The BUMBLEB
- *  third-party board does not include any on-board peripherals, but does have an officially recommended external peripheral
- *  layout for buttons, LEDs and a Joystick.
- *
- *  <table>
- *    <tr><th>Left Port Pin</th><th>Up Port Pin</th><th>Right Port Pin</th><th>Down Port Pin</th><th>Press Port Pin</th></tr>
- *    <tr><td>PORTD.2</td><td>PORTD.3</td><td>PORTD.0</td><td>PORTD.1</td><td>PORTD.4</td></tr>
- *  </table>
- *
- *  @{
- */
-
-#ifndef __JOYSTICK_BUMBLEB_H__
-#define __JOYSTICK_BUMBLEB_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_JOYSTICK_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/Joystick.h instead.
-		#endif
-
-	/* Private Interface - For use in library only: */
-	#if !defined(__DOXYGEN__)
-		/* Macros: */
-			#define JOY_MASK                 ((1 << 0) | (1 << 1) | (1 << 2) | (1 << 3) | (1 << 4))
-	#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Mask for the joystick being pushed in the left direction. */
-			#define JOY_LEFT                  (1 << 2)
-
-			/** Mask for the joystick being pushed in the upward direction. */
-			#define JOY_UP                    (1 << 3)
-
-			/** Mask for the joystick being pushed in the right direction. */
-			#define JOY_RIGHT                 (1 << 0)
-
-			/** Mask for the joystick being pushed in the downward direction. */
-			#define JOY_DOWN                  (1 << 1)
-
-			/** Mask for the joystick being pushed inward. */
-			#define JOY_PRESS                 (1 << 4)
-
-		/* Inline Functions: */
-		#if !defined(__DOXYGEN__)
-			static inline void Joystick_Init(void)
-			{
-				DDRD  &= ~JOY_MASK;
-				PORTD |=  JOY_MASK;
-			}
-
-			static inline void Joystick_Disable(void)
-			{
-				DDRD  &= ~JOY_MASK;
-				PORTD &= ~JOY_MASK;
-			}
-
-			static inline uint8_t Joystick_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
-			static inline uint8_t Joystick_GetStatus(void)
-			{
-				return (uint8_t)(~PIND & JOY_MASK);
-			}
-		#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/BUMBLEB/LEDs.h b/NativePrograms/LUFA/Drivers/Board/AVR8/BUMBLEB/LEDs.h
deleted file mode 100644
index 9b517dd082..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/BUMBLEB/LEDs.h
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific LED driver header for the Fletchtronics BUMBLEB.
- *  \copydetails Group_LEDs_BUMBLEB
- *
- *  \note This file should not be included directly. It is automatically included as needed by the LEDs driver
- *        dispatch header located in LUFA/Drivers/Board/LEDs.h.
- */
-
-/** \ingroup Group_LEDs
- *  \defgroup Group_LEDs_BUMBLEB BUMBLEB
- *  \brief Board specific LED driver header for the Fletchtronics BUMBLEB.
- *
- *  Board specific LED driver header for the Fletchtronics BUMBLEB (http://fletchtronics.net/bumble-b). The BUMBLEB
- *  third-party board does not include any on-board peripherals, but does have an officially recommended external
- *  peripheral layout for buttons, LEDs and a Joystick.
- *
- *  <table>
- *    <tr><th>Name</th><th>Color</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr>
- *    <tr><td>LEDS_LED1</td><td>N/A</td><td>User Supplied</td><td>High</td><td>PORTB.4</td></tr>
- *    <tr><td>LEDS_LED2</td><td>N/A</td><td>User Supplied</td><td>High</td><td>PORTB.5</td></tr>
- *    <tr><td>LEDS_LED3</td><td>N/A</td><td>User Supplied</td><td>High</td><td>PORTB.6</td></tr>
- *    <tr><td>LEDS_LED4</td><td>N/A</td><td>User Supplied</td><td>High</td><td>PORTB.7</td></tr>
- *  </table>
- *
- *  @{
- */
-
-#ifndef __LEDS_BUMBLEB_H__
-#define __LEDS_BUMBLEB_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_LEDS_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/LEDS.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** LED mask for the first LED on the board. */
-			#define LEDS_LED1        (1 << 4)
-
-			/** LED mask for the second LED on the board. */
-			#define LEDS_LED2        (1 << 5)
-
-			/** LED mask for the third LED on the board. */
-			#define LEDS_LED3        (1 << 6)
-
-			/** LED mask for the fourth LED on the board. */
-			#define LEDS_LED4        (1 << 7)
-
-			/** LED mask for all the LEDs on the board. */
-			#define LEDS_ALL_LEDS    (LEDS_LED1 | LEDS_LED2 | LEDS_LED3 | LEDS_LED4)
-
-			/** LED mask for none of the board LEDs. */
-			#define LEDS_NO_LEDS     0
-
-		/* Inline Functions: */
-		#if !defined(__DOXYGEN__)
-			static inline void LEDs_Init(void)
-			{
-				DDRB  |=  LEDS_ALL_LEDS;
-				PORTB &= ~LEDS_ALL_LEDS;
-			}
-
-			static inline void LEDs_Disable(void)
-			{
-				DDRB  &= ~LEDS_ALL_LEDS;
-				PORTB &= ~LEDS_ALL_LEDS;
-			}
-
-			static inline void LEDs_TurnOnLEDs(const uint8_t LedMask)
-			{
-				PORTB |= LedMask;
-			}
-
-			static inline void LEDs_TurnOffLEDs(const uint8_t LedMask)
-			{
-				PORTB &= ~LedMask;
-			}
-
-			static inline void LEDs_SetAllLEDs(const uint8_t LedMask)
-			{
-				PORTB = ((PORTB & ~LEDS_ALL_LEDS) | LedMask);
-			}
-
-			static inline void LEDs_ChangeLEDs(const uint8_t LedMask,
-			                                   const uint8_t ActiveMask)
-			{
-				PORTB = ((PORTB & ~LedMask) | ActiveMask);
-			}
-
-			static inline void LEDs_ToggleLEDs(const uint8_t LEDMask)
-			{
-				PINB  = LEDMask;
-			}
-
-			static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT;
-			static inline uint8_t LEDs_GetLEDs(void)
-			{
-				return (PORTB & LEDS_ALL_LEDS);
-			}
-		#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/CULV3/Board.h b/NativePrograms/LUFA/Drivers/Board/AVR8/CULV3/Board.h
deleted file mode 100644
index 80d84d1b44..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/CULV3/Board.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific information header for the Busware CUL V3.
- *  \copydetails Group_BoardInfo_CULV3
- *
- *  \note This file should not be included directly. It is automatically included as needed by the Board driver
- *        dispatch header located in LUFA/Drivers/Board/Board.h.
- */
-
-/** \ingroup Group_BoardInfo
- *  \defgroup Group_BoardInfo_CULV3 CULV3
- *  \brief Board specific information header for the Busware CUL V3.
- *
- *  Board specific information header for the Busware CUL V3 (http://busware.de/tiki-index.php?page=CUL).
- *
- *  @{
- */
-
-#ifndef __BOARD_CULV3_H__
-#define __BOARD_CULV3_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-		#include "../../Buttons.h"
-		#include "../../LEDs.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_BOARD_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/Board.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Indicates the board has hardware Buttons mounted. */
-			#define BOARD_HAS_BUTTONS
-
-			/** Indicates the board has hardware LEDs mounted. */
-			#define BOARD_HAS_LEDS
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/CULV3/Buttons.h b/NativePrograms/LUFA/Drivers/Board/AVR8/CULV3/Buttons.h
deleted file mode 100644
index ebed5b6097..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/CULV3/Buttons.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific LED driver header for the Busware CULV3.
- *  \copydetails Group_LEDs_CULV3
- *
- *  \note This file should not be included directly. It is automatically included as needed by the Buttons driver
- *        dispatch header located in LUFA/Drivers/Board/LEDs.h.
- */
-
-/** \ingroup Group_Buttons
- *  \defgroup Group_Buttons_CULV3 CULV3
- *  \brief Board specific Buttons driver header for the Busware CULV3.
- *
- *  Board specific Buttons driver header for the Busware CUL V3 (http://busware.de/tiki-index.php?page=CUL).
- *
- *  <table>
- *    <tr><th>Name</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr>
- *    <tr><td>BUTTONS_BUTTON1</td><td>HWB Button</td><td>Low</td><td>PORTE.2</td></tr>
- *  </table>
- *
- *  @{
- */
-
-#ifndef __BUTTONS_CULV3_H__
-#define __BUTTONS_CULV3_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_BUTTONS_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/Buttons.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Button mask for the first button on the board. */
-			#define BUTTONS_BUTTON1      (1 << 2)
-
-		/* Inline Functions: */
-		#if !defined(__DOXYGEN__)
-			static inline void Buttons_Init(void)
-			{
-				DDRE  &= ~BUTTONS_BUTTON1;
-				PORTE |=  BUTTONS_BUTTON1;
-			}
-
-			static inline void Buttons_Disable(void)
-			{
-				DDRE  &= ~BUTTONS_BUTTON1;
-				PORTE &= ~BUTTONS_BUTTON1;
-			}
-
-			static inline uint8_t Buttons_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
-			static inline uint8_t Buttons_GetStatus(void)
-			{
-				return ((PINE & BUTTONS_BUTTON1) ^ BUTTONS_BUTTON1);
-			}
-		#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/CULV3/LEDs.h b/NativePrograms/LUFA/Drivers/Board/AVR8/CULV3/LEDs.h
deleted file mode 100644
index f8c7d31ba7..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/CULV3/LEDs.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific LED driver header for the Busware CUL V3.
- *  \copydetails Group_LEDs_CULV3
- *
- *  \note This file should not be included directly. It is automatically included as needed by the LEDs driver
- *        dispatch header located in LUFA/Drivers/Board/LEDs.h.
- */
-
-/** \ingroup Group_LEDs
- *  \defgroup Group_LEDs_CULV3 CULV3
- *  \brief Board specific LED driver header for the Busware CUL V3.
- *
- *  Board specific LED driver header for the Busware CUL V3 (http://busware.de/tiki-index.php?page=CUL).
- *
- *  <table>
- *    <tr><th>Name</th><th>Color</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr>
- *    <tr><td>LEDS_LED1</td><td>Yellow</td><td>General Indicator</td><td>High</td><td>PORTE.6</td></tr>
- *  </table>
- *
- *  @{
- */
-
-#ifndef __LEDS_CULV3_H__
-#define __LEDS_CULV3_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_LEDS_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/LEDS.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** LED mask for the first LED on the board. */
-			#define LEDS_LED1        (1 << 6)
-
-			/** LED mask for all the LEDs on the board. */
-			#define LEDS_ALL_LEDS    LEDS_LED1
-
-			/** LED mask for the none of the board LEDs. */
-			#define LEDS_NO_LEDS     0
-
-		/* Inline Functions: */
-		#if !defined(__DOXYGEN__)
-			static inline void LEDs_Init(void)
-			{
-				DDRE  |=  LEDS_ALL_LEDS;
-				PORTE &= ~LEDS_ALL_LEDS;
-         	}
-
-			static inline void LEDs_Disable(void)
-			{
-				DDRE  &= ~LEDS_ALL_LEDS;
-				PORTE &= ~LEDS_ALL_LEDS;
-         	}
-
-			static inline void LEDs_TurnOnLEDs(const uint8_t LEDMask)
-			{
-				PORTE |= LEDMask;
-			}
-
-			static inline void LEDs_TurnOffLEDs(const uint8_t LEDMask)
-			{
-				PORTE &= ~LEDMask;
-			}
-
-			static inline void LEDs_SetAllLEDs(const uint8_t LEDMask)
-			{
-				PORTE = ((PORTE & ~LEDS_ALL_LEDS) | LEDMask);
-			}
-
-			static inline void LEDs_ChangeLEDs(const uint8_t LEDMask,
-			                                   const uint8_t ActiveMask)
-			{
-				PORTE = ((PORTE & ~LEDMask) | ActiveMask);
-			}
-
-			static inline void LEDs_ToggleLEDs(const uint8_t LEDMask)
-			{
-				PINE  = LEDMask;
-			}
-
-			static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT;
-			static inline uint8_t LEDs_GetLEDs(void)
-			{
-				return (PORTE & LEDS_ALL_LEDS);
-			}
-		#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/DUCE/Board.h b/NativePrograms/LUFA/Drivers/Board/AVR8/DUCE/Board.h
deleted file mode 100644
index b3ffb1d164..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/DUCE/Board.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific information header for the DorkbotPDX Duce.
- *  \copydetails Group_BoardInfo_DUCE
- *
- *  \note This file should not be included directly. It is automatically included as needed by the Board driver
- *        dispatch header located in LUFA/Drivers/Board/Board.h.
- */
-
-/** \ingroup Group_BoardInfo
- *  \defgroup Group_BoardInfo_DUCE DUCE
- *  \brief Board specific information header for the DorkbotPDX Duce.
- *
- *  Board specific information header for the DorkbotPDX Duce (http://dorkbotpdx.org/wiki/duce).
- *
- *  @{
- */
-
-#ifndef __BOARD_DUCE_H__
-#define __BOARD_DUCE_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-		#include "../../LEDs.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_BOARD_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/Board.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Indicates the board has hardware LEDs mounted. */
-			#define BOARD_HAS_LEDS
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/DUCE/LEDs.h b/NativePrograms/LUFA/Drivers/Board/AVR8/DUCE/LEDs.h
deleted file mode 100644
index 8165c82ed5..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/DUCE/LEDs.h
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific LED driver header for the DorkbotPDX Duce.
- *  \copydetails Group_LEDs_DUCE
- *
- *  \note This file should not be included directly. It is automatically included as needed by the LEDs driver
- *        dispatch header located in LUFA/Drivers/Board/LEDs.h.
- */
-
-/** \ingroup Group_LEDs
- *  \defgroup Group_LEDs_DUCE DUCE
- *  \brief Board specific LED driver header for the DorkbotPDX Duce.
- *
- *  Board specific LED driver header for the DorkbotPDX Duce (http://dorkbotpdx.org/wiki/duce).
- *
- *  <table>
- *    <tr><th>Name</th><th>Color</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr>
- *    <tr><td>LEDS_LED1</td><td>Red</td><td>Bicolor Indicator 1</td><td>High</td><td>PORTC.4</td></tr>
- *    <tr><td>LEDS_LED2</td><td>Green</td><td>Bicolor Indicator 1</td><td>High</td><td>PORTC.5</td></tr>
- *    <tr><td>LEDS_LED3</td><td>Red</td><td>Bicolor Indicator 2</td><td>High</td><td>PORTC.6</td></tr>
- *    <tr><td>LEDS_LED4</td><td>Green</td><td>Bicolor Indicator 2</td><td>High</td><td>PORTC.7</td></tr>
- *  </table>
- *
- *  @{
- */
-
-#ifndef __LEDS_DUCE_H__
-#define __LEDS_DUCE_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_LEDS_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/LEDS.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** LED mask for the first LED on the board. */
-			#define LEDS_LED1        (1 << 4)
-
-			/** LED mask for the second LED on the board. */
-			#define LEDS_LED2        (1 << 5)
-
-			/** LED mask for the third LED on the board. */
-			#define LEDS_LED3        (1 << 6)
-
-			/** LED mask for the fourth LED on the board. */
-			#define LEDS_LED4        (1 << 7)
-
-			/** LED mask for all the LEDs on the board. */
-			#define LEDS_ALL_LEDS    (LEDS_LED1 | LEDS_LED2 | LEDS_LED3 | LEDS_LED4)
-
-			/** LED mask for none of the board LEDs. */
-			#define LEDS_NO_LEDS     0
-
-		/* Inline Functions: */
-		#if !defined(__DOXYGEN__)
-			static inline void LEDs_Init(void)
-			{
-				DDRC  |=  LEDS_ALL_LEDS;
-				PORTC &= ~LEDS_ALL_LEDS;
-			}
-
-			static inline void LEDs_Disable(void)
-			{
-				DDRC  &= ~LEDS_ALL_LEDS;
-				PORTC &= ~LEDS_ALL_LEDS;
-			}
-
-			static inline void LEDs_TurnOnLEDs(const uint8_t LEDMask)
-			{
-				PORTC |= LEDMask;
-			}
-
-			static inline void LEDs_TurnOffLEDs(const uint8_t LEDMask)
-			{
-				PORTC &= ~LEDMask;
-			}
-
-			static inline void LEDs_SetAllLEDs(const uint8_t LEDMask)
-			{
-				PORTC = ((PORTC & ~LEDS_ALL_LEDS) | LEDMask);
-			}
-
-			static inline void LEDs_ChangeLEDs(const uint8_t LEDMask,
-			                                   const uint8_t ActiveMask)
-			{
-				PORTC = ((PORTC & ~LEDMask) | ActiveMask);
-			}
-
-			static inline void LEDs_ToggleLEDs(const uint8_t LEDMask)
-			{
-				PINC  = LEDMask;
-			}
-
-			static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT;
-			static inline uint8_t LEDs_GetLEDs(void)
-			{
-				return (PORTC & LEDS_ALL_LEDS);
-			}
-		#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/EVK527/Board.h b/NativePrograms/LUFA/Drivers/Board/AVR8/EVK527/Board.h
deleted file mode 100644
index a2908d9a10..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/EVK527/Board.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific information header for the Atmel EVK527.
- *  \copydetails Group_BoardInfo_EVK527
- *
- *  \note This file should not be included directly. It is automatically included as needed by the Board driver
- *        dispatch header located in LUFA/Drivers/Board/Board.h.
- */
-
-/** \ingroup Group_BoardInfo
- *  \defgroup Group_BoardInfo_EVK527 EVK527
- *  \brief Board specific information header for the Atmel EVK527.
- *
- *  Board specific information header for the Atmel EVK527.
- *
- *  @{
- */
-
-#ifndef __BOARD_EVK527_H__
-#define __BOARD_EVK527_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-		#include "../../Buttons.h"
-		#include "../../Dataflash.h"
-		#include "../../Joystick.h"
-		#include "../../LEDs.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_BOARD_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/Board.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Indicates the board has hardware Buttons mounted. */
-			#define BOARD_HAS_BUTTONS
-
-			/** Indicates the board has a hardware Dataflash mounted. */
-			#define BOARD_HAS_DATAFLASH
-
-			/** Indicates the board has a hardware Joystick mounted. */
-			#define BOARD_HAS_JOYSTICK
-
-			/** Indicates the board has hardware LEDs mounted. */
-			#define BOARD_HAS_LEDS
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/EVK527/Buttons.h b/NativePrograms/LUFA/Drivers/Board/AVR8/EVK527/Buttons.h
deleted file mode 100644
index b5927d9924..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/EVK527/Buttons.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific Buttons driver header for the Atmel EVK527.
- *  \copydetails Group_Buttons_EVK527
- *
- *  \note This file should not be included directly. It is automatically included as needed by the Buttons driver
- *        dispatch header located in LUFA/Drivers/Board/Buttons.h.
- */
-
-/** \ingroup Group_Buttons
- *  \defgroup Group_Buttons_EVK527 EVK527
- *  \brief Board specific Buttons driver header for the Atmel EVK527.
- *
- *  Board specific Buttons driver header for the Atmel EVK527.
- *
- *  <table>
- *    <tr><th>Name</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr>
- *    <tr><td>BUTTONS_BUTTON1</td><td>HWB Button</td><td>Low</td><td>PORTE.2</td></tr>
- *  </table>
- *
- *  @{
- */
-
-#ifndef __BUTTONS_EVK527_H__
-#define __BUTTONS_EVK527_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_BUTTONS_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/Buttons.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Button mask for the first button on the board. */
-			#define BUTTONS_BUTTON1      (1 << 2)
-
-		/* Inline Functions: */
-		#if !defined(__DOXYGEN__)
-			static inline void Buttons_Init(void)
-			{
-				DDRE  &= ~BUTTONS_BUTTON1;
-				PORTE |=  BUTTONS_BUTTON1;
-			}
-
-			static inline void Buttons_Disable(void)
-			{
-				DDRE  &= ~BUTTONS_BUTTON1;
-				PORTE &= ~BUTTONS_BUTTON1;
-			}
-
-			static inline uint8_t Buttons_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
-			static inline uint8_t Buttons_GetStatus(void)
-			{
-				return ((PINE & BUTTONS_BUTTON1) ^ BUTTONS_BUTTON1);
-			}
-		#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/EVK527/Dataflash.h b/NativePrograms/LUFA/Drivers/Board/AVR8/EVK527/Dataflash.h
deleted file mode 100644
index 970f12607d..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/EVK527/Dataflash.h
+++ /dev/null
@@ -1,222 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific Dataflash driver header for the Atmel EVK527.
- *  \copydetails Group_Dataflash_EVK527
- *
- *  \note This file should not be included directly. It is automatically included as needed by the dataflash driver
- *        dispatch header located in LUFA/Drivers/Board/Dataflash.h.
- */
-
-/** \ingroup Group_Dataflash
- *  \defgroup Group_Dataflash_EVK527 EVK527
- *  \brief Board specific Dataflash driver header for the Atmel EVK527.
- *
- *  Board specific Dataflash driver header for the Atmel EVK527.
- *
- *  <table>
- *    <tr><th>Name</th><th>Info</th><th>Select Pin</th><th>SPI Port</th></tr>
- *    <tr><td>DATAFLASH_CHIP1</td><td>AT45DB321C (4MB)</td><td>PORTE.6</td><td>SPI0</td></tr>
- *  </table>
- *
- *  @{
- */
-
-#ifndef __DATAFLASH_EVK527_H__
-#define __DATAFLASH_EVK527_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-		#include "../../../Misc/AT45DB321C.h"
-		#include "../../../Peripheral/SPI.h"
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_DATAFLASH_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/Dataflash.h instead.
-		#endif
-
-	/* Private Interface - For use in library only: */
-	#if !defined(__DOXYGEN__)
-		/* Macros: */
-			#define DATAFLASH_CHIPCS_MASK                DATAFLASH_CHIP1
-			#define DATAFLASH_CHIPCS_DDR                 DDRE
-			#define DATAFLASH_CHIPCS_PORT                PORTE
-	#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Constant indicating the total number of dataflash ICs mounted on the selected board. */
-			#define DATAFLASH_TOTALCHIPS                 1
-
-			/** Mask for no dataflash chip selected. */
-			#define DATAFLASH_NO_CHIP                    0
-
-			/** Mask for the first dataflash chip selected. */
-			#define DATAFLASH_CHIP1                      (1 << 6)
-
-			/** Internal main memory page size for the board's dataflash IC. */
-			#define DATAFLASH_PAGE_SIZE                  512
-
-			/** Total number of pages inside the board's dataflash IC. */
-			#define DATAFLASH_PAGES                      8192
-
-		/* Inline Functions: */
-			/** Initializes the dataflash driver so that commands and data may be sent to an attached dataflash IC.
-			 *  The appropriate SPI interface will be automatically configured.
-			 */
-			static inline void Dataflash_Init(void)
-			{
-				DATAFLASH_CHIPCS_DDR  |= DATAFLASH_CHIPCS_MASK;
-				DATAFLASH_CHIPCS_PORT |= DATAFLASH_CHIPCS_MASK;
-
-				SPI_Init(SPI_SPEED_FCPU_DIV_2 | SPI_ORDER_MSB_FIRST | SPI_SCK_LEAD_FALLING | SPI_SAMPLE_TRAILING | SPI_MODE_MASTER);
-			}
-
-			/** Sends a byte to the currently selected dataflash IC, and returns a byte from the dataflash.
-			 *
-			 *  \param[in] Byte  Byte of data to send to the dataflash
-			 *
-			 *  \return Last response byte from the dataflash
-			 */
-			static inline uint8_t Dataflash_TransferByte(const uint8_t Byte) ATTR_ALWAYS_INLINE;
-			static inline uint8_t Dataflash_TransferByte(const uint8_t Byte)
-			{
-				return SPI_TransferByte(Byte);
-			}
-
-			/** Sends a byte to the currently selected dataflash IC, and ignores the next byte from the dataflash.
-			 *
-			 *  \param[in] Byte  Byte of data to send to the dataflash
-			 */
-			static inline void Dataflash_SendByte(const uint8_t Byte) ATTR_ALWAYS_INLINE;
-			static inline void Dataflash_SendByte(const uint8_t Byte)
-			{
-				SPI_SendByte(Byte);
-			}
-
-			/** Sends a dummy byte to the currently selected dataflash IC, and returns the next byte from the dataflash.
-			 *
-			 *  \return Last response byte from the dataflash
-			 */
-			static inline uint8_t Dataflash_ReceiveByte(void) ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT;
-			static inline uint8_t Dataflash_ReceiveByte(void)
-			{
-				return SPI_ReceiveByte();
-			}
-
-			/** Determines the currently selected dataflash chip.
-			 *
-			 *  \return Mask of the currently selected Dataflash chip, either \ref DATAFLASH_NO_CHIP if no chip is selected
-			 *          or a DATAFLASH_CHIPn mask (where n is the chip number).
-			 */
-			static inline uint8_t Dataflash_GetSelectedChip(void) ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT;
-			static inline uint8_t Dataflash_GetSelectedChip(void)
-			{
-				return (~DATAFLASH_CHIPCS_PORT & DATAFLASH_CHIPCS_MASK);
-			}
-
-			/** Selects the given dataflash chip.
-			 *
-			 *  \param[in]  ChipMask  Mask of the Dataflash IC to select, in the form of a \c DATAFLASH_CHIPn mask (where n is
-			 *              the chip number).
-			 */
-			static inline void Dataflash_SelectChip(const uint8_t ChipMask) ATTR_ALWAYS_INLINE;
-			static inline void Dataflash_SelectChip(const uint8_t ChipMask)
-			{
-				DATAFLASH_CHIPCS_PORT = ((DATAFLASH_CHIPCS_PORT | DATAFLASH_CHIPCS_MASK) & ~ChipMask);
-			}
-
-			/** Deselects the current dataflash chip, so that no dataflash is selected. */
-			static inline void Dataflash_DeselectChip(void) ATTR_ALWAYS_INLINE;
-			static inline void Dataflash_DeselectChip(void)
-			{
-				Dataflash_SelectChip(DATAFLASH_NO_CHIP);
-			}
-
-			/** Selects a dataflash IC from the given page number, which should range from 0 to
-			 *  ((DATAFLASH_PAGES * DATAFLASH_TOTALCHIPS) - 1). For boards containing only one
-			 *  dataflash IC, this will select DATAFLASH_CHIP1. If the given page number is outside
-			 *  the total number of pages contained in the boards dataflash ICs, all dataflash ICs
-			 *  are deselected.
-			 *
-			 *  \param[in] PageAddress  Address of the page to manipulate, ranging from
-			 *                          0 to ((DATAFLASH_PAGES * DATAFLASH_TOTALCHIPS) - 1).
-			 */
-			static inline void Dataflash_SelectChipFromPage(const uint16_t PageAddress)
-			{
-				Dataflash_DeselectChip();
-
-				if (PageAddress >= DATAFLASH_PAGES)
-				  return;
-
-				Dataflash_SelectChip(DATAFLASH_CHIP1);
-			}
-
-			/** Toggles the select line of the currently selected dataflash IC, so that it is ready to receive
-			 *  a new command.
-			 */
-			static inline void Dataflash_ToggleSelectedChipCS(void)
-			{
-				uint8_t SelectedChipMask = Dataflash_GetSelectedChip();
-
-				Dataflash_DeselectChip();
-				Dataflash_SelectChip(SelectedChipMask);
-			}
-
-			/** Spin-loops while the currently selected dataflash is busy executing a command, such as a main
-			 *  memory page program or main memory to buffer transfer.
-			 */
-			static inline void Dataflash_WaitWhileBusy(void)
-			{
-				Dataflash_ToggleSelectedChipCS();
-				Dataflash_SendByte(DF_CMD_GETSTATUS);
-				while (!(Dataflash_ReceiveByte() & DF_STATUS_READY));
-				Dataflash_ToggleSelectedChipCS();
-			}
-
-			/** Sends a set of page and buffer address bytes to the currently selected dataflash IC, for use with
-			 *  dataflash commands which require a complete 24-bit address.
-			 *
-			 *  \param[in] PageAddress  Page address within the selected dataflash IC
-			 *  \param[in] BufferByte   Address within the dataflash's buffer
-			 */
-			static inline void Dataflash_SendAddressBytes(uint16_t PageAddress,
-			                                              const uint16_t BufferByte)
-			{
-				Dataflash_SendByte(PageAddress >> 5);
-				Dataflash_SendByte((PageAddress << 3) | (BufferByte >> 8));
-				Dataflash_SendByte(BufferByte);
-			}
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/EVK527/Joystick.h b/NativePrograms/LUFA/Drivers/Board/AVR8/EVK527/Joystick.h
deleted file mode 100644
index 6eec5a648c..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/EVK527/Joystick.h
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific joystick driver header for the Atmel EVK527.
- *  \copydetails Group_Joystick_EVK527
- *
- *  \note This file should not be included directly. It is automatically included as needed by the joystick driver
- *        dispatch header located in LUFA/Drivers/Board/Joystick.h.
- */
-
-/** \ingroup Group_Joystick
- *  \defgroup Group_Joystick_EVK527 EVK527
- *  \brief Board specific joystick driver header for the Atmel EVK527.
- *
- *  Board specific joystick driver header for the Atmel EVK527.
- *
- *  <table>
- *    <tr><th>Left Port Pin</th><th>Up Port Pin</th><th>Right Port Pin</th><th>Down Port Pin</th><th>Press Port Pin</th></tr>
- *    <tr><td>PORTF.4</td><td>PORTF.5</td><td>PORTF.7</td><td>PORTC.6</td><td>PORTF.6</td></tr>
- *  </table>
- *
- *  @{
- */
-
-#ifndef __JOYSTICK_EVK527_H__
-#define __JOYSTICK_EVK527_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_JOYSTICK_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/Joystick.h instead.
-		#endif
-
-	/* Private Interface - For use in library only: */
-	#if !defined(__DOXYGEN__)
-		/* Macros: */
-			#define JOY_FMASK                 ((1 << 4) | (1 << 5) | (1 << 6) | (1 << 7))
-			#define JOY_CMASK                 (1 << 6)
-
-			#define JOY_PORTC_MASK_SHIFT      3
-	#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Mask for the joystick being pushed in the left direction. */
-			#define JOY_LEFT                  (1 << 4)
-
-			/** Mask for the joystick being pushed in the right direction. */
-			#define JOY_RIGHT                 (1 << 7)
-
-			/** Mask for the joystick being pushed in the upward direction. */
-			#define JOY_UP                    (1 << 5)
-
-			/** Mask for the joystick being pushed in the downward direction. */
-			#define JOY_DOWN                 ((1 << 6) >> JOY_PORTC_MASK_SHIFT)
-
-			/** Mask for the joystick being pushed inward. */
-			#define JOY_PRESS                 (1 << 6)
-
-		/* Inline Functions: */
-		#if !defined(__DOXYGEN__)
-			static inline void Joystick_Init(void)
-			{
-				DDRF  &= ~JOY_FMASK;
-				DDRC  &= ~JOY_CMASK;
-
-				PORTF |=  JOY_FMASK;
-				PORTC |=  JOY_CMASK;
-			}
-
-			static inline void Joystick_Disable(void)
-			{
-				DDRF  &= ~JOY_FMASK;
-				DDRC  &= ~JOY_CMASK;
-
-				PORTF &= ~JOY_FMASK;
-				PORTC &= ~JOY_CMASK;
-			}
-
-			static inline uint8_t Joystick_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
-			static inline uint8_t Joystick_GetStatus(void)
-			{
-				return (((uint8_t)~PINF & JOY_FMASK) | (((uint8_t)~PINC & JOY_CMASK) >> JOY_PORTC_MASK_SHIFT));
-			}
-		#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/EVK527/LEDs.h b/NativePrograms/LUFA/Drivers/Board/AVR8/EVK527/LEDs.h
deleted file mode 100644
index 7ed3253773..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/EVK527/LEDs.h
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific LED driver header for the Atmel EVK527.
- *  \copydetails Group_LEDs_EVK527
- *
- *  \note This file should not be included directly. It is automatically included as needed by the LEDs driver
- *        dispatch header located in LUFA/Drivers/Board/LEDs.h.
- */
-
-/** \ingroup Group_LEDs
- *  \defgroup Group_LEDs_EVK527 EVK527
- *  \brief Board specific LED driver header for the Atmel EVK527.
- *
- *  Board specific LED driver header for the Atmel EVK527.
- *
- *  <table>
- *    <tr><th>Name</th><th>Color</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr>
- *    <tr><td>LEDS_LED1</td><td>Green</td><td>General Indicator</td><td>High</td><td>PORTD.5</td></tr>
- *    <tr><td>LEDS_LED2</td><td>Green</td><td>General Indicator</td><td>High</td><td>PORTD.6</td></tr>
- *    <tr><td>LEDS_LED3</td><td>Green</td><td>General Indicator</td><td>High</td><td>PORTD.7</td></tr>
- *  </table>
- *
- *  @{
- */
-
-#ifndef __LEDS_EVK527_H__
-#define __LEDS_EVK527_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_LEDS_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/LEDS.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** LED mask for the first LED on the board. */
-			#define LEDS_LED1        (1 << 5)
-
-			/** LED mask for the second LED on the board. */
-			#define LEDS_LED2        (1 << 6)
-
-			/** LED mask for the third LED on the board. */
-			#define LEDS_LED3        (1 << 7)
-
-			/** LED mask for all the LEDs on the board. */
-			#define LEDS_ALL_LEDS    (LEDS_LED1 | LEDS_LED2 | LEDS_LED3)
-
-			/** LED mask for none of the board LEDs. */
-			#define LEDS_NO_LEDS     0
-
-		/* Inline Functions: */
-		#if !defined(__DOXYGEN__)
-			static inline void LEDs_Init(void)
-			{
-				DDRD  |=  LEDS_ALL_LEDS;
-				PORTD &= ~LEDS_ALL_LEDS;
-			}
-
-			static inline void LEDs_Disable(void)
-			{
-				DDRD  &= ~LEDS_ALL_LEDS;
-				PORTD &= ~LEDS_ALL_LEDS;
-			}
-
-			static inline void LEDs_TurnOnLEDs(const uint8_t LEDMask)
-			{
-				PORTD |= LEDMask;
-			}
-
-			static inline void LEDs_TurnOffLEDs(const uint8_t LEDMask)
-			{
-				PORTD &= ~LEDMask;
-			}
-
-			static inline void LEDs_SetAllLEDs(const uint8_t LEDMask)
-			{
-				PORTD = ((PORTD & ~LEDS_ALL_LEDS) | LEDMask);
-			}
-
-			static inline void LEDs_ChangeLEDs(const uint8_t LEDMask,
-			                                   const uint8_t ActiveMask)
-			{
-				PORTD = ((PORTD & ~LEDMask) | ActiveMask);
-			}
-
-			static inline void LEDs_ToggleLEDs(const uint8_t LEDMask)
-			{
-				PIND  = LEDMask;
-			}
-
-			static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT;
-			static inline uint8_t LEDs_GetLEDs(void)
-			{
-				return (PORTD & LEDS_ALL_LEDS);
-			}
-		#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/JMDBU2/Board.h b/NativePrograms/LUFA/Drivers/Board/AVR8/JMDBU2/Board.h
deleted file mode 100644
index ff01f5a578..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/JMDBU2/Board.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific information header for the Mattairtech JM-DB-U2.
- *  \copydetails Group_BoardInfo_JMDBU2
- *
- *  \note This file should not be included directly. It is automatically included as needed by the Board driver
- *        dispatch header located in LUFA/Drivers/Board/Board.h.
- */
-
-/** \ingroup Group_BoardInfo
- *  \defgroup Group_BoardInfo_JMDBU2 JMDBU2
- *  \brief Board specific information header for the Mattairtech JM-DB-U2.
- *
- *  Board specific information header for the Mattairtech JM-DB-U2 (http://u2.mattair.net/index.html).
- *
- *  @{
- */
-
-#ifndef __BOARD_JMDBU2_H__
-#define __BOARD_JMDBU2_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-		#include "../../Buttons.h"
-		#include "../../LEDs.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_BOARD_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/Board.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Indicates the board has hardware Buttons mounted. */
-			#define BOARD_HAS_BUTTONS
-
-			/** Indicates the board has hardware LEDs mounted. */
-			#define BOARD_HAS_LEDS
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/JMDBU2/Buttons.h b/NativePrograms/LUFA/Drivers/Board/AVR8/JMDBU2/Buttons.h
deleted file mode 100644
index 34ff773956..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/JMDBU2/Buttons.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific Buttons driver header for the Mattairtech JM-DB-U2.
- *  \copydetails Group_Buttons_JMDBU2
- *
- *  \note This file should not be included directly. It is automatically included as needed by the Buttons driver
- *        dispatch header located in LUFA/Drivers/Board/Buttons.h.
- */
-
-/** \ingroup Group_Buttons
- *  \defgroup Group_Buttons_JMDBU2 JMDBU2
- *  \brief Board specific Buttons driver header for the Mattairtech JM-DB-U2.
- *
- *  Board specific Buttons driver header for the Mattairtech JM-DB-U2 (http://u2.mattair.net/index.html).
- *
- *  <table>
- *    <tr><th>Name</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr>
- *    <tr><td>BUTTONS_BUTTON1</td><td>HWB Button</td><td>Low</td><td>PORTD.7</td></tr>
- *  </table>
- *
- *  @{
- */
-
-#ifndef __BUTTONS_JMDBU2_H__
-#define __BUTTONS_JMDBU2_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_BUTTONS_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/Buttons.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Button mask for the first button on the board. */
-			#define BUTTONS_BUTTON1      (1 << 7)
-
-		/* Inline Functions: */
-		#if !defined(__DOXYGEN__)
-			static inline void Buttons_Init(void)
-			{
-				DDRD  &= ~BUTTONS_BUTTON1;
-				PORTD |=  BUTTONS_BUTTON1;
-			}
-
-			static inline void Buttons_Disable(void)
-			{
-				DDRD  &= ~BUTTONS_BUTTON1;
-				PORTD &= ~BUTTONS_BUTTON1;
-			}
-
-			static inline uint8_t Buttons_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
-			static inline uint8_t Buttons_GetStatus(void)
-			{
-				return ((PIND & BUTTONS_BUTTON1) ^ BUTTONS_BUTTON1);
-			}
-		#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/JMDBU2/LEDs.h b/NativePrograms/LUFA/Drivers/Board/AVR8/JMDBU2/LEDs.h
deleted file mode 100644
index b694d3c210..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/JMDBU2/LEDs.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific LED driver header for the Mattairtech JM-DB-U2.
- *  \copydetails Group_LEDs_JMDBU2
- *
- *  \note This file should not be included directly. It is automatically included as needed by the LEDs driver
- *        dispatch header located in LUFA/Drivers/Board/LEDs.h.
- */
-
-/** \ingroup Group_LEDs
- *  \defgroup Group_LEDs_JMDBU2 JMDBU2
- *  \brief Board specific LED driver header for the Mattairtech JM-DB-U2.
- *
- *  Board specific LED driver header for the Mattairtech JM-DB-U2 (http://u2.mattair.net/index.html).
- *
- *  <table>
- *    <tr><th>Name</th><th>Color</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr>
- *    <tr><td>LEDS_LED1</td><td>Green</td><td>General Indicator</td><td>High</td><td>PORTD.4</td></tr>
- *  </table>
- *
- *  @{
- */
-
-#ifndef __LEDS_JMDBU2_H__
-#define __LEDS_JMDBU2_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_LEDS_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/LEDS.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** LED mask for the first LED on the board. */
-			#define LEDS_LED1        (1 << 4)
-
-			/** LED mask for all the LEDs on the board. */
-			#define LEDS_ALL_LEDS    LEDS_LED1
-
-			/** LED mask for none of the board LEDs. */
-			#define LEDS_NO_LEDS     0
-
-		/* Inline Functions: */
-		#if !defined(__DOXYGEN__)
-			static inline void LEDs_Init(void)
-			{
-				DDRD  |=  LEDS_ALL_LEDS;
-				PORTD &= ~LEDS_ALL_LEDS;
-			}
-
-			static inline void LEDs_Disable(void)
-			{
-				DDRD  &= ~LEDS_ALL_LEDS;
-				PORTD &= ~LEDS_ALL_LEDS;
-			}
-
-			static inline void LEDs_TurnOnLEDs(const uint8_t LEDMask)
-			{
-				PORTD |= LEDMask;
-			}
-
-			static inline void LEDs_TurnOffLEDs(const uint8_t LEDMask)
-			{
-				PORTD &= ~LEDMask;
-			}
-
-			static inline void LEDs_SetAllLEDs(const uint8_t LEDMask)
-			{
-				PORTD = ((PORTD & ~LEDS_ALL_LEDS) | LEDMask);
-			}
-
-			static inline void LEDs_ChangeLEDs(const uint8_t LEDMask,
-			                                   const uint8_t ActiveMask)
-			{
-				PORTD = ((PORTD & ~LEDMask) | ActiveMask);
-			}
-
-			static inline void LEDs_ToggleLEDs(const uint8_t LEDMask)
-			{
-				PIND  = LEDMask;
-			}
-
-			static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT;
-			static inline uint8_t LEDs_GetLEDs(void)
-			{
-				return (PORTD & LEDS_ALL_LEDS);
-			}
-		#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/LEONARDO/Board.h b/NativePrograms/LUFA/Drivers/Board/AVR8/LEONARDO/Board.h
deleted file mode 100644
index 539b0620c0..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/LEONARDO/Board.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific information header for the Arduino Leonardo board.
- *  \copydetails Group_BoardInfo_LEONARDO
- *
- *  \note This file should not be included directly. It is automatically included as needed by the Board driver
- *        dispatch header located in LUFA/Drivers/Board/Board.h.
- */
-
-/** \ingroup Group_BoardInfo
- *  \defgroup Group_BoardInfo_LEONARDO LEONARDO
- *  \brief Board specific information header for the Arduino Leonardo board.
- *
- *  Board specific information header for the Arduino Leonardo board (http://arduino.cc/en/Main/arduinoBoardLeonardo).
- *
- *  @{
- */
-
-#ifndef __BOARD_LEONARDO_H__
-#define __BOARD_LEONARDO_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-		#include "../../LEDs.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_BOARD_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/Board.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Indicates the board has hardware LEDs mounted. */
-			#define BOARD_HAS_LEDS
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/LEONARDO/LEDs.h b/NativePrograms/LUFA/Drivers/Board/AVR8/LEONARDO/LEDs.h
deleted file mode 100644
index d0301af18e..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/LEONARDO/LEDs.h
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific LED driver header for the Arduino Leonardo board.
- *  \copydetails Group_LEDs_LEONARDO
- *
- *  \note This file should not be included directly. It is automatically included as needed by the LEDs driver
- *        dispatch header located in LUFA/Drivers/Board/LEDs.h.
- */
-
-/** \ingroup Group_LEDs
- *  \defgroup Group_LEDs_LEONARDO LEONARDO
- *  \brief Board specific LED driver header for the Arduino Leonardo board.
- *
- *  Board specific LED driver header for the Arduino Leonardo board (http://arduino.cc/en/Main/arduinoBoardLeonardo).
- *
- *  <table>
- *    <tr><th>Name</th><th>Color</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr>
- *    <tr><td>LEDS_LED1</td><td>Yellow</td><td>RX</td><td>Low</td><td>PORTB.0</td></tr>
- *    <tr><td>LEDS_LED2</td><td>Yellow</td><td>TX</td><td>Low</td><td>PORTD.5</td></tr>
- *    <tr><td>LEDS_LED3</td><td>Yellow</td><td>General Indicator</td><td>High</td><td>PORTC.7</td></tr>
- *  </table>
- *
- *  @{
- */
-
-#ifndef __LEDS_LEONARDO_H__
-#define __LEDS_LEONARDO_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_LEDS_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/LEDS.h instead.
-		#endif
-
-	/* Private Interface - For use in library only: */
-	#if !defined(__DOXYGEN__)
-		/* Macros: */
-			#define LEDS_PORTB_LEDS       (LEDS_LED1)
-			#define LEDS_PORTD_LEDS       (LEDS_LED2)
-			#define LEDS_PORTC_LEDS       (LEDS_LED3)
-	#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** LED mask for the first LED on the board. */
-			#define LEDS_LED1        (1 << 0)
-
-			/** LED mask for the second LED on the board. */
-			#define LEDS_LED2        (1 << 5)
-
-			/** LED mask for the third LED on the board. */
-			#define LEDS_LED3        (1 << 7)
-
-			/** LED mask for all the LEDs on the board. */
-			#define LEDS_ALL_LEDS    (LEDS_LED1 | LEDS_LED2 | LEDS_LED3)
-
-			/** LED mask for none of the board LEDs. */
-			#define LEDS_NO_LEDS     0
-
-		/* Inline Functions: */
-		#if !defined(__DOXYGEN__)
-			static inline void LEDs_Init(void)
-			{
-				DDRB  |=  LEDS_PORTB_LEDS;
-				PORTB |=  LEDS_PORTB_LEDS;
-				DDRD  |=  LEDS_PORTD_LEDS;
-				PORTD |=  LEDS_PORTD_LEDS;
-				DDRC  |=  LEDS_PORTC_LEDS;
-				PORTC &= ~LEDS_PORTC_LEDS;
-			}
-
-			static inline void LEDs_Disable(void)
-			{
-				DDRB  &= ~LEDS_PORTB_LEDS;
-				PORTB &= ~LEDS_PORTB_LEDS;
-				DDRD  &= ~LEDS_PORTD_LEDS;
-				PORTD &= ~LEDS_PORTD_LEDS;
-				DDRC  &= ~LEDS_PORTC_LEDS;
-				PORTC &= ~LEDS_PORTC_LEDS;
-			}
-
-			static inline void LEDs_TurnOnLEDs(const uint8_t LEDMask)
-			{
-				PORTB &= ~(LEDMask & LEDS_PORTB_LEDS);
-				PORTD &= ~(LEDMask & LEDS_PORTD_LEDS);
-				PORTC |=  (LEDMask & LEDS_PORTC_LEDS);
-			}
-
-			static inline void LEDs_TurnOffLEDs(const uint8_t LEDMask)
-			{
-				PORTB |=  (LEDMask & LEDS_PORTB_LEDS);
-				PORTD |=  (LEDMask & LEDS_PORTD_LEDS);
-				PORTC &= ~(LEDMask & LEDS_PORTC_LEDS);
-			}
-
-			static inline void LEDs_SetAllLEDs(const uint8_t LEDMask)
-			{
-				PORTB = ((PORTB |  LEDS_PORTB_LEDS) & ~(LEDMask & LEDS_PORTB_LEDS));
-				PORTD = ((PORTD |  LEDS_PORTD_LEDS) & ~(LEDMask & LEDS_PORTD_LEDS));
-				PORTC = ((PORTC & ~LEDS_PORTC_LEDS) |  (LEDMask & LEDS_PORTC_LEDS));
-			}
-
-			static inline void LEDs_ChangeLEDs(const uint8_t LEDMask,
-			                                   const uint8_t ActiveMask)
-			{
-				PORTB = ((PORTB |  (LEDMask & LEDS_PORTB_LEDS)) & ~(ActiveMask & LEDS_PORTB_LEDS));
-				PORTD = ((PORTD |  (LEDMask & LEDS_PORTD_LEDS)) & ~(ActiveMask & LEDS_PORTD_LEDS));
-				PORTC = ((PORTC & ~(LEDMask & LEDS_PORTC_LEDS)) |  (ActiveMask & LEDS_PORTC_LEDS));
-			}
-
-			static inline void LEDs_ToggleLEDs(const uint8_t LEDMask)
-			{
-				PINB  = (LEDMask & LEDS_PORTB_LEDS);
-				PIND  = (LEDMask & LEDS_PORTD_LEDS);
-				PINC  = (LEDMask & LEDS_PORTC_LEDS);
-			}
-
-			static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT;
-			static inline uint8_t LEDs_GetLEDs(void)
-			{
-				return ((~PORTB & LEDS_PORTB_LEDS) | (~PORTD & LEDS_PORTD_LEDS) | (PORTC & LEDS_PORTC_LEDS));
-			}
-		#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/MAXIMUS/Board.h b/NativePrograms/LUFA/Drivers/Board/AVR8/MAXIMUS/Board.h
deleted file mode 100644
index 6fca70d23e..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/MAXIMUS/Board.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific information header for the Maximus board.
- *  \copydetails Group_BoardInfo_MAXIMUS
- *
- *  \note This file should not be included directly. It is automatically included as needed by the Board driver
- *        dispatch header located in LUFA/Drivers/Board/Board.h.
- */
-
-/** \ingroup Group_BoardInfo
- *  \defgroup Group_BoardInfo_MAXIMUS MAXIMUS
- *  \brief Board specific information header for the Maximus board.
- *
- *  Board specific information header for the Maximus (http://www.avrusb.com/).
- *
- *  @{
- */
-
-#ifndef __BOARD_MAXIMUS_H__
-#define __BOARD_MAXIMUS_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-		#include "../../LEDs.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_BOARD_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/Board.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Indicates the board has hardware LEDs mounted. */
-			#define BOARD_HAS_LEDS
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/MAXIMUS/LEDs.h b/NativePrograms/LUFA/Drivers/Board/AVR8/MAXIMUS/LEDs.h
deleted file mode 100644
index b3f751c507..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/MAXIMUS/LEDs.h
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific LED driver header for the Maximus.
- *  \copydetails Group_LEDs_MAXIMUS
- *
- *  \note This file should not be included directly. It is automatically included as needed by the LEDs driver
- *        dispatch header located in LUFA/Drivers/Board/LEDs.h.
- */
-
-/** \ingroup Group_LEDs
- *  \defgroup Group_LEDs_MAXIMUS MAXIMUS
- *  \brief Board specific LED driver header for the Maximus.
- *
- *  Board specific LED driver header for the Maximus (http://www.avrusb.com/).
- *
- *  <table>
- *    <tr><th>Name</th><th>Color</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr>
- *    <tr><td>LEDS_LED1</td><td>Green</td><td>LG</td><td>High</td><td>PORTB.6</td></tr>
- *    <tr><td>LEDS_LED2</td><td>Red</td><td>LR</td><td>High</td><td>PORTB.7</td></tr>
- *  </table>
- *
- *  @{
- */
-
-#ifndef __LEDS_MAXIMUS_H__
-#define __LEDS_MAXIMUS_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_LEDS_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/LEDS.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** LED mask for the first LED on the board. */
-			#define LEDS_LED1        (1 << 6)
-
-			/** LED mask for the second LED on the board. */
-			#define LEDS_LED2        (1 << 7)
-
-			/** LED mask for all the LEDs on the board. */
-			#define LEDS_ALL_LEDS    (LEDS_LED1 | LEDS_LED2)
-
-			/** LED mask for the none of the board LEDs. */
-			#define LEDS_NO_LEDS     0
-
-		/* Inline Functions: */
-		#if !defined(__DOXYGEN__)
-			static inline void LEDs_Init(void)
-			{
-				DDRB  |=  LEDS_ALL_LEDS;
-				PORTB &= ~LEDS_ALL_LEDS;
-			}
-
-			static inline void LEDs_Disable(void)
-			{
-				DDRB  &= ~LEDS_ALL_LEDS;
-				PORTB &= ~LEDS_ALL_LEDS;
-			}
-
-			static inline void LEDs_TurnOnLEDs(const uint8_t LEDMask)
-			{
-				PORTB |= LEDMask;
-			}
-
-			static inline void LEDs_TurnOffLEDs(const uint8_t LEDMask)
-			{
-				PORTB &= ~LEDMask;
-			}
-
-			static inline void LEDs_SetAllLEDs(const uint8_t LEDMask)
-			{
-				PORTB = ((PORTB & ~LEDS_ALL_LEDS) | LEDMask);
-			}
-
-			static inline void LEDs_ChangeLEDs(const uint8_t LEDMask,
-			                                   const uint8_t ActiveMask)
-			{
-				PORTB = ((PORTB & ~LEDMask) | ActiveMask);
-			}
-
-			static inline void LEDs_ToggleLEDs(const uint8_t LEDMask)
-			{
-				PINB  = LEDMask;
-			}
-
-			static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT;
-			static inline uint8_t LEDs_GetLEDs(void)
-			{
-				return (PORTB & LEDS_ALL_LEDS);
-			}
-		#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/MICRO/Board.h b/NativePrograms/LUFA/Drivers/Board/AVR8/MICRO/Board.h
deleted file mode 100644
index adbc5df79c..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/MICRO/Board.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific information header for the Arduino Micro board.
- *  \copydetails Group_BoardInfo_MICRO
- *
- *  \note This file should not be included directly. It is automatically included as needed by the Board driver
- *        dispatch header located in LUFA/Drivers/Board/Board.h.
- */
-
-/** \ingroup Group_BoardInfo
- *  \defgroup Group_BoardInfo_MICRO MICRO
- *  \brief Board specific information header for the Arduino Micro board.
- *
- *  Board specific information header for the Arduino Micro board (http://arduino.cc/en/Main/arduinoBoardMicro).
- *
- *  @{
- */
-
-#ifndef __BOARD_MICRO_H__
-#define __BOARD_MICRO_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-		#include "../../LEDs.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_BOARD_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/Board.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Indicates the board has hardware LEDs mounted. */
-			#define BOARD_HAS_LEDS
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/MICRO/LEDs.h b/NativePrograms/LUFA/Drivers/Board/AVR8/MICRO/LEDs.h
deleted file mode 100644
index 6cee1f8524..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/MICRO/LEDs.h
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific LED driver header for the Arduino Micro board.
- *  \copydetails Group_LEDs_MICRO
- *
- *  \note This file should not be included directly. It is automatically included as needed by the LEDs driver
- *        dispatch header located in LUFA/Drivers/Board/LEDs.h.
- */
-
-/** \ingroup Group_LEDs
- *  \defgroup Group_LEDs_MICRO MICRO
- *  \brief Board specific LED driver header for the Arduino Micro board.
- *
- *  Board specific LED driver header for the Arduino Micro board (http://arduino.cc/en/Main/arduinoBoardMicro).
- *
- *  <table>
- *    <tr><th>Name</th><th>Color</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr>
- *    <tr><td>LEDS_LED1</td><td>Yellow</td><td>RX</td><td>High</td><td>PORTB.0</td></tr>
- *    <tr><td>LEDS_LED2</td><td>Yellow</td><td>TX</td><td>High</td><td>PORTD.5</td></tr>
- *    <tr><td>LEDS_LED3</td><td>Green</td><td>General Indicator</td><td>High</td><td>PORTC.7</td></tr>
- *  </table>
- *
- *  @{
- */
-
-#ifndef __LEDS_MICRO_H__
-#define __LEDS_MICRO_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_LEDS_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/LEDS.h instead.
-		#endif
-
-	/* Private Interface - For use in library only: */
-	#if !defined(__DOXYGEN__)
-		/* Macros: */
-			#define LEDS_PORTB_LEDS       (LEDS_LED1)
-			#define LEDS_PORTD_LEDS       (LEDS_LED2)
-			#define LEDS_PORTC_LEDS       (LEDS_LED3)
-	#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** LED mask for the first LED on the board. */
-			#define LEDS_LED1        (1 << 0)
-
-			/** LED mask for the second LED on the board. */
-			#define LEDS_LED2        (1 << 5)
-
-			/** LED mask for the third LED on the board. */
-			#define LEDS_LED3        (1 << 7)
-
-			/** LED mask for all the LEDs on the board. */
-			#define LEDS_ALL_LEDS    (LEDS_LED1 | LEDS_LED2 | LEDS_LED3)
-
-			/** LED mask for none of the board LEDs. */
-			#define LEDS_NO_LEDS     0
-
-		/* Inline Functions: */
-		#if !defined(__DOXYGEN__)
-			static inline void LEDs_Init(void)
-			{
-				DDRB  |=  LEDS_PORTB_LEDS;
-				PORTB &= ~LEDS_PORTB_LEDS;
-				DDRD  |=  LEDS_PORTD_LEDS;
-				PORTD &= ~LEDS_PORTD_LEDS;
-				DDRC  |=  LEDS_PORTC_LEDS;
-				PORTC &= ~LEDS_PORTC_LEDS;
-			}
-
-			static inline void LEDs_Disable(void)
-			{
-				DDRB  &= ~LEDS_PORTB_LEDS;
-				PORTB &= ~LEDS_PORTB_LEDS;
-				DDRD  &= ~LEDS_PORTD_LEDS;
-				PORTD &= ~LEDS_PORTD_LEDS;
-				DDRC  &= ~LEDS_PORTC_LEDS;
-				PORTC &= ~LEDS_PORTC_LEDS;
-			}
-
-			static inline void LEDs_TurnOnLEDs(const uint8_t LEDMask)
-			{
-				PORTB |=  (LEDMask & LEDS_PORTB_LEDS);
-				PORTD |=  (LEDMask & LEDS_PORTD_LEDS);
-				PORTC |=  (LEDMask & LEDS_PORTC_LEDS);
-			}
-
-			static inline void LEDs_TurnOffLEDs(const uint8_t LEDMask)
-			{
-				PORTB &= ~(LEDMask & LEDS_PORTB_LEDS);
-				PORTD &= ~(LEDMask & LEDS_PORTD_LEDS);
-				PORTC &= ~(LEDMask & LEDS_PORTC_LEDS);
-			}
-
-			static inline void LEDs_SetAllLEDs(const uint8_t LEDMask)
-			{
-				PORTB = ((PORTB & ~LEDS_PORTB_LEDS) | (LEDMask & LEDS_PORTB_LEDS));
-				PORTD = ((PORTD & ~LEDS_PORTD_LEDS) | (LEDMask & LEDS_PORTD_LEDS));
-				PORTC = ((PORTC & ~LEDS_PORTC_LEDS) | (LEDMask & LEDS_PORTC_LEDS));
-			}
-
-			static inline void LEDs_ChangeLEDs(const uint8_t LEDMask,
-			                                   const uint8_t ActiveMask)
-			{
-				PORTB = ((PORTB & ~(LEDMask & LEDS_PORTB_LEDS)) | (ActiveMask & LEDS_PORTB_LEDS));
-				PORTD = ((PORTD & ~(LEDMask & LEDS_PORTD_LEDS)) | (ActiveMask & LEDS_PORTD_LEDS));
-				PORTC = ((PORTC & ~(LEDMask & LEDS_PORTC_LEDS)) | (ActiveMask & LEDS_PORTC_LEDS));
-			}
-
-			static inline void LEDs_ToggleLEDs(const uint8_t LEDMask)
-			{
-				PORTB ^= (LEDMask & LEDS_PORTB_LEDS);
-				PORTD ^= (LEDMask & LEDS_PORTD_LEDS);
-				PORTC ^= (LEDMask & LEDS_PORTC_LEDS);
-			}
-
-			static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT;
-			static inline uint8_t LEDs_GetLEDs(void)
-			{
-				return ((PORTB & LEDS_PORTB_LEDS) | (PORTD & LEDS_PORTD_LEDS) | (PORTC & LEDS_PORTC_LEDS));
-			}
-		#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/MICROPENDOUS/Board.h b/NativePrograms/LUFA/Drivers/Board/AVR8/MICROPENDOUS/Board.h
deleted file mode 100644
index 728351e1ab..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/MICROPENDOUS/Board.h
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific information header for the Micropendous series boards.
- *  \copydetails Group_BoardInfo_MICROPENDOUS_32U2
- *
- *  \note This file should not be included directly. It is automatically included as needed by the Board driver
- *        dispatch header located in LUFA/Drivers/Board/Board.h.
- */
-
-/** \ingroup Group_BoardInfo
- *  \defgroup Group_BoardInfo_MICROPENDOUS_A MICROPENDOUS_A
- *  \brief Board specific information header for the Micropendous A (https://code.google.com/p/micropendous/wiki/MicropendousA).
- *
- *  See \ref Group_BoardInfo_MICROPENDOUS_32U2 for more details.
- */
-
-/** \ingroup Group_BoardInfo
- *  \defgroup Group_BoardInfo_MICROPENDOUS_1 MICROPENDOUS_1
- *  \brief Board specific information header for the Micropendous 1 (https://code.google.com/p/micropendous/wiki/Micropendous1).
- *
- *  See \ref Group_BoardInfo_MICROPENDOUS_32U2 for more details.
- */
-
-/** \ingroup Group_BoardInfo
- *  \defgroup Group_BoardInfo_MICROPENDOUS_2 MICROPENDOUS_2
- *  \brief Board specific information header for the Micropendous 2 (https://code.google.com/p/micropendous/wiki/Micropendous2).
- *
- *  See \ref Group_BoardInfo_MICROPENDOUS_32U2 for more details.
- */
-
-/** \ingroup Group_BoardInfo
- *  \defgroup Group_BoardInfo_MICROPENDOUS_3 MICROPENDOUS_3
- *  \brief Board specific information header for the Micropendous 3 (https://code.google.com/p/micropendous/wiki/Micropendous3).
- *
- *  See \ref Group_BoardInfo_MICROPENDOUS_32U2 for more details.
- */
-
-/** \ingroup Group_BoardInfo
- *  \defgroup Group_BoardInfo_MICROPENDOUS_4 MICROPENDOUS_4
- *  \brief Board specific information header for the Micropendous 4 (https://code.google.com/p/micropendous/wiki/Micropendous4).
- *
- *  See \ref Group_BoardInfo_MICROPENDOUS_32U2 for more details.
- */
-
-/** \ingroup Group_BoardInfo
- *  \defgroup Group_BoardInfo_MICROPENDOUS_DIP MICROPENDOUS_DIP
- *  \brief Board specific information header for the Micropendous DIP (https://code.google.com/p/micropendous/wiki/MicropendousDIP).
- *
- *  See \ref Group_BoardInfo_MICROPENDOUS_32U2 for more details.
- */
-
-/** \ingroup Group_BoardInfo
- *  \defgroup Group_BoardInfo_MICROPENDOUS_REV1 MICROPENDOUS_REV1
- *  \brief Board specific information header for the Micropendous Arduino-like Revision 1 (https://code.google.com/p/micropendous/wiki/Micropendous).
- *
- *  See \ref Group_BoardInfo_MICROPENDOUS_32U2 for more details.
- */
-
-/** \ingroup Group_BoardInfo
- *  \defgroup Group_BoardInfo_MICROPENDOUS_REV2 MICROPENDOUS_REV2
- *  \brief Board specific information header for the Micropendous Arduino-like Revision 2 (https://code.google.com/p/micropendous/wiki/Micropendous).
- *
- *  See \ref Group_BoardInfo_MICROPENDOUS_32U2 for more details.
- */
-
-/** \ingroup Group_BoardInfo
- *  \defgroup Group_BoardInfo_MICROPENDOUS_32U2 MICROPENDOUS_32U2
- *  \brief Board specific information header for the Micropendous series boards.
- *
- *  Board specific information header for the Micropendous series boards (https://code.google.com/p/micropendous).
- *
- *  @{
- */
-
-#ifndef __BOARD_MICROPENDOUS_H__
-#define __BOARD_MICROPENDOUS_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_BOARD_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/Board.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			#if ((BOARD == BOARD_MICROPENDOUS_32U2) || (BOARD == BOARD_MICROPENDOUS_A) || \
-			     (BOARD == BOARD_MICROPENDOUS_1)    || (BOARD == BOARD_MICROPENDOUS_2) || \
-			     (BOARD == BOARD_MICROPENDOUS_3)    || (BOARD == BOARD_MICROPENDOUS_4) || \
-			     (BOARD == BOARD_MICROPENDOUS_REV1) || (BOARD == BOARD_MICROPENDOUS_REV2) || \
-			     (BOARD == BOARD_MICROPENDOUS_DIP) || defined(__DOXYGEN__))
-				#include "../../Buttons.h"
-
-				/** Indicates the board has hardware Buttons mounted. */
-				#define BOARD_HAS_BUTTONS
-			#endif
-
-			#if ((BOARD == BOARD_MICROPENDOUS_REV1) || (BOARD == BOARD_MICROPENDOUS_REV2) || \
-			     (BOARD == BOARD_MICROPENDOUS_32U2) || defined(__DOXYGEN__))
-				#include "../../LEDs.h"
-
-				/** Indicates the board has hardware LEDs mounted. */
-				#define BOARD_HAS_LEDS
-			#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/MICROPENDOUS/Buttons.h b/NativePrograms/LUFA/Drivers/Board/AVR8/MICROPENDOUS/Buttons.h
deleted file mode 100644
index 42b7416c1d..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/MICROPENDOUS/Buttons.h
+++ /dev/null
@@ -1,205 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific Buttons driver header for the Micropendous series boards.
- *  \copydetails Group_Buttons_MICROPENDOUS_32U2
- *
- *  \note This file should not be included directly. It is automatically included as needed by the Buttons driver
- *        dispatch header located in LUFA/Drivers/Board/Buttons.h.
- */
-
-/** \ingroup Group_Buttons
- *  \defgroup Group_Buttons_MICROPENDOUS_A MICROPENDOUS_A
- *  \brief Board specific Button driver header for the Micropendous A (https://code.google.com/p/micropendous/wiki/MicropendousA).
- *
- *  See \ref Group_Buttons_MICROPENDOUS_32U2 for more details.
- */
-
-/** \ingroup Group_Buttons
- *  \defgroup Group_Buttons_MICROPENDOUS_1 MICROPENDOUS_1
- *  \brief Board specific Button driver header for the Micropendous 1 (https://code.google.com/p/micropendous/wiki/Micropendous1).
- *
- *  See \ref Group_Buttons_MICROPENDOUS_32U2 for more details.
- */
-
-/** \ingroup Group_Buttons
- *  \defgroup Group_Buttons_MICROPENDOUS_2 MICROPENDOUS_2
- *  \brief Board specific Button driver header for the Micropendous 2 (https://code.google.com/p/micropendous/wiki/Micropendous2).
- *
- *  See \ref Group_Buttons_MICROPENDOUS_32U2 for more details.
- */
-
-/** \ingroup Group_Buttons
- *  \defgroup Group_Buttons_MICROPENDOUS_3 MICROPENDOUS_3
- *  \brief Board specific Button driver header for the Micropendous 3 (https://code.google.com/p/micropendous/wiki/Micropendous3).
- *
- *  See \ref Group_Buttons_MICROPENDOUS_32U2 for more details.
- */
-
-/** \ingroup Group_Buttons
- *  \defgroup Group_Buttons_MICROPENDOUS_4 MICROPENDOUS_4
- *  \brief Board specific Button driver header for the Micropendous 4 (https://code.google.com/p/micropendous/wiki/Micropendous4).
- *
- *  See \ref Group_Buttons_MICROPENDOUS_32U2 for more details.
- */
-
-/** \ingroup Group_Buttons
- *  \defgroup Group_Buttons_MICROPENDOUS_DIP MICROPENDOUS_DIP
- *  \brief Board specific Button driver header for the Micropendous DIP (https://code.google.com/p/micropendous/wiki/MicropendousDIP).
- *
- *  See \ref Group_Buttons_MICROPENDOUS_32U2 for more details.
- */
-
-/** \ingroup Group_Buttons
- *  \defgroup Group_Buttons_MICROPENDOUS_REV1 MICROPENDOUS_REV1
- *  \brief Board specific Button driver header for the Micropendous Arduino-like Revision 1 (https://code.google.com/p/micropendous/wiki/Micropendous).
- *
- *  See \ref Group_Buttons_MICROPENDOUS_32U2 for more details.
- */
-
-/** \ingroup Group_Buttons
- *  \defgroup Group_Buttons_MICROPENDOUS_REV2 MICROPENDOUS_REV2
- *  \brief Board specific Button driver header for the Micropendous Arduino-like Revision 2 (https://code.google.com/p/micropendous/wiki/Micropendous).
- *
- *  See \ref Group_Buttons_MICROPENDOUS_32U2 for more details.
- */
-
-/** \ingroup Group_Buttons
- *  \defgroup Group_Buttons_MICROPENDOUS_32U2 MICROPENDOUS_32U2
- *  \brief Board specific Buttons driver header for the Micropendous 32U2.
- *
- *  \note There are multiple supported Micropendous boards, compile with <code>BOARD = MICROPENDOUS_{VERSION}</code>.
- *
- *  Board specific Buttons driver header for the Micropendous 32U2 (https://code.google.com/p/micropendous/wiki/Micropendous_32U2).
- *
- *  <b>BOARD_MICROPENDOUS_1 and BOARD_MICROPENDOUS_32U2</b>:
- *  <table>
- *    <tr><th>Name</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr>
- *    <tr><td>BUTTONS_BUTTON1</td><td>HWB Button</td><td>Low</td><td>PORTD.7</td></tr>
- *  </table>
- *
- *  <b>Other Revisions</b>:
- *  <table>
- *    <tr><th>Name</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr>
- *    <tr><td>BUTTONS_BUTTON1</td><td>HWB Button</td><td>Low</td><td>PORTE.2</td></tr>
- *  </table>
- *
- *  @{
- */
-
-#ifndef __BUTTONS_MICROPENDOUS_H__
-#define __BUTTONS_MICROPENDOUS_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_BUTTONS_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/Buttons.h instead.
-		#endif
-
-	/* Private Interface - For use in library only: */
-	#if !defined(__DOXYGEN__)
-		#if (BOARD == BOARD_MICROPENDOUS_32U2)
-			#define _BOARD_BUTTON1_MASK             (1 << 7)
-			#define _BOARD_BUTTON_PORTLETTER        D
-		#elif (BOARD == BOARD_MICROPENDOUS_A)
-			#define _BOARD_BUTTON1_MASK             (1 << 2)
-			#define _BOARD_BUTTON_PORTLETTER        E
-		#elif (BOARD == BOARD_MICROPENDOUS_1)
-			#define _BOARD_BUTTON1_MASK             (1 << 7)
-			#define _BOARD_BUTTON_PORTLETTER        D
-		#elif (BOARD == BOARD_MICROPENDOUS_2)
-			#define _BOARD_BUTTON1_MASK             (1 << 2)
-			#define _BOARD_BUTTON_PORTLETTER        E
-		#elif (BOARD == BOARD_MICROPENDOUS_3)
-			#define _BOARD_BUTTON1_MASK             (1 << 2)
-			#define _BOARD_BUTTON_PORTLETTER        E
-		#elif (BOARD == BOARD_MICROPENDOUS_4)
-			#define _BOARD_BUTTON1_MASK             (1 << 2)
-			#define _BOARD_BUTTON_PORTLETTER        E
-		#elif (BOARD == BOARD_MICROPENDOUS_DIP)
-			#define _BOARD_BUTTON1_MASK             (1 << 2)
-			#define _BOARD_BUTTON_PORTLETTER        E
-		#elif (BOARD == BOARD_MICROPENDOUS_REV1)
-			#define _BOARD_BUTTON1_MASK             (1 << 2)
-			#define _BOARD_BUTTON_PORTLETTER        E
-		#elif (BOARD == BOARD_MICROPENDOUS_REV2)
-			#define _BOARD_BUTTON1_MASK             (1 << 2)
-			#define _BOARD_BUTTON_PORTLETTER        E
-		#endif
-
-		#define _BOARD_BUTTON_PORT                  CONCAT_EXPANDED(PORT, _BOARD_BUTTON_PORTLETTER)
-		#define _BOARD_BUTTON_PIN                   CONCAT_EXPANDED(PIN,  _BOARD_BUTTON_PORTLETTER)
-		#define _BOARD_BUTTON_DDR                   CONCAT_EXPANDED(DDR,  _BOARD_BUTTON_PORTLETTER)
-	#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Button mask for the first button on the board. */
-			#define BUTTONS_BUTTON1     _BOARD_BUTTON1_MASK
-
-		/* Inline Functions: */
-		#if !defined(__DOXYGEN__)
-			static inline void Buttons_Init(void)
-			{
-				_BOARD_BUTTON_DDR  &= ~BUTTONS_BUTTON1;
-				_BOARD_BUTTON_PORT |=  BUTTONS_BUTTON1;
-			}
-
-			static inline void Buttons_Disable(void)
-			{
-				_BOARD_BUTTON_DDR  &= ~BUTTONS_BUTTON1;
-				_BOARD_BUTTON_PORT &= ~BUTTONS_BUTTON1;
-			}
-
-			static inline uint8_t Buttons_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
-			static inline uint8_t Buttons_GetStatus(void)
-			{
-				return ((_BOARD_BUTTON_PIN & BUTTONS_BUTTON1) ^ BUTTONS_BUTTON1);
-			}
-		#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/MICROPENDOUS/LEDs.h b/NativePrograms/LUFA/Drivers/Board/AVR8/MICROPENDOUS/LEDs.h
deleted file mode 100644
index a92b9eb738..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/MICROPENDOUS/LEDs.h
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific LED driver header for the Micropendous series boards.
- *  \copydetails Group_LEDs_MICROPENDOUS_32U2
- *
- *  \note This file should not be included directly. It is automatically included as needed by the LEDs driver
- *        dispatch header located in LUFA/Drivers/Board/LEDs.h.
- */
-
-/** \ingroup Group_LEDs
- *  \defgroup Group_LEDs_MICROPENDOUS_REV1 MICROPENDOUS_REV1
- *  \brief Board specific LED driver header for the Micropendous Arduino-like Revision 1 (https://code.google.com/p/micropendous/wiki/Micropendous).
- *
- *  See \ref Group_LEDs_MICROPENDOUS_32U2 for more details.
- */
-
-/** \ingroup Group_LEDs
- *  \defgroup Group_LEDs_MICROPENDOUS_REV2 MICROPENDOUS_REV2
- *  \brief Board specific LED driver header for the Micropendous Arduino-like Revision 2 (https://code.google.com/p/micropendous/wiki/Micropendous).
- *
- *  See \ref Group_LEDs_MICROPENDOUS_32U2 for more details.
- */
-
-/** \ingroup Group_LEDs
- *  \defgroup Group_LEDs_MICROPENDOUS_32U2 MICROPENDOUS_32U2
- *  \brief Board specific LED driver header for the Micropendous-32U2.
- *
- *  Board specific LED driver header for the Micropendous 32U2 (https://code.google.com/p/micropendous/wiki/Micropendous_32U2).
- *
- *  <b>BOARD_MICROPENDOUS_32U2</b>:
- *  <table>
- *    <tr><th>Name</th><th>Color</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr>
- *    <tr><td>LEDS_LED1</td><td>Green</td><td>General Indicator</td><td>High</td><td>PORTD.6</td></tr>
- *  </table>
- *
- *  <b>Other Revisions</b>:
- *  <table>
- *    <tr><th>Name</th><th>Color</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr>
- *    <tr><td>LEDS_LED1</td><td>Green</td><td>General Indicator</td><td>High</td><td>PORTB.1</td></tr>
- *  </table>
- *
- *  @{
- */
-
-#ifndef __LEDS_MICROPENDOUS_H__
-#define __LEDS_MICROPENDOUS_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_LEDS_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/LEDS.h instead.
-		#endif
-
-	/* Private Interface - For use in library only: */
-	#if !defined(__DOXYGEN__)
-		#if (BOARD == BOARD_MICROPENDOUS_32U2)
-			#define _BOARD_LED1_MASK                (1 << 6)
-			#define _BOARD_LED_PORTLETTER           D
-		#elif (BOARD == BOARD_MICROPENDOUS_REV1)
-			#define _BOARD_LED1_MASK                (1 << 1)
-			#define _BOARD_LED_PORTLETTER           B
-		#elif (BOARD == BOARD_MICROPENDOUS_REV2)
-			#define _BOARD_LED1_MASK                (1 << 1)
-			#define _BOARD_LED_PORTLETTER           B
-		#endif
-
-		#define _BOARD_LED_PORT                     CONCAT_EXPANDED(PORT, _BOARD_LED_PORTLETTER)
-		#define _BOARD_LED_PIN                      CONCAT_EXPANDED(PIN,  _BOARD_LED_PORTLETTER)
-		#define _BOARD_LED_DDR                      CONCAT_EXPANDED(DDR,  _BOARD_LED_PORTLETTER)
-	#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** LED mask for the first LED on the board. */
-			#define LEDS_LED1        _BOARD_LED1_MASK
-
-			/** LED mask for all the LEDs on the board. */
-			#define LEDS_ALL_LEDS    LEDS_LED1
-
-			/** LED mask for the none of the board LEDs. */
-			#define LEDS_NO_LEDS     0
-
-		/* Inline Functions: */
-		#if !defined(__DOXYGEN__)
-			static inline void LEDs_Init(void)
-			{
-				_BOARD_LED_DDR  |=  LEDS_ALL_LEDS;
-				_BOARD_LED_PORT &= ~LEDS_ALL_LEDS;
-			}
-
-			static inline void LEDs_Disable(void)
-			{
-				_BOARD_LED_DDR  &= ~LEDS_ALL_LEDS;
-				_BOARD_LED_PORT &= ~LEDS_ALL_LEDS;
-			}
-
-			static inline void LEDs_TurnOnLEDs(const uint8_t LEDMask)
-			{
-				_BOARD_LED_PORT |= LEDMask;
-			}
-
-			static inline void LEDs_TurnOffLEDs(const uint8_t LEDMask)
-			{
-				_BOARD_LED_PORT &= ~LEDMask;
-			}
-
-			static inline void LEDs_SetAllLEDs(const uint8_t LEDMask)
-			{
-				_BOARD_LED_PORT = ((_BOARD_LED_PORT & ~LEDS_ALL_LEDS) | LEDMask);
-			}
-
-			static inline void LEDs_ChangeLEDs(const uint8_t LEDMask,
-			                                   const uint8_t ActiveMask)
-			{
-				_BOARD_LED_PORT = ((_BOARD_LED_PORT & ~LEDMask) | ActiveMask);
-			}
-
-			static inline void LEDs_ToggleLEDs(const uint8_t LEDMask)
-			{
-				_BOARD_LED_PIN  = LEDMask;
-			}
-
-			static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT;
-			static inline uint8_t LEDs_GetLEDs(void)
-			{
-				return (_BOARD_LED_PORT & LEDS_ALL_LEDS);
-			}
-		#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/MICROSIN162/Board.h b/NativePrograms/LUFA/Drivers/Board/AVR8/MICROSIN162/Board.h
deleted file mode 100644
index 0a0a5cd852..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/MICROSIN162/Board.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific information header for the Microsin AVR-USB162 board.
- *  \copydetails Group_BoardInfo_MICROSIN162
- *
- *  \note This file should not be included directly. It is automatically included as needed by the Board driver
- *        dispatch header located in LUFA/Drivers/Board/Board.h.
- */
-
-/** \ingroup Group_BoardInfo
- *  \defgroup Group_BoardInfo_MICROSIN162 MICROSIN162
- *  \brief Board specific information header for the Microsin AVR-USB162 board.
- *
- *  Board specific information header for the Microsin AVR-USB162 board (http://microsin.ru/content/view/685/44/).
- *
- *  @{
- */
-
-#ifndef __BOARD_MICROSIN162_H__
-#define __BOARD_MICROSIN162_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-		#include "../../Buttons.h"
-		#include "../../LEDs.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_BOARD_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/Board.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Indicates the board has hardware Buttons mounted. */
-			#define BOARD_HAS_BUTTONS
-
-			/** Indicates the board has hardware LEDs mounted. */
-			#define BOARD_HAS_LEDS
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/MICROSIN162/Buttons.h b/NativePrograms/LUFA/Drivers/Board/AVR8/MICROSIN162/Buttons.h
deleted file mode 100644
index 28f963ece8..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/MICROSIN162/Buttons.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific Buttons driver header for the Microsin AVR-USB162 board.
- *  \copydetails Group_Buttons_MICROSIN162
- *
- *  \note This file should not be included directly. It is automatically included as needed by the Buttons driver
- *        dispatch header located in LUFA/Drivers/Board/Buttons.h.
- */
-
-/** \ingroup Group_Buttons
- *  \defgroup Group_Buttons_MICROSIN162 MICROSIN162
- *  \brief Board specific Buttons driver header for the Microsin AVR-USB162 board.
- *
- *  Board specific Buttons driver header for the Microsin AVR-USB162 board (http://microsin.ru/content/view/685/44/).
- *
- *  <table>
- *    <tr><th>Name</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr>
- *    <tr><td>BUTTONS_BUTTON1</td><td>HWB Button</td><td>Low</td><td>PORTD.7</td></tr>
- *  </table>
- *
- *  @{
- */
-
-#ifndef __BUTTONS_MICROSIN162_H__
-#define __BUTTONS_MICROSIN162_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_BUTTONS_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/Buttons.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Button mask for the first button on the board. */
-			#define BUTTONS_BUTTON1      (1 << 7)
-
-		/* Inline Functions: */
-		#if !defined(__DOXYGEN__)
-			static inline void Buttons_Init(void)
-			{
-				DDRD  &= ~BUTTONS_BUTTON1;
-				PORTD |=  BUTTONS_BUTTON1;
-			}
-
-			static inline void Buttons_Disable(void)
-			{
-				DDRD  &= ~BUTTONS_BUTTON1;
-				PORTD &= ~BUTTONS_BUTTON1;
-			}
-
-			static inline uint8_t Buttons_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
-			static inline uint8_t Buttons_GetStatus(void)
-			{
-				return ((PIND & BUTTONS_BUTTON1) ^ BUTTONS_BUTTON1);
-			}
-		#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/MICROSIN162/LEDs.h b/NativePrograms/LUFA/Drivers/Board/AVR8/MICROSIN162/LEDs.h
deleted file mode 100644
index 1f3908bf8e..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/MICROSIN162/LEDs.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific LED driver header for the Microsin AVR-USB162 board.
- *  \copydetails Group_LEDs_MICROSIN162
- *
- *  \note This file should not be included directly. It is automatically included as needed by the LEDs driver
- *        dispatch header located in LUFA/Drivers/Board/LEDs.h.
- */
-
-/** \ingroup Group_LEDs
- *  \defgroup Group_LEDs_MICROSIN162 MICROSIN162
- *  \brief Board specific LED driver header for the Microsin AVR-USB162 board.
- *
- *  Board specific LED driver header for the Microsin AVR-USB162 board (http://microsin.ru/content/view/685/44/).
- *
- *  <table>
- *    <tr><th>Name</th><th>Color</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr>
- *    <tr><td>LEDS_LED1</td><td>Green</td><td>General Indicator</td><td>Low</td><td>PORTD.4</td></tr>
- *  </table>
- *
- *  @{
- */
-
-#ifndef __LEDS_MICROSIN162_H__
-#define __LEDS_MICROSIN162_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_LEDS_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/LEDS.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** LED mask for the first LED on the board. */
-			#define LEDS_LED1        (1 << 4)
-
-			/** LED mask for all the LEDs on the board. */
-			#define LEDS_ALL_LEDS    LEDS_LED1
-
-			/** LED mask for none of the board LEDs. */
-			#define LEDS_NO_LEDS     0
-
-		/* Inline Functions: */
-		#if !defined(__DOXYGEN__)
-			static inline void LEDs_Init(void)
-			{
-				DDRD  |= LEDS_ALL_LEDS;
-				PORTD |= LEDS_ALL_LEDS;
-			}
-
-			static inline void LEDs_Disable(void)
-			{
-				DDRD  &= ~LEDS_ALL_LEDS;
-				PORTD &= ~LEDS_ALL_LEDS;
-			}
-
-			static inline void LEDs_TurnOnLEDs(const uint8_t LEDMask)
-			{
-				PORTD &= ~LEDMask;
-			}
-
-			static inline void LEDs_TurnOffLEDs(const uint8_t LEDMask)
-			{
-				PORTD |= LEDMask;
-			}
-
-			static inline void LEDs_SetAllLEDs(const uint8_t LEDMask)
-			{
-				PORTD = ((PORTD | LEDS_ALL_LEDS) & ~LEDMask);
-			}
-
-			static inline void LEDs_ChangeLEDs(const uint8_t LEDMask,
-			                                   const uint8_t ActiveMask)
-			{
-				PORTD = ((PORTD | LEDMask) & ~ActiveMask);
-			}
-
-			static inline void LEDs_ToggleLEDs(const uint8_t LEDMask)
-			{
-				PIND  = LEDMask;
-			}
-
-			static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT;
-			static inline uint8_t LEDs_GetLEDs(void)
-			{
-				return (~PORTD & LEDS_ALL_LEDS);
-			}
-		#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/MINIMUS/Board.h b/NativePrograms/LUFA/Drivers/Board/AVR8/MINIMUS/Board.h
deleted file mode 100644
index ff900f9a54..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/MINIMUS/Board.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific information header for the MINIMUS.
- *  \copydetails Group_BoardInfo_MINIMUS
- *
- *  \note This file should not be included directly. It is automatically included as needed by the Board driver
- *        dispatch header located in LUFA/Drivers/Board/Board.h.
- */
-
-/** \ingroup Group_BoardInfo
- *  \defgroup Group_BoardInfo_MINIMUS MINIMUS
- *  \brief Board specific information header for the MINIMUS.
- *
- *  Board specific information header for the MINIMUS.
- *
- *  @{
- */
-
-#ifndef __BOARD_MINIMUS_H__
-#define __BOARD_MINIMUS_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-		#include "../../Buttons.h"
-		#include "../../LEDs.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_BOARD_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/Board.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Indicates the board has hardware Buttons mounted. */
-			#define BOARD_HAS_BUTTONS
-
-			/** Indicates the board has hardware LEDs mounted. */
-			#define BOARD_HAS_LEDS
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/MINIMUS/Buttons.h b/NativePrograms/LUFA/Drivers/Board/AVR8/MINIMUS/Buttons.h
deleted file mode 100644
index 339156f2c4..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/MINIMUS/Buttons.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific Buttons driver header for the MINIMUS.
- *  \copydetails Group_Buttons_MINIMUS
- *
- *  \note This file should not be included directly. It is automatically included as needed by the Buttons driver
- *        dispatch header located in LUFA/Drivers/Board/Buttons.h.
- */
-
-/** \ingroup Group_Buttons
- *  \defgroup Group_Buttons_MINIMUS MINIMUS
- *  \brief Board specific Buttons driver header for the MINIMUS.
- *
- *  Board specific Buttons driver header for the MINIMUS.
- *
- *  <table>
- *    <tr><th>Name</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr>
- *    <tr><td>BUTTONS_BUTTON1</td><td>HWB Button</td><td>Low</td><td>PORTD.7</td></tr>
- *  </table>
- *
- *  @{
- */
-
-#ifndef __BUTTONS_MINIMUS_H__
-#define __BUTTONS_MINIMUS_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_BUTTONS_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/Buttons.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Button mask for the first button on the board. */
-			#define BUTTONS_BUTTON1      (1 << 7)
-
-		/* Inline Functions: */
-		#if !defined(__DOXYGEN__)
-			static inline void Buttons_Init(void)
-			{
-				DDRD  &= ~BUTTONS_BUTTON1;
-				PORTD |=  BUTTONS_BUTTON1;
-			}
-
-			static inline void Buttons_Disable(void)
-			{
-				DDRD  &= ~BUTTONS_BUTTON1;
-				PORTD &= ~BUTTONS_BUTTON1;
-			}
-
-			static inline uint8_t Buttons_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
-			static inline uint8_t Buttons_GetStatus(void)
-			{
-				return ((PIND & BUTTONS_BUTTON1) ^ BUTTONS_BUTTON1);
-			}
-		#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/MINIMUS/LEDs.h b/NativePrograms/LUFA/Drivers/Board/AVR8/MINIMUS/LEDs.h
deleted file mode 100644
index e756aede0e..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/MINIMUS/LEDs.h
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific LED driver header for the MINIMUS.
- *  \copydetails Group_LEDs_MINIMUS
- *
- *  \note This file should not be included directly. It is automatically included as needed by the LEDs driver
- *        dispatch header located in LUFA/Drivers/Board/LEDs.h.
- */
-
-/** \ingroup Group_LEDs
- *  \defgroup Group_LEDs_MINIMUS MINIMUS
- *  \brief Board specific LED driver header for the MINIMUS.
- *
- *  Board specific LED driver header for the Minimus USB (http://www.minimususb.com/).
- *
- *  <table>
- *    <tr><th>Name</th><th>Color</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr>
- *    <tr><td>LEDS_LED1</td><td>Blue</td><td>General Indicator</td><td>Low</td><td>PORTD.5</td></tr>
- *    <tr><td>LEDS_LED2</td><td>Red</td><td>General Indicator</td><td>Low</td><td>PORTD.6</td></tr>
- *  </table>
- *
- *  @{
- */
-
-#ifndef __LEDS_MINIMUS_H__
-#define __LEDS_MINIMUS_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_LEDS_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/LEDS.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** LED mask for the first LED on the board. */
-			#define LEDS_LED1        (1 << 5)
-
-			/** LED mask for the second LED on the board. */
-			#define LEDS_LED2        (1 << 6)
-
-			/** LED mask for all the LEDs on the board. */
-			#define LEDS_ALL_LEDS    (LEDS_LED1 | LEDS_LED2)
-
-			/** LED mask for the none of the board LEDs. */
-			#define LEDS_NO_LEDS     0
-
-		/* Inline Functions: */
-		#if !defined(__DOXYGEN__)
-			static inline void LEDs_Init(void)
-			{
-				DDRD  |= LEDS_ALL_LEDS;
-				PORTD |= LEDS_ALL_LEDS;
-			}
-
-			static inline void LEDs_Disable(void)
-			{
-				DDRD  &= ~LEDS_ALL_LEDS;
-				PORTD &= ~LEDS_ALL_LEDS;
-			}
-
-			static inline void LEDs_TurnOnLEDs(const uint8_t LEDMask)
-			{
-				PORTD &= ~LEDMask;
-			}
-
-			static inline void LEDs_TurnOffLEDs(const uint8_t LEDMask)
-			{
-				PORTD |=  LEDMask;
-			}
-
-			static inline void LEDs_SetAllLEDs(const uint8_t LEDMask)
-			{
-				PORTD = ((PORTD | LEDS_ALL_LEDS) & ~LEDMask);
-			}
-
-			static inline void LEDs_ChangeLEDs(const uint8_t LEDMask,
-			                                   const uint8_t ActiveMask)
-			{
-				PORTD = ((PORTD & ~LEDMask) | ActiveMask);
-			}
-
-			static inline void LEDs_ToggleLEDs(const uint8_t LEDMask)
-			{
-				PIND  = LEDMask;
-			}
-
-			static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT;
-			static inline uint8_t LEDs_GetLEDs(void)
-			{
-				return (~PORTD & LEDS_ALL_LEDS);
-			}
-		#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/MULTIO/Board.h b/NativePrograms/LUFA/Drivers/Board/AVR8/MULTIO/Board.h
deleted file mode 100644
index 5ab190904f..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/MULTIO/Board.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific information header for the Bitwizard Multio.
- *  \copydetails Group_BoardInfo_MULTIO
- *
- *  \note This file should not be included directly. It is automatically included as needed by the Board driver
- *        dispatch header located in LUFA/Drivers/Board/Board.h.
- */
-
-/** \ingroup Group_BoardInfo
- *  \defgroup Group_BoardInfo_MULTIO MULTIO
- *  \brief Board specific information header for the Bitwizard Multio.
- *
- *  Board specific information header for the Bitwizard Multio (http://www.bitwizard.nl/wiki/index.php/USB-multio).
- *
- *  @{
- */
-
-#ifndef __BOARD_MULTIO_H__
-#define __BOARD_MULTIO_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-		#include "../../LEDs.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_BOARD_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/Board.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Indicates the board has hardware LEDs mounted. */
-			#define BOARD_HAS_LEDS
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/MULTIO/LEDs.h b/NativePrograms/LUFA/Drivers/Board/AVR8/MULTIO/LEDs.h
deleted file mode 100644
index 23faaffbc1..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/MULTIO/LEDs.h
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific LED driver header for the Bitwizard Multio.
- *  \copydetails Group_LEDs_MULTIO
- *
- *  \note This file should not be included directly. It is automatically included as needed by the LEDs driver
- *        dispatch header located in LUFA/Drivers/Board/LEDs.h.
- */
-
-/** \ingroup Group_LEDs
- *  \defgroup Group_LEDs_MULTIO MULTIO
- *  \brief Board specific LED driver header for the Bitwizard Multio.
- *
- *  Board specific LED driver header for the Bitwizard Multio (http://www.bitwizard.nl/wiki/index.php/USB-multio).
- *
- *  <table>
- *    <tr><th>Name</th><th>Color</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr>
- *    <tr><td>LEDS_LED1</td><td>Green</td><td>General Indicator</td><td>High</td><td>PORTD.0</td></tr>
- *    <tr><td>LEDS_LED2</td><td>Green</td><td>General Indicator</td><td>High</td><td>PORTC.2</td></tr>
- *    <tr><td>LEDS_LED3</td><td>Green</td><td>General Indicator</td><td>High</td><td>PORTD.7</td></tr>
- *  </table>
- *
- *  @{
- */
-
-#ifndef __LEDS_MULTIO_H__
-#define __LEDS_MULTIO_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_LEDS_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/LEDS.h instead.
-		#endif
-
-	/* Private Interface - For use in library only: */
-	#if !defined(__DOXYGEN__)
-		/* Macros: */
-			#define LEDS_PORTD_LEDS       (LEDS_LED1 | LEDS_LED3)
-			#define LEDS_PORTC_LEDS       LEDS_LED2
-	#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** LED mask for the first LED on the board. */
-			#define LEDS_LED1        (1 << 0)
-
-			/** LED mask for the second LED on the board. */
-			#define LEDS_LED2        (1 << 2)
-
-			/** LED mask for the second LED on the board. */
-			#define LEDS_LED3        (1 << 7)
-
-			/** LED mask for all the LEDs on the board. */
-			#define LEDS_ALL_LEDS    (LEDS_LED1 | LEDS_LED2 | LEDS_LED3)
-
-			/** LED mask for none of the board LEDs. */
-			#define LEDS_NO_LEDS     0
-
-		/* Inline Functions: */
-		#if !defined(__DOXYGEN__)
-			static inline void LEDs_Init(void)
-			{
-				DDRD  |=  LEDS_PORTD_LEDS;
-				DDRC  |=  LEDS_PORTC_LEDS;
-
-				PORTD &= ~LEDS_PORTD_LEDS;
-				PORTC &= ~LEDS_PORTC_LEDS;
-			}
-
-			static inline void LEDs_Disable(void)
-			{
-				DDRD  &= ~LEDS_PORTD_LEDS;
-				DDRC  &= ~LEDS_PORTC_LEDS;
-
-				PORTD &= ~LEDS_PORTD_LEDS;
-				PORTC &= ~LEDS_PORTC_LEDS;
-			}
-
-			static inline void LEDs_TurnOnLEDs(const uint8_t LEDMask)
-			{
-				PORTD |= (LEDMask & LEDS_PORTD_LEDS);
-				PORTC |= (LEDMask & LEDS_PORTC_LEDS);
-			}
-
-			static inline void LEDs_TurnOffLEDs(const uint8_t LEDMask)
-			{
-				PORTD &= ~(LEDMask & LEDS_PORTD_LEDS);
-				PORTC &= ~(LEDMask & LEDS_PORTC_LEDS);
-			}
-
-			static inline void LEDs_SetAllLEDs(const uint8_t LEDMask)
-			{
-				PORTD = (PORTD & ~LEDS_PORTD_LEDS) | (LEDMask & LEDS_PORTD_LEDS);
-				PORTC = (PORTC & ~LEDS_PORTC_LEDS) | (LEDMask & LEDS_PORTC_LEDS);
-			}
-
-			static inline void LEDs_ChangeLEDs(const uint8_t LEDMask,
-			                                   const uint8_t ActiveMask)
-			{
-				PORTD = (PORTD & ~(LEDMask & LEDS_PORTD_LEDS)) | (ActiveMask & LEDS_PORTD_LEDS);
-				PORTC = (PORTC & ~(LEDMask & LEDS_PORTC_LEDS)) | (ActiveMask & LEDS_PORTC_LEDS);
-			}
-
-			static inline void LEDs_ToggleLEDs(const uint8_t LEDMask)
-			{
-				PIND  = (LEDMask & LEDS_PORTD_LEDS);
-				PINC  = (LEDMask & LEDS_PORTC_LEDS);
-			}
-
-			static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT;
-			static inline uint8_t LEDs_GetLEDs(void)
-			{
-				return ((PORTD & LEDS_PORTD_LEDS) | (PORTC & LEDS_PORTC_LEDS));
-			}
-		#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/OLIMEX162/Board.h b/NativePrograms/LUFA/Drivers/Board/AVR8/OLIMEX162/Board.h
deleted file mode 100644
index c43824b176..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/OLIMEX162/Board.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific information header for the Olimex AVR-USB-162 Development Board.
- *  \copydetails Group_BoardInfo_OLIMEX162
- *
- *  \note This file should not be included directly. It is automatically included as needed by the Board driver
- *        dispatch header located in LUFA/Drivers/Board/Board.h.
- */
-
-/** \ingroup Group_BoardInfo
- *  \defgroup Group_BoardInfo_OLIMEX162 OLIMEX162
- *  \brief Board specific information header for the Olimex AVR-USB-162 Development Board.
- *
- *  Board specific information header for the Olimex AVR-USB-162 Development Board (http://www.olimex.com/dev/avr-usb-162.html).
- *
- *  @{
- */
-
-#ifndef __BOARD_OLIMEX162_H__
-#define __BOARD_OLIMEX162_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-		#include "../../Buttons.h"
-		#include "../../LEDs.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_BOARD_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/Board.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Indicates the board has hardware Buttons mounted. */
-			#define BOARD_HAS_BUTTONS
-
-			/** Indicates the board has hardware LEDs mounted. */
-			#define BOARD_HAS_LEDS
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/OLIMEX162/Buttons.h b/NativePrograms/LUFA/Drivers/Board/AVR8/OLIMEX162/Buttons.h
deleted file mode 100644
index bd9fd8c48e..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/OLIMEX162/Buttons.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific Buttons driver header for the Olimex AVR-USB-162 Development Board.
- *  \copydetails Group_Buttons_OLIMEX162
- *
- *  \note This file should not be included directly. It is automatically included as needed by the Buttons driver
- *        dispatch header located in LUFA/Drivers/Board/Buttons.h.
- */
-
-/** \ingroup Group_Buttons
- *  \defgroup Group_Buttons_OLIMEX162 OLIMEX162
- *  \brief Board specific Buttons driver header for the Olimex AVR-USB-162 Development Board.
- *
- *  Board specific Buttons driver header for the Olimex AVR-USB-162 Development Board (http://www.olimex.com/dev/avr-usb-162.html).
- *
- *  <table>
- *    <tr><th>Name</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr>
- *    <tr><td>BUTTONS_BUTTON1</td><td>HWB Button</td><td>Low</td><td>PORTD.7</td></tr>
- *  </table>
- *
- *  @{
- */
-
-#ifndef __BUTTONS_OLIMEX162_H__
-#define __BUTTONS_OLIMEX162_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_BUTTONS_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/Buttons.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Button mask for the first button on the board. */
-			#define BUTTONS_BUTTON1      (1 << 7)
-
-		/* Inline Functions: */
-		#if !defined(__DOXYGEN__)
-			static inline void Buttons_Init(void)
-			{
-				DDRD  &= ~BUTTONS_BUTTON1;
-				PORTD |=  BUTTONS_BUTTON1;
-			}
-
-			static inline void Buttons_Disable(void)
-			{
-				DDRD  &= ~BUTTONS_BUTTON1;
-				PORTD &= ~BUTTONS_BUTTON1;
-			}
-
-			static inline uint8_t Buttons_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
-			static inline uint8_t Buttons_GetStatus(void)
-			{
-				return ((PIND & BUTTONS_BUTTON1) ^ BUTTONS_BUTTON1);
-			}
-		#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/OLIMEX162/LEDs.h b/NativePrograms/LUFA/Drivers/Board/AVR8/OLIMEX162/LEDs.h
deleted file mode 100644
index 915f043f61..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/OLIMEX162/LEDs.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific LED driver header for the Olimex AVR-USB-162.
- *  \copydetails Group_LEDs_OLIMEX162
- *
- *  \note This file should not be included directly. It is automatically included as needed by the LEDs driver
- *        dispatch header located in LUFA/Drivers/Board/LEDs.h.
- */
-
-/** \ingroup Group_LEDs
- *  \defgroup Group_LEDs_OLIMEX162 OLIMEX162
- *  \brief Board specific LED driver header for the Olimex AVR-USB-162.
- *
- *  Board specific LED driver header for the Olimex AVR-USB-162 (http://www.olimex.com/dev/avr-usb-162.html).
- *
- *  <table>
- *    <tr><th>Name</th><th>Color</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr>
- *    <tr><td>LEDS_LED1</td><td>Yellow</td><td>General Indicator</td><td>High</td><td>PORTD.4</td></tr>
- *  </table>
- *
- *  @{
- */
-
-#ifndef __LEDS_OLIMEX162_H__
-#define __LEDS_OLIMEX162_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_LEDS_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/LEDS.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** LED mask for the first LED on the board. */
-			#define LEDS_LED1        (1 << 4)
-
-			/** LED mask for all the LEDs on the board. */
-			#define LEDS_ALL_LEDS    LEDS_LED1
-
-			/** LED mask for none of the board LEDs. */
-			#define LEDS_NO_LEDS     0
-
-		/* Inline Functions: */
-		#if !defined(__DOXYGEN__)
-			static inline void LEDs_Init(void)
-			{
-				DDRD  |=  LEDS_ALL_LEDS;
-				PORTD &= ~LEDS_ALL_LEDS;
-			}
-
-			static inline void LEDs_Disable(void)
-			{
-				DDRD  &= ~LEDS_ALL_LEDS;
-				PORTD &= ~LEDS_ALL_LEDS;
-			}
-
-			static inline void LEDs_TurnOnLEDs(const uint8_t LEDMask)
-			{
-				PORTD |= LEDMask;
-			}
-
-			static inline void LEDs_TurnOffLEDs(const uint8_t LEDMask)
-			{
-				PORTD &= ~LEDMask;
-			}
-
-			static inline void LEDs_SetAllLEDs(const uint8_t LEDMask)
-			{
-				PORTD = ((PORTD & ~LEDS_ALL_LEDS) | LEDMask);
-			}
-
-			static inline void LEDs_ChangeLEDs(const uint8_t LEDMask,
-			                                   const uint8_t ActiveMask)
-			{
-				PORTD = ((PORTD & ~LEDMask) | ActiveMask);
-			}
-
-			static inline void LEDs_ToggleLEDs(const uint8_t LEDMask)
-			{
-				PIND  = LEDMask;
-			}
-
-			static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT;
-			static inline uint8_t LEDs_GetLEDs(void)
-			{
-				return (PORTD & LEDS_ALL_LEDS);
-			}
-		#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/OLIMEX32U4/Board.h b/NativePrograms/LUFA/Drivers/Board/AVR8/OLIMEX32U4/Board.h
deleted file mode 100644
index 2c06d919e7..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/OLIMEX32U4/Board.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific information header for the Olimex AVR-USB-32U4 Development Board.
- *  \copydetails Group_BoardInfo_OLIMEX32U4
- *
- *  \note This file should not be included directly. It is automatically included as needed by the Board driver
- *        dispatch header located in LUFA/Drivers/Board/Board.h.
- */
-
-/** \ingroup Group_BoardInfo
- *  \defgroup Group_BoardInfo_OLIMEX32U4 OLIMEX32U4
- *  \brief Board specific information header for the Olimex AVR-USB-32U4 Development Board.
- *
- *  Board specific information header for the Olimex AVR-USB-32U4 Development Board (http://www.olimex.com/dev/olimexino-32u4.html).
- *
- *  @{
- */
-
-#ifndef __BOARD_OLIMEX32U4_H__
-#define __BOARD_OLIMEX32U4_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-		#include "../../Buttons.h"
-		#include "../../LEDs.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_BOARD_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/Board.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Indicates the board has hardware Buttons mounted. */
-			#define BOARD_HAS_BUTTONS
-
-			/** Indicates the board has hardware LEDs mounted. */
-			#define BOARD_HAS_LEDS
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/OLIMEX32U4/Buttons.h b/NativePrograms/LUFA/Drivers/Board/AVR8/OLIMEX32U4/Buttons.h
deleted file mode 100644
index 9f200445c8..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/OLIMEX32U4/Buttons.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific Buttons driver header for the Olimex AVR-USB-32U4 Development Board.
- *  \copydetails Group_Buttons_OLIMEX32U4
- *
- *  \note This file should not be included directly. It is automatically included as needed by the Buttons driver
- *        dispatch header located in LUFA/Drivers/Board/Buttons.h.
- */
-
-/** \ingroup Group_Buttons
- *  \defgroup Group_Buttons_OLIMEX32U4 OLIMEX32U4
- *  \brief Board specific Buttons driver header for the Olimex AVR-USB-32U4 Development Board.
- *
- *  Board specific Buttons driver header for the Olimex AVR-USB-32U4 Development Board (http://www.olimex.com/dev/olimexino-32u4.html).
- *
- *  <table>
- *    <tr><th>Name</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr>
- *    <tr><td>BUTTONS_BUTTON1</td><td>HWB Button</td><td>Low</td><td>PORTE.2</td></tr>
- *  </table>
- *
- *  @{
- */
-
-#ifndef __BUTTONS_OLIMEX32U4_H__
-#define __BUTTONS_OLIMEX32U4_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_BUTTONS_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/Buttons.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Button mask for the first button on the board. */
-			#define BUTTONS_BUTTON1      (1 << 2)
-
-		/* Inline Functions: */
-		#if !defined(__DOXYGEN__)
-			static inline void Buttons_Init(void)
-			{
-				DDRE  &= ~BUTTONS_BUTTON1;
-				PORTE |=  BUTTONS_BUTTON1;
-			}
-
-			static inline void Buttons_Disable(void)
-			{
-				DDRE  &= ~BUTTONS_BUTTON1;
-				PORTE &= ~BUTTONS_BUTTON1;
-			}
-
-			static inline uint8_t Buttons_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
-			static inline uint8_t Buttons_GetStatus(void)
-			{
-				return ((PINE & BUTTONS_BUTTON1) ^ BUTTONS_BUTTON1);
-			}
-		#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/OLIMEX32U4/LEDs.h b/NativePrograms/LUFA/Drivers/Board/AVR8/OLIMEX32U4/LEDs.h
deleted file mode 100644
index f2eff9e115..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/OLIMEX32U4/LEDs.h
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific LED driver header for the Olimex AVR-USB-32U4.
- *  \copydetails Group_LEDs_OLIMEX32U4
- *
- *  \note This file should not be included directly. It is automatically included as needed by the LEDs driver
- *        dispatch header located in LUFA/Drivers/Board/LEDs.h.
- */
-
-/** \ingroup Group_LEDs
- *  \defgroup Group_LEDs_OLIMEX32U4 OLIMEX32U4
- *  \brief Board specific LED driver header for the Olimex AVR-USB-32U4.
- *
- *  Board specific LED driver header for the Olimex AVR-USB-32U4 (http://www.olimex.com/dev/olimexino-32u4.html).
- *
- *  <table>
- *    <tr><th>Name</th><th>Color</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr>
- *    <tr><td>LEDS_LED1</td><td>Green</td><td>TX</td><td>High</td><td>PORTD.5</td></tr>
- *    <tr><td>LEDS_LED2</td><td>Yellow</td><td>RX</td><td>High</td><td>PORTB.0</td></tr>
- *    <tr><td>LEDS_LED3</td><td>Green</td><td>General Indicator (Default Unconnected)</td><td>High</td><td>PORTE.6</td></tr>
- *    <tr><td>LEDS_LED4</td><td>Yellow</td><td>General Indicator (Default Unconnected)</td><td>High</td><td>PORTB.5</td></tr>
- *  </table>
- *
- *  @{
- */
-
-#ifndef __LEDS_OLIMEX32U4_H__
-#define __LEDS_OLIMEX32U4_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_LEDS_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/LEDS.h instead.
-		#endif
-
-	/* Private Interface - For use in library only: */
-	#if !defined(__DOXYGEN__)
-		/* Macros: */
-			#define LEDS_PORTB_LEDS       (LEDS_LED2 | LEDS_LED4)
-			#define LEDS_PORTD_LEDS       (LEDS_LED1)
-			#define LEDS_PORTE_LEDS       (LEDS_LED3)
-
-			#define LEDS_PORTD_MASK_SHIFT 1
-	#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** LED mask for the first LED on the board. */
-			#define LEDS_LED1        ((1 << 5) >> LEDS_PORTD_MASK_SHIFT)
-
-			/** LED mask for the second LED on the board. */
-			#define LEDS_LED2        (1 << 0)
-
-			/** LED mask for the third LED on the board. */
-			#define LEDS_LED3        (1 << 6)
-
-			/** LED mask for the fourth LED on the board. */
-			#define LEDS_LED4        (1 << 5)
-
-			/** LED mask for all the LEDs on the board. */
-			#define LEDS_ALL_LEDS    (LEDS_LED1 | LEDS_LED2 | LEDS_LED3 | LEDS_LED4)
-
-			/** LED mask for none of the board LEDs. */
-			#define LEDS_NO_LEDS     0
-
-		/* Inline Functions: */
-		#if !defined(__DOXYGEN__)
-			static inline void LEDs_Init(void)
-			{
-				DDRB  |=  LEDS_PORTB_LEDS;
-				PORTB &= ~LEDS_PORTB_LEDS;
-				DDRD  |=  (LEDS_PORTD_LEDS << LEDS_PORTD_MASK_SHIFT);
-				PORTD &= ~(LEDS_PORTD_LEDS << LEDS_PORTD_MASK_SHIFT);
-				DDRE  |=  LEDS_PORTE_LEDS;
-				PORTE &= ~LEDS_PORTE_LEDS;
-			}
-
-			static inline void LEDs_Disable(void)
-			{
-				DDRB  &= ~LEDS_PORTB_LEDS;
-				PORTB &= ~LEDS_PORTB_LEDS;
-				DDRD  &= ~(LEDS_PORTD_LEDS << LEDS_PORTD_MASK_SHIFT);
-				PORTD &= ~(LEDS_PORTD_LEDS << LEDS_PORTD_MASK_SHIFT);
-				DDRE  &= ~LEDS_PORTE_LEDS;
-				PORTE &= ~LEDS_PORTE_LEDS;
-			}
-
-			static inline void LEDs_TurnOnLEDs(const uint8_t LEDMask)
-			{
-				PORTB |= (LEDMask & LEDS_PORTB_LEDS);
-				PORTD |= ((LEDMask & LEDS_PORTD_LEDS) << LEDS_PORTD_MASK_SHIFT);
-				PORTE |= (LEDMask & LEDS_PORTE_LEDS);
-			}
-
-			static inline void LEDs_TurnOffLEDs(const uint8_t LEDMask)
-			{
-				PORTB &= ~(LEDMask & LEDS_PORTB_LEDS);
-				PORTD &= ~((LEDMask & LEDS_PORTD_LEDS) << LEDS_PORTD_MASK_SHIFT);
-				PORTE &= ~(LEDMask & LEDS_PORTE_LEDS);
-			}
-
-			static inline void LEDs_SetAllLEDs(const uint8_t LEDMask)
-			{
-				PORTB = ((PORTB & ~LEDS_PORTB_LEDS) | (LEDMask & LEDS_PORTB_LEDS));
-				PORTD = ((PORTD & ~(LEDS_PORTD_LEDS << LEDS_PORTD_MASK_SHIFT)) |
-				         ((LEDMask & LEDS_PORTD_LEDS) << LEDS_PORTD_MASK_SHIFT));
-				PORTE = ((PORTE & ~LEDS_PORTE_LEDS) | (LEDMask & LEDS_PORTE_LEDS));
-			}
-
-			static inline void LEDs_ChangeLEDs(const uint8_t LEDMask,
-			                                   const uint8_t ActiveMask)
-			{
-				PORTB = ((PORTB & ~(LEDMask & LEDS_PORTB_LEDS)) | (ActiveMask & LEDS_PORTB_LEDS));
-				PORTD = ((PORTD & ~((LEDMask & LEDS_PORTD_LEDS) << LEDS_PORTD_MASK_SHIFT)) |
-				         ((ActiveMask & LEDS_PORTD_LEDS) << LEDS_PORTD_MASK_SHIFT));
-				PORTE = ((PORTE & ~(LEDMask & LEDS_PORTE_LEDS)) | (ActiveMask & LEDS_PORTE_LEDS));
-			}
-
-			static inline void LEDs_ToggleLEDs(const uint8_t LEDMask)
-			{
-				PINB  = (LEDMask & LEDS_PORTB_LEDS);
-				PIND  = ((LEDMask & LEDS_PORTD_LEDS) << LEDS_PORTD_MASK_SHIFT);
-				PINE  = (LEDMask & LEDS_PORTE_LEDS);
-			}
-
-			static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT;
-			static inline uint8_t LEDs_GetLEDs(void)
-			{
-				return ((PORTB & LEDS_PORTB_LEDS) |
-				        ((PORTD & (LEDS_PORTD_LEDS << LEDS_PORTD_MASK_SHIFT)) >> LEDS_PORTD_MASK_SHIFT) |
-				        (PORTE & LEDS_PORTE_LEDS));
-			}
-		#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/OLIMEXISPMK2/Board.h b/NativePrograms/LUFA/Drivers/Board/AVR8/OLIMEXISPMK2/Board.h
deleted file mode 100644
index 7167d1244b..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/OLIMEXISPMK2/Board.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific information header for the Olimex AVR-ISP-MK2 Development Board.
- *  \copydetails Group_BoardInfo_OLIMEXISPMK2
- *
- *  \note This file should not be included directly. It is automatically included as needed by the Board driver
- *        dispatch header located in LUFA/Drivers/Board/Board.h.
- */
-
-/** \ingroup Group_BoardInfo
- *  \defgroup Group_BoardInfo_OLIMEXISPMK2 OLIMEXISPMK2
- *  \brief Board specific information header for the Olimex AVR-ISP-MK2 Development Board.
- *
- *  Board specific information header for the Olimex AVR-ISP-MK2 Development Board (https://www.olimex.com/dev/avr-isp-mk2.html).
- *
- *  @{
- */
-
-#ifndef __BOARD_OLIMEXISPMK2_H__
-#define __BOARD_OLIMEXISPMK2_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-		#include "../../Buttons.h"
-		#include "../../LEDs.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_BOARD_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/Board.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Indicates the board has hardware Buttons mounted. */
-			#define BOARD_HAS_BUTTONS
-
-			/** Indicates the board has hardware LEDs mounted. */
-			#define BOARD_HAS_LEDS
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/OLIMEXISPMK2/Buttons.h b/NativePrograms/LUFA/Drivers/Board/AVR8/OLIMEXISPMK2/Buttons.h
deleted file mode 100644
index 61492630cc..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/OLIMEXISPMK2/Buttons.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific Buttons driver header for the Olimex AVR-ISP-MK2 Development Board.
- *  \copydetails Group_Buttons_OLIMEXISPMK2
- *
- *  \note This file should not be included directly. It is automatically included as needed by the Buttons driver
- *        dispatch header located in LUFA/Drivers/Board/Buttons.h.
- */
-
-/** \ingroup Group_Buttons
- *  \defgroup Group_Buttons_OLIMEXISPMK2 OLIMEXISPMK2
- *  \brief Board specific Buttons driver header for the Olimex AVR-ISP-MK2.
- *
- *  Board specific Buttons driver header for the Olimex AVR-ISP-MK2 Development Board (https://www.olimex.com/dev/avr-isp-mk2.html).
- *
- *  <table>
- *    <tr><th>Name</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr>
- *    <tr><td>BUTTONS_BUTTON1</td><td>HWB Button</td><td>Low</td><td>PORTD.7</td></tr>
- *  </table>
- *
- *  @{
- */
-
-#ifndef __BUTTONS_OLIMEXISPMK2_H__
-#define __BUTTONS_OLIMEXISPMK2_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_BUTTONS_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/Buttons.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Button mask for the first button on the board. */
-			#define BUTTONS_BUTTON1      (1 << 7)
-
-		/* Inline Functions: */
-		#if !defined(__DOXYGEN__)
-			static inline void Buttons_Init(void)
-			{
-				DDRD  &= ~BUTTONS_BUTTON1;
-				PORTD |=  BUTTONS_BUTTON1;
-			}
-
-			static inline void Buttons_Disable(void)
-			{
-				DDRD  &= ~BUTTONS_BUTTON1;
-				PORTD &= ~BUTTONS_BUTTON1;
-			}
-
-			static inline uint8_t Buttons_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
-			static inline uint8_t Buttons_GetStatus(void)
-			{
-				return ((PIND & BUTTONS_BUTTON1) ^ BUTTONS_BUTTON1);
-			}
-		#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/OLIMEXISPMK2/LEDs.h b/NativePrograms/LUFA/Drivers/Board/AVR8/OLIMEXISPMK2/LEDs.h
deleted file mode 100644
index 2116ef9a54..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/OLIMEXISPMK2/LEDs.h
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific LED driver header for the Olimex AVR-ISP-MK2 Development Board.
- *  \copydetails Group_LEDs_OLIMEXISPMK2
- *
- *  \note This file should not be included directly. It is automatically included as needed by the LEDs driver
- *        dispatch header located in LUFA/Drivers/Board/LEDs.h.
- */
-
-/** \ingroup Group_LEDs
- *  \defgroup Group_LEDs_OLIMEXISPMK2 OLIMEXISPMK2
- *  \brief Board specific LED driver header for the Olimex AVR-ISP-MK2.
- *
- *  Board specific LED driver header for the Olimex AVR-ISP-MK2 Development Board (https://www.olimex.com/dev/avr-isp-mk2.html).
- *
- *  <table>
- *    <tr><th>Name</th><th>Color</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr>
- *    <tr><td>LEDS_LED1</td><td>Yellow</td><td>Target Power</td><td>High</td><td>PORTB.5</td></tr>
- *    <tr><td>LEDS_LED2</td><td>Red</td><td>Activity</td><td>High</td><td>PORTB.6</td></tr>
- *    <tr><td>LEDS_LED3</td><td>Green</td><td>Ready</td><td>High</td><td>PORTB.7</td></tr>
- *  </table>
- *
- *  @{
- */
-
-#ifndef __LEDS_OLIMEXISPMK2_H__
-#define __LEDS_OLIMEXISPMK2_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_LEDS_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/LEDS.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** LED mask for the first LED on the board. */
-			#define LEDS_LED1        (1 << 5)
-
-			/** LED mask for the second LED on the board. */
-			#define LEDS_LED2        (1 << 6)
-
-			/** LED mask for the third LED on the board. */
-			#define LEDS_LED3        (1 << 7)
-
-			/** LED mask for all the LEDs on the board. */
-			#define LEDS_ALL_LEDS    (LEDS_LED1 | LEDS_LED2 | LEDS_LED3)
-
-			/** LED mask for none of the board LEDs. */
-			#define LEDS_NO_LEDS     0
-
-		/* Inline Functions: */
-		#if !defined(__DOXYGEN__)
-			static inline void LEDs_Init(void)
-			{
-				DDRB  |=  LEDS_ALL_LEDS;
-				PORTB &= ~LEDS_ALL_LEDS;
-			}
-
-			static inline void LEDs_Disable(void)
-			{
-				DDRB  &= ~LEDS_ALL_LEDS;
-				PORTB &= ~LEDS_ALL_LEDS;
-			}
-
-			static inline void LEDs_TurnOnLEDs(const uint8_t LEDMask)
-			{
-				PORTB |= LEDMask;
-			}
-
-			static inline void LEDs_TurnOffLEDs(const uint8_t LEDMask)
-			{
-				PORTB &= ~LEDMask;
-			}
-
-			static inline void LEDs_SetAllLEDs(const uint8_t LEDMask)
-			{
-				PORTB = ((PORTB & ~LEDS_ALL_LEDS) | LEDMask);
-			}
-
-			static inline void LEDs_ChangeLEDs(const uint8_t LEDMask,
-			                                   const uint8_t ActiveMask)
-			{
-				PORTB = ((PORTB & ~LEDMask) | ActiveMask);
-			}
-
-			static inline void LEDs_ToggleLEDs(const uint8_t LEDMask)
-			{
-				PINB  = LEDMask;
-			}
-
-			static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT;
-			static inline uint8_t LEDs_GetLEDs(void)
-			{
-				return (PORTB & LEDS_ALL_LEDS);
-			}
-		#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/OLIMEXT32U4/Board.h b/NativePrograms/LUFA/Drivers/Board/AVR8/OLIMEXT32U4/Board.h
deleted file mode 100644
index 2cc9f6d8b6..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/OLIMEXT32U4/Board.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific information header for the Olimex AVR-USB-T32U4 Development Board.
- *  \copydetails Group_BoardInfo_OLIMEXT32U4
- *
- *  \note This file should not be included directly. It is automatically included as needed by the Board driver
- *        dispatch header located in LUFA/Drivers/Board/Board.h.
- */
-
-/** \ingroup Group_BoardInfo
- *  \defgroup Group_BoardInfo_OLIMEXT32U4 OLIMEXT32U4
- *  \brief Board specific information header for the Olimex AVR-USB-T32U4 Development Board.
- *
- *  Board specific information header for the Olimex AVR-USB-T32U4 Development Board (http://www.olimex.com/dev/avr-t32u4.html).
- *
- *  @{
- */
-
-#ifndef __BOARD_OLIMEXT32U4_H__
-#define __BOARD_OLIMEXT32U4_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-		#include "../../Buttons.h"
-		#include "../../LEDs.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_BOARD_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/Board.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Indicates the board has hardware Buttons mounted. */
-			#define BOARD_HAS_BUTTONS
-
-			/** Indicates the board has hardware LEDs mounted. */
-			#define BOARD_HAS_LEDS
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/OLIMEXT32U4/Buttons.h b/NativePrograms/LUFA/Drivers/Board/AVR8/OLIMEXT32U4/Buttons.h
deleted file mode 100644
index 17fe083c0d..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/OLIMEXT32U4/Buttons.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific Buttons driver header for the Olimex AVR-USB-T32U4 Development Board.
- *  \copydetails Group_Buttons_OLIMEXT32U4
- *
- *  \note This file should not be included directly. It is automatically included as needed by the Buttons driver
- *        dispatch header located in LUFA/Drivers/Board/Buttons.h.
- */
-
-/** \ingroup Group_Buttons
- *  \defgroup Group_Buttons_OLIMEXT32U4 OLIMEXT32U4
- *  \brief Board specific Buttons driver header for the Olimex AVR-USB-32U4 Development Board.
- *
- *  Board specific Buttons driver header for the Olimex AVR-USB-T32U4 Development Board (http://www.olimex.com/dev/avr-t32u4.html).
- *
- *  <table>
- *    <tr><th>Name</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr>
- *    <tr><td>BUTTONS_BUTTON1</td><td>HWB Button</td><td>Low</td><td>PORTE.2</td></tr>
- *  </table>
- *
- *  @{
- */
-
-#ifndef __BUTTONS_OLIMEXT32U4_H__
-#define __BUTTONS_OLIMEXT32U4_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_BUTTONS_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/Buttons.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Button mask for the first button on the board. */
-			#define BUTTONS_BUTTON1      (1 << 2)
-
-		/* Inline Functions: */
-		#if !defined(__DOXYGEN__)
-			static inline void Buttons_Init(void)
-			{
-				DDRE  &= ~BUTTONS_BUTTON1;
-				PORTE |=  BUTTONS_BUTTON1;
-			}
-
-			static inline void Buttons_Disable(void)
-			{
-				DDRE  &= ~BUTTONS_BUTTON1;
-				PORTE &= ~BUTTONS_BUTTON1;
-			}
-
-			static inline uint8_t Buttons_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
-			static inline uint8_t Buttons_GetStatus(void)
-			{
-				return ((PINE & BUTTONS_BUTTON1) ^ BUTTONS_BUTTON1);
-			}
-		#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/OLIMEXT32U4/LEDs.h b/NativePrograms/LUFA/Drivers/Board/AVR8/OLIMEXT32U4/LEDs.h
deleted file mode 100644
index 305ddd0347..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/OLIMEXT32U4/LEDs.h
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific LED driver header for the Olimex AVR-USB-T32U4.
- *  \copydetails Group_LEDs_OLIMEXT32U4
- *
- *  \note This file should not be included directly. It is automatically included as needed by the LEDs driver
- *        dispatch header located in LUFA/Drivers/Board/LEDs.h.
- */
-
-/** \ingroup Group_LEDs
- *  \defgroup Group_LEDs_OLIMEXT32U4 OLIMEXT32U4
- *  \brief Board specific LED driver header for the Olimex AVR-USB-T32U4.
- *
- *  Board specific LED driver header for the Olimex AVR-USB-T32U4 (http://www.olimex.com/dev/avr-t32u4.html).
- *
- *  <table>
- *    <tr><th>Name</th><th>Color</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr>
- *    <tr><td>LEDS_LED1</td><td>Yellow</td><td>RX</td><td>High</td><td>PORTB.0</td></tr>
- *    <tr><td>LEDS_LED2</td><td>Green</td><td>TX</td><td>High</td><td>PORTD.5</td></tr>
- *    <tr><td>LEDS_LED3</td><td>N/A</td><td>General Indicator (Not Mounted)</td><td>High</td><td>PORTE.6</td></tr>
- *  </table>
- *
- *  @{
- */
-
-#ifndef __LEDS_OLIMEXT32U4_H__
-#define __LEDS_OLIMEXT32U4_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_LEDS_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/LEDS.h instead.
-		#endif
-
-	/* Private Interface - For use in library only: */
-	#if !defined(__DOXYGEN__)
-		/* Macros: */
-			#define LEDS_PORTB_LEDS       (LEDS_LED1)
-			#define LEDS_PORTD_LEDS       (LEDS_LED2)
-			#define LEDS_PORTE_LEDS       (LEDS_LED3)
-	#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** LED mask for the first LED on the board. */
-			#define LEDS_LED1        (1 << 0)
-
-			/** LED mask for the second LED on the board. */
-			#define LEDS_LED2        (1 << 5)
-
-			/** LED mask for the third LED on the board. */
-			#define LEDS_LED3        (1 << 6)
-
-			/** LED mask for all the LEDs on the board. */
-			#define LEDS_ALL_LEDS    (LEDS_LED1 | LEDS_LED2 | LEDS_LED3)
-
-			/** LED mask for none of the board LEDs. */
-			#define LEDS_NO_LEDS     0
-
-		/* Inline Functions: */
-		#if !defined(__DOXYGEN__)
-			static inline void LEDs_Init(void)
-			{
-				DDRB  |=  LEDS_PORTB_LEDS;
-				PORTB &= ~LEDS_PORTB_LEDS;
-				DDRD  |=  LEDS_PORTD_LEDS;
-				PORTD &= ~LEDS_PORTD_LEDS;
-				DDRE  |=  LEDS_PORTE_LEDS;
-				PORTE &= ~LEDS_PORTE_LEDS;
-			}
-
-			static inline void LEDs_Disable(void)
-			{
-				DDRB  &= ~LEDS_PORTB_LEDS;
-				PORTB &= ~LEDS_PORTB_LEDS;
-				DDRD  &= ~LEDS_PORTD_LEDS;
-				PORTD &= ~LEDS_PORTD_LEDS;
-				DDRE  &= ~LEDS_PORTE_LEDS;
-				PORTE &= ~LEDS_PORTE_LEDS;
-			}
-
-			static inline void LEDs_TurnOnLEDs(const uint8_t LEDMask)
-			{
-				PORTB |= (LEDMask & LEDS_PORTB_LEDS);
-				PORTD |= (LEDMask & LEDS_PORTD_LEDS);
-				PORTE |= (LEDMask & LEDS_PORTE_LEDS);
-			}
-
-			static inline void LEDs_TurnOffLEDs(const uint8_t LEDMask)
-			{
-				PORTB &= ~(LEDMask & LEDS_PORTB_LEDS);
-				PORTD &= ~(LEDMask & LEDS_PORTD_LEDS);
-				PORTE &= ~(LEDMask & LEDS_PORTE_LEDS);
-			}
-
-			static inline void LEDs_SetAllLEDs(const uint8_t LEDMask)
-			{
-				PORTB = ((PORTB & ~LEDS_PORTB_LEDS) | (LEDMask & LEDS_PORTB_LEDS));
-				PORTD = ((PORTD & ~LEDS_PORTD_LEDS) | (LEDMask & LEDS_PORTD_LEDS));
-				PORTE = ((PORTE & ~LEDS_PORTE_LEDS) | (LEDMask & LEDS_PORTE_LEDS));
-			}
-
-			static inline void LEDs_ChangeLEDs(const uint8_t LEDMask,
-			                                   const uint8_t ActiveMask)
-			{
-				PORTB = ((PORTB & ~(LEDMask & LEDS_PORTB_LEDS)) | (ActiveMask & LEDS_PORTB_LEDS));
-				PORTD = ((PORTD & ~(LEDMask & LEDS_PORTD_LEDS)) | (ActiveMask & LEDS_PORTD_LEDS));
-				PORTE = ((PORTE & ~(LEDMask & LEDS_PORTE_LEDS)) | (ActiveMask & LEDS_PORTE_LEDS));
-			}
-
-			static inline void LEDs_ToggleLEDs(const uint8_t LEDMask)
-			{
-				PINB  = (LEDMask & LEDS_PORTB_LEDS);
-				PIND  = (LEDMask & LEDS_PORTD_LEDS);
-				PINE  = (LEDMask & LEDS_PORTE_LEDS);
-			}
-
-			static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT;
-			static inline uint8_t LEDs_GetLEDs(void)
-			{
-				return ((PORTB & LEDS_PORTB_LEDS) | (PORTD & LEDS_PORTD_LEDS) | (PORTE & LEDS_PORTE_LEDS));
-			}
-		#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/POLOLUMICRO/Board.h b/NativePrograms/LUFA/Drivers/Board/AVR8/POLOLUMICRO/Board.h
deleted file mode 100644
index fb2496bb98..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/POLOLUMICRO/Board.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific information header for the "Pololu A-Star Micro" board.
- *  \copydetails Group_BoardInfo_POLOLUMICRO
- *
- *  \note This file should not be included directly. It is automatically included as needed by the Board driver
- *        dispatch header located in LUFA/Drivers/Board/Board.h.
- */
-
-/** \ingroup Group_BoardInfo
- *  \defgroup Group_BoardInfo_POLOLUMICRO POLOLUMICRO
- *  \brief Board specific information header for the "Pololu A-Star Micro" board.
- *
- *  Board specific information header:
- * https://www.pololu.com/docs/0J61 -> https://www.pololu.com/docs/0J61/3.1
- *
- *  @{
- */
-
-#ifndef __BOARD_POLOLUMICRO_H__
-#define __BOARD_POLOLUMICRO_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-		#include "../../LEDs.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_BOARD_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/Board.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Indicates the board has hardware LEDs mounted. */
-			#define BOARD_HAS_LEDS
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/POLOLUMICRO/LEDs.h b/NativePrograms/LUFA/Drivers/Board/AVR8/POLOLUMICRO/LEDs.h
deleted file mode 100644
index 6912ed8026..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/POLOLUMICRO/LEDs.h
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific LED driver header for the Pololu A-Star Micro board.
- *  \copydetails Group_LEDs_MICRO
- *
- *  \note This file should not be included directly. It is automatically included as needed by the LEDs driver
- *        dispatch header located in LUFA/Drivers/Board/LEDs.h.
- */
-
-/** \ingroup Group_LEDs
- *  \defgroup Group_LEDs_MICRO MICRO
- *  \brief Board specific LED driver header for the Pololu A-Star Micro board.
- *
- *  Board specific LED driver header for the Pololu A-Star Micro board https://www.pololu.com/docs/0J61/3.1
- *
- *  <table>
- *    <tr><th>Name</th><th>Color</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr>
- *    <tr><td>LEDS_LED1</td><td>Yellow</td><td>General Indicator</td><td>High</td><td>PORTC.7</td></tr>
- *    <tr><td>LEDS_LED2</td><td>Green</td><td>Bootloader, USB-activity</td><td>Low</td><td>PORTD.5</td></tr>
- *  </table>
- *
- *  @{
- */
-
-#ifndef __LEDS_MICRO_H__
-#define __LEDS_MICRO_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_LEDS_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/LEDS.h instead.
-		#endif
-
-	/* Private Interface - For use in library only: */
-	#if !defined(__DOXYGEN__)
-		/* Macros: */
-			#define LEDS_PORTC_LEDS       (LEDS_LED1)
-			#define LEDS_PORTD_LEDS       (LEDS_LED2)
-	#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** LED mask for the first LED on the board. */
-			#define LEDS_LED1        (1 << 7)
-
-			/** LED mask for the second LED on the board. */
-			#define LEDS_LED2        (1 << 5)
-
-			/** LED mask for all the LEDs on the board. */
-			#define LEDS_ALL_LEDS    (LEDS_LED1 | LEDS_LED2)
-
-			/** LED mask for none of the board LEDs. */
-			#define LEDS_NO_LEDS     0
-
-		/* Inline Functions: */
-		#if !defined(__DOXYGEN__)
-			static inline void LEDs_Init(void)
-			{
-				DDRD  |=  LEDS_PORTD_LEDS;
-				PORTD &= ~LEDS_PORTD_LEDS;
-				DDRC  |=  LEDS_PORTC_LEDS;
-				PORTC &= ~LEDS_PORTC_LEDS;
-			}
-
-			static inline void LEDs_Disable(void)
-			{
-				DDRD  &= ~LEDS_PORTD_LEDS;
-				PORTD &= ~LEDS_PORTD_LEDS;
-				DDRC  &= ~LEDS_PORTC_LEDS;
-				PORTC &= ~LEDS_PORTC_LEDS;
-			}
-
-			static inline void LEDs_TurnOnLEDs(const uint8_t LEDMask)
-			{
-				PORTD |=  (LEDMask & LEDS_PORTD_LEDS);
-				PORTC |=  (LEDMask & LEDS_PORTC_LEDS);
-			}
-
-			static inline void LEDs_TurnOffLEDs(const uint8_t LEDMask)
-			{
-				PORTD &= ~(LEDMask & LEDS_PORTD_LEDS);
-				PORTC &= ~(LEDMask & LEDS_PORTC_LEDS);
-			}
-
-			static inline void LEDs_SetAllLEDs(const uint8_t LEDMask)
-			{
-				PORTD = ((PORTD & ~LEDS_PORTD_LEDS) | (LEDMask & LEDS_PORTD_LEDS));
-				PORTC = ((PORTC & ~LEDS_PORTC_LEDS) | (LEDMask & LEDS_PORTC_LEDS));
-			}
-
-			static inline void LEDs_ChangeLEDs(const uint8_t LEDMask,
-			                                   const uint8_t ActiveMask)
-			{
-				PORTD = ((PORTD & ~(LEDMask & LEDS_PORTD_LEDS)) | (ActiveMask & LEDS_PORTD_LEDS));
-				PORTC = ((PORTC & ~(LEDMask & LEDS_PORTC_LEDS)) | (ActiveMask & LEDS_PORTC_LEDS));
-			}
-
-			static inline void LEDs_ToggleLEDs(const uint8_t LEDMask)
-			{
-				PORTD ^= (LEDMask & LEDS_PORTD_LEDS);
-				PORTC ^= (LEDMask & LEDS_PORTC_LEDS);
-			}
-
-			static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT;
-			static inline uint8_t LEDs_GetLEDs(void)
-			{
-				return ((PORTD & LEDS_PORTD_LEDS) | (PORTC & LEDS_PORTC_LEDS));
-			}
-		#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/RZUSBSTICK/Board.h b/NativePrograms/LUFA/Drivers/Board/AVR8/RZUSBSTICK/Board.h
deleted file mode 100644
index a3eb5142e4..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/RZUSBSTICK/Board.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific information header for the Atmel RZUSBSTICK.
- *  \copydetails Group_BoardInfo_RZUSBSTICK
- *
- *  \note This file should not be included directly. It is automatically included as needed by the Board driver
- *        dispatch header located in LUFA/Drivers/Board/Board.h.
- */
-
-/** \ingroup Group_BoardInfo
- *  \defgroup Group_BoardInfo_RZUSBSTICK RZUSBSTICK
- *  \brief Board specific information header for the Atmel RZUSBSTICK.
- *
- *  Board specific information header for the Atmel RZUSBSTICK.
- *
- *  @{
- */
-
-#ifndef __BOARD_RZUSBSTICK_H__
-#define __BOARD_RZUSBSTICK_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-		#include "../../LEDs.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_BOARD_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/Board.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Indicates the board has hardware LEDs mounted. */
-			#define BOARD_HAS_LEDS
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/RZUSBSTICK/LEDs.h b/NativePrograms/LUFA/Drivers/Board/AVR8/RZUSBSTICK/LEDs.h
deleted file mode 100644
index 70df0fd7d4..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/RZUSBSTICK/LEDs.h
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific LED driver header for the Atmel RZUSBSTICK.
- *  \copydetails Group_LEDs_RZUSBSTICK
- *
- *  \note This file should not be included directly. It is automatically included as needed by the LEDs driver
- *        dispatch header located in LUFA/Drivers/Board/LEDs.h.
- */
-
-/** \ingroup Group_LEDs
- *  \defgroup Group_LEDs_RZUSBSTICK RZUSBSTICK
- *  \brief Board specific LED driver header for the Atmel RZUSBSTICK.
- *
- *  Board specific LED driver header for the Atmel RZUSBSTICK.
- *
- *  <table>
- *    <tr><th>Name</th><th>Color</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr>
- *    <tr><td>LEDS_LED1</td><td>Blue</td><td>General Indicator</td><td>High</td><td>PORTD.7</td></tr>
- *    <tr><td>LEDS_LED1</td><td>Red</td><td>General Indicator</td><td>Low</td><td>PORTD.5</td></tr>
- *    <tr><td>LEDS_LED1</td><td>Green</td><td>General Indicator</td><td>Low</td><td>PORTE.6</td></tr>
- *    <tr><td>LEDS_LED1</td><td>Yellow</td><td>General Indicator</td><td>Low</td><td>PORTE.7</td></tr>
- *  </table>
- *
- *  @{
- */
-
-#ifndef __LEDS_RZUSBSTICK_H__
-#define __LEDS_RZUSBSTICK_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_LEDS_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/LEDS.h instead.
-		#endif
-
-	/* Private Interface - For use in library only: */
-	#if !defined(__DOXYGEN__)
-		/* Macros: */
-			#define LEDS_PORTD_LEDS       (LEDS_LED1 | LEDS_LED2)
-			#define LEDS_PORTE_LEDS       (LEDS_LED3 | LEDS_LED4)
-
-			#define LEDS_PORTE_MASK_SHIFT 4
-	#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** LED mask for the first LED on the board. */
-			#define LEDS_LED1        (1 << 7)
-
-			/** LED mask for the second LED on the board. */
-			#define LEDS_LED2        (1 << 5)
-
-			/** LED mask for the third LED on the board. */
-			#define LEDS_LED3        ((1 << 6) >> LEDS_PORTE_MASK_SHIFT)
-
-			/** LED mask for the fourth LED on the board. */
-			#define LEDS_LED4        ((1 << 7) >> LEDS_PORTE_MASK_SHIFT)
-
-			/** LED mask for all the LEDs on the board. */
-			#define LEDS_ALL_LEDS    (LEDS_LED1 | LEDS_LED2 | LEDS_LED3 | LEDS_LED4)
-
-			/** LED mask for none of the board LEDs. */
-			#define LEDS_NO_LEDS     0
-
-		/* Inline Functions: */
-		#if !defined(__DOXYGEN__)
-			static inline void LEDs_Init(void)
-			{
-				DDRD  |=  LEDS_PORTD_LEDS;
-				PORTD &= ~LEDS_LED1;
-				PORTD |=  LEDS_LED2;
-
-				DDRE  |=  (LEDS_PORTE_LEDS << LEDS_PORTE_MASK_SHIFT);
-				PORTE |=  (LEDS_PORTE_LEDS << LEDS_PORTE_MASK_SHIFT);
-			}
-
-			static inline void LEDs_Disable(void)
-			{
-				DDRD  &= ~LEDS_PORTD_LEDS;
-				PORTD &= ~LEDS_PORTD_LEDS;
-
-				DDRE  &= ~(LEDS_PORTE_LEDS << LEDS_PORTE_MASK_SHIFT);
-				PORTE &= ~(LEDS_PORTE_LEDS << LEDS_PORTE_MASK_SHIFT);
-			}
-
-			static inline void LEDs_TurnOnLEDs(const uint8_t LEDMask)
-			{
-				PORTD |=  (LEDMask & LEDS_LED1);
-				PORTD &= ~(LEDMask & LEDS_LED2);
-				PORTE &= ~((LEDMask & LEDS_PORTE_LEDS) << LEDS_PORTE_MASK_SHIFT);
-			}
-
-			static inline void LEDs_TurnOffLEDs(const uint8_t LEDMask)
-			{
-				PORTD &= ~(LEDMask & LEDS_LED1);
-				PORTD |=  (LEDMask & LEDS_LED2);
-				PORTE |=  ((LEDMask & LEDS_PORTE_LEDS) << LEDS_PORTE_MASK_SHIFT);
-			}
-
-			static inline void LEDs_SetAllLEDs(const uint8_t LEDMask)
-			{
-				PORTD = (((PORTD & ~LEDS_LED1) |  (LEDMask & LEDS_LED1)) |
-				         ((PORTD |  LEDS_LED2) & ~(LEDMask & LEDS_LED2)));
-				PORTE = ((PORTE | (LEDS_PORTE_LEDS << LEDS_PORTE_MASK_SHIFT)) &
-				        ~((LEDMask & LEDS_PORTE_LEDS) << LEDS_PORTE_MASK_SHIFT));
-			}
-
-			static inline void LEDs_ChangeLEDs(const uint8_t LEDMask,
-			                                   const uint8_t ActiveMask)
-			{
-				PORTD = (((PORTD & ~(LEDMask & LEDS_LED1)) |  (ActiveMask & LEDS_LED1)) |
-				         ((PORTD |  (LEDMask & LEDS_LED2)) & ~(ActiveMask & LEDS_LED2)));
-				PORTE = ((PORTE | ((LEDMask & LEDS_PORTE_LEDS) << LEDS_PORTE_MASK_SHIFT)) &
-				        ~((ActiveMask & LEDS_PORTE_LEDS) << LEDS_PORTE_MASK_SHIFT));
-			}
-
-			static inline void LEDs_ToggleLEDs(const uint8_t LEDMask)
-			{
-				PIND  = (LEDMask & LEDS_PORTD_LEDS);
-				PINE  = ((LEDMask & LEDS_PORTE_LEDS) << LEDS_PORTE_MASK_SHIFT);
-			}
-
-			static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT;
-			static inline uint8_t LEDs_GetLEDs(void)
-			{
-				return (((PORTD & LEDS_LED1) | (~PORTD & LEDS_LED2)) |
-				        ((~PORTE & (LEDS_PORTE_LEDS << LEDS_PORTE_MASK_SHIFT)) >> LEDS_PORTE_MASK_SHIFT));
-			}
-		#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/SPARKFUN8U2/Board.h b/NativePrograms/LUFA/Drivers/Board/AVR8/SPARKFUN8U2/Board.h
deleted file mode 100644
index c6fe5eece9..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/SPARKFUN8U2/Board.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific information header for the Sparkfun ATMEGA8U2 breakout board.
- *  \copydetails Group_BoardInfo_SPARKFUN8U2
- *
- *  \note This file should not be included directly. It is automatically included as needed by the Board driver
- *        dispatch header located in LUFA/Drivers/Board/Board.h.
- */
-
-/** \ingroup Group_BoardInfo
- *  \defgroup Group_BoardInfo_SPARKFUN8U2 SPARKFUN8U2
- *  \brief Board specific information header for the Sparkfun ATMEGA8U2 breakout board.
- *
- *  Board specific information header for the Sparkfun ATMEGA8U2 breakout board (http://www.sparkfun.com/products/10277).
- *
- *  @{
- */
-
-#ifndef __BOARD_SPARKFUN8U2_H__
-#define __BOARD_SPARKFUN8U2_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-		#include "../../LEDs.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_BOARD_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/Board.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Indicates the board has hardware LEDs mounted. */
-			#define BOARD_HAS_LEDS
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/SPARKFUN8U2/LEDs.h b/NativePrograms/LUFA/Drivers/Board/AVR8/SPARKFUN8U2/LEDs.h
deleted file mode 100644
index 0fdc7ff6ef..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/SPARKFUN8U2/LEDs.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific LED driver header for the Sparkfun ATMEGA8U2 breakout board.
- *  \copydetails Group_LEDs_SPARKFUN8U2
- *
- *  \note This file should not be included directly. It is automatically included as needed by the LEDs driver
- *        dispatch header located in LUFA/Drivers/Board/LEDs.h.
- */
-
-/** \ingroup Group_LEDs
- *  \defgroup Group_LEDs_SPARKFUN8U2 SPARKFUN8U2
- *  \brief Board specific LED driver header for the Sparkfun ATMEGA8U2 breakout board.
- *
- *  Board specific LED driver header for the Sparkfun ATMEGA8U2 breakout board (http://www.sparkfun.com/products/10277).
- *
- *  <table>
- *    <tr><th>Name</th><th>Color</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr>
- *    <tr><td>LEDS_LED1</td><td>Green</td><td>General Indicator</td><td>Low</td><td>PORTB.4</td></tr>
- *  </table>
- *
- *  @{
- */
-
-#ifndef __LEDS_SPARKFUN8U2_H__
-#define __LEDS_SPARKFUN8U2_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_LEDS_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/LEDS.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** LED mask for the first LED on the board. */
-			#define LEDS_LED1        (1 << 4)
-
-			/** LED mask for all the LEDs on the board. */
-			#define LEDS_ALL_LEDS    LEDS_LED1
-
-			/** LED mask for none of the board LEDs. */
-			#define LEDS_NO_LEDS     0
-
-		/* Inline Functions: */
-		#if !defined(__DOXYGEN__)
-			static inline void LEDs_Init(void)
-			{
-				DDRB  |= LEDS_ALL_LEDS;
-				PORTB |= LEDS_ALL_LEDS;
-			}
-
-			static inline void LEDs_Disable(void)
-			{
-				DDRB  &= ~LEDS_ALL_LEDS;
-				PORTB &= ~LEDS_ALL_LEDS;
-			}
-
-			static inline void LEDs_TurnOnLEDs(const uint8_t LEDMask)
-			{
-				PORTB &= ~LEDMask;
-			}
-
-			static inline void LEDs_TurnOffLEDs(const uint8_t LEDMask)
-			{
-				PORTB |= LEDMask;
-			}
-
-			static inline void LEDs_SetAllLEDs(const uint8_t LEDMask)
-			{
-				PORTB = ((PORTB | LEDS_ALL_LEDS) & ~LEDMask);
-			}
-
-			static inline void LEDs_ChangeLEDs(const uint8_t LEDMask,
-			                                   const uint8_t ActiveMask)
-			{
-				PORTB = ((PORTB | LEDMask) & ~ActiveMask);
-			}
-
-			static inline void LEDs_ToggleLEDs(const uint8_t LEDMask)
-			{
-				PINB  = LEDMask;
-			}
-
-			static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT;
-			static inline uint8_t LEDs_GetLEDs(void)
-			{
-				return (~PORTB & LEDS_ALL_LEDS);
-			}
-		#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/STANGE_ISP/Board.h b/NativePrograms/LUFA/Drivers/Board/AVR8/STANGE_ISP/Board.h
deleted file mode 100644
index 732e9a0e7d..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/STANGE_ISP/Board.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific information header for the Dimex Stange-ISP board.
- *  \copydetails Group_BoardInfo_STANGE_ISP
- *
- *  \note This file should not be included directly. It is automatically included as needed by the Board driver
- *        dispatch header located in LUFA/Drivers/Board/Board.h.
- */
-
-/** \ingroup Group_BoardInfo
- *  \defgroup Group_BoardInfo_STANGE_ISP STANGE_ISP
- *  \brief Board specific information header for the Dimex Stange-ISP board.
- *
- *  Board specific information header for the Dimex Stange-ISP board (http://www.diamex.de/dxshop/USB-ISP-Programmer-fuer-Atmel-AVR).
- *
- *  @{
- */
-
-#ifndef __BOARD_STANGE_ISP_H__
-#define __BOARD_STANGE_ISP_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-		#include "../../Buttons.h"
-		#include "../../LEDs.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_BOARD_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/Board.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Indicates the board has hardware Buttons mounted. */
-			#define BOARD_HAS_BUTTONS
-
-			/** Indicates the board has hardware LEDs mounted. */
-			#define BOARD_HAS_LEDS
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/STANGE_ISP/Buttons.h b/NativePrograms/LUFA/Drivers/Board/AVR8/STANGE_ISP/Buttons.h
deleted file mode 100644
index 51a2f7574b..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/STANGE_ISP/Buttons.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  The author disclaim 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, 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.
-*/
-
-/** \file
- *  \brief Board specific button driver header for the Dimex Stange-ISP board.
- *  \copydetails Group_Buttons_STANGE_ISP
- *
- *  \note This file should not be included directly. It is automatically included as needed by the Buttons driver
- *        dispatch header located in LUFA/Drivers/Board/Buttons.h.
- */
-
-/** \ingroup Group_Buttons
- *  \defgroup Group_Buttons_STANGE_ISP STANGE_ISP
- *  \brief Board specific Buttons driver header for the Dimex Stange-ISP.
- *
- *  Board specific Buttons driver header for the Dimex Stange-ISP board (http://www.diamex.de/dxshop/USB-ISP-Programmer-fuer-Atmel-AVR).
- *
- *  <table>
- *    <tr><th>Name</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr>
- *    <tr><td>BUTTONS_BUTTON1</td><td>HWB Button</td><td>Low</td><td>PORTD.7</td></tr>
- *  </table>
- *
- *  @{
- */
-
-#ifndef __BUTTONS_STANGE_ISP_H__
-#define __BUTTONS_STANGE_ISP_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_BUTTONS_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/Buttons.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Button mask for the first button on the board. */
-			#define BUTTONS_BUTTON1      (1 << 7)
-
-		/* Inline Functions: */
-		#if !defined(__DOXYGEN__)
-			static inline void Buttons_Init(void)
-			{
-				DDRD  &= ~BUTTONS_BUTTON1;
-				PORTD |=  BUTTONS_BUTTON1;
-			}
-
-			static inline void Buttons_Disable(void)
-			{
-				DDRD  &= ~BUTTONS_BUTTON1;
-				PORTD &= ~BUTTONS_BUTTON1;
-			}
-
-			static inline uint8_t Buttons_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
-			static inline uint8_t Buttons_GetStatus(void)
-			{
-				return ((PIND & BUTTONS_BUTTON1) ^ BUTTONS_BUTTON1);
-			}
-		#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/STANGE_ISP/LEDs.h b/NativePrograms/LUFA/Drivers/Board/AVR8/STANGE_ISP/LEDs.h
deleted file mode 100644
index f900558929..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/STANGE_ISP/LEDs.h
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  The author disclaim 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, 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.
-*/
-
-/** \file
- *  \brief Board specific LED driver header for the Dimex Stange-ISP board.
- *  \copydetails Group_LEDs_STANGE_ISP
- *
- *  \note This file should not be included directly. It is automatically included as needed by the LEDs driver
- *        dispatch header located in LUFA/Drivers/Board/LEDs.h.
- */
-
-/** \ingroup Group_LEDs
- *  \defgroup Group_LEDs_STANGE_ISP STANGE_ISP
- *  \brief Board specific LED driver header for the Dimex Stange-ISP board.
- *
- *  Board specific LED driver header for the Dimex Stange-ISP board (http://www.diamex.de/dxshop/USB-ISP-Programmer-fuer-Atmel-AVR).
- *
- *  <table>
- *    <tr><th>Name</th><th>Color</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr>
- *    <tr><td>LEDS_LED1</td><td>Green</td><td>General Indicator</td><td>Low</td><td>PORTD.0</td></tr>
- *    <tr><td>LEDS_LED2</td><td>Red</td><td>General Indicator</td><td>Low</td><td>PORTD.1</td></tr>
- *  </table>
- *
- *  @{
- */
-
-#ifndef __LEDS_STANGE_ISP_LEDS_H__
-#define __LEDS_STANGE_ISP_LEDS_H__
-
-	/* Includes: */
-	#include "../../../../Common/Common.h"
-
-	/* Enable C linkage for C++ Compilers: */
-	#if defined(__cplusplus)
-	extern "C" {
-	#endif
-
-	/* Preprocessor Checks: */
-	#if !defined(__INCLUDE_FROM_LEDS_H)
-		#error Do not include this file directly. Include LUFA/Drivers/Board/LEDS.h instead.
-	#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** LED mask for the first LED on the board. */
-			#define LEDS_LED1        (1 << 0)
-
-			/** LED mask for the second LED on the board. */
-			#define LEDS_LED2        (1 << 1)
-
-			/** LED mask for all the LEDs on the board. */
-			#define LEDS_ALL_LEDS    (LEDS_LED1 | LEDS_LED2)
-
-			/** LED mask for none of the board LEDs. */
-			#define LEDS_NO_LEDS     0
-
-		/* Inline Functions: */
-		#if !defined(__DOXYGEN__)
-			static inline void LEDs_Init(void)
-			{
-				DDRD  |= LEDS_ALL_LEDS;
-				PORTD |= LEDS_ALL_LEDS;
-			}
-
-			static inline void LEDs_Disable(void)
-			{
-				DDRD  &= ~LEDS_ALL_LEDS;
-				PORTD &= ~LEDS_ALL_LEDS;
-			}
-
-			static inline void LEDs_TurnOnLEDs(const uint8_t LEDMask)
-			{
-				PORTD &= ~LEDMask;
-			}
-
-			static inline void LEDs_TurnOffLEDs(const uint8_t LEDMask)
-			{
-				PORTD |= LEDMask;
-			}
-
-			static inline void LEDs_SetAllLEDs (const uint8_t LEDMask)
-			{
-				PORTD = ((PORTD | LEDS_ALL_LEDS) & ~LEDMask);
-			}
-
-			static inline void LEDs_ChangeLEDs ( const uint8_t LEDMask, const uint8_t ActiveMask)
-			{
-				PORTD = ((PORTD | LEDMask) & ~ActiveMask);
-			}
-
-			static inline void LEDs_ToggleLEDs(const uint8_t LEDMask)
-			{
-				PIND  = LEDMask;
-			}
-
-			static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT;
-			static inline uint8_t LEDs_GetLEDs(void)
-			{
-				return (~PORTD & LEDS_ALL_LEDS);
-			}
-		#endif
-
-	/* Disable C linkage for C++ Compilers: */
-	#if defined(__cplusplus)
-	}
-	#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/STK525/Board.h b/NativePrograms/LUFA/Drivers/Board/AVR8/STK525/Board.h
deleted file mode 100644
index 8e0725ee41..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/STK525/Board.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific information header for the Atmel STK525.
- *  \copydetails Group_BoardInfo_STK525
- *
- *  \note This file should not be included directly. It is automatically included as needed by the Board driver
- *        dispatch header located in LUFA/Drivers/Board/Board.h.
- */
-
-/** \ingroup Group_BoardInfo
- *  \defgroup Group_BoardInfo_STK525 STK525
- *  \brief Board specific information header for the Atmel STK525.
- *
- *  Board specific information header for the Atmel STK525.
- *
- *  @{
- */
-
-#ifndef __BOARD_STK525_H__
-#define __BOARD_STK525_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-		#include "../../Buttons.h"
-		#include "../../Dataflash.h"
-		#include "../../Joystick.h"
-		#include "../../LEDs.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_BOARD_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/Board.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Indicates the board has hardware Buttons mounted. */
-			#define BOARD_HAS_BUTTONS
-
-			/** Indicates the board has a hardware Dataflash mounted. */
-			#define BOARD_HAS_DATAFLASH
-
-			/** Indicates the board has a hardware Joystick mounted. */
-			#define BOARD_HAS_JOYSTICK
-
-			/** Indicates the board has hardware LEDs mounted. */
-			#define BOARD_HAS_LEDS
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/STK525/Buttons.h b/NativePrograms/LUFA/Drivers/Board/AVR8/STK525/Buttons.h
deleted file mode 100644
index e5a22e8600..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/STK525/Buttons.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific Buttons driver header for the Atmel STK525.
- *  \copydetails Group_Buttons_STK525
- *
- *  \note This file should not be included directly. It is automatically included as needed by the Buttons driver
- *        dispatch header located in LUFA/Drivers/Board/Buttons.h.
- */
-
-/** \ingroup Group_Buttons
- *  \defgroup Group_Buttons_STK525 STK525
- *  \brief Board specific Buttons driver header for the Atmel STK525.
- *
- *  Board specific Buttons driver header for the Atmel STK525.
- *
- *  <table>
- *    <tr><th>Name</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr>
- *    <tr><td>BUTTONS_BUTTON1</td><td>HWB Button</td><td>Low</td><td>PORTE.2</td></tr>
- *  </table>
- *
- *  @{
- */
-
-#ifndef __BUTTONS_STK525_H__
-#define __BUTTONS_STK525_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_BUTTONS_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/Buttons.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Button mask for the first button on the board. */
-			#define BUTTONS_BUTTON1      (1 << 2)
-
-		/* Inline Functions: */
-		#if !defined(__DOXYGEN__)
-			static inline void Buttons_Init(void)
-			{
-				DDRE  &= ~BUTTONS_BUTTON1;
-				PORTE |=  BUTTONS_BUTTON1;
-			}
-
-			static inline void Buttons_Disable(void)
-			{
-				DDRE  &= ~BUTTONS_BUTTON1;
-				PORTE &= ~BUTTONS_BUTTON1;
-			}
-
-			static inline uint8_t Buttons_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
-			static inline uint8_t Buttons_GetStatus(void)
-			{
-				return ((PINE & BUTTONS_BUTTON1) ^ BUTTONS_BUTTON1);
-			}
-		#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/STK525/Dataflash.h b/NativePrograms/LUFA/Drivers/Board/AVR8/STK525/Dataflash.h
deleted file mode 100644
index 8df419ad4d..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/STK525/Dataflash.h
+++ /dev/null
@@ -1,222 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific Dataflash driver header for the Atmel STK525.
- *  \copydetails Group_Dataflash_STK525
- *
- *  \note This file should not be included directly. It is automatically included as needed by the dataflash driver
- *        dispatch header located in LUFA/Drivers/Board/Dataflash.h.
- */
-
-/** \ingroup Group_Dataflash
- *  \defgroup Group_Dataflash_STK525 STK525
- *  \brief Board specific Dataflash driver header for the Atmel STK525.
- *
- *  Board specific Dataflash driver header for the Atmel STK525.
- *
- *  <table>
- *    <tr><th>Name</th><th>Info</th><th>Select Pin</th><th>SPI Port</th></tr>
- *    <tr><td>DATAFLASH_CHIP1</td><td>AT45DB321C (4MB)</td><td>PORTB.4</td><td>SPI0</td></tr>
- *  </table>
- *
- *  @{
- */
-
-#ifndef __DATAFLASH_STK525_H__
-#define __DATAFLASH_STK525_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-		#include "../../../Misc/AT45DB321C.h"
-		#include "../../../Peripheral/SPI.h"
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_DATAFLASH_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/Dataflash.h instead.
-		#endif
-
-	/* Private Interface - For use in library only: */
-	#if !defined(__DOXYGEN__)
-		/* Macros: */
-			#define DATAFLASH_CHIPCS_MASK                DATAFLASH_CHIP1
-			#define DATAFLASH_CHIPCS_DDR                 DDRB
-			#define DATAFLASH_CHIPCS_PORT                PORTB
-	#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Constant indicating the total number of dataflash ICs mounted on the selected board. */
-			#define DATAFLASH_TOTALCHIPS                 1
-
-			/** Mask for no dataflash chip selected. */
-			#define DATAFLASH_NO_CHIP                    0
-
-			/** Mask for the first dataflash chip selected. */
-			#define DATAFLASH_CHIP1                      (1 << 4)
-
-			/** Internal main memory page size for the board's dataflash IC. */
-			#define DATAFLASH_PAGE_SIZE                  512
-
-			/** Total number of pages inside the board's dataflash IC. */
-			#define DATAFLASH_PAGES                      8192
-
-		/* Inline Functions: */
-			/** Initializes the dataflash driver so that commands and data may be sent to an attached dataflash IC.
-			 *  The appropriate SPI interface will be automatically configured.
-			 */
-			static inline void Dataflash_Init(void)
-			{
-				DATAFLASH_CHIPCS_DDR  |= DATAFLASH_CHIPCS_MASK;
-				DATAFLASH_CHIPCS_PORT |= DATAFLASH_CHIPCS_MASK;
-
-				SPI_Init(SPI_SPEED_FCPU_DIV_2 | SPI_ORDER_MSB_FIRST | SPI_SCK_LEAD_FALLING | SPI_SAMPLE_TRAILING | SPI_MODE_MASTER);
-			}
-
-			/** Sends a byte to the currently selected dataflash IC, and returns a byte from the dataflash.
-			 *
-			 *  \param[in] Byte  Byte of data to send to the dataflash
-			 *
-			 *  \return Last response byte from the dataflash
-			 */
-			static inline uint8_t Dataflash_TransferByte(const uint8_t Byte) ATTR_ALWAYS_INLINE;
-			static inline uint8_t Dataflash_TransferByte(const uint8_t Byte)
-			{
-				return SPI_TransferByte(Byte);
-			}
-
-			/** Sends a byte to the currently selected dataflash IC, and ignores the next byte from the dataflash.
-			 *
-			 *  \param[in] Byte  Byte of data to send to the dataflash
-			 */
-			static inline void Dataflash_SendByte(const uint8_t Byte) ATTR_ALWAYS_INLINE;
-			static inline void Dataflash_SendByte(const uint8_t Byte)
-			{
-				SPI_SendByte(Byte);
-			}
-
-			/** Sends a dummy byte to the currently selected dataflash IC, and returns the next byte from the dataflash.
-			 *
-			 *  \return Last response byte from the dataflash
-			 */
-			static inline uint8_t Dataflash_ReceiveByte(void) ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT;
-			static inline uint8_t Dataflash_ReceiveByte(void)
-			{
-				return SPI_ReceiveByte();
-			}
-
-			/** Determines the currently selected dataflash chip.
-			 *
-			 *  \return Mask of the currently selected Dataflash chip, either \ref DATAFLASH_NO_CHIP if no chip is selected
-			 *          or a DATAFLASH_CHIPn mask (where n is the chip number).
-			 */
-			static inline uint8_t Dataflash_GetSelectedChip(void) ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT;
-			static inline uint8_t Dataflash_GetSelectedChip(void)
-			{
-				return (~DATAFLASH_CHIPCS_PORT & DATAFLASH_CHIPCS_MASK);
-			}
-
-			/** Selects the given dataflash chip.
-			 *
-			 *  \param[in]  ChipMask  Mask of the Dataflash IC to select, in the form of a \c DATAFLASH_CHIPn mask (where n is
-			 *              the chip number).
-			 */
-			static inline void Dataflash_SelectChip(const uint8_t ChipMask) ATTR_ALWAYS_INLINE;
-			static inline void Dataflash_SelectChip(const uint8_t ChipMask)
-			{
-				DATAFLASH_CHIPCS_PORT = ((DATAFLASH_CHIPCS_PORT | DATAFLASH_CHIPCS_MASK) & ~ChipMask);
-			}
-
-			/** Deselects the current dataflash chip, so that no dataflash is selected. */
-			static inline void Dataflash_DeselectChip(void) ATTR_ALWAYS_INLINE;
-			static inline void Dataflash_DeselectChip(void)
-			{
-				Dataflash_SelectChip(DATAFLASH_NO_CHIP);
-			}
-
-			/** Selects a dataflash IC from the given page number, which should range from 0 to
-			 *  ((DATAFLASH_PAGES * DATAFLASH_TOTALCHIPS) - 1). For boards containing only one
-			 *  dataflash IC, this will select DATAFLASH_CHIP1. If the given page number is outside
-			 *  the total number of pages contained in the boards dataflash ICs, all dataflash ICs
-			 *  are deselected.
-			 *
-			 *  \param[in] PageAddress  Address of the page to manipulate, ranging from
-			 *                          0 to ((DATAFLASH_PAGES * DATAFLASH_TOTALCHIPS) - 1).
-			 */
-			static inline void Dataflash_SelectChipFromPage(const uint16_t PageAddress)
-			{
-				Dataflash_DeselectChip();
-
-				if (PageAddress >= DATAFLASH_PAGES)
-				  return;
-
-				Dataflash_SelectChip(DATAFLASH_CHIP1);
-			}
-
-			/** Toggles the select line of the currently selected dataflash IC, so that it is ready to receive
-			 *  a new command.
-			 */
-			static inline void Dataflash_ToggleSelectedChipCS(void)
-			{
-				uint8_t SelectedChipMask = Dataflash_GetSelectedChip();
-
-				Dataflash_DeselectChip();
-				Dataflash_SelectChip(SelectedChipMask);
-			}
-
-			/** Spin-loops while the currently selected dataflash is busy executing a command, such as a main
-			 *  memory page program or main memory to buffer transfer.
-			 */
-			static inline void Dataflash_WaitWhileBusy(void)
-			{
-				Dataflash_ToggleSelectedChipCS();
-				Dataflash_SendByte(DF_CMD_GETSTATUS);
-				while (!(Dataflash_ReceiveByte() & DF_STATUS_READY));
-				Dataflash_ToggleSelectedChipCS();
-			}
-
-			/** Sends a set of page and buffer address bytes to the currently selected dataflash IC, for use with
-			 *  dataflash commands which require a complete 24-bit address.
-			 *
-			 *  \param[in] PageAddress  Page address within the selected dataflash IC
-			 *  \param[in] BufferByte   Address within the dataflash's buffer
-			 */
-			static inline void Dataflash_SendAddressBytes(uint16_t PageAddress,
-			                                              const uint16_t BufferByte)
-			{
-				Dataflash_SendByte(PageAddress >> 6);
-				Dataflash_SendByte((PageAddress << 2) | (BufferByte >> 8));
-				Dataflash_SendByte(BufferByte);
-			}
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/STK525/Joystick.h b/NativePrograms/LUFA/Drivers/Board/AVR8/STK525/Joystick.h
deleted file mode 100644
index 2df24e884c..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/STK525/Joystick.h
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific joystick driver header for the Atmel STK525.
- *  \copydetails Group_Joystick_STK525
- *
- *  \note This file should not be included directly. It is automatically included as needed by the joystick driver
- *        dispatch header located in LUFA/Drivers/Board/Joystick.h.
- */
-
-/** \ingroup Group_Joystick
- *  \defgroup Group_Joystick_STK525 STK525
- *  \brief Board specific joystick driver header for the Atmel STK525.
- *
- *  Board specific joystick driver header for the Atmel STK525.
- *
- *  <table>
- *    <tr><th>Left Port Pin</th><th>Up Port Pin</th><th>Right Port Pin</th><th>Down Port Pin</th><th>Press Port Pin</th></tr>
- *    <tr><td>PORTB.6</td><td>PORTB.7</td><td>PORTE.4</td><td>PORTE.5</td><td>PORTB.5</td></tr>
- *  </table>
- *
- *  @{
- */
-
-#ifndef __JOYSTICK_STK525_H__
-#define __JOYSTICK_STK525_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_JOYSTICK_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/Joystick.h instead.
-		#endif
-
-	/* Private Interface - For use in library only: */
-	#if !defined(__DOXYGEN__)
-		/* Macros: */
-			#define JOY_BMASK                 ((1 << 5) | (1 << 6) | (1 << 7))
-			#define JOY_EMASK                 ((1 << 4) | (1 << 5))
-
-			#define JOY_PORTE_MASK_SHIFT      1
-	#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Mask for the joystick being pushed in the left direction. */
-			#define JOY_LEFT                  (1 << 6)
-
-			/** Mask for the joystick being pushed in the right direction. */
-			#define JOY_RIGHT                ((1 << 4) >> JOY_PORTE_MASK_SHIFT)
-
-			/** Mask for the joystick being pushed in the upward direction. */
-			#define JOY_UP                    (1 << 7)
-
-			/** Mask for the joystick being pushed in the downward direction. */
-			#define JOY_DOWN                 ((1 << 5) >> JOY_PORTE_MASK_SHIFT)
-
-			/** Mask for the joystick being pushed inward. */
-			#define JOY_PRESS                 (1 << 5)
-
-		/* Inline Functions: */
-		#if !defined(__DOXYGEN__)
-			static inline void Joystick_Init(void)
-			{
-				DDRB  &= ~JOY_BMASK;
-				DDRE  &= ~JOY_EMASK;
-
-				PORTB |=  JOY_BMASK;
-				PORTE |=  JOY_EMASK;
-			}
-
-			static inline void Joystick_Disable(void)
-			{
-				DDRB  &= ~JOY_BMASK;
-				DDRE  &= ~JOY_EMASK;
-
-				PORTB &= ~JOY_BMASK;
-				PORTE &= ~JOY_EMASK;
-			}
-
-			static inline uint8_t Joystick_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
-			static inline uint8_t Joystick_GetStatus(void)
-			{
-				return (((uint8_t)~PINB & JOY_BMASK) | (((uint8_t)~PINE & JOY_EMASK) >> JOY_PORTE_MASK_SHIFT));
-			}
-		#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/STK525/LEDs.h b/NativePrograms/LUFA/Drivers/Board/AVR8/STK525/LEDs.h
deleted file mode 100644
index d654e159c4..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/STK525/LEDs.h
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific LED driver header for the Atmel STK525.
- *  \copydetails Group_LEDs_STK525
- *
- *  \note This file should not be included directly. It is automatically included as needed by the LEDs driver
- *        dispatch header located in LUFA/Drivers/Board/LEDs.h.
- */
-
-/** \ingroup Group_LEDs
- *  \defgroup Group_LEDs_STK525 STK525
- *  \brief Board specific LED driver header for the Atmel STK525.
- *
- *  Board specific LED driver header for the Atmel STK525.
- *
- *  <table>
- *    <tr><th>Name</th><th>Color</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr>
- *    <tr><td>LEDS_LED1</td><td>Green</td><td>General Indicator</td><td>High</td><td>PORTD.4</td></tr>
- *    <tr><td>LEDS_LED2</td><td>Green</td><td>General Indicator</td><td>High</td><td>PORTD.5</td></tr>
- *    <tr><td>LEDS_LED3</td><td>Green</td><td>General Indicator</td><td>High</td><td>PORTD.6</td></tr>
- *    <tr><td>LEDS_LED4</td><td>Green</td><td>General Indicator</td><td>High</td><td>PORTD.7</td></tr>
- *  </table>
- *
- *  @{
- */
-
-#ifndef __LEDS_STK525_H__
-#define __LEDS_STK525_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_LEDS_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/LEDS.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** LED mask for the first LED on the board. */
-			#define LEDS_LED1        (1 << 4)
-
-			/** LED mask for the second LED on the board. */
-			#define LEDS_LED2        (1 << 5)
-
-			/** LED mask for the third LED on the board. */
-			#define LEDS_LED3        (1 << 7)
-
-			/** LED mask for the fourth LED on the board. */
-			#define LEDS_LED4        (1 << 6)
-
-			/** LED mask for all the LEDs on the board. */
-			#define LEDS_ALL_LEDS    (LEDS_LED1 | LEDS_LED2 | LEDS_LED3 | LEDS_LED4)
-
-			/** LED mask for none of the board LEDs. */
-			#define LEDS_NO_LEDS     0
-
-		/* Inline Functions: */
-		#if !defined(__DOXYGEN__)
-			static inline void LEDs_Init(void)
-			{
-				DDRD  |=  LEDS_ALL_LEDS;
-				PORTD &= ~LEDS_ALL_LEDS;
-			}
-
-			static inline void LEDs_Disable(void)
-			{
-				DDRD  &= ~LEDS_ALL_LEDS;
-				PORTD &= ~LEDS_ALL_LEDS;
-			}
-
-			static inline void LEDs_TurnOnLEDs(const uint8_t LEDMask)
-			{
-				PORTD |= LEDMask;
-			}
-
-			static inline void LEDs_TurnOffLEDs(const uint8_t LEDMask)
-			{
-				PORTD &= ~LEDMask;
-			}
-
-			static inline void LEDs_SetAllLEDs(const uint8_t LEDMask)
-			{
-				PORTD = ((PORTD & ~LEDS_ALL_LEDS) | LEDMask);
-			}
-
-			static inline void LEDs_ChangeLEDs(const uint8_t LEDMask,
-			                                   const uint8_t ActiveMask)
-			{
-				PORTD = ((PORTD & ~LEDMask) | ActiveMask);
-			}
-
-			static inline void LEDs_ToggleLEDs(const uint8_t LEDMask)
-			{
-				PIND  = LEDMask;
-			}
-
-			static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT;
-			static inline uint8_t LEDs_GetLEDs(void)
-			{
-				return (PORTD & LEDS_ALL_LEDS);
-			}
-		#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/STK526/Board.h b/NativePrograms/LUFA/Drivers/Board/AVR8/STK526/Board.h
deleted file mode 100644
index cfc983ce5f..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/STK526/Board.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific information header for the Atmel STK526.
- *  \copydetails Group_BoardInfo_STK526
- *
- *  \note This file should not be included directly. It is automatically included as needed by the Board driver
- *        dispatch header located in LUFA/Drivers/Board/Board.h.
- */
-
-/** \ingroup Group_BoardInfo
- *  \defgroup Group_BoardInfo_STK526 STK526
- *  \brief Board specific information header for the Atmel STK526.
- *
- *  Board specific information header for the Atmel STK526.
- *
- *  @{
- */
-
-#ifndef __BOARD_STK526_H__
-#define __BOARD_STK526_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-		#include "../../Buttons.h"
-		#include "../../Dataflash.h"
-		#include "../../Joystick.h"
-		#include "../../LEDs.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_BOARD_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/Board.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Indicates the board has hardware Buttons mounted. */
-			#define BOARD_HAS_BUTTONS
-
-			/** Indicates the board has a hardware Dataflash mounted. */
-			#define BOARD_HAS_DATAFLASH
-
-			/** Indicates the board has a hardware Joystick mounted. */
-			#define BOARD_HAS_JOYSTICK
-
-			/** Indicates the board has hardware LEDs mounted. */
-			#define BOARD_HAS_LEDS
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/STK526/Buttons.h b/NativePrograms/LUFA/Drivers/Board/AVR8/STK526/Buttons.h
deleted file mode 100644
index d55fdca434..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/STK526/Buttons.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific Buttons driver header for the Atmel STK526.
- *  \copydetails Group_Buttons_STK526
- *
- *  \note This file should not be included directly. It is automatically included as needed by the Buttons driver
- *        dispatch header located in LUFA/Drivers/Board/Buttons.h.
- */
-
-/** \ingroup Group_Buttons
- *  \defgroup Group_Buttons_STK526 STK526
- *  \brief Board specific Buttons driver header for the Atmel STK526.
- *
- *  Board specific Buttons driver header for the Atmel STK526.
- *
- *  <table>
- *    <tr><th>Name</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr>
- *    <tr><td>BUTTONS_BUTTON1</td><td>HWB Button</td><td>Low</td><td>PORTD.7</td></tr>
- *  </table>
- *
- *  @{
- */
-
-#ifndef __BUTTONS_STK526_H__
-#define __BUTTONS_STK526_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_BUTTONS_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/Buttons.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Button mask for the first button on the board. */
-			#define BUTTONS_BUTTON1      (1 << 7)
-
-		/* Inline Functions: */
-		#if !defined(__DOXYGEN__)
-			static inline void Buttons_Init(void)
-			{
-				DDRD  &= ~BUTTONS_BUTTON1;
-				PORTD |=  BUTTONS_BUTTON1;
-			}
-
-			static inline void Buttons_Disable(void)
-			{
-				DDRD  &= ~BUTTONS_BUTTON1;
-				PORTD &= ~BUTTONS_BUTTON1;
-			}
-
-			static inline uint8_t Buttons_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
-			static inline uint8_t Buttons_GetStatus(void)
-			{
-				return ((PIND & BUTTONS_BUTTON1) ^ BUTTONS_BUTTON1);
-			}
-		#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/STK526/Dataflash.h b/NativePrograms/LUFA/Drivers/Board/AVR8/STK526/Dataflash.h
deleted file mode 100644
index 58bd3d5d30..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/STK526/Dataflash.h
+++ /dev/null
@@ -1,222 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific Dataflash driver header for the Atmel STK525.
- *  \copydetails Group_Dataflash_STK526
- *
- *  \note This file should not be included directly. It is automatically included as needed by the dataflash driver
- *        dispatch header located in LUFA/Drivers/Board/Dataflash.h.
- */
-
-/** \ingroup Group_Dataflash
- *  \defgroup Group_Dataflash_STK526 STK526
- *  \brief Board specific Dataflash driver header for the Atmel STK525.
- *
- *  Board specific Dataflash driver header for the Atmel STK525.
- *
- *  <table>
- *    <tr><th>Name</th><th>Info</th><th>Select Pin</th><th>SPI Port</th></tr>
- *    <tr><td>DATAFLASH_CHIP1</td><td>AT45DB642D (8MB)</td><td>PORTC.2</td><td>SPI0</td></tr>
- *  </table>
- *
- *  @{
- */
-
-#ifndef __DATAFLASH_STK526_H__
-#define __DATAFLASH_STK526_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-		#include "../../../Misc/AT45DB642D.h"
-		#include "../../../Peripheral/SPI.h"
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_DATAFLASH_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/Dataflash.h instead.
-		#endif
-
-	/* Private Interface - For use in library only: */
-	#if !defined(__DOXYGEN__)
-		/* Macros: */
-			#define DATAFLASH_CHIPCS_MASK                DATAFLASH_CHIP1
-			#define DATAFLASH_CHIPCS_DDR                 DDRC
-			#define DATAFLASH_CHIPCS_PORT                PORTC
-	#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Constant indicating the total number of dataflash ICs mounted on the selected board. */
-			#define DATAFLASH_TOTALCHIPS                 1
-
-			/** Mask for no dataflash chip selected. */
-			#define DATAFLASH_NO_CHIP                    0
-
-			/** Mask for the first dataflash chip selected. */
-			#define DATAFLASH_CHIP1                      (1 << 2)
-
-			/** Internal main memory page size for the board's dataflash IC. */
-			#define DATAFLASH_PAGE_SIZE                  1024
-
-			/** Total number of pages inside the board's dataflash IC. */
-			#define DATAFLASH_PAGES                      8192
-
-		/* Inline Functions: */
-			/** Initializes the dataflash driver so that commands and data may be sent to an attached dataflash IC.
-			 *  The appropriate SPI interface will be automatically configured.
-			 */
-			static inline void Dataflash_Init(void)
-			{
-				DATAFLASH_CHIPCS_DDR  |= DATAFLASH_CHIPCS_MASK;
-				DATAFLASH_CHIPCS_PORT |= DATAFLASH_CHIPCS_MASK;
-
-				SPI_Init(SPI_SPEED_FCPU_DIV_2 | SPI_ORDER_MSB_FIRST | SPI_SCK_LEAD_FALLING | SPI_SAMPLE_TRAILING | SPI_MODE_MASTER);
-			}
-
-			/** Sends a byte to the currently selected dataflash IC, and returns a byte from the dataflash.
-			 *
-			 *  \param[in] Byte  Byte of data to send to the dataflash
-			 *
-			 *  \return Last response byte from the dataflash
-			 */
-			static inline uint8_t Dataflash_TransferByte(const uint8_t Byte) ATTR_ALWAYS_INLINE;
-			static inline uint8_t Dataflash_TransferByte(const uint8_t Byte)
-			{
-				return SPI_TransferByte(Byte);
-			}
-
-			/** Sends a byte to the currently selected dataflash IC, and ignores the next byte from the dataflash.
-			 *
-			 *  \param[in] Byte  Byte of data to send to the dataflash
-			 */
-			static inline void Dataflash_SendByte(const uint8_t Byte) ATTR_ALWAYS_INLINE;
-			static inline void Dataflash_SendByte(const uint8_t Byte)
-			{
-				SPI_SendByte(Byte);
-			}
-
-			/** Sends a dummy byte to the currently selected dataflash IC, and returns the next byte from the dataflash.
-			 *
-			 *  \return Last response byte from the dataflash
-			 */
-			static inline uint8_t Dataflash_ReceiveByte(void) ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT;
-			static inline uint8_t Dataflash_ReceiveByte(void)
-			{
-				return SPI_ReceiveByte();
-			}
-
-			/** Determines the currently selected dataflash chip.
-			 *
-			 *  \return Mask of the currently selected Dataflash chip, either \ref DATAFLASH_NO_CHIP if no chip is selected
-			 *          or a DATAFLASH_CHIPn mask (where n is the chip number).
-			 */
-			static inline uint8_t Dataflash_GetSelectedChip(void) ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT;
-			static inline uint8_t Dataflash_GetSelectedChip(void)
-			{
-				return (~DATAFLASH_CHIPCS_PORT & DATAFLASH_CHIPCS_MASK);
-			}
-
-			/** Selects the given dataflash chip.
-			 *
-			 *  \param[in]  ChipMask  Mask of the Dataflash IC to select, in the form of a \c DATAFLASH_CHIPn mask (where n is
-			 *              the chip number).
-			 */
-			static inline void Dataflash_SelectChip(const uint8_t ChipMask) ATTR_ALWAYS_INLINE;
-			static inline void Dataflash_SelectChip(const uint8_t ChipMask)
-			{
-				DATAFLASH_CHIPCS_PORT = ((DATAFLASH_CHIPCS_PORT | DATAFLASH_CHIPCS_MASK) & ~ChipMask);
-			}
-
-			/** Deselects the current dataflash chip, so that no dataflash is selected. */
-			static inline void Dataflash_DeselectChip(void) ATTR_ALWAYS_INLINE;
-			static inline void Dataflash_DeselectChip(void)
-			{
-				Dataflash_SelectChip(DATAFLASH_NO_CHIP);
-			}
-
-			/** Selects a dataflash IC from the given page number, which should range from 0 to
-			 *  ((DATAFLASH_PAGES * DATAFLASH_TOTALCHIPS) - 1). For boards containing only one
-			 *  dataflash IC, this will select DATAFLASH_CHIP1. If the given page number is outside
-			 *  the total number of pages contained in the boards dataflash ICs, all dataflash ICs
-			 *  are deselected.
-			 *
-			 *  \param[in] PageAddress  Address of the page to manipulate, ranging from
-			 *                          0 to ((DATAFLASH_PAGES * DATAFLASH_TOTALCHIPS) - 1).
-			 */
-			static inline void Dataflash_SelectChipFromPage(const uint16_t PageAddress)
-			{
-				Dataflash_DeselectChip();
-
-				if (PageAddress >= DATAFLASH_PAGES)
-				  return;
-
-				Dataflash_SelectChip(DATAFLASH_CHIP1);
-			}
-
-			/** Toggles the select line of the currently selected dataflash IC, so that it is ready to receive
-			 *  a new command.
-			 */
-			static inline void Dataflash_ToggleSelectedChipCS(void)
-			{
-				uint8_t SelectedChipMask = Dataflash_GetSelectedChip();
-
-				Dataflash_DeselectChip();
-				Dataflash_SelectChip(SelectedChipMask);
-			}
-
-			/** Spin-loops while the currently selected dataflash is busy executing a command, such as a main
-			 *  memory page program or main memory to buffer transfer.
-			 */
-			static inline void Dataflash_WaitWhileBusy(void)
-			{
-				Dataflash_ToggleSelectedChipCS();
-				Dataflash_SendByte(DF_CMD_GETSTATUS);
-				while (!(Dataflash_ReceiveByte() & DF_STATUS_READY));
-				Dataflash_ToggleSelectedChipCS();
-			}
-
-			/** Sends a set of page and buffer address bytes to the currently selected dataflash IC, for use with
-			 *  dataflash commands which require a complete 24-bit address.
-			 *
-			 *  \param[in] PageAddress  Page address within the selected dataflash IC
-			 *  \param[in] BufferByte   Address within the dataflash's buffer
-			 */
-			static inline void Dataflash_SendAddressBytes(uint16_t PageAddress,
-			                                              const uint16_t BufferByte)
-			{
-				Dataflash_SendByte(PageAddress >> 5);
-				Dataflash_SendByte((PageAddress << 3) | (BufferByte >> 8));
-				Dataflash_SendByte(BufferByte);
-			}
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/STK526/Joystick.h b/NativePrograms/LUFA/Drivers/Board/AVR8/STK526/Joystick.h
deleted file mode 100644
index 7bd7dd53b9..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/STK526/Joystick.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific joystick driver header for the Atmel STK526.
- *  \copydetails Group_Joystick_STK526
- *
- *  \note This file should not be included directly. It is automatically included as needed by the joystick driver
- *        dispatch header located in LUFA/Drivers/Board/Joystick.h.
- */
-
-/** \ingroup Group_Joystick
- *  \defgroup Group_Joystick_STK526 STK526
- *  \brief Board specific joystick driver header for the Atmel STK526.
- *
- *  Board specific joystick driver header for the Atmel STK526.
- *
- *  <table>
- *    <tr><th>Left Port Pin</th><th>Up Port Pin</th><th>Right Port Pin</th><th>Down Port Pin</th><th>Press Port Pin</th></tr>
- *    <tr><td>PORTB.4</td><td>PORTB.5</td><td>PORTB.6</td><td>PORTB.7</td><td>PORTB.0</td></tr>
- *  </table>
- *
- *  @{
- */
-
-#ifndef __JOYSTICK_STK526_H__
-#define __JOYSTICK_STK526_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_JOYSTICK_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/Joystick.h instead.
-		#endif
-
-	/* Private Interface - For use in library only: */
-	#if !defined(__DOXYGEN__)
-		/* Macros: */
-			#define JOY_BMASK                 ((1 << 0) | (1 << 4) | (1 << 5) | (1 << 6) | (1 << 7))
-	#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Mask for the joystick being pushed in the left direction. */
-			#define JOY_LEFT                  (1 << 4)
-
-			/** Mask for the joystick being pushed in the right direction. */
-			#define JOY_RIGHT                 (1 << 6)
-
-			/** Mask for the joystick being pushed in the upward direction. */
-			#define JOY_UP                    (1 << 5)
-
-			/** Mask for the joystick being pushed in the downward direction. */
-			#define JOY_DOWN                  (1 << 7)
-
-			/** Mask for the joystick being pushed inward. */
-			#define JOY_PRESS                 (1 << 0)
-
-		/* Inline Functions: */
-		#if !defined(__DOXYGEN__)
-			static inline void Joystick_Init(void)
-			{
-				DDRB  &= ~JOY_BMASK;
-
-				PORTB |=  JOY_BMASK;
-			}
-
-			static inline void Joystick_Disable(void)
-			{
-				DDRB  &= ~JOY_BMASK;
-
-				PORTB &= ~JOY_BMASK;
-			}
-
-			static inline uint8_t Joystick_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
-			static inline uint8_t Joystick_GetStatus(void)
-			{
-				return ((uint8_t)~PINB & JOY_BMASK);
-			}
-		#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/STK526/LEDs.h b/NativePrograms/LUFA/Drivers/Board/AVR8/STK526/LEDs.h
deleted file mode 100644
index e7b165d0be..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/STK526/LEDs.h
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific LED driver header for the Atmel STK526.
- *  \copydetails Group_LEDs_STK526
- *
- *  \note This file should not be included directly. It is automatically included as needed by the LEDs driver
- *        dispatch header located in LUFA/Drivers/Board/LEDs.h.
- */
-
-/** \ingroup Group_LEDs
- *  \defgroup Group_LEDs_STK526 STK526
- *  \brief Board specific LED driver header for the Atmel STK526.
- *
- *  Board specific LED driver header for the Atmel STK526.
- *
- *  <table>
- *    <tr><th>Name</th><th>Color</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr>
- *    <tr><td>LEDS_LED1</td><td>Green</td><td>General Indicator</td><td>High</td><td>PORTD.1</td></tr>
- *    <tr><td>LEDS_LED2</td><td>Green</td><td>General Indicator</td><td>High</td><td>PORTD.0</td></tr>
- *    <tr><td>LEDS_LED3</td><td>Green</td><td>General Indicator</td><td>High</td><td>PORTD.5</td></tr>
- *    <tr><td>LEDS_LED4</td><td>Green</td><td>General Indicator</td><td>High</td><td>PORTD.4</td></tr>
- *  </table>
- *
- *  @{
- */
-
-#ifndef __LEDS_STK526_H__
-#define __LEDS_STK526_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_LEDS_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/LEDS.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** LED mask for the first LED on the board. */
-			#define LEDS_LED1        (1 << 1)
-
-			/** LED mask for the second LED on the board. */
-			#define LEDS_LED2        (1 << 0)
-
-			/** LED mask for the third LED on the board. */
-			#define LEDS_LED3        (1 << 5)
-
-			/** LED mask for the fourth LED on the board. */
-			#define LEDS_LED4        (1 << 4)
-
-			/** LED mask for all the LEDs on the board. */
-			#define LEDS_ALL_LEDS    (LEDS_LED1 | LEDS_LED2 | LEDS_LED3 | LEDS_LED4)
-
-			/** LED mask for none of the board LEDs. */
-			#define LEDS_NO_LEDS     0
-
-		/* Inline Functions: */
-		#if !defined(__DOXYGEN__)
-			static inline void LEDs_Init(void)
-			{
-				DDRD  |=  LEDS_ALL_LEDS;
-				PORTD &= ~LEDS_ALL_LEDS;
-			}
-
-			static inline void LEDs_Disable(void)
-			{
-				DDRD  &= ~LEDS_ALL_LEDS;
-				PORTD &= ~LEDS_ALL_LEDS;
-			}
-
-			static inline void LEDs_TurnOnLEDs(const uint8_t LEDMask)
-			{
-				PORTD |= LEDMask;
-			}
-
-			static inline void LEDs_TurnOffLEDs(const uint8_t LEDMask)
-			{
-				PORTD &= ~LEDMask;
-			}
-
-			static inline void LEDs_SetAllLEDs(const uint8_t LEDMask)
-			{
-				PORTD = ((PORTD & ~LEDS_ALL_LEDS) | LEDMask);
-			}
-
-			static inline void LEDs_ChangeLEDs(const uint8_t LEDMask,
-			                                   const uint8_t ActiveMask)
-			{
-				PORTD = ((PORTD & ~LEDMask) | ActiveMask);
-			}
-
-			static inline void LEDs_ToggleLEDs(const uint8_t LEDMask)
-			{
-				PIND  = LEDMask;
-			}
-
-			static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT;
-			static inline uint8_t LEDs_GetLEDs(void)
-			{
-				return (PORTD & LEDS_ALL_LEDS);
-			}
-		#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/TEENSY/Board.h b/NativePrograms/LUFA/Drivers/Board/AVR8/TEENSY/Board.h
deleted file mode 100644
index acd68b3815..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/TEENSY/Board.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific information header for the PJRC Teensy 1.x/2.x boards.
- *  \copydetails Group_BoardInfo_TEENSY
- *
- *  \note This file should not be included directly. It is automatically included as needed by the Board driver
- *        dispatch header located in LUFA/Drivers/Board/Board.h.
- */
-
-/** \ingroup Group_BoardInfo
- *  \defgroup Group_BoardInfo_TEENSY2 TEENSY2
- *  \brief Board specific information header for the PJRC Teensy 2 boards.
- *
- *  See \ref Group_BoardInfo_TEENSY for more details.
- */
-
-/** \ingroup Group_BoardInfo
- *  \defgroup Group_BoardInfo_TEENSY TEENSY
- *  \brief Board specific information header for the PJRC Teensy 1.x/2.x boards.
- *
- *  Board specific information header for the PJRC Teensy boards (http://www.pjrc.com/teensy/index.html).
- *
- *  @{
- */
-
-#ifndef __BOARD_TEENSY_H__
-#define __BOARD_TEENSY_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-		#include "../../LEDs.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_BOARD_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/Board.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Indicates the board has hardware LEDs mounted. */
-			#define BOARD_HAS_LEDS
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/TEENSY/LEDs.h b/NativePrograms/LUFA/Drivers/Board/AVR8/TEENSY/LEDs.h
deleted file mode 100644
index 4e6de95be5..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/TEENSY/LEDs.h
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific LED driver header for the PJRC Teensy 1.x/2.x boards.
- *  \copydetails Group_LEDs_TEENSY
- *
- *  \note This file should not be included directly. It is automatically included as needed by the LEDs driver
- *        dispatch header located in LUFA/Drivers/Board/LEDs.h.
- */
-
-/** \ingroup Group_LEDs
- *  \defgroup Group_LEDs_TEENSY2 TEENSY2
- *  \brief Board specific LED driver header for the PJRC Teensy 2 boards.
- *
- *  See \ref Group_LEDs_TEENSY for more details.
- */
-
-/** \ingroup Group_LEDs
- *  \defgroup Group_LEDs_TEENSY TEENSY
- *  \brief Board specific LED driver header for the PJRC Teensy 1.x/2.x boards.
- *
- *  \note For version 2 Teensy boards, compile with <code>BOARD = TEENSY2</code>.
- *
- *  Board specific LED driver header for the PJRC Teensy boards (http://www.pjrc.com/teensy/index.html).
- *
- *  <b>TEENSY</b>:
- *  <table>
- *    <tr><th>Name</th><th>Color</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr>
- *    <tr><td>LEDS_LED1</td><td>Green</td><td>General Indicator</td><td>High</td><td>PORTD.6</td></tr>
- *  </table>
- *
- *  <b>TEENSY2</b>:
- *  <table>
- *    <tr><th>Name</th><th>Color</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr>
- *    <tr><td>LEDS_LED1</td><td>Green</td><td>General Indicator</td><td>Low</td><td>PORTD.6</td></tr>
- *  </table>
- *
- *  @{
- */
-
-#ifndef __LEDS_TEENSY_H__
-#define __LEDS_TEENSY_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_LEDS_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/LEDS.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** LED mask for the first LED on the board. */
-			#define LEDS_LED1        (1 << 6)
-
-			/** LED mask for all the LEDs on the board. */
-			#define LEDS_ALL_LEDS    LEDS_LED1
-
-			/** LED mask for none of the board LEDs. */
-			#define LEDS_NO_LEDS     0
-
-		/* Inline Functions: */
-		#if !defined(__DOXYGEN__)
-			static inline void LEDs_Init(void)
-			{
-				DDRD  |= LEDS_ALL_LEDS;
-
-				#if (BOARD == BOARD_TEENSY2)
-				PORTD &= ~LEDS_ALL_LEDS;
-				#else
-				PORTD |=  LEDS_ALL_LEDS;
-				#endif
-			}
-
-			static inline void LEDs_Disable(void)
-			{
-				DDRD  &= ~LEDS_ALL_LEDS;
-				PORTD &= ~LEDS_ALL_LEDS;
-			}
-
-			static inline void LEDs_TurnOnLEDs(const uint8_t LEDMask)
-			{
-				#if (BOARD == BOARD_TEENSY2)
-				PORTD |=  LEDMask;
-				#else
-				PORTD &= ~LEDMask;
-				#endif
-			}
-
-			static inline void LEDs_TurnOffLEDs(const uint8_t LEDMask)
-			{
-				#if (BOARD == BOARD_TEENSY2)
-				PORTD &= ~LEDMask;
-				#else
-				PORTD |=  LEDMask;
-				#endif
-			}
-
-			static inline void LEDs_SetAllLEDs(const uint8_t LEDMask)
-			{
-				#if (BOARD == BOARD_TEENSY2)
-				PORTD = ((PORTD & ~LEDS_ALL_LEDS) | LEDMask);
-				#else
-				PORTD = ((PORTD | LEDS_ALL_LEDS) & ~LEDMask);
-				#endif
-			}
-
-			static inline void LEDs_ChangeLEDs(const uint8_t LEDMask,
-			                                   const uint8_t ActiveMask)
-			{
-				#if (BOARD == BOARD_TEENSY2)
-				PORTD = ((PORTD & ~LEDMask) | ActiveMask);
-				#else
-				PORTD = ((PORTD | LEDMask) & ~ActiveMask);
-				#endif
-			}
-
-			static inline void LEDs_ToggleLEDs(const uint8_t LEDMask)
-			{
-				PIND  = LEDMask;
-			}
-
-			static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT;
-			static inline uint8_t LEDs_GetLEDs(void)
-			{
-				#if (BOARD == BOARD_TEENSY2)
-				return (PORTD & LEDS_ALL_LEDS);
-				#else
-				return (~PORTD & LEDS_ALL_LEDS);
-				#endif
-			}
-		#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/TUL/Board.h b/NativePrograms/LUFA/Drivers/Board/AVR8/TUL/Board.h
deleted file mode 100644
index 85fa21603a..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/TUL/Board.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2019.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2019  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific information header for the TUL.
- *  \copydetails Group_BoardInfo_TUL
- *
- *  \note This file should not be included directly. It is automatically included as needed by the Board driver
- *        dispatch header located in LUFA/Drivers/Board/Board.h.
- */
-
-/** \ingroup Group_BoardInfo
- *  \defgroup Group_BoardInfo_TUL TUL
- *  \brief Board specific information header for the TUL.
- *
- *  Board specific information header for the Busware TUL (http://www.busware.de/tiki-index.php?page=TUL).
- *
- *  @{
- */
-
-#ifndef __BOARD_TUL_H__
-#define __BOARD_TUL_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-		#include "../../Buttons.h"
-		#include "../../LEDs.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_BOARD_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/Board.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Indicates the board has hardware Buttons mounted. */
-			#define BOARD_HAS_BUTTONS
-
-			/** Indicates the board has hardware LEDs mounted. */
-			#define BOARD_HAS_LEDS
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/TUL/Buttons.h b/NativePrograms/LUFA/Drivers/Board/AVR8/TUL/Buttons.h
deleted file mode 100644
index b834011ecf..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/TUL/Buttons.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2019.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2019  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific Buttons driver header for the TUL.
- *  \copydetails Group_Buttons_TUL
- *
- *  \note This file should not be included directly. It is automatically included as needed by the Buttons driver
- *        dispatch header located in LUFA/Drivers/Board/Buttons.h.
- */
-
-/** \ingroup Group_Buttons
- *  \defgroup Group_Buttons_TUL TUL
- *  \brief Board specific Buttons driver header for the TUL.
- *
- *  Board specific Buttons driver header for the Busware TUL (http://www.busware.de/tiki-index.php?page=TUL).
- *
- *  <table>
- *    <tr><th>Name</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr>
- *    <tr><td>BUTTONS_BUTTON1</td><td>HWB Button</td><td>Low</td><td>PORTE.2</td></tr>
- *  </table>
- *
- *  @{
- */
-
-#ifndef __BUTTONS_TUL_H__
-#define __BUTTONS_TUL_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_BUTTONS_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/Buttons.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Button mask for the first button on the board. */
-			#define BUTTONS_BUTTON1      (1 << 2)
-
-		/* Inline Functions: */
-		#if !defined(__DOXYGEN__)
-			static inline void Buttons_Init(void)
-			{
-				DDRE  &= ~BUTTONS_BUTTON1;
-				PORTE |=  BUTTONS_BUTTON1;
-			}
-
-			static inline void Buttons_Disable(void)
-			{
-				DDRE  &= ~BUTTONS_BUTTON1;
-				PORTE &= ~BUTTONS_BUTTON1;
-			}
-
-			static inline uint8_t Buttons_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
-			static inline uint8_t Buttons_GetStatus(void)
-			{
-				return ((PINE & BUTTONS_BUTTON1) ^ BUTTONS_BUTTON1);
-			}
-		#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/TUL/LEDs.h b/NativePrograms/LUFA/Drivers/Board/AVR8/TUL/LEDs.h
deleted file mode 100644
index 7b0bec050b..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/TUL/LEDs.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2019.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2019  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific LED driver header for the Busware TUL.
- *  \copydetails Group_LEDs_TUL
- *
- *  \note This file should not be included directly. It is automatically included as needed by the LEDs driver
- *        dispatch header located in LUFA/Drivers/Board/LEDs.h.
- */
-
-/** \ingroup Group_LEDs
- *  \defgroup Group_LEDs_TUL TUL
- *  \brief Board specific LED driver header for the Busware TUL.
- *
- *  Board specific LED driver header for the Busware TUL (http://www.busware.de/tiki-index.php?page=TUL).
- *
- *  <table>
- *    <tr><th>Name</th><th>Color</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr>
- *    <tr><td>LEDS_LED1</td><td>Green</td><td>General Indicator</td><td>High</td><td>PORTF.0</td></tr>
- *  </table>
- *
- *  @{
- */
-
-#ifndef __LEDS_TUL_H__
-#define __LEDS_TUL_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_LEDS_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/LEDS.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** LED mask for the first LED on the board. */
-			#define LEDS_LED1        (1 << 0)
-
-			/** LED mask for all the LEDs on the board. */
-			#define LEDS_ALL_LEDS    LEDS_LED1
-
-			/** LED mask for the none of the board LEDs. */
-			#define LEDS_NO_LEDS     0
-
-		/* Inline Functions: */
-		#if !defined(__DOXYGEN__)
-			static inline void LEDs_Init(void)
-			{
-				DDRF  |=  LEDS_ALL_LEDS;
-				PORTF &= ~LEDS_ALL_LEDS;
-			}
-
-			static inline void LEDs_Disable(void)
-			{
-				DDRF  &= ~LEDS_ALL_LEDS;
-				PORTF &= ~LEDS_ALL_LEDS;
-			}
-
-			static inline void LEDs_TurnOnLEDs(const uint8_t LEDMask)
-			{
-				PORTF |= LEDMask;
-			}
-
-			static inline void LEDs_TurnOffLEDs(const uint8_t LEDMask)
-			{
-				PORTF &= ~LEDMask;
-			}
-
-			static inline void LEDs_SetAllLEDs(const uint8_t LEDMask)
-			{
-				PORTF = ((PORTF & ~LEDS_ALL_LEDS) | LEDMask);
-			}
-
-			static inline void LEDs_ChangeLEDs(const uint8_t LEDMask,
-			                                   const uint8_t ActiveMask)
-			{
-				PORTF = ((PORTF & ~LEDMask) | ActiveMask);
-			}
-
-			static inline void LEDs_ToggleLEDs(const uint8_t LEDMask)
-			{
-				PINF  = LEDMask;
-			}
-
-			static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT;
-			static inline uint8_t LEDs_GetLEDs(void)
-			{
-				return (PORTF & LEDS_ALL_LEDS);
-			}
-		#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/U2S/Board.h b/NativePrograms/LUFA/Drivers/Board/AVR8/U2S/Board.h
deleted file mode 100644
index 742c368146..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/U2S/Board.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2019.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2019  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific information header for the U2S.
- *  \copydetails Group_BoardInfo_U2S
- *
- *  \note This file should not be included directly. It is automatically included as needed by the Board driver
- *        dispatch header located in LUFA/Drivers/Board/Board.h.
- */
-
-/** \ingroup Group_BoardInfo
- *  \defgroup Group_BoardInfo_U2S U2S
- *  \brief Board specific information header for the U2S.
- *
- *  Board specific information header for the U2S (http://sites.google.com/site/megau2s/).
- *
- *  @{
- */
-
-#ifndef __BOARD_U2S__
-#define __BOARD_U2S__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-		#include "../../Buttons.h"
-		#include "../../LEDs.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_BOARD_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/Board.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Indicates the board has a hardware Buttons mounted. */
-			#define BOARD_HAS_BUTTONS
-
-			/** Indicates the board has a hardware LEDs mounted. */
-			#define BOARD_HAS_LEDS
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/U2S/Buttons.h b/NativePrograms/LUFA/Drivers/Board/AVR8/U2S/Buttons.h
deleted file mode 100644
index 123d9d42e5..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/U2S/Buttons.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2019.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2019  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific Buttons driver header for the U2S.
- *  \copydetails Group_Buttons_U2S
- *
- *  \note This file should not be included directly. It is automatically included as needed by the Buttons driver
- *        dispatch header located in LUFA/Drivers/Board/Buttons.h.
- */
-
-/** \ingroup Group_Buttons
- *  \defgroup Group_Buttons_U2S U2S
- *  \brief Board specific Buttons driver header for the U2S.
- *
- *  Board specific Buttons driver header for the U2S (http://sites.google.com/site/megau2s/).
- *
- *  <table>
- *    <tr><th>Name</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr>
- *    <tr><td>BUTTONS_BUTTON1</td><td>HWB Button</td><td>Low</td><td>PORTC.4</td></tr>
- *  </table>
- *
- *  @{
- */
-
-#ifndef __BUTTONS_U2S__
-#define __BUTTONS_U2S__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_BUTTONS_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/Buttons.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Button mask for the first button on the board. */
-			#define BUTTONS_BUTTON1      (1 << 4)
-
-		/* Inline Functions: */
-		#if !defined(__DOXYGEN__)
-			static inline void Buttons_Init(void)
-			{
-				DDRC  &= ~BUTTONS_BUTTON1;
-				PORTC |=  BUTTONS_BUTTON1;
-			}
-
-			static inline void Buttons_Disable(void)
-			{
-				DDRC  &= ~BUTTONS_BUTTON1;
-				PORTC &= ~BUTTONS_BUTTON1;
-			}
-
-			static inline uint8_t Buttons_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
-			static inline uint8_t Buttons_GetStatus(void)
-			{
-				return ((PINC & BUTTONS_BUTTON1) ^ BUTTONS_BUTTON1);
-			}
-		#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/U2S/LEDs.h b/NativePrograms/LUFA/Drivers/Board/AVR8/U2S/LEDs.h
deleted file mode 100644
index 2572a72210..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/U2S/LEDs.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2019.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2019  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific LED driver header for the U2S.
- *  \copydetails Group_LEDs_U2S
- *
- *  \note This file should not be included directly. It is automatically included as needed by the LEDs driver
- *        dispatch header located in LUFA/Drivers/Board/LEDs.h.
- */
-
-/** \ingroup Group_LEDs
- *  \defgroup Group_LEDs_U2S U2S
- *  \brief Board specific LED driver header for the U2S.
- *
- *  Board specific LED driver header for the U2S (http://sites.google.com/site/megau2s/).
- *
- *  <table>
- *    <tr><th>Name</th><th>Color</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr>
- *    <tr><td>LEDS_LED1</td><td>Red</td><td>General Indicator</td><td>Low</td><td>PORTC.2</td></tr>
- *  </table>
- *
- *  @{
- */
-
-#ifndef __LEDS_U2S__
-#define __LEDS_U2S__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_LEDS_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/LEDS.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** LED mask for the first LED on the board. */
-			#define LEDS_LED1        (1 << 2)
-
-			/** LED mask for all the LEDs on the board. */
-			#define LEDS_ALL_LEDS    LEDS_LED1
-
-			/** LED mask for none of the board LEDs. */
-			#define LEDS_NO_LEDS     0
-
-		/* Inline Functions: */
-		#if !defined(__DOXYGEN__)
-			static inline void LEDs_Init(void)
-			{
-				DDRC  |= LEDS_ALL_LEDS;
-				PORTC |= LEDS_ALL_LEDS;
-			}
-
-			static inline void LEDs_Disable(void)
-			{
-				DDRC  &= ~LEDS_ALL_LEDS;
-				PORTC &= ~LEDS_ALL_LEDS;
-			}
-
-			static inline void LEDs_TurnOnLEDs(const uint8_t LEDMask)
-			{
-				PORTC &= ~LEDMask;
-			}
-
-			static inline void LEDs_TurnOffLEDs(const uint8_t LEDMask)
-			{
-				PORTC |= LEDMask;
-			}
-
-			static inline void LEDs_SetAllLEDs(const uint8_t LEDMask)
-			{
-				PORTC = ((PORTC | LEDS_ALL_LEDS) & ~LEDMask);
-			}
-
-			static inline void LEDs_ChangeLEDs(const uint8_t LEDMask,
-			                                   const uint8_t ActiveMask)
-			{
-				PORTC = ((PORTC | LEDMask) & ~ActiveMask);
-			}
-
-			static inline void LEDs_ToggleLEDs(const uint8_t LEDMask)
-			{
-				PINC  = LEDMask;
-			}
-
-			static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT;
-			static inline uint8_t LEDs_GetLEDs(void)
-			{
-				return (~PORTC & LEDS_ALL_LEDS);
-			}
-		#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/UDIP/Board.h b/NativePrograms/LUFA/Drivers/Board/AVR8/UDIP/Board.h
deleted file mode 100644
index 469c73cdcc..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/UDIP/Board.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2019.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2019  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific information header for the UDIP.
- *  \copydetails Group_BoardInfo_UDIP
- *
- *  \note This file should not be included directly. It is automatically included as needed by the Board driver
- *        dispatch header located in LUFA/Drivers/Board/Board.h.
- */
-
-/** \ingroup Group_BoardInfo
- *  \defgroup Group_BoardInfo_UDIP UDIP
- *  \brief Board specific information header for the UDIP.
- *
- *  Board specific information header for the Linnix UDIP (http://linnix.com/udip/).
- *
- *  @{
- */
-
-#ifndef __BOARD_UDIP_H__
-#define __BOARD_UDIP_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-		#include "../../Buttons.h"
-		#include "../../LEDs.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_BOARD_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/Board.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Indicates the board has hardware Buttons mounted. */
-			#define BOARD_HAS_BUTTONS
-
-			/** Indicates the board has hardware LEDs mounted. */
-			#define BOARD_HAS_LEDS
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/UDIP/Buttons.h b/NativePrograms/LUFA/Drivers/Board/AVR8/UDIP/Buttons.h
deleted file mode 100644
index 5a116bf0ba..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/UDIP/Buttons.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2019.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2019  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific Buttons driver header for the UDIP.
- *  \copydetails Group_Buttons_UDIP
- *
- *  \note This file should not be included directly. It is automatically included as needed by the Buttons driver
- *        dispatch header located in LUFA/Drivers/Board/Buttons.h.
- */
-
-/** \ingroup Group_Buttons
- *  \defgroup Group_Buttons_UDIP UDIP
- *  \brief Board specific Buttons driver header for the UDIP.
- *
- *  Board specific Buttons driver header for the Linnix UDIP (http://linnix.com/udip/).
- *
- *  <table>
- *    <tr><th>Name</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr>
- *    <tr><td>BUTTONS_BUTTON1</td><td>HWB Button</td><td>Low</td><td>PORTD.7</td></tr>
- *  </table>
- *
- *  @{
- */
-
-#ifndef __BUTTONS_UDIP_H__
-#define __BUTTONS_UDIP_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_BUTTONS_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/Buttons.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Button mask for the first button on the board. */
-			#define BUTTONS_BUTTON1      (1 << 7)
-
-		/* Inline Functions: */
-		#if !defined(__DOXYGEN__)
-			static inline void Buttons_Init(void)
-			{
-				DDRD  &= ~BUTTONS_BUTTON1;
-				PORTD |=  BUTTONS_BUTTON1;
-			}
-
-			static inline void Buttons_Disable(void)
-			{
-				DDRD  &= ~BUTTONS_BUTTON1;
-				PORTD &= ~BUTTONS_BUTTON1;
-			}
-
-			static inline uint8_t Buttons_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
-			static inline uint8_t Buttons_GetStatus(void)
-			{
-				return ((PIND & BUTTONS_BUTTON1) ^ BUTTONS_BUTTON1);
-			}
-		#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/UDIP/LEDs.h b/NativePrograms/LUFA/Drivers/Board/AVR8/UDIP/LEDs.h
deleted file mode 100644
index 3b8c56f0ae..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/UDIP/LEDs.h
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2019.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2019  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific LED driver header for the Linnix UDIP.
- *  \copydetails Group_LEDs_UDIP
- *
- *  \note This file should not be included directly. It is automatically included as needed by the LEDs driver
- *        dispatch header located in LUFA/Drivers/Board/LEDs.h.
- */
-
-/** \ingroup Group_LEDs
- *  \defgroup Group_LEDs_UDIP UDIP
- *  \brief Board specific LED driver header for the Linnix UDIP.
- *
- *  Board specific LED driver header for the Linnix UDIP (http://linnix.com/udip/).
- *
- *  <table>
- *    <tr><th>Name</th><th>Color</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr>
- *    <tr><td>LEDS_LED1</td><td>Green</td><td>Bicolor Indicator 1</td><td>High</td><td>PORTB.6</td></tr>
- *    <tr><td>LEDS_LED2</td><td>Red</td><td>Bicolor Indicator 1</td><td>High</td><td>PORTB.5</td></tr>
- *    <tr><td>LEDS_LED3</td><td>Green</td><td>Bicolor Indicator 2</td><td>High</td><td>PORTD.5</td></tr>
- *    <tr><td>LEDS_LED4</td><td>Red</td><td>Bicolor Indicator 2</td><td>High</td><td>PORTD.4</td></tr>
- *  </table>
- *
- *  @{
- */
-
-#ifndef __LEDS_UDIP_H__
-#define __LEDS_UDIP_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_LEDS_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/LEDS.h instead.
-		#endif
-
-	/* Private Interface - For use in library only: */
-	#if !defined(__DOXYGEN__)
-		/* Macros: */
-			#define LEDS_PORTB_LEDS       (LEDS_LED1 | LEDS_LED2)
-			#define LEDS_PORTD_LEDS       (LEDS_LED3 | LEDS_LED4)
-
-			#define LEDS_PORTD_MASK_SHIFT 1
-	#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** LED mask for the first LED on the board. */
-			#define LEDS_LED1        (1 << 6)
-
-			/** LED mask for the second LED on the board. */
-			#define LEDS_LED2        (1 << 5)
-
-			/** LED mask for the third LED on the board. */
-			#define LEDS_LED3        ((1 << 5) >> LEDS_PORTD_MASK_SHIFT)
-
-			/** LED mask for the fourth LED on the board. */
-			#define LEDS_LED4        ((1 << 4) >> LEDS_PORTD_MASK_SHIFT)
-
-			/** LED mask for all the LEDs on the board. */
-			#define LEDS_ALL_LEDS    (LEDS_LED1 | LEDS_LED2 | LEDS_LED3 | LEDS_LED4)
-
-			/** LED mask for none of the board LEDs. */
-			#define LEDS_NO_LEDS     0
-
-		/* Inline Functions: */
-		#if !defined(__DOXYGEN__)
-			static inline void LEDs_Init(void)
-			{
-				DDRB |= LEDS_PORTB_LEDS;
-				DDRD |= (LEDS_PORTD_LEDS << LEDS_PORTD_MASK_SHIFT);
-			}
-
-			static inline void LEDs_Disable(void)
-			{
-				DDRB &= ~LEDS_PORTB_LEDS;
-				DDRD &= ~(LEDS_PORTD_LEDS << LEDS_PORTD_MASK_SHIFT);
-			}
-
-			static inline void LEDs_TurnOnLEDs(const uint8_t LEDMask)
-			{
-				PORTB |= (LEDMask & LEDS_PORTB_LEDS);
-				PORTD |= ((LEDMask & LEDS_PORTD_LEDS) << LEDS_PORTD_MASK_SHIFT);
-			}
-
-			static inline void LEDs_TurnOffLEDs(const uint8_t LEDMask)
-			{
-				PORTB &= ~(LEDMask & LEDS_PORTB_LEDS);
-				PORTD &= ~((LEDMask & LEDS_PORTD_LEDS) << LEDS_PORTD_MASK_SHIFT);
-			}
-
-			static inline void LEDs_SetAllLEDs(const uint8_t LEDMask)
-			{
-				PORTB = (PORTB & ~LEDS_PORTB_LEDS) | (LEDMask & LEDS_PORTB_LEDS);
-				PORTD = (PORTD & ~(LEDS_PORTD_LEDS << LEDS_PORTD_MASK_SHIFT)) |
-				        ((LEDMask & LEDS_PORTD_LEDS) << LEDS_PORTD_MASK_SHIFT);
-			}
-
-			static inline void LEDs_ChangeLEDs(const uint8_t LEDMask,
-			                                   const uint8_t ActiveMask)
-			{
-				PORTB = (PORTB & ~(LEDMask & LEDS_PORTB_LEDS)) | (ActiveMask & LEDS_PORTB_LEDS);
-				PORTD = (PORTD & ~((LEDMask & LEDS_PORTD_LEDS) << LEDS_PORTD_MASK_SHIFT)) |
-				        ((ActiveMask & LEDS_PORTD_LEDS) << LEDS_PORTD_MASK_SHIFT);
-			}
-
-			static inline void LEDs_ToggleLEDs(const uint8_t LEDMask)
-			{
-				PINB  = (LEDMask & LEDS_PORTB_LEDS);
-				PIND  = ((LEDMask & LEDS_PORTD_LEDS) << LEDS_PORTD_MASK_SHIFT);
-			}
-
-			static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT;
-			static inline uint8_t LEDs_GetLEDs(void)
-			{
-				return ((PORTB & LEDS_PORTB_LEDS) | ((PORTD & LEDS_PORTD_LEDS) >> LEDS_PORTD_MASK_SHIFT));
-			}
-		#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/UNO/Board.h b/NativePrograms/LUFA/Drivers/Board/AVR8/UNO/Board.h
deleted file mode 100644
index ea6169acb7..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/UNO/Board.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2019.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2019  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific information header for the Arduino Uno.
- *  \copydetails Group_BoardInfo_UNO
- *
- *  \note This file should not be included directly. It is automatically included as needed by the Board driver
- *        dispatch header located in LUFA/Drivers/Board/Board.h.
- */
-
-/** \ingroup Group_BoardInfo
- *  \defgroup Group_BoardInfo_UNO UNO
- *  \brief Board specific information header for the Arduino Uno.
- *
- *  Board specific information header for the Arduino Uno (http://arduino.cc/en/Main/ArduinoBoardUno).
- *
- *  @{
- */
-
-#ifndef __BOARD_UNO_H__
-#define __BOARD_UNO_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-		#include "../../LEDs.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_BOARD_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/Board.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Indicates the board has hardware LEDs mounted. */
-			#define BOARD_HAS_LEDS
-
-			/** Pin that can reset the main MCU. */
-			#define AVR_RESET_LINE_PORT  PORTD
-			#define AVR_RESET_LINE_DDR   DDRD
-			#define AVR_RESET_LINE_PIN   PIND
-			#define AVR_RESET_LINE_MASK  (1 << PD7)
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/UNO/LEDs.h b/NativePrograms/LUFA/Drivers/Board/AVR8/UNO/LEDs.h
deleted file mode 100644
index ffd6d4c065..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/UNO/LEDs.h
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2019.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2019  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific LED driver header for the Arduino Uno.
- *  \copydetails Group_LEDs_UNO
- *
- *  \note This file should not be included directly. It is automatically included as needed by the LEDs driver
- *        dispatch header located in LUFA/Drivers/Board/LEDs.h.
- */
-
-/** \ingroup Group_LEDs
- *  \defgroup Group_LEDs_UNO UNO
- *  \brief Board specific LED driver header for the Arduino Uno.
- *
- *  Board specific LED driver header for the Arduino Uno (http://arduino.cc/en/Main/ArduinoBoardUno).
- *
- *  <table>
- *    <tr><th>Name</th><th>Color</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr>
- *    <tr><td>LEDS_LED1</td><td>Yellow</td><td>RX</td><td>Low</td><td>PORTD.5</td></tr>
- *    <tr><td>LEDS_LED2</td><td>Yellow</td><td>TX</td><td>Low</td><td>PORTD.4</td></tr>
- *  </table>
- *
- *  @{
- */
-
-#ifndef __LEDS_UNO_H__
-#define __LEDS_UNO_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_LEDS_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/LEDS.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** LED mask for the first LED on the board. */
-			#define LEDS_LED1        (1 << 5)
-
-			/** LED mask for the second LED on the board. */
-			#define LEDS_LED2        (1 << 4)
-
-			/** LED mask for all the LEDs on the board. */
-			#define LEDS_ALL_LEDS    (LEDS_LED1 | LEDS_LED2)
-
-			/** LED mask for none of the board LEDs. */
-			#define LEDS_NO_LEDS     0
-
-			/** LED mask for the library LED driver, to indicate TX activity. */
-			#define LEDMASK_TX       LEDS_LED1
-
-			/** LED mask for the library LED driver, to indicate RX activity. */
-			#define LEDMASK_RX       LEDS_LED2
-
-		/* Inline Functions: */
-		#if !defined(__DOXYGEN__)
-			static inline void LEDs_Init(void)
-			{
-				DDRD  |= LEDS_ALL_LEDS;
-				PORTD |= LEDS_ALL_LEDS;
-			}
-
-			static inline void LEDs_Disable(void)
-			{
-				DDRD  &= ~LEDS_ALL_LEDS;
-				PORTD |= LEDS_ALL_LEDS;
-			}
-
-			static inline void LEDs_TurnOnLEDs(const uint8_t LEDMask)
-			{
-				PORTD &= ~LEDMask;
-			}
-
-			static inline void LEDs_TurnOffLEDs(const uint8_t LEDMask)
-			{
-				PORTD |= LEDMask;
-			}
-
-			static inline void LEDs_SetAllLEDs(const uint8_t LEDMask)
-			{
-				PORTD = ((PORTD | LEDS_ALL_LEDS) & ~LEDMask);
-			}
-
-			static inline void LEDs_ChangeLEDs(const uint8_t LEDMask,
-			                                   const uint8_t ActiveMask)
-			{
-				PORTD = ((PORTD | LEDMask) & ~ActiveMask);
-			}
-
-			static inline void LEDs_ToggleLEDs(const uint8_t LEDMask)
-			{
-				PIND  = LEDMask;
-			}
-
-			static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT;
-			static inline uint8_t LEDs_GetLEDs(void)
-			{
-				return (~PORTD & LEDS_ALL_LEDS);
-			}
-		#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/USB2AX/Board.h b/NativePrograms/LUFA/Drivers/Board/AVR8/USB2AX/Board.h
deleted file mode 100644
index c79552df0f..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/USB2AX/Board.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2019.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2019  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific LED driver header for the Xevelabs USB2AX.
- *  \copydetails Group_BoardInfo_USB2AX
- *
- *  \note This file should not be included directly. It is automatically included as needed by the Board driver
- *        dispatch header located in LUFA/Drivers/Board/Board.h.
- */
-
-/** \ingroup Group_BoardInfo
- *  \defgroup Group_BoardInfo_USB2AX_V31 USB2AX_V31
- *  \brief Board specific information header for the Xevelabs USB2AX revision 3.1.
- *
- *  See \ref Group_BoardInfo_USB2AX for more details.
- */
-
-/** \ingroup Group_BoardInfo
- *  \defgroup Group_BoardInfo_USB2AX_V3 USB2AX_V3
- *  \brief Board specific information header for the Xevelabs USB2AX revision 3.
- *
- *  See \ref Group_BoardInfo_USB2AX for more details.
- */
-
-/** \ingroup Group_BoardInfo
- *  \defgroup Group_BoardInfo_USB2AX USB2AX
- *  \brief Board specific information header for the Xevelabs USB2AX.
- *
- *  Board specific information header for the Xevelabs USB2AX (http://paranoidstudio.assembla.com/wiki/show/paranoidstudio/USB2AX).
- *
- *  @{
- */
-
-#ifndef __BOARD_USB2AX_H__
-#define __BOARD_USB2AX_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-		#include "../../Buttons.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_BOARD_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/Board.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			#if (BOARD == BOARD_USB2AX) || (BOARD == BOARD_USB2AX_V3) || \
-			    defined(__DOXYGEN__)
-				#include "../../Buttons.h"
-
-				/** Indicates the board has hardware Buttons mounted. */
-				#define BOARD_HAS_BUTTONS
-			#endif
-
-			#if ((BOARD == BOARD_USB2AX) || (BOARD == BOARD_USB2AX_V3) || \
-			     (BOARD == BOARD_USB2AX_V31) || defined(__DOXYGEN__))
-				#include "../../LEDs.h"
-
-				/** Indicates the board has hardware LEDs mounted. */
-				#define BOARD_HAS_LEDS
-			#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/USB2AX/Buttons.h b/NativePrograms/LUFA/Drivers/Board/AVR8/USB2AX/Buttons.h
deleted file mode 100644
index f95e31348b..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/USB2AX/Buttons.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2019.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2019  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific Buttons driver header for the Xevelabs USB2AX.
- *  \copydetails Group_Buttons_USB2AX
- *
- *  \note This file should not be included directly. It is automatically included as needed by the Buttons driver
- *        dispatch header located in LUFA/Drivers/Board/Buttons.h.
- */
-
-/** \ingroup Group_Buttons
- *  \defgroup Group_Buttons_USB2AX_V31 USB2AX_V31
- *  \brief Board specific Button driver header for the Xevelabs USB2AX revision 3.1.
- *
- *  See \ref Group_Buttons_USB2AX for more details.
- */
-
-/** \ingroup Group_Buttons
- *  \defgroup Group_Buttons_USB2AX_V3 USB2AX_V3
- *  \brief Board specific Button driver header for the Xevelabs USB2AX revision 3.
- *
- *  See \ref Group_Buttons_USB2AX for more details.
- */
-
-/** \ingroup Group_Buttons
- *  \defgroup Group_Buttons_USB2AX USB2AX
- *  \brief Board specific Buttons driver header for the Xevelabs USB2AX revisions 1 and 2.
- *
- *  \note For version 3 USB2AX boards, compile with <code>BOARD = USB2AX_V3</code> and for version 3.1, with <code>BOARD = USB2AX_V31</code>.
- *
- *  Board specific Buttons driver header for the Paranoid Studio USB2AX (http://paranoidstudio.assembla.com/wiki/show/paranoidstudio/USB2AX).
- *
- *  <table>
- *    <tr><th>Name</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr>
- *    <tr><td>BUTTONS_BUTTON1</td><td>HWB Button</td><td>Low</td><td>PORTD.7</td></tr>
- *  </table>
- *
- *  @{
- */
-
-#ifndef __BUTTONS_USB2AX_H__
-#define __BUTTONS_USB2AX_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_BUTTONS_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/Buttons.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Button mask for the first button on the board. */
-			#define BUTTONS_BUTTON1      (1 << 7)
-
-		/* Inline Functions: */
-		#if !defined(__DOXYGEN__)
-			static inline void Buttons_Init(void)
-			{
-				DDRD  &= ~BUTTONS_BUTTON1;
-				PORTD |=  BUTTONS_BUTTON1;
-			}
-
-			static inline void Buttons_Disable(void)
-			{
-				DDRD  &= ~BUTTONS_BUTTON1;
-				PORTD &= ~BUTTONS_BUTTON1;
-			}
-
-			static inline uint8_t Buttons_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
-			static inline uint8_t Buttons_GetStatus(void)
-			{
-				return ((PIND & BUTTONS_BUTTON1) ^ BUTTONS_BUTTON1);
-			}
-		#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/USB2AX/LEDs.h b/NativePrograms/LUFA/Drivers/Board/AVR8/USB2AX/LEDs.h
deleted file mode 100644
index 91e1f7e6b1..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/USB2AX/LEDs.h
+++ /dev/null
@@ -1,218 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2019.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2019  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific LED driver header for the Xevelabs USB2AX.
- *  \copydetails Group_LEDs_USB2AX
- *
- *  \note This file should not be included directly. It is automatically included as needed by the LEDs driver
- *        dispatch header located in LUFA/Drivers/Board/LEDs.h.
- */
-
-/** \ingroup Group_LEDs
- *  \defgroup Group_LEDs_USB2AX_V31 USB2AX_V31
- *  \brief Board specific LED driver header for the Xevelabs USB2AX revision 3.1.
- *
- *  See \ref Group_LEDs_USB2AX for more details.
- */
-
-/** \ingroup Group_LEDs
- *  \defgroup Group_LEDs_USB2AX_V3 USB2AX_V3
- *  \brief Board specific LED driver header for the Xevelabs USB2AX revision 3.
- *
- *  See \ref Group_LEDs_USB2AX for more details.
- */
-
-/** \ingroup Group_LEDs
- *  \defgroup Group_LEDs_USB2AX USB2AX
- *  \brief Board specific LED driver header for the Xevelabs USB2AX revisions 1 and 2.
- *
- *  \note For version 3 USB2AX boards, compile with <code>BOARD = USB2AX_V3</code> and for version 3.1, with <code>BOARD = USB2AX_V31</code>.
- *
- *  Board specific LED driver header for the Xevelabs USB2AX (http://paranoidstudio.assembla.com/wiki/show/paranoidstudio/USB2AX).
- *
- *  <b>USB2AX</b>:
- *  <table>
- *    <tr><th>Name</th><th>Color</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr>
- *    <tr><td>LEDS_LED1</td><td>Green</td><td>General Indicator</td><td>High</td><td>PORTC.6</td></tr>
- *  </table>
- *
- *  <b>USB2AX_V3</b>:
- *  <table>
- *    <tr><th>Name</th><th>Color</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr>
- *    <tr><td>LEDS_LED1</td><td>Green</td><td>General Indicator</td><td>High</td><td>PORTD.1</td></tr>
- *  </table>
- *
- *  <b>USB2AX_V31</b>:
- *  <table>
- *    <tr><th>Name</th><th>Color</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr>
- *    <tr><td>LEDS_LED1</td><td>Green</td><td>General Indicator</td><td>High</td><td>PORTD.5</td></tr>
- *    <tr><td>LEDS_LED2</td><td>Red</td><td>General Indicator</td><td>High</td><td>PORTD.6</td></tr>
- *  </table>
- *
- *  @{
- */
-
-#ifndef __LEDS_USB2AX_H__
-#define __LEDS_USB2AX_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_LEDS_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/LEDS.h instead.
-		#endif
-
-	/* Private Interface - For use in library only: */
-	#if !defined(__DOXYGEN__)
-		/* Macros: */
-			#if (BOARD == BOARD_USB2AX_V31)
-                #define USB2AX_LEDS_LED1   (1 << 5)
-                #define USB2AX_LEDS_LED2   (1 << 6)
-            #elif (BOARD == BOARD_USB2AX_V3)
-				#define USB2AX_LEDS_LED1   (1 << 1)
-                #define USB2AX_LEDS_LED2   0
-			#else
-				#define USB2AX_LEDS_LED1   (1 << 6)
-                #define USB2AX_LEDS_LED2   0
-			#endif
-	#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** LED mask for the first LED on the board. */
-			#define LEDS_LED1        USB2AX_LEDS_LED1
-
-			/** LED mask for the second LED on the board. */
-			#define LEDS_LED2        USB2AX_LEDS_LED2
-
-			/** LED mask for all the LEDs on the board. */
-			#define LEDS_ALL_LEDS    (LEDS_LED1 | LEDS_LED2)
-
-			/** LED mask for none of the board LEDs. */
-			#define LEDS_NO_LEDS     0
-
-		/* Inline Functions: */
-		#if !defined(__DOXYGEN__)
-			static inline void LEDs_Init(void)
-			{
-				#if (BOARD == BOARD_USB2AX)
-				DDRC  |=  LEDS_ALL_LEDS;
-				PORTC &= ~LEDS_ALL_LEDS;
-				#else
-				DDRD  |=  LEDS_ALL_LEDS;
-				PORTD &= ~LEDS_ALL_LEDS;
-				#endif
-			}
-
-			static inline void LEDs_Disable(void)
-			{
-				#if (BOARD == BOARD_USB2AX)
-				DDRC  &= ~LEDS_ALL_LEDS;
-				PORTC &= ~LEDS_ALL_LEDS;
-				#else
-				DDRD  &= ~LEDS_ALL_LEDS;
-				PORTD &= ~LEDS_ALL_LEDS;
-				#endif
-			}
-
-			static inline void LEDs_TurnOnLEDs(const uint8_t LEDMask)
-			{
-				#if (BOARD == BOARD_USB2AX)
-				PORTC |= LEDMask;
-				#else
-				PORTD |= LEDMask;
-				#endif
-			}
-
-			static inline void LEDs_TurnOffLEDs(const uint8_t LEDMask)
-			{
-				#if (BOARD == BOARD_USB2AX)
-				PORTC &= ~LEDMask;
-				#else
-				PORTD &= ~LEDMask;
-				#endif
-			}
-
-			static inline void LEDs_SetAllLEDs(const uint8_t LEDMask)
-			{
-				#if (BOARD == BOARD_USB2AX)
-				PORTC = ((PORTC & ~LEDS_ALL_LEDS) | LEDMask);
-				#else
-				PORTD = ((PORTD & ~LEDS_ALL_LEDS) | LEDMask);
-				#endif
-			}
-
-			static inline void LEDs_ChangeLEDs(const uint8_t LEDMask,
-			                                   const uint8_t ActiveMask)
-			{
-				#if (BOARD == BOARD_USB2AX)
-				PORTC = ((PORTC & ~LEDMask) | ActiveMask);
-				#else
-				PORTD = ((PORTD & ~LEDMask) | ActiveMask);
-				#endif
-			}
-
-			static inline void LEDs_ToggleLEDs(const uint8_t LEDMask)
-			{
-				#if (BOARD == BOARD_USB2AX)
-				PINC  = LEDMask;
-				#else
-				PIND  = LEDMask;
-				#endif
-			}
-
-			static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT;
-			static inline uint8_t LEDs_GetLEDs(void)
-			{
-				#if (BOARD == BOARD_USB2AX)
-				return (PORTC & LEDS_ALL_LEDS);
-				#else
-				return (PORTD & LEDS_ALL_LEDS);
-				#endif
-			}
-		#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/USBFOO/Board.h b/NativePrograms/LUFA/Drivers/Board/AVR8/USBFOO/Board.h
deleted file mode 100644
index d7199691dd..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/USBFOO/Board.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2019.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2019  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific information header for the Kernel Concepts USBFOO.
- *  \copydetails Group_BoardInfo_USBFOO
- *
- *  \note This file should not be included directly. It is automatically included as needed by the Board driver
- *        dispatch header located in LUFA/Drivers/Board/Board.h.
- */
-
-/** \ingroup Group_BoardInfo
- *  \defgroup Group_BoardInfo_USBFOO USBFOO
- *  \brief Board specific information header for the Kernel Concepts USBFOO.
- *
- *  Board specific information header for the Kernel Concepts USBFOO (http://shop.kernelconcepts.de/product_info.php?products_id=102).
- *
- *  @{
- */
-
-#ifndef __BOARD_USBFOO_H__
-#define __BOARD_USBFOO_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-		#include "../../Buttons.h"
-		#include "../../LEDs.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_BOARD_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/Board.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Indicates the board has hardware Buttons mounted. */
-			#define BOARD_HAS_BUTTONS
-
-			/** Indicates the board has hardware LEDs mounted. */
-			#define BOARD_HAS_LEDS
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/USBFOO/Buttons.h b/NativePrograms/LUFA/Drivers/Board/AVR8/USBFOO/Buttons.h
deleted file mode 100644
index 3cf4977787..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/USBFOO/Buttons.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2019.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2019  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific Buttons driver header for the Kernel Concepts USBFOO.
- *  \copydetails Group_Buttons_USBFOO
- *
- *  \note This file should not be included directly. It is automatically included as needed by the Buttons driver
- *        dispatch header located in LUFA/Drivers/Board/Buttons.h.
- */
-
-/** \ingroup Group_Buttons
- *  \defgroup Group_Buttons_USBFOO USBFOO
- *  \brief Board specific Buttons driver header for the Kernel Concepts USBFOO.
- *
- *  Board specific Buttons driver header for the Kernel Concepts USBFOO (http://shop.kernelconcepts.de/product_info.php?products_id=102).
- *
- *  <table>
- *    <tr><th>Name</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr>
- *    <tr><td>BUTTONS_BUTTON1</td><td>HWB Button</td><td>Low</td><td>PORTD.7</td></tr>
- *  </table>
- *
- *  @{
- */
-
-#ifndef __BUTTONS_USBFOO_H__
-#define __BUTTONS_USBFOO_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_BUTTONS_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/Buttons.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Button mask for the first button on the board. */
-			#define BUTTONS_BUTTON1      (1 << 7)
-
-		/* Inline Functions: */
-		#if !defined(__DOXYGEN__)
-			static inline void Buttons_Init(void)
-			{
-				DDRD  &= ~BUTTONS_BUTTON1;
-				PORTD |=  BUTTONS_BUTTON1;
-			}
-
-			static inline void Buttons_Disable(void)
-			{
-				DDRD  &= ~BUTTONS_BUTTON1;
-				PORTD &= ~BUTTONS_BUTTON1;
-			}
-
-			static inline uint8_t Buttons_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
-			static inline uint8_t Buttons_GetStatus(void)
-			{
-				return ((PIND & BUTTONS_BUTTON1) ^ BUTTONS_BUTTON1);
-			}
-		#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/USBFOO/LEDs.h b/NativePrograms/LUFA/Drivers/Board/AVR8/USBFOO/LEDs.h
deleted file mode 100644
index b13a09f530..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/USBFOO/LEDs.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2019.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2019  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific LED driver header for the Kernel Concepts USBFOO.
- *  \copydetails Group_LEDs_USBFOO
- *
- *  \note This file should not be included directly. It is automatically included as needed by the LEDs driver
- *        dispatch header located in LUFA/Drivers/Board/LEDs.h.
- */
-
-/** \ingroup Group_LEDs
- *  \defgroup Group_LEDs_USBFOO USBFOO
- *  \brief Board specific LED driver header for the Kernel Concepts USBFOO.
- *
- *  Board specific LED driver header for the Kernel Concepts USBFOO (http://shop.kernelconcepts.de/product_info.php?products_id=102).
- *
- *  <table>
- *    <tr><th>Name</th><th>Color</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr>
- *    <tr><td>LEDS_LED1</td><td>Green</td><td>General Indicator</td><td>Low</td><td>PORTD.4</td></tr>
- *  </table>
- *
- *  @{
- */
-
-#ifndef __LEDS_USBFOO_H__
-#define __LEDS_USBFOO_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_LEDS_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/LEDS.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** LED mask for the first LED on the board. */
-			#define LEDS_LED1        (1 << 4)
-
-			/** LED mask for all the LEDs on the board. */
-			#define LEDS_ALL_LEDS    LEDS_LED1
-
-			/** LED mask for none of the board LEDs. */
-			#define LEDS_NO_LEDS     0
-
-		/* Inline Functions: */
-		#if !defined(__DOXYGEN__)
-			static inline void LEDs_Init(void)
-			{
-				DDRD  |= LEDS_ALL_LEDS;
-				PORTD |= LEDS_ALL_LEDS;
-			}
-
-			static inline void LEDs_Disable(void)
-			{
-				DDRD  &= ~LEDS_ALL_LEDS;
-				PORTD &= ~LEDS_ALL_LEDS;
-			}
-
-			static inline void LEDs_TurnOnLEDs(const uint8_t LEDMask)
-			{
-				PORTD &= ~LEDMask;
-			}
-
-			static inline void LEDs_TurnOffLEDs(const uint8_t LEDMask)
-			{
-				PORTD |= LEDMask;
-			}
-
-			static inline void LEDs_SetAllLEDs(const uint8_t LEDMask)
-			{
-				PORTD = ((PORTD | LEDS_ALL_LEDS) & ~LEDMask);
-			}
-
-			static inline void LEDs_ChangeLEDs(const uint8_t LEDMask,
-			                                   const uint8_t ActiveMask)
-			{
-				PORTD = ((PORTD | LEDMask) & ~ActiveMask);
-			}
-
-			static inline void LEDs_ToggleLEDs(const uint8_t LEDMask)
-			{
-				PIND  = LEDMask;
-			}
-
-			static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT;
-			static inline uint8_t LEDs_GetLEDs(void)
-			{
-				return (~PORTD & LEDS_ALL_LEDS);
-			}
-		#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/USBKEY/Board.h b/NativePrograms/LUFA/Drivers/Board/AVR8/USBKEY/Board.h
deleted file mode 100644
index 645cb600e6..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/USBKEY/Board.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2019.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2019  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific information header for the Atmel USBKEY.
- *  \copydetails Group_BoardInfo_USBKEY
- *
- *  \note This file should not be included directly. It is automatically included as needed by the Board driver
- *        dispatch header located in LUFA/Drivers/Board/Board.h.
- */
-
-/** \ingroup Group_BoardInfo
- *  \defgroup Group_BoardInfo_USBKEY USBKEY
- *  \brief Board specific information header for the Atmel USBKEY.
- *
- *  Board specific information header for the Atmel USBKEY.
- *
- *  @{
- */
-
-#ifndef __BOARD_USBKEY_H__
-#define __BOARD_USBKEY_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-		#include "../../Buttons.h"
-		#include "../../Dataflash.h"
-		#include "../../Joystick.h"
-		#include "../../LEDs.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_BOARD_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/Board.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Indicates the board has hardware Buttons mounted. */
-			#define BOARD_HAS_BUTTONS
-
-			/** Indicates the board has a hardware Dataflash mounted. */
-			#define BOARD_HAS_DATAFLASH
-
-			/** Indicates the board has a hardware Joystick mounted. */
-			#define BOARD_HAS_JOYSTICK
-
-			/** Indicates the board has hardware LEDs mounted. */
-			#define BOARD_HAS_LEDS
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/USBKEY/Buttons.h b/NativePrograms/LUFA/Drivers/Board/AVR8/USBKEY/Buttons.h
deleted file mode 100644
index 6a79852491..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/USBKEY/Buttons.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2019.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2019  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific Buttons driver header for the Atmel USBKEY.
- *  \copydetails Group_Buttons_USBKEY
- *
- *  \note This file should not be included directly. It is automatically included as needed by the Buttons driver
- *        dispatch header located in LUFA/Drivers/Board/Buttons.h.
- */
-
-/** \ingroup Group_Buttons
- *  \defgroup Group_Buttons_USBKEY USBKEY
- *  \brief Board specific Buttons driver header for the Atmel USBKEY.
- *
- *  Board specific Buttons driver header for the Atmel USBKEY.
- *
- *  <table>
- *    <tr><th>Name</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr>
- *    <tr><td>BUTTONS_BUTTON1</td><td>HWB Button</td><td>Low</td><td>PORTE.2</td></tr>
- *  </table>
- *
- *  @{
- */
-
-#ifndef __BUTTONS_USBKEY_H__
-#define __BUTTONS_USBKEY_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_BUTTONS_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/Buttons.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Button mask for the first button on the board. */
-			#define BUTTONS_BUTTON1      (1 << 2)
-
-		/* Inline Functions: */
-		#if !defined(__DOXYGEN__)
-			static inline void Buttons_Init(void)
-			{
-				DDRE  &= ~BUTTONS_BUTTON1;
-				PORTE |=  BUTTONS_BUTTON1;
-			}
-
-			static inline void Buttons_Disable(void)
-			{
-				DDRE  &= ~BUTTONS_BUTTON1;
-				PORTE &= ~BUTTONS_BUTTON1;
-			}
-
-			static inline uint8_t Buttons_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
-			static inline uint8_t Buttons_GetStatus(void)
-			{
-				return ((PINE & BUTTONS_BUTTON1) ^ BUTTONS_BUTTON1);
-			}
-		#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/USBKEY/Dataflash.h b/NativePrograms/LUFA/Drivers/Board/AVR8/USBKEY/Dataflash.h
deleted file mode 100644
index 228ce72bb0..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/USBKEY/Dataflash.h
+++ /dev/null
@@ -1,237 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2019.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2019  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific Dataflash driver header for the Atmel USBKEY.
- *  \copydetails Group_Dataflash_USBKEY
- *
- *  \note This file should not be included directly. It is automatically included as needed by the dataflash driver
- *        dispatch header located in LUFA/Drivers/Board/Dataflash.h.
- */
-
-/** \ingroup Group_Dataflash
- *  \defgroup Group_Dataflash_USBKEY USBKEY
- *  \brief Board specific Dataflash driver header for the Atmel USBKEY.
- *
- *  Board specific Dataflash driver header for the Atmel USBKEY board.
- *
- *  <table>
- *    <tr><th>Name</th><th>Info</th><th>Select Pin</th><th>SPI Port</th></tr>
- *    <tr><td>DATAFLASH_CHIP1</td><td>AT45DB642D (8MB)</td><td>PORTE.0</td><td>SPI0</td></tr>
- *    <tr><td>DATAFLASH_CHIP2</td><td>AT45DB642D (8MB)</td><td>PORTE.1</td><td>SPI0</td></tr>
- *  </table>
- *
- *  @{
- */
-
-#ifndef __DATAFLASH_USBKEY_H__
-#define __DATAFLASH_USBKEY_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-		#include "../../../Misc/AT45DB642D.h"
-		#include "../../../Peripheral/SPI.h"
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_DATAFLASH_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/Dataflash.h instead.
-		#endif
-
-	/* Private Interface - For use in library only: */
-	#if !defined(__DOXYGEN__)
-		/* Macros: */
-			#define DATAFLASH_CHIPCS_MASK                (DATAFLASH_CHIP1 | DATAFLASH_CHIP2)
-			#define DATAFLASH_CHIPCS_DDR                 DDRE
-			#define DATAFLASH_CHIPCS_PORT                PORTE
-	#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Constant indicating the total number of dataflash ICs mounted on the selected board. */
-			#define DATAFLASH_TOTALCHIPS                 2
-
-			/** Mask for no dataflash chip selected. */
-			#define DATAFLASH_NO_CHIP                    0
-
-			/** Mask for the first dataflash chip selected. */
-			#define DATAFLASH_CHIP1                      (1 << 0)
-
-			/** Mask for the second dataflash chip selected. */
-			#define DATAFLASH_CHIP2                      (1 << 1)
-
-			/** Internal main memory page size for the board's dataflash ICs. */
-			#define DATAFLASH_PAGE_SIZE                  1024
-
-			/** Total number of pages inside each of the board's dataflash ICs. */
-			#define DATAFLASH_PAGES                      8192
-
-		/* Inline Functions: */
-			/** Initializes the dataflash driver so that commands and data may be sent to an attached dataflash IC.
-			 *  The appropriate SPI interface will be automatically configured.
-			 */
-			static inline void Dataflash_Init(void)
-			{
-				DATAFLASH_CHIPCS_DDR  |= DATAFLASH_CHIPCS_MASK;
-				DATAFLASH_CHIPCS_PORT |= DATAFLASH_CHIPCS_MASK;
-
-				SPI_Init(SPI_SPEED_FCPU_DIV_2 | SPI_ORDER_MSB_FIRST | SPI_SCK_LEAD_FALLING | SPI_SAMPLE_TRAILING | SPI_MODE_MASTER);
-			}
-
-			/** Sends a byte to the currently selected dataflash IC, and returns a byte from the dataflash.
-			 *
-			 *  \param[in] Byte  Byte of data to send to the dataflash
-			 *
-			 *  \return Last response byte from the dataflash
-			 */
-			static inline uint8_t Dataflash_TransferByte(const uint8_t Byte) ATTR_ALWAYS_INLINE;
-			static inline uint8_t Dataflash_TransferByte(const uint8_t Byte)
-			{
-				return SPI_TransferByte(Byte);
-			}
-
-			/** Sends a byte to the currently selected dataflash IC, and ignores the next byte from the dataflash.
-			 *
-			 *  \param[in] Byte  Byte of data to send to the dataflash
-			 */
-			static inline void Dataflash_SendByte(const uint8_t Byte) ATTR_ALWAYS_INLINE;
-			static inline void Dataflash_SendByte(const uint8_t Byte)
-			{
-				SPI_SendByte(Byte);
-			}
-
-			/** Sends a dummy byte to the currently selected dataflash IC, and returns the next byte from the dataflash.
-			 *
-			 *  \return Last response byte from the dataflash
-			 */
-			static inline uint8_t Dataflash_ReceiveByte(void) ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT;
-			static inline uint8_t Dataflash_ReceiveByte(void)
-			{
-				return SPI_ReceiveByte();
-			}
-
-			/** Determines the currently selected dataflash chip.
-			 *
-			 *  \return Mask of the currently selected Dataflash chip, either \ref DATAFLASH_NO_CHIP if no chip is selected
-			 *          or a DATAFLASH_CHIPn mask (where n is the chip number).
-			 */
-			static inline uint8_t Dataflash_GetSelectedChip(void) ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT;
-			static inline uint8_t Dataflash_GetSelectedChip(void)
-			{
-				return (~DATAFLASH_CHIPCS_PORT & DATAFLASH_CHIPCS_MASK);
-			}
-
-			/** Selects the given dataflash chip.
-			 *
-			 *  \param[in]  ChipMask  Mask of the Dataflash IC to select, in the form of a \c DATAFLASH_CHIPn mask (where n is
-			 *              the chip number).
-			 */
-			static inline void Dataflash_SelectChip(const uint8_t ChipMask) ATTR_ALWAYS_INLINE;
-			static inline void Dataflash_SelectChip(const uint8_t ChipMask)
-			{
-				DATAFLASH_CHIPCS_PORT = ((DATAFLASH_CHIPCS_PORT | DATAFLASH_CHIPCS_MASK) & ~ChipMask);
-			}
-
-			/** Deselects the current dataflash chip, so that no dataflash is selected. */
-			static inline void Dataflash_DeselectChip(void) ATTR_ALWAYS_INLINE;
-			static inline void Dataflash_DeselectChip(void)
-			{
-				Dataflash_SelectChip(DATAFLASH_NO_CHIP);
-			}
-
-			/** Selects a dataflash IC from the given page number, which should range from 0 to
-			 *  ((DATAFLASH_PAGES * DATAFLASH_TOTALCHIPS) - 1). For boards containing only one
-			 *  dataflash IC, this will select DATAFLASH_CHIP1. If the given page number is outside
-			 *  the total number of pages contained in the boards dataflash ICs, all dataflash ICs
-			 *  are deselected.
-			 *
-			 *  \param[in] PageAddress  Address of the page to manipulate, ranging from
-			 *                          0 to ((DATAFLASH_PAGES * DATAFLASH_TOTALCHIPS) - 1).
-			 */
-			static inline void Dataflash_SelectChipFromPage(const uint16_t PageAddress)
-			{
-				Dataflash_DeselectChip();
-
-				if (PageAddress >= (DATAFLASH_PAGES * DATAFLASH_TOTALCHIPS))
-				  return;
-
-				#if (DATAFLASH_TOTALCHIPS == 2)
-					if (PageAddress & 0x01)
-					  Dataflash_SelectChip(DATAFLASH_CHIP2);
-					else
-					  Dataflash_SelectChip(DATAFLASH_CHIP1);
-				#else
-					Dataflash_SelectChip(DATAFLASH_CHIP1);
-				#endif
-			}
-
-			/** Toggles the select line of the currently selected dataflash IC, so that it is ready to receive
-			 *  a new command.
-			 */
-			static inline void Dataflash_ToggleSelectedChipCS(void)
-			{
-				uint8_t SelectedChipMask = Dataflash_GetSelectedChip();
-
-				Dataflash_DeselectChip();
-				Dataflash_SelectChip(SelectedChipMask);
-			}
-
-			/** Spin-loops while the currently selected dataflash is busy executing a command, such as a main
-			 *  memory page program or main memory to buffer transfer.
-			 */
-			static inline void Dataflash_WaitWhileBusy(void)
-			{
-				Dataflash_ToggleSelectedChipCS();
-				Dataflash_SendByte(DF_CMD_GETSTATUS);
-				while (!(Dataflash_ReceiveByte() & DF_STATUS_READY));
-				Dataflash_ToggleSelectedChipCS();
-			}
-
-			/** Sends a set of page and buffer address bytes to the currently selected dataflash IC, for use with
-			 *  dataflash commands which require a complete 24-bit address.
-			 *
-			 *  \param[in] PageAddress  Page address within the selected dataflash IC
-			 *  \param[in] BufferByte   Address within the dataflash's buffer
-			 */
-			static inline void Dataflash_SendAddressBytes(uint16_t PageAddress,
-			                                              const uint16_t BufferByte)
-			{
-				#if (DATAFLASH_TOTALCHIPS == 2)
-					PageAddress >>= 1;
-				#endif
-
-				Dataflash_SendByte(PageAddress >> 5);
-				Dataflash_SendByte((PageAddress << 3) | (BufferByte >> 8));
-				Dataflash_SendByte(BufferByte);
-			}
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/USBKEY/Joystick.h b/NativePrograms/LUFA/Drivers/Board/AVR8/USBKEY/Joystick.h
deleted file mode 100644
index afc1e48876..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/USBKEY/Joystick.h
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2019.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2019  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific joystick driver header for the Atmel USBKEY.
- *  \copydetails Group_Joystick_USBKEY
- *
- *  \note This file should not be included directly. It is automatically included as needed by the joystick driver
- *        dispatch header located in LUFA/Drivers/Board/Joystick.h.
- */
-
-/** \ingroup Group_Joystick
- *  \defgroup Group_Joystick_USBKEY USBKEY
- *  \brief Board specific joystick driver header for the Atmel USBKEY.
- *
- *  Board specific joystick driver header for the Atmel USBKEY.
- *
- *  <table>
- *    <tr><th>Left Port Pin</th><th>Up Port Pin</th><th>Right Port Pin</th><th>Down Port Pin</th><th>Press Port Pin</th></tr>
- *    <tr><td>PORTB.6</td><td>PORTB.7</td><td>PORTE.4</td><td>PORTE.5</td><td>PORTB.5</td></tr>
- *  </table>
- *
- *  @{
- */
-
-#ifndef __JOYSTICK_USBKEY_H__
-#define __JOYSTICK_USBKEY_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_JOYSTICK_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/Joystick.h instead.
-		#endif
-
-	/* Private Interface - For use in library only: */
-	#if !defined(__DOXYGEN__)
-		/* Macros: */
-			#define JOY_BMASK                 ((1 << 5) | (1 << 6) | (1 << 7))
-			#define JOY_EMASK                 ((1 << 4) | (1 << 5))
-
-			#define JOY_PORTE_MASK_SHIFT      1
-	#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Mask for the joystick being pushed in the left direction. */
-			#define JOY_LEFT                  (1 << 6)
-
-			/** Mask for the joystick being pushed in the right direction. */
-			#define JOY_RIGHT                ((1 << 4) >> JOY_PORTE_MASK_SHIFT)
-
-			/** Mask for the joystick being pushed in the upward direction. */
-			#define JOY_UP                    (1 << 7)
-
-			/** Mask for the joystick being pushed in the downward direction. */
-			#define JOY_DOWN                 ((1 << 5) >> JOY_PORTE_MASK_SHIFT)
-
-			/** Mask for the joystick being pushed inward. */
-			#define JOY_PRESS                 (1 << 5)
-
-		/* Inline Functions: */
-		#if !defined(__DOXYGEN__)
-			static inline void Joystick_Init(void)
-			{
-				DDRB  &= ~JOY_BMASK;
-				DDRE  &= ~JOY_EMASK;
-
-				PORTB |=  JOY_BMASK;
-				PORTE |=  JOY_EMASK;
-			}
-
-			static inline void Joystick_Disable(void)
-			{
-				DDRB  &= ~JOY_BMASK;
-				DDRE  &= ~JOY_EMASK;
-
-				PORTB &= ~JOY_BMASK;
-				PORTE &= ~JOY_EMASK;
-			}
-
-			static inline uint8_t Joystick_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
-			static inline uint8_t Joystick_GetStatus(void)
-			{
-				return (((uint8_t)~PINB & JOY_BMASK) | (((uint8_t)~PINE & JOY_EMASK) >> JOY_PORTE_MASK_SHIFT));
-			}
-		#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/USBKEY/LEDs.h b/NativePrograms/LUFA/Drivers/Board/AVR8/USBKEY/LEDs.h
deleted file mode 100644
index 80904f076e..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/USBKEY/LEDs.h
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2019.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2019  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific LED driver header for the Atmel USBKEY.
- *  \copydetails Group_LEDs_USBKEY
- *
- *  \note This file should not be included directly. It is automatically included as needed by the LEDs driver
- *        dispatch header located in LUFA/Drivers/Board/LEDs.h.
- */
-
-/** \ingroup Group_LEDs
- *  \defgroup Group_LEDs_USBKEY USBKEY
- *  \brief Board specific LED driver header for the Atmel USBKEY.
- *
- *  Board specific LED driver header for the Atmel USBKEY.
- *
- *  <table>
- *    <tr><th>Name</th><th>Color</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr>
- *    <tr><td>LEDS_LED1</td><td>Red</td><td>Bicolor Indicator 1</td><td>High</td><td>PORTD.4</td></tr>
- *    <tr><td>LEDS_LED2</td><td>Green</td><td>Bicolor Indicator 1</td><td>High</td><td>PORTD.5</td></tr>
- *    <tr><td>LEDS_LED3</td><td>Red</td><td>Bicolor Indicator 2</td><td>High</td><td>PORTD.6</td></tr>
- *    <tr><td>LEDS_LED4</td><td>Green</td><td>Bicolor Indicator 2</td><td>High</td><td>PORTD.7</td></tr>
- *  </table>
- *
- *  @{
- */
-
-#ifndef __LEDS_USBKEY_H__
-#define __LEDS_USBKEY_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_LEDS_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/LEDS.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** LED mask for the first LED on the board. */
-			#define LEDS_LED1        (1 << 4)
-
-			/** LED mask for the second LED on the board. */
-			#define LEDS_LED2        (1 << 5)
-
-			/** LED mask for the third LED on the board. */
-			#define LEDS_LED3        (1 << 7)
-
-			/** LED mask for the fourth LED on the board. */
-			#define LEDS_LED4        (1 << 6)
-
-			/** LED mask for all the LEDs on the board. */
-			#define LEDS_ALL_LEDS    (LEDS_LED1 | LEDS_LED2 | LEDS_LED3 | LEDS_LED4)
-
-			/** LED mask for none of the board LEDs. */
-			#define LEDS_NO_LEDS     0
-
-		/* Inline Functions: */
-		#if !defined(__DOXYGEN__)
-			static inline void LEDs_Init(void)
-			{
-				DDRD  |=  LEDS_ALL_LEDS;
-				PORTD &= ~LEDS_ALL_LEDS;
-			}
-
-			static inline void LEDs_Disable(void)
-			{
-				DDRD  &= ~LEDS_ALL_LEDS;
-				PORTD &= ~LEDS_ALL_LEDS;
-			}
-
-			static inline void LEDs_TurnOnLEDs(const uint8_t LEDMask)
-			{
-				PORTD |= LEDMask;
-			}
-
-			static inline void LEDs_TurnOffLEDs(const uint8_t LEDMask)
-			{
-				PORTD &= ~LEDMask;
-			}
-
-			static inline void LEDs_SetAllLEDs(const uint8_t LEDMask)
-			{
-				PORTD = ((PORTD & ~LEDS_ALL_LEDS) | LEDMask);
-			}
-
-			static inline void LEDs_ChangeLEDs(const uint8_t LEDMask,
-			                                   const uint8_t ActiveMask)
-			{
-				PORTD = ((PORTD & ~LEDMask) | ActiveMask);
-			}
-
-			static inline void LEDs_ToggleLEDs(const uint8_t LEDMask)
-			{
-				PIND  = LEDMask;
-			}
-
-			static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT;
-			static inline uint8_t LEDs_GetLEDs(void)
-			{
-				return (PORTD & LEDS_ALL_LEDS);
-			}
-		#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/USBTINYMKII/Board.h b/NativePrograms/LUFA/Drivers/Board/AVR8/USBTINYMKII/Board.h
deleted file mode 100644
index c3ad13a2fc..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/USBTINYMKII/Board.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2019.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2019  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific information header for Tom's USBTINY MKII.
- *  \copydetails Group_BoardInfo_USBTINYMKII
- *
- *  \note This file should not be included directly. It is automatically included as needed by the Board driver
- *        dispatch header located in LUFA/Drivers/Board/Board.h.
- */
-
-/** \ingroup Group_BoardInfo
- *  \defgroup Group_BoardInfo_USBTINYMKII USBTINYMKII
- *  \brief Board specific information header for Tom's USBTINY MKII.
- *
- *  Board specific information header for Tom's USBTINY MKII (http://tom-itx.dyndns.org:81/~webpage/).
- *
- *  @{
- */
-
-#ifndef __BOARD_USBTINYMKII_H__
-#define __BOARD_USBTINYMKII_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-		#include "../../Buttons.h"
-		#include "../../LEDs.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_BOARD_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/Board.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Indicates the board has hardware Buttons mounted. */
-			#define BOARD_HAS_BUTTONS
-
-			/** Indicates the board has hardware LEDs mounted. */
-			#define BOARD_HAS_LEDS
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/USBTINYMKII/Buttons.h b/NativePrograms/LUFA/Drivers/Board/AVR8/USBTINYMKII/Buttons.h
deleted file mode 100644
index eb47d05cba..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/USBTINYMKII/Buttons.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2019.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2019  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific Buttons driver header for Tom's USBTINY MKII.
- *  \copydetails Group_Buttons_USBTINYMKII
- *
- *  \note This file should not be included directly. It is automatically included as needed by the Buttons driver
- *        dispatch header located in LUFA/Drivers/Board/Buttons.h.
- */
-
-/** \ingroup Group_Buttons
- *  \defgroup Group_Buttons_USBTINYMKII USBTINYMKII
- *  \brief Board specific Buttons driver header for Tom's USBTINY MKII.
- *
- *  Board specific Buttons driver header for Tom's USBTINY MKII (http://tom-itx.dyndns.org:81/~webpage/).
- *
- *  <table>
- *    <tr><th>Name</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr>
- *    <tr><td>BUTTONS_BUTTON1</td><td>HWB Button</td><td>Low</td><td>PORTD.7</td></tr>
- *  </table>
- *
- *  @{
- */
-
-#ifndef __BUTTONS_USBTINYMKII_H__
-#define __BUTTONS_USBTINYMKII_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_BUTTONS_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/Buttons.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Button mask for the first button on the board. */
-			#define BUTTONS_BUTTON1      (1 << 7)
-
-		/* Inline Functions: */
-		#if !defined(__DOXYGEN__)
-			static inline void Buttons_Init(void)
-			{
-				DDRD  &= ~BUTTONS_BUTTON1;
-				PORTD |=  BUTTONS_BUTTON1;
-			}
-
-			static inline void Buttons_Disable(void)
-			{
-				DDRD  &= ~BUTTONS_BUTTON1;
-				PORTD &= ~BUTTONS_BUTTON1;
-			}
-
-			static inline uint8_t Buttons_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
-			static inline uint8_t Buttons_GetStatus(void)
-			{
-				return ((PIND & BUTTONS_BUTTON1) ^ BUTTONS_BUTTON1);
-			}
-		#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/USBTINYMKII/LEDs.h b/NativePrograms/LUFA/Drivers/Board/AVR8/USBTINYMKII/LEDs.h
deleted file mode 100644
index 5abc21347b..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/USBTINYMKII/LEDs.h
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2019.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2019  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific LED driver header for Tom's USBTINY MKII.
- *  \copydetails Group_LEDs_USBTINYMKII
- *
- *  \note This file should not be included directly. It is automatically included as needed by the LEDs driver
- *        dispatch header located in LUFA/Drivers/Board/LEDs.h.
- */
-
-/** \ingroup Group_LEDs
- *  \defgroup Group_LEDs_USBTINYMKII USBTINYMKII
- *  \brief Board specific LED driver header for Tom's USBTINY MKII.
- *
- *  Board specific LED driver header for Tom's USBTINY MKII (http://tom-itx.dyndns.org:81/~webpage/).
- *
- *  <table>
- *    <tr><th>Name</th><th>Color</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr>
- *    <tr><td>LEDS_LED1</td><td>Red</td><td>Bicolor Indicator 1</td><td>High</td><td>PORTB.6</td></tr>
- *    <tr><td>LEDS_LED2</td><td>Green</td><td>Bicolor Indicator 1</td><td>High</td><td>PORTB.7</td></tr>
- *    <tr><td>LEDS_LED3</td><td>Red</td><td>Target Power</td><td>High</td><td>PORTB.5</td></tr>
- *  </table>
- *
- *  @{
- */
-
-#ifndef __LEDS_USBTINYMKII_H__
-#define __LEDS_USBTINYMKII_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_LEDS_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/LEDS.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** LED mask for the first LED on the board. */
-			#define LEDS_LED1        (1 << 6)
-
-			/** LED mask for the second LED on the board. */
-			#define LEDS_LED2        (1 << 7)
-
-			/** LED mask for the third LED on the board. */
-			#define LEDS_LED3        (1 << 5)
-
-			/** LED mask for all the LEDs on the board. */
-			#define LEDS_ALL_LEDS    (LEDS_LED1 | LEDS_LED2 | LEDS_LED3)
-
-			/** LED mask for none of the board LEDs. */
-			#define LEDS_NO_LEDS     0
-
-		/* Inline Functions: */
-		#if !defined(__DOXYGEN__)
-			static inline void LEDs_Init(void)
-			{
-				DDRB  |=  LEDS_ALL_LEDS;
-				PORTB &= ~LEDS_ALL_LEDS;
-			}
-
-			static inline void LEDs_Disable(void)
-			{
-				DDRB  &= ~LEDS_ALL_LEDS;
-				PORTB &= ~LEDS_ALL_LEDS;
-			}
-
-			static inline void LEDs_TurnOnLEDs(const uint8_t LedMask)
-			{
-				PORTB |= LedMask;
-			}
-
-			static inline void LEDs_TurnOffLEDs(const uint8_t LedMask)
-			{
-				PORTB &= ~LedMask;
-			}
-
-			static inline void LEDs_SetAllLEDs(const uint8_t LedMask)
-			{
-				PORTB = ((PORTB & ~LEDS_ALL_LEDS) | LedMask);
-			}
-
-			static inline void LEDs_ChangeLEDs(const uint8_t LedMask,
-			                                   const uint8_t ActiveMask)
-			{
-				PORTB = ((PORTB & ~LedMask) | ActiveMask);
-			}
-
-			static inline void LEDs_ToggleLEDs(const uint8_t LEDMask)
-			{
-				PINB  = LEDMask;
-			}
-
-			static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT;
-			static inline uint8_t LEDs_GetLEDs(void)
-			{
-				return (PORTB & LEDS_ALL_LEDS);
-			}
-		#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/XPLAIN/Board.h b/NativePrograms/LUFA/Drivers/Board/AVR8/XPLAIN/Board.h
deleted file mode 100644
index 7f57609402..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/XPLAIN/Board.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2019.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2019  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific information header for the original Atmel XPLAIN.
- *  \copydetails Group_BoardInfo_XPLAIN
- *
- *  \note This file should not be included directly. It is automatically included as needed by the Board driver
- *        dispatch header located in LUFA/Drivers/Board/Board.h.
- */
-
-/** \ingroup Group_BoardInfo
- *  \defgroup Group_BoardInfo_XPLAIN_REV1 XPLAIN_REV1
- *  \brief Board specific information header for the original Atmel XPLAIN, revision 1.
- *
- *  See \ref Group_BoardInfo_XPLAIN for more details.
- */
-
-/** \ingroup Group_BoardInfo
- *  \defgroup Group_BoardInfo_XPLAIN XPLAIN
- *  \brief Board specific information header for the original Atmel XPLAIN.
- *
- *  Board specific information header for the original Atmel XPLAIN.
- *
- *  @{
- */
-
-#ifndef __BOARD_XPLAIN_H__
-#define __BOARD_XPLAIN_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-		#include "../../Dataflash.h"
-		#include "../../LEDs.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_BOARD_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/Board.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Indicates the board has a hardware Dataflash mounted. */
-			#define BOARD_HAS_DATAFLASH
-
-			/** Indicates the board has hardware LEDs mounted. */
-			#define BOARD_HAS_LEDS
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/XPLAIN/Dataflash.h b/NativePrograms/LUFA/Drivers/Board/AVR8/XPLAIN/Dataflash.h
deleted file mode 100644
index e0f935df3a..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/XPLAIN/Dataflash.h
+++ /dev/null
@@ -1,245 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2019.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2019  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific Dataflash driver header for the original Atmel XPLAIN.
- *  \copydetails Group_Dataflash_XPLAIN
- *
- *  \note This file should not be included directly. It is automatically included as needed by the dataflash driver
- *        dispatch header located in LUFA/Drivers/Board/Dataflash.h.
- */
-
-/** \ingroup Group_Dataflash
- *  \defgroup Group_Dataflash_XPLAIN_REV1 XPLAIN_REV1
- *  \brief Board specific Dataflash driver header for the original Atmel XPLAIN, revision 1.
- *
- *  See \ref Group_Dataflash_XPLAIN for more details.
- */
-
-/** \ingroup Group_Dataflash
- *  \defgroup Group_Dataflash_XPLAIN XPLAIN
- *  \brief Board specific Dataflash driver header for the original Atmel XPLAIN.
- *
- *  \note For the first revision XPLAIN board, compile with <code>BOARD = BOARD_XPLAIN_REV1</code>.
- *
- *  Board specific Dataflash driver header for the Atmel XPLAIN.
- *
- *  <b>Revision 1 Boards</b>:
- *  <table>
- *    <tr><th>Name</th><th>Info</th><th>Select Pin</th><th>SPI Port</th></tr>
- *    <tr><td>DATAFLASH_CHIP1</td><td>AT45DB041D (512KB)</td><td>PORTB.5</td><td>SPI0</td></tr>
- *  </table>
- *
- *  <b>Other Board Revisions</b>:
- *  <table>
- *    <tr><th>Name</th><th>Info</th><th>Select Pin</th><th>SPI Port</th></tr>
- *    <tr><td>DATAFLASH_CHIP1</td><td>AT45DB642D (8MB)</td><td>PORTB.5</td><td>SPI0</td></tr>
- *  </table>
- *
- *  @{
- */
-
-#ifndef __DATAFLASH_XPLAIN_H__
-#define __DATAFLASH_XPLAIN_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-
-		#include "../../../Misc/AT45DB642D.h"
-		#include "../../../Peripheral/SPI.h"
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_DATAFLASH_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/Dataflash.h instead.
-		#endif
-
-	/* Private Interface - For use in library only: */
-	#if !defined(__DOXYGEN__)
-		/* Macros: */
-			#define DATAFLASH_CHIPCS_MASK                DATAFLASH_CHIP1
-			#define DATAFLASH_CHIPCS_DDR                 DDRB
-			#define DATAFLASH_CHIPCS_PORT                PORTB
-	#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Constant indicating the total number of dataflash ICs mounted on the selected board. */
-			#define DATAFLASH_TOTALCHIPS                 1
-
-			/** Mask for no dataflash chip selected. */
-			#define DATAFLASH_NO_CHIP                    0
-
-			/** Mask for the first dataflash chip selected. */
-			#define DATAFLASH_CHIP1                      (1 << 5)
-
-			#if ((BOARD != BOARD_XPLAIN_REV1) || defined(__DOXYGEN__))
-				/** Internal main memory page size for the board's dataflash ICs. */
-				#define DATAFLASH_PAGE_SIZE              1024
-
-				/** Total number of pages inside each of the board's dataflash ICs. */
-				#define DATAFLASH_PAGES                  8192
-			#else
-				#define DATAFLASH_PAGE_SIZE              256
-
-				#define DATAFLASH_PAGES                  2048
-			#endif
-
-		/* Inline Functions: */
-			/** Initializes the dataflash driver so that commands and data may be sent to an attached dataflash IC.
-			 *  The appropriate SPI interface will be automatically configured.
-			 */
-			static inline void Dataflash_Init(void)
-			{
-				DATAFLASH_CHIPCS_DDR  |= DATAFLASH_CHIPCS_MASK;
-				DATAFLASH_CHIPCS_PORT |= DATAFLASH_CHIPCS_MASK;
-
-				SPI_Init(SPI_SPEED_FCPU_DIV_2 | SPI_ORDER_MSB_FIRST | SPI_SCK_LEAD_FALLING | SPI_SAMPLE_TRAILING | SPI_MODE_MASTER);
-			}
-
-			/** Sends a byte to the currently selected dataflash IC, and returns a byte from the dataflash.
-			 *
-			 *  \param[in] Byte  Byte of data to send to the dataflash
-			 *
-			 *  \return Last response byte from the dataflash
-			 */
-			static inline uint8_t Dataflash_TransferByte(const uint8_t Byte) ATTR_ALWAYS_INLINE;
-			static inline uint8_t Dataflash_TransferByte(const uint8_t Byte)
-			{
-				return SPI_TransferByte(Byte);
-			}
-
-			/** Sends a byte to the currently selected dataflash IC, and ignores the next byte from the dataflash.
-			 *
-			 *  \param[in] Byte  Byte of data to send to the dataflash
-			 */
-			static inline void Dataflash_SendByte(const uint8_t Byte) ATTR_ALWAYS_INLINE;
-			static inline void Dataflash_SendByte(const uint8_t Byte)
-			{
-				SPI_SendByte(Byte);
-			}
-
-			/** Sends a dummy byte to the currently selected dataflash IC, and returns the next byte from the dataflash.
-			 *
-			 *  \return Last response byte from the dataflash
-			 */
-			static inline uint8_t Dataflash_ReceiveByte(void) ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT;
-			static inline uint8_t Dataflash_ReceiveByte(void)
-			{
-				return SPI_ReceiveByte();
-			}
-
-			/** Determines the currently selected dataflash chip.
-			 *
-			 *  \return Mask of the currently selected Dataflash chip, either \ref DATAFLASH_NO_CHIP if no chip is selected
-			 *          or a DATAFLASH_CHIPn mask (where n is the chip number).
-			 */
-			static inline uint8_t Dataflash_GetSelectedChip(void) ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT;
-			static inline uint8_t Dataflash_GetSelectedChip(void)
-			{
-				return (~DATAFLASH_CHIPCS_PORT & DATAFLASH_CHIPCS_MASK);
-			}
-
-			/** Selects the given dataflash chip.
-			 *
-			 *  \param[in]  ChipMask  Mask of the Dataflash IC to select, in the form of a \c DATAFLASH_CHIPn mask (where n is
-			 *              the chip number).
-			 */
-			static inline void Dataflash_SelectChip(const uint8_t ChipMask) ATTR_ALWAYS_INLINE;
-			static inline void Dataflash_SelectChip(const uint8_t ChipMask)
-			{
-				DATAFLASH_CHIPCS_PORT = ((DATAFLASH_CHIPCS_PORT | DATAFLASH_CHIPCS_MASK) & ~ChipMask);
-			}
-
-			/** Deselects the current dataflash chip, so that no dataflash is selected. */
-			static inline void Dataflash_DeselectChip(void) ATTR_ALWAYS_INLINE;
-			static inline void Dataflash_DeselectChip(void)
-			{
-				Dataflash_SelectChip(DATAFLASH_NO_CHIP);
-			}
-
-			/** Selects a dataflash IC from the given page number, which should range from 0 to
-			 *  ((DATAFLASH_PAGES * DATAFLASH_TOTALCHIPS) - 1). For boards containing only one
-			 *  dataflash IC, this will select DATAFLASH_CHIP1. If the given page number is outside
-			 *  the total number of pages contained in the boards dataflash ICs, all dataflash ICs
-			 *  are deselected.
-			 *
-			 *  \param[in] PageAddress  Address of the page to manipulate, ranging from
-			 *                          0 to ((DATAFLASH_PAGES * DATAFLASH_TOTALCHIPS) - 1).
-			 */
-			static inline void Dataflash_SelectChipFromPage(const uint16_t PageAddress)
-			{
-				Dataflash_DeselectChip();
-
-				if (PageAddress >= DATAFLASH_PAGES)
-				  return;
-
-				Dataflash_SelectChip(DATAFLASH_CHIP1);
-			}
-
-			/** Toggles the select line of the currently selected dataflash IC, so that it is ready to receive
-			 *  a new command.
-			 */
-			static inline void Dataflash_ToggleSelectedChipCS(void)
-			{
-				uint8_t SelectedChipMask = Dataflash_GetSelectedChip();
-
-				Dataflash_DeselectChip();
-				Dataflash_SelectChip(SelectedChipMask);
-			}
-
-			/** Spin-loops while the currently selected dataflash is busy executing a command, such as a main
-			 *  memory page program or main memory to buffer transfer.
-			 */
-			static inline void Dataflash_WaitWhileBusy(void)
-			{
-				Dataflash_ToggleSelectedChipCS();
-				Dataflash_SendByte(DF_CMD_GETSTATUS);
-				while (!(Dataflash_ReceiveByte() & DF_STATUS_READY));
-				Dataflash_ToggleSelectedChipCS();
-			}
-
-			/** Sends a set of page and buffer address bytes to the currently selected dataflash IC, for use with
-			 *  dataflash commands which require a complete 24-bit address.
-			 *
-			 *  \param[in] PageAddress  Page address within the selected dataflash IC
-			 *  \param[in] BufferByte   Address within the dataflash's buffer
-			 */
-			static inline void Dataflash_SendAddressBytes(uint16_t PageAddress,
-			                                              const uint16_t BufferByte)
-			{
-				Dataflash_SendByte(PageAddress >> 5);
-				Dataflash_SendByte((PageAddress << 3) | (BufferByte >> 8));
-				Dataflash_SendByte(BufferByte);
-			}
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/XPLAIN/LEDs.h b/NativePrograms/LUFA/Drivers/Board/AVR8/XPLAIN/LEDs.h
deleted file mode 100644
index 1f0cbcccc5..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/XPLAIN/LEDs.h
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2019.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2019  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific LED driver header for the original Atmel XPLAIN.
- *  \copydetails Group_LEDs_XPLAIN
- *
- *  \note This file should not be included directly. It is automatically included as needed by the LEDs driver
- *        dispatch header located in LUFA/Drivers/Board/LEDs.h.
- */
-
-/** \ingroup Group_LEDs
- *  \defgroup Group_LEDs_XPLAIN_REV1 XPLAIN_REV1
- *  \brief Board specific LED driver header for the original Atmel XPLAIN, revision 1.
- *
- *  See \ref Group_LEDs_XPLAIN for more details.
- */
-
-/** \ingroup Group_LEDs
- *  \defgroup Group_LEDs_XPLAIN XPLAIN
- *  \brief Board specific LED driver header for the original Atmel XPLAIN.
- *
- *  Board specific LED driver header for the Atmel XPLAIN.
- *
- *  <table>
- *    <tr><th>Name</th><th>Color</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr>
- *    <tr><td>LEDS_LED1</td><td>Green</td><td>General Indicator</td><td>Low</td><td>PORTB.6</td></tr>
- *  </table>
- *
- *  @{
- */
-
-#ifndef __LEDS_XPLAIN_H__
-#define __LEDS_XPLAIN_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_LEDS_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/LEDS.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** LED mask for the first LED on the board. */
-			#define LEDS_LED1        (1 << 6)
-
-			/** LED mask for all the LEDs on the board. */
-			#define LEDS_ALL_LEDS    LEDS_LED1
-
-			/** LED mask for none of the board LEDs. */
-			#define LEDS_NO_LEDS     0
-
-		/* Inline Functions: */
-		#if !defined(__DOXYGEN__)
-			static inline void LEDs_Init(void)
-			{
-				DDRB  |= LEDS_ALL_LEDS;
-				PORTB |= LEDS_ALL_LEDS;
-			}
-
-			static inline void LEDs_Disable(void)
-			{
-				DDRB  &= ~LEDS_ALL_LEDS;
-				PORTB &= ~LEDS_ALL_LEDS;
-			}
-
-			static inline void LEDs_TurnOnLEDs(const uint8_t LEDMask)
-			{
-				PORTB &= ~LEDMask;
-			}
-
-			static inline void LEDs_TurnOffLEDs(const uint8_t LEDMask)
-			{
-				PORTB |= LEDMask;
-			}
-
-			static inline void LEDs_SetAllLEDs(const uint8_t LEDMask)
-			{
-				PORTB = ((PORTB | LEDS_ALL_LEDS) & ~LEDMask);
-			}
-
-			static inline void LEDs_ChangeLEDs(const uint8_t LEDMask,
-			                                   const uint8_t ActiveMask)
-			{
-				PORTB = ((PORTB | LEDMask) & ~ActiveMask);
-			}
-
-			static inline void LEDs_ToggleLEDs(const uint8_t LEDMask)
-			{
-				PINB  = LEDMask;
-			}
-
-			static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT;
-			static inline uint8_t LEDs_GetLEDs(void)
-			{
-				return (~PORTB & LEDS_ALL_LEDS);
-			}
-		#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/XPLAINED_MINI/Board.h b/NativePrograms/LUFA/Drivers/Board/AVR8/XPLAINED_MINI/Board.h
deleted file mode 100644
index b7f980d5f8..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/XPLAINED_MINI/Board.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2019.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2019  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific information header for the Atmel Xplained-MINI series kits.
- *  \copydetails Group_BoardInfo_XPLAINED_MINI
- *
- *  \note This file should not be included directly. It is automatically included as needed by the Board driver
- *        dispatch header located in LUFA/Drivers/Board/Board.h.
- */
-
-/** \ingroup Group_BoardInfo
- *  \defgroup Group_BoardInfo_XPLAINED_MINI XPLAINED_MINI
- *  \brief Board specific information header for the Atmel Xplained-MINI series kits.
- *
- *  Board specific information header for the Atmel Xplained-MINI series kits.
- *
- *  @{
- */
-
-#ifndef __BOARD_XPLAINED_MINI_H__
-#define __BOARD_XPLAINED_MINI_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-		#include "../../LEDs.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_BOARD_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/Board.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Indicates the board has hardware LEDs mounted. */
-			#define BOARD_HAS_LEDS
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/XPLAINED_MINI/LEDs.h b/NativePrograms/LUFA/Drivers/Board/AVR8/XPLAINED_MINI/LEDs.h
deleted file mode 100644
index 97e765e1b4..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/XPLAINED_MINI/LEDs.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2019.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2019  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific LED driver header for the Atmel Xplained-MINI series kits..
- *  \copydetails Group_LEDs_XPLAINED_MINI
- *
- *  \note This file should not be included directly. It is automatically included as needed by the LEDs driver
- *        dispatch header located in LUFA/Drivers/Board/LEDs.h.
- */
-
-/** \ingroup Group_LEDs
- *  \defgroup Group_LEDs_XPLAINED_MINI XPLAINED_MINI
- *  \brief Board specific LED driver header for the Atmel Xplained-MINI series kits.
- *
- *  Board specific LED driver header for the Atmel Xplained-MINI series kits.
- *
- *  <table>
- *    <tr><th>Name</th><th>Color</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr>
- *    <tr><td>LEDS_LED1</td><td>Green</td><td>General Indicator</td><td>Low</td><td>PORTC.6</td></tr>
- *  </table>
- *
- *  @{
- */
-
-#ifndef __LEDS_XPLAINED_MINI_H__
-#define __LEDS_XPLAINED_MINI_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_LEDS_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/LEDS.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** LED mask for the first LED on the board. */
-			#define LEDS_LED1        (1 << 6)
-
-			/** LED mask for all the LEDs on the board. */
-			#define LEDS_ALL_LEDS    LEDS_LED1
-
-			/** LED mask for none of the board LEDs. */
-			#define LEDS_NO_LEDS     0
-
-		/* Inline Functions: */
-		#if !defined(__DOXYGEN__)
-			static inline void LEDs_Init(void)
-			{
-				DDRC  |= LEDS_ALL_LEDS;
-				PORTC |= LEDS_ALL_LEDS;
-			}
-
-			static inline void LEDs_Disable(void)
-			{
-				DDRC  &= ~LEDS_ALL_LEDS;
-				PORTC &= ~LEDS_ALL_LEDS;
-			}
-
-			static inline void LEDs_TurnOnLEDs(const uint8_t LEDMask)
-			{
-				PORTC &= ~LEDMask;
-			}
-
-			static inline void LEDs_TurnOffLEDs(const uint8_t LEDMask)
-			{
-				PORTC |= LEDMask;
-			}
-
-			static inline void LEDs_SetAllLEDs(const uint8_t LEDMask)
-			{
-				PORTC = ((PORTC | LEDS_ALL_LEDS) & ~LEDMask);
-			}
-
-			static inline void LEDs_ChangeLEDs(const uint8_t LEDMask,
-			                                   const uint8_t ActiveMask)
-			{
-				PORTC = ((PORTC | LEDMask) & ~ActiveMask);
-			}
-
-			static inline void LEDs_ToggleLEDs(const uint8_t LEDMask)
-			{
-				PINC  = LEDMask;
-			}
-
-			static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT;
-			static inline uint8_t LEDs_GetLEDs(void)
-			{
-				return (~PORTC & LEDS_ALL_LEDS);
-			}
-		#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/YUN/Board.h b/NativePrograms/LUFA/Drivers/Board/AVR8/YUN/Board.h
deleted file mode 100644
index 4a99f579c1..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/YUN/Board.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2019.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2019  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific information header for the Arduino Yun board.
- *  \copydetails Group_BoardInfo_YUN
- *
- *  \note This file should not be included directly. It is automatically included as needed by the Board driver
- *        dispatch header located in LUFA/Drivers/Board/Board.h.
- */
-
-/** \ingroup Group_BoardInfo
- *  \defgroup Group_BoardInfo_YUN YUN
- *  \brief Board specific information header for the Arduino Yun board.
- *
- *  Board specific information header for the Arduino Yun board (http://arduino.cc/en/Main/arduinoBoardYun).
- *
- *  @{
- */
-
-#ifndef __BOARD_YUN_H__
-#define __BOARD_YUN_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-		#include "../../LEDs.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_BOARD_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/Board.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Indicates the board has hardware LEDs mounted. */
-			#define BOARD_HAS_LEDS
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/AVR8/YUN/LEDs.h b/NativePrograms/LUFA/Drivers/Board/AVR8/YUN/LEDs.h
deleted file mode 100644
index 8b0c711cfc..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/AVR8/YUN/LEDs.h
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2019.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2019  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific LED driver header for the Arduino Yun board.
- *  \copydetails Group_LEDs_YUN
- *
- *  \note This file should not be included directly. It is automatically included as needed by the LEDs driver
- *        dispatch header located in LUFA/Drivers/Board/LEDs.h.
- */
-
-/** \ingroup Group_LEDs
- *  \defgroup Group_LEDs_YUN YUN
- *  \brief Board specific LED driver header for the Arduino Yun board.
- *
- *  Board specific LED driver header for the Arduino Yun board (http://arduino.cc/en/Main/arduinoBoardYun).
- *
- *  <table>
- *    <tr><th>Name</th><th>Color</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr>
- *    <tr><td>LEDS_LED1</td><td>Yellow</td><td>RX</td><td>Low</td><td>PORTB.0</td></tr>
- *    <tr><td>LEDS_LED2</td><td>Yellow</td><td>TX</td><td>Low</td><td>PORTD.5</td></tr>
- *    <tr><td>LEDS_LED3</td><td>Red</td><td>General Indicator</td><td>High</td><td>PORTC.7</td></tr>
- *  </table>
- *
- *  @{
- */
-
-#ifndef __LEDS_YUN_H__
-#define __LEDS_YUN_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_LEDS_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/LEDS.h instead.
-		#endif
-
-	/* Private Interface - For use in library only: */
-	#if !defined(__DOXYGEN__)
-		/* Macros: */
-			#define LEDS_PORTB_LEDS       (LEDS_LED1)
-			#define LEDS_PORTD_LEDS       (LEDS_LED2)
-			#define LEDS_PORTC_LEDS       (LEDS_LED3)
-	#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** LED mask for the first LED on the board. */
-			#define LEDS_LED1        (1 << 0)
-
-			/** LED mask for the second LED on the board. */
-			#define LEDS_LED2        (1 << 5)
-
-			/** LED mask for the third LED on the board. */
-			#define LEDS_LED3        (1 << 7)
-
-			/** LED mask for all the LEDs on the board. */
-			#define LEDS_ALL_LEDS    (LEDS_LED1 | LEDS_LED2 | LEDS_LED3)
-
-			/** LED mask for none of the board LEDs. */
-			#define LEDS_NO_LEDS     0
-
-		/* Inline Functions: */
-		#if !defined(__DOXYGEN__)
-			static inline void LEDs_Init(void)
-			{
-				DDRB  |=  LEDS_PORTB_LEDS;
-				PORTB |=  LEDS_PORTB_LEDS;
-				DDRD  |=  LEDS_PORTD_LEDS;
-				PORTD |=  LEDS_PORTD_LEDS;
-				DDRC  |=  LEDS_PORTC_LEDS;
-				PORTC &= ~LEDS_PORTC_LEDS;
-			}
-
-			static inline void LEDs_Disable(void)
-			{
-				DDRB  &= ~LEDS_PORTB_LEDS;
-				PORTB &= ~LEDS_PORTB_LEDS;
-				DDRD  &= ~LEDS_PORTD_LEDS;
-				PORTD &= ~LEDS_PORTD_LEDS;
-				DDRC  &= ~LEDS_PORTC_LEDS;
-				PORTC &= ~LEDS_PORTC_LEDS;
-			}
-
-			static inline void LEDs_TurnOnLEDs(const uint8_t LEDMask)
-			{
-				PORTB &= ~(LEDMask & LEDS_PORTB_LEDS);
-				PORTD &= ~(LEDMask & LEDS_PORTD_LEDS);
-				PORTC |=  (LEDMask & LEDS_PORTC_LEDS);
-			}
-
-			static inline void LEDs_TurnOffLEDs(const uint8_t LEDMask)
-			{
-				PORTB |=  (LEDMask & LEDS_PORTB_LEDS);
-				PORTD |=  (LEDMask & LEDS_PORTD_LEDS);
-				PORTC &= ~(LEDMask & LEDS_PORTC_LEDS);
-			}
-
-			static inline void LEDs_SetAllLEDs(const uint8_t LEDMask)
-			{
-				PORTB = ((PORTB |  LEDS_PORTB_LEDS) & ~(LEDMask & LEDS_PORTB_LEDS));
-				PORTD = ((PORTD |  LEDS_PORTD_LEDS) & ~(LEDMask & LEDS_PORTD_LEDS));
-				PORTC = ((PORTC & ~LEDS_PORTC_LEDS) |  (LEDMask & LEDS_PORTC_LEDS));
-			}
-
-			static inline void LEDs_ChangeLEDs(const uint8_t LEDMask,
-			                                   const uint8_t ActiveMask)
-			{
-				PORTB = ((PORTB |  (LEDMask & LEDS_PORTB_LEDS)) & ~(ActiveMask & LEDS_PORTB_LEDS));
-				PORTD = ((PORTD |  (LEDMask & LEDS_PORTD_LEDS)) & ~(ActiveMask & LEDS_PORTD_LEDS));
-				PORTC = ((PORTC & ~(LEDMask & LEDS_PORTC_LEDS)) |  (ActiveMask & LEDS_PORTC_LEDS));
-			}
-
-			static inline void LEDs_ToggleLEDs(const uint8_t LEDMask)
-			{
-				PINB  = (LEDMask & LEDS_PORTB_LEDS);
-				PIND  = (LEDMask & LEDS_PORTD_LEDS);
-				PINC  = (LEDMask & LEDS_PORTC_LEDS);
-			}
-
-			static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT;
-			static inline uint8_t LEDs_GetLEDs(void)
-			{
-				return ((~PORTB & LEDS_PORTB_LEDS) | (~PORTD & LEDS_PORTD_LEDS) | (PORTC & LEDS_PORTC_LEDS));
-			}
-		#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/Board.h b/NativePrograms/LUFA/Drivers/Board/Board.h
deleted file mode 100644
index c458f6d43f..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/Board.h
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board hardware information driver.
- *
- *  This file is the master dispatch header file for the board-specific information driver, to give information
- *  on the hardware contained on a specific board.
- *
- *  User code should include this file, which will in turn include the correct board driver header file for the
- *  currently selected board.
- *
- *  If the \c BOARD value is set to \c BOARD_USER, this will include the \c /Board/Board.h file in the user project
- *  directory.
- *
- *  For possible \c BOARD makefile values, see \ref Group_BoardTypes.
- */
-
-/** \ingroup Group_BoardDrivers
- *  \defgroup Group_BoardInfo Board Information Driver - LUFA/Drivers/Board/Board.h
- *  \brief Board hardware information driver.
- *
- *  \section Sec_BoardInfo_Dependencies Module Source Dependencies
- *  The following files must be built with any user project that uses this module:
- *    - None
- *
- *  @{
- */
-
-#ifndef __BOARD_H__
-#define __BOARD_H__
-
-	/* Macros: */
-		#define __INCLUDE_FROM_BOARD_H
-
-	/* Includes: */
-		#include "../../Common/Common.h"
-
-		#if (BOARD == BOARD_USBKEY)
-			#include "AVR8/USBKEY/Board.h"
-		#elif (BOARD == BOARD_STK525)
-			#include "AVR8/STK525/Board.h"
-		#elif (BOARD == BOARD_STK526)
-			#include "AVR8/STK526/Board.h"
-		#elif (BOARD == BOARD_RZUSBSTICK)
-			#include "AVR8/RZUSBSTICK/Board.h"
-		#elif (BOARD == BOARD_ATAVRUSBRF01)
-			#include "AVR8/ATAVRUSBRF01/Board.h"
-		#elif ((BOARD == BOARD_XPLAIN) || (BOARD == BOARD_XPLAIN_REV1))
-			#include "AVR8/XPLAIN/Board.h"
-		#elif (BOARD == BOARD_BUMBLEB)
-			#include "AVR8/BUMBLEB/Board.h"
-		#elif (BOARD == BOARD_EVK527)
-			#include "AVR8/EVK527/Board.h"
-		#elif ((BOARD == BOARD_TEENSY) || (BOARD == BOARD_TEENSY2))
-			#include "AVR8/TEENSY/Board.h"
-		#elif (BOARD == BOARD_USBTINYMKII)
-			#include "AVR8/USBTINYMKII/Board.h"
-		#elif (BOARD == BOARD_BENITO)
-			#include "AVR8/BENITO/Board.h"
-		#elif (BOARD == BOARD_JMDBU2)
-			#include "AVR8/JMDBU2/Board.h"
-		#elif (BOARD == BOARD_OLIMEX162)
-			#include "AVR8/OLIMEX162/Board.h"
-		#elif (BOARD == BOARD_USBFOO)
-			#include "AVR8/USBFOO/Board.h"
-		#elif (BOARD == BOARD_UDIP)
-			#include "AVR8/UDIP/Board.h"
-		#elif (BOARD == BOARD_BUI)
-			#include "AVR8/BUI/Board.h"
-		#elif (BOARD == BOARD_UNO)
-			#include "AVR8/UNO/Board.h"
-		#elif (BOARD == BOARD_CULV3)
-			#include "AVR8/CULV3/Board.h"
-		#elif (BOARD == BOARD_BLACKCAT)
-			#include "AVR8/BLACKCAT/Board.h"
-		#elif (BOARD == BOARD_MAXIMUS)
-			#include "AVR8/MAXIMUS/Board.h"
-		#elif (BOARD == BOARD_MINIMUS)
-			#include "AVR8/MINIMUS/Board.h"
-		#elif (BOARD == BOARD_ADAFRUITU4)
-			#include "AVR8/ADAFRUITU4/Board.h"
-		#elif (BOARD == BOARD_MICROSIN162)
-			#include "AVR8/MICROSIN162/Board.h"
-		#elif (BOARD == BOARD_SPARKFUN8U2)
-			#include "AVR8/SPARKFUN8U2/Board.h"
-		#elif (BOARD == BOARD_EVK1101)
-			#include "UC3/EVK1101/Board.h"
-		#elif (BOARD == BOARD_TUL)
-			#include "AVR8/TUL/Board.h"
-		#elif (BOARD == BOARD_EVK1100)
-			#include "UC3/EVK1100/Board.h"
-		#elif (BOARD == BOARD_EVK1104)
-			#include "UC3/EVK1104/Board.h"
-		#elif (BOARD == BOARD_A3BU_XPLAINED)
-			#include "XMEGA/A3BU_XPLAINED/Board.h"
-		#elif ((BOARD == BOARD_USB2AX) || (BOARD == BOARD_USB2AX_V3) || (BOARD == BOARD_USB2AX_V31))
-			#include "AVR8/USB2AX/Board.h"
-		#elif ((BOARD == BOARD_MICROPENDOUS_REV1) || (BOARD == BOARD_MICROPENDOUS_REV2) || \
-		       (BOARD == BOARD_MICROPENDOUS_32U2) || (BOARD == BOARD_MICROPENDOUS_A) || \
-		       (BOARD == BOARD_MICROPENDOUS_1)    || (BOARD == BOARD_MICROPENDOUS_2) || \
-		       (BOARD == BOARD_MICROPENDOUS_3)    || (BOARD == BOARD_MICROPENDOUS_4) || \
-		       (BOARD == BOARD_MICROPENDOUS_DIP))
-			#include "AVR8/MICROPENDOUS/Board.h"
-		#elif (BOARD == BOARD_B1_XPLAINED)
-			#include "XMEGA/B1_XPLAINED/Board.h"
-		#elif (BOARD == BOARD_MULTIO)
-			#include "AVR8/MULTIO/Board.h"
-		#elif (BOARD == BOARD_BIGMULTIO)
-			#include "AVR8/BIGMULTIO/Board.h"
-		#elif (BOARD == BOARD_DUCE)
-			#include "AVR8/DUCE/Board.h"
-		#elif (BOARD == BOARD_OLIMEX32U4)
-			#include "AVR8/OLIMEX32U4/Board.h"
-		#elif (BOARD == BOARD_OLIMEXT32U4)
-			#include "AVR8/OLIMEXT32U4/Board.h"
-		#elif (BOARD == BOARD_OLIMEXISPMK2)
-			#include "AVR8/OLIMEXISPMK2/Board.h"
-		#elif (BOARD == BOARD_LEONARDO)
-			#include "AVR8/LEONARDO/Board.h"
-		#elif (BOARD == BOARD_UC3A3_XPLAINED)
-			#include "UC3/UC3A3_XPLAINED/Board.h"
-		#elif (BOARD == BOARD_STANGE_ISP)
-			#include "AVR8/STANGE_ISP/Board.h"
-		#elif (BOARD == BOARD_C3_XPLAINED)
-			#include "XMEGA/C3_XPLAINED/Board.h"
-		#elif (BOARD == BOARD_U2S)
-			#include "AVR8/U2S/Board.h"
-		#elif (BOARD == BOARD_YUN)
-			#include "AVR8/YUN/Board.h"
-		#elif (BOARD == BOARD_MICRO)
-			#include "AVR8/MICRO/Board.h"
-		#elif (BOARD == BOARD_POLOLUMICRO)
-			#include "AVR8/POLOLUMICRO/Board.h"
-		#elif (BOARD == BOARD_XPLAINED_MINI)
-			#include "AVR8/XPLAINED_MINI/Board.h"
-		#else
-			#include "Board/Board.h"
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/Buttons.h b/NativePrograms/LUFA/Drivers/Board/Buttons.h
deleted file mode 100644
index 986ee739de..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/Buttons.h
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Digital button board hardware driver.
- *
- *  This file is the master dispatch header file for the board-specific Buttons driver, for boards containing
- *  physical pushbuttons connected to the microcontroller's GPIO pins.
- *
- *  User code should include this file, which will in turn include the correct Button driver header file for the
- *  currently selected board.
- *
- *  If the \c BOARD value is set to \c BOARD_USER, this will include the \c /Board/Buttons.h file in the user project
- *  directory.
- *
- *  For possible \c BOARD makefile values, see \ref Group_BoardTypes.
- */
-
-/** \ingroup Group_BoardDrivers
- *  \defgroup Group_Buttons Buttons Driver - LUFA/Drivers/Board/Buttons.h
- *  \brief Digital button board hardware driver.
- *
- *  \section Sec_Buttons_Dependencies Module Source Dependencies
- *  The following files must be built with any user project that uses this module:
- *    - None
- *
- *  \section Sec_Buttons_ModDescription Module Description
- *  Hardware buttons driver. This provides an easy to use driver for the hardware buttons present on many boards.
- *  It provides a way to easily configure and check the status of all the buttons on the board so that appropriate
- *  actions can be taken.
- *
- *  If the \c BOARD value is set to \c BOARD_USER, this will include the \c /Board/Buttons.h file in the user project
- *  directory. Otherwise, it will include the appropriate built-in board driver header file.
- *
- *  For possible \c BOARD makefile values, see \ref Group_BoardTypes.
- *
- *  \section Sec_Buttons_ExampleUsage Example Usage
- *  The following snippet is an example of how this module may be used within a typical
- *  application.
- *
- *  \code
- *      // Initialize the button driver before first use
- *      Buttons_Init();
- *
- *      printf("Waiting for button press...\r\n");
- *
- *      // Loop until a board button has been pressed
- *      uint8_t ButtonPress;
- *      while (!(ButtonPress = Buttons_GetStatus())) {};
- *
- *      // Display which button was pressed (assuming two board buttons)
- *      printf("Button pressed: %s\r\n", (ButtonPress == BUTTONS_BUTTON1) ? "Button 1" : "Button 2");
- *  \endcode
- *
- *  @{
- */
-
-#ifndef __BUTTONS_H__
-#define __BUTTONS_H__
-
-	/* Macros: */
-		#define __INCLUDE_FROM_BUTTONS_H
-
-	/* Includes: */
-		#include "../../Common/Common.h"
-
-		#if (BOARD == BOARD_NONE)
-			#define BUTTONS_BUTTON1  0
-			static inline void       Buttons_Init(void) {}
-			static inline void       Buttons_Disable(void) {}
-			static inline uint_reg_t Buttons_GetStatus(void) { return 0; }
-		#elif (BOARD == BOARD_USBKEY)
-			#include "AVR8/USBKEY/Buttons.h"
-		#elif (BOARD == BOARD_STK525)
-			#include "AVR8/STK525/Buttons.h"
-		#elif (BOARD == BOARD_STK526)
-			#include "AVR8/STK526/Buttons.h"
-		#elif (BOARD == BOARD_ATAVRUSBRF01)
-			#include "AVR8/ATAVRUSBRF01/Buttons.h"
-		#elif (BOARD == BOARD_BUMBLEB)
-			#include "AVR8/BUMBLEB/Buttons.h"
-		#elif (BOARD == BOARD_EVK527)
-			#include "AVR8/EVK527/Buttons.h"
-		#elif (BOARD == BOARD_USBTINYMKII)
-			#include "AVR8/USBTINYMKII/Buttons.h"
-		#elif (BOARD == BOARD_BENITO)
-			#include "AVR8/BENITO/Buttons.h"
-		#elif (BOARD == BOARD_JMDBU2)
-			#include "AVR8/JMDBU2/Buttons.h"
-		#elif (BOARD == BOARD_OLIMEX162)
-			#include "AVR8/OLIMEX162/Buttons.h"
-		#elif (BOARD == BOARD_USBFOO)
-			#include "AVR8/USBFOO/Buttons.h"
-		#elif (BOARD == BOARD_UDIP)
-			#include "AVR8/UDIP/Buttons.h"
-		#elif (BOARD == BOARD_CULV3)
-			#include "AVR8/CULV3/Buttons.h"
-		#elif (BOARD == BOARD_MINIMUS)
-			#include "AVR8/MINIMUS/Buttons.h"
-		#elif (BOARD == BOARD_MICROSIN162)
-			#include "AVR8/MICROSIN162/Buttons.h"
-		#elif (BOARD == BOARD_EVK1101)
-			#include "UC3/EVK1101/Buttons.h"
-		#elif (BOARD == BOARD_TUL)
-			#include "AVR8/TUL/Buttons.h"
-		#elif (BOARD == BOARD_EVK1100)
-			#include "UC3/EVK1100/Buttons.h"
-		#elif (BOARD == BOARD_EVK1104)
-			#include "UC3/EVK1104/Buttons.h"
-		#elif (BOARD == BOARD_A3BU_XPLAINED)
-			#include "XMEGA/A3BU_XPLAINED/Buttons.h"
-		#elif ((BOARD == BOARD_USB2AX) || (BOARD == BOARD_USB2AX_V3))
-			#include "AVR8/USB2AX/Buttons.h"
-		#elif ((BOARD == BOARD_MICROPENDOUS_32U2) || (BOARD == BOARD_MICROPENDOUS_A) || \
-		       (BOARD == BOARD_MICROPENDOUS_1)    || (BOARD == BOARD_MICROPENDOUS_2) || \
-		       (BOARD == BOARD_MICROPENDOUS_3)    || (BOARD == BOARD_MICROPENDOUS_4) || \
-		       (BOARD == BOARD_MICROPENDOUS_REV1) || (BOARD == BOARD_MICROPENDOUS_REV2) || \
-		       (BOARD == BOARD_MICROPENDOUS_DIP))
-			#include "AVR8/MICROPENDOUS/Buttons.h"
-		#elif (BOARD == BOARD_B1_XPLAINED)
-			#include "XMEGA/B1_XPLAINED/Buttons.h"
-		#elif (BOARD == BOARD_OLIMEX32U4)
-			#include "AVR8/OLIMEX32U4/Buttons.h"
-		#elif (BOARD == BOARD_OLIMEXT32U4)
-			#include "AVR8/OLIMEXT32U4/Buttons.h"
-		#elif (BOARD == BOARD_OLIMEXISPMK2)
-			#include "AVR8/OLIMEXISPMK2/Buttons.h"
-		#elif (BOARD == BOARD_UC3A3_XPLAINED)
-			#include "UC3/UC3A3_XPLAINED/Buttons.h"
-		#elif (BOARD == BOARD_STANGE_ISP)
-			#include "AVR8/STANGE_ISP/Buttons.h"
-		#elif (BOARD == BOARD_C3_XPLAINED)
-			#include "XMEGA/C3_XPLAINED/Buttons.h"
-		#elif (BOARD == BOARD_U2S)
-			#include "AVR8/U2S/Buttons.h"
-		#else
-			#include "Board/Buttons.h"
-		#endif
-
-	/* Pseudo-Functions for Doxygen: */
-	#if defined(__DOXYGEN__)
-		/** Initializes the buttons driver, so that the current button position can be read. This sets the appropriate
-		 *  I/O pins to an inputs with pull-ups enabled.
-		 *
-		 *  This must be called before any Button driver functions are used.
-		 */
-		static inline void Buttons_Init(void);
-
-		/** Disables the buttons driver, releasing the I/O pins back to their default high-impedance input mode. */
-		static inline void Buttons_Disable(void);
-
-		/** Returns a mask indicating which board buttons are currently pressed.
-		 *
-		 *  \return Mask of \c BUTTONS_BUTTON* constants indicating which board buttons are currently pressed.
-		 */
-		static inline uint_reg_t Buttons_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
-	#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/Dataflash.h b/NativePrograms/LUFA/Drivers/Board/Dataflash.h
deleted file mode 100644
index 0a7647db3a..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/Dataflash.h
+++ /dev/null
@@ -1,264 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Master include file for the board dataflash IC driver.
- *  \brief Atmel Dataflash storage IC board hardware driver.
- *
- *  This file is the master dispatch header file for the board-specific Atmel dataflash driver, for boards containing
- *  Atmel Dataflash ICs for external non-volatile storage.
- *
- *  User code should include this file, which will in turn include the correct dataflash driver header file for
- *  the currently selected board.
- *
- *  If the \c BOARD value is set to \c BOARD_USER, this will include the \c /Board/Dataflash.h file in the user project
- *  directory.
- *
- *  For possible \c BOARD makefile values, see \ref Group_BoardTypes.
- */
-
-/** \ingroup Group_BoardDrivers
- *  \defgroup Group_Dataflash Dataflash Driver - LUFA/Drivers/Board/Dataflash.h
- *  \brief Atmel Dataflash storage IC board hardware driver.
- *
- *  \section Sec_Dataflash_Dependencies Module Source Dependencies
- *  The following files must be built with any user project that uses this module:
- *    - None
- *
- *  \section Sec_Dataflash_ModDescription Module Description
- *  Dataflash driver. This module provides an easy to use interface for the Dataflash ICs located on many boards,
- *  for the storage of large amounts of data into the Dataflash's non-volatile memory.
- *
- *  If the \c BOARD value is set to \c BOARD_USER, this will include the \c /Board/Dataflash.h file in the user project
- *  directory. Otherwise, it will include the appropriate built-in board driver header file.
- *
- *  For possible \c BOARD makefile values, see \ref Group_BoardTypes.
- *
- *  \section Sec_Dataflash_ExampleUsage Example Usage
- *  The following snippet is an example of how this module may be used within a typical
- *  application.
- *
- *  \code
- *      // Initialize the board Dataflash driver before first use
- *      Dataflash_Init();
- *
- *      uint8_t WriteBuffer[DATAFLASH_PAGE_SIZE];
- *      uint8_t ReadBuffer[DATAFLASH_PAGE_SIZE];
- *
- *      // Fill page write buffer with a repeating pattern
- *      for (uint16_t i = 0; i < DATAFLASH_PAGE_SIZE; i++)
- *        WriteBuffer[i] = (i & 0xFF);
- *
- *      // Must select the chip of interest first before operating on it
- *      Dataflash_SelectChip(DATAFLASH_CHIP1);
- *
- *      // Write to the Dataflash's first internal memory buffer
- *      printf("Writing data to first dataflash buffer:\r\n");
- *      Dataflash_SendByte(DF_CMD_BUFF1WRITE);
- *      Dataflash_SendAddressBytes(0, 0);
- *
- *      for (uint16_t i = 0; i < DATAFLASH_PAGE_SIZE; i++)
- *        Dataflash_SendByte(WriteBuffer[i]);
- *
- *      // Commit the Dataflash's first memory buffer to the non-volatile FLASH memory
- *      printf("Committing page to non-volatile memory page index 5:\r\n");
- *      Dataflash_SendByte(DF_CMD_BUFF1TOMAINMEMWITHERASE);
- *      Dataflash_SendAddressBytes(5, 0);
- *      Dataflash_WaitWhileBusy();
- *
- *      // Read the page from non-volatile FLASH memory into the Dataflash's second memory buffer
- *      printf("Reading data into second dataflash buffer:\r\n");
- *      Dataflash_SendByte(DF_CMD_MAINMEMTOBUFF2);
- *      Dataflash_SendAddressBytes(5, 0);
- *      Dataflash_WaitWhileBusy();
- *
- *      // Read the Dataflash's second internal memory buffer
- *      Dataflash_SendByte(DF_CMD_BUFF2READ);
- *      Dataflash_SendAddressBytes(0, 0);
- *
- *      for (uint16_t i = 0; i < DATAFLASH_PAGE_SIZE; i++)
- *        ReadBuffer[i] = Dataflash_ReceiveByte();
- *
- *      // Deselect the chip after use
- *      Dataflash_DeselectChip();
- *  \endcode
- *
- *  @{
- */
-
-#ifndef __DATAFLASH_H__
-#define __DATAFLASH_H__
-
-	/* Macros: */
-		#define __INCLUDE_FROM_DATAFLASH_H
-
-	/* Includes: */
-		#include "../../Common/Common.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Retrieves the Dataflash chip select mask for the given Dataflash chip index.
-			 *
-			 *  \attention This macro will only work correctly on chip index numbers that are compile-time
-			 *             constants defined by the preprocessor.
-			 *
-			 *  \param[in] index  Index of the dataflash chip mask to retrieve.
-			 *
-			 *  \return Mask for the given Dataflash chip's /CS pin
-			 */
-			#define DATAFLASH_CHIP_MASK(index)      CONCAT_EXPANDED(DATAFLASH_CHIP, index)
-
-		/* Inline Functions: */
-			/** Initializes the dataflash driver so that commands and data may be sent to an attached dataflash IC.
-			 *
-			 *  \note The microcontroller's physical interface driver connected to the Dataflash IC must be initialized before
-			 *        any of the dataflash commands are used. This is usually a SPI hardware port, but on some devices/boards may
-			 *        be a USART operating in SPI Master mode.
-			 */
-			static inline void Dataflash_Init(void);
-
-			/** Determines the currently selected dataflash chip.
-			 *
-			 *  \return Mask of the currently selected Dataflash chip, either \ref DATAFLASH_NO_CHIP if no chip is selected
-			 *  or a \c DATAFLASH_CHIPn mask (where n is the chip number).
-			 */
-			static inline uint8_t Dataflash_GetSelectedChip(void) ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT;
-
-			/** Selects the given dataflash chip.
-			 *
-			 *  \param[in]  ChipMask  Mask of the Dataflash IC to select, in the form of a \c DATAFLASH_CHIPn mask (where n is
-			 *              the chip number).
-			 */
-			static inline void Dataflash_SelectChip(const uint8_t ChipMask) ATTR_ALWAYS_INLINE;
-
-			/** Deselects the current dataflash chip, so that no dataflash is selected. */
-			static inline void Dataflash_DeselectChip(void) ATTR_ALWAYS_INLINE;
-
-			/** Selects a dataflash IC from the given page number, which should range from 0 to
-			 *  ((DATAFLASH_PAGES * DATAFLASH_TOTALCHIPS) - 1). For boards containing only one
-			 *  dataflash IC, this will select \ref DATAFLASH_CHIP1. If the given page number is outside
-			 *  the total number of pages contained in the boards dataflash ICs, all dataflash ICs
-			 *  are deselected.
-			 *
-			 *  \param[in] PageAddress  Address of the page to manipulate, ranging from
-			 *                          0 to ((DATAFLASH_PAGES * DATAFLASH_TOTALCHIPS) - 1).
-			 */
-			static inline void Dataflash_SelectChipFromPage(const uint16_t PageAddress);
-
-			/** Toggles the select line of the currently selected dataflash IC, so that it is ready to receive
-			 *  a new command.
-			 */
-			static inline void Dataflash_ToggleSelectedChipCS(void);
-
-			/** Spin-loops while the currently selected dataflash is busy executing a command, such as a main
-			 *  memory page program or main memory to buffer transfer.
-			 */
-			static inline void Dataflash_WaitWhileBusy(void);
-
-			/** Sends a set of page and buffer address bytes to the currently selected dataflash IC, for use with
-			 *  dataflash commands which require a complete 24-bit address.
-			 *
-			 *  \param[in] PageAddress  Page address within the selected dataflash IC
-			 *  \param[in] BufferByte   Address within the dataflash's buffer
-			 */
-			static inline void Dataflash_SendAddressBytes(uint16_t PageAddress,
-			                                              const uint16_t BufferByte);
-
-			/** Sends a byte to the currently selected dataflash IC, and returns a byte from the dataflash.
-			 *
-			 *  \param[in] Byte  Byte of data to send to the dataflash
-			 *
-			 *  \return Last response byte from the dataflash
-			 */
-			static inline uint8_t Dataflash_TransferByte(const uint8_t Byte) ATTR_ALWAYS_INLINE;
-
-			/** Sends a byte to the currently selected dataflash IC, and ignores the next byte from the dataflash.
-			 *
-			 *  \param[in] Byte  Byte of data to send to the dataflash
-			 */
-			static inline void Dataflash_SendByte(const uint8_t Byte) ATTR_ALWAYS_INLINE;
-
-			/** Sends a dummy byte to the currently selected dataflash IC, and returns the next byte from the dataflash.
-			 *
-			 *  \return Last response byte from the dataflash
-			 */
-			static inline uint8_t Dataflash_ReceiveByte(void) ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT;
-
-		/* Includes: */
-			#if (BOARD == BOARD_NONE)
-				#define DATAFLASH_TOTALCHIPS  0
-				#define DATAFLASH_NO_CHIP     0
-				#define DATAFLASH_CHIP1       0
-				#define DATAFLASH_PAGE_SIZE   0
-				#define DATAFLASH_PAGES       0
-				static inline void    Dataflash_Init(void) {};
-				static inline uint8_t Dataflash_TransferByte(const uint8_t Byte) { return 0; };
-				static inline void    Dataflash_SendByte(const uint8_t Byte) {};
-				static inline uint8_t Dataflash_ReceiveByte(void) { return 0; };
-				static inline uint8_t Dataflash_GetSelectedChip(void) { return 0; };
-				static inline void    Dataflash_SelectChip(const uint8_t ChipMask) {};
-				static inline void    Dataflash_DeselectChip(void) {};
-				static inline void    Dataflash_SelectChipFromPage(const uint16_t PageAddress) {};
-				static inline void    Dataflash_ToggleSelectedChipCS(void) {};
-				static inline void    Dataflash_WaitWhileBusy(void) {};
-				static inline void    Dataflash_SendAddressBytes(uint16_t PageAddress,
-				                                                 const uint16_t BufferByte) {};
-			#elif (BOARD == BOARD_USBKEY)
-				#include "AVR8/USBKEY/Dataflash.h"
-			#elif (BOARD == BOARD_STK525)
-				#include "AVR8/STK525/Dataflash.h"
-			#elif (BOARD == BOARD_STK526)
-				#include "AVR8/STK526/Dataflash.h"
-			#elif ((BOARD == BOARD_XPLAIN) || (BOARD == BOARD_XPLAIN_REV1))
-				#include "AVR8/XPLAIN/Dataflash.h"
-			#elif (BOARD == BOARD_EVK527)
-				#include "AVR8/EVK527/Dataflash.h"
-			#elif (BOARD == BOARD_A3BU_XPLAINED)
-				#include "XMEGA/A3BU_XPLAINED/Dataflash.h"
-			#elif (BOARD == BOARD_B1_XPLAINED)
-				#include "XMEGA/B1_XPLAINED/Dataflash.h"
-			#else
-				#include "Board/Dataflash.h"
-			#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/Joystick.h b/NativePrograms/LUFA/Drivers/Board/Joystick.h
deleted file mode 100644
index 1b88ba52a5..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/Joystick.h
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Digital joystick board hardware driver.
- *
- *  This file is the master dispatch header file for the board-specific Joystick driver, for boards containing a
- *  digital joystick.
- *
- *  User code should include this file, which will in turn include the correct joystick driver header file for the
- *  currently selected board.
- *
- *  If the \c BOARD value is set to \c BOARD_USER, this will include the \c /Board/Joystick.h file in the user project
- *  directory.
- *
- *  For possible \c BOARD makefile values, see \ref Group_BoardTypes.
- */
-
-/** \ingroup Group_BoardDrivers
- *  \defgroup Group_Joystick Joystick Driver - LUFA/Drivers/Board/Joystick.h
- *  \brief Digital joystick board hardware driver.
- *
- *  \section Sec_Joystick_Dependencies Module Source Dependencies
- *  The following files must be built with any user project that uses this module:
- *    - None
- *
- *  \section Sec_Joystick_ModDescription Module Description
- *  Hardware Joystick driver. This module provides an easy to use interface to control the hardware digital Joystick
- *  located on many boards.
- *
- *  If the \c BOARD value is set to \c BOARD_USER, this will include the \c /Board/Joystick.h file in the user project
- *  directory. Otherwise, it will include the appropriate built-in board driver header file.
- *
- *  For possible \c BOARD makefile values, see \ref Group_BoardTypes.
- *
- *  \section Sec_Joystick_ExampleUsage Example Usage
- *  The following snippet is an example of how this module may be used within a typical
- *  application.
- *
- *  \code
- *      // Initialize the board Joystick driver before first use
- *      Joystick_Init();
- *
- *      printf("Waiting for joystick movement...\r\n");
- *
- *      // Loop until a the joystick has been moved
- *      uint8_t JoystickMovement;
- *      while (!(JoystickMovement = Joystick_GetStatus())) {};
- *
- *      // Display which direction the joystick was moved in
- *      printf("Joystick moved:\r\n");
- *
- *      if (JoystickMovement & (JOY_UP | JOY_DOWN))
- *        printf("%s ", (JoystickMovement & JOY_UP) ? "Up" : "Down");
- *
- *      if (JoystickMovement & (JOY_LEFT | JOY_RIGHT))
- *        printf("%s ", (JoystickMovement & JOY_LEFT) ? "Left" : "Right");
- *
- *      if (JoystickMovement & JOY_PRESS)
- *        printf("Pressed");
- *  \endcode
- *
- *  @{
- */
-
-#ifndef __JOYSTICK_H__
-#define __JOYSTICK_H__
-
-	/* Macros: */
-		#define __INCLUDE_FROM_JOYSTICK_H
-
-	/* Includes: */
-		#include "../../Common/Common.h"
-
-		#if (BOARD == BOARD_NONE)
-			#define JOY_UP           0
-			#define JOY_DOWN         0
-			#define JOY_LEFT         0
-			#define JOY_RIGHT        0
-			#define JOY_PRESS        0
-			static inline void       Joystick_Init(void) {}
-			static inline void       Joystick_Disable(void) {}
-			static inline uint_reg_t Joystick_GetStatus(void) { return 0; }
-		#elif (BOARD == BOARD_USBKEY)
-			#include "AVR8/USBKEY/Joystick.h"
-		#elif (BOARD == BOARD_STK525)
-			#include "AVR8/STK525/Joystick.h"
-		#elif (BOARD == BOARD_STK526)
-			#include "AVR8/STK526/Joystick.h"
-		#elif (BOARD == BOARD_BUMBLEB)
-			#include "AVR8/BUMBLEB/Joystick.h"
-		#elif (BOARD == BOARD_EVK527)
-			#include "AVR8/EVK527/Joystick.h"
-		#elif (BOARD == BOARD_EVK1101)
-			#include "UC3/EVK1101/Joystick.h"
-		#elif (BOARD == BOARD_EVK1100)
-			#include "UC3/EVK1100/Joystick.h"
-		#else
-			#include "Board/Joystick.h"
-		#endif
-
-	/* Pseudo-Functions for Doxygen: */
-	#if defined(__DOXYGEN__)
-		/** Initializes the joystick driver so that the joystick position can be read. This sets the appropriate
-		 *  I/O pins to inputs with their pull-ups enabled.
-		 *
-		 *  This must be called before any Joystick driver functions are used.
-		 */
-		static inline void Joystick_Init(void);
-
-		/** Disables the joystick driver, releasing the I/O pins back to their default high-impedance input mode. */
-		static inline void Joystick_Disable(void);
-
-		/** Returns the current status of the joystick, as a mask indicating the direction the joystick is
-		 *  currently facing in (multiple bits can be set).
-		 *
-		 *  \return Mask of \c JOYSTICK_* constants indicating the current joystick direction(s).
-		 */
-		static inline uint_reg_t Joystick_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
-	#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/LEDs.h b/NativePrograms/LUFA/Drivers/Board/LEDs.h
deleted file mode 100644
index de6c091df1..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/LEDs.h
+++ /dev/null
@@ -1,302 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief LED board hardware driver.
- *
- *  This file is the master dispatch header file for the board-specific LED driver, for boards containing user
- *  controllable LEDs.
- *
- *  User code should include this file, which will in turn include the correct LED driver header file for the
- *  currently selected board.
- *
- *  If the \c BOARD value is set to \c BOARD_USER, this will include the \c /Board/LEDs.h file in the user project
- *  directory.
- *
- *  For possible \c BOARD makefile values, see \ref Group_BoardTypes.
- */
-
-/** \ingroup Group_BoardDrivers
- *  \defgroup Group_LEDs LEDs Driver - LUFA/Drivers/Board/LEDs.h
- *  \brief LED board hardware driver.
- *
- *  \section Sec_LEDs_Dependencies Module Source Dependencies
- *  The following files must be built with any user project that uses this module:
- *    - None
- *
- *  \section Sec_LEDs_ModDescription Module Description
- *  Hardware LEDs driver. This provides an easy to use driver for the hardware LEDs present on many boards. It
- *  provides an interface to configure, test and change the status of all the board LEDs.
- *
- *  If the \c BOARD value is set to \c BOARD_USER, this will include the \c /Board/LEDs.h file in the user project
- *  directory. Otherwise, it will include the appropriate built-in board driver header file. If the BOARD value
- *  is set to \c BOARD_NONE, this driver is silently disabled.
- *
- *  For possible \c BOARD makefile values, see \ref Group_BoardTypes.
- *
- *  \note To make code as compatible as possible, it is assumed that all boards carry a minimum of four LEDs. If
- *        a board contains less than four LEDs, the remaining LED masks are defined to 0 so as to have no effect.
- *        If other behavior is desired, either alias the remaining LED masks to existing LED masks via the -D
- *        switch in the project makefile, or alias them to nothing in the makefile to cause compilation errors when
- *        a non-existing LED is referenced in application code. Note that this means that it is possible to make
- *        compatible code for a board with no LEDs by making a board LED driver (see \ref Page_WritingBoardDrivers)
- *        which contains only stub functions and defines no LEDs.
- *
- *  \section Sec_LEDs_ExampleUsage Example Usage
- *  The following snippet is an example of how this module may be used within a typical
- *  application.
- *
- *  \code
- *      // Initialize the board LED driver before first use
- *      LEDs_Init();
- *
- *      // Turn on each of the four LEDs in turn
- *      LEDs_SetAllLEDs(LEDS_LED1);
- *      Delay_MS(500);
- *      LEDs_SetAllLEDs(LEDS_LED2);
- *      Delay_MS(500);
- *      LEDs_SetAllLEDs(LEDS_LED3);
- *      Delay_MS(500);
- *      LEDs_SetAllLEDs(LEDS_LED4);
- *      Delay_MS(500);
- *
- *      // Turn on all LEDs
- *      LEDs_SetAllLEDs(LEDS_ALL_LEDS);
- *      Delay_MS(1000);
- *
- *      // Turn on LED 1, turn off LED 2, leaving LEDs 3 and 4 in their current state
- *      LEDs_ChangeLEDs((LEDS_LED1 | LEDS_LED2), LEDS_LED1);
- *  \endcode
- *
- *  @{
- */
-
-#ifndef __LEDS_H__
-#define __LEDS_H__
-
-	/* Macros: */
-		#define __INCLUDE_FROM_LEDS_H
-
-	/* Includes: */
-		#include "../../Common/Common.h"
-
-		#if (BOARD == BOARD_NONE)
-			static inline void       LEDs_Init(void) {}
-			static inline void       LEDs_Disable(void) {}
-			static inline void       LEDs_TurnOnLEDs(const uint_reg_t LEDMask) {}
-			static inline void       LEDs_TurnOffLEDs(const uint_reg_t LEDMask) {}
-			static inline void       LEDs_SetAllLEDs(const uint_reg_t LEDMask) {}
-			static inline void       LEDs_ChangeLEDs(const uint_reg_t LEDMask, const uint_reg_t ActiveMask) {}
-			static inline void       LEDs_ToggleLEDs(const uint_reg_t LEDMask) {}
-			static inline uint_reg_t LEDs_GetLEDs(void) { return 0; }
-		#elif (BOARD == BOARD_USBKEY)
-			#include "AVR8/USBKEY/LEDs.h"
-		#elif (BOARD == BOARD_STK525)
-			#include "AVR8/STK525/LEDs.h"
-		#elif (BOARD == BOARD_STK526)
-			#include "AVR8/STK526/LEDs.h"
-		#elif (BOARD == BOARD_RZUSBSTICK)
-			#include "AVR8/RZUSBSTICK/LEDs.h"
-		#elif (BOARD == BOARD_ATAVRUSBRF01)
-			#include "AVR8/ATAVRUSBRF01/LEDs.h"
-		#elif ((BOARD == BOARD_XPLAIN) || (BOARD == BOARD_XPLAIN_REV1))
-			#include "AVR8/XPLAIN/LEDs.h"
-		#elif (BOARD == BOARD_BUMBLEB)
-			#include "AVR8/BUMBLEB/LEDs.h"
-		#elif (BOARD == BOARD_EVK527)
-			#include "AVR8/EVK527/LEDs.h"
-		#elif ((BOARD == BOARD_TEENSY) || (BOARD == BOARD_TEENSY2))
-			#include "AVR8/TEENSY/LEDs.h"
-		#elif (BOARD == BOARD_USBTINYMKII)
-			#include "AVR8/USBTINYMKII/LEDs.h"
-		#elif (BOARD == BOARD_BENITO)
-			#include "AVR8/BENITO/LEDs.h"
-		#elif (BOARD == BOARD_JMDBU2)
-			#include "AVR8/JMDBU2/LEDs.h"
-		#elif (BOARD == BOARD_OLIMEX162)
-			#include "AVR8/OLIMEX162/LEDs.h"
-		#elif (BOARD == BOARD_USBFOO)
-			#include "AVR8/USBFOO/LEDs.h"
-		#elif (BOARD == BOARD_UDIP)
-			#include "AVR8/UDIP/LEDs.h"
-		#elif (BOARD == BOARD_BUI)
-			#include "AVR8/BUI/LEDs.h"
-		#elif (BOARD == BOARD_UNO)
-			#include "AVR8/UNO/LEDs.h"
-		#elif (BOARD == BOARD_CULV3)
-			#include "AVR8/CULV3/LEDs.h"
-		#elif (BOARD == BOARD_BLACKCAT)
-			#include "AVR8/BLACKCAT/LEDs.h"
-		#elif (BOARD == BOARD_MAXIMUS)
-			#include "AVR8/MAXIMUS/LEDs.h"
-		#elif (BOARD == BOARD_MINIMUS)
-			#include "AVR8/MINIMUS/LEDs.h"
-		#elif (BOARD == BOARD_ADAFRUITU4)
-			#include "AVR8/ADAFRUITU4/LEDs.h"
-		#elif (BOARD == BOARD_MICROSIN162)
-			#include "AVR8/MICROSIN162/LEDs.h"
-		#elif (BOARD == BOARD_SPARKFUN8U2)
-			#include "AVR8/SPARKFUN8U2/LEDs.h"
-		#elif (BOARD == BOARD_EVK1101)
-			#include "UC3/EVK1101/LEDs.h"
-		#elif (BOARD == BOARD_TUL)
-			#include "AVR8/TUL/LEDs.h"
-		#elif (BOARD == BOARD_EVK1100)
-			#include "UC3/EVK1100/LEDs.h"
-		#elif (BOARD == BOARD_EVK1104)
-			#include "UC3/EVK1104/LEDs.h"
-		#elif (BOARD == BOARD_A3BU_XPLAINED)
-			#include "XMEGA/A3BU_XPLAINED/LEDs.h"
-		#elif ((BOARD == BOARD_USB2AX) || (BOARD == BOARD_USB2AX_V3) || (BOARD == BOARD_USB2AX_V31))
-			#include "AVR8/USB2AX/LEDs.h"
-		#elif ((BOARD == BOARD_MICROPENDOUS_REV1) || (BOARD == BOARD_MICROPENDOUS_REV2) || \
-		       (BOARD == BOARD_MICROPENDOUS_32U2))
-			#include "AVR8/MICROPENDOUS/LEDs.h"
-		#elif (BOARD == BOARD_B1_XPLAINED)
-			#include "XMEGA/B1_XPLAINED/LEDs.h"
-		#elif (BOARD == BOARD_MULTIO)
-			#include "AVR8/MULTIO/LEDs.h"
-		#elif (BOARD == BOARD_BIGMULTIO)
-			#include "AVR8/BIGMULTIO/LEDs.h"
-		#elif (BOARD == BOARD_DUCE)
-			#include "AVR8/DUCE/LEDs.h"
-		#elif (BOARD == BOARD_OLIMEX32U4)
-			#include "AVR8/OLIMEX32U4/LEDs.h"
-		#elif (BOARD == BOARD_OLIMEXT32U4)
-			#include "AVR8/OLIMEXT32U4/LEDs.h"
-		#elif (BOARD == BOARD_OLIMEXISPMK2)
-			#include "AVR8/OLIMEXISPMK2/LEDs.h"
-		#elif (BOARD == BOARD_LEONARDO)
-			#include "AVR8/LEONARDO/LEDs.h"
-		#elif (BOARD == BOARD_UC3A3_XPLAINED)
-			#include "UC3/UC3A3_XPLAINED/LEDs.h"
-		#elif (BOARD == BOARD_STANGE_ISP)
-			#include "AVR8/STANGE_ISP/LEDs.h"
-		#elif (BOARD == BOARD_C3_XPLAINED)
-			#include "XMEGA/C3_XPLAINED/LEDs.h"
-		#elif (BOARD == BOARD_U2S)
-			#include "AVR8/U2S/LEDs.h"
-		#elif (BOARD == BOARD_YUN)
-			#include "AVR8/YUN/LEDs.h"
-		#elif (BOARD == BOARD_MICRO)
-			#include "AVR8/MICRO/LEDs.h"
-		#elif (BOARD == BOARD_POLOLUMICRO)
-			#include "AVR8/POLOLUMICRO/LEDs.h"
-		#elif (BOARD == BOARD_XPLAINED_MINI)
-			#include "AVR8/XPLAINED_MINI/LEDs.h"
-		#else
-			#include "Board/LEDs.h"
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__DOXYGEN__)
-			#if !defined(LEDS_NO_LEDS)
-				#define LEDS_NO_LEDS   0
-			#endif
-
-			#if !defined(LEDS_ALL_LEDS)
-				#define LEDS_ALL_LEDS  (LEDS_LED1 | LEDS_LED2 | LEDS_LED3 | LEDS_LED4)
-			#endif
-
-			#if !defined(LEDS_LED1)
-				#define LEDS_LED1      0
-			#endif
-
-			#if !defined(LEDS_LED2)
-				#define LEDS_LED2      0
-			#endif
-
-			#if !defined(LEDS_LED3)
-				#define LEDS_LED3      0
-			#endif
-
-			#if !defined(LEDS_LED4)
-				#define LEDS_LED4      0
-			#endif
-		#endif
-
-	/* Pseudo-Functions for Doxygen: */
-	#if defined(__DOXYGEN__)
-		/** Initializes the board LED driver so that the LEDs can be controlled. This sets the appropriate port
-		 *  I/O pins as outputs, and sets the LEDs to default to off.
-		 *
-		 *  This must be called before any LED driver functions are used.
-		 */
-		static inline void LEDs_Init(void);
-
-		/** Disables the board LED driver, releasing the I/O pins back to their default high-impedance input mode. */
-		static inline void LEDs_Disable(void);
-
-		/** Turns on the LEDs specified in the given LED mask.
-		 *
-		 *  \param[in] LEDMask  Mask of the board LEDs to manipulate (see board-specific LEDs.h driver file).
-		 */
-		static inline void LEDs_TurnOnLEDs(const uint_reg_t LEDMask);
-
-		/** Turns off the LEDs specified in the given LED mask.
-		 *
-		 *  \param[in] LEDMask  Mask of the board LEDs to manipulate (see board-specific LEDs.h driver file).
-		 */
-		static inline void LEDs_TurnOffLEDs(const uint_reg_t LEDMask);
-
-		/** Turns off all LEDs not specified in the given LED mask, and turns on all the LEDs in the given LED
-		 *  mask.
-		 *
-		 *  \param[in] LEDMask  Mask of the board LEDs to manipulate (see board-specific LEDs.h driver file).
-		 */
-		static inline void LEDs_SetAllLEDs(const uint_reg_t LEDMask);
-
-		/** Turns off all LEDs in the LED mask that are not set in the active mask, and turns on all the LEDs
-		 *  specified in both the LED and active masks.
-		 *
-		 *  \param[in] LEDMask     Mask of the board LEDs to manipulate (see board-specific LEDs.h driver file).
-		 *  \param[in] ActiveMask  Mask of whether the LEDs in the LED mask should be turned on or off.
-		 */
-		static inline void LEDs_ChangeLEDs(const uint_reg_t LEDMask,
-		                                   const uint_reg_t ActiveMask);
-
-		/** Toggles all LEDs in the LED mask, leaving all others in their current states.
-		 *
-		 *  \param[in] LEDMask  Mask of the board LEDs to manipulate (see board-specific LEDs.h driver file).
-		 */
-		static inline void LEDs_ToggleLEDs(const uint_reg_t LEDMask);
-
-		/** Returns the status of all the board LEDs; set LED masks in the return value indicate that the
-		 *  corresponding LED is on.
-		 *
-		 *  \return Mask of \c LEDS_LED* constants indicating which of the board LEDs are currently turned on.
-		 */
-		static inline uint_reg_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT;
-	#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/Temperature.c b/NativePrograms/LUFA/Drivers/Board/Temperature.c
deleted file mode 100644
index bd1410ef8d..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/Temperature.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-#define  __INCLUDE_FROM_TEMPERATURE_C
-#include "Temperature.h"
-
-#if defined(TEMPERATURE_SENSOR_DRIVER_COMPATIBLE)
-
-static const uint16_t PROGMEM Temperature_Lookup[TEMP_TABLE_SIZE] =
-{
-	0x3B4, 0x3B0, 0x3AB, 0x3A6, 0x3A0, 0x39A, 0x394, 0x38E, 0x388, 0x381, 0x37A, 0x373,
-	0x36B, 0x363, 0x35B, 0x353, 0x34A, 0x341, 0x338, 0x32F, 0x325, 0x31B, 0x311, 0x307,
-	0x2FC, 0x2F1, 0x2E6, 0x2DB, 0x2D0, 0x2C4, 0x2B8, 0x2AC, 0x2A0, 0x294, 0x288, 0x27C,
-	0x26F, 0x263, 0x256, 0x24A, 0x23D, 0x231, 0x225, 0x218, 0x20C, 0x200, 0x1F3, 0x1E7,
-	0x1DB, 0x1CF, 0x1C4, 0x1B8, 0x1AC, 0x1A1, 0x196, 0x18B, 0x180, 0x176, 0x16B, 0x161,
-	0x157, 0x14D, 0x144, 0x13A, 0x131, 0x128, 0x11F, 0x117, 0x10F, 0x106, 0x0FE, 0x0F7,
-	0x0EF, 0x0E8, 0x0E1, 0x0DA, 0x0D3, 0x0CD, 0x0C7, 0x0C0, 0x0BA, 0x0B5, 0x0AF, 0x0AA,
-	0x0A4, 0x09F, 0x09A, 0x096, 0x091, 0x08C, 0x088, 0x084, 0x080, 0x07C, 0x078, 0x074,
-	0x071, 0x06D, 0x06A, 0x067, 0x064, 0x061, 0x05E, 0x05B, 0x058, 0x055, 0x053, 0x050,
-	0x04E, 0x04C, 0x049, 0x047, 0x045, 0x043, 0x041, 0x03F, 0x03D, 0x03C, 0x03A, 0x038
-};
-
-int8_t Temperature_GetTemperature(void)
-{
-	uint16_t Temp_ADC = ADC_GetChannelReading(ADC_REFERENCE_AVCC | ADC_RIGHT_ADJUSTED | TEMP_ADC_CHANNEL_MASK);
-
-	if (Temp_ADC > pgm_read_word(&Temperature_Lookup[0]))
-	  return TEMP_MIN_TEMP;
-
-	for (uint16_t Index = 0; Index < TEMP_TABLE_SIZE; Index++)
-	{
-		if (Temp_ADC > pgm_read_word(&Temperature_Lookup[Index]))
-		  return (Index + TEMP_TABLE_OFFSET_DEGREES);
-	}
-
-	return TEMP_MAX_TEMP;
-}
-
-#endif
diff --git a/NativePrograms/LUFA/Drivers/Board/Temperature.h b/NativePrograms/LUFA/Drivers/Board/Temperature.h
deleted file mode 100644
index 22c90d6b57..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/Temperature.h
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief NTC Temperature Sensor board hardware driver.
- *
- *  Master include file for the board temperature sensor driver, for the USB boards which contain a temperature sensor.
- */
-
-/** \ingroup Group_BoardDrivers
- *  \defgroup Group_Temperature Temperature Sensor Driver - LUFA/Drivers/Board/Temperature.h
- *  \brief NTC Temperature Sensor board hardware driver.
- *
- *  \section Sec_Temperature_Dependencies Module Source Dependencies
- *  The following files must be built with any user project that uses this module:
- *    - LUFA/Drivers/Board/Temperature.c <i>(Makefile source module name: LUFA_SRC_TEMPERATURE)</i>
- *
- *  \section Sec_Temperature_ModDescription Module Description
- *  Temperature sensor driver. This provides an easy to use interface for the hardware temperature sensor located
- *  on many boards. It provides an interface to configure the sensor and appropriate ADC channel, plus read out the
- *  current temperature in degrees C. It is designed for and will only work with the temperature sensor located on the
- *  official Atmel USB AVR boards, as each sensor has different characteristics.
- *
- *  \section Sec_Temperature_ExampleUsage Example Usage
- *  The following snippet is an example of how this module may be used within a typical
- *  application.
- *
- *  \code
- *      // Initialize the ADC and board temperature sensor drivers before first use
- *      ADC_Init(ADC_FREE_RUNNING | ADC_PRESCALE_128);
- *      Temperature_Init();
- *
- *      // Display converted temperature in degrees Celsius
- *      printf("Current Temperature: %d Degrees\r\n", Temperature_GetTemperature());
- *  \endcode
- *
- *  @{
- */
-
-#ifndef __TEMPERATURE_H__
-#define __TEMPERATURE_H__
-
-	/* Includes: */
-		#include "../../Common/Common.h"
-
-	/* Preprocessor Checks: */
-		#if ((BOARD == BOARD_USBKEY) || (BOARD == BOARD_STK525) || \
-		     (BOARD == BOARD_STK526) || (BOARD == BOARD_EVK527))
-			#define TEMPERATURE_SENSOR_DRIVER_COMPATIBLE
-		#endif
-
-		#if !defined(__INCLUDE_FROM_TEMPERATURE_C) && !defined(TEMPERATURE_SENSOR_DRIVER_COMPATIBLE)
-			#error The selected board does not contain a compatible temperature sensor.
-		#endif
-
-	#if defined(TEMPERATURE_SENSOR_DRIVER_COMPATIBLE)
-
-	/* Includes: */
-		#include "../Peripheral/ADC.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** ADC channel number for the temperature sensor. */
-			#define TEMP_ADC_CHANNEL       0
-
-			/** ADC channel MUX mask for the temperature sensor. */
-			#define TEMP_ADC_CHANNEL_MASK  ADC_CHANNEL0
-
-			/** Size of the temperature sensor lookup table, in lookup values */
-			#define TEMP_TABLE_SIZE        120
-
-			/** Minimum returnable temperature from the \ref Temperature_GetTemperature() function. */
-			#define TEMP_MIN_TEMP          TEMP_TABLE_OFFSET_DEGREES
-
-			/** Maximum returnable temperature from the \ref Temperature_GetTemperature() function. */
-			#define TEMP_MAX_TEMP          ((TEMP_TABLE_SIZE - 1) + TEMP_TABLE_OFFSET_DEGREES)
-
-		/* Inline Functions: */
-			/** Initializes the temperature sensor driver, including setting up the appropriate ADC channel.
-			 *  This must be called before any other temperature sensor routines.
-			 *
-			 *  \pre The ADC itself (not the ADC channel) must be configured separately before calling the
-			 *       temperature sensor functions.
-			 */
-			static inline void Temperature_Init(void) ATTR_ALWAYS_INLINE;
-			static inline void Temperature_Init(void)
-			{
-				ADC_SetupChannel(TEMP_ADC_CHANNEL);
-			}
-
-		/* Function Prototypes: */
-			/** Performs a complete ADC on the temperature sensor channel, and converts the result into a
-			 *  valid temperature between \ref TEMP_MIN_TEMP and \ref TEMP_MAX_TEMP in degrees Celsius.
-			 *
-			 *  \return Signed temperature value in degrees Celsius.
-			 */
-			int8_t Temperature_GetTemperature(void) ATTR_WARN_UNUSED_RESULT;
-
-	/* Private Interface - For use in library only: */
-	#if !defined(__DOXYGEN__)
-		/* Macros: */
-			#define TEMP_TABLE_OFFSET_DEGREES   -21
-	#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-	#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/UC3/EVK1100/Board.h b/NativePrograms/LUFA/Drivers/Board/UC3/EVK1100/Board.h
deleted file mode 100644
index e131cf0565..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/UC3/EVK1100/Board.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific information header for the Atmel EVK1100.
- *  \copydetails Group_BoardInfo_EVK1100
- *
- *  \note This file should not be included directly. It is automatically included as needed by the Board driver
- *        dispatch header located in LUFA/Drivers/Board/Board.h.
- */
-
-/** \ingroup Group_BoardInfo
- *  \defgroup Group_BoardInfo_EVK1100 EVK1100
- *  \brief Board specific information header for the Atmel Atmel EVK1100.
- *
- *  Board specific information header for the Atmel Atmel EVK1100.
- *
- *  @{
- */
-
-#ifndef __BOARD_EVK1100_H__
-#define __BOARD_EVK1100_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-		#include "../../Buttons.h"
-		#include "../../Joystick.h"
-		#include "../../LEDs.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_BOARD_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/Board.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Indicates the board has hardware Buttons mounted. */
-			#define BOARD_HAS_BUTTONS
-
-			/** Indicates the board has a hardware Joystick mounted. */
-			#define BOARD_HAS_JOYSTICK
-
-			/** Indicates the board has hardware LEDs mounted. */
-			#define BOARD_HAS_LEDS
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/UC3/EVK1100/Buttons.h b/NativePrograms/LUFA/Drivers/Board/UC3/EVK1100/Buttons.h
deleted file mode 100644
index 7923e72937..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/UC3/EVK1100/Buttons.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific Buttons driver header for the Atmel EVK1100.
- *  \copydetails Group_Buttons_EVK1100
- *
- *  \note This file should not be included directly. It is automatically included as needed by the Buttons driver
- *        dispatch header located in LUFA/Drivers/Board/Buttons.h.
- */
-
-/** \ingroup Group_Buttons
- *  \defgroup Group_Buttons_EVK1100 EVK1100
- *  \brief Board specific Buttons driver header for the Atmel EVK1100.
- *
- *  Board specific Buttons driver header for the Atmel EVK1100.
- *
- *  <table>
- *    <tr><th>Name</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr>
- *    <tr><td>BUTTONS_BUTTON1</td><td>SW0 Button</td><td>Low</td><td>GPIO88</td></tr>
- *    <tr><td>BUTTONS_BUTTON2</td><td>SW1 Button</td><td>Low</td><td>GPIO85</td></tr>
- *    <tr><td>BUTTONS_BUTTON3</td><td>SW2 Button</td><td>Low</td><td>GPIO82</td></tr>
- *  </table>
- *
- *  @{
- */
-
-#ifndef __BUTTONS_EVK1100_H__
-#define __BUTTONS_EVK1100_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_BUTTONS_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/Buttons.h instead.
-		#endif
-
-	/* Private Interface - For use in library only: */
-	#if !defined(__DOXYGEN__)
-		/* Macros: */
-			#define BUTTONS_PORT          2
-	#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Mask of the first button on the board */
-			#define BUTTONS_BUTTON1       (1UL << 24)
-
-			/** Mask of the second button on the board */
-			#define BUTTONS_BUTTON2       (1UL << 21)
-
-			/** Mask of the third button on the board */
-			#define BUTTONS_BUTTON3       (1UL << 18)
-
-		/* Inline Functions: */
-		#if !defined(__DOXYGEN__)
-			static inline void Buttons_Init(void)
-			{
-				AVR32_GPIO.port[BUTTONS_PORT].gpers = (BUTTONS_BUTTON1 | BUTTONS_BUTTON2);
-				AVR32_GPIO.port[BUTTONS_PORT].puers = (BUTTONS_BUTTON1 | BUTTONS_BUTTON2);
-			}
-
-			static inline void Buttons_Disable(void)
-			{
-				AVR32_GPIO.port[BUTTONS_PORT].gperc = (BUTTONS_BUTTON1 | BUTTONS_BUTTON2);
-				AVR32_GPIO.port[BUTTONS_PORT].puerc = (BUTTONS_BUTTON1 | BUTTONS_BUTTON2);
-			}
-
-			static inline uint32_t Buttons_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
-			static inline uint32_t Buttons_GetStatus(void)
-			{
-				return (~(AVR32_GPIO.port[JOY_MOVE_PORT].pvr & (BUTTONS_BUTTON1 | BUTTONS_BUTTON2)));
-			}
-		#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/UC3/EVK1100/Joystick.h b/NativePrograms/LUFA/Drivers/Board/UC3/EVK1100/Joystick.h
deleted file mode 100644
index 725537be88..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/UC3/EVK1100/Joystick.h
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific joystick driver header for the Atmel EVK1100.
- *  \copydetails Group_Joystick_EVK1100
- *
- *  \note This file should not be included directly. It is automatically included as needed by the joystick driver
- *        dispatch header located in LUFA/Drivers/Board/Joystick.h.
- */
-
-/** \ingroup Group_Joystick
- *  \defgroup Group_Joystick_EVK1100 EVK1100
- *  \brief Board specific joystick driver header for the Atmel EVK1100.
- *
- *  Board specific joystick driver header for the Atmel EVK1100.
- *
- *  <table>
- *    <tr><th>Left Port Pin</th><th>Up Port Pin</th><th>Right Port Pin</th><th>Down Port Pin</th><th>Press Port Pin</th></tr>
- *    <tr><td>GPIO25</td><td>GPIO26</td><td>GPIO28</td><td>GPIO27</td><td>GPIO20</td></tr>
- *  </table>
- *
- *  @{
- */
-
-#ifndef __JOYSTICK_EVK1100_H__
-#define __JOYSTICK_EVK1100_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_JOYSTICK_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/Joystick.h instead.
-		#endif
-
-	/* Private Interface - For use in library only: */
-	#if !defined(__DOXYGEN__)
-		/* Macros: */
-			#define JOY_PORT                 0
-			#define JOY_MASK                ((1UL << 28) | (1UL << 27) | (1UL << 26) | (1UL << 25) | (1UL << 20))
-	#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Mask for the joystick being pushed in the left direction. */
-			#define JOY_LEFT                  (1UL << 25)
-
-			/** Mask for the joystick being pushed in the upward direction. */
-			#define JOY_UP                    (1UL << 26)
-
-			/** Mask for the joystick being pushed in the right direction. */
-			#define JOY_RIGHT                 (1UL << 28)
-
-			/** Mask for the joystick being pushed in the downward direction. */
-			#define JOY_DOWN                  (1UL << 27)
-
-			/** Mask for the joystick being pushed inward. */
-			#define JOY_PRESS                 (1UL << 20)
-
-		/* Inline Functions: */
-		#if !defined(__DOXYGEN__)
-			static inline void Joystick_Init(void)
-			{
-				AVR32_GPIO.port[JOY_PORT].gpers = JOY_MASK;
-				AVR32_GPIO.port[JOY_PORT].gpers = JOY_MASK;
-			};
-
-			static inline void Joystick_Disable(void)
-			{
-				AVR32_GPIO.port[JOY_PORT].gperc = JOY_MASK;
-				AVR32_GPIO.port[JOY_PORT].gperc = JOY_MASK;
-			};
-
-			static inline uint32_t Joystick_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
-			static inline uint32_t Joystick_GetStatus(void)
-			{
-				return (uint32_t)(~(AVR32_GPIO.port[JOY_PORT].pvr & JOY_MASK));
-			}
-		#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/UC3/EVK1100/LEDs.h b/NativePrograms/LUFA/Drivers/Board/UC3/EVK1100/LEDs.h
deleted file mode 100644
index 4a9a569a1a..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/UC3/EVK1100/LEDs.h
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific LED driver header for the Atmel EVK1100.
- *  \copydetails Group_LEDs_EVK1100
- *
- *  \note This file should not be included directly. It is automatically included as needed by the LEDs driver
- *        dispatch header located in LUFA/Drivers/Board/LEDs.h.
- */
-
-/** \ingroup Group_LEDs
- *  \defgroup Group_LEDs_EVK1100 EVK1100
- *  \brief Board specific LED driver header for the Atmel EVK1100.
- *
- *  Board specific LED driver header for the Atmel EVK1100.
- *
- *  <table>
- *    <tr><th>Name</th><th>Color</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr>
- *    <tr><td>LEDS_LED1</td><td>Green</td><td>LED0 LED</td><td>Low</td><td>GPIO51</td></tr>
- *    <tr><td>LEDS_LED2</td><td>Green</td><td>LED1 LED</td><td>Low</td><td>GPIO52</td></tr>
- *    <tr><td>LEDS_LED3</td><td>Green</td><td>LED2 LED</td><td>Low</td><td>GPIO53</td></tr>
- *    <tr><td>LEDS_LED4</td><td>Green</td><td>LED3 LED</td><td>Low</td><td>GPIO54</td></tr>
- *    <tr><td>LEDS_LED5</td><td>Green</td><td>LED4 LED</td><td>Low</td><td>GPIO59</td></tr>
- *    <tr><td>LEDS_LED6</td><td>Green</td><td>LED5 LED</td><td>Low</td><td>GPIO60</td></tr>
- *    <tr><td>LEDS_LED7</td><td>Green</td><td>LED6 LED</td><td>Low</td><td>GPIO61</td></tr>
- *    <tr><td>LEDS_LED8</td><td>Green</td><td>LED7 LED</td><td>Low</td><td>GPIO62</td></tr>
- *  </table>
- *
- *  @{
- */
-
-#ifndef __LEDS_EVK1100_H__
-#define __LEDS_EVK1100_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_LEDS_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/LEDS.h instead.
-		#endif
-
-	/* Private Interface - For use in library only: */
-	#if !defined(__DOXYGEN__)
-		/* Macros: */
-			#define LEDS_PORT        1
-	#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** LED mask for the first LED on the board. */
-			#define LEDS_LED1        (1UL << 19)
-
-			/** LED mask for the second LED on the board. */
-			#define LEDS_LED2        (1UL << 20)
-
-			/** LED mask for the third LED on the board. */
-			#define LEDS_LED3        (1UL << 21)
-
-			/** LED mask for the fourth LED on the board. */
-			#define LEDS_LED4        (1UL << 22)
-
-			/** LED mask for the fifth LED on the board. */
-			#define LEDS_LED5        (1UL << 27)
-
-			/** LED mask for the sixth LED on the board. */
-			#define LEDS_LED6        (1UL << 28)
-
-			/** LED mask for the seventh LED on the board. */
-			#define LEDS_LED7        (1UL << 29)
-
-			/** LED mask for the eighth LED on the board. */
-			#define LEDS_LED8        (1UL << 30)
-
-			/** LED mask for all the LEDs on the board. */
-			#define LEDS_ALL_LEDS    (LEDS_LED1 | LEDS_LED2 | LEDS_LED3 | LEDS_LED4 \
-			                          LEDS_LED5 | LEDS_LED6 | LEDS_LED7 | LEDS_LED8)
-
-			/** LED mask for the none of the board LEDs */
-			#define LEDS_NO_LEDS     0
-
-		/* Inline Functions: */
-		#if !defined(__DOXYGEN__)
-			static inline void LEDs_Init(void)
-			{
-				AVR32_GPIO.port[LEDS_PORT].gpers = LEDS_ALL_LEDS;
-				AVR32_GPIO.port[LEDS_PORT].oders = LEDS_ALL_LEDS;
-				AVR32_GPIO.port[LEDS_PORT].ovrs  = LEDS_ALL_LEDS;
-			}
-
-			static inline void LEDs_Disable(void)
-			{
-				AVR32_GPIO.port[LEDS_PORT].gperc = LEDS_ALL_LEDS;
-				AVR32_GPIO.port[LEDS_PORT].oderc = LEDS_ALL_LEDS;
-				AVR32_GPIO.port[LEDS_PORT].ovrc  = LEDS_ALL_LEDS;
-			}
-
-			static inline void LEDs_TurnOnLEDs(const uint32_t LEDMask)
-			{
-				AVR32_GPIO.port[LEDS_PORT].ovrc  = LEDMask;
-			}
-
-			static inline void LEDs_TurnOffLEDs(const uint32_t LEDMask)
-			{
-				AVR32_GPIO.port[LEDS_PORT].ovrs  = LEDMask;
-			}
-
-			static inline void LEDs_SetAllLEDs(const uint32_t LEDMask)
-			{
-				AVR32_GPIO.port[LEDS_PORT].ovrs  = LEDS_ALL_LEDS;
-				AVR32_GPIO.port[LEDS_PORT].ovrc  = LEDMask;
-			}
-
-			static inline void LEDs_ChangeLEDs(const uint32_t LEDMask, const uint32_t ActiveMask)
-			{
-				AVR32_GPIO.port[LEDS_PORT].ovrs  = LEDMask;
-				AVR32_GPIO.port[LEDS_PORT].ovrc  = ActiveMask;
-			}
-
-			static inline void LEDs_ToggleLEDs(const uint32_t LEDMask)
-			{
-				AVR32_GPIO.port[LEDS_PORT].ovrt  = LEDMask;
-			}
-
-			static inline uint32_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT;
-			static inline uint32_t LEDs_GetLEDs(void)
-			{
-				return (~AVR32_GPIO.port[LEDS_PORT].ovr & LEDS_ALL_LEDS);
-			}
-		#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/UC3/EVK1101/Board.h b/NativePrograms/LUFA/Drivers/Board/UC3/EVK1101/Board.h
deleted file mode 100644
index 4a6b83a986..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/UC3/EVK1101/Board.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific information header for the Atmel EVK1101.
- *  \copydetails Group_BoardInfo_EVK1101
- *
- *  \note This file should not be included directly. It is automatically included as needed by the Board driver
- *        dispatch header located in LUFA/Drivers/Board/Board.h.
- */
-
-/** \ingroup Group_BoardInfo
- *  \defgroup Group_BoardInfo_EVK1101 EVK1101
- *  \brief Board specific information header for the Atmel Atmel EVK1101.
- *
- *  Board specific information header for the Atmel Atmel EVK1101.
- *
- *  @{
- */
-
-#ifndef __BOARD_EVK1101_H__
-#define __BOARD_EVK1101_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-		#include "../../Buttons.h"
-		#include "../../Joystick.h"
-		#include "../../LEDs.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_BOARD_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/Board.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Indicates the board has hardware Buttons mounted. */
-			#define BOARD_HAS_BUTTONS
-
-			/** Indicates the board has a hardware Joystick mounted. */
-			#define BOARD_HAS_JOYSTICK
-
-			/** Indicates the board has hardware LEDs mounted. */
-			#define BOARD_HAS_LEDS
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/UC3/EVK1101/Buttons.h b/NativePrograms/LUFA/Drivers/Board/UC3/EVK1101/Buttons.h
deleted file mode 100644
index 4e7f6657f6..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/UC3/EVK1101/Buttons.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific Buttons driver header for the Atmel EVK1101.
- *  \copydetails Group_Buttons_EVK1101
- *
- *  \note This file should not be included directly. It is automatically included as needed by the Buttons driver
- *        dispatch header located in LUFA/Drivers/Board/Buttons.h.
- */
-
-/** \ingroup Group_Buttons
- *  \defgroup Group_Buttons_EVK1101 EVK1101
- *  \brief Board specific Buttons driver header for the Atmel EVK1101.
- *
- *  Board specific Buttons driver header for the Atmel EVK1101.
- *
- *  <table>
- *    <tr><th>Name</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr>
- *    <tr><td>BUTTONS_BUTTON1</td><td>SW0 Button</td><td>Low</td><td>GPIO34</td></tr>
- *    <tr><td>BUTTONS_BUTTON2</td><td>SW1 Button</td><td>Low</td><td>GPIO35</td></tr>
- *  </table>
- *
- *  @{
- */
-
-#ifndef __BUTTONS_EVK1101_H__
-#define __BUTTONS_EVK1101_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_BUTTONS_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/Buttons.h instead.
-		#endif
-
-	/* Private Interface - For use in library only: */
-	#if !defined(__DOXYGEN__)
-		/* Macros: */
-			#define BUTTONS_PORT          1
-	#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Mask of the first button on the board */
-			#define BUTTONS_BUTTON1       (1UL << 2)
-
-			/** Mask of the second button on the board */
-			#define BUTTONS_BUTTON2       (1UL << 3)
-
-		/* Inline Functions: */
-		#if !defined(__DOXYGEN__)
-			static inline void Buttons_Init(void)
-			{
-				AVR32_GPIO.port[BUTTONS_PORT].gpers = (BUTTONS_BUTTON1 | BUTTONS_BUTTON2);
-				AVR32_GPIO.port[BUTTONS_PORT].puers = (BUTTONS_BUTTON1 | BUTTONS_BUTTON2);
-			}
-
-			static inline void Buttons_Disable(void)
-			{
-				AVR32_GPIO.port[BUTTONS_PORT].gperc = (BUTTONS_BUTTON1 | BUTTONS_BUTTON2);
-				AVR32_GPIO.port[BUTTONS_PORT].puerc = (BUTTONS_BUTTON1 | BUTTONS_BUTTON2);
-			}
-
-			static inline uint32_t Buttons_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
-			static inline uint32_t Buttons_GetStatus(void)
-			{
-				return (~(AVR32_GPIO.port[BUTTONS_PORT].pvr & (BUTTONS_BUTTON1 | BUTTONS_BUTTON2)));
-			}
-		#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/UC3/EVK1101/Joystick.h b/NativePrograms/LUFA/Drivers/Board/UC3/EVK1101/Joystick.h
deleted file mode 100644
index 3801926337..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/UC3/EVK1101/Joystick.h
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific joystick driver header for the Atmel EVK1101.
- *  \copydetails Group_Joystick_EVK1101
- *
- *  \note This file should not be included directly. It is automatically included as needed by the joystick driver
- *        dispatch header located in LUFA/Drivers/Board/Joystick.h.
- */
-
-/** \ingroup Group_Joystick
- *  \defgroup Group_Joystick_EVK1101 EVK1101
- *  \brief Board specific joystick driver header for the Atmel EVK1101.
- *
- *  Board specific joystick driver header for the Atmel EVK1101.
- *
- *  <table>
- *    <tr><th>Left Port Pin</th><th>Up Port Pin</th><th>Right Port Pin</th><th>Down Port Pin</th><th>Press Port Pin</th></tr>
- *    <tr><td>GPIO38</td><td>GPIO39</td><td>GPIO41</td><td>GPIO40</td><td>GPIO13</td></tr>
- *  </table>
- *
- *  @{
- */
-
-#ifndef __JOYSTICK_EVK1101_H__
-#define __JOYSTICK_EVK1101_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_JOYSTICK_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/Joystick.h instead.
-		#endif
-
-	/* Private Interface - For use in library only: */
-	#if !defined(__DOXYGEN__)
-		/* Macros: */
-			#define JOY_MOVE_PORT            1
-			#define JOY_MOVE_MASK            ((1UL << 6) | (1UL << 7) | (1UL << 8) | (1UL << 9))
-			#define JOY_PRESS_PORT           0
-			#define JOY_PRESS_MASK           (1UL << 13)
-	#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Mask for the joystick being pushed in the left direction. */
-			#define JOY_LEFT                  (1UL << 6)
-
-			/** Mask for the joystick being pushed in the upward direction. */
-			#define JOY_UP                    (1UL << 7)
-
-			/** Mask for the joystick being pushed in the right direction. */
-			#define JOY_RIGHT                 (1UL << 9)
-
-			/** Mask for the joystick being pushed in the downward direction. */
-			#define JOY_DOWN                  (1UL << 8)
-
-			/** Mask for the joystick being pushed inward. */
-			#define JOY_PRESS                 (1UL << 13)
-
-		/* Inline Functions: */
-		#if !defined(__DOXYGEN__)
-			static inline void Joystick_Init(void)
-			{
-				AVR32_GPIO.port[JOY_MOVE_PORT].gpers  = JOY_MOVE_MASK;
-				AVR32_GPIO.port[JOY_PRESS_PORT].gpers = JOY_PRESS_MASK;
-
-				AVR32_GPIO.port[JOY_MOVE_PORT].puers  = JOY_MOVE_MASK;
-				AVR32_GPIO.port[JOY_PRESS_PORT].puers = JOY_PRESS_MASK;
-			};
-
-			static inline void Joystick_Disable(void)
-			{
-				AVR32_GPIO.port[JOY_MOVE_PORT].gperc  = JOY_MOVE_MASK;
-				AVR32_GPIO.port[JOY_PRESS_PORT].gperc = JOY_PRESS_MASK;
-
-				AVR32_GPIO.port[JOY_MOVE_PORT].puerc  = JOY_MOVE_MASK;
-				AVR32_GPIO.port[JOY_PRESS_PORT].puerc = JOY_PRESS_MASK;
-			};
-
-			static inline uint32_t Joystick_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
-			static inline uint32_t Joystick_GetStatus(void)
-			{
-				return (uint32_t)(~((AVR32_GPIO.port[JOY_MOVE_PORT].pvr  & JOY_MOVE_MASK) |
-				                    (AVR32_GPIO.port[JOY_PRESS_PORT].pvr & JOY_PRESS_MASK)));
-			}
-		#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/UC3/EVK1101/LEDs.h b/NativePrograms/LUFA/Drivers/Board/UC3/EVK1101/LEDs.h
deleted file mode 100644
index 5f43ecafbd..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/UC3/EVK1101/LEDs.h
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific LED driver header for the Atmel EVK1101.
- *  \copydetails Group_LEDs_EVK1101
- *
- *  \note This file should not be included directly. It is automatically included as needed by the LEDs driver
- *        dispatch header located in LUFA/Drivers/Board/LEDs.h.
- */
-
-/** \ingroup Group_LEDs
- *  \defgroup Group_LEDs_EVK1101 EVK1101
- *  \brief Board specific LED driver header for the Atmel EVK1101.
- *
- *  Board specific LED driver header for the Atmel EVK1101.
- *
- *  <table>
- *    <tr><th>Name</th><th>Color</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr>
- *    <tr><td>LEDS_LED1</td><td>Green</td><td>LED0 LED</td><td>Low</td><td>GPIO7</td></tr>
- *    <tr><td>LEDS_LED2</td><td>Green</td><td>LED1 LED</td><td>Low</td><td>GPIO8</td></tr>
- *    <tr><td>LEDS_LED3</td><td>Green</td><td>LED2 LED</td><td>Low</td><td>GPIO21</td></tr>
- *    <tr><td>LEDS_LED4</td><td>Green</td><td>LED3 LED</td><td>Low</td><td>GPIO22</td></tr>
- *  </table>
- *
- *  @{
- */
-
-#ifndef __LEDS_EVK1101_H__
-#define __LEDS_EVK1101_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_LEDS_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/LEDS.h instead.
-		#endif
-
-	/* Private Interface - For use in library only: */
-	#if !defined(__DOXYGEN__)
-		/* Macros: */
-			#define LEDS_PORT        0
-	#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** LED mask for the first LED on the board. */
-			#define LEDS_LED1        (1UL << 7)
-
-			/** LED mask for the second LED on the board. */
-			#define LEDS_LED2        (1UL << 8)
-
-			/** LED mask for the third LED on the board. */
-			#define LEDS_LED3        (1UL << 21)
-
-			/** LED mask for the fourth LED on the board. */
-			#define LEDS_LED4        (1UL << 22)
-
-			/** LED mask for all the LEDs on the board. */
-			#define LEDS_ALL_LEDS    (LEDS_LED1 | LEDS_LED2 | LEDS_LED3 | LEDS_LED4)
-
-			/** LED mask for the none of the board LEDs */
-			#define LEDS_NO_LEDS     0
-
-		/* Inline Functions: */
-		#if !defined(__DOXYGEN__)
-			static inline void LEDs_Init(void)
-			{
-				AVR32_GPIO.port[LEDS_PORT].gpers = LEDS_ALL_LEDS;
-				AVR32_GPIO.port[LEDS_PORT].oders = LEDS_ALL_LEDS;
-				AVR32_GPIO.port[LEDS_PORT].ovrs  = LEDS_ALL_LEDS;
-			}
-
-			static inline void LEDs_Disable(void)
-			{
-				AVR32_GPIO.port[LEDS_PORT].gperc = LEDS_ALL_LEDS;
-				AVR32_GPIO.port[LEDS_PORT].oderc = LEDS_ALL_LEDS;
-				AVR32_GPIO.port[LEDS_PORT].ovrc  = LEDS_ALL_LEDS;
-			}
-
-			static inline void LEDs_TurnOnLEDs(const uint32_t LEDMask)
-			{
-				AVR32_GPIO.port[LEDS_PORT].ovrc  = LEDMask;
-			}
-
-			static inline void LEDs_TurnOffLEDs(const uint32_t LEDMask)
-			{
-				AVR32_GPIO.port[LEDS_PORT].ovrs  = LEDMask;
-			}
-
-			static inline void LEDs_SetAllLEDs(const uint32_t LEDMask)
-			{
-				AVR32_GPIO.port[LEDS_PORT].ovrs  = LEDS_ALL_LEDS;
-				AVR32_GPIO.port[LEDS_PORT].ovrc  = LEDMask;
-			}
-
-			static inline void LEDs_ChangeLEDs(const uint32_t LEDMask, const uint32_t ActiveMask)
-			{
-				AVR32_GPIO.port[LEDS_PORT].ovrs  = LEDMask;
-				AVR32_GPIO.port[LEDS_PORT].ovrc  = ActiveMask;
-			}
-
-			static inline void LEDs_ToggleLEDs(const uint32_t LEDMask)
-			{
-				AVR32_GPIO.port[LEDS_PORT].ovrt  = LEDMask;
-			}
-
-			static inline uint32_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT;
-			static inline uint32_t LEDs_GetLEDs(void)
-			{
-				return (~AVR32_GPIO.port[LEDS_PORT].ovr & LEDS_ALL_LEDS);
-			}
-		#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/UC3/EVK1104/Board.h b/NativePrograms/LUFA/Drivers/Board/UC3/EVK1104/Board.h
deleted file mode 100644
index 1fe14dec84..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/UC3/EVK1104/Board.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific information header for the Atmel EVK1104.
- *  \copydetails Group_BoardInfo_EVK1104
- *
- *  \note This file should not be included directly. It is automatically included as needed by the Board driver
- *        dispatch header located in LUFA/Drivers/Board/Board.h.
- */
-
-/** \ingroup Group_BoardInfo
- *  \defgroup Group_BoardInfo_EVK1104 EVK1104
- *  \brief Board specific information header for the Atmel Atmel EVK1104.
- *
- *  Board specific information header for the Atmel Atmel EVK1104.
- *
- *  @{
- */
-
-#ifndef __BOARD_EVK1104_H__
-#define __BOARD_EVK1104_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-		#include "../../Buttons.h"
-		#include "../../LEDs.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_BOARD_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/Board.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Indicates the board has hardware Buttons mounted. */
-			#define BOARD_HAS_BUTTONS
-
-			/** Indicates the board has hardware LEDs mounted. */
-			#define BOARD_HAS_LEDS
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/UC3/EVK1104/Buttons.h b/NativePrograms/LUFA/Drivers/Board/UC3/EVK1104/Buttons.h
deleted file mode 100644
index f2aa937001..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/UC3/EVK1104/Buttons.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific Buttons driver header for the Atmel EVK1104.
- *  \copydetails Group_Buttons_EVK1104
- *
- *  \note This file should not be included directly. It is automatically included as needed by the Buttons driver
- *        dispatch header located in LUFA/Drivers/Board/Buttons.h.
- */
-
-/** \ingroup Group_Buttons
- *  \defgroup Group_Buttons_EVK1104 EVK1104
- *  \brief Board specific Buttons driver header for the Atmel EVK1104.
- *
- *  Board specific Buttons driver header for the Atmel EVK1104.
- *
- *  <table>
- *    <tr><th>Name</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr>
- *    <tr><td>BUTTONS_BUTTON1</td><td>SW0 Button</td><td>Low</td><td>GPIO42</td></tr>
- *  </table>
- *
- *  @{
- */
-
-#ifndef __BUTTONS_EVK1104_H__
-#define __BUTTONS_EVK1104_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_BUTTONS_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/Buttons.h instead.
-		#endif
-
-	/* Private Interface - For use in library only: */
-	#if !defined(__DOXYGEN__)
-		/* Macros: */
-			#define BUTTONS_PORT          1
-	#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Mask of the first button on the board */
-			#define BUTTONS_BUTTON1       (1UL << 10)
-
-		/* Inline Functions: */
-		#if !defined(__DOXYGEN__)
-			static inline void Buttons_Init(void)
-			{
-				AVR32_GPIO.port[BUTTONS_PORT].gpers = (BUTTONS_BUTTON1 | BUTTONS_BUTTON2);
-				AVR32_GPIO.port[BUTTONS_PORT].puers = (BUTTONS_BUTTON1 | BUTTONS_BUTTON2);
-			}
-
-			static inline void Buttons_Disable(void)
-			{
-				AVR32_GPIO.port[BUTTONS_PORT].gperc = (BUTTONS_BUTTON1 | BUTTONS_BUTTON2);
-				AVR32_GPIO.port[BUTTONS_PORT].puerc = (BUTTONS_BUTTON1 | BUTTONS_BUTTON2);
-			}
-
-			static inline uint32_t Buttons_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
-			static inline uint32_t Buttons_GetStatus(void)
-			{
-				return (~(AVR32_GPIO.port[JOY_MOVE_PORT].pvr & (BUTTONS_BUTTON1 | BUTTONS_BUTTON2)));
-			}
-		#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/UC3/EVK1104/LEDs.h b/NativePrograms/LUFA/Drivers/Board/UC3/EVK1104/LEDs.h
deleted file mode 100644
index 94aa19a71c..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/UC3/EVK1104/LEDs.h
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific LED driver header for the Atmel EVK1104.
- *  \copydetails Group_LEDs_EVK1104
- *
- *  \note This file should not be included directly. It is automatically included as needed by the LEDs driver
- *        dispatch header located in LUFA/Drivers/Board/LEDs.h.
- */
-
-/** \ingroup Group_LEDs
- *  \defgroup Group_LEDs_EVK1104 EVK1104
- *  \brief Board specific LED driver header for the Atmel EVK1104.
- *
- *  Board specific LED driver header for the Atmel EVK1104.
- *
- *  <table>
- *    <tr><th>Name</th><th>Color</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr>
- *    <tr><td>LEDS_LED1</td><td>Green</td><td>LED0 LED</td><td>Low</td><td>GPIO67</td></tr>
- *    <tr><td>LEDS_LED2</td><td>Green</td><td>LED1 LED</td><td>Low</td><td>GPIO101</td></tr>
- *    <tr><td>LEDS_LED3</td><td>Green</td><td>LED2 LED</td><td>Low</td><td>GPIO102</td></tr>
- *    <tr><td>LEDS_LED4</td><td>Green</td><td>LED3 LED</td><td>Low</td><td>GPIO105</td></tr>
- *  </table>
- *
- *  @{
- */
-
-#ifndef __LEDS_EVK1104_H__
-#define __LEDS_EVK1104_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_LEDS_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/LEDS.h instead.
-		#endif
-
-	/* Private Interface - For use in library only: */
-	#if !defined(__DOXYGEN__)
-		/* Macros: */
-			#define LEDS_LEDMASK2    (1UL << 3)
-			#define LEDS_LEDMASK3   ((1UL << 9) | (1UL << 6) | (1UL << 5))
-	#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** LED mask for the first LED on the board. */
-			#define LEDS_LED1        (1UL << 3)
-
-			/** LED mask for the second LED on the board. */
-			#define LEDS_LED2        (1UL << 5)
-
-			/** LED mask for the third LED on the board. */
-			#define LEDS_LED3        (1UL << 9)
-
-			/** LED mask for the fourth LED on the board. */
-			#define LEDS_LED4        (1UL << 6)
-
-			/** LED mask for all the LEDs on the board. */
-			#define LEDS_ALL_LEDS    (LEDS_LED1 | LEDS_LED2 | LEDS_LED3 | LEDS_LED4)
-
-			/** LED mask for the none of the board LEDs */
-			#define LEDS_NO_LEDS     0
-
-		/* Inline Functions: */
-		#if !defined(__DOXYGEN__)
-			static inline void LEDs_Init(void)
-			{
-				AVR32_GPIO.port[2].gpers = LEDS_LEDMASK2;
-				AVR32_GPIO.port[2].oders = LEDS_LEDMASK2;
-				AVR32_GPIO.port[2].ovrs  = LEDS_LEDMASK2;
-
-				AVR32_GPIO.port[3].gpers = LEDS_LEDMASK3;
-				AVR32_GPIO.port[3].oders = LEDS_LEDMASK3;
-				AVR32_GPIO.port[3].ovrs  = LEDS_LEDMASK3;
-			}
-
-			static inline void LEDs_Disable(void)
-			{
-				AVR32_GPIO.port[2].gperc = LEDS_LEDMASK2;
-				AVR32_GPIO.port[2].oderc = LEDS_LEDMASK2;
-				AVR32_GPIO.port[2].ovrc  = LEDS_LEDMASK2;
-
-				AVR32_GPIO.port[3].gperc = LEDS_LEDMASK3;
-				AVR32_GPIO.port[3].oderc = LEDS_LEDMASK3;
-				AVR32_GPIO.port[3].ovrc  = LEDS_LEDMASK3;
-			}
-
-			static inline void LEDs_TurnOnLEDs(const uint32_t LEDMask)
-			{
-				AVR32_GPIO.port[2].ovrc  = (LEDMask & LEDS_LEDMASK2);
-				AVR32_GPIO.port[3].ovrc  = (LEDMask & LEDS_LEDMASK3);
-			}
-
-			static inline void LEDs_TurnOffLEDs(const uint32_t LEDMask)
-			{
-				AVR32_GPIO.port[2].ovrs  = (LEDMask & LEDS_LEDMASK2);
-				AVR32_GPIO.port[3].ovrs  = (LEDMask & LEDS_LEDMASK3);
-			}
-
-			static inline void LEDs_SetAllLEDs(const uint32_t LEDMask)
-			{
-				AVR32_GPIO.port[2].ovrs  = LEDS_LEDMASK2;
-				AVR32_GPIO.port[2].ovrc  = (LEDMask & LEDS_LEDMASK2);
-
-				AVR32_GPIO.port[3].ovrs  = LEDS_LEDMASK3;
-				AVR32_GPIO.port[3].ovrc  = (LEDMask & LEDS_LEDMASK3);
-			}
-
-			static inline void LEDs_ChangeLEDs(const uint32_t LEDMask, const uint32_t ActiveMask)
-			{
-				AVR32_GPIO.port[2].ovrs  = (LEDMask    & LEDS_LEDMASK2);
-				AVR32_GPIO.port[2].ovrc  = (ActiveMask & LEDS_LEDMASK2);
-
-				AVR32_GPIO.port[3].ovrs  = (LEDMask    & LEDS_LEDMASK3);
-				AVR32_GPIO.port[3].ovrc  = (ActiveMask & LEDS_LEDMASK3);
-			}
-
-			static inline void LEDs_ToggleLEDs(const uint32_t LEDMask)
-			{
-				AVR32_GPIO.port[2].ovrt  = (LEDMask & LEDS_LEDMASK2);
-				AVR32_GPIO.port[3].ovrt  = (LEDMask & LEDS_LEDMASK3);
-			}
-
-			static inline uint32_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT;
-			static inline uint32_t LEDs_GetLEDs(void)
-			{
-				return ((~AVR32_GPIO.port[2].ovr & LEDS_LEDMASK2) | (~AVR32_GPIO.port[3].ovr & LEDS_LEDMASK3));
-			}
-		#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/UC3/UC3A3_XPLAINED/Board.h b/NativePrograms/LUFA/Drivers/Board/UC3/UC3A3_XPLAINED/Board.h
deleted file mode 100644
index 4733800317..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/UC3/UC3A3_XPLAINED/Board.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific information header for the Atmel UC3-A3 Xplained.
- *  \copydetails Group_BoardInfo_UC3_A3_XPLAINED
- *
- *  \note This file should not be included directly. It is automatically included as needed by the Board driver
- *        dispatch header located in LUFA/Drivers/Board/Board.h.
- */
-
-/** \ingroup Group_BoardInfo
- *  \defgroup Group_BoardInfo_UC3_A3_XPLAINED UC3_A3_XPLAINED
- *  \brief Board specific information header for the Atmel UC3-A3 Xplained.
- *
- *  Board specific information header for the Atmel UC3-A3 Xplained.
- *
- *  @{
- */
-
-#ifndef __BOARD_UC3_A3_XPLAINED_H__
-#define __BOARD_UC3_A3_XPLAINED_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-		#include "../../Buttons.h"
-		#include "../../LEDs.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_BOARD_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/Board.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Indicates the board has hardware Buttons mounted. */
-			#define BOARD_HAS_BUTTONS
-
-			/** Indicates the board has hardware LEDs mounted. */
-			#define BOARD_HAS_LEDS
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/UC3/UC3A3_XPLAINED/Buttons.h b/NativePrograms/LUFA/Drivers/Board/UC3/UC3A3_XPLAINED/Buttons.h
deleted file mode 100644
index 9434979c9b..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/UC3/UC3A3_XPLAINED/Buttons.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific Buttons driver header for the Atmel UC3-A3 Xplained.
- *  \copydetails Group_Buttons_UC3A3_XPLAINED
- *
- *  \note This file should not be included directly. It is automatically included as needed by the Buttons driver
- *        dispatch header located in LUFA/Drivers/Board/Buttons.h.
- */
-
-/** \ingroup Group_Buttons
- *  \defgroup Group_Buttons_UC3A3_XPLAINED UC3A3_XPLAINED
- *  \brief Board specific Buttons driver header for the Atmel UC3-A3 Xplained.
- *
- *  Board specific Buttons driver header for the Atmel UC3-A3 Xplained.
- *
- *  <table>
- *    <tr><th>Name</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr>
- *    <tr><td>BUTTONS_BUTTON1</td><td>SW0 Button</td><td>Low</td><td>GPIO32</td></tr>
- *  </table>
- *
- *  @{
- */
-
-#ifndef __BUTTONS_UC3A3_XPLAINED_H__
-#define __BUTTONS_UC3A3_XPLAINED_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_BUTTONS_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/Buttons.h instead.
-		#endif
-
-	/* Private Interface - For use in library only: */
-	#if !defined(__DOXYGEN__)
-		/* Macros: */
-			#define BUTTONS_PORT          1
-	#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Mask of the first button on the board */
-			#define BUTTONS_BUTTON1       (1UL << 0)
-
-		/* Inline Functions: */
-		#if !defined(__DOXYGEN__)
-			static inline void Buttons_Init(void)
-			{
-				AVR32_GPIO.port[BUTTONS_PORT].gpers = (BUTTONS_BUTTON1 | BUTTONS_BUTTON2);
-				AVR32_GPIO.port[BUTTONS_PORT].puers = (BUTTONS_BUTTON1 | BUTTONS_BUTTON2);
-			}
-
-			static inline void Buttons_Disable(void)
-			{
-				AVR32_GPIO.port[BUTTONS_PORT].gperc = (BUTTONS_BUTTON1 | BUTTONS_BUTTON2);
-				AVR32_GPIO.port[BUTTONS_PORT].puerc = (BUTTONS_BUTTON1 | BUTTONS_BUTTON2);
-			}
-
-			static inline uint32_t Buttons_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
-			static inline uint32_t Buttons_GetStatus(void)
-			{
-				return (~(AVR32_GPIO.port[JOY_MOVE_PORT].pvr & (BUTTONS_BUTTON1 | BUTTONS_BUTTON2)));
-			}
-		#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/UC3/UC3A3_XPLAINED/LEDs.h b/NativePrograms/LUFA/Drivers/Board/UC3/UC3A3_XPLAINED/LEDs.h
deleted file mode 100644
index 6a680606b5..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/UC3/UC3A3_XPLAINED/LEDs.h
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific LED driver header for the Atmel UC3-A3 Xplained.
- *  \copydetails Group_LEDs_UC3A3_XPLAINED
- *
- *  \note This file should not be included directly. It is automatically included as needed by the LEDs driver
- *        dispatch header located in LUFA/Drivers/Board/LEDs.h.
- */
-
-/** \ingroup Group_LEDs
- *  \defgroup Group_LEDs_UC3A3_XPLAINED UC3A3_XPLAINED
- *  \brief Board specific LED driver header for the Atmel UC3-A3 Xplained.
- *
- *  Board specific LED driver header for the Atmel UC3-A3 Xplained.
- *
- *  <table>
- *    <tr><th>Name</th><th>Color</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr>
- *    <tr><td>LEDS_LED1</td><td>Yellow</td><td>LED0 LED</td><td>Low</td><td>GPIO35</td></tr>
- *    <tr><td>LEDS_LED2</td><td>Yellow</td><td>LED1 LED</td><td>Low</td><td>GPIO73</td></tr>
- *    <tr><td>LEDS_LED3</td><td>Yellow</td><td>LED2 LED</td><td>Low</td><td>GPIO34</td></tr>
- *    <tr><td>LEDS_LED4</td><td>Yellow</td><td>LED3 LED</td><td>Low</td><td>GPIO38</td></tr>
- *    <tr><td>LEDS_LED5</td><td>Green</td><td>Status</td><td>Low</td><td>GPIO50</td></tr>
- *    <tr><td>LEDS_LED6</td><td>Red</td><td>Power</td><td>High</td><td>GPIO49</td></tr>
- *  </table>
- *
- *  @{
- */
-
-#ifndef __LEDS_UC3A3_XPLAINED_H__
-#define __LEDS_UC3A3_XPLAINED_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_LEDS_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/LEDS.h instead.
-		#endif
-
-	/* Private Interface - For use in library only: */
-	#if !defined(__DOXYGEN__)
-		/* Macros: */
-			#define LEDS_LEDMASK1   ((1UL << 3) | (1UL << 2) | (1UL << 6) | (1UL << 18) | (1UL << 17))
-			#define LEDS_LEDMASK3    (1UL << 9)
-	#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** LED mask for the first LED on the board. */
-			#define LEDS_LED1        (1UL << 3)
-
-			/** LED mask for the second LED on the board. */
-			#define LEDS_LED2        (1UL << 9)
-
-			/** LED mask for the third LED on the board. */
-			#define LEDS_LED3        (1UL << 2)
-
-			/** LED mask for the fourth LED on the board. */
-			#define LEDS_LED4        (1UL << 6)
-
-			/** LED mask for the fifth LED on the board. */
-			#define LEDS_LED5        (1UL << 18)
-
-			/** LED mask for the sixth LED on the board. */
-			#define LEDS_LED6        (1UL << 17)
-
-			/** LED mask for all the LEDs on the board. */
-			#define LEDS_ALL_LEDS    (LEDS_LED1 | LEDS_LED2 | LEDS_LED3 | LEDS_LED4 | LEDS_LED5 | LEDS_LED6)
-
-			/** LED mask for the none of the board LEDs */
-			#define LEDS_NO_LEDS     0
-
-		/* Inline Functions: */
-		#if !defined(__DOXYGEN__)
-			static inline void LEDs_Init(void)
-			{
-				AVR32_GPIO.port[1].gpers = LEDS_LEDMASK1;
-				AVR32_GPIO.port[1].oders = LEDS_LEDMASK1;
-				AVR32_GPIO.port[1].ovrs  = LEDS_LEDMASK1;
-
-				AVR32_GPIO.port[3].gpers = LEDS_LEDMASK3;
-				AVR32_GPIO.port[3].oders = LEDS_LEDMASK3;
-				AVR32_GPIO.port[3].ovrs  = LEDS_LEDMASK3;
-			}
-
-			static inline void LEDs_Disable(void)
-			{
-				AVR32_GPIO.port[1].gperc = LEDS_LEDMASK1;
-				AVR32_GPIO.port[1].oderc = LEDS_LEDMASK1;
-				AVR32_GPIO.port[1].ovrc  = LEDS_LEDMASK1;
-
-				AVR32_GPIO.port[3].gperc = LEDS_LEDMASK3;
-				AVR32_GPIO.port[3].oderc = LEDS_LEDMASK3;
-				AVR32_GPIO.port[3].ovrc  = LEDS_LEDMASK3;
-			}
-
-			static inline void LEDs_TurnOnLEDs(const uint32_t LEDMask)
-			{
-				AVR32_GPIO.port[1].ovrc  = (LEDMask & LEDS_LEDMASK1);
-				AVR32_GPIO.port[3].ovrc  = (LEDMask & LEDS_LEDMASK3);
-			}
-
-			static inline void LEDs_TurnOffLEDs(const uint32_t LEDMask)
-			{
-				AVR32_GPIO.port[1].ovrs  = (LEDMask & LEDS_LEDMASK1);
-				AVR32_GPIO.port[3].ovrs  = (LEDMask & LEDS_LEDMASK3);
-			}
-
-			static inline void LEDs_SetAllLEDs(const uint32_t LEDMask)
-			{
-				AVR32_GPIO.port[1].ovrs  = LEDS_LEDMASK1;
-				AVR32_GPIO.port[1].ovrc  = (LEDMask & LEDS_LEDMASK1);
-
-				AVR32_GPIO.port[3].ovrs  = LEDS_LEDMASK3;
-				AVR32_GPIO.port[3].ovrc  = (LEDMask & LEDS_LEDMASK3);
-			}
-
-			static inline void LEDs_ChangeLEDs(const uint32_t LEDMask, const uint32_t ActiveMask)
-			{
-				AVR32_GPIO.port[1].ovrs  = (LEDMask    & LEDS_LEDMASK1);
-				AVR32_GPIO.port[1].ovrc  = (ActiveMask & LEDS_LEDMASK1);
-
-				AVR32_GPIO.port[3].ovrs  = (LEDMask    & LEDS_LEDMASK3);
-				AVR32_GPIO.port[3].ovrc  = (ActiveMask & LEDS_LEDMASK3);
-			}
-
-			static inline void LEDs_ToggleLEDs(const uint32_t LEDMask)
-			{
-				AVR32_GPIO.port[1].ovrt  = (LEDMask & LEDS_LEDMASK1);
-				AVR32_GPIO.port[3].ovrt  = (LEDMask & LEDS_LEDMASK3);
-			}
-
-			static inline uint32_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT;
-			static inline uint32_t LEDs_GetLEDs(void)
-			{
-				return ((~AVR32_GPIO.port[1].ovr & LEDS_LEDMASK1) | (~AVR32_GPIO.port[3].ovr & LEDS_LEDMASK3));
-			}
-		#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/XMEGA/A3BU_XPLAINED/Board.h b/NativePrograms/LUFA/Drivers/Board/XMEGA/A3BU_XPLAINED/Board.h
deleted file mode 100644
index 95315ca807..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/XMEGA/A3BU_XPLAINED/Board.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific information header for the Atmel XMEGA A3BU Xplained.
- *  \copydetails Group_BoardInfo_A3BU_XPLAINED
- *
- *  \note This file should not be included directly. It is automatically included as needed by the Board driver
- *        dispatch header located in LUFA/Drivers/Board/Board.h.
- */
-
-/** \ingroup Group_BoardInfo
- *  \defgroup Group_BoardInfo_A3BU_XPLAINED A3BU_XPLAINED
- *  \brief Board specific information header for the Atmel XMEGA A3BU Xplained.
- *
- *  Board specific information header for the Atmel XMEGA A3BU Xplained.
- *
- *  @{
- */
-
-#ifndef __BOARD_A3BU_XPLAINED_H__
-#define __BOARD_A3BU_XPLAINED_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-		#include "../../Buttons.h"
-		#include "../../Dataflash.h"
-		#include "../../LEDs.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_BOARD_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/Board.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Indicates the board has hardware Buttons mounted. */
-			#define BOARD_HAS_BUTTONS
-
-			/** Indicates the board has a hardware Dataflash mounted. */
-			#define BOARD_HAS_DATAFLASH
-
-			/** Indicates the board has hardware LEDs mounted. */
-			#define BOARD_HAS_LEDS
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/XMEGA/A3BU_XPLAINED/Buttons.h b/NativePrograms/LUFA/Drivers/Board/XMEGA/A3BU_XPLAINED/Buttons.h
deleted file mode 100644
index 4bdd91df70..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/XMEGA/A3BU_XPLAINED/Buttons.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific Buttons driver header for the Atmel XMEGA A3BU Xplained.
- *  \copydetails Group_Buttons_A3BU_XPLAINED
- *
- *  \note This file should not be included directly. It is automatically included as needed by the Buttons driver
- *        dispatch header located in LUFA/Drivers/Board/Buttons.h.
- */
-
-/** \ingroup Group_Buttons
- *  \defgroup Group_Buttons_A3BU_XPLAINED A3BU_XPLAINED
- *  \brief Board specific Buttons driver header for the Atmel XMEGA A3BU Xplained.
- *
- *  Board specific Buttons driver header for the Atmel XMEGA A3BU Xplained.
- *
- *  <table>
- *    <tr><th>Name</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr>
- *    <tr><td>BUTTONS_BUTTON1</td><td>SW0 Button</td><td>Low</td><td>PORTE.5</td></tr>
- *    <tr><td>BUTTONS_BUTTON2</td><td>SW1 Button</td><td>Low</td><td>PORTF.1</td></tr>
- *    <tr><td>BUTTONS_BUTTON3</td><td>SW2 Button</td><td>Low</td><td>PORTF.2</td></tr>
- *  </table>
- *
- *  @{
- */
-
-#ifndef __BUTTONS_A3BU_XPLAINED_H__
-#define __BUTTONS_A3BU_XPLAINED_H__
-
-	/* Includes: */
-		#include <avr/io.h>
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_BUTTONS_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/Buttons.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Button mask for the first button on the board. */
-			#define BUTTONS_BUTTON1          (1 << 5)
-
-			/** Button mask for the second button on the board. */
-			#define BUTTONS_BUTTON2          (1 << 1)
-
-			/** Button mask for the third button on the board. */
-			#define BUTTONS_BUTTON3          (1 << 2)
-
-		/* Inline Functions: */
-		#if !defined(__DOXYGEN__)
-			static inline void Buttons_Init(void)
-			{
-				PORTE.OUTCLR   = BUTTONS_BUTTON1;
-				PORTE.PIN5CTRL = (PORT_OPC_PULLUP_gc | PORT_INVEN_bm);
-
-				PORTF.OUTCLR   = (BUTTONS_BUTTON2 | BUTTONS_BUTTON3);
-				PORTF.PIN1CTRL = (PORT_OPC_PULLUP_gc | PORT_INVEN_bm);
-				PORTF.PIN2CTRL = (PORT_OPC_PULLUP_gc | PORT_INVEN_bm);
-			}
-
-			static inline void Buttons_Disable(void)
-			{
-				PORTE.OUTCLR   = BUTTONS_BUTTON1;
-				PORTE.PIN5CTRL = 0;
-
-				PORTF.OUTCLR   = (BUTTONS_BUTTON2 | BUTTONS_BUTTON3);
-				PORTF.PIN1CTRL = 0;
-				PORTF.PIN2CTRL = 0;
-			}
-
-			static inline uint8_t Buttons_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
-			static inline uint8_t Buttons_GetStatus(void)
-			{
-				return ((PORTE_IN & BUTTONS_BUTTON1) | (PORTF_IN & (BUTTONS_BUTTON2 | BUTTONS_BUTTON3)));
-			}
-		#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/XMEGA/A3BU_XPLAINED/Dataflash.h b/NativePrograms/LUFA/Drivers/Board/XMEGA/A3BU_XPLAINED/Dataflash.h
deleted file mode 100644
index cf3af824d4..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/XMEGA/A3BU_XPLAINED/Dataflash.h
+++ /dev/null
@@ -1,228 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific Dataflash driver header for the Atmel XMEGA A3BU Xplained.
- *  \copydetails Group_Dataflash_A3BU_XPLAINED
- *
- *  \note This file should not be included directly. It is automatically included as needed by the dataflash driver
- *        dispatch header located in LUFA/Drivers/Board/Dataflash.h.
- */
-
-/** \ingroup Group_Dataflash
- *  \defgroup Group_Dataflash_A3BU_XPLAINED A3BU_XPLAINED
- *  \brief Board specific Dataflash driver header for the Atmel XMEGA A3BU Xplained.
- *
- *  Board specific Dataflash driver header for the Atmel XMEGA A3BU Xplained board.
- *
- *  <table>
- *    <tr><th>Name</th><th>Info</th><th>Select Pin</th><th>SPI Port</th></tr>
- *    <tr><td>DATAFLASH_CHIP1</td><td>AT45DB642D (8MB)</td><td>PORTF.4</td><td>USARTD0 (In SPI Mode)</td></tr>
- *  </table>
- *
- *  @{
- */
-
-#ifndef __DATAFLASH_A3BU_XPLAINED_H__
-#define __DATAFLASH_A3BU_XPLAINED_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-		#include "../../../Misc/AT45DB642D.h"
-		#include "../../../Peripheral/SerialSPI.h"
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_DATAFLASH_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/Dataflash.h instead.
-		#endif
-
-	/* Private Interface - For use in library only: */
-	#if !defined(__DOXYGEN__)
-		/* Macros: */
-			#define DATAFLASH_CHIPCS_MASK                DATAFLASH_CHIP1
-			#define DATAFLASH_CHIPCS_PORT                PORTF
-	#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Constant indicating the total number of dataflash ICs mounted on the selected board. */
-			#define DATAFLASH_TOTALCHIPS                 1
-
-			/** Mask for no dataflash chip selected. */
-			#define DATAFLASH_NO_CHIP                    0
-
-			/** Mask for the first dataflash chip selected. */
-			#define DATAFLASH_CHIP1                      (1 << 4)
-
-			/** Internal main memory page size for the board's dataflash ICs. */
-			#define DATAFLASH_PAGE_SIZE                  1024
-
-			/** Total number of pages inside each of the board's dataflash ICs. */
-			#define DATAFLASH_PAGES                      8192
-
-		/* Inline Functions: */
-			/** Initializes the dataflash driver so that commands and data may be sent to an attached dataflash IC.
-			 *  The appropriate SPI interface will be automatically configured.
-			 */
-			static inline void Dataflash_Init(void)
-			{
-				DATAFLASH_CHIPCS_PORT.DIRSET   = DATAFLASH_CHIPCS_MASK;
-
-				PORTCFG.MPCMASK                = DATAFLASH_CHIPCS_MASK;
-				DATAFLASH_CHIPCS_PORT.PIN0CTRL = PORT_INVEN_bm;
-
-				SerialSPI_Init(&USARTD0, (USART_SPI_SCK_LEAD_RISING | USART_SPI_SAMPLE_LEADING | USART_SPI_ORDER_MSB_FIRST), (F_CPU / 2));
-
-				PORTD.DIRSET   = PIN3_bm | PIN1_bm;
-				PORTD.DIRCLR   = PIN2_bm;
-				PORTC.PIN2CTRL = PORT_OPC_PULLUP_gc;
-			}
-
-			/** Sends a byte to the currently selected dataflash IC, and returns a byte from the dataflash.
-			 *
-			 *  \param[in] Byte  Byte of data to send to the dataflash
-			 *
-			 *  \return Last response byte from the dataflash
-			 */
-			static inline uint8_t Dataflash_TransferByte(const uint8_t Byte) ATTR_ALWAYS_INLINE;
-			static inline uint8_t Dataflash_TransferByte(const uint8_t Byte)
-			{
-				return SerialSPI_TransferByte(&USARTD0, Byte);
-			}
-
-			/** Sends a byte to the currently selected dataflash IC, and ignores the next byte from the dataflash.
-			 *
-			 *  \param[in] Byte  Byte of data to send to the dataflash
-			 */
-			static inline void Dataflash_SendByte(const uint8_t Byte) ATTR_ALWAYS_INLINE;
-			static inline void Dataflash_SendByte(const uint8_t Byte)
-			{
-				SerialSPI_SendByte(&USARTD0, Byte);
-			}
-
-			/** Sends a dummy byte to the currently selected dataflash IC, and returns the next byte from the dataflash.
-			 *
-			 *  \return Last response byte from the dataflash
-			 */
-			static inline uint8_t Dataflash_ReceiveByte(void) ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT;
-			static inline uint8_t Dataflash_ReceiveByte(void)
-			{
-				return SerialSPI_ReceiveByte(&USARTD0);
-			}
-
-			/** Determines the currently selected dataflash chip.
-			 *
-			 *  \return Mask of the currently selected Dataflash chip, either \ref DATAFLASH_NO_CHIP if no chip is selected
-			 *          or a DATAFLASH_CHIPn mask (where n is the chip number).
-			 */
-			static inline uint8_t Dataflash_GetSelectedChip(void) ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT;
-			static inline uint8_t Dataflash_GetSelectedChip(void)
-			{
-				return (DATAFLASH_CHIPCS_PORT.OUT & DATAFLASH_CHIPCS_MASK);
-			}
-
-			/** Selects the given dataflash chip.
-			 *
-			 *  \param[in]  ChipMask  Mask of the Dataflash IC to select, in the form of a \c DATAFLASH_CHIPn mask (where n is
-			 *              the chip number).
-			 */
-			static inline void Dataflash_SelectChip(const uint8_t ChipMask) ATTR_ALWAYS_INLINE;
-			static inline void Dataflash_SelectChip(const uint8_t ChipMask)
-			{
-				DATAFLASH_CHIPCS_PORT.OUTCLR = DATAFLASH_CHIPCS_MASK;
-				DATAFLASH_CHIPCS_PORT.OUTSET = ChipMask;
-			}
-
-			/** Deselects the current dataflash chip, so that no dataflash is selected. */
-			static inline void Dataflash_DeselectChip(void) ATTR_ALWAYS_INLINE;
-			static inline void Dataflash_DeselectChip(void)
-			{
-				Dataflash_SelectChip(DATAFLASH_NO_CHIP);
-			}
-
-			/** Selects a dataflash IC from the given page number, which should range from 0 to
-			 *  ((DATAFLASH_PAGES * DATAFLASH_TOTALCHIPS) - 1). For boards containing only one
-			 *  dataflash IC, this will select DATAFLASH_CHIP1. If the given page number is outside
-			 *  the total number of pages contained in the boards dataflash ICs, all dataflash ICs
-			 *  are deselected.
-			 *
-			 *  \param[in] PageAddress  Address of the page to manipulate, ranging from
-			 *                          0 to ((DATAFLASH_PAGES * DATAFLASH_TOTALCHIPS) - 1).
-			 */
-			static inline void Dataflash_SelectChipFromPage(const uint16_t PageAddress)
-			{
-				Dataflash_DeselectChip();
-
-				if (PageAddress >= (DATAFLASH_PAGES * DATAFLASH_TOTALCHIPS))
-				  return;
-
-				Dataflash_SelectChip(DATAFLASH_CHIP1);
-			}
-
-			/** Toggles the select line of the currently selected dataflash IC, so that it is ready to receive
-			 *  a new command.
-			 */
-			static inline void Dataflash_ToggleSelectedChipCS(void)
-			{
-				uint8_t SelectedChipMask = Dataflash_GetSelectedChip();
-
-				Dataflash_DeselectChip();
-				Dataflash_SelectChip(SelectedChipMask);
-			}
-
-			/** Spin-loops while the currently selected dataflash is busy executing a command, such as a main
-			 *  memory page program or main memory to buffer transfer.
-			 */
-			static inline void Dataflash_WaitWhileBusy(void)
-			{
-				Dataflash_ToggleSelectedChipCS();
-				Dataflash_SendByte(DF_CMD_GETSTATUS);
-				while (!(Dataflash_ReceiveByte() & DF_STATUS_READY));
-				Dataflash_ToggleSelectedChipCS();
-			}
-
-			/** Sends a set of page and buffer address bytes to the currently selected dataflash IC, for use with
-			 *  dataflash commands which require a complete 24-bit address.
-			 *
-			 *  \param[in] PageAddress  Page address within the selected dataflash IC
-			 *  \param[in] BufferByte   Address within the dataflash's buffer
-			 */
-			static inline void Dataflash_SendAddressBytes(uint16_t PageAddress,
-			                                              const uint16_t BufferByte)
-			{
-				Dataflash_SendByte(PageAddress >> 5);
-				Dataflash_SendByte((PageAddress << 3) | (BufferByte >> 8));
-				Dataflash_SendByte(BufferByte);
-			}
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/XMEGA/A3BU_XPLAINED/LEDs.h b/NativePrograms/LUFA/Drivers/Board/XMEGA/A3BU_XPLAINED/LEDs.h
deleted file mode 100644
index bea9537daf..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/XMEGA/A3BU_XPLAINED/LEDs.h
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific LED driver header for the Atmel XMEGA A3BU Xplained.
- *  \copydetails Group_LEDs_A3BU_XPLAINED
- *
- *  \note This file should not be included directly. It is automatically included as needed by the LEDs driver
- *        dispatch header located in LUFA/Drivers/Board/LEDs.h.
- */
-
-/** \ingroup Group_LEDs
- *  \defgroup Group_LEDs_A3BU_XPLAINED A3BU_XPLAINED
- *  \brief Board specific LED driver header for the Atmel XMEGA A3BU Xplained.
- *
- *  Board specific LED driver header for the Atmel XMEGA A3BU Xplained.
- *
- *  <table>
- *    <tr><th>Name</th><th>Color</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr>
- *    <tr><td>LEDS_LED1</td><td>Yellow</td><td>LED0 LED</td><td>Low</td><td>PORTR.0</td></tr>
- *    <tr><td>LEDS_LED2</td><td>Yellow</td><td>LED1 LED</td><td>Low</td><td>PORTR.1</td></tr>
- *    <tr><td>LEDS_LED3</td><td>Red</td><td>Status Bicolour Red LED</td><td>Low</td><td>PORTD.4</td></tr>
- *    <tr><td>LEDS_LED4</td><td>Green</td><td>Status Bicolour Green LED</td><td>High</td><td>PORTD.5</td></tr>
- *  </table>
- *
- *  @{
- */
-
-#ifndef __LEDS_A3BU_XPLAINED_H__
-#define __LEDS_A3BU_XPLAINED_H__
-
-	/* Includes: */
-		#include <avr/io.h>
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_LEDS_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/LEDS.h instead.
-		#endif
-
-	/* Private Interface - For use in library only: */
-	#if !defined(__DOXYGEN__)
-		/* Macros: */
-			#define LEDS_PORTR_LEDS       (LEDS_LED1 | LEDS_LED2)
-			#define LEDS_PORTD_LEDS       (LEDS_LED3 | LEDS_LED4)
-	#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** LED mask for the first LED on the board. */
-			#define LEDS_LED1        (1 << 0)
-
-			/** LED mask for the second LED on the board. */
-			#define LEDS_LED2        (1 << 1)
-
-			/** LED mask for the third LED on the board. */
-			#define LEDS_LED3        (1 << 4)
-
-			/** LED mask for the fourth LED on the board. */
-			#define LEDS_LED4        (1 << 5)
-
-			/** LED mask for all the LEDs on the board. */
-			#define LEDS_ALL_LEDS    (LEDS_LED1 | LEDS_LED2 | LEDS_LED3 | LEDS_LED4)
-
-			/** LED mask for none of the board LEDs. */
-			#define LEDS_NO_LEDS     0
-
-		/* Inline Functions: */
-		#if !defined(__DOXYGEN__)
-			static inline void LEDs_Init(void)
-			{
-				PORTR.DIRSET    = LEDS_PORTR_LEDS;
-				PORTR.OUTCLR    = LEDS_PORTR_LEDS;
-
-				PORTCFG.MPCMASK = LEDS_PORTR_LEDS;
-				PORTR.PIN0CTRL  = PORT_INVEN_bm;
-
-				PORTD.DIRSET    = LEDS_PORTD_LEDS;
-				PORTD.OUTCLR    = LEDS_PORTD_LEDS;
-
-				PORTD.PIN4CTRL  = PORT_INVEN_bm;
-			}
-
-			static inline void LEDs_Disable(void)
-			{
-				PORTR.DIRCLR    = LEDS_PORTR_LEDS;
-				PORTR.OUTCLR    = LEDS_PORTR_LEDS;
-
-				PORTCFG.MPCMASK = 0;
-				PORTR.PIN0CTRL  = LEDS_PORTR_LEDS;
-
-				PORTD.DIRCLR    = LEDS_PORTD_LEDS;
-				PORTD.OUTCLR    = LEDS_PORTD_LEDS;
-
-				PORTD.PIN4CTRL  = 0;
-			}
-
-			static inline void LEDs_TurnOnLEDs(const uint8_t LEDMask)
-			{
-				PORTR_OUTSET = LEDMask & LEDS_PORTR_LEDS;
-				PORTD_OUTSET = LEDMask & LEDS_PORTD_LEDS;
-			}
-
-			static inline void LEDs_TurnOffLEDs(const uint8_t LEDMask)
-			{
-				PORTR_OUTCLR = LEDMask & LEDS_PORTR_LEDS;
-				PORTD_OUTCLR = LEDMask & LEDS_PORTD_LEDS;
-			}
-
-			static inline void LEDs_SetAllLEDs(const uint8_t LEDMask)
-			{
-				PORTR_OUTCLR = LEDS_PORTR_LEDS;
-				PORTD_OUTCLR = LEDS_PORTD_LEDS;
-
-				PORTR_OUTSET = (LEDMask & LEDS_PORTR_LEDS);
-				PORTD_OUTSET = (LEDMask & LEDS_PORTD_LEDS);
-			}
-
-			static inline void LEDs_ChangeLEDs(const uint8_t LEDMask,
-			                                   const uint8_t ActiveMask)
-			{
-				PORTR_OUTCLR = (LEDMask & LEDS_PORTR_LEDS);
-				PORTD_OUTCLR = (LEDMask & LEDS_PORTD_LEDS);
-
-				PORTR_OUTSET = (ActiveMask & LEDS_PORTR_LEDS);
-				PORTD_OUTSET = (ActiveMask & LEDS_PORTD_LEDS);
-			}
-
-			static inline void LEDs_ToggleLEDs(const uint8_t LEDMask)
-			{
-				PORTR_OUTTGL = (LEDMask & LEDS_PORTR_LEDS);
-				PORTD_OUTTGL = (LEDMask & LEDS_PORTD_LEDS);
-			}
-
-			static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT;
-			static inline uint8_t LEDs_GetLEDs(void)
-			{
-				return ((PORTR_OUT & LEDS_PORTR_LEDS) | (PORTD_OUT & LEDS_PORTD_LEDS));
-			}
-		#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/XMEGA/B1_XPLAINED/Board.h b/NativePrograms/LUFA/Drivers/Board/XMEGA/B1_XPLAINED/Board.h
deleted file mode 100644
index 4628d9bd1a..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/XMEGA/B1_XPLAINED/Board.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific information header for the Atmel XMEGA B1 Xplained.
- *  \copydetails Group_BoardInfo_B1_XPLAINED
- *
- *  \note This file should not be included directly. It is automatically included as needed by the Board driver
- *        dispatch header located in LUFA/Drivers/Board/Board.h.
- */
-
-/** \ingroup Group_BoardInfo
- *  \defgroup Group_BoardInfo_B1_XPLAINED B1_XPLAINED
- *  \brief Board specific information header for the Atmel XMEGA B1 Xplained.
- *
- *  Board specific information header for the Atmel XMEGA B1 Xplained.
- *
- *  @{
- */
-
-#ifndef __BOARD_B1_XPLAINED_H__
-#define __BOARD_B1_XPLAINED_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-		#include "../../Buttons.h"
-		#include "../../Dataflash.h"
-		#include "../../LEDs.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_BOARD_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/Board.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Indicates the board has hardware Buttons mounted. */
-			#define BOARD_HAS_BUTTONS
-
-			/** Indicates the board has a hardware Dataflash mounted. */
-			#define BOARD_HAS_DATAFLASH
-
-			/** Indicates the board has hardware LEDs mounted. */
-			#define BOARD_HAS_LEDS
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/XMEGA/B1_XPLAINED/Buttons.h b/NativePrograms/LUFA/Drivers/Board/XMEGA/B1_XPLAINED/Buttons.h
deleted file mode 100644
index 98a61e66e7..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/XMEGA/B1_XPLAINED/Buttons.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific Buttons driver header for the Atmel XMEGA B1 Xplained.
- *  \copydetails Group_Buttons_B1_XPLAINED
- *
- *  \note This file should not be included directly. It is automatically included as needed by the Buttons driver
- *        dispatch header located in LUFA/Drivers/Board/Buttons.h.
- */
-
-/** \ingroup Group_Buttons
- *  \defgroup Group_Buttons_B1_XPLAINED B1_XPLAINED
- *  \brief Board specific Buttons driver header for the Atmel XMEGA B1 Xplained.
- *
- *  Board specific Buttons driver header for the Atmel XMEGA B1 Xplained.
- *
- *  <table>
- *    <tr><th>Name</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr>
- *    <tr><td>BUTTONS_BUTTON1</td><td>Touch CS0 Button</td><td>Low</td><td>PORTE.0</td></tr>
- *    <tr><td>BUTTONS_BUTTON2</td><td>Touch CS1 Button</td><td>Low</td><td>PORTE.1</td></tr>
- *    <tr><td>BUTTONS_BUTTON3</td><td>Touch CS2 Button</td><td>Low</td><td>PORTE.2</td></tr>
- *    <tr><td>BUTTONS_BUTTON4</td><td>Touch CS3 Button</td><td>Low</td><td>PORTE.3</td></tr>
- *  </table>
- *
- *  @{
- */
-
-#ifndef __BUTTONS_B1_XPLAINED_H__
-#define __BUTTONS_B1_XPLAINED_H__
-
-	/* Includes: */
-		#include <avr/io.h>
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_BUTTONS_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/Buttons.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Button mask for the first button on the board. */
-			#define BUTTONS_BUTTON1          (1 << 0)
-
-			/** Button mask for the second button on the board. */
-			#define BUTTONS_BUTTON2          (1 << 1)
-
-			/** Button mask for the third button on the board. */
-			#define BUTTONS_BUTTON3          (1 << 2)
-
-			/** Button mask for the fourth button on the board. */
-			#define BUTTONS_BUTTON4          (1 << 3)
-
-		/* Inline Functions: */
-		#if !defined(__DOXYGEN__)
-			static inline void Buttons_Init(void)
-			{
-				PORTE.OUTSET    = (BUTTONS_BUTTON1 | BUTTONS_BUTTON2 | BUTTONS_BUTTON3 | BUTTONS_BUTTON4);
-
-				PORTCFG.MPCMASK = (BUTTONS_BUTTON1 | BUTTONS_BUTTON2 | BUTTONS_BUTTON3 | BUTTONS_BUTTON4);
-				PORTE.PIN0CTRL  = (PORT_INVEN_bm | PORT_OPC_PULLUP_gc);
-			}
-
-			static inline void Buttons_Disable(void)
-			{
-				PORTE.OUTCLR    = (BUTTONS_BUTTON1 | BUTTONS_BUTTON2 | BUTTONS_BUTTON3 | BUTTONS_BUTTON4);
-
-				PORTCFG.MPCMASK = (BUTTONS_BUTTON1 | BUTTONS_BUTTON2 | BUTTONS_BUTTON3 | BUTTONS_BUTTON4);
-				PORTE.PIN0CTRL  = 0;
-			}
-
-			static inline uint8_t Buttons_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
-			static inline uint8_t Buttons_GetStatus(void)
-			{
-				return (PORTE_IN & (BUTTONS_BUTTON1 | BUTTONS_BUTTON2 | BUTTONS_BUTTON3 | BUTTONS_BUTTON4));
-			}
-		#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/XMEGA/B1_XPLAINED/Dataflash.h b/NativePrograms/LUFA/Drivers/Board/XMEGA/B1_XPLAINED/Dataflash.h
deleted file mode 100644
index 87c27b23e9..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/XMEGA/B1_XPLAINED/Dataflash.h
+++ /dev/null
@@ -1,229 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific Dataflash driver header for the Atmel XMEGA B1 Xplained.
- *  \copydetails Group_Dataflash_B1_XPLAINED
- *
- *  \note This file should not be included directly. It is automatically included as needed by the dataflash driver
- *        dispatch header located in LUFA/Drivers/Board/Dataflash.h.
- */
-
-/** \ingroup Group_Dataflash
- *  \defgroup Group_Dataflash_B1_XPLAINED B1_XPLAINED
- *  \brief Board specific Dataflash driver header for the Atmel XMEGA B1 Xplained.
- *
- *  Board specific Dataflash driver header for the Atmel XMEGA B1 Xplained board.
- *
- *  <table>
- *    <tr><th>Name</th><th>Info</th><th>Select Pin</th><th>SPI Port</th></tr>
- *    <tr><td>DATAFLASH_CHIP1</td><td>AT45DB642D (8MB)</td><td>PORTD.2</td><td>USARTC0 (In SPI Mode, Remapped)</td></tr>
- *  </table>
- *
- *  @{
- */
-
-#ifndef __DATAFLASH_B1_XPLAINED_H__
-#define __DATAFLASH_B1_XPLAINED_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-		#include "../../../Misc/AT45DB642D.h"
-		#include "../../../Peripheral/SerialSPI.h"
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_DATAFLASH_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/Dataflash.h instead.
-		#endif
-
-	/* Private Interface - For use in library only: */
-	#if !defined(__DOXYGEN__)
-		/* Macros: */
-			#define DATAFLASH_CHIPCS_MASK                DATAFLASH_CHIP1
-			#define DATAFLASH_CHIPCS_PORT                PORTD
-	#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Constant indicating the total number of dataflash ICs mounted on the selected board. */
-			#define DATAFLASH_TOTALCHIPS                 1
-
-			/** Mask for no dataflash chip selected. */
-			#define DATAFLASH_NO_CHIP                    0
-
-			/** Mask for the first dataflash chip selected. */
-			#define DATAFLASH_CHIP1                      (1 << 2)
-
-			/** Internal main memory page size for the board's dataflash ICs. */
-			#define DATAFLASH_PAGE_SIZE                  1024
-
-			/** Total number of pages inside each of the board's dataflash ICs. */
-			#define DATAFLASH_PAGES                      8192
-
-		/* Inline Functions: */
-			/** Initializes the dataflash driver so that commands and data may be sent to an attached dataflash IC.
-			 *  The appropriate SPI interface will be automatically configured.
-			 */
-			static inline void Dataflash_Init(void)
-			{
-				DATAFLASH_CHIPCS_PORT.DIRSET   = DATAFLASH_CHIPCS_MASK;
-
-				PORTCFG.MPCMASK                = DATAFLASH_CHIPCS_MASK;
-				DATAFLASH_CHIPCS_PORT.PIN0CTRL = PORT_INVEN_bm;
-
-				SerialSPI_Init(&USARTC0, (USART_SPI_SCK_LEAD_RISING | USART_SPI_SAMPLE_LEADING | USART_SPI_ORDER_MSB_FIRST), (F_CPU / 2));
-
-				PORTC.REMAP   |= PORT_USART0_bm;
-				PORTC.DIRSET   = PIN7_bm | PIN5_bm;
-				PORTC.DIRCLR   = PIN6_bm;
-				PORTC.PIN6CTRL = PORT_OPC_PULLUP_gc;
-			}
-
-			/** Sends a byte to the currently selected dataflash IC, and returns a byte from the dataflash.
-			 *
-			 *  \param[in] Byte  Byte of data to send to the dataflash
-			 *
-			 *  \return Last response byte from the dataflash
-			 */
-			static inline uint8_t Dataflash_TransferByte(const uint8_t Byte) ATTR_ALWAYS_INLINE;
-			static inline uint8_t Dataflash_TransferByte(const uint8_t Byte)
-			{
-				return SerialSPI_TransferByte(&USARTC0, Byte);
-			}
-
-			/** Sends a byte to the currently selected dataflash IC, and ignores the next byte from the dataflash.
-			 *
-			 *  \param[in] Byte  Byte of data to send to the dataflash
-			 */
-			static inline void Dataflash_SendByte(const uint8_t Byte) ATTR_ALWAYS_INLINE;
-			static inline void Dataflash_SendByte(const uint8_t Byte)
-			{
-				SerialSPI_SendByte(&USARTC0, Byte);
-			}
-
-			/** Sends a dummy byte to the currently selected dataflash IC, and returns the next byte from the dataflash.
-			 *
-			 *  \return Last response byte from the dataflash
-			 */
-			static inline uint8_t Dataflash_ReceiveByte(void) ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT;
-			static inline uint8_t Dataflash_ReceiveByte(void)
-			{
-				return SerialSPI_ReceiveByte(&USARTC0);
-			}
-
-			/** Determines the currently selected dataflash chip.
-			 *
-			 *  \return Mask of the currently selected Dataflash chip, either \ref DATAFLASH_NO_CHIP if no chip is selected
-			 *          or a DATAFLASH_CHIPn mask (where n is the chip number).
-			 */
-			static inline uint8_t Dataflash_GetSelectedChip(void) ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT;
-			static inline uint8_t Dataflash_GetSelectedChip(void)
-			{
-				return (DATAFLASH_CHIPCS_PORT.OUT & DATAFLASH_CHIPCS_MASK);
-			}
-
-			/** Selects the given dataflash chip.
-			 *
-			 *  \param[in]  ChipMask  Mask of the Dataflash IC to select, in the form of a \c DATAFLASH_CHIPn mask (where n is
-			 *              the chip number).
-			 */
-			static inline void Dataflash_SelectChip(const uint8_t ChipMask) ATTR_ALWAYS_INLINE;
-			static inline void Dataflash_SelectChip(const uint8_t ChipMask)
-			{
-				DATAFLASH_CHIPCS_PORT.OUTCLR = DATAFLASH_CHIPCS_MASK;
-				DATAFLASH_CHIPCS_PORT.OUTSET = (ChipMask & DATAFLASH_CHIPCS_MASK);
-			}
-
-			/** Deselects the current dataflash chip, so that no dataflash is selected. */
-			static inline void Dataflash_DeselectChip(void) ATTR_ALWAYS_INLINE;
-			static inline void Dataflash_DeselectChip(void)
-			{
-				Dataflash_SelectChip(DATAFLASH_NO_CHIP);
-			}
-
-			/** Selects a dataflash IC from the given page number, which should range from 0 to
-			 *  ((DATAFLASH_PAGES * DATAFLASH_TOTALCHIPS) - 1). For boards containing only one
-			 *  dataflash IC, this will select DATAFLASH_CHIP1. If the given page number is outside
-			 *  the total number of pages contained in the boards dataflash ICs, all dataflash ICs
-			 *  are deselected.
-			 *
-			 *  \param[in] PageAddress  Address of the page to manipulate, ranging from
-			 *                          0 to ((DATAFLASH_PAGES * DATAFLASH_TOTALCHIPS) - 1).
-			 */
-			static inline void Dataflash_SelectChipFromPage(const uint16_t PageAddress)
-			{
-				Dataflash_DeselectChip();
-
-				if (PageAddress >= (DATAFLASH_PAGES * DATAFLASH_TOTALCHIPS))
-				  return;
-
-				Dataflash_SelectChip(DATAFLASH_CHIP1);
-			}
-
-			/** Toggles the select line of the currently selected dataflash IC, so that it is ready to receive
-			 *  a new command.
-			 */
-			static inline void Dataflash_ToggleSelectedChipCS(void)
-			{
-				uint8_t SelectedChipMask = Dataflash_GetSelectedChip();
-
-				Dataflash_DeselectChip();
-				Dataflash_SelectChip(SelectedChipMask);
-			}
-
-			/** Spin-loops while the currently selected dataflash is busy executing a command, such as a main
-			 *  memory page program or main memory to buffer transfer.
-			 */
-			static inline void Dataflash_WaitWhileBusy(void)
-			{
-				Dataflash_ToggleSelectedChipCS();
-				Dataflash_SendByte(DF_CMD_GETSTATUS);
-				while (!(Dataflash_ReceiveByte() & DF_STATUS_READY));
-				Dataflash_ToggleSelectedChipCS();
-			}
-
-			/** Sends a set of page and buffer address bytes to the currently selected dataflash IC, for use with
-			 *  dataflash commands which require a complete 24-bit address.
-			 *
-			 *  \param[in] PageAddress  Page address within the selected dataflash IC
-			 *  \param[in] BufferByte   Address within the dataflash's buffer
-			 */
-			static inline void Dataflash_SendAddressBytes(uint16_t PageAddress,
-			                                              const uint16_t BufferByte)
-			{
-				Dataflash_SendByte(PageAddress >> 5);
-				Dataflash_SendByte((PageAddress << 3) | (BufferByte >> 8));
-				Dataflash_SendByte(BufferByte);
-			}
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/XMEGA/B1_XPLAINED/LEDs.h b/NativePrograms/LUFA/Drivers/Board/XMEGA/B1_XPLAINED/LEDs.h
deleted file mode 100644
index 5ef349d7d3..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/XMEGA/B1_XPLAINED/LEDs.h
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific LED driver header for the Atmel XMEGA B1 Xplained.
- *  \copydetails Group_LEDs_B1_XPLAINED
- *
- *  \note This file should not be included directly. It is automatically included as needed by the LEDs driver
- *        dispatch header located in LUFA/Drivers/Board/LEDs.h.
- */
-
-/** \ingroup Group_LEDs
- *  \defgroup Group_LEDs_B1_XPLAINED B1_XPLAINED
- *  \brief Board specific LED driver header for the Atmel XMEGA B1 Xplained.
- *
- *  Board specific LED driver header for the Atmel XMEGA B1 Xplained.
- *
- *  <table>
- *    <tr><th>Name</th><th>Color</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr>
- *    <tr><td>LEDS_LED1</td><td>Yellow</td><td>LED0 LED</td><td>High</td><td>PORTB.4</td></tr>
- *    <tr><td>LEDS_LED2</td><td>Yellow</td><td>LED1 LED</td><td>High</td><td>PORTB.5</td></tr>
- *    <tr><td>LEDS_LED3</td><td>Yellow</td><td>LED2 LED</td><td>High</td><td>PORTB.6</td></tr>
- *    <tr><td>LEDS_LED4</td><td>Yellow</td><td>LED3 LED</td><td>High</td><td>PORTB.7</td></tr>
- *    <tr><td>LEDS_LED5</td><td>Green</td><td>USB LED</td><td>Low</td><td>PORTE.4</td></tr>
- *  </table>
- *
- *  @{
- */
-
-#ifndef __LEDS_B1_XPLAINED_H__
-#define __LEDS_B1_XPLAINED_H__
-
-	/* Includes: */
-		#include <avr/io.h>
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_LEDS_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/LEDS.h instead.
-		#endif
-
-	/* Private Interface - For use in library only: */
-	#if !defined(__DOXYGEN__)
-		/* Macros: */
-			#define LEDS_PORTB_LEDS        (LEDS_LED1 | LEDS_LED2 | LEDS_LED3 | LEDS_LED4)
-			#define LEDS_PORTE_LEDS        LEDS_LED5
-
-			#define LEDS_PORTE_MASK_SHIFT  1
-	#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** LED mask for the first LED on the board. */
-			#define LEDS_LED1        (1 << 4)
-
-			/** LED mask for the second LED on the board. */
-			#define LEDS_LED2        (1 << 5)
-
-			/** LED mask for the third LED on the board. */
-			#define LEDS_LED3        (1 << 6)
-
-			/** LED mask for the fourth LED on the board. */
-			#define LEDS_LED4        (1 << 7)
-
-			/** LED mask for the fifth LED on the board. */
-			#define LEDS_LED5       ((1 << 4) >> LEDS_PORTE_MASK_SHIFT)
-
-			/** LED mask for all the LEDs on the board. */
-			#define LEDS_ALL_LEDS    (LEDS_LED1 | LEDS_LED2 | LEDS_LED3 | LEDS_LED4 | LEDS_LED5)
-
-			/** LED mask for none of the board LEDs. */
-			#define LEDS_NO_LEDS     0
-
-		/* Inline Functions: */
-		#if !defined(__DOXYGEN__)
-			static inline void LEDs_Init(void)
-			{
-				PORTB.DIRSET    = LEDS_PORTB_LEDS;
-				PORTB.OUTCLR    = LEDS_PORTB_LEDS;
-
-				PORTCFG.MPCMASK = LEDS_PORTB_LEDS;
-				PORTB.PIN0CTRL  = PORT_INVEN_bm;
-
-				PORTE.DIRSET    = (LEDS_PORTE_LEDS << LEDS_PORTE_MASK_SHIFT);
-				PORTE.OUTCLR    = (LEDS_PORTE_LEDS << LEDS_PORTE_MASK_SHIFT);
-			}
-
-			static inline void LEDs_Disable(void)
-			{
-				PORTB.DIRCLR    = LEDS_PORTB_LEDS;
-				PORTB.OUTCLR    = LEDS_PORTB_LEDS;
-
-				PORTCFG.MPCMASK = 0;
-				PORTB.PIN0CTRL  = LEDS_PORTB_LEDS;
-
-				PORTE.DIRCLR    = (LEDS_PORTE_LEDS << LEDS_PORTE_MASK_SHIFT);
-				PORTE.OUTCLR    = (LEDS_PORTE_LEDS << LEDS_PORTE_MASK_SHIFT);
-			}
-
-			static inline void LEDs_TurnOnLEDs(const uint8_t LEDMask)
-			{
-				PORTB_OUTSET = (LEDMask & LEDS_PORTB_LEDS);
-				PORTE_OUTSET = ((LEDMask & LEDS_PORTE_LEDS) << LEDS_PORTE_MASK_SHIFT);
-			}
-
-			static inline void LEDs_TurnOffLEDs(const uint8_t LEDMask)
-			{
-				PORTB_OUTCLR = (LEDMask & LEDS_PORTB_LEDS);
-				PORTE_OUTCLR = ((LEDMask & LEDS_PORTE_LEDS) << LEDS_PORTE_MASK_SHIFT);
-			}
-
-			static inline void LEDs_SetAllLEDs(const uint8_t LEDMask)
-			{
-				PORTB_OUTCLR = LEDS_PORTB_LEDS;
-				PORTE_OUTCLR = (LEDS_PORTE_LEDS << LEDS_PORTE_MASK_SHIFT);
-
-				PORTB_OUTSET = (LEDMask & LEDS_PORTB_LEDS);
-				PORTE_OUTSET = ((LEDMask & LEDS_PORTE_LEDS) << LEDS_PORTE_MASK_SHIFT);
-			}
-
-			static inline void LEDs_ChangeLEDs(const uint8_t LEDMask,
-			                                   const uint8_t ActiveMask)
-			{
-				PORTB_OUTCLR =  (LEDMask & LEDS_PORTB_LEDS);
-				PORTE_OUTCLR = ((LEDMask & LEDS_PORTE_LEDS) << LEDS_PORTE_MASK_SHIFT);
-
-				PORTB_OUTSET =  (ActiveMask & LEDS_PORTB_LEDS);
-				PORTE_OUTSET = ((ActiveMask & LEDS_PORTE_LEDS) << LEDS_PORTE_MASK_SHIFT);
-			}
-
-			static inline void LEDs_ToggleLEDs(const uint8_t LEDMask)
-			{
-				PORTB_OUTTGL = (LEDMask & LEDS_PORTB_LEDS);
-				PORTE_OUTTGL = ((LEDMask & LEDS_PORTE_LEDS) << LEDS_PORTE_MASK_SHIFT);
-			}
-
-			static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT;
-			static inline uint8_t LEDs_GetLEDs(void)
-			{
-				return ((PORTB_OUT & LEDS_PORTB_LEDS) | (PORTE_OUT & (LEDS_PORTE_LEDS << LEDS_PORTE_MASK_SHIFT)));
-			}
-		#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/XMEGA/C3_XPLAINED/Board.h b/NativePrograms/LUFA/Drivers/Board/XMEGA/C3_XPLAINED/Board.h
deleted file mode 100644
index 4a6add0c84..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/XMEGA/C3_XPLAINED/Board.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific information header for the Atmel XMEGA C3 Xplained.
- *  \copydetails Group_BoardInfo_C3_XPLAINED
- *
- *  \note This file should not be included directly. It is automatically included as needed by the Board driver
- *        dispatch header located in LUFA/Drivers/Board/Board.h.
- */
-
-/** \ingroup Group_BoardInfo
- *  \defgroup Group_BoardInfo_C3_XPLAINED C3_XPLAINED
- *  \brief Board specific information header for the Atmel XMEGA C3 Xplained.
- *
- *  Board specific information header for the Atmel XMEGA C3 Xplained.
- *
- *  @{
- */
-
-#ifndef __BOARD_C3_XPLAINED_H__
-#define __BOARD_C3_XPLAINED_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-		#include "../../Buttons.h"
-		#include "../../Dataflash.h"
-		#include "../../LEDs.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_BOARD_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/Board.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Indicates the board has hardware Buttons mounted. */
-			#define BOARD_HAS_BUTTONS
-
-			/** Indicates the board has hardware LEDs mounted. */
-			#define BOARD_HAS_LEDS
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/XMEGA/C3_XPLAINED/Buttons.h b/NativePrograms/LUFA/Drivers/Board/XMEGA/C3_XPLAINED/Buttons.h
deleted file mode 100644
index d8e96d5b4b..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/XMEGA/C3_XPLAINED/Buttons.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific Buttons driver header for the Atmel XMEGA C3 Xplained.
- *  \copydetails Group_Buttons_C3_XPLAINED
- *
- *  \note This file should not be included directly. It is automatically included as needed by the Buttons driver
- *        dispatch header located in LUFA/Drivers/Board/Buttons.h.
- */
-
-/** \ingroup Group_Buttons
- *  \defgroup Group_Buttons_C3_XPLAINED C3_XPLAINED
- *  \brief Board specific Buttons driver header for the Atmel XMEGA C3 Xplained.
- *
- *  Board specific Buttons driver header for the Atmel XMEGA C3 Xplained.
- *
- *  <table>
- *    <tr><th>Name</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr>
- *    <tr><td>BUTTONS_BUTTON1</td><td>SW0 Button</td><td>Low</td><td>PORTF.1</td></tr>
- *    <tr><td>BUTTONS_BUTTON2</td><td>SW1 Button</td><td>Low</td><td>PORTF.2</td></tr>
- *  </table>
- *
- *  @{
- */
-
-#ifndef __BUTTONS_C3_XPLAINED_H__
-#define __BUTTONS_C3_XPLAINED_H__
-
-	/* Includes: */
-		#include <avr/io.h>
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_BUTTONS_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/Buttons.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Button mask for the first button on the board. */
-			#define BUTTONS_BUTTON1          (1 << 1)
-
-			/** Button mask for the second button on the board. */
-			#define BUTTONS_BUTTON2          (1 << 2)
-
-		/* Inline Functions: */
-		#if !defined(__DOXYGEN__)
-			static inline void Buttons_Init(void)
-			{
-				PORTF.OUTCLR   = (BUTTONS_BUTTON1 | BUTTONS_BUTTON2);
-				PORTF.PIN1CTRL = (PORT_OPC_PULLUP_gc | PORT_INVEN_bm);
-				PORTF.PIN2CTRL = (PORT_OPC_PULLUP_gc | PORT_INVEN_bm);
-			}
-
-			static inline void Buttons_Disable(void)
-			{
-				PORTF.OUTCLR   = (BUTTONS_BUTTON1 | BUTTONS_BUTTON2);
-				PORTF.PIN1CTRL = 0;
-				PORTF.PIN2CTRL = 0;
-			}
-
-			static inline uint8_t Buttons_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
-			static inline uint8_t Buttons_GetStatus(void)
-			{
-				return (PORTF_IN & (BUTTONS_BUTTON1 | BUTTONS_BUTTON2));
-			}
-		#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Board/XMEGA/C3_XPLAINED/LEDs.h b/NativePrograms/LUFA/Drivers/Board/XMEGA/C3_XPLAINED/LEDs.h
deleted file mode 100644
index f86b2dcb6d..0000000000
--- a/NativePrograms/LUFA/Drivers/Board/XMEGA/C3_XPLAINED/LEDs.h
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Board specific LED driver header for the Atmel XMEGA C3 Xplained.
- *  \copydetails Group_LEDs_C3_XPLAINED
- *
- *  \note This file should not be included directly. It is automatically included as needed by the LEDs driver
- *        dispatch header located in LUFA/Drivers/Board/LEDs.h.
- */
-
-/** \ingroup Group_LEDs
- *  \defgroup Group_LEDs_C3_XPLAINED C3_XPLAINED
- *  \brief Board specific LED driver header for the Atmel XMEGA C3 Xplained.
- *
- *  Board specific LED driver header for the Atmel XMEGA C3 Xplained.
- *
- *  <table>
- *    <tr><th>Name</th><th>Color</th><th>Info</th><th>Active Level</th><th>Port Pin</th></tr>
- *    <tr><td>LEDS_LED1</td><td>Yellow</td><td>LED0 LED</td><td>Low</td><td>PORTR.0</td></tr>
- *    <tr><td>LEDS_LED2</td><td>Yellow</td><td>LED1 LED</td><td>Low</td><td>PORTR.1</td></tr>
- *    <tr><td>LEDS_LED3</td><td>Red</td><td>Status Bicolour Red LED</td><td>Low</td><td>PORTD.4</td></tr>
- *    <tr><td>LEDS_LED4</td><td>Green</td><td>Status Bicolour Green LED</td><td>High</td><td>PORTD.5</td></tr>
- *  </table>
- *
- *  @{
- */
-
-#ifndef __LEDS_C3_XPLAINED_H__
-#define __LEDS_C3_XPLAINED_H__
-
-	/* Includes: */
-		#include <avr/io.h>
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_LEDS_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Board/LEDS.h instead.
-		#endif
-
-	/* Private Interface - For use in library only: */
-	#if !defined(__DOXYGEN__)
-		/* Macros: */
-			#define LEDS_PORTR_LEDS       (LEDS_LED1 | LEDS_LED2)
-			#define LEDS_PORTD_LEDS       (LEDS_LED3 | LEDS_LED4)
-	#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** LED mask for the first LED on the board. */
-			#define LEDS_LED1        (1 << 0)
-
-			/** LED mask for the second LED on the board. */
-			#define LEDS_LED2        (1 << 1)
-
-			/** LED mask for the third LED on the board. */
-			#define LEDS_LED3        (1 << 4)
-
-			/** LED mask for the fourth LED on the board. */
-			#define LEDS_LED4        (1 << 5)
-
-			/** LED mask for all the LEDs on the board. */
-			#define LEDS_ALL_LEDS    (LEDS_LED1 | LEDS_LED2 | LEDS_LED3 | LEDS_LED4)
-
-			/** LED mask for none of the board LEDs. */
-			#define LEDS_NO_LEDS     0
-
-		/* Inline Functions: */
-		#if !defined(__DOXYGEN__)
-			static inline void LEDs_Init(void)
-			{
-				PORTR.DIRSET    = LEDS_PORTR_LEDS;
-				PORTR.OUTCLR    = LEDS_PORTR_LEDS;
-
-				PORTCFG.MPCMASK = LEDS_PORTR_LEDS;
-				PORTR.PIN0CTRL  = PORT_INVEN_bm;
-
-				PORTD.DIRSET    = LEDS_PORTD_LEDS;
-				PORTD.OUTCLR    = LEDS_PORTD_LEDS;
-
-				PORTD.PIN4CTRL  = PORT_INVEN_bm;
-			}
-
-			static inline void LEDs_Disable(void)
-			{
-				PORTR.DIRCLR    = LEDS_PORTR_LEDS;
-				PORTR.OUTCLR    = LEDS_PORTR_LEDS;
-
-				PORTCFG.MPCMASK = 0;
-				PORTR.PIN0CTRL  = LEDS_PORTR_LEDS;
-
-				PORTD.DIRCLR    = LEDS_PORTD_LEDS;
-				PORTD.OUTCLR    = LEDS_PORTD_LEDS;
-
-				PORTD.PIN4CTRL  = 0;
-			}
-
-			static inline void LEDs_TurnOnLEDs(const uint8_t LEDMask)
-			{
-				PORTR_OUTSET = LEDMask & LEDS_PORTR_LEDS;
-				PORTD_OUTSET = LEDMask & LEDS_PORTD_LEDS;
-			}
-
-			static inline void LEDs_TurnOffLEDs(const uint8_t LEDMask)
-			{
-				PORTR_OUTCLR = LEDMask & LEDS_PORTR_LEDS;
-				PORTD_OUTCLR = LEDMask & LEDS_PORTD_LEDS;
-			}
-
-			static inline void LEDs_SetAllLEDs(const uint8_t LEDMask)
-			{
-				PORTR_OUTCLR = LEDS_PORTR_LEDS;
-				PORTD_OUTCLR = LEDS_PORTD_LEDS;
-
-				PORTR_OUTSET = (LEDMask & LEDS_PORTR_LEDS);
-				PORTD_OUTSET = (LEDMask & LEDS_PORTD_LEDS);
-			}
-
-			static inline void LEDs_ChangeLEDs(const uint8_t LEDMask,
-			                                   const uint8_t ActiveMask)
-			{
-				PORTR_OUTCLR = (LEDMask & LEDS_PORTR_LEDS);
-				PORTD_OUTCLR = (LEDMask & LEDS_PORTD_LEDS);
-
-				PORTR_OUTSET = (ActiveMask & LEDS_PORTR_LEDS);
-				PORTD_OUTSET = (ActiveMask & LEDS_PORTD_LEDS);
-			}
-
-			static inline void LEDs_ToggleLEDs(const uint8_t LEDMask)
-			{
-				PORTR_OUTTGL = (LEDMask & LEDS_PORTR_LEDS);
-				PORTD_OUTTGL = (LEDMask & LEDS_PORTD_LEDS);
-			}
-
-			static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT;
-			static inline uint8_t LEDs_GetLEDs(void)
-			{
-				return ((PORTR_OUT & LEDS_PORTR_LEDS) | (PORTD_OUT & LEDS_PORTD_LEDS));
-			}
-		#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Misc/AT45DB321C.h b/NativePrograms/LUFA/Drivers/Misc/AT45DB321C.h
deleted file mode 100644
index 3457f28801..0000000000
--- a/NativePrograms/LUFA/Drivers/Misc/AT45DB321C.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Command constants for the Atmel AT45DB321C Dataflash.
- *  \copydetails Group_AT45DB321C
- */
-
-/** \ingroup Group_MiscDrivers
- *  \defgroup Group_AT45DB321C Atmel AT45DB321C Dataflash Commands - LUFA/Drivers/Misc/AT45DB321C.h
- *  \brief Command constants for the Atmel AT45DB321C Dataflash.
- *
- *  Dataflash command constants for the Atmel AT45DB321C Dataflash IC.
- *
- *  @{
- */
-
-#ifndef __AT45DB321C_CMDS_H__
-#define __AT45DB321C_CMDS_H__
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** \name Dataflash Status Values */
-			/**@{*/
-			#define DF_STATUS_READY                         (1 << 7)
-			#define DF_STATUS_COMPMISMATCH                  (1 << 6)
-			#define DF_STATUS_SECTORPROTECTION_ON           (1 << 1)
-			/**@}*/
-
-			/** \name Dataflash Commands */
-			/**@{*/
-			#define DF_CMD_GETSTATUS                        0xD7
-
-			#define DF_CMD_MAINMEMTOBUFF1                   0x53
-			#define DF_CMD_MAINMEMTOBUFF2                   0x55
-			#define DF_CMD_MAINMEMTOBUFF1COMP               0x60
-			#define DF_CMD_MAINMEMTOBUFF2COMP               0x61
-			#define DF_CMD_AUTOREWRITEBUFF1                 0x58
-			#define DF_CMD_AUTOREWRITEBUFF2                 0x59
-
-			#define DF_CMD_MAINMEMPAGEREAD                  0xD2
-			#define DF_CMD_CONTARRAYREAD_LF                 0xE8
-			#define DF_CMD_BUFF1READ_LF                     0xD4
-			#define DF_CMD_BUFF2READ_LF                     0xD6
-
-			#define DF_CMD_BUFF1WRITE                       0x84
-			#define DF_CMD_BUFF2WRITE                       0x87
-			#define DF_CMD_BUFF1TOMAINMEMWITHERASE          0x83
-			#define DF_CMD_BUFF2TOMAINMEMWITHERASE          0x86
-			#define DF_CMD_BUFF1TOMAINMEM                   0x88
-			#define DF_CMD_BUFF2TOMAINMEM                   0x89
-			#define DF_CMD_MAINMEMPAGETHROUGHBUFF1          0x82
-			#define DF_CMD_MAINMEMPAGETHROUGHBUFF2          0x85
-
-			#define DF_CMD_PAGEERASE                        0x81
-			#define DF_CMD_BLOCKERASE                       0x50
-
-			#define DF_CMD_SECTORPROTECTIONOFF              ((char[]){0x3D, 0x2A, 0x7F, 0xCF})
-			#define DF_CMD_SECTORPROTECTIONOFF_BYTE1        0x3D
-			#define DF_CMD_SECTORPROTECTIONOFF_BYTE2        0x2A
-			#define DF_CMD_SECTORPROTECTIONOFF_BYTE3        0x7F
-			#define DF_CMD_SECTORPROTECTIONOFF_BYTE4        0xCF
-
-			#define DF_CMD_READMANUFACTURERDEVICEINFO       0x9F
-			/**@}*/
-
-			/** Manufacturer code for Atmel Corporation, returned by Atmel Dataflash ICs in response to the \c DF_CMD_READMANUFACTURERDEVICEINFO command. */
-			#define DF_MANUFACTURER_ATMEL                   0x1F
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Misc/AT45DB642D.h b/NativePrograms/LUFA/Drivers/Misc/AT45DB642D.h
deleted file mode 100644
index 304bce6b23..0000000000
--- a/NativePrograms/LUFA/Drivers/Misc/AT45DB642D.h
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Command constants for the Atmel AT45DB642D Dataflash.
- *  \copydetails Group_AT45DB642D
- */
-
-/** \ingroup Group_MiscDrivers
- *  \defgroup Group_AT45DB642D Atmel AT45DB642D Dataflash Commands - LUFA/Drivers/Misc/AT45DB642D.h
- *  \brief Command constants for the Atmel AT45DB642D Dataflash.
- *
- *  Dataflash command constants for the Atmel AT45DB642D Dataflash IC.
- *
- *  @{
- */
-
-#ifndef __AT45DB642D_CMDS_H__
-#define __AT45DB642D_CMDS_H__
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** \name Dataflash Status Values */
-			/**@{*/
-			#define DF_STATUS_READY                         (1 << 7)
-			#define DF_STATUS_COMPMISMATCH                  (1 << 6)
-			#define DF_STATUS_SECTORPROTECTION_ON           (1 << 1)
-			#define DF_STATUS_BINARYPAGESIZE_ON             (1 << 0)
-			/**@}*/
-
-			/** \name Dataflash Commands */
-			/**@{*/
-			#define DF_CMD_GETSTATUS                        0xD7
-			#define DF_CMD_POWERDOWN                        0xB9
-			#define DF_CMD_WAKEUP                           0xAB
-
-			#define DF_CMD_MAINMEMTOBUFF1                   0x53
-			#define DF_CMD_MAINMEMTOBUFF2                   0x55
-			#define DF_CMD_MAINMEMTOBUFF1COMP               0x60
-			#define DF_CMD_MAINMEMTOBUFF2COMP               0x61
-			#define DF_CMD_AUTOREWRITEBUFF1                 0x58
-			#define DF_CMD_AUTOREWRITEBUFF2                 0x59
-
-			#define DF_CMD_MAINMEMPAGEREAD                  0xD2
-			#define DF_CMD_CONTARRAYREAD_LF                 0x03
-			#define DF_CMD_BUFF1READ_LF                     0xD1
-			#define DF_CMD_BUFF2READ_LF                     0xD3
-
-			#define DF_CMD_BUFF1WRITE                       0x84
-			#define DF_CMD_BUFF2WRITE                       0x87
-			#define DF_CMD_BUFF1TOMAINMEMWITHERASE          0x83
-			#define DF_CMD_BUFF2TOMAINMEMWITHERASE          0x86
-			#define DF_CMD_BUFF1TOMAINMEM                   0x88
-			#define DF_CMD_BUFF2TOMAINMEM                   0x89
-			#define DF_CMD_MAINMEMPAGETHROUGHBUFF1          0x82
-			#define DF_CMD_MAINMEMPAGETHROUGHBUFF2          0x85
-
-			#define DF_CMD_PAGEERASE                        0x81
-			#define DF_CMD_BLOCKERASE                       0x50
-			#define DF_CMD_SECTORERASE                      0x7C
-
-			#define DF_CMD_CHIPERASE                        ((char[]){0xC7, 0x94, 0x80, 0x9A})
-			#define DF_CMD_CHIPERASE_BYTE1                  0xC7
-			#define DF_CMD_CHIPERASE_BYTE2                  0x94
-			#define DF_CMD_CHIPERASE_BYTE3                  0x80
-			#define DF_CMD_CHIPERASE_BYTE4                  0x9A
-
-			#define DF_CMD_SECTORPROTECTIONOFF              ((char[]){0x3D, 0x2A, 0x7F, 0x9A})
-			#define DF_CMD_SECTORPROTECTIONOFF_BYTE1        0x3D
-			#define DF_CMD_SECTORPROTECTIONOFF_BYTE2        0x2A
-			#define DF_CMD_SECTORPROTECTIONOFF_BYTE3        0x7F
-			#define DF_CMD_SECTORPROTECTIONOFF_BYTE4        0x9A
-
-			#define DF_CMD_BINARYPAGESIZEMODEON             ((char[]){0x3D, 0x2A, 0x80, 0xA6})
-			#define DF_CMD_BINARYPAGESIZEMODEON_BYTE1       0x3D
-			#define DF_CMD_BINARYPAGESIZEMODEON_BYTE2       0x2A
-			#define DF_CMD_BINARYPAGESIZEMODEON_BYTE3       0x80
-			#define DF_CMD_BINARYPAGESIZEMODEON_BYTE4       0xA6
-
-			#define DF_CMD_READMANUFACTURERDEVICEINFO       0x9F
-			/**@}*/
-
-			/** Manufacturer code for Atmel Corporation, returned by Atmel Dataflash ICs in response to the \c DF_CMD_READMANUFACTURERDEVICEINFO command. */
-			#define DF_MANUFACTURER_ATMEL                   0x1F
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Misc/RingBuffer.h b/NativePrograms/LUFA/Drivers/Misc/RingBuffer.h
deleted file mode 100644
index d884f775dd..0000000000
--- a/NativePrograms/LUFA/Drivers/Misc/RingBuffer.h
+++ /dev/null
@@ -1,308 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Lightweight ring (circular) buffer, for fast insertion/deletion of bytes.
- *
- *  Lightweight ring buffer, for fast insertion/deletion. Multiple buffers can be created of
- *  different sizes to suit different needs.
- *
- *  Note that for each buffer, insertion and removal operations may occur at the same time (via
- *  a multi-threaded ISR based system) however the same kind of operation (two or more insertions
- *  or deletions) must not overlap. If there is possibility of two or more of the same kind of
- *  operating occurring at the same point in time, atomic (mutex) locking should be used.
- */
-
-/** \ingroup Group_MiscDrivers
- *  \defgroup Group_RingBuff Generic Byte Ring Buffer - LUFA/Drivers/Misc/RingBuffer.h
- *  \brief Lightweight ring buffer, for fast insertion/deletion of bytes.
- *
- *  \section Sec_RingBuff_Dependencies Module Source Dependencies
- *  The following files must be built with any user project that uses this module:
- *    - None
- *
- *  \section Sec_RingBuff_ModDescription Module Description
- *  Lightweight ring buffer, for fast insertion/deletion. Multiple buffers can be created of
- *  different sizes to suit different needs.
- *
- *  Note that for each buffer, insertion and removal operations may occur at the same time (via
- *  a multi-threaded ISR based system) however the same kind of operation (two or more insertions
- *  or deletions) must not overlap. If there is possibility of two or more of the same kind of
- *  operating occurring at the same point in time, atomic (mutex) locking should be used.
- *
- *  \section Sec_RingBuff_ExampleUsage Example Usage
- *  The following snippet is an example of how this module may be used within a typical
- *  application.
- *
- *  \code
- *      // Create the buffer structure and its underlying storage array
- *      RingBuffer_t Buffer;
- *      uint8_t      BufferData[128];
- *
- *      // Initialize the buffer with the created storage array
- *      RingBuffer_InitBuffer(&Buffer, BufferData, sizeof(BufferData));
- *
- *      // Insert some data into the buffer
- *      RingBuffer_Insert(&Buffer, 'H');
- *      RingBuffer_Insert(&Buffer, 'E');
- *      RingBuffer_Insert(&Buffer, 'L');
- *      RingBuffer_Insert(&Buffer, 'L');
- *      RingBuffer_Insert(&Buffer, 'O');
- *
- *      // Cache the number of stored bytes in the buffer
- *      uint16_t BufferCount = RingBuffer_GetCount(&Buffer);
- *
- *      // Printer stored data length
- *      printf("Buffer Length: %d, Buffer Data: \r\n", BufferCount);
- *
- *      // Print contents of the buffer one character at a time
- *      while (BufferCount--)
- *        putc(RingBuffer_Remove(&Buffer));
- *  \endcode
- *
- *  @{
- */
-
-#ifndef __RING_BUFFER_H__
-#define __RING_BUFFER_H__
-
-	/* Includes: */
-		#include "../../Common/Common.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Type Defines: */
-		/** \brief Ring Buffer Management Structure.
-		 *
-		 *  Type define for a new ring buffer object. Buffers should be initialized via a call to
-		 *  \ref RingBuffer_InitBuffer() before use.
-		 */
-		typedef struct
-		{
-			uint8_t* In; /**< Current storage location in the circular buffer. */
-			uint8_t* Out; /**< Current retrieval location in the circular buffer. */
-			uint8_t* Start; /**< Pointer to the start of the buffer's underlying storage array. */
-			uint8_t* End; /**< Pointer to the end of the buffer's underlying storage array. */
-			uint16_t Size; /**< Size of the buffer's underlying storage array. */
-			uint16_t Count; /**< Number of bytes currently stored in the buffer. */
-		} RingBuffer_t;
-
-	/* Inline Functions: */
-		/** Initializes a ring buffer ready for use. Buffers must be initialized via this function
-		 *  before any operations are called upon them. Already initialized buffers may be reset
-		 *  by re-initializing them using this function.
-		 *
-		 *  \param[out] Buffer   Pointer to a ring buffer structure to initialize.
-		 *  \param[out] DataPtr  Pointer to a global array that will hold the data stored into the ring buffer.
-		 *  \param[out] Size     Maximum number of bytes that can be stored in the underlying data array.
-		 */
-		static inline void RingBuffer_InitBuffer(RingBuffer_t* Buffer,
-		                                         uint8_t* const DataPtr,
-		                                         const uint16_t Size) ATTR_NON_NULL_PTR_ARG(1) ATTR_NON_NULL_PTR_ARG(2);
-		static inline void RingBuffer_InitBuffer(RingBuffer_t* Buffer,
-		                                         uint8_t* const DataPtr,
-		                                         const uint16_t Size)
-		{
-			GCC_FORCE_POINTER_ACCESS(Buffer);
-
-			uint_reg_t CurrentGlobalInt = GetGlobalInterruptMask();
-			GlobalInterruptDisable();
-
-			Buffer->In     = DataPtr;
-			Buffer->Out    = DataPtr;
-			Buffer->Start  = &DataPtr[0];
-			Buffer->End    = &DataPtr[Size];
-			Buffer->Size   = Size;
-			Buffer->Count  = 0;
-
-			SetGlobalInterruptMask(CurrentGlobalInt);
-		}
-
-		/** Retrieves the current number of bytes stored in a particular buffer. This value is computed
-		 *  by entering an atomic lock on the buffer, so that the buffer cannot be modified while the
-		 *  computation takes place. This value should be cached when reading out the contents of the buffer,
-		 *  so that as small a time as possible is spent in an atomic lock.
-		 *
-		 *  \note The value returned by this function is guaranteed to only be the minimum number of bytes
-		 *        stored in the given buffer; this value may change as other threads write new data, thus
-		 *        the returned number should be used only to determine how many successive reads may safely
-		 *        be performed on the buffer.
-		 *
-		 *  \param[in] Buffer  Pointer to a ring buffer structure whose count is to be computed.
-		 *
-		 *  \return Number of bytes currently stored in the buffer.
-		 */
-		static inline uint16_t RingBuffer_GetCount(RingBuffer_t* const Buffer) ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(1);
-		static inline uint16_t RingBuffer_GetCount(RingBuffer_t* const Buffer)
-		{
-			uint16_t Count;
-
-			uint_reg_t CurrentGlobalInt = GetGlobalInterruptMask();
-			GlobalInterruptDisable();
-
-			Count = Buffer->Count;
-
-			SetGlobalInterruptMask(CurrentGlobalInt);
-			return Count;
-		}
-
-		/** Retrieves the free space in a particular buffer. This value is computed by entering an atomic lock
-		 *  on the buffer, so that the buffer cannot be modified while the computation takes place.
-		 *
-		 *  \note The value returned by this function is guaranteed to only be the maximum number of bytes
-		 *        free in the given buffer; this value may change as other threads write new data, thus
-		 *        the returned number should be used only to determine how many successive writes may safely
-		 *        be performed on the buffer when there is a single writer thread.
-		 *
-		 *  \param[in] Buffer  Pointer to a ring buffer structure whose free count is to be computed.
-		 *
-		 *  \return Number of free bytes in the buffer.
-		 */
-		static inline uint16_t RingBuffer_GetFreeCount(RingBuffer_t* const Buffer) ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(1);
-		static inline uint16_t RingBuffer_GetFreeCount(RingBuffer_t* const Buffer)
-		{
-			return (Buffer->Size - RingBuffer_GetCount(Buffer));
-		}
-
-		/** Atomically determines if the specified ring buffer contains any data. This should
-		 *  be tested before removing data from the buffer, to ensure that the buffer does not
-		 *  underflow.
-		 *
-		 *  If the data is to be removed in a loop, store the total number of bytes stored in the
-		 *  buffer (via a call to the \ref RingBuffer_GetCount() function) in a temporary variable
-		 *  to reduce the time spent in atomicity locks.
-		 *
-		 *  \param[in,out] Buffer  Pointer to a ring buffer structure to insert into.
-		 *
-		 *  \return Boolean \c true if the buffer contains no free space, \c false otherwise.
-		 */
-		static inline bool RingBuffer_IsEmpty(RingBuffer_t* const Buffer) ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(1);
-		static inline bool RingBuffer_IsEmpty(RingBuffer_t* const Buffer)
-		{
-			return (RingBuffer_GetCount(Buffer) == 0);
-		}
-
-		/** Atomically determines if the specified ring buffer contains any free space. This should
-		 *  be tested before storing data to the buffer, to ensure that no data is lost due to a
-		 *  buffer overrun.
-		 *
-		 *  \param[in,out] Buffer  Pointer to a ring buffer structure to insert into.
-		 *
-		 *  \return Boolean \c true if the buffer contains no free space, \c false otherwise.
-		 */
-		static inline bool RingBuffer_IsFull(RingBuffer_t* const Buffer) ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(1);
-		static inline bool RingBuffer_IsFull(RingBuffer_t* const Buffer)
-		{
-			return (RingBuffer_GetCount(Buffer) == Buffer->Size);
-		}
-
-		/** Inserts an element into the ring buffer.
-		 *
-		 *  \warning Only one execution thread (main program thread or an ISR) may insert into a single buffer
-		 *           otherwise data corruption may occur. Insertion and removal may occur from different execution
-		 *           threads.
-		 *
-		 *  \param[in,out] Buffer  Pointer to a ring buffer structure to insert into.
-		 *  \param[in]     Data    Data element to insert into the buffer.
-		 */
-		static inline void RingBuffer_Insert(RingBuffer_t* Buffer,
-		                                     const uint8_t Data) ATTR_NON_NULL_PTR_ARG(1);
-		static inline void RingBuffer_Insert(RingBuffer_t* Buffer,
-		                                     const uint8_t Data)
-		{
-			GCC_FORCE_POINTER_ACCESS(Buffer);
-
-			*Buffer->In = Data;
-
-			if (++Buffer->In == Buffer->End)
-			  Buffer->In = Buffer->Start;
-
-			uint_reg_t CurrentGlobalInt = GetGlobalInterruptMask();
-			GlobalInterruptDisable();
-
-			Buffer->Count++;
-
-			SetGlobalInterruptMask(CurrentGlobalInt);
-		}
-
-		/** Removes an element from the ring buffer.
-		 *
-		 *  \warning Only one execution thread (main program thread or an ISR) may remove from a single buffer
-		 *           otherwise data corruption may occur. Insertion and removal may occur from different execution
-		 *           threads.
-		 *
-		 *  \param[in,out] Buffer  Pointer to a ring buffer structure to retrieve from.
-		 *
-		 *  \return Next data element stored in the buffer.
-		 */
-		static inline uint8_t RingBuffer_Remove(RingBuffer_t* Buffer) ATTR_NON_NULL_PTR_ARG(1);
-		static inline uint8_t RingBuffer_Remove(RingBuffer_t* Buffer)
-		{
-			GCC_FORCE_POINTER_ACCESS(Buffer);
-
-			uint8_t Data = *Buffer->Out;
-
-			if (++Buffer->Out == Buffer->End)
-			  Buffer->Out = Buffer->Start;
-
-			uint_reg_t CurrentGlobalInt = GetGlobalInterruptMask();
-			GlobalInterruptDisable();
-
-			Buffer->Count--;
-
-			SetGlobalInterruptMask(CurrentGlobalInt);
-
-			return Data;
-		}
-
-		/** Returns the next element stored in the ring buffer, without removing it.
-		 *
-		 *  \param[in,out] Buffer  Pointer to a ring buffer structure to retrieve from.
-		 *
-		 *  \return Next data element stored in the buffer.
-		 */
-		static inline uint8_t RingBuffer_Peek(RingBuffer_t* const Buffer) ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(1);
-		static inline uint8_t RingBuffer_Peek(RingBuffer_t* const Buffer)
-		{
-			return *Buffer->Out;
-		}
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Misc/TerminalCodes.h b/NativePrograms/LUFA/Drivers/Misc/TerminalCodes.h
deleted file mode 100644
index 184ede1554..0000000000
--- a/NativePrograms/LUFA/Drivers/Misc/TerminalCodes.h
+++ /dev/null
@@ -1,231 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief ANSI terminal special escape code macros.
- *
- *  ANSI terminal compatible escape sequences. These escape sequences are designed to be concatenated with existing
- *  strings to modify their display on a compatible terminal application.
- */
-
-/** \ingroup Group_MiscDrivers
- *  \defgroup Group_Terminal ANSI Terminal Escape Codes - LUFA/Drivers/Misc/TerminalCodes.h
- *  \brief ANSI terminal special escape code macros.
- *
- *  \section Sec_Terminal_Dependencies Module Source Dependencies
- *  The following files must be built with any user project that uses this module:
- *    - None
- *
- *  \section Sec_Terminal_ModDescription Module Description
- *  Escape code macros for ANSI compliant text terminals.
- *
- *  \note If desired, the macro \c DISABLE_TERMINAL_CODES can be defined in the project makefile and passed to the GCC
- *        compiler via the -D switch to disable the terminal codes without modifying the source, for use with non
- *        compatible terminals (any terminal codes then equate to empty strings).
- *
- *  \section Sec_Terminal_ExampleUsage Example Usage
- *  The following snippet is an example of how this module may be used within a typical
- *  application.
- *
- *  \code
- *      printf("Normal String, "
- *             ESC_BOLD_ON "Bold String, "
- *             ESC_UNDERLINE_ON "Bold and Underlined String"
- *             ESC_RESET ESC_FG_BLUE ESC_BG_YELLOW "Normal Blue-on-Yellow String");
- *  \endcode
- *
- *  @{
- */
-
-#ifndef __TERMINALCODES_H__
-#define __TERMINALCODES_H__
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			#if !defined(DISABLE_TERMINAL_CODES)
-				/** Creates an ANSI escape sequence with the specified payload.
-				 *
-				 *  \param[in] EscapeSeq  Payload to encode as an ANSI escape sequence, a \c ESC_* mask.
-				 */
-				#define ANSI_ESCAPE_SEQUENCE(EscapeSeq)  "\33[" EscapeSeq
-			#else
-				#define ANSI_ESCAPE_SEQUENCE(EscapeSeq)
-			#endif
-
-			/** \name Text Display Modifier Control Sequences */
-			/**@{*/
-			/** Turns on bold so that any following text is printed to the terminal in bold. */
-			#define ESC_BOLD_ON                     ANSI_ESCAPE_SEQUENCE("1m")
-
-			/** Turns on italics so that any following text is printed to the terminal in italics. */
-			#define ESC_ITALICS_ON                  ANSI_ESCAPE_SEQUENCE("3m")
-
-			/** Turns on underline so that any following text is printed to the terminal underlined. */
-			#define ESC_UNDERLINE_ON                ANSI_ESCAPE_SEQUENCE("4m")
-
-			/** Turns on inverse so that any following text is printed to the terminal in inverted colours. */
-			#define ESC_INVERSE_ON                  ANSI_ESCAPE_SEQUENCE("7m")
-
-			/** Turns on strike-through so that any following text is printed to the terminal with a line through the
-			 *  center.
-			 */
-			#define ESC_STRIKETHROUGH_ON            ANSI_ESCAPE_SEQUENCE("9m")
-
-			/** Turns off bold so that any following text is printed to the terminal in non bold. */
-			#define ESC_BOLD_OFF                    ANSI_ESCAPE_SEQUENCE("22m")
-
-			/** Turns off italics so that any following text is printed to the terminal in non italics. */
-			#define ESC_ITALICS_OFF                 ANSI_ESCAPE_SEQUENCE("23m")
-
-			/** Turns off underline so that any following text is printed to the terminal non underlined. */
-			#define ESC_UNDERLINE_OFF               ANSI_ESCAPE_SEQUENCE("24m")
-
-			/** Turns off inverse so that any following text is printed to the terminal in non inverted colours. */
-			#define ESC_INVERSE_OFF                 ANSI_ESCAPE_SEQUENCE("27m")
-
-			/** Turns off strike-through so that any following text is printed to the terminal without a line through
-			 *  the center.
-			 */
-			#define ESC_STRIKETHROUGH_OFF           ANSI_ESCAPE_SEQUENCE("29m")
-			/**@}*/
-
-			/** \name Text Colour Control Sequences */
-			/**@{*/
-			/** Sets the foreground (text) colour to black. */
-			#define ESC_FG_BLACK                    ANSI_ESCAPE_SEQUENCE("30m")
-
-			/** Sets the foreground (text) colour to red. */
-			#define ESC_FG_RED                      ANSI_ESCAPE_SEQUENCE("31m")
-
-			/** Sets the foreground (text) colour to green. */
-			#define ESC_FG_GREEN                    ANSI_ESCAPE_SEQUENCE("32m")
-
-			/** Sets the foreground (text) colour to yellow. */
-			#define ESC_FG_YELLOW                   ANSI_ESCAPE_SEQUENCE("33m")
-
-			/** Sets the foreground (text) colour to blue. */
-			#define ESC_FG_BLUE                     ANSI_ESCAPE_SEQUENCE("34m")
-
-			/** Sets the foreground (text) colour to magenta. */
-			#define ESC_FG_MAGENTA                  ANSI_ESCAPE_SEQUENCE("35m")
-
-			/** Sets the foreground (text) colour to cyan. */
-			#define ESC_FG_CYAN                     ANSI_ESCAPE_SEQUENCE("36m")
-
-			/** Sets the foreground (text) colour to white. */
-			#define ESC_FG_WHITE                    ANSI_ESCAPE_SEQUENCE("37m")
-
-			/** Sets the foreground (text) colour to the terminal's default. */
-			#define ESC_FG_DEFAULT                  ANSI_ESCAPE_SEQUENCE("39m")
-
-			/** Sets the text background colour to black. */
-			#define ESC_BG_BLACK                    ANSI_ESCAPE_SEQUENCE("40m")
-
-			/** Sets the text background colour to red. */
-			#define ESC_BG_RED                      ANSI_ESCAPE_SEQUENCE("41m")
-
-			/** Sets the text background colour to green. */
-			#define ESC_BG_GREEN                    ANSI_ESCAPE_SEQUENCE("42m")
-
-			/** Sets the text background colour to yellow. */
-			#define ESC_BG_YELLOW                   ANSI_ESCAPE_SEQUENCE("43m")
-
-			/** Sets the text background colour to blue. */
-			#define ESC_BG_BLUE                     ANSI_ESCAPE_SEQUENCE("44m")
-
-			/** Sets the text background colour to magenta. */
-			#define ESC_BG_MAGENTA                  ANSI_ESCAPE_SEQUENCE("45m")
-
-			/** Sets the text background colour to cyan. */
-			#define ESC_BG_CYAN                     ANSI_ESCAPE_SEQUENCE("46m")
-
-			/** Sets the text background colour to white. */
-			#define ESC_BG_WHITE                    ANSI_ESCAPE_SEQUENCE("47m")
-
-			/** Sets the text background colour to the terminal's default. */
-			#define ESC_BG_DEFAULT                  ANSI_ESCAPE_SEQUENCE("49m")
-			/**@}*/
-
-			/** \name Cursor Positioning Control Sequences */
-			/**@{*/
-			/** Saves the current cursor position so that it may be restored with \ref ESC_CURSOR_POS_RESTORE. */
-			#define ESC_CURSOR_POS_SAVE             ANSI_ESCAPE_SEQUENCE("s")
-
-			/** Restores the cursor position to the last position saved with \ref ESC_CURSOR_POS_SAVE. */
-			#define ESC_CURSOR_POS_RESTORE          ANSI_ESCAPE_SEQUENCE("u")
-
-			/** Sets the cursor position to the given line and column.
-			 *
-			 *  \param[in] Line    Line number to position the cursor at.
-			 *  \param[in] Column  Column number to position the cursor at.
-			 */
-			#define ESC_CURSOR_POS(Line, Column)    ANSI_ESCAPE_SEQUENCE(#Line ";" #Column "H")
-
-			/** Moves the cursor up the given number of lines.
-			 *
-			 *  \param[in] Lines  Number of lines to move the cursor position
-			 */
-			#define ESC_CURSOR_UP(Lines)            ANSI_ESCAPE_SEQUENCE(#Lines "A")
-
-			/** Moves the cursor down the given number of lines.
-			 *
-			 *  \param[in] Lines  Number of lines to move the cursor position
-			 */
-			#define ESC_CURSOR_DOWN(Lines)          ANSI_ESCAPE_SEQUENCE(#Lines "B")
-
-			/** Moves the cursor to the right the given number of columns.
-			 *
-			 *  \param[in] Columns  Number of columns to move the cursor position
-			 */
-			#define ESC_CURSOR_FORWARD(Columns)     ANSI_ESCAPE_SEQUENCE(#Columns "C")
-
-			/** Moves the cursor to the left the given number of columns.
-			 *
-			 *  \param[in] Columns  Number of columns to move the cursor position
-			 */
-			#define ESC_CURSOR_BACKWARD(Columns)    ANSI_ESCAPE_SEQUENCE(#Columns "D")
-			/**@}*/
-
-			/** \name Miscellaneous Control Sequences */
-			/**@{*/
-			/** Resets any escape sequence modifiers back to their defaults. */
-			#define ESC_RESET                       ANSI_ESCAPE_SEQUENCE("0m")
-
-			/** Erases the entire display, returning the cursor to the top left. */
-			#define ESC_ERASE_DISPLAY               ANSI_ESCAPE_SEQUENCE("2J")
-
-			/** Erases the current line, returning the cursor to the far left. */
-			#define ESC_ERASE_LINE                  ANSI_ESCAPE_SEQUENCE("K")
-			/**@}*/
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Peripheral/ADC.h b/NativePrograms/LUFA/Drivers/Peripheral/ADC.h
deleted file mode 100644
index 94b8493ccf..0000000000
--- a/NativePrograms/LUFA/Drivers/Peripheral/ADC.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Hardware Analogue-to-Digital converter driver.
- *
- *  This file is the master dispatch header file for the device-specific ADC driver, for microcontrollers
- *  containing an ADC.
- *
- *  User code should include this file, which will in turn include the correct ADC driver header file for the
- *  currently selected architecture and microcontroller model.
- */
-
-/** \ingroup Group_PeripheralDrivers
- *  \defgroup Group_ADC ADC Driver - LUFA/Drivers/Peripheral/ADC.h
- *  \brief Hardware Analogue-to-Digital converter driver.
- *
- *  \section Sec_ADC_Dependencies Module Source Dependencies
- *  The following files must be built with any user project that uses this module:
- *    - None
- *
- *  \section Sec_ADC_ModDescription Module Description
- *  Hardware ADC driver. This module provides an easy to use driver for the hardware ADC
- *  present on many microcontrollers, for the conversion of analogue signals into the
- *  digital domain.
- *
- *  \note The exact API for this driver may vary depending on the target used - see
- *        individual target module documentation for the API specific to your target processor.
- */
-
-#ifndef __ADC_H__
-#define __ADC_H__
-
-	/* Macros: */
-		#define __INCLUDE_FROM_ADC_H
-
-	/* Includes: */
-		#include "../../Common/Common.h"
-
-	/* Includes: */
-		#if (ARCH == ARCH_AVR8)
-			#include "AVR8/ADC_AVR8.h"
-		#else
-			#error The ADC peripheral driver is not currently available for your selected architecture.
-		#endif
-
-#endif
-
diff --git a/NativePrograms/LUFA/Drivers/Peripheral/AVR8/ADC_AVR8.h b/NativePrograms/LUFA/Drivers/Peripheral/AVR8/ADC_AVR8.h
deleted file mode 100644
index 835f7f2fae..0000000000
--- a/NativePrograms/LUFA/Drivers/Peripheral/AVR8/ADC_AVR8.h
+++ /dev/null
@@ -1,446 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief ADC Peripheral Driver (AVR8)
- *
- *  On-chip Analogue-to-Digital converter (ADC) driver for supported U4, U6 and U7 model AVRs that contain an ADC
- *  peripheral internally.
- *
- *  \note This file should not be included directly. It is automatically included as needed by the ADC driver
- *        dispatch header located in LUFA/Drivers/Peripheral/ADC.h.
- */
-
-/** \ingroup Group_ADC
- *  \defgroup Group_ADC_AVR8 ADC Peripheral Driver (AVR8)
- *
- *  \section Sec_ADC_AVR8_ModDescription Module Description
- *  On-chip Analogue-to-Digital converter (ADC) driver for supported U4, U6 and U7 model AVRs that contain an ADC
- *  peripheral internally.
- *
- *  \note This file should not be included directly. It is automatically included as needed by the ADC driver
- *        dispatch header located in LUFA/Drivers/Peripheral/ADC.h.
- *
- *  \section Sec_ADC_AVR8_ExampleUsage Example Usage
- *  The following snippet is an example of how this module may be used within a typical
- *  application.
- *
- *  \code
- *      // Initialize the ADC driver before first use
- *      ADC_Init(ADC_FREE_RUNNING | ADC_PRESCALE_32);
- *
- *      // Must setup the ADC channel to read beforehand
- *      ADC_SetupChannel(1);
- *
- *      // Perform a single conversion of the ADC channel 1
- *      ADC_GetChannelReading(ADC_REFERENCE_AVCC | ADC_RIGHT_ADJUSTED | ADC_CHANNEL1);
- *      printf("Conversion Result: %d\r\n", ADC_GetResult());
- *
- *      // Start reading ADC channel 1 in free running (continuous conversion) mode
- *      ADC_StartReading(ADC_REFERENCE_AVCC | ADC_RIGHT_ADJUSTED | ADC_CHANNEL1);
- *      for (;;)
- *      {
- *           while (!(ADC_IsReadingComplete())) {};
- *           printf("Conversion Result: %d\r\n", ADC_GetResult());
- *      }
- *  \endcode
- *
- *  @{
- */
-
-#ifndef __ADC_AVR8_H__
-#define __ADC_AVR8_H__
-
-	/* Includes: */
-		#include "../../../Common/Common.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_ADC_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Peripheral/ADC.h instead.
-		#endif
-
-		#if !(defined(__AVR_AT90USB1286__) || defined(__AVR_AT90USB646__) || \
-		      defined(__AVR_AT90USB1287__) || defined(__AVR_AT90USB647__) || \
-			  defined(__AVR_ATmega16U4__)  || defined(__AVR_ATmega32U4__))
-			#error The ADC peripheral driver is not currently available for your selected microcontroller model.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** \name ADC Reference Configuration Masks */
-			/**@{*/
-			/** Reference mask, for using the voltage present at the AVR's AREF pin for the ADC reference. */
-			#define ADC_REFERENCE_AREF              0
-
-			/** Reference mask, for using the voltage present at the AVR's AVCC pin for the ADC reference. */
-			#define ADC_REFERENCE_AVCC              (1 << REFS0)
-
-			/** Reference mask, for using the internally generated 2.56V reference voltage as the ADC reference. */
-			#define ADC_REFERENCE_INT2560MV         ((1 << REFS1) | (1 << REFS0))
-			/**@}*/
-
-			/** \name ADC Result Adjustment Configuration Masks */
-			/**@{*/
-			/** Left-adjusts the 10-bit ADC result, so that the upper 8 bits of the value returned by the
-			 *  \ref ADC_GetResult() macro contain the 8 most significant bits of the result.
-			 */
-			#define ADC_LEFT_ADJUSTED               (1 << ADLAR)
-
-			/** Right-adjusts the 10-bit ADC result, so that the lower 8 bits of the value returned by the
-			 *  \ref ADC_GetResult() macro contain the 8 least significant bits of the result.
-			 */
-			#define ADC_RIGHT_ADJUSTED              (0 << ADLAR)
-			/**@}*/
-
-			/** \name ADC Mode Configuration Masks */
-			/**@{*/
-			/** Sets the ADC mode to free running, so that conversions take place continuously as fast as the ADC
-			 *  is capable of at the given input clock speed.
-			 */
-			#define ADC_FREE_RUNNING                (1 << ADATE)
-
-			/** Sets the ADC mode to single conversion, so that only a single conversion will take place before
-			 *  the ADC returns to idle.
-			 */
-			#define ADC_SINGLE_CONVERSION           (0 << ADATE)
-			/**@}*/
-
-			/** \name ADC Prescaler Configuration Masks */
-			/**@{*/
-			/** Sets the ADC input clock to prescale by a factor of 2 the AVR's system clock. */
-			#define ADC_PRESCALE_2                  (1 << ADPS0)
-
-			/** Sets the ADC input clock to prescale by a factor of 4 the AVR's system clock. */
-			#define ADC_PRESCALE_4                  (1 << ADPS1)
-
-			/** Sets the ADC input clock to prescale by a factor of 8 the AVR's system clock. */
-			#define ADC_PRESCALE_8                  ((1 << ADPS0) | (1 << ADPS1))
-
-			/** Sets the ADC input clock to prescale by a factor of 16 the AVR's system clock. */
-			#define ADC_PRESCALE_16                 (1 << ADPS2)
-
-			/** Sets the ADC input clock to prescale by a factor of 32 the AVR's system clock. */
-			#define ADC_PRESCALE_32                 ((1 << ADPS2) | (1 << ADPS0))
-
-			/** Sets the ADC input clock to prescale by a factor of 64 the AVR's system clock. */
-			#define ADC_PRESCALE_64                 ((1 << ADPS2) | (1 << ADPS1))
-
-			/** Sets the ADC input clock to prescale by a factor of 128 the AVR's system clock. */
-			#define ADC_PRESCALE_128                ((1 << ADPS2) | (1 << ADPS1) | (1 << ADPS0))
-			/**@}*/
-
-			/** \name ADC MUX Masks */
-			/**@{*/
-			/** MUX mask define for the ADC0 channel of the ADC. See \ref ADC_StartReading() and \ref ADC_GetChannelReading(). */
-			#define ADC_CHANNEL0                    (0x00 << MUX0)
-
-			/** MUX mask define for the ADC1 channel of the ADC. See \ref ADC_StartReading() and \ref ADC_GetChannelReading(). */
-			#define ADC_CHANNEL1                    (0x01 << MUX0)
-
-			#if (!(defined(__AVR_ATmega16U4__) || defined(__AVR_ATmega32U4__)) || defined(__DOXYGEN__))
-				/** MUX mask define for the ADC2 channel of the ADC. See \ref ADC_StartReading() and \ref ADC_GetChannelReading().
-				 *
-				 *  \note Not available on all AVR models.
-				 */
-				#define ADC_CHANNEL2                (0x02 << MUX0)
-
-				/** MUX mask define for the ADC3 channel of the ADC. See \ref ADC_StartReading() and \ref ADC_GetChannelReading().
-				 *
-				 *  \note Not available on all AVR models.
-				 */
-				#define ADC_CHANNEL3                (0x03 << MUX0)
-			#endif
-
-			/** MUX mask define for the ADC4 channel of the ADC. See \ref ADC_StartReading() and \ref ADC_GetChannelReading(). */
-			#define ADC_CHANNEL4                    (0x04 << MUX0)
-
-			/** MUX mask define for the ADC5 channel of the ADC. See \ref ADC_StartReading() and \ref ADC_GetChannelReading(). */
-			#define ADC_CHANNEL5                    (0x05 << MUX0)
-
-			/** MUX mask define for the ADC6 channel of the ADC. See \ref ADC_StartReading() and \ref ADC_GetChannelReading(). */
-			#define ADC_CHANNEL6                    (0x06 << MUX0)
-
-			/** MUX mask define for the ADC7 channel of the ADC. See \ref ADC_StartReading and \ref ADC_GetChannelReading. */
-			#define ADC_CHANNEL7                    (0x07 << MUX0)
-
-			#if (defined(__AVR_ATmega16U4__)  || defined(__AVR_ATmega32U4__) || defined(__DOXYGEN__))
-				/** MUX mask define for the ADC8 channel of the ADC. See \ref ADC_StartReading() and \ref ADC_GetChannelReading().
-				 *
-				 *  \note Not available on all AVR models.
-				 */
-				#define ADC_CHANNEL8                ((1 << 8) | (0x00 << MUX0))
-
-				/** MUX mask define for the ADC9 channel of the ADC. See \ref ADC_StartReading() and \ref ADC_GetChannelReading().
-				 *
-				 *  \note Not available on all AVR models.
-				 */
-				#define ADC_CHANNEL9                ((1 << 8) | (0x01 << MUX0))
-
-				/** MUX mask define for the ADC10 channel of the ADC. See \ref ADC_StartReading() and \ref ADC_GetChannelReading().
-				 *
-				 *  \note Not available on all AVR models.
-				 */
-				#define ADC_CHANNEL10               ((1 << 8) | (0x02 << MUX0))
-
-				/** MUX mask define for the ADC11 channel of the ADC. See \ref ADC_StartReading() and \ref ADC_GetChannelReading().
-				 *
-				 *  \note Not available on all AVR models.
-				 */
-				#define ADC_CHANNEL11               ((1 << 8) | (0x03 << MUX0))
-
-				/** MUX mask define for the ADC12 channel of the ADC. See \ref ADC_StartReading() and \ref ADC_GetChannelReading().
-				 *
-				 *  \note Not available on all AVR models.
-				 */
-				#define ADC_CHANNEL12               ((1 << 8) | (0x04 << MUX0))
-
-				/** MUX mask define for the ADC13 channel of the ADC. See \ref ADC_StartReading() and \ref ADC_GetChannelReading().
-				 *
-				 *  \note Not available on all AVR models.
-				 */
-				#define ADC_CHANNEL13               ((1 << 8) | (0x05 << MUX0))
-
-				/** MUX mask define for the internal temperature sensor channel of the ADC. See \ref ADC_StartReading() and
-				 *  \ref ADC_GetChannelReading().
-				 *
-				 *  \note Not available on all AVR models.
-				 */
-				#define ADC_INT_TEMP_SENS           ((1 << 8) | (0x07 << MUX0))
-			#endif
-
-			/** MUX mask define for the internal 1.1V band-gap channel of the ADC. See \ref ADC_StartReading() and \ref ADC_GetChannelReading(). */
-			#define ADC_1100MV_BANDGAP              (0x1E << MUX0)
-
-			/** Retrieves the ADC MUX mask for the given ADC channel number.
-			 *
-			 *  \attention This macro will only work correctly on channel numbers that are compile-time
-			 *             constants defined by the preprocessor.
-			 *
-			 *  \param[in] Channel  Index of the ADC channel whose MUX mask is to be retrieved.
-			 */
-			#define ADC_GET_CHANNEL_MASK(Channel)   CONCAT_EXPANDED(ADC_CHANNEL, Channel)
-			/**@}*/
-
-		/* Inline Functions: */
-			/** Configures the given ADC channel, ready for ADC conversions. This function sets the
-			 *  associated port pin as an input and disables the digital portion of the I/O to reduce
-			 *  power consumption.
-			 *
-			 *  \note This must only be called for ADC channels with are connected to a physical port
-			 *        pin of the AVR, denoted by its special alternative function ADCx.
-			 *
-			 *  \warning The channel number must be specified as an integer, and <b>not</b> a \c ADC_CHANNEL* mask.
-			 *
-			 *  \param[in] ChannelIndex  ADC channel number to set up for conversions.
-			 */
-			static inline void ADC_SetupChannel(const uint8_t ChannelIndex)
-			{
-				#if (defined(__AVR_AT90USB1286__) || defined(__AVR_AT90USB646__) || \
-					 defined(__AVR_AT90USB1287__) || defined(__AVR_AT90USB647__))
-				DDRF  &= ~(1 << ChannelIndex);
-				DIDR0 |=  (1 << ChannelIndex);
-				#elif (defined(__AVR_ATmega16U4__) || defined(__AVR_ATmega32U4__))
-				if (ChannelIndex < 8)
-				{
-					DDRF  &= ~(1 << ChannelIndex);
-					DIDR0 |=  (1 << ChannelIndex);
-				}
-				else if (ChannelIndex == 8)
-				{
-					DDRD  &= ~(1 << 4);
-					DIDR2 |=  (1 << 0);
-				}
-				else if (ChannelIndex < 11)
-				{
-					DDRD  &= ~(1 << (ChannelIndex - 3));
-					DIDR2 |=  (1 << (ChannelIndex - 8));
-				}
-				else
-				{
-					DDRB  &= ~(1 << (ChannelIndex - 7));
-					DIDR2 |=  (1 << (ChannelIndex - 8));
-				}
-				#endif
-			}
-
-			/** De-configures the given ADC channel, re-enabling digital I/O mode instead of analog. This
-			 *  function sets the associated port pin as an input and re-enabled the digital portion of
-			 *  the I/O.
-			 *
-			 *  \note This must only be called for ADC channels with are connected to a physical port
-			 *        pin of the AVR, denoted by its special alternative function ADCx.
-			 *
-			 *  \warning The channel number must be specified as an integer, and <b>not</b> a \c ADC_CHANNEL* mask.
-			 *
-			 *  \param[in] ChannelIndex  ADC channel number to set up for conversions.
-			 */
-			static inline void ADC_DisableChannel(const uint8_t ChannelIndex)
-			{
-				#if (defined(__AVR_AT90USB1286__) || defined(__AVR_AT90USB646__) || \
-					 defined(__AVR_AT90USB1287__) || defined(__AVR_AT90USB647__))
-				DDRF  &= ~(1 << ChannelIndex);
-				DIDR0 &= ~(1 << ChannelIndex);
-				#elif (defined(__AVR_ATmega16U4__) || defined(__AVR_ATmega32U4__))
-				if (ChannelIndex < 8)
-				{
-					DDRF  &= ~(1 << ChannelIndex);
-					DIDR0 &= ~(1 << ChannelIndex);
-				}
-				else if (ChannelIndex == 8)
-				{
-					DDRD  &= ~(1 << 4);
-					DIDR2 &= ~(1 << 0);
-				}
-				else if (ChannelIndex < 11)
-				{
-					DDRD  &= ~(1 << (ChannelIndex - 3));
-					DIDR2 &= ~(1 << (ChannelIndex - 8));
-				}
-				else
-				{
-					DDRB  &= ~(1 << (ChannelIndex - 7));
-					DIDR2 &= ~(1 << (ChannelIndex - 8));
-				}
-				#endif
-			}
-
-			/** Starts the reading of the given channel, but does not wait until the conversion has completed.
-			 *  Once executed, the conversion status can be determined via the \ref ADC_IsReadingComplete() macro and
-			 *  the result read via the \ref ADC_GetResult() macro.
-			 *
-			 *  If the ADC has been initialized in free running mode, calling this function once will begin the repeated
-			 *  conversions. If the ADC is in single conversion mode (or the channel to convert from is to be changed),
-			 *  this function must be called each time a conversion is to take place.
-			 *
-			 *  \param[in] MUXMask  ADC channel mask, reference mask and adjustment mask.
-			 */
-			static inline void ADC_StartReading(const uint16_t MUXMask)
-			{
-				ADMUX = MUXMask;
-
-				#if (defined(__AVR_ATmega16U4__)  || defined(__AVR_ATmega32U4__) || defined(__DOXYGEN__))
-				if (MUXMask & (1 << 8))
-				  ADCSRB |=  (1 << MUX5);
-				else
-				  ADCSRB &= ~(1 << MUX5);
-				#endif
-
-				ADCSRA |= (1 << ADSC);
-			}
-
-			/** Indicates if the current ADC conversion is completed, or still in progress.
-			 *
-			 *  \return Boolean \c false if the reading is still taking place, or true if the conversion is
-			 *          complete and ready to be read out with \ref ADC_GetResult().
-			 */
-			static inline bool ADC_IsReadingComplete(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline bool ADC_IsReadingComplete(void)
-			{
-				return ((ADCSRA & (1 << ADIF)) ? true : false);
-			}
-
-			/** Retrieves the conversion value of the last completed ADC conversion and clears the reading
-			 *  completion flag.
-			 *
-			 *  \return The result of the last ADC conversion as an unsigned value.
-			 */
-			static inline uint16_t ADC_GetResult(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline uint16_t ADC_GetResult(void)
-			{
-				ADCSRA |= (1 << ADIF);
-				return ADC;
-			}
-
-			/** Performs a complete single reading from channel, including a polling spin-loop to wait for the
-			 *  conversion to complete, and the returning of the converted value.
-			 *
-			 *  \note For free running mode, the automated conversions should be initialized with a single call
-			 *        to \ref ADC_StartReading() to select the channel and begin the automated conversions, and
-			 *        the results read directly from the \ref ADC_GetResult() instead to reduce overhead.
-			 *
-			 *  \param[in] MUXMask  Mask comprising of an ADC channel mask, reference mask and adjustment mask.
-			 *
-			 *  \return Converted ADC result for the given ADC channel.
-			 */
-			static inline uint16_t ADC_GetChannelReading(const uint16_t MUXMask) ATTR_WARN_UNUSED_RESULT;
-			static inline uint16_t ADC_GetChannelReading(const uint16_t MUXMask)
-			{
-				ADC_StartReading(MUXMask);
-
-				while (!(ADC_IsReadingComplete()));
-
-				return ADC_GetResult();
-			}
-
-			/** Initializes the ADC, ready for conversions. This must be called before any other ADC operations.
-			 *  The "mode" parameter should be a mask comprised of a conversion mode (free running or single) and
-			 *  prescaler masks.
-			 *
-			 *  \param[in] Mode  Mask of ADC prescale and mode settings.
-			 */
-			static inline void ADC_Init(const uint8_t Mode) ATTR_ALWAYS_INLINE;
-			static inline void ADC_Init(const uint8_t Mode)
-			{
-				ADCSRA = ((1 << ADEN) | Mode);
-			}
-
-			/** Turns off the ADC. If this is called, any further ADC operations will require a call to
-			 *  \ref ADC_Init() before the ADC can be used again.
-			 */
-			static inline void ADC_Disable(void) ATTR_ALWAYS_INLINE;
-			static inline void ADC_Disable(void)
-			{
-				ADCSRA = 0;
-			}
-
-			/** Indicates if the ADC is currently enabled.
-			 *
-			 *  \return Boolean \c true if the ADC subsystem is currently enabled, \c false otherwise.
-			 */
-			static inline bool ADC_GetStatus(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline bool ADC_GetStatus(void)
-			{
-				return ((ADCSRA & (1 << ADEN)) ? true : false);
-			}
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Peripheral/AVR8/SPI_AVR8.h b/NativePrograms/LUFA/Drivers/Peripheral/AVR8/SPI_AVR8.h
deleted file mode 100644
index 93a00000f2..0000000000
--- a/NativePrograms/LUFA/Drivers/Peripheral/AVR8/SPI_AVR8.h
+++ /dev/null
@@ -1,258 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief SPI Peripheral Driver (AVR8)
- *
- *  On-chip SPI driver for the 8-bit AVR microcontrollers.
- *
- *  \note This file should not be included directly. It is automatically included as needed by the SPI driver
- *        dispatch header located in LUFA/Drivers/Peripheral/SPI.h.
- */
-
-/** \ingroup Group_SPI
- *  \defgroup Group_SPI_AVR8 SPI Peripheral Driver (AVR8)
- *
- *  \section Sec_SPI_AVR8_ModDescription Module Description
- *  Driver for the hardware SPI port available on most 8-bit AVR microcontroller models. This
- *  module provides an easy to use driver for the setup and transfer of data over the
- *  AVR's SPI port.
- *
- *  \note This file should not be included directly. It is automatically included as needed by the SPI driver
- *        dispatch header located in LUFA/Drivers/Peripheral/SPI.h.
- *
- *  \section Sec_SPI_AVR8_ExampleUsage Example Usage
- *  The following snippet is an example of how this module may be used within a typical
- *  application.
- *
- *  \code
- *      // Initialize the SPI driver before first use
- *      SPI_Init(SPI_SPEED_FCPU_DIV_2 | SPI_ORDER_MSB_FIRST | SPI_SCK_LEAD_FALLING |
- *               SPI_SAMPLE_TRAILING | SPI_MODE_MASTER);
- *
- *      // Send several bytes, ignoring the returned data
- *      SPI_SendByte(0x01);
- *      SPI_SendByte(0x02);
- *      SPI_SendByte(0x03);
- *
- *      // Receive several bytes, sending a dummy 0x00 byte each time
- *      uint8_t Byte1 = SPI_ReceiveByte();
- *      uint8_t Byte2 = SPI_ReceiveByte();
- *      uint8_t Byte3 = SPI_ReceiveByte();
- *
- *      // Send a byte, and store the received byte from the same transaction
- *      uint8_t ResponseByte = SPI_TransferByte(0xDC);
- *  \endcode
- *
- *  @{
- */
-
-#ifndef __SPI_AVR8_H__
-#define __SPI_AVR8_H__
-
-	/* Includes: */
-		#include "../../../Common/Common.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_SPI_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Peripheral/SPI.h instead.
-		#endif
-
-	/* Private Interface - For use in library only: */
-	#if !defined(__DOXYGEN__)
-		/* Macros: */
-			#define SPI_USE_DOUBLESPEED            (1 << SPE)
-	#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** \name SPI Prescaler Configuration Masks */
-			/**@{*/
-			/** SPI prescaler mask for \ref SPI_Init(). Divides the system clock by a factor of 2. */
-			#define SPI_SPEED_FCPU_DIV_2           SPI_USE_DOUBLESPEED
-
-			/** SPI prescaler mask for \ref SPI_Init(). Divides the system clock by a factor of 4. */
-			#define SPI_SPEED_FCPU_DIV_4           0
-
-			/** SPI prescaler mask for \ref SPI_Init(). Divides the system clock by a factor of 8. */
-			#define SPI_SPEED_FCPU_DIV_8           (SPI_USE_DOUBLESPEED | (1 << SPR0))
-
-			/** SPI prescaler mask for \ref SPI_Init(). Divides the system clock by a factor of 16. */
-			#define SPI_SPEED_FCPU_DIV_16          (1 << SPR0)
-
-			/** SPI prescaler mask for \ref SPI_Init(). Divides the system clock by a factor of 32. */
-			#define SPI_SPEED_FCPU_DIV_32          (SPI_USE_DOUBLESPEED | (1 << SPR1))
-
-			/** SPI prescaler mask for \ref SPI_Init(). Divides the system clock by a factor of 64. */
-			#define SPI_SPEED_FCPU_DIV_64          (SPI_USE_DOUBLESPEED | (1 << SPR1) | (1 << SPR0))
-
-			/** SPI prescaler mask for \ref SPI_Init(). Divides the system clock by a factor of 128. */
-			#define SPI_SPEED_FCPU_DIV_128         ((1 << SPR1) | (1 << SPR0))
-			/**@}*/
-
-			/** \name SPI SCK Polarity Configuration Masks */
-			/**@{*/
-			/** SPI clock polarity mask for \ref SPI_Init(). Indicates that the SCK should lead on the rising edge. */
-			#define SPI_SCK_LEAD_RISING            (0 << CPOL)
-
-			/** SPI clock polarity mask for \ref SPI_Init(). Indicates that the SCK should lead on the falling edge. */
-			#define SPI_SCK_LEAD_FALLING           (1 << CPOL)
-			/**@}*/
-
-			/** \name SPI Sample Edge Configuration Masks */
-			/**@{*/
-			/** SPI data sample mode mask for \ref SPI_Init(). Indicates that the data should sampled on the leading edge. */
-			#define SPI_SAMPLE_LEADING             (0 << CPHA)
-
-			/** SPI data sample mode mask for \ref SPI_Init(). Indicates that the data should be sampled on the trailing edge. */
-			#define SPI_SAMPLE_TRAILING            (1 << CPHA)
-			/**@}*/
-
-			/** \name SPI Data Ordering Configuration Masks */
-			/**@{*/
-			/** SPI data order mask for \ref SPI_Init(). Indicates that data should be shifted out MSB first. */
-			#define SPI_ORDER_MSB_FIRST            (0 << DORD)
-
-			/** SPI data order mask for \ref SPI_Init(). Indicates that data should be shifted out LSB first. */
-			#define SPI_ORDER_LSB_FIRST            (1 << DORD)
-			/**@}*/
-
-			/** \name SPI Mode Configuration Masks */
-			/**@{*/
-			/** SPI mode mask for \ref SPI_Init(). Indicates that the SPI interface should be initialized into slave mode. */
-			#define SPI_MODE_SLAVE                 (0 << MSTR)
-
-			/** SPI mode mask for \ref SPI_Init(). Indicates that the SPI interface should be initialized into master mode. */
-			#define SPI_MODE_MASTER                (1 << MSTR)
-			/**@}*/
-
-		/* Inline Functions: */
-			/** Initializes the SPI subsystem, ready for transfers. Must be called before calling any other
-			 *  SPI routines.
-			 *
-			 *  \param[in] SPIOptions  SPI Options, a mask consisting of one of each of the \c SPI_SPEED_*,
-			 *                         \c SPI_SCK_*, \c SPI_SAMPLE_*, \c SPI_ORDER_* and \c SPI_MODE_* masks.
-			 */
-			static inline void SPI_Init(const uint8_t SPIOptions);
-			static inline void SPI_Init(const uint8_t SPIOptions)
-			{
-				/* Prevent high rise times on PB.0 (/SS) from forcing a change to SPI slave mode */
-				DDRB  |= (1 << 0);
-				PORTB |= (1 << 0);
-
-				DDRB  |=  ((1 << 1) | (1 << 2));
-				DDRB  &= ~(1 << 3);
-				PORTB |=  (1 << 3);
-
-				if (SPIOptions & SPI_USE_DOUBLESPEED)
-				  SPSR |= (1 << SPI2X);
-				else
-				  SPSR &= ~(1 << SPI2X);
-
-				/* Switch /SS to input mode after configuration to allow for forced mode changes */
-				DDRB &= ~(1 << 0);
-
-				SPCR  = ((1 << SPE) | SPIOptions);
-			}
-
-			/** Turns off the SPI driver, disabling and returning used hardware to their default configuration. */
-			static inline void SPI_Disable(void);
-			static inline void SPI_Disable(void)
-			{
-				DDRB  &= ~((1 << 1) | (1 << 2));
-				PORTB &= ~((1 << 0) | (1 << 3));
-
-				SPCR   = 0;
-				SPSR   = 0;
-			}
-
-			/** Retrieves the currently selected SPI mode, once the SPI interface has been configured.
-			 *
-			 *  \return \ref SPI_MODE_MASTER if the interface is currently in SPI Master mode, \ref SPI_MODE_SLAVE otherwise
-			 */
-			static inline uint8_t SPI_GetCurrentMode(void) ATTR_ALWAYS_INLINE;
-			static inline uint8_t SPI_GetCurrentMode(void)
-			{
-				return (SPCR & SPI_MODE_MASTER);
-			}
-
-			/** Sends and receives a byte through the SPI interface, blocking until the transfer is complete.
-			 *
-			 *  \param[in] Byte  Byte to send through the SPI interface.
-			 *
-			 *  \return Response byte from the attached SPI device.
-			 */
-			static inline uint8_t SPI_TransferByte(const uint8_t Byte) ATTR_ALWAYS_INLINE;
-			static inline uint8_t SPI_TransferByte(const uint8_t Byte)
-			{
-				SPDR = Byte;
-				while (!(SPSR & (1 << SPIF)));
-				return SPDR;
-			}
-
-			/** Sends a byte through the SPI interface, blocking until the transfer is complete. The response
-			 *  byte sent to from the attached SPI device is ignored.
-			 *
-			 *  \param[in] Byte  Byte to send through the SPI interface.
-			 */
-			static inline void SPI_SendByte(const uint8_t Byte) ATTR_ALWAYS_INLINE;
-			static inline void SPI_SendByte(const uint8_t Byte)
-			{
-				SPDR = Byte;
-				while (!(SPSR & (1 << SPIF)));
-			}
-
-			/** Sends a dummy byte through the SPI interface, blocking until the transfer is complete. The response
-			 *  byte from the attached SPI device is returned.
-			 *
-			 *  \return The response byte from the attached SPI device.
-			 */
-			static inline uint8_t SPI_ReceiveByte(void) ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT;
-			static inline uint8_t SPI_ReceiveByte(void)
-			{
-				SPDR = 0x00;
-				while (!(SPSR & (1 << SPIF)));
-				return SPDR;
-			}
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Peripheral/AVR8/SerialSPI_AVR8.h b/NativePrograms/LUFA/Drivers/Peripheral/AVR8/SerialSPI_AVR8.h
deleted file mode 100644
index a5e921887b..0000000000
--- a/NativePrograms/LUFA/Drivers/Peripheral/AVR8/SerialSPI_AVR8.h
+++ /dev/null
@@ -1,208 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Master SPI Mode Serial USART Peripheral Driver (XMEGA)
- *
- *  On-chip Master SPI mode USART driver for the XMEGA AVR microcontrollers.
- *
- *  \note This file should not be included directly. It is automatically included as needed by the SPI Master
- *        Mode USART driver dispatch header located in LUFA/Drivers/Peripheral/Serial.h.
- */
-
-/** \ingroup Group_SerialSPI
- *  \defgroup Group_SerialSPI_AVR8 Master SPI Mode Serial USART Peripheral Driver (AVR8)
- *
- *  \section Sec_SerialSPI_AVR8_ModDescription Module Description
- *  On-chip serial USART driver for the 8-bit AVR8 microcontrollers.
- *
- *  \note This file should not be included directly. It is automatically included as needed by the SPI Master
- *        driver dispatch header located in LUFA/Drivers/Peripheral/SerialSPI.h.
- *
- *  \section Sec_SerialSPI_AVR8_ExampleUsage Example Usage
- *  The following snippet is an example of how this module may be used within a typical
- *  application.
- *
- *  \code
- *      // Initialize the Master SPI mode USART driver before first use, with 1Mbit baud
- *      SerialSPI_Init((USART_SPI_SCK_LEAD_RISING | USART_SPI_SAMPLE_LEADING | USART_SPI_ORDER_MSB_FIRST), 1000000);
- *
- *      // Send several bytes, ignoring the returned data
- *      SerialSPI_SendByte(0x01);
- *      SerialSPI_SendByte(0x02);
- *      SerialSPI_SendByte(0x03);
- *
- *      // Receive several bytes, sending a dummy 0x00 byte each time
- *      uint8_t Byte1 = SerialSPI_ReceiveByte();
- *      uint8_t Byte2 = SerialSPI_ReceiveByte();
- *      uint8_t Byte3 = SerialSPI_ReceiveByte();
- *
- *      // Send a byte, and store the received byte from the same transaction
- *      uint8_t ResponseByte = SerialSPI_TransferByte(0xDC);
- *  \endcode
- *
- *  @{
- */
-
-#ifndef __SERIAL_SPI_AVR8_H__
-#define __SERIAL_SPI_AVR8_H__
-
-	/* Includes: */
-		#include "../../../Common/Common.h"
-
-		#include <stdio.h>
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_SERIAL_SPI_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Peripheral/Serial.h instead.
-		#endif
-
-	/* Private Interface - For use in library only: */
-		#if !defined(__DOXYGEN__)
-			#define SERIAL_SPI_UBBRVAL(Baud)             ((Baud < (F_CPU / 2)) ? ((F_CPU / (2 * Baud)) - 1) : 0)
-
-			/* Master USART SPI mode flag definitions missing in the AVR8 toolchain */
-			#if !defined(UCPHA1)
-				#define UCPHA1                           1
-			#endif
-			#if !defined(UDORD1)
-				#define UDORD1                           2
-			#endif
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** \name SPI SCK Polarity Configuration Masks */
-			/**@{*/
-			/** SPI clock polarity mask for \ref SPI_Init(). Indicates that the SCK should lead on the rising edge. */
-			#define USART_SPI_SCK_LEAD_RISING            (0 << UCPOL1)
-
-			/** SPI clock polarity mask for \ref SPI_Init(). Indicates that the SCK should lead on the falling edge. */
-			#define USART_SPI_SCK_LEAD_FALLING           (1 << UCPOL1)
-			/**@}*/
-
-			/** \name SPI Sample Edge Configuration Masks */
-			/**@{*/
-			/** SPI data sample mode mask for \ref SerialSPI_Init(). Indicates that the data should sampled on the leading edge. */
-			#define USART_SPI_SAMPLE_LEADING             (0 << UCPHA1)
-
-			/** SPI data sample mode mask for \ref SerialSPI_Init(). Indicates that the data should be sampled on the trailing edge. */
-			#define USART_SPI_SAMPLE_TRAILING            (1 << UCPHA1)
-			/**@}*/
-
-			/** \name SPI Data Ordering Configuration Masks */
-			/**@{*/
-			/** SPI data order mask for \ref SerialSPI_Init(). Indicates that data should be shifted out MSB first. */
-			#define USART_SPI_ORDER_MSB_FIRST            (0 << UDORD1)
-
-			/** SPI data order mask for \ref SerialSPI_Init(). Indicates that data should be shifted out LSB first. */
-			#define USART_SPI_ORDER_LSB_FIRST            (1 << UDORD1)
-			/**@}*/
-
-		/* Inline Functions: */
-			/** Initialize the USART module in Master SPI mode.
-			 *
-			 *  \param[in]     SPIOptions   USART SPI Options, a mask consisting of one of each of the \c USART_SPI_SCK_*,
-			 *                              \c USART_SPI_SAMPLE_* and \c USART_SPI_ORDER_* masks.
-			 *  \param[in]     BaudRate     SPI baud rate, in bits per second.
-			 */
-			static inline void SerialSPI_Init(const uint8_t SPIOptions,
-			                                  const uint32_t BaudRate)
-			{
-				DDRD  |= ((1 << 3) | (1 << 5));
-				PORTD |= (1 << 2);
-
-				UCSR1C = ((1 << UMSEL11) | (1 << UMSEL10) | SPIOptions);
-				UCSR1B = ((1 << TXEN1)  | (1 << RXEN1));
-
-				UBRR1  = SERIAL_SPI_UBBRVAL(BaudRate);
-			}
-
-			/** Turns off the USART driver, disabling and returning used hardware to their default configuration. */
-			static inline void SerialSPI_Disable(void)
-			{
-				UCSR1B = 0;
-				UCSR1A = 0;
-				UCSR1C = 0;
-
-				UBRR1  = 0;
-
-				DDRD  &= ~((1 << 3) | (1 << 5));
-				PORTD &= ~(1 << 2);
-			}
-
-			/** Sends and receives a byte through the USART SPI interface, blocking until the transfer is complete.
-			 *
-			 *  \param[in] DataByte  Byte to send through the USART SPI interface.
-			 *
-			 *  \return Response byte from the attached SPI device.
-			 */
-			static inline uint8_t SerialSPI_TransferByte(const uint8_t DataByte)
-			{
-				UDR1 = DataByte;
-				while (!(UCSR1A & (1 << TXC1)));
-				UCSR1A = (1 << TXC1);
-				return UDR1;
-			}
-
-			/** Sends a byte through the USART SPI interface, blocking until the transfer is complete. The response
-			 *  byte sent to from the attached SPI device is ignored.
-			 *
-			 *  \param[in] DataByte  Byte to send through the USART SPI interface.
-			 */
-			static inline void SerialSPI_SendByte(const uint8_t DataByte)
-			{
-				SerialSPI_TransferByte(DataByte);
-			}
-
-			/** Sends a dummy byte through the USART SPI interface, blocking until the transfer is complete. The response
-			 *  byte from the attached SPI device is returned.
-			 *
-			 *  \return The response byte from the attached SPI device.
-			 */
-			static inline uint8_t SerialSPI_ReceiveByte(void)
-			{
-				return SerialSPI_TransferByte(0);
-			}
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Peripheral/AVR8/Serial_AVR8.c b/NativePrograms/LUFA/Drivers/Peripheral/AVR8/Serial_AVR8.c
deleted file mode 100644
index b2ac43a0d7..0000000000
--- a/NativePrograms/LUFA/Drivers/Peripheral/AVR8/Serial_AVR8.c
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-#include "../../../Common/Common.h"
-#if (ARCH == ARCH_AVR8)
-
-#define  __INCLUDE_FROM_SERIAL_C
-#include "../Serial.h"
-
-FILE USARTSerialStream;
-
-int Serial_putchar(char DataByte,
-                   FILE *Stream)
-{
-	(void)Stream;
-
-	Serial_SendByte(DataByte);
-	return 0;
-}
-
-int Serial_getchar(FILE *Stream)
-{
-	(void)Stream;
-
-	if (!(Serial_IsCharReceived()))
-	  return _FDEV_EOF;
-
-	return Serial_ReceiveByte();
-}
-
-int Serial_getchar_Blocking(FILE *Stream)
-{
-	(void)Stream;
-
-	while (!(Serial_IsCharReceived()));
-	return Serial_ReceiveByte();
-}
-
-void Serial_SendString_P(const char* FlashStringPtr)
-{
-	uint8_t CurrByte;
-
-	while ((CurrByte = pgm_read_byte(FlashStringPtr)) != 0x00)
-	{
-		Serial_SendByte(CurrByte);
-		FlashStringPtr++;
-	}
-}
-
-void Serial_SendString(const char* StringPtr)
-{
-	uint8_t CurrByte;
-
-	while ((CurrByte = *StringPtr) != 0x00)
-	{
-		Serial_SendByte(CurrByte);
-		StringPtr++;
-	}
-}
-
-void Serial_SendData(const void* Buffer,
-                     uint16_t Length)
-{
-	uint8_t* CurrByte = (uint8_t*)Buffer;
-
-	while (Length--)
-	  Serial_SendByte(*(CurrByte++));
-}
-
-void Serial_CreateStream(FILE* Stream)
-{
-	if (!(Stream))
-	{
-		Stream = &USARTSerialStream;
-		stdin  = Stream;
-		stdout = Stream;
-	}
-
-	*Stream = (FILE)FDEV_SETUP_STREAM(Serial_putchar, Serial_getchar, _FDEV_SETUP_RW);
-}
-
-void Serial_CreateBlockingStream(FILE* Stream)
-{
-	if (!(Stream))
-	{
-		Stream = &USARTSerialStream;
-		stdin  = Stream;
-		stdout = Stream;
-	}
-
-	*Stream = (FILE)FDEV_SETUP_STREAM(Serial_putchar, Serial_getchar_Blocking, _FDEV_SETUP_RW);
-}
-
-#endif
diff --git a/NativePrograms/LUFA/Drivers/Peripheral/AVR8/Serial_AVR8.h b/NativePrograms/LUFA/Drivers/Peripheral/AVR8/Serial_AVR8.h
deleted file mode 100644
index 5c3e61de61..0000000000
--- a/NativePrograms/LUFA/Drivers/Peripheral/AVR8/Serial_AVR8.h
+++ /dev/null
@@ -1,271 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Serial USART Peripheral Driver (AVR8)
- *
- *  On-chip serial USART driver for the 8-bit AVR microcontrollers.
- *
- *  \note This file should not be included directly. It is automatically included as needed by the USART driver
- *        dispatch header located in LUFA/Drivers/Peripheral/Serial.h.
- */
-
-/** \ingroup Group_Serial
- *  \defgroup Group_Serial_AVR8 Serial USART Peripheral Driver (AVR8)
- *
- *  \section Sec_Serial_AVR8_ModDescription Module Description
- *  On-chip serial USART driver for the 8-bit AVR microcontrollers.
- *
- *  \note This file should not be included directly. It is automatically included as needed by the USART driver
- *        dispatch header located in LUFA/Drivers/Peripheral/Serial.h.
- *
- *  \section Sec_Serial_AVR8_ExampleUsage Example Usage
- *  The following snippet is an example of how this module may be used within a typical
- *  application.
- *
- *  \code
- *      // Initialize the serial USART driver before first use, with 9600 baud (and no double-speed mode)
- *      Serial_Init(9600, false);
- *
- *      // Send a string through the USART
- *      Serial_SendString("Test String\r\n");
- *
- *      // Send a raw byte through the USART
- *      Serial_SendByte(0xDC);
- *
- *      // Receive a byte through the USART (or -1 if no data received)
- *      int16_t DataByte = Serial_ReceiveByte();
- *  \endcode
- *
- *  @{
- */
-
-#ifndef __SERIAL_AVR8_H__
-#define __SERIAL_AVR8_H__
-
-	/* Includes: */
-		#include "../../../Common/Common.h"
-		#include "../../Misc/TerminalCodes.h"
-
-		#include <stdio.h>
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_SERIAL_H) && !defined(__INCLUDE_FROM_SERIAL_C)
-			#error Do not include this file directly. Include LUFA/Drivers/Peripheral/Serial.h instead.
-		#endif
-
-	/* Private Interface - For use in library only: */
-	#if !defined(__DOXYGEN__)
-		/* External Variables: */
-			extern FILE USARTSerialStream;
-
-		/* Function Prototypes: */
-			int Serial_putchar(char DataByte,
-			                   FILE *Stream);
-			int Serial_getchar(FILE *Stream);
-			int Serial_getchar_Blocking(FILE *Stream);
-	#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Macro for calculating the baud value from a given baud rate when the \c U2X (double speed) bit is
-			 *  not set.
-			 *
-			 *  \param[in] Baud  Target serial UART baud rate.
-			 *
-			 *  \return Closest UBRR register value for the given UART frequency.
-			 */
-			#define SERIAL_UBBRVAL(Baud)    ((((F_CPU / 16) + (Baud / 2)) / (Baud)) - 1)
-
-			/** Macro for calculating the baud value from a given baud rate when the \c U2X (double speed) bit is
-			 *  set.
-			 *
-			 *  \param[in] Baud  Target serial UART baud rate.
-			 *
-			 *  \return Closest UBRR register value for the given UART frequency.
-			 */
-			#define SERIAL_2X_UBBRVAL(Baud) ((((F_CPU / 8) + (Baud / 2)) / (Baud)) - 1)
-
-		/* Function Prototypes: */
-			/** Transmits a given NUL terminated string located in program space (FLASH) through the USART.
-			 *
-			 *  \param[in] FlashStringPtr  Pointer to a string located in program space.
-			 */
-			void Serial_SendString_P(const char* FlashStringPtr) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Transmits a given NUL terminated string located in SRAM memory through the USART.
-			 *
-			 *  \param[in] StringPtr  Pointer to a string located in SRAM space.
-			 */
-			void Serial_SendString(const char* StringPtr) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Transmits a given buffer located in SRAM memory through the USART.
-			 *
-			 *  \param[in] Buffer  Pointer to a buffer containing the data to send.
-			 *  \param[in] Length  Length of the data to send, in bytes.
-			 */
-			void Serial_SendData(const void* Buffer, uint16_t Length) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Creates a standard character stream from the USART so that it can be used with all the regular functions
-			 *  in the avr-libc \c <stdio.h> library that accept a \c FILE stream as a destination (e.g. \c fprintf). The created
-			 *  stream is bidirectional and can be used for both input and output functions.
-			 *
-			 *  Reading data from this stream is non-blocking, i.e. in most instances, complete strings cannot be read in by a single
-			 *  fetch, as the endpoint will not be ready at some point in the transmission, aborting the transfer. However, this may
-			 *  be used when the read data is processed byte-per-bye (via \c getc()) or when the user application will implement its own
-			 *  line buffering.
-			 *
-			 *  \param[in,out] Stream  Pointer to a FILE structure where the created stream should be placed, if \c NULL, \c stdout
-			 *                         and \c stdin will be configured to use the USART.
-			 *
-			 *  \pre The USART must first be configured via a call to \ref Serial_Init() before the stream is used.
-			 */
-			void Serial_CreateStream(FILE* Stream);
-
-			/** Identical to \ref Serial_CreateStream(), except that reads are blocking until the calling stream function terminates
-			 *  the transfer.
-			 *
-			 *  \param[in,out] Stream  Pointer to a FILE structure where the created stream should be placed, if \c NULL, \c stdout
-			 *                         and \c stdin will be configured to use the USART.
-			 *
-			 *  \pre The USART must first be configured via a call to \ref Serial_Init() before the stream is used.
-			 */
-			void Serial_CreateBlockingStream(FILE* Stream);
-
-		/* Inline Functions: */
-			/** Initializes the USART, ready for serial data transmission and reception. This initializes the interface to
-			 *  standard 8-bit, no parity, 1 stop bit settings suitable for most applications.
-			 *
-			 *  \param[in] BaudRate     Serial baud rate, in bits per second. This should be the target baud rate regardless of the
-			 *                          \c DoubleSpeed parameter's value.
-			 *  \param[in] DoubleSpeed  Enables double speed mode when set, halving the sample time to double the baud rate.
-			 */
-			static inline void Serial_Init(const uint32_t BaudRate,
-			                               const bool DoubleSpeed);
-			static inline void Serial_Init(const uint32_t BaudRate,
-			                               const bool DoubleSpeed)
-			{
-				UBRR1  = (DoubleSpeed ? SERIAL_2X_UBBRVAL(BaudRate) : SERIAL_UBBRVAL(BaudRate));
-
-				UCSR1C = ((1 << UCSZ11) | (1 << UCSZ10));
-				UCSR1A = (DoubleSpeed ? (1 << U2X1) : 0);
-				UCSR1B = ((1 << TXEN1)  | (1 << RXEN1));
-
-				DDRD  |= (1 << 3);
-				PORTD |= (1 << 2);
-			}
-
-			/** Turns off the USART driver, disabling and returning used hardware to their default configuration. */
-			static inline void Serial_Disable(void);
-			static inline void Serial_Disable(void)
-			{
-				UCSR1B = 0;
-				UCSR1A = 0;
-				UCSR1C = 0;
-
-				UBRR1  = 0;
-
-				DDRD  &= ~(1 << 3);
-				PORTD &= ~(1 << 2);
-			}
-
-			/** Indicates whether a character has been received through the USART.
-			 *
-			 *  \return Boolean \c true if a character has been received, \c false otherwise.
-			 */
-			static inline bool Serial_IsCharReceived(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline bool Serial_IsCharReceived(void)
-			{
-				return ((UCSR1A & (1 << RXC1)) ? true : false);
-			}
-
-			/** Indicates whether there is hardware buffer space for a new transmit on the USART. This
-			 *  function can be used to determine if a call to \ref Serial_SendByte() will block in advance.
-			 *
-			 *  \return Boolean \c true if a character can be queued for transmission immediately, \c false otherwise.
-			 */
-			static inline bool Serial_IsSendReady(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline bool Serial_IsSendReady(void)
-			{
-				return ((UCSR1A & (1 << UDRE1)) ? true : false);
-			}
-
-			/** Indicates whether the hardware USART transmit buffer is completely empty, indicating all
-			 *  pending transmissions have completed.
-			 *
-			 *  \return Boolean \c true if no characters are buffered for transmission, \c false otherwise.
-			 */
-			static inline bool Serial_IsSendComplete(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline bool Serial_IsSendComplete(void)
-			{
-				return ((UCSR1A & (1 << TXC1)) ? true : false);
-			}
-
-			/** Transmits a given byte through the USART.
-			 *
-			 *  \note If no buffer space is available in the hardware USART, this function will block. To check if
-			 *        space is available before calling this function, see \ref Serial_IsSendReady().
-			 *
-			 *  \param[in] DataByte  Byte to transmit through the USART.
-			 */
-			static inline void Serial_SendByte(const char DataByte) ATTR_ALWAYS_INLINE;
-			static inline void Serial_SendByte(const char DataByte)
-			{
-				while (!(Serial_IsSendReady()));
-				UDR1 = DataByte;
-			}
-
-			/** Receives the next byte from the USART.
-			 *
-			 *  \return Next byte received from the USART, or a negative value if no byte has been received.
-			 */
-			static inline int16_t Serial_ReceiveByte(void) ATTR_ALWAYS_INLINE;
-			static inline int16_t Serial_ReceiveByte(void)
-			{
-				if (!(Serial_IsCharReceived()))
-				  return -1;
-
-				return UDR1;
-			}
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Peripheral/AVR8/TWI_AVR8.c b/NativePrograms/LUFA/Drivers/Peripheral/AVR8/TWI_AVR8.c
deleted file mode 100644
index 2ef28b5bf1..0000000000
--- a/NativePrograms/LUFA/Drivers/Peripheral/AVR8/TWI_AVR8.c
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-#include "../../../Common/Common.h"
-#if (ARCH == ARCH_AVR8) && defined(TWCR)
-
-#define  __INCLUDE_FROM_TWI_C
-#include "../TWI.h"
-
-uint8_t TWI_StartTransmission(const uint8_t SlaveAddress,
-                              const uint8_t TimeoutMS)
-{
-	for (;;)
-	{
-		bool     BusCaptured = false;
-		uint16_t TimeoutRemaining;
-
-		TWCR = ((1 << TWINT) | (1 << TWSTA) | (1 << TWEN));
-
-		TimeoutRemaining = (TimeoutMS * 100);
-		while (TimeoutRemaining && !(BusCaptured))
-		{
-			if (TWCR & (1 << TWINT))
-			{
-				switch (TWSR & TW_STATUS_MASK)
-				{
-					case TW_START:
-					case TW_REP_START:
-						BusCaptured = true;
-						break;
-					case TW_MT_ARB_LOST:
-						TWCR = ((1 << TWINT) | (1 << TWSTA) | (1 << TWEN));
-						continue;
-					default:
-						TWCR = (1 << TWEN);
-						return TWI_ERROR_BusFault;
-				}
-			}
-
-			_delay_us(10);
-			TimeoutRemaining--;
-		}
-
-		if (!(TimeoutRemaining))
-		{
-			TWCR = (1 << TWEN);
-			return TWI_ERROR_BusCaptureTimeout;
-		}
-
-		TWDR = SlaveAddress;
-		TWCR = ((1 << TWINT) | (1 << TWEN));
-
-		TimeoutRemaining = (TimeoutMS * 100);
-		while (TimeoutRemaining)
-		{
-			if (TWCR & (1 << TWINT))
-			  break;
-
-			_delay_us(10);
-			TimeoutRemaining--;
-		}
-
-		if (!(TimeoutRemaining))
-		  return TWI_ERROR_SlaveResponseTimeout;
-
-		switch (TWSR & TW_STATUS_MASK)
-		{
-			case TW_MT_SLA_ACK:
-			case TW_MR_SLA_ACK:
-				return TWI_ERROR_NoError;
-			default:
-				TWCR = ((1 << TWINT) | (1 << TWSTO) | (1 << TWEN));
-				return TWI_ERROR_SlaveNotReady;
-		}
-	}
-}
-
-bool TWI_SendByte(const uint8_t Byte)
-{
-	TWDR = Byte;
-	TWCR = ((1 << TWINT) | (1 << TWEN));
-	while (!(TWCR & (1 << TWINT)));
-
-	return ((TWSR & TW_STATUS_MASK) == TW_MT_DATA_ACK);
-}
-
-bool TWI_ReceiveByte(uint8_t* const Byte,
-					 const bool LastByte)
-{
-	uint8_t TWCRMask;
-
-	if (LastByte)
-	  TWCRMask = ((1 << TWINT) | (1 << TWEN));
-	else
-	  TWCRMask = ((1 << TWINT) | (1 << TWEN) | (1 << TWEA));
-
-	TWCR = TWCRMask;
-	while (!(TWCR & (1 << TWINT)));
-	*Byte = TWDR;
-
-	uint8_t Status = (TWSR & TW_STATUS_MASK);
-
-	return ((LastByte) ? (Status == TW_MR_DATA_NACK) : (Status == TW_MR_DATA_ACK));
-}
-
-uint8_t TWI_ReadPacket(const uint8_t SlaveAddress,
-                       const uint8_t TimeoutMS,
-                       const uint8_t* InternalAddress,
-                       uint8_t InternalAddressLen,
-                       uint8_t* Buffer,
-                       uint16_t Length)
-{
-	uint8_t ErrorCode;
-
-	if ((ErrorCode = TWI_StartTransmission((SlaveAddress & TWI_DEVICE_ADDRESS_MASK) | TWI_ADDRESS_WRITE,
-	                                       TimeoutMS)) == TWI_ERROR_NoError)
-	{
-		while (InternalAddressLen--)
-		{
-			if (!(TWI_SendByte(*(InternalAddress++))))
-			{
-				ErrorCode = TWI_ERROR_SlaveNAK;
-				break;
-			}
-		}
-
-		if ((ErrorCode = TWI_StartTransmission((SlaveAddress & TWI_DEVICE_ADDRESS_MASK) | TWI_ADDRESS_READ,
-											   TimeoutMS)) == TWI_ERROR_NoError)
-		{
-			while (Length--)
-			{
-				if (!(TWI_ReceiveByte(Buffer++, (Length == 0))))
-				{
-					ErrorCode = TWI_ERROR_SlaveNAK;
-					break;
-				}
-			}
-
-			TWI_StopTransmission();
-		}
-	}
-
-	return ErrorCode;
-}
-
-uint8_t TWI_WritePacket(const uint8_t SlaveAddress,
-                        const uint8_t TimeoutMS,
-                        const uint8_t* InternalAddress,
-                        uint8_t InternalAddressLen,
-                        const uint8_t* Buffer,
-                        uint16_t Length)
-{
-	uint8_t ErrorCode;
-
-	if ((ErrorCode = TWI_StartTransmission((SlaveAddress & TWI_DEVICE_ADDRESS_MASK) | TWI_ADDRESS_WRITE,
-	                                       TimeoutMS)) == TWI_ERROR_NoError)
-	{
-		while (InternalAddressLen--)
-		{
-			if (!(TWI_SendByte(*(InternalAddress++))))
-			{
-				ErrorCode = TWI_ERROR_SlaveNAK;
-				break;
-			}
-		}
-
-		while (Length--)
-		{
-			if (!(TWI_SendByte(*(Buffer++))))
-			{
-				ErrorCode = TWI_ERROR_SlaveNAK;
-				break;
-			}
-		}
-
-		TWI_StopTransmission();
-	}
-
-	return ErrorCode;
-}
-
-#endif
diff --git a/NativePrograms/LUFA/Drivers/Peripheral/AVR8/TWI_AVR8.h b/NativePrograms/LUFA/Drivers/Peripheral/AVR8/TWI_AVR8.h
deleted file mode 100644
index fdb272321b..0000000000
--- a/NativePrograms/LUFA/Drivers/Peripheral/AVR8/TWI_AVR8.h
+++ /dev/null
@@ -1,305 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief TWI Peripheral Driver (AVR8)
- *
- *  On-chip TWI driver for the 8-bit AVR microcontrollers.
- *
- *  \note This file should not be included directly. It is automatically included as needed by the TWI driver
- *        dispatch header located in LUFA/Drivers/Peripheral/TWI.h.
- */
-
-/** \ingroup Group_TWI
- *  \defgroup Group_TWI_AVR8 TWI Peripheral Driver (AVR8)
- *
- *  \section Sec_TWI_AVR8_ModDescription Module Description
- *  Master mode TWI driver for the 8-bit AVR microcontrollers which contain a hardware TWI module.
- *
- *  \note This file should not be included directly. It is automatically included as needed by the TWI driver
- *        dispatch header located in LUFA/Drivers/Peripheral/TWI.h.
- *
- *  \section Sec_TWI_AVR8_ExampleUsage Example Usage
- *  The following snippet is an example of how this module may be used within a typical
- *  application.
- *
- *  <b>Low Level API Example:</b>
- *  \code
- *      // Initialize the TWI driver before first use at 200KHz
- *      TWI_Init(TWI_BIT_PRESCALE_1, TWI_BITLENGTH_FROM_FREQ(1, 200000));
- *
- *      // Start a write session to device at device address 0xA0, internal address 0xDC with a 10ms timeout
- *      if (TWI_StartTransmission(0xA0 | TWI_ADDRESS_WRITE, 10) == TWI_ERROR_NoError)
- *      {
- *          TWI_SendByte(0xDC);
- *
- *          TWI_SendByte(0x01);
- *          TWI_SendByte(0x02);
- *          TWI_SendByte(0x03);
- *
- *          // Must stop transmission afterwards to release the bus
- *          TWI_StopTransmission();
- *      }
- *
- *      // Start a read session to device at address 0xA0, internal address 0xDC with a 10ms timeout
- *      if (TWI_StartTransmission(0xA0 | TWI_ADDRESS_WRITE, 10) == TWI_ERROR_NoError)
- *      {
- *          TWI_SendByte(0xDC);
- *          TWI_StopTransmission();
- *
- *          if (TWI_StartTransmission(0xA0 | TWI_ADDRESS_READ, 10) == TWI_ERROR_NoError)
- *          {
- *              uint8_t Byte1, Byte2, Byte3;
- *
- *              // Read three bytes, acknowledge after the third byte is received
- *              TWI_ReceiveByte(&Byte1, false);
- *              TWI_ReceiveByte(&Byte2, false);
- *              TWI_ReceiveByte(&Byte3, true);
- *
- *              // Must stop transmission afterwards to release the bus
- *              TWI_StopTransmission();
- *          }
- *      }
- *  \endcode
- *
- *  <b>High Level API Example:</b>
- *  \code
- *      // Initialize the TWI driver before first use at 200KHz
- *      TWI_Init(TWI_BIT_PRESCALE_1, TWI_BITLENGTH_FROM_FREQ(1, 200000));
- *
- *      // Start a write session to device at device address 0xA0, internal address 0xDC with a 10ms timeout
- *      uint8_t InternalWriteAddress = 0xDC;
- *      uint8_t WritePacket[3] = {0x01, 0x02, 0x03};
- *
- *      TWI_WritePacket(0xA0, 10, &InternalWriteAddress, sizeof(InternalWriteAddress),
- *                      &WritePacket, sizeof(WritePacket);
- *
- *      // Start a read session to device at address 0xA0, internal address 0xDC with a 10ms timeout
- *      uint8_t InternalReadAddress = 0xDC;
- *      uint8_t ReadPacket[3];
- *
- *      TWI_ReadPacket(0xA0, 10, &InternalReadAddress, sizeof(InternalReadAddress),
- *                     &ReadPacket, sizeof(ReadPacket);
- *  \endcode
- *
- *  @{
- */
-
-#ifndef __TWI_AVR8_H__
-#define __TWI_AVR8_H__
-
-	/* Includes: */
-		#include "../../../Common/Common.h"
-
-		#include <stdio.h>
-		#include <util/twi.h>
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_TWI_H) && !defined(__INCLUDE_FROM_TWI_C)
-			#error Do not include this file directly. Include LUFA/Drivers/Peripheral/TWI.h instead.
-		#endif
-
-		#if !(defined(__AVR_AT90USB1286__) || defined(__AVR_AT90USB646__) || \
-		      defined(__AVR_AT90USB1287__) || defined(__AVR_AT90USB647__) || \
-			  defined(__AVR_ATmega16U4__)  || defined(__AVR_ATmega32U4__))
-			#error The TWI peripheral driver is not currently available for your selected microcontroller model.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** TWI slave device address mask for a read session. Mask with a slave device base address to obtain
-			 *  the correct TWI bus address for the slave device when reading data from it.
-			 */
-			#define TWI_ADDRESS_READ         0x01
-
-			/** TWI slave device address mask for a write session. Mask with a slave device base address to obtain
-			 *  the correct TWI bus address for the slave device when writing data to it.
-			 */
-			#define TWI_ADDRESS_WRITE        0x00
-
-			/** Mask to retrieve the base address for a TWI device, which can then be ORed with \ref TWI_ADDRESS_READ
-			 *  or \ref TWI_ADDRESS_WRITE to obtain the device's read and write address respectively.
-			 */
-			#define TWI_DEVICE_ADDRESS_MASK  0xFE
-
-			/** Bit length prescaler for \ref TWI_Init(). This mask multiplies the TWI bit length prescaler by 1. */
-			#define TWI_BIT_PRESCALE_1       ((0 << TWPS1) | (0 << TWPS0))
-
-			/** Bit length prescaler for \ref TWI_Init(). This mask multiplies the TWI bit length prescaler by 4. */
-			#define TWI_BIT_PRESCALE_4       ((0 << TWPS1) | (1 << TWPS0))
-
-			/** Bit length prescaler for \ref TWI_Init(). This mask multiplies the TWI bit length prescaler by 16. */
-			#define TWI_BIT_PRESCALE_16      ((1 << TWPS1) | (0 << TWPS0))
-
-			/** Bit length prescaler for \ref TWI_Init(). This mask multiplies the TWI bit length prescaler by 64. */
-			#define TWI_BIT_PRESCALE_64      ((1 << TWPS1) | (1 << TWPS0))
-
-			/** Calculates the length of each bit on the TWI bus for a given target frequency. This may be used with
-			 *  the \ref TWI_Init() function to convert a bus frequency to a number of clocks for the \c BitLength
-			 *  parameter.
-			 *
-			 *  \param[in] Prescale   Prescaler set on the TWI bus.
-			 *  \param[in] Frequency  Desired TWI bus frequency in Hz.
-			 *
-			 *  \return Bit length in clocks for the given TWI bus frequency at the given prescaler value.
-			 */
-			#define TWI_BITLENGTH_FROM_FREQ(Prescale, Frequency) ((((F_CPU / (Prescale)) / (Frequency)) - 16) / 2)
-
-		/* Enums: */
-			/** Enum for the possible return codes of the TWI transfer start routine and other dependant TWI functions. */
-			enum TWI_ErrorCodes_t
-			{
-				TWI_ERROR_NoError              = 0, /**< Indicates that the command completed successfully. */
-				TWI_ERROR_BusFault             = 1, /**< A TWI bus fault occurred while attempting to capture the bus. */
-				TWI_ERROR_BusCaptureTimeout    = 2, /**< A timeout occurred whilst waiting for the bus to be ready. */
-				TWI_ERROR_SlaveResponseTimeout = 3, /**< No ACK received at the nominated slave address within the timeout period. */
-				TWI_ERROR_SlaveNotReady        = 4, /**< Slave NAKed the TWI bus START condition. */
-				TWI_ERROR_SlaveNAK             = 5, /**< Slave NAKed whilst attempting to send data to the device. */
-			};
-
-		/* Inline Functions: */
-			/** Initializes the TWI hardware into master mode, ready for data transmission and reception. This must be
-			 *  before any other TWI operations.
-			 *
-			 *  The generated SCL frequency will be according to the formula <pre>F_CPU / (16 + 2 * BitLength + 4 ^ Prescale)</pre>.
-			 *
-			 *  \attention The value of the \c BitLength parameter should not be set below 10 or invalid bus conditions may
-			 *             occur, as indicated in the AVR8 microcontroller datasheet.
-			 *
-			 *  \param[in] Prescale   Prescaler to use when determining the bus frequency, a \c TWI_BIT_PRESCALE_* value.
-			 *  \param[in] BitLength  Length of the bits sent on the bus.
-			 */
-			static inline void TWI_Init(const uint8_t Prescale,
-			                            const uint8_t BitLength) ATTR_ALWAYS_INLINE;
-			static inline void TWI_Init(const uint8_t Prescale,
-			                            const uint8_t BitLength)
-			{
-				TWCR |= (1 << TWEN);
-				TWSR  = Prescale;
-				TWBR  = BitLength;
-			}
-
-			/** Turns off the TWI driver hardware. If this is called, any further TWI operations will require a call to
-			 *  \ref TWI_Init() before the TWI can be used again.
-			 */
-			static inline void TWI_Disable(void) ATTR_ALWAYS_INLINE;
-			static inline void TWI_Disable(void)
-			{
-				TWCR &= ~(1 << TWEN);
-			}
-
-			/** Sends a TWI STOP onto the TWI bus, terminating communication with the currently addressed device. */
-			static inline void TWI_StopTransmission(void) ATTR_ALWAYS_INLINE;
-			static inline void TWI_StopTransmission(void)
-			{
-				TWCR = ((1 << TWINT) | (1 << TWSTO) | (1 << TWEN));
-			}
-
-		/* Function Prototypes: */
-			/** Begins a master mode TWI bus communication with the given slave device address.
-			 *
-			 *  \param[in] SlaveAddress  Address of the slave TWI device to communicate with.
-			 *  \param[in] TimeoutMS     Timeout period within which the slave must respond, in milliseconds.
-			 *
-			 *  \return A value from the \ref TWI_ErrorCodes_t enum.
-			 */
-			uint8_t TWI_StartTransmission(const uint8_t SlaveAddress,
-			                              const uint8_t TimeoutMS);
-
-			/** Sends a byte to the currently addressed device on the TWI bus.
-			 *
-			 *  \param[in] Byte  Byte to send to the currently addressed device
-			 *
-			 *  \return Boolean \c true if the recipient ACKed the byte, \c false otherwise
-			 */
-			bool TWI_SendByte(const uint8_t Byte);
-
-			/** Receives a byte from the currently addressed device on the TWI bus.
-			 *
-			 *  \param[in] Byte      Location where the read byte is to be stored.
-			 *  \param[in] LastByte  Indicates if the byte should be ACKed if false, NAKed if true.
-			 *
-			 *  \return Boolean \c true if the byte reception successfully completed, \c false otherwise.
-			 */
-			bool TWI_ReceiveByte(uint8_t* const Byte,
-			                     const bool LastByte) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** High level function to perform a complete packet transfer over the TWI bus to the specified
-			 *  device.
-			 *
-			 *  \param[in] SlaveAddress        Base address of the TWI slave device to communicate with.
-			 *  \param[in] TimeoutMS           Timeout for bus capture and slave START ACK, in milliseconds.
-			 *  \param[in] InternalAddress     Pointer to a location where the internal slave read start address is stored.
-			 *  \param[in] InternalAddressLen  Size of the internal device address, in bytes.
-			 *  \param[in] Buffer              Pointer to a buffer where the read packet data is to be stored.
-			 *  \param[in] Length              Size of the packet to read, in bytes.
-			 *
-			 *  \return A value from the \ref TWI_ErrorCodes_t enum.
-			 */
-			uint8_t TWI_ReadPacket(const uint8_t SlaveAddress,
-			                       const uint8_t TimeoutMS,
-			                       const uint8_t* InternalAddress,
-			                       uint8_t InternalAddressLen,
-			                       uint8_t* Buffer,
-			                       uint16_t Length) ATTR_NON_NULL_PTR_ARG(3);
-
-			/** High level function to perform a complete packet transfer over the TWI bus from the specified
-			 *  device.
-			 *
-			 *  \param[in] SlaveAddress        Base address of the TWI slave device to communicate with
-			 *  \param[in] TimeoutMS           Timeout for bus capture and slave START ACK, in milliseconds
-			 *  \param[in] InternalAddress     Pointer to a location where the internal slave write start address is stored
-			 *  \param[in] InternalAddressLen  Size of the internal device address, in bytes
-			 *  \param[in] Buffer              Pointer to a buffer where the packet data to send is stored
-			 *  \param[in] Length              Size of the packet to send, in bytes
-			 *
-			 *  \return A value from the \ref TWI_ErrorCodes_t enum.
-			 */
-			uint8_t TWI_WritePacket(const uint8_t SlaveAddress,
-			                        const uint8_t TimeoutMS,
-			                        const uint8_t* InternalAddress,
-			                        uint8_t InternalAddressLen,
-			                        const uint8_t* Buffer,
-			                        uint16_t Length) ATTR_NON_NULL_PTR_ARG(3);
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Peripheral/SPI.h b/NativePrograms/LUFA/Drivers/Peripheral/SPI.h
deleted file mode 100644
index 85320c94d0..0000000000
--- a/NativePrograms/LUFA/Drivers/Peripheral/SPI.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Hardware Serial Peripheral Interface driver.
- *
- *  This file is the master dispatch header file for the device-specific SPI driver, for microcontrollers
- *  containing a hardware SPI.
- *
- *  User code should include this file, which will in turn include the correct SPI driver header file for the
- *  currently selected architecture and microcontroller model.
- */
-
-/** \ingroup Group_PeripheralDrivers
- *  \defgroup Group_SPI SPI Driver - LUFA/Drivers/Peripheral/SPI.h
- *  \brief Hardware Serial Peripheral Interface driver.
- *
- *  \section Sec_SPI_Dependencies Module Source Dependencies
- *  The following files must be built with any user project that uses this module:
- *    - None
- *
- *  \section Sec_SPI_ModDescription Module Description
- *  Hardware SPI driver. This module provides an easy to use driver for the setup and transfer of data over
- *  the selected architecture and microcontroller model's SPI port.
- *
- *  \note The exact API for this driver may vary depending on the target used - see
- *        individual target module documentation for the API specific to your target processor.
- */
-
-#ifndef __SPI_H__
-#define __SPI_H__
-
-	/* Macros: */
-		#define __INCLUDE_FROM_SPI_H
-
-	/* Includes: */
-		#include "../../Common/Common.h"
-
-	/* Includes: */
-		#if (ARCH == ARCH_AVR8)
-			#include "AVR8/SPI_AVR8.h"
-		#elif (ARCH == ARCH_XMEGA)
-			#include "XMEGA/SPI_XMEGA.h"
-		#else
-			#error The SPI peripheral driver is not currently available for your selected architecture.
-		#endif
-
-#endif
-
diff --git a/NativePrograms/LUFA/Drivers/Peripheral/Serial.h b/NativePrograms/LUFA/Drivers/Peripheral/Serial.h
deleted file mode 100644
index af3e32ca56..0000000000
--- a/NativePrograms/LUFA/Drivers/Peripheral/Serial.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Hardware Serial USART driver.
- *
- *  This file is the master dispatch header file for the device-specific USART driver, for microcontrollers
- *  containing a hardware USART.
- *
- *  User code should include this file, which will in turn include the correct ADC driver header file for the
- *  currently selected architecture and microcontroller model.
- */
-
-/** \ingroup Group_PeripheralDrivers
- *  \defgroup Group_Serial Serial USART Driver - LUFA/Drivers/Peripheral/Serial.h
- *  \brief Hardware Serial USART driver.
- *
- *  \section Sec_Serial_Dependencies Module Source Dependencies
- *  The following files must be built with any user project that uses this module:
- *    - LUFA/Drivers/Peripheral/<i>ARCH</i>/Serial_<i>ARCH</i>.c <i>(Makefile source module name: LUFA_SRC_SERIAL)</i>
- *
- *  \section Sec_Serial_ModDescription Module Description
- *  Hardware serial USART driver. This module provides an easy to use driver for the setup and transfer
- *  of data over the selected architecture and microcontroller model's USART port.
- *
- *  \note The exact API for this driver may vary depending on the target used - see
- *        individual target module documentation for the API specific to your target processor.
- */
-
-#ifndef __SERIAL_H__
-#define __SERIAL_H__
-
-	/* Macros: */
-		#define __INCLUDE_FROM_SERIAL_H
-
-	/* Includes: */
-		#include "../../Common/Common.h"
-
-	/* Includes: */
-		#if (ARCH == ARCH_AVR8)
-			#include "AVR8/Serial_AVR8.h"
-		#elif (ARCH == ARCH_XMEGA)
-			#include "XMEGA/Serial_XMEGA.h"
-		#else
-			#error The Serial peripheral driver is not currently available for your selected architecture.
-		#endif
-
-#endif
-
diff --git a/NativePrograms/LUFA/Drivers/Peripheral/SerialSPI.h b/NativePrograms/LUFA/Drivers/Peripheral/SerialSPI.h
deleted file mode 100644
index 725a22bac2..0000000000
--- a/NativePrograms/LUFA/Drivers/Peripheral/SerialSPI.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Hardware SPI Master Mode Serial USART driver.
- *
- *  This file is the master dispatch header file for the device-specific SPI Master Mode USART driver, for
- *  microcontrollers containing a hardware USART capable of operating in a Master SPI mode.
- *
- *  User code should include this file, which will in turn include the correct ADC driver header file for the
- *  currently selected architecture and microcontroller model.
- */
-
-/** \ingroup Group_PeripheralDrivers
- *  \defgroup Group_SerialSPI Master SPI Mode Serial USART Driver - LUFA/Drivers/Peripheral/SerialSPI.h
- *  \brief Hardware SPI Master Mode Serial USART driver.
- *
- *  \section Sec_SerialSPI_Dependencies Module Source Dependencies
- *  The following files must be built with any user project that uses this module:
- *    - None
- *
- *  \section Sec_SerialSPI_ModDescription Module Description
- *  Hardware SPI Master Mode serial USART driver. This module provides an easy to use driver for the setup and transfer
- *  of data over the selected architecture and microcontroller model's USART port, using a SPI framing format.
- *
- *  \note The exact API for this driver may vary depending on the target used - see
- *        individual target module documentation for the API specific to your target processor.
- */
-
-#ifndef __SERIAL_SPI_H__
-#define __SERIAL_SPI_H__
-
-	/* Macros: */
-		#define __INCLUDE_FROM_SERIAL_SPI_H
-
-	/* Includes: */
-		#include "../../Common/Common.h"
-
-	/* Includes: */
-		#if (ARCH == ARCH_AVR8)
-			#include "AVR8/SerialSPI_AVR8.h"
-		#elif (ARCH == ARCH_XMEGA)
-			#include "XMEGA/SerialSPI_XMEGA.h"
-		#else
-			#error The Serial SPI Master Mode peripheral driver is not currently available for your selected architecture.
-		#endif
-
-#endif
-
diff --git a/NativePrograms/LUFA/Drivers/Peripheral/TWI.h b/NativePrograms/LUFA/Drivers/Peripheral/TWI.h
deleted file mode 100644
index fb71d26daf..0000000000
--- a/NativePrograms/LUFA/Drivers/Peripheral/TWI.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Hardware Two Wire Interface (I2C) driver.
- *
- *  This file is the master dispatch header file for the device-specific SPI driver, for microcontrollers
- *  containing a hardware TWI.
- *
- *  User code should include this file, which will in turn include the correct TWI driver header file for the
- *  currently selected architecture and microcontroller model.
- */
-
-/** \ingroup Group_PeripheralDrivers
- *  \defgroup Group_TWI TWI Driver - LUFA/Drivers/Peripheral/TWI.h
- *  \brief Hardware Two Wire Interface (I2C) driver.
- *
- *  \section Sec_TWI_Dependencies Module Source Dependencies
- *  The following files must be built with any user project that uses this module:
- *    - LUFA/Drivers/Peripheral/<i>ARCH</i>/TWI_<i>ARCH</i>.c <i>(Makefile source module name: LUFA_SRC_TWI)</i>
- *
- *  \section Sec_TWI_ModDescription Module Description
- *  Hardware TWI driver. This module provides an easy to use driver for the setup and transfer of data over
- *  the selected architecture and microcontroller model's TWI bus port.
- *
- *  \note The exact API for this driver may vary depending on the target used - see
- *        individual target module documentation for the API specific to your target processor.
- */
-
-#ifndef __TWI_H__
-#define __TWI_H__
-
-	/* Macros: */
-		#define __INCLUDE_FROM_TWI_H
-
-	/* Includes: */
-		#include "../../Common/Common.h"
-
-	/* Includes: */
-		#if (ARCH == ARCH_AVR8)
-			#include "AVR8/TWI_AVR8.h"
-		#elif (ARCH == ARCH_XMEGA)
-			#include "XMEGA/TWI_XMEGA.h"
-		#else
-			#error The TWI peripheral driver is not currently available for your selected architecture.
-		#endif
-
-#endif
-
diff --git a/NativePrograms/LUFA/Drivers/Peripheral/XMEGA/SPI_XMEGA.h b/NativePrograms/LUFA/Drivers/Peripheral/XMEGA/SPI_XMEGA.h
deleted file mode 100644
index 60911e0d20..0000000000
--- a/NativePrograms/LUFA/Drivers/Peripheral/XMEGA/SPI_XMEGA.h
+++ /dev/null
@@ -1,251 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief SPI Peripheral Driver (XMEGA)
- *
- *  On-chip SPI driver for the XMEGA microcontrollers.
- *
- *  \note This file should not be included directly. It is automatically included as needed by the SPI driver
- *        dispatch header located in LUFA/Drivers/Peripheral/SPI.h.
- */
-
-/** \ingroup Group_SPI
- *  \defgroup Group_SPI_XMEGA SPI Peripheral Driver (XMEGA)
- *
- *  \section Sec_SPI_XMEGA_ModDescription Module Description
- *  Driver for the hardware SPI port(s) available on XMEGA AVR microcontroller models. This
- *  module provides an easy to use driver for the setup and transfer of data over the AVR's
- *  SPI ports.
- *
- *  \note This file should not be included directly. It is automatically included as needed by the SPI driver
- *        dispatch header located in LUFA/Drivers/Peripheral/SPI.h.
- *
- *  \code
- *      // Initialize the SPI driver before first use
- *      SPI_Init(&SPIC,
- *               SPI_SPEED_FCPU_DIV_2 | SPI_ORDER_MSB_FIRST | SPI_SCK_LEAD_FALLING |
- *               SPI_SAMPLE_TRAILING | SPI_MODE_MASTER);
- *
- *      // Send several bytes, ignoring the returned data
- *      SPI_SendByte(&SPIC, 0x01);
- *      SPI_SendByte(&SPIC, 0x02);
- *      SPI_SendByte(&SPIC, 0x03);
- *
- *      // Receive several bytes, sending a dummy 0x00 byte each time
- *      uint8_t Byte1 = SPI_ReceiveByte(&SPIC);
- *      uint8_t Byte2 = SPI_ReceiveByte(&SPIC);
- *      uint8_t Byte3 = SPI_ReceiveByte(&SPIC);
- *
- *      // Send a byte, and store the received byte from the same transaction
- *      uint8_t ResponseByte = SPI_TransferByte(&SPIC, 0xDC);
- *  \endcode
- *
- *  @{
- */
-
-#ifndef __SPI_XMEGA_H__
-#define __SPI_XMEGA_H__
-
-	/* Includes: */
-		#include "../../../Common/Common.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_SPI_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Peripheral/SPI.h instead.
-		#endif
-
-	/* Private Interface - For use in library only: */
-	#if !defined(__DOXYGEN__)
-		/* Macros: */
-			#define SPI_USE_DOUBLESPEED            SPI_CLK2X_bm
-	#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** \name SPI Prescaler Configuration Masks */
-			/**@{*/
-			/** SPI prescaler mask for \ref SPI_Init(). Divides the system clock by a factor of 2. */
-			#define SPI_SPEED_FCPU_DIV_2           SPI_USE_DOUBLESPEED
-
-			/** SPI prescaler mask for \ref SPI_Init(). Divides the system clock by a factor of 4. */
-			#define SPI_SPEED_FCPU_DIV_4           0
-
-			/** SPI prescaler mask for \ref SPI_Init(). Divides the system clock by a factor of 8. */
-			#define SPI_SPEED_FCPU_DIV_8           (SPI_USE_DOUBLESPEED | (1 << SPI_PRESCALER_gp))
-
-			/** SPI prescaler mask for \ref SPI_Init(). Divides the system clock by a factor of 16. */
-			#define SPI_SPEED_FCPU_DIV_16          (1 << SPI_PRESCALER_gp)
-
-			/** SPI prescaler mask for \ref SPI_Init(). Divides the system clock by a factor of 32. */
-			#define SPI_SPEED_FCPU_DIV_32          (SPI_USE_DOUBLESPEED | (2 << SPI_PRESCALER_gp))
-
-			/** SPI prescaler mask for \ref SPI_Init(). Divides the system clock by a factor of 64. */
-			#define SPI_SPEED_FCPU_DIV_64          (2 << SPI_PRESCALER_gp)
-
-			/** SPI prescaler mask for \ref SPI_Init(). Divides the system clock by a factor of 128. */
-			#define SPI_SPEED_FCPU_DIV_128         (3 << SPI_PRESCALER_gp)
-			/**@}*/
-
-			/** \name SPI SCK Polarity Configuration Masks */
-			/**@{*/
-			/** SPI clock polarity mask for \ref SPI_Init(). Indicates that the SCK should lead on the rising edge. */
-			#define SPI_SCK_LEAD_RISING            0
-
-			/** SPI clock polarity mask for \ref SPI_Init(). Indicates that the SCK should lead on the falling edge. */
-			#define SPI_SCK_LEAD_FALLING           SPI_MODE1_bm
-			/**@}*/
-
-			/** \name SPI Sample Edge Configuration Masks */
-			/**@{*/
-			/** SPI data sample mode mask for \ref SPI_Init(). Indicates that the data should sampled on the leading edge. */
-			#define SPI_SAMPLE_LEADING             0
-
-			/** SPI data sample mode mask for \ref SPI_Init(). Indicates that the data should be sampled on the trailing edge. */
-			#define SPI_SAMPLE_TRAILING            SPI_MODE0_bm
-			/**@}*/
-
-			/** \name SPI Data Ordering Configuration Masks */
-			/**@{*/
-			/** SPI data order mask for \ref SPI_Init(). Indicates that data should be shifted out MSB first. */
-			#define SPI_ORDER_MSB_FIRST            0
-
-			/** SPI data order mask for \ref SPI_Init(). Indicates that data should be shifted out LSB first. */
-			#define SPI_ORDER_LSB_FIRST            SPI_DORD_bm
-			/**@}*/
-
-			/** \name SPI Mode Configuration Masks */
-			/**@{*/
-			/** SPI mode mask for \ref SPI_Init(). Indicates that the SPI interface should be initialized into slave mode. */
-			#define SPI_MODE_SLAVE                 0
-
-			/** SPI mode mask for \ref SPI_Init(). Indicates that the SPI interface should be initialized into master mode. */
-			#define SPI_MODE_MASTER                SPI_MASTER_bm
-			/**@}*/
-
-		/* Inline Functions: */
-			/** Initializes the SPI subsystem, ready for transfers. Must be called before calling any other
-			 *  SPI routines.
-			 *
-			 *  \param[in,out] SPI         Pointer to the base of the SPI peripheral within the device.
-			 *  \param[in]     SPIOptions  SPI Options, a mask consisting of one of each of the \c SPI_SPEED_*,
-			 *                             \c SPI_SCK_*, \c SPI_SAMPLE_*, \c SPI_ORDER_* and \c SPI_MODE_* masks.
-			 */
-			static inline void SPI_Init(SPI_t* const SPI,
-			                            const uint8_t SPIOptions) ATTR_NON_NULL_PTR_ARG(1);
-			static inline void SPI_Init(SPI_t* const SPI,
-			                            const uint8_t SPIOptions)
-			{
-				SPI->CTRL = (SPIOptions | SPI_ENABLE_bm);
-			}
-
-			/** Turns off the SPI driver, disabling and returning used hardware to their default configuration.
-			 *
-			 *  \param[in,out] SPI   Pointer to the base of the SPI peripheral within the device.
-			 */
-			static inline void SPI_Disable(SPI_t* const SPI) ATTR_NON_NULL_PTR_ARG(1);
-			static inline void SPI_Disable(SPI_t* const SPI)
-			{
-				SPI->CTRL &= ~SPI_ENABLE_bm;
-			}
-
-			/** Retrieves the currently selected SPI mode, once the SPI interface has been configured.
-			 *
-			 *  \param[in,out] SPI  Pointer to the base of the SPI peripheral within the device.
-			 *
-			 *  \return \ref SPI_MODE_MASTER if the interface is currently in SPI Master mode, \ref SPI_MODE_SLAVE otherwise
-			 */
-			static inline uint8_t SPI_GetCurrentMode(SPI_t* const SPI) ATTR_ALWAYS_INLINE ATTR_NON_NULL_PTR_ARG(1);
-			static inline uint8_t SPI_GetCurrentMode(SPI_t* const SPI)
-			{
-				return (SPI->CTRL & SPI_MASTER_bm);
-			}
-
-			/** Sends and receives a byte through the SPI interface, blocking until the transfer is complete.
-			 *
-			 *  \param[in,out] SPI   Pointer to the base of the SPI peripheral within the device.
-			 *  \param[in]     Byte  Byte to send through the SPI interface.
-			 *
-			 *  \return Response byte from the attached SPI device.
-			 */
-			static inline uint8_t SPI_TransferByte(SPI_t* const SPI,
-			                                       const uint8_t Byte) ATTR_ALWAYS_INLINE ATTR_NON_NULL_PTR_ARG(1);
-			static inline uint8_t SPI_TransferByte(SPI_t* const SPI,
-			                                       const uint8_t Byte)
-			{
-				SPI->DATA = Byte;
-				while (!(SPI->STATUS & SPI_IF_bm));
-				return SPI->DATA;
-			}
-
-			/** Sends a byte through the SPI interface, blocking until the transfer is complete. The response
-			 *  byte sent to from the attached SPI device is ignored.
-			 *
-			 *  \param[in,out] SPI   Pointer to the base of the SPI peripheral within the device.
-			 *  \param[in]     Byte  Byte to send through the SPI interface.
-			 */
-			static inline void SPI_SendByte(SPI_t* const SPI,
-			                                const uint8_t Byte) ATTR_ALWAYS_INLINE ATTR_NON_NULL_PTR_ARG(1);
-			static inline void SPI_SendByte(SPI_t* const SPI,
-			                                const uint8_t Byte)
-			{
-				SPI->DATA = Byte;
-				while (!(SPI->STATUS & SPI_IF_bm));
-			}
-
-			/** Sends a dummy byte through the SPI interface, blocking until the transfer is complete. The response
-			 *  byte from the attached SPI device is returned.
-			 *
-			 *  \param[in,out] SPI  Pointer to the base of the SPI peripheral within the device.
-			 *
-			 *  \return The response byte from the attached SPI device.
-			 */
-			static inline uint8_t SPI_ReceiveByte(SPI_t* const SPI) ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(1);
-			static inline uint8_t SPI_ReceiveByte(SPI_t* const SPI)
-			{
-				SPI->DATA = 0;
-				while (!(SPI->STATUS & SPI_IF_bm));
-				return SPI->DATA;
-			}
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Peripheral/XMEGA/SerialSPI_XMEGA.h b/NativePrograms/LUFA/Drivers/Peripheral/XMEGA/SerialSPI_XMEGA.h
deleted file mode 100644
index 91a1280893..0000000000
--- a/NativePrograms/LUFA/Drivers/Peripheral/XMEGA/SerialSPI_XMEGA.h
+++ /dev/null
@@ -1,212 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Master SPI Mode Serial USART Peripheral Driver (XMEGA)
- *
- *  On-chip Master SPI mode USART driver for the XMEGA AVR microcontrollers.
- *
- *  \note This file should not be included directly. It is automatically included as needed by the SPI Master
- *        Mode USART driver dispatch header located in LUFA/Drivers/Peripheral/Serial.h.
- */
-
-/** \ingroup Group_SerialSPI
- *  \defgroup Group_SerialSPI_XMEGA Master SPI Mode Serial USART Peripheral Driver (XMEGA)
- *
- *  \section Sec_SerialSPI_XMEGA_ModDescription Module Description
- *  On-chip serial USART driver for the XMEGA AVR microcontrollers.
- *
- *  \note This file should not be included directly. It is automatically included as needed by the ADC driver
- *        dispatch header located in LUFA/Drivers/Peripheral/SerialSPI.h.
- *
- *  \section Sec_SerialSPI_XMEGA_ExampleUsage Example Usage
- *  The following snippet is an example of how this module may be used within a typical
- *  application.
- *
- *  \code
- *      // Initialize the Master SPI mode USART driver before first use, with 1Mbit baud
- *      SerialSPI_Init(&USARTD0, (USART_SPI_SCK_LEAD_RISING | USART_SPI_SAMPLE_LEADING | USART_SPI_ORDER_MSB_FIRST), 1000000);
- *
- *      // Send several bytes, ignoring the returned data
- *      SerialSPI_SendByte(&USARTD0, 0x01);
- *      SerialSPI_SendByte(&USARTD0, 0x02);
- *      SerialSPI_SendByte(&USARTD0, 0x03);
- *
- *      // Receive several bytes, sending a dummy 0x00 byte each time
- *      uint8_t Byte1 = SerialSPI_ReceiveByte(&USARTD);
- *      uint8_t Byte2 = SerialSPI_ReceiveByte(&USARTD);
- *      uint8_t Byte3 = SerialSPI_ReceiveByte(&USARTD);
- *
- *      // Send a byte, and store the received byte from the same transaction
- *      uint8_t ResponseByte = SerialSPI_TransferByte(&USARTD0, 0xDC);
- *  \endcode
- *
- *  @{
- */
-
-#ifndef __SERIAL_SPI_XMEGA_H__
-#define __SERIAL_SPI_XMEGA_H__
-
-	/* Includes: */
-		#include "../../../Common/Common.h"
-
-		#include <stdio.h>
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_SERIAL_SPI_H)
-			#error Do not include this file directly. Include LUFA/Drivers/Peripheral/Serial.h instead.
-		#endif
-
-	/* Private Interface - For use in library only: */
-	#if !defined(__DOXYGEN__)
-			#define SERIAL_SPI_UBBRVAL(Baud)       ((Baud < (F_CPU / 2)) ? ((F_CPU / (2 * Baud)) - 1) : 0)
-	#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** \name SPI SCK Polarity Configuration Masks */
-			/**@{*/
-			/** SPI clock polarity mask for \ref SerialSPI_Init(). Indicates that the SCK should lead on the rising edge. */
-			#define USART_SPI_SCK_LEAD_RISING      0
-			/**@}*/
-
-			/** \name SPI Sample Edge Configuration Masks */
-			/**@{*/
-			/** SPI data sample mode mask for \ref SerialSPI_Init(). Indicates that the data should sampled on the leading edge. */
-			#define USART_SPI_SAMPLE_LEADING       0
-
-			/** SPI data sample mode mask for \ref SerialSPI_Init(). Indicates that the data should be sampled on the trailing edge. */
-			#define USART_SPI_SAMPLE_TRAILING      (1 << 1)
-			/**@}*/
-
-			/** \name SPI Data Ordering Configuration Masks */
-			/**@{*/
-			/** SPI data order mask for \ref SerialSPI_Init(). Indicates that data should be shifted out MSB first. */
-			#define USART_SPI_ORDER_MSB_FIRST      0
-
-			/** SPI data order mask for \ref SerialSPI_Init(). Indicates that data should be shifted out LSB first. */
-			#define USART_SPI_ORDER_LSB_FIRST      (1 << 2)
-			/**@}*/
-
-		/* Inline Functions: */
-			/** Initialize the USART module in Master SPI mode.
-			 *
-			 *  \param[in,out] USART        Pointer to the base of the USART peripheral within the device.
-			 *  \param[in]     SPIOptions   USART SPI Options, a mask consisting of one of each of the \c USART_SPI_SCK_*,
-			 *                              \c USART_SPI_SAMPLE_* and \c USART_SPI_ORDER_* masks.
-			 *  \param[in]     BaudRate     SPI baud rate, in bits per second.
-			 */
-			static inline void SerialSPI_Init(USART_t* const USART,
-			                                  const uint8_t SPIOptions,
-			                                  const uint32_t BaudRate) ATTR_NON_NULL_PTR_ARG(1);
-			static inline void SerialSPI_Init(USART_t* const USART,
-			                                  const uint8_t SPIOptions,
-			                                  const uint32_t BaudRate)
-			{
-				uint16_t BaudValue = SERIAL_SPI_UBBRVAL(BaudRate);
-
-				USART->BAUDCTRLB = (BaudValue >> 8);
-				USART->BAUDCTRLA = (BaudValue & 0xFF);
-
-				USART->CTRLC = (USART_CMODE_MSPI_gc | SPIOptions);
-				USART->CTRLB = (USART_RXEN_bm | USART_TXEN_bm);
-			}
-
-			/** Turns off the USART driver, disabling and returning used hardware to their default configuration.
-			 *
-			 *  \param[in,out] USART  Pointer to the base of the USART peripheral within the device.
-			 */
-			static inline void SerialSPI_Disable(USART_t* const USART) ATTR_ALWAYS_INLINE ATTR_NON_NULL_PTR_ARG(1);
-			static inline void SerialSPI_Disable(USART_t* const USART)
-			{
-				USART->CTRLA = 0;
-				USART->CTRLB = 0;
-				USART->CTRLC = 0;
-			}
-
-			/** Sends and receives a byte through the USART SPI interface, blocking until the transfer is complete.
-			 *
-			 *  \param[in,out] USART     Pointer to the base of the USART peripheral within the device.
-			 *  \param[in]     DataByte  Byte to send through the USART SPI interface.
-			 *
-			 *  \return Response byte from the attached SPI device.
-			 */
-			static inline uint8_t SerialSPI_TransferByte(USART_t* const USART,
-			                                             const uint8_t DataByte) ATTR_ALWAYS_INLINE ATTR_NON_NULL_PTR_ARG(1);
-			static inline uint8_t SerialSPI_TransferByte(USART_t* const USART,
-			                                             const uint8_t DataByte)
-			{
-				USART->DATA   = DataByte;
-				while (!(USART->STATUS & USART_TXCIF_bm));
-				USART->STATUS = USART_TXCIF_bm;
-				return USART->DATA;
-			}
-
-			/** Sends a byte through the USART SPI interface, blocking until the transfer is complete. The response
-			 *  byte sent to from the attached SPI device is ignored.
-			 *
-			 *  \param[in,out] USART     Pointer to the base of the USART peripheral within the device.
-			 *  \param[in]     DataByte  Byte to send through the USART SPI interface.
-			 */
-			static inline void SerialSPI_SendByte(USART_t* const USART,
-			                                      const uint8_t DataByte) ATTR_ALWAYS_INLINE ATTR_NON_NULL_PTR_ARG(1);
-			static inline void SerialSPI_SendByte(USART_t* const USART,
-			                                      const uint8_t DataByte)
-			{
-				SerialSPI_TransferByte(USART, DataByte);
-			}
-
-			/** Sends a dummy byte through the USART SPI interface, blocking until the transfer is complete. The response
-			 *  byte from the attached SPI device is returned.
-			 *
-			 *  \param[in,out] USART  Pointer to the base of the USART peripheral within the device.
-			 *
-			 *  \return The response byte from the attached SPI device.
-			 */
-			static inline uint8_t SerialSPI_ReceiveByte(USART_t* const USART) ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(1);
-			static inline uint8_t SerialSPI_ReceiveByte(USART_t* const USART)
-			{
-				return SerialSPI_TransferByte(USART, 0);
-			}
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Peripheral/XMEGA/Serial_XMEGA.c b/NativePrograms/LUFA/Drivers/Peripheral/XMEGA/Serial_XMEGA.c
deleted file mode 100644
index 8e9774ef3f..0000000000
--- a/NativePrograms/LUFA/Drivers/Peripheral/XMEGA/Serial_XMEGA.c
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-#include "../../../Common/Common.h"
-#if (ARCH == ARCH_XMEGA)
-
-#define  __INCLUDE_FROM_SERIAL_C
-#include "../Serial.h"
-
-FILE USARTSerialStream;
-
-int Serial_putchar(char DataByte,
-                   FILE *Stream)
-{
-	USART_t* USART = fdev_get_udata(Stream);
-
-	Serial_SendByte(USART, DataByte);
-	return 0;
-}
-
-int Serial_getchar(FILE *Stream)
-{
-	USART_t* USART = fdev_get_udata(Stream);
-
-	if (!(Serial_IsCharReceived(USART)))
-	  return _FDEV_EOF;
-
-	return Serial_ReceiveByte(USART);
-}
-
-int Serial_getchar_Blocking(FILE *Stream)
-{
-	USART_t* USART = fdev_get_udata(Stream);
-
-	while (!(Serial_IsCharReceived(USART)));
-	return Serial_ReceiveByte(USART);
-}
-
-void Serial_SendString_P(USART_t* const USART,
-                         const char* FlashStringPtr)
-{
-	uint8_t CurrByte;
-
-	while ((CurrByte = pgm_read_byte(FlashStringPtr)) != 0x00)
-	{
-		Serial_SendByte(USART, CurrByte);
-		FlashStringPtr++;
-	}
-}
-
-void Serial_SendString(USART_t* const USART,
-                       const char* StringPtr)
-{
-	uint8_t CurrByte;
-
-	while ((CurrByte = *StringPtr) != 0x00)
-	{
-		Serial_SendByte(USART, CurrByte);
-		StringPtr++;
-	}
-}
-
-void Serial_SendData(USART_t* const USART,
-                     const void* Buffer,
-                     uint16_t Length)
-{
-	uint8_t* CurrByte = (uint8_t*)Buffer;
-
-	while (Length--)
-	  Serial_SendByte(USART, *(CurrByte++));
-}
-
-void Serial_CreateStream(USART_t* USART, FILE* Stream)
-{
-	if (!(Stream))
-	{
-		Stream = &USARTSerialStream;
-		stdin  = Stream;
-		stdout = Stream;
-    }
-
-    *Stream = (FILE)FDEV_SETUP_STREAM(Serial_putchar, Serial_getchar, _FDEV_SETUP_RW);
-    fdev_set_udata(Stream, USART);
-}
-
-void Serial_CreateBlockingStream(USART_t* USART, FILE* Stream)
-{
-	if (!(Stream))
-	{
-		Stream = &USARTSerialStream;
-		stdin  = Stream;
-		stdout = Stream;
-	}
-
-    *Stream = (FILE)FDEV_SETUP_STREAM(Serial_putchar, Serial_getchar_Blocking, _FDEV_SETUP_RW);
-    fdev_set_udata(Stream, USART);
-}
-
-#endif
diff --git a/NativePrograms/LUFA/Drivers/Peripheral/XMEGA/Serial_XMEGA.h b/NativePrograms/LUFA/Drivers/Peripheral/XMEGA/Serial_XMEGA.h
deleted file mode 100644
index 7089b80435..0000000000
--- a/NativePrograms/LUFA/Drivers/Peripheral/XMEGA/Serial_XMEGA.h
+++ /dev/null
@@ -1,289 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Serial USART Peripheral Driver (XMEGA)
- *
- *  On-chip serial USART driver for the XMEGA AVR microcontrollers.
- *
- *  \note This file should not be included directly. It is automatically included as needed by the USART driver
- *        dispatch header located in LUFA/Drivers/Peripheral/Serial.h.
- */
-
-/** \ingroup Group_Serial
- *  \defgroup Group_Serial_XMEGA Serial USART Peripheral Driver (XMEGA)
- *
- *  \section Sec_Serial_XMEGA_ModDescription Module Description
- *  On-chip serial USART driver for the XMEGA AVR microcontrollers.
- *
- *  \note This file should not be included directly. It is automatically included as needed by the USART driver
- *        dispatch header located in LUFA/Drivers/Peripheral/Serial.h.
- *
- *  \section Sec_Serial_XMEGA_ExampleUsage Example Usage
- *  The following snippet is an example of how this module may be used within a typical
- *  application.
- *
- *  \code
- *      // Initialize the serial USART driver before first use, with 9600 baud (and no double-speed mode)
- *      Serial_Init(&USARTD0, 9600, false);
- *
- *      // Send a string through the USART
- *      Serial_TxString(&USARTD0, "Test String\r\n");
- *
- *      // Receive a byte through the USART
- *      uint8_t DataByte = Serial_RxByte(&USARTD0);
- *  \endcode
- *
- *  @{
- */
-
-#ifndef __SERIAL_XMEGA_H__
-#define __SERIAL_XMEGA_H__
-
-	/* Includes: */
-		#include "../../../Common/Common.h"
-		#include "../../Misc/TerminalCodes.h"
-
-		#include <stdio.h>
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_SERIAL_H) && !defined(__INCLUDE_FROM_SERIAL_C)
-			#error Do not include this file directly. Include LUFA/Drivers/Peripheral/Serial.h instead.
-		#endif
-
-	/* Private Interface - For use in library only: */
-	#if !defined(__DOXYGEN__)
-		/* External Variables: */
-			extern FILE USARTSerialStream;
-
-		/* Function Prototypes: */
-			int Serial_putchar(char DataByte,
-			                   FILE *Stream);
-			int Serial_getchar(FILE *Stream);
-			int Serial_getchar_Blocking(FILE *Stream);
-	#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Macro for calculating the baud value from a given baud rate when the \c U2X (double speed) bit is
-			 *  not set.
-			 *
-			 *  \param[in] Baud  Target serial UART baud rate.
-			 *
-			 *  \return Closest UBRR register value for the given UART frequency.
-			 */
-			#define SERIAL_UBBRVAL(Baud)    ((((F_CPU / 16) + (Baud / 2)) / (Baud)) - 1)
-
-			/** Macro for calculating the baud value from a given baud rate when the \c U2X (double speed) bit is
-			 *  set.
-			 *
-			 *  \param[in] Baud  Target serial UART baud rate.
-			 *
-			 *  \return Closest UBRR register value for the given UART frequency.
-			 */
-			#define SERIAL_2X_UBBRVAL(Baud) ((((F_CPU / 8) + (Baud / 2)) / (Baud)) - 1)
-
-		/* Function Prototypes: */
-			/** Transmits a given string located in program space (FLASH) through the USART.
-			 *
-			 *  \param[in,out] USART           Pointer to the base of the USART peripheral within the device.
-			 *  \param[in]     FlashStringPtr  Pointer to a string located in program space.
-			 */
-			void Serial_SendString_P(USART_t* const USART,
-			                         const char* FlashStringPtr) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Transmits a given string located in SRAM memory through the USART.
-			 *
-			 *  \param[in,out] USART      Pointer to the base of the USART peripheral within the device.
-			 *  \param[in]     StringPtr  Pointer to a string located in SRAM space.
-			 */
-			void Serial_SendString(USART_t* const USART,
-			                       const char* StringPtr) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Transmits a given buffer located in SRAM memory through the USART.
-			 *
-			 *  \param[in,out] USART   Pointer to the base of the USART peripheral within the device.
-			 *  \param[in]     Buffer  Pointer to a buffer containing the data to send.
-			 *  \param[in]     Length  Length of the data to send, in bytes.
-			 */
-			void Serial_SendData(USART_t* const USART,
-			                     const void* Buffer,
-			                     uint16_t Length) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Creates a standard character stream from the USART so that it can be used with all the regular functions
-			 *  in the avr-libc \c <stdio.h> library that accept a \c FILE stream as a destination (e.g. \c fprintf). The created
-			 *  stream is bidirectional and can be used for both input and output functions.
-			 *
-			 *  Reading data from this stream is non-blocking, i.e. in most instances, complete strings cannot be read in by a single
-			 *  fetch, as the endpoint will not be ready at some point in the transmission, aborting the transfer. However, this may
-			 *  be used when the read data is processed byte-per-bye (via \c getc()) or when the user application will implement its own
-			 *  line buffering.
-			 *
-			 *  \param[in,out] USART   Pointer to the base of the USART peripheral within the device.
-			 *  \param[in,out] Stream  Pointer to a FILE structure where the created stream should be placed, if \c NULL, \c stdout
-			 *                         and \c stdin will be configured to use the USART.
-			 *
-			 *  \pre The USART must first be configured via a call to \ref Serial_Init() before the stream is used.
-			 */
-			void Serial_CreateStream(USART_t* USART, FILE* Stream);
-
-            /** Identical to \ref Serial_CreateStream(), except that reads are blocking until the calling stream function terminates
-			 *  the transfer.
-			 *
-			 *  \param[in,out] USART   Pointer to the base of the USART peripheral within the device.
-			 *  \param[in,out] Stream  Pointer to a FILE structure where the created stream should be placed, if \c NULL, \c stdout
-			 *                         and \c stdin will be configured to use the USART.
-			 *
-			 *  \pre The USART must first be configured via a call to \ref Serial_Init() before the stream is used.
-			 */
-			void Serial_CreateBlockingStream(USART_t* USART, FILE* Stream);
-
-		/* Inline Functions: */
-			/** Initializes the USART, ready for serial data transmission and reception. This initializes the interface to
-			 *  standard 8-bit, no parity, 1 stop bit settings suitable for most applications.
-			 *
-			 *  \param[in,out] USART        Pointer to the base of the USART peripheral within the device.
-			 *  \param[in]     BaudRate     Serial baud rate, in bits per second. This should be the target baud rate regardless of
-			 *                              the \c DoubleSpeed parameter's value.
-			 *  \param[in]     DoubleSpeed  Enables double speed mode when set, halving the sample time to double the baud rate.
-			 */
-			static inline void Serial_Init(USART_t* const USART,
-			                               const uint32_t BaudRate,
-			                               const bool DoubleSpeed) ATTR_NON_NULL_PTR_ARG(1);
-			static inline void Serial_Init(USART_t* const USART,
-			                               const uint32_t BaudRate,
-			                               const bool DoubleSpeed)
-			{
-				uint16_t BaudValue = (DoubleSpeed ? SERIAL_2X_UBBRVAL(BaudRate) : SERIAL_UBBRVAL(BaudRate));
-
-				USART->BAUDCTRLB = (BaudValue >> 8);
-				USART->BAUDCTRLA = (BaudValue & 0xFF);
-
-				USART->CTRLC = (USART_CMODE_ASYNCHRONOUS_gc | USART_PMODE_DISABLED_gc | USART_CHSIZE_8BIT_gc);
-				USART->CTRLB = (USART_RXEN_bm | USART_TXEN_bm | (DoubleSpeed ? USART_CLK2X_bm : 0));
-			}
-
-			/** Turns off the USART driver, disabling and returning used hardware to their default configuration.
-			 *
-			 *  \param[in,out] USART  Pointer to the base of the USART peripheral within the device.
-			 */
-			static inline void Serial_Disable(USART_t* const USART) ATTR_ALWAYS_INLINE ATTR_NON_NULL_PTR_ARG(1);
-			static inline void Serial_Disable(USART_t* const USART)
-			{
-				USART->CTRLA = 0;
-				USART->CTRLB = 0;
-				USART->CTRLC = 0;
-			}
-
-			/** Indicates whether a character has been received through the USART.
-			 *
-			 *  \param[in,out] USART  Pointer to the base of the USART peripheral within the device.
-			 *
-			 *  \return Boolean \c true if a character has been received, \c false otherwise.
-			 */
-			static inline bool Serial_IsCharReceived(USART_t* const USART) ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(1);
-			static inline bool Serial_IsCharReceived(USART_t* const USART)
-			{
-				return ((USART->STATUS & USART_RXCIF_bm) ? true : false);
-			}
-
-			/** Indicates whether there is hardware buffer space for a new transmit on the USART. This
-			 *  function can be used to determine if a call to \ref Serial_SendByte() will block in advance.
-			 *
-			 *  \param[in,out] USART  Pointer to the base of the USART peripheral within the device.
-			 *
-			 *  \return Boolean \c true if a character can be queued for transmission immediately, \c false otherwise.
-			 */
-			static inline bool Serial_IsSendReady(USART_t* const USART) ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(1);
-			static inline bool Serial_IsSendReady(USART_t* const USART)
-			{
-				return (USART->STATUS & USART_DREIF_bm) ? true : false;
-			}
-
-			/** Indicates whether the hardware USART transmit buffer is completely empty, indicating all
-			 *  pending transmissions have completed.
-			 *
-			 *  \param[in,out] USART  Pointer to the base of the USART peripheral within the device.
-			 *
-			 *  \return Boolean \c true if no characters are buffered for transmission, \c false otherwise.
-			 */
-			static inline bool Serial_IsSendComplete(USART_t* const USART) ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(1);
-			static inline bool Serial_IsSendComplete(USART_t* const USART)
-			{
-				return (USART->STATUS & USART_TXCIF_bm) ? true : false;
-			}
-
-			/** Transmits a given byte through the USART.
-			 *
-			 *  \note If no buffer space is available in the hardware USART, this function will block. To check if
-			 *        space is available before calling this function, see \ref Serial_IsSendReady().
-			 *
-			 *  \param[in,out] USART     Pointer to the base of the USART peripheral within the device.
-			 *  \param[in]     DataByte  Byte to transmit through the USART.
-			 */
-			static inline void Serial_SendByte(USART_t* const USART,
-			                                   const char DataByte) ATTR_ALWAYS_INLINE ATTR_NON_NULL_PTR_ARG(1);
-			static inline void Serial_SendByte(USART_t* const USART,
-			                                   const char DataByte)
-			{
-				while (!(Serial_IsSendReady(USART)));
-				USART->DATA = DataByte;
-			}
-
-			/** Receives the next byte from the USART.
-			 *
-			 *  \param[in,out] USART  Pointer to the base of the USART peripheral within the device.
-			 *
-			 *  \return Next byte received from the USART, or a negative value if no byte has been received.
-			 */
-			static inline int16_t Serial_ReceiveByte(USART_t* const USART) ATTR_ALWAYS_INLINE ATTR_NON_NULL_PTR_ARG(1);
-			static inline int16_t Serial_ReceiveByte(USART_t* const USART)
-			{
-				if (!(Serial_IsCharReceived(USART)))
-				  return -1;
-
-				USART->STATUS = USART_RXCIF_bm;
-				return USART->DATA;
-			}
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/Peripheral/XMEGA/TWI_XMEGA.c b/NativePrograms/LUFA/Drivers/Peripheral/XMEGA/TWI_XMEGA.c
deleted file mode 100644
index f784e6db61..0000000000
--- a/NativePrograms/LUFA/Drivers/Peripheral/XMEGA/TWI_XMEGA.c
+++ /dev/null
@@ -1,185 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-#include "../../../Common/Common.h"
-#if (ARCH == ARCH_XMEGA)
-
-#define  __INCLUDE_FROM_TWI_C
-#include "../TWI.h"
-
-uint8_t TWI_StartTransmission(TWI_t* const TWI,
-                              const uint8_t SlaveAddress,
-                              const uint8_t TimeoutMS)
-{
-	uint16_t TimeoutRemaining;
-
-	TWI->MASTER.ADDR = SlaveAddress;
-
-	TimeoutRemaining = (TimeoutMS * 100);
-	while (TimeoutRemaining)
-	{
-		uint8_t status = TWI->MASTER.STATUS;
-
-		if ((status & (TWI_MASTER_WIF_bm | TWI_MASTER_ARBLOST_bm)) == (TWI_MASTER_WIF_bm | TWI_MASTER_ARBLOST_bm))
-		{
-			TWI->MASTER.ADDR = SlaveAddress;
-		}
-		else if ((status & (TWI_MASTER_WIF_bm | TWI_MASTER_RXACK_bm)) == (TWI_MASTER_WIF_bm | TWI_MASTER_RXACK_bm))
-		{
-			TWI_StopTransmission(TWI);
-			return TWI_ERROR_SlaveResponseTimeout;
-		}
-		else if (status & (TWI_MASTER_WIF_bm | TWI_MASTER_RIF_bm))
-		{
-			return TWI_ERROR_NoError;
-		}
-
-		_delay_us(10);
-		TimeoutRemaining--;
-	}
-
-	if (!(TimeoutRemaining)) {
-		if (TWI->MASTER.STATUS & TWI_MASTER_CLKHOLD_bm) {
-			TWI_StopTransmission(TWI);
-		}
-	}
-
-	return TWI_ERROR_BusCaptureTimeout;
-}
-
-bool TWI_SendByte(TWI_t* const TWI,
-                  const uint8_t Byte)
-{
-	TWI->MASTER.DATA = Byte;
-
-	while (!(TWI->MASTER.STATUS & TWI_MASTER_WIF_bm));
-
-	return (TWI->MASTER.STATUS & TWI_MASTER_WIF_bm) && !(TWI->MASTER.STATUS & TWI_MASTER_RXACK_bm);
-}
-
-bool TWI_ReceiveByte(TWI_t* const TWI,
-                     uint8_t* const Byte,
-                     const bool LastByte)
-{
-	if ((TWI->MASTER.STATUS & (TWI_MASTER_BUSERR_bm | TWI_MASTER_ARBLOST_bm)) == (TWI_MASTER_BUSERR_bm | TWI_MASTER_ARBLOST_bm)) {
-		return false;
-	}
-
-	while (!(TWI->MASTER.STATUS & TWI_MASTER_RIF_bm));
-
-	*Byte = TWI->MASTER.DATA;
-
-	if (LastByte)
-	  TWI->MASTER.CTRLC = TWI_MASTER_ACKACT_bm | TWI_MASTER_CMD_STOP_gc;
-	else
-	  TWI->MASTER.CTRLC = TWI_MASTER_CMD_RECVTRANS_gc;
-
-	return true;
-}
-
-uint8_t TWI_ReadPacket(TWI_t* const TWI,
-                       const uint8_t SlaveAddress,
-                       const uint8_t TimeoutMS,
-                       const uint8_t* InternalAddress,
-                       uint8_t InternalAddressLen,
-                       uint8_t* Buffer,
-                       uint16_t Length)
-{
-	uint8_t ErrorCode;
-
-	if ((ErrorCode = TWI_StartTransmission(TWI, (SlaveAddress & TWI_DEVICE_ADDRESS_MASK) | TWI_ADDRESS_WRITE,
-	                                       TimeoutMS)) == TWI_ERROR_NoError)
-	{
-		while (InternalAddressLen--)
-		{
-			if (!(TWI_SendByte(TWI, *(InternalAddress++))))
-			{
-				ErrorCode = TWI_ERROR_SlaveNAK;
-				break;
-			}
-		}
-
-		if ((ErrorCode = TWI_StartTransmission(TWI, (SlaveAddress & TWI_DEVICE_ADDRESS_MASK) | TWI_ADDRESS_READ,
-		                                       TimeoutMS)) == TWI_ERROR_NoError)
-		{
-			while (Length--)
-			{
-				if (!(TWI_ReceiveByte(TWI, Buffer++, (Length == 0))))
-				{
-					ErrorCode = TWI_ERROR_SlaveNAK;
-					break;
-				}
-			}
-		}
-
-		TWI_StopTransmission(TWI);
-	}
-
-	return ErrorCode;
-}
-
-uint8_t TWI_WritePacket(TWI_t* const TWI,
-                        const uint8_t SlaveAddress,
-                        const uint8_t TimeoutMS,
-                        const uint8_t* InternalAddress,
-                        uint8_t InternalAddressLen,
-                        const uint8_t* Buffer,
-                        uint16_t Length)
-{
-	uint8_t ErrorCode;
-
-	if ((ErrorCode = TWI_StartTransmission(TWI, (SlaveAddress & TWI_DEVICE_ADDRESS_MASK) | TWI_ADDRESS_WRITE,
-	                                       TimeoutMS)) == TWI_ERROR_NoError)
-	{
-		while (InternalAddressLen--)
-		{
-			if (!(TWI_SendByte(TWI, *(InternalAddress++))))
-			{
-				ErrorCode = TWI_ERROR_SlaveNAK;
-				break;
-			}
-		}
-
-		while (Length--)
-		{
-			if (!(TWI_SendByte(TWI, *(Buffer++))))
-			{
-				ErrorCode = TWI_ERROR_SlaveNAK;
-				break;
-			}
-		}
-
-		TWI_StopTransmission(TWI);
-	}
-
-	return ErrorCode;
-}
-
-#endif
diff --git a/NativePrograms/LUFA/Drivers/Peripheral/XMEGA/TWI_XMEGA.h b/NativePrograms/LUFA/Drivers/Peripheral/XMEGA/TWI_XMEGA.h
deleted file mode 100644
index 5689624281..0000000000
--- a/NativePrograms/LUFA/Drivers/Peripheral/XMEGA/TWI_XMEGA.h
+++ /dev/null
@@ -1,302 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief TWI Peripheral Driver (XMEGA)
- *
- *  On-chip TWI driver for the XMEGA Family of AVR microcontrollers.
- *
- *  \note This file should not be included directly. It is automatically included as needed by the TWI driver
- *        dispatch header located in LUFA/Drivers/Peripheral/TWI.h.
- */
-
-/** \ingroup Group_TWI
- *  \defgroup Group_TWI_XMEGA TWI Peripheral Driver (XMEGA)
- *
- *  \section Sec_TWI_XMEGA_ModDescription Module Description
- *  Master mode TWI driver for the 8-bit AVR microcontrollers which contain a hardware TWI module.
- *
- *  \note This file should not be included directly. It is automatically included as needed by the TWI driver
- *        dispatch header located in LUFA/Drivers/Peripheral/TWI.h.
- *
- *  \section Sec_TWI_XMEGA_ExampleUsage Example Usage
- *  The following snippet is an example of how this module may be used within a typical
- *  application.
- *
- *  <b>Low Level API Example:</b>
- *  \code
- *      // Initialize the TWI driver before first use at 200KHz
- *      TWI_Init(&TWIC, TWI_BAUD_FROM_FREQ(200000));
- *
- *      // Start a write session to device at device address 0xA0, internal address 0xDC with a 10ms timeout
- *      if (TWI_StartTransmission(&TWIC, 0xA0 | TWI_ADDRESS_WRITE, 10) == TWI_ERROR_NoError)
- *      {
- *          TWI_SendByte(&TWIC, 0xDC);
- *
- *          TWI_SendByte(&TWIC, 0x01);
- *          TWI_SendByte(&TWIC, 0x02);
- *          TWI_SendByte(&TWIC, 0x03);
- *
- *          // Must stop transmission afterwards to release the bus
- *          TWI_StopTransmission(&TWIC);
- *      }
- *
- *      // Start a read session to device at address 0xA0, internal address 0xDC with a 10ms timeout
- *      if (TWI_StartTransmission(&TWIC, 0xA0 | TWI_ADDRESS_WRITE, 10) == TWI_ERROR_NoError)
- *      {
- *          TWI_SendByte(&TWIC, 0xDC);
- *          TWI_StopTransmission(&TWIC);
- *
- *          if (TWI_StartTransmission(&TWIC, 0xA0 | TWI_ADDRESS_READ, 10) == TWI_ERROR_NoError)
- *          {
- *              uint8_t Byte1, Byte2, Byte3;
- *
- *              // Read three bytes, acknowledge after the third byte is received
- *              TWI_ReceiveByte(&TWIC, &Byte1, false);
- *              TWI_ReceiveByte(&TWIC, &Byte2, false);
- *              TWI_ReceiveByte(&TWIC, &Byte3, true);
- *
- *              // Must stop transmission afterwards to release the bus
- *              TWI_StopTransmission(&TWIC);
- *          }
- *      }
- *  \endcode
- *
- *  <b>High Level API Example:</b>
- *  \code
- *      // Initialize the TWI driver before first use at 200KHz
- *      TWI_Init(&TWIC, TWI_BAUD_FROM_FREQ(200000));
- *
- *      // Start a write session to device at device address 0xA0, internal address 0xDC with a 10ms timeout
- *      uint8_t InternalWriteAddress = 0xDC;
- *      uint8_t WritePacket[3] = {0x01, 0x02, 0x03};
- *
- *      TWI_WritePacket(&TWIC, 0xA0, 10, &InternalWriteAddress, sizeof(InternalWriteAddress),
- *                      &WritePacket, sizeof(WritePacket);
- *
- *      // Start a read session to device at address 0xA0, internal address 0xDC with a 10ms timeout
- *      uint8_t InternalReadAddress = 0xDC;
- *      uint8_t ReadPacket[3];
- *
- *      TWI_ReadPacket(&TWIC, 0xA0, 10, &InternalReadAddress, sizeof(InternalReadAddress),
- *                     &ReadPacket, sizeof(ReadPacket);
- *  \endcode
- *
- *  @{
- */
-
-#ifndef __TWI_XMEGA_H__
-#define __TWI_XMEGA_H__
-
-	/* Includes: */
-		#include "../../../Common/Common.h"
-
-		#include <stdio.h>
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_TWI_H) && !defined(__INCLUDE_FROM_TWI_C)
-			#error Do not include this file directly. Include LUFA/Drivers/Peripheral/TWI.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** TWI slave device address mask for a read session. Mask with a slave device base address to obtain
-			 *  the correct TWI bus address for the slave device when reading data from it.
-			 */
-			#define TWI_ADDRESS_READ         0x01
-
-			/** TWI slave device address mask for a write session. Mask with a slave device base address to obtain
-			 *  the correct TWI bus address for the slave device when writing data to it.
-			 */
-			#define TWI_ADDRESS_WRITE        0x00
-
-			/** Mask to retrieve the base address for a TWI device, which can then be ORed with \ref TWI_ADDRESS_READ
-			 *  or \ref TWI_ADDRESS_WRITE to obtain the device's read and write address respectively.
-			 */
-			#define TWI_DEVICE_ADDRESS_MASK  0xFE
-
-			/** Calculates the length of each bit on the TWI bus for a given target frequency. This may be used with
-			 *  the \ref TWI_Init() function to convert a bus frequency to a number of clocks for the \c BitLength
-			 *  parameter.
-			 *
-			 *  \param[in] Frequency  Desired TWI bus frequency in Hz.
-			 *
-			 *  \return Bit length in clocks for the given TWI bus frequency at the given prescaler value.
-			 */
-			#define TWI_BAUD_FROM_FREQ(Frequency) ((F_CPU / (2 * Frequency)) - 5)
-
-		/* Enums: */
-			/** Enum for the possible return codes of the TWI transfer start routine and other dependant TWI functions. */
-			enum TWI_ErrorCodes_t
-			{
-				TWI_ERROR_NoError              = 0, /**< Indicates that the command completed successfully. */
-				TWI_ERROR_BusFault             = 1, /**< A TWI bus fault occurred while attempting to capture the bus. */
-				TWI_ERROR_BusCaptureTimeout    = 2, /**< A timeout occurred whilst waiting for the bus to be ready. */
-				TWI_ERROR_SlaveResponseTimeout = 3, /**< No ACK received at the nominated slave address within the timeout period. */
-				TWI_ERROR_SlaveNotReady        = 4, /**< Slave NAKed the TWI bus START condition. */
-				TWI_ERROR_SlaveNAK             = 5, /**< Slave NAKed whilst attempting to send data to the device. */
-			};
-
-		/* Inline Functions: */
-			/** Initializes the TWI hardware into master mode, ready for data transmission and reception. This must be
-			 *  before any other TWI operations.
-			 *
-			 *  The generated SCL frequency will be according to the formula <pre>F_CPU / (2 * (5 + (BAUD)))</pre>.
-			 *
-			 *  \attention The value of the \c BitLength parameter should not be set below 10 or invalid bus conditions may
-			 *             occur, as indicated in the XMEGA microcontroller datasheet.
-			 *
-			 *  \param[in] TWI   Pointer to the base of the TWI peripheral within the device.
-			 *  \param[in] Baud  Value of the BAUD register of the TWI Master.
-			 */
-			static inline void TWI_Init(TWI_t* const TWI,
-			                            const uint8_t Baud) ATTR_ALWAYS_INLINE ATTR_NON_NULL_PTR_ARG(1);
-			static inline void TWI_Init(TWI_t* const TWI,
-			                            const uint8_t Baud)
-			{
-				TWI->CTRL          = 0x00;
-				TWI->MASTER.BAUD   = Baud;
-				TWI->MASTER.CTRLA  = TWI_MASTER_ENABLE_bm;
-				TWI->MASTER.CTRLB  = 0;
-				TWI->MASTER.STATUS = TWI_MASTER_BUSSTATE_IDLE_gc;
-			}
-
-			/** Turns off the TWI driver hardware. If this is called, any further TWI operations will require a call to
-			 *  \ref TWI_Init() before the TWI can be used again.
-	   		 *
-			 *  \param[in] TWI  Pointer to the base of the TWI peripheral within the device.
-			 */
-			static inline void TWI_Disable(TWI_t* const TWI) ATTR_ALWAYS_INLINE ATTR_NON_NULL_PTR_ARG(1);
-			static inline void TWI_Disable(TWI_t* const TWI)
-			{
-				TWI->MASTER.CTRLA &= ~TWI_MASTER_ENABLE_bm;
-			}
-
-			/** Sends a TWI STOP onto the TWI bus, terminating communication with the currently addressed device.
-			 *
-			 *  \param[in] TWI  Pointer to the base of the TWI peripheral within the device.
-			 */
-			static inline void TWI_StopTransmission(TWI_t* const TWI) ATTR_ALWAYS_INLINE ATTR_NON_NULL_PTR_ARG(1);
-			static inline void TWI_StopTransmission(TWI_t* const TWI)
-			{
-				TWI->MASTER.CTRLC = TWI_MASTER_ACKACT_bm | TWI_MASTER_CMD_STOP_gc;
-			}
-
-		/* Function Prototypes: */
-			/** Begins a master mode TWI bus communication with the given slave device address.
-			 *
-			 *  \param[in] TWI           Pointer to the base of the TWI peripheral within the device.
-			 *  \param[in] SlaveAddress  Address of the slave TWI device to communicate with.
-			 *  \param[in] TimeoutMS     Timeout period within which the slave must respond, in milliseconds.
-			 *
-			 *  \return A value from the \ref TWI_ErrorCodes_t enum.
-			 */
-			uint8_t TWI_StartTransmission(TWI_t* const TWI,
-			                              const uint8_t SlaveAddress,
-			                              const uint8_t TimeoutMS) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Sends a byte to the currently addressed device on the TWI bus.
-			 *
-			 *  \param[in] TWI   Pointer to the base of the TWI peripheral within the device.
-			 *  \param[in] Byte  Byte to send to the currently addressed device
-			 *
-			 *  \return Boolean \c true if the recipient ACKed the byte, \c false otherwise
-			 */
-			bool TWI_SendByte(TWI_t* const TWI,
-			                  const uint8_t Byte) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Receives a byte from the currently addressed device on the TWI bus.
-			 *
-			 *  \param[in] TWI       Pointer to the base of the TWI peripheral within the device.
-			 *  \param[in] Byte      Location where the read byte is to be stored.
-			 *  \param[in] LastByte  Indicates if the byte should be ACKed if false, NAKed if true.
-			 *
-			 *  \return Boolean \c true if the byte reception successfully completed, \c false otherwise.
-			 */
-			bool TWI_ReceiveByte(TWI_t* const TWI,
-			                     uint8_t* const Byte,
-			                     const bool LastByte) ATTR_NON_NULL_PTR_ARG(1) ATTR_NON_NULL_PTR_ARG(2);
-
-			/** High level function to perform a complete packet transfer over the TWI bus to the specified
-			 *  device.
-			 *
-			 *  \param[in] TWI                 Pointer to the base of the TWI peripheral within the device.
-			 *  \param[in] SlaveAddress        Base address of the TWI slave device to communicate with.
-			 *  \param[in] TimeoutMS           Timeout for bus capture and slave START ACK, in milliseconds.
-			 *  \param[in] InternalAddress     Pointer to a location where the internal slave read start address is stored.
-			 *  \param[in] InternalAddressLen  Size of the internal device address, in bytes.
-			 *  \param[in] Buffer              Pointer to a buffer where the read packet data is to be stored.
-			 *  \param[in] Length              Size of the packet to read, in bytes.
-			 *
-			 *  \return A value from the \ref TWI_ErrorCodes_t enum.
-			 */
-			uint8_t TWI_ReadPacket(TWI_t* const TWI,
-			                       const uint8_t SlaveAddress,
-			                       const uint8_t TimeoutMS,
-			                       const uint8_t* InternalAddress,
-			                       uint8_t InternalAddressLen,
-			                       uint8_t* Buffer,
-			                       uint16_t Length) ATTR_NON_NULL_PTR_ARG(1) ATTR_NON_NULL_PTR_ARG(4);
-
-			/** High level function to perform a complete packet transfer over the TWI bus from the specified
-			 *  device.
-			 *
-			 *  \param[in] TWI                 Pointer to the base of the TWI peripheral within the device.
-			 *  \param[in] SlaveAddress        Base address of the TWI slave device to communicate with
-			 *  \param[in] TimeoutMS           Timeout for bus capture and slave START ACK, in milliseconds
-			 *  \param[in] InternalAddress     Pointer to a location where the internal slave write start address is stored
-			 *  \param[in] InternalAddressLen  Size of the internal device address, in bytes
-			 *  \param[in] Buffer              Pointer to a buffer where the packet data to send is stored
-			 *  \param[in] Length              Size of the packet to send, in bytes
-			 *
-			 *  \return A value from the \ref TWI_ErrorCodes_t enum.
-			 */
-			uint8_t TWI_WritePacket(TWI_t* const TWI,
-			                        const uint8_t SlaveAddress,
-			                        const uint8_t TimeoutMS,
-			                        const uint8_t* InternalAddress,
-			                        uint8_t InternalAddressLen,
-			                        const uint8_t* Buffer,
-			                        uint16_t Length) ATTR_NON_NULL_PTR_ARG(1) ATTR_NON_NULL_PTR_ARG(4);
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Class/AndroidAccessoryClass.h b/NativePrograms/LUFA/Drivers/USB/Class/AndroidAccessoryClass.h
deleted file mode 100644
index 2da0771e8f..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Class/AndroidAccessoryClass.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Master include file for the library USB Android Open Accessory Class driver.
- *
- *  Master include file for the library USB Android Open Accessory Class driver, for both host and device modes, where available.
- *
- *  This file should be included in all user projects making use of this optional class driver, instead of
- *  including any headers in the USB/ClassDriver/Device, USB/ClassDriver/Host or USB/ClassDriver/Common subdirectories.
- */
-
-/** \ingroup Group_USBClassDrivers
- *  \defgroup Group_USBClassAOA Android Open Accessory Class Driver
- *  \brief USB class driver for the Google Android Open Accessory class standard.
- *
- *  \section Sec_USBClassAOA_Dependencies Module Source Dependencies
- *  The following files must be built with any user project that uses this module:
- *    - LUFA/Drivers/USB/Class/Host/AndroidAccessoryClassHost.c <i>(Makefile source module name: LUFA_SRC_USBCLASS)</i>
- *
- *  \section Sec_USBClassAOA_ModDescription Module Description
- *  Android Open Accessory Class Driver module. This module contains an internal implementation of the USB Android Open Accessory
- *  Class, for Host USB mode. User applications can use this class driver instead of implementing the Android Open Accessory Class
- *  manually via the low-level LUFA APIs.
- *
- *  This module is designed to simplify the user code by exposing only the required interface needed to interface with
- *  Host using the USB Android Open Accessory Class.
- *
- *  @{
- */
-
-#ifndef _AOA_CLASS_H_
-#define _AOA_CLASS_H_
-
-	/* Macros: */
-		#define __INCLUDE_FROM_USB_DRIVER
-		#define __INCLUDE_FROM_AOA_DRIVER
-
-	/* Includes: */
-		#include "../Core/USBMode.h"
-
-		#if defined(USB_CAN_BE_HOST)
-			#include "Host/AndroidAccessoryClassHost.h"
-		#endif
-
-#endif
-
-/** @} */
-
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Class/AudioClass.h b/NativePrograms/LUFA/Drivers/USB/Class/AudioClass.h
deleted file mode 100644
index 49c3de668a..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Class/AudioClass.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Master include file for the library USB Audio 1.0 Class driver.
- *
- *  Master include file for the library USB Audio 1.0 Class driver, for both host and device modes, where available.
- *
- *  This file should be included in all user projects making use of this optional class driver, instead of
- *  including any headers in the USB/ClassDriver/Device, USB/ClassDriver/Host or USB/ClassDriver/Common subdirectories.
- */
-
-/** \ingroup Group_USBClassDrivers
- *  \defgroup Group_USBClassAudio Audio 1.0 Class Driver
- *  \brief USB class driver for the USB-IF Audio 1.0 class standard.
- *
- *  \section Sec_USBClassAudio_Dependencies Module Source Dependencies
- *  The following files must be built with any user project that uses this module:
- *    - LUFA/Drivers/USB/Class/Device/AudioClassDevice.c <i>(Makefile source module name: LUFA_SRC_USBCLASS)</i>
- *    - LUFA/Drivers/USB/Class/Host/AudioClassHost.c <i>(Makefile source module name: LUFA_SRC_USBCLASS)</i>
- *
- *  \section Sec_USBClassAudio_ModDescription Module Description
- *  Audio 1.0 Class Driver module. This module contains an internal implementation of the USB Audio 1.0 Class, for both
- *  Device and Host USB modes. User applications can use this class driver instead of implementing the Audio 1.0 class
- *  manually via the low-level LUFA APIs.
- *
- *  This module is designed to simplify the user code by exposing only the required interface needed to interface with
- *  Hosts or Devices using the USB Audio 1.0 Class.
- *
- *  @{
- */
-
-#ifndef _AUDIO_CLASS_H_
-#define _AUDIO_CLASS_H_
-
-	/* Macros: */
-		#define __INCLUDE_FROM_USB_DRIVER
-		#define __INCLUDE_FROM_AUDIO_DRIVER
-
-	/* Includes: */
-		#include "../Core/USBMode.h"
-
-		#if defined(USB_CAN_BE_DEVICE)
-			#include "Device/AudioClassDevice.h"
-		#endif
-
-		#if defined(USB_CAN_BE_HOST)
-			#include "Host/AudioClassHost.h"
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Class/CCIDClass.h b/NativePrograms/LUFA/Drivers/USB/Class/CCIDClass.h
deleted file mode 100644
index c67c3a4063..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Class/CCIDClass.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-  Copyright 2020  Filipe Rodrigues (filipepazrodrigues [at] gmail [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Master include file for the library USB CCID Class driver.
- *
- *  Master include file for the library USB CCID Class driver, for both host and device modes, where available.
- *
- *  This file should be included in all user projects making use of this optional class driver, instead of
- *  including any headers in the USB/ClassDriver/Device, USB/ClassDriver/Host or USB/ClassDriver/Common subdirectories.
- */
-
-/** \ingroup Group_USBClassDrivers
- *  \defgroup Group_USBClassCCID CCID Class Driver
- *  \brief USB class driver for the USB-IF CCID class standard.
- *
- *  \section Sec_USBClassCCID_Dependencies Module Source Dependencies
- *  The following files must be built with any user project that uses this module:
- *    - LUFA/Drivers/USB/Class/Device/CCIDClassDevice.c <i>(Makefile source module name: LUFA_SRC_USBCLASS)</i>
- *
- *  \section Sec_USBClassCCID_ModDescription Module Description
- *  CCID Class Driver module. This module contains an internal implementation of the USB CCID Class, for Device USB
- *  mode. User applications can use this class driver instead of implementing the CCID class manually via the low-level
- *  LUFA APIs.
- *
- *  This module is designed to simplify the user code by exposing only the required interface needed to interface with
- *  Devices using the USB CCID Class.
- *
- *  \warning
- *  LUFA is not a secure USB stack, and has not undergone, not is it expected to pass, any form of security audit. The
- *  CCID class here is presented as-is and is intended for research purposes only, and *should not* be used in a security
- *  critical application under any circumstances.
- *
- *  @{
- */
-
-#ifndef _CCID_CLASS_H_
-#define _CCID_CLASS_H_
-
-	/* Macros: */
-		#define __INCLUDE_FROM_USB_DRIVER
-		#define __INCLUDE_FROM_CCID_DRIVER
-
-	/* Includes: */
-		#include "../Core/USBMode.h"
-
-		#if defined(USB_CAN_BE_DEVICE)
-			#include "Device/CCIDClassDevice.h"
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Class/CDCClass.h b/NativePrograms/LUFA/Drivers/USB/Class/CDCClass.h
deleted file mode 100644
index 36086b00a1..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Class/CDCClass.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Master include file for the library USB CDC-ACM Class driver.
- *
- *  Master include file for the library USB CDC Class driver, for both host and device modes, where available.
- *
- *  This file should be included in all user projects making use of this optional class driver, instead of
- *  including any headers in the USB/ClassDriver/Device, USB/ClassDriver/Host or USB/ClassDriver/Common subdirectories.
- */
-
-/** \ingroup Group_USBClassDrivers
- *  \defgroup Group_USBClassCDC CDC-ACM (Virtual Serial) Class Driver
- *  \brief USB class driver for the USB-IF CDC-ACM (Virtual Serial) class standard.
- *
- *  \section Sec_USBClassCDC_Dependencies Module Source Dependencies
- *  The following files must be built with any user project that uses this module:
- *    - LUFA/Drivers/USB/Class/Device/CDCClassDevice.c <i>(Makefile source module name: LUFA_SRC_USBCLASS)</i>
- *    - LUFA/Drivers/USB/Class/Host/CDCClassHost.c <i>(Makefile source module name: LUFA_SRC_USBCLASS)</i>
- *
- *  \section Sec_USBClassCDC_ModDescription Module Description
- *  CDC Class Driver module. This module contains an internal implementation of the USB CDC-ACM class Virtual Serial
- *  Ports, for both Device and Host USB modes. User applications can use this class driver instead of implementing the
- *  CDC class manually via the low-level LUFA APIs.
- *
- *  This module is designed to simplify the user code by exposing only the required interface needed to interface with
- *  Hosts or Devices using the USB CDC Class.
- *
- *  @{
- */
-
-#ifndef _CDC_CLASS_H_
-#define _CDC_CLASS_H_
-
-	/* Macros: */
-		#define __INCLUDE_FROM_USB_DRIVER
-		#define __INCLUDE_FROM_CDC_DRIVER
-
-	/* Includes: */
-		#include "../Core/USBMode.h"
-
-		#if defined(USB_CAN_BE_DEVICE)
-			#include "Device/CDCClassDevice.h"
-		#endif
-
-		#if defined(USB_CAN_BE_HOST)
-			#include "Host/CDCClassHost.h"
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Class/Common/AndroidAccessoryClassCommon.h b/NativePrograms/LUFA/Drivers/USB/Class/Common/AndroidAccessoryClassCommon.h
deleted file mode 100644
index c4c6be513d..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Class/Common/AndroidAccessoryClassCommon.h
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Common definitions and declarations for the library USB Android Open Accessory Class driver.
- *
- *  Common definitions and declarations for the library USB Android Open Accessory Class driver.
- *
- *  \note This file should not be included directly. It is automatically included as needed by the USB module driver
- *        dispatch header located in LUFA/Drivers/USB.h.
- */
-
-/** \ingroup Group_USBClassAOA
- *  \defgroup Group_USBClassAOACommon  Common Class Definitions
- *
- *  \section Sec_USBClassAOACommon_ModDescription Module Description
- *  Constants, Types and Enum definitions that are common to both Device and Host modes for the USB
- *  Android Open Accessory Class.
- *
- *  @{
- */
-
-#ifndef _AOA_CLASS_COMMON_H_
-#define _AOA_CLASS_COMMON_H_
-
-	/* Includes: */
-		#include "../../Core/StdDescriptors.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_AOA_DRIVER)
-			#error Do not include this file directly. Include LUFA/Drivers/USB.h instead.
-		#endif
-
-	/* Macros: */
-		/** Product ID value in a Device Descriptor to indicate an Android device in Open Accessory mode. */
-		#define ANDROID_ACCESSORY_PRODUCT_ID        0x2D00
-
-		/** Product ID value in a Device Descriptor to indicate an Android device in Open Accessory and Android Debug mode. */
-		#define ANDROID_ACCESSORY_ADB_PRODUCT_ID    0x2D01
-
-	/* Enums: */
-		/** Enum for possible Class, Subclass and Protocol values of device and interface descriptors relating to the
-		 *  Android Open Accessory class.
-		 */
-		enum AOA_Descriptor_ClassSubclassProtocol_t
-		{
-			AOA_CSCP_AOADataClass    = 0xFF, /**< Descriptor Class value indicating that the device or interface
-			                                  *   belongs to the AOA data class.
-			                                  */
-			AOA_CSCP_AOADataSubclass = 0xFF, /**< Descriptor Subclass value indicating that the device or interface
-			                                  *   belongs to AOA data subclass.
-			                                  */
-			AOA_CSCP_AOADataProtocol = 0x00, /**< Descriptor Protocol value indicating that the device or interface
-			                                  *   belongs to the AOA data class protocol.
-			                                  */
-		};
-
-		/** Enum for the Android Open Accessory class specific control requests that can be issued by the USB bus host. */
-		enum AOA_ClassRequests_t
-		{
-			AOA_REQ_GetAccessoryProtocol    = 0x33, /**< Android Open Accessory control request to retrieve the device's supported Accessory Protocol version. */
-			AOA_REQ_SendString              = 0x34, /**< Android Open Accessory control request to set an accessory property string in the device. */
-			AOA_REQ_StartAccessoryMode      = 0x35, /**< Android Open Accessory control request to switch the device into Accessory mode. */
-		};
-
-		/** Enum for the possible Android Open Accessory property string indexes. */
-		enum AOA_Strings_t
-		{
-			AOA_STRING_Manufacturer         = 0, /**< Index of the Manufacturer property string. */
-			AOA_STRING_Model                = 1, /**< Index of the Model Name property string. */
-			AOA_STRING_Description          = 2, /**< Index of the Description property string. */
-			AOA_STRING_Version              = 3, /**< Index of the Version Number property string. */
-			AOA_STRING_URI                  = 4, /**< Index of the URI Information property string. */
-			AOA_STRING_Serial               = 5, /**< Index of the Serial Number property string. */
-
-			#if !defined(__DOXYGEN__)
-			AOA_STRING_TOTAL_STRINGS
-			#endif
-		};
-
-		/** Enum for the possible Android Open Accessory protocol versions. */
-		enum AOA_Protocols_t
-		{
-			AOA_PROTOCOL_AccessoryV1        = 0x0001, /**< Android Open Accessory version 1. */
-			AOA_PROTOCOL_AccessoryV2        = 0x0002, /**< Android Open Accessory version 2. */
-		};
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Class/Common/AudioClassCommon.h b/NativePrograms/LUFA/Drivers/USB/Class/Common/AudioClassCommon.h
deleted file mode 100644
index a24e68b3f0..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Class/Common/AudioClassCommon.h
+++ /dev/null
@@ -1,787 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Common definitions and declarations for the library USB Audio 1.0 Class driver.
- *
- *  Common definitions and declarations for the library USB Audio 1.0 Class driver.
- *
- *  \note This file should not be included directly. It is automatically included as needed by the USB module driver
- *        dispatch header located in LUFA/Drivers/USB.h.
- */
-
-/** \ingroup Group_USBClassAudio
- *  \defgroup Group_USBClassAudioCommon  Common Class Definitions
- *
- *  \section Sec_USBClassAudioCommon_ModDescription Module Description
- *  Constants, Types and Enum definitions that are common to both Device and Host modes for the USB
- *  Audio 1.0 Class.
- *
- *  @{
- */
-
-#ifndef _AUDIO_CLASS_COMMON_H_
-#define _AUDIO_CLASS_COMMON_H_
-
-	/* Includes: */
-		#include "../../Core/StdDescriptors.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_AUDIO_DRIVER)
-			#error Do not include this file directly. Include LUFA/Drivers/USB.h instead.
-		#endif
-
-	/* Macros: */
-		/** \name Audio Channel Masks */
-		/**@{*/
-		/** Supported channel mask for an Audio class terminal descriptor. See the Audio class specification for more details. */
-		#define AUDIO_CHANNEL_LEFT_FRONT           (1 << 0)
-
-		/** Supported channel mask for an Audio class terminal descriptor. See the Audio class specification for more details. */
-		#define AUDIO_CHANNEL_RIGHT_FRONT          (1 << 1)
-
-		/** Supported channel mask for an Audio class terminal descriptor. See the Audio class specification for more details. */
-		#define AUDIO_CHANNEL_CENTER_FRONT         (1 << 2)
-
-		/** Supported channel mask for an Audio class terminal descriptor. See the Audio class specification for more details. */
-		#define AUDIO_CHANNEL_LOW_FREQ_ENHANCE     (1 << 3)
-
-		/** Supported channel mask for an Audio class terminal descriptor. See the Audio class specification for more details. */
-		#define AUDIO_CHANNEL_LEFT_SURROUND        (1 << 4)
-
-		/** Supported channel mask for an Audio class terminal descriptor. See the Audio class specification for more details. */
-		#define AUDIO_CHANNEL_RIGHT_SURROUND       (1 << 5)
-
-		/** Supported channel mask for an Audio class terminal descriptor. See the Audio class specification for more details. */
-		#define AUDIO_CHANNEL_LEFT_OF_CENTER       (1 << 6)
-
-		/** Supported channel mask for an Audio class terminal descriptor. See the Audio class specification for more details. */
-		#define AUDIO_CHANNEL_RIGHT_OF_CENTER      (1 << 7)
-
-		/** Supported channel mask for an Audio class terminal descriptor. See the Audio class specification for more details. */
-		#define AUDIO_CHANNEL_SURROUND             (1 << 8)
-
-		/** Supported channel mask for an Audio class terminal descriptor. See the Audio class specification for more details. */
-		#define AUDIO_CHANNEL_SIDE_LEFT            (1 << 9)
-
-		/** Supported channel mask for an Audio class terminal descriptor. See the Audio class specification for more details. */
-		#define AUDIO_CHANNEL_SIDE_RIGHT           (1 << 10)
-
-		/** Supported channel mask for an Audio class terminal descriptor. See the Audio class specification for more details. */
-		#define AUDIO_CHANNEL_TOP                  (1 << 11)
-		/**@}*/
-
-		/** \name Audio Feature Masks */
-		/**@{*/
-		/** Supported feature mask for an Audio class feature unit descriptor. See the Audio class specification for more details. */
-		#define AUDIO_FEATURE_MUTE                 (1 << 0)
-
-		/** Supported feature mask for an Audio class feature unit descriptor. See the Audio class specification for more details. */
-		#define AUDIO_FEATURE_VOLUME               (1 << 1)
-
-		/** Supported feature mask for an Audio class feature unit descriptor. See the Audio class specification for more details. */
-		#define AUDIO_FEATURE_BASS                 (1 << 2)
-
-		/** Supported feature mask for an Audio class feature unit descriptor. See the Audio class specification for more details. */
-		#define AUDIO_FEATURE_MID                  (1 << 3)
-
-		/** Supported feature mask for an Audio class feature unit descriptor. See the Audio class specification for more details. */
-		#define AUDIO_FEATURE_TREBLE               (1 << 4)
-
-		/** Supported feature mask for an Audio class feature unit descriptor. See the Audio class specification for more details. */
-		#define AUDIO_FEATURE_GRAPHIC_EQUALIZER    (1 << 5)
-
-		/** Supported feature mask for an Audio class feature unit descriptor. See the Audio class specification for more details. */
-		#define AUDIO_FEATURE_AUTOMATIC_GAIN       (1 << 6)
-
-		/** Supported feature mask for an Audio class feature unit descriptor. See the Audio class specification for more details. */
-		#define AUDIO_FEATURE_DELAY                (1 << 7)
-
-		/** Supported feature mask for an Audio class feature unit descriptor. See the Audio class specification for more details. */
-		#define AUDIO_FEATURE_BASS_BOOST           (1 << 8)
-
-		/** Supported feature mask for an Audio class feature unit descriptor. See the Audio class specification for more details. */
-		#define AUDIO_FEATURE_BASS_LOUDNESS        (1 << 9)
-		/**@}*/
-
-		/** \name Audio Terminal Types */
-		/**@{*/
-		/** Terminal type constant for an Audio class terminal descriptor. See the Audio class specification for more details. */
-		#define AUDIO_TERMINAL_UNDEFINED           0x0100
-
-		/** Terminal type constant for an Audio class terminal descriptor. See the Audio class specification for more details. */
-		#define AUDIO_TERMINAL_STREAMING           0x0101
-
-		/** Terminal type constant for an Audio class terminal descriptor. See the Audio class specification for more details. */
-		#define AUDIO_TERMINAL_VENDOR              0x01FF
-
-		/** Terminal type constant for an Audio class terminal descriptor. See the Audio class specification for more details. */
-		#define AUDIO_TERMINAL_IN_UNDEFINED        0x0200
-
-		/** Terminal type constant for an Audio class terminal descriptor. See the Audio class specification for more details. */
-		#define AUDIO_TERMINAL_IN_MIC              0x0201
-
-		/** Terminal type constant for an Audio class terminal descriptor. See the Audio class specification for more details. */
-		#define AUDIO_TERMINAL_IN_DESKTOP_MIC      0x0202
-
-		/** Terminal type constant for an Audio class terminal descriptor. See the Audio class specification for more details. */
-		#define AUDIO_TERMINAL_IN_PERSONAL_MIC     0x0203
-
-		/** Terminal type constant for an Audio class terminal descriptor. See the Audio class specification for more details. */
-		#define AUDIO_TERMINAL_IN_OMNIDIR_MIC      0x0204
-
-		/** Terminal type constant for an Audio class terminal descriptor. See the Audio class specification for more details. */
-		#define AUDIO_TERMINAL_IN_MIC_ARRAY        0x0205
-
-		/** Terminal type constant for an Audio class terminal descriptor. See the Audio class specification for more details. */
-		#define AUDIO_TERMINAL_IN_PROCESSING_MIC   0x0206
-
-		/** Terminal type constant for an Audio class terminal descriptor. See the Audio class specification for more details. */
-		#define AUDIO_TERMINAL_IN_OUT_UNDEFINED    0x0300
-
-		/** Terminal type constant for an Audio class terminal descriptor. See the Audio class specification for more details. */
-		#define AUDIO_TERMINAL_OUT_SPEAKER         0x0301
-
-		/** Terminal type constant for an Audio class terminal descriptor. See the Audio class specification for more details. */
-		#define AUDIO_TERMINAL_OUT_HEADPHONES      0x0302
-
-		/** Terminal type constant for an Audio class terminal descriptor. See the Audio class specification for more details. */
-		#define AUDIO_TERMINAL_OUT_HEAD_MOUNTED    0x0303
-
-		/** Terminal type constant for an Audio class terminal descriptor. See the Audio class specification for more details. */
-		#define AUDIO_TERMINAL_OUT_DESKTOP         0x0304
-
-		/** Terminal type constant for an Audio class terminal descriptor. See the Audio class specification for more details. */
-		#define AUDIO_TERMINAL_OUT_ROOM            0x0305
-
-		/** Terminal type constant for an Audio class terminal descriptor. See the Audio class specification for more details. */
-		#define AUDIO_TERMINAL_OUT_COMMUNICATION   0x0306
-
-		/** Terminal type constant for an Audio class terminal descriptor. See the Audio class specification for more details. */
-		#define AUDIO_TERMINAL_OUT_LOWFREQ         0x0307
-		/**@}*/
-
-		/** Convenience macro to fill a 24-bit \ref USB_Audio_SampleFreq_t structure with the given sample rate as a 24-bit number.
-		 *
-		 *  \param[in] freq  Required audio sampling frequency in HZ
-		 */
-		#define AUDIO_SAMPLE_FREQ(freq)           {.Byte1 = ((uint32_t)freq & 0xFF), .Byte2 = (((uint32_t)freq >> 8) & 0xFF), .Byte3 = (((uint32_t)freq >> 16) & 0xFF)}
-
-		/** Mask for the attributes parameter of an Audio class-specific Endpoint descriptor, indicating that the endpoint
-		 *  accepts only filled endpoint packets of audio samples.
-		 */
-		#define AUDIO_EP_FULL_PACKETS_ONLY        (1 << 7)
-
-		/** Mask for the attributes parameter of an Audio class-specific Endpoint descriptor, indicating that the endpoint
-		 *  will accept partially filled endpoint packets of audio samples.
-		 */
-		#define AUDIO_EP_ACCEPTS_SMALL_PACKETS    (0 << 7)
-
-		/** Mask for the attributes parameter of an Audio class-specific Endpoint descriptor, indicating that the endpoint
-		 *  allows for sampling frequency adjustments to be made via control requests directed at the endpoint.
-		 */
-		#define AUDIO_EP_SAMPLE_FREQ_CONTROL      (1 << 0)
-
-		/** Mask for the attributes parameter of an Audio class-specific Endpoint descriptor, indicating that the endpoint
-		 *  allows for pitch adjustments to be made via control requests directed at the endpoint.
-		 */
-		#define AUDIO_EP_PITCH_CONTROL            (1 << 1)
-
-	/* Enums: */
-		/** Enum for possible Class, Subclass and Protocol values of device and interface descriptors relating to the Audio
-		 *  device class.
-		 */
-		enum Audio_Descriptor_ClassSubclassProtocol_t
-		{
-			AUDIO_CSCP_AudioClass                     = 0x01, /**< Descriptor Class value indicating that the device or
-			                                                   *   interface belongs to the USB Audio 1.0 class.
-			                                                   */
-			AUDIO_CSCP_ControlSubclass                = 0x01, /**< Descriptor Subclass value indicating that the device or
-			                                                   *   interface belongs to the Audio Control subclass.
-			                                                   */
-			AUDIO_CSCP_ControlProtocol                = 0x00, /**< Descriptor Protocol value indicating that the device or
-			                                                   *   interface belongs to the Audio Control protocol.
-			                                                   */
-			AUDIO_CSCP_AudioStreamingSubclass         = 0x02, /**< Descriptor Subclass value indicating that the device or
-			                                                   *   interface belongs to the MIDI Streaming subclass.
-			                                                   */
-			AUDIO_CSCP_MIDIStreamingSubclass          = 0x03, /**< Descriptor Subclass value indicating that the device or
-			                                                   *   interface belongs to the Audio streaming subclass.
-			                                                   */
-			AUDIO_CSCP_StreamingProtocol              = 0x00, /**< Descriptor Protocol value indicating that the device or
-			                                                   *   interface belongs to the Streaming Audio protocol.
-			                                                   */
-		};
-
-		/** Enum for the Audio class specific descriptor types. */
-		enum AUDIO_DescriptorTypes_t
-		{
-			AUDIO_DTYPE_CSInterface                     = 0x24, /**< Audio class specific Interface functional descriptor. */
-			AUDIO_DTYPE_CSEndpoint                      = 0x25, /**< Audio class specific Endpoint functional descriptor. */
-		};
-
-		/** Audio class specific interface description subtypes, for the Audio Control interface. */
-		enum Audio_CSInterface_AC_SubTypes_t
-		{
-			AUDIO_DSUBTYPE_CSInterface_Header         = 0x01, /**< Audio class specific control interface header. */
-			AUDIO_DSUBTYPE_CSInterface_InputTerminal  = 0x02, /**< Audio class specific control interface Input Terminal. */
-			AUDIO_DSUBTYPE_CSInterface_OutputTerminal = 0x03, /**< Audio class specific control interface Output Terminal. */
-			AUDIO_DSUBTYPE_CSInterface_Mixer          = 0x04, /**< Audio class specific control interface Mixer Unit. */
-			AUDIO_DSUBTYPE_CSInterface_Selector       = 0x05, /**< Audio class specific control interface Selector Unit. */
-			AUDIO_DSUBTYPE_CSInterface_Feature        = 0x06, /**< Audio class specific control interface Feature Unit. */
-			AUDIO_DSUBTYPE_CSInterface_Processing     = 0x07, /**< Audio class specific control interface Processing Unit. */
-			AUDIO_DSUBTYPE_CSInterface_Extension      = 0x08, /**< Audio class specific control interface Extension Unit. */
-		};
-
-		/** Audio class specific interface description subtypes, for the Audio Streaming interface. */
-		enum Audio_CSInterface_AS_SubTypes_t
-		{
-			AUDIO_DSUBTYPE_CSInterface_General        = 0x01, /**< Audio class specific streaming interface general descriptor. */
-			AUDIO_DSUBTYPE_CSInterface_FormatType     = 0x02, /**< Audio class specific streaming interface format type descriptor. */
-			AUDIO_DSUBTYPE_CSInterface_FormatSpecific = 0x03, /**< Audio class specific streaming interface format information descriptor. */
-		};
-
-		/** Audio class specific endpoint description subtypes, for the Audio Streaming interface. */
-		enum Audio_CSEndpoint_SubTypes_t
-		{
-			AUDIO_DSUBTYPE_CSEndpoint_General         = 0x01, /**< Audio class specific endpoint general descriptor. */
-		};
-
-		/** Enum for the Audio class specific control requests that can be issued by the USB bus host. */
-		enum Audio_ClassRequests_t
-		{
-			AUDIO_REQ_SetCurrent    = 0x01, /**< Audio class-specific request to set the current value of a parameter within the device. */
-			AUDIO_REQ_SetMinimum    = 0x02, /**< Audio class-specific request to set the minimum value of a parameter within the device. */
-			AUDIO_REQ_SetMaximum    = 0x03, /**< Audio class-specific request to set the maximum value of a parameter within the device. */
-			AUDIO_REQ_SetResolution = 0x04, /**< Audio class-specific request to set the resolution value of a parameter within the device. */
-			AUDIO_REQ_SetMemory     = 0x05, /**< Audio class-specific request to set the memory value of a parameter within the device. */
-			AUDIO_REQ_GetCurrent    = 0x81, /**< Audio class-specific request to get the current value of a parameter within the device. */
-			AUDIO_REQ_GetMinimum    = 0x82, /**< Audio class-specific request to get the minimum value of a parameter within the device. */
-			AUDIO_REQ_GetMaximum    = 0x83, /**< Audio class-specific request to get the maximum value of a parameter within the device. */
-			AUDIO_REQ_GetResolution = 0x84, /**< Audio class-specific request to get the resolution value of a parameter within the device. */
-			AUDIO_REQ_GetMemory     = 0x85, /**< Audio class-specific request to get the memory value of a parameter within the device. */
-			AUDIO_REQ_GetStatus     = 0xFF, /**< Audio class-specific request to get the device status. */
-		};
-
-		/** Enum for Audio class specific Endpoint control modifiers which can be set and retrieved by a USB host, if the corresponding
-		 *  endpoint control is indicated to be supported in the Endpoint's Audio-class specific endpoint descriptor.
-		 */
-		enum Audio_EndpointControls_t
-		{
-			AUDIO_EPCONTROL_SamplingFreq = 0x01, /**< Sampling frequency adjustment of the endpoint. */
-			AUDIO_EPCONTROL_Pitch        = 0x02, /**< Pitch adjustment of the endpoint. */
-		};
-
-	/* Type Defines: */
-		/** \brief Audio class-specific Input Terminal Descriptor (LUFA naming conventions).
-		 *
-		 *  Type define for an Audio class-specific input terminal descriptor. This indicates to the host that the device
-		 *  contains an input audio source, either from a physical terminal on the device, or a logical terminal (for example,
-		 *  a USB endpoint). See the USB Audio specification for more details.
-		 *
-		 *  \see \ref USB_Audio_StdDescriptor_InputTerminal_t for the version of this type with standard element names.
-		 *
-		 *  \note Regardless of CPU architecture, these values should be stored as little endian.
-		 */
-		typedef struct
-		{
-			USB_Descriptor_Header_t Header; /**< Regular descriptor header containing the descriptor's type and length. */
-			uint8_t                 Subtype; /**< Sub type value used to distinguish between audio class-specific descriptors,
-			                                  *   must be \ref AUDIO_DSUBTYPE_CSInterface_InputTerminal.
-			                                  */
-
-			uint8_t                 TerminalID; /**< ID value of this terminal unit - must be a unique value within the device. */
-			uint16_t                TerminalType; /**< Type of terminal, a \c TERMINAL_* mask. */
-			uint8_t                 AssociatedOutputTerminal; /**< ID of associated output terminal, for physically grouped terminals
-			                                                   *   such as the speaker and microphone of a phone handset.
-			                                                   */
-			uint8_t                 TotalChannels; /**< Total number of separate audio channels within this interface (right, left, etc.) */
-			uint16_t                ChannelConfig; /**< \c CHANNEL_* masks indicating what channel layout is supported by this terminal. */
-
-			uint8_t                 ChannelStrIndex; /**< Index of a string descriptor describing this channel within the device. */
-			uint8_t                 TerminalStrIndex; /**< Index of a string descriptor describing this descriptor within the device. */
-		} ATTR_PACKED USB_Audio_Descriptor_InputTerminal_t;
-
-		/** \brief Audio class-specific Input Terminal Descriptor (USB-IF naming conventions).
-		 *
-		 *  Type define for an Audio class-specific input terminal descriptor. This indicates to the host that the device
-		 *  contains an input audio source, either from a physical terminal on the device, or a logical terminal (for example,
-		 *  a USB endpoint). See the USB Audio specification for more details.
-		 *
-		 *  \see \ref USB_Audio_Descriptor_InputTerminal_t for the version of this type with non-standard LUFA specific
-		 *       element names.
-		 *
-		 *  \note Regardless of CPU architecture, these values should be stored as little endian.
-		 */
-		typedef struct
-		{
-			uint8_t  bLength; /**< Size of the descriptor, in bytes. */
-			uint8_t  bDescriptorType; /**< Type of the descriptor, either a value in \ref USB_DescriptorTypes_t or a value
-			                           *   given by the specific class.
-			                           */
-
-			uint8_t  bDescriptorSubtype; /**< Sub type value used to distinguish between audio class-specific descriptors,
-			                              *   must be \ref AUDIO_DSUBTYPE_CSInterface_InputTerminal.
-			                              */
-			uint8_t  bTerminalID; /**< ID value of this terminal unit - must be a unique value within the device. */
-			uint16_t wTerminalType; /**< Type of terminal, a \c TERMINAL_* mask. */
-			uint8_t  bAssocTerminal; /**< ID of associated output terminal, for physically grouped terminals
-			                          *   such as the speaker and microphone of a phone handset.
-			                          */
-			uint8_t  bNrChannels; /**< Total number of separate audio channels within this interface (right, left, etc.) */
-			uint16_t wChannelConfig; /**< \c CHANNEL_* masks indicating what channel layout is supported by this terminal. */
-
-			uint8_t  iChannelNames; /**< Index of a string descriptor describing this channel within the device. */
-			uint8_t  iTerminal; /**< Index of a string descriptor describing this descriptor within the device. */
-		} ATTR_PACKED USB_Audio_StdDescriptor_InputTerminal_t;
-
-		/** \brief Audio class-specific Output Terminal Descriptor (LUFA naming conventions).
-		 *
-		 *  Type define for an Audio class-specific output terminal descriptor. This indicates to the host that the device
-		 *  contains an output audio sink, either to a physical terminal on the device, or a logical terminal (for example,
-		 *  a USB endpoint). See the USB Audio specification for more details.
-		 *
-		 *  \see \ref USB_Audio_StdDescriptor_OutputTerminal_t for the version of this type with standard element names.
-		 *
-		 *  \note Regardless of CPU architecture, these values should be stored as little endian.
-		 */
-		typedef struct
-		{
-			USB_Descriptor_Header_t Header; /**< Regular descriptor header containing the descriptor's type and length. */
-			uint8_t                 Subtype; /**< Sub type value used to distinguish between audio class-specific descriptors,
-			                                  *   must be \ref AUDIO_DSUBTYPE_CSInterface_OutputTerminal.
-			                                  */
-
-			uint8_t                 TerminalID; /**< ID value of this terminal unit - must be a unique value within the device. */
-			uint16_t                TerminalType; /**< Type of terminal, a \c TERMINAL_* mask. */
-			uint8_t                 AssociatedInputTerminal; /**< ID of associated input terminal, for physically grouped terminals
-			                                                    *   such as the speaker and microphone of a phone handset.
-			                                                    */
-			uint8_t                 SourceID; /**< ID value of the unit this terminal's audio is sourced from. */
-
-			uint8_t                 TerminalStrIndex; /**< Index of a string descriptor describing this descriptor within the device. */
-		} ATTR_PACKED USB_Audio_Descriptor_OutputTerminal_t;
-
-		/** \brief Audio class-specific Output Terminal Descriptor (USB-IF naming conventions).
-		 *
-		 *  Type define for an Audio class-specific output terminal descriptor. This indicates to the host that the device
-		 *  contains an output audio sink, either to a physical terminal on the device, or a logical terminal (for example,
-		 *  a USB endpoint). See the USB Audio specification for more details.
-		 *
-		 *  \see \ref USB_Audio_Descriptor_OutputTerminal_t for the version of this type with non-standard LUFA specific
-		 *       element names.
-		 *
-		 *  \note Regardless of CPU architecture, these values should be stored as little endian.
-		 */
-		typedef struct
-		{
-			uint8_t  bLength; /**< Size of the descriptor, in bytes. */
-			uint8_t  bDescriptorType; /**< Sub type value used to distinguish between audio class-specific descriptors,
-			                           *   must be \ref AUDIO_DSUBTYPE_CSInterface_OutputTerminal.
-			                           */
-
-			uint8_t  bDescriptorSubtype; /**< Sub type value used to distinguish between audio class-specific descriptors,
-			                              *   a value from the \ref Audio_CSInterface_AC_SubTypes_t enum.
-			                              */
-			uint8_t  bTerminalID; /**< ID value of this terminal unit - must be a unique value within the device. */
-			uint16_t wTerminalType; /**< Type of terminal, a \c TERMINAL_* mask. */
-			uint8_t  bAssocTerminal; /**< ID of associated input terminal, for physically grouped terminals
-			                          *   such as the speaker and microphone of a phone handset.
-			                          */
-			uint8_t  bSourceID; /**< ID value of the unit this terminal's audio is sourced from. */
-
-			uint8_t  iTerminal; /**< Index of a string descriptor describing this descriptor within the device. */
-		} ATTR_PACKED USB_Audio_StdDescriptor_OutputTerminal_t;
-
-		/** \brief Audio class-specific Interface Descriptor (LUFA naming conventions).
-		 *
-		 *  Type define for an Audio class-specific interface descriptor. This follows a regular interface descriptor to
-		 *  supply extra information about the audio device's layout to the host. See the USB Audio specification for more
-		 *  details.
-		 *
-		 *  \see \ref USB_Audio_StdDescriptor_Interface_AC_t for the version of this type with standard element names.
-		 *
-		 *  \note Regardless of CPU architecture, these values should be stored as little endian.
-		 */
-		typedef struct
-		{
-			USB_Descriptor_Header_t Header; /**< Regular descriptor header containing the descriptor's type and length. */
-			uint8_t                 Subtype; /**< Sub type value used to distinguish between audio class-specific descriptors,
-			                                  *   a value from the \ref Audio_CSInterface_AS_SubTypes_t enum.
-			                                  */
-
-			uint16_t                ACSpecification; /**< Binary Coded Decimal value, indicating the supported Audio Class specification version.
-			                                          *
-			                                          *   \see \ref VERSION_BCD() utility macro.
-			                                          */
-			uint16_t                TotalLength; /**< Total length of the Audio class-specific descriptors, including this descriptor. */
-
-			uint8_t                 InCollection; /**< Total number of Audio Streaming interfaces linked to this Audio Control interface (must be 1). */
-			uint8_t                 InterfaceNumber; /**< Interface number of the associated Audio Streaming interface. */
-		} ATTR_PACKED USB_Audio_Descriptor_Interface_AC_t;
-
-		/** \brief Audio class-specific Interface Descriptor (USB-IF naming conventions).
-		 *
-		 *  Type define for an Audio class-specific interface descriptor. This follows a regular interface descriptor to
-		 *  supply extra information about the audio device's layout to the host. See the USB Audio specification for more
-		 *  details.
-		 *
-		 *  \see \ref USB_Audio_Descriptor_Interface_AC_t for the version of this type with non-standard LUFA specific
-		 *       element names.
-		 *
-		 *  \note Regardless of CPU architecture, these values should be stored as little endian.
-		 */
-		typedef struct
-		{
-			uint8_t  bLength; /**< Size of the descriptor, in bytes. */
-			uint8_t  bDescriptorType; /**< Type of the descriptor, either a value in \ref USB_DescriptorTypes_t or a value
-			                           *   given by the specific class.
-			                           */
-
-			uint8_t  bDescriptorSubtype;/**< Sub type value used to distinguish between audio class-specific descriptors,
-			                             *   a value from the \ref Audio_CSInterface_AS_SubTypes_t enum.
-			                             */
-
-			uint16_t bcdADC; /**< Binary coded decimal value, indicating the supported Audio Class specification version.
-			                  *
-			                  *   \see \ref VERSION_BCD() utility macro.
-			                  */
-			uint16_t wTotalLength; /**< Total length of the Audio class-specific descriptors, including this descriptor. */
-
-			uint8_t  bInCollection; /**< Total number of Audio Streaming interfaces linked to this Audio Control interface (must be 1). */
-			uint8_t  bInterfaceNumbers; /**< Interface number of the associated Audio Streaming interface. */
-		} ATTR_PACKED USB_Audio_StdDescriptor_Interface_AC_t;
-
-		/** \brief Audio class-specific Feature Unit Descriptor (LUFA naming conventions).
-		 *
-		 *  Type define for an Audio class-specific Feature Unit descriptor. This indicates to the host what features
-		 *  are present in the device's audio stream for basic control, such as per-channel volume. See the USB Audio
-		 *  specification for more details.
-		 *
-		 *  \see \ref USB_Audio_StdDescriptor_FeatureUnit_t for the version of this type with standard element names.
-		 *
-		 *  \note Regardless of CPU architecture, these values should be stored as little endian.
-		 */
-		typedef struct
-		{
-			USB_Descriptor_Header_t Header; /**< Regular descriptor header containing the descriptor's type and length. */
-			uint8_t                 Subtype; /**< Sub type value used to distinguish between audio class-specific descriptors,
-			                                  *   must be \ref AUDIO_DSUBTYPE_CSInterface_Feature.
-			                                  */
-
-			uint8_t                 UnitID; /**< ID value of this feature unit - must be a unique value within the device. */
-			uint8_t                 SourceID; /**< Source ID value of the audio source input into this feature unit. */
-
-			uint8_t                 ControlSize; /**< Size of each element in the \c ChannelControls array. */
-			uint8_t                 ChannelControls[3]; /**< Feature masks for the control channel, and each separate audio channel. */
-
-			uint8_t                 FeatureUnitStrIndex; /**< Index of a string descriptor describing this descriptor within the device. */
-		} ATTR_PACKED USB_Audio_Descriptor_FeatureUnit_t;
-
-		/** \brief Audio class-specific Feature Unit Descriptor (USB-IF naming conventions).
-		 *
-		 *  Type define for an Audio class-specific Feature Unit descriptor. This indicates to the host what features
-		 *  are present in the device's audio stream for basic control, such as per-channel volume. See the USB Audio
-		 *  specification for more details.
-		 *
-		 *  \see \ref USB_Audio_Descriptor_FeatureUnit_t for the version of this type with non-standard LUFA specific
-		 *       element names.
-		 *
-		 *  \note Regardless of CPU architecture, these values should be stored as little endian.
-		 */
-		typedef struct
-		{
-			uint8_t bLength; /**< Size of the descriptor, in bytes. */
-			uint8_t bDescriptorType; /**< Type of the descriptor, either a value in \ref USB_DescriptorTypes_t or a value
-			                          *   given by the specific class.
-			                          */
-
-			uint8_t bDescriptorSubtype; /**< Sub type value used to distinguish between audio class-specific descriptors,
-			                             *   must be \ref AUDIO_DSUBTYPE_CSInterface_Feature.
-			                             */
-
-			uint8_t bUnitID; /**< ID value of this feature unit - must be a unique value within the device. */
-			uint8_t bSourceID; /**< Source ID value of the audio source input into this feature unit. */
-
-			uint8_t bControlSize; /**< Size of each element in the \c ChannelControls array. */
-			uint8_t bmaControls[3]; /**< Feature masks for the control channel, and each separate audio channel. */
-
-			uint8_t iFeature; /**< Index of a string descriptor describing this descriptor within the device. */
-		} ATTR_PACKED USB_Audio_StdDescriptor_FeatureUnit_t;
-
-		/** \brief Audio class-specific Streaming Audio Interface Descriptor (LUFA naming conventions).
-		 *
-		 *  Type define for an Audio class-specific streaming interface descriptor. This indicates to the host
-		 *  how audio streams within the device are formatted. See the USB Audio specification for more details.
-		 *
-		 *  \see \ref USB_Audio_StdDescriptor_Interface_AS_t for the version of this type with standard element names.
-		 *
-		 *  \note Regardless of CPU architecture, these values should be stored as little endian.
-		 */
-		typedef struct
-		{
-			USB_Descriptor_Header_t Header; /**< Regular descriptor header containing the descriptor's type and length. */
-			uint8_t                 Subtype; /**< Sub type value used to distinguish between audio class-specific descriptors,
-			                                  *   a value from the \ref Audio_CSInterface_AS_SubTypes_t enum.
-			                                  */
-
-			uint8_t                 TerminalLink; /**< ID value of the output terminal this descriptor is describing. */
-
-			uint8_t                 FrameDelay; /**< Delay in frames resulting from the complete sample processing from input to output. */
-			uint16_t                AudioFormat; /**< Format of the audio stream, see Audio Device Formats specification. */
-		} ATTR_PACKED USB_Audio_Descriptor_Interface_AS_t;
-
-		/** \brief Audio class-specific Streaming Audio Interface Descriptor (USB-IF naming conventions).
-		 *
-		 *  Type define for an Audio class-specific streaming interface descriptor. This indicates to the host
-		 *  how audio streams within the device are formatted. See the USB Audio specification for more details.
-		 *
-		 *  \see \ref USB_Audio_Descriptor_Interface_AS_t for the version of this type with non-standard LUFA specific
-		 *       element names.
-		 *
-		 *  \note Regardless of CPU architecture, these values should be stored as little endian.
-		 */
-		typedef struct
-		{
-			uint8_t  bLength; /**< Size of the descriptor, in bytes. */
-			uint8_t  bDescriptorType; /**< Type of the descriptor, either a value in \ref USB_DescriptorTypes_t or a value
-			                           *   given by the specific class.
-			                           */
-
-			uint8_t  bDescriptorSubtype; /**< Sub type value used to distinguish between audio class-specific descriptors,
-			                              *   a value from the \ref Audio_CSInterface_AS_SubTypes_t enum.
-			                              */
-
-			uint8_t  bTerminalLink; /**< ID value of the output terminal this descriptor is describing. */
-
-			uint8_t  bDelay; /**< Delay in frames resulting from the complete sample processing from input to output. */
-			uint16_t wFormatTag; /**< Format of the audio stream, see Audio Device Formats specification. */
-		} ATTR_PACKED USB_Audio_StdDescriptor_Interface_AS_t;
-
-		/** \brief Audio class-specific Format Descriptor (LUFA naming conventions).
-		 *
-		 *  Type define for an Audio class-specific audio format descriptor. This is used to give the host full details
-		 *  about the number of channels, the sample resolution, acceptable sample frequencies and encoding method used
-		 *  in the device's audio streams. See the USB Audio specification for more details.
-		 *
-		 *  \attention This descriptor <b>must</b> be followed by one or more \ref USB_Audio_SampleFreq_t elements containing
-		 *             the continuous or discrete sample frequencies.
-		 *
-		 *  \see \ref USB_Audio_StdDescriptor_Format_t for the version of this type with standard element names.
-		 *
-		 *  \note Regardless of CPU architecture, these values should be stored as little endian.
-		 */
-		typedef struct
-		{
-			USB_Descriptor_Header_t Header; /**< Regular descriptor header containing the descriptor's type and length. */
-			uint8_t                 Subtype; /**< Sub type value used to distinguish between audio class-specific descriptors,
-			                                  *   must be \ref AUDIO_DSUBTYPE_CSInterface_FormatType.
-			                                  */
-
-			uint8_t                 FormatType; /**< Format of the audio stream, see Audio Device Formats specification. */
-			uint8_t                 Channels; /**< Total number of discrete channels in the stream. */
-
-			uint8_t                 SubFrameSize; /**< Size in bytes of each channel's sample data in the stream. */
-			uint8_t                 BitResolution; /**< Bits of resolution of each channel's samples in the stream. */
-
-			uint8_t                 TotalDiscreteSampleRates; /**< Total number of discrete sample frequencies supported by the device. When
-			                                                   *   zero, this must be followed by the lower and upper continuous sampling
-			                                                   *   frequencies supported by the device; otherwise, this must be followed
-			                                                   *   by the given number of discrete sampling frequencies supported.
-			                                                   */
-		} ATTR_PACKED USB_Audio_Descriptor_Format_t;
-
-		/** \brief 24-Bit Audio Frequency Structure.
-		 *
-		 *  Type define for a 24-bit audio sample frequency structure. As GCC does not contain a built in 24-bit datatype,
-		 *  this this structure is used to build up the value instead. Fill this structure with the \ref AUDIO_SAMPLE_FREQ() macro.
-		 *
-		 *  \note Regardless of CPU architecture, these values should be stored as little endian.
-		 */
-		typedef struct
-		{
-			uint8_t Byte1; /**< Lowest 8 bits of the 24-bit value. */
-			uint8_t Byte2; /**< Middle 8 bits of the 24-bit value. */
-			uint8_t Byte3; /**< Upper 8 bits of the 24-bit value. */
-		} ATTR_PACKED USB_Audio_SampleFreq_t;
-
-		/** \brief Audio class-specific Format Descriptor (USB-IF naming conventions).
-		 *
-		 *  Type define for an Audio class-specific audio format descriptor. This is used to give the host full details
-		 *  about the number of channels, the sample resolution, acceptable sample frequencies and encoding method used
-		 *  in the device's audio streams. See the USB Audio specification for more details.
-		 *
-		 *  \attention This descriptor <b>must</b> be followed by one or more 24-bit integer elements containing the continuous
-		 *             or discrete sample frequencies.
-		 *
-		 *  \see \ref USB_Audio_Descriptor_Format_t for the version of this type with non-standard LUFA specific
-		 *       element names.
-		 *
-		 *  \note Regardless of CPU architecture, these values should be stored as little endian.
-		 */
-		typedef struct
-		{
-			uint8_t bLength; /**< Size of the descriptor, in bytes. */
-			uint8_t bDescriptorType; /**< Sub type value used to distinguish between audio class-specific descriptors,
-			                          *   must be \ref AUDIO_DSUBTYPE_CSInterface_FormatType.
-			                          */
-
-			uint8_t bDescriptorSubtype;/**< Sub type value used to distinguish between audio class-specific descriptors,
-			                            *   a value from the \ref Audio_CSInterface_AS_SubTypes_t enum.
-			                            */
-
-			uint8_t bFormatType; /**< Format of the audio stream, see Audio Device Formats specification. */
-			uint8_t bNrChannels; /**< Total number of discrete channels in the stream. */
-
-			uint8_t bSubFrameSize; /**< Size in bytes of each channel's sample data in the stream. */
-			uint8_t bBitResolution; /**< Bits of resolution of each channel's samples in the stream. */
-
-			uint8_t bSampleFrequencyType; /**< Total number of sample frequencies supported by the device. When
-			                               *   zero, this must be followed by the lower and upper continuous sampling
-			                               *   frequencies supported by the device; otherwise, this must be followed
-			                               *   by the given number of discrete sampling frequencies supported.
-			                               */
-		} ATTR_PACKED USB_Audio_StdDescriptor_Format_t;
-
-		/** \brief Audio class-specific Streaming Endpoint Descriptor (LUFA naming conventions).
-		 *
-		 *  Type define for an Audio class-specific endpoint descriptor. This contains a regular endpoint
-		 *  descriptor with a few Audio-class-specific extensions. See the USB Audio specification for more details.
-		 *
-		 *  \see \ref USB_Audio_StdDescriptor_StreamEndpoint_Std_t for the version of this type with standard element names.
-		 *
-		 *  \note Regardless of CPU architecture, these values should be stored as little endian.
-		 */
-		typedef struct
-		{
-			USB_Descriptor_Endpoint_t Endpoint; /**< Standard endpoint descriptor describing the audio endpoint. */
-
-			uint8_t                   Refresh; /**< Always set to zero for Audio class devices. */
-			uint8_t                   SyncEndpointNumber; /**< Endpoint address to send synchronization information to, if needed (zero otherwise). */
-		} ATTR_PACKED USB_Audio_Descriptor_StreamEndpoint_Std_t;
-
-		/** \brief Audio class-specific Streaming Endpoint Descriptor (USB-IF naming conventions).
-		 *
-		 *  Type define for an Audio class-specific endpoint descriptor. This contains a regular endpoint
-		 *  descriptor with a few Audio-class-specific extensions. See the USB Audio specification for more details.
-		 *
-		 *  \see \ref USB_Audio_Descriptor_StreamEndpoint_Std_t for the version of this type with non-standard LUFA specific
-		 *       element names.
-		 *
-		 *  \note Regardless of CPU architecture, these values should be stored as little endian.
-		 */
-		typedef struct
-		{
-			uint8_t  bLength; /**< Size of the descriptor, in bytes. */
-			uint8_t  bDescriptorType; /**< Type of the descriptor, either a value in \ref USB_DescriptorTypes_t or a
-			                           *   value given by the specific class.
-			                           */
-			uint8_t  bEndpointAddress; /**< Logical address of the endpoint within the device for the current
-			                            *   configuration, including direction mask.
-			                            */
-			uint8_t  bmAttributes; /**< Endpoint attributes, comprised of a mask of the endpoint type (\c EP_TYPE_*)
-			                        *   and attributes (\c ENDPOINT_ATTR_*) masks.
-			                        */
-			uint16_t wMaxPacketSize; /**< Size of the endpoint bank, in bytes. This indicates the maximum packet size
-			                          *   that the endpoint can receive at a time.
-			                          */
-			uint8_t  bInterval; /**< Polling interval in milliseconds for the endpoint if it is an INTERRUPT or
-			                     *   ISOCHRONOUS type.
-			                     */
-
-			uint8_t  bRefresh; /**< Always set to zero for Audio class devices. */
-			uint8_t  bSynchAddress; /**< Endpoint address to send synchronization information to, if needed (zero otherwise). */
-		} ATTR_PACKED USB_Audio_StdDescriptor_StreamEndpoint_Std_t;
-
-		/** \brief Audio class-specific Extended Endpoint Descriptor (LUFA naming conventions).
-		 *
-		 *  Type define for an Audio class-specific extended endpoint descriptor. This contains extra information
-		 *  on the usage of endpoints used to stream audio in and out of the USB Audio device, and follows an Audio
-		 *  class-specific extended endpoint descriptor. See the USB Audio specification for more details.
-		 *
-		 *  \see \ref USB_Audio_StdDescriptor_StreamEndpoint_Spc_t for the version of this type with standard element names.
-		 *
-		 *  \note Regardless of CPU architecture, these values should be stored as little endian.
-		 */
-		typedef struct
-		{
-			USB_Descriptor_Header_t Header; /**< Regular descriptor header containing the descriptor's type and length. */
-			uint8_t                 Subtype; /**< Sub type value used to distinguish between audio class-specific descriptors,
-			                                  *   a value from the \ref Audio_CSEndpoint_SubTypes_t enum.
-			                                  */
-
-			uint8_t                 Attributes; /**< Audio class-specific endpoint attributes, such as \ref AUDIO_EP_FULL_PACKETS_ONLY. */
-
-			uint8_t                 LockDelayUnits; /**< Units used for the LockDelay field, see Audio class specification. */
-			uint16_t                LockDelay; /**< Time required to internally lock endpoint's internal clock recovery circuitry. */
-		} ATTR_PACKED USB_Audio_Descriptor_StreamEndpoint_Spc_t;
-
-		/** \brief Audio class-specific Extended Endpoint Descriptor (USB-IF naming conventions).
-		 *
-		 *  Type define for an Audio class-specific extended endpoint descriptor. This contains extra information
-		 *  on the usage of endpoints used to stream audio in and out of the USB Audio device, and follows an Audio
-		 *  class-specific extended endpoint descriptor. See the USB Audio specification for more details.
-		 *
-		 *  \see \ref USB_Audio_Descriptor_StreamEndpoint_Spc_t for the version of this type with non-standard LUFA specific
-		 *       element names.
-		 *
-		 *  \note Regardless of CPU architecture, these values should be stored as little endian.
-		 */
-		typedef struct
-		{
-			uint8_t  bLength; /**< Size of the descriptor, in bytes. */
-			uint8_t  bDescriptorType; /**< Type of the descriptor, either a value in \ref USB_DescriptorTypes_t or a value
-			                           *   given by the specific class.
-			                           */
-
-			uint8_t  bDescriptorSubtype; /**< Sub type value used to distinguish between audio class-specific descriptors,
-			                              *   a value from the \ref Audio_CSEndpoint_SubTypes_t enum.
-			                              */
-
-			uint8_t  bmAttributes; /**< Audio class-specific endpoint attributes, such as \ref AUDIO_EP_FULL_PACKETS_ONLY. */
-
-			uint8_t  bLockDelayUnits; /**< Units used for the LockDelay field, see Audio class specification. */
-			uint16_t wLockDelay; /**< Time required to internally lock endpoint's internal clock recovery circuitry. */
-		} ATTR_PACKED USB_Audio_StdDescriptor_StreamEndpoint_Spc_t;
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Class/Common/CCIDClassCommon.h b/NativePrograms/LUFA/Drivers/USB/Class/Common/CCIDClassCommon.h
deleted file mode 100644
index 722c48d5f4..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Class/Common/CCIDClassCommon.h
+++ /dev/null
@@ -1,293 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-  Copyright 2020  Filipe Rodrigues (filipepazrodrigues [at] gmail [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Common definitions and declarations for the library USB CCID Class driver.
- *
- *  Common definitions and declarations for the library USB CCID Class driver.
- *
- *  \note This file should not be included directly. It is automatically included as needed by the USB module driver
- *        dispatch header located in LUFA/Drivers/USB.h.
- */
-
-/** \ingroup Group_USBClassCCID
- *  \defgroup Group_USBClassCCIDCommon  Common Class Definitions
- *
- *  \section Sec_USBClassCCIDCommon_ModDescription Module Description
- *  Constants, Types and Enum definitions that are common to both Device and Host modes for the USB
- *  CCID Class.
- *
- *  @{
- */
-
-#ifndef _CCID_CLASS_COMMON_H_
-#define _CCID_CLASS_COMMON_H_
-
-	/* Includes: */
-		#include "../../Core/StdDescriptors.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_CCID_DRIVER)
-			#error Do not include this file directly. Include LUFA/Drivers/USB.h instead.
-		#endif
-
-	/* Macros: */
-		#define CCID_CURRENT_SPEC_RELEASE_NUMBER              0x0110
-		#define CCID_VOLTAGESUPPORT_5V                        0
-		#define CCID_VOLTAGESUPPORT_3V                        (1 << 0)
-		#define CCID_VOLTAGESUPPORT_1V8                       (1 << 1)
-
-		#define CCID_PROTOCOLS_T0                             (1 << 0)
-		#define CCID_PROTOCOLS_T1                             (1 << 1)
-
-		#define CCID_PROTOCOLNUM_T0                           0
-		#define CCID_PROTOCOLNUM_T1                           (1 << 0)
-
-		#define CCID_ICCSTATUS_PRESENTANDACTIVE               0
-		#define CCID_ICCSTATUS_PRESENTANDINACTIVE             (1 << 0)
-		#define CCID_ICCSTATUS_NOICCPRESENT                   (1 << 1)
-
-		#define CCID_COMMANDSTATUS_PROCESSEDWITHOUTERROR      0
-		#define CCID_COMMANDSTATUS_ERROR                      1
-		#define CCID_COMMANDSTATUS_FAILED                     (1 << 6)
-		#define CCID_COMMANDSTATUS_TIMEEXTENSIONREQUESTED     (2 << 6)
-		#define CCID_COMMANDSTATUS_RFU                        (3 << 6)
-
-		#define CCID_ERROR_RFU_START                          0x80
-		#define CCID_ERROR_NO_ERROR                           0x80
-		#define CCID_ERROR_NOT_SUPPORTED                      0
-		#define CCID_ERROR_CMD_ABORTED                        0xFF
-		#define CCID_ERROR_CMD_NOT_ABORTED                    0xFF
-
-		#define CCID_ERROR_PARAMETERS_PROTOCOL_NOT_SUPPORTED  0x7
-
-		#define CCID_ERROR_SLOT_NOT_FOUND                     5
-
-		#define CCID_DESCRIPTOR_CLOCK_KHZ(khz)                (khz)
-		#define CCID_DESCRIPTOR_CLOCK_MHZ(mhz)                ((mhz) * 1000)
-
-
-	/* Enums: */
-		/** Enum for possible Class, Subclass and Protocol values of device and interface descriptors relating to the CCID
-		 *  device class.
-		 */
-		enum CCID_Descriptor_ClassSubclassProtocol_t
-		{
-			CCID_CSCP_CCIDClass                         = 0x0b, /**< Descriptor Class value indicating that the device or interface
-			                                                     *   belongs to the CCID class.
-			                                                     */
-			CCID_CSCP_NoSpecificSubclass                = 0x00, /**< Descriptor Subclass value indicating that the device or interface
-			                                                     *   belongs to no specific subclass of the CCID class.
-			                                                     */
-			CCID_CSCP_NoSpecificProtocol                = 0x00, /**< Descriptor Protocol value indicating that the device or interface
-			                                                     *   belongs to no specific protocol of the CCID class.
-			                                                     */
-		};
-
-		/** Enum for possible bulk messages between PC and Reader */
-		enum CCID_BulkOutMessages_t
-		{
-			CCID_PC_to_RDR_IccPowerOn                   = 0x62,
-			CCID_PC_to_RDR_IccPowerOff                  = 0x63,
-			CCID_PC_to_RDR_GetSlotStatus                = 0x65,
-			CCID_PC_to_RDR_XfrBlock                     = 0x6f,
-			CCID_PC_to_RDR_GetParameters                = 0x6c,
-			CCID_PC_to_RDR_ResetParameters              = 0x6d,
-			CCID_PC_to_RDR_SetParameters                = 0x61,
-			CCID_PC_to_RDR_Escape                       = 0x6b,
-			CCID_PC_to_RDR_IccClock                     = 0x6e,
-			CCID_PC_to_RDR_T0APDU                       = 0x6a,
-			CCID_PC_to_RDR_Secure                       = 0x69,
-			CCID_PC_to_RDR_Mechanical                   = 0x71,
-			CCID_PC_to_RDR_Abort                        = 0x72,
-			CCID_PC_to_RDR_SetDataRateAndClockFrequency = 0x73,
-
-			CCID_RDR_to_PC_DataBlock                    = 0x80,
-			CCID_RDR_to_PC_SlotStatus                   = 0x81,
-			CCID_RDR_to_PC_Parameters                   = 0x82,
-			CCID_RDR_to_PC_Escape                       = 0x83,
-			CCID_RDR_to_PC_DataRateAndClockFrequency    = 0x84,
-		};
-
-		/** Enum for the CCID class specific control requests that can be issued by the USB bus host. */
-		enum CCID_ClassRequests_t
-		{
-			CCID_ABORT                                  = 0x1,
-			CCID_GET_CLOCK_FREQUENCIES                  = 0x2,
-			CCID_GET_DATA_RATES                         = 0x3,
-		};
-
-		/** Enum for the CCID class specific descriptor types. */
-		enum CCID_DescriptorTypes_t
-		{
-			CCID_DTYPE_Functional                       = 0x21, /**< CCID class specific Interface functional descriptor. */
-		};
-
-		enum CCID_Features_Auto_t
-		{
-			CCID_Features_Auto_None 					= 0x0,
-			CCID_Features_Auto_ParameterConfiguration	= 0x2,
-			CCID_Features_Auto_ICCActivation			= 0x4,
-			CCID_Features_Auto_VoltageSelection			= 0x8,
-
-			CCID_Features_Auto_ICCClockFrequencyChange	= 0x10,
-			CCID_Features_Auto_ICCBaudRateChange		= 0x20,
-			CCID_Features_Auto_ParameterNegotiation		= 0x40,
-			CCID_Features_Auto_PPS						= 0x80,
-		};
-
-		enum CCID_Features_ExchangeLevel_t
-		{
-			CCID_Features_ExchangeLevel_TPDU  				= 0x00010000,
-			CCID_Features_ExchangeLevel_ShortAPDU 			= 0x00020000,
-			CCID_Features_ExchangeLevel_ShortExtendedAPDU	= 0x00040000
-		};
-
-	/* Type Defines: */
-		typedef struct
-		{
-			USB_Descriptor_Header_t Header; /**< Regular descriptor header containing the descriptor's type and length. */
-
-			uint16_t    CCID;
-			uint8_t     MaxSlotIndex;
-			uint8_t     VoltageSupport;
-			uint32_t    Protocols;
-			uint32_t    DefaultClock;
-			uint32_t    MaximumClock;
-			uint8_t     NumClockSupported;
-			uint32_t    DataRate;
-			uint32_t    MaxDataRate;
-			uint8_t     NumDataRatesSupported;
-			uint32_t    MaxIFSD;
-			uint32_t    SynchProtocols;
-			uint32_t    Mechanical;
-			uint32_t    Features;
-			uint32_t    MaxCCIDMessageLength;
-			uint8_t     ClassGetResponse;
-			uint8_t     ClassEnvelope;
-			uint16_t    LcdLayout;
-			uint8_t     PINSupport;
-			uint8_t     MaxCCIDBusySlots;
-		} ATTR_PACKED USB_CCID_Descriptor_t;
-
-		typedef struct
-		{
-			uint8_t FindexDindex;
-			uint8_t TCCKST0;
-			uint8_t GuardTimeT0;
-			uint8_t WaitingIntegerT0;
-			uint8_t ClockStop;
-		} ATTR_PACKED USB_CCID_ProtocolData_T0_t;
-
-		typedef struct
-		{
-			uint8_t FindexDindex;
-			uint8_t TCCKST1;
-			uint8_t GuardTimeT1;
-			uint8_t WaitingIntegerT1;
-			uint8_t ClockStop;
-			uint8_t FSC;
-			uint8_t NadValue;
-		} ATTR_PACKED USB_CCID_ProtocolData_T1_t;
-
-
-		/** Enum for a common bulk message header. */
-		typedef struct
-		{
-			uint8_t     MessageType;
-			uint32_t    Length;
-			uint8_t     Slot;
-			uint8_t     Seq;
-		} ATTR_PACKED USB_CCID_BulkMessage_Header_t;
-
-		typedef struct
-		{
-			USB_CCID_BulkMessage_Header_t CCIDHeader;
-			uint8_t Status;
-			uint8_t Error;
-			uint8_t ChainParam;
-			uint8_t Data[0];
-		} ATTR_PACKED USB_CCID_RDR_to_PC_DataBlock_t;
-
-		typedef struct
-		{
-			USB_CCID_BulkMessage_Header_t CCIDHeader;
-			uint8_t Status;
-			uint8_t Error;
-			uint8_t ClockStatus;
-		} ATTR_PACKED USB_CCID_RDR_to_PC_SlotStatus_t;
-
-		typedef struct
-		{
-			USB_CCID_BulkMessage_Header_t CCIDHeader;
-			uint8_t Status;
-			uint8_t Error;
-			uint8_t ProtocolNum;
-			union
-			{
-				USB_CCID_ProtocolData_T0_t T0;
-				USB_CCID_ProtocolData_T1_t T1;
-			} ProtocolData;
-		} ATTR_PACKED USB_CCID_RDR_to_PC_Parameters_t;
-
-		typedef struct
-		{
-			USB_CCID_BulkMessage_Header_t CCIDHeader;
-			uint8_t Status;
-			uint8_t Error;
-			uint8_t RFU;
-			uint8_t Data[0];
-		} ATTR_PACKED USB_CCID_RDR_to_PC_Escape_t;
-
-		typedef struct
-		{
-			USB_CCID_BulkMessage_Header_t CCIDHeader;
-			uint8_t Status;
-			uint8_t Error;
-			uint8_t RFU;
-			uint32_t ClockFrequency;
-			uint32_t DataRate;
-		} ATTR_PACKED USB_CCID_RDR_to_PC_DataRateAndClockFrequency_t;
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Class/Common/CDCClassCommon.h b/NativePrograms/LUFA/Drivers/USB/Class/Common/CDCClassCommon.h
deleted file mode 100644
index de39f0e12d..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Class/Common/CDCClassCommon.h
+++ /dev/null
@@ -1,383 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Common definitions and declarations for the library USB CDC Class driver.
- *
- *  Common definitions and declarations for the library USB CDC Class driver.
- *
- *  \note This file should not be included directly. It is automatically included as needed by the USB module driver
- *        dispatch header located in LUFA/Drivers/USB.h.
- */
-
-/** \ingroup Group_USBClassCDC
- *  \defgroup Group_USBClassCDCCommon  Common Class Definitions
- *
- *  \section Sec_USBClassCDCCommon_ModDescription Module Description
- *  Constants, Types and Enum definitions that are common to both Device and Host modes for the USB
- *  CDC Class.
- *
- *  @{
- */
-
-#ifndef _CDC_CLASS_COMMON_H_
-#define _CDC_CLASS_COMMON_H_
-
-	/* Includes: */
-		#include "../../Core/StdDescriptors.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_CDC_DRIVER)
-			#error Do not include this file directly. Include LUFA/Drivers/USB.h instead.
-		#endif
-
-	/* Macros: */
-		/** \name Virtual Control Line Masks */
-		/**@{*/
-		/** Mask for the DTR handshake line for use with the \ref CDC_REQ_SetControlLineState class-specific request
-		 *  from the host, to indicate that the DTR line state should be high.
-		 */
-		#define CDC_CONTROL_LINE_OUT_DTR         (1 << 0)
-
-		/** Mask for the RTS handshake line for use with the \ref CDC_REQ_SetControlLineState class-specific request
-		 *  from the host, to indicate that the RTS line state should be high.
-		 */
-		#define CDC_CONTROL_LINE_OUT_RTS         (1 << 1)
-
-		/** Mask for the DCD handshake line for use with the \ref CDC_NOTIF_SerialState class-specific notification
-		 *  from the device to the host, to indicate that the DCD line state is currently high.
-		 */
-		#define CDC_CONTROL_LINE_IN_DCD          (1 << 0)
-
-		/** Mask for the DSR handshake line for use with the \ref CDC_NOTIF_SerialState class-specific notification
-		 *  from the device to the host, to indicate that the DSR line state is currently high.
-		 */
-		#define CDC_CONTROL_LINE_IN_DSR          (1 << 1)
-
-		/** Mask for the BREAK handshake line for use with the \ref CDC_NOTIF_SerialState class-specific notification
-		 *  from the device to the host, to indicate that the BREAK line state is currently high.
-		 */
-		#define CDC_CONTROL_LINE_IN_BREAK        (1 << 2)
-
-		/** Mask for the RING handshake line for use with the \ref CDC_NOTIF_SerialState class-specific notification
-		 *  from the device to the host, to indicate that the RING line state is currently high.
-		 */
-		#define CDC_CONTROL_LINE_IN_RING         (1 << 3)
-
-		/** Mask for use with the \ref CDC_NOTIF_SerialState class-specific notification from the device to the host,
-		 *  to indicate that a framing error has occurred on the virtual serial port.
-		 */
-		#define CDC_CONTROL_LINE_IN_FRAMEERROR   (1 << 4)
-
-		/** Mask for use with the \ref CDC_NOTIF_SerialState class-specific notification from the device to the host,
-		 *  to indicate that a parity error has occurred on the virtual serial port.
-		 */
-		#define CDC_CONTROL_LINE_IN_PARITYERROR  (1 << 5)
-
-		/** Mask for use with the \ref CDC_NOTIF_SerialState class-specific notification from the device to the host,
-		 *  to indicate that a data overrun error has occurred on the virtual serial port.
-		 */
-		#define CDC_CONTROL_LINE_IN_OVERRUNERROR (1 << 6)
-		/**@}*/
-
-	/* Enums: */
-		/** Enum for possible Class, Subclass and Protocol values of device and interface descriptors relating to the CDC
-		 *  device class.
-		 */
-		enum CDC_Descriptor_ClassSubclassProtocol_t
-		{
-			CDC_CSCP_CDCClass               = 0x02, /**< Descriptor Class value indicating that the device or interface
-			                                         *   belongs to the CDC class.
-			                                         */
-			CDC_CSCP_NoSpecificSubclass     = 0x00, /**< Descriptor Subclass value indicating that the device or interface
-			                                         *   belongs to no specific subclass of the CDC class.
-			                                         */
-			CDC_CSCP_ACMSubclass            = 0x02, /**< Descriptor Subclass value indicating that the device or interface
-			                                         *   belongs to the Abstract Control Model CDC subclass.
-			                                         */
-			CDC_CSCP_ATCommandProtocol      = 0x01, /**< Descriptor Protocol value indicating that the device or interface
-			                                         *   belongs to the AT Command protocol of the CDC class.
-			                                         */
-			CDC_CSCP_NoSpecificProtocol     = 0x00, /**< Descriptor Protocol value indicating that the device or interface
-			                                         *   belongs to no specific protocol of the CDC class.
-			                                         */
-			CDC_CSCP_VendorSpecificProtocol = 0xFF, /**< Descriptor Protocol value indicating that the device or interface
-			                                         *   belongs to a vendor-specific protocol of the CDC class.
-			                                         */
-			CDC_CSCP_CDCDataClass           = 0x0A, /**< Descriptor Class value indicating that the device or interface
-			                                         *   belongs to the CDC Data class.
-			                                         */
-			CDC_CSCP_NoDataSubclass         = 0x00, /**< Descriptor Subclass value indicating that the device or interface
-			                                         *   belongs to no specific subclass of the CDC data class.
-			                                         */
-			CDC_CSCP_NoDataProtocol         = 0x00, /**< Descriptor Protocol value indicating that the device or interface
-			                                         *   belongs to no specific protocol of the CDC data class.
-			                                         */
-		};
-
-		/** Enum for the CDC class specific control requests that can be issued by the USB bus host. */
-		enum CDC_ClassRequests_t
-		{
-			CDC_REQ_SendEncapsulatedCommand = 0x00, /**< CDC class-specific request to send an encapsulated command to the device. */
-			CDC_REQ_GetEncapsulatedResponse = 0x01, /**< CDC class-specific request to retrieve an encapsulated command response from the device. */
-			CDC_REQ_SetLineEncoding         = 0x20, /**< CDC class-specific request to set the current virtual serial port configuration settings. */
-			CDC_REQ_GetLineEncoding         = 0x21, /**< CDC class-specific request to get the current virtual serial port configuration settings. */
-			CDC_REQ_SetControlLineState     = 0x22, /**< CDC class-specific request to set the current virtual serial port handshake line states. */
-			CDC_REQ_SendBreak               = 0x23, /**< CDC class-specific request to send a break to the receiver via the carrier channel. */
-		};
-
-		/** Enum for the CDC class specific notification requests that can be issued by a CDC device to a host. */
-		enum CDC_ClassNotifications_t
-		{
-			CDC_NOTIF_SerialState = 0x20, /**< Notification type constant for a change in the virtual serial port
-			                               *   handshake line states, for use with a \ref USB_Request_Header_t
-			                               *   notification structure when sent to the host via the CDC notification
-			                               *   endpoint.
-			                               */
-		};
-
-		/** Enum for the CDC class specific descriptor types. */
-		enum CDC_DescriptorTypes_t
-		{
-			CDC_DTYPE_CSInterface                     = 0x24, /**< CDC class specific Interface functional descriptor. */
-			CDC_DTYPE_CSEndpoint                      = 0x25, /**< CDC class specific Endpoint functional descriptor. */
-		};
-
-		/** Enum for the CDC class specific interface descriptor subtypes. */
-		enum CDC_DescriptorSubtypes_t
-		{
-			CDC_DSUBTYPE_CSInterface_Header           = 0x00, /**< CDC class specific Header functional descriptor. */
-			CDC_DSUBTYPE_CSInterface_CallManagement   = 0x01, /**< CDC class specific Call Management functional descriptor. */
-			CDC_DSUBTYPE_CSInterface_ACM              = 0x02, /**< CDC class specific Abstract Control Model functional descriptor. */
-			CDC_DSUBTYPE_CSInterface_DirectLine       = 0x03, /**< CDC class specific Direct Line functional descriptor. */
-			CDC_DSUBTYPE_CSInterface_TelephoneRinger  = 0x04, /**< CDC class specific Telephone Ringer functional descriptor. */
-			CDC_DSUBTYPE_CSInterface_TelephoneCall    = 0x05, /**< CDC class specific Telephone Call functional descriptor. */
-			CDC_DSUBTYPE_CSInterface_Union            = 0x06, /**< CDC class specific Union functional descriptor. */
-			CDC_DSUBTYPE_CSInterface_CountrySelection = 0x07, /**< CDC class specific Country Selection functional descriptor. */
-			CDC_DSUBTYPE_CSInterface_TelephoneOpModes = 0x08, /**< CDC class specific Telephone Operation Modes functional descriptor. */
-			CDC_DSUBTYPE_CSInterface_USBTerminal      = 0x09, /**< CDC class specific USB Terminal functional descriptor. */
-			CDC_DSUBTYPE_CSInterface_NetworkChannel   = 0x0A, /**< CDC class specific Network Channel functional descriptor. */
-			CDC_DSUBTYPE_CSInterface_ProtocolUnit     = 0x0B, /**< CDC class specific Protocol Unit functional descriptor. */
-			CDC_DSUBTYPE_CSInterface_ExtensionUnit    = 0x0C, /**< CDC class specific Extension Unit functional descriptor. */
-			CDC_DSUBTYPE_CSInterface_MultiChannel     = 0x0D, /**< CDC class specific Multi-Channel Management functional descriptor. */
-			CDC_DSUBTYPE_CSInterface_CAPI             = 0x0E, /**< CDC class specific Common ISDN API functional descriptor. */
-			CDC_DSUBTYPE_CSInterface_Ethernet         = 0x0F, /**< CDC class specific Ethernet functional descriptor. */
-			CDC_DSUBTYPE_CSInterface_ATM              = 0x10, /**< CDC class specific Asynchronous Transfer Mode functional descriptor. */
-		};
-
-		/** Enum for the possible line encoding formats of a virtual serial port. */
-		enum CDC_LineEncodingFormats_t
-		{
-			CDC_LINEENCODING_OneStopBit          = 0, /**< Each frame contains one stop bit. */
-			CDC_LINEENCODING_OneAndAHalfStopBits = 1, /**< Each frame contains one and a half stop bits. */
-			CDC_LINEENCODING_TwoStopBits         = 2, /**< Each frame contains two stop bits. */
-		};
-
-		/** Enum for the possible line encoding parity settings of a virtual serial port. */
-		enum CDC_LineEncodingParity_t
-		{
-			CDC_PARITY_None  = 0, /**< No parity bit mode on each frame. */
-			CDC_PARITY_Odd   = 1, /**< Odd parity bit mode on each frame. */
-			CDC_PARITY_Even  = 2, /**< Even parity bit mode on each frame. */
-			CDC_PARITY_Mark  = 3, /**< Mark parity bit mode on each frame. */
-			CDC_PARITY_Space = 4, /**< Space parity bit mode on each frame. */
-		};
-
-	/* Type Defines: */
-		/** \brief CDC class-specific Functional Header Descriptor (LUFA naming conventions).
-		 *
-		 *  Type define for a CDC class-specific functional header descriptor. This indicates to the host that the device
-		 *  contains one or more CDC functional data descriptors, which give the CDC interface's capabilities and configuration.
-		 *  See the CDC class specification for more details.
-		 *
-		 *  \see \ref USB_CDC_StdDescriptor_FunctionalHeader_t for the version of this type with standard element names.
-		 *
-		 *  \note Regardless of CPU architecture, these values should be stored as little endian.
-		 */
-		typedef struct
-		{
-			USB_Descriptor_Header_t Header; /**< Regular descriptor header containing the descriptor's type and length. */
-			uint8_t                 Subtype; /**< Sub type value used to distinguish between CDC class-specific descriptors,
-			                                  *   must be \ref CDC_DSUBTYPE_CSInterface_Header.
-			                                  */
-			uint16_t                CDCSpecification; /**< Version number of the CDC specification implemented by the device,
-			                                           *   encoded in BCD format.
-			                                           *
-			                                           *   \see \ref VERSION_BCD() utility macro.
-			                                           */
-		} ATTR_PACKED USB_CDC_Descriptor_FunctionalHeader_t;
-
-		/** \brief CDC class-specific Functional Header Descriptor (USB-IF naming conventions).
-		 *
-		 *  Type define for a CDC class-specific functional header descriptor. This indicates to the host that the device
-		 *  contains one or more CDC functional data descriptors, which give the CDC interface's capabilities and configuration.
-		 *  See the CDC class specification for more details.
-		 *
-		 *  \see \ref USB_CDC_Descriptor_FunctionalHeader_t for the version of this type with non-standard LUFA specific
-		 *       element names.
-		 *
-		 *  \note Regardless of CPU architecture, these values should be stored as little endian.
-		 */
-		typedef struct
-		{
-			uint8_t  bFunctionLength; /**< Size of the descriptor, in bytes. */
-			uint8_t  bDescriptorType; /**< Type of the descriptor, either a value in \ref USB_DescriptorTypes_t or a value
-			                           *   given by the specific class.
-			                           */
-			uint8_t  bDescriptorSubType; /**< Sub type value used to distinguish between CDC class-specific descriptors,
-			                              *   must be \ref CDC_DSUBTYPE_CSInterface_Header.
-			                              */
-			uint16_t bcdCDC; /**< Version number of the CDC specification implemented by the device, encoded in BCD format.
-			                  *
-			                  *   \see \ref VERSION_BCD() utility macro.
-			                  */
-		} ATTR_PACKED USB_CDC_StdDescriptor_FunctionalHeader_t;
-
-		/** \brief CDC class-specific Functional ACM Descriptor (LUFA naming conventions).
-		 *
-		 *  Type define for a CDC class-specific functional ACM descriptor. This indicates to the host that the CDC interface
-		 *  supports the CDC ACM subclass of the CDC specification. See the CDC class specification for more details.
-		 *
-		 *  \see \ref USB_CDC_StdDescriptor_FunctionalACM_t for the version of this type with standard element names.
-		 *
-		 *  \note Regardless of CPU architecture, these values should be stored as little endian.
-		 */
-		typedef struct
-		{
-			USB_Descriptor_Header_t Header; /**< Regular descriptor header containing the descriptor's type and length. */
-			uint8_t                 Subtype; /**< Sub type value used to distinguish between CDC class-specific descriptors,
-			                                  *   must be \ref CDC_DSUBTYPE_CSInterface_ACM.
-			                                  */
-			uint8_t                 Capabilities; /**< Capabilities of the ACM interface, given as a bit mask. For most devices,
-			                                       *   this should be set to a fixed value of \c 0x06 - for other capabilities, refer
-			                                       *   to the CDC ACM specification.
-			                                       */
-		} ATTR_PACKED USB_CDC_Descriptor_FunctionalACM_t;
-
-		/** \brief CDC class-specific Functional ACM Descriptor (USB-IF naming conventions).
-		 *
-		 *  Type define for a CDC class-specific functional ACM descriptor. This indicates to the host that the CDC interface
-		 *  supports the CDC ACM subclass of the CDC specification. See the CDC class specification for more details.
-		 *
-		 *  \see \ref USB_CDC_Descriptor_FunctionalACM_t for the version of this type with non-standard LUFA specific
-		 *       element names.
-		 *
-		 *  \note Regardless of CPU architecture, these values should be stored as little endian.
-		 */
-		typedef struct
-		{
-			uint8_t bFunctionLength; /**< Size of the descriptor, in bytes. */
-			uint8_t bDescriptorType; /**< Type of the descriptor, either a value in \ref USB_DescriptorTypes_t or a value
-			                          *   given by the specific class.
-			                          */
-			uint8_t bDescriptorSubType; /**< Sub type value used to distinguish between CDC class-specific descriptors,
-			                             *   must be \ref CDC_DSUBTYPE_CSInterface_ACM.
-			                             */
-			uint8_t bmCapabilities; /**< Capabilities of the ACM interface, given as a bit mask. For most devices,
-			                         *   this should be set to a fixed value of 0x06 - for other capabilities, refer
-			                         *   to the CDC ACM specification.
-			                         */
-		} ATTR_PACKED USB_CDC_StdDescriptor_FunctionalACM_t;
-
-		/** \brief CDC class-specific Functional Union Descriptor (LUFA naming conventions).
-		 *
-		 *  Type define for a CDC class-specific functional Union descriptor. This indicates to the host that specific
-		 *  CDC control and data interfaces are related. See the CDC class specification for more details.
-		 *
-		 *  \see \ref USB_CDC_StdDescriptor_FunctionalUnion_t for the version of this type with standard element names.
-		 *
-		 *  \note Regardless of CPU architecture, these values should be stored as little endian.
-		 */
-		typedef struct
-		{
-			USB_Descriptor_Header_t Header; /**< Regular descriptor header containing the descriptor's type and length. */
-			uint8_t                 Subtype; /**< Sub type value used to distinguish between CDC class-specific descriptors,
-			                                  *   must be \ref CDC_DSUBTYPE_CSInterface_Union.
-			                                  */
-			uint8_t                 MasterInterfaceNumber; /**< Interface number of the CDC Control interface. */
-			uint8_t                 SlaveInterfaceNumber; /**< Interface number of the CDC Data interface. */
-		} ATTR_PACKED USB_CDC_Descriptor_FunctionalUnion_t;
-
-		/** \brief CDC class-specific Functional Union Descriptor (USB-IF naming conventions).
-		 *
-		 *  Type define for a CDC class-specific functional Union descriptor. This indicates to the host that specific
-		 *  CDC control and data interfaces are related. See the CDC class specification for more details.
-		 *
-		 *  \see \ref USB_CDC_Descriptor_FunctionalUnion_t for the version of this type with non-standard LUFA specific
-		 *       element names.
-		 *
-		 *  \note Regardless of CPU architecture, these values should be stored as little endian.
-		 */
-		typedef struct
-		{
-			uint8_t bFunctionLength; /**< Size of the descriptor, in bytes. */
-			uint8_t bDescriptorType; /**< Type of the descriptor, either a value in \ref USB_DescriptorTypes_t or a value
-			                          *   given by the specific class.
-			                          */
-			uint8_t bDescriptorSubType; /**< Sub type value used to distinguish between CDC class-specific descriptors,
-			                             *   must be \ref CDC_DSUBTYPE_CSInterface_Union.
-			                             */
-			uint8_t bMasterInterface; /**< Interface number of the CDC Control interface. */
-			uint8_t bSlaveInterface0; /**< Interface number of the CDC Data interface. */
-		} ATTR_PACKED USB_CDC_StdDescriptor_FunctionalUnion_t;
-
-		/** \brief CDC Virtual Serial Port Line Encoding Settings Structure.
-		 *
-		 *  Type define for a CDC Line Encoding structure, used to hold the various encoding parameters for a virtual
-		 *  serial port.
-		 *
-		 *  \note Regardless of CPU architecture, these values should be stored as little endian.
-		 */
-		typedef struct
-		{
-			uint32_t BaudRateBPS; /**< Baud rate of the virtual serial port, in bits per second. */
-			uint8_t  CharFormat; /**< Character format of the virtual serial port, a value from the
-								  *   \ref CDC_LineEncodingFormats_t enum.
-								  */
-			uint8_t  ParityType; /**< Parity setting of the virtual serial port, a value from the
-								  *   \ref CDC_LineEncodingParity_t enum.
-								  */
-			uint8_t  DataBits; /**< Bits of data per character of the virtual serial port. */
-		} ATTR_PACKED CDC_LineEncoding_t;
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Class/Common/HIDClassCommon.h b/NativePrograms/LUFA/Drivers/USB/Class/Common/HIDClassCommon.h
deleted file mode 100644
index 74706f1f72..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Class/Common/HIDClassCommon.h
+++ /dev/null
@@ -1,682 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Common definitions and declarations for the library USB HID Class driver.
- *
- *  Common definitions and declarations for the library USB HID Class driver.
- *
- *  \note This file should not be included directly. It is automatically included as needed by the USB module driver
- *        dispatch header located in LUFA/Drivers/USB.h.
- */
-
-/** \ingroup Group_USBClassHID
- *  \defgroup Group_USBClassHIDCommon  Common Class Definitions
- *
- *  \section Sec_USBClassHIDCommon_ModDescription Module Description
- *  Constants, Types and Enum definitions that are common to both Device and Host modes for the USB
- *  HID Class.
- *
- *  @{
- */
-
-#ifndef _HID_CLASS_COMMON_H_
-#define _HID_CLASS_COMMON_H_
-
-	/* Includes: */
-		#include "../../Core/StdDescriptors.h"
-		#include "HIDParser.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_HID_DRIVER)
-			#error Do not include this file directly. Include LUFA/Drivers/USB.h instead.
-		#endif
-
-	/* Macros: */
-		/** \name Keyboard Standard Report Modifier Masks */
-		/**@{*/
-		/** Constant for a keyboard report modifier byte, indicating that the keyboard's left control key is currently pressed. */
-		#define HID_KEYBOARD_MODIFIER_LEFTCTRL                    (1 << 0)
-
-		/** Constant for a keyboard report modifier byte, indicating that the keyboard's left shift key is currently pressed. */
-		#define HID_KEYBOARD_MODIFIER_LEFTSHIFT                   (1 << 1)
-
-		/** Constant for a keyboard report modifier byte, indicating that the keyboard's left alt key is currently pressed. */
-		#define HID_KEYBOARD_MODIFIER_LEFTALT                     (1 << 2)
-
-		/** Constant for a keyboard report modifier byte, indicating that the keyboard's left GUI key is currently pressed. */
-		#define HID_KEYBOARD_MODIFIER_LEFTGUI                     (1 << 3)
-
-		/** Constant for a keyboard report modifier byte, indicating that the keyboard's right control key is currently pressed. */
-		#define HID_KEYBOARD_MODIFIER_RIGHTCTRL                   (1 << 4)
-
-		/** Constant for a keyboard report modifier byte, indicating that the keyboard's right shift key is currently pressed. */
-		#define HID_KEYBOARD_MODIFIER_RIGHTSHIFT                  (1 << 5)
-
-		/** Constant for a keyboard report modifier byte, indicating that the keyboard's right alt key is currently pressed. */
-		#define HID_KEYBOARD_MODIFIER_RIGHTALT                    (1 << 6)
-
-		/** Constant for a keyboard report modifier byte, indicating that the keyboard's right GUI key is currently pressed. */
-		#define HID_KEYBOARD_MODIFIER_RIGHTGUI                    (1 << 7)
-		/**@}*/
-
-		/** \name Keyboard Standard Report LED Masks */
-		/**@{*/
-		/** Constant for a keyboard output report LED byte, indicating that the host's NUM LOCK mode is currently set. */
-		#define HID_KEYBOARD_LED_NUMLOCK                          (1 << 0)
-
-		/** Constant for a keyboard output report LED byte, indicating that the host's CAPS LOCK mode is currently set. */
-		#define HID_KEYBOARD_LED_CAPSLOCK                         (1 << 1)
-
-		/** Constant for a keyboard output report LED byte, indicating that the host's SCROLL LOCK mode is currently set. */
-		#define HID_KEYBOARD_LED_SCROLLLOCK                       (1 << 2)
-
-		/** Constant for a keyboard output report LED byte, indicating that the host's COMPOSE mode is currently set. */
-		#define HID_KEYBOARD_LED_COMPOSE                          (1 << 3)
-
-		/** Constant for a keyboard output report LED byte, indicating that the host's KANA mode is currently set. */
-		#define HID_KEYBOARD_LED_KANA                             (1 << 4)
-		/**@}*/
-
-		/** \name Keyboard Standard Report Key Scan-codes */
-		/**@{*/
-		#define HID_KEYBOARD_SC_RESERVED                          0x00
-		#define HID_KEYBOARD_SC_ERROR_ROLLOVER                    0x01
-		#define HID_KEYBOARD_SC_POST_FAIL                         0x02
-		#define HID_KEYBOARD_SC_ERROR_UNDEFINED                   0x03
-		#define HID_KEYBOARD_SC_A                                 0x04
-		#define HID_KEYBOARD_SC_B                                 0x05
-		#define HID_KEYBOARD_SC_C                                 0x06
-		#define HID_KEYBOARD_SC_D                                 0x07
-		#define HID_KEYBOARD_SC_E                                 0x08
-		#define HID_KEYBOARD_SC_F                                 0x09
-		#define HID_KEYBOARD_SC_G                                 0x0A
-		#define HID_KEYBOARD_SC_H                                 0x0B
-		#define HID_KEYBOARD_SC_I                                 0x0C
-		#define HID_KEYBOARD_SC_J                                 0x0D
-		#define HID_KEYBOARD_SC_K                                 0x0E
-		#define HID_KEYBOARD_SC_L                                 0x0F
-		#define HID_KEYBOARD_SC_M                                 0x10
-		#define HID_KEYBOARD_SC_N                                 0x11
-		#define HID_KEYBOARD_SC_O                                 0x12
-		#define HID_KEYBOARD_SC_P                                 0x13
-		#define HID_KEYBOARD_SC_Q                                 0x14
-		#define HID_KEYBOARD_SC_R                                 0x15
-		#define HID_KEYBOARD_SC_S                                 0x16
-		#define HID_KEYBOARD_SC_T                                 0x17
-		#define HID_KEYBOARD_SC_U                                 0x18
-		#define HID_KEYBOARD_SC_V                                 0x19
-		#define HID_KEYBOARD_SC_W                                 0x1A
-		#define HID_KEYBOARD_SC_X                                 0x1B
-		#define HID_KEYBOARD_SC_Y                                 0x1C
-		#define HID_KEYBOARD_SC_Z                                 0x1D
-		#define HID_KEYBOARD_SC_1_AND_EXCLAMATION                 0x1E
-		#define HID_KEYBOARD_SC_2_AND_AT                          0x1F
-		#define HID_KEYBOARD_SC_3_AND_HASHMARK                    0x20
-		#define HID_KEYBOARD_SC_4_AND_DOLLAR                      0x21
-		#define HID_KEYBOARD_SC_5_AND_PERCENTAGE                  0x22
-		#define HID_KEYBOARD_SC_6_AND_CARET                       0x23
-		#define HID_KEYBOARD_SC_7_AND_AMPERSAND                   0x24
-		#define HID_KEYBOARD_SC_8_AND_ASTERISK                    0x25
-		#define HID_KEYBOARD_SC_9_AND_OPENING_PARENTHESIS         0x26
-		#define HID_KEYBOARD_SC_0_AND_CLOSING_PARENTHESIS         0x27
-		#define HID_KEYBOARD_SC_ENTER                             0x28
-		#define HID_KEYBOARD_SC_ESCAPE                            0x29
-		#define HID_KEYBOARD_SC_BACKSPACE                         0x2A
-		#define HID_KEYBOARD_SC_TAB                               0x2B
-		#define HID_KEYBOARD_SC_SPACE                             0x2C
-		#define HID_KEYBOARD_SC_MINUS_AND_UNDERSCORE              0x2D
-		#define HID_KEYBOARD_SC_EQUAL_AND_PLUS                    0x2E
-		#define HID_KEYBOARD_SC_OPENING_BRACKET_AND_OPENING_BRACE 0x2F
-		#define HID_KEYBOARD_SC_CLOSING_BRACKET_AND_CLOSING_BRACE 0x30
-		#define HID_KEYBOARD_SC_BACKSLASH_AND_PIPE                0x31
-		#define HID_KEYBOARD_SC_NON_US_HASHMARK_AND_TILDE         0x32
-		#define HID_KEYBOARD_SC_SEMICOLON_AND_COLON               0x33
-		#define HID_KEYBOARD_SC_APOSTROPHE_AND_QUOTE              0x34
-		#define HID_KEYBOARD_SC_GRAVE_ACCENT_AND_TILDE            0x35
-		#define HID_KEYBOARD_SC_COMMA_AND_LESS_THAN_SIGN          0x36
-		#define HID_KEYBOARD_SC_DOT_AND_GREATER_THAN_SIGN         0x37
-		#define HID_KEYBOARD_SC_SLASH_AND_QUESTION_MARK           0x38
-		#define HID_KEYBOARD_SC_CAPS_LOCK                         0x39
-		#define HID_KEYBOARD_SC_F1                                0x3A
-		#define HID_KEYBOARD_SC_F2                                0x3B
-		#define HID_KEYBOARD_SC_F3                                0x3C
-		#define HID_KEYBOARD_SC_F4                                0x3D
-		#define HID_KEYBOARD_SC_F5                                0x3E
-		#define HID_KEYBOARD_SC_F6                                0x3F
-		#define HID_KEYBOARD_SC_F7                                0x40
-		#define HID_KEYBOARD_SC_F8                                0x41
-		#define HID_KEYBOARD_SC_F9                                0x42
-		#define HID_KEYBOARD_SC_F10                               0x43
-		#define HID_KEYBOARD_SC_F11                               0x44
-		#define HID_KEYBOARD_SC_F12                               0x45
-		#define HID_KEYBOARD_SC_PRINT_SCREEN                      0x46
-		#define HID_KEYBOARD_SC_SCROLL_LOCK                       0x47
-		#define HID_KEYBOARD_SC_PAUSE                             0x48
-		#define HID_KEYBOARD_SC_INSERT                            0x49
-		#define HID_KEYBOARD_SC_HOME                              0x4A
-		#define HID_KEYBOARD_SC_PAGE_UP                           0x4B
-		#define HID_KEYBOARD_SC_DELETE                            0x4C
-		#define HID_KEYBOARD_SC_END                               0x4D
-		#define HID_KEYBOARD_SC_PAGE_DOWN                         0x4E
-		#define HID_KEYBOARD_SC_RIGHT_ARROW                       0x4F
-		#define HID_KEYBOARD_SC_LEFT_ARROW                        0x50
-		#define HID_KEYBOARD_SC_DOWN_ARROW                        0x51
-		#define HID_KEYBOARD_SC_UP_ARROW                          0x52
-		#define HID_KEYBOARD_SC_NUM_LOCK                          0x53
-		#define HID_KEYBOARD_SC_KEYPAD_SLASH                      0x54
-		#define HID_KEYBOARD_SC_KEYPAD_ASTERISK                   0x55
-		#define HID_KEYBOARD_SC_KEYPAD_MINUS                      0x56
-		#define HID_KEYBOARD_SC_KEYPAD_PLUS                       0x57
-		#define HID_KEYBOARD_SC_KEYPAD_ENTER                      0x58
-		#define HID_KEYBOARD_SC_KEYPAD_1_AND_END                  0x59
-		#define HID_KEYBOARD_SC_KEYPAD_2_AND_DOWN_ARROW           0x5A
-		#define HID_KEYBOARD_SC_KEYPAD_3_AND_PAGE_DOWN            0x5B
-		#define HID_KEYBOARD_SC_KEYPAD_4_AND_LEFT_ARROW           0x5C
-		#define HID_KEYBOARD_SC_KEYPAD_5                          0x5D
-		#define HID_KEYBOARD_SC_KEYPAD_6_AND_RIGHT_ARROW          0x5E
-		#define HID_KEYBOARD_SC_KEYPAD_7_AND_HOME                 0x5F
-		#define HID_KEYBOARD_SC_KEYPAD_8_AND_UP_ARROW             0x60
-		#define HID_KEYBOARD_SC_KEYPAD_9_AND_PAGE_UP              0x61
-		#define HID_KEYBOARD_SC_KEYPAD_0_AND_INSERT               0x62
-		#define HID_KEYBOARD_SC_KEYPAD_DOT_AND_DELETE             0x63
-		#define HID_KEYBOARD_SC_NON_US_BACKSLASH_AND_PIPE         0x64
-		#define HID_KEYBOARD_SC_APPLICATION                       0x65
-		#define HID_KEYBOARD_SC_POWER                             0x66
-		#define HID_KEYBOARD_SC_KEYPAD_EQUAL_SIGN                 0x67
-		#define HID_KEYBOARD_SC_F13                               0x68
-		#define HID_KEYBOARD_SC_F14                               0x69
-		#define HID_KEYBOARD_SC_F15                               0x6A
-		#define HID_KEYBOARD_SC_F16                               0x6B
-		#define HID_KEYBOARD_SC_F17                               0x6C
-		#define HID_KEYBOARD_SC_F18                               0x6D
-		#define HID_KEYBOARD_SC_F19                               0x6E
-		#define HID_KEYBOARD_SC_F20                               0x6F
-		#define HID_KEYBOARD_SC_F21                               0x70
-		#define HID_KEYBOARD_SC_F22                               0x71
-		#define HID_KEYBOARD_SC_F23                               0x72
-		#define HID_KEYBOARD_SC_F24                               0x73
-		#define HID_KEYBOARD_SC_EXECUTE                           0x74
-		#define HID_KEYBOARD_SC_HELP                              0x75
-		#define HID_KEYBOARD_SC_MENU                              0x76
-		#define HID_KEYBOARD_SC_SELECT                            0x77
-		#define HID_KEYBOARD_SC_STOP                              0x78
-		#define HID_KEYBOARD_SC_AGAIN                             0x79
-		#define HID_KEYBOARD_SC_UNDO                              0x7A
-		#define HID_KEYBOARD_SC_CUT                               0x7B
-		#define HID_KEYBOARD_SC_COPY                              0x7C
-		#define HID_KEYBOARD_SC_PASTE                             0x7D
-		#define HID_KEYBOARD_SC_FIND                              0x7E
-		#define HID_KEYBOARD_SC_MUTE                              0x7F
-		#define HID_KEYBOARD_SC_VOLUME_UP                         0x80
-		#define HID_KEYBOARD_SC_VOLUME_DOWN                       0x81
-		#define HID_KEYBOARD_SC_LOCKING_CAPS_LOCK                 0x82
-		#define HID_KEYBOARD_SC_LOCKING_NUM_LOCK                  0x83
-		#define HID_KEYBOARD_SC_LOCKING_SCROLL_LOCK               0x84
-		#define HID_KEYBOARD_SC_KEYPAD_COMMA                      0x85
-		#define HID_KEYBOARD_SC_KEYPAD_EQUAL_SIGN_AS400           0x86
-		#define HID_KEYBOARD_SC_INTERNATIONAL1                    0x87
-		#define HID_KEYBOARD_SC_INTERNATIONAL2                    0x88
-		#define HID_KEYBOARD_SC_INTERNATIONAL3                    0x89
-		#define HID_KEYBOARD_SC_INTERNATIONAL4                    0x8A
-		#define HID_KEYBOARD_SC_INTERNATIONAL5                    0x8B
-		#define HID_KEYBOARD_SC_INTERNATIONAL6                    0x8C
-		#define HID_KEYBOARD_SC_INTERNATIONAL7                    0x8D
-		#define HID_KEYBOARD_SC_INTERNATIONAL8                    0x8E
-		#define HID_KEYBOARD_SC_INTERNATIONAL9                    0x8F
-		#define HID_KEYBOARD_SC_LANG1                             0x90
-		#define HID_KEYBOARD_SC_LANG2                             0x91
-		#define HID_KEYBOARD_SC_LANG3                             0x92
-		#define HID_KEYBOARD_SC_LANG4                             0x93
-		#define HID_KEYBOARD_SC_LANG5                             0x94
-		#define HID_KEYBOARD_SC_LANG6                             0x95
-		#define HID_KEYBOARD_SC_LANG7                             0x96
-		#define HID_KEYBOARD_SC_LANG8                             0x97
-		#define HID_KEYBOARD_SC_LANG9                             0x98
-		#define HID_KEYBOARD_SC_ALTERNATE_ERASE                   0x99
-		#define HID_KEYBOARD_SC_SYSREQ                            0x9A
-		#define HID_KEYBOARD_SC_CANCEL                            0x9B
-		#define HID_KEYBOARD_SC_CLEAR                             0x9C
-		#define HID_KEYBOARD_SC_PRIOR                             0x9D
-		#define HID_KEYBOARD_SC_RETURN                            0x9E
-		#define HID_KEYBOARD_SC_SEPARATOR                         0x9F
-		#define HID_KEYBOARD_SC_OUT                               0xA0
-		#define HID_KEYBOARD_SC_OPER                              0xA1
-		#define HID_KEYBOARD_SC_CLEAR_AND_AGAIN                   0xA2
-		#define HID_KEYBOARD_SC_CRSEL_AND_PROPS                   0xA3
-		#define HID_KEYBOARD_SC_EXSEL                             0xA4
-		#define HID_KEYBOARD_SC_KEYPAD_00                         0xB0
-		#define HID_KEYBOARD_SC_KEYPAD_000                        0xB1
-		#define HID_KEYBOARD_SC_THOUSANDS_SEPARATOR               0xB2
-		#define HID_KEYBOARD_SC_DECIMAL_SEPARATOR                 0xB3
-		#define HID_KEYBOARD_SC_CURRENCY_UNIT                     0xB4
-		#define HID_KEYBOARD_SC_CURRENCY_SUB_UNIT                 0xB5
-		#define HID_KEYBOARD_SC_KEYPAD_OPENING_PARENTHESIS        0xB6
-		#define HID_KEYBOARD_SC_KEYPAD_CLOSING_PARENTHESIS        0xB7
-		#define HID_KEYBOARD_SC_KEYPAD_OPENING_BRACE              0xB8
-		#define HID_KEYBOARD_SC_KEYPAD_CLOSING_BRACE              0xB9
-		#define HID_KEYBOARD_SC_KEYPAD_TAB                        0xBA
-		#define HID_KEYBOARD_SC_KEYPAD_BACKSPACE                  0xBB
-		#define HID_KEYBOARD_SC_KEYPAD_A                          0xBC
-		#define HID_KEYBOARD_SC_KEYPAD_B                          0xBD
-		#define HID_KEYBOARD_SC_KEYPAD_C                          0xBE
-		#define HID_KEYBOARD_SC_KEYPAD_D                          0xBF
-		#define HID_KEYBOARD_SC_KEYPAD_E                          0xC0
-		#define HID_KEYBOARD_SC_KEYPAD_F                          0xC1
-		#define HID_KEYBOARD_SC_KEYPAD_XOR                        0xC2
-		#define HID_KEYBOARD_SC_KEYPAD_CARET                      0xC3
-		#define HID_KEYBOARD_SC_KEYPAD_PERCENTAGE                 0xC4
-		#define HID_KEYBOARD_SC_KEYPAD_LESS_THAN_SIGN             0xC5
-		#define HID_KEYBOARD_SC_KEYPAD_GREATER_THAN_SIGN          0xC6
-		#define HID_KEYBOARD_SC_KEYPAD_AMP                        0xC7
-		#define HID_KEYBOARD_SC_KEYPAD_AMP_AMP                    0xC8
-		#define HID_KEYBOARD_SC_KEYPAD_PIPE                       0xC9
-		#define HID_KEYBOARD_SC_KEYPAD_PIPE_PIPE                  0xCA
-		#define HID_KEYBOARD_SC_KEYPAD_COLON                      0xCB
-		#define HID_KEYBOARD_SC_KEYPAD_HASHMARK                   0xCC
-		#define HID_KEYBOARD_SC_KEYPAD_SPACE                      0xCD
-		#define HID_KEYBOARD_SC_KEYPAD_AT                         0xCE
-		#define HID_KEYBOARD_SC_KEYPAD_EXCLAMATION_SIGN           0xCF
-		#define HID_KEYBOARD_SC_KEYPAD_MEMORY_STORE               0xD0
-		#define HID_KEYBOARD_SC_KEYPAD_MEMORY_RECALL              0xD1
-		#define HID_KEYBOARD_SC_KEYPAD_MEMORY_CLEAR               0xD2
-		#define HID_KEYBOARD_SC_KEYPAD_MEMORY_ADD                 0xD3
-		#define HID_KEYBOARD_SC_KEYPAD_MEMORY_SUBTRACT            0xD4
-		#define HID_KEYBOARD_SC_KEYPAD_MEMORY_MULTIPLY            0xD5
-		#define HID_KEYBOARD_SC_KEYPAD_MEMORY_DIVIDE              0xD6
-		#define HID_KEYBOARD_SC_KEYPAD_PLUS_AND_MINUS             0xD7
-		#define HID_KEYBOARD_SC_KEYPAD_CLEAR                      0xD8
-		#define HID_KEYBOARD_SC_KEYPAD_CLEAR_ENTRY                0xD9
-		#define HID_KEYBOARD_SC_KEYPAD_BINARY                     0xDA
-		#define HID_KEYBOARD_SC_KEYPAD_OCTAL                      0xDB
-		#define HID_KEYBOARD_SC_KEYPAD_DECIMAL                    0xDC
-		#define HID_KEYBOARD_SC_KEYPAD_HEXADECIMAL                0xDD
-		#define HID_KEYBOARD_SC_LEFT_CONTROL                      0xE0
-		#define HID_KEYBOARD_SC_LEFT_SHIFT                        0xE1
-		#define HID_KEYBOARD_SC_LEFT_ALT                          0xE2
-		#define HID_KEYBOARD_SC_LEFT_GUI                          0xE3
-		#define HID_KEYBOARD_SC_RIGHT_CONTROL                     0xE4
-		#define HID_KEYBOARD_SC_RIGHT_SHIFT                       0xE5
-		#define HID_KEYBOARD_SC_RIGHT_ALT                         0xE6
-		#define HID_KEYBOARD_SC_RIGHT_GUI                         0xE7
-		#define HID_KEYBOARD_SC_MEDIA_PLAY                        0xE8
-		#define HID_KEYBOARD_SC_MEDIA_STOP                        0xE9
-		#define HID_KEYBOARD_SC_MEDIA_PREVIOUS_TRACK              0xEA
-		#define HID_KEYBOARD_SC_MEDIA_NEXT_TRACK                  0xEB
-		#define HID_KEYBOARD_SC_MEDIA_EJECT                       0xEC
-		#define HID_KEYBOARD_SC_MEDIA_VOLUME_UP                   0xED
-		#define HID_KEYBOARD_SC_MEDIA_VOLUME_DOWN                 0xEE
-		#define HID_KEYBOARD_SC_MEDIA_MUTE                        0xEF
-		#define HID_KEYBOARD_SC_MEDIA_WWW                         0xF0
-		#define HID_KEYBOARD_SC_MEDIA_BACKWARD                    0xF1
-		#define HID_KEYBOARD_SC_MEDIA_FORWARD                     0xF2
-		#define HID_KEYBOARD_SC_MEDIA_CANCEL                      0xF3
-		#define HID_KEYBOARD_SC_MEDIA_SEARCH                      0xF4
-		#define HID_KEYBOARD_SC_MEDIA_SLEEP                       0xF8
-		#define HID_KEYBOARD_SC_MEDIA_LOCK                        0xF9
-		#define HID_KEYBOARD_SC_MEDIA_RELOAD                      0xFA
-		#define HID_KEYBOARD_SC_MEDIA_CALCULATOR                  0xFB
-		/**@}*/
-
-		/** \name Common HID Device Report Descriptors */
-		/**@{*/
-		/** \hideinitializer
-		 *  A list of HID report item array elements that describe a typical HID USB Joystick. The resulting report
-		 *  descriptor is structured according to the following layout:
-		 *
-		 *  \code
-		 *  struct
-		 *  {
-		 *      intA_t X; // Signed X axis value
-		 *      intA_t Y; // Signed Y axis value
-		 *      intA_t Z; // Signed Z axis value
-		 *      uintB_t Buttons; // Pressed buttons bitmask
-		 *  } Joystick_Report;
-		 *  \endcode
-		 *
-		 *  Where \c uintA_t is a type large enough to hold the ranges of the signed \c MinAxisVal and \c MaxAxisVal values,
-		 *  and \c intB_t is a type large enough to hold one bit per button.
-		 *
-		 *  \param[in] MinAxisVal      Minimum logical axis value (16-bit).
-		 *  \param[in] MaxAxisVal      Maximum logical axis value (16-bit).
-		 *  \param[in] MinPhysicalVal  Minimum physical axis value, for movement resolution calculations (16-bit).
-		 *  \param[in] MaxPhysicalVal  Maximum physical axis value, for movement resolution calculations (16-bit).
-		 *  \param[in] Buttons         Total number of buttons in the device (8-bit).
-		 */
-		#define HID_DESCRIPTOR_JOYSTICK(MinAxisVal, MaxAxisVal, MinPhysicalVal, MaxPhysicalVal, Buttons) \
-			HID_RI_USAGE_PAGE(8, 0x01),                     \
-			HID_RI_USAGE(8, 0x04),                          \
-			HID_RI_COLLECTION(8, 0x01),                     \
-				HID_RI_USAGE(8, 0x01),                      \
-				HID_RI_COLLECTION(8, 0x00),                 \
-					HID_RI_USAGE(8, 0x30),                  \
-					HID_RI_USAGE(8, 0x31),                  \
-					HID_RI_USAGE(8, 0x32),                  \
-					HID_RI_LOGICAL_MINIMUM(16, MinAxisVal), \
-					HID_RI_LOGICAL_MAXIMUM(16, MaxAxisVal), \
-					HID_RI_PHYSICAL_MINIMUM(16, MinPhysicalVal), \
-					HID_RI_PHYSICAL_MAXIMUM(16, MaxPhysicalVal), \
-					HID_RI_REPORT_COUNT(8, 3),              \
-					HID_RI_REPORT_SIZE(8, (((MinAxisVal >= -128) && (MaxAxisVal <= 127)) ? 8 : 16)), \
-					HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE), \
-				HID_RI_END_COLLECTION(0),                   \
-				HID_RI_USAGE_PAGE(8, 0x09),                 \
-				HID_RI_USAGE_MINIMUM(8, 0x01),              \
-				HID_RI_USAGE_MAXIMUM(8, Buttons),           \
-				HID_RI_LOGICAL_MINIMUM(8, 0x00),            \
-				HID_RI_LOGICAL_MAXIMUM(8, 0x01),            \
-				HID_RI_REPORT_SIZE(8, 0x01),                \
-				HID_RI_REPORT_COUNT(8, Buttons),            \
-				HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE), \
-				HID_RI_REPORT_SIZE(8, (Buttons % 8) ? (8 - (Buttons % 8)) : 0), \
-				HID_RI_REPORT_COUNT(8, 0x01),               \
-				HID_RI_INPUT(8, HID_IOF_CONSTANT),          \
-			HID_RI_END_COLLECTION(0)
-
-		/** \hideinitializer
-		 *  A list of HID report item array elements that describe a typical HID USB keyboard. The resulting report descriptor
-		 *  is compatible with \ref USB_KeyboardReport_Data_t when \c MaxKeys is equal to 6. For other values, the report will
-		 *  be structured according to the following layout:
-		 *
-		 *  \code
-		 *  struct
-		 *  {
-		 *      uint8_t Modifier; // Keyboard modifier byte indicating pressed modifier keys (\c HID_KEYBOARD_MODIFER_* masks)
-		 *      uint8_t Reserved; // Reserved for OEM use, always set to 0.
-		 *      uint8_t KeyCode[MaxKeys]; // Length determined by the number of keys that can be reported
-		 *  } Keyboard_Report;
-		 *  \endcode
-		 *
-		 *  \param[in] MaxKeys  Number of simultaneous keys that can be reported at the one time (8-bit).
-		 */
-		#define HID_DESCRIPTOR_KEYBOARD(MaxKeys)            \
-			HID_RI_USAGE_PAGE(8, 0x01),                     \
-			HID_RI_USAGE(8, 0x06),                          \
-			HID_RI_COLLECTION(8, 0x01),                     \
-				HID_RI_USAGE_PAGE(8, 0x07),                 \
-				HID_RI_USAGE_MINIMUM(8, 0xE0),              \
-				HID_RI_USAGE_MAXIMUM(8, 0xE7),              \
-				HID_RI_LOGICAL_MINIMUM(8, 0x00),            \
-				HID_RI_LOGICAL_MAXIMUM(8, 0x01),            \
-				HID_RI_REPORT_SIZE(8, 0x01),                \
-				HID_RI_REPORT_COUNT(8, 0x08),               \
-				HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE), \
-				HID_RI_REPORT_COUNT(8, 0x01),               \
-				HID_RI_REPORT_SIZE(8, 0x08),                \
-				HID_RI_INPUT(8, HID_IOF_CONSTANT),          \
-				HID_RI_USAGE_PAGE(8, 0x08),                 \
-				HID_RI_USAGE_MINIMUM(8, 0x01),              \
-				HID_RI_USAGE_MAXIMUM(8, 0x05),              \
-				HID_RI_REPORT_COUNT(8, 0x05),               \
-				HID_RI_REPORT_SIZE(8, 0x01),                \
-				HID_RI_OUTPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE | HID_IOF_NON_VOLATILE), \
-				HID_RI_REPORT_COUNT(8, 0x01),               \
-				HID_RI_REPORT_SIZE(8, 0x03),                \
-				HID_RI_OUTPUT(8, HID_IOF_CONSTANT),         \
-				HID_RI_LOGICAL_MINIMUM(8, 0x00),            \
-				HID_RI_LOGICAL_MAXIMUM(16, 0xFF),           \
-				HID_RI_USAGE_PAGE(8, 0x07),                 \
-				HID_RI_USAGE_MINIMUM(8, 0x00),              \
-				HID_RI_USAGE_MAXIMUM(8, 0xFF),              \
-				HID_RI_REPORT_COUNT(8, MaxKeys),            \
-				HID_RI_REPORT_SIZE(8, 0x08),                \
-				HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_ARRAY | HID_IOF_ABSOLUTE), \
-			HID_RI_END_COLLECTION(0)
-
-		/** \hideinitializer
-		 *  A list of HID report item array elements that describe a typical HID USB mouse. The resulting report descriptor
-		 *  is compatible with \ref USB_MouseReport_Data_t if the \c MinAxisVal and \c MaxAxisVal values fit within a \c int8_t range
-		 *  and the number of Buttons is less than 8. For other values, the report is structured according to the following layout:
-		 *
-		 *  \code
-		 *  struct
-		 *  {
-		 *      uintA_t Buttons; // Pressed buttons bitmask
-		 *      intB_t X; // X axis value
-		 *      intB_t Y; // Y axis value
-		 *  } Mouse_Report;
-		 *  \endcode
-		 *
-		 *  Where \c intA_t is a type large enough to hold one bit per button, and \c intB_t is a type large enough to hold the
-		 *  ranges of the signed \c MinAxisVal and \c MaxAxisVal values.
-		 *
-		 *  \param[in] MinAxisVal      Minimum X/Y logical axis value (16-bit).
-		 *  \param[in] MaxAxisVal      Maximum X/Y logical axis value (16-bit).
-		 *  \param[in] MinPhysicalVal  Minimum X/Y physical axis value, for movement resolution calculations (16-bit).
-		 *  \param[in] MaxPhysicalVal  Maximum X/Y physical axis value, for movement resolution calculations (16-bit).
-		 *  \param[in] Buttons         Total number of buttons in the device (8-bit).
-		 *  \param[in] AbsoluteCoords  Boolean \c true to use absolute X/Y coordinates (e.g. touchscreen).
-		 */
-		#define HID_DESCRIPTOR_MOUSE(MinAxisVal, MaxAxisVal, MinPhysicalVal, MaxPhysicalVal, Buttons, AbsoluteCoords) \
-			HID_RI_USAGE_PAGE(8, 0x01),                     \
-			HID_RI_USAGE(8, 0x02),                          \
-			HID_RI_COLLECTION(8, 0x01),                     \
-				HID_RI_USAGE(8, 0x01),                      \
-				HID_RI_COLLECTION(8, 0x00),                 \
-					HID_RI_USAGE_PAGE(8, 0x09),             \
-					HID_RI_USAGE_MINIMUM(8, 0x01),          \
-					HID_RI_USAGE_MAXIMUM(8, Buttons),       \
-					HID_RI_LOGICAL_MINIMUM(8, 0x00),        \
-					HID_RI_LOGICAL_MAXIMUM(8, 0x01),        \
-					HID_RI_REPORT_COUNT(8, Buttons),        \
-					HID_RI_REPORT_SIZE(8, 0x01),            \
-					HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE), \
-					HID_RI_REPORT_COUNT(8, 0x01),           \
-					HID_RI_REPORT_SIZE(8, (Buttons % 8) ? (8 - (Buttons % 8)) : 0), \
-					HID_RI_INPUT(8, HID_IOF_CONSTANT),      \
-					HID_RI_USAGE_PAGE(8, 0x01),             \
-					HID_RI_USAGE(8, 0x30),                  \
-					HID_RI_USAGE(8, 0x31),                  \
-					HID_RI_LOGICAL_MINIMUM(16, MinAxisVal), \
-					HID_RI_LOGICAL_MAXIMUM(16, MaxAxisVal), \
-					HID_RI_PHYSICAL_MINIMUM(16, MinPhysicalVal), \
-					HID_RI_PHYSICAL_MAXIMUM(16, MaxPhysicalVal), \
-					HID_RI_REPORT_COUNT(8, 0x02),           \
-					HID_RI_REPORT_SIZE(8, (((MinAxisVal >= -128) && (MaxAxisVal <= 127)) ? 8 : 16)), \
-					HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | (AbsoluteCoords ? HID_IOF_ABSOLUTE : HID_IOF_RELATIVE)), \
-				HID_RI_END_COLLECTION(0),                   \
-			HID_RI_END_COLLECTION(0)
-
-		/** \hideinitializer
-		 *  A list of HID report item array elements that describe a typical Vendor Defined byte array HID report descriptor,
-		 *  used for transporting arbitrary data between the USB host and device via HID reports. The resulting report should be
-		 *  a \c uint8_t byte array of the specified length in both Device to Host (IN) and Host to Device (OUT) directions.
-		 *
-		 *  \param[in] VendorPageNum    Vendor Defined HID Usage Page index, ranging from 0x00 to 0xFF.
-		 *  \param[in] CollectionUsage  Vendor Usage for the encompassing report IN and OUT collection, ranging from 0x00 to 0xFF.
-		 *  \param[in] DataINUsage      Vendor Usage for the IN report data, ranging from 0x00 to 0xFF.
-		 *  \param[in] DataOUTUsage     Vendor Usage for the OUT report data, ranging from 0x00 to 0xFF.
-		 *  \param[in] NumBytes         Length of the data IN and OUT reports.
-		 */
-		#define HID_DESCRIPTOR_VENDOR(VendorPageNum, CollectionUsage, DataINUsage, DataOUTUsage, NumBytes) \
-			HID_RI_USAGE_PAGE(16, (0xFF00 | VendorPageNum)), \
-			HID_RI_USAGE(8, CollectionUsage),           \
-			HID_RI_COLLECTION(8, 0x01),                 \
-				HID_RI_USAGE(8, DataINUsage),           \
-				HID_RI_LOGICAL_MINIMUM(8, 0x00),        \
-				HID_RI_LOGICAL_MAXIMUM(8, 0xFF),        \
-				HID_RI_REPORT_SIZE(8, 0x08),            \
-				HID_RI_REPORT_COUNT(8, NumBytes),       \
-				HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE), \
-				HID_RI_USAGE(8, DataOUTUsage),          \
-				HID_RI_LOGICAL_MINIMUM(8, 0x00),        \
-				HID_RI_LOGICAL_MAXIMUM(8, 0xFF),        \
-				HID_RI_REPORT_SIZE(8, 0x08),            \
-				HID_RI_REPORT_COUNT(8, NumBytes),       \
-				HID_RI_OUTPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE | HID_IOF_NON_VOLATILE), \
-			HID_RI_END_COLLECTION(0)
-		/**@}*/
-
-	/* Type Defines: */
-		/** Enum for possible Class, Subclass and Protocol values of device and interface descriptors relating to the HID
-		 *  device class.
-		 */
-		enum HID_Descriptor_ClassSubclassProtocol_t
-		{
-			HID_CSCP_HIDClass             = 0x03, /**< Descriptor Class value indicating that the device or interface
-			                                       *   belongs to the HID class.
-			                                       */
-			HID_CSCP_NonBootSubclass      = 0x00, /**< Descriptor Subclass value indicating that the device or interface
-			                                       *   does not implement a HID boot protocol.
-			                                       */
-			HID_CSCP_BootSubclass         = 0x01, /**< Descriptor Subclass value indicating that the device or interface
-			                                       *   implements a HID boot protocol.
-			                                       */
-			HID_CSCP_NonBootProtocol      = 0x00, /**< Descriptor Protocol value indicating that the device or interface
-			                                       *   does not belong to a HID boot protocol.
-			                                       */
-			HID_CSCP_KeyboardBootProtocol = 0x01, /**< Descriptor Protocol value indicating that the device or interface
-			                                       *   belongs to the Keyboard HID boot protocol.
-			                                       */
-			HID_CSCP_MouseBootProtocol    = 0x02, /**< Descriptor Protocol value indicating that the device or interface
-			                                       *   belongs to the Mouse HID boot protocol.
-			                                       */
-		};
-
-		/** Enum for the HID class specific control requests that can be issued by the USB bus host. */
-		enum HID_ClassRequests_t
-		{
-			HID_REQ_GetReport       = 0x01, /**< HID class-specific Request to get the current HID report from the device. */
-			HID_REQ_GetIdle         = 0x02, /**< HID class-specific Request to get the current device idle count. */
-			HID_REQ_GetProtocol     = 0x03, /**< HID class-specific Request to get the current HID report protocol mode. */
-			HID_REQ_SetReport       = 0x09, /**< HID class-specific Request to set the current HID report to the device. */
-			HID_REQ_SetIdle         = 0x0A, /**< HID class-specific Request to set the device's idle count. */
-			HID_REQ_SetProtocol     = 0x0B, /**< HID class-specific Request to set the current HID report protocol mode. */
-		};
-
-		/** Enum for the HID class specific descriptor types. */
-		enum HID_DescriptorTypes_t
-		{
-			HID_DTYPE_HID           = 0x21, /**< Descriptor header type value, to indicate a HID class HID descriptor. */
-			HID_DTYPE_Report        = 0x22, /**< Descriptor header type value, to indicate a HID class HID report descriptor. */
-		};
-
-		/** Enum for the different types of HID reports. */
-		enum HID_ReportItemTypes_t
-		{
-			HID_REPORT_ITEM_In      = 0, /**< Indicates that the item is an IN report type. */
-			HID_REPORT_ITEM_Out     = 1, /**< Indicates that the item is an OUT report type. */
-			HID_REPORT_ITEM_Feature = 2, /**< Indicates that the item is a FEATURE report type. */
-		};
-
-		/** \brief HID class-specific HID Descriptor (LUFA naming conventions).
-		 *
-		 *  Type define for the HID class-specific HID descriptor, to describe the HID device's specifications. Refer to the HID
-		 *  specification for details on the structure elements.
-		 *
-		 *  \see \ref USB_HID_StdDescriptor_HID_t for the version of this type with standard element names.
-		 *
-		 *  \note Regardless of CPU architecture, these values should be stored as little endian.
-		 */
-		typedef struct
-		{
-			USB_Descriptor_Header_t Header; /**< Regular descriptor header containing the descriptor's type and length. */
-
-			uint16_t                HIDSpec; /**< BCD encoded version that the HID descriptor and device complies to.
-			                                  *
-			                                  *   \see \ref VERSION_BCD() utility macro.
-			                                  */
-			uint8_t                 CountryCode; /**< Country code of the localized device, or zero if universal. */
-
-			uint8_t                 TotalReportDescriptors; /**< Total number of HID report descriptors for the interface. */
-
-			uint8_t                 HIDReportType; /**< Type of HID report, set to \ref HID_DTYPE_Report. */
-			uint16_t                HIDReportLength; /**< Length of the associated HID report descriptor, in bytes. */
-		} ATTR_PACKED USB_HID_Descriptor_HID_t;
-
-		/** \brief HID class-specific HID Descriptor (USB-IF naming conventions).
-		 *
-		 *  Type define for the HID class-specific HID descriptor, to describe the HID device's specifications. Refer to the HID
-		 *  specification for details on the structure elements.
-		 *
-		 *  \see \ref USB_HID_Descriptor_HID_t for the version of this type with non-standard LUFA specific
-		 *       element names.
-		 *
-		 *  \note Regardless of CPU architecture, these values should be stored as little endian.
-		 */
-		typedef struct
-		{
-			uint8_t  bLength; /**< Size of the descriptor, in bytes. */
-			uint8_t  bDescriptorType; /**< Type of the descriptor, either a value in \ref USB_DescriptorTypes_t or a value
-			                           *   given by the specific class.
-			                           */
-
-			uint16_t bcdHID; /**< BCD encoded version that the HID descriptor and device complies to.
-			                  *
-			                  *   \see \ref VERSION_BCD() utility macro.
-			                  */
-			uint8_t  bCountryCode; /**< Country code of the localized device, or zero if universal. */
-
-			uint8_t  bNumDescriptors; /**< Total number of HID report descriptors for the interface. */
-
-			uint8_t  bDescriptorType2; /**< Type of HID report, set to \ref HID_DTYPE_Report. */
-			uint16_t wDescriptorLength; /**< Length of the associated HID report descriptor, in bytes. */
-		} ATTR_PACKED USB_HID_StdDescriptor_HID_t;
-
-		/** \brief Standard HID Boot Protocol Mouse Report.
-		 *
-		 *  Type define for a standard Boot Protocol Mouse report
-		 */
-		typedef struct
-		{
-			uint8_t Button; /**< Button mask for currently pressed buttons in the mouse. */
-			int8_t  X; /**< Current delta X movement of the mouse. */
-			int8_t  Y; /**< Current delta Y movement on the mouse. */
-		} ATTR_PACKED USB_MouseReport_Data_t;
-
-		/** \brief Standard HID Boot Protocol Keyboard Report.
-		 *
-		 *  Type define for a standard Boot Protocol Keyboard report
-		 */
-		typedef struct
-		{
-			uint8_t Modifier; /**< Keyboard modifier byte, indicating pressed modifier keys (a combination of
-			                   *   \c HID_KEYBOARD_MODIFER_* masks).
-			                   */
-			uint8_t Reserved; /**< Reserved for OEM use, always set to 0. */
-			uint8_t KeyCode[6]; /**< Key codes of the currently pressed keys. */
-		} ATTR_PACKED USB_KeyboardReport_Data_t;
-
-		/** Type define for the data type used to store HID report descriptor elements. */
-		typedef uint8_t USB_Descriptor_HIDReport_Datatype_t;
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
diff --git a/NativePrograms/LUFA/Drivers/USB/Class/Common/HIDParser.c b/NativePrograms/LUFA/Drivers/USB/Class/Common/HIDParser.c
deleted file mode 100644
index 5ff60b61b2..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Class/Common/HIDParser.c
+++ /dev/null
@@ -1,389 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-#define  __INCLUDE_FROM_USB_DRIVER
-#define  __INCLUDE_FROM_HID_DRIVER
-#include "HIDParser.h"
-
-uint8_t USB_ProcessHIDReport(const uint8_t* ReportData,
-                             uint16_t ReportSize,
-                             HID_ReportInfo_t* const ParserData)
-{
-	HID_StateTable_t      StateTable[HID_STATETABLE_STACK_DEPTH];
-	HID_StateTable_t*     CurrStateTable     = &StateTable[0];
-	HID_CollectionPath_t* CurrCollectionPath = NULL;
-	HID_ReportSizeInfo_t* CurrReportIDInfo   = &ParserData->ReportIDSizes[0];
-	uint16_t              UsageList[HID_USAGE_STACK_DEPTH];
-	uint8_t               UsageListSize      = 0;
-	HID_MinMax_t          UsageMinMax        = {0, 0};
-
-	memset(ParserData,       0x00, sizeof(HID_ReportInfo_t));
-	memset(CurrStateTable,   0x00, sizeof(HID_StateTable_t));
-	memset(CurrReportIDInfo, 0x00, sizeof(HID_ReportSizeInfo_t));
-
-	ParserData->TotalDeviceReports = 1;
-
-	while (ReportSize)
-	{
-		uint8_t  HIDReportItem  = *ReportData;
-		uint32_t ReportItemData;
-
-		ReportData++;
-		ReportSize--;
-
-		switch (HIDReportItem & HID_RI_DATA_SIZE_MASK)
-		{
-			case HID_RI_DATA_BITS_32:
-				ReportItemData  = (((uint32_t)ReportData[3] << 24) | ((uint32_t)ReportData[2] << 16) |
-			                       ((uint16_t)ReportData[1] << 8)  | ReportData[0]);
-				ReportSize     -= 4;
-				ReportData     += 4;
-				break;
-
-			case HID_RI_DATA_BITS_16:
-				ReportItemData  = (((uint16_t)ReportData[1] << 8) | (ReportData[0]));
-				ReportSize     -= 2;
-				ReportData     += 2;
-				break;
-
-			case HID_RI_DATA_BITS_8:
-				ReportItemData  = ReportData[0];
-				ReportSize     -= 1;
-				ReportData     += 1;
-				break;
-
-			default:
-				ReportItemData  = 0;
-				break;
-		}
-
-		switch (HIDReportItem & (HID_RI_TYPE_MASK | HID_RI_TAG_MASK))
-		{
-			case HID_RI_PUSH(0):
-				if (CurrStateTable == &StateTable[HID_STATETABLE_STACK_DEPTH - 1])
-				  return HID_PARSE_HIDStackOverflow;
-
-				memcpy((CurrStateTable + 1),
-				       CurrStateTable,
-				       sizeof(HID_StateTable_t));
-
-				CurrStateTable++;
-				break;
-
-			case HID_RI_POP(0):
-				if (CurrStateTable == &StateTable[0])
-				  return HID_PARSE_HIDStackUnderflow;
-
-				CurrStateTable--;
-				break;
-
-			case HID_RI_USAGE_PAGE(0):
-				CurrStateTable->Attributes.Usage.Page       = ReportItemData;
-				break;
-
-			case HID_RI_LOGICAL_MINIMUM(0):
-				CurrStateTable->Attributes.Logical.Minimum  = ReportItemData;
-				break;
-
-			case HID_RI_LOGICAL_MAXIMUM(0):
-				CurrStateTable->Attributes.Logical.Maximum  = ReportItemData;
-				break;
-
-			case HID_RI_PHYSICAL_MINIMUM(0):
-				CurrStateTable->Attributes.Physical.Minimum = ReportItemData;
-				break;
-
-			case HID_RI_PHYSICAL_MAXIMUM(0):
-				CurrStateTable->Attributes.Physical.Maximum = ReportItemData;
-				break;
-
-			case HID_RI_UNIT_EXPONENT(0):
-				CurrStateTable->Attributes.Unit.Exponent    = ReportItemData;
-				break;
-
-			case HID_RI_UNIT(0):
-				CurrStateTable->Attributes.Unit.Type        = ReportItemData;
-				break;
-
-			case HID_RI_REPORT_SIZE(0):
-				CurrStateTable->Attributes.BitSize          = ReportItemData;
-				break;
-
-			case HID_RI_REPORT_COUNT(0):
-				CurrStateTable->ReportCount                 = ReportItemData;
-				break;
-
-			case HID_RI_REPORT_ID(0):
-				CurrStateTable->ReportID                    = ReportItemData;
-
-				if (ParserData->UsingReportIDs)
-				{
-					CurrReportIDInfo = NULL;
-
-					for (uint8_t i = 0; i < ParserData->TotalDeviceReports; i++)
-					{
-						if (ParserData->ReportIDSizes[i].ReportID == CurrStateTable->ReportID)
-						{
-							CurrReportIDInfo = &ParserData->ReportIDSizes[i];
-							break;
-						}
-					}
-
-					if (CurrReportIDInfo == NULL)
-					{
-						if (ParserData->TotalDeviceReports == HID_MAX_REPORT_IDS)
-						  return HID_PARSE_InsufficientReportIDItems;
-
-						CurrReportIDInfo = &ParserData->ReportIDSizes[ParserData->TotalDeviceReports++];
-						memset(CurrReportIDInfo, 0x00, sizeof(HID_ReportSizeInfo_t));
-					}
-				}
-
-				ParserData->UsingReportIDs = true;
-
-				CurrReportIDInfo->ReportID = CurrStateTable->ReportID;
-				break;
-
-			case HID_RI_USAGE(0):
-				if (UsageListSize == HID_USAGE_STACK_DEPTH)
-				  return HID_PARSE_UsageListOverflow;
-
-				if ((HIDReportItem & HID_RI_DATA_SIZE_MASK) == HID_RI_DATA_BITS_32)
-				  CurrStateTable->Attributes.Usage.Page = (ReportItemData >> 16);
-
-				UsageList[UsageListSize++] = ReportItemData;
-				break;
-
-			case HID_RI_USAGE_MINIMUM(0):
-				UsageMinMax.Minimum = ReportItemData;
-				break;
-
-			case HID_RI_USAGE_MAXIMUM(0):
-				UsageMinMax.Maximum = ReportItemData;
-				break;
-
-			case HID_RI_COLLECTION(0):
-				if (CurrCollectionPath == NULL)
-				{
-					CurrCollectionPath = &ParserData->CollectionPaths[0];
-				}
-				else
-				{
-					HID_CollectionPath_t* ParentCollectionPath = CurrCollectionPath;
-
-					CurrCollectionPath = &ParserData->CollectionPaths[1];
-
-					while (CurrCollectionPath->Parent != NULL)
-					{
-						if (CurrCollectionPath == &ParserData->CollectionPaths[HID_MAX_COLLECTIONS - 1])
-						  return HID_PARSE_InsufficientCollectionPaths;
-
-						CurrCollectionPath++;
-					}
-
-					CurrCollectionPath->Parent = ParentCollectionPath;
-				}
-
-				CurrCollectionPath->Type       = ReportItemData;
-				CurrCollectionPath->Usage.Page = CurrStateTable->Attributes.Usage.Page;
-
-				if (UsageListSize)
-				{
-					CurrCollectionPath->Usage.Usage = UsageList[0];
-
-					for (uint8_t i = 1; i < UsageListSize; i++)
-					  UsageList[i - 1] = UsageList[i];
-
-					UsageListSize--;
-				}
-				else if (UsageMinMax.Minimum <= UsageMinMax.Maximum)
-				{
-					CurrCollectionPath->Usage.Usage = UsageMinMax.Minimum++;
-				}
-
-				break;
-
-			case HID_RI_END_COLLECTION(0):
-				if (CurrCollectionPath == NULL)
-				  return HID_PARSE_UnexpectedEndCollection;
-
-				CurrCollectionPath = CurrCollectionPath->Parent;
-				break;
-
-			case HID_RI_INPUT(0):
-			case HID_RI_OUTPUT(0):
-			case HID_RI_FEATURE(0):
-				for (uint8_t ReportItemNum = 0; ReportItemNum < CurrStateTable->ReportCount; ReportItemNum++)
-				{
-					HID_ReportItem_t NewReportItem;
-
-					memcpy(&NewReportItem.Attributes,
-					       &CurrStateTable->Attributes,
-					       sizeof(HID_ReportItem_Attributes_t));
-
-					NewReportItem.ItemFlags      = ReportItemData;
-					NewReportItem.CollectionPath = CurrCollectionPath;
-					NewReportItem.ReportID       = CurrStateTable->ReportID;
-
-					if (UsageListSize)
-					{
-						NewReportItem.Attributes.Usage.Usage = UsageList[0];
-
-						for (uint8_t i = 1; i < UsageListSize; i++)
-						  UsageList[i - 1] = UsageList[i];
-
-						UsageListSize--;
-					}
-					else if (UsageMinMax.Minimum <= UsageMinMax.Maximum)
-					{
-						NewReportItem.Attributes.Usage.Usage = UsageMinMax.Minimum++;
-					}
-
-					uint8_t ItemTypeTag = (HIDReportItem & (HID_RI_TYPE_MASK | HID_RI_TAG_MASK));
-
-					if (ItemTypeTag == HID_RI_INPUT(0))
-					  NewReportItem.ItemType = HID_REPORT_ITEM_In;
-					else if (ItemTypeTag == HID_RI_OUTPUT(0))
-					  NewReportItem.ItemType = HID_REPORT_ITEM_Out;
-					else
-					  NewReportItem.ItemType = HID_REPORT_ITEM_Feature;
-
-					NewReportItem.BitOffset = CurrReportIDInfo->ReportSizeBits[NewReportItem.ItemType];
-
-					CurrReportIDInfo->ReportSizeBits[NewReportItem.ItemType] += CurrStateTable->Attributes.BitSize;
-
-					ParserData->LargestReportSizeBits = MAX(ParserData->LargestReportSizeBits, CurrReportIDInfo->ReportSizeBits[NewReportItem.ItemType]);
-
-					if (ParserData->TotalReportItems == HID_MAX_REPORTITEMS)
-					  return HID_PARSE_InsufficientReportItems;
-
-					memcpy(&ParserData->ReportItems[ParserData->TotalReportItems],
-					       &NewReportItem, sizeof(HID_ReportItem_t));
-
-					if (!(ReportItemData & HID_IOF_CONSTANT) && CALLBACK_HIDParser_FilterHIDReportItem(&NewReportItem))
-					  ParserData->TotalReportItems++;
-				}
-
-				break;
-
-			default:
-				break;
-		}
-
-		if ((HIDReportItem & HID_RI_TYPE_MASK) == HID_RI_TYPE_MAIN)
-		{
-			UsageMinMax.Minimum = 0;
-			UsageMinMax.Maximum = 0;
-			UsageListSize       = 0;
-		}
-	}
-
-	if (!(ParserData->TotalReportItems))
-	  return HID_PARSE_NoUnfilteredReportItems;
-
-	return HID_PARSE_Successful;
-}
-
-bool USB_GetHIDReportItemInfo(const uint8_t* ReportData,
-                              HID_ReportItem_t* const ReportItem)
-{
-	if (ReportItem == NULL)
-	  return false;
-
-	uint16_t DataBitsRem  = ReportItem->Attributes.BitSize;
-	uint16_t CurrentBit   = ReportItem->BitOffset;
-	uint32_t BitMask      = (1 << 0);
-
-	if (ReportItem->ReportID)
-	{
-		if (ReportItem->ReportID != ReportData[0])
-		  return false;
-
-		ReportData++;
-	}
-
-	ReportItem->PreviousValue = ReportItem->Value;
-	ReportItem->Value = 0;
-
-	while (DataBitsRem--)
-	{
-		if (ReportData[CurrentBit / 8] & (1 << (CurrentBit % 8)))
-		  ReportItem->Value |= BitMask;
-
-		CurrentBit++;
-		BitMask <<= 1;
-	}
-
-	return true;
-}
-
-void USB_SetHIDReportItemInfo(uint8_t* ReportData,
-                              HID_ReportItem_t* const ReportItem)
-{
-	if (ReportItem == NULL)
-	  return;
-
-	uint16_t DataBitsRem  = ReportItem->Attributes.BitSize;
-	uint16_t CurrentBit   = ReportItem->BitOffset;
-	uint32_t BitMask      = (1 << 0);
-
-	if (ReportItem->ReportID)
-	{
-		ReportData[0] = ReportItem->ReportID;
-		ReportData++;
-	}
-
-	ReportItem->PreviousValue = ReportItem->Value;
-
-	while (DataBitsRem--)
-	{
-		if (ReportItem->Value & BitMask)
-		  ReportData[CurrentBit / 8] |= (1 << (CurrentBit % 8));
-
-		CurrentBit++;
-		BitMask <<= 1;
-	}
-}
-
-uint16_t USB_GetHIDReportSize(HID_ReportInfo_t* const ParserData,
-                              const uint8_t ReportID,
-                              const uint8_t ReportType)
-{
-	for (uint8_t i = 0; i < HID_MAX_REPORT_IDS; i++)
-	{
-		uint16_t ReportSizeBits = ParserData->ReportIDSizes[i].ReportSizeBits[ReportType];
-
-		if (ParserData->ReportIDSizes[i].ReportID == ReportID)
-		  return (ReportSizeBits / 8) + ((ReportSizeBits % 8) ? 1 : 0);
-	}
-
-	return 0;
-}
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Class/Common/HIDParser.h b/NativePrograms/LUFA/Drivers/USB/Class/Common/HIDParser.h
deleted file mode 100644
index 4b9df50da8..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Class/Common/HIDParser.h
+++ /dev/null
@@ -1,364 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief USB Human Interface Device (HID) Class report descriptor parser.
- *
- *  This file allows for the easy parsing of complex HID report descriptors, which describes the data that
- *  a HID device transmits to the host. It also provides an easy API for extracting and processing the data
- *  elements inside a HID report sent from an attached HID device.
- */
-
-/** \ingroup Group_USB
- *  \defgroup Group_HIDParser HID Report Parser
- *  \brief USB Human Interface Device (HID) Class report descriptor parser.
- *
- *  \section Sec_HIDParser_Dependencies Module Source Dependencies
- *  The following files must be built with any user project that uses this module:
- *    - LUFA/Drivers/USB/Class/Host/HIDParser.c <i>(Makefile source module name: LUFA_SRC_USB)</i>
- *
- *  \section Sec_HIDParser_ModDescription Module Description
- *  Human Interface Device (HID) class report descriptor parser. This module implements a parser than is
- *  capable of processing a complete HID report descriptor, and outputting a flat structure containing the
- *  contents of the report in an a more friendly format. The parsed data may then be further processed and used
- *  within an application to process sent and received HID reports to and from an attached HID device.
- *
- *  A HID report descriptor consists of a set of HID report items, which describe the function and layout
- *  of data exchanged between a HID device and a host, including both the physical encoding of each item
- *  (such as a button, key press or joystick axis) in the sent and received data packets - known as "reports" -
- *  as well as other information about each item such as the usages, data range, physical location and other
- *  characteristics. In this way a HID device can retain a high degree of flexibility in its capabilities, as it
- *  is not forced to comply with a given report layout or feature-set.
- *
- *  This module also contains routines for the processing of data in an actual HID report, using the parsed report
- *  descriptor data as a guide for the encoding.
- *
- *  @{
- */
-
-#ifndef __HIDPARSER_H__
-#define __HIDPARSER_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-
-		#include "HIDReportData.h"
-		#include "HIDClassCommon.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Macros: */
-		#if !defined(HID_STATETABLE_STACK_DEPTH) || defined(__DOXYGEN__)
-			/** Constant indicating the maximum stack depth of the state table. A larger state table
-			 *  allows for more PUSH/POP report items to be nested, but consumes more memory. By default
-			 *  this is set to 2 levels (allowing non-nested PUSH items) but this can be overridden by
-			 *  defining \c HID_STATETABLE_STACK_DEPTH to another value in the user project makefile, passing the
-			 *  define to the compiler using the -D compiler switch.
-			 */
-			#define HID_STATETABLE_STACK_DEPTH    2
-		#endif
-
-		#if !defined(HID_USAGE_STACK_DEPTH) || defined(__DOXYGEN__)
-			/** Constant indicating the maximum stack depth of the usage table. A larger usage table
-			 *  allows for more USAGE items to be indicated sequentially for REPORT COUNT entries of more than
-			 *  one, but requires more stack space. By default this is set to 8 levels (allowing for a report
-			 *  item with a count of 8) but this can be overridden by defining \c HID_USAGE_STACK_DEPTH to another
-			 *  value in the user project makefile, passing the define to the compiler using the -D compiler
-			 *  switch.
-			 */
-			#define HID_USAGE_STACK_DEPTH         8
-		#endif
-
-		#if !defined(HID_MAX_COLLECTIONS) || defined(__DOXYGEN__)
-			/** Constant indicating the maximum number of COLLECTION items (nested or unnested) that can be
-			 *  processed in the report item descriptor. A large value allows for more COLLECTION items to be
-			 *  processed, but consumes more memory. By default this is set to 10 collections, but this can be
-			 *  overridden by defining \c HID_MAX_COLLECTIONS to another value in the user project makefile, passing
-			 *  the define to the compiler using the -D compiler switch.
-			 */
-			#define HID_MAX_COLLECTIONS           10
-		#endif
-
-		#if !defined(HID_MAX_REPORTITEMS) || defined(__DOXYGEN__)
-			/** Constant indicating the maximum number of report items (IN, OUT or FEATURE) that can be processed
-			 *  in the report item descriptor and stored in the user HID Report Info structure. A large value allows
-			 *  for more report items to be stored, but consumes more memory. By default this is set to 20 items,
-			 *  but this can be overridden by defining \c HID_MAX_REPORTITEMS to another value in the user project
-			 *  makefile, and passing the define to the compiler using the -D compiler switch.
-			 */
-			#define HID_MAX_REPORTITEMS           20
-		#endif
-
-		#if !defined(HID_MAX_REPORT_IDS) || defined(__DOXYGEN__)
-			/** Constant indicating the maximum number of unique report IDs that can be processed in the report item
-			 *  descriptor for the report size information array in the user HID Report Info structure. A large value
-			 *  allows for more report ID report sizes to be stored, but consumes more memory. By default this is set
-			 *  to 10 items, but this can be overridden by defining \c HID_MAX_REPORT_IDS to another value in the user project
-			 *  makefile, and passing the define to the compiler using the -D compiler switch. Note that IN, OUT and FEATURE
-			 *  items sharing the same report ID consume only one size item in the array.
-			 */
-			#define HID_MAX_REPORT_IDS            10
-		#endif
-
-		/** Returns the value a given HID report item (once its value has been fetched via \ref USB_GetHIDReportItemInfo())
-		 *  left-aligned to the given data type. This allows for signed data to be interpreted correctly, by shifting the data
-		 *  leftwards until the data's sign bit is in the correct position.
-		 *
-		 *  \param[in] ReportItem  HID Report Item whose retrieved value is to be aligned.
-		 *  \param[in] Type        Data type to align the HID report item's value to.
-		 *
-		 *  \return Left-aligned data of the given report item's pre-retrieved value for the given datatype.
-		 */
-		#define HID_ALIGN_DATA(ReportItem, Type) ((Type)(ReportItem->Value << ((8 * sizeof(Type)) - ReportItem->Attributes.BitSize)))
-
-	/* Public Interface - May be used in end-application: */
-		/* Enums: */
-			/** Enum for the possible error codes in the return value of the \ref USB_ProcessHIDReport() function. */
-			enum HID_Parse_ErrorCodes_t
-			{
-				HID_PARSE_Successful                  = 0, /**< Successful parse of the HID report descriptor, no error. */
-				HID_PARSE_HIDStackOverflow            = 1, /**< More than \ref HID_STATETABLE_STACK_DEPTH nested PUSHes in the report. */
-				HID_PARSE_HIDStackUnderflow           = 2, /**< A POP was found when the state table stack was empty. */
-				HID_PARSE_InsufficientReportItems     = 3, /**< More than \ref HID_MAX_REPORTITEMS report items in the report. */
-				HID_PARSE_UnexpectedEndCollection     = 4, /**< An END COLLECTION item found without matching COLLECTION item. */
-				HID_PARSE_InsufficientCollectionPaths = 5, /**< More than \ref HID_MAX_COLLECTIONS collections in the report. */
-				HID_PARSE_UsageListOverflow           = 6, /**< More than \ref HID_USAGE_STACK_DEPTH usages listed in a row. */
-				HID_PARSE_InsufficientReportIDItems   = 7, /**< More than \ref HID_MAX_REPORT_IDS report IDs in the device. */
-				HID_PARSE_NoUnfilteredReportItems     = 8, /**< All report items from the device were filtered by the filtering callback routine. */
-			};
-
-		/* Type Defines: */
-			/** \brief HID Parser Report Item Min/Max Structure.
-			 *
-			 *  Type define for an attribute with both minimum and maximum values (e.g. Logical Min/Max).
-			 */
-			typedef struct
-			{
-				uint32_t Minimum; /**< Minimum value for the attribute. */
-				uint32_t Maximum; /**< Maximum value for the attribute. */
-			} HID_MinMax_t;
-
-			/** \brief HID Parser Report Item Unit Structure.
-			 *
-			 *  Type define for the Unit attributes of a report item.
-			 */
-			typedef struct
-			{
-				uint32_t Type;     /**< Unit type (refer to HID specifications for details). */
-				uint8_t  Exponent; /**< Unit exponent (refer to HID specifications for details). */
-			} HID_Unit_t;
-
-			/** \brief HID Parser Report Item Usage Structure.
-			 *
-			 *  Type define for the Usage attributes of a report item.
-			 */
-			typedef struct
-			{
-				uint16_t Page;  /**< Usage page of the report item. */
-				uint16_t Usage; /**< Usage of the report item. */
-			} HID_Usage_t;
-
-			/** \brief HID Parser Report Item Collection Path Structure.
-			 *
-			 *  Type define for a COLLECTION object. Contains the collection attributes and a reference to the
-			 *  parent collection if any.
-			 */
-			typedef struct HID_CollectionPath
-			{
-				uint8_t                    Type;   /**< Collection type (e.g. "Generic Desktop"). */
-				HID_Usage_t                Usage;  /**< Collection usage. */
-				struct HID_CollectionPath* Parent; /**< Reference to parent collection, or \c NULL if root collection. */
-			} HID_CollectionPath_t;
-
-			/** \brief HID Parser Report Item Attributes Structure.
-			 *
-			 *  Type define for all the data attributes of a report item, except flags.
-			 */
-			typedef struct
-			{
-				uint8_t      BitSize;  /**< Size in bits of the report item's data. */
-
-				HID_Usage_t  Usage;    /**< Usage of the report item. */
-				HID_Unit_t   Unit;     /**< Unit type and exponent of the report item. */
-				HID_MinMax_t Logical;  /**< Logical minimum and maximum of the report item. */
-				HID_MinMax_t Physical; /**< Physical minimum and maximum of the report item. */
-			} HID_ReportItem_Attributes_t;
-
-			/** \brief HID Parser Report Item Details Structure.
-			 *
-			 *  Type define for a report item (IN, OUT or FEATURE) layout attributes and other details.
-			 */
-			typedef struct
-			{
-				uint16_t                    BitOffset;      /**< Bit offset in the IN, OUT or FEATURE report of the item. */
-				uint8_t                     ItemType;       /**< Report item type, a value in \ref HID_ReportItemTypes_t. */
-				uint16_t                    ItemFlags;      /**< Item data flags, a mask of \c HID_IOF_* constants. */
-				uint8_t                     ReportID;       /**< Report ID this item belongs to, or 0x00 if device has only one report */
-				HID_CollectionPath_t*       CollectionPath; /**< Collection path of the item. */
-
-				HID_ReportItem_Attributes_t Attributes;     /**< Report item attributes. */
-
-				uint32_t                    Value;          /**< Current value of the report item - use \ref HID_ALIGN_DATA() when processing
-				                                             *   a retrieved value so that it is aligned to a specific type.
-				                                             */
-				uint32_t                    PreviousValue;  /**< Previous value of the report item. */
-			} HID_ReportItem_t;
-
-			/** \brief HID Parser Report Size Structure.
-			 *
-			 *  Type define for a report item size information structure, to retain the size of a device's reports by ID.
-			 */
-			typedef struct
-			{
-				uint8_t  ReportID; /**< Report ID of the report within the HID interface. */
-				uint16_t ReportSizeBits[3]; /**< Total number of bits in each report type for the given Report ID,
-				                             *   indexed by the \ref HID_ReportItemTypes_t enum.
-				                             */
-			} HID_ReportSizeInfo_t;
-
-			/** \brief HID Parser State Structure.
-			 *
-			 *  Type define for a complete processed HID report, including all report item data and collections.
-			 */
-			typedef struct
-			{
-				uint8_t              TotalReportItems; /**< Total number of report items stored in the \c ReportItems array. */
-				HID_ReportItem_t     ReportItems[HID_MAX_REPORTITEMS]; /**< Report items array, including all IN, OUT
-			                                                            *   and FEATURE items.
-				                                                        */
-				HID_CollectionPath_t CollectionPaths[HID_MAX_COLLECTIONS]; /**< All collection items, referenced
-				                                                            *   by the report items.
-				                                                            */
-				uint8_t              TotalDeviceReports; /**< Number of reports within the HID interface */
-				HID_ReportSizeInfo_t ReportIDSizes[HID_MAX_REPORT_IDS]; /**< Report sizes for each report in the interface */
-				uint16_t             LargestReportSizeBits; /**< Largest report that the attached device will generate, in bits */
-				bool                 UsingReportIDs; /**< Indicates if the device has at least one REPORT ID
-				                                      *   element in its HID report descriptor.
-				                                      */
-			} HID_ReportInfo_t;
-
-		/* Function Prototypes: */
-			/** Function to process a given HID report returned from an attached device, and store it into a given
-			 *  \ref HID_ReportInfo_t structure.
-			 *
-			 *  \param[in]  ReportData  Buffer containing the device's HID report table.
-			 *  \param[in]  ReportSize  Size in bytes of the HID report table.
-			 *  \param[out] ParserData  Pointer to a \ref HID_ReportInfo_t instance for the parser output.
-			 *
-			 *  \return A value in the \ref HID_Parse_ErrorCodes_t enum.
-			 */
-			uint8_t USB_ProcessHIDReport(const uint8_t* ReportData,
-			                             uint16_t ReportSize,
-			                             HID_ReportInfo_t* const ParserData) ATTR_NON_NULL_PTR_ARG(1) ATTR_NON_NULL_PTR_ARG(3);
-
-			/** Extracts the given report item's value out of the given HID report and places it into the Value
-			 *  member of the report item's \ref HID_ReportItem_t structure.
-			 *
-			 *  When called on a report with an item that exists in that report, this copies the report item's \c Value
-			 *  to its \c PreviousValue element for easy checking to see if an item's value has changed before processing
-			 *  a report. If the given item does not exist in the report, the function does not modify the report item's
-			 *  data.
-			 *
-			 *  \param[in]     ReportData  Buffer containing an IN or FEATURE report from an attached device.
-			 *  \param[in,out] ReportItem  Pointer to the report item of interest in a \ref HID_ReportInfo_t ReportItem array.
-			 *
-			 *  \returns Boolean \c true if the item to retrieve was located in the given report, \c false otherwise.
-			 */
-			bool USB_GetHIDReportItemInfo(const uint8_t* ReportData,
-			                              HID_ReportItem_t* const ReportItem) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Retrieves the given report item's value out of the \c Value member of the report item's
-			 *  \ref HID_ReportItem_t structure and places it into the correct position in the HID report
-			 *  buffer. The report buffer is assumed to have the appropriate bits cleared before calling
-			 *  this function (i.e., the buffer should be explicitly cleared before report values are added).
-			 *
-			 *  When called, this copies the report item's \c Value element to its \c PreviousValue element for easy
-			 *  checking to see if an item's value has changed before sending a report.
-			 *
-			 *  If the device has multiple HID reports, the first byte in the report is set to the report ID of the given item.
-			 *
-			 *  \param[out] ReportData  Buffer holding the current OUT or FEATURE report data.
-			 *  \param[in]  ReportItem  Pointer to the report item of interest in a \ref HID_ReportInfo_t ReportItem array.
-			 */
-			void USB_SetHIDReportItemInfo(uint8_t* ReportData,
-			                              HID_ReportItem_t* const ReportItem) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Retrieves the size of a given HID report in bytes from its Report ID.
-			 *
-			 *  \param[in] ParserData  Pointer to a \ref HID_ReportInfo_t instance containing the parser output.
-			 *  \param[in] ReportID    Report ID of the report whose size is to be determined.
-			 *  \param[in] ReportType  Type of the report whose size is to be determined, a value from the
-			 *                         \ref HID_ReportItemTypes_t enum.
-			 *
-			 *  \return Size of the report in bytes, or \c 0 if the report does not exist.
-			 */
-			uint16_t USB_GetHIDReportSize(HID_ReportInfo_t* const ParserData,
-			                              const uint8_t ReportID,
-			                              const uint8_t ReportType) ATTR_CONST ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Callback routine for the HID Report Parser. This callback <b>must</b> be implemented by the user code when
-			 *  the parser is used, to determine what report IN, OUT and FEATURE item's information is stored into the user
-			 *  \ref HID_ReportInfo_t structure. This can be used to filter only those items the application will be using, so that
-			 *  no RAM is wasted storing the attributes for report items which will never be referenced by the application.
-			 *
-			 *  Report item pointers passed to this callback function may be cached by the user application for later use
-			 *  when processing report items. This provides faster report processing in the user application than would
-			 *  a search of the entire parsed report item table for each received or sent report.
-			 *
-			 *  \param[in] CurrentItem  Pointer to the current report item for user checking.
-			 *
-			 *  \return Boolean \c true if the item should be stored into the \ref HID_ReportInfo_t structure, \c false if
-			 *          it should be ignored.
-			 */
-			bool CALLBACK_HIDParser_FilterHIDReportItem(HID_ReportItem_t* const CurrentItem);
-
-	/* Private Interface - For use in library only: */
-	#if !defined(__DOXYGEN__)
-		/* Type Defines: */
-			typedef struct
-			{
-				 HID_ReportItem_Attributes_t Attributes;
-				 uint8_t                     ReportCount;
-				 uint8_t                     ReportID;
-			} HID_StateTable_t;
-	#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Class/Common/HIDReportData.h b/NativePrograms/LUFA/Drivers/USB/Class/Common/HIDReportData.h
deleted file mode 100644
index e484502436..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Class/Common/HIDReportData.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Constants for HID report item attributes.
- *
- *  HID report item constants for report item attributes. Refer to the HID specification for
- *  details on each flag's meaning when applied to an IN, OUT or FEATURE item.
- */
-
-/** \ingroup Group_HIDParser
- *  \defgroup Group_HIDReportItemConst HID Report Descriptor Item Constants
- *
- *  General HID constant definitions for HID Report Descriptor elements.
- *
- *  @{
- */
-
-#ifndef __HIDREPORTDATA_H__
-#define __HIDREPORTDATA_H__
-
-	/* Private Interface - For use in library only: */
-	#if !defined(__DOXYGEN__)
-		/* Macros: */
-			#define HID_RI_DATA_SIZE_MASK                   0x03
-			#define HID_RI_TYPE_MASK                        0x0C
-			#define HID_RI_TAG_MASK                         0xF0
-
-			#define HID_RI_TYPE_MAIN                        0x00
-			#define HID_RI_TYPE_GLOBAL                      0x04
-			#define HID_RI_TYPE_LOCAL                       0x08
-
-			#define HID_RI_DATA_BITS_0                      0x00
-			#define HID_RI_DATA_BITS_8                      0x01
-			#define HID_RI_DATA_BITS_16                     0x02
-			#define HID_RI_DATA_BITS_32                     0x03
-			#define HID_RI_DATA_BITS(DataBits)              CONCAT_EXPANDED(HID_RI_DATA_BITS_, DataBits)
-
-			#define _HID_RI_ENCODE_0(Data)
-			#define _HID_RI_ENCODE_8(Data)                  , (Data & 0xFF)
-			#define _HID_RI_ENCODE_16(Data)                 _HID_RI_ENCODE_8(Data)  _HID_RI_ENCODE_8(Data >> 8)
-			#define _HID_RI_ENCODE_32(Data)                 _HID_RI_ENCODE_16(Data) _HID_RI_ENCODE_16(Data >> 16)
-			#define _HID_RI_ENCODE(DataBits, ...)           CONCAT_EXPANDED(_HID_RI_ENCODE_, DataBits(__VA_ARGS__))
-
-			#define _HID_RI_ENTRY(Type, Tag, DataBits, ...) (Type | Tag | HID_RI_DATA_BITS(DataBits)) _HID_RI_ENCODE(DataBits, (__VA_ARGS__))
-	#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-		/** \name HID Input, Output and Feature Report Descriptor Item Flags */
-		/**@{*/
-			#define HID_IOF_CONSTANT                        (1 << 0)
-			#define HID_IOF_DATA                            (0 << 0)
-			#define HID_IOF_VARIABLE                        (1 << 1)
-			#define HID_IOF_ARRAY                           (0 << 1)
-			#define HID_IOF_RELATIVE                        (1 << 2)
-			#define HID_IOF_ABSOLUTE                        (0 << 2)
-			#define HID_IOF_WRAP                            (1 << 3)
-			#define HID_IOF_NO_WRAP                         (0 << 3)
-			#define HID_IOF_NON_LINEAR                      (1 << 4)
-			#define HID_IOF_LINEAR                          (0 << 4)
-			#define HID_IOF_NO_PREFERRED_STATE              (1 << 5)
-			#define HID_IOF_PREFERRED_STATE                 (0 << 5)
-			#define HID_IOF_NULLSTATE                       (1 << 6)
-			#define HID_IOF_NO_NULL_POSITION                (0 << 6)
-			#define HID_IOF_VOLATILE                        (1 << 7)
-			#define HID_IOF_NON_VOLATILE                    (0 << 7)
-			#define HID_IOF_BUFFERED_BYTES                  (1 << 8)
-			#define HID_IOF_BITFIELD                        (0 << 8)
-		/**@}*/
-
-		/** \name HID Report Descriptor Item Macros */
-		/**@{*/
-			#define HID_RI_INPUT(DataBits, ...)             _HID_RI_ENTRY(HID_RI_TYPE_MAIN  , 0x80, DataBits, __VA_ARGS__)
-			#define HID_RI_OUTPUT(DataBits, ...)            _HID_RI_ENTRY(HID_RI_TYPE_MAIN  , 0x90, DataBits, __VA_ARGS__)
-			#define HID_RI_COLLECTION(DataBits, ...)        _HID_RI_ENTRY(HID_RI_TYPE_MAIN  , 0xA0, DataBits, __VA_ARGS__)
-			#define HID_RI_FEATURE(DataBits, ...)           _HID_RI_ENTRY(HID_RI_TYPE_MAIN  , 0xB0, DataBits, __VA_ARGS__)
-			#define HID_RI_END_COLLECTION(DataBits, ...)    _HID_RI_ENTRY(HID_RI_TYPE_MAIN  , 0xC0, DataBits, __VA_ARGS__)
-			#define HID_RI_USAGE_PAGE(DataBits, ...)        _HID_RI_ENTRY(HID_RI_TYPE_GLOBAL, 0x00, DataBits, __VA_ARGS__)
-			#define HID_RI_LOGICAL_MINIMUM(DataBits, ...)   _HID_RI_ENTRY(HID_RI_TYPE_GLOBAL, 0x10, DataBits, __VA_ARGS__)
-			#define HID_RI_LOGICAL_MAXIMUM(DataBits, ...)   _HID_RI_ENTRY(HID_RI_TYPE_GLOBAL, 0x20, DataBits, __VA_ARGS__)
-			#define HID_RI_PHYSICAL_MINIMUM(DataBits, ...)  _HID_RI_ENTRY(HID_RI_TYPE_GLOBAL, 0x30, DataBits, __VA_ARGS__)
-			#define HID_RI_PHYSICAL_MAXIMUM(DataBits, ...)  _HID_RI_ENTRY(HID_RI_TYPE_GLOBAL, 0x40, DataBits, __VA_ARGS__)
-			#define HID_RI_UNIT_EXPONENT(DataBits, ...)     _HID_RI_ENTRY(HID_RI_TYPE_GLOBAL, 0x50, DataBits, __VA_ARGS__)
-			#define HID_RI_UNIT(DataBits, ...)              _HID_RI_ENTRY(HID_RI_TYPE_GLOBAL, 0x60, DataBits, __VA_ARGS__)
-			#define HID_RI_REPORT_SIZE(DataBits, ...)       _HID_RI_ENTRY(HID_RI_TYPE_GLOBAL, 0x70, DataBits, __VA_ARGS__)
-			#define HID_RI_REPORT_ID(DataBits, ...)         _HID_RI_ENTRY(HID_RI_TYPE_GLOBAL, 0x80, DataBits, __VA_ARGS__)
-			#define HID_RI_REPORT_COUNT(DataBits, ...)      _HID_RI_ENTRY(HID_RI_TYPE_GLOBAL, 0x90, DataBits, __VA_ARGS__)
-			#define HID_RI_PUSH(DataBits, ...)              _HID_RI_ENTRY(HID_RI_TYPE_GLOBAL, 0xA0, DataBits, __VA_ARGS__)
-			#define HID_RI_POP(DataBits, ...)               _HID_RI_ENTRY(HID_RI_TYPE_GLOBAL, 0xB0, DataBits, __VA_ARGS__)
-			#define HID_RI_USAGE(DataBits, ...)             _HID_RI_ENTRY(HID_RI_TYPE_LOCAL , 0x00, DataBits, __VA_ARGS__)
-			#define HID_RI_USAGE_MINIMUM(DataBits, ...)     _HID_RI_ENTRY(HID_RI_TYPE_LOCAL , 0x10, DataBits, __VA_ARGS__)
-			#define HID_RI_USAGE_MAXIMUM(DataBits, ...)     _HID_RI_ENTRY(HID_RI_TYPE_LOCAL , 0x20, DataBits, __VA_ARGS__)
-		/**@}*/
-
-/** @} */
-
-#endif
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Class/Common/MIDIClassCommon.h b/NativePrograms/LUFA/Drivers/USB/Class/Common/MIDIClassCommon.h
deleted file mode 100644
index 04d93dbc21..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Class/Common/MIDIClassCommon.h
+++ /dev/null
@@ -1,363 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Common definitions and declarations for the library USB MIDI Class driver.
- *
- *  Common definitions and declarations for the library USB MIDI Class driver.
- *
- *  \note This file should not be included directly. It is automatically included as needed by the USB module driver
- *        dispatch header located in LUFA/Drivers/USB.h.
- */
-
-/** \ingroup Group_USBClassMIDI
- *  \defgroup Group_USBClassMIDICommon  Common Class Definitions
- *
- *  \section Sec_USBClassMIDICommon_ModDescription Module Description
- *  Constants, Types and Enum definitions that are common to both Device and Host modes for the USB
- *  MIDI Class.
- *
- *  @{
- */
-
-#ifndef _MIDI_CLASS_COMMON_H_
-#define _MIDI_CLASS_COMMON_H_
-
-	/* Macros: */
-		#define __INCLUDE_FROM_AUDIO_DRIVER
-
-	/* Includes: */
-		#include "../../Core/StdDescriptors.h"
-		#include "AudioClassCommon.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_MIDI_DRIVER)
-			#error Do not include this file directly. Include LUFA/Drivers/USB.h instead.
-		#endif
-
-	/* Macros: */
-		/** \name MIDI Command Values
-		 *  See http://www.midi.org/techspecs/midimessages.php for more information.
-		 */
-		/**@{*/
-		/** MIDI command for System Exclusive (SysEx) single event that has one byte of data total. */
-		#define MIDI_COMMAND_SYSEX_1BYTE           MIDI_COMMAND_SYSEX_END_1BYTE
-
-		/** MIDI command for System Exclusive (SysEx) single event that has two bytes of data total. */
-		#define MIDI_COMMAND_SYSEX_2BYTE           0x20
-
-		/** MIDI command for System Exclusive (SysEx) single event that has three bytes of data total. */
-		#define MIDI_COMMAND_SYSEX_3BYTE           0x30
-
-		/** MIDI command for System Exclusive (SysEx) stream event that has at least four bytes of data total. */
-		#define MIDI_COMMAND_SYSEX_START_3BYTE     0x40
-
-		/** MIDI command for System Exclusive (SysEx) stream event terminator with one remaining data byte. */
-		#define MIDI_COMMAND_SYSEX_END_1BYTE       0x50
-
-		/** MIDI command for System Exclusive (SysEx) stream event terminator with two remaining data bytes. */
-		#define MIDI_COMMAND_SYSEX_END_2BYTE       0x60
-
-		/** MIDI command for System Exclusive (SysEx) stream event terminator with three remaining data bytes. */
-		#define MIDI_COMMAND_SYSEX_END_3BYTE       0x70
-
-		/** MIDI command for a note off (deactivation) event. */
-		#define MIDI_COMMAND_NOTE_OFF              0x80
-
-		/** MIDI command for a note on (activation) event. */
-		#define MIDI_COMMAND_NOTE_ON               0x90
-
-		/** MIDI command for a note pressure change event. */
-		#define MIDI_COMMAND_NOTE_PRESSURE         0xA0
-
-		/** MIDI command for a control change event. */
-		#define MIDI_COMMAND_CONTROL_CHANGE        0xB0
-
-		/** MIDI command for a control change event. */
-		#define MIDI_COMMAND_PROGRAM_CHANGE        0xC0
-
-		/** MIDI command for a channel pressure change event. */
-		#define MIDI_COMMAND_CHANNEL_PRESSURE      0xD0
-
-		/** MIDI command for a pitch change event. */
-		#define MIDI_COMMAND_PITCH_WHEEL_CHANGE    0xE0
-		/**@}*/
-
-		/** Standard key press velocity value used for all note events. */
-		#define MIDI_STANDARD_VELOCITY             64
-
-		/** Convenience macro. MIDI channels are numbered from 1-10 (natural numbers) however the logical channel
-		 *  addresses are zero-indexed. This converts a natural MIDI channel number into the logical channel address.
-		 *
-		 *  \param[in] channel  MIDI channel number to address.
-		 *
-		 *  \return Constructed MIDI channel ID.
-		 */
-		#define MIDI_CHANNEL(channel)              ((channel) - 1)
-
-		/** Constructs a MIDI event ID from a given MIDI command and a virtual MIDI cable index. This can then be
-		 *  used to create and decode \ref MIDI_EventPacket_t MIDI event packets.
-		 *
-		 *  \param[in] virtualcable  Index of the virtual MIDI cable the event relates to
-		 *  \param[in] command       MIDI command to send through the virtual MIDI cable
-		 *
-		 *  \return Constructed MIDI event ID.
-		 */
-		#define MIDI_EVENT(virtualcable, command)  (((virtualcable) << 4) | ((command) >> 4))
-
-	/* Enums: */
-		/** Enum for the possible MIDI jack types in a MIDI device jack descriptor. */
-		enum MIDI_JackTypes_t
-		{
-			MIDI_JACKTYPE_Embedded = 0x01, /**< MIDI class descriptor jack type value for an embedded (logical) MIDI input or output jack. */
-			MIDI_JACKTYPE_External = 0x02, /**< MIDI class descriptor jack type value for an external (physical) MIDI input or output jack. */
-		};
-
-	/* Type Defines: */
-		/** \brief MIDI class-specific Streaming Interface Descriptor (LUFA naming conventions).
-		 *
-		 *  Type define for an Audio class-specific MIDI streaming interface descriptor. This indicates to the host
-		 *  how MIDI the specification compliance of the device and the total length of the Audio class-specific descriptors.
-		 *  See the USB Audio specification for more details.
-		 *
-		 *  \see \ref USB_MIDI_StdDescriptor_AudioInterface_AS_t for the version of this type with standard element names.
-		 *
-		 *  \note Regardless of CPU architecture, these values should be stored as little endian.
-		 */
-		typedef struct
-		{
-			USB_Descriptor_Header_t Header; /**< Regular descriptor header containing the descriptor's type and length. */
-			uint8_t                 Subtype; /**< Sub type value used to distinguish between audio class-specific descriptors. */
-
-			uint16_t                AudioSpecification; /**< Binary coded decimal value, indicating the supported Audio Class
-			                                             *   specification version.
-			                                             *
-			                                             *   \see \ref VERSION_BCD() utility macro.
-			                                             */
-			uint16_t                TotalLength; /**< Total length of the Audio class-specific descriptors, including this descriptor. */
-		} ATTR_PACKED USB_MIDI_Descriptor_AudioInterface_AS_t;
-
-		/** \brief MIDI class-specific Streaming Interface Descriptor (USB-IF naming conventions).
-		 *
-		 *  Type define for an Audio class-specific MIDI streaming interface descriptor. This indicates to the host
-		 *  how MIDI the specification compliance of the device and the total length of the Audio class-specific descriptors.
-		 *  See the USB Audio specification for more details.
-		 *
-		 *  \see \ref USB_MIDI_Descriptor_AudioInterface_AS_t for the version of this type with non-standard LUFA specific
-		 *       element names.
-		 *
-		 *  \note Regardless of CPU architecture, these values should be stored as little endian.
-		 */
-		typedef struct
-		{
-			uint8_t  bLength; /**< Size of the descriptor, in bytes. */
-			uint8_t  bDescriptorType; /**< Type of the descriptor, either a value in \ref USB_DescriptorTypes_t or a value
-			                           *   given by the specific class.
-			                           */
-
-			uint8_t  bDescriptorSubtype; /**< Sub type value used to distinguish between audio class-specific descriptors. */
-
-			uint16_t bcdMSC; /**< Binary coded decimal value, indicating the supported MIDI Class specification version.
-			                  *
-			                  *   \see \ref VERSION_BCD() utility macro.
-			                  */
-			uint16_t wTotalLength; /**< Total length of the Audio class-specific descriptors, including this descriptor. */
-		} ATTR_PACKED USB_MIDI_StdDescriptor_AudioInterface_AS_t;
-
-		/** \brief MIDI class-specific Input Jack Descriptor (LUFA naming conventions).
-		 *
-		 *  Type define for an Audio class-specific MIDI IN jack. This gives information to the host on a MIDI input, either
-		 *  a physical input jack, or a logical jack (receiving input data internally, or from the host via an endpoint).
-		 *
-		 *  \see \ref USB_MIDI_StdDescriptor_InputJack_t for the version of this type with standard element names.
-		 *
-		 *  \note Regardless of CPU architecture, these values should be stored as little endian.
-		 */
-		typedef struct
-		{
-			USB_Descriptor_Header_t Header; /**< Regular descriptor header containing the descriptor's type and length. */
-			uint8_t                 Subtype; /**< Sub type value used to distinguish between audio class-specific descriptors. */
-
-			uint8_t                 JackType; /**< Type of jack, one of the \c JACKTYPE_* mask values. */
-			uint8_t                 JackID; /**< ID value of this jack - must be a unique value within the device. */
-
-			uint8_t                 JackStrIndex; /**< Index of a string descriptor describing this descriptor within the device. */
-		} ATTR_PACKED USB_MIDI_Descriptor_InputJack_t;
-
-		/** \brief MIDI class-specific Input Jack Descriptor (USB-IF naming conventions).
-		 *
-		 *  Type define for an Audio class-specific MIDI IN jack. This gives information to the host on a MIDI input, either
-		 *  a physical input jack, or a logical jack (receiving input data internally, or from the host via an endpoint).
-		 *
-		 *  \see \ref USB_MIDI_Descriptor_InputJack_t for the version of this type with non-standard LUFA specific
-		 *       element names.
-		 *
-		 *  \note Regardless of CPU architecture, these values should be stored as little endian.
-		 */
-		typedef struct
-		{
-			uint8_t  bLength; /**< Size of the descriptor, in bytes. */
-			uint8_t  bDescriptorType; /**< Type of the descriptor, either a value in \ref USB_DescriptorTypes_t or a value
-			                           *   given by the specific class.
-			                           */
-
-			uint8_t  bDescriptorSubtype; /**< Sub type value used to distinguish between audio class-specific descriptors. */
-
-			uint8_t  bJackType; /**< Type of jack, one of the \c JACKTYPE_* mask values. */
-			uint8_t  bJackID; /**< ID value of this jack - must be a unique value within the device. */
-
-			uint8_t  iJack; /**< Index of a string descriptor describing this descriptor within the device. */
-		} ATTR_PACKED USB_MIDI_StdDescriptor_InputJack_t;
-
-		/** \brief MIDI class-specific Output Jack Descriptor (LUFA naming conventions).
-		 *
-		 *  Type define for an Audio class-specific MIDI OUT jack. This gives information to the host on a MIDI output, either
-		 *  a physical output jack, or a logical jack (sending output data internally, or to the host via an endpoint).
-		 *
-		 *  \see \ref USB_MIDI_StdDescriptor_OutputJack_t for the version of this type with standard element names.
-		 *
-		 *  \note Regardless of CPU architecture, these values should be stored as little endian.
-		 */
-		typedef struct
-		{
-			USB_Descriptor_Header_t   Header; /**< Regular descriptor header containing the descriptor's type and length. */
-			uint8_t                   Subtype; /**< Sub type value used to distinguish between audio class-specific descriptors. */
-
-			uint8_t                   JackType; /**< Type of jack, one of the \c JACKTYPE_* mask values. */
-			uint8_t                   JackID; /**< ID value of this jack - must be a unique value within the device. */
-
-			uint8_t                   NumberOfPins; /**< Number of output channels within the jack, either physical or logical. */
-			uint8_t                   SourceJackID[1]; /**< ID of each output pin's source data jack. */
-			uint8_t                   SourcePinID[1]; /**< Pin number in the input jack of each output pin's source data. */
-
-			uint8_t                   JackStrIndex; /**< Index of a string descriptor describing this descriptor within the device. */
-		} ATTR_PACKED USB_MIDI_Descriptor_OutputJack_t;
-
-		/** \brief MIDI class-specific Output Jack Descriptor (USB-IF naming conventions).
-		 *
-		 *  Type define for an Audio class-specific MIDI OUT jack. This gives information to the host on a MIDI output, either
-		 *  a physical output jack, or a logical jack (sending output data internally, or to the host via an endpoint).
-		 *
-		 *  \see \ref USB_MIDI_Descriptor_OutputJack_t for the version of this type with non-standard LUFA specific
-		 *       element names.
-		 *
-		 *  \note Regardless of CPU architecture, these values should be stored as little endian.
-		 */
-		typedef struct
-		{
-			uint8_t  bLength; /**< Size of the descriptor, in bytes. */
-			uint8_t  bDescriptorType; /**< Type of the descriptor, either a value in \ref USB_DescriptorTypes_t or a value
-			                           *   given by the specific class.
-			                           */
-
-			uint8_t  bDescriptorSubtype; /**< Sub type value used to distinguish between audio class-specific descriptors. */
-
-			uint8_t  bJackType; /**< Type of jack, one of the \c JACKTYPE_* mask values. */
-			uint8_t  bJackID; /**< ID value of this jack - must be a unique value within the device. */
-
-			uint8_t  bNrInputPins; /**< Number of output channels within the jack, either physical or logical. */
-			uint8_t  baSourceID[1]; /**< ID of each output pin's source data jack. */
-			uint8_t  baSourcePin[1]; /**< Pin number in the input jack of each output pin's source data. */
-
-			uint8_t  iJack; /**< Index of a string descriptor describing this descriptor within the device. */
-		} ATTR_PACKED USB_MIDI_StdDescriptor_OutputJack_t;
-
-		/** \brief Audio class-specific Jack Endpoint Descriptor (LUFA naming conventions).
-		 *
-		 *  Type define for an Audio class-specific extended MIDI jack endpoint descriptor. This contains extra information
-		 *  on the usage of MIDI endpoints used to stream MIDI events in and out of the USB Audio device, and follows an Audio
-		 *  class-specific extended MIDI endpoint descriptor. See the USB Audio specification for more details.
-		 *
-		 *  \see \ref USB_MIDI_StdDescriptor_Jack_Endpoint_t for the version of this type with standard element names.
-		 *
-		 *  \note Regardless of CPU architecture, these values should be stored as little endian.
-		 */
-		typedef struct
-		{
-			USB_Descriptor_Header_t   Header; /**< Regular descriptor header containing the descriptor's type and length. */
-			uint8_t                   Subtype; /**< Sub type value used to distinguish between audio class-specific descriptors. */
-
-			uint8_t                   TotalEmbeddedJacks; /**< Total number of jacks inside this endpoint. */
-			uint8_t                   AssociatedJackID[1]; /**< IDs of each jack inside the endpoint. */
-		} ATTR_PACKED USB_MIDI_Descriptor_Jack_Endpoint_t;
-
-		/** \brief Audio class-specific Jack Endpoint Descriptor (USB-IF naming conventions).
-		 *
-		 *  Type define for an Audio class-specific extended MIDI jack endpoint descriptor. This contains extra information
-		 *  on the usage of MIDI endpoints used to stream MIDI events in and out of the USB Audio device, and follows an Audio
-		 *  class-specific extended MIDI endpoint descriptor. See the USB Audio specification for more details.
-		 *
-		 *  \see \ref USB_MIDI_Descriptor_Jack_Endpoint_t for the version of this type with non-standard LUFA specific
-		 *       element names.
-		 *
-		 *  \note Regardless of CPU architecture, these values should be stored as little endian.
-		 */
-		typedef struct
-		{
-			uint8_t  bLength; /**< Size of the descriptor, in bytes. */
-			uint8_t  bDescriptorType; /**< Type of the descriptor, either a value in \ref USB_DescriptorTypes_t or a value
-			                           *   given by the specific class.
-			                           */
-
-			uint8_t  bDescriptorSubtype; /**< Sub type value used to distinguish between audio class-specific descriptors. */
-
-			uint8_t  bNumEmbMIDIJack; /**< Total number of jacks inside this endpoint. */
-			uint8_t  bAssocJackID[1]; /**< IDs of each jack inside the endpoint. */
-		} ATTR_PACKED USB_MIDI_StdDescriptor_Jack_Endpoint_t;
-
-		/** \brief MIDI Class Driver Event Packet.
-		 *
-		 *  Type define for a USB MIDI event packet, used to encapsulate sent and received MIDI messages from a USB MIDI interface.
-		 *
-		 *  \note Regardless of CPU architecture, these values should be stored as little endian.
-		 */
-		typedef struct
-		{
-			uint8_t  Event; /**< MIDI event type, constructed with the \ref MIDI_EVENT() macro. */
-
-			uint8_t  Data1; /**< First byte of data in the MIDI event. */
-			uint8_t  Data2; /**< Second byte of data in the MIDI event. */
-			uint8_t  Data3; /**< Third byte of data in the MIDI event. */
-		} ATTR_PACKED MIDI_EventPacket_t;
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Class/Common/MassStorageClassCommon.h b/NativePrograms/LUFA/Drivers/USB/Class/Common/MassStorageClassCommon.h
deleted file mode 100644
index 2138cdb3e8..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Class/Common/MassStorageClassCommon.h
+++ /dev/null
@@ -1,368 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Common definitions and declarations for the library USB Mass Storage Class driver.
- *
- *  Common definitions and declarations for the library USB Mass Storage Class driver.
- *
- *  \note This file should not be included directly. It is automatically included as needed by the USB module driver
- *        dispatch header located in LUFA/Drivers/USB.h.
- */
-
-/** \ingroup Group_USBClassMS
- *  \defgroup Group_USBClassMSCommon  Common Class Definitions
- *
- *  \section Sec_USBClassMSCommon_ModDescription Module Description
- *  Constants, Types and Enum definitions that are common to both Device and Host modes for the USB
- *  Mass Storage Class.
- *
- *  @{
- */
-
-#ifndef _MS_CLASS_COMMON_H_
-#define _MS_CLASS_COMMON_H_
-
-	/* Includes: */
-		#include "../../Core/StdDescriptors.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_MS_DRIVER)
-			#error Do not include this file directly. Include LUFA/Drivers/USB.h instead.
-		#endif
-
-	/* Macros: */
-		/** Magic signature for a Command Block Wrapper used in the Mass Storage Bulk-Only transport protocol. */
-		#define MS_CBW_SIGNATURE                               0x43425355UL
-
-		/** Magic signature for a Command Status Wrapper used in the Mass Storage Bulk-Only transport protocol. */
-		#define MS_CSW_SIGNATURE                               0x53425355UL
-
-		/** Mask for a Command Block Wrapper's flags attribute to specify a command with data sent from host-to-device. */
-		#define MS_COMMAND_DIR_DATA_OUT                        (0 << 7)
-
-		/** Mask for a Command Block Wrapper's flags attribute to specify a command with data sent from device-to-host. */
-		#define MS_COMMAND_DIR_DATA_IN                         (1 << 7)
-
-		/** \name SCSI Commands*/
-		/**@{*/
-		/** SCSI Command Code for an INQUIRY command. */
-		#define SCSI_CMD_INQUIRY                               0x12
-
-		/** SCSI Command Code for a REQUEST SENSE command. */
-		#define SCSI_CMD_REQUEST_SENSE                         0x03
-
-		/** SCSI Command Code for a TEST UNIT READY command. */
-		#define SCSI_CMD_TEST_UNIT_READY                       0x00
-
-		/** SCSI Command Code for a READ CAPACITY (10) command. */
-		#define SCSI_CMD_READ_CAPACITY_10                      0x25
-
-		/** SCSI Command Code for a START STOP UNIT command. */
-		#define SCSI_CMD_START_STOP_UNIT                       0x1B
-
-		/** SCSI Command Code for a SEND DIAGNOSTIC command. */
-		#define SCSI_CMD_SEND_DIAGNOSTIC                       0x1D
-
-		/** SCSI Command Code for a PREVENT ALLOW MEDIUM REMOVAL command. */
-		#define SCSI_CMD_PREVENT_ALLOW_MEDIUM_REMOVAL          0x1E
-
-		/** SCSI Command Code for a WRITE (10) command. */
-		#define SCSI_CMD_WRITE_10                              0x2A
-
-		/** SCSI Command Code for a READ (10) command. */
-		#define SCSI_CMD_READ_10                               0x28
-
-		/** SCSI Command Code for a WRITE (6) command. */
-		#define SCSI_CMD_WRITE_6                               0x0A
-
-		/** SCSI Command Code for a READ (6) command. */
-		#define SCSI_CMD_READ_6                                0x08
-
-		/** SCSI Command Code for a VERIFY (10) command. */
-		#define SCSI_CMD_VERIFY_10                             0x2F
-
-		/** SCSI Command Code for a MODE SENSE (6) command. */
-		#define SCSI_CMD_MODE_SENSE_6                          0x1A
-
-		/** SCSI Command Code for a MODE SENSE (10) command. */
-		#define SCSI_CMD_MODE_SENSE_10                         0x5A
-		/**@}*/
-
-		/** \name SCSI Sense Key Values */
-		/**@{*/
-		/** SCSI Sense Code to indicate no error has occurred. */
-		#define SCSI_SENSE_KEY_GOOD                            0x00
-
-		/** SCSI Sense Code to indicate that the device has recovered from an error. */
-		#define SCSI_SENSE_KEY_RECOVERED_ERROR                 0x01
-
-		/** SCSI Sense Code to indicate that the device is not ready for a new command. */
-		#define SCSI_SENSE_KEY_NOT_READY                       0x02
-
-		/** SCSI Sense Code to indicate an error whilst accessing the medium. */
-		#define SCSI_SENSE_KEY_MEDIUM_ERROR                    0x03
-
-		/** SCSI Sense Code to indicate a hardware error has occurred. */
-		#define SCSI_SENSE_KEY_HARDWARE_ERROR                  0x04
-
-		/** SCSI Sense Code to indicate that an illegal request has been issued. */
-		#define SCSI_SENSE_KEY_ILLEGAL_REQUEST                 0x05
-
-		/** SCSI Sense Code to indicate that the unit requires attention from the host to indicate
-		 *  a reset event, medium removal or other condition.
-		 */
-		#define SCSI_SENSE_KEY_UNIT_ATTENTION                  0x06
-
-		/** SCSI Sense Code to indicate that a write attempt on a protected block has been made. */
-		#define SCSI_SENSE_KEY_DATA_PROTECT                    0x07
-
-		/** SCSI Sense Code to indicate an error while trying to write to a write-once medium. */
-		#define SCSI_SENSE_KEY_BLANK_CHECK                     0x08
-
-		/** SCSI Sense Code to indicate a vendor specific error has occurred. */
-		#define SCSI_SENSE_KEY_VENDOR_SPECIFIC                 0x09
-
-		/** SCSI Sense Code to indicate that an EXTENDED COPY command has aborted due to an error. */
-		#define SCSI_SENSE_KEY_COPY_ABORTED                    0x0A
-
-		/** SCSI Sense Code to indicate that the device has aborted the issued command. */
-		#define SCSI_SENSE_KEY_ABORTED_COMMAND                 0x0B
-
-		/** SCSI Sense Code to indicate an attempt to write past the end of a partition has been made. */
-		#define SCSI_SENSE_KEY_VOLUME_OVERFLOW                 0x0D
-
-		/** SCSI Sense Code to indicate that the source data did not match the data read from the medium. */
-		#define SCSI_SENSE_KEY_MISCOMPARE                      0x0E
-		/**@}*/
-
-		/** \name SCSI Additional Sense Codes */
-		/**@{*/
-		/** SCSI Additional Sense Code to indicate no additional sense information is available. */
-		#define SCSI_ASENSE_NO_ADDITIONAL_INFORMATION          0x00
-
-		/** SCSI Additional Sense Code to indicate that the logical unit (LUN) addressed is not ready. */
-		#define SCSI_ASENSE_LOGICAL_UNIT_NOT_READY             0x04
-
-		/** SCSI Additional Sense Code to indicate an invalid field was encountered while processing the issued command. */
-		#define SCSI_ASENSE_INVALID_FIELD_IN_CDB               0x24
-
-		/** SCSI Additional Sense Code to indicate that a medium that was previously indicated as not ready has now
-		 *  become ready for use.
-		 */
-		#define SCSI_ASENSE_NOT_READY_TO_READY_CHANGE          0x28
-
-		/** SCSI Additional Sense Code to indicate that an attempt to write to a protected area was made. */
-		#define SCSI_ASENSE_WRITE_PROTECTED                    0x27
-
-		/** SCSI Additional Sense Code to indicate an error whilst formatting the device medium. */
-		#define SCSI_ASENSE_FORMAT_ERROR                       0x31
-
-		/** SCSI Additional Sense Code to indicate an invalid command was issued. */
-		#define SCSI_ASENSE_INVALID_COMMAND                    0x20
-
-		/** SCSI Additional Sense Code to indicate a write to a block out outside of the medium's range was issued. */
-		#define SCSI_ASENSE_LOGICAL_BLOCK_ADDRESS_OUT_OF_RANGE 0x21
-
-		/** SCSI Additional Sense Code to indicate that no removable medium is inserted into the device. */
-		#define SCSI_ASENSE_MEDIUM_NOT_PRESENT                 0x3A
-		/**@}*/
-
-		/** \name SCSI Additional Sense Key Code Qualifiers */
-		/**@{*/
-		/** SCSI Additional Sense Qualifier Code to indicate no additional sense qualifier information is available. */
-		#define SCSI_ASENSEQ_NO_QUALIFIER                      0x00
-
-		/** SCSI Additional Sense Qualifier Code to indicate that a medium format command failed to complete. */
-		#define SCSI_ASENSEQ_FORMAT_COMMAND_FAILED             0x01
-
-		/** SCSI Additional Sense Qualifier Code to indicate that an initializing command must be issued before the issued
-		 *  command can be executed.
-		 */
-		#define SCSI_ASENSEQ_INITIALIZING_COMMAND_REQUIRED     0x02
-
-		/** SCSI Additional Sense Qualifier Code to indicate that an operation is currently in progress. */
-		#define SCSI_ASENSEQ_OPERATION_IN_PROGRESS             0x07
-		/**@}*/
-
-	/* Enums: */
-		/** Enum for possible Class, Subclass and Protocol values of device and interface descriptors relating to the Mass
-		 *  Storage device class.
-		 */
-		enum MS_Descriptor_ClassSubclassProtocol_t
-		{
-			MS_CSCP_MassStorageClass          = 0x08, /**< Descriptor Class value indicating that the device or interface
-			                                           *   belongs to the Mass Storage class.
-			                                           */
-			MS_CSCP_SCSITransparentSubclass   = 0x06, /**< Descriptor Subclass value indicating that the device or interface
-			                                           *   belongs to the SCSI Transparent Command Set subclass of the Mass
-			                                           *   storage class.
-			                                           */
-			MS_CSCP_BulkOnlyTransportProtocol = 0x50, /**< Descriptor Protocol value indicating that the device or interface
-			                                           *   belongs to the Bulk Only Transport protocol of the Mass Storage class.
-			                                           */
-		};
-
-		/** Enum for the Mass Storage class specific control requests that can be issued by the USB bus host. */
-		enum MS_ClassRequests_t
-		{
-			MS_REQ_GetMaxLUN                  = 0xFE, /**< Mass Storage class-specific request to retrieve the total number of Logical
-			                                           *   Units (drives) in the SCSI device.
-			                                           */
-			MS_REQ_MassStorageReset           = 0xFF, /**< Mass Storage class-specific request to reset the Mass Storage interface,
-			                                           *   ready for the next command.
-		                                               */
-		};
-
-		/** Enum for the possible command status wrapper return status codes. */
-		enum MS_CommandStatusCodes_t
-		{
-			MS_SCSI_COMMAND_Pass              = 0, /**< Command completed with no error */
-			MS_SCSI_COMMAND_Fail              = 1, /**< Command failed to complete - host may check the exact error via a
-			                                        *   SCSI REQUEST SENSE command.
-			                                        */
-			MS_SCSI_COMMAND_PhaseError        = 2, /**< Command failed due to being invalid in the current phase. */
-		};
-
-	/* Type Defines: */
-		/** \brief Mass Storage Class Command Block Wrapper.
-		 *
-		 *  Type define for a Command Block Wrapper, used in the Mass Storage Bulk-Only Transport protocol.
-		 *
-		 *  \note Regardless of CPU architecture, these values should be stored as little endian.
-		 */
-		typedef struct
-		{
-			uint32_t Signature; /**< Command block signature, must be \ref MS_CBW_SIGNATURE to indicate a valid Command Block. */
-			uint32_t Tag; /**< Unique command ID value, to associate a command block wrapper with its command status wrapper. */
-			uint32_t DataTransferLength; /**< Length of the optional data portion of the issued command, in bytes. */
-			uint8_t  Flags; /**< Command block flags, indicating command data direction. */
-			uint8_t  LUN; /**< Logical Unit number this command is issued to. */
-			uint8_t  SCSICommandLength; /**< Length of the issued SCSI command within the SCSI command data array. */
-			uint8_t  SCSICommandData[16]; /**< Issued SCSI command in the Command Block. */
-		} ATTR_PACKED MS_CommandBlockWrapper_t;
-
-		/** \brief Mass Storage Class Command Status Wrapper.
-		 *
-		 *  Type define for a Command Status Wrapper, used in the Mass Storage Bulk-Only Transport protocol.
-		 *
-		 *  \note Regardless of CPU architecture, these values should be stored as little endian.
-		 */
-		typedef struct
-		{
-			uint32_t Signature; /**< Status block signature, must be \ref MS_CSW_SIGNATURE to indicate a valid Command Status. */
-			uint32_t Tag; /**< Unique command ID value, to associate a command block wrapper with its command status wrapper. */
-			uint32_t DataTransferResidue; /**< Number of bytes of data not processed in the SCSI command. */
-			uint8_t  Status; /**< Status code of the issued command - a value from the \ref MS_CommandStatusCodes_t enum. */
-		} ATTR_PACKED MS_CommandStatusWrapper_t;
-
-		/** \brief Mass Storage Class SCSI Sense Structure
-		 *
-		 *  Type define for a SCSI Sense structure. Structures of this type are filled out by the
-		 *  device via the \ref MS_Host_RequestSense() function, indicating the current sense data of the
-		 *  device (giving explicit error codes for the last issued command). For details of the
-		 *  structure contents, refer to the SCSI specifications.
-		 */
-		typedef struct
-		{
-			uint8_t  ResponseCode;
-
-			uint8_t  SegmentNumber;
-
-			unsigned SenseKey            : 4;
-			unsigned Reserved            : 1;
-			unsigned ILI                 : 1;
-			unsigned EOM                 : 1;
-			unsigned FileMark            : 1;
-
-			uint8_t  Information[4];
-			uint8_t  AdditionalLength;
-			uint8_t  CmdSpecificInformation[4];
-			uint8_t  AdditionalSenseCode;
-			uint8_t  AdditionalSenseQualifier;
-			uint8_t  FieldReplaceableUnitCode;
-			uint8_t  SenseKeySpecific[3];
-		} ATTR_PACKED SCSI_Request_Sense_Response_t;
-
-		/** \brief Mass Storage Class SCSI Inquiry Structure.
-		 *
-		 *  Type define for a SCSI Inquiry structure. Structures of this type are filled out by the
-		 *  device via the \ref MS_Host_GetInquiryData() function, retrieving the attached device's
-		 *  information.
-		 *
-		 *  For details of the structure contents, refer to the SCSI specifications.
-		 */
-		typedef struct
-		{
-			unsigned DeviceType          : 5;
-			unsigned PeripheralQualifier : 3;
-
-			unsigned Reserved            : 7;
-			unsigned Removable           : 1;
-
-			uint8_t  Version;
-
-			unsigned ResponseDataFormat  : 4;
-			unsigned Reserved2           : 1;
-			unsigned NormACA             : 1;
-			unsigned TrmTsk              : 1;
-			unsigned AERC                : 1;
-
-			uint8_t  AdditionalLength;
-			uint8_t  Reserved3[2];
-
-			unsigned SoftReset           : 1;
-			unsigned CmdQue              : 1;
-			unsigned Reserved4           : 1;
-			unsigned Linked              : 1;
-			unsigned Sync                : 1;
-			unsigned WideBus16Bit        : 1;
-			unsigned WideBus32Bit        : 1;
-			unsigned RelAddr             : 1;
-
-			uint8_t  VendorID[8];
-			uint8_t  ProductID[16];
-			uint8_t  RevisionID[4];
-		} ATTR_PACKED SCSI_Inquiry_Response_t;
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Class/Common/PrinterClassCommon.h b/NativePrograms/LUFA/Drivers/USB/Class/Common/PrinterClassCommon.h
deleted file mode 100644
index 863f9a1707..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Class/Common/PrinterClassCommon.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Common definitions and declarations for the library USB Printer Class driver.
- *
- *  Common definitions and declarations for the library USB Printer Class driver.
- *
- *  \note This file should not be included directly. It is automatically included as needed by the USB module driver
- *        dispatch header located in LUFA/Drivers/USB.h.
- */
-
-/** \ingroup Group_USBClassPrinter
- *  \defgroup Group_USBClassPrinterCommon  Common Class Definitions
- *
- *  \section Sec_USBClassPrinterCommon_ModDescription Module Description
- *  Constants, Types and Enum definitions that are common to both Device and Host modes for the USB
- *  Printer Class.
- *
- *  @{
- */
-
-#ifndef _PRINTER_CLASS_COMMON_H_
-#define _PRINTER_CLASS_COMMON_H_
-
-	/* Includes: */
-		#include "../../Core/StdDescriptors.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_PRINTER_DRIVER)
-			#error Do not include this file directly. Include LUFA/Drivers/USB.h instead.
-		#endif
-
-	/* Macros: */
-		/** \name Virtual Printer Status Line Masks */
-		/**@{*/
-		/** Port status mask for a printer device, indicating that an error has *not* occurred. */
-		#define PRNT_PORTSTATUS_NOTERROR    (1 << 3)
-
-		/** Port status mask for a printer device, indicating that the device is currently selected. */
-		#define PRNT_PORTSTATUS_SELECT      (1 << 4)
-
-		/** Port status mask for a printer device, indicating that the device is currently out of paper. */
-		#define PRNT_PORTSTATUS_PAPEREMPTY  (1 << 5)
-		/**@}*/
-
-	/* Enums: */
-		/** Enum for possible Class, Subclass and Protocol values of device and interface descriptors relating to the Printer
-		 *  device class.
-		 */
-		enum PRNT_Descriptor_ClassSubclassProtocol_t
-		{
-			PRNT_CSCP_PrinterClass          = 0x07, /**< Descriptor Class value indicating that the device or interface
-			                                         *   belongs to the Printer class.
-			                                         */
-			PRNT_CSCP_PrinterSubclass       = 0x01, /**< Descriptor Subclass value indicating that the device or interface
-			                                         *   belongs to the Printer subclass.
-			                                         */
-			PRNT_CSCP_BidirectionalProtocol = 0x02, /**< Descriptor Protocol value indicating that the device or interface
-			                                         *   belongs to the Bidirectional protocol of the Printer class.
-			                                         */
-		};
-
-		/** Enum for the Printer class specific control requests that can be issued by the USB bus host. */
-		enum PRNT_ClassRequests_t
-		{
-			PRNT_REQ_GetDeviceID            = 0x00, /**< Printer class-specific request to retrieve the Unicode ID
-			                                         *   string of the device, containing the device's name, manufacturer
-			                                         *   and supported printer languages.
-			                                         */
-			PRNT_REQ_GetPortStatus          = 0x01, /**< Printer class-specific request to get the current status of the
-			                                         *   virtual printer port, for device selection and ready states.
-			                                         */
-			PRNT_REQ_SoftReset              = 0x02, /**< Printer class-specific request to reset the device, ready for new
-			                                         *   printer commands.
-			                                         */
-		};
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Class/Common/RNDISClassCommon.h b/NativePrograms/LUFA/Drivers/USB/Class/Common/RNDISClassCommon.h
deleted file mode 100644
index a73039939d..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Class/Common/RNDISClassCommon.h
+++ /dev/null
@@ -1,411 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Common definitions and declarations for the library USB RNDIS Class driver.
- *
- *  Common definitions and declarations for the library USB RNDIS Class driver.
- *
- *  \note This file should not be included directly. It is automatically included as needed by the USB module driver
- *        dispatch header located in LUFA/Drivers/USB.h.
- */
-
-/** \ingroup Group_USBClassRNDIS
- *  \defgroup Group_USBClassRNDISCommon  Common Class Definitions
- *
- *  \section Sec_USBClassRNDISCommon_ModDescription Module Description
- *  Constants, Types and Enum definitions that are common to both Device and Host modes for the USB
- *  RNDIS Class.
- *
- *  @{
- */
-
-#ifndef _RNDIS_CLASS_COMMON_H_
-#define _RNDIS_CLASS_COMMON_H_
-
-	/* Macros: */
-		#define __INCLUDE_FROM_CDC_DRIVER
-
-	/* Includes: */
-		#include "../../Core/StdDescriptors.h"
-		#include "CDCClassCommon.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_RNDIS_DRIVER)
-			#error Do not include this file directly. Include LUFA/Drivers/USB.h instead.
-		#endif
-
-	/* Macros: */
-		/** Additional error code for RNDIS functions when a device returns a logical command failure. */
-		#define RNDIS_ERROR_LOGICAL_CMD_FAILED        0x80
-
-		/** Implemented RNDIS Version Major. */
-		#define REMOTE_NDIS_VERSION_MAJOR             0x01
-
-		/** Implemented RNDIS Version Minor. */
-		#define REMOTE_NDIS_VERSION_MINOR             0x00
-
-		/** \name RNDIS Message Values */
-		/**@{*/
-		#define REMOTE_NDIS_PACKET_MSG                0x00000001UL
-		#define REMOTE_NDIS_INITIALIZE_MSG            0x00000002UL
-		#define REMOTE_NDIS_HALT_MSG                  0x00000003UL
-		#define REMOTE_NDIS_QUERY_MSG                 0x00000004UL
-		#define REMOTE_NDIS_SET_MSG                   0x00000005UL
-		#define REMOTE_NDIS_RESET_MSG                 0x00000006UL
-		#define REMOTE_NDIS_INDICATE_STATUS_MSG       0x00000007UL
-		#define REMOTE_NDIS_KEEPALIVE_MSG             0x00000008UL
-		/**@}*/
-
-		/** \name RNDIS Response Values */
-		/**@{*/
-		#define REMOTE_NDIS_INITIALIZE_CMPLT          0x80000002UL
-		#define REMOTE_NDIS_QUERY_CMPLT               0x80000004UL
-		#define REMOTE_NDIS_SET_CMPLT                 0x80000005UL
-		#define REMOTE_NDIS_RESET_CMPLT               0x80000006UL
-		#define REMOTE_NDIS_KEEPALIVE_CMPLT           0x80000008UL
-		/**@}*/
-
-		/** \name RNDIS Status Values */
-		/**@{*/
-		#define REMOTE_NDIS_STATUS_SUCCESS            0x00000000UL
-		#define REMOTE_NDIS_STATUS_FAILURE            0xC0000001UL
-		#define REMOTE_NDIS_STATUS_INVALID_DATA       0xC0010015UL
-		#define REMOTE_NDIS_STATUS_NOT_SUPPORTED      0xC00000BBUL
-		#define REMOTE_NDIS_STATUS_MEDIA_CONNECT      0x4001000BUL
-		#define REMOTE_NDIS_STATUS_MEDIA_DISCONNECT   0x4001000CUL
-		/**@}*/
-
-		/** \name RNDIS Media States */
-		/**@{*/
-		#define REMOTE_NDIS_MEDIA_STATE_CONNECTED     0x00000000UL
-		#define REMOTE_NDIS_MEDIA_STATE_DISCONNECTED  0x00000001UL
-		/**@}*/
-
-		/** \name RNDIS Media Types */
-		/**@{*/
-		#define REMOTE_NDIS_MEDIUM_802_3              0x00000000UL
-		/**@}*/
-
-		/** \name RNDIS Connection Types */
-		/**@{*/
-		#define REMOTE_NDIS_DF_CONNECTIONLESS	      0x00000001UL
-		#define REMOTE_NDIS_DF_CONNECTION_ORIENTED    0x00000002UL
-		/**@}*/
-
-		/** \name RNDIS Packet Types */
-		/**@{*/
-		#define REMOTE_NDIS_PACKET_DIRECTED           0x00000001UL
-		#define REMOTE_NDIS_PACKET_MULTICAST          0x00000002UL
-		#define REMOTE_NDIS_PACKET_ALL_MULTICAST      0x00000004UL
-		#define REMOTE_NDIS_PACKET_BROADCAST          0x00000008UL
-		#define REMOTE_NDIS_PACKET_SOURCE_ROUTING     0x00000010UL
-		#define REMOTE_NDIS_PACKET_PROMISCUOUS        0x00000020UL
-		#define REMOTE_NDIS_PACKET_SMT                0x00000040UL
-		#define REMOTE_NDIS_PACKET_ALL_LOCAL          0x00000080UL
-		#define REMOTE_NDIS_PACKET_GROUP              0x00001000UL
-		#define REMOTE_NDIS_PACKET_ALL_FUNCTIONAL     0x00002000UL
-		#define REMOTE_NDIS_PACKET_FUNCTIONAL         0x00004000UL
-		#define REMOTE_NDIS_PACKET_MAC_FRAME          0x00008000UL
-		/**@}*/
-
-		/** \name RNDIS OID Values */
-		/**@{*/
-		#define OID_GEN_SUPPORTED_LIST                0x00010101UL
-		#define OID_GEN_HARDWARE_STATUS               0x00010102UL
-		#define OID_GEN_MEDIA_SUPPORTED               0x00010103UL
-		#define OID_GEN_MEDIA_IN_USE                  0x00010104UL
-		#define OID_GEN_MAXIMUM_FRAME_SIZE            0x00010106UL
-		#define OID_GEN_MAXIMUM_TOTAL_SIZE            0x00010111UL
-		#define OID_GEN_LINK_SPEED                    0x00010107UL
-		#define OID_GEN_TRANSMIT_BLOCK_SIZE           0x0001010AUL
-		#define OID_GEN_RECEIVE_BLOCK_SIZE            0x0001010BUL
-		#define OID_GEN_VENDOR_ID                     0x0001010CUL
-		#define OID_GEN_VENDOR_DESCRIPTION            0x0001010DUL
-		#define OID_GEN_CURRENT_PACKET_FILTER         0x0001010EUL
-		#define OID_GEN_MAXIMUM_TOTAL_SIZE            0x00010111UL
-		#define OID_GEN_MEDIA_CONNECT_STATUS          0x00010114UL
-		#define OID_GEN_PHYSICAL_MEDIUM               0x00010202UL
-		#define OID_GEN_XMIT_OK                       0x00020101UL
-		#define OID_GEN_RCV_OK                        0x00020102UL
-		#define OID_GEN_XMIT_ERROR                    0x00020103UL
-		#define OID_GEN_RCV_ERROR                     0x00020104UL
-		#define OID_GEN_RCV_NO_BUFFER                 0x00020105UL
-		#define OID_802_3_PERMANENT_ADDRESS           0x01010101UL
-		#define OID_802_3_CURRENT_ADDRESS             0x01010102UL
-		#define OID_802_3_MULTICAST_LIST              0x01010103UL
-		#define OID_802_3_MAXIMUM_LIST_SIZE           0x01010104UL
-		#define OID_802_3_RCV_ERROR_ALIGNMENT         0x01020101UL
-		#define OID_802_3_XMIT_ONE_COLLISION          0x01020102UL
-		#define OID_802_3_XMIT_MORE_COLLISIONS        0x01020103UL
-		/**@}*/
-
-		/** Maximum size in bytes of an Ethernet frame according to the Ethernet standard. */
-		#define ETHERNET_FRAME_SIZE_MAX               1500
-
-	/* Enums: */
-		/** Enum for the RNDIS class specific control requests that can be issued by the USB bus host. */
-		enum RNDIS_ClassRequests_t
-		{
-			RNDIS_REQ_SendEncapsulatedCommand = 0x00, /**< RNDIS request to issue a host-to-device NDIS command. */
-			RNDIS_REQ_GetEncapsulatedResponse = 0x01, /**< RNDIS request to issue a device-to-host NDIS response. */
-		};
-
-		/** Enum for the possible NDIS adapter states. */
-		enum RNDIS_States_t
-		{
-			RNDIS_Uninitialized    = 0, /**< Adapter currently uninitialized. */
-			RNDIS_Initialized      = 1, /**< Adapter currently initialized but not ready for data transfers. */
-			RNDIS_Data_Initialized = 2, /**< Adapter currently initialized and ready for data transfers. */
-		};
-
-		/** Enum for the RNDIS class specific notification requests that can be issued by a RNDIS device to a host. */
-		enum RNDIS_ClassNotifications_t
-		{
-			RNDIS_NOTIF_ResponseAvailable = 0x01, /**< Notification request value for a RNDIS Response Available notification. */
-		};
-
-		/** Enum for the NDIS hardware states. */
-		enum NDIS_Hardware_Status_t
-		{
-			NDIS_HardwareStatus_Ready, /**< Hardware Ready to accept commands from the host. */
-			NDIS_HardwareStatus_Initializing, /**< Hardware busy initializing. */
-			NDIS_HardwareStatus_Reset, /**< Hardware reset. */
-			NDIS_HardwareStatus_Closing, /**< Hardware currently closing. */
-			NDIS_HardwareStatus_NotReady /**< Hardware not ready to accept commands from the host. */
-		};
-
-	/* Type Defines: */
-		/** \brief MAC Address Structure.
-		 *
-		 *  Type define for a physical MAC address of a device on a network.
-		 */
-		typedef struct
-		{
-			uint8_t Octets[6]; /**< Individual bytes of a MAC address */
-		} ATTR_PACKED MAC_Address_t;
-
-		/** \brief RNDIS Common Message Header Structure.
-		 *
-		 *  Type define for a RNDIS message header, sent before RNDIS messages.
-		 *
-		 *  \note Regardless of CPU architecture, these values should be stored as little endian.
-		 */
-		typedef struct
-		{
-			uint32_t MessageType; /**< RNDIS message type, a \c REMOTE_NDIS_*_MSG constant */
-			uint32_t MessageLength; /**< Total length of the RNDIS message, in bytes */
-		} ATTR_PACKED RNDIS_Message_Header_t;
-
-		/** \brief RNDIS Message Structure.
-		 *
-		 *  Type define for a RNDIS packet message, used to encapsulate Ethernet packets sent to and from the adapter.
-		 *
-		 *  \note Regardless of CPU architecture, these values should be stored as little endian.
-		 */
-		typedef struct
-		{
-			uint32_t MessageType;
-			uint32_t MessageLength;
-			uint32_t DataOffset;
-			uint32_t DataLength;
-			uint32_t OOBDataOffset;
-			uint32_t OOBDataLength;
-			uint32_t NumOOBDataElements;
-			uint32_t PerPacketInfoOffset;
-			uint32_t PerPacketInfoLength;
-			uint32_t VcHandle;
-			uint32_t Reserved;
-		} ATTR_PACKED RNDIS_Packet_Message_t;
-
-		/** \brief RNDIS Initialization Message Structure.
-		 *
-		 *  Type define for a RNDIS Initialize command message.
-		 *
-		 *  \note Regardless of CPU architecture, these values should be stored as little endian.
-		 */
-		typedef struct
-		{
-			uint32_t MessageType;
-			uint32_t MessageLength;
-			uint32_t RequestId;
-
-			uint32_t MajorVersion;
-			uint32_t MinorVersion;
-			uint32_t MaxTransferSize;
-		} ATTR_PACKED RNDIS_Initialize_Message_t;
-
-		/** \brief RNDIS Initialize Complete Message Structure.
-		 *
-		 *  Type define for a RNDIS Initialize Complete response message.
-		 *
-		 *  \note Regardless of CPU architecture, these values should be stored as little endian.
-		 */
-		typedef struct
-		{
-			uint32_t MessageType;
-			uint32_t MessageLength;
-			uint32_t RequestId;
-			uint32_t Status;
-
-			uint32_t MajorVersion;
-			uint32_t MinorVersion;
-			uint32_t DeviceFlags;
-			uint32_t Medium;
-			uint32_t MaxPacketsPerTransfer;
-			uint32_t MaxTransferSize;
-			uint32_t PacketAlignmentFactor;
-			uint32_t AFListOffset;
-			uint32_t AFListSize;
-		} ATTR_PACKED RNDIS_Initialize_Complete_t;
-
-		/** \brief RNDIS Keep Alive Message Structure.
-		 *
-		 *  Type define for a RNDIS Keep Alive command message.
-		 *
-		 *  \note Regardless of CPU architecture, these values should be stored as little endian.
-		 */
-		typedef struct
-		{
-			uint32_t MessageType;
-			uint32_t MessageLength;
-			uint32_t RequestId;
-		} ATTR_PACKED RNDIS_KeepAlive_Message_t;
-
-		/** \brief RNDIS Keep Alive Complete Message Structure.
-		 *
-		 *  Type define for a RNDIS Keep Alive Complete response message.
-		 *
-		 *  \note Regardless of CPU architecture, these values should be stored as little endian.
-		 */
-		typedef struct
-		{
-			uint32_t MessageType;
-			uint32_t MessageLength;
-			uint32_t RequestId;
-			uint32_t Status;
-		} ATTR_PACKED RNDIS_KeepAlive_Complete_t;
-
-		/** \brief RNDIS Reset Complete Message Structure.
-		 *
-		 *  Type define for a RNDIS Reset Complete response message.
-		 *
-		 *  \note Regardless of CPU architecture, these values should be stored as little endian.
-		 */
-		typedef struct
-		{
-			uint32_t MessageType;
-			uint32_t MessageLength;
-			uint32_t Status;
-
-			uint32_t AddressingReset;
-		} ATTR_PACKED RNDIS_Reset_Complete_t;
-
-		/** \brief RNDIS OID Property Set Message Structure.
-		 *
-		 *  Type define for a RNDIS OID Property Set command message.
-		 *
-		 *  \note Regardless of CPU architecture, these values should be stored as little endian.
-		 */
-		typedef struct
-		{
-			uint32_t MessageType;
-			uint32_t MessageLength;
-			uint32_t RequestId;
-
-			uint32_t Oid;
-			uint32_t InformationBufferLength;
-			uint32_t InformationBufferOffset;
-			uint32_t DeviceVcHandle;
-		} ATTR_PACKED RNDIS_Set_Message_t;
-
-		/** \brief RNDIS OID Property Set Complete Message Structure.
-		 *
-		 *  Type define for a RNDIS OID Property Set Complete response message.
-		 *
-		 *  \note Regardless of CPU architecture, these values should be stored as little endian.
-		 */
-		typedef struct
-		{
-			uint32_t MessageType;
-			uint32_t MessageLength;
-			uint32_t RequestId;
-			uint32_t Status;
-		} ATTR_PACKED RNDIS_Set_Complete_t;
-
-		/** \brief RNDIS OID Property Query Message Structure.
-		 *
-		 *  Type define for a RNDIS OID Property Query command message.
-		 *
-		 *  \note Regardless of CPU architecture, these values should be stored as little endian.
-		 */
-		typedef struct
-		{
-			uint32_t MessageType;
-			uint32_t MessageLength;
-			uint32_t RequestId;
-
-			uint32_t Oid;
-			uint32_t InformationBufferLength;
-			uint32_t InformationBufferOffset;
-			uint32_t DeviceVcHandle;
-		} ATTR_PACKED RNDIS_Query_Message_t;
-
-		/** \brief RNDIS OID Property Query Complete Message Structure.
-		 *
-		 *  Type define for a RNDIS OID Property Query Complete response message.
-		 *
-		 *  \note Regardless of CPU architecture, these values should be stored as little endian.
-		 */
-		typedef struct
-		{
-			uint32_t MessageType;
-			uint32_t MessageLength;
-			uint32_t RequestId;
-			uint32_t Status;
-
-			uint32_t InformationBufferLength;
-			uint32_t InformationBufferOffset;
-		} ATTR_PACKED RNDIS_Query_Complete_t;
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Class/Common/StillImageClassCommon.h b/NativePrograms/LUFA/Drivers/USB/Class/Common/StillImageClassCommon.h
deleted file mode 100644
index 05b32cd6e9..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Class/Common/StillImageClassCommon.h
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Common definitions and declarations for the library USB Still Image Class driver.
- *
- *  Common definitions and declarations for the library USB Still Image Class driver.
- *
- *  \note This file should not be included directly. It is automatically included as needed by the USB module driver
- *        dispatch header located in LUFA/Drivers/USB.h.
- */
-
-/** \ingroup Group_USBClassSI
- *  \defgroup Group_USBClassSICommon  Common Class Definitions
- *
- *  \section Sec_USBClassSICommon_ModDescription Module Description
- *  Constants, Types and Enum definitions that are common to both Device and Host modes for the USB
- *  Still Image Class.
- *
- *  @{
- */
-
-#ifndef _SI_CLASS_COMMON_H_
-#define _SI_CLASS_COMMON_H_
-
-	/* Includes: */
-		#include "../../Core/StdDescriptors.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_SI_DRIVER)
-			#error Do not include this file directly. Include LUFA/Drivers/USB.h instead.
-		#endif
-
-	/* Macros: */
-		/** Length in bytes of a given Unicode string's character length.
-		 *
-		 *  \param[in] Chars  Total number of Unicode characters in the string.
-		 *
-		 *  \return Number of bytes of the given unicode string.
-		 */
-		#define UNICODE_STRING_LENGTH(Chars)  ((Chars) << 1)
-
-		/** Used in the DataLength field of a PIMA container, to give the total container size in bytes for
-		 *  a command container.
-		 *
-		 *  \param[in] Params  Number of parameters which are to be sent in the \c Param field of the container.
-		 */
-		#define PIMA_COMMAND_SIZE(Params)     ((sizeof(PIMA_Container_t) - 12) + ((Params) * sizeof(uint32_t)))
-
-		/** Used in the DataLength field of a PIMA container, to give the total container size in bytes for
-		 *  a data container.
-		 *
-		 *  \param[in] DataLen  Length in bytes of the data in the container.
-		 */
-		#define PIMA_DATA_SIZE(DataLen)       ((sizeof(PIMA_Container_t) - 12) + (DataLen))
-
-	/* Enums: */
-		/** Enum for the possible PIMA contains types. */
-		enum PIMA_Container_Types_t
-		{
-			PIMA_CONTAINER_Undefined     = 0, /**< Undefined container type. */
-			PIMA_CONTAINER_CommandBlock  = 1, /**< Command Block container type. */
-			PIMA_CONTAINER_DataBlock     = 2, /**< Data Block container type. */
-			PIMA_CONTAINER_ResponseBlock = 3, /**< Response container type. */
-			PIMA_CONTAINER_EventBlock    = 4, /**< Event Block container type. */
-		};
-
-	/* Enums: */
-		/** Enum for possible Class, Subclass and Protocol values of device and interface descriptors relating to the
-		 *  Still Image device class.
-		 */
-		enum SI_Descriptor_ClassSubclassProtocol_t
-		{
-			SI_CSCP_StillImageClass             = 0x06, /**< Descriptor Class value indicating that the device or interface
-			                                             *   belongs to the Still Image class.
-			                                             */
-			SI_CSCP_StillImageSubclass          = 0x01, /**< Descriptor Subclass value indicating that the device or interface
-			                                             *   belongs to the Still Image subclass.
-			                                             */
-			SI_CSCP_BulkOnlyProtocol            = 0x01, /**< Descriptor Protocol value indicating that the device or interface
-			                                             *   belongs to the Bulk Only Transport protocol of the Still Image class.
-			                                             */
-		};
-
-		/** Enums for the possible status codes of a returned Response Block from an attached PIMA compliant Still Image device. */
-		enum PIMA_ResponseCodes_t
-		{
-			PIMA_RESPONSE_OK                    = 1, /**< Response code indicating no error in the issued command. */
-			PIMA_RESPONSE_GeneralError          = 2, /**< Response code indicating a general error while processing the
-			                                          *  issued command.
-			                                          */
-			PIMA_RESPONSE_SessionNotOpen        = 3, /**< Response code indicating that the sent command requires an open
-			                                          *   session before being issued.
-			                                          */
-			PIMA_RESPONSE_InvalidTransaction    = 4, /**< Response code indicating an invalid transaction occurred. */
-			PIMA_RESPONSE_OperationNotSupported = 5, /**< Response code indicating that the issued command is not supported
-			                                          *   by the attached device.
-			                                          */
-			PIMA_RESPONSE_ParameterNotSupported = 6, /**< Response code indicating that one or more of the issued command's
-			                                          *   parameters are not supported by the device.
-			                                          */
-		};
-
-	/* Type Defines: */
-		/** \brief PIMA Still Image Device Command/Response Container.
-		 *
-		 *  Type define for a PIMA container, use to send commands and receive responses to and from an
-		 *  attached Still Image device.
-		 *
-		 *  \note Regardless of CPU architecture, these values should be stored as little endian.
-		 */
-		typedef struct
-		{
-			uint32_t DataLength; /**< Length of the container and data, in bytes. */
-			uint16_t Type; /**< Container type, a value from the \ref PIMA_Container_Types_t enum. */
-			uint16_t Code; /**< Command, event or response code of the container. */
-			uint32_t TransactionID; /**< Unique container ID to link blocks together. */
-			uint32_t Params[3]; /**< Block parameters to be issued along with the block code (command blocks only). */
-		} ATTR_PACKED PIMA_Container_t;
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Class/Device/AudioClassDevice.c b/NativePrograms/LUFA/Drivers/USB/Class/Device/AudioClassDevice.c
deleted file mode 100644
index 1a4a2659c9..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Class/Device/AudioClassDevice.c
+++ /dev/null
@@ -1,197 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-#define  __INCLUDE_FROM_USB_DRIVER
-#include "../../Core/USBMode.h"
-
-#if defined(USB_CAN_BE_DEVICE)
-
-#define  __INCLUDE_FROM_AUDIO_DRIVER
-#define  __INCLUDE_FROM_AUDIO_DEVICE_C
-#include "AudioClassDevice.h"
-
-void Audio_Device_ProcessControlRequest(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo)
-{
-	if (!(Endpoint_IsSETUPReceived()))
-	  return;
-
-	if ((USB_ControlRequest.bmRequestType & CONTROL_REQTYPE_RECIPIENT) == REQREC_INTERFACE)
-	{
-		uint8_t InterfaceIndex = (USB_ControlRequest.wIndex & 0xFF);
-
-		if ((InterfaceIndex != AudioInterfaceInfo->Config.ControlInterfaceNumber) &&
-		    (InterfaceIndex != AudioInterfaceInfo->Config.StreamingInterfaceNumber))
-		{
-			return;
-		}
-	}
-	else if ((USB_ControlRequest.bmRequestType & CONTROL_REQTYPE_RECIPIENT) == REQREC_ENDPOINT)
-	{
-		uint8_t EndpointAddress = (USB_ControlRequest.wIndex & 0xFF);
-
-		if ((EndpointAddress != AudioInterfaceInfo->Config.DataINEndpoint.Address) &&
-		    (EndpointAddress != AudioInterfaceInfo->Config.DataOUTEndpoint.Address))
-		{
-			return;
-		}
-	}
-
-	switch (USB_ControlRequest.bRequest)
-	{
-		case REQ_SetInterface:
-			if (USB_ControlRequest.bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_INTERFACE))
-			{
-				Endpoint_ClearSETUP();
-				Endpoint_ClearStatusStage();
-
-				AudioInterfaceInfo->State.InterfaceEnabled = ((USB_ControlRequest.wValue & 0xFF) != 0);
-				EVENT_Audio_Device_StreamStartStop(AudioInterfaceInfo);
-			}
-
-			break;
-		case AUDIO_REQ_GetStatus:
-			if ((USB_ControlRequest.bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE)) ||
-			    (USB_ControlRequest.bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_ENDPOINT)))
-			{
-				Endpoint_ClearSETUP();
-				Endpoint_ClearStatusStage();
-			}
-
-			break;
-		case AUDIO_REQ_SetCurrent:
-		case AUDIO_REQ_SetMinimum:
-		case AUDIO_REQ_SetMaximum:
-		case AUDIO_REQ_SetResolution:
-			if ((USB_ControlRequest.bmRequestType & CONTROL_REQTYPE_RECIPIENT) == REQREC_ENDPOINT)
-			{
-				uint8_t EndpointProperty = USB_ControlRequest.bRequest;
-				uint8_t EndpointAddress  = (uint8_t)USB_ControlRequest.wIndex;
-				uint8_t EndpointControl  = (USB_ControlRequest.wValue >> 8);
-
-				if (CALLBACK_Audio_Device_GetSetEndpointProperty(AudioInterfaceInfo, EndpointProperty, EndpointAddress,
-				                                                 EndpointControl, NULL, NULL))
-				{
-					uint16_t ValueLength = USB_ControlRequest.wLength;
-					uint8_t  Value[ValueLength];
-
-					Endpoint_ClearSETUP();
-					Endpoint_Read_Control_Stream_LE(Value, ValueLength);
-					Endpoint_ClearIN();
-
-					CALLBACK_Audio_Device_GetSetEndpointProperty(AudioInterfaceInfo, EndpointProperty, EndpointAddress,
-					                                             EndpointControl, &ValueLength, Value);
-				}
-			}
-			else if ((USB_ControlRequest.bmRequestType & CONTROL_REQTYPE_RECIPIENT) == REQREC_INTERFACE)
-			{
-				uint8_t  Property  = USB_ControlRequest.bRequest;
-				uint8_t  Entity    = (USB_ControlRequest.wIndex >> 8);
-				uint16_t Parameter = USB_ControlRequest.wValue;
-
-				if (CALLBACK_Audio_Device_GetSetInterfaceProperty(AudioInterfaceInfo, Property, Entity,
-				                                                  Parameter, NULL, NULL))
-				{
-					uint16_t ValueLength = USB_ControlRequest.wLength;
-					uint8_t  Value[ValueLength];
-
-					Endpoint_ClearSETUP();
-					Endpoint_Read_Control_Stream_LE(Value, ValueLength);
-					Endpoint_ClearIN();
-
-					CALLBACK_Audio_Device_GetSetInterfaceProperty(AudioInterfaceInfo, Property, Entity,
-				                                                  Parameter, &ValueLength, Value);
-				}
-			}
-
-			break;
-		case AUDIO_REQ_GetCurrent:
-		case AUDIO_REQ_GetMinimum:
-		case AUDIO_REQ_GetMaximum:
-		case AUDIO_REQ_GetResolution:
-			if ((USB_ControlRequest.bmRequestType & CONTROL_REQTYPE_RECIPIENT) == REQREC_ENDPOINT)
-			{
-				uint8_t  EndpointProperty = USB_ControlRequest.bRequest;
-				uint8_t  EndpointAddress  = (uint8_t)USB_ControlRequest.wIndex;
-				uint8_t  EndpointControl  = (USB_ControlRequest.wValue >> 8);
-				uint16_t ValueLength      = USB_ControlRequest.wLength;
-				uint8_t  Value[ValueLength];
-
-				if (CALLBACK_Audio_Device_GetSetEndpointProperty(AudioInterfaceInfo, EndpointProperty, EndpointAddress,
-				                                                 EndpointControl, &ValueLength, Value))
-				{
-					Endpoint_ClearSETUP();
-					Endpoint_Write_Control_Stream_LE(Value, ValueLength);
-					Endpoint_ClearOUT();
-				}
-			}
-			else if ((USB_ControlRequest.bmRequestType & CONTROL_REQTYPE_RECIPIENT) == REQREC_INTERFACE)
-			{
-				uint8_t  Property    = USB_ControlRequest.bRequest;
-				uint8_t  Entity      = (USB_ControlRequest.wIndex >> 8);
-				uint16_t Parameter   = USB_ControlRequest.wValue;
-				uint16_t ValueLength = USB_ControlRequest.wLength;
-				uint8_t  Value[ValueLength];
-
-				if (CALLBACK_Audio_Device_GetSetInterfaceProperty(AudioInterfaceInfo, Property, Entity,
-				                                                  Parameter, &ValueLength, Value))
-				{
-					Endpoint_ClearSETUP();
-					Endpoint_Write_Control_Stream_LE(Value, ValueLength);
-					Endpoint_ClearOUT();
-				}
-			}
-
-			break;
-	}
-}
-
-bool Audio_Device_ConfigureEndpoints(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo)
-{
-	memset(&AudioInterfaceInfo->State, 0x00, sizeof(AudioInterfaceInfo->State));
-
-	AudioInterfaceInfo->Config.DataINEndpoint.Type  = EP_TYPE_ISOCHRONOUS;
-	AudioInterfaceInfo->Config.DataOUTEndpoint.Type = EP_TYPE_ISOCHRONOUS;
-
-	if (!(Endpoint_ConfigureEndpointTable(&AudioInterfaceInfo->Config.DataINEndpoint, 1)))
-	  return false;
-
-	if (!(Endpoint_ConfigureEndpointTable(&AudioInterfaceInfo->Config.DataOUTEndpoint, 1)))
-	  return false;
-
-	return true;
-}
-
-void Audio_Device_Event_Stub(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo)
-{
-
-}
-
-#endif
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Class/Device/AudioClassDevice.h b/NativePrograms/LUFA/Drivers/USB/Class/Device/AudioClassDevice.h
deleted file mode 100644
index c818fd2eda..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Class/Device/AudioClassDevice.h
+++ /dev/null
@@ -1,396 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Device mode driver for the library USB Audio 1.0 Class driver.
- *
- *  Device mode driver for the library USB Audio 1.0 Class driver.
- *
- *  \note This file should not be included directly. It is automatically included as needed by the USB module driver
- *        dispatch header located in LUFA/Drivers/USB.h.
- */
-
-/** \ingroup Group_USBClassAudio
- *  \defgroup Group_USBClassAudioDevice Audio 1.0 Class Device Mode Driver
- *
- *  \section Sec_USBClassAudioDevice_Dependencies Module Source Dependencies
- *  The following files must be built with any user project that uses this module:
- *    - LUFA/Drivers/USB/Class/Device/AudioClassDevice.c <i>(Makefile source module name: LUFA_SRC_USBCLASS)</i>
- *
- *  \section Sec_USBClassAudioDevice_ModDescription Module Description
- *  Device Mode USB Class driver framework interface, for the Audio 1.0 USB Class driver.
- *
- *  @{
- */
-
-#ifndef _AUDIO_CLASS_DEVICE_H_
-#define _AUDIO_CLASS_DEVICE_H_
-
-	/* Includes: */
-		#include "../../USB.h"
-		#include "../Common/AudioClassCommon.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_AUDIO_DRIVER)
-			#error Do not include this file directly. Include LUFA/Drivers/USB.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Type Defines: */
-			/** \brief Audio Class Device Mode Configuration and State Structure.
-			 *
-			 *  Class state structure. An instance of this structure should be made for each Audio interface
-			 *  within the user application, and passed to each of the Audio class driver functions as the
-			 *  \c AudioInterfaceInfo parameter. This stores each Audio interface's configuration and state information.
-			 */
-			typedef struct
-			{
-				struct
-				{
-					uint8_t  ControlInterfaceNumber; /**< Index of the Audio Control interface within the device this
-					                                  *   structure controls.
-					                                  */
-					uint8_t  StreamingInterfaceNumber; /**< Index of the Audio Streaming interface within the device this
-														*   structure controls.
-														*/
-
-					USB_Endpoint_Table_t DataINEndpoint; /**< Data IN endpoint configuration table. */
-					USB_Endpoint_Table_t DataOUTEndpoint; /**< Data OUT endpoint configuration table. */
-				} Config; /**< Config data for the USB class interface within the device. All elements in this section
-				           *   <b>must</b> be set or the interface will fail to enumerate and operate correctly.
-				           */
-				struct
-				{
-					bool InterfaceEnabled; /**< Set and cleared by the class driver to indicate if the host has enabled the streaming endpoints
-					                        *   of the Audio Streaming interface.
-					                        */
-				} State; /**< State data for the USB class interface within the device. All elements in this section
-				          *   are reset to their defaults when the interface is enumerated.
-				          */
-			} USB_ClassInfo_Audio_Device_t;
-
-		/* Function Prototypes: */
-			/** Configures the endpoints of a given Audio interface, ready for use. This should be linked to the library
-			 *  \ref EVENT_USB_Device_ConfigurationChanged() event so that the endpoints are configured when the configuration containing the
-			 *  given Audio interface is selected.
-			 *
-			 *  \param[in,out] AudioInterfaceInfo  Pointer to a structure containing an Audio Class configuration and state.
-			 *
-			 *  \return Boolean \c true if the endpoints were successfully configured, \c false otherwise.
-			 */
-			bool Audio_Device_ConfigureEndpoints(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Processes incoming control requests from the host, that are directed to the given Audio class interface. This should be
-			 *  linked to the library \ref EVENT_USB_Device_ControlRequest() event.
-			 *
-			 *  \param[in,out] AudioInterfaceInfo  Pointer to a structure containing an Audio Class configuration and state.
-			 */
-			void Audio_Device_ProcessControlRequest(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Audio class driver callback for the setting and retrieval of streaming endpoint properties. This callback must be implemented
-			 *  in the user application to handle property manipulations on streaming audio endpoints.
-			 *
-			 *  When the DataLength parameter is NULL, this callback should only indicate whether the specified operation is valid for
-			 *  the given endpoint index, and should return as fast as possible. When non-NULL, this value may be altered for GET operations
-			 *  to indicate the size of the retrieved data.
-			 *
-			 *  \note The length of the retrieved data stored into the Data buffer on GET operations should not exceed the initial value
-			 *        of the \c DataLength parameter.
-			 *
-			 *  \param[in,out] AudioInterfaceInfo  Pointer to a structure containing an Audio Class configuration and state.
-			 *  \param[in]     EndpointProperty    Property of the endpoint to get or set, a value from \ref Audio_ClassRequests_t.
-			 *  \param[in]     EndpointAddress     Address of the streaming endpoint whose property is being referenced.
-			 *  \param[in]     EndpointControl     Parameter of the endpoint to get or set, a value from \ref Audio_EndpointControls_t.
-			 *  \param[in,out] DataLength          For SET operations, the length of the parameter data to set. For GET operations, the maximum
-			 *                                     length of the retrieved data. When NULL, the function should return whether the given property
-			 *                                     and parameter is valid for the requested endpoint without reading or modifying the Data buffer.
-			 *  \param[in,out] Data                Pointer to a location where the parameter data is stored for SET operations, or where
-			 *                                     the retrieved data is to be stored for GET operations.
-			 *
-			 *  \return Boolean \c true if the property GET/SET was successful, \c false otherwise
-			 */
-			bool CALLBACK_Audio_Device_GetSetEndpointProperty(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo,
-			                                                  const uint8_t EndpointProperty,
-			                                                  const uint8_t EndpointAddress,
-			                                                  const uint8_t EndpointControl,
-			                                                  uint16_t* const DataLength,
-			                                                  uint8_t* Data) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Audio class driver callback for the setting and retrieval of streaming interface properties. This callback must be implemented
-			 *  in the user application to handle property manipulations on streaming audio interfaces.
-			 *
-			 *  When the DataLength parameter is NULL, this callback should only indicate whether the specified operation is valid for
-			 *  the given entity and should return as fast as possible. When non-NULL, this value may be altered for GET operations
-			 *  to indicate the size of the retrieved data.
-			 *
-			 *  \note The length of the retrieved data stored into the Data buffer on GET operations should not exceed the initial value
-			 *        of the \c DataLength parameter.
-			 *
-			 *  \param[in,out] AudioInterfaceInfo  Pointer to a structure containing an Audio Class configuration and state.
-			 *  \param[in]     Property            Property of the interface to get or set, a value from \ref Audio_ClassRequests_t.
-			 *  \param[in]     EntityAddress       Address of the audio entity whose property is being referenced.
-			 *  \param[in]     Parameter           Parameter of the entity to get or set, specific to each type of entity (see USB Audio specification).
-			 *  \param[in,out] DataLength          For SET operations, the length of the parameter data to set. For GET operations, the maximum
-			 *                                     length of the retrieved data. When NULL, the function should return whether the given property
-			 *                                     and parameter is valid for the requested endpoint without reading or modifying the Data buffer.
-			 *  \param[in,out] Data                Pointer to a location where the parameter data is stored for SET operations, or where
-			 *                                     the retrieved data is to be stored for GET operations.
-			 *
-			 *  \return Boolean \c true if the property GET/SET was successful, \c false otherwise
-			 */
-			bool CALLBACK_Audio_Device_GetSetInterfaceProperty(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo,
-			                                                   const uint8_t Property,
-			                                                   const uint8_t EntityAddress,
-			                                                   const uint16_t Parameter,
-			                                                   uint16_t* const DataLength,
-			                                                   uint8_t* Data) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Audio class driver event for an Audio Stream start/stop change. This event fires each time the device receives a stream enable or
-			 *  disable control request from the host, to start and stop the audio stream. The current state of the stream can be determined by the
-			 *  State.InterfaceEnabled value inside the Audio interface structure passed as a parameter.
-			 *
-			 *  \param[in,out] AudioInterfaceInfo  Pointer to a structure containing an Audio Class configuration and state.
-			 */
-			void EVENT_Audio_Device_StreamStartStop(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo);
-
-		/* Inline Functions: */
-			/** General management task for a given Audio class interface, required for the correct operation of the interface. This should
-			 *  be called frequently in the main program loop, before the master USB management task \ref USB_USBTask().
-			 *
-			 *  \param[in,out] AudioInterfaceInfo  Pointer to a structure containing an Audio Class configuration and state.
-			 */
-			static inline void Audio_Device_USBTask(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo)
-			                                        ATTR_NON_NULL_PTR_ARG(1) ATTR_ALWAYS_INLINE;
-			static inline void Audio_Device_USBTask(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo)
-			{
-				(void)AudioInterfaceInfo;
-			}
-
-			/** Determines if the given audio interface is ready for a sample to be read from it, and selects the streaming
-			 *  OUT endpoint ready for reading.
-			 *
-			 *  \pre This function must only be called when the Device state machine is in the \ref DEVICE_STATE_Configured state or
-			 *       the call will fail.
-			 *
-			 *  \param[in,out] AudioInterfaceInfo  Pointer to a structure containing an Audio Class configuration and state.
-			 *
-			 *  \return Boolean \c true if the given Audio interface has a sample to be read, \c false otherwise.
-			 */
-			static inline bool Audio_Device_IsSampleReceived(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo)
-			                                                 ATTR_NON_NULL_PTR_ARG(1) ATTR_ALWAYS_INLINE;
-			static inline bool Audio_Device_IsSampleReceived(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo)
-			{
-				if ((USB_DeviceState != DEVICE_STATE_Configured) || !(AudioInterfaceInfo->State.InterfaceEnabled))
-				  return false;
-
-				Endpoint_SelectEndpoint(AudioInterfaceInfo->Config.DataOUTEndpoint.Address);
-				return Endpoint_IsOUTReceived();
-			}
-
-			/** Determines if the given audio interface is ready to accept the next sample to be written to it, and selects
-			 *  the streaming IN endpoint ready for writing.
-			 *
-			 *  \pre This function must only be called when the Device state machine is in the \ref DEVICE_STATE_Configured state or
-			 *       the call will fail.
-			 *
-			 *  \param[in,out] AudioInterfaceInfo  Pointer to a structure containing an Audio Class configuration and state.
-			 *
-			 *  \return Boolean \c true if the given Audio interface is ready to accept the next sample, \c false otherwise.
-			 */
-			static inline bool Audio_Device_IsReadyForNextSample(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo)
-			                                                     ATTR_NON_NULL_PTR_ARG(1) ATTR_ALWAYS_INLINE;
-			static inline bool Audio_Device_IsReadyForNextSample(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo)
-			{
-				if ((USB_DeviceState != DEVICE_STATE_Configured) || !(AudioInterfaceInfo->State.InterfaceEnabled))
-				  return false;
-
-				Endpoint_SelectEndpoint(AudioInterfaceInfo->Config.DataINEndpoint.Address);
-				return Endpoint_IsINReady();
-			}
-
-			/** Reads the next 8-bit audio sample from the current audio interface.
-			 *
-			 *  \pre This should be preceded immediately by a call to the \ref Audio_Device_IsSampleReceived() function to ensure
-			 *       that the correct endpoint is selected and ready for data.
-			 *
-			 *  \param[in,out] AudioInterfaceInfo  Pointer to a structure containing an Audio Class configuration and state.
-			 *
-			 *  \return  Signed 8-bit audio sample from the audio interface.
-			 */
-			static inline int8_t Audio_Device_ReadSample8(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo)
-			                                              ATTR_NON_NULL_PTR_ARG(1) ATTR_ALWAYS_INLINE;
-			static inline int8_t Audio_Device_ReadSample8(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo)
-			{
-				int8_t Sample;
-
-				(void)AudioInterfaceInfo;
-
-				Sample = Endpoint_Read_8();
-
-				if (!(Endpoint_BytesInEndpoint()))
-				  Endpoint_ClearOUT();
-
-				return Sample;
-			}
-
-			/** Reads the next 16-bit audio sample from the current audio interface.
-			 *
-			 *  \pre This should be preceded immediately by a call to the \ref Audio_Device_IsSampleReceived() function to ensure
-			 *       that the correct endpoint is selected and ready for data.
-			 *
-			 *  \param[in,out] AudioInterfaceInfo  Pointer to a structure containing an Audio Class configuration and state.
-			 *
-			 *  \return  Signed 16-bit audio sample from the audio interface.
-			 */
-			static inline int16_t Audio_Device_ReadSample16(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo)
-			                                                ATTR_NON_NULL_PTR_ARG(1) ATTR_ALWAYS_INLINE;
-			static inline int16_t Audio_Device_ReadSample16(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo)
-			{
-				int16_t Sample;
-
-				(void)AudioInterfaceInfo;
-
-				Sample = (int16_t)Endpoint_Read_16_LE();
-
-				if (!(Endpoint_BytesInEndpoint()))
-				  Endpoint_ClearOUT();
-
-				return Sample;
-			}
-
-			/** Reads the next 24-bit audio sample from the current audio interface.
-			 *
-			 *  \pre This should be preceded immediately by a call to the \ref Audio_Device_IsSampleReceived() function to ensure
-			 *       that the correct endpoint is selected and ready for data.
-			 *
-			 *  \param[in,out] AudioInterfaceInfo  Pointer to a structure containing an Audio Class configuration and state.
-			 *
-			 *  \return Signed 24-bit audio sample from the audio interface.
-			 */
-			static inline int32_t Audio_Device_ReadSample24(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo)
-			                                                ATTR_NON_NULL_PTR_ARG(1) ATTR_ALWAYS_INLINE;
-			static inline int32_t Audio_Device_ReadSample24(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo)
-			{
-				int32_t Sample;
-
-				(void)AudioInterfaceInfo;
-
-				Sample = (((uint32_t)Endpoint_Read_8() << 16) | Endpoint_Read_16_LE());
-
-				if (!(Endpoint_BytesInEndpoint()))
-				  Endpoint_ClearOUT();
-
-				return Sample;
-			}
-
-			/** Writes the next 8-bit audio sample to the current audio interface.
-			 *
-			 *  \pre This should be preceded immediately by a call to the \ref Audio_Device_IsReadyForNextSample() function to
-			 *       ensure that the correct endpoint is selected and ready for data.
-			 *
-			 *  \param[in,out] AudioInterfaceInfo  Pointer to a structure containing an Audio Class configuration and state.
-			 *  \param[in]     Sample              Signed 8-bit audio sample.
-			 */
-			static inline void Audio_Device_WriteSample8(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo,
-			                                             const int8_t Sample) ATTR_NON_NULL_PTR_ARG(1) ATTR_ALWAYS_INLINE;
-			static inline void Audio_Device_WriteSample8(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo,
-			                                             const int8_t Sample)
-			{
-				Endpoint_Write_8(Sample);
-
-				if (Endpoint_BytesInEndpoint() == AudioInterfaceInfo->Config.DataINEndpoint.Size)
-				  Endpoint_ClearIN();
-			}
-
-			/** Writes the next 16-bit audio sample to the current audio interface.
-			 *
-			 *  \pre This should be preceded immediately by a call to the \ref Audio_Device_IsReadyForNextSample() function to
-			 *       ensure that the correct endpoint is selected and ready for data.
-			 *
-			 *  \param[in,out] AudioInterfaceInfo  Pointer to a structure containing an Audio Class configuration and state.
-			 *  \param[in]     Sample              Signed 16-bit audio sample.
-			 */
-			static inline void Audio_Device_WriteSample16(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo,
-			                                              const int16_t Sample) ATTR_NON_NULL_PTR_ARG(1) ATTR_ALWAYS_INLINE;
-			static inline void Audio_Device_WriteSample16(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo,
-			                                              const int16_t Sample)
-			{
-				Endpoint_Write_16_LE(Sample);
-
-				if (Endpoint_BytesInEndpoint() == AudioInterfaceInfo->Config.DataINEndpoint.Size)
-				  Endpoint_ClearIN();
-			}
-
-			/** Writes the next 24-bit audio sample to the current audio interface.
-			 *
-			 *  \pre This should be preceded immediately by a call to the \ref Audio_Device_IsReadyForNextSample() function to
-			 *       ensure that the correct endpoint is selected and ready for data.
-			 *
-			 *  \param[in,out] AudioInterfaceInfo  Pointer to a structure containing an Audio Class configuration and state.
-			 *  \param[in]     Sample              Signed 24-bit audio sample.
-			 */
-			static inline void Audio_Device_WriteSample24(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo,
-			                                              const int32_t Sample) ATTR_NON_NULL_PTR_ARG(1) ATTR_ALWAYS_INLINE;
-			static inline void Audio_Device_WriteSample24(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo,
-			                                              const int32_t Sample)
-			{
-				Endpoint_Write_16_LE(Sample);
-				Endpoint_Write_8(Sample >> 16);
-
-				if (Endpoint_BytesInEndpoint() == AudioInterfaceInfo->Config.DataINEndpoint.Size)
-				  Endpoint_ClearIN();
-			}
-
-	/* Private Interface - For use in library only: */
-	#if !defined(__DOXYGEN__)
-		/* Function Prototypes: */
-			#if defined(__INCLUDE_FROM_AUDIO_DEVICE_C)
-				void Audio_Device_Event_Stub(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo);
-
-				void EVENT_Audio_Device_StreamStartStop(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo)
-				                                        ATTR_WEAK ATTR_NON_NULL_PTR_ARG(1) ATTR_ALIAS(Audio_Device_Event_Stub);
-			#endif
-
-	#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Class/Device/CCIDClassDevice.c b/NativePrograms/LUFA/Drivers/USB/Class/Device/CCIDClassDevice.c
deleted file mode 100644
index a2b5eed9f1..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Class/Device/CCIDClassDevice.c
+++ /dev/null
@@ -1,392 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-  Copyright 2020  Filipe Rodrigues (filipepazrodrigues [at] gmail [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-#define  __INCLUDE_FROM_USB_DRIVER
-#include "../../Core/USBMode.h"
-
-#if defined(USB_CAN_BE_DEVICE)
-
-#define	 __INCLUDE_FROM_CCID_DRIVER
-#define	 __INCLUDE_FROM_CCID_DEVICE_C
-#include "CCIDClassDevice.h"
-
-
-bool CCID_CheckStatusNoError(uint8_t Status)
-{
-	return (Status & 0xC0) == 0x0;
-}
-
-void CCID_Device_ProcessControlRequest(USB_ClassInfo_CCID_Device_t* const CCIDInterfaceInfo)
-{
-	if (!(Endpoint_IsSETUPReceived()))
-		return;
-
-	if (USB_ControlRequest.wIndex != CCIDInterfaceInfo->Config.InterfaceNumber)
-		return;
-
-	switch (USB_ControlRequest.bRequest)
-	{
-		case CCID_ABORT:
-		{
-			// Initiates the abort process.
-			// The host should send 2 messages in the following order:
-			//	- CCID_ABORT control request
-			//	- CCID_PC_t_PCo_RDR_Abort command
-			//
-			// If the device is still processing a message, it should fail it until receiving a CCIRPC_to_RDR_Abort
-			// command.
-			//
-			// When the device receives the CCIRPC_to_RDR_Abort message, it replies with RDR_to_PC_SlotStatus
-			// and the abort process ends.
-
-			// The wValue field contains the slot number (bSlot) in the low byte and the sequence number (bSeq) in
-			// the high	byte
-			uint8_t Slot = USB_ControlRequest.wValue & 0xFF;
-			uint8_t Seq  = USB_ControlRequest.wValue >> 8;
-
-			if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE) && Slot == 0)
-			{
-				Endpoint_ClearSETUP();
-
-				CCIDInterfaceInfo->State.Aborted = true;
-				CCIDInterfaceInfo->State.AbortedSeq = Seq;
-
-				Endpoint_ClearOUT();
-			}
-
-			break;
-		}
-
-		case CCID_GET_CLOCK_FREQUENCIES:
-		{
-			if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))
-			{
-
-				Endpoint_ClearSETUP();
-				Endpoint_Write_8(0); // Not supported
-				Endpoint_ClearOUT();
-			}
-			break;
-		}
-
-		case CCID_GET_DATA_RATES:
-		{
-			if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))
-			{
-
-				Endpoint_ClearSETUP();
-				Endpoint_Write_8(0); // Not supported
-				Endpoint_ClearOUT();
-			}
-			break;
-		}
-	}
-}
-
-bool CCID_Device_ConfigureEndpoints(USB_ClassInfo_CCID_Device_t* const CCIDInterfaceInfo)
-{
-	CCIDInterfaceInfo->Config.DataINEndpoint.Type  = EP_TYPE_BULK;
-	CCIDInterfaceInfo->Config.DataOUTEndpoint.Type = EP_TYPE_BULK;
-
-	if (!(Endpoint_ConfigureEndpointTable(&CCIDInterfaceInfo->Config.DataINEndpoint, 1)))
-		return false;
-
-	if (!(Endpoint_ConfigureEndpointTable(&CCIDInterfaceInfo->Config.DataOUTEndpoint, 1)))
-		return false;
-
-	return true;
-}
-
-void CCID_Device_USBTask(USB_ClassInfo_CCID_Device_t* const CCIDInterfaceInfo)
-{
-	Endpoint_SelectEndpoint(CCIDInterfaceInfo->Config.DataOUTEndpoint.Address);
-
-	uint8_t RequestBuffer[0x40 - sizeof(USB_CCID_BulkMessage_Header_t)];
-	uint8_t ResponseBuffer[0x40];
-
-	CCIDInterfaceInfo->State.Aborted    = false;
-	CCIDInterfaceInfo->State.AbortedSeq = -1;
-
-	if (Endpoint_IsOUTReceived())
-	{
-		USB_CCID_BulkMessage_Header_t CCIDHeader;
-		CCIDHeader.MessageType = Endpoint_Read_8();
-		CCIDHeader.Length      = Endpoint_Read_32_LE();
-		CCIDHeader.Slot        = Endpoint_Read_8();
-		CCIDHeader.Seq         = Endpoint_Read_8();
-
-		uint8_t Status;
-		uint8_t Error = CCID_ERROR_NO_ERROR;
-
-		switch (CCIDHeader.MessageType)
-		{
-			case CCID_PC_to_RDR_IccPowerOn:
-			{
-				uint8_t AtrLength;
-				USB_CCID_RDR_to_PC_DataBlock_t* ResponseATR = (USB_CCID_RDR_to_PC_DataBlock_t*)&ResponseBuffer;
-
-				ResponseATR->CCIDHeader.MessageType = CCID_RDR_to_PC_DataBlock;
-				ResponseATR->CCIDHeader.Slot        = CCIDHeader.Slot;
-				ResponseATR->CCIDHeader.Seq         = CCIDHeader.Seq;
-				ResponseATR->ChainParam             = 0;
-
-				Status = CALLBACK_CCID_IccPowerOn(CCIDInterfaceInfo, ResponseATR->CCIDHeader.Slot, (uint8_t*)ResponseATR->Data, &AtrLength, &Error);
-
-				if (CCID_CheckStatusNoError(Status) && !CCIDInterfaceInfo->State.Aborted)
-				{
-					ResponseATR->CCIDHeader.Length = AtrLength;
-				}
-				else if (CCIDInterfaceInfo->State.Aborted)
-				{
-					Status = CCID_COMMANDSTATUS_FAILED | CCID_ICCSTATUS_PRESENTANDACTIVE;
-					Error  = CCID_ERROR_CMD_ABORTED;
-					AtrLength = 0;
-				}
-				else
-				{
-					AtrLength = 0;
-				}
-
-				ResponseATR->Status = Status;
-				ResponseATR->Error  = Error;
-
-				Endpoint_ClearOUT();
-
-				Endpoint_SelectEndpoint(CCIDInterfaceInfo->Config.DataINEndpoint.Address);
-				Endpoint_Write_Stream_LE(ResponseATR, sizeof(USB_CCID_RDR_to_PC_DataBlock_t) + AtrLength, NULL);
-				Endpoint_ClearIN();
-				break;
-			}
-
-			case CCID_PC_to_RDR_IccPowerOff:
-			{
-				USB_CCID_RDR_to_PC_SlotStatus_t* ResponsePowerOff = (USB_CCID_RDR_to_PC_SlotStatus_t*)&ResponseBuffer;
-				ResponsePowerOff->CCIDHeader.MessageType = CCID_RDR_to_PC_SlotStatus;
-				ResponsePowerOff->CCIDHeader.Length      = 0;
-				ResponsePowerOff->CCIDHeader.Slot        = CCIDHeader.Slot;
-				ResponsePowerOff->CCIDHeader.Seq         = CCIDHeader.Seq;
-
-				ResponsePowerOff->ClockStatus = 0;
-
-				Status = CALLBACK_CCID_IccPowerOff(CCIDInterfaceInfo, CCIDHeader.Slot, &Error);
-
-				ResponsePowerOff->Status = Status;
-				ResponsePowerOff->Error  = Error;
-
-				Endpoint_ClearOUT();
-
-				Endpoint_SelectEndpoint(CCIDInterfaceInfo->Config.DataINEndpoint.Address);
-				Endpoint_Write_Stream_LE(ResponsePowerOff, sizeof(USB_CCID_RDR_to_PC_SlotStatus_t), NULL);
-				Endpoint_ClearIN();
-				break;
-			}
-
-			case CCID_PC_to_RDR_GetSlotStatus:
-			{
-				USB_CCID_RDR_to_PC_SlotStatus_t* ResponseSlotStatus = (USB_CCID_RDR_to_PC_SlotStatus_t*)&ResponseBuffer;
-				ResponseSlotStatus->CCIDHeader.MessageType = CCID_RDR_to_PC_SlotStatus;
-				ResponseSlotStatus->CCIDHeader.Length      = 0;
-				ResponseSlotStatus->CCIDHeader.Slot        = CCIDHeader.Slot;
-				ResponseSlotStatus->CCIDHeader.Seq         = CCIDHeader.Seq;
-
-				ResponseSlotStatus->ClockStatus = 0;
-
-				Status = CALLBACK_CCID_GetSlotStatus(CCIDInterfaceInfo, CCIDHeader.Slot, &Error);
-
-				ResponseSlotStatus->Status = Status;
-				ResponseSlotStatus->Error  = Error;
-
-				Endpoint_ClearOUT();
-
-				Endpoint_SelectEndpoint(CCIDInterfaceInfo->Config.DataINEndpoint.Address);
-				Endpoint_Write_Stream_LE(ResponseSlotStatus, sizeof(USB_CCID_RDR_to_PC_SlotStatus_t), NULL);
-				Endpoint_ClearIN();
-				break;
-			}
-
-			case CCID_PC_to_RDR_SetParameters:
-			{
-				uint8_t ProtocolNum = Endpoint_Read_8();
-				uint8_t RFU         = Endpoint_Read_16_LE();
-
-				(void)RFU;
-
-				USB_CCID_RDR_to_PC_Parameters_t* ResponseParametersStatus = (USB_CCID_RDR_to_PC_Parameters_t*)&ResponseBuffer;
-				ResponseParametersStatus->CCIDHeader.MessageType = CCID_RDR_to_PC_Parameters;
-				ResponseParametersStatus->CCIDHeader.Length      = 0;
-				ResponseParametersStatus->CCIDHeader.Slot        = CCIDHeader.Slot;
-				ResponseParametersStatus->CCIDHeader.Seq         = CCIDHeader.Seq;
-
-				if (ProtocolNum == CCID_PROTOCOLNUM_T0)
-				{
-					if (CCIDHeader.Length * sizeof(uint8_t) == sizeof(USB_CCID_ProtocolData_T0_t))
-					{
-
-						Endpoint_Read_Stream_LE(RequestBuffer, CCIDHeader.Length * sizeof(uint8_t), NULL);
-						Status = CALLBACK_CCID_SetParameters_T0(CCIDInterfaceInfo, CCIDHeader.Slot, &Error, (USB_CCID_ProtocolData_T0_t*) RequestBuffer);
-						if (CCID_CheckStatusNoError(Status))
-						{
-							ResponseParametersStatus->CCIDHeader.Length = CCIDHeader.Length;
-							Status = CALLBACK_CCID_GetParameters_T0(CCIDInterfaceInfo, CCIDHeader.Slot, &Error, &ResponseParametersStatus->ProtocolNum, (USB_CCID_ProtocolData_T0_t*) &ResponseParametersStatus->ProtocolData);
-						}
-					}
-					else
-					{
-						// Unexpected length
-						Status = CCID_COMMANDSTATUS_FAILED | CCID_ICCSTATUS_PRESENTANDACTIVE;
-					}
-				}
-				else
-				{
-					ResponseParametersStatus->ProtocolNum = CCID_PROTOCOLNUM_T0;
-
-					// For now, we don't support T=1 protocol
-					Error  = CCID_ERROR_PARAMETERS_PROTOCOL_NOT_SUPPORTED;
-					Status = CCID_COMMANDSTATUS_ERROR | CCID_ICCSTATUS_PRESENTANDACTIVE;
-				}
-
-				ResponseParametersStatus->Status = Status;
-				ResponseParametersStatus->Error  = Error;
-
-				Endpoint_ClearOUT();
-
-				Endpoint_SelectEndpoint(CCIDInterfaceInfo->Config.DataINEndpoint.Address);
-				Endpoint_Write_Stream_LE(ResponseParametersStatus, sizeof(USB_CCID_BulkMessage_Header_t) + 3 + ResponseParametersStatus->CCIDHeader.Length , NULL);
-				Endpoint_ClearIN();
-				break;
-			}
-
-			case CCID_PC_to_RDR_GetParameters:
-			{
-				USB_CCID_RDR_to_PC_Parameters_t* ResponseParametersStatus = (USB_CCID_RDR_to_PC_Parameters_t*)&ResponseBuffer;
-				ResponseParametersStatus->CCIDHeader.MessageType = CCID_RDR_to_PC_Parameters;
-				ResponseParametersStatus->CCIDHeader.Length      = sizeof(USB_CCID_ProtocolData_T0_t);
-				ResponseParametersStatus->CCIDHeader.Slot        = CCIDHeader.Slot;
-				ResponseParametersStatus->CCIDHeader.Seq         = CCIDHeader.Seq;
-
-				Status = CALLBACK_CCID_GetParameters_T0(CCIDInterfaceInfo, CCIDHeader.Slot, &Error, &ResponseParametersStatus->ProtocolNum, (USB_CCID_ProtocolData_T0_t*) &ResponseParametersStatus->ProtocolData);
-
-				ResponseParametersStatus->Status = Status;
-				ResponseParametersStatus->Error  = Error;
-
-				Endpoint_ClearOUT();
-
-				Endpoint_SelectEndpoint(CCIDInterfaceInfo->Config.DataINEndpoint.Address);
-				Endpoint_Write_Stream_LE(ResponseParametersStatus, sizeof(USB_CCID_BulkMessage_Header_t) + 3 + ResponseParametersStatus->CCIDHeader.Length , NULL);
-				Endpoint_ClearIN();
-				break;
-			}
-
-			case CCID_PC_to_RDR_XfrBlock:
-			{
-				uint8_t  Bwi            = Endpoint_Read_8();
-				uint16_t LevelParameter = Endpoint_Read_16_LE();
-				uint8_t  ReceivedBuffer[0x4];
-
-				(void)Bwi;
-				(void)LevelParameter;
-
-				Endpoint_Read_Stream_LE(ReceivedBuffer, sizeof(ReceivedBuffer), NULL);
-
-				uint8_t	ResponseDataLength = 0;
-
-				USB_CCID_RDR_to_PC_DataBlock_t* ResponseBlock = (USB_CCID_RDR_to_PC_DataBlock_t*)&ResponseBuffer;
-				ResponseBlock->CCIDHeader.MessageType = CCID_RDR_to_PC_DataBlock;
-				ResponseBlock->CCIDHeader.Slot        = CCIDHeader.Slot;
-				ResponseBlock->CCIDHeader.Seq         = CCIDHeader.Seq;
-
-				ResponseBlock->ChainParam = 0;
-
-				Status = CALLBACK_CCID_XfrBlock(CCIDInterfaceInfo, CCIDHeader.Slot, RequestBuffer, CCIDHeader.Length, (uint8_t*) &ResponseBlock->Data, &ResponseDataLength, &Error);
-
-				if (CCID_CheckStatusNoError(Status) && !CCIDInterfaceInfo->State.Aborted)
-				{
-					ResponseBlock->CCIDHeader.Length = ResponseDataLength;
-				}
-				else if (CCIDInterfaceInfo->State.Aborted)
-				{
-					Status = CCID_COMMANDSTATUS_FAILED | CCID_ICCSTATUS_PRESENTANDACTIVE;
-					Error  = CCID_ERROR_CMD_ABORTED;
-					ResponseDataLength = 0;
-				}
-				else
-				{
-					ResponseDataLength = 0;
-				}
-
-				ResponseBlock->Status = Status;
-				ResponseBlock->Error  = Error;
-
-				Endpoint_ClearOUT();
-
-				Endpoint_SelectEndpoint(CCIDInterfaceInfo->Config.DataINEndpoint.Address);
-				Endpoint_Write_Stream_LE(ResponseBlock, sizeof(USB_CCID_RDR_to_PC_DataBlock_t) + ResponseDataLength, NULL);
-				Endpoint_ClearIN();
-				break;
-			}
-
-			case CCID_PC_to_RDR_Abort:
-			{
-				USB_CCID_RDR_to_PC_SlotStatus_t* ResponseAbort = (USB_CCID_RDR_to_PC_SlotStatus_t*)&ResponseBuffer;
-				ResponseAbort->CCIDHeader.MessageType = CCID_RDR_to_PC_SlotStatus;
-				ResponseAbort->CCIDHeader.Length      = 0;
-				ResponseAbort->CCIDHeader.Slot        = CCIDHeader.Slot;
-				ResponseAbort->CCIDHeader.Seq         = CCIDHeader.Seq;
-
-				ResponseAbort->ClockStatus = 0;
-
-				Status = CALLBACK_CCID_Abort(CCIDInterfaceInfo, CCIDHeader.Slot, CCIDHeader.Seq, &Error);
-
-				ResponseAbort->Status = Status;
-				ResponseAbort->Error  = Error;
-
-				Endpoint_ClearOUT();
-
-				Endpoint_SelectEndpoint(CCIDInterfaceInfo->Config.DataINEndpoint.Address);
-				Endpoint_Write_Stream_LE(ResponseAbort, sizeof(USB_CCID_RDR_to_PC_SlotStatus_t), NULL);
-				Endpoint_ClearIN();
-				break;
-			}
-
-			default:
-			{
-				memset(ResponseBuffer, 0x00, sizeof(ResponseBuffer));
-
-				Endpoint_SelectEndpoint(CCIDInterfaceInfo->Config.DataINEndpoint.Address);
-				Endpoint_Write_Stream_LE(ResponseBuffer, sizeof(ResponseBuffer), NULL);
-				Endpoint_ClearIN();
-				break;
-			}
-		}
-	}
-}
-
-#endif
diff --git a/NativePrograms/LUFA/Drivers/USB/Class/Device/CCIDClassDevice.h b/NativePrograms/LUFA/Drivers/USB/Class/Device/CCIDClassDevice.h
deleted file mode 100644
index 6e7befee91..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Class/Device/CCIDClassDevice.h
+++ /dev/null
@@ -1,233 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-  Copyright 2020  Filipe Rodrigues (filipepazrodrigues [at] gmail [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Device mode driver for the library USB CCID Class driver.
- *
- *  Device mode driver for the library USB CCID Class driver.
- *
- *  \note This file should not be included directly. It is automatically included as needed by the USB module driver
- *        dispatch header located in LUFA/Drivers/USB.h.
- */
-
-/** \ingroup Group_USBClassCCID
- *  \defgroup Group_USBClassCCIDDevice CCID Class Device Mode Driver
- *
- *  \section Sec_USBClassCCIDDevice_Dependencies Module Source Dependencies
- *  The following files must be built with any user project that uses this module:
- *    - LUFA/Drivers/USB/Class/Device/CCIDClassDevice.c <i>(Makefile source module name: LUFA_SRC_USBCLASS)</i>
- *
- *  \section Sec_USBClassCCIDDevice_ModDescription Module Description
- *  Device Mode USB Class driver framework interface, for the CCID USB Class driver.
- *
- *  @{
- */
-
-#ifndef _CCID_CLASS_DEVICE_H_
-#define _CCID_CLASS_DEVICE_H_
-
-	/* Includes: */
-		#include "../../USB.h"
-		#include "../Common/CCIDClassCommon.h"
-
-	/* Public Interface - May be used in end-application: */
-		/* Type Defines: */
-			/** \brief CCID Class Device Mode Configuration and State Structure.
-			 *
-			 *	Class state structure. An instance of this structure should be made for each CCID interface
-			 *	within the user application, and passed to each of the CCID class driver functions as the
-			 *	CCIDInterfaceInfo parameter. This stores each CCID interface's configuration and state information.
-			 */
-			typedef struct
-			{
-				struct
-				{
-					uint8_t InterfaceNumber; /**< Interface number of the CCID interface within the device. */
-					uint8_t TotalSlots; /**< Total of slots no this device. */
-					USB_Endpoint_Table_t DataINEndpoint; /**< Data IN endpoint configuration table. */
-					USB_Endpoint_Table_t DataOUTEndpoint; /**< Data OUT endpoint configuration table. */
-				} Config; /**< Config data for the USB class interface within the device. All elements in this section
-				           *   <b>must</b> be set or the interface will fail to enumerate and operate correctly.
-				           */
-				struct
-				{
-					bool    Aborted; //< Set if host has started an abort process
-					uint8_t AbortedSeq; //< Sequence number for the current abort process
-				} State; /**< State data for the USB class interface within the device. All elements in this section
-				          *   are reset to their defaults when the interface is enumerated.
-				          */
-				USB_CCID_ProtocolData_T0_t ProtocolData;
-			} USB_ClassInfo_CCID_Device_t;
-
-	/* Function Prototypes: */
-			/** Configures the endpoints of a given CCID interface, ready for use. This should be linked to the library
-			 *	\ref EVENT_USB_Device_ConfigurationChanged() event so that the endpoints are configured when the configuration containing
-			 *	the given CCID interface is selected.
-			 *
-			 *	\param[in,out] CCIDInterfaceInfo	Pointer to a structure containing a CCID Class configuration.
-			 *
-			 *	\return Boolean \c true if the endpoints were successfully configured, \c false otherwise.
-			 */
-			bool CCID_Device_ConfigureEndpoints(USB_ClassInfo_CCID_Device_t* const CCIDInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Processes incoming control requests from the host, that are directed to the given CCID class interface. This should be
-			 *	linked to the library \ref EVENT_USB_Device_ControlRequest() event.
-			 *
-			 *	\param[in,out] CCIDInterfaceInfo	Pointer to a structure containing a CCID Class configuration and state.
-			 */
-			void CCID_Device_ProcessControlRequest(USB_ClassInfo_CCID_Device_t* const CCIDInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** General management task for a given CCID class interface, required for the correct operation of the interface. This should
-			 *	be called frequently in the main program loop, before the master USB management task \ref USB_USBTask().
-			 *
-			 *	\param[in,out] CCIDInterfaceInfo	Pointer to a structure containing a CCID Class configuration and state.
-			 */
-			void CCID_Device_USBTask(USB_ClassInfo_CCID_Device_t* const CCIDInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** CCID class driver callback for PC_TO_RDR_IccPowerOn CCID message
-			 *  When the ICC is inserted into a slot of a CCID, the CCID can activate the ICC, and the ICC will respond with an ATR
-			 *  (answer to reset)
-			 *
-			 *	\param[in,out] CCIDInterfaceInfo	Pointer to a structure containing a CCID Class configuration and state.
-			 *  \param[in]     Slot 				The slot ID currently being powered on.
-			 *  \param[in,out] Atr					Pointer to an array containing the Power On ATR being sent to the device.
-			 *  \param[out]    AtrSize				The size of the ATR being sent (up to 15 bytes maximum).
-			 *  \param[out]    Error				The result of the operation, or error.
-			 *
-			 *  \return	The command result code.
-			 */
-			uint8_t CALLBACK_CCID_IccPowerOn(USB_ClassInfo_CCID_Device_t* const CCIDInterfaceInfo,
-			                                 const uint8_t Slot,
-			                                 uint8_t* const Atr,
-			                                 uint8_t* const AtrSize,
-			                                 uint8_t* const Error) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** CCID class driver callback for PC_TO_RDR_IccPowerOff CCID message
-			 *  Turns off the ICC
-			 *
-			 *	\param[in,out] CCIDInterfaceInfo	Pointer to a structure containing a CCID Class configuration and state.
-			 *  \param[in]     Slot 				The slot ID currently being powered off.
-			 *  \param[out]    Error				The result of the operation, or error.
-			 *
-			 *  \return	The command result code.
-			 */
-			uint8_t CALLBACK_CCID_IccPowerOff(USB_ClassInfo_CCID_Device_t* const CCIDInterfaceInfo,
-			                                  const uint8_t Slot,
-			                                  uint8_t* const Error) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** CCID class driver callback for PC_TO_RDR_GetSlotStatus CCID message
-			 *  Retrieves the current status of a given slot
-			 *
-			 *	\param[in,out] CCIDInterfaceInfo	Pointer to a structure containing a CCID Class configuration and state.
-			 *  \param[in]     Slot 				The slot ID from which we want to retrieve the status.
-			 *  \param[out]    Error				The result of the operation, or error.
-			 *
-			 *  \return	The command result code.
-			 */
-			uint8_t CALLBACK_CCID_GetSlotStatus(USB_ClassInfo_CCID_Device_t* const CCIDInterfaceInfo,
-			                                    const uint8_t Slot,
-			                                    uint8_t* const Error) ATTR_NON_NULL_PTR_ARG(1);
-
-
-			/** CCID class driver callback for PC_TO_RDR_SetParameters CCID message for T=0
-			 *  Sets the current parameters of a given slot
-			 *
-			 *  \param[in,out] CCIDInterfaceInfo	Pointer to a structure containing a CCID Class configuration, state and protocol data.
-			 *  \param[in]     Slot 				The slot ID from which we want to retrieve the status.
-			 *  \param[out]    Error				The result of the operation, or error.
-			 *  \param[out]    T0 					Pointer to a buffer containing the new parameters
-			 *
-			 *  \return	The command result code.
-			 */
-			uint8_t CALLBACK_CCID_SetParameters_T0(USB_ClassInfo_CCID_Device_t* const CCIDInterfaceInfo,
-												   const uint8_t Slot,
-												   uint8_t* const Error,
-												   USB_CCID_ProtocolData_T0_t* const T0) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** CCID class driver callback for PC_TO_RDR_SetParameters CCID message for T=0
-			 *  Retrieves the current parameters of a given slot
-			 *
-			 *  \param[in,out] CCIDInterfaceInfo	Pointer to a structure containing a CCID Class configuration, state and protocol data.
-			 *  \param[in]     Slot 				The slot ID from which we want to retrieve the status.
-			 *  \param[out]    Error				The result of the operation, or error.
-			 *  \param[out]    ProtocolNum			The CCID protocol ID of the parameter being retrieved.
-			 *  \param[out]    T0 					Pointer to a buffer where the parameters will be returned
-			 *
-			 *  \return	The command result code.
-			 */
-			uint8_t CALLBACK_CCID_GetParameters_T0(USB_ClassInfo_CCID_Device_t* const CCIDInterfaceInfo,
-												   const uint8_t Slot,
-												   uint8_t* const Error,
-												   uint8_t* const ProtocolNum,
-												   USB_CCID_ProtocolData_T0_t* const T0) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** CCID class driver callback for PC_TO_RDR_XfrBlock CCID message
-			 *  Send a block of bytes from the host to a slot in the device
-			 *  and also received a block of bytes as a response
-			 *
-			 *  \param[in,out] CCIDInterfaceInfo	Pointer to a structure containing a CCID Class configuration and state.
-			 *  \param[in]     Slot 				The slot ID from which we want to retrieve the status.
-			 *  \param[in]     ReceivedBuffer 		Pointer to an array holding the received block of bytes
-			 *  \param[in]     ReceivedBufferSize 	The size of the received block of bytes
-			 *  \param[out]    SendBuffer 			Pointer to a buffer which will hold the bytes being sent back to the host
-			 *  \param[out]    SentBufferSize 		The size of the block of bytes being sent back to the host
-			 *  \param[out]    Error				The result of the operation, or error.
-			 *
-			 *  \return	The command result code.
-			 */
-			uint8_t CALLBACK_CCID_XfrBlock(USB_ClassInfo_CCID_Device_t* const CCIDInterfaceInfo,
-										   const uint8_t Slot,
-										   const uint8_t* ReceivedBuffer,
-										   const uint8_t ReceivedBufferSize,
-										   uint8_t* const SendBuffer,
-										   uint8_t* const SentBufferSize,
-										   uint8_t* const Error) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** CCID class driver callback for CCID_PC_to_RDR_Abort CCID message
-			 *  Aborts a BULK out message previously sent to a slot
-			 *
-			 *	\param[in,out] CCIDInterfaceInfo	Pointer to a structure containing a CCID Class configuration and state.
-			 *  \param[in]     Slot 				The slot ID to where the message being aborted was sent to.
-			 *  \param[in]     Seq 					The current sequence number for this message. Must be checked against
-			 *	               						the current abort message being sent at the control pipe.
-			 *  \param[out]    Error				The result of the operation, or error.
-			 *
-			 *  \return	The command result code.
-			 */
-			uint8_t CALLBACK_CCID_Abort(USB_ClassInfo_CCID_Device_t* const CCIDInterfaceInfo,
-			                            const uint8_t Slot,
-			                            const uint8_t Seq,
-			                            uint8_t* const Error) ATTR_NON_NULL_PTR_ARG(1);
-
-
-#endif
-
-/** @} */
diff --git a/NativePrograms/LUFA/Drivers/USB/Class/Device/CDCClassDevice.c b/NativePrograms/LUFA/Drivers/USB/Class/Device/CDCClassDevice.c
deleted file mode 100644
index 765675a121..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Class/Device/CDCClassDevice.c
+++ /dev/null
@@ -1,369 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-#define  __INCLUDE_FROM_USB_DRIVER
-#include "../../Core/USBMode.h"
-
-#if defined(USB_CAN_BE_DEVICE)
-
-#define  __INCLUDE_FROM_CDC_DRIVER
-#define  __INCLUDE_FROM_CDC_DEVICE_C
-#include "CDCClassDevice.h"
-
-void CDC_Device_ProcessControlRequest(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo)
-{
-	if (!(Endpoint_IsSETUPReceived()))
-	  return;
-
-	if (USB_ControlRequest.wIndex != CDCInterfaceInfo->Config.ControlInterfaceNumber)
-	  return;
-
-	switch (USB_ControlRequest.bRequest)
-	{
-		case CDC_REQ_GetLineEncoding:
-			if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))
-			{
-				Endpoint_ClearSETUP();
-
-				while (!(Endpoint_IsINReady()));
-
-				Endpoint_Write_32_LE(CDCInterfaceInfo->State.LineEncoding.BaudRateBPS);
-				Endpoint_Write_8(CDCInterfaceInfo->State.LineEncoding.CharFormat);
-				Endpoint_Write_8(CDCInterfaceInfo->State.LineEncoding.ParityType);
-				Endpoint_Write_8(CDCInterfaceInfo->State.LineEncoding.DataBits);
-
-				Endpoint_ClearIN();
-				Endpoint_ClearStatusStage();
-			}
-
-			break;
-		case CDC_REQ_SetLineEncoding:
-			if (USB_ControlRequest.bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))
-			{
-				Endpoint_ClearSETUP();
-
-				while (!(Endpoint_IsOUTReceived()))
-				{
-					if (USB_DeviceState == DEVICE_STATE_Unattached)
-					  return;
-				}
-
-				CDCInterfaceInfo->State.LineEncoding.BaudRateBPS = Endpoint_Read_32_LE();
-				CDCInterfaceInfo->State.LineEncoding.CharFormat  = Endpoint_Read_8();
-				CDCInterfaceInfo->State.LineEncoding.ParityType  = Endpoint_Read_8();
-				CDCInterfaceInfo->State.LineEncoding.DataBits    = Endpoint_Read_8();
-
-				Endpoint_ClearOUT();
-				Endpoint_ClearStatusStage();
-
-				EVENT_CDC_Device_LineEncodingChanged(CDCInterfaceInfo);
-			}
-
-			break;
-		case CDC_REQ_SetControlLineState:
-			if (USB_ControlRequest.bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))
-			{
-				Endpoint_ClearSETUP();
-				Endpoint_ClearStatusStage();
-
-				CDCInterfaceInfo->State.ControlLineStates.HostToDevice = USB_ControlRequest.wValue;
-
-				EVENT_CDC_Device_ControLineStateChanged(CDCInterfaceInfo);
-			}
-
-			break;
-		case CDC_REQ_SendBreak:
-			if (USB_ControlRequest.bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))
-			{
-				Endpoint_ClearSETUP();
-				Endpoint_ClearStatusStage();
-
-				EVENT_CDC_Device_BreakSent(CDCInterfaceInfo, (uint8_t)USB_ControlRequest.wValue);
-			}
-
-			break;
-	}
-}
-
-bool CDC_Device_ConfigureEndpoints(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo)
-{
-	memset(&CDCInterfaceInfo->State, 0x00, sizeof(CDCInterfaceInfo->State));
-
-	CDCInterfaceInfo->Config.DataINEndpoint.Type       = EP_TYPE_BULK;
-	CDCInterfaceInfo->Config.DataOUTEndpoint.Type      = EP_TYPE_BULK;
-	CDCInterfaceInfo->Config.NotificationEndpoint.Type = EP_TYPE_INTERRUPT;
-
-	if (!(Endpoint_ConfigureEndpointTable(&CDCInterfaceInfo->Config.DataINEndpoint, 1)))
-	  return false;
-
-	if (!(Endpoint_ConfigureEndpointTable(&CDCInterfaceInfo->Config.DataOUTEndpoint, 1)))
-	  return false;
-
-	if (!(Endpoint_ConfigureEndpointTable(&CDCInterfaceInfo->Config.NotificationEndpoint, 1)))
-	  return false;
-
-	return true;
-}
-
-void CDC_Device_USBTask(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo)
-{
-	if ((USB_DeviceState != DEVICE_STATE_Configured) || !(CDCInterfaceInfo->State.LineEncoding.BaudRateBPS))
-	  return;
-
-	#if !defined(NO_CLASS_DRIVER_AUTOFLUSH)
-	Endpoint_SelectEndpoint(CDCInterfaceInfo->Config.DataINEndpoint.Address);
-
-	if (Endpoint_IsINReady())
-	  CDC_Device_Flush(CDCInterfaceInfo);
-	#endif
-}
-
-uint8_t CDC_Device_SendString(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo,
-                              const char* const String)
-{
-	if ((USB_DeviceState != DEVICE_STATE_Configured) || !(CDCInterfaceInfo->State.LineEncoding.BaudRateBPS))
-	  return ENDPOINT_RWSTREAM_DeviceDisconnected;
-
-	Endpoint_SelectEndpoint(CDCInterfaceInfo->Config.DataINEndpoint.Address);
-	return Endpoint_Write_Stream_LE(String, strlen(String), NULL);
-}
-
-uint8_t CDC_Device_SendData(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo,
-                            const void* const Buffer,
-                            const uint16_t Length)
-{
-	if ((USB_DeviceState != DEVICE_STATE_Configured) || !(CDCInterfaceInfo->State.LineEncoding.BaudRateBPS))
-	  return ENDPOINT_RWSTREAM_DeviceDisconnected;
-
-	Endpoint_SelectEndpoint(CDCInterfaceInfo->Config.DataINEndpoint.Address);
-	return Endpoint_Write_Stream_LE(Buffer, Length, NULL);
-}
-
-#if defined(ARCH_HAS_FLASH_ADDRESS_SPACE)
-	uint8_t CDC_Device_SendString_P(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo,
-	                                const char* const String)
-	{
-		if ((USB_DeviceState != DEVICE_STATE_Configured) || !(CDCInterfaceInfo->State.LineEncoding.BaudRateBPS))
-		  return ENDPOINT_RWSTREAM_DeviceDisconnected;
-
-		Endpoint_SelectEndpoint(CDCInterfaceInfo->Config.DataINEndpoint.Address);
-		return Endpoint_Write_PStream_LE(String, strlen_P(String), NULL);
-	}
-
-	uint8_t CDC_Device_SendData_P(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo,
-	                              const void* const Buffer,
-	                              const uint16_t Length)
-	{
-		if ((USB_DeviceState != DEVICE_STATE_Configured) || !(CDCInterfaceInfo->State.LineEncoding.BaudRateBPS))
-		  return ENDPOINT_RWSTREAM_DeviceDisconnected;
-
-		Endpoint_SelectEndpoint(CDCInterfaceInfo->Config.DataINEndpoint.Address);
-		return Endpoint_Write_PStream_LE(Buffer, Length, NULL);
-	}
-#endif
-
-uint8_t CDC_Device_SendByte(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo,
-                            const uint8_t Data)
-{
-	if ((USB_DeviceState != DEVICE_STATE_Configured) || !(CDCInterfaceInfo->State.LineEncoding.BaudRateBPS))
-	  return ENDPOINT_RWSTREAM_DeviceDisconnected;
-
-	Endpoint_SelectEndpoint(CDCInterfaceInfo->Config.DataINEndpoint.Address);
-
-	if (!(Endpoint_IsReadWriteAllowed()))
-	{
-		Endpoint_ClearIN();
-
-		uint8_t ErrorCode;
-
-		if ((ErrorCode = Endpoint_WaitUntilReady()) != ENDPOINT_READYWAIT_NoError)
-		  return ErrorCode;
-	}
-
-	Endpoint_Write_8(Data);
-	return ENDPOINT_READYWAIT_NoError;
-}
-
-uint8_t CDC_Device_Flush(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo)
-{
-	if ((USB_DeviceState != DEVICE_STATE_Configured) || !(CDCInterfaceInfo->State.LineEncoding.BaudRateBPS))
-	  return ENDPOINT_RWSTREAM_DeviceDisconnected;
-
-	uint8_t ErrorCode;
-
-	Endpoint_SelectEndpoint(CDCInterfaceInfo->Config.DataINEndpoint.Address);
-
-	if (!(Endpoint_BytesInEndpoint()))
-	  return ENDPOINT_READYWAIT_NoError;
-
-	bool BankFull = !(Endpoint_IsReadWriteAllowed());
-
-	Endpoint_ClearIN();
-
-	if (BankFull)
-	{
-		if ((ErrorCode = Endpoint_WaitUntilReady()) != ENDPOINT_READYWAIT_NoError)
-		  return ErrorCode;
-
-		Endpoint_ClearIN();
-	}
-
-	return ENDPOINT_READYWAIT_NoError;
-}
-
-uint16_t CDC_Device_BytesReceived(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo)
-{
-	if ((USB_DeviceState != DEVICE_STATE_Configured) || !(CDCInterfaceInfo->State.LineEncoding.BaudRateBPS))
-	  return 0;
-
-	Endpoint_SelectEndpoint(CDCInterfaceInfo->Config.DataOUTEndpoint.Address);
-
-	if (Endpoint_IsOUTReceived())
-	{
-		if (!(Endpoint_BytesInEndpoint()))
-		{
-			Endpoint_ClearOUT();
-			return 0;
-		}
-		else
-		{
-			return Endpoint_BytesInEndpoint();
-		}
-	}
-	else
-	{
-		return 0;
-	}
-}
-
-int16_t CDC_Device_ReceiveByte(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo)
-{
-	if ((USB_DeviceState != DEVICE_STATE_Configured) || !(CDCInterfaceInfo->State.LineEncoding.BaudRateBPS))
-	  return -1;
-
-	int16_t ReceivedByte = -1;
-
-	Endpoint_SelectEndpoint(CDCInterfaceInfo->Config.DataOUTEndpoint.Address);
-
-	if (Endpoint_IsOUTReceived())
-	{
-		if (Endpoint_BytesInEndpoint())
-		  ReceivedByte = Endpoint_Read_8();
-
-		if (!(Endpoint_BytesInEndpoint()))
-		  Endpoint_ClearOUT();
-	}
-
-	return ReceivedByte;
-}
-
-void CDC_Device_SendControlLineStateChange(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo)
-{
-	if ((USB_DeviceState != DEVICE_STATE_Configured) || !(CDCInterfaceInfo->State.LineEncoding.BaudRateBPS))
-	  return;
-
-	Endpoint_SelectEndpoint(CDCInterfaceInfo->Config.NotificationEndpoint.Address);
-
-	USB_Request_Header_t Notification = (USB_Request_Header_t)
-		{
-			.bmRequestType = (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE),
-			.bRequest      = CDC_NOTIF_SerialState,
-			.wValue        = CPU_TO_LE16(0),
-			.wIndex        = CPU_TO_LE16(0),
-			.wLength       = CPU_TO_LE16(sizeof(CDCInterfaceInfo->State.ControlLineStates.DeviceToHost)),
-		};
-
-	Endpoint_Write_Stream_LE(&Notification, sizeof(USB_Request_Header_t), NULL);
-	Endpoint_Write_Stream_LE(&CDCInterfaceInfo->State.ControlLineStates.DeviceToHost,
-	                         sizeof(CDCInterfaceInfo->State.ControlLineStates.DeviceToHost),
-	                         NULL);
-	Endpoint_ClearIN();
-}
-
-#if defined(FDEV_SETUP_STREAM)
-	void CDC_Device_CreateStream(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo,
-	                             FILE* const Stream)
-	{
-		*Stream = (FILE)FDEV_SETUP_STREAM(CDC_Device_putchar, CDC_Device_getchar, _FDEV_SETUP_RW);
-		fdev_set_udata(Stream, CDCInterfaceInfo);
-	}
-
-	void CDC_Device_CreateBlockingStream(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo,
-	                                     FILE* const Stream)
-	{
-		*Stream = (FILE)FDEV_SETUP_STREAM(CDC_Device_putchar, CDC_Device_getchar_Blocking, _FDEV_SETUP_RW);
-		fdev_set_udata(Stream, CDCInterfaceInfo);
-	}
-
-	static int CDC_Device_putchar(char c,
-	                              FILE* Stream)
-	{
-		return CDC_Device_SendByte((USB_ClassInfo_CDC_Device_t*)fdev_get_udata(Stream), c) ? _FDEV_ERR : c;
-	}
-
-	static int CDC_Device_getchar(FILE* Stream)
-	{
-		int16_t ReceivedByte = CDC_Device_ReceiveByte((USB_ClassInfo_CDC_Device_t*)fdev_get_udata(Stream));
-
-		if (ReceivedByte < 0)
-		  return _FDEV_EOF;
-
-		return ReceivedByte;
-	}
-
-	static int CDC_Device_getchar_Blocking(FILE* Stream)
-	{
-		int16_t ReceivedByte;
-
-		while ((ReceivedByte = CDC_Device_ReceiveByte((USB_ClassInfo_CDC_Device_t*)fdev_get_udata(Stream))) < 0)
-		{
-			if (USB_DeviceState == DEVICE_STATE_Unattached)
-			  return _FDEV_EOF;
-
-			CDC_Device_USBTask((USB_ClassInfo_CDC_Device_t*)fdev_get_udata(Stream));
-			USB_USBTask();
-		}
-
-		return ReceivedByte;
-	}
-#endif
-
-void CDC_Device_Event_Stub(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo)
-{
-
-}
-
-void CDC_Device_Event_Stub_2(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo, const uint8_t _1)
-{
-	CDC_Device_Event_Stub(CDCInterfaceInfo);
-}
-
-#endif
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Class/Device/CDCClassDevice.h b/NativePrograms/LUFA/Drivers/USB/Class/Device/CDCClassDevice.h
deleted file mode 100644
index 6f8571289b..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Class/Device/CDCClassDevice.h
+++ /dev/null
@@ -1,395 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Device mode driver for the library USB CDC Class driver.
- *
- *  Device mode driver for the library USB CDC Class driver.
- *
- *  \note This file should not be included directly. It is automatically included as needed by the USB module driver
- *        dispatch header located in LUFA/Drivers/USB.h.
- */
-
-/** \ingroup Group_USBClassCDC
- *  \defgroup Group_USBClassCDCDevice CDC Class Device Mode Driver
- *
- *  \section Sec_USBClassCDCDevice_Dependencies Module Source Dependencies
- *  The following files must be built with any user project that uses this module:
- *    - LUFA/Drivers/USB/Class/Device/CDCClassDevice.c <i>(Makefile source module name: LUFA_SRC_USBCLASS)</i>
- *
- *  \section Sec_USBClassCDCDevice_ModDescription Module Description
- *  Device Mode USB Class driver framework interface, for the CDC USB Class driver.
- *
- *  \note There are several major drawbacks to the CDC-ACM standard USB class, however
- *        it is very standardized and thus usually available as a built-in driver on
- *        most platforms, and so is a better choice than a proprietary serial class.
- *
- *        One major issue with CDC-ACM is that it requires two Interface descriptors,
- *        which will upset most hosts when part of a multi-function "Composite" USB
- *        device. This is because each interface will be loaded into a separate driver
- *        instance, causing the two interfaces be become unlinked. To prevent this, you
- *        should use the "Interface Association Descriptor" addendum to the USB 2.0 standard
- *        which is available on most OSes when creating Composite devices.
- *
- *        Another major oversight is that there is no mechanism for the host to notify the
- *        device that there is a data sink on the host side ready to accept data. This
- *        means that the device may try to send data while the host isn't listening, causing
- *        lengthy blocking timeouts in the transmission routines. It is thus highly recommended
- *        that the virtual serial line DTR (Data Terminal Ready) signal be used where possible
- *        to determine if a host application is ready for data.
- *
- *  @{
- */
-
-#ifndef _CDC_CLASS_DEVICE_H_
-#define _CDC_CLASS_DEVICE_H_
-
-	/* Includes: */
-		#include "../../USB.h"
-		#include "../Common/CDCClassCommon.h"
-
-		#include <stdio.h>
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_CDC_DRIVER)
-			#error Do not include this file directly. Include LUFA/Drivers/USB.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Type Defines: */
-			/** \brief CDC Class Device Mode Configuration and State Structure.
-			 *
-			 *  Class state structure. An instance of this structure should be made for each CDC interface
-			 *  within the user application, and passed to each of the CDC class driver functions as the
-			 *  CDCInterfaceInfo parameter. This stores each CDC interface's configuration and state information.
-			 */
-			typedef struct
-			{
-				struct
-				{
-					uint8_t ControlInterfaceNumber; /**< Interface number of the CDC control interface within the device. */
-
-					USB_Endpoint_Table_t DataINEndpoint; /**< Data IN endpoint configuration table. */
-					USB_Endpoint_Table_t DataOUTEndpoint; /**< Data OUT endpoint configuration table. */
-					USB_Endpoint_Table_t NotificationEndpoint; /**< Notification IN Endpoint configuration table. */
-				} Config; /**< Config data for the USB class interface within the device. All elements in this section
-				           *   <b>must</b> be set or the interface will fail to enumerate and operate correctly.
-				           */
-				struct
-				{
-					struct
-					{
-						uint16_t HostToDevice; /**< Control line states from the host to device, as a set of \c CDC_CONTROL_LINE_OUT_*
-											    *   masks. This value is updated each time \ref CDC_Device_USBTask() is called.
-											    */
-						uint16_t DeviceToHost; /**< Control line states from the device to host, as a set of \c CDC_CONTROL_LINE_IN_*
-											    *   masks - to notify the host of changes to these values, call the
-											    *   \ref CDC_Device_SendControlLineStateChange() function.
-											    */
-					} ControlLineStates; /**< Current states of the virtual serial port's control lines between the device and host. */
-
-					CDC_LineEncoding_t LineEncoding; /**< Line encoding used in the virtual serial port, for the device's information.
-					                                  *   This is generally only used if the virtual serial port data is to be
-					                                  *   reconstructed on a physical UART.
-					                                  */
-				} State; /**< State data for the USB class interface within the device. All elements in this section
-				          *   are reset to their defaults when the interface is enumerated.
-				          */
-			} USB_ClassInfo_CDC_Device_t;
-
-		/* Function Prototypes: */
-			/** Configures the endpoints of a given CDC interface, ready for use. This should be linked to the library
-			 *  \ref EVENT_USB_Device_ConfigurationChanged() event so that the endpoints are configured when the configuration containing
-			 *  the given CDC interface is selected.
-			 *
-			 *  \param[in,out] CDCInterfaceInfo  Pointer to a structure containing a CDC Class configuration and state.
-			 *
-			 *  \return Boolean \c true if the endpoints were successfully configured, \c false otherwise.
-			 */
-			bool CDC_Device_ConfigureEndpoints(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Processes incoming control requests from the host, that are directed to the given CDC class interface. This should be
-			 *  linked to the library \ref EVENT_USB_Device_ControlRequest() event.
-			 *
-			 *  \param[in,out] CDCInterfaceInfo  Pointer to a structure containing a CDC Class configuration and state.
-			 */
-			void CDC_Device_ProcessControlRequest(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** General management task for a given CDC class interface, required for the correct operation of the interface. This should
-			 *  be called frequently in the main program loop, before the master USB management task \ref USB_USBTask().
-			 *
-			 *  \param[in,out] CDCInterfaceInfo  Pointer to a structure containing a CDC Class configuration and state.
-			 */
-			void CDC_Device_USBTask(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** CDC class driver event for a line encoding change on a CDC interface. This event fires each time the host requests a
-			 *  line encoding change (containing the serial parity, baud and other configuration information) and may be hooked in the
-			 *  user program by declaring a handler function with the same name and parameters listed here. The new line encoding
-			 *  settings are available in the \c LineEncoding structure inside the CDC interface structure passed as a parameter.
-			 *
-			 *  \param[in,out] CDCInterfaceInfo  Pointer to a structure containing a CDC Class configuration and state.
-			 */
-			void EVENT_CDC_Device_LineEncodingChanged(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** CDC class driver event for a control line state change on a CDC interface. This event fires each time the host requests a
-			 *  control line state change (containing the virtual serial control line states, such as DTR) and may be hooked in the
-			 *  user program by declaring a handler function with the same name and parameters listed here. The new control line states
-			 *  are available in the \c ControlLineStates.HostToDevice value inside the CDC interface structure passed as a parameter, set as
-			 *  a mask of \c CDC_CONTROL_LINE_OUT_* masks.
-			 *
-			 *  \param[in,out] CDCInterfaceInfo  Pointer to a structure containing a CDC Class configuration and state.
-			 */
-			void EVENT_CDC_Device_ControLineStateChanged(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** CDC class driver event for a send break request sent to the device from the host. This is generally used to separate
-			 *  data or to indicate a special condition to the receiving device.
-			 *
-			 *  \param[in,out] CDCInterfaceInfo  Pointer to a structure containing a CDC Class configuration and state.
-			 *  \param[in]     Duration          Duration of the break that has been sent by the host, in milliseconds.
-			 */
-			void EVENT_CDC_Device_BreakSent(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo,
-			                                const uint8_t Duration) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Sends a given null terminated string to the attached USB host, if connected. If a host is not connected when
-			 *  the function is called, the string is discarded. Bytes will be queued for transmission to the host until either
-			 *  the endpoint bank becomes full, or the \ref CDC_Device_Flush() function is called to flush the pending data to
-			 *  the host. This allows for multiple bytes to be packed into a single endpoint packet, increasing data throughput.
-			 *
-			 *  \pre This function must only be called when the Device state machine is in the \ref DEVICE_STATE_Configured state or
-			 *       the call will fail.
-			 *
-			 *  \param[in,out] CDCInterfaceInfo  Pointer to a structure containing a CDC Class configuration and state.
-			 *  \param[in]     String            Pointer to the null terminated string to send to the host.
-			 *
-			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t CDC_Device_SendString(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo,
-			                              const char* const String) ATTR_NON_NULL_PTR_ARG(1) ATTR_NON_NULL_PTR_ARG(2);
-
-			/** Sends a given data buffer to the attached USB host, if connected. If a host is not connected when the function is
-			 *  called, the string is discarded. Bytes will be queued for transmission to the host until either the endpoint bank
-			 *  becomes full, or the \ref CDC_Device_Flush() function is called to flush the pending data to the host. This allows
-			 *  for multiple bytes to be packed into a single endpoint packet, increasing data throughput.
-			 *
-			 *  \pre This function must only be called when the Device state machine is in the \ref DEVICE_STATE_Configured state or
-			 *       the call will fail.
-			 *
-			 *  \param[in,out] CDCInterfaceInfo  Pointer to a structure containing a CDC Class configuration and state.
-			 *  \param[in]     Buffer            Pointer to a buffer containing the data to send to the device.
-			 *  \param[in]     Length            Length of the data to send to the host.
-			 *
-			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t CDC_Device_SendData(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo,
-			                            const void* const Buffer,
-			                            const uint16_t Length) ATTR_NON_NULL_PTR_ARG(1) ATTR_NON_NULL_PTR_ARG(2);
-
-			#if defined(ARCH_HAS_FLASH_ADDRESS_SPACE)
-				/** Sends a given null terminated string from PROGMEM space to the attached USB host, if connected. If a host is not connected
-				 *  when the function is called, the string is discarded. Bytes will be queued for transmission to the host until either
-				 *  the endpoint bank becomes full, or the \ref CDC_Device_Flush() function is called to flush the pending data to
-				 *  the host. This allows for multiple bytes to be packed into a single endpoint packet, increasing data throughput.
-				 *
-				 *  \pre This function must only be called when the Device state machine is in the \ref DEVICE_STATE_Configured state or
-				 *       the call will fail.
-				 *
-				 *  \note This function does not exist on architectures that do not have a separate flash memory space.
-				 *
-				 *  \param[in,out] CDCInterfaceInfo  Pointer to a structure containing a CDC Class configuration and state.
-				 *  \param[in]     String            Pointer to the null terminated string to send to the host.
-				 *
-				 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.
-				 */
-				uint8_t CDC_Device_SendString_P(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo,
-				                                const char* const String) ATTR_NON_NULL_PTR_ARG(1) ATTR_NON_NULL_PTR_ARG(2);
-			#endif
-
-			#if defined(ARCH_HAS_FLASH_ADDRESS_SPACE)
-				/** Sends a given data buffer from PROGMEM space to the attached USB host, if connected. If a host is not connected when the
-				 *  function is called, the string is discarded. Bytes will be queued for transmission to the host until either the endpoint
-				 *  bank becomes full, or the \ref CDC_Device_Flush() function is called to flush the pending data to the host. This allows
-				 *  for multiple bytes to be packed into a single endpoint packet, increasing data throughput.
-				 *
-				 *  \pre This function must only be called when the Device state machine is in the \ref DEVICE_STATE_Configured state or
-				 *       the call will fail.
-				 *
-				 *  \note This function does not exist on architectures that do not have a separate flash memory space.
-				 *
-				 *  \param[in,out] CDCInterfaceInfo  Pointer to a structure containing a CDC Class configuration and state.
-				 *  \param[in]     Buffer            Pointer to a buffer containing the data to send to the device.
-				 *  \param[in]     Length            Length of the data to send to the host.
-				 *
-				 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.
-				 */
-				uint8_t CDC_Device_SendData_P(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo,
-				                              const void* const Buffer,
-				                              const uint16_t Length) ATTR_NON_NULL_PTR_ARG(1) ATTR_NON_NULL_PTR_ARG(2);
-			#endif
-
-			/** Sends a given byte to the attached USB host, if connected. If a host is not connected when the function is called, the
-			 *  byte is discarded. Bytes will be queued for transmission to the host until either the endpoint bank becomes full, or the
-			 *  \ref CDC_Device_Flush() function is called to flush the pending data to the host. This allows for multiple bytes to be
-			 *  packed into a single endpoint packet, increasing data throughput.
-			 *
-			 *  \pre This function must only be called when the Device state machine is in the \ref DEVICE_STATE_Configured state or
-			 *       the call will fail.
-			 *
-			 *  \param[in,out] CDCInterfaceInfo  Pointer to a structure containing a CDC Class configuration and state.
-			 *  \param[in]     Data              Byte of data to send to the host.
-			 *
-			 *  \return A value from the \ref Endpoint_WaitUntilReady_ErrorCodes_t enum.
-			 */
-			uint8_t CDC_Device_SendByte(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo,
-			                            const uint8_t Data) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Determines the number of bytes received by the CDC interface from the host, waiting to be read. This indicates the number
-			 *  of bytes in the OUT endpoint bank only, and thus the number of calls to \ref CDC_Device_ReceiveByte() which are guaranteed to
-			 *  succeed immediately. If multiple bytes are to be received, they should be buffered by the user application, as the endpoint
-			 *  bank will not be released back to the USB controller until all bytes are read.
-			 *
-			 *  \pre This function must only be called when the Device state machine is in the \ref DEVICE_STATE_Configured state or
-			 *       the call will fail.
-			 *
-			 *  \param[in,out] CDCInterfaceInfo  Pointer to a structure containing a CDC Class configuration and state.
-			 *
-			 *  \return Total number of buffered bytes received from the host.
-			 */
-			uint16_t CDC_Device_BytesReceived(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Reads a byte of data from the host. If no data is waiting to be read of if a USB host is not connected, the function
-			 *  returns a negative value. The \ref CDC_Device_BytesReceived() function may be queried in advance to determine how many
-			 *  bytes are currently buffered in the CDC interface's data receive endpoint bank, and thus how many repeated calls to this
-			 *  function which are guaranteed to succeed.
-			 *
-			 *  \pre This function must only be called when the Device state machine is in the \ref DEVICE_STATE_Configured state or
-			 *       the call will fail.
-			 *
-			 *  \param[in,out] CDCInterfaceInfo  Pointer to a structure containing a CDC Class configuration and state.
-			 *
-			 *  \return Next received byte from the host, or a negative value if no data received.
-			 */
-			int16_t CDC_Device_ReceiveByte(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Flushes any data waiting to be sent, ensuring that the send buffer is cleared.
-			 *
-			 *  \pre This function must only be called when the Device state machine is in the \ref DEVICE_STATE_Configured state or
-			 *       the call will fail.
-			 *
-			 *  \param[in,out] CDCInterfaceInfo  Pointer to a structure containing a CDC Class configuration and state.
-			 *
-			 *  \return A value from the \ref Endpoint_WaitUntilReady_ErrorCodes_t enum.
-			 */
-			uint8_t CDC_Device_Flush(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Sends a Serial Control Line State Change notification to the host. This should be called when the virtual serial
-			 *  control lines (DCD, DSR, etc.) have changed states, or to give BREAK notifications to the host. Line states persist
-			 *  until they are cleared via a second notification. This should be called each time the CDC class driver's
-			 *  \c ControlLineStates.DeviceToHost value is updated to push the new states to the USB host.
-			 *
-			 *  \pre This function must only be called when the Device state machine is in the \ref DEVICE_STATE_Configured state or
-			 *       the call will fail.
-			 *
-			 *  \param[in,out] CDCInterfaceInfo  Pointer to a structure containing a CDC Class configuration and state.
-			 */
-			void CDC_Device_SendControlLineStateChange(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);
-
-			#if defined(FDEV_SETUP_STREAM) || defined(__DOXYGEN__)
-			/** Creates a standard character stream for the given CDC Device instance so that it can be used with all the regular
-			 *  functions in the standard <stdio.h> library that accept a \c FILE stream as a destination (e.g. \c fprintf()). The created
-			 *  stream is bidirectional and can be used for both input and output functions.
-			 *
-			 *  Reading data from this stream is non-blocking, i.e. in most instances, complete strings cannot be read in by a single
-			 *  fetch, as the endpoint will not be ready at some point in the transmission, aborting the transfer. However, this may
-			 *  be used when the read data is processed byte-per-bye (via \c getc()) or when the user application will implement its own
-			 *  line buffering.
-			 *
-			 *  \note The created stream can be given as \c stdout if desired to direct the standard output from all \c <stdio.h> functions
-			 *        to the given CDC interface.
-			 *        \n\n
-			 *
-			 *  \note This function is not available on all microcontroller architectures.
-			 *
-			 *  \param[in,out] CDCInterfaceInfo  Pointer to a structure containing a CDC Class configuration and state.
-			 *  \param[in,out] Stream            Pointer to a FILE structure where the created stream should be placed.
-			 */
-			void CDC_Device_CreateStream(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo,
-			                             FILE* const Stream) ATTR_NON_NULL_PTR_ARG(1) ATTR_NON_NULL_PTR_ARG(2);
-
-			/** Identical to \ref CDC_Device_CreateStream(), except that reads are blocking until the calling stream function terminates
-			 *  the transfer. While blocking, the USB and CDC service tasks are called repeatedly to maintain USB communications.
-			 *
-			 *  \note This function is not available on all microcontroller architectures.
-			 *
-			 *  \param[in,out] CDCInterfaceInfo  Pointer to a structure containing a CDC Class configuration and state.
-			 *  \param[in,out] Stream            Pointer to a FILE structure where the created stream should be placed.
-			 */
-			void CDC_Device_CreateBlockingStream(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo,
-			                                     FILE* const Stream) ATTR_NON_NULL_PTR_ARG(1) ATTR_NON_NULL_PTR_ARG(2);
-			#endif
-
-	/* Private Interface - For use in library only: */
-	#if !defined(__DOXYGEN__)
-		/* Function Prototypes: */
-			#if defined(__INCLUDE_FROM_CDC_DEVICE_C)
-				#if defined(FDEV_SETUP_STREAM)
-				static int CDC_Device_putchar(char c,
-				                              FILE* Stream) ATTR_NON_NULL_PTR_ARG(2);
-				static int CDC_Device_getchar(FILE* Stream) ATTR_NON_NULL_PTR_ARG(1);
-				static int CDC_Device_getchar_Blocking(FILE* Stream) ATTR_NON_NULL_PTR_ARG(1);
-				#endif
-
-				void CDC_Device_Event_Stub(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo);
-				void CDC_Device_Event_Stub_2(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo, const uint8_t _1);
-
-				void EVENT_CDC_Device_LineEncodingChanged(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo)
-				                                          ATTR_WEAK ATTR_NON_NULL_PTR_ARG(1) ATTR_ALIAS(CDC_Device_Event_Stub);
-				void EVENT_CDC_Device_ControLineStateChanged(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo)
-				                                             ATTR_WEAK ATTR_NON_NULL_PTR_ARG(1) ATTR_ALIAS(CDC_Device_Event_Stub);
-				void EVENT_CDC_Device_BreakSent(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo,
-				                                const uint8_t Duration) ATTR_WEAK ATTR_NON_NULL_PTR_ARG(1)
-				                                ATTR_ALIAS(CDC_Device_Event_Stub_2);
-			#endif
-
-	#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Class/Device/HIDClassDevice.c b/NativePrograms/LUFA/Drivers/USB/Class/Device/HIDClassDevice.c
deleted file mode 100644
index 6d6bc7ee10..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Class/Device/HIDClassDevice.c
+++ /dev/null
@@ -1,211 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-#define  __INCLUDE_FROM_USB_DRIVER
-#include "../../Core/USBMode.h"
-
-#if defined(USB_CAN_BE_DEVICE)
-
-#define  __INCLUDE_FROM_HID_DRIVER
-#define  __INCLUDE_FROM_HID_DEVICE_C
-#include "HIDClassDevice.h"
-
-void HID_Device_ProcessControlRequest(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo)
-{
-	if (!(Endpoint_IsSETUPReceived()))
-	  return;
-
-	if (USB_ControlRequest.wIndex != HIDInterfaceInfo->Config.InterfaceNumber)
-	  return;
-
-	switch (USB_ControlRequest.bRequest)
-	{
-		case HID_REQ_GetReport:
-			if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))
-			{
-				uint16_t ReportSize = 0;
-				uint8_t  ReportID   = (USB_ControlRequest.wValue & 0xFF);
-				uint8_t  ReportType = (USB_ControlRequest.wValue >> 8) - 1;
-				uint8_t  ReportData[HIDInterfaceInfo->Config.PrevReportINBufferSize];
-
-				memset(ReportData, 0, sizeof(ReportData));
-
-				CALLBACK_HID_Device_CreateHIDReport(HIDInterfaceInfo, &ReportID, ReportType, ReportData, &ReportSize);
-
-				if (HIDInterfaceInfo->Config.PrevReportINBuffer != NULL)
-				{
-					memcpy(HIDInterfaceInfo->Config.PrevReportINBuffer, ReportData,
-					       HIDInterfaceInfo->Config.PrevReportINBufferSize);
-				}
-
-				Endpoint_SelectEndpoint(ENDPOINT_CONTROLEP);
-
-				Endpoint_ClearSETUP();
-
-				if (ReportID)
-				  Endpoint_Write_8(ReportID);
-
-				Endpoint_Write_Control_Stream_LE(ReportData, ReportSize);
-				Endpoint_ClearOUT();
-			}
-
-			break;
-		case HID_REQ_SetReport:
-			if (USB_ControlRequest.bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))
-			{
-				uint16_t ReportSize = USB_ControlRequest.wLength;
-				uint8_t  ReportID   = (USB_ControlRequest.wValue & 0xFF);
-				uint8_t  ReportType = (USB_ControlRequest.wValue >> 8) - 1;
-				uint8_t  ReportData[ReportSize];
-
-				Endpoint_ClearSETUP();
-				Endpoint_Read_Control_Stream_LE(ReportData, ReportSize);
-				Endpoint_ClearIN();
-
-				CALLBACK_HID_Device_ProcessHIDReport(HIDInterfaceInfo, ReportID, ReportType,
-				                                     &ReportData[ReportID ? 1 : 0], ReportSize - (ReportID ? 1 : 0));
-			}
-
-			break;
-		case HID_REQ_GetProtocol:
-			if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))
-			{
-				Endpoint_ClearSETUP();
-				while (!(Endpoint_IsINReady()));
-				Endpoint_Write_8(HIDInterfaceInfo->State.UsingReportProtocol);
-				Endpoint_ClearIN();
-				Endpoint_ClearStatusStage();
-			}
-
-			break;
-		case HID_REQ_SetProtocol:
-			if (USB_ControlRequest.bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))
-			{
-				Endpoint_ClearSETUP();
-				Endpoint_ClearStatusStage();
-
-				HIDInterfaceInfo->State.UsingReportProtocol = ((USB_ControlRequest.wValue & 0xFF) != 0x00);
-			}
-
-			break;
-		case HID_REQ_SetIdle:
-			if (USB_ControlRequest.bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))
-			{
-				Endpoint_ClearSETUP();
-				Endpoint_ClearStatusStage();
-
-				HIDInterfaceInfo->State.IdleCount = ((USB_ControlRequest.wValue & 0xFF00) >> 6);
-			}
-
-			break;
-		case HID_REQ_GetIdle:
-			if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))
-			{
-				Endpoint_ClearSETUP();
-				while (!(Endpoint_IsINReady()));
-				Endpoint_Write_8(HIDInterfaceInfo->State.IdleCount >> 2);
-				Endpoint_ClearIN();
-				Endpoint_ClearStatusStage();
-			}
-
-			break;
-	}
-}
-
-bool HID_Device_ConfigureEndpoints(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo)
-{
-	memset(&HIDInterfaceInfo->State, 0x00, sizeof(HIDInterfaceInfo->State));
-	HIDInterfaceInfo->State.UsingReportProtocol = true;
-	HIDInterfaceInfo->State.IdleCount           = 500;
-
-	HIDInterfaceInfo->Config.ReportINEndpoint.Type = EP_TYPE_INTERRUPT;
-
-	if (!(Endpoint_ConfigureEndpointTable(&HIDInterfaceInfo->Config.ReportINEndpoint, 1)))
-	  return false;
-
-	return true;
-}
-
-void HID_Device_USBTask(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo)
-{
-	if (USB_DeviceState != DEVICE_STATE_Configured)
-	  return;
-
-	if (HIDInterfaceInfo->State.PrevFrameNum == USB_Device_GetFrameNumber())
-	{
-		#if defined(USB_DEVICE_OPT_LOWSPEED)
-		if (!(USB_Options & USB_DEVICE_OPT_LOWSPEED))
-		  return;
-		#else
-		return;
-		#endif
-	}
-
-	Endpoint_SelectEndpoint(HIDInterfaceInfo->Config.ReportINEndpoint.Address);
-
-	if (Endpoint_IsReadWriteAllowed())
-	{
-		uint8_t  ReportINData[HIDInterfaceInfo->Config.PrevReportINBufferSize];
-		uint8_t  ReportID     = 0;
-		uint16_t ReportINSize = 0;
-
-		memset(ReportINData, 0, sizeof(ReportINData));
-
-		bool ForceSend         = CALLBACK_HID_Device_CreateHIDReport(HIDInterfaceInfo, &ReportID, HID_REPORT_ITEM_In,
-		                                                             ReportINData, &ReportINSize);
-		bool StatesChanged     = false;
-		bool IdlePeriodElapsed = (HIDInterfaceInfo->State.IdleCount && !(HIDInterfaceInfo->State.IdleMSRemaining));
-
-		if (HIDInterfaceInfo->Config.PrevReportINBuffer != NULL)
-		{
-			StatesChanged = (memcmp(ReportINData, HIDInterfaceInfo->Config.PrevReportINBuffer, ReportINSize) != 0);
-			memcpy(HIDInterfaceInfo->Config.PrevReportINBuffer, ReportINData, HIDInterfaceInfo->Config.PrevReportINBufferSize);
-		}
-
-		if (ReportINSize && (ForceSend || StatesChanged || IdlePeriodElapsed))
-		{
-			HIDInterfaceInfo->State.IdleMSRemaining = HIDInterfaceInfo->State.IdleCount;
-
-			Endpoint_SelectEndpoint(HIDInterfaceInfo->Config.ReportINEndpoint.Address);
-
-			if (ReportID)
-			  Endpoint_Write_8(ReportID);
-
-			Endpoint_Write_Stream_LE(ReportINData, ReportINSize, NULL);
-
-			Endpoint_ClearIN();
-		}
-
-		HIDInterfaceInfo->State.PrevFrameNum = USB_Device_GetFrameNumber();
-	}
-}
-
-#endif
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Class/Device/HIDClassDevice.h b/NativePrograms/LUFA/Drivers/USB/Class/Device/HIDClassDevice.h
deleted file mode 100644
index 42c120e6b4..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Class/Device/HIDClassDevice.h
+++ /dev/null
@@ -1,210 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Device mode driver for the library USB HID Class driver.
- *
- *  Device mode driver for the library USB HID Class driver.
- *
- *  \note This file should not be included directly. It is automatically included as needed by the USB module driver
- *        dispatch header located in LUFA/Drivers/USB.h.
- */
-
-/** \ingroup Group_USBClassHID
- *  \defgroup Group_USBClassHIDDevice HID Class Device Mode Driver
- *
- *  \section Sec_USBClassHIDDevice_Dependencies Module Source Dependencies
- *  The following files must be built with any user project that uses this module:
- *    - LUFA/Drivers/USB/Class/Device/HIDClassDevice.c <i>(Makefile source module name: LUFA_SRC_USBCLASS)</i>
- *
- *  \section Sec_USBClassHIDDevice_ModDescription Module Description
- *  Device Mode USB Class driver framework interface, for the HID USB Class driver.
- *
- *  @{
- */
-
-#ifndef _HID_CLASS_DEVICE_H_
-#define _HID_CLASS_DEVICE_H_
-
-	/* Includes: */
-		#include "../../USB.h"
-		#include "../Common/HIDClassCommon.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_HID_DRIVER)
-			#error Do not include this file directly. Include LUFA/Drivers/USB.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Type Defines: */
-			/** \brief HID Class Device Mode Configuration and State Structure.
-			 *
-			 *  Class state structure. An instance of this structure should be made for each HID interface
-			 *  within the user application, and passed to each of the HID class driver functions as the
-			 *  \c HIDInterfaceInfo parameter. This stores each HID interface's configuration and state information.
-			 *
-			 *  \note Due to technical limitations, the HID device class driver does not utilize a separate OUT
-			 *        endpoint for host->device communications. Instead, the host->device data (if any) is sent to
-			 *        the device via the control endpoint.
-			 */
-			typedef struct
-			{
-				struct
-				{
-					uint8_t  InterfaceNumber; /**< Interface number of the HID interface within the device. */
-
-					USB_Endpoint_Table_t ReportINEndpoint; /**< Data IN HID report endpoint configuration table. */
-
-					void*    PrevReportINBuffer; /**< Pointer to a buffer where the previously created HID input report can be
-					                              *  stored by the driver, for comparison purposes to detect report changes that
-					                              *  must be sent immediately to the host. This should point to a buffer big enough
-					                              *  to hold the largest HID input report sent from the HID interface. If this is set
-					                              *  to \c NULL, it is up to the user to force transfers when needed in the
-					                              *  \ref CALLBACK_HID_Device_CreateHIDReport() callback function.
-					                              *
-					                              *  \note Due to the single buffer, the internal driver can only correctly compare
-					                              *        subsequent reports with identical report IDs. In multiple report devices,
-					                              *        this buffer should be set to \c NULL and the decision to send reports made
-					                              *        by the user application instead.
-					                              */
-					uint8_t  PrevReportINBufferSize; /**< Size in bytes of the given input report buffer. This is used to create a
-					                                  *  second buffer of the same size within the driver so that subsequent reports
-					                                  *  can be compared. If the user app is to determine when reports are to be sent
-					                                  *  exclusively (i.e. \c PrevReportINBuffer is \c NULL) this value must still be
-					                                  *  set to the size of the largest report the device can issue to the host.
-					                                  */
-				} Config; /**< Config data for the USB class interface within the device. All elements in this section
-				           *   <b>must</b> be set or the interface will fail to enumerate and operate correctly.
-				           */
-				struct
-				{
-					bool     UsingReportProtocol; /**< Indicates if the HID interface is set to Boot or Report protocol mode. */
-					uint16_t PrevFrameNum; /**< Frame number of the previous HID report packet opportunity. */
-					uint16_t IdleCount; /**< Report idle period, in milliseconds, set by the host. */
-					uint16_t IdleMSRemaining; /**< Total number of milliseconds remaining before the idle period elapsed - this
-				                               *   should be decremented by the user application if non-zero each millisecond. */
-				} State; /**< State data for the USB class interface within the device. All elements in this section
-				          *   are reset to their defaults when the interface is enumerated.
-				          */
-			} USB_ClassInfo_HID_Device_t;
-
-		/* Function Prototypes: */
-			/** Configures the endpoints of a given HID interface, ready for use. This should be linked to the library
-			 *  \ref EVENT_USB_Device_ConfigurationChanged() event so that the endpoints are configured when the configuration
-			 *  containing the given HID interface is selected.
-			 *
-			 *  \param[in,out] HIDInterfaceInfo  Pointer to a structure containing a HID Class configuration and state.
-			 *
-			 *  \return Boolean \c true if the endpoints were successfully configured, \c false otherwise.
-			 */
-			bool HID_Device_ConfigureEndpoints(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Processes incoming control requests from the host, that are directed to the given HID class interface. This should be
-			 *  linked to the library \ref EVENT_USB_Device_ControlRequest() event.
-			 *
-			 *  \param[in,out] HIDInterfaceInfo  Pointer to a structure containing a HID Class configuration and state.
-			 */
-			void HID_Device_ProcessControlRequest(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** General management task for a given HID class interface, required for the correct operation of the interface. This should
-			 *  be called frequently in the main program loop, before the master USB management task \ref USB_USBTask().
-			 *
-			 *  \param[in,out] HIDInterfaceInfo  Pointer to a structure containing a HID Class configuration and state.
-			 */
-			void HID_Device_USBTask(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** HID class driver callback for the user creation of a HID IN report. This callback may fire in response to either
-			 *  HID class control requests from the host, or by the normal HID endpoint polling procedure. Inside this callback the
-			 *  user is responsible for the creation of the next HID input report to be sent to the host.
-			 *
-			 *  \param[in,out] HIDInterfaceInfo  Pointer to a structure containing a HID Class configuration and state.
-			 *  \param[in,out] ReportID          If preset to a non-zero value, this is the report ID being requested by the host. If zero,
-			 *                                   this should be set to the report ID of the generated HID input report (if any). If multiple
-			 *                                   reports are not sent via the given HID interface, this parameter should be ignored.
-			 *  \param[in]     ReportType        Type of HID report to generate, either \ref HID_REPORT_ITEM_In or \ref HID_REPORT_ITEM_Feature.
-			 *  \param[out]    ReportData        Pointer to a buffer where the generated HID report should be stored.
-			 *  \param[out]    ReportSize        Number of bytes in the generated input report, or zero if no report is to be sent.
-			 *
-			 *  \return Boolean \c true to force the sending of the report even if it is identical to the previous report and still within
-			 *          the idle period (useful for devices which report relative movement), \c false otherwise.
-			 */
-			bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo,
-			                                         uint8_t* const ReportID,
-			                                         const uint8_t ReportType,
-			                                         void* ReportData,
-			                                         uint16_t* const ReportSize) ATTR_NON_NULL_PTR_ARG(1)
-			                                         ATTR_NON_NULL_PTR_ARG(2) ATTR_NON_NULL_PTR_ARG(4) ATTR_NON_NULL_PTR_ARG(5);
-
-			/** HID class driver callback for the user processing of a received HID OUT report. This callback may fire in response to
-			 *  either HID class control requests from the host, or by the normal HID endpoint polling procedure. Inside this callback
-			 *  the user is responsible for the processing of the received HID output report from the host.
-			 *
-			 *  \param[in,out] HIDInterfaceInfo  Pointer to a structure containing a HID Class configuration and state.
-			 *  \param[in]     ReportID          Report ID of the received output report. If multiple reports are not received via the given HID
-			 *                                   interface, this parameter should be ignored.
-			 *  \param[in]     ReportType        Type of received HID report, either \ref HID_REPORT_ITEM_Out or \ref HID_REPORT_ITEM_Feature.
-			 *  \param[in]     ReportData        Pointer to a buffer where the received HID report is stored.
-			 *  \param[in]     ReportSize        Size in bytes of the received report from the host.
-			 */
-			void CALLBACK_HID_Device_ProcessHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo,
-			                                          const uint8_t ReportID,
-			                                          const uint8_t ReportType,
-			                                          const void* ReportData,
-			                                          const uint16_t ReportSize) ATTR_NON_NULL_PTR_ARG(1) ATTR_NON_NULL_PTR_ARG(4);
-
-		/* Inline Functions: */
-			/** Indicates that a millisecond of idle time has elapsed on the given HID interface, and the interface's idle count should be
-			 *  decremented. This should be called once per millisecond so that hardware key-repeats function correctly. It is recommended
-			 *  that this be called by the \ref EVENT_USB_Device_StartOfFrame() event, once SOF events have been enabled via
-			 *  \ref USB_Device_EnableSOFEvents().
-			 *
-			 *  \param[in,out] HIDInterfaceInfo  Pointer to a structure containing a HID Class configuration and state.
-			 */
-			static inline void HID_Device_MillisecondElapsed(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo) ATTR_ALWAYS_INLINE ATTR_NON_NULL_PTR_ARG(1);
-			static inline void HID_Device_MillisecondElapsed(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo)
-			{
-				if (HIDInterfaceInfo->State.IdleMSRemaining)
-				  HIDInterfaceInfo->State.IdleMSRemaining--;
-			}
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Class/Device/MIDIClassDevice.c b/NativePrograms/LUFA/Drivers/USB/Class/Device/MIDIClassDevice.c
deleted file mode 100644
index 2a5fa0f9ae..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Class/Device/MIDIClassDevice.c
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-#define  __INCLUDE_FROM_USB_DRIVER
-#include "../../Core/USBMode.h"
-
-#if defined(USB_CAN_BE_DEVICE)
-
-#define  __INCLUDE_FROM_MIDI_DRIVER
-#define  __INCLUDE_FROM_MIDI_DEVICE_C
-#include "MIDIClassDevice.h"
-
-bool MIDI_Device_ConfigureEndpoints(USB_ClassInfo_MIDI_Device_t* const MIDIInterfaceInfo)
-{
-	memset(&MIDIInterfaceInfo->State, 0x00, sizeof(MIDIInterfaceInfo->State));
-
-	MIDIInterfaceInfo->Config.DataINEndpoint.Type  = EP_TYPE_BULK;
-	MIDIInterfaceInfo->Config.DataOUTEndpoint.Type = EP_TYPE_BULK;
-
-	if (!(Endpoint_ConfigureEndpointTable(&MIDIInterfaceInfo->Config.DataINEndpoint, 1)))
-	  return false;
-
-	if (!(Endpoint_ConfigureEndpointTable(&MIDIInterfaceInfo->Config.DataOUTEndpoint, 1)))
-	  return false;
-
-	return true;
-}
-
-void MIDI_Device_USBTask(USB_ClassInfo_MIDI_Device_t* const MIDIInterfaceInfo)
-{
-	if (USB_DeviceState != DEVICE_STATE_Configured)
-	  return;
-
-	#if !defined(NO_CLASS_DRIVER_AUTOFLUSH)
-	Endpoint_SelectEndpoint(MIDIInterfaceInfo->Config.DataINEndpoint.Address);
-
-	if (Endpoint_IsINReady())
-	  MIDI_Device_Flush(MIDIInterfaceInfo);
-	#endif
-}
-
-uint8_t MIDI_Device_SendEventPacket(USB_ClassInfo_MIDI_Device_t* const MIDIInterfaceInfo,
-                                    const MIDI_EventPacket_t* const Event)
-{
-	if (USB_DeviceState != DEVICE_STATE_Configured)
-	  return ENDPOINT_RWSTREAM_DeviceDisconnected;
-
-	uint8_t ErrorCode;
-
-	Endpoint_SelectEndpoint(MIDIInterfaceInfo->Config.DataINEndpoint.Address);
-
-	if ((ErrorCode = Endpoint_Write_Stream_LE(Event, sizeof(MIDI_EventPacket_t), NULL)) != ENDPOINT_RWSTREAM_NoError)
-	  return ErrorCode;
-
-	if (!(Endpoint_IsReadWriteAllowed()))
-	  Endpoint_ClearIN();
-
-	return ENDPOINT_RWSTREAM_NoError;
-}
-
-uint8_t MIDI_Device_Flush(USB_ClassInfo_MIDI_Device_t* const MIDIInterfaceInfo)
-{
-	if (USB_DeviceState != DEVICE_STATE_Configured)
-	  return ENDPOINT_RWSTREAM_DeviceDisconnected;
-
-	uint8_t ErrorCode;
-
-	Endpoint_SelectEndpoint(MIDIInterfaceInfo->Config.DataINEndpoint.Address);
-
-	if (Endpoint_BytesInEndpoint())
-	{
-		Endpoint_ClearIN();
-
-		if ((ErrorCode = Endpoint_WaitUntilReady()) != ENDPOINT_READYWAIT_NoError)
-		  return ErrorCode;
-	}
-
-	return ENDPOINT_READYWAIT_NoError;
-}
-
-bool MIDI_Device_ReceiveEventPacket(USB_ClassInfo_MIDI_Device_t* const MIDIInterfaceInfo,
-                                    MIDI_EventPacket_t* const Event)
-{
-	if (USB_DeviceState != DEVICE_STATE_Configured)
-	  return false;
-
-	Endpoint_SelectEndpoint(MIDIInterfaceInfo->Config.DataOUTEndpoint.Address);
-
-	if (!(Endpoint_IsOUTReceived()))
-		return false;
-
-	if (!(Endpoint_IsReadWriteAllowed()))
-	  return false;
-
-	Endpoint_Read_Stream_LE(Event, sizeof(MIDI_EventPacket_t), NULL);
-
-	if (!(Endpoint_IsReadWriteAllowed()))
-	  Endpoint_ClearOUT();
-
-	return true;
-}
-
-#endif
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Class/Device/MIDIClassDevice.h b/NativePrograms/LUFA/Drivers/USB/Class/Device/MIDIClassDevice.h
deleted file mode 100644
index ef2e14b129..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Class/Device/MIDIClassDevice.h
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Device mode driver for the library USB MIDI Class driver.
- *
- *  Device mode driver for the library USB MIDI Class driver.
- *
- *  \note This file should not be included directly. It is automatically included as needed by the USB module driver
- *        dispatch header located in LUFA/Drivers/USB.h.
- */
-
-/** \ingroup Group_USBClassMIDI
- *  \defgroup Group_USBClassMIDIDevice MIDI Class Device Mode Driver
- *
- *  \section Sec_USBClassMIDIDevice_Dependencies Module Source Dependencies
- *  The following files must be built with any user project that uses this module:
- *    - LUFA/Drivers/USB/Class/Device/MIDIClassDevice.c <i>(Makefile source module name: LUFA_SRC_USBCLASS)</i>
- *
- *  \section Sec_USBClassMIDIDevice_ModDescription Module Description
- *  Device Mode USB Class driver framework interface, for the MIDI USB Class driver.
- *
- *  @{
- */
-
-#ifndef _MIDI_CLASS_DEVICE_H_
-#define _MIDI_CLASS_DEVICE_H_
-
-	/* Includes: */
-		#include "../../USB.h"
-		#include "../Common/MIDIClassCommon.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_MIDI_DRIVER)
-			#error Do not include this file directly. Include LUFA/Drivers/USB.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Type Define: */
-			/** \brief MIDI Class Device Mode Configuration and State Structure.
-			 *
-			 *  Class state structure. An instance of this structure should be made for each MIDI interface
-			 *  within the user application, and passed to each of the MIDI class driver functions as the
-			 *  \c MIDIInterfaceInfo parameter. This stores each MIDI interface's configuration and state information.
-			 */
-			typedef struct
-			{
-				struct
-				{
-					uint8_t  StreamingInterfaceNumber; /**< Index of the Audio Streaming interface within the device this structure controls. */
-
-					USB_Endpoint_Table_t DataINEndpoint; /**< Data IN endpoint configuration table. */
-					USB_Endpoint_Table_t DataOUTEndpoint; /**< Data OUT endpoint configuration table. */
-				} Config; /**< Config data for the USB class interface within the device. All elements in this section
-				           *   <b>must</b> be set or the interface will fail to enumerate and operate correctly.
-				           */
-
-				struct
-				{
-					uint8_t RESERVED; // No state information for this class
-				} State; /**< State data for the USB class interface within the device. All elements in this section
-				          *   are reset to their defaults when the interface is enumerated.
-				          */
-			} USB_ClassInfo_MIDI_Device_t;
-
-		/* Function Prototypes: */
-			/** Configures the endpoints of a given MIDI interface, ready for use. This should be linked to the library
-			 *  \ref EVENT_USB_Device_ConfigurationChanged() event so that the endpoints are configured when the configuration
-			 *  containing the given MIDI interface is selected.
-			 *
-			 *  \param[in,out] MIDIInterfaceInfo  Pointer to a structure containing a MIDI Class configuration and state.
-			 *
-			 *  \return Boolean \c true if the endpoints were successfully configured, \c false otherwise.
-			 */
-			bool MIDI_Device_ConfigureEndpoints(USB_ClassInfo_MIDI_Device_t* const MIDIInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** General management task for a given MIDI class interface, required for the correct operation of the interface. This should
-			 *  be called frequently in the main program loop, before the master USB management task \ref USB_USBTask().
-			 *
-			 *  \param[in,out] MIDIInterfaceInfo  Pointer to a structure containing a MIDI Class configuration and state.
-			 */
-			void MIDI_Device_USBTask(USB_ClassInfo_MIDI_Device_t* const MIDIInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Sends a MIDI event packet to the host. If no host is connected, the event packet is discarded. Events are queued into the
-			 *  endpoint bank until either the endpoint bank is full, or \ref MIDI_Device_Flush() is called. This allows for multiple
-			 *  MIDI events to be packed into a single endpoint packet, increasing data throughput.
-			 *
-			 *  \pre This function must only be called when the Host state machine is in the \ref HOST_STATE_Configured state or the
-			 *       call will fail.
-			 *
-			 *  \param[in,out] MIDIInterfaceInfo  Pointer to a structure containing a MIDI Class configuration and state.
-			 *  \param[in]     Event              Pointer to a populated \ref MIDI_EventPacket_t structure containing the MIDI event to send.
-			 *
-			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t MIDI_Device_SendEventPacket(USB_ClassInfo_MIDI_Device_t* const MIDIInterfaceInfo,
-			                                    const MIDI_EventPacket_t* const Event) ATTR_NON_NULL_PTR_ARG(1) ATTR_NON_NULL_PTR_ARG(2);
-
-
-			/** Flushes the MIDI send buffer, sending any queued MIDI events to the host. This should be called to override the
-			 *  \ref MIDI_Device_SendEventPacket() function's packing behavior, to flush queued events.
-			 *
-			 *  \param[in,out] MIDIInterfaceInfo  Pointer to a structure containing a MIDI Class configuration and state.
-			 *
-			 *  \return A value from the \ref Endpoint_WaitUntilReady_ErrorCodes_t enum.
-			 */
-			uint8_t MIDI_Device_Flush(USB_ClassInfo_MIDI_Device_t* const MIDIInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Receives a MIDI event packet from the host. Events are unpacked from the endpoint, thus if the endpoint bank contains
-			 *  multiple MIDI events from the host in the one packet, multiple calls to this function will return each individual event.
-			 *
-			 *  \pre This function must only be called when the Host state machine is in the \ref HOST_STATE_Configured state or the
-			 *       call will fail.
-			 *
-			 *  \param[in,out] MIDIInterfaceInfo  Pointer to a structure containing a MIDI Class configuration and state.
-			 *  \param[out]    Event              Pointer to a USB_MIDI_EventPacket_t structure where the received MIDI event is to be placed.
-			 *
-			 *  \return Boolean \c true if a MIDI event packet was received, \c false otherwise.
-			 */
-			bool MIDI_Device_ReceiveEventPacket(USB_ClassInfo_MIDI_Device_t* const MIDIInterfaceInfo,
-			                                    MIDI_EventPacket_t* const Event) ATTR_NON_NULL_PTR_ARG(1) ATTR_NON_NULL_PTR_ARG(2);
-
-		/* Inline Functions: */
-			/** Processes incoming control requests from the host, that are directed to the given MIDI class interface. This should be
-			 *  linked to the library \ref EVENT_USB_Device_ControlRequest() event.
-			 *
-			 *  \param[in,out] MIDIInterfaceInfo  Pointer to a structure containing a MIDI Class configuration and state.
-			 */
-			static inline void MIDI_Device_ProcessControlRequest(USB_ClassInfo_MIDI_Device_t* const MIDIInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);
-			static inline void MIDI_Device_ProcessControlRequest(USB_ClassInfo_MIDI_Device_t* const MIDIInterfaceInfo)
-			{
-				(void)MIDIInterfaceInfo;
-			}
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Class/Device/MassStorageClassDevice.c b/NativePrograms/LUFA/Drivers/USB/Class/Device/MassStorageClassDevice.c
deleted file mode 100644
index 24b8acd772..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Class/Device/MassStorageClassDevice.c
+++ /dev/null
@@ -1,215 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-#define  __INCLUDE_FROM_USB_DRIVER
-#include "../../Core/USBMode.h"
-
-#if defined(USB_CAN_BE_DEVICE)
-
-#define  __INCLUDE_FROM_MS_DRIVER
-#define  __INCLUDE_FROM_MASSSTORAGE_DEVICE_C
-#include "MassStorageClassDevice.h"
-
-void MS_Device_ProcessControlRequest(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo)
-{
-	if (!(Endpoint_IsSETUPReceived()))
-	  return;
-
-	if (USB_ControlRequest.wIndex != MSInterfaceInfo->Config.InterfaceNumber)
-	  return;
-
-	switch (USB_ControlRequest.bRequest)
-	{
-		case MS_REQ_MassStorageReset:
-			if (USB_ControlRequest.bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))
-			{
-				Endpoint_ClearSETUP();
-				Endpoint_ClearStatusStage();
-
-				MSInterfaceInfo->State.IsMassStoreReset = true;
-			}
-
-			break;
-		case MS_REQ_GetMaxLUN:
-			if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))
-			{
-				Endpoint_ClearSETUP();
-				while (!(Endpoint_IsINReady()));
-				Endpoint_Write_8(MSInterfaceInfo->Config.TotalLUNs - 1);
-				Endpoint_ClearIN();
-				Endpoint_ClearStatusStage();
-			}
-
-			break;
-	}
-}
-
-bool MS_Device_ConfigureEndpoints(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo)
-{
-	memset(&MSInterfaceInfo->State, 0x00, sizeof(MSInterfaceInfo->State));
-
-	MSInterfaceInfo->Config.DataINEndpoint.Type  = EP_TYPE_BULK;
-	MSInterfaceInfo->Config.DataOUTEndpoint.Type = EP_TYPE_BULK;
-
-	if (!(Endpoint_ConfigureEndpointTable(&MSInterfaceInfo->Config.DataINEndpoint, 1)))
-	  return false;
-
-	if (!(Endpoint_ConfigureEndpointTable(&MSInterfaceInfo->Config.DataOUTEndpoint, 1)))
-	  return false;
-
-	return true;
-}
-
-void MS_Device_USBTask(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo)
-{
-	if (USB_DeviceState != DEVICE_STATE_Configured)
-	  return;
-
-	Endpoint_SelectEndpoint(MSInterfaceInfo->Config.DataOUTEndpoint.Address);
-
-	if (Endpoint_IsOUTReceived())
-	{
-		if (MS_Device_ReadInCommandBlock(MSInterfaceInfo))
-		{
-			if (MSInterfaceInfo->State.CommandBlock.Flags & MS_COMMAND_DIR_DATA_IN)
-			  Endpoint_SelectEndpoint(MSInterfaceInfo->Config.DataINEndpoint.Address);
-
-			bool SCSICommandResult = CALLBACK_MS_Device_SCSICommandReceived(MSInterfaceInfo);
-
-			MSInterfaceInfo->State.CommandStatus.Status              = (SCSICommandResult) ? MS_SCSI_COMMAND_Pass : MS_SCSI_COMMAND_Fail;
-			MSInterfaceInfo->State.CommandStatus.Signature           = CPU_TO_LE32(MS_CSW_SIGNATURE);
-			MSInterfaceInfo->State.CommandStatus.Tag                 = MSInterfaceInfo->State.CommandBlock.Tag;
-			MSInterfaceInfo->State.CommandStatus.DataTransferResidue = MSInterfaceInfo->State.CommandBlock.DataTransferLength;
-
-			if (!(SCSICommandResult) && (le32_to_cpu(MSInterfaceInfo->State.CommandStatus.DataTransferResidue)))
-			  Endpoint_StallTransaction();
-
-			MS_Device_ReturnCommandStatus(MSInterfaceInfo);
-		}
-	}
-
-	if (MSInterfaceInfo->State.IsMassStoreReset)
-	{
-		Endpoint_ResetEndpoint(MSInterfaceInfo->Config.DataOUTEndpoint.Address);
-		Endpoint_ResetEndpoint(MSInterfaceInfo->Config.DataINEndpoint.Address);
-
-		Endpoint_SelectEndpoint(MSInterfaceInfo->Config.DataOUTEndpoint.Address);
-		Endpoint_ClearStall();
-		Endpoint_ResetDataToggle();
-		Endpoint_SelectEndpoint(MSInterfaceInfo->Config.DataINEndpoint.Address);
-		Endpoint_ClearStall();
-		Endpoint_ResetDataToggle();
-
-		MSInterfaceInfo->State.IsMassStoreReset = false;
-	}
-}
-
-static bool MS_Device_ReadInCommandBlock(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo)
-{
-	uint16_t BytesProcessed;
-
-	Endpoint_SelectEndpoint(MSInterfaceInfo->Config.DataOUTEndpoint.Address);
-
-	BytesProcessed = 0;
-	while (Endpoint_Read_Stream_LE(&MSInterfaceInfo->State.CommandBlock,
-	                               (sizeof(MS_CommandBlockWrapper_t) - 16), &BytesProcessed) ==
-	                               ENDPOINT_RWSTREAM_IncompleteTransfer)
-	{
-		if (MSInterfaceInfo->State.IsMassStoreReset)
-		  return false;
-	}
-
-	if ((MSInterfaceInfo->State.CommandBlock.Signature         != CPU_TO_LE32(MS_CBW_SIGNATURE))     ||
-	    (MSInterfaceInfo->State.CommandBlock.LUN               >= MSInterfaceInfo->Config.TotalLUNs) ||
-		(MSInterfaceInfo->State.CommandBlock.Flags              & 0x1F)                              ||
-		(MSInterfaceInfo->State.CommandBlock.SCSICommandLength == 0)                                 ||
-		(MSInterfaceInfo->State.CommandBlock.SCSICommandLength >  16))
-	{
-		Endpoint_StallTransaction();
-		Endpoint_SelectEndpoint(MSInterfaceInfo->Config.DataINEndpoint.Address);
-		Endpoint_StallTransaction();
-
-		return false;
-	}
-
-	BytesProcessed = 0;
-	while (Endpoint_Read_Stream_LE(&MSInterfaceInfo->State.CommandBlock.SCSICommandData,
-	                                MSInterfaceInfo->State.CommandBlock.SCSICommandLength, &BytesProcessed) ==
-	                                ENDPOINT_RWSTREAM_IncompleteTransfer)
-	{
-		if (MSInterfaceInfo->State.IsMassStoreReset)
-		  return false;
-	}
-
-	Endpoint_ClearOUT();
-
-	return true;
-}
-
-static void MS_Device_ReturnCommandStatus(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo)
-{
-	Endpoint_SelectEndpoint(MSInterfaceInfo->Config.DataOUTEndpoint.Address);
-
-	while (Endpoint_IsStalled())
-	{
-		#if !defined(INTERRUPT_CONTROL_ENDPOINT)
-		USB_USBTask();
-		#endif
-
-		if (MSInterfaceInfo->State.IsMassStoreReset)
-		  return;
-	}
-
-	Endpoint_SelectEndpoint(MSInterfaceInfo->Config.DataINEndpoint.Address);
-
-	while (Endpoint_IsStalled())
-	{
-		#if !defined(INTERRUPT_CONTROL_ENDPOINT)
-		USB_USBTask();
-		#endif
-
-		if (MSInterfaceInfo->State.IsMassStoreReset)
-		  return;
-	}
-
-	uint16_t BytesProcessed = 0;
-	while (Endpoint_Write_Stream_LE(&MSInterfaceInfo->State.CommandStatus,
-	                                sizeof(MS_CommandStatusWrapper_t), &BytesProcessed) ==
-	                                ENDPOINT_RWSTREAM_IncompleteTransfer)
-	{
-		if (MSInterfaceInfo->State.IsMassStoreReset)
-		  return;
-	}
-
-	Endpoint_ClearIN();
-}
-
-#endif
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Class/Device/MassStorageClassDevice.h b/NativePrograms/LUFA/Drivers/USB/Class/Device/MassStorageClassDevice.h
deleted file mode 100644
index 5e38577aaa..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Class/Device/MassStorageClassDevice.h
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Device mode driver for the library USB Mass Storage Class driver.
- *
- *  Device mode driver for the library USB Mass Storage Class driver.
- *
- *  \note This file should not be included directly. It is automatically included as needed by the USB module driver
- *        dispatch header located in LUFA/Drivers/USB.h.
- */
-
-/** \ingroup Group_USBClassMS
- *  \defgroup Group_USBClassMSDevice Mass Storage Class Device Mode Driver
- *
- *  \section Sec_USBClassMSDevice_Dependencies Module Source Dependencies
- *  The following files must be built with any user project that uses this module:
- *    - LUFA/Drivers/USB/Class/Device/MassStorageClassDevice.c <i>(Makefile source module name: LUFA_SRC_USBCLASS)</i>
- *
- *  \section Sec_USBClassMSDevice_ModDescription Module Description
- *  Device Mode USB Class driver framework interface, for the Mass Storage USB Class driver.
- *
- *  @{
- */
-
-#ifndef _MS_CLASS_DEVICE_H_
-#define _MS_CLASS_DEVICE_H_
-
-	/* Includes: */
-		#include "../../USB.h"
-		#include "../Common/MassStorageClassCommon.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_MS_DRIVER)
-			#error Do not include this file directly. Include LUFA/Drivers/USB.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Type Defines: */
-			/** \brief Mass Storage Class Device Mode Configuration and State Structure.
-			 *
-			 *  Class state structure. An instance of this structure should be made for each Mass Storage interface
-			 *  within the user application, and passed to each of the Mass Storage class driver functions as the
-			 *  \c MSInterfaceInfo parameter. This stores each Mass Storage interface's configuration and state information.
-			 */
-			typedef struct
-			{
-				struct
-				{
-					uint8_t  InterfaceNumber; /**< Interface number of the Mass Storage interface within the device. */
-
-					USB_Endpoint_Table_t DataINEndpoint; /**< Data IN endpoint configuration table. */
-					USB_Endpoint_Table_t DataOUTEndpoint; /**< Data OUT endpoint configuration table. */
-
-					uint8_t  TotalLUNs; /**< Total number of logical drives in the Mass Storage interface. */
-				} Config; /**< Config data for the USB class interface within the device. All elements in this section
-				           *   <b>must</b> be set or the interface will fail to enumerate and operate correctly.
-				           */
-				struct
-				{
-					MS_CommandBlockWrapper_t  CommandBlock; /**< Mass Storage class command block structure, stores the received SCSI
-															 *   command from the host which is to be processed.
-															 */
-					MS_CommandStatusWrapper_t CommandStatus; /**< Mass Storage class command status structure, set elements to indicate
-															  *   the issued command's success or failure to the host.
-															  */
-					volatile bool IsMassStoreReset; /**< Flag indicating that the host has requested that the Mass Storage interface be reset
-											         *   and that all current Mass Storage operations should immediately abort.
-											         */
-				} State; /**< State data for the USB class interface within the device. All elements in this section
-				          *   are reset to their defaults when the interface is enumerated.
-				          */
-			} USB_ClassInfo_MS_Device_t;
-
-		/* Function Prototypes: */
-			/** Configures the endpoints of a given Mass Storage interface, ready for use. This should be linked to the library
-			 *  \ref EVENT_USB_Device_ConfigurationChanged() event so that the endpoints are configured when the configuration
-			 *  containing the given Mass Storage interface is selected.
-			 *
-			 *  \param[in,out] MSInterfaceInfo  Pointer to a structure containing a Mass Storage Class configuration and state.
-			 *
-			 *  \return Boolean \c true if the endpoints were successfully configured, \c false otherwise.
-			 */
-			bool MS_Device_ConfigureEndpoints(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Processes incoming control requests from the host, that are directed to the given Mass Storage class interface. This should be
-			 *  linked to the library \ref EVENT_USB_Device_ControlRequest() event.
-			 *
-			 *  \param[in,out] MSInterfaceInfo  Pointer to a structure containing a Mass Storage Class configuration and state.
-			 */
-			void MS_Device_ProcessControlRequest(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** General management task for a given Mass Storage class interface, required for the correct operation of the interface. This should
-			 *  be called frequently in the main program loop, before the master USB management task \ref USB_USBTask().
-			 *
-			 *  \param[in,out] MSInterfaceInfo  Pointer to a structure containing a Mass Storage configuration and state.
-			 */
-			void MS_Device_USBTask(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Mass Storage class driver callback for the user processing of a received SCSI command. This callback will fire each time the
-			 *  host sends a SCSI command which requires processing by the user application. Inside this callback the user is responsible
-			 *  for the processing of the received SCSI command from the host. The SCSI command is available in the CommandBlock structure
-			 *  inside the Mass Storage class state structure passed as a parameter to the callback function.
-			 *
-			 *  \param[in,out] MSInterfaceInfo  Pointer to a structure containing a Mass Storage Class configuration and state.
-			 *
-			 *  \return Boolean \c true if the SCSI command was successfully processed, \c false otherwise.
-			 */
-			bool CALLBACK_MS_Device_SCSICommandReceived(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);
-
-	/* Private Interface - For use in library only: */
-	#if !defined(__DOXYGEN__)
-		/* Function Prototypes: */
-			#if defined(__INCLUDE_FROM_MASSSTORAGE_DEVICE_C)
-				static void MS_Device_ReturnCommandStatus(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);
-				static bool MS_Device_ReadInCommandBlock(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);
-			#endif
-
-	#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Class/Device/PrinterClassDevice.c b/NativePrograms/LUFA/Drivers/USB/Class/Device/PrinterClassDevice.c
deleted file mode 100644
index 39daf985c2..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Class/Device/PrinterClassDevice.c
+++ /dev/null
@@ -1,316 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-#define  __INCLUDE_FROM_USB_DRIVER
-#include "../../Core/USBMode.h"
-
-#if defined(USB_CAN_BE_DEVICE)
-
-#define  __INCLUDE_FROM_PRINTER_DRIVER
-#define  __INCLUDE_FROM_PRINTER_DEVICE_C
-#include "PrinterClassDevice.h"
-
-void PRNT_Device_ProcessControlRequest(USB_ClassInfo_PRNT_Device_t* const PRNTInterfaceInfo)
-{
-	if (!(Endpoint_IsSETUPReceived()))
-	  return;
-
-	if (USB_ControlRequest.wIndex != PRNTInterfaceInfo->Config.InterfaceNumber)
-	  return;
-
-	switch (USB_ControlRequest.bRequest)
-	{
-		case PRNT_REQ_GetDeviceID:
-			if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))
-			{
-				Endpoint_ClearSETUP();
-
-				while (!(Endpoint_IsINReady()))
-				{
-					if (USB_DeviceState == DEVICE_STATE_Unattached)
-					  return;
-				}
-
-				uint16_t IEEEStringLen = strlen(PRNTInterfaceInfo->Config.IEEE1284String);
-				Endpoint_Write_16_BE(IEEEStringLen + sizeof(uint16_t));
-				Endpoint_Write_Control_Stream_LE(PRNTInterfaceInfo->Config.IEEE1284String, IEEEStringLen);
-				Endpoint_ClearStatusStage();
-			}
-
-			break;
-		case PRNT_REQ_GetPortStatus:
-			if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))
-			{
-				Endpoint_ClearSETUP();
-
-				while (!(Endpoint_IsINReady()))
-				{
-					if (USB_DeviceState == DEVICE_STATE_Unattached)
-					  return;
-				}
-
-				Endpoint_Write_8(PRNTInterfaceInfo->State.PortStatus);
-				Endpoint_ClearIN();
-
-				Endpoint_ClearStatusStage();
-			}
-
-			break;
-		case PRNT_REQ_SoftReset:
-			if (USB_ControlRequest.bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))
-			{
-				Endpoint_ClearSETUP();
-				Endpoint_ClearStatusStage();
-
-				PRNTInterfaceInfo->State.IsPrinterReset = true;
-
-				EVENT_PRNT_Device_SoftReset(PRNTInterfaceInfo);
-			}
-
-			break;
-	}
-}
-
-bool PRNT_Device_ConfigureEndpoints(USB_ClassInfo_PRNT_Device_t* const PRNTInterfaceInfo)
-{
-	memset(&PRNTInterfaceInfo->State, 0x00, sizeof(PRNTInterfaceInfo->State));
-	PRNTInterfaceInfo->State.PortStatus = PRNT_PORTSTATUS_NOTERROR | PRNT_PORTSTATUS_SELECT;
-
-	PRNTInterfaceInfo->Config.DataINEndpoint.Type  = EP_TYPE_BULK;
-	PRNTInterfaceInfo->Config.DataOUTEndpoint.Type = EP_TYPE_BULK;
-
-	if (!(Endpoint_ConfigureEndpointTable(&PRNTInterfaceInfo->Config.DataINEndpoint, 1)))
-	  return false;
-
-	if (!(Endpoint_ConfigureEndpointTable(&PRNTInterfaceInfo->Config.DataOUTEndpoint, 1)))
-	  return false;
-
-	return true;
-}
-
-void PRNT_Device_USBTask(USB_ClassInfo_PRNT_Device_t* const PRNTInterfaceInfo)
-{
-	if (USB_DeviceState != DEVICE_STATE_Configured)
-	  return;
-
-	#if !defined(NO_CLASS_DRIVER_AUTOFLUSH)
-	Endpoint_SelectEndpoint(PRNTInterfaceInfo->Config.DataINEndpoint.Address);
-
-	if (Endpoint_IsINReady())
-	  PRNT_Device_Flush(PRNTInterfaceInfo);
-	#endif
-
-	if (PRNTInterfaceInfo->State.IsPrinterReset)
-	{
-		Endpoint_ResetEndpoint(PRNTInterfaceInfo->Config.DataOUTEndpoint.Address);
-		Endpoint_ResetEndpoint(PRNTInterfaceInfo->Config.DataINEndpoint.Address);
-
-		Endpoint_SelectEndpoint(PRNTInterfaceInfo->Config.DataOUTEndpoint.Address);
-		Endpoint_ClearStall();
-		Endpoint_ResetDataToggle();
-		Endpoint_SelectEndpoint(PRNTInterfaceInfo->Config.DataINEndpoint.Address);
-		Endpoint_ClearStall();
-		Endpoint_ResetDataToggle();
-
-		PRNTInterfaceInfo->State.IsPrinterReset = false;
-	}
-}
-
-uint8_t PRNT_Device_SendString(USB_ClassInfo_PRNT_Device_t* const PRNTInterfaceInfo,
-                               const char* const String)
-{
-	if (USB_DeviceState != DEVICE_STATE_Configured)
-	  return ENDPOINT_RWSTREAM_DeviceDisconnected;
-
-	Endpoint_SelectEndpoint(PRNTInterfaceInfo->Config.DataINEndpoint.Address);
-	return Endpoint_Write_Stream_LE(String, strlen(String), NULL);
-}
-
-uint8_t PRNT_Device_SendData(USB_ClassInfo_PRNT_Device_t* const PRNTInterfaceInfo,
-                             const void* const Buffer,
-                             const uint16_t Length)
-{
-	if (USB_DeviceState != DEVICE_STATE_Configured)
-	  return ENDPOINT_RWSTREAM_DeviceDisconnected;
-
-	Endpoint_SelectEndpoint(PRNTInterfaceInfo->Config.DataINEndpoint.Address);
-	return Endpoint_Write_Stream_LE(Buffer, Length, NULL);
-}
-
-uint8_t PRNT_Device_SendByte(USB_ClassInfo_PRNT_Device_t* const PRNTInterfaceInfo,
-                             const uint8_t Data)
-{
-	if (USB_DeviceState != DEVICE_STATE_Configured)
-	  return ENDPOINT_RWSTREAM_DeviceDisconnected;
-
-	Endpoint_SelectEndpoint(PRNTInterfaceInfo->Config.DataINEndpoint.Address);
-
-	if (!(Endpoint_IsReadWriteAllowed()))
-	{
-		Endpoint_ClearIN();
-
-		uint8_t ErrorCode;
-
-		if ((ErrorCode = Endpoint_WaitUntilReady()) != ENDPOINT_READYWAIT_NoError)
-		  return ErrorCode;
-	}
-
-	Endpoint_Write_8(Data);
-	return ENDPOINT_READYWAIT_NoError;
-}
-
-uint8_t PRNT_Device_Flush(USB_ClassInfo_PRNT_Device_t* const PRNTInterfaceInfo)
-{
-	if (USB_DeviceState != DEVICE_STATE_Configured)
-	  return ENDPOINT_RWSTREAM_DeviceDisconnected;
-
-	uint8_t ErrorCode;
-
-	Endpoint_SelectEndpoint(PRNTInterfaceInfo->Config.DataINEndpoint.Address);
-
-	if (!(Endpoint_BytesInEndpoint()))
-	  return ENDPOINT_READYWAIT_NoError;
-
-	bool BankFull = !(Endpoint_IsReadWriteAllowed());
-
-	Endpoint_ClearIN();
-
-	if (BankFull)
-	{
-		if ((ErrorCode = Endpoint_WaitUntilReady()) != ENDPOINT_READYWAIT_NoError)
-		  return ErrorCode;
-
-		Endpoint_ClearIN();
-	}
-
-	return ENDPOINT_READYWAIT_NoError;
-}
-
-uint16_t PRNT_Device_BytesReceived(USB_ClassInfo_PRNT_Device_t* const PRNTInterfaceInfo)
-{
-	if (USB_DeviceState != DEVICE_STATE_Configured)
-	  return 0;
-
-	Endpoint_SelectEndpoint(PRNTInterfaceInfo->Config.DataOUTEndpoint.Address);
-
-	if (Endpoint_IsOUTReceived())
-	{
-		if (!(Endpoint_BytesInEndpoint()))
-		{
-			Endpoint_ClearOUT();
-			return 0;
-		}
-		else
-		{
-			return Endpoint_BytesInEndpoint();
-		}
-	}
-	else
-	{
-		return 0;
-	}
-}
-
-int16_t PRNT_Device_ReceiveByte(USB_ClassInfo_PRNT_Device_t* const PRNTInterfaceInfo)
-{
-	if (USB_DeviceState != DEVICE_STATE_Configured)
-	  return -1;
-
-	int16_t ReceivedByte = -1;
-
-	Endpoint_SelectEndpoint(PRNTInterfaceInfo->Config.DataOUTEndpoint.Address);
-
-	if (Endpoint_IsOUTReceived())
-	{
-		if (Endpoint_BytesInEndpoint())
-		  ReceivedByte = Endpoint_Read_8();
-
-		if (!(Endpoint_BytesInEndpoint()))
-		  Endpoint_ClearOUT();
-	}
-
-	return ReceivedByte;
-}
-
-#if defined(FDEV_SETUP_STREAM)
-void PRNT_Device_CreateStream(USB_ClassInfo_PRNT_Device_t* const PRNTInterfaceInfo,
-                              FILE* const Stream)
-{
-	*Stream = (FILE)FDEV_SETUP_STREAM(PRNT_Device_putchar, PRNT_Device_getchar, _FDEV_SETUP_RW);
-	fdev_set_udata(Stream, PRNTInterfaceInfo);
-}
-
-void PRNT_Device_CreateBlockingStream(USB_ClassInfo_PRNT_Device_t* const PRNTInterfaceInfo,
-                                      FILE* const Stream)
-{
-	*Stream = (FILE)FDEV_SETUP_STREAM(PRNT_Device_putchar, PRNT_Device_getchar_Blocking, _FDEV_SETUP_RW);
-	fdev_set_udata(Stream, PRNTInterfaceInfo);
-}
-
-static int PRNT_Device_putchar(char c,
-                               FILE* Stream)
-{
-	return PRNT_Device_SendByte((USB_ClassInfo_PRNT_Device_t*)fdev_get_udata(Stream), c) ? _FDEV_ERR : 0;
-}
-
-static int PRNT_Device_getchar(FILE* Stream)
-{
-	int16_t ReceivedByte = PRNT_Device_ReceiveByte((USB_ClassInfo_PRNT_Device_t*)fdev_get_udata(Stream));
-
-	if (ReceivedByte < 0)
-	  return _FDEV_EOF;
-
-	return ReceivedByte;
-}
-
-static int PRNT_Device_getchar_Blocking(FILE* Stream)
-{
-	int16_t ReceivedByte;
-
-	while ((ReceivedByte = PRNT_Device_ReceiveByte((USB_ClassInfo_PRNT_Device_t*)fdev_get_udata(Stream))) < 0)
-	{
-		if (USB_DeviceState == DEVICE_STATE_Unattached)
-		  return _FDEV_EOF;
-
-		PRNT_Device_USBTask((USB_ClassInfo_PRNT_Device_t*)fdev_get_udata(Stream));
-		USB_USBTask();
-	}
-
-	return ReceivedByte;
-}
-#endif
-
-void PRNT_Device_Event_Stub(USB_ClassInfo_PRNT_Device_t* const PRNTInterfaceInfo)
-{
-
-}
-
-#endif
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Class/Device/PrinterClassDevice.h b/NativePrograms/LUFA/Drivers/USB/Class/Device/PrinterClassDevice.h
deleted file mode 100644
index 9412168a4a..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Class/Device/PrinterClassDevice.h
+++ /dev/null
@@ -1,293 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Device mode driver for the library USB Printer Class driver.
- *
- *  Device mode driver for the library USB Printer Class driver.
- *
- *  \note This file should not be included directly. It is automatically included as needed by the USB module driver
- *        dispatch header located in LUFA/Drivers/USB.h.
- */
-
-/** \ingroup Group_USBClassPrinter
- *  \defgroup Group_USBClassPrinterDevice Printer Class Device Mode Driver
- *
- *  \section Sec_USBClassPrinterDevice_Dependencies Module Source Dependencies
- *  The following files must be built with any user project that uses this module:
- *    - LUFA/Drivers/USB/Class/Device/PrinterClassDevice.c <i>(Makefile source module name: LUFA_SRC_USBCLASS)</i>
- *
- *  \section Sec_USBClassPrinterDevice_ModDescription Module Description
- *  Device Mode USB Class driver framework interface, for the Printer USB Class driver.
- *
- *  @{
- */
-
-#ifndef _PRINTER_CLASS_DEVICE_H_
-#define _PRINTER_CLASS_DEVICE_H_
-
-	/* Includes: */
-		#include "../../USB.h"
-		#include "../Common/PrinterClassCommon.h"
-
-		#include <stdio.h>
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_PRINTER_DRIVER)
-			#error Do not include this file directly. Include LUFA/Drivers/USB.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Type Defines: */
-			/** \brief Printer Class Device Mode Configuration and State Structure.
-			 *
-			 *  Class state structure. An instance of this structure should be made for each Printer interface
-			 *  within the user application, and passed to each of the Printer class driver functions as the
-			 *  PRNTInterfaceInfo parameter. This stores each Printer interface's configuration and state information.
-			 */
-			typedef struct
-			{
-				struct
-				{
-					uint8_t InterfaceNumber; /**< Interface number of the Printer interface within the device. */
-
-					USB_Endpoint_Table_t DataINEndpoint; /**< Data IN endpoint configuration table. */
-					USB_Endpoint_Table_t DataOUTEndpoint; /**< Data OUT endpoint configuration table. */
-
-					char* IEEE1284String; /**< IEEE 1284 identification string, sent to the host during enumeration
-					                       *   to identify the printer model, manufacturer and other characteristics.
-					                       */
-				} Config; /**< Config data for the USB class interface within the device. All elements in this section
-				           *   <b>must</b> be set or the interface will fail to enumerate and operate correctly.
-				           */
-				struct
-				{
-					uint8_t PortStatus; /**< Current status of the Printer virtual port, a collection of \c PRNT_PORTSTATUS_*
-					                     *   bitmask values.
-					                     */
-
-					volatile bool IsPrinterReset; /**< Flag indicating that the host has requested that the Printer interface be reset
-											       *   and that all current Mass Storage operations should immediately abort.
-											       */
-				} State; /**< State data for the USB class interface within the device. All elements in this section
-				          *   are reset to their defaults when the interface is enumerated.
-				          */
-			} USB_ClassInfo_PRNT_Device_t;
-
-		/* Function Prototypes: */
-			/** Configures the endpoints of a given Printer interface, ready for use. This should be linked to the library
-			 *  \ref EVENT_USB_Device_ConfigurationChanged() event so that the endpoints are configured when the configuration containing
-			 *  the given Printer interface is selected.
-			 *
-			 *  \param[in,out] PRNTInterfaceInfo  Pointer to a structure containing a Printer Class configuration and state.
-			 *
-			 *  \return Boolean \c true if the endpoints were successfully configured, \c false otherwise.
-			 */
-			bool PRNT_Device_ConfigureEndpoints(USB_ClassInfo_PRNT_Device_t* const PRNTInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Processes incoming control requests from the host, that are directed to the given Printer class interface. This should be
-			 *  linked to the library \ref EVENT_USB_Device_ControlRequest() event.
-			 *
-			 *  \param[in,out] PRNTInterfaceInfo  Pointer to a structure containing a Printer Class configuration and state.
-			 */
-			void PRNT_Device_ProcessControlRequest(USB_ClassInfo_PRNT_Device_t* const PRNTInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** General management task for a given Printer class interface, required for the correct operation of the interface. This should
-			 *  be called frequently in the main program loop, before the master USB management task \ref USB_USBTask().
-			 *
-			 *  \param[in,out] PRNTInterfaceInfo  Pointer to a structure containing a Printer Class configuration and state.
-			 */
-			void PRNT_Device_USBTask(USB_ClassInfo_PRNT_Device_t* const PRNTInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Printer class driver event for a soft reset request on a Printer interface. This event fires each time the host
-			 *  requests a reset of the printer interface's internal state, and may be hooked in the user program by declaring a
-			 *  handler function with the same name and parameters listed here.
-			 *
-			 *  \param[in,out] PRNTInterfaceInfo  Pointer to a structure containing a Printer Class configuration and state.
-			 */
-			void EVENT_PRNT_Device_SoftReset(USB_ClassInfo_PRNT_Device_t* const PRNTInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Sends a given data buffer to the attached USB host, if connected. If a host is not connected when the function is
-			 *  called, the string is discarded. Bytes will be queued for transmission to the host until either the endpoint bank
-			 *  becomes full, or the \ref PRNT_Device_Flush() function is called to flush the pending data to the host. This allows
-			 *  for multiple bytes to be packed into a single endpoint packet, increasing data throughput.
-			 *
-			 *  \pre This function must only be called when the Device state machine is in the \ref DEVICE_STATE_Configured state or
-			 *       the call will fail.
-			 *
-			 *  \param[in,out] PRNTInterfaceInfo  Pointer to a structure containing a Printer Class configuration and state.
-			 *  \param[in]     Buffer            Pointer to a buffer containing the data to send to the device.
-			 *  \param[in]     Length            Length of the data to send to the host.
-			 *
-			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t PRNT_Device_SendData(USB_ClassInfo_PRNT_Device_t* const PRNTInterfaceInfo,
-			                             const void* const Buffer,
-			                             const uint16_t Length) ATTR_NON_NULL_PTR_ARG(1) ATTR_NON_NULL_PTR_ARG(2);
-
-			/** Sends a given null terminated string to the attached USB host, if connected. If a host is not connected when
-			 *  the function is called, the string is discarded. Bytes will be queued for transmission to the host until either
-			 *  the endpoint bank becomes full, or the \ref PRNT_Device_Flush() function is called to flush the pending data to
-			 *  the host. This allows for multiple bytes to be packed into a single endpoint packet, increasing data throughput.
-			 *
-			 *  \pre This function must only be called when the Device state machine is in the \ref DEVICE_STATE_Configured state or
-			 *       the call will fail.
-			 *
-			 *  \param[in,out] PRNTInterfaceInfo  Pointer to a structure containing a Printer Class configuration and state.
-			 *  \param[in]     String            Pointer to the null terminated string to send to the host.
-			 *
-			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t PRNT_Device_SendString(USB_ClassInfo_PRNT_Device_t* const PRNTInterfaceInfo,
-			                               const char* const String) ATTR_NON_NULL_PTR_ARG(1) ATTR_NON_NULL_PTR_ARG(2);
-
-			/** Sends a given byte to the attached USB host, if connected. If a host is not connected when the function is called, the
-			 *  byte is discarded. Bytes will be queued for transmission to the host until either the endpoint bank becomes full, or the
-			 *  \ref PRNT_Device_Flush() function is called to flush the pending data to the host. This allows for multiple bytes to be
-			 *  packed into a single endpoint packet, increasing data throughput.
-			 *
-			 *  \pre This function must only be called when the Device state machine is in the \ref DEVICE_STATE_Configured state or
-			 *       the call will fail.
-			 *
-			 *  \param[in,out] PRNTInterfaceInfo  Pointer to a structure containing a Printer Class configuration and state.
-			 *  \param[in]     Data              Byte of data to send to the host.
-			 *
-			 *  \return A value from the \ref Endpoint_WaitUntilReady_ErrorCodes_t enum.
-			 */
-			uint8_t PRNT_Device_SendByte(USB_ClassInfo_PRNT_Device_t* const PRNTInterfaceInfo,
-			                             const uint8_t Data) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Determines the number of bytes received by the Printer interface from the host, waiting to be read. This indicates the number
-			 *  of bytes in the OUT endpoint bank only, and thus the number of calls to \ref PRNT_Device_ReceiveByte() which are guaranteed to
-			 *  succeed immediately. If multiple bytes are to be received, they should be buffered by the user application, as the endpoint
-			 *  bank will not be released back to the USB controller until all bytes are read.
-			 *
-			 *  \pre This function must only be called when the Device state machine is in the \ref DEVICE_STATE_Configured state or
-			 *       the call will fail.
-			 *
-			 *  \param[in,out] PRNTInterfaceInfo  Pointer to a structure containing a Printer Class configuration and state.
-			 *
-			 *  \return Total number of buffered bytes received from the host.
-			 */
-			uint16_t PRNT_Device_BytesReceived(USB_ClassInfo_PRNT_Device_t* const PRNTInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Reads a byte of data from the host. If no data is waiting to be read of if a USB host is not connected, the function
-			 *  returns a negative value. The \ref PRNT_Device_BytesReceived() function may be queried in advance to determine how many
-			 *  bytes are currently buffered in the Printer interface's data receive endpoint bank, and thus how many repeated calls to this
-			 *  function which are guaranteed to succeed.
-			 *
-			 *  \pre This function must only be called when the Device state machine is in the \ref DEVICE_STATE_Configured state or
-			 *       the call will fail.
-			 *
-			 *  \param[in,out] PRNTInterfaceInfo  Pointer to a structure containing a Printer Class configuration and state.
-			 *
-			 *  \return Next received byte from the host, or a negative value if no data received.
-			 */
-			int16_t PRNT_Device_ReceiveByte(USB_ClassInfo_PRNT_Device_t* const PRNTInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Flushes any data waiting to be sent, ensuring that the send buffer is cleared.
-			 *
-			 *  \pre This function must only be called when the Device state machine is in the \ref DEVICE_STATE_Configured state or
-			 *       the call will fail.
-			 *
-			 *  \param[in,out] PRNTInterfaceInfo  Pointer to a structure containing a Printer Class configuration and state.
-			 *
-			 *  \return A value from the \ref Endpoint_WaitUntilReady_ErrorCodes_t enum.
-			 */
-			uint8_t PRNT_Device_Flush(USB_ClassInfo_PRNT_Device_t* const PRNTInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);
-
-			#if defined(FDEV_SETUP_STREAM) || defined(__DOXYGEN__)
-			/** Creates a standard character stream for the given Printer Device instance so that it can be used with all the regular
-			 *  functions in the standard <stdio.h> library that accept a \c FILE stream as a destination (e.g. \c fprintf()). The created
-			 *  stream is bidirectional and can be used for both input and output functions.
-			 *
-			 *  Reading data from this stream is non-blocking, i.e. in most instances, complete strings cannot be read in by a single
-			 *  fetch, as the endpoint will not be ready at some point in the transmission, aborting the transfer. However, this may
-			 *  be used when the read data is processed byte-per-bye (via \c getc()) or when the user application will implement its own
-			 *  line buffering.
-			 *
-			 *  \note The created stream can be given as \c stdout if desired to direct the standard output from all \c <stdio.h> functions
-			 *        to the given Printer interface.
-			 *        \n\n
-			 *
-			 *  \note This function is not available on all microcontroller architectures.
-			 *
-			 *  \param[in,out] PRNTInterfaceInfo  Pointer to a structure containing a Printer Class configuration and state.
-			 *  \param[in,out] Stream            Pointer to a FILE structure where the created stream should be placed.
-			 */
-			void PRNT_Device_CreateStream(USB_ClassInfo_PRNT_Device_t* const PRNTInterfaceInfo,
-			                              FILE* const Stream) ATTR_NON_NULL_PTR_ARG(1) ATTR_NON_NULL_PTR_ARG(2);
-
-			/** Identical to \ref PRNT_Device_CreateStream(), except that reads are blocking until the calling stream function terminates
-			 *  the transfer. While blocking, the USB and Printer service tasks are called repeatedly to maintain USB communications.
-			 *
-			 *  \note This function is not available on all microcontroller architectures.
-			 *
-			 *  \param[in,out] PRNTInterfaceInfo  Pointer to a structure containing a Printer Class configuration and state.
-			 *  \param[in,out] Stream            Pointer to a FILE structure where the created stream should be placed.
-			 */
-			void PRNT_Device_CreateBlockingStream(USB_ClassInfo_PRNT_Device_t* const PRNTInterfaceInfo,
-			                                      FILE* const Stream) ATTR_NON_NULL_PTR_ARG(1) ATTR_NON_NULL_PTR_ARG(2);
-			#endif
-
-	/* Private Interface - For use in library only: */
-	#if !defined(__DOXYGEN__)
-		/* Function Prototypes: */
-			#if defined(__INCLUDE_FROM_PRINTER_DEVICE_C)
-				#if defined(FDEV_SETUP_STREAM)
-				static int PRNT_Device_putchar(char c,
-				                               FILE* Stream) ATTR_NON_NULL_PTR_ARG(2);
-				static int PRNT_Device_getchar(FILE* Stream) ATTR_NON_NULL_PTR_ARG(1);
-				static int PRNT_Device_getchar_Blocking(FILE* Stream) ATTR_NON_NULL_PTR_ARG(1);
-				#endif
-
-				void PRNT_Device_Event_Stub(USB_ClassInfo_PRNT_Device_t* const PRNTInterfaceInfo);
-
-				void EVENT_PRNT_Device_SoftReset(USB_ClassInfo_PRNT_Device_t* const PRNTInterfaceInfo)
-				                                 ATTR_WEAK ATTR_NON_NULL_PTR_ARG(1) ATTR_ALIAS(PRNT_Device_Event_Stub);
-
-			#endif
-
-	#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Class/Device/RNDISClassDevice.c b/NativePrograms/LUFA/Drivers/USB/Class/Device/RNDISClassDevice.c
deleted file mode 100644
index fa3ca0268e..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Class/Device/RNDISClassDevice.c
+++ /dev/null
@@ -1,508 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-#define  __INCLUDE_FROM_USB_DRIVER
-#include "../../Core/USBMode.h"
-
-#if defined(USB_CAN_BE_DEVICE)
-
-#define  __INCLUDE_FROM_RNDIS_DRIVER
-#define  __INCLUDE_FROM_RNDIS_DEVICE_C
-#include "RNDISClassDevice.h"
-
-static const uint32_t PROGMEM AdapterSupportedOIDList[]  =
-	{
-		CPU_TO_LE32(OID_GEN_SUPPORTED_LIST),
-		CPU_TO_LE32(OID_GEN_PHYSICAL_MEDIUM),
-		CPU_TO_LE32(OID_GEN_HARDWARE_STATUS),
-		CPU_TO_LE32(OID_GEN_MEDIA_SUPPORTED),
-		CPU_TO_LE32(OID_GEN_MEDIA_IN_USE),
-		CPU_TO_LE32(OID_GEN_MAXIMUM_FRAME_SIZE),
-		CPU_TO_LE32(OID_GEN_MAXIMUM_TOTAL_SIZE),
-		CPU_TO_LE32(OID_GEN_LINK_SPEED),
-		CPU_TO_LE32(OID_GEN_TRANSMIT_BLOCK_SIZE),
-		CPU_TO_LE32(OID_GEN_RECEIVE_BLOCK_SIZE),
-		CPU_TO_LE32(OID_GEN_VENDOR_ID),
-		CPU_TO_LE32(OID_GEN_VENDOR_DESCRIPTION),
-		CPU_TO_LE32(OID_GEN_CURRENT_PACKET_FILTER),
-		CPU_TO_LE32(OID_GEN_MAXIMUM_TOTAL_SIZE),
-		CPU_TO_LE32(OID_GEN_MEDIA_CONNECT_STATUS),
-		CPU_TO_LE32(OID_GEN_XMIT_OK),
-		CPU_TO_LE32(OID_GEN_RCV_OK),
-		CPU_TO_LE32(OID_GEN_XMIT_ERROR),
-		CPU_TO_LE32(OID_GEN_RCV_ERROR),
-		CPU_TO_LE32(OID_GEN_RCV_NO_BUFFER),
-		CPU_TO_LE32(OID_802_3_PERMANENT_ADDRESS),
-		CPU_TO_LE32(OID_802_3_CURRENT_ADDRESS),
-		CPU_TO_LE32(OID_802_3_MULTICAST_LIST),
-		CPU_TO_LE32(OID_802_3_MAXIMUM_LIST_SIZE),
-		CPU_TO_LE32(OID_802_3_RCV_ERROR_ALIGNMENT),
-		CPU_TO_LE32(OID_802_3_XMIT_ONE_COLLISION),
-		CPU_TO_LE32(OID_802_3_XMIT_MORE_COLLISIONS),
-	};
-
-void RNDIS_Device_ProcessControlRequest(USB_ClassInfo_RNDIS_Device_t* const RNDISInterfaceInfo)
-{
-	if (!(Endpoint_IsSETUPReceived()))
-	  return;
-
-	if (USB_ControlRequest.wIndex != RNDISInterfaceInfo->Config.ControlInterfaceNumber)
-	  return;
-
-	switch (USB_ControlRequest.bRequest)
-	{
-		case RNDIS_REQ_SendEncapsulatedCommand:
-			if (USB_ControlRequest.bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))
-			{
-				Endpoint_ClearSETUP();
-				Endpoint_Read_Control_Stream_LE(RNDISInterfaceInfo->Config.MessageBuffer, USB_ControlRequest.wLength);
-				Endpoint_ClearIN();
-
-				RNDIS_Device_ProcessRNDISControlMessage(RNDISInterfaceInfo);
-			}
-
-			break;
-		case RNDIS_REQ_GetEncapsulatedResponse:
-			if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))
-			{
-				RNDIS_Message_Header_t* MessageHeader = (RNDIS_Message_Header_t*)RNDISInterfaceInfo->Config.MessageBuffer;
-
-				if (!(MessageHeader->MessageLength))
-				{
-					RNDISInterfaceInfo->Config.MessageBuffer[0] = 0;
-					MessageHeader->MessageLength                = CPU_TO_LE32(1);
-				}
-
-				Endpoint_ClearSETUP();
-				Endpoint_Write_Control_Stream_LE(RNDISInterfaceInfo->Config.MessageBuffer, le32_to_cpu(MessageHeader->MessageLength));
-				Endpoint_ClearOUT();
-
-				MessageHeader->MessageLength = CPU_TO_LE32(0);
-			}
-
-			break;
-	}
-}
-
-bool RNDIS_Device_ConfigureEndpoints(USB_ClassInfo_RNDIS_Device_t* const RNDISInterfaceInfo)
-{
-	memset(&RNDISInterfaceInfo->State, 0x00, sizeof(RNDISInterfaceInfo->State));
-
-	RNDISInterfaceInfo->Config.DataINEndpoint.Type       = EP_TYPE_BULK;
-	RNDISInterfaceInfo->Config.DataOUTEndpoint.Type      = EP_TYPE_BULK;
-	RNDISInterfaceInfo->Config.NotificationEndpoint.Type = EP_TYPE_INTERRUPT;
-
-	if (RNDISInterfaceInfo->Config.MessageBuffer == NULL)
-	  return false;
-
-	if (RNDISInterfaceInfo->Config.MessageBufferLength < RNDIS_DEVICE_MIN_MESSAGE_BUFFER_LENGTH)
-	  return false;
-
-	if (!(Endpoint_ConfigureEndpointTable(&RNDISInterfaceInfo->Config.DataINEndpoint, 1)))
-	  return false;
-
-	if (!(Endpoint_ConfigureEndpointTable(&RNDISInterfaceInfo->Config.DataOUTEndpoint, 1)))
-	  return false;
-
-	if (!(Endpoint_ConfigureEndpointTable(&RNDISInterfaceInfo->Config.NotificationEndpoint, 1)))
-	  return false;
-
-	return true;
-}
-
-void RNDIS_Device_USBTask(USB_ClassInfo_RNDIS_Device_t* const RNDISInterfaceInfo)
-{
-	if (USB_DeviceState != DEVICE_STATE_Configured)
-	  return;
-
-	Endpoint_SelectEndpoint(RNDISInterfaceInfo->Config.NotificationEndpoint.Address);
-
-	if (Endpoint_IsINReady() && RNDISInterfaceInfo->State.ResponseReady)
-	{
-		USB_Request_Header_t Notification = (USB_Request_Header_t)
-			{
-				.bmRequestType = (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE),
-				.bRequest      = RNDIS_NOTIF_ResponseAvailable,
-				.wValue        = CPU_TO_LE16(0),
-				.wIndex        = CPU_TO_LE16(0),
-				.wLength       = CPU_TO_LE16(0),
-			};
-
-		Endpoint_Write_Stream_LE(&Notification, sizeof(USB_Request_Header_t), NULL);
-
-		Endpoint_ClearIN();
-
-		RNDISInterfaceInfo->State.ResponseReady = false;
-	}
-}
-
-void RNDIS_Device_ProcessRNDISControlMessage(USB_ClassInfo_RNDIS_Device_t* const RNDISInterfaceInfo)
-{
-	/* Note: Only a single buffer is used for both the received message and its response to save SRAM. Because of
-	         this, response bytes should be filled in order so that they do not clobber unread data in the buffer. */
-
-	RNDIS_Message_Header_t* MessageHeader = (RNDIS_Message_Header_t*)RNDISInterfaceInfo->Config.MessageBuffer;
-
-	switch (le32_to_cpu(MessageHeader->MessageType))
-	{
-		case REMOTE_NDIS_INITIALIZE_MSG:
-			RNDISInterfaceInfo->State.ResponseReady     = true;
-
-			RNDIS_Initialize_Message_t*  INITIALIZE_Message  =
-			               (RNDIS_Initialize_Message_t*)RNDISInterfaceInfo->Config.MessageBuffer;
-			RNDIS_Initialize_Complete_t* INITIALIZE_Response =
-			               (RNDIS_Initialize_Complete_t*)RNDISInterfaceInfo->Config.MessageBuffer;
-
-			INITIALIZE_Response->MessageType            = CPU_TO_LE32(REMOTE_NDIS_INITIALIZE_CMPLT);
-			INITIALIZE_Response->MessageLength          = CPU_TO_LE32(sizeof(RNDIS_Initialize_Complete_t));
-			INITIALIZE_Response->RequestId              = INITIALIZE_Message->RequestId;
-			INITIALIZE_Response->Status                 = CPU_TO_LE32(REMOTE_NDIS_STATUS_SUCCESS);
-
-			INITIALIZE_Response->MajorVersion           = CPU_TO_LE32(REMOTE_NDIS_VERSION_MAJOR);
-			INITIALIZE_Response->MinorVersion           = CPU_TO_LE32(REMOTE_NDIS_VERSION_MINOR);
-			INITIALIZE_Response->DeviceFlags            = CPU_TO_LE32(REMOTE_NDIS_DF_CONNECTIONLESS);
-			INITIALIZE_Response->Medium                 = CPU_TO_LE32(REMOTE_NDIS_MEDIUM_802_3);
-			INITIALIZE_Response->MaxPacketsPerTransfer  = CPU_TO_LE32(1);
-			INITIALIZE_Response->MaxTransferSize        = CPU_TO_LE32(sizeof(RNDIS_Packet_Message_t) + ETHERNET_FRAME_SIZE_MAX);
-			INITIALIZE_Response->PacketAlignmentFactor  = CPU_TO_LE32(0);
-			INITIALIZE_Response->AFListOffset           = CPU_TO_LE32(0);
-			INITIALIZE_Response->AFListSize             = CPU_TO_LE32(0);
-
-			RNDISInterfaceInfo->State.CurrRNDISState    = RNDIS_Initialized;
-			break;
-		case REMOTE_NDIS_HALT_MSG:
-			RNDISInterfaceInfo->State.ResponseReady     = false;
-
-			MessageHeader->MessageLength                = CPU_TO_LE32(0);
-
-			RNDISInterfaceInfo->State.CurrRNDISState    = RNDIS_Uninitialized;
-			break;
-		case REMOTE_NDIS_QUERY_MSG:
-			RNDISInterfaceInfo->State.ResponseReady     = true;
-
-			RNDIS_Query_Message_t*  QUERY_Message       = (RNDIS_Query_Message_t*)RNDISInterfaceInfo->Config.MessageBuffer;
-			RNDIS_Query_Complete_t* QUERY_Response      = (RNDIS_Query_Complete_t*)RNDISInterfaceInfo->Config.MessageBuffer;
-			uint32_t                Query_Oid           = CPU_TO_LE32(QUERY_Message->Oid);
-
-			void*    QueryData    = &RNDISInterfaceInfo->Config.MessageBuffer[sizeof(RNDIS_Message_Header_t) +
-			                                                                  le32_to_cpu(QUERY_Message->InformationBufferOffset)];
-			void*    ResponseData = &RNDISInterfaceInfo->Config.MessageBuffer[sizeof(RNDIS_Query_Complete_t)];
-			uint16_t ResponseSize;
-
-			QUERY_Response->MessageType                 = CPU_TO_LE32(REMOTE_NDIS_QUERY_CMPLT);
-
-			if (RNDIS_Device_ProcessNDISQuery(RNDISInterfaceInfo, Query_Oid, QueryData, le32_to_cpu(QUERY_Message->InformationBufferLength),
-			                                  ResponseData, &ResponseSize))
-			{
-				QUERY_Response->Status                  = CPU_TO_LE32(REMOTE_NDIS_STATUS_SUCCESS);
-				QUERY_Response->MessageLength           = cpu_to_le32(sizeof(RNDIS_Query_Complete_t) + ResponseSize);
-
-				QUERY_Response->InformationBufferLength = CPU_TO_LE32(ResponseSize);
-				QUERY_Response->InformationBufferOffset = CPU_TO_LE32(sizeof(RNDIS_Query_Complete_t) - sizeof(RNDIS_Message_Header_t));
-			}
-			else
-			{
-				QUERY_Response->Status                  = CPU_TO_LE32(REMOTE_NDIS_STATUS_NOT_SUPPORTED);
-				QUERY_Response->MessageLength           = CPU_TO_LE32(sizeof(RNDIS_Query_Complete_t));
-
-				QUERY_Response->InformationBufferLength = CPU_TO_LE32(0);
-				QUERY_Response->InformationBufferOffset = CPU_TO_LE32(0);
-			}
-
-			break;
-		case REMOTE_NDIS_SET_MSG:
-			RNDISInterfaceInfo->State.ResponseReady     = true;
-
-			RNDIS_Set_Message_t*  SET_Message           = (RNDIS_Set_Message_t*)RNDISInterfaceInfo->Config.MessageBuffer;
-			RNDIS_Set_Complete_t* SET_Response          = (RNDIS_Set_Complete_t*)RNDISInterfaceInfo->Config.MessageBuffer;
-			uint32_t              SET_Oid               = le32_to_cpu(SET_Message->Oid);
-
-			SET_Response->MessageType                   = CPU_TO_LE32(REMOTE_NDIS_SET_CMPLT);
-			SET_Response->MessageLength                 = CPU_TO_LE32(sizeof(RNDIS_Set_Complete_t));
-			SET_Response->RequestId                     = SET_Message->RequestId;
-
-			void* SetData = &RNDISInterfaceInfo->Config.MessageBuffer[sizeof(RNDIS_Message_Header_t) +
-			                                                              le32_to_cpu(SET_Message->InformationBufferOffset)];
-
-			SET_Response->Status = RNDIS_Device_ProcessNDISSet(RNDISInterfaceInfo, SET_Oid, SetData,
-			                                                   le32_to_cpu(SET_Message->InformationBufferLength)) ?
-			                                                   REMOTE_NDIS_STATUS_SUCCESS : REMOTE_NDIS_STATUS_NOT_SUPPORTED;
-			break;
-		case REMOTE_NDIS_RESET_MSG:
-			RNDISInterfaceInfo->State.ResponseReady     = true;
-
-			RNDIS_Reset_Complete_t* RESET_Response      = (RNDIS_Reset_Complete_t*)RNDISInterfaceInfo->Config.MessageBuffer;
-
-			RESET_Response->MessageType                 = CPU_TO_LE32(REMOTE_NDIS_RESET_CMPLT);
-			RESET_Response->MessageLength               = CPU_TO_LE32(sizeof(RNDIS_Reset_Complete_t));
-			RESET_Response->Status                      = CPU_TO_LE32(REMOTE_NDIS_STATUS_SUCCESS);
-			RESET_Response->AddressingReset             = CPU_TO_LE32(0);
-
-			break;
-		case REMOTE_NDIS_KEEPALIVE_MSG:
-			RNDISInterfaceInfo->State.ResponseReady     = true;
-
-			RNDIS_KeepAlive_Message_t*  KEEPALIVE_Message  =
-			                (RNDIS_KeepAlive_Message_t*)RNDISInterfaceInfo->Config.MessageBuffer;
-			RNDIS_KeepAlive_Complete_t* KEEPALIVE_Response =
-			                (RNDIS_KeepAlive_Complete_t*)RNDISInterfaceInfo->Config.MessageBuffer;
-
-			KEEPALIVE_Response->MessageType             = CPU_TO_LE32(REMOTE_NDIS_KEEPALIVE_CMPLT);
-			KEEPALIVE_Response->MessageLength           = CPU_TO_LE32(sizeof(RNDIS_KeepAlive_Complete_t));
-			KEEPALIVE_Response->RequestId               = KEEPALIVE_Message->RequestId;
-			KEEPALIVE_Response->Status                  = CPU_TO_LE32(REMOTE_NDIS_STATUS_SUCCESS);
-
-			break;
-	}
-}
-
-static bool RNDIS_Device_ProcessNDISQuery(USB_ClassInfo_RNDIS_Device_t* const RNDISInterfaceInfo,
-                                          const uint32_t OId,
-                                          void* const QueryData,
-                                          const uint16_t QuerySize,
-                                          void* ResponseData,
-                                          uint16_t* const ResponseSize)
-{
-	(void)QueryData;
-	(void)QuerySize;
-
-	switch (OId)
-	{
-		case OID_GEN_SUPPORTED_LIST:
-			*ResponseSize = sizeof(AdapterSupportedOIDList);
-
-			memcpy_P(ResponseData, AdapterSupportedOIDList, sizeof(AdapterSupportedOIDList));
-
-			return true;
-		case OID_GEN_PHYSICAL_MEDIUM:
-			*ResponseSize = sizeof(uint32_t);
-
-			/* Indicate that the device is a true ethernet link */
-			*((uint32_t*)ResponseData) = CPU_TO_LE32(0);
-
-			return true;
-		case OID_GEN_HARDWARE_STATUS:
-			*ResponseSize = sizeof(uint32_t);
-
-			*((uint32_t*)ResponseData) = CPU_TO_LE32(NDIS_HardwareStatus_Ready);
-
-			return true;
-		case OID_GEN_MEDIA_SUPPORTED:
-		case OID_GEN_MEDIA_IN_USE:
-			*ResponseSize = sizeof(uint32_t);
-
-			*((uint32_t*)ResponseData) = CPU_TO_LE32(REMOTE_NDIS_MEDIUM_802_3);
-
-			return true;
-		case OID_GEN_VENDOR_ID:
-			*ResponseSize = sizeof(uint32_t);
-
-			/* Vendor ID 0x0xFFFFFF is reserved for vendors who have not purchased a NDIS VID */
-			*((uint32_t*)ResponseData) = CPU_TO_LE32(0x00FFFFFF);
-
-			return true;
-		case OID_GEN_MAXIMUM_FRAME_SIZE:
-		case OID_GEN_TRANSMIT_BLOCK_SIZE:
-		case OID_GEN_RECEIVE_BLOCK_SIZE:
-			*ResponseSize = sizeof(uint32_t);
-
-			*((uint32_t*)ResponseData) = CPU_TO_LE32(ETHERNET_FRAME_SIZE_MAX);
-
-			return true;
-		case OID_GEN_VENDOR_DESCRIPTION:
-			*ResponseSize = (strlen(RNDISInterfaceInfo->Config.AdapterVendorDescription) + 1);
-
-			memcpy(ResponseData, RNDISInterfaceInfo->Config.AdapterVendorDescription, *ResponseSize);
-
-			return true;
-		case OID_GEN_MEDIA_CONNECT_STATUS:
-			*ResponseSize = sizeof(uint32_t);
-
-			*((uint32_t*)ResponseData) = CPU_TO_LE32(REMOTE_NDIS_MEDIA_STATE_CONNECTED);
-
-			return true;
-		case OID_GEN_LINK_SPEED:
-			*ResponseSize = sizeof(uint32_t);
-
-			/* Indicate 10Mb/s link speed */
-			*((uint32_t*)ResponseData) = CPU_TO_LE32(100000);
-
-			return true;
-		case OID_802_3_PERMANENT_ADDRESS:
-		case OID_802_3_CURRENT_ADDRESS:
-			*ResponseSize = sizeof(MAC_Address_t);
-
-			memcpy(ResponseData, &RNDISInterfaceInfo->Config.AdapterMACAddress, sizeof(MAC_Address_t));
-
-			return true;
-		case OID_802_3_MAXIMUM_LIST_SIZE:
-			*ResponseSize = sizeof(uint32_t);
-
-			/* Indicate only one multicast address supported */
-			*((uint32_t*)ResponseData) = CPU_TO_LE32(1);
-
-			return true;
-		case OID_GEN_CURRENT_PACKET_FILTER:
-			*ResponseSize = sizeof(uint32_t);
-
-			*((uint32_t*)ResponseData) = cpu_to_le32(RNDISInterfaceInfo->State.CurrPacketFilter);
-
-			return true;
-		case OID_GEN_XMIT_OK:
-		case OID_GEN_RCV_OK:
-		case OID_GEN_XMIT_ERROR:
-		case OID_GEN_RCV_ERROR:
-		case OID_GEN_RCV_NO_BUFFER:
-		case OID_802_3_RCV_ERROR_ALIGNMENT:
-		case OID_802_3_XMIT_ONE_COLLISION:
-		case OID_802_3_XMIT_MORE_COLLISIONS:
-			*ResponseSize = sizeof(uint32_t);
-
-			/* Unused statistic OIDs - always return 0 for each */
-			*((uint32_t*)ResponseData) = CPU_TO_LE32(0);
-
-			return true;
-		case OID_GEN_MAXIMUM_TOTAL_SIZE:
-			*ResponseSize = sizeof(uint32_t);
-
-			/* Indicate maximum overall buffer (Ethernet frame and RNDIS header) the adapter can handle */
-			*((uint32_t*)ResponseData) = CPU_TO_LE32(RNDISInterfaceInfo->Config.MessageBufferLength + ETHERNET_FRAME_SIZE_MAX);
-
-			return true;
-		default:
-			return false;
-	}
-}
-
-static bool RNDIS_Device_ProcessNDISSet(USB_ClassInfo_RNDIS_Device_t* const RNDISInterfaceInfo,
-                                        const uint32_t OId,
-                                        const void* SetData,
-                                        const uint16_t SetSize)
-{
-	(void)SetSize;
-
-	switch (OId)
-	{
-		case OID_GEN_CURRENT_PACKET_FILTER:
-			RNDISInterfaceInfo->State.CurrPacketFilter = le32_to_cpu(*((uint32_t*)SetData));
-			RNDISInterfaceInfo->State.CurrRNDISState   = (RNDISInterfaceInfo->State.CurrPacketFilter) ? RNDIS_Data_Initialized : RNDIS_Initialized;
-
-			return true;
-		case OID_802_3_MULTICAST_LIST:
-			/* Do nothing - throw away the value from the host as it is unused */
-
-			return true;
-		default:
-			return false;
-	}
-}
-
-bool RNDIS_Device_IsPacketReceived(USB_ClassInfo_RNDIS_Device_t* const RNDISInterfaceInfo)
-{
-	if ((USB_DeviceState != DEVICE_STATE_Configured) ||
-	    (RNDISInterfaceInfo->State.CurrRNDISState != RNDIS_Data_Initialized))
-	{
-		return false;
-	}
-
-	Endpoint_SelectEndpoint(RNDISInterfaceInfo->Config.DataOUTEndpoint.Address);
-	return Endpoint_IsOUTReceived();
-}
-
-uint8_t RNDIS_Device_ReadPacket(USB_ClassInfo_RNDIS_Device_t* const RNDISInterfaceInfo,
-                                void* Buffer,
-                                uint16_t* const PacketLength)
-{
-	if ((USB_DeviceState != DEVICE_STATE_Configured) ||
-	    (RNDISInterfaceInfo->State.CurrRNDISState != RNDIS_Data_Initialized))
-	{
-		return ENDPOINT_RWSTREAM_DeviceDisconnected;
-	}
-
-	Endpoint_SelectEndpoint(RNDISInterfaceInfo->Config.DataOUTEndpoint.Address);
-
-	*PacketLength = 0;
-
-	if (!(Endpoint_IsOUTReceived()))
-		return ENDPOINT_RWSTREAM_NoError;
-
-	RNDIS_Packet_Message_t RNDISPacketHeader;
-	Endpoint_Read_Stream_LE(&RNDISPacketHeader, sizeof(RNDIS_Packet_Message_t), NULL);
-
-	if (le32_to_cpu(RNDISPacketHeader.DataLength) > ETHERNET_FRAME_SIZE_MAX)
-	{
-		Endpoint_StallTransaction();
-
-		return RNDIS_ERROR_LOGICAL_CMD_FAILED;
-	}
-
-	*PacketLength = (uint16_t)le32_to_cpu(RNDISPacketHeader.DataLength);
-
-	Endpoint_Read_Stream_LE(Buffer, *PacketLength, NULL);
-	Endpoint_ClearOUT();
-
-	return ENDPOINT_RWSTREAM_NoError;
-}
-
-uint8_t RNDIS_Device_SendPacket(USB_ClassInfo_RNDIS_Device_t* const RNDISInterfaceInfo,
-                                void* Buffer,
-                                const uint16_t PacketLength)
-{
-	uint8_t ErrorCode;
-
-	if ((USB_DeviceState != DEVICE_STATE_Configured) ||
-	    (RNDISInterfaceInfo->State.CurrRNDISState != RNDIS_Data_Initialized))
-	{
-		return ENDPOINT_RWSTREAM_DeviceDisconnected;
-	}
-
-	Endpoint_SelectEndpoint(RNDISInterfaceInfo->Config.DataINEndpoint.Address);
-
-	if ((ErrorCode = Endpoint_WaitUntilReady()) != ENDPOINT_READYWAIT_NoError)
-	  return ErrorCode;
-
-	RNDIS_Packet_Message_t RNDISPacketHeader;
-
-	memset(&RNDISPacketHeader, 0, sizeof(RNDIS_Packet_Message_t));
-
-	RNDISPacketHeader.MessageType   = CPU_TO_LE32(REMOTE_NDIS_PACKET_MSG);
-	RNDISPacketHeader.MessageLength = cpu_to_le32(sizeof(RNDIS_Packet_Message_t) + PacketLength);
-	RNDISPacketHeader.DataOffset    = CPU_TO_LE32(sizeof(RNDIS_Packet_Message_t) - sizeof(RNDIS_Message_Header_t));
-	RNDISPacketHeader.DataLength    = cpu_to_le32(PacketLength);
-
-	Endpoint_Write_Stream_LE(&RNDISPacketHeader, sizeof(RNDIS_Packet_Message_t), NULL);
-	Endpoint_Write_Stream_LE(Buffer, PacketLength, NULL);
-	Endpoint_ClearIN();
-
-	return ENDPOINT_RWSTREAM_NoError;
-}
-
-#endif
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Class/Device/RNDISClassDevice.h b/NativePrograms/LUFA/Drivers/USB/Class/Device/RNDISClassDevice.h
deleted file mode 100644
index 58465328bd..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Class/Device/RNDISClassDevice.h
+++ /dev/null
@@ -1,207 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Device mode driver for the library USB RNDIS Class driver.
- *
- *  Device mode driver for the library USB RNDIS Class driver.
- *
- *  \note This file should not be included directly. It is automatically included as needed by the USB module driver
- *        dispatch header located in LUFA/Drivers/USB.h.
- */
-
-/** \ingroup Group_USBClassRNDIS
- *  \defgroup Group_USBClassRNDISDevice RNDIS Class Device Mode Driver
- *
- *  \section Sec_USBClassRNDISDevice_Dependencies Module Source Dependencies
- *  The following files must be built with any user project that uses this module:
- *    - LUFA/Drivers/USB/Class/Device/RNDISClassDevice.c <i>(Makefile source module name: LUFA_SRC_USBCLASS)</i>
- *
- *  \section Sec_USBClassRNDISDevice_ModDescription Module Description
- *  Device Mode USB Class driver framework interface, for the RNDIS USB Class driver.
- *
- *  @{
- */
-
-#ifndef _RNDIS_CLASS_DEVICE_H_
-#define _RNDIS_CLASS_DEVICE_H_
-
-	/* Includes: */
-		#include "../../USB.h"
-		#include "../Common/RNDISClassCommon.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_RNDIS_DRIVER)
-			#error Do not include this file directly. Include LUFA/Drivers/USB.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Type Defines: */
-			/** \brief RNDIS Class Device Mode Configuration and State Structure.
-			 *
-			 *  Class state structure. An instance of this structure should be made for each RNDIS interface
-			 *  within the user application, and passed to each of the RNDIS class driver functions as the
-			 *  \c RNDISInterfaceInfo parameter. This stores each RNDIS interface's configuration and state information.
-			 */
-			typedef struct
-			{
-				struct
-				{
-					uint8_t  ControlInterfaceNumber; /**< Interface number of the RNDIS control interface within the device. */
-
-					USB_Endpoint_Table_t DataINEndpoint; /**< Data IN endpoint configuration table. */
-					USB_Endpoint_Table_t DataOUTEndpoint; /**< Data OUT endpoint configuration table. */
-					USB_Endpoint_Table_t NotificationEndpoint; /**< Notification IN Endpoint configuration table. */
-
-					char*         AdapterVendorDescription; /**< String description of the adapter vendor. */
-					MAC_Address_t AdapterMACAddress; /**< MAC address of the adapter. */
-
-					uint8_t*      MessageBuffer; /**< Buffer where RNDIS messages can be stored by the internal driver. This
-					                              *   should be at least 132 bytes in length for minimal functionality. */
-					uint16_t      MessageBufferLength; /**< Length in bytes of the \ref MessageBuffer RNDIS buffer. */
-				} Config; /**< Config data for the USB class interface within the device. All elements in this section
-				           *   <b>must</b> be set or the interface will fail to enumerate and operate correctly.
-				           */
-				struct
-				{
-					bool     ResponseReady; /**< Internal flag indicating if a RNDIS message is waiting to be returned to the host. */
-					uint8_t  CurrRNDISState; /**< Current RNDIS state of the adapter, a value from the \ref RNDIS_States_t enum. */
-					uint32_t CurrPacketFilter; /**< Current packet filter mode, used internally by the class driver. */
-				} State; /**< State data for the USB class interface within the device. All elements in this section
-				          *   are reset to their defaults when the interface is enumerated.
-				          */
-			} USB_ClassInfo_RNDIS_Device_t;
-
-		/* Function Prototypes: */
-			/** Configures the endpoints of a given RNDIS interface, ready for use. This should be linked to the library
-			 *  \ref EVENT_USB_Device_ConfigurationChanged() event so that the endpoints are configured when the configuration
-			 *  containing the given RNDIS interface is selected.
-			 *
-			 *  \param[in,out] RNDISInterfaceInfo  Pointer to a structure containing a RNDIS Class configuration and state.
-			 *
-			 *  \return Boolean \c true if the endpoints were successfully configured, \c false otherwise.
-			 */
-			bool RNDIS_Device_ConfigureEndpoints(USB_ClassInfo_RNDIS_Device_t* const RNDISInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Processes incoming control requests from the host, that are directed to the given RNDIS class interface. This should be
-			 *  linked to the library \ref EVENT_USB_Device_ControlRequest() event.
-			 *
-			 *  \param[in,out] RNDISInterfaceInfo  Pointer to a structure containing a RNDIS Class configuration and state.
-			 */
-			void RNDIS_Device_ProcessControlRequest(USB_ClassInfo_RNDIS_Device_t* const RNDISInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** General management task for a given RNDIS class interface, required for the correct operation of the interface. This should
-			 *  be called frequently in the main program loop, before the master USB management task \ref USB_USBTask().
-			 *
-			 *  \param[in,out] RNDISInterfaceInfo  Pointer to a structure containing a RNDIS Class configuration and state.
-			 */
-			void RNDIS_Device_USBTask(USB_ClassInfo_RNDIS_Device_t* const RNDISInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Determines if a packet is currently waiting for the device to read in and process.
-			 *
-			 *  \pre This function must only be called when the Device state machine is in the \ref DEVICE_STATE_Configured state or the
-			 *       call will fail.
-			 *
-			 *  \param[in,out] RNDISInterfaceInfo  Pointer to a structure containing an RNDIS Class configuration and state.
-			 *
-			 *  \return Boolean \c true if a packet is waiting to be read in by the host, \c false otherwise.
-			 */
-			bool RNDIS_Device_IsPacketReceived(USB_ClassInfo_RNDIS_Device_t* const RNDISInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Retrieves the next pending packet from the device, discarding the remainder of the RNDIS packet header to leave
-			 *  only the packet contents for processing by the device in the nominated buffer.
-			 *
-			 *  \pre This function must only be called when the Device state machine is in the \ref DEVICE_STATE_Configured state or the
-			 *       call will fail.
-			 *
-			 *  \param[in,out] RNDISInterfaceInfo  Pointer to a structure containing an RNDIS Class configuration and state.
-			 *  \param[out]    Buffer              Pointer to a buffer where the packer data is to be written to.
-			 *  \param[out]    PacketLength        Pointer to where the length in bytes of the read packet is to be stored.
-			 *
-			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t RNDIS_Device_ReadPacket(USB_ClassInfo_RNDIS_Device_t* const RNDISInterfaceInfo,
-											void* Buffer,
-											uint16_t* const PacketLength) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Sends the given packet to the attached RNDIS device, after adding a RNDIS packet message header.
-			 *
-			 *  \pre This function must only be called when the Device state machine is in the \ref DEVICE_STATE_Configured state or the
-			 *       call will fail.
-			 *
-			 *  \param[in,out] RNDISInterfaceInfo  Pointer to a structure containing an RNDIS Class configuration and state.
-			 *  \param[in]     Buffer              Pointer to a buffer where the packer data is to be read from.
-			 *  \param[in]     PacketLength        Length in bytes of the packet to send.
-			 *
-			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t RNDIS_Device_SendPacket(USB_ClassInfo_RNDIS_Device_t* const RNDISInterfaceInfo,
-											void* Buffer,
-											const uint16_t PacketLength) ATTR_NON_NULL_PTR_ARG(1);
-
-	/* Private Interface - For use in library only: */
-	#if !defined(__DOXYGEN__)
-		/* Macros: */
-			#define RNDIS_DEVICE_MIN_MESSAGE_BUFFER_LENGTH  sizeof(AdapterSupportedOIDList) + sizeof(RNDIS_Query_Complete_t)
-
-		/* Function Prototypes: */
-		#if defined(__INCLUDE_FROM_RNDIS_DEVICE_C)
-			static void RNDIS_Device_ProcessRNDISControlMessage(USB_ClassInfo_RNDIS_Device_t* const RNDISInterfaceInfo)
-			                                                    ATTR_NON_NULL_PTR_ARG(1);
-			static bool RNDIS_Device_ProcessNDISQuery(USB_ClassInfo_RNDIS_Device_t* const RNDISInterfaceInfo,
-			                                          const uint32_t OId,
-                                                      void* const QueryData,
-                                                      const uint16_t QuerySize,
-										              void* ResponseData,
-                                                      uint16_t* const ResponseSize) ATTR_NON_NULL_PTR_ARG(1)
-			                                          ATTR_NON_NULL_PTR_ARG(5) ATTR_NON_NULL_PTR_ARG(6);
-			static bool RNDIS_Device_ProcessNDISSet(USB_ClassInfo_RNDIS_Device_t* const RNDISInterfaceInfo,
-                                                    const uint32_t OId,
-			                                        const void* SetData,
-                                                    const uint16_t SetSize) ATTR_NON_NULL_PTR_ARG(1)
-			                                        ATTR_NON_NULL_PTR_ARG(3);
-		#endif
-
-	#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Class/HIDClass.h b/NativePrograms/LUFA/Drivers/USB/Class/HIDClass.h
deleted file mode 100644
index ab6c17722d..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Class/HIDClass.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Master include file for the library USB HID Class driver.
- *
- *  Master include file for the library USB HID Class driver, for both host and device modes, where available.
- *
- *  This file should be included in all user projects making use of this optional class driver, instead of
- *  including any headers in the USB/ClassDriver/Device, USB/ClassDriver/Host or USB/ClassDriver/Common subdirectories.
- */
-
-/** \ingroup Group_USBClassDrivers
- *  \defgroup Group_USBClassHID HID Class Driver
- *  \brief USB class driver for the USB-IF Human Interface Device (HID) class standard.
- *
- *  \section Sec_USBClassHID_Dependencies Module Source Dependencies
- *  The following files must be built with any user project that uses this module:
- *    - LUFA/Drivers/USB/Class/Device/HIDClassDevice.c <i>(Makefile source module name: LUFA_SRC_USBCLASS)</i>
- *    - LUFA/Drivers/USB/Class/Host/HIDClassHost.c <i>(Makefile source module name: LUFA_SRC_USBCLASS)</i>
- *    - LUFA/Drivers/USB/Class/Host/HIDParser.c <i>(Makefile source module name: LUFA_SRC_USB)</i>
- *
- *  \section Sec_USBClassHID_ModDescription Module Description
- *  HID Class Driver module. This module contains an internal implementation of the USB HID Class, for both Device
- *  and Host USB modes. User applications can use this class driver instead of implementing the HID class manually
- *  via the low-level LUFA APIs.
- *
- *  This module is designed to simplify the user code by exposing only the required interface needed to interface with
- *  Hosts or Devices using the USB HID Class.
- *
- *  @{
- */
-
-#ifndef _HID_CLASS_H_
-#define _HID_CLASS_H_
-
-	/* Macros: */
-		#define __INCLUDE_FROM_USB_DRIVER
-		#define __INCLUDE_FROM_HID_DRIVER
-
-	/* Includes: */
-		#include "../Core/USBMode.h"
-
-		#if defined(USB_CAN_BE_DEVICE)
-			#include "Device/HIDClassDevice.h"
-		#endif
-
-		#if defined(USB_CAN_BE_HOST)
-			#include "Host/HIDClassHost.h"
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Class/Host/AndroidAccessoryClassHost.c b/NativePrograms/LUFA/Drivers/USB/Class/Host/AndroidAccessoryClassHost.c
deleted file mode 100644
index 080e33a078..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Class/Host/AndroidAccessoryClassHost.c
+++ /dev/null
@@ -1,422 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-#define  __INCLUDE_FROM_USB_DRIVER
-#include "../../Core/USBMode.h"
-
-#if defined(USB_CAN_BE_HOST)
-
-#define  __INCLUDE_FROM_AOA_DRIVER
-#define  __INCLUDE_FROM_ANDROIDACCESSORY_HOST_C
-#include "AndroidAccessoryClassHost.h"
-
-bool AOA_Host_ValidateAccessoryDevice(USB_ClassInfo_AOA_Host_t* const AOAInterfaceInfo,
-                                      const USB_Descriptor_Device_t* const DeviceDescriptor,
-                                      bool* const NeedModeSwitch)
-{
-	(void)AOAInterfaceInfo;
-
-	if (DeviceDescriptor->Header.Type != DTYPE_Device)
-	  return false;
-
-	*NeedModeSwitch = ((DeviceDescriptor->ProductID != ANDROID_ACCESSORY_PRODUCT_ID) &&
-	                   (DeviceDescriptor->ProductID != ANDROID_ACCESSORY_ADB_PRODUCT_ID));
-
-	return true;
-}
-
-uint8_t AOA_Host_ConfigurePipes(USB_ClassInfo_AOA_Host_t* const AOAInterfaceInfo,
-                                uint16_t ConfigDescriptorSize,
-                                void* ConfigDescriptorData)
-{
-	USB_Descriptor_Endpoint_t*  DataINEndpoint  = NULL;
-	USB_Descriptor_Endpoint_t*  DataOUTEndpoint = NULL;
-	USB_Descriptor_Interface_t* AOAInterface    = NULL;
-
-	memset(&AOAInterfaceInfo->State, 0x00, sizeof(AOAInterfaceInfo->State));
-
-	if (DESCRIPTOR_TYPE(ConfigDescriptorData) != DTYPE_Configuration)
-	  return AOA_ENUMERROR_InvalidConfigDescriptor;
-
-	if (USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData,
-	                              DCOMP_AOA_Host_NextAndroidAccessoryInterface) != DESCRIPTOR_SEARCH_COMP_Found)
-	{
-		return AOA_ENUMERROR_NoCompatibleInterfaceFound;
-	}
-
-	AOAInterface = DESCRIPTOR_PCAST(ConfigDescriptorData, USB_Descriptor_Interface_t);
-
-	while (!(DataINEndpoint) || !(DataOUTEndpoint))
-	{
-		if (USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData,
-		                              DCOMP_AOA_Host_NextInterfaceBulkEndpoint) != DESCRIPTOR_SEARCH_COMP_Found)
-		{
-			return AOA_ENUMERROR_NoCompatibleInterfaceFound;
-		}
-
-		USB_Descriptor_Endpoint_t* EndpointData = DESCRIPTOR_PCAST(ConfigDescriptorData, USB_Descriptor_Endpoint_t);
-
-		if ((EndpointData->EndpointAddress & ENDPOINT_DIR_MASK) == ENDPOINT_DIR_IN)
-		  DataINEndpoint  = EndpointData;
-		else
-		  DataOUTEndpoint = EndpointData;
-	}
-
-	AOAInterfaceInfo->Config.DataINPipe.Size  = le16_to_cpu(DataINEndpoint->EndpointSize);
-	AOAInterfaceInfo->Config.DataINPipe.EndpointAddress = DataINEndpoint->EndpointAddress;
-	AOAInterfaceInfo->Config.DataINPipe.Type  = EP_TYPE_BULK;
-
-	AOAInterfaceInfo->Config.DataOUTPipe.Size = le16_to_cpu(DataOUTEndpoint->EndpointSize);
-	AOAInterfaceInfo->Config.DataOUTPipe.EndpointAddress = DataOUTEndpoint->EndpointAddress;
-	AOAInterfaceInfo->Config.DataOUTPipe.Type = EP_TYPE_BULK;
-
-	if (!(Pipe_ConfigurePipeTable(&AOAInterfaceInfo->Config.DataINPipe, 1)))
-	  return AOA_ENUMERROR_PipeConfigurationFailed;
-
-	if (!(Pipe_ConfigurePipeTable(&AOAInterfaceInfo->Config.DataOUTPipe, 1)))
-	  return AOA_ENUMERROR_PipeConfigurationFailed;
-
-	AOAInterfaceInfo->State.IsActive        = true;
-	AOAInterfaceInfo->State.InterfaceNumber = AOAInterface->InterfaceNumber;
-
-	return AOA_ENUMERROR_NoError;
-}
-
-static uint8_t DCOMP_AOA_Host_NextAndroidAccessoryInterface(void* const CurrentDescriptor)
-{
-	USB_Descriptor_Header_t* Header = DESCRIPTOR_PCAST(CurrentDescriptor, USB_Descriptor_Header_t);
-
-	if (Header->Type == DTYPE_Interface)
-	{
-		USB_Descriptor_Interface_t* Interface = DESCRIPTOR_PCAST(CurrentDescriptor, USB_Descriptor_Interface_t);
-
-		if ((Interface->Class    == AOA_CSCP_AOADataClass)    &&
-		    (Interface->SubClass == AOA_CSCP_AOADataSubclass) &&
-		    (Interface->Protocol == AOA_CSCP_AOADataProtocol))
-		{
-			return DESCRIPTOR_SEARCH_Found;
-		}
-	}
-
-	return DESCRIPTOR_SEARCH_NotFound;
-}
-
-static uint8_t DCOMP_AOA_Host_NextInterfaceBulkEndpoint(void* const CurrentDescriptor)
-{
-	USB_Descriptor_Header_t* Header = DESCRIPTOR_PCAST(CurrentDescriptor, USB_Descriptor_Header_t);
-
-	if (Header->Type == DTYPE_Endpoint)
-	{
-		USB_Descriptor_Endpoint_t* Endpoint = DESCRIPTOR_PCAST(CurrentDescriptor, USB_Descriptor_Endpoint_t);
-
-		uint8_t EndpointType = (Endpoint->Attributes & EP_TYPE_MASK);
-
-		if ((EndpointType == EP_TYPE_BULK) && (!(Pipe_IsEndpointBound(Endpoint->EndpointAddress))))
-		  return DESCRIPTOR_SEARCH_Found;
-	}
-	else if (Header->Type == DTYPE_Interface)
-	{
-		return DESCRIPTOR_SEARCH_Fail;
-	}
-
-	return DESCRIPTOR_SEARCH_NotFound;
-}
-
-void AOA_Host_USBTask(USB_ClassInfo_AOA_Host_t* const AOAInterfaceInfo)
-{
-	if ((USB_HostState != HOST_STATE_Configured) || !(AOAInterfaceInfo->State.IsActive))
-	  return;
-
-	#if !defined(NO_CLASS_DRIVER_AUTOFLUSH)
-	AOA_Host_Flush(AOAInterfaceInfo);
-	#endif
-}
-
-uint8_t AOA_Host_StartAccessoryMode(USB_ClassInfo_AOA_Host_t* const AOAInterfaceInfo)
-{
-	uint8_t ErrorCode;
-
-	uint16_t AccessoryProtocol;
-	if ((ErrorCode = AOA_Host_GetAccessoryProtocol(&AccessoryProtocol)) != HOST_WAITERROR_Successful)
-	  return ErrorCode;
-
-	if ((AccessoryProtocol != CPU_TO_LE16(AOA_PROTOCOL_AccessoryV1)) && (AccessoryProtocol != CPU_TO_LE16(AOA_PROTOCOL_AccessoryV2)))
-	  return AOA_ERROR_LOGICAL_CMD_FAILED;
-
-	for (uint8_t PropertyIndex = 0; PropertyIndex < AOA_STRING_TOTAL_STRINGS; PropertyIndex++)
-	{
-		if ((ErrorCode = AOA_Host_SendPropertyString(AOAInterfaceInfo, PropertyIndex)) != HOST_WAITERROR_Successful)
-		  return ErrorCode;
-	}
-
-	USB_ControlRequest = (USB_Request_Header_t)
-	{
-		.bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_VENDOR | REQREC_DEVICE),
-		.bRequest      = AOA_REQ_StartAccessoryMode,
-		.wValue        = 0,
-		.wIndex        = 0,
-		.wLength       = 0,
-	};
-
-	Pipe_SelectPipe(PIPE_CONTROLPIPE);
-	return USB_Host_SendControlRequest(NULL);
-}
-
-static uint8_t AOA_Host_GetAccessoryProtocol(uint16_t* const Protocol)
-{
-	USB_ControlRequest = (USB_Request_Header_t)
-	{
-		.bmRequestType = (REQDIR_DEVICETOHOST | REQTYPE_VENDOR | REQREC_DEVICE),
-		.bRequest      = AOA_REQ_GetAccessoryProtocol,
-		.wValue        = 0,
-		.wIndex        = 0,
-		.wLength       = sizeof(uint16_t),
-	};
-
-	Pipe_SelectPipe(PIPE_CONTROLPIPE);
-	return USB_Host_SendControlRequest(Protocol);
-}
-
-static uint8_t AOA_Host_SendPropertyString(USB_ClassInfo_AOA_Host_t* const AOAInterfaceInfo,
-                                           const uint8_t StringIndex)
-{
-	const char* String = AOAInterfaceInfo->Config.PropertyStrings[StringIndex];
-
-	if (String == NULL)
-	  String = "";
-
-	USB_ControlRequest = (USB_Request_Header_t)
-	{
-		.bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_VENDOR | REQREC_DEVICE),
-		.bRequest      = AOA_REQ_SendString,
-		.wValue        = 0,
-		.wIndex        = StringIndex,
-		.wLength       = (strlen(String) + 1),
-	};
-
-	Pipe_SelectPipe(PIPE_CONTROLPIPE);
-	return USB_Host_SendControlRequest((char*)String);
-}
-
-uint8_t AOA_Host_SendData(USB_ClassInfo_AOA_Host_t* const AOAInterfaceInfo,
-                          const void* const Buffer,
-                          const uint16_t Length)
-{
-	if ((USB_HostState != HOST_STATE_Configured) || !(AOAInterfaceInfo->State.IsActive))
-	  return PIPE_READYWAIT_DeviceDisconnected;
-
-	uint8_t ErrorCode;
-
-	Pipe_SelectPipe(AOAInterfaceInfo->Config.DataOUTPipe.Address);
-
-	Pipe_Unfreeze();
-	ErrorCode = Pipe_Write_Stream_LE(Buffer, Length, NULL);
-	Pipe_Freeze();
-
-	return ErrorCode;
-}
-
-uint8_t AOA_Host_SendString(USB_ClassInfo_AOA_Host_t* const AOAInterfaceInfo,
-                            const char* const String)
-{
-	if ((USB_HostState != HOST_STATE_Configured) || !(AOAInterfaceInfo->State.IsActive))
-	  return PIPE_READYWAIT_DeviceDisconnected;
-
-	uint8_t ErrorCode;
-
-	Pipe_SelectPipe(AOAInterfaceInfo->Config.DataOUTPipe.Address);
-
-	Pipe_Unfreeze();
-	ErrorCode = Pipe_Write_Stream_LE(String, strlen(String), NULL);
-	Pipe_Freeze();
-
-	return ErrorCode;
-}
-
-uint8_t AOA_Host_SendByte(USB_ClassInfo_AOA_Host_t* const AOAInterfaceInfo,
-                          const uint8_t Data)
-{
-	if ((USB_HostState != HOST_STATE_Configured) || !(AOAInterfaceInfo->State.IsActive))
-	  return PIPE_READYWAIT_DeviceDisconnected;
-
-	uint8_t ErrorCode;
-
-	Pipe_SelectPipe(AOAInterfaceInfo->Config.DataOUTPipe.Address);
-	Pipe_Unfreeze();
-
-	if (!(Pipe_IsReadWriteAllowed()))
-	{
-		Pipe_ClearOUT();
-
-		if ((ErrorCode = Pipe_WaitUntilReady()) != PIPE_READYWAIT_NoError)
-		  return ErrorCode;
-	}
-
-	Pipe_Write_8(Data);
-	Pipe_Freeze();
-
-	return PIPE_READYWAIT_NoError;
-}
-
-uint16_t AOA_Host_BytesReceived(USB_ClassInfo_AOA_Host_t* const AOAInterfaceInfo)
-{
-	if ((USB_HostState != HOST_STATE_Configured) || !(AOAInterfaceInfo->State.IsActive))
-	  return 0;
-
-	Pipe_SelectPipe(AOAInterfaceInfo->Config.DataINPipe.Address);
-	Pipe_Unfreeze();
-
-	if (Pipe_IsINReceived())
-	{
-		if (!(Pipe_BytesInPipe()))
-		{
-			Pipe_ClearIN();
-			Pipe_Freeze();
-			return 0;
-		}
-		else
-		{
-			Pipe_Freeze();
-			return Pipe_BytesInPipe();
-		}
-	}
-	else
-	{
-		Pipe_Freeze();
-
-		return 0;
-	}
-}
-
-int16_t AOA_Host_ReceiveByte(USB_ClassInfo_AOA_Host_t* const AOAInterfaceInfo)
-{
-	if ((USB_HostState != HOST_STATE_Configured) || !(AOAInterfaceInfo->State.IsActive))
-	  return -1;
-
-	int16_t ReceivedByte = -1;
-
-	Pipe_SelectPipe(AOAInterfaceInfo->Config.DataINPipe.Address);
-	Pipe_Unfreeze();
-
-	if (Pipe_IsINReceived())
-	{
-		if (Pipe_BytesInPipe())
-		  ReceivedByte = Pipe_Read_8();
-
-		if (!(Pipe_BytesInPipe()))
-		  Pipe_ClearIN();
-	}
-
-	Pipe_Freeze();
-
-	return ReceivedByte;
-}
-
-uint8_t AOA_Host_Flush(USB_ClassInfo_AOA_Host_t* const AOAInterfaceInfo)
-{
-	if ((USB_HostState != HOST_STATE_Configured) || !(AOAInterfaceInfo->State.IsActive))
-	  return PIPE_READYWAIT_DeviceDisconnected;
-
-	uint8_t ErrorCode;
-
-	Pipe_SelectPipe(AOAInterfaceInfo->Config.DataOUTPipe.Address);
-	Pipe_Unfreeze();
-
-	if (!(Pipe_BytesInPipe()))
-	  return PIPE_READYWAIT_NoError;
-
-	bool BankFull = !(Pipe_IsReadWriteAllowed());
-
-	Pipe_ClearOUT();
-
-	if (BankFull)
-	{
-		if ((ErrorCode = Pipe_WaitUntilReady()) != PIPE_READYWAIT_NoError)
-		  return ErrorCode;
-
-		Pipe_ClearOUT();
-	}
-
-	Pipe_Freeze();
-
-	return PIPE_READYWAIT_NoError;
-}
-
-#if defined(FDEV_SETUP_STREAM)
-void AOA_Host_CreateStream(USB_ClassInfo_AOA_Host_t* const AOAInterfaceInfo,
-                           FILE* const Stream)
-{
-	*Stream = (FILE)FDEV_SETUP_STREAM(AOA_Host_putchar, AOA_Host_getchar, _FDEV_SETUP_RW);
-	fdev_set_udata(Stream, AOAInterfaceInfo);
-}
-
-void AOA_Host_CreateBlockingStream(USB_ClassInfo_AOA_Host_t* const AOAInterfaceInfo,
-                                   FILE* const Stream)
-{
-	*Stream = (FILE)FDEV_SETUP_STREAM(AOA_Host_putchar, AOA_Host_getchar_Blocking, _FDEV_SETUP_RW);
-	fdev_set_udata(Stream, AOAInterfaceInfo);
-}
-
-static int AOA_Host_putchar(char c,
-                            FILE* Stream)
-{
-	return AOA_Host_SendByte((USB_ClassInfo_AOA_Host_t*)fdev_get_udata(Stream), c) ? _FDEV_ERR : 0;
-}
-
-static int AOA_Host_getchar(FILE* Stream)
-{
-	int16_t ReceivedByte = AOA_Host_ReceiveByte((USB_ClassInfo_AOA_Host_t*)fdev_get_udata(Stream));
-
-	if (ReceivedByte < 0)
-	  return _FDEV_EOF;
-
-	return ReceivedByte;
-}
-
-static int AOA_Host_getchar_Blocking(FILE* Stream)
-{
-	int16_t ReceivedByte;
-
-	while ((ReceivedByte = AOA_Host_ReceiveByte((USB_ClassInfo_AOA_Host_t*)fdev_get_udata(Stream))) < 0)
-	{
-		if (USB_HostState == HOST_STATE_Unattached)
-		  return _FDEV_EOF;
-
-		AOA_Host_USBTask((USB_ClassInfo_AOA_Host_t*)fdev_get_udata(Stream));
-		USB_USBTask();
-	}
-
-	return ReceivedByte;
-}
-#endif
-
-#endif
-
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Class/Host/AndroidAccessoryClassHost.h b/NativePrograms/LUFA/Drivers/USB/Class/Host/AndroidAccessoryClassHost.h
deleted file mode 100644
index 861305a51f..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Class/Host/AndroidAccessoryClassHost.h
+++ /dev/null
@@ -1,314 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Host mode driver for the library USB Android Open Accessory Class driver.
- *
- *  Host mode driver for the library USB Android Open Accessory Class driver.
- *
- *  \note This file should not be included directly. It is automatically included as needed by the USB module driver
- *        dispatch header located in LUFA/Drivers/USB.h.
- */
-
-/** \ingroup Group_USBClassAOA
- *  \defgroup Group_USBClassAndroidAccessoryHost Android Open Accessory Class Host Mode Driver
- *
- *  \section Sec_USBClassAndroidAccessoryHost_Dependencies Module Source Dependencies
- *  The following files must be built with any user project that uses this module:
- *    - LUFA/Drivers/USB/Class/Host/AndroidAccessoryClassHost.c <i>(Makefile source module name: LUFA_SRC_USBCLASS)</i>
- *
- *  \section Sec_USBClassAndroidAccessoryHost_ModDescription Module Description
- *  Host Mode USB Class driver framework interface, for the Android Open Accessory USB Class driver.
- *
- *  @{
- */
-
-#ifndef __AOA_CLASS_HOST_H__
-#define __AOA_CLASS_HOST_H__
-
-	/* Includes: */
-		#include "../../USB.h"
-		#include "../Common/AndroidAccessoryClassCommon.h"
-
-		#include <stdio.h>
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_AOA_DRIVER)
-			#error Do not include this file directly. Include LUFA/Drivers/USB.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Error code for some Android Open Accessory Host functions, indicating a logical (and not hardware) error. */
-			#define AOA_ERROR_LOGICAL_CMD_FAILED              0x80
-
-		/* Type Defines: */
-			/** \brief Android Open Accessory Class Host Mode Configuration and State Structure.
-			 *
-			 *  Class state structure. An instance of this structure should be made within the user application,
-			 *  and passed to each of the Android Open Accessory class driver functions as the \c AOAInterfaceInfo
-			 *  parameter. This stores each Android Open Accessory interface's configuration and state information.
-			 */
-			typedef struct
-			{
-				struct
-				{
-					USB_Pipe_Table_t DataINPipe; /**< Data IN Pipe configuration table. */
-					USB_Pipe_Table_t DataOUTPipe; /**< Data OUT Pipe configuration table. */
-
-					char*    PropertyStrings[AOA_STRING_TOTAL_STRINGS]; /**< Android Accessory property strings, sent to identify the accessory when the
-					                                                     *   Android device is switched into Open Accessory mode. */
-				} Config; /**< Config data for the USB class interface within the device. All elements in this section
-				           *   <b>must</b> be set or the interface will fail to enumerate and operate correctly.
-				           */
-				struct
-				{
-					bool IsActive; /**< Indicates if the current interface instance is connected to an attached device, valid
-					                *   after \ref AOA_Host_ConfigurePipes() is called and the Host state machine is in the
-					                *   Configured state.
-					                */
-					uint8_t  InterfaceNumber; /**< Interface index of the AOA interface within the attached device. */
-				} State; /**< State data for the USB class interface within the device. All elements in this section
-						  *   <b>may</b> be set to initial values, but may also be ignored to default to sane values when
-						  *   the interface is enumerated.
-						  */
-			} USB_ClassInfo_AOA_Host_t;
-
-		/* Enums: */
-			/** Enum for the possible error codes returned by the \ref AOA_Host_ConfigurePipes() function. */
-			enum AOA_Host_EnumerationFailure_ErrorCodes_t
-			{
-				AOA_ENUMERROR_NoError                    = 0, /**< Configuration Descriptor was processed successfully. */
-				AOA_ENUMERROR_InvalidConfigDescriptor    = 1, /**< The device returned an invalid Configuration Descriptor. */
-				AOA_ENUMERROR_NoCompatibleInterfaceFound = 2, /**< A compatible Android Open Accessory interface was not found in the device's Configuration Descriptor. */
-				AOA_ENUMERROR_PipeConfigurationFailed    = 3, /**< One or more pipes for the specified interface could not be configured correctly. */
-			};
-
-		/* Function Prototypes: */
-			/** General management task for a given Android Open Accessory host class interface, required for the correct operation of the interface.
-			 *  This should be called frequently in the main program loop, before the master USB management task \ref USB_USBTask().
-			 *
-			 *  \param[in,out] AOAInterfaceInfo  Pointer to a structure containing an Android Open Accessory Class host configuration and state.
-			 */
-			void AOA_Host_USBTask(USB_ClassInfo_AOA_Host_t* const AOAInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Validates a device descriptor, to check if the device is a valid Android device, and if it is currently in Android Open Accessory mode.
-			 *
-			 *  \param[in,out] AOAInterfaceInfo  Pointer to a structure containing an AOA Class host configuration and state.
-			 *  \param[in]     DeviceDescriptor  Pointer a buffer containing the attached device's Device Descriptor.
-			 *  \param[out]    NeedModeSwitch    Pointer to a boolean where the mode switch requirement of the attached device is to be stored.
-			 *
-			 *  \return Boolean \c true if the attached device is a valid Android device, \c false otherwise.
-			 */
-			bool AOA_Host_ValidateAccessoryDevice(USB_ClassInfo_AOA_Host_t* const AOAInterfaceInfo,
-                                                  const USB_Descriptor_Device_t* const DeviceDescriptor,
-			                                      bool* const NeedModeSwitch) ATTR_NON_NULL_PTR_ARG(1) ATTR_NON_NULL_PTR_ARG(2) ATTR_NON_NULL_PTR_ARG(3);
-
-			/** Host interface configuration routine, to configure a given Android Open Accessory host interface instance using the Configuration
-			 *  Descriptor read from an attached USB device. This function automatically updates the given Android Open Accessory Host instance's
-			 *  state values and configures the pipes required to communicate with the interface if it is found within the device. This should be
-			 *  called once after the stack has enumerated the attached device, while the host state machine is in the Addressed state.
-			 *
-			 *  \param[in,out] AOAInterfaceInfo      Pointer to a structure containing an AOA Class host configuration and state.
-			 *  \param[in]     ConfigDescriptorSize  Length of the attached device's Configuration Descriptor.
-			 *  \param[in]     ConfigDescriptorData  Pointer to a buffer containing the attached device's Configuration Descriptor.
-			 *
-			 *  \return A value from the \ref AOA_Host_EnumerationFailure_ErrorCodes_t enum.
-			 */
-			uint8_t AOA_Host_ConfigurePipes(USB_ClassInfo_AOA_Host_t* const AOAInterfaceInfo,
-			                                uint16_t ConfigDescriptorSize,
-			                                void* ConfigDescriptorData) ATTR_NON_NULL_PTR_ARG(1) ATTR_NON_NULL_PTR_ARG(3);
-
-			/** Starts Accessory Mode in the attached Android device. This function will validate the device's Android Open Accessory protocol
-			 *  version, send the configured property strings, and request a switch to Android Open Accessory mode.
-			 *
-			 *  \param[in,out] AOAInterfaceInfo  Pointer to a structure containing an AOA Class host configuration and state.
-			 *
-			 *  \return A value from the \ref USB_Host_SendControlErrorCodes_t enum, or \ref AOA_ERROR_LOGICAL_CMD_FAILED if a logical error occurred..
-			 */
-			uint8_t AOA_Host_StartAccessoryMode(USB_ClassInfo_AOA_Host_t* const AOAInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Sends a given data buffer to the attached USB device, if connected. If a device is not connected when the function is
-			 *  called, the data will be discarded. Bytes will be queued for transmission to the device until either the pipe bank
-			 *  becomes full, or the \ref AOA_Host_Flush() function is called to flush the pending data to the device. This allows for
-			 *  multiple bytes to be packed into a single pipe packet, increasing data throughput.
-			 *
-			 *  \pre This function must only be called when the Host state machine is in the \ref HOST_STATE_Configured state or the
-			 *       call will fail.
-			 *
-			 *  \param[in,out] AOAInterfaceInfo  Pointer to a structure containing a AOA Class host configuration and state.
-			 *  \param[in]     Buffer            Pointer to a buffer containing the data to send to the device.
-			 *  \param[in]     Length            Length of the data to send to the device.
-			 *
-			 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t AOA_Host_SendData(USB_ClassInfo_AOA_Host_t* const AOAInterfaceInfo,
-			                          const void* const Buffer,
-			                          const uint16_t Length) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Sends a given null-terminated string to the attached USB device, if connected. If a device is not connected when the
-			 *  function is called, the string is discarded. Bytes will be queued for transmission to the device until either the pipe
-			 *  bank becomes full, or the \ref AOA_Host_Flush() function is called to flush the pending data to the device. This allows
-			 *  for multiple bytes to be packed into a single pipe packet, increasing data throughput.
-			 *
-			 *  \pre This function must only be called when the Host state machine is in the \ref HOST_STATE_Configured state or the
-			 *       call will fail.
-			 *
-			 *  \param[in,out] AOAInterfaceInfo  Pointer to a structure containing a AOA Class host configuration and state.
-			 *  \param[in]     String            Pointer to the null terminated string to send to the device.
-			 *
-			 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t AOA_Host_SendString(USB_ClassInfo_AOA_Host_t* const AOAInterfaceInfo,
-			                            const char* const String) ATTR_NON_NULL_PTR_ARG(1) ATTR_NON_NULL_PTR_ARG(2);
-
-			/** Sends a given byte to the attached USB device, if connected. If a device is not connected when the function is called, the
-			 *  byte is discarded. Bytes will be queued for transmission to the device until either the pipe bank becomes full, or the
-			 *  \ref AOA_Host_Flush() function is called to flush the pending data to the host. This allows for multiple bytes to be
-			 *  packed into a single pipe packet, increasing data throughput.
-			 *
-			 *  \pre This function must only be called when the Host state machine is in the \ref HOST_STATE_Configured state or the
-			 *       call will fail.
-			 *
-			 *  \param[in,out] AOAInterfaceInfo  Pointer to a structure containing a AOA Class host configuration and state.
-			 *  \param[in]     Data              Byte of data to send to the device.
-			 *
-			 *  \return A value from the \ref Pipe_WaitUntilReady_ErrorCodes_t enum.
-			 */
-			uint8_t AOA_Host_SendByte(USB_ClassInfo_AOA_Host_t* const AOAInterfaceInfo,
-			                          const uint8_t Data) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Determines the number of bytes received by the AOA interface from the device, waiting to be read. This indicates the number
-			 *  of bytes in the IN pipe bank only, and thus the number of calls to \ref AOA_Host_ReceiveByte() which are guaranteed to succeed
-			 *  immediately. If multiple bytes are to be received, they should be buffered by the user application, as the pipe bank will not be
-			 *  released back to the USB controller until all bytes are read.
-			 *
-			 *  \pre This function must only be called when the Host state machine is in the \ref HOST_STATE_Configured state or the
-			 *       call will fail.
-			 *
-			 *  \param[in,out] AOAInterfaceInfo  Pointer to a structure containing a AOA Class host configuration and state.
-			 *
-			 *  \return Total number of buffered bytes received from the device.
-			 */
-			uint16_t AOA_Host_BytesReceived(USB_ClassInfo_AOA_Host_t* const AOAInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Reads a byte of data from the device. If no data is waiting to be read of if a USB device is not connected, the function
-			 *  returns a negative value. The \ref AOA_Host_BytesReceived() function may be queried in advance to determine how many bytes
-			 *  are currently buffered in the AOA interface's data receive pipe.
-			 *
-			 *  \pre This function must only be called when the Host state machine is in the \ref HOST_STATE_Configured state or the
-			 *       call will fail.
-			 *
-			 *  \param[in,out] AOAInterfaceInfo  Pointer to a structure containing a AOA Class host configuration and state.
-			 *
-			 *  \return Next received byte from the device, or a negative value if no data received.
-			 */
-			int16_t AOA_Host_ReceiveByte(USB_ClassInfo_AOA_Host_t* const AOAInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Flushes any data waiting to be sent, ensuring that the send buffer is cleared.
-			 *
-			 *  \pre This function must only be called when the Host state machine is in the \ref HOST_STATE_Configured state or the
-			 *       call will fail.
-			 *
-			 *  \param[in,out] AOAInterfaceInfo  Pointer to a structure containing a AOA Class host configuration and state.
-			 *
-			 *  \return A value from the \ref Pipe_WaitUntilReady_ErrorCodes_t enum.
-			 */
-			uint8_t AOA_Host_Flush(USB_ClassInfo_AOA_Host_t* const AOAInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Creates a standard character stream for the given AOA Device instance so that it can be used with all the regular
-			 *  functions in the standard \c <stdio.h> library that accept a \c FILE stream as a destination (e.g. \c fprintf). The created
-			 *  stream is bidirectional and can be used for both input and output functions.
-			 *
-			 *  Reading data from this stream is non-blocking, i.e. in most instances, complete strings cannot be read in by a single
-			 *  fetch, as the endpoint will not be ready at some point in the transmission, aborting the transfer. However, this may
-			 *  be used when the read data is processed byte-per-bye (via \c getc()) or when the user application will implement its own
-			 *  line buffering.
-			 *
-			 *  \note The created stream can be given as \c stdout if desired to direct the standard output from all \c <stdio.h> functions
-			 *        to the given AOA interface.
-			 *        \n\n
-			 *
-			 *  \note This function is not available on all microcontroller architectures.
-			 *
-			 *  \param[in,out] AOAInterfaceInfo  Pointer to a structure containing a AOA Class configuration and state.
-			 *  \param[in,out] Stream            Pointer to a FILE structure where the created stream should be placed.
-			 */
-			void AOA_Host_CreateStream(USB_ClassInfo_AOA_Host_t* const AOAInterfaceInfo,
-			                           FILE* const Stream) ATTR_NON_NULL_PTR_ARG(1) ATTR_NON_NULL_PTR_ARG(2);
-
-			/** Identical to \ref AOA_Host_CreateStream(), except that reads are blocking until the calling stream function terminates
-			 *  the transfer. While blocking, the USB and AOA service tasks are called repeatedly to maintain USB communications.
-			 *
-			 *  \note This function is not available on all microcontroller architectures.
-			 *
-			 *  \param[in,out] AOAInterfaceInfo  Pointer to a structure containing a AOA Class configuration and state.
-			 *  \param[in,out] Stream            Pointer to a FILE structure where the created stream should be placed.
-			 */
-			void AOA_Host_CreateBlockingStream(USB_ClassInfo_AOA_Host_t* const AOAInterfaceInfo,
-			                                   FILE* const Stream) ATTR_NON_NULL_PTR_ARG(1) ATTR_NON_NULL_PTR_ARG(2);
-
-	/* Private Interface - For use in library only: */
-	#if !defined(__DOXYGEN__)
-		/* Function Prototypes: */
-			#if defined(__INCLUDE_FROM_ANDROIDACCESSORY_HOST_C)
-				#if defined(FDEV_SETUP_STREAM)
-				static int AOA_Host_putchar(char c,
-				                            FILE* Stream) ATTR_NON_NULL_PTR_ARG(2);
-				static int AOA_Host_getchar(FILE* Stream) ATTR_NON_NULL_PTR_ARG(1);
-				static int AOA_Host_getchar_Blocking(FILE* Stream) ATTR_NON_NULL_PTR_ARG(1);
-				#endif
-
-				static uint8_t AOA_Host_GetAccessoryProtocol(uint16_t* const Protocol) ATTR_NON_NULL_PTR_ARG(1);
-				static uint8_t AOA_Host_SendPropertyString(USB_ClassInfo_AOA_Host_t* const AOAInterfaceInfo,
-			                                               const uint8_t StringIndex) ATTR_NON_NULL_PTR_ARG(1);
-
-				static uint8_t DCOMP_AOA_Host_NextAndroidAccessoryInterface(void* const CurrentDescriptor)
-				                                                            ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(1);
-				static uint8_t DCOMP_AOA_Host_NextInterfaceBulkEndpoint(void* const CurrentDescriptor)
-				                                                        ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(1);
-			#endif
-	#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Class/Host/AudioClassHost.c b/NativePrograms/LUFA/Drivers/USB/Class/Host/AudioClassHost.c
deleted file mode 100644
index 5e8a6a1cb1..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Class/Host/AudioClassHost.c
+++ /dev/null
@@ -1,223 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-#define  __INCLUDE_FROM_USB_DRIVER
-#include "../../Core/USBMode.h"
-
-#if defined(USB_CAN_BE_HOST)
-
-#define  __INCLUDE_FROM_AUDIO_DRIVER
-#define  __INCLUDE_FROM_AUDIO_HOST_C
-#include "AudioClassHost.h"
-
-uint8_t Audio_Host_ConfigurePipes(USB_ClassInfo_Audio_Host_t* const AudioInterfaceInfo,
-                                  uint16_t ConfigDescriptorSize,
-                                  void* ConfigDescriptorData)
-{
-	USB_Descriptor_Endpoint_t*  DataINEndpoint          = NULL;
-	USB_Descriptor_Endpoint_t*  DataOUTEndpoint         = NULL;
-	USB_Descriptor_Interface_t* AudioControlInterface   = NULL;
-	USB_Descriptor_Interface_t* AudioStreamingInterface = NULL;
-
-	memset(&AudioInterfaceInfo->State, 0x00, sizeof(AudioInterfaceInfo->State));
-
-	if (DESCRIPTOR_TYPE(ConfigDescriptorData) != DTYPE_Configuration)
-	  return AUDIO_ENUMERROR_InvalidConfigDescriptor;
-
-	while ((AudioInterfaceInfo->Config.DataINPipe.Address  && !(DataINEndpoint)) ||
-	       (AudioInterfaceInfo->Config.DataOUTPipe.Address && !(DataOUTEndpoint)))
-	{
-		if (!(AudioControlInterface) ||
-		    USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData,
-		                              DCOMP_Audio_Host_NextAudioInterfaceDataEndpoint) != DESCRIPTOR_SEARCH_COMP_Found)
-		{
-			if (!(AudioControlInterface) ||
-			    USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData,
-			                              DCOMP_Audio_Host_NextAudioStreamInterface) != DESCRIPTOR_SEARCH_COMP_Found)
-			{
-				if (USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData,
-				                              DCOMP_Audio_Host_NextAudioControlInterface) != DESCRIPTOR_SEARCH_COMP_Found)
-				{
-					return AUDIO_ENUMERROR_NoCompatibleInterfaceFound;
-				}
-
-				AudioControlInterface = DESCRIPTOR_PCAST(ConfigDescriptorData, USB_Descriptor_Interface_t);
-
-				if (USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData,
-				                              DCOMP_Audio_Host_NextAudioStreamInterface) != DESCRIPTOR_SEARCH_COMP_Found)
-				{
-					return AUDIO_ENUMERROR_NoCompatibleInterfaceFound;
-				}
-			}
-
-			AudioStreamingInterface = DESCRIPTOR_PCAST(ConfigDescriptorData, USB_Descriptor_Interface_t);
-
-			DataINEndpoint  = NULL;
-			DataOUTEndpoint = NULL;
-
-			continue;
-		}
-
-		USB_Descriptor_Endpoint_t* EndpointData = DESCRIPTOR_PCAST(ConfigDescriptorData, USB_Descriptor_Endpoint_t);
-
-		if ((EndpointData->EndpointAddress & ENDPOINT_DIR_MASK) == ENDPOINT_DIR_IN)
-		  DataINEndpoint  = EndpointData;
-		else
-		  DataOUTEndpoint = EndpointData;
-	}
-
-	AudioInterfaceInfo->Config.DataINPipe.Size   = le16_to_cpu(DataINEndpoint->EndpointSize);
-	AudioInterfaceInfo->Config.DataINPipe.EndpointAddress = DataINEndpoint->EndpointAddress;
-	AudioInterfaceInfo->Config.DataINPipe.Type   = EP_TYPE_ISOCHRONOUS;
-	AudioInterfaceInfo->Config.DataINPipe.Banks  = 2;
-
-	AudioInterfaceInfo->Config.DataOUTPipe.Size  = le16_to_cpu(DataOUTEndpoint->EndpointSize);
-	AudioInterfaceInfo->Config.DataOUTPipe.EndpointAddress = DataOUTEndpoint->EndpointAddress;
-	AudioInterfaceInfo->Config.DataOUTPipe.Type  = EP_TYPE_ISOCHRONOUS;
-	AudioInterfaceInfo->Config.DataOUTPipe.Banks = 2;
-
-	if (!(Pipe_ConfigurePipeTable(&AudioInterfaceInfo->Config.DataINPipe, 1)))
-	  return AUDIO_ENUMERROR_PipeConfigurationFailed;
-
-	if (!(Pipe_ConfigurePipeTable(&AudioInterfaceInfo->Config.DataOUTPipe, 1)))
-	  return AUDIO_ENUMERROR_PipeConfigurationFailed;
-
-	AudioInterfaceInfo->State.ControlInterfaceNumber    = AudioControlInterface->InterfaceNumber;
-	AudioInterfaceInfo->State.StreamingInterfaceNumber  = AudioStreamingInterface->InterfaceNumber;
-	AudioInterfaceInfo->State.EnabledStreamingAltIndex  = AudioStreamingInterface->AlternateSetting;
-	AudioInterfaceInfo->State.IsActive = true;
-
-	return AUDIO_ENUMERROR_NoError;
-}
-
-static uint8_t DCOMP_Audio_Host_NextAudioControlInterface(void* CurrentDescriptor)
-{
-	USB_Descriptor_Header_t* Header = DESCRIPTOR_PCAST(CurrentDescriptor, USB_Descriptor_Header_t);
-
-	if (Header->Type == DTYPE_Interface)
-	{
-		USB_Descriptor_Interface_t* Interface = DESCRIPTOR_PCAST(CurrentDescriptor, USB_Descriptor_Interface_t);
-
-		if ((Interface->Class    == AUDIO_CSCP_AudioClass) &&
-		    (Interface->SubClass == AUDIO_CSCP_ControlSubclass) &&
-		    (Interface->Protocol == AUDIO_CSCP_ControlProtocol))
-		{
-			return DESCRIPTOR_SEARCH_Found;
-		}
-	}
-
-	return DESCRIPTOR_SEARCH_NotFound;
-}
-
-static uint8_t DCOMP_Audio_Host_NextAudioStreamInterface(void* CurrentDescriptor)
-{
-	USB_Descriptor_Header_t* Header = DESCRIPTOR_PCAST(CurrentDescriptor, USB_Descriptor_Header_t);
-
-	if (Header->Type == DTYPE_Interface)
-	{
-		USB_Descriptor_Interface_t* Interface = DESCRIPTOR_PCAST(CurrentDescriptor, USB_Descriptor_Interface_t);
-
-		if ((Interface->Class    == AUDIO_CSCP_AudioClass) &&
-		    (Interface->SubClass == AUDIO_CSCP_AudioStreamingSubclass) &&
-		    (Interface->Protocol == AUDIO_CSCP_StreamingProtocol))
-		{
-			return DESCRIPTOR_SEARCH_Found;
-		}
-	}
-
-	return DESCRIPTOR_SEARCH_NotFound;
-}
-
-static uint8_t DCOMP_Audio_Host_NextAudioInterfaceDataEndpoint(void* CurrentDescriptor)
-{
-	USB_Descriptor_Header_t* Header = DESCRIPTOR_PCAST(CurrentDescriptor, USB_Descriptor_Header_t);
-
-	if (Header->Type == DTYPE_Endpoint)
-	{
-		USB_Descriptor_Endpoint_t* Endpoint = DESCRIPTOR_PCAST(CurrentDescriptor, USB_Descriptor_Endpoint_t);
-
-		if ((Endpoint->Attributes & EP_TYPE_MASK) == EP_TYPE_ISOCHRONOUS)
-		  return DESCRIPTOR_SEARCH_Found;
-	}
-	else if (Header->Type == DTYPE_Interface)
-	{
-		return DESCRIPTOR_SEARCH_Fail;
-	}
-
-	return DESCRIPTOR_SEARCH_NotFound;
-}
-
-uint8_t Audio_Host_StartStopStreaming(USB_ClassInfo_Audio_Host_t* const AudioInterfaceInfo,
-			                          const bool EnableStreaming)
-{
-	if (!(AudioInterfaceInfo->State.IsActive))
-	  return HOST_SENDCONTROL_DeviceDisconnected;
-
-	return USB_Host_SetInterfaceAltSetting(AudioInterfaceInfo->State.StreamingInterfaceNumber,
-	                                       EnableStreaming ? AudioInterfaceInfo->State.EnabledStreamingAltIndex : 0);
-}
-
-uint8_t Audio_Host_GetSetEndpointProperty(USB_ClassInfo_Audio_Host_t* const AudioInterfaceInfo,
-			                              const uint8_t DataPipeIndex,
-			                              const uint8_t EndpointProperty,
-			                              const uint8_t EndpointControl,
-			                              const uint16_t DataLength,
-			                              void* const Data)
-{
-	if (!(AudioInterfaceInfo->State.IsActive))
-	  return HOST_SENDCONTROL_DeviceDisconnected;
-
-	uint8_t RequestType;
-	uint8_t EndpointAddress;
-
-	if (EndpointProperty & 0x80)
-	  RequestType = (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_ENDPOINT);
-	else
-	  RequestType = (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_ENDPOINT);
-
-	Pipe_SelectPipe(DataPipeIndex);
-	EndpointAddress = Pipe_GetBoundEndpointAddress();
-
-	USB_ControlRequest = (USB_Request_Header_t)
-		{
-			.bmRequestType = RequestType,
-			.bRequest      = EndpointProperty,
-			.wValue        = ((uint16_t)EndpointControl << 8),
-			.wIndex        = EndpointAddress,
-			.wLength       = DataLength,
-		};
-
-	Pipe_SelectPipe(PIPE_CONTROLPIPE);
-
-	return USB_Host_SendControlRequest(Data);
-}
-
-#endif
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Class/Host/AudioClassHost.h b/NativePrograms/LUFA/Drivers/USB/Class/Host/AudioClassHost.h
deleted file mode 100644
index 123c24e62f..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Class/Host/AudioClassHost.h
+++ /dev/null
@@ -1,411 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Host mode driver for the library USB Audio 1.0 Class driver.
- *
- *  Host mode driver for the library USB Audio 1.0 Class driver.
- *
- *  \note This file should not be included directly. It is automatically included as needed by the USB module driver
- *        dispatch header located in LUFA/Drivers/USB.h.
- */
-
-/** \ingroup Group_USBClassAudio
- *  \defgroup Group_USBClassAudioHost Audio 1.0 Class Host Mode Driver
- *
- *  \section Sec_USBClassAudioHost_Dependencies Module Source Dependencies
- *  The following files must be built with any user project that uses this module:
- *    - LUFA/Drivers/USB/Class/Host/AudioClassHost.c <i>(Makefile source module name: LUFA_SRC_USBCLASS)</i>
- *
- *  \section Sec_USBClassAudioHost_ModDescription Module Description
- *  Host Mode USB Class driver framework interface, for the Audio 1.0 USB Class driver.
- *
- *  @{
- */
-
-#ifndef __AUDIO_CLASS_HOST_H__
-#define __AUDIO_CLASS_HOST_H__
-
-	/* Includes: */
-		#include "../../USB.h"
-		#include "../Common/AudioClassCommon.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_AUDIO_DRIVER)
-			#error Do not include this file directly. Include LUFA/Drivers/USB.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Type Defines: */
-			/** \brief Audio Class Host Mode Configuration and State Structure.
-			 *
-			 *  Class state structure. An instance of this structure should be made within the user application,
-			 *  and passed to each of the Audio class driver functions as the \c AudioInterfaceInfo parameter. This
-			 *  stores each Audio interface's configuration and state information.
-			 */
-			typedef struct
-			{
-				struct
-				{
-					USB_Pipe_Table_t DataINPipe; /**< Data IN Pipe configuration table. */
-					USB_Pipe_Table_t DataOUTPipe; /**< Data OUT Pipe configuration table. */
-				} Config; /**< Config data for the USB class interface within the device. All elements in this section
-				           *   <b>must</b> be set or the interface will fail to enumerate and operate correctly.
-				           */
-				struct
-				{
-					bool IsActive; /**< Indicates if the current interface instance is connected to an attached device, valid
-					                *   after \ref Audio_Host_ConfigurePipes() is called and the Host state machine is in the
-					                *   Configured state.
-					                */
-					uint8_t ControlInterfaceNumber; /**< Interface index of the Audio Control interface within the attached device. */
-					uint8_t StreamingInterfaceNumber; /**< Interface index of the Audio Streaming interface within the attached device. */
-
-					uint8_t EnabledStreamingAltIndex; /**< Alternative setting index of the Audio Streaming interface when the stream is enabled. */
-				} State; /**< State data for the USB class interface within the device. All elements in this section
-						  *   <b>may</b> be set to initial values, but may also be ignored to default to sane values when
-						  *   the interface is enumerated.
-						  */
-			} USB_ClassInfo_Audio_Host_t;
-
-		/* Enums: */
-			/** Enum for the possible error codes returned by the \ref Audio_Host_ConfigurePipes() function. */
-			enum AUDIO_Host_EnumerationFailure_ErrorCodes_t
-			{
-				AUDIO_ENUMERROR_NoError                    = 0, /**< Configuration Descriptor was processed successfully. */
-				AUDIO_ENUMERROR_InvalidConfigDescriptor    = 1, /**< The device returned an invalid Configuration Descriptor. */
-				AUDIO_ENUMERROR_NoCompatibleInterfaceFound = 2, /**< A compatible AUDIO interface was not found in the device's Configuration Descriptor. */
-				AUDIO_ENUMERROR_PipeConfigurationFailed    = 3, /**< One or more pipes for the specified interface could not be configured correctly. */
-			};
-
-		/* Function Prototypes: */
-			/** Host interface configuration routine, to configure a given Audio host interface instance using the Configuration
-			 *  Descriptor read from an attached USB device. This function automatically updates the given Audio Host instance's
-			 *  state values and configures the pipes required to communicate with the interface if it is found within the
-			 *  device. This should be called once after the stack has enumerated the attached device, while the host state
-			 *  machine is in the Addressed state.
-			 *
-			 *  \param[in,out] AudioInterfaceInfo    Pointer to a structure containing an Audio Class host configuration and state.
-			 *  \param[in]     ConfigDescriptorSize  Length of the attached device's Configuration Descriptor.
-			 *  \param[in]     ConfigDescriptorData  Pointer to a buffer containing the attached device's Configuration Descriptor.
-			 *
-			 *  \return A value from the \ref AUDIO_Host_EnumerationFailure_ErrorCodes_t enum.
-			 */
-			uint8_t Audio_Host_ConfigurePipes(USB_ClassInfo_Audio_Host_t* const AudioInterfaceInfo,
-			                                  uint16_t ConfigDescriptorSize,
-			                                  void* ConfigDescriptorData) ATTR_NON_NULL_PTR_ARG(1) ATTR_NON_NULL_PTR_ARG(3);
-
-			/** Starts or stops the audio streaming for the given configured Audio Host interface, allowing for audio samples to be
-			 *  send and/or received.
-			 *
-			 *  \param[in,out] AudioInterfaceInfo  Pointer to a structure containing an Audio Class host configuration and state.
-			 *  \param[in]     EnableStreaming     Boolean true to enable streaming of the specified interface, \c false to disable
-			 *
-			 *  \return A value from the \ref USB_Host_SendControlErrorCodes_t enum.
-			 */
-			uint8_t Audio_Host_StartStopStreaming(USB_ClassInfo_Audio_Host_t* const AudioInterfaceInfo,
-			                                      const bool EnableStreaming) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Gets or sets the specified property of a streaming audio class endpoint that is bound to a pipe in the given
-			 *  class instance.
-			 *
-			 *  \param[in,out] AudioInterfaceInfo  Pointer to a structure containing an Audio Class host configuration and state.
-			 *  \param[in]     DataPipeIndex       Index of the data pipe whose bound endpoint is to be altered.
-			 *  \param[in]     EndpointProperty    Property of the endpoint to get or set, a value from \ref Audio_ClassRequests_t.
-			 *  \param[in]     EndpointControl     Parameter of the endpoint to get or set, a value from \ref Audio_EndpointControls_t.
-			 *  \param[in,out] DataLength          For SET operations, the length of the parameter data to set. For GET operations, the maximum
-			 *                                     length of the retrieved data.
-			 *  \param[in,out] Data                Pointer to a location where the parameter data is stored for SET operations, or where
-			 *                                     the retrieved data is to be stored for GET operations.
-			 *
-			 *  \return A value from the \ref USB_Host_SendControlErrorCodes_t enum.
-			 */
-			uint8_t Audio_Host_GetSetEndpointProperty(USB_ClassInfo_Audio_Host_t* const AudioInterfaceInfo,
-			                                          const uint8_t DataPipeIndex,
-			                                          const uint8_t EndpointProperty,
-			                                          const uint8_t EndpointControl,
-			                                          const uint16_t DataLength,
-			                                          void* const Data) ATTR_NON_NULL_PTR_ARG(1) ATTR_NON_NULL_PTR_ARG(6);
-
-		/* Inline Functions: */
-			/** General management task for a given Audio host class interface, required for the correct operation of
-			 *  the interface. This should be called frequently in the main program loop, before the master USB management task
-			 *  \ref USB_USBTask().
-			 *
-			 *  \param[in,out] AudioInterfaceInfo  Pointer to a structure containing an Audio Class host configuration and state.
-			 */
-			static inline void Audio_Host_USBTask(USB_ClassInfo_Audio_Host_t* const AudioInterfaceInfo)
-			                                      ATTR_NON_NULL_PTR_ARG(1) ATTR_ALWAYS_INLINE;
-			static inline void Audio_Host_USBTask(USB_ClassInfo_Audio_Host_t* const AudioInterfaceInfo)
-			{
-				(void)AudioInterfaceInfo;
-			}
-
-			/** Determines if the given audio interface is ready for a sample to be read from it, and selects the streaming
-			 *  IN pipe ready for reading.
-			 *
-			 *  \pre This function must only be called when the Host state machine is in the \ref HOST_STATE_Configured state or
-			 *       the call will fail.
-			 *
-			 *  \param[in,out] AudioInterfaceInfo  Pointer to a structure containing an Audio Class configuration and state.
-			 *
-			 *  \return Boolean \c true if the given Audio interface has a sample to be read, \c false otherwise.
-			 */
-			static inline bool Audio_Host_IsSampleReceived(USB_ClassInfo_Audio_Host_t* const AudioInterfaceInfo)
-			                                               ATTR_NON_NULL_PTR_ARG(1) ATTR_ALWAYS_INLINE;
-			static inline bool Audio_Host_IsSampleReceived(USB_ClassInfo_Audio_Host_t* const AudioInterfaceInfo)
-			{
-				if ((USB_HostState != HOST_STATE_Configured) || !(AudioInterfaceInfo->State.IsActive))
-				  return false;
-
-				bool SampleReceived = false;
-
-				Pipe_SelectPipe(AudioInterfaceInfo->Config.DataINPipe.Address);
-				Pipe_Unfreeze();
-				SampleReceived = Pipe_IsINReceived();
-				Pipe_Freeze();
-
-				return SampleReceived;
-			}
-
-			/** Determines if the given audio interface is ready to accept the next sample to be written to it, and selects
-			 *  the streaming OUT pipe ready for writing.
-			 *
-			 *  \pre This function must only be called when the Host state machine is in the \ref HOST_STATE_Configured state or
-			 *       the call will fail.
-			 *
-			 *  \param[in,out] AudioInterfaceInfo  Pointer to a structure containing an Audio Class configuration and state.
-			 *
-			 *  \return Boolean \c true if the given Audio interface is ready to accept the next sample, \c false otherwise.
-			 */
-			static inline bool Audio_Host_IsReadyForNextSample(USB_ClassInfo_Audio_Host_t* const AudioInterfaceInfo)
-			                                                   ATTR_NON_NULL_PTR_ARG(1) ATTR_ALWAYS_INLINE;
-			static inline bool Audio_Host_IsReadyForNextSample(USB_ClassInfo_Audio_Host_t* const AudioInterfaceInfo)
-			{
-				if ((USB_HostState != HOST_STATE_Configured) || !(AudioInterfaceInfo->State.IsActive))
-				  return false;
-
-				Pipe_SelectPipe(AudioInterfaceInfo->Config.DataOUTPipe.Address);
-				return Pipe_IsOUTReady();
-			}
-
-			/** Reads the next 8-bit audio sample from the current audio interface.
-			 *
-			 *  \pre This should be preceded immediately by a call to the \ref Audio_Host_IsSampleReceived() function to ensure
-			 *       that the correct pipe is selected and ready for data.
-			 *
-			 *  \param[in,out] AudioInterfaceInfo  Pointer to a structure containing an Audio Class configuration and state.
-			 *
-			 *  \return  Signed 8-bit audio sample from the audio interface.
-			 */
-			static inline int8_t Audio_Host_ReadSample8(USB_ClassInfo_Audio_Host_t* const AudioInterfaceInfo)
-			                                            ATTR_NON_NULL_PTR_ARG(1) ATTR_ALWAYS_INLINE;
-			static inline int8_t Audio_Host_ReadSample8(USB_ClassInfo_Audio_Host_t* const AudioInterfaceInfo)
-			{
-				int8_t Sample;
-
-				(void)AudioInterfaceInfo;
-
-				Sample = Pipe_Read_8();
-
-				if (!(Pipe_BytesInPipe()))
-				{
-					Pipe_Unfreeze();
-					Pipe_ClearIN();
-					Pipe_Freeze();
-				}
-
-				return Sample;
-			}
-
-			/** Reads the next 16-bit audio sample from the current audio interface.
-			 *
-			 *  \pre This should be preceded immediately by a call to the \ref Audio_Host_IsSampleReceived() function to ensure
-			 *       that the correct pipe is selected and ready for data.
-			 *
-			 *  \param[in,out] AudioInterfaceInfo  Pointer to a structure containing an Audio Class configuration and state.
-			 *
-			 *  \return  Signed 16-bit audio sample from the audio interface.
-			 */
-			static inline int16_t Audio_Host_ReadSample16(USB_ClassInfo_Audio_Host_t* const AudioInterfaceInfo)
-			                                              ATTR_NON_NULL_PTR_ARG(1) ATTR_ALWAYS_INLINE;
-			static inline int16_t Audio_Host_ReadSample16(USB_ClassInfo_Audio_Host_t* const AudioInterfaceInfo)
-			{
-				int16_t Sample;
-
-				(void)AudioInterfaceInfo;
-
-				Sample = (int16_t)Pipe_Read_16_LE();
-
-				if (!(Pipe_BytesInPipe()))
-				{
-					Pipe_Unfreeze();
-					Pipe_ClearIN();
-					Pipe_Freeze();
-				}
-
-				return Sample;
-			}
-
-			/** Reads the next 24-bit audio sample from the current audio interface.
-			 *
-			 *  \pre This should be preceded immediately by a call to the \ref Audio_Host_IsSampleReceived() function to ensure
-			 *       that the correct pipe is selected and ready for data.
-			 *
-			 *  \param[in,out] AudioInterfaceInfo  Pointer to a structure containing an Audio Class configuration and state.
-			 *
-			 *  \return Signed 24-bit audio sample from the audio interface.
-			 */
-			static inline int32_t Audio_Host_ReadSample24(USB_ClassInfo_Audio_Host_t* const AudioInterfaceInfo)
-			                                              ATTR_NON_NULL_PTR_ARG(1) ATTR_ALWAYS_INLINE;
-			static inline int32_t Audio_Host_ReadSample24(USB_ClassInfo_Audio_Host_t* const AudioInterfaceInfo)
-			{
-				int32_t Sample;
-
-				(void)AudioInterfaceInfo;
-
-				Sample = (((uint32_t)Pipe_Read_8() << 16) | Pipe_Read_16_LE());
-
-				if (!(Pipe_BytesInPipe()))
-				{
-					Pipe_Unfreeze();
-					Pipe_ClearIN();
-					Pipe_Freeze();
-				}
-
-				return Sample;
-			}
-
-			/** Writes the next 8-bit audio sample to the current audio interface.
-			 *
-			 *  \pre This should be preceded immediately by a call to the \ref Audio_Host_IsReadyForNextSample() function to
-			 *       ensure that the correct pipe is selected and ready for data.
-			 *
-			 *  \param[in,out] AudioInterfaceInfo  Pointer to a structure containing an Audio Class configuration and state.
-			 *  \param[in]     Sample              Signed 8-bit audio sample.
-			 */
-			static inline void Audio_Host_WriteSample8(USB_ClassInfo_Audio_Host_t* const AudioInterfaceInfo,
-			                                           const int8_t Sample) ATTR_NON_NULL_PTR_ARG(1) ATTR_ALWAYS_INLINE;
-			static inline void Audio_Host_WriteSample8(USB_ClassInfo_Audio_Host_t* const AudioInterfaceInfo,
-			                                           const int8_t Sample)
-			{
-				(void)AudioInterfaceInfo;
-
-				Pipe_Write_8(Sample);
-
-				if (!(Pipe_IsReadWriteAllowed()))
-				{
-					Pipe_Unfreeze();
-					Pipe_ClearOUT();
-					Pipe_WaitUntilReady();
-					Pipe_Freeze();
-				}
-			}
-
-			/** Writes the next 16-bit audio sample to the current audio interface.
-			 *
-			 *  \pre This should be preceded immediately by a call to the \ref Audio_Host_IsReadyForNextSample() function to
-			 *       ensure that the correct pipe is selected and ready for data.
-			 *
-			 *  \param[in,out] AudioInterfaceInfo  Pointer to a structure containing an Audio Class configuration and state.
-			 *  \param[in]     Sample              Signed 16-bit audio sample.
-			 */
-			static inline void Audio_Host_WriteSample16(USB_ClassInfo_Audio_Host_t* const AudioInterfaceInfo,
-			                                            const int16_t Sample) ATTR_NON_NULL_PTR_ARG(1) ATTR_ALWAYS_INLINE;
-			static inline void Audio_Host_WriteSample16(USB_ClassInfo_Audio_Host_t* const AudioInterfaceInfo,
-			                                            const int16_t Sample)
-			{
-				(void)AudioInterfaceInfo;
-
-				Pipe_Write_16_LE(Sample);
-
-				if (!(Pipe_IsReadWriteAllowed()))
-				{
-					Pipe_Unfreeze();
-					Pipe_ClearOUT();
-					Pipe_WaitUntilReady();
-					Pipe_Freeze();
-				}
-			}
-
-			/** Writes the next 24-bit audio sample to the current audio interface.
-			 *
-			 *  \pre This should be preceded immediately by a call to the \ref Audio_Host_IsReadyForNextSample() function to
-			 *       ensure that the correct pipe is selected and ready for data.
-			 *
-			 *  \param[in,out] AudioInterfaceInfo  Pointer to a structure containing an Audio Class configuration and state.
-			 *  \param[in]     Sample              Signed 24-bit audio sample.
-			 */
-			static inline void Audio_Host_WriteSample24(USB_ClassInfo_Audio_Host_t* const AudioInterfaceInfo,
-			                                            const int32_t Sample) ATTR_NON_NULL_PTR_ARG(1) ATTR_ALWAYS_INLINE;
-			static inline void Audio_Host_WriteSample24(USB_ClassInfo_Audio_Host_t* const AudioInterfaceInfo,
-			                                            const int32_t Sample)
-			{
-				(void)AudioInterfaceInfo;
-
-				Pipe_Write_16_LE(Sample);
-				Pipe_Write_8(Sample >> 16);
-
-				if (!(Pipe_IsReadWriteAllowed()))
-				{
-					Pipe_Unfreeze();
-					Pipe_ClearOUT();
-					Pipe_WaitUntilReady();
-					Pipe_Freeze();
-				}
-			}
-
-	/* Private Interface - For use in library only: */
-	#if !defined(__DOXYGEN__)
-		/* Function Prototypes: */
-			#if defined(__INCLUDE_FROM_AUDIO_HOST_C)
-				static uint8_t DCOMP_Audio_Host_NextAudioControlInterface(void* CurrentDescriptor)
-				                                                          ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(1);
-				static uint8_t DCOMP_Audio_Host_NextAudioStreamInterface(void* CurrentDescriptor)
-				                                                         ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(1);
-				static uint8_t DCOMP_Audio_Host_NextAudioInterfaceDataEndpoint(void* CurrentDescriptor)
-				                                                               ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(1);
-			#endif
-	#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Class/Host/CDCClassHost.c b/NativePrograms/LUFA/Drivers/USB/Class/Host/CDCClassHost.c
deleted file mode 100644
index 06ba0ed4ca..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Class/Host/CDCClassHost.c
+++ /dev/null
@@ -1,514 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-#define  __INCLUDE_FROM_USB_DRIVER
-#include "../../Core/USBMode.h"
-
-#if defined(USB_CAN_BE_HOST)
-
-#define  __INCLUDE_FROM_CDC_DRIVER
-#define  __INCLUDE_FROM_CDC_HOST_C
-#include "CDCClassHost.h"
-
-uint8_t CDC_Host_ConfigurePipes(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo,
-                                uint16_t ConfigDescriptorSize,
-                                void* ConfigDescriptorData)
-{
-	USB_Descriptor_Endpoint_t*  DataINEndpoint       = NULL;
-	USB_Descriptor_Endpoint_t*  DataOUTEndpoint      = NULL;
-	USB_Descriptor_Endpoint_t*  NotificationEndpoint = NULL;
-	USB_Descriptor_Interface_t* CDCControlInterface  = NULL;
-
-	memset(&CDCInterfaceInfo->State, 0x00, sizeof(CDCInterfaceInfo->State));
-
-	if (DESCRIPTOR_TYPE(ConfigDescriptorData) != DTYPE_Configuration)
-	  return CDC_ENUMERROR_InvalidConfigDescriptor;
-
-	while (!(DataINEndpoint) || !(DataOUTEndpoint) || !(NotificationEndpoint))
-	{
-		if (!(CDCControlInterface) ||
-		    USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData,
-		                              DCOMP_CDC_Host_NextCDCInterfaceEndpoint) != DESCRIPTOR_SEARCH_COMP_Found)
-		{
-			if (NotificationEndpoint)
-			{
-				if (USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData,
-				                              DCOMP_CDC_Host_NextCDCDataInterface) != DESCRIPTOR_SEARCH_COMP_Found)
-				{
-					return CDC_ENUMERROR_NoCompatibleInterfaceFound;
-				}
-
-				DataINEndpoint  = NULL;
-				DataOUTEndpoint = NULL;
-			}
-			else
-			{
-				if (USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData,
-				                              DCOMP_CDC_Host_NextCDCControlInterface) != DESCRIPTOR_SEARCH_COMP_Found)
-				{
-					return CDC_ENUMERROR_NoCompatibleInterfaceFound;
-				}
-
-				CDCControlInterface = DESCRIPTOR_PCAST(ConfigDescriptorData, USB_Descriptor_Interface_t);
-
-				NotificationEndpoint = NULL;
-			}
-
-			continue;
-		}
-
-		USB_Descriptor_Endpoint_t* EndpointData = DESCRIPTOR_PCAST(ConfigDescriptorData, USB_Descriptor_Endpoint_t);
-
-		if ((EndpointData->EndpointAddress & ENDPOINT_DIR_MASK) == ENDPOINT_DIR_IN)
-		{
-			if ((EndpointData->Attributes & EP_TYPE_MASK) == EP_TYPE_INTERRUPT)
-			  NotificationEndpoint = EndpointData;
-			else
-			  DataINEndpoint = EndpointData;
-		}
-		else
-		{
-			DataOUTEndpoint = EndpointData;
-		}
-	}
-
-	CDCInterfaceInfo->Config.DataINPipe.Size  = le16_to_cpu(DataINEndpoint->EndpointSize);
-	CDCInterfaceInfo->Config.DataINPipe.EndpointAddress = DataINEndpoint->EndpointAddress;
-	CDCInterfaceInfo->Config.DataINPipe.Type  = EP_TYPE_BULK;
-
-	CDCInterfaceInfo->Config.DataOUTPipe.Size = le16_to_cpu(DataOUTEndpoint->EndpointSize);
-	CDCInterfaceInfo->Config.DataOUTPipe.EndpointAddress = DataOUTEndpoint->EndpointAddress;
-	CDCInterfaceInfo->Config.DataOUTPipe.Type = EP_TYPE_BULK;
-
-	CDCInterfaceInfo->Config.NotificationPipe.Size = le16_to_cpu(NotificationEndpoint->EndpointSize);
-	CDCInterfaceInfo->Config.NotificationPipe.EndpointAddress = NotificationEndpoint->EndpointAddress;
-	CDCInterfaceInfo->Config.NotificationPipe.Type = EP_TYPE_INTERRUPT;
-
-	if (!(Pipe_ConfigurePipeTable(&CDCInterfaceInfo->Config.DataINPipe, 1)))
-	  return CDC_ENUMERROR_PipeConfigurationFailed;
-
-	if (!(Pipe_ConfigurePipeTable(&CDCInterfaceInfo->Config.DataOUTPipe, 1)))
-	  return CDC_ENUMERROR_PipeConfigurationFailed;
-
-	if (!(Pipe_ConfigurePipeTable(&CDCInterfaceInfo->Config.NotificationPipe, 1)))
-	  return CDC_ENUMERROR_PipeConfigurationFailed;
-
-	CDCInterfaceInfo->State.ControlInterfaceNumber = CDCControlInterface->InterfaceNumber;
-	CDCInterfaceInfo->State.ControlLineStates.HostToDevice = (CDC_CONTROL_LINE_OUT_RTS | CDC_CONTROL_LINE_OUT_DTR);
-	CDCInterfaceInfo->State.ControlLineStates.DeviceToHost = (CDC_CONTROL_LINE_IN_DCD  | CDC_CONTROL_LINE_IN_DSR);
-	CDCInterfaceInfo->State.IsActive = true;
-
-	return CDC_ENUMERROR_NoError;
-}
-
-static uint8_t DCOMP_CDC_Host_NextCDCControlInterface(void* const CurrentDescriptor)
-{
-	USB_Descriptor_Header_t* Header = DESCRIPTOR_PCAST(CurrentDescriptor, USB_Descriptor_Header_t);
-
-	if (Header->Type == DTYPE_Interface)
-	{
-		USB_Descriptor_Interface_t* Interface = DESCRIPTOR_PCAST(CurrentDescriptor, USB_Descriptor_Interface_t);
-
-		if ((Interface->Class    == CDC_CSCP_CDCClass)    &&
-		    (Interface->SubClass == CDC_CSCP_ACMSubclass) &&
-		    (Interface->Protocol == CDC_CSCP_ATCommandProtocol))
-		{
-			return DESCRIPTOR_SEARCH_Found;
-		}
-	}
-
-	return DESCRIPTOR_SEARCH_NotFound;
-}
-
-static uint8_t DCOMP_CDC_Host_NextCDCDataInterface(void* const CurrentDescriptor)
-{
-	USB_Descriptor_Header_t* Header = DESCRIPTOR_PCAST(CurrentDescriptor, USB_Descriptor_Header_t);
-
-	if (Header->Type == DTYPE_Interface)
-	{
-		USB_Descriptor_Interface_t* Interface = DESCRIPTOR_PCAST(CurrentDescriptor, USB_Descriptor_Interface_t);
-
-		if ((Interface->Class    == CDC_CSCP_CDCDataClass)   &&
-		    (Interface->SubClass == CDC_CSCP_NoDataSubclass) &&
-		    (Interface->Protocol == CDC_CSCP_NoDataProtocol))
-		{
-			return DESCRIPTOR_SEARCH_Found;
-		}
-	}
-
-	return DESCRIPTOR_SEARCH_NotFound;
-}
-
-static uint8_t DCOMP_CDC_Host_NextCDCInterfaceEndpoint(void* const CurrentDescriptor)
-{
-	USB_Descriptor_Header_t* Header = DESCRIPTOR_PCAST(CurrentDescriptor, USB_Descriptor_Header_t);
-
-	if (Header->Type == DTYPE_Endpoint)
-	{
-		USB_Descriptor_Endpoint_t* Endpoint = DESCRIPTOR_PCAST(CurrentDescriptor, USB_Descriptor_Endpoint_t);
-
-		uint8_t EndpointType = (Endpoint->Attributes & EP_TYPE_MASK);
-
-		if (((EndpointType == EP_TYPE_BULK) || (EndpointType == EP_TYPE_INTERRUPT)) &&
-		    !(Pipe_IsEndpointBound(Endpoint->EndpointAddress)))
-		{
-			return DESCRIPTOR_SEARCH_Found;
-		}
-	}
-	else if (Header->Type == DTYPE_Interface)
-	{
-		return DESCRIPTOR_SEARCH_Fail;
-	}
-
-	return DESCRIPTOR_SEARCH_NotFound;
-}
-
-void CDC_Host_USBTask(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo)
-{
-	if ((USB_HostState != HOST_STATE_Configured) || !(CDCInterfaceInfo->State.IsActive))
-	  return;
-
-	Pipe_SelectPipe(CDCInterfaceInfo->Config.NotificationPipe.Address);
-	Pipe_Unfreeze();
-
-	if (Pipe_IsINReceived())
-	{
-		USB_Request_Header_t Notification;
-		Pipe_Read_Stream_LE(&Notification, sizeof(USB_Request_Header_t), NULL);
-
-		if ((Notification.bRequest      == CDC_NOTIF_SerialState) &&
-		    (Notification.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE)))
-		{
-			Pipe_Read_Stream_LE(&CDCInterfaceInfo->State.ControlLineStates.DeviceToHost,
-			                    sizeof(CDCInterfaceInfo->State.ControlLineStates.DeviceToHost),
-			                    NULL);
-
-			Pipe_ClearIN();
-
-			EVENT_CDC_Host_ControLineStateChanged(CDCInterfaceInfo);
-		}
-		else
-		{
-			Pipe_ClearIN();
-		}
-	}
-
-	Pipe_Freeze();
-
-	#if !defined(NO_CLASS_DRIVER_AUTOFLUSH)
-	CDC_Host_Flush(CDCInterfaceInfo);
-	#endif
-}
-
-uint8_t CDC_Host_SetLineEncoding(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo)
-{
-	USB_ControlRequest = (USB_Request_Header_t)
-	{
-		.bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE),
-		.bRequest      = CDC_REQ_SetLineEncoding,
-		.wValue        = 0,
-		.wIndex        = CDCInterfaceInfo->State.ControlInterfaceNumber,
-		.wLength       = sizeof(CDCInterfaceInfo->State.LineEncoding),
-	};
-
-	Pipe_SelectPipe(PIPE_CONTROLPIPE);
-
-	return USB_Host_SendControlRequest(&CDCInterfaceInfo->State.LineEncoding);
-}
-
-uint8_t CDC_Host_SendControlLineStateChange(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo)
-{
-	USB_ControlRequest = (USB_Request_Header_t)
-	{
-		.bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE),
-		.bRequest      = CDC_REQ_SetControlLineState,
-		.wValue        = CDCInterfaceInfo->State.ControlLineStates.HostToDevice,
-		.wIndex        = CDCInterfaceInfo->State.ControlInterfaceNumber,
-		.wLength       = 0,
-	};
-
-	Pipe_SelectPipe(PIPE_CONTROLPIPE);
-
-	return USB_Host_SendControlRequest(NULL);
-}
-
-uint8_t CDC_Host_SendBreak(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo,
-                           const uint8_t Duration)
-{
-	USB_ControlRequest = (USB_Request_Header_t)
-	{
-		.bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE),
-		.bRequest      = CDC_REQ_SendBreak,
-		.wValue        = Duration,
-		.wIndex        = CDCInterfaceInfo->State.ControlInterfaceNumber,
-		.wLength       = 0,
-	};
-
-	Pipe_SelectPipe(PIPE_CONTROLPIPE);
-
-	return USB_Host_SendControlRequest(NULL);
-}
-
-uint8_t CDC_Host_SendString(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo,
-                            const char* const String)
-{
-	if ((USB_HostState != HOST_STATE_Configured) || !(CDCInterfaceInfo->State.IsActive))
-	  return PIPE_READYWAIT_DeviceDisconnected;
-
-	uint8_t ErrorCode;
-
-	Pipe_SelectPipe(CDCInterfaceInfo->Config.DataOUTPipe.Address);
-
-	Pipe_Unfreeze();
-	ErrorCode = Pipe_Write_Stream_LE(String, strlen(String), NULL);
-	Pipe_Freeze();
-
-	return ErrorCode;
-}
-
-uint8_t CDC_Host_SendData(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo,
-                          const void* const Buffer,
-                          const uint16_t Length)
-{
-	if ((USB_HostState != HOST_STATE_Configured) || !(CDCInterfaceInfo->State.IsActive))
-	  return PIPE_READYWAIT_DeviceDisconnected;
-
-	uint8_t ErrorCode;
-
-	Pipe_SelectPipe(CDCInterfaceInfo->Config.DataOUTPipe.Address);
-
-	Pipe_Unfreeze();
-	ErrorCode = Pipe_Write_Stream_LE(Buffer, Length, NULL);
-	Pipe_Freeze();
-
-	return ErrorCode;
-}
-
-#if defined(ARCH_HAS_FLASH_ADDRESS_SPACE)
-	uint8_t CDC_Host_SendString_P(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo,
-	                              const char* const String)
-	{
-		if ((USB_HostState != HOST_STATE_Configured) || !(CDCInterfaceInfo->State.IsActive))
-		  return PIPE_READYWAIT_DeviceDisconnected;
-
-		uint8_t ErrorCode;
-
-		Pipe_SelectPipe(CDCInterfaceInfo->Config.DataOUTPipe.Address);
-
-		Pipe_Unfreeze();
-		ErrorCode = Pipe_Write_PStream_LE(String, strlen_P(String), NULL);
-		Pipe_Freeze();
-
-		return ErrorCode;
-	}
-
-	uint8_t CDC_Host_SendData_P(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo,
-	                            const void* const Buffer,
-	                            const uint16_t Length)
-	{
-		if ((USB_HostState != HOST_STATE_Configured) || !(CDCInterfaceInfo->State.IsActive))
-		  return PIPE_READYWAIT_DeviceDisconnected;
-
-		uint8_t ErrorCode;
-
-		Pipe_SelectPipe(CDCInterfaceInfo->Config.DataOUTPipe.Address);
-
-		Pipe_Unfreeze();
-		ErrorCode = Pipe_Write_PStream_LE(Buffer, Length, NULL);
-		Pipe_Freeze();
-
-		return ErrorCode;
-	}
-#endif
-
-uint8_t CDC_Host_SendByte(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo,
-                          const uint8_t Data)
-{
-	if ((USB_HostState != HOST_STATE_Configured) || !(CDCInterfaceInfo->State.IsActive))
-	  return PIPE_READYWAIT_DeviceDisconnected;
-
-	uint8_t ErrorCode;
-
-	Pipe_SelectPipe(CDCInterfaceInfo->Config.DataOUTPipe.Address);
-	Pipe_Unfreeze();
-
-	if (!(Pipe_IsReadWriteAllowed()))
-	{
-		Pipe_ClearOUT();
-
-		if ((ErrorCode = Pipe_WaitUntilReady()) != PIPE_READYWAIT_NoError)
-		  return ErrorCode;
-	}
-
-	Pipe_Write_8(Data);
-	Pipe_Freeze();
-
-	return PIPE_READYWAIT_NoError;
-}
-
-uint16_t CDC_Host_BytesReceived(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo)
-{
-	if ((USB_HostState != HOST_STATE_Configured) || !(CDCInterfaceInfo->State.IsActive))
-	  return 0;
-
-	Pipe_SelectPipe(CDCInterfaceInfo->Config.DataINPipe.Address);
-	Pipe_Unfreeze();
-
-	if (Pipe_IsINReceived())
-	{
-		if (!(Pipe_BytesInPipe()))
-		{
-			Pipe_ClearIN();
-			Pipe_Freeze();
-			return 0;
-		}
-		else
-		{
-			Pipe_Freeze();
-			return Pipe_BytesInPipe();
-		}
-	}
-	else
-	{
-		Pipe_Freeze();
-
-		return 0;
-	}
-}
-
-int16_t CDC_Host_ReceiveByte(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo)
-{
-	if ((USB_HostState != HOST_STATE_Configured) || !(CDCInterfaceInfo->State.IsActive))
-	  return -1;
-
-	int16_t ReceivedByte = -1;
-
-	Pipe_SelectPipe(CDCInterfaceInfo->Config.DataINPipe.Address);
-	Pipe_Unfreeze();
-
-	if (Pipe_IsINReceived())
-	{
-		if (Pipe_BytesInPipe())
-		  ReceivedByte = Pipe_Read_8();
-
-		if (!(Pipe_BytesInPipe()))
-		  Pipe_ClearIN();
-	}
-
-	Pipe_Freeze();
-
-	return ReceivedByte;
-}
-
-uint8_t CDC_Host_Flush(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo)
-{
-	if ((USB_HostState != HOST_STATE_Configured) || !(CDCInterfaceInfo->State.IsActive))
-	  return PIPE_READYWAIT_DeviceDisconnected;
-
-	uint8_t ErrorCode;
-
-	Pipe_SelectPipe(CDCInterfaceInfo->Config.DataOUTPipe.Address);
-	Pipe_Unfreeze();
-
-	if (!(Pipe_BytesInPipe()))
-	  return PIPE_READYWAIT_NoError;
-
-	bool BankFull = !(Pipe_IsReadWriteAllowed());
-
-	Pipe_ClearOUT();
-
-	if (BankFull)
-	{
-		if ((ErrorCode = Pipe_WaitUntilReady()) != PIPE_READYWAIT_NoError)
-		  return ErrorCode;
-
-		Pipe_ClearOUT();
-	}
-
-	Pipe_Freeze();
-
-	return PIPE_READYWAIT_NoError;
-}
-
-#if defined(FDEV_SETUP_STREAM)
-	void CDC_Host_CreateStream(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo,
-	                           FILE* const Stream)
-	{
-		*Stream = (FILE)FDEV_SETUP_STREAM(CDC_Host_putchar, CDC_Host_getchar, _FDEV_SETUP_RW);
-		fdev_set_udata(Stream, CDCInterfaceInfo);
-	}
-
-	void CDC_Host_CreateBlockingStream(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo,
-	                                   FILE* const Stream)
-	{
-		*Stream = (FILE)FDEV_SETUP_STREAM(CDC_Host_putchar, CDC_Host_getchar_Blocking, _FDEV_SETUP_RW);
-		fdev_set_udata(Stream, CDCInterfaceInfo);
-	}
-
-	static int CDC_Host_putchar(char c,
-	                            FILE* Stream)
-	{
-		return CDC_Host_SendByte((USB_ClassInfo_CDC_Host_t*)fdev_get_udata(Stream), c) ? _FDEV_ERR : 0;
-	}
-
-	static int CDC_Host_getchar(FILE* Stream)
-	{
-		int16_t ReceivedByte = CDC_Host_ReceiveByte((USB_ClassInfo_CDC_Host_t*)fdev_get_udata(Stream));
-
-		if (ReceivedByte < 0)
-		  return _FDEV_EOF;
-
-		return ReceivedByte;
-	}
-
-	static int CDC_Host_getchar_Blocking(FILE* Stream)
-	{
-		int16_t ReceivedByte;
-
-		while ((ReceivedByte = CDC_Host_ReceiveByte((USB_ClassInfo_CDC_Host_t*)fdev_get_udata(Stream))) < 0)
-		{
-			if (USB_HostState == HOST_STATE_Unattached)
-			  return _FDEV_EOF;
-
-			CDC_Host_USBTask((USB_ClassInfo_CDC_Host_t*)fdev_get_udata(Stream));
-			USB_USBTask();
-		}
-
-		return ReceivedByte;
-	}
-#endif
-
-void CDC_Host_Event_Stub(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo)
-{
-
-}
-
-#endif
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Class/Host/CDCClassHost.h b/NativePrograms/LUFA/Drivers/USB/Class/Host/CDCClassHost.h
deleted file mode 100644
index aaab73da2d..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Class/Host/CDCClassHost.h
+++ /dev/null
@@ -1,393 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Host mode driver for the library USB CDC Class driver.
- *
- *  Host mode driver for the library USB CDC Class driver.
- *
- *  \note This file should not be included directly. It is automatically included as needed by the USB module driver
- *        dispatch header located in LUFA/Drivers/USB.h.
- */
-
-/** \ingroup Group_USBClassCDC
- *  \defgroup Group_USBClassCDCHost CDC Class Host Mode Driver
- *
- *  \section Sec_USBClassCDCHost_Dependencies Module Source Dependencies
- *  The following files must be built with any user project that uses this module:
- *    - LUFA/Drivers/USB/Class/Host/CDCClassHost.c <i>(Makefile source module name: LUFA_SRC_USBCLASS)</i>
- *
- *  \section Sec_USBClassCDCHost_ModDescription Module Description
- *  Host Mode USB Class driver framework interface, for the CDC USB Class driver.
- *
- *  @{
- */
-
-#ifndef __CDC_CLASS_HOST_H__
-#define __CDC_CLASS_HOST_H__
-
-	/* Includes: */
-		#include "../../USB.h"
-		#include "../Common/CDCClassCommon.h"
-
-		#include <stdio.h>
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_CDC_DRIVER)
-			#error Do not include this file directly. Include LUFA/Drivers/USB.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Type Defines: */
-			/** \brief CDC Class Host Mode Configuration and State Structure.
-			 *
-			 *  Class state structure. An instance of this structure should be made within the user application,
-			 *  and passed to each of the CDC class driver functions as the \c CDCInterfaceInfo parameter. This
-			 *  stores each CDC interface's configuration and state information.
-			 */
-			typedef struct
-			{
-				struct
-				{
-					USB_Pipe_Table_t DataINPipe; /**< Data IN Pipe configuration table. */
-					USB_Pipe_Table_t DataOUTPipe; /**< Data OUT Pipe configuration table. */
-					USB_Pipe_Table_t NotificationPipe; /**< Notification IN Pipe configuration table. */
-				} Config; /**< Config data for the USB class interface within the device. All elements in this section
-				           *   <b>must</b> be set or the interface will fail to enumerate and operate correctly.
-				           */
-				struct
-				{
-					bool IsActive; /**< Indicates if the current interface instance is connected to an attached device, valid
-					                *   after \ref CDC_Host_ConfigurePipes() is called and the Host state machine is in the
-					                *   Configured state.
-					                */
-					uint8_t  ControlInterfaceNumber; /**< Interface index of the CDC-ACM control interface within the attached device. */
-
-					struct
-					{
-						uint16_t HostToDevice; /**< Control line states from the host to device, as a set of \c CDC_CONTROL_LINE_OUT_*
-						                        *   masks - to notify the device of changes to these values, call the
-						                        *   \ref CDC_Host_SendControlLineStateChange() function.
-						                        */
-						uint16_t DeviceToHost; /**< Control line states from the device to host, as a set of \c CDC_CONTROL_LINE_IN_*
-						                        *   masks. This value is updated each time \ref CDC_Host_USBTask() is called.
-						                        */
-					} ControlLineStates; /**< Current states of the virtual serial port's control lines between the device and host. */
-
-					CDC_LineEncoding_t LineEncoding; /**< Line encoding used in the virtual serial port, for the device's information.
-					                                  *   This is generally only used if the virtual serial port data is to be
-					                                  *   reconstructed on a physical UART. When set by the host application, the
-					                                  *   \ref CDC_Host_SetLineEncoding() function must be called to push the changes
-					                                  *   to the device.
-					                                  */
-				} State; /**< State data for the USB class interface within the device. All elements in this section
-						  *   <b>may</b> be set to initial values, but may also be ignored to default to sane values when
-						  *   the interface is enumerated.
-						  */
-			} USB_ClassInfo_CDC_Host_t;
-
-		/* Enums: */
-			/** Enum for the possible error codes returned by the \ref CDC_Host_ConfigurePipes() function. */
-			enum CDC_Host_EnumerationFailure_ErrorCodes_t
-			{
-				CDC_ENUMERROR_NoError                    = 0, /**< Configuration Descriptor was processed successfully. */
-				CDC_ENUMERROR_InvalidConfigDescriptor    = 1, /**< The device returned an invalid Configuration Descriptor. */
-				CDC_ENUMERROR_NoCompatibleInterfaceFound = 2, /**< A compatible CDC interface was not found in the device's Configuration Descriptor. */
-				CDC_ENUMERROR_PipeConfigurationFailed    = 3, /**< One or more pipes for the specified interface could not be configured correctly. */
-			};
-
-		/* Function Prototypes: */
-			/** General management task for a given CDC host class interface, required for the correct operation of the interface. This should
-			 *  be called frequently in the main program loop, before the master USB management task \ref USB_USBTask().
-			 *
-			 *  \param[in,out] CDCInterfaceInfo  Pointer to a structure containing an CDC Class host configuration and state.
-			 */
-			void CDC_Host_USBTask(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Host interface configuration routine, to configure a given CDC host interface instance using the Configuration
-			 *  Descriptor read from an attached USB device. This function automatically updates the given CDC Host instance's
-			 *  state values and configures the pipes required to communicate with the interface if it is found within the device.
-			 *  This should be called once after the stack has enumerated the attached device, while the host state machine is in
-			 *  the Addressed state.
-			 *
-			 *  \param[in,out] CDCInterfaceInfo      Pointer to a structure containing an CDC Class host configuration and state.
-			 *  \param[in]     ConfigDescriptorSize  Length of the attached device's Configuration Descriptor.
-			 *  \param[in]     ConfigDescriptorData  Pointer to a buffer containing the attached device's Configuration Descriptor.
-			 *
-			 *  \return A value from the \ref CDC_Host_EnumerationFailure_ErrorCodes_t enum.
-			 */
-			uint8_t CDC_Host_ConfigurePipes(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo,
-			                                uint16_t ConfigDescriptorSize,
-			                                void* ConfigDescriptorData) ATTR_NON_NULL_PTR_ARG(1) ATTR_NON_NULL_PTR_ARG(3);
-
-			/** Sets the line encoding for the attached device's virtual serial port. This should be called when the \c LineEncoding
-			 *  values of the interface have been changed to push the new settings to the USB device.
-			 *
-			 *  \param[in,out] CDCInterfaceInfo  Pointer to a structure containing a CDC Class host configuration and state.
-			 *
-			 *  \return A value from the \ref USB_Host_SendControlErrorCodes_t enum.
-			 */
-			uint8_t CDC_Host_SetLineEncoding(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Sends a Serial Control Line State Change notification to the device. This should be called when the virtual serial
-			 *  control lines (DTR, RTS, etc.) have changed states. Line states persist until they are cleared via a second
-			 *  notification. This should be called each time the CDC class driver's \c ControlLineStates.HostToDevice value is updated
-			 *  to push the new states to the USB device.
-			 *
-			 *  \param[in,out] CDCInterfaceInfo  Pointer to a structure containing a CDC Class host configuration and state.
-			 *
-			 *  \return A value from the \ref USB_Host_SendControlErrorCodes_t enum.
-			 */
-			uint8_t CDC_Host_SendControlLineStateChange(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Sends a Send Break request to the device. This is generally used to separate data or to indicate a special condition
-			 *  to the receiving device.
-			 *
-			 *  \param[in,out] CDCInterfaceInfo  Pointer to a structure containing a CDC Class host configuration and state.
-			 *  \param[in]     Duration          Duration of the break, in milliseconds.
-			 *
-			 *  \return A value from the \ref USB_Host_SendControlErrorCodes_t enum.
-			 */
-			uint8_t CDC_Host_SendBreak(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo,
-			                           const uint8_t Duration) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Sends a given null-terminated string to the attached USB device, if connected. If a device is not connected when the
-			 *  function is called, the string is discarded. Bytes will be queued for transmission to the device until either the pipe
-			 *  bank becomes full, or the \ref CDC_Host_Flush() function is called to flush the pending data to the device. This allows
-			 *  for multiple bytes to be packed into a single pipe packet, increasing data throughput.
-			 *
-			 *  \pre This function must only be called when the Host state machine is in the \ref HOST_STATE_Configured state or the
-			 *       call will fail.
-			 *
-			 *  \param[in,out] CDCInterfaceInfo  Pointer to a structure containing a CDC Class host configuration and state.
-			 *  \param[in]     String            Pointer to the null terminated string to send to the device.
-			 *
-			 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t CDC_Host_SendString(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo,
-			                            const char* const String) ATTR_NON_NULL_PTR_ARG(1) ATTR_NON_NULL_PTR_ARG(2);
-
-			/** Sends a given data buffer to the attached USB device, if connected. If a device is not connected when the function is
-			 *  called, the data will be discarded. Bytes will be queued for transmission to the device until either the pipe bank
-			 *  becomes full, or the \ref CDC_Host_Flush() function is called to flush the pending data to the device. This allows for
-			 *  multiple bytes to be packed into a single pipe packet, increasing data throughput.
-			 *
-			 *  \pre This function must only be called when the Host state machine is in the \ref HOST_STATE_Configured state or the
-			 *       call will fail.
-			 *
-			 *  \param[in,out] CDCInterfaceInfo  Pointer to a structure containing a CDC Class host configuration and state.
-			 *  \param[in]     Buffer            Pointer to a buffer containing the data to send to the device.
-			 *  \param[in]     Length            Length of the data to send to the device.
-			 *
-			 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t CDC_Host_SendData(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo,
-			                          const void* const Buffer,
-			                          const uint16_t Length) ATTR_NON_NULL_PTR_ARG(1);
-
-			#if defined(ARCH_HAS_FLASH_ADDRESS_SPACE)
-				/** Sends a given null terminated string from PROGMEM space to the attached USB device, if connected. If a device is not connected
-				 *  when the function is called, the string is discarded. Bytes will be queued for transmission to the device until either
-				 *  the pipe bank becomes full, or the \ref CDC_Host_Flush() function is called to flush the pending data to
-				 *  the device. This allows for multiple bytes to be packed into a single pipe packet, increasing data throughput.
-				 *
-				 *  \pre This function must only be called when the Host state machine is in the \ref HOST_STATE_Configured state or
-				 *       the call will fail.
-				 *
-				 *  \note This function does not exist on architectures that do not have a separate flash memory space.
-				 *
-				 *  \param[in,out] CDCInterfaceInfo  Pointer to a structure containing a CDC Class host configuration and state.
-				 *  \param[in]     String            Pointer to the null terminated string to send to the host.
-				 *
-				 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.
-				 */
-				uint8_t CDC_Host_SendString_P(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo,
-			                                  const char* const String) ATTR_NON_NULL_PTR_ARG(1) ATTR_NON_NULL_PTR_ARG(2);
-			#endif
-
-			#if defined(ARCH_HAS_FLASH_ADDRESS_SPACE)
-				/** Sends a given data buffer from PROGMEM space to the attached USB device, if connected. If a device is not connected when the
-				 *  function is called, the string is discarded. Bytes will be queued for transmission to the host until either the pipe
-				 *  bank becomes full, or the \ref CDC_Host_Flush() function is called to flush the pending data to the device. This allows
-				 *  for multiple bytes to be packed into a single pipe packet, increasing data throughput.
-				 *
-				 *  \pre This function must only be called when the Host state machine is in the \ref HOST_STATE_Configured state or
-				 *       the call will fail.
-				 *
-				 *  \note This function does not exist on architectures that do not have a separate flash memory space.
-				 *
-				 *  \param[in,out] CDCInterfaceInfo  Pointer to a structure containing a CDC Class host configuration and state.
-				 *  \param[in]     Buffer            Pointer to a buffer containing the data to send to the device.
-				 *  \param[in]     Length            Length of the data to send to the host.
-				 *
-				 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.
-				 */
-				uint8_t CDC_Host_SendData_P(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo,
-			                                const void* const Buffer,
-			                                const uint16_t Length) ATTR_NON_NULL_PTR_ARG(1);
-			#endif
-
-			/** Sends a given byte to the attached USB device, if connected. If a device is not connected when the function is called, the
-			 *  byte is discarded. Bytes will be queued for transmission to the device until either the pipe bank becomes full, or the
-			 *  \ref CDC_Host_Flush() function is called to flush the pending data to the host. This allows for multiple bytes to be
-			 *  packed into a single pipe packet, increasing data throughput.
-			 *
-			 *  \pre This function must only be called when the Host state machine is in the \ref HOST_STATE_Configured state or the
-			 *       call will fail.
-			 *
-			 *  \param[in,out] CDCInterfaceInfo  Pointer to a structure containing a CDC Class host configuration and state.
-			 *  \param[in]     Data              Byte of data to send to the device.
-			 *
-			 *  \return A value from the \ref Pipe_WaitUntilReady_ErrorCodes_t enum.
-			 */
-			uint8_t CDC_Host_SendByte(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo,
-			                          const uint8_t Data) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Determines the number of bytes received by the CDC interface from the device, waiting to be read. This indicates the number
-			 *  of bytes in the IN pipe bank only, and thus the number of calls to \ref CDC_Host_ReceiveByte() which are guaranteed to succeed
-			 *  immediately. If multiple bytes are to be received, they should be buffered by the user application, as the pipe bank will not be
-			 *  released back to the USB controller until all bytes are read.
-			 *
-			 *  \pre This function must only be called when the Host state machine is in the \ref HOST_STATE_Configured state or the
-			 *       call will fail.
-			 *
-			 *  \param[in,out] CDCInterfaceInfo  Pointer to a structure containing a CDC Class host configuration and state.
-			 *
-			 *  \return Total number of buffered bytes received from the device.
-			 */
-			uint16_t CDC_Host_BytesReceived(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Reads a byte of data from the device. If no data is waiting to be read of if a USB device is not connected, the function
-			 *  returns a negative value. The \ref CDC_Host_BytesReceived() function may be queried in advance to determine how many bytes
-			 *  are currently buffered in the CDC interface's data receive pipe.
-			 *
-			 *  \pre This function must only be called when the Host state machine is in the \ref HOST_STATE_Configured state or the
-			 *       call will fail.
-			 *
-			 *  \param[in,out] CDCInterfaceInfo  Pointer to a structure containing a CDC Class host configuration and state.
-			 *
-			 *  \return Next received byte from the device, or a negative value if no data received.
-			 */
-			int16_t CDC_Host_ReceiveByte(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Flushes any data waiting to be sent, ensuring that the send buffer is cleared.
-			 *
-			 *  \pre This function must only be called when the Host state machine is in the \ref HOST_STATE_Configured state or the
-			 *       call will fail.
-			 *
-			 *  \param[in,out] CDCInterfaceInfo  Pointer to a structure containing a CDC Class host configuration and state.
-			 *
-			 *  \return A value from the \ref Pipe_WaitUntilReady_ErrorCodes_t enum.
-			 */
-			uint8_t CDC_Host_Flush(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);
-
-			#if defined(FDEV_SETUP_STREAM) || defined(__DOXYGEN__)
-			/** Creates a standard character stream for the given CDC Device instance so that it can be used with all the regular
-			 *  functions in the standard \c <stdio.h> library that accept a \c FILE stream as a destination (e.g. \c fprintf). The created
-			 *  stream is bidirectional and can be used for both input and output functions.
-			 *
-			 *  Reading data from this stream is non-blocking, i.e. in most instances, complete strings cannot be read in by a single
-			 *  fetch, as the endpoint will not be ready at some point in the transmission, aborting the transfer. However, this may
-			 *  be used when the read data is processed byte-per-bye (via \c getc()) or when the user application will implement its own
-			 *  line buffering.
-			 *
-			 *  \note The created stream can be given as \c stdout if desired to direct the standard output from all \c <stdio.h> functions
-			 *        to the given CDC interface.
-			 *        \n\n
-			 *
-			 *  \note This function is not available on all microcontroller architectures.
-			 *
-			 *  \param[in,out] CDCInterfaceInfo  Pointer to a structure containing a CDC Class configuration and state.
-			 *  \param[in,out] Stream            Pointer to a FILE structure where the created stream should be placed.
-			 */
-			void CDC_Host_CreateStream(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo,
-			                           FILE* const Stream) ATTR_NON_NULL_PTR_ARG(1) ATTR_NON_NULL_PTR_ARG(2);
-
-			/** Identical to \ref CDC_Host_CreateStream(), except that reads are blocking until the calling stream function terminates
-			 *  the transfer. While blocking, the USB and CDC service tasks are called repeatedly to maintain USB communications.
-			 *
-			 *  \note This function is not available on all microcontroller architectures.
-			 *
-			 *  \param[in,out] CDCInterfaceInfo  Pointer to a structure containing a CDC Class configuration and state.
-			 *  \param[in,out] Stream            Pointer to a FILE structure where the created stream should be placed.
-			 */
-			void CDC_Host_CreateBlockingStream(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo,
-			                                   FILE* const Stream) ATTR_NON_NULL_PTR_ARG(1)  ATTR_NON_NULL_PTR_ARG(2);
-			#endif
-
-			/** CDC class driver event for a control line state change on a CDC host interface. This event fires each time the device notifies
-			 *  the host of a control line state change (containing the virtual serial control line states, such as DCD) and may be hooked in the
-			 *  user program by declaring a handler function with the same name and parameters listed here. The new control line states
-			 *  are available in the \c ControlLineStates.DeviceToHost value inside the CDC host interface structure passed as a parameter, set as
-			 *  a mask of \c CDC_CONTROL_LINE_IN_* masks.
-			 *
-			 *  \param[in,out] CDCInterfaceInfo  Pointer to a structure containing a CDC Class host configuration and state.
-			 */
-			void EVENT_CDC_Host_ControLineStateChanged(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);
-
-	/* Private Interface - For use in library only: */
-	#if !defined(__DOXYGEN__)
-		/* Function Prototypes: */
-			#if defined(__INCLUDE_FROM_CDC_HOST_C)
-				#if defined(FDEV_SETUP_STREAM)
-				static int CDC_Host_putchar(char c,
-				                            FILE* Stream) ATTR_NON_NULL_PTR_ARG(2);
-				static int CDC_Host_getchar(FILE* Stream) ATTR_NON_NULL_PTR_ARG(1);
-				static int CDC_Host_getchar_Blocking(FILE* Stream) ATTR_NON_NULL_PTR_ARG(1);
-				#endif
-
-				void CDC_Host_Event_Stub(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo);
-
-				void EVENT_CDC_Host_ControLineStateChanged(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo)
-				                                           ATTR_WEAK ATTR_NON_NULL_PTR_ARG(1) ATTR_ALIAS(CDC_Host_Event_Stub);
-
-				static uint8_t DCOMP_CDC_Host_NextCDCControlInterface(void* const CurrentDescriptor)
-				                                                      ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(1);
-				static uint8_t DCOMP_CDC_Host_NextCDCDataInterface(void* const CurrentDescriptor)
-				                                                   ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(1);
-				static uint8_t DCOMP_CDC_Host_NextCDCInterfaceEndpoint(void* const CurrentDescriptor)
-				                                                       ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(1);
-			#endif
-	#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Class/Host/HIDClassHost.c b/NativePrograms/LUFA/Drivers/USB/Class/Host/HIDClassHost.c
deleted file mode 100644
index 2d4acef058..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Class/Host/HIDClassHost.c
+++ /dev/null
@@ -1,400 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-#define  __INCLUDE_FROM_USB_DRIVER
-#include "../../Core/USBMode.h"
-
-#if defined(USB_CAN_BE_HOST)
-
-#define  __INCLUDE_FROM_HID_DRIVER
-#define  __INCLUDE_FROM_HID_HOST_C
-#include "HIDClassHost.h"
-
-uint8_t HID_Host_ConfigurePipes(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo,
-                                uint16_t ConfigDescriptorSize,
-                                void* ConfigDescriptorData)
-{
-	USB_Descriptor_Endpoint_t*  DataINEndpoint  = NULL;
-	USB_Descriptor_Endpoint_t*  DataOUTEndpoint = NULL;
-	USB_Descriptor_Interface_t* HIDInterface    = NULL;
-	USB_HID_Descriptor_HID_t*   HIDDescriptor   = NULL;
-
-	memset(&HIDInterfaceInfo->State, 0x00, sizeof(HIDInterfaceInfo->State));
-
-	if (DESCRIPTOR_TYPE(ConfigDescriptorData) != DTYPE_Configuration)
-	  return HID_ENUMERROR_InvalidConfigDescriptor;
-
-	while (!(DataINEndpoint) || !(DataOUTEndpoint))
-	{
-		if (!(HIDInterface) ||
-		    USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData,
-		                              DCOMP_HID_Host_NextHIDInterfaceEndpoint) != DESCRIPTOR_SEARCH_COMP_Found)
-		{
-			if (DataINEndpoint)
-			  break;
-
-			do
-			{
-				if (USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData,
-				                              DCOMP_HID_Host_NextHIDInterface) != DESCRIPTOR_SEARCH_COMP_Found)
-				{
-					return HID_ENUMERROR_NoCompatibleInterfaceFound;
-				}
-
-				HIDInterface = DESCRIPTOR_PCAST(ConfigDescriptorData, USB_Descriptor_Interface_t);
-			} while (HIDInterfaceInfo->Config.HIDInterfaceProtocol &&
-					 (HIDInterface->Protocol != HIDInterfaceInfo->Config.HIDInterfaceProtocol));
-
-			if (USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData,
-			                              DCOMP_HID_Host_NextHIDDescriptor) != DESCRIPTOR_SEARCH_COMP_Found)
-			{
-				return HID_ENUMERROR_NoCompatibleInterfaceFound;
-			}
-
-			HIDDescriptor = DESCRIPTOR_PCAST(ConfigDescriptorData, USB_HID_Descriptor_HID_t);
-
-			DataINEndpoint  = NULL;
-			DataOUTEndpoint = NULL;
-
-			continue;
-		}
-
-		USB_Descriptor_Endpoint_t* EndpointData = DESCRIPTOR_PCAST(ConfigDescriptorData, USB_Descriptor_Endpoint_t);
-
-		if ((EndpointData->EndpointAddress & ENDPOINT_DIR_MASK) == ENDPOINT_DIR_IN)
-		  DataINEndpoint  = EndpointData;
-		else
-		  DataOUTEndpoint = EndpointData;
-	}
-
-	HIDInterfaceInfo->Config.DataINPipe.Size  = le16_to_cpu(DataINEndpoint->EndpointSize);
-	HIDInterfaceInfo->Config.DataINPipe.EndpointAddress = DataINEndpoint->EndpointAddress;
-	HIDInterfaceInfo->Config.DataINPipe.Type  = EP_TYPE_INTERRUPT;
-
-	if (!(Pipe_ConfigurePipeTable(&HIDInterfaceInfo->Config.DataINPipe, 1)))
-	  return HID_ENUMERROR_PipeConfigurationFailed;
-
-	if (DataOUTEndpoint)
-	{
-		HIDInterfaceInfo->Config.DataOUTPipe.Size = le16_to_cpu(DataOUTEndpoint->EndpointSize);
-		HIDInterfaceInfo->Config.DataOUTPipe.EndpointAddress = DataOUTEndpoint->EndpointAddress;
-		HIDInterfaceInfo->Config.DataOUTPipe.Type = EP_TYPE_INTERRUPT;
-
-		if (!(Pipe_ConfigurePipeTable(&HIDInterfaceInfo->Config.DataOUTPipe, 1)))
-		  return HID_ENUMERROR_PipeConfigurationFailed;
-	}
-
-	HIDInterfaceInfo->State.InterfaceNumber      = HIDInterface->InterfaceNumber;
-	HIDInterfaceInfo->State.HIDReportSize        = LE16_TO_CPU(HIDDescriptor->HIDReportLength);
-	HIDInterfaceInfo->State.DeviceUsesOUTPipe    = DataOUTEndpoint;
-	HIDInterfaceInfo->State.SupportsBootProtocol = (HIDInterface->SubClass != HID_CSCP_NonBootProtocol);
-	HIDInterfaceInfo->State.LargestReportSize    = 8;
-	HIDInterfaceInfo->State.IsActive             = true;
-
-	return HID_ENUMERROR_NoError;
-}
-
-static uint8_t DCOMP_HID_Host_NextHIDInterface(void* const CurrentDescriptor)
-{
-	USB_Descriptor_Header_t* Header = DESCRIPTOR_PCAST(CurrentDescriptor, USB_Descriptor_Header_t);
-
-	if (Header->Type == DTYPE_Interface)
-	{
-		USB_Descriptor_Interface_t* Interface = DESCRIPTOR_PCAST(CurrentDescriptor, USB_Descriptor_Interface_t);
-
-		if (Interface->Class == HID_CSCP_HIDClass)
-		  return DESCRIPTOR_SEARCH_Found;
-	}
-
-	return DESCRIPTOR_SEARCH_NotFound;
-}
-
-static uint8_t DCOMP_HID_Host_NextHIDDescriptor(void* const CurrentDescriptor)
-{
-	USB_Descriptor_Header_t* Header = DESCRIPTOR_PCAST(CurrentDescriptor, USB_Descriptor_Header_t);
-
-	if (Header->Type == HID_DTYPE_HID)
-	  return DESCRIPTOR_SEARCH_Found;
-	else if (Header->Type == DTYPE_Interface)
-	  return DESCRIPTOR_SEARCH_Fail;
-	else
-	  return DESCRIPTOR_SEARCH_NotFound;
-}
-
-static uint8_t DCOMP_HID_Host_NextHIDInterfaceEndpoint(void* const CurrentDescriptor)
-{
-	USB_Descriptor_Header_t* Header = DESCRIPTOR_PCAST(CurrentDescriptor, USB_Descriptor_Header_t);
-
-	if (Header->Type == DTYPE_Endpoint)
-	{
-		USB_Descriptor_Endpoint_t* Endpoint = DESCRIPTOR_PCAST(CurrentDescriptor, USB_Descriptor_Endpoint_t);
-
-		if (!(Pipe_IsEndpointBound(Endpoint->EndpointAddress)))
-		  return DESCRIPTOR_SEARCH_Found;
-	}
-	else if (Header->Type == DTYPE_Interface)
-	{
-		return DESCRIPTOR_SEARCH_Fail;
-	}
-
-	return DESCRIPTOR_SEARCH_NotFound;
-}
-
-#if !defined(HID_HOST_BOOT_PROTOCOL_ONLY)
-uint8_t HID_Host_ReceiveReportByID(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo,
-                                   const uint8_t ReportID,
-                                   void* Buffer)
-{
-	USB_ControlRequest = (USB_Request_Header_t)
-	{
-		.bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE),
-		.bRequest      = HID_REQ_SetReport,
-		.wValue        = ((HID_REPORT_ITEM_In + 1) << 8) | ReportID,
-		.wIndex        = HIDInterfaceInfo->State.InterfaceNumber,
-		.wLength       = USB_GetHIDReportSize(HIDInterfaceInfo->Config.HIDParserData, ReportID, HID_REPORT_ITEM_In),
-	};
-
-	Pipe_SelectPipe(PIPE_CONTROLPIPE);
-
-	return USB_Host_SendControlRequest(Buffer);
-}
-#endif
-
-uint8_t HID_Host_ReceiveReport(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo,
-                               void* Buffer)
-{
-	if ((USB_HostState != HOST_STATE_Configured) || !(HIDInterfaceInfo->State.IsActive))
-	  return PIPE_READYWAIT_DeviceDisconnected;
-
-	uint8_t ErrorCode;
-
-	Pipe_SelectPipe(HIDInterfaceInfo->Config.DataINPipe.Address);
-	Pipe_Unfreeze();
-
-	uint16_t ReportSize;
-	uint8_t* BufferPos = Buffer;
-
-#if !defined(HID_HOST_BOOT_PROTOCOL_ONLY)
-	if (!(HIDInterfaceInfo->State.UsingBootProtocol))
-	{
-		uint8_t ReportID = 0;
-
-		if (HIDInterfaceInfo->Config.HIDParserData->UsingReportIDs)
-		{
-			ReportID = Pipe_Read_8();
-			*(BufferPos++) = ReportID;
-		}
-
-		ReportSize = USB_GetHIDReportSize(HIDInterfaceInfo->Config.HIDParserData, ReportID, HID_REPORT_ITEM_In);
-	}
-	else
-#endif
-	{
-		ReportSize = Pipe_BytesInPipe();
-	}
-
-	if ((ErrorCode = Pipe_Read_Stream_LE(BufferPos, ReportSize, NULL)) != PIPE_RWSTREAM_NoError)
-	  return ErrorCode;
-
-	Pipe_ClearIN();
-	Pipe_Freeze();
-
-	return PIPE_RWSTREAM_NoError;
-}
-
-uint8_t HID_Host_SendReportByID(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo,
-#if !defined(HID_HOST_BOOT_PROTOCOL_ONLY)
-                                const uint8_t ReportID,
-#endif
-                                const uint8_t ReportType,
-                                void* Buffer,
-                                const uint16_t ReportSize)
-{
-#if !defined(HID_HOST_BOOT_PROTOCOL_ONLY)
-	if ((USB_HostState != HOST_STATE_Configured) || !(HIDInterfaceInfo->State.IsActive))
-	  return PIPE_RWSTREAM_NoError;
-
-	if (HIDInterfaceInfo->State.DeviceUsesOUTPipe && (ReportType == HID_REPORT_ITEM_Out))
-	{
-		uint8_t ErrorCode;
-
-		Pipe_SelectPipe(HIDInterfaceInfo->Config.DataOUTPipe.Address);
-		Pipe_Unfreeze();
-
-		if (ReportID)
-		  Pipe_Write_Stream_LE(&ReportID, sizeof(ReportID), NULL);
-
-		if ((ErrorCode = Pipe_Write_Stream_LE(Buffer, ReportSize, NULL)) != PIPE_RWSTREAM_NoError)
-		  return ErrorCode;
-
-		Pipe_ClearOUT();
-		Pipe_Freeze();
-
-		return PIPE_RWSTREAM_NoError;
-	}
-	else
-#endif
-	{
-		USB_ControlRequest = (USB_Request_Header_t)
-		{
-			.bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE),
-			.bRequest      = HID_REQ_SetReport,
-#if !defined(HID_HOST_BOOT_PROTOCOL_ONLY)
-			.wValue        = ((ReportType + 1) << 8) | ReportID,
-#else
-			.wValue        = ((ReportType + 1) << 8),
-#endif
-			.wIndex        = HIDInterfaceInfo->State.InterfaceNumber,
-			.wLength       = ReportSize,
-		};
-
-		Pipe_SelectPipe(PIPE_CONTROLPIPE);
-
-		return USB_Host_SendControlRequest(Buffer);
-	}
-}
-
-bool HID_Host_IsReportReceived(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo)
-{
-	if ((USB_HostState != HOST_STATE_Configured) || !(HIDInterfaceInfo->State.IsActive))
-	  return false;
-
-	bool ReportReceived;
-
-	Pipe_SelectPipe(HIDInterfaceInfo->Config.DataINPipe.Address);
-	Pipe_Unfreeze();
-
-	ReportReceived = Pipe_IsINReceived();
-
-	Pipe_Freeze();
-
-	return ReportReceived;
-}
-
-uint8_t HID_Host_SetBootProtocol(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo)
-{
-	uint8_t ErrorCode;
-
-	if (!(HIDInterfaceInfo->State.SupportsBootProtocol))
-	  return HID_ERROR_LOGICAL;
-
-	USB_ControlRequest = (USB_Request_Header_t)
-		{
-			.bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE),
-			.bRequest      = HID_REQ_SetProtocol,
-			.wValue        = 0,
-			.wIndex        = HIDInterfaceInfo->State.InterfaceNumber,
-			.wLength       = 0,
-		};
-
-	Pipe_SelectPipe(PIPE_CONTROLPIPE);
-
-	if ((ErrorCode = USB_Host_SendControlRequest(NULL)) != HOST_SENDCONTROL_Successful)
-	  return ErrorCode;
-
-	HIDInterfaceInfo->State.LargestReportSize = 8;
-	HIDInterfaceInfo->State.UsingBootProtocol = true;
-
-	return HOST_SENDCONTROL_Successful;
-}
-
-uint8_t HID_Host_SetIdlePeriod(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo,
-                               const uint16_t MS)
-{
-	USB_ControlRequest = (USB_Request_Header_t)
-		{
-			.bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE),
-			.bRequest      = HID_REQ_SetIdle,
-			.wValue        = ((MS << 6) & 0xFF00),
-			.wIndex        = HIDInterfaceInfo->State.InterfaceNumber,
-			.wLength       = 0,
-		};
-
-	Pipe_SelectPipe(PIPE_CONTROLPIPE);
-
-	return USB_Host_SendControlRequest(NULL);
-}
-
-#if !defined(HID_HOST_BOOT_PROTOCOL_ONLY)
-uint8_t HID_Host_SetReportProtocol(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo)
-{
-	uint8_t ErrorCode;
-
-	uint8_t HIDReportData[HIDInterfaceInfo->State.HIDReportSize];
-
-	USB_ControlRequest = (USB_Request_Header_t)
-		{
-			.bmRequestType = (REQDIR_DEVICETOHOST | REQTYPE_STANDARD | REQREC_INTERFACE),
-			.bRequest      = REQ_GetDescriptor,
-			.wValue        = (HID_DTYPE_Report << 8),
-			.wIndex        = HIDInterfaceInfo->State.InterfaceNumber,
-			.wLength       = HIDInterfaceInfo->State.HIDReportSize,
-		};
-
-	Pipe_SelectPipe(PIPE_CONTROLPIPE);
-
-	if ((ErrorCode = USB_Host_SendControlRequest(HIDReportData)) != HOST_SENDCONTROL_Successful)
-	  return ErrorCode;
-
-	if (HIDInterfaceInfo->State.UsingBootProtocol)
-	{
-		USB_ControlRequest = (USB_Request_Header_t)
-			{
-				.bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE),
-				.bRequest      = HID_REQ_SetProtocol,
-				.wValue        = 1,
-				.wIndex        = HIDInterfaceInfo->State.InterfaceNumber,
-				.wLength       = 0,
-			};
-
-		if ((ErrorCode = USB_Host_SendControlRequest(NULL)) != HOST_SENDCONTROL_Successful)
-		  return ErrorCode;
-
-		HIDInterfaceInfo->State.UsingBootProtocol = false;
-	}
-
-	if (HIDInterfaceInfo->Config.HIDParserData == NULL)
-	  return HID_ERROR_LOGICAL;
-
-	if ((ErrorCode = USB_ProcessHIDReport(HIDReportData, HIDInterfaceInfo->State.HIDReportSize,
-	                                      HIDInterfaceInfo->Config.HIDParserData)) != HID_PARSE_Successful)
-	{
-		return HID_ERROR_LOGICAL | ErrorCode;
-	}
-
-	uint16_t LargestReportSizeBits = HIDInterfaceInfo->Config.HIDParserData->LargestReportSizeBits;
-	HIDInterfaceInfo->State.LargestReportSize = (LargestReportSizeBits >> 3) + ((LargestReportSizeBits & 0x07) != 0);
-
-	return 0;
-}
-#endif
-
-#endif
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Class/Host/HIDClassHost.h b/NativePrograms/LUFA/Drivers/USB/Class/Host/HIDClassHost.h
deleted file mode 100644
index 473619a9a2..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Class/Host/HIDClassHost.h
+++ /dev/null
@@ -1,313 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Host mode driver for the library USB HID Class driver.
- *
- *  Host mode driver for the library USB HID Class driver.
- *
- *  \note This file should not be included directly. It is automatically included as needed by the USB module driver
- *        dispatch header located in LUFA/Drivers/USB.h.
- */
-
-/** \ingroup Group_USBClassHID
- *  \defgroup Group_USBClassHIDHost HID Class Host Mode Driver
- *
- *  \section Sec_USBClassHIDHost_Dependencies Module Source Dependencies
- *  The following files must be built with any user project that uses this module:
- *    - LUFA/Drivers/USB/Class/Host/HIDClassHost.c <i>(Makefile source module name: LUFA_SRC_USBCLASS)</i>
- *
- *  \section Sec_USBClassHIDHost_ModDescription Module Description
- *  Host Mode USB Class driver framework interface, for the HID USB Class driver.
- *
- *  @{
- */
-
-#ifndef __HID_CLASS_HOST_H__
-#define __HID_CLASS_HOST_H__
-
-	/* Includes: */
-		#include "../../USB.h"
-		#include "../Common/HIDClassCommon.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_HID_DRIVER)
-			#error Do not include this file directly. Include LUFA/Drivers/USB.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Error code for some HID Host functions, indicating a logical (and not hardware) error. */
-			#define HID_ERROR_LOGICAL              0x80
-
-		/* Type Defines: */
-			/** \brief HID Class Host Mode Configuration and State Structure.
-			 *
-			 *  Class state structure. An instance of this structure should be made within the user application,
-			 *  and passed to each of the HID class driver functions as the \c HIDInterfaceInfo parameter. This
-			 *  stores each HID interface's configuration and state information.
-			 */
-			typedef struct
-			{
-				struct
-				{
-					USB_Pipe_Table_t DataINPipe; /**< Data IN Pipe configuration table. */
-					USB_Pipe_Table_t DataOUTPipe; /**< Data OUT Pipe configuration table. */
-
-					uint8_t  HIDInterfaceProtocol; /**< HID interface protocol value to match against if a specific
-					                                *   boot subclass protocol is required, a protocol value from the
-					                                *   \ref HID_Descriptor_ClassSubclassProtocol_t enum.
-					                                */
-					#if !defined(HID_HOST_BOOT_PROTOCOL_ONLY)
-					HID_ReportInfo_t* HIDParserData; /**< HID parser data to store the parsed HID report data, when boot protocol
-					                                  *   is not used.
-					                                  *
-					                                  *  \note When the \c HID_HOST_BOOT_PROTOCOL_ONLY compile time token is defined,
-					                                  *        this field is unavailable.
-					                                  */
-					#endif
-				} Config; /**< Config data for the USB class interface within the device. All elements in this section
-				           *   <b>must</b> be set or the interface will fail to enumerate and operate correctly.
-				           */
-				struct
-				{
-					bool IsActive; /**< Indicates if the current interface instance is connected to an attached device, valid
-					                *   after \ref HID_Host_ConfigurePipes() is called and the Host state machine is in the
-					                *   Configured state.
-					                */
-					uint8_t InterfaceNumber; /**< Interface index of the HID interface within the attached device. */
-
-					bool SupportsBootProtocol; /**< Indicates if the current interface instance supports the HID Boot
-					                            *   Protocol when enabled via \ref HID_Host_SetBootProtocol().
-					                            */
-					bool DeviceUsesOUTPipe; /**< Indicates if the current interface instance uses a separate OUT data pipe for
-					                         *   OUT reports, or if OUT reports are sent via the control pipe instead.
-					                         */
-					bool UsingBootProtocol; /**< Indicates that the interface is currently initialized in Boot Protocol mode */
-					uint16_t HIDReportSize; /**< Size in bytes of the HID report descriptor in the device. */
-
-					uint8_t LargestReportSize; /**< Largest report the device will send, in bytes. */
-				} State; /**< State data for the USB class interface within the device. All elements in this section
-				          *   <b>may</b> be set to initial values, but may also be ignored to default to sane values when
-				          *   the interface is enumerated.
-				          */
-			} USB_ClassInfo_HID_Host_t;
-
-		/* Enums: */
-			/** Enum for the possible error codes returned by the \ref HID_Host_ConfigurePipes() function. */
-			enum HID_Host_EnumerationFailure_ErrorCodes_t
-			{
-				HID_ENUMERROR_NoError                    = 0, /**< Configuration Descriptor was processed successfully. */
-				HID_ENUMERROR_InvalidConfigDescriptor    = 1, /**< The device returned an invalid Configuration Descriptor. */
-				HID_ENUMERROR_NoCompatibleInterfaceFound = 2, /**< A compatible HID interface was not found in the device's Configuration Descriptor. */
-				HID_ENUMERROR_PipeConfigurationFailed    = 3, /**< One or more pipes for the specified interface could not be configured correctly. */
-			};
-
-		/* Function Prototypes: */
-			/** Host interface configuration routine, to configure a given HID host interface instance using the Configuration
-			 *  Descriptor read from an attached USB device. This function automatically updates the given HID Host instance's
-			 *  state values and configures the pipes required to communicate with the interface if it is found within the
-			 *  device. This should be called once after the stack has enumerated the attached device, while the host state
-			 *  machine is in the Addressed state.
-			 *
-			 *  \attention Once the device pipes are configured, the HID device's reporting protocol <b>must</b> be set via a call
-			 *             to either the \ref HID_Host_SetBootProtocol() or \ref HID_Host_SetReportProtocol() function.
-			 *
-			 *  \param[in,out] HIDInterfaceInfo      Pointer to a structure containing a HID Class host configuration and state.
-			 *  \param[in]     ConfigDescriptorSize  Length of the attached device's Configuration Descriptor.
-			 *  \param[in]     ConfigDescriptorData  Pointer to a buffer containing the attached device's Configuration Descriptor.
-			 *
-			 *  \return A value from the \ref HID_Host_EnumerationFailure_ErrorCodes_t enum.
-			 */
-			uint8_t HID_Host_ConfigurePipes(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo,
-			                                uint16_t ConfigDescriptorSize,
-			                                void* ConfigDescriptorData) ATTR_NON_NULL_PTR_ARG(1) ATTR_NON_NULL_PTR_ARG(3);
-
-
-			/** Receives a HID IN report from the attached HID device, when a report has been received on the HID IN Data pipe.
-			 *
-			 *  \pre This function must only be called when the Host state machine is in the \ref HOST_STATE_Configured state or the
-			 *       call will fail.
-			 *
-			 *  \attention The destination buffer should be large enough to accommodate the largest report that the attached device
-			 *             can generate.
-			 *
-			 *  \param[in,out] HIDInterfaceInfo  Pointer to a structure containing a HID Class host configuration and state.
-			 *  \param[in]     Buffer            Buffer to store the received report into.
-			 *
-			 *  \return An error code from the \ref Pipe_Stream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t HID_Host_ReceiveReport(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo,
-			                               void* Buffer) ATTR_NON_NULL_PTR_ARG(1) ATTR_NON_NULL_PTR_ARG(2);
-
-			#if !defined(HID_HOST_BOOT_PROTOCOL_ONLY)
-			/** Receives a HID IN report from the attached device, by the report ID.
-			 *
-			 *  \pre This function must only be called when the Host state machine is in the \ref HOST_STATE_Configured state or the
-			 *       call will fail.
-			 *
-			 *  \note When the \c HID_HOST_BOOT_PROTOCOL_ONLY compile time token is defined, this method is unavailable.
-			 *
-			 *  \param[in,out] HIDInterfaceInfo  Pointer to a structure containing a HID Class host configuration and state.
-			 *  \param[in]     ReportID          Report ID of the received report if ControlRequest is false, set by the to the Report ID to fetch.
-			 *  \param[in]     Buffer            Buffer to store the received report into.
-			 *
-			 *  \return A value from the \ref USB_Host_SendControlErrorCodes_t enum.
-			 */
-			uint8_t HID_Host_ReceiveReportByID(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo,
-			                                   const uint8_t ReportID,
-			                                   void* Buffer) ATTR_NON_NULL_PTR_ARG(1) ATTR_NON_NULL_PTR_ARG(3);
-			#endif
-
-			/** Sends an OUT or FEATURE report to the currently attached HID device, using the device's OUT pipe if available,
-			 *  or the device's Control pipe if not.
-			 *
-			 *  \pre This function must only be called when the Host state machine is in the \ref HOST_STATE_Configured state or the
-			 *       call will fail.
-			 *
-			 *  \note When the \c HID_HOST_BOOT_PROTOCOL_ONLY compile time token is defined, the ReportID parameter is removed
-			 *        from the parameter list of this function.
-			 *
-			 *  \param[in,out] HIDInterfaceInfo  Pointer to a structure containing a HID Class host configuration and state.
-			 *  \param[in]     ReportID          Report ID of the report to send to the device, or 0 if the device does not use report IDs.
-			 *  \param[in]     ReportType        Type of report to issue to the device, either \ref HID_REPORT_ITEM_Out or \ref HID_REPORT_ITEM_Feature.
-			 *  \param[in]     Buffer            Buffer containing the report to send to the attached device.
-			 *  \param[in]     ReportSize        Report size in bytes to send to the attached device.
-			 *
-			 *  \return An error code from the \ref USB_Host_SendControlErrorCodes_t enum if the DeviceUsesOUTPipe flag is set in
-			 *          the interface's state structure, a value from the \ref Pipe_Stream_RW_ErrorCodes_t enum otherwise.
-			 */
-			uint8_t HID_Host_SendReportByID(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo,
-			#if !defined(HID_HOST_BOOT_PROTOCOL_ONLY)
-			                                const uint8_t ReportID,
-			#endif
-			                                const uint8_t ReportType,
-			                                void* Buffer,
-			                                const uint16_t ReportSize) ATTR_NON_NULL_PTR_ARG(1)
-			#if !defined(HID_HOST_BOOT_PROTOCOL_ONLY)
-			                                ATTR_NON_NULL_PTR_ARG(4);
-			#else
-			                                ATTR_NON_NULL_PTR_ARG(3);
-			#endif
-
-			/** Determines if a HID IN report has been received from the attached device on the data IN pipe.
-			 *
-			 *  \pre This function must only be called when the Host state machine is in the \ref HOST_STATE_Configured state or the
-			 *       call will fail.
-			 *
-			 *  \param[in,out] HIDInterfaceInfo  Pointer to a structure containing a HID Class host configuration and state.
-			 *
-			 *  \return Boolean \c true if a report has been received, \c false otherwise.
-			 */
-			bool HID_Host_IsReportReceived(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Switches the attached HID device's reporting protocol over to the Boot Report protocol mode, on supported devices.
-			 *
-			 *  \note When the \c HID_HOST_BOOT_PROTOCOL_ONLY compile time token is defined, this method must still be called
-			 *        to explicitly place the attached device into boot protocol mode before use.
-			 *
-			 *  \param[in,out] HIDInterfaceInfo  Pointer to a structure containing a HID Class host configuration and state.
-			 *
-			 *  \return \ref HID_ERROR_LOGICAL if the device does not support Boot Protocol mode, a value from the
-			 *          \ref USB_Host_SendControlErrorCodes_t enum otherwise.
-			 */
-			uint8_t HID_Host_SetBootProtocol(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Sets the idle period for the attached HID device to the specified interval. The HID idle period determines the rate
-			 *  at which the device should send a report, when no state changes have occurred; i.e. on HID keyboards, this sets the
-			 *  hardware key repeat interval.
-			 *
-			 *  \param[in,out] HIDInterfaceInfo  Pointer to a structure containing a HID Class host configuration and state.
-			 *  \param[in]     MS                Idle period as a multiple of four milliseconds, zero to disable hardware repeats
-			 *
-			 *  \return A value from the \ref USB_Host_SendControlErrorCodes_t enum.
-			 */
-			uint8_t HID_Host_SetIdlePeriod(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo,
-			                               const uint16_t MS) ATTR_NON_NULL_PTR_ARG(1);
-
-			#if !defined(HID_HOST_BOOT_PROTOCOL_ONLY)
-			/** Switches the attached HID device's reporting protocol over to the standard Report protocol mode. This also retrieves
-			 *  and parses the device's HID report descriptor, so that the size of each report can be determined in advance.
-			 *
-			 *  \attention Whether this function is used or not, the \ref CALLBACK_HIDParser_FilterHIDReportItem() callback from the HID
-			 *             Report Parser this function references <b>must</b> be implemented in the user code.
-			 *
-			 *  \note When the \c HID_HOST_BOOT_PROTOCOL_ONLY compile time token is defined, this method is unavailable.
-			 *
-			 *  \param[in,out] HIDInterfaceInfo  Pointer to a structure containing a HID Class host configuration and state.
-			 *
-			 *  \return A value from the \ref USB_Host_SendControlErrorCodes_t enum if an error occurs while retrieving the HID
-			 *          Report descriptor or the setting of the Report protocol, \ref HID_ERROR_LOGICAL if the HID interface does
-			 *          not have a valid \ref HID_ReportInfo_t structure set in its configuration, a mask of \ref HID_ERROR_LOGICAL
-			 *          and a value from the \ref HID_Parse_ErrorCodes_t otherwise.
-			 */
-			uint8_t HID_Host_SetReportProtocol(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);
-			#endif
-
-		/* Inline Functions: */
-			/** General management task for a given Human Interface Class host class interface, required for the correct operation of
-			 *  the interface. This should be called frequently in the main program loop, before the master USB management task
-			 *  \ref USB_USBTask().
-			 *
-			 *  \param[in,out] HIDInterfaceInfo  Pointer to a structure containing a HID Class host configuration and state.
-			 */
-			static inline void HID_Host_USBTask(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);
-			static inline void HID_Host_USBTask(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo)
-			{
-				(void)HIDInterfaceInfo;
-			}
-
-	/* Private Interface - For use in library only: */
-	#if !defined(__DOXYGEN__)
-		/* Function Prototypes: */
-			#if defined(__INCLUDE_FROM_HID_HOST_C)
-				static uint8_t DCOMP_HID_Host_NextHIDInterface(void* const CurrentDescriptor)
-				                                               ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(1);
-				static uint8_t DCOMP_HID_Host_NextHIDDescriptor(void* const CurrentDescriptor)
-				                                                ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(1);
-				static uint8_t DCOMP_HID_Host_NextHIDInterfaceEndpoint(void* const CurrentDescriptor)
-				                                                       ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(1);
-			#endif
-	#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Class/Host/MIDIClassHost.c b/NativePrograms/LUFA/Drivers/USB/Class/Host/MIDIClassHost.c
deleted file mode 100644
index d34d9e184a..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Class/Host/MIDIClassHost.c
+++ /dev/null
@@ -1,231 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-#define  __INCLUDE_FROM_USB_DRIVER
-#include "../../Core/USBMode.h"
-
-#if defined(USB_CAN_BE_HOST)
-
-#define  __INCLUDE_FROM_MIDI_DRIVER
-#define  __INCLUDE_FROM_MIDI_HOST_C
-#include "MIDIClassHost.h"
-
-uint8_t MIDI_Host_ConfigurePipes(USB_ClassInfo_MIDI_Host_t* const MIDIInterfaceInfo,
-                                 uint16_t ConfigDescriptorSize,
-                                 void* ConfigDescriptorData)
-{
-	USB_Descriptor_Endpoint_t*  DataINEndpoint  = NULL;
-	USB_Descriptor_Endpoint_t*  DataOUTEndpoint = NULL;
-	USB_Descriptor_Interface_t* MIDIInterface   = NULL;
-
-	memset(&MIDIInterfaceInfo->State, 0x00, sizeof(MIDIInterfaceInfo->State));
-
-	if (DESCRIPTOR_TYPE(ConfigDescriptorData) != DTYPE_Configuration)
-	  return MIDI_ENUMERROR_InvalidConfigDescriptor;
-
-	while (!(DataINEndpoint) || !(DataOUTEndpoint))
-	{
-		if (!(MIDIInterface) ||
-		    USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData,
-		                              DCOMP_MIDI_Host_NextMIDIStreamingDataEndpoint) != DESCRIPTOR_SEARCH_COMP_Found)
-		{
-			if (USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData,
-			                              DCOMP_MIDI_Host_NextMIDIStreamingInterface) != DESCRIPTOR_SEARCH_COMP_Found)
-			{
-				return MIDI_ENUMERROR_NoCompatibleInterfaceFound;
-			}
-
-			MIDIInterface = DESCRIPTOR_PCAST(ConfigDescriptorData, USB_Descriptor_Interface_t);
-
-			DataINEndpoint  = NULL;
-			DataOUTEndpoint = NULL;
-
-			continue;
-		}
-
-		USB_Descriptor_Endpoint_t* EndpointData = DESCRIPTOR_PCAST(ConfigDescriptorData, USB_Descriptor_Endpoint_t);
-
-		if ((EndpointData->EndpointAddress & ENDPOINT_DIR_MASK) == ENDPOINT_DIR_IN)
-		  DataINEndpoint  = EndpointData;
-		else
-		  DataOUTEndpoint = EndpointData;
-	}
-
-	MIDIInterfaceInfo->Config.DataINPipe.Size  = le16_to_cpu(DataINEndpoint->EndpointSize);
-	MIDIInterfaceInfo->Config.DataINPipe.EndpointAddress = DataINEndpoint->EndpointAddress;
-	MIDIInterfaceInfo->Config.DataINPipe.Type  = EP_TYPE_BULK;
-
-	MIDIInterfaceInfo->Config.DataOUTPipe.Size = le16_to_cpu(DataOUTEndpoint->EndpointSize);
-	MIDIInterfaceInfo->Config.DataOUTPipe.EndpointAddress = DataOUTEndpoint->EndpointAddress;
-	MIDIInterfaceInfo->Config.DataOUTPipe.Type = EP_TYPE_BULK;
-
-	if (!(Pipe_ConfigurePipeTable(&MIDIInterfaceInfo->Config.DataINPipe, 1)))
-	  return MIDI_ENUMERROR_PipeConfigurationFailed;
-
-	if (!(Pipe_ConfigurePipeTable(&MIDIInterfaceInfo->Config.DataOUTPipe, 1)))
-	  return MIDI_ENUMERROR_PipeConfigurationFailed;
-
-	MIDIInterfaceInfo->State.InterfaceNumber = MIDIInterface->InterfaceNumber;
-	MIDIInterfaceInfo->State.IsActive = true;
-
-	return MIDI_ENUMERROR_NoError;
-}
-
-static uint8_t DCOMP_MIDI_Host_NextMIDIStreamingInterface(void* const CurrentDescriptor)
-{
-	USB_Descriptor_Header_t* Header = DESCRIPTOR_PCAST(CurrentDescriptor, USB_Descriptor_Header_t);
-
-	if (Header->Type == DTYPE_Interface)
-	{
-		USB_Descriptor_Interface_t* Interface = DESCRIPTOR_PCAST(CurrentDescriptor, USB_Descriptor_Interface_t);
-
-		if ((Interface->Class    == AUDIO_CSCP_AudioClass)            &&
-		    (Interface->SubClass == AUDIO_CSCP_MIDIStreamingSubclass) &&
-		    (Interface->Protocol == AUDIO_CSCP_StreamingProtocol))
-		{
-			return DESCRIPTOR_SEARCH_Found;
-		}
-	}
-
-	return DESCRIPTOR_SEARCH_NotFound;
-}
-
-static uint8_t DCOMP_MIDI_Host_NextMIDIStreamingDataEndpoint(void* const CurrentDescriptor)
-{
-	USB_Descriptor_Header_t* Header = DESCRIPTOR_PCAST(CurrentDescriptor, USB_Descriptor_Header_t);
-
-	if (Header->Type == DTYPE_Endpoint)
-	{
-		USB_Descriptor_Endpoint_t* Endpoint = DESCRIPTOR_PCAST(CurrentDescriptor, USB_Descriptor_Endpoint_t);
-
-		uint8_t EndpointType = (Endpoint->Attributes & EP_TYPE_MASK);
-
-		if ((EndpointType == EP_TYPE_BULK) && !(Pipe_IsEndpointBound(Endpoint->EndpointAddress)))
-		  return DESCRIPTOR_SEARCH_Found;
-	}
-	else if (Header->Type == DTYPE_Interface)
-	{
-		return DESCRIPTOR_SEARCH_Fail;
-	}
-
-	return DESCRIPTOR_SEARCH_NotFound;
-}
-
-void MIDI_Host_USBTask(USB_ClassInfo_MIDI_Host_t* const MIDIInterfaceInfo)
-{
-	if ((USB_HostState != HOST_STATE_Configured) || !(MIDIInterfaceInfo->State.IsActive))
-	  return;
-
-	#if !defined(NO_CLASS_DRIVER_AUTOFLUSH)
-	MIDI_Host_Flush(MIDIInterfaceInfo);
-	#endif
-}
-
-uint8_t MIDI_Host_Flush(USB_ClassInfo_MIDI_Host_t* const MIDIInterfaceInfo)
-{
-	if ((USB_HostState != HOST_STATE_Configured) || !(MIDIInterfaceInfo->State.IsActive))
-	  return PIPE_RWSTREAM_DeviceDisconnected;
-
-	uint8_t ErrorCode;
-
-	Pipe_SelectPipe(MIDIInterfaceInfo->Config.DataOUTPipe.Address);
-	Pipe_Unfreeze();
-
-	if (Pipe_BytesInPipe())
-	{
-		Pipe_ClearOUT();
-
-		if ((ErrorCode = Pipe_WaitUntilReady()) != PIPE_READYWAIT_NoError)
-		{
-			Pipe_Freeze();
-			return ErrorCode;
-		}
-	}
-
-	Pipe_Freeze();
-
-	return PIPE_READYWAIT_NoError;
-}
-
-uint8_t MIDI_Host_SendEventPacket(USB_ClassInfo_MIDI_Host_t* const MIDIInterfaceInfo,
-                                  MIDI_EventPacket_t* const Event)
-{
-	if ((USB_HostState != HOST_STATE_Configured) || !(MIDIInterfaceInfo->State.IsActive))
-	  return HOST_SENDCONTROL_DeviceDisconnected;
-
-	uint8_t ErrorCode;
-
-	Pipe_SelectPipe(MIDIInterfaceInfo->Config.DataOUTPipe.Address);
-	Pipe_Unfreeze();
-
-	if ((ErrorCode = Pipe_Write_Stream_LE(Event, sizeof(MIDI_EventPacket_t), NULL)) != PIPE_RWSTREAM_NoError)
-	{
-		Pipe_Freeze();
-		return ErrorCode;
-	}
-
-	if (!(Pipe_IsReadWriteAllowed()))
-	  Pipe_ClearOUT();
-
-	Pipe_Freeze();
-
-	return PIPE_RWSTREAM_NoError;
-}
-
-bool MIDI_Host_ReceiveEventPacket(USB_ClassInfo_MIDI_Host_t* const MIDIInterfaceInfo,
-                                  MIDI_EventPacket_t* const Event)
-{
-	if ((USB_HostState != HOST_STATE_Configured) || !(MIDIInterfaceInfo->State.IsActive))
-	  return HOST_SENDCONTROL_DeviceDisconnected;
-
-	bool DataReady = false;
-
-	Pipe_SelectPipe(MIDIInterfaceInfo->Config.DataINPipe.Address);
-	Pipe_Unfreeze();
-
-	if (Pipe_IsINReceived())
-	{
-		if (Pipe_BytesInPipe())
-		{
-			Pipe_Read_Stream_LE(Event, sizeof(MIDI_EventPacket_t), NULL);
-			DataReady = true;
-		}
-
-		if (!(Pipe_BytesInPipe()))
-		  Pipe_ClearIN();
-	}
-
-	Pipe_Freeze();
-
-	return DataReady;
-}
-
-#endif
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Class/Host/MIDIClassHost.h b/NativePrograms/LUFA/Drivers/USB/Class/Host/MIDIClassHost.h
deleted file mode 100644
index 6a69987cbd..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Class/Host/MIDIClassHost.h
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Host mode driver for the library USB MIDI Class driver.
- *
- *  Host mode driver for the library USB MIDI Class driver.
- *
- *  \note This file should not be included directly. It is automatically included as needed by the USB module driver
- *        dispatch header located in LUFA/Drivers/USB.h.
- */
-
-/** \ingroup Group_USBClassMIDI
- *  \defgroup Group_USBClassMIDIHost MIDI Class Host Mode Driver
- *
- *  \section Sec_USBClassMIDIHost_Dependencies Module Source Dependencies
- *  The following files must be built with any user project that uses this module:
- *    - LUFA/Drivers/USB/Class/Host/MIDIClassHost.c <i>(Makefile source module name: LUFA_SRC_USBCLASS)</i>
- *
- *  \section Sec_USBClassMIDIHost_ModDescription Module Description
- *  Host Mode USB Class driver framework interface, for the MIDI USB Class driver.
- *
- *  @{
- */
-
-#ifndef __MIDI_CLASS_HOST_H__
-#define __MIDI_CLASS_HOST_H__
-
-	/* Includes: */
-		#include "../../USB.h"
-		#include "../Common/MIDIClassCommon.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_MIDI_DRIVER)
-			#error Do not include this file directly. Include LUFA/Drivers/USB.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Type Defines: */
-			/** \brief MIDI Class Host Mode Configuration and State Structure.
-			 *
-			 *  Class state structure. An instance of this structure should be made within the user application,
-			 *  and passed to each of the MIDI class driver functions as the \c MIDIInterfaceInfo parameter. This
-			 *  stores each MIDI interface's configuration and state information.
-			 */
-			typedef struct
-			{
-				struct
-				{
-					USB_Pipe_Table_t DataINPipe; /**< Data IN Pipe configuration table. */
-					USB_Pipe_Table_t DataOUTPipe; /**< Data OUT Pipe configuration table. */
-				} Config; /**< Config data for the USB class interface within the device. All elements in this section
-				           *   <b>must</b> be set or the interface will fail to enumerate and operate correctly.
-				           */
-				struct
-				{
-					bool     IsActive; /**< Indicates if the current interface instance is connected to an attached device, valid
-					                    *   after \ref MIDI_Host_ConfigurePipes() is called and the Host state machine is in the
-					                    *   Configured state.
-					                    */
-					uint8_t  InterfaceNumber; /**< Interface index of the MIDI interface within the attached device. */
-				} State; /**< State data for the USB class interface within the device. All elements in this section
-						  *   <b>may</b> be set to initial values, but may also be ignored to default to sane values when
-						  *   the interface is enumerated.
-						  */
-			} USB_ClassInfo_MIDI_Host_t;
-
-		/* Enums: */
-			/** Enum for the possible error codes returned by the \ref MIDI_Host_ConfigurePipes() function. */
-			enum MIDI_Host_EnumerationFailure_ErrorCodes_t
-			{
-				MIDI_ENUMERROR_NoError                    = 0, /**< Configuration Descriptor was processed successfully. */
-				MIDI_ENUMERROR_InvalidConfigDescriptor    = 1, /**< The device returned an invalid Configuration Descriptor. */
-				MIDI_ENUMERROR_NoCompatibleInterfaceFound = 2, /**< A compatible MIDI interface was not found in the device's Configuration Descriptor. */
-				MIDI_ENUMERROR_PipeConfigurationFailed    = 3, /**< One or more pipes for the specified interface could not be configured correctly. */
-			};
-
-		/* Function Prototypes: */
-			/** Host interface configuration routine, to configure a given MIDI host interface instance using the Configuration
-			 *  Descriptor read from an attached USB device. This function automatically updates the given MIDI Host instance's
-			 *  state values and configures the pipes required to communicate with the interface if it is found within the device.
-			 *  This should be called once after the stack has enumerated the attached device, while the host state machine is in
-			 *  the Addressed state.
-			 *
-			 *  \param[in,out] MIDIInterfaceInfo     Pointer to a structure containing an MIDI Class host configuration and state.
-			 *  \param[in]     ConfigDescriptorSize  Length of the attached device's Configuration Descriptor.
-			 *  \param[in]     ConfigDescriptorData  Pointer to a buffer containing the attached device's Configuration Descriptor.
-			 *
-			 *  \return A value from the \ref MIDI_Host_EnumerationFailure_ErrorCodes_t enum.
-			 */
-			uint8_t MIDI_Host_ConfigurePipes(USB_ClassInfo_MIDI_Host_t* const MIDIInterfaceInfo,
-			                                 uint16_t ConfigDescriptorSize,
-			                                 void* ConfigDescriptorData) ATTR_NON_NULL_PTR_ARG(1) ATTR_NON_NULL_PTR_ARG(3);
-
-			/** General management task for a given MIDI host class interface, required for the correct operation of the interface. This should
-			 *  be called frequently in the main program loop, before the master USB management task \ref USB_USBTask().
-			 *
-			 *  \param[in,out] MIDIInterfaceInfo  Pointer to a structure containing an MIDI Class host configuration and state.
-			 */
-			void MIDI_Host_USBTask(USB_ClassInfo_MIDI_Host_t* const MIDIInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Sends a MIDI event packet to the device. If no device is connected, the event packet is discarded.
-			 *
-			 *  \pre This function must only be called when the Host state machine is in the \ref HOST_STATE_Configured state or the
-			 *       call will fail.
-			 *
-			 *  \param[in,out] MIDIInterfaceInfo  Pointer to a structure containing a MIDI Class configuration and state.
-			 *  \param[in]     Event              Pointer to a populated USB_MIDI_EventPacket_t structure containing the MIDI event to send.
-			 *
-			 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t MIDI_Host_SendEventPacket(USB_ClassInfo_MIDI_Host_t* const MIDIInterfaceInfo,
-			                                  MIDI_EventPacket_t* const Event) ATTR_NON_NULL_PTR_ARG(1) ATTR_NON_NULL_PTR_ARG(2);
-
-			/** Flushes the MIDI send buffer, sending any queued MIDI events to the device. This should be called to override the
-			 *  \ref MIDI_Host_SendEventPacket() function's packing behavior, to flush queued events. Events are queued into the
-			 *  pipe bank until either the pipe bank is full, or \ref MIDI_Host_Flush() is called. This allows for multiple MIDI
-			 *  events to be packed into a single pipe packet, increasing data throughput.
-			 *
-			 *  \param[in,out] MIDIInterfaceInfo  Pointer to a structure containing a MIDI Class configuration and state.
-			 *
-			 *  \return A value from the \ref Pipe_WaitUntilReady_ErrorCodes_t enum.
-			 */
-			 uint8_t MIDI_Host_Flush(USB_ClassInfo_MIDI_Host_t* const MIDIInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Receives a MIDI event packet from the device.
-			 *
-			 *  \pre This function must only be called when the Host state machine is in the \ref HOST_STATE_Configured state or the
-			 *       call will fail.
-			 *
-			 *  \param[in,out] MIDIInterfaceInfo  Pointer to a structure containing a MIDI Class configuration and state.
-			 *  \param[out]    Event              Pointer to a USB_MIDI_EventPacket_t structure where the received MIDI event is to be placed.
-			 *
-			 *  \return Boolean \c true if a MIDI event packet was received, \c false otherwise.
-			 */
-			bool MIDI_Host_ReceiveEventPacket(USB_ClassInfo_MIDI_Host_t* const MIDIInterfaceInfo,
-			                                  MIDI_EventPacket_t* const Event) ATTR_NON_NULL_PTR_ARG(1) ATTR_NON_NULL_PTR_ARG(2);
-
-	/* Private Interface - For use in library only: */
-	#if !defined(__DOXYGEN__)
-		/* Function Prototypes: */
-			#if defined(__INCLUDE_FROM_MIDI_HOST_C)
-				static uint8_t DCOMP_MIDI_Host_NextMIDIStreamingInterface(void* const CurrentDescriptor)
-				                                                          ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(1);
-				static uint8_t DCOMP_MIDI_Host_NextMIDIStreamingDataEndpoint(void* const CurrentDescriptor)
-				                                                             ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(1);
-			#endif
-	#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Class/Host/MassStorageClassHost.c b/NativePrograms/LUFA/Drivers/USB/Class/Host/MassStorageClassHost.c
deleted file mode 100644
index b085dd4581..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Class/Host/MassStorageClassHost.c
+++ /dev/null
@@ -1,579 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-#define  __INCLUDE_FROM_USB_DRIVER
-#include "../../Core/USBMode.h"
-
-#if defined(USB_CAN_BE_HOST)
-
-#define  __INCLUDE_FROM_MS_DRIVER
-#define  __INCLUDE_FROM_MASSSTORAGE_HOST_C
-#include "MassStorageClassHost.h"
-
-uint8_t MS_Host_ConfigurePipes(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo,
-                               uint16_t ConfigDescriptorSize,
-							   void* ConfigDescriptorData)
-{
-	USB_Descriptor_Endpoint_t*  DataINEndpoint       = NULL;
-	USB_Descriptor_Endpoint_t*  DataOUTEndpoint      = NULL;
-	USB_Descriptor_Interface_t* MassStorageInterface = NULL;
-
-	memset(&MSInterfaceInfo->State, 0x00, sizeof(MSInterfaceInfo->State));
-
-	if (DESCRIPTOR_TYPE(ConfigDescriptorData) != DTYPE_Configuration)
-	  return MS_ENUMERROR_InvalidConfigDescriptor;
-
-	while (!(DataINEndpoint) || !(DataOUTEndpoint))
-	{
-		if (!(MassStorageInterface) ||
-		    USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData,
-		                              DCOMP_MS_Host_NextMSInterfaceEndpoint) != DESCRIPTOR_SEARCH_COMP_Found)
-		{
-			if (USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData,
-			                              DCOMP_MS_Host_NextMSInterface) != DESCRIPTOR_SEARCH_COMP_Found)
-			{
-				return MS_ENUMERROR_NoCompatibleInterfaceFound;
-			}
-
-			MassStorageInterface = DESCRIPTOR_PCAST(ConfigDescriptorData, USB_Descriptor_Interface_t);
-
-			DataINEndpoint  = NULL;
-			DataOUTEndpoint = NULL;
-
-			continue;
-		}
-
-		USB_Descriptor_Endpoint_t* EndpointData = DESCRIPTOR_PCAST(ConfigDescriptorData, USB_Descriptor_Endpoint_t);
-
-		if ((EndpointData->EndpointAddress & ENDPOINT_DIR_MASK) == ENDPOINT_DIR_IN)
-		  DataINEndpoint  = EndpointData;
-		else
-		  DataOUTEndpoint = EndpointData;
-	}
-
-	MSInterfaceInfo->Config.DataINPipe.Size  = le16_to_cpu(DataINEndpoint->EndpointSize);
-	MSInterfaceInfo->Config.DataINPipe.EndpointAddress = DataINEndpoint->EndpointAddress;
-	MSInterfaceInfo->Config.DataINPipe.Type  = EP_TYPE_BULK;
-
-	MSInterfaceInfo->Config.DataOUTPipe.Size = le16_to_cpu(DataOUTEndpoint->EndpointSize);
-	MSInterfaceInfo->Config.DataOUTPipe.EndpointAddress = DataOUTEndpoint->EndpointAddress;
-	MSInterfaceInfo->Config.DataOUTPipe.Type = EP_TYPE_BULK;
-
-	if (!(Pipe_ConfigurePipeTable(&MSInterfaceInfo->Config.DataINPipe, 1)))
-	  return MS_ENUMERROR_PipeConfigurationFailed;
-
-	if (!(Pipe_ConfigurePipeTable(&MSInterfaceInfo->Config.DataOUTPipe, 1)))
-	  return MS_ENUMERROR_PipeConfigurationFailed;
-
-	MSInterfaceInfo->State.InterfaceNumber = MassStorageInterface->InterfaceNumber;
-	MSInterfaceInfo->State.IsActive = true;
-
-	return MS_ENUMERROR_NoError;
-}
-
-static uint8_t DCOMP_MS_Host_NextMSInterface(void* const CurrentDescriptor)
-{
-	USB_Descriptor_Header_t* Header = DESCRIPTOR_PCAST(CurrentDescriptor, USB_Descriptor_Header_t);
-
-	if (Header->Type == DTYPE_Interface)
-	{
-		USB_Descriptor_Interface_t* Interface = DESCRIPTOR_PCAST(CurrentDescriptor, USB_Descriptor_Interface_t);
-
-		if ((Interface->Class    == MS_CSCP_MassStorageClass)        &&
-		    (Interface->SubClass == MS_CSCP_SCSITransparentSubclass) &&
-		    (Interface->Protocol == MS_CSCP_BulkOnlyTransportProtocol))
-		{
-			return DESCRIPTOR_SEARCH_Found;
-		}
-	}
-
-	return DESCRIPTOR_SEARCH_NotFound;
-}
-
-static uint8_t DCOMP_MS_Host_NextMSInterfaceEndpoint(void* const CurrentDescriptor)
-{
-	USB_Descriptor_Header_t* Header = DESCRIPTOR_PCAST(CurrentDescriptor, USB_Descriptor_Header_t);
-
-	if (Header->Type == DTYPE_Endpoint)
-	{
-		USB_Descriptor_Endpoint_t* Endpoint = DESCRIPTOR_PCAST(CurrentDescriptor, USB_Descriptor_Endpoint_t);
-
-		uint8_t EndpointType = (Endpoint->Attributes & EP_TYPE_MASK);
-
-		if ((EndpointType == EP_TYPE_BULK) && (!(Pipe_IsEndpointBound(Endpoint->EndpointAddress))))
-		{
-			return DESCRIPTOR_SEARCH_Found;
-		}
-	}
-	else if (Header->Type == DTYPE_Interface)
-	{
-		return DESCRIPTOR_SEARCH_Fail;
-	}
-
-	return DESCRIPTOR_SEARCH_NotFound;
-}
-
-static uint8_t MS_Host_SendCommand(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo,
-                                   MS_CommandBlockWrapper_t* const SCSICommandBlock,
-                                   const void* const BufferPtr)
-{
-	uint8_t ErrorCode = PIPE_RWSTREAM_NoError;
-
-	if (++MSInterfaceInfo->State.TransactionTag == 0xFFFFFFFF)
-	  MSInterfaceInfo->State.TransactionTag = 1;
-
-	SCSICommandBlock->Signature = CPU_TO_LE32(MS_CBW_SIGNATURE);
-	SCSICommandBlock->Tag       = cpu_to_le32(MSInterfaceInfo->State.TransactionTag);
-
-	Pipe_SelectPipe(MSInterfaceInfo->Config.DataOUTPipe.Address);
-	Pipe_Unfreeze();
-
-	if ((ErrorCode = Pipe_Write_Stream_LE(SCSICommandBlock, sizeof(MS_CommandBlockWrapper_t),
-	                                      NULL)) != PIPE_RWSTREAM_NoError)
-	{
-		return ErrorCode;
-	}
-
-	Pipe_ClearOUT();
-	Pipe_WaitUntilReady();
-
-	Pipe_Freeze();
-
-	if (BufferPtr != NULL)
-	{
-		ErrorCode = MS_Host_SendReceiveData(MSInterfaceInfo, SCSICommandBlock, (void*)BufferPtr);
-
-		if ((ErrorCode != PIPE_RWSTREAM_NoError) && (ErrorCode != PIPE_RWSTREAM_PipeStalled))
-		{
-			Pipe_Freeze();
-			return ErrorCode;
-		}
-	}
-
-	MS_CommandStatusWrapper_t SCSIStatusBlock;
-	return MS_Host_GetReturnedStatus(MSInterfaceInfo, &SCSIStatusBlock);
-}
-
-static uint8_t MS_Host_WaitForDataReceived(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo)
-{
-	uint16_t TimeoutMSRem        = MS_COMMAND_DATA_TIMEOUT_MS;
-	uint16_t PreviousFrameNumber = USB_Host_GetFrameNumber();
-
-	Pipe_SelectPipe(MSInterfaceInfo->Config.DataINPipe.Address);
-	Pipe_Unfreeze();
-
-	while (!(Pipe_IsINReceived()))
-	{
-		uint16_t CurrentFrameNumber = USB_Host_GetFrameNumber();
-
-		if (CurrentFrameNumber != PreviousFrameNumber)
-		{
-			PreviousFrameNumber = CurrentFrameNumber;
-
-			if (!(TimeoutMSRem--))
-			  return PIPE_RWSTREAM_Timeout;
-		}
-
-		Pipe_Freeze();
-		Pipe_SelectPipe(MSInterfaceInfo->Config.DataOUTPipe.Address);
-		Pipe_Unfreeze();
-
-		if (Pipe_IsStalled())
-		{
-			USB_Host_ClearEndpointStall(Pipe_GetBoundEndpointAddress());
-			return PIPE_RWSTREAM_PipeStalled;
-		}
-
-		Pipe_Freeze();
-		Pipe_SelectPipe(MSInterfaceInfo->Config.DataINPipe.Address);
-		Pipe_Unfreeze();
-
-		if (Pipe_IsStalled())
-		{
-			USB_Host_ClearEndpointStall(Pipe_GetBoundEndpointAddress());
-			return PIPE_RWSTREAM_PipeStalled;
-		}
-
-		if (USB_HostState == HOST_STATE_Unattached)
-		  return PIPE_RWSTREAM_DeviceDisconnected;
-	};
-
-	Pipe_SelectPipe(MSInterfaceInfo->Config.DataINPipe.Address);
-	Pipe_Freeze();
-
-	Pipe_SelectPipe(MSInterfaceInfo->Config.DataOUTPipe.Address);
-	Pipe_Freeze();
-
-	return PIPE_RWSTREAM_NoError;
-}
-
-static uint8_t MS_Host_SendReceiveData(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo,
-                                       MS_CommandBlockWrapper_t* const SCSICommandBlock,
-                                       void* BufferPtr)
-{
-	uint8_t  ErrorCode = PIPE_RWSTREAM_NoError;
-	uint16_t BytesRem  = le32_to_cpu(SCSICommandBlock->DataTransferLength);
-
-	if (SCSICommandBlock->Flags & MS_COMMAND_DIR_DATA_IN)
-	{
-		if ((ErrorCode = MS_Host_WaitForDataReceived(MSInterfaceInfo)) != PIPE_RWSTREAM_NoError)
-		{
-			Pipe_Freeze();
-			return ErrorCode;
-		}
-
-		Pipe_SelectPipe(MSInterfaceInfo->Config.DataINPipe.Address);
-		Pipe_Unfreeze();
-
-		if ((ErrorCode = Pipe_Read_Stream_LE(BufferPtr, BytesRem, NULL)) != PIPE_RWSTREAM_NoError)
-		  return ErrorCode;
-
-		Pipe_ClearIN();
-	}
-	else
-	{
-		Pipe_SelectPipe(MSInterfaceInfo->Config.DataOUTPipe.Address);
-		Pipe_Unfreeze();
-
-		if ((ErrorCode = Pipe_Write_Stream_LE(BufferPtr, BytesRem, NULL)) != PIPE_RWSTREAM_NoError)
-		  return ErrorCode;
-
-		Pipe_ClearOUT();
-
-		while (!(Pipe_IsOUTReady()))
-		{
-			if (USB_HostState == HOST_STATE_Unattached)
-			  return PIPE_RWSTREAM_DeviceDisconnected;
-		}
-	}
-
-	Pipe_Freeze();
-
-	return ErrorCode;
-}
-
-static uint8_t MS_Host_GetReturnedStatus(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo,
-                                         MS_CommandStatusWrapper_t* const SCSICommandStatus)
-{
-	uint8_t ErrorCode = PIPE_RWSTREAM_NoError;
-
-	if ((ErrorCode = MS_Host_WaitForDataReceived(MSInterfaceInfo)) != PIPE_RWSTREAM_NoError)
-	  return ErrorCode;
-
-	Pipe_SelectPipe(MSInterfaceInfo->Config.DataINPipe.Address);
-	Pipe_Unfreeze();
-
-	if ((ErrorCode = Pipe_Read_Stream_LE(SCSICommandStatus, sizeof(MS_CommandStatusWrapper_t),
-	                                     NULL)) != PIPE_RWSTREAM_NoError)
-	{
-		return ErrorCode;
-	}
-
-	Pipe_ClearIN();
-	Pipe_Freeze();
-
-	if (SCSICommandStatus->Status != MS_SCSI_COMMAND_Pass)
-	  ErrorCode = MS_ERROR_LOGICAL_CMD_FAILED;
-
-	return ErrorCode;
-}
-
-uint8_t MS_Host_ResetMSInterface(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo)
-{
-	uint8_t ErrorCode;
-
-	USB_ControlRequest = (USB_Request_Header_t)
-		{
-			.bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE),
-			.bRequest      = MS_REQ_MassStorageReset,
-			.wValue        = 0,
-			.wIndex        = MSInterfaceInfo->State.InterfaceNumber,
-			.wLength       = 0,
-		};
-
-	Pipe_SelectPipe(PIPE_CONTROLPIPE);
-
-	if ((ErrorCode = USB_Host_SendControlRequest(NULL)) != HOST_SENDCONTROL_Successful)
-	  return ErrorCode;
-
-	Pipe_SelectPipe(MSInterfaceInfo->Config.DataINPipe.Address);
-
-	if ((ErrorCode = USB_Host_ClearEndpointStall(Pipe_GetBoundEndpointAddress())) != HOST_SENDCONTROL_Successful)
-	  return ErrorCode;
-
-	Pipe_SelectPipe(MSInterfaceInfo->Config.DataOUTPipe.Address);
-
-	if ((ErrorCode = USB_Host_ClearEndpointStall(Pipe_GetBoundEndpointAddress())) != HOST_SENDCONTROL_Successful)
-	  return ErrorCode;
-
-	return HOST_SENDCONTROL_Successful;
-}
-
-uint8_t MS_Host_GetMaxLUN(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo,
-                          uint8_t* const MaxLUNIndex)
-{
-	uint8_t ErrorCode;
-
-	USB_ControlRequest = (USB_Request_Header_t)
-		{
-			.bmRequestType = (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE),
-			.bRequest      = MS_REQ_GetMaxLUN,
-			.wValue        = 0,
-			.wIndex        = MSInterfaceInfo->State.InterfaceNumber,
-			.wLength       = 1,
-		};
-
-	Pipe_SelectPipe(PIPE_CONTROLPIPE);
-
-	if ((ErrorCode = USB_Host_SendControlRequest(MaxLUNIndex)) == HOST_SENDCONTROL_SetupStalled)
-	{
-		*MaxLUNIndex = 0;
-		ErrorCode    = HOST_SENDCONTROL_Successful;
-	}
-
-	return ErrorCode;
-}
-
-uint8_t MS_Host_GetInquiryData(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo,
-                               const uint8_t LUNIndex,
-                               SCSI_Inquiry_Response_t* const InquiryData)
-{
-	if ((USB_HostState != HOST_STATE_Configured) || !(MSInterfaceInfo->State.IsActive))
-	  return HOST_SENDCONTROL_DeviceDisconnected;
-
-	MS_CommandBlockWrapper_t SCSICommandBlock = (MS_CommandBlockWrapper_t)
-		{
-			.DataTransferLength = CPU_TO_LE32(sizeof(SCSI_Inquiry_Response_t)),
-			.Flags              = MS_COMMAND_DIR_DATA_IN,
-			.LUN                = LUNIndex,
-			.SCSICommandLength  = 6,
-			.SCSICommandData    =
-				{
-					SCSI_CMD_INQUIRY,
-					0x00,                            // Reserved
-					0x00,                            // Reserved
-					0x00,                            // Reserved
-					sizeof(SCSI_Inquiry_Response_t), // Allocation Length
-					0x00                             // Unused (control)
-				}
-		};
-
-	return MS_Host_SendCommand(MSInterfaceInfo, &SCSICommandBlock, InquiryData);
-}
-
-uint8_t MS_Host_TestUnitReady(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo,
-                              const uint8_t LUNIndex)
-{
-	if ((USB_HostState != HOST_STATE_Configured) || !(MSInterfaceInfo->State.IsActive))
-	  return HOST_SENDCONTROL_DeviceDisconnected;
-
-	MS_CommandBlockWrapper_t SCSICommandBlock = (MS_CommandBlockWrapper_t)
-		{
-			.DataTransferLength = CPU_TO_LE32(0),
-			.Flags              = MS_COMMAND_DIR_DATA_IN,
-			.LUN                = LUNIndex,
-			.SCSICommandLength  = 6,
-			.SCSICommandData    =
-				{
-					SCSI_CMD_TEST_UNIT_READY,
-					0x00,                   // Reserved
-					0x00,                   // Reserved
-					0x00,                   // Reserved
-					0x00,                   // Reserved
-					0x00                    // Unused (control)
-				}
-		};
-
-	return MS_Host_SendCommand(MSInterfaceInfo, &SCSICommandBlock, NULL);
-}
-
-uint8_t MS_Host_ReadDeviceCapacity(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo,
-                                   const uint8_t LUNIndex,
-                                   SCSI_Capacity_t* const DeviceCapacity)
-{
-	if ((USB_HostState != HOST_STATE_Configured) || !(MSInterfaceInfo->State.IsActive))
-	  return HOST_SENDCONTROL_DeviceDisconnected;
-
-	uint8_t ErrorCode;
-
-	MS_CommandBlockWrapper_t SCSICommandBlock = (MS_CommandBlockWrapper_t)
-		{
-			.DataTransferLength = CPU_TO_LE32(sizeof(SCSI_Capacity_t)),
-			.Flags              = MS_COMMAND_DIR_DATA_IN,
-			.LUN                = LUNIndex,
-			.SCSICommandLength  = 10,
-			.SCSICommandData    =
-				{
-					SCSI_CMD_READ_CAPACITY_10,
-					0x00,                   // Reserved
-					0x00,                   // MSB of Logical block address
-					0x00,
-					0x00,
-					0x00,                   // LSB of Logical block address
-					0x00,                   // Reserved
-					0x00,                   // Reserved
-					0x00,                   // Partial Medium Indicator
-					0x00                    // Unused (control)
-				}
-		};
-
-	if ((ErrorCode = MS_Host_SendCommand(MSInterfaceInfo, &SCSICommandBlock, DeviceCapacity)) != PIPE_RWSTREAM_NoError)
-	  return ErrorCode;
-
-	DeviceCapacity->Blocks    = BE32_TO_CPU(DeviceCapacity->Blocks);
-	DeviceCapacity->BlockSize = BE32_TO_CPU(DeviceCapacity->BlockSize);
-
-	return PIPE_RWSTREAM_NoError;
-}
-
-uint8_t MS_Host_RequestSense(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo,
-                             const uint8_t LUNIndex,
-                             SCSI_Request_Sense_Response_t* const SenseData)
-{
-	if ((USB_HostState != HOST_STATE_Configured) || !(MSInterfaceInfo->State.IsActive))
-	  return HOST_SENDCONTROL_DeviceDisconnected;
-
-	MS_CommandBlockWrapper_t SCSICommandBlock = (MS_CommandBlockWrapper_t)
-		{
-			.DataTransferLength = CPU_TO_LE32(sizeof(SCSI_Request_Sense_Response_t)),
-			.Flags              = MS_COMMAND_DIR_DATA_IN,
-			.LUN                = LUNIndex,
-			.SCSICommandLength  = 6,
-			.SCSICommandData    =
-				{
-					SCSI_CMD_REQUEST_SENSE,
-					0x00,                                  // Reserved
-					0x00,                                  // Reserved
-					0x00,                                  // Reserved
-					sizeof(SCSI_Request_Sense_Response_t), // Allocation Length
-					0x00                                   // Unused (control)
-				}
-		};
-
-	return MS_Host_SendCommand(MSInterfaceInfo, &SCSICommandBlock, SenseData);
-}
-
-uint8_t MS_Host_PreventAllowMediumRemoval(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo,
-                                          const uint8_t LUNIndex,
-                                          const bool PreventRemoval)
-{
-	if ((USB_HostState != HOST_STATE_Configured) || !(MSInterfaceInfo->State.IsActive))
-	  return HOST_SENDCONTROL_DeviceDisconnected;
-
-	MS_CommandBlockWrapper_t SCSICommandBlock = (MS_CommandBlockWrapper_t)
-		{
-			.DataTransferLength = CPU_TO_LE32(0),
-			.Flags              = MS_COMMAND_DIR_DATA_OUT,
-			.LUN                = LUNIndex,
-			.SCSICommandLength  = 6,
-			.SCSICommandData    =
-				{
-					SCSI_CMD_PREVENT_ALLOW_MEDIUM_REMOVAL,
-					0x00,                   // Reserved
-					0x00,                   // Reserved
-					PreventRemoval,         // Prevent flag
-					0x00,                   // Reserved
-					0x00                    // Unused (control)
-				}
-		};
-
-	return MS_Host_SendCommand(MSInterfaceInfo, &SCSICommandBlock, NULL);
-}
-
-uint8_t MS_Host_ReadDeviceBlocks(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo,
-                                 const uint8_t LUNIndex,
-                                 const uint32_t BlockAddress,
-                                 const uint8_t Blocks,
-                                 const uint16_t BlockSize,
-                                 void* BlockBuffer)
-{
-	if ((USB_HostState != HOST_STATE_Configured) || !(MSInterfaceInfo->State.IsActive))
-	  return HOST_SENDCONTROL_DeviceDisconnected;
-
-	MS_CommandBlockWrapper_t SCSICommandBlock = (MS_CommandBlockWrapper_t)
-		{
-			.DataTransferLength = cpu_to_le32((uint32_t)Blocks * BlockSize),
-			.Flags              = MS_COMMAND_DIR_DATA_IN,
-			.LUN                = LUNIndex,
-			.SCSICommandLength  = 10,
-			.SCSICommandData    =
-				{
-					SCSI_CMD_READ_10,
-					0x00,                   // Unused (control bits, all off)
-					(BlockAddress >> 24),   // MSB of Block Address
-					(BlockAddress >> 16),
-					(BlockAddress >> 8),
-					(BlockAddress & 0xFF),  // LSB of Block Address
-					0x00,                   // Reserved
-					0x00,                   // MSB of Total Blocks to Read
-					Blocks,                 // LSB of Total Blocks to Read
-					0x00                    // Unused (control)
-				}
-		};
-
-	return MS_Host_SendCommand(MSInterfaceInfo, &SCSICommandBlock, BlockBuffer);
-}
-
-uint8_t MS_Host_WriteDeviceBlocks(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo,
-                                  const uint8_t LUNIndex,
-                                  const uint32_t BlockAddress,
-                                  const uint8_t Blocks,
-                                  const uint16_t BlockSize,
-                                  const void* BlockBuffer)
-{
-	if ((USB_HostState != HOST_STATE_Configured) || !(MSInterfaceInfo->State.IsActive))
-	  return HOST_SENDCONTROL_DeviceDisconnected;
-
-	MS_CommandBlockWrapper_t SCSICommandBlock = (MS_CommandBlockWrapper_t)
-		{
-			.DataTransferLength = cpu_to_le32((uint32_t)Blocks * BlockSize),
-			.Flags              = MS_COMMAND_DIR_DATA_OUT,
-			.LUN                = LUNIndex,
-			.SCSICommandLength  = 10,
-			.SCSICommandData    =
-				{
-					SCSI_CMD_WRITE_10,
-					0x00,                   // Unused (control bits, all off)
-					(BlockAddress >> 24),   // MSB of Block Address
-					(BlockAddress >> 16),
-					(BlockAddress >> 8),
-					(BlockAddress & 0xFF),  // LSB of Block Address
-					0x00,                   // Reserved
-					0x00,                   // MSB of Total Blocks to Write
-					Blocks,                 // LSB of Total Blocks to Write
-					0x00                    // Unused (control)
-				}
-		};
-
-	return MS_Host_SendCommand(MSInterfaceInfo, &SCSICommandBlock, BlockBuffer);
-}
-
-#endif
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Class/Host/MassStorageClassHost.h b/NativePrograms/LUFA/Drivers/USB/Class/Host/MassStorageClassHost.h
deleted file mode 100644
index 77b9bc15ec..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Class/Host/MassStorageClassHost.h
+++ /dev/null
@@ -1,335 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Host mode driver for the library USB Mass Storage Class driver.
- *
- *  Host mode driver for the library USB Mass Storage Class driver.
- *
- *  \note This file should not be included directly. It is automatically included as needed by the USB module driver
- *        dispatch header located in LUFA/Drivers/USB.h.
- */
-
-/** \ingroup Group_USBClassMS
- *  \defgroup Group_USBClassMassStorageHost Mass Storage Class Host Mode Driver
- *
- *  \section Sec_USBClassMassStorageHost_Dependencies Module Source Dependencies
- *  The following files must be built with any user project that uses this module:
- *    - LUFA/Drivers/USB/Class/Host/MassStorageClassHost.c <i>(Makefile source module name: LUFA_SRC_USBCLASS)</i>
- *
- *  \section Sec_USBClassMassStorageHost_ModDescription Module Description
- *  Host Mode USB Class driver framework interface, for the Mass Storage USB Class driver.
- *
- *  @{
- */
-
-#ifndef __MS_CLASS_HOST_H__
-#define __MS_CLASS_HOST_H__
-
-	/* Includes: */
-		#include "../../USB.h"
-		#include "../Common/MassStorageClassCommon.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_MS_DRIVER)
-			#error Do not include this file directly. Include LUFA/Drivers/USB.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Error code for some Mass Storage Host functions, indicating a logical (and not hardware) error. */
-			#define MS_ERROR_LOGICAL_CMD_FAILED              0x80
-
-		/* Type Defines: */
-			/** \brief Mass Storage Class Host Mode Configuration and State Structure.
-			 *
-			 *  Class state structure. An instance of this structure should be made within the user application,
-			 *  and passed to each of the Mass Storage class driver functions as the \c MSInterfaceInfo parameter. This
-			 *  stores each Mass Storage interface's configuration and state information.
-			 */
-			typedef struct
-			{
-				struct
-				{
-					USB_Pipe_Table_t DataINPipe; /**< Data IN Pipe configuration table. */
-					USB_Pipe_Table_t DataOUTPipe; /**< Data OUT Pipe configuration table. */
-				} Config; /**< Config data for the USB class interface within the device. All elements in this section
-				           *   <b>must</b> be set or the interface will fail to enumerate and operate correctly.
-				           */
-				struct
-				{
-					bool     IsActive; /**< Indicates if the current interface instance is connected to an attached device, valid
-					                    *   after \ref MS_Host_ConfigurePipes() is called and the Host state machine is in the
-					                    *   Configured state.
-					                    */
-					uint8_t  InterfaceNumber; /**< Interface index of the Mass Storage interface within the attached device. */
-
-					uint32_t TransactionTag; /**< Current transaction tag for data synchronizing of packets. */
-				} State; /**< State data for the USB class interface within the device. All elements in this section
-						  *   <b>may</b> be set to initial values, but may also be ignored to default to sane values when
-						  *   the interface is enumerated.
-						  */
-			} USB_ClassInfo_MS_Host_t;
-
-			/** \brief SCSI Device LUN Capacity Structure.
-			 *
-			 *  SCSI capacity structure, to hold the total capacity of the device in both the number
-			 *  of blocks in the current LUN, and the size of each block. This structure is filled by
-			 *  the device when the \ref MS_Host_ReadDeviceCapacity() function is called.
-			 */
-			typedef struct
-			{
-				uint32_t Blocks; /**< Number of blocks in the addressed LUN of the device. */
-				uint32_t BlockSize; /**< Number of bytes in each block in the addressed LUN. */
-			} SCSI_Capacity_t;
-
-		/* Enums: */
-			/** Enum for the possible error codes returned by the \ref MS_Host_ConfigurePipes() function. */
-			enum MS_Host_EnumerationFailure_ErrorCodes_t
-			{
-				MS_ENUMERROR_NoError                    = 0, /**< Configuration Descriptor was processed successfully. */
-				MS_ENUMERROR_InvalidConfigDescriptor    = 1, /**< The device returned an invalid Configuration Descriptor. */
-				MS_ENUMERROR_NoCompatibleInterfaceFound = 2, /**< A compatible Mass Storage interface was not found in the device's Configuration Descriptor. */
-				MS_ENUMERROR_PipeConfigurationFailed    = 3, /**< One or more pipes for the specified interface could not be configured correctly. */
-			};
-
-		/* Function Prototypes: */
-			/** Host interface configuration routine, to configure a given Mass Storage host interface instance using the
-			 *  Configuration Descriptor read from an attached USB device. This function automatically updates the given Mass
-			 *  Storage Host instance's state values and configures the pipes required to communicate with the interface if it
-			 *  is found within the device. This should be called once after the stack has enumerated the attached device, while
-			 *  the host state machine is in the Addressed state.
-			 *
-			 *  \param[in,out] MSInterfaceInfo         Pointer to a structure containing an MS Class host configuration and state.
-			 *  \param[in]     ConfigDescriptorSize    Length of the attached device's Configuration Descriptor.
-			 *  \param[in]     DeviceConfigDescriptor  Pointer to a buffer containing the attached device's Configuration Descriptor.
-			 *
-			 *  \return A value from the \ref MS_Host_EnumerationFailure_ErrorCodes_t enum.
-			 */
-			uint8_t MS_Host_ConfigurePipes(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo,
-			                               uint16_t ConfigDescriptorSize,
-			                               void* DeviceConfigDescriptor) ATTR_NON_NULL_PTR_ARG(1) ATTR_NON_NULL_PTR_ARG(3);
-
-			/** Sends a MASS STORAGE RESET control request to the attached device, resetting the Mass Storage Interface
-			 *  and readying it for the next Mass Storage command. This should be called after a failed SCSI request to
-			 *  ensure the attached Mass Storage device is ready to receive the next command.
-			 *
-			 *  \param[in,out] MSInterfaceInfo  Pointer to a structure containing a MS Class host configuration and state.
-			 *
-			 *  \return A value from the \ref USB_Host_SendControlErrorCodes_t enum.
-			 */
-			uint8_t MS_Host_ResetMSInterface(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Sends a GET MAX LUN control request to the attached device, retrieving the index of the highest LUN (Logical
-			 *  UNit, a logical drive) in the device. This value can then be used in the other functions of the Mass Storage
-			 *  Host mode Class driver to address a specific LUN within the device.
-			 *
-			 *  \note Some devices do not support this request, and will STALL it when issued. To get around this,
-			 *        on unsupported devices the max LUN index will be reported as zero and no error will be returned
-			 *        if the device STALLs the request.
-			 *
-			 *  \param[in,out] MSInterfaceInfo  Pointer to a structure containing a MS Class host configuration and state.
-			 *  \param[out]    MaxLUNIndex      Pointer to a location where the highest LUN index value should be stored.
-			 *
-			 *  \return A value from the \ref USB_Host_SendControlErrorCodes_t enum.
-			 */
-			uint8_t MS_Host_GetMaxLUN(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo,
-			                          uint8_t* const MaxLUNIndex) ATTR_NON_NULL_PTR_ARG(1) ATTR_NON_NULL_PTR_ARG(2);
-
-			/** Retrieves the Mass Storage device's inquiry data for the specified LUN, indicating the device characteristics and
-			 *  properties.
-			 *
-			 *  \pre This function must only be called when the Host state machine is in the \ref HOST_STATE_Configured state or the
-			 *       call will fail.
-			 *
-			 *  \param[in,out] MSInterfaceInfo  Pointer to a structure containing a MS Class host configuration and state.
-			 *  \param[in]     LUNIndex         LUN index within the device the command is being issued to.
-			 *  \param[out]    InquiryData      Location where the read inquiry data should be stored.
-			 *
-			 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum or \ref MS_ERROR_LOGICAL_CMD_FAILED.
-			 */
-			uint8_t MS_Host_GetInquiryData(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo,
-			                               const uint8_t LUNIndex,
-			                               SCSI_Inquiry_Response_t* const InquiryData) ATTR_NON_NULL_PTR_ARG(1)
-			                               ATTR_NON_NULL_PTR_ARG(3);
-
-			/** Sends a TEST UNIT READY command to the device, to determine if it is ready to accept other SCSI commands.
-			 *
-			 *  \param[in,out] MSInterfaceInfo  Pointer to a structure containing a MS Class host configuration and state.
-			 *  \param[in]     LUNIndex         LUN index within the device the command is being issued to.
-			 *
-			 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum or \ref MS_ERROR_LOGICAL_CMD_FAILED if not ready.
-			 */
-			uint8_t MS_Host_TestUnitReady(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo,
-			                              const uint8_t LUNIndex) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Retrieves the total capacity of the attached USB Mass Storage device, in blocks, and block size.
-			 *
-			 *  \pre This function must only be called when the Host state machine is in the \ref HOST_STATE_Configured state or the
-			 *       call will fail.
-			 *
-			 *  \param[in,out] MSInterfaceInfo  Pointer to a structure containing a MS Class host configuration and state.
-			 *  \param[in]     LUNIndex         LUN index within the device the command is being issued to.
-			 *  \param[out]    DeviceCapacity   Pointer to the location where the capacity information should be stored.
-			 *
-			 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum or \ref MS_ERROR_LOGICAL_CMD_FAILED if not ready.
-			 */
-			uint8_t MS_Host_ReadDeviceCapacity(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo,
-			                                   const uint8_t LUNIndex,
-			                                   SCSI_Capacity_t* const DeviceCapacity) ATTR_NON_NULL_PTR_ARG(1)
-			                                   ATTR_NON_NULL_PTR_ARG(3);
-
-			/** Retrieves the device sense data, indicating the current device state and error codes for the previously
-			 *  issued command.
-			 *
-			 *  \pre This function must only be called when the Host state machine is in the \ref HOST_STATE_Configured state or the
-			 *       call will fail.
-			 *
-			 *  \param[in,out] MSInterfaceInfo  Pointer to a structure containing a MS Class host configuration and state.
-			 *  \param[in]     LUNIndex         LUN index within the device the command is being issued to.
-			 *  \param[out]    SenseData        Pointer to the location where the sense information should be stored.
-			 *
-			 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum or \ref MS_ERROR_LOGICAL_CMD_FAILED if not ready.
-			 */
-			uint8_t MS_Host_RequestSense(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo,
-			                             const uint8_t LUNIndex,
-			                             SCSI_Request_Sense_Response_t* const SenseData) ATTR_NON_NULL_PTR_ARG(1)
-			                             ATTR_NON_NULL_PTR_ARG(3);
-
-			/** Issues a PREVENT MEDIUM REMOVAL command, to logically (or, depending on the type of device, physically) lock
-			 *  the device from removal so that blocks of data on the medium can be read or altered.
-			 *
-			 *  \pre This function must only be called when the Host state machine is in the \ref HOST_STATE_Configured state or the
-			 *       call will fail.
-			 *
-			 *  \param[in,out] MSInterfaceInfo  Pointer to a structure containing a MS Class host configuration and state.
-			 *  \param[in]     LUNIndex         LUN index within the device the command is being issued to.
-			 *  \param[in]     PreventRemoval   Boolean \c true if the device should be locked from removal, \c false otherwise.
-			 *
-			 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum or \ref MS_ERROR_LOGICAL_CMD_FAILED if not ready.
-			 */
-			uint8_t MS_Host_PreventAllowMediumRemoval(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo,
-			                                          const uint8_t LUNIndex,
-			                                          const bool PreventRemoval) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Reads blocks of data from the attached Mass Storage device's medium.
-			 *
-			 *  \pre This function must only be called when the Host state machine is in the \ref HOST_STATE_Configured state or the
-			 *       call will fail.
-			 *
-			 *  \param[in,out] MSInterfaceInfo  Pointer to a structure containing a MS Class host configuration and state.
-			 *  \param[in]     LUNIndex         LUN index within the device the command is being issued to.
-			 *  \param[in]     BlockAddress     Starting block address within the device to read from.
-			 *  \param[in]     Blocks           Total number of blocks to read.
-			 *  \param[in]     BlockSize        Size in bytes of each block within the device.
-			 *  \param[out]    BlockBuffer      Pointer to where the read data from the device should be stored.
-			 *
-			 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum or \ref MS_ERROR_LOGICAL_CMD_FAILED if not ready.
-			 */
-			uint8_t MS_Host_ReadDeviceBlocks(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo,
-			                                 const uint8_t LUNIndex,
-			                                 const uint32_t BlockAddress,
-			                                 const uint8_t Blocks,
-			                                 const uint16_t BlockSize,
-			                                 void* BlockBuffer) ATTR_NON_NULL_PTR_ARG(1) ATTR_NON_NULL_PTR_ARG(6);
-
-			/** Writes blocks of data to the attached Mass Storage device's medium.
-			 *
-			 *  \pre This function must only be called when the Host state machine is in the \ref HOST_STATE_Configured state or the
-			 *       call will fail.
-			 *
-			 *  \param[in,out] MSInterfaceInfo  Pointer to a structure containing a MS Class host configuration and state.
-			 *  \param[in]     LUNIndex         LUN index within the device the command is being issued to.
-			 *  \param[in]     BlockAddress     Starting block address within the device to write to.
-			 *  \param[in]     Blocks           Total number of blocks to read.
-			 *  \param[in]     BlockSize        Size in bytes of each block within the device.
-			 *  \param[in]     BlockBuffer      Pointer to where the data to write should be sourced from.
-			 *
-			 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum or \ref MS_ERROR_LOGICAL_CMD_FAILED if not ready.
-			 */
-			uint8_t MS_Host_WriteDeviceBlocks(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo,
-			                                  const uint8_t LUNIndex,
-			                                  const uint32_t BlockAddress,
-			                                  const uint8_t Blocks,
-			                                  const uint16_t BlockSize,
-			                                  const void* BlockBuffer) ATTR_NON_NULL_PTR_ARG(1) ATTR_NON_NULL_PTR_ARG(6);
-
-		/* Inline Functions: */
-			/** General management task for a given Mass Storage host class interface, required for the correct operation of
-			 *  the interface. This should be called frequently in the main program loop, before the master USB management task
-			 *  \ref USB_USBTask().
-			 *
-			 *  \param[in,out] MSInterfaceInfo  Pointer to a structure containing an Mass Storage Class host configuration and state.
-			 */
-			static inline void MS_Host_USBTask(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1) ATTR_ALWAYS_INLINE;
-			static inline void MS_Host_USBTask(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo)
-			{
-				(void)MSInterfaceInfo;
-			}
-
-	/* Private Interface - For use in library only: */
-	#if !defined(__DOXYGEN__)
-		/* Macros: */
-			#define MS_COMMAND_DATA_TIMEOUT_MS        10000
-
-		/* Function Prototypes: */
-			#if defined(__INCLUDE_FROM_MASSSTORAGE_HOST_C)
-				static uint8_t MS_Host_SendCommand(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo,
-				                                   MS_CommandBlockWrapper_t* const SCSICommandBlock,
-				                                   const void* const BufferPtr) ATTR_NON_NULL_PTR_ARG(1) ATTR_NON_NULL_PTR_ARG(2);
-				static uint8_t MS_Host_WaitForDataReceived(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);
-				static uint8_t MS_Host_SendReceiveData(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo,
-				                                       MS_CommandBlockWrapper_t* const SCSICommandBlock,
-				                                       void* BufferPtr) ATTR_NON_NULL_PTR_ARG(1) ATTR_NON_NULL_PTR_ARG(2);
-				static uint8_t MS_Host_GetReturnedStatus(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo,
-				                                         MS_CommandStatusWrapper_t* const SCSICommandStatus)
-				                                         ATTR_NON_NULL_PTR_ARG(1) ATTR_NON_NULL_PTR_ARG(2);
-
-				static uint8_t DCOMP_MS_Host_NextMSInterface(void* const CurrentDescriptor)
-				                                             ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(1);
-				static uint8_t DCOMP_MS_Host_NextMSInterfaceEndpoint(void* const CurrentDescriptor)
-				                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(1);
-			#endif
-	#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Class/Host/PrinterClassHost.c b/NativePrograms/LUFA/Drivers/USB/Class/Host/PrinterClassHost.c
deleted file mode 100644
index 18c719158f..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Class/Host/PrinterClassHost.c
+++ /dev/null
@@ -1,400 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-#define  __INCLUDE_FROM_USB_DRIVER
-#include "../../Core/USBMode.h"
-
-#if defined(USB_CAN_BE_HOST)
-
-#define  __INCLUDE_FROM_PRINTER_DRIVER
-#define  __INCLUDE_FROM_PRINTER_HOST_C
-#include "PrinterClassHost.h"
-
-uint8_t PRNT_Host_ConfigurePipes(USB_ClassInfo_PRNT_Host_t* const PRNTInterfaceInfo,
-                                 uint16_t ConfigDescriptorSize,
-							     void* ConfigDescriptorData)
-{
-	USB_Descriptor_Endpoint_t*  DataINEndpoint   = NULL;
-	USB_Descriptor_Endpoint_t*  DataOUTEndpoint  = NULL;
-	USB_Descriptor_Interface_t* PrinterInterface = NULL;
-
-	memset(&PRNTInterfaceInfo->State, 0x00, sizeof(PRNTInterfaceInfo->State));
-
-	if (DESCRIPTOR_TYPE(ConfigDescriptorData) != DTYPE_Configuration)
-	  return PRNT_ENUMERROR_InvalidConfigDescriptor;
-
-	while (!(DataINEndpoint) || !(DataOUTEndpoint))
-	{
-		if (!(PrinterInterface) ||
-		    USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData,
-		                              DCOMP_PRNT_Host_NextPRNTInterfaceEndpoint) != DESCRIPTOR_SEARCH_COMP_Found)
-		{
-			if (USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData,
-			                              DCOMP_PRNT_Host_NextPRNTInterface) != DESCRIPTOR_SEARCH_COMP_Found)
-			{
-				return PRNT_ENUMERROR_NoCompatibleInterfaceFound;
-			}
-
-			PrinterInterface = DESCRIPTOR_PCAST(ConfigDescriptorData, USB_Descriptor_Interface_t);
-
-			DataINEndpoint  = NULL;
-			DataOUTEndpoint = NULL;
-
-			continue;
-		}
-
-		USB_Descriptor_Endpoint_t* EndpointData = DESCRIPTOR_PCAST(ConfigDescriptorData, USB_Descriptor_Endpoint_t);
-
-		if ((EndpointData->EndpointAddress & ENDPOINT_DIR_MASK) == ENDPOINT_DIR_IN)
-		  DataINEndpoint  = EndpointData;
-		else
-		  DataOUTEndpoint = EndpointData;
-	}
-
-	PRNTInterfaceInfo->Config.DataINPipe.Size  = le16_to_cpu(DataINEndpoint->EndpointSize);
-	PRNTInterfaceInfo->Config.DataINPipe.EndpointAddress = DataINEndpoint->EndpointAddress;
-	PRNTInterfaceInfo->Config.DataINPipe.Type  = EP_TYPE_BULK;
-
-	PRNTInterfaceInfo->Config.DataOUTPipe.Size = le16_to_cpu(DataOUTEndpoint->EndpointSize);
-	PRNTInterfaceInfo->Config.DataOUTPipe.EndpointAddress = DataOUTEndpoint->EndpointAddress;
-	PRNTInterfaceInfo->Config.DataOUTPipe.Type = EP_TYPE_BULK;
-
-	if (!(Pipe_ConfigurePipeTable(&PRNTInterfaceInfo->Config.DataINPipe, 1)))
-	  return PRNT_ENUMERROR_PipeConfigurationFailed;
-
-	if (!(Pipe_ConfigurePipeTable(&PRNTInterfaceInfo->Config.DataOUTPipe, 1)))
-	  return PRNT_ENUMERROR_PipeConfigurationFailed;
-
-	PRNTInterfaceInfo->State.InterfaceNumber  = PrinterInterface->InterfaceNumber;
-	PRNTInterfaceInfo->State.AlternateSetting = PrinterInterface->AlternateSetting;
-	PRNTInterfaceInfo->State.IsActive = true;
-
-	return PRNT_ENUMERROR_NoError;
-}
-
-static uint8_t DCOMP_PRNT_Host_NextPRNTInterface(void* CurrentDescriptor)
-{
-	USB_Descriptor_Header_t* Header = DESCRIPTOR_PCAST(CurrentDescriptor, USB_Descriptor_Header_t);
-
-	if (Header->Type == DTYPE_Interface)
-	{
-		USB_Descriptor_Interface_t* Interface = DESCRIPTOR_PCAST(CurrentDescriptor, USB_Descriptor_Interface_t);
-
-		if ((Interface->Class    == PRNT_CSCP_PrinterClass)    &&
-		    (Interface->SubClass == PRNT_CSCP_PrinterSubclass) &&
-		    (Interface->Protocol == PRNT_CSCP_BidirectionalProtocol))
-		{
-			return DESCRIPTOR_SEARCH_Found;
-		}
-	}
-
-	return DESCRIPTOR_SEARCH_NotFound;
-}
-
-static uint8_t DCOMP_PRNT_Host_NextPRNTInterfaceEndpoint(void* CurrentDescriptor)
-{
-	USB_Descriptor_Header_t* Header = DESCRIPTOR_PCAST(CurrentDescriptor, USB_Descriptor_Header_t);
-
-	if (Header->Type == DTYPE_Endpoint)
-	{
-		USB_Descriptor_Endpoint_t* Endpoint = DESCRIPTOR_PCAST(CurrentDescriptor, USB_Descriptor_Endpoint_t);
-
-		uint8_t EndpointType = (Endpoint->Attributes & EP_TYPE_MASK);
-
-		if (EndpointType == EP_TYPE_BULK)
-		  return DESCRIPTOR_SEARCH_Found;
-	}
-	else if (Header->Type == DTYPE_Interface)
-	{
-		return DESCRIPTOR_SEARCH_Fail;
-	}
-
-	return DESCRIPTOR_SEARCH_NotFound;
-}
-
-void PRNT_Host_USBTask(USB_ClassInfo_PRNT_Host_t* const PRNTInterfaceInfo)
-{
-	if ((USB_HostState != HOST_STATE_Configured) || !(PRNTInterfaceInfo->State.IsActive))
-	  return;
-
-	#if !defined(NO_CLASS_DRIVER_AUTOFLUSH)
-	PRNT_Host_Flush(PRNTInterfaceInfo);
-	#endif
-}
-
-uint8_t PRNT_Host_SetBidirectionalMode(USB_ClassInfo_PRNT_Host_t* const PRNTInterfaceInfo)
-{
-	if (PRNTInterfaceInfo->State.AlternateSetting)
-	{
-		uint8_t ErrorCode;
-
-		if ((ErrorCode = USB_Host_SetInterfaceAltSetting(PRNTInterfaceInfo->State.InterfaceNumber,
-		                                                 PRNTInterfaceInfo->State.AlternateSetting)) != HOST_SENDCONTROL_Successful)
-		{
-			return ErrorCode;
-		}
-	}
-
-	return HOST_SENDCONTROL_Successful;
-}
-
-uint8_t PRNT_Host_GetPortStatus(USB_ClassInfo_PRNT_Host_t* const PRNTInterfaceInfo,
-                                uint8_t* const PortStatus)
-{
-	USB_ControlRequest = (USB_Request_Header_t)
-		{
-			.bmRequestType = (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE),
-			.bRequest      = PRNT_REQ_GetPortStatus,
-			.wValue        = 0,
-			.wIndex        = PRNTInterfaceInfo->State.InterfaceNumber,
-			.wLength       = sizeof(uint8_t),
-		};
-
-	Pipe_SelectPipe(PIPE_CONTROLPIPE);
-	return USB_Host_SendControlRequest(PortStatus);
-}
-
-uint8_t PRNT_Host_SoftReset(USB_ClassInfo_PRNT_Host_t* const PRNTInterfaceInfo)
-{
-	USB_ControlRequest = (USB_Request_Header_t)
-		{
-			.bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE),
-			.bRequest      = PRNT_REQ_SoftReset,
-			.wValue        = 0,
-			.wIndex        = PRNTInterfaceInfo->State.InterfaceNumber,
-			.wLength       = 0,
-		};
-
-	Pipe_SelectPipe(PIPE_CONTROLPIPE);
-	return USB_Host_SendControlRequest(NULL);
-}
-
-uint8_t PRNT_Host_Flush(USB_ClassInfo_PRNT_Host_t* const PRNTInterfaceInfo)
-{
-	if ((USB_HostState != HOST_STATE_Configured) || !(PRNTInterfaceInfo->State.IsActive))
-	  return PIPE_READYWAIT_DeviceDisconnected;
-
-	uint8_t ErrorCode;
-
-	Pipe_SelectPipe(PRNTInterfaceInfo->Config.DataOUTPipe.Address);
-	Pipe_Unfreeze();
-
-	if (!(Pipe_BytesInPipe()))
-	  return PIPE_READYWAIT_NoError;
-
-	bool BankFull = !(Pipe_IsReadWriteAllowed());
-
-	Pipe_ClearOUT();
-
-	if (BankFull)
-	{
-		if ((ErrorCode = Pipe_WaitUntilReady()) != PIPE_READYWAIT_NoError)
-		  return ErrorCode;
-
-		Pipe_ClearOUT();
-	}
-
-	Pipe_Freeze();
-
-	return PIPE_READYWAIT_NoError;
-}
-
-uint8_t PRNT_Host_SendByte(USB_ClassInfo_PRNT_Host_t* const PRNTInterfaceInfo,
-                           const uint8_t Data)
-{
-	if ((USB_HostState != HOST_STATE_Configured) || !(PRNTInterfaceInfo->State.IsActive))
-	  return PIPE_READYWAIT_DeviceDisconnected;
-
-	uint8_t ErrorCode;
-
-	Pipe_SelectPipe(PRNTInterfaceInfo->Config.DataOUTPipe.Address);
-	Pipe_Unfreeze();
-
-	if (!(Pipe_IsReadWriteAllowed()))
-	{
-		Pipe_ClearOUT();
-
-		if ((ErrorCode = Pipe_WaitUntilReady()) != PIPE_READYWAIT_NoError)
-		  return ErrorCode;
-	}
-
-	Pipe_Write_8(Data);
-	Pipe_Freeze();
-
-	return PIPE_READYWAIT_NoError;
-}
-
-uint8_t PRNT_Host_SendString(USB_ClassInfo_PRNT_Host_t* const PRNTInterfaceInfo,
-                             const char* const String)
-{
-	uint8_t ErrorCode;
-
-	if ((USB_HostState != HOST_STATE_Configured) || !(PRNTInterfaceInfo->State.IsActive))
-	  return PIPE_RWSTREAM_DeviceDisconnected;
-
-	Pipe_SelectPipe(PRNTInterfaceInfo->Config.DataOUTPipe.Address);
-	Pipe_Unfreeze();
-
-	if ((ErrorCode = Pipe_Write_Stream_LE(String, strlen(String), NULL)) != PIPE_RWSTREAM_NoError)
-	  return ErrorCode;
-
-	Pipe_ClearOUT();
-
-	ErrorCode = Pipe_WaitUntilReady();
-
-	Pipe_Freeze();
-
-	return ErrorCode;
-}
-
-uint8_t PRNT_Host_SendData(USB_ClassInfo_PRNT_Host_t* const PRNTInterfaceInfo,
-                           const void* Buffer,
-                           const uint16_t Length)
-{
-	uint8_t ErrorCode;
-
-	if ((USB_HostState != HOST_STATE_Configured) || !(PRNTInterfaceInfo->State.IsActive))
-	  return PIPE_RWSTREAM_DeviceDisconnected;
-
-	Pipe_SelectPipe(PRNTInterfaceInfo->Config.DataOUTPipe.Address);
-	Pipe_Unfreeze();
-
-	if ((ErrorCode = Pipe_Write_Stream_LE(Buffer, Length, NULL)) != PIPE_RWSTREAM_NoError)
-	  return ErrorCode;
-
-	Pipe_ClearOUT();
-
-	ErrorCode = Pipe_WaitUntilReady();
-
-	Pipe_Freeze();
-
-	return ErrorCode;
-}
-
-uint16_t PRNT_Host_BytesReceived(USB_ClassInfo_PRNT_Host_t* const PRNTInterfaceInfo)
-{
-	if ((USB_HostState != HOST_STATE_Configured) || !(PRNTInterfaceInfo->State.IsActive))
-	  return 0;
-
-	Pipe_SelectPipe(PRNTInterfaceInfo->Config.DataINPipe.Address);
-	Pipe_Unfreeze();
-
-	if (Pipe_IsINReceived())
-	{
-		if (!(Pipe_BytesInPipe()))
-		{
-			Pipe_ClearIN();
-			Pipe_Freeze();
-			return 0;
-		}
-		else
-		{
-			Pipe_Freeze();
-			return Pipe_BytesInPipe();
-		}
-	}
-	else
-	{
-		Pipe_Freeze();
-
-		return 0;
-	}
-}
-
-int16_t PRNT_Host_ReceiveByte(USB_ClassInfo_PRNT_Host_t* const PRNTInterfaceInfo)
-{
-	if ((USB_HostState != HOST_STATE_Configured) || !(PRNTInterfaceInfo->State.IsActive))
-	  return PIPE_RWSTREAM_DeviceDisconnected;
-
-	int16_t ReceivedByte = -1;
-
-	Pipe_SelectPipe(PRNTInterfaceInfo->Config.DataINPipe.Address);
-	Pipe_Unfreeze();
-
-	if (Pipe_IsINReceived())
-	{
-		if (Pipe_BytesInPipe())
-		  ReceivedByte = Pipe_Read_8();
-
-		if (!(Pipe_BytesInPipe()))
-		  Pipe_ClearIN();
-	}
-
-	Pipe_Freeze();
-
-	return ReceivedByte;
-}
-
-uint8_t PRNT_Host_GetDeviceID(USB_ClassInfo_PRNT_Host_t* const PRNTInterfaceInfo,
-                              char* const DeviceIDString,
-                              const uint16_t BufferSize)
-{
-	uint8_t  ErrorCode;
-	uint16_t DeviceIDStringLength = 0;
-
-	USB_ControlRequest = (USB_Request_Header_t)
-		{
-			.bmRequestType = (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE),
-			.bRequest      = PRNT_REQ_GetDeviceID,
-			.wValue        = 0,
-			.wIndex        = PRNTInterfaceInfo->State.InterfaceNumber,
-			.wLength       = sizeof(DeviceIDStringLength),
-		};
-
-	Pipe_SelectPipe(PIPE_CONTROLPIPE);
-
-	if ((ErrorCode = USB_Host_SendControlRequest(&DeviceIDStringLength)) != HOST_SENDCONTROL_Successful)
-	  return ErrorCode;
-
-	if (!(DeviceIDStringLength))
-	{
-		DeviceIDString[0] = 0x00;
-		return HOST_SENDCONTROL_Successful;
-	}
-
-	DeviceIDStringLength = be16_to_cpu(DeviceIDStringLength);
-
-	if (DeviceIDStringLength > BufferSize)
-	  DeviceIDStringLength = BufferSize;
-
-	USB_ControlRequest.wLength = DeviceIDStringLength;
-
-	if ((ErrorCode = USB_Host_SendControlRequest(DeviceIDString)) != HOST_SENDCONTROL_Successful)
-	  return ErrorCode;
-
-	memmove(&DeviceIDString[0], &DeviceIDString[2], DeviceIDStringLength - 2);
-
-	DeviceIDString[DeviceIDStringLength - 2] = 0x00;
-
-	return HOST_SENDCONTROL_Successful;
-}
-
-#endif
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Class/Host/PrinterClassHost.h b/NativePrograms/LUFA/Drivers/USB/Class/Host/PrinterClassHost.h
deleted file mode 100644
index 91cc51e981..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Class/Host/PrinterClassHost.h
+++ /dev/null
@@ -1,285 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Host mode driver for the library USB Printer Class driver.
- *
- *  Host mode driver for the library USB Printer Class driver.
- *
- *  \note This file should not be included directly. It is automatically included as needed by the USB module driver
- *        dispatch header located in LUFA/Drivers/USB.h.
- */
-
-/** \ingroup Group_USBClassPrinter
- *  \defgroup Group_USBClassPrinterHost Printer Class Host Mode Driver
- *
- *  \section Sec_USBClassPrinterHost_Dependencies Module Source Dependencies
- *  The following files must be built with any user project that uses this module:
- *    - LUFA/Drivers/USB/Class/Host/PrinterClassHost.c <i>(Makefile source module name: LUFA_SRC_USBCLASS)</i>
- *
- *  \section Sec_USBClassPrinterHost_ModDescription Module Description
- *  Host Mode USB Class driver framework interface, for the Printer USB Class driver.
- *
- *  @{
- */
-
-#ifndef __PRINTER_CLASS_HOST_H__
-#define __PRINTER_CLASS_HOST_H__
-
-	/* Includes: */
-		#include "../../USB.h"
-		#include "../Common/PrinterClassCommon.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_PRINTER_DRIVER)
-			#error Do not include this file directly. Include LUFA/Drivers/USB.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Type Defines: */
-			/** \brief Printer Class Host Mode Configuration and State Structure.
-			 *
-			 *  Class state structure. An instance of this structure should be made within the user application,
-			 *  and passed to each of the Printer class driver functions as the \c PRNTInterfaceInfo parameter. This
-			 *  stores each Printer interface's configuration and state information.
-			 */
-			typedef struct
-			{
-				struct
-				{
-					USB_Pipe_Table_t DataINPipe; /**< Data IN Pipe configuration table. */
-					USB_Pipe_Table_t DataOUTPipe; /**< Data OUT Pipe configuration table. */
-				} Config; /**< Config data for the USB class interface within the device. All elements in this section
-				           *   <b>must</b> be set or the interface will fail to enumerate and operate correctly.
-				           */
-				struct
-				{
-					bool IsActive; /**< Indicates if the current interface instance is connected to an attached device, valid
-					                *   after \ref PRNT_Host_ConfigurePipes() is called and the Host state machine is in the
-					                *   Configured state.
-					                */
-					uint8_t InterfaceNumber; /**< Interface index of the Printer interface within the attached device. */
-					uint8_t AlternateSetting; /**< Alternate setting within the Printer Interface in the attached device. */
-				} State; /**< State data for the USB class interface within the device. All elements in this section
-						  *   <b>may</b> be set to initial values, but may also be ignored to default to sane values when
-						  *   the interface is enumerated.
-						  */
-			} USB_ClassInfo_PRNT_Host_t;
-
-		/* Enums: */
-			/** Enum for the possible error codes returned by the \ref PRNT_Host_ConfigurePipes() function. */
-			enum PRNT_Host_EnumerationFailure_ErrorCodes_t
-			{
-				PRNT_ENUMERROR_NoError                    = 0, /**< Configuration Descriptor was processed successfully. */
-				PRNT_ENUMERROR_InvalidConfigDescriptor    = 1, /**< The device returned an invalid Configuration Descriptor. */
-				PRNT_ENUMERROR_NoCompatibleInterfaceFound = 2, /**< A compatible Printer interface was not found in the device's Configuration Descriptor. */
-				PRNT_ENUMERROR_PipeConfigurationFailed    = 3, /**< One or more pipes for the specified interface could not be configured correctly. */
-			};
-
-		/* Function Prototypes: */
-			/** Host interface configuration routine, to configure a given Printer host interface instance using the
-			 *  Configuration Descriptor read from an attached USB device. This function automatically updates the given Printer
-			 *  instance's state values and configures the pipes required to communicate with the interface if it is found within
-			 *  the device. This should be called once after the stack has enumerated the attached device, while the host state
-			 *  machine is in the Addressed state.
-			 *
-			 *  \param[in,out] PRNTInterfaceInfo     Pointer to a structure containing a Printer Class host configuration and state.
-			 *  \param[in]     ConfigDescriptorSize  Length of the attached device's Configuration Descriptor.
-			 *  \param[in]     ConfigDescriptorData  Pointer to a buffer containing the attached device's Configuration Descriptor.
-			 *
-			 *  \return A value from the \ref PRNT_Host_EnumerationFailure_ErrorCodes_t enum.
-			 */
-			uint8_t PRNT_Host_ConfigurePipes(USB_ClassInfo_PRNT_Host_t* const PRNTInterfaceInfo,
-			                                 uint16_t ConfigDescriptorSize,
-			                                 void* ConfigDescriptorData) ATTR_NON_NULL_PTR_ARG(1) ATTR_NON_NULL_PTR_ARG(3);
-
-			/** General management task for a given Printer host class interface, required for the correct operation of
-			 *  the interface. This should be called frequently in the main program loop, before the master USB management task
-			 *  \ref USB_USBTask().
-			 *
-			 *  \param[in,out] PRNTInterfaceInfo  Pointer to a structure containing a Printer Class host configuration and state.
-			 */
-			void PRNT_Host_USBTask(USB_ClassInfo_PRNT_Host_t* const PRNTInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Configures the printer to enable Bidirectional mode, if it is not already in this mode. This should be called
-			 *  once the connected device's configuration has been set, to ensure the printer is ready to accept commands.
-			 *
-			 *  \param[in,out] PRNTInterfaceInfo  Pointer to a structure containing a Printer Class host configuration and state.
-			 *
-			 *  \return A value from the \ref USB_Host_SendControlErrorCodes_t enum.
-			 */
-			uint8_t PRNT_Host_SetBidirectionalMode(USB_ClassInfo_PRNT_Host_t* const PRNTInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Retrieves the status of the virtual Printer port's inbound status lines. The result can then be masked against the
-			 *  \c PRNT_PORTSTATUS_* macros to determine the printer port's status.
-			 *
-			 *  \param[in,out] PRNTInterfaceInfo  Pointer to a structure containing a Printer Class host configuration and state.
-			 *  \param[out]    PortStatus         Location where the retrieved port status should be stored.
-			 *
-			 *  \return A value from the \ref USB_Host_SendControlErrorCodes_t enum.
-			 */
-			uint8_t PRNT_Host_GetPortStatus(USB_ClassInfo_PRNT_Host_t* const PRNTInterfaceInfo,
-			                                uint8_t* const PortStatus)
-			                                ATTR_NON_NULL_PTR_ARG(1) ATTR_NON_NULL_PTR_ARG(2);
-
-			/** Soft-resets the attached printer, readying it for new commands.
-			 *
-			 *  \param[in,out] PRNTInterfaceInfo  Pointer to a structure containing a Printer Class host configuration and state.
-			 *
-			 *  \return A value from the \ref USB_Host_SendControlErrorCodes_t enum.
-			 */
-			uint8_t PRNT_Host_SoftReset(USB_ClassInfo_PRNT_Host_t* const PRNTInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Flushes any data waiting to be sent, ensuring that the send buffer is cleared.
-			 *
-			 *  \pre This function must only be called when the Host state machine is in the \ref HOST_STATE_Configured state or the
-			 *       call will fail.
-			 *
-			 *  \param[in,out] PRNTInterfaceInfo  Pointer to a structure containing a Printer Class host configuration and state.
-			 *
-			 *  \return A value from the \ref Pipe_WaitUntilReady_ErrorCodes_t enum.
-			 */
-			uint8_t PRNT_Host_Flush(USB_ClassInfo_PRNT_Host_t* const PRNTInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Sends the given null terminated string to the attached printer's input endpoint.
-			 *
-			 *  \pre This function must only be called when the Host state machine is in the \ref HOST_STATE_Configured state or the
-			 *       call will fail.
-			 *
-			 *  \param[in,out] PRNTInterfaceInfo  Pointer to a structure containing a Printer Class host configuration and state.
-			 *  \param[in]     String             Pointer to a null terminated string to send.
-			 *
-			 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t PRNT_Host_SendString(USB_ClassInfo_PRNT_Host_t* const PRNTInterfaceInfo,
-			                             const char* const String) ATTR_NON_NULL_PTR_ARG(1) ATTR_NON_NULL_PTR_ARG(2);
-
-			/** Sends the given raw data stream to the attached printer's input endpoint. This should contain commands that the
-			 *  printer is able to understand - for example, PCL data. Not all printers accept all printer languages; see
-			 *  \ref PRNT_Host_GetDeviceID() for details on determining acceptable languages for an attached printer.
-			 *
-			 *  \pre This function must only be called when the Host state machine is in the \ref HOST_STATE_Configured state or the
-			 *       call will fail.
-			 *
-			 *  \param[in,out] PRNTInterfaceInfo  Pointer to a structure containing a Printer Class host configuration and state.
-			 *  \param[in]     Buffer             Pointer to a buffer containing the raw command stream to send to the printer.
-			 *  \param[in]     Length             Size in bytes of the command stream to be sent.
-			 *
-			 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t PRNT_Host_SendData(USB_ClassInfo_PRNT_Host_t* const PRNTInterfaceInfo,
-			                           const void* Buffer,
-			                           const uint16_t Length) ATTR_NON_NULL_PTR_ARG(1) ATTR_NON_NULL_PTR_ARG(2);
-
-			/** Sends a given byte to the attached USB device, if connected. If a device is not connected when the function is called, the
-			 *  byte is discarded. Bytes will be queued for transmission to the device until either the pipe bank becomes full, or the
-			 *  \ref PRNT_Host_Flush() function is called to flush the pending data to the host. This allows for multiple bytes to be
-			 *  packed into a single pipe packet, increasing data throughput.
-			 *
-			 *  \pre This function must only be called when the Host state machine is in the \ref HOST_STATE_Configured state or the
-			 *       call will fail.
-			 *
-			 *  \param[in,out] PRNTInterfaceInfo  Pointer to a structure containing a Printer Class host configuration and state.
-			 *  \param[in]     Data               Byte of data to send to the device.
-			 *
-			 *  \return A value from the \ref Pipe_WaitUntilReady_ErrorCodes_t enum.
-			 */
-			uint8_t PRNT_Host_SendByte(USB_ClassInfo_PRNT_Host_t* const PRNTInterfaceInfo,
-			                           const uint8_t Data) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Determines the number of bytes received by the printer interface from the device, waiting to be read. This indicates the number
-			 *  of bytes in the IN pipe bank only, and thus the number of calls to \ref PRNT_Host_ReceiveByte() which are guaranteed to succeed
-			 *  immediately. If multiple bytes are to be received, they should be buffered by the user application, as the pipe bank will not be
-			 *  released back to the USB controller until all bytes are read.
-			 *
-			 *  \pre This function must only be called when the Host state machine is in the \ref HOST_STATE_Configured state or the
-			 *       call will fail.
-			 *
-			 *  \param[in,out] PRNTInterfaceInfo  Pointer to a structure containing a Printer Class host configuration and state.
-			 *
-			 *  \return Total number of buffered bytes received from the device.
-			 */
-			uint16_t PRNT_Host_BytesReceived(USB_ClassInfo_PRNT_Host_t* const PRNTInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Reads a byte of data from the device. If no data is waiting to be read of if a USB device is not connected, the function
-			 *  returns a negative value. The \ref PRNT_Host_BytesReceived() function may be queried in advance to determine how many bytes
-			 *  are currently buffered in the Printer interface's data receive pipe.
-			 *
-			 *  \pre This function must only be called when the Host state machine is in the \ref HOST_STATE_Configured state or the
-			 *       call will fail.
-			 *
-			 *  \param[in,out] PRNTInterfaceInfo  Pointer to a structure containing a Printer Class host configuration and state.
-			 *
-			 *  \return Next received byte from the device, or a negative value if no data received.
-			 */
-			int16_t PRNT_Host_ReceiveByte(USB_ClassInfo_PRNT_Host_t* const PRNTInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Retrieves the attached printer device's ID string, formatted according to IEEE 1284. This string is sent as a
-			 *  Unicode string from the device and is automatically converted to an ASCII encoded C string by this function, thus
-			 *  the maximum reportable string length is two less than the size given (to accommodate the Unicode string length
-			 *  bytes which are removed).
-			 *
-			 *  This string, when supported, contains the model, manufacturer and acceptable printer languages for the attached device.
-			 *
-			 *  \param[in,out] PRNTInterfaceInfo  Pointer to a structure containing a Printer Class host configuration and state.
-			 *  \param[out]    DeviceIDString     Pointer to a buffer where the Device ID string should be stored, in ASCII format.
-			 *  \param[in]     BufferSize         Size in bytes of the buffer allocated for the Device ID string.
-			 *
-			 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t PRNT_Host_GetDeviceID(USB_ClassInfo_PRNT_Host_t* const PRNTInterfaceInfo,
-			                              char* const DeviceIDString,
-			                              const uint16_t BufferSize) ATTR_NON_NULL_PTR_ARG(1) ATTR_NON_NULL_PTR_ARG(2);
-
-	/* Private Interface - For use in library only: */
-	#if !defined(__DOXYGEN__)
-		/* Function Prototypes: */
-			#if defined(__INCLUDE_FROM_PRINTER_HOST_C)
-				static uint8_t DCOMP_PRNT_Host_NextPRNTInterface(void* const CurrentDescriptor)
-				                                                 ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(1);
-				static uint8_t DCOMP_PRNT_Host_NextPRNTInterfaceEndpoint(void* const CurrentDescriptor)
-				                                                         ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(1);
-			#endif
-	#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Class/Host/RNDISClassHost.c b/NativePrograms/LUFA/Drivers/USB/Class/Host/RNDISClassHost.c
deleted file mode 100644
index 94d8458edc..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Class/Host/RNDISClassHost.c
+++ /dev/null
@@ -1,476 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-#define  __INCLUDE_FROM_USB_DRIVER
-#include "../../Core/USBMode.h"
-
-#if defined(USB_CAN_BE_HOST)
-
-#define  __INCLUDE_FROM_RNDIS_DRIVER
-#define  __INCLUDE_FROM_RNDIS_HOST_C
-#include "RNDISClassHost.h"
-
-uint8_t RNDIS_Host_ConfigurePipes(USB_ClassInfo_RNDIS_Host_t* const RNDISInterfaceInfo,
-                                  uint16_t ConfigDescriptorSize,
-                                  void* ConfigDescriptorData)
-{
-	USB_Descriptor_Endpoint_t*  DataINEndpoint        = NULL;
-	USB_Descriptor_Endpoint_t*  DataOUTEndpoint       = NULL;
-	USB_Descriptor_Endpoint_t*  NotificationEndpoint  = NULL;
-	USB_Descriptor_Interface_t* RNDISControlInterface = NULL;
-
-	memset(&RNDISInterfaceInfo->State, 0x00, sizeof(RNDISInterfaceInfo->State));
-
-	if (DESCRIPTOR_TYPE(ConfigDescriptorData) != DTYPE_Configuration)
-	  return RNDIS_ENUMERROR_InvalidConfigDescriptor;
-
-	RNDISControlInterface = DESCRIPTOR_PCAST(ConfigDescriptorData, USB_Descriptor_Interface_t);
-
-	while (!(DataINEndpoint) || !(DataOUTEndpoint) || !(NotificationEndpoint))
-	{
-		if (!(RNDISControlInterface) ||
-		    USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData,
-		                              DCOMP_RNDIS_Host_NextRNDISInterfaceEndpoint) != DESCRIPTOR_SEARCH_COMP_Found)
-		{
-			if (NotificationEndpoint)
-			{
-				if (USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData,
-											  DCOMP_RNDIS_Host_NextRNDISDataInterface) != DESCRIPTOR_SEARCH_COMP_Found)
-				{
-					return RNDIS_ENUMERROR_NoCompatibleInterfaceFound;
-				}
-
-				DataINEndpoint  = NULL;
-				DataOUTEndpoint = NULL;
-			}
-			else
-			{
-				if (USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData,
-											  DCOMP_RNDIS_Host_NextRNDISControlInterface) != DESCRIPTOR_SEARCH_COMP_Found)
-				{
-					return RNDIS_ENUMERROR_NoCompatibleInterfaceFound;
-				}
-
-				RNDISControlInterface = DESCRIPTOR_PCAST(ConfigDescriptorData, USB_Descriptor_Interface_t);
-
-				NotificationEndpoint = NULL;
-			}
-
-			continue;
-		}
-
-		USB_Descriptor_Endpoint_t* EndpointData = DESCRIPTOR_PCAST(ConfigDescriptorData, USB_Descriptor_Endpoint_t);
-
-		if ((EndpointData->EndpointAddress & ENDPOINT_DIR_MASK) == ENDPOINT_DIR_IN)
-		{
-			if ((EndpointData->Attributes & EP_TYPE_MASK) == EP_TYPE_INTERRUPT)
-			  NotificationEndpoint = EndpointData;
-			else
-			  DataINEndpoint = EndpointData;
-		}
-		else
-		{
-			DataOUTEndpoint = EndpointData;
-		}
-	}
-
-	RNDISInterfaceInfo->Config.DataINPipe.Size  = le16_to_cpu(DataINEndpoint->EndpointSize);
-	RNDISInterfaceInfo->Config.DataINPipe.EndpointAddress = DataINEndpoint->EndpointAddress;
-	RNDISInterfaceInfo->Config.DataINPipe.Type  = EP_TYPE_BULK;
-
-	RNDISInterfaceInfo->Config.DataOUTPipe.Size = le16_to_cpu(DataOUTEndpoint->EndpointSize);
-	RNDISInterfaceInfo->Config.DataOUTPipe.EndpointAddress = DataOUTEndpoint->EndpointAddress;
-	RNDISInterfaceInfo->Config.DataOUTPipe.Type = EP_TYPE_BULK;
-
-	RNDISInterfaceInfo->Config.NotificationPipe.Size = le16_to_cpu(NotificationEndpoint->EndpointSize);
-	RNDISInterfaceInfo->Config.NotificationPipe.EndpointAddress = NotificationEndpoint->EndpointAddress;
-	RNDISInterfaceInfo->Config.NotificationPipe.Type = EP_TYPE_INTERRUPT;
-
-	if (!(Pipe_ConfigurePipeTable(&RNDISInterfaceInfo->Config.DataINPipe, 1)))
-	  return RNDIS_ENUMERROR_PipeConfigurationFailed;
-
-	if (!(Pipe_ConfigurePipeTable(&RNDISInterfaceInfo->Config.DataOUTPipe, 1)))
-	  return RNDIS_ENUMERROR_PipeConfigurationFailed;
-
-	if (!(Pipe_ConfigurePipeTable(&RNDISInterfaceInfo->Config.NotificationPipe, 1)))
-	  return RNDIS_ENUMERROR_PipeConfigurationFailed;
-
-	RNDISInterfaceInfo->State.ControlInterfaceNumber = RNDISControlInterface->InterfaceNumber;
-	RNDISInterfaceInfo->State.IsActive = true;
-
-	return RNDIS_ENUMERROR_NoError;
-}
-
-static uint8_t DCOMP_RNDIS_Host_NextRNDISControlInterface(void* const CurrentDescriptor)
-{
-	USB_Descriptor_Header_t* Header = DESCRIPTOR_PCAST(CurrentDescriptor, USB_Descriptor_Header_t);
-
-	if (Header->Type == DTYPE_Interface)
-	{
-		USB_Descriptor_Interface_t* Interface = DESCRIPTOR_PCAST(CurrentDescriptor, USB_Descriptor_Interface_t);
-
-		if ((Interface->Class    == CDC_CSCP_CDCClass)    &&
-		    (Interface->SubClass == CDC_CSCP_ACMSubclass) &&
-		    (Interface->Protocol == CDC_CSCP_VendorSpecificProtocol))
-		{
-			return DESCRIPTOR_SEARCH_Found;
-		}
-	}
-
-	return DESCRIPTOR_SEARCH_NotFound;
-}
-
-static uint8_t DCOMP_RNDIS_Host_NextRNDISDataInterface(void* const CurrentDescriptor)
-{
-	USB_Descriptor_Header_t* Header = DESCRIPTOR_PCAST(CurrentDescriptor, USB_Descriptor_Header_t);
-
-	if (Header->Type == DTYPE_Interface)
-	{
-		USB_Descriptor_Interface_t* Interface = DESCRIPTOR_PCAST(CurrentDescriptor,
-		                                                         USB_Descriptor_Interface_t);
-
-		if ((Interface->Class    == CDC_CSCP_CDCDataClass)   &&
-		    (Interface->SubClass == CDC_CSCP_NoDataSubclass) &&
-		    (Interface->Protocol == CDC_CSCP_NoDataProtocol))
-		{
-			return DESCRIPTOR_SEARCH_Found;
-		}
-	}
-
-	return DESCRIPTOR_SEARCH_NotFound;
-}
-
-static uint8_t DCOMP_RNDIS_Host_NextRNDISInterfaceEndpoint(void* const CurrentDescriptor)
-{
-	USB_Descriptor_Header_t* Header = DESCRIPTOR_PCAST(CurrentDescriptor, USB_Descriptor_Header_t);
-
-	if (Header->Type == DTYPE_Endpoint)
-	{
-		USB_Descriptor_Endpoint_t* Endpoint = DESCRIPTOR_PCAST(CurrentDescriptor, USB_Descriptor_Endpoint_t);
-
-		uint8_t EndpointType = (Endpoint->Attributes & EP_TYPE_MASK);
-
-		if (((EndpointType == EP_TYPE_BULK) || (EndpointType == EP_TYPE_INTERRUPT)) &&
-		    !(Pipe_IsEndpointBound(Endpoint->EndpointAddress)))
-		{
-			return DESCRIPTOR_SEARCH_Found;
-		}
-	}
-	else if (Header->Type == DTYPE_Interface)
-	{
-		return DESCRIPTOR_SEARCH_Fail;
-	}
-
-	return DESCRIPTOR_SEARCH_NotFound;
-}
-
-static uint8_t RNDIS_SendEncapsulatedCommand(USB_ClassInfo_RNDIS_Host_t* const RNDISInterfaceInfo,
-                                             void* Buffer,
-                                             const uint16_t Length)
-{
-	USB_ControlRequest = (USB_Request_Header_t)
-		{
-			.bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE),
-			.bRequest      = RNDIS_REQ_SendEncapsulatedCommand,
-			.wValue        = 0,
-			.wIndex        = RNDISInterfaceInfo->State.ControlInterfaceNumber,
-			.wLength       = Length,
-		};
-
-	Pipe_SelectPipe(PIPE_CONTROLPIPE);
-
-	return USB_Host_SendControlRequest(Buffer);
-}
-
-static uint8_t RNDIS_GetEncapsulatedResponse(USB_ClassInfo_RNDIS_Host_t* const RNDISInterfaceInfo,
-                                             void* Buffer,
-                                             const uint16_t Length)
-{
-	USB_ControlRequest = (USB_Request_Header_t)
-		{
-			.bmRequestType = (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE),
-			.bRequest      = RNDIS_REQ_GetEncapsulatedResponse,
-			.wValue        = 0,
-			.wIndex        = RNDISInterfaceInfo->State.ControlInterfaceNumber,
-			.wLength       = Length,
-		};
-
-	Pipe_SelectPipe(PIPE_CONTROLPIPE);
-
-	return USB_Host_SendControlRequest(Buffer);
-}
-
-uint8_t RNDIS_Host_SendKeepAlive(USB_ClassInfo_RNDIS_Host_t* const RNDISInterfaceInfo)
-{
-	uint8_t ErrorCode;
-
-	RNDIS_KeepAlive_Message_t  KeepAliveMessage;
-	RNDIS_KeepAlive_Complete_t KeepAliveMessageResponse;
-
-	KeepAliveMessage.MessageType     = CPU_TO_LE32(REMOTE_NDIS_KEEPALIVE_MSG);
-	KeepAliveMessage.MessageLength   = CPU_TO_LE32(sizeof(RNDIS_KeepAlive_Message_t));
-	KeepAliveMessage.RequestId       = cpu_to_le32(RNDISInterfaceInfo->State.RequestID++);
-
-	if ((ErrorCode = RNDIS_SendEncapsulatedCommand(RNDISInterfaceInfo, &KeepAliveMessage,
-	                                               sizeof(RNDIS_KeepAlive_Message_t))) != HOST_SENDCONTROL_Successful)
-	{
-		return ErrorCode;
-	}
-
-	if ((ErrorCode = RNDIS_GetEncapsulatedResponse(RNDISInterfaceInfo, &KeepAliveMessageResponse,
-	                                               sizeof(RNDIS_KeepAlive_Complete_t))) != HOST_SENDCONTROL_Successful)
-	{
-		return ErrorCode;
-	}
-
-	return HOST_SENDCONTROL_Successful;
-}
-
-uint8_t RNDIS_Host_InitializeDevice(USB_ClassInfo_RNDIS_Host_t* const RNDISInterfaceInfo)
-{
-	uint8_t ErrorCode;
-
-	RNDIS_Initialize_Message_t  InitMessage;
-	RNDIS_Initialize_Complete_t InitMessageResponse;
-
-	InitMessage.MessageType     = CPU_TO_LE32(REMOTE_NDIS_INITIALIZE_MSG);
-	InitMessage.MessageLength   = CPU_TO_LE32(sizeof(RNDIS_Initialize_Message_t));
-	InitMessage.RequestId       = cpu_to_le32(RNDISInterfaceInfo->State.RequestID++);
-
-	InitMessage.MajorVersion    = CPU_TO_LE32(REMOTE_NDIS_VERSION_MAJOR);
-	InitMessage.MinorVersion    = CPU_TO_LE32(REMOTE_NDIS_VERSION_MINOR);
-	InitMessage.MaxTransferSize = cpu_to_le32(RNDISInterfaceInfo->Config.HostMaxPacketSize);
-
-	if ((ErrorCode = RNDIS_SendEncapsulatedCommand(RNDISInterfaceInfo, &InitMessage,
-	                                               sizeof(RNDIS_Initialize_Message_t))) != HOST_SENDCONTROL_Successful)
-	{
-		return ErrorCode;
-	}
-
-	if ((ErrorCode = RNDIS_GetEncapsulatedResponse(RNDISInterfaceInfo, &InitMessageResponse,
-	                                               sizeof(RNDIS_Initialize_Complete_t))) != HOST_SENDCONTROL_Successful)
-	{
-		return ErrorCode;
-	}
-
-	if (InitMessageResponse.Status != CPU_TO_LE32(REMOTE_NDIS_STATUS_SUCCESS))
-	  return RNDIS_ERROR_LOGICAL_CMD_FAILED;
-
-	RNDISInterfaceInfo->State.DeviceMaxPacketSize = le32_to_cpu(InitMessageResponse.MaxTransferSize);
-
-	return HOST_SENDCONTROL_Successful;
-}
-
-uint8_t RNDIS_Host_SetRNDISProperty(USB_ClassInfo_RNDIS_Host_t* const RNDISInterfaceInfo,
-                                    const uint32_t Oid,
-                                    void* Buffer,
-                                    const uint16_t Length)
-{
-	uint8_t ErrorCode;
-
-	struct
-	{
-		RNDIS_Set_Message_t SetMessage;
-		uint8_t             ContiguousBuffer[Length];
-	} SetMessageData;
-
-	RNDIS_Set_Complete_t SetMessageResponse;
-
-	SetMessageData.SetMessage.MessageType    = CPU_TO_LE32(REMOTE_NDIS_SET_MSG);
-	SetMessageData.SetMessage.MessageLength  = cpu_to_le32(sizeof(RNDIS_Set_Message_t) + Length);
-	SetMessageData.SetMessage.RequestId      = cpu_to_le32(RNDISInterfaceInfo->State.RequestID++);
-
-	SetMessageData.SetMessage.Oid            = cpu_to_le32(Oid);
-	SetMessageData.SetMessage.InformationBufferLength = cpu_to_le32(Length);
-	SetMessageData.SetMessage.InformationBufferOffset = CPU_TO_LE32(sizeof(RNDIS_Set_Message_t) - sizeof(RNDIS_Message_Header_t));
-	SetMessageData.SetMessage.DeviceVcHandle = CPU_TO_LE32(0);
-
-	memcpy(&SetMessageData.ContiguousBuffer, Buffer, Length);
-
-	if ((ErrorCode = RNDIS_SendEncapsulatedCommand(RNDISInterfaceInfo, &SetMessageData,
-	                                               (sizeof(RNDIS_Set_Message_t) + Length))) != HOST_SENDCONTROL_Successful)
-	{
-		return ErrorCode;
-	}
-
-	if ((ErrorCode = RNDIS_GetEncapsulatedResponse(RNDISInterfaceInfo, &SetMessageResponse,
-	                                               sizeof(RNDIS_Set_Complete_t))) != HOST_SENDCONTROL_Successful)
-	{
-		return ErrorCode;
-	}
-
-	if (SetMessageResponse.Status != CPU_TO_LE32(REMOTE_NDIS_STATUS_SUCCESS))
-	  return RNDIS_ERROR_LOGICAL_CMD_FAILED;
-
-	return HOST_SENDCONTROL_Successful;
-}
-
-uint8_t RNDIS_Host_QueryRNDISProperty(USB_ClassInfo_RNDIS_Host_t* const RNDISInterfaceInfo,
-                                      const uint32_t Oid,
-                                      void* Buffer,
-                                      const uint16_t MaxLength)
-{
-	uint8_t ErrorCode;
-
-	RNDIS_Query_Message_t QueryMessage;
-
-	struct
-	{
-		RNDIS_Query_Complete_t QueryMessageResponse;
-		uint8_t                ContiguousBuffer[MaxLength];
-	} QueryMessageResponseData;
-
-	QueryMessage.MessageType    = CPU_TO_LE32(REMOTE_NDIS_QUERY_MSG);
-	QueryMessage.MessageLength  = CPU_TO_LE32(sizeof(RNDIS_Query_Message_t));
-	QueryMessage.RequestId      = cpu_to_le32(RNDISInterfaceInfo->State.RequestID++);
-
-	QueryMessage.Oid            = cpu_to_le32(Oid);
-	QueryMessage.InformationBufferLength = CPU_TO_LE32(0);
-	QueryMessage.InformationBufferOffset = CPU_TO_LE32(0);
-	QueryMessage.DeviceVcHandle = CPU_TO_LE32(0);
-
-	if ((ErrorCode = RNDIS_SendEncapsulatedCommand(RNDISInterfaceInfo, &QueryMessage,
-	                                               sizeof(RNDIS_Query_Message_t))) != HOST_SENDCONTROL_Successful)
-	{
-		return ErrorCode;
-	}
-
-	if ((ErrorCode = RNDIS_GetEncapsulatedResponse(RNDISInterfaceInfo, &QueryMessageResponseData,
-	                                               sizeof(QueryMessageResponseData))) != HOST_SENDCONTROL_Successful)
-	{
-		return ErrorCode;
-	}
-
-	if (QueryMessageResponseData.QueryMessageResponse.Status != CPU_TO_LE32(REMOTE_NDIS_STATUS_SUCCESS))
-	  return RNDIS_ERROR_LOGICAL_CMD_FAILED;
-
-	memcpy(Buffer, &QueryMessageResponseData.ContiguousBuffer, MaxLength);
-
-	return HOST_SENDCONTROL_Successful;
-}
-
-bool RNDIS_Host_IsPacketReceived(USB_ClassInfo_RNDIS_Host_t* const RNDISInterfaceInfo)
-{
-	bool PacketWaiting;
-
-	if ((USB_HostState != HOST_STATE_Configured) || !(RNDISInterfaceInfo->State.IsActive))
-	  return false;
-
-	Pipe_SelectPipe(RNDISInterfaceInfo->Config.DataINPipe.Address);
-
-	Pipe_Unfreeze();
-	PacketWaiting = Pipe_IsINReceived();
-	Pipe_Freeze();
-
-	return PacketWaiting;
-}
-
-uint8_t RNDIS_Host_ReadPacket(USB_ClassInfo_RNDIS_Host_t* const RNDISInterfaceInfo,
-                              void* Buffer,
-                              uint16_t* const PacketLength)
-{
-	uint8_t ErrorCode;
-
-	if ((USB_HostState != HOST_STATE_Configured) || !(RNDISInterfaceInfo->State.IsActive))
-	  return PIPE_READYWAIT_DeviceDisconnected;
-
-	Pipe_SelectPipe(RNDISInterfaceInfo->Config.DataINPipe.Address);
-	Pipe_Unfreeze();
-
-	if (!(Pipe_IsReadWriteAllowed()))
-	{
-		if (Pipe_IsINReceived())
-		  Pipe_ClearIN();
-
-		*PacketLength = 0;
-		Pipe_Freeze();
-		return PIPE_RWSTREAM_NoError;
-	}
-
-	RNDIS_Packet_Message_t DeviceMessage;
-
-	if ((ErrorCode = Pipe_Read_Stream_LE(&DeviceMessage, sizeof(RNDIS_Packet_Message_t),
-	                                     NULL)) != PIPE_RWSTREAM_NoError)
-	{
-		return ErrorCode;
-	}
-
-	*PacketLength = (uint16_t)le32_to_cpu(DeviceMessage.DataLength);
-
-	Pipe_Discard_Stream(le32_to_cpu(DeviceMessage.DataOffset) -
-	                    (sizeof(RNDIS_Packet_Message_t) - sizeof(RNDIS_Message_Header_t)),
-	                    NULL);
-
-	Pipe_Read_Stream_LE(Buffer, *PacketLength, NULL);
-
-	if (!(Pipe_BytesInPipe()))
-	  Pipe_ClearIN();
-
-	Pipe_Freeze();
-
-	return PIPE_RWSTREAM_NoError;
-}
-
-uint8_t RNDIS_Host_SendPacket(USB_ClassInfo_RNDIS_Host_t* const RNDISInterfaceInfo,
-                              void* Buffer,
-                              const uint16_t PacketLength)
-{
-	uint8_t ErrorCode;
-
-	if ((USB_HostState != HOST_STATE_Configured) || !(RNDISInterfaceInfo->State.IsActive))
-	  return PIPE_READYWAIT_DeviceDisconnected;
-
-	RNDIS_Packet_Message_t DeviceMessage;
-
-	memset(&DeviceMessage, 0, sizeof(RNDIS_Packet_Message_t));
-	DeviceMessage.MessageType   = CPU_TO_LE32(REMOTE_NDIS_PACKET_MSG);
-	DeviceMessage.MessageLength = CPU_TO_LE32(sizeof(RNDIS_Packet_Message_t) + PacketLength);
-	DeviceMessage.DataOffset    = CPU_TO_LE32(sizeof(RNDIS_Packet_Message_t) - sizeof(RNDIS_Message_Header_t));
-	DeviceMessage.DataLength    = cpu_to_le32(PacketLength);
-
-	Pipe_SelectPipe(RNDISInterfaceInfo->Config.DataOUTPipe.Address);
-	Pipe_Unfreeze();
-
-	if ((ErrorCode = Pipe_Write_Stream_LE(&DeviceMessage, sizeof(RNDIS_Packet_Message_t),
-	                                      NULL)) != PIPE_RWSTREAM_NoError)
-	{
-		return ErrorCode;
-	}
-
-	Pipe_Write_Stream_LE(Buffer, PacketLength, NULL);
-	Pipe_ClearOUT();
-
-	Pipe_Freeze();
-
-	return PIPE_RWSTREAM_NoError;
-}
-
-#endif
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Class/Host/RNDISClassHost.h b/NativePrograms/LUFA/Drivers/USB/Class/Host/RNDISClassHost.h
deleted file mode 100644
index f7c009dc1e..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Class/Host/RNDISClassHost.h
+++ /dev/null
@@ -1,270 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Host mode driver for the library USB RNDIS Class driver.
- *
- *  Host mode driver for the library USB RNDIS Class driver.
- *
- *  \note This file should not be included directly. It is automatically included as needed by the USB module driver
- *        dispatch header located in LUFA/Drivers/USB.h.
- */
-
-/** \ingroup Group_USBClassRNDIS
- *  \defgroup Group_USBClassRNDISHost RNDIS Class Host Mode Driver
- *
- *  \section Sec_USBClassRNDISHost_Dependencies Module Source Dependencies
- *  The following files must be built with any user project that uses this module:
- *    - LUFA/Drivers/USB/Class/Host/RNDISClassHost.c <i>(Makefile source module name: LUFA_SRC_USBCLASS)</i>
- *
- *  \section Sec_USBClassRNDISHost_ModDescription Module Description
- *  Host Mode USB Class driver framework interface, for the Microsoft RNDIS Ethernet
- *  USB Class driver.
- *
- *  @{
- */
-
-#ifndef __RNDIS_CLASS_HOST_H__
-#define __RNDIS_CLASS_HOST_H__
-
-	/* Includes: */
-		#include "../../USB.h"
-		#include "../Common/RNDISClassCommon.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_RNDIS_DRIVER)
-			#error Do not include this file directly. Include LUFA/Drivers/USB.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Type Defines: */
-			/** \brief RNDIS Class Host Mode Configuration and State Structure.
-			 *
-			 *  Class state structure. An instance of this structure should be made within the user application,
-			 *  and passed to each of the RNDIS class driver functions as the \c RNDISInterfaceInfo parameter. This
-			 *  stores each RNDIS interface's configuration and state information.
-			 */
-			typedef struct
-			{
-				struct
-				{
-					USB_Pipe_Table_t DataINPipe; /**< Data IN Pipe configuration table. */
-					USB_Pipe_Table_t DataOUTPipe; /**< Data OUT Pipe configuration table. */
-					USB_Pipe_Table_t NotificationPipe; /**< Notification IN Pipe configuration table. */
-
-					uint32_t HostMaxPacketSize; /**< Maximum size of a packet which can be buffered by the host. */
-				} Config; /**< Config data for the USB class interface within the device. All elements in this section
-				           *   <b>must</b> be set or the interface will fail to enumerate and operate correctly.
-				           */
-				struct
-				{
-					bool IsActive; /**< Indicates if the current interface instance is connected to an attached device, valid
-					                *   after \ref RNDIS_Host_ConfigurePipes() is called and the Host state machine is in the
-					                *   Configured state.
-					                */
-					uint8_t ControlInterfaceNumber; /**< Interface index of the RNDIS control interface within the attached device. */
-
-					uint32_t DeviceMaxPacketSize; /**< Maximum size of a packet which can be buffered by the attached RNDIS device. */
-
-					uint32_t RequestID; /**< Request ID counter to give a unique ID for each command/response pair. */
-				} State; /**< State data for the USB class interface within the device. All elements in this section
-						  *   <b>may</b> be set to initial values, but may also be ignored to default to sane values when
-						  *   the interface is enumerated.
-						  */
-			} USB_ClassInfo_RNDIS_Host_t;
-
-		/* Enums: */
-			/** Enum for the possible error codes returned by the \ref RNDIS_Host_ConfigurePipes() function. */
-			enum RNDIS_Host_EnumerationFailure_ErrorCodes_t
-			{
-				RNDIS_ENUMERROR_NoError                    = 0, /**< Configuration Descriptor was processed successfully. */
-				RNDIS_ENUMERROR_InvalidConfigDescriptor    = 1, /**< The device returned an invalid Configuration Descriptor. */
-				RNDIS_ENUMERROR_NoCompatibleInterfaceFound = 2, /**< A compatible RNDIS interface was not found in the device's Configuration Descriptor. */
-				RNDIS_ENUMERROR_PipeConfigurationFailed    = 3, /**< One or more pipes for the specified interface could not be configured correctly. */
-			};
-
-		/* Function Prototypes: */
-			/** Host interface configuration routine, to configure a given RNDIS host interface instance using the Configuration
-			 *  Descriptor read from an attached USB device. This function automatically updates the given RNDIS Host instance's
-			 *  state values and configures the pipes required to communicate with the interface if it is found within the device.
-			 *  This should be called once after the stack has enumerated the attached device, while the host state machine is in
-			 *  the Addressed state.
-			 *
-			 *  \param[in,out] RNDISInterfaceInfo    Pointer to a structure containing an RNDIS Class host configuration and state.
-			 *  \param[in]     ConfigDescriptorSize  Length of the attached device's Configuration Descriptor.
-			 *  \param[in]     ConfigDescriptorData  Pointer to a buffer containing the attached device's Configuration Descriptor.
-			 *
-			 *  \return A value from the \ref RNDIS_Host_EnumerationFailure_ErrorCodes_t enum.
-			 */
-			uint8_t RNDIS_Host_ConfigurePipes(USB_ClassInfo_RNDIS_Host_t* const RNDISInterfaceInfo,
-			                                  uint16_t ConfigDescriptorSize,
-			                                  void* ConfigDescriptorData) ATTR_NON_NULL_PTR_ARG(1) ATTR_NON_NULL_PTR_ARG(3);
-
-			/** Sends a RNDIS KEEPALIVE command to the device, to ensure that it does not enter standby mode after periods
-			 *  of long inactivity.
-			 *
-			 *  \param[in,out] RNDISInterfaceInfo  Pointer to a structure containing an RNDIS Class host configuration and state.
-			 *
-			 *  \return A value from the \ref USB_Host_SendControlErrorCodes_t enum or \ref RNDIS_ERROR_LOGICAL_CMD_FAILED if the device returned a
-			 *          logical command failure.
-			 */
-			uint8_t RNDIS_Host_SendKeepAlive(USB_ClassInfo_RNDIS_Host_t* const RNDISInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Initializes the attached RNDIS device's RNDIS interface. This should be called after the device's pipes have been
-			 *  configured via the call to \ref RNDIS_Host_ConfigurePipes().
-			 *
-			 *  \param[in,out] RNDISInterfaceInfo  Pointer to a structure containing an RNDIS Class host configuration and state.
-			 *
-			 *  \return A value from the \ref USB_Host_SendControlErrorCodes_t enum or \ref RNDIS_ERROR_LOGICAL_CMD_FAILED if the
-			 *          device returned a logical command failure.
-			 */
-			uint8_t RNDIS_Host_InitializeDevice(USB_ClassInfo_RNDIS_Host_t* const RNDISInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Sets a given RNDIS property of an attached RNDIS device.
-			 *
-			 *  \param[in,out] RNDISInterfaceInfo  Pointer to a structure containing an RNDIS Class host configuration and state.
-			 *  \param[in]     Oid                 OID number of the parameter to set.
-			 *  \param[in]     Buffer              Pointer to where the property data is to be sourced from.
-			 *  \param[in]     Length              Length in bytes of the property data to sent to the device.
-			 *
-			 *  \return A value from the \ref USB_Host_SendControlErrorCodes_t enum or \ref RNDIS_ERROR_LOGICAL_CMD_FAILED if the
-			 *          device returned a logical command failure.
-			 */
-			uint8_t RNDIS_Host_SetRNDISProperty(USB_ClassInfo_RNDIS_Host_t* const RNDISInterfaceInfo,
-			                                    const uint32_t Oid,
-			                                    void* Buffer,
-			                                    const uint16_t Length) ATTR_NON_NULL_PTR_ARG(1) ATTR_NON_NULL_PTR_ARG(3);
-
-			/** Gets a given RNDIS property of an attached RNDIS device.
-			 *
-			 *  \param[in,out] RNDISInterfaceInfo  Pointer to a structure containing an RNDIS Class host configuration and state.
-			 *  \param[in]     Oid                 OID number of the parameter to get.
-			 *  \param[in]     Buffer              Pointer to where the property data is to be written to.
-			 *  \param[in]     MaxLength           Length in bytes of the destination buffer size.
-			 *
-			 *  \return A value from the \ref USB_Host_SendControlErrorCodes_t enum or \ref RNDIS_ERROR_LOGICAL_CMD_FAILED if the
-			 *          device returned a logical command failure.
-			 */
-			uint8_t RNDIS_Host_QueryRNDISProperty(USB_ClassInfo_RNDIS_Host_t* const RNDISInterfaceInfo,
-			                                      const uint32_t Oid,
-			                                      void* Buffer,
-			                                      const uint16_t MaxLength) ATTR_NON_NULL_PTR_ARG(1) ATTR_NON_NULL_PTR_ARG(3);
-
-			/** Determines if a packet is currently waiting for the host to read in and process.
-			 *
-			 *  \pre This function must only be called when the Host state machine is in the \ref HOST_STATE_Configured state or the
-			 *       call will fail.
-			 *
-			 *  \param[in,out] RNDISInterfaceInfo  Pointer to a structure containing an RNDIS Class host configuration and state.
-			 *
-			 *  \return Boolean \c true if a packet is waiting to be read in by the host, \c false otherwise.
-			 */
-			bool RNDIS_Host_IsPacketReceived(USB_ClassInfo_RNDIS_Host_t* const RNDISInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Retrieves the next pending packet from the device, discarding the remainder of the RNDIS packet header to leave
-			 *  only the packet contents for processing by the host in the nominated buffer.
-			 *
-			 *  \pre This function must only be called when the Host state machine is in the \ref HOST_STATE_Configured state or the
-			 *       call will fail.
-			 *
-			 *  \param[in,out] RNDISInterfaceInfo  Pointer to a structure containing an RNDIS Class host configuration and state.
-			 *  \param[out]    Buffer              Pointer to a buffer where the packer data is to be written to.
-			 *  \param[out]    PacketLength        Pointer to where the length in bytes of the read packet is to be stored.
-			 *
-			 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t RNDIS_Host_ReadPacket(USB_ClassInfo_RNDIS_Host_t* const RNDISInterfaceInfo,
-			                              void* Buffer,
-			                              uint16_t* const PacketLength) ATTR_NON_NULL_PTR_ARG(1) ATTR_NON_NULL_PTR_ARG(2)
-			                              ATTR_NON_NULL_PTR_ARG(3);
-
-			/** Sends the given packet to the attached RNDIS device, after adding a RNDIS packet message header.
-			 *
-			 *  \pre This function must only be called when the Host state machine is in the \ref HOST_STATE_Configured state or the
-			 *       call will fail.
-			 *
-			 *  \param[in,out] RNDISInterfaceInfo  Pointer to a structure containing an RNDIS Class host configuration and state.
-			 *  \param[in]     Buffer              Pointer to a buffer where the packer data is to be read from.
-			 *  \param[in]     PacketLength        Length in bytes of the packet to send.
-			 *
-			 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t RNDIS_Host_SendPacket(USB_ClassInfo_RNDIS_Host_t* const RNDISInterfaceInfo,
-			                              void* Buffer,
-			                              const uint16_t PacketLength) ATTR_NON_NULL_PTR_ARG(1) ATTR_NON_NULL_PTR_ARG(2);
-
-		/* Inline Functions: */
-			/** General management task for a given RNDIS host class interface, required for the correct operation of the interface. This should
-			 *  be called frequently in the main program loop, before the master USB management task \ref USB_USBTask().
-			 *
-			 *  \param[in,out] RNDISInterfaceInfo  Pointer to a structure containing an RNDIS Class host configuration and state.
-			 */
-			static inline void RNDIS_Host_USBTask(USB_ClassInfo_RNDIS_Host_t* const RNDISInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1) ATTR_ALWAYS_INLINE;
-			static inline void RNDIS_Host_USBTask(USB_ClassInfo_RNDIS_Host_t* const RNDISInterfaceInfo)
-			{
-				(void)RNDISInterfaceInfo;
-			}
-
-	/* Private Interface - For use in library only: */
-	#if !defined(__DOXYGEN__)
-		/* Function Prototypes: */
-			#if defined(__INCLUDE_FROM_RNDIS_HOST_C)
-				static uint8_t RNDIS_SendEncapsulatedCommand(USB_ClassInfo_RNDIS_Host_t* const RNDISInterfaceInfo,
-				                                             void* Buffer,
-				                                             const uint16_t Length) ATTR_NON_NULL_PTR_ARG(1)
-				                                             ATTR_NON_NULL_PTR_ARG(2);
-				static uint8_t RNDIS_GetEncapsulatedResponse(USB_ClassInfo_RNDIS_Host_t* const RNDISInterfaceInfo,
-				                                             void* Buffer,
-				                                             const uint16_t Length) ATTR_NON_NULL_PTR_ARG(1)
-				                                             ATTR_NON_NULL_PTR_ARG(2);
-
-				static uint8_t DCOMP_RNDIS_Host_NextRNDISControlInterface(void* const CurrentDescriptor)
-				                                                          ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(1);
-				static uint8_t DCOMP_RNDIS_Host_NextRNDISDataInterface(void* const CurrentDescriptor)
-				                                                       ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(1);
-				static uint8_t DCOMP_RNDIS_Host_NextRNDISInterfaceEndpoint(void* const CurrentDescriptor)
-				                                                           ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(1);
-			#endif
-	#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Class/Host/StillImageClassHost.c b/NativePrograms/LUFA/Drivers/USB/Class/Host/StillImageClassHost.c
deleted file mode 100644
index bdef5953a2..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Class/Host/StillImageClassHost.c
+++ /dev/null
@@ -1,436 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-#define  __INCLUDE_FROM_USB_DRIVER
-#include "../../Core/USBMode.h"
-
-#if defined(USB_CAN_BE_HOST)
-
-#define  __INCLUDE_FROM_SI_DRIVER
-#define  __INCLUDE_FROM_STILLIMAGE_HOST_C
-#include "StillImageClassHost.h"
-
-uint8_t SI_Host_ConfigurePipes(USB_ClassInfo_SI_Host_t* const SIInterfaceInfo,
-                               uint16_t ConfigDescriptorSize,
-                               void* ConfigDescriptorData)
-{
-	USB_Descriptor_Endpoint_t*  DataINEndpoint      = NULL;
-	USB_Descriptor_Endpoint_t*  DataOUTEndpoint     = NULL;
-	USB_Descriptor_Endpoint_t*  EventsEndpoint      = NULL;
-	USB_Descriptor_Interface_t* StillImageInterface = NULL;
-
-	memset(&SIInterfaceInfo->State, 0x00, sizeof(SIInterfaceInfo->State));
-
-	if (DESCRIPTOR_TYPE(ConfigDescriptorData) != DTYPE_Configuration)
-	  return SI_ENUMERROR_InvalidConfigDescriptor;
-
-	while (!(DataINEndpoint) || !(DataOUTEndpoint) || !(EventsEndpoint))
-	{
-		if (!(StillImageInterface) ||
-		    USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData,
-		                              DCOMP_SI_Host_NextSIInterfaceEndpoint) != DESCRIPTOR_SEARCH_COMP_Found)
-		{
-			if (USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData,
-			                              DCOMP_SI_Host_NextSIInterface) != DESCRIPTOR_SEARCH_COMP_Found)
-			{
-				return SI_ENUMERROR_NoCompatibleInterfaceFound;
-			}
-
-			StillImageInterface = DESCRIPTOR_PCAST(ConfigDescriptorData, USB_Descriptor_Interface_t);
-
-			DataINEndpoint  = NULL;
-			DataOUTEndpoint = NULL;
-			EventsEndpoint  = NULL;
-
-			continue;
-		}
-
-		USB_Descriptor_Endpoint_t* EndpointData = DESCRIPTOR_PCAST(ConfigDescriptorData, USB_Descriptor_Endpoint_t);
-
-		if ((EndpointData->EndpointAddress & ENDPOINT_DIR_MASK) == ENDPOINT_DIR_IN)
-		{
-			if ((EndpointData->Attributes & EP_TYPE_MASK) == EP_TYPE_INTERRUPT)
-			  EventsEndpoint = EndpointData;
-			else
-			  DataINEndpoint = EndpointData;
-		}
-		else
-		{
-			DataOUTEndpoint = EndpointData;
-		}
-	}
-
-	SIInterfaceInfo->Config.DataINPipe.Size  = le16_to_cpu(DataINEndpoint->EndpointSize);
-	SIInterfaceInfo->Config.DataINPipe.EndpointAddress = DataINEndpoint->EndpointAddress;
-	SIInterfaceInfo->Config.DataINPipe.Type  = EP_TYPE_BULK;
-
-	SIInterfaceInfo->Config.DataOUTPipe.Size = le16_to_cpu(DataOUTEndpoint->EndpointSize);
-	SIInterfaceInfo->Config.DataOUTPipe.EndpointAddress = DataOUTEndpoint->EndpointAddress;
-	SIInterfaceInfo->Config.DataOUTPipe.Type = EP_TYPE_BULK;
-
-	SIInterfaceInfo->Config.EventsPipe.Size = le16_to_cpu(EventsEndpoint->EndpointSize);
-	SIInterfaceInfo->Config.EventsPipe.EndpointAddress = EventsEndpoint->EndpointAddress;
-	SIInterfaceInfo->Config.EventsPipe.Type = EP_TYPE_INTERRUPT;
-
-	if (!(Pipe_ConfigurePipeTable(&SIInterfaceInfo->Config.DataINPipe, 1)))
-	  return SI_ENUMERROR_PipeConfigurationFailed;
-
-	if (!(Pipe_ConfigurePipeTable(&SIInterfaceInfo->Config.DataOUTPipe, 1)))
-	  return SI_ENUMERROR_PipeConfigurationFailed;
-
-	if (!(Pipe_ConfigurePipeTable(&SIInterfaceInfo->Config.EventsPipe, 1)))
-	  return SI_ENUMERROR_PipeConfigurationFailed;
-
-	SIInterfaceInfo->State.InterfaceNumber = StillImageInterface->InterfaceNumber;
-	SIInterfaceInfo->State.IsActive = true;
-
-	return SI_ENUMERROR_NoError;
-}
-
-uint8_t DCOMP_SI_Host_NextSIInterface(void* const CurrentDescriptor)
-{
-	USB_Descriptor_Header_t* Header = DESCRIPTOR_PCAST(CurrentDescriptor, USB_Descriptor_Header_t);
-
-	if (Header->Type == DTYPE_Interface)
-	{
-		USB_Descriptor_Interface_t* Interface = DESCRIPTOR_PCAST(CurrentDescriptor, USB_Descriptor_Interface_t);
-
-		if ((Interface->Class    == SI_CSCP_StillImageClass)    &&
-		    (Interface->SubClass == SI_CSCP_StillImageSubclass) &&
-		    (Interface->Protocol == SI_CSCP_BulkOnlyProtocol))
-		{
-			return DESCRIPTOR_SEARCH_Found;
-		}
-	}
-
-	return DESCRIPTOR_SEARCH_NotFound;
-}
-
-uint8_t DCOMP_SI_Host_NextSIInterfaceEndpoint(void* const CurrentDescriptor)
-{
-	USB_Descriptor_Header_t* Header = DESCRIPTOR_PCAST(CurrentDescriptor, USB_Descriptor_Header_t);
-
-	if (Header->Type == DTYPE_Endpoint)
-	{
-		USB_Descriptor_Endpoint_t* Endpoint = DESCRIPTOR_PCAST(CurrentDescriptor, USB_Descriptor_Endpoint_t);
-
-		uint8_t EndpointType = (Endpoint->Attributes & EP_TYPE_MASK);
-
-		if (((EndpointType == EP_TYPE_BULK) || (EndpointType == EP_TYPE_INTERRUPT)) &&
-		    (!(Pipe_IsEndpointBound(Endpoint->EndpointAddress))))
-		{
-			return DESCRIPTOR_SEARCH_Found;
-		}
-	}
-	else if (Header->Type == DTYPE_Interface)
-	{
-		return DESCRIPTOR_SEARCH_Fail;
-	}
-
-	return DESCRIPTOR_SEARCH_NotFound;
-}
-
-uint8_t SI_Host_SendBlockHeader(USB_ClassInfo_SI_Host_t* const SIInterfaceInfo,
-                                PIMA_Container_t* const PIMAHeader)
-{
-	uint8_t ErrorCode;
-
-	if ((USB_HostState != HOST_STATE_Configured) || !(SIInterfaceInfo->State.IsActive))
-	  return PIPE_RWSTREAM_DeviceDisconnected;
-
-	if (SIInterfaceInfo->State.IsSessionOpen)
-	  PIMAHeader->TransactionID = cpu_to_le32(SIInterfaceInfo->State.TransactionID++);
-
-	Pipe_SelectPipe(SIInterfaceInfo->Config.DataOUTPipe.Address);
-	Pipe_Unfreeze();
-
-	if ((ErrorCode = Pipe_Write_Stream_LE(PIMAHeader, PIMA_COMMAND_SIZE(0), NULL)) != PIPE_RWSTREAM_NoError)
-	  return ErrorCode;
-
-	uint8_t ParamBytes = (PIMAHeader->DataLength - PIMA_COMMAND_SIZE(0));
-
-	if (ParamBytes)
-	{
-		if ((ErrorCode = Pipe_Write_Stream_LE(&PIMAHeader->Params, ParamBytes, NULL)) != PIPE_RWSTREAM_NoError)
-		  return ErrorCode;
-	}
-
-	Pipe_ClearOUT();
-	Pipe_Freeze();
-
-	return PIPE_RWSTREAM_NoError;
-}
-
-uint8_t SI_Host_ReceiveBlockHeader(USB_ClassInfo_SI_Host_t* const SIInterfaceInfo,
-                                   PIMA_Container_t* const PIMAHeader)
-{
-	uint16_t TimeoutMSRem        = SI_COMMAND_DATA_TIMEOUT_MS;
-	uint16_t PreviousFrameNumber = USB_Host_GetFrameNumber();
-
-	if ((USB_HostState != HOST_STATE_Configured) || !(SIInterfaceInfo->State.IsActive))
-	  return PIPE_RWSTREAM_DeviceDisconnected;
-
-	Pipe_SelectPipe(SIInterfaceInfo->Config.DataINPipe.Address);
-	Pipe_Unfreeze();
-
-	while (!(Pipe_IsINReceived()))
-	{
-		uint16_t CurrentFrameNumber = USB_Host_GetFrameNumber();
-
-		if (CurrentFrameNumber != PreviousFrameNumber)
-		{
-			PreviousFrameNumber = CurrentFrameNumber;
-
-			if (!(TimeoutMSRem--))
-			  return PIPE_RWSTREAM_Timeout;
-		}
-
-		Pipe_Freeze();
-		Pipe_SelectPipe(SIInterfaceInfo->Config.DataOUTPipe.Address);
-		Pipe_Unfreeze();
-
-		if (Pipe_IsStalled())
-		{
-			USB_Host_ClearEndpointStall(Pipe_GetBoundEndpointAddress());
-			return PIPE_RWSTREAM_PipeStalled;
-		}
-
-		Pipe_Freeze();
-		Pipe_SelectPipe(SIInterfaceInfo->Config.DataINPipe.Address);
-		Pipe_Unfreeze();
-
-		if (Pipe_IsStalled())
-		{
-			USB_Host_ClearEndpointStall(Pipe_GetBoundEndpointAddress());
-			return PIPE_RWSTREAM_PipeStalled;
-		}
-
-		if (USB_HostState == HOST_STATE_Unattached)
-		  return PIPE_RWSTREAM_DeviceDisconnected;
-	}
-
-	Pipe_Read_Stream_LE(PIMAHeader, PIMA_COMMAND_SIZE(0), NULL);
-
-	if (PIMAHeader->Type == CPU_TO_LE16(PIMA_CONTAINER_ResponseBlock))
-	{
-		uint8_t ParamBytes = (PIMAHeader->DataLength - PIMA_COMMAND_SIZE(0));
-
-		if (ParamBytes)
-		  Pipe_Read_Stream_LE(&PIMAHeader->Params, ParamBytes, NULL);
-
-		Pipe_ClearIN();
-	}
-
-	Pipe_Freeze();
-
-	return PIPE_RWSTREAM_NoError;
-}
-
-uint8_t SI_Host_SendData(USB_ClassInfo_SI_Host_t* const SIInterfaceInfo,
-                         const void* Buffer,
-                         const uint16_t Bytes)
-{
-	uint8_t ErrorCode;
-
-	if ((USB_HostState != HOST_STATE_Configured) || !(SIInterfaceInfo->State.IsActive))
-	  return PIPE_RWSTREAM_DeviceDisconnected;
-
-	Pipe_SelectPipe(SIInterfaceInfo->Config.DataOUTPipe.Address);
-	Pipe_Unfreeze();
-
-	ErrorCode = Pipe_Write_Stream_LE(Buffer, Bytes, NULL);
-
-	Pipe_ClearOUT();
-	Pipe_Freeze();
-
-	return ErrorCode;
-}
-
-uint8_t SI_Host_ReadData(USB_ClassInfo_SI_Host_t* const SIInterfaceInfo,
-                         void* Buffer,
-                         const uint16_t Bytes)
-{
-	uint8_t ErrorCode;
-
-	if ((USB_HostState != HOST_STATE_Configured) || !(SIInterfaceInfo->State.IsActive))
-	  return PIPE_RWSTREAM_DeviceDisconnected;
-
-	Pipe_SelectPipe(SIInterfaceInfo->Config.DataINPipe.Address);
-	Pipe_Unfreeze();
-
-	ErrorCode = Pipe_Read_Stream_LE(Buffer, Bytes, NULL);
-
-	Pipe_Freeze();
-
-	return ErrorCode;
-}
-
-bool SI_Host_IsEventReceived(USB_ClassInfo_SI_Host_t* const SIInterfaceInfo)
-{
-	bool IsEventReceived = false;
-
-	if ((USB_HostState != HOST_STATE_Configured) || !(SIInterfaceInfo->State.IsActive))
-	  return false;
-
-	Pipe_SelectPipe(SIInterfaceInfo->Config.EventsPipe.Address);
-	Pipe_Unfreeze();
-
-	if (Pipe_IsINReceived())
-	  IsEventReceived = true;
-
-	Pipe_Freeze();
-
-	return IsEventReceived;
-}
-
-uint8_t SI_Host_ReceiveEventHeader(USB_ClassInfo_SI_Host_t* const SIInterfaceInfo,
-                                   PIMA_Container_t* const PIMAHeader)
-{
-	uint8_t ErrorCode;
-
-	if ((USB_HostState != HOST_STATE_Configured) || !(SIInterfaceInfo->State.IsActive))
-	  return PIPE_RWSTREAM_DeviceDisconnected;
-
-	Pipe_SelectPipe(SIInterfaceInfo->Config.EventsPipe.Address);
-	Pipe_Unfreeze();
-
-	ErrorCode = Pipe_Read_Stream_LE(PIMAHeader, sizeof(PIMA_Container_t), NULL);
-
-	Pipe_ClearIN();
-	Pipe_Freeze();
-
-	return ErrorCode;
-}
-
-uint8_t SI_Host_OpenSession(USB_ClassInfo_SI_Host_t* const SIInterfaceInfo)
-{
-	if ((USB_HostState != HOST_STATE_Configured) || !(SIInterfaceInfo->State.IsActive))
-	  return PIPE_RWSTREAM_DeviceDisconnected;
-
-	uint8_t ErrorCode;
-
-	SIInterfaceInfo->State.TransactionID = 0;
-	SIInterfaceInfo->State.IsSessionOpen = false;
-
-	PIMA_Container_t PIMABlock = (PIMA_Container_t)
-		{
-			.DataLength    = CPU_TO_LE32(PIMA_COMMAND_SIZE(1)),
-			.Type          = CPU_TO_LE16(PIMA_CONTAINER_CommandBlock),
-			.Code          = CPU_TO_LE16(0x1002),
-			.Params        = {CPU_TO_LE32(1)},
-		};
-
-	if ((ErrorCode = SI_Host_SendBlockHeader(SIInterfaceInfo, &PIMABlock)) != PIPE_RWSTREAM_NoError)
-	  return ErrorCode;
-
-	if ((ErrorCode = SI_Host_ReceiveBlockHeader(SIInterfaceInfo, &PIMABlock)) != PIPE_RWSTREAM_NoError)
-	  return ErrorCode;
-
-	if ((PIMABlock.Type != CPU_TO_LE16(PIMA_CONTAINER_ResponseBlock)) || (PIMABlock.Code != CPU_TO_LE16(0x2001)))
-	  return SI_ERROR_LOGICAL_CMD_FAILED;
-
-	SIInterfaceInfo->State.IsSessionOpen = true;
-
-	return PIPE_RWSTREAM_NoError;
-}
-
-uint8_t SI_Host_CloseSession(USB_ClassInfo_SI_Host_t* const SIInterfaceInfo)
-{
-	if ((USB_HostState != HOST_STATE_Configured) || !(SIInterfaceInfo->State.IsActive))
-	  return PIPE_RWSTREAM_DeviceDisconnected;
-
-	uint8_t ErrorCode;
-
-	PIMA_Container_t PIMABlock = (PIMA_Container_t)
-		{
-			.DataLength    = CPU_TO_LE32(PIMA_COMMAND_SIZE(1)),
-			.Type          = CPU_TO_LE16(PIMA_CONTAINER_CommandBlock),
-			.Code          = CPU_TO_LE16(0x1003),
-			.Params        = {CPU_TO_LE32(1)},
-		};
-
-	if ((ErrorCode = SI_Host_SendBlockHeader(SIInterfaceInfo, &PIMABlock)) != PIPE_RWSTREAM_NoError)
-	  return ErrorCode;
-
-	if ((ErrorCode = SI_Host_ReceiveBlockHeader(SIInterfaceInfo, &PIMABlock)) != PIPE_RWSTREAM_NoError)
-	  return ErrorCode;
-
-	SIInterfaceInfo->State.IsSessionOpen = false;
-
-	if ((PIMABlock.Type != CPU_TO_LE16(PIMA_CONTAINER_ResponseBlock)) || (PIMABlock.Code != CPU_TO_LE16(0x2001)))
-	  return SI_ERROR_LOGICAL_CMD_FAILED;
-
-	return PIPE_RWSTREAM_NoError;
-}
-
-uint8_t SI_Host_SendCommand(USB_ClassInfo_SI_Host_t* const SIInterfaceInfo,
-                            const uint16_t Operation,
-                            const uint8_t TotalParams,
-                            uint32_t* const Params)
-{
-	if ((USB_HostState != HOST_STATE_Configured) || !(SIInterfaceInfo->State.IsActive))
-	  return PIPE_RWSTREAM_DeviceDisconnected;
-
-	uint8_t ErrorCode;
-
-	PIMA_Container_t PIMABlock = (PIMA_Container_t)
-		{
-			.DataLength    = cpu_to_le32(PIMA_COMMAND_SIZE(TotalParams)),
-			.Type          = CPU_TO_LE16(PIMA_CONTAINER_CommandBlock),
-			.Code          = cpu_to_le16(Operation),
-		};
-
-	memcpy(&PIMABlock.Params, Params, sizeof(uint32_t) * TotalParams);
-
-	if ((ErrorCode = SI_Host_SendBlockHeader(SIInterfaceInfo, &PIMABlock)) != PIPE_RWSTREAM_NoError)
-	  return ErrorCode;
-
-	return PIPE_RWSTREAM_NoError;
-}
-
-uint8_t SI_Host_ReceiveResponse(USB_ClassInfo_SI_Host_t* const SIInterfaceInfo)
-{
-	uint8_t ErrorCode;
-	PIMA_Container_t PIMABlock;
-
-	if ((USB_HostState != HOST_STATE_Configured) || !(SIInterfaceInfo->State.IsActive))
-	  return PIPE_RWSTREAM_DeviceDisconnected;
-
-	if ((ErrorCode = SI_Host_ReceiveBlockHeader(SIInterfaceInfo, &PIMABlock)) != PIPE_RWSTREAM_NoError)
-	  return ErrorCode;
-
-	if ((PIMABlock.Type != CPU_TO_LE16(PIMA_CONTAINER_ResponseBlock)) || (PIMABlock.Code != CPU_TO_LE16(0x2001)))
-	  return SI_ERROR_LOGICAL_CMD_FAILED;
-
-	return PIPE_RWSTREAM_NoError;
-}
-
-#endif
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Class/Host/StillImageClassHost.h b/NativePrograms/LUFA/Drivers/USB/Class/Host/StillImageClassHost.h
deleted file mode 100644
index 7e7ed209f4..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Class/Host/StillImageClassHost.h
+++ /dev/null
@@ -1,317 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Host mode driver for the library USB Still Image Class driver.
- *
- *  Host mode driver for the library USB Still Image Class driver.
- *
- *  \note This file should not be included directly. It is automatically included as needed by the USB module driver
- *        dispatch header located in LUFA/Drivers/USB.h.
- */
-
-/** \ingroup Group_USBClassSI
- *  \defgroup Group_USBClassStillImageHost Still Image Class Host Mode Driver
- *
- *  \section Sec_USBClassStillImageHost_Dependencies Module Source Dependencies
- *  The following files must be built with any user project that uses this module:
- *    - LUFA/Drivers/USB/Class/Host/StillImageClassHost.c <i>(Makefile source module name: LUFA_SRC_USBCLASS)</i>
- *
- *  \section Sec_USBClassStillImageHost_ModDescription Module Description
- *  Host Mode USB Class driver framework interface, for the Still Image USB Class driver.
- *
- *  @{
- */
-
-#ifndef __SI_CLASS_HOST_H__
-#define __SI_CLASS_HOST_H__
-
-	/* Includes: */
-		#include "../../USB.h"
-		#include "../Common/StillImageClassCommon.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_SI_DRIVER)
-			#error Do not include this file directly. Include LUFA/Drivers/USB.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Error code for some Still Image Host functions, indicating a logical (and not hardware) error. */
-			#define SI_ERROR_LOGICAL_CMD_FAILED              0x80
-
-		/* Type Defines: */
-			/** \brief Still Image Class Host Mode Configuration and State Structure.
-			 *
-			 *  Class state structure. An instance of this structure should be made within the user application,
-			 *  and passed to each of the Still Image class driver functions as the \c SIInterfaceInfo parameter. This
-			 *  stores each Still Image interface's configuration and state information.
-			 */
-			typedef struct
-			{
-				struct
-				{
-					USB_Pipe_Table_t DataINPipe; /**< Data IN Pipe configuration table. */
-					USB_Pipe_Table_t DataOUTPipe; /**< Data OUT Pipe configuration table. */
-					USB_Pipe_Table_t EventsPipe; /**< Event notification IN Pipe configuration table. */
-				} Config; /**< Config data for the USB class interface within the device. All elements in this section
-				           *   <b>must</b> be set or the interface will fail to enumerate and operate correctly.
-				           */
-				struct
-				{
-					bool     IsActive; /**< Indicates if the current interface instance is connected to an attached device, valid
-					                    *   after \ref SI_Host_ConfigurePipes() is called and the Host state machine is in the
-					                    *   Configured state.
-					                    */
-					uint8_t  InterfaceNumber; /**< Interface index of the Still Image interface within the attached device. */
-
-					bool IsSessionOpen; /**< Indicates if a PIMA session is currently open with the attached device. */
-					uint32_t TransactionID; /**< Transaction ID for the next transaction to send to the device. */
-				} State; /**< State data for the USB class interface within the device. All elements in this section
-						  *   <b>may</b> be set to initial values, but may also be ignored to default to sane values when
-						  *   the interface is enumerated.
-						  */
-			} USB_ClassInfo_SI_Host_t;
-
-		/* Enums: */
-			/** Enum for the possible error codes returned by the \ref SI_Host_ConfigurePipes() function. */
-			enum SI_Host_EnumerationFailure_ErrorCodes_t
-			{
-				SI_ENUMERROR_NoError                    = 0, /**< Configuration Descriptor was processed successfully. */
-				SI_ENUMERROR_InvalidConfigDescriptor    = 1, /**< The device returned an invalid Configuration Descriptor. */
-				SI_ENUMERROR_NoCompatibleInterfaceFound = 2, /**< A compatible Still Image interface was not found in the device's
-				                                              *   Configuration Descriptor.
-				                                              */
-				SI_ENUMERROR_PipeConfigurationFailed    = 3, /**< One or more pipes for the specified interface could not be configured correctly. */
-			};
-
-		/* Function Prototypes: */
-			/** Host interface configuration routine, to configure a given Still Image host interface instance using the
-			 *  Configuration Descriptor read from an attached USB device. This function automatically updates the given Still
-			 *  Image Host instance's state values and configures the pipes required to communicate with the interface if it is
-			 *  found within the device. This should be called once after the stack has enumerated the attached device, while
-			 *  the host state machine is in the Addressed state.
-			 *
-			 *  \param[in,out] SIInterfaceInfo       Pointer to a structure containing a Still Image Class host configuration and state.
-			 *  \param[in]     ConfigDescriptorSize  Length of the attached device's Configuration Descriptor.
-			 *  \param[in]     ConfigDescriptorData  Pointer to a buffer containing the attached device's Configuration Descriptor.
-			 *
-			 *  \return A value from the \ref SI_Host_EnumerationFailure_ErrorCodes_t enum.
-			 */
-			uint8_t SI_Host_ConfigurePipes(USB_ClassInfo_SI_Host_t* const SIInterfaceInfo,
-			                               uint16_t ConfigDescriptorSize,
-			                               void* ConfigDescriptorData) ATTR_NON_NULL_PTR_ARG(1) ATTR_NON_NULL_PTR_ARG(3);
-
-			/** Opens a new PIMA session with the attached device. This should be used before any session-orientated PIMA commands
-			 *  are issued to the device. Only one session can be open at the one time.
-			 *
-			 *  \pre This function must only be called when the Host state machine is in the \ref HOST_STATE_Configured state or the
-			 *       call will fail.
-			 *
-			 *  \param[in,out] SIInterfaceInfo  Pointer to a structure containing a Still Image Class host configuration and state.
-			 *
-			 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum, or \ref SI_ERROR_LOGICAL_CMD_FAILED if the device
-			 *          returned a logical command failure.
-			 */
-			uint8_t SI_Host_OpenSession(USB_ClassInfo_SI_Host_t* const SIInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Closes an already opened PIMA session with the attached device. This should be used after all session-orientated
-			 *  PIMA commands have been issued to the device.
-			 *
-			 *  \pre This function must only be called when the Host state machine is in the \ref HOST_STATE_Configured state or the
-			 *       call will fail.
-			 *
-			 *  \param[in,out] SIInterfaceInfo  Pointer to a structure containing a Still Image Class host configuration and state.
-			 *
-			 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum, or \ref SI_ERROR_LOGICAL_CMD_FAILED if the device
-			 *          returned a logical command failure.
-			 */
-			uint8_t SI_Host_CloseSession(USB_ClassInfo_SI_Host_t* const SIInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Sends a raw PIMA block header to the device, filling out the transaction ID automatically. This can be used to send
-			 *  arbitrary PIMA blocks to the device with or without parameters.
-			 *
-			 *  \pre This function must only be called when the Host state machine is in the \ref HOST_STATE_Configured state or the
-			 *       call will fail.
-			 *
-			 *  \param[in,out] SIInterfaceInfo  Pointer to a structure containing a Still Image Class host configuration and state.
-			 *  \param[in]     PIMAHeader       Pointer to a PIMA container structure that is to be sent.
-			 *
-			 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t SI_Host_SendBlockHeader(USB_ClassInfo_SI_Host_t* const SIInterfaceInfo,
-			                                PIMA_Container_t* const PIMAHeader) ATTR_NON_NULL_PTR_ARG(1)
-			                                ATTR_NON_NULL_PTR_ARG(2);
-
-			/** Receives a raw PIMA block header from the device. This can be used to receive arbitrary PIMA blocks from the device with
-			 *  or without parameters.
-			 *
-			 *  \pre This function must only be called when the Host state machine is in the \ref HOST_STATE_Configured state or the
-			 *       call will fail.
-			 *
-			 *  \param[in,out] SIInterfaceInfo  Pointer to a structure containing a Still Image Class host configuration and state.
-			 *  \param[out]    PIMAHeader       Pointer to a PIMA container structure where the received block is to be stored.
-			 *
-			 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t SI_Host_ReceiveBlockHeader(USB_ClassInfo_SI_Host_t* const SIInterfaceInfo,
-			                                   PIMA_Container_t* const PIMAHeader) ATTR_NON_NULL_PTR_ARG(1)
-			                                   ATTR_NON_NULL_PTR_ARG(2);
-
-			/** Sends a given PIMA command to the attached device, filling out the PIMA command header's Transaction ID automatically.
-			 *
-			 *  \pre This function must only be called when the Host state machine is in the \ref HOST_STATE_Configured state or the
-			 *       call will fail.
-			 *
-			 *  \param[in,out] SIInterfaceInfo  Pointer to a structure containing a Still Image Class host configuration and state.
-			 *  \param[in]     Operation        PIMA operation code to issue to the device.
-			 *  \param[in]     TotalParams      Total number of 32-bit parameters to send to the device in the issued command block.
-			 *  \param[in]     Params           Pointer to an array of 32-bit values containing the parameters to send in the command block.
-			 *
-			 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum, or \ref SI_ERROR_LOGICAL_CMD_FAILED if the device
-			 *          returned a logical command failure.
-			 */
-			uint8_t SI_Host_SendCommand(USB_ClassInfo_SI_Host_t* const SIInterfaceInfo,
-			                            const uint16_t Operation,
-			                            const uint8_t TotalParams,
-			                            uint32_t* const Params) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Receives and checks a response block from the attached Still Image device, once a command has been issued and all data
-			 *  associated with the command has been transferred.
-			 *
-			 *  \pre This function must only be called when the Host state machine is in the \ref HOST_STATE_Configured state or the
-			 *       call will fail.
-			 *
-			 *  \param[in,out] SIInterfaceInfo  Pointer to a structure containing a Still Image Class host configuration and state.
-			 *
-			 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum, or \ref SI_ERROR_LOGICAL_CMD_FAILED if the device
-			 *          returned a logical command failure.
-			 */
-			uint8_t SI_Host_ReceiveResponse(USB_ClassInfo_SI_Host_t* const SIInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Indicates if the device has issued a PIMA event block to the host via the asynchronous events pipe.
-			 *
-			 *  \pre This function must only be called when the Host state machine is in the \ref HOST_STATE_Configured state or the
-			 *       call will fail.
-			 *
-			 *  \param[in,out] SIInterfaceInfo  Pointer to a structure containing a Still Image Class host configuration and state.
-			 *
-			 *  \return Boolean \c true if an event is waiting to be read, \c false otherwise.
-			 */
-			bool SI_Host_IsEventReceived(USB_ClassInfo_SI_Host_t* const SIInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Receives an asynchronous event block from the device via the asynchronous events pipe.
-			 *
-			 *  \pre This function must only be called when the Host state machine is in the \ref HOST_STATE_Configured state or the
-			 *       call will fail.
-			 *
-			 *  \param[in,out] SIInterfaceInfo  Pointer to a structure containing a Still Image Class host configuration and state.
-			 *  \param[out]    PIMAHeader       Pointer to a PIMA container structure where the event should be stored.
-			 *
-			 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum, or \ref SI_ERROR_LOGICAL_CMD_FAILED if the device
-			 *          returned a logical command failure.
-			 */
-			uint8_t SI_Host_ReceiveEventHeader(USB_ClassInfo_SI_Host_t* const SIInterfaceInfo,
-			                                   PIMA_Container_t* const PIMAHeader) ATTR_NON_NULL_PTR_ARG(1)
-			                                   ATTR_NON_NULL_PTR_ARG(2);
-
-			/** Sends arbitrary data to the attached device, for use in the data phase of PIMA commands which require data
-			 *  transfer beyond the regular PIMA command block parameters.
-			 *
-			 *  \pre This function must only be called when the Host state machine is in the \ref HOST_STATE_Configured state or the
-			 *       call will fail.
-			 *
-			 *  \param[in,out] SIInterfaceInfo  Pointer to a structure containing a Still Image Class host configuration and state.
-			 *  \param[in]     Buffer           Pointer to a buffer where the data to send has been stored.
-			 *  \param[in]     Bytes            Length in bytes of the data in the buffer to send to the attached device.
-			 *
-			 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t SI_Host_SendData(USB_ClassInfo_SI_Host_t* const SIInterfaceInfo,
-			                         const void* Buffer,
-			                         const uint16_t Bytes) ATTR_NON_NULL_PTR_ARG(1) ATTR_NON_NULL_PTR_ARG(2);
-
-			/** Receives arbitrary data from the attached device, for use in the data phase of PIMA commands which require data
-			 *  transfer beyond the regular PIMA command block parameters.
-			 *
-			 *  \pre This function must only be called when the Host state machine is in the \ref HOST_STATE_Configured state or the
-			 *       call will fail.
-			 *
-			 *  \param[in,out] SIInterfaceInfo  Pointer to a structure containing a Still Image Class host configuration and state.
-			 *  \param[out]    Buffer           Pointer to a buffer where the received data is to be stored.
-			 *  \param[in]     Bytes            Length in bytes of the data to read.
-			 *
-			 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t SI_Host_ReadData(USB_ClassInfo_SI_Host_t* const SIInterfaceInfo,
-			                         void* Buffer,
-			                         const uint16_t Bytes) ATTR_NON_NULL_PTR_ARG(1) ATTR_NON_NULL_PTR_ARG(2);
-
-		/* Inline Functions: */
-			/** General management task for a given Still Image host class interface, required for the correct operation of the
-			 *  interface. This should be called frequently in the main program loop, before the master USB management task
-			 *  \ref USB_USBTask().
-			 *
-			 *  \param[in,out] SIInterfaceInfo  Pointer to a structure containing a Still Image Class host configuration and state.
-			 */
-			static inline void SI_Host_USBTask(USB_ClassInfo_SI_Host_t* const SIInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1) ATTR_ALWAYS_INLINE;
-			static inline void SI_Host_USBTask(USB_ClassInfo_SI_Host_t* const SIInterfaceInfo)
-			{
-				(void)SIInterfaceInfo;
-			}
-
-	/* Private Interface - For use in library only: */
-	#if !defined(__DOXYGEN__)
-		/* Macros: */
-			#define SI_COMMAND_DATA_TIMEOUT_MS        10000
-
-		/* Function Prototypes: */
-			#if defined(__INCLUDE_FROM_STILLIMAGE_HOST_C)
-				static uint8_t DCOMP_SI_Host_NextSIInterface(void* const CurrentDescriptor)
-				                                             ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(1);
-				static uint8_t DCOMP_SI_Host_NextSIInterfaceEndpoint(void* const CurrentDescriptor)
-				                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(1);
-			#endif
-	#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Class/MIDIClass.h b/NativePrograms/LUFA/Drivers/USB/Class/MIDIClass.h
deleted file mode 100644
index 199c4f3d9d..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Class/MIDIClass.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Master include file for the library USB MIDI Class driver.
- *
- *  Master include file for the library USB MIDI Class driver, for both host and device modes, where available.
- *
- *  This file should be included in all user projects making use of this optional class driver, instead of
- *  including any headers in the USB/ClassDriver/Device, USB/ClassDriver/Host or USB/ClassDriver/Common subdirectories.
- */
-
-/** \ingroup Group_USBClassDrivers
- *  \defgroup Group_USBClassMIDI MIDI Class Driver
- *  \brief USB class driver for the USB-IF MIDI class standard.
- *
- *  \section Sec_USBClassMIDI_Dependencies Module Source Dependencies
- *  The following files must be built with any user project that uses this module:
- *    - LUFA/Drivers/USB/Class/Device/MIDIClassDevice.c <i>(Makefile source module name: LUFA_SRC_USBCLASS)</i>
- *    - LUFA/Drivers/USB/Class/Host/MIDIClassHost.c <i>(Makefile source module name: LUFA_SRC_USBCLASS)</i>
- *
- *  \section Sec_USBClassMIDI_ModDescription Module Description
- *  MIDI Class Driver module. This module contains an internal implementation of the USB MIDI Class, for both Device
- *  and Host USB modes. User applications can use this class driver instead of implementing the MIDI class manually
- *  via the low-level LUFA APIs.
- *
- *  This module is designed to simplify the user code by exposing only the required interface needed to interface with
- *  Hosts or Devices using the USB MIDI Class.
- *
- *  \note The USB MIDI class is actually a special case of the regular Audio class, thus this module depends on
- *        structure definitions from the \ref Group_USBClassAudioDevice class driver module.
- *
- *  @{
- */
-
-#ifndef _MIDI_CLASS_H_
-#define _MIDI_CLASS_H_
-
-	/* Macros: */
-		#define __INCLUDE_FROM_USB_DRIVER
-		#define __INCLUDE_FROM_MIDI_DRIVER
-
-	/* Includes: */
-		#include "../Core/USBMode.h"
-
-		#if defined(USB_CAN_BE_DEVICE)
-			#include "Device/MIDIClassDevice.h"
-		#endif
-
-		#if defined(USB_CAN_BE_HOST)
-			#include "Host/MIDIClassHost.h"
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Class/MassStorageClass.h b/NativePrograms/LUFA/Drivers/USB/Class/MassStorageClass.h
deleted file mode 100644
index 6f3bbe5e78..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Class/MassStorageClass.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Master include file for the library USB Mass Storage Class driver.
- *
- *  Master include file for the library USB Mass Storage Class driver, for both host and device modes, where available.
- *
- *  This file should be included in all user projects making use of this optional class driver, instead of
- *  including any headers in the USB/ClassDriver/Device, USB/ClassDriver/Host or USB/ClassDriver/Common subdirectories.
- */
-
-/** \ingroup Group_USBClassDrivers
- *  \defgroup Group_USBClassMS Mass Storage Class Driver
- *  \brief USB class driver for the USB-IF Bulk-Only Transport Mass Storage class standard.
- *
- *  \section Sec_USBClassMS_Dependencies Module Source Dependencies
- *  The following files must be built with any user project that uses this module:
- *    - LUFA/Drivers/USB/Class/Device/MassStorageClassDevice.c <i>(Makefile source module name: LUFA_SRC_USBCLASS)</i>
- *    - LUFA/Drivers/USB/Class/Host/MassStorageClassHost.c <i>(Makefile source module name: LUFA_SRC_USBCLASS)</i>
- *
- *  \section Sec_USBClassMS_ModDescription Module Description
- *  Mass Storage Class Driver module. This module contains an internal implementation of the USB Mass Storage Class, for both
- *  Device and Host USB modes. User applications can use this class driver instead of implementing the Mass Storage class
- *  manually via the low-level LUFA APIs.
- *
- *  This module is designed to simplify the user code by exposing only the required interface needed to interface with
- *  Hosts or Devices using the USB Mass Storage Class.
- *
- *  @{
- */
-
-#ifndef _MS_CLASS_H_
-#define _MS_CLASS_H_
-
-	/* Macros: */
-		#define __INCLUDE_FROM_USB_DRIVER
-		#define __INCLUDE_FROM_MS_DRIVER
-
-	/* Includes: */
-		#include "../Core/USBMode.h"
-
-		#if defined(USB_CAN_BE_DEVICE)
-			#include "Device/MassStorageClassDevice.h"
-		#endif
-
-		#if defined(USB_CAN_BE_HOST)
-			#include "Host/MassStorageClassHost.h"
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Class/PrinterClass.h b/NativePrograms/LUFA/Drivers/USB/Class/PrinterClass.h
deleted file mode 100644
index 9b27888181..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Class/PrinterClass.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Master include file for the library USB Printer Class driver.
- *
- *  Master include file for the library USB Printer Class driver, for both host and device modes, where available.
- *
- *  This file should be included in all user projects making use of this optional class driver, instead of
- *  including any headers in the USB/ClassDriver/Device, USB/ClassDriver/Host or USB/ClassDriver/Common subdirectories.
- */
-
-/** \ingroup Group_USBClassDrivers
- *  \defgroup Group_USBClassPrinter Printer Class Driver
- *  \brief USB class driver for the USB-IF Printer class standard.
- *
- *  \section Sec_USBClassPrinter_Dependencies Module Source Dependencies
- *  The following files must be built with any user project that uses this module:
- *    - LUFA/Drivers/USB/Class/Host/PrinterClassDevice.c <i>(Makefile source module name: LUFA_SRC_USBCLASS)</i>
- *    - LUFA/Drivers/USB/Class/Host/PrinterClassHost.c <i>(Makefile source module name: LUFA_SRC_USBCLASS)</i>
- *
- *  \section Sec_USBClassPrinter_ModDescription Module Description
- *  Printer Class Driver module. This module contains an internal implementation of the USB Printer Class, for the base
- *  USB Printer transport layer for USB Host mode only. Note that printers are free to implement whatever printer language
- *  they choose on top of this (e.g. Postscript), and so this driver exposes low level data transport functions only rather
- *  than high level raster or text functions. User applications can use this class driver instead of implementing the Printer
- *  class manually via the low-level LUFA APIs.
- *
- *  This module is designed to simplify the user code by exposing only the required interface needed to interface with
- *  Devices using the USB Printer Class.
- *
- *  @{
- */
-
-#ifndef _PRINTER_CLASS_H_
-#define _PRINTER_CLASS_H_
-
-	/* Macros: */
-		#define __INCLUDE_FROM_USB_DRIVER
-		#define __INCLUDE_FROM_PRINTER_DRIVER
-
-	/* Includes: */
-		#include "../Core/USBMode.h"
-
-		#if defined(USB_CAN_BE_DEVICE)
-			#include "Device/PrinterClassDevice.h"
-		#endif
-
-		#if defined(USB_CAN_BE_HOST)
-			#include "Host/PrinterClassHost.h"
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Class/RNDISClass.h b/NativePrograms/LUFA/Drivers/USB/Class/RNDISClass.h
deleted file mode 100644
index 14ef22f969..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Class/RNDISClass.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Master include file for the library USB RNDIS Class driver.
- *
- *  Master include file for the library USB RNDIS Class driver, for both host and device modes, where available.
- *
- *  This file should be included in all user projects making use of this optional class driver, instead of
- *  including any headers in the USB/ClassDriver/Device, USB/ClassDriver/Host or USB/ClassDriver/Common subdirectories.
- */
-
-/** \ingroup Group_USBClassDrivers
- *  \defgroup Group_USBClassRNDIS RNDIS (Networking) Class Driver
- *  \brief USB class driver for the Microsoft Remote Network Driver Interface Specification (RNDIS) class standard.
- *
- *  \section Sec_USBClassRNDIS_Dependencies Module Source Dependencies
- *  The following files must be built with any user project that uses this module:
- *    - LUFA/Drivers/USB/Class/Device/RNDISClassDevice.c <i>(Makefile source module name: LUFA_SRC_USBCLASS)</i>
- *    - LUFA/Drivers/USB/Class/Host/RNDISClassHost.c <i>(Makefile source module name: LUFA_SRC_USBCLASS)</i>
- *
- *  \section Sec_USBClassRNDIS_ModDescription Module Description
- *  RNDIS Class Driver module. This module contains an internal implementation of the Microsoft USB RNDIS Networking
- *  Class, for both Device and Host USB modes. User applications can use this class driver instead of implementing the
- *  RNDIS class manually via the low-level LUFA APIs.
- *
- *  This module is designed to simplify the user code by exposing only the required interface needed to interface with
- *  Hosts using the USB RNDIS Class.
- *
- *  @{
- */
-
-#ifndef _RNDIS_CLASS_H_
-#define _RNDIS_CLASS_H_
-
-	/* Macros: */
-		#define __INCLUDE_FROM_USB_DRIVER
-		#define __INCLUDE_FROM_RNDIS_DRIVER
-
-	/* Includes: */
-		#include "../Core/USBMode.h"
-
-		#if defined(USB_CAN_BE_DEVICE)
-			#include "Device/RNDISClassDevice.h"
-		#endif
-
-		#if defined(USB_CAN_BE_HOST)
-			#include "Host/RNDISClassHost.h"
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Class/StillImageClass.h b/NativePrograms/LUFA/Drivers/USB/Class/StillImageClass.h
deleted file mode 100644
index d18e8558f3..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Class/StillImageClass.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Master include file for the library USB Still Image Class driver.
- *
- *  Master include file for the library USB Still Image Class driver, for both host and device modes, where available.
- *
- *  This file should be included in all user projects making use of this optional class driver, instead of
- *  including any headers in the USB/ClassDriver/Device, USB/ClassDriver/Host or USB/ClassDriver/Common subdirectories.
- */
-
-/** \ingroup Group_USBClassDrivers
- *  \defgroup Group_USBClassSI Still Image Class Driver
- *  \brief USB class driver for the USB-IF Still Image (PIMA-compliant) class standard.
- *
- *  \section Sec_USBClassSI_Dependencies Module Source Dependencies
- *  The following files must be built with any user project that uses this module:
- *    - LUFA/Drivers/USB/Class/Host/StillImageClassHost.c <i>(Makefile source module name: LUFA_SRC_USBCLASS)</i>
- *
- *  \section Sec_USBClassSI_ModDescription Module Description
- *  Still Image Class Driver module. This module contains an internal implementation of the USB Still Image Class,
- *  for USB Host mode only. User applications can use this class driver instead of implementing the Still Image class
- *  manually via the low-level LUFA APIs.
- *
- *  This module is designed to simplify the user code by exposing only the required interface needed to interface with
- *  Devices using the USB Still Image Class.
- *
- *  @{
- */
-
-#ifndef _SI_CLASS_H_
-#define _SI_CLASS_H_
-
-	/* Macros: */
-		#define __INCLUDE_FROM_USB_DRIVER
-		#define __INCLUDE_FROM_SI_DRIVER
-
-	/* Includes: */
-		#include "../Core/USBMode.h"
-
-		#if defined(USB_CAN_BE_HOST)
-			#include "Host/StillImageClassHost.h"
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Core/AVR8/Device_AVR8.c b/NativePrograms/LUFA/Drivers/USB/Core/AVR8/Device_AVR8.c
deleted file mode 100644
index d72973edbe..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Core/AVR8/Device_AVR8.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-#include "../../../../Common/Common.h"
-#if (ARCH == ARCH_AVR8)
-
-#define  __INCLUDE_FROM_USB_DRIVER
-#include "../USBMode.h"
-
-#if defined(USB_CAN_BE_DEVICE)
-
-#include "../Device.h"
-
-void USB_Device_SendRemoteWakeup(void)
-{
-	if (!(USB_Options & USB_OPT_MANUAL_PLL))
-	{
-		USB_PLL_On();
-		while (!(USB_PLL_IsReady()));
-	}
-
-	USB_CLK_Unfreeze();
-
-	UDCON |= (1 << RMWKUP);
-	while (UDCON & (1 << RMWKUP));
-}
-
-#endif
-
-#endif
diff --git a/NativePrograms/LUFA/Drivers/USB/Core/AVR8/Device_AVR8.h b/NativePrograms/LUFA/Drivers/USB/Core/AVR8/Device_AVR8.h
deleted file mode 100644
index 56f1c280b0..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Core/AVR8/Device_AVR8.h
+++ /dev/null
@@ -1,272 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief USB Device definitions for the AVR8 microcontrollers.
- *  \copydetails Group_Device_AVR8
- *
- *  \note This file should not be included directly. It is automatically included as needed by the USB driver
- *        dispatch header located in LUFA/Drivers/USB/USB.h.
- */
-
-/** \ingroup Group_Device
- *  \defgroup Group_Device_AVR8 Device Management (AVR8)
- *  \brief USB Device definitions for the AVR8 microcontrollers.
- *
- *  Architecture specific USB Device definitions for the Atmel 8-bit AVR microcontrollers.
- *
- *  @{
- */
-
-#ifndef __USBDEVICE_AVR8_H__
-#define __USBDEVICE_AVR8_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-		#include "../USBController.h"
-		#include "../StdDescriptors.h"
-		#include "../USBInterrupt.h"
-		#include "../Endpoint.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_USB_DRIVER)
-			#error Do not include this file directly. Include LUFA/Drivers/USB/USB.h instead.
-		#endif
-
-		#if (defined(USE_RAM_DESCRIPTORS) && defined(USE_EEPROM_DESCRIPTORS))
-			#error USE_RAM_DESCRIPTORS and USE_EEPROM_DESCRIPTORS are mutually exclusive.
-		#endif
-
-		#if (defined(USE_FLASH_DESCRIPTORS) && defined(USE_EEPROM_DESCRIPTORS))
-			#error USE_FLASH_DESCRIPTORS and USE_EEPROM_DESCRIPTORS are mutually exclusive.
-		#endif
-
-		#if (defined(USE_FLASH_DESCRIPTORS) && defined(USE_RAM_DESCRIPTORS))
-			#error USE_FLASH_DESCRIPTORS and USE_RAM_DESCRIPTORS are mutually exclusive.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** \name USB Device Mode Option Masks */
-			/**@{*/
-			#if defined(USB_SERIES_4_AVR) || defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR) || defined(__DOXYGEN__)
-				/** Mask for the Options parameter of the \ref USB_Init() function. This indicates that the
-				 *  USB interface should be initialized in low speed (1.5Mb/s) mode.
-				 *
-				 *  \note Low Speed mode is not available on all USB AVR models.
-				 *        \n
-				 *
-				 *  \note Restrictions apply on the number, size and type of endpoints which can be used
-				 *        when running in low speed mode - please refer to the USB 2.0 specification.
-				 */
-				#define USB_DEVICE_OPT_LOWSPEED            (1 << 0)
-			#endif
-
-			/** Mask for the Options parameter of the \ref USB_Init() function. This indicates that the
-			 *  USB interface should be initialized in full speed (12Mb/s) mode.
-			 */
-			#define USB_DEVICE_OPT_FULLSPEED               (0 << 0)
-			/**@}*/
-
-			#if (!defined(NO_INTERNAL_SERIAL) && \
-			     (defined(USB_SERIES_7_AVR) || defined(USB_SERIES_6_AVR) || \
-			      defined(USB_SERIES_4_AVR) || defined(USB_SERIES_2_AVR) || \
-				  defined(__DOXYGEN__)))
-				/** String descriptor index for the device's unique serial number string descriptor within the device.
-				 *  This unique serial number is used by the host to associate resources to the device (such as drivers or COM port
-				 *  number allocations) to a device regardless of the port it is plugged in to on the host. Some microcontrollers contain
-				 *  a unique serial number internally, and setting the device descriptors serial number string index to this value
-				 *  will cause it to use the internal serial number.
-				 *
-				 *  On unsupported devices, this will evaluate to \ref NO_DESCRIPTOR and so will force the host to create a pseudo-serial
-				 *  number for the device.
-				 */
-				#ifndef USE_INTERNAL_SERIAL
-					#define USE_INTERNAL_SERIAL         0xDC
-				#endif
-
-				/** Length of the device's unique internal serial number, in bits, if present on the selected microcontroller
-				 *  model.
-				 */
-				#define INTERNAL_SERIAL_LENGTH_BITS     80
-
-				/** Start address of the internal serial number, in the appropriate address space, if present on the selected microcontroller
-				 *  model.
-				 */
-				#define INTERNAL_SERIAL_START_ADDRESS   0x0E
-			#else
-				#undef	USE_INTERNAL_SERIAL
-				#define USE_INTERNAL_SERIAL             NO_DESCRIPTOR
-
-				#define INTERNAL_SERIAL_LENGTH_BITS     0
-				#define INTERNAL_SERIAL_START_ADDRESS   0
-			#endif
-
-		/* Function Prototypes: */
-			/** Sends a Remote Wakeup request to the host. This signals to the host that the device should
-			 *  be taken out of suspended mode, and communications should resume.
-			 *
-			 *  Typically, this is implemented so that HID devices (mice, keyboards, etc.) can wake up the
-			 *  host computer when the host has suspended all USB devices to enter a low power state.
-			 *
-			 *  \attention This function should only be used if the device has indicated to the host that it
-			 *             supports the Remote Wakeup feature in the device descriptors, and should only be
-			 *             issued if the host is currently allowing remote wakeup events from the device (i.e.,
-			 *             the \ref USB_Device_RemoteWakeupEnabled flag is set). When the \c NO_DEVICE_REMOTE_WAKEUP
-			 *             compile time option is used, this function is unavailable.
-			 *             \n\n
-			 *
-			 *  \attention The USB clock must be running for this function to operate. If the stack is initialized with
-			 *             the \ref USB_OPT_MANUAL_PLL option enabled, the user must ensure that the PLL is running
-			 *             before attempting to call this function.
-			 *
-			 *  \see \ref Group_StdDescriptors for more information on the RMWAKEUP feature and device descriptors.
-			 */
-			void USB_Device_SendRemoteWakeup(void);
-
-		/* Inline Functions: */
-			/** Returns the current USB frame number, when in device mode. Every millisecond the USB bus is active (i.e. enumerated to a host)
-			 *  the frame number is incremented by one.
-			 *
-			 *  \return Current USB frame number from the USB controller.
-			 */
-			static inline uint16_t USB_Device_GetFrameNumber(void) ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT;
-			static inline uint16_t USB_Device_GetFrameNumber(void)
-			{
-				return UDFNUM;
-			}
-
-			#if !defined(NO_SOF_EVENTS)
-				/** Enables the device mode Start Of Frame events. When enabled, this causes the
-				 *  \ref EVENT_USB_Device_StartOfFrame() event to fire once per millisecond, synchronized to the USB bus,
-				 *  at the start of each USB frame when enumerated in device mode.
-				 *
-				 *  \note This function is not available when the \c NO_SOF_EVENTS compile time token is defined.
-				 */
-				static inline void USB_Device_EnableSOFEvents(void) ATTR_ALWAYS_INLINE;
-				static inline void USB_Device_EnableSOFEvents(void)
-				{
-					USB_INT_Enable(USB_INT_SOFI);
-				}
-
-				/** Disables the device mode Start Of Frame events. When disabled, this stops the firing of the
-				 *  \ref EVENT_USB_Device_StartOfFrame() event when enumerated in device mode.
-				 *
-				 *  \note This function is not available when the \c NO_SOF_EVENTS compile time token is defined.
-				 */
-				static inline void USB_Device_DisableSOFEvents(void) ATTR_ALWAYS_INLINE;
-				static inline void USB_Device_DisableSOFEvents(void)
-				{
-					USB_INT_Disable(USB_INT_SOFI);
-				}
-			#endif
-
-	/* Private Interface - For use in library only: */
-	#if !defined(__DOXYGEN__)
-		/* Inline Functions: */
-			#if defined(USB_DEVICE_OPT_LOWSPEED)
-			static inline void USB_Device_SetLowSpeed(void) ATTR_ALWAYS_INLINE;
-			static inline void USB_Device_SetLowSpeed(void)
-			{
-				UDCON |=  (1 << LSM);
-			}
-
-			static inline void USB_Device_SetFullSpeed(void) ATTR_ALWAYS_INLINE;
-			static inline void USB_Device_SetFullSpeed(void)
-			{
-				UDCON &= ~(1 << LSM);
-			}
-			#endif
-
-			static inline void USB_Device_SetDeviceAddress(const uint8_t Address) ATTR_ALWAYS_INLINE;
-			static inline void USB_Device_SetDeviceAddress(const uint8_t Address)
-			{
-				UDADDR = (UDADDR & (1 << ADDEN)) | (Address & 0x7F);
-			}
-
-			static inline void USB_Device_EnableDeviceAddress(const uint8_t Address) ATTR_ALWAYS_INLINE;
-			static inline void USB_Device_EnableDeviceAddress(const uint8_t Address)
-			{
-				(void)Address;
-
-				UDADDR |= (1 << ADDEN);
-			}
-
-			static inline bool USB_Device_IsAddressSet(void) ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT;
-			static inline bool USB_Device_IsAddressSet(void)
-			{
-				return (UDADDR & (1 << ADDEN));
-			}
-
-			#if (USE_INTERNAL_SERIAL != NO_DESCRIPTOR)
-			static inline void USB_Device_GetSerialString(uint16_t* const UnicodeString) ATTR_NON_NULL_PTR_ARG(1);
-			static inline void USB_Device_GetSerialString(uint16_t* const UnicodeString)
-			{
-				uint_reg_t CurrentGlobalInt = GetGlobalInterruptMask();
-				GlobalInterruptDisable();
-
-				uint8_t SigReadAddress = INTERNAL_SERIAL_START_ADDRESS;
-
-				for (uint8_t SerialCharNum = 0; SerialCharNum < (INTERNAL_SERIAL_LENGTH_BITS / 4); SerialCharNum++)
-				{
-					uint8_t SerialByte = boot_signature_byte_get(SigReadAddress);
-
-					if (SerialCharNum & 0x01)
-					{
-						SerialByte >>= 4;
-						SigReadAddress++;
-					}
-
-					SerialByte &= 0x0F;
-
-					UnicodeString[SerialCharNum] = cpu_to_le16((SerialByte >= 10) ?
-															   (('A' - 10) + SerialByte) : ('0' + SerialByte));
-				}
-
-				SetGlobalInterruptMask(CurrentGlobalInt);
-			}
-			#endif
-
-	#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Core/AVR8/EndpointStream_AVR8.c b/NativePrograms/LUFA/Drivers/USB/Core/AVR8/EndpointStream_AVR8.c
deleted file mode 100644
index 2144fd68bb..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Core/AVR8/EndpointStream_AVR8.c
+++ /dev/null
@@ -1,265 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-#include "../../../../Common/Common.h"
-#if (ARCH == ARCH_AVR8)
-
-#define  __INCLUDE_FROM_USB_DRIVER
-#include "../USBMode.h"
-
-#if defined(USB_CAN_BE_DEVICE)
-
-#include "EndpointStream_AVR8.h"
-
-#if !defined(CONTROL_ONLY_DEVICE)
-uint8_t Endpoint_Discard_Stream(uint16_t Length,
-                                uint16_t* const BytesProcessed)
-{
-	uint8_t  ErrorCode;
-	uint16_t BytesInTransfer = BytesProcessed ? *BytesProcessed : 0;
-
-	if ((ErrorCode = Endpoint_WaitUntilReady()))
-	  return ErrorCode;
-
-	while (BytesInTransfer < Length)
-	{
-		if (!(Endpoint_IsReadWriteAllowed()))
-		{
-			Endpoint_ClearOUT();
-
-			if (BytesProcessed != NULL)
-			{
-				*BytesProcessed = BytesInTransfer;
-				return ENDPOINT_RWSTREAM_IncompleteTransfer;
-			}
-
-			if ((ErrorCode = Endpoint_WaitUntilReady()))
-			  return ErrorCode;
-		}
-		else
-		{
-			Endpoint_Discard_8();
-			BytesInTransfer++;
-		}
-	}
-
-	return ENDPOINT_RWSTREAM_NoError;
-}
-
-uint8_t Endpoint_Null_Stream(uint16_t Length,
-                             uint16_t* const BytesProcessed)
-{
-	uint8_t  ErrorCode;
-	uint16_t BytesInTransfer = BytesProcessed ? *BytesProcessed : 0;
-
-	if ((ErrorCode = Endpoint_WaitUntilReady()))
-	  return ErrorCode;
-
-	while (BytesInTransfer < Length)
-	{
-		if (!(Endpoint_IsReadWriteAllowed()))
-		{
-			Endpoint_ClearIN();
-
-			if (BytesProcessed != NULL)
-			{
-				*BytesProcessed = BytesInTransfer;
-				return ENDPOINT_RWSTREAM_IncompleteTransfer;
-			}
-
-			if ((ErrorCode = Endpoint_WaitUntilReady()))
-			  return ErrorCode;
-		}
-		else
-		{
-			Endpoint_Write_8(0);
-			BytesInTransfer++;
-		}
-	}
-
-	return ENDPOINT_RWSTREAM_NoError;
-}
-
-/* The following abuses the C preprocessor in order to copy-paste common code with slight alterations,
- * so that the code needs to be written once. It is a crude form of templating to reduce code maintenance. */
-
-#define  TEMPLATE_FUNC_NAME                        Endpoint_Write_Stream_LE
-#define  TEMPLATE_BUFFER_TYPE                      const void*
-#define  TEMPLATE_CLEAR_ENDPOINT()                 Endpoint_ClearIN()
-#define  TEMPLATE_BUFFER_OFFSET(Length)            0
-#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount
-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(*BufferPtr)
-#include "Template/Template_Endpoint_RW.c"
-
-#define  TEMPLATE_FUNC_NAME                        Endpoint_Write_Stream_BE
-#define  TEMPLATE_BUFFER_TYPE                      const void*
-#define  TEMPLATE_CLEAR_ENDPOINT()                 Endpoint_ClearIN()
-#define  TEMPLATE_BUFFER_OFFSET(Length)            (Length - 1)
-#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount
-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(*BufferPtr)
-#include "Template/Template_Endpoint_RW.c"
-
-#define  TEMPLATE_FUNC_NAME                        Endpoint_Read_Stream_LE
-#define  TEMPLATE_BUFFER_TYPE                      void*
-#define  TEMPLATE_CLEAR_ENDPOINT()                 Endpoint_ClearOUT()
-#define  TEMPLATE_BUFFER_OFFSET(Length)            0
-#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount
-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *BufferPtr = Endpoint_Read_8()
-#include "Template/Template_Endpoint_RW.c"
-
-#define  TEMPLATE_FUNC_NAME                        Endpoint_Read_Stream_BE
-#define  TEMPLATE_BUFFER_TYPE                      void*
-#define  TEMPLATE_CLEAR_ENDPOINT()                 Endpoint_ClearOUT()
-#define  TEMPLATE_BUFFER_OFFSET(Length)            (Length - 1)
-#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount
-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *BufferPtr = Endpoint_Read_8()
-#include "Template/Template_Endpoint_RW.c"
-
-#if defined(ARCH_HAS_FLASH_ADDRESS_SPACE)
-	#define  TEMPLATE_FUNC_NAME                        Endpoint_Write_PStream_LE
-	#define  TEMPLATE_BUFFER_TYPE                      const void*
-	#define  TEMPLATE_CLEAR_ENDPOINT()                 Endpoint_ClearIN()
-	#define  TEMPLATE_BUFFER_OFFSET(Length)            0
-	#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount
-	#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(pgm_read_byte(BufferPtr))
-	#include "Template/Template_Endpoint_RW.c"
-
-	#define  TEMPLATE_FUNC_NAME                        Endpoint_Write_PStream_BE
-	#define  TEMPLATE_BUFFER_TYPE                      const void*
-	#define  TEMPLATE_CLEAR_ENDPOINT()                 Endpoint_ClearIN()
-	#define  TEMPLATE_BUFFER_OFFSET(Length)            (Length - 1)
-	#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount
-	#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(pgm_read_byte(BufferPtr))
-	#include "Template/Template_Endpoint_RW.c"
-#endif
-
-#if defined(ARCH_HAS_EEPROM_ADDRESS_SPACE)
-	#define  TEMPLATE_FUNC_NAME                        Endpoint_Write_EStream_LE
-	#define  TEMPLATE_BUFFER_TYPE                      const void*
-	#define  TEMPLATE_CLEAR_ENDPOINT()                 Endpoint_ClearIN()
-	#define  TEMPLATE_BUFFER_OFFSET(Length)            0
-	#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount
-	#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(eeprom_read_byte(BufferPtr))
-	#include "Template/Template_Endpoint_RW.c"
-
-	#define  TEMPLATE_FUNC_NAME                        Endpoint_Write_EStream_BE
-	#define  TEMPLATE_BUFFER_TYPE                      const void*
-	#define  TEMPLATE_CLEAR_ENDPOINT()                 Endpoint_ClearIN()
-	#define  TEMPLATE_BUFFER_OFFSET(Length)            (Length - 1)
-	#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount
-	#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(eeprom_read_byte(BufferPtr))
-	#include "Template/Template_Endpoint_RW.c"
-
-	#define  TEMPLATE_FUNC_NAME                        Endpoint_Read_EStream_LE
-	#define  TEMPLATE_BUFFER_TYPE                      void*
-	#define  TEMPLATE_CLEAR_ENDPOINT()                 Endpoint_ClearOUT()
-	#define  TEMPLATE_BUFFER_OFFSET(Length)            0
-	#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount
-	#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         eeprom_update_byte(BufferPtr, Endpoint_Read_8())
-	#include "Template/Template_Endpoint_RW.c"
-
-	#define  TEMPLATE_FUNC_NAME                        Endpoint_Read_EStream_BE
-	#define  TEMPLATE_BUFFER_TYPE                      void*
-	#define  TEMPLATE_CLEAR_ENDPOINT()                 Endpoint_ClearOUT()
-	#define  TEMPLATE_BUFFER_OFFSET(Length)            (Length - 1)
-	#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount
-	#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         eeprom_update_byte(BufferPtr, Endpoint_Read_8())
-	#include "Template/Template_Endpoint_RW.c"
-#endif
-
-#endif
-
-#define  TEMPLATE_FUNC_NAME                        Endpoint_Write_Control_Stream_LE
-#define  TEMPLATE_BUFFER_OFFSET(Length)            0
-#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount
-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(*BufferPtr)
-#include "Template/Template_Endpoint_Control_W.c"
-
-#define  TEMPLATE_FUNC_NAME                        Endpoint_Write_Control_Stream_BE
-#define  TEMPLATE_BUFFER_OFFSET(Length)            (Length - 1)
-#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount
-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(*BufferPtr)
-#include "Template/Template_Endpoint_Control_W.c"
-
-#define  TEMPLATE_FUNC_NAME                        Endpoint_Read_Control_Stream_LE
-#define  TEMPLATE_BUFFER_OFFSET(Length)            0
-#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount
-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *BufferPtr = Endpoint_Read_8()
-#include "Template/Template_Endpoint_Control_R.c"
-
-#define  TEMPLATE_FUNC_NAME                        Endpoint_Read_Control_Stream_BE
-#define  TEMPLATE_BUFFER_OFFSET(Length)            (Length - 1)
-#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount
-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *BufferPtr = Endpoint_Read_8()
-#include "Template/Template_Endpoint_Control_R.c"
-
-#if defined(ARCH_HAS_FLASH_ADDRESS_SPACE)
-	#define  TEMPLATE_FUNC_NAME                        Endpoint_Write_Control_PStream_LE
-	#define  TEMPLATE_BUFFER_OFFSET(Length)            0
-	#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount
-	#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(pgm_read_byte(BufferPtr))
-	#include "Template/Template_Endpoint_Control_W.c"
-
-	#define  TEMPLATE_FUNC_NAME                        Endpoint_Write_Control_PStream_BE
-	#define  TEMPLATE_BUFFER_OFFSET(Length)            (Length - 1)
-	#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount
-	#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(pgm_read_byte(BufferPtr))
-	#include "Template/Template_Endpoint_Control_W.c"
-#endif
-
-#if defined(ARCH_HAS_EEPROM_ADDRESS_SPACE)
-	#define  TEMPLATE_FUNC_NAME                        Endpoint_Write_Control_EStream_LE
-	#define  TEMPLATE_BUFFER_OFFSET(Length)            0
-	#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount
-	#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(eeprom_read_byte(BufferPtr))
-	#include "Template/Template_Endpoint_Control_W.c"
-
-	#define  TEMPLATE_FUNC_NAME                        Endpoint_Write_Control_EStream_BE
-	#define  TEMPLATE_BUFFER_OFFSET(Length)            (Length - 1)
-	#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount
-	#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(eeprom_read_byte(BufferPtr))
-	#include "Template/Template_Endpoint_Control_W.c"
-
-	#define  TEMPLATE_FUNC_NAME                        Endpoint_Read_Control_EStream_LE
-	#define  TEMPLATE_BUFFER_OFFSET(Length)            0
-	#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount
-	#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         eeprom_update_byte(BufferPtr, Endpoint_Read_8())
-	#include "Template/Template_Endpoint_Control_R.c"
-
-	#define  TEMPLATE_FUNC_NAME                        Endpoint_Read_Control_EStream_BE
-	#define  TEMPLATE_BUFFER_OFFSET(Length)            (Length - 1)
-	#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount
-	#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         eeprom_update_byte(BufferPtr, Endpoint_Read_8())
-	#include "Template/Template_Endpoint_Control_R.c"
-#endif
-
-#endif
-
-#endif
diff --git a/NativePrograms/LUFA/Drivers/USB/Core/AVR8/EndpointStream_AVR8.h b/NativePrograms/LUFA/Drivers/USB/Core/AVR8/EndpointStream_AVR8.h
deleted file mode 100644
index dd519c6a81..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Core/AVR8/EndpointStream_AVR8.h
+++ /dev/null
@@ -1,658 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Endpoint data stream transmission and reception management for the AVR8 microcontrollers.
- *  \copydetails Group_EndpointStreamRW_AVR8
- *
- *  \note This file should not be included directly. It is automatically included as needed by the USB driver
- *        dispatch header located in LUFA/Drivers/USB/USB.h.
- */
-
-/** \ingroup Group_EndpointStreamRW
- *  \defgroup Group_EndpointStreamRW_AVR8 Read/Write of Multi-Byte Streams (AVR8)
- *  \brief Endpoint data stream transmission and reception management for the Atmel AVR8 architecture.
- *
- *  Functions, macros, variables, enums and types related to data reading and writing of data streams from
- *  and to endpoints.
- *
- *  @{
- */
-
-#ifndef __ENDPOINT_STREAM_AVR8_H__
-#define __ENDPOINT_STREAM_AVR8_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-		#include "../USBMode.h"
-		#include "../USBTask.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_USB_DRIVER)
-			#error Do not include this file directly. Include LUFA/Drivers/USB/USB.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Function Prototypes: */
-			/** \name Stream functions for null data */
-			/**@{*/
-
-			/** Reads and discards the given number of bytes from the currently selected endpoint's bank,
-			 *  discarding fully read packets from the host as needed. The last packet is not automatically
-			 *  discarded once the remaining bytes has been read; the user is responsible for manually
-			 *  discarding the last packet from the host via the \ref Endpoint_ClearOUT() macro.
-			 *
-			 *  If the BytesProcessed parameter is \c NULL, the entire stream transfer is attempted at once,
-			 *  failing or succeeding as a single unit. If the BytesProcessed parameter points to a valid
-			 *  storage location, the transfer will instead be performed as a series of chunks. Each time
-			 *  the endpoint bank becomes empty while there is still data to process (and after the current
-			 *  packet has been acknowledged) the BytesProcessed location will be updated with the total number
-			 *  of bytes processed in the stream, and the function will exit with an error code of
-			 *  \ref ENDPOINT_RWSTREAM_IncompleteTransfer. This allows for any abort checking to be performed
-			 *  in the user code - to continue the transfer, call the function again with identical parameters
-			 *  and it will resume until the BytesProcessed value reaches the total transfer length.
-			 *
-			 *  <b>Single Stream Transfer Example:</b>
-			 *  \code
-			 *  uint8_t ErrorCode;
-			 *
-			 *  if ((ErrorCode = Endpoint_Discard_Stream(512, NULL)) != ENDPOINT_RWSTREAM_NoError)
-			 *  {
-			 *       // Stream failed to complete - check ErrorCode here
-			 *  }
-			 *  \endcode
-			 *
-			 *  <b>Partial Stream Transfers Example:</b>
-			 *  \code
-			 *  uint8_t  ErrorCode;
-			 *  uint16_t BytesProcessed;
-			 *
-			 *  BytesProcessed = 0;
-			 *  while ((ErrorCode = Endpoint_Discard_Stream(512, &BytesProcessed)) == ENDPOINT_RWSTREAM_IncompleteTransfer)
-			 *  {
-			 *      // Stream not yet complete - do other actions here, abort if required
-			 *  }
-			 *
-			 *  if (ErrorCode != ENDPOINT_RWSTREAM_NoError)
-			 *  {
-			 *      // Stream failed to complete - check ErrorCode here
-			 *  }
-			 *  \endcode
-			 *
-			 *  \note This routine should not be used on CONTROL type endpoints.
-			 *
-			 *  \param[in] Length          Number of bytes to discard via the currently selected endpoint.
-			 *  \param[in] BytesProcessed  Pointer to a location where the total number of bytes processed in the current
-			 *                             transaction should be updated, \c NULL if the entire stream should be read at once.
-			 *
-			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Endpoint_Discard_Stream(uint16_t Length,
-			                                uint16_t* const BytesProcessed);
-
-			/** Writes a given number of zeroed bytes to the currently selected endpoint's bank, sending
-			 *  full packets to the host as needed. The last packet is not automatically sent once the
-			 *  remaining bytes have been written; the user is responsible for manually sending the last
-			 *  packet to the host via the \ref Endpoint_ClearIN() macro.
-			 *
-			 *  If the BytesProcessed parameter is \c NULL, the entire stream transfer is attempted at once,
-			 *  failing or succeeding as a single unit. If the BytesProcessed parameter points to a valid
-			 *  storage location, the transfer will instead be performed as a series of chunks. Each time
-			 *  the endpoint bank becomes full while there is still data to process (and after the current
-			 *  packet transmission has been initiated) the BytesProcessed location will be updated with the
-			 *  total number of bytes processed in the stream, and the function will exit with an error code of
-			 *  \ref ENDPOINT_RWSTREAM_IncompleteTransfer. This allows for any abort checking to be performed
-			 *  in the user code - to continue the transfer, call the function again with identical parameters
-			 *  and it will resume until the BytesProcessed value reaches the total transfer length.
-			 *
-			 *  <b>Single Stream Transfer Example:</b>
-			 *  \code
-			 *  uint8_t ErrorCode;
-			 *
-			 *  if ((ErrorCode = Endpoint_Null_Stream(512, NULL)) != ENDPOINT_RWSTREAM_NoError)
-			 *  {
-			 *       // Stream failed to complete - check ErrorCode here
-			 *  }
-			 *  \endcode
-			 *
-			 *  <b>Partial Stream Transfers Example:</b>
-			 *  \code
-			 *  uint8_t  ErrorCode;
-			 *  uint16_t BytesProcessed;
-			 *
-			 *  BytesProcessed = 0;
-			 *  while ((ErrorCode = Endpoint_Null_Stream(512, &BytesProcessed)) == ENDPOINT_RWSTREAM_IncompleteTransfer)
-			 *  {
-			 *      // Stream not yet complete - do other actions here, abort if required
-			 *  }
-			 *
-			 *  if (ErrorCode != ENDPOINT_RWSTREAM_NoError)
-			 *  {
-			 *      // Stream failed to complete - check ErrorCode here
-			 *  }
-			 *  \endcode
-			 *
-			 *  \note This routine should not be used on CONTROL type endpoints.
-			 *
-			 *  \param[in] Length          Number of zero bytes to send via the currently selected endpoint.
-			 *  \param[in] BytesProcessed  Pointer to a location where the total number of bytes processed in the current
-			 *                             transaction should be updated, \c NULL if the entire stream should be read at once.
-			 *
-			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Endpoint_Null_Stream(uint16_t Length,
-			                             uint16_t* const BytesProcessed);
-
-			/**@}*/
-
-			/** \name Stream functions for RAM source/destination data */
-			/**@{*/
-
-			/** Writes the given number of bytes to the endpoint from the given buffer in little endian,
-			 *  sending full packets to the host as needed. The last packet filled is not automatically sent;
-			 *  the user is responsible for manually sending the last written packet to the host via the
-			 *  \ref Endpoint_ClearIN() macro.
-			 *
-			 *  If the BytesProcessed parameter is \c NULL, the entire stream transfer is attempted at once,
-			 *  failing or succeeding as a single unit. If the BytesProcessed parameter points to a valid
-			 *  storage location, the transfer will instead be performed as a series of chunks. Each time
-			 *  the endpoint bank becomes full while there is still data to process (and after the current
-			 *  packet transmission has been initiated) the BytesProcessed location will be updated with the
-			 *  total number of bytes processed in the stream, and the function will exit with an error code of
-			 *  \ref ENDPOINT_RWSTREAM_IncompleteTransfer. This allows for any abort checking to be performed
-			 *  in the user code - to continue the transfer, call the function again with identical parameters
-			 *  and it will resume until the BytesProcessed value reaches the total transfer length.
-			 *
-			 *  <b>Single Stream Transfer Example:</b>
-			 *  \code
-			 *  uint8_t DataStream[512];
-			 *  uint8_t ErrorCode;
-			 *
-			 *  if ((ErrorCode = Endpoint_Write_Stream_LE(DataStream, sizeof(DataStream),
-			 *                                            NULL)) != ENDPOINT_RWSTREAM_NoError)
-			 *  {
-			 *       // Stream failed to complete - check ErrorCode here
-			 *  }
-			 *  \endcode
-			 *
-			 *  <b>Partial Stream Transfers Example:</b>
-			 *  \code
-			 *  uint8_t  DataStream[512];
-			 *  uint8_t  ErrorCode;
-			 *  uint16_t BytesProcessed;
-			 *
-			 *  BytesProcessed = 0;
-			 *  while ((ErrorCode = Endpoint_Write_Stream_LE(DataStream, sizeof(DataStream),
-			 *                                               &BytesProcessed)) == ENDPOINT_RWSTREAM_IncompleteTransfer)
-			 *  {
-			 *      // Stream not yet complete - do other actions here, abort if required
-			 *  }
-			 *
-			 *  if (ErrorCode != ENDPOINT_RWSTREAM_NoError)
-			 *  {
-			 *      // Stream failed to complete - check ErrorCode here
-			 *  }
-			 *  \endcode
-			 *
-			 *  \note This routine should not be used on CONTROL type endpoints.
-			 *
-			 *  \param[in] Buffer          Pointer to the source data buffer to read from.
-			 *  \param[in] Length          Number of bytes to read for the currently selected endpoint into the buffer.
-			 *  \param[in] BytesProcessed  Pointer to a location where the total number of bytes processed in the current
-			 *                             transaction should be updated, \c NULL if the entire stream should be written at once.
-			 *
-			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Endpoint_Write_Stream_LE(const void* const Buffer,
-			                                 uint16_t Length,
-			                                 uint16_t* const BytesProcessed) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Writes the given number of bytes to the endpoint from the given buffer in big endian,
-			 *  sending full packets to the host as needed. The last packet filled is not automatically sent;
-			 *  the user is responsible for manually sending the last written packet to the host via the
-			 *  \ref Endpoint_ClearIN() macro.
-			 *
-			 *  \note This routine should not be used on CONTROL type endpoints.
-			 *
-			 *  \param[in] Buffer          Pointer to the source data buffer to read from.
-			 *  \param[in] Length          Number of bytes to read for the currently selected endpoint into the buffer.
-			 *  \param[in] BytesProcessed  Pointer to a location where the total number of bytes processed in the current
-			 *                             transaction should be updated, \c NULL if the entire stream should be written at once.
-			 *
-			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Endpoint_Write_Stream_BE(const void* const Buffer,
-			                                 uint16_t Length,
-			                                 uint16_t* const BytesProcessed) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Reads the given number of bytes from the endpoint from the given buffer in little endian,
-			 *  discarding fully read packets from the host as needed. The last packet is not automatically
-			 *  discarded once the remaining bytes has been read; the user is responsible for manually
-			 *  discarding the last packet from the host via the \ref Endpoint_ClearOUT() macro.
-			 *
-			 *  If the BytesProcessed parameter is \c NULL, the entire stream transfer is attempted at once,
-			 *  failing or succeeding as a single unit. If the BytesProcessed parameter points to a valid
-			 *  storage location, the transfer will instead be performed as a series of chunks. Each time
-			 *  the endpoint bank becomes empty while there is still data to process (and after the current
-			 *  packet has been acknowledged) the BytesProcessed location will be updated with the total number
-			 *  of bytes processed in the stream, and the function will exit with an error code of
-			 *  \ref ENDPOINT_RWSTREAM_IncompleteTransfer. This allows for any abort checking to be performed
-			 *  in the user code - to continue the transfer, call the function again with identical parameters
-			 *  and it will resume until the BytesProcessed value reaches the total transfer length.
-			 *
-			 *  <b>Single Stream Transfer Example:</b>
-			 *  \code
-			 *  uint8_t DataStream[512];
-			 *  uint8_t ErrorCode;
-			 *
-			 *  if ((ErrorCode = Endpoint_Read_Stream_LE(DataStream, sizeof(DataStream),
-			 *                                           NULL)) != ENDPOINT_RWSTREAM_NoError)
-			 *  {
-			 *       // Stream failed to complete - check ErrorCode here
-			 *  }
-			 *  \endcode
-			 *
-			 *  <b>Partial Stream Transfers Example:</b>
-			 *  \code
-			 *  uint8_t  DataStream[512];
-			 *  uint8_t  ErrorCode;
-			 *  uint16_t BytesProcessed;
-			 *
-			 *  BytesProcessed = 0;
-			 *  while ((ErrorCode = Endpoint_Read_Stream_LE(DataStream, sizeof(DataStream),
-			 *                                              &BytesProcessed)) == ENDPOINT_RWSTREAM_IncompleteTransfer)
-			 *  {
-			 *      // Stream not yet complete - do other actions here, abort if required
-			 *  }
-			 *
-			 *  if (ErrorCode != ENDPOINT_RWSTREAM_NoError)
-			 *  {
-			 *      // Stream failed to complete - check ErrorCode here
-			 *  }
-			 *  \endcode
-			 *
-			 *  \note This routine should not be used on CONTROL type endpoints.
-			 *
-			 *  \param[out] Buffer          Pointer to the destination data buffer to write to.
-			 *  \param[in]  Length          Number of bytes to send via the currently selected endpoint.
-			 *  \param[in]  BytesProcessed  Pointer to a location where the total number of bytes processed in the current
-			 *                              transaction should be updated, \c NULL if the entire stream should be read at once.
-			 *
-			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Endpoint_Read_Stream_LE(void* const Buffer,
-			                                uint16_t Length,
-			                                uint16_t* const BytesProcessed) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Reads the given number of bytes from the endpoint from the given buffer in big endian,
-			 *  discarding fully read packets from the host as needed. The last packet is not automatically
-			 *  discarded once the remaining bytes has been read; the user is responsible for manually
-			 *  discarding the last packet from the host via the \ref Endpoint_ClearOUT() macro.
-			 *
-			 *  \note This routine should not be used on CONTROL type endpoints.
-			 *
-			 *  \param[out] Buffer          Pointer to the destination data buffer to write to.
-			 *  \param[in]  Length          Number of bytes to send via the currently selected endpoint.
-			 *  \param[in]  BytesProcessed  Pointer to a location where the total number of bytes processed in the current
-			 *                              transaction should be updated, \c NULL if the entire stream should be read at once.
-			 *
-			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Endpoint_Read_Stream_BE(void* const Buffer,
-			                                uint16_t Length,
-			                                uint16_t* const BytesProcessed) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Writes the given number of bytes to the CONTROL type endpoint from the given buffer in little endian,
-			 *  sending full packets to the host as needed. The host OUT acknowledgement is not automatically cleared
-			 *  in both failure and success states; the user is responsible for manually clearing the status OUT packet
-			 *  to finalize the transfer's status stage via the \ref Endpoint_ClearOUT() macro.
-			 *
-			 *  \note This function automatically sends the last packet in the data stage of the transaction; when the
-			 *        function returns, the user is responsible for clearing the <b>status</b> stage of the transaction.
-			 *        Note that the status stage packet is sent or received in the opposite direction of the data flow.
-			 *        \n\n
-			 *
-			 *  \note This routine should only be used on CONTROL type endpoints.
-			 *
-			 *  \warning Unlike the standard stream read/write commands, the control stream commands cannot be chained
-			 *           together; i.e. the entire stream data must be read or written at the one time.
-			 *
-			 *  \param[in] Buffer  Pointer to the source data buffer to read from.
-			 *  \param[in] Length  Number of bytes to read for the currently selected endpoint into the buffer.
-			 *
-			 *  \return A value from the \ref Endpoint_ControlStream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Endpoint_Write_Control_Stream_LE(const void* const Buffer,
-			                                         uint16_t Length) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Writes the given number of bytes to the CONTROL type endpoint from the given buffer in big endian,
-			 *  sending full packets to the host as needed. The host OUT acknowledgement is not automatically cleared
-			 *  in both failure and success states; the user is responsible for manually clearing the status OUT packet
-			 *  to finalize the transfer's status stage via the \ref Endpoint_ClearOUT() macro.
-			 *
-			 *  \note This function automatically sends the last packet in the data stage of the transaction; when the
-			 *        function returns, the user is responsible for clearing the <b>status</b> stage of the transaction.
-			 *        Note that the status stage packet is sent or received in the opposite direction of the data flow.
-			 *        \n\n
-			 *
-			 *  \note This routine should only be used on CONTROL type endpoints.
-			 *
-			 *  \warning Unlike the standard stream read/write commands, the control stream commands cannot be chained
-			 *           together; i.e. the entire stream data must be read or written at the one time.
-			 *
-			 *  \param[in] Buffer  Pointer to the source data buffer to read from.
-			 *  \param[in] Length  Number of bytes to read for the currently selected endpoint into the buffer.
-			 *
-			 *  \return A value from the \ref Endpoint_ControlStream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Endpoint_Write_Control_Stream_BE(const void* const Buffer,
-			                                         uint16_t Length) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Reads the given number of bytes from the CONTROL endpoint from the given buffer in little endian,
-			 *  discarding fully read packets from the host as needed. The device IN acknowledgement is not
-			 *  automatically sent after success or failure states; the user is responsible for manually sending the
-			 *  status IN packet to finalize the transfer's status stage via the \ref Endpoint_ClearIN() macro.
-			 *
-			 *  \note This function automatically sends the last packet in the data stage of the transaction; when the
-			 *        function returns, the user is responsible for clearing the <b>status</b> stage of the transaction.
-			 *        Note that the status stage packet is sent or received in the opposite direction of the data flow.
-			 *        \n\n
-			 *
-			 *  \note This routine should only be used on CONTROL type endpoints.
-			 *
-			 *  \warning Unlike the standard stream read/write commands, the control stream commands cannot be chained
-			 *           together; i.e. the entire stream data must be read or written at the one time.
-			 *
-			 *  \param[out] Buffer  Pointer to the destination data buffer to write to.
-			 *  \param[in]  Length  Number of bytes to send via the currently selected endpoint.
-			 *
-			 *  \return A value from the \ref Endpoint_ControlStream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Endpoint_Read_Control_Stream_LE(void* const Buffer,
-			                                        uint16_t Length) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Reads the given number of bytes from the CONTROL endpoint from the given buffer in big endian,
-			 *  discarding fully read packets from the host as needed. The device IN acknowledgement is not
-			 *  automatically sent after success or failure states; the user is responsible for manually sending the
-			 *  status IN packet to finalize the transfer's status stage via the \ref Endpoint_ClearIN() macro.
-			 *
-			 *  \note This function automatically sends the last packet in the data stage of the transaction; when the
-			 *        function returns, the user is responsible for clearing the <b>status</b> stage of the transaction.
-			 *        Note that the status stage packet is sent or received in the opposite direction of the data flow.
-			 *        \n\n
-			 *
-			 *  \note This routine should only be used on CONTROL type endpoints.
-			 *
-			 *  \warning Unlike the standard stream read/write commands, the control stream commands cannot be chained
-			 *           together; i.e. the entire stream data must be read or written at the one time.
-			 *
-			 *  \param[out] Buffer  Pointer to the destination data buffer to write to.
-			 *  \param[in]  Length  Number of bytes to send via the currently selected endpoint.
-			 *
-			 *  \return A value from the \ref Endpoint_ControlStream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Endpoint_Read_Control_Stream_BE(void* const Buffer,
-			                                        uint16_t Length) ATTR_NON_NULL_PTR_ARG(1);
-			/**@}*/
-
-			/** \name Stream functions for EEPROM source/destination data */
-			/**@{*/
-
-			/** EEPROM buffer source version of \ref Endpoint_Write_Stream_LE().
-			 *
-			 *  \param[in] Buffer          Pointer to the source data buffer to read from.
-			 *  \param[in] Length          Number of bytes to read for the currently selected endpoint into the buffer.
-			 *  \param[in] BytesProcessed  Pointer to a location where the total number of bytes processed in the current
-			 *                             transaction should be updated, \c NULL if the entire stream should be written at once.
-			 *
-			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Endpoint_Write_EStream_LE(const void* const Buffer,
-			                                  uint16_t Length,
-			                                  uint16_t* const BytesProcessed) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** EEPROM buffer source version of \ref Endpoint_Write_Stream_BE().
-			 *
-			 *  \param[in] Buffer          Pointer to the source data buffer to read from.
-			 *  \param[in] Length          Number of bytes to read for the currently selected endpoint into the buffer.
-			 *  \param[in] BytesProcessed  Pointer to a location where the total number of bytes processed in the current
-			 *                             transaction should be updated, \c NULL if the entire stream should be written at once.
-			 *
-			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Endpoint_Write_EStream_BE(const void* const Buffer,
-			                                  uint16_t Length,
-			                                  uint16_t* const BytesProcessed) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** EEPROM buffer destination version of \ref Endpoint_Read_Stream_LE().
-			 *
-			 *  \param[out] Buffer          Pointer to the destination data buffer to write to, located in EEPROM memory space.
-			 *  \param[in]  Length          Number of bytes to send via the currently selected endpoint.
-			 *  \param[in]  BytesProcessed  Pointer to a location where the total number of bytes processed in the current
-			 *                              transaction should be updated, \c NULL if the entire stream should be read at once.
-			 *
-			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Endpoint_Read_EStream_LE(void* const Buffer,
-			                                 uint16_t Length,
-			                                 uint16_t* const BytesProcessed) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** EEPROM buffer destination version of \ref Endpoint_Read_Stream_BE().
-			 *
-			 *  \param[out] Buffer          Pointer to the destination data buffer to write to, located in EEPROM memory space.
-			 *  \param[in]  Length          Number of bytes to send via the currently selected endpoint.
-			 *  \param[in]  BytesProcessed  Pointer to a location where the total number of bytes processed in the current
-			 *                              transaction should be updated, \c NULL if the entire stream should be read at once.
-			 *
-			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Endpoint_Read_EStream_BE(void* const Buffer,
-			                                 uint16_t Length,
-			                                 uint16_t* const BytesProcessed) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** EEPROM buffer source version of Endpoint_Write_Control_Stream_LE.
-			 *
-			 *  \note This function automatically sends the last packet in the data stage of the transaction; when the
-			 *        function returns, the user is responsible for clearing the <b>status</b> stage of the transaction.
-			 *        Note that the status stage packet is sent or received in the opposite direction of the data flow.
-			 *        \n\n
-			 *
-			 *  \note This routine should only be used on CONTROL type endpoints.
-			 *        \n\n
-			 *
-			 *  \warning Unlike the standard stream read/write commands, the control stream commands cannot be chained
-			 *           together; i.e. the entire stream data must be read or written at the one time.
-			 *
-			 *  \param[in] Buffer  Pointer to the source data buffer to read from.
-			 *  \param[in] Length  Number of bytes to read for the currently selected endpoint into the buffer.
-			 *
-			 *  \return A value from the \ref Endpoint_ControlStream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Endpoint_Write_Control_EStream_LE(const void* const Buffer,
-			                                          uint16_t Length) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** EEPROM buffer source version of \ref Endpoint_Write_Control_Stream_BE().
-			 *
-			 *  \note This function automatically sends the last packet in the data stage of the transaction; when the
-			 *        function returns, the user is responsible for clearing the <b>status</b> stage of the transaction.
-			 *        Note that the status stage packet is sent or received in the opposite direction of the data flow.
-			 *        \n\n
-			 *
-			 *  \note This routine should only be used on CONTROL type endpoints.
-			 *        \n\n
-			 *
-			 *  \warning Unlike the standard stream read/write commands, the control stream commands cannot be chained
-			 *           together; i.e. the entire stream data must be read or written at the one time.
-			 *
-			 *  \param[in] Buffer  Pointer to the source data buffer to read from.
-			 *  \param[in] Length  Number of bytes to read for the currently selected endpoint into the buffer.
-			 *
-			 *  \return A value from the \ref Endpoint_ControlStream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Endpoint_Write_Control_EStream_BE(const void* const Buffer,
-			                                          uint16_t Length) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** EEPROM buffer source version of \ref Endpoint_Read_Control_Stream_LE().
-			 *
-			 *  \note This function automatically sends the last packet in the data stage of the transaction; when the
-			 *        function returns, the user is responsible for clearing the <b>status</b> stage of the transaction.
-			 *        Note that the status stage packet is sent or received in the opposite direction of the data flow.
-			 *        \n\n
-			 *
-			 *  \note This routine should only be used on CONTROL type endpoints.
-			 *        \n\n
-			 *
-			 *  \warning Unlike the standard stream read/write commands, the control stream commands cannot be chained
-			 *           together; i.e. the entire stream data must be read or written at the one time.
-			 *
-			 *  \param[out] Buffer  Pointer to the destination data buffer to write to.
-			 *  \param[in]  Length  Number of bytes to send via the currently selected endpoint.
-			 *
-			 *  \return A value from the \ref Endpoint_ControlStream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Endpoint_Read_Control_EStream_LE(void* const Buffer,
-			                                         uint16_t Length) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** EEPROM buffer source version of \ref Endpoint_Read_Control_Stream_BE().
-			 *
-			 *  \note This function automatically sends the last packet in the data stage of the transaction; when the
-			 *        function returns, the user is responsible for clearing the <b>status</b> stage of the transaction.
-			 *        Note that the status stage packet is sent or received in the opposite direction of the data flow.
-			 *        \n\n
-			 *
-			 *  \note This routine should only be used on CONTROL type endpoints.
-			 *        \n\n
-			 *
-			 *  \warning Unlike the standard stream read/write commands, the control stream commands cannot be chained
-			 *           together; i.e. the entire stream data must be read or written at the one time.
-			 *
-			 *  \param[out] Buffer  Pointer to the destination data buffer to write to.
-			 *  \param[in]  Length  Number of bytes to send via the currently selected endpoint.
-			 *
-			 *  \return A value from the \ref Endpoint_ControlStream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Endpoint_Read_Control_EStream_BE(void* const Buffer,
-			                                         uint16_t Length) ATTR_NON_NULL_PTR_ARG(1);
-			/**@}*/
-
-			/** \name Stream functions for PROGMEM source/destination data */
-			/**@{*/
-
-			/** FLASH buffer source version of \ref Endpoint_Write_Stream_LE().
-			 *
-			 *  \pre The FLASH data must be located in the first 64KB of FLASH for this function to work correctly.
-			 *
-			 *  \param[in] Buffer          Pointer to the source data buffer to read from.
-			 *  \param[in] Length          Number of bytes to read for the currently selected endpoint into the buffer.
-			 *  \param[in] BytesProcessed  Pointer to a location where the total number of bytes processed in the current
-			 *                             transaction should be updated, \c NULL if the entire stream should be written at once.
-			 *
-			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Endpoint_Write_PStream_LE(const void* const Buffer,
-			                                  uint16_t Length,
-			                                  uint16_t* const BytesProcessed) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** FLASH buffer source version of \ref Endpoint_Write_Stream_BE().
-			 *
-			 *  \pre The FLASH data must be located in the first 64KB of FLASH for this function to work correctly.
-			 *
-			 *  \param[in] Buffer          Pointer to the source data buffer to read from.
-			 *  \param[in] Length          Number of bytes to read for the currently selected endpoint into the buffer.
-			 *  \param[in] BytesProcessed  Pointer to a location where the total number of bytes processed in the current
-			 *                             transaction should be updated, \c NULL if the entire stream should be written at once.
-			 *
-			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Endpoint_Write_PStream_BE(const void* const Buffer,
-			                                  uint16_t Length,
-			                                  uint16_t* const BytesProcessed) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** FLASH buffer source version of \ref Endpoint_Write_Control_Stream_LE().
-			 *
-			 *  \pre The FLASH data must be located in the first 64KB of FLASH for this function to work correctly.
-			 *
-			 *  \note This function automatically sends the last packet in the data stage of the transaction; when the
-			 *        function returns, the user is responsible for clearing the <b>status</b> stage of the transaction.
-			 *        Note that the status stage packet is sent or received in the opposite direction of the data flow.
-			 *        \n\n
-			 *
-			 *  \note This routine should only be used on CONTROL type endpoints.
-			 *        \n\n
-			 *
-			 *  \warning Unlike the standard stream read/write commands, the control stream commands cannot be chained
-			 *           together; i.e. the entire stream data must be read or written at the one time.
-			 *
-			 *  \param[in] Buffer  Pointer to the source data buffer to read from.
-			 *  \param[in] Length  Number of bytes to read for the currently selected endpoint into the buffer.
-			 *
-			 *  \return A value from the \ref Endpoint_ControlStream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Endpoint_Write_Control_PStream_LE(const void* const Buffer,
-			                                          uint16_t Length) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** FLASH buffer source version of \ref Endpoint_Write_Control_Stream_BE().
-			 *
-			 *  \pre The FLASH data must be located in the first 64KB of FLASH for this function to work correctly.
-			 *
-			 *  \note This function automatically sends the last packet in the data stage of the transaction; when the
-			 *        function returns, the user is responsible for clearing the <b>status</b> stage of the transaction.
-			 *        Note that the status stage packet is sent or received in the opposite direction of the data flow.
-			 *        \n\n
-			 *
-			 *  \note This routine should only be used on CONTROL type endpoints.
-			 *        \n\n
-			 *
-			 *  \warning Unlike the standard stream read/write commands, the control stream commands cannot be chained
-			 *           together; i.e. the entire stream data must be read or written at the one time.
-			 *
-			 *  \param[in] Buffer  Pointer to the source data buffer to read from.
-			 *  \param[in] Length  Number of bytes to read for the currently selected endpoint into the buffer.
-			 *
-			 *  \return A value from the \ref Endpoint_ControlStream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Endpoint_Write_Control_PStream_BE(const void* const Buffer,
-			                                          uint16_t Length) ATTR_NON_NULL_PTR_ARG(1);
-			/**@}*/
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Core/AVR8/Endpoint_AVR8.c b/NativePrograms/LUFA/Drivers/USB/Core/AVR8/Endpoint_AVR8.c
deleted file mode 100644
index 442d7f4552..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Core/AVR8/Endpoint_AVR8.c
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-#include "../../../../Common/Common.h"
-#if (ARCH == ARCH_AVR8)
-
-#define  __INCLUDE_FROM_USB_DRIVER
-#include "../USBMode.h"
-
-#if defined(USB_CAN_BE_DEVICE)
-
-#include "../Endpoint.h"
-
-#if !defined(FIXED_CONTROL_ENDPOINT_SIZE)
-uint8_t USB_Device_ControlEndpointSize = ENDPOINT_CONTROLEP_DEFAULT_SIZE;
-#endif
-
-bool Endpoint_ConfigureEndpointTable(const USB_Endpoint_Table_t* const Table,
-                                     const uint8_t Entries)
-{
-	for (uint8_t i = 0; i < Entries; i++)
-	{
-		if (!(Table[i].Address))
-		  continue;
-
-		if (!(Endpoint_ConfigureEndpoint(Table[i].Address, Table[i].Type, Table[i].Size, Table[i].Banks)))
-		  return false;
-	}
-
-	return true;
-}
-
-bool Endpoint_ConfigureEndpoint_Prv(const uint8_t Number,
-                                    const uint8_t UECFG0XData,
-                                    const uint8_t UECFG1XData)
-{
-#if defined(CONTROL_ONLY_DEVICE) || defined(ORDERED_EP_CONFIG)
-	Endpoint_SelectEndpoint(Number);
-	Endpoint_EnableEndpoint();
-
-	UECFG1X = 0;
-	UECFG0X = UECFG0XData;
-	UECFG1X = UECFG1XData;
-
-	return Endpoint_IsConfigured();
-#else
-	for (uint8_t EPNum = Number; EPNum < ENDPOINT_TOTAL_ENDPOINTS; EPNum++)
-	{
-		uint8_t UECFG0XTemp;
-		uint8_t UECFG1XTemp;
-		uint8_t UEIENXTemp;
-
-		Endpoint_SelectEndpoint(EPNum);
-
-		if (EPNum == Number)
-		{
-			UECFG0XTemp = UECFG0XData;
-			UECFG1XTemp = UECFG1XData;
-			UEIENXTemp  = 0;
-		}
-		else
-		{
-			UECFG0XTemp = UECFG0X;
-			UECFG1XTemp = UECFG1X;
-			UEIENXTemp  = UEIENX;
-		}
-
-		if (!(UECFG1XTemp & (1 << ALLOC)))
-		  continue;
-
-		Endpoint_DisableEndpoint();
-		UECFG1X &= ~(1 << ALLOC);
-
-		Endpoint_EnableEndpoint();
-		UECFG0X = UECFG0XTemp;
-		UECFG1X = UECFG1XTemp;
-		UEIENX  = UEIENXTemp;
-
-		if (!(Endpoint_IsConfigured()))
-		  return false;
-	}
-
-	Endpoint_SelectEndpoint(Number);
-	return true;
-#endif
-}
-
-void Endpoint_ClearEndpoints(void)
-{
-	UEINT = 0;
-
-	for (uint8_t EPNum = 0; EPNum < ENDPOINT_TOTAL_ENDPOINTS; EPNum++)
-	{
-		Endpoint_SelectEndpoint(EPNum);
-		UEIENX  = 0;
-		UEINTX  = 0;
-		UECFG1X = 0;
-		Endpoint_DisableEndpoint();
-	}
-}
-
-void Endpoint_ClearStatusStage(void)
-{
-	if (USB_ControlRequest.bmRequestType & REQDIR_DEVICETOHOST)
-	{
-		while (!(Endpoint_IsOUTReceived()))
-		{
-			if (USB_DeviceState == DEVICE_STATE_Unattached)
-			  return;
-		}
-
-		Endpoint_ClearOUT();
-	}
-	else
-	{
-		while (!(Endpoint_IsINReady()))
-		{
-			if (USB_DeviceState == DEVICE_STATE_Unattached)
-			  return;
-		}
-
-		Endpoint_ClearIN();
-	}
-}
-
-#if !defined(CONTROL_ONLY_DEVICE)
-uint8_t Endpoint_WaitUntilReady(void)
-{
-	#if (USB_STREAM_TIMEOUT_MS < 0xFF)
-	uint8_t  TimeoutMSRem = USB_STREAM_TIMEOUT_MS;
-	#else
-	uint16_t TimeoutMSRem = USB_STREAM_TIMEOUT_MS;
-	#endif
-
-	uint16_t PreviousFrameNumber = USB_Device_GetFrameNumber();
-
-	for (;;)
-	{
-		if (Endpoint_GetEndpointDirection() == ENDPOINT_DIR_IN)
-		{
-			if (Endpoint_IsINReady())
-			  return ENDPOINT_READYWAIT_NoError;
-		}
-		else
-		{
-			if (Endpoint_IsOUTReceived())
-			  return ENDPOINT_READYWAIT_NoError;
-		}
-
-		uint8_t USB_DeviceState_LCL = USB_DeviceState;
-
-		if (USB_DeviceState_LCL == DEVICE_STATE_Unattached)
-		  return ENDPOINT_READYWAIT_DeviceDisconnected;
-		else if (USB_DeviceState_LCL == DEVICE_STATE_Suspended)
-		  return ENDPOINT_READYWAIT_BusSuspended;
-		else if (Endpoint_IsStalled())
-		  return ENDPOINT_READYWAIT_EndpointStalled;
-
-		uint16_t CurrentFrameNumber = USB_Device_GetFrameNumber();
-
-		if (CurrentFrameNumber != PreviousFrameNumber)
-		{
-			PreviousFrameNumber = CurrentFrameNumber;
-
-			if (!(TimeoutMSRem--))
-			  return ENDPOINT_READYWAIT_Timeout;
-		}
-	}
-}
-#endif
-
-#endif
-
-#endif
diff --git a/NativePrograms/LUFA/Drivers/USB/Core/AVR8/Endpoint_AVR8.h b/NativePrograms/LUFA/Drivers/USB/Core/AVR8/Endpoint_AVR8.h
deleted file mode 100644
index 474a5084b4..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Core/AVR8/Endpoint_AVR8.h
+++ /dev/null
@@ -1,819 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief USB Endpoint definitions for the AVR8 microcontrollers.
- *  \copydetails Group_EndpointManagement_AVR8
- *
- *  \note This file should not be included directly. It is automatically included as needed by the USB driver
- *        dispatch header located in LUFA/Drivers/USB/USB.h.
- */
-
-/** \ingroup Group_EndpointRW
- *  \defgroup Group_EndpointRW_AVR8 Endpoint Data Reading and Writing (AVR8)
- *  \brief Endpoint data read/write definitions for the Atmel AVR8 architecture.
- *
- *  Functions, macros, variables, enums and types related to data reading and writing from and to endpoints.
- */
-
-/** \ingroup Group_EndpointPrimitiveRW
- *  \defgroup Group_EndpointPrimitiveRW_AVR8 Read/Write of Primitive Data Types (AVR8)
- *  \brief Endpoint primitive read/write definitions for the Atmel AVR8 architecture.
- *
- *  Functions, macros, variables, enums and types related to data reading and writing of primitive data types
- *  from and to endpoints.
- */
-
-/** \ingroup Group_EndpointPacketManagement
- *  \defgroup Group_EndpointPacketManagement_AVR8 Endpoint Packet Management (AVR8)
- *  \brief Endpoint packet management definitions for the Atmel AVR8 architecture.
- *
- *  Functions, macros, variables, enums and types related to packet management of endpoints.
- */
-
-/** \ingroup Group_EndpointManagement
- *  \defgroup Group_EndpointManagement_AVR8 Endpoint Management (AVR8)
- *  \brief Endpoint management definitions for the Atmel AVR8 architecture.
- *
- *  Functions, macros and enums related to endpoint management when in USB Device mode. This
- *  module contains the endpoint management macros, as well as endpoint interrupt and data
- *  send/receive functions for various data types.
- *
- *  @{
- */
-
-#ifndef __ENDPOINT_AVR8_H__
-#define __ENDPOINT_AVR8_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-		#include "../USBTask.h"
-		#include "../USBInterrupt.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_USB_DRIVER)
-			#error Do not include this file directly. Include LUFA/Drivers/USB/USB.h instead.
-		#endif
-
-	/* Private Interface - For use in library only: */
-	#if !defined(__DOXYGEN__)
-		/* Inline Functions: */
-			static inline uint8_t Endpoint_BytesToEPSizeMask(const uint16_t Bytes) ATTR_WARN_UNUSED_RESULT ATTR_CONST
-			                                                                       ATTR_ALWAYS_INLINE;
-			static inline uint8_t Endpoint_BytesToEPSizeMask(const uint16_t Bytes)
-			{
-				uint8_t  MaskVal    = 0;
-				uint16_t CheckBytes = 8;
-
-				while (CheckBytes < Bytes)
-				{
-					MaskVal++;
-					CheckBytes <<= 1;
-				}
-
-				return (MaskVal << EPSIZE0);
-			}
-
-		/* Function Prototypes: */
-			void Endpoint_ClearEndpoints(void);
-			bool Endpoint_ConfigureEndpoint_Prv(const uint8_t Number,
-			                                    const uint8_t UECFG0XData,
-			                                    const uint8_t UECFG1XData);
-
-	#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			#if (!defined(FIXED_CONTROL_ENDPOINT_SIZE) || defined(__DOXYGEN__))
-				/** Default size of the default control endpoint's bank, until altered by the control endpoint bank size
-				 *  value in the device descriptor. Not available if the \c FIXED_CONTROL_ENDPOINT_SIZE token is defined.
-				 */
-				#define ENDPOINT_CONTROLEP_DEFAULT_SIZE     8
-			#endif
-
-			#if !defined(CONTROL_ONLY_DEVICE) || defined(__DOXYGEN__)
-				#if defined(USB_SERIES_4_AVR) || defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR) || defined(__DOXYGEN__)
-					/** Total number of endpoints (including the default control endpoint at address 0) which may
-					 *  be used in the device. Different USB AVR models support different amounts of endpoints,
-					 *  this value reflects the maximum number of endpoints for the currently selected AVR model.
-					 */
-					#define ENDPOINT_TOTAL_ENDPOINTS        7
-				#else
-					#define ENDPOINT_TOTAL_ENDPOINTS        5
-				#endif
-			#else
-				#define ENDPOINT_TOTAL_ENDPOINTS            1
-			#endif
-
-		/* Enums: */
-			/** Enum for the possible error return codes of the \ref Endpoint_WaitUntilReady() function.
-			 *
-			 *  \ingroup Group_EndpointRW_AVR8
-			 */
-			enum Endpoint_WaitUntilReady_ErrorCodes_t
-			{
-				ENDPOINT_READYWAIT_NoError                 = 0, /**< Endpoint is ready for next packet, no error. */
-				ENDPOINT_READYWAIT_EndpointStalled         = 1, /**< The endpoint was stalled during the stream
-				                                                 *   transfer by the host or device.
-				                                                 */
-				ENDPOINT_READYWAIT_DeviceDisconnected      = 2,	/**< Device was disconnected from the host while
-				                                                 *   waiting for the endpoint to become ready.
-				                                                 */
-				ENDPOINT_READYWAIT_BusSuspended            = 3, /**< The USB bus has been suspended by the host and
-				                                                 *   no USB endpoint traffic can occur until the bus
-				                                                 *   has resumed.
-				                                                 */
-				ENDPOINT_READYWAIT_Timeout                 = 4, /**< The host failed to accept or send the next packet
-				                                                 *   within the software timeout period set by the
-				                                                 *   \ref USB_STREAM_TIMEOUT_MS macro.
-				                                                 */
-			};
-
-		/* Inline Functions: */
-			/** Configures the specified endpoint address with the given endpoint type, bank size and number of hardware
-			 *  banks. Once configured, the endpoint may be read from or written to, depending on its direction.
-			 *
-			 *  \param[in] Address    Endpoint address to configure.
-			 *
-			 *  \param[in] Type       Type of endpoint to configure, a \c EP_TYPE_* mask. Not all endpoint types
-			 *                        are available on Low Speed USB devices - refer to the USB 2.0 specification.
-			 *
-			 *  \param[in] Size       Size of the endpoint's bank, where packets are stored before they are transmitted
-			 *                        to the USB host, or after they have been received from the USB host (depending on
-			 *                        the endpoint's data direction). The bank size must indicate the maximum packet size
-			 *                        that the endpoint can handle.
-			 *
-			 *  \param[in] Banks      Number of banks to use for the endpoint being configured.
-			 *
-			 *  \attention When the \c ORDERED_EP_CONFIG compile time option is used, Endpoints <b>must</b> be configured in
-			 *             ascending order, or bank corruption will occur.
-			 *
-			 *  \note Different endpoints may have different maximum packet sizes based on the endpoint's index - please
-			 *        refer to the chosen microcontroller model's datasheet to determine the maximum bank size for each endpoint.
-			 *        \n\n
-			 *
-			 *  \note The default control endpoint should not be manually configured by the user application, as
-			 *        it is automatically configured by the library internally.
-			 *        \n\n
-			 *
-			 *  \note This routine will automatically select the specified endpoint upon success. Upon failure, the endpoint
-			 *        which failed to reconfigure correctly will be selected.
-			 *
-			 *  \return Boolean \c true if the configuration succeeded, \c false otherwise.
-			 */
-			static inline bool Endpoint_ConfigureEndpoint(const uint8_t Address,
-			                                              const uint8_t Type,
-			                                              const uint16_t Size,
-			                                              const uint8_t Banks) ATTR_ALWAYS_INLINE;
-			static inline bool Endpoint_ConfigureEndpoint(const uint8_t Address,
-			                                              const uint8_t Type,
-			                                              const uint16_t Size,
-			                                              const uint8_t Banks)
-			{
-				uint8_t Number = (Address & ENDPOINT_EPNUM_MASK);
-
-				if (Number >= ENDPOINT_TOTAL_ENDPOINTS)
-				  return false;
-
-				return Endpoint_ConfigureEndpoint_Prv(Number,
-				                                      ((Type << EPTYPE0) | ((Address & ENDPOINT_DIR_IN) ? (1 << EPDIR) : 0)),
-				                                      ((1 << ALLOC) | ((Banks > 1) ? (1 << EPBK0) : 0) | Endpoint_BytesToEPSizeMask(Size)));
-			}
-
-			/** Indicates the number of bytes currently stored in the current endpoint's selected bank.
-			 *
-			 *  \ingroup Group_EndpointRW_AVR8
-			 *
-			 *  \return Total number of bytes in the currently selected Endpoint's FIFO buffer.
-			 */
-			static inline uint16_t Endpoint_BytesInEndpoint(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline uint16_t Endpoint_BytesInEndpoint(void)
-			{
-				#if (defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR))
-					return UEBCX;
-				#elif defined(USB_SERIES_4_AVR)
-					return (((uint16_t)UEBCHX << 8) | UEBCLX);
-				#elif defined(USB_SERIES_2_AVR)
-					return UEBCLX;
-				#endif
-			}
-
-			/** Determines the currently selected endpoint's direction.
-			 *
-			 *  \return The currently selected endpoint's direction, as a \c ENDPOINT_DIR_* mask.
-			 */
-			static inline uint8_t Endpoint_GetEndpointDirection(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline uint8_t Endpoint_GetEndpointDirection(void)
-			{
-				return (UECFG0X & (1 << EPDIR)) ? ENDPOINT_DIR_IN : ENDPOINT_DIR_OUT;
-			}
-
-			/** Get the endpoint address of the currently selected endpoint. This is typically used to save
-			 *  the currently selected endpoint so that it can be restored after another endpoint has been
-			 *  manipulated.
-			 *
-			 *  \return Index of the currently selected endpoint.
-			 */
-			static inline uint8_t Endpoint_GetCurrentEndpoint(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline uint8_t Endpoint_GetCurrentEndpoint(void)
-			{
-				#if !defined(CONTROL_ONLY_DEVICE)
-					return ((UENUM & ENDPOINT_EPNUM_MASK) | Endpoint_GetEndpointDirection());
-				#else
-					return ENDPOINT_CONTROLEP;
-				#endif
-			}
-
-			/** Selects the given endpoint address.
-			 *
-			 *  Any endpoint operations which do not require the endpoint address to be indicated will operate on
-			 *  the currently selected endpoint.
-			 *
-			 *  \param[in] Address Endpoint address to select.
-			 */
-			static inline void Endpoint_SelectEndpoint(const uint8_t Address) ATTR_ALWAYS_INLINE;
-			static inline void Endpoint_SelectEndpoint(const uint8_t Address)
-			{
-				#if !defined(CONTROL_ONLY_DEVICE)
-					UENUM = (Address & ENDPOINT_EPNUM_MASK);
-				#endif
-			}
-
-			/** Resets the endpoint bank FIFO. This clears all the endpoint banks and resets the USB controller's
-			 *  data In and Out pointers to the bank's contents.
-			 *
-			 *  \param[in] Address  Endpoint address whose FIFO buffers are to be reset.
-			 */
-			static inline void Endpoint_ResetEndpoint(const uint8_t Address) ATTR_ALWAYS_INLINE;
-			static inline void Endpoint_ResetEndpoint(const uint8_t Address)
-			{
-				UERST = (1 << (Address & ENDPOINT_EPNUM_MASK));
-				UERST = 0;
-			}
-
-			/** Enables the currently selected endpoint so that data can be sent and received through it to
-			 *  and from a host.
-			 *
-			 *  \note Endpoints must first be configured properly via \ref Endpoint_ConfigureEndpoint().
-			 */
-			static inline void Endpoint_EnableEndpoint(void) ATTR_ALWAYS_INLINE;
-			static inline void Endpoint_EnableEndpoint(void)
-			{
-				UECONX |= (1 << EPEN);
-			}
-
-			/** Disables the currently selected endpoint so that data cannot be sent and received through it
-			 *  to and from a host.
-			 */
-			static inline void Endpoint_DisableEndpoint(void) ATTR_ALWAYS_INLINE;
-			static inline void Endpoint_DisableEndpoint(void)
-			{
-				UECONX &= ~(1 << EPEN);
-			}
-
-			/** Determines if the currently selected endpoint is enabled, but not necessarily configured.
-			 *
-			 * \return Boolean \c true if the currently selected endpoint is enabled, \c false otherwise.
-			 */
-			static inline bool Endpoint_IsEnabled(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline bool Endpoint_IsEnabled(void)
-			{
-				return ((UECONX & (1 << EPEN)) ? true : false);
-			}
-
-			/** Retrieves the number of busy banks in the currently selected endpoint, which have been queued for
-			 *  transmission via the \ref Endpoint_ClearIN() command, or are awaiting acknowledgment via the
-			 *  \ref Endpoint_ClearOUT() command.
-			 *
-			 *  \ingroup Group_EndpointPacketManagement_AVR8
-			 *
-			 *  \return Total number of busy banks in the selected endpoint.
-			 */
-			static inline uint8_t Endpoint_GetBusyBanks(void) ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT;
-			static inline uint8_t Endpoint_GetBusyBanks(void)
-			{
-				return (UESTA0X & (0x03 << NBUSYBK0));
-			}
-
-			/** Aborts all pending IN transactions on the currently selected endpoint, once the bank
-			 *  has been queued for transmission to the host via \ref Endpoint_ClearIN(). This function
-			 *  will terminate all queued transactions, resetting the endpoint banks ready for a new
-			 *  packet.
-			 *
-			 *  \ingroup Group_EndpointPacketManagement_AVR8
-			 */
-			static inline void Endpoint_AbortPendingIN(void)
-			{
-				while (Endpoint_GetBusyBanks() != 0)
-				{
-					UEINTX |= (1 << RXOUTI);
-					while (UEINTX & (1 << RXOUTI));
-				}
-			}
-
-			/** Determines if the currently selected endpoint may be read from (if data is waiting in the endpoint
-			 *  bank and the endpoint is an OUT direction, or if the bank is not yet full if the endpoint is an IN
-			 *  direction). This function will return false if an error has occurred in the endpoint, if the endpoint
-			 *  is an OUT direction and no packet (or an empty packet) has been received, or if the endpoint is an IN
-			 *  direction and the endpoint bank is full.
-			 *
-			 *  \ingroup Group_EndpointPacketManagement_AVR8
-			 *
-			 *  \return Boolean \c true if the currently selected endpoint may be read from or written to, depending
-			 *          on its direction.
-			 */
-			static inline bool Endpoint_IsReadWriteAllowed(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline bool Endpoint_IsReadWriteAllowed(void)
-			{
-				return ((UEINTX & (1 << RWAL)) ? true : false);
-			}
-
-			/** Determines if the currently selected endpoint is configured.
-			 *
-			 *  \return Boolean \c true if the currently selected endpoint has been configured, \c false otherwise.
-			 */
-			static inline bool Endpoint_IsConfigured(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline bool Endpoint_IsConfigured(void)
-			{
-				return ((UESTA0X & (1 << CFGOK)) ? true : false);
-			}
-
-			/** Returns a mask indicating which INTERRUPT type endpoints have interrupted - i.e. their
-			 *  interrupt duration has elapsed. Which endpoints have interrupted can be determined by
-			 *  masking the return value against <tt>(1 << <i>{Endpoint Number}</i>)</tt>.
-			 *
-			 *  \return Mask whose bits indicate which endpoints have interrupted.
-			 */
-			static inline uint8_t Endpoint_GetEndpointInterrupts(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline uint8_t Endpoint_GetEndpointInterrupts(void)
-			{
-				return UEINT;
-			}
-
-			/** Determines if the specified endpoint number has interrupted (valid only for INTERRUPT type
-			 *  endpoints).
-			 *
-			 *  \param[in] Address  Address of the endpoint whose interrupt flag should be tested.
-			 *
-			 *  \return Boolean \c true if the specified endpoint has interrupted, \c false otherwise.
-			 */
-			static inline bool Endpoint_HasEndpointInterrupted(const uint8_t Address) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline bool Endpoint_HasEndpointInterrupted(const uint8_t Address)
-			{
-				return ((Endpoint_GetEndpointInterrupts() & (1 << (Address & ENDPOINT_EPNUM_MASK))) ? true : false);
-			}
-
-			/** Determines if the selected IN endpoint is ready for a new packet to be sent to the host.
-			 *
-			 *  \ingroup Group_EndpointPacketManagement_AVR8
-			 *
-			 *  \return Boolean \c true if the current endpoint is ready for an IN packet, \c false otherwise.
-			 */
-			static inline bool Endpoint_IsINReady(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline bool Endpoint_IsINReady(void)
-			{
-				return ((UEINTX & (1 << TXINI)) ? true : false);
-			}
-
-			/** Determines if the selected OUT endpoint has received new packet from the host.
-			 *
-			 *  \ingroup Group_EndpointPacketManagement_AVR8
-			 *
-			 *  \return Boolean \c true if current endpoint is has received an OUT packet, \c false otherwise.
-			 */
-			static inline bool Endpoint_IsOUTReceived(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline bool Endpoint_IsOUTReceived(void)
-			{
-				return ((UEINTX & (1 << RXOUTI)) ? true : false);
-			}
-
-			/** Determines if the current CONTROL type endpoint has received a SETUP packet.
-			 *
-			 *  \ingroup Group_EndpointPacketManagement_AVR8
-			 *
-			 *  \return Boolean \c true if the selected endpoint has received a SETUP packet, \c false otherwise.
-			 */
-			static inline bool Endpoint_IsSETUPReceived(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline bool Endpoint_IsSETUPReceived(void)
-			{
-				return ((UEINTX & (1 << RXSTPI)) ? true : false);
-			}
-
-			/** Clears a received SETUP packet on the currently selected CONTROL type endpoint, freeing up the
-			 *  endpoint for the next packet.
-			 *
-			 *  \ingroup Group_EndpointPacketManagement_AVR8
-			 *
-			 *  \note This is not applicable for non CONTROL type endpoints.
-			 */
-			static inline void Endpoint_ClearSETUP(void) ATTR_ALWAYS_INLINE;
-			static inline void Endpoint_ClearSETUP(void)
-			{
-				UEINTX &= ~(1 << RXSTPI);
-			}
-
-			/** Sends an IN packet to the host on the currently selected endpoint, freeing up the endpoint for the
-			 *  next packet and switching to the alternative endpoint bank if double banked.
-			 *
-			 *  \ingroup Group_EndpointPacketManagement_AVR8
-			 */
-			static inline void Endpoint_ClearIN(void) ATTR_ALWAYS_INLINE;
-			static inline void Endpoint_ClearIN(void)
-			{
-				#if !defined(CONTROL_ONLY_DEVICE)
-					UEINTX &= ~((1 << TXINI) | (1 << FIFOCON));
-				#else
-					UEINTX &= ~(1 << TXINI);
-				#endif
-			}
-
-			/** Acknowledges an OUT packet to the host on the currently selected endpoint, freeing up the endpoint
-			 *  for the next packet and switching to the alternative endpoint bank if double banked.
-			 *
-			 *  \ingroup Group_EndpointPacketManagement_AVR8
-			 */
-			static inline void Endpoint_ClearOUT(void) ATTR_ALWAYS_INLINE;
-			static inline void Endpoint_ClearOUT(void)
-			{
-				#if !defined(CONTROL_ONLY_DEVICE)
-					UEINTX &= ~((1 << RXOUTI) | (1 << FIFOCON));
-				#else
-					UEINTX &= ~(1 << RXOUTI);
-				#endif
-			}
-
-			/** Stalls the current endpoint, indicating to the host that a logical problem occurred with the
-			 *  indicated endpoint and that the current transfer sequence should be aborted. This provides a
-			 *  way for devices to indicate invalid commands to the host so that the current transfer can be
-			 *  aborted and the host can begin its own recovery sequence.
-			 *
-			 *  The currently selected endpoint remains stalled until either the \ref Endpoint_ClearStall() macro
-			 *  is called, or the host issues a CLEAR FEATURE request to the device for the currently selected
-			 *  endpoint.
-			 *
-			 *  \ingroup Group_EndpointPacketManagement_AVR8
-			 */
-			static inline void Endpoint_StallTransaction(void) ATTR_ALWAYS_INLINE;
-			static inline void Endpoint_StallTransaction(void)
-			{
-				UECONX |= (1 << STALLRQ);
-			}
-
-			/** Clears the STALL condition on the currently selected endpoint.
-			 *
-			 *  \ingroup Group_EndpointPacketManagement_AVR8
-			 */
-			static inline void Endpoint_ClearStall(void) ATTR_ALWAYS_INLINE;
-			static inline void Endpoint_ClearStall(void)
-			{
-				UECONX |= (1 << STALLRQC);
-			}
-
-			/** Determines if the currently selected endpoint is stalled, \c false otherwise.
-			 *
-			 *  \ingroup Group_EndpointPacketManagement_AVR8
-			 *
-			 *  \return Boolean \c true if the currently selected endpoint is stalled, \c false otherwise.
-			 */
-			static inline bool Endpoint_IsStalled(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline bool Endpoint_IsStalled(void)
-			{
-				return ((UECONX & (1 << STALLRQ)) ? true : false);
-			}
-
-			/** Resets the data toggle of the currently selected endpoint. */
-			static inline void Endpoint_ResetDataToggle(void) ATTR_ALWAYS_INLINE;
-			static inline void Endpoint_ResetDataToggle(void)
-			{
-				UECONX |= (1 << RSTDT);
-			}
-
-			/** Sets the direction of the currently selected endpoint.
-			 *
-			 *  \param[in] DirectionMask  New endpoint direction, as a \c ENDPOINT_DIR_* mask.
-			 */
-			static inline void Endpoint_SetEndpointDirection(const uint8_t DirectionMask) ATTR_ALWAYS_INLINE;
-			static inline void Endpoint_SetEndpointDirection(const uint8_t DirectionMask)
-			{
-				UECFG0X = ((UECFG0X & ~(1 << EPDIR)) | (DirectionMask ? (1 << EPDIR) : 0));
-			}
-
-			/** Reads one byte from the currently selected endpoint's bank, for OUT direction endpoints.
-			 *
-			 *  \ingroup Group_EndpointPrimitiveRW_AVR8
-			 *
-			 *  \return Next byte in the currently selected endpoint's FIFO buffer.
-			 */
-			static inline uint8_t Endpoint_Read_8(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline uint8_t Endpoint_Read_8(void)
-			{
-				return UEDATX;
-			}
-
-			/** Writes one byte to the currently selected endpoint's bank, for IN direction endpoints.
-			 *
-			 *  \ingroup Group_EndpointPrimitiveRW_AVR8
-			 *
-			 *  \param[in] Data  Data to write into the the currently selected endpoint's FIFO buffer.
-			 */
-			static inline void Endpoint_Write_8(const uint8_t Data) ATTR_ALWAYS_INLINE;
-			static inline void Endpoint_Write_8(const uint8_t Data)
-			{
-				UEDATX = Data;
-			}
-
-			/** Discards one byte from the currently selected endpoint's bank, for OUT direction endpoints.
-			 *
-			 *  \ingroup Group_EndpointPrimitiveRW_AVR8
-			 */
-			static inline void Endpoint_Discard_8(void) ATTR_ALWAYS_INLINE;
-			static inline void Endpoint_Discard_8(void)
-			{
-				uint8_t Dummy;
-
-				Dummy = UEDATX;
-
-				(void)Dummy;
-			}
-
-			/** Reads two bytes from the currently selected endpoint's bank in little endian format, for OUT
-			 *  direction endpoints.
-			 *
-			 *  \ingroup Group_EndpointPrimitiveRW_AVR8
-			 *
-			 *  \return Next two bytes in the currently selected endpoint's FIFO buffer.
-			 */
-			static inline uint16_t Endpoint_Read_16_LE(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline uint16_t Endpoint_Read_16_LE(void)
-			{
-				union
-				{
-					uint16_t Value;
-					uint8_t  Bytes[2];
-				} Data;
-
-				Data.Bytes[0] = UEDATX;
-				Data.Bytes[1] = UEDATX;
-
-				return Data.Value;
-			}
-
-			/** Reads two bytes from the currently selected endpoint's bank in big endian format, for OUT
-			 *  direction endpoints.
-			 *
-			 *  \ingroup Group_EndpointPrimitiveRW_AVR8
-			 *
-			 *  \return Next two bytes in the currently selected endpoint's FIFO buffer.
-			 */
-			static inline uint16_t Endpoint_Read_16_BE(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline uint16_t Endpoint_Read_16_BE(void)
-			{
-				union
-				{
-					uint16_t Value;
-					uint8_t  Bytes[2];
-				} Data;
-
-				Data.Bytes[1] = UEDATX;
-				Data.Bytes[0] = UEDATX;
-
-				return Data.Value;
-			}
-
-			/** Writes two bytes to the currently selected endpoint's bank in little endian format, for IN
-			 *  direction endpoints.
-			 *
-			 *  \ingroup Group_EndpointPrimitiveRW_AVR8
-			 *
-			 *  \param[in] Data  Data to write to the currently selected endpoint's FIFO buffer.
-			 */
-			static inline void Endpoint_Write_16_LE(const uint16_t Data) ATTR_ALWAYS_INLINE;
-			static inline void Endpoint_Write_16_LE(const uint16_t Data)
-			{
-				UEDATX = (Data & 0xFF);
-				UEDATX = (Data >> 8);
-			}
-
-			/** Writes two bytes to the currently selected endpoint's bank in big endian format, for IN
-			 *  direction endpoints.
-			 *
-			 *  \ingroup Group_EndpointPrimitiveRW_AVR8
-			 *
-			 *  \param[in] Data  Data to write to the currently selected endpoint's FIFO buffer.
-			 */
-			static inline void Endpoint_Write_16_BE(const uint16_t Data) ATTR_ALWAYS_INLINE;
-			static inline void Endpoint_Write_16_BE(const uint16_t Data)
-			{
-				UEDATX = (Data >> 8);
-				UEDATX = (Data & 0xFF);
-			}
-
-			/** Discards two bytes from the currently selected endpoint's bank, for OUT direction endpoints.
-			 *
-			 *  \ingroup Group_EndpointPrimitiveRW_AVR8
-			 */
-			static inline void Endpoint_Discard_16(void) ATTR_ALWAYS_INLINE;
-			static inline void Endpoint_Discard_16(void)
-			{
-				uint8_t Dummy;
-
-				Dummy = UEDATX;
-				Dummy = UEDATX;
-
-				(void)Dummy;
-			}
-
-			/** Reads four bytes from the currently selected endpoint's bank in little endian format, for OUT
-			 *  direction endpoints.
-			 *
-			 *  \ingroup Group_EndpointPrimitiveRW_AVR8
-			 *
-			 *  \return Next four bytes in the currently selected endpoint's FIFO buffer.
-			 */
-			static inline uint32_t Endpoint_Read_32_LE(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline uint32_t Endpoint_Read_32_LE(void)
-			{
-				union
-				{
-					uint32_t Value;
-					uint8_t  Bytes[4];
-				} Data;
-
-				Data.Bytes[0] = UEDATX;
-				Data.Bytes[1] = UEDATX;
-				Data.Bytes[2] = UEDATX;
-				Data.Bytes[3] = UEDATX;
-
-				return Data.Value;
-			}
-
-			/** Reads four bytes from the currently selected endpoint's bank in big endian format, for OUT
-			 *  direction endpoints.
-			 *
-			 *  \ingroup Group_EndpointPrimitiveRW_AVR8
-			 *
-			 *  \return Next four bytes in the currently selected endpoint's FIFO buffer.
-			 */
-			static inline uint32_t Endpoint_Read_32_BE(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline uint32_t Endpoint_Read_32_BE(void)
-			{
-				union
-				{
-					uint32_t Value;
-					uint8_t  Bytes[4];
-				} Data;
-
-				Data.Bytes[3] = UEDATX;
-				Data.Bytes[2] = UEDATX;
-				Data.Bytes[1] = UEDATX;
-				Data.Bytes[0] = UEDATX;
-
-				return Data.Value;
-			}
-
-			/** Writes four bytes to the currently selected endpoint's bank in little endian format, for IN
-			 *  direction endpoints.
-			 *
-			 *  \ingroup Group_EndpointPrimitiveRW_AVR8
-			 *
-			 *  \param[in] Data  Data to write to the currently selected endpoint's FIFO buffer.
-			 */
-			static inline void Endpoint_Write_32_LE(const uint32_t Data) ATTR_ALWAYS_INLINE;
-			static inline void Endpoint_Write_32_LE(const uint32_t Data)
-			{
-				UEDATX = (Data &  0xFF);
-				UEDATX = (Data >> 8);
-				UEDATX = (Data >> 16);
-				UEDATX = (Data >> 24);
-			}
-
-			/** Writes four bytes to the currently selected endpoint's bank in big endian format, for IN
-			 *  direction endpoints.
-			 *
-			 *  \ingroup Group_EndpointPrimitiveRW_AVR8
-			 *
-			 *  \param[in] Data  Data to write to the currently selected endpoint's FIFO buffer.
-			 */
-			static inline void Endpoint_Write_32_BE(const uint32_t Data) ATTR_ALWAYS_INLINE;
-			static inline void Endpoint_Write_32_BE(const uint32_t Data)
-			{
-				UEDATX = (Data >> 24);
-				UEDATX = (Data >> 16);
-				UEDATX = (Data >> 8);
-				UEDATX = (Data &  0xFF);
-			}
-
-			/** Discards four bytes from the currently selected endpoint's bank, for OUT direction endpoints.
-			 *
-			 *  \ingroup Group_EndpointPrimitiveRW_AVR8
-			 */
-			static inline void Endpoint_Discard_32(void) ATTR_ALWAYS_INLINE;
-			static inline void Endpoint_Discard_32(void)
-			{
-				uint8_t Dummy;
-
-				Dummy = UEDATX;
-				Dummy = UEDATX;
-				Dummy = UEDATX;
-				Dummy = UEDATX;
-
-				(void)Dummy;
-			}
-
-		/* External Variables: */
-			/** Global indicating the maximum packet size of the default control endpoint located at address
-			 *  0 in the device. This value is set to the value indicated in the device descriptor in the user
-			 *  project once the USB interface is initialized into device mode.
-			 *
-			 *  If space is an issue, it is possible to fix this to a static value by defining the control
-			 *  endpoint size in the \c FIXED_CONTROL_ENDPOINT_SIZE token passed to the compiler in the makefile
-			 *  via the -D switch. When a fixed control endpoint size is used, the size is no longer dynamically
-			 *  read from the descriptors at runtime and instead fixed to the given value. When used, it is
-			 *  important that the descriptor control endpoint size value matches the size given as the
-			 *  \c FIXED_CONTROL_ENDPOINT_SIZE token - it is recommended that the \c FIXED_CONTROL_ENDPOINT_SIZE token
-			 *  be used in the device descriptors to ensure this.
-			 *
-			 *  \attention This variable should be treated as read-only in the user application, and never manually
-			 *             changed in value.
-			 */
-			#if (!defined(FIXED_CONTROL_ENDPOINT_SIZE) || defined(__DOXYGEN__))
-				extern uint8_t USB_Device_ControlEndpointSize;
-			#else
-				#define USB_Device_ControlEndpointSize FIXED_CONTROL_ENDPOINT_SIZE
-			#endif
-
-		/* Function Prototypes: */
-			/** Configures a table of endpoint descriptions, in sequence. This function can be used to configure multiple
-			 *  endpoints at the same time.
-			 *
-			 *  \note Endpoints with a zero address will be ignored, thus this function cannot be used to configure the
-			 *        control endpoint.
-			 *
-			 *  \param[in] Table    Pointer to a table of endpoint descriptions.
-			 *  \param[in] Entries  Number of entries in the endpoint table to configure.
-			 *
-			 *  \return Boolean \c true if all endpoints configured successfully, \c false otherwise.
-			 */
-			bool Endpoint_ConfigureEndpointTable(const USB_Endpoint_Table_t* const Table,
-			                                     const uint8_t Entries);
-
-			/** Completes the status stage of a control transfer on a CONTROL type endpoint automatically,
-			 *  with respect to the data direction. This is a convenience function which can be used to
-			 *  simplify user control request handling.
-			 *
-			 *  \note This routine should not be called on non CONTROL type endpoints.
-			 */
-			void Endpoint_ClearStatusStage(void);
-
-			/** Spin-loops until the currently selected non-control endpoint is ready for the next packet of data
-			 *  to be read or written to it.
-			 *
-			 *  \note This routine should not be called on CONTROL type endpoints.
-			 *
-			 *  \ingroup Group_EndpointRW_AVR8
-			 *
-			 *  \return A value from the \ref Endpoint_WaitUntilReady_ErrorCodes_t enum.
-			 */
-			uint8_t Endpoint_WaitUntilReady(void);
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Core/AVR8/Host_AVR8.c b/NativePrograms/LUFA/Drivers/USB/Core/AVR8/Host_AVR8.c
deleted file mode 100644
index d74c28ee87..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Core/AVR8/Host_AVR8.c
+++ /dev/null
@@ -1,297 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-#include "../../../../Common/Common.h"
-#if (ARCH == ARCH_AVR8)
-
-#define  __INCLUDE_FROM_USB_DRIVER
-#include "../USBMode.h"
-
-#if defined(USB_CAN_BE_HOST)
-
-#define  __INCLUDE_FROM_HOST_C
-#include "../Host.h"
-
-void USB_Host_ProcessNextHostState(void)
-{
-	uint8_t ErrorCode    = HOST_ENUMERROR_NoError;
-	uint8_t SubErrorCode = HOST_ENUMERROR_NoError;
-
-	static uint16_t WaitMSRemaining;
-	static uint8_t  PostWaitState;
-
-	switch (USB_HostState)
-	{
-		case HOST_STATE_WaitForDevice:
-			if (WaitMSRemaining)
-			{
-				if ((SubErrorCode = USB_Host_WaitMS(1)) != HOST_WAITERROR_Successful)
-				{
-					USB_HostState = PostWaitState;
-					ErrorCode     = HOST_ENUMERROR_WaitStage;
-					break;
-				}
-
-				if (!(--WaitMSRemaining))
-				  USB_HostState = PostWaitState;
-			}
-
-			break;
-		case HOST_STATE_Powered:
-			WaitMSRemaining = HOST_DEVICE_SETTLE_DELAY_MS;
-
-			USB_HostState = HOST_STATE_Powered_WaitForDeviceSettle;
-			break;
-		case HOST_STATE_Powered_WaitForDeviceSettle:
-			if (WaitMSRemaining--)
-			{
-				Delay_MS(1);
-				break;
-			}
-			else
-			{
-				USB_Host_VBUS_Manual_Off();
-
-				USB_OTGPAD_On();
-				USB_Host_VBUS_Auto_Enable();
-				USB_Host_VBUS_Auto_On();
-
-				#if defined(NO_AUTO_VBUS_MANAGEMENT)
-				USB_Host_VBUS_Manual_Enable();
-				USB_Host_VBUS_Manual_On();
-				#endif
-
-				USB_HostState = HOST_STATE_Powered_WaitForConnect;
-			}
-
-			break;
-		case HOST_STATE_Powered_WaitForConnect:
-			if (USB_INT_HasOccurred(USB_INT_DCONNI))
-			{
-				USB_INT_Clear(USB_INT_DCONNI);
-				USB_INT_Clear(USB_INT_DDISCI);
-
-				USB_INT_Clear(USB_INT_VBERRI);
-				USB_INT_Enable(USB_INT_VBERRI);
-
-				USB_Host_ResumeBus();
-				Pipe_ClearPipes();
-
-				HOST_TASK_NONBLOCK_WAIT(100, HOST_STATE_Powered_DoReset);
-			}
-
-			break;
-		case HOST_STATE_Powered_DoReset:
-			USB_Host_ResetDevice();
-
-			HOST_TASK_NONBLOCK_WAIT(200, HOST_STATE_Powered_ConfigPipe);
-			break;
-		case HOST_STATE_Powered_ConfigPipe:
-			if (!(Pipe_ConfigurePipe(PIPE_CONTROLPIPE, EP_TYPE_CONTROL, ENDPOINT_CONTROLEP, PIPE_CONTROLPIPE_DEFAULT_SIZE, 1)))
-			{
-				ErrorCode    = HOST_ENUMERROR_PipeConfigError;
-				SubErrorCode = 0;
-				break;
-			}
-
-			USB_HostState = HOST_STATE_Default;
-			break;
-		case HOST_STATE_Default:
-			USB_ControlRequest = (USB_Request_Header_t)
-				{
-					.bmRequestType = (REQDIR_DEVICETOHOST | REQTYPE_STANDARD | REQREC_DEVICE),
-					.bRequest      = REQ_GetDescriptor,
-					.wValue        = (DTYPE_Device << 8),
-					.wIndex        = 0,
-					.wLength       = 8,
-				};
-
-			uint8_t DataBuffer[8];
-
-			Pipe_SelectPipe(PIPE_CONTROLPIPE);
-			if ((SubErrorCode = USB_Host_SendControlRequest(DataBuffer)) != HOST_SENDCONTROL_Successful)
-			{
-				ErrorCode = HOST_ENUMERROR_ControlError;
-				break;
-			}
-
-			USB_Host_ControlPipeSize = DataBuffer[offsetof(USB_Descriptor_Device_t, Endpoint0Size)];
-
-			USB_Host_ResetDevice();
-
-			HOST_TASK_NONBLOCK_WAIT(200, HOST_STATE_Default_PostReset);
-			break;
-		case HOST_STATE_Default_PostReset:
-			if (!(Pipe_ConfigurePipe(PIPE_CONTROLPIPE, EP_TYPE_CONTROL, ENDPOINT_CONTROLEP, USB_Host_ControlPipeSize, 1)))
-			{
-				ErrorCode    = HOST_ENUMERROR_PipeConfigError;
-				SubErrorCode = 0;
-				break;
-			}
-
-			USB_ControlRequest = (USB_Request_Header_t)
-				{
-					.bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_DEVICE),
-					.bRequest      = REQ_SetAddress,
-					.wValue        = USB_HOST_DEVICEADDRESS,
-					.wIndex        = 0,
-					.wLength       = 0,
-				};
-
-			if ((SubErrorCode = USB_Host_SendControlRequest(NULL)) != HOST_SENDCONTROL_Successful)
-			{
-				ErrorCode = HOST_ENUMERROR_ControlError;
-				break;
-			}
-
-			HOST_TASK_NONBLOCK_WAIT(100, HOST_STATE_Default_PostAddressSet);
-			break;
-		case HOST_STATE_Default_PostAddressSet:
-			USB_Host_SetDeviceAddress(USB_HOST_DEVICEADDRESS);
-
-			USB_HostState = HOST_STATE_Addressed;
-
-			EVENT_USB_Host_DeviceEnumerationComplete();
-			break;
-
-		default:
-			break;
-	}
-
-	if ((ErrorCode != HOST_ENUMERROR_NoError) && (USB_HostState != HOST_STATE_Unattached))
-	{
-		EVENT_USB_Host_DeviceEnumerationFailed(ErrorCode, SubErrorCode);
-
-		USB_Host_VBUS_Auto_Off();
-
-		EVENT_USB_Host_DeviceUnattached();
-
-		USB_ResetInterface();
-	}
-}
-
-uint8_t USB_Host_WaitMS(uint8_t MS)
-{
-	bool    BusSuspended = USB_Host_IsBusSuspended();
-	uint8_t ErrorCode    = HOST_WAITERROR_Successful;
-	bool    HSOFIEnabled = USB_INT_IsEnabled(USB_INT_HSOFI);
-
-	USB_INT_Disable(USB_INT_HSOFI);
-	USB_INT_Clear(USB_INT_HSOFI);
-
-	USB_Host_ResumeBus();
-
-	while (MS)
-	{
-		if (USB_INT_HasOccurred(USB_INT_HSOFI))
-		{
-			USB_INT_Clear(USB_INT_HSOFI);
-			MS--;
-		}
-
-		if ((USB_HostState == HOST_STATE_Unattached) || (USB_CurrentMode != USB_MODE_Host))
-		{
-			ErrorCode = HOST_WAITERROR_DeviceDisconnect;
-
-			break;
-		}
-
-		if (Pipe_IsError())
-		{
-			Pipe_ClearError();
-			ErrorCode = HOST_WAITERROR_PipeError;
-
-			break;
-		}
-
-		if (Pipe_IsStalled())
-		{
-			Pipe_ClearStall();
-			ErrorCode = HOST_WAITERROR_SetupStalled;
-
-			break;
-		}
-	}
-
-	if (BusSuspended)
-	  USB_Host_SuspendBus();
-
-	if (HSOFIEnabled)
-	  USB_INT_Enable(USB_INT_HSOFI);
-
-	return ErrorCode;
-}
-
-static void USB_Host_ResetDevice(void)
-{
-	bool BusSuspended = USB_Host_IsBusSuspended();
-
-	USB_INT_Disable(USB_INT_DDISCI);
-
-	USB_Host_ResetBus();
-	while (!(USB_Host_IsBusResetComplete()));
-	USB_Host_ResumeBus();
-
-	USB_Host_ConfigurationNumber = 0;
-
-	bool HSOFIEnabled = USB_INT_IsEnabled(USB_INT_HSOFI);
-
-	USB_INT_Disable(USB_INT_HSOFI);
-	USB_INT_Clear(USB_INT_HSOFI);
-
-	for (uint8_t MSRem = 10; MSRem != 0; MSRem--)
-	{
-		/* Workaround for powerless-pull-up devices. After a USB bus reset,
-		   all disconnection interrupts are suppressed while a USB frame is
-		   looked for - if it is found within 10ms, the device is still
-		   present.                                                        */
-
-		if (USB_INT_HasOccurred(USB_INT_HSOFI))
-		{
-			USB_INT_Clear(USB_INT_HSOFI);
-			USB_INT_Clear(USB_INT_DDISCI);
-			break;
-		}
-
-		Delay_MS(1);
-	}
-
-	if (HSOFIEnabled)
-	  USB_INT_Enable(USB_INT_HSOFI);
-
-	if (BusSuspended)
-	  USB_Host_SuspendBus();
-
-	USB_INT_Enable(USB_INT_DDISCI);
-}
-
-#endif
-
-#endif
diff --git a/NativePrograms/LUFA/Drivers/USB/Core/AVR8/Host_AVR8.h b/NativePrograms/LUFA/Drivers/USB/Core/AVR8/Host_AVR8.h
deleted file mode 100644
index e5fe0dca36..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Core/AVR8/Host_AVR8.h
+++ /dev/null
@@ -1,372 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief USB Host definitions for the AVR8 microcontrollers.
- *  \copydetails Group_Host_AVR8
- *
- *  \note This file should not be included directly. It is automatically included as needed by the USB driver
- *        dispatch header located in LUFA/Drivers/USB/USB.h.
- */
-
-/** \ingroup Group_Host
- *  \defgroup Group_Host_AVR8 Host Management (AVR8)
- *  \brief USB Host definitions for the AVR8 microcontrollers.
- *
- *  Architecture specific USB Host definitions for the Atmel 8-bit AVR microcontrollers.
- *
- *  @{
- */
-
-#ifndef __USBHOST_AVR8_H__
-#define __USBHOST_AVR8_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-		#include "../StdDescriptors.h"
-		#include "../Pipe.h"
-		#include "../USBInterrupt.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_USB_DRIVER)
-			#error Do not include this file directly. Include LUFA/Drivers/USB/USB.h instead.
-		#endif
-
-		#if defined(INVERTED_VBUS_ENABLE_LINE) && !defined(NO_AUTO_VBUS_MANAGEMENT)
-			#error The INVERTED_VBUS_ENABLE_LINE compile option requires NO_AUTO_VBUS_MANAGEMENT for the AVR8 architecture.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Indicates the fixed USB device address which any attached device is enumerated to when in
-			 *  host mode. As only one USB device may be attached to the AVR in host mode at any one time
-			 *  and that the address used is not important (other than the fact that it is non-zero), a
-			 *  fixed value is specified by the library.
-			 */
-			#define USB_HOST_DEVICEADDRESS                 1
-
-			#if !defined(HOST_DEVICE_SETTLE_DELAY_MS) || defined(__DOXYGEN__)
-				/** Constant for the delay in milliseconds after a device is connected before the library
-				 *  will start the enumeration process. Some devices require a delay of up to 5 seconds
-				 *  after connection before the enumeration process can start or incorrect operation will
-				 *  occur.
-				 *
-				 *  The default delay value may be overridden in the user project makefile by defining the
-				 *  \c HOST_DEVICE_SETTLE_DELAY_MS token to the required delay in milliseconds, and passed to the
-				 *  compiler using the -D switch.
-				 */
-				#define HOST_DEVICE_SETTLE_DELAY_MS        1000
-			#endif
-
-			/** Enum for the error codes for the \ref EVENT_USB_Host_HostError() event.
-			 *
-			 *  \see \ref Group_Events for more information on this event.
-			 */
-			enum USB_Host_ErrorCodes_t
-			{
-				HOST_ERROR_VBusVoltageDip       = 0, /**< VBUS voltage dipped to an unacceptable level. This
-				                                      *   error may be the result of an attached device drawing
-				                                      *   too much current from the VBUS line, or due to the
-				                                      *   AVR's power source being unable to supply sufficient
-				                                      *   current.
-				                                      */
-			};
-
-			/** Enum for the error codes for the \ref EVENT_USB_Host_DeviceEnumerationFailed() event.
-			 *
-			 *  \see \ref Group_Events for more information on this event.
-			 */
-			enum USB_Host_EnumerationErrorCodes_t
-			{
-				HOST_ENUMERROR_NoError          = 0, /**< No error occurred. Used internally, this is not a valid
-				                                      *   ErrorCode parameter value for the \ref EVENT_USB_Host_DeviceEnumerationFailed()
-				                                      *   event.
-				                                      */
-				HOST_ENUMERROR_WaitStage        = 1, /**< One of the delays between enumeration steps failed
-				                                      *   to complete successfully, due to a timeout or other
-				                                      *   error.
-				                                      */
-				HOST_ENUMERROR_NoDeviceDetected = 2, /**< No device was detected, despite the USB data lines
-				                                      *   indicating the attachment of a device.
-				                                      */
-				HOST_ENUMERROR_ControlError     = 3, /**< One of the enumeration control requests failed to
-				                                      *   complete successfully.
-				                                      */
-				HOST_ENUMERROR_PipeConfigError  = 4, /**< The default control pipe (address 0) failed to
-				                                      *   configure correctly.
-				                                      */
-			};
-
-		/* Inline Functions: */
-			/** Returns the current USB frame number, when in host mode. Every millisecond the USB bus is active (i.e. not suspended)
-			 *  the frame number is incremented by one.
-			 *
-			 *  \return Current USB frame number from the USB controller.
-			 */
-			static inline uint16_t USB_Host_GetFrameNumber(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline uint16_t USB_Host_GetFrameNumber(void)
-			{
-				return UHFNUM;
-			}
-
-			#if !defined(NO_SOF_EVENTS)
-				/** Enables the host mode Start Of Frame events. When enabled, this causes the
-				 *  \ref EVENT_USB_Host_StartOfFrame() event to fire once per millisecond, synchronized to the USB bus,
-				 *  at the start of each USB frame when a device is enumerated while in host mode.
-				 *
-				 *  \note This function is not available when the \c NO_SOF_EVENTS compile time token is defined.
-				 */
-				static inline void USB_Host_EnableSOFEvents(void) ATTR_ALWAYS_INLINE;
-				static inline void USB_Host_EnableSOFEvents(void)
-				{
-					USB_INT_Enable(USB_INT_HSOFI);
-				}
-
-				/** Disables the host mode Start Of Frame events. When disabled, this stops the firing of the
-				 *  \ref EVENT_USB_Host_StartOfFrame() event when enumerated in host mode.
-				 *
-				 *  \note This function is not available when the \c NO_SOF_EVENTS compile time token is defined.
-				 */
-				static inline void USB_Host_DisableSOFEvents(void) ATTR_ALWAYS_INLINE;
-				static inline void USB_Host_DisableSOFEvents(void)
-				{
-					USB_INT_Disable(USB_INT_HSOFI);
-				}
-			#endif
-
-			/** Resets the USB bus, including the endpoints in any attached device and pipes on the AVR host.
-			 *  USB bus resets leave the default control pipe configured (if already configured).
-			 *
-			 *  If the USB bus has been suspended prior to issuing a bus reset, the attached device will be
-			 *  woken up automatically and the bus resumed after the reset has been correctly issued.
-			 */
-			static inline void USB_Host_ResetBus(void) ATTR_ALWAYS_INLINE;
-			static inline void USB_Host_ResetBus(void)
-			{
-				UHCON |=  (1 << RESET);
-			}
-
-			/** Determines if a previously issued bus reset (via the \ref USB_Host_ResetBus() macro) has
-			 *  completed.
-			 *
-			 *  \return Boolean \c true if no bus reset is currently being sent, \c false otherwise.
-			 */
-			static inline bool USB_Host_IsBusResetComplete(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline bool USB_Host_IsBusResetComplete(void)
-			{
-				return ((UHCON & (1 << RESET)) ? false : true);
-			}
-
-			/** Resumes USB communications with an attached and enumerated device, by resuming the transmission
-			 *  of the 1MS Start Of Frame messages to the device. When resumed, USB communications between the
-			 *  host and attached device may occur.
-			 */
-			static inline void USB_Host_ResumeBus(void) ATTR_ALWAYS_INLINE;
-			static inline void USB_Host_ResumeBus(void)
-			{
-				UHCON |=  (1 << SOFEN);
-			}
-
-			/** Suspends the USB bus, preventing any communications from occurring between the host and attached
-			 *  device until the bus has been resumed. This stops the transmission of the 1MS Start Of Frame
-			 *  messages to the device.
-			 *
-			 *  \attention While the USB bus is suspended, all USB interrupt sources are also disabled; this means that
-			 *             some events (such as device disconnections) will not fire until the bus is resumed.
-			 */
-			static inline void USB_Host_SuspendBus(void) ATTR_ALWAYS_INLINE;
-			static inline void USB_Host_SuspendBus(void)
-			{
-				UHCON &= ~(1 << SOFEN);
-			}
-
-			/** Determines if the USB bus has been suspended via the use of the \ref USB_Host_SuspendBus() macro,
-			 *  false otherwise. While suspended, no USB communications can occur until the bus is resumed,
-			 *  except for the Remote Wakeup event from the device if supported.
-			 *
-			 *  \return Boolean \c true if the bus is currently suspended, \c false otherwise.
-			 */
-			static inline bool USB_Host_IsBusSuspended(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline bool USB_Host_IsBusSuspended(void)
-			{
-				return ((UHCON & (1 << SOFEN)) ? false : true);
-			}
-
-			/** Determines if the attached device is currently enumerated in Full Speed mode (12Mb/s), or
-			 *  false if the attached device is enumerated in Low Speed mode (1.5Mb/s).
-			 *
-			 *  \return Boolean \c true if the attached device is enumerated in Full Speed mode, \c false otherwise.
-			 */
-			static inline bool USB_Host_IsDeviceFullSpeed(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline bool USB_Host_IsDeviceFullSpeed(void)
-			{
-				return ((USBSTA & (1 << SPEED)) ? true : false);
-			}
-
-			/** Determines if the attached device is currently issuing a Remote Wakeup request, requesting
-			 *  that the host resume the USB bus and wake up the device, \c false otherwise.
-			 *
-			 *  \return Boolean \c true if the attached device has sent a Remote Wakeup request, \c false otherwise.
-			 */
-			static inline bool USB_Host_IsRemoteWakeupSent(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline bool USB_Host_IsRemoteWakeupSent(void)
-			{
-				return ((UHINT & (1 << RXRSMI)) ? true : false);
-			}
-
-			/** Clears the flag indicating that a Remote Wakeup request has been issued by an attached device. */
-			static inline void USB_Host_ClearRemoteWakeupSent(void) ATTR_ALWAYS_INLINE;
-			static inline void USB_Host_ClearRemoteWakeupSent(void)
-			{
-				UHINT &= ~(1 << RXRSMI);
-			}
-
-			/** Accepts a Remote Wakeup request from an attached device. This must be issued in response to
-			 *  a device's Remote Wakeup request within 2ms for the request to be accepted and the bus to
-			 *  be resumed.
-			 */
-			static inline void USB_Host_ResumeFromWakeupRequest(void) ATTR_ALWAYS_INLINE;
-			static inline void USB_Host_ResumeFromWakeupRequest(void)
-			{
-				UHCON |=  (1 << RESUME);
-			}
-
-			/** Determines if a resume from Remote Wakeup request is currently being sent to an attached
-			 *  device.
-			 *
-			 *  \return Boolean \c true if no resume request is currently being sent, \c false otherwise.
-			 */
-			static inline bool USB_Host_IsResumeFromWakeupRequestSent(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline bool USB_Host_IsResumeFromWakeupRequestSent(void)
-			{
-				return ((UHCON & (1 << RESUME)) ? false : true);
-			}
-
-	/* Private Interface - For use in library only: */
-	#if !defined(__DOXYGEN__)
-		/* Macros: */
-			static inline void USB_Host_HostMode_On(void) ATTR_ALWAYS_INLINE;
-			static inline void USB_Host_HostMode_On(void)
-			{
-				USBCON |=  (1 << HOST);
-			}
-
-			static inline void USB_Host_HostMode_Off(void) ATTR_ALWAYS_INLINE;
-			static inline void USB_Host_HostMode_Off(void)
-			{
-				USBCON &= ~(1 << HOST);
-			}
-
-			static inline void USB_Host_VBUS_Auto_Enable(void) ATTR_ALWAYS_INLINE;
-			static inline void USB_Host_VBUS_Auto_Enable(void)
-			{
-				OTGCON &= ~(1 << VBUSHWC);
-				UHWCON |=  (1 << UVCONE);
-			}
-
-			static inline void USB_Host_VBUS_Manual_Enable(void) ATTR_ALWAYS_INLINE;
-			static inline void USB_Host_VBUS_Manual_Enable(void)
-			{
-				OTGCON |=  (1 << VBUSHWC);
-				UHWCON &= ~(1 << UVCONE);
-
-				DDRE   |=  (1 << 7);
-			}
-
-			static inline void USB_Host_VBUS_Auto_On(void) ATTR_ALWAYS_INLINE;
-			static inline void USB_Host_VBUS_Auto_On(void)
-			{
-				OTGCON |=  (1 << VBUSREQ);
-			}
-
-			static inline void USB_Host_VBUS_Manual_On(void) ATTR_ALWAYS_INLINE;
-			static inline void USB_Host_VBUS_Manual_On(void)
-			{
-				#if defined(INVERTED_VBUS_ENABLE_LINE)
-				PORTE  &= ~(1 << 7);
-				#else
-				PORTE  |=  (1 << 7);
-				#endif
-			}
-
-			static inline void USB_Host_VBUS_Auto_Off(void) ATTR_ALWAYS_INLINE;
-			static inline void USB_Host_VBUS_Auto_Off(void)
-			{
-				OTGCON |=  (1 << VBUSRQC);
-			}
-
-			static inline void USB_Host_VBUS_Manual_Off(void) ATTR_ALWAYS_INLINE;
-			static inline void USB_Host_VBUS_Manual_Off(void)
-			{
-				#if defined(INVERTED_VBUS_ENABLE_LINE)
-				PORTE  |=  (1 << 7);
-				#else
-				PORTE  &= ~(1 << 7);
-				#endif
-			}
-
-			static inline void USB_Host_SetDeviceAddress(const uint8_t Address) ATTR_ALWAYS_INLINE;
-			static inline void USB_Host_SetDeviceAddress(const uint8_t Address)
-			{
-				UHADDR  =  (Address & 0x7F);
-			}
-
-		/* Enums: */
-			enum USB_Host_WaitMSErrorCodes_t
-			{
-				HOST_WAITERROR_Successful       = 0,
-				HOST_WAITERROR_DeviceDisconnect = 1,
-				HOST_WAITERROR_PipeError        = 2,
-				HOST_WAITERROR_SetupStalled     = 3,
-			};
-
-		/* Function Prototypes: */
-			void    USB_Host_ProcessNextHostState(void);
-			uint8_t USB_Host_WaitMS(uint8_t MS);
-
-			#if defined(__INCLUDE_FROM_HOST_C)
-				static void USB_Host_ResetDevice(void);
-			#endif
-	#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Core/AVR8/OTG_AVR8.h b/NativePrograms/LUFA/Drivers/USB/Core/AVR8/OTG_AVR8.h
deleted file mode 100644
index ce6a53922b..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Core/AVR8/OTG_AVR8.h
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief USB OTG definitions for the AVR8 microcontrollers.
- *  \copydetails Group_OTG_AVR8
- *
- *  \note This file should not be included directly. It is automatically included as needed by the USB driver
- *        dispatch header located in LUFA/Drivers/USB/USB.h.
- */
-
-/** \ingroup Group_OTG
- *  \defgroup Group_OTG_AVR8 USB On The Go (OTG) Management (AVR8)
- *  \brief USB OTG definitions for the AVR8 microcontrollers.
- *
- *  Architecture specific USB OTG definitions for the Atmel 8-bit AVR microcontrollers.
- *
- *  @{
- */
-
-#ifndef __USBOTG_AVR8_H__
-#define __USBOTG_AVR8_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_USB_DRIVER)
-			#error Do not include this file directly. Include LUFA/Drivers/USB/USB.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Mask for the VBUS pulsing method of SRP, supported by some OTG devices.
-			 *
-			 *  \see \ref USB_OTG_Device_InitiateSRP().
-			 */
-			#define USB_OTG_SRP_VBUS                   (1 << SRPSEL)
-
-			/** Mask for the Data + pulsing method of SRP, supported by some OTG devices.
-			 *
-			 *  \see \ref USB_OTG_Device_InitiateSRP().
-			 */
-			#define USB_OTG_STP_DATA                   0
-
-		/* Inline Functions: */
-			/** Initiate a Host Negotiation Protocol request. This indicates to the other connected device
-			 *  that the device wishes to change device/host roles.
-			 */
-			static inline void USB_OTG_Device_RequestHNP(void) ATTR_ALWAYS_INLINE;
-			static inline void USB_OTG_Device_RequestHNP(void)
-			{
-				OTGCON |=  (1 << HNPREQ);
-			}
-
-			/** Cancel a Host Negotiation Protocol request. This stops a pending HNP request to the other
-			 *  connected device.
-			 */
-			static inline void USB_OTG_Device_CancelHNPRequest(void) ATTR_ALWAYS_INLINE;
-			static inline void USB_OTG_Device_CancelHNPRequest(void)
-			{
-				OTGCON &= ~(1 << HNPREQ);
-			}
-
-			/** Determines if the device is currently sending a HNP to an attached host.
-			 *
-			 *  \return Boolean \c true if currently sending a HNP to the other connected device, \c false otherwise
-			 */
-			static inline bool USB_OTG_Device_IsSendingHNP(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline bool USB_OTG_Device_IsSendingHNP(void)
-			{
-				return ((OTGCON & (1 << HNPREQ)) ? true : false);
-			}
-
-			/** Initiates a Session Request Protocol request. Most OTG devices turn off VBUS when the USB
-			 *  interface is not in use, to conserve power. Sending a SRP to a USB OTG device running in
-			 *  host mode indicates that VBUS should be applied and a session started.
-			 *
-			 *  There are two different methods of sending a SRP - either pulses on the VBUS line, or by
-			 *  pulsing the Data + line via the internal pull-up resistor.
-			 *
-			 *  \param[in] SRPTypeMask  Mask indicating the type of SRP to use, either \ref USB_OTG_SRP_VBUS or
-			 *                          \ref USB_OTG_STP_DATA.
-			 */
-			static inline void USB_OTG_Device_InitiateSRP(const uint8_t SRPTypeMask) ATTR_ALWAYS_INLINE;
-			static inline void USB_OTG_Device_InitiateSRP(const uint8_t SRPTypeMask)
-			{
-				OTGCON = ((OTGCON & ~(1 << SRPSEL)) | (SRPTypeMask | (1 << SRPREQ)));
-			}
-
-			/** Accepts a HNP from a connected device, indicating that both devices should exchange
-			 *  device/host roles.
-			 */
-			static inline void USB_OTG_Host_AcceptHNP(void) ATTR_ALWAYS_INLINE;
-			static inline void USB_OTG_Host_AcceptHNP(void)
-			{
-				OTGCON |=  (1 << HNPREQ);
-			}
-
-			/** Rejects a HNP from a connected device, indicating that both devices should remain in their
-			 *  current device/host roles.
-			 */
-			static inline void USB_OTG_Host_RejectHNP(void) ATTR_ALWAYS_INLINE;
-			static inline void USB_OTG_Host_RejectHNP(void)
-			{
-				OTGCON &= ~(1 << HNPREQ);
-			}
-
-			/** Indicates if the connected device is currently sending a HNP request.
-			 *
-			 *  \return Boolean \c true if a HNP is currently being issued by the connected device, \c false otherwise.
-			 */
-			static inline bool USB_OTG_Host_IsHNPReceived(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline bool USB_OTG_Host_IsHNPReceived(void)
-			{
-				return ((OTGCON & (1 << HNPREQ)) ? true : false);
-			}
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Core/AVR8/PipeStream_AVR8.c b/NativePrograms/LUFA/Drivers/USB/Core/AVR8/PipeStream_AVR8.c
deleted file mode 100644
index 7ee37dc652..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Core/AVR8/PipeStream_AVR8.c
+++ /dev/null
@@ -1,221 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-#include "../../../../Common/Common.h"
-#if (ARCH == ARCH_AVR8)
-
-#define  __INCLUDE_FROM_USB_DRIVER
-#include "../USBMode.h"
-
-#if defined(USB_CAN_BE_HOST)
-
-#include "PipeStream_AVR8.h"
-
-uint8_t Pipe_Discard_Stream(uint16_t Length,
-                            uint16_t* const BytesProcessed)
-{
-	uint8_t  ErrorCode;
-	uint16_t BytesInTransfer = 0;
-
-	Pipe_SetPipeToken(PIPE_TOKEN_IN);
-
-	if ((ErrorCode = Pipe_WaitUntilReady()))
-	  return ErrorCode;
-
-	if (BytesProcessed != NULL)
-	  Length -= *BytesProcessed;
-
-	while (Length)
-	{
-		if (!(Pipe_IsReadWriteAllowed()))
-		{
-			Pipe_ClearIN();
-
-			if (BytesProcessed != NULL)
-			{
-				*BytesProcessed += BytesInTransfer;
-				return PIPE_RWSTREAM_IncompleteTransfer;
-			}
-
-			if ((ErrorCode = Pipe_WaitUntilReady()))
-			  return ErrorCode;
-		}
-		else
-		{
-			Pipe_Discard_8();
-
-			Length--;
-			BytesInTransfer++;
-		}
-	}
-
-	return PIPE_RWSTREAM_NoError;
-}
-
-uint8_t Pipe_Null_Stream(uint16_t Length,
-                         uint16_t* const BytesProcessed)
-{
-	uint8_t  ErrorCode;
-	uint16_t BytesInTransfer = 0;
-
-	Pipe_SetPipeToken(PIPE_TOKEN_OUT);
-
-	if ((ErrorCode = Pipe_WaitUntilReady()))
-	  return ErrorCode;
-
-	if (BytesProcessed != NULL)
-	  Length -= *BytesProcessed;
-
-	while (Length)
-	{
-		if (!(Pipe_IsReadWriteAllowed()))
-		{
-			Pipe_ClearOUT();
-
-			if (BytesProcessed != NULL)
-			{
-				*BytesProcessed += BytesInTransfer;
-				return PIPE_RWSTREAM_IncompleteTransfer;
-			}
-
-			USB_USBTask();
-
-			if ((ErrorCode = Pipe_WaitUntilReady()))
-			  return ErrorCode;
-		}
-		else
-		{
-			Pipe_Write_8(0);
-
-			Length--;
-			BytesInTransfer++;
-		}
-	}
-
-	return PIPE_RWSTREAM_NoError;
-}
-
-/* The following abuses the C preprocessor in order to copy-paste common code with slight alterations,
- * so that the code needs to be written once. It is a crude form of templating to reduce code maintenance. */
-
-#define  TEMPLATE_FUNC_NAME                        Pipe_Write_Stream_LE
-#define  TEMPLATE_BUFFER_TYPE                      const void*
-#define  TEMPLATE_TOKEN                            PIPE_TOKEN_OUT
-#define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearOUT()
-#define  TEMPLATE_BUFFER_OFFSET(Length)            0
-#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   DataStream += Amount
-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Pipe_Write_8(*BufferPtr)
-#include "Template/Template_Pipe_RW.c"
-
-#define  TEMPLATE_FUNC_NAME                        Pipe_Write_Stream_BE
-#define  TEMPLATE_BUFFER_TYPE                      const void*
-#define  TEMPLATE_TOKEN                            PIPE_TOKEN_OUT
-#define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearOUT()
-#define  TEMPLATE_BUFFER_OFFSET(Length)            (Length - 1)
-#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   DataStream -= Amount
-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Pipe_Write_8(*BufferPtr)
-#include "Template/Template_Pipe_RW.c"
-
-#define  TEMPLATE_FUNC_NAME                        Pipe_Read_Stream_LE
-#define  TEMPLATE_BUFFER_TYPE                      void*
-#define  TEMPLATE_TOKEN                            PIPE_TOKEN_IN
-#define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearIN()
-#define  TEMPLATE_BUFFER_OFFSET(Length)            0
-#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   DataStream += Amount
-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *BufferPtr = Pipe_Read_8()
-#include "Template/Template_Pipe_RW.c"
-
-#define  TEMPLATE_FUNC_NAME                        Pipe_Read_Stream_BE
-#define  TEMPLATE_BUFFER_TYPE                      void*
-#define  TEMPLATE_TOKEN                            PIPE_TOKEN_IN
-#define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearIN()
-#define  TEMPLATE_BUFFER_OFFSET(Length)            (Length - 1)
-#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   DataStream -= Amount
-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *BufferPtr = Pipe_Read_8()
-#include "Template/Template_Pipe_RW.c"
-
-#define  TEMPLATE_FUNC_NAME                        Pipe_Write_PStream_LE
-#define  TEMPLATE_BUFFER_TYPE                      const void*
-#define  TEMPLATE_TOKEN                            PIPE_TOKEN_OUT
-#define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearOUT()
-#define  TEMPLATE_BUFFER_OFFSET(Length)            0
-#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   DataStream += Amount
-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Pipe_Write_8(pgm_read_byte(BufferPtr))
-#include "Template/Template_Pipe_RW.c"
-
-#define  TEMPLATE_FUNC_NAME                        Pipe_Write_PStream_BE
-#define  TEMPLATE_BUFFER_TYPE                      const void*
-#define  TEMPLATE_TOKEN                            PIPE_TOKEN_OUT
-#define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearOUT()
-#define  TEMPLATE_BUFFER_OFFSET(Length)            (Length - 1)
-#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   DataStream -= Amount
-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Pipe_Write_8(pgm_read_byte(BufferPtr))
-#include "Template/Template_Pipe_RW.c"
-
-#define  TEMPLATE_FUNC_NAME                        Pipe_Write_EStream_LE
-#define  TEMPLATE_BUFFER_TYPE                      const void*
-#define  TEMPLATE_TOKEN                            PIPE_TOKEN_OUT
-#define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearOUT()
-#define  TEMPLATE_BUFFER_OFFSET(Length)            0
-#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   DataStream += Amount
-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Pipe_Write_8(eeprom_read_byte(BufferPtr))
-#include "Template/Template_Pipe_RW.c"
-
-#define  TEMPLATE_FUNC_NAME                        Pipe_Write_EStream_BE
-#define  TEMPLATE_BUFFER_TYPE                      const void*
-#define  TEMPLATE_TOKEN                            PIPE_TOKEN_OUT
-#define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearOUT()
-#define  TEMPLATE_BUFFER_OFFSET(Length)            (Length - 1)
-#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   DataStream -= Amount
-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Pipe_Write_8(eeprom_read_byte(BufferPtr))
-#include "Template/Template_Pipe_RW.c"
-
-#define  TEMPLATE_FUNC_NAME                        Pipe_Read_EStream_LE
-#define  TEMPLATE_BUFFER_TYPE                      void*
-#define  TEMPLATE_TOKEN                            PIPE_TOKEN_IN
-#define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearIN()
-#define  TEMPLATE_BUFFER_OFFSET(Length)            0
-#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   DataStream += Amount
-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         eeprom_update_byte(BufferPtr, Pipe_Read_8())
-#include "Template/Template_Pipe_RW.c"
-
-#define  TEMPLATE_FUNC_NAME                        Pipe_Read_EStream_BE
-#define  TEMPLATE_BUFFER_TYPE                      void*
-#define  TEMPLATE_TOKEN                            PIPE_TOKEN_IN
-#define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearIN()
-#define  TEMPLATE_BUFFER_OFFSET(Length)            (Length - 1)
-#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   DataStream -= Amount
-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         eeprom_update_byte(BufferPtr, Pipe_Read_8())
-#include "Template/Template_Pipe_RW.c"
-
-#endif
-
-#endif
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Core/AVR8/PipeStream_AVR8.h b/NativePrograms/LUFA/Drivers/USB/Core/AVR8/PipeStream_AVR8.h
deleted file mode 100644
index c4af26b4d5..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Core/AVR8/PipeStream_AVR8.h
+++ /dev/null
@@ -1,442 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Pipe data stream transmission and reception management for the AVR8 microcontrollers
- *  \copydetails Group_PipeStreamRW_AVR8
- *
- *  \note This file should not be included directly. It is automatically included as needed by the USB driver
- *        dispatch header located in LUFA/Drivers/USB/USB.h.
- */
-
-/** \ingroup Group_PipeStreamRW
- *  \defgroup Group_PipeStreamRW_AVR8 Read/Write of Multi-Byte Streams (AVR8)
- *  \brief Pipe data stream transmission and reception management for the Atmel AVR8 architecture.
- *
- *  Functions, macros, variables, enums and types related to data reading and writing of data streams from
- *  and to pipes.
- *
- *  @{
- */
-
-#ifndef __PIPE_STREAM_AVR8_H__
-#define __PIPE_STREAM_AVR8_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-		#include "../USBMode.h"
-		#include "../USBTask.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_USB_DRIVER)
-			#error Do not include this file directly. Include LUFA/Drivers/USB/USB.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Function Prototypes: */
-			/** \name Stream functions for null data */
-			/**@{*/
-
-			/** Reads and discards the given number of bytes from the pipe, discarding fully read packets from the host
-			 *  as needed. The last packet is not automatically discarded once the remaining bytes has been read; the
-			 *  user is responsible for manually discarding the last packet from the device via the \ref Pipe_ClearIN() macro.
-			 *
-			 *  If the BytesProcessed parameter is \c NULL, the entire stream transfer is attempted at once, failing or
-			 *  succeeding as a single unit. If the BytesProcessed parameter points to a valid storage location, the transfer
-			 *  will instead be performed as a series of chunks. Each time the pipe bank becomes empty while there is still data
-			 *  to process (and after the current packet has been acknowledged) the BytesProcessed location will be updated with
-			 *  the total number of bytes processed in the stream, and the function will exit with an error code of
-			 *  \ref PIPE_RWSTREAM_IncompleteTransfer. This allows for any abort checking to be performed in the user code - to
-			 *  continue the transfer, call the function again with identical parameters and it will resume until the BytesProcessed
-			 *  value reaches the total transfer length.
-			 *
-			 *  <b>Single Stream Transfer Example:</b>
-			 *  \code
-			 *  uint8_t ErrorCode;
-			 *
-			 *  if ((ErrorCode = Pipe_Discard_Stream(512, NULL)) != PIPE_RWSTREAM_NoError)
-			 *  {
-			 *       // Stream failed to complete - check ErrorCode here
-			 *  }
-			 *  \endcode
-			 *
-			 *  <b>Partial Stream Transfers Example:</b>
-			 *  \code
-			 *  uint8_t  ErrorCode;
-			 *  uint16_t BytesProcessed;
-			 *
-			 *  BytesProcessed = 0;
-			 *  while ((ErrorCode = Pipe_Discard_Stream(512, &BytesProcessed)) == PIPE_RWSTREAM_IncompleteTransfer)
-			 *  {
-			 *      // Stream not yet complete - do other actions here, abort if required
-			 *  }
-			 *
-			 *  if (ErrorCode != PIPE_RWSTREAM_NoError)
-			 *  {
-			 *      // Stream failed to complete - check ErrorCode here
-			 *  }
-			 *  \endcode
-			 *
-			 *  \note The pipe token is set automatically, thus this can be used on bi-directional pipes directly without
-			 *        having to explicitly change the data direction with a call to \ref Pipe_SetPipeToken().
-			 *
-			 *  \param[in] Length          Number of bytes to discard via the currently selected pipe.
-			 *  \param[in] BytesProcessed  Pointer to a location where the total number of bytes already processed should
-			 *                             updated, \c NULL if the entire stream should be processed at once.
-			 *
-			 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Pipe_Discard_Stream(uint16_t Length,
-			                            uint16_t* const BytesProcessed);
-
-			/** Writes a given number of zeroed bytes to the pipe, sending full pipe packets from the host to the device
-			 *  as needed. The last packet is not automatically sent once the remaining bytes has been written; the
-			 *  user is responsible for manually discarding the last packet from the device via the \ref Pipe_ClearOUT() macro.
-			 *
-			 *  If the BytesProcessed parameter is \c NULL, the entire stream transfer is attempted at once, failing or
-			 *  succeeding as a single unit. If the BytesProcessed parameter points to a valid storage location, the transfer
-			 *  will instead be performed as a series of chunks. Each time the pipe bank becomes full while there is still data
-			 *  to process (and after the current packet transmission has been initiated) the BytesProcessed location will be
-			 *  updated with the total number of bytes processed in the stream, and the function will exit with an error code of
-			 *  \ref PIPE_RWSTREAM_IncompleteTransfer. This allows for any abort checking to be performed in the user code - to
-			 *  continue the transfer, call the function again with identical parameters and it will resume until the BytesProcessed
-			 *  value reaches the total transfer length.
-			 *
-			 *  <b>Single Stream Transfer Example:</b>
-			 *  \code
-			 *  uint8_t ErrorCode;
-			 *
-			 *  if ((ErrorCode = Pipe_Null_Stream(512, NULL)) != PIPE_RWSTREAM_NoError)
-			 *  {
-			 *       // Stream failed to complete - check ErrorCode here
-			 *  }
-			 *  \endcode
-			 *
-			 *  <b>Partial Stream Transfers Example:</b>
-			 *  \code
-			 *  uint8_t  ErrorCode;
-			 *  uint16_t BytesProcessed;
-			 *
-			 *  BytesProcessed = 0;
-			 *  while ((ErrorCode = Pipe_Null_Stream(512, &BytesProcessed)) == PIPE_RWSTREAM_IncompleteTransfer)
-			 *  {
-			 *      // Stream not yet complete - do other actions here, abort if required
-			 *  }
-			 *
-			 *  if (ErrorCode != PIPE_RWSTREAM_NoError)
-			 *  {
-			 *      // Stream failed to complete - check ErrorCode here
-			 *  }
-			 *  \endcode
-			 *
-			 *  \note The pipe token is set automatically, thus this can be used on bi-directional pipes directly without
-			 *        having to explicitly change the data direction with a call to \ref Pipe_SetPipeToken().
-			 *
-			 *  \param[in] Length          Number of zero bytes to write via the currently selected pipe.
-			 *  \param[in] BytesProcessed  Pointer to a location where the total number of bytes already processed should
-			 *                             updated, \c NULL if the entire stream should be processed at once.
-			 *
-			 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Pipe_Null_Stream(uint16_t Length,
-			                         uint16_t* const BytesProcessed);
-
-			/**@}*/
-
-			/** \name Stream functions for RAM source/destination data */
-			/**@{*/
-
-			/** Writes the given number of bytes to the pipe from the given buffer in little endian,
-			 *  sending full packets to the device as needed. The last packet filled is not automatically sent;
-			 *  the user is responsible for manually sending the last written packet to the host via the
-			 *  \ref Pipe_ClearOUT() macro. Between each USB packet, the given stream callback function is
-			 *  executed repeatedly until the next packet is ready, allowing for early aborts of stream transfers.
-			 *
-			 *  If the BytesProcessed parameter is \c NULL, the entire stream transfer is attempted at once,
-			 *  failing or succeeding as a single unit. If the BytesProcessed parameter points to a valid
-			 *  storage location, the transfer will instead be performed as a series of chunks. Each time
-			 *  the pipe bank becomes full while there is still data to process (and after the current
-			 *  packet transmission has been initiated) the BytesProcessed location will be updated with the
-			 *  total number of bytes processed in the stream, and the function will exit with an error code of
-			 *  \ref PIPE_RWSTREAM_IncompleteTransfer. This allows for any abort checking to be performed
-			 *  in the user code - to continue the transfer, call the function again with identical parameters
-			 *  and it will resume until the BytesProcessed value reaches the total transfer length.
-			 *
-			 *  <b>Single Stream Transfer Example:</b>
-			 *  \code
-			 *  uint8_t DataStream[512];
-			 *  uint8_t ErrorCode;
-			 *
-			 *  if ((ErrorCode = Pipe_Write_Stream_LE(DataStream, sizeof(DataStream),
-			 *                                        NULL)) != PIPE_RWSTREAM_NoError)
-			 *  {
-			 *       // Stream failed to complete - check ErrorCode here
-			 *  }
-			 *  \endcode
-			 *
-			 *  <b>Partial Stream Transfers Example:</b>
-			 *  \code
-			 *  uint8_t  DataStream[512];
-			 *  uint8_t  ErrorCode;
-			 *  uint16_t BytesProcessed;
-			 *
-			 *  BytesProcessed = 0;
-			 *  while ((ErrorCode = Pipe_Write_Stream_LE(DataStream, sizeof(DataStream),
-			 *                                           &BytesProcessed)) == PIPE_RWSTREAM_IncompleteTransfer)
-			 *  {
-			 *      // Stream not yet complete - do other actions here, abort if required
-			 *  }
-			 *
-			 *  if (ErrorCode != PIPE_RWSTREAM_NoError)
-			 *  {
-			 *      // Stream failed to complete - check ErrorCode here
-			 *  }
-			 *  \endcode
-			 *
-			 *  \note The pipe token is set automatically, thus this can be used on bi-directional pipes directly without
-			 *        having to explicitly change the data direction with a call to \ref Pipe_SetPipeToken().
-			 *
-			 *  \param[in] Buffer          Pointer to the source data buffer to read from.
-			 *  \param[in] Length          Number of bytes to read for the currently selected pipe into the buffer.
-			 *  \param[in] BytesProcessed  Pointer to a location where the total number of bytes already processed should
-			 *                             updated, \c NULL if the entire stream should be written at once.
-			 *
-			 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Pipe_Write_Stream_LE(const void* const Buffer,
-			                             uint16_t Length,
-			                             uint16_t* const BytesProcessed) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Writes the given number of bytes to the pipe from the given buffer in big endian,
-			 *  sending full packets to the device as needed. The last packet filled is not automatically sent;
-			 *  the user is responsible for manually sending the last written packet to the host via the
-			 *  \ref Pipe_ClearOUT() macro. Between each USB packet, the given stream callback function is
-			 *  executed repeatedly until the next packet is ready, allowing for early aborts of stream transfers.
-			 *
-			 *  \note The pipe token is set automatically, thus this can be used on bi-directional pipes directly without
-			 *        having to explicitly change the data direction with a call to \ref Pipe_SetPipeToken().
-			 *
-			 *  \param[in] Buffer          Pointer to the source data buffer to read from.
-			 *  \param[in] Length          Number of bytes to read for the currently selected pipe into the buffer.
-			 *  \param[in] BytesProcessed  Pointer to a location where the total number of bytes already processed should
-			 *                             updated, \c NULL if the entire stream should be written at once.
-			 *
-			 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Pipe_Write_Stream_BE(const void* const Buffer,
-			                             uint16_t Length,
-			                             uint16_t* const BytesProcessed) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Reads the given number of bytes from the pipe into the given buffer in little endian,
-			 *  sending full packets to the device as needed. The last packet filled is not automatically sent;
-			 *  the user is responsible for manually sending the last written packet to the host via the
-			 *  \ref Pipe_ClearIN() macro. Between each USB packet, the given stream callback function is
-			 *  executed repeatedly until the next packet is ready, allowing for early aborts of stream transfers.
-			 *
-			 *  If the BytesProcessed parameter is \c NULL, the entire stream transfer is attempted at once,
-			 *  failing or succeeding as a single unit. If the BytesProcessed parameter points to a valid
-			 *  storage location, the transfer will instead be performed as a series of chunks. Each time
-			 *  the pipe bank becomes empty while there is still data to process (and after the current
-			 *  packet has been acknowledged) the BytesProcessed location will be updated with the total number
-			 *  of bytes processed in the stream, and the function will exit with an error code of
-			 *  \ref PIPE_RWSTREAM_IncompleteTransfer. This allows for any abort checking to be performed
-			 *  in the user code - to continue the transfer, call the function again with identical parameters
-			 *  and it will resume until the BytesProcessed value reaches the total transfer length.
-			 *
-			 *  <b>Single Stream Transfer Example:</b>
-			 *  \code
-			 *  uint8_t DataStream[512];
-			 *  uint8_t ErrorCode;
-			 *
-			 *  if ((ErrorCode = Pipe_Read_Stream_LE(DataStream, sizeof(DataStream),
-			 *                                       NULL)) != PIPE_RWSTREAM_NoError)
-			 *  {
-			 *       // Stream failed to complete - check ErrorCode here
-			 *  }
-			 *  \endcode
-			 *
-			 *  <b>Partial Stream Transfers Example:</b>
-			 *  \code
-			 *  uint8_t  DataStream[512];
-			 *  uint8_t  ErrorCode;
-			 *  uint16_t BytesProcessed;
-			 *
-			 *  BytesProcessed = 0;
-			 *  while ((ErrorCode = Pipe_Read_Stream_LE(DataStream, sizeof(DataStream),
-			 *                                          &BytesProcessed)) == PIPE_RWSTREAM_IncompleteTransfer)
-			 *  {
-			 *      // Stream not yet complete - do other actions here, abort if required
-			 *  }
-			 *
-			 *  if (ErrorCode != PIPE_RWSTREAM_NoError)
-			 *  {
-			 *      // Stream failed to complete - check ErrorCode here
-			 *  }
-			 *  \endcode
-			 *
-			 *  \note The pipe token is set automatically, thus this can be used on bi-directional pipes directly without
-			 *        having to explicitly change the data direction with a call to \ref Pipe_SetPipeToken().
-			 *
-			 *  \param[out] Buffer          Pointer to the source data buffer to write to.
-			 *  \param[in]  Length          Number of bytes to read for the currently selected pipe to read from.
-			 *  \param[in]  BytesProcessed  Pointer to a location where the total number of bytes already processed should
-			 *                              updated, \c NULL if the entire stream should be read at once.
-			 *
-			 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Pipe_Read_Stream_LE(void* const Buffer,
-			                            uint16_t Length,
-			                            uint16_t* const BytesProcessed) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Reads the given number of bytes from the pipe into the given buffer in big endian,
-			 *  sending full packets to the device as needed. The last packet filled is not automatically sent;
-			 *  the user is responsible for manually sending the last written packet to the host via the
-			 *  \ref Pipe_ClearIN() macro. Between each USB packet, the given stream callback function is
-			 *  executed repeatedly until the next packet is ready, allowing for early aborts of stream transfers.
-			 *
-			 *  \note The pipe token is set automatically, thus this can be used on bi-directional pipes directly without
-			 *        having to explicitly change the data direction with a call to \ref Pipe_SetPipeToken().
-			 *
-			 *  \param[out] Buffer          Pointer to the source data buffer to write to.
-			 *  \param[in]  Length          Number of bytes to read for the currently selected pipe to read from.
-			 *  \param[in]  BytesProcessed  Pointer to a location where the total number of bytes already processed should
-			 *                              updated, \c NULL if the entire stream should be read at once.
-			 *
-			 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Pipe_Read_Stream_BE(void* const Buffer,
-			                            uint16_t Length,
-			                            uint16_t* const BytesProcessed) ATTR_NON_NULL_PTR_ARG(1);
-			/**@}*/
-
-			/** \name Stream functions for EEPROM source/destination data */
-			/**@{*/
-
-			/** EEPROM buffer source version of \ref Pipe_Write_Stream_LE().
-			 *
-			 *  \param[in] Buffer          Pointer to the source data buffer to read from.
-			 *  \param[in] Length          Number of bytes to read for the currently selected pipe into the buffer.
-			 *  \param[in] BytesProcessed  Pointer to a location where the total number of bytes already processed should
-			 *                             updated, \c NULL if the entire stream should be written at once.
-			 *
-			 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Pipe_Write_EStream_LE(const void* const Buffer,
-			                              uint16_t Length,
-			                              uint16_t* const BytesProcessed) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** EEPROM buffer source version of \ref Pipe_Write_Stream_BE().
-			 *
-			 *  \param[in] Buffer          Pointer to the source data buffer to read from.
-			 *  \param[in] Length          Number of bytes to read for the currently selected pipe into the buffer.
-			 *  \param[in] BytesProcessed  Pointer to a location where the total number of bytes already processed should
-			 *                             updated, \c NULL if the entire stream should be written at once.
-			 *
-			 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Pipe_Write_EStream_BE(const void* const Buffer,
-			                              uint16_t Length,
-			                              uint16_t* const BytesProcessed) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** EEPROM buffer source version of \ref Pipe_Read_Stream_LE().
-			 *
-			 *  \param[out] Buffer          Pointer to the source data buffer to write to.
-			 *  \param[in]  Length          Number of bytes to read for the currently selected pipe to read from.
-			 *  \param[in]  BytesProcessed  Pointer to a location where the total number of bytes already processed should
-			 *                              updated, \c NULL if the entire stream should be read at once.
-			 *
-			 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Pipe_Read_EStream_LE(void* const Buffer,
-			                             uint16_t Length,
-			                             uint16_t* const BytesProcessed) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** EEPROM buffer source version of \ref Pipe_Read_Stream_BE().
-			 *
-			 *  \param[out] Buffer          Pointer to the source data buffer to write to.
-			 *  \param[in]  Length          Number of bytes to read for the currently selected pipe to read from.
-			 *  \param[in]  BytesProcessed  Pointer to a location where the total number of bytes already processed should
-			 *                              updated, \c NULL if the entire stream should be read at once.
-			 *
-			 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Pipe_Read_EStream_BE(void* const Buffer,
-			                             uint16_t Length,
-			                             uint16_t* const BytesProcessed) ATTR_NON_NULL_PTR_ARG(1);
-			/**@}*/
-
-			/** \name Stream functions for PROGMEM source/destination data */
-			/**@{*/
-
-			/** FLASH buffer source version of \ref Pipe_Write_Stream_LE().
-			 *
-			 *  \pre The FLASH data must be located in the first 64KB of FLASH for this function to work correctly.
-			 *
-			 *  \param[in] Buffer          Pointer to the source data buffer to read from.
-			 *  \param[in] Length          Number of bytes to read for the currently selected pipe into the buffer.
-			 *  \param[in] BytesProcessed  Pointer to a location where the total number of bytes already processed should
-			 *                             updated, \c NULL if the entire stream should be written at once.
-			 *
-			 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Pipe_Write_PStream_LE(const void* const Buffer,
-			                              uint16_t Length,
-			                              uint16_t* const BytesProcessed) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** FLASH buffer source version of \ref Pipe_Write_Stream_BE().
-			 *
-			 *  \pre The FLASH data must be located in the first 64KB of FLASH for this function to work correctly.
-			 *
-			 *  \param[in] Buffer          Pointer to the source data buffer to read from.
-			 *  \param[in] Length          Number of bytes to read for the currently selected pipe into the buffer.
-			 *  \param[in] BytesProcessed  Pointer to a location where the total number of bytes already processed should
-			 *                             updated, \c NULL if the entire stream should be written at once.
-			 *
-			 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Pipe_Write_PStream_BE(const void* const Buffer,
-			                              uint16_t Length,
-			                              uint16_t* const BytesProcessed) ATTR_NON_NULL_PTR_ARG(1);
-			/**@}*/
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Core/AVR8/Pipe_AVR8.c b/NativePrograms/LUFA/Drivers/USB/Core/AVR8/Pipe_AVR8.c
deleted file mode 100644
index ca4675141a..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Core/AVR8/Pipe_AVR8.c
+++ /dev/null
@@ -1,210 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-#include "../../../../Common/Common.h"
-#if (ARCH == ARCH_AVR8)
-
-#define  __INCLUDE_FROM_USB_DRIVER
-#include "../USBMode.h"
-
-#if defined(USB_CAN_BE_HOST)
-
-#include "../Pipe.h"
-
-uint8_t USB_Host_ControlPipeSize = PIPE_CONTROLPIPE_DEFAULT_SIZE;
-
-bool Pipe_ConfigurePipeTable(const USB_Pipe_Table_t* const Table,
-                             const uint8_t Entries)
-{
-	for (uint8_t i = 0; i < Entries; i++)
-	{
-		if (!(Table[i].Address))
-		  continue;
-
-		if (!(Pipe_ConfigurePipe(Table[i].Address, Table[i].Type, Table[i].EndpointAddress, Table[i].Size, Table[i].Banks)))
-		{
-			return false;
-		}
-	}
-
-	return true;
-}
-
-bool Pipe_ConfigurePipe(const uint8_t Address,
-                        const uint8_t Type,
-                        const uint8_t EndpointAddress,
-                        const uint16_t Size,
-                        const uint8_t Banks)
-{
-	uint8_t Number = (Address & PIPE_EPNUM_MASK);
-	uint8_t Token  = (Address & PIPE_DIR_IN) ? PIPE_TOKEN_IN : PIPE_TOKEN_OUT;
-
-	if (Number >= PIPE_TOTAL_PIPES)
-	  return false;
-
-	if (Type == EP_TYPE_CONTROL)
-	  Token = PIPE_TOKEN_SETUP;
-
-#if defined(ORDERED_EP_CONFIG)
-	Pipe_SelectPipe(Number);
-	Pipe_EnablePipe();
-
-	UPCFG1X = 0;
-
-	UPCFG0X = ((Type << EPTYPE0) | Token | ((EndpointAddress & PIPE_EPNUM_MASK) << PEPNUM0));
-	UPCFG1X = ((1 << ALLOC) | ((Banks > 1) ? (1 << EPBK0) : 0) | Pipe_BytesToEPSizeMask(Size));
-
-	Pipe_SetInfiniteINRequests();
-
-	return Pipe_IsConfigured();
-#else
-	for (uint8_t PNum = Number; PNum < PIPE_TOTAL_PIPES; PNum++)
-	{
-		uint8_t UPCFG0XTemp;
-		uint8_t UPCFG1XTemp;
-		uint8_t UPCFG2XTemp;
-		uint8_t UPIENXTemp;
-
-		Pipe_SelectPipe(PNum);
-
-		if (PNum == Number)
-		{
-			UPCFG0XTemp = ((Type << EPTYPE0) | Token | ((EndpointAddress & PIPE_EPNUM_MASK) << PEPNUM0));
-			UPCFG1XTemp = ((1 << ALLOC) | ((Banks > 1) ? (1 << EPBK0) : 0) | Pipe_BytesToEPSizeMask(Size));
-			UPCFG2XTemp = 0;
-			UPIENXTemp  = 0;
-		}
-		else
-		{
-			UPCFG0XTemp = UPCFG0X;
-			UPCFG1XTemp = UPCFG1X;
-			UPCFG2XTemp = UPCFG2X;
-			UPIENXTemp  = UPIENX;
-		}
-
-		if (!(UPCFG1XTemp & (1 << ALLOC)))
-		  continue;
-
-		Pipe_DisablePipe();
-		UPCFG1X &= ~(1 << ALLOC);
-
-		Pipe_EnablePipe();
-		UPCFG0X = UPCFG0XTemp;
-		UPCFG1X = UPCFG1XTemp;
-		UPCFG2X = UPCFG2XTemp;
-		UPIENX  = UPIENXTemp;
-
-		Pipe_SetInfiniteINRequests();
-
-		if (!(Pipe_IsConfigured()))
-		  return false;
-	}
-
-	Pipe_SelectPipe(Number);
-	return true;
-#endif
-}
-
-void Pipe_ClearPipes(void)
-{
-	UPINT = 0;
-
-	for (uint8_t PNum = 0; PNum < PIPE_TOTAL_PIPES; PNum++)
-	{
-		Pipe_SelectPipe(PNum);
-		UPIENX  = 0;
-		UPINTX  = 0;
-		UPCFG1X = 0;
-		Pipe_DisablePipe();
-	}
-}
-
-bool Pipe_IsEndpointBound(const uint8_t EndpointAddress)
-{
-	uint8_t PrevPipeNumber = Pipe_GetCurrentPipe();
-
-	for (uint8_t PNum = 0; PNum < PIPE_TOTAL_PIPES; PNum++)
-	{
-		Pipe_SelectPipe(PNum);
-
-		if (!(Pipe_IsConfigured()))
-		  continue;
-
-		if (Pipe_GetBoundEndpointAddress() == EndpointAddress)
-		  return true;
-	}
-
-	Pipe_SelectPipe(PrevPipeNumber);
-	return false;
-}
-
-uint8_t Pipe_WaitUntilReady(void)
-{
-	#if (USB_STREAM_TIMEOUT_MS < 0xFF)
-	uint8_t  TimeoutMSRem = USB_STREAM_TIMEOUT_MS;
-	#else
-	uint16_t TimeoutMSRem = USB_STREAM_TIMEOUT_MS;
-	#endif
-
-	uint16_t PreviousFrameNumber = USB_Host_GetFrameNumber();
-
-	for (;;)
-	{
-		if (Pipe_GetPipeToken() == PIPE_TOKEN_IN)
-		{
-			if (Pipe_IsINReceived())
-			  return PIPE_READYWAIT_NoError;
-		}
-		else
-		{
-			if (Pipe_IsOUTReady())
-			  return PIPE_READYWAIT_NoError;
-		}
-
-		if (Pipe_IsStalled())
-		  return PIPE_READYWAIT_PipeStalled;
-		else if (USB_HostState == HOST_STATE_Unattached)
-		  return PIPE_READYWAIT_DeviceDisconnected;
-
-		uint16_t CurrentFrameNumber = USB_Host_GetFrameNumber();
-
-		if (CurrentFrameNumber != PreviousFrameNumber)
-		{
-			PreviousFrameNumber = CurrentFrameNumber;
-
-			if (!(TimeoutMSRem--))
-			  return PIPE_READYWAIT_Timeout;
-		}
-	}
-}
-
-#endif
-
-#endif
diff --git a/NativePrograms/LUFA/Drivers/USB/Core/AVR8/Pipe_AVR8.h b/NativePrograms/LUFA/Drivers/USB/Core/AVR8/Pipe_AVR8.h
deleted file mode 100644
index 612a12d131..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Core/AVR8/Pipe_AVR8.h
+++ /dev/null
@@ -1,922 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief USB Pipe definitions for the AVR8 microcontrollers.
- *  \copydetails Group_PipeManagement_AVR8
- *
- *  \note This file should not be included directly. It is automatically included as needed by the USB driver
- *        dispatch header located in LUFA/Drivers/USB/USB.h.
- */
-
-/** \ingroup Group_PipeRW
- *  \defgroup Group_PipeRW_AVR8 Pipe Data Reading and Writing (AVR8)
- *  \brief Pipe data read/write definitions for the Atmel AVR8 architecture.
- *
- *  Functions, macros, variables, enums and types related to data reading and writing from and to pipes.
- */
-
-/** \ingroup Group_PipePrimitiveRW
- *  \defgroup Group_PipePrimitiveRW_AVR8 Read/Write of Primitive Data Types (AVR8)
- *  \brief Pipe primitive data read/write definitions for the Atmel AVR8 architecture.
- *
- *  Functions, macros, variables, enums and types related to data reading and writing of primitive data types
- *  from and to pipes.
- */
-
-/** \ingroup Group_PipePacketManagement
- *  \defgroup Group_PipePacketManagement_AVR8 Pipe Packet Management (AVR8)
- *  \brief Pipe packet management definitions for the Atmel AVR8 architecture.
- *
- *  Functions, macros, variables, enums and types related to packet management of pipes.
- */
-
-/** \ingroup Group_PipeControlReq
- *  \defgroup Group_PipeControlReq_AVR8 Pipe Control Request Management (AVR8)
- *  \brief Pipe control request management definitions for the Atmel AVR8 architecture.
- *
- *  Module for host mode request processing. This module allows for the transmission of standard, class and
- *  vendor control requests to the default control endpoint of an attached device while in host mode.
- *
- *  \see Chapter 9 of the USB 2.0 specification.
- */
-
-/** \ingroup Group_PipeManagement
- *  \defgroup Group_PipeManagement_AVR8 Pipe Management (AVR8)
- *  \brief Pipe management definitions for the Atmel AVR8 architecture.
- *
- *  This module contains functions, macros and enums related to pipe management when in USB Host mode. This
- *  module contains the pipe management macros, as well as pipe interrupt and data send/receive functions
- *  for various data types.
- *
- *  @{
- */
-
-#ifndef __PIPE_AVR8_H__
-#define __PIPE_AVR8_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-		#include "../USBTask.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_USB_DRIVER)
-			#error Do not include this file directly. Include LUFA/Drivers/USB/USB.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** \name Pipe Error Flag Masks */
-			/**@{*/
-			/** Mask for \ref Pipe_GetErrorFlags(), indicating that an overflow error occurred in the pipe on the received data. */
-			#define PIPE_ERRORFLAG_OVERFLOW         (1 << 6)
-
-			/** Mask for \ref Pipe_GetErrorFlags(), indicating that an underflow error occurred in the pipe on the received data. */
-			#define PIPE_ERRORFLAG_UNDERFLOW        (1 << 5)
-
-			/** Mask for \ref Pipe_GetErrorFlags(), indicating that a CRC error occurred in the pipe on the received data. */
-			#define PIPE_ERRORFLAG_CRC16            (1 << 4)
-
-			/** Mask for \ref Pipe_GetErrorFlags(), indicating that a hardware timeout error occurred in the pipe. */
-			#define PIPE_ERRORFLAG_TIMEOUT          (1 << 3)
-
-			/** Mask for \ref Pipe_GetErrorFlags(), indicating that a hardware PID error occurred in the pipe. */
-			#define PIPE_ERRORFLAG_PID              (1 << 2)
-
-			/** Mask for \ref Pipe_GetErrorFlags(), indicating that a hardware data PID error occurred in the pipe. */
-			#define PIPE_ERRORFLAG_DATAPID          (1 << 1)
-
-			/** Mask for \ref Pipe_GetErrorFlags(), indicating that a hardware data toggle error occurred in the pipe. */
-			#define PIPE_ERRORFLAG_DATATGL          (1 << 0)
-			/**@}*/
-
-			/** \name Pipe Token Masks */
-			/**@{*/
-			/** Token mask for \ref Pipe_SetPipeToken() and \ref Pipe_GetPipeToken(). This sets the pipe as a SETUP token (for CONTROL type pipes),
-			 *  which will trigger a control request on the attached device when data is written to the pipe.
-			 */
-			#define PIPE_TOKEN_SETUP                (0 << PTOKEN0)
-
-			/** Token mask for \ref Pipe_SetPipeToken() and \ref Pipe_GetPipeToken(). This sets the pipe as a IN token (for non-CONTROL type pipes),
-			 *  indicating that the pipe data will flow from device to host.
-			 */
-			#define PIPE_TOKEN_IN                   (1 << PTOKEN0)
-
-			/** Token mask for \ref Pipe_SetPipeToken() and \ref Pipe_GetPipeToken(). This sets the pipe as a OUT token (for non-CONTROL type pipes),
-			 *  indicating that the pipe data will flow from host to device.
-			 */
-			#define PIPE_TOKEN_OUT                  (2 << PTOKEN0)
-			/**@}*/
-
-			/** Default size of the default control pipe's bank, until altered by the Endpoint0Size value
-			 *  in the device descriptor of the attached device.
-			 */
-			#define PIPE_CONTROLPIPE_DEFAULT_SIZE   64
-
-			/** Total number of pipes (including the default control pipe at address 0) which may be used in
-			 *  the device. Different USB AVR models support different amounts of pipes, this value reflects
-			 *  the maximum number of pipes for the currently selected AVR model.
-			 */
-			#define PIPE_TOTAL_PIPES                7
-
-			/** Size in bytes of the largest pipe bank size possible in the device. Not all banks on each AVR
-			 *  model supports the largest bank size possible on the device; different pipe numbers support
-			 *  different maximum bank sizes. This value reflects the largest possible bank of any pipe on the
-			 *  currently selected USB AVR model.
-			 */
-			#define PIPE_MAX_SIZE                   256
-
-		/* Enums: */
-			/** Enum for the possible error return codes of the \ref Pipe_WaitUntilReady() function.
-			 *
-			 *  \ingroup Group_PipeRW_AVR8
-			 */
-			enum Pipe_WaitUntilReady_ErrorCodes_t
-			{
-				PIPE_READYWAIT_NoError                 = 0, /**< Pipe ready for next packet, no error. */
-				PIPE_READYWAIT_PipeStalled             = 1,	/**< The device stalled the pipe while waiting. */
-				PIPE_READYWAIT_DeviceDisconnected      = 2,	/**< Device was disconnected from the host while waiting. */
-				PIPE_READYWAIT_Timeout                 = 3, /**< The device failed to accept or send the next packet
-				                                             *   within the software timeout period set by the
-				                                             *   \ref USB_STREAM_TIMEOUT_MS macro.
-				                                             */
-			};
-
-		/* Inline Functions: */
-			/** Indicates the number of bytes currently stored in the current pipes's selected bank.
-			 *
-			 *  \ingroup Group_PipeRW_AVR8
-			 *
-			 *  \return Total number of bytes in the currently selected pipe's FIFO buffer.
-			 */
-			static inline uint16_t Pipe_BytesInPipe(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline uint16_t Pipe_BytesInPipe(void)
-			{
-				return UPBCX;
-			}
-
-			/** Determines the currently selected pipe's direction.
-			 *
-			 *  \return The currently selected pipe's direction, as a \c PIPE_DIR_* mask.
-			 */
-			static inline uint8_t Pipe_GetPipeDirection(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline uint8_t Pipe_GetPipeDirection(void)
-			{
-				return (UPCFG0X & (1 << EPDIR)) ? PIPE_DIR_IN : PIPE_DIR_OUT;
-			}
-
-			/** Returns the pipe address of the currently selected pipe. This is typically used to save the
-			 *  currently selected pipe address so that it can be restored after another pipe has been manipulated.
-			 *
-			 *  \return Index of the currently selected pipe.
-			 */
-			static inline uint8_t Pipe_GetCurrentPipe(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline uint8_t Pipe_GetCurrentPipe(void)
-			{
-				return ((UPNUM & PIPE_PIPENUM_MASK) | Pipe_GetPipeDirection());
-			}
-
-			/** Selects the given pipe address. Any pipe operations which do not require the pipe address to be
-			 *  indicated will operate on the currently selected pipe.
-			 *
-			 *  \param[in] Address  Address of the pipe to select.
-			 */
-			static inline void Pipe_SelectPipe(const uint8_t Address) ATTR_ALWAYS_INLINE;
-			static inline void Pipe_SelectPipe(const uint8_t Address)
-			{
-				UPNUM = (Address & PIPE_PIPENUM_MASK);
-			}
-
-			/** Resets the desired pipe, including the pipe banks and flags.
-			 *
-			 *  \param[in] Address  Address of the pipe to reset.
-			 */
-			static inline void Pipe_ResetPipe(const uint8_t Address) ATTR_ALWAYS_INLINE;
-			static inline void Pipe_ResetPipe(const uint8_t Address)
-			{
-				UPRST = (1 << (Address & PIPE_PIPENUM_MASK));
-				UPRST = 0;
-			}
-
-			/** Enables the currently selected pipe so that data can be sent and received through it to and from
-			 *  an attached device.
-			 *
-			 *  \pre The currently selected pipe must first be configured properly via \ref Pipe_ConfigurePipe().
-			 */
-			static inline void Pipe_EnablePipe(void) ATTR_ALWAYS_INLINE;
-			static inline void Pipe_EnablePipe(void)
-			{
-				UPCONX |= (1 << PEN);
-			}
-
-			/** Disables the currently selected pipe so that data cannot be sent and received through it to and
-			 *  from an attached device.
-			 */
-			static inline void Pipe_DisablePipe(void) ATTR_ALWAYS_INLINE;
-			static inline void Pipe_DisablePipe(void)
-			{
-				UPCONX &= ~(1 << PEN);
-			}
-
-			/** Determines if the currently selected pipe is enabled, but not necessarily configured.
-			 *
-			 * \return Boolean \c true if the currently selected pipe is enabled, \c false otherwise.
-			 */
-			static inline bool Pipe_IsEnabled(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline bool Pipe_IsEnabled(void)
-			{
-				return ((UPCONX & (1 << PEN)) ? true : false);
-			}
-
-			/** Gets the current pipe token, indicating the pipe's data direction and type.
-			 *
-			 *  \return The current pipe token, as a \c PIPE_TOKEN_* mask.
-			 */
-			static inline uint8_t Pipe_GetPipeToken(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline uint8_t Pipe_GetPipeToken(void)
-			{
-				return (UPCFG0X & (0x03 << PTOKEN0));
-			}
-
-			/** Sets the token for the currently selected pipe to one of the tokens specified by the \c PIPE_TOKEN_*
-			 *  masks. This can be used on CONTROL type pipes, to allow for bidirectional transfer of data during
-			 *  control requests, or on regular pipes to allow for half-duplex bidirectional data transfer to devices
-			 *  which have two endpoints of opposite direction sharing the same endpoint address within the device.
-			 *
-			 *  \param[in] Token  New pipe token to set the selected pipe to, as a \c PIPE_TOKEN_* mask.
-			 */
-			static inline void Pipe_SetPipeToken(const uint8_t Token) ATTR_ALWAYS_INLINE;
-			static inline void Pipe_SetPipeToken(const uint8_t Token)
-			{
-				UPCFG0X = ((UPCFG0X & ~(0x03 << PTOKEN0)) | Token);
-			}
-
-			/** Configures the currently selected pipe to allow for an unlimited number of IN requests. */
-			static inline void Pipe_SetInfiniteINRequests(void) ATTR_ALWAYS_INLINE;
-			static inline void Pipe_SetInfiniteINRequests(void)
-			{
-				UPCONX |= (1 << INMODE);
-			}
-
-			/** Configures the currently selected pipe to only allow the specified number of IN requests to be
-			 *  accepted by the pipe before it is automatically frozen.
-			 *
-			 *  \param[in] TotalINRequests  Total number of IN requests that the pipe may receive before freezing.
-			 */
-			static inline void Pipe_SetFiniteINRequests(const uint8_t TotalINRequests) ATTR_ALWAYS_INLINE;
-			static inline void Pipe_SetFiniteINRequests(const uint8_t TotalINRequests)
-			{
-				UPCONX &= ~(1 << INMODE);
-				UPINRQX = TotalINRequests;
-			}
-
-			/** Determines if the currently selected pipe is configured.
-			 *
-			 *  \return Boolean \c true if the selected pipe is configured, \c false otherwise.
-			 */
-			static inline bool Pipe_IsConfigured(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline bool Pipe_IsConfigured(void)
-			{
-				return ((UPSTAX & (1 << CFGOK)) ? true : false);
-			}
-
-			/** Retrieves the endpoint address of the endpoint within the attached device that the currently selected
-			 *  pipe is bound to.
-			 *
-			 *  \return Endpoint address the currently selected pipe is bound to.
-			 */
-			static inline uint8_t Pipe_GetBoundEndpointAddress(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline uint8_t Pipe_GetBoundEndpointAddress(void)
-			{
-				uint8_t UPCFG0X_Temp = UPCFG0X;
-
-				return (((UPCFG0X_Temp >> PEPNUM0) & PIPE_EPNUM_MASK) |
-				        ((UPCFG0X_Temp & (1 << PTOKEN1)) ? ENDPOINT_DIR_IN : ENDPOINT_DIR_OUT));
-			}
-
-			/** Sets the period between interrupts for an INTERRUPT type pipe to a specified number of milliseconds.
-			 *
-			 *  \param[in] Milliseconds  Number of milliseconds between each pipe poll.
-			 */
-			static inline void Pipe_SetInterruptPeriod(const uint8_t Milliseconds) ATTR_ALWAYS_INLINE;
-			static inline void Pipe_SetInterruptPeriod(const uint8_t Milliseconds)
-			{
-				UPCFG2X = Milliseconds;
-			}
-
-			/** Returns a mask indicating which pipe's interrupt periods have elapsed, indicating that the pipe should
-			 *  be serviced.
-			 *
-			 *  \return Mask whose bits indicate which pipes have interrupted.
-			 */
-			static inline uint8_t Pipe_GetPipeInterrupts(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline uint8_t Pipe_GetPipeInterrupts(void)
-			{
-				return UPINT;
-			}
-
-			/** Determines if the specified pipe address has interrupted (valid only for INTERRUPT type
-			 *  pipes).
-			 *
-			 *  \param[in] Address  Address of the pipe whose interrupt flag should be tested.
-			 *
-			 *  \return Boolean \c true if the specified pipe has interrupted, \c false otherwise.
-			 */
-			static inline bool Pipe_HasPipeInterrupted(const uint8_t Address) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline bool Pipe_HasPipeInterrupted(const uint8_t Address)
-			{
-				return ((UPINT & (1 << (Address & PIPE_PIPENUM_MASK))) ? true : false);
-			}
-
-			/** Unfreezes the selected pipe, allowing it to communicate with an attached device. */
-			static inline void Pipe_Unfreeze(void) ATTR_ALWAYS_INLINE;
-			static inline void Pipe_Unfreeze(void)
-			{
-				UPCONX &= ~(1 << PFREEZE);
-			}
-
-			/** Freezes the selected pipe, preventing it from communicating with an attached device. */
-			static inline void Pipe_Freeze(void) ATTR_ALWAYS_INLINE;
-			static inline void Pipe_Freeze(void)
-			{
-				UPCONX |= (1 << PFREEZE);
-			}
-
-			/** Determines if the currently selected pipe is frozen, and not able to accept data.
-			 *
-			 *  \return Boolean \c true if the currently selected pipe is frozen, \c false otherwise.
-			 */
-			static inline bool Pipe_IsFrozen(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline bool Pipe_IsFrozen(void)
-			{
-				return ((UPCONX & (1 << PFREEZE)) ? true : false);
-			}
-
-			/** Clears the error flags for the currently selected pipe. */
-			static inline void Pipe_ClearError(void) ATTR_ALWAYS_INLINE;
-			static inline void Pipe_ClearError(void)
-			{
-				UPERRX = 0;
-				UPINTX &= ~(1 << PERRI);
-			}
-
-			/** Determines if the master pipe error flag is set for the currently selected pipe, indicating that
-			 *  some sort of hardware error has occurred on the pipe.
-			 *
-			 *  \see \ref Pipe_GetErrorFlags() macro for information on retrieving the exact error flag.
-			 *
-			 *  \return Boolean \c true if an error has occurred on the selected pipe, \c false otherwise.
-			 */
-			static inline bool Pipe_IsError(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline bool Pipe_IsError(void)
-			{
-				return ((UPINTX & (1 << PERRI)) ? true : false);
-			}
-
-			/** Gets a mask of the hardware error flags which have occurred on the currently selected pipe. This
-			 *  value can then be masked against the \c PIPE_ERRORFLAG_* masks to determine what error has occurred.
-			 *
-			 *  \return  Mask comprising of \c PIPE_ERRORFLAG_* bits indicating what error has occurred on the selected pipe.
-			 */
-			static inline uint8_t Pipe_GetErrorFlags(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline uint8_t Pipe_GetErrorFlags(void)
-			{
-				return ((UPERRX & (PIPE_ERRORFLAG_CRC16 | PIPE_ERRORFLAG_TIMEOUT |
-				                   PIPE_ERRORFLAG_PID   | PIPE_ERRORFLAG_DATAPID |
-				                   PIPE_ERRORFLAG_DATATGL)) |
-				        (UPSTAX & (PIPE_ERRORFLAG_OVERFLOW | PIPE_ERRORFLAG_UNDERFLOW)));
-			}
-
-			/** Retrieves the number of busy banks in the currently selected pipe, which have been queued for
-			 *  transmission via the \ref Pipe_ClearOUT() command, or are awaiting acknowledgement via the
-			 *  \ref Pipe_ClearIN() command.
-			 *
-			 *  \ingroup Group_PipePacketManagement_AVR8
-			 *
-			 *  \return Total number of busy banks in the selected pipe.
-			 */
-			static inline uint8_t Pipe_GetBusyBanks(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline uint8_t Pipe_GetBusyBanks(void)
-			{
-				return (UPSTAX & (0x03 << NBUSYBK0));
-			}
-
-			/** Determines if the currently selected pipe may be read from (if data is waiting in the pipe
-			 *  bank and the pipe is an IN direction, or if the bank is not yet full if the pipe is an OUT
-			 *  direction). This function will return false if an error has occurred in the pipe, or if the pipe
-			 *  is an IN direction and no packet (or an empty packet) has been received, or if the pipe is an OUT
-			 *  direction and the pipe bank is full.
-			 *
-			 *  \note This function is not valid on CONTROL type pipes.
-			 *
-			 *  \ingroup Group_PipePacketManagement_AVR8
-			 *
-			 *  \return Boolean \c true if the currently selected pipe may be read from or written to, depending
-			 *          on its direction.
-			 */
-			static inline bool Pipe_IsReadWriteAllowed(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline bool Pipe_IsReadWriteAllowed(void)
-			{
-				return ((UPINTX & (1 << RWAL)) ? true : false);
-			}
-
-			/** Determines if a packet has been received on the currently selected IN pipe from the attached device.
-			 *
-			 *  \ingroup Group_PipePacketManagement_AVR8
-			 *
-			 *  \return Boolean \c true if the current pipe has received an IN packet, \c false otherwise.
-			 */
-			static inline bool Pipe_IsINReceived(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline bool Pipe_IsINReceived(void)
-			{
-				return ((UPINTX & (1 << RXINI)) ? true : false);
-			}
-
-			/** Determines if the currently selected OUT pipe is ready to send an OUT packet to the attached device.
-			 *
-			 *  \ingroup Group_PipePacketManagement_AVR8
-			 *
-			 *  \return Boolean \c true if the current pipe is ready for an OUT packet, \c false otherwise.
-			 */
-			static inline bool Pipe_IsOUTReady(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline bool Pipe_IsOUTReady(void)
-			{
-				return ((UPINTX & (1 << TXOUTI)) ? true : false);
-			}
-
-			/** Determines if no SETUP request is currently being sent to the attached device on the selected
-			 *  CONTROL type pipe.
-			 *
-			 *  \ingroup Group_PipePacketManagement_AVR8
-			 *
-			 *  \return Boolean \c true if the current pipe is ready for a SETUP packet, \c false otherwise.
-			 */
-			static inline bool Pipe_IsSETUPSent(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline bool Pipe_IsSETUPSent(void)
-			{
-				return ((UPINTX & (1 << TXSTPI)) ? true : false);
-			}
-
-			/** Sends the currently selected CONTROL type pipe's contents to the device as a SETUP packet.
-			 *
-			 *  \ingroup Group_PipePacketManagement_AVR8
-			 */
-			static inline void Pipe_ClearSETUP(void) ATTR_ALWAYS_INLINE;
-			static inline void Pipe_ClearSETUP(void)
-			{
-				UPINTX &= ~((1 << TXSTPI) | (1 << FIFOCON));
-			}
-
-			/** Acknowledges the reception of a setup IN request from the attached device on the currently selected
-			 *  pipe, freeing the bank ready for the next packet.
-			 *
-			 *  \ingroup Group_PipePacketManagement_AVR8
-			 */
-			static inline void Pipe_ClearIN(void) ATTR_ALWAYS_INLINE;
-			static inline void Pipe_ClearIN(void)
-			{
-				UPINTX &= ~((1 << RXINI) | (1 << FIFOCON));
-			}
-
-			/** Sends the currently selected pipe's contents to the device as an OUT packet on the selected pipe, freeing
-			 *  the bank ready for the next packet.
-			 *
-			 *  \ingroup Group_PipePacketManagement_AVR8
-			 */
-			static inline void Pipe_ClearOUT(void) ATTR_ALWAYS_INLINE;
-			static inline void Pipe_ClearOUT(void)
-			{
-				UPINTX &= ~((1 << TXOUTI) | (1 << FIFOCON));
-			}
-
-			/** Determines if the device sent a NAK (Negative Acknowledge) in response to the last sent packet on
-			 *  the currently selected pipe. This occurs when the host sends a packet to the device, but the device
-			 *  is not currently ready to handle the packet (i.e. its endpoint banks are full). Once a NAK has been
-			 *  received, it must be cleared using \ref Pipe_ClearNAKReceived() before the previous (or any other) packet
-			 *  can be re-sent.
-			 *
-			 *  \ingroup Group_PipePacketManagement_AVR8
-			 *
-			 *  \return Boolean \c true if an NAK has been received on the current pipe, \c false otherwise.
-			 */
-			static inline bool Pipe_IsNAKReceived(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline bool Pipe_IsNAKReceived(void)
-			{
-				return ((UPINTX & (1 << NAKEDI)) ? true : false);
-			}
-
-			/** Clears the NAK condition on the currently selected pipe.
-			 *
-			 *  \ingroup Group_PipePacketManagement_AVR8
-			 *
-			 *  \see \ref Pipe_IsNAKReceived() for more details.
-			 */
-			static inline void Pipe_ClearNAKReceived(void) ATTR_ALWAYS_INLINE;
-			static inline void Pipe_ClearNAKReceived(void)
-			{
-				UPINTX &= ~(1 << NAKEDI);
-			}
-
-			/** Determines if the currently selected pipe has had the STALL condition set by the attached device.
-			 *
-			 *  \ingroup Group_PipePacketManagement_AVR8
-			 *
-			 *  \return Boolean \c true if the current pipe has been stalled by the attached device, \c false otherwise.
-			 */
-			static inline bool Pipe_IsStalled(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline bool Pipe_IsStalled(void)
-			{
-				return ((UPINTX & (1 << RXSTALLI)) ? true : false);
-			}
-
-			/** Clears the STALL condition detection flag on the currently selected pipe, but does not clear the
-			 *  STALL condition itself (this must be done via a ClearFeature control request to the device).
-			 *
-			 *  \ingroup Group_PipePacketManagement_AVR8
-			 */
-			static inline void Pipe_ClearStall(void) ATTR_ALWAYS_INLINE;
-			static inline void Pipe_ClearStall(void)
-			{
-				UPINTX &= ~(1 << RXSTALLI);
-			}
-
-			/** Reads one byte from the currently selected pipe's bank, for OUT direction pipes.
-			 *
-			 *  \ingroup Group_PipePrimitiveRW_AVR8
-			 *
-			 *  \return Next byte in the currently selected pipe's FIFO buffer.
-			 */
-			static inline uint8_t Pipe_Read_8(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline uint8_t Pipe_Read_8(void)
-			{
-				return UPDATX;
-			}
-
-			/** Writes one byte to the currently selected pipe's bank, for IN direction pipes.
-			 *
-			 *  \ingroup Group_PipePrimitiveRW_AVR8
-			 *
-			 *  \param[in] Data  Data to write into the the currently selected pipe's FIFO buffer.
-			 */
-			static inline void Pipe_Write_8(const uint8_t Data) ATTR_ALWAYS_INLINE;
-			static inline void Pipe_Write_8(const uint8_t Data)
-			{
-				UPDATX = Data;
-			}
-
-			/** Discards one byte from the currently selected pipe's bank, for OUT direction pipes.
-			 *
-			 *  \ingroup Group_PipePrimitiveRW_AVR8
-			 */
-			static inline void Pipe_Discard_8(void) ATTR_ALWAYS_INLINE;
-			static inline void Pipe_Discard_8(void)
-			{
-				uint8_t Dummy;
-
-				Dummy = UPDATX;
-
-				(void)Dummy;
-			}
-
-			/** Reads two bytes from the currently selected pipe's bank in little endian format, for OUT
-			 *  direction pipes.
-			 *
-			 *  \ingroup Group_PipePrimitiveRW_AVR8
-			 *
-			 *  \return Next two bytes in the currently selected pipe's FIFO buffer.
-			 */
-			static inline uint16_t Pipe_Read_16_LE(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline uint16_t Pipe_Read_16_LE(void)
-			{
-				union
-				{
-					uint16_t Value;
-					uint8_t  Bytes[2];
-				} Data;
-
-				Data.Bytes[0] = UPDATX;
-				Data.Bytes[1] = UPDATX;
-
-				return Data.Value;
-			}
-
-			/** Reads two bytes from the currently selected pipe's bank in big endian format, for OUT
-			 *  direction pipes.
-			 *
-			 *  \ingroup Group_PipePrimitiveRW_AVR8
-			 *
-			 *  \return Next two bytes in the currently selected pipe's FIFO buffer.
-			 */
-			static inline uint16_t Pipe_Read_16_BE(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline uint16_t Pipe_Read_16_BE(void)
-			{
-				union
-				{
-					uint16_t Value;
-					uint8_t  Bytes[2];
-				} Data;
-
-				Data.Bytes[1] = UPDATX;
-				Data.Bytes[0] = UPDATX;
-
-				return Data.Value;
-			}
-
-			/** Writes two bytes to the currently selected pipe's bank in little endian format, for IN
-			 *  direction pipes.
-			 *
-			 *  \ingroup Group_PipePrimitiveRW_AVR8
-			 *
-			 *  \param[in] Data  Data to write to the currently selected pipe's FIFO buffer.
-			 */
-			static inline void Pipe_Write_16_LE(const uint16_t Data) ATTR_ALWAYS_INLINE;
-			static inline void Pipe_Write_16_LE(const uint16_t Data)
-			{
-				UPDATX = (Data & 0xFF);
-				UPDATX = (Data >> 8);
-			}
-
-			/** Writes two bytes to the currently selected pipe's bank in big endian format, for IN
-			 *  direction pipes.
-			 *
-			 *  \ingroup Group_PipePrimitiveRW_AVR8
-			 *
-			 *  \param[in] Data  Data to write to the currently selected pipe's FIFO buffer.
-			 */
-			static inline void Pipe_Write_16_BE(const uint16_t Data) ATTR_ALWAYS_INLINE;
-			static inline void Pipe_Write_16_BE(const uint16_t Data)
-			{
-				UPDATX = (Data >> 8);
-				UPDATX = (Data & 0xFF);
-			}
-
-			/** Discards two bytes from the currently selected pipe's bank, for OUT direction pipes.
-			 *
-			 *  \ingroup Group_PipePrimitiveRW_AVR8
-			 */
-			static inline void Pipe_Discard_16(void) ATTR_ALWAYS_INLINE;
-			static inline void Pipe_Discard_16(void)
-			{
-				uint8_t Dummy;
-
-				Dummy = UPDATX;
-				Dummy = UPDATX;
-
-				(void)Dummy;
-			}
-
-			/** Reads four bytes from the currently selected pipe's bank in little endian format, for OUT
-			 *  direction pipes.
-			 *
-			 *  \ingroup Group_PipePrimitiveRW_AVR8
-			 *
-			 *  \return Next four bytes in the currently selected pipe's FIFO buffer.
-			 */
-			static inline uint32_t Pipe_Read_32_LE(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline uint32_t Pipe_Read_32_LE(void)
-			{
-				union
-				{
-					uint32_t Value;
-					uint8_t  Bytes[4];
-				} Data;
-
-				Data.Bytes[0] = UPDATX;
-				Data.Bytes[1] = UPDATX;
-				Data.Bytes[2] = UPDATX;
-				Data.Bytes[3] = UPDATX;
-
-				return Data.Value;
-			}
-
-			/** Reads four bytes from the currently selected pipe's bank in big endian format, for OUT
-			 *  direction pipes.
-			 *
-			 *  \ingroup Group_PipePrimitiveRW_AVR8
-			 *
-			 *  \return Next four bytes in the currently selected pipe's FIFO buffer.
-			 */
-			static inline uint32_t Pipe_Read_32_BE(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline uint32_t Pipe_Read_32_BE(void)
-			{
-				union
-				{
-					uint32_t DWord;
-					uint8_t  Bytes[4];
-				} Data;
-
-				Data.Bytes[3] = UPDATX;
-				Data.Bytes[2] = UPDATX;
-				Data.Bytes[1] = UPDATX;
-				Data.Bytes[0] = UPDATX;
-
-				return Data.DWord;
-			}
-
-			/** Writes four bytes to the currently selected pipe's bank in little endian format, for IN
-			 *  direction pipes.
-			 *
-			 *  \ingroup Group_PipePrimitiveRW_AVR8
-			 *
-			 *  \param[in] Data  Data to write to the currently selected pipe's FIFO buffer.
-			 */
-			static inline void Pipe_Write_32_LE(const uint32_t Data) ATTR_ALWAYS_INLINE;
-			static inline void Pipe_Write_32_LE(const uint32_t Data)
-			{
-				UPDATX = (Data &  0xFF);
-				UPDATX = (Data >> 8);
-				UPDATX = (Data >> 16);
-				UPDATX = (Data >> 24);
-			}
-
-			/** Writes four bytes to the currently selected pipe's bank in big endian format, for IN
-			 *  direction pipes.
-			 *
-			 *  \ingroup Group_PipePrimitiveRW_AVR8
-			 *
-			 *  \param[in] Data  Data to write to the currently selected pipe's FIFO buffer.
-			 */
-			static inline void Pipe_Write_32_BE(const uint32_t Data) ATTR_ALWAYS_INLINE;
-			static inline void Pipe_Write_32_BE(const uint32_t Data)
-			{
-				UPDATX = (Data >> 24);
-				UPDATX = (Data >> 16);
-				UPDATX = (Data >> 8);
-				UPDATX = (Data &  0xFF);
-			}
-
-			/** Discards four bytes from the currently selected pipe's bank, for OUT direction pipes.
-			 *
-			 *  \ingroup Group_PipePrimitiveRW_AVR8
-			 */
-			static inline void Pipe_Discard_32(void) ATTR_ALWAYS_INLINE;
-			static inline void Pipe_Discard_32(void)
-			{
-				uint8_t Dummy;
-
-				Dummy = UPDATX;
-				Dummy = UPDATX;
-				Dummy = UPDATX;
-				Dummy = UPDATX;
-
-				(void)Dummy;
-			}
-
-		/* External Variables: */
-			/** Global indicating the maximum packet size of the default control pipe located at address
-			 *  0 in the device. This value is set to the value indicated in the attached device's device
-		     *  descriptor once the USB interface is initialized into host mode and a device is attached
-			 *  to the USB bus.
-			 *
-			 *  \attention This variable should be treated as read-only in the user application, and never manually
-			 *             changed in value.
-			 */
-			extern uint8_t USB_Host_ControlPipeSize;
-
-		/* Function Prototypes: */
-			/** Configures a table of pipe descriptions, in sequence. This function can be used to configure multiple
-			 *  pipes at the same time.
-			 *
-			 *  \note Pipe with a zero address will be ignored, thus this function cannot be used to configure the
-			 *        control pipe.
-			 *
-			 *  \param[in] Table    Pointer to a table of pipe descriptions.
-			 *  \param[in] Entries  Number of entries in the pipe table to configure.
-			 *
-			 *  \return Boolean \c true if all pipes configured successfully, \c false otherwise.
-			 */
-			bool Pipe_ConfigurePipeTable(const USB_Pipe_Table_t* const Table,
-			                             const uint8_t Entries);
-
-			/** Configures the specified pipe address with the given pipe type, endpoint address within the attached device,
-			 *  bank size and number of hardware banks.
-			 *
-			 *  A newly configured pipe is frozen by default, and must be unfrozen before use via the \ref Pipe_Unfreeze()
-			 *  before being used. Pipes should be kept frozen unless waiting for data from a device while in IN mode, or
-			 *  sending data to the device in OUT mode. IN type pipes are also automatically configured to accept infinite
-			 *  numbers of IN requests without automatic freezing - this can be overridden by a call to
-			 *  \ref Pipe_SetFiniteINRequests().
-			 *
-			 *  \param[in] Address          Pipe address to configure.
-			 *
-			 *  \param[in] Type             Type of pipe to configure, an \c EP_TYPE_* mask. Not all pipe types are available on Low
-			 *                              Speed USB devices - refer to the USB 2.0 specification.
-			 *
-			 *  \param[in] EndpointAddress  Endpoint address within the attached device that the pipe should interface to.
-			 *
-			 *  \param[in] Size             Size of the pipe's bank, where packets are stored before they are transmitted to
-			 *                              the USB device, or after they have been received from the USB device (depending on
-			 *                              the pipe's data direction). The bank size must indicate the maximum packet size that
-			 *                              the pipe can handle.
-			 *
-			 *  \param[in] Banks            Number of banks to use for the pipe being configured.
-			 *
-			 *  \attention When the \c ORDERED_EP_CONFIG compile time option is used, Pipes <b>must</b> be configured in ascending order,
-			 *             or bank corruption will occur.
-			 *
-			 *  \note Certain microcontroller model's pipes may have different maximum packet sizes based on the pipe's
-			 *        index - refer to the chosen microcontroller's datasheet to determine the maximum bank size for each pipe.
-			 *        \n\n
-			 *
-			 *  \note The default control pipe should not be manually configured by the user application, as it is
-			 *        automatically configured by the library internally.
-			 *        \n\n
-			 *
-			 *  \note This routine will automatically select the specified pipe upon success. Upon failure, the pipe which
-			 *        failed to reconfigure correctly will be selected.
-			 *
-			 *  \return Boolean \c true if the configuration succeeded, \c false otherwise.
-			 */
-			bool Pipe_ConfigurePipe(const uint8_t Address,
-			                        const uint8_t Type,
-			                        const uint8_t EndpointAddress,
-			                        const uint16_t Size,
-			                        const uint8_t Banks);
-
-			/** Spin-loops until the currently selected non-control pipe is ready for the next packet of data to be read
-			 *  or written to it, aborting in the case of an error condition (such as a timeout or device disconnect).
-			 *
-			 *  \ingroup Group_PipeRW_AVR8
-			 *
-			 *  \return A value from the \ref Pipe_WaitUntilReady_ErrorCodes_t enum.
-			 */
-			uint8_t Pipe_WaitUntilReady(void);
-
-			/** Determines if a pipe has been bound to the given device endpoint address. If a pipe which is bound to the given
-			 *  endpoint is found, it is automatically selected.
-			 *
-			 *  \param[in] EndpointAddress Address and direction mask of the endpoint within the attached device to check.
-			 *
-			 *  \return Boolean \c true if a pipe bound to the given endpoint address of the specified direction is found,
-			 *          \c false otherwise.
-			 */
-			bool Pipe_IsEndpointBound(const uint8_t EndpointAddress) ATTR_WARN_UNUSED_RESULT;
-
-	/* Private Interface - For use in library only: */
-	#if !defined(__DOXYGEN__)
-		/* Macros: */
-			#if !defined(ENDPOINT_CONTROLEP)
-				#define ENDPOINT_CONTROLEP          0
-			#endif
-
-		/* Inline Functions: */
-			static inline uint8_t Pipe_BytesToEPSizeMask(const uint16_t Bytes) ATTR_WARN_UNUSED_RESULT ATTR_CONST ATTR_ALWAYS_INLINE;
-			static inline uint8_t Pipe_BytesToEPSizeMask(const uint16_t Bytes)
-			{
-				uint8_t  MaskVal    = 0;
-				uint16_t CheckBytes = 8;
-
-				while ((CheckBytes < Bytes) && (CheckBytes < PIPE_MAX_SIZE))
-				{
-					MaskVal++;
-					CheckBytes <<= 1;
-				}
-
-				return (MaskVal << EPSIZE0);
-			}
-
-		/* Function Prototypes: */
-			void Pipe_ClearPipes(void);
-	#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Core/AVR8/Template/Template_Endpoint_Control_R.c b/NativePrograms/LUFA/Drivers/USB/Core/AVR8/Template/Template_Endpoint_Control_R.c
deleted file mode 100644
index 6cfbaaf03e..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Core/AVR8/Template/Template_Endpoint_Control_R.c
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-#if defined(TEMPLATE_FUNC_NAME)
-
-uint8_t TEMPLATE_FUNC_NAME (void* const Buffer,
-                            uint16_t Length)
-{
-	uint8_t* DataStream = ((uint8_t*)Buffer + TEMPLATE_BUFFER_OFFSET(Length));
-
-	if (!(Length))
-	  Endpoint_ClearOUT();
-
-	while (Length)
-	{
-		uint8_t USB_DeviceState_LCL = USB_DeviceState;
-
-		if (USB_DeviceState_LCL == DEVICE_STATE_Unattached)
-		  return ENDPOINT_RWCSTREAM_DeviceDisconnected;
-		else if (USB_DeviceState_LCL == DEVICE_STATE_Suspended)
-		  return ENDPOINT_RWCSTREAM_BusSuspended;
-		else if (Endpoint_IsSETUPReceived())
-		  return ENDPOINT_RWCSTREAM_HostAborted;
-
-		if (Endpoint_IsOUTReceived())
-		{
-			while (Length && Endpoint_BytesInEndpoint())
-			{
-				TEMPLATE_TRANSFER_BYTE(DataStream);
-				TEMPLATE_BUFFER_MOVE(DataStream, 1);
-				Length--;
-			}
-
-			Endpoint_ClearOUT();
-		}
-	}
-
-	while (!(Endpoint_IsINReady()))
-	{
-		uint8_t USB_DeviceState_LCL = USB_DeviceState;
-
-		if (USB_DeviceState_LCL == DEVICE_STATE_Unattached)
-		  return ENDPOINT_RWCSTREAM_DeviceDisconnected;
-		else if (USB_DeviceState_LCL == DEVICE_STATE_Suspended)
-		  return ENDPOINT_RWCSTREAM_BusSuspended;
-	}
-
-	return ENDPOINT_RWCSTREAM_NoError;
-}
-
-#undef TEMPLATE_BUFFER_OFFSET
-#undef TEMPLATE_BUFFER_MOVE
-#undef TEMPLATE_FUNC_NAME
-#undef TEMPLATE_TRANSFER_BYTE
-
-#endif
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Core/AVR8/Template/Template_Endpoint_Control_W.c b/NativePrograms/LUFA/Drivers/USB/Core/AVR8/Template/Template_Endpoint_Control_W.c
deleted file mode 100644
index 24f374a894..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Core/AVR8/Template/Template_Endpoint_Control_W.c
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-#if defined(TEMPLATE_FUNC_NAME)
-
-uint8_t TEMPLATE_FUNC_NAME (const void* const Buffer,
-                            uint16_t Length)
-{
-	uint8_t* DataStream     = ((uint8_t*)Buffer + TEMPLATE_BUFFER_OFFSET(Length));
-	bool     LastPacketFull = false;
-
-	if (Length > USB_ControlRequest.wLength)
-	  Length = USB_ControlRequest.wLength;
-	else if (!(Length))
-	  Endpoint_ClearIN();
-
-	while (Length || LastPacketFull)
-	{
-		uint8_t USB_DeviceState_LCL = USB_DeviceState;
-
-		if (USB_DeviceState_LCL == DEVICE_STATE_Unattached)
-		  return ENDPOINT_RWCSTREAM_DeviceDisconnected;
-		else if (USB_DeviceState_LCL == DEVICE_STATE_Suspended)
-		  return ENDPOINT_RWCSTREAM_BusSuspended;
-		else if (Endpoint_IsSETUPReceived())
-		  return ENDPOINT_RWCSTREAM_HostAborted;
-		else if (Endpoint_IsOUTReceived())
-		  break;
-
-		if (Endpoint_IsINReady())
-		{
-			uint16_t BytesInEndpoint = Endpoint_BytesInEndpoint();
-
-			while (Length && (BytesInEndpoint < USB_Device_ControlEndpointSize))
-			{
-				TEMPLATE_TRANSFER_BYTE(DataStream);
-				TEMPLATE_BUFFER_MOVE(DataStream, 1);
-				Length--;
-				BytesInEndpoint++;
-			}
-
-			LastPacketFull = (BytesInEndpoint == USB_Device_ControlEndpointSize);
-			Endpoint_ClearIN();
-		}
-	}
-
-	while (!(Endpoint_IsOUTReceived()))
-	{
-		uint8_t USB_DeviceState_LCL = USB_DeviceState;
-
-		if (USB_DeviceState_LCL == DEVICE_STATE_Unattached)
-		  return ENDPOINT_RWCSTREAM_DeviceDisconnected;
-		else if (USB_DeviceState_LCL == DEVICE_STATE_Suspended)
-		  return ENDPOINT_RWCSTREAM_BusSuspended;
-		else if (Endpoint_IsSETUPReceived())
-		  return ENDPOINT_RWCSTREAM_HostAborted;
-	}
-
-	return ENDPOINT_RWCSTREAM_NoError;
-}
-
-#undef TEMPLATE_BUFFER_OFFSET
-#undef TEMPLATE_BUFFER_MOVE
-#undef TEMPLATE_FUNC_NAME
-#undef TEMPLATE_TRANSFER_BYTE
-
-#endif
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Core/AVR8/Template/Template_Endpoint_RW.c b/NativePrograms/LUFA/Drivers/USB/Core/AVR8/Template/Template_Endpoint_RW.c
deleted file mode 100644
index a5dc5e78d4..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Core/AVR8/Template/Template_Endpoint_RW.c
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-#if defined(TEMPLATE_FUNC_NAME)
-
-uint8_t TEMPLATE_FUNC_NAME (TEMPLATE_BUFFER_TYPE const Buffer,
-                            uint16_t Length,
-                            uint16_t* const BytesProcessed)
-{
-	uint8_t* DataStream      = ((uint8_t*)Buffer + TEMPLATE_BUFFER_OFFSET(Length));
-	uint16_t BytesInTransfer = 0;
-	uint8_t  ErrorCode;
-
-	if ((ErrorCode = Endpoint_WaitUntilReady()))
-	  return ErrorCode;
-
-	if (BytesProcessed != NULL)
-	{
-		Length -= *BytesProcessed;
-		TEMPLATE_BUFFER_MOVE(DataStream, *BytesProcessed);
-	}
-
-	while (Length)
-	{
-		if (!(Endpoint_IsReadWriteAllowed()))
-		{
-			TEMPLATE_CLEAR_ENDPOINT();
-
-			#if !defined(INTERRUPT_CONTROL_ENDPOINT)
-			USB_USBTask();
-			#endif
-
-			if (BytesProcessed != NULL)
-			{
-				*BytesProcessed += BytesInTransfer;
-				return ENDPOINT_RWSTREAM_IncompleteTransfer;
-			}
-
-			if ((ErrorCode = Endpoint_WaitUntilReady()))
-			  return ErrorCode;
-		}
-		else
-		{
-			TEMPLATE_TRANSFER_BYTE(DataStream);
-			TEMPLATE_BUFFER_MOVE(DataStream, 1);
-			Length--;
-			BytesInTransfer++;
-		}
-	}
-
-	return ENDPOINT_RWSTREAM_NoError;
-}
-
-#undef TEMPLATE_FUNC_NAME
-#undef TEMPLATE_BUFFER_TYPE
-#undef TEMPLATE_TRANSFER_BYTE
-#undef TEMPLATE_CLEAR_ENDPOINT
-#undef TEMPLATE_BUFFER_OFFSET
-#undef TEMPLATE_BUFFER_MOVE
-
-#endif
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Core/AVR8/Template/Template_Pipe_RW.c b/NativePrograms/LUFA/Drivers/USB/Core/AVR8/Template/Template_Pipe_RW.c
deleted file mode 100644
index 80a7bd0a92..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Core/AVR8/Template/Template_Pipe_RW.c
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-#if defined(TEMPLATE_FUNC_NAME)
-
-uint8_t TEMPLATE_FUNC_NAME (TEMPLATE_BUFFER_TYPE const Buffer,
-                            uint16_t Length,
-                            uint16_t* const BytesProcessed)
-{
-	uint8_t* DataStream      = ((uint8_t*)Buffer + TEMPLATE_BUFFER_OFFSET(Length));
-	uint16_t BytesInTransfer = 0;
-	uint8_t  ErrorCode;
-
-	Pipe_SetPipeToken(TEMPLATE_TOKEN);
-
-	if ((ErrorCode = Pipe_WaitUntilReady()))
-	  return ErrorCode;
-
-	if (BytesProcessed != NULL)
-	{
-		Length -= *BytesProcessed;
-		TEMPLATE_BUFFER_MOVE(DataStream, *BytesProcessed);
-	}
-
-	while (Length)
-	{
-		if (!(Pipe_IsReadWriteAllowed()))
-		{
-			TEMPLATE_CLEAR_PIPE();
-
-			if (BytesProcessed != NULL)
-			{
-				*BytesProcessed += BytesInTransfer;
-				return PIPE_RWSTREAM_IncompleteTransfer;
-			}
-
-			if ((ErrorCode = Pipe_WaitUntilReady()))
-			  return ErrorCode;
-		}
-		else
-		{
-			TEMPLATE_TRANSFER_BYTE(DataStream);
-			TEMPLATE_BUFFER_MOVE(DataStream, 1);
-			Length--;
-			BytesInTransfer++;
-		}
-	}
-
-	return PIPE_RWSTREAM_NoError;
-}
-
-#undef TEMPLATE_FUNC_NAME
-#undef TEMPLATE_BUFFER_TYPE
-#undef TEMPLATE_TOKEN
-#undef TEMPLATE_TRANSFER_BYTE
-#undef TEMPLATE_CLEAR_PIPE
-#undef TEMPLATE_BUFFER_OFFSET
-#undef TEMPLATE_BUFFER_MOVE
-
-#endif
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Core/AVR8/USBController_AVR8.c b/NativePrograms/LUFA/Drivers/USB/Core/AVR8/USBController_AVR8.c
deleted file mode 100644
index 10c75e703a..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Core/AVR8/USBController_AVR8.c
+++ /dev/null
@@ -1,273 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-#include "../../../../Common/Common.h"
-#if (ARCH == ARCH_AVR8)
-
-#define  __INCLUDE_FROM_USB_DRIVER
-#define  __INCLUDE_FROM_USB_CONTROLLER_C
-#include "../USBController.h"
-
-#if defined(USB_CAN_BE_BOTH)
-volatile uint8_t USB_CurrentMode = USB_MODE_None;
-#endif
-
-#if !defined(USE_STATIC_OPTIONS)
-volatile uint8_t USB_Options;
-#endif
-
-void USB_Init(
-               #if defined(USB_CAN_BE_BOTH)
-               const uint8_t Mode
-               #endif
-
-               #if (defined(USB_CAN_BE_BOTH) && !defined(USE_STATIC_OPTIONS))
-               ,
-               #elif (!defined(USB_CAN_BE_BOTH) && defined(USE_STATIC_OPTIONS))
-               void
-               #endif
-
-               #if !defined(USE_STATIC_OPTIONS)
-               const uint8_t Options
-               #endif
-               )
-{
-	#if !defined(USE_STATIC_OPTIONS)
-	USB_Options = Options;
-	#endif
-
-	#if defined(USB_SERIES_4_AVR) || defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR)
-	/* Workaround for AVR8 bootloaders that fail to turn off the OTG pad before running
-	 * the loaded application. This causes VBUS detection to fail unless we first force
-	 * it off to reset it. */
-	USB_OTGPAD_Off();
-	#endif
-
-	if (!(USB_Options & USB_OPT_REG_DISABLED))
-	  USB_REG_On();
-	else
-	  USB_REG_Off();
-
-	if (!(USB_Options & USB_OPT_MANUAL_PLL))
-	{
-		#if defined(USB_SERIES_4_AVR)
-		PLLFRQ = (1 << PDIV2);
-		#endif
-	}
-
-	#if defined(USB_CAN_BE_BOTH)
-	if (Mode == USB_MODE_UID)
-	{
-		UHWCON |=  (1 << UIDE);
-		USB_INT_Enable(USB_INT_IDTI);
-		USB_CurrentMode = USB_GetUSBModeFromUID();
-	}
-	else
-	{
-		UHWCON &= ~(1 << UIDE);
-		USB_CurrentMode = Mode;
-	}
-	#endif
-
-	USB_IsInitialized = true;
-
-	USB_ResetInterface();
-}
-
-void USB_Disable(void)
-{
-	USB_INT_DisableAllInterrupts();
-	USB_INT_ClearAllInterrupts();
-
-	USB_Detach();
-	USB_Controller_Disable();
-
-	if (!(USB_Options & USB_OPT_MANUAL_PLL))
-	  USB_PLL_Off();
-
-	if (!(USB_Options & USB_OPT_REG_KEEP_ENABLED))
-	  USB_REG_Off();
-
-	#if defined(USB_SERIES_4_AVR) || defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR)
-	USB_OTGPAD_Off();
-	#endif
-
-	#if defined(USB_CAN_BE_BOTH)
-	USB_CurrentMode = USB_MODE_None;
-	#endif
-
-	USB_IsInitialized = false;
-}
-
-void USB_ResetInterface(void)
-{
-	#if defined(USB_CAN_BE_BOTH)
-	bool UIDModeSelectEnabled = ((UHWCON & (1 << UIDE)) != 0);
-	#endif
-
-	USB_INT_DisableAllInterrupts();
-	USB_INT_ClearAllInterrupts();
-
-	USB_Controller_Reset();
-
-	#if defined(USB_CAN_BE_BOTH)
-	if (UIDModeSelectEnabled)
-	  USB_INT_Enable(USB_INT_IDTI);
-	#endif
-
-	USB_CLK_Unfreeze();
-
-	if (USB_CurrentMode == USB_MODE_Device)
-	{
-		#if defined(USB_CAN_BE_DEVICE)
-		#if (defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR))
-		UHWCON |=  (1 << UIMOD);
-		#endif
-
-		if (!(USB_Options & USB_OPT_MANUAL_PLL))
-		{
-			#if defined(USB_SERIES_2_AVR)
-			USB_PLL_On();
-			while (!(USB_PLL_IsReady()));
-			#else
-			USB_PLL_Off();
-			#endif
-		}
-
-		USB_Init_Device();
-		#endif
-	}
-	else if (USB_CurrentMode == USB_MODE_Host)
-	{
-		#if defined(USB_CAN_BE_HOST)
-		UHWCON &= ~(1 << UIMOD);
-
-		if (!(USB_Options & USB_OPT_MANUAL_PLL))
-		{
-			#if defined(USB_CAN_BE_HOST)
-			USB_PLL_On();
-			while (!(USB_PLL_IsReady()));
-			#endif
-		}
-
-		USB_Init_Host();
-		#endif
-	}
-
-	#if (defined(USB_SERIES_4_AVR) || defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR))
-	USB_OTGPAD_On();
-	#endif
-}
-
-#if defined(USB_CAN_BE_DEVICE)
-static void USB_Init_Device(void)
-{
-	USB_DeviceState                 = DEVICE_STATE_Unattached;
-	USB_Device_ConfigurationNumber  = 0;
-
-	#if !defined(NO_DEVICE_REMOTE_WAKEUP)
-	USB_Device_RemoteWakeupEnabled  = false;
-	#endif
-
-	#if !defined(NO_DEVICE_SELF_POWER)
-	USB_Device_CurrentlySelfPowered = false;
-	#endif
-
-	#if !defined(FIXED_CONTROL_ENDPOINT_SIZE)
-	USB_Descriptor_Device_t* DeviceDescriptorPtr;
-
-	#if defined(ARCH_HAS_MULTI_ADDRESS_SPACE) && \
-	    !(defined(USE_FLASH_DESCRIPTORS) || defined(USE_EEPROM_DESCRIPTORS) || defined(USE_RAM_DESCRIPTORS))
-	uint8_t DescriptorAddressSpace;
-
-	if (CALLBACK_USB_GetDescriptor((DTYPE_Device << 8), 0, (void*)&DeviceDescriptorPtr, &DescriptorAddressSpace) != NO_DESCRIPTOR)
-	{
-		if (DescriptorAddressSpace == MEMSPACE_FLASH)
-		  USB_Device_ControlEndpointSize = pgm_read_byte(&DeviceDescriptorPtr->Endpoint0Size);
-		else if (DescriptorAddressSpace == MEMSPACE_EEPROM)
-		  USB_Device_ControlEndpointSize = eeprom_read_byte(&DeviceDescriptorPtr->Endpoint0Size);
-		else
-		  USB_Device_ControlEndpointSize = DeviceDescriptorPtr->Endpoint0Size;
-	}
-	#else
-	if (CALLBACK_USB_GetDescriptor((DTYPE_Device << 8), 0, (void*)&DeviceDescriptorPtr) != NO_DESCRIPTOR)
-	{
-		#if defined(USE_RAM_DESCRIPTORS)
-		USB_Device_ControlEndpointSize = DeviceDescriptorPtr->Endpoint0Size;
-		#elif defined(USE_EEPROM_DESCRIPTORS)
-		USB_Device_ControlEndpointSize = eeprom_read_byte(&DeviceDescriptorPtr->Endpoint0Size);
-		#else
-		USB_Device_ControlEndpointSize = pgm_read_byte(&DeviceDescriptorPtr->Endpoint0Size);
-		#endif
-	}
-	#endif
-	#endif
-
-	#if (defined(USB_SERIES_4_AVR) || defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR))
-	if (USB_Options & USB_DEVICE_OPT_LOWSPEED)
-	  USB_Device_SetLowSpeed();
-	else
-	  USB_Device_SetFullSpeed();
-
-	USB_INT_Enable(USB_INT_VBUSTI);
-	#endif
-
-	Endpoint_ConfigureEndpoint(ENDPOINT_CONTROLEP, EP_TYPE_CONTROL,
-							   USB_Device_ControlEndpointSize, 1);
-
-	USB_INT_Clear(USB_INT_SUSPI);
-	USB_INT_Enable(USB_INT_SUSPI);
-	USB_INT_Enable(USB_INT_EORSTI);
-
-	USB_Attach();
-}
-#endif
-
-#if defined(USB_CAN_BE_HOST)
-static void USB_Init_Host(void)
-{
-	USB_HostState                = HOST_STATE_Unattached;
-	USB_Host_ConfigurationNumber = 0;
-	USB_Host_ControlPipeSize     = PIPE_CONTROLPIPE_DEFAULT_SIZE;
-
-	USB_Host_HostMode_On();
-
-	USB_Host_VBUS_Auto_Off();
-	USB_Host_VBUS_Manual_Enable();
-	USB_Host_VBUS_Manual_On();
-
-	USB_INT_Enable(USB_INT_SRPI);
-	USB_INT_Enable(USB_INT_BCERRI);
-
-	USB_Attach();
-}
-#endif
-
-#endif
diff --git a/NativePrograms/LUFA/Drivers/USB/Core/AVR8/USBController_AVR8.h b/NativePrograms/LUFA/Drivers/USB/Core/AVR8/USBController_AVR8.h
deleted file mode 100644
index 45af69a184..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Core/AVR8/USBController_AVR8.h
+++ /dev/null
@@ -1,432 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief USB Controller definitions for the AVR8 microcontrollers.
- *  \copydetails Group_USBManagement_AVR8
- *
- *  \note This file should not be included directly. It is automatically included as needed by the USB driver
- *        dispatch header located in LUFA/Drivers/USB/USB.h.
- */
-
-/** \ingroup Group_USBManagement
- *  \defgroup Group_USBManagement_AVR8 USB Interface Management (AVR8)
- *  \brief USB Controller definitions for the AVR8 microcontrollers.
- *
- *  Functions, macros, variables, enums and types related to the setup and management of the USB interface.
- *
- *  @{
- */
-
-#ifndef __USBCONTROLLER_AVR8_H__
-#define __USBCONTROLLER_AVR8_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-		#include "../USBMode.h"
-		#include "../Events.h"
-		#include "../USBTask.h"
-		#include "../USBInterrupt.h"
-
-		#if defined(USB_CAN_BE_HOST) || defined(__DOXYGEN__)
-			#include "../Host.h"
-			#include "../OTG.h"
-			#include "../Pipe.h"
-			#include "../HostStandardReq.h"
-			#include "../PipeStream.h"
-		#endif
-
-		#if defined(USB_CAN_BE_DEVICE) || defined(__DOXYGEN__)
-			#include "../Device.h"
-			#include "../Endpoint.h"
-			#include "../DeviceStandardReq.h"
-			#include "../EndpointStream.h"
-		#endif
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks and Defines: */
-		#if !defined(__INCLUDE_FROM_USB_DRIVER)
-			#error Do not include this file directly. Include LUFA/Drivers/USB/USB.h instead.
-		#endif
-
-		#if !defined(F_USB)
-			#error F_USB is not defined. You must define F_USB to the frequency of the unprescaled USB controller clock in your project makefile.
-		#endif
-
-		#if (F_USB == 8000000)
-			#if (defined(__AVR_AT90USB82__) || defined(__AVR_AT90USB162__) || \
-			     defined(__AVR_ATmega8U2__) || defined(__AVR_ATmega16U2__) || \
-			     defined(__AVR_ATmega32U2__))
-				#define USB_PLL_PSC                0
-			#elif (defined(__AVR_ATmega16U4__) || defined(__AVR_ATmega32U4__))
-				#define USB_PLL_PSC                0
-			#elif (defined(__AVR_AT90USB646__)  || defined(__AVR_AT90USB1286__))
-				#define USB_PLL_PSC                ((1 << PLLP1) | (1 << PLLP0))
-			#elif (defined(__AVR_AT90USB647__)  || defined(__AVR_AT90USB1287__))
-				#define USB_PLL_PSC                ((1 << PLLP1) | (1 << PLLP0))
-			#endif
-		#elif (F_USB == 16000000)
-			#if (defined(__AVR_AT90USB82__) || defined(__AVR_AT90USB162__) || \
-			     defined(__AVR_ATmega8U2__) || defined(__AVR_ATmega16U2__) || \
-			     defined(__AVR_ATmega32U2__))
-				#define USB_PLL_PSC                (1 << PLLP0)
-			#elif (defined(__AVR_ATmega16U4__) || defined(__AVR_ATmega32U4__))
-				#define USB_PLL_PSC                (1 << PINDIV)
-			#elif (defined(__AVR_AT90USB646__) || defined(__AVR_AT90USB647__))
-				#define USB_PLL_PSC                ((1 << PLLP2) | (1 << PLLP1))
-			#elif (defined(__AVR_AT90USB1286__) || defined(__AVR_AT90USB1287__))
-				#define USB_PLL_PSC                ((1 << PLLP2) | (1 << PLLP0))
-			#endif
-		#endif
-
-		#if !defined(USB_PLL_PSC)
-			#error No PLL prescale value available for chosen F_USB value and AVR model.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** \name USB Controller Option Masks */
-			/**@{*/
-			/** Regulator disable option mask for \ref USB_Init(). This indicates that the internal 3.3V USB data pad
-			 *  regulator should be disabled and the AVR's VCC level used for the data pads.
-			 *
-			 *  \note See USB AVR data sheet for more information on the internal pad regulator.
-			 */
-			#define USB_OPT_REG_DISABLED               (1 << 1)
-
-			/** Regulator enable option mask for \ref USB_Init(). This indicates that the internal 3.3V USB data pad
-			 *  regulator should be enabled to regulate the data pin voltages from the VBUS level down to a level within
-			 *  the range allowable by the USB standard.
-			 *
-			 *  \note See USB AVR data sheet for more information on the internal pad regulator.
-			 */
-			#define USB_OPT_REG_ENABLED                (0 << 1)
-
-			/** Option mask for \ref USB_Init() to keep regulator enabled at all times. Indicates that \ref USB_Disable()
-			 *  should not disable the regulator as it would otherwise. Has no effect if regulator is disabled using
-			 *  \ref USB_OPT_REG_DISABLED.
-			 *
-			 *  \note See USB AVR data sheet for more information on the internal pad regulator.
-			 */
-			#define USB_OPT_REG_KEEP_ENABLED           (1 << 3)
-
-			/** Manual PLL control option mask for \ref USB_Init(). This indicates to the library that the user application
-			 *  will take full responsibility for controlling the AVR's PLL (used to generate the high frequency clock
-			 *  that the USB controller requires) and ensuring that it is locked at the correct frequency for USB operations.
-			 */
-			#define USB_OPT_MANUAL_PLL                 (1 << 2)
-
-			/** Automatic PLL control option mask for \ref USB_Init(). This indicates to the library that the library should
-			 *  take full responsibility for controlling the AVR's PLL (used to generate the high frequency clock
-			 *  that the USB controller requires) and ensuring that it is locked at the correct frequency for USB operations.
-			 */
-			#define USB_OPT_AUTO_PLL                   (0 << 2)
-			/**@}*/
-
-			#if !defined(USB_STREAM_TIMEOUT_MS) || defined(__DOXYGEN__)
-				/** Constant for the maximum software timeout period of the USB data stream transfer functions
-				 *  (both control and standard) when in either device or host mode. If the next packet of a stream
-				 *  is not received or acknowledged within this time period, the stream function will fail.
-				 *
-				 *  This value may be overridden in the user project makefile as the value of the
-				 *  \ref USB_STREAM_TIMEOUT_MS token, and passed to the compiler using the -D switch.
-				 */
-				#define USB_STREAM_TIMEOUT_MS       100
-			#endif
-
-		/* Inline Functions: */
-			#if defined(USB_SERIES_4_AVR) || defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR) || defined(__DOXYGEN__)
-				/** Determines if the VBUS line is currently high (i.e. the USB host is supplying power).
-				 *
-				 *  \note This function is not available on some AVR models which do not support hardware VBUS monitoring.
-				 *
-				 *  \return Boolean \c true if the VBUS line is currently detecting power from a host, \c false otherwise.
-				 */
-				static inline bool USB_VBUS_GetStatus(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-				static inline bool USB_VBUS_GetStatus(void)
-				{
-					return ((USBSTA & (1 << VBUS)) ? true : false);
-				}
-			#endif
-
-			/** Detaches the device from the USB bus. This has the effect of removing the device from any
-			 *  attached host, ceasing USB communications. If no host is present, this prevents any host from
-			 *  enumerating the device once attached until \ref USB_Attach() is called.
-			 */
-			static inline void USB_Detach(void) ATTR_ALWAYS_INLINE;
-			static inline void USB_Detach(void)
-			{
-				UDCON  |=  (1 << DETACH);
-			}
-
-			/** Attaches the device to the USB bus. This announces the device's presence to any attached
-			 *  USB host, starting the enumeration process. If no host is present, attaching the device
-			 *  will allow for enumeration once a host is connected to the device.
-			 *
-			 *  This is inexplicably also required for proper operation while in host mode, to enable the
-			 *  attachment of a device to the host. This is despite the bit being located in the device-mode
-			 *  register and despite the datasheet making no mention of its requirement in host mode.
-			 */
-			static inline void USB_Attach(void) ATTR_ALWAYS_INLINE;
-			static inline void USB_Attach(void)
-			{
-				UDCON  &= ~(1 << DETACH);
-			}
-
-		/* Function Prototypes: */
-			/** Main function to initialize and start the USB interface. Once active, the USB interface will
-			 *  allow for device connection to a host when in device mode, or for device enumeration while in
-			 *  host mode.
-			 *
-			 *  As the USB library relies on interrupts for the device and host mode enumeration processes,
-			 *  the user must enable global interrupts before or shortly after this function is called. In
-			 *  device mode, interrupts must be enabled within 500ms of this function being called to ensure
-			 *  that the host does not time out whilst enumerating the device. In host mode, interrupts may be
-			 *  enabled at the application's leisure however enumeration will not begin of an attached device
-			 *  until after this has occurred.
-			 *
-			 *  Calling this function when the USB interface is already initialized will cause a complete USB
-			 *  interface reset and re-enumeration.
-			 *
-			 *  \param[in] Mode     Mask indicating what mode the USB interface is to be initialized to, a value
-			 *                      from the \ref USB_Modes_t enum.
-			 *                      \note This parameter does not exist on devices with only one supported USB
-			 *                            mode (device or host).
-			 *
-			 *  \param[in] Options  Mask indicating the options which should be used when initializing the USB
-			 *                      interface to control the USB interface's behavior. This should be comprised of
-			 *                      a \c USB_OPT_REG_* mask to control the regulator, a \c USB_OPT_*_PLL mask to control the
-			 *                      PLL, and a \c USB_DEVICE_OPT_* mask (when the device mode is enabled) to set the device
-			 *                      mode speed.
-			 *
-			 *  \note To reduce the FLASH requirements of the library if only device or host mode is required,
-			 *        the mode can be statically set in the project makefile by defining the token \c USB_DEVICE_ONLY
-			 *        (for device mode) or \c USB_HOST_ONLY (for host mode), passing the token to the compiler
-			 *        via the -D switch. If the mode is statically set, this parameter does not exist in the
-			 *        function prototype.
-			 *        \n\n
-			 *
-			 *  \note To reduce the FLASH requirements of the library if only fixed settings are required,
-			 *        the options may be set statically in the same manner as the mode (see the Mode parameter of
-			 *        this function). To statically set the USB options, pass in the \c USE_STATIC_OPTIONS token,
-			 *        defined to the appropriate options masks. When the options are statically set, this
-			 *        parameter does not exist in the function prototype.
-			 *        \n\n
-			 *
-			 *  \note The mode parameter does not exist on devices where only one mode is possible, such as USB
-			 *        AVR models which only implement the USB device mode in hardware.
-			 *
-			 *  \see \ref Group_Device for the \c USB_DEVICE_OPT_* masks.
-			 */
-			void USB_Init(
-			               #if defined(USB_CAN_BE_BOTH) || defined(__DOXYGEN__)
-			               const uint8_t Mode
-			               #endif
-
-			               #if (defined(USB_CAN_BE_BOTH) && !defined(USE_STATIC_OPTIONS)) || defined(__DOXYGEN__)
-			               ,
-			               #elif (!defined(USB_CAN_BE_BOTH) && defined(USE_STATIC_OPTIONS))
-			               void
-			               #endif
-
-			               #if !defined(USE_STATIC_OPTIONS) || defined(__DOXYGEN__)
-			               const uint8_t Options
-			               #endif
-			               );
-
-			/** Shuts down the USB interface. This turns off the USB interface after deallocating all USB FIFO
-			 *  memory, endpoints and pipes. When turned off, no USB functionality can be used until the interface
-			 *  is restarted with the \ref USB_Init() function.
-			 */
-			void USB_Disable(void);
-
-			/** Resets the interface, when already initialized. This will re-enumerate the device if already connected
-			 *  to a host, or re-enumerate an already attached device when in host mode.
-			 */
-			void USB_ResetInterface(void);
-
-		/* Global Variables: */
-			#if defined(USB_CAN_BE_BOTH) || defined(__DOXYGEN__)
-				/** Indicates the mode that the USB interface is currently initialized to, a value from the
-				 *  \ref USB_Modes_t enum.
-				 *
-				 *  \attention This variable should be treated as read-only in the user application, and never manually
-				 *             changed in value.
-				 *
-				 *  \note When the controller is initialized into UID auto-detection mode, this variable will hold the
-				 *        currently selected USB mode (i.e. \ref USB_MODE_Device or \ref USB_MODE_Host). If the controller
-				 *        is fixed into a specific mode (either through the \c USB_DEVICE_ONLY or \c USB_HOST_ONLY compile time
-				 *        options, or a limitation of the USB controller in the chosen device model) this will evaluate to
-				 *        a constant of the appropriate value and will never evaluate to \ref USB_MODE_None even when the
-				 *        USB interface is not initialized.
-				 */
-				extern volatile uint8_t USB_CurrentMode;
-			#elif defined(USB_CAN_BE_HOST)
-				#define USB_CurrentMode USB_MODE_Host
-			#elif defined(USB_CAN_BE_DEVICE)
-				#define USB_CurrentMode USB_MODE_Device
-			#endif
-
-			#if !defined(USE_STATIC_OPTIONS) || defined(__DOXYGEN__)
-				/** Indicates the current USB options that the USB interface was initialized with when \ref USB_Init()
-				 *  was called. This value will be one of the \c USB_MODE_* masks defined elsewhere in this module.
-				 *
-				 *  \attention This variable should be treated as read-only in the user application, and never manually
-				 *             changed in value.
-				 */
-				extern volatile uint8_t USB_Options;
-			#elif defined(USE_STATIC_OPTIONS)
-				#define USB_Options USE_STATIC_OPTIONS
-			#endif
-
-	/* Private Interface - For use in library only: */
-	#if !defined(__DOXYGEN__)
-		/* Function Prototypes: */
-			#if defined(__INCLUDE_FROM_USB_CONTROLLER_C)
-				#if defined(USB_CAN_BE_DEVICE)
-				static void USB_Init_Device(void);
-				#endif
-
-				#if defined(USB_CAN_BE_HOST)
-				static void USB_Init_Host(void);
-				#endif
-			#endif
-
-		/* Inline Functions: */
-			static inline void USB_PLL_On(void) ATTR_ALWAYS_INLINE;
-			static inline void USB_PLL_On(void)
-			{
-				PLLCSR = USB_PLL_PSC;
-				PLLCSR = (USB_PLL_PSC | (1 << PLLE));
-			}
-
-			static inline void USB_PLL_Off(void) ATTR_ALWAYS_INLINE;
-			static inline void USB_PLL_Off(void)
-			{
-				PLLCSR = 0;
-			}
-
-			static inline bool USB_PLL_IsReady(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline bool USB_PLL_IsReady(void)
-			{
-				return ((PLLCSR & (1 << PLOCK)) ? true : false);
-			}
-
-			static inline void USB_REG_On(void) ATTR_ALWAYS_INLINE;
-			static inline void USB_REG_On(void)
-			{
-			#if defined(USB_SERIES_4_AVR) || defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR)
-				UHWCON |=  (1 << UVREGE);
-			#else
-				REGCR  &= ~(1 << REGDIS);
-			#endif
-			}
-
-			static inline void USB_REG_Off(void) ATTR_ALWAYS_INLINE;
-			static inline void USB_REG_Off(void)
-			{
-			#if defined(USB_SERIES_4_AVR) || defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR)
-				UHWCON &= ~(1 << UVREGE);
-			#else
-				REGCR  |=  (1 << REGDIS);
-			#endif
-			}
-
-			#if defined(USB_SERIES_4_AVR) || defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR)
-			static inline void USB_OTGPAD_On(void) ATTR_ALWAYS_INLINE;
-			static inline void USB_OTGPAD_On(void)
-			{
-				USBCON |=  (1 << OTGPADE);
-			}
-
-			static inline void USB_OTGPAD_Off(void) ATTR_ALWAYS_INLINE;
-			static inline void USB_OTGPAD_Off(void)
-			{
-				USBCON &= ~(1 << OTGPADE);
-			}
-			#endif
-
-			static inline void USB_CLK_Freeze(void) ATTR_ALWAYS_INLINE;
-			static inline void USB_CLK_Freeze(void)
-			{
-				USBCON |=  (1 << FRZCLK);
-			}
-
-			static inline void USB_CLK_Unfreeze(void) ATTR_ALWAYS_INLINE;
-			static inline void USB_CLK_Unfreeze(void)
-			{
-				USBCON &= ~(1 << FRZCLK);
-			}
-
-			static inline void USB_Controller_Enable(void) ATTR_ALWAYS_INLINE;
-			static inline void USB_Controller_Enable(void)
-			{
-				USBCON |=  (1 << USBE);
-			}
-
-			static inline void USB_Controller_Disable(void) ATTR_ALWAYS_INLINE;
-			static inline void USB_Controller_Disable(void)
-			{
-				USBCON &= ~(1 << USBE);
-			}
-
-			static inline void USB_Controller_Reset(void) ATTR_ALWAYS_INLINE;
-			static inline void USB_Controller_Reset(void)
-			{
-				USBCON &= ~(1 << USBE);
-				USBCON |=  (1 << USBE);
-			}
-
-			#if defined(USB_CAN_BE_BOTH)
-			static inline uint8_t USB_GetUSBModeFromUID(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline uint8_t USB_GetUSBModeFromUID(void)
-			{
-				if (USBSTA & (1 << ID))
-				  return USB_MODE_Device;
-				else
-				  return USB_MODE_Host;
-			}
-			#endif
-
-	#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Core/AVR8/USBInterrupt_AVR8.c b/NativePrograms/LUFA/Drivers/USB/Core/AVR8/USBInterrupt_AVR8.c
deleted file mode 100644
index e67dbb6819..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Core/AVR8/USBInterrupt_AVR8.c
+++ /dev/null
@@ -1,279 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-#include "../../../../Common/Common.h"
-#if (ARCH == ARCH_AVR8)
-
-#define  __INCLUDE_FROM_USB_DRIVER
-#include "../USBInterrupt.h"
-
-void USB_INT_DisableAllInterrupts(void)
-{
-	#if defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR)
-	USBCON &= ~((1 << VBUSTE) | (1 << IDTE));
-	#elif defined(USB_SERIES_4_AVR)
-	USBCON &= ~(1 << VBUSTE);
-	#endif
-
-	#if defined(USB_CAN_BE_BOTH)
-	OTGIEN  = 0;
-	#endif
-
-	#if defined(USB_CAN_BE_HOST)
-	UHIEN   = 0;
-	#endif
-
-	#if defined(USB_CAN_BE_DEVICE)
-	UDIEN   = 0;
-	#endif
-}
-
-void USB_INT_ClearAllInterrupts(void)
-{
-	#if defined(USB_SERIES_4_AVR) || defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR)
-	USBINT = 0;
-	#endif
-
-	#if defined(USB_CAN_BE_BOTH)
-	OTGINT = 0;
-	#endif
-
-	#if defined(USB_CAN_BE_HOST)
-	UHINT  = 0;
-	#endif
-
-	#if defined(USB_CAN_BE_DEVICE)
-	UDINT  = 0;
-	#endif
-}
-
-ISR(USB_GEN_vect, ISR_BLOCK)
-{
-	#if defined(USB_CAN_BE_DEVICE)
-	#if !defined(NO_SOF_EVENTS)
-	if (USB_INT_HasOccurred(USB_INT_SOFI) && USB_INT_IsEnabled(USB_INT_SOFI))
-	{
-		USB_INT_Clear(USB_INT_SOFI);
-
-		EVENT_USB_Device_StartOfFrame();
-	}
-	#endif
-
-	#if defined(USB_SERIES_4_AVR) || defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR)
-	if (USB_INT_HasOccurred(USB_INT_VBUSTI) && USB_INT_IsEnabled(USB_INT_VBUSTI))
-	{
-		USB_INT_Clear(USB_INT_VBUSTI);
-
-		if (USB_VBUS_GetStatus())
-		{
-			if (!(USB_Options & USB_OPT_MANUAL_PLL))
-			{
-				USB_PLL_On();
-				while (!(USB_PLL_IsReady()));
-			}
-
-			USB_DeviceState = DEVICE_STATE_Powered;
-			EVENT_USB_Device_Connect();
-		}
-		else
-		{
-			if (!(USB_Options & USB_OPT_MANUAL_PLL))
-			  USB_PLL_Off();
-
-			USB_DeviceState = DEVICE_STATE_Unattached;
-			EVENT_USB_Device_Disconnect();
-		}
-	}
-	#endif
-
-	if (USB_INT_HasOccurred(USB_INT_SUSPI) && USB_INT_IsEnabled(USB_INT_SUSPI))
-	{
-		USB_INT_Disable(USB_INT_SUSPI);
-		USB_INT_Enable(USB_INT_WAKEUPI);
-
-		USB_CLK_Freeze();
-
-		if (!(USB_Options & USB_OPT_MANUAL_PLL))
-		  USB_PLL_Off();
-
-		#if defined(USB_SERIES_2_AVR) && !defined(NO_LIMITED_CONTROLLER_CONNECT)
-		USB_DeviceState = DEVICE_STATE_Unattached;
-		EVENT_USB_Device_Disconnect();
-		#else
-		USB_DeviceState = DEVICE_STATE_Suspended;
-		EVENT_USB_Device_Suspend();
-		#endif
-	}
-
-	if (USB_INT_HasOccurred(USB_INT_WAKEUPI) && USB_INT_IsEnabled(USB_INT_WAKEUPI))
-	{
-		if (!(USB_Options & USB_OPT_MANUAL_PLL))
-		{
-			USB_PLL_On();
-			while (!(USB_PLL_IsReady()));
-		}
-
-		USB_CLK_Unfreeze();
-
-		USB_INT_Clear(USB_INT_WAKEUPI);
-
-		USB_INT_Disable(USB_INT_WAKEUPI);
-		USB_INT_Enable(USB_INT_SUSPI);
-
-		if (USB_Device_ConfigurationNumber)
-		  USB_DeviceState = DEVICE_STATE_Configured;
-		else
-		  USB_DeviceState = (USB_Device_IsAddressSet()) ? DEVICE_STATE_Addressed : DEVICE_STATE_Powered;
-
-		#if defined(USB_SERIES_2_AVR) && !defined(NO_LIMITED_CONTROLLER_CONNECT)
-		EVENT_USB_Device_Connect();
-		#else
-		EVENT_USB_Device_WakeUp();
-		#endif
-	}
-
-	if (USB_INT_HasOccurred(USB_INT_EORSTI) && USB_INT_IsEnabled(USB_INT_EORSTI))
-	{
-		USB_INT_Clear(USB_INT_EORSTI);
-
-		USB_DeviceState                = DEVICE_STATE_Default;
-		USB_Device_ConfigurationNumber = 0;
-
-		USB_INT_Clear(USB_INT_SUSPI);
-		USB_INT_Disable(USB_INT_SUSPI);
-		USB_INT_Enable(USB_INT_WAKEUPI);
-
-		Endpoint_ConfigureEndpoint(ENDPOINT_CONTROLEP, EP_TYPE_CONTROL,
-		                           USB_Device_ControlEndpointSize, 1);
-
-		#if defined(INTERRUPT_CONTROL_ENDPOINT)
-		USB_INT_Enable(USB_INT_RXSTPI);
-		#endif
-
-		EVENT_USB_Device_Reset();
-	}
-	#endif
-
-	#if defined(USB_CAN_BE_HOST)
-	#if !defined(NO_SOF_EVENTS)
-	if (USB_INT_HasOccurred(USB_INT_HSOFI) && USB_INT_IsEnabled(USB_INT_HSOFI))
-	{
-		USB_INT_Clear(USB_INT_HSOFI);
-
-		EVENT_USB_Host_StartOfFrame();
-	}
-	#endif
-
-	if (USB_INT_HasOccurred(USB_INT_DDISCI) && USB_INT_IsEnabled(USB_INT_DDISCI))
-	{
-		USB_INT_Clear(USB_INT_DDISCI);
-		USB_INT_Clear(USB_INT_DCONNI);
-		USB_INT_Disable(USB_INT_DDISCI);
-
-		EVENT_USB_Host_DeviceUnattached();
-
-		USB_ResetInterface();
-	}
-
-	if (USB_INT_HasOccurred(USB_INT_VBERRI) && USB_INT_IsEnabled(USB_INT_VBERRI))
-	{
-		USB_INT_Clear(USB_INT_VBERRI);
-
-		USB_Host_VBUS_Manual_Off();
-		USB_Host_VBUS_Auto_Off();
-
-		EVENT_USB_Host_HostError(HOST_ERROR_VBusVoltageDip);
-		EVENT_USB_Host_DeviceUnattached();
-
-		USB_HostState = HOST_STATE_Unattached;
-	}
-
-	if (USB_INT_HasOccurred(USB_INT_SRPI) && USB_INT_IsEnabled(USB_INT_SRPI))
-	{
-		USB_INT_Clear(USB_INT_SRPI);
-		USB_INT_Disable(USB_INT_SRPI);
-
-		EVENT_USB_Host_DeviceAttached();
-
-		USB_INT_Enable(USB_INT_DDISCI);
-
-		USB_HostState = HOST_STATE_Powered;
-	}
-
-	if (USB_INT_HasOccurred(USB_INT_BCERRI) && USB_INT_IsEnabled(USB_INT_BCERRI))
-	{
-		USB_INT_Clear(USB_INT_BCERRI);
-
-		EVENT_USB_Host_DeviceEnumerationFailed(HOST_ENUMERROR_NoDeviceDetected, 0);
-		EVENT_USB_Host_DeviceUnattached();
-
-		USB_ResetInterface();
-	}
-	#endif
-
-	#if defined(USB_CAN_BE_BOTH)
-	if (USB_INT_HasOccurred(USB_INT_IDTI) && USB_INT_IsEnabled(USB_INT_IDTI))
-	{
-		USB_INT_Clear(USB_INT_IDTI);
-
-		if (USB_DeviceState != DEVICE_STATE_Unattached)
-		  EVENT_USB_Device_Disconnect();
-
-		if (USB_HostState != HOST_STATE_Unattached)
-		  EVENT_USB_Host_DeviceUnattached();
-
-		USB_CurrentMode = USB_GetUSBModeFromUID();
-		USB_ResetInterface();
-
-		EVENT_USB_UIDChange();
-	}
-	#endif
-}
-
-#if defined(INTERRUPT_CONTROL_ENDPOINT) && defined(USB_CAN_BE_DEVICE)
-ISR(USB_COM_vect, ISR_BLOCK)
-{
-	uint8_t PrevSelectedEndpoint = Endpoint_GetCurrentEndpoint();
-
-	Endpoint_SelectEndpoint(ENDPOINT_CONTROLEP);
-	USB_INT_Disable(USB_INT_RXSTPI);
-
-	GlobalInterruptEnable();
-
-	USB_Device_ProcessControlRequest();
-
-	Endpoint_SelectEndpoint(ENDPOINT_CONTROLEP);
-	USB_INT_Enable(USB_INT_RXSTPI);
-	Endpoint_SelectEndpoint(PrevSelectedEndpoint);
-}
-#endif
-
-#endif
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Core/AVR8/USBInterrupt_AVR8.h b/NativePrograms/LUFA/Drivers/USB/Core/AVR8/USBInterrupt_AVR8.h
deleted file mode 100644
index 7350dcba62..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Core/AVR8/USBInterrupt_AVR8.h
+++ /dev/null
@@ -1,375 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief USB Controller Interrupt definitions for the AVR8 microcontrollers.
- *
- *  This file contains definitions required for the correct handling of low level USB service routine interrupts
- *  from the USB controller.
- *
- *  \note This file should not be included directly. It is automatically included as needed by the USB driver
- *        dispatch header located in LUFA/Drivers/USB/USB.h.
- */
-
-#ifndef __USBINTERRUPT_AVR8_H__
-#define __USBINTERRUPT_AVR8_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_USB_DRIVER)
-			#error Do not include this file directly. Include LUFA/Drivers/USB/USB.h instead.
-		#endif
-
-	/* Private Interface - For use in library only: */
-	#if !defined(__DOXYGEN__)
-		/* Enums: */
-			enum USB_Interrupts_t
-			{
-				#if (defined(USB_SERIES_4_AVR) || defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR) || defined(__DOXYGEN__))
-				USB_INT_VBUSTI  = 0,
-				#endif
-				#if (defined(USB_CAN_BE_BOTH) || defined(__DOXYGEN__))
-				USB_INT_IDTI    = 1,
-				#endif
-				#if (defined(USB_CAN_BE_DEVICE) || defined(__DOXYGEN__))
-				USB_INT_WAKEUPI = 2,
-				USB_INT_SUSPI   = 3,
-				USB_INT_EORSTI  = 4,
-				USB_INT_SOFI    = 5,
-				USB_INT_RXSTPI  = 6,
-				#endif
-				#if (defined(USB_CAN_BE_HOST) || defined(__DOXYGEN__))
-				USB_INT_HSOFI   = 7,
-				USB_INT_DCONNI  = 8,
-				USB_INT_DDISCI  = 9,
-				USB_INT_RSTI    = 10,
-				USB_INT_BCERRI  = 11,
-				USB_INT_VBERRI  = 12,
-				USB_INT_SRPI    = 13,
-				#endif
-			};
-
-		/* Inline Functions: */
-			static inline void USB_INT_Enable(const uint8_t Interrupt) ATTR_ALWAYS_INLINE;
-			static inline void USB_INT_Enable(const uint8_t Interrupt)
-			{
-				switch (Interrupt)
-				{
-					#if (defined(USB_SERIES_4_AVR) || defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR))
-					case USB_INT_VBUSTI:
-						USBCON |= (1 << VBUSTE);
-						break;
-					#endif
-					#if defined(USB_CAN_BE_BOTH)
-					case USB_INT_IDTI:
-						USBCON |= (1 << IDTE);
-						break;
-					#endif
-					#if defined(USB_CAN_BE_DEVICE)
-					case USB_INT_WAKEUPI:
-						UDIEN  |= (1 << WAKEUPE);
-						break;
-					case USB_INT_SUSPI:
-						UDIEN  |= (1 << SUSPE);
-						break;
-					case USB_INT_EORSTI:
-						UDIEN  |= (1 << EORSTE);
-						break;
-					case USB_INT_SOFI:
-						UDIEN  |= (1 << SOFE);
-						break;
-					case USB_INT_RXSTPI:
-						UEIENX |= (1 << RXSTPE);
-						break;
-					#endif
-					#if defined(USB_CAN_BE_HOST)
-					case USB_INT_HSOFI:
-						UHIEN  |= (1 << HSOFE);
-						break;
-					case USB_INT_DCONNI:
-						UHIEN  |= (1 << DCONNE);
-						break;
-					case USB_INT_DDISCI:
-						UHIEN  |= (1 << DDISCE);
-						break;
-					case USB_INT_RSTI:
-						UHIEN  |= (1 << RSTE);
-						break;
-					case USB_INT_BCERRI:
-						OTGIEN |= (1 << BCERRE);
-						break;
-					case USB_INT_VBERRI:
-						OTGIEN |= (1 << VBERRE);
-						break;
-					case USB_INT_SRPI:
-						OTGIEN |= (1 << SRPE);
-						break;
-					#endif
-					default:
-						break;
-				}
-			}
-
-			static inline void USB_INT_Disable(const uint8_t Interrupt) ATTR_ALWAYS_INLINE;
-			static inline void USB_INT_Disable(const uint8_t Interrupt)
-			{
-				switch (Interrupt)
-				{
-					#if (defined(USB_SERIES_4_AVR) || defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR))
-					case USB_INT_VBUSTI:
-						USBCON &= ~(1 << VBUSTE);
-						break;
-					#endif
-					#if defined(USB_CAN_BE_BOTH)
-					case USB_INT_IDTI:
-						USBCON &= ~(1 << IDTE);
-						break;
-					#endif
-					#if defined(USB_CAN_BE_DEVICE)
-					case USB_INT_WAKEUPI:
-						UDIEN  &= ~(1 << WAKEUPE);
-						break;
-					case USB_INT_SUSPI:
-						UDIEN  &= ~(1 << SUSPE);
-						break;
-					case USB_INT_EORSTI:
-						UDIEN  &= ~(1 << EORSTE);
-						break;
-					case USB_INT_SOFI:
-						UDIEN  &= ~(1 << SOFE);
-						break;
-					case USB_INT_RXSTPI:
-						UEIENX &= ~(1 << RXSTPE);
-						break;
-					#endif
-					#if defined(USB_CAN_BE_HOST)
-					case USB_INT_HSOFI:
-						UHIEN  &= ~(1 << HSOFE);
-						break;
-					case USB_INT_DCONNI:
-						UHIEN  &= ~(1 << DCONNE);
-						break;
-					case USB_INT_DDISCI:
-						UHIEN  &= ~(1 << DDISCE);
-						break;
-					case USB_INT_RSTI:
-						UHIEN  &= ~(1 << RSTE);
-						break;
-					case USB_INT_BCERRI:
-						OTGIEN &= ~(1 << BCERRE);
-						break;
-					case USB_INT_VBERRI:
-						OTGIEN &= ~(1 << VBERRE);
-						break;
-					case USB_INT_SRPI:
-						OTGIEN &= ~(1 << SRPE);
-						break;
-					#endif
-					default:
-						break;
-				}
-			}
-
-			static inline void USB_INT_Clear(const uint8_t Interrupt) ATTR_ALWAYS_INLINE;
-			static inline void USB_INT_Clear(const uint8_t Interrupt)
-			{
-				switch (Interrupt)
-				{
-					#if (defined(USB_SERIES_4_AVR) || defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR))
-					case USB_INT_VBUSTI:
-						USBINT &= ~(1 << VBUSTI);
-						break;
-					#endif
-					#if defined(USB_CAN_BE_BOTH)
-					case USB_INT_IDTI:
-						USBINT &= ~(1 << IDTI);
-						break;
-					#endif
-					#if defined(USB_CAN_BE_DEVICE)
-					case USB_INT_WAKEUPI:
-						UDINT  &= ~(1 << WAKEUPI);
-						break;
-					case USB_INT_SUSPI:
-						UDINT  &= ~(1 << SUSPI);
-						break;
-					case USB_INT_EORSTI:
-						UDINT  &= ~(1 << EORSTI);
-						break;
-					case USB_INT_SOFI:
-						UDINT  &= ~(1 << SOFI);
-						break;
-					case USB_INT_RXSTPI:
-						UEINTX &= ~(1 << RXSTPI);
-						break;
-					#endif
-					#if defined(USB_CAN_BE_HOST)
-					case USB_INT_HSOFI:
-						UHINT  &= ~(1 << HSOFI);
-						break;
-					case USB_INT_DCONNI:
-						UHINT  &= ~(1 << DCONNI);
-						break;
-					case USB_INT_DDISCI:
-						UHINT  &= ~(1 << DDISCI);
-						break;
-					case USB_INT_RSTI:
-						UHINT  &= ~(1 << RSTI);
-						break;
-					case USB_INT_BCERRI:
-						OTGINT &= ~(1 << BCERRI);
-						break;
-					case USB_INT_VBERRI:
-						OTGINT &= ~(1 << VBERRI);
-						break;
-					case USB_INT_SRPI:
-						OTGINT &= ~(1 << SRPI);
-						break;
-					#endif
-					default:
-						break;
-				}
-			}
-
-			static inline bool USB_INT_IsEnabled(const uint8_t Interrupt) ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT;
-			static inline bool USB_INT_IsEnabled(const uint8_t Interrupt)
-			{
-				switch (Interrupt)
-				{
-					#if (defined(USB_SERIES_4_AVR) || defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR))
-					case USB_INT_VBUSTI:
-						return (USBCON & (1 << VBUSTE));
-					#endif
-					#if defined(USB_CAN_BE_BOTH)
-					case USB_INT_IDTI:
-						return (USBCON & (1 << IDTE));
-					#endif
-					#if defined(USB_CAN_BE_DEVICE)
-					case USB_INT_WAKEUPI:
-						return (UDIEN  & (1 << WAKEUPE));
-					case USB_INT_SUSPI:
-						return (UDIEN  & (1 << SUSPE));
-					case USB_INT_EORSTI:
-						return (UDIEN  & (1 << EORSTE));
-					case USB_INT_SOFI:
-						return (UDIEN  & (1 << SOFE));
-					case USB_INT_RXSTPI:
-						return (UEIENX & (1 << RXSTPE));
-					#endif
-					#if defined(USB_CAN_BE_HOST)
-					case USB_INT_HSOFI:
-						return (UHIEN  & (1 << HSOFE));
-					case USB_INT_DCONNI:
-						return (UHIEN  & (1 << DCONNE));
-					case USB_INT_DDISCI:
-						return (UHIEN  & (1 << DDISCE));
-					case USB_INT_RSTI:
-						return (UHIEN  & (1 << RSTE));
-					case USB_INT_BCERRI:
-						return (OTGIEN & (1 << BCERRE));
-					case USB_INT_VBERRI:
-						return (OTGIEN & (1 << VBERRE));
-					case USB_INT_SRPI:
-						return (OTGIEN & (1 << SRPE));
-					#endif
-					default:
-						return false;
-				}
-			}
-
-			static inline bool USB_INT_HasOccurred(const uint8_t Interrupt) ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT;
-			static inline bool USB_INT_HasOccurred(const uint8_t Interrupt)
-			{
-				switch (Interrupt)
-				{
-					#if (defined(USB_SERIES_4_AVR) || defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR))
-					case USB_INT_VBUSTI:
-						return (USBINT & (1 << VBUSTI));
-					#endif
-					#if defined(USB_CAN_BE_BOTH)
-					case USB_INT_IDTI:
-						return (USBINT & (1 << IDTI));
-					#endif
-					#if defined(USB_CAN_BE_DEVICE)
-					case USB_INT_WAKEUPI:
-						return (UDINT  & (1 << WAKEUPI));
-					case USB_INT_SUSPI:
-						return (UDINT  & (1 << SUSPI));
-					case USB_INT_EORSTI:
-						return (UDINT  & (1 << EORSTI));
-					case USB_INT_SOFI:
-						return (UDINT  & (1 << SOFI));
-					case USB_INT_RXSTPI:
-						return (UEINTX & (1 << RXSTPI));
-					#endif
-					#if defined(USB_CAN_BE_HOST)
-					case USB_INT_HSOFI:
-						return (UHINT  & (1 << HSOFI));
-					case USB_INT_DCONNI:
-						return (UHINT  & (1 << DCONNI));
-					case USB_INT_DDISCI:
-						return (UHINT  & (1 << DDISCI));
-					case USB_INT_RSTI:
-						return (UHINT  & (1 << RSTI));
-					case USB_INT_BCERRI:
-						return (OTGINT & (1 << BCERRI));
-					case USB_INT_VBERRI:
-						return (OTGINT & (1 << VBERRI));
-					case USB_INT_SRPI:
-						return (OTGINT & (1 << SRPI));
-					#endif
-					default:
-						return false;
-				}
-			}
-
-		/* Includes: */
-			#include "../USBMode.h"
-			#include "../Events.h"
-			#include "../USBController.h"
-
-		/* Function Prototypes: */
-			void USB_INT_ClearAllInterrupts(void);
-			void USB_INT_DisableAllInterrupts(void);
-	#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Core/ConfigDescriptors.c b/NativePrograms/LUFA/Drivers/USB/Core/ConfigDescriptors.c
deleted file mode 100644
index 2cfa4bc5f0..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Core/ConfigDescriptors.c
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-#define  __INCLUDE_FROM_USB_DRIVER
-#include "ConfigDescriptors.h"
-
-#if defined(USB_CAN_BE_HOST)
-uint8_t USB_Host_GetDeviceConfigDescriptor(const uint8_t ConfigNumber,
-                                           uint16_t* const ConfigSizePtr,
-                                           void* const BufferPtr,
-                                           const uint16_t BufferSize)
-{
-	uint8_t ErrorCode;
-	uint8_t ConfigHeader[sizeof(USB_Descriptor_Configuration_Header_t)];
-
-	USB_ControlRequest = (USB_Request_Header_t)
-		{
-			.bmRequestType = (REQDIR_DEVICETOHOST | REQTYPE_STANDARD | REQREC_DEVICE),
-			.bRequest      = REQ_GetDescriptor,
-			.wValue        = ((DTYPE_Configuration << 8) | (ConfigNumber - 1)),
-			.wIndex        = 0,
-			.wLength       = sizeof(USB_Descriptor_Configuration_Header_t),
-		};
-
-	Pipe_SelectPipe(PIPE_CONTROLPIPE);
-
-	if ((ErrorCode = USB_Host_SendControlRequest(ConfigHeader)) != HOST_SENDCONTROL_Successful)
-	  return ErrorCode;
-
-	*ConfigSizePtr = le16_to_cpu(DESCRIPTOR_PCAST(ConfigHeader, USB_Descriptor_Configuration_Header_t)->TotalConfigurationSize);
-
-	if (*ConfigSizePtr > BufferSize)
-	  return HOST_GETCONFIG_BuffOverflow;
-
-	USB_ControlRequest.wLength = *ConfigSizePtr;
-
-	if ((ErrorCode = USB_Host_SendControlRequest(BufferPtr)) != HOST_SENDCONTROL_Successful)
-	  return ErrorCode;
-
-	if (DESCRIPTOR_TYPE(BufferPtr) != DTYPE_Configuration)
-	  return HOST_GETCONFIG_InvalidData;
-
-	return HOST_GETCONFIG_Successful;
-}
-#endif
-
-void USB_GetNextDescriptorOfType(uint16_t* const BytesRem,
-                                 void** const CurrConfigLoc,
-                                 const uint8_t Type)
-{
-	while (*BytesRem)
-	{
-		USB_GetNextDescriptor(BytesRem, CurrConfigLoc);
-
-		if (DESCRIPTOR_TYPE(*CurrConfigLoc) == Type)
-		  return;
-	}
-}
-
-void USB_GetNextDescriptorOfTypeBefore(uint16_t* const BytesRem,
-                                       void** const CurrConfigLoc,
-                                       const uint8_t Type,
-                                       const uint8_t BeforeType)
-{
-	while (*BytesRem)
-	{
-		USB_GetNextDescriptor(BytesRem, CurrConfigLoc);
-
-		if (DESCRIPTOR_TYPE(*CurrConfigLoc) == Type)
-		{
-			return;
-		}
-		else if (DESCRIPTOR_TYPE(*CurrConfigLoc) == BeforeType)
-		{
-			*BytesRem = 0;
-			return;
-		}
-	}
-}
-
-void USB_GetNextDescriptorOfTypeAfter(uint16_t* const BytesRem,
-                                      void** const CurrConfigLoc,
-                                      const uint8_t Type,
-                                      const uint8_t AfterType)
-{
-	USB_GetNextDescriptorOfType(BytesRem, CurrConfigLoc, AfterType);
-
-	if (*BytesRem)
-	  USB_GetNextDescriptorOfType(BytesRem, CurrConfigLoc, Type);
-}
-
-uint8_t USB_GetNextDescriptorComp(uint16_t* const BytesRem,
-                                  void** const CurrConfigLoc,
-                                  ConfigComparatorPtr_t const ComparatorRoutine)
-{
-	uint8_t ErrorCode;
-
-	while (*BytesRem)
-	{
-		uint8_t* PrevDescLoc  = *CurrConfigLoc;
-		uint16_t PrevBytesRem = *BytesRem;
-
-		USB_GetNextDescriptor(BytesRem, CurrConfigLoc);
-
-		if ((ErrorCode = ComparatorRoutine(*CurrConfigLoc)) != DESCRIPTOR_SEARCH_NotFound)
-		{
-			if (ErrorCode == DESCRIPTOR_SEARCH_Fail)
-			{
-				*CurrConfigLoc = PrevDescLoc;
-				*BytesRem      = PrevBytesRem;
-			}
-
-			return ErrorCode;
-		}
-	}
-
-	return DESCRIPTOR_SEARCH_COMP_EndOfDescriptor;
-}
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Core/ConfigDescriptors.h b/NativePrograms/LUFA/Drivers/USB/Core/ConfigDescriptors.h
deleted file mode 100644
index 6ecf844b3b..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Core/ConfigDescriptors.h
+++ /dev/null
@@ -1,287 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief USB Configuration Descriptor definitions.
- *  \copydetails Group_ConfigDescriptorParser
- *
- *  \note This file should not be included directly. It is automatically included as needed by the USB driver
- *        dispatch header located in LUFA/Drivers/USB/USB.h.
- */
-
-/** \ingroup Group_StdDescriptors
- *  \defgroup Group_ConfigDescriptorParser Configuration Descriptor Parser
- *  \brief USB Configuration Descriptor definitions.
- *
- *  This section of the library gives a friendly API which can be used in host applications to easily
- *  parse an attached device's configuration descriptor so that endpoint, interface and other descriptor
- *  data can be extracted and used as needed.
- *
- *  @{
- */
-
-#ifndef __CONFIGDESCRIPTORS_H__
-#define __CONFIGDESCRIPTORS_H__
-
-	/* Includes: */
-		#include "../../../Common/Common.h"
-		#include "USBMode.h"
-		#include "HostStandardReq.h"
-		#include "StdDescriptors.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_USB_DRIVER)
-			#error Do not include this file directly. Include LUFA/Drivers/USB/USB.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Casts a pointer to a descriptor inside the configuration descriptor into a pointer to the given
-			 *  descriptor type.
-			 *
-			 *  Usage Example:
-			 *  \code
-			 *  uint8_t* CurrDescriptor = &ConfigDescriptor[0]; // Pointing to the configuration header
-			 *  USB_Descriptor_Configuration_Header_t* ConfigHeaderPtr = DESCRIPTOR_PCAST(CurrDescriptor,
-			 *                                                           USB_Descriptor_Configuration_Header_t);
-			 *
-			 *  // Can now access elements of the configuration header struct using the -> indirection operator
-			 *  \endcode
-			 */
-			#define DESCRIPTOR_PCAST(DescriptorPtr, Type) ((Type*)(DescriptorPtr))
-
-			/** Casts a pointer to a descriptor inside the configuration descriptor into the given descriptor
-			 *  type (as an actual struct instance rather than a pointer to a struct).
-			 *
-			 *  Usage Example:
-			 *  \code
-			 *  uint8_t* CurrDescriptor = &ConfigDescriptor[0]; // Pointing to the configuration header
-			 *  USB_Descriptor_Configuration_Header_t ConfigHeader = DESCRIPTOR_CAST(CurrDescriptor,
-			 *                                                       USB_Descriptor_Configuration_Header_t);
-			 *
-			 *  // Can now access elements of the configuration header struct using the . operator
-			 *  \endcode
-			 */
-			#define DESCRIPTOR_CAST(DescriptorPtr, Type)  (*DESCRIPTOR_PCAST(DescriptorPtr, Type))
-
-			/** Returns the descriptor's type, expressed as the 8-bit type value in the header of the descriptor.
-			 *  This value's meaning depends on the descriptor's placement in the descriptor, but standard type
-			 *  values can be accessed in the \ref USB_DescriptorTypes_t enum.
-			 */
-			#define DESCRIPTOR_TYPE(DescriptorPtr)    DESCRIPTOR_PCAST(DescriptorPtr, USB_Descriptor_Header_t)->Type
-
-			/** Returns the descriptor's size, expressed as the 8-bit value indicating the number of bytes. */
-			#define DESCRIPTOR_SIZE(DescriptorPtr)    DESCRIPTOR_PCAST(DescriptorPtr, USB_Descriptor_Header_t)->Size
-
-		/* Type Defines: */
-			/** Type define for a Configuration Descriptor comparator function (function taking a pointer to an array
-			 *  of type void, returning a uint8_t value).
-			 *
-			 *  \see \ref USB_GetNextDescriptorComp function for more details.
-			 */
-			typedef uint8_t (* ConfigComparatorPtr_t)(void*);
-
-		/* Enums: */
-			/** Enum for the possible return codes of the \ref USB_Host_GetDeviceConfigDescriptor() function. */
-			enum USB_Host_GetConfigDescriptor_ErrorCodes_t
-			{
-				HOST_GETCONFIG_Successful       = 0, /**< No error occurred while retrieving the configuration descriptor. */
-				HOST_GETCONFIG_DeviceDisconnect = 1, /**< The attached device was disconnected while retrieving the configuration
-				                                      *   descriptor.
-				                                      */
-				HOST_GETCONFIG_PipeError        = 2, /**< An error occurred in the pipe while sending the request. */
-				HOST_GETCONFIG_SetupStalled     = 3, /**< The attached device stalled the request to retrieve the configuration
-				                                      *   descriptor.
-				                                      */
-				HOST_GETCONFIG_SoftwareTimeOut  = 4, /**< The request or data transfer timed out. */
-				HOST_GETCONFIG_BuffOverflow     = 5, /**< The device's configuration descriptor is too large to fit into the allocated
-				                                      *   buffer.
-				                                      */
-				HOST_GETCONFIG_InvalidData      = 6, /**< The device returned invalid configuration descriptor data. */
-			};
-
-			/** Enum for return values of a descriptor comparator function. */
-			enum DSearch_Return_ErrorCodes_t
-			{
-				DESCRIPTOR_SEARCH_Found                = 0, /**< Current descriptor matches comparator criteria. */
-				DESCRIPTOR_SEARCH_Fail                 = 1, /**< No further descriptor could possibly match criteria, fail the search. */
-				DESCRIPTOR_SEARCH_NotFound             = 2, /**< Current descriptor does not match comparator criteria. */
-			};
-
-			/** Enum for return values of \ref USB_GetNextDescriptorComp(). */
-			enum DSearch_Comp_Return_ErrorCodes_t
-			{
-				DESCRIPTOR_SEARCH_COMP_Found           = 0, /**< Configuration descriptor now points to descriptor which matches
-				                                             *   search criteria of the given comparator function. */
-				DESCRIPTOR_SEARCH_COMP_Fail            = 1, /**< Comparator function returned \ref DESCRIPTOR_SEARCH_Fail. */
-				DESCRIPTOR_SEARCH_COMP_EndOfDescriptor = 2, /**< End of configuration descriptor reached before match found. */
-			};
-
-		/* Function Prototypes: */
-			/** Retrieves the configuration descriptor data from an attached device via a standard request into a buffer,
-			 *  including validity and size checking to prevent a buffer overflow.
-			 *
-			 *  \param[in]     ConfigNumber   Device configuration descriptor number to fetch from the device (usually set to 1 for
-			 *                                single configuration devices).
-			 *  \param[in,out] ConfigSizePtr  Pointer to a location for storing the retrieved configuration descriptor size.
-			 *  \param[out]    BufferPtr      Pointer to the buffer for storing the configuration descriptor data.
-			 *  \param[out]    BufferSize     Size of the allocated buffer where the configuration descriptor is to be stored.
-			 *
-			 *  \return A value from the \ref USB_Host_GetConfigDescriptor_ErrorCodes_t enum.
-			 */
-			uint8_t USB_Host_GetDeviceConfigDescriptor(const uint8_t ConfigNumber,
-			                                           uint16_t* const ConfigSizePtr,
-			                                           void* const BufferPtr,
-			                                           const uint16_t BufferSize) ATTR_NON_NULL_PTR_ARG(2) ATTR_NON_NULL_PTR_ARG(3);
-
-			/** Skips to the next sub-descriptor inside the configuration descriptor of the specified type value.
-			 *  The bytes remaining value is automatically decremented.
-			 *
-			 * \param[in,out] BytesRem       Pointer to the number of bytes remaining of the configuration descriptor.
-			 * \param[in,out] CurrConfigLoc  Pointer to the current descriptor inside the configuration descriptor.
-			 * \param[in]     Type           Descriptor type value to search for.
-			 */
-			void USB_GetNextDescriptorOfType(uint16_t* const BytesRem,
-			                                 void** const CurrConfigLoc,
-			                                 const uint8_t Type)
-			                                 ATTR_NON_NULL_PTR_ARG(1) ATTR_NON_NULL_PTR_ARG(2);
-
-			/** Skips to the next sub-descriptor inside the configuration descriptor of the specified type value,
-			 *  which must come before a descriptor of the second given type value. If the BeforeType type
-			 *  descriptor is reached first, the number of bytes remaining to process is set to zero and the
-			 *  function exits. The bytes remaining value is automatically decremented.
-			 *
-			 * \param[in,out] BytesRem       Pointer to the number of bytes remaining of the configuration descriptor.
-			 * \param[in,out] CurrConfigLoc  Pointer to the current descriptor inside the configuration descriptor.
-			 * \param[in]     Type           Descriptor type value to search for.
-			 * \param[in]     BeforeType     Descriptor type value which must not be reached before the given Type descriptor.
-			 */
-			void USB_GetNextDescriptorOfTypeBefore(uint16_t* const BytesRem,
-			                                       void** const CurrConfigLoc,
-			                                       const uint8_t Type,
-			                                       const uint8_t BeforeType)
-			                                       ATTR_NON_NULL_PTR_ARG(1) ATTR_NON_NULL_PTR_ARG(2);
-
-			/** Skips to the next sub-descriptor inside the configuration descriptor of the specified type value,
-			 *  which must come after a descriptor of the second given type value. The bytes remaining value is
-			 *  automatically decremented.
-			 *
-			 * \param[in,out] BytesRem       Pointer to the number of bytes remaining of the configuration descriptor.
-			 * \param[in,out] CurrConfigLoc  Pointer to the current descriptor inside the configuration descriptor.
-			 * \param[in]     Type           Descriptor type value to search for.
-			 * \param[in]     AfterType      Descriptor type value which must be reached before the given Type descriptor.
-			 */
-			void USB_GetNextDescriptorOfTypeAfter(uint16_t* const BytesRem,
-			                                      void** const CurrConfigLoc,
-			                                      const uint8_t Type,
-			                                      const uint8_t AfterType)
-			                                      ATTR_NON_NULL_PTR_ARG(1) ATTR_NON_NULL_PTR_ARG(2);
-
-			/** Searches for the next descriptor in the given configuration descriptor using a pre-made comparator
-			 *  function. The routine updates the position and remaining configuration descriptor bytes values
-			 *  automatically. If a comparator routine fails a search, the descriptor pointer is retreated back
-			 *  so that the next descriptor search invocation will start from the descriptor which first caused the
-			 *  original search to fail. This behavior allows for one comparator to be used immediately after another
-			 *  has failed, starting the second search from the descriptor which failed the first.
-			 *
-			 *  Comparator functions should be standard functions which accept a pointer to the header of the current
-			 *  descriptor inside the configuration descriptor which is being compared, and should return a value from
-			 *  the \ref DSearch_Return_ErrorCodes_t enum as a uint8_t value.
-			 *
-			 *  \note This function is available in USB Host mode only.
-			 *
-			 *  \param[in,out] BytesRem           Pointer to an int storing the remaining bytes in the configuration descriptor.
-			 *  \param[in,out] CurrConfigLoc      Pointer to the current position in the configuration descriptor.
-			 *  \param[in]     ComparatorRoutine  Name of the comparator search function to use on the configuration descriptor.
-			 *
-			 *  \return Value of one of the members of the \ref DSearch_Comp_Return_ErrorCodes_t enum.
-			 *
-			 *  Usage Example:
-			 *  \code
-			 *  uint8_t EndpointSearcher(void* CurrentDescriptor); // Comparator Prototype
-			 *
-			 *  uint8_t EndpointSearcher(void* CurrentDescriptor)
-			 *  {
-			 *     if (DESCRIPTOR_TYPE(CurrentDescriptor) == DTYPE_Endpoint)
-			 *         return DESCRIPTOR_SEARCH_Found;
-			 *     else
-			 *         return DESCRIPTOR_SEARCH_NotFound;
-			 *  }
-			 *
-			 *  //...
-			 *
-			 *  // After retrieving configuration descriptor:
-			 *  if (USB_Host_GetNextDescriptorComp(&BytesRemaining, &CurrentConfigLoc, EndpointSearcher) ==
-			 *      Descriptor_Search_Comp_Found)
-			 *  {
-			 *      // Do something with the endpoint descriptor
-			 *  }
-			 *  \endcode
-			 */
-			uint8_t USB_GetNextDescriptorComp(uint16_t* const BytesRem,
-			                                  void** const CurrConfigLoc,
-			                                  ConfigComparatorPtr_t const ComparatorRoutine) ATTR_NON_NULL_PTR_ARG(1)
-			                                  ATTR_NON_NULL_PTR_ARG(2) ATTR_NON_NULL_PTR_ARG(3);
-
-		/* Inline Functions: */
-			/** Skips over the current sub-descriptor inside the configuration descriptor, so that the pointer then
-			    points to the next sub-descriptor. The bytes remaining value is automatically decremented.
-			 *
-			 * \param[in,out] BytesRem       Pointer to the number of bytes remaining of the configuration descriptor.
-			 * \param[in,out] CurrConfigLoc  Pointer to the current descriptor inside the configuration descriptor.
-			 */
-			static inline void USB_GetNextDescriptor(uint16_t* const BytesRem,
-			                                         void** CurrConfigLoc) ATTR_NON_NULL_PTR_ARG(1) ATTR_NON_NULL_PTR_ARG(2);
-			static inline void USB_GetNextDescriptor(uint16_t* const BytesRem,
-			                                         void** CurrConfigLoc)
-			{
-				uint16_t CurrDescriptorSize = DESCRIPTOR_CAST(*CurrConfigLoc, USB_Descriptor_Header_t).Size;
-
-				if (*BytesRem < CurrDescriptorSize)
-				  CurrDescriptorSize = *BytesRem;
-
-				*CurrConfigLoc  = (void*)((uintptr_t)*CurrConfigLoc + CurrDescriptorSize);
-				*BytesRem      -= CurrDescriptorSize;
-			}
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Core/Device.h b/NativePrograms/LUFA/Drivers/USB/Core/Device.h
deleted file mode 100644
index 7f949b694c..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Core/Device.h
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Common USB Device definitions for all architectures.
- *  \copydetails Group_Device
- *
- *  \note This file should not be included directly. It is automatically included as needed by the USB driver
- *        dispatch header located in LUFA/Drivers/USB/USB.h.
- */
-
-/** \ingroup Group_USB
- *  \defgroup Group_Device Device Management
- *  \brief USB Device management definitions for USB device mode.
- *
- *  USB Device mode related definitions common to all architectures. This module contains definitions which
- *  are used when the USB controller is initialized in device mode.
- *
- *  @{
- */
-
-#ifndef __USBDEVICE_H__
-#define __USBDEVICE_H__
-
-	/* Includes: */
-		#include "../../../Common/Common.h"
-		#include "USBMode.h"
-		#include "StdDescriptors.h"
-		#include "USBInterrupt.h"
-		#include "Endpoint.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_USB_DRIVER)
-			#error Do not include this file directly. Include LUFA/Drivers/USB/USB.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Enums: */
-			/** Enum for the various states of the USB Device state machine. Only some states are
-			 *  implemented in the LUFA library - other states are left to the user to implement.
-			 *
-			 *  For information on each possible USB device state, refer to the USB 2.0 specification.
-			 *
-			 *  \see \ref USB_DeviceState, which stores the current device state machine state.
-			 */
-			enum USB_Device_States_t
-			{
-				DEVICE_STATE_Unattached                   = 0, /**< Internally implemented by the library. This state indicates
-				                                                *   that the device is not currently connected to a host.
-				                                                */
-				DEVICE_STATE_Powered                      = 1, /**< Internally implemented by the library. This state indicates
-				                                                *   that the device is connected to a host, but enumeration has not
-				                                                *   yet begun.
-				                                                */
-				DEVICE_STATE_Default                      = 2, /**< Internally implemented by the library. This state indicates
-				                                                *   that the device's USB bus has been reset by the host and it is
-				                                                *   now waiting for the host to begin the enumeration process.
-				                                                */
-				DEVICE_STATE_Addressed                    = 3, /**< Internally implemented by the library. This state indicates
-				                                                *   that the device has been addressed by the USB Host, but is not
-				                                                *   yet configured.
-				                                                */
-				DEVICE_STATE_Configured                   = 4, /**< May be implemented by the user project. This state indicates
-				                                                *   that the device has been enumerated by the host and is ready
-				                                                *   for USB communications to begin.
-				                                                */
-				DEVICE_STATE_Suspended                    = 5, /**< May be implemented by the user project. This state indicates
-				                                                *   that the USB bus has been suspended by the host, and the device
-				                                                *   should power down to a minimal power level until the bus is
-				                                                *   resumed.
-				                                                */
-			};
-
-		/* Function Prototypes: */
-			/** Function to retrieve a given descriptor's size and memory location from the given descriptor type value,
-			 *  index and language ID. This function MUST be overridden in the user application (added with full, identical
-			 *  prototype and name so that the library can call it to retrieve descriptor data.
-			 *
-			 *  \param[in] wValue                  The type of the descriptor to retrieve in the upper byte, and the index in the
-			 *                                     lower byte (when more than one descriptor of the given type exists, such as the
-			 *                                     case of string descriptors). The type may be one of the standard types defined
-			 *                                     in the DescriptorTypes_t enum, or may be a class-specific descriptor type value.
-			 *  \param[in] wIndex                  The language ID of the string to return if the \c wValue type indicates
-			 *                                     \ref DTYPE_String, otherwise zero for standard descriptors, or as defined in a
-			 *                                     class-specific standards.
-			 *  \param[out] DescriptorAddress      Pointer to the descriptor in memory. This should be set by the routine to
-			 *                                     the address of the descriptor.
-			 *  \param[out] DescriptorMemorySpace  A value from the \ref USB_DescriptorMemorySpaces_t enum to indicate the memory
-			 *                                     space in which the descriptor is stored. This parameter does not exist when one
-			 *                                     of the \c USE_*_DESCRIPTORS compile time options is used, or on architectures which
-			 *                                     use a unified address space.
-			 *
-			 *  \note By default, the library expects all descriptors to be located in flash memory via the \c PROGMEM attribute.
-			 *        If descriptors should be located in RAM or EEPROM instead (to speed up access in the case of RAM, or to
-			 *        allow the descriptors to be changed dynamically at runtime) either the \c USE_RAM_DESCRIPTORS or the
-			 *        \c USE_EEPROM_DESCRIPTORS tokens may be defined in the project makefile and passed to the compiler by the -D
-			 *        switch.
-			 *
-			 *  \return Size in bytes of the descriptor if it exists, zero or \ref NO_DESCRIPTOR otherwise.
-			 */
-			uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-			                                    const uint16_t wIndex,
-			                                    const void** const DescriptorAddress
-			#if (defined(ARCH_HAS_MULTI_ADDRESS_SPACE) || defined(__DOXYGEN__)) && \
-			    !(defined(USE_FLASH_DESCRIPTORS) || defined(USE_EEPROM_DESCRIPTORS) || defined(USE_RAM_DESCRIPTORS))
-			                                    , uint8_t* const DescriptorMemorySpace
-			#endif
-			                                    ) ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
-
-	/* Architecture Includes: */
-		#if (ARCH == ARCH_AVR8)
-			#include "AVR8/Device_AVR8.h"
-		#elif (ARCH == ARCH_UC3)
-			#include "UC3/Device_UC3.h"
-		#elif (ARCH == ARCH_XMEGA)
-			#include "XMEGA/Device_XMEGA.h"
-		#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Core/DeviceStandardReq.c b/NativePrograms/LUFA/Drivers/USB/Core/DeviceStandardReq.c
deleted file mode 100644
index 8d068fec64..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Core/DeviceStandardReq.c
+++ /dev/null
@@ -1,393 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-#define  __INCLUDE_FROM_USB_DRIVER
-#include "USBMode.h"
-
-#if defined(USB_CAN_BE_DEVICE)
-
-#define  __INCLUDE_FROM_DEVICESTDREQ_C
-#include "DeviceStandardReq.h"
-
-uint8_t USB_Device_ConfigurationNumber;
-
-#if !defined(NO_DEVICE_SELF_POWER)
-bool    USB_Device_CurrentlySelfPowered;
-#endif
-
-#if !defined(NO_DEVICE_REMOTE_WAKEUP)
-bool    USB_Device_RemoteWakeupEnabled;
-#endif
-
-void USB_Device_ProcessControlRequest(void)
-{
-	#if defined(ARCH_BIG_ENDIAN)
-	USB_ControlRequest.bmRequestType = Endpoint_Read_8();
-	USB_ControlRequest.bRequest      = Endpoint_Read_8();
-	USB_ControlRequest.wValue        = Endpoint_Read_16_LE();
-	USB_ControlRequest.wIndex        = Endpoint_Read_16_LE();
-	USB_ControlRequest.wLength       = Endpoint_Read_16_LE();
-	#else
-	uint8_t* RequestHeader = (uint8_t*)&USB_ControlRequest;
-
-	for (uint8_t RequestHeaderByte = 0; RequestHeaderByte < sizeof(USB_Request_Header_t); RequestHeaderByte++)
-	  *(RequestHeader++) = Endpoint_Read_8();
-	#endif
-
-	EVENT_USB_Device_ControlRequest();
-
-	if (Endpoint_IsSETUPReceived())
-	{
-		uint8_t bmRequestType = USB_ControlRequest.bmRequestType;
-
-		switch (USB_ControlRequest.bRequest)
-		{
-			case REQ_GetStatus:
-				if ((bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_STANDARD | REQREC_DEVICE)) ||
-					(bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_STANDARD | REQREC_ENDPOINT)))
-				{
-					USB_Device_GetStatus();
-				}
-
-				break;
-			case REQ_ClearFeature:
-			case REQ_SetFeature:
-				if ((bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_DEVICE)) ||
-					(bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_ENDPOINT)))
-				{
-					USB_Device_ClearSetFeature();
-				}
-
-				break;
-			case REQ_SetAddress:
-				if (bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_DEVICE))
-				  USB_Device_SetAddress();
-
-				break;
-			case REQ_GetDescriptor:
-				if ((bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_STANDARD | REQREC_DEVICE)) ||
-					(bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_STANDARD | REQREC_INTERFACE)))
-				{
-					USB_Device_GetDescriptor();
-				}
-
-				break;
-			case REQ_GetConfiguration:
-				if (bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_STANDARD | REQREC_DEVICE))
-				  USB_Device_GetConfiguration();
-
-				break;
-			case REQ_SetConfiguration:
-				if (bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_DEVICE))
-				  USB_Device_SetConfiguration();
-
-				break;
-
-			default:
-				break;
-		}
-	}
-
-	if (Endpoint_IsSETUPReceived())
-	{
-		Endpoint_ClearSETUP();
-		Endpoint_StallTransaction();
-	}
-}
-
-static void USB_Device_SetAddress(void)
-{
-	uint8_t DeviceAddress = (USB_ControlRequest.wValue & 0x7F);
-
-	USB_Device_SetDeviceAddress(DeviceAddress);
-
-	Endpoint_ClearSETUP();
-
-	Endpoint_ClearStatusStage();
-
-	while (!(Endpoint_IsINReady()));
-
-	USB_Device_EnableDeviceAddress(DeviceAddress);
-
-	USB_DeviceState = (DeviceAddress) ? DEVICE_STATE_Addressed : DEVICE_STATE_Default;
-}
-
-static void USB_Device_SetConfiguration(void)
-{
-	#if defined(FIXED_NUM_CONFIGURATIONS)
-	if ((uint8_t)USB_ControlRequest.wValue > FIXED_NUM_CONFIGURATIONS)
-	  return;
-	#else
-	USB_Descriptor_Device_t* DevDescriptorPtr;
-
-	#if defined(ARCH_HAS_MULTI_ADDRESS_SPACE)
-		#if defined(USE_FLASH_DESCRIPTORS)
-			#define MemoryAddressSpace  MEMSPACE_FLASH
-		#elif defined(USE_EEPROM_DESCRIPTORS)
-			#define MemoryAddressSpace  MEMSPACE_EEPROM
-		#elif defined(USE_RAM_DESCRIPTORS)
-			#define MemoryAddressSpace  MEMSPACE_RAM
-		#else
-			uint8_t MemoryAddressSpace;
-		#endif
-	#endif
-
-	if (CALLBACK_USB_GetDescriptor((DTYPE_Device << 8), 0, (void*)&DevDescriptorPtr
-	#if defined(ARCH_HAS_MULTI_ADDRESS_SPACE) && \
-	    !(defined(USE_FLASH_DESCRIPTORS) || defined(USE_EEPROM_DESCRIPTORS) || defined(USE_RAM_DESCRIPTORS))
-	                               , &MemoryAddressSpace
-	#endif
-	                               ) == NO_DESCRIPTOR)
-	{
-		return;
-	}
-
-	#if defined(ARCH_HAS_MULTI_ADDRESS_SPACE)
-	if (MemoryAddressSpace == MEMSPACE_FLASH)
-	{
-		if (((uint8_t)USB_ControlRequest.wValue > pgm_read_byte(&DevDescriptorPtr->NumberOfConfigurations)))
-		  return;
-	}
-	else if (MemoryAddressSpace == MEMSPACE_EEPROM)
-	{
-		if (((uint8_t)USB_ControlRequest.wValue > eeprom_read_byte(&DevDescriptorPtr->NumberOfConfigurations)))
-		  return;
-	}
-	else
-	{
-		if ((uint8_t)USB_ControlRequest.wValue > DevDescriptorPtr->NumberOfConfigurations)
-		  return;
-	}
-	#else
-	if ((uint8_t)USB_ControlRequest.wValue > DevDescriptorPtr->NumberOfConfigurations)
-	  return;
-	#endif
-	#endif
-
-	Endpoint_ClearSETUP();
-
-	USB_Device_ConfigurationNumber = (uint8_t)USB_ControlRequest.wValue;
-
-	Endpoint_ClearStatusStage();
-
-	if (USB_Device_ConfigurationNumber)
-	  USB_DeviceState = DEVICE_STATE_Configured;
-	else
-	  USB_DeviceState = (USB_Device_IsAddressSet()) ? DEVICE_STATE_Configured : DEVICE_STATE_Powered;
-
-	EVENT_USB_Device_ConfigurationChanged();
-}
-
-static void USB_Device_GetConfiguration(void)
-{
-	Endpoint_ClearSETUP();
-
-	Endpoint_Write_8(USB_Device_ConfigurationNumber);
-	Endpoint_ClearIN();
-
-	Endpoint_ClearStatusStage();
-}
-
-#if !defined(NO_INTERNAL_SERIAL) && (USE_INTERNAL_SERIAL != NO_DESCRIPTOR)
-static void USB_Device_GetInternalSerialDescriptor(void)
-{
-	struct
-	{
-		USB_Descriptor_Header_t Header;
-		uint16_t                UnicodeString[INTERNAL_SERIAL_LENGTH_BITS / 4];
-	} SignatureDescriptor;
-
-	SignatureDescriptor.Header.Type = DTYPE_String;
-	SignatureDescriptor.Header.Size = USB_STRING_LEN(INTERNAL_SERIAL_LENGTH_BITS / 4);
-
-	USB_Device_GetSerialString(SignatureDescriptor.UnicodeString);
-
-	Endpoint_ClearSETUP();
-
-	Endpoint_Write_Control_Stream_LE(&SignatureDescriptor, sizeof(SignatureDescriptor));
-	Endpoint_ClearOUT();
-}
-#endif
-
-static void USB_Device_GetDescriptor(void)
-{
-	const void* DescriptorPointer;
-	uint16_t    DescriptorSize;
-
-	#if defined(ARCH_HAS_MULTI_ADDRESS_SPACE) && \
-	    !(defined(USE_FLASH_DESCRIPTORS) || defined(USE_EEPROM_DESCRIPTORS) || defined(USE_RAM_DESCRIPTORS))
-	uint8_t DescriptorAddressSpace;
-	#endif
-
-	#if !defined(NO_INTERNAL_SERIAL) && (USE_INTERNAL_SERIAL != NO_DESCRIPTOR)
-	if (USB_ControlRequest.wValue == ((DTYPE_String << 8) | USE_INTERNAL_SERIAL))
-	{
-		USB_Device_GetInternalSerialDescriptor();
-		return;
-	}
-	#endif
-
-	if ((DescriptorSize = CALLBACK_USB_GetDescriptor(USB_ControlRequest.wValue, USB_ControlRequest.wIndex,
-	                                                 &DescriptorPointer
-	#if defined(ARCH_HAS_MULTI_ADDRESS_SPACE) && \
-	    !(defined(USE_FLASH_DESCRIPTORS) || defined(USE_EEPROM_DESCRIPTORS) || defined(USE_RAM_DESCRIPTORS))
-	                                                 , &DescriptorAddressSpace
-	#endif
-													 )) == NO_DESCRIPTOR)
-	{
-		return;
-	}
-
-	Endpoint_ClearSETUP();
-
-	#if defined(USE_RAM_DESCRIPTORS) || !defined(ARCH_HAS_MULTI_ADDRESS_SPACE)
-	Endpoint_Write_Control_Stream_LE(DescriptorPointer, DescriptorSize);
-	#elif defined(USE_EEPROM_DESCRIPTORS)
-	Endpoint_Write_Control_EStream_LE(DescriptorPointer, DescriptorSize);
-	#elif defined(USE_FLASH_DESCRIPTORS)
-	Endpoint_Write_Control_PStream_LE(DescriptorPointer, DescriptorSize);
-	#else
-	if (DescriptorAddressSpace == MEMSPACE_FLASH)
-	  Endpoint_Write_Control_PStream_LE(DescriptorPointer, DescriptorSize);
-	else if (DescriptorAddressSpace == MEMSPACE_EEPROM)
-	  Endpoint_Write_Control_EStream_LE(DescriptorPointer, DescriptorSize);
-	else
-	  Endpoint_Write_Control_Stream_LE(DescriptorPointer, DescriptorSize);
-	#endif
-
-	Endpoint_ClearOUT();
-}
-
-static void USB_Device_GetStatus(void)
-{
-	uint8_t CurrentStatus = 0;
-
-	switch (USB_ControlRequest.bmRequestType)
-	{
-		case (REQDIR_DEVICETOHOST | REQTYPE_STANDARD | REQREC_DEVICE):
-		{
-			#if !defined(NO_DEVICE_SELF_POWER)
-			if (USB_Device_CurrentlySelfPowered)
-			  CurrentStatus |= FEATURE_SELFPOWERED_ENABLED;
-			#endif
-
-			#if !defined(NO_DEVICE_REMOTE_WAKEUP)
-			if (USB_Device_RemoteWakeupEnabled)
-			  CurrentStatus |= FEATURE_REMOTE_WAKEUP_ENABLED;
-			#endif
-			break;
-		}
-		case (REQDIR_DEVICETOHOST | REQTYPE_STANDARD | REQREC_ENDPOINT):
-		{
-			#if !defined(CONTROL_ONLY_DEVICE)
-			uint8_t EndpointIndex = ((uint8_t)USB_ControlRequest.wIndex & ENDPOINT_EPNUM_MASK);
-
-			if (EndpointIndex >= ENDPOINT_TOTAL_ENDPOINTS)
-				return;
-
-			Endpoint_SelectEndpoint(EndpointIndex);
-
-			CurrentStatus = Endpoint_IsStalled();
-
-			Endpoint_SelectEndpoint(ENDPOINT_CONTROLEP);
-			#endif
-
-			break;
-		}
-		default:
-			return;
-	}
-
-	Endpoint_ClearSETUP();
-
-	Endpoint_Write_16_LE(CurrentStatus);
-	Endpoint_ClearIN();
-
-	Endpoint_ClearStatusStage();
-}
-
-static void USB_Device_ClearSetFeature(void)
-{
-	switch (USB_ControlRequest.bmRequestType & CONTROL_REQTYPE_RECIPIENT)
-	{
-		#if !defined(NO_DEVICE_REMOTE_WAKEUP)
-		case REQREC_DEVICE:
-		{
-			if ((uint8_t)USB_ControlRequest.wValue == FEATURE_SEL_DeviceRemoteWakeup)
-			  USB_Device_RemoteWakeupEnabled = (USB_ControlRequest.bRequest == REQ_SetFeature);
-			else
-			  return;
-
-			break;
-		}
-		#endif
-		#if !defined(CONTROL_ONLY_DEVICE)
-		case REQREC_ENDPOINT:
-		{
-			if ((uint8_t)USB_ControlRequest.wValue == FEATURE_SEL_EndpointHalt)
-			{
-				uint8_t EndpointIndex = ((uint8_t)USB_ControlRequest.wIndex & ENDPOINT_EPNUM_MASK);
-
-				if (EndpointIndex == ENDPOINT_CONTROLEP || EndpointIndex >= ENDPOINT_TOTAL_ENDPOINTS)
-				  return;
-
-				Endpoint_SelectEndpoint(EndpointIndex);
-
-				if (Endpoint_IsEnabled())
-				{
-					if (USB_ControlRequest.bRequest == REQ_SetFeature)
-					{
-						Endpoint_StallTransaction();
-					}
-					else
-					{
-						Endpoint_ClearStall();
-						Endpoint_ResetEndpoint(EndpointIndex);
-						Endpoint_ResetDataToggle();
-					}
-				}
-			}
-
-			break;
-		}
-		#endif
-		default:
-			return;
-	}
-
-	Endpoint_SelectEndpoint(ENDPOINT_CONTROLEP);
-
-	Endpoint_ClearSETUP();
-
-	Endpoint_ClearStatusStage();
-}
-
-#endif
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Core/DeviceStandardReq.h b/NativePrograms/LUFA/Drivers/USB/Core/DeviceStandardReq.h
deleted file mode 100644
index 86bdc6d7f0..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Core/DeviceStandardReq.h
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief USB device standard request management.
- *
- *  This file contains the function prototypes necessary for the processing of incoming standard control requests
- *  when the library is in USB device mode.
- *
- *  \note This file should not be included directly. It is automatically included as needed by the USB driver
- *        dispatch header located in LUFA/Drivers/USB/USB.h.
- */
-
-#ifndef __DEVICESTDREQ_H__
-#define __DEVICESTDREQ_H__
-
-	/* Includes: */
-		#include "../../../Common/Common.h"
-		#include "USBMode.h"
-		#include "StdDescriptors.h"
-		#include "Events.h"
-		#include "StdRequestType.h"
-		#include "USBTask.h"
-		#include "USBController.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_USB_DRIVER)
-			#error Do not include this file directly. Include LUFA/Drivers/USB/USB.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Enums: */
-			#if defined(ARCH_HAS_MULTI_ADDRESS_SPACE) || defined(__DOXYGEN__)
-				/** Enum for the possible descriptor memory spaces, for the \c MemoryAddressSpace parameter of the
-				 *  \ref CALLBACK_USB_GetDescriptor() function. This can be used when none of the \c USE_*_DESCRIPTORS
-				 *  compile time options are used, to indicate in which memory space the descriptor is stored.
-				 *
-				 *  \ingroup Group_Device
-				 */
-				enum USB_DescriptorMemorySpaces_t
-				{
-					#if defined(ARCH_HAS_FLASH_ADDRESS_SPACE) || defined(__DOXYGEN__)
-					MEMSPACE_FLASH    = 0, /**< Indicates the requested descriptor is located in FLASH memory. */
-					#endif
-					#if defined(ARCH_HAS_EEPROM_ADDRESS_SPACE) || defined(__DOXYGEN__)
-					MEMSPACE_EEPROM   = 1, /**< Indicates the requested descriptor is located in EEPROM memory. */
-					#endif
-					MEMSPACE_RAM      = 2, /**< Indicates the requested descriptor is located in RAM memory. */
-				};
-			#endif
-
-		/* Global Variables: */
-			/** Indicates the currently set configuration number of the device. USB devices may have several
-			 *  different configurations which the host can select between; this indicates the currently selected
-			 *  value, or 0 if no configuration has been selected.
-			 *
-			 *  \attention This variable should be treated as read-only in the user application, and never manually
-			 *             changed in value.
-			 *
-			 *  \ingroup Group_Device
-			 */
-			extern uint8_t USB_Device_ConfigurationNumber;
-
-			#if !defined(NO_DEVICE_REMOTE_WAKEUP)
-				/** Indicates if the host is currently allowing the device to issue remote wakeup events. If this
-				 *  flag is cleared, the device should not issue remote wakeup events to the host.
-				 *
-				 *  \attention This variable should be treated as read-only in the user application, and never manually
-				 *             changed in value.
-				 *
-				 *  \note To reduce FLASH usage of the compiled applications where Remote Wakeup is not supported,
-				 *        this global and the underlying management code can be disabled by defining the
-				 *        \c NO_DEVICE_REMOTE_WAKEUP token in the project makefile and passing it to the compiler via
-				 *        the -D switch.
-				 *
-				 *  \ingroup Group_Device
-				 */
-				extern bool USB_Device_RemoteWakeupEnabled;
-			#endif
-
-			#if !defined(NO_DEVICE_SELF_POWER)
-				/** Indicates if the device is currently being powered by its own power supply, rather than being
-				 *  powered by the host's USB supply. This flag should remain cleared if the device does not
-				 *  support self powered mode, as indicated in the device descriptors.
-				 *
-				 *  \ingroup Group_Device
-				 */
-				extern bool USB_Device_CurrentlySelfPowered;
-			#endif
-
-	/* Private Interface - For use in library only: */
-	#if !defined(__DOXYGEN__)
-		#if defined(USE_RAM_DESCRIPTORS) && defined(USE_EEPROM_DESCRIPTORS)
-			#error USE_RAM_DESCRIPTORS and USE_EEPROM_DESCRIPTORS are mutually exclusive.
-		#elif defined(USE_RAM_DESCRIPTORS) && defined(USE_FLASH_DESCRIPTORS)
-			#error USE_RAM_DESCRIPTORS and USE_FLASH_DESCRIPTORS are mutually exclusive.
-		#elif defined(USE_FLASH_DESCRIPTORS) && defined(USE_EEPROM_DESCRIPTORS)
-			#error USE_FLASH_DESCRIPTORS and USE_EEPROM_DESCRIPTORS are mutually exclusive.
-		#elif defined(USE_FLASH_DESCRIPTORS) && defined(USE_EEPROM_DESCRIPTORS) && defined(USE_RAM_DESCRIPTORS)
-			#error Only one of the USE_*_DESCRIPTORS modes should be selected.
-		#endif
-
-		/* Function Prototypes: */
-			void USB_Device_ProcessControlRequest(void);
-
-			#if defined(__INCLUDE_FROM_DEVICESTDREQ_C)
-				static void USB_Device_SetAddress(void);
-				static void USB_Device_SetConfiguration(void);
-				static void USB_Device_GetConfiguration(void);
-				static void USB_Device_GetDescriptor(void);
-				static void USB_Device_GetStatus(void);
-				static void USB_Device_ClearSetFeature(void);
-
-				#if !defined(NO_INTERNAL_SERIAL) && (USE_INTERNAL_SERIAL != NO_DESCRIPTOR)
-					static void USB_Device_GetInternalSerialDescriptor(void);
-				#endif
-			#endif
-	#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Core/Endpoint.h b/NativePrograms/LUFA/Drivers/USB/Core/Endpoint.h
deleted file mode 100644
index 1c21ac07ec..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Core/Endpoint.h
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief USB Endpoint definitions for all architectures.
- *  \copydetails Group_EndpointManagement
- *
- *  \note This file should not be included directly. It is automatically included as needed by the USB driver
- *        dispatch header located in LUFA/Drivers/USB/USB.h.
- */
-
-/** \ingroup Group_EndpointManagement
- *  \defgroup Group_EndpointRW Endpoint Data Reading and Writing
- *  \brief Endpoint data read/write definitions.
- *
- *  Functions, macros, variables, enums and types related to data reading and writing from and to endpoints.
- */
-
-/** \ingroup Group_EndpointRW
- *  \defgroup Group_EndpointPrimitiveRW Read/Write of Primitive Data Types
- *  \brief Endpoint data primitive read/write definitions.
- *
- *  Functions, macros, variables, enums and types related to data reading and writing of primitive data types
- *  from and to endpoints.
- */
-
-/** \ingroup Group_EndpointManagement
- *  \defgroup Group_EndpointPacketManagement Endpoint Packet Management
- *  \brief USB Endpoint package management definitions.
- *
- *  Functions, macros, variables, enums and types related to packet management of endpoints.
- */
-
-/** \ingroup Group_USB
- *  \defgroup Group_EndpointManagement Endpoint Management
- *  \brief Endpoint management definitions.
- *
- *  Functions, macros and enums related to endpoint management when in USB Device mode. This
- *  module contains the endpoint management macros, as well as endpoint interrupt and data
- *  send/receive functions for various data types.
- *
- *  @{
- */
-
-#ifndef __ENDPOINT_H__
-#define __ENDPOINT_H__
-
-	/* Includes: */
-		#include "../../../Common/Common.h"
-		#include "USBMode.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_USB_DRIVER)
-			#error Do not include this file directly. Include LUFA/Drivers/USB/USB.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Type Defines: */
-			/** Type define for a endpoint table entry, used to configure endpoints in groups via
-			 *  \ref Endpoint_ConfigureEndpointTable().
-			 */
-			typedef struct
-			{
-				uint8_t  Address; /**< Address of the endpoint to configure, or zero if the table entry is to be unused. */
-				uint16_t Size; /**< Size of the endpoint bank, in bytes. */
-				uint8_t  Type; /**< Type of the endpoint, a \c EP_TYPE_* mask. */
-				uint8_t  Banks; /**< Number of hardware banks to use for the endpoint. */
-			} USB_Endpoint_Table_t;
-
-		/* Macros: */
-			/** Endpoint number mask, for masking against endpoint addresses to retrieve the endpoint's
-			 *  numerical address in the device.
-			 */
-			#define ENDPOINT_EPNUM_MASK                     0x0F
-
-			/** Endpoint address for the default control endpoint, which always resides in address 0. This is
-			 *  defined for convenience to give more readable code when used with the endpoint macros.
-			 */
-			#define ENDPOINT_CONTROLEP                      0
-
-	/* Architecture Includes: */
-		#if (ARCH == ARCH_AVR8)
-			#include "AVR8/Endpoint_AVR8.h"
-		#elif (ARCH == ARCH_UC3)
-			#include "UC3/Endpoint_UC3.h"
-		#elif (ARCH == ARCH_XMEGA)
-			#include "XMEGA/Endpoint_XMEGA.h"
-		#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Core/EndpointStream.h b/NativePrograms/LUFA/Drivers/USB/Core/EndpointStream.h
deleted file mode 100644
index 115567e454..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Core/EndpointStream.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Endpoint data stream transmission and reception management.
- *  \copydetails Group_EndpointStreamRW
- *
- *  \note This file should not be included directly. It is automatically included as needed by the USB driver
- *        dispatch header located in LUFA/Drivers/USB/USB.h.
- */
-
-/** \ingroup Group_EndpointRW
- *  \defgroup Group_EndpointStreamRW Read/Write of Multi-Byte Streams
- *  \brief Endpoint data stream transmission and reception management.
- *
- *  Functions, macros, variables, enums and types related to data reading and writing of data streams from
- *  and to endpoints.
- *
- *  @{
- */
-
-#ifndef __ENDPOINT_STREAM_H__
-#define __ENDPOINT_STREAM_H__
-
-	/* Includes: */
-		#include "../../../Common/Common.h"
-		#include "USBMode.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_USB_DRIVER)
-			#error Do not include this file directly. Include LUFA/Drivers/USB/USB.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Enums: */
-			/** Enum for the possible error return codes of the \c Endpoint_*_Stream_* functions. */
-			enum Endpoint_Stream_RW_ErrorCodes_t
-			{
-				ENDPOINT_RWSTREAM_NoError            = 0, /**< Command completed successfully, no error. */
-				ENDPOINT_RWSTREAM_EndpointStalled    = 1, /**< The endpoint was stalled during the stream
-				                                           *   transfer by the host or device.
-				                                           */
-				ENDPOINT_RWSTREAM_DeviceDisconnected = 2, /**< Device was disconnected from the host during
-				                                           *   the transfer.
-				                                           */
-				ENDPOINT_RWSTREAM_BusSuspended       = 3, /**< The USB bus has been suspended by the host and
-				                                           *   no USB endpoint traffic can occur until the bus
-				                                           *   has resumed.
-				                                           */
-				ENDPOINT_RWSTREAM_Timeout            = 4, /**< The host failed to accept or send the next packet
-				                                           *   within the software timeout period set by the
-				                                           *   \ref USB_STREAM_TIMEOUT_MS macro.
-				                                           */
-				ENDPOINT_RWSTREAM_IncompleteTransfer = 5, /**< Indicates that the endpoint bank became full or empty before
-				                                           *   the complete contents of the current stream could be
-				                                           *   transferred. The endpoint stream function should be called
-				                                           *   again to process the next chunk of data in the transfer.
-				                                           */
-			};
-
-			/** Enum for the possible error return codes of the \c Endpoint_*_Control_Stream_* functions. */
-			enum Endpoint_ControlStream_RW_ErrorCodes_t
-			{
-				ENDPOINT_RWCSTREAM_NoError            = 0, /**< Command completed successfully, no error. */
-				ENDPOINT_RWCSTREAM_HostAborted        = 1, /**< The aborted the transfer prematurely. */
-				ENDPOINT_RWCSTREAM_DeviceDisconnected = 2, /**< Device was disconnected from the host during
-				                                            *   the transfer.
-				                                            */
-				ENDPOINT_RWCSTREAM_BusSuspended       = 3, /**< The USB bus has been suspended by the host and
-				                                            *   no USB endpoint traffic can occur until the bus
-				                                            *   has resumed.
-				                                            */
-			};
-
-	/* Architecture Includes: */
-		#if (ARCH == ARCH_AVR8)
-			#include "AVR8/EndpointStream_AVR8.h"
-		#elif (ARCH == ARCH_UC3)
-			#include "UC3/EndpointStream_UC3.h"
-		#elif (ARCH == ARCH_XMEGA)
-			#include "XMEGA/EndpointStream_XMEGA.h"
-		#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Core/Events.c b/NativePrograms/LUFA/Drivers/USB/Core/Events.c
deleted file mode 100644
index e1a9b44910..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Core/Events.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-#define  __INCLUDE_FROM_EVENTS_C
-#define  __INCLUDE_FROM_USB_DRIVER
-#include "Events.h"
-
-void USB_Event_Stub(void)
-{
-
-}
-
-void USB_Event_Stub_2(const uint8_t _1)
-{
-	(void)_1;
-	USB_Event_Stub();
-}
-
-void USB_Event_Stub_3(const uint8_t _1, const uint8_t _2)
-{
-	(void)_1;
-	(void)_2;
-	USB_Event_Stub();
-}
diff --git a/NativePrograms/LUFA/Drivers/USB/Core/Events.h b/NativePrograms/LUFA/Drivers/USB/Core/Events.h
deleted file mode 100644
index 75f936769c..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Core/Events.h
+++ /dev/null
@@ -1,374 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief USB Event management definitions.
- *  \copydetails Group_Events
- *
- *  \note This file should not be included directly. It is automatically included as needed by the USB driver
- *        dispatch header located in LUFA/Drivers/USB/USB.h.
- */
-
-/** \ingroup Group_USB
- *  \defgroup Group_Events USB Events
- *  \brief USB Event management definitions.
- *
- *  This module contains macros and functions relating to the management of library events, which are small
- *  pieces of code similar to ISRs which are run when a given condition is met. Each event can be fired from
- *  multiple places in the user or library code, which may or may not be inside an ISR, thus each handler
- *  should be written to be as small and fast as possible to prevent possible problems.
- *
- *  Events can be hooked by the user application by declaring a handler function with the same name and parameters
- *  listed here. If an event with no user-associated handler is fired within the library, it by default maps to an
- *  internal empty stub function.
- *
- *  Each event must only have one associated event handler, but can be raised by multiple sources by calling the
- *  event handler function (with any required event parameters).
- *
- *  @{
- */
-
-#ifndef __USBEVENTS_H__
-#define __USBEVENTS_H__
-
-	/* Includes: */
-		#include "../../../Common/Common.h"
-		#include "USBMode.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_USB_DRIVER)
-			#error Do not include this file directly. Include LUFA/Drivers/USB/USB.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Pseudo-Functions for Doxygen: */
-		#if !defined(__INCLUDE_FROM_EVENTS_C) || defined(__DOXYGEN__)
-			/** Event for USB mode pin level change. This event fires when the USB interface is set to dual role
-			 *  mode, and the UID pin level has changed to indicate a new mode (device or host). This event fires
-			 *  before the mode is switched to the newly indicated mode but after the \ref EVENT_USB_Device_Disconnect
-			 *  event has fired (if disconnected before the role change).
-			 *
-			 *  \note This event only exists on microcontrollers that support dual role USB modes.
-			 *        \n\n
-			 *
-			 *  \note This event does not exist if the \c USB_DEVICE_ONLY or \c USB_HOST_ONLY tokens have been supplied
-			 *        to the compiler (see \ref Group_USBManagement documentation).
-			 */
-			void EVENT_USB_UIDChange(void);
-
-			/** Event for USB host error. This event fires when a hardware fault has occurred whilst the USB
-			 *  interface is in host mode.
-			 *
-			 *  \param[in] ErrorCode  Error code indicating the failure reason, a value in \ref USB_Host_ErrorCodes_t.
-			 *
-			 *  \note This event only exists on microcontrollers that supports USB host mode.
-			 *        \n\n
-			 *
-			 *  \note This event does not exist if the \c USB_DEVICE_ONLY token is supplied to the compiler (see
-			 *        \ref Group_USBManagement documentation).
-			 */
-			void EVENT_USB_Host_HostError(const uint8_t ErrorCode);
-
-			/** Event for USB device attachment. This event fires when a the USB interface is in host mode, and
-			 *  a USB device has been connected to the USB interface. This is interrupt driven, thus fires before
-			 *  the standard \ref EVENT_USB_Device_Connect() event and so can be used to programmatically start the USB
-			 *  management task to reduce CPU consumption.
-			 *
-			 *  \note This event only exists on microcontrollers that supports USB host mode.
-			 *        \n\n
-			 *
-			 *  \note This event does not exist if the \c USB_DEVICE_ONLY token is supplied to the compiler (see
-			 *        \ref Group_USBManagement documentation).
-			 *
-			 *  \see \ref USB_USBTask() for more information on the USB management task and reducing CPU usage.
-			 */
-			void EVENT_USB_Host_DeviceAttached(void);
-
-			/** Event for USB device removal. This event fires when a the USB interface is in host mode, and
-			 *  a USB device has been removed the USB interface whether or not it has been enumerated. This
-			 *  can be used to programmatically stop the USB management task to reduce CPU consumption.
-			 *
-			 *  \note This event only exists on microcontrollers that supports USB host mode.
-			 *        \n\n
-			 *
-			 *  \note This event does not exist if the \c USB_DEVICE_ONLY token is supplied to the compiler (see
-			 *        \ref Group_USBManagement documentation).
-			 *
-			 *  \see \ref USB_USBTask() for more information on the USB management task and reducing CPU usage.
-			 */
-			void EVENT_USB_Host_DeviceUnattached(void);
-
-			/** Event for USB device enumeration failure. This event fires when a the USB interface is
-			 *  in host mode, and an attached USB device has failed to enumerate completely.
-			 *
-			 *  \param[in] ErrorCode     Error code indicating the failure reason, a value in
-			 *                           \ref USB_Host_EnumerationErrorCodes_t.
-			 *
-			 *  \param[in] SubErrorCode  Sub error code indicating the reason for failure - for example, if the
-			 *                           ErrorCode parameter indicates a control error, this will give the error
-			 *                           code returned by the \ref USB_Host_SendControlRequest() function.
-			 *
-			 *  \note This event only exists on microcontrollers that supports USB host mode.
-			 *        \n\n
-			 *
-			 *  \note This event does not exist if the \c USB_DEVICE_ONLY token is supplied to the compiler (see
-			 *        \ref Group_USBManagement documentation).
-			 */
-			void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode,
-			                                            const uint8_t SubErrorCode);
-
-			/** Event for USB device enumeration completion. This event fires when a the USB interface is
-			 *  in host mode and an attached USB device has been completely enumerated and is ready to be
-			 *  controlled by the user application.
-			 *
-			 *  This event is time-critical; exceeding OS-specific delays within this event handler (typically of around
-			 *  1 second) when a transaction is waiting to be processed by the device will prevent break communications
-			 *  and cause the host to reset the USB bus.
-			 *
-			 *  \note This event only exists on microcontrollers that supports USB host mode.
-			 *        \n\n
-			 *
-			 *  \note This event does not exist if the \c USB_DEVICE_ONLY token is supplied to the compiler (see
-			 *        \ref Group_USBManagement documentation).
-			 */
-			void EVENT_USB_Host_DeviceEnumerationComplete(void);
-
-			/** Event for USB Start Of Frame detection, when enabled. This event fires at the start of each USB
-			 *  frame, once per millisecond, and is synchronized to the USB bus. This can be used as an accurate
-			 *  millisecond timer source when the USB bus is not suspended while in host mode.
-			 *
-			 *  This event is time-critical; it is run once per millisecond and thus long handlers will significantly
-			 *  degrade device performance. This event should only be enabled when needed to reduce device wake-ups.
-			 *
-			 *  \note This event is not normally active - it must be manually enabled and disabled via the
-			 *        \ref USB_Host_EnableSOFEvents() and \ref USB_Host_DisableSOFEvents() commands after enumeration of
-			 *        a USB device.
-			 *        \n\n
-			 *
-			 *  \note This event does not exist if the \c USB_DEVICE_ONLY token is supplied to the compiler (see
-			 *        \ref Group_USBManagement documentation).
-			 */
-			void EVENT_USB_Host_StartOfFrame(void);
-
-			/** Event for USB device connection. This event fires when the microcontroller is in USB Device mode
-			 *  and the device is connected to a USB host, beginning the enumeration process measured by a rising
-			 *  level on the microcontroller's VBUS sense pin.
-			 *
-			 *  This event is time-critical; exceeding OS-specific delays within this event handler (typically of around
-			 *  two seconds) will prevent the device from enumerating correctly.
-			 *
-			 *  \attention This event may fire multiple times during device enumeration on the microcontrollers with limited USB controllers
-			 *             if \c NO_LIMITED_CONTROLLER_CONNECT is not defined.
-			 *
-			 *  \note For the microcontrollers with limited USB controller functionality, VBUS sensing is not available.
-			 *        this means that the current connection state is derived from the bus suspension and wake up events by default,
-			 *        which is not always accurate (host may suspend the bus while still connected). If the actual connection state
-			 *        needs to be determined, VBUS should be routed to an external pin, and the auto-detect behavior turned off by
-			 *        passing the \c NO_LIMITED_CONTROLLER_CONNECT token to the compiler via the -D switch at compile time. The connection
-			 *        and disconnection events may be manually fired, and the \ref USB_DeviceState global changed manually.
-			 *        \n\n
-			 *
-			 *  \see \ref Group_USBManagement for more information on the USB management task and reducing CPU usage.
-			 */
-			void EVENT_USB_Device_Connect(void);
-
-			/** Event for USB device disconnection. This event fires when the microcontroller is in USB Device mode and the device is
-			 *  disconnected from a host, measured by a falling level on the microcontroller's VBUS sense pin.
-			 *
-			 *  \attention This event may fire multiple times during device enumeration on the microcontrollers with limited USB controllers
-			 *             if \c NO_LIMITED_CONTROLLER_CONNECT is not defined.
-			 *
-			 *  \note For the microcontrollers with limited USB controllers, VBUS sense is not available to the USB controller.
-			 *        this means that the current connection state is derived from the bus suspension and wake up events by default,
-			 *        which is not always accurate (host may suspend the bus while still connected). If the actual connection state
-			 *        needs to be determined, VBUS should be routed to an external pin, and the auto-detect behavior turned off by
-			 *        passing the \c NO_LIMITED_CONTROLLER_CONNECT token to the compiler via the -D switch at compile time. The connection
-			 *        and disconnection events may be manually fired, and the \ref USB_DeviceState global changed manually.
-			 *        \n\n
-			 *
-			 *  \see \ref Group_USBManagement for more information on the USB management task and reducing CPU usage.
-			 */
-			void EVENT_USB_Device_Disconnect(void);
-
-			/** Event for control requests. This event fires when a the USB host issues a control request
-			 *  to the mandatory device control endpoint (of address 0). This may either be a standard
-			 *  request that the library may have a handler code for internally, or a class specific request
-			 *  issued to the device which must be handled appropriately. If a request is not processed in the
-			 *  user application via this event, it will be passed to the library for processing internally
-			 *  if a suitable handler exists.
-			 *
-			 *  This event is time-critical; each packet within the request transaction must be acknowledged or
-			 *  sent within 50ms or the host will abort the transfer.
-			 *
-			 *  The library internally handles all standard control requests with the exceptions of SYNC FRAME,
-			 *  SET DESCRIPTOR and SET INTERFACE. These and all other non-standard control requests will be left
-			 *  for the user to process via this event if desired. If not handled in the user application or by
-			 *  the library internally, unknown requests are automatically STALLed.
-			 *
-			 *  \note This event does not exist if the \c USB_HOST_ONLY token is supplied to the compiler (see
-			 *        \ref Group_USBManagement documentation).
-			 *        \n\n
-			 *
-			 *  \note Requests should be handled in the same manner as described in the USB 2.0 Specification,
-			 *        or appropriate class specification. In all instances, the library has already read the
-			 *        request SETUP parameters into the \ref USB_ControlRequest structure which should then be used
-			 *        by the application to determine how to handle the issued request.
-			 */
-			void EVENT_USB_Device_ControlRequest(void);
-
-			/** Event for USB configuration number changed. This event fires when a the USB host changes the
-			 *  selected configuration number while in device mode. This event should be hooked in device
-			 *  applications to create the endpoints and configure the device for the selected configuration.
-			 *
-			 *  This event is time-critical; exceeding OS-specific delays within this event handler (typically of around
-			 *  one second) will prevent the device from enumerating correctly.
-			 *
-			 *  This event fires after the value of \ref USB_Device_ConfigurationNumber has been changed.
-			 *
-			 *  \note This event does not exist if the \c USB_HOST_ONLY token is supplied to the compiler (see
-			 *        \ref Group_USBManagement documentation).
-			 */
-			void EVENT_USB_Device_ConfigurationChanged(void);
-
-			/** Event for USB suspend. This event fires when a the USB host suspends the device by halting its
-			 *  transmission of Start Of Frame pulses to the device. This is generally hooked in order to move
-			 *  the device over to a low power state until the host wakes up the device. If the USB interface is
-			 *  enumerated with the \ref USB_OPT_AUTO_PLL option set, the library will automatically suspend the
-			 *  USB PLL before the event is fired to save power.
-			 *
-			 *  \note This event does not exist if the \c USB_HOST_ONLY token is supplied to the compiler (see
-			 *        \ref Group_USBManagement documentation).
-			 *        \n\n
-			 *
-			 *  \note This event does not exist on the microcontrollers with limited USB VBUS sensing abilities
-			 *        when the \c NO_LIMITED_CONTROLLER_CONNECT compile time token is not set - see
-			 *        \ref EVENT_USB_Device_Disconnect.
-			 *
-			 *  \see \ref EVENT_USB_Device_WakeUp() event for accompanying Wake Up event.
-			 */
-			void EVENT_USB_Device_Suspend(void);
-
-			/** Event for USB wake up. This event fires when a the USB interface is suspended while in device
-			 *  mode, and the host wakes up the device by supplying Start Of Frame pulses. This is generally
-			 *  hooked to pull the user application out of a low power state and back into normal operating
-			 *  mode. If the USB interface is enumerated with the \ref USB_OPT_AUTO_PLL option set, the library
-			 *  will automatically restart the USB PLL before the event is fired.
-			 *
-			 *  \note This event does not exist if the \c USB_HOST_ONLY token is supplied to the compiler (see
-			 *        \ref Group_USBManagement documentation).
-			 *        \n\n
-			 *
-			 *  \note This event does not exist on the microcontrollers with limited USB VBUS sensing abilities
-			 *        when the \c NO_LIMITED_CONTROLLER_CONNECT compile time token is not set - see
-			 *        \ref EVENT_USB_Device_Disconnect.
-			 *
-			 *  \see \ref EVENT_USB_Device_Suspend() event for accompanying Suspend event.
-			 */
-			void EVENT_USB_Device_WakeUp(void);
-
-			/** Event for USB interface reset. This event fires when the USB interface is in device mode, and
-			 *  a the USB host requests that the device reset its interface. This event fires after the control
-			 *  endpoint has been automatically configured by the library.
-			 *
-			 *  This event is time-critical; exceeding OS-specific delays within this event handler (typically of around
-			 *  two seconds) will prevent the device from enumerating correctly.
-			 *
-			 *  \note This event does not exist if the \c USB_HOST_ONLY token is supplied to the compiler (see
-			 *        \ref Group_USBManagement documentation).
-			 */
-			void EVENT_USB_Device_Reset(void);
-
-			/** Event for USB Start Of Frame detection, when enabled. This event fires at the start of each USB
-			 *  frame, once per millisecond, and is synchronized to the USB bus. This can be used as an accurate
-			 *  millisecond timer source when the USB bus is enumerated in device mode to a USB host.
-			 *
-			 *  This event is time-critical; it is run once per millisecond and thus long handlers will significantly
-			 *  degrade device performance. This event should only be enabled when needed to reduce device wake-ups.
-			 *
-			 *  \pre This event is not normally active - it must be manually enabled and disabled via the
-			 *       \ref USB_Device_EnableSOFEvents() and \ref USB_Device_DisableSOFEvents() commands after enumeration.
-			 *       \n\n
-			 *
-			 *  \note This event does not exist if the \c USB_HOST_ONLY token is supplied to the compiler (see
-			 *        \ref Group_USBManagement documentation).
-			 */
-			void EVENT_USB_Device_StartOfFrame(void);
-		#endif
-
-	/* Private Interface - For use in library only: */
-	#if !defined(__DOXYGEN__)
-		/* Function Prototypes: */
-			#if defined(__INCLUDE_FROM_EVENTS_C)
-				void USB_Event_Stub(void);
-				void USB_Event_Stub_2(const uint8_t _1);
-				void USB_Event_Stub_3(const uint8_t _1, const uint8_t _2);
-
-				#if defined(USB_CAN_BE_BOTH)
-					void EVENT_USB_UIDChange(void) ATTR_WEAK ATTR_ALIAS(USB_Event_Stub);
-				#endif
-
-				#if defined(USB_CAN_BE_HOST)
-					void EVENT_USB_Host_HostError(const uint8_t ErrorCode) ATTR_WEAK ATTR_ALIAS(USB_Event_Stub_2);
-					void EVENT_USB_Host_DeviceAttached(void) ATTR_WEAK ATTR_ALIAS(USB_Event_Stub);
-					void EVENT_USB_Host_DeviceUnattached(void) ATTR_WEAK ATTR_ALIAS(USB_Event_Stub);
-					void EVENT_USB_Host_DeviceEnumerationComplete(void) ATTR_WEAK ATTR_ALIAS(USB_Event_Stub);
-					void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode,
-                                                                const uint8_t SubErrorCode)
-					                                            ATTR_WEAK ATTR_ALIAS(USB_Event_Stub_3);
-					void EVENT_USB_Host_StartOfFrame(void) ATTR_WEAK ATTR_ALIAS(USB_Event_Stub);
-				#endif
-
-				#if defined(USB_CAN_BE_DEVICE)
-					void EVENT_USB_Device_Connect(void) ATTR_WEAK ATTR_ALIAS(USB_Event_Stub);
-					void EVENT_USB_Device_Disconnect(void) ATTR_WEAK ATTR_ALIAS(USB_Event_Stub);
-					void EVENT_USB_Device_ControlRequest(void) ATTR_WEAK ATTR_ALIAS(USB_Event_Stub);
-					void EVENT_USB_Device_ConfigurationChanged(void) ATTR_WEAK ATTR_ALIAS(USB_Event_Stub);
-					void EVENT_USB_Device_Suspend(void) ATTR_WEAK ATTR_ALIAS(USB_Event_Stub);
-					void EVENT_USB_Device_WakeUp(void) ATTR_WEAK ATTR_ALIAS(USB_Event_Stub);
-					void EVENT_USB_Device_Reset(void) ATTR_WEAK ATTR_ALIAS(USB_Event_Stub);
-					void EVENT_USB_Device_StartOfFrame(void) ATTR_WEAK ATTR_ALIAS(USB_Event_Stub);
-				#endif
-			#endif
-	#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Core/Host.h b/NativePrograms/LUFA/Drivers/USB/Core/Host.h
deleted file mode 100644
index b6a90e6bea..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Core/Host.h
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Common USB Host definitions for all architectures.
- *  \copydetails Group_Host
- *
- *  \note This file should not be included directly. It is automatically included as needed by the USB driver
- *        dispatch header located in LUFA/Drivers/USB/USB.h.
- */
-
-/** \ingroup Group_USB
- *  \defgroup Group_Host Host Management
- *  \brief USB Host management definitions for USB host mode.
- *
- *  USB Host mode related macros and enums. This module contains macros and enums which are used when
- *  the USB controller is initialized in host mode.
- *
- *  @{
- */
-
-#ifndef __USBHOST_H__
-#define __USBHOST_H__
-
-	/* Includes: */
-		#include "../../../Common/Common.h"
-		#include "USBMode.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_USB_DRIVER)
-			#error Do not include this file directly. Include LUFA/Drivers/USB/USB.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Enums: */
-			/** Enum for the various states of the USB Host state machine.
-			 *
-			 *  For information on each possible USB host state, refer to the USB 2.0 specification.
-			 *  Several of the USB host states are broken up further into multiple smaller sub-states,
-			 *  so that they can be internally implemented inside the library in an efficient manner.
-			 *
-			 *  \see \ref USB_HostState, which stores the current host state machine state.
-			 */
-			enum USB_Host_States_t
-			{
-				HOST_STATE_WaitForDevice                = 0,  /**< This state indicates that the stack is waiting for an interval
-				                                               *   to elapse before continuing with the next step of the device
-				                                               *   enumeration process.
-				                                               */
-				HOST_STATE_Unattached                   = 1,  /**< This state indicates that the host state machine is waiting for
-				                                               *   a device to be attached so that it can start the enumeration process.
-				                                               */
-				HOST_STATE_Powered                      = 2,  /**< This state indicates that a device has been attached, and the
-				                                               *   library's internals are being configured to begin the enumeration
-				                                               *   process.
-				                                               */
-				HOST_STATE_Powered_WaitForDeviceSettle  = 3,  /**< This state indicates that the stack is waiting for the initial
-				                                               *   settling period to elapse before beginning the enumeration process.
-				                                               */
-				HOST_STATE_Powered_WaitForConnect       = 4,  /**< This state indicates that the stack is waiting for a connection event
-				                                               *   from the USB controller to indicate a valid USB device has been attached
-				                                               *   to the bus and is ready to be enumerated.
-				                                               */
-				HOST_STATE_Powered_DoReset              = 5,  /**< This state indicates that a valid USB device has been attached, and that
-				                                               *   it will now be reset to ensure it is ready for enumeration.
-				                                               */
-				HOST_STATE_Powered_ConfigPipe           = 6,  /**< This state indicates that the attached device is currently powered and
-				                                               *   reset, and that the control pipe is now being configured by the stack.
-				                                               */
-				HOST_STATE_Default                      = 7,  /**< This state indicates that the stack is currently retrieving the control
-				                                               *   endpoint's size from the device, so that the control pipe can be altered
-				                                               *   to match.
-				                                               */
-				HOST_STATE_Default_PostReset            = 8,  /**< This state indicates that the control pipe is being reconfigured to match
-				                                               *   the retrieved control endpoint size from the device, and the device's USB
-				                                               *   bus address is being set.
-				                                               */
-				HOST_STATE_Default_PostAddressSet       = 9,  /**< This state indicates that the device's address has now been set, and the
-				                                               *   stack is has now completed the device enumeration process. This state causes
-				                                               *   the stack to change the current USB device address to that set for the
-				                                               *   connected device, before progressing to the \ref HOST_STATE_Addressed state
-				                                               *   ready for use in the user application.
-				                                               */
-				HOST_STATE_Addressed                    = 10, /**< Indicates that the device has been enumerated and addressed, and is now waiting
-				                                               *   for the user application to configure the device ready for use.
-				                                               */
-				HOST_STATE_Configured                   = 11, /**< Indicates that the device has been configured into a valid device configuration,
-				                                               *   ready for general use by the user application.
-				                                               */
-			};
-
-	/* Architecture Includes: */
-		#if (ARCH == ARCH_AVR8)
-			#include "AVR8/Host_AVR8.h"
-		#elif (ARCH == ARCH_UC3)
-			#include "UC3/Host_UC3.h"
-		#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Core/HostStandardReq.c b/NativePrograms/LUFA/Drivers/USB/Core/HostStandardReq.c
deleted file mode 100644
index e431d8052d..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Core/HostStandardReq.c
+++ /dev/null
@@ -1,322 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-#define  __INCLUDE_FROM_USB_DRIVER
-#include "USBMode.h"
-
-#if defined(USB_CAN_BE_HOST)
-
-#define  __INCLUDE_FROM_HOSTSTDREQ_C
-#include "HostStandardReq.h"
-
-uint8_t USB_Host_ConfigurationNumber;
-
-static uint8_t USB_Host_SendControlRequest_PRV(void* const BufferPtr)
-{
-	uint8_t* DataStream   = (uint8_t*)BufferPtr;
-	uint8_t  ReturnStatus = HOST_SENDCONTROL_Successful;
-	uint16_t DataLen      = USB_ControlRequest.wLength;
-
-	USB_Host_ResumeBus();
-
-	if ((ReturnStatus = USB_Host_WaitMS(1)) != HOST_WAITERROR_Successful)
-	  return ReturnStatus;
-
-	Pipe_SetPipeToken(PIPE_TOKEN_SETUP);
-	Pipe_ClearError();
-
-	Pipe_Unfreeze();
-
-	#if defined(ARCH_BIG_ENDIAN)
-	Pipe_Write_8(USB_ControlRequest.bmRequestType);
-	Pipe_Write_8(USB_ControlRequest.bRequest);
-	Pipe_Write_16_LE(USB_ControlRequest.wValue);
-	Pipe_Write_16_LE(USB_ControlRequest.wIndex);
-	Pipe_Write_16_LE(USB_ControlRequest.wLength);
-	#else
-	uint8_t* HeaderStream = (uint8_t*)&USB_ControlRequest;
-
-	for (uint8_t HeaderByte = 0; HeaderByte < sizeof(USB_Request_Header_t); HeaderByte++)
-	  Pipe_Write_8(*(HeaderStream++));
-	#endif
-
-	Pipe_ClearSETUP();
-
-	if ((ReturnStatus = USB_Host_WaitForIOS(USB_HOST_WAITFOR_SetupSent)) != HOST_SENDCONTROL_Successful)
-	  return ReturnStatus;
-
-	Pipe_Freeze();
-
-	if ((ReturnStatus = USB_Host_WaitMS(1)) != HOST_WAITERROR_Successful)
-	  return ReturnStatus;
-
-	if ((USB_ControlRequest.bmRequestType & CONTROL_REQTYPE_DIRECTION) == REQDIR_DEVICETOHOST)
-	{
-		Pipe_SetPipeToken(PIPE_TOKEN_IN);
-
-		if (DataStream != NULL)
-		{
-			while (DataLen)
-			{
-				Pipe_Unfreeze();
-
-				if ((ReturnStatus = USB_Host_WaitForIOS(USB_HOST_WAITFOR_InReceived)) != HOST_SENDCONTROL_Successful)
-				  return ReturnStatus;
-
-				if (!(Pipe_BytesInPipe()))
-				  DataLen = 0;
-
-				while (Pipe_BytesInPipe() && DataLen)
-				{
-					*(DataStream++) = Pipe_Read_8();
-					DataLen--;
-				}
-
-				Pipe_Freeze();
-				Pipe_ClearIN();
-			}
-		}
-
-		Pipe_SetPipeToken(PIPE_TOKEN_OUT);
-		Pipe_Unfreeze();
-
-		if ((ReturnStatus = USB_Host_WaitForIOS(USB_HOST_WAITFOR_OutReady)) != HOST_SENDCONTROL_Successful)
-		  return ReturnStatus;
-
-		Pipe_ClearOUT();
-
-		if ((ReturnStatus = USB_Host_WaitForIOS(USB_HOST_WAITFOR_OutReady)) != HOST_SENDCONTROL_Successful)
-		  return ReturnStatus;
-	}
-	else
-	{
-		if (DataStream != NULL)
-		{
-			Pipe_SetPipeToken(PIPE_TOKEN_OUT);
-			Pipe_Unfreeze();
-
-			while (DataLen)
-			{
-				if ((ReturnStatus = USB_Host_WaitForIOS(USB_HOST_WAITFOR_OutReady)) != HOST_SENDCONTROL_Successful)
-				  return ReturnStatus;
-
-				while (DataLen && (Pipe_BytesInPipe() < USB_Host_ControlPipeSize))
-				{
-					Pipe_Write_8(*(DataStream++));
-					DataLen--;
-				}
-
-				Pipe_ClearOUT();
-			}
-
-			if ((ReturnStatus = USB_Host_WaitForIOS(USB_HOST_WAITFOR_OutReady)) != HOST_SENDCONTROL_Successful)
-			  return ReturnStatus;
-
-			Pipe_Freeze();
-		}
-
-		Pipe_SetPipeToken(PIPE_TOKEN_IN);
-		Pipe_Unfreeze();
-
-		if ((ReturnStatus = USB_Host_WaitForIOS(USB_HOST_WAITFOR_InReceived)) != HOST_SENDCONTROL_Successful)
-		  return ReturnStatus;
-
-		Pipe_ClearIN();
-	}
-
-	return ReturnStatus;
-}
-
-static uint8_t USB_Host_WaitForIOS(const uint8_t WaitType)
-{
-	#if (USB_HOST_TIMEOUT_MS < 0xFF)
-	uint8_t  TimeoutCounter = USB_HOST_TIMEOUT_MS;
-	#else
-	uint16_t TimeoutCounter = USB_HOST_TIMEOUT_MS;
-	#endif
-
-	while (!(((WaitType == USB_HOST_WAITFOR_SetupSent)  && Pipe_IsSETUPSent())  ||
-	         ((WaitType == USB_HOST_WAITFOR_InReceived) && Pipe_IsINReceived()) ||
-	         ((WaitType == USB_HOST_WAITFOR_OutReady)   && Pipe_IsOUTReady())))
-	{
-		uint8_t ErrorCode;
-
-		if ((ErrorCode = USB_Host_WaitMS(1)) != HOST_WAITERROR_Successful)
-		  return ErrorCode;
-
-		if (!(TimeoutCounter--))
-		  return HOST_SENDCONTROL_SoftwareTimeOut;
-	}
-
-	return HOST_SENDCONTROL_Successful;
-}
-
-uint8_t USB_Host_SendControlRequest(void* const BufferPtr)
-{
-	bool BusSuspended    = USB_Host_IsBusSuspended();
-	uint8_t ReturnStatus = USB_Host_SendControlRequest_PRV(BufferPtr);
-
-	Pipe_Freeze();
-
-	if (BusSuspended)
-	  USB_Host_SuspendBus();
-
-	Pipe_ResetPipe(PIPE_CONTROLPIPE);
-
-	return ReturnStatus;
-}
-
-uint8_t USB_Host_SetDeviceConfiguration(const uint8_t ConfigNumber)
-{
-	uint8_t ErrorCode;
-
-	USB_ControlRequest = (USB_Request_Header_t)
-		{
-			.bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_DEVICE),
-			.bRequest      = REQ_SetConfiguration,
-			.wValue        = ConfigNumber,
-			.wIndex        = 0,
-			.wLength       = 0,
-		};
-
-	Pipe_SelectPipe(PIPE_CONTROLPIPE);
-
-	if ((ErrorCode = USB_Host_SendControlRequest(NULL)) == HOST_SENDCONTROL_Successful)
-	{
-		USB_Host_ConfigurationNumber = ConfigNumber;
-		USB_HostState                = (ConfigNumber) ? HOST_STATE_Configured : HOST_STATE_Addressed;
-	}
-
-	return ErrorCode;
-}
-
-uint8_t USB_Host_GetDeviceConfiguration(uint8_t* const ConfigNumber)
-{
-	USB_ControlRequest = (USB_Request_Header_t)
-		{
-			.bmRequestType = (REQDIR_DEVICETOHOST | REQTYPE_STANDARD | REQREC_DEVICE),
-			.bRequest      = REQ_GetConfiguration,
-			.wValue        = 0,
-			.wIndex        = 0,
-			.wLength       = sizeof(uint8_t),
-		};
-
-	Pipe_SelectPipe(PIPE_CONTROLPIPE);
-
-	return USB_Host_SendControlRequest(ConfigNumber);
-}
-
-uint8_t USB_Host_GetDescriptor(const uint8_t Type,
-                               const uint8_t Index,
-                               void* const Buffer,
-                               const uint8_t BufferLength)
-{
-	USB_ControlRequest = (USB_Request_Header_t)
-		{
-			.bmRequestType = (REQDIR_DEVICETOHOST | REQTYPE_STANDARD | REQREC_DEVICE),
-			.bRequest      = REQ_GetDescriptor,
-			.wValue        = (((uint16_t)Type << 8) | Index),
-			.wIndex        = 0,
-			.wLength       = BufferLength,
-		};
-
-	Pipe_SelectPipe(PIPE_CONTROLPIPE);
-
-	return USB_Host_SendControlRequest(Buffer);
-}
-
-uint8_t USB_Host_GetDeviceStatus(uint8_t* const FeatureStatus)
-{
-	USB_ControlRequest = (USB_Request_Header_t)
-		{
-			.bmRequestType = (REQDIR_DEVICETOHOST | REQTYPE_STANDARD | REQREC_DEVICE),
-			.bRequest      = REQ_GetStatus,
-			.wValue        = 0,
-			.wIndex        = 0,
-			.wLength       = 0,
-		};
-
-	Pipe_SelectPipe(PIPE_CONTROLPIPE);
-
-	return USB_Host_SendControlRequest(FeatureStatus);
-}
-
-uint8_t USB_Host_ClearEndpointStall(const uint8_t EndpointAddress)
-{
-	USB_ControlRequest = (USB_Request_Header_t)
-		{
-			.bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_ENDPOINT),
-			.bRequest      = REQ_ClearFeature,
-			.wValue        = FEATURE_SEL_EndpointHalt,
-			.wIndex        = EndpointAddress,
-			.wLength       = 0,
-		};
-
-	Pipe_SelectPipe(PIPE_CONTROLPIPE);
-
-	return USB_Host_SendControlRequest(NULL);
-}
-
-uint8_t USB_Host_SetInterfaceAltSetting(const uint8_t InterfaceIndex,
-                                        const uint8_t AltSetting)
-{
-	USB_ControlRequest = (USB_Request_Header_t)
-		{
-			.bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_INTERFACE),
-			.bRequest      = REQ_SetInterface,
-			.wValue        = AltSetting,
-			.wIndex        = InterfaceIndex,
-			.wLength       = 0,
-		};
-
-	Pipe_SelectPipe(PIPE_CONTROLPIPE);
-
-	return USB_Host_SendControlRequest(NULL);
-}
-
-uint8_t USB_Host_GetInterfaceAltSetting(const uint8_t InterfaceIndex,
-                                        uint8_t* const AltSetting)
-{
-	USB_ControlRequest = (USB_Request_Header_t)
-		{
-			.bmRequestType = (REQDIR_DEVICETOHOST | REQTYPE_STANDARD | REQREC_INTERFACE),
-			.bRequest      = REQ_GetInterface,
-			.wValue        = 0,
-			.wIndex        = InterfaceIndex,
-			.wLength       = sizeof(uint8_t),
-		};
-
-	Pipe_SelectPipe(PIPE_CONTROLPIPE);
-
-	return USB_Host_SendControlRequest(AltSetting);
-}
-
-#endif
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Core/HostStandardReq.h b/NativePrograms/LUFA/Drivers/USB/Core/HostStandardReq.h
deleted file mode 100644
index c816fa6850..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Core/HostStandardReq.h
+++ /dev/null
@@ -1,292 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief USB host standard request management.
- *
- *  This file contains the function prototypes necessary for the issuing of outgoing standard control requests
- *  when the library is in USB host mode.
- *
- *  \note This file should not be included directly. It is automatically included as needed by the USB driver
- *        dispatch header located in LUFA/Drivers/USB/USB.h.
- */
-
-#ifndef __HOSTSTDREQ_H__
-#define __HOSTSTDREQ_H__
-
-	/* Includes: */
-		#include "../../../Common/Common.h"
-		#include "USBMode.h"
-		#include "StdRequestType.h"
-		#include "USBController.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_USB_DRIVER)
-			#error Do not include this file directly. Include LUFA/Drivers/USB/USB.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			#if !defined(USB_HOST_TIMEOUT_MS) || defined(__DOXYGEN__)
-				/** Constant for the maximum software timeout period of sent USB control transactions to an attached
-				 *  device. If a device fails to respond to a sent control request within this period, the
-				 *  library will return a timeout error code.
-				 *
-				 *  This value may be overridden in the user project makefile as the value of the
-				 *  \ref USB_HOST_TIMEOUT_MS token, and passed to the compiler using the -D switch.
-				 */
-				#define USB_HOST_TIMEOUT_MS                1000
-			#endif
-
-		/* Enums: */
-			/** Enum for the \ref USB_Host_SendControlRequest() return code, indicating the reason for the error
-			 *  if the transfer of the request is unsuccessful.
-			 *
-			 *  \ingroup Group_PipeControlReq
-			 */
-			enum USB_Host_SendControlErrorCodes_t
-			{
-				HOST_SENDCONTROL_Successful         = 0, /**< No error occurred in the request transfer. */
-				HOST_SENDCONTROL_DeviceDisconnected = 1, /**< The attached device was disconnected during the
-				                                        *     request transfer.
-				                                        */
-				HOST_SENDCONTROL_PipeError          = 2, /**< An error occurred in the pipe while sending the request. */
-				HOST_SENDCONTROL_SetupStalled       = 3, /**< The attached device stalled the request, usually
-				                                          *   indicating that the request is unsupported on the device.
-				                                          */
-				HOST_SENDCONTROL_SoftwareTimeOut    = 4, /**< The request or data transfer timed out. */
-			};
-
-		/* Global Variables: */
-			/** Indicates the currently set configuration number of the attached device. This indicates the currently
-			 *  selected configuration value if one has been set successfully, or 0 if no configuration has been selected.
-			 *
-			 *  To set a device configuration, call the \ref USB_Host_SetDeviceConfiguration() function.
-			 *
-			 *  \attention This variable should be treated as read-only in the user application, and never manually
-			 *             changed in value.
-			 *
-			 *  \ingroup Group_Host
-			 */
-			extern uint8_t USB_Host_ConfigurationNumber;
-
-		/* Function Prototypes: */
-			/** Sends the request stored in the \ref USB_ControlRequest global structure to the attached device,
-			 *  and transfers the data stored in the buffer to the device, or from the device to the buffer
-			 *  as requested. The transfer is made on the currently selected pipe.
-			 *
-			 *  \ingroup Group_PipeControlReq
-			 *
-			 *  \param[in] BufferPtr  Pointer to the start of the data buffer if the request has a data stage, or
-			 *                        \c NULL if the request transfers no data to or from the device.
-			 *
-			 *  \return A value from the \ref USB_Host_SendControlErrorCodes_t enum to indicate the result.
-			 */
-			uint8_t USB_Host_SendControlRequest(void* const BufferPtr);
-
-			/** Sends a SET CONFIGURATION standard request to the attached device, with the given configuration index.
-			 *
-			 *  This routine will automatically update the \ref USB_HostState and \ref USB_Host_ConfigurationNumber
-			 *  state variables according to the given function parameters and the result of the request.
-			 *
-			 *  \note After this routine returns, the control pipe will be selected.
-			 *
-			 *  \ingroup Group_PipeControlReq
-			 *
-			 *  \param[in] ConfigNumber  Configuration index to send to the device.
-			 *
-			 *  \return A value from the \ref USB_Host_SendControlErrorCodes_t enum to indicate the result.
-			 */
-			uint8_t USB_Host_SetDeviceConfiguration(const uint8_t ConfigNumber);
-
-			/** Sends a GET CONFIGURATION standard request to the attached device, to retrieve the currently selected
-			 *  device configuration index.
-			 *
-			 *  \note After this routine returns, the control pipe will be selected.
-			 *
-			 *  \ingroup Group_PipeControlReq
-			 *
-			 *  \param[out] ConfigNumber  Pointer to a location where the retrieved configuration index should be stored.
-			 *
-			 *  \return A value from the \ref USB_Host_SendControlErrorCodes_t enum to indicate the result.
-			 */
-			uint8_t USB_Host_GetDeviceConfiguration(uint8_t* const ConfigNumber) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Sends a GET DESCRIPTOR standard request to the attached device, requesting the  descriptor of the
-			 *  specified type and index.
-			 *
-			 *  \note After this routine returns, the control pipe will be selected.
-			 *
-			 *  \ingroup Group_PipeControlReq
-			 *
-			 *  \param[in]  Type          Type of descriptor to retrieve, a value from the \ref USB_DescriptorTypes_t enum.
-			 *  \param[in]  Index         Index of the descriptor to retrieve.
-			 *  \param[out] Buffer        Pointer to the destination buffer where the retrieved string descriptor is to be stored.
-			 *  \param[in]  BufferLength  Maximum size of the string descriptor which can be stored into the buffer.
-			 *
-			 *  \return A value from the \ref USB_Host_SendControlErrorCodes_t enum to indicate the result.
-			 */
-			uint8_t USB_Host_GetDescriptor(const uint8_t Type,
-			                               const uint8_t Index,
-			                               void* const Buffer,
-			                               const uint8_t BufferLength) ATTR_NON_NULL_PTR_ARG(3);
-
-			/** Retrieves the current feature status of the attached device, via a GET STATUS standard request. The
-			 *  retrieved feature status can then be examined by masking the retrieved value with the various
-			 *  \c FEATURE_* masks for bus/self power information and remote wakeup support.
-			 *
-			 *  \note After this routine returns, the control pipe will be selected.
-			 *
-			 *  \ingroup Group_PipeControlReq
-			 *
-			 *  \param[out]  FeatureStatus  Location where the retrieved feature status should be stored.
-			 *
-			 *  \return A value from the \ref USB_Host_SendControlErrorCodes_t enum to indicate the result.
-			 */
-			uint8_t USB_Host_GetDeviceStatus(uint8_t* const FeatureStatus) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Clears a stall condition on the given pipe, via a CLEAR FEATURE standard request to the attached device.
-			 *
-			 *  \note After this routine returns, the control pipe will be selected.
-			 *
-			 *  \ingroup Group_PipeControlReq
-			 *
-			 *  \param[in] EndpointAddress  Address of the endpoint to clear, including the endpoint's direction.
-			 *
-			 *  \return A value from the \ref USB_Host_SendControlErrorCodes_t enum to indicate the result.
-			 */
-			uint8_t USB_Host_ClearEndpointStall(const uint8_t EndpointAddress);
-
-			/** Selects a given alternative setting for the specified interface, via a SET INTERFACE standard request to
-			 *  the attached device.
-			 *
-			 *  \note After this routine returns, the control pipe will be selected.
-			 *
-			 *  \ingroup Group_PipeControlReq
-			 *
-			 *  \param[in] InterfaceIndex  Index of the interface whose alternative setting is to be altered.
-			 *  \param[in] AltSetting      Index of the interface's alternative setting which is to be selected.
-			 *
-			 *  \return A value from the \ref USB_Host_SendControlErrorCodes_t enum to indicate the result.
-			 */
-			uint8_t USB_Host_SetInterfaceAltSetting(const uint8_t InterfaceIndex,
-			                                        const uint8_t AltSetting);
-
-
-			/** Retrieves the current alternative setting for the specified interface, via a GET INTERFACE standard request to
-			 *  the attached device.
-			 *
-			 *  \note After this routine returns, the control pipe will be selected.
-			 *
-			 *  \ingroup Group_PipeControlReq
-			 *
-			 *  \param[in]  InterfaceIndex  Index of the interface whose alternative setting is to be altered.
-			 *  \param[out] AltSetting      Pointer to a location where the retrieved alternative setting value should be stored.
-			 *
-			 *  \return A value from the \ref USB_Host_SendControlErrorCodes_t enum to indicate the result.
-			 */
-			uint8_t USB_Host_GetInterfaceAltSetting(const uint8_t InterfaceIndex,
-			                                        uint8_t* const AltSetting) ATTR_NON_NULL_PTR_ARG(2);
-
-		/* Inline Functions: */
-			/** Sends a GET DESCRIPTOR standard request to the attached device, requesting the device descriptor.
-			 *  This can be used to easily retrieve information about the device such as its VID, PID and power
-			 *  requirements. This is a convenience wrapper for \ref USB_Host_GetDescriptor().
-			 *
-			 *  \note After this routine returns, the control pipe will be selected.
-			 *
-			 *  \ingroup Group_PipeControlReq
-			 *
-			 *  \param[out] DeviceDescriptorPtr  Pointer to the destination device descriptor structure where
-			 *                                   the read data is to be stored.
-			 *
-			 *  \return A value from the \ref USB_Host_SendControlErrorCodes_t enum to indicate the result.
-			 */
-			static inline uint8_t USB_Host_GetDeviceDescriptor(USB_Descriptor_Device_t* const DeviceDescriptorPtr) ATTR_NON_NULL_PTR_ARG(1);
-			static inline uint8_t USB_Host_GetDeviceDescriptor(USB_Descriptor_Device_t* const DeviceDescriptorPtr)
-			{
-				return USB_Host_GetDescriptor(DTYPE_Device, 0, DeviceDescriptorPtr, sizeof(USB_Descriptor_Device_t));
-			}
-
-			/** Sends a GET DESCRIPTOR standard request to the attached device, requesting the string descriptor
-			 *  of the specified index. This can be used to easily retrieve string descriptors from the device by
-			 *  index, after the index is obtained from the Device or Configuration descriptors. This is a convenience
-			 *  wrapper for \ref USB_Host_GetDescriptor().
-			 *
-			 *  \note After this routine returns, the control pipe will be selected.
-			 *
-			 *  \ingroup Group_PipeControlReq
-			 *
-			 *  \param[in]  Index        Index of the string descriptor to retrieve.
-			 *  \param[out] Buffer       Pointer to the destination buffer where the retrieved string descriptor is
-			 *                           to be stored.
-			 *  \param[in] BufferLength  Maximum size of the string descriptor which can be stored into the buffer.
-			 *
-			 *  \return A value from the \ref USB_Host_SendControlErrorCodes_t enum to indicate the result.
-			 */
-			static inline uint8_t USB_Host_GetDeviceStringDescriptor(const uint8_t Index,
-			                                                         void* const Buffer,
-			                                                         const uint8_t BufferLength) ATTR_NON_NULL_PTR_ARG(2);
-			static inline uint8_t USB_Host_GetDeviceStringDescriptor(const uint8_t Index,
-			                                                         void* const Buffer,
-			                                                         const uint8_t BufferLength)
-			{
-				return USB_Host_GetDescriptor(DTYPE_String, Index,  Buffer, BufferLength);
-			}
-
-	/* Private Interface - For use in library only: */
-	#if !defined(__DOXYGEN__)
-		/* Enums: */
-			enum USB_WaitForTypes_t
-			{
-				USB_HOST_WAITFOR_SetupSent,
-				USB_HOST_WAITFOR_InReceived,
-				USB_HOST_WAITFOR_OutReady,
-			};
-
-		/* Function Prototypes: */
-			#if defined(__INCLUDE_FROM_HOSTSTDREQ_C)
-				static uint8_t USB_Host_SendControlRequest_PRV(void* const BufferPtr);
-				static uint8_t USB_Host_WaitForIOS(const uint8_t WaitType);
-			#endif
-	#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Core/OTG.h b/NativePrograms/LUFA/Drivers/USB/Core/OTG.h
deleted file mode 100644
index 8025f579d3..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Core/OTG.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Common USB OTG definitions for all architectures.
- *  \copydetails Group_OTG
- *
- *  \note This file should not be included directly. It is automatically included as needed by the USB driver
- *        dispatch header located in LUFA/Drivers/USB/USB.h.
- */
-
-/** \ingroup Group_USB
- *  \defgroup Group_OTG USB On The Go (OTG) Management
- *  \brief USB OTG management definitions.
- *
- *  This module contains macros for embedded USB hosts with dual role On The Go capabilities, for managing role
- *  exchange. OTG is a way for two USB dual role devices to talk to one another directly without fixed device/host
- *  roles.
- *
- *  @{
- */
-
-#ifndef __USBOTG_H__
-#define __USBOTG_H__
-
-	/* Includes: */
-		#include "../../../Common/Common.h"
-		#include "USBMode.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_USB_DRIVER)
-			#error Do not include this file directly. Include LUFA/Drivers/USB/USB.h instead.
-		#endif
-
-	/* Architecture Includes: */
-		#if (ARCH == ARCH_AVR8)
-			#include "AVR8/OTG_AVR8.h"
-		#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Core/Pipe.h b/NativePrograms/LUFA/Drivers/USB/Core/Pipe.h
deleted file mode 100644
index 9607786bcf..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Core/Pipe.h
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Common USB Pipe definitions for all architectures.
- *  \copydetails Group_PipeManagement
- *
- *  \note This file should not be included directly. It is automatically included as needed by the USB driver
- *        dispatch header located in LUFA/Drivers/USB/USB.h.
- */
-
-/** \ingroup Group_PipeManagement
- *  \defgroup Group_PipeRW Pipe Data Reading and Writing
- *  \brief Pipe data read/write definitions.
- *
- *  Functions, macros, variables, enums and types related to data reading and writing from and to pipes.
- */
-
-/** \ingroup Group_PipeRW
- *  \defgroup Group_PipePrimitiveRW Read/Write of Primitive Data Types
- *  \brief Pipe data primitive read/write definitions.
- *
- *  Functions, macros, variables, enums and types related to data reading and writing of primitive data types
- *  from and to pipes.
- */
-
-/** \ingroup Group_PipeManagement
- *  \defgroup Group_PipePacketManagement Pipe Packet Management
- *  \brief Pipe packet management definitions.
- *
- *  Functions, macros, variables, enums and types related to packet management of pipes.
- */
-
-/** \ingroup Group_PipeManagement
- *  \defgroup Group_PipeControlReq Pipe Control Request Management
- *  \brief Pipe control request definitions.
- *
- *  Module for host mode request processing. This module allows for the transmission of standard, class and
- *  vendor control requests to the default control endpoint of an attached device while in host mode.
- *
- *  \see Chapter 9 of the USB 2.0 specification.
- */
-
-/** \ingroup Group_USB
- *  \defgroup Group_PipeManagement Pipe Management
- *  \brief Pipe management definitions.
- *
- *  This module contains functions, macros and enums related to pipe management when in USB Host mode. This
- *  module contains the pipe management macros, as well as pipe interrupt and data send/receive functions
- *  for various data types.
- *
- *  @{
- */
-
-#ifndef __PIPE_H__
-#define __PIPE_H__
-
-	/* Includes: */
-		#include "../../../Common/Common.h"
-		#include "USBMode.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_USB_DRIVER)
-			#error Do not include this file directly. Include LUFA/Drivers/USB/USB.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Type Defines: */
-			/** Type define for a pipe table entry, used to configure pipes in groups via
-			 *  \ref Pipe_ConfigurePipeTable().
-			 */
-			typedef struct
-			{
-				uint8_t  Address; /**< Address of the pipe to configure, or zero if the table entry is to be unused. */
-				uint16_t Size; /**< Size of the pipe bank, in bytes. */
-				uint8_t  EndpointAddress; /**< Address of the endpoint in the connected device. */
-				uint8_t  Type; /**< Type of the endpoint, a \c EP_TYPE_* mask. */
-				uint8_t  Banks; /**< Number of hardware banks to use for the pipe. */
-			} USB_Pipe_Table_t;
-
-		/* Macros: */
-			/** Pipe address for the default control pipe, which always resides in address 0. This is
-			 *  defined for convenience to give more readable code when used with the pipe macros.
-			 */
-			#define PIPE_CONTROLPIPE                0
-
-			/** Pipe number mask, for masking against pipe addresses to retrieve the pipe's numerical address
-			 *  in the device.
-			 */
-			#define PIPE_PIPENUM_MASK               0x0F
-
-			/** Endpoint number mask, for masking against endpoint addresses to retrieve the endpoint's
-			 *  numerical address in the attached device.
-			 */
-			#define PIPE_EPNUM_MASK                 0x0F
-
-	/* Architecture Includes: */
-		#if (ARCH == ARCH_AVR8)
-			#include "AVR8/Pipe_AVR8.h"
-		#elif (ARCH == ARCH_UC3)
-			#include "UC3/Pipe_UC3.h"
-		#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Core/PipeStream.h b/NativePrograms/LUFA/Drivers/USB/Core/PipeStream.h
deleted file mode 100644
index 1afb8d0276..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Core/PipeStream.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Pipe data stream transmission and reception management.
- *  \copydetails Group_PipeStreamRW
- *
- *  \note This file should not be included directly. It is automatically included as needed by the USB driver
- *        dispatch header located in LUFA/Drivers/USB/USB.h.
- */
-
-/** \ingroup Group_PipeRW
- *  \defgroup Group_PipeStreamRW Read/Write of Multi-Byte Streams
- *  \brief Pipe data stream transmission and reception management.
- *
- *  Functions, macros, variables, enums and types related to data reading and writing of data streams from
- *  and to pipes.
- *
- *  @{
- */
-
-#ifndef __PIPE_STREAM_H__
-#define __PIPE_STREAM_H__
-
-	/* Includes: */
-		#include "../../../Common/Common.h"
-		#include "USBMode.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_USB_DRIVER)
-			#error Do not include this file directly. Include LUFA/Drivers/USB/USB.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Enums: */
-			/** Enum for the possible error return codes of the Pipe_*_Stream_* functions. */
-			enum Pipe_Stream_RW_ErrorCodes_t
-			{
-				PIPE_RWSTREAM_NoError            = 0, /**< Command completed successfully, no error. */
-				PIPE_RWSTREAM_PipeStalled        = 1, /**< The device stalled the pipe during the transfer. */
-				PIPE_RWSTREAM_DeviceDisconnected = 2, /**< Device was disconnected from the host during
-			                                           *   the transfer.
-			                                           */
-				PIPE_RWSTREAM_Timeout            = 3, /**< The device failed to accept or send the next packet
-				                                       *   within the software timeout period set by the
-				                                       *   \ref USB_STREAM_TIMEOUT_MS macro.
-				                                       */
-				PIPE_RWSTREAM_IncompleteTransfer = 4, /**< Indicates that the pipe bank became full/empty before the
-				                                       *   complete contents of the stream could be transferred.
-				                                       */
-			};
-
-	/* Architecture Includes: */
-		#if (ARCH == ARCH_AVR8)
-			#include "AVR8/PipeStream_AVR8.h"
-		#elif (ARCH == ARCH_UC3)
-			#include "UC3/PipeStream_UC3.h"
-		#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Core/StdDescriptors.h b/NativePrograms/LUFA/Drivers/USB/Core/StdDescriptors.h
deleted file mode 100644
index 3256b2d077..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Core/StdDescriptors.h
+++ /dev/null
@@ -1,770 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Common standard USB Descriptor definitions for all architectures.
- *  \copydetails Group_StdDescriptors
- *
- *  \note This file should not be included directly. It is automatically included as needed by the USB driver
- *        dispatch header located in LUFA/Drivers/USB/USB.h.
- */
-
-/** \ingroup Group_USB
- *  \defgroup Group_StdDescriptors USB Descriptors
- *  \brief Standard USB Descriptor definitions.
- *
- *  Standard USB device descriptor defines and retrieval routines, for USB devices. This module contains
- *  structures and macros for the easy creation of standard USB descriptors in USB device projects.
- *
- *  @{
- */
-
-#ifndef __USBDESCRIPTORS_H__
-#define __USBDESCRIPTORS_H__
-
-	/* Includes: */
-		#include "../../../Common/Common.h"
-		#include "USBMode.h"
-		#include "Events.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_USB_DRIVER)
-			#error Do not include this file directly. Include LUFA/Drivers/USB/USB.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Indicates that a given descriptor does not exist in the device. This can be used inside descriptors
-			 *  for string descriptor indexes, or may be use as a return value for GetDescriptor when the specified
-			 *  descriptor does not exist.
-			 */
-			#define NO_DESCRIPTOR                     0
-
-			/** Macro to calculate the power value for the configuration descriptor, from a given number of milliamperes.
-			 *
-			 *  \param[in] mA  Maximum number of milliamps the device consumes when the given configuration is selected.
-			 */
-			#define USB_CONFIG_POWER_MA(mA)           ((mA) >> 1)
-
-			/** Macro to calculate the Unicode length of a string with a given number of Unicode characters.
-			 *  Should be used in string descriptor's headers for giving the string descriptor's byte length.
-			 *
-			 *  \param[in] UnicodeChars  Number of Unicode characters in the string text.
-			 */
-			#define USB_STRING_LEN(UnicodeChars)      (sizeof(USB_Descriptor_Header_t) + ((UnicodeChars) << 1))
-
-			/** Convenience macro to easily create \ref USB_Descriptor_String_t instances from a wide character string.
-			 *
-			 *  \note This macro is for little-endian systems only.
-			 *
-			 *  \param[in] String  String to initialize a USB String Descriptor structure with.
-			 */
-			#define USB_STRING_DESCRIPTOR(String)     { .Header = {.Size = sizeof(USB_Descriptor_Header_t) + (sizeof(String) - 2), .Type = DTYPE_String}, .UnicodeString = String }
-
-			/** Convenience macro to easily create \ref USB_Descriptor_String_t instances from an array of characters.
-			 *
-			 *  \param[in] ...  Characters to initialize a USB String Descriptor structure with.
-			 */
-			#define USB_STRING_DESCRIPTOR_ARRAY(...)  { .Header = {.Size = sizeof(USB_Descriptor_Header_t) + sizeof((uint16_t[]){__VA_ARGS__}), .Type = DTYPE_String}, .UnicodeString = {__VA_ARGS__} }
-
-			/** Macro to encode a given major/minor/revision version number into Binary Coded Decimal format for descriptor
-			 *  fields requiring BCD encoding, such as the USB version number in the standard device descriptor.
-			 *
-			 *  \note This value is automatically converted into Little Endian, suitable for direct use inside device
-			 *        descriptors on all architectures without endianness conversion macros.
-			 *
-			 *  \param[in]  Major     Major version number to encode.
-			 *  \param[in]  Minor     Minor version number to encode.
-			 *  \param[in]  Revision  Revision version number to encode.
-			 */
-			#define VERSION_BCD(Major, Minor, Revision) \
-			                                          CPU_TO_LE16( ((Major & 0xFF) << 8) | \
-			                                                       ((Minor & 0x0F) << 4) | \
-			                                                       (Revision & 0x0F) )
-
-			/** String language ID for the English language. Should be used in \ref USB_Descriptor_String_t descriptors
-			 *  to indicate that the English language is supported by the device in its string descriptors.
-			 */
-			#define LANGUAGE_ID_ENG                   0x0409
-
-			/** \name USB Configuration Descriptor Attribute Masks */
-			/**@{*/
-			/** Mask for the reserved bit in the Configuration Descriptor's \c ConfigAttributes field, which must be always
-			 *  set on all USB devices for historical purposes.
-			 */
-			#define USB_CONFIG_ATTR_RESERVED          0x80
-
-			/** Can be masked with other configuration descriptor attributes for a \ref USB_Descriptor_Configuration_Header_t
-			 *  descriptor's \c ConfigAttributes value to indicate that the specified configuration can draw its power
-			 *  from the device's own power source, instead of drawing it from the USB host.
-			 *
-			 *  Note that the host will probe this dynamically - the device should report its current power state via the
-			 *  \ref USB_Device_CurrentlySelfPowered global variable.
-			 */
-			#define USB_CONFIG_ATTR_SELFPOWERED       0x40
-
-			/** Can be masked with other configuration descriptor attributes for a \ref USB_Descriptor_Configuration_Header_t
-			 *  descriptor's \c ConfigAttributes value to indicate that the specified configuration supports the
-			 *  remote wakeup feature of the USB standard, allowing a suspended USB device to wake up the host upon
-			 *  request.
-			 *
-			 *  If set, the host will dynamically enable and disable remote wakeup support, indicated via the
-			 *  \ref USB_Device_RemoteWakeupEnabled global variable. To initiate a remote wakeup of the host (when allowed)
-			 *  see \ref USB_Device_RemoteWakeupEnabled().
-			 */
-			#define USB_CONFIG_ATTR_REMOTEWAKEUP      0x20
-			/**@}*/
-
-			/** \name Endpoint Descriptor Attribute Masks */
-			/**@{*/
-			/** Can be masked with other endpoint descriptor attributes for a \ref USB_Descriptor_Endpoint_t descriptor's
-			 *  \c Attributes value to indicate that the specified endpoint is not synchronized.
-			 *
-			 *  \see The USB specification for more details on the possible Endpoint attributes.
-			 */
-			#define ENDPOINT_ATTR_NO_SYNC             (0 << 2)
-
-			/** Can be masked with other endpoint descriptor attributes for a \ref USB_Descriptor_Endpoint_t descriptor's
-			 *  \c Attributes value to indicate that the specified endpoint is asynchronous.
-			 *
-			 *  \see The USB specification for more details on the possible Endpoint attributes.
-			 */
-			#define ENDPOINT_ATTR_ASYNC               (1 << 2)
-
-			/** Can be masked with other endpoint descriptor attributes for a \ref USB_Descriptor_Endpoint_t descriptor's
-			 *  \c Attributes value to indicate that the specified endpoint is adaptive.
-			 *
-			 *  \see The USB specification for more details on the possible Endpoint attributes.
-			 */
-			#define ENDPOINT_ATTR_ADAPTIVE            (2 << 2)
-
-			/** Can be masked with other endpoint descriptor attributes for a \ref USB_Descriptor_Endpoint_t descriptor's
-			 *  \c Attributes value to indicate that the specified endpoint is synchronized.
-			 *
-			 *  \see The USB specification for more details on the possible Endpoint attributes.
-			 */
-			#define ENDPOINT_ATTR_SYNC                (3 << 2)
-			/**@}*/
-
-			/** \name Endpoint Descriptor Usage Masks */
-			/**@{*/
-			/** Can be masked with other endpoint descriptor attributes for a \ref USB_Descriptor_Endpoint_t descriptor's
-			 *  \c Attributes value to indicate that the specified endpoint is used for data transfers.
-			 *
-			 *  \see The USB specification for more details on the possible Endpoint usage attributes.
-			 */
-			#define ENDPOINT_USAGE_DATA               (0 << 4)
-
-			/** Can be masked with other endpoint descriptor attributes for a \ref USB_Descriptor_Endpoint_t descriptor's
-			 *  \c Attributes value to indicate that the specified endpoint is used for feedback.
-			 *
-			 *  \see The USB specification for more details on the possible Endpoint usage attributes.
-			 */
-			#define ENDPOINT_USAGE_FEEDBACK           (1 << 4)
-
-			/** Can be masked with other endpoint descriptor attributes for a \ref USB_Descriptor_Endpoint_t descriptor's
-			 *  \c Attributes value to indicate that the specified endpoint is used for implicit feedback.
-			 *
-			 *  \see The USB specification for more details on the possible Endpoint usage attributes.
-			 */
-			#define ENDPOINT_USAGE_IMPLICIT_FEEDBACK  (2 << 4)
-			/**@}*/
-
-		/* Enums: */
-			/** Enum for the possible standard descriptor types, as given in each descriptor's header. */
-			enum USB_DescriptorTypes_t
-			{
-				DTYPE_Device                    = 0x01, /**< Indicates that the descriptor is a device descriptor. */
-				DTYPE_Configuration             = 0x02, /**< Indicates that the descriptor is a configuration descriptor. */
-				DTYPE_String                    = 0x03, /**< Indicates that the descriptor is a string descriptor. */
-				DTYPE_Interface                 = 0x04, /**< Indicates that the descriptor is an interface descriptor. */
-				DTYPE_Endpoint                  = 0x05, /**< Indicates that the descriptor is an endpoint descriptor. */
-				DTYPE_DeviceQualifier           = 0x06, /**< Indicates that the descriptor is a device qualifier descriptor. */
-				DTYPE_Other                     = 0x07, /**< Indicates that the descriptor is of other type. */
-				DTYPE_InterfacePower            = 0x08, /**< Indicates that the descriptor is an interface power descriptor. */
-				DTYPE_InterfaceAssociation      = 0x0B, /**< Indicates that the descriptor is an interface association descriptor. */
-			};
-
-			/** Enum for possible Class, Subclass and Protocol values of device and interface descriptors. */
-			enum USB_Descriptor_ClassSubclassProtocol_t
-			{
-				USB_CSCP_NoDeviceClass          = 0x00, /**< Descriptor Class value indicating that the device does not belong
-				                                         *   to a particular class at the device level.
-				                                         */
-				USB_CSCP_NoDeviceSubclass       = 0x00, /**< Descriptor Subclass value indicating that the device does not belong
-				                                         *   to a particular subclass at the device level.
-				                                         */
-				USB_CSCP_NoDeviceProtocol       = 0x00, /**< Descriptor Protocol value indicating that the device does not belong
-				                                         *   to a particular protocol at the device level.
-				                                         */
-				USB_CSCP_VendorSpecificClass    = 0xFF, /**< Descriptor Class value indicating that the device/interface belongs
-				                                         *   to a vendor specific class.
-				                                         */
-				USB_CSCP_VendorSpecificSubclass = 0xFF, /**< Descriptor Subclass value indicating that the device/interface belongs
-				                                         *   to a vendor specific subclass.
-				                                         */
-				USB_CSCP_VendorSpecificProtocol = 0xFF, /**< Descriptor Protocol value indicating that the device/interface belongs
-				                                         *   to a vendor specific protocol.
-				                                         */
-				USB_CSCP_IADDeviceClass         = 0xEF, /**< Descriptor Class value indicating that the device belongs to the
-				                                         *   Interface Association Descriptor class.
-				                                         */
-				USB_CSCP_IADDeviceSubclass      = 0x02, /**< Descriptor Subclass value indicating that the device belongs to the
-				                                         *   Interface Association Descriptor subclass.
-				                                         */
-				USB_CSCP_IADDeviceProtocol      = 0x01, /**< Descriptor Protocol value indicating that the device belongs to the
-				                                         *   Interface Association Descriptor protocol.
-				                                         */
-			};
-
-		/* Type Defines: */
-			/** \brief Standard USB Descriptor Header (LUFA naming conventions).
-			 *
-             *  Type define for all descriptors' standard header, indicating the descriptor's length and type. This structure
-			 *  uses LUFA-specific element names to make each element's purpose clearer.
-			 *
-			 *  \see \ref USB_StdDescriptor_Header_t for the version of this type with standard element names.
-			 *
-			 *  \note Regardless of CPU architecture, these values should be stored as little endian.
-			 */
-			typedef struct
-			{
-				uint8_t Size; /**< Size of the descriptor, in bytes. */
-				uint8_t Type; /**< Type of the descriptor, either a value in \ref USB_DescriptorTypes_t or a value
-				               *   given by the specific class.
-				               */
-			} ATTR_PACKED USB_Descriptor_Header_t;
-
-			/** \brief Standard USB Descriptor Header (USB-IF naming conventions).
-			 *
-			 *  Type define for all descriptors' standard header, indicating the descriptor's length and type. This structure
-			 *  uses the relevant standard's given element names to ensure compatibility with the standard.
-			 *
-			 *  \see \ref USB_Descriptor_Header_t for the version of this type with non-standard LUFA specific element names.
-			 *
-			 *  \note Regardless of CPU architecture, these values should be stored as little endian.
-			 */
-			typedef struct
-			{
-				uint8_t bLength; /**< Size of the descriptor, in bytes. */
-				uint8_t bDescriptorType; /**< Type of the descriptor, either a value in \ref USB_DescriptorTypes_t or a value
-				                          *   given by the specific class.
-				                          */
-			} ATTR_PACKED USB_StdDescriptor_Header_t;
-
-			/** \brief Standard USB Device Descriptor (LUFA naming conventions).
-			 *
-			 *  Type define for a standard Device Descriptor. This structure uses LUFA-specific element names to make each
-			 *  element's purpose clearer.
-			 *
-			 *  \see \ref USB_StdDescriptor_Device_t for the version of this type with standard element names.
-			 *
-			 *  \note Regardless of CPU architecture, these values should be stored as little endian.
-			 */
-			typedef struct
-			{
-				USB_Descriptor_Header_t Header; /**< Descriptor header, including type and size. */
-
-				uint16_t USBSpecification; /**< BCD of the supported USB specification.
-				                            *
-				                            *   \see \ref VERSION_BCD() utility macro.
-				                            */
-				uint8_t  Class; /**< USB device class. */
-				uint8_t  SubClass; /**< USB device subclass. */
-				uint8_t  Protocol; /**< USB device protocol. */
-
-				uint8_t  Endpoint0Size; /**< Size of the control (address 0) endpoint's bank in bytes. */
-
-				uint16_t VendorID; /**< Vendor ID for the USB product. */
-				uint16_t ProductID; /**< Unique product ID for the USB product. */
-				uint16_t ReleaseNumber; /**< Product release (version) number.
-				                         *
-				                         *   \see \ref VERSION_BCD() utility macro.
-				                         */
-				uint8_t  ManufacturerStrIndex; /**< String index for the manufacturer's name. The
-				                                *   host will request this string via a separate
-				                                *   control request for the string descriptor.
-				                                *
-				                                *   \note If no string supplied, use \ref NO_DESCRIPTOR.
-				                                */
-				uint8_t  ProductStrIndex; /**< String index for the product name/details.
-				                           *
-				                           *  \see ManufacturerStrIndex structure entry.
-				                           */
-				uint8_t  SerialNumStrIndex; /**< String index for the product's globally unique hexadecimal
-				                             *   serial number, in uppercase Unicode ASCII.
-				                             *
-				                             *  \note On some microcontroller models, there is an embedded serial number
-				                             *        in the chip which can be used for the device serial number.
-				                             *        To use this serial number, set this to \c USE_INTERNAL_SERIAL.
-				                             *        On unsupported devices, this will evaluate to \ref NO_DESCRIPTOR
-				                             *        and will cause the host to generate a pseudo-unique value for the
-				                             *        device upon insertion.
-				                             *
-				                             *  \see \c ManufacturerStrIndex structure entry.
-				                             */
-				uint8_t  NumberOfConfigurations; /**< Total number of configurations supported by
-				                                  *   the device.
-				                                  */
-			} ATTR_PACKED USB_Descriptor_Device_t;
-
-			/** \brief Standard USB Device Descriptor (USB-IF naming conventions).
-			 *
-			 *  Type define for a standard Device Descriptor. This structure uses the relevant standard's given element names
-			 *  to ensure compatibility with the standard.
-			 *
-			 *  \see \ref USB_Descriptor_Device_t for the version of this type with non-standard LUFA specific element names.
-			 *
-			 *  \note Regardless of CPU architecture, these values should be stored as little endian.
-			 */
-			typedef struct
-			{
-				uint8_t  bLength; /**< Size of the descriptor, in bytes. */
-				uint8_t  bDescriptorType; /**< Type of the descriptor, either a value in \ref USB_DescriptorTypes_t or a value
-				                              *   given by the specific class.
-				                              */
-				uint16_t bcdUSB; /**< BCD of the supported USB specification.
-				                  *
-				                  *   \see \ref VERSION_BCD() utility macro.
-				                  */
-				uint8_t  bDeviceClass; /**< USB device class. */
-				uint8_t  bDeviceSubClass; /**< USB device subclass. */
-				uint8_t  bDeviceProtocol; /**< USB device protocol. */
-				uint8_t  bMaxPacketSize0; /**< Size of the control (address 0) endpoint's bank in bytes. */
-				uint16_t idVendor; /**< Vendor ID for the USB product. */
-				uint16_t idProduct; /**< Unique product ID for the USB product. */
-				uint16_t bcdDevice; /**< Product release (version) number.
-				                     *
-				                     *   \see \ref VERSION_BCD() utility macro.
-				                     */
-				uint8_t  iManufacturer; /**< String index for the manufacturer's name. The
-				                         *   host will request this string via a separate
-				                         *   control request for the string descriptor.
-				                         *
-				                         *   \note If no string supplied, use \ref NO_DESCRIPTOR.
-				                         */
-				uint8_t  iProduct; /**< String index for the product name/details.
-				                    *
-				                    *  \see ManufacturerStrIndex structure entry.
-				                    */
-				uint8_t iSerialNumber; /**< String index for the product's globally unique hexadecimal
-				                        *   serial number, in uppercase Unicode ASCII.
-				                        *
-				                        *  \note On some microcontroller models, there is an embedded serial number
-				                        *        in the chip which can be used for the device serial number.
-				                        *        To use this serial number, set this to \c USE_INTERNAL_SERIAL.
-				                        *        On unsupported devices, this will evaluate to \ref NO_DESCRIPTOR
-				                        *        and will cause the host to generate a pseudo-unique value for the
-				                        *        device upon insertion.
-				                        *
-				                        *  \see \c ManufacturerStrIndex structure entry.
-				                        */
-				uint8_t  bNumConfigurations; /**< Total number of configurations supported by
-				                              *   the device.
-				                              */
-			} ATTR_PACKED USB_StdDescriptor_Device_t;
-
-			/** \brief Standard USB Device Qualifier Descriptor (LUFA naming conventions).
-			 *
-			 *  Type define for a standard Device Qualifier Descriptor. This structure uses LUFA-specific element names
-			 *  to make each element's purpose clearer.
-			 *
-			 *  \see \ref USB_StdDescriptor_DeviceQualifier_t for the version of this type with standard element names.
-			 */
-			typedef struct
-			{
-				USB_Descriptor_Header_t Header; /**< Descriptor header, including type and size. */
-
-				uint16_t USBSpecification; /**< BCD of the supported USB specification.
-				                            *
-				                            *   \see \ref VERSION_BCD() utility macro.
-				                            */
-				uint8_t  Class; /**< USB device class. */
-				uint8_t  SubClass; /**< USB device subclass. */
-				uint8_t  Protocol; /**< USB device protocol. */
-
-				uint8_t  Endpoint0Size; /**< Size of the control (address 0) endpoint's bank in bytes. */
-				uint8_t  NumberOfConfigurations; /**< Total number of configurations supported by
-				                                  *   the device.
-				                                  */
-				uint8_t  Reserved; /**< Reserved for future use, must be 0. */
-			} ATTR_PACKED USB_Descriptor_DeviceQualifier_t;
-
-			/** \brief Standard USB Device Qualifier Descriptor (USB-IF naming conventions).
-			 *
-			 *  Type define for a standard Device Qualifier Descriptor. This structure uses the relevant standard's given element names
-			 *  to ensure compatibility with the standard.
-			 *
-			 *  \see \ref USB_Descriptor_DeviceQualifier_t for the version of this type with non-standard LUFA specific element names.
-			 */
-			typedef struct
-			{
-				uint8_t  bLength; /**< Size of the descriptor, in bytes. */
-				uint8_t  bDescriptorType; /**< Type of the descriptor, either a value in \ref USB_DescriptorTypes_t or a value
-				                           *   given by the specific class.
-				                           */
-				uint16_t bcdUSB; /**< BCD of the supported USB specification.
-				                  *
-				                  *   \see \ref VERSION_BCD() utility macro.
-				                  */
-				uint8_t  bDeviceClass; /**< USB device class. */
-				uint8_t  bDeviceSubClass; /**< USB device subclass. */
-				uint8_t  bDeviceProtocol; /**< USB device protocol. */
-				uint8_t  bMaxPacketSize0; /**< Size of the control (address 0) endpoint's bank in bytes. */
-				uint8_t  bNumConfigurations; /**< Total number of configurations supported by
-				                              *   the device.
-				                              */
-				uint8_t  bReserved; /**< Reserved for future use, must be 0. */
-			} ATTR_PACKED USB_StdDescriptor_DeviceQualifier_t;
-
-			/** \brief Standard USB Configuration Descriptor (LUFA naming conventions).
-			 *
-			 *  Type define for a standard Configuration Descriptor header. This structure uses LUFA-specific element names
-			 *  to make each element's purpose clearer.
-			 *
-			 *  \see \ref USB_StdDescriptor_Configuration_Header_t for the version of this type with standard element names.
-			 *
-			 *  \note Regardless of CPU architecture, these values should be stored as little endian.
-			 */
-			typedef struct
-			{
-				USB_Descriptor_Header_t Header; /**< Descriptor header, including type and size. */
-
-				uint16_t TotalConfigurationSize; /**< Size of the configuration descriptor header,
-				                                  *   and all sub descriptors inside the configuration.
-				                                  */
-				uint8_t  TotalInterfaces; /**< Total number of interfaces in the configuration. */
-
-				uint8_t  ConfigurationNumber; /**< Configuration index of the current configuration. */
-				uint8_t  ConfigurationStrIndex; /**< Index of a string descriptor describing the configuration. */
-
-				uint8_t  ConfigAttributes; /**< Configuration attributes, comprised of a mask of \c USB_CONFIG_ATTR_* masks.
-				                            *   On all devices, this should include USB_CONFIG_ATTR_RESERVED at a minimum.
-				                            */
-
-				uint8_t  MaxPowerConsumption; /**< Maximum power consumption of the device while in the
-				                               *   current configuration, calculated by the \ref USB_CONFIG_POWER_MA()
-				                               *   macro.
-				                               */
-			} ATTR_PACKED USB_Descriptor_Configuration_Header_t;
-
-			/** \brief Standard USB Configuration Descriptor (USB-IF naming conventions).
-			 *
-			 *  Type define for a standard Configuration Descriptor header. This structure uses the relevant standard's given element names
-			 *  to ensure compatibility with the standard.
-			 *
-			 *  \see \ref USB_Descriptor_Device_t for the version of this type with non-standard LUFA specific element names.
-			 *
-			 *  \note Regardless of CPU architecture, these values should be stored as little endian.
-			 */
-			typedef struct
-			{
-				uint8_t  bLength; /**< Size of the descriptor, in bytes. */
-				uint8_t  bDescriptorType; /**< Type of the descriptor, either a value in \ref USB_DescriptorTypes_t or a value
-				                           *   given by the specific class.
-				                           */
-				uint16_t wTotalLength; /**< Size of the configuration descriptor header,
-				                           *   and all sub descriptors inside the configuration.
-				                           */
-				uint8_t  bNumInterfaces; /**< Total number of interfaces in the configuration. */
-				uint8_t  bConfigurationValue; /**< Configuration index of the current configuration. */
-				uint8_t  iConfiguration; /**< Index of a string descriptor describing the configuration. */
-				uint8_t  bmAttributes; /**< Configuration attributes, comprised of a mask of \c USB_CONFIG_ATTR_* masks.
-				                        *   On all devices, this should include USB_CONFIG_ATTR_RESERVED at a minimum.
-				                        */
-				uint8_t  bMaxPower; /**< Maximum power consumption of the device while in the
-				                     *   current configuration, calculated by the \ref USB_CONFIG_POWER_MA()
-				                     *   macro.
-				                     */
-			} ATTR_PACKED USB_StdDescriptor_Configuration_Header_t;
-
-			/** \brief Standard USB Interface Descriptor (LUFA naming conventions).
-			 *
-			 *  Type define for a standard Interface Descriptor. This structure uses LUFA-specific element names
-			 *  to make each element's purpose clearer.
-			 *
-			 *  \see \ref USB_StdDescriptor_Interface_t for the version of this type with standard element names.
-			 *
-			 *  \note Regardless of CPU architecture, these values should be stored as little endian.
-			 */
-			typedef struct
-			{
-				USB_Descriptor_Header_t Header; /**< Descriptor header, including type and size. */
-
-				uint8_t InterfaceNumber; /**< Index of the interface in the current configuration. */
-				uint8_t AlternateSetting; /**< Alternate setting for the interface number. The same
-				                           *   interface number can have multiple alternate settings
-				                           *   with different endpoint configurations, which can be
-				                           *   selected by the host.
-				                           */
-				uint8_t TotalEndpoints; /**< Total number of endpoints in the interface. */
-
-				uint8_t Class; /**< Interface class ID. */
-				uint8_t SubClass; /**< Interface subclass ID. */
-				uint8_t Protocol; /**< Interface protocol ID. */
-
-				uint8_t InterfaceStrIndex; /**< Index of the string descriptor describing the interface. */
-			} ATTR_PACKED USB_Descriptor_Interface_t;
-
-			/** \brief Standard USB Interface Descriptor (USB-IF naming conventions).
-			 *
-			 *  Type define for a standard Interface Descriptor. This structure uses the relevant standard's given element names
-			 *  to ensure compatibility with the standard.
-			 *
-			 *  \see \ref USB_Descriptor_Interface_t for the version of this type with non-standard LUFA specific element names.
-			 *
-			 *  \note Regardless of CPU architecture, these values should be stored as little endian.
-			 */
-			typedef struct
-			{
-				uint8_t bLength; /**< Size of the descriptor, in bytes. */
-				uint8_t bDescriptorType; /**< Type of the descriptor, either a value in \ref USB_DescriptorTypes_t or a value
-				                          *   given by the specific class.
-				                          */
-				uint8_t bInterfaceNumber; /**< Index of the interface in the current configuration. */
-				uint8_t bAlternateSetting; /**< Alternate setting for the interface number. The same
-				                            *   interface number can have multiple alternate settings
-				                            *   with different endpoint configurations, which can be
-				                            *   selected by the host.
-				                            */
-				uint8_t bNumEndpoints; /**< Total number of endpoints in the interface. */
-				uint8_t bInterfaceClass; /**< Interface class ID. */
-				uint8_t bInterfaceSubClass; /**< Interface subclass ID. */
-				uint8_t bInterfaceProtocol; /**< Interface protocol ID. */
-				uint8_t iInterface; /**< Index of the string descriptor describing the
-				                     *   interface.
-				                     */
-			} ATTR_PACKED USB_StdDescriptor_Interface_t;
-
-			/** \brief Standard USB Interface Association Descriptor (LUFA naming conventions).
-			 *
-			 *  Type define for a standard Interface Association Descriptor. This structure uses LUFA-specific element names
-			 *  to make each element's purpose clearer.
-			 *
-			 *  This descriptor has been added as a supplement to the USB2.0 standard, in the ECN located at
-			 *  <a>http://www.usb.org/developers/docs/InterfaceAssociationDescriptor_ecn.pdf</a>. It allows composite
-			 *  devices with multiple interfaces related to the same function to have the multiple interfaces bound
-			 *  together at the point of enumeration, loading one generic driver for all the interfaces in the single
-			 *  function. Read the ECN for more information.
-			 *
-			 *  \see \ref USB_StdDescriptor_Interface_Association_t for the version of this type with standard element names.
-			 *
-			 *  \note Regardless of CPU architecture, these values should be stored as little endian.
-			 */
-			typedef struct
-			{
-				USB_Descriptor_Header_t Header; /**< Descriptor header, including type and size. */
-
-				uint8_t FirstInterfaceIndex; /**< Index of the first associated interface. */
-				uint8_t TotalInterfaces; /**< Total number of associated interfaces. */
-
-				uint8_t Class; /**< Interface class ID. */
-				uint8_t SubClass; /**< Interface subclass ID. */
-				uint8_t Protocol; /**< Interface protocol ID. */
-
-				uint8_t IADStrIndex; /**< Index of the string descriptor describing the
-				                      *   interface association.
-				                      */
-			} ATTR_PACKED USB_Descriptor_Interface_Association_t;
-
-			/** \brief Standard USB Interface Association Descriptor (USB-IF naming conventions).
-			 *
-			 *  Type define for a standard Interface Association Descriptor. This structure uses the relevant standard's given
-			 *  element names to ensure compatibility with the standard.
-			 *
-			 *  This descriptor has been added as a supplement to the USB2.0 standard, in the ECN located at
-			 *  <a>http://www.usb.org/developers/docs/InterfaceAssociationDescriptor_ecn.pdf</a>. It allows composite
-			 *  devices with multiple interfaces related to the same function to have the multiple interfaces bound
-			 *  together at the point of enumeration, loading one generic driver for all the interfaces in the single
-			 *  function. Read the ECN for more information.
-			 *
-			 *  \see \ref USB_Descriptor_Interface_Association_t for the version of this type with non-standard LUFA specific
-			 *       element names.
-			 *
-			 *  \note Regardless of CPU architecture, these values should be stored as little endian.
-			 */
-			typedef struct
-			{
-				uint8_t bLength; /**< Size of the descriptor, in bytes. */
-				uint8_t bDescriptorType; /**< Type of the descriptor, either a value in \ref USB_DescriptorTypes_t or a value
-				                          *   given by the specific class.
-				                          */
-				uint8_t bFirstInterface; /**< Index of the first associated interface. */
-				uint8_t bInterfaceCount; /**< Total number of associated interfaces. */
-				uint8_t bFunctionClass; /**< Interface class ID. */
-				uint8_t bFunctionSubClass; /**< Interface subclass ID. */
-				uint8_t bFunctionProtocol; /**< Interface protocol ID. */
-				uint8_t iFunction; /**< Index of the string descriptor describing the
-				                    *   interface association.
-				                    */
-			} ATTR_PACKED USB_StdDescriptor_Interface_Association_t;
-
-			/** \brief Standard USB Endpoint Descriptor (LUFA naming conventions).
-			 *
-			 *  Type define for a standard Endpoint Descriptor. This structure uses LUFA-specific element names
-			 *  to make each element's purpose clearer.
-			 *
-			 *  \see \ref USB_StdDescriptor_Endpoint_t for the version of this type with standard element names.
-			 *
-			 *  \note Regardless of CPU architecture, these values should be stored as little endian.
-			 */
-			typedef struct
-			{
-				USB_Descriptor_Header_t Header; /**< Descriptor header, including type and size. */
-
-				uint8_t  EndpointAddress; /**< Logical address of the endpoint within the device for the current
-				                           *   configuration, including direction mask.
-				                           */
-				uint8_t  Attributes; /**< Endpoint attributes, comprised of a mask of the endpoint type (EP_TYPE_*)
-				                      *   and attributes (ENDPOINT_ATTR_*) masks.
-				                      */
-				uint16_t EndpointSize; /**< Size of the endpoint bank, in bytes. This indicates the maximum packet
-				                        *   size that the endpoint can receive at a time.
-				                        */
-				uint8_t  PollingIntervalMS; /**< Polling interval in milliseconds for the endpoint if it is an INTERRUPT
-				                             *   or ISOCHRONOUS type.
-				                             */
-			} ATTR_PACKED USB_Descriptor_Endpoint_t;
-
-			/** \brief Standard USB Endpoint Descriptor (USB-IF naming conventions).
-			 *
-			 *  Type define for a standard Endpoint Descriptor. This structure uses the relevant standard's given
-			 *  element names to ensure compatibility with the standard.
-			 *
-			 *  \see \ref USB_Descriptor_Endpoint_t for the version of this type with non-standard LUFA specific
-			 *       element names.
-			 *
-			 *  \note Regardless of CPU architecture, these values should be stored as little endian.
-			 */
-			typedef struct
-			{
-				uint8_t  bLength; /**< Size of the descriptor, in bytes. */
-				uint8_t  bDescriptorType; /**< Type of the descriptor, either a value in \ref USB_DescriptorTypes_t or a
-				                           *   value given by the specific class.
-				                           */
-				uint8_t  bEndpointAddress; /**< Logical address of the endpoint within the device for the current
-				                            *   configuration, including direction mask.
-				                            */
-				uint8_t  bmAttributes; /**< Endpoint attributes, comprised of a mask of the endpoint type (EP_TYPE_*)
-				                        *   and attributes (ENDPOINT_ATTR_*) masks.
-				                        */
-				uint16_t wMaxPacketSize; /**< Size of the endpoint bank, in bytes. This indicates the maximum packet size
-				                          *   that the endpoint can receive at a time.
-				                          */
-				uint8_t  bInterval; /**< Polling interval in milliseconds for the endpoint if it is an INTERRUPT or
-				                     *   ISOCHRONOUS type.
-				                     */
-			} ATTR_PACKED USB_StdDescriptor_Endpoint_t;
-
-			/** \brief Standard USB String Descriptor (LUFA naming conventions).
-			 *
-			 *  Type define for a standard string descriptor. Unlike other standard descriptors, the length
-			 *  of the descriptor for placement in the descriptor header must be determined by the \ref USB_STRING_LEN()
-			 *  macro rather than by the size of the descriptor structure, as the length is not fixed.
-			 *
-			 *  This structure should also be used for string index 0, which contains the supported language IDs for
-			 *  the device as an array.
-			 *
-			 *  This structure uses LUFA-specific element names to make each element's purpose clearer.
-			 *
-			 *  \see \ref USB_StdDescriptor_String_t for the version of this type with standard element names.
-			 *
-			 *  \note Regardless of CPU architecture, these values should be stored as little endian.
-			 */
-			typedef struct
-			{
-				USB_Descriptor_Header_t Header; /**< Descriptor header, including type and size. */
-
-				#if (((ARCH == ARCH_AVR8) || (ARCH == ARCH_XMEGA)) && !defined(__DOXYGEN__))
-				wchar_t  UnicodeString[];
-				#else
-				uint16_t UnicodeString[]; /**< String data, as unicode characters (alternatively,
-				                           *   string language IDs). If normal ASCII characters are
-				                           *   to be used, they must be added as an array of characters
-				                           *   rather than a normal C string so that they are widened to
-				                           *   Unicode size.
-				                           *
-				                           *   Under GCC, strings prefixed with the "L" character (before
-				                           *   the opening string quotation mark) are considered to be
-				                           *   Unicode strings, and may be used instead of an explicit
-				                           *   array of ASCII characters on little endian devices with
-				                           *   UTF-16-LE \c wchar_t encoding.
-				                           */
-				#endif
-			} ATTR_PACKED USB_Descriptor_String_t;
-
-			/** \brief Standard USB String Descriptor (USB-IF naming conventions).
-			 *
-			 *  Type define for a standard string descriptor. Unlike other standard descriptors, the length
-			 *  of the descriptor for placement in the descriptor header must be determined by the \ref USB_STRING_LEN()
-			 *  macro rather than by the size of the descriptor structure, as the length is not fixed.
-			 *
-			 *  This structure should also be used for string index 0, which contains the supported language IDs for
-			 *  the device as an array.
-			 *
-			 *  This structure uses the relevant standard's given element names to ensure compatibility with the standard.
-			 *
-			 *  \see \ref USB_Descriptor_String_t for the version of this type with with non-standard LUFA specific
-			 *       element names.
-			 *
-			 *  \note Regardless of CPU architecture, these values should be stored as little endian.
-			 */
-			typedef struct
-			{
-				uint8_t bLength; /**< Size of the descriptor, in bytes. */
-				uint8_t bDescriptorType; /**< Type of the descriptor, either a value in \ref USB_DescriptorTypes_t
-				                          *   or a value given by the specific class.
-				                          */
-				uint16_t bString[]; /**< String data, as unicode characters (alternatively, string language IDs).
-				                     *   If normal ASCII characters are to be used, they must be added as an array
-				                     *   of characters rather than a normal C string so that they are widened to
-				                     *   Unicode size.
-				                     *
-				                     *   Under GCC, strings prefixed with the "L" character (before the opening string
-				                     *   quotation mark) are considered to be Unicode strings, and may be used instead
-				                     *   of an explicit array of ASCII characters.
-				                     */
-			} ATTR_PACKED USB_StdDescriptor_String_t;
-
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Core/StdRequestType.h b/NativePrograms/LUFA/Drivers/USB/Core/StdRequestType.h
deleted file mode 100644
index 0ef36d533c..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Core/StdRequestType.h
+++ /dev/null
@@ -1,258 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief USB control endpoint request definitions.
- *  \copydetails Group_StdRequest
- *
- *  \note This file should not be included directly. It is automatically included as needed by the USB driver
- *        dispatch header located in LUFA/Drivers/USB/USB.h.
- */
-
-/** \ingroup Group_USB
- *  \defgroup Group_StdRequest Standard USB Requests
- *  \brief USB control endpoint request definitions.
- *
- *  This module contains definitions for the various control request parameters, so that the request
- *  details (such as data direction, request recipient, etc.) can be extracted via masking.
- *
- *  @{
- */
-
-#ifndef __STDREQTYPE_H__
-#define __STDREQTYPE_H__
-
-	/* Includes: */
-		#include "../../../Common/Common.h"
-		#include "USBMode.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_USB_DRIVER)
-			#error Do not include this file directly. Include LUFA/Drivers/USB/USB.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Mask for the request type parameter, to indicate the direction of the request data (Host to Device
-			 *  or Device to Host). The result of this mask should then be compared to the request direction masks.
-			 *
-			 *  \see \c REQDIR_* macros for masks indicating the request data direction.
-			 */
-			#define CONTROL_REQTYPE_DIRECTION  0x80
-
-			/** Mask for the request type parameter, to indicate the type of request (Device, Class or Vendor
-			 *  Specific). The result of this mask should then be compared to the request type masks.
-			 *
-			 *  \see \c REQTYPE_* macros for masks indicating the request type.
-			 */
-			#define CONTROL_REQTYPE_TYPE       0x60
-
-			/** Mask for the request type parameter, to indicate the recipient of the request (Device, Interface
-			 *  Endpoint or Other). The result of this mask should then be compared to the request recipient
-			 *  masks.
-			 *
-			 *  \see \c REQREC_* macros for masks indicating the request recipient.
-			 */
-			#define CONTROL_REQTYPE_RECIPIENT  0x1F
-
-			/** \name Control Request Data Direction Masks */
-			/**@{*/
-			/** Request data direction mask, indicating that the request data will flow from host to device.
-			 *
-			 *  \see \ref CONTROL_REQTYPE_DIRECTION macro.
-			 */
-			#define REQDIR_HOSTTODEVICE        (0 << 7)
-
-			/** Request data direction mask, indicating that the request data will flow from device to host.
-			 *
-			 *  \see \ref CONTROL_REQTYPE_DIRECTION macro.
-			 */
-			#define REQDIR_DEVICETOHOST        (1 << 7)
-			/**@}*/
-
-			/** \name Control Request Type Masks */
-			/**@{*/
-			/** Request type mask, indicating that the request is a standard request.
-			 *
-			 *  \see \ref CONTROL_REQTYPE_TYPE macro.
-			 */
-			#define REQTYPE_STANDARD           (0 << 5)
-
-			/** Request type mask, indicating that the request is a class-specific request.
-			 *
-			 *  \see \ref CONTROL_REQTYPE_TYPE macro.
-			 */
-			#define REQTYPE_CLASS              (1 << 5)
-
-			/** Request type mask, indicating that the request is a vendor specific request.
-			 *
-			 *  \see \ref CONTROL_REQTYPE_TYPE macro.
-			 */
-			#define REQTYPE_VENDOR             (2 << 5)
-			/**@}*/
-
-			/** \name Control Request Recipient Masks */
-			/**@{*/
-			/** Request recipient mask, indicating that the request is to be issued to the device as a whole.
-			 *
-			 *  \see \ref CONTROL_REQTYPE_RECIPIENT macro.
-			 */
-			#define REQREC_DEVICE              (0 << 0)
-
-			/** Request recipient mask, indicating that the request is to be issued to an interface in the
-			 *  currently selected configuration.
-			 *
-			 *  \see \ref CONTROL_REQTYPE_RECIPIENT macro.
-			 */
-			#define REQREC_INTERFACE           (1 << 0)
-
-			/** Request recipient mask, indicating that the request is to be issued to an endpoint in the
-			 *  currently selected configuration.
-			 *
-			 *  \see \ref CONTROL_REQTYPE_RECIPIENT macro.
-			 */
-			#define REQREC_ENDPOINT            (2 << 0)
-
-			/** Request recipient mask, indicating that the request is to be issued to an unspecified element
-			 *  in the currently selected configuration.
-			 *
-			 *  \see \ref CONTROL_REQTYPE_RECIPIENT macro.
-			 */
-			#define REQREC_OTHER               (3 << 0)
-			/**@}*/
-
-		/* Type Defines: */
-			/** \brief Standard USB Control Request
-			 *
-			 *  Type define for a standard USB control request.
-			 *
-			 *  \see The USB 2.0 specification for more information on standard control requests.
-			 */
-			typedef struct
-			{
-				uint8_t  bmRequestType; /**< Type of the request. */
-				uint8_t  bRequest; /**< Request command code. */
-				uint16_t wValue; /**< wValue parameter of the request. */
-				uint16_t wIndex; /**< wIndex parameter of the request. */
-				uint16_t wLength; /**< Length of the data to transfer in bytes. */
-			} ATTR_PACKED USB_Request_Header_t;
-
-		/* Enums: */
-			/** Enumeration for the various standard request commands. These commands are applicable when the
-			 *  request type is \ref REQTYPE_STANDARD (with the exception of \ref REQ_GetDescriptor, which is always
-			 *  handled regardless of the request type value).
-			 *
-			 *  \see Chapter 9 of the USB 2.0 Specification.
-			 */
-			enum USB_Control_Request_t
-			{
-				REQ_GetStatus           = 0, /**< Implemented in the library for device and endpoint recipients. Passed
-				                              *   to the user application for other recipients via the
-				                              *   \ref EVENT_USB_Device_ControlRequest() event when received in
-				                              *   device mode. */
-				REQ_ClearFeature        = 1, /**< Implemented in the library for device and endpoint recipients. Passed
-				                              *   to the user application for other recipients via the
-				                              *   \ref EVENT_USB_Device_ControlRequest() event when received in
-				                              *   device mode. */
-				REQ_SetFeature          = 3, /**< Implemented in the library for device and endpoint recipients. Passed
-				                              *   to the user application for other recipients via the
-				                              *   \ref EVENT_USB_Device_ControlRequest() event when received in
-				                              *   device mode. */
-				REQ_SetAddress          = 5, /**< Implemented in the library for the device recipient. Passed
-				                              *   to the user application for other recipients via the
-				                              *   \ref EVENT_USB_Device_ControlRequest() event when received in
-				                              *   device mode. */
-				REQ_GetDescriptor       = 6, /**< Implemented in the library for device and interface recipients. Passed to the
-				                              *   user application for other recipients via the
-				                              *   \ref EVENT_USB_Device_ControlRequest() event when received in
-				                              *   device mode. */
-				REQ_SetDescriptor       = 7, /**< Not implemented in the library, passed to the user application
-				                              *   via the \ref EVENT_USB_Device_ControlRequest() event when received in
-				                              *   device mode. */
-				REQ_GetConfiguration    = 8, /**< Implemented in the library for the device recipient. Passed
-				                              *   to the user application for other recipients via the
-				                              *   \ref EVENT_USB_Device_ControlRequest() event when received in
-				                              *   device mode. */
-				REQ_SetConfiguration    = 9, /**< Implemented in the library for the device recipient. Passed
-				                              *   to the user application for other recipients via the
-				                              *   \ref EVENT_USB_Device_ControlRequest() event when received in
-				                              *   device mode. */
-				REQ_GetInterface        = 10, /**< Not implemented in the library, passed to the user application
-				                              *   via the \ref EVENT_USB_Device_ControlRequest() event when received in
-				                              *   device mode. */
-				REQ_SetInterface        = 11, /**< Not implemented in the library, passed to the user application
-				                              *   via the \ref EVENT_USB_Device_ControlRequest() event when received in
-				                              *   device mode. */
-				REQ_SynchFrame          = 12, /**< Not implemented in the library, passed to the user application
-				                              *   via the \ref EVENT_USB_Device_ControlRequest() event when received in
-				                              *   device mode. */
-			};
-
-			/** Feature Selector values for Set Feature and Clear Feature standard control requests directed to the device, interface
-			 *  and endpoint recipients.
-			 */
-			enum USB_Feature_Selectors_t
-			{
-				FEATURE_SEL_EndpointHalt       = 0x00, /**< Feature selector for Clear Feature or Set Feature commands. When
-				                                        *   used in a Set Feature or Clear Feature request this indicates that an
-				                                        *   endpoint (whose address is given elsewhere in the request) should have
-				                                        *   its stall condition changed.
-				                                        */
-				FEATURE_SEL_DeviceRemoteWakeup = 0x01, /**< Feature selector for Device level Remote Wakeup enable set or clear.
-			                                            *   This feature can be controlled by the host on devices which indicate
-			                                            *   remote wakeup support in their descriptors to selectively disable or
-			                                            *   enable remote wakeup.
-			                                            */
-				FEATURE_SEL_TestMode           = 0x02, /**< Feature selector for Test Mode features, used to test the USB controller
-			                                            *   to check for incorrect operation.
-			                                            */
-			};
-
-	/* Private Interface - For use in library only: */
-		#if !defined(__DOXYGEN__)
-			/* Macros: */
-				#define FEATURE_SELFPOWERED_ENABLED     (1 << 0)
-				#define FEATURE_REMOTE_WAKEUP_ENABLED   (1 << 1)
-		#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Core/UC3/Device_UC3.c b/NativePrograms/LUFA/Drivers/USB/Core/UC3/Device_UC3.c
deleted file mode 100644
index 39f0a9b6aa..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Core/UC3/Device_UC3.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-#include "../../../../Common/Common.h"
-#if (ARCH == ARCH_UC3)
-
-#define  __INCLUDE_FROM_USB_DRIVER
-#include "../USBMode.h"
-
-#if defined(USB_CAN_BE_DEVICE)
-
-#include "../Device.h"
-
-void USB_Device_SendRemoteWakeup(void)
-{
-	USB_CLK_Unfreeze();
-
-	AVR32_USBB.UDCON.rmwkup = true;
-	while (AVR32_USBB.UDCON.rmwkup);
-}
-
-#endif
-
-#endif
diff --git a/NativePrograms/LUFA/Drivers/USB/Core/UC3/Device_UC3.h b/NativePrograms/LUFA/Drivers/USB/Core/UC3/Device_UC3.h
deleted file mode 100644
index f5ac8a6fef..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Core/UC3/Device_UC3.h
+++ /dev/null
@@ -1,270 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief USB Device definitions for the AVR32 UC3 microcontrollers.
- *  \copydetails Group_Device_UC3
- *
- *  \note This file should not be included directly. It is automatically included as needed by the USB driver
- *        dispatch header located in LUFA/Drivers/USB/USB.h.
- */
-
-/** \ingroup Group_Device
- *  \defgroup Group_Device_UC3 Device Management (UC3)
- *  \brief USB Device definitions for the AVR32 UC3 microcontrollers.
- *
- *  Architecture specific USB Device definitions for the Atmel 32-bit UC3 AVR microcontrollers.
- *
- *  @{
- */
-
-#ifndef __USBDEVICE_UC3_H__
-#define __USBDEVICE_UC3_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-		#include "../USBController.h"
-		#include "../StdDescriptors.h"
-		#include "../USBInterrupt.h"
-		#include "../Endpoint.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_USB_DRIVER)
-			#error Do not include this file directly. Include LUFA/Drivers/USB/USB.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** \name USB Device Mode Option Masks */
-			/**@{*/
-			/** Mask for the Options parameter of the \ref USB_Init() function. This indicates that the
-			 *  USB interface should be initialized in low speed (1.5Mb/s) mode.
-			 *
-			 *  \note Restrictions apply on the number, size and type of endpoints which can be used
-			 *        when running in low speed mode - please refer to the USB 2.0 specification.
-			 */
-			#define USB_DEVICE_OPT_LOWSPEED                (1 << 0)
-
-			/** Mask for the Options parameter of the \ref USB_Init() function. This indicates that the
-			 *  USB interface should be initialized in full speed (12Mb/s) mode.
-			 */
-			#define USB_DEVICE_OPT_FULLSPEED               (0 << 0)
-
-			#if defined(USB_SERIES_UC3A3_AVR32) || defined(USB_SERIES_UC3A4_AVR32) || defined(__DOXYGEN__)
-				/** Mask for the Options parameter of the \ref USB_Init() function. This indicates that the
-				 *  USB interface should be initialized in high speed (480Mb/s) mode.
-				 */
-				#define USB_DEVICE_OPT_HIGHSPEED           (1 << 1)
-			#endif
-			/**@}*/
-
-			#if (!defined(NO_INTERNAL_SERIAL) && \
-			     (defined(USB_SERIES_UC3A3_AVR32) || defined(USB_SERIES_UC3A4_AVR32) || \
-				  defined(__DOXYGEN__)))
-				/** String descriptor index for the device's unique serial number string descriptor within the device.
-				 *  This unique serial number is used by the host to associate resources to the device (such as drivers or COM port
-				 *  number allocations) to a device regardless of the port it is plugged in to on the host. Some microcontrollers contain
-				 *  a unique serial number internally, and setting the device descriptors serial number string index to this value
-				 *  will cause it to use the internal serial number.
-				 *
-				 *  On unsupported devices, this will evaluate to \ref NO_DESCRIPTOR and so will force the host to create a pseudo-serial
-				 *  number for the device.
-				 */
-				#ifndef USE_INTERNAL_SERIAL
-					#define USE_INTERNAL_SERIAL         0xDC
-				#endif
-
-				/** Length of the device's unique internal serial number, in bits, if present on the selected microcontroller
-				 *  model.
-				 */
-				#define INTERNAL_SERIAL_LENGTH_BITS     120
-
-				/** Start address of the internal serial number, in the appropriate address space, if present on the selected microcontroller
-				 *  model.
-				 */
-				#define INTERNAL_SERIAL_START_ADDRESS   0x80800204
-			#else
-				#undef	USE_INTERNAL_SERIAL
-				#define USE_INTERNAL_SERIAL             NO_DESCRIPTOR
-
-				#define INTERNAL_SERIAL_LENGTH_BITS     0
-				#define INTERNAL_SERIAL_START_ADDRESS   0
-			#endif
-
-		/* Function Prototypes: */
-			/** Sends a Remote Wakeup request to the host. This signals to the host that the device should
-			 *  be taken out of suspended mode, and communications should resume.
-			 *
-			 *  Typically, this is implemented so that HID devices (mice, keyboards, etc.) can wake up the
-			 *  host computer when the host has suspended all USB devices to enter a low power state.
-			 *
-			 *  \note This function should only be used if the device has indicated to the host that it
-			 *        supports the Remote Wakeup feature in the device descriptors, and should only be
-			 *        issued if the host is currently allowing remote wakeup events from the device (i.e.,
-			 *        the \ref USB_Device_RemoteWakeupEnabled flag is set). When the \c NO_DEVICE_REMOTE_WAKEUP
-			 *        compile time option is used, this function is unavailable.
-			 *
-			 *  \note The USB clock must be running for this function to operate. If the stack is initialized with
-			 *        the \ref USB_OPT_MANUAL_PLL option enabled, the user must ensure that the PLL is running
-			 *        before attempting to call this function.
-			 *
-			 *  \see \ref Group_StdDescriptors for more information on the RMWAKEUP feature and device descriptors.
-			 */
-			void USB_Device_SendRemoteWakeup(void);
-
-		/* Inline Functions: */
-			/** Returns the current USB frame number, when in device mode. Every millisecond the USB bus is active (i.e. enumerated to a host)
-			 *  the frame number is incremented by one.
-			 *
-			 *  \return Current USB frame number from the USB controller.
-			 */
-			static inline uint16_t USB_Device_GetFrameNumber(void) ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT;
-			static inline uint16_t USB_Device_GetFrameNumber(void)
-			{
-				return AVR32_USBB.UDFNUM.fnum;
-			}
-
-			#if !defined(NO_SOF_EVENTS)
-				/** Enables the device mode Start Of Frame events. When enabled, this causes the
-				 *  \ref EVENT_USB_Device_StartOfFrame() event to fire once per millisecond, synchronized to the USB bus,
-				 *  at the start of each USB frame when enumerated in device mode.
-				 *
-				 *  \note Not available when the \c NO_SOF_EVENTS compile time token is defined.
-				 */
-				static inline void USB_Device_EnableSOFEvents(void) ATTR_ALWAYS_INLINE;
-				static inline void USB_Device_EnableSOFEvents(void)
-				{
-					USB_INT_Enable(USB_INT_SOFI);
-				}
-
-				/** Disables the device mode Start Of Frame events. When disabled, this stops the firing of the
-				 *  \ref EVENT_USB_Device_StartOfFrame() event when enumerated in device mode.
-				 *
-				 *  \note Not available when the \c NO_SOF_EVENTS compile time token is defined.
-				 */
-				static inline void USB_Device_DisableSOFEvents(void) ATTR_ALWAYS_INLINE;
-				static inline void USB_Device_DisableSOFEvents(void)
-				{
-					USB_INT_Disable(USB_INT_SOFI);
-				}
-			#endif
-
-	/* Private Interface - For use in library only: */
-	#if !defined(__DOXYGEN__)
-		/* Inline Functions: */
-			static inline void USB_Device_SetLowSpeed(void) ATTR_ALWAYS_INLINE;
-			static inline void USB_Device_SetLowSpeed(void)
-			{
-				AVR32_USBB.UDCON.ls      = true;
-			}
-
-			static inline void USB_Device_SetFullSpeed(void) ATTR_ALWAYS_INLINE;
-			static inline void USB_Device_SetFullSpeed(void)
-			{
-				AVR32_USBB.UDCON.ls      = false;
-				#if defined(USB_DEVICE_OPT_HIGHSPEED)
-				AVR32_USBB.UDCON.spdconf = 3;
-				#endif
-			}
-
-			#if defined(USB_DEVICE_OPT_HIGHSPEED)
-			static inline void USB_Device_SetHighSpeed(void) ATTR_ALWAYS_INLINE;
-			static inline void USB_Device_SetHighSpeed(void)
-			{
-				AVR32_USBB.UDCON.ls      = false;
-				AVR32_USBB.UDCON.spdconf = 0;
-			}
-			#endif
-
-			static inline void USB_Device_SetDeviceAddress(const uint8_t Address) ATTR_ALWAYS_INLINE;
-			static inline void USB_Device_SetDeviceAddress(const uint8_t Address)
-			{
-				AVR32_USBB.UDCON.uadd  = Address;
-			}
-
-			static inline void USB_Device_EnableDeviceAddress(const uint8_t Address) ATTR_ALWAYS_INLINE;
-			static inline void USB_Device_EnableDeviceAddress(const uint8_t Address)
-			{
-				(void)Address;
-
-				AVR32_USBB.UDCON.adden = true;
-			}
-
-			static inline bool USB_Device_IsAddressSet(void) ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT;
-			static inline bool USB_Device_IsAddressSet(void)
-			{
-				return AVR32_USBB.UDCON.adden;
-			}
-
-			#if (USE_INTERNAL_SERIAL != NO_DESCRIPTOR)
-			static inline void USB_Device_GetSerialString(uint16_t* const UnicodeString) ATTR_NON_NULL_PTR_ARG(1);
-			static inline void USB_Device_GetSerialString(uint16_t* const UnicodeString)
-			{
-				uint_reg_t CurrentGlobalInt = GetGlobalInterruptMask();
-				GlobalInterruptDisable();
-
-				uint8_t* SigReadAddress = (uint8_t*)INTERNAL_SERIAL_START_ADDRESS;
-
-				for (uint8_t SerialCharNum = 0; SerialCharNum < (INTERNAL_SERIAL_LENGTH_BITS / 4); SerialCharNum++)
-				{
-					uint8_t SerialByte = *SigReadAddress;
-
-					if (SerialCharNum & 0x01)
-					{
-						SerialByte >>= 4;
-						SigReadAddress++;
-					}
-
-					SerialByte &= 0x0F;
-
-					UnicodeString[SerialCharNum] = cpu_to_le16((SerialByte >= 10) ?
-															   (('A' - 10) + SerialByte) : ('0' + SerialByte));
-				}
-
-				SetGlobalInterruptMask(CurrentGlobalInt);
-			}
-			#endif
-
-	#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Core/UC3/EndpointStream_UC3.c b/NativePrograms/LUFA/Drivers/USB/Core/UC3/EndpointStream_UC3.c
deleted file mode 100644
index 3e50ee4e00..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Core/UC3/EndpointStream_UC3.c
+++ /dev/null
@@ -1,225 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-#include "../../../../Common/Common.h"
-#if (ARCH == ARCH_UC3)
-
-#define  __INCLUDE_FROM_USB_DRIVER
-#include "../USBMode.h"
-
-#if defined(USB_CAN_BE_DEVICE)
-
-#include "EndpointStream_UC3.h"
-
-#if !defined(CONTROL_ONLY_DEVICE)
-uint8_t Endpoint_Discard_Stream(uint16_t Length,
-                                uint16_t* const BytesProcessed)
-{
-	uint8_t  ErrorCode;
-	uint16_t BytesInTransfer = BytesProcessed ? *BytesProcessed : 0;
-
-	if ((ErrorCode = Endpoint_WaitUntilReady()))
-	  return ErrorCode;
-
-	while (BytesInTransfer < Length)
-	{
-		if (!(Endpoint_IsReadWriteAllowed()))
-		{
-			Endpoint_ClearOUT();
-
-			if (BytesProcessed != NULL)
-			{
-				*BytesProcessed = BytesInTransfer;
-				return ENDPOINT_RWSTREAM_IncompleteTransfer;
-			}
-
-			if ((ErrorCode = Endpoint_WaitUntilReady()))
-			  return ErrorCode;
-		}
-		else
-		{
-			Endpoint_Discard_8();
-			BytesInTransfer++;
-		}
-	}
-
-	return ENDPOINT_RWSTREAM_NoError;
-}
-
-uint8_t Endpoint_Null_Stream(uint16_t Length,
-                             uint16_t* const BytesProcessed)
-{
-	uint8_t  ErrorCode;
-	uint16_t BytesInTransfer = BytesProcessed ? *BytesProcessed : 0;
-
-	if ((ErrorCode = Endpoint_WaitUntilReady()))
-	  return ErrorCode;
-
-	while (BytesInTransfer < Length)
-	{
-		if (!(Endpoint_IsReadWriteAllowed()))
-		{
-			Endpoint_ClearIN();
-
-			if (BytesProcessed != NULL)
-			{
-				*BytesProcessed = BytesInTransfer;
-				return ENDPOINT_RWSTREAM_IncompleteTransfer;
-			}
-
-			if ((ErrorCode = Endpoint_WaitUntilReady()))
-			  return ErrorCode;
-		}
-		else
-		{
-			Endpoint_Write_8(0);
-			BytesInTransfer++;
-		}
-	}
-
-	return ENDPOINT_RWSTREAM_NoError;
-}
-
-/* The following abuses the C preprocessor in order to copy-paste common code with slight alterations,
- * so that the code needs to be written once. It is a crude form of templating to reduce code maintenance. */
-
-#define  TEMPLATE_FUNC_NAME                        Endpoint_Write_Stream_LE
-#define  TEMPLATE_BUFFER_TYPE                      const void*
-#define  TEMPLATE_CLEAR_ENDPOINT()                 Endpoint_ClearIN()
-#define  TEMPLATE_BUFFER_OFFSET(Length)            0
-#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount
-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(*BufferPtr)
-#include "Template/Template_Endpoint_RW.c"
-
-#define  TEMPLATE_FUNC_NAME                        Endpoint_Write_Stream_BE
-#define  TEMPLATE_BUFFER_TYPE                      const void*
-#define  TEMPLATE_CLEAR_ENDPOINT()                 Endpoint_ClearIN()
-#define  TEMPLATE_BUFFER_OFFSET(Length)            (Length - 1)
-#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount
-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(*BufferPtr)
-#include "Template/Template_Endpoint_RW.c"
-
-#define  TEMPLATE_FUNC_NAME                        Endpoint_Read_Stream_LE
-#define  TEMPLATE_BUFFER_TYPE                      void*
-#define  TEMPLATE_CLEAR_ENDPOINT()                 Endpoint_ClearOUT()
-#define  TEMPLATE_BUFFER_OFFSET(Length)            0
-#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount
-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *BufferPtr = Endpoint_Read_8()
-#include "Template/Template_Endpoint_RW.c"
-
-#define  TEMPLATE_FUNC_NAME                        Endpoint_Read_Stream_BE
-#define  TEMPLATE_BUFFER_TYPE                      void*
-#define  TEMPLATE_CLEAR_ENDPOINT()                 Endpoint_ClearOUT()
-#define  TEMPLATE_BUFFER_OFFSET(Length)            (Length - 1)
-#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount
-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *BufferPtr = Endpoint_Read_8()
-#include "Template/Template_Endpoint_RW.c"
-
-#if defined(ARCH_HAS_FLASH_ADDRESS_SPACE)
-	#define  TEMPLATE_FUNC_NAME                        Endpoint_Write_PStream_LE
-	#define  TEMPLATE_BUFFER_TYPE                      const void*
-	#define  TEMPLATE_CLEAR_ENDPOINT()                 Endpoint_ClearIN()
-	#define  TEMPLATE_BUFFER_OFFSET(Length)            0
-	#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount
-	#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(pgm_read_byte(BufferPtr))
-	#include "Template/Template_Endpoint_RW.c"
-
-	#define  TEMPLATE_FUNC_NAME                        Endpoint_Write_PStream_BE
-	#define  TEMPLATE_BUFFER_TYPE                      const void*
-	#define  TEMPLATE_CLEAR_ENDPOINT()                 Endpoint_ClearIN()
-	#define  TEMPLATE_BUFFER_OFFSET(Length)            (Length - 1)
-	#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount
-	#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(pgm_read_byte(BufferPtr))
-	#include "Template/Template_Endpoint_RW.c"
-#endif
-
-#if defined(ARCH_HAS_EEPROM_ADDRESS_SPACE)
-	#define  TEMPLATE_FUNC_NAME                        Endpoint_Write_EStream_LE
-	#define  TEMPLATE_BUFFER_TYPE                      const void*
-	#define  TEMPLATE_CLEAR_ENDPOINT()                 Endpoint_ClearIN()
-	#define  TEMPLATE_BUFFER_OFFSET(Length)            0
-	#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount
-	#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(eeprom_read_byte(BufferPtr))
-	#include "Template/Template_Endpoint_RW.c"
-
-	#define  TEMPLATE_FUNC_NAME                        Endpoint_Write_EStream_BE
-	#define  TEMPLATE_BUFFER_TYPE                      const void*
-	#define  TEMPLATE_CLEAR_ENDPOINT()                 Endpoint_ClearIN()
-	#define  TEMPLATE_BUFFER_OFFSET(Length)            (Length - 1)
-	#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount
-	#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(eeprom_read_byte(BufferPtr))
-	#include "Template/Template_Endpoint_RW.c"
-
-	#define  TEMPLATE_FUNC_NAME                        Endpoint_Read_EStream_LE
-	#define  TEMPLATE_BUFFER_TYPE                      void*
-	#define  TEMPLATE_CLEAR_ENDPOINT()                 Endpoint_ClearOUT()
-	#define  TEMPLATE_BUFFER_OFFSET(Length)            0
-	#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount
-	#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         eeprom_update_byte(BufferPtr, Endpoint_Read_8())
-	#include "Template/Template_Endpoint_RW.c"
-
-	#define  TEMPLATE_FUNC_NAME                        Endpoint_Read_EStream_BE
-	#define  TEMPLATE_BUFFER_TYPE                      void*
-	#define  TEMPLATE_CLEAR_ENDPOINT()                 Endpoint_ClearOUT()
-	#define  TEMPLATE_BUFFER_OFFSET(Length)            (Length - 1)
-	#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount
-	#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         eeprom_update_byte(BufferPtr, Endpoint_Read_8())
-	#include "Template/Template_Endpoint_RW.c"
-#endif
-
-#endif
-
-#define  TEMPLATE_FUNC_NAME                        Endpoint_Write_Control_Stream_LE
-#define  TEMPLATE_BUFFER_OFFSET(Length)            0
-#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount
-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(*BufferPtr)
-#include "Template/Template_Endpoint_Control_W.c"
-
-#define  TEMPLATE_FUNC_NAME                        Endpoint_Write_Control_Stream_BE
-#define  TEMPLATE_BUFFER_OFFSET(Length)            (Length - 1)
-#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount
-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(*BufferPtr)
-#include "Template/Template_Endpoint_Control_W.c"
-
-#define  TEMPLATE_FUNC_NAME                        Endpoint_Read_Control_Stream_LE
-#define  TEMPLATE_BUFFER_OFFSET(Length)            0
-#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount
-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *BufferPtr = Endpoint_Read_8()
-#include "Template/Template_Endpoint_Control_R.c"
-
-#define  TEMPLATE_FUNC_NAME                        Endpoint_Read_Control_Stream_BE
-#define  TEMPLATE_BUFFER_OFFSET(Length)            (Length - 1)
-#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount
-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *BufferPtr = Endpoint_Read_8()
-#include "Template/Template_Endpoint_Control_R.c"
-
-#endif
-
-#endif
diff --git a/NativePrograms/LUFA/Drivers/USB/Core/UC3/EndpointStream_UC3.h b/NativePrograms/LUFA/Drivers/USB/Core/UC3/EndpointStream_UC3.h
deleted file mode 100644
index 45738bcfa2..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Core/UC3/EndpointStream_UC3.h
+++ /dev/null
@@ -1,438 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Endpoint data stream transmission and reception management for the AVR32 UC3 microcontrollers.
- *  \copydetails Group_EndpointStreamRW_UC3
- *
- *  \note This file should not be included directly. It is automatically included as needed by the USB driver
- *        dispatch header located in LUFA/Drivers/USB/USB.h.
- */
-
-/** \ingroup Group_EndpointStreamRW
- *  \defgroup Group_EndpointStreamRW_UC3 Read/Write of Multi-Byte Streams (UC3)
- *  \brief Endpoint data stream transmission and reception management for the Atmel AVR32 UC3 architecture.
- *
- *  Functions, macros, variables, enums and types related to data reading and writing of data streams from
- *  and to endpoints.
- *
- *  @{
- */
-
-#ifndef __ENDPOINT_STREAM_UC3_H__
-#define __ENDPOINT_STREAM_UC3_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-		#include "../USBMode.h"
-		#include "../USBTask.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_USB_DRIVER)
-			#error Do not include this file directly. Include LUFA/Drivers/USB/USB.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Function Prototypes: */
-			/** \name Stream functions for null data */
-			/**@{*/
-
-			/** Reads and discards the given number of bytes from the currently selected endpoint's bank,
-			 *  discarding fully read packets from the host as needed. The last packet is not automatically
-			 *  discarded once the remaining bytes has been read; the user is responsible for manually
-			 *  discarding the last packet from the host via the \ref Endpoint_ClearOUT() macro.
-			 *
-			 *  If the BytesProcessed parameter is \c NULL, the entire stream transfer is attempted at once,
-			 *  failing or succeeding as a single unit. If the BytesProcessed parameter points to a valid
-			 *  storage location, the transfer will instead be performed as a series of chunks. Each time
-			 *  the endpoint bank becomes empty while there is still data to process (and after the current
-			 *  packet has been acknowledged) the BytesProcessed location will be updated with the total number
-			 *  of bytes processed in the stream, and the function will exit with an error code of
-			 *  \ref ENDPOINT_RWSTREAM_IncompleteTransfer. This allows for any abort checking to be performed
-			 *  in the user code - to continue the transfer, call the function again with identical parameters
-			 *  and it will resume until the BytesProcessed value reaches the total transfer length.
-			 *
-			 *  <b>Single Stream Transfer Example:</b>
-			 *  \code
-			 *  uint8_t ErrorCode;
-			 *
-			 *  if ((ErrorCode = Endpoint_Discard_Stream(512, NULL)) != ENDPOINT_RWSTREAM_NoError)
-			 *  {
-			 *       // Stream failed to complete - check ErrorCode here
-			 *  }
-			 *  \endcode
-			 *
-			 *  <b>Partial Stream Transfers Example:</b>
-			 *  \code
-			 *  uint8_t  ErrorCode;
-			 *  uint16_t BytesProcessed;
-			 *
-			 *  BytesProcessed = 0;
-			 *  while ((ErrorCode = Endpoint_Discard_Stream(512, &BytesProcessed)) == ENDPOINT_RWSTREAM_IncompleteTransfer)
-			 *  {
-			 *      // Stream not yet complete - do other actions here, abort if required
-			 *  }
-			 *
-			 *  if (ErrorCode != ENDPOINT_RWSTREAM_NoError)
-			 *  {
-			 *      // Stream failed to complete - check ErrorCode here
-			 *  }
-			 *  \endcode
-			 *
-			 *  \note This routine should not be used on CONTROL type endpoints.
-			 *
-			 *  \param[in] Length          Number of bytes to discard via the currently selected endpoint.
-			 *  \param[in] BytesProcessed  Pointer to a location where the total number of bytes processed in the current
-			 *                             transaction should be updated, \c NULL if the entire stream should be read at once.
-			 *
-			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Endpoint_Discard_Stream(uint16_t Length,
-			                                uint16_t* const BytesProcessed);
-
-			/** Writes a given number of zeroed bytes to the currently selected endpoint's bank, sending
-			 *  full packets to the host as needed. The last packet is not automatically sent once the
-			 *  remaining bytes have been written; the user is responsible for manually sending the last
-			 *  packet to the host via the \ref Endpoint_ClearIN() macro.
-			 *
-			 *  If the BytesProcessed parameter is \c NULL, the entire stream transfer is attempted at once,
-			 *  failing or succeeding as a single unit. If the BytesProcessed parameter points to a valid
-			 *  storage location, the transfer will instead be performed as a series of chunks. Each time
-			 *  the endpoint bank becomes full while there is still data to process (and after the current
-			 *  packet transmission has been initiated) the BytesProcessed location will be updated with the
-			 *  total number of bytes processed in the stream, and the function will exit with an error code of
-			 *  \ref ENDPOINT_RWSTREAM_IncompleteTransfer. This allows for any abort checking to be performed
-			 *  in the user code - to continue the transfer, call the function again with identical parameters
-			 *  and it will resume until the BytesProcessed value reaches the total transfer length.
-			 *
-			 *  <b>Single Stream Transfer Example:</b>
-			 *  \code
-			 *  uint8_t ErrorCode;
-			 *
-			 *  if ((ErrorCode = Endpoint_Null_Stream(512, NULL)) != ENDPOINT_RWSTREAM_NoError)
-			 *  {
-			 *       // Stream failed to complete - check ErrorCode here
-			 *  }
-			 *  \endcode
-			 *
-			 *  <b>Partial Stream Transfers Example:</b>
-			 *  \code
-			 *  uint8_t  ErrorCode;
-			 *  uint16_t BytesProcessed;
-			 *
-			 *  BytesProcessed = 0;
-			 *  while ((ErrorCode = Endpoint_Null_Stream(512, &BytesProcessed)) == ENDPOINT_RWSTREAM_IncompleteTransfer)
-			 *  {
-			 *      // Stream not yet complete - do other actions here, abort if required
-			 *  }
-			 *
-			 *  if (ErrorCode != ENDPOINT_RWSTREAM_NoError)
-			 *  {
-			 *      // Stream failed to complete - check ErrorCode here
-			 *  }
-			 *  \endcode
-			 *
-			 *  \note This routine should not be used on CONTROL type endpoints.
-			 *
-			 *  \param[in] Length          Number of zero bytes to send via the currently selected endpoint.
-			 *  \param[in] BytesProcessed  Pointer to a location where the total number of bytes processed in the current
-			 *                             transaction should be updated, \c NULL if the entire stream should be read at once.
-			 *
-			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Endpoint_Null_Stream(uint16_t Length,
-			                             uint16_t* const BytesProcessed);
-
-			/**@}*/
-
-			/** \name Stream functions for RAM source/destination data */
-			/**@{*/
-
-			/** Writes the given number of bytes to the endpoint from the given buffer in little endian,
-			 *  sending full packets to the host as needed. The last packet filled is not automatically sent;
-			 *  the user is responsible for manually sending the last written packet to the host via the
-			 *  \ref Endpoint_ClearIN() macro.
-			 *
-			 *  If the BytesProcessed parameter is \c NULL, the entire stream transfer is attempted at once,
-			 *  failing or succeeding as a single unit. If the BytesProcessed parameter points to a valid
-			 *  storage location, the transfer will instead be performed as a series of chunks. Each time
-			 *  the endpoint bank becomes full while there is still data to process (and after the current
-			 *  packet transmission has been initiated) the BytesProcessed location will be updated with the
-			 *  total number of bytes processed in the stream, and the function will exit with an error code of
-			 *  \ref ENDPOINT_RWSTREAM_IncompleteTransfer. This allows for any abort checking to be performed
-			 *  in the user code - to continue the transfer, call the function again with identical parameters
-			 *  and it will resume until the BytesProcessed value reaches the total transfer length.
-			 *
-			 *  <b>Single Stream Transfer Example:</b>
-			 *  \code
-			 *  uint8_t DataStream[512];
-			 *  uint8_t ErrorCode;
-			 *
-			 *  if ((ErrorCode = Endpoint_Write_Stream_LE(DataStream, sizeof(DataStream),
-			 *                                            NULL)) != ENDPOINT_RWSTREAM_NoError)
-			 *  {
-			 *       // Stream failed to complete - check ErrorCode here
-			 *  }
-			 *  \endcode
-			 *
-			 *  <b>Partial Stream Transfers Example:</b>
-			 *  \code
-			 *  uint8_t  DataStream[512];
-			 *  uint8_t  ErrorCode;
-			 *  uint16_t BytesProcessed;
-			 *
-			 *  BytesProcessed = 0;
-			 *  while ((ErrorCode = Endpoint_Write_Stream_LE(DataStream, sizeof(DataStream),
-			 *                                               &BytesProcessed)) == ENDPOINT_RWSTREAM_IncompleteTransfer)
-			 *  {
-			 *      // Stream not yet complete - do other actions here, abort if required
-			 *  }
-			 *
-			 *  if (ErrorCode != ENDPOINT_RWSTREAM_NoError)
-			 *  {
-			 *      // Stream failed to complete - check ErrorCode here
-			 *  }
-			 *  \endcode
-			 *
-			 *  \note This routine should not be used on CONTROL type endpoints.
-			 *
-			 *  \param[in] Buffer          Pointer to the source data buffer to read from.
-			 *  \param[in] Length          Number of bytes to read for the currently selected endpoint into the buffer.
-			 *  \param[in] BytesProcessed  Pointer to a location where the total number of bytes processed in the current
-			 *                             transaction should be updated, \c NULL if the entire stream should be written at once.
-			 *
-			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Endpoint_Write_Stream_LE(const void* const Buffer,
-			                                 uint16_t Length,
-			                                 uint16_t* const BytesProcessed) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Writes the given number of bytes to the endpoint from the given buffer in big endian,
-			 *  sending full packets to the host as needed. The last packet filled is not automatically sent;
-			 *  the user is responsible for manually sending the last written packet to the host via the
-			 *  \ref Endpoint_ClearIN() macro.
-			 *
-			 *  \note This routine should not be used on CONTROL type endpoints.
-			 *
-			 *  \param[in] Buffer          Pointer to the source data buffer to read from.
-			 *  \param[in] Length          Number of bytes to read for the currently selected endpoint into the buffer.
-			 *  \param[in] BytesProcessed  Pointer to a location where the total number of bytes processed in the current
-			 *                             transaction should be updated, \c NULL if the entire stream should be written at once.
-			 *
-			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Endpoint_Write_Stream_BE(const void* const Buffer,
-			                                 uint16_t Length,
-			                                 uint16_t* const BytesProcessed) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Reads the given number of bytes from the endpoint from the given buffer in little endian,
-			 *  discarding fully read packets from the host as needed. The last packet is not automatically
-			 *  discarded once the remaining bytes has been read; the user is responsible for manually
-			 *  discarding the last packet from the host via the \ref Endpoint_ClearOUT() macro.
-			 *
-			 *  If the BytesProcessed parameter is \c NULL, the entire stream transfer is attempted at once,
-			 *  failing or succeeding as a single unit. If the BytesProcessed parameter points to a valid
-			 *  storage location, the transfer will instead be performed as a series of chunks. Each time
-			 *  the endpoint bank becomes empty while there is still data to process (and after the current
-			 *  packet has been acknowledged) the BytesProcessed location will be updated with the total number
-			 *  of bytes processed in the stream, and the function will exit with an error code of
-			 *  \ref ENDPOINT_RWSTREAM_IncompleteTransfer. This allows for any abort checking to be performed
-			 *  in the user code - to continue the transfer, call the function again with identical parameters
-			 *  and it will resume until the BytesProcessed value reaches the total transfer length.
-			 *
-			 *  <b>Single Stream Transfer Example:</b>
-			 *  \code
-			 *  uint8_t DataStream[512];
-			 *  uint8_t ErrorCode;
-			 *
-			 *  if ((ErrorCode = Endpoint_Read_Stream_LE(DataStream, sizeof(DataStream),
-			 *                                           NULL)) != ENDPOINT_RWSTREAM_NoError)
-			 *  {
-			 *       // Stream failed to complete - check ErrorCode here
-			 *  }
-			 *  \endcode
-			 *
-			 *  <b>Partial Stream Transfers Example:</b>
-			 *  \code
-			 *  uint8_t  DataStream[512];
-			 *  uint8_t  ErrorCode;
-			 *  uint16_t BytesProcessed;
-			 *
-			 *  BytesProcessed = 0;
-			 *  while ((ErrorCode = Endpoint_Read_Stream_LE(DataStream, sizeof(DataStream),
-			 *                                              &BytesProcessed)) == ENDPOINT_RWSTREAM_IncompleteTransfer)
-			 *  {
-			 *      // Stream not yet complete - do other actions here, abort if required
-			 *  }
-			 *
-			 *  if (ErrorCode != ENDPOINT_RWSTREAM_NoError)
-			 *  {
-			 *      // Stream failed to complete - check ErrorCode here
-			 *  }
-			 *  \endcode
-			 *
-			 *  \note This routine should not be used on CONTROL type endpoints.
-			 *
-			 *  \param[out] Buffer          Pointer to the destination data buffer to write to.
-			 *  \param[in]  Length          Number of bytes to send via the currently selected endpoint.
-			 *  \param[in]  BytesProcessed  Pointer to a location where the total number of bytes processed in the current
-			 *                              transaction should be updated, \c NULL if the entire stream should be read at once.
-			 *
-			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Endpoint_Read_Stream_LE(void* const Buffer,
-			                                uint16_t Length,
-			                                uint16_t* const BytesProcessed) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Reads the given number of bytes from the endpoint from the given buffer in big endian,
-			 *  discarding fully read packets from the host as needed. The last packet is not automatically
-			 *  discarded once the remaining bytes has been read; the user is responsible for manually
-			 *  discarding the last packet from the host via the \ref Endpoint_ClearOUT() macro.
-			 *
-			 *  \note This routine should not be used on CONTROL type endpoints.
-			 *
-			 *  \param[out] Buffer          Pointer to the destination data buffer to write to.
-			 *  \param[in]  Length          Number of bytes to send via the currently selected endpoint.
-			 *  \param[in]  BytesProcessed  Pointer to a location where the total number of bytes processed in the current
-			 *                              transaction should be updated, \c NULL if the entire stream should be read at once.
-			 *
-			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Endpoint_Read_Stream_BE(void* const Buffer,
-			                                uint16_t Length,
-			                                uint16_t* const BytesProcessed) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Writes the given number of bytes to the CONTROL type endpoint from the given buffer in little endian,
-			 *  sending full packets to the host as needed. The host OUT acknowledgement is not automatically cleared
-			 *  in both failure and success states; the user is responsible for manually clearing the status OUT packet
-			 *  to finalize the transfer's status stage via the \ref Endpoint_ClearOUT() macro.
-			 *
-			 *  \note This function automatically sends the last packet in the data stage of the transaction; when the
-			 *        function returns, the user is responsible for clearing the <b>status</b> stage of the transaction.
-			 *        Note that the status stage packet is sent or received in the opposite direction of the data flow.
-			 *        \n\n
-			 *
-			 *  \note This routine should only be used on CONTROL type endpoints.
-			 *
-			 *  \warning Unlike the standard stream read/write commands, the control stream commands cannot be chained
-			 *           together; i.e. the entire stream data must be read or written at the one time.
-			 *
-			 *  \param[in] Buffer  Pointer to the source data buffer to read from.
-			 *  \param[in] Length  Number of bytes to read for the currently selected endpoint into the buffer.
-			 *
-			 *  \return A value from the \ref Endpoint_ControlStream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Endpoint_Write_Control_Stream_LE(const void* const Buffer,
-			                                         uint16_t Length) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Writes the given number of bytes to the CONTROL type endpoint from the given buffer in big endian,
-			 *  sending full packets to the host as needed. The host OUT acknowledgement is not automatically cleared
-			 *  in both failure and success states; the user is responsible for manually clearing the status OUT packet
-			 *  to finalize the transfer's status stage via the \ref Endpoint_ClearOUT() macro.
-			 *
-			 *  \note This function automatically sends the last packet in the data stage of the transaction; when the
-			 *        function returns, the user is responsible for clearing the <b>status</b> stage of the transaction.
-			 *        Note that the status stage packet is sent or received in the opposite direction of the data flow.
-			 *        \n\n
-			 *
-			 *  \note This routine should only be used on CONTROL type endpoints.
-			 *
-			 *  \warning Unlike the standard stream read/write commands, the control stream commands cannot be chained
-			 *           together; i.e. the entire stream data must be read or written at the one time.
-			 *
-			 *  \param[in] Buffer  Pointer to the source data buffer to read from.
-			 *  \param[in] Length  Number of bytes to read for the currently selected endpoint into the buffer.
-			 *
-			 *  \return A value from the \ref Endpoint_ControlStream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Endpoint_Write_Control_Stream_BE(const void* const Buffer,
-			                                         uint16_t Length) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Reads the given number of bytes from the CONTROL endpoint from the given buffer in little endian,
-			 *  discarding fully read packets from the host as needed. The device IN acknowledgement is not
-			 *  automatically sent after success or failure states; the user is responsible for manually sending the
-			 *  status IN packet to finalize the transfer's status stage via the \ref Endpoint_ClearIN() macro.
-			 *
-			 *  \note This function automatically sends the last packet in the data stage of the transaction; when the
-			 *        function returns, the user is responsible for clearing the <b>status</b> stage of the transaction.
-			 *        Note that the status stage packet is sent or received in the opposite direction of the data flow.
-			 *        \n\n
-			 *
-			 *  \note This routine should only be used on CONTROL type endpoints.
-			 *
-			 *  \warning Unlike the standard stream read/write commands, the control stream commands cannot be chained
-			 *           together; i.e. the entire stream data must be read or written at the one time.
-			 *
-			 *  \param[out] Buffer  Pointer to the destination data buffer to write to.
-			 *  \param[in]  Length  Number of bytes to send via the currently selected endpoint.
-			 *
-			 *  \return A value from the \ref Endpoint_ControlStream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Endpoint_Read_Control_Stream_LE(void* const Buffer,
-			                                        uint16_t Length) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Reads the given number of bytes from the CONTROL endpoint from the given buffer in big endian,
-			 *  discarding fully read packets from the host as needed. The device IN acknowledgement is not
-			 *  automatically sent after success or failure states; the user is responsible for manually sending the
-			 *  status IN packet to finalize the transfer's status stage via the \ref Endpoint_ClearIN() macro.
-			 *
-			 *  \note This function automatically sends the last packet in the data stage of the transaction; when the
-			 *        function returns, the user is responsible for clearing the <b>status</b> stage of the transaction.
-			 *        Note that the status stage packet is sent or received in the opposite direction of the data flow.
-			 *        \n\n
-			 *
-			 *  \note This routine should only be used on CONTROL type endpoints.
-			 *
-			 *  \warning Unlike the standard stream read/write commands, the control stream commands cannot be chained
-			 *           together; i.e. the entire stream data must be read or written at the one time.
-			 *
-			 *  \param[out] Buffer  Pointer to the destination data buffer to write to.
-			 *  \param[in]  Length  Number of bytes to send via the currently selected endpoint.
-			 *
-			 *  \return A value from the \ref Endpoint_ControlStream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Endpoint_Read_Control_Stream_BE(void* const Buffer,
-			                                        uint16_t Length) ATTR_NON_NULL_PTR_ARG(1);
-			/**@}*/
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Core/UC3/Endpoint_UC3.c b/NativePrograms/LUFA/Drivers/USB/Core/UC3/Endpoint_UC3.c
deleted file mode 100644
index ba9da39cb0..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Core/UC3/Endpoint_UC3.c
+++ /dev/null
@@ -1,196 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-#include "../../../../Common/Common.h"
-#if (ARCH == ARCH_UC3)
-
-#define  __INCLUDE_FROM_USB_DRIVER
-#include "../USBMode.h"
-
-#if defined(USB_CAN_BE_DEVICE)
-
-#include "../Endpoint.h"
-
-#if !defined(FIXED_CONTROL_ENDPOINT_SIZE)
-uint8_t USB_Device_ControlEndpointSize = ENDPOINT_CONTROLEP_DEFAULT_SIZE;
-#endif
-
-volatile uint32_t USB_Endpoint_SelectedEndpoint = ENDPOINT_CONTROLEP;
-volatile uint8_t* USB_Endpoint_FIFOPos[ENDPOINT_TOTAL_ENDPOINTS];
-
-bool Endpoint_ConfigureEndpointTable(const USB_Endpoint_Table_t* const Table,
-                                     const uint8_t Entries)
-{
-	for (uint8_t i = 0; i < Entries; i++)
-	{
-		if (!(Table[i].Address))
-		  continue;
-
-		if (!(Endpoint_ConfigureEndpoint(Table[i].Address, Table[i].Type, Table[i].Size, Table[i].Banks)))
-		{
-			return false;
-		}
-	}
-
-	return true;
-}
-
-bool Endpoint_ConfigureEndpoint_Prv(const uint8_t Number,
-                                    const uint32_t UECFG0Data)
-{
-	USB_Endpoint_FIFOPos[Number] = &AVR32_USBB_SLAVE[Number * ENDPOINT_HSB_ADDRESS_SPACE_SIZE];
-
-#if defined(CONTROL_ONLY_DEVICE) || defined(ORDERED_EP_CONFIG)
-	Endpoint_SelectEndpoint(Number);
-	Endpoint_EnableEndpoint();
-
-	(&AVR32_USBB.uecfg0)[Number] = 0;
-	(&AVR32_USBB.uecfg0)[Number] = UECFG0Data;
-
-	return Endpoint_IsConfigured();
-#else
-	for (uint8_t EPNum = Number; EPNum < ENDPOINT_TOTAL_ENDPOINTS; EPNum++)
-	{
-		uint32_t UECFG0Temp;
-
-		Endpoint_SelectEndpoint(EPNum);
-
-		if (EPNum == Number)
-		{
-			UECFG0Temp = UECFG0Data;
-		}
-		else
-		{
-			UECFG0Temp = (&AVR32_USBB.uecfg0)[EPNum];
-		}
-
-		if (!(UECFG0Temp & AVR32_USBB_ALLOC_MASK))
-		  continue;
-
-		Endpoint_DisableEndpoint();
-		(&AVR32_USBB.uecfg0)[EPNum] &= ~AVR32_USBB_ALLOC_MASK;
-
-		Endpoint_EnableEndpoint();
-		(&AVR32_USBB.uecfg0)[EPNum] = UECFG0Temp;
-
-		if (!(Endpoint_IsConfigured()))
-		  return false;
-	}
-
-	Endpoint_SelectEndpoint(Number);
-	return true;
-#endif
-}
-
-void Endpoint_ClearEndpoints(void)
-{
-	for (uint8_t EPNum = 0; EPNum < ENDPOINT_TOTAL_ENDPOINTS; EPNum++)
-	{
-		Endpoint_SelectEndpoint(EPNum);
-		(&AVR32_USBB.uecfg0)[EPNum]    = 0;
-		(&AVR32_USBB.uecon0clr)[EPNum] = -1;
-		USB_Endpoint_FIFOPos[EPNum]    = &AVR32_USBB_SLAVE[EPNum * 0x10000];
-		Endpoint_DisableEndpoint();
-	}
-}
-
-void Endpoint_ClearStatusStage(void)
-{
-	if (USB_ControlRequest.bmRequestType & REQDIR_DEVICETOHOST)
-	{
-		while (!(Endpoint_IsOUTReceived()))
-		{
-			if (USB_DeviceState == DEVICE_STATE_Unattached)
-			  return;
-		}
-
-		Endpoint_ClearOUT();
-	}
-	else
-	{
-		while (!(Endpoint_IsINReady()))
-		{
-			if (USB_DeviceState == DEVICE_STATE_Unattached)
-			  return;
-		}
-
-		Endpoint_ClearIN();
-	}
-}
-
-#if !defined(CONTROL_ONLY_DEVICE)
-uint8_t Endpoint_WaitUntilReady(void)
-{
-	#if (USB_STREAM_TIMEOUT_MS < 0xFF)
-	uint8_t  TimeoutMSRem = USB_STREAM_TIMEOUT_MS;
-	#else
-	uint16_t TimeoutMSRem = USB_STREAM_TIMEOUT_MS;
-	#endif
-
-	uint16_t PreviousFrameNumber = USB_Device_GetFrameNumber();
-
-	for (;;)
-	{
-		if (Endpoint_GetEndpointDirection() == ENDPOINT_DIR_IN)
-		{
-			if (Endpoint_IsINReady())
-			  return ENDPOINT_READYWAIT_NoError;
-		}
-		else
-		{
-			if (Endpoint_IsOUTReceived())
-			  return ENDPOINT_READYWAIT_NoError;
-		}
-
-		uint8_t USB_DeviceState_LCL = USB_DeviceState;
-
-		if (USB_DeviceState_LCL == DEVICE_STATE_Unattached)
-		  return ENDPOINT_READYWAIT_DeviceDisconnected;
-		else if (USB_DeviceState_LCL == DEVICE_STATE_Suspended)
-		  return ENDPOINT_READYWAIT_BusSuspended;
-		else if (Endpoint_IsStalled())
-		  return ENDPOINT_READYWAIT_EndpointStalled;
-
-		uint16_t CurrentFrameNumber = USB_Device_GetFrameNumber();
-
-		if (CurrentFrameNumber != PreviousFrameNumber)
-		{
-			PreviousFrameNumber = CurrentFrameNumber;
-
-			if (!(TimeoutMSRem--))
-			  return ENDPOINT_READYWAIT_Timeout;
-		}
-	}
-}
-#endif
-
-#endif
-
-#endif
diff --git a/NativePrograms/LUFA/Drivers/USB/Core/UC3/Endpoint_UC3.h b/NativePrograms/LUFA/Drivers/USB/Core/UC3/Endpoint_UC3.h
deleted file mode 100644
index 27813cd9d6..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Core/UC3/Endpoint_UC3.h
+++ /dev/null
@@ -1,794 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief USB Endpoint definitions for the AVR32 UC3 microcontrollers.
- *  \copydetails Group_EndpointManagement_UC3
- *
- *  \note This file should not be included directly. It is automatically included as needed by the USB driver
- *        dispatch header located in LUFA/Drivers/USB/USB.h.
- */
-
-/** \ingroup Group_EndpointRW
- *  \defgroup Group_EndpointRW_UC3 Endpoint Data Reading and Writing (UC3)
- *  \brief Endpoint data read/write definitions for the Atmel AVR32 UC3 architecture.
- *
- *  Functions, macros, variables, enums and types related to data reading and writing from and to endpoints.
- */
-
-/** \ingroup Group_EndpointPrimitiveRW
- *  \defgroup Group_EndpointPrimitiveRW_UC3 Read/Write of Primitive Data Types (UC3)
- *  \brief Endpoint primitive read/write definitions for the Atmel AVR32 UC3 architecture.
- *
- *  Functions, macros, variables, enums and types related to data reading and writing of primitive data types
- *  from and to endpoints.
- */
-
-/** \ingroup Group_EndpointPacketManagement
- *  \defgroup Group_EndpointPacketManagement_UC3 Endpoint Packet Management (UC3)
- *  \brief Endpoint packet management definitions for the Atmel AVR32 UC3 architecture.
- *
- *  Functions, macros, variables, enums and types related to packet management of endpoints.
- */
-
-/** \ingroup Group_EndpointManagement
- *  \defgroup Group_EndpointManagement_UC3 Endpoint Management (UC3)
- *  \brief Endpoint management definitions for the Atmel AVR32 UC3 architecture.
- *
- *  Functions, macros and enums related to endpoint management when in USB Device mode. This
- *  module contains the endpoint management macros, as well as endpoint interrupt and data
- *  send/receive functions for various data types.
- *
- *  @{
- */
-
-#ifndef __ENDPOINT_UC3_H__
-#define __ENDPOINT_UC3_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-		#include "../USBTask.h"
-		#include "../USBInterrupt.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_USB_DRIVER)
-			#error Do not include this file directly. Include LUFA/Drivers/USB/USB.h instead.
-		#endif
-
-	/* Private Interface - For use in library only: */
-	#if !defined(__DOXYGEN__)
-		/* Macros: */
-			#define ENDPOINT_HSB_ADDRESS_SPACE_SIZE            (64 * 1024UL)
-
-		/* Inline Functions: */
-			static inline uint32_t Endpoint_BytesToEPSizeMask(const uint16_t Bytes) ATTR_WARN_UNUSED_RESULT ATTR_CONST
-			                                                                        ATTR_ALWAYS_INLINE;
-			static inline uint32_t Endpoint_BytesToEPSizeMask(const uint16_t Bytes)
-			{
-				uint8_t  MaskVal    = 0;
-				uint16_t CheckBytes = 8;
-
-				while (CheckBytes < Bytes)
-				{
-					MaskVal++;
-					CheckBytes <<= 1;
-				}
-
-				return (MaskVal << AVR32_USBB_EPSIZE_OFFSET);
-			}
-
-		/* Function Prototypes: */
-			void Endpoint_ClearEndpoints(void);
-			bool Endpoint_ConfigureEndpoint_Prv(const uint8_t Number,
-			                                    const uint32_t UECFGXData);
-
-		/* External Variables: */
-			extern volatile uint32_t USB_Endpoint_SelectedEndpoint;
-			extern volatile uint8_t* USB_Endpoint_FIFOPos[];
-	#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			#if (!defined(FIXED_CONTROL_ENDPOINT_SIZE) || defined(__DOXYGEN__))
-				/** Default size of the default control endpoint's bank, until altered by the control endpoint bank size
-				 *  value in the device descriptor. Not available if the \c FIXED_CONTROL_ENDPOINT_SIZE token is defined.
-				 */
-				#define ENDPOINT_CONTROLEP_DEFAULT_SIZE     8
-			#endif
-
-			#if !defined(CONTROL_ONLY_DEVICE) || defined(__DOXYGEN__)
-				#if defined(USB_SERIES_UC3A3_AVR32) || defined(USB_SERIES_UC3A4_AVR32)
-					#define ENDPOINT_TOTAL_ENDPOINTS        8
-				#else
-					/** Total number of endpoints (including the default control endpoint at address 0) which may
-					 *  be used in the device. Different AVR models support different amounts of endpoints,
-					 *  this value reflects the maximum number of endpoints for the currently selected AVR model.
-					 */
-					#define ENDPOINT_TOTAL_ENDPOINTS        7
-				#endif
-			#else
-				#define ENDPOINT_TOTAL_ENDPOINTS            1
-			#endif
-
-		/* Enums: */
-			/** Enum for the possible error return codes of the \ref Endpoint_WaitUntilReady() function.
-			 *
-			 *  \ingroup Group_EndpointRW_UC3
-			 */
-			enum Endpoint_WaitUntilReady_ErrorCodes_t
-			{
-				ENDPOINT_READYWAIT_NoError                 = 0, /**< Endpoint is ready for next packet, no error. */
-				ENDPOINT_READYWAIT_EndpointStalled         = 1, /**< The endpoint was stalled during the stream
-				                                                 *   transfer by the host or device.
-				                                                 */
-				ENDPOINT_READYWAIT_DeviceDisconnected      = 2,	/**< Device was disconnected from the host while
-				                                                 *   waiting for the endpoint to become ready.
-				                                                 */
-				ENDPOINT_READYWAIT_BusSuspended            = 3, /**< The USB bus has been suspended by the host and
-				                                                 *   no USB endpoint traffic can occur until the bus
-				                                                 *   has resumed.
-				                                                 */
-				ENDPOINT_READYWAIT_Timeout                 = 4, /**< The host failed to accept or send the next packet
-				                                                 *   within the software timeout period set by the
-				                                                 *   \ref USB_STREAM_TIMEOUT_MS macro.
-				                                                 */
-			};
-
-		/* Inline Functions: */
-			/** Configures the specified endpoint address with the given endpoint type, bank size and number of hardware
-			 *  banks. Once configured, the endpoint may be read from or written to, depending on its direction.
-			 *
-			 *  \param[in] Address    Endpoint address to configure.
-			 *
-			 *  \param[in] Type       Type of endpoint to configure, a \c EP_TYPE_* mask. Not all endpoint types
-			 *                        are available on Low Speed USB devices - refer to the USB 2.0 specification.
-			 *
-			 *  \param[in] Size       Size of the endpoint's bank, where packets are stored before they are transmitted
-			 *                        to the USB host, or after they have been received from the USB host (depending on
-			 *                        the endpoint's data direction). The bank size must indicate the maximum packet size
-			 *                        that the endpoint can handle.
-			 *
-			 *  \param[in] Banks      Number of hardware banks to use for the endpoint being configured.
-			 *
-			 *  \attention When the \c ORDERED_EP_CONFIG compile time option is used, Endpoints <b>must</b> be configured in
-			 *             ascending order, or bank corruption will occur.
-			 *
-			 *  \note Different endpoints may have different maximum packet sizes based on the endpoint's index - refer to
-			 *        the chosen microcontroller model's datasheet to determine the maximum bank size for each endpoint.
-			 *        \n\n
-			 *
-			 *  \note The default control endpoint should not be manually configured by the user application, as
-			 *        it is automatically configured by the library internally.
-			 *        \n\n
-			 *
-			 *  \note This routine will automatically select the specified endpoint upon success. Upon failure, the endpoint
-			 *        which failed to reconfigure correctly will be selected.
-			 *
-			 *  \return Boolean \c true if the configuration succeeded, \c false otherwise.
-			 */
-			static inline bool Endpoint_ConfigureEndpoint(const uint8_t Address,
-			                                              const uint8_t Type,
-			                                              const uint16_t Size,
-			                                              const uint8_t Banks) ATTR_ALWAYS_INLINE;
-			static inline bool Endpoint_ConfigureEndpoint(const uint8_t Address,
-			                                              const uint8_t Type,
-			                                              const uint16_t Size,
-			                                              const uint8_t Banks)
-			{
-				uint8_t Number = (Address & ENDPOINT_EPNUM_MASK);
-
-				if (Number >= ENDPOINT_TOTAL_ENDPOINTS)
-				  return false;
-
-				return Endpoint_ConfigureEndpoint_Prv(Number,
-				                                      (AVR32_USBB_ALLOC_MASK |
-				                                       ((uint32_t)Type << AVR32_USBB_EPTYPE_OFFSET) |
-				                                       ((Address & ENDPOINT_DIR_IN) ? AVR32_USBB_UECFG0_EPDIR_MASK : 0) |
-				                                       (((Banks > 1) ? AVR32_USBB_UECFG0_EPBK_DOUBLE : AVR32_USBB_UECFG0_EPBK_SINGLE) << AVR32_USBB_EPBK_OFFSET) |
-				                                       Endpoint_BytesToEPSizeMask(Size)));
-			}
-
-			/** Indicates the number of bytes currently stored in the current endpoint's selected bank.
-			 *
-			 *  \ingroup Group_EndpointRW_UC3
-			 *
-			 *  \return Total number of bytes in the currently selected Endpoint's FIFO buffer.
-			 */
-			static inline uint16_t Endpoint_BytesInEndpoint(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline uint16_t Endpoint_BytesInEndpoint(void)
-			{
-				return (&AVR32_USBB.UESTA0)[USB_Endpoint_SelectedEndpoint].byct;
-			}
-
-			/** Determines the currently selected endpoint's direction.
-			 *
-			 *  \return The currently selected endpoint's direction, as a \c ENDPOINT_DIR_* mask.
-			 */
-			static inline uint32_t Endpoint_GetEndpointDirection(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline uint32_t Endpoint_GetEndpointDirection(void)
-			{
-				return ((&AVR32_USBB.UECFG0)[USB_Endpoint_SelectedEndpoint].epdir ? ENDPOINT_DIR_IN : ENDPOINT_DIR_OUT);
-			}
-
-			/** Get the endpoint address of the currently selected endpoint. This is typically used to save
-			 *  the currently selected endpoint so that it can be restored after another endpoint has been
-			 *  manipulated.
-			 *
-			 *  \return Index of the currently selected endpoint.
-			 */
-			static inline uint8_t Endpoint_GetCurrentEndpoint(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline uint8_t Endpoint_GetCurrentEndpoint(void)
-			{
-				return (USB_Endpoint_SelectedEndpoint | Endpoint_GetEndpointDirection());
-			}
-
-			/** Selects the given endpoint address.
-			 *
-			 *  Any endpoint operations which do not require the endpoint address to be indicated will operate on
-			 *  the currently selected endpoint.
-			 *
-			 *  \param[in] Address  Endpoint address to select.
-			 */
-			static inline void Endpoint_SelectEndpoint(const uint8_t Address) ATTR_ALWAYS_INLINE;
-			static inline void Endpoint_SelectEndpoint(const uint8_t Address)
-			{
-				USB_Endpoint_SelectedEndpoint = (Address & ENDPOINT_EPNUM_MASK);
-			}
-
-			/** Resets the endpoint bank FIFO. This clears all the endpoint banks and resets the USB controller's
-			 *  data In and Out pointers to the bank's contents.
-			 *
-			 *  \param[in] Address  Endpoint number whose FIFO buffers are to be reset.
-			 */
-			static inline void Endpoint_ResetEndpoint(const uint8_t Address) ATTR_ALWAYS_INLINE;
-			static inline void Endpoint_ResetEndpoint(const uint8_t Address)
-			{
-				uint32_t EndpointNumber = (Address & ENDPOINT_EPNUM_MASK);
-
-				AVR32_USBB.uerst |=  (AVR32_USBB_EPRST0_MASK << EndpointNumber);
-				AVR32_USBB.uerst &= ~(AVR32_USBB_EPRST0_MASK << EndpointNumber);
-				USB_Endpoint_FIFOPos[EndpointNumber] = &AVR32_USBB_SLAVE[EndpointNumber * ENDPOINT_HSB_ADDRESS_SPACE_SIZE];
-			}
-
-			/** Enables the currently selected endpoint so that data can be sent and received through it to
-			 *  and from a host.
-			 *
-			 *  \note Endpoints must first be configured properly via \ref Endpoint_ConfigureEndpoint().
-			 */
-			static inline void Endpoint_EnableEndpoint(void) ATTR_ALWAYS_INLINE;
-			static inline void Endpoint_EnableEndpoint(void)
-			{
-				AVR32_USBB.uerst |=  (AVR32_USBB_EPEN0_MASK << USB_Endpoint_SelectedEndpoint);
-			}
-
-			/** Disables the currently selected endpoint so that data cannot be sent and received through it
-			 *  to and from a host.
-			 */
-			static inline void Endpoint_DisableEndpoint(void) ATTR_ALWAYS_INLINE;
-			static inline void Endpoint_DisableEndpoint(void)
-			{
-				AVR32_USBB.uerst &= ~(AVR32_USBB_EPEN0_MASK << USB_Endpoint_SelectedEndpoint);
-			}
-
-			/** Determines if the currently selected endpoint is enabled, but not necessarily configured.
-			 *
-			 * \return Boolean \c true if the currently selected endpoint is enabled, \c false otherwise.
-			 */
-			static inline bool Endpoint_IsEnabled(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline bool Endpoint_IsEnabled(void)
-			{
-				return ((AVR32_USBB.uerst & (AVR32_USBB_EPEN0_MASK << USB_Endpoint_SelectedEndpoint)) ? true : false);
-			}
-
-			/** Retrieves the number of busy banks in the currently selected endpoint, which have been queued for
-			 *  transmission via the \ref Endpoint_ClearIN() command, or are awaiting acknowledgement via the
-			 *  \ref Endpoint_ClearOUT() command.
-			 *
-			 *  \ingroup Group_EndpointPacketManagement_UC3
-			 *
-			 *  \return Total number of busy banks in the selected endpoint.
-			 */
-			static inline uint8_t Endpoint_GetBusyBanks(void) ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT;
-			static inline uint8_t Endpoint_GetBusyBanks(void)
-			{
-				return (&AVR32_USBB.UESTA0)[USB_Endpoint_SelectedEndpoint].nbusybk;
-			}
-
-			/** Aborts all pending IN transactions on the currently selected endpoint, once the bank
-			 *  has been queued for transmission to the host via \ref Endpoint_ClearIN(). This function
-			 *  will terminate all queued transactions, resetting the endpoint banks ready for a new
-			 *  packet.
-			 *
-			 *  \ingroup Group_EndpointPacketManagement_UC3
-			 */
-			static inline void Endpoint_AbortPendingIN(void)
-			{
-				while (Endpoint_GetBusyBanks() != 0)
-				{
-					(&AVR32_USBB.UECON0SET)[USB_Endpoint_SelectedEndpoint].killbks = true;
-					while ((&AVR32_USBB.UECON0)[USB_Endpoint_SelectedEndpoint].killbk);
-				}
-			}
-
-			/** Determines if the currently selected endpoint may be read from (if data is waiting in the endpoint
-			 *  bank and the endpoint is an OUT direction, or if the bank is not yet full if the endpoint is an IN
-			 *  direction). This function will return false if an error has occurred in the endpoint, if the endpoint
-			 *  is an OUT direction and no packet (or an empty packet) has been received, or if the endpoint is an IN
-			 *  direction and the endpoint bank is full.
-			 *
-			 *  \ingroup Group_EndpointPacketManagement_UC3
-			 *
-			 *  \return Boolean \c true if the currently selected endpoint may be read from or written to, depending
-			 *          on its direction.
-			 */
-			static inline bool Endpoint_IsReadWriteAllowed(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline bool Endpoint_IsReadWriteAllowed(void)
-			{
-				return (&AVR32_USBB.UESTA0)[USB_Endpoint_SelectedEndpoint].rwall;
-			}
-
-			/** Determines if the currently selected endpoint is configured.
-			 *
-			 *  \return Boolean \c true if the currently selected endpoint has been configured, \c false otherwise.
-			 */
-			static inline bool Endpoint_IsConfigured(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline bool Endpoint_IsConfigured(void)
-			{
-				return (&AVR32_USBB.UESTA0)[USB_Endpoint_SelectedEndpoint].cfgok;
-			}
-
-			/** Returns a mask indicating which INTERRUPT type endpoints have interrupted - i.e. their
-			 *  interrupt duration has elapsed. Which endpoints have interrupted can be determined by
-			 *  masking the return value against <tt>(1 << <i>{Endpoint Number}</i>)</tt>.
-			 *
-			 *  \return Mask whose bits indicate which endpoints have interrupted.
-			 */
-			static inline uint32_t Endpoint_GetEndpointInterrupts(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline uint32_t Endpoint_GetEndpointInterrupts(void)
-			{
-				return ((AVR32_USBB.udint & (AVR32_USBB_EP6INT_MASK | AVR32_USBB_EP5INT_MASK |
-				                             AVR32_USBB_EP4INT_MASK | AVR32_USBB_EP3INT_MASK |
-				                             AVR32_USBB_EP2INT_MASK | AVR32_USBB_EP1INT_MASK |
-				                             AVR32_USBB_EP0INT_MASK)) >> AVR32_USBB_EP0INT_OFFSET);
-			}
-
-			/** Determines if the specified endpoint number has interrupted (valid only for INTERRUPT type
-			 *  endpoints).
-			 *
-			 *  \param[in] Address  Address of the endpoint whose interrupt flag should be tested.
-			 *
-			 *  \return Boolean \c true if the specified endpoint has interrupted, \c false otherwise.
-			 */
-			static inline bool Endpoint_HasEndpointInterrupted(const uint8_t Address) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline bool Endpoint_HasEndpointInterrupted(const uint8_t Address)
-			{
-				return ((Endpoint_GetEndpointInterrupts() & (AVR32_USBB_EP0INT_MASK << (Address & ENDPOINT_EPNUM_MASK))) ? true : false);
-			}
-
-			/** Determines if the selected IN endpoint is ready for a new packet to be sent to the host.
-			 *
-			 *  \ingroup Group_EndpointPacketManagement_UC3
-			 *
-			 *  \return Boolean \c true if the current endpoint is ready for an IN packet, \c false otherwise.
-			 */
-			static inline bool Endpoint_IsINReady(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline bool Endpoint_IsINReady(void)
-			{
-				return (&AVR32_USBB.UESTA0)[USB_Endpoint_SelectedEndpoint].txini;
-			}
-
-			/** Determines if the selected OUT endpoint has received new packet from the host.
-			 *
-			 *  \ingroup Group_EndpointPacketManagement_UC3
-			 *
-			 *  \return Boolean \c true if current endpoint is has received an OUT packet, \c false otherwise.
-			 */
-			static inline bool Endpoint_IsOUTReceived(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline bool Endpoint_IsOUTReceived(void)
-			{
-				return (&AVR32_USBB.UESTA0)[USB_Endpoint_SelectedEndpoint].rxouti;
-			}
-
-			/** Determines if the current CONTROL type endpoint has received a SETUP packet.
-			 *
-			 *  \ingroup Group_EndpointPacketManagement_UC3
-			 *
-			 *  \return Boolean \c true if the selected endpoint has received a SETUP packet, \c false otherwise.
-			 */
-			static inline bool Endpoint_IsSETUPReceived(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline bool Endpoint_IsSETUPReceived(void)
-			{
-				return (&AVR32_USBB.UESTA0)[USB_Endpoint_SelectedEndpoint].rxstpi;
-			}
-
-			/** Clears a received SETUP packet on the currently selected CONTROL type endpoint, freeing up the
-			 *  endpoint for the next packet.
-			 *
-			 *  \ingroup Group_EndpointPacketManagement_UC3
-			 *
-			 *  \note This is not applicable for non CONTROL type endpoints.
-			 */
-			static inline void Endpoint_ClearSETUP(void) ATTR_ALWAYS_INLINE;
-			static inline void Endpoint_ClearSETUP(void)
-			{
-				(&AVR32_USBB.UESTA0CLR)[USB_Endpoint_SelectedEndpoint].rxstpic = true;
-				USB_Endpoint_FIFOPos[USB_Endpoint_SelectedEndpoint] = &AVR32_USBB_SLAVE[USB_Endpoint_SelectedEndpoint * ENDPOINT_HSB_ADDRESS_SPACE_SIZE];
-			}
-
-			/** Sends an IN packet to the host on the currently selected endpoint, freeing up the endpoint for the
-			 *  next packet and switching to the alternative endpoint bank if double banked.
-			 *
-			 *  \ingroup Group_EndpointPacketManagement_UC3
-			 */
-			static inline void Endpoint_ClearIN(void) ATTR_ALWAYS_INLINE;
-			static inline void Endpoint_ClearIN(void)
-			{
-				(&AVR32_USBB.UESTA0CLR)[USB_Endpoint_SelectedEndpoint].txinic   = true;
-				(&AVR32_USBB.UECON0CLR)[USB_Endpoint_SelectedEndpoint].fifoconc = true;
-				USB_Endpoint_FIFOPos[USB_Endpoint_SelectedEndpoint] = &AVR32_USBB_SLAVE[USB_Endpoint_SelectedEndpoint * ENDPOINT_HSB_ADDRESS_SPACE_SIZE];
-			}
-
-			/** Acknowledges an OUT packet to the host on the currently selected endpoint, freeing up the endpoint
-			 *  for the next packet and switching to the alternative endpoint bank if double banked.
-			 *
-			 *  \ingroup Group_EndpointPacketManagement_UC3
-			 */
-			static inline void Endpoint_ClearOUT(void) ATTR_ALWAYS_INLINE;
-			static inline void Endpoint_ClearOUT(void)
-			{
-				(&AVR32_USBB.UESTA0CLR)[USB_Endpoint_SelectedEndpoint].rxoutic  = true;
-				(&AVR32_USBB.UECON0CLR)[USB_Endpoint_SelectedEndpoint].fifoconc = true;
-				USB_Endpoint_FIFOPos[USB_Endpoint_SelectedEndpoint] = &AVR32_USBB_SLAVE[USB_Endpoint_SelectedEndpoint * ENDPOINT_HSB_ADDRESS_SPACE_SIZE];
-			}
-
-			/** Stalls the current endpoint, indicating to the host that a logical problem occurred with the
-			 *  indicated endpoint and that the current transfer sequence should be aborted. This provides a
-			 *  way for devices to indicate invalid commands to the host so that the current transfer can be
-			 *  aborted and the host can begin its own recovery sequence.
-			 *
-			 *  The currently selected endpoint remains stalled until either the \ref Endpoint_ClearStall() macro
-			 *  is called, or the host issues a CLEAR FEATURE request to the device for the currently selected
-			 *  endpoint.
-			 *
-			 *  \ingroup Group_EndpointPacketManagement_UC3
-			 */
-			static inline void Endpoint_StallTransaction(void) ATTR_ALWAYS_INLINE;
-			static inline void Endpoint_StallTransaction(void)
-			{
-				(&AVR32_USBB.UECON0SET)[USB_Endpoint_SelectedEndpoint].stallrqs = true;
-			}
-
-			/** Clears the STALL condition on the currently selected endpoint.
-			 *
-			 *  \ingroup Group_EndpointPacketManagement_UC3
-			 */
-			static inline void Endpoint_ClearStall(void) ATTR_ALWAYS_INLINE;
-			static inline void Endpoint_ClearStall(void)
-			{
-				(&AVR32_USBB.UECON0CLR)[USB_Endpoint_SelectedEndpoint].stallrqc = true;
-			}
-
-			/** Determines if the currently selected endpoint is stalled, \c false otherwise.
-			 *
-			 *  \ingroup Group_EndpointPacketManagement_UC3
-			 *
-			 *  \return Boolean \c true if the currently selected endpoint is stalled, \c false otherwise.
-			 */
-			static inline bool Endpoint_IsStalled(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline bool Endpoint_IsStalled(void)
-			{
-				return (&AVR32_USBB.UECON0)[USB_Endpoint_SelectedEndpoint].stallrq;
-			}
-
-			/** Resets the data toggle of the currently selected endpoint. */
-			static inline void Endpoint_ResetDataToggle(void) ATTR_ALWAYS_INLINE;
-			static inline void Endpoint_ResetDataToggle(void)
-			{
-				(&AVR32_USBB.UECON0SET)[USB_Endpoint_SelectedEndpoint].rstdts = true;
-			}
-
-			/** Sets the direction of the currently selected endpoint.
-			 *
-			 *  \param[in] DirectionMask  New endpoint direction, as a \c ENDPOINT_DIR_* mask.
-			 */
-			static inline void Endpoint_SetEndpointDirection(const uint32_t DirectionMask) ATTR_ALWAYS_INLINE;
-			static inline void Endpoint_SetEndpointDirection(const uint32_t DirectionMask)
-			{
-				(&AVR32_USBB.UECFG0)[USB_Endpoint_SelectedEndpoint].epdir = (DirectionMask == ENDPOINT_DIR_IN);
-			}
-
-			/** Reads one byte from the currently selected endpoint's bank, for OUT direction endpoints.
-			 *
-			 *  \ingroup Group_EndpointPrimitiveRW_UC3
-			 *
-			 *  \return Next byte in the currently selected endpoint's FIFO buffer.
-			 */
-			static inline uint8_t Endpoint_Read_8(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline uint8_t Endpoint_Read_8(void)
-			{
-				return *(USB_Endpoint_FIFOPos[USB_Endpoint_SelectedEndpoint]++);
-			}
-
-			/** Writes one byte to the currently selected endpoint's bank, for IN direction endpoints.
-			 *
-			 *  \ingroup Group_EndpointPrimitiveRW_UC3
-			 *
-			 *  \param[in] Data  Data to write into the the currently selected endpoint's FIFO buffer.
-			 */
-			static inline void Endpoint_Write_8(const uint8_t Data) ATTR_ALWAYS_INLINE;
-			static inline void Endpoint_Write_8(const uint8_t Data)
-			{
-				*(USB_Endpoint_FIFOPos[USB_Endpoint_SelectedEndpoint]++) = Data;
-			}
-
-			/** Discards one byte from the currently selected endpoint's bank, for OUT direction endpoints.
-			 *
-			 *  \ingroup Group_EndpointPrimitiveRW_UC3
-			 */
-			static inline void Endpoint_Discard_8(void) ATTR_ALWAYS_INLINE;
-			static inline void Endpoint_Discard_8(void)
-			{
-				uint8_t Dummy;
-
-				Dummy = *(USB_Endpoint_FIFOPos[USB_Endpoint_SelectedEndpoint]++);
-
-				(void)Dummy;
-			}
-
-			/** Reads two bytes from the currently selected endpoint's bank in little endian format, for OUT
-			 *  direction endpoints.
-			 *
-			 *  \ingroup Group_EndpointPrimitiveRW_UC3
-			 *
-			 *  \return Next two bytes in the currently selected endpoint's FIFO buffer.
-			 */
-			static inline uint16_t Endpoint_Read_16_LE(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline uint16_t Endpoint_Read_16_LE(void)
-			{
-				uint16_t Byte0 = *(USB_Endpoint_FIFOPos[USB_Endpoint_SelectedEndpoint]++);
-				uint16_t Byte1 = *(USB_Endpoint_FIFOPos[USB_Endpoint_SelectedEndpoint]++);
-
-				return ((Byte1 << 8) | Byte0);
-			}
-
-			/** Reads two bytes from the currently selected endpoint's bank in big endian format, for OUT
-			 *  direction endpoints.
-			 *
-			 *  \ingroup Group_EndpointPrimitiveRW_UC3
-			 *
-			 *  \return Next two bytes in the currently selected endpoint's FIFO buffer.
-			 */
-			static inline uint16_t Endpoint_Read_16_BE(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline uint16_t Endpoint_Read_16_BE(void)
-			{
-				uint16_t Byte0 = *(USB_Endpoint_FIFOPos[USB_Endpoint_SelectedEndpoint]++);
-				uint16_t Byte1 = *(USB_Endpoint_FIFOPos[USB_Endpoint_SelectedEndpoint]++);
-
-				return ((Byte0 << 8) | Byte1);
-			}
-
-			/** Writes two bytes to the currently selected endpoint's bank in little endian format, for IN
-			 *  direction endpoints.
-			 *
-			 *  \ingroup Group_EndpointPrimitiveRW_UC3
-			 *
-			 *  \param[in] Data  Data to write to the currently selected endpoint's FIFO buffer.
-			 */
-			static inline void Endpoint_Write_16_LE(const uint16_t Data) ATTR_ALWAYS_INLINE;
-			static inline void Endpoint_Write_16_LE(const uint16_t Data)
-			{
-				*(USB_Endpoint_FIFOPos[USB_Endpoint_SelectedEndpoint]++) = (Data & 0xFF);
-				*(USB_Endpoint_FIFOPos[USB_Endpoint_SelectedEndpoint]++) = (Data >> 8);
-			}
-
-			/** Writes two bytes to the currently selected endpoint's bank in big endian format, for IN
-			 *  direction endpoints.
-			 *
-			 *  \ingroup Group_EndpointPrimitiveRW_UC3
-			 *
-			 *  \param[in] Data  Data to write to the currently selected endpoint's FIFO buffer.
-			 */
-			static inline void Endpoint_Write_16_BE(const uint16_t Data) ATTR_ALWAYS_INLINE;
-			static inline void Endpoint_Write_16_BE(const uint16_t Data)
-			{
-				*(USB_Endpoint_FIFOPos[USB_Endpoint_SelectedEndpoint]++) = (Data >> 8);
-				*(USB_Endpoint_FIFOPos[USB_Endpoint_SelectedEndpoint]++) = (Data & 0xFF);
-			}
-
-			/** Discards two bytes from the currently selected endpoint's bank, for OUT direction endpoints.
-			 *
-			 *  \ingroup Group_EndpointPrimitiveRW_UC3
-			 */
-			static inline void Endpoint_Discard_16(void) ATTR_ALWAYS_INLINE;
-			static inline void Endpoint_Discard_16(void)
-			{
-				uint8_t Dummy;
-
-				Dummy = *(USB_Endpoint_FIFOPos[USB_Endpoint_SelectedEndpoint]++);
-				Dummy = *(USB_Endpoint_FIFOPos[USB_Endpoint_SelectedEndpoint]++);
-
-				(void)Dummy;
-			}
-
-			/** Reads four bytes from the currently selected endpoint's bank in little endian format, for OUT
-			 *  direction endpoints.
-			 *
-			 *  \ingroup Group_EndpointPrimitiveRW_UC3
-			 *
-			 *  \return Next four bytes in the currently selected endpoint's FIFO buffer.
-			 */
-			static inline uint32_t Endpoint_Read_32_LE(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline uint32_t Endpoint_Read_32_LE(void)
-			{
-				uint32_t Byte0 = *(USB_Endpoint_FIFOPos[USB_Endpoint_SelectedEndpoint]++);
-				uint32_t Byte1 = *(USB_Endpoint_FIFOPos[USB_Endpoint_SelectedEndpoint]++);
-				uint32_t Byte2 = *(USB_Endpoint_FIFOPos[USB_Endpoint_SelectedEndpoint]++);
-				uint32_t Byte3 = *(USB_Endpoint_FIFOPos[USB_Endpoint_SelectedEndpoint]++);
-
-				return ((Byte3 << 24) | (Byte2 << 16) | (Byte1 << 8) | Byte0);
-			}
-
-			/** Reads four bytes from the currently selected endpoint's bank in big endian format, for OUT
-			 *  direction endpoints.
-			 *
-			 *  \ingroup Group_EndpointPrimitiveRW_UC3
-			 *
-			 *  \return Next four bytes in the currently selected endpoint's FIFO buffer.
-			 */
-			static inline uint32_t Endpoint_Read_32_BE(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline uint32_t Endpoint_Read_32_BE(void)
-			{
-				uint32_t Byte0 = *(USB_Endpoint_FIFOPos[USB_Endpoint_SelectedEndpoint]++);
-				uint32_t Byte1 = *(USB_Endpoint_FIFOPos[USB_Endpoint_SelectedEndpoint]++);
-				uint32_t Byte2 = *(USB_Endpoint_FIFOPos[USB_Endpoint_SelectedEndpoint]++);
-				uint32_t Byte3 = *(USB_Endpoint_FIFOPos[USB_Endpoint_SelectedEndpoint]++);
-
-				return ((Byte0 << 24) | (Byte1 << 16) | (Byte2 << 8) | Byte3);
-			}
-
-			/** Writes four bytes to the currently selected endpoint's bank in little endian format, for IN
-			 *  direction endpoints.
-			 *
-			 *  \ingroup Group_EndpointPrimitiveRW_UC3
-			 *
-			 *  \param[in] Data  Data to write to the currently selected endpoint's FIFO buffer.
-			 */
-			static inline void Endpoint_Write_32_LE(const uint32_t Data) ATTR_ALWAYS_INLINE;
-			static inline void Endpoint_Write_32_LE(const uint32_t Data)
-			{
-				*(USB_Endpoint_FIFOPos[USB_Endpoint_SelectedEndpoint]++) = (Data &  0xFF);
-				*(USB_Endpoint_FIFOPos[USB_Endpoint_SelectedEndpoint]++) = (Data >> 8);
-				*(USB_Endpoint_FIFOPos[USB_Endpoint_SelectedEndpoint]++) = (Data >> 16);
-				*(USB_Endpoint_FIFOPos[USB_Endpoint_SelectedEndpoint]++) = (Data >> 24);
-			}
-
-			/** Writes four bytes to the currently selected endpoint's bank in big endian format, for IN
-			 *  direction endpoints.
-			 *
-			 *  \ingroup Group_EndpointPrimitiveRW_UC3
-			 *
-			 *  \param[in] Data  Data to write to the currently selected endpoint's FIFO buffer.
-			 */
-			static inline void Endpoint_Write_32_BE(const uint32_t Data) ATTR_ALWAYS_INLINE;
-			static inline void Endpoint_Write_32_BE(const uint32_t Data)
-			{
-				*(USB_Endpoint_FIFOPos[USB_Endpoint_SelectedEndpoint]++) = (Data >> 24);
-				*(USB_Endpoint_FIFOPos[USB_Endpoint_SelectedEndpoint]++) = (Data >> 16);
-				*(USB_Endpoint_FIFOPos[USB_Endpoint_SelectedEndpoint]++) = (Data >> 8);
-				*(USB_Endpoint_FIFOPos[USB_Endpoint_SelectedEndpoint]++) = (Data &  0xFF);
-			}
-
-			/** Discards four bytes from the currently selected endpoint's bank, for OUT direction endpoints.
-			 *
-			 *  \ingroup Group_EndpointPrimitiveRW_UC3
-			 */
-			static inline void Endpoint_Discard_32(void) ATTR_ALWAYS_INLINE;
-			static inline void Endpoint_Discard_32(void)
-			{
-				uint8_t Dummy;
-
-				Dummy = *(USB_Endpoint_FIFOPos[USB_Endpoint_SelectedEndpoint]++);
-				Dummy = *(USB_Endpoint_FIFOPos[USB_Endpoint_SelectedEndpoint]++);
-				Dummy = *(USB_Endpoint_FIFOPos[USB_Endpoint_SelectedEndpoint]++);
-				Dummy = *(USB_Endpoint_FIFOPos[USB_Endpoint_SelectedEndpoint]++);
-
-				(void)Dummy;
-			}
-
-		/* External Variables: */
-			/** Global indicating the maximum packet size of the default control endpoint located at address
-			 *  0 in the device. This value is set to the value indicated in the device descriptor in the user
-			 *  project once the USB interface is initialized into device mode.
-			 *
-			 *  If space is an issue, it is possible to fix this to a static value by defining the control
-			 *  endpoint size in the \c FIXED_CONTROL_ENDPOINT_SIZE token passed to the compiler in the makefile
-			 *  via the -D switch. When a fixed control endpoint size is used, the size is no longer dynamically
-			 *  read from the descriptors at runtime and instead fixed to the given value. When used, it is
-			 *  important that the descriptor control endpoint size value matches the size given as the
-			 *  \c FIXED_CONTROL_ENDPOINT_SIZE token - it is recommended that the \c FIXED_CONTROL_ENDPOINT_SIZE token
-			 *  be used in the device descriptors to ensure this.
-			 *
-			 *  \attention This variable should be treated as read-only in the user application, and never manually
-			 *             changed in value.
-			 */
-			#if (!defined(FIXED_CONTROL_ENDPOINT_SIZE) || defined(__DOXYGEN__))
-				extern uint8_t USB_Device_ControlEndpointSize;
-			#else
-				#define USB_Device_ControlEndpointSize FIXED_CONTROL_ENDPOINT_SIZE
-			#endif
-
-		/* Function Prototypes: */
-			/** Configures a table of endpoint descriptions, in sequence. This function can be used to configure multiple
-			 *  endpoints at the same time.
-			 *
-			 *  \note Endpoints with a zero address will be ignored, thus this function cannot be used to configure the
-			 *        control endpoint.
-			 *
-			 *  \param[in] Table    Pointer to a table of endpoint descriptions.
-			 *  \param[in] Entries  Number of entries in the endpoint table to configure.
-			 *
-			 *  \return Boolean \c true if all endpoints configured successfully, \c false otherwise.
-			 */
-			bool Endpoint_ConfigureEndpointTable(const USB_Endpoint_Table_t* const Table,
-			                                     const uint8_t Entries);
-
-			/** Completes the status stage of a control transfer on a CONTROL type endpoint automatically,
-			 *  with respect to the data direction. This is a convenience function which can be used to
-			 *  simplify user control request handling.
-			 *
-			 *  \note This routine should not be called on non CONTROL type endpoints.
-			 */
-			void Endpoint_ClearStatusStage(void);
-
-			/** Spin-loops until the currently selected non-control endpoint is ready for the next packet of data
-			 *  to be read or written to it.
-			 *
-			 *  \note This routine should not be called on CONTROL type endpoints.
-			 *
-			 *  \ingroup Group_EndpointRW_UC3
-			 *
-			 *  \return A value from the \ref Endpoint_WaitUntilReady_ErrorCodes_t enum.
-			 */
-			uint8_t Endpoint_WaitUntilReady(void);
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Core/UC3/Host_UC3.c b/NativePrograms/LUFA/Drivers/USB/Core/UC3/Host_UC3.c
deleted file mode 100644
index e77a7e6953..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Core/UC3/Host_UC3.c
+++ /dev/null
@@ -1,297 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-#include "../../../../Common/Common.h"
-#if (ARCH == ARCH_UC3)
-
-#define  __INCLUDE_FROM_USB_DRIVER
-#include "../USBMode.h"
-
-#if defined(USB_CAN_BE_HOST)
-
-#define  __INCLUDE_FROM_HOST_C
-#include "../Host.h"
-
-void USB_Host_ProcessNextHostState(void)
-{
-	uint8_t ErrorCode    = HOST_ENUMERROR_NoError;
-	uint8_t SubErrorCode = HOST_ENUMERROR_NoError;
-
-	static uint16_t WaitMSRemaining;
-	static uint8_t  PostWaitState;
-
-	switch (USB_HostState)
-	{
-		case HOST_STATE_WaitForDevice:
-			if (WaitMSRemaining)
-			{
-				if ((SubErrorCode = USB_Host_WaitMS(1)) != HOST_WAITERROR_Successful)
-				{
-					USB_HostState = PostWaitState;
-					ErrorCode     = HOST_ENUMERROR_WaitStage;
-					break;
-				}
-
-				if (!(--WaitMSRemaining))
-				  USB_HostState = PostWaitState;
-			}
-
-			break;
-		case HOST_STATE_Powered:
-			WaitMSRemaining = HOST_DEVICE_SETTLE_DELAY_MS;
-
-			USB_HostState = HOST_STATE_Powered_WaitForDeviceSettle;
-			break;
-		case HOST_STATE_Powered_WaitForDeviceSettle:
-			if (WaitMSRemaining--)
-			{
-				Delay_MS(1);
-				break;
-			}
-			else
-			{
-				USB_Host_VBUS_Manual_Off();
-
-				USB_OTGPAD_On();
-				USB_Host_VBUS_Auto_Enable();
-				USB_Host_VBUS_Auto_On();
-
-				#if defined(NO_AUTO_VBUS_MANAGEMENT)
-				USB_Host_VBUS_Manual_Enable();
-				USB_Host_VBUS_Manual_On();
-				#endif
-
-				USB_HostState = HOST_STATE_Powered_WaitForConnect;
-			}
-
-			break;
-		case HOST_STATE_Powered_WaitForConnect:
-			if (USB_INT_HasOccurred(USB_INT_DCONNI))
-			{
-				USB_INT_Clear(USB_INT_DCONNI);
-				USB_INT_Clear(USB_INT_DDISCI);
-
-				USB_INT_Clear(USB_INT_VBERRI);
-				USB_INT_Enable(USB_INT_VBERRI);
-
-				USB_Host_ResumeBus();
-				Pipe_ClearPipes();
-
-				HOST_TASK_NONBLOCK_WAIT(100, HOST_STATE_Powered_DoReset);
-			}
-
-			break;
-		case HOST_STATE_Powered_DoReset:
-			USB_Host_ResetDevice();
-
-			HOST_TASK_NONBLOCK_WAIT(200, HOST_STATE_Powered_ConfigPipe);
-			break;
-		case HOST_STATE_Powered_ConfigPipe:
-			if (!(Pipe_ConfigurePipe(PIPE_CONTROLPIPE, EP_TYPE_CONTROL, ENDPOINT_CONTROLEP, PIPE_CONTROLPIPE_DEFAULT_SIZE, 1)))
-			{
-				ErrorCode    = HOST_ENUMERROR_PipeConfigError;
-				SubErrorCode = 0;
-				break;
-			}
-
-			USB_HostState = HOST_STATE_Default;
-			break;
-		case HOST_STATE_Default:
-			USB_ControlRequest = (USB_Request_Header_t)
-				{
-					.bmRequestType = (REQDIR_DEVICETOHOST | REQTYPE_STANDARD | REQREC_DEVICE),
-					.bRequest      = REQ_GetDescriptor,
-					.wValue        = (DTYPE_Device << 8),
-					.wIndex        = 0,
-					.wLength       = 8,
-				};
-
-			uint8_t DataBuffer[8];
-
-			Pipe_SelectPipe(PIPE_CONTROLPIPE);
-			if ((SubErrorCode = USB_Host_SendControlRequest(DataBuffer)) != HOST_SENDCONTROL_Successful)
-			{
-				ErrorCode = HOST_ENUMERROR_ControlError;
-				break;
-			}
-
-			USB_Host_ControlPipeSize = DataBuffer[offsetof(USB_Descriptor_Device_t, Endpoint0Size)];
-
-			USB_Host_ResetDevice();
-
-			HOST_TASK_NONBLOCK_WAIT(200, HOST_STATE_Default_PostReset);
-			break;
-		case HOST_STATE_Default_PostReset:
-			if (!(Pipe_ConfigurePipe(PIPE_CONTROLPIPE, EP_TYPE_CONTROL, ENDPOINT_CONTROLEP, USB_Host_ControlPipeSize, 1)))
-			{
-				ErrorCode    = HOST_ENUMERROR_PipeConfigError;
-				SubErrorCode = 0;
-				break;
-			}
-
-			USB_ControlRequest = (USB_Request_Header_t)
-				{
-					.bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_DEVICE),
-					.bRequest      = REQ_SetAddress,
-					.wValue        = USB_HOST_DEVICEADDRESS,
-					.wIndex        = 0,
-					.wLength       = 0,
-				};
-
-			if ((SubErrorCode = USB_Host_SendControlRequest(NULL)) != HOST_SENDCONTROL_Successful)
-			{
-				ErrorCode = HOST_ENUMERROR_ControlError;
-				break;
-			}
-
-			HOST_TASK_NONBLOCK_WAIT(100, HOST_STATE_Default_PostAddressSet);
-			break;
-		case HOST_STATE_Default_PostAddressSet:
-			USB_Host_SetDeviceAddress(USB_HOST_DEVICEADDRESS);
-
-			USB_HostState = HOST_STATE_Addressed;
-
-			EVENT_USB_Host_DeviceEnumerationComplete();
-			break;
-
-		default:
-			break;
-	}
-
-	if ((ErrorCode != HOST_ENUMERROR_NoError) && (USB_HostState != HOST_STATE_Unattached))
-	{
-		EVENT_USB_Host_DeviceEnumerationFailed(ErrorCode, SubErrorCode);
-
-		USB_Host_VBUS_Auto_Off();
-
-		EVENT_USB_Host_DeviceUnattached();
-
-		USB_ResetInterface();
-	}
-}
-
-uint8_t USB_Host_WaitMS(uint8_t MS)
-{
-	bool    BusSuspended = USB_Host_IsBusSuspended();
-	uint8_t ErrorCode    = HOST_WAITERROR_Successful;
-	bool    HSOFIEnabled = USB_INT_IsEnabled(USB_INT_HSOFI);
-
-	USB_INT_Disable(USB_INT_HSOFI);
-	USB_INT_Clear(USB_INT_HSOFI);
-
-	USB_Host_ResumeBus();
-
-	while (MS)
-	{
-		if (USB_INT_HasOccurred(USB_INT_HSOFI))
-		{
-			USB_INT_Clear(USB_INT_HSOFI);
-			MS--;
-		}
-
-		if ((USB_HostState == HOST_STATE_Unattached) || (USB_CurrentMode != USB_MODE_Host))
-		{
-			ErrorCode = HOST_WAITERROR_DeviceDisconnect;
-
-			break;
-		}
-
-		if (Pipe_IsError())
-		{
-			Pipe_ClearError();
-			ErrorCode = HOST_WAITERROR_PipeError;
-
-			break;
-		}
-
-		if (Pipe_IsStalled())
-		{
-			Pipe_ClearStall();
-			ErrorCode = HOST_WAITERROR_SetupStalled;
-
-			break;
-		}
-	}
-
-	if (BusSuspended)
-	  USB_Host_SuspendBus();
-
-	if (HSOFIEnabled)
-	  USB_INT_Enable(USB_INT_HSOFI);
-
-	return ErrorCode;
-}
-
-static void USB_Host_ResetDevice(void)
-{
-	bool BusSuspended = USB_Host_IsBusSuspended();
-
-	USB_INT_Disable(USB_INT_DDISCI);
-
-	USB_Host_ResetBus();
-	while (!(USB_Host_IsBusResetComplete()));
-	USB_Host_ResumeBus();
-
-	USB_Host_ConfigurationNumber = 0;
-
-	bool HSOFIEnabled = USB_INT_IsEnabled(USB_INT_HSOFI);
-
-	USB_INT_Disable(USB_INT_HSOFI);
-	USB_INT_Clear(USB_INT_HSOFI);
-
-	for (uint8_t MSRem = 10; MSRem != 0; MSRem--)
-	{
-		/* Workaround for powerless-pull-up devices. After a USB bus reset,
-		   all disconnection interrupts are suppressed while a USB frame is
-		   looked for - if it is found within 10ms, the device is still
-		   present.                                                        */
-
-		if (USB_INT_HasOccurred(USB_INT_HSOFI))
-		{
-			USB_INT_Clear(USB_INT_HSOFI);
-			USB_INT_Clear(USB_INT_DDISCI);
-			break;
-		}
-
-		Delay_MS(1);
-	}
-
-	if (HSOFIEnabled)
-	  USB_INT_Enable(USB_INT_HSOFI);
-
-	if (BusSuspended)
-	  USB_Host_SuspendBus();
-
-	USB_INT_Enable(USB_INT_DDISCI);
-}
-
-#endif
-
-#endif
diff --git a/NativePrograms/LUFA/Drivers/USB/Core/UC3/Host_UC3.h b/NativePrograms/LUFA/Drivers/USB/Core/UC3/Host_UC3.h
deleted file mode 100644
index 43af4233e1..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Core/UC3/Host_UC3.h
+++ /dev/null
@@ -1,363 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief USB Host definitions for the AVR32 UC3B microcontrollers.
- *  \copydetails Group_Host_UC3B
- *
- *  \note This file should not be included directly. It is automatically included as needed by the USB driver
- *        dispatch header located in LUFA/Drivers/USB/USB.h.
- */
-
-/** \ingroup Group_Host
- *  \defgroup Group_Host_UC3B Host Management (UC3B)
- *  \brief USB Host definitions for the AVR32 UC3B microcontrollers.
- *
- *  Architecture specific USB Host definitions for the Atmel 32-bit AVR UC3B microcontrollers.
- *
- *  @{
- */
-
-#ifndef __USBHOST_UC3B_H__
-#define __USBHOST_UC3B_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-		#include "../StdDescriptors.h"
-		#include "../Pipe.h"
-		#include "../USBInterrupt.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_USB_DRIVER)
-			#error Do not include this file directly. Include LUFA/Drivers/USB/USB.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Indicates the fixed USB device address which any attached device is enumerated to when in
-			 *  host mode. As only one USB device may be attached to the AVR in host mode at any one time
-			 *  and that the address used is not important (other than the fact that it is non-zero), a
-			 *  fixed value is specified by the library.
-			 */
-			#define USB_HOST_DEVICEADDRESS                 1
-
-			#if !defined(HOST_DEVICE_SETTLE_DELAY_MS) || defined(__DOXYGEN__)
-				/** Constant for the delay in milliseconds after a device is connected before the library
-				 *  will start the enumeration process. Some devices require a delay of up to 5 seconds
-				 *  after connection before the enumeration process can start or incorrect operation will
-				 *  occur.
-				 *
-				 *  The default delay value may be overridden in the user project makefile by defining the
-				 *  \c HOST_DEVICE_SETTLE_DELAY_MS token to the required delay in milliseconds, and passed to the
-				 *  compiler using the -D switch.
-				 */
-				#define HOST_DEVICE_SETTLE_DELAY_MS        1000
-			#endif
-
-		/* Enums: */
-			/** Enum for the error codes for the \ref EVENT_USB_Host_HostError() event.
-			 *
-			 *  \see \ref Group_Events for more information on this event.
-			 */
-			enum USB_Host_ErrorCodes_t
-			{
-				HOST_ERROR_VBusVoltageDip       = 0, /**< VBUS voltage dipped to an unacceptable level. This
-				                                      *   error may be the result of an attached device drawing
-				                                      *   too much current from the VBUS line, or due to the
-				                                      *   AVR's power source being unable to supply sufficient
-				                                      *   current.
-				                                      */
-			};
-
-			/** Enum for the error codes for the \ref EVENT_USB_Host_DeviceEnumerationFailed() event.
-			 *
-			 *  \see \ref Group_Events for more information on this event.
-			 */
-			enum USB_Host_EnumerationErrorCodes_t
-			{
-				HOST_ENUMERROR_NoError          = 0, /**< No error occurred. Used internally, this is not a valid
-				                                      *   ErrorCode parameter value for the \ref EVENT_USB_Host_DeviceEnumerationFailed()
-				                                      *   event.
-				                                      */
-				HOST_ENUMERROR_WaitStage        = 1, /**< One of the delays between enumeration steps failed
-				                                      *   to complete successfully, due to a timeout or other
-				                                      *   error.
-				                                      */
-				HOST_ENUMERROR_NoDeviceDetected = 2, /**< No device was detected, despite the USB data lines
-				                                      *   indicating the attachment of a device.
-				                                      */
-				HOST_ENUMERROR_ControlError     = 3, /**< One of the enumeration control requests failed to
-				                                      *   complete successfully.
-				                                      */
-				HOST_ENUMERROR_PipeConfigError  = 4, /**< The default control pipe (address 0) failed to
-				                                      *   configure correctly.
-				                                      */
-			};
-
-		/* Inline Functions: */
-			/** Returns the current USB frame number, when in host mode. Every millisecond the USB bus is active (i.e. not suspended)
-			 *  the frame number is incremented by one.
-			 *
-			 *  \return Current USB frame number from the USB controller.
-			 */
-			static inline uint16_t USB_Host_GetFrameNumber(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline uint16_t USB_Host_GetFrameNumber(void)
-			{
-				return AVR32_USBB_UHFNUM;
-			}
-
-			#if !defined(NO_SOF_EVENTS)
-				/** Enables the host mode Start Of Frame events. When enabled, this causes the
-				 *  \ref EVENT_USB_Host_StartOfFrame() event to fire once per millisecond, synchronized to the USB bus,
-				 *  at the start of each USB frame when a device is enumerated while in host mode.
-				 *
-				 *  \note This function is not available when the \c NO_SOF_EVENTS compile time token is defined.
-				 */
-				static inline void USB_Host_EnableSOFEvents(void) ATTR_ALWAYS_INLINE;
-				static inline void USB_Host_EnableSOFEvents(void)
-				{
-					USB_INT_Enable(USB_INT_HSOFI);
-				}
-
-				/** Disables the host mode Start Of Frame events. When disabled, this stops the firing of the
-				 *  \ref EVENT_USB_Host_StartOfFrame() event when enumerated in host mode.
-				 *
-				 *  \note This function is not available when the \c NO_SOF_EVENTS compile time token is defined.
-				 */
-				static inline void USB_Host_DisableSOFEvents(void) ATTR_ALWAYS_INLINE;
-				static inline void USB_Host_DisableSOFEvents(void)
-				{
-					USB_INT_Disable(USB_INT_HSOFI);
-				}
-			#endif
-
-			/** Resets the USB bus, including the endpoints in any attached device and pipes on the AVR host.
-			 *  USB bus resets leave the default control pipe configured (if already configured).
-			 *
-			 *  If the USB bus has been suspended prior to issuing a bus reset, the attached device will be
-			 *  woken up automatically and the bus resumed after the reset has been correctly issued.
-			 */
-			static inline void USB_Host_ResetBus(void) ATTR_ALWAYS_INLINE;
-			static inline void USB_Host_ResetBus(void)
-			{
-				AVR32_USBB.UHCON.reset = true;
-			}
-
-			/** Determines if a previously issued bus reset (via the \ref USB_Host_ResetBus() macro) has
-			 *  completed.
-			 *
-			 *  \return Boolean \c true if no bus reset is currently being sent, \c false otherwise.
-			 */
-			static inline bool USB_Host_IsBusResetComplete(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline bool USB_Host_IsBusResetComplete(void)
-			{
-				return AVR32_USBB.UHCON.reset;
-			}
-
-			/** Resumes USB communications with an attached and enumerated device, by resuming the transmission
-			 *  of the 1MS Start Of Frame messages to the device. When resumed, USB communications between the
-			 *  host and attached device may occur.
-			 */
-			static inline void USB_Host_ResumeBus(void) ATTR_ALWAYS_INLINE;
-			static inline void USB_Host_ResumeBus(void)
-			{
-				AVR32_USBB.UHCON.sofe = true;
-			}
-
-			/** Suspends the USB bus, preventing any communications from occurring between the host and attached
-			 *  device until the bus has been resumed. This stops the transmission of the 1MS Start Of Frame
-			 *  messages to the device.
-			 *
-			 *  \note While the USB bus is suspended, all USB interrupt sources are also disabled; this means that
-			 *        some events (such as device disconnections) will not fire until the bus is resumed.
-			 */
-			static inline void USB_Host_SuspendBus(void) ATTR_ALWAYS_INLINE;
-			static inline void USB_Host_SuspendBus(void)
-			{
-				AVR32_USBB.UHCON.sofe = false;
-			}
-
-			/** Determines if the USB bus has been suspended via the use of the \ref USB_Host_SuspendBus() macro,
-			 *  false otherwise. While suspended, no USB communications can occur until the bus is resumed,
-			 *  except for the Remote Wakeup event from the device if supported.
-			 *
-			 *  \return Boolean \c true if the bus is currently suspended, \c false otherwise.
-			 */
-			static inline bool USB_Host_IsBusSuspended(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline bool USB_Host_IsBusSuspended(void)
-			{
-				return AVR32_USBB.UHCON.sofe;
-			}
-
-			/** Determines if the attached device is currently enumerated in Full Speed mode (12Mb/s), or
-			 *  false if the attached device is enumerated in Low Speed mode (1.5Mb/s).
-			 *
-			 *  \return Boolean \c true if the attached device is enumerated in Full Speed mode, \c false otherwise.
-			 */
-			static inline bool USB_Host_IsDeviceFullSpeed(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline bool USB_Host_IsDeviceFullSpeed(void)
-			{
-				return (AVR32_USBB.USBSTA.speed == AVR32_USBB_SPEED_FULL);
-			}
-
-			/** Determines if the attached device is currently issuing a Remote Wakeup request, requesting
-			 *  that the host resume the USB bus and wake up the device, \c false otherwise.
-			 *
-			 *  \return Boolean \c true if the attached device has sent a Remote Wakeup request, \c false otherwise.
-			 */
-			static inline bool USB_Host_IsRemoteWakeupSent(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline bool USB_Host_IsRemoteWakeupSent(void)
-			{
-				return AVR32_USBB.UHINT.rxrsmi;
-			}
-
-			/** Clears the flag indicating that a Remote Wakeup request has been issued by an attached device. */
-			static inline void USB_Host_ClearRemoteWakeupSent(void) ATTR_ALWAYS_INLINE;
-			static inline void USB_Host_ClearRemoteWakeupSent(void)
-			{
-				AVR32_USBB.UHINTCLR.rxrsmic = true;
-			}
-
-			/** Accepts a Remote Wakeup request from an attached device. This must be issued in response to
-			 *  a device's Remote Wakeup request within 2ms for the request to be accepted and the bus to
-			 *  be resumed.
-			 */
-			static inline void USB_Host_ResumeFromWakeupRequest(void) ATTR_ALWAYS_INLINE;
-			static inline void USB_Host_ResumeFromWakeupRequest(void)
-			{
-				AVR32_USBB.UHCON.resume = true;
-			}
-
-			/** Determines if a resume from Remote Wakeup request is currently being sent to an attached
-			 *  device.
-			 *
-			 *  \return Boolean \c true if no resume request is currently being sent, \c false otherwise.
-			 */
-			static inline bool USB_Host_IsResumeFromWakeupRequestSent(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline bool USB_Host_IsResumeFromWakeupRequestSent(void)
-			{
-				return AVR32_USBB.UHCON.resume;
-			}
-
-	/* Private Interface - For use in library only: */
-	#if !defined(__DOXYGEN__)
-		/* Macros: */
-			static inline void USB_Host_HostMode_On(void) ATTR_ALWAYS_INLINE;
-			static inline void USB_Host_HostMode_On(void)
-			{
-				// Not required for UC3B
-			}
-
-			static inline void USB_Host_HostMode_Off(void) ATTR_ALWAYS_INLINE;
-			static inline void USB_Host_HostMode_Off(void)
-			{
-				// Not required for UC3B
-			}
-
-			static inline void USB_Host_VBUS_Auto_Enable(void) ATTR_ALWAYS_INLINE;
-			static inline void USB_Host_VBUS_Auto_Enable(void)
-			{
-				AVR32_USBB.USBCON.vbushwc = false;
-			}
-
-			static inline void USB_Host_VBUS_Manual_Enable(void) ATTR_ALWAYS_INLINE;
-			static inline void USB_Host_VBUS_Manual_Enable(void)
-			{
-				AVR32_USBB.USBCON.vbushwc = true;
-			}
-
-			static inline void USB_Host_VBUS_Auto_On(void) ATTR_ALWAYS_INLINE;
-			static inline void USB_Host_VBUS_Auto_On(void)
-			{
-				AVR32_USBB.USBSTASET.vbusrqs = true;
-			}
-
-			static inline void USB_Host_VBUS_Manual_On(void) ATTR_ALWAYS_INLINE;
-			static inline void USB_Host_VBUS_Manual_On(void)
-			{
-				AVR32_USBB.USBSTASET.vbusrqs = true;
-			}
-
-			static inline void USB_Host_VBUS_Auto_Off(void) ATTR_ALWAYS_INLINE;
-			static inline void USB_Host_VBUS_Auto_Off(void)
-			{
-				AVR32_USBB.USBSTACLR.vbusrqc = true;
-			}
-
-			static inline void USB_Host_VBUS_Manual_Off(void) ATTR_ALWAYS_INLINE;
-			static inline void USB_Host_VBUS_Manual_Off(void)
-			{
-				AVR32_USBB.USBSTACLR.vbusrqc = true;
-			}
-
-			static inline void USB_Host_SetDeviceAddress(const uint8_t Address) ATTR_ALWAYS_INLINE;
-			static inline void USB_Host_SetDeviceAddress(const uint8_t Address)
-			{
-				AVR32_USBB.UHADDR1.uhaddr_p0 = Address;
-				AVR32_USBB.UHADDR1.uhaddr_p1 = Address;
-				AVR32_USBB.UHADDR1.uhaddr_p2 = Address;
-				AVR32_USBB.UHADDR1.uhaddr_p3 = Address;
-				AVR32_USBB.UHADDR2.uhaddr_p4 = Address;
-				AVR32_USBB.UHADDR2.uhaddr_p5 = Address;
-				AVR32_USBB.UHADDR2.uhaddr_p6 = Address;
-			}
-
-		/* Enums: */
-			enum USB_Host_WaitMSErrorCodes_t
-			{
-				HOST_WAITERROR_Successful       = 0,
-				HOST_WAITERROR_DeviceDisconnect = 1,
-				HOST_WAITERROR_PipeError        = 2,
-				HOST_WAITERROR_SetupStalled     = 3,
-			};
-
-		/* Function Prototypes: */
-			void    USB_Host_ProcessNextHostState(void);
-			uint8_t USB_Host_WaitMS(uint8_t MS);
-
-			#if defined(__INCLUDE_FROM_HOST_C)
-				static void USB_Host_ResetDevice(void);
-			#endif
-	#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Core/UC3/PipeStream_UC3.c b/NativePrograms/LUFA/Drivers/USB/Core/UC3/PipeStream_UC3.c
deleted file mode 100644
index e16d09ce40..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Core/UC3/PipeStream_UC3.c
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-#include "../../../../Common/Common.h"
-#if (ARCH == ARCH_UC3)
-
-#define  __INCLUDE_FROM_USB_DRIVER
-#include "../USBMode.h"
-
-#if defined(USB_CAN_BE_HOST)
-
-#include "PipeStream_UC3.h"
-
-uint8_t Pipe_Discard_Stream(uint16_t Length,
-                            uint16_t* const BytesProcessed)
-{
-	uint8_t  ErrorCode;
-	uint16_t BytesInTransfer = 0;
-
-	Pipe_SetPipeToken(PIPE_TOKEN_IN);
-
-	if ((ErrorCode = Pipe_WaitUntilReady()))
-	  return ErrorCode;
-
-	if (BytesProcessed != NULL)
-	  Length -= *BytesProcessed;
-
-	while (Length)
-	{
-		if (!(Pipe_IsReadWriteAllowed()))
-		{
-			Pipe_ClearIN();
-
-			if (BytesProcessed != NULL)
-			{
-				*BytesProcessed += BytesInTransfer;
-				return PIPE_RWSTREAM_IncompleteTransfer;
-			}
-
-			if ((ErrorCode = Pipe_WaitUntilReady()))
-			  return ErrorCode;
-		}
-		else
-		{
-			Pipe_Discard_8();
-
-			Length--;
-			BytesInTransfer++;
-		}
-	}
-
-	return PIPE_RWSTREAM_NoError;
-}
-
-uint8_t Pipe_Null_Stream(uint16_t Length,
-                         uint16_t* const BytesProcessed)
-{
-	uint8_t  ErrorCode;
-	uint16_t BytesInTransfer = 0;
-
-	Pipe_SetPipeToken(PIPE_TOKEN_OUT);
-
-	if ((ErrorCode = Pipe_WaitUntilReady()))
-	  return ErrorCode;
-
-	if (BytesProcessed != NULL)
-	  Length -= *BytesProcessed;
-
-	while (Length)
-	{
-		if (!(Pipe_IsReadWriteAllowed()))
-		{
-			Pipe_ClearOUT();
-
-			if (BytesProcessed != NULL)
-			{
-				*BytesProcessed += BytesInTransfer;
-				return PIPE_RWSTREAM_IncompleteTransfer;
-			}
-
-			USB_USBTask();
-
-			if ((ErrorCode = Pipe_WaitUntilReady()))
-			  return ErrorCode;
-		}
-		else
-		{
-			Pipe_Write_8(0);
-
-			Length--;
-			BytesInTransfer++;
-		}
-	}
-
-	return PIPE_RWSTREAM_NoError;
-}
-
-/* The following abuses the C preprocessor in order to copy-paste common code with slight alterations,
- * so that the code needs to be written once. It is a crude form of templating to reduce code maintenance. */
-
-#define  TEMPLATE_FUNC_NAME                        Pipe_Write_Stream_LE
-#define  TEMPLATE_BUFFER_TYPE                      const void*
-#define  TEMPLATE_TOKEN                            PIPE_TOKEN_OUT
-#define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearOUT()
-#define  TEMPLATE_BUFFER_OFFSET(Length)            0
-#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   DataStream += Amount
-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Pipe_Write_8(*BufferPtr)
-#include "Template/Template_Pipe_RW.c"
-
-#define  TEMPLATE_FUNC_NAME                        Pipe_Write_Stream_BE
-#define  TEMPLATE_BUFFER_TYPE                      const void*
-#define  TEMPLATE_TOKEN                            PIPE_TOKEN_OUT
-#define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearOUT()
-#define  TEMPLATE_BUFFER_OFFSET(Length)            (Length - 1)
-#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   DataStream -= Amount
-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Pipe_Write_8(*BufferPtr)
-#include "Template/Template_Pipe_RW.c"
-
-#define  TEMPLATE_FUNC_NAME                        Pipe_Read_Stream_LE
-#define  TEMPLATE_BUFFER_TYPE                      void*
-#define  TEMPLATE_TOKEN                            PIPE_TOKEN_IN
-#define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearIN()
-#define  TEMPLATE_BUFFER_OFFSET(Length)            0
-#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   DataStream += Amount
-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *BufferPtr = Pipe_Read_8()
-#include "Template/Template_Pipe_RW.c"
-
-#define  TEMPLATE_FUNC_NAME                        Pipe_Read_Stream_BE
-#define  TEMPLATE_BUFFER_TYPE                      void*
-#define  TEMPLATE_TOKEN                            PIPE_TOKEN_IN
-#define  TEMPLATE_CLEAR_PIPE()                     Pipe_ClearIN()
-#define  TEMPLATE_BUFFER_OFFSET(Length)            (Length - 1)
-#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   DataStream -= Amount
-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *BufferPtr = Pipe_Read_8()
-#include "Template/Template_Pipe_RW.c"
-
-#endif
-
-#endif
diff --git a/NativePrograms/LUFA/Drivers/USB/Core/UC3/PipeStream_UC3.h b/NativePrograms/LUFA/Drivers/USB/Core/UC3/PipeStream_UC3.h
deleted file mode 100644
index e9aa359724..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Core/UC3/PipeStream_UC3.h
+++ /dev/null
@@ -1,352 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Pipe data stream transmission and reception management for the AVR32 UC3 microcontrollers.
- *  \copydetails Group_PipeStreamRW_UC3
- *
- *  \note This file should not be included directly. It is automatically included as needed by the USB driver
- *        dispatch header located in LUFA/Drivers/USB/USB.h.
- */
-
-/** \ingroup Group_PipeStreamRW
- *  \defgroup Group_PipeStreamRW_UC3 Read/Write of Multi-Byte Streams (UC3)
- *  \brief Pipe data stream transmission and reception management for the Atmel AVR32 UC3 architecture.
- *
- *  Functions, macros, variables, enums and types related to data reading and writing of data streams from
- *  and to pipes.
- *
- *  @{
- */
-
-#ifndef __PIPE_STREAM_UC3_H__
-#define __PIPE_STREAM_UC3_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-		#include "../USBMode.h"
-		#include "../USBTask.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_USB_DRIVER)
-			#error Do not include this file directly. Include LUFA/Drivers/USB/USB.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Function Prototypes: */
-			/** \name Stream functions for null data */
-			/**@{*/
-
-			/** Reads and discards the given number of bytes from the pipe, discarding fully read packets from the host
-			 *  as needed. The last packet is not automatically discarded once the remaining bytes has been read; the
-			 *  user is responsible for manually discarding the last packet from the device via the \ref Pipe_ClearIN() macro.
-			 *
-			 *  If the BytesProcessed parameter is \c NULL, the entire stream transfer is attempted at once, failing or
-			 *  succeeding as a single unit. If the BytesProcessed parameter points to a valid storage location, the transfer
-			 *  will instead be performed as a series of chunks. Each time the pipe bank becomes empty while there is still data
-			 *  to process (and after the current packet has been acknowledged) the BytesProcessed location will be updated with
-			 *  the total number of bytes processed in the stream, and the function will exit with an error code of
-			 *  \ref PIPE_RWSTREAM_IncompleteTransfer. This allows for any abort checking to be performed in the user code - to
-			 *  continue the transfer, call the function again with identical parameters and it will resume until the BytesProcessed
-			 *  value reaches the total transfer length.
-			 *
-			 *  <b>Single Stream Transfer Example:</b>
-			 *  \code
-			 *  uint8_t ErrorCode;
-			 *
-			 *  if ((ErrorCode = Pipe_Discard_Stream(512, NULL)) != PIPE_RWSTREAM_NoError)
-			 *  {
-			 *       // Stream failed to complete - check ErrorCode here
-			 *  }
-			 *  \endcode
-			 *
-			 *  <b>Partial Stream Transfers Example:</b>
-			 *  \code
-			 *  uint8_t  ErrorCode;
-			 *  uint16_t BytesProcessed;
-			 *
-			 *  BytesProcessed = 0;
-			 *  while ((ErrorCode = Pipe_Discard_Stream(512, &BytesProcessed)) == PIPE_RWSTREAM_IncompleteTransfer)
-			 *  {
-			 *      // Stream not yet complete - do other actions here, abort if required
-			 *  }
-			 *
-			 *  if (ErrorCode != PIPE_RWSTREAM_NoError)
-			 *  {
-			 *      // Stream failed to complete - check ErrorCode here
-			 *  }
-			 *  \endcode
-			 *
-			 *  \note The pipe token is set automatically, thus this can be used on bi-directional pipes directly without
-			 *        having to explicitly change the data direction with a call to \ref Pipe_SetPipeToken().
-			 *
-			 *  \param[in] Length          Number of bytes to discard via the currently selected pipe.
-			 *  \param[in] BytesProcessed  Pointer to a location where the total number of bytes already processed should
-			 *                             updated, \c NULL if the entire stream should be processed at once.
-			 *
-			 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Pipe_Discard_Stream(uint16_t Length,
-			                            uint16_t* const BytesProcessed);
-
-			/** Writes a given number of zeroed bytes to the pipe, sending full pipe packets from the host to the device
-			 *  as needed. The last packet is not automatically sent once the remaining bytes has been written; the
-			 *  user is responsible for manually discarding the last packet from the device via the \ref Pipe_ClearOUT() macro.
-			 *
-			 *  If the BytesProcessed parameter is \c NULL, the entire stream transfer is attempted at once, failing or
-			 *  succeeding as a single unit. If the BytesProcessed parameter points to a valid storage location, the transfer
-			 *  will instead be performed as a series of chunks. Each time the pipe bank becomes full while there is still data
-			 *  to process (and after the current packet transmission has been initiated) the BytesProcessed location will be
-			 *  updated with the total number of bytes processed in the stream, and the function will exit with an error code of
-			 *  \ref PIPE_RWSTREAM_IncompleteTransfer. This allows for any abort checking to be performed in the user code - to
-			 *  continue the transfer, call the function again with identical parameters and it will resume until the BytesProcessed
-			 *  value reaches the total transfer length.
-			 *
-			 *  <b>Single Stream Transfer Example:</b>
-			 *  \code
-			 *  uint8_t ErrorCode;
-			 *
-			 *  if ((ErrorCode = Pipe_Null_Stream(512, NULL)) != PIPE_RWSTREAM_NoError)
-			 *  {
-			 *       // Stream failed to complete - check ErrorCode here
-			 *  }
-			 *  \endcode
-			 *
-			 *  <b>Partial Stream Transfers Example:</b>
-			 *  \code
-			 *  uint8_t  ErrorCode;
-			 *  uint16_t BytesProcessed;
-			 *
-			 *  BytesProcessed = 0;
-			 *  while ((ErrorCode = Pipe_Null_Stream(512, &BytesProcessed)) == PIPE_RWSTREAM_IncompleteTransfer)
-			 *  {
-			 *      // Stream not yet complete - do other actions here, abort if required
-			 *  }
-			 *
-			 *  if (ErrorCode != PIPE_RWSTREAM_NoError)
-			 *  {
-			 *      // Stream failed to complete - check ErrorCode here
-			 *  }
-			 *  \endcode
-			 *
-			 *  \note The pipe token is set automatically, thus this can be used on bi-directional pipes directly without
-			 *        having to explicitly change the data direction with a call to \ref Pipe_SetPipeToken().
-			 *
-			 *  \param[in] Length          Number of zero bytes to write via the currently selected pipe.
-			 *  \param[in] BytesProcessed  Pointer to a location where the total number of bytes already processed should
-			 *                             updated, \c NULL if the entire stream should be processed at once.
-			 *
-			 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Pipe_Null_Stream(uint16_t Length,
-			                         uint16_t* const BytesProcessed);
-
-			/**@}*/
-
-			/** \name Stream functions for RAM source/destination data */
-			/**@{*/
-
-			/** Writes the given number of bytes to the pipe from the given buffer in little endian,
-			 *  sending full packets to the device as needed. The last packet filled is not automatically sent;
-			 *  the user is responsible for manually sending the last written packet to the host via the
-			 *  \ref Pipe_ClearOUT() macro. Between each USB packet, the given stream callback function is
-			 *  executed repeatedly until the next packet is ready, allowing for early aborts of stream transfers.
-			 *
-			 *  If the BytesProcessed parameter is \c NULL, the entire stream transfer is attempted at once,
-			 *  failing or succeeding as a single unit. If the BytesProcessed parameter points to a valid
-			 *  storage location, the transfer will instead be performed as a series of chunks. Each time
-			 *  the pipe bank becomes full while there is still data to process (and after the current
-			 *  packet transmission has been initiated) the BytesProcessed location will be updated with the
-			 *  total number of bytes processed in the stream, and the function will exit with an error code of
-			 *  \ref PIPE_RWSTREAM_IncompleteTransfer. This allows for any abort checking to be performed
-			 *  in the user code - to continue the transfer, call the function again with identical parameters
-			 *  and it will resume until the BytesProcessed value reaches the total transfer length.
-			 *
-			 *  <b>Single Stream Transfer Example:</b>
-			 *  \code
-			 *  uint8_t DataStream[512];
-			 *  uint8_t ErrorCode;
-			 *
-			 *  if ((ErrorCode = Pipe_Write_Stream_LE(DataStream, sizeof(DataStream),
-			 *                                        NULL)) != PIPE_RWSTREAM_NoError)
-			 *  {
-			 *       // Stream failed to complete - check ErrorCode here
-			 *  }
-			 *  \endcode
-			 *
-			 *  <b>Partial Stream Transfers Example:</b>
-			 *  \code
-			 *  uint8_t  DataStream[512];
-			 *  uint8_t  ErrorCode;
-			 *  uint16_t BytesProcessed;
-			 *
-			 *  BytesProcessed = 0;
-			 *  while ((ErrorCode = Pipe_Write_Stream_LE(DataStream, sizeof(DataStream),
-			 *                                           &BytesProcessed)) == PIPE_RWSTREAM_IncompleteTransfer)
-			 *  {
-			 *      // Stream not yet complete - do other actions here, abort if required
-			 *  }
-			 *
-			 *  if (ErrorCode != PIPE_RWSTREAM_NoError)
-			 *  {
-			 *      // Stream failed to complete - check ErrorCode here
-			 *  }
-			 *  \endcode
-			 *
-			 *  \note The pipe token is set automatically, thus this can be used on bi-directional pipes directly without
-			 *        having to explicitly change the data direction with a call to \ref Pipe_SetPipeToken().
-			 *
-			 *  \param[in] Buffer          Pointer to the source data buffer to read from.
-			 *  \param[in] Length          Number of bytes to read for the currently selected pipe into the buffer.
-			 *  \param[in] BytesProcessed  Pointer to a location where the total number of bytes already processed should
-			 *                             updated, \c NULL if the entire stream should be written at once.
-			 *
-			 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Pipe_Write_Stream_LE(const void* const Buffer,
-			                             uint16_t Length,
-			                             uint16_t* const BytesProcessed) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Writes the given number of bytes to the pipe from the given buffer in big endian,
-			 *  sending full packets to the device as needed. The last packet filled is not automatically sent;
-			 *  the user is responsible for manually sending the last written packet to the host via the
-			 *  \ref Pipe_ClearOUT() macro. Between each USB packet, the given stream callback function is
-			 *  executed repeatedly until the next packet is ready, allowing for early aborts of stream transfers.
-			 *
-			 *  \note The pipe token is set automatically, thus this can be used on bi-directional pipes directly without
-			 *        having to explicitly change the data direction with a call to \ref Pipe_SetPipeToken().
-			 *
-			 *  \param[in] Buffer          Pointer to the source data buffer to read from.
-			 *  \param[in] Length          Number of bytes to read for the currently selected pipe into the buffer.
-			 *  \param[in] BytesProcessed  Pointer to a location where the total number of bytes already processed should
-			 *                             updated, \c NULL if the entire stream should be written at once.
-			 *
-			 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Pipe_Write_Stream_BE(const void* const Buffer,
-			                             uint16_t Length,
-			                             uint16_t* const BytesProcessed) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Reads the given number of bytes from the pipe into the given buffer in little endian,
-			 *  sending full packets to the device as needed. The last packet filled is not automatically sent;
-			 *  the user is responsible for manually sending the last written packet to the host via the
-			 *  \ref Pipe_ClearIN() macro. Between each USB packet, the given stream callback function is
-			 *  executed repeatedly until the next packet is ready, allowing for early aborts of stream transfers.
-			 *
-			 *  If the BytesProcessed parameter is \c NULL, the entire stream transfer is attempted at once,
-			 *  failing or succeeding as a single unit. If the BytesProcessed parameter points to a valid
-			 *  storage location, the transfer will instead be performed as a series of chunks. Each time
-			 *  the pipe bank becomes empty while there is still data to process (and after the current
-			 *  packet has been acknowledged) the BytesProcessed location will be updated with the total number
-			 *  of bytes processed in the stream, and the function will exit with an error code of
-			 *  \ref PIPE_RWSTREAM_IncompleteTransfer. This allows for any abort checking to be performed
-			 *  in the user code - to continue the transfer, call the function again with identical parameters
-			 *  and it will resume until the BytesProcessed value reaches the total transfer length.
-			 *
-			 *  <b>Single Stream Transfer Example:</b>
-			 *  \code
-			 *  uint8_t DataStream[512];
-			 *  uint8_t ErrorCode;
-			 *
-			 *  if ((ErrorCode = Pipe_Read_Stream_LE(DataStream, sizeof(DataStream),
-			 *                                       NULL)) != PIPE_RWSTREAM_NoError)
-			 *  {
-			 *       // Stream failed to complete - check ErrorCode here
-			 *  }
-			 *  \endcode
-			 *
-			 *  <b>Partial Stream Transfers Example:</b>
-			 *  \code
-			 *  uint8_t  DataStream[512];
-			 *  uint8_t  ErrorCode;
-			 *  uint16_t BytesProcessed;
-			 *
-			 *  BytesProcessed = 0;
-			 *  while ((ErrorCode = Pipe_Read_Stream_LE(DataStream, sizeof(DataStream),
-			 *                                          &BytesProcessed)) == PIPE_RWSTREAM_IncompleteTransfer)
-			 *  {
-			 *      // Stream not yet complete - do other actions here, abort if required
-			 *  }
-			 *
-			 *  if (ErrorCode != PIPE_RWSTREAM_NoError)
-			 *  {
-			 *      // Stream failed to complete - check ErrorCode here
-			 *  }
-			 *  \endcode
-			 *
-			 *  \note The pipe token is set automatically, thus this can be used on bi-directional pipes directly without
-			 *        having to explicitly change the data direction with a call to \ref Pipe_SetPipeToken().
-			 *
-			 *  \param[out] Buffer          Pointer to the source data buffer to write to.
-			 *  \param[in]  Length          Number of bytes to read for the currently selected pipe to read from.
-			 *  \param[in]  BytesProcessed  Pointer to a location where the total number of bytes already processed should
-			 *                              updated, \c NULL if the entire stream should be read at once.
-			 *
-			 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Pipe_Read_Stream_LE(void* const Buffer,
-			                            uint16_t Length,
-			                            uint16_t* const BytesProcessed) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Reads the given number of bytes from the pipe into the given buffer in big endian,
-			 *  sending full packets to the device as needed. The last packet filled is not automatically sent;
-			 *  the user is responsible for manually sending the last written packet to the host via the
-			 *  \ref Pipe_ClearIN() macro. Between each USB packet, the given stream callback function is
-			 *  executed repeatedly until the next packet is ready, allowing for early aborts of stream transfers.
-			 *
-			 *  \note The pipe token is set automatically, thus this can be used on bi-directional pipes directly without
-			 *        having to explicitly change the data direction with a call to \ref Pipe_SetPipeToken().
-			 *
-			 *  \param[out] Buffer          Pointer to the source data buffer to write to.
-			 *  \param[in]  Length          Number of bytes to read for the currently selected pipe to read from.
-			 *  \param[in]  BytesProcessed  Pointer to a location where the total number of bytes already processed should
-			 *                              updated, \c NULL if the entire stream should be read at once.
-			 *
-			 *  \return A value from the \ref Pipe_Stream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Pipe_Read_Stream_BE(void* const Buffer,
-			                            uint16_t Length,
-			                            uint16_t* const BytesProcessed) ATTR_NON_NULL_PTR_ARG(1);
-			/**@}*/
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Core/UC3/Pipe_UC3.c b/NativePrograms/LUFA/Drivers/USB/Core/UC3/Pipe_UC3.c
deleted file mode 100644
index cfb4fe0a93..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Core/UC3/Pipe_UC3.c
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-#include "../../../../Common/Common.h"
-#if (ARCH == ARCH_UC3)
-
-#define  __INCLUDE_FROM_USB_DRIVER
-#include "../USBMode.h"
-
-#if defined(USB_CAN_BE_HOST)
-
-#include "../Pipe.h"
-
-uint8_t USB_Host_ControlPipeSize = PIPE_CONTROLPIPE_DEFAULT_SIZE;
-
-volatile uint32_t USB_Pipe_SelectedPipe = PIPE_CONTROLPIPE;
-volatile uint8_t* USB_Pipe_FIFOPos[PIPE_TOTAL_PIPES];
-
-bool Pipe_ConfigurePipeTable(const USB_Pipe_Table_t* const Table,
-                             const uint8_t Entries)
-{
-	for (uint8_t i = 0; i < Entries; i++)
-	{
-		if (!(Table[i].Address))
-		  continue;
-
-		if (!(Pipe_ConfigurePipe(Table[i].Address, Table[i].Type, Table[i].EndpointAddress, Table[i].Size, Table[i].Banks)))
-		{
-			return false;
-		}
-	}
-
-	return true;
-}
-
-bool Pipe_ConfigurePipe(const uint8_t Address,
-                        const uint8_t Type,
-                        const uint8_t EndpointAddress,
-                        const uint16_t Size,
-                        const uint8_t Banks)
-{
-	uint8_t Number = (Address & PIPE_EPNUM_MASK);
-	uint8_t Token  = (Address & PIPE_DIR_IN) ? PIPE_TOKEN_IN : PIPE_TOKEN_OUT;
-
-	if (Number >= PIPE_TOTAL_PIPES)
-	  return false;
-
-	if (Type == EP_TYPE_CONTROL)
-	  Token = PIPE_TOKEN_SETUP;
-
-	USB_Pipe_FIFOPos[Number]     = &AVR32_USBB_SLAVE[Number * PIPE_HSB_ADDRESS_SPACE_SIZE];
-
-#if defined(ORDERED_EP_CONFIG)
-	Pipe_SelectPipe(Number);
-	Pipe_EnablePipe();
-
-	(&AVR32_USBB.upcfg0)[Number] = 0;
-	(&AVR32_USBB.upcfg0)[Number] = (AVR32_USBB_ALLOC_MASK |
-	                                ((uint32_t)Type  << AVR32_USBB_PTYPE_OFFSET)  |
-	                                ((uint32_t)Token << AVR32_USBB_PTOKEN_OFFSET) |
-	                                ((Banks > 1) ? AVR32_USBB_PBK_MASK : 0)       |
-	                                Pipe_BytesToEPSizeMask(Size) |
-	                                ((uint32_t)Number << AVR32_USBB_PEPNUM_OFFSET));
-
-	Pipe_SetInfiniteINRequests();
-
-	return Pipe_IsConfigured();
-#else
-	for (uint8_t PNum = Number; PNum < PIPE_TOTAL_PIPES; PNum++)
-	{
-		uint32_t UPCFG0Temp;
-
-		Pipe_SelectPipe(PNum);
-
-		if (PNum == Number)
-		{
-			UPCFG0Temp = (AVR32_USBB_ALLOC_MASK |
-			              ((uint32_t)Type  << AVR32_USBB_PTYPE_OFFSET)  |
-			              ((uint32_t)Token << AVR32_USBB_PTOKEN_OFFSET) |
-			              ((Banks > 1) ? AVR32_USBB_PBK_MASK : 0)       |
-			              Pipe_BytesToEPSizeMask(Size) |
-			              ((EndpointAddress & PIPE_EPNUM_MASK) << AVR32_USBB_PEPNUM_OFFSET));
-		}
-		else
-		{
-			UPCFG0Temp = (&AVR32_USBB.upcfg0)[PNum];
-		}
-
-		if (!(UPCFG0Temp & AVR32_USBB_ALLOC_MASK))
-		  continue;
-
-		Pipe_DisablePipe();
-		(&AVR32_USBB.upcfg0)[PNum] &= ~AVR32_USBB_ALLOC_MASK;
-
-		Pipe_EnablePipe();
-		(&AVR32_USBB.upcfg0)[PNum] = UPCFG0Temp;
-
-		Pipe_SetInfiniteINRequests();
-
-		if (!(Pipe_IsConfigured()))
-		  return false;
-	}
-
-	Pipe_SelectPipe(Number);
-	return true;
-#endif
-}
-
-void Pipe_ClearPipes(void)
-{
-	for (uint8_t PNum = 0; PNum < PIPE_TOTAL_PIPES; PNum++)
-	{
-		Pipe_SelectPipe(PNum);
-		(&AVR32_USBB.upcfg0)[PNum]    = 0;
-		(&AVR32_USBB.upcon0clr)[PNum] = -1;
-		USB_Pipe_FIFOPos[PNum]        = &AVR32_USBB_SLAVE[PNum * 0x10000];
-		Pipe_DisablePipe();
-	}
-}
-
-bool Pipe_IsEndpointBound(const uint8_t EndpointAddress)
-{
-	uint8_t PrevPipeNumber = Pipe_GetCurrentPipe();
-
-	for (uint8_t PNum = 0; PNum < PIPE_TOTAL_PIPES; PNum++)
-	{
-		Pipe_SelectPipe(PNum);
-
-		if (!(Pipe_IsConfigured()))
-		  continue;
-
-		if (Pipe_GetBoundEndpointAddress() == EndpointAddress)
-		  return true;
-	}
-
-	Pipe_SelectPipe(PrevPipeNumber);
-	return false;
-}
-
-uint8_t Pipe_WaitUntilReady(void)
-{
-	#if (USB_STREAM_TIMEOUT_MS < 0xFF)
-	uint8_t  TimeoutMSRem = USB_STREAM_TIMEOUT_MS;
-	#else
-	uint16_t TimeoutMSRem = USB_STREAM_TIMEOUT_MS;
-	#endif
-
-	uint16_t PreviousFrameNumber = USB_Host_GetFrameNumber();
-
-	for (;;)
-	{
-		if (Pipe_GetPipeToken() == PIPE_TOKEN_IN)
-		{
-			if (Pipe_IsINReceived())
-			  return PIPE_READYWAIT_NoError;
-		}
-		else
-		{
-			if (Pipe_IsOUTReady())
-			  return PIPE_READYWAIT_NoError;
-		}
-
-		if (Pipe_IsStalled())
-		  return PIPE_READYWAIT_PipeStalled;
-		else if (USB_HostState == HOST_STATE_Unattached)
-		  return PIPE_READYWAIT_DeviceDisconnected;
-
-		uint16_t CurrentFrameNumber = USB_Host_GetFrameNumber();
-
-		if (CurrentFrameNumber != PreviousFrameNumber)
-		{
-			PreviousFrameNumber = CurrentFrameNumber;
-
-			if (!(TimeoutMSRem--))
-			  return PIPE_READYWAIT_Timeout;
-		}
-	}
-}
-
-#endif
-
-#endif
diff --git a/NativePrograms/LUFA/Drivers/USB/Core/UC3/Pipe_UC3.h b/NativePrograms/LUFA/Drivers/USB/Core/UC3/Pipe_UC3.h
deleted file mode 100644
index c75ecb1173..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Core/UC3/Pipe_UC3.h
+++ /dev/null
@@ -1,924 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief USB Pipe definitions for the AVR32 UC3 microcontrollers.
- *  \copydetails Group_PipeManagement_UC3
- *
- *  \note This file should not be included directly. It is automatically included as needed by the USB driver
- *        dispatch header located in LUFA/Drivers/USB/USB.h.
- */
-
-/** \ingroup Group_PipeRW
- *  \defgroup Group_PipeRW_UC3 Pipe Data Reading and Writing (UC3)
- *  \brief Pipe data read/write definitions for the Atmel AVR32 UC3 architecture.
- *
- *  Functions, macros, variables, enums and types related to data reading and writing from and to pipes.
- */
-
-/** \ingroup Group_PipePrimitiveRW
- *  \defgroup Group_PipePrimitiveRW_UC3 Read/Write of Primitive Data Types (UC3)
- *  \brief Pipe primitive data read/write definitions for the Atmel AVR32 UC3 architecture.
- *
- *  Functions, macros, variables, enums and types related to data reading and writing of primitive data types
- *  from and to pipes.
- */
-
-/** \ingroup Group_PipePacketManagement
- *  \defgroup Group_PipePacketManagement_UC3 Pipe Packet Management (UC3)
- *  \brief Pipe packet management definitions for the Atmel AVR32 UC3 architecture.
- *
- *  Functions, macros, variables, enums and types related to packet management of pipes.
- */
-
-/** \ingroup Group_PipeControlReq
- *  \defgroup Group_PipeControlReq_UC3 Pipe Control Request Management (UC3)
- *  \brief Pipe control request management definitions for the Atmel AVR32 UC3 architecture.
- *
- *  Module for host mode request processing. This module allows for the transmission of standard, class and
- *  vendor control requests to the default control endpoint of an attached device while in host mode.
- *
- *  \see Chapter 9 of the USB 2.0 specification.
- */
-
-/** \ingroup Group_PipeManagement
- *  \defgroup Group_PipeManagement_UC3 Pipe Management (UC3)
- *  \brief Pipe management definitions for the Atmel AVR32 UC3 architecture.
- *
- *  This module contains functions, macros and enums related to pipe management when in USB Host mode. This
- *  module contains the pipe management macros, as well as pipe interrupt and data send/receive functions
- *  for various data types.
- *
- *  @{
- */
-
-#ifndef __PIPE_UC3_H__
-#define __PIPE_UC3_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-		#include "../USBTask.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_USB_DRIVER)
-			#error Do not include this file directly. Include LUFA/Drivers/USB/USB.h instead.
-		#endif
-
-	/* Private Interface - For use in library only: */
-	#if !defined(__DOXYGEN__)
-		/* Macros: */
-			#define PIPE_HSB_ADDRESS_SPACE_SIZE     (64 * 1024UL)
-
-		/* External Variables: */
-			extern volatile uint32_t USB_Pipe_SelectedPipe;
-			extern volatile uint8_t* USB_Pipe_FIFOPos[];
-	#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** \name Pipe Error Flag Masks */
-			/**@{*/
-			/** Mask for \ref Pipe_GetErrorFlags(), indicating that an overflow error occurred in the pipe on the received data. */
-			#define PIPE_ERRORFLAG_OVERFLOW         (AVR32_USBB_UPSTA0_OVERFI_MASK << 8)
-
-			/** Mask for \ref Pipe_GetErrorFlags(), indicating that a CRC error occurred in the pipe on the received data. */
-			#define PIPE_ERRORFLAG_CRC16            AVR32_USBB_UPERR0_CRC16_MASK
-
-			/** Mask for \ref Pipe_GetErrorFlags(), indicating that a hardware timeout error occurred in the pipe. */
-			#define PIPE_ERRORFLAG_TIMEOUT          AVR32_USBB_UPERR0_TIMEOUT_MASK
-
-			/** Mask for \ref Pipe_GetErrorFlags(), indicating that a hardware PID error occurred in the pipe. */
-			#define PIPE_ERRORFLAG_PID              AVR32_USBB_UPERR0_PID_MASK
-
-			/** Mask for \ref Pipe_GetErrorFlags(), indicating that a hardware data PID error occurred in the pipe. */
-			#define PIPE_ERRORFLAG_DATAPID          AVR32_USBB_UPERR0_DATAPID_MASK
-
-			/** Mask for \ref Pipe_GetErrorFlags(), indicating that a hardware data toggle error occurred in the pipe. */
-			#define PIPE_ERRORFLAG_DATATGL          AVR32_USBB_UPERR0_DATATGL_MASK
-			/**@}*/
-
-			/** \name Pipe Token Masks */
-			/**@{*/
-			/** Token mask for \ref Pipe_SetPipeToken() and \ref Pipe_GetPipeToken(). This sets the pipe as a SETUP token (for CONTROL type pipes),
-			 *  which will trigger a control request on the attached device when data is written to the pipe.
-			 */
-			#define PIPE_TOKEN_SETUP                AVR32_USBB_UPCFG0_PTOKEN_SETUP
-
-			/** Token mask for \ref Pipe_SetPipeToken() and \ref Pipe_GetPipeToken(). This sets the pipe as a IN token (for non-CONTROL type pipes),
-			 *  indicating that the pipe data will flow from device to host.
-			 */
-			#define PIPE_TOKEN_IN                   AVR32_USBB_UPCFG0_PTOKEN_IN
-
-			/** Token mask for \ref Pipe_SetPipeToken() and \ref Pipe_GetPipeToken(). This sets the pipe as a OUT token (for non-CONTROL type pipes),
-			 *  indicating that the pipe data will flow from host to device.
-			 */
-			#define PIPE_TOKEN_OUT                  AVR32_USBB_UPCFG0_PTOKEN_OUT
-			/**@}*/
-
-			/** Default size of the default control pipe's bank, until altered by the Endpoint0Size value
-			 *  in the device descriptor of the attached device.
-			 */
-			#define PIPE_CONTROLPIPE_DEFAULT_SIZE   64
-
-			#if defined(USB_SERIES_UC3A3_AVR32) || defined(USB_SERIES_UC3A4_AVR32) || defined(__DOXYGEN__)
-				/** Total number of pipes (including the default control pipe at address 0) which may be used in
-				 *  the device.
-				 */
-				#define PIPE_TOTAL_PIPES            8
-			#else
-				#define PIPE_TOTAL_PIPES            7
-			#endif
-
-			/** Size in bytes of the largest pipe bank size possible in the device. Not all banks on each AVR
-			 *  model supports the largest bank size possible on the device; different pipe numbers support
-			 *  different maximum bank sizes. This value reflects the largest possible bank of any pipe on the
-			 *  currently selected UC3 AVR model.
-			 */
-			#define PIPE_MAX_SIZE                   256
-
-		/* Enums: */
-			/** Enum for the possible error return codes of the \ref Pipe_WaitUntilReady() function.
-			 *
-			 *  \ingroup Group_PipeRW_UC3
-			 */
-			enum Pipe_WaitUntilReady_ErrorCodes_t
-			{
-				PIPE_READYWAIT_NoError                 = 0, /**< Pipe ready for next packet, no error. */
-				PIPE_READYWAIT_PipeStalled             = 1,	/**< The device stalled the pipe while waiting. */
-				PIPE_READYWAIT_DeviceDisconnected      = 2,	/**< Device was disconnected from the host while waiting. */
-				PIPE_READYWAIT_Timeout                 = 3, /**< The device failed to accept or send the next packet
-				                                             *   within the software timeout period set by the
-				                                             *   \ref USB_STREAM_TIMEOUT_MS macro.
-				                                             */
-			};
-
-		/* Inline Functions: */
-			/** Indicates the number of bytes currently stored in the current pipes's selected bank.
-			 *
-			 *  \ingroup Group_PipeRW_UC3
-			 *
-			 *  \return Total number of bytes in the currently selected pipe's FIFO buffer.
-			 */
-			static inline uint16_t Pipe_BytesInPipe(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline uint16_t Pipe_BytesInPipe(void)
-			{
-				return (&AVR32_USBB.UPSTA0)[USB_Pipe_SelectedPipe].pbyct;
-			}
-
-			/** Determines the currently selected pipe's direction.
-			 *
-			 *  \return The currently selected pipe's direction, as a \c PIPE_DIR_* mask.
-			 */
-			static inline uint8_t Pipe_GetPipeDirection(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline uint8_t Pipe_GetPipeDirection(void)
-			{
-				return (((&AVR32_USBB.UPCFG0)[USB_Pipe_SelectedPipe].ptoken == PIPE_TOKEN_OUT) ? PIPE_DIR_OUT : PIPE_DIR_IN);
-			}
-
-			/** Returns the pipe address of the currently selected pipe. This is typically used to save the
-			 *  currently selected pipe number so that it can be restored after another pipe has been manipulated.
-			 *
-			 *  \return Index of the currently selected pipe.
-			 */
-			static inline uint8_t Pipe_GetCurrentPipe(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline uint8_t Pipe_GetCurrentPipe(void)
-			{
-				return (USB_Pipe_SelectedPipe | Pipe_GetPipeDirection());
-			}
-
-			/** Selects the given pipe address. Any pipe operations which do not require the pipe address to be
-			 *  indicated will operate on the currently selected pipe.
-			 *
-			 *  \param[in] Address  Address of the pipe to select.
-			 */
-			static inline void Pipe_SelectPipe(const uint8_t Address) ATTR_ALWAYS_INLINE;
-			static inline void Pipe_SelectPipe(const uint8_t Address)
-			{
-				USB_Pipe_SelectedPipe = (Address & PIPE_EPNUM_MASK);
-			}
-
-			/** Resets the desired pipe, including the pipe banks and flags.
-			 *
-			 *  \param[in] Address  Index of the pipe to reset.
-			 */
-			static inline void Pipe_ResetPipe(const uint8_t Address) ATTR_ALWAYS_INLINE;
-			static inline void Pipe_ResetPipe(const uint8_t Address)
-			{
-				uint32_t PipeNumber = (Address & PIPE_EPNUM_MASK);
-
-				AVR32_USBB.uprst |=  (AVR32_USBB_PRST0_MASK << PipeNumber);
-				AVR32_USBB.uprst &= ~(AVR32_USBB_PRST0_MASK << PipeNumber);
-				USB_Pipe_FIFOPos[PipeNumber] = &AVR32_USBB_SLAVE[PipeNumber * PIPE_HSB_ADDRESS_SPACE_SIZE];
-			}
-
-			/** Enables the currently selected pipe so that data can be sent and received through it to and from
-			 *  an attached device.
-			 *
-			 *  \pre The currently selected pipe must first be configured properly via \ref Pipe_ConfigurePipe().
-			 */
-			static inline void Pipe_EnablePipe(void) ATTR_ALWAYS_INLINE;
-			static inline void Pipe_EnablePipe(void)
-			{
-				AVR32_USBB.uprst |=  (AVR32_USBB_PEN0_MASK << USB_Pipe_SelectedPipe);
-			}
-
-			/** Disables the currently selected pipe so that data cannot be sent and received through it to and
-			 *  from an attached device.
-			 */
-			static inline void Pipe_DisablePipe(void) ATTR_ALWAYS_INLINE;
-			static inline void Pipe_DisablePipe(void)
-			{
-				AVR32_USBB.uprst &= ~(AVR32_USBB_PEN0_MASK << USB_Pipe_SelectedPipe);
-			}
-
-			/** Determines if the currently selected pipe is enabled, but not necessarily configured.
-			 *
-			 * \return Boolean \c true if the currently selected pipe is enabled, \c false otherwise.
-			 */
-			static inline bool Pipe_IsEnabled(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline bool Pipe_IsEnabled(void)
-			{
-				return ((AVR32_USBB.uprst & (AVR32_USBB_PEN0_MASK << USB_Pipe_SelectedPipe)) ? true : false);
-			}
-
-			/** Gets the current pipe token, indicating the pipe's data direction and type.
-			 *
-			 *  \return The current pipe token, as a \c PIPE_TOKEN_* mask.
-			 */
-			static inline uint8_t Pipe_GetPipeToken(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline uint8_t Pipe_GetPipeToken(void)
-			{
-				return (&AVR32_USBB.UPCFG0)[USB_Pipe_SelectedPipe].ptoken;
-			}
-
-			/** Sets the token for the currently selected pipe to one of the tokens specified by the \c PIPE_TOKEN_*
-			 *  masks. This can be used on CONTROL type pipes, to allow for bidirectional transfer of data during
-			 *  control requests, or on regular pipes to allow for half-duplex bidirectional data transfer to devices
-			 *  which have two endpoints of opposite direction sharing the same endpoint address within the device.
-			 *
-			 *  \param[in] Token  New pipe token to set the selected pipe to, as a \c PIPE_TOKEN_* mask.
-			 */
-			static inline void Pipe_SetPipeToken(const uint8_t Token) ATTR_ALWAYS_INLINE;
-			static inline void Pipe_SetPipeToken(const uint8_t Token)
-			{
-				(&AVR32_USBB.UPCFG0)[USB_Pipe_SelectedPipe].ptoken = Token;
-			}
-
-			/** Configures the currently selected pipe to allow for an unlimited number of IN requests. */
-			static inline void Pipe_SetInfiniteINRequests(void) ATTR_ALWAYS_INLINE;
-			static inline void Pipe_SetInfiniteINRequests(void)
-			{
-				(&AVR32_USBB.UPINRQ0)[USB_Pipe_SelectedPipe].inmode = true;
-			}
-
-			/** Configures the currently selected pipe to only allow the specified number of IN requests to be
-			 *  accepted by the pipe before it is automatically frozen.
-			 *
-			 *  \param[in] TotalINRequests  Total number of IN requests that the pipe may receive before freezing.
-			 */
-			static inline void Pipe_SetFiniteINRequests(const uint8_t TotalINRequests) ATTR_ALWAYS_INLINE;
-			static inline void Pipe_SetFiniteINRequests(const uint8_t TotalINRequests)
-			{
-				(&AVR32_USBB.UPINRQ0)[USB_Pipe_SelectedPipe].inmode = false;
-				(&AVR32_USBB.UPINRQ0)[USB_Pipe_SelectedPipe].inrq   = TotalINRequests;
-			}
-
-			/** Determines if the currently selected pipe is configured.
-			 *
-			 *  \return Boolean \c true if the selected pipe is configured, \c false otherwise.
-			 */
-			static inline bool Pipe_IsConfigured(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline bool Pipe_IsConfigured(void)
-			{
-				return (&AVR32_USBB.UPSTA0)[USB_Pipe_SelectedPipe].cfgok;
-			}
-
-			/** Retrieves the endpoint address of the endpoint within the attached device that the currently selected
-			 *  pipe is bound to.
-			 *
-			 *  \return Endpoint address the currently selected pipe is bound to.
-			 */
-			static inline uint8_t Pipe_GetBoundEndpointAddress(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline uint8_t Pipe_GetBoundEndpointAddress(void)
-			{
-				return ((&AVR32_USBB.UPCFG0)[USB_Pipe_SelectedPipe].pepnum |
-				        ((Pipe_GetPipeToken() == PIPE_TOKEN_IN) ? PIPE_DIR_IN : PIPE_DIR_OUT));
-			}
-
-			/** Sets the period between interrupts for an INTERRUPT type pipe to a specified number of milliseconds.
-			 *
-			 *  \param[in] Milliseconds  Number of milliseconds between each pipe poll.
-			 */
-			static inline void Pipe_SetInterruptPeriod(const uint8_t Milliseconds) ATTR_ALWAYS_INLINE;
-			static inline void Pipe_SetInterruptPeriod(const uint8_t Milliseconds)
-			{
-				(&AVR32_USBB.UPCFG0)[USB_Pipe_SelectedPipe].intfrq = Milliseconds;
-			}
-
-			/** Returns a mask indicating which pipe's interrupt periods have elapsed, indicating that the pipe should
-			 *  be serviced.
-			 *
-			 *  \return Mask whose bits indicate which pipes have interrupted.
-			 */
-			static inline uint8_t Pipe_GetPipeInterrupts(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline uint8_t Pipe_GetPipeInterrupts(void)
-			{
-				return ((AVR32_USBB.uhint & (AVR32_USBB_P6INT_MASK | AVR32_USBB_P5INT_MASK |
-				                             AVR32_USBB_P4INT_MASK | AVR32_USBB_P3INT_MASK |
-				                             AVR32_USBB_P2INT_MASK | AVR32_USBB_P1INT_MASK |
-				                             AVR32_USBB_P0INT_MASK)) >> AVR32_USBB_P0INT_OFFSET);
-			}
-
-			/** Determines if the specified pipe address has interrupted (valid only for INTERRUPT type
-			 *  pipes).
-			 *
-			 *  \param[in] Address  Address of the pipe whose interrupt flag should be tested.
-			 *
-			 *  \return Boolean \c true if the specified pipe has interrupted, \c false otherwise.
-			 */
-			static inline bool Pipe_HasPipeInterrupted(const uint8_t Address) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline bool Pipe_HasPipeInterrupted(const uint8_t Address)
-			{
-				return ((AVR32_USBB.uhint & (AVR32_USBB_P0INTES_MASK << (Address & PIPE_EPNUM_MASK))) ? true : false);
-			}
-
-			/** Unfreezes the selected pipe, allowing it to communicate with an attached device. */
-			static inline void Pipe_Unfreeze(void) ATTR_ALWAYS_INLINE;
-			static inline void Pipe_Unfreeze(void)
-			{
-				(&AVR32_USBB.UPCON0CLR)[USB_Pipe_SelectedPipe].pfreezec = true;
-			}
-
-			/** Freezes the selected pipe, preventing it from communicating with an attached device. */
-			static inline void Pipe_Freeze(void) ATTR_ALWAYS_INLINE;
-			static inline void Pipe_Freeze(void)
-			{
-				(&AVR32_USBB.UPCON0SET)[USB_Pipe_SelectedPipe].pfreezes = true;
-			}
-
-			/** Determines if the currently selected pipe is frozen, and not able to accept data.
-			 *
-			 *  \return Boolean \c true if the currently selected pipe is frozen, \c false otherwise.
-			 */
-			static inline bool Pipe_IsFrozen(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline bool Pipe_IsFrozen(void)
-			{
-				return (((&AVR32_USBB.UPCON0)[USB_Pipe_SelectedPipe].pfreeze) ? true : false);
-			}
-
-			/** Clears the error flags for the currently selected pipe. */
-			static inline void Pipe_ClearError(void) ATTR_ALWAYS_INLINE;
-			static inline void Pipe_ClearError(void)
-			{
-				(&AVR32_USBB.uperr0)[USB_Pipe_SelectedPipe] = 0;
-				(&AVR32_USBB.UPSTA0CLR)[USB_Pipe_SelectedPipe].overfic  = true;
-			}
-
-			/** Determines if the master pipe error flag is set for the currently selected pipe, indicating that
-			 *  some sort of hardware error has occurred on the pipe.
-			 *
-			 *  \see \ref Pipe_GetErrorFlags() macro for information on retrieving the exact error flag.
-			 *
-			 *  \return Boolean \c true if an error has occurred on the selected pipe, \c false otherwise.
-			 */
-			static inline bool Pipe_IsError(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline bool Pipe_IsError(void)
-			{
-				return (((&AVR32_USBB.upsta0)[USB_Pipe_SelectedPipe] &
-				        (AVR32_USBB_PERRI_MASK | AVR32_USBB_OVERFI_MASK)) ? true : false);
-			}
-
-			/** Gets a mask of the hardware error flags which have occurred on the currently selected pipe. This
-			 *  value can then be masked against the \c PIPE_ERRORFLAG_* masks to determine what error has occurred.
-			 *
-			 *  \return  Mask comprising of \c PIPE_ERRORFLAG_* bits indicating what error has occurred on the selected pipe.
-			 */
-			static inline uint8_t Pipe_GetErrorFlags(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline uint8_t Pipe_GetErrorFlags(void)
-			{
-
-				return (((&AVR32_USBB.uperr0)[USB_Pipe_SelectedPipe] &
-				        (PIPE_ERRORFLAG_CRC16 | PIPE_ERRORFLAG_TIMEOUT |
-				         PIPE_ERRORFLAG_PID   | PIPE_ERRORFLAG_DATAPID |
-				         PIPE_ERRORFLAG_DATATGL)) |
-				        (((&AVR32_USBB.upsta0)[USB_Pipe_SelectedPipe] << 8) &
-						 PIPE_ERRORFLAG_OVERFLOW));
-			}
-
-			/** Retrieves the number of busy banks in the currently selected pipe, which have been queued for
-			 *  transmission via the \ref Pipe_ClearOUT() command, or are awaiting acknowledgement via the
-			 *  \ref Pipe_ClearIN() command.
-			 *
-			 *  \ingroup Group_PipePacketManagement_UC3
-			 *
-			 *  \return Total number of busy banks in the selected pipe.
-			 */
-			static inline uint8_t Pipe_GetBusyBanks(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline uint8_t Pipe_GetBusyBanks(void)
-			{
-				return (&AVR32_USBB.UPSTA0)[USB_Pipe_SelectedPipe].nbusybk;
-			}
-
-			/** Determines if the currently selected pipe may be read from (if data is waiting in the pipe
-			 *  bank and the pipe is an IN direction, or if the bank is not yet full if the pipe is an OUT
-			 *  direction). This function will return false if an error has occurred in the pipe, or if the pipe
-			 *  is an IN direction and no packet (or an empty packet) has been received, or if the pipe is an OUT
-			 *  direction and the pipe bank is full.
-			 *
-			 *  \note This function is not valid on CONTROL type pipes.
-			 *
-			 *  \ingroup Group_PipePacketManagement_UC3
-			 *
-			 *  \return Boolean \c true if the currently selected pipe may be read from or written to, depending
-			 *          on its direction.
-			 */
-			static inline bool Pipe_IsReadWriteAllowed(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline bool Pipe_IsReadWriteAllowed(void)
-			{
-				return (&AVR32_USBB.UPSTA0)[USB_Pipe_SelectedPipe].rwall;
-			}
-
-			/** Determines if a packet has been received on the currently selected IN pipe from the attached device.
-			 *
-			 *  \ingroup Group_PipePacketManagement_UC3
-			 *
-			 *  \return Boolean \c true if the current pipe has received an IN packet, \c false otherwise.
-			 */
-			static inline bool Pipe_IsINReceived(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline bool Pipe_IsINReceived(void)
-			{
-				return (&AVR32_USBB.UPSTA0)[USB_Pipe_SelectedPipe].rxini;
-			}
-
-			/** Determines if the currently selected OUT pipe is ready to send an OUT packet to the attached device.
-			 *
-			 *  \ingroup Group_PipePacketManagement_UC3
-			 *
-			 *  \return Boolean \c true if the current pipe is ready for an OUT packet, \c false otherwise.
-			 */
-			static inline bool Pipe_IsOUTReady(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline bool Pipe_IsOUTReady(void)
-			{
-				return (&AVR32_USBB.UPSTA0)[USB_Pipe_SelectedPipe].txouti;
-			}
-
-			/** Determines if no SETUP request is currently being sent to the attached device on the selected
-			 *  CONTROL type pipe.
-			 *
-			 *  \ingroup Group_PipePacketManagement_UC3
-			 *
-			 *  \return Boolean \c true if the current pipe is ready for a SETUP packet, \c false otherwise.
-			 */
-			static inline bool Pipe_IsSETUPSent(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline bool Pipe_IsSETUPSent(void)
-			{
-				return (&AVR32_USBB.UPSTA0)[USB_Pipe_SelectedPipe].txstpi;
-			}
-
-			/** Sends the currently selected CONTROL type pipe's contents to the device as a SETUP packet.
-			 *
-			 *  \ingroup Group_PipePacketManagement_UC3
-			 */
-			static inline void Pipe_ClearSETUP(void) ATTR_ALWAYS_INLINE;
-			static inline void Pipe_ClearSETUP(void)
-			{
-				(&AVR32_USBB.UPSTA0CLR)[USB_Pipe_SelectedPipe].txstpic = true;
-				(&AVR32_USBB.UPCON0CLR)[USB_Pipe_SelectedPipe].fifoconc = true;
-				USB_Pipe_FIFOPos[USB_Pipe_SelectedPipe] = &AVR32_USBB_SLAVE[USB_Pipe_SelectedPipe * PIPE_HSB_ADDRESS_SPACE_SIZE];
-			}
-
-			/** Acknowledges the reception of a setup IN request from the attached device on the currently selected
-			 *  pipe, freeing the bank ready for the next packet.
-			 *
-			 *  \ingroup Group_PipePacketManagement_UC3
-			 */
-			static inline void Pipe_ClearIN(void) ATTR_ALWAYS_INLINE;
-			static inline void Pipe_ClearIN(void)
-			{
-				(&AVR32_USBB.UPSTA0CLR)[USB_Pipe_SelectedPipe].rxinic   = true;
-				(&AVR32_USBB.UPCON0CLR)[USB_Pipe_SelectedPipe].fifoconc = true;
-				USB_Pipe_FIFOPos[USB_Pipe_SelectedPipe] = &AVR32_USBB_SLAVE[USB_Pipe_SelectedPipe * PIPE_HSB_ADDRESS_SPACE_SIZE];
-			}
-
-			/** Sends the currently selected pipe's contents to the device as an OUT packet on the selected pipe, freeing
-			 *  the bank ready for the next packet.
-			 *
-			 *  \ingroup Group_PipePacketManagement_UC3
-			 */
-			static inline void Pipe_ClearOUT(void) ATTR_ALWAYS_INLINE;
-			static inline void Pipe_ClearOUT(void)
-			{
-				(&AVR32_USBB.UPSTA0CLR)[USB_Pipe_SelectedPipe].txoutic  = true;
-				(&AVR32_USBB.UPCON0CLR)[USB_Pipe_SelectedPipe].fifoconc = true;
-				USB_Pipe_FIFOPos[USB_Pipe_SelectedPipe] = &AVR32_USBB_SLAVE[USB_Pipe_SelectedPipe * PIPE_HSB_ADDRESS_SPACE_SIZE];
-			}
-
-			/** Determines if the device sent a NAK (Negative Acknowledge) in response to the last sent packet on
-			 *  the currently selected pipe. This occurs when the host sends a packet to the device, but the device
-			 *  is not currently ready to handle the packet (i.e. its endpoint banks are full). Once a NAK has been
-			 *  received, it must be cleared using \ref Pipe_ClearNAKReceived() before the previous (or any other) packet
-			 *  can be re-sent.
-			 *
-			 *  \ingroup Group_PipePacketManagement_UC3
-			 *
-			 *  \return Boolean \c true if an NAK has been received on the current pipe, \c false otherwise.
-			 */
-			static inline bool Pipe_IsNAKReceived(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline bool Pipe_IsNAKReceived(void)
-			{
-				return (&AVR32_USBB.UPSTA0)[USB_Pipe_SelectedPipe].nakedi;
-			}
-
-			/** Clears the NAK condition on the currently selected pipe.
-			 *
-			 *  \ingroup Group_PipePacketManagement_UC3
-			 *
-			 *  \see \ref Pipe_IsNAKReceived() for more details.
-			 */
-			static inline void Pipe_ClearNAKReceived(void) ATTR_ALWAYS_INLINE;
-			static inline void Pipe_ClearNAKReceived(void)
-			{
-				(&AVR32_USBB.UPSTA0CLR)[USB_Pipe_SelectedPipe].nakedic = true;
-			}
-
-			/** Determines if the currently selected pipe has had the STALL condition set by the attached device.
-			 *
-			 *  \ingroup Group_PipePacketManagement_UC3
-			 *
-			 *  \return Boolean \c true if the current pipe has been stalled by the attached device, \c false otherwise.
-			 */
-			static inline bool Pipe_IsStalled(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline bool Pipe_IsStalled(void)
-			{
-				return (&AVR32_USBB.UPSTA0)[USB_Pipe_SelectedPipe].rxstalldi;
-			}
-
-			/** Clears the STALL condition detection flag on the currently selected pipe, but does not clear the
-			 *  STALL condition itself (this must be done via a ClearFeature control request to the device).
-			 *
-			 *  \ingroup Group_PipePacketManagement_UC3
-			 */
-			static inline void Pipe_ClearStall(void) ATTR_ALWAYS_INLINE;
-			static inline void Pipe_ClearStall(void)
-			{
-				(&AVR32_USBB.UPSTA0CLR)[USB_Pipe_SelectedPipe].rxstalldic = true;
-				USB_Pipe_FIFOPos[USB_Pipe_SelectedPipe] = &AVR32_USBB_SLAVE[USB_Pipe_SelectedPipe * PIPE_HSB_ADDRESS_SPACE_SIZE];
-			}
-
-			/** Reads one byte from the currently selected pipe's bank, for OUT direction pipes.
-			 *
-			 *  \ingroup Group_PipePrimitiveRW_UC3
-			 *
-			 *  \return Next byte in the currently selected pipe's FIFO buffer.
-			 */
-			static inline uint8_t Pipe_Read_8(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline uint8_t Pipe_Read_8(void)
-			{
-				return *(USB_Pipe_FIFOPos[USB_Pipe_SelectedPipe]++);
-			}
-
-			/** Writes one byte to the currently selected pipe's bank, for IN direction pipes.
-			 *
-			 *  \ingroup Group_PipePrimitiveRW_UC3
-			 *
-			 *  \param[in] Data  Data to write into the the currently selected pipe's FIFO buffer.
-			 */
-			static inline void Pipe_Write_8(const uint8_t Data) ATTR_ALWAYS_INLINE;
-			static inline void Pipe_Write_8(const uint8_t Data)
-			{
-				*(USB_Pipe_FIFOPos[USB_Pipe_SelectedPipe]++) = Data;
-			}
-
-			/** Discards one byte from the currently selected pipe's bank, for OUT direction pipes.
-			 *
-			 *  \ingroup Group_PipePrimitiveRW_UC3
-			 */
-			static inline void Pipe_Discard_8(void) ATTR_ALWAYS_INLINE;
-			static inline void Pipe_Discard_8(void)
-			{
-				uint8_t Dummy;
-
-				Dummy = *(USB_Pipe_FIFOPos[USB_Pipe_SelectedPipe]++);
-
-				(void)Dummy;
-			}
-
-			/** Reads two bytes from the currently selected pipe's bank in little endian format, for OUT
-			 *  direction pipes.
-			 *
-			 *  \ingroup Group_PipePrimitiveRW_UC3
-			 *
-			 *  \return Next two bytes in the currently selected pipe's FIFO buffer.
-			 */
-			static inline uint16_t Pipe_Read_16_LE(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline uint16_t Pipe_Read_16_LE(void)
-			{
-				uint16_t Byte0 = *(USB_Pipe_FIFOPos[USB_Pipe_SelectedPipe]++);
-				uint16_t Byte1 = *(USB_Pipe_FIFOPos[USB_Pipe_SelectedPipe]++);
-
-				return ((Byte1 << 8) | Byte0);
-			}
-
-			/** Reads two bytes from the currently selected pipe's bank in big endian format, for OUT
-			 *  direction pipes.
-			 *
-			 *  \ingroup Group_PipePrimitiveRW_UC3
-			 *
-			 *  \return Next two bytes in the currently selected pipe's FIFO buffer.
-			 */
-			static inline uint16_t Pipe_Read_16_BE(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline uint16_t Pipe_Read_16_BE(void)
-			{
-				uint16_t Byte0 = *(USB_Pipe_FIFOPos[USB_Pipe_SelectedPipe]++);
-				uint16_t Byte1 = *(USB_Pipe_FIFOPos[USB_Pipe_SelectedPipe]++);
-
-				return ((Byte0 << 8) | Byte1);
-			}
-
-			/** Writes two bytes to the currently selected pipe's bank in little endian format, for IN
-			 *  direction pipes.
-			 *
-			 *  \ingroup Group_PipePrimitiveRW_UC3
-			 *
-			 *  \param[in] Data  Data to write to the currently selected pipe's FIFO buffer.
-			 */
-			static inline void Pipe_Write_16_LE(const uint16_t Data) ATTR_ALWAYS_INLINE;
-			static inline void Pipe_Write_16_LE(const uint16_t Data)
-			{
-				*(USB_Pipe_FIFOPos[USB_Pipe_SelectedPipe]++) = (Data & 0xFF);
-				*(USB_Pipe_FIFOPos[USB_Pipe_SelectedPipe]++) = (Data >> 8);
-			}
-
-			/** Writes two bytes to the currently selected pipe's bank in big endian format, for IN
-			 *  direction pipes.
-			 *
-			 *  \ingroup Group_PipePrimitiveRW_UC3
-			 *
-			 *  \param[in] Data  Data to write to the currently selected pipe's FIFO buffer.
-			 */
-			static inline void Pipe_Write_16_BE(const uint16_t Data) ATTR_ALWAYS_INLINE;
-			static inline void Pipe_Write_16_BE(const uint16_t Data)
-			{
-				*(USB_Pipe_FIFOPos[USB_Pipe_SelectedPipe]++) = (Data >> 8);
-				*(USB_Pipe_FIFOPos[USB_Pipe_SelectedPipe]++) = (Data & 0xFF);
-			}
-
-			/** Discards two bytes from the currently selected pipe's bank, for OUT direction pipes.
-			 *
-			 *  \ingroup Group_PipePrimitiveRW_UC3
-			 */
-			static inline void Pipe_Discard_16(void) ATTR_ALWAYS_INLINE;
-			static inline void Pipe_Discard_16(void)
-			{
-				uint8_t Dummy;
-
-				Dummy = *(USB_Pipe_FIFOPos[USB_Pipe_SelectedPipe]++);
-				Dummy = *(USB_Pipe_FIFOPos[USB_Pipe_SelectedPipe]++);
-
-				(void)Dummy;
-			}
-
-			/** Reads four bytes from the currently selected pipe's bank in little endian format, for OUT
-			 *  direction pipes.
-			 *
-			 *  \ingroup Group_PipePrimitiveRW_UC3
-			 *
-			 *  \return Next four bytes in the currently selected pipe's FIFO buffer.
-			 */
-			static inline uint32_t Pipe_Read_32_LE(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline uint32_t Pipe_Read_32_LE(void)
-			{
-				uint32_t Byte0 = *(USB_Pipe_FIFOPos[USB_Pipe_SelectedPipe]++);
-				uint32_t Byte1 = *(USB_Pipe_FIFOPos[USB_Pipe_SelectedPipe]++);
-				uint32_t Byte2 = *(USB_Pipe_FIFOPos[USB_Pipe_SelectedPipe]++);
-				uint32_t Byte3 = *(USB_Pipe_FIFOPos[USB_Pipe_SelectedPipe]++);
-
-				return ((Byte3 << 24) | (Byte2 << 16) | (Byte1 << 8) | Byte0);
-			}
-
-			/** Reads four bytes from the currently selected pipe's bank in big endian format, for OUT
-			 *  direction pipes.
-			 *
-			 *  \ingroup Group_PipePrimitiveRW_UC3
-			 *
-			 *  \return Next four bytes in the currently selected pipe's FIFO buffer.
-			 */
-			static inline uint32_t Pipe_Read_32_BE(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline uint32_t Pipe_Read_32_BE(void)
-			{
-				uint32_t Byte0 = *(USB_Pipe_FIFOPos[USB_Pipe_SelectedPipe]++);
-				uint32_t Byte1 = *(USB_Pipe_FIFOPos[USB_Pipe_SelectedPipe]++);
-				uint32_t Byte2 = *(USB_Pipe_FIFOPos[USB_Pipe_SelectedPipe]++);
-				uint32_t Byte3 = *(USB_Pipe_FIFOPos[USB_Pipe_SelectedPipe]++);
-
-				return ((Byte0 << 24) | (Byte1 << 16) | (Byte2 << 8) | Byte3);
-			}
-
-			/** Writes four bytes to the currently selected pipe's bank in little endian format, for IN
-			 *  direction pipes.
-			 *
-			 *  \ingroup Group_PipePrimitiveRW_UC3
-			 *
-			 *  \param[in] Data  Data to write to the currently selected pipe's FIFO buffer.
-			 */
-			static inline void Pipe_Write_32_LE(const uint32_t Data) ATTR_ALWAYS_INLINE;
-			static inline void Pipe_Write_32_LE(const uint32_t Data)
-			{
-				*(USB_Pipe_FIFOPos[USB_Pipe_SelectedPipe]++) = (Data &  0xFF);
-				*(USB_Pipe_FIFOPos[USB_Pipe_SelectedPipe]++) = (Data >> 8);
-				*(USB_Pipe_FIFOPos[USB_Pipe_SelectedPipe]++) = (Data >> 16);
-				*(USB_Pipe_FIFOPos[USB_Pipe_SelectedPipe]++) = (Data >> 24);
-			}
-
-			/** Writes four bytes to the currently selected pipe's bank in big endian format, for IN
-			 *  direction pipes.
-			 *
-			 *  \ingroup Group_PipePrimitiveRW_UC3
-			 *
-			 *  \param[in] Data  Data to write to the currently selected pipe's FIFO buffer.
-			 */
-			static inline void Pipe_Write_32_BE(const uint32_t Data) ATTR_ALWAYS_INLINE;
-			static inline void Pipe_Write_32_BE(const uint32_t Data)
-			{
-				*(USB_Pipe_FIFOPos[USB_Pipe_SelectedPipe]++) = (Data >> 24);
-				*(USB_Pipe_FIFOPos[USB_Pipe_SelectedPipe]++) = (Data >> 16);
-				*(USB_Pipe_FIFOPos[USB_Pipe_SelectedPipe]++) = (Data >> 8);
-				*(USB_Pipe_FIFOPos[USB_Pipe_SelectedPipe]++) = (Data &  0xFF);
-			}
-
-			/** Discards four bytes from the currently selected pipe's bank, for OUT direction pipes.
-			 *
-			 *  \ingroup Group_PipePrimitiveRW_UC3
-			 */
-			static inline void Pipe_Discard_32(void) ATTR_ALWAYS_INLINE;
-			static inline void Pipe_Discard_32(void)
-			{
-				uint8_t Dummy;
-
-				Dummy = *(USB_Pipe_FIFOPos[USB_Pipe_SelectedPipe]++);
-				Dummy = *(USB_Pipe_FIFOPos[USB_Pipe_SelectedPipe]++);
-				Dummy = *(USB_Pipe_FIFOPos[USB_Pipe_SelectedPipe]++);
-				Dummy = *(USB_Pipe_FIFOPos[USB_Pipe_SelectedPipe]++);
-
-				(void)Dummy;
-			}
-
-		/* External Variables: */
-			/** Global indicating the maximum packet size of the default control pipe located at address
-			 *  0 in the device. This value is set to the value indicated in the attached device's device
-		     *  descriptor once the USB interface is initialized into host mode and a device is attached
-			 *  to the USB bus.
-			 *
-			 *  \attention This variable should be treated as read-only in the user application, and never manually
-			 *             changed in value.
-			 */
-			extern uint8_t USB_Host_ControlPipeSize;
-
-		/* Function Prototypes: */
-			/** Configures a table of pipe descriptions, in sequence. This function can be used to configure multiple
-			 *  pipes at the same time.
-			 *
-			 *  \note Pipe with a zero address will be ignored, thus this function cannot be used to configure the
-			 *        control pipe.
-			 *
-			 *  \param[in] Table    Pointer to a table of pipe descriptions.
-			 *  \param[in] Entries  Number of entries in the pipe table to configure.
-			 *
-			 *  \return Boolean \c true if all pipes configured successfully, \c false otherwise.
-			 */
-			bool Pipe_ConfigurePipeTable(const USB_Pipe_Table_t* const Table,
-			                             const uint8_t Entries);
-
-			/** Configures the specified pipe address with the given pipe type, endpoint address within the attached device,
-			 *  bank size and number of hardware banks.
-			 *
-			 *  A newly configured pipe is frozen by default, and must be unfrozen before use via the \ref Pipe_Unfreeze()
-			 *  before being used. Pipes should be kept frozen unless waiting for data from a device while in IN mode, or
-			 *  sending data to the device in OUT mode. IN type pipes are also automatically configured to accept infinite
-			 *  numbers of IN requests without automatic freezing - this can be overridden by a call to
-			 *  \ref Pipe_SetFiniteINRequests().
-			 *
-			 *  \param[in] Address          Pipe address to configure.
-			 *
-			 *  \param[in] Type             Type of pipe to configure, an \c EP_TYPE_* mask. Not all pipe types are available on Low
-			 *                              Speed USB devices - refer to the USB 2.0 specification.
-			 *
-			 *  \param[in] EndpointAddress  Endpoint address within the attached device that the pipe should interface to.
-			 *
-			 *  \param[in] Size             Size of the pipe's bank, where packets are stored before they are transmitted to
-			 *                              the USB device, or after they have been received from the USB device (depending on
-			 *                              the pipe's data direction). The bank size must indicate the maximum packet size that
-			 *                              the pipe can handle.
-			 *
-			 *  \param[in] Banks            Number of banks to use for the pipe being configured.
-			 *
-			 *  \note When the \c ORDERED_EP_CONFIG compile time option is used, Pipes <b>must</b> be configured in ascending order,
-			 *        or bank corruption will occur.
-			 *        \n\n
-			 *
-			 *  \note Certain microcontroller model's pipes may have different maximum packet sizes based on the pipe's
-			 *        index - refer to the chosen microcontroller's datasheet to determine the maximum bank size for each pipe.
-			 *        \n\n
-			 *
-			 *  \note The default control pipe should not be manually configured by the user application, as it is
-			 *        automatically configured by the library internally.
-			 *        \n\n
-			 *
-			 *  \note This routine will automatically select the specified pipe upon success. Upon failure, the pipe which
-			 *        failed to reconfigure correctly will be selected.
-			 *
-			 *  \return Boolean \c true if the configuration succeeded, \c false otherwise.
-			 */
-			bool Pipe_ConfigurePipe(const uint8_t Address,
-			                        const uint8_t Type,
-			                        const uint8_t EndpointAddress,
-			                        const uint16_t Size,
-			                        const uint8_t Banks);
-
-			/** Spin-loops until the currently selected non-control pipe is ready for the next packet of data to be read
-			 *  or written to it, aborting in the case of an error condition (such as a timeout or device disconnect).
-			 *
-			 *  \ingroup Group_PipeRW_UC3
-			 *
-			 *  \return A value from the \ref Pipe_WaitUntilReady_ErrorCodes_t enum.
-			 */
-			uint8_t Pipe_WaitUntilReady(void);
-
-			/** Determines if a pipe has been bound to the given device endpoint address. If a pipe which is bound to the given
-			 *  endpoint is found, it is automatically selected.
-			 *
-			 *  \param[in] EndpointAddress Address and direction mask of the endpoint within the attached device to check.
-			 *
-			 *  \return Boolean \c true if a pipe bound to the given endpoint address of the specified direction is found,
-			 *          \c false otherwise.
-			 */
-			bool Pipe_IsEndpointBound(const uint8_t EndpointAddress) ATTR_WARN_UNUSED_RESULT;
-
-	/* Private Interface - For use in library only: */
-	#if !defined(__DOXYGEN__)
-		/* Macros: */
-			#if !defined(ENDPOINT_CONTROLEP)
-				#define ENDPOINT_CONTROLEP          0
-			#endif
-
-		/* Inline Functions: */
-			static inline uint8_t Pipe_BytesToEPSizeMask(const uint16_t Bytes) ATTR_WARN_UNUSED_RESULT ATTR_CONST ATTR_ALWAYS_INLINE;
-			static inline uint8_t Pipe_BytesToEPSizeMask(const uint16_t Bytes)
-			{
-				uint8_t  MaskVal    = 0;
-				uint16_t CheckBytes = 8;
-
-				while ((CheckBytes < Bytes) && (CheckBytes < PIPE_MAX_SIZE))
-				{
-					MaskVal++;
-					CheckBytes <<= 1;
-				}
-
-				return (MaskVal << AVR32_USBB_PSIZE_OFFSET);
-			}
-
-		/* Function Prototypes: */
-			void Pipe_ClearPipes(void);
-	#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Core/UC3/Template/Template_Endpoint_Control_R.c b/NativePrograms/LUFA/Drivers/USB/Core/UC3/Template/Template_Endpoint_Control_R.c
deleted file mode 100644
index 6cfbaaf03e..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Core/UC3/Template/Template_Endpoint_Control_R.c
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-#if defined(TEMPLATE_FUNC_NAME)
-
-uint8_t TEMPLATE_FUNC_NAME (void* const Buffer,
-                            uint16_t Length)
-{
-	uint8_t* DataStream = ((uint8_t*)Buffer + TEMPLATE_BUFFER_OFFSET(Length));
-
-	if (!(Length))
-	  Endpoint_ClearOUT();
-
-	while (Length)
-	{
-		uint8_t USB_DeviceState_LCL = USB_DeviceState;
-
-		if (USB_DeviceState_LCL == DEVICE_STATE_Unattached)
-		  return ENDPOINT_RWCSTREAM_DeviceDisconnected;
-		else if (USB_DeviceState_LCL == DEVICE_STATE_Suspended)
-		  return ENDPOINT_RWCSTREAM_BusSuspended;
-		else if (Endpoint_IsSETUPReceived())
-		  return ENDPOINT_RWCSTREAM_HostAborted;
-
-		if (Endpoint_IsOUTReceived())
-		{
-			while (Length && Endpoint_BytesInEndpoint())
-			{
-				TEMPLATE_TRANSFER_BYTE(DataStream);
-				TEMPLATE_BUFFER_MOVE(DataStream, 1);
-				Length--;
-			}
-
-			Endpoint_ClearOUT();
-		}
-	}
-
-	while (!(Endpoint_IsINReady()))
-	{
-		uint8_t USB_DeviceState_LCL = USB_DeviceState;
-
-		if (USB_DeviceState_LCL == DEVICE_STATE_Unattached)
-		  return ENDPOINT_RWCSTREAM_DeviceDisconnected;
-		else if (USB_DeviceState_LCL == DEVICE_STATE_Suspended)
-		  return ENDPOINT_RWCSTREAM_BusSuspended;
-	}
-
-	return ENDPOINT_RWCSTREAM_NoError;
-}
-
-#undef TEMPLATE_BUFFER_OFFSET
-#undef TEMPLATE_BUFFER_MOVE
-#undef TEMPLATE_FUNC_NAME
-#undef TEMPLATE_TRANSFER_BYTE
-
-#endif
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Core/UC3/Template/Template_Endpoint_Control_W.c b/NativePrograms/LUFA/Drivers/USB/Core/UC3/Template/Template_Endpoint_Control_W.c
deleted file mode 100644
index 24f374a894..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Core/UC3/Template/Template_Endpoint_Control_W.c
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-#if defined(TEMPLATE_FUNC_NAME)
-
-uint8_t TEMPLATE_FUNC_NAME (const void* const Buffer,
-                            uint16_t Length)
-{
-	uint8_t* DataStream     = ((uint8_t*)Buffer + TEMPLATE_BUFFER_OFFSET(Length));
-	bool     LastPacketFull = false;
-
-	if (Length > USB_ControlRequest.wLength)
-	  Length = USB_ControlRequest.wLength;
-	else if (!(Length))
-	  Endpoint_ClearIN();
-
-	while (Length || LastPacketFull)
-	{
-		uint8_t USB_DeviceState_LCL = USB_DeviceState;
-
-		if (USB_DeviceState_LCL == DEVICE_STATE_Unattached)
-		  return ENDPOINT_RWCSTREAM_DeviceDisconnected;
-		else if (USB_DeviceState_LCL == DEVICE_STATE_Suspended)
-		  return ENDPOINT_RWCSTREAM_BusSuspended;
-		else if (Endpoint_IsSETUPReceived())
-		  return ENDPOINT_RWCSTREAM_HostAborted;
-		else if (Endpoint_IsOUTReceived())
-		  break;
-
-		if (Endpoint_IsINReady())
-		{
-			uint16_t BytesInEndpoint = Endpoint_BytesInEndpoint();
-
-			while (Length && (BytesInEndpoint < USB_Device_ControlEndpointSize))
-			{
-				TEMPLATE_TRANSFER_BYTE(DataStream);
-				TEMPLATE_BUFFER_MOVE(DataStream, 1);
-				Length--;
-				BytesInEndpoint++;
-			}
-
-			LastPacketFull = (BytesInEndpoint == USB_Device_ControlEndpointSize);
-			Endpoint_ClearIN();
-		}
-	}
-
-	while (!(Endpoint_IsOUTReceived()))
-	{
-		uint8_t USB_DeviceState_LCL = USB_DeviceState;
-
-		if (USB_DeviceState_LCL == DEVICE_STATE_Unattached)
-		  return ENDPOINT_RWCSTREAM_DeviceDisconnected;
-		else if (USB_DeviceState_LCL == DEVICE_STATE_Suspended)
-		  return ENDPOINT_RWCSTREAM_BusSuspended;
-		else if (Endpoint_IsSETUPReceived())
-		  return ENDPOINT_RWCSTREAM_HostAborted;
-	}
-
-	return ENDPOINT_RWCSTREAM_NoError;
-}
-
-#undef TEMPLATE_BUFFER_OFFSET
-#undef TEMPLATE_BUFFER_MOVE
-#undef TEMPLATE_FUNC_NAME
-#undef TEMPLATE_TRANSFER_BYTE
-
-#endif
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Core/UC3/Template/Template_Endpoint_RW.c b/NativePrograms/LUFA/Drivers/USB/Core/UC3/Template/Template_Endpoint_RW.c
deleted file mode 100644
index a5dc5e78d4..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Core/UC3/Template/Template_Endpoint_RW.c
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-#if defined(TEMPLATE_FUNC_NAME)
-
-uint8_t TEMPLATE_FUNC_NAME (TEMPLATE_BUFFER_TYPE const Buffer,
-                            uint16_t Length,
-                            uint16_t* const BytesProcessed)
-{
-	uint8_t* DataStream      = ((uint8_t*)Buffer + TEMPLATE_BUFFER_OFFSET(Length));
-	uint16_t BytesInTransfer = 0;
-	uint8_t  ErrorCode;
-
-	if ((ErrorCode = Endpoint_WaitUntilReady()))
-	  return ErrorCode;
-
-	if (BytesProcessed != NULL)
-	{
-		Length -= *BytesProcessed;
-		TEMPLATE_BUFFER_MOVE(DataStream, *BytesProcessed);
-	}
-
-	while (Length)
-	{
-		if (!(Endpoint_IsReadWriteAllowed()))
-		{
-			TEMPLATE_CLEAR_ENDPOINT();
-
-			#if !defined(INTERRUPT_CONTROL_ENDPOINT)
-			USB_USBTask();
-			#endif
-
-			if (BytesProcessed != NULL)
-			{
-				*BytesProcessed += BytesInTransfer;
-				return ENDPOINT_RWSTREAM_IncompleteTransfer;
-			}
-
-			if ((ErrorCode = Endpoint_WaitUntilReady()))
-			  return ErrorCode;
-		}
-		else
-		{
-			TEMPLATE_TRANSFER_BYTE(DataStream);
-			TEMPLATE_BUFFER_MOVE(DataStream, 1);
-			Length--;
-			BytesInTransfer++;
-		}
-	}
-
-	return ENDPOINT_RWSTREAM_NoError;
-}
-
-#undef TEMPLATE_FUNC_NAME
-#undef TEMPLATE_BUFFER_TYPE
-#undef TEMPLATE_TRANSFER_BYTE
-#undef TEMPLATE_CLEAR_ENDPOINT
-#undef TEMPLATE_BUFFER_OFFSET
-#undef TEMPLATE_BUFFER_MOVE
-
-#endif
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Core/UC3/Template/Template_Pipe_RW.c b/NativePrograms/LUFA/Drivers/USB/Core/UC3/Template/Template_Pipe_RW.c
deleted file mode 100644
index 80a7bd0a92..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Core/UC3/Template/Template_Pipe_RW.c
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-#if defined(TEMPLATE_FUNC_NAME)
-
-uint8_t TEMPLATE_FUNC_NAME (TEMPLATE_BUFFER_TYPE const Buffer,
-                            uint16_t Length,
-                            uint16_t* const BytesProcessed)
-{
-	uint8_t* DataStream      = ((uint8_t*)Buffer + TEMPLATE_BUFFER_OFFSET(Length));
-	uint16_t BytesInTransfer = 0;
-	uint8_t  ErrorCode;
-
-	Pipe_SetPipeToken(TEMPLATE_TOKEN);
-
-	if ((ErrorCode = Pipe_WaitUntilReady()))
-	  return ErrorCode;
-
-	if (BytesProcessed != NULL)
-	{
-		Length -= *BytesProcessed;
-		TEMPLATE_BUFFER_MOVE(DataStream, *BytesProcessed);
-	}
-
-	while (Length)
-	{
-		if (!(Pipe_IsReadWriteAllowed()))
-		{
-			TEMPLATE_CLEAR_PIPE();
-
-			if (BytesProcessed != NULL)
-			{
-				*BytesProcessed += BytesInTransfer;
-				return PIPE_RWSTREAM_IncompleteTransfer;
-			}
-
-			if ((ErrorCode = Pipe_WaitUntilReady()))
-			  return ErrorCode;
-		}
-		else
-		{
-			TEMPLATE_TRANSFER_BYTE(DataStream);
-			TEMPLATE_BUFFER_MOVE(DataStream, 1);
-			Length--;
-			BytesInTransfer++;
-		}
-	}
-
-	return PIPE_RWSTREAM_NoError;
-}
-
-#undef TEMPLATE_FUNC_NAME
-#undef TEMPLATE_BUFFER_TYPE
-#undef TEMPLATE_TOKEN
-#undef TEMPLATE_TRANSFER_BYTE
-#undef TEMPLATE_CLEAR_PIPE
-#undef TEMPLATE_BUFFER_OFFSET
-#undef TEMPLATE_BUFFER_MOVE
-
-#endif
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Core/UC3/USBController_UC3.c b/NativePrograms/LUFA/Drivers/USB/Core/UC3/USBController_UC3.c
deleted file mode 100644
index 672b45bb13..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Core/UC3/USBController_UC3.c
+++ /dev/null
@@ -1,222 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-#include "../../../../Common/Common.h"
-#if (ARCH == ARCH_UC3)
-
-#define  __INCLUDE_FROM_USB_DRIVER
-#define  __INCLUDE_FROM_USB_CONTROLLER_C
-#include "../USBController.h"
-
-#if defined(USB_CAN_BE_BOTH)
-volatile uint8_t USB_CurrentMode = USB_MODE_None;
-#endif
-
-#if !defined(USE_STATIC_OPTIONS)
-volatile uint8_t USB_Options;
-#endif
-
-void USB_Init(
-               #if defined(USB_CAN_BE_BOTH)
-               const uint8_t Mode
-               #endif
-
-               #if (defined(USB_CAN_BE_BOTH) && !defined(USE_STATIC_OPTIONS))
-               ,
-               #elif (!defined(USB_CAN_BE_BOTH) && defined(USE_STATIC_OPTIONS))
-               void
-               #endif
-
-               #if !defined(USE_STATIC_OPTIONS)
-               const uint8_t Options
-               #endif
-               )
-{
-	#if !defined(USE_STATIC_OPTIONS)
-	USB_Options = Options;
-	#endif
-
-	#if defined(USB_CAN_BE_BOTH)
-	if (Mode == USB_MODE_UID)
-	{
-		AVR32_USBB.USBCON.uide = true;
-		USB_INT_Enable(USB_INT_IDTI);
-		USB_CurrentMode = USB_GetUSBModeFromUID();
-	}
-	else
-	{
-		AVR32_USBB.USBCON.uide = false;
-		USB_CurrentMode = Mode;
-	}
-	#else
-	AVR32_USBB.USBCON.uide = false;
-	#endif
-
-	USB_IsInitialized = true;
-
-	USB_ResetInterface();
-}
-
-void USB_Disable(void)
-{
-	USB_INT_DisableAllInterrupts();
-	USB_INT_ClearAllInterrupts();
-
-	USB_Detach();
-	USB_Controller_Disable();
-
-	USB_OTGPAD_Off();
-
-	#if defined(USB_CAN_BE_BOTH)
-	USB_CurrentMode = USB_MODE_None;
-	#endif
-
-	AVR32_PM.GCCTRL[3].cen = false;
-
-	USB_IsInitialized = false;
-}
-
-void USB_ResetInterface(void)
-{
-	#if defined(USB_CAN_BE_BOTH)
-	bool UIDModeSelectEnabled = AVR32_USBB.USBCON.uide;
-	#endif
-
-	AVR32_PM.GCCTRL[AVR32_PM_GCLK_USBB].pllsel = !(USB_Options & USB_OPT_GCLK_SRC_OSC);
-	AVR32_PM.GCCTRL[AVR32_PM_GCLK_USBB].oscsel = !(USB_Options & USB_OPT_GCLK_CHANNEL_0);
-	AVR32_PM.GCCTRL[AVR32_PM_GCLK_USBB].diven  = (F_USB != USB_CLOCK_REQUIRED_FREQ);
-	AVR32_PM.GCCTRL[AVR32_PM_GCLK_USBB].div    = (F_USB == USB_CLOCK_REQUIRED_FREQ) ? 0 : (uint32_t)((F_USB / USB_CLOCK_REQUIRED_FREQ / 2) - 1);
-	AVR32_PM.GCCTRL[AVR32_PM_GCLK_USBB].cen    = true;
-
-	USB_INT_DisableAllInterrupts();
-	USB_INT_ClearAllInterrupts();
-
-	USB_Controller_Reset();
-
-	#if defined(USB_CAN_BE_BOTH)
-	if (UIDModeSelectEnabled)
-	  USB_INT_Enable(USB_INT_IDTI);
-	#endif
-
-	USB_CLK_Unfreeze();
-
-	if (USB_CurrentMode == USB_MODE_Device)
-	{
-		#if defined(USB_CAN_BE_DEVICE)
-		AVR32_USBB.USBCON.uimod = true;
-
-		USB_Init_Device();
-		#endif
-	}
-	else if (USB_CurrentMode == USB_MODE_Host)
-	{
-		#if defined(INVERTED_VBUS_ENABLE_LINE)
-		AVR32_USBB.USBCON.vbuspo = true;
-		#endif
-
-		#if defined(USB_CAN_BE_HOST)
-		AVR32_USBB.USBCON.uimod = false;
-
-		USB_Init_Host();
-		#endif
-	}
-
-	USB_OTGPAD_On();
-}
-
-#if defined(USB_CAN_BE_DEVICE)
-static void USB_Init_Device(void)
-{
-	USB_DeviceState                 = DEVICE_STATE_Unattached;
-	USB_Device_ConfigurationNumber  = 0;
-
-	#if !defined(NO_DEVICE_REMOTE_WAKEUP)
-	USB_Device_RemoteWakeupEnabled  = false;
-	#endif
-
-	#if !defined(NO_DEVICE_SELF_POWER)
-	USB_Device_CurrentlySelfPowered = false;
-	#endif
-
-	#if !defined(FIXED_CONTROL_ENDPOINT_SIZE)
-	USB_Descriptor_Device_t* DeviceDescriptorPtr;
-
-	if (CALLBACK_USB_GetDescriptor((DTYPE_Device << 8), 0, (void*)&DeviceDescriptorPtr) != NO_DESCRIPTOR)
-	  USB_Device_ControlEndpointSize = DeviceDescriptorPtr->Endpoint0Size;
-	#endif
-
-	if (USB_Options & USB_DEVICE_OPT_LOWSPEED)
-	{
-		USB_Device_SetLowSpeed();
-	}
-	else
-	{
-		#if defined(USB_DEVICE_OPT_HIGHSPEED)
-		if (USB_Options & USB_DEVICE_OPT_HIGHSPEED)
-		  USB_Device_SetHighSpeed();
-		else
-		  USB_Device_SetFullSpeed();
-		#else
-		USB_Device_SetFullSpeed();
-		#endif
-	}
-
-	USB_INT_Enable(USB_INT_VBUSTI);
-
-	Endpoint_ConfigureEndpoint(ENDPOINT_CONTROLEP, EP_TYPE_CONTROL,
-							   USB_Device_ControlEndpointSize, 1);
-
-	USB_INT_Clear(USB_INT_SUSPI);
-	USB_INT_Enable(USB_INT_SUSPI);
-	USB_INT_Enable(USB_INT_EORSTI);
-
-	USB_Attach();
-}
-#endif
-
-#if defined(USB_CAN_BE_HOST)
-static void USB_Init_Host(void)
-{
-	USB_HostState                = HOST_STATE_Unattached;
-	USB_Host_ConfigurationNumber = 0;
-	USB_Host_ControlPipeSize     = PIPE_CONTROLPIPE_DEFAULT_SIZE;
-
-	USB_Host_HostMode_On();
-
-	USB_Host_VBUS_Auto_On();
-
-	USB_INT_Enable(USB_INT_DCONNI);
-	USB_INT_Enable(USB_INT_BCERRI);
-
-	USB_Attach();
-}
-#endif
-
-#endif
diff --git a/NativePrograms/LUFA/Drivers/USB/Core/UC3/USBController_UC3.h b/NativePrograms/LUFA/Drivers/USB/Core/UC3/USBController_UC3.h
deleted file mode 100644
index 88aaaf3edd..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Core/UC3/USBController_UC3.h
+++ /dev/null
@@ -1,353 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief USB Controller definitions for the AVR32 UC3 microcontrollers.
- *  \copydetails Group_USBManagement_UC3
- *
- *  \note This file should not be included directly. It is automatically included as needed by the USB driver
- *        dispatch header located in LUFA/Drivers/USB/USB.h.
- */
-
-/** \ingroup Group_USBManagement
- *  \defgroup Group_USBManagement_UC3 USB Interface Management (UC3)
- *  \brief USB Controller definitions for the AVR32 UC3 microcontrollers.
- *
- *  Functions, macros, variables, enums and types related to the setup and management of the USB interface.
- *
- *  @{
- */
-
-#ifndef __USBCONTROLLER_UC3_H__
-#define __USBCONTROLLER_UC3_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-		#include "../USBMode.h"
-		#include "../Events.h"
-		#include "../USBTask.h"
-		#include "../USBInterrupt.h"
-
-		#if defined(USB_CAN_BE_HOST) || defined(__DOXYGEN__)
-			#include "../Host.h"
-			#include "../OTG.h"
-			#include "../Pipe.h"
-			#include "../HostStandardReq.h"
-			#include "../PipeStream.h"
-		#endif
-
-		#if defined(USB_CAN_BE_DEVICE) || defined(__DOXYGEN__)
-			#include "../Device.h"
-			#include "../Endpoint.h"
-			#include "../DeviceStandardReq.h"
-			#include "../EndpointStream.h"
-		#endif
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks and Defines: */
-		#if !defined(__INCLUDE_FROM_USB_DRIVER)
-			#error Do not include this file directly. Include LUFA/Drivers/USB/USB.h instead.
-		#endif
-
-		#if !defined(F_USB)
-			#error F_USB is not defined. You must define F_USB to the frequency of the clock input to the USB module.
-		#endif
-
-		#if (defined(USB_SERIES_UC3A3_AVR) || defined(USB_SERIES_UC3A4_AVR))
-			#if ((F_USB < 12000000) || (F_USB % 12000000))
-				#error Invalid F_USB specified. F_USB must be a multiple of 12MHz for UC3A3 and UC3A4 devices.
-			#endif
-		#else
-			#if ((F_USB < 48000000) || (F_USB % 48000000))
-				#error Invalid F_USB specified. F_USB must be a multiple of 48MHz for UC3A and UC3B devices.
-			#endif
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** \name USB Controller Option Masks */
-			/**@{*/
-			/** Selects one of the system's main clock oscillators as the input clock to the USB Generic Clock source
-			 *  generation module. This indicates that an external oscillator should be used directly instead of an
-			 *  internal PLL clock source.
-			 */
-			#define USB_OPT_GCLK_SRC_OSC               (1 << 2)
-
-			/** Selects one of the system's PLL oscillators as the input clock to the USB Generic Clock source
-			 *  generation module. This indicates that one of the device's PLL outputs should be used instead of an
-			 *  external oscillator source.
-			 */
-			#define USB_OPT_GCLK_SRC_PLL               (0 << 2)
-
-			/** Selects PLL or External Oscillator 0 as the USB Generic Clock source module input clock. */
-			#define USB_OPT_GCLK_CHANNEL_0             (1 << 3)
-
-			/** Selects PLL or External Oscillator 1 as the USB Generic Clock source module input clock. */
-			#define USB_OPT_GCLK_CHANNEL_1             (0 << 3)
-			/**@}*/
-
-			#if !defined(USB_STREAM_TIMEOUT_MS) || defined(__DOXYGEN__)
-				/** Constant for the maximum software timeout period of the USB data stream transfer functions
-				 *  (both control and standard) when in either device or host mode. If the next packet of a stream
-				 *  is not received or acknowledged within this time period, the stream function will fail.
-				 *
-				 *  This value may be overridden in the user project makefile as the value of the
-				 *  \ref USB_STREAM_TIMEOUT_MS token, and passed to the compiler using the -D switch.
-				 */
-				#define USB_STREAM_TIMEOUT_MS       100
-			#endif
-
-		/* Inline Functions: */
-			/** Determines if the VBUS line is currently high (i.e. the USB host is supplying power).
-			 *
-			 *  \return Boolean \c true if the VBUS line is currently detecting power from a host, \c false otherwise.
-			 */
-			static inline bool USB_VBUS_GetStatus(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline bool USB_VBUS_GetStatus(void)
-			{
-				return AVR32_USBB.USBSTA.vbus;
-			}
-
-			/** Detaches the device from the USB bus. This has the effect of removing the device from any
-			 *  attached host, ceasing USB communications. If no host is present, this prevents any host from
-			 *  enumerating the device once attached until \ref USB_Attach() is called.
-			 */
-			static inline void USB_Detach(void) ATTR_ALWAYS_INLINE;
-			static inline void USB_Detach(void)
-			{
-				AVR32_USBB.UDCON.detach = true;
-			}
-
-			/** Attaches the device to the USB bus. This announces the device's presence to any attached
-			 *  USB host, starting the enumeration process. If no host is present, attaching the device
-			 *  will allow for enumeration once a host is connected to the device.
-			 *
-			 *  This is inexplicably also required for proper operation while in host mode, to enable the
-			 *  attachment of a device to the host. This is despite the bit being located in the device-mode
-			 *  register and despite the datasheet making no mention of its requirement in host mode.
-			 */
-			static inline void USB_Attach(void) ATTR_ALWAYS_INLINE;
-			static inline void USB_Attach(void)
-			{
-				AVR32_USBB.UDCON.detach = false;
-			}
-
-		/* Function Prototypes: */
-			/** Main function to initialize and start the USB interface. Once active, the USB interface will
-			 *  allow for device connection to a host when in device mode, or for device enumeration while in
-			 *  host mode.
-			 *
-			 *  As the USB library relies on interrupts for the device and host mode enumeration processes,
-			 *  the user must enable global interrupts before or shortly after this function is called. In
-			 *  device mode, interrupts must be enabled within 500ms of this function being called to ensure
-			 *  that the host does not time out whilst enumerating the device. In host mode, interrupts may be
-			 *  enabled at the application's leisure however enumeration will not begin of an attached device
-			 *  until after this has occurred.
-			 *
-			 *  Calling this function when the USB interface is already initialized will cause a complete USB
-			 *  interface reset and re-enumeration.
-			 *
-			 *  \param[in] Mode     Mask indicating what mode the USB interface is to be initialized to, a value
-			 *                      from the \ref USB_Modes_t enum.
-			 *                      \note This parameter does not exist on devices with only one supported USB
-			 *                            mode (device or host).
-			 *
-			 *  \param[in] Options  Mask indicating the options which should be used when initializing the USB
-			 *                      interface to control the USB interface's behavior. This should be comprised of
-			 *                      a \c USB_OPT_REG_* mask to control the regulator, a \c USB_OPT_*_PLL mask to control the
-			 *                      PLL, and a \c USB_DEVICE_OPT_* mask (when the device mode is enabled) to set the device
-			 *                      mode speed.
-			 *
-			 *  \note To reduce the FLASH requirements of the library if only device or host mode is required,
-			 *        the mode can be statically set in the project makefile by defining the token \c USB_DEVICE_ONLY
-			 *        (for device mode) or \c USB_HOST_ONLY (for host mode), passing the token to the compiler
-			 *        via the -D switch. If the mode is statically set, this parameter does not exist in the
-			 *        function prototype.
-			 *        \n\n
-			 *
-			 *  \note To reduce the FLASH requirements of the library if only fixed settings are required,
-			 *        the options may be set statically in the same manner as the mode (see the Mode parameter of
-			 *        this function). To statically set the USB options, pass in the \c USE_STATIC_OPTIONS token,
-			 *        defined to the appropriate options masks. When the options are statically set, this
-			 *        parameter does not exist in the function prototype.
-			 *
-			 *  \see \ref Group_Device for the \c USB_DEVICE_OPT_* masks.
-			 */
-			void USB_Init(
-			               #if defined(USB_CAN_BE_BOTH) || defined(__DOXYGEN__)
-			               const uint8_t Mode
-			               #endif
-
-			               #if (defined(USB_CAN_BE_BOTH) && !defined(USE_STATIC_OPTIONS)) || defined(__DOXYGEN__)
-			               ,
-			               #elif (!defined(USB_CAN_BE_BOTH) && defined(USE_STATIC_OPTIONS))
-			               void
-			               #endif
-
-			               #if !defined(USE_STATIC_OPTIONS) || defined(__DOXYGEN__)
-			               const uint8_t Options
-			               #endif
-			               );
-
-			/** Shuts down the USB interface. This turns off the USB interface after deallocating all USB FIFO
-			 *  memory, endpoints and pipes. When turned off, no USB functionality can be used until the interface
-			 *  is restarted with the \ref USB_Init() function.
-			 */
-			void USB_Disable(void);
-
-			/** Resets the interface, when already initialized. This will re-enumerate the device if already connected
-			 *  to a host, or re-enumerate an already attached device when in host mode.
-			 */
-			void USB_ResetInterface(void);
-
-		/* Global Variables: */
-			#if defined(USB_CAN_BE_BOTH) || defined(__DOXYGEN__)
-				/** Indicates the mode that the USB interface is currently initialized to, a value from the
-				 *  \ref USB_Modes_t enum.
-				 *
-				 *  \attention This variable should be treated as read-only in the user application, and never manually
-				 *             changed in value.
-				 *
-				 *  \note When the controller is initialized into UID auto-detection mode, this variable will hold the
-				 *        currently selected USB mode (i.e. \ref USB_MODE_Device or \ref USB_MODE_Host). If the controller
-				 *        is fixed into a specific mode (either through the \c USB_DEVICE_ONLY or \c USB_HOST_ONLY compile time
-				 *        options, or a limitation of the USB controller in the chosen device model) this will evaluate to
-				 *        a constant of the appropriate value and will never evaluate to \ref USB_MODE_None even when the
-				 *        USB interface is not initialized.
-				 */
-				extern volatile uint8_t USB_CurrentMode;
-			#elif defined(USB_CAN_BE_HOST)
-				#define USB_CurrentMode USB_MODE_Host
-			#elif defined(USB_CAN_BE_DEVICE)
-				#define USB_CurrentMode USB_MODE_Device
-			#endif
-
-			#if !defined(USE_STATIC_OPTIONS) || defined(__DOXYGEN__)
-				/** Indicates the current USB options that the USB interface was initialized with when \ref USB_Init()
-				 *  was called. This value will be one of the \c USB_MODE_* masks defined elsewhere in this module.
-				 *
-				 *  \attention This variable should be treated as read-only in the user application, and never manually
-				 *             changed in value.
-				 */
-				extern volatile uint8_t USB_Options;
-			#elif defined(USE_STATIC_OPTIONS)
-				#define USB_Options USE_STATIC_OPTIONS
-			#endif
-
-	/* Private Interface - For use in library only: */
-	#if !defined(__DOXYGEN__)
-		/* Macros: */
-			#if defined(USB_SERIES_UC3A3_AVR32) || defined(USB_SERIES_UC3A4_AVR32)
-				#define USB_CLOCK_REQUIRED_FREQ  12000000UL
-			#else
-				#define USB_CLOCK_REQUIRED_FREQ  48000000UL
-			#endif
-
-		/* Function Prototypes: */
-			#if defined(__INCLUDE_FROM_USB_CONTROLLER_C)
-				#if defined(USB_CAN_BE_DEVICE)
-				static void USB_Init_Device(void);
-				#endif
-
-				#if defined(USB_CAN_BE_HOST)
-				static void USB_Init_Host(void);
-				#endif
-			#endif
-
-		/* Inline Functions: */
-			static inline void USB_OTGPAD_On(void) ATTR_ALWAYS_INLINE;
-			static inline void USB_OTGPAD_On(void)
-			{
-				AVR32_USBB.USBCON.otgpade = true;
-			}
-
-			static inline void USB_OTGPAD_Off(void) ATTR_ALWAYS_INLINE;
-			static inline void USB_OTGPAD_Off(void)
-			{
-				AVR32_USBB.USBCON.otgpade = false;
-			}
-
-			static inline void USB_CLK_Freeze(void) ATTR_ALWAYS_INLINE;
-			static inline void USB_CLK_Freeze(void)
-			{
-				AVR32_USBB.USBCON.frzclk = true;
-			}
-
-			static inline void USB_CLK_Unfreeze(void) ATTR_ALWAYS_INLINE;
-			static inline void USB_CLK_Unfreeze(void)
-			{
-				AVR32_USBB.USBCON.frzclk = false;
-			}
-
-			static inline void USB_Controller_Enable(void) ATTR_ALWAYS_INLINE;
-			static inline void USB_Controller_Enable(void)
-			{
-				AVR32_USBB.USBCON.usbe = true;
-			}
-
-			static inline void USB_Controller_Disable(void) ATTR_ALWAYS_INLINE;
-			static inline void USB_Controller_Disable(void)
-			{
-				AVR32_USBB.USBCON.usbe = false;
-			}
-
-			static inline void USB_Controller_Reset(void) ATTR_ALWAYS_INLINE;
-			static inline void USB_Controller_Reset(void)
-			{
-				AVR32_USBB.USBCON.usbe = false;
-				AVR32_USBB.USBCON.usbe = true;
-			}
-
-			#if defined(USB_CAN_BE_BOTH)
-			static inline uint8_t USB_GetUSBModeFromUID(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline uint8_t USB_GetUSBModeFromUID(void)
-			{
-				if (AVR32_USBB.USBSTA.id)
-				  return USB_MODE_Device;
-				else
-				  return USB_MODE_Host;
-			}
-			#endif
-
-	#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Core/UC3/USBInterrupt_UC3.c b/NativePrograms/LUFA/Drivers/USB/Core/UC3/USBInterrupt_UC3.c
deleted file mode 100644
index e7e18fd763..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Core/UC3/USBInterrupt_UC3.c
+++ /dev/null
@@ -1,228 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-#include "../../../../Common/Common.h"
-#if (ARCH == ARCH_UC3)
-
-#define  __INCLUDE_FROM_USB_DRIVER
-#include "../USBInterrupt.h"
-
-void USB_INT_DisableAllInterrupts(void)
-{
-	AVR32_USBB.USBCON.vbuste     = false;
-	AVR32_USBB.USBCON.idte       = false;
-
-	AVR32_USBB.uhinteclr         = -1;
-	AVR32_USBB.udinteclr         = -1;
-}
-
-void USB_INT_ClearAllInterrupts(void)
-{
-	AVR32_USBB.USBSTACLR.vbustic = true;
-	AVR32_USBB.USBSTACLR.idtic   = true;
-
-	AVR32_USBB.uhintclr          = -1;
-	AVR32_USBB.udintclr          = -1;
-}
-
-ISR(USB_GEN_vect)
-{
-	#if defined(USB_CAN_BE_DEVICE)
-	#if !defined(NO_SOF_EVENTS)
-	if (USB_INT_HasOccurred(USB_INT_SOFI) && USB_INT_IsEnabled(USB_INT_SOFI))
-	{
-		USB_INT_Clear(USB_INT_SOFI);
-
-		EVENT_USB_Device_StartOfFrame();
-	}
-	#endif
-
-	if (USB_INT_HasOccurred(USB_INT_VBUSTI) && USB_INT_IsEnabled(USB_INT_VBUSTI))
-	{
-		USB_INT_Clear(USB_INT_VBUSTI);
-
-		if (USB_VBUS_GetStatus())
-		{
-			USB_DeviceState = DEVICE_STATE_Powered;
-			EVENT_USB_Device_Connect();
-		}
-		else
-		{
-			USB_DeviceState = DEVICE_STATE_Unattached;
-			EVENT_USB_Device_Disconnect();
-		}
-	}
-
-	if (USB_INT_HasOccurred(USB_INT_SUSPI) && USB_INT_IsEnabled(USB_INT_SUSPI))
-	{
-		USB_INT_Disable(USB_INT_SUSPI);
-		USB_INT_Enable(USB_INT_WAKEUPI);
-
-		USB_CLK_Freeze();
-
-		USB_DeviceState = DEVICE_STATE_Suspended;
-		EVENT_USB_Device_Suspend();
-	}
-
-	if (USB_INT_HasOccurred(USB_INT_WAKEUPI) && USB_INT_IsEnabled(USB_INT_WAKEUPI))
-	{
-		USB_CLK_Unfreeze();
-
-		USB_INT_Clear(USB_INT_WAKEUPI);
-
-		USB_INT_Disable(USB_INT_WAKEUPI);
-		USB_INT_Enable(USB_INT_SUSPI);
-
-		if (USB_Device_ConfigurationNumber)
-		  USB_DeviceState = DEVICE_STATE_Configured;
-		else
-		  USB_DeviceState = (USB_Device_IsAddressSet()) ? DEVICE_STATE_Addressed : DEVICE_STATE_Powered;
-
-		EVENT_USB_Device_WakeUp();
-	}
-
-	if (USB_INT_HasOccurred(USB_INT_EORSTI) && USB_INT_IsEnabled(USB_INT_EORSTI))
-	{
-		USB_INT_Clear(USB_INT_EORSTI);
-
-		USB_DeviceState                = DEVICE_STATE_Default;
-		USB_Device_ConfigurationNumber = 0;
-
-		USB_INT_Clear(USB_INT_SUSPI);
-		USB_INT_Disable(USB_INT_SUSPI);
-		USB_INT_Enable(USB_INT_WAKEUPI);
-
-		USB_Device_SetDeviceAddress(0);
-		Endpoint_ConfigureEndpoint(ENDPOINT_CONTROLEP, EP_TYPE_CONTROL,
-		                           USB_Device_ControlEndpointSize, 1);
-
-		#if defined(INTERRUPT_CONTROL_ENDPOINT)
-		USB_INT_Enable(USB_INT_RXSTPI);
-		#endif
-
-		EVENT_USB_Device_Reset();
-	}
-	#endif
-
-	#if defined(USB_CAN_BE_HOST)
-	#if !defined(NO_SOF_EVENTS)
-	if (USB_INT_HasOccurred(USB_INT_HSOFI) && USB_INT_IsEnabled(USB_INT_HSOFI))
-	{
-		USB_INT_Clear(USB_INT_HSOFI);
-
-		EVENT_USB_Host_StartOfFrame();
-	}
-	#endif
-
-	if (USB_INT_HasOccurred(USB_INT_DDISCI) && USB_INT_IsEnabled(USB_INT_DDISCI))
-	{
-		USB_INT_Clear(USB_INT_DDISCI);
-		USB_INT_Clear(USB_INT_DCONNI);
-		USB_INT_Disable(USB_INT_DDISCI);
-
-		EVENT_USB_Host_DeviceUnattached();
-
-		USB_ResetInterface();
-	}
-
-	if (USB_INT_HasOccurred(USB_INT_VBERRI) && USB_INT_IsEnabled(USB_INT_VBERRI))
-	{
-		USB_INT_Clear(USB_INT_VBERRI);
-
-		USB_Host_VBUS_Manual_Off();
-		USB_Host_VBUS_Auto_Off();
-
-		EVENT_USB_Host_HostError(HOST_ERROR_VBusVoltageDip);
-		EVENT_USB_Host_DeviceUnattached();
-
-		USB_HostState = HOST_STATE_Unattached;
-	}
-
-	if (USB_INT_HasOccurred(USB_INT_DCONNI) && USB_INT_IsEnabled(USB_INT_DCONNI))
-	{
-		USB_INT_Clear(USB_INT_DCONNI);
-		USB_INT_Disable(USB_INT_DCONNI);
-
-		EVENT_USB_Host_DeviceAttached();
-
-		USB_INT_Enable(USB_INT_DDISCI);
-
-		USB_HostState = HOST_STATE_Powered;
-	}
-
-	if (USB_INT_HasOccurred(USB_INT_BCERRI) && USB_INT_IsEnabled(USB_INT_BCERRI))
-	{
-		USB_INT_Clear(USB_INT_BCERRI);
-
-		EVENT_USB_Host_DeviceEnumerationFailed(HOST_ENUMERROR_NoDeviceDetected, 0);
-		EVENT_USB_Host_DeviceUnattached();
-
-		USB_ResetInterface();
-	}
-	#endif
-
-	#if defined(USB_CAN_BE_BOTH)
-	if (USB_INT_HasOccurred(USB_INT_IDTI) && USB_INT_IsEnabled(USB_INT_IDTI))
-	{
-		USB_INT_Clear(USB_INT_IDTI);
-
-		if (USB_DeviceState != DEVICE_STATE_Unattached)
-		  EVENT_USB_Device_Disconnect();
-
-		if (USB_HostState != HOST_STATE_Unattached)
-		  EVENT_USB_Host_DeviceUnattached();
-
-		USB_CurrentMode = USB_GetUSBModeFromUID();
-		USB_ResetInterface();
-
-		EVENT_USB_UIDChange();
-	}
-	#endif
-}
-
-#if defined(INTERRUPT_CONTROL_ENDPOINT) && defined(USB_CAN_BE_DEVICE)
-ISR(USB_COM_vect)
-{
-	uint8_t PrevSelectedEndpoint = Endpoint_GetCurrentEndpoint();
-
-	Endpoint_SelectEndpoint(ENDPOINT_CONTROLEP);
-	USB_INT_Disable(USB_INT_RXSTPI);
-
-	GlobalInterruptEnable();
-
-	USB_Device_ProcessControlRequest();
-
-	Endpoint_SelectEndpoint(ENDPOINT_CONTROLEP);
-	USB_INT_Enable(USB_INT_RXSTPI);
-	Endpoint_SelectEndpoint(PrevSelectedEndpoint);
-}
-#endif
-
-#endif
diff --git a/NativePrograms/LUFA/Drivers/USB/Core/UC3/USBInterrupt_UC3.h b/NativePrograms/LUFA/Drivers/USB/Core/UC3/USBInterrupt_UC3.h
deleted file mode 100644
index c2bdc19490..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Core/UC3/USBInterrupt_UC3.h
+++ /dev/null
@@ -1,376 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief USB Controller Interrupt definitions for the AVR32 UC3 microcontrollers.
- *
- *  This file contains definitions required for the correct handling of low level USB service routine interrupts
- *  from the USB controller.
- *
- *  \note This file should not be included directly. It is automatically included as needed by the USB driver
- *        dispatch header located in LUFA/Drivers/USB/USB.h.
- */
-
-#ifndef __USBINTERRUPT_UC3_H__
-#define __USBINTERRUPT_UC3_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_USB_DRIVER)
-			#error Do not include this file directly. Include LUFA/Drivers/USB/USB.h instead.
-		#endif
-
-	/* Private Interface - For use in library only: */
-	#if !defined(__DOXYGEN__)
-		/* External Variables: */
-			extern volatile uint32_t USB_Endpoint_SelectedEndpoint;
-
-		/* Enums: */
-			enum USB_Interrupts_t
-			{
-				USB_INT_VBUSTI  = 0,
-				#if (defined(USB_CAN_BE_BOTH) || defined(__DOXYGEN__))
-				USB_INT_IDTI    = 1,
-				#endif
-				#if (defined(USB_CAN_BE_DEVICE) || defined(__DOXYGEN__))
-				USB_INT_WAKEUPI = 2,
-				USB_INT_SUSPI   = 3,
-				USB_INT_EORSTI  = 4,
-				USB_INT_SOFI    = 5,
-				USB_INT_RXSTPI  = 6,
-				#endif
-				#if (defined(USB_CAN_BE_HOST) || defined(__DOXYGEN__))
-				USB_INT_HSOFI   = 7,
-				USB_INT_DCONNI  = 8,
-				USB_INT_DDISCI  = 9,
-				USB_INT_RSTI    = 10,
-				USB_INT_BCERRI  = 11,
-				USB_INT_VBERRI  = 12,
-				#endif
-			};
-
-		/* Inline Functions: */
-			static inline void USB_INT_Enable(const uint8_t Interrupt) ATTR_ALWAYS_INLINE;
-			static inline void USB_INT_Enable(const uint8_t Interrupt)
-			{
-				switch (Interrupt)
-				{
-					case USB_INT_VBUSTI:
-						AVR32_USBB.USBCON.vbuste      = true;
-						break;
-					#if defined(USB_CAN_BE_BOTH)
-					case USB_INT_IDTI:
-						AVR32_USBB.USBCON.idte        = true;
-						break;
-					#endif
-					#if defined(USB_CAN_BE_DEVICE)
-					case USB_INT_WAKEUPI:
-						AVR32_USBB.UDINTESET.wakeupes = true;
-						break;
-					case USB_INT_SUSPI:
-						AVR32_USBB.UDINTESET.suspes   = true;
-						break;
-					case USB_INT_EORSTI:
-						AVR32_USBB.UDINTESET.eorstes  = true;
-						break;
-					case USB_INT_SOFI:
-						AVR32_USBB.UDINTESET.sofes    = true;
-						break;
-					case USB_INT_RXSTPI:
-						(&AVR32_USBB.UECON0SET)[USB_Endpoint_SelectedEndpoint].rxstpes = true;
-						break;
-					#endif
-					#if defined(USB_CAN_BE_HOST)
-					case USB_INT_HSOFI:
-						AVR32_USBB.UHINTESET.hsofies  = true;
-						break;
-					case USB_INT_DCONNI:
-						AVR32_USBB.UHINTESET.dconnies = true;
-						break;
-					case USB_INT_DDISCI:
-						AVR32_USBB.UHINTESET.ddiscies = true;
-						break;
-					case USB_INT_RSTI:
-						AVR32_USBB.UHINTESET.rsties   = true;
-						break;
-					case USB_INT_BCERRI:
-						AVR32_USBB.USBCON.bcerre      = true;
-						break;
-					case USB_INT_VBERRI:
-						AVR32_USBB.USBCON.vberre      = true;
-						break;
-					#endif
-					default:
-						break;
-				}
-			}
-
-			static inline void USB_INT_Disable(const uint8_t Interrupt) ATTR_ALWAYS_INLINE;
-			static inline void USB_INT_Disable(const uint8_t Interrupt)
-			{
-				switch (Interrupt)
-				{
-					case USB_INT_VBUSTI:
-						AVR32_USBB.USBCON.vbuste      = false;
-						break;
-					#if defined(USB_CAN_BE_BOTH)
-					case USB_INT_IDTI:
-						AVR32_USBB.USBCON.idte        = false;
-						break;
-					#endif
-					#if defined(USB_CAN_BE_DEVICE)
-					case USB_INT_WAKEUPI:
-						AVR32_USBB.UDINTECLR.wakeupec = true;
-						break;
-					case USB_INT_SUSPI:
-						AVR32_USBB.UDINTECLR.suspec   = true;
-						break;
-					case USB_INT_EORSTI:
-						AVR32_USBB.UDINTECLR.eorstec  = true;
-						break;
-					case USB_INT_SOFI:
-						AVR32_USBB.UDINTECLR.sofec    = true;
-						break;
-					case USB_INT_RXSTPI:
-						(&AVR32_USBB.UECON0CLR)[USB_Endpoint_SelectedEndpoint].rxstpec = true;
-						break;
-					#endif
-					#if defined(USB_CAN_BE_HOST)
-					case USB_INT_HSOFI:
-						AVR32_USBB.UHINTECLR.hsofiec  = true;
-						break;
-					case USB_INT_DCONNI:
-						AVR32_USBB.UHINTECLR.dconniec = true;
-						break;
-					case USB_INT_DDISCI:
-						AVR32_USBB.UHINTECLR.ddisciec = true;
-						break;
-					case USB_INT_RSTI:
-						AVR32_USBB.UHINTECLR.rstiec   = true;
-						break;
-					case USB_INT_BCERRI:
-						AVR32_USBB.USBCON.bcerre      = false;
-						break;
-					case USB_INT_VBERRI:
-						AVR32_USBB.USBCON.vberre      = false;
-						break;
-					#endif
-					default:
-						break;
-				}
-			}
-
-			static inline void USB_INT_Clear(const uint8_t Interrupt) ATTR_ALWAYS_INLINE;
-			static inline void USB_INT_Clear(const uint8_t Interrupt)
-			{
-				switch (Interrupt)
-				{
-					case USB_INT_VBUSTI:
-						AVR32_USBB.USBSTACLR.vbustic = true;
-						(void)AVR32_USBB.USBSTACLR;
-						break;
-					#if defined(USB_CAN_BE_BOTH)
-					case USB_INT_IDTI:
-						AVR32_USBB.USBSTACLR.idtic   = true;
-						(void)AVR32_USBB.USBSTACLR;
-						break;
-					#endif
-					#if defined(USB_CAN_BE_DEVICE)
-					case USB_INT_WAKEUPI:
-						AVR32_USBB.UDINTCLR.wakeupc  = true;
-						(void)AVR32_USBB.UDINTCLR;
-						break;
-					case USB_INT_SUSPI:
-						AVR32_USBB.UDINTCLR.suspc    = true;
-						(void)AVR32_USBB.UDINTCLR;
-						break;
-					case USB_INT_EORSTI:
-						AVR32_USBB.UDINTCLR.eorstc   = true;
-						(void)AVR32_USBB.UDINTCLR;
-						break;
-					case USB_INT_SOFI:
-						AVR32_USBB.UDINTCLR.sofc     = true;
-						(void)AVR32_USBB.UDINTCLR;
-						break;
-					case USB_INT_RXSTPI:
-						(&AVR32_USBB.UESTA0CLR)[USB_Endpoint_SelectedEndpoint].rxstpic = true;
-						break;
-					#endif
-					#if defined(USB_CAN_BE_HOST)
-					case USB_INT_HSOFI:
-						AVR32_USBB.UHINTCLR.hsofic   = true;
-						(void)AVR32_USBB.UHINTCLR;
-						break;
-					case USB_INT_DCONNI:
-						AVR32_USBB.UHINTCLR.dconnic  = true;
-						(void)AVR32_USBB.UHINTCLR;
-						break;
-					case USB_INT_DDISCI:
-						AVR32_USBB.UHINTCLR.ddiscic  = true;
-						(void)AVR32_USBB.UHINTCLR;
-						break;
-					case USB_INT_RSTI:
-						AVR32_USBB.UHINTCLR.rstic    = true;
-						(void)AVR32_USBB.UHINTCLR;
-						break;
-					case USB_INT_BCERRI:
-						AVR32_USBB.USBSTACLR.bcerric = true;
-						(void)AVR32_USBB.USBSTACLR;
-						break;
-					case USB_INT_VBERRI:
-						AVR32_USBB.USBSTACLR.vberric = true;
-						(void)AVR32_USBB.USBSTACLR;
-						break;
-					#endif
-					default:
-						break;
-				}
-			}
-
-			static inline bool USB_INT_IsEnabled(const uint8_t Interrupt) ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT;
-			static inline bool USB_INT_IsEnabled(const uint8_t Interrupt)
-			{
-				switch (Interrupt)
-				{
-					case USB_INT_VBUSTI:
-						return AVR32_USBB.USBCON.vbuste;
-					#if defined(USB_CAN_BE_BOTH)
-					case USB_INT_IDTI:
-						return AVR32_USBB.USBCON.idte;
-					#endif
-					#if defined(USB_CAN_BE_DEVICE)
-					case USB_INT_WAKEUPI:
-						return AVR32_USBB.UDINTE.wakeupe;
-					case USB_INT_SUSPI:
-						return AVR32_USBB.UDINTE.suspe;
-					case USB_INT_EORSTI:
-						return AVR32_USBB.UDINTE.eorste;
-					case USB_INT_SOFI:
-						return AVR32_USBB.UDINTE.sofe;
-					case USB_INT_RXSTPI:
-						return (&AVR32_USBB.UECON0)[USB_Endpoint_SelectedEndpoint].rxstpe;
-					#endif
-					#if defined(USB_CAN_BE_HOST)
-					case USB_INT_HSOFI:
-						return AVR32_USBB.UHINTE.hsofie;
-					case USB_INT_DCONNI:
-						return AVR32_USBB.UHINTE.dconnie;
-					case USB_INT_DDISCI:
-						return AVR32_USBB.UHINTE.ddiscie;
-					case USB_INT_RSTI:
-						return AVR32_USBB.UHINTE.rstie;
-					case USB_INT_BCERRI:
-						return AVR32_USBB.USBCON.bcerre;
-					case USB_INT_VBERRI:
-						return AVR32_USBB.USBCON.vberre;
-					#endif
-					default:
-						return false;
-				}
-			}
-
-			static inline bool USB_INT_HasOccurred(const uint8_t Interrupt) ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT;
-			static inline bool USB_INT_HasOccurred(const uint8_t Interrupt)
-			{
-				switch (Interrupt)
-				{
-					case USB_INT_VBUSTI:
-						return AVR32_USBB.USBSTA.vbusti;
-					#if defined(USB_CAN_BE_BOTH)
-					case USB_INT_IDTI:
-						return AVR32_USBB.USBSTA.idti;
-					#endif
-					#if defined(USB_CAN_BE_DEVICE)
-					case USB_INT_WAKEUPI:
-						return AVR32_USBB.UDINT.wakeup;
-					case USB_INT_SUSPI:
-						return AVR32_USBB.UDINT.susp;
-					case USB_INT_EORSTI:
-						return AVR32_USBB.UDINT.eorst;
-					case USB_INT_SOFI:
-						return AVR32_USBB.UDINT.sof;
-					case USB_INT_RXSTPI:
-						return (&AVR32_USBB.UESTA0)[USB_Endpoint_SelectedEndpoint].rxstpi;
-					#endif
-					#if defined(USB_CAN_BE_HOST)
-					case USB_INT_HSOFI:
-						return AVR32_USBB.UHINT.hsofi;
-					case USB_INT_DCONNI:
-						return AVR32_USBB.UHINT.dconni;
-					case USB_INT_DDISCI:
-						return AVR32_USBB.UHINT.ddisci;
-					case USB_INT_RSTI:
-						return AVR32_USBB.UHINT.rsti;
-					case USB_INT_BCERRI:
-						return AVR32_USBB.USBSTA.bcerri;
-					case USB_INT_VBERRI:
-						return AVR32_USBB.USBSTA.vberri;
-					#endif
-					default:
-						return false;
-				}
-			}
-
-		/* Includes: */
-			#include "../USBMode.h"
-			#include "../Events.h"
-			#include "../USBController.h"
-
-		/* Function Prototypes: */
-			void USB_INT_ClearAllInterrupts(void);
-			void USB_INT_DisableAllInterrupts(void);
-	#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Function Prototypes: */
-			#if defined(__DOXYGEN__)
-				/** Interrupt service routine handler for the USB controller ISR group. This interrupt routine <b>must</b> be
-				 *  linked to the entire USB controller ISR vector group inside the AVR32's interrupt controller peripheral,
-				 *  using the user application's preferred USB controller driver.
-				 */
-				void USB_GEN_vect(void);
-			#else
-				ISR(USB_GEN_vect);
-			#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Core/USBController.h b/NativePrograms/LUFA/Drivers/USB/Core/USBController.h
deleted file mode 100644
index 3a75ce3709..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Core/USBController.h
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Common USB Controller definitions for all architectures.
- *  \copydetails Group_USBManagement
- *
- *  \note This file should not be included directly. It is automatically included as needed by the USB driver
- *        dispatch header located in LUFA/Drivers/USB/USB.h.
- */
-
-/** \ingroup Group_USB
- *  \defgroup Group_USBManagement USB Interface Management
- *  \brief USB Controller definitions for general USB controller management.
- *
- *  Functions, macros, variables, enums and types related to the setup and management of the USB interface.
- *
- *  @{
- */
-
-#ifndef __USBCONTROLLER_H__
-#define __USBCONTROLLER_H__
-
-	/* Includes: */
-		#include "../../../Common/Common.h"
-		#include "USBMode.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks and Defines: */
-		#if !defined(__INCLUDE_FROM_USB_DRIVER)
-			#error Do not include this file directly. Include LUFA/Drivers/USB/USB.h instead.
-		#endif
-
-	/* Defines: */
-		/** \name Endpoint Direction Masks */
-		/**@{*/
-		/** Endpoint direction mask, for masking against endpoint addresses to retrieve the endpoint's
-		 *  direction for comparing with the \c ENDPOINT_DIR_* masks.
-		 */
-		#define ENDPOINT_DIR_MASK                  0x80
-
-		/** Endpoint address direction mask for an OUT direction (Host to Device) endpoint. This may be ORed with
-		 *  the index of the address within a device to obtain the full endpoint address.
-		 */
-		#define ENDPOINT_DIR_OUT                   0x00
-
-		/** Endpoint address direction mask for an IN direction (Device to Host) endpoint. This may be ORed with
-		 *  the index of the address within a device to obtain the full endpoint address.
-		 */
-		#define ENDPOINT_DIR_IN                    0x80
-		/**@}*/
-
-		/** \name Pipe Direction Masks */
-		/**@{*/
-		/** Pipe direction mask, for masking against pipe addresses to retrieve the pipe's
-		 *  direction for comparing with the \c PIPE_DIR_* masks.
-		 */
-		#define PIPE_DIR_MASK                      0x80
-
-		/** Endpoint address direction mask for an OUT direction (Host to Device) endpoint. This may be ORed with
-		 *  the index of the address within a device to obtain the full endpoint address.
-		 */
-		#define PIPE_DIR_OUT                       0x00
-
-		/** Endpoint address direction mask for an IN direction (Device to Host) endpoint. This may be ORed with
-		 *  the index of the address within a device to obtain the full endpoint address.
-		 */
-		#define PIPE_DIR_IN                        0x80
-		/**@}*/
-
-		/** \name Endpoint/Pipe Type Masks */
-		/**@{*/
-		/** Mask for determining the type of an endpoint from an endpoint descriptor. This should then be compared
-		 *  with the \c EP_TYPE_* masks to determine the exact type of the endpoint.
-		 */
-		#define EP_TYPE_MASK                       0x03
-
-		/** Mask for a CONTROL type endpoint or pipe.
-		 *
-		 *  \note See \ref Group_EndpointManagement and \ref Group_PipeManagement for endpoint/pipe functions.
-		 */
-		#define EP_TYPE_CONTROL                    0x00
-
-		/** Mask for an ISOCHRONOUS type endpoint or pipe.
-		 *
-		 *  \note See \ref Group_EndpointManagement and \ref Group_PipeManagement for endpoint/pipe functions.
-		 */
-		#define EP_TYPE_ISOCHRONOUS                0x01
-
-		/** Mask for a BULK type endpoint or pipe.
-		 *
-		 *  \note See \ref Group_EndpointManagement and \ref Group_PipeManagement for endpoint/pipe functions.
-		 */
-		#define EP_TYPE_BULK                       0x02
-
-		/** Mask for an INTERRUPT type endpoint or pipe.
-		 *
-		 *  \note See \ref Group_EndpointManagement and \ref Group_PipeManagement for endpoint/pipe functions.
-		 */
-		#define EP_TYPE_INTERRUPT                  0x03
-		/**@}*/
-
-	/* Enums: */
-		/** Enum for the possible USB controller modes, for initialization via \ref USB_Init() and indication back to the
-		 *  user application via \ref USB_CurrentMode.
-		 */
-		enum USB_Modes_t
-		{
-			USB_MODE_None   = 0, /**< Indicates that the controller is currently not initialized in any specific USB mode. */
-			USB_MODE_Device = 1, /**< Indicates that the controller is currently initialized in USB Device mode. */
-			USB_MODE_Host   = 2, /**< Indicates that the controller is currently initialized in USB Host mode. */
-			USB_MODE_UID    = 3, /**< Indicates that the controller should determine the USB mode from the UID pin of the
-			                      *   USB connector.
-			                      */
-		};
-
-	/* Architecture Includes: */
-		#if (ARCH == ARCH_AVR8)
-			#include "AVR8/USBController_AVR8.h"
-		#elif (ARCH == ARCH_UC3)
-			#include "UC3/USBController_UC3.h"
-		#elif (ARCH == ARCH_XMEGA)
-			#include "XMEGA/USBController_XMEGA.h"
-		#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Core/USBInterrupt.h b/NativePrograms/LUFA/Drivers/USB/Core/USBInterrupt.h
deleted file mode 100644
index 86b881bcb5..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Core/USBInterrupt.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief USB controller interrupt service routine management.
- *
- *  This file contains definitions required for the correct handling of low level USB service routine interrupts
- *  from the USB controller.
- *
- *  \note This file should not be included directly. It is automatically included as needed by the USB driver
- *        dispatch header located in LUFA/Drivers/USB/USB.h.
- */
-
-#ifndef __USBINTERRUPT_H__
-#define __USBINTERRUPT_H__
-
-	/* Includes: */
-		#include "../../../Common/Common.h"
-		#include "USBMode.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_USB_DRIVER)
-			#error Do not include this file directly. Include LUFA/Drivers/USB/USB.h instead.
-		#endif
-
-	/* Architecture Includes: */
-		#if (ARCH == ARCH_AVR8)
-			#include "AVR8/USBInterrupt_AVR8.h"
-		#elif (ARCH == ARCH_UC3)
-			#include "UC3/USBInterrupt_UC3.h"
-		#elif (ARCH == ARCH_XMEGA)
-			#include "XMEGA/USBInterrupt_XMEGA.h"
-		#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Core/USBMode.h b/NativePrograms/LUFA/Drivers/USB/Core/USBMode.h
deleted file mode 100644
index 53e17675ab..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Core/USBMode.h
+++ /dev/null
@@ -1,283 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief USB mode and feature support definitions.
- *  \copydetails Group_USBMode
- *
- *  \note This file should not be included directly. It is automatically included as needed by the USB driver
- *        dispatch header located in LUFA/Drivers/USB/USB.h.
- */
-
-/** \ingroup Group_USB
- *  \defgroup Group_USBMode USB Mode Tokens
- *  \brief USB mode and feature support definitions.
- *
- *  This file defines macros indicating the type of USB controller the library is being compiled for, and its
- *  capabilities. These macros may then be referenced in the user application to selectively enable or disable
- *  code sections depending on if they are defined or not.
- *
- *  After the inclusion of the master USB driver header, one or more of the following tokens may be defined, to
- *  allow the user code to conditionally enable or disable code based on the USB controller family and allowable
- *  USB modes. These tokens may be tested against to eliminate code relating to a USB mode which is not enabled for
- *  the given compilation.
- *
- *  @{
- */
-
-#ifndef __USBMODE_H__
-#define __USBMODE_H__
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_USB_DRIVER)
-			#error Do not include this file directly. Include LUFA/Drivers/USB/USB.h instead.
-		#endif
-
-	/* Includes: */
-		#include "../../../Common/Common.h"
-
-	/* Public Interface - May be used in end-application: */
-	#if defined(__DOXYGEN__)
-		/** Indicates that the target AVR microcontroller belongs to the Series 2 AVR8 USB controller
-		 *  (i.e. AT90USBxxx2 or ATMEGAxxU2) when defined.
-		 */
-		#define USB_SERIES_2_AVR
-
-		/** Indicates that the target AVR microcontroller belongs to the Series 4 AVR8 USB controller
-		 *  (i.e. ATMEGAxxU4) when defined.
-		 */
-		#define USB_SERIES_4_AVR
-
-		/** Indicates that the target AVR microcontroller belongs to the Series 6 AVR8 USB controller
-		 *  (i.e. AT90USBxxx6) when defined.
-		 */
-		#define USB_SERIES_6_AVR
-
-		/** Indicates that the target AVR microcontroller belongs to the Series 7 AVR8 USB controller
-		 *  (i.e. AT90USBxxx7) when defined.
-		 */
-		#define USB_SERIES_7_AVR
-
-		/** Indicates that the target AVR microcontroller belongs to the AVR32 UC3A0 Series USB controller
-		 *  (i.e. AT32UC3A0*) when defined.
-		 */
-		#define USB_SERIES_UC3A0_AVR
-
-		/** Indicates that the target AVR microcontroller belongs to the AVR32 UC3A1 Series USB controller
-		 *  (i.e. AT32UC3A1*) when defined.
-		 */
-		#define USB_SERIES_UC3A1_AVR
-
-		/** Indicates that the target AVR microcontroller belongs to the AVR32 UC3A3 Series USB controller
-		 *  (i.e. AT32UC3A3*) when defined.
-		 */
-		#define USB_SERIES_UC3A3_AVR
-
-		/** Indicates that the target AVR microcontroller belongs to the AVR32 UC3A4 Series USB controller
-		 *  (i.e. AT32UC3A4*) when defined.
-		 */
-		#define USB_SERIES_UC3A4_AVR
-
-		/** Indicates that the target AVR microcontroller belongs to the AVR32 UC3B0 Series USB controller
-		 *  (i.e. AT32UC3B0*) when defined.
-		 */
-		#define USB_SERIES_UC3B0_AVR
-
-		/** Indicates that the target AVR microcontroller belongs to the AVR32 UC3B1 Series USB controller
-		 *  (i.e. AT32UC3B1*) when defined.
-		 */
-		#define USB_SERIES_UC3B1_AVR
-
-		/** Indicates that the target AVR microcontroller belongs to the XMEGA A1U Series USB controller
-		 *  (i.e. ATXMEGA*A1U) when defined.
-		 */
-		#define USB_SERIES_A1U_XMEGA
-
-		/** Indicates that the target AVR microcontroller belongs to the XMEGA A3U Series USB controller
-		 *  (i.e. ATXMEGA*A3U) when defined.
-		 */
-		#define USB_SERIES_A3U_XMEGA
-
-		/** Indicates that the target AVR microcontroller belongs to the XMEGA A4U Series USB controller
-		 *  (i.e. ATXMEGA*A4U) when defined.
-		 */
-		#define USB_SERIES_A4U_XMEGA
-
-		/** Indicates that the target AVR microcontroller belongs to the XMEGA B1 Series USB controller
-		 *  (i.e. ATXMEGA*B1) when defined.
-		 */
-		#define USB_SERIES_B1_XMEGA
-
-		/** Indicates that the target AVR microcontroller belongs to the XMEGA B3 Series USB controller
-		 *  (i.e. ATXMEGA*B3) when defined.
-		 */
-		#define USB_SERIES_B3_XMEGA
-
-		/** Indicates that the target AVR microcontroller belongs to the XMEGA C3 Series USB controller
-		 *  (i.e. ATXMEGA*C3) when defined.
-		 */
-		#define USB_SERIES_C3_XMEGA
-
-		/** Indicates that the target AVR microcontroller belongs to the XMEGA C4 Series USB controller
-		 *  (i.e. ATXMEGA*C4) when defined.
-		 */
-		#define USB_SERIES_C4_XMEGA
-
-		/** Indicates that the target microcontroller and compilation settings allow for the
-		 *  target to be configured in USB Device mode when defined.
-		 */
-		#define USB_CAN_BE_DEVICE
-
-		/** Indicates that the target microcontroller and compilation settings allow for the
-		 *  target to be configured in USB Host mode when defined.
-		 */
-		#define USB_CAN_BE_HOST
-
-		/** Indicates that the target microcontroller and compilation settings allow for the
-		 *  target to be configured in either USB Device or Host mode when defined.
-		 */
-		#define USB_CAN_BE_BOTH
-	#else
-		/* Macros: */
-			#if (defined(__AVR_AT90USB162__) || defined(__AVR_AT90USB82__)  || \
-			     defined(__AVR_ATmega32U2__) || defined(__AVR_ATmega16U2__) || defined(__AVR_ATmega8U2__))
-				#define USB_SERIES_2_AVR
-				#define USB_CAN_BE_DEVICE
-			#elif (defined(__AVR_ATmega32U4__) || defined(__AVR_ATmega16U4__))
-				#define USB_SERIES_4_AVR
-				#define USB_CAN_BE_DEVICE
-			#elif (defined(__AVR_AT90USB646__) || defined(__AVR_AT90USB1286__))
-				#define USB_SERIES_6_AVR
-				#define USB_CAN_BE_DEVICE
-			#elif (defined(__AVR_AT90USB647__) || defined(__AVR_AT90USB1287__))
-				#define USB_SERIES_7_AVR
-				#define USB_CAN_BE_DEVICE
-				#define USB_CAN_BE_HOST
-			#elif (defined(__AVR32_UC3A0512__) || defined(__AVR32_UC3A0256__) || \
-			       defined(__AVR32_UC3A0128__) || defined(__AVR32_UC3A064__))
-				#define USB_SERIES_UC3A0_AVR32
-				#define USB_CAN_BE_DEVICE
-				#define USB_CAN_BE_HOST
-			#elif (defined(__AVR32_UC3A1512__) || defined(__AVR32_UC3A1256__) || \
-			       defined(__AVR32_UC3A1128__) || defined(__AVR32_UC3A164__))
-				#define USB_SERIES_UC3A1_AVR32
-				#define USB_CAN_BE_DEVICE
-				#define USB_CAN_BE_HOST
-			#elif (defined(__AVR32_UC3A3256__) || defined(__AVR32_UC3A3256S__) || \
-			       defined(__AVR32_UC3A3128__) || defined(__AVR32_UC3A3128S__) || \
-			       defined(__AVR32_UC3A364__)  || defined(__AVR32_UC3A364S__))
-				#define USB_SERIES_UC3A3_AVR32
-				#define USB_CAN_BE_DEVICE
-				#define USB_CAN_BE_HOST
-			#elif (defined(__AVR32_UC3A4256__) || defined(__AVR32_UC3A4256S__) || \
-			       defined(__AVR32_UC3A4128__) || defined(__AVR32_UC3A4128S__) || \
-			       defined(__AVR32_UC3A464__)  || defined(__AVR32_UC3A464S__))
-				#define USB_SERIES_UC3A4_AVR32
-				#define USB_CAN_BE_DEVICE
-				#define USB_CAN_BE_HOST
-			#elif (defined(__AVR32_UC3B0512__) || defined(__AVR32_UC3B0256__) || \
-			       defined(__AVR32_UC3B0128__) || defined(__AVR32_UC3B064__))
-				#define USB_SERIES_UC3B0_AVR32
-				#define USB_CAN_BE_DEVICE
-				#define USB_CAN_BE_HOST
-			#elif (defined(__AVR32_UC3B1512__) || defined(__AVR32_UC3B1256__) || \
-			       defined(__AVR32_UC3B1128__) || defined(__AVR32_UC3B164__))
-				#define USB_SERIES_UC3B1_AVR32
-				#define USB_CAN_BE_DEVICE
-				#define USB_CAN_BE_HOST
-			#elif (defined(__AVR_ATxmega128A1U__) || defined(__AVR_ATxmega64A1U__))
-				#define USB_SERIES_A1U_XMEGA
-				#define USB_CAN_BE_DEVICE
-			#elif (defined(__AVR_ATxmega64A3U__) || defined(__AVR_ATxmega128A3U__) || \
-			       defined(__AVR_ATxmega192A3U__) || defined(__AVR_ATxmega256A3U__))
-				#define USB_SERIES_A3U_XMEGA
-				#define USB_CAN_BE_DEVICE
-			#elif (defined(__AVR_ATxmega256A3BU__))
-				#define USB_SERIES_A3BU_XMEGA
-				#define USB_CAN_BE_DEVICE
-			#elif (defined(__AVR_ATxmega16A4U__) || defined(__AVR_ATxmega32A4U__) || \
-			       defined(__AVR_ATxmega64A4U__) || defined(__AVR_ATxmega128A4U__))
-				#define USB_SERIES_A4U_XMEGA
-				#define USB_CAN_BE_DEVICE
-			#elif (defined(__AVR_ATxmega128B1__) || defined(__AVR_ATxmega64B1__))
-				#define USB_SERIES_B1_XMEGA
-				#define USB_CAN_BE_DEVICE
-			#elif (defined(__AVR_ATxmega128B3__) || defined(__AVR_ATxmega64B3__))
-				#define USB_SERIES_B3_XMEGA
-				#define USB_CAN_BE_DEVICE
-			#elif (defined(__AVR_ATxmega128C3__) || defined(__AVR_ATxmega64C3__) || \
-			       defined(__AVR_ATxmega192C3__) || defined(__AVR_ATxmega256C3__) || \
-				   defined(__AVR_ATxmega384C3__))
-				#define USB_SERIES_C3_XMEGA
-				#define USB_CAN_BE_DEVICE
-			#elif (defined(__AVR_ATxmega16C4__) || defined(__AVR_ATxmega32C4__))
-				#define USB_SERIES_C4_XMEGA
-				#define USB_CAN_BE_DEVICE
-			#endif
-
-			#if (defined(USB_HOST_ONLY) && defined(USB_DEVICE_ONLY))
-				#error USB_HOST_ONLY and USB_DEVICE_ONLY are mutually exclusive.
-			#elif defined(USB_HOST_ONLY)
-				#if !defined(USB_CAN_BE_HOST)
-					#error USB_HOST_ONLY is not available for the currently selected microcontroller model.
-				#else
-					#undef USB_CAN_BE_DEVICE
-				#endif
-			#elif defined(USB_DEVICE_ONLY)
-				#if !defined(USB_CAN_BE_DEVICE)
-					#error USB_DEVICE_ONLY is not available for the currently selected microcontroller model.
-				#else
-					#undef USB_CAN_BE_HOST
-				#endif
-			#endif
-
-			#if (defined(USB_CAN_BE_DEVICE) && defined(USB_CAN_BE_HOST))
-				#define USB_CAN_BE_BOTH
-			#endif
-
-			#if (!defined(USB_CAN_BE_DEVICE) && !defined(USB_CAN_BE_HOST))
-				#error The currently selected device, USB mode or architecture is not supported.
-			#endif
-	#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Core/USBTask.c b/NativePrograms/LUFA/Drivers/USB/Core/USBTask.c
deleted file mode 100644
index f6dffa7257..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Core/USBTask.c
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-#define  __INCLUDE_FROM_USBTASK_C
-#define  __INCLUDE_FROM_USB_DRIVER
-#include "USBTask.h"
-
-volatile bool        USB_IsInitialized;
-USB_Request_Header_t USB_ControlRequest;
-
-#if defined(USB_CAN_BE_HOST) && !defined(HOST_STATE_AS_GPIOR)
-volatile uint8_t     USB_HostState;
-#endif
-
-#if defined(USB_CAN_BE_DEVICE) && !defined(DEVICE_STATE_AS_GPIOR)
-volatile uint8_t     USB_DeviceState;
-#endif
-
-void USB_USBTask(void)
-{
-	#if defined(USB_CAN_BE_BOTH)
-		if (USB_CurrentMode == USB_MODE_Device)
-		  USB_DeviceTask();
-		else if (USB_CurrentMode == USB_MODE_Host)
-		  USB_HostTask();
-	#elif defined(USB_CAN_BE_HOST)
-		USB_HostTask();
-	#elif defined(USB_CAN_BE_DEVICE)
-		USB_DeviceTask();
-	#endif
-}
-
-#if defined(USB_CAN_BE_DEVICE)
-static void USB_DeviceTask(void)
-{
-	if (USB_DeviceState == DEVICE_STATE_Unattached)
-	  return;
-
-	uint8_t PrevEndpoint = Endpoint_GetCurrentEndpoint();
-
-	Endpoint_SelectEndpoint(ENDPOINT_CONTROLEP);
-
-	if (Endpoint_IsSETUPReceived())
-	  USB_Device_ProcessControlRequest();
-
-	Endpoint_SelectEndpoint(PrevEndpoint);
-}
-#endif
-
-#if defined(USB_CAN_BE_HOST)
-static void USB_HostTask(void)
-{
-	uint8_t PrevPipe = Pipe_GetCurrentPipe();
-
-	Pipe_SelectPipe(PIPE_CONTROLPIPE);
-
-	USB_Host_ProcessNextHostState();
-
-	Pipe_SelectPipe(PrevPipe);
-}
-#endif
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Core/USBTask.h b/NativePrograms/LUFA/Drivers/USB/Core/USBTask.h
deleted file mode 100644
index 69042eca07..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Core/USBTask.h
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Main USB service task management.
- *
- *  This file contains the function definitions required for the main USB service task, which must be called
- *  from the user application to ensure that the USB connection to or from a connected USB device is maintained.
- *
- *  \note This file should not be included directly. It is automatically included as needed by the USB driver
- *        dispatch header located in LUFA/Drivers/USB/USB.h.
- */
-
-#ifndef __USBTASK_H__
-#define __USBTASK_H__
-
-	/* Includes: */
-		#include "../../../Common/Common.h"
-		#include "USBMode.h"
-		#include "USBController.h"
-		#include "Events.h"
-		#include "StdRequestType.h"
-		#include "StdDescriptors.h"
-
-		#if defined(USB_CAN_BE_DEVICE)
-			#include "DeviceStandardReq.h"
-		#endif
-
-		#if defined(USB_CAN_BE_HOST)
-			#include "HostStandardReq.h"
-		#endif
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_USB_DRIVER)
-			#error Do not include this file directly. Include LUFA/Drivers/USB/USB.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Global Variables: */
-			/** Indicates if the USB interface is currently initialized but not necessarily connected to a host
-			 *  or device (i.e. if \ref USB_Init() has been run). If this is false, all other library globals related
-			 *  to the USB driver are invalid.
-			 *
-			 *  \attention This variable should be treated as read-only in the user application, and never manually
-			 *             changed in value.
-			 *
-			 *  \ingroup Group_USBManagement
-			 */
-			extern volatile bool USB_IsInitialized;
-
-			/** Structure containing the last received Control request when in Device mode (for use in user-applications
-			 *  inside of the \ref EVENT_USB_Device_ControlRequest() event, or for filling up with a control request to
-			 *  issue when in Host mode before calling \ref USB_Host_SendControlRequest().
-			 *
-			 *  \note The contents of this structure is automatically endian-corrected for the current CPU architecture.
-			 *
-			 *  \ingroup Group_USBManagement
-			 */
-			 extern USB_Request_Header_t USB_ControlRequest;
-
-			#if defined(USB_CAN_BE_HOST) || defined(__DOXYGEN__)
-				#if !defined(HOST_STATE_AS_GPIOR) || defined(__DOXYGEN__)
-					/** Indicates the current host state machine state. When in host mode, this indicates the state
-					 *  via one of the values of the \ref USB_Host_States_t enum values.
-					 *
-					 *  This value should not be altered by the user application as it is handled automatically by the
-					 *  library.
-					 *
-					 *  To reduce program size and speed up checks of this global on the AVR8 architecture, it can be
-					 *  placed into one of the AVR's \c GPIOR hardware registers instead of RAM by defining the
-					 *  \c HOST_STATE_AS_GPIOR token to a value between 0 and 2 in the project makefile and passing it to
-					 *  the compiler via the -D switch. When defined, the corresponding GPIOR register should not be used
-					 *  in the user application except implicitly via the library APIs.
-					 *
-					 *  \note This global is only present if the user application can be a USB host.
-					 *
-					 *  \see \ref USB_Host_States_t for a list of possible device states.
-					 *
-					 *  \ingroup Group_Host
-					 */
-					extern volatile uint8_t USB_HostState;
-				#else
-					#define USB_HostState            CONCAT_EXPANDED(GPIOR, HOST_STATE_AS_GPIOR)
-				#endif
-			#endif
-
-			#if defined(USB_CAN_BE_DEVICE) || defined(__DOXYGEN__)
-				#if !defined(DEVICE_STATE_AS_GPIOR) || defined(__DOXYGEN__)
-					/** Indicates the current device state machine state. When in device mode, this indicates the state
-					 *  via one of the values of the \ref USB_Device_States_t enum values.
-					 *
-					 *  This value should not be altered by the user application as it is handled automatically by the
-					 *  library. The only exception to this rule is if the NO_LIMITED_CONTROLLER_CONNECT token is used
-					 *  (see \ref EVENT_USB_Device_Connect() and \ref EVENT_USB_Device_Disconnect() events).
-					 *
-					 *  To reduce program size and speed up checks of this global on the AVR8 architecture, it can be
-					 *  placed into one of the AVR's \c GPIOR hardware registers instead of RAM by defining the
-					 *  \c DEVICE_STATE_AS_GPIOR token to a value between 0 and 2 in the project makefile and passing it to
-					 *  the compiler via the -D switch. When defined, the corresponding GPIOR register should not be used
-					 *  in the user application except implicitly via the library APIs.
-					 *
-					 *  \attention This variable should be treated as read-only in the user application, and never manually
-					 *             changed in value except in the circumstances outlined above.
-					 *
-					 *  \note This global is only present if the user application can be a USB device.
-					 *        \n\n
-					 *
-					 *  \see \ref USB_Device_States_t for a list of possible device states.
-					 *
-					 *  \ingroup Group_Device
-					 */
-					extern volatile uint8_t USB_DeviceState;
-				#else
-					#define USB_DeviceState            CONCAT_EXPANDED(GPIOR, DEVICE_STATE_AS_GPIOR)
-				#endif
-			#endif
-
-		/* Function Prototypes: */
-			/** This is the main USB management task. The USB driver requires this task to be executed
-			 *  continuously when the USB system is active (device attached in host mode, or attached to a host
-			 *  in device mode) in order to manage USB communications. This task may be executed inside an RTOS,
-			 *  fast timer ISR or the main user application loop.
-			 *
-			 *  The USB task must be serviced within 30ms while in device mode, or within 1ms while in host mode.
-			 *  The task may be serviced at all times, or (for minimum CPU consumption):
-			 *
-			 *    - In device mode, it may be disabled at start-up, enabled on the firing of the \ref EVENT_USB_Device_Connect()
-			 *      event and disabled again on the firing of the \ref EVENT_USB_Device_Disconnect() event.
-			 *
-			 *    - In host mode, it may be disabled at start-up, enabled on the firing of the \ref EVENT_USB_Host_DeviceAttached()
-			 *      event and disabled again on the firing of the \ref EVENT_USB_Host_DeviceEnumerationComplete() or
-			 *      \ref EVENT_USB_Host_DeviceEnumerationFailed() events.
-			 *
-			 *  If in device mode (only), the control endpoint can instead be managed via interrupts entirely by the library
-			 *  by defining the INTERRUPT_CONTROL_ENDPOINT token and passing it to the compiler via the -D switch.
-			 *
-			 *  \see \ref Group_Events for more information on the USB events.
-			 *
-			 *  \ingroup Group_USBManagement
-			 */
-			void USB_USBTask(void);
-
-	/* Private Interface - For use in library only: */
-	#if !defined(__DOXYGEN__)
-		/* Function Prototypes: */
-			#if defined(__INCLUDE_FROM_USBTASK_C)
-				#if defined(USB_CAN_BE_HOST)
-					static void USB_HostTask(void);
-				#endif
-
-				#if defined(USB_CAN_BE_DEVICE)
-					static void USB_DeviceTask(void);
-				#endif
-			#endif
-
-		/* Macros: */
-			#define HOST_TASK_NONBLOCK_WAIT(Duration, NextState) do { USB_HostState   = HOST_STATE_WaitForDevice; \
-			                                                          WaitMSRemaining = (Duration);               \
-			                                                          PostWaitState   = (NextState);              } while (0)
-	#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Core/XMEGA/Device_XMEGA.c b/NativePrograms/LUFA/Drivers/USB/Core/XMEGA/Device_XMEGA.c
deleted file mode 100644
index f175a88714..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Core/XMEGA/Device_XMEGA.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-#include "../../../../Common/Common.h"
-#if (ARCH == ARCH_XMEGA)
-
-#define  __INCLUDE_FROM_USB_DRIVER
-#include "../USBMode.h"
-
-#if defined(USB_CAN_BE_DEVICE)
-
-#include "../Device.h"
-
-void USB_Device_SendRemoteWakeup(void)
-{
-	USB.CTRLB |= USB_RWAKEUP_bm;
-}
-
-#endif
-
-#endif
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Core/XMEGA/Device_XMEGA.h b/NativePrograms/LUFA/Drivers/USB/Core/XMEGA/Device_XMEGA.h
deleted file mode 100644
index b7113559e3..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Core/XMEGA/Device_XMEGA.h
+++ /dev/null
@@ -1,269 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief USB Device definitions for the AVR XMEGA microcontrollers.
- *  \copydetails Group_Device_XMEGA
- *
- *  \note This file should not be included directly. It is automatically included as needed by the USB driver
- *        dispatch header located in LUFA/Drivers/USB/USB.h.
- */
-
-/** \ingroup Group_Device
- *  \defgroup Group_Device_XMEGA Device Management (XMEGA)
- *  \brief USB Device definitions for the AVR XMEGA microcontrollers.
- *
- *  Architecture specific USB Device definitions for the Atmel AVR XMEGA microcontrollers.
- *
- *  @{
- */
-
-#ifndef __USBDEVICE_XMEGA_H__
-#define __USBDEVICE_XMEGA_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-		#include "../USBController.h"
-		#include "../StdDescriptors.h"
-		#include "../USBInterrupt.h"
-		#include "../Endpoint.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_USB_DRIVER)
-			#error Do not include this file directly. Include LUFA/Drivers/USB/USB.h instead.
-		#endif
-
-		#if (defined(USE_RAM_DESCRIPTORS) && defined(USE_EEPROM_DESCRIPTORS))
-			#error USE_RAM_DESCRIPTORS and USE_EEPROM_DESCRIPTORS are mutually exclusive.
-		#endif
-
-		#if (defined(USE_FLASH_DESCRIPTORS) && defined(USE_EEPROM_DESCRIPTORS))
-			#error USE_FLASH_DESCRIPTORS and USE_EEPROM_DESCRIPTORS are mutually exclusive.
-		#endif
-
-		#if (defined(USE_FLASH_DESCRIPTORS) && defined(USE_RAM_DESCRIPTORS))
-			#error USE_FLASH_DESCRIPTORS and USE_RAM_DESCRIPTORS are mutually exclusive.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** \name USB Device Mode Option Masks */
-			/**@{*/
-			/** Mask for the Options parameter of the \ref USB_Init() function. This indicates that the
-			 *  USB interface should be initialized in low speed (1.5Mb/s) mode.
-			 *
-			 *  \note Low Speed mode is not available on all USB AVR models.
-			 *        \n
-			 *
-			 *  \note Restrictions apply on the number, size and type of endpoints which can be used
-			 *        when running in low speed mode - refer to the USB 2.0 specification.
-			 */
-			#define USB_DEVICE_OPT_LOWSPEED        (1 << 0)
-
-			#if (F_USB > 6000000)
-				/** Mask for the Options parameter of the \ref USB_Init() function. This indicates that the
-				 *  USB interface should be initialized in full speed (12Mb/s) mode.
-				 */
-				#define USB_DEVICE_OPT_FULLSPEED   (0 << 0)
-			#endif
-			/**@}*/
-
-			#if (!defined(NO_INTERNAL_SERIAL) || defined(__DOXYGEN__))
-				/** String descriptor index for the device's unique serial number string descriptor within the device.
-				 *  This unique serial number is used by the host to associate resources to the device (such as drivers or COM port
-				 *  number allocations) to a device regardless of the port it is plugged in to on the host. Some microcontrollers contain
-				 *  a unique serial number internally, and setting the device descriptors serial number string index to this value
-				 *  will cause it to use the internal serial number.
-				 *
-				 *  On unsupported devices, this will evaluate to \ref NO_DESCRIPTOR and so will force the host to create a pseudo-serial
-				 *  number for the device.
-				 */
-				#ifndef USE_INTERNAL_SERIAL
-					#define USE_INTERNAL_SERIAL         0xDC
-				#endif
-
-				/** Length of the device's unique internal serial number, in bits, if present on the selected microcontroller
-				 *  model.
-				 */
-				#define INTERNAL_SERIAL_LENGTH_BITS     (8 * (1 + (offsetof(NVM_PROD_SIGNATURES_t, COORDY1) - offsetof(NVM_PROD_SIGNATURES_t, LOTNUM0))))
-
-				/** Start address of the internal serial number, in the appropriate address space, if present on the selected microcontroller
-				 *  model.
-				 */
-				#define INTERNAL_SERIAL_START_ADDRESS   offsetof(NVM_PROD_SIGNATURES_t, LOTNUM0)
-			#else
-				#undef	USE_INTERNAL_SERIAL
-				#define USE_INTERNAL_SERIAL             NO_DESCRIPTOR
-
-				#define INTERNAL_SERIAL_LENGTH_BITS     0
-				#define INTERNAL_SERIAL_START_ADDRESS   0
-			#endif
-
-		/* Function Prototypes: */
-			/** Sends a Remote Wakeup request to the host. This signals to the host that the device should
-			 *  be taken out of suspended mode, and communications should resume.
-			 *
-			 *  Typically, this is implemented so that HID devices (mice, keyboards, etc.) can wake up the
-			 *  host computer when the host has suspended all USB devices to enter a low power state.
-			 *
-			 *  \note This function should only be used if the device has indicated to the host that it
-			 *        supports the Remote Wakeup feature in the device descriptors, and should only be
-			 *        issued if the host is currently allowing remote wakeup events from the device (i.e.,
-			 *        the \ref USB_Device_RemoteWakeupEnabled flag is set). When the \c NO_DEVICE_REMOTE_WAKEUP
-			 *        compile time option is used, this function is unavailable.
-			 *        \n\n
-			 *
-			 *  \note The USB clock must be running for this function to operate. If the stack is initialized with
-			 *        the \ref USB_OPT_MANUAL_PLL option enabled, the user must ensure that the PLL is running
-			 *        before attempting to call this function.
-			 *
-			 *  \see \ref Group_StdDescriptors for more information on the RMWAKEUP feature and device descriptors.
-			 */
-			void USB_Device_SendRemoteWakeup(void);
-
-		/* Inline Functions: */
-			/** Returns the current USB frame number, when in device mode. Every millisecond the USB bus is active (i.e. enumerated to a host)
-			 *  the frame number is incremented by one.
-			 *
-			 *  \return Current USB frame number from the USB controller.
-			 */
-			static inline uint16_t USB_Device_GetFrameNumber(void) ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT;
-			static inline uint16_t USB_Device_GetFrameNumber(void)
-			{
-				return ((USB_EndpointTable_t*)USB.EPPTR)->FrameNum;
-			}
-
-			#if !defined(NO_SOF_EVENTS)
-			/** Enables the device mode Start Of Frame events. When enabled, this causes the
-			 *  \ref EVENT_USB_Device_StartOfFrame() event to fire once per millisecond, synchronized to the USB bus,
-			 *  at the start of each USB frame when enumerated in device mode.
-			 *
-			 *  \note This function is not available when the \c NO_SOF_EVENTS compile time token is defined.
-			 */
-			static inline void USB_Device_EnableSOFEvents(void) ATTR_ALWAYS_INLINE;
-			static inline void USB_Device_EnableSOFEvents(void)
-			{
-				USB.INTCTRLA |=  USB_SOFIE_bm;
-			}
-
-			/** Disables the device mode Start Of Frame events. When disabled, this stops the firing of the
-			 *  \ref EVENT_USB_Device_StartOfFrame() event when enumerated in device mode.
-			 *
-			 *  \note This function is not available when the \c NO_SOF_EVENTS compile time token is defined.
-			 */
-			static inline void USB_Device_DisableSOFEvents(void) ATTR_ALWAYS_INLINE;
-			static inline void USB_Device_DisableSOFEvents(void)
-			{
-				USB.INTCTRLA &= ~USB_SOFIE_bm;
-			}
-			#endif
-
-	/* Private Interface - For use in library only: */
-	#if !defined(__DOXYGEN__)
-		/* Inline Functions: */
-			static inline void USB_Device_SetLowSpeed(void) ATTR_ALWAYS_INLINE;
-			static inline void USB_Device_SetLowSpeed(void)
-			{
-				USB.CTRLA &= ~USB_SPEED_bm;
-			}
-
-			static inline void USB_Device_SetFullSpeed(void) ATTR_ALWAYS_INLINE;
-			static inline void USB_Device_SetFullSpeed(void)
-			{
-				USB.CTRLA |=  USB_SPEED_bm;
-			}
-
-			static inline void USB_Device_SetDeviceAddress(const uint8_t Address) ATTR_ALWAYS_INLINE;
-			static inline void USB_Device_SetDeviceAddress(const uint8_t Address)
-			{
-				(void)Address;
-
-				/* No implementation for XMEGA architecture */
-			}
-
-			static inline void USB_Device_EnableDeviceAddress(const uint8_t Address) ATTR_ALWAYS_INLINE;
-			static inline void USB_Device_EnableDeviceAddress(const uint8_t Address)
-			{
-				USB.ADDR = Address;
-			}
-
-			static inline bool USB_Device_IsAddressSet(void) ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT;
-			static inline bool USB_Device_IsAddressSet(void)
-			{
-				return ((USB.ADDR != 0) ? true : false);
-			}
-
-			static inline void USB_Device_GetSerialString(uint16_t* const UnicodeString) ATTR_NON_NULL_PTR_ARG(1);
-			static inline void USB_Device_GetSerialString(uint16_t* const UnicodeString)
-			{
-				uint_reg_t CurrentGlobalInt = GetGlobalInterruptMask();
-				GlobalInterruptDisable();
-
-				uint8_t SigReadAddress = INTERNAL_SERIAL_START_ADDRESS;
-
-				for (uint8_t SerialCharNum = 0; SerialCharNum < (INTERNAL_SERIAL_LENGTH_BITS / 4); SerialCharNum++)
-				{
-					uint8_t SerialByte;
-
-					NVM.CMD    = NVM_CMD_READ_CALIB_ROW_gc;
-					SerialByte = pgm_read_byte(SigReadAddress);
-					NVM.CMD    = 0;
-
-					if (SerialCharNum & 0x01)
-					{
-						SerialByte >>= 4;
-						SigReadAddress++;
-					}
-
-					SerialByte &= 0x0F;
-
-					UnicodeString[SerialCharNum] = cpu_to_le16((SerialByte >= 10) ?
-															   (('A' - 10) + SerialByte) : ('0' + SerialByte));
-				}
-
-				SetGlobalInterruptMask(CurrentGlobalInt);
-			}
-
-	#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Core/XMEGA/EndpointStream_XMEGA.c b/NativePrograms/LUFA/Drivers/USB/Core/XMEGA/EndpointStream_XMEGA.c
deleted file mode 100644
index c6d28cd20d..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Core/XMEGA/EndpointStream_XMEGA.c
+++ /dev/null
@@ -1,265 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-#include "../../../../Common/Common.h"
-#if (ARCH == ARCH_XMEGA)
-
-#define  __INCLUDE_FROM_USB_DRIVER
-#include "../USBMode.h"
-
-#if defined(USB_CAN_BE_DEVICE)
-
-#include "EndpointStream_XMEGA.h"
-
-#if !defined(CONTROL_ONLY_DEVICE)
-uint8_t Endpoint_Discard_Stream(uint16_t Length,
-                                uint16_t* const BytesProcessed)
-{
-	uint8_t  ErrorCode;
-	uint16_t BytesInTransfer = BytesProcessed ? *BytesProcessed : 0;
-
-	if ((ErrorCode = Endpoint_WaitUntilReady()))
-	  return ErrorCode;
-
-	while (BytesInTransfer < Length)
-	{
-		if (!(Endpoint_IsReadWriteAllowed()))
-		{
-			Endpoint_ClearOUT();
-
-			if (BytesProcessed != NULL)
-			{
-				*BytesProcessed = BytesInTransfer;
-				return ENDPOINT_RWSTREAM_IncompleteTransfer;
-			}
-
-			if ((ErrorCode = Endpoint_WaitUntilReady()))
-			  return ErrorCode;
-		}
-		else
-		{
-			Endpoint_Discard_8();
-			BytesInTransfer++;
-		}
-	}
-
-	return ENDPOINT_RWSTREAM_NoError;
-}
-
-uint8_t Endpoint_Null_Stream(uint16_t Length,
-                             uint16_t* const BytesProcessed)
-{
-	uint8_t  ErrorCode;
-	uint16_t BytesInTransfer = BytesProcessed ? *BytesProcessed : 0;
-
-	if ((ErrorCode = Endpoint_WaitUntilReady()))
-	  return ErrorCode;
-
-	while (BytesInTransfer < Length)
-	{
-		if (!(Endpoint_IsReadWriteAllowed()))
-		{
-			Endpoint_ClearIN();
-
-			if (BytesProcessed != NULL)
-			{
-				*BytesProcessed = BytesInTransfer;
-				return ENDPOINT_RWSTREAM_IncompleteTransfer;
-			}
-
-			if ((ErrorCode = Endpoint_WaitUntilReady()))
-			  return ErrorCode;
-		}
-		else
-		{
-			Endpoint_Write_8(0);
-			BytesInTransfer++;
-		}
-	}
-
-	return ENDPOINT_RWSTREAM_NoError;
-}
-
-/* The following abuses the C preprocessor in order to copy-paste common code with slight alterations,
- * so that the code needs to be written once. It is a crude form of templating to reduce code maintenance. */
-
-#define  TEMPLATE_FUNC_NAME                        Endpoint_Write_Stream_LE
-#define  TEMPLATE_BUFFER_TYPE                      const void*
-#define  TEMPLATE_CLEAR_ENDPOINT()                 Endpoint_ClearIN()
-#define  TEMPLATE_BUFFER_OFFSET(Length)            0
-#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount
-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(*BufferPtr)
-#include "Template/Template_Endpoint_RW.c"
-
-#define  TEMPLATE_FUNC_NAME                        Endpoint_Write_Stream_BE
-#define  TEMPLATE_BUFFER_TYPE                      const void*
-#define  TEMPLATE_CLEAR_ENDPOINT()                 Endpoint_ClearIN()
-#define  TEMPLATE_BUFFER_OFFSET(Length)            (Length - 1)
-#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount
-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(*BufferPtr)
-#include "Template/Template_Endpoint_RW.c"
-
-#define  TEMPLATE_FUNC_NAME                        Endpoint_Read_Stream_LE
-#define  TEMPLATE_BUFFER_TYPE                      void*
-#define  TEMPLATE_CLEAR_ENDPOINT()                 Endpoint_ClearOUT()
-#define  TEMPLATE_BUFFER_OFFSET(Length)            0
-#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount
-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *BufferPtr = Endpoint_Read_8()
-#include "Template/Template_Endpoint_RW.c"
-
-#define  TEMPLATE_FUNC_NAME                        Endpoint_Read_Stream_BE
-#define  TEMPLATE_BUFFER_TYPE                      void*
-#define  TEMPLATE_CLEAR_ENDPOINT()                 Endpoint_ClearOUT()
-#define  TEMPLATE_BUFFER_OFFSET(Length)            (Length - 1)
-#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount
-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *BufferPtr = Endpoint_Read_8()
-#include "Template/Template_Endpoint_RW.c"
-
-#if defined(ARCH_HAS_FLASH_ADDRESS_SPACE)
-	#define  TEMPLATE_FUNC_NAME                        Endpoint_Write_PStream_LE
-	#define  TEMPLATE_BUFFER_TYPE                      const void*
-	#define  TEMPLATE_CLEAR_ENDPOINT()                 Endpoint_ClearIN()
-	#define  TEMPLATE_BUFFER_OFFSET(Length)            0
-	#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount
-	#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(pgm_read_byte(BufferPtr))
-	#include "Template/Template_Endpoint_RW.c"
-
-	#define  TEMPLATE_FUNC_NAME                        Endpoint_Write_PStream_BE
-	#define  TEMPLATE_BUFFER_TYPE                      const void*
-	#define  TEMPLATE_CLEAR_ENDPOINT()                 Endpoint_ClearIN()
-	#define  TEMPLATE_BUFFER_OFFSET(Length)            (Length - 1)
-	#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount
-	#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(pgm_read_byte(BufferPtr))
-	#include "Template/Template_Endpoint_RW.c"
-#endif
-
-#if defined(ARCH_HAS_EEPROM_ADDRESS_SPACE)
-	#define  TEMPLATE_FUNC_NAME                        Endpoint_Write_EStream_LE
-	#define  TEMPLATE_BUFFER_TYPE                      const void*
-	#define  TEMPLATE_CLEAR_ENDPOINT()                 Endpoint_ClearIN()
-	#define  TEMPLATE_BUFFER_OFFSET(Length)            0
-	#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount
-	#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(eeprom_read_byte(BufferPtr))
-	#include "Template/Template_Endpoint_RW.c"
-
-	#define  TEMPLATE_FUNC_NAME                        Endpoint_Write_EStream_BE
-	#define  TEMPLATE_BUFFER_TYPE                      const void*
-	#define  TEMPLATE_CLEAR_ENDPOINT()                 Endpoint_ClearIN()
-	#define  TEMPLATE_BUFFER_OFFSET(Length)            (Length - 1)
-	#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount
-	#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(eeprom_read_byte(BufferPtr))
-	#include "Template/Template_Endpoint_RW.c"
-
-	#define  TEMPLATE_FUNC_NAME                        Endpoint_Read_EStream_LE
-	#define  TEMPLATE_BUFFER_TYPE                      void*
-	#define  TEMPLATE_CLEAR_ENDPOINT()                 Endpoint_ClearOUT()
-	#define  TEMPLATE_BUFFER_OFFSET(Length)            0
-	#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount
-	#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         eeprom_update_byte(BufferPtr, Endpoint_Read_8())
-	#include "Template/Template_Endpoint_RW.c"
-
-	#define  TEMPLATE_FUNC_NAME                        Endpoint_Read_EStream_BE
-	#define  TEMPLATE_BUFFER_TYPE                      void*
-	#define  TEMPLATE_CLEAR_ENDPOINT()                 Endpoint_ClearOUT()
-	#define  TEMPLATE_BUFFER_OFFSET(Length)            (Length - 1)
-	#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount
-	#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         eeprom_update_byte(BufferPtr, Endpoint_Read_8())
-	#include "Template/Template_Endpoint_RW.c"
-#endif
-
-#endif
-
-#define  TEMPLATE_FUNC_NAME                        Endpoint_Write_Control_Stream_LE
-#define  TEMPLATE_BUFFER_OFFSET(Length)            0
-#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount
-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(*BufferPtr)
-#include "Template/Template_Endpoint_Control_W.c"
-
-#define  TEMPLATE_FUNC_NAME                        Endpoint_Write_Control_Stream_BE
-#define  TEMPLATE_BUFFER_OFFSET(Length)            (Length - 1)
-#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount
-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(*BufferPtr)
-#include "Template/Template_Endpoint_Control_W.c"
-
-#define  TEMPLATE_FUNC_NAME                        Endpoint_Read_Control_Stream_LE
-#define  TEMPLATE_BUFFER_OFFSET(Length)            0
-#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount
-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *BufferPtr = Endpoint_Read_8()
-#include "Template/Template_Endpoint_Control_R.c"
-
-#define  TEMPLATE_FUNC_NAME                        Endpoint_Read_Control_Stream_BE
-#define  TEMPLATE_BUFFER_OFFSET(Length)            (Length - 1)
-#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount
-#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         *BufferPtr = Endpoint_Read_8()
-#include "Template/Template_Endpoint_Control_R.c"
-
-#if defined(ARCH_HAS_FLASH_ADDRESS_SPACE)
-	#define  TEMPLATE_FUNC_NAME                        Endpoint_Write_Control_PStream_LE
-	#define  TEMPLATE_BUFFER_OFFSET(Length)            0
-	#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount
-	#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(pgm_read_byte(BufferPtr))
-	#include "Template/Template_Endpoint_Control_W.c"
-
-	#define  TEMPLATE_FUNC_NAME                        Endpoint_Write_Control_PStream_BE
-	#define  TEMPLATE_BUFFER_OFFSET(Length)            (Length - 1)
-	#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount
-	#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(pgm_read_byte(BufferPtr))
-	#include "Template/Template_Endpoint_Control_W.c"
-#endif
-
-#if defined(ARCH_HAS_EEPROM_ADDRESS_SPACE)
-	#define  TEMPLATE_FUNC_NAME                        Endpoint_Write_Control_EStream_LE
-	#define  TEMPLATE_BUFFER_OFFSET(Length)            0
-	#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount
-	#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(eeprom_read_byte(BufferPtr))
-	#include "Template/Template_Endpoint_Control_W.c"
-
-	#define  TEMPLATE_FUNC_NAME                        Endpoint_Write_Control_EStream_BE
-	#define  TEMPLATE_BUFFER_OFFSET(Length)            (Length - 1)
-	#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount
-	#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         Endpoint_Write_8(eeprom_read_byte(BufferPtr))
-	#include "Template/Template_Endpoint_Control_W.c"
-
-	#define  TEMPLATE_FUNC_NAME                        Endpoint_Read_Control_EStream_LE
-	#define  TEMPLATE_BUFFER_OFFSET(Length)            0
-	#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr += Amount
-	#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         eeprom_update_byte(BufferPtr, Endpoint_Read_8())
-	#include "Template/Template_Endpoint_Control_R.c"
-
-	#define  TEMPLATE_FUNC_NAME                        Endpoint_Read_Control_EStream_BE
-	#define  TEMPLATE_BUFFER_OFFSET(Length)            (Length - 1)
-	#define  TEMPLATE_BUFFER_MOVE(BufferPtr, Amount)   BufferPtr -= Amount
-	#define  TEMPLATE_TRANSFER_BYTE(BufferPtr)         eeprom_update_byte(BufferPtr, Endpoint_Read_8())
-	#include "Template/Template_Endpoint_Control_R.c"
-#endif
-
-#endif
-
-#endif
diff --git a/NativePrograms/LUFA/Drivers/USB/Core/XMEGA/EndpointStream_XMEGA.h b/NativePrograms/LUFA/Drivers/USB/Core/XMEGA/EndpointStream_XMEGA.h
deleted file mode 100644
index 9c36465a60..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Core/XMEGA/EndpointStream_XMEGA.h
+++ /dev/null
@@ -1,658 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Endpoint data stream transmission and reception management for the AVR XMEGA microcontrollers.
- *  \copydetails Group_EndpointStreamRW_XMEGA
- *
- *  \note This file should not be included directly. It is automatically included as needed by the USB driver
- *        dispatch header located in LUFA/Drivers/USB/USB.h.
- */
-
-/** \ingroup Group_EndpointStreamRW
- *  \defgroup Group_EndpointStreamRW_XMEGA Read/Write of Multi-Byte Streams (XMEGA)
- *  \brief Endpoint data stream transmission and reception management for the Atmel AVR XMEGA architecture.
- *
- *  Functions, macros, variables, enums and types related to data reading and writing of data streams from
- *  and to endpoints.
- *
- *  @{
- */
-
-#ifndef __ENDPOINT_STREAM_XMEGA_H__
-#define __ENDPOINT_STREAM_XMEGA_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-		#include "../USBMode.h"
-		#include "../USBTask.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_USB_DRIVER)
-			#error Do not include this file directly. Include LUFA/Drivers/USB/USB.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Function Prototypes: */
-			/** \name Stream functions for null data */
-			/**@{*/
-
-			/** Reads and discards the given number of bytes from the currently selected endpoint's bank,
-			 *  discarding fully read packets from the host as needed. The last packet is not automatically
-			 *  discarded once the remaining bytes has been read; the user is responsible for manually
-			 *  discarding the last packet from the host via the \ref Endpoint_ClearOUT() macro.
-			 *
-			 *  If the BytesProcessed parameter is \c NULL, the entire stream transfer is attempted at once,
-			 *  failing or succeeding as a single unit. If the BytesProcessed parameter points to a valid
-			 *  storage location, the transfer will instead be performed as a series of chunks. Each time
-			 *  the endpoint bank becomes empty while there is still data to process (and after the current
-			 *  packet has been acknowledged) the BytesProcessed location will be updated with the total number
-			 *  of bytes processed in the stream, and the function will exit with an error code of
-			 *  \ref ENDPOINT_RWSTREAM_IncompleteTransfer. This allows for any abort checking to be performed
-			 *  in the user code - to continue the transfer, call the function again with identical parameters
-			 *  and it will resume until the BytesProcessed value reaches the total transfer length.
-			 *
-			 *  <b>Single Stream Transfer Example:</b>
-			 *  \code
-			 *  uint8_t ErrorCode;
-			 *
-			 *  if ((ErrorCode = Endpoint_Discard_Stream(512, NULL)) != ENDPOINT_RWSTREAM_NoError)
-			 *  {
-			 *       // Stream failed to complete - check ErrorCode here
-			 *  }
-			 *  \endcode
-			 *
-			 *  <b>Partial Stream Transfers Example:</b>
-			 *  \code
-			 *  uint8_t  ErrorCode;
-			 *  uint16_t BytesProcessed;
-			 *
-			 *  BytesProcessed = 0;
-			 *  while ((ErrorCode = Endpoint_Discard_Stream(512, &BytesProcessed)) == ENDPOINT_RWSTREAM_IncompleteTransfer)
-			 *  {
-			 *      // Stream not yet complete - do other actions here, abort if required
-			 *  }
-			 *
-			 *  if (ErrorCode != ENDPOINT_RWSTREAM_NoError)
-			 *  {
-			 *      // Stream failed to complete - check ErrorCode here
-			 *  }
-			 *  \endcode
-			 *
-			 *  \note This routine should not be used on CONTROL type endpoints.
-			 *
-			 *  \param[in] Length          Number of bytes to discard via the currently selected endpoint.
-			 *  \param[in] BytesProcessed  Pointer to a location where the total number of bytes processed in the current
-			 *                             transaction should be updated, \c NULL if the entire stream should be read at once.
-			 *
-			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Endpoint_Discard_Stream(uint16_t Length,
-			                                uint16_t* const BytesProcessed);
-
-			/** Writes a given number of zeroed bytes to the currently selected endpoint's bank, sending
-			 *  full packets to the host as needed. The last packet is not automatically sent once the
-			 *  remaining bytes have been written; the user is responsible for manually sending the last
-			 *  packet to the host via the \ref Endpoint_ClearIN() macro.
-			 *
-			 *  If the BytesProcessed parameter is \c NULL, the entire stream transfer is attempted at once,
-			 *  failing or succeeding as a single unit. If the BytesProcessed parameter points to a valid
-			 *  storage location, the transfer will instead be performed as a series of chunks. Each time
-			 *  the endpoint bank becomes full while there is still data to process (and after the current
-			 *  packet transmission has been initiated) the BytesProcessed location will be updated with the
-			 *  total number of bytes processed in the stream, and the function will exit with an error code of
-			 *  \ref ENDPOINT_RWSTREAM_IncompleteTransfer. This allows for any abort checking to be performed
-			 *  in the user code - to continue the transfer, call the function again with identical parameters
-			 *  and it will resume until the BytesProcessed value reaches the total transfer length.
-			 *
-			 *  <b>Single Stream Transfer Example:</b>
-			 *  \code
-			 *  uint8_t ErrorCode;
-			 *
-			 *  if ((ErrorCode = Endpoint_Null_Stream(512, NULL)) != ENDPOINT_RWSTREAM_NoError)
-			 *  {
-			 *       // Stream failed to complete - check ErrorCode here
-			 *  }
-			 *  \endcode
-			 *
-			 *  <b>Partial Stream Transfers Example:</b>
-			 *  \code
-			 *  uint8_t  ErrorCode;
-			 *  uint16_t BytesProcessed;
-			 *
-			 *  BytesProcessed = 0;
-			 *  while ((ErrorCode = Endpoint_Null_Stream(512, &BytesProcessed)) == ENDPOINT_RWSTREAM_IncompleteTransfer)
-			 *  {
-			 *      // Stream not yet complete - do other actions here, abort if required
-			 *  }
-			 *
-			 *  if (ErrorCode != ENDPOINT_RWSTREAM_NoError)
-			 *  {
-			 *      // Stream failed to complete - check ErrorCode here
-			 *  }
-			 *  \endcode
-			 *
-			 *  \note This routine should not be used on CONTROL type endpoints.
-			 *
-			 *  \param[in] Length          Number of zero bytes to send via the currently selected endpoint.
-			 *  \param[in] BytesProcessed  Pointer to a location where the total number of bytes processed in the current
-			 *                             transaction should be updated, \c NULL if the entire stream should be read at once.
-			 *
-			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Endpoint_Null_Stream(uint16_t Length,
-			                             uint16_t* const BytesProcessed);
-
-			/**@}*/
-
-			/** \name Stream functions for RAM source/destination data */
-			/**@{*/
-
-			/** Writes the given number of bytes to the endpoint from the given buffer in little endian,
-			 *  sending full packets to the host as needed. The last packet filled is not automatically sent;
-			 *  the user is responsible for manually sending the last written packet to the host via the
-			 *  \ref Endpoint_ClearIN() macro.
-			 *
-			 *  If the BytesProcessed parameter is \c NULL, the entire stream transfer is attempted at once,
-			 *  failing or succeeding as a single unit. If the BytesProcessed parameter points to a valid
-			 *  storage location, the transfer will instead be performed as a series of chunks. Each time
-			 *  the endpoint bank becomes full while there is still data to process (and after the current
-			 *  packet transmission has been initiated) the BytesProcessed location will be updated with the
-			 *  total number of bytes processed in the stream, and the function will exit with an error code of
-			 *  \ref ENDPOINT_RWSTREAM_IncompleteTransfer. This allows for any abort checking to be performed
-			 *  in the user code - to continue the transfer, call the function again with identical parameters
-			 *  and it will resume until the BytesProcessed value reaches the total transfer length.
-			 *
-			 *  <b>Single Stream Transfer Example:</b>
-			 *  \code
-			 *  uint8_t DataStream[512];
-			 *  uint8_t ErrorCode;
-			 *
-			 *  if ((ErrorCode = Endpoint_Write_Stream_LE(DataStream, sizeof(DataStream),
-			 *                                            NULL)) != ENDPOINT_RWSTREAM_NoError)
-			 *  {
-			 *       // Stream failed to complete - check ErrorCode here
-			 *  }
-			 *  \endcode
-			 *
-			 *  <b>Partial Stream Transfers Example:</b>
-			 *  \code
-			 *  uint8_t  DataStream[512];
-			 *  uint8_t  ErrorCode;
-			 *  uint16_t BytesProcessed;
-			 *
-			 *  BytesProcessed = 0;
-			 *  while ((ErrorCode = Endpoint_Write_Stream_LE(DataStream, sizeof(DataStream),
-			 *                                               &BytesProcessed)) == ENDPOINT_RWSTREAM_IncompleteTransfer)
-			 *  {
-			 *      // Stream not yet complete - do other actions here, abort if required
-			 *  }
-			 *
-			 *  if (ErrorCode != ENDPOINT_RWSTREAM_NoError)
-			 *  {
-			 *      // Stream failed to complete - check ErrorCode here
-			 *  }
-			 *  \endcode
-			 *
-			 *  \note This routine should not be used on CONTROL type endpoints.
-			 *
-			 *  \param[in] Buffer          Pointer to the source data buffer to read from.
-			 *  \param[in] Length          Number of bytes to read for the currently selected endpoint into the buffer.
-			 *  \param[in] BytesProcessed  Pointer to a location where the total number of bytes processed in the current
-			 *                             transaction should be updated, \c NULL if the entire stream should be written at once.
-			 *
-			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Endpoint_Write_Stream_LE(const void* const Buffer,
-			                                 uint16_t Length,
-			                                 uint16_t* const BytesProcessed) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Writes the given number of bytes to the endpoint from the given buffer in big endian,
-			 *  sending full packets to the host as needed. The last packet filled is not automatically sent;
-			 *  the user is responsible for manually sending the last written packet to the host via the
-			 *  \ref Endpoint_ClearIN() macro.
-			 *
-			 *  \note This routine should not be used on CONTROL type endpoints.
-			 *
-			 *  \param[in] Buffer          Pointer to the source data buffer to read from.
-			 *  \param[in] Length          Number of bytes to read for the currently selected endpoint into the buffer.
-			 *  \param[in] BytesProcessed  Pointer to a location where the total number of bytes processed in the current
-			 *                             transaction should be updated, \c NULL if the entire stream should be written at once.
-			 *
-			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Endpoint_Write_Stream_BE(const void* const Buffer,
-			                                 uint16_t Length,
-			                                 uint16_t* const BytesProcessed) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Reads the given number of bytes from the endpoint from the given buffer in little endian,
-			 *  discarding fully read packets from the host as needed. The last packet is not automatically
-			 *  discarded once the remaining bytes has been read; the user is responsible for manually
-			 *  discarding the last packet from the host via the \ref Endpoint_ClearOUT() macro.
-			 *
-			 *  If the BytesProcessed parameter is \c NULL, the entire stream transfer is attempted at once,
-			 *  failing or succeeding as a single unit. If the BytesProcessed parameter points to a valid
-			 *  storage location, the transfer will instead be performed as a series of chunks. Each time
-			 *  the endpoint bank becomes empty while there is still data to process (and after the current
-			 *  packet has been acknowledged) the BytesProcessed location will be updated with the total number
-			 *  of bytes processed in the stream, and the function will exit with an error code of
-			 *  \ref ENDPOINT_RWSTREAM_IncompleteTransfer. This allows for any abort checking to be performed
-			 *  in the user code - to continue the transfer, call the function again with identical parameters
-			 *  and it will resume until the BytesProcessed value reaches the total transfer length.
-			 *
-			 *  <b>Single Stream Transfer Example:</b>
-			 *  \code
-			 *  uint8_t DataStream[512];
-			 *  uint8_t ErrorCode;
-			 *
-			 *  if ((ErrorCode = Endpoint_Read_Stream_LE(DataStream, sizeof(DataStream),
-			 *                                           NULL)) != ENDPOINT_RWSTREAM_NoError)
-			 *  {
-			 *       // Stream failed to complete - check ErrorCode here
-			 *  }
-			 *  \endcode
-			 *
-			 *  <b>Partial Stream Transfers Example:</b>
-			 *  \code
-			 *  uint8_t  DataStream[512];
-			 *  uint8_t  ErrorCode;
-			 *  uint16_t BytesProcessed;
-			 *
-			 *  BytesProcessed = 0;
-			 *  while ((ErrorCode = Endpoint_Read_Stream_LE(DataStream, sizeof(DataStream),
-			 *                                              &BytesProcessed)) == ENDPOINT_RWSTREAM_IncompleteTransfer)
-			 *  {
-			 *      // Stream not yet complete - do other actions here, abort if required
-			 *  }
-			 *
-			 *  if (ErrorCode != ENDPOINT_RWSTREAM_NoError)
-			 *  {
-			 *      // Stream failed to complete - check ErrorCode here
-			 *  }
-			 *  \endcode
-			 *
-			 *  \note This routine should not be used on CONTROL type endpoints.
-			 *
-			 *  \param[out] Buffer          Pointer to the destination data buffer to write to.
-			 *  \param[in]  Length          Number of bytes to send via the currently selected endpoint.
-			 *  \param[in]  BytesProcessed  Pointer to a location where the total number of bytes processed in the current
-			 *                              transaction should be updated, \c NULL if the entire stream should be read at once.
-			 *
-			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Endpoint_Read_Stream_LE(void* const Buffer,
-			                                uint16_t Length,
-			                                uint16_t* const BytesProcessed) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Reads the given number of bytes from the endpoint from the given buffer in big endian,
-			 *  discarding fully read packets from the host as needed. The last packet is not automatically
-			 *  discarded once the remaining bytes has been read; the user is responsible for manually
-			 *  discarding the last packet from the host via the \ref Endpoint_ClearOUT() macro.
-			 *
-			 *  \note This routine should not be used on CONTROL type endpoints.
-			 *
-			 *  \param[out] Buffer          Pointer to the destination data buffer to write to.
-			 *  \param[in]  Length          Number of bytes to send via the currently selected endpoint.
-			 *  \param[in]  BytesProcessed  Pointer to a location where the total number of bytes processed in the current
-			 *                              transaction should be updated, \c NULL if the entire stream should be read at once.
-			 *
-			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Endpoint_Read_Stream_BE(void* const Buffer,
-			                                uint16_t Length,
-			                                uint16_t* const BytesProcessed) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Writes the given number of bytes to the CONTROL type endpoint from the given buffer in little endian,
-			 *  sending full packets to the host as needed. The host OUT acknowledgement is not automatically cleared
-			 *  in both failure and success states; the user is responsible for manually clearing the status OUT packet
-			 *  to finalize the transfer's status stage via the \ref Endpoint_ClearOUT() macro.
-			 *
-			 *  \note This function automatically sends the last packet in the data stage of the transaction; when the
-			 *        function returns, the user is responsible for clearing the <b>status</b> stage of the transaction.
-			 *        Note that the status stage packet is sent or received in the opposite direction of the data flow.
-			 *        \n\n
-			 *
-			 *  \note This routine should only be used on CONTROL type endpoints.
-			 *
-			 *  \warning Unlike the standard stream read/write commands, the control stream commands cannot be chained
-			 *           together; i.e. the entire stream data must be read or written at the one time.
-			 *
-			 *  \param[in] Buffer  Pointer to the source data buffer to read from.
-			 *  \param[in] Length  Number of bytes to read for the currently selected endpoint into the buffer.
-			 *
-			 *  \return A value from the \ref Endpoint_ControlStream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Endpoint_Write_Control_Stream_LE(const void* const Buffer,
-			                                         uint16_t Length) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Writes the given number of bytes to the CONTROL type endpoint from the given buffer in big endian,
-			 *  sending full packets to the host as needed. The host OUT acknowledgement is not automatically cleared
-			 *  in both failure and success states; the user is responsible for manually clearing the status OUT packet
-			 *  to finalize the transfer's status stage via the \ref Endpoint_ClearOUT() macro.
-			 *
-			 *  \note This function automatically sends the last packet in the data stage of the transaction; when the
-			 *        function returns, the user is responsible for clearing the <b>status</b> stage of the transaction.
-			 *        Note that the status stage packet is sent or received in the opposite direction of the data flow.
-			 *        \n\n
-			 *
-			 *  \note This routine should only be used on CONTROL type endpoints.
-			 *
-			 *  \warning Unlike the standard stream read/write commands, the control stream commands cannot be chained
-			 *           together; i.e. the entire stream data must be read or written at the one time.
-			 *
-			 *  \param[in] Buffer  Pointer to the source data buffer to read from.
-			 *  \param[in] Length  Number of bytes to read for the currently selected endpoint into the buffer.
-			 *
-			 *  \return A value from the \ref Endpoint_ControlStream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Endpoint_Write_Control_Stream_BE(const void* const Buffer,
-			                                         uint16_t Length) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Reads the given number of bytes from the CONTROL endpoint from the given buffer in little endian,
-			 *  discarding fully read packets from the host as needed. The device IN acknowledgement is not
-			 *  automatically sent after success or failure states; the user is responsible for manually sending the
-			 *  status IN packet to finalize the transfer's status stage via the \ref Endpoint_ClearIN() macro.
-			 *
-			 *  \note This function automatically sends the last packet in the data stage of the transaction; when the
-			 *        function returns, the user is responsible for clearing the <b>status</b> stage of the transaction.
-			 *        Note that the status stage packet is sent or received in the opposite direction of the data flow.
-			 *        \n\n
-			 *
-			 *  \note This routine should only be used on CONTROL type endpoints.
-			 *
-			 *  \warning Unlike the standard stream read/write commands, the control stream commands cannot be chained
-			 *           together; i.e. the entire stream data must be read or written at the one time.
-			 *
-			 *  \param[out] Buffer  Pointer to the destination data buffer to write to.
-			 *  \param[in]  Length  Number of bytes to send via the currently selected endpoint.
-			 *
-			 *  \return A value from the \ref Endpoint_ControlStream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Endpoint_Read_Control_Stream_LE(void* const Buffer,
-			                                        uint16_t Length) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** Reads the given number of bytes from the CONTROL endpoint from the given buffer in big endian,
-			 *  discarding fully read packets from the host as needed. The device IN acknowledgement is not
-			 *  automatically sent after success or failure states; the user is responsible for manually sending the
-			 *  status IN packet to finalize the transfer's status stage via the \ref Endpoint_ClearIN() macro.
-			 *
-			 *  \note This function automatically sends the last packet in the data stage of the transaction; when the
-			 *        function returns, the user is responsible for clearing the <b>status</b> stage of the transaction.
-			 *        Note that the status stage packet is sent or received in the opposite direction of the data flow.
-			 *        \n\n
-			 *
-			 *  \note This routine should only be used on CONTROL type endpoints.
-			 *
-			 *  \warning Unlike the standard stream read/write commands, the control stream commands cannot be chained
-			 *           together; i.e. the entire stream data must be read or written at the one time.
-			 *
-			 *  \param[out] Buffer  Pointer to the destination data buffer to write to.
-			 *  \param[in]  Length  Number of bytes to send via the currently selected endpoint.
-			 *
-			 *  \return A value from the \ref Endpoint_ControlStream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Endpoint_Read_Control_Stream_BE(void* const Buffer,
-			                                        uint16_t Length) ATTR_NON_NULL_PTR_ARG(1);
-			/**@}*/
-
-			/** \name Stream functions for EEPROM source/destination data */
-			/**@{*/
-
-			/** EEPROM buffer source version of \ref Endpoint_Write_Stream_LE().
-			 *
-			 *  \param[in] Buffer          Pointer to the source data buffer to read from.
-			 *  \param[in] Length          Number of bytes to read for the currently selected endpoint into the buffer.
-			 *  \param[in] BytesProcessed  Pointer to a location where the total number of bytes processed in the current
-			 *                             transaction should be updated, \c NULL if the entire stream should be written at once.
-			 *
-			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Endpoint_Write_EStream_LE(const void* const Buffer,
-			                                  uint16_t Length,
-			                                  uint16_t* const BytesProcessed) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** EEPROM buffer source version of \ref Endpoint_Write_Stream_BE().
-			 *
-			 *  \param[in] Buffer          Pointer to the source data buffer to read from.
-			 *  \param[in] Length          Number of bytes to read for the currently selected endpoint into the buffer.
-			 *  \param[in] BytesProcessed  Pointer to a location where the total number of bytes processed in the current
-			 *                             transaction should be updated, \c NULL if the entire stream should be written at once.
-			 *
-			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Endpoint_Write_EStream_BE(const void* const Buffer,
-			                                  uint16_t Length,
-			                                  uint16_t* const BytesProcessed) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** EEPROM buffer destination version of \ref Endpoint_Read_Stream_LE().
-			 *
-			 *  \param[out] Buffer          Pointer to the destination data buffer to write to, located in EEPROM memory space.
-			 *  \param[in]  Length          Number of bytes to send via the currently selected endpoint.
-			 *  \param[in]  BytesProcessed  Pointer to a location where the total number of bytes processed in the current
-			 *                              transaction should be updated, \c NULL if the entire stream should be read at once.
-			 *
-			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Endpoint_Read_EStream_LE(void* const Buffer,
-			                                 uint16_t Length,
-			                                 uint16_t* const BytesProcessed) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** EEPROM buffer destination version of \ref Endpoint_Read_Stream_BE().
-			 *
-			 *  \param[out] Buffer          Pointer to the destination data buffer to write to, located in EEPROM memory space.
-			 *  \param[in]  Length          Number of bytes to send via the currently selected endpoint.
-			 *  \param[in]  BytesProcessed  Pointer to a location where the total number of bytes processed in the current
-			 *                              transaction should be updated, \c NULL if the entire stream should be read at once.
-			 *
-			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Endpoint_Read_EStream_BE(void* const Buffer,
-			                                 uint16_t Length,
-			                                 uint16_t* const BytesProcessed) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** EEPROM buffer source version of Endpoint_Write_Control_Stream_LE.
-			 *
-			 *  \note This function automatically sends the last packet in the data stage of the transaction; when the
-			 *        function returns, the user is responsible for clearing the <b>status</b> stage of the transaction.
-			 *        Note that the status stage packet is sent or received in the opposite direction of the data flow.
-			 *        \n\n
-			 *
-			 *  \note This routine should only be used on CONTROL type endpoints.
-			 *        \n\n
-			 *
-			 *  \warning Unlike the standard stream read/write commands, the control stream commands cannot be chained
-			 *           together; i.e. the entire stream data must be read or written at the one time.
-			 *
-			 *  \param[in] Buffer  Pointer to the source data buffer to read from.
-			 *  \param[in] Length  Number of bytes to read for the currently selected endpoint into the buffer.
-			 *
-			 *  \return A value from the \ref Endpoint_ControlStream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Endpoint_Write_Control_EStream_LE(const void* const Buffer,
-			                                          uint16_t Length) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** EEPROM buffer source version of \ref Endpoint_Write_Control_Stream_BE().
-			 *
-			 *  \note This function automatically sends the last packet in the data stage of the transaction; when the
-			 *        function returns, the user is responsible for clearing the <b>status</b> stage of the transaction.
-			 *        Note that the status stage packet is sent or received in the opposite direction of the data flow.
-			 *        \n\n
-			 *
-			 *  \note This routine should only be used on CONTROL type endpoints.
-			 *        \n\n
-			 *
-			 *  \warning Unlike the standard stream read/write commands, the control stream commands cannot be chained
-			 *           together; i.e. the entire stream data must be read or written at the one time.
-			 *
-			 *  \param[in] Buffer  Pointer to the source data buffer to read from.
-			 *  \param[in] Length  Number of bytes to read for the currently selected endpoint into the buffer.
-			 *
-			 *  \return A value from the \ref Endpoint_ControlStream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Endpoint_Write_Control_EStream_BE(const void* const Buffer,
-			                                          uint16_t Length) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** EEPROM buffer source version of \ref Endpoint_Read_Control_Stream_LE().
-			 *
-			 *  \note This function automatically sends the last packet in the data stage of the transaction; when the
-			 *        function returns, the user is responsible for clearing the <b>status</b> stage of the transaction.
-			 *        Note that the status stage packet is sent or received in the opposite direction of the data flow.
-			 *        \n\n
-			 *
-			 *  \note This routine should only be used on CONTROL type endpoints.
-			 *        \n\n
-			 *
-			 *  \warning Unlike the standard stream read/write commands, the control stream commands cannot be chained
-			 *           together; i.e. the entire stream data must be read or written at the one time.
-			 *
-			 *  \param[out] Buffer  Pointer to the destination data buffer to write to.
-			 *  \param[in]  Length  Number of bytes to send via the currently selected endpoint.
-			 *
-			 *  \return A value from the \ref Endpoint_ControlStream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Endpoint_Read_Control_EStream_LE(void* const Buffer,
-			                                         uint16_t Length) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** EEPROM buffer source version of \ref Endpoint_Read_Control_Stream_BE().
-			 *
-			 *  \note This function automatically sends the last packet in the data stage of the transaction; when the
-			 *        function returns, the user is responsible for clearing the <b>status</b> stage of the transaction.
-			 *        Note that the status stage packet is sent or received in the opposite direction of the data flow.
-			 *        \n\n
-			 *
-			 *  \note This routine should only be used on CONTROL type endpoints.
-			 *        \n\n
-			 *
-			 *  \warning Unlike the standard stream read/write commands, the control stream commands cannot be chained
-			 *           together; i.e. the entire stream data must be read or written at the one time.
-			 *
-			 *  \param[out] Buffer  Pointer to the destination data buffer to write to.
-			 *  \param[in]  Length  Number of bytes to send via the currently selected endpoint.
-			 *
-			 *  \return A value from the \ref Endpoint_ControlStream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Endpoint_Read_Control_EStream_BE(void* const Buffer,
-			                                         uint16_t Length) ATTR_NON_NULL_PTR_ARG(1);
-			/**@}*/
-
-			/** \name Stream functions for PROGMEM source/destination data */
-			/**@{*/
-
-			/** FLASH buffer source version of \ref Endpoint_Write_Stream_LE().
-			 *
-			 *  \pre The FLASH data must be located in the first 64KB of FLASH for this function to work correctly.
-			 *
-			 *  \param[in] Buffer          Pointer to the source data buffer to read from.
-			 *  \param[in] Length          Number of bytes to read for the currently selected endpoint into the buffer.
-			 *  \param[in] BytesProcessed  Pointer to a location where the total number of bytes processed in the current
-			 *                             transaction should be updated, \c NULL if the entire stream should be written at once.
-			 *
-			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Endpoint_Write_PStream_LE(const void* const Buffer,
-			                                  uint16_t Length,
-			                                  uint16_t* const BytesProcessed) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** FLASH buffer source version of \ref Endpoint_Write_Stream_BE().
-			 *
-			 *  \pre The FLASH data must be located in the first 64KB of FLASH for this function to work correctly.
-			 *
-			 *  \param[in] Buffer          Pointer to the source data buffer to read from.
-			 *  \param[in] Length          Number of bytes to read for the currently selected endpoint into the buffer.
-			 *  \param[in] BytesProcessed  Pointer to a location where the total number of bytes processed in the current
-			 *                             transaction should be updated, \c NULL if the entire stream should be written at once.
-			 *
-			 *  \return A value from the \ref Endpoint_Stream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Endpoint_Write_PStream_BE(const void* const Buffer,
-			                                  uint16_t Length,
-			                                  uint16_t* const BytesProcessed) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** FLASH buffer source version of \ref Endpoint_Write_Control_Stream_LE().
-			 *
-			 *  \pre The FLASH data must be located in the first 64KB of FLASH for this function to work correctly.
-			 *
-			 *  \note This function automatically sends the last packet in the data stage of the transaction; when the
-			 *        function returns, the user is responsible for clearing the <b>status</b> stage of the transaction.
-			 *        Note that the status stage packet is sent or received in the opposite direction of the data flow.
-			 *        \n\n
-			 *
-			 *  \note This routine should only be used on CONTROL type endpoints.
-			 *        \n\n
-			 *
-			 *  \warning Unlike the standard stream read/write commands, the control stream commands cannot be chained
-			 *           together; i.e. the entire stream data must be read or written at the one time.
-			 *
-			 *  \param[in] Buffer  Pointer to the source data buffer to read from.
-			 *  \param[in] Length  Number of bytes to read for the currently selected endpoint into the buffer.
-			 *
-			 *  \return A value from the \ref Endpoint_ControlStream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Endpoint_Write_Control_PStream_LE(const void* const Buffer,
-			                                          uint16_t Length) ATTR_NON_NULL_PTR_ARG(1);
-
-			/** FLASH buffer source version of \ref Endpoint_Write_Control_Stream_BE().
-			 *
-			 *  \pre The FLASH data must be located in the first 64KB of FLASH for this function to work correctly.
-			 *
-			 *  \note This function automatically sends the last packet in the data stage of the transaction; when the
-			 *        function returns, the user is responsible for clearing the <b>status</b> stage of the transaction.
-			 *        Note that the status stage packet is sent or received in the opposite direction of the data flow.
-			 *        \n\n
-			 *
-			 *  \note This routine should only be used on CONTROL type endpoints.
-			 *        \n\n
-			 *
-			 *  \warning Unlike the standard stream read/write commands, the control stream commands cannot be chained
-			 *           together; i.e. the entire stream data must be read or written at the one time.
-			 *
-			 *  \param[in] Buffer  Pointer to the source data buffer to read from.
-			 *  \param[in] Length  Number of bytes to read for the currently selected endpoint into the buffer.
-			 *
-			 *  \return A value from the \ref Endpoint_ControlStream_RW_ErrorCodes_t enum.
-			 */
-			uint8_t Endpoint_Write_Control_PStream_BE(const void* const Buffer,
-			                                          uint16_t Length) ATTR_NON_NULL_PTR_ARG(1);
-			/**@}*/
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Core/XMEGA/Endpoint_XMEGA.c b/NativePrograms/LUFA/Drivers/USB/Core/XMEGA/Endpoint_XMEGA.c
deleted file mode 100644
index 8ec545efd7..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Core/XMEGA/Endpoint_XMEGA.c
+++ /dev/null
@@ -1,268 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-#include "../../../../Common/Common.h"
-#if (ARCH == ARCH_XMEGA)
-
-#define  __INCLUDE_FROM_USB_DRIVER
-#include "../USBMode.h"
-
-#if defined(USB_CAN_BE_DEVICE)
-
-#include "../Endpoint.h"
-
-#if !defined(FIXED_CONTROL_ENDPOINT_SIZE)
-uint8_t USB_Device_ControlEndpointSize = ENDPOINT_CONTROLEP_DEFAULT_SIZE;
-#endif
-
-Endpoint_FIFOPair_t       USB_Endpoint_FIFOs[ENDPOINT_TOTAL_ENDPOINTS];
-
-volatile uint8_t          USB_Endpoint_SelectedEndpoint;
-volatile USB_EP_t*        USB_Endpoint_SelectedHandle;
-volatile Endpoint_FIFO_t* USB_Endpoint_SelectedFIFO;
-
-bool Endpoint_IsINReady(void)
-{
-	Endpoint_SelectEndpoint(USB_Endpoint_SelectedEndpoint | ENDPOINT_DIR_IN);
-
-	return ((USB_Endpoint_SelectedHandle->STATUS & USB_EP_BUSNACK0_bm) ? true : false);
-}
-
-bool Endpoint_IsOUTReceived(void)
-{
-	Endpoint_SelectEndpoint(USB_Endpoint_SelectedEndpoint & ~ENDPOINT_DIR_IN);
-
-	if (USB_Endpoint_SelectedHandle->STATUS & USB_EP_TRNCOMPL0_bm)
-	{
-		USB_Endpoint_SelectedFIFO->Length = USB_Endpoint_SelectedHandle->CNT;
-		return true;
-	}
-
-	return false;
-}
-
-bool Endpoint_IsSETUPReceived(void)
-{
-	Endpoint_SelectEndpoint(USB_Endpoint_SelectedEndpoint & ~ENDPOINT_DIR_IN);
-
-	if (USB_Endpoint_SelectedHandle->STATUS & USB_EP_SETUP_bm)
-	{
-		USB_Endpoint_SelectedFIFO->Length = USB_Endpoint_SelectedHandle->CNT;
-		return true;
-	}
-
-	return false;
-}
-
-void Endpoint_ClearSETUP(void)
-{
-	Endpoint_SelectEndpoint(USB_Endpoint_SelectedEndpoint & ~ENDPOINT_DIR_IN);
-	USB_Endpoint_SelectedHandle->STATUS &= ~(USB_EP_SETUP_bm | USB_EP_TRNCOMPL0_bm | USB_EP_BUSNACK0_bm | USB_EP_OVF_bm);
-	USB_Endpoint_SelectedHandle->STATUS |= USB_EP_TOGGLE_bm;
-	USB_Endpoint_SelectedFIFO->Position  = 0;
-
-	Endpoint_SelectEndpoint(USB_Endpoint_SelectedEndpoint | ENDPOINT_DIR_IN);
-	USB_Endpoint_SelectedHandle->STATUS |= USB_EP_TOGGLE_bm;
-	USB_Endpoint_SelectedFIFO->Position  = 0;
-}
-
-void Endpoint_ClearIN(void)
-{
-	USB_Endpoint_SelectedHandle->CNT     = USB_Endpoint_SelectedFIFO->Position;
-	USB_Endpoint_SelectedHandle->STATUS &= ~(USB_EP_TRNCOMPL0_bm | USB_EP_BUSNACK0_bm | USB_EP_OVF_bm);
-	USB_Endpoint_SelectedFIFO->Position  = 0;
-}
-
-void Endpoint_ClearOUT(void)
-{
-	USB_Endpoint_SelectedHandle->STATUS &= ~(USB_EP_TRNCOMPL0_bm | USB_EP_BUSNACK0_bm | USB_EP_OVF_bm);
-	USB_Endpoint_SelectedFIFO->Position  = 0;
-}
-
-void Endpoint_StallTransaction(void)
-{
-	USB_Endpoint_SelectedHandle->CTRL |= USB_EP_STALL_bm;
-
-	if ((USB_Endpoint_SelectedHandle->CTRL & USB_EP_TYPE_gm) == USB_EP_TYPE_CONTROL_gc)
-	{
-		Endpoint_SelectEndpoint(USB_Endpoint_SelectedEndpoint ^ ENDPOINT_DIR_IN);
-		USB_Endpoint_SelectedHandle->CTRL |= USB_EP_STALL_bm;
-	}
-}
-
-uint8_t Endpoint_Read_8(void)
-{
-	return USB_Endpoint_SelectedFIFO->Data[USB_Endpoint_SelectedFIFO->Position++];
-}
-
-void Endpoint_Write_8(const uint8_t Data)
-{
-	USB_Endpoint_SelectedFIFO->Data[USB_Endpoint_SelectedFIFO->Position++] = Data;
-}
-
-void Endpoint_SelectEndpoint(const uint8_t Address)
-{
-	uint8_t EndpointNumber = (Address & ENDPOINT_EPNUM_MASK);
-
-	USB_Endpoint_SelectedEndpoint = Address;
-
-	Endpoint_FIFOPair_t* EndpointFIFOPair = &USB_Endpoint_FIFOs[EndpointNumber];
-	USB_EndpointTable_t* EndpointTable    = (USB_EndpointTable_t*)USB.EPPTR;
-
-	if (Address & ENDPOINT_DIR_IN)
-	{
-		USB_Endpoint_SelectedFIFO   = &EndpointFIFOPair->IN;
-		USB_Endpoint_SelectedHandle = &EndpointTable->Endpoints[EndpointNumber].IN;
-	}
-	else
-	{
-		USB_Endpoint_SelectedFIFO   = &EndpointFIFOPair->OUT;
-		USB_Endpoint_SelectedHandle = &EndpointTable->Endpoints[EndpointNumber].OUT;
-	}
-}
-
-bool Endpoint_ConfigureEndpointTable(const USB_Endpoint_Table_t* const Table,
-                                     const uint8_t Entries)
-{
-	for (uint8_t i = 0; i < Entries; i++)
-	{
-		if (!(Table[i].Address))
-		  continue;
-
-		if (!(Endpoint_ConfigureEndpoint(Table[i].Address, Table[i].Type, Table[i].Size, Table[i].Banks)))
-		{
-			return false;
-		}
-	}
-
-	return true;
-}
-
-bool Endpoint_ConfigureEndpoint_PRV(const uint8_t Address,
-                                    const uint8_t Config,
-                                    const uint8_t Size)
-{
-	Endpoint_SelectEndpoint(Address);
-
-	USB_Endpoint_SelectedHandle->CTRL    = 0;
-	USB_Endpoint_SelectedHandle->STATUS  = (Address & ENDPOINT_DIR_IN) ? USB_EP_BUSNACK0_bm : 0;
-	USB_Endpoint_SelectedHandle->CTRL    = Config;
-	USB_Endpoint_SelectedHandle->CNT     = 0;
-	USB_Endpoint_SelectedHandle->DATAPTR = (intptr_t)USB_Endpoint_SelectedFIFO->Data;
-
-	USB_Endpoint_SelectedFIFO->Length    = (Address & ENDPOINT_DIR_IN) ? Size : 0;
-	USB_Endpoint_SelectedFIFO->Position  = 0;
-
-	return true;
-}
-
-void Endpoint_ClearEndpoints(void)
-{
-	for (uint8_t EPNum = 0; EPNum < ENDPOINT_TOTAL_ENDPOINTS; EPNum++)
-	{
-		((USB_EndpointTable_t*)USB.EPPTR)->Endpoints[EPNum].IN.CTRL  = 0;
-		((USB_EndpointTable_t*)USB.EPPTR)->Endpoints[EPNum].OUT.CTRL = 0;
-	}
-}
-
-void Endpoint_ClearStatusStage(void)
-{
-	if (USB_ControlRequest.bmRequestType & REQDIR_DEVICETOHOST)
-	{
-		while (!(Endpoint_IsOUTReceived()))
-		{
-			if (USB_DeviceState == DEVICE_STATE_Unattached)
-			  return;
-		}
-
-		Endpoint_ClearOUT();
-	}
-	else
-	{
-		while (!(Endpoint_IsINReady()))
-		{
-			if (USB_DeviceState == DEVICE_STATE_Unattached)
-			  return;
-		}
-
-		Endpoint_ClearIN();
-	}
-}
-
-#if !defined(CONTROL_ONLY_DEVICE)
-uint8_t Endpoint_WaitUntilReady(void)
-{
-	#if (USB_STREAM_TIMEOUT_MS < 0xFF)
-	uint8_t  TimeoutMSRem = USB_STREAM_TIMEOUT_MS;
-	#else
-	uint16_t TimeoutMSRem = USB_STREAM_TIMEOUT_MS;
-	#endif
-
-	uint16_t PreviousFrameNumber = USB_Device_GetFrameNumber();
-
-	for (;;)
-	{
-		if (Endpoint_GetEndpointDirection() == ENDPOINT_DIR_IN)
-		{
-			if (Endpoint_IsINReady())
-			  return ENDPOINT_READYWAIT_NoError;
-		}
-		else
-		{
-			if (Endpoint_IsOUTReceived())
-			  return ENDPOINT_READYWAIT_NoError;
-		}
-
-		uint8_t USB_DeviceState_LCL = USB_DeviceState;
-
-		if (USB_DeviceState_LCL == DEVICE_STATE_Unattached)
-		  return ENDPOINT_READYWAIT_DeviceDisconnected;
-		else if (USB_DeviceState_LCL == DEVICE_STATE_Suspended)
-		  return ENDPOINT_READYWAIT_BusSuspended;
-		else if (Endpoint_IsStalled())
-		  return ENDPOINT_READYWAIT_EndpointStalled;
-
-		uint16_t CurrentFrameNumber = USB_Device_GetFrameNumber();
-
-		if (CurrentFrameNumber != PreviousFrameNumber)
-		{
-			PreviousFrameNumber = CurrentFrameNumber;
-
-			if (!(TimeoutMSRem--))
-			  return ENDPOINT_READYWAIT_Timeout;
-		}
-	}
-}
-#endif
-
-#endif
-
-#endif
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Core/XMEGA/Endpoint_XMEGA.h b/NativePrograms/LUFA/Drivers/USB/Core/XMEGA/Endpoint_XMEGA.h
deleted file mode 100644
index 711ac17627..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Core/XMEGA/Endpoint_XMEGA.h
+++ /dev/null
@@ -1,689 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief USB Endpoint definitions for the AVR XMEGA microcontrollers.
- *  \copydetails Group_EndpointManagement_XMEGA
- *
- *  \note This file should not be included directly. It is automatically included as needed by the USB driver
- *        dispatch header located in LUFA/Drivers/USB/USB.h.
- */
-
-/** \ingroup Group_EndpointRW
- *  \defgroup Group_EndpointRW_XMEGA Endpoint Data Reading and Writing (XMEGA)
- *  \brief Endpoint data read/write definitions for the Atmel AVR XMEGA architecture.
- *
- *  Functions, macros, variables, enums and types related to data reading and writing from and to endpoints.
- */
-
-/** \ingroup Group_EndpointPrimitiveRW
- *  \defgroup Group_EndpointPrimitiveRW_XMEGA Read/Write of Primitive Data Types (XMEGA)
- *  \brief Endpoint primitive read/write definitions for the Atmel AVR XMEGA architecture.
- *
- *  Functions, macros, variables, enums and types related to data reading and writing of primitive data types
- *  from and to endpoints.
- */
-
-/** \ingroup Group_EndpointPacketManagement
- *  \defgroup Group_EndpointPacketManagement_XMEGA Endpoint Packet Management (XMEGA)
- *  \brief Endpoint packet management definitions for the Atmel AVR XMEGA architecture.
- *
- *  Functions, macros, variables, enums and types related to packet management of endpoints.
- */
-
-/** \ingroup Group_EndpointManagement
- *  \defgroup Group_EndpointManagement_XMEGA Endpoint Management (XMEGA)
- *  \brief Endpoint management definitions for the Atmel AVR XMEGA architecture.
- *
- *  Functions, macros and enums related to endpoint management when in USB Device mode. This
- *  module contains the endpoint management macros, as well as endpoint interrupt and data
- *  send/receive functions for various data types.
- *
- *  @{
- */
-
-#ifndef __ENDPOINT_XMEGA_H__
-#define __ENDPOINT_XMEGA_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-		#include "../USBTask.h"
-		#include "../USBInterrupt.h"
-		#include "../USBController.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_USB_DRIVER)
-			#error Do not include this file directly. Include LUFA/Drivers/USB/USB.h instead.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			#if (!defined(MAX_ENDPOINT_INDEX) && !defined(CONTROL_ONLY_DEVICE)) || defined(__DOXYGEN__)
-				/** Total number of endpoints (including the default control endpoint at address 0) which may
-				 *  be used in the device. Different USB AVR models support different amounts of endpoints,
-				 *  this value reflects the maximum number of endpoints for the currently selected AVR model.
-				 */
-				#define ENDPOINT_TOTAL_ENDPOINTS            16
-			#else
-				#if defined(CONTROL_ONLY_DEVICE)
-					#define ENDPOINT_TOTAL_ENDPOINTS        1
-				#else
-					#define ENDPOINT_TOTAL_ENDPOINTS        (MAX_ENDPOINT_INDEX + 1)
-				#endif
-			#endif
-
-	/* Private Interface - For use in library only: */
-	#if !defined(__DOXYGEN__)
-		/* Type Defines: */
-			typedef struct
-			{
-				uint8_t Data[64];
-
-				uint8_t Length;
-				uint8_t Position;
-			} Endpoint_FIFO_t;
-
-			typedef struct
-			{
-				Endpoint_FIFO_t OUT;
-				Endpoint_FIFO_t IN;
-			} Endpoint_FIFOPair_t;
-
-		/* External Variables: */
-			extern Endpoint_FIFOPair_t       USB_Endpoint_FIFOs[ENDPOINT_TOTAL_ENDPOINTS];
-			extern volatile uint8_t          USB_Endpoint_SelectedEndpoint;
-			extern volatile USB_EP_t*        USB_Endpoint_SelectedHandle;
-			extern volatile Endpoint_FIFO_t* USB_Endpoint_SelectedFIFO;
-
-		/* Inline Functions: */
-			static inline uint8_t Endpoint_BytesToEPSizeMask(const uint16_t Bytes) ATTR_WARN_UNUSED_RESULT ATTR_CONST
-			                                                                       ATTR_ALWAYS_INLINE;
-			static inline uint8_t Endpoint_BytesToEPSizeMask(const uint16_t Bytes)
-			{
-				uint8_t  MaskVal    = 0;
-				uint16_t CheckBytes = 8;
-
-				while (CheckBytes < Bytes)
-				{
-					MaskVal++;
-					CheckBytes <<= 1;
-				}
-
-				return (MaskVal << USB_EP_BUFSIZE_gp);
-			}
-
-		/* Function Prototypes: */
-			bool Endpoint_ConfigureEndpoint_PRV(const uint8_t Address,
-			                                    const uint8_t Config,
-			                                    const uint8_t Size);
-			void Endpoint_ClearEndpoints(void);
-	#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			#if (!defined(FIXED_CONTROL_ENDPOINT_SIZE) || defined(__DOXYGEN__))
-				/** Default size of the default control endpoint's bank, until altered by the control endpoint bank size
-				 *  value in the device descriptor. Not available if the \c FIXED_CONTROL_ENDPOINT_SIZE token is defined.
-				 */
-				#define ENDPOINT_CONTROLEP_DEFAULT_SIZE     8
-			#endif
-
-		/* Enums: */
-			/** Enum for the possible error return codes of the \ref Endpoint_WaitUntilReady() function.
-			 *
-			 *  \ingroup Group_EndpointRW_XMEGA
-			 */
-			enum Endpoint_WaitUntilReady_ErrorCodes_t
-			{
-				ENDPOINT_READYWAIT_NoError                 = 0, /**< Endpoint is ready for next packet, no error. */
-				ENDPOINT_READYWAIT_EndpointStalled         = 1, /**< The endpoint was stalled during the stream
-				                                                 *   transfer by the host or device.
-				                                                 */
-				ENDPOINT_READYWAIT_DeviceDisconnected      = 2,	/**< Device was disconnected from the host while
-				                                                 *   waiting for the endpoint to become ready.
-				                                                 */
-				ENDPOINT_READYWAIT_BusSuspended            = 3, /**< The USB bus has been suspended by the host and
-				                                                 *   no USB endpoint traffic can occur until the bus
-				                                                 *   has resumed.
-				                                                 */
-				ENDPOINT_READYWAIT_Timeout                 = 4, /**< The host failed to accept or send the next packet
-				                                                 *   within the software timeout period set by the
-				                                                 *   \ref USB_STREAM_TIMEOUT_MS macro.
-				                                                 */
-			};
-
-		/* Inline Functions: */
-			/** Selects the given endpoint address.
-			 *
-			 *  Any endpoint operations which do not require the endpoint address to be indicated will operate on
-			 *  the currently selected endpoint.
-			 *
-			 *  \param[in] Address  Endpoint address to select.
-			 */
-			void Endpoint_SelectEndpoint(const uint8_t Address);
-
-			/** Configures the specified endpoint address with the given endpoint type, bank size and number of hardware
-			 *  banks. Once configured, the endpoint may be read from or written to, depending on its direction.
-			 *
-			 *  \param[in] Address    Endpoint address to configure.
-			 *
-			 *  \param[in] Type       Type of endpoint to configure, a \c EP_TYPE_* mask. Not all endpoint types
-			 *                        are available on Low Speed USB devices - refer to the USB 2.0 specification.
-			 *
-			 *  \param[in] Size       Size of the endpoint's bank, where packets are stored before they are transmitted
-			 *                        to the USB host, or after they have been received from the USB host (depending on
-			 *                        the endpoint's data direction). The bank size must indicate the maximum packet size
-			 *                        that the endpoint can handle.
-			 *
-			 *  \param[in] Banks      Number of hardware banks to use for the endpoint being configured.
-			 *
-			 *  \note The default control endpoint should not be manually configured by the user application, as
-			 *        it is automatically configured by the library internally.
-			 *        \n\n
-			 *
-			 *  \note This routine will automatically select the specified endpoint.
-			 *
-			 *  \return Boolean \c true if the configuration succeeded, \c false otherwise.
-			 */
-			static inline bool Endpoint_ConfigureEndpoint(const uint8_t Address,
-			                                              const uint8_t Type,
-			                                              const uint16_t Size,
-			                                              const uint8_t Banks) ATTR_ALWAYS_INLINE;
-			static inline bool Endpoint_ConfigureEndpoint(const uint8_t Address,
-			                                              const uint8_t Type,
-			                                              const uint16_t Size,
-			                                              const uint8_t Banks)
-			{
-				uint8_t EPConfigMask = (USB_EP_INTDSBL_bm | ((Banks > 1) ? USB_EP_PINGPONG_bm : 0) | Endpoint_BytesToEPSizeMask(Size));
-
-				if ((Address & ENDPOINT_EPNUM_MASK) >= ENDPOINT_TOTAL_ENDPOINTS)
-				  return false;
-
-				// TODO - Fix once limitations are lifted
-				EPConfigMask &= ~USB_EP_PINGPONG_bm;
-				if (Size > 64)
-				  return false;
-
-				switch (Type)
-				{
-					case EP_TYPE_CONTROL:
-						EPConfigMask |= USB_EP_TYPE_CONTROL_gc;
-						break;
-					case EP_TYPE_ISOCHRONOUS:
-						EPConfigMask |= USB_EP_TYPE_ISOCHRONOUS_gc;
-						break;
-					default:
-						EPConfigMask |= USB_EP_TYPE_BULK_gc;
-						break;
-				}
-
-				if (Type == EP_TYPE_CONTROL)
-				  Endpoint_ConfigureEndpoint_PRV(Address ^ ENDPOINT_DIR_IN, EPConfigMask, Size);
-
-				return Endpoint_ConfigureEndpoint_PRV(Address, EPConfigMask, Size);
-			}
-
-			/** Indicates the number of bytes currently stored in the current endpoint's selected bank.
-			 *
-			 *  \ingroup Group_EndpointRW_XMEGA
-			 *
-			 *  \return Total number of bytes in the currently selected Endpoint's FIFO buffer.
-			 */
-			static inline uint16_t Endpoint_BytesInEndpoint(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline uint16_t Endpoint_BytesInEndpoint(void)
-			{
-				if (USB_Endpoint_SelectedEndpoint & ENDPOINT_DIR_IN)
-				  return USB_Endpoint_SelectedFIFO->Position;
-				else
-				  return (USB_Endpoint_SelectedFIFO->Length - USB_Endpoint_SelectedFIFO->Position);
-			}
-
-			/** Get the endpoint address of the currently selected endpoint. This is typically used to save
-			 *  the currently selected endpoint so that it can be restored after another endpoint has been
-			 *  manipulated.
-			 *
-			 *  \return Index of the currently selected endpoint.
-			 */
-			static inline uint8_t Endpoint_GetCurrentEndpoint(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline uint8_t Endpoint_GetCurrentEndpoint(void)
-			{
-				return USB_Endpoint_SelectedEndpoint;
-			}
-
-			/** Resets the endpoint bank FIFO. This clears all the endpoint banks and resets the USB controller's
-			 *  data In and Out pointers to the bank's contents.
-			 *
-			 *  \param[in] Address  Endpoint address whose FIFO buffers are to be reset.
-			 */
-			static inline void Endpoint_ResetEndpoint(const uint8_t Address) ATTR_ALWAYS_INLINE;
-			static inline void Endpoint_ResetEndpoint(const uint8_t Address)
-			{
-				if (Address & ENDPOINT_DIR_IN)
-				  USB_Endpoint_FIFOs[Address & ENDPOINT_EPNUM_MASK].IN.Position  = 0;
-				else
-				  USB_Endpoint_FIFOs[Address & ENDPOINT_EPNUM_MASK].OUT.Position = 0;
-			}
-
-			/** Determines if the currently selected endpoint is enabled, but not necessarily configured.
-			 *
-			 * \return Boolean \c true if the currently selected endpoint is enabled, \c false otherwise.
-			 */
-			static inline bool Endpoint_IsEnabled(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline bool Endpoint_IsEnabled(void)
-			{
-				return true;
-			}
-
-			/** Aborts all pending IN transactions on the currently selected endpoint, once the bank
-			 *  has been queued for transmission to the host via \ref Endpoint_ClearIN(). This function
-			 *  will terminate all queued transactions, resetting the endpoint banks ready for a new
-			 *  packet.
-			 *
-			 *  \ingroup Group_EndpointPacketManagement_XMEGA
-			 */
-			static inline void Endpoint_AbortPendingIN(void)
-			{
-				USB_Endpoint_SelectedHandle->STATUS |= USB_EP_BUSNACK0_bm;
-			}
-
-			/** Determines if the currently selected endpoint may be read from (if data is waiting in the endpoint
-			 *  bank and the endpoint is an OUT direction, or if the bank is not yet full if the endpoint is an IN
-			 *  direction). This function will return false if an error has occurred in the endpoint, if the endpoint
-			 *  is an OUT direction and no packet (or an empty packet) has been received, or if the endpoint is an IN
-			 *  direction and the endpoint bank is full.
-			 *
-			 *  \ingroup Group_EndpointPacketManagement_XMEGA
-			 *
-			 *  \return Boolean \c true if the currently selected endpoint may be read from or written to, depending
-			 *          on its direction.
-			 */
-			static inline bool Endpoint_IsReadWriteAllowed(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline bool Endpoint_IsReadWriteAllowed(void)
-			{
-				return (USB_Endpoint_SelectedFIFO->Position < USB_Endpoint_SelectedFIFO->Length);
-			}
-
-			/** Determines if the currently selected endpoint is configured.
-			 *
-			 *  \return Boolean \c true if the currently selected endpoint has been configured, \c false otherwise.
-			 */
-			static inline bool Endpoint_IsConfigured(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline bool Endpoint_IsConfigured(void)
-			{
-				return ((USB_Endpoint_SelectedHandle->CTRL & USB_EP_TYPE_gm) ? true : false);
-			}
-
-			/** Determines if the selected IN endpoint is ready for a new packet to be sent to the host.
-			 *
-			 *  \ingroup Group_EndpointPacketManagement_XMEGA
-			 *
-			 *  \return Boolean \c true if the current endpoint is ready for an IN packet, \c false otherwise.
-			 */
-			bool Endpoint_IsINReady(void) ATTR_WARN_UNUSED_RESULT;
-
-			/** Determines if the selected OUT endpoint has received new packet from the host.
-			 *
-			 *  \ingroup Group_EndpointPacketManagement_XMEGA
-			 *
-			 *  \return Boolean \c true if current endpoint is has received an OUT packet, \c false otherwise.
-			 */
-			bool Endpoint_IsOUTReceived(void) ATTR_WARN_UNUSED_RESULT;
-
-			/** Determines if the current CONTROL type endpoint has received a SETUP packet.
-			 *
-			 *  \ingroup Group_EndpointPacketManagement_XMEGA
-			 *
-			 *  \return Boolean \c true if the selected endpoint has received a SETUP packet, \c false otherwise.
-			 */
-			bool Endpoint_IsSETUPReceived(void) ATTR_WARN_UNUSED_RESULT;
-
-			/** Clears a received SETUP packet on the currently selected CONTROL type endpoint, freeing up the
-			 *  endpoint for the next packet.
-			 *
-			 *  \ingroup Group_EndpointPacketManagement_XMEGA
-			 *
-			 *  \note This is not applicable for non CONTROL type endpoints.
-			 */
-			void Endpoint_ClearSETUP(void);
-
-			/** Sends an IN packet to the host on the currently selected endpoint, freeing up the endpoint for the
-			 *  next packet and switching to the alternative endpoint bank if double banked.
-			 *
-			 *  \ingroup Group_EndpointPacketManagement_XMEGA
-			 */
-			void Endpoint_ClearIN(void);
-
-			/** Acknowledges an OUT packet to the host on the currently selected endpoint, freeing up the endpoint
-			 *  for the next packet and switching to the alternative endpoint bank if double banked.
-			 *
-			 *  \ingroup Group_EndpointPacketManagement_XMEGA
-			 */
-			void Endpoint_ClearOUT(void);
-
-			/** Stalls the current endpoint, indicating to the host that a logical problem occurred with the
-			 *  indicated endpoint and that the current transfer sequence should be aborted. This provides a
-			 *  way for devices to indicate invalid commands to the host so that the current transfer can be
-			 *  aborted and the host can begin its own recovery sequence.
-			 *
-			 *  The currently selected endpoint remains stalled until either the \ref Endpoint_ClearStall() macro
-			 *  is called, or the host issues a CLEAR FEATURE request to the device for the currently selected
-			 *  endpoint.
-			 *
-			 *  \ingroup Group_EndpointPacketManagement_XMEGA
-			 */
-			void Endpoint_StallTransaction(void);
-
-			/** Clears the STALL condition on the currently selected endpoint.
-			 *
-			 *  \ingroup Group_EndpointPacketManagement_XMEGA
-			 */
-			static inline void Endpoint_ClearStall(void) ATTR_ALWAYS_INLINE;
-			static inline void Endpoint_ClearStall(void)
-			{
-				USB_Endpoint_SelectedHandle->CTRL &= ~USB_EP_STALL_bm;
-			}
-
-			/** Determines if the currently selected endpoint is stalled, \c false otherwise.
-			 *
-			 *  \ingroup Group_EndpointPacketManagement_XMEGA
-			 *
-			 *  \return Boolean \c true if the currently selected endpoint is stalled, \c false otherwise.
-			 */
-			static inline bool Endpoint_IsStalled(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline bool Endpoint_IsStalled(void)
-			{
-				return ((USB_Endpoint_SelectedHandle->CTRL & USB_EP_STALL_bm) ? true : false);
-			}
-
-			/** Resets the data toggle of the currently selected endpoint. */
-			static inline void Endpoint_ResetDataToggle(void) ATTR_ALWAYS_INLINE;
-			static inline void Endpoint_ResetDataToggle(void)
-			{
-				USB_Endpoint_SelectedHandle->STATUS &= ~USB_EP_TOGGLE_bm;
-			}
-
-			/** Determines the currently selected endpoint's direction.
-			 *
-			 *  \return The currently selected endpoint's direction, as a \c ENDPOINT_DIR_* mask.
-			 */
-			static inline uint8_t Endpoint_GetEndpointDirection(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline uint8_t Endpoint_GetEndpointDirection(void)
-			{
-				return (USB_Endpoint_SelectedEndpoint & ENDPOINT_DIR_IN);
-			}
-
-			/** Reads one byte from the currently selected endpoint's bank, for OUT direction endpoints.
-			 *
-			 *  \ingroup Group_EndpointPrimitiveRW_XMEGA
-			 *
-			 *  \return Next byte in the currently selected endpoint's FIFO buffer.
-			 */
-			uint8_t Endpoint_Read_8(void) ATTR_WARN_UNUSED_RESULT;
-
-			/** Writes one byte to the currently selected endpoint's bank, for IN direction endpoints.
-			 *
-			 *  \ingroup Group_EndpointPrimitiveRW_XMEGA
-			 *
-			 *  \param[in] Data  Data to write into the the currently selected endpoint's FIFO buffer.
-			 */
-			void Endpoint_Write_8(const uint8_t Data);
-
-			/** Discards one byte from the currently selected endpoint's bank, for OUT direction endpoints.
-			 *
-			 *  \ingroup Group_EndpointPrimitiveRW_XMEGA
-			 */
-			static inline void Endpoint_Discard_8(void) ATTR_ALWAYS_INLINE;
-			static inline void Endpoint_Discard_8(void)
-			{
-				USB_Endpoint_SelectedFIFO->Position++;
-			}
-
-			/** Reads two bytes from the currently selected endpoint's bank in little endian format, for OUT
-			 *  direction endpoints.
-			 *
-			 *  \ingroup Group_EndpointPrimitiveRW_XMEGA
-			 *
-			 *  \return Next two bytes in the currently selected endpoint's FIFO buffer.
-			 */
-			static inline uint16_t Endpoint_Read_16_LE(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline uint16_t Endpoint_Read_16_LE(void)
-			{
-				uint16_t Byte0 = Endpoint_Read_8();
-				uint16_t Byte1 = Endpoint_Read_8();
-
-				return ((Byte1 << 8) | Byte0);
-			}
-
-			/** Reads two bytes from the currently selected endpoint's bank in big endian format, for OUT
-			 *  direction endpoints.
-			 *
-			 *  \ingroup Group_EndpointPrimitiveRW_XMEGA
-			 *
-			 *  \return Next two bytes in the currently selected endpoint's FIFO buffer.
-			 */
-			static inline uint16_t Endpoint_Read_16_BE(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline uint16_t Endpoint_Read_16_BE(void)
-			{
-				uint16_t Byte0 = Endpoint_Read_8();
-				uint16_t Byte1 = Endpoint_Read_8();
-
-				return ((Byte0 << 8) | Byte1);
-			}
-
-			/** Writes two bytes to the currently selected endpoint's bank in little endian format, for IN
-			 *  direction endpoints.
-			 *
-			 *  \ingroup Group_EndpointPrimitiveRW_XMEGA
-			 *
-			 *  \param[in] Data  Data to write to the currently selected endpoint's FIFO buffer.
-			 */
-			static inline void Endpoint_Write_16_LE(const uint16_t Data) ATTR_ALWAYS_INLINE;
-			static inline void Endpoint_Write_16_LE(const uint16_t Data)
-			{
-				Endpoint_Write_8(Data & 0xFF);
-				Endpoint_Write_8(Data >> 8);
-			}
-
-			/** Writes two bytes to the currently selected endpoint's bank in big endian format, for IN
-			 *  direction endpoints.
-			 *
-			 *  \ingroup Group_EndpointPrimitiveRW_XMEGA
-			 *
-			 *  \param[in] Data  Data to write to the currently selected endpoint's FIFO buffer.
-			 */
-			static inline void Endpoint_Write_16_BE(const uint16_t Data) ATTR_ALWAYS_INLINE;
-			static inline void Endpoint_Write_16_BE(const uint16_t Data)
-			{
-				Endpoint_Write_8(Data >> 8);
-				Endpoint_Write_8(Data & 0xFF);
-			}
-
-			/** Discards two bytes from the currently selected endpoint's bank, for OUT direction endpoints.
-			 *
-			 *  \ingroup Group_EndpointPrimitiveRW_XMEGA
-			 */
-			static inline void Endpoint_Discard_16(void) ATTR_ALWAYS_INLINE;
-			static inline void Endpoint_Discard_16(void)
-			{
-				Endpoint_Discard_8();
-				Endpoint_Discard_8();
-			}
-
-			/** Reads four bytes from the currently selected endpoint's bank in little endian format, for OUT
-			 *  direction endpoints.
-			 *
-			 *  \ingroup Group_EndpointPrimitiveRW_XMEGA
-			 *
-			 *  \return Next four bytes in the currently selected endpoint's FIFO buffer.
-			 */
-			static inline uint32_t Endpoint_Read_32_LE(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline uint32_t Endpoint_Read_32_LE(void)
-			{
-				uint32_t Byte0 = Endpoint_Read_8();
-				uint32_t Byte1 = Endpoint_Read_8();
-				uint32_t Byte2 = Endpoint_Read_8();
-				uint32_t Byte3 = Endpoint_Read_8();
-
-				return ((Byte3 << 24) | (Byte2 << 16) | (Byte1 << 8) | Byte0);
-			}
-
-			/** Reads four bytes from the currently selected endpoint's bank in big endian format, for OUT
-			 *  direction endpoints.
-			 *
-			 *  \ingroup Group_EndpointPrimitiveRW_XMEGA
-			 *
-			 *  \return Next four bytes in the currently selected endpoint's FIFO buffer.
-			 */
-			static inline uint32_t Endpoint_Read_32_BE(void) ATTR_WARN_UNUSED_RESULT ATTR_ALWAYS_INLINE;
-			static inline uint32_t Endpoint_Read_32_BE(void)
-			{
-				uint32_t Byte0 = Endpoint_Read_8();
-				uint32_t Byte1 = Endpoint_Read_8();
-				uint32_t Byte2 = Endpoint_Read_8();
-				uint32_t Byte3 = Endpoint_Read_8();
-
-				return ((Byte0 << 24) | (Byte1 << 16) | (Byte2 << 8) | Byte3);
-			}
-
-			/** Writes four bytes to the currently selected endpoint's bank in little endian format, for IN
-			 *  direction endpoints.
-			 *
-			 *  \ingroup Group_EndpointPrimitiveRW_XMEGA
-			 *
-			 *  \param[in] Data  Data to write to the currently selected endpoint's FIFO buffer.
-			 */
-			static inline void Endpoint_Write_32_LE(const uint32_t Data) ATTR_ALWAYS_INLINE;
-			static inline void Endpoint_Write_32_LE(const uint32_t Data)
-			{
-				Endpoint_Write_8(Data & 0xFF);
-				Endpoint_Write_8(Data >> 8);
-				Endpoint_Write_8(Data >> 16);
-				Endpoint_Write_8(Data >> 24);
-			}
-
-			/** Writes four bytes to the currently selected endpoint's bank in big endian format, for IN
-			 *  direction endpoints.
-			 *
-			 *  \ingroup Group_EndpointPrimitiveRW_XMEGA
-			 *
-			 *  \param[in] Data  Data to write to the currently selected endpoint's FIFO buffer.
-			 */
-			static inline void Endpoint_Write_32_BE(const uint32_t Data) ATTR_ALWAYS_INLINE;
-			static inline void Endpoint_Write_32_BE(const uint32_t Data)
-			{
-				Endpoint_Write_8(Data >> 24);
-				Endpoint_Write_8(Data >> 16);
-				Endpoint_Write_8(Data >> 8);
-				Endpoint_Write_8(Data & 0xFF);
-			}
-
-			/** Discards four bytes from the currently selected endpoint's bank, for OUT direction endpoints.
-			 *
-			 *  \ingroup Group_EndpointPrimitiveRW_XMEGA
-			 */
-			static inline void Endpoint_Discard_32(void) ATTR_ALWAYS_INLINE;
-			static inline void Endpoint_Discard_32(void)
-			{
-				Endpoint_Discard_8();
-				Endpoint_Discard_8();
-				Endpoint_Discard_8();
-				Endpoint_Discard_8();
-			}
-
-		/* External Variables: */
-			/** Global indicating the maximum packet size of the default control endpoint located at address
-			 *  0 in the device. This value is set to the value indicated in the device descriptor in the user
-			 *  project once the USB interface is initialized into device mode.
-			 *
-			 *  If space is an issue, it is possible to fix this to a static value by defining the control
-			 *  endpoint size in the \c FIXED_CONTROL_ENDPOINT_SIZE token passed to the compiler in the makefile
-			 *  via the -D switch. When a fixed control endpoint size is used, the size is no longer dynamically
-			 *  read from the descriptors at runtime and instead fixed to the given value. When used, it is
-			 *  important that the descriptor control endpoint size value matches the size given as the
-			 *  \c FIXED_CONTROL_ENDPOINT_SIZE token - it is recommended that the \c FIXED_CONTROL_ENDPOINT_SIZE token
-			 *  be used in the device descriptors to ensure this.
-			 *
-			 *  \attention This variable should be treated as read-only in the user application, and never manually
-			 *             changed in value.
-			 */
-			#if (!defined(FIXED_CONTROL_ENDPOINT_SIZE) || defined(__DOXYGEN__))
-				extern uint8_t USB_Device_ControlEndpointSize;
-			#else
-				#define USB_Device_ControlEndpointSize FIXED_CONTROL_ENDPOINT_SIZE
-			#endif
-
-		/* Function Prototypes: */
-			/** Configures a table of endpoint descriptions, in sequence. This function can be used to configure multiple
-			 *  endpoints at the same time.
-			 *
-			 *  \note Endpoints with a zero address will be ignored, thus this function cannot be used to configure the
-			 *        control endpoint.
-			 *
-			 *  \param[in] Table    Pointer to a table of endpoint descriptions.
-			 *  \param[in] Entries  Number of entries in the endpoint table to configure.
-			 *
-			 *  \return Boolean \c true if all endpoints configured successfully, \c false otherwise.
-			 */
-			bool Endpoint_ConfigureEndpointTable(const USB_Endpoint_Table_t* const Table,
-			                                     const uint8_t Entries);
-
-			/** Completes the status stage of a control transfer on a CONTROL type endpoint automatically,
-			 *  with respect to the data direction. This is a convenience function which can be used to
-			 *  simplify user control request handling.
-			 *
-			 *  \note This routine should not be called on non CONTROL type endpoints.
-			 */
-			void Endpoint_ClearStatusStage(void);
-
-			/** Spin-loops until the currently selected non-control endpoint is ready for the next packet of data
-			 *  to be read or written to it.
-			 *
-			 *  \note This routine should not be called on CONTROL type endpoints.
-			 *
-			 *  \ingroup Group_EndpointRW_XMEGA
-			 *
-			 *  \return A value from the \ref Endpoint_WaitUntilReady_ErrorCodes_t enum.
-			 */
-			uint8_t Endpoint_WaitUntilReady(void);
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Core/XMEGA/Host_XMEGA.c b/NativePrograms/LUFA/Drivers/USB/Core/XMEGA/Host_XMEGA.c
deleted file mode 100644
index 5f60d51b39..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Core/XMEGA/Host_XMEGA.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-#include "../../../../Common/Common.h"
-#if (ARCH == ARCH_XMEGA)
-
-#define  __INCLUDE_FROM_USB_DRIVER
-#include "../USBMode.h"
-
-#if defined(USB_CAN_BE_HOST)
-
-#endif
-
-#endif
diff --git a/NativePrograms/LUFA/Drivers/USB/Core/XMEGA/PipeStream_XMEGA.c b/NativePrograms/LUFA/Drivers/USB/Core/XMEGA/PipeStream_XMEGA.c
deleted file mode 100644
index 5f60d51b39..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Core/XMEGA/PipeStream_XMEGA.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-#include "../../../../Common/Common.h"
-#if (ARCH == ARCH_XMEGA)
-
-#define  __INCLUDE_FROM_USB_DRIVER
-#include "../USBMode.h"
-
-#if defined(USB_CAN_BE_HOST)
-
-#endif
-
-#endif
diff --git a/NativePrograms/LUFA/Drivers/USB/Core/XMEGA/Pipe_XMEGA.c b/NativePrograms/LUFA/Drivers/USB/Core/XMEGA/Pipe_XMEGA.c
deleted file mode 100644
index 308d5486ea..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Core/XMEGA/Pipe_XMEGA.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-#define  __INCLUDE_FROM_USB_DRIVER
-#include "../USBMode.h"
-
-#if defined(USB_CAN_BE_HOST)
-
-#endif
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Core/XMEGA/Template/Template_Endpoint_Control_R.c b/NativePrograms/LUFA/Drivers/USB/Core/XMEGA/Template/Template_Endpoint_Control_R.c
deleted file mode 100644
index 9f9e2096ea..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Core/XMEGA/Template/Template_Endpoint_Control_R.c
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-#if defined(TEMPLATE_FUNC_NAME)
-
-uint8_t TEMPLATE_FUNC_NAME (void* const Buffer,
-                            uint16_t Length)
-{
-	uint8_t* DataStream = ((uint8_t*)Buffer + TEMPLATE_BUFFER_OFFSET(Length));
-
-	Endpoint_SelectEndpoint(USB_Endpoint_SelectedEndpoint & ~ENDPOINT_DIR_IN);
-
-	if (!(Length))
-	  Endpoint_ClearOUT();
-
-	while (Length)
-	{
-		uint8_t USB_DeviceState_LCL = USB_DeviceState;
-
-		if (USB_DeviceState_LCL == DEVICE_STATE_Unattached)
-		  return ENDPOINT_RWCSTREAM_DeviceDisconnected;
-		else if (USB_DeviceState_LCL == DEVICE_STATE_Suspended)
-		  return ENDPOINT_RWCSTREAM_BusSuspended;
-		else if (Endpoint_IsSETUPReceived())
-		  return ENDPOINT_RWCSTREAM_HostAborted;
-
-		if (Endpoint_IsOUTReceived())
-		{
-			while (Length && Endpoint_BytesInEndpoint())
-			{
-				TEMPLATE_TRANSFER_BYTE(DataStream);
-				TEMPLATE_BUFFER_MOVE(DataStream, 1);
-				Length--;
-			}
-
-			Endpoint_ClearOUT();
-		}
-	}
-
-	while (!(Endpoint_IsINReady()))
-	{
-		uint8_t USB_DeviceState_LCL = USB_DeviceState;
-
-		if (USB_DeviceState_LCL == DEVICE_STATE_Unattached)
-		  return ENDPOINT_RWCSTREAM_DeviceDisconnected;
-		else if (USB_DeviceState_LCL == DEVICE_STATE_Suspended)
-		  return ENDPOINT_RWCSTREAM_BusSuspended;
-	}
-
-	return ENDPOINT_RWCSTREAM_NoError;
-}
-
-#undef TEMPLATE_BUFFER_OFFSET
-#undef TEMPLATE_BUFFER_MOVE
-#undef TEMPLATE_FUNC_NAME
-#undef TEMPLATE_TRANSFER_BYTE
-
-#endif
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Core/XMEGA/Template/Template_Endpoint_Control_W.c b/NativePrograms/LUFA/Drivers/USB/Core/XMEGA/Template/Template_Endpoint_Control_W.c
deleted file mode 100644
index 0d611998c8..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Core/XMEGA/Template/Template_Endpoint_Control_W.c
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-#if defined(TEMPLATE_FUNC_NAME)
-
-uint8_t TEMPLATE_FUNC_NAME (const void* const Buffer,
-                            uint16_t Length)
-{
-	uint8_t* DataStream     = ((uint8_t*)Buffer + TEMPLATE_BUFFER_OFFSET(Length));
-	bool     LastPacketFull = false;
-
-	Endpoint_SelectEndpoint(USB_Endpoint_SelectedEndpoint | ENDPOINT_DIR_IN);
-
-	if (Length > USB_ControlRequest.wLength)
-	  Length = USB_ControlRequest.wLength;
-	else if (!(Length))
-	  Endpoint_ClearIN();
-
-	while (Length || LastPacketFull)
-	{
-		uint8_t USB_DeviceState_LCL = USB_DeviceState;
-
-		if (USB_DeviceState_LCL == DEVICE_STATE_Unattached)
-		  return ENDPOINT_RWCSTREAM_DeviceDisconnected;
-		else if (USB_DeviceState_LCL == DEVICE_STATE_Suspended)
-		  return ENDPOINT_RWCSTREAM_BusSuspended;
-		else if (Endpoint_IsSETUPReceived())
-		  return ENDPOINT_RWCSTREAM_HostAborted;
-		else if (Endpoint_IsOUTReceived())
-		  break;
-
-		if (Endpoint_IsINReady())
-		{
-			uint16_t BytesInEndpoint = Endpoint_BytesInEndpoint();
-
-			while (Length && (BytesInEndpoint < USB_Device_ControlEndpointSize))
-			{
-				TEMPLATE_TRANSFER_BYTE(DataStream);
-				TEMPLATE_BUFFER_MOVE(DataStream, 1);
-				Length--;
-				BytesInEndpoint++;
-			}
-
-			LastPacketFull = (BytesInEndpoint == USB_Device_ControlEndpointSize);
-			Endpoint_ClearIN();
-		}
-	}
-
-	while (!(Endpoint_IsOUTReceived()))
-	{
-		uint8_t USB_DeviceState_LCL = USB_DeviceState;
-
-		if (USB_DeviceState_LCL == DEVICE_STATE_Unattached)
-		  return ENDPOINT_RWCSTREAM_DeviceDisconnected;
-		else if (USB_DeviceState_LCL == DEVICE_STATE_Suspended)
-		  return ENDPOINT_RWCSTREAM_BusSuspended;
-		else if (Endpoint_IsSETUPReceived())
-		  return ENDPOINT_RWCSTREAM_HostAborted;
-	}
-
-	return ENDPOINT_RWCSTREAM_NoError;
-}
-
-#undef TEMPLATE_BUFFER_OFFSET
-#undef TEMPLATE_BUFFER_MOVE
-#undef TEMPLATE_FUNC_NAME
-#undef TEMPLATE_TRANSFER_BYTE
-
-#endif
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Core/XMEGA/Template/Template_Endpoint_RW.c b/NativePrograms/LUFA/Drivers/USB/Core/XMEGA/Template/Template_Endpoint_RW.c
deleted file mode 100644
index a5dc5e78d4..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Core/XMEGA/Template/Template_Endpoint_RW.c
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-#if defined(TEMPLATE_FUNC_NAME)
-
-uint8_t TEMPLATE_FUNC_NAME (TEMPLATE_BUFFER_TYPE const Buffer,
-                            uint16_t Length,
-                            uint16_t* const BytesProcessed)
-{
-	uint8_t* DataStream      = ((uint8_t*)Buffer + TEMPLATE_BUFFER_OFFSET(Length));
-	uint16_t BytesInTransfer = 0;
-	uint8_t  ErrorCode;
-
-	if ((ErrorCode = Endpoint_WaitUntilReady()))
-	  return ErrorCode;
-
-	if (BytesProcessed != NULL)
-	{
-		Length -= *BytesProcessed;
-		TEMPLATE_BUFFER_MOVE(DataStream, *BytesProcessed);
-	}
-
-	while (Length)
-	{
-		if (!(Endpoint_IsReadWriteAllowed()))
-		{
-			TEMPLATE_CLEAR_ENDPOINT();
-
-			#if !defined(INTERRUPT_CONTROL_ENDPOINT)
-			USB_USBTask();
-			#endif
-
-			if (BytesProcessed != NULL)
-			{
-				*BytesProcessed += BytesInTransfer;
-				return ENDPOINT_RWSTREAM_IncompleteTransfer;
-			}
-
-			if ((ErrorCode = Endpoint_WaitUntilReady()))
-			  return ErrorCode;
-		}
-		else
-		{
-			TEMPLATE_TRANSFER_BYTE(DataStream);
-			TEMPLATE_BUFFER_MOVE(DataStream, 1);
-			Length--;
-			BytesInTransfer++;
-		}
-	}
-
-	return ENDPOINT_RWSTREAM_NoError;
-}
-
-#undef TEMPLATE_FUNC_NAME
-#undef TEMPLATE_BUFFER_TYPE
-#undef TEMPLATE_TRANSFER_BYTE
-#undef TEMPLATE_CLEAR_ENDPOINT
-#undef TEMPLATE_BUFFER_OFFSET
-#undef TEMPLATE_BUFFER_MOVE
-
-#endif
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Core/XMEGA/USBController_XMEGA.c b/NativePrograms/LUFA/Drivers/USB/Core/XMEGA/USBController_XMEGA.c
deleted file mode 100644
index e4698fdb5e..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Core/XMEGA/USBController_XMEGA.c
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-#include "../../../../Common/Common.h"
-#if (ARCH == ARCH_XMEGA)
-
-#define  __INCLUDE_FROM_USB_DRIVER
-#define  __INCLUDE_FROM_USB_CONTROLLER_C
-#include "../USBController.h"
-
-#if defined(USB_CAN_BE_BOTH)
-volatile uint8_t USB_CurrentMode = USB_MODE_None;
-#endif
-
-#if !defined(USE_STATIC_OPTIONS)
-volatile uint8_t USB_Options;
-#endif
-
-/* Ugly workaround to ensure an aligned table, since __BIGGEST_ALIGNMENT__ == 1 for the 8-bit AVR-GCC toolchain */
-uint8_t USB_EndpointTable[sizeof(USB_EndpointTable_t) + 1];
-
-void USB_Init(
-               #if defined(USB_CAN_BE_BOTH)
-               const uint8_t Mode
-               #endif
-
-               #if (defined(USB_CAN_BE_BOTH) && !defined(USE_STATIC_OPTIONS))
-               ,
-               #elif (!defined(USB_CAN_BE_BOTH) && defined(USE_STATIC_OPTIONS))
-               void
-               #endif
-
-               #if !defined(USE_STATIC_OPTIONS)
-               const uint8_t Options
-               #endif
-               )
-{
-	#if !defined(USE_STATIC_OPTIONS)
-	USB_Options = Options;
-	#endif
-
-	uint_reg_t CurrentGlobalInt = GetGlobalInterruptMask();
-	GlobalInterruptDisable();
-
-	NVM.CMD  = NVM_CMD_READ_CALIB_ROW_gc;
-	USB.CAL0 = pgm_read_byte(offsetof(NVM_PROD_SIGNATURES_t, USBCAL0));
-	USB.CAL1 = pgm_read_byte(offsetof(NVM_PROD_SIGNATURES_t, USBCAL1));
-	NVM.CMD  = NVM_CMD_NO_OPERATION_gc;
-
-	/* Ugly workaround to ensure an aligned table, since __BIGGEST_ALIGNMENT__ == 1 for the 8-bit AVR-GCC toolchain */
-	USB.EPPTR = ((intptr_t)&USB_EndpointTable[1] & ~(1 << 0));
-	USB.CTRLA = (USB_STFRNUM_bm | ((ENDPOINT_TOTAL_ENDPOINTS - 1) << USB_MAXEP_gp));
-
-	if ((USB_Options & USB_OPT_BUSEVENT_PRIHIGH) == USB_OPT_BUSEVENT_PRIHIGH)
-	  USB.INTCTRLA = (3 << USB_INTLVL_gp);
-	else if ((USB_Options & USB_OPT_BUSEVENT_PRIMED) == USB_OPT_BUSEVENT_PRIMED)
-	  USB.INTCTRLA = (2 << USB_INTLVL_gp);
-	else
-	  USB.INTCTRLA = (1 << USB_INTLVL_gp);
-
-	SetGlobalInterruptMask(CurrentGlobalInt);
-
-	#if defined(USB_CAN_BE_BOTH)
-	USB_CurrentMode = Mode;
-	#endif
-
-	USB_IsInitialized = true;
-
-	USB_ResetInterface();
-}
-
-void USB_Disable(void)
-{
-	USB_INT_DisableAllInterrupts();
-	USB_INT_ClearAllInterrupts();
-
-	USB_Detach();
-	USB_Controller_Disable();
-
-	USB_IsInitialized = false;
-}
-
-void USB_ResetInterface(void)
-{
-	uint8_t PrescalerNeeded;
-
-	#if defined(USB_DEVICE_OPT_FULLSPEED)
-	if (USB_Options & USB_DEVICE_OPT_LOWSPEED)
-	  PrescalerNeeded = F_USB / 6000000;
-	else
-	  PrescalerNeeded = F_USB / 48000000;
-	#else
-	PrescalerNeeded = F_USB / 6000000;
-	#endif
-
-	uint8_t DividerIndex = 0;
-	while (PrescalerNeeded > 0)
-	{
-		DividerIndex++;
-		PrescalerNeeded >>= 1;
-	}
-
-	CLK.USBCTRL = (DividerIndex - 1) << CLK_USBPSDIV_gp;
-
-	if (USB_Options & USB_OPT_PLLCLKSRC)
-	  CLK.USBCTRL |= (CLK_USBSRC_PLL_gc   | CLK_USBSEN_bm);
-	else
-	  CLK.USBCTRL |= (CLK_USBSRC_RC32M_gc | CLK_USBSEN_bm);
-
-	USB_Device_SetDeviceAddress(0);
-
-	USB_INT_DisableAllInterrupts();
-	USB_INT_ClearAllInterrupts();
-
-	USB_Controller_Reset();
-	USB_Init_Device();
-}
-
-#if defined(USB_CAN_BE_DEVICE)
-static void USB_Init_Device(void)
-{
-	USB_DeviceState                 = DEVICE_STATE_Unattached;
-	USB_Device_ConfigurationNumber  = 0;
-
-	#if !defined(NO_DEVICE_REMOTE_WAKEUP)
-	USB_Device_RemoteWakeupEnabled  = false;
-	#endif
-
-	#if !defined(NO_DEVICE_SELF_POWER)
-	USB_Device_CurrentlySelfPowered = false;
-	#endif
-
-	#if !defined(FIXED_CONTROL_ENDPOINT_SIZE)
-	USB_Descriptor_Device_t* DeviceDescriptorPtr;
-
-	#if defined(ARCH_HAS_MULTI_ADDRESS_SPACE) && \
-	    !(defined(USE_FLASH_DESCRIPTORS) || defined(USE_EEPROM_DESCRIPTORS) || defined(USE_RAM_DESCRIPTORS))
-	uint8_t DescriptorAddressSpace;
-
-	if (CALLBACK_USB_GetDescriptor((DTYPE_Device << 8), 0, (void*)&DeviceDescriptorPtr, &DescriptorAddressSpace) != NO_DESCRIPTOR)
-	{
-		if (DescriptorAddressSpace == MEMSPACE_FLASH)
-		  USB_Device_ControlEndpointSize = pgm_read_byte(&DeviceDescriptorPtr->Endpoint0Size);
-		else if (DescriptorAddressSpace == MEMSPACE_EEPROM)
-		  USB_Device_ControlEndpointSize = eeprom_read_byte(&DeviceDescriptorPtr->Endpoint0Size);
-		else
-		  USB_Device_ControlEndpointSize = DeviceDescriptorPtr->Endpoint0Size;
-	}
-	#else
-	if (CALLBACK_USB_GetDescriptor((DTYPE_Device << 8), 0, (void*)&DeviceDescriptorPtr) != NO_DESCRIPTOR)
-	{
-		#if defined(USE_RAM_DESCRIPTORS)
-		USB_Device_ControlEndpointSize = DeviceDescriptorPtr->Endpoint0Size;
-		#elif defined(USE_EEPROM_DESCRIPTORS)
-		USB_Device_ControlEndpointSize = eeprom_read_byte(&DeviceDescriptorPtr->Endpoint0Size);
-		#else
-		USB_Device_ControlEndpointSize = pgm_read_byte(&DeviceDescriptorPtr->Endpoint0Size);
-		#endif
-	}
-	#endif
-	#endif
-
-	if (USB_Options & USB_DEVICE_OPT_LOWSPEED)
-	  USB_Device_SetLowSpeed();
-	else
-	  USB_Device_SetFullSpeed();
-
-	Endpoint_ConfigureEndpoint(ENDPOINT_CONTROLEP, EP_TYPE_CONTROL,
-							   USB_Device_ControlEndpointSize, 1);
-
-	USB_INT_Enable(USB_INT_BUSEVENTI);
-
-	USB_Attach();
-}
-#endif
-
-#endif
diff --git a/NativePrograms/LUFA/Drivers/USB/Core/XMEGA/USBController_XMEGA.h b/NativePrograms/LUFA/Drivers/USB/Core/XMEGA/USBController_XMEGA.h
deleted file mode 100644
index 6435b41290..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Core/XMEGA/USBController_XMEGA.h
+++ /dev/null
@@ -1,313 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief USB Controller definitions for the AVR XMEGA microcontrollers.
- *  \copydetails Group_USBManagement_XMEGA
- *
- *  \note This file should not be included directly. It is automatically included as needed by the USB driver
- *        dispatch header located in LUFA/Drivers/USB/USB.h.
- */
-
-/** \ingroup Group_USBManagement
- *  \defgroup Group_USBManagement_XMEGA USB Interface Management (XMEGA)
- *  \brief USB Controller definitions for the AVR XMEGA microcontrollers.
- *
- *  Functions, macros, variables, enums and types related to the setup and management of the USB interface.
- *
- *  @{
- */
-
-#ifndef __USBCONTROLLER_XMEGA_H__
-#define __USBCONTROLLER_XMEGA_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-		#include "../USBMode.h"
-		#include "../Events.h"
-		#include "../USBTask.h"
-		#include "../USBInterrupt.h"
-
-	/* Private Interface - For use in library only: */
-	#if !defined(__DOXYGEN__)
-		/* Macros: */
-			#if defined(MAX_ENDPOINT_INDEX)
-				#define ENDPOINT_TABLE_COUNT  (MAX_ENDPOINT_INDEX + 1)
-			#else
-				#define ENDPOINT_TABLE_COUNT  16
-			#endif
-
-		/* Type Defines: */
-			typedef struct
-			{
-				struct
-				{
-					USB_EP_t OUT;
-					USB_EP_t IN;
-				} Endpoints[ENDPOINT_TABLE_COUNT];
-				uint16_t FrameNum;
-			} ATTR_PACKED USB_EndpointTable_t;
-
-		/* External Variables: */
-			extern uint8_t USB_EndpointTable[];
-	#endif
-
-	/* Includes: */
-		#if defined(USB_CAN_BE_DEVICE) || defined(__DOXYGEN__)
-			#include "../Device.h"
-			#include "../Endpoint.h"
-			#include "../DeviceStandardReq.h"
-			#include "../EndpointStream.h"
-		#endif
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks and Defines: */
-		#if !defined(__INCLUDE_FROM_USB_DRIVER)
-			#error Do not include this file directly. Include LUFA/Drivers/USB/USB.h instead.
-		#endif
-
-		#if !defined(F_USB)
-			#error F_USB is not defined. You must define F_USB to the frequency of the unprescaled USB controller clock in your project makefile.
-		#endif
-
-		#if ((F_USB % 6000000) || (F_USB < 6000000))
-			#error Invalid F_USB specified. F_USB must be a multiple of 6MHz for USB Low Speed operation, and a multiple of 48MHz for Full Speed operation.
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** \name USB Controller Option Masks */
-			/**@{*/
-			/** Sets the USB bus interrupt priority level to be low priority. The USB bus interrupt is used for Start of Frame events, bus suspend
-			 *  and resume events, bus reset events and other events related to the management of the USB bus.
-			 */
-			#define USB_OPT_BUSEVENT_PRILOW           ((0 << 2) | (0 << 1))
-
-			/** Sets the USB bus interrupt priority level to be medium priority. The USB bus interrupt is used for Start of Frame events, bus suspend
-			 *  and resume events, bus reset events and other events related to the management of the USB bus.
-			 */
-			#define USB_OPT_BUSEVENT_PRIMED           ((0 << 2) | (1 << 1))
-
-			/** Sets the USB bus interrupt priority level to be high priority. The USB bus interrupt is used for Start of Frame events, bus suspend
-			 *  and resume events, bus reset events and other events related to the management of the USB bus.
-			 */
-			#define USB_OPT_BUSEVENT_PRIHIGH          ((1 << 2) | (0 << 1))
-
-			/** Sets the USB controller to source its clock from the internal RC 32MHz clock, once it has been DFLL calibrated to 48MHz. */
-			#define USB_OPT_RC32MCLKSRC               (0 << 3)
-
-			/** Sets the USB controller to source its clock from the internal PLL. */
-			#define USB_OPT_PLLCLKSRC                 (1 << 3)
-			/**@}*/
-
-			#if !defined(USB_STREAM_TIMEOUT_MS) || defined(__DOXYGEN__)
-				/** Constant for the maximum software timeout period of the USB data stream transfer functions
-				 *  (both control and standard) when in either device or host mode. If the next packet of a stream
-				 *  is not received or acknowledged within this time period, the stream function will fail.
-				 *
-				 *  This value may be overridden in the user project makefile as the value of the
-				 *  \ref USB_STREAM_TIMEOUT_MS token, and passed to the compiler using the -D switch.
-				 */
-				#define USB_STREAM_TIMEOUT_MS       100
-			#endif
-
-		/* Inline Functions: */
-			/** Detaches the device from the USB bus. This has the effect of removing the device from any
-			 *  attached host, ceasing USB communications. If no host is present, this prevents any host from
-			 *  enumerating the device once attached until \ref USB_Attach() is called.
-			 */
-			static inline void USB_Detach(void) ATTR_ALWAYS_INLINE;
-			static inline void USB_Detach(void)
-			{
-				USB.CTRLB &= ~USB_ATTACH_bm;
-			}
-
-			/** Attaches the device to the USB bus. This announces the device's presence to any attached
-			 *  USB host, starting the enumeration process. If no host is present, attaching the device
-			 *  will allow for enumeration once a host is connected to the device.
-			 *
-			 *  This is inexplicably also required for proper operation while in host mode, to enable the
-			 *  attachment of a device to the host. This is despite the bit being located in the device-mode
-			 *  register and despite the datasheet making no mention of its requirement in host mode.
-			 */
-			static inline void USB_Attach(void) ATTR_ALWAYS_INLINE;
-			static inline void USB_Attach(void)
-			{
-				USB.CTRLB |= USB_ATTACH_bm;
-			}
-
-		/* Function Prototypes: */
-			/** Main function to initialize and start the USB interface. Once active, the USB interface will
-			 *  allow for device connection to a host when in device mode, or for device enumeration while in
-			 *  host mode.
-			 *
-			 *  As the USB library relies on interrupts for the device and host mode enumeration processes,
-			 *  the user must enable global interrupts before or shortly after this function is called. In
-			 *  device mode, interrupts must be enabled within 500ms of this function being called to ensure
-			 *  that the host does not time out whilst enumerating the device. In host mode, interrupts may be
-			 *  enabled at the application's leisure however enumeration will not begin of an attached device
-			 *  until after this has occurred.
-			 *
-			 *  Calling this function when the USB interface is already initialized will cause a complete USB
-			 *  interface reset and re-enumeration.
-			 *
-			 *  \param[in] Mode     Mask indicating what mode the USB interface is to be initialized to, a value
-			 *                      from the \ref USB_Modes_t enum.
-			 *                      \note This parameter does not exist on devices with only one supported USB
-			 *                            mode (device or host).
-			 *
-			 *  \param[in] Options  Mask indicating the options which should be used when initializing the USB
-			 *                      interface to control the USB interface's behavior. This should be comprised of
-			 *                      a \c USB_OPT_REG_* mask to control the regulator, a \c USB_OPT_*_PLL mask to control the
-			 *                      PLL, and a \c USB_DEVICE_OPT_* mask (when the device mode is enabled) to set the device
-			 *                      mode speed.
-			 *
-			 *  \note To reduce the FLASH requirements of the library if only device or host mode is required,
-			 *        the mode can be statically set in the project makefile by defining the token \c USB_DEVICE_ONLY
-			 *        (for device mode) or \c USB_HOST_ONLY (for host mode), passing the token to the compiler
-			 *        via the -D switch. If the mode is statically set, this parameter does not exist in the
-			 *        function prototype.
-			 *        \n\n
-			 *
-			 *  \note To reduce the FLASH requirements of the library if only fixed settings are required,
-			 *        the options may be set statically in the same manner as the mode (see the Mode parameter of
-			 *        this function). To statically set the USB options, pass in the \c USE_STATIC_OPTIONS token,
-			 *        defined to the appropriate options masks. When the options are statically set, this
-			 *        parameter does not exist in the function prototype.
-			 *        \n\n
-			 *
-			 *  \note The mode parameter does not exist on devices where only one mode is possible, such as USB
-			 *        AVR models which only implement the USB device mode in hardware.
-			 *
-			 *  \see \ref Group_Device for the \c USB_DEVICE_OPT_* masks.
-			 */
-			void USB_Init(
-			               #if defined(USB_CAN_BE_BOTH) || defined(__DOXYGEN__)
-			               const uint8_t Mode
-			               #endif
-
-			               #if (defined(USB_CAN_BE_BOTH) && !defined(USE_STATIC_OPTIONS)) || defined(__DOXYGEN__)
-			               ,
-			               #elif (!defined(USB_CAN_BE_BOTH) && defined(USE_STATIC_OPTIONS))
-			               void
-			               #endif
-
-			               #if !defined(USE_STATIC_OPTIONS) || defined(__DOXYGEN__)
-			               const uint8_t Options
-			               #endif
-			               );
-
-			/** Shuts down the USB interface. This turns off the USB interface after deallocating all USB FIFO
-			 *  memory, endpoints and pipes. When turned off, no USB functionality can be used until the interface
-			 *  is restarted with the \ref USB_Init() function.
-			 */
-			void USB_Disable(void);
-
-			/** Resets the interface, when already initialized. This will re-enumerate the device if already connected
-			 *  to a host, or re-enumerate an already attached device when in host mode.
-			 */
-			void USB_ResetInterface(void);
-
-		/* Global Variables: */
-			#if defined(USB_CAN_BE_BOTH) || defined(__DOXYGEN__)
-				/** Indicates the mode that the USB interface is currently initialized to, a value from the
-				 *  \ref USB_Modes_t enum.
-				 *
-				 *  \attention This variable should be treated as read-only in the user application, and never manually
-				 *             changed in value.
-				 *
-				 *  \note When the controller is initialized into UID auto-detection mode, this variable will hold the
-				 *        currently selected USB mode (i.e. \ref USB_MODE_Device or \ref USB_MODE_Host). If the controller
-				 *        is fixed into a specific mode (either through the \c USB_DEVICE_ONLY or \c USB_HOST_ONLY compile time
-				 *        options, or a limitation of the USB controller in the chosen device model) this will evaluate to
-				 *        a constant of the appropriate value and will never evaluate to \ref USB_MODE_None even when the
-				 *        USB interface is not initialized.
-				 */
-				extern volatile uint8_t USB_CurrentMode;
-			#elif defined(USB_CAN_BE_HOST)
-				#define USB_CurrentMode USB_MODE_Host
-			#elif defined(USB_CAN_BE_DEVICE)
-				#define USB_CurrentMode USB_MODE_Device
-			#endif
-
-			#if !defined(USE_STATIC_OPTIONS) || defined(__DOXYGEN__)
-				/** Indicates the current USB options that the USB interface was initialized with when \ref USB_Init()
-				 *  was called. This value will be one of the \c USB_MODE_* masks defined elsewhere in this module.
-				 *
-				 *  \attention This variable should be treated as read-only in the user application, and never manually
-				 *             changed in value.
-				 */
-				extern volatile uint8_t USB_Options;
-			#elif defined(USE_STATIC_OPTIONS)
-				#define USB_Options USE_STATIC_OPTIONS
-			#endif
-
-	/* Private Interface - For use in library only: */
-	#if !defined(__DOXYGEN__)
-		/* Function Prototypes: */
-			#if defined(__INCLUDE_FROM_USB_CONTROLLER_C)
-				static void USB_Init_Device(void);
-			#endif
-
-		/* Inline Functions: */
-			static inline void USB_Controller_Enable(void) ATTR_ALWAYS_INLINE;
-			static inline void USB_Controller_Enable(void)
-			{
-				USB.CTRLA |=  USB_ENABLE_bm;
-			}
-
-			static inline void USB_Controller_Disable(void) ATTR_ALWAYS_INLINE;
-			static inline void USB_Controller_Disable(void)
-			{
-				USB.CTRLA &= ~USB_ENABLE_bm;
-			}
-
-			static inline void USB_Controller_Reset(void) ATTR_ALWAYS_INLINE;
-			static inline void USB_Controller_Reset(void)
-			{
-				USB.CTRLA &= ~USB_ENABLE_bm;
-				USB.CTRLA |=  USB_ENABLE_bm;
-			}
-
-	#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Drivers/USB/Core/XMEGA/USBInterrupt_XMEGA.c b/NativePrograms/LUFA/Drivers/USB/Core/XMEGA/USBInterrupt_XMEGA.c
deleted file mode 100644
index c17739d96e..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Core/XMEGA/USBInterrupt_XMEGA.c
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-#include "../../../../Common/Common.h"
-#if (ARCH == ARCH_XMEGA)
-
-#define  __INCLUDE_FROM_USB_DRIVER
-#include "../USBInterrupt.h"
-
-void USB_INT_DisableAllInterrupts(void)
-{
-	USB.INTCTRLA    &= USB_INTLVL_gm;
-	USB.INTCTRLB     = 0;
-}
-
-void USB_INT_ClearAllInterrupts(void)
-{
-	USB.INTFLAGSACLR = 0xFF;
-	USB.INTFLAGSBCLR = 0xFF;
-}
-
-ISR(USB_BUSEVENT_vect)
-{
-	#if !defined(NO_SOF_EVENTS)
-	if (USB_INT_HasOccurred(USB_INT_SOFI) && USB_INT_IsEnabled(USB_INT_SOFI))
-	{
-		USB_INT_Clear(USB_INT_SOFI);
-
-		EVENT_USB_Device_StartOfFrame();
-	}
-	#endif
-
-	if (USB_INT_HasOccurred(USB_INT_BUSEVENTI_Suspend))
-	{
-		USB_INT_Clear(USB_INT_BUSEVENTI_Suspend);
-
-		#if !defined(NO_LIMITED_CONTROLLER_CONNECT)
-		USB_DeviceState = DEVICE_STATE_Unattached;
-		EVENT_USB_Device_Disconnect();
-		#else
-		USB_DeviceState = DEVICE_STATE_Suspended;
-		EVENT_USB_Device_Suspend();
-		#endif
-	}
-
-	if (USB_INT_HasOccurred(USB_INT_BUSEVENTI_Resume))
-	{
-		USB_INT_Clear(USB_INT_BUSEVENTI_Resume);
-
-		if (USB_Device_ConfigurationNumber)
-		  USB_DeviceState = DEVICE_STATE_Configured;
-		else
-		  USB_DeviceState = (USB_Device_IsAddressSet()) ? DEVICE_STATE_Addressed : DEVICE_STATE_Powered;
-
-		#if !defined(NO_LIMITED_CONTROLLER_CONNECT)
-		EVENT_USB_Device_Connect();
-		#else
-		EVENT_USB_Device_WakeUp();
-		#endif
-	}
-
-	if (USB_INT_HasOccurred(USB_INT_BUSEVENTI_Reset))
-	{
-		USB_INT_Clear(USB_INT_BUSEVENTI_Reset);
-
-		USB_DeviceState                = DEVICE_STATE_Default;
-		USB_Device_ConfigurationNumber = 0;
-
-		USB_Device_EnableDeviceAddress(0);
-
-		Endpoint_ClearEndpoints();
-		Endpoint_ConfigureEndpoint(ENDPOINT_CONTROLEP, EP_TYPE_CONTROL,
-		                           USB_Device_ControlEndpointSize, 1);
-
-		EVENT_USB_Device_Reset();
-	}
-}
-
-#endif
diff --git a/NativePrograms/LUFA/Drivers/USB/Core/XMEGA/USBInterrupt_XMEGA.h b/NativePrograms/LUFA/Drivers/USB/Core/XMEGA/USBInterrupt_XMEGA.h
deleted file mode 100644
index 8466e7b1cb..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/Core/XMEGA/USBInterrupt_XMEGA.h
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief USB Controller Interrupt definitions for the AVR XMEGA microcontrollers.
- *
- *  This file contains definitions required for the correct handling of low level USB service routine interrupts
- *  from the USB controller.
- *
- *  \note This file should not be included directly. It is automatically included as needed by the USB driver
- *        dispatch header located in LUFA/Drivers/USB/USB.h.
- */
-
-#ifndef __USBINTERRUPT_XMEGA_H__
-#define __USBINTERRUPT_XMEGA_H__
-
-	/* Includes: */
-		#include "../../../../Common/Common.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Preprocessor Checks: */
-		#if !defined(__INCLUDE_FROM_USB_DRIVER)
-			#error Do not include this file directly. Include LUFA/Drivers/USB/USB.h instead.
-		#endif
-
-	/* Private Interface - For use in library only: */
-	#if !defined(__DOXYGEN__)
-		/* Enums: */
-			enum USB_Interrupts_t
-			{
-				USB_INT_BUSEVENTI         = 1,
-				USB_INT_BUSEVENTI_Suspend = 2,
-				USB_INT_BUSEVENTI_Resume  = 3,
-				USB_INT_BUSEVENTI_Reset   = 4,
-				USB_INT_SOFI              = 5,
-			};
-
-		/* Inline Functions: */
-			static inline void USB_INT_Enable(const uint8_t Interrupt) ATTR_ALWAYS_INLINE;
-			static inline void USB_INT_Enable(const uint8_t Interrupt)
-			{
-				switch (Interrupt)
-				{
-					case USB_INT_BUSEVENTI:
-						USB.INTCTRLA |= USB_BUSEVIE_bm;
-						break;
-					case USB_INT_SOFI:
-						USB.INTCTRLA |= USB_SOFIE_bm;
-						break;
-					default:
-						break;
-				}
-			}
-
-			static inline void USB_INT_Disable(const uint8_t Interrupt) ATTR_ALWAYS_INLINE;
-			static inline void USB_INT_Disable(const uint8_t Interrupt)
-			{
-				switch (Interrupt)
-				{
-					case USB_INT_BUSEVENTI:
-						USB.INTCTRLA &= ~USB_BUSEVIE_bm;
-						break;
-					case USB_INT_SOFI:
-						USB.INTCTRLA &= ~USB_SOFIE_bm;
-						break;
-					default:
-						break;
-				}
-			}
-
-			static inline void USB_INT_Clear(const uint8_t Interrupt) ATTR_ALWAYS_INLINE;
-			static inline void USB_INT_Clear(const uint8_t Interrupt)
-			{
-				switch (Interrupt)
-				{
-					case USB_INT_BUSEVENTI_Suspend:
-						USB.INTFLAGSACLR = USB_SUSPENDIF_bm;
-						break;
-					case USB_INT_BUSEVENTI_Resume:
-						USB.INTFLAGSACLR = USB_RESUMEIF_bm;
-						break;
-					case USB_INT_BUSEVENTI_Reset:
-						USB.INTFLAGSACLR = USB_RSTIF_bm;
-						break;
-					case USB_INT_SOFI:
-						USB.INTFLAGSACLR = USB_SOFIF_bm;
-						break;
-					default:
-						break;
-				}
-			}
-
-			static inline bool USB_INT_IsEnabled(const uint8_t Interrupt) ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT;
-			static inline bool USB_INT_IsEnabled(const uint8_t Interrupt)
-			{
-				switch (Interrupt)
-				{
-					case USB_INT_BUSEVENTI:
-						return ((USB.INTCTRLA & USB_BUSEVIE_bm) ? true : false);
-					case USB_INT_SOFI:
-						return ((USB.INTCTRLA & USB_SOFIE_bm) ? true : false);
-					default:
-						return false;
-				}
-			}
-
-			static inline bool USB_INT_HasOccurred(const uint8_t Interrupt) ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT;
-			static inline bool USB_INT_HasOccurred(const uint8_t Interrupt)
-			{
-				switch (Interrupt)
-				{
-					case USB_INT_BUSEVENTI_Suspend:
-						return ((USB.INTFLAGSACLR & USB_SUSPENDIF_bm) ? true : false);
-					case USB_INT_BUSEVENTI_Resume:
-						return ((USB.INTFLAGSACLR & USB_RESUMEIF_bm) ? true : false);
-					case USB_INT_BUSEVENTI_Reset:
-						return ((USB.INTFLAGSACLR & USB_RSTIF_bm) ? true : false);
-					case USB_INT_SOFI:
-						return ((USB.INTFLAGSACLR & USB_SOFIF_bm) ? true : false);
-					default:
-						return false;
-				}
-			}
-
-		/* Includes: */
-			#include "../USBMode.h"
-			#include "../Events.h"
-			#include "../USBController.h"
-
-		/* Function Prototypes: */
-			void USB_INT_ClearAllInterrupts(void);
-			void USB_INT_DisableAllInterrupts(void);
-	#endif
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
diff --git a/NativePrograms/LUFA/Drivers/USB/USB.h b/NativePrograms/LUFA/Drivers/USB/USB.h
deleted file mode 100644
index 07ae680dec..0000000000
--- a/NativePrograms/LUFA/Drivers/USB/USB.h
+++ /dev/null
@@ -1,423 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Master include file for the library USB functionality.
- *
- *  Master include file for the library USB functionality.
- *
- *  This file should be included in all user projects making use of the USB portions of the library, instead of
- *  the individual USB driver submodule headers.
- */
-
-/** \defgroup Group_USB USB Core - LUFA/Drivers/USB/USB.h
- *
- *  \brief Core driver for the microcontroller hardware USB module
- *
- *  \section Sec_USB_Dependencies Module Source Dependencies
- *  The following files must be built with any user project that uses this module:
- *    - LUFA/Drivers/USB/Core/ConfigDescriptors.c <i>(Makefile source module name: LUFA_SRC_USB)</i>
- *    - LUFA/Drivers/USB/Core/DeviceStandardReq.c <i>(Makefile source module name: LUFA_SRC_USB)</i>
- *    - LUFA/Drivers/USB/Core/Events.c <i>(Makefile source module name: LUFA_SRC_USB)</i>
- *    - LUFA/Drivers/USB/Core/HostStandardReq.c <i>(Makefile source module name: LUFA_SRC_USB)</i>
- *    - LUFA/Drivers/USB/Core/USBTask.c <i>(Makefile source module name: LUFA_SRC_USB)</i>
- *    - LUFA/Drivers/USB/Core/<i>ARCH</i>/Device_<i>ARCH</i>.c <i>(Makefile source module name: LUFA_SRC_USB)</i>
- *    - LUFA/Drivers/USB/Core/<i>ARCH</i>/Endpoint_<i>ARCH</i>.c <i>(Makefile source module name: LUFA_SRC_USB)</i>
- *    - LUFA/Drivers/USB/Core/<i>ARCH</i>/EndpointStream_<i>ARCH</i>.c <i>(Makefile source module name: LUFA_SRC_USB)</i>
- *    - LUFA/Drivers/USB/Core/<i>ARCH</i>/Host_<i>ARCH</i>.c <i>(Makefile source module name: LUFA_SRC_USB)</i>
- *    - LUFA/Drivers/USB/Core/<i>ARCH</i>/Pipe_<i>ARCH</i>.c <i>(Makefile source module name: LUFA_SRC_USB)</i>
- *    - LUFA/Drivers/USB/Core/<i>ARCH</i>/PipeStream_<i>ARCH</i>.c <i>(Makefile source module name: LUFA_SRC_USB)</i>
- *    - LUFA/Drivers/USB/Core/<i>ARCH</i>/USBController_<i>ARCH</i>.c <i>(Makefile source module name: LUFA_SRC_USB)</i>
- *    - LUFA/Drivers/USB/Core/<i>ARCH</i>/USBInterrupt_<i>ARCH</i>.c <i>(Makefile source module name: LUFA_SRC_USB)</i>
- *    - LUFA/Drivers/USB/Class/Common/HIDParser.c <i>(Makefile source module name: LUFA_SRC_USB)</i>
- *
- *  \section Sec_USB_ModDescription Module Description
- *  Driver and framework for the USB controller of the selected architecture and microcontroller model. This module
- *  consists of many submodules, and is designed to provide an easy way to configure and control USB host, device
- *  or OTG mode USB applications.
- *
- *  The USB stack requires the sole control over the USB controller in the microcontroller only; i.e. it does not
- *  require any additional timers or other peripherals to operate. This ensures that the USB stack requires as few
- *  resources as possible.
- *
- *  The USB stack can be used in Device Mode for connections to USB Hosts (see \ref Group_Device), in Host mode for
- *  hosting of other USB devices (see \ref Group_Host), or as a dual role device which can either act as a USB host
- *  or device depending on what peripheral is connected (see \ref Group_OTG). Both modes also require a common set
- *  of USB management functions found \ref Group_USBManagement.
- */
-
-/** \defgroup Group_USBClassDrivers USB Class Drivers
- *
- *  \brief Drivers for the various standardized USB device classes
- *
- *  Drivers for both host and device mode of the standard USB classes, for rapid application development.
- *  Class drivers give a framework which sits on top of the low level library API, allowing for standard
- *  USB classes to be implemented in a project with minimal user code. These drivers can be used in
- *  conjunction with the library low level APIs to implement interfaces both via the class drivers and via
- *  the standard library APIs.
- *
- *  Multiple device mode class drivers can be used within a project, including multiple instances of the
- *  same class driver. In this way, USB Hosts and Devices can be made quickly using the internal class drivers
- *  so that more time and effort can be put into the end application instead of the USB protocol.
- *
- *  The available class drivers and their modes are listed below.
- *
- *  <table>
- *  <tr>
- *   <th width="200px">USB Class</th>
- *   <th width="90px">Device Mode</th>
- *   <th width="90px">Host Mode</th>
- *  </tr>
- *  <tr>
- *   <td>Android Open Accessory</td>
- *   <td bgcolor="#EE0000">No</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *  </tr>
- *  <tr>
- *   <td>Audio 1.0</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *  </tr>
- *  <tr>
- *   <td>CDC-ACM</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *  </tr>
- *  <tr>
- *   <td>HID</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *  </tr>
- *  <tr>
- *   <td>MIDI</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *  </tr>
- *  <tr>
- *   <td>Mass Storage</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *  </tr>
- *  <tr>
- *   <td>Printer</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *  </tr>
- *  <tr>
- *   <td>RNDIS</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *  </tr>
- *  <tr>
- *   <td>Still Image</td>
- *   <td bgcolor="#EE0000">No</td>
- *   <td bgcolor="#00EE00">Yes</td>
- *  </tr>
- *  </table>
- *
- *
- *  \section Sec_USB_UsingClassDrivers Using the Class Drivers
- *  To make the Class drivers easy to integrate into a user application, they all implement a standardized
- *  design with similarly named/used function, enums, defines and types. The two different modes are implemented
- *  slightly differently, and thus will be explained separately. For information on a specific class driver, read
- *  the class driver's module documentation.
- *
- *  \subsection Sec_USB_ClassDriverDevice Device Mode Class Drivers
- *  Implementing a Device Mode Class Driver in a user application requires a number of steps to be followed. Firstly,
- *  the module configuration and state structure must be added to the project source. These structures are named in a
- *  similar manner between classes, that of <tt>USB_ClassInfo_<i>{Class Name}</i>_Device_t</tt>, and are used to hold the
- *  complete state and configuration for each class instance. Multiple class instances is where the power of the class
- *  drivers lie; multiple interfaces of the same class simply require more instances of the Class Driver's \c USB_ClassInfo_*
- *  structure.
- *
- *  Inside the ClassInfo structure lies two sections, a \c Config section, and a \c State section. The \c Config
- *  section contains the instance's configuration parameters, and <b>must have all fields set by the user application</b>
- *  before the class driver is used. Each Device mode Class driver typically contains a set of configuration parameters
- *  for the endpoint size/number of the associated logical USB interface, plus any class-specific configuration parameters.
- *
- *  The following is an example of a properly initialized instance of the Audio Class Driver structure:
- *
- *  \code
- *  USB_ClassInfo_Audio_Device_t My_Audio_Interface =
- *  {
- *      .Config =
- *          {
- *              .StreamingInterfaceNumber = 1,
- *              .DataINEndpoint           =
- *                  {
- *                      .Address          = (ENDPOINT_DIR_IN | 1),
- *                      .Size             = 64,
- *                      .Banks            = 1,
- *                  },
- *          },
- *  };
- *  \endcode
- *
- *  \note The class driver's configuration parameters should match those used in the device's descriptors that are
- *  sent to the host.
- *
- *  To initialize the Class driver instance, the driver's <tt><i>{Class Name}</i>_Device_ConfigureEndpoints()</tt> function
- *  should be called in response to the \ref EVENT_USB_Device_ConfigurationChanged() event. This function will return a
- *  boolean true value if the driver successfully initialized the instance. Like all the class driver functions, this function
- *  takes in the address of the specific instance you wish to initialize - in this manner, multiple separate instances of
- *  the same class type can be initialized like this:
- *
- *  \code
- *  void EVENT_USB_Device_ConfigurationChanged(void)
- *  {
- *      LEDs_SetAllLEDs(LEDMASK_USB_READY);
- *
- *      if (!(Audio_Device_ConfigureEndpoints(&My_Audio_Interface)))
- *          LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
- *  }
- *  \endcode
- *
- *  Once initialized, it is important to maintain the class driver's state by repeatedly calling the Class Driver's
- *  <tt><i>{Class Name}</i>_Device_USBTask()</tt> function in the main program loop. The exact implementation of this
- *  function varies between class drivers, and can be used for any internal class driver purpose to maintain each
- *  instance. Again, this function uses the address of the instance to operate on, and thus needs to be called for each
- *  separate instance, just like the main USB maintenance routine \ref USB_USBTask():
- *
- *  \code
- *  int main(void)
- *  {
- *      SetupHardware();
- *
- *      LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
- *
- *      for (;;)
- *      {
- *          if (USB_DeviceState != DEVICE_STATE_Configured)
- *            Create_And_Process_Samples();
- *
- *          Audio_Device_USBTask(&My_Audio_Interface);
- *          USB_USBTask();
- *      }
- *  }
- *  \endcode
- *
- *  The final standardized Device Class Driver function is the Control Request handler function
- *  <tt><i>{Class Name}</i>_Device_ProcessControlRequest()</tt>, which should be called when the
- *  \ref EVENT_USB_Device_ControlRequest() event fires. This function should also be called for
- *  each class driver instance, using the address of the instance to operate on as the function's
- *  parameter. The request handler will abort if it is determined that the current request is not
- *  targeted at the given class driver instance, thus these methods can safely be called
- *  one-after-another in the event handler with no form of error checking:
- *
- *  \code
- *  void EVENT_USB_Device_ControlRequest(void)
- *  {
- *      Audio_Device_ProcessControlRequest(&My_Audio_Interface);
- *  }
- *  \endcode
- *
- *  Each class driver may also define a set of callback functions (which are prefixed by \c CALLBACK_*
- *  in the function's name) which <b>must</b> also be added to the user application - refer to each
- *  individual class driver's documentation for mandatory callbacks. In addition, each class driver may
- *  also define a set of events (identifiable by their prefix of \c EVENT_* in the function's name), which
- *  the user application <b>may</b> choose to implement, or ignore if not needed.
- *
- *  The individual Device Mode Class Driver documentation contains more information on the non-standardized,
- *  class-specific functions which the user application can then use on the driver instances, such as data
- *  read and write routines. See each driver's individual documentation for more information on the
- *  class-specific functions.
- *
- *  \subsection Sec_USB_ClassDriverHost Host Mode Class Drivers
- *  Implementing a Host Mode Class Driver in a user application requires a number of steps to be followed. Firstly,
- *  the module configuration and state structure must be added to the project source. These structures are named in a
- *  similar manner between classes, that of <tt>USB_ClassInfo_<b>{Class Name}</b>_Host_t</tt>, and are used to hold the
- *  complete state and configuration for each class instance. Multiple class instances is where the power of the class
- *  drivers lie; multiple interfaces of the same class simply require more instances of the Class Driver's \c USB_ClassInfo_*
- *  structure.
- *
- *  Inside the \c USB_ClassInfo_* structure lies two sections, a \c Config section, and a \c State section. The \c Config
- *  section contains the instance's configuration parameters, and <b>must have all fields set by the user application</b>
- *  before the class driver is used. Each Device mode Class driver typically contains a set of configuration parameters
- *  for the endpoint size/number of the associated logical USB interface, plus any class-specific configuration parameters.
- *
- *  The following is an example of a properly initialized instance of the MIDI Host Class Driver structure:
- *
- *  \code
- *  USB_ClassInfo_MIDI_Host_t My_MIDI_Interface =
- *  {
- *      .Config =
- *          {
- *              .DataINPipe             =
- *                  {
- *                      .Address        = (PIPE_DIR_IN  | 1),
- *                      .Size           = 64,
- *                      .Banks          = 1,
- *                  },
- *              .DataOUTPipe            =
- *                  {
- *                      .Address        = (PIPE_DIR_OUT | 2),
- *                      .Size           = 64,
- *                      .Banks          = 1,
- *                  },
- *          },
- *  };
- *  \endcode
- *
- *  To initialize the Class driver instance, the driver's <tt><b>{Class Name}</b>_Host_ConfigurePipes()</tt> function
- *  should be called in response to the \c EVENT_USB_Host_DeviceEnumerationComplete() event firing. This function will
- *  will return an error code from the class driver's <tt><b>{Class Name}</b>_EnumerationFailure_ErrorCodes_t</tt> enum
- *  to indicate if the driver successfully initialized the instance and bound it to an interface in the attached device.
- *  Like all the class driver functions, this function takes in the address of the specific instance you wish to initialize -
- *  in this manner, multiple separate instances of the same class type can be initialized. A fragment of a Class Driver
- *  based Host mode application may look like the following:
- *
- *  \code
- *  void EVENT_USB_Host_DeviceEnumerationComplete(void)
- *  {
- *      LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);
- *
- *      uint16_t ConfigDescriptorSize;
- *      uint8_t  ConfigDescriptorData[512];
- *
- *      if (USB_Host_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, ConfigDescriptorData,
- *                                             sizeof(ConfigDescriptorData)) != HOST_GETCONFIG_Successful)
- *      {
- *          LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
- *          return;
- *      }
- *
- *      if (MIDI_Host_ConfigurePipes(&Keyboard_MIDI_Interface,
- *                                   ConfigDescriptorSize, ConfigDescriptorData) != MIDI_ENUMERROR_NoError)
- *      {
- *          LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
- *          return;
- *      }
- *
- *      if (USB_Host_SetDeviceConfiguration(1) != HOST_SENDCONTROL_Successful)
- *      {
- *          LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
- *          return;
- *      }
- *
- *      LEDs_SetAllLEDs(LEDMASK_USB_READY);
- *  }
- *  \endcode
- *
- *  Note that the function also requires the device's configuration descriptor so that it can determine which interface
- *  in the device to bind to - this can be retrieved as shown in the above fragment using the
- *  \ref USB_Host_GetDeviceConfigDescriptor() function. If the device does not implement the interface the class driver
- *  is looking for, if all the matching interfaces are already bound to class driver instances or if an error occurs while
- *  binding to a device interface (for example, a device endpoint bank larger that the maximum supported bank size is used)
- *  the configuration will fail.
- *
- *  To complete the device enumeration after binding the host mode Class Drivers to the attached device, a call to
- *  \c USB_Host_SetDeviceConfiguration() must be made. If the device configuration is not set within the
- *  \c EVENT_USB_Host_DeviceEnumerationComplete() event, the host still will assume the device enumeration has failed.
- *
- *  Once initialized, it is important to maintain the class driver's state by repeatedly calling the Class Driver's
- *  <tt><b>{Class Name}</b>_Host_USBTask()</tt> function in the main program loop. The exact implementation of this
- *  function varies between class drivers, and can be used for any internal class driver purpose to maintain each
- *  instance. Again, this function uses the address of the instance to operate on, and thus needs to be called for each
- *  separate instance, just like the main USB maintenance routine \ref USB_USBTask():
- *
- *  \code
- *  int main(void)
- *  {
- *      SetupHardware();
- *
- *      LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
- *
- *      for (;;)
- *      {
- *          if (USB_HostState != HOST_STATE_Configured)
- *              Create_And_Process_Samples();
- *
- *          MIDI_Host_USBTask(&My_Audio_Interface);
- *          USB_USBTask();
- *      }
- *  }
- *  \endcode
- *
- *  Each class driver may also define a set of callback functions (which are prefixed by \c CALLBACK_*
- *  in the function's name) which <b>must</b> also be added to the user application - refer to each
- *  individual class driver's documentation for mandatory callbacks. In addition, each class driver may
- *  also define a set of events (identifiable by their prefix of \c EVENT_* in the function's name), which
- *  the user application <b>may</b> choose to implement, or ignore if not needed.
- *
- *  The individual Host Mode Class Driver documentation contains more information on the non-standardized,
- *  class-specific functions which the user application can then use on the driver instances, such as data
- *  read and write routines. See each driver's individual documentation for more information on the
- *  class-specific functions.
- */
-
-#ifndef __USB_H__
-#define __USB_H__
-
-	/* Macros: */
-		#define __INCLUDE_FROM_USB_DRIVER
-
-	/* Includes: */
-		#include "../../Common/Common.h"
-		#include "Core/USBMode.h"
-
-	/* Includes: */
-		#include "Core/USBTask.h"
-		#include "Core/Events.h"
-		#include "Core/StdDescriptors.h"
-		#include "Core/ConfigDescriptors.h"
-		#include "Core/USBController.h"
-		#include "Core/USBInterrupt.h"
-
-		#if defined(USB_CAN_BE_HOST) || defined(__DOXYGEN__)
-			#include "Core/Host.h"
-			#include "Core/Pipe.h"
-			#include "Core/HostStandardReq.h"
-			#include "Core/PipeStream.h"
-		#endif
-
-		#if defined(USB_CAN_BE_DEVICE) || defined(__DOXYGEN__)
-			#include "Core/Device.h"
-			#include "Core/Endpoint.h"
-			#include "Core/DeviceStandardReq.h"
-			#include "Core/EndpointStream.h"
-		#endif
-
-		#if defined(USB_CAN_BE_BOTH) || defined(__DOXYGEN__)
-			#include "Core/OTG.h"
-		#endif
-
-		#include "Class/AndroidAccessoryClass.h"
-		#include "Class/AudioClass.h"
-		#include "Class/CCIDClass.h"
-		#include "Class/CDCClass.h"
-		#include "Class/HIDClass.h"
-		#include "Class/MassStorageClass.h"
-		#include "Class/MIDIClass.h"
-		#include "Class/PrinterClass.h"
-		#include "Class/RNDISClass.h"
-		#include "Class/StillImageClass.h"
-
-#endif
-
diff --git a/NativePrograms/LUFA/LUFAConfig.h b/NativePrograms/LUFA/LUFAConfig.h
deleted file mode 100644
index b9b7d24840..0000000000
--- a/NativePrograms/LUFA/LUFAConfig.h
+++ /dev/null
@@ -1,81 +0,0 @@
-// LUFA Library Configuration Header File. Used to configure LUFA's compile time options, as an alternative to the compile-time defines.
-#ifndef _LUFA_CONFIG_H_
-#define _LUFA_CONFIG_H_
-	#if (ARCH == ARCH_AVR8)
-		// Non-USB Related Configuration Tokens
-		// #define DISABLE_TERMINAL_CODES
-
-		// USB Class Driver Related Tokens
-		// #define HID_HOST_BOOT_PROTOCOL_ONLY
-		// #define HID_STATETABLE_STACK_DEPTH       {Insert Value Here}
-		// #define HID_USAGE_STACK_DEPTH            {Insert Value Here}
-		// #define HID_MAX_COLLECTIONS              {Insert Value Here}
-		// #define HID_MAX_REPORTITEMS              {Insert Value Here}
-		// #define HID_MAX_REPORT_IDS               {Insert Value Here}
-		// #define NO_CLASS_DRIVER_AUTOFLUSH
-
-		// General USB Driver Related Tokens
-		// #define ORDERED_EP_CONFIG
-		#define USE_STATIC_OPTIONS               (USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)
-		#define USB_DEVICE_ONLY
-		// #define USB_HOST_ONLY
-		// #define USB_STREAM_TIMEOUT_MS            {Insert Value Here}
-		// #define NO_LIMITED_CONTROLLER_CONNECT
-		// #define NO_SOF_EVENTS
-
-		// USB Device Mode Driver Related Tokens
-		// #define USE_RAM_DESCRIPTORS
-		#define USE_FLASH_DESCRIPTORS
-		// #define USE_EEPROM_DESCRIPTORS
-		// #define NO_INTERNAL_SERIAL
-		#define FIXED_CONTROL_ENDPOINT_SIZE      64
-		// #define DEVICE_STATE_AS_GPIOR            {Insert Value Here}
-		#define FIXED_NUM_CONFIGURATIONS         1
-		// #define CONTROL_ONLY_DEVICE
-		// #define INTERRUPT_CONTROL_ENDPOINT
-		// #define NO_DEVICE_REMOTE_WAKEUP
-		// #define NO_DEVICE_SELF_POWER
-
-		// USB Host Mode Driver Related Tokens
-		// #define HOST_STATE_AS_GPIOR              {Insert Value Here}
-		// #define USB_HOST_TIMEOUT_MS              {Insert Value Here}
-		// #define HOST_DEVICE_SETTLE_DELAY_MS	    {Insert Value Here}
-		// #define NO_AUTO_VBUS_MANAGEMENT
-		// #define INVERTED_VBUS_ENABLE_LINE
-
-	#elif (ARCH == ARCH_XMEGA)
-		// Non-USB Related Configuration Tokens
-		// #define DISABLE_TERMINAL_CODES
-
-		// USB Class Driver Related Tokens
-		// #define HID_HOST_BOOT_PROTOCOL_ONLY
-		// #define HID_STATETABLE_STACK_DEPTH       {Insert Value Here}
-		// #define HID_USAGE_STACK_DEPTH            {Insert Value Here}
-		// #define HID_MAX_COLLECTIONS              {Insert Value Here}
-		// #define HID_MAX_REPORTITEMS              {Insert Value Here}
-		// #define HID_MAX_REPORT_IDS               {Insert Value Here}
-		// #define NO_CLASS_DRIVER_AUTOFLUSH
-
-		// General USB Driver Related Tokens
-		#define USE_STATIC_OPTIONS               (USB_DEVICE_OPT_FULLSPEED | USB_OPT_RC32MCLKSRC | USB_OPT_BUSEVENT_PRIHIGH)
-		// #define USB_STREAM_TIMEOUT_MS            {Insert Value Here}
-		// #define NO_LIMITED_CONTROLLER_CONNECT
-		// #define NO_SOF_EVENTS
-
-		// USB Device Mode Driver Related Tokens
-		// #define USE_RAM_DESCRIPTORS
-		#define USE_FLASH_DESCRIPTORS
-		// #define USE_EEPROM_DESCRIPTORS
-		// #define NO_INTERNAL_SERIAL
-		#define FIXED_CONTROL_ENDPOINT_SIZE      64
-		// #define DEVICE_STATE_AS_GPIOR            {Insert Value Here}
-		#define FIXED_NUM_CONFIGURATIONS         1
-		// #define CONTROL_ONLY_DEVICE
-		#define MAX_ENDPOINT_INDEX               1
-		// #define NO_DEVICE_REMOTE_WAKEUP
-		// #define NO_DEVICE_SELF_POWER
-
-	#else
-		#error Unsupported architecture for this LUFA configuration file.
-	#endif
-#endif
diff --git a/NativePrograms/LUFA/License.txt b/NativePrograms/LUFA/License.txt
deleted file mode 100644
index 5e5d9565ce..0000000000
--- a/NativePrograms/LUFA/License.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-                  LUFA Library
-        Copyright (C) Dean Camera, 2020.
-
-     dean [at] fourwalledcubicle [dot] com
-                www.lufa-lib.org
-
-
-Permission to use, copy, modify, and distribute this software
-and its documentation for any purpose is hereby granted without
-fee, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of the author not be used in
-advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-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, 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.
diff --git a/NativePrograms/LUFA/Platform/Platform.h b/NativePrograms/LUFA/Platform/Platform.h
deleted file mode 100644
index 37d4a2c6a7..0000000000
--- a/NativePrograms/LUFA/Platform/Platform.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Architecture Specific Hardware Platform Drivers.
- *
- *  This file is the master dispatch header file for the device-specific hardware platform drivers, for low level
- *  hardware configuration and management. The platform drivers are a set of drivers which are designed to provide
- *  a high level management layer for the various low level system functions such as clock control and interrupt
- *  management.
- *
- *  User code may choose to either include this master dispatch header file to include all available platform
- *  driver header files for the current architecture, or may choose to only include the specific platform driver
- *  modules required for a particular application.
- */
-
-/** \defgroup Group_PlatformDrivers System Platform Drivers - LUFA/Platform/Platform.h
- *  \brief Hardware platform drivers.
- *
- *  \section Sec_PlatformDrivers_Dependencies Module Source Dependencies
- *  The following files must be built with any user project that uses this module:
- *    - <b>UC3 Architecture Only:</b> LUFA/Platform/UC3/InterruptManagement.c <i>(Makefile source module name: LUFA_SRC_PLATFORM)</i>
- *    - <b>UC3 Architecture Only:</b> LUFA/Platform/UC3/Exception.S <i>(Makefile source module name: LUFA_SRC_PLATFORM)</i>
- *
- *  \section Sec_PlatformDrivers_ModDescription Module Description
- *  Device-specific hardware platform drivers, for low level hardware configuration and management. The platform
- *  drivers are a set of drivers which are designed to provide a high level management layer for the various low level
- *  system functions such as clock control and interrupt management.
- *
- *  User code may choose to either include this master dispatch header file to include all available platform
- *  driver header files for the current architecture, or may choose to only include the specific platform driver
- *  modules required for a particular application.
- *
- *  \note The exact APIs and availability of sub-modules within the platform driver group may vary depending on the
- *        target used - see individual target module documentation for the API specific to your target processor.
- */
-
-#ifndef __LUFA_PLATFORM_H__
-#define __LUFA_PLATFORM_H__
-
-	/* Includes: */
-		#include "../Common/Common.h"
-
-	/* Includes: */
-		#if (ARCH == ARCH_UC3)
-			#include "UC3/ClockManagement.h"
-			#include "UC3/InterruptManagement.h"
-		#elif (ARCH == ARCH_XMEGA)
-			#include "XMEGA/ClockManagement.h"
-		#endif
-
-#endif
-
diff --git a/NativePrograms/LUFA/Platform/UC3/ClockManagement.h b/NativePrograms/LUFA/Platform/UC3/ClockManagement.h
deleted file mode 100644
index 78a2a2161d..0000000000
--- a/NativePrograms/LUFA/Platform/UC3/ClockManagement.h
+++ /dev/null
@@ -1,338 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Module Clock Driver for the AVR32 UC3 microcontrollers.
- *
- *  Clock management driver for the AVR32 UC3 microcontrollers. This driver allows for the configuration
- *  of the various clocks within the device to clock the various peripherals.
- */
-
-/** \ingroup Group_PlatformDrivers_UC3
- *  \defgroup Group_PlatformDrivers_UC3Clocks Clock Management Driver - LUFA/Platform/UC3/ClockManagement.h
- *  \brief Module Clock Driver for the AVR32 UC3 microcontrollers.
- *
- *  \section Sec_PlatformDrivers_UC3Clocks_Dependencies Module Source Dependencies
- *  The following files must be built with any user project that uses this module:
- *    - None
- *
- *  \section Sec_PlatformDrivers_UC3Clocks_ModDescription Module Description
- *  Clock management driver for the AVR32 UC3 microcontrollers. This driver allows for the configuration
- *  of the various clocks within the device to clock the various peripherals.
- *
- *  Usage Example:
- *  \code
- *		#include <LUFA/Platform/UC3/ClockManagement.h>
- *
- *		void main(void)
- *		{
- *			// Start the master external oscillator which will be used as the main clock reference
- *			UC3CLK_StartExternalOscillator(0, EXOSC_MODE_8MHZ_OR_MORE, EXOSC_START_0CLK);
- *
- *			// Start the PLL for the CPU clock, switch CPU to it
- *			UC3CLK_StartPLL(0, CLOCK_SRC_OSC0, 12000000, F_CPU);
- *			UC3CLK_SetCPUClockSource(CLOCK_SRC_PLL0, F_CPU);
- *
- *			// Start the PLL for the USB Generic Clock module
- *			UC3CLK_StartPLL(1, CLOCK_SRC_OSC0, 12000000, 48000000);
- *		}
- *  \endcode
- *
- *  @{
- */
-
-#ifndef _UC3_CLOCK_MANAGEMENT_H_
-#define _UC3_CLOCK_MANAGEMENT_H_
-
-	/* Includes: */
-		#include "../../Common/Common.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Enum for the possible external oscillator types. */
-			enum UC3_Extern_OSC_ClockTypes_t
-			{
-				EXOSC_MODE_CLOCK         = AVR32_PM_OSCCTRL0_MODE_EXT_CLOCK,  /**< External clock (non-crystal) mode. */
-				EXOSC_MODE_900KHZ_MAX    = AVR32_PM_OSCCTRL0_MODE_CRYSTAL_G0, /**< External crystal oscillator equal to or slower than 900KHz. */
-				EXOSC_MODE_3MHZ_MAX      = AVR32_PM_OSCCTRL0_MODE_CRYSTAL_G1, /**< External crystal oscillator equal to or slower than 3MHz. */
-				EXOSC_MODE_8MHZ_MAX      = AVR32_PM_OSCCTRL0_MODE_CRYSTAL_G2, /**< External crystal oscillator equal to or slower than 8MHz. */
-				EXOSC_MODE_8MHZ_OR_MORE  = AVR32_PM_OSCCTRL0_MODE_CRYSTAL_G3, /**< External crystal oscillator equal to or faster than 8MHz. */
-			};
-
-			/** Enum for the possible external oscillator startup times. */
-			enum UC3_Extern_OSC_ClockStartup_t
-			{
-				EXOSC_START_0CLK         = AVR32_PM_OSCCTRL0_STARTUP_0_RCOSC,     /**< Immediate startup, no delay. */
-				EXOSC_START_64CLK        = AVR32_PM_OSCCTRL0_STARTUP_64_RCOSC,    /**< Wait 64 clock cycles before startup for stability. */
-				EXOSC_START_128CLK       = AVR32_PM_OSCCTRL0_STARTUP_128_RCOSC,   /**< Wait 128 clock cycles before startup for stability. */
-				EXOSC_START_2048CLK      = AVR32_PM_OSCCTRL0_STARTUP_2048_RCOSC,  /**< Wait 2048 clock cycles before startup for stability. */
-				EXOSC_START_4096CLK      = AVR32_PM_OSCCTRL0_STARTUP_4096_RCOSC,  /**< Wait 4096 clock cycles before startup for stability. */
-				EXOSC_START_8192CLK      = AVR32_PM_OSCCTRL0_STARTUP_8192_RCOSC,  /**< Wait 8192 clock cycles before startup for stability. */
-				EXOSC_START_16384CLK     = AVR32_PM_OSCCTRL0_STARTUP_16384_RCOSC, /**< Wait 16384 clock cycles before startup for stability. */
-			};
-
-			/** Enum for the possible module clock sources. */
-			enum UC3_System_ClockSource_t
-			{
-				CLOCK_SRC_SLOW_CLK       = 0, /**< Clock sourced from the internal slow clock. */
-				CLOCK_SRC_OSC0           = 1, /**< Clock sourced from the Oscillator 0 clock. */
-				CLOCK_SRC_OSC1           = 2, /**< Clock sourced from the Oscillator 1 clock. */
-				CLOCK_SRC_PLL0           = 3, /**< Clock sourced from the PLL 0 clock. */
-				CLOCK_SRC_PLL1           = 4, /**< Clock sourced from the PLL 1 clock. */
-			};
-
-		/* Inline Functions: */
-			/** Starts the given external oscillator of the UC3 microcontroller, with the given options. This routine blocks until
-			 *  the oscillator is ready for use.
-			 *
-			 *  \param[in] Channel  Index of the external oscillator to start.
-			 *  \param[in] Type     Type of clock attached to the given oscillator channel, a value from \ref UC3_Extern_OSC_ClockTypes_t.
-			 *  \param[in] Startup  Startup time of the external oscillator, a value from \ref UC3_Extern_OSC_ClockStartup_t.
-			 *
-			 *  \return Boolean \c true if the external oscillator was successfully started, \c false if invalid parameters specified.
-			 */
-			static inline bool UC3CLK_StartExternalOscillator(const uint8_t Channel,
-			                                                  const uint8_t Type,
-			                                                  const uint8_t Startup) ATTR_ALWAYS_INLINE;
-			static inline bool UC3CLK_StartExternalOscillator(const uint8_t Channel,
-			                                                  const uint8_t Type,
-			                                                  const uint8_t Startup)
-			{
-				switch (Channel)
-				{
-					case 0:
-						AVR32_PM.OSCCTRL0.startup = Startup;
-						AVR32_PM.OSCCTRL0.mode    = Type;
-						break;
-					case 1:
-						AVR32_PM.OSCCTRL1.startup = Startup;
-						AVR32_PM.OSCCTRL1.mode    = Type;
-						break;
-					default:
-						return false;
-				}
-
-				AVR32_PM.mcctrl |= (1 << (AVR32_PM_MCCTRL_OSC0EN_OFFSET + Channel));
-
-				while (!(AVR32_PM.poscsr & (1 << (AVR32_PM_POSCSR_OSC0RDY_OFFSET + Channel))));
-				return true;
-			}
-
-			/** Stops the given external oscillator of the UC3 microcontroller.
-			 *
-			 *  \param[in] Channel  Index of the external oscillator to stop.
-			 */
-			static inline void UC3CLK_StopExternalOscillator(const uint8_t Channel) ATTR_ALWAYS_INLINE;
-			static inline void UC3CLK_StopExternalOscillator(const uint8_t Channel)
-			{
-				AVR32_PM.mcctrl &= ~(1 << (AVR32_PM_MCCTRL_OSC0EN_OFFSET + Channel));
-			}
-
-			/** Starts the given PLL of the UC3 microcontroller, with the given options. This routine blocks until the PLL is ready for use.
-			 *
-			 *  \attention The output frequency must be equal to or greater than the source frequency.
-			 *
-			 *  \param[in] Channel     Index of the PLL to start.
-			 *  \param[in] Source      Clock source for the PLL, a value from \ref UC3_System_ClockSource_t.
-			 *  \param[in] SourceFreq  Frequency of the PLL's clock source, in Hz.
-			 *  \param[in] Frequency   Target frequency of the PLL's output.
-			 *
-			 *  \return Boolean \c true if the PLL was successfully started, \c false if invalid parameters specified.
-			 */
-			static inline bool UC3CLK_StartPLL(const uint8_t Channel,
-			                                   const uint8_t Source,
-			                                   const uint32_t SourceFreq,
-			                                   const uint32_t Frequency) ATTR_ALWAYS_INLINE;
-			static inline bool UC3CLK_StartPLL(const uint8_t Channel,
-			                                   const uint8_t Source,
-			                                   const uint32_t SourceFreq,
-			                                   const uint32_t Frequency)
-			{
-				if (SourceFreq > Frequency)
-				  return false;
-
-				switch (Source)
-				{
-					case CLOCK_SRC_OSC0:
-						AVR32_PM.PLL[Channel].pllosc = 0;
-						break;
-					case CLOCK_SRC_OSC1:
-						AVR32_PM.PLL[Channel].pllosc = 1;
-						break;
-					default:
-						return false;
-				}
-
-				AVR32_PM.PLL[Channel].pllmul = (Frequency / SourceFreq) ? (((Frequency / SourceFreq) - 1) / 2) : 0;
-				AVR32_PM.PLL[Channel].plldiv = 0;
-				AVR32_PM.PLL[Channel].pllen  = true;
-
-				while (!(AVR32_PM.poscsr & (1 << (AVR32_PM_POSCSR_LOCK0_OFFSET + Channel))));
-				return true;
-			}
-
-			/** Stops the given PLL of the UC3 microcontroller.
-			 *
-			 *  \param[in] Channel  Index of the PLL to stop.
-			 */
-			static inline void UC3CLK_StopPLL(const uint8_t Channel) ATTR_ALWAYS_INLINE;
-			static inline void UC3CLK_StopPLL(const uint8_t Channel)
-			{
-				AVR32_PM.PLL[Channel].pllen = false;
-			}
-
-			/** Starts the given Generic Clock of the UC3 microcontroller, with the given options.
-			 *
-			 *  \param[in] Channel     Index of the Generic Clock to start.
-			 *  \param[in] Source      Clock source for the Generic Clock, a value from \ref UC3_System_ClockSource_t.
-			 *  \param[in] SourceFreq  Frequency of the Generic Clock's clock source, in Hz.
-			 *  \param[in] Frequency   Target frequency of the Generic Clock's output.
-			 *
-			 *  \return Boolean \c true if the Generic Clock was successfully started, \c false if invalid parameters specified.
-			 */
-			static inline bool UC3CLK_StartGenericClock(const uint8_t Channel,
-			                                            const uint8_t Source,
-			                                            const uint32_t SourceFreq,
-			                                            const uint32_t Frequency) ATTR_ALWAYS_INLINE;
-			static inline bool UC3CLK_StartGenericClock(const uint8_t Channel,
-			                                            const uint8_t Source,
-			                                            const uint32_t SourceFreq,
-			                                            const uint32_t Frequency)
-			{
-				if (Channel >= AVR32_PM_GCLK_NUM)
-				  return false;
-
-				if (SourceFreq < Frequency)
-				  return false;
-
-				switch (Source)
-				{
-					case CLOCK_SRC_OSC0:
-						AVR32_PM.GCCTRL[Channel].pllsel = false;
-						AVR32_PM.GCCTRL[Channel].oscsel = 0;
-						break;
-					case CLOCK_SRC_OSC1:
-						AVR32_PM.GCCTRL[Channel].pllsel = false;
-						AVR32_PM.GCCTRL[Channel].oscsel = 1;
-						break;
-					case CLOCK_SRC_PLL0:
-						AVR32_PM.GCCTRL[Channel].pllsel = true;
-						AVR32_PM.GCCTRL[Channel].oscsel = 0;
-						break;
-					case CLOCK_SRC_PLL1:
-						AVR32_PM.GCCTRL[Channel].pllsel = true;
-						AVR32_PM.GCCTRL[Channel].oscsel = 1;
-						break;
-					default:
-						return false;
-				}
-
-				AVR32_PM.GCCTRL[Channel].diven = (SourceFreq > Frequency) ? true : false;
-				AVR32_PM.GCCTRL[Channel].div   = (((SourceFreq / Frequency) - 1) / 2);
-				AVR32_PM.GCCTRL[Channel].cen   = true;
-
-				return true;
-			}
-
-			/** Stops the given generic clock of the UC3 microcontroller.
-			 *
-			 *  \param[in] Channel  Index of the generic clock to stop.
-			 *
-			 *  \return Boolean \c true if the generic clock was successfully stopped, \c false if invalid parameters specified.
-			 */
-			static inline bool UC3CLK_StopGenericClock(const uint8_t Channel) ATTR_ALWAYS_INLINE;
-			static inline bool UC3CLK_StopGenericClock(const uint8_t Channel)
-			{
-				if (Channel >= AVR32_PM_GCLK_NUM)
-				  return false;
-
-				AVR32_PM.GCCTRL[Channel].cen = false;
-
-				return true;
-			}
-
-			/** Sets the clock source for the main microcontroller core. The given clock source should be configured
-			 *  and ready for use before this function is called.
-			 *
-			 *  This function will configure the FLASH controller's wait states automatically to suit the given clock source.
-			 *
-			 *  \param[in] Source      Clock source for the CPU core, a value from \ref UC3_System_ClockSource_t.
-			 *  \param[in] SourceFreq  Frequency of the CPU core's clock source, in Hz.
-			 *
-			 *  \return Boolean \c true if the CPU core clock was successfully altered, \c false if invalid parameters specified.
-			 */
-			static inline bool UC3CLK_SetCPUClockSource(const uint8_t Source,
-			                                            const uint32_t SourceFreq) ATTR_ALWAYS_INLINE;
-			static inline bool UC3CLK_SetCPUClockSource(const uint8_t Source,
-			                                            const uint32_t SourceFreq)
-			{
-				if (SourceFreq > AVR32_PM_CPU_MAX_FREQ)
-				  return false;
-
-				AVR32_FLASHC.FCR.fws = (SourceFreq > AVR32_FLASHC_FWS_0_MAX_FREQ) ? true : false;
-
-				switch (Source)
-				{
-					#if defined(AVR32_PM_MCCTRL_MCSEL_SLOW)
-					case CLOCK_SRC_SLOW_CLK:
-						AVR32_PM.MCCTRL.mcsel = AVR32_PM_MCCTRL_MCSEL_SLOW;
-						break;
-					#endif
-					#if defined(AVR32_PM_MCCTRL_MCSEL_OSC0)
-					case CLOCK_SRC_OSC0:
-						AVR32_PM.MCCTRL.mcsel = AVR32_PM_MCCTRL_MCSEL_OSC0;
-						break;
-					#endif
-					#if defined(AVR32_PM_MCCTRL_MCSEL_PLL0)
-					case CLOCK_SRC_PLL0:
-						AVR32_PM.MCCTRL.mcsel = AVR32_PM_MCCTRL_MCSEL_PLL0;
-						break;
-					#endif
-					default:
-						return false;
-				}
-
-				return true;
-			}
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Platform/UC3/Exception.S b/NativePrograms/LUFA/Platform/UC3/Exception.S
deleted file mode 100644
index d73d76debf..0000000000
--- a/NativePrograms/LUFA/Platform/UC3/Exception.S
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-#if defined(__AVR32__)
-#include <avr32/io.h>
-
-.section .exception_handlers, "ax", @progbits
-
-// ================= EXCEPTION TABLE ================
-.balign  0x200
-.global  EVBA_Table
-EVBA_Table:
-
-.org  0x000
-Exception_Unrecoverable_Exception:
-	rjmp $
-.org  0x004
-Exception_TLB_Multiple_Hit:
-	rjmp $
-.org  0x008
-Exception_Bus_Error_Data_Fetch:
-	rjmp $
-.org  0x00C
-Exception_Bus_Error_Instruction_Fetch:
-	rjmp $
-.org  0x010
-Exception_NMI:
-	rjmp $
-.org  0x014
-Exception_Instruction_Address:
-	rjmp $
-.org  0x018
-Exception_ITLB_Protection:
-	rjmp $
-.org  0x01C
-Exception_OCD_Breakpoint:
-	rjmp $
-.org  0x020
-Exception_Illegal_Opcode:
-	rjmp $
-.org  0x024
-Exception_Unimplemented_Instruction:
-	rjmp $
-.org  0x028
-Exception_Privilege_Violation:
-	rjmp $
-.org  0x02C
-Exception_Floating_Point:
-	rjmp $
-.org  0x030
-Exception_Coprocessor_Absent:
-	rjmp $
-.org  0x034
-Exception_Data_Address_Read:
-	rjmp $
-.org  0x038
-Exception_Data_Address_Write:
-	rjmp $
-.org  0x03C
-Exception_DTLB_Protection_Read:
-	rjmp $
-.org  0x040
-Exception_DTLB_Protection_Write:
-	rjmp $
-.org  0x044
-Exception_DTLB_Modified:
-	rjmp $
-.org  0x050
-Exception_ITLB_Miss:
-	rjmp $
-.org  0x060
-Exception_DTLB_Miss_Read:
-	rjmp $
-.org  0x070
-Exception_DTLB_Miss_Write:
-	rjmp $
-.org  0x100
-Exception_Supervisor_Call:
-    rjmp $
-// ============== END OF EXCEPTION TABLE =============
-
-// ============= GENERAL INTERRUPT HANDLER ===========
-.balign 4
-.irp    Level, 0, 1, 2, 3
-Exception_INT\Level:
-	mov     r12, \Level
-	call    INTC_GetInterruptHandler
-	mov     pc, r12
-.endr
-// ========= END OF GENERAL INTERRUPT HANDLER ========
-
-// ====== GENERAL INTERRUPT HANDLER OFFSET TABLE ======
-.balign 4
-.global Autovector_Table
-Autovector_Table:
-.irp    Level, 0, 1, 2, 3
-	.word ((AVR32_INTC_INT0 + \Level) << AVR32_INTC_IPR_INTLEVEL_OFFSET) | (Exception_INT\Level - EVBA_Table)
-.endr
-// === END OF GENERAL INTERRUPT HANDLER OFFSET TABLE ===
-
-#endif
diff --git a/NativePrograms/LUFA/Platform/UC3/InterruptManagement.c b/NativePrograms/LUFA/Platform/UC3/InterruptManagement.c
deleted file mode 100644
index 4903a4cab5..0000000000
--- a/NativePrograms/LUFA/Platform/UC3/InterruptManagement.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-#include "../../Common/Common.h"
-#if (ARCH == ARCH_UC3)
-
-#define  __INCLUDE_FROM_INTMANAGEMENT_C
-#include "InterruptManagement.h"
-
-/** Interrupt vector table, containing the ISR to call for each interrupt group */
-InterruptHandlerPtr_t InterruptHandlers[AVR32_INTC_NUM_INT_GRPS];
-
-/** ISR for unhandled interrupt groups */
-ISR(Unhandled_Interrupt)
-{
-	for (;;);
-}
-
-InterruptHandlerPtr_t INTC_GetInterruptHandler(const uint_reg_t InterruptLevel)
-{
-	return InterruptHandlers[AVR32_INTC.icr[AVR32_INTC_INT3 - InterruptLevel]];
-}
-
-void INTC_Init(void)
-{
-	for (uint8_t InterruptGroup = 0; InterruptGroup < AVR32_INTC_NUM_INT_GRPS; InterruptGroup++)
-	{
-		InterruptHandlers[InterruptGroup] = Unhandled_Interrupt;
-		AVR32_INTC.ipr[InterruptGroup]    = Autovector_Table[AVR32_INTC_INT0];
-	}
-
-	__builtin_mtsr(AVR32_EVBA, (uintptr_t)&EVBA_Table);
-}
-
-#endif
diff --git a/NativePrograms/LUFA/Platform/UC3/InterruptManagement.h b/NativePrograms/LUFA/Platform/UC3/InterruptManagement.h
deleted file mode 100644
index 7c58107f5a..0000000000
--- a/NativePrograms/LUFA/Platform/UC3/InterruptManagement.h
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Interrupt Controller Driver for the AVR32 UC3 microcontrollers.
- *
- *  Interrupt controller driver for the AVR32 UC3 microcontrollers, for the configuration of interrupt
- *  handlers within the device.
- */
-
-/** \ingroup Group_PlatformDrivers_UC3
- *  \defgroup Group_PlatformDrivers_UC3Interrupts Interrupt Controller Driver - LUFA/Platform/UC3/InterruptManagement.h
- *  \brief Interrupt Controller Driver for the AVR32 UC3 microcontrollers.
- *
- *  \section Sec_PlatformDrivers_UC3Interrupts_Dependencies Module Source Dependencies
- *  The following files must be built with any user project that uses this module:
- *    - LUFA/Platform/UC3/InterruptManagement.c <i>(Makefile source module name: LUFA_SRC_PLATFORM)</i>
- *    - LUFA/Platform/UC3/Exception.S <i>(Makefile source module name: LUFA_SRC_PLATFORM)</i>
- *
- *  \section Sec_PlatformDrivers_UC3Interrupts_ModDescription Module Description
- *  Interrupt controller driver for the AVR32 UC3 microcontrollers, for the configuration of interrupt
- *  handlers within the device.
- *
- *  Usage Example:
- *  \code
- *		#include <LUFA/Platform/UC3/InterruptManagement.h>
- *
- *		ISR(USB_Group_IRQ_Handler)
- *		{
- *			// USB group handler code here
- *		}
- *
- *		void main(void)
- *		{
- *			INTC_Init();
- *			INTC_RegisterGroupHandler(INTC_IRQ_GROUP(AVR32_USBB_IRQ), AVR32_INTC_INT0, USB_Group_IRQ_Handler);
- *		}
- *  \endcode
- *
- *  @{
- */
-
-#ifndef _UC3_INTERRUPT_MANAGEMENT_H_
-#define _UC3_INTERRUPT_MANAGEMENT_H_
-
-	/* Includes: */
-		#include "../../Common/Common.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Private Interface - For use in library only: */
-	#if !defined(__DOXYGEN__)
-		/* Type Defines: */
-			typedef void (*InterruptHandlerPtr_t)(void);
-
-		/* External Variables: */
-			#if defined(__INCLUDE_FROM_INTMANAGEMENT_C)
-				extern const void        EVBA_Table;
-			#endif
-			extern InterruptHandlerPtr_t InterruptHandlers[AVR32_INTC_NUM_INT_GRPS];
-			extern const uint32_t        Autovector_Table[];
-	#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Converts a given interrupt index into its associated interrupt group.
-			 *
-			 *  \param[in] IRQIndex  Index of the interrupt request to convert.
-			 *
-			 *  \return Interrupt group number associated with the interrupt index.
-			 */
-			#define INTC_IRQ_GROUP(IRQIndex)  (IRQIndex / 32)
-
-			/** Converts a given interrupt index into its associated interrupt line.
-			 *
-			 *  \param[in] IRQIndex  Index of the interrupt request to convert.
-			 *
-			 *  \return Interrupt line number associated with the interrupt index.
-			 */
-			#define INTC_IRQ_LINE(IRQIndex)   (IRQIndex % 32)
-
-		/* Function Prototypes: */
-			/** Initializes the interrupt controller ready to handle interrupts. This must be called at the
-			 *  start of the user program before any interrupts are registered or enabled.
-			 */
-			void INTC_Init(void);
-
-			/** Retrieves the associated interrupt handler for the interrupt group currently being fired. This
-			 *  is called directly from the exception handler routine before dispatching to the ISR.
-			 *
-			 *  \param[in] InterruptLevel  Priority level of the interrupt.
-			 *
-			 *  \return Pointer to the associated interrupt handler function, or NULL if no handler set.
-			 */
-			InterruptHandlerPtr_t INTC_GetInterruptHandler(const uint_reg_t InterruptLevel);
-
-		/* Inline Functions: */
-			/** Registers a handler for a given interrupt group. On the AVR32 UC3 devices, interrupts are grouped by
-			 *  peripheral. To save on SRAM used, a single ISR handles all interrupt lines within a single group - to
-			 *  determine the exact line that has interrupted within the group ISR handler, use \ref INTC_GetGroupInterrupts().
-			 *
-			 *  If multiple interrupts with the same group are registered, the last registered handler will become the
-			 *  handler called for interrupts raised within that group.
-			 *
-			 *  To obtain the group number of a specific interrupt index, use the \ref INTC_IRQ_GROUP() macro.
-			 *
-			 *  \param[in] GroupNumber       Group number of the interrupt group to register a handler for.
-			 *  \param[in] InterruptLevel    Priority level for the specified interrupt, a \c AVR32_INTC_INT* mask.
-			 *  \param[in] Handler           Address of the ISR handler for the interrupt group.
-			 */
-			static inline void INTC_RegisterGroupHandler(const uint16_t GroupNumber,
-			                                             const uint8_t InterruptLevel,
-			                                             const InterruptHandlerPtr_t Handler) ATTR_ALWAYS_INLINE;
-			static inline void INTC_RegisterGroupHandler(const uint16_t GroupNumber,
-			                                             const uint8_t InterruptLevel,
-			                                             const InterruptHandlerPtr_t Handler)
-			{
-				InterruptHandlers[GroupNumber] = Handler;
-				AVR32_INTC.ipr[GroupNumber]    = Autovector_Table[InterruptLevel];
-			}
-
-			/** Retrieves the pending interrupts for a given interrupt group. The result of this function should be masked
-			 *  against interrupt request indexes converted to a request line number via the \ref INTC_IRQ_LINE() macro. To
-			 *  obtain the group number of a given interrupt request, use the \ref INTC_IRQ_GROUP() macro.
-			 *
-			 *  \param[in] GroupNumber Group number of the interrupt group to check.
-			 *
-			 *  \return Mask of pending interrupt lines for the given interrupt group.
-			 */
-			static inline uint_reg_t INTC_GetGroupInterrupts(const uint16_t GroupNumber) ATTR_ALWAYS_INLINE;
-			static inline uint_reg_t INTC_GetGroupInterrupts(const uint16_t GroupNumber)
-			{
-				return AVR32_INTC.irr[GroupNumber];
-			}
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Platform/UC3/UC3ExperimentalInfo.txt b/NativePrograms/LUFA/Platform/UC3/UC3ExperimentalInfo.txt
deleted file mode 100644
index 8aadb3ed79..0000000000
--- a/NativePrograms/LUFA/Platform/UC3/UC3ExperimentalInfo.txt
+++ /dev/null
@@ -1 +0,0 @@
-Please note that the UC3 architecture support is EXPERIMENTAL at this time, and may be non-functional/incomplete in some areas. Please refer to the Known Issues section of the LUFA manual.
\ No newline at end of file
diff --git a/NativePrograms/LUFA/Platform/XMEGA/ClockManagement.h b/NativePrograms/LUFA/Platform/XMEGA/ClockManagement.h
deleted file mode 100644
index bc0d6cf7de..0000000000
--- a/NativePrograms/LUFA/Platform/XMEGA/ClockManagement.h
+++ /dev/null
@@ -1,397 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *  \brief Module Clock Driver for the AVR USB XMEGA microcontrollers.
- *
- *  Clock management driver for the AVR USB XMEGA microcontrollers. This driver allows for the configuration
- *  of the various clocks within the device to clock the various peripherals.
- */
-
-/** \ingroup Group_PlatformDrivers_XMEGA
- *  \defgroup Group_PlatformDrivers_XMEGAClocks Clock Management Driver - LUFA/Platform/XMEGA/ClockManagement.h
- *  \brief Module Clock Driver for the AVR USB XMEGA microcontrollers.
- *
- *  \section Sec_PlatformDrivers_XMEGAClocks_Dependencies Module Source Dependencies
- *  The following files must be built with any user project that uses this module:
- *    - None
- *
- *  \section Sec_PlatformDrivers_XMEGAClocks_ModDescription Module Description
- *  Clock management driver for the AVR USB XMEGA microcontrollers. This driver allows for the configuration
- *  of the various clocks within the device to clock the various peripherals.
- *
- *  Usage Example:
- *  \code
- *   	#include <LUFA/Platform/XMEGA/ClockManagement.h>
- *
- *   	void main(void)
- *   	{
- *   		// Start the PLL to multiply the 2MHz RC oscillator to F_CPU and switch the CPU core to run from it
- *   		XMEGACLK_StartPLL(CLOCK_SRC_INT_RC2MHZ, 2000000, F_CPU);
- *   		XMEGACLK_SetCPUClockSource(CLOCK_SRC_PLL);
- *
- *   		// Start the 32MHz internal RC oscillator and start the DFLL to increase it to F_USB using the USB SOF as a reference
- *   		XMEGACLK_StartInternalOscillator(CLOCK_SRC_INT_RC32MHZ);
- *   		XMEGACLK_StartDFLL(CLOCK_SRC_INT_RC32MHZ, DFLL_REF_INT_USBSOF, F_USB);
- *   	}
- *  \endcode
- *
- *  @{
- */
-
-#ifndef _XMEGA_CLOCK_MANAGEMENT_H_
-#define _XMEGA_CLOCK_MANAGEMENT_H_
-
-	/* Includes: */
-		#include "../../Common/Common.h"
-
-	/* Enable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			extern "C" {
-		#endif
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** Enum for the possible external oscillator frequency ranges. */
-			enum XMEGA_Extern_OSC_ClockFrequency_t
-			{
-				EXOSC_FREQ_2MHZ_MAX      = OSC_FRQRANGE_04TO2_gc,  /**< External crystal oscillator equal to or slower than 2MHz. */
-				EXOSC_FREQ_9MHZ_MAX      = OSC_FRQRANGE_2TO9_gc,   /**< External crystal oscillator equal to or slower than 9MHz. */
-				EXOSC_FREQ_12MHZ_MAX     = OSC_FRQRANGE_9TO12_gc,  /**< External crystal oscillator equal to or slower than 12MHz. */
-				EXOSC_FREQ_16MHZ_MAX     = OSC_FRQRANGE_12TO16_gc, /**< External crystal oscillator equal to or slower than 16MHz. */
-			};
-
-			/** Enum for the possible external oscillator startup times. */
-			enum XMEGA_Extern_OSC_ClockStartup_t
-			{
-				EXOSC_START_6CLK         = OSC_XOSCSEL_EXTCLK_gc,      /**< Wait 6 clock cycles before startup (external clock). */
-				EXOSC_START_32KCLK       = OSC_XOSCSEL_32KHz_gc,       /**< Wait 32K clock cycles before startup (32.768KHz crystal). */
-				EXOSC_START_256CLK       = OSC_XOSCSEL_XTAL_256CLK_gc, /**< Wait 256 clock cycles before startup. */
-				EXOSC_START_1KCLK        = OSC_XOSCSEL_XTAL_1KCLK_gc,  /**< Wait 1K clock cycles before startup. */
-				EXOSC_START_16KCLK       = OSC_XOSCSEL_XTAL_16KCLK_gc, /**< Wait 16K clock cycles before startup. */
-			};
-
-			/** Enum for the possible module clock sources. */
-			enum XMEGA_System_ClockSource_t
-			{
-				CLOCK_SRC_INT_RC2MHZ    = 0, /**< Clock sourced from the Internal 2MHz RC Oscillator clock. */
-				CLOCK_SRC_INT_RC32MHZ   = 1, /**< Clock sourced from the Internal 32MHz RC Oscillator clock. */
-				CLOCK_SRC_INT_RC32KHZ   = 2, /**< Clock sourced from the Internal 32KHz RC Oscillator clock. */
-				CLOCK_SRC_XOSC          = 3, /**< Clock sourced from the External Oscillator clock. */
-				CLOCK_SRC_PLL           = 4, /**< Clock sourced from the Internal PLL clock. */
-			};
-
-			/** Enum for the possible DFLL clock reference sources. */
-			enum XMEGA_System_DFLLReference_t
-			{
-				DFLL_REF_INT_RC32KHZ   = 0, /**< Reference clock sourced from the Internal 32KHz RC Oscillator clock. */
-				DFLL_REF_EXT_RC32KHZ   = 1, /**< Reference clock sourced from the External 32KHz RC Oscillator clock connected to TOSC pins. */
-				DFLL_REF_INT_USBSOF    = 2, /**< Reference clock sourced from the USB Start Of Frame packets. */
-			};
-
-		/* Inline Functions: */
-			/** Write a value to a location protected by the XMEGA CCP protection mechanism. This function uses inline assembly to ensure that
-			 *  the protected address is written to within four clock cycles of the CCP key being written.
-			 *
-			 *  \param[in] Address  Address to write to, a memory address protected by the CCP mechanism
-			 *  \param[in] Value    Value to write to the protected location
-			 */
-			static inline void XMEGACLK_CCP_Write(volatile void* Address, const uint8_t Value) ATTR_NON_NULL_PTR_ARG(1) ATTR_ALWAYS_INLINE;
-			static inline void XMEGACLK_CCP_Write(volatile void* Address, const uint8_t Value)
-			{
-				__asm__ __volatile__ (
-					"out %0, __zero_reg__" "\n\t" /* Zero RAMPZ using fixed zero value register */
-					"movw r30, %1"         "\n\t" /* Copy address to Z register pair */
-					"out %2, %3"           "\n\t" /* Write key to CCP register */
-					"st Z, %4"             "\n\t" /* Indirectly write value to address */
-					: /* No output operands */
-					: /* Input operands: */ "m" (RAMPZ), "e" (Address), "m" (CCP), "r" (CCP_IOREG_gc), "r" (Value)
-					: /* Clobbered registers: */ "r30", "r31"
-				);
-			}
-
-			/** Starts the external oscillator of the XMEGA microcontroller, with the given options. This routine blocks until
-			 *  the oscillator is ready for use.
-			 *
-			 *  \param[in] FreqRange  Frequency range of the external oscillator, a value from \ref XMEGA_Extern_OSC_ClockFrequency_t.
-			 *  \param[in] Startup    Startup time of the external oscillator, a value from \ref XMEGA_Extern_OSC_ClockStartup_t.
-			 *
-			 *  \return Boolean \c true if the external oscillator was successfully started, \c false if invalid parameters specified.
-			 */
-			static inline bool XMEGACLK_StartExternalOscillator(const uint8_t FreqRange,
-			                                                    const uint8_t Startup) ATTR_ALWAYS_INLINE;
-			static inline bool XMEGACLK_StartExternalOscillator(const uint8_t FreqRange,
-			                                                    const uint8_t Startup)
-			{
-				OSC.XOSCCTRL  = (FreqRange | ((Startup == EXOSC_START_32KCLK) ? OSC_X32KLPM_bm : 0) | Startup);
-				OSC.CTRL     |= OSC_XOSCEN_bm;
-
-				while (!(OSC.STATUS & OSC_XOSCRDY_bm));
-				return true;
-			}
-
-			/** Stops the external oscillator of the XMEGA microcontroller. */
-			static inline void XMEGACLK_StopExternalOscillator(void) ATTR_ALWAYS_INLINE;
-			static inline void XMEGACLK_StopExternalOscillator(void)
-			{
-				OSC.CTRL     &= ~OSC_XOSCEN_bm;
-			}
-
-			/** Starts the given internal oscillator of the XMEGA microcontroller, with the given options. This routine blocks until
-			 *  the oscillator is ready for use.
-			 *
-			 *  \param[in] Source  Internal oscillator to start, a value from \ref XMEGA_System_ClockSource_t.
-			 *
-			 *  \return Boolean \c true if the internal oscillator was successfully started, \c false if invalid parameters specified.
-			 */
-			static inline bool XMEGACLK_StartInternalOscillator(const uint8_t Source) ATTR_ALWAYS_INLINE;
-			static inline bool XMEGACLK_StartInternalOscillator(const uint8_t Source)
-			{
-				switch (Source)
-				{
-					case CLOCK_SRC_INT_RC2MHZ:
-						OSC.CTRL |= OSC_RC2MEN_bm;
-						while (!(OSC.STATUS & OSC_RC2MRDY_bm));
-						return true;
-					case CLOCK_SRC_INT_RC32MHZ:
-						OSC.CTRL |= OSC_RC32MEN_bm;
-						while (!(OSC.STATUS & OSC_RC32MRDY_bm));
-						return true;
-					case CLOCK_SRC_INT_RC32KHZ:
-						OSC.CTRL |= OSC_RC32KEN_bm;
-						while (!(OSC.STATUS & OSC_RC32KRDY_bm));
-						return true;
-					default:
-						return false;
-				}
-			}
-
-			/** Stops the given internal oscillator of the XMEGA microcontroller.
-			 *
-			 *  \param[in] Source  Internal oscillator to stop, a value from \ref XMEGA_System_ClockSource_t.
-			 *
-			 *  \return Boolean \c true if the internal oscillator was successfully stopped, \c false if invalid parameters specified.
-			 */
-			static inline bool XMEGACLK_StopInternalOscillator(const uint8_t Source) ATTR_ALWAYS_INLINE;
-			static inline bool XMEGACLK_StopInternalOscillator(const uint8_t Source)
-			{
-				switch (Source)
-				{
-					case CLOCK_SRC_INT_RC2MHZ:
-						OSC.CTRL &= ~OSC_RC2MEN_bm;
-						return true;
-					case CLOCK_SRC_INT_RC32MHZ:
-						OSC.CTRL &= ~OSC_RC32MEN_bm;
-						return true;
-					case CLOCK_SRC_INT_RC32KHZ:
-						OSC.CTRL &= ~OSC_RC32KEN_bm;
-						return true;
-					default:
-						return false;
-				}
-			}
-
-			/** Starts the PLL of the XMEGA microcontroller, with the given options. This routine blocks until the PLL is ready for use.
-			 *
-			 *  \attention The output frequency must be equal to or greater than the source frequency.
-			 *
-			 *  \param[in] Source       Clock source for the PLL, a value from \ref XMEGA_System_ClockSource_t.
-			 *  \param[in] SourceFreq   Frequency of the PLL's clock source, in Hz.
-			 *  \param[in] Frequency    Target frequency of the PLL's output.
-			 *
-			 *  \return Boolean \c true if the PLL was successfully started, \c false if invalid parameters specified.
-			 */
-			static inline bool XMEGACLK_StartPLL(const uint8_t Source,
-			                                     const uint32_t SourceFreq,
-			                                     const uint32_t Frequency) ATTR_ALWAYS_INLINE;
-			static inline bool XMEGACLK_StartPLL(const uint8_t Source,
-			                                     const uint32_t SourceFreq,
-			                                     const uint32_t Frequency)
-			{
-				uint8_t MulFactor = (Frequency / SourceFreq);
-
-				if (SourceFreq > Frequency)
-				  return false;
-
-				if (MulFactor > 31)
-				  return false;
-
-				switch (Source)
-				{
-					case CLOCK_SRC_INT_RC2MHZ:
-						OSC.PLLCTRL = (OSC_PLLSRC_RC2M_gc  | MulFactor);
-						break;
-					case CLOCK_SRC_INT_RC32MHZ:
-						OSC.PLLCTRL = (OSC_PLLSRC_RC32M_gc | MulFactor);
-						break;
-					case CLOCK_SRC_XOSC:
-						OSC.PLLCTRL = (OSC_PLLSRC_XOSC_gc  | MulFactor);
-						break;
-					default:
-						return false;
-				}
-
-				OSC.CTRL |= OSC_PLLEN_bm;
-
-				while (!(OSC.STATUS & OSC_PLLRDY_bm));
-				return true;
-			}
-
-			/** Stops the PLL of the XMEGA microcontroller. */
-			static inline void XMEGACLK_StopPLL(void) ATTR_ALWAYS_INLINE;
-			static inline void XMEGACLK_StopPLL(void)
-			{
-				OSC.CTRL &= ~OSC_PLLEN_bm;
-			}
-
-			/** Starts the DFLL of the XMEGA microcontroller, with the given options.
-			 *
-			 *  \param[in] Source     RC Clock source for the DFLL, a value from \ref XMEGA_System_ClockSource_t.
-			 *  \param[in] Reference  Reference clock source for the DFLL, an value from \ref XMEGA_System_DFLLReference_t.
-			 *  \param[in] Frequency  Target frequency of the DFLL's output.
-			 *
-			 *  \return Boolean \c true if the DFLL was successfully started, \c false if invalid parameters specified.
-			 */
-			static inline bool XMEGACLK_StartDFLL(const uint8_t Source,
-			                                      const uint8_t Reference,
-			                                      const uint32_t Frequency) ATTR_ALWAYS_INLINE;
-			static inline bool XMEGACLK_StartDFLL(const uint8_t Source,
-			                                      const uint8_t Reference,
-			                                      const uint32_t Frequency)
-			{
-				uint16_t DFLLCompare = (Frequency / 1024);
-
-				switch (Source)
-				{
-					case CLOCK_SRC_INT_RC2MHZ:
-						OSC.DFLLCTRL   |= (Reference << OSC_RC2MCREF_bp);
-						DFLLRC2M.COMP1  = (DFLLCompare & 0xFF);
-						DFLLRC2M.COMP2  = (DFLLCompare >> 8);
-						DFLLRC2M.CTRL   = DFLL_ENABLE_bm;
-						break;
-					case CLOCK_SRC_INT_RC32MHZ:
-						OSC.DFLLCTRL   |= (Reference << OSC_RC32MCREF_gp);
-						DFLLRC32M.COMP1 = (DFLLCompare & 0xFF);
-						DFLLRC32M.COMP2 = (DFLLCompare >> 8);
-
-						if (Reference == DFLL_REF_INT_USBSOF)
-						{
-							NVM.CMD        = NVM_CMD_READ_CALIB_ROW_gc;
-							DFLLRC32M.CALA = pgm_read_byte(offsetof(NVM_PROD_SIGNATURES_t, USBRCOSCA));
-							DFLLRC32M.CALB = pgm_read_byte(offsetof(NVM_PROD_SIGNATURES_t, USBRCOSC));
-							NVM.CMD        = 0;
-						}
-
-						DFLLRC32M.CTRL  = DFLL_ENABLE_bm;
-						break;
-					default:
-						return false;
-				}
-
-				return true;
-			}
-
-			/** Stops the given DFLL of the XMEGA microcontroller.
-			 *
-			 *  \param[in] Source  RC Clock source for the DFLL to be stopped, a value from \ref XMEGA_System_ClockSource_t.
-			 *
-			 *  \return Boolean \c true if the DFLL was successfully stopped, \c false if invalid parameters specified.
-			 */
-			static inline bool XMEGACLK_StopDFLL(const uint8_t Source) ATTR_ALWAYS_INLINE;
-			static inline bool XMEGACLK_StopDFLL(const uint8_t Source)
-			{
-				switch (Source)
-				{
-					case CLOCK_SRC_INT_RC2MHZ:
-						DFLLRC2M.CTRL = 0;
-						break;
-					case CLOCK_SRC_INT_RC32MHZ:
-						DFLLRC32M.CTRL = 0;
-						break;
-					default:
-						return false;
-				}
-
-				return true;
-			}
-
-			/** Sets the clock source for the main microcontroller core. The given clock source should be configured
-			 *  and ready for use before this function is called.
-			 *
-			 *  \param[in] Source      Clock source for the CPU core, a value from \ref XMEGA_System_ClockSource_t.
-			 *
-			 *  \return Boolean \c true if the CPU core clock was successfully altered, \c false if invalid parameters specified.
-			 */
-			static inline bool XMEGACLK_SetCPUClockSource(const uint8_t Source) ATTR_ALWAYS_INLINE;
-			static inline bool XMEGACLK_SetCPUClockSource(const uint8_t Source)
-			{
-				uint8_t ClockSourceMask = 0;
-
-				switch (Source)
-				{
-					case CLOCK_SRC_INT_RC2MHZ:
-						ClockSourceMask = CLK_SCLKSEL_RC2M_gc;
-						break;
-					case CLOCK_SRC_INT_RC32MHZ:
-						ClockSourceMask = CLK_SCLKSEL_RC32M_gc;
-						break;
-					case CLOCK_SRC_INT_RC32KHZ:
-						ClockSourceMask = CLK_SCLKSEL_RC32K_gc;
-						break;
-					case CLOCK_SRC_XOSC:
-						ClockSourceMask = CLK_SCLKSEL_XOSC_gc;
-						break;
-					case CLOCK_SRC_PLL:
-						ClockSourceMask = CLK_SCLKSEL_PLL_gc;
-						break;
-					default:
-						return false;
-				}
-
-				uint_reg_t CurrentGlobalInt = GetGlobalInterruptMask();
-				GlobalInterruptDisable();
-
-				XMEGACLK_CCP_Write(&CLK.CTRL, ClockSourceMask);
-
-				SetGlobalInterruptMask(CurrentGlobalInt);
-
-				Delay_MS(1);
-				return (CLK.CTRL == ClockSourceMask);
-			}
-
-	/* Disable C linkage for C++ Compilers: */
-		#if defined(__cplusplus)
-			}
-		#endif
-
-#endif
-
-/** @} */
-
diff --git a/NativePrograms/LUFA/Platform/XMEGA/XMEGAExperimentalInfo.txt b/NativePrograms/LUFA/Platform/XMEGA/XMEGAExperimentalInfo.txt
deleted file mode 100644
index 42144aac48..0000000000
--- a/NativePrograms/LUFA/Platform/XMEGA/XMEGAExperimentalInfo.txt
+++ /dev/null
@@ -1 +0,0 @@
-Please note that the XMEGA architecture support is EXPERIMENTAL at this time, and may be non-functional/incomplete in some areas. Please refer to the Known Issues section of the LUFA manual.
\ No newline at end of file
diff --git a/NativePrograms/LUFA/Version.h b/NativePrograms/LUFA/Version.h
deleted file mode 100644
index fef80dcd7b..0000000000
--- a/NativePrograms/LUFA/Version.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
-             LUFA Library
-     Copyright (C) Dean Camera, 2020.
-
-  dean [at] fourwalledcubicle [dot] com
-           www.lufa-lib.org
-*/
-
-/*
-  Copyright 2020  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-
-  Permission to use, copy, modify, distribute, and sell this
-  software and its documentation for any purpose is hereby granted
-  without fee, provided that the above copyright notice appear in
-  all copies and that both that the copyright notice and this
-  permission notice and warranty disclaimer appear in supporting
-  documentation, and that the name of the author not be used in
-  advertising or publicity pertaining to distribution of the
-  software without specific, written prior permission.
-
-  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, 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.
-*/
-
-/** \file
- *
- *  \brief LUFA library version constants.
- *
- *  Version constants for informational purposes and version-specific macro creation. This header file contains the
- *  current LUFA version number in several forms, for use in the user-application (for example, for printing out
- *  whilst debugging, or for testing for version compatibility).
- */
-
-#ifndef __LUFA_VERSION_H__
-#define __LUFA_VERSION_H__
-
-	/* Public Interface - May be used in end-application: */
-		/* Macros: */
-			/** \name LUFA Release Type Constants */
-			/**@{*/
-				/** Constant for \ref LUFA_VERSION_RELEASE_TYPE indicating a development release. */
-				#define LUFA_VERSION_RELEASE_TYPE_DEVELOPMENT   0
-
-				/** Constant for \ref LUFA_VERSION_RELEASE_TYPE indicating a beta release. */
-				#define LUFA_VERSION_RELEASE_TYPE_BETA          1
-
-				/** Constant for \ref LUFA_VERSION_RELEASE_TYPE indicating a full official release. */
-				#define LUFA_VERSION_RELEASE_TYPE_FULL          2
-			/**@}*/
-
-			/** Indicates the version number of the library, as an integer. \note This value is only updates in non-development releases. */
-			#define LUFA_VERSION_INTEGER              0x170418
-
-			/** Indicates the version number of the library, as a string. \note This value is only updates in non-development releases. */
-			#define LUFA_VERSION_STRING               "170418"
-
-			/** Indicates the release type of the library. */
-			#define LUFA_VERSION_RELEASE_TYPE         LUFA_VERSION_RELEASE_TYPE_DEVELOPMENT
-
-#endif
-
diff --git a/NativePrograms/LUFA/doxyfile b/NativePrograms/LUFA/doxyfile
deleted file mode 100644
index c1cb3e3ac9..0000000000
--- a/NativePrograms/LUFA/doxyfile
+++ /dev/null
@@ -1,2544 +0,0 @@
-# Doxyfile 1.8.18
-
-# This file describes the settings to be used by the documentation system
-# doxygen (www.doxygen.org) for a project.
-#
-# All text after a double hash (##) is considered a comment and is placed in
-# front of the TAG it is preceding.
-#
-# All text after a single hash (#) is considered a comment and will be ignored.
-# The format is:
-# TAG = value [value, ...]
-# For lists, items can also be appended using:
-# TAG += value [value, ...]
-# Values that contain spaces should be placed between quotes (\" \").
-
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-
-# This tag specifies the encoding used for all characters in the configuration
-# file that follow. The default is UTF-8 which is also the encoding used for all
-# text before the first occurrence of this tag. Doxygen uses libiconv (or the
-# iconv built into libc) for the transcoding. See
-# https://www.gnu.org/software/libiconv/ for the list of possible encodings.
-# The default value is: UTF-8.
-
-DOXYFILE_ENCODING      = UTF-8
-
-# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by
-# double-quotes, unless you are using Doxywizard) that should identify the
-# project for which the documentation is generated. This name is used in the
-# title of most generated pages and in a few other places.
-# The default value is: My Project.
-
-PROJECT_NAME           = "LUFA Library"
-
-# The PROJECT_NUMBER tag can be used to enter a project or revision number. This
-# could be handy for archiving the generated documentation or if some version
-# control system is used.
-
-PROJECT_NUMBER         = 000000
-
-# Using the PROJECT_BRIEF tag one can provide an optional one line description
-# for a project that appears at the top of each page and should give viewer a
-# quick idea about the purpose of the project. Keep the description short.
-
-PROJECT_BRIEF          =
-
-# With the PROJECT_LOGO tag one can specify a logo or an icon that is included
-# in the documentation. The maximum height of the logo should not exceed 55
-# pixels and the maximum width should not exceed 200 pixels. Doxygen will copy
-# the logo to the output directory.
-
-PROJECT_LOGO           = ./DoxygenPages/Images/LUFA_thumb.png
-
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
-# into which the generated documentation will be written. If a relative path is
-# entered, it will be relative to the location where doxygen was started. If
-# left blank the current directory will be used.
-
-OUTPUT_DIRECTORY       = ./Documentation/
-
-# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub-
-# directories (in 2 levels) under the output directory of each output format and
-# will distribute the generated files over these directories. Enabling this
-# option can be useful when feeding doxygen a huge amount of source files, where
-# putting all generated files in the same directory would otherwise causes
-# performance problems for the file system.
-# The default value is: NO.
-
-CREATE_SUBDIRS         = NO
-
-# If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII
-# characters to appear in the names of generated files. If set to NO, non-ASCII
-# characters will be escaped, for example _xE3_x81_x84 will be used for Unicode
-# U+3044.
-# The default value is: NO.
-
-ALLOW_UNICODE_NAMES    = NO
-
-# The OUTPUT_LANGUAGE tag is used to specify the language in which all
-# documentation generated by doxygen is written. Doxygen will use this
-# information to generate all constant output in the proper language.
-# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese,
-# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States),
-# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian,
-# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages),
-# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian,
-# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian,
-# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish,
-# Ukrainian and Vietnamese.
-# The default value is: English.
-
-OUTPUT_LANGUAGE        = English
-
-# The OUTPUT_TEXT_DIRECTION tag is used to specify the direction in which all
-# documentation generated by doxygen is written. Doxygen will use this
-# information to generate all generated output in the proper direction.
-# Possible values are: None, LTR, RTL and Context.
-# The default value is: None.
-
-OUTPUT_TEXT_DIRECTION  = None
-
-# If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member
-# descriptions after the members that are listed in the file and class
-# documentation (similar to Javadoc). Set to NO to disable this.
-# The default value is: YES.
-
-BRIEF_MEMBER_DESC      = YES
-
-# If the REPEAT_BRIEF tag is set to YES, doxygen will prepend the brief
-# description of a member or function before the detailed description
-#
-# Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
-# brief descriptions will be completely suppressed.
-# The default value is: YES.
-
-REPEAT_BRIEF           = NO
-
-# This tag implements a quasi-intelligent brief description abbreviator that is
-# used to form the text in various listings. Each string in this list, if found
-# as the leading text of the brief description, will be stripped from the text
-# and the result, after processing the whole list, is used as the annotated
-# text. Otherwise, the brief description is used as-is. If left blank, the
-# following values are used ($name is automatically replaced with the name of
-# the entity):The $name class, The $name widget, The $name file, is, provides,
-# specifies, contains, represents, a, an and the.
-
-ABBREVIATE_BRIEF       = "The $name class" \
-                         "The $name widget" \
-                         "The $name file" \
-                         is \
-                         provides \
-                         specifies \
-                         contains \
-                         represents \
-                         a \
-                         an \
-                         the
-
-# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
-# doxygen will generate a detailed section even if there is only a brief
-# description.
-# The default value is: NO.
-
-ALWAYS_DETAILED_SEC    = NO
-
-# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
-# inherited members of a class in the documentation of that class as if those
-# members were ordinary class members. Constructors, destructors and assignment
-# operators of the base classes will not be shown.
-# The default value is: NO.
-
-INLINE_INHERITED_MEMB  = NO
-
-# If the FULL_PATH_NAMES tag is set to YES, doxygen will prepend the full path
-# before files name in the file list and in the header files. If set to NO the
-# shortest path that makes the file name unique will be used
-# The default value is: YES.
-
-FULL_PATH_NAMES        = YES
-
-# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path.
-# Stripping is only done if one of the specified strings matches the left-hand
-# part of the path. The tag can be used to show relative paths in the file list.
-# If left blank the directory from which doxygen is run is used as the path to
-# strip.
-#
-# Note that you can specify absolute paths here, but also relative paths, which
-# will be relative from the directory where doxygen is started.
-# This tag requires that the tag FULL_PATH_NAMES is set to YES.
-
-STRIP_FROM_PATH        =
-
-# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the
-# path mentioned in the documentation of a class, which tells the reader which
-# header file to include in order to use a class. If left blank only the name of
-# the header file containing the class definition is used. Otherwise one should
-# specify the list of include paths that are normally passed to the compiler
-# using the -I flag.
-
-STRIP_FROM_INC_PATH    =
-
-# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but
-# less readable) file names. This can be useful is your file systems doesn't
-# support long names like on DOS, Mac, or CD-ROM.
-# The default value is: NO.
-
-SHORT_NAMES            = NO
-
-# If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the
-# first line (until the first dot) of a Javadoc-style comment as the brief
-# description. If set to NO, the Javadoc-style will behave just like regular Qt-
-# style comments (thus requiring an explicit @brief command for a brief
-# description.)
-# The default value is: NO.
-
-JAVADOC_AUTOBRIEF      = NO
-
-# If the JAVADOC_BANNER tag is set to YES then doxygen will interpret a line
-# such as
-# /***************
-# as being the beginning of a Javadoc-style comment "banner". If set to NO, the
-# Javadoc-style will behave just like regular comments and it will not be
-# interpreted by doxygen.
-# The default value is: NO.
-
-JAVADOC_BANNER         = NO
-
-# If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first
-# line (until the first dot) of a Qt-style comment as the brief description. If
-# set to NO, the Qt-style will behave just like regular Qt-style comments (thus
-# requiring an explicit \brief command for a brief description.)
-# The default value is: NO.
-
-QT_AUTOBRIEF           = NO
-
-# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a
-# multi-line C++ special comment block (i.e. a block of //! or /// comments) as
-# a brief description. This used to be the default behavior. The new default is
-# to treat a multi-line C++ comment block as a detailed description. Set this
-# tag to YES if you prefer the old behavior instead.
-#
-# Note that setting this tag to YES also means that rational rose comments are
-# not recognized any more.
-# The default value is: NO.
-
-MULTILINE_CPP_IS_BRIEF = NO
-
-# If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
-# documentation from any documented member that it re-implements.
-# The default value is: YES.
-
-INHERIT_DOCS           = YES
-
-# If the SEPARATE_MEMBER_PAGES tag is set to YES then doxygen will produce a new
-# page for each member. If set to NO, the documentation of a member will be part
-# of the file/class/namespace that contains it.
-# The default value is: NO.
-
-SEPARATE_MEMBER_PAGES  = NO
-
-# The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen
-# uses this value to replace tabs by spaces in code fragments.
-# Minimum value: 1, maximum value: 16, default value: 4.
-
-TAB_SIZE               = 4
-
-# This tag can be used to specify a number of aliases that act as commands in
-# the documentation. An alias has the form:
-# name=value
-# For example adding
-# "sideeffect=@par Side Effects:\n"
-# will allow you to put the command \sideeffect (or @sideeffect) in the
-# documentation, which will result in a user-defined paragraph with heading
-# "Side Effects:". You can put \n's in the value part of an alias to insert
-# newlines (in the resulting output). You can put ^^ in the value part of an
-# alias to insert a newline as if a physical newline was in the original file.
-# When you need a literal { or } or , in the value part of an alias you have to
-# escape them by means of a backslash (\), this can lead to conflicts with the
-# commands \{ and \} for these it is advised to use the version @{ and @} or use
-# a double escape (\\{ and \\})
-
-ALIASES                =
-
-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
-# only. Doxygen will then generate output that is more tailored for C. For
-# instance, some of the names that are used will be different. The list of all
-# members will be omitted, etc.
-# The default value is: NO.
-
-OPTIMIZE_OUTPUT_FOR_C  = YES
-
-# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or
-# Python sources only. Doxygen will then generate output that is more tailored
-# for that language. For instance, namespaces will be presented as packages,
-# qualified scopes will look different, etc.
-# The default value is: NO.
-
-OPTIMIZE_OUTPUT_JAVA   = NO
-
-# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
-# sources. Doxygen will then generate output that is tailored for Fortran.
-# The default value is: NO.
-
-OPTIMIZE_FOR_FORTRAN   = NO
-
-# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
-# sources. Doxygen will then generate output that is tailored for VHDL.
-# The default value is: NO.
-
-OPTIMIZE_OUTPUT_VHDL   = NO
-
-# Set the OPTIMIZE_OUTPUT_SLICE tag to YES if your project consists of Slice
-# sources only. Doxygen will then generate output that is more tailored for that
-# language. For instance, namespaces will be presented as modules, types will be
-# separated into more groups, etc.
-# The default value is: NO.
-
-OPTIMIZE_OUTPUT_SLICE  = NO
-
-# Doxygen selects the parser to use depending on the extension of the files it
-# parses. With this tag you can assign which parser to use for a given
-# extension. Doxygen has a built-in mapping, but you can override or extend it
-# using this tag. The format is ext=language, where ext is a file extension, and
-# language is one of the parsers supported by doxygen: IDL, Java, JavaScript,
-# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice, VHDL,
-# Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
-# FortranFree, unknown formatted Fortran: Fortran. In the later case the parser
-# tries to guess whether the code is fixed or free formatted code, this is the
-# default for Fortran type files). For instance to make doxygen treat .inc files
-# as Fortran files (default is PHP), and .f files as C (default is Fortran),
-# use: inc=Fortran f=C.
-#
-# Note: For files without extension you can use no_extension as a placeholder.
-#
-# Note that for custom extensions you also need to set FILE_PATTERNS otherwise
-# the files are not read by doxygen.
-
-EXTENSION_MAPPING      =
-
-# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments
-# according to the Markdown format, which allows for more readable
-# documentation. See https://daringfireball.net/projects/markdown/ for details.
-# The output of markdown processing is further processed by doxygen, so you can
-# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in
-# case of backward compatibilities issues.
-# The default value is: YES.
-
-MARKDOWN_SUPPORT       = NO
-
-# When the TOC_INCLUDE_HEADINGS tag is set to a non-zero value, all headings up
-# to that level are automatically included in the table of contents, even if
-# they do not have an id attribute.
-# Note: This feature currently applies only to Markdown headings.
-# Minimum value: 0, maximum value: 99, default value: 5.
-# This tag requires that the tag MARKDOWN_SUPPORT is set to YES.
-
-TOC_INCLUDE_HEADINGS   = 5
-
-# When enabled doxygen tries to link words that correspond to documented
-# classes, or namespaces to their corresponding documentation. Such a link can
-# be prevented in individual cases by putting a % sign in front of the word or
-# globally by setting AUTOLINK_SUPPORT to NO.
-# The default value is: YES.
-
-AUTOLINK_SUPPORT       = YES
-
-# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
-# to include (a tag file for) the STL sources as input, then you should set this
-# tag to YES in order to let doxygen match functions declarations and
-# definitions whose arguments contain STL classes (e.g. func(std::string);
-# versus func(std::string) {}). This also make the inheritance and collaboration
-# diagrams that involve STL classes more complete and accurate.
-# The default value is: NO.
-
-BUILTIN_STL_SUPPORT    = NO
-
-# If you use Microsoft's C++/CLI language, you should set this option to YES to
-# enable parsing support.
-# The default value is: NO.
-
-CPP_CLI_SUPPORT        = NO
-
-# Set the SIP_SUPPORT tag to YES if your project consists of sip (see:
-# https://www.riverbankcomputing.com/software/sip/intro) sources only. Doxygen
-# will parse them like normal C++ but will assume all classes use public instead
-# of private inheritance when no explicit protection keyword is present.
-# The default value is: NO.
-
-SIP_SUPPORT            = NO
-
-# For Microsoft's IDL there are propget and propput attributes to indicate
-# getter and setter methods for a property. Setting this option to YES will make
-# doxygen to replace the get and set methods by a property in the documentation.
-# This will only work if the methods are indeed getting or setting a simple
-# type. If this is not the case, or you want to show the methods anyway, you
-# should set this option to NO.
-# The default value is: YES.
-
-IDL_PROPERTY_SUPPORT   = NO
-
-# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
-# tag is set to YES then doxygen will reuse the documentation of the first
-# member in the group (if any) for the other members of the group. By default
-# all members of a group must be documented explicitly.
-# The default value is: NO.
-
-DISTRIBUTE_GROUP_DOC   = NO
-
-# If one adds a struct or class to a group and this option is enabled, then also
-# any nested class or struct is added to the same group. By default this option
-# is disabled and one has to add nested compounds explicitly via \ingroup.
-# The default value is: NO.
-
-GROUP_NESTED_COMPOUNDS = NO
-
-# Set the SUBGROUPING tag to YES to allow class member groups of the same type
-# (for instance a group of public functions) to be put as a subgroup of that
-# type (e.g. under the Public Functions section). Set it to NO to prevent
-# subgrouping. Alternatively, this can be done per class using the
-# \nosubgrouping command.
-# The default value is: YES.
-
-SUBGROUPING            = YES
-
-# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions
-# are shown inside the group in which they are included (e.g. using \ingroup)
-# instead of on a separate page (for HTML and Man pages) or section (for LaTeX
-# and RTF).
-#
-# Note that this feature does not work in combination with
-# SEPARATE_MEMBER_PAGES.
-# The default value is: NO.
-
-INLINE_GROUPED_CLASSES = NO
-
-# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions
-# with only public data fields or simple typedef fields will be shown inline in
-# the documentation of the scope in which they are defined (i.e. file,
-# namespace, or group documentation), provided this scope is documented. If set
-# to NO, structs, classes, and unions are shown on a separate page (for HTML and
-# Man pages) or section (for LaTeX and RTF).
-# The default value is: NO.
-
-INLINE_SIMPLE_STRUCTS  = NO
-
-# When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or
-# enum is documented as struct, union, or enum with the name of the typedef. So
-# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
-# with name TypeT. When disabled the typedef will appear as a member of a file,
-# namespace, or class. And the struct will be named TypeS. This can typically be
-# useful for C code in case the coding convention dictates that all compound
-# types are typedef'ed and only the typedef is referenced, never the tag name.
-# The default value is: NO.
-
-TYPEDEF_HIDES_STRUCT   = YES
-
-# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This
-# cache is used to resolve symbols given their name and scope. Since this can be
-# an expensive process and often the same symbol appears multiple times in the
-# code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small
-# doxygen will become slower. If the cache is too large, memory is wasted. The
-# cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range
-# is 0..9, the default is 0, corresponding to a cache size of 2^16=65536
-# symbols. At the end of a run doxygen will report the cache usage and suggest
-# the optimal cache size from a speed point of view.
-# Minimum value: 0, maximum value: 9, default value: 0.
-
-LOOKUP_CACHE_SIZE      = 0
-
-#---------------------------------------------------------------------------
-# Build related configuration options
-#---------------------------------------------------------------------------
-
-# If the EXTRACT_ALL tag is set to YES, doxygen will assume all entities in
-# documentation are documented, even if no documentation was available. Private
-# class members and static file members will be hidden unless the
-# EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES.
-# Note: This will also disable the warnings about undocumented members that are
-# normally produced when WARNINGS is set to YES.
-# The default value is: NO.
-
-EXTRACT_ALL            = YES
-
-# If the EXTRACT_PRIVATE tag is set to YES, all private members of a class will
-# be included in the documentation.
-# The default value is: NO.
-
-EXTRACT_PRIVATE        = YES
-
-# If the EXTRACT_PRIV_VIRTUAL tag is set to YES, documented private virtual
-# methods of a class will be included in the documentation.
-# The default value is: NO.
-
-EXTRACT_PRIV_VIRTUAL   = NO
-
-# If the EXTRACT_PACKAGE tag is set to YES, all members with package or internal
-# scope will be included in the documentation.
-# The default value is: NO.
-
-EXTRACT_PACKAGE        = NO
-
-# If the EXTRACT_STATIC tag is set to YES, all static members of a file will be
-# included in the documentation.
-# The default value is: NO.
-
-EXTRACT_STATIC         = YES
-
-# If the EXTRACT_LOCAL_CLASSES tag is set to YES, classes (and structs) defined
-# locally in source files will be included in the documentation. If set to NO,
-# only classes defined in header files are included. Does not have any effect
-# for Java sources.
-# The default value is: YES.
-
-EXTRACT_LOCAL_CLASSES  = YES
-
-# This flag is only useful for Objective-C code. If set to YES, local methods,
-# which are defined in the implementation section but not in the interface are
-# included in the documentation. If set to NO, only methods in the interface are
-# included.
-# The default value is: NO.
-
-EXTRACT_LOCAL_METHODS  = NO
-
-# If this flag is set to YES, the members of anonymous namespaces will be
-# extracted and appear in the documentation as a namespace called
-# 'anonymous_namespace{file}', where file will be replaced with the base name of
-# the file that contains the anonymous namespace. By default anonymous namespace
-# are hidden.
-# The default value is: NO.
-
-EXTRACT_ANON_NSPACES   = NO
-
-# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all
-# undocumented members inside documented classes or files. If set to NO these
-# members will be included in the various overviews, but no documentation
-# section is generated. This option has no effect if EXTRACT_ALL is enabled.
-# The default value is: NO.
-
-HIDE_UNDOC_MEMBERS     = NO
-
-# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all
-# undocumented classes that are normally visible in the class hierarchy. If set
-# to NO, these classes will be included in the various overviews. This option
-# has no effect if EXTRACT_ALL is enabled.
-# The default value is: NO.
-
-HIDE_UNDOC_CLASSES     = NO
-
-# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
-# declarations. If set to NO, these declarations will be included in the
-# documentation.
-# The default value is: NO.
-
-HIDE_FRIEND_COMPOUNDS  = NO
-
-# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any
-# documentation blocks found inside the body of a function. If set to NO, these
-# blocks will be appended to the function's detailed documentation block.
-# The default value is: NO.
-
-HIDE_IN_BODY_DOCS      = NO
-
-# The INTERNAL_DOCS tag determines if documentation that is typed after a
-# \internal command is included. If the tag is set to NO then the documentation
-# will be excluded. Set it to YES to include the internal documentation.
-# The default value is: NO.
-
-INTERNAL_DOCS          = NO
-
-# If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file
-# names in lower-case letters. If set to YES, upper-case letters are also
-# allowed. This is useful if you have classes or files whose names only differ
-# in case and if your file system supports case sensitive file names. Windows
-# (including Cygwin) ands Mac users are advised to set this option to NO.
-# The default value is: system dependent.
-
-CASE_SENSE_NAMES       = NO
-
-# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with
-# their full class and namespace scopes in the documentation. If set to YES, the
-# scope will be hidden.
-# The default value is: NO.
-
-HIDE_SCOPE_NAMES       = NO
-
-# If the HIDE_COMPOUND_REFERENCE tag is set to NO (default) then doxygen will
-# append additional text to a page's title, such as Class Reference. If set to
-# YES the compound reference will be hidden.
-# The default value is: NO.
-
-HIDE_COMPOUND_REFERENCE= NO
-
-# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
-# the files that are included by a file in the documentation of that file.
-# The default value is: YES.
-
-SHOW_INCLUDE_FILES     = YES
-
-# If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each
-# grouped member an include statement to the documentation, telling the reader
-# which file to include in order to use the member.
-# The default value is: NO.
-
-SHOW_GROUPED_MEMB_INC  = NO
-
-# If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include
-# files with double quotes in the documentation rather than with sharp brackets.
-# The default value is: NO.
-
-FORCE_LOCAL_INCLUDES   = NO
-
-# If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the
-# documentation for inline members.
-# The default value is: YES.
-
-INLINE_INFO            = YES
-
-# If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the
-# (detailed) documentation of file and class members alphabetically by member
-# name. If set to NO, the members will appear in declaration order.
-# The default value is: YES.
-
-SORT_MEMBER_DOCS       = YES
-
-# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief
-# descriptions of file, namespace and class members alphabetically by member
-# name. If set to NO, the members will appear in declaration order. Note that
-# this will also influence the order of the classes in the class list.
-# The default value is: NO.
-
-SORT_BRIEF_DOCS        = YES
-
-# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the
-# (brief and detailed) documentation of class members so that constructors and
-# destructors are listed first. If set to NO the constructors will appear in the
-# respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS.
-# Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief
-# member documentation.
-# Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting
-# detailed member documentation.
-# The default value is: NO.
-
-SORT_MEMBERS_CTORS_1ST = NO
-
-# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy
-# of group names into alphabetical order. If set to NO the group names will
-# appear in their defined order.
-# The default value is: NO.
-
-SORT_GROUP_NAMES       = YES
-
-# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by
-# fully-qualified names, including namespaces. If set to NO, the class list will
-# be sorted only by class name, not including the namespace part.
-# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
-# Note: This option applies only to the class list, not to the alphabetical
-# list.
-# The default value is: NO.
-
-SORT_BY_SCOPE_NAME     = NO
-
-# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper
-# type resolution of all parameters of a function it will reject a match between
-# the prototype and the implementation of a member function even if there is
-# only one candidate or it is obvious which candidate to choose by doing a
-# simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still
-# accept a match between prototype and implementation in such cases.
-# The default value is: NO.
-
-STRICT_PROTO_MATCHING  = YES
-
-# The GENERATE_TODOLIST tag can be used to enable (YES) or disable (NO) the todo
-# list. This list is created by putting \todo commands in the documentation.
-# The default value is: YES.
-
-GENERATE_TODOLIST      = NO
-
-# The GENERATE_TESTLIST tag can be used to enable (YES) or disable (NO) the test
-# list. This list is created by putting \test commands in the documentation.
-# The default value is: YES.
-
-GENERATE_TESTLIST      = NO
-
-# The GENERATE_BUGLIST tag can be used to enable (YES) or disable (NO) the bug
-# list. This list is created by putting \bug commands in the documentation.
-# The default value is: YES.
-
-GENERATE_BUGLIST       = NO
-
-# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or disable (NO)
-# the deprecated list. This list is created by putting \deprecated commands in
-# the documentation.
-# The default value is: YES.
-
-GENERATE_DEPRECATEDLIST= YES
-
-# The ENABLED_SECTIONS tag can be used to enable conditional documentation
-# sections, marked by \if <section_label> ... \endif and \cond <section_label>
-# ... \endcond blocks.
-
-ENABLED_SECTIONS       =
-
-# The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the
-# initial value of a variable or macro / define can have for it to appear in the
-# documentation. If the initializer consists of more lines than specified here
-# it will be hidden. Use a value of 0 to hide initializers completely. The
-# appearance of the value of individual variables and macros / defines can be
-# controlled using \showinitializer or \hideinitializer command in the
-# documentation regardless of this setting.
-# Minimum value: 0, maximum value: 10000, default value: 30.
-
-MAX_INITIALIZER_LINES  = 1
-
-# Set the SHOW_USED_FILES tag to NO to disable the list of files generated at
-# the bottom of the documentation of classes and structs. If set to YES, the
-# list will mention the files that were used to generate the documentation.
-# The default value is: YES.
-
-SHOW_USED_FILES        = YES
-
-# Set the SHOW_FILES tag to NO to disable the generation of the Files page. This
-# will remove the Files entry from the Quick Index and from the Folder Tree View
-# (if specified).
-# The default value is: YES.
-
-SHOW_FILES             = YES
-
-# Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces
-# page. This will remove the Namespaces entry from the Quick Index and from the
-# Folder Tree View (if specified).
-# The default value is: YES.
-
-SHOW_NAMESPACES        = YES
-
-# The FILE_VERSION_FILTER tag can be used to specify a program or script that
-# doxygen should invoke to get the current version for each file (typically from
-# the version control system). Doxygen will invoke the program by executing (via
-# popen()) the command command input-file, where command is the value of the
-# FILE_VERSION_FILTER tag, and input-file is the name of an input file provided
-# by doxygen. Whatever the program writes to standard output is used as the file
-# version. For an example see the documentation.
-
-FILE_VERSION_FILTER    =
-
-# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
-# by doxygen. The layout file controls the global structure of the generated
-# output files in an output format independent way. To create the layout file
-# that represents doxygen's defaults, run doxygen with the -l option. You can
-# optionally specify a file name after the option, if omitted DoxygenLayout.xml
-# will be used as the name of the layout file.
-#
-# Note that if you run doxygen from a directory containing a file called
-# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
-# tag is left empty.
-
-LAYOUT_FILE            =
-
-# The CITE_BIB_FILES tag can be used to specify one or more bib files containing
-# the reference definitions. This must be a list of .bib files. The .bib
-# extension is automatically appended if omitted. This requires the bibtex tool
-# to be installed. See also https://en.wikipedia.org/wiki/BibTeX for more info.
-# For LaTeX the style of the bibliography can be controlled using
-# LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the
-# search path. See also \cite for info how to create references.
-
-CITE_BIB_FILES         =
-
-#---------------------------------------------------------------------------
-# Configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-
-# The QUIET tag can be used to turn on/off the messages that are generated to
-# standard output by doxygen. If QUIET is set to YES this implies that the
-# messages are off.
-# The default value is: NO.
-
-QUIET                  = YES
-
-# The WARNINGS tag can be used to turn on/off the warning messages that are
-# generated to standard error (stderr) by doxygen. If WARNINGS is set to YES
-# this implies that the warnings are on.
-#
-# Tip: Turn warnings on while writing the documentation.
-# The default value is: YES.
-
-WARNINGS               = YES
-
-# If the WARN_IF_UNDOCUMENTED tag is set to YES then doxygen will generate
-# warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag
-# will automatically be disabled.
-# The default value is: YES.
-
-WARN_IF_UNDOCUMENTED   = YES
-
-# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
-# potential errors in the documentation, such as not documenting some parameters
-# in a documented function, or documenting parameters that don't exist or using
-# markup commands wrongly.
-# The default value is: YES.
-
-WARN_IF_DOC_ERROR      = YES
-
-# This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
-# are documented, but have no documentation for their parameters or return
-# value. If set to NO, doxygen will only warn about wrong or incomplete
-# parameter documentation, but not about the absence of documentation. If
-# EXTRACT_ALL is set to YES then this flag will automatically be disabled.
-# The default value is: NO.
-
-WARN_NO_PARAMDOC       = YES
-
-# If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when
-# a warning is encountered.
-# The default value is: NO.
-
-WARN_AS_ERROR          = NO
-
-# The WARN_FORMAT tag determines the format of the warning messages that doxygen
-# can produce. The string should contain the $file, $line, and $text tags, which
-# will be replaced by the file and line number from which the warning originated
-# and the warning text. Optionally the format may contain $version, which will
-# be replaced by the version of the file (if it could be obtained via
-# FILE_VERSION_FILTER)
-# The default value is: $file:$line: $text.
-
-WARN_FORMAT            = "$file:$line: $text"
-
-# The WARN_LOGFILE tag can be used to specify a file to which warning and error
-# messages should be written. If left blank the output is written to standard
-# error (stderr).
-
-WARN_LOGFILE           =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the input files
-#---------------------------------------------------------------------------
-
-# The INPUT tag is used to specify the files and/or directories that contain
-# documented source files. You may enter file names like myfile.cpp or
-# directories like /usr/src/myproject. Separate the files or directories with
-# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
-# Note: If this tag is empty the current directory is searched.
-
-INPUT                  = ./
-
-# This tag can be used to specify the character encoding of the source files
-# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
-# libiconv (or the iconv built into libc) for the transcoding. See the libiconv
-# documentation (see: https://www.gnu.org/software/libiconv/) for the list of
-# possible encodings.
-# The default value is: UTF-8.
-
-INPUT_ENCODING         = UTF-8
-
-# If the value of the INPUT tag contains directories, you can use the
-# FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and
-# *.h) to filter out the source-files in the directories.
-#
-# Note that for custom extensions or not directly supported extensions you also
-# need to set EXTENSION_MAPPING for the extension otherwise the files are not
-# read by doxygen.
-#
-# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
-# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
-# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
-# *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C comment),
-# *.doc (to be provided as doxygen C comment), *.txt (to be provided as doxygen
-# C comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd,
-# *.vhdl, *.ucf, *.qsf and *.ice.
-
-FILE_PATTERNS          = *.h \
-                         *.txt
-
-# The RECURSIVE tag can be used to specify whether or not subdirectories should
-# be searched for input files as well.
-# The default value is: NO.
-
-RECURSIVE              = YES
-
-# The EXCLUDE tag can be used to specify files and/or directories that should be
-# excluded from the INPUT source files. This way you can easily exclude a
-# subdirectory from a directory tree whose root is specified with the INPUT tag.
-#
-# Note that relative paths are relative to the directory from which doxygen is
-# run.
-
-EXCLUDE                = Documentation/ \
-                         Build/ \
-                         License.txt
-
-# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
-# directories that are symbolic links (a Unix file system feature) are excluded
-# from the input.
-# The default value is: NO.
-
-EXCLUDE_SYMLINKS       = NO
-
-# If the value of the INPUT tag contains directories, you can use the
-# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
-# certain files from those directories.
-#
-# Note that the wildcards are matched against the file with absolute path, so to
-# exclude all test directories for example use the pattern */test/*
-
-EXCLUDE_PATTERNS       =
-
-# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
-# (namespaces, classes, functions, etc.) that should be excluded from the
-# output. The symbol name can be a fully qualified name, a word, or if the
-# wildcard * is used, a substring. Examples: ANamespace, AClass,
-# AClass::ANamespace, ANamespace::*Test
-#
-# Note that the wildcards are matched against the file with absolute path, so to
-# exclude all test directories use the pattern */test/*
-
-EXCLUDE_SYMBOLS        = _* \
-                         __*
-
-# The EXAMPLE_PATH tag can be used to specify one or more files or directories
-# that contain example code fragments that are included (see the \include
-# command).
-
-EXAMPLE_PATH           = ./ \
-                         CodeTemplates/
-
-# If the value of the EXAMPLE_PATH tag contains directories, you can use the
-# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and
-# *.h) to filter out the source-files in the directories. If left blank all
-# files are included.
-
-EXAMPLE_PATTERNS       = *
-
-# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
-# searched for input files to be used with the \include or \dontinclude commands
-# irrespective of the value of the RECURSIVE tag.
-# The default value is: NO.
-
-EXAMPLE_RECURSIVE      = NO
-
-# The IMAGE_PATH tag can be used to specify one or more files or directories
-# that contain images that are to be included in the documentation (see the
-# \image command).
-
-IMAGE_PATH             = ./
-
-# The INPUT_FILTER tag can be used to specify a program that doxygen should
-# invoke to filter for each input file. Doxygen will invoke the filter program
-# by executing (via popen()) the command:
-#
-# <filter> <input-file>
-#
-# where <filter> is the value of the INPUT_FILTER tag, and <input-file> is the
-# name of an input file. Doxygen will then use the output that the filter
-# program writes to standard output. If FILTER_PATTERNS is specified, this tag
-# will be ignored.
-#
-# Note that the filter must not add or remove lines; it is applied before the
-# code is scanned, but not when the output code is generated. If lines are added
-# or removed, the anchors will not be placed correctly.
-#
-# Note that for custom extensions or not directly supported extensions you also
-# need to set EXTENSION_MAPPING for the extension otherwise the files are not
-# properly processed by doxygen.
-
-INPUT_FILTER           =
-
-# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
-# basis. Doxygen will compare the file name with each pattern and apply the
-# filter if there is a match. The filters are a list of the form: pattern=filter
-# (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how
-# filters are used. If the FILTER_PATTERNS tag is empty or if none of the
-# patterns match the file name, INPUT_FILTER is applied.
-#
-# Note that for custom extensions or not directly supported extensions you also
-# need to set EXTENSION_MAPPING for the extension otherwise the files are not
-# properly processed by doxygen.
-
-FILTER_PATTERNS        =
-
-# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
-# INPUT_FILTER) will also be used to filter the input files that are used for
-# producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES).
-# The default value is: NO.
-
-FILTER_SOURCE_FILES    = NO
-
-# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
-# pattern. A pattern will override the setting for FILTER_PATTERN (if any) and
-# it is also possible to disable source filtering for a specific pattern using
-# *.ext= (so without naming a filter).
-# This tag requires that the tag FILTER_SOURCE_FILES is set to YES.
-
-FILTER_SOURCE_PATTERNS =
-
-# If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that
-# is part of the input, its contents will be placed on the main page
-# (index.html). This can be useful if you have a project on for instance GitHub
-# and want to reuse the introduction page also for the doxygen output.
-
-USE_MDFILE_AS_MAINPAGE =
-
-#---------------------------------------------------------------------------
-# Configuration options related to source browsing
-#---------------------------------------------------------------------------
-
-# If the SOURCE_BROWSER tag is set to YES then a list of source files will be
-# generated. Documented entities will be cross-referenced with these sources.
-#
-# Note: To get rid of all source code in the generated output, make sure that
-# also VERBATIM_HEADERS is set to NO.
-# The default value is: NO.
-
-SOURCE_BROWSER         = NO
-
-# Setting the INLINE_SOURCES tag to YES will include the body of functions,
-# classes and enums directly into the documentation.
-# The default value is: NO.
-
-INLINE_SOURCES         = NO
-
-# Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any
-# special comment blocks from generated source code fragments. Normal C, C++ and
-# Fortran comments will always remain visible.
-# The default value is: YES.
-
-STRIP_CODE_COMMENTS    = YES
-
-# If the REFERENCED_BY_RELATION tag is set to YES then for each documented
-# entity all documented functions referencing it will be listed.
-# The default value is: NO.
-
-REFERENCED_BY_RELATION = NO
-
-# If the REFERENCES_RELATION tag is set to YES then for each documented function
-# all documented entities called/used by that function will be listed.
-# The default value is: NO.
-
-REFERENCES_RELATION    = NO
-
-# If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set
-# to YES then the hyperlinks from functions in REFERENCES_RELATION and
-# REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will
-# link to the documentation.
-# The default value is: YES.
-
-REFERENCES_LINK_SOURCE = NO
-
-# If SOURCE_TOOLTIPS is enabled (the default) then hovering a hyperlink in the
-# source code will show a tooltip with additional information such as prototype,
-# brief description and links to the definition and documentation. Since this
-# will make the HTML file larger and loading of large files a bit slower, you
-# can opt to disable this feature.
-# The default value is: YES.
-# This tag requires that the tag SOURCE_BROWSER is set to YES.
-
-SOURCE_TOOLTIPS        = YES
-
-# If the USE_HTAGS tag is set to YES then the references to source code will
-# point to the HTML generated by the htags(1) tool instead of doxygen built-in
-# source browser. The htags tool is part of GNU's global source tagging system
-# (see https://www.gnu.org/software/global/global.html). You will need version
-# 4.8.6 or higher.
-#
-# To use it do the following:
-# - Install the latest version of global
-# - Enable SOURCE_BROWSER and USE_HTAGS in the configuration file
-# - Make sure the INPUT points to the root of the source tree
-# - Run doxygen as normal
-#
-# Doxygen will invoke htags (and that will in turn invoke gtags), so these
-# tools must be available from the command line (i.e. in the search path).
-#
-# The result: instead of the source browser generated by doxygen, the links to
-# source code will now point to the output of htags.
-# The default value is: NO.
-# This tag requires that the tag SOURCE_BROWSER is set to YES.
-
-USE_HTAGS              = NO
-
-# If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a
-# verbatim copy of the header file for each class for which an include is
-# specified. Set to NO to disable this.
-# See also: Section \class.
-# The default value is: YES.
-
-VERBATIM_HEADERS       = NO
-
-# If the CLANG_ASSISTED_PARSING tag is set to YES then doxygen will use the
-# clang parser (see: http://clang.llvm.org/) for more accurate parsing at the
-# cost of reduced performance. This can be particularly helpful with template
-# rich C++ code for which doxygen's built-in parser lacks the necessary type
-# information.
-# Note: The availability of this option depends on whether or not doxygen was
-# generated with the -Duse_libclang=ON option for CMake.
-# The default value is: NO.
-
-CLANG_ASSISTED_PARSING = NO
-
-# If clang assisted parsing is enabled you can provide the compiler with command
-# line options that you would normally use when invoking the compiler. Note that
-# the include paths will already be set by doxygen for the files and directories
-# specified with INPUT and INCLUDE_PATH.
-# This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES.
-
-CLANG_OPTIONS          =
-
-# If clang assisted parsing is enabled you can provide the clang parser with the
-# path to the compilation database (see:
-# http://clang.llvm.org/docs/HowToSetupToolingForLLVM.html) used when the files
-# were built. This is equivalent to specifying the "-p" option to a clang tool,
-# such as clang-check. These options will then be passed to the parser.
-# Note: The availability of this option depends on whether or not doxygen was
-# generated with the -Duse_libclang=ON option for CMake.
-
-CLANG_DATABASE_PATH    =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-
-# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index of all
-# compounds will be generated. Enable this if the project contains a lot of
-# classes, structs, unions or interfaces.
-# The default value is: YES.
-
-ALPHABETICAL_INDEX     = YES
-
-# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in
-# which the alphabetical index list will be split.
-# Minimum value: 1, maximum value: 20, default value: 5.
-# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
-
-COLS_IN_ALPHA_INDEX    = 5
-
-# In case all classes in a project start with a common prefix, all classes will
-# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag
-# can be used to specify a prefix (or a list of prefixes) that should be ignored
-# while generating the index headers.
-# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
-
-IGNORE_PREFIX          =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the HTML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_HTML tag is set to YES, doxygen will generate HTML output
-# The default value is: YES.
-
-GENERATE_HTML          = YES
-
-# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it.
-# The default directory is: html.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_OUTPUT            = html
-
-# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each
-# generated HTML page (for example: .htm, .php, .asp).
-# The default value is: .html.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_FILE_EXTENSION    = .html
-
-# The HTML_HEADER tag can be used to specify a user-defined HTML header file for
-# each generated HTML page. If the tag is left blank doxygen will generate a
-# standard header.
-#
-# To get valid HTML the header file that includes any scripts and style sheets
-# that doxygen needs, which is dependent on the configuration options used (e.g.
-# the setting GENERATE_TREEVIEW). It is highly recommended to start with a
-# default header using
-# doxygen -w html new_header.html new_footer.html new_stylesheet.css
-# YourConfigFile
-# and then modify the file new_header.html. See also section "Doxygen usage"
-# for information on how to generate the default header that doxygen normally
-# uses.
-# Note: The header is subject to change so you typically have to regenerate the
-# default header when upgrading to a newer version of doxygen. For a description
-# of the possible markers and block names see the documentation.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_HEADER            =
-
-# The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each
-# generated HTML page. If the tag is left blank doxygen will generate a standard
-# footer. See HTML_HEADER for more information on how to generate a default
-# footer and what special commands can be used inside the footer. See also
-# section "Doxygen usage" for information on how to generate the default footer
-# that doxygen normally uses.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_FOOTER            = ./DoxygenPages/Style/Footer.htm
-
-# The HTML_STYLESHEET tag can be used to specify a user-defined cascading style
-# sheet that is used by each HTML page. It can be used to fine-tune the look of
-# the HTML output. If left blank doxygen will generate a default style sheet.
-# See also section "Doxygen usage" for information on how to generate the style
-# sheet that doxygen normally uses.
-# Note: It is recommended to use HTML_EXTRA_STYLESHEET instead of this tag, as
-# it is more robust and this tag (HTML_STYLESHEET) will in the future become
-# obsolete.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_STYLESHEET        =
-
-# The HTML_EXTRA_STYLESHEET tag can be used to specify additional user-defined
-# cascading style sheets that are included after the standard style sheets
-# created by doxygen. Using this option one can overrule certain style aspects.
-# This is preferred over using HTML_STYLESHEET since it does not replace the
-# standard style sheet and is therefore more robust against future updates.
-# Doxygen will copy the style sheet files to the output directory.
-# Note: The order of the extra style sheet files is of importance (e.g. the last
-# style sheet in the list overrules the setting of the previous ones in the
-# list). For an example see the documentation.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_EXTRA_STYLESHEET  = ./DoxygenPages/Style/Style.css
-
-# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
-# other source files which should be copied to the HTML output directory. Note
-# that these files will be copied to the base HTML output directory. Use the
-# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
-# files. In the HTML_STYLESHEET file, use the file name only. Also note that the
-# files will be copied as-is; there are no commands or markers available.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_EXTRA_FILES       =
-
-# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
-# will adjust the colors in the style sheet and background images according to
-# this color. Hue is specified as an angle on a colorwheel, see
-# https://en.wikipedia.org/wiki/Hue for more information. For instance the value
-# 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
-# purple, and 360 is red again.
-# Minimum value: 0, maximum value: 359, default value: 220.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_COLORSTYLE_HUE    = 220
-
-# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
-# in the HTML output. For a value of 0 the output will use grayscales only. A
-# value of 255 will produce the most vivid colors.
-# Minimum value: 0, maximum value: 255, default value: 100.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_COLORSTYLE_SAT    = 120
-
-# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the
-# luminance component of the colors in the HTML output. Values below 100
-# gradually make the output lighter, whereas values above 100 make the output
-# darker. The value divided by 100 is the actual gamma applied, so 80 represents
-# a gamma of 0.8, The value 220 represents a gamma of 2.2, and 100 does not
-# change the gamma.
-# Minimum value: 40, maximum value: 240, default value: 80.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_COLORSTYLE_GAMMA  = 80
-
-# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
-# page will contain the date and time when the page was generated. Setting this
-# to YES can help to show when doxygen was last run and thus if the
-# documentation is up to date.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_TIMESTAMP         = NO
-
-# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
-# documentation will contain a main index with vertical navigation menus that
-# are dynamically created via JavaScript. If disabled, the navigation index will
-# consists of multiple levels of tabs that are statically embedded in every HTML
-# page. Disable this option to support browsers that do not have JavaScript,
-# like the Qt help browser.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_DYNAMIC_MENUS     = YES
-
-# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
-# documentation will contain sections that can be hidden and shown after the
-# page has loaded.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_DYNAMIC_SECTIONS  = YES
-
-# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries
-# shown in the various tree structured indices initially; the user can expand
-# and collapse entries dynamically later on. Doxygen will expand the tree to
-# such a level that at most the specified number of entries are visible (unless
-# a fully collapsed tree already exceeds this amount). So setting the number of
-# entries 1 will produce a full collapsed tree by default. 0 is a special value
-# representing an infinite number of entries and will result in a full expanded
-# tree by default.
-# Minimum value: 0, maximum value: 9999, default value: 100.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_INDEX_NUM_ENTRIES = 100
-
-# If the GENERATE_DOCSET tag is set to YES, additional index files will be
-# generated that can be used as input for Apple's Xcode 3 integrated development
-# environment (see: https://developer.apple.com/xcode/), introduced with OSX
-# 10.5 (Leopard). To create a documentation set, doxygen will generate a
-# Makefile in the HTML output directory. Running make will produce the docset in
-# that directory and running make install will install the docset in
-# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at
-# startup. See https://developer.apple.com/library/archive/featuredarticles/Doxy
-# genXcode/_index.html for more information.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_DOCSET        = NO
-
-# This tag determines the name of the docset feed. A documentation feed provides
-# an umbrella under which multiple documentation sets from a single provider
-# (such as a company or product suite) can be grouped.
-# The default value is: Doxygen generated docs.
-# This tag requires that the tag GENERATE_DOCSET is set to YES.
-
-DOCSET_FEEDNAME        = "Doxygen generated docs"
-
-# This tag specifies a string that should uniquely identify the documentation
-# set bundle. This should be a reverse domain-name style string, e.g.
-# com.mycompany.MyDocSet. Doxygen will append .docset to the name.
-# The default value is: org.doxygen.Project.
-# This tag requires that the tag GENERATE_DOCSET is set to YES.
-
-DOCSET_BUNDLE_ID       = org.doxygen.Project
-
-# The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify
-# the documentation publisher. This should be a reverse domain-name style
-# string, e.g. com.mycompany.MyDocSet.documentation.
-# The default value is: org.doxygen.Publisher.
-# This tag requires that the tag GENERATE_DOCSET is set to YES.
-
-DOCSET_PUBLISHER_ID    = com.lufa-lib.library.documentation
-
-# The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher.
-# The default value is: Publisher.
-# This tag requires that the tag GENERATE_DOCSET is set to YES.
-
-DOCSET_PUBLISHER_NAME  = DeanCamera
-
-# If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
-# additional HTML index files: index.hhp, index.hhc, and index.hhk. The
-# index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
-# (see: https://www.microsoft.com/en-us/download/details.aspx?id=21138) on
-# Windows.
-#
-# The HTML Help Workshop contains a compiler that can convert all HTML output
-# generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
-# files are now used as the Windows 98 help format, and will replace the old
-# Windows help format (.hlp) on all Windows platforms in the future. Compressed
-# HTML files also contain an index, a table of contents, and you can search for
-# words in the documentation. The HTML workshop also contains a viewer for
-# compressed HTML files.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_HTMLHELP      = NO
-
-# The CHM_FILE tag can be used to specify the file name of the resulting .chm
-# file. You can add a path in front of the file if the result should not be
-# written to the html output directory.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-CHM_FILE               = ../LUFA.chm
-
-# The HHC_LOCATION tag can be used to specify the location (absolute path
-# including file name) of the HTML help compiler (hhc.exe). If non-empty,
-# doxygen will try to run the HTML help compiler on the generated index.hhp.
-# The file has to be specified with full path.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-HHC_LOCATION           =
-
-# The GENERATE_CHI flag controls if a separate .chi index file is generated
-# (YES) or that it should be included in the master .chm file (NO).
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-GENERATE_CHI           = NO
-
-# The CHM_INDEX_ENCODING is used to encode HtmlHelp index (hhk), content (hhc)
-# and project file content.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-CHM_INDEX_ENCODING     =
-
-# The BINARY_TOC flag controls whether a binary table of contents is generated
-# (YES) or a normal table of contents (NO) in the .chm file. Furthermore it
-# enables the Previous and Next buttons.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-BINARY_TOC             = NO
-
-# The TOC_EXPAND flag can be set to YES to add extra items for group members to
-# the table of contents of the HTML help documentation and to the tree view.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-TOC_EXPAND             = YES
-
-# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
-# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that
-# can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help
-# (.qch) of the generated HTML documentation.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_QHP           = NO
-
-# If the QHG_LOCATION tag is specified, the QCH_FILE tag can be used to specify
-# the file name of the resulting .qch file. The path specified is relative to
-# the HTML output folder.
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QCH_FILE               =
-
-# The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help
-# Project output. For more information please see Qt Help Project / Namespace
-# (see: https://doc.qt.io/archives/qt-4.8/qthelpproject.html#namespace).
-# The default value is: org.doxygen.Project.
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_NAMESPACE          = org.doxygen.Project
-
-# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt
-# Help Project output. For more information please see Qt Help Project / Virtual
-# Folders (see: https://doc.qt.io/archives/qt-4.8/qthelpproject.html#virtual-
-# folders).
-# The default value is: doc.
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_VIRTUAL_FOLDER     = doc
-
-# If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom
-# filter to add. For more information please see Qt Help Project / Custom
-# Filters (see: https://doc.qt.io/archives/qt-4.8/qthelpproject.html#custom-
-# filters).
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_CUST_FILTER_NAME   =
-
-# The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the
-# custom filter to add. For more information please see Qt Help Project / Custom
-# Filters (see: https://doc.qt.io/archives/qt-4.8/qthelpproject.html#custom-
-# filters).
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_CUST_FILTER_ATTRS  =
-
-# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
-# project's filter section matches. Qt Help Project / Filter Attributes (see:
-# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#filter-attributes).
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_SECT_FILTER_ATTRS  =
-
-# The QHG_LOCATION tag can be used to specify the location of Qt's
-# qhelpgenerator. If non-empty doxygen will try to run qhelpgenerator on the
-# generated .qhp file.
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHG_LOCATION           =
-
-# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be
-# generated, together with the HTML files, they form an Eclipse help plugin. To
-# install this plugin and make it available under the help contents menu in
-# Eclipse, the contents of the directory containing the HTML and XML files needs
-# to be copied into the plugins directory of eclipse. The name of the directory
-# within the plugins directory should be the same as the ECLIPSE_DOC_ID value.
-# After copying Eclipse needs to be restarted before the help appears.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_ECLIPSEHELP   = NO
-
-# A unique identifier for the Eclipse help plugin. When installing the plugin
-# the directory name containing the HTML and XML files should also have this
-# name. Each documentation set should have its own identifier.
-# The default value is: org.doxygen.Project.
-# This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES.
-
-ECLIPSE_DOC_ID         = org.doxygen.Project
-
-# If you want full control over the layout of the generated HTML pages it might
-# be necessary to disable the index and replace it with your own. The
-# DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) at top
-# of each HTML page. A value of NO enables the index and the value YES disables
-# it. Since the tabs in the index contain the same information as the navigation
-# tree, you can set this option to YES if you also set GENERATE_TREEVIEW to YES.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-DISABLE_INDEX          = YES
-
-# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
-# structure should be generated to display hierarchical information. If the tag
-# value is set to YES, a side panel will be generated containing a tree-like
-# index structure (just like the one that is generated for HTML Help). For this
-# to work a browser that supports JavaScript, DHTML, CSS and frames is required
-# (i.e. any modern browser). Windows users are probably better off using the
-# HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can
-# further fine-tune the look of the index. As an example, the default style
-# sheet generated by doxygen has an example that shows how to put an image at
-# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
-# the same information as the tab index, you could consider setting
-# DISABLE_INDEX to YES when enabling this option.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_TREEVIEW      = YES
-
-# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
-# doxygen will group on one line in the generated HTML documentation.
-#
-# Note that a value of 0 will completely suppress the enum values from appearing
-# in the overview section.
-# Minimum value: 0, maximum value: 20, default value: 4.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-ENUM_VALUES_PER_LINE   = 1
-
-# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used
-# to set the initial width (in pixels) of the frame in which the tree is shown.
-# Minimum value: 0, maximum value: 1500, default value: 250.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-TREEVIEW_WIDTH         = 300
-
-# If the EXT_LINKS_IN_WINDOW option is set to YES, doxygen will open links to
-# external symbols imported via tag files in a separate window.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-EXT_LINKS_IN_WINDOW    = NO
-
-# If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg
-# tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see
-# https://inkscape.org) to generate formulas as SVG images instead of PNGs for
-# the HTML output. These images will generally look nicer at scaled resolutions.
-# Possible values are: png The default and svg Looks nicer but requires the
-# pdf2svg tool.
-# The default value is: png.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_FORMULA_FORMAT    = png
-
-# Use this tag to change the font size of LaTeX formulas included as images in
-# the HTML documentation. When you change the font size after a successful
-# doxygen run you need to manually remove any form_*.png images from the HTML
-# output directory to force them to be regenerated.
-# Minimum value: 8, maximum value: 50, default value: 10.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-FORMULA_FONTSIZE       = 10
-
-# Use the FORMULA_TRANSPARENT tag to determine whether or not the images
-# generated for formulas are transparent PNGs. Transparent PNGs are not
-# supported properly for IE 6.0, but are supported on all modern browsers.
-#
-# Note that when changing this option you need to delete any form_*.png files in
-# the HTML output directory before the changes have effect.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-FORMULA_TRANSPARENT    = YES
-
-# The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands
-# to create new LaTeX commands to be used in formulas as building blocks. See
-# the section "Including formulas" for details.
-
-FORMULA_MACROFILE      =
-
-# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# https://www.mathjax.org) which uses client side JavaScript for the rendering
-# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
-# installed or if you want to formulas look prettier in the HTML output. When
-# enabled you may also need to install MathJax separately and configure the path
-# to it using the MATHJAX_RELPATH option.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-USE_MATHJAX            = NO
-
-# When MathJax is enabled you can set the default output format to be used for
-# the MathJax output. See the MathJax site (see:
-# http://docs.mathjax.org/en/latest/output.html) for more details.
-# Possible values are: HTML-CSS (which is slower, but has the best
-# compatibility), NativeMML (i.e. MathML) and SVG.
-# The default value is: HTML-CSS.
-# This tag requires that the tag USE_MATHJAX is set to YES.
-
-MATHJAX_FORMAT         = HTML-CSS
-
-# When MathJax is enabled you need to specify the location relative to the HTML
-# output directory using the MATHJAX_RELPATH option. The destination directory
-# should contain the MathJax.js script. For instance, if the mathjax directory
-# is located at the same level as the HTML output directory, then
-# MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
-# Content Delivery Network so you can quickly see the result without installing
-# MathJax. However, it is strongly recommended to install a local copy of
-# MathJax from https://www.mathjax.org before deployment.
-# The default value is: https://cdn.jsdelivr.net/npm/mathjax@2.
-# This tag requires that the tag USE_MATHJAX is set to YES.
-
-MATHJAX_RELPATH        = http://www.mathjax.org/mathjax
-
-# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
-# extension names that should be enabled during MathJax rendering. For example
-# MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
-# This tag requires that the tag USE_MATHJAX is set to YES.
-
-MATHJAX_EXTENSIONS     =
-
-# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces
-# of code that will be used on startup of the MathJax code. See the MathJax site
-# (see: http://docs.mathjax.org/en/latest/output.html) for more details. For an
-# example see the documentation.
-# This tag requires that the tag USE_MATHJAX is set to YES.
-
-MATHJAX_CODEFILE       =
-
-# When the SEARCHENGINE tag is enabled doxygen will generate a search box for
-# the HTML output. The underlying search engine uses javascript and DHTML and
-# should work on any modern browser. Note that when using HTML help
-# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET)
-# there is already a search function so this one should typically be disabled.
-# For large projects the javascript based search engine can be slow, then
-# enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to
-# search using the keyboard; to jump to the search box use <access key> + S
-# (what the <access key> is depends on the OS and browser, but it is typically
-# <CTRL>, <ALT>/<option>, or both). Inside the search box use the <cursor down
-# key> to jump into the search results window, the results can be navigated
-# using the <cursor keys>. Press <Enter> to select an item or <escape> to cancel
-# the search. The filter options can be selected when the cursor is inside the
-# search box by pressing <Shift>+<cursor down>. Also here use the <cursor keys>
-# to select a filter and <Enter> or <escape> to activate or cancel the filter
-# option.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-SEARCHENGINE           = YES
-
-# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using JavaScript. There
-# are two flavors of web server based searching depending on the EXTERNAL_SEARCH
-# setting. When disabled, doxygen will generate a PHP script for searching and
-# an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
-# and searching needs to be provided by external tools. See the section
-# "External Indexing and Searching" for details.
-# The default value is: NO.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-SERVER_BASED_SEARCH    = NO
-
-# When EXTERNAL_SEARCH tag is enabled doxygen will no longer generate the PHP
-# script for searching. Instead the search results are written to an XML file
-# which needs to be processed by an external indexer. Doxygen will invoke an
-# external search engine pointed to by the SEARCHENGINE_URL option to obtain the
-# search results.
-#
-# Doxygen ships with an example indexer (doxyindexer) and search engine
-# (doxysearch.cgi) which are based on the open source search engine library
-# Xapian (see: https://xapian.org/).
-#
-# See the section "External Indexing and Searching" for details.
-# The default value is: NO.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-EXTERNAL_SEARCH        = NO
-
-# The SEARCHENGINE_URL should point to a search engine hosted by a web server
-# which will return the search results when EXTERNAL_SEARCH is enabled.
-#
-# Doxygen ships with an example indexer (doxyindexer) and search engine
-# (doxysearch.cgi) which are based on the open source search engine library
-# Xapian (see: https://xapian.org/). See the section "External Indexing and
-# Searching" for details.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-SEARCHENGINE_URL       =
-
-# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed
-# search data is written to a file for indexing by an external tool. With the
-# SEARCHDATA_FILE tag the name of this file can be specified.
-# The default file is: searchdata.xml.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-SEARCHDATA_FILE        = searchdata.xml
-
-# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the
-# EXTERNAL_SEARCH_ID tag can be used as an identifier for the project. This is
-# useful in combination with EXTRA_SEARCH_MAPPINGS to search through multiple
-# projects and redirect the results back to the right project.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-EXTERNAL_SEARCH_ID     =
-
-# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen
-# projects other than the one defined by this configuration file, but that are
-# all added to the same external search index. Each project needs to have a
-# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id of
-# to a relative location where the documentation can be found. The format is:
-# EXTRA_SEARCH_MAPPINGS = tagname1=loc1 tagname2=loc2 ...
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-EXTRA_SEARCH_MAPPINGS  =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_LATEX tag is set to YES, doxygen will generate LaTeX output.
-# The default value is: YES.
-
-GENERATE_LATEX         = NO
-
-# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it.
-# The default directory is: latex.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_OUTPUT           = latex
-
-# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
-# invoked.
-#
-# Note that when not enabling USE_PDFLATEX the default is latex when enabling
-# USE_PDFLATEX the default is pdflatex and when in the later case latex is
-# chosen this is overwritten by pdflatex. For specific output languages the
-# default can have been set differently, this depends on the implementation of
-# the output language.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_CMD_NAME         = latex
-
-# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to generate
-# index for LaTeX.
-# Note: This tag is used in the Makefile / make.bat.
-# See also: LATEX_MAKEINDEX_CMD for the part in the generated output file
-# (.tex).
-# The default file is: makeindex.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-MAKEINDEX_CMD_NAME     = makeindex
-
-# The LATEX_MAKEINDEX_CMD tag can be used to specify the command name to
-# generate index for LaTeX. In case there is no backslash (\) as first character
-# it will be automatically added in the LaTeX code.
-# Note: This tag is used in the generated output file (.tex).
-# See also: MAKEINDEX_CMD_NAME for the part in the Makefile / make.bat.
-# The default value is: makeindex.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_MAKEINDEX_CMD    = makeindex
-
-# If the COMPACT_LATEX tag is set to YES, doxygen generates more compact LaTeX
-# documents. This may be useful for small projects and may help to save some
-# trees in general.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-COMPACT_LATEX          = NO
-
-# The PAPER_TYPE tag can be used to set the paper type that is used by the
-# printer.
-# Possible values are: a4 (210 x 297 mm), letter (8.5 x 11 inches), legal (8.5 x
-# 14 inches) and executive (7.25 x 10.5 inches).
-# The default value is: a4.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-PAPER_TYPE             = a4
-
-# The EXTRA_PACKAGES tag can be used to specify one or more LaTeX package names
-# that should be included in the LaTeX output. The package can be specified just
-# by its name or with the correct syntax as to be used with the LaTeX
-# \usepackage command. To get the times font for instance you can specify :
-# EXTRA_PACKAGES=times or EXTRA_PACKAGES={times}
-# To use the option intlimits with the amsmath package you can specify:
-# EXTRA_PACKAGES=[intlimits]{amsmath}
-# If left blank no extra packages will be included.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-EXTRA_PACKAGES         =
-
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
-# generated LaTeX document. The header should contain everything until the first
-# chapter. If it is left blank doxygen will generate a standard header. See
-# section "Doxygen usage" for information on how to let doxygen write the
-# default header to a separate file.
-#
-# Note: Only use a user-defined header if you know what you are doing! The
-# following commands have a special meaning inside the header: $title,
-# $datetime, $date, $doxygenversion, $projectname, $projectnumber,
-# $projectbrief, $projectlogo. Doxygen will replace $title with the empty
-# string, for the replacement values of the other commands the user is referred
-# to HTML_HEADER.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_HEADER           =
-
-# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
-# generated LaTeX document. The footer should contain everything after the last
-# chapter. If it is left blank doxygen will generate a standard footer. See
-# LATEX_HEADER for more information on how to generate a default footer and what
-# special commands can be used inside the footer.
-#
-# Note: Only use a user-defined footer if you know what you are doing!
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_FOOTER           =
-
-# The LATEX_EXTRA_STYLESHEET tag can be used to specify additional user-defined
-# LaTeX style sheets that are included after the standard style sheets created
-# by doxygen. Using this option one can overrule certain style aspects. Doxygen
-# will copy the style sheet files to the output directory.
-# Note: The order of the extra style sheet files is of importance (e.g. the last
-# style sheet in the list overrules the setting of the previous ones in the
-# list).
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_EXTRA_STYLESHEET =
-
-# The LATEX_EXTRA_FILES tag can be used to specify one or more extra images or
-# other source files which should be copied to the LATEX_OUTPUT output
-# directory. Note that the files will be copied as-is; there are no commands or
-# markers available.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_EXTRA_FILES      =
-
-# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated is
-# prepared for conversion to PDF (using ps2pdf or pdflatex). The PDF file will
-# contain links (just like the HTML output) instead of page references. This
-# makes the output suitable for online browsing using a PDF viewer.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-PDF_HYPERLINKS         = YES
-
-# If the USE_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
-# the PDF file directly from the LaTeX files. Set this option to YES, to get a
-# higher quality PDF documentation.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-USE_PDFLATEX           = YES
-
-# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
-# command to the generated LaTeX files. This will instruct LaTeX to keep running
-# if errors occur, instead of asking the user for help. This option is also used
-# when generating formulas in HTML.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_BATCHMODE        = NO
-
-# If the LATEX_HIDE_INDICES tag is set to YES then doxygen will not include the
-# index chapters (such as File Index, Compound Index, etc.) in the output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_HIDE_INDICES     = NO
-
-# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
-# code with syntax highlighting in the LaTeX output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_SOURCE_CODE      = NO
-
-# The LATEX_BIB_STYLE tag can be used to specify the style to use for the
-# bibliography, e.g. plainnat, or ieeetr. See
-# https://en.wikipedia.org/wiki/BibTeX and \cite for more info.
-# The default value is: plain.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_BIB_STYLE        = plain
-
-# If the LATEX_TIMESTAMP tag is set to YES then the footer of each generated
-# page will contain the date and time when the page was generated. Setting this
-# to NO can help when comparing the output of multiple runs.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_TIMESTAMP        = NO
-
-# The LATEX_EMOJI_DIRECTORY tag is used to specify the (relative or absolute)
-# path from which the emoji images will be read. If a relative path is entered,
-# it will be relative to the LATEX_OUTPUT directory. If left blank the
-# LATEX_OUTPUT directory will be used.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_EMOJI_DIRECTORY  =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the RTF output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_RTF tag is set to YES, doxygen will generate RTF output. The
-# RTF output is optimized for Word 97 and may not look too pretty with other RTF
-# readers/editors.
-# The default value is: NO.
-
-GENERATE_RTF           = NO
-
-# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it.
-# The default directory is: rtf.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_OUTPUT             = rtf
-
-# If the COMPACT_RTF tag is set to YES, doxygen generates more compact RTF
-# documents. This may be useful for small projects and may help to save some
-# trees in general.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-COMPACT_RTF            = NO
-
-# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated will
-# contain hyperlink fields. The RTF file will contain links (just like the HTML
-# output) instead of page references. This makes the output suitable for online
-# browsing using Word or some other Word compatible readers that support those
-# fields.
-#
-# Note: WordPad (write) and others do not support links.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_HYPERLINKS         = NO
-
-# Load stylesheet definitions from file. Syntax is similar to doxygen's
-# configuration file, i.e. a series of assignments. You only have to provide
-# replacements, missing definitions are set to their default value.
-#
-# See also section "Doxygen usage" for information on how to generate the
-# default style sheet that doxygen normally uses.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_STYLESHEET_FILE    =
-
-# Set optional variables used in the generation of an RTF document. Syntax is
-# similar to doxygen's configuration file. A template extensions file can be
-# generated using doxygen -e rtf extensionFile.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_EXTENSIONS_FILE    =
-
-# If the RTF_SOURCE_CODE tag is set to YES then doxygen will include source code
-# with syntax highlighting in the RTF output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_SOURCE_CODE        = NO
-
-#---------------------------------------------------------------------------
-# Configuration options related to the man page output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_MAN tag is set to YES, doxygen will generate man pages for
-# classes and files.
-# The default value is: NO.
-
-GENERATE_MAN           = NO
-
-# The MAN_OUTPUT tag is used to specify where the man pages will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it. A directory man3 will be created inside the directory specified by
-# MAN_OUTPUT.
-# The default directory is: man.
-# This tag requires that the tag GENERATE_MAN is set to YES.
-
-MAN_OUTPUT             = man
-
-# The MAN_EXTENSION tag determines the extension that is added to the generated
-# man pages. In case the manual section does not start with a number, the number
-# 3 is prepended. The dot (.) at the beginning of the MAN_EXTENSION tag is
-# optional.
-# The default value is: .3.
-# This tag requires that the tag GENERATE_MAN is set to YES.
-
-MAN_EXTENSION          = .3
-
-# The MAN_SUBDIR tag determines the name of the directory created within
-# MAN_OUTPUT in which the man pages are placed. If defaults to man followed by
-# MAN_EXTENSION with the initial . removed.
-# This tag requires that the tag GENERATE_MAN is set to YES.
-
-MAN_SUBDIR             =
-
-# If the MAN_LINKS tag is set to YES and doxygen generates man output, then it
-# will generate one additional man file for each entity documented in the real
-# man page(s). These additional files only source the real man page, but without
-# them the man command would be unable to find the correct page.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_MAN is set to YES.
-
-MAN_LINKS              = NO
-
-#---------------------------------------------------------------------------
-# Configuration options related to the XML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_XML tag is set to YES, doxygen will generate an XML file that
-# captures the structure of the code including all documentation.
-# The default value is: NO.
-
-GENERATE_XML           = NO
-
-# The XML_OUTPUT tag is used to specify where the XML pages will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it.
-# The default directory is: xml.
-# This tag requires that the tag GENERATE_XML is set to YES.
-
-XML_OUTPUT             = xml
-
-# If the XML_PROGRAMLISTING tag is set to YES, doxygen will dump the program
-# listings (including syntax highlighting and cross-referencing information) to
-# the XML output. Note that enabling this will significantly increase the size
-# of the XML output.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_XML is set to YES.
-
-XML_PROGRAMLISTING     = YES
-
-# If the XML_NS_MEMB_FILE_SCOPE tag is set to YES, doxygen will include
-# namespace members in file scope as well, matching the HTML output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_XML is set to YES.
-
-XML_NS_MEMB_FILE_SCOPE = NO
-
-#---------------------------------------------------------------------------
-# Configuration options related to the DOCBOOK output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_DOCBOOK tag is set to YES, doxygen will generate Docbook files
-# that can be used to generate PDF.
-# The default value is: NO.
-
-GENERATE_DOCBOOK       = NO
-
-# The DOCBOOK_OUTPUT tag is used to specify where the Docbook pages will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be put in
-# front of it.
-# The default directory is: docbook.
-# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
-
-DOCBOOK_OUTPUT         = docbook
-
-# If the DOCBOOK_PROGRAMLISTING tag is set to YES, doxygen will include the
-# program listings (including syntax highlighting and cross-referencing
-# information) to the DOCBOOK output. Note that enabling this will significantly
-# increase the size of the DOCBOOK output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
-
-DOCBOOK_PROGRAMLISTING = NO
-
-#---------------------------------------------------------------------------
-# Configuration options for the AutoGen Definitions output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an
-# AutoGen Definitions (see http://autogen.sourceforge.net/) file that captures
-# the structure of the code including all documentation. Note that this feature
-# is still experimental and incomplete at the moment.
-# The default value is: NO.
-
-GENERATE_AUTOGEN_DEF   = NO
-
-#---------------------------------------------------------------------------
-# Configuration options related to the Perl module output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_PERLMOD tag is set to YES, doxygen will generate a Perl module
-# file that captures the structure of the code including all documentation.
-#
-# Note that this feature is still experimental and incomplete at the moment.
-# The default value is: NO.
-
-GENERATE_PERLMOD       = NO
-
-# If the PERLMOD_LATEX tag is set to YES, doxygen will generate the necessary
-# Makefile rules, Perl scripts and LaTeX code to be able to generate PDF and DVI
-# output from the Perl module output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_PERLMOD is set to YES.
-
-PERLMOD_LATEX          = NO
-
-# If the PERLMOD_PRETTY tag is set to YES, the Perl module output will be nicely
-# formatted so it can be parsed by a human reader. This is useful if you want to
-# understand what is going on. On the other hand, if this tag is set to NO, the
-# size of the Perl module output will be much smaller and Perl will parse it
-# just the same.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_PERLMOD is set to YES.
-
-PERLMOD_PRETTY         = YES
-
-# The names of the make variables in the generated doxyrules.make file are
-# prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. This is useful
-# so different doxyrules.make files included by the same Makefile don't
-# overwrite each other's variables.
-# This tag requires that the tag GENERATE_PERLMOD is set to YES.
-
-PERLMOD_MAKEVAR_PREFIX =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor
-#---------------------------------------------------------------------------
-
-# If the ENABLE_PREPROCESSING tag is set to YES, doxygen will evaluate all
-# C-preprocessor directives found in the sources and include files.
-# The default value is: YES.
-
-ENABLE_PREPROCESSING   = YES
-
-# If the MACRO_EXPANSION tag is set to YES, doxygen will expand all macro names
-# in the source code. If set to NO, only conditional compilation will be
-# performed. Macro expansion can be done in a controlled way by setting
-# EXPAND_ONLY_PREDEF to YES.
-# The default value is: NO.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-MACRO_EXPANSION        = YES
-
-# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then
-# the macro expansion is limited to the macros specified with the PREDEFINED and
-# EXPAND_AS_DEFINED tags.
-# The default value is: NO.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-EXPAND_ONLY_PREDEF     = YES
-
-# If the SEARCH_INCLUDES tag is set to YES, the include files in the
-# INCLUDE_PATH will be searched if a #include is found.
-# The default value is: YES.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-SEARCH_INCLUDES        = YES
-
-# The INCLUDE_PATH tag can be used to specify one or more directories that
-# contain include files that are not input files but should be processed by the
-# preprocessor.
-# This tag requires that the tag SEARCH_INCLUDES is set to YES.
-
-INCLUDE_PATH           =
-
-# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
-# patterns (like *.h and *.hpp) to filter out the header-files in the
-# directories. If left blank, the patterns specified with FILE_PATTERNS will be
-# used.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-INCLUDE_FILE_PATTERNS  =
-
-# The PREDEFINED tag can be used to specify one or more macro names that are
-# defined before the preprocessor is started (similar to the -D option of e.g.
-# gcc). The argument of the tag is a list of macros of the form: name or
-# name=definition (no spaces). If the definition and the "=" are omitted, "=1"
-# is assumed. To prevent a macro definition from being undefined via #undef or
-# recursively expanded use the := operator instead of the = operator.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-PREDEFINED             = __DOXYGEN__ \
-                         PROGMEM \
-                         EEMEM \
-                         ATTR_PACKED
-
-# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
-# tag can be used to specify a list of macro names that should be expanded. The
-# macro definition that is found in the sources will be used. Use the PREDEFINED
-# tag if you want to use a different macro definition that overrules the
-# definition found in the source code.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-EXPAND_AS_DEFINED      =
-
-# If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
-# remove all references to function-like macros that are alone on a line, have
-# an all uppercase name, and do not end with a semicolon. Such function macros
-# are typically used for boiler-plate code, and will confuse the parser if not
-# removed.
-# The default value is: YES.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-SKIP_FUNCTION_MACROS   = YES
-
-#---------------------------------------------------------------------------
-# Configuration options related to external references
-#---------------------------------------------------------------------------
-
-# The TAGFILES tag can be used to specify one or more tag files. For each tag
-# file the location of the external documentation should be added. The format of
-# a tag file without this location is as follows:
-# TAGFILES = file1 file2 ...
-# Adding location for the tag files is done as follows:
-# TAGFILES = file1=loc1 "file2 = loc2" ...
-# where loc1 and loc2 can be relative or absolute paths or URLs. See the
-# section "Linking to external documentation" for more information about the use
-# of tag files.
-# Note: Each tag file must have a unique name (where the name does NOT include
-# the path). If a tag file is not located in the directory in which doxygen is
-# run, you must also specify the path to the tagfile here.
-
-TAGFILES               =
-
-# When a file name is specified after GENERATE_TAGFILE, doxygen will create a
-# tag file that is based on the input files it reads. See section "Linking to
-# external documentation" for more information about the usage of tag files.
-
-GENERATE_TAGFILE       =
-
-# If the ALLEXTERNALS tag is set to YES, all external class will be listed in
-# the class index. If set to NO, only the inherited external classes will be
-# listed.
-# The default value is: NO.
-
-ALLEXTERNALS           = NO
-
-# If the EXTERNAL_GROUPS tag is set to YES, all external groups will be listed
-# in the modules index. If set to NO, only the current project's groups will be
-# listed.
-# The default value is: YES.
-
-EXTERNAL_GROUPS        = YES
-
-# If the EXTERNAL_PAGES tag is set to YES, all external pages will be listed in
-# the related pages index. If set to NO, only the current project's pages will
-# be listed.
-# The default value is: YES.
-
-EXTERNAL_PAGES         = YES
-
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool
-#---------------------------------------------------------------------------
-
-# If the CLASS_DIAGRAMS tag is set to YES, doxygen will generate a class diagram
-# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to
-# NO turns the diagrams off. Note that this option also works with HAVE_DOT
-# disabled, but it is recommended to install and use dot, since it yields more
-# powerful graphs.
-# The default value is: YES.
-
-CLASS_DIAGRAMS         = NO
-
-# You can include diagrams made with dia in doxygen documentation. Doxygen will
-# then run dia to produce the diagram and insert it in the documentation. The
-# DIA_PATH tag allows you to specify the directory where the dia binary resides.
-# If left empty dia is assumed to be found in the default search path.
-
-DIA_PATH               =
-
-# If set to YES the inheritance and collaboration graphs will hide inheritance
-# and usage relations if the target is undocumented or is not a class.
-# The default value is: YES.
-
-HIDE_UNDOC_RELATIONS   = YES
-
-# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
-# available from the path. This tool is part of Graphviz (see:
-# http://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent
-# Bell Labs. The other options in this section have no effect if this option is
-# set to NO
-# The default value is: NO.
-
-HAVE_DOT               = NO
-
-# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed
-# to run in parallel. When set to 0 doxygen will base this on the number of
-# processors available in the system. You can set it explicitly to a value
-# larger than 0 to get control over the balance between CPU load and processing
-# speed.
-# Minimum value: 0, maximum value: 32, default value: 0.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_NUM_THREADS        = 0
-
-# When you want a differently looking font in the dot files that doxygen
-# generates you can specify the font name using DOT_FONTNAME. You need to make
-# sure dot is able to find the font, which can be done by putting it in a
-# standard location or by setting the DOTFONTPATH environment variable or by
-# setting DOT_FONTPATH to the directory containing the font.
-# The default value is: Helvetica.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_FONTNAME           =
-
-# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of
-# dot graphs.
-# Minimum value: 4, maximum value: 24, default value: 10.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_FONTSIZE           = 10
-
-# By default doxygen will tell dot to use the default font as specified with
-# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set
-# the path where dot can find it using this tag.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_FONTPATH           =
-
-# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for
-# each documented class showing the direct and indirect inheritance relations.
-# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-CLASS_GRAPH            = NO
-
-# If the COLLABORATION_GRAPH tag is set to YES then doxygen will generate a
-# graph for each documented class showing the direct and indirect implementation
-# dependencies (inheritance, containment, and class references variables) of the
-# class with other documented classes.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-COLLABORATION_GRAPH    = NO
-
-# If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for
-# groups, showing the direct groups dependencies.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-GROUP_GRAPHS           = YES
-
-# If the UML_LOOK tag is set to YES, doxygen will generate inheritance and
-# collaboration diagrams in a style similar to the OMG's Unified Modeling
-# Language.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-UML_LOOK               = NO
-
-# If the UML_LOOK tag is enabled, the fields and methods are shown inside the
-# class node. If there are many fields or methods and many nodes the graph may
-# become too big to be useful. The UML_LIMIT_NUM_FIELDS threshold limits the
-# number of items for each type to make the size more manageable. Set this to 0
-# for no limit. Note that the threshold may be exceeded by 50% before the limit
-# is enforced. So when you set the threshold to 10, up to 15 fields may appear,
-# but if the number exceeds 15, the total amount of fields shown is limited to
-# 10.
-# Minimum value: 0, maximum value: 100, default value: 10.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-UML_LIMIT_NUM_FIELDS   = 10
-
-# If the TEMPLATE_RELATIONS tag is set to YES then the inheritance and
-# collaboration graphs will show the relations between templates and their
-# instances.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-TEMPLATE_RELATIONS     = NO
-
-# If the INCLUDE_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are set to
-# YES then doxygen will generate a graph for each documented file showing the
-# direct and indirect include dependencies of the file with other documented
-# files.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-INCLUDE_GRAPH          = YES
-
-# If the INCLUDED_BY_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are
-# set to YES then doxygen will generate a graph for each documented file showing
-# the direct and indirect include dependencies of the file with other documented
-# files.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-INCLUDED_BY_GRAPH      = YES
-
-# If the CALL_GRAPH tag is set to YES then doxygen will generate a call
-# dependency graph for every global function or class method.
-#
-# Note that enabling this option will significantly increase the time of a run.
-# So in most cases it will be better to enable call graphs for selected
-# functions only using the \callgraph command. Disabling a call graph can be
-# accomplished by means of the command \hidecallgraph.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-CALL_GRAPH             = NO
-
-# If the CALLER_GRAPH tag is set to YES then doxygen will generate a caller
-# dependency graph for every global function or class method.
-#
-# Note that enabling this option will significantly increase the time of a run.
-# So in most cases it will be better to enable caller graphs for selected
-# functions only using the \callergraph command. Disabling a caller graph can be
-# accomplished by means of the command \hidecallergraph.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-CALLER_GRAPH           = NO
-
-# If the GRAPHICAL_HIERARCHY tag is set to YES then doxygen will graphical
-# hierarchy of all classes instead of a textual one.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-GRAPHICAL_HIERARCHY    = NO
-
-# If the DIRECTORY_GRAPH tag is set to YES then doxygen will show the
-# dependencies a directory has on other directories in a graphical way. The
-# dependency relations are determined by the #include relations between the
-# files in the directories.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DIRECTORY_GRAPH        = YES
-
-# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
-# generated by dot. For an explanation of the image formats see the section
-# output formats in the documentation of the dot tool (Graphviz (see:
-# http://www.graphviz.org/)).
-# Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order
-# to make the SVG files visible in IE 9+ (other browsers do not have this
-# requirement).
-# Possible values are: png, jpg, gif, svg, png:gd, png:gd:gd, png:cairo,
-# png:cairo:gd, png:cairo:cairo, png:cairo:gdiplus, png:gdiplus and
-# png:gdiplus:gdiplus.
-# The default value is: png.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_IMAGE_FORMAT       = png
-
-# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
-# enable generation of interactive SVG images that allow zooming and panning.
-#
-# Note that this requires a modern browser other than Internet Explorer. Tested
-# and working are Firefox, Chrome, Safari, and Opera.
-# Note: For IE 9+ you need to set HTML_FILE_EXTENSION to xhtml in order to make
-# the SVG files visible. Older versions of IE do not have SVG support.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-INTERACTIVE_SVG        = NO
-
-# The DOT_PATH tag can be used to specify the path where the dot tool can be
-# found. If left blank, it is assumed the dot tool can be found in the path.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_PATH               =
-
-# The DOTFILE_DIRS tag can be used to specify one or more directories that
-# contain dot files that are included in the documentation (see the \dotfile
-# command).
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOTFILE_DIRS           =
-
-# The MSCFILE_DIRS tag can be used to specify one or more directories that
-# contain msc files that are included in the documentation (see the \mscfile
-# command).
-
-MSCFILE_DIRS           =
-
-# The DIAFILE_DIRS tag can be used to specify one or more directories that
-# contain dia files that are included in the documentation (see the \diafile
-# command).
-
-DIAFILE_DIRS           =
-
-# When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the
-# path where java can find the plantuml.jar file. If left blank, it is assumed
-# PlantUML is not used or called during a preprocessing step. Doxygen will
-# generate a warning when it encounters a \startuml command in this case and
-# will not generate output for the diagram.
-
-PLANTUML_JAR_PATH      =
-
-# When using plantuml, the PLANTUML_CFG_FILE tag can be used to specify a
-# configuration file for plantuml.
-
-PLANTUML_CFG_FILE      =
-
-# When using plantuml, the specified paths are searched for files specified by
-# the !include statement in a plantuml block.
-
-PLANTUML_INCLUDE_PATH  =
-
-# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes
-# that will be shown in the graph. If the number of nodes in a graph becomes
-# larger than this value, doxygen will truncate the graph, which is visualized
-# by representing a node as a red box. Note that doxygen if the number of direct
-# children of the root node in a graph is already larger than
-# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note that
-# the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
-# Minimum value: 0, maximum value: 10000, default value: 50.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_GRAPH_MAX_NODES    = 15
-
-# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the graphs
-# generated by dot. A depth value of 3 means that only nodes reachable from the
-# root by following a path via at most 3 edges will be shown. Nodes that lay
-# further from the root node will be omitted. Note that setting this option to 1
-# or 2 may greatly reduce the computation time needed for large code bases. Also
-# note that the size of a graph can be further restricted by
-# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
-# Minimum value: 0, maximum value: 1000, default value: 0.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-MAX_DOT_GRAPH_DEPTH    = 2
-
-# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
-# background. This is disabled by default, because dot on Windows does not seem
-# to support this out of the box.
-#
-# Warning: Depending on the platform used, enabling this option may lead to
-# badly anti-aliased labels on the edges of a graph (i.e. they become hard to
-# read).
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_TRANSPARENT        = YES
-
-# Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output
-# files in one run (i.e. multiple -o and -T options on the command line). This
-# makes dot run faster, but since only newer versions of dot (>1.8.10) support
-# this, this feature is disabled by default.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_MULTI_TARGETS      = NO
-
-# If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page
-# explaining the meaning of the various boxes and arrows in the dot generated
-# graphs.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-GENERATE_LEGEND        = YES
-
-# If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate dot
-# files that are used to generate the various graphs.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_CLEANUP            = YES
diff --git a/NativePrograms/LUFA/makefile b/NativePrograms/LUFA/makefile
deleted file mode 100644
index fe1cd38a8d..0000000000
--- a/NativePrograms/LUFA/makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-#             LUFA Library
-#     Copyright (C) Dean Camera, 2020.
-#
-#  dean [at] fourwalledcubicle [dot] com
-#           www.lufa-lib.org
-#
-# ---------------------------------------
-#  Makefile for the LUFA library itself.
-# ---------------------------------------
-
-LUFA_VERSION_NUM := $(shell grep LUFA_VERSION_STRING Version.h | cut -d'"' -f2)
-
-# Default target - no default action when attempting to build the core directly
-all:
-
-# Display the LUFA version of this library copy
-version:
-	@echo "LUFA $(LUFA_VERSION_NUM)"
-
-LUFA_PATH               := .
-ARCH                    := {AVR8,UC3,XMEGA}
-DOXYGEN_OVERRIDE_PARAMS := QUIET=YES PROJECT_NUMBER=$(LUFA_VERSION_NUM)
-
-# Remove all object and associated files from the LUFA library core
-clean:
-	rm -f $(LUFA_SRC_ALL_FILES:%.c=%.o)
-	rm -f $(LUFA_SRC_ALL_FILES:%.c=%.d)
-	rm -f $(LUFA_SRC_ALL_FILES:%.c=%.lst)
-
-# Include LUFA-specific DMBS extension modules
-DMBS_LUFA_PATH ?= $(LUFA_PATH)/Build/LUFA
-include $(DMBS_LUFA_PATH)/lufa-sources.mk
-
-# Include common DMBS build system modules
-DMBS_PATH      ?= $(LUFA_PATH)/Build/DMBS/DMBS
-include $(DMBS_PATH)/core.mk
-include $(DMBS_PATH)/doxygen.mk
-
-.PHONY: all version
diff --git a/NativePrograms/NintendoSwitch/!BuildAll-ArduinoLeonardo.cmd b/NativePrograms/NintendoSwitch/!BuildAll-ArduinoLeonardo.cmd
deleted file mode 100644
index 488519e9ec..0000000000
--- a/NativePrograms/NintendoSwitch/!BuildAll-ArduinoLeonardo.cmd
+++ /dev/null
@@ -1,15 +0,0 @@
-@echo off
-
-cd /D "%~dp0"
-
-if not exist Programs\ (
-    echo.
-    echo Please unzip the folder before you can use it.
-    echo.
-    pause
-    exit
-)
-
-@call ../Scripts/BuildAll.cmd ArduinoLeonardo
-
-
diff --git a/NativePrograms/NintendoSwitch/!BuildAll-ArduinoUnoR3.cmd b/NativePrograms/NintendoSwitch/!BuildAll-ArduinoUnoR3.cmd
deleted file mode 100644
index 7fc90f1c06..0000000000
--- a/NativePrograms/NintendoSwitch/!BuildAll-ArduinoUnoR3.cmd
+++ /dev/null
@@ -1,15 +0,0 @@
-@echo off
-
-cd /D "%~dp0"
-
-if not exist Programs\ (
-    echo.
-    echo Please unzip the folder before you can use it.
-    echo.
-    pause
-    exit
-)
-
-@call ../Scripts/BuildAll.cmd ArduinoUnoR3
-
-
diff --git a/NativePrograms/NintendoSwitch/!BuildAll-ProMicro.cmd b/NativePrograms/NintendoSwitch/!BuildAll-ProMicro.cmd
deleted file mode 100644
index b1ece4743b..0000000000
--- a/NativePrograms/NintendoSwitch/!BuildAll-ProMicro.cmd
+++ /dev/null
@@ -1,15 +0,0 @@
-@echo off
-
-cd /D "%~dp0"
-
-if not exist Programs\ (
-    echo.
-    echo Please unzip the folder before you can use it.
-    echo.
-    pause
-    exit
-)
-
-@call ../Scripts/BuildAll.cmd ProMicro
-
-
diff --git a/NativePrograms/NintendoSwitch/!BuildAll-Teensy++2.0.cmd b/NativePrograms/NintendoSwitch/!BuildAll-Teensy++2.0.cmd
deleted file mode 100644
index e30eb5dfe0..0000000000
--- a/NativePrograms/NintendoSwitch/!BuildAll-Teensy++2.0.cmd
+++ /dev/null
@@ -1,15 +0,0 @@
-@echo off
-
-cd /D "%~dp0"
-
-if not exist Programs\ (
-    echo.
-    echo Please unzip the folder before you can use it.
-    echo.
-    pause
-    exit
-)
-
-@call ../Scripts/BuildAll.cmd TeensyPP2
-
-
diff --git a/NativePrograms/NintendoSwitch/!BuildAll-Teensy2.0.cmd b/NativePrograms/NintendoSwitch/!BuildAll-Teensy2.0.cmd
deleted file mode 100644
index 84f90a817e..0000000000
--- a/NativePrograms/NintendoSwitch/!BuildAll-Teensy2.0.cmd
+++ /dev/null
@@ -1,15 +0,0 @@
-@echo off
-
-cd /D "%~dp0"
-
-if not exist Programs\ (
-    echo.
-    echo Please unzip the folder before you can use it.
-    echo.
-    pause
-    exit
-)
-
-@call ../Scripts/BuildAll.cmd Teensy2
-
-
diff --git a/NativePrograms/NintendoSwitch/!Cleanup.cmd b/NativePrograms/NintendoSwitch/!Cleanup.cmd
deleted file mode 100644
index 7832b61049..0000000000
--- a/NativePrograms/NintendoSwitch/!Cleanup.cmd
+++ /dev/null
@@ -1,21 +0,0 @@
-::  Clean the build. Delete all build artifacts.
-
-cd %~dp0
-
-del *.log
-del *.d
-del *.elf
-del *.hex
-del *.map
-del *.o
-del *.eep
-del *.bin
-del *.lss
-del *.sym
-del *.tmp
-
-del obj\*.d
-del obj\*.o
-del obj\build-*
-
-::pause
diff --git a/NativePrograms/NintendoSwitch/00-BuildAllUnix.sh b/NativePrograms/NintendoSwitch/00-BuildAllUnix.sh
deleted file mode 100644
index a543c0de94..0000000000
--- a/NativePrograms/NintendoSwitch/00-BuildAllUnix.sh
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/usr/bin/env bash
-
-# change directory to library location
-cd "$(dirname "$0")"
-
-# define the MCU, which is the board type
-
-if [[ "$OSTYPE" == "darwin"* ]]; then
-    PLATFORM="mac"
-    FZF=$(which fzf)
-
-    if [[ "$FZF" == "" ]]; then
-        boxed_msg "${RED}ERROR: FZF is not detected on your system. Please install it through Homebrew ${RESET}"
-        exit 1
-    fi
-
-elif [[ "$OSTYPE" == "linux-gnu"* ]]; then
-    PLATFORM="linux"
-    FZF="../Scripts/fzf-${PLATFORM}"
-else
-    boxed_msg "${RED}${OSTYPE} is not a recognized platform. Please run only on Mac or Linux${RESET}"
-    exit 1
-fi
-
-BOARD=$1
-
-function run() {
-    if [[ -z "$BOARD" ]]; then
-        board_prompt
-    fi
-
-    # if the boards were given by integer, we can update them here
-
-
-    # say what we're building for convenience
-    echo "Ready to build for board: $BOARD"
-    echo ""
-
-    # and send off to build
-    bash ../Scripts/BuildAllUnix.sh "$BOARD" #1> /dev/null
-
-    # let them know we finished
-    echo -e "\033[1mFinished building hex files for board: $BOARD \033[0m"
-    echo "Please make sure the hex files were properly built or updated."
-    echo "You can now close this window if you wish."
-    echo ""
-    # really done
-}
-
-function board_prompt() {
-    BOARD=$(cat ../Scripts/Boards.txt | $FZF --height=15% --prompt="Choose your Board: ")
-}
-
-run
diff --git a/NativePrograms/NintendoSwitch/00-CleanupUnix.sh b/NativePrograms/NintendoSwitch/00-CleanupUnix.sh
deleted file mode 100644
index 3e3789e7cc..0000000000
--- a/NativePrograms/NintendoSwitch/00-CleanupUnix.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/usr/bin/env bash
-# this script removes all compiled pieces to create a fresh directory
-
-# change directory to library location
-cd "$(dirname "$0")"
-
-# NOTE: /dev/null forwarding is to ensure that nothing is printed if the files were already deleted
-rm *.log > /dev/null 2>&1
-rm *.d > /dev/null 2>&1
-rm *.elf > /dev/null 2>&1
-rm *.hex > /dev/null 2>&1
-rm *.map > /dev/null 2>&1
-rm *.o > /dev/null 2>&1
-rm *.eep > /dev/null 2>&1
-rm *.bin > /dev/null 2>&1
-rm *.lss > /dev/null 2>&1
-rm *.sym > /dev/null 2>&1
-rm *.tmp > /dev/null 2>&1
-
-# compiled pieces within Libraries, Programs, and obj
-rm Libraries/*.d > /dev/null 2>&1
-rm Libraries/*.o > /dev/null 2>&1
-
-rm Programs/*.d > /dev/null 2>&1
-rm Programs/*.o > /dev/null 2>&1
-
-rm obj/*.d > /dev/null 2>&1
-rm obj/*.o > /dev/null 2>&1
-
-echo "Finished cleaning build files."
diff --git a/NativePrograms/NintendoSwitch/00-FlashUnix.sh b/NativePrograms/NintendoSwitch/00-FlashUnix.sh
deleted file mode 100644
index a7c2f8ea87..0000000000
--- a/NativePrograms/NintendoSwitch/00-FlashUnix.sh
+++ /dev/null
@@ -1,222 +0,0 @@
-#!/usr/bin/env bash
-
-# change directory to library location
-cd "$(dirname "$0")" || exit
-
-# Parse Command line arguments for MCU, Program and Device Path
-BOARD=$1
-PROGRAM=$2
-DEVICE_PATH=$3
-
-
-if [[ "$OSTYPE" == "darwin"* ]]; then
-    PLATFORM="mac"
-    FZF=$(which fzf)
-
-    if [[ "$FZF" == "" ]]; then
-        boxed_msg "${RED}ERROR: FZF is not detected on your system. Please install it through Homebrew ${RESET}"
-        exit 1
-    fi
-
-elif [[ "$OSTYPE" == "linux-gnu"* ]]; then
-    PLATFORM="linux"
-    FZF="../Scripts/fzf-${PLATFORM}"
-else
-    boxed_msg "${RED}${OSTYPE} is not a recognized platform. Please run only on Mac or Linux${RESET}"
-    exit 1
-fi
-
-SUDO=""
-BUILD_HEX=""
-HEXFILE=""
-PROGRAM_COMMAND="program_avrdude ${MCU} ${HEXFILE}" # Default to using avrdude
-BOARDS=(ArduinoUnoR3 ProMicro Teensy2 TeensyPP2)
-
-function run() {
-
-    configure
-
-    if [[ $BUILD_HEX == "y" ]]; then
-        build_hex
-    fi
-
-    boxed_msg "Flashing ${PROGRAM}.hex ..."
-    $PROGRAM_COMMAND
-
-    boxed_msg "Finished flashing ${HEXFILE} to ${BOARD}!"
-}
-
-function configure() {
-    boxed_msg "Configuration"
-
-    [[ -f "${HOME}/.paconfig" ]] && source "${HOME}/.paconfig"
-    [[ "$EUID" -ne 0 ]] && SUDO="sudo"
-    [[ -z "${BOARD}" ]] && board_prompt || note "Using Preconfigured BOARD [${BOARD}]"
-    [[ -z "${PROGRAM}" ]] && prog_prompt
-    
-    if [[ ! -f ${HEXFILE} ]]; then
-        question "Build ${PROGRAM}? ${WHITE}[Y/n]${RESET}" "DOBUILD"
-        DOBUILD="${DOBUILD:-y}"
-        if [ "$DOBUILD" == "y" ]; then
-            BUILD_HEX="y"
-        else
-            logmsg "Nothing to flash, exiting.."
-            exit
-        fi
-    fi
-
-    # Logic below to determine if we need to us dfu-programmer or not
-    if [[ $PLATFORM == "mac" ]] && [[ ${MCU} == "atmega16u2" ]]; then
-        which dfu-programmer >/dev/null 2>&1
-        if [[ $? -eq 0 ]]; then
-            question "Mac platform detected, UNO R3 configured. Connect your device and enter DFU mode, then press any key..." "use_dfu"
-            PROGRAM_COMMAND="program_dfu ${MCU} ${HEXFILE}"
-        else
-            logmsg "dfu-programmer not installed, run \"brew install dfu-programmer\" then rerun this script"
-	    exit 1
-        fi
-    fi
-}
-
-function build_hex {
-        boxed_msg "Build ${PROGRAM}.c"
-
-        note "Cleaning Build Environment"
-        ./00-CleanupUnix.sh >/dev/null
-
-
-        note "Running Build Script"
-        sh ../Scripts/BuildOneUnix.sh "${BOARD}" "${PROGRAM}" > /dev/null 2>&1
-
-        retVal=$?
-        if [ $retVal -ne 0 ]; then
-            boxed_msg "${RED}ERROR - CRITICAL: An error occured while building.\nPlease check logs and perhaps run the cleanup script before trying again.${RESET}"
-            exit 1
-        else 
-            note "${PROGRAM}.hex successfully built!"
-        fi
-    
-}
-
-function detect_device() {
-    local -r delay='0.75'
-    local spinstr='\|/-'
-    local temp
-    while true; do
-        temp="${spinstr#?}"
-        printf "${YELLOW}Waiting for device... [%c]  ${RESET}" "${spinstr}"
-        spinstr=${temp}${spinstr%"${temp}"}
-        # shellcheck disable=SC2010
-        found_device_path="$(ls /dev/tty* | grep -i 'acm\|usb')"
-        if [[ -n "$found_device_path" ]]; then
-            DEVICE_PATH="${found_device_path}"
-            break
-        fi
-        sleep "${delay}"
-        printf "%0.s\b" {1..28}
-    done
-    printf "    \b\b\b\b\n"
-    boxed_msg "Device connected at [${found_device_path}]" "short"
-}
-
-function program_dfu {
-    # start with clearing the BOARD
-    ${SUDO} dfu-programmer "${MCU}" erase || true
-    # then flash the hex to the BOARD
-    ${SUDO} dfu-programmer "${MCU}" flash "${HEXFILE}"
-    if [[ $? -ne 0 ]]; then
-        boxed_msg "${RED}Flash Error: Check the output above for more info.${RESET}"
-        exit 1
-    fi
-    # then reset the BOARD
-    ${SUDO} dfu-programmer "${MCU}" reset
-    if [[ $? -ne 0 ]]; then
-        boxed_msg "${RED}Device Reset Error: Check the output above for more info.${RESET}"
-        exit 1
-    fi
-}
-
-function program_avrdude {
-    if [[ $AUTODETECT_DEVICE == "y" ]]; then
-        note "Autodetect enabled..."
-        detect_device
-    elif [[ -z $DEVICE_PATH ]] && [[ -z $autodetect_device ]]; then
-        question "Would you like to attempt auto detecting your device? ${WHITE}[y/n]${RESET}" "autodetect_device"
-        autodetect_device="${autodetect_device:-y}"
-        if [[ $autodetect_device == "n" ]]; then
-            question "Please enter the path to your device ${WHITE}(ex. /dev/ttyACM0)${RESET}" "DEVICE_PATH"        
-        elif [[ $autodetect_device == "y" ]]; then
-            detect_device 
-        else
-            note "Invalid input, defaulting to autodetection"
-            detect_device
-        fi
-    fi
-    
-    note "Attempting to flash ${WHITE}${PROGRAM}.hex${RESET} to ${WHITE}${DEVICE_PATH}${RESET} now"
-    ${SUDO} avrdude -q -p "${MCU}" -P "${DEVICE_PATH}" -c avr109 -U flash:w:"${HEXFILE}"
-}
-
-function boxed_msg() {
-    msg=$1
-    len=$2
-    [[ $len == short ]] && div="\n===============\n" || div="\n=================================\n"
-    echo -e "${div}${GREEN}${msg}${RESET}${div}"
-}
-
-function question() {
-    echo -e "\n${YELLOW}${1}: ${RESET}"
-    read -r "$2"
-}
-
-function logmsg {
-    msg=$1
-    echo -e "${LBLUE}${msg}${RESET}"
-}
-
-function note() {
-    msg=$1
-    div='** '
-    echo -e "${YELLOW}${div}${msg}${RESET}"
-}
-
-function board_prompt() {
-    BOARD=$(cat ../Scripts/Boards.txt | $FZF --height=15% --prompt="Choose your Board: ")
-    case $BOARD in
-        "ArduinoUnoR3")
-            MCU=atmega16u2
-            ;;
-        "ArduinoLeonardo")
-            MCU=atmega32u4
-            ;;
-        "ProMicro") 
-            MCU=atmega32u4
-            ;;
-        "Teensy2") 
-            MCU=atmega32u4
-            ;;
-        "TeensyPP2")
-            MCU=at90usb1286
-            ;;
-        *)
-            note "Invalid Board"
-            exit 1
-    esac
-}
-
-function prog_prompt() {
-    PROGRAM=$(ls -1 *.c 2> /dev/null | sed 's/\.c//g' | $FZF --height=15% --prompt="Program to Flash: " )
-    HEXFILE="${PROGRAM}.hex"
-}
-
-## Color Helpers
-RED=$'\e[1;31m'
-YELLOW=$'\e[1;33m'
-GREEN=$'\e[1;32m'
-LBLUE=$'\e[1;34m'
-WHITE=$'\e[1;37m'
-RESET=$'\e[0m'
-
-# LEZZGOOO!
-run
-
diff --git a/NativePrograms/NintendoSwitch/CustomProgram.c b/NativePrograms/NintendoSwitch/CustomProgram.c
deleted file mode 100644
index a5e41b88ea..0000000000
--- a/NativePrograms/NintendoSwitch/CustomProgram.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/*  Pokemon Sword & Shield: Custom Program
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- *      Make your own program here!
- * 
- */
-
-//
-//  This is a template making your own program. The example here is a copy/paste
-//  of the TurboA program. Feel free to modify accordingly.
-//
-//  Every program that is fully integrated into the package has 4 files:
-//      1.  NativePrograms/PokemonSwShPrograms/ProgramName.h
-//      2.  NativePrograms/ProgramName.c
-//      3.  NativePrograms/ProgramName_Core.c
-//      4.  GeneratorConfig/ProgramName.json
-//
-//  The program is then referenced by the following files/scripts:
-//      1.  NativePrograms/Scripts/BuildAll.cmd
-//      2.  NativePrograms/Scripts/BuildAllUnix.sh
-//      3.  GeneratorConfig/ProgramList.txt
-//
-//  Thus to add a new program, you must edit all of the above.
-//
-
-#include "Programs/CustomProgram.h"
-
-
-//  Setting definitions and defaults go here.
-
diff --git a/NativePrograms/NintendoSwitch/FrameworkSettings.c b/NativePrograms/NintendoSwitch/FrameworkSettings.c
deleted file mode 100644
index 264302624a..0000000000
--- a/NativePrograms/NintendoSwitch/FrameworkSettings.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/*  Framework Settings
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- */
-
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-#include "Libraries/FrameworkSettings.h"
-
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-//  General Options
-
-//  The initial wait period before the program does anything. This gives you
-//  time to switch the Arduino from computer to Switch if connected over a KVM.
-uint16_t CONNECT_CONTROLLER_DELAY           =   5 * TICKS_PER_SECOND;
-
-//  Delay from pressing home anywhere in the settings to return to the home menu.
-uint16_t SETTINGS_TO_HOME_DELAY             =   120;
-
-//  Set this to true if starting the game requires checking the internet.
-//  Otherwise, programs that require soft-resetting may not work properly.
-//
-//  If the game is not a physical cartridge and the Switch is not the primary
-//  Switch, starting the game will require checking the internet to see if it
-//  can be played. If this is the case, set this to true.
-//
-//  Setting this option to true will slow down soft-resetting by about 3 seconds.
-bool START_GAME_REQUIRES_INTERNET           =   false;
-
-//  If starting the game requires checking the internet, wait this long for it.
-uint16_t START_GAME_INTERNET_CHECK_DELAY    =   3 * TICKS_PER_SECOND;
-
-//  Some programs can bypass the system update menu at little performance cost.
-//  Setting this to true enables this.
-bool TOLERATE_SYSTEM_UPDATE_MENU_FAST       =   true;
-
-//  Some programs can bypass the system update menu, but will take a noticeable
-//  performance hit. Setting this to true enables this.
-bool TOLERATE_SYSTEM_UPDATE_MENU_SLOW       =   false;
diff --git a/NativePrograms/NintendoSwitch/FriendDelete.c b/NativePrograms/NintendoSwitch/FriendDelete.c
deleted file mode 100644
index 58dff7b998..0000000000
--- a/NativePrograms/NintendoSwitch/FriendDelete.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/*  Pokemon Sword & Shield: Friend Deleter
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- *      Please refer to the user manual for instructions and documentation.
- * 
- */
-
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-#include "Programs/FriendDelete.h"
-
-
-
-//  Set to a large number to delete all friends.
-const uint16_t FRIENDS_TO_DELETE    =   3;
-
-//  Instead of deleting friends, block them.
-const bool BLOCK_FRIENDS            =   false;
-
-
-//  Timings: You may need to increase if your internet is slow.
-const uint16_t VIEW_FRIEND_DELAY    =   2 * TICKS_PER_SECOND;   //  Delay from opening a friend to when you can press buttons.
-const uint16_t DELETE_FRIEND_DELAY  =   8 * TICKS_PER_SECOND;   //  Delay to delete the friend.
-const uint16_t FINISH_DELETE_DELAY  =   2 * TICKS_PER_SECOND;   //  Delay after deleting a friend.
-
-
diff --git a/NativePrograms/NintendoSwitch/Libraries/FrameworkSettings.h b/NativePrograms/NintendoSwitch/Libraries/FrameworkSettings.h
deleted file mode 100644
index 4cf4c763c2..0000000000
--- a/NativePrograms/NintendoSwitch/Libraries/FrameworkSettings.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*  Framework Settings
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- */
-
-#ifndef PokemonAutomation_FrameworkSettings_H
-#define PokemonAutomation_FrameworkSettings_H
-
-#include <stdbool.h>
-#include <stdint.h>
-
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-//  General Options
-
-//  The initial wait period before the program does anything. This gives you
-//  time to switch the Arduino from computer to Switch if connected over a KVM.
-extern uint16_t CONNECT_CONTROLLER_DELAY;
-
-//  Delay from pressing home anywhere in the settings to return to the home menu.
-extern uint16_t SETTINGS_TO_HOME_DELAY;
-
-//  Set this to true if starting the game requires checking the internet.
-//  Otherwise, programs that require soft-resetting may not work properly.
-//
-//  If the game is not a physical cartridge and the Switch is not the primary
-//  Switch, starting the game will require checking the internet to see if it
-//  can be played. If this is the case, set this to true.
-//
-//  Setting this option to true will slow down soft-resetting by about 3 seconds.
-extern bool START_GAME_REQUIRES_INTERNET;
-
-//  If starting the game requires checking the internet, wait this long for it.
-extern uint16_t START_GAME_INTERNET_CHECK_DELAY;
-
-//  Some programs can bypass the system update menu at little performance cost.
-//  Setting this to true enables this.
-extern bool TOLERATE_SYSTEM_UPDATE_MENU_FAST;
-
-//  Some programs have the ability to tolerate the system update menu at the
-//  cost of speed/performance. Setting this to true enables this.
-extern bool TOLERATE_SYSTEM_UPDATE_MENU_SLOW;
-
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-#endif
diff --git a/NativePrograms/NintendoSwitch/Libraries/NintendoSwitch_Device.h b/NativePrograms/NintendoSwitch/Libraries/NintendoSwitch_Device.h
deleted file mode 100644
index 3ad3574a0a..0000000000
--- a/NativePrograms/NintendoSwitch/Libraries/NintendoSwitch_Device.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*  Device Functions
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_NintendoSwitch_Device_H
-#define PokemonAutomation_NintendoSwitch_Device_H
-
-//#ifdef __AVR__
-//#include "NativePrograms/NintendoSwitch/Framework/Master.h"
-//#endif
-#include "Common/Microcontroller/MessageProtocol.h"
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-
-
-//  Call this at the start of every program.
-void initialize_framework(uint8_t program_id);
-
-//  Turn on/off the LEDs.
-void set_leds(bool on);
-
-//  A global clock. Returns the # of ticks that have elapsed since the start of
-//  the program.
-uint32_t system_clock(void);
-
-void end_program_callback(void);
-
-
-
-#endif
diff --git a/NativePrograms/NintendoSwitch/Libraries/NintendoSwitch_PushButtons.h b/NativePrograms/NintendoSwitch/Libraries/NintendoSwitch_PushButtons.h
deleted file mode 100644
index b3df8a9bf9..0000000000
--- a/NativePrograms/NintendoSwitch/Libraries/NintendoSwitch_PushButtons.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*  Pokemon Automation Push Button Framework
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- */
-
-#ifndef PokemonAutomation_NintendoSwitch_PushButtons_H
-#define PokemonAutomation_NintendoSwitch_PushButtons_H
-
-//#ifdef __AVR__
-//#include "NativePrograms/NintendoSwitch/Framework/Master.h"
-//#endif
-#include "Common/Microcontroller/MessageProtocol.h"
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-#include "Common/NintendoSwitch/NintendoSwitch_Protocol_PushButtons.h"
-
-
-
-//  Do nothing for the specified number of ticks.
-void pbf_wait(uint16_t ticks);
-
-//  Press the specified button for "hold_ticks" ticks.
-//  Then release and wait for "release_ticks" ticks.
-void pbf_press_button(Button button, uint16_t hold_ticks, uint16_t release_ticks);
-
-//  Press the specified Dpad button for "hold_ticks" ticks.
-//  Then release and wait for "release_ticks" ticks.
-void pbf_press_dpad(DpadPosition position, uint16_t hold_ticks, uint16_t release_ticks);
-
-//  Joystick Positions:
-//      Neutral     x = 0x80, y = 0x80
-//      Up          x = 0x80, y = 0x00
-//      Down        x = 0x80, y = 0xff
-//      Left        x = 0x00, y = 0x80
-//      Right       x = 0xff, y = 0x80
-void pbf_move_left_joystick (uint8_t x, uint8_t y, uint16_t hold_ticks, uint16_t release_ticks);
-void pbf_move_right_joystick(uint8_t x, uint8_t y, uint16_t hold_ticks, uint16_t release_ticks);
-
-//  Repeatedly press the specified button as quickly as possible for the
-//  specified amount of time.
-void pbf_mash_button(Button button, uint16_t ticks);
-
-
-
-
-//  Wait this many ticks and flash the LEDs.
-void start_program_flash(uint16_t ticks);
-
-//  Connect controller from grip menu and go to Switch home.
-void grip_menu_connect_go_home(void);
-
-//  Keep the Switch from sleeping after the program finishes.
-//  If the Switch sleeps, it may end up restarting the program!
-void end_program_loop(void);
-
-
-
-#endif
diff --git a/NativePrograms/NintendoSwitch/PABotBase.c b/NativePrograms/NintendoSwitch/PABotBase.c
deleted file mode 100644
index ac1e4b6b3c..0000000000
--- a/NativePrograms/NintendoSwitch/PABotBase.c
+++ /dev/null
@@ -1,13 +0,0 @@
-/*  Pokemon Sword & Shield: Pokemon Automation Bot Base
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- *      Please refer to the user manual for instructions and documentation.
- * 
- */
-
-//#include "Programs/PABotBase.h"
-
-//
-//  This program has no program-specific configurable options.
-//
diff --git a/NativePrograms/NintendoSwitch/ProgramList.txt b/NativePrograms/NintendoSwitch/ProgramList.txt
deleted file mode 100644
index 1887f6a3f5..0000000000
--- a/NativePrograms/NintendoSwitch/ProgramList.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-
----- Programs ----
-CustomProgram
-
-TurboA
-FriendDelete
-PABotBase
diff --git a/NativePrograms/NintendoSwitch/Programs/CustomProgram.h b/NativePrograms/NintendoSwitch/Programs/CustomProgram.h
deleted file mode 100644
index 726dc17ee9..0000000000
--- a/NativePrograms/NintendoSwitch/Programs/CustomProgram.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*  Pokemon Sword & Shield Arduino Programs
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- */
-
-//
-//  This is a template making your own program. The example here is a copy/paste
-//  of the TurboA program. Feel free to modify accordingly.
-//
-//  Every program that is fully integrated into the package has 4 files:
-//      1.  NativePrograms/PokemonSwShPrograms/ProgramName.h
-//      2.  NativePrograms/ProgramName.c
-//      3.  NativePrograms/ProgramName_Core.c
-//      4.  GeneratorConfig/ProgramName.json
-//
-//  The program is then referenced by the following files/scripts:
-//      1.  NativePrograms/Scripts/BuildAll.cmd
-//      2.  NativePrograms/Scripts/BuildAllUnix.sh
-//      3.  GeneratorConfig/ProgramList.txt
-//
-//  Thus to add a new program, you must edit all of the above.
-//
-
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-
-//  Setting declarations go here.
-
diff --git a/NativePrograms/NintendoSwitch/Programs/CustomProgram_Core.c b/NativePrograms/NintendoSwitch/Programs/CustomProgram_Core.c
deleted file mode 100644
index 20831b2772..0000000000
--- a/NativePrograms/NintendoSwitch/Programs/CustomProgram_Core.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/*  Pokemon Sword & Shield Arduino Programs
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- */
-
-//
-//  This is a template making your own program. The example here is a copy/paste
-//  of the TurboA program. Feel free to modify accordingly.
-//
-//  Every program that is fully integrated into the package has 4 files:
-//      1.  NativePrograms/(category)/ProgramName.h
-//      2.  NativePrograms/(category)/ProgramName.c
-//      3.  NativePrograms/(category)/ProgramName_Core.c
-//      4.  GeneratorConfig/(category)/ProgramName.json
-//
-//  The program is then referenced by the following files/scripts:
-//      1.  NativePrograms/(category)/Scripts/BuildAll.cmd
-//      2.  NativePrograms/(category)/Scripts/BuildAllUnix.sh
-//      3.  GeneratorConfig/(category)/ProgramList.txt
-//
-//  Thus to add a new program, you must edit all of the above.
-//
-
-#include "Common/PokemonSwSh/PokemonProgramIDs.h"
-#include "NativePrograms/DeviceFramework/DeviceSettings.h"
-#include "NativePrograms/NintendoSwitch/Libraries/FrameworkSettings.h"
-#include "NativePrograms/NintendoSwitch/Libraries/NintendoSwitch_Device.h"
-#include "NativePrograms/NintendoSwitch/Libraries/NintendoSwitch_PushButtons.h"
-#include "NativePrograms/NintendoSwitch/Programs/CustomProgram.h"
-#include "NativePrograms/PokemonSwSh/Libraries/PokemonSwSh_Settings.h"
-
-
-int main(void){
-    //  Do not delete these two lines!
-    start_program_callback();
-    initialize_framework(0);
-
-    //  Start the program in the grip menu. Then go home.
-    start_program_flash(CONNECT_CONTROLLER_DELAY);
-    grip_menu_connect_go_home();
-
-    //  Enter the game.
-    pbf_press_button(BUTTON_HOME, 10, PokemonSwSh_HOME_TO_GAME_DELAY);
-
-    //  Turbo A forever...
-    while (true){
-        pbf_press_button(BUTTON_A, 5, 5);
-    }
-
-    //  Not really relevant here, but for programs that finish, go to
-    //  Switch home to idle.
-    pbf_press_button(BUTTON_HOME, 10, PokemonSwSh_GAME_TO_HOME_DELAY_SAFE);
-    end_program_callback();
-    end_program_loop();
-};
-
diff --git a/NativePrograms/NintendoSwitch/Programs/FriendDelete.h b/NativePrograms/NintendoSwitch/Programs/FriendDelete.h
deleted file mode 100644
index f4ef4cb415..0000000000
--- a/NativePrograms/NintendoSwitch/Programs/FriendDelete.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*  Pokemon Sword & Shield Arduino Programs
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- */
-
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-
-
-//  Set to a large number to delete all friends.
-extern const uint16_t FRIENDS_TO_DELETE;
-
-//  Instead of deleting friends, block them.
-extern const bool BLOCK_FRIENDS;
-
-
-//  Timings
-extern const uint16_t VIEW_FRIEND_DELAY;    //  Delay from opening a friend to when you can press buttons.
-extern const uint16_t DELETE_FRIEND_DELAY;  //  Delay to delete the friend.
-extern const uint16_t FINISH_DELETE_DELAY;  //  Delay after deleting a friend.
-
diff --git a/NativePrograms/NintendoSwitch/Programs/PABotBase.h b/NativePrograms/NintendoSwitch/Programs/PABotBase.h
deleted file mode 100644
index adacd7b084..0000000000
--- a/NativePrograms/NintendoSwitch/Programs/PABotBase.h
+++ /dev/null
@@ -1,9 +0,0 @@
-/*  Pokemon Sword & Shield Arduino Programs
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- */
-
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-
-
diff --git a/NativePrograms/NintendoSwitch/Programs/TurboA.h b/NativePrograms/NintendoSwitch/Programs/TurboA.h
deleted file mode 100644
index adacd7b084..0000000000
--- a/NativePrograms/NintendoSwitch/Programs/TurboA.h
+++ /dev/null
@@ -1,9 +0,0 @@
-/*  Pokemon Sword & Shield Arduino Programs
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- */
-
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-
-
diff --git a/NativePrograms/NintendoSwitch/Sandbox.c b/NativePrograms/NintendoSwitch/Sandbox.c
deleted file mode 100644
index 7e3951ff5a..0000000000
--- a/NativePrograms/NintendoSwitch/Sandbox.c
+++ /dev/null
@@ -1,194 +0,0 @@
-
-
-
-
-
-
-////////////////////////////////////////////////////////////////////////////////
-#include <stdint.h>
-#include <avr/io.h>
-#include <avr/pgmspace.h>
-//#include <LUFA/Drivers/USB/USB.h>
-#include <LUFA/Drivers/Peripheral/Serial.h>
-#include "Common/NintendoSwitch/FrameworkSettings.h"
-#include "Common/NintendoSwitch/NintendoSwitch_PushButtons.h"
-//#include "DeviceFramework/Controller.h"
-//#include "PokemonSwShLibraries/PokemonRoutines.h"
-//#include "PokemonSwShLibraries/CodeEntry.h"
-//#include "PokemonSwShLibraries/ProgramFlow.h"
-//#include "PokemonSwShLibraries/NavigateDateTime.h"
-#include "NativePrograms/DeviceFramework/HardwareLED.h"
-//#include "Libraries/AutoHostTools.h"
-//#include "Libraries/DaySkipperTools.h"
-//#include "Libraries/EggHelpers.h"
-//#include "PokemonSwShLibraries/ShinyHuntTools.h"
-//#include "Framework/BotBaseUtils.h"
-//#include "Framework/ProtocolSerial.h"
-//#include "Framework/SerialCommandsPBF.h"
-//#include "Framework/SerialCommandsSSF.h"
-//#include "Framework/SerialProcessor.h"
-#include "NativePrograms/NintendoSwitch/Framework/uart.h"
-#include "NativePrograms/NintendoSwitch/Framework/HardwareSerial.h"
-#include "Common/PokemonSwSh/PokemonProgramIDs.h"
-
-
-#if 0
-#define BAUD_RATE 9600
-#define CPU_PRESCALE(n) (CLKPR = 0x80, CLKPR = (n))
-// write a string to the uart
-#define uart_print(s) uart_print_P(PSTR(s))
-void uart_print_P(const char *str)
-{
-    char c;
-    while (1) {
-        c = pgm_read_byte(str++);
-        if (!c) break;
-        uart_putchar(c);
-    }
-}
-
-void blink(uint8_t x){
-    while (x--){
-        onboard_led(true);
-        pbf_wait(50);
-        onboard_led(false);
-        pbf_wait(50);
-    }
-}
-#endif
-
-int main(void){
-    setup_leds();
-    initialize_framework(PABB_PID_SANDBOX);
-    bool state = true;
-
-    while (true){
-        onboard_led(state = !state);
-        uart_putchar('h');
-//        pabb_send_error_ready();
-//        pbf_wait(5 * TICKS_PER_SECOND);
-//        pbf_press_button(BUTTON_ZL, 10, 5 * TICKS_PER_SECOND - 10);
-    }
-
-
-#if 0
-    setup_leds();
-    CPU_PRESCALE(0);  // run at 16 MHz
-
-    Serial_Init(BAUD_RATE, false);
-
-    bool state = true;
-    onboard_led(state);
-
-    while (true){
-        if (Serial_IsCharReceived()){
-            onboard_led(state = !state);
-            char ch = (char)Serial_ReceiveByte();
-            Serial_SendByte();
-        }
-//        Serial_SendByte('H');
-//        Serial_SendByte('e');
-//        onboard_led(state = !state);
-//        uart_print("H");
-//        uart_print("Hello World\r\n");
-    }
-#endif
-
-
-
-#if 0
-    setup_leds();
-    initialize_framework();
-
-    CPU_PRESCALE(0);  // run at 16 MHz
-    uart_init(BAUD_RATE);
-
-//    bool state = false;
-    onboard_led(false);
-
-    while (true){
-        if (uart_available()){
-//            onboard_led(state = !state);
-            char ch = uart_getchar();
-            onboard_led(true);
-            pbf_wait(50);
-            onboard_led(false);
-            pbf_wait(125);
-
-            switch (ch){
-            case 'a': blink(2); break;
-            case 's': blink(3); break;
-            }
-            uart_putchar(ch);
-        }
-//        onboard_led(state = !state);
-//        uart_print("H");
-//        uart_print("Hello World\r\n");
-    }
-#endif
-
-
-#if 0
-    setup_leds();
-
-    CPU_PRESCALE(0);  // run at 16 MHz
-    uart_init(BAUD_RATE);
-
-    bool state = true;
-    onboard_led(state);
-
-    uint8_t c;
-    uart_print("UART Example\r\n");
-    while (1) {
-        if (uart_available()) {
-            onboard_led(state = !state);
-            c = uart_getchar();
-            uart_print("Byte: ");
-            uart_putchar(c);
-            uart_putchar('\r');
-            uart_putchar('\n');
-        }
-    }
-#endif
-
-
-
-#if 0
-    start_program_callback();
-
-    initialize_framework(true);
-
-//    Serial_Init(9600, false);
-//    sei();
-    CPU_PRESCALE(0);  // run at 16 MHz
-    uart_init(9600);
-
-    start_program_flash(CONNECT_CONTROLLER_DELAY);
-    grip_menu_connect_go_home();
-
-    bool leds = false;
-    while (true){
-        onboard_led(leds);
-        leds = !leds;
-
-        uart_putchar('H');
-        uart_putchar('e');
-//        uart_putchar('l');
-//        uart_putchar('l');
-//        uart_putchar('o');
-//        uart_putchar('\r');
-//        uart_putchar('\n');
-
-        pbf_wait(TICKS_PER_SECOND);
-    }
-#endif
-
-
-
-
-
-
-
-
-}
-
diff --git a/NativePrograms/NintendoSwitch/TurboA.c b/NativePrograms/NintendoSwitch/TurboA.c
deleted file mode 100644
index 286d7e9678..0000000000
--- a/NativePrograms/NintendoSwitch/TurboA.c
+++ /dev/null
@@ -1,13 +0,0 @@
-/*  Pokemon Sword & Shield: Turbo A
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- *      Please refer to the user manual for instructions and documentation.
- * 
- */
-
-#include "Programs/TurboA.h"
-
-//
-//  This program has no program-specific configurable options.
-//
diff --git a/NativePrograms/NintendoSwitch/makefile b/NativePrograms/NintendoSwitch/makefile
deleted file mode 100644
index d7271d8c27..0000000000
--- a/NativePrograms/NintendoSwitch/makefile
+++ /dev/null
@@ -1,132 +0,0 @@
-#
-#             LUFA Library
-#     Copyright (C) Dean Camera, 2014.
-#
-#  dean [at] fourwalledcubicle [dot] com
-#           www.lufa-lib.org
-# 
-#  Modified by https://github.com/PokemonAutomation/Arduino-Source
-#
-# --------------------------------------
-#         LUFA Project Makefile.
-# --------------------------------------
-
-#   MCU Types:
-#     atmega16u2    for Arduino UNO R3
-#     atmega32u4    for Arduino Micro, and Teensy 2.0
-#     at90usb1286   for Teensy 2.0++
-
-#   Set MCU and TARGET here:
-
-ifeq ($(BOARD_TYPE),)
-BOARD_TYPE := Teensy2
-endif
-ifeq ($(TARGET),)
-TARGET := TurboA
-#TARGET := Sandbox
-endif
-
-
-################################################################################
-#   Ignore all this stuff below.
-
-PATH_PUBLIC = ../../
-PATH_INTERNAL = ../../../Internal
-
-CATEGORY = NintendoSwitch
-
-#MCU          = atmega16u2
-ARCH         = AVR8
-F_CPU        = 16000000
-F_USB        = $(F_CPU)
-OPTIMIZATION = s
-#TARGET       = TurboA
-SRC          = $(TARGET).c
-LUFA_PATH    = $(PATH_PUBLIC)/NativePrograms/LUFA
-CC_FLAGS     = -DUSE_LUFA_CONFIG_HEADER -I$(PATH_PUBLIC) -I$(PATH_PUBLIC)/NativePrograms/LUFA/ -Wno-unused-function -Werror
-
-
-
-
-#   Board
-ifeq ($(BOARD_TYPE), ArduinoUnoR3)
-MCU := atmega16u2
-SRC += $(PATH_PUBLIC)/NativePrograms/DeviceFramework/Board-atmega16u2-ArduinoUnoR3.c
-endif
-ifeq ($(BOARD_TYPE), ArduinoLeonardo)
-MCU := atmega32u4
-SRC += $(PATH_PUBLIC)/NativePrograms/DeviceFramework/Board-atmega32u4-ArduinoLeonardo.c
-endif
-ifeq ($(BOARD_TYPE), ProMicro)
-MCU := atmega32u4
-SRC += $(PATH_PUBLIC)/NativePrograms/DeviceFramework/Board-atmega32u4-ProMicro.c
-endif
-ifeq ($(BOARD_TYPE), Teensy2)
-MCU := atmega32u4
-SRC += $(PATH_PUBLIC)/NativePrograms/DeviceFramework/Board-atmega32u4-Teensy2.c
-endif
-ifeq ($(BOARD_TYPE), TeensyPP2)
-MCU := at90usb1286
-SRC += $(PATH_PUBLIC)/NativePrograms/DeviceFramework/Board-at90usb1286-Teensy2.c
-endif
-
-#   Framework
-SRC += $(LUFA_SRC_USB)
-SRC += $(PATH_PUBLIC)/NativePrograms/DeviceFramework/Framework/DeviceSettings.c
-SRC += $(PATH_PUBLIC)/NativePrograms/NintendoSwitch/FrameworkSettings.c
-ifneq ("$(wildcard $(PATH_INTERNAL)/NativePrograms/NintendoSwitch/Framework/NintendoSwitch_PushButtons.c)","")
-CC_FLAGS += -I$(PATH_INTERNAL)
-SRC += $(PATH_PUBLIC)/Common/CRC32.c
-SRC += $(PATH_INTERNAL)/NativePrograms/NintendoSwitch/Framework/uart.c
-SRC += $(PATH_INTERNAL)/NativePrograms/NintendoSwitch/Framework/HardwareUSB.c
-ifeq ($(TARGET), PABotBase)
-SRC += $(PATH_INTERNAL)/NativePrograms/NintendoSwitch/Framework/CommandQueue.c
-else
-SRC += $(PATH_INTERNAL)/NativePrograms/NintendoSwitch/Framework/CommandQueueNull.c
-endif
-SRC += $(PATH_INTERNAL)/NativePrograms/NintendoSwitch/Framework/HardwareSerial.c
-SRC += $(PATH_INTERNAL)/NativePrograms/NintendoSwitch/Framework/Controller.c
-SRC += $(PATH_INTERNAL)/NativePrograms/NintendoSwitch/Framework/NintendoSwitch_PushButtons.c
-SRC += $(PATH_INTERNAL)/NativePrograms/NintendoSwitch/Framework/NintendoSwitch_ScalarButtons.c
-else
-LD_FLAGS += obj/obj-$(MCU)/CRC32.o
-LD_FLAGS += obj/obj-$(MCU)/uart.o
-LD_FLAGS += obj/obj-$(MCU)/HardwareUSB.o
-ifeq ($(TARGET), PABotBase)
-LD_FLAGS += obj/obj-$(MCU)/CommandQueue.o
-else
-LD_FLAGS += obj/obj-$(MCU)/CommandQueueNull.o
-endif
-LD_FLAGS += obj/obj-$(MCU)/HardwareSerial.o
-LD_FLAGS += obj/obj-$(MCU)/Controller.o
-LD_FLAGS += obj/obj-$(MCU)/NintendoSwitch_PushButtons.o
-LD_FLAGS += obj/obj-$(MCU)/NintendoSwitch_ScalarButtons.o
-endif
-
-#   Program
-SRC += $(PATH_PUBLIC)/NativePrograms/PokemonSwSh/PokemonSwSh_Settings.c
-ifneq ("$(wildcard $(PATH_INTERNAL)/NativePrograms/$(CATEGORY)/$(TARGET)_Core.c)","")
-SRC += $(PATH_INTERNAL)/NativePrograms/$(CATEGORY)/$(TARGET)_Core.c
-else ifneq ("$(wildcard Programs/$(TARGET)_Core.c)","")
-SRC += Programs/$(TARGET)_Core.c
-else ifneq ("$(wildcard obj/obj-$(MCU)/$(TARGET)_Core.o)","")
-LD_FLAGS += obj/obj-$(MCU)/$(TARGET)_Core.o
-endif
-
-#   Must go at the end or it blows up memory if floating-point is used.
-LD_FLAGS += -lm
-
-
-# Default target
-all:
-
-# Include LUFA build script makefiles
-include $(LUFA_PATH)/Build/lufa_core.mk
-include $(LUFA_PATH)/Build/lufa_sources.mk
-include $(LUFA_PATH)/Build/lufa_build.mk
-include $(LUFA_PATH)/Build/lufa_cppcheck.mk
-include $(LUFA_PATH)/Build/lufa_doxygen.mk
-include $(LUFA_PATH)/Build/lufa_dfu.mk
-include $(LUFA_PATH)/Build/lufa_hid.mk
-include $(LUFA_PATH)/Build/lufa_avrdude.mk
-include $(LUFA_PATH)/Build/lufa_atprogram.mk
diff --git a/NativePrograms/PokemonBDSP/!BuildAll-ArduinoLeonardo.cmd b/NativePrograms/PokemonBDSP/!BuildAll-ArduinoLeonardo.cmd
deleted file mode 100644
index 488519e9ec..0000000000
--- a/NativePrograms/PokemonBDSP/!BuildAll-ArduinoLeonardo.cmd
+++ /dev/null
@@ -1,15 +0,0 @@
-@echo off
-
-cd /D "%~dp0"
-
-if not exist Programs\ (
-    echo.
-    echo Please unzip the folder before you can use it.
-    echo.
-    pause
-    exit
-)
-
-@call ../Scripts/BuildAll.cmd ArduinoLeonardo
-
-
diff --git a/NativePrograms/PokemonBDSP/!BuildAll-ArduinoUnoR3.cmd b/NativePrograms/PokemonBDSP/!BuildAll-ArduinoUnoR3.cmd
deleted file mode 100644
index 7fc90f1c06..0000000000
--- a/NativePrograms/PokemonBDSP/!BuildAll-ArduinoUnoR3.cmd
+++ /dev/null
@@ -1,15 +0,0 @@
-@echo off
-
-cd /D "%~dp0"
-
-if not exist Programs\ (
-    echo.
-    echo Please unzip the folder before you can use it.
-    echo.
-    pause
-    exit
-)
-
-@call ../Scripts/BuildAll.cmd ArduinoUnoR3
-
-
diff --git a/NativePrograms/PokemonBDSP/!BuildAll-ProMicro.cmd b/NativePrograms/PokemonBDSP/!BuildAll-ProMicro.cmd
deleted file mode 100644
index b1ece4743b..0000000000
--- a/NativePrograms/PokemonBDSP/!BuildAll-ProMicro.cmd
+++ /dev/null
@@ -1,15 +0,0 @@
-@echo off
-
-cd /D "%~dp0"
-
-if not exist Programs\ (
-    echo.
-    echo Please unzip the folder before you can use it.
-    echo.
-    pause
-    exit
-)
-
-@call ../Scripts/BuildAll.cmd ProMicro
-
-
diff --git a/NativePrograms/PokemonBDSP/!BuildAll-Teensy++2.0.cmd b/NativePrograms/PokemonBDSP/!BuildAll-Teensy++2.0.cmd
deleted file mode 100644
index e30eb5dfe0..0000000000
--- a/NativePrograms/PokemonBDSP/!BuildAll-Teensy++2.0.cmd
+++ /dev/null
@@ -1,15 +0,0 @@
-@echo off
-
-cd /D "%~dp0"
-
-if not exist Programs\ (
-    echo.
-    echo Please unzip the folder before you can use it.
-    echo.
-    pause
-    exit
-)
-
-@call ../Scripts/BuildAll.cmd TeensyPP2
-
-
diff --git a/NativePrograms/PokemonBDSP/!BuildAll-Teensy2.0.cmd b/NativePrograms/PokemonBDSP/!BuildAll-Teensy2.0.cmd
deleted file mode 100644
index 84f90a817e..0000000000
--- a/NativePrograms/PokemonBDSP/!BuildAll-Teensy2.0.cmd
+++ /dev/null
@@ -1,15 +0,0 @@
-@echo off
-
-cd /D "%~dp0"
-
-if not exist Programs\ (
-    echo.
-    echo Please unzip the folder before you can use it.
-    echo.
-    pause
-    exit
-)
-
-@call ../Scripts/BuildAll.cmd Teensy2
-
-
diff --git a/NativePrograms/PokemonBDSP/!Cleanup.cmd b/NativePrograms/PokemonBDSP/!Cleanup.cmd
deleted file mode 100644
index 7832b61049..0000000000
--- a/NativePrograms/PokemonBDSP/!Cleanup.cmd
+++ /dev/null
@@ -1,21 +0,0 @@
-::  Clean the build. Delete all build artifacts.
-
-cd %~dp0
-
-del *.log
-del *.d
-del *.elf
-del *.hex
-del *.map
-del *.o
-del *.eep
-del *.bin
-del *.lss
-del *.sym
-del *.tmp
-
-del obj\*.d
-del obj\*.o
-del obj\build-*
-
-::pause
diff --git a/NativePrograms/PokemonBDSP/00-BuildAllUnix.sh b/NativePrograms/PokemonBDSP/00-BuildAllUnix.sh
deleted file mode 100644
index a543c0de94..0000000000
--- a/NativePrograms/PokemonBDSP/00-BuildAllUnix.sh
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/usr/bin/env bash
-
-# change directory to library location
-cd "$(dirname "$0")"
-
-# define the MCU, which is the board type
-
-if [[ "$OSTYPE" == "darwin"* ]]; then
-    PLATFORM="mac"
-    FZF=$(which fzf)
-
-    if [[ "$FZF" == "" ]]; then
-        boxed_msg "${RED}ERROR: FZF is not detected on your system. Please install it through Homebrew ${RESET}"
-        exit 1
-    fi
-
-elif [[ "$OSTYPE" == "linux-gnu"* ]]; then
-    PLATFORM="linux"
-    FZF="../Scripts/fzf-${PLATFORM}"
-else
-    boxed_msg "${RED}${OSTYPE} is not a recognized platform. Please run only on Mac or Linux${RESET}"
-    exit 1
-fi
-
-BOARD=$1
-
-function run() {
-    if [[ -z "$BOARD" ]]; then
-        board_prompt
-    fi
-
-    # if the boards were given by integer, we can update them here
-
-
-    # say what we're building for convenience
-    echo "Ready to build for board: $BOARD"
-    echo ""
-
-    # and send off to build
-    bash ../Scripts/BuildAllUnix.sh "$BOARD" #1> /dev/null
-
-    # let them know we finished
-    echo -e "\033[1mFinished building hex files for board: $BOARD \033[0m"
-    echo "Please make sure the hex files were properly built or updated."
-    echo "You can now close this window if you wish."
-    echo ""
-    # really done
-}
-
-function board_prompt() {
-    BOARD=$(cat ../Scripts/Boards.txt | $FZF --height=15% --prompt="Choose your Board: ")
-}
-
-run
diff --git a/NativePrograms/PokemonBDSP/00-CleanupUnix.sh b/NativePrograms/PokemonBDSP/00-CleanupUnix.sh
deleted file mode 100644
index 3e3789e7cc..0000000000
--- a/NativePrograms/PokemonBDSP/00-CleanupUnix.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/usr/bin/env bash
-# this script removes all compiled pieces to create a fresh directory
-
-# change directory to library location
-cd "$(dirname "$0")"
-
-# NOTE: /dev/null forwarding is to ensure that nothing is printed if the files were already deleted
-rm *.log > /dev/null 2>&1
-rm *.d > /dev/null 2>&1
-rm *.elf > /dev/null 2>&1
-rm *.hex > /dev/null 2>&1
-rm *.map > /dev/null 2>&1
-rm *.o > /dev/null 2>&1
-rm *.eep > /dev/null 2>&1
-rm *.bin > /dev/null 2>&1
-rm *.lss > /dev/null 2>&1
-rm *.sym > /dev/null 2>&1
-rm *.tmp > /dev/null 2>&1
-
-# compiled pieces within Libraries, Programs, and obj
-rm Libraries/*.d > /dev/null 2>&1
-rm Libraries/*.o > /dev/null 2>&1
-
-rm Programs/*.d > /dev/null 2>&1
-rm Programs/*.o > /dev/null 2>&1
-
-rm obj/*.d > /dev/null 2>&1
-rm obj/*.o > /dev/null 2>&1
-
-echo "Finished cleaning build files."
diff --git a/NativePrograms/PokemonBDSP/00-FlashUnix.sh b/NativePrograms/PokemonBDSP/00-FlashUnix.sh
deleted file mode 100644
index a7c2f8ea87..0000000000
--- a/NativePrograms/PokemonBDSP/00-FlashUnix.sh
+++ /dev/null
@@ -1,222 +0,0 @@
-#!/usr/bin/env bash
-
-# change directory to library location
-cd "$(dirname "$0")" || exit
-
-# Parse Command line arguments for MCU, Program and Device Path
-BOARD=$1
-PROGRAM=$2
-DEVICE_PATH=$3
-
-
-if [[ "$OSTYPE" == "darwin"* ]]; then
-    PLATFORM="mac"
-    FZF=$(which fzf)
-
-    if [[ "$FZF" == "" ]]; then
-        boxed_msg "${RED}ERROR: FZF is not detected on your system. Please install it through Homebrew ${RESET}"
-        exit 1
-    fi
-
-elif [[ "$OSTYPE" == "linux-gnu"* ]]; then
-    PLATFORM="linux"
-    FZF="../Scripts/fzf-${PLATFORM}"
-else
-    boxed_msg "${RED}${OSTYPE} is not a recognized platform. Please run only on Mac or Linux${RESET}"
-    exit 1
-fi
-
-SUDO=""
-BUILD_HEX=""
-HEXFILE=""
-PROGRAM_COMMAND="program_avrdude ${MCU} ${HEXFILE}" # Default to using avrdude
-BOARDS=(ArduinoUnoR3 ProMicro Teensy2 TeensyPP2)
-
-function run() {
-
-    configure
-
-    if [[ $BUILD_HEX == "y" ]]; then
-        build_hex
-    fi
-
-    boxed_msg "Flashing ${PROGRAM}.hex ..."
-    $PROGRAM_COMMAND
-
-    boxed_msg "Finished flashing ${HEXFILE} to ${BOARD}!"
-}
-
-function configure() {
-    boxed_msg "Configuration"
-
-    [[ -f "${HOME}/.paconfig" ]] && source "${HOME}/.paconfig"
-    [[ "$EUID" -ne 0 ]] && SUDO="sudo"
-    [[ -z "${BOARD}" ]] && board_prompt || note "Using Preconfigured BOARD [${BOARD}]"
-    [[ -z "${PROGRAM}" ]] && prog_prompt
-    
-    if [[ ! -f ${HEXFILE} ]]; then
-        question "Build ${PROGRAM}? ${WHITE}[Y/n]${RESET}" "DOBUILD"
-        DOBUILD="${DOBUILD:-y}"
-        if [ "$DOBUILD" == "y" ]; then
-            BUILD_HEX="y"
-        else
-            logmsg "Nothing to flash, exiting.."
-            exit
-        fi
-    fi
-
-    # Logic below to determine if we need to us dfu-programmer or not
-    if [[ $PLATFORM == "mac" ]] && [[ ${MCU} == "atmega16u2" ]]; then
-        which dfu-programmer >/dev/null 2>&1
-        if [[ $? -eq 0 ]]; then
-            question "Mac platform detected, UNO R3 configured. Connect your device and enter DFU mode, then press any key..." "use_dfu"
-            PROGRAM_COMMAND="program_dfu ${MCU} ${HEXFILE}"
-        else
-            logmsg "dfu-programmer not installed, run \"brew install dfu-programmer\" then rerun this script"
-	    exit 1
-        fi
-    fi
-}
-
-function build_hex {
-        boxed_msg "Build ${PROGRAM}.c"
-
-        note "Cleaning Build Environment"
-        ./00-CleanupUnix.sh >/dev/null
-
-
-        note "Running Build Script"
-        sh ../Scripts/BuildOneUnix.sh "${BOARD}" "${PROGRAM}" > /dev/null 2>&1
-
-        retVal=$?
-        if [ $retVal -ne 0 ]; then
-            boxed_msg "${RED}ERROR - CRITICAL: An error occured while building.\nPlease check logs and perhaps run the cleanup script before trying again.${RESET}"
-            exit 1
-        else 
-            note "${PROGRAM}.hex successfully built!"
-        fi
-    
-}
-
-function detect_device() {
-    local -r delay='0.75'
-    local spinstr='\|/-'
-    local temp
-    while true; do
-        temp="${spinstr#?}"
-        printf "${YELLOW}Waiting for device... [%c]  ${RESET}" "${spinstr}"
-        spinstr=${temp}${spinstr%"${temp}"}
-        # shellcheck disable=SC2010
-        found_device_path="$(ls /dev/tty* | grep -i 'acm\|usb')"
-        if [[ -n "$found_device_path" ]]; then
-            DEVICE_PATH="${found_device_path}"
-            break
-        fi
-        sleep "${delay}"
-        printf "%0.s\b" {1..28}
-    done
-    printf "    \b\b\b\b\n"
-    boxed_msg "Device connected at [${found_device_path}]" "short"
-}
-
-function program_dfu {
-    # start with clearing the BOARD
-    ${SUDO} dfu-programmer "${MCU}" erase || true
-    # then flash the hex to the BOARD
-    ${SUDO} dfu-programmer "${MCU}" flash "${HEXFILE}"
-    if [[ $? -ne 0 ]]; then
-        boxed_msg "${RED}Flash Error: Check the output above for more info.${RESET}"
-        exit 1
-    fi
-    # then reset the BOARD
-    ${SUDO} dfu-programmer "${MCU}" reset
-    if [[ $? -ne 0 ]]; then
-        boxed_msg "${RED}Device Reset Error: Check the output above for more info.${RESET}"
-        exit 1
-    fi
-}
-
-function program_avrdude {
-    if [[ $AUTODETECT_DEVICE == "y" ]]; then
-        note "Autodetect enabled..."
-        detect_device
-    elif [[ -z $DEVICE_PATH ]] && [[ -z $autodetect_device ]]; then
-        question "Would you like to attempt auto detecting your device? ${WHITE}[y/n]${RESET}" "autodetect_device"
-        autodetect_device="${autodetect_device:-y}"
-        if [[ $autodetect_device == "n" ]]; then
-            question "Please enter the path to your device ${WHITE}(ex. /dev/ttyACM0)${RESET}" "DEVICE_PATH"        
-        elif [[ $autodetect_device == "y" ]]; then
-            detect_device 
-        else
-            note "Invalid input, defaulting to autodetection"
-            detect_device
-        fi
-    fi
-    
-    note "Attempting to flash ${WHITE}${PROGRAM}.hex${RESET} to ${WHITE}${DEVICE_PATH}${RESET} now"
-    ${SUDO} avrdude -q -p "${MCU}" -P "${DEVICE_PATH}" -c avr109 -U flash:w:"${HEXFILE}"
-}
-
-function boxed_msg() {
-    msg=$1
-    len=$2
-    [[ $len == short ]] && div="\n===============\n" || div="\n=================================\n"
-    echo -e "${div}${GREEN}${msg}${RESET}${div}"
-}
-
-function question() {
-    echo -e "\n${YELLOW}${1}: ${RESET}"
-    read -r "$2"
-}
-
-function logmsg {
-    msg=$1
-    echo -e "${LBLUE}${msg}${RESET}"
-}
-
-function note() {
-    msg=$1
-    div='** '
-    echo -e "${YELLOW}${div}${msg}${RESET}"
-}
-
-function board_prompt() {
-    BOARD=$(cat ../Scripts/Boards.txt | $FZF --height=15% --prompt="Choose your Board: ")
-    case $BOARD in
-        "ArduinoUnoR3")
-            MCU=atmega16u2
-            ;;
-        "ArduinoLeonardo")
-            MCU=atmega32u4
-            ;;
-        "ProMicro") 
-            MCU=atmega32u4
-            ;;
-        "Teensy2") 
-            MCU=atmega32u4
-            ;;
-        "TeensyPP2")
-            MCU=at90usb1286
-            ;;
-        *)
-            note "Invalid Board"
-            exit 1
-    esac
-}
-
-function prog_prompt() {
-    PROGRAM=$(ls -1 *.c 2> /dev/null | sed 's/\.c//g' | $FZF --height=15% --prompt="Program to Flash: " )
-    HEXFILE="${PROGRAM}.hex"
-}
-
-## Color Helpers
-RED=$'\e[1;31m'
-YELLOW=$'\e[1;33m'
-GREEN=$'\e[1;32m'
-LBLUE=$'\e[1;34m'
-WHITE=$'\e[1;37m'
-RESET=$'\e[0m'
-
-# LEZZGOOO!
-run
-
diff --git a/NativePrograms/PokemonBDSP/EggFetcher.c b/NativePrograms/PokemonBDSP/EggFetcher.c
deleted file mode 100644
index 0ac49f5401..0000000000
--- a/NativePrograms/PokemonBDSP/EggFetcher.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/*  Pokemon BDSP Arduino Programs
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- */
-
-#include "Programs/EggFetcher.h"
-
-
-//  Bike shortcut direction.
-const ShortcutDirection BIKE_SHORTCUT_DIRECTION = SHORTCUT_UP;
-
-
-
-//  Fetch this many times. This puts a limit on how many eggs you can get so
-//  you don't make a mess of your boxes for fetching too many.
-const uint16_t MAX_FETCH_ATTEMPTS = 2000;
-
-
-//  Fetch an egg after traveling for this long.
-const uint16_t TRAVEL_TIME_PER_FETCH    =   15 * TICKS_PER_SECOND;
-
-
-
diff --git a/NativePrograms/PokemonBDSP/EggHatcher.c b/NativePrograms/PokemonBDSP/EggHatcher.c
deleted file mode 100644
index daa4147c8b..0000000000
--- a/NativePrograms/PokemonBDSP/EggHatcher.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/*  Pokemon BDSP Arduino Programs
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- */
-
-#include "Programs/EggHatcher.h"
-
-
-const uint8_t   BOXES_TO_HATCH  =   3;
-const uint16_t  STEPS_TO_HATCH  =   5120;   //  Lookup the # of steps on Serebii.
-
-//  After hatching a box, save the game and reset. This will recover from game crashes.
-const bool SAVE_AND_RESET       =   true;
-
-
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-//  Advanced Settings (you shouldn't need to change these)
-
-//  Additional time added to the spinning. If any shinies are hatched, they will
-//  eat into this safety buffer along with any other unexpected slowdowns.
-//  Hatching a shiny takes 2 seconds longer than a non-shiny.
-//
-//  If you see that the program is going into Y-COMM or there is less than 5
-//  seconds of extra spinning after the last egg in the batch, please report
-//  this as a bug. As a temporary work-around, you can increase this number.
-const uint16_t SAFETY_TIME  =   10 * TICKS_PER_SECOND;
-
-//  Total animation time for hatching 5 eggs when there are no shinies.
-const uint16_t HATCH_DELAY  =   105 * TICKS_PER_SECOND;
-
-
-
diff --git a/NativePrograms/PokemonBDSP/Libraries/PokemonBDSP_Settings.h b/NativePrograms/PokemonBDSP/Libraries/PokemonBDSP_Settings.h
deleted file mode 100644
index f487e3c714..0000000000
--- a/NativePrograms/PokemonBDSP/Libraries/PokemonBDSP_Settings.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*  PokemonBDSP Settings
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- */
-
-#ifndef PokemonAutomation_PokemonBDSP_Settings_H
-#define PokemonAutomation_PokemonBDSP_Settings_H
-
-#include <stdbool.h>
-#include <stdint.h>
-
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-//  Advanced Options
-
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-//  Menu Navigation Timings
-
-//  Delay to bring up the menu when pressing X in the overworld.
-extern uint16_t PokemonBDSP_OVERWORLD_TO_MENU_DELAY;
-
-//  Delay to go from menu back to overworld.
-extern uint16_t PokemonBDSP_MENU_TO_OVERWORLD_DELAY;
-
-//  Delay from pressing home to entering the the Switch home menu.
-extern uint16_t PokemonBDSP_GAME_TO_HOME_DELAY;
-
-//  Delay to enter game from home menu.
-extern uint16_t PokemonBDSP_HOME_TO_GAME_DELAY;
-
-
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-//  Start Game Timings
-
-//  Delays to start and enter the game when it isn't running.
-extern uint16_t PokemonBDSP_START_GAME_MASH;  //  1. Mash A for this long to start the game.
-extern uint16_t PokemonBDSP_START_GAME_WAIT;  //  2. Wait this long for the game to load.
-extern uint16_t PokemonBDSP_ENTER_GAME_MASH;  //  3. Mash A for this long to enter the game.
-extern uint16_t PokemonBDSP_ENTER_GAME_WAIT;  //  4. Wait this long for the game to fully load into the overworld.
-
-
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-//  Box Timings (for egg programs)
-
-extern uint16_t PokemonBDSP_BOX_SCROLL_DELAY;         //  Delay to move the cursor.
-extern uint16_t PokemonBDSP_BOX_CHANGE_DELAY;         //  Delay to change boxes.
-extern uint16_t PokemonBDSP_BOX_PICKUP_DROP_DELAY;    //  Delay to pickup/drop pokemon.
-
-extern uint16_t PokemonBDSP_MENU_TO_POKEMON_DELAY;    //  Delay to enter Pokemon menu.
-extern uint16_t PokemonBDSP_POKEMON_TO_BOX_DELAY;     //  Delay to enter box system.
-extern uint16_t PokemonBDSP_BOX_TO_POKEMON_DELAY;     //  Delay to exit box system.
-extern uint16_t PokemonBDSP_POKEMON_TO_MENU_DELAY;    //  Delay to return to menu.
-
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-#endif
diff --git a/NativePrograms/PokemonBDSP/MassRelease.c b/NativePrograms/PokemonBDSP/MassRelease.c
deleted file mode 100644
index c2d4f9e271..0000000000
--- a/NativePrograms/PokemonBDSP/MassRelease.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/*  Pokemon BDSP: Mass Release
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- *      Please refer to the user manual for instructions and documentation.
- * 
- */
-
-#include "Programs/MassRelease.h"
-
-
-
-//  # of boxes to release.
-const uint8_t BOXES_TO_RELEASE  =   2;
-
-
-//  Set this to true if the system update window is up and you don't want to
-//  update yet.
-const bool DODGE_SYSTEM_UPDATE_WINDOW   =   false;
-
diff --git a/NativePrograms/PokemonBDSP/PokemonBDSP_Settings.c b/NativePrograms/PokemonBDSP/PokemonBDSP_Settings.c
deleted file mode 100644
index a667bc4a91..0000000000
--- a/NativePrograms/PokemonBDSP/PokemonBDSP_Settings.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/*  Settings
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- * 
- *  These are global setting shared by all programs.
- * 
- *  You shouldn't need to change any of the timing settings unless you are
- *  encountering problems.
- * 
- */
-
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-#include "Libraries/PokemonBDSP_Settings.h"
-
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-//  Advanced Options
-//
-//  You really shouldn't need to touch anything from here on down unless you are
-//  encountering problems and are trying to debug it yourself.
-//
-
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-//  Menu Navigation Timings
-
-//  Delay to bring up the menu when pressing X in the overworld.
-uint16_t PokemonBDSP_OVERWORLD_TO_MENU_DELAY            =   250;
-
-//  Delay to go from menu back to overworld.
-uint16_t PokemonBDSP_MENU_TO_OVERWORLD_DELAY            =   250;
-
-//  Delay from pressing home to entering the the Switch home menu.
-uint16_t PokemonBDSP_GAME_TO_HOME_DELAY                 =   125;
-
-//  Delay to enter game from home menu.
-uint16_t PokemonBDSP_HOME_TO_GAME_DELAY                 =   3 * TICKS_PER_SECOND;
-
-
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-//  Start Game Timings
-
-//  Delays to start and enter the game when it isn't running.
-uint16_t PokemonBDSP_START_GAME_MASH                    =   2 * TICKS_PER_SECOND;   //  1. Mash A for this long to start the game.
-uint16_t PokemonBDSP_START_GAME_WAIT                    =   40 * TICKS_PER_SECOND;  //  2. Wait this long for the game to load.
-uint16_t PokemonBDSP_ENTER_GAME_MASH                    =   5 * TICKS_PER_SECOND;   //  3. Mash A for this long to enter the game.
-uint16_t PokemonBDSP_ENTER_GAME_WAIT                    =   30 * TICKS_PER_SECOND;  //  4. Wait this long for the game to enter the overworld.
-
-
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-//  Box Timings (for egg programs)
-
-uint16_t PokemonBDSP_BOX_SCROLL_DELAY           =    30;     //  Delay to move the cursor.
-uint16_t PokemonBDSP_BOX_CHANGE_DELAY           =    200;    //  Delay to change boxes.
-uint16_t PokemonBDSP_BOX_PICKUP_DROP_DELAY      =    50;     //  Delay to pickup/drop pokemon.
-
-uint16_t PokemonBDSP_MENU_TO_POKEMON_DELAY      =    300;    //  Delay to enter Pokemon menu.
-uint16_t PokemonBDSP_POKEMON_TO_BOX_DELAY       =    300;    //  Delay to enter box system.
-uint16_t PokemonBDSP_BOX_TO_POKEMON_DELAY       =    250;    //  Delay to exit box system.
-uint16_t PokemonBDSP_POKEMON_TO_MENU_DELAY      =    250;    //  Delay to return to menu.
-
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
diff --git a/NativePrograms/PokemonBDSP/ProgramList.txt b/NativePrograms/PokemonBDSP/ProgramList.txt
deleted file mode 100644
index 35c1c203b2..0000000000
--- a/NativePrograms/PokemonBDSP/ProgramList.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-
----- General ----
-MassRelease
-
----- Eggs ----
-EggFetcher
-EggHatcher
diff --git a/NativePrograms/PokemonBDSP/Programs/EggFetcher.h b/NativePrograms/PokemonBDSP/Programs/EggFetcher.h
deleted file mode 100644
index b1a7f4bd7a..0000000000
--- a/NativePrograms/PokemonBDSP/Programs/EggFetcher.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*  Pokemon BDSP Arduino Programs
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- */
-
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-
-
-//  Bike shortcut direction.
-typedef enum{
-    SHORTCUT_UP,
-    SHORTCUT_RIGHT,
-    SHORTCUT_DOWN,
-    SHORTCUT_LEFT,
-} ShortcutDirection;
-extern const ShortcutDirection BIKE_SHORTCUT_DIRECTION;
-
-
-
-//  Fetch this many times. This puts a limit on how many eggs you can get so
-//  you don't make a mess of your boxes for fetching too many.
-extern const uint16_t MAX_FETCH_ATTEMPTS;
-
-
-//  Fetch an egg after traveling for this long.
-extern const uint16_t TRAVEL_TIME_PER_FETCH;
-
-
-
diff --git a/NativePrograms/PokemonBDSP/Programs/EggHatcher.h b/NativePrograms/PokemonBDSP/Programs/EggHatcher.h
deleted file mode 100644
index 336548049b..0000000000
--- a/NativePrograms/PokemonBDSP/Programs/EggHatcher.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*  Pokemon BDSP Arduino Programs
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- */
-
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-
-
-extern const uint8_t   BOXES_TO_HATCH;
-extern const uint16_t  STEPS_TO_HATCH;      //  Lookup the # of steps on Serebii.
-
-//  After hatching a box, save the game and reset. This will recover from game crashes.
-extern const bool       SAVE_AND_RESET;
-
-
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-//  Advanced Settings (you shouldn't need to change these)
-
-//  Additional time added to the spinning. If any shinies are hatched, they will
-//  eat into this safety buffer along with any other unexpected slowdowns.
-//  Hatching a shiny takes 2 seconds longer than a non-shiny.
-//
-//  If you see that the program is going into Y-COMM or there is less than 5
-//  seconds of extra spinning after the last egg in the batch, please report
-//  this as a bug. As a temporary work-around, you can increase this number.
-extern const uint16_t SAFETY_TIME;
-
-//  Total animation time for hatching 5 eggs when there are no shinies.
-extern const uint16_t HATCH_DELAY;
-
-
-
diff --git a/NativePrograms/PokemonBDSP/Programs/MassRelease.h b/NativePrograms/PokemonBDSP/Programs/MassRelease.h
deleted file mode 100644
index f6071491d6..0000000000
--- a/NativePrograms/PokemonBDSP/Programs/MassRelease.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*  Pokemon BDSP Arduino Programs
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- */
-
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-
-
-//  # of boxes to release.
-extern const uint8_t BOXES_TO_RELEASE;
-
-//  Dodge the system update window.
-extern const bool DODGE_SYSTEM_UPDATE_WINDOW;
-
-
diff --git a/NativePrograms/PokemonBDSP/README.md b/NativePrograms/PokemonBDSP/README.md
deleted file mode 100644
index 9a43c90cc7..0000000000
--- a/NativePrograms/PokemonBDSP/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# NativePrograms
-
-Source code for the Arduino-side programs.
diff --git a/NativePrograms/PokemonBDSP/README_Mac_Linux.md b/NativePrograms/PokemonBDSP/README_Mac_Linux.md
deleted file mode 100644
index 023f271982..0000000000
--- a/NativePrograms/PokemonBDSP/README_Mac_Linux.md
+++ /dev/null
@@ -1,34 +0,0 @@
-# Requirements
-
-## Mac OS (Homebrew Required)
-
-Run the commands below to install the packages needed to build and flash your device
-
-```shell
-# Uninstall existing packages to ensure avr-gcc is properly installed
-brew uninstall avr-gcc avrdude
-
-# Now install requirements
-brew tap osx-cross/avr
-brew install avr-gcc --build-from-source avr-gcc
-brew install avrdude make
-```
-
-## Linux
-
-First, install your distros "Development Tools" group of packages. This will include basic tools such as gcc and make.
-
-For Fedora, the command is shown below:
-
-```shell
-dnf groupinstall 'Development Tools'
-```
-
-install the packages listed below. Note that the package names will likely differ between distros.
-
-```shell
-avr-libc
-avr-binutils 
-gcc-avr32-linux-gnu
-gcc-c++-avr32-linux-gn
-```
\ No newline at end of file
diff --git a/NativePrograms/PokemonBDSP/makefile b/NativePrograms/PokemonBDSP/makefile
deleted file mode 100644
index 9b6186003c..0000000000
--- a/NativePrograms/PokemonBDSP/makefile
+++ /dev/null
@@ -1,133 +0,0 @@
-#
-#             LUFA Library
-#     Copyright (C) Dean Camera, 2014.
-#
-#  dean [at] fourwalledcubicle [dot] com
-#           www.lufa-lib.org
-# 
-#  Modified by https://github.com/PokemonAutomation/Arduino-Source
-#
-# --------------------------------------
-#         LUFA Project Makefile.
-# --------------------------------------
-
-#   MCU Types:
-#     atmega16u2    for Arduino UNO R3
-#     atmega32u4    for Arduino Micro, and Teensy 2.0
-#     at90usb1286   for Teensy 2.0++
-
-#   Set MCU and TARGET here:
-
-ifeq ($(BOARD_TYPE),)
-BOARD_TYPE := Teensy2
-endif
-ifeq ($(TARGET),)
-TARGET := TurboA
-#TARGET := Sandbox
-endif
-
-
-################################################################################
-#   Ignore all this stuff below.
-
-PATH_PUBLIC = ../../
-PATH_INTERNAL = ../../../Internal
-
-CATEGORY = PokemonBDSP
-
-#MCU          = atmega16u2
-ARCH         = AVR8
-F_CPU        = 16000000
-F_USB        = $(F_CPU)
-OPTIMIZATION = s
-#TARGET       = TurboA
-SRC          = $(TARGET).c
-LUFA_PATH    = $(PATH_PUBLIC)/NativePrograms/LUFA
-CC_FLAGS     = -DUSE_LUFA_CONFIG_HEADER -I$(PATH_PUBLIC) -I$(PATH_PUBLIC)/NativePrograms/LUFA/ -Wno-unused-function -Werror
-
-
-
-
-#   Board
-ifeq ($(BOARD_TYPE), ArduinoUnoR3)
-MCU := atmega16u2
-SRC += $(PATH_PUBLIC)/NativePrograms/DeviceFramework/Board-atmega16u2-ArduinoUnoR3.c
-endif
-ifeq ($(BOARD_TYPE), ArduinoLeonardo)
-MCU := atmega32u4
-SRC += $(PATH_PUBLIC)/NativePrograms/DeviceFramework/Board-atmega32u4-ArduinoLeonardo.c
-endif
-ifeq ($(BOARD_TYPE), ProMicro)
-MCU := atmega32u4
-SRC += $(PATH_PUBLIC)/NativePrograms/DeviceFramework/Board-atmega32u4-ProMicro.c
-endif
-ifeq ($(BOARD_TYPE), Teensy2)
-MCU := atmega32u4
-SRC += $(PATH_PUBLIC)/NativePrograms/DeviceFramework/Board-atmega32u4-Teensy2.c
-endif
-ifeq ($(BOARD_TYPE), TeensyPP2)
-MCU := at90usb1286
-SRC += $(PATH_PUBLIC)/NativePrograms/DeviceFramework/Board-at90usb1286-Teensy2.c
-endif
-
-#   Framework
-SRC += $(LUFA_SRC_USB)
-SRC += $(PATH_PUBLIC)/NativePrograms/DeviceFramework/Framework/DeviceSettings.c
-SRC += $(PATH_PUBLIC)/NativePrograms/NintendoSwitch/FrameworkSettings.c
-ifneq ("$(wildcard $(PATH_INTERNAL)/NativePrograms/NintendoSwitch/Framework/NintendoSwitch_PushButtons.c)","")
-CC_FLAGS += -I$(PATH_INTERNAL)
-SRC += $(PATH_PUBLIC)/Common/CRC32.c
-SRC += $(PATH_INTERNAL)/NativePrograms/NintendoSwitch/Framework/uart.c
-SRC += $(PATH_INTERNAL)/NativePrograms/NintendoSwitch/Framework/HardwareUSB.c
-ifeq ($(TARGET), PABotBase)
-SRC += $(PATH_INTERNAL)/NativePrograms/NintendoSwitch/Framework/CommandQueue.c
-else
-SRC += $(PATH_INTERNAL)/NativePrograms/NintendoSwitch/Framework/CommandQueueNull.c
-endif
-SRC += $(PATH_INTERNAL)/NativePrograms/NintendoSwitch/Framework/HardwareSerial.c
-SRC += $(PATH_INTERNAL)/NativePrograms/NintendoSwitch/Framework/Controller.c
-SRC += $(PATH_INTERNAL)/NativePrograms/NintendoSwitch/Framework/NintendoSwitch_PushButtons.c
-SRC += $(PATH_INTERNAL)/NativePrograms/NintendoSwitch/Framework/NintendoSwitch_ScalarButtons.c
-else
-LD_FLAGS += obj/obj-$(MCU)/CRC32.o
-LD_FLAGS += obj/obj-$(MCU)/uart.o
-LD_FLAGS += obj/obj-$(MCU)/HardwareUSB.o
-ifeq ($(TARGET), PABotBase)
-LD_FLAGS += obj/obj-$(MCU)/CommandQueue.o
-else
-LD_FLAGS += obj/obj-$(MCU)/CommandQueueNull.o
-endif
-LD_FLAGS += obj/obj-$(MCU)/HardwareSerial.o
-LD_FLAGS += obj/obj-$(MCU)/Controller.o
-LD_FLAGS += obj/obj-$(MCU)/NintendoSwitch_PushButtons.o
-LD_FLAGS += obj/obj-$(MCU)/NintendoSwitch_ScalarButtons.o
-endif
-
-#   Program
-SRC += $(PATH_PUBLIC)/NativePrograms/PokemonBDSP/PokemonBDSP_Settings.c
-#SRC += $(PATH_PUBLIC)/NativePrograms/$(CATEGORY)/Programs/PokemonCallbacks.c
-ifneq ("$(wildcard $(PATH_INTERNAL)/NativePrograms/$(CATEGORY)/$(TARGET)_Core.c)","")
-SRC += $(PATH_INTERNAL)/NativePrograms/$(CATEGORY)/$(TARGET)_Core.c
-else ifneq ("$(wildcard Programs/$(TARGET)_Core.c)","")
-SRC += Programs/$(TARGET)_Core.c
-else ifneq ("$(wildcard obj/obj-$(MCU)/$(TARGET)_Core.o)","")
-LD_FLAGS += obj/obj-$(MCU)/$(TARGET)_Core.o
-endif
-
-#   Must go at the end or it blows up memory if floating-point is used.
-LD_FLAGS += -lm
-
-
-# Default target
-all:
-
-# Include LUFA build script makefiles
-include $(LUFA_PATH)/Build/lufa_core.mk
-include $(LUFA_PATH)/Build/lufa_sources.mk
-include $(LUFA_PATH)/Build/lufa_build.mk
-include $(LUFA_PATH)/Build/lufa_cppcheck.mk
-include $(LUFA_PATH)/Build/lufa_doxygen.mk
-include $(LUFA_PATH)/Build/lufa_dfu.mk
-include $(LUFA_PATH)/Build/lufa_hid.mk
-include $(LUFA_PATH)/Build/lufa_avrdude.mk
-include $(LUFA_PATH)/Build/lufa_atprogram.mk
diff --git a/NativePrograms/PokemonSV/!BuildAll-ArduinoLeonardo.cmd b/NativePrograms/PokemonSV/!BuildAll-ArduinoLeonardo.cmd
deleted file mode 100644
index 488519e9ec..0000000000
--- a/NativePrograms/PokemonSV/!BuildAll-ArduinoLeonardo.cmd
+++ /dev/null
@@ -1,15 +0,0 @@
-@echo off
-
-cd /D "%~dp0"
-
-if not exist Programs\ (
-    echo.
-    echo Please unzip the folder before you can use it.
-    echo.
-    pause
-    exit
-)
-
-@call ../Scripts/BuildAll.cmd ArduinoLeonardo
-
-
diff --git a/NativePrograms/PokemonSV/!BuildAll-ArduinoUnoR3.cmd b/NativePrograms/PokemonSV/!BuildAll-ArduinoUnoR3.cmd
deleted file mode 100644
index 7fc90f1c06..0000000000
--- a/NativePrograms/PokemonSV/!BuildAll-ArduinoUnoR3.cmd
+++ /dev/null
@@ -1,15 +0,0 @@
-@echo off
-
-cd /D "%~dp0"
-
-if not exist Programs\ (
-    echo.
-    echo Please unzip the folder before you can use it.
-    echo.
-    pause
-    exit
-)
-
-@call ../Scripts/BuildAll.cmd ArduinoUnoR3
-
-
diff --git a/NativePrograms/PokemonSV/!BuildAll-ProMicro.cmd b/NativePrograms/PokemonSV/!BuildAll-ProMicro.cmd
deleted file mode 100644
index b1ece4743b..0000000000
--- a/NativePrograms/PokemonSV/!BuildAll-ProMicro.cmd
+++ /dev/null
@@ -1,15 +0,0 @@
-@echo off
-
-cd /D "%~dp0"
-
-if not exist Programs\ (
-    echo.
-    echo Please unzip the folder before you can use it.
-    echo.
-    pause
-    exit
-)
-
-@call ../Scripts/BuildAll.cmd ProMicro
-
-
diff --git a/NativePrograms/PokemonSV/!BuildAll-Teensy++2.0.cmd b/NativePrograms/PokemonSV/!BuildAll-Teensy++2.0.cmd
deleted file mode 100644
index e30eb5dfe0..0000000000
--- a/NativePrograms/PokemonSV/!BuildAll-Teensy++2.0.cmd
+++ /dev/null
@@ -1,15 +0,0 @@
-@echo off
-
-cd /D "%~dp0"
-
-if not exist Programs\ (
-    echo.
-    echo Please unzip the folder before you can use it.
-    echo.
-    pause
-    exit
-)
-
-@call ../Scripts/BuildAll.cmd TeensyPP2
-
-
diff --git a/NativePrograms/PokemonSV/!BuildAll-Teensy2.0.cmd b/NativePrograms/PokemonSV/!BuildAll-Teensy2.0.cmd
deleted file mode 100644
index 84f90a817e..0000000000
--- a/NativePrograms/PokemonSV/!BuildAll-Teensy2.0.cmd
+++ /dev/null
@@ -1,15 +0,0 @@
-@echo off
-
-cd /D "%~dp0"
-
-if not exist Programs\ (
-    echo.
-    echo Please unzip the folder before you can use it.
-    echo.
-    pause
-    exit
-)
-
-@call ../Scripts/BuildAll.cmd Teensy2
-
-
diff --git a/NativePrograms/PokemonSV/!Cleanup.cmd b/NativePrograms/PokemonSV/!Cleanup.cmd
deleted file mode 100644
index 7832b61049..0000000000
--- a/NativePrograms/PokemonSV/!Cleanup.cmd
+++ /dev/null
@@ -1,21 +0,0 @@
-::  Clean the build. Delete all build artifacts.
-
-cd %~dp0
-
-del *.log
-del *.d
-del *.elf
-del *.hex
-del *.map
-del *.o
-del *.eep
-del *.bin
-del *.lss
-del *.sym
-del *.tmp
-
-del obj\*.d
-del obj\*.o
-del obj\build-*
-
-::pause
diff --git a/NativePrograms/PokemonSV/00-BuildAllUnix.sh b/NativePrograms/PokemonSV/00-BuildAllUnix.sh
deleted file mode 100644
index a543c0de94..0000000000
--- a/NativePrograms/PokemonSV/00-BuildAllUnix.sh
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/usr/bin/env bash
-
-# change directory to library location
-cd "$(dirname "$0")"
-
-# define the MCU, which is the board type
-
-if [[ "$OSTYPE" == "darwin"* ]]; then
-    PLATFORM="mac"
-    FZF=$(which fzf)
-
-    if [[ "$FZF" == "" ]]; then
-        boxed_msg "${RED}ERROR: FZF is not detected on your system. Please install it through Homebrew ${RESET}"
-        exit 1
-    fi
-
-elif [[ "$OSTYPE" == "linux-gnu"* ]]; then
-    PLATFORM="linux"
-    FZF="../Scripts/fzf-${PLATFORM}"
-else
-    boxed_msg "${RED}${OSTYPE} is not a recognized platform. Please run only on Mac or Linux${RESET}"
-    exit 1
-fi
-
-BOARD=$1
-
-function run() {
-    if [[ -z "$BOARD" ]]; then
-        board_prompt
-    fi
-
-    # if the boards were given by integer, we can update them here
-
-
-    # say what we're building for convenience
-    echo "Ready to build for board: $BOARD"
-    echo ""
-
-    # and send off to build
-    bash ../Scripts/BuildAllUnix.sh "$BOARD" #1> /dev/null
-
-    # let them know we finished
-    echo -e "\033[1mFinished building hex files for board: $BOARD \033[0m"
-    echo "Please make sure the hex files were properly built or updated."
-    echo "You can now close this window if you wish."
-    echo ""
-    # really done
-}
-
-function board_prompt() {
-    BOARD=$(cat ../Scripts/Boards.txt | $FZF --height=15% --prompt="Choose your Board: ")
-}
-
-run
diff --git a/NativePrograms/PokemonSV/00-CleanupUnix.sh b/NativePrograms/PokemonSV/00-CleanupUnix.sh
deleted file mode 100644
index 3e3789e7cc..0000000000
--- a/NativePrograms/PokemonSV/00-CleanupUnix.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/usr/bin/env bash
-# this script removes all compiled pieces to create a fresh directory
-
-# change directory to library location
-cd "$(dirname "$0")"
-
-# NOTE: /dev/null forwarding is to ensure that nothing is printed if the files were already deleted
-rm *.log > /dev/null 2>&1
-rm *.d > /dev/null 2>&1
-rm *.elf > /dev/null 2>&1
-rm *.hex > /dev/null 2>&1
-rm *.map > /dev/null 2>&1
-rm *.o > /dev/null 2>&1
-rm *.eep > /dev/null 2>&1
-rm *.bin > /dev/null 2>&1
-rm *.lss > /dev/null 2>&1
-rm *.sym > /dev/null 2>&1
-rm *.tmp > /dev/null 2>&1
-
-# compiled pieces within Libraries, Programs, and obj
-rm Libraries/*.d > /dev/null 2>&1
-rm Libraries/*.o > /dev/null 2>&1
-
-rm Programs/*.d > /dev/null 2>&1
-rm Programs/*.o > /dev/null 2>&1
-
-rm obj/*.d > /dev/null 2>&1
-rm obj/*.o > /dev/null 2>&1
-
-echo "Finished cleaning build files."
diff --git a/NativePrograms/PokemonSV/00-FlashUnix.sh b/NativePrograms/PokemonSV/00-FlashUnix.sh
deleted file mode 100644
index a7c2f8ea87..0000000000
--- a/NativePrograms/PokemonSV/00-FlashUnix.sh
+++ /dev/null
@@ -1,222 +0,0 @@
-#!/usr/bin/env bash
-
-# change directory to library location
-cd "$(dirname "$0")" || exit
-
-# Parse Command line arguments for MCU, Program and Device Path
-BOARD=$1
-PROGRAM=$2
-DEVICE_PATH=$3
-
-
-if [[ "$OSTYPE" == "darwin"* ]]; then
-    PLATFORM="mac"
-    FZF=$(which fzf)
-
-    if [[ "$FZF" == "" ]]; then
-        boxed_msg "${RED}ERROR: FZF is not detected on your system. Please install it through Homebrew ${RESET}"
-        exit 1
-    fi
-
-elif [[ "$OSTYPE" == "linux-gnu"* ]]; then
-    PLATFORM="linux"
-    FZF="../Scripts/fzf-${PLATFORM}"
-else
-    boxed_msg "${RED}${OSTYPE} is not a recognized platform. Please run only on Mac or Linux${RESET}"
-    exit 1
-fi
-
-SUDO=""
-BUILD_HEX=""
-HEXFILE=""
-PROGRAM_COMMAND="program_avrdude ${MCU} ${HEXFILE}" # Default to using avrdude
-BOARDS=(ArduinoUnoR3 ProMicro Teensy2 TeensyPP2)
-
-function run() {
-
-    configure
-
-    if [[ $BUILD_HEX == "y" ]]; then
-        build_hex
-    fi
-
-    boxed_msg "Flashing ${PROGRAM}.hex ..."
-    $PROGRAM_COMMAND
-
-    boxed_msg "Finished flashing ${HEXFILE} to ${BOARD}!"
-}
-
-function configure() {
-    boxed_msg "Configuration"
-
-    [[ -f "${HOME}/.paconfig" ]] && source "${HOME}/.paconfig"
-    [[ "$EUID" -ne 0 ]] && SUDO="sudo"
-    [[ -z "${BOARD}" ]] && board_prompt || note "Using Preconfigured BOARD [${BOARD}]"
-    [[ -z "${PROGRAM}" ]] && prog_prompt
-    
-    if [[ ! -f ${HEXFILE} ]]; then
-        question "Build ${PROGRAM}? ${WHITE}[Y/n]${RESET}" "DOBUILD"
-        DOBUILD="${DOBUILD:-y}"
-        if [ "$DOBUILD" == "y" ]; then
-            BUILD_HEX="y"
-        else
-            logmsg "Nothing to flash, exiting.."
-            exit
-        fi
-    fi
-
-    # Logic below to determine if we need to us dfu-programmer or not
-    if [[ $PLATFORM == "mac" ]] && [[ ${MCU} == "atmega16u2" ]]; then
-        which dfu-programmer >/dev/null 2>&1
-        if [[ $? -eq 0 ]]; then
-            question "Mac platform detected, UNO R3 configured. Connect your device and enter DFU mode, then press any key..." "use_dfu"
-            PROGRAM_COMMAND="program_dfu ${MCU} ${HEXFILE}"
-        else
-            logmsg "dfu-programmer not installed, run \"brew install dfu-programmer\" then rerun this script"
-	    exit 1
-        fi
-    fi
-}
-
-function build_hex {
-        boxed_msg "Build ${PROGRAM}.c"
-
-        note "Cleaning Build Environment"
-        ./00-CleanupUnix.sh >/dev/null
-
-
-        note "Running Build Script"
-        sh ../Scripts/BuildOneUnix.sh "${BOARD}" "${PROGRAM}" > /dev/null 2>&1
-
-        retVal=$?
-        if [ $retVal -ne 0 ]; then
-            boxed_msg "${RED}ERROR - CRITICAL: An error occured while building.\nPlease check logs and perhaps run the cleanup script before trying again.${RESET}"
-            exit 1
-        else 
-            note "${PROGRAM}.hex successfully built!"
-        fi
-    
-}
-
-function detect_device() {
-    local -r delay='0.75'
-    local spinstr='\|/-'
-    local temp
-    while true; do
-        temp="${spinstr#?}"
-        printf "${YELLOW}Waiting for device... [%c]  ${RESET}" "${spinstr}"
-        spinstr=${temp}${spinstr%"${temp}"}
-        # shellcheck disable=SC2010
-        found_device_path="$(ls /dev/tty* | grep -i 'acm\|usb')"
-        if [[ -n "$found_device_path" ]]; then
-            DEVICE_PATH="${found_device_path}"
-            break
-        fi
-        sleep "${delay}"
-        printf "%0.s\b" {1..28}
-    done
-    printf "    \b\b\b\b\n"
-    boxed_msg "Device connected at [${found_device_path}]" "short"
-}
-
-function program_dfu {
-    # start with clearing the BOARD
-    ${SUDO} dfu-programmer "${MCU}" erase || true
-    # then flash the hex to the BOARD
-    ${SUDO} dfu-programmer "${MCU}" flash "${HEXFILE}"
-    if [[ $? -ne 0 ]]; then
-        boxed_msg "${RED}Flash Error: Check the output above for more info.${RESET}"
-        exit 1
-    fi
-    # then reset the BOARD
-    ${SUDO} dfu-programmer "${MCU}" reset
-    if [[ $? -ne 0 ]]; then
-        boxed_msg "${RED}Device Reset Error: Check the output above for more info.${RESET}"
-        exit 1
-    fi
-}
-
-function program_avrdude {
-    if [[ $AUTODETECT_DEVICE == "y" ]]; then
-        note "Autodetect enabled..."
-        detect_device
-    elif [[ -z $DEVICE_PATH ]] && [[ -z $autodetect_device ]]; then
-        question "Would you like to attempt auto detecting your device? ${WHITE}[y/n]${RESET}" "autodetect_device"
-        autodetect_device="${autodetect_device:-y}"
-        if [[ $autodetect_device == "n" ]]; then
-            question "Please enter the path to your device ${WHITE}(ex. /dev/ttyACM0)${RESET}" "DEVICE_PATH"        
-        elif [[ $autodetect_device == "y" ]]; then
-            detect_device 
-        else
-            note "Invalid input, defaulting to autodetection"
-            detect_device
-        fi
-    fi
-    
-    note "Attempting to flash ${WHITE}${PROGRAM}.hex${RESET} to ${WHITE}${DEVICE_PATH}${RESET} now"
-    ${SUDO} avrdude -q -p "${MCU}" -P "${DEVICE_PATH}" -c avr109 -U flash:w:"${HEXFILE}"
-}
-
-function boxed_msg() {
-    msg=$1
-    len=$2
-    [[ $len == short ]] && div="\n===============\n" || div="\n=================================\n"
-    echo -e "${div}${GREEN}${msg}${RESET}${div}"
-}
-
-function question() {
-    echo -e "\n${YELLOW}${1}: ${RESET}"
-    read -r "$2"
-}
-
-function logmsg {
-    msg=$1
-    echo -e "${LBLUE}${msg}${RESET}"
-}
-
-function note() {
-    msg=$1
-    div='** '
-    echo -e "${YELLOW}${div}${msg}${RESET}"
-}
-
-function board_prompt() {
-    BOARD=$(cat ../Scripts/Boards.txt | $FZF --height=15% --prompt="Choose your Board: ")
-    case $BOARD in
-        "ArduinoUnoR3")
-            MCU=atmega16u2
-            ;;
-        "ArduinoLeonardo")
-            MCU=atmega32u4
-            ;;
-        "ProMicro") 
-            MCU=atmega32u4
-            ;;
-        "Teensy2") 
-            MCU=atmega32u4
-            ;;
-        "TeensyPP2")
-            MCU=at90usb1286
-            ;;
-        *)
-            note "Invalid Board"
-            exit 1
-    esac
-}
-
-function prog_prompt() {
-    PROGRAM=$(ls -1 *.c 2> /dev/null | sed 's/\.c//g' | $FZF --height=15% --prompt="Program to Flash: " )
-    HEXFILE="${PROGRAM}.hex"
-}
-
-## Color Helpers
-RED=$'\e[1;31m'
-YELLOW=$'\e[1;33m'
-GREEN=$'\e[1;32m'
-LBLUE=$'\e[1;34m'
-WHITE=$'\e[1;37m'
-RESET=$'\e[0m'
-
-# LEZZGOOO!
-run
-
diff --git a/NativePrograms/PokemonSV/EggCombined.c b/NativePrograms/PokemonSV/EggCombined.c
deleted file mode 100644
index 04fa025008..0000000000
--- a/NativePrograms/PokemonSV/EggCombined.c
+++ /dev/null
@@ -1,14 +0,0 @@
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-#include "Programs/EggCombined.h"
-
-// USE HM
-const bool USE_HM           =   true;
-
-// MAX SANDWICHES TO MAKE
-const uint16_t MAX_SAND     =   5;
-
-// EGG HATCHING
-const uint8_t BOXES_TO_HATCH    =   2;
-const uint16_t STEPS_TO_HATCH   =   5120;
-const bool HAS_CLONED_RIDER     =   false;
-const float SAFETY_COEFF        =   1.1;
\ No newline at end of file
diff --git a/NativePrograms/PokemonSV/EggFetcher.c b/NativePrograms/PokemonSV/EggFetcher.c
deleted file mode 100644
index eadf3e1941..0000000000
--- a/NativePrograms/PokemonSV/EggFetcher.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-#include "Programs/EggFetcher.h"
-
-// USE HM
-const bool USE_HM           =   true;
-
-// MAX SANDWICHES TO MAKE
-const uint16_t MAX_SAND     =   5;
diff --git a/NativePrograms/PokemonSV/EggHatcher.c b/NativePrograms/PokemonSV/EggHatcher.c
deleted file mode 100644
index 472ec862ce..0000000000
--- a/NativePrograms/PokemonSV/EggHatcher.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-#include "Programs/EggHatcher.h"
-
-const uint8_t BOXES_TO_HATCH    =   2;
-const uint16_t STEPS_TO_HATCH   =   5120;
-const bool HAS_CLONED_RIDER     =   false;
-const float SAFETY_COEFF        =   1.1;
diff --git a/NativePrograms/PokemonSV/ItemDupe.c b/NativePrograms/PokemonSV/ItemDupe.c
deleted file mode 100644
index 268be1f4de..0000000000
--- a/NativePrograms/PokemonSV/ItemDupe.c
+++ /dev/null
@@ -1,2 +0,0 @@
-//  This file is generated by the UI. There's no point in editing.
-#include "../NativePrograms/PokemonSV/Programs/ItemDupe.h"
diff --git a/NativePrograms/PokemonSV/Libraries/PokemonSV_Settings.h b/NativePrograms/PokemonSV/Libraries/PokemonSV_Settings.h
deleted file mode 100644
index 3d9632ed9f..0000000000
--- a/NativePrograms/PokemonSV/Libraries/PokemonSV_Settings.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/*  PokemonSCVI Settings
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- */
-
-#ifndef PokemonAutomation_PokemonSCVI_Settings_H
-#define PokemonAutomation_PokemonSCVI_Settings_H
-
-#include <stdbool.h>
-#include <stdint.h>
-
-#endif
diff --git a/NativePrograms/PokemonSV/MassPurchase.c b/NativePrograms/PokemonSV/MassPurchase.c
deleted file mode 100644
index 1f492dda6c..0000000000
--- a/NativePrograms/PokemonSV/MassPurchase.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-#include "Programs/MassPurchase.h"
-
-// PAY WITH LP
-const bool PAY_LP           =   false;
-
-// ITEMS TO BUY
-const uint16_t ITEMS        =   50;
-
-// QT TO BUY
-const uint16_t QUANTITY     =   0;
diff --git a/NativePrograms/PokemonSV/MassRelease.c b/NativePrograms/PokemonSV/MassRelease.c
deleted file mode 100644
index 822b982012..0000000000
--- a/NativePrograms/PokemonSV/MassRelease.c
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-#include "Programs/MassRelease.h"
-
-const uint16_t RELEASE        =   60;
diff --git a/NativePrograms/PokemonSV/ProgramList.txt b/NativePrograms/PokemonSV/ProgramList.txt
deleted file mode 100644
index eaac9d6184..0000000000
--- a/NativePrograms/PokemonSV/ProgramList.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-
----- General ----
-MassRelease
-MassPurchase
-RoamingGimmighoulFarmer
-
----- Glitches ----
-ItemDupe
-
----- Eggs ----
-EggFetcher
-EggHatcher
-EggCombined
\ No newline at end of file
diff --git a/NativePrograms/PokemonSV/Programs/EggCombined.h b/NativePrograms/PokemonSV/Programs/EggCombined.h
deleted file mode 100644
index ebe347e429..0000000000
--- a/NativePrograms/PokemonSV/Programs/EggCombined.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-
-// USE HM
-extern const bool USE_HM;
-
-// MAX SANDWICHES
-extern const uint16_t MAX_SAND;
-
-extern const uint8_t BOXES_TO_HATCH;
-extern const uint16_t STEPS_TO_HATCH;
-extern const bool HAS_CLONED_RIDER;
-extern const float SAFETY_COEFF;
\ No newline at end of file
diff --git a/NativePrograms/PokemonSV/Programs/EggCombined_Core.c b/NativePrograms/PokemonSV/Programs/EggCombined_Core.c
deleted file mode 100644
index 5158c29932..0000000000
--- a/NativePrograms/PokemonSV/Programs/EggCombined_Core.c
+++ /dev/null
@@ -1,205 +0,0 @@
-#include "Common/PokemonSwSh/PokemonProgramIDs.h"
-#include "NativePrograms/DeviceFramework/DeviceSettings.h"
-#include "NativePrograms/NintendoSwitch/Libraries/FrameworkSettings.h"
-#include "NativePrograms/NintendoSwitch/Libraries/NintendoSwitch_Device.h"
-#include "NativePrograms/NintendoSwitch/Libraries/NintendoSwitch_PushButtons.h"
-#include "EggCombined.h"
-
-void open_picnic(void) {
-    pbf_move_left_joystick(STICK_MIN, STICK_CENTER, 190, 0);
-    pbf_press_button(BUTTON_L, 20, 80);
-    pbf_press_button(BUTTON_X, 20, 200);
-    pbf_press_button(BUTTON_A, 20, 1000);
-};
-
-void move_to_basket(void) {
-    pbf_press_button(BUTTON_L, 20, 100);
-    pbf_move_left_joystick(STICK_MIN, STICK_CENTER, 50, 0);
-    pbf_move_left_joystick(STICK_CENTER, STICK_MIN, 70, 0);
-    pbf_press_button(BUTTON_L, 20, 100);
-    pbf_move_left_joystick(STICK_MAX, STICK_CENTER, 50, 0);
-    pbf_move_left_joystick(STICK_CENTER, STICK_MAX, 100, 50);
-    pbf_press_button(BUTTON_L, 20, 100);
-    pbf_press_button(BUTTON_PLUS, 20, 200);
-};
-
-void fly_to_gate(void) {
-    pbf_press_button(BUTTON_A, 20, 500);
-    pbf_press_button(BUTTON_Y, 20, 800);
-    pbf_move_left_joystick(STICK_MAX, STICK_MAX, 6, 500);
-    pbf_mash_button(BUTTON_A, 1000);
-};
-
-void move_to_location(void) {
-    pbf_move_left_joystick(STICK_MIN, STICK_CENTER, 190, 0);
-    pbf_press_button(BUTTON_L, 20, 0);
-    pbf_move_left_joystick(STICK_CENTER, STICK_MIN, 150, 100);
-    pbf_move_left_joystick(STICK_CENTER, STICK_MAX, 20, 0);
-    pbf_press_button(BUTTON_L, 20, 300);
-};
-
-void open_box(void) {
-    pbf_press_button(BUTTON_A, 20, 500);
-    pbf_press_button(BUTTON_X, 20, 200);
-    pbf_press_button(BUTTON_A, 20, 500);
-};
-
-void get_egg(int boxCol) {
-    pbf_press_dpad(DPAD_RIGHT, 20, 100);
-    pbf_press_button(BUTTON_MINUS, 20, 100);
-    for (int i = 0; i < 40; i++) {
-        pbf_press_dpad(DPAD_DOWN, 5, 0);
-    };
-    pbf_wait(100);
-    pbf_press_button(BUTTON_A, 20, 100);
-    for (int curCol = 0; curCol < boxCol + 1; curCol++) {
-        pbf_press_dpad(DPAD_LEFT, 20, 100);
-    };
-    pbf_press_dpad(DPAD_DOWN, 20, 100);
-    pbf_press_button(BUTTON_A, 20, 100);
-    pbf_press_button(BUTTON_B, 20, 200);
-    pbf_press_button(BUTTON_B, 20, 800);
-};
-
-void deposit_pokemon(int boxCol) {
-    pbf_press_dpad(DPAD_LEFT, 20, 100);
-    pbf_press_dpad(DPAD_DOWN, 20, 100);
-    if (HAS_CLONED_RIDER) {
-        pbf_press_dpad(DPAD_DOWN, 20, 100);
-    };
-    pbf_press_button(BUTTON_MINUS, 20, 100);
-    for (int i = 0; i < 40; i++) {
-        pbf_press_dpad(DPAD_DOWN, 5, 0);
-    };
-    pbf_wait(100);
-    pbf_press_button(BUTTON_A, 20, 100);
-    for (int curCol = 0; curCol < boxCol + 1; curCol++) {
-        pbf_press_dpad(DPAD_RIGHT, 20, 100);
-    };
-    pbf_press_dpad(DPAD_UP, 20, 100);
-    pbf_press_button(BUTTON_A, 20, 100);
-};
-
-void ride_hatch(void) {
-    pbf_press_button(BUTTON_PLUS, 20, 400);
-    // hatch the first egg at full speed, sometimes the speed boost can fail %point for optimizing%
-    pbf_move_left_joystick(STICK_MAX, STICK_CENTER, 50, 0);
-    pbf_press_button(BUTTON_LCLICK, 5, 0);
-    pbf_move_left_joystick(STICK_MAX, STICK_CENTER, STEPS_TO_HATCH * SAFETY_COEFF, 0);
-    // hatch the remaining 4 eggs, not speed boosted to reduce error due to random positioning
-    for (int checkEggLoop = 0; checkEggLoop < 80; checkEggLoop++) {
-        pbf_move_left_joystick(STICK_MAX, STICK_CENTER, 220, 0);
-        pbf_press_button(BUTTON_A, 5, 0);
-    };
-};
-
-void deposit_parent(void) {
-    pbf_press_button(BUTTON_X, 20, 200);
-    pbf_press_dpad(DPAD_UP, 20, 100);
-    pbf_press_button(BUTTON_A, 20, 500);
-    pbf_press_button(BUTTON_L, 20, 200);
-    pbf_press_button(BUTTON_Y, 20, 500);
-    pbf_press_dpad(DPAD_LEFT, 20, 100);
-    pbf_press_button(BUTTON_Y, 20, 500);
-    pbf_press_dpad(DPAD_DOWN, 20, 100);
-    if (HAS_CLONED_RIDER) {
-        pbf_press_dpad(DPAD_DOWN, 20, 100);
-    };
-    pbf_press_button(BUTTON_MINUS, 20, 100);
-    for (int i = 0; i < 40; i++) {
-        pbf_press_dpad(DPAD_DOWN, 5, 0);
-    };
-    pbf_wait(100);
-    pbf_press_button(BUTTON_A, 20, 100);
-    pbf_press_dpad(DPAD_RIGHT, 20, 100);
-    pbf_press_dpad(DPAD_RIGHT, 20, 100);
-    pbf_press_dpad(DPAD_UP, 20, 100);
-    pbf_press_button(BUTTON_A, 20, 100);
-    pbf_press_button(BUTTON_R, 20, 200);
-    pbf_press_button(BUTTON_B, 20, 200);
-    pbf_press_button(BUTTON_B, 20, 800);
-};
-
-int main(void) {
-    start_program_callback();
-    initialize_framework(0);
-
-    // START IN GRIP MENU
-    start_program_flash(CONNECT_CONTROLLER_DELAY);
-    grip_menu_connect_go_home();
-    if (TOLERATE_SYSTEM_UPDATE_MENU_FAST) {
-        pbf_press_button(BUTTON_A, 5, 180);
-        pbf_move_right_joystick(STICK_CENTER, STICK_MIN, 5, 0);
-    };
-    pbf_press_button(BUTTON_A, 5, 500);
-
-    // ########## Egg Fetching ##########
-    open_picnic();
-    move_to_basket();
-
-    for (int curSand = 0; curSand < MAX_SAND; curSand++) {
-        pbf_move_left_joystick(STICK_CENTER, STICK_MIN, 20, 100);
-        // START SANDWICH
-        pbf_press_button(BUTTON_A, 20, 250);
-        pbf_press_button(BUTTON_A, 20, 750);
-        // SELECT RECIPE
-        if (USE_HM) {
-            pbf_press_dpad(DPAD_DOWN, 20, 100);
-        }
-        pbf_press_button(BUTTON_A, 20, 250);
-        // SELECT PICK
-        pbf_press_button(BUTTON_A, 20, 1250);
-        // MAKE SANDWICH
-        pbf_move_left_joystick(STICK_CENTER, STICK_MIN, 250, 100);
-        pbf_move_left_joystick(STICK_CENTER, STICK_MAX, 25, 100);
-        pbf_mash_button(BUTTON_A, 1500);
-        pbf_wait(3000);
-        pbf_press_button(BUTTON_A, 20, 150);
-        // WAIT AT BASKET
-        pbf_move_left_joystick(STICK_CENTER, STICK_MAX, 5, 100);
-        for (int rounds = 0; rounds < 10; rounds++) {
-            pbf_wait(22500);
-            pbf_press_button(BUTTON_A, 20, 100);
-            pbf_mash_button(BUTTON_B, 4000);
-        };
-        pbf_wait(200);
-    };
-
-    // ########## Transition ##########
-    pbf_press_button(BUTTON_Y, 20, 150);
-    pbf_press_button(BUTTON_A, 20, 800);
-
-    deposit_parent();
-    fly_to_gate();
-
-    // ########## Egg Hatching ##########
-    for(int curBox = 0; curBox < BOXES_TO_HATCH; curBox++) {
-        // ########## Intial loop setup ##########
-        open_box();
-        pbf_press_dpad(DPAD_LEFT, 20, 200);
-        if (HAS_CLONED_RIDER) {
-            pbf_press_dpad(DPAD_DOWN, 20, 100);
-        };
-
-        // ########## Main hatching loop ##########
-        for(int boxCol = 0; boxCol < 6; boxCol++) {
-            get_egg(boxCol);
-            move_to_location();
-            ride_hatch();
-            fly_to_gate();
-            open_box();
-            deposit_pokemon(boxCol);
-        };
-
-        // ########## End loop setup ##########
-        pbf_wait(200);
-        pbf_press_button(BUTTON_R, 20, 200);
-        pbf_press_button(BUTTON_B, 20, 200);
-        pbf_press_button(BUTTON_B, 20, 800);
-    };
-    
-    // ########## End idling in home ##########
-    pbf_press_button(BUTTON_HOME, 20, 100);
-    end_program_callback();
-    end_program_loop();
-};
\ No newline at end of file
diff --git a/NativePrograms/PokemonSV/Programs/EggFetcher.h b/NativePrograms/PokemonSV/Programs/EggFetcher.h
deleted file mode 100644
index fc0a28503d..0000000000
--- a/NativePrograms/PokemonSV/Programs/EggFetcher.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-
-// USE HM
-extern const bool USE_HM;
-
-// MAX SANDWICHES
-extern const uint16_t MAX_SAND;
diff --git a/NativePrograms/PokemonSV/Programs/EggFetcher_Core.c b/NativePrograms/PokemonSV/Programs/EggFetcher_Core.c
deleted file mode 100644
index bd622fe5e9..0000000000
--- a/NativePrograms/PokemonSV/Programs/EggFetcher_Core.c
+++ /dev/null
@@ -1,84 +0,0 @@
-// EGG FETCHER SCVI
-
-#include "Common/PokemonSwSh/PokemonProgramIDs.h"
-#include "NativePrograms/DeviceFramework/DeviceSettings.h"
-#include "NativePrograms/NintendoSwitch/Libraries/FrameworkSettings.h"
-#include "NativePrograms/NintendoSwitch/Libraries/NintendoSwitch_Device.h"
-#include "NativePrograms/NintendoSwitch/Libraries/NintendoSwitch_PushButtons.h"
-#include "NativePrograms/PokemonSwSh/Libraries/PokemonSwSh_Settings.h"
-#include "EggFetcher.h"
-
-void fly_to_gate(void) {
-    pbf_press_button(BUTTON_A, 20, 500);
-    pbf_press_button(BUTTON_Y, 20, 800);
-    pbf_move_left_joystick(STICK_MAX, STICK_MAX, 6, 500);
-    pbf_mash_button(BUTTON_A, 1000);
-};
-
-void open_picnic(void) {
-    pbf_move_left_joystick(STICK_MIN, STICK_CENTER, 190, 0);
-    pbf_press_button(BUTTON_L, 20, 100);
-    pbf_press_button(BUTTON_X, 20, 200);
-    pbf_press_button(BUTTON_A, 20, 1000);
-};
-
-void move_to_basket(void) {
-    pbf_press_button(BUTTON_L, 20, 100);
-    pbf_move_left_joystick(STICK_MIN, STICK_CENTER, 50, 0);
-    pbf_move_left_joystick(STICK_CENTER, STICK_MIN, 70, 0);
-    pbf_press_button(BUTTON_L, 20, 100);
-    pbf_move_left_joystick(STICK_MAX, STICK_CENTER, 50, 0);
-    pbf_move_left_joystick(STICK_CENTER, STICK_MAX, 100, 50);
-    pbf_press_button(BUTTON_L, 20, 100);
-    pbf_press_button(BUTTON_PLUS, 20, 200);
-};
-
-int main(void) {
-    // START PROGRAM ON MICROCONTROLLER
-    start_program_callback();
-    initialize_framework(0);
-
-    // START IN GRIP MENU
-    start_program_flash(CONNECT_CONTROLLER_DELAY);
-    grip_menu_connect_go_home();
-    if (TOLERATE_SYSTEM_UPDATE_MENU_FAST) {
-        pbf_press_button(BUTTON_A, 5, 180);
-        pbf_move_right_joystick(STICK_CENTER, STICK_MIN, 5, 0);
-    };
-    pbf_press_button(BUTTON_A, 5, 500);
-
-    open_picnic();
-    move_to_basket();
-
-    for (int curSand = 0; curSand < MAX_SAND; curSand++) {
-        pbf_move_left_joystick(STICK_CENTER, STICK_MIN, 20, 100);
-        // START SANDWICH
-        pbf_press_button(BUTTON_A, 20, 250);
-        pbf_press_button(BUTTON_A, 20, 750);
-        // SELECT RECIPE
-        if (USE_HM) {
-            pbf_press_dpad(DPAD_DOWN, 20, 100);
-        };
-        pbf_press_button(BUTTON_A, 20, 250);
-        // SELECT PICK
-        pbf_press_button(BUTTON_A, 20, 1250);
-        // MAKE SANDWICH
-        pbf_move_left_joystick(STICK_CENTER, STICK_MIN, 250, 100);
-        pbf_move_left_joystick(STICK_CENTER, STICK_MAX, 25, 100);
-        pbf_mash_button(BUTTON_A, 1500);
-        pbf_wait(3000);
-        pbf_press_button(BUTTON_A, 20, 150);
-        // WAIT AT BASKET
-        pbf_move_left_joystick(STICK_CENTER, STICK_MAX, 5, 100);
-        for (int rounds = 0; rounds < 10; rounds++) {
-            pbf_wait(22500);
-            pbf_press_button(BUTTON_A, 20, 100);
-            pbf_mash_button(BUTTON_B, 4000);
-        };
-        pbf_wait(200);
-    };
-    // EXIT TO IDLE MODE
-    pbf_press_button(BUTTON_HOME, 20, 100);
-    end_program_callback();
-    end_program_loop();
-};
\ No newline at end of file
diff --git a/NativePrograms/PokemonSV/Programs/EggHatcher.h b/NativePrograms/PokemonSV/Programs/EggHatcher.h
deleted file mode 100644
index 9cee94d8e0..0000000000
--- a/NativePrograms/PokemonSV/Programs/EggHatcher.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-
-extern const uint8_t BOXES_TO_HATCH;
-extern const uint16_t STEPS_TO_HATCH;
-extern const bool HAS_CLONED_RIDER;
-extern const float SAFETY_COEFF;
\ No newline at end of file
diff --git a/NativePrograms/PokemonSV/Programs/EggHatcher_Core.c b/NativePrograms/PokemonSV/Programs/EggHatcher_Core.c
deleted file mode 100644
index 85bc45ddaa..0000000000
--- a/NativePrograms/PokemonSV/Programs/EggHatcher_Core.c
+++ /dev/null
@@ -1,120 +0,0 @@
-#include "Common/PokemonSwSh/PokemonProgramIDs.h"
-#include "NativePrograms/DeviceFramework/DeviceSettings.h"
-#include "NativePrograms/NintendoSwitch/Libraries/FrameworkSettings.h"
-#include "NativePrograms/NintendoSwitch/Libraries/NintendoSwitch_Device.h"
-#include "NativePrograms/NintendoSwitch/Libraries/NintendoSwitch_PushButtons.h"
-#include "EggHatcher.h"
-
-void fly_to_gate(void) {
-    pbf_press_button(BUTTON_A, 20, 500);
-    pbf_press_button(BUTTON_Y, 20, 800);
-    pbf_move_left_joystick(STICK_MAX, STICK_MAX, 6, 500);
-    pbf_mash_button(BUTTON_A, 1000);
-};
-
-void move_to_location(void) {
-    pbf_move_left_joystick(STICK_MIN, STICK_CENTER, 190, 0);
-    pbf_press_button(BUTTON_L, 20, 0);
-    pbf_move_left_joystick(STICK_CENTER, STICK_MIN, 150, 100);
-    pbf_move_left_joystick(STICK_CENTER, STICK_MAX, 20, 0);
-    pbf_press_button(BUTTON_L, 20, 300);
-};
-
-void open_box(void) {
-    pbf_press_button(BUTTON_A, 20, 500);
-    pbf_press_button(BUTTON_X, 20, 200);
-    pbf_press_button(BUTTON_A, 20, 500);
-};
-
-void get_egg(int boxCol) {
-    pbf_press_dpad(DPAD_RIGHT, 20, 100);
-    pbf_press_button(BUTTON_MINUS, 20, 100);
-    for (int i = 0; i < 40; i++) {
-        pbf_press_dpad(DPAD_DOWN, 5, 0);
-    };
-    pbf_wait(100);
-    pbf_press_button(BUTTON_A, 20, 100);
-    for (int curCol = 0; curCol < boxCol + 1; curCol++) {
-        pbf_press_dpad(DPAD_LEFT, 20, 100);
-    };
-    pbf_press_dpad(DPAD_DOWN, 20, 100);
-    pbf_press_button(BUTTON_A, 20, 100);
-    pbf_press_button(BUTTON_B, 20, 200);
-    pbf_press_button(BUTTON_B, 20, 800);
-};
-
-void deposit_pokemon(int boxCol) {
-    pbf_press_dpad(DPAD_LEFT, 20, 100);
-    pbf_press_dpad(DPAD_DOWN, 20, 100);
-    if (HAS_CLONED_RIDER) {
-        pbf_press_dpad(DPAD_DOWN, 20, 100);
-    };
-    pbf_press_button(BUTTON_MINUS, 20, 100);
-    for (int i = 0; i < 40; i++) {
-        pbf_press_dpad(DPAD_DOWN, 5, 0);
-    };
-    pbf_wait(100);
-    pbf_press_button(BUTTON_A, 20, 100);
-    for (int curCol = 0; curCol < boxCol + 1; curCol++) {
-        pbf_press_dpad(DPAD_RIGHT, 20, 100);
-    };
-    pbf_press_dpad(DPAD_UP, 20, 100);
-    pbf_press_button(BUTTON_A, 20, 100);
-};
-
-void ride_hatch(void) {
-    pbf_press_button(BUTTON_PLUS, 20, 400);
-    // hatch the first egg at full speed, sometimes the speed boost can fail %point for optimizing%
-    pbf_move_left_joystick(STICK_MAX, STICK_CENTER, 50, 0);
-    pbf_press_button(BUTTON_LCLICK, 5, 0);
-    pbf_move_left_joystick(STICK_MAX, STICK_CENTER, STEPS_TO_HATCH * SAFETY_COEFF, 0);
-    // hatch the remaining 4 eggs, not speed boosted to reduce error due to random positioning
-    for (int checkEggLoop = 0; checkEggLoop < 80; checkEggLoop++) {
-        pbf_move_left_joystick(STICK_MAX, STICK_CENTER, 220, 0);
-        pbf_press_button(BUTTON_A, 5, 0);
-    };
-};
-
-int main(void) {
-    start_program_callback();
-    initialize_framework(0);
-
-    // ########## Start in grip menu ##########
-    start_program_flash(CONNECT_CONTROLLER_DELAY);
-    grip_menu_connect_go_home();
-    if (TOLERATE_SYSTEM_UPDATE_MENU_FAST) {
-        pbf_press_button(BUTTON_A, 5, 180);
-        pbf_move_right_joystick(STICK_CENTER, STICK_MIN, 5, 0);
-    };
-    pbf_press_button(BUTTON_A, 5, 500);
-
-    for(int curBox = 0; curBox < BOXES_TO_HATCH; curBox++) {
-        // ########## Intial loop setup ##########
-        open_box();
-        pbf_press_dpad(DPAD_LEFT, 20, 200);
-        if (HAS_CLONED_RIDER) {
-            pbf_press_dpad(DPAD_DOWN, 20, 100);
-        };
-
-        // ########## Main hatching loop ##########
-        for(int boxCol = 0; boxCol < 6; boxCol++) {
-            get_egg(boxCol);
-            move_to_location();
-            ride_hatch();
-            fly_to_gate();
-            open_box();
-            deposit_pokemon(boxCol);
-        };
-
-        // ########## End loop setup ##########
-        pbf_wait(200);
-        pbf_press_button(BUTTON_R, 20, 200);
-        pbf_press_button(BUTTON_B, 20, 200);
-        pbf_press_button(BUTTON_B, 20, 800);
-    };
-    
-    // ########## End idling in home ##########
-    pbf_press_button(BUTTON_HOME, 20, 100);
-    end_program_callback();
-    end_program_loop();
-};
\ No newline at end of file
diff --git a/NativePrograms/PokemonSV/Programs/ItemDupe.h b/NativePrograms/PokemonSV/Programs/ItemDupe.h
deleted file mode 100644
index ff35806bfe..0000000000
--- a/NativePrograms/PokemonSV/Programs/ItemDupe.h
+++ /dev/null
@@ -1,2 +0,0 @@
-
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
diff --git a/NativePrograms/PokemonSV/Programs/ItemDupe_Core.c b/NativePrograms/PokemonSV/Programs/ItemDupe_Core.c
deleted file mode 100644
index dccbfc21d8..0000000000
--- a/NativePrograms/PokemonSV/Programs/ItemDupe_Core.c
+++ /dev/null
@@ -1,139 +0,0 @@
-// SCVI ITEM DUPLICATION
-// ---------------------
-// Includes reset in case of failures
-//
-// CREDITS
-// -------
-// - Pokemon Automation Team for HEX Generator, Program Base, and Help in development
-// - Vaedz#1011 for Original Program, Development, Failure Reset Function, and Startup Correction
-// - Zeverand#6019 for Modifications on timing and Dpad Controls
-// - Jack Mutsers#2563 for Optimization, Original Violet Program, Development, Joystick Reset for Emotes, Joystick Cycle System, and Program Condesation
-// -------
-// SCARLET AND VIOLET VERSION
-// WORKS WITH BOTH GAMES
-//
-// TESTING
-// -------
-// Teensy 2 - STABLE
-// Teensy 2++ - STABLE
-// Arduino Leonardo - STABLE
-// Arduino UNO R3 - STABLE
-// Pro Micro - STABLE
-
-#include "Common/PokemonSwSh/PokemonProgramIDs.h"
-#include "NativePrograms/DeviceFramework/DeviceSettings.h"
-#include "NativePrograms/NintendoSwitch/Libraries/FrameworkSettings.h"
-#include "NativePrograms/NintendoSwitch/Libraries/NintendoSwitch_Device.h"
-#include "NativePrograms/NintendoSwitch/Libraries/NintendoSwitch_PushButtons.h"
-#include "NativePrograms/PokemonSV/Programs/ItemDupe.h"
-#include "NativePrograms/PokemonSwSh/Libraries/PokemonSwSh_Settings.h"
-
-int resetFail = 0;
-int incConst = 1;
-bool oddCycle = true;
-
-int main(void){
-// START PROGRAM ON MICROCONTROLLER
-start_program_callback();
-initialize_framework(0);
-
-// START PROGRAM ON SWITCH
-start_program_flash(CONNECT_CONTROLLER_DELAY);
-grip_menu_connect_go_home();
-
-// START GAME (BE SURE TO HAVE GLITCH ACTIVE)
-pbf_press_button(BUTTON_HOME, 10, 375);
-    
-// ENSURE MENU IS IN CORRECT POSITION
-pbf_press_button(BUTTON_X, 5, 5);
-pbf_wait(100);
-pbf_press_dpad(DPAD_LEFT, 5, 5);
-pbf_wait(100);
-pbf_press_dpad(DPAD_UP, 500, 5);
-pbf_wait(100);
-pbf_press_button(BUTTON_X, 5, 5);
-
-while (true){
-    // DELAY START
-    pbf_wait(50);
-
-    // ENTER MENU AND NAVIGATE TO LEGENDARY
-    pbf_press_button(BUTTON_X, 5, 5);
-
-    // ACTIVATE RIDE FORM GLITCH
-    pbf_wait(160);
-    pbf_press_button(BUTTON_A, 5, 125);
-    pbf_press_dpad(DPAD_UP, 5, 10);
-    pbf_press_dpad(DPAD_UP, 5, 85);
-    pbf_press_button(BUTTON_A, 5, 130);
-    pbf_press_button(BUTTON_A, 5, 140);
-    pbf_press_button(BUTTON_A, 5, 100); // ENSURE DIALOG ENDS
-    pbf_press_button(BUTTON_A, 5, 300);
-    pbf_press_button(BUTTON_A, 5, 100);
-
-    // COLLECT ITEM FROM BOX
-    pbf_press_dpad(DPAD_RIGHT, 5, 85);
-    pbf_press_dpad(DPAD_DOWN, 5, 25);
-    pbf_press_dpad(DPAD_DOWN, 5, 55);
-    pbf_press_button(BUTTON_A, 5, 420);
-    pbf_press_button(BUTTON_X, 5, 60);
-    pbf_press_button(BUTTON_X, 5, 60);
-    pbf_press_button(BUTTON_L, 5, 80);
-    pbf_press_button(BUTTON_A, 5, 100);
-    pbf_press_dpad(DPAD_DOWN, 5, 10);
-    pbf_press_dpad(DPAD_DOWN, 5, 10);
-    pbf_press_dpad(DPAD_DOWN, 5, 65);
-    pbf_press_button(BUTTON_A, 5, 100);
-    pbf_press_button(BUTTON_B, 5, 240);
-
-    // RESET MENU AND NAVIGATE OUT OF MENU
-    pbf_press_dpad(DPAD_LEFT, 5, 10);
-    pbf_press_dpad(DPAD_LEFT, 5, 80);
-    pbf_press_dpad(DPAD_UP, 5, 50);
-    pbf_press_button(BUTTON_B, 5, 20);
-    pbf_press_button(BUTTON_B, 5, 5); // ENSURE MENU IS CLOSED
-    pbf_wait(130);
-
-    // CHECK FAILURE EVERY 4 CYCLES
-    if (resetFail > 2) {
-        pbf_press_button(BUTTON_B, 5, 5);
-        pbf_wait(60);
-        pbf_press_button(BUTTON_B, 5, 5);
-        pbf_wait(60);
-        pbf_press_button(BUTTON_B, 5, 5);
-        pbf_wait(60);
-        pbf_press_button(BUTTON_B, 5, 5);
-        pbf_wait(80);
-
-    // ENABLE EMOTE ABILITY (MOVEMENT LOCK)
-        pbf_press_dpad(DPAD_RIGHT, 5, 5);
-        pbf_wait(170);
-        pbf_press_button(BUTTON_B, 5, 5);
-        pbf_wait(90);
-
-    // PREVENT CHARACTER FROM WALKING AWAY
-        if(oddCycle){
-            pbf_move_left_joystick(0x80, 0x00, 1, 5);
-        }else{
-            pbf_move_left_joystick(0x80, 0xff, 1, 5);
-        }
-
-        pbf_wait(60);
-        pbf_press_button(BUTTON_X, 5, 5);
-        pbf_wait(100);
-        pbf_press_dpad(DPAD_LEFT, 5, 5);
-        pbf_wait(80);
-        pbf_press_dpad(DPAD_UP, 500, 5);
-        pbf_wait(50);
-        pbf_press_button(BUTTON_B, 5, 5);
-        resetFail = 0;
-        oddCycle = !oddCycle;
-    } else {
-        resetFail = resetFail + incConst;
-    };
-}
-    //EXIT TO IDLE MODE (NEVER USED)
-    pbf_press_button(BUTTON_HOME, 10, 125);
-    end_program_callback();
-    end_program_loop();
-};
diff --git a/NativePrograms/PokemonSV/Programs/MassPurchase.h b/NativePrograms/PokemonSV/Programs/MassPurchase.h
deleted file mode 100644
index 5ded8e552b..0000000000
--- a/NativePrograms/PokemonSV/Programs/MassPurchase.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*  Pokemon Sword & Shield Arduino Programs
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- */
-
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-
-// PAY WITH LP
-extern const bool PAY_LP;
-
-// ITEMS TO BUY
-extern const uint16_t ITEMS;
-
-// QT TO BUY
-extern const uint16_t QUANTITY;
diff --git a/NativePrograms/PokemonSV/Programs/MassPurchase_Core.c b/NativePrograms/PokemonSV/Programs/MassPurchase_Core.c
deleted file mode 100644
index 4f3aac7cb1..0000000000
--- a/NativePrograms/PokemonSV/Programs/MassPurchase_Core.c
+++ /dev/null
@@ -1,51 +0,0 @@
-// MASS PURCHASE
-
-#include "Common/PokemonSwSh/PokemonProgramIDs.h"
-#include "NativePrograms/DeviceFramework/DeviceSettings.h"
-#include "NativePrograms/NintendoSwitch/Libraries/FrameworkSettings.h"
-#include "NativePrograms/NintendoSwitch/Libraries/NintendoSwitch_Device.h"
-#include "NativePrograms/NintendoSwitch/Libraries/NintendoSwitch_PushButtons.h"
-#include "NativePrograms/PokemonSV/Programs/MassPurchase.h"
-#include "NativePrograms/PokemonSwSh/Libraries/PokemonSwSh_Settings.h"
-
-int main(void){
-// START PROGRAM ON MICROCONTROLLER
-start_program_callback();
-initialize_framework(0);
-int finish=0;
-int count=0;
-
-// START PROGRAM ON SWITCH
-start_program_flash(CONNECT_CONTROLLER_DELAY);
-grip_menu_connect_go_home();
-
-// START GAME (BE SURE TO HAVE INSTRUCTIONS SET UP)
-pbf_press_button(BUTTON_HOME, 10, 375);
-
-// BUY
-while (finish != ITEMS) {
-    pbf_press_button(BUTTON_A, 5, 105);
-    while (count != QUANTITY) {
-        pbf_press_dpad(DPAD_UP, 5, 105);
-        count++;
-    };
-    pbf_press_dpad(DPAD_DOWN, 5, 105);
-    pbf_press_button(BUTTON_A, 5, 125);
-    if (PAY_LP == true) {
-        pbf_press_dpad(DPAD_DOWN, 5, 105);
-    };
-    pbf_press_button(BUTTON_A, 5, 250);
-    pbf_press_button(BUTTON_A, 5, 125);
-    pbf_press_dpad(DPAD_DOWN, 5, 105);
-};
-    pbf_press_button(BUTTON_B, 5, 105);
-    pbf_press_button(BUTTON_A, 5, 105);
-    pbf_press_button(BUTTON_B, 5, 105);
-    pbf_press_button(BUTTON_A, 5, 105);
-    
-    // EXIT TO IDLE MODE AFTER FINISHED
-    pbf_press_button(BUTTON_HOME, 10, 125);
-    end_program_callback();
-    end_program_loop();
-};
-
diff --git a/NativePrograms/PokemonSV/Programs/MassRelease.h b/NativePrograms/PokemonSV/Programs/MassRelease.h
deleted file mode 100644
index 335ceee83e..0000000000
--- a/NativePrograms/PokemonSV/Programs/MassRelease.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-
-// POKEMON TO RELEASE
-extern const uint16_t RELEASE;
diff --git a/NativePrograms/PokemonSV/Programs/MassRelease_Core.c b/NativePrograms/PokemonSV/Programs/MassRelease_Core.c
deleted file mode 100644
index 3f45c30e72..0000000000
--- a/NativePrograms/PokemonSV/Programs/MassRelease_Core.c
+++ /dev/null
@@ -1,81 +0,0 @@
-// SCVI MASS RELEASE
-
-#include "Common/PokemonSwSh/PokemonProgramIDs.h"
-#include "NativePrograms/DeviceFramework/DeviceSettings.h"
-#include "NativePrograms/NintendoSwitch/Libraries/FrameworkSettings.h"
-#include "NativePrograms/NintendoSwitch/Libraries/NintendoSwitch_Device.h"
-#include "NativePrograms/NintendoSwitch/Libraries/NintendoSwitch_PushButtons.h"
-#include "NativePrograms/PokemonSV/Programs/MassRelease.h"
-#include "NativePrograms/PokemonSwSh/Libraries/PokemonSwSh_Settings.h"
-
-int main(void){
-// START PROGRAM ON MICROCONTROLLER
-start_program_callback();
-initialize_framework(0);
-
-// START PROGRAM ON SWITCH
-start_program_flash(CONNECT_CONTROLLER_DELAY);
-grip_menu_connect_go_home();
-int comp = 0;
-int done = 0;
-int box_count = 0;
-    
-// START GAME (BE SURE TO HAVE INSTRUCTIONS SET UP)
-pbf_press_button(BUTTON_HOME, 10, 375);
-    
-while (done != RELEASE){
-    // DELAY START
-    pbf_wait(50);
-
-    // RELEASE POKEMON
-    pbf_press_button(BUTTON_A, 5, 125);
-    pbf_press_dpad(DPAD_UP, 5, 105);
-    pbf_press_dpad(DPAD_UP, 5, 105);
-    pbf_press_button(BUTTON_A, 5, 125);
-    pbf_press_dpad(DPAD_UP, 5, 105);
-    pbf_press_button(BUTTON_A, 5, 500);
-    pbf_press_button(BUTTON_A, 5, 105);
-    comp++;
-    box_count++;
-    done++;
-    
-    // GO TO NEXT POKEMON
-    if (box_count == 30) {
-        pbf_press_button(BUTTON_R, 5, 105);
-        pbf_press_dpad(DPAD_DOWN, 5, 105);
-        pbf_press_dpad(DPAD_DOWN, 5, 105);
-        box_count=0;
-    };
-    
-    if (comp == 6) {
-        pbf_press_dpad(DPAD_DOWN, 5, 105);
-        pbf_press_dpad(DPAD_LEFT, 5, 105);
-        pbf_press_dpad(DPAD_LEFT, 5, 105);
-        pbf_press_dpad(DPAD_LEFT, 5, 105);
-        pbf_press_dpad(DPAD_LEFT, 5, 105);
-        pbf_press_dpad(DPAD_LEFT, 5, 105);
-        pbf_press_dpad(DPAD_LEFT, 5, 105);
-        comp=0;
-    };
-    
-    pbf_press_dpad(DPAD_RIGHT, 5, 105);
-    
-    // FIX ERROR ONCE PER BOX
-    if (box_count == 0) {
-        pbf_press_button(BUTTON_B, 5, 250);
-        pbf_press_button(BUTTON_B, 5, 250);
-        pbf_press_button(BUTTON_B, 5, 250);
-        pbf_press_button(BUTTON_B, 5, 250);
-        pbf_press_button(BUTTON_X, 5, 105);
-        pbf_press_dpad(DPAD_RIGHT, 5, 105);
-        pbf_press_dpad(DPAD_UP, 500, 105);
-        pbf_press_dpad(DPAD_DOWN, 5, 105);
-        pbf_press_button(BUTTON_A, 5, 500);
-    };
-};
-    
-    // EXIT TO IDLE MODE WHEN DONE RELEASING
-    pbf_press_button(BUTTON_HOME, 10, 125);
-    end_program_callback();
-    end_program_loop();
-};
diff --git a/NativePrograms/PokemonSV/Programs/RoamingGimmighoulFarmer.h b/NativePrograms/PokemonSV/Programs/RoamingGimmighoulFarmer.h
deleted file mode 100644
index 734122636f..0000000000
--- a/NativePrograms/PokemonSV/Programs/RoamingGimmighoulFarmer.h
+++ /dev/null
@@ -1,9 +0,0 @@
-/*  Pokemon Sword & Shield Arduino Programs
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- */
-
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-
-extern const uint16_t SKIPS;
diff --git a/NativePrograms/PokemonSV/Programs/RoamingGimmighoulFarmer_Core.c b/NativePrograms/PokemonSV/Programs/RoamingGimmighoulFarmer_Core.c
deleted file mode 100644
index d378ec9353..0000000000
--- a/NativePrograms/PokemonSV/Programs/RoamingGimmighoulFarmer_Core.c
+++ /dev/null
@@ -1,70 +0,0 @@
-// COIN FARMER ROAMING
-
-#include "Common/PokemonSwSh/PokemonProgramIDs.h"
-#include "NativePrograms/DeviceFramework/DeviceSettings.h"
-#include "NativePrograms/NintendoSwitch/Libraries/FrameworkSettings.h"
-#include "NativePrograms/NintendoSwitch/Libraries/NintendoSwitch_Device.h"
-#include "NativePrograms/NintendoSwitch/Libraries/NintendoSwitch_PushButtons.h"
-#include "NativePrograms/PokemonSV/Programs/RoamingGimmighoulFarmer.h"
-#include "NativePrograms/PokemonSwSh/Libraries/PokemonSwSh_Settings.h"
-
-int main(void){
-// START PROGRAM ON MICROCONTROLLER
-start_program_callback();
-initialize_framework(0);
-int finish=0;
-
-// START PROGRAM ON SWITCH
-start_program_flash(CONNECT_CONTROLLER_DELAY);
-grip_menu_connect_go_home();
-
-// START GAME (BE SURE TO HAVE INSTRUCTIONS SET UP)
-pbf_press_button(BUTTON_HOME, 10, 375);
-
-// FARM
-    while (finish != SKIPS) {
-        // COLLECT COIN
-        pbf_press_button(BUTTON_A, 5, 375);
-        
-        // SAVE GAME
-        pbf_press_button(BUTTON_X, 5, 250);
-        pbf_press_button(BUTTON_R, 5, 250);
-        pbf_press_button(BUTTON_A, 5, 625);
-        pbf_press_button(BUTTON_A, 5, 105);
-        
-        // DATE SKIP
-        pbf_press_button(BUTTON_HOME, 10, 125);
-        pbf_press_dpad(DPAD_RIGHT, 5, 75);
-        pbf_press_dpad(DPAD_RIGHT, 5, 75);
-        pbf_press_dpad(DPAD_DOWN, 5, 75);
-        pbf_press_dpad(DPAD_RIGHT, 5, 75);
-        pbf_press_button(BUTTON_A, 5, 175);
-        pbf_press_dpad(DPAD_DOWN, 500, 75);
-        pbf_press_dpad(DPAD_RIGHT, 5, 75);
-        pbf_press_dpad(DPAD_DOWN, 100, 75);
-        pbf_press_button(BUTTON_A, 5, 125);
-        pbf_press_dpad(DPAD_DOWN, 100, 75);
-        pbf_press_button(BUTTON_A, 5, 105);
-        pbf_press_dpad(DPAD_RIGHT, 5, 75);
-        pbf_press_dpad(DPAD_UP, 5, 75);
-        pbf_press_dpad(DPAD_RIGHT, 5, 75);
-        pbf_press_dpad(DPAD_RIGHT, 5, 75);
-        pbf_press_dpad(DPAD_RIGHT, 5, 75);
-        pbf_press_dpad(DPAD_RIGHT, 5, 75);
-        pbf_press_dpad(DPAD_RIGHT, 5, 75);
-        pbf_press_button(BUTTON_A, 5, 105);
-        pbf_press_button(BUTTON_HOME, 5, 500);
-        
-        // RESTART GAME
-        pbf_press_button(BUTTON_X, 5, 125);
-        pbf_press_button(BUTTON_A, 5, 500);
-        pbf_press_button(BUTTON_A, 5, 125);
-        pbf_press_button(BUTTON_A, 5, 2500);
-        pbf_press_button(BUTTON_A, 5, 3750);
-    };
-    // EXIT TO IDLE MODE AFTER FINISHED
-    pbf_press_button(BUTTON_HOME, 10, 125);
-    end_program_callback();
-    end_program_loop();
-};
-
diff --git a/NativePrograms/PokemonSV/README.md b/NativePrograms/PokemonSV/README.md
deleted file mode 100644
index 9a43c90cc7..0000000000
--- a/NativePrograms/PokemonSV/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# NativePrograms
-
-Source code for the Arduino-side programs.
diff --git a/NativePrograms/PokemonSV/README_Mac_Linux.md b/NativePrograms/PokemonSV/README_Mac_Linux.md
deleted file mode 100644
index 023f271982..0000000000
--- a/NativePrograms/PokemonSV/README_Mac_Linux.md
+++ /dev/null
@@ -1,34 +0,0 @@
-# Requirements
-
-## Mac OS (Homebrew Required)
-
-Run the commands below to install the packages needed to build and flash your device
-
-```shell
-# Uninstall existing packages to ensure avr-gcc is properly installed
-brew uninstall avr-gcc avrdude
-
-# Now install requirements
-brew tap osx-cross/avr
-brew install avr-gcc --build-from-source avr-gcc
-brew install avrdude make
-```
-
-## Linux
-
-First, install your distros "Development Tools" group of packages. This will include basic tools such as gcc and make.
-
-For Fedora, the command is shown below:
-
-```shell
-dnf groupinstall 'Development Tools'
-```
-
-install the packages listed below. Note that the package names will likely differ between distros.
-
-```shell
-avr-libc
-avr-binutils 
-gcc-avr32-linux-gnu
-gcc-c++-avr32-linux-gn
-```
\ No newline at end of file
diff --git a/NativePrograms/PokemonSV/RoamingGimmighoulFarmer.c b/NativePrograms/PokemonSV/RoamingGimmighoulFarmer.c
deleted file mode 100644
index a2f31be431..0000000000
--- a/NativePrograms/PokemonSV/RoamingGimmighoulFarmer.c
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-#include "Programs/RoamingGimmighoulFarmer.h"
-
-const uint16_t SKIPS        =   5000;
diff --git a/NativePrograms/PokemonSV/makefile b/NativePrograms/PokemonSV/makefile
deleted file mode 100644
index dfae4949ab..0000000000
--- a/NativePrograms/PokemonSV/makefile
+++ /dev/null
@@ -1,133 +0,0 @@
-#
-#             LUFA Library
-#     Copyright (C) Dean Camera, 2014.
-#
-#  dean [at] fourwalledcubicle [dot] com
-#           www.lufa-lib.org
-# 
-#  Modified by https://github.com/PokemonAutomation/Arduino-Source
-#
-# --------------------------------------
-#         LUFA Project Makefile.
-# --------------------------------------
-
-#   MCU Types:
-#     atmega16u2    for Arduino UNO R3
-#     atmega32u4    for Arduino Micro, and Teensy 2.0
-#     at90usb1286   for Teensy 2.0++
-
-#   Set MCU and TARGET here:
-
-ifeq ($(BOARD_TYPE),)
-BOARD_TYPE := Teensy2
-endif
-ifeq ($(TARGET),)
-TARGET := TurboA
-#TARGET := Sandbox
-endif
-
-
-################################################################################
-#   Ignore all this stuff below.
-
-PATH_PUBLIC = ../../
-PATH_INTERNAL = ../../../Internal
-
-CATEGORY = PokemonSV
-
-#MCU          = atmega16u2
-ARCH         = AVR8
-F_CPU        = 16000000
-F_USB        = $(F_CPU)
-OPTIMIZATION = s
-#TARGET       = TurboA
-SRC          = $(TARGET).c
-LUFA_PATH    = $(PATH_PUBLIC)/NativePrograms/LUFA
-CC_FLAGS     = -DUSE_LUFA_CONFIG_HEADER -I$(PATH_PUBLIC) -I$(PATH_PUBLIC)/NativePrograms/LUFA/ -Wno-unused-function -Werror
-
-
-
-
-#   Board
-ifeq ($(BOARD_TYPE), ArduinoUnoR3)
-MCU := atmega16u2
-SRC += $(PATH_PUBLIC)/NativePrograms/DeviceFramework/Board-atmega16u2-ArduinoUnoR3.c
-endif
-ifeq ($(BOARD_TYPE), ArduinoLeonardo)
-MCU := atmega32u4
-SRC += $(PATH_PUBLIC)/NativePrograms/DeviceFramework/Board-atmega32u4-ArduinoLeonardo.c
-endif
-ifeq ($(BOARD_TYPE), ProMicro)
-MCU := atmega32u4
-SRC += $(PATH_PUBLIC)/NativePrograms/DeviceFramework/Board-atmega32u4-ProMicro.c
-endif
-ifeq ($(BOARD_TYPE), Teensy2)
-MCU := atmega32u4
-SRC += $(PATH_PUBLIC)/NativePrograms/DeviceFramework/Board-atmega32u4-Teensy2.c
-endif
-ifeq ($(BOARD_TYPE), TeensyPP2)
-MCU := at90usb1286
-SRC += $(PATH_PUBLIC)/NativePrograms/DeviceFramework/Board-at90usb1286-Teensy2.c
-endif
-
-#   Framework
-SRC += $(LUFA_SRC_USB)
-SRC += $(PATH_PUBLIC)/NativePrograms/DeviceFramework/Framework/DeviceSettings.c
-SRC += $(PATH_PUBLIC)/NativePrograms/NintendoSwitch/FrameworkSettings.c
-ifneq ("$(wildcard $(PATH_INTERNAL)/NativePrograms/NintendoSwitch/Framework/NintendoSwitch_PushButtons.c)","")
-CC_FLAGS += -I$(PATH_INTERNAL)
-SRC += $(PATH_PUBLIC)/Common/CRC32.c
-SRC += $(PATH_INTERNAL)/NativePrograms/NintendoSwitch/Framework/uart.c
-SRC += $(PATH_INTERNAL)/NativePrograms/NintendoSwitch/Framework/HardwareUSB.c
-ifeq ($(TARGET), PABotBase)
-SRC += $(PATH_INTERNAL)/NativePrograms/NintendoSwitch/Framework/CommandQueue.c
-else
-SRC += $(PATH_INTERNAL)/NativePrograms/NintendoSwitch/Framework/CommandQueueNull.c
-endif
-SRC += $(PATH_INTERNAL)/NativePrograms/NintendoSwitch/Framework/HardwareSerial.c
-SRC += $(PATH_INTERNAL)/NativePrograms/NintendoSwitch/Framework/Controller.c
-SRC += $(PATH_INTERNAL)/NativePrograms/NintendoSwitch/Framework/NintendoSwitch_PushButtons.c
-SRC += $(PATH_INTERNAL)/NativePrograms/NintendoSwitch/Framework/NintendoSwitch_ScalarButtons.c
-else
-LD_FLAGS += obj/obj-$(MCU)/CRC32.o
-LD_FLAGS += obj/obj-$(MCU)/uart.o
-LD_FLAGS += obj/obj-$(MCU)/HardwareUSB.o
-ifeq ($(TARGET), PABotBase)
-LD_FLAGS += obj/obj-$(MCU)/CommandQueue.o
-else
-LD_FLAGS += obj/obj-$(MCU)/CommandQueueNull.o
-endif
-LD_FLAGS += obj/obj-$(MCU)/HardwareSerial.o
-LD_FLAGS += obj/obj-$(MCU)/Controller.o
-LD_FLAGS += obj/obj-$(MCU)/NintendoSwitch_PushButtons.o
-LD_FLAGS += obj/obj-$(MCU)/NintendoSwitch_ScalarButtons.o
-endif
-
-#   Program
-SRC += $(PATH_PUBLIC)/NativePrograms/PokemonBDSP/PokemonBDSP_Settings.c
-#SRC += $(PATH_PUBLIC)/NativePrograms/$(CATEGORY)/Programs/PokemonCallbacks.c
-ifneq ("$(wildcard $(PATH_INTERNAL)/NativePrograms/$(CATEGORY)/$(TARGET)_Core.c)","")
-SRC += $(PATH_INTERNAL)/NativePrograms/$(CATEGORY)/$(TARGET)_Core.c
-else ifneq ("$(wildcard Programs/$(TARGET)_Core.c)","")
-SRC += Programs/$(TARGET)_Core.c
-else ifneq ("$(wildcard obj/obj-$(MCU)/$(TARGET)_Core.o)","")
-LD_FLAGS += obj/obj-$(MCU)/$(TARGET)_Core.o
-endif
-
-#   Must go at the end or it blows up memory if floating-point is used.
-LD_FLAGS += -lm
-
-
-# Default target
-all:
-
-# Include LUFA build script makefiles
-include $(LUFA_PATH)/Build/lufa_core.mk
-include $(LUFA_PATH)/Build/lufa_sources.mk
-include $(LUFA_PATH)/Build/lufa_build.mk
-include $(LUFA_PATH)/Build/lufa_cppcheck.mk
-include $(LUFA_PATH)/Build/lufa_doxygen.mk
-include $(LUFA_PATH)/Build/lufa_dfu.mk
-include $(LUFA_PATH)/Build/lufa_hid.mk
-include $(LUFA_PATH)/Build/lufa_avrdude.mk
-include $(LUFA_PATH)/Build/lufa_atprogram.mk
diff --git a/NativePrograms/PokemonSwSh/!BuildAll-ArduinoLeonardo.cmd b/NativePrograms/PokemonSwSh/!BuildAll-ArduinoLeonardo.cmd
deleted file mode 100644
index 488519e9ec..0000000000
--- a/NativePrograms/PokemonSwSh/!BuildAll-ArduinoLeonardo.cmd
+++ /dev/null
@@ -1,15 +0,0 @@
-@echo off
-
-cd /D "%~dp0"
-
-if not exist Programs\ (
-    echo.
-    echo Please unzip the folder before you can use it.
-    echo.
-    pause
-    exit
-)
-
-@call ../Scripts/BuildAll.cmd ArduinoLeonardo
-
-
diff --git a/NativePrograms/PokemonSwSh/!BuildAll-ArduinoUnoR3.cmd b/NativePrograms/PokemonSwSh/!BuildAll-ArduinoUnoR3.cmd
deleted file mode 100644
index 7fc90f1c06..0000000000
--- a/NativePrograms/PokemonSwSh/!BuildAll-ArduinoUnoR3.cmd
+++ /dev/null
@@ -1,15 +0,0 @@
-@echo off
-
-cd /D "%~dp0"
-
-if not exist Programs\ (
-    echo.
-    echo Please unzip the folder before you can use it.
-    echo.
-    pause
-    exit
-)
-
-@call ../Scripts/BuildAll.cmd ArduinoUnoR3
-
-
diff --git a/NativePrograms/PokemonSwSh/!BuildAll-ProMicro.cmd b/NativePrograms/PokemonSwSh/!BuildAll-ProMicro.cmd
deleted file mode 100644
index b1ece4743b..0000000000
--- a/NativePrograms/PokemonSwSh/!BuildAll-ProMicro.cmd
+++ /dev/null
@@ -1,15 +0,0 @@
-@echo off
-
-cd /D "%~dp0"
-
-if not exist Programs\ (
-    echo.
-    echo Please unzip the folder before you can use it.
-    echo.
-    pause
-    exit
-)
-
-@call ../Scripts/BuildAll.cmd ProMicro
-
-
diff --git a/NativePrograms/PokemonSwSh/!BuildAll-Teensy++2.0.cmd b/NativePrograms/PokemonSwSh/!BuildAll-Teensy++2.0.cmd
deleted file mode 100644
index e30eb5dfe0..0000000000
--- a/NativePrograms/PokemonSwSh/!BuildAll-Teensy++2.0.cmd
+++ /dev/null
@@ -1,15 +0,0 @@
-@echo off
-
-cd /D "%~dp0"
-
-if not exist Programs\ (
-    echo.
-    echo Please unzip the folder before you can use it.
-    echo.
-    pause
-    exit
-)
-
-@call ../Scripts/BuildAll.cmd TeensyPP2
-
-
diff --git a/NativePrograms/PokemonSwSh/!BuildAll-Teensy2.0.cmd b/NativePrograms/PokemonSwSh/!BuildAll-Teensy2.0.cmd
deleted file mode 100644
index 84f90a817e..0000000000
--- a/NativePrograms/PokemonSwSh/!BuildAll-Teensy2.0.cmd
+++ /dev/null
@@ -1,15 +0,0 @@
-@echo off
-
-cd /D "%~dp0"
-
-if not exist Programs\ (
-    echo.
-    echo Please unzip the folder before you can use it.
-    echo.
-    pause
-    exit
-)
-
-@call ../Scripts/BuildAll.cmd Teensy2
-
-
diff --git a/NativePrograms/PokemonSwSh/!Cleanup.cmd b/NativePrograms/PokemonSwSh/!Cleanup.cmd
deleted file mode 100644
index 7832b61049..0000000000
--- a/NativePrograms/PokemonSwSh/!Cleanup.cmd
+++ /dev/null
@@ -1,21 +0,0 @@
-::  Clean the build. Delete all build artifacts.
-
-cd %~dp0
-
-del *.log
-del *.d
-del *.elf
-del *.hex
-del *.map
-del *.o
-del *.eep
-del *.bin
-del *.lss
-del *.sym
-del *.tmp
-
-del obj\*.d
-del obj\*.o
-del obj\build-*
-
-::pause
diff --git a/NativePrograms/PokemonSwSh/00-BuildAllUnix.sh b/NativePrograms/PokemonSwSh/00-BuildAllUnix.sh
deleted file mode 100644
index a543c0de94..0000000000
--- a/NativePrograms/PokemonSwSh/00-BuildAllUnix.sh
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/usr/bin/env bash
-
-# change directory to library location
-cd "$(dirname "$0")"
-
-# define the MCU, which is the board type
-
-if [[ "$OSTYPE" == "darwin"* ]]; then
-    PLATFORM="mac"
-    FZF=$(which fzf)
-
-    if [[ "$FZF" == "" ]]; then
-        boxed_msg "${RED}ERROR: FZF is not detected on your system. Please install it through Homebrew ${RESET}"
-        exit 1
-    fi
-
-elif [[ "$OSTYPE" == "linux-gnu"* ]]; then
-    PLATFORM="linux"
-    FZF="../Scripts/fzf-${PLATFORM}"
-else
-    boxed_msg "${RED}${OSTYPE} is not a recognized platform. Please run only on Mac or Linux${RESET}"
-    exit 1
-fi
-
-BOARD=$1
-
-function run() {
-    if [[ -z "$BOARD" ]]; then
-        board_prompt
-    fi
-
-    # if the boards were given by integer, we can update them here
-
-
-    # say what we're building for convenience
-    echo "Ready to build for board: $BOARD"
-    echo ""
-
-    # and send off to build
-    bash ../Scripts/BuildAllUnix.sh "$BOARD" #1> /dev/null
-
-    # let them know we finished
-    echo -e "\033[1mFinished building hex files for board: $BOARD \033[0m"
-    echo "Please make sure the hex files were properly built or updated."
-    echo "You can now close this window if you wish."
-    echo ""
-    # really done
-}
-
-function board_prompt() {
-    BOARD=$(cat ../Scripts/Boards.txt | $FZF --height=15% --prompt="Choose your Board: ")
-}
-
-run
diff --git a/NativePrograms/PokemonSwSh/00-CleanupUnix.sh b/NativePrograms/PokemonSwSh/00-CleanupUnix.sh
deleted file mode 100644
index 3e3789e7cc..0000000000
--- a/NativePrograms/PokemonSwSh/00-CleanupUnix.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/usr/bin/env bash
-# this script removes all compiled pieces to create a fresh directory
-
-# change directory to library location
-cd "$(dirname "$0")"
-
-# NOTE: /dev/null forwarding is to ensure that nothing is printed if the files were already deleted
-rm *.log > /dev/null 2>&1
-rm *.d > /dev/null 2>&1
-rm *.elf > /dev/null 2>&1
-rm *.hex > /dev/null 2>&1
-rm *.map > /dev/null 2>&1
-rm *.o > /dev/null 2>&1
-rm *.eep > /dev/null 2>&1
-rm *.bin > /dev/null 2>&1
-rm *.lss > /dev/null 2>&1
-rm *.sym > /dev/null 2>&1
-rm *.tmp > /dev/null 2>&1
-
-# compiled pieces within Libraries, Programs, and obj
-rm Libraries/*.d > /dev/null 2>&1
-rm Libraries/*.o > /dev/null 2>&1
-
-rm Programs/*.d > /dev/null 2>&1
-rm Programs/*.o > /dev/null 2>&1
-
-rm obj/*.d > /dev/null 2>&1
-rm obj/*.o > /dev/null 2>&1
-
-echo "Finished cleaning build files."
diff --git a/NativePrograms/PokemonSwSh/00-FlashUnix.sh b/NativePrograms/PokemonSwSh/00-FlashUnix.sh
deleted file mode 100644
index a7c2f8ea87..0000000000
--- a/NativePrograms/PokemonSwSh/00-FlashUnix.sh
+++ /dev/null
@@ -1,222 +0,0 @@
-#!/usr/bin/env bash
-
-# change directory to library location
-cd "$(dirname "$0")" || exit
-
-# Parse Command line arguments for MCU, Program and Device Path
-BOARD=$1
-PROGRAM=$2
-DEVICE_PATH=$3
-
-
-if [[ "$OSTYPE" == "darwin"* ]]; then
-    PLATFORM="mac"
-    FZF=$(which fzf)
-
-    if [[ "$FZF" == "" ]]; then
-        boxed_msg "${RED}ERROR: FZF is not detected on your system. Please install it through Homebrew ${RESET}"
-        exit 1
-    fi
-
-elif [[ "$OSTYPE" == "linux-gnu"* ]]; then
-    PLATFORM="linux"
-    FZF="../Scripts/fzf-${PLATFORM}"
-else
-    boxed_msg "${RED}${OSTYPE} is not a recognized platform. Please run only on Mac or Linux${RESET}"
-    exit 1
-fi
-
-SUDO=""
-BUILD_HEX=""
-HEXFILE=""
-PROGRAM_COMMAND="program_avrdude ${MCU} ${HEXFILE}" # Default to using avrdude
-BOARDS=(ArduinoUnoR3 ProMicro Teensy2 TeensyPP2)
-
-function run() {
-
-    configure
-
-    if [[ $BUILD_HEX == "y" ]]; then
-        build_hex
-    fi
-
-    boxed_msg "Flashing ${PROGRAM}.hex ..."
-    $PROGRAM_COMMAND
-
-    boxed_msg "Finished flashing ${HEXFILE} to ${BOARD}!"
-}
-
-function configure() {
-    boxed_msg "Configuration"
-
-    [[ -f "${HOME}/.paconfig" ]] && source "${HOME}/.paconfig"
-    [[ "$EUID" -ne 0 ]] && SUDO="sudo"
-    [[ -z "${BOARD}" ]] && board_prompt || note "Using Preconfigured BOARD [${BOARD}]"
-    [[ -z "${PROGRAM}" ]] && prog_prompt
-    
-    if [[ ! -f ${HEXFILE} ]]; then
-        question "Build ${PROGRAM}? ${WHITE}[Y/n]${RESET}" "DOBUILD"
-        DOBUILD="${DOBUILD:-y}"
-        if [ "$DOBUILD" == "y" ]; then
-            BUILD_HEX="y"
-        else
-            logmsg "Nothing to flash, exiting.."
-            exit
-        fi
-    fi
-
-    # Logic below to determine if we need to us dfu-programmer or not
-    if [[ $PLATFORM == "mac" ]] && [[ ${MCU} == "atmega16u2" ]]; then
-        which dfu-programmer >/dev/null 2>&1
-        if [[ $? -eq 0 ]]; then
-            question "Mac platform detected, UNO R3 configured. Connect your device and enter DFU mode, then press any key..." "use_dfu"
-            PROGRAM_COMMAND="program_dfu ${MCU} ${HEXFILE}"
-        else
-            logmsg "dfu-programmer not installed, run \"brew install dfu-programmer\" then rerun this script"
-	    exit 1
-        fi
-    fi
-}
-
-function build_hex {
-        boxed_msg "Build ${PROGRAM}.c"
-
-        note "Cleaning Build Environment"
-        ./00-CleanupUnix.sh >/dev/null
-
-
-        note "Running Build Script"
-        sh ../Scripts/BuildOneUnix.sh "${BOARD}" "${PROGRAM}" > /dev/null 2>&1
-
-        retVal=$?
-        if [ $retVal -ne 0 ]; then
-            boxed_msg "${RED}ERROR - CRITICAL: An error occured while building.\nPlease check logs and perhaps run the cleanup script before trying again.${RESET}"
-            exit 1
-        else 
-            note "${PROGRAM}.hex successfully built!"
-        fi
-    
-}
-
-function detect_device() {
-    local -r delay='0.75'
-    local spinstr='\|/-'
-    local temp
-    while true; do
-        temp="${spinstr#?}"
-        printf "${YELLOW}Waiting for device... [%c]  ${RESET}" "${spinstr}"
-        spinstr=${temp}${spinstr%"${temp}"}
-        # shellcheck disable=SC2010
-        found_device_path="$(ls /dev/tty* | grep -i 'acm\|usb')"
-        if [[ -n "$found_device_path" ]]; then
-            DEVICE_PATH="${found_device_path}"
-            break
-        fi
-        sleep "${delay}"
-        printf "%0.s\b" {1..28}
-    done
-    printf "    \b\b\b\b\n"
-    boxed_msg "Device connected at [${found_device_path}]" "short"
-}
-
-function program_dfu {
-    # start with clearing the BOARD
-    ${SUDO} dfu-programmer "${MCU}" erase || true
-    # then flash the hex to the BOARD
-    ${SUDO} dfu-programmer "${MCU}" flash "${HEXFILE}"
-    if [[ $? -ne 0 ]]; then
-        boxed_msg "${RED}Flash Error: Check the output above for more info.${RESET}"
-        exit 1
-    fi
-    # then reset the BOARD
-    ${SUDO} dfu-programmer "${MCU}" reset
-    if [[ $? -ne 0 ]]; then
-        boxed_msg "${RED}Device Reset Error: Check the output above for more info.${RESET}"
-        exit 1
-    fi
-}
-
-function program_avrdude {
-    if [[ $AUTODETECT_DEVICE == "y" ]]; then
-        note "Autodetect enabled..."
-        detect_device
-    elif [[ -z $DEVICE_PATH ]] && [[ -z $autodetect_device ]]; then
-        question "Would you like to attempt auto detecting your device? ${WHITE}[y/n]${RESET}" "autodetect_device"
-        autodetect_device="${autodetect_device:-y}"
-        if [[ $autodetect_device == "n" ]]; then
-            question "Please enter the path to your device ${WHITE}(ex. /dev/ttyACM0)${RESET}" "DEVICE_PATH"        
-        elif [[ $autodetect_device == "y" ]]; then
-            detect_device 
-        else
-            note "Invalid input, defaulting to autodetection"
-            detect_device
-        fi
-    fi
-    
-    note "Attempting to flash ${WHITE}${PROGRAM}.hex${RESET} to ${WHITE}${DEVICE_PATH}${RESET} now"
-    ${SUDO} avrdude -q -p "${MCU}" -P "${DEVICE_PATH}" -c avr109 -U flash:w:"${HEXFILE}"
-}
-
-function boxed_msg() {
-    msg=$1
-    len=$2
-    [[ $len == short ]] && div="\n===============\n" || div="\n=================================\n"
-    echo -e "${div}${GREEN}${msg}${RESET}${div}"
-}
-
-function question() {
-    echo -e "\n${YELLOW}${1}: ${RESET}"
-    read -r "$2"
-}
-
-function logmsg {
-    msg=$1
-    echo -e "${LBLUE}${msg}${RESET}"
-}
-
-function note() {
-    msg=$1
-    div='** '
-    echo -e "${YELLOW}${div}${msg}${RESET}"
-}
-
-function board_prompt() {
-    BOARD=$(cat ../Scripts/Boards.txt | $FZF --height=15% --prompt="Choose your Board: ")
-    case $BOARD in
-        "ArduinoUnoR3")
-            MCU=atmega16u2
-            ;;
-        "ArduinoLeonardo")
-            MCU=atmega32u4
-            ;;
-        "ProMicro") 
-            MCU=atmega32u4
-            ;;
-        "Teensy2") 
-            MCU=atmega32u4
-            ;;
-        "TeensyPP2")
-            MCU=at90usb1286
-            ;;
-        *)
-            note "Invalid Board"
-            exit 1
-    esac
-}
-
-function prog_prompt() {
-    PROGRAM=$(ls -1 *.c 2> /dev/null | sed 's/\.c//g' | $FZF --height=15% --prompt="Program to Flash: " )
-    HEXFILE="${PROGRAM}.hex"
-}
-
-## Color Helpers
-RED=$'\e[1;31m'
-YELLOW=$'\e[1;33m'
-GREEN=$'\e[1;32m'
-LBLUE=$'\e[1;34m'
-WHITE=$'\e[1;37m'
-RESET=$'\e[0m'
-
-# LEZZGOOO!
-run
-
diff --git a/NativePrograms/PokemonSwSh/AutoHost-MultiGame.c b/NativePrograms/PokemonSwSh/AutoHost-MultiGame.c
deleted file mode 100644
index 8ed21fd19d..0000000000
--- a/NativePrograms/PokemonSwSh/AutoHost-MultiGame.c
+++ /dev/null
@@ -1,93 +0,0 @@
-/*  Pokemon Sword & Shield: Multi-Game Rolling Auto-Host
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- *      Please refer to the user manual for instructions and documentation.
- * 
- */
-
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-#include "Programs/AutoHost-MultiGame.h"
-
-
-
-//  Raid Code
-//      No code:            RANDOM_DIGITS = 0       RAID_CODE = ""
-//      Fixed code:         RANDOM_DIGITS = 0       RAID_CODE = "1234 5678"
-//      Random Code:        RANDOM_DIGITS = 4       RAID_CODE = "1234 5678"
-//
-//  Non-digit characters (such as spaces or hyphen) will be skipped.
-//
-//  "RANDOM_DIGITS" specifies how many of the first digits are randomized.
-//  If it is less than 8, the remaining digits will be copies of the last digit.
-//  This makes it easier to enter the code.
-//
-//  When using random codes, "RAID_CODE" is used to generate the starting seed.
-const uint8_t RANDOM_DIGITS     =   0;
-const char* RAID_CODE           =   "1280 0000";
-
-
-//  General Settings
-const bool HOST_ONLINE          =   true;                   //  true = host online, false = host offline
-const uint16_t LOBBY_WAIT_DELAY =   60 * TICKS_PER_SECOND;  //  3:00 - 60 secs = 2:00
-
-
-//  Game List
-const RollingAutoHostSlot GAME_LIST[] = {
-    {
-        .game_slot          =   1,                      //  Game slot at start of program. (must be 1 or 2)
-        .user_slot          =   2,                      //  User # to host from.
-        .skips              =   3,                      //  # of frame skips to roll before hosting.
-        .backup_save        =   false,                  //  Load backup save instead of normal reset.
-        .always_catchable   =   true,                   //  Pokemon in this den are always catchable.
-        .accept_FRs         =   true,                   //  Accept friend requests.
-        .move_slot          =   0,                      //  If 0, don't select a move. Otherwise select this move slot.
-        .dynamax            =   true,                   //  If 1st move select is enabled, dynamax as well.
-        .post_raid_delay    =   0 * TICKS_PER_SECOND,   //  Extra wait time after each raid.
-    },
-    {
-        .game_slot          =   1,
-        .user_slot          =   3,
-        .skips              =   3,
-        .backup_save        =   false,
-        .always_catchable   =   true,
-        .accept_FRs         =   true,
-        .move_slot          =   0,
-        .dynamax            =   true,
-        .post_raid_delay    =   0 * TICKS_PER_SECOND,
-    },
-
-
-    //  DO NOT DELETE THIS
-    {0},
-};
-
-
-//  Accept FRs this many games into the future.
-//      0   Accept FRs for the game that's currently being hosted.
-//      1   Accept FRs for the next game that will be hosted.
-//      2   Accept FRs for the game that will be hosted 2 from now.
-//      3   ...
-const uint8_t FR_FORWARD_ACCEPT =   1;
-
-
-//  Rollover Prevention
-//
-//  This option is only relevant if all dens being hosted have (skips = 0).
-//
-//  If set to zero, this feature is disabled.
-//  Otherwise, the program will touch the date at roughly this interval to
-//  prevent the den from rolling over. This feature requres time-sync be disabled.
-const uint32_t TOUCH_DATE_INTERVAL  =   (uint32_t)4 * 3600 * TICKS_PER_SECOND;  //  4 hours
-
-
-
-//  Increase these if your internet is slow.
-const uint16_t CONNECT_TO_INTERNET_DELAY    =   20 * TICKS_PER_SECOND;  //  Time from "Connect to Internet" to when you're ready to enter den.
-const uint16_t ENTER_ONLINE_DEN_DELAY       =   8 * TICKS_PER_SECOND;   //  "Communicating" when entering den while online.
-const uint16_t OPEN_ONLINE_DEN_LOBBY_DELAY  =   8 * TICKS_PER_SECOND;   //  Delay from "Invite Others" to when the clock starts ticking.
-
-const uint16_t RAID_START_TO_EXIT_DELAY     =   15 * TICKS_PER_SECOND;  //  Time from start raid to reset. (when not selecting move)
-const uint16_t DELAY_TO_SELECT_MOVE         =   32 * TICKS_PER_SECOND;  //  This + RAID_START_TO_EXIT_DELAY = time from start raid to select move.
-
-
diff --git a/NativePrograms/PokemonSwSh/AutoHost-Rolling.c b/NativePrograms/PokemonSwSh/AutoHost-Rolling.c
deleted file mode 100644
index a3e2c4f791..0000000000
--- a/NativePrograms/PokemonSwSh/AutoHost-Rolling.c
+++ /dev/null
@@ -1,107 +0,0 @@
-/*  Pokemon Sword & Shield: Rolling Auto-Host with Friend-Request Accepts
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- *      Please refer to the user manual for instructions and documentation.
- * 
- */
-
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-#include "Programs/AutoHost-Rolling.h"
-
-
-
-//  Raid Code
-//      No code:            RANDOM_DIGITS = 0       RAID_CODE = ""
-//      Fixed code:         RANDOM_DIGITS = 0       RAID_CODE = "1234 5678"
-//      Random Code:        RANDOM_DIGITS = 4       RAID_CODE = "1234 5678"
-//
-//  Non-digit characters (such as spaces or hyphen) will be skipped.
-//
-//  "RANDOM_DIGITS" specifies how many of the first digits are randomized.
-//  If it is less than 8, the remaining digits will be copies of the last digit.
-//  This makes it easier to enter the code.
-//
-//  When using random codes, "RAID_CODE" is used to generate the starting seed.
-const uint8_t RANDOM_DIGITS     =   0;
-const char* RAID_CODE           =   "1280 0000";
-
-
-//  General Settings
-const uint8_t SKIPS             =   3;                      //  Set to 0 if hard-locked on desired frame.
-const bool HOST_ONLINE          =   true;                   //  true = host online, false = host offline
-const uint16_t LOBBY_WAIT_DELAY =   60 * TICKS_PER_SECOND;  //  3:00 - 60 secs = 2:00
-
-
-//  Backup Save: (for soft-lock hosting)
-//      If set to true, the game will load backup save upon soft-reset.
-//  The idea here is to roll forward from the save frame to the shiny frame.
-//  Once on the shiny frame (with the desired softlock), you enter and exit the
-//  camp to setup a backup save on the shiny frame. That way, you can load the
-//  backup save on the shiny frame while leaving the real save safely 3 or more
-//  frames before.
-//
-//  This option only makes sense when SKIPS = 0.
-const bool BACKUP_SAVE      =   false;
-
-
-//  ALWAYS_CATCHABLE    All pokemon in this den are catchable.
-//  MAYBE_UNCATCHABLE   There may be uncatchable pokemon.
-const Catchability CATCHABILITY     =   ALWAYS_CATCHABLE;
-
-
-//  Friend-Request Accepting:
-//      0   =   Disabled. Do not automatically accept friend requests.
-//      #   =   Automatically accept friend requests for the N'th user.
-//
-//  This number is the slot position of the user at the top of the Home menu.
-//  The left-most user is slot 1. This option only works if "HOST_ONLINE" is true.
-//
-//  Friend accepting is done while waiting in the raid lobby. Therefore it does
-//  not slow down the program.
-const uint8_t FRIEND_ACCEPT_USER_SLOT       =   0;
-
-
-//  Additional Raid Delay:
-//      If you are farming a pokemon and the time between raids is too short to
-//  join consecutive raids, use this to add time between raids. This extra wait
-//  time is done after entering the den, but before entering the code.
-const uint16_t EXTRA_DELAY_BETWEEN_RAIDS    =   0 * TICKS_PER_SECOND;
-
-
-//  Select 1st Move:
-//      MOVE_SLOT   =   0   Do not select a move for first turn.
-//      MOVE_SLOT   =   #   Select this move for the first turn.
-const uint8_t MOVE_SLOT     =   0;
-const bool DYNAMAX          =   true;   //  Must set to false if you cannot dmax.
-const uint8_t TROLL_HOSTING =   0;      //0 to disable, 1/2/3 to attack one of your allies.
-
-
-//  Alternate Games: (experimental feature)
-//      If set to true, alternate between games 1 and 2.
-//  Basically if you have both Sword and Shield on the same user and you wish
-//  to host dens on both with the same settings. This implies that at least of
-//  the games must be a digital copy since you cannot have 2 carts in at once.
-const bool ALTERNATE_GAMES  =   false;
-
-
-//  Rollover Prevention
-//
-//  This option is only relevant if (SKIPS = 0).
-//
-//  If set to zero, this feature is disabled.
-//  Otherwise, the program will touch the date at roughly this interval to
-//  prevent the den from rolling over. This feature requres time-sync be disabled.
-const uint32_t TOUCH_DATE_INTERVAL  =   (uint32_t)4 * 3600 * TICKS_PER_SECOND;  //  4 hours
-
-
-
-//  Increase these if your internet is slow.
-const uint16_t CONNECT_TO_INTERNET_DELAY    =   20 * TICKS_PER_SECOND;  //  Time from "Connect to Internet" to when you're ready to enter den.
-const uint16_t ENTER_ONLINE_DEN_DELAY       =   8 * TICKS_PER_SECOND;   //  "Communicating" when entering den while online.
-const uint16_t OPEN_ONLINE_DEN_LOBBY_DELAY  =   8 * TICKS_PER_SECOND;   //  Delay from "Invite Others" to when the clock starts ticking.
-
-const uint16_t RAID_START_TO_EXIT_DELAY     =   15 * TICKS_PER_SECOND;  //  Time from start raid to reset. (when not selecting move)
-const uint16_t DELAY_TO_SELECT_MOVE         =   32 * TICKS_PER_SECOND;  //  This + RAID_START_TO_EXIT_DELAY = time from start raid to select move.
-
-
diff --git a/NativePrograms/PokemonSwSh/BallThrower.c b/NativePrograms/PokemonSwSh/BallThrower.c
deleted file mode 100644
index 626dc60e54..0000000000
--- a/NativePrograms/PokemonSwSh/BallThrower.c
+++ /dev/null
@@ -1,13 +0,0 @@
-/*  Pokemon Sword & Shield: Ball Thrower
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- *      Please refer to the user manual for instructions and documentation.
- * 
- */
-
-#include "Programs/BallThrower.h"
-
-//
-//  This program has no program-specific configurable options.
-//
diff --git a/NativePrograms/PokemonSwSh/BeamReset.c b/NativePrograms/PokemonSwSh/BeamReset.c
deleted file mode 100644
index 6288073289..0000000000
--- a/NativePrograms/PokemonSwSh/BeamReset.c
+++ /dev/null
@@ -1,21 +0,0 @@
-/*  Pokemon Sword & Shield: Beam Resetter
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- *      Please refer to the user manual for instructions and documentation.
- * 
- */
-
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-#include "Programs/BeamReset.h"
-
-
-
-//  Wait in the Home menu for this long before resetting the game.
-const uint16_t DELAY_BEFORE_RESET   =   5 * TICKS_PER_SECOND;
-
-//  Talking to the den has an extra line in German. Set this to true if this
-//  is the case.
-const bool EXTRA_LINE   =   false;
-
-
diff --git a/NativePrograms/PokemonSwSh/ClothingBuyer.c b/NativePrograms/PokemonSwSh/ClothingBuyer.c
deleted file mode 100644
index 6ff9091064..0000000000
--- a/NativePrograms/PokemonSwSh/ClothingBuyer.c
+++ /dev/null
@@ -1,15 +0,0 @@
-/*  Pokemon Sword & Shield: Clothing Buyer
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- *      Please refer to the user manual for instructions and documentation.
- * 
- */
-
-#include "Programs/ClothingBuyer.h"
-
-
-//  Rotate categories. This will allow the program to eventually buy out the
-//  entire store, but it will take a lot longer than doing separate runs on
-//  each category individually.
-const bool CATEGORY_ROTATION    =   true;
diff --git a/NativePrograms/PokemonSwSh/CurryHunter.c b/NativePrograms/PokemonSwSh/CurryHunter.c
deleted file mode 100644
index 3872915235..0000000000
--- a/NativePrograms/PokemonSwSh/CurryHunter.c
+++ /dev/null
@@ -1,21 +0,0 @@
-/*  Pokemon Sword & Shield Arduino Programs
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- *      Please refer to the user manual for instructions and documentation.
- * 
- */
-
-// This is a program that cooks curry for you and catch any Pokémon found while doing so.
-
-
-#include "Programs/CurryHunter.h"
-
-//  Wait this long for the Pokemon to walk up to you.
-const uint16_t WALK_UP_DELAY = 2 * TICKS_PER_SECOND;
-
-//  Take a video after each cooking iteration. This will spam your album with videos.
-const bool TAKE_VIDEO = false;
-
-//  Run this many iterations before stopping.
-const uint32_t ITERATIONS = 999;
diff --git a/NativePrograms/PokemonSwSh/DateSpam-BerryFarmer.c b/NativePrograms/PokemonSwSh/DateSpam-BerryFarmer.c
deleted file mode 100644
index c1f4979357..0000000000
--- a/NativePrograms/PokemonSwSh/DateSpam-BerryFarmer.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/*  Pokemon Sword & Shield: Berry Farmer
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- *      Please refer to the user manual for instructions and documentation.
- * 
- */
-
-#include "Programs/DateSpam-BerryFarmer.h"
-
-
-
-//  Grab berries this many times. You can set this number if you're also date
-//  skipping to a particular den frame and you don't want to overshoot it.
-//
-//  Be aware that this program isn't intended to be an accurate date skipper.
-//  It will occasionally miss frames causing it to fall short.
-const uint32_t SKIPS            =   100000;
-
-
-//  Save the game every this number of iterations.
-//  If set to zero, no saving is done.
-const uint16_t SAVE_ITERATIONS  =   0;
diff --git a/NativePrograms/PokemonSwSh/DateSpam-DailyHighlightFarmer.c b/NativePrograms/PokemonSwSh/DateSpam-DailyHighlightFarmer.c
deleted file mode 100644
index 434b59eecc..0000000000
--- a/NativePrograms/PokemonSwSh/DateSpam-DailyHighlightFarmer.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/*  Pokemon Sword & Shield: Crown Tundra Daily Highlight Farmer
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- *      Please refer to the user manual for instructions and documentation.
- * 
- */
-
-#include "Programs/DateSpam-DailyHighlightFarmer.h"
-
-
-
-//  Grab watts this many times. You can set this number if you're also date
-//  skipping to a particular den frame and you don't want to overshoot it.
-//
-//  Be aware that this program isn't intended to be an accurate date skipper.
-//  It will occasionally miss frames causing it to fall short.
-const uint32_t SKIPS            =   100000;
-
-
-//  Save the game every this number of iterations.
-//  If set to zero, no saving is done.
-const uint16_t SAVE_ITERATIONS  =   0;
diff --git a/NativePrograms/PokemonSwSh/DateSpam-LotoFarmer.c b/NativePrograms/PokemonSwSh/DateSpam-LotoFarmer.c
deleted file mode 100644
index f848cdba9f..0000000000
--- a/NativePrograms/PokemonSwSh/DateSpam-LotoFarmer.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/*  Pokemon Sword & Shield: Loto-ID
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- *      Please refer to the user manual for instructions and documentation.
- * 
- */
-
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-#include "Programs/DateSpam-LotoFarmer.h"
-
-
-
-//  Run Loto-ID this many times. You can set this number if you're also date
-//  skipping to a particular den frame and you don't want to overshoot it.
-//
-//  Be aware that this program isn't intended to be an accurate date skipper.
-//  It will occasionally miss frames causing it to fall short.
-const uint32_t SKIPS    =   100000;
-
-//  Mash B for this long to exit the dialog.
-//  For some languages, (like German), you may need to increase this.
-const uint16_t MASH_B_DURATION  =   9 * TICKS_PER_SECOND;
diff --git a/NativePrograms/PokemonSwSh/DateSpam-StowOnSideFarmer.c b/NativePrograms/PokemonSwSh/DateSpam-StowOnSideFarmer.c
deleted file mode 100644
index 80f375d812..0000000000
--- a/NativePrograms/PokemonSwSh/DateSpam-StowOnSideFarmer.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/*  Pokemon Sword & Shield: Stow-on-Side Bargains Dealer Farmer
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- *      Please refer to the user manual for instructions and documentation.
- * 
- */
-
-#include "Programs/DateSpam-StowOnSideFarmer.h"
-
-
-
-//  Purchase this many times. You can set this number if you're also date
-//  skipping to a particular den frame and you don't want to overshoot it.
-//
-//  Be aware that this program isn't intended to be an accurate date skipper.
-//  It will occasionally miss frames causing it to fall short.
-const uint32_t SKIPS            =   100000;
-
-
-//  Save the game every this number of iterations.
-//  If set to zero, no saving is done.
-const uint16_t SAVE_ITERATIONS  =   0;
diff --git a/NativePrograms/PokemonSwSh/DateSpam-WattFarmer.c b/NativePrograms/PokemonSwSh/DateSpam-WattFarmer.c
deleted file mode 100644
index 5e9d0d0b2f..0000000000
--- a/NativePrograms/PokemonSwSh/DateSpam-WattFarmer.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/*  Pokemon Sword & Shield: Watt Farmer
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- *      Please refer to the user manual for instructions and documentation.
- * 
- */
-
-#include "Programs/DateSpam-WattFarmer.h"
-
-
-//  Wait this long after leaving the grip menu to allow for the Switch to
-//  reestablish local connection.
-const uint16_t GRIP_MENU_WAIT   =   5 * TICKS_PER_SECOND;
-
-
-//  Grab watts this many times. You can set this number if you're also date
-//  skipping to a particular den frame and you don't want to overshoot it.
-//
-//  Be aware that this program isn't intended to be an accurate date skipper.
-//  It will occasionally miss frames causing it to fall short.
-const uint32_t SKIPS            =   33334;
-
-
-//  Save the game every this number of iterations.
-//  If set to zero, no saving is done.
-const uint16_t SAVE_ITERATIONS  =   0;
diff --git a/NativePrograms/PokemonSwSh/DaySkipperEU.c b/NativePrograms/PokemonSwSh/DaySkipperEU.c
deleted file mode 100644
index 9672f0c518..0000000000
--- a/NativePrograms/PokemonSwSh/DaySkipperEU.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/*  Pokemon Sword & Shield: EU Date Skipper (7k)
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- *      Please refer to the user manual for instructions and documentation.
- * 
- *  This is an EU version of the 7k skipper that at about 7500 skips/hour.
- * 
- *  This program is slower than the JPN skipper. So if you're doing long skips,
- *  you'll still want to change your Switch language to Japanese.
- * 
- */
-
-#include "Programs/DaySkipperEU.h"
-
-
-
-//  The maximum number of skips to perform.
-//  The actual # of skips will be lower if any errors are made.
-const uint32_t SKIPS            =   10;
-
-//  The current year in real life.
-const uint16_t REAL_LIFE_YEAR   =   2022;
-
-
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-//  Advanced Settings (you shouldn't need to change these)
-
-//  Run auto-recovery every this # of skips. Zero disables the auto-corrections.
-//  At 500, the overhead is approximately 0.5%.
-const uint16_t CORRECTION_SKIPS      =   1000;
diff --git a/NativePrograms/PokemonSwSh/DaySkipperJPN-7.8k.c b/NativePrograms/PokemonSwSh/DaySkipperJPN-7.8k.c
deleted file mode 100644
index cd9640d106..0000000000
--- a/NativePrograms/PokemonSwSh/DaySkipperJPN-7.8k.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/*  Pokemon Sword & Shield: JPN Date Skipper (7.8k)
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- *      Please refer to the user manual for instructions and documentation.
- * 
- *  This program is experimental. Instructions are the same as DaySkipperJPN
- *  except that you must set the date to January 1, 2000. The hour must be set
- *  away from the DST missing hour.
- * 
- *  This program will run at ~7800 skips/hour at full speed. It will be able to
- *  tolerate single missed skips and maintain this full speed. However, if a
- *  large error happens (such as a trapping error), it will recover, but it will
- *  only be able to run at a degraded state of ~7500/hour.
- * 
- */
-
-#include "Programs/DaySkipperJPN-7.8k.h"
-
-
-
-//  The maximum number of skips to perform.
-//  The actual # of skips will be lower if any errors are made.
-const uint32_t SKIPS = 10;
-
-//  If you don't want to start on 1/1/2000, you can set this instead.
-const Date START_DATE = {2000, 1, 1};  //  {year, month, day}
-
-
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-//  Advanced Settings (you shouldn't need to change these)
-
-//  Run auto-recovery every this # of skips. Zero disables the auto-corrections.
-//  At 500, the overhead is approximately 0.5%.
-const uint16_t CORRECTION_SKIPS      =   1000;
-
diff --git a/NativePrograms/PokemonSwSh/DaySkipperJPN.c b/NativePrograms/PokemonSwSh/DaySkipperJPN.c
deleted file mode 100644
index 14678dbff7..0000000000
--- a/NativePrograms/PokemonSwSh/DaySkipperJPN.c
+++ /dev/null
@@ -1,25 +0,0 @@
-/*  Pokemon Sword & Shield: JPN Date Skipper (7k)
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- *      Please refer to the user manual for instructions and documentation.
- * 
- */
-
-#include "Programs/DaySkipperJPN.h"
-
-
-
-//  The maximum number of skips to perform.
-//  The actual # of skips will be lower if any errors are made.
-const uint32_t SKIPS = 10;
-
-
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-//  Advanced Settings (you shouldn't need to change these)
-
-//  Run auto-recovery every this # of skips. Zero disables the auto-corrections.
-//  At 500, the overhead is approximately 0.5%.
-const uint16_t CORRECTION_SKIPS      =   1000;
-
diff --git a/NativePrograms/PokemonSwSh/DaySkipperUS.c b/NativePrograms/PokemonSwSh/DaySkipperUS.c
deleted file mode 100644
index 9bc2238831..0000000000
--- a/NativePrograms/PokemonSwSh/DaySkipperUS.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/*  Pokemon Sword & Shield: US Date Skipper (7k)
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- *      Please refer to the user manual for instructions and documentation.
- * 
- *  This is the US version of the 7k skipper that at about 7100 skips/hour.
- * 
- *  This program is slower than the JPN skipper. So if you're doing long skips,
- *  you'll still want to change your Switch language to Japanese.
- * 
- */
-
-#include "Programs/DaySkipperUS.h"
-
-
-
-//  The maximum number of skips to perform.
-//  The actual # of skips will be lower if any errors are made.
-const uint32_t SKIPS            =   10;
-
-//  The current year in real life.
-const uint16_t REAL_LIFE_YEAR   =   2022;
-
-
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-//  Advanced Settings (you shouldn't need to change these)
-
-//  Run auto-recovery every this # of skips. Zero disables the auto-corrections.
-//  At 500, the overhead is approximately 0.5%.
-const uint16_t CORRECTION_SKIPS      =   500;
-
diff --git a/NativePrograms/PokemonSwSh/DenRoller.c b/NativePrograms/PokemonSwSh/DenRoller.c
deleted file mode 100644
index 4747c0f968..0000000000
--- a/NativePrograms/PokemonSwSh/DenRoller.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/*  Pokemon Sword & Shield: Den Roller
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- *      Please refer to the user manual for instructions and documentation.
- * 
- */
-
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-#include "Programs/DenRoller.h"
-
-
-
-//  # of frames to roll.
-const uint8_t SKIPS                 =   3;
-
-//  ALWAYS_CATCHABLE    All pokemon in this den are catchable.
-//  MAYBE_UNCATCHABLE   There may be uncatchable pokemon.
-const Catchability CATCHABILITY     =   ALWAYS_CATCHABLE;
-
-//  View the rolled pokemon for this long before resetting.
-const uint16_t VIEW_TIME            =   5 * TICKS_PER_SECOND;
-
-
diff --git a/NativePrograms/PokemonSwSh/EggCombined2.c b/NativePrograms/PokemonSwSh/EggCombined2.c
deleted file mode 100644
index 455d82357d..0000000000
--- a/NativePrograms/PokemonSwSh/EggCombined2.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/*  Pokemon Sword & Shield: Combined Egg Fetcher+Hatcher
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- *      Please refer to the user manual for instructions and documentation.
- * 
- */
-
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-#include "Programs/EggCombined2.h"
-
-
-
-const uint8_t   BOXES_TO_HATCH      =   32;
-const uint16_t  STEPS_TO_HATCH      =   5120;   //  Lookup the # of steps on Serebii.
-
-
-//  For each batch of eggs, attempt this many egg fetches.
-//
-//  This parameter works by dividing the incubation time by the # of fetch
-//  attempts and doing a fetch at this interval. Therefore increasing this
-//  number will decrease the time between fetches which also decreases the
-//  chance of successfully fetching an egg. The optimal value is difficult to
-//  determine and is dependent on many factors.
-//
-//  For fast hatching eggs like Magikarp, you may need to decrease this number
-//  to as low as 1 or 2. This implies that it's impossible for fetching to keep
-//  pace with hatching as is the case with manual hatching anyway.
-//
-//  The program will automatically reduce this number if it determines that it
-//  is too large to function correctly.
-//
-//  If this is set to a non-integer, the program will vary the # of fetches
-//  across batches so that they average out to the specified number.
-//
-const float FETCHES_PER_BATCH       =   6.0;
-
-
-//  Rollover Prevention
-//
-//  Prevent a den from rolling over by periodically touching the date.
-//
-//  If set to zero, this feature is disabled.
-//  Otherwise, the program will touch the date at roughly this interval to
-//  prevent a den from rolling over. This feature requres time-sync be disabled.
-const uint32_t TOUCH_DATE_INTERVAL  =   (uint32_t)4 * 3600 * TICKS_PER_SECOND;  //  4 hours
-
-
-
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-//  Advanced Settings (you shouldn't need to change these)
-
-//  Additional time added to the spinning. If any shinies are hatched, they will
-//  eat into this safety buffer along with any other unexpected slowdowns.
-//  Hatching a shiny takes 2 seconds longer than a non-shiny.
-//
-//  If you see that the program is going into Y-COMM or there is less than 5
-//  seconds of extra spinning after the last egg in the batch, please report
-//  this as a bug. As a temporary work-around, you can increase this number.
-const uint16_t SAFETY_TIME          =   12 * TICKS_PER_SECOND;
-
-//  Eggs will not hatch early by more than this period.
-const uint16_t EARLY_HATCH_SAFETY   =   5 * TICKS_PER_SECOND;
-
-//  Total animation time for hatching 5 eggs when there are no shinies.
-const uint16_t HATCH_DELAY          =   88 * TICKS_PER_SECOND;
diff --git a/NativePrograms/PokemonSwSh/EggFetcher2.c b/NativePrograms/PokemonSwSh/EggFetcher2.c
deleted file mode 100644
index 571e53411d..0000000000
--- a/NativePrograms/PokemonSwSh/EggFetcher2.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/*  Pokemon Sword & Shield: Egg Fetcher
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- *      Please refer to the user manual for instructions and documentation.
- * 
- */
-
-#include "Programs/EggFetcher2.h"
-
-
-
-//  Fetch this many times. This puts a limit on how many eggs you can get so
-//  you don't make a mess of your boxes for fetching too many.
-const uint16_t MAX_FETCH_ATTEMPTS = 2000;
-
-
diff --git a/NativePrograms/PokemonSwSh/EggHatcher.c b/NativePrograms/PokemonSwSh/EggHatcher.c
deleted file mode 100644
index 57ee08aa79..0000000000
--- a/NativePrograms/PokemonSwSh/EggHatcher.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/*  Pokemon Sword & Shield: Egg Hatcher
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- *      Please refer to the user manual for instructions and documentation.
- * 
- */
-
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-#include "Programs/EggHatcher.h"
-
-
-
-const uint8_t   BOXES_TO_HATCH      =   3;
-const uint16_t  STEPS_TO_HATCH      =   5120;   //  Lookup the # of steps on Serebii.
-
-
-
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-//  Advanced Settings (you shouldn't need to change these)
-
-//  Additional time added to the spinning. If any shinies are hatched, they will
-//  eat into this safety buffer along with any other unexpected slowdowns.
-//  Hatching a shiny takes 2 seconds longer than a non-shiny.
-//
-//  If you see that the program is going into Y-COMM or there is less than 5
-//  seconds of extra spinning after the last egg in the batch, please report
-//  this as a bug. As a temporary work-around, you can increase this number.
-const uint16_t SAFETY_TIME      =   12 * TICKS_PER_SECOND;
-
-//  Total animation time for hatching 5 eggs when there are no shinies.
-const uint16_t HATCH_DELAY      =   88 * TICKS_PER_SECOND;
-
-
diff --git a/NativePrograms/PokemonSwSh/EggSuperCombined2.c b/NativePrograms/PokemonSwSh/EggSuperCombined2.c
deleted file mode 100644
index 93b929fbb5..0000000000
--- a/NativePrograms/PokemonSwSh/EggSuperCombined2.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/*  Pokemon Sword & Shield: Combined Egg Fetcher+Hatcher with Mass Release
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- *      Please refer to the user manual for instructions and documentation.
- * 
- */
-
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-#include "Programs/EggSuperCombined2.h"
-
-
-
-//  Start by releasing this many boxes. All boxes must be completely filled with
-//  releasable pokemon.
-const uint8_t   BOXES_TO_RELEASE    =   2;
-
-//  After you finish releasing boxes, skip this many boxes.
-const uint8_t   BOXES_TO_SKIP       =   1;
-
-//  Proceed to run EggCombined for this many boxes.
-const uint8_t   BOXES_TO_HATCH      =   31;
-const uint16_t  STEPS_TO_HATCH      =   5120;   //  Lookup the # of steps on Serebii.
-
-
-//  For each batch of eggs, attempt this many egg fetches.
-//
-//  This parameter works by dividing the incubation time by the # of fetch
-//  attempts and doing a fetch at this interval. Therefore increasing this
-//  number will decrease the time between fetches which also decreases the
-//  chance of successfully fetching an egg. The optimal value is difficult to
-//  determine and is dependent on many factors.
-//
-//  For fast hatching eggs like Magikarp, you may need to decrease this number
-//  to as low as 1 or 2. This implies that it's impossible for fetching to keep
-//  pace with hatching as is the case with manual hatching anyway.
-//
-//  The program will automatically reduce this number if it determines that it
-//  is too large to function correctly.
-//
-//  If this is set to a non-integer, the program will vary the # of fetches
-//  across batches so that they average out to the specified number.
-//
-const float FETCHES_PER_BATCH     =   6.0;
-
-
-//  Rollover Prevention
-//
-//  Prevent a den from rolling over by periodically touching the date.
-//
-//  If set to zero, this feature is disabled.
-//  Otherwise, the program will touch the date at roughly this interval to
-//  prevent a den from rolling over. This feature requres time-sync be disabled.
-const uint32_t TOUCH_DATE_INTERVAL  =   (uint32_t)4 * 3600 * TICKS_PER_SECOND;  //  4 hours
-
-
-
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-//  Advanced Settings (you shouldn't need to change these)
-
-//  Additional time added to the spinning. If any shinies are hatched, they will
-//  eat into this safety buffer along with any other unexpected slowdowns.
-//  Hatching a shiny takes 2 seconds longer than a non-shiny.
-//
-//  If you see that the program is going into Y-COMM or there is less than 5
-//  seconds of extra spinning after the last egg in the batch, please report
-//  this as a bug. As a temporary work-around, you can increase this number.
-const uint16_t SAFETY_TIME          =   12 * TICKS_PER_SECOND;
-
-//  Eggs will not hatch early by more than this period.
-const uint16_t EARLY_HATCH_SAFETY   =   5 * TICKS_PER_SECOND;
-
-//  Total animation time for hatching 5 eggs when there are no shinies.
-const uint16_t HATCH_DELAY          =   88 * TICKS_PER_SECOND;
-
-
diff --git a/NativePrograms/PokemonSwSh/EventBeamFinder.c b/NativePrograms/PokemonSwSh/EventBeamFinder.c
deleted file mode 100644
index b7b75790a7..0000000000
--- a/NativePrograms/PokemonSwSh/EventBeamFinder.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/*  Pokemon Sword & Shield: Event Beam Finder
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- *      Please refer to the user manual for instructions and documentation.
- * 
- */
-
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-#include "Programs/EventBeamFinder.h"
-
-
-
-//  View the den for this duration before moving on.
-const uint16_t WAIT_TIME_IN_DEN = 5 * TICKS_PER_SECOND;
-
-
diff --git a/NativePrograms/PokemonSwSh/FastCodeEntry.c b/NativePrograms/PokemonSwSh/FastCodeEntry.c
deleted file mode 100644
index 2f09edf0e9..0000000000
--- a/NativePrograms/PokemonSwSh/FastCodeEntry.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*  Pokemon Sword & Shield: Fast Code Entry
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- *      Please refer to the user manual for instructions and documentation.
- * 
- */
-
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-#include "Programs/FastCodeEntry.h"
-
-
-
-//  Raid Code
-const char* RAID_CODE = "9107 3091";
-
-//  Wait this long before entering the code.
-const uint16_t INITIAL_DELAY = 0 * TICKS_PER_SECOND;
diff --git a/NativePrograms/PokemonSwSh/GodEggDuplication.c b/NativePrograms/PokemonSwSh/GodEggDuplication.c
deleted file mode 100644
index 8216c666b3..0000000000
--- a/NativePrograms/PokemonSwSh/GodEggDuplication.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/*  Pokemon Sword & Shield: God Egg Duplication
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- *      Please refer to the user manual for instructions and documentation.
- * 
- *  Actually no, you can't refer to the user manual. This program is developer
- *  only since it encourages behavior that we don't want.
- * 
- *  This program is almost identical to GodEggItemDupe, except that it doesn't
- *  detach the items or release the Pokemon.
- * 
- */
-
-#include "Programs/GodEggDuplication.h"
-
-
-
-//  Fetch this many times. This puts a limit on how many Pokemon you can clone
-//  so you don't make a mess of your boxes for cloning too many.
-const uint16_t MAX_FETCH_ATTEMPTS = 2000;
-
-
-
-//  Round-robin through this many party pokemon. You can clone up to 6 different
-//  Pokemon in the same run.
-//
-//  If set to 1, it will only clone the 1st party member.
-//  If set to 2, it will alternate cloning the 1st and 2nd party members.
-//  If set to N, it will clone the 1st N members in your party in a round-robin fashion.
-//
-//  This option doesn't increase the speed of the duplication. It merely gives
-//  you more variety.
-const uint8_t PARTY_ROUND_ROBIN     =   6;
-
-
diff --git a/NativePrograms/PokemonSwSh/GodEggItemDupe.c b/NativePrograms/PokemonSwSh/GodEggItemDupe.c
deleted file mode 100644
index ea389605b9..0000000000
--- a/NativePrograms/PokemonSwSh/GodEggItemDupe.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/*  Pokemon Sword & Shield: God Egg Item Duplication
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- *      Please refer to the user manual for instructions and documentation.
- * 
- */
-
-#include "Programs/GodEggItemDupe.h"
-
-
-
-//  Fetch this many times.
-const uint16_t MAX_FETCH_ATTEMPTS = 10000;
-
-
-//  Round-robin through this many party pokemon. By attaching different items
-//  to different pokemon in your party, you can duplicate different items in the
-//  same run. Thus it can clone up to 6 different items in each run.
-//
-//  If set to 1, it will only clone the item held by the 1st party member.
-//  If set to 2, it will alternate cloning items held by the 1st and 2nd party members.
-//  If set to N, it will clone the items held by the 1st N members in your party
-//  in a round-robin fashion.
-//
-//  This option doesn't increase the speed of the item duplication. It merely
-//  gives you more variety. If you run the program unattended overnight, you may
-//  get around 300 of the same item. By setting this parameter, you can instead
-//  get 50 of 6 different items.
-const uint8_t PARTY_ROUND_ROBIN     =   6;
-
-
-//  When you release a pokemon, the item automatically detaches and goes to your
-//  inventory. But certain items (like Rusted Sword/Shield) will prevent you
-//  from releasing the Pokemon. If you are duplicating such items, you must set
-//  this to true.
-const bool DETACH_BEFORE_RELEASE    =   false;
-
-
diff --git a/NativePrograms/PokemonSwSh/Libraries/PokemonSwSh_Settings.h b/NativePrograms/PokemonSwSh/Libraries/PokemonSwSh_Settings.h
deleted file mode 100644
index c6f6bb6cc5..0000000000
--- a/NativePrograms/PokemonSwSh/Libraries/PokemonSwSh_Settings.h
+++ /dev/null
@@ -1,145 +0,0 @@
-/*  Settings
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_Settings_H
-#define PokemonAutomation_PokemonSwSh_Settings_H
-
-#include <stdbool.h>
-#include <stdint.h>
-
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-//  Egg Options
-
-//  true    =   Send Pokemon to boxes is "Automatic".
-//  false   =   Send Pokemon to boxes is "Manual".
-extern bool PokemonSwSh_AUTO_DEPOSIT;
-
-//  The daycare lady has an extra line of text in Japanese. Set this to true if
-//  you are running any of the egg programs in a Japanese game.
-extern bool PokemonSwSh_EGG_FETCH_EXTRA_LINE;
-
-//  Time needed to mash B to fetch an egg and return to overworld when
-//  auto-deposit is off.
-extern uint16_t PokemonSwSh_FETCH_EGG_MASH_DELAY;
-
-
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-//  Den Options
-
-typedef enum{
-    ALWAYS_CATCHABLE,
-    MAYBE_UNCATCHABLE,
-    ALWAYS_UNCATCHABLE,
-} Catchability;
-
-//  Which method to use to bypass the uncatchable Pokemon prompt?
-//      true    =   Use a fast (but potentially unreliable) method.
-//      false   =   Use a slower (by about 5 seconds) method.
-extern bool PokemonSwSh_DODGE_UNCATCHABLE_PROMPT_FAST;
-
-
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-//  Advanced Options
-
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-//  General Timings
-
-//  Time to accept FRs before returning to den lobby.
-extern uint16_t PokemonSwSh_AUTO_FR_DURATION;
-
-
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-//  Menu Navigation Timings
-
-//  Delay to bring up the menu when pressing X in the overworld.
-extern uint16_t PokemonSwSh_OVERWORLD_TO_MENU_DELAY;
-
-//  Delay to go from menu back to overworld.
-extern uint16_t PokemonSwSh_MENU_TO_OVERWORLD_DELAY;
-
-//  Delay from pressing home to entering the the Switch home menu.
-//  This affects the speed of date-spamming programs (i.e. watt farmer)
-extern uint16_t PokemonSwSh_GAME_TO_HOME_DELAY_FAST;
-extern uint16_t PokemonSwSh_GAME_TO_HOME_DELAY_SAFE;
-
-//  Delay to enter game from home menu.
-extern uint16_t PokemonSwSh_HOME_TO_GAME_DELAY;
-
-//  Time needed to open Y-COMM.
-extern uint16_t PokemonSwSh_OPEN_YCOMM_DELAY;
-
-//  Delay to enter your Switch profile.
-extern uint16_t PokemonSwSh_ENTER_PROFILE_DELAY;
-
-
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-//  Start Game Timings
-
-//  Delays to start and enter the game when it isn't running.
-extern uint16_t PokemonSwSh_START_GAME_MASH;  //  1. Mash A for this long to start the game.
-extern uint16_t PokemonSwSh_START_GAME_WAIT;  //  2. Wait this long for the game to load.
-extern uint16_t PokemonSwSh_ENTER_GAME_MASH;  //  3. Mash A for this long to enter the game.
-extern uint16_t PokemonSwSh_ENTER_GAME_WAIT;  //  4. Wait this long for the game to fully load into the overworld.
-
-
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-//  Den Timings
-
-//  Time needed to enter a den on final button press.
-extern uint16_t PokemonSwSh_ENTER_OFFLINE_DEN_DELAY;
-
-//  Time from exiting den after a day-skip to when you can collect watts and re-enter it.
-extern uint16_t PokemonSwSh_REENTER_DEN_DELAY;
-
-//  Time needed to collect watts.
-extern uint16_t PokemonSwSh_COLLECT_WATTS_OFFLINE_DELAY;
-extern uint16_t PokemonSwSh_COLLECT_WATTS_ONLINE_DELAY;
-
-//  Time needed to bypass uncatchable pokemon prompt.
-extern uint16_t PokemonSwSh_UNCATCHABLE_PROMPT_DELAY;
-
-//  Time needed to open a den lobby on local connection.
-extern uint16_t PokemonSwSh_OPEN_LOCAL_DEN_LOBBY_DELAY;
-
-//  Time needed to enter Switch Pokemon.
-extern uint16_t PokemonSwSh_ENTER_SWITCH_POKEMON;
-
-//  Time needed to exit Switch Pokemon back to den lobby.
-extern uint16_t PokemonSwSh_EXIT_SWITCH_POKEMON;
-
-//  Always 3 minutes.
-extern uint16_t PokemonSwSh_FULL_LOBBY_TIMER;
-
-
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-//  Box Timings (for egg programs)
-
-extern uint16_t PokemonSwSh_BOX_SCROLL_DELAY;         //  Delay to move the cursor.
-extern uint16_t PokemonSwSh_BOX_CHANGE_DELAY;         //  Delay to change boxes.
-extern uint16_t PokemonSwSh_BOX_PICKUP_DROP_DELAY;    //  Delay to pickup/drop pokemon.
-
-extern uint16_t PokemonSwSh_MENU_TO_POKEMON_DELAY;    //  Delay to enter Pokemon menu.
-extern uint16_t PokemonSwSh_POKEMON_TO_BOX_DELAY;     //  Delay to enter box system.
-extern uint16_t PokemonSwSh_BOX_TO_POKEMON_DELAY;     //  Delay to exit box system.
-extern uint16_t PokemonSwSh_POKEMON_TO_MENU_DELAY;    //  Delay to return to menu.
-
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-#endif
diff --git a/NativePrograms/PokemonSwSh/MassRelease.c b/NativePrograms/PokemonSwSh/MassRelease.c
deleted file mode 100644
index 01d0482726..0000000000
--- a/NativePrograms/PokemonSwSh/MassRelease.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/*  Pokemon Sword & Shield: Mass Release
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- *      Please refer to the user manual for instructions and documentation.
- * 
- */
-
-#include "Programs/MassRelease.h"
-
-
-
-//  # of boxes to release.
-const uint8_t BOXES_TO_RELEASE  =   2;
-
-
-//  Set this to true if the system update window is up and you don't want to
-//  update yet.
-const bool DODGE_SYSTEM_UPDATE_WINDOW   =   false;
-
diff --git a/NativePrograms/PokemonSwSh/MultiGameFossil.c b/NativePrograms/PokemonSwSh/MultiGameFossil.c
deleted file mode 100644
index a1dfaf85e1..0000000000
--- a/NativePrograms/PokemonSwSh/MultiGameFossil.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/*  Pokemon Sword & Shield: Beam Resetter
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- *      Please refer to the user manual for instructions and documentation.
- * 
- */
-
-#include "Programs/MultiGameFossil.h"
-
-
-
-//
-//  The list of participating saves. Each entry in the array will have 4 parameters:
-//
-//  Parameter 1:    Game slot at start of program. (must be 1 or 2)
-//  Parameter 2:    The slot # of the user. (1 is the left-most user, 2 is the 2nd-to-left, etc...)
-//  Parameter 3:    Dracozolt, Arctozolt, Dracovish, or Arctovish
-//  Parameter 4:    The number of revives to perform.
-//
-const Batch BATCH[] = {
-    {1, 3, Arctozolt, 960},
-    {1, 6, Dracovish, 960},
-
-
-    //  DO NOT DELETE THIS
-    {0},
-};
-
-
diff --git a/NativePrograms/PokemonSwSh/PokemonSwSh_Settings.c b/NativePrograms/PokemonSwSh/PokemonSwSh_Settings.c
deleted file mode 100644
index 5a2e97ea61..0000000000
--- a/NativePrograms/PokemonSwSh/PokemonSwSh_Settings.c
+++ /dev/null
@@ -1,146 +0,0 @@
-/*  Settings
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- * 
- *  These are global setting shared by all programs.
- * 
- *  You shouldn't need to change any of the timing settings unless you are
- *  encountering problems.
- * 
- */
-
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-#include "Libraries/PokemonSwSh_Settings.h"
-
-
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-//  Egg Options
-
-//  true    =   Send Pokemon to boxes is "Automatic".
-//  false   =   Send Pokemon to boxes is "Manual".
-bool PokemonSwSh_AUTO_DEPOSIT               =   true;
-
-//  The daycare lady has an extra line of text in Japanese. Set this to true if
-//  you are running any of the egg programs in a Japanese game.
-bool PokemonSwSh_EGG_FETCH_EXTRA_LINE       =   false;
-
-//  Time needed to mash B to fetch an egg and return to overworld when
-//  auto-deposit is off.
-uint16_t PokemonSwSh_FETCH_EGG_MASH_DELAY   =   800;
-
-
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-//  Den Options
-
-//  Which method to use to bypass the uncatchable Pokemon prompt?
-//      true    =   Use a fast (but potentially unreliable) method.
-//      false   =   Use a slower (by about 5 seconds) method.
-bool PokemonSwSh_DODGE_UNCATCHABLE_PROMPT_FAST      =   false;
-
-
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-//  Advanced Options
-//
-//  You really shouldn't need to touch anything from here on down unless you are
-//  encountering problems and are trying to debug it yourself.
-//
-
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-//  General Timings
-
-//  Time to accept FRs before returning to den lobby.
-uint16_t PokemonSwSh_AUTO_FR_DURATION                   =   8 * TICKS_PER_SECOND;
-
-
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-//  Menu Navigation Timings
-
-//  Delay to bring up the menu when pressing X in the overworld.
-uint16_t PokemonSwSh_OVERWORLD_TO_MENU_DELAY            =   120;
-
-//  Delay to go from menu back to overworld.
-uint16_t PokemonSwSh_MENU_TO_OVERWORLD_DELAY            =   250;
-
-//  Delay from pressing home to entering the the Switch home menu.
-//  This affects the speed of date-spamming programs (i.e. watt farmer)
-uint16_t PokemonSwSh_GAME_TO_HOME_DELAY_FAST            =   100;
-uint16_t PokemonSwSh_GAME_TO_HOME_DELAY_SAFE            =   125;
-
-
-//  Delay to enter game from home menu.
-uint16_t PokemonSwSh_HOME_TO_GAME_DELAY                 =   3 * TICKS_PER_SECOND;
-
-//  Time needed to open Y-COMM.
-uint16_t PokemonSwSh_OPEN_YCOMM_DELAY                   =   200;
-
-//  Delay to enter your Switch profile.
-uint16_t PokemonSwSh_ENTER_PROFILE_DELAY                =   2 * TICKS_PER_SECOND;
-
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-//  Start Game Timings
-
-//  Delays to start and enter the game when it isn't running.
-uint16_t PokemonSwSh_START_GAME_MASH                    =   2 * TICKS_PER_SECOND;   //  1. Mash A for this long to start the game.
-uint16_t PokemonSwSh_START_GAME_WAIT                    =   20 * TICKS_PER_SECOND;  //  2. Wait this long for the game to load.
-uint16_t PokemonSwSh_ENTER_GAME_MASH                    =   3 * TICKS_PER_SECOND;   //  3. Mash A for this long to enter the game.
-uint16_t PokemonSwSh_ENTER_GAME_WAIT                    =   11 * TICKS_PER_SECOND;  //  4. Wait this long for the game to enter the overworld.
-
-
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-//  Den Timings
-
-//  Time needed to enter a den on final button press.
-uint16_t PokemonSwSh_ENTER_OFFLINE_DEN_DELAY        =   125;
-
-//  Time from exiting den after a day-skip to when you can collect watts and re-enter it.
-uint16_t PokemonSwSh_REENTER_DEN_DELAY              =   5 * TICKS_PER_SECOND;
-
-//  Time needed to collect watts.
-uint16_t PokemonSwSh_COLLECT_WATTS_OFFLINE_DELAY    =   80;
-uint16_t PokemonSwSh_COLLECT_WATTS_ONLINE_DELAY     =   3 * TICKS_PER_SECOND;
-
-//  Time needed to bypass uncatchable pokemon prompt.
-uint16_t PokemonSwSh_UNCATCHABLE_PROMPT_DELAY       =   110;
-
-//  Time needed to open a den lobby on local connection.
-uint16_t PokemonSwSh_OPEN_LOCAL_DEN_LOBBY_DELAY     =   3 * TICKS_PER_SECOND;
-
-//  Time needed to enter Switch Pokemon.
-uint16_t PokemonSwSh_ENTER_SWITCH_POKEMON           =   4 * TICKS_PER_SECOND;
-
-//  Time needed to exit Switch Pokemon back to den lobby.
-uint16_t PokemonSwSh_EXIT_SWITCH_POKEMON            =   3 * TICKS_PER_SECOND;
-
-//  Always 3 minutes.
-uint16_t PokemonSwSh_FULL_LOBBY_TIMER               =   180 * TICKS_PER_SECOND;
-
-
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-//  Box Timings (for egg programs)
-
-uint16_t PokemonSwSh_BOX_SCROLL_DELAY           =    20;     //  Delay to move the cursor.
-uint16_t PokemonSwSh_BOX_CHANGE_DELAY           =    80;     //  Delay to change boxes.
-uint16_t PokemonSwSh_BOX_PICKUP_DROP_DELAY      =    90;     //  Delay to pickup/drop pokemon.
-
-uint16_t PokemonSwSh_MENU_TO_POKEMON_DELAY      =    300;    //  Delay to enter Pokemon menu.
-uint16_t PokemonSwSh_POKEMON_TO_BOX_DELAY       =    300;    //  Delay to enter box system.
-uint16_t PokemonSwSh_BOX_TO_POKEMON_DELAY       =    250;    //  Delay to exit box system.
-uint16_t PokemonSwSh_POKEMON_TO_MENU_DELAY      =    250;    //  Delay to return to menu.
-
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
diff --git a/NativePrograms/PokemonSwSh/ProgramList.txt b/NativePrograms/PokemonSwSh/ProgramList.txt
deleted file mode 100644
index 6f9455198d..0000000000
--- a/NativePrograms/PokemonSwSh/ProgramList.txt
+++ /dev/null
@@ -1,50 +0,0 @@
-
----- General ----
-MassRelease
-SurpriseTrade
-TradeBot
-ClothingBuyer
-BallThrower
-
----- Date-Spam Farmers ----
-DateSpam-WattFarmer
-DateSpam-BerryFarmer
-DateSpam-LotoFarmer
-DateSpam-StowOnSideFarmer
-DateSpam-DailyHighlightFarmer
-
----- Den Hunting ----
-BeamReset
-EventBeamFinder
-DaySkipperJPN
-DaySkipperEU
-DaySkipperUS
-DaySkipperJPN-7.8k
-
----- Hosting ----
-DenRoller
-AutoHost-Rolling
-AutoHost-MultiGame
-
----- Unattended Shiny Hunting ----
-MultiGameFossil
-ShinyHunt-Regi
-ShinyHunt-SwordsOfJustice
-ShinyHuntUnattended-Regi
-ShinyHuntUnattended-SwordsOfJustice
-ShinyHuntUnattended-StrongSpawn
-ShinyHuntUnattended-Regigigas
-ShinyHuntUnattended-Regigigas2
-ShinyHuntUnattended-IoATrade
-CurryHunter
-
----- Eggs ----
-EggFetcher2
-EggHatcher
-EggCombined2
-EggSuperCombined2
-
----- Forbidden Programs ----
-FastCodeEntry
-GodEggDuplication
-GodEggItemDupe
diff --git a/NativePrograms/PokemonSwSh/Programs/AutoHost-MultiGame.h b/NativePrograms/PokemonSwSh/Programs/AutoHost-MultiGame.h
deleted file mode 100644
index 0c0fb2922a..0000000000
--- a/NativePrograms/PokemonSwSh/Programs/AutoHost-MultiGame.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/*  Pokemon Sword & Shield Arduino Programs
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- */
-
-#include <avr/pgmspace.h>
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-
-
-//  Raid Code
-//      No code:            RANDOM_DIGITS = 0       RAID_CODE = ""
-//      Fixed code:         RANDOM_DIGITS = 0       RAID_CODE = "12345678"
-//      Random Code:        RANDOM_DIGITS = 4       RAID_CODE = "12345678"
-//
-//  "RANDOM_DIGITS" specifies how many of the first digits are randomized.
-//  If it is less than 8, the remaining digits will be copies of the last digit.
-//  This makes it easier to enter the code.
-//
-//  When using random codes, "RAID_CODE" is used to generate the starting seed.
-extern const uint8_t RANDOM_DIGITS;
-extern const char* RAID_CODE;
-
-
-//  General Settings
-extern const bool HOST_ONLINE;              //  true = host online, false = host offline
-extern const uint16_t LOBBY_WAIT_DELAY;     //  3:00 - 60 secs = 2:00
-
-
-//  Game List
-#if 0
-typedef struct{
-    //  This is what the struct is supposed to look like. (9 bytes)
-
-    uint8_t game_slot;          //  Game slot at start of program. (must be 1 or 2)
-    uint8_t user_slot;          //  User # to host from.
-
-    bool backup_save;           //  Load backup save instead of normal reset.
-    bool always_catchable;      //  Pokemon in this den are always catchable.
-
-    bool accept_FRs;            //  Pokemon in this den are always catchable.
-
-    uint8_t skips;              //  # of frame skips to roll before hosting.
-    bool accept_FRs;            //  Accept friend requests.
-
-    uint8_t move_slot;          //  If 0, don't select a move. Otherwise select this move slot.
-    bool dynamax;               //  If 1st move select is enabled, dynamax as well.
-
-    uint16_t post_raid_delay;   //  Extra wait time after each raid.
-} RollingAutoHostSlot;
-#else
-typedef struct{
-    //  Here's the compressed version. (4 bytes)
-
-    uint8_t game_slot     : 2;      //  Game slot at start of program. (must be 1 or 2)
-    uint8_t user_slot     : 4;      //  User # to host from.
-
-    bool backup_save      : 1;      //  Load backup save instead of normal reset.
-    bool always_catchable : 1;      //  Pokemon in this den are always catchable.
-
-    uint8_t skips         : 3;      //  # of frame skips to roll before hosting.
-    bool accept_FRs       : 1;      //  Accept friend requests.
-
-    uint8_t move_slot     : 3;      //  If 0, don't select a move. Otherwise select this move slot.
-    bool dynamax          : 1;      //  If 1st move select is enabled, dynamax as well.
-
-    uint16_t post_raid_delay;       //  Extra wait time after each raid.
-} RollingAutoHostSlot;
-#endif
-extern const RollingAutoHostSlot PROGMEM GAME_LIST[];
-
-
-//  Accept FRs this many games into the future.
-//      0   Accept FRs for the game that's currently being hosted.
-//      1   Accept FRs for the next game that will be hosted.
-//      2   Accept FRs for the game that will be hosted 2 from now.
-//      3   ...
-extern const uint8_t FR_FORWARD_ACCEPT;
-
-
-//  Rollover Prevention
-//
-//  This option is only relevant if all dens being hosted have (skips = 0).
-//
-//  If set to zero, this feature is disabled.
-//  Otherwise, the program will touch the date at roughly this interval to
-//  prevent the den from rolling over. This feature requres time-sync be disabled.
-extern const uint32_t TOUCH_DATE_INTERVAL;
-
-
-
-//  Increase these if your internet is slow.
-extern const uint16_t CONNECT_TO_INTERNET_DELAY;    //  Time from "Connect to Internet" to when you're ready to enter den.
-extern const uint16_t ENTER_ONLINE_DEN_DELAY;       //  "Communicating" when entering den while online.
-extern const uint16_t START_RAID_DELAY;             //  Delay from "Invite Others" to when the clock starts ticking.
-
-extern const uint16_t RAID_START_TO_EXIT_DELAY;     //  Time from start raid to reset. (when not selecting move)
-extern const uint16_t DELAY_TO_SELECT_MOVE;         //  This + RAID_START_TO_EXIT_DELAY = time from start raid to select move.
-
-
diff --git a/NativePrograms/PokemonSwSh/Programs/AutoHost-Rolling.h b/NativePrograms/PokemonSwSh/Programs/AutoHost-Rolling.h
deleted file mode 100644
index 8ab48de016..0000000000
--- a/NativePrograms/PokemonSwSh/Programs/AutoHost-Rolling.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/*  Pokemon Sword & Shield Arduino Programs
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- */
-
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-#include "NativePrograms/PokemonSwSh/Libraries/PokemonSwSh_Settings.h"
-
-
-//  Raid Code
-//      No code:            RANDOM_DIGITS = 0       RAID_CODE = ""
-//      Fixed code:         RANDOM_DIGITS = 0       RAID_CODE = "12345678"
-//      Random Code:        RANDOM_DIGITS = 4       RAID_CODE = "12345678"
-//
-//  "RANDOM_DIGITS" specifies how many of the first digits are randomized.
-//  If it is less than 8, the remaining digits will be copies of the last digit.
-//  This makes it easier to enter the code.
-//
-//  When using random codes, "RAID_CODE" is used to generate the starting seed.
-extern const uint8_t RANDOM_DIGITS;
-extern const char* RAID_CODE;
-
-
-//  General Settings
-extern const uint8_t SKIPS;                 //  Set to 0 if hard-locked on desired frame.
-extern const bool HOST_ONLINE;              //  true = host online, false = host offline
-extern const uint16_t LOBBY_WAIT_DELAY;     //  3:00 - 60 secs = 2:00
-
-
-//  Backup Save: (for soft-lock hosting)
-//      If set to true, the game will load backup save upon soft-reset.
-//  The idea here is to roll forward from the save frame to the shiny frame.
-//  Once on the shiny frame (with the desired softlock), you enter and exit the
-//  camp to setup a backup save on the shiny frame. That way, you can load the
-//  backup save on the shiny frame while leaving the real save safely 3 or more
-//  frames before.
-//
-//  This option only makes sense when SKIPS = 0.
-extern const bool BACKUP_SAVE;
-
-
-//  ALWAYS_CATCHABLE    All pokemon in this den are catchable.
-//  MAYBE_UNCATCHABLE   There may be uncatchable pokemon.
-extern const Catchability CATCHABILITY;
-
-
-//  Friend-Request Accepting:
-//      0   =   Disabled. Do not automatically accept friend requests.
-//      #   =   Automatically accept friend requests for the N'th user.
-//
-//  This number is the slot position of the user at the top of the Home menu.
-//  The left-most user is slot 1. This option only works if "HOST_ONLINE" is true.
-//
-//  Friend accepting is done while waiting in the raid lobby. Therefore it does
-//  not slow down the program.
-extern const uint8_t FRIEND_ACCEPT_USER_SLOT;
-
-
-//  Additional Raid Delay:
-//      If you are farming a pokemon and the time between raids is too short to
-//  join consecutive raids, use this to add time between raids. This extra wait
-//  time is done after the code is entered, but before opening the lobby.
-extern const uint16_t EXTRA_DELAY_BETWEEN_RAIDS;
-
-
-//  Select 1st Move:
-//      MOVE_SLOT   =   0   Do not select a move for first turn.
-//      MOVE_SLOT   =   #   Select this move for the first turn.
-extern const uint8_t MOVE_SLOT;
-extern const bool DYNAMAX;          //  Must set to false if you cannot dmax.
-extern const uint8_t TROLL_HOSTING; //  0 disables the troll hosting option, 1 attacks the first ally, 2 attacks the second one, 3 attacks the third one. Dynamaxing will disable this option.
-
-
-//  Alternate Games: (experimental feature)
-//      If set to true, alternate between games 1 and 2.
-//  Basically if you have both Sword and Shield on the same user and you wish
-//  to host dens on both with the same settings.
-extern const bool ALTERNATE_GAMES;
-
-
-//  Rollover Prevention
-//
-//  This option is only relevant if (SKIPS = 0).
-//
-//  If set to zero, this feature is disabled.
-//  Otherwise, the program will touch the date at roughly this interval to
-//  prevent the den from rolling over. This feature requres time-sync be disabled.
-extern const uint32_t TOUCH_DATE_INTERVAL;
-
-
-
-//  Increase these if your internet is slow.
-extern const uint16_t CONNECT_TO_INTERNET_DELAY;    //  Time from "Connect to Internet" to when you're ready to enter den.
-extern const uint16_t ENTER_ONLINE_DEN_DELAY;       //  "Communicating" when entering den while online.
-extern const uint16_t START_RAID_DELAY;             //  Delay from "Invite Others" to when the clock starts ticking.
-
-extern const uint16_t RAID_START_TO_EXIT_DELAY;     //  Time from start raid to reset. (when not selecting move)
-extern const uint16_t DELAY_TO_SELECT_MOVE;         //  This + RAID_START_TO_EXIT_DELAY = time from start raid to select move.
-
-
diff --git a/NativePrograms/PokemonSwSh/Programs/BallThrower.h b/NativePrograms/PokemonSwSh/Programs/BallThrower.h
deleted file mode 100644
index f67a476d7e..0000000000
--- a/NativePrograms/PokemonSwSh/Programs/BallThrower.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/*  Pokemon Sword & Shield Arduino Programs
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- */
-
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-
-
-
-
diff --git a/NativePrograms/PokemonSwSh/Programs/BeamReset.h b/NativePrograms/PokemonSwSh/Programs/BeamReset.h
deleted file mode 100644
index 13aaf345c6..0000000000
--- a/NativePrograms/PokemonSwSh/Programs/BeamReset.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*  Pokemon Sword & Shield Arduino Programs
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- */
-
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-
-//  Wait in the Home menu for this long before resetting the game.
-extern const uint16_t DELAY_BEFORE_RESET;
-
-//  Talking to the den has an extra line in German. Set this to true if this
-//  is the case.
-extern const bool EXTRA_LINE;
-
-
diff --git a/NativePrograms/PokemonSwSh/Programs/ClothingBuyer.h b/NativePrograms/PokemonSwSh/Programs/ClothingBuyer.h
deleted file mode 100644
index 92c5217add..0000000000
--- a/NativePrograms/PokemonSwSh/Programs/ClothingBuyer.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/*  Pokemon Sword & Shield Arduino Programs
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- */
-
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-
-
-//  Rotate categories. This will allow the program to eventually buy out the
-//  entire store, but it will take a lot longer than doing separate runs on
-//  each category individually.
-extern const bool CATEGORY_ROTATION;
diff --git a/NativePrograms/PokemonSwSh/Programs/CurryHunter.h b/NativePrograms/PokemonSwSh/Programs/CurryHunter.h
deleted file mode 100644
index 6ff6d4242c..0000000000
--- a/NativePrograms/PokemonSwSh/Programs/CurryHunter.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/*  Pokemon Sword & Shield Arduino Programs
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- */
-
-
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-
-//  Wait this long for the Pokemon to walk up to you.
-extern const uint16_t WALK_UP_DELAY;
-
-//  Take a video after each cooking iteration. This will spam your album with videos.
-extern const bool TAKE_VIDEO;
-
-//  Run this many iterations before stopping.
-extern const uint32_t ITERATIONS;
-
diff --git a/NativePrograms/PokemonSwSh/Programs/DateSpam-BerryFarmer.h b/NativePrograms/PokemonSwSh/Programs/DateSpam-BerryFarmer.h
deleted file mode 100644
index 26f6fa4fb1..0000000000
--- a/NativePrograms/PokemonSwSh/Programs/DateSpam-BerryFarmer.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*  Pokemon Sword & Shield Arduino Programs
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- */
-
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-
-
-//  Grab berries this many times. You can set this number if you're also date
-//  skipping to a particular den frame and you don't want to overshoot it.
-//
-//  Be aware that this program isn't intended to be an accurate date skipper.
-//  It will occasionally miss frames causing it to fall short.
-extern const uint32_t SKIPS;
-
-
-//  Save the game every this number of iterations.
-//  If set to zero, no saving is done.
-extern const uint16_t SAVE_ITERATIONS;
-
-
diff --git a/NativePrograms/PokemonSwSh/Programs/DateSpam-DailyHighlightFarmer.h b/NativePrograms/PokemonSwSh/Programs/DateSpam-DailyHighlightFarmer.h
deleted file mode 100644
index d9ffa506c3..0000000000
--- a/NativePrograms/PokemonSwSh/Programs/DateSpam-DailyHighlightFarmer.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*  Pokemon Sword & Shield Arduino Programs
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- */
-
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-
-
-//  Grab watts this many times. You can set this number if you're also date
-//  skipping to a particular den frame and you don't want to overshoot it.
-//
-//  Be aware that this program isn't intended to be an accurate date skipper.
-//  It will occasionally miss frames causing it to fall short.
-extern const uint32_t SKIPS;
-
-
-//  Save the game every this number of iterations.
-//  If set to zero, no saving is done.
-extern const uint16_t SAVE_ITERATIONS;
-
-
diff --git a/NativePrograms/PokemonSwSh/Programs/DateSpam-LotoFarmer.h b/NativePrograms/PokemonSwSh/Programs/DateSpam-LotoFarmer.h
deleted file mode 100644
index 98e5775ff8..0000000000
--- a/NativePrograms/PokemonSwSh/Programs/DateSpam-LotoFarmer.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*  Pokemon Sword & Shield Arduino Programs
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- */
-
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-
-
-//  Run Loto-ID this many times. You can set this number if you're also date
-//  skipping to a particular den frame and you don't want to overshoot it.
-//
-//  Be aware that this program isn't intended to be an accurate date skipper.
-//  It will occasionally miss frames causing it to fall short.
-extern const uint32_t SKIPS;
-
-//  Mash B for this long to exit the dialog.
-//  For some languages, (like German), you may need to increase this.
-extern const uint16_t MASH_B_DURATION;
-
diff --git a/NativePrograms/PokemonSwSh/Programs/DateSpam-StowOnSideFarmer.h b/NativePrograms/PokemonSwSh/Programs/DateSpam-StowOnSideFarmer.h
deleted file mode 100644
index 2c1038ebfa..0000000000
--- a/NativePrograms/PokemonSwSh/Programs/DateSpam-StowOnSideFarmer.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*  Pokemon Sword & Shield Arduino Programs
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- */
-
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-
-
-//  Purchase this many times. You can set this number if you're also date
-//  skipping to a particular den frame and you don't want to overshoot it.
-//
-//  Be aware that this program isn't intended to be an accurate date skipper.
-//  It will occasionally miss frames causing it to fall short.
-extern const uint32_t SKIPS;
-
-
-//  Save the game every this number of iterations.
-//  If set to zero, no saving is done.
-extern const uint16_t SAVE_ITERATIONS;
-
-
diff --git a/NativePrograms/PokemonSwSh/Programs/DateSpam-WattFarmer.h b/NativePrograms/PokemonSwSh/Programs/DateSpam-WattFarmer.h
deleted file mode 100644
index b33ba1c168..0000000000
--- a/NativePrograms/PokemonSwSh/Programs/DateSpam-WattFarmer.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*  Pokemon Sword & Shield Arduino Programs
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- */
-
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-
-
-//  Wait this long after leaving the grip menu to allow for the Switch to
-//  reestablish local connection.
-extern const uint16_t GRIP_MENU_WAIT;
-
-
-//  Grab watts this many times. You can set this number if you're also date
-//  skipping to a particular den frame and you don't want to overshoot it.
-//
-//  Be aware that this program isn't intended to be an accurate date skipper.
-//  It will occasionally miss frames causing it to fall short.
-extern const uint32_t SKIPS;
-
-
-//  Save the game every this number of iterations.
-//  If set to zero, no saving is done.
-extern const uint16_t SAVE_ITERATIONS;
-
-
diff --git a/NativePrograms/PokemonSwSh/Programs/DaySkipperEU.h b/NativePrograms/PokemonSwSh/Programs/DaySkipperEU.h
deleted file mode 100644
index 7d5bf2b676..0000000000
--- a/NativePrograms/PokemonSwSh/Programs/DaySkipperEU.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*  Pokemon Sword & Shield Arduino Programs
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- */
-
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-
-
-//  The maximum number of skips to perform.
-//  The actual # of skips will be lower if any errors are made.
-extern const uint32_t SKIPS;
-
-//  The current year in real life.
-extern const uint16_t REAL_LIFE_YEAR;
-
-
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-//  Advanced Settings (you shouldn't need to change these)
-
-//  Run auto-recovery every this # of skips. Zero disables the auto-corrections.
-//  At 500, the overhead is approximately 0.5%.
-extern const uint16_t CORRECTION_SKIPS;
-
-
diff --git a/NativePrograms/PokemonSwSh/Programs/DaySkipperJPN-7.8k.h b/NativePrograms/PokemonSwSh/Programs/DaySkipperJPN-7.8k.h
deleted file mode 100644
index a93407ccb9..0000000000
--- a/NativePrograms/PokemonSwSh/Programs/DaySkipperJPN-7.8k.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*  Pokemon Sword & Shield Arduino Programs
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- */
-
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-
-
-//  The maximum number of skips to perform.
-//  The actual # of skips will be lower if any errors are made.
-extern const uint32_t SKIPS;
-
-//  If you don't want to start on 1/1/2000, you can set this instead.
-typedef struct{
-    uint16_t year;
-    uint8_t month;
-    uint8_t day;
-} Date;
-extern const Date START_DATE;
-
-
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-//  Advanced Settings (you shouldn't need to change these)
-
-//  Run auto-recovery every this # of skips. Zero disables the auto-corrections.
-//  At 500, the overhead is approximately 0.5%.
-extern const uint16_t CORRECTION_SKIPS;
-
diff --git a/NativePrograms/PokemonSwSh/Programs/DaySkipperJPN.h b/NativePrograms/PokemonSwSh/Programs/DaySkipperJPN.h
deleted file mode 100644
index 3e050fcd45..0000000000
--- a/NativePrograms/PokemonSwSh/Programs/DaySkipperJPN.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*  Pokemon Sword & Shield Arduino Programs
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- */
-
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-
-
-//  The maximum number of skips to perform.
-//  The actual # of skips will be lower if any errors are made.
-extern const uint32_t SKIPS;
-
-
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-//  Advanced Settings (you shouldn't need to change these)
-
-//  Run auto-recovery every this # of skips. Zero disables the auto-corrections.
-//  At 500, the overhead is approximately 0.5%.
-extern const uint16_t CORRECTION_SKIPS;
-
-
diff --git a/NativePrograms/PokemonSwSh/Programs/DaySkipperUS.h b/NativePrograms/PokemonSwSh/Programs/DaySkipperUS.h
deleted file mode 100644
index 7d5bf2b676..0000000000
--- a/NativePrograms/PokemonSwSh/Programs/DaySkipperUS.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*  Pokemon Sword & Shield Arduino Programs
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- */
-
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-
-
-//  The maximum number of skips to perform.
-//  The actual # of skips will be lower if any errors are made.
-extern const uint32_t SKIPS;
-
-//  The current year in real life.
-extern const uint16_t REAL_LIFE_YEAR;
-
-
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-//  Advanced Settings (you shouldn't need to change these)
-
-//  Run auto-recovery every this # of skips. Zero disables the auto-corrections.
-//  At 500, the overhead is approximately 0.5%.
-extern const uint16_t CORRECTION_SKIPS;
-
-
diff --git a/NativePrograms/PokemonSwSh/Programs/DenRoller.h b/NativePrograms/PokemonSwSh/Programs/DenRoller.h
deleted file mode 100644
index ec4fe83580..0000000000
--- a/NativePrograms/PokemonSwSh/Programs/DenRoller.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/*  Pokemon Sword & Shield Arduino Programs
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- */
-
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-#include "NativePrograms/PokemonSwSh/Libraries/PokemonSwSh_Settings.h"
-
-
-//  # of frames to roll.
-extern const uint8_t SKIPS;
-
-//  ALWAYS_CATCHABLE    All pokemon in this den are catchable.
-//  MAYBE_UNCATCHABLE   There may be uncatchable pokemon.
-extern const Catchability CATCHABILITY;
-
-//  View the rolled pokemon for this long before resetting.
-extern const uint16_t VIEW_TIME;
diff --git a/NativePrograms/PokemonSwSh/Programs/EggCombined2.h b/NativePrograms/PokemonSwSh/Programs/EggCombined2.h
deleted file mode 100644
index 16983fb85d..0000000000
--- a/NativePrograms/PokemonSwSh/Programs/EggCombined2.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*  Pokemon Sword & Shield Arduino Programs
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- */
-
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-
-
-extern const uint8_t   BOXES_TO_HATCH;
-extern const uint16_t  STEPS_TO_HATCH;      //  Lookup the # of steps on Serebii.
-
-
-//  For each batch of eggs, attempt this many egg fetches.
-//
-//  This parameter works by dividing the incubation time by the # of fetch
-//  attempts and doing a fetch at this interval. Therefore increasing this
-//  number will decrease the time between fetches which also decreases the
-//  chance of successfully fetching an egg. The optimal value is difficult to
-//  determine and is dependent on many factors.
-//
-//  For fast hatching eggs like Magikarp, you may need to decrease this number
-//  to as low as 1 or 2. This implies that it's impossible for fetching to keep
-//  pace with hatching as is the case with manual hatching anyway.
-//
-//  The program will automatically reduce this number if it determines that it
-//  is too large to function correctly.
-//
-//  If this is set to a non-integer, the program will vary the # of fetches
-//  across batches so that they average out to the specified number.
-//
-extern const float FETCHES_PER_BATCH;
-
-
-
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-//  Advanced Settings (you shouldn't need to change these)
-
-//  Additional time added to the spinning. If any shinies are hatched, they will
-//  eat into this safety buffer along with any other unexpected slowdowns.
-//  Hatching a shiny takes 2 seconds longer than a non-shiny.
-//
-//  If you see that the program is going into Y-COMM or there is less than 5
-//  seconds of extra spinning after the last egg in the batch, please report
-//  this as a bug. As a temporary work-around, you can increase this number.
-extern const uint16_t SAFETY_TIME;
-
-//  Eggs will not hatch early by more than this interval.
-extern const uint16_t EARLY_HATCH_SAFETY;
-
-//  Total animation time for hatching 5 eggs when there are no shinies.
-extern const uint16_t HATCH_DELAY;
-
-
-//  Rollover Prevention
-//
-//  Prevent a den from rolling over by periodically touching the date.
-//
-//  If set to zero, this feature is disabled.
-//  Otherwise, the program will touch the date at roughly this interval to
-//  prevent a den from rolling over. This feature requres time-sync be disabled.
-extern const uint32_t TOUCH_DATE_INTERVAL;
-
-
diff --git a/NativePrograms/PokemonSwSh/Programs/EggFetcher2.h b/NativePrograms/PokemonSwSh/Programs/EggFetcher2.h
deleted file mode 100644
index 2eeb1d08e7..0000000000
--- a/NativePrograms/PokemonSwSh/Programs/EggFetcher2.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/*  Pokemon Sword & Shield Arduino Programs
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- */
-
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-
-
-//  Fetch this many times. This puts a limit on how many eggs you can get so
-//  you don't make a mess of your boxes for fetching too many.
-extern const uint16_t MAX_FETCH_ATTEMPTS;
-
-
diff --git a/NativePrograms/PokemonSwSh/Programs/EggHatcher.h b/NativePrograms/PokemonSwSh/Programs/EggHatcher.h
deleted file mode 100644
index 9dc6b71da0..0000000000
--- a/NativePrograms/PokemonSwSh/Programs/EggHatcher.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*  Pokemon Sword & Shield Arduino Programs
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- */
-
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-
-
-extern const uint8_t   BOXES_TO_HATCH;
-extern const uint16_t  STEPS_TO_HATCH;      //  Lookup the # of steps on Serebii.
-
-
-
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-//  Advanced Settings (you shouldn't need to change these)
-
-//  Additional time added to the spinning. If any shinies are hatched, they will
-//  eat into this safety buffer along with any other unexpected slowdowns.
-//  Hatching a shiny takes 2 seconds longer than a non-shiny.
-//
-//  If you see that the program is going into Y-COMM or there is less than 5
-//  seconds of extra spinning after the last egg in the batch, please report
-//  this as a bug. As a temporary work-around, you can increase this number.
-extern const uint16_t SAFETY_TIME;
-
-//  Total animation time for hatching 5 eggs when there are no shinies.
-extern const uint16_t HATCH_DELAY;
-
-
diff --git a/NativePrograms/PokemonSwSh/Programs/EggSuperCombined2.h b/NativePrograms/PokemonSwSh/Programs/EggSuperCombined2.h
deleted file mode 100644
index 1ceedbde0c..0000000000
--- a/NativePrograms/PokemonSwSh/Programs/EggSuperCombined2.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*  Pokemon Sword & Shield Arduino Programs
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- */
-
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-
-
-//  Start by releasing this many boxes. All boxes must be completely filled with
-//  releasable pokemon.
-extern const uint8_t   BOXES_TO_RELEASE;
-
-//  After you finish releasing boxes, skip this many boxes.
-extern const uint8_t   BOXES_TO_SKIP;
-
-//  Proceed to run EggCombined for this many boxes.
-extern const uint8_t   BOXES_TO_HATCH;
-extern const uint16_t  STEPS_TO_HATCH;      //  Lookup the # of steps on Serebii.
-
-
-//  For each batch of eggs, attempt this many egg fetches.
-//
-//  This parameter works by dividing the incubation time by the # of fetch
-//  attempts and doing a fetch at this interval. Therefore increasing this
-//  number will decrease the time between fetches which also decreases the
-//  chance of successfully fetching an egg. The optimal value is difficult to
-//  determine and is dependent on many factors.
-//
-//  For fast hatching eggs like Magikarp, you may need to decrease this number
-//  to as low as 1 or 2. This implies that it's impossible for fetching to keep
-//  pace with hatching as is the case with manual hatching anyway.
-//
-//  The program will automatically reduce this number if it determines that it
-//  is too large to function correctly.
-//
-//  If this is set to a non-integer, the program will vary the # of fetches
-//  across batches so that they average out to the specified number.
-//
-extern const float FETCHES_PER_BATCH;
-
-
-
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-//  Advanced Settings (you shouldn't need to change these)
-
-//  Additional time added to the spinning. If any shinies are hatched, they will
-//  eat into this safety buffer along with any other unexpected slowdowns.
-//  Hatching a shiny takes 2 seconds longer than a non-shiny.
-//
-//  If you see that the program is going into Y-COMM or there is less than 5
-//  seconds of extra spinning after the last egg in the batch, please report
-//  this as a bug. As a temporary work-around, you can increase this number.
-extern const uint16_t SAFETY_TIME;
-
-//  Eggs will not hatch early by more than this interval.
-extern const uint16_t EARLY_HATCH_SAFETY;
-
-//  Total animation time for hatching 5 eggs when there are no shinies.
-extern const uint16_t HATCH_DELAY;
-
-
-//  Rollover Prevention
-//
-//  Prevent a den from rolling over by periodically touching the date.
-//
-//  If set to zero, this feature is disabled.
-//  Otherwise, the program will touch the date at roughly this interval to
-//  prevent a den from rolling over. This feature requres time-sync be disabled.
-extern const uint32_t TOUCH_DATE_INTERVAL;
-
-
diff --git a/NativePrograms/PokemonSwSh/Programs/EventBeamFinder.h b/NativePrograms/PokemonSwSh/Programs/EventBeamFinder.h
deleted file mode 100644
index 54807890a4..0000000000
--- a/NativePrograms/PokemonSwSh/Programs/EventBeamFinder.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/*  Pokemon Sword & Shield Arduino Programs
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- */
-
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-
-
-//  View the den for this duration before moving on.
-extern const uint16_t WAIT_TIME_IN_DEN;
-
-
diff --git a/NativePrograms/PokemonSwSh/Programs/FastCodeEntry.h b/NativePrograms/PokemonSwSh/Programs/FastCodeEntry.h
deleted file mode 100644
index e00b8fd27e..0000000000
--- a/NativePrograms/PokemonSwSh/Programs/FastCodeEntry.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/*  Pokemon Sword & Shield Arduino Programs
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- */
-
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-
-
-//  Raid Code
-extern const char* RAID_CODE;
-
-//  Wait this long before entering the code.
-extern const uint16_t INITIAL_DELAY;
diff --git a/NativePrograms/PokemonSwSh/Programs/GodEggDuplication.h b/NativePrograms/PokemonSwSh/Programs/GodEggDuplication.h
deleted file mode 100644
index bbc6b11d8f..0000000000
--- a/NativePrograms/PokemonSwSh/Programs/GodEggDuplication.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*  Pokemon Sword & Shield Arduino Programs
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- */
-
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-
-
-//  Fetch this many times. This puts a limit on how many Pokemon you can clone
-//  so you don't make a mess of your boxes for cloning too many.
-extern const uint16_t MAX_FETCH_ATTEMPTS;
-
-
-//  Round-robin through this many party pokemon. You can clone up to 6 different
-//  Pokemon in the same run.
-//
-//  If set to 1, it will only clone the 1st party member.
-//  If set to 2, it will alternate cloning the 1st and 2nd party members.
-//  If set to N, it will clone the 1st N members in your party in a round-robin fashion.
-//
-//  This option doesn't increase the speed of the duplication. It merely gives
-//  you more variety.
-extern const uint8_t PARTY_ROUND_ROBIN;
-
-
diff --git a/NativePrograms/PokemonSwSh/Programs/GodEggItemDupe.h b/NativePrograms/PokemonSwSh/Programs/GodEggItemDupe.h
deleted file mode 100644
index c5aad019da..0000000000
--- a/NativePrograms/PokemonSwSh/Programs/GodEggItemDupe.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*  Pokemon Sword & Shield Arduino Programs
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- */
-
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-
-
-//  Fetch this many times.
-extern const uint16_t MAX_FETCH_ATTEMPTS;
-
-
-//  Round-robin through this many party pokemon. By attaching different items
-//  to different pokemon in your party, you can duplicate different items in the
-//  same run. Thus can clone up to 6 different items in each run.
-//
-//  If set to 1, it will only clone the item held by the 1st party member.
-//  If set to 2, it will alternate cloning items held by the 1st and 2nd party members.
-//  If set to N, it will clone the items held by the 1st N members in your party
-//  in a round-robin fashion.
-//
-//  This option doesn't increase the speed of the item duplication. It merely
-//  gives you more variety. If you run the program unattended overnight, you may
-//  get around 300 of the same item. By setting this parameter, you can instead
-//  get 50 of 6 different items.
-extern const uint8_t PARTY_ROUND_ROBIN;
-
-
-//  When you release a pokemon, the item automatically detaches and goes to your
-//  inventory. But certain items (like Rusted Sword/Shield) will prevent you
-//  from releasing the Pokemon. If you are duplicating such items, you must set
-//  this to true.
-extern const bool DETACH_BEFORE_RELEASE;
-
-
diff --git a/NativePrograms/PokemonSwSh/Programs/MassRelease.h b/NativePrograms/PokemonSwSh/Programs/MassRelease.h
deleted file mode 100644
index 70310aa7cd..0000000000
--- a/NativePrograms/PokemonSwSh/Programs/MassRelease.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*  Pokemon Sword & Shield Arduino Programs
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- */
-
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-
-
-//  # of boxes to release.
-extern const uint8_t BOXES_TO_RELEASE;
-
-//  Dodge the system update window.
-extern const bool DODGE_SYSTEM_UPDATE_WINDOW;
-
-
diff --git a/NativePrograms/PokemonSwSh/Programs/MultiGameFossil.h b/NativePrograms/PokemonSwSh/Programs/MultiGameFossil.h
deleted file mode 100644
index c3bae49cac..0000000000
--- a/NativePrograms/PokemonSwSh/Programs/MultiGameFossil.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*  Pokemon Sword & Shield Arduino Programs
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- */
-
-#include <avr/pgmspace.h>
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-
-
-typedef enum{
-    Dracozolt   =   0,
-    Arctozolt   =   1,
-    Dracovish   =   2,
-    Arctovish   =   3,
-} FossilMon;
-typedef struct{
-    uint8_t game_slot : 2;
-    uint8_t user_slot : 4;
-    FossilMon mon : 2;
-    uint16_t revives;
-} Batch;
-
-
-//
-//  The list of participating saves. Each entry in the array will have 4 parameters:
-//
-//  Parameter 1:    Game slot at start of program. (must be 1 or 2)
-//  Parameter 2:    The slot # of the user. (1 is the left-most user, 2 is the 2nd-to-left, etc...)
-//  Parameter 3:    The pokemon you are reviving in this save.
-//  Parameter 4:    The number of revives to perform.
-//
-extern const Batch PROGMEM BATCH[];
-
-
diff --git a/NativePrograms/PokemonSwSh/Programs/PokemonCallbacks.c b/NativePrograms/PokemonSwSh/Programs/PokemonCallbacks.c
deleted file mode 100644
index 91b88db014..0000000000
--- a/NativePrograms/PokemonSwSh/Programs/PokemonCallbacks.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*  Device-side Callbacks for the Pokemon Programs
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- *      All callbacks here MUST return in under 4 milliseconds or it may throw
- *  off the program's clock and break timing-sensitive programs by missing a
- *  Switch USB update.
- * 
- */
-
-#include "PokemonCallbacks.h"
-
-void dayskipper_on_skip_callback(uint32_t remaining_skips){
-    //  It is very important this callback returns in under 4 milliseconds.
-    //  The day skippers are timing-sensitive and cannot tolerate delays.
-
-
-}
diff --git a/NativePrograms/PokemonSwSh/Programs/PokemonCallbacks.h b/NativePrograms/PokemonSwSh/Programs/PokemonCallbacks.h
deleted file mode 100644
index e7f9c650fb..0000000000
--- a/NativePrograms/PokemonSwSh/Programs/PokemonCallbacks.h
+++ /dev/null
@@ -1,9 +0,0 @@
-/*  Device-side Callbacks for the Pokemon Programs
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- */
-
-#include <stdint.h>
-
-void dayskipper_on_skip_callback(uint32_t remaining_skips);
diff --git a/NativePrograms/PokemonSwSh/Programs/ShinyHunt-Regi.h b/NativePrograms/PokemonSwSh/Programs/ShinyHunt-Regi.h
deleted file mode 100644
index 9773a49043..0000000000
--- a/NativePrograms/PokemonSwSh/Programs/ShinyHunt-Regi.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*  Pokemon Sword & Shield Arduino Programs
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- */
-
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-
-
-extern const uint16_t WAIT_TIME;
-
-
-//  Rollover Prevention
-//
-//  Prevent a den from rolling over by periodically touching the date.
-//
-//  If set to zero, this feature is disabled.
-//  Otherwise, the program will touch the date at roughly this interval to
-//  prevent a den from rolling over. This feature requres time-sync be disabled.
-extern const uint32_t TOUCH_DATE_INTERVAL;
-
diff --git a/NativePrograms/PokemonSwSh/Programs/ShinyHunt-SwordsOfJustice.h b/NativePrograms/PokemonSwSh/Programs/ShinyHunt-SwordsOfJustice.h
deleted file mode 100644
index ff82d96bfb..0000000000
--- a/NativePrograms/PokemonSwSh/Programs/ShinyHunt-SwordsOfJustice.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*  Pokemon Sword & Shield Arduino Programs
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- */
-
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-
-
-//  Increase this number if you want to give yourself more time before running.
-extern const uint16_t EXIT_CAMP_TO_RUN_DELAY;
-
-
-//  These two timings are less important.
-extern const uint16_t ENTER_CAMP_DELAY;
-extern const uint16_t RUN_DELAY;
-
-
-//  Time Rollback
-//
-//  Periodically roll back the time to keep the weather the same.
-//
-//  If set to zero, this feature is disabled.
-//  Otherwise, it roll the hour back by this amount every this many hours.
-//  This feature requres time-sync be disabled.
-extern const uint8_t TIME_ROLLBACK_HOURS;
diff --git a/NativePrograms/PokemonSwSh/Programs/ShinyHuntUnattended-IoATrade.h b/NativePrograms/PokemonSwSh/Programs/ShinyHuntUnattended-IoATrade.h
deleted file mode 100644
index b84ad9e067..0000000000
--- a/NativePrograms/PokemonSwSh/Programs/ShinyHuntUnattended-IoATrade.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*  Pokemon Sword & Shield Arduino Programs
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- */
-
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-
-
-//  This needs to be carefully calibrated.
-//    - If it's too short, it may stop on a non-shiny.
-//    - If it's too long, it may run on a shiny.
-//
-//  There is less than a 0.5 second window which this must land in.
-//
-//  The default value here is calibrated for the "average system". If it doesn't
-//  work, then you must calibrate it yourself.
-//
-extern const uint16_t START_TO_RUN_DELAY;
-
-
-
-
-//
-//  You shouldn't need to touch anything below here.
-//
-
-
-//  Time it takes to fly from IoA to Route 10.
-extern const uint16_t FLY_DURATION;
-
-//  Time to move from Route 10 fly spot to the Beartic.
-extern const uint16_t MOVE_DURATION;
-
-//  Time to perform the trade.
-extern const uint16_t MASH_TO_TRADE_DELAY;
-
-
-//  Rollover Prevention
-//
-//  Prevent a den from rolling over by periodically touching the date.
-//
-//  If set to zero, this feature is disabled.
-//  Otherwise, the program will touch the date at roughly this interval to
-//  prevent a den from rolling over. This feature requres time-sync be disabled.
-extern const uint32_t TOUCH_DATE_INTERVAL;
diff --git a/NativePrograms/PokemonSwSh/Programs/ShinyHuntUnattended-Regi.h b/NativePrograms/PokemonSwSh/Programs/ShinyHuntUnattended-Regi.h
deleted file mode 100644
index a828e023bd..0000000000
--- a/NativePrograms/PokemonSwSh/Programs/ShinyHuntUnattended-Regi.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*  Pokemon Sword & Shield Arduino Programs
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- */
-
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-
-
-//  This needs to be carefully calibrated.
-//    - If it's too short, it may stop on a non-shiny.
-//    - If it's too long, it may run from a shiny.
-//
-//  There is less than a 0.5 second window which this must land in.
-//
-//  The default value here is calibrated for the "average system". If it doesn't
-//  work, then you must calibrate it yourself.
-//
-extern const uint16_t START_TO_RUN_DELAY;
-
-//  Name of the Regi you are SR'ing for.
-typedef enum{
-    Regirock,
-    Regice,
-    Registeel,
-    Regieleki,
-    Regidrago,
-} RegiGolem;
-extern const RegiGolem REGI_NAME;
-
-//  The light puzzle is not 100% reliable. Sometimes it will miss lights.
-//  To counter that, the program will periodically leave and re-enter the
-//  building after this many encounters. Zero disables the corrections.
-//  If you disable corrections, the program will stop working when it
-//  misses a light and will not self-recover.
-extern const uint16_t CORRECTION_INTERVAL;
-
-//  Delay to enter/exit the building.
-extern const uint16_t TRANSITION_DELAY;
-
-
-//  Rollover Prevention
-//
-//  Prevent a den from rolling over by periodically touching the date.
-//
-//  If set to zero, this feature is disabled.
-//  Otherwise, the program will touch the date at roughly this interval to
-//  prevent a den from rolling over. This feature requres time-sync be disabled.
-extern const uint32_t TOUCH_DATE_INTERVAL;
diff --git a/NativePrograms/PokemonSwSh/Programs/ShinyHuntUnattended-Regigigas.h b/NativePrograms/PokemonSwSh/Programs/ShinyHuntUnattended-Regigigas.h
deleted file mode 100644
index d89f656870..0000000000
--- a/NativePrograms/PokemonSwSh/Programs/ShinyHuntUnattended-Regigigas.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*  Pokemon Sword & Shield Arduino Programs
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- */
-
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-
-
-//  This needs to be carefully calibrated.
-//    - If it's too short, it may stop on a non-shiny.
-//    - If it's too long, it may run from a shiny.
-//
-//  There is less than a 0.5 second window which this must land in.
-//
-//  The default value here is calibrated for the "average system". If it doesn't
-//  work, then you must calibrate it yourself.
-//
-extern const uint16_t START_TO_ATTACK_DELAY;
-
-//  Time to return to the overworld after selecting a move.
-extern const uint16_t END_BATTLE_DELAY;
-
-
-//  Rollover Prevention
-//
-//  Prevent a den from rolling over by periodically touching the date.
-//
-//  If set to zero, this feature is disabled.
-//  Otherwise, the program will touch the date at roughly this interval to
-//  prevent a den from rolling over. This feature requres time-sync be disabled.
-extern const uint32_t TOUCH_DATE_INTERVAL;
diff --git a/NativePrograms/PokemonSwSh/Programs/ShinyHuntUnattended-Regigigas2.h b/NativePrograms/PokemonSwSh/Programs/ShinyHuntUnattended-Regigigas2.h
deleted file mode 100644
index 8bf80ae7d5..0000000000
--- a/NativePrograms/PokemonSwSh/Programs/ShinyHuntUnattended-Regigigas2.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*  Pokemon Sword & Shield Arduino Programs
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- */
-
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-
-
-//  The amount of Reversal PP that you are saved with.
-extern const uint8_t REVERSAL_PP;
-
-
-//  This needs to be carefully calibrated.
-//    - If it's too short, it may stop on a non-shiny.
-//    - If it's too long, it may run from a shiny.
-//
-//  There is less than a 0.5 second window which this must land in.
-//
-//  The default value here is calibrated for the "average system". If it doesn't
-//  work, then you must calibrate it yourself.
-//
-extern const uint16_t START_TO_ATTACK_DELAY;
-
-
-//  Time from when you attack to when you can decide to catch or not catch.
-extern const uint16_t ATTACK_TO_CATCH_DELAY;
-
-//  Time from deciding not to catch to returning to the overworld.
-extern const uint16_t CATCH_TO_OVERWORLD_DELAY;
-
-
-//  Rollover Prevention
-//
-//  Prevent a den from rolling over by periodically touching the date.
-//
-//  If set to zero, this feature is disabled.
-//  Otherwise, the program will touch the date at roughly this interval to
-//  prevent a den from rolling over. This feature requres time-sync be disabled.
-extern const uint32_t TOUCH_DATE_INTERVAL;
diff --git a/NativePrograms/PokemonSwSh/Programs/ShinyHuntUnattended-StrongSpawn.h b/NativePrograms/PokemonSwSh/Programs/ShinyHuntUnattended-StrongSpawn.h
deleted file mode 100644
index 8c1d0fb551..0000000000
--- a/NativePrograms/PokemonSwSh/Programs/ShinyHuntUnattended-StrongSpawn.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*  Pokemon Sword & Shield Arduino Programs
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- */
-
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-
-
-//  This needs to be carefully calibrated.
-//    - If it's too short, it may stop on a non-shiny.
-//    - If it's too long, it may run from a shiny.
-//
-//  There is less than a 0.5 second window which this must land in.
-//
-//  The default value here is unlikely to work for your setup since there are
-//  so many factors involved. You must calibrate it for your particular setup.
-//
-extern const uint16_t ENTER_GAME_TO_RUN_DELAY;
-
-
-
-//  Wait this long for the game to start before pressing A to enter the game
-//  and start the encounter. You can try to decrease this to make resetting
-//  faster.
-extern const uint16_t PokemonSwSh_START_GAME_WAIT_DELAY;
-
-
-//  Time Rollback
-//
-//  Periodically roll back the time to keep the weather the same.
-//
-//  If set to zero, this feature is disabled.
-//  Otherwise, it roll the hour back by this amount every this many hours.
-//  This feature requres time-sync be disabled.
-extern const uint8_t TIME_ROLLBACK_HOURS;
-
diff --git a/NativePrograms/PokemonSwSh/Programs/ShinyHuntUnattended-SwordsOfJustice.h b/NativePrograms/PokemonSwSh/Programs/ShinyHuntUnattended-SwordsOfJustice.h
deleted file mode 100644
index ba5acdbc57..0000000000
--- a/NativePrograms/PokemonSwSh/Programs/ShinyHuntUnattended-SwordsOfJustice.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*  Pokemon Sword & Shield Arduino Programs
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- */
-
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-
-
-//  This needs to be carefully calibrated.
-//    - If it's too short, it may stop on a non-shiny.
-//    - If it's too long, it may run from a shiny.
-//
-//  There is less than a 0.5 second window which this must land in.
-//
-//  The default value here is calibrated for the "average system". If it doesn't
-//  work, then you must calibrate it yourself.
-//
-extern const uint16_t EXIT_CAMP_TO_RUN_DELAY;
-
-//  Set this to true if you are running in airplane mode.
-extern const bool AIRPLANE_MODE;
-
-
-//  These timings are less important.
-extern const uint16_t ENTER_CAMP_DELAY;
-
-
-//  Time Rollback
-//
-//  Periodically roll back the time to keep the weather the same.
-//
-//  If set to zero, this feature is disabled.
-//  Otherwise, it roll the hour back by this amount every this many hours.
-//  This feature requres time-sync be disabled.
-extern const uint8_t TIME_ROLLBACK_HOURS;
diff --git a/NativePrograms/PokemonSwSh/Programs/SurpriseTrade.h b/NativePrograms/PokemonSwSh/Programs/SurpriseTrade.h
deleted file mode 100644
index d821e92c6b..0000000000
--- a/NativePrograms/PokemonSwSh/Programs/SurpriseTrade.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*  Pokemon Sword & Shield Arduino Programs
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- */
-
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-
-
-extern const uint8_t BOXES_TO_TRADE;
-
-//  Time to wait for a trade partner.
-extern const uint16_t INITIAL_WAIT;
-
-
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-//  Advanced Settings (you shouldn't need to change these)
-
-extern const uint16_t TRADE_ANIMATION;
-extern const uint16_t EVOLVE_DELAY;
-
-
diff --git a/NativePrograms/PokemonSwSh/Programs/TradeBot.h b/NativePrograms/PokemonSwSh/Programs/TradeBot.h
deleted file mode 100644
index 009b4d1329..0000000000
--- a/NativePrograms/PokemonSwSh/Programs/TradeBot.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*  Pokemon Sword & Shield Arduino Programs
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- */
-
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-
-
-//  Raid Code
-extern const char* TRADE_CODE;
-
-extern const uint8_t BOXES_TO_TRADE;
-
-//  Set this if you are playing in German.
-extern const bool LINK_TRADE_EXTRA_LINE;
-
-//  Time to wait for a trade partner.
-extern const uint16_t SEARCH_DELAY;
-
-//  Time to wait for partner to confirm the trade.
-extern const uint16_t CONFIRM_DELAY;
-
-
-//  Increase these if your internet connection is slow.
-extern const uint16_t TRADE_START;
-extern const uint16_t TRADE_COMMUNICATION;
-
-
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-//  Advanced Settings (you shouldn't need to change these)
-
-extern const uint16_t TRADE_ANIMATION;
-extern const uint16_t EVOLVE_DELAY;
-
-
diff --git a/NativePrograms/PokemonSwSh/README.md b/NativePrograms/PokemonSwSh/README.md
deleted file mode 100644
index 9a43c90cc7..0000000000
--- a/NativePrograms/PokemonSwSh/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# NativePrograms
-
-Source code for the Arduino-side programs.
diff --git a/NativePrograms/PokemonSwSh/README_Mac_Linux.md b/NativePrograms/PokemonSwSh/README_Mac_Linux.md
deleted file mode 100644
index 023f271982..0000000000
--- a/NativePrograms/PokemonSwSh/README_Mac_Linux.md
+++ /dev/null
@@ -1,34 +0,0 @@
-# Requirements
-
-## Mac OS (Homebrew Required)
-
-Run the commands below to install the packages needed to build and flash your device
-
-```shell
-# Uninstall existing packages to ensure avr-gcc is properly installed
-brew uninstall avr-gcc avrdude
-
-# Now install requirements
-brew tap osx-cross/avr
-brew install avr-gcc --build-from-source avr-gcc
-brew install avrdude make
-```
-
-## Linux
-
-First, install your distros "Development Tools" group of packages. This will include basic tools such as gcc and make.
-
-For Fedora, the command is shown below:
-
-```shell
-dnf groupinstall 'Development Tools'
-```
-
-install the packages listed below. Note that the package names will likely differ between distros.
-
-```shell
-avr-libc
-avr-binutils 
-gcc-avr32-linux-gnu
-gcc-c++-avr32-linux-gn
-```
\ No newline at end of file
diff --git a/NativePrograms/PokemonSwSh/ShinyHunt-Regi.c b/NativePrograms/PokemonSwSh/ShinyHunt-Regi.c
deleted file mode 100644
index 9e21c98c6e..0000000000
--- a/NativePrograms/PokemonSwSh/ShinyHunt-Regi.c
+++ /dev/null
@@ -1,22 +0,0 @@
-/*  Pokemon Sword & Shield: Soft-Reset for Regis
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- *      Please refer to the user manual for instructions and documentation.
- * 
- */
-
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-#include "Programs/ShinyHunt-Regi.h"
-
-const uint16_t WAIT_TIME    =   15 * TICKS_PER_SECOND;
-
-
-//  Rollover Prevention
-//
-//  Prevent a den from rolling over by periodically touching the date.
-//
-//  If set to zero, this feature is disabled.
-//  Otherwise, the program will touch the date at roughly this interval to
-//  prevent a den from rolling over. This feature requres time-sync be disabled.
-const uint32_t TOUCH_DATE_INTERVAL  =   (uint32_t)4 * 3600 * TICKS_PER_SECOND;  //  4 hours
diff --git a/NativePrograms/PokemonSwSh/ShinyHunt-SwordsOfJustice.c b/NativePrograms/PokemonSwSh/ShinyHunt-SwordsOfJustice.c
deleted file mode 100644
index a0569972cc..0000000000
--- a/NativePrograms/PokemonSwSh/ShinyHunt-SwordsOfJustice.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/*  Pokemon Sword & Shield: Soft-Reset for Swords of Justice
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- *      Please refer to the user manual for instructions and documentation.
- * 
- */
-
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-#include "Programs/ShinyHunt-SwordsOfJustice.h"
-
-//  Increase this number if you want to give yourself more time before running.
-const uint16_t EXIT_CAMP_TO_RUN_DELAY   =   19 * TICKS_PER_SECOND;
-
-
-//  Time Rollback
-//
-//  Periodically roll back the time to keep the weather the same.
-//
-//  If set to zero, this feature is disabled.
-//  Otherwise, it roll the hour back by this amount every this many hours.
-//  This feature requres time-sync be disabled.
-const uint8_t TIME_ROLLBACK_HOURS   =   1;
-
-
-//  These two timings are less important.
-const uint16_t ENTER_CAMP_DELAY         =   8 * TICKS_PER_SECOND;
-const uint16_t RUN_DELAY                =   5 * TICKS_PER_SECOND;
diff --git a/NativePrograms/PokemonSwSh/ShinyHuntUnattended-IoATrade.c b/NativePrograms/PokemonSwSh/ShinyHuntUnattended-IoATrade.c
deleted file mode 100644
index a128472074..0000000000
--- a/NativePrograms/PokemonSwSh/ShinyHuntUnattended-IoATrade.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*  Pokemon Sword & Shield: Soft-Reset for Isle of Armor Trades
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- *      Please refer to the user manual for instructions and documentation.
- * 
- */
-
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-#include "Programs/ShinyHuntUnattended-IoATrade.h"
-
-
-//  This needs to be carefully calibrated.
-//    - If it's too short, it may stop on a non-shiny.
-//    - If it's too long, it may run on a shiny.
-//
-//  There is less than a 0.5 second window which this must land in.
-//
-//  The default value here is calibrated for the "average system". If it doesn't
-//  work, then you must calibrate it yourself.
-//
-const uint16_t START_TO_RUN_DELAY   =   1260;
-
-
-//  Rollover Prevention
-//
-//  Prevent a den from rolling over by periodically touching the date.
-//
-//  If set to zero, this feature is disabled.
-//  Otherwise, the program will touch the date at roughly this interval to
-//  prevent a den from rolling over. This feature requres time-sync be disabled.
-const uint32_t TOUCH_DATE_INTERVAL  =   (uint32_t)4 * 3600 * TICKS_PER_SECOND;  //  4 hours
-
-
-
-
-//
-//  You shouldn't need to touch anything below here.
-//
-
-
-//  Time it takes to fly from IoA to Route 10.
-const uint16_t FLY_DURATION         =   800;
-
-//  Time to move from Route 10 fly spot to the Beartic.
-const uint16_t MOVE_DURATION        =   300;
-
-//  Time to perform the trade.
-const uint16_t MASH_TO_TRADE_DELAY  =   29 * TICKS_PER_SECOND;
diff --git a/NativePrograms/PokemonSwSh/ShinyHuntUnattended-Regi.c b/NativePrograms/PokemonSwSh/ShinyHuntUnattended-Regi.c
deleted file mode 100644
index b4b8c96edc..0000000000
--- a/NativePrograms/PokemonSwSh/ShinyHuntUnattended-Regi.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/*  Pokemon Sword & Shield: Soft-Reset for Regi Golems
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- *      Please refer to the user manual for instructions and documentation.
- * 
- */
-
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-#include "Programs/ShinyHuntUnattended-Regi.h"
-
-
-//  This needs to be carefully calibrated.
-//    - If it's too short, it may stop on a non-shiny.
-//    - If it's too long, it may run from a shiny.
-//
-//  There is less than a 0.5 second window which this must land in.
-//
-//  The default value here is calibrated for the "average system". If it doesn't
-//  work, then you must calibrate it yourself.
-//
-const uint16_t START_TO_RUN_DELAY   =   1990;
-
-//  Name of the Regi you are SR'ing for.
-//
-//  Available Options:
-//      -   Regirock
-//      -   Regice
-//      -   Registeel
-//      -   Regieleki
-//      -   Regidrago
-//
-const RegiGolem REGI_NAME           =   Registeel;
-
-
-//  Rollover Prevention
-//
-//  Prevent a den from rolling over by periodically touching the date.
-//
-//  If set to zero, this feature is disabled.
-//  Otherwise, the program will touch the date at roughly this interval to
-//  prevent a den from rolling over. This feature requres time-sync be disabled.
-const uint32_t TOUCH_DATE_INTERVAL  =   (uint32_t)4 * 3600 * TICKS_PER_SECOND;  //  4 hours
-
-
-
-//  The light puzzle is not 100% reliable. Sometimes it will miss lights.
-//  To counter that, the program will periodically leave and re-enter the
-//  building after this many encounters. Zero disables the corrections.
-//  If you disable corrections, the program will stop working when it
-//  misses a light and will not self-recover.
-const uint16_t CORRECTION_INTERVAL  =   20;
-
-//  Delay to enter/exit the building.
-const uint16_t TRANSITION_DELAY     =   5 * TICKS_PER_SECOND;
diff --git a/NativePrograms/PokemonSwSh/ShinyHuntUnattended-Regigigas.c b/NativePrograms/PokemonSwSh/ShinyHuntUnattended-Regigigas.c
deleted file mode 100644
index f4673774c0..0000000000
--- a/NativePrograms/PokemonSwSh/ShinyHuntUnattended-Regigigas.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/*  Pokemon Sword & Shield: Soft-Reset for Regigigas
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- *      Please refer to the user manual for instructions and documentation.
- * 
- */
-
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-#include "Programs/ShinyHuntUnattended-Regigigas.h"
-
-
-//  This needs to be carefully calibrated.
-//    - If it's too short, it may stop on a non-shiny.
-//    - If it's too long, it may run from a shiny.
-//
-//  There is less than a 0.5 second window which this must land in.
-//
-//  The default value here is calibrated for the "average system". If it doesn't
-//  work, then you must calibrate it yourself.
-//
-const uint16_t START_TO_ATTACK_DELAY    =   3720;
-
-
-//  Rollover Prevention
-//
-//  Prevent a den from rolling over by periodically touching the date.
-//
-//  If set to zero, this feature is disabled.
-//  Otherwise, the program will touch the date at roughly this interval to
-//  prevent a den from rolling over. This feature requres time-sync be disabled.
-const uint32_t TOUCH_DATE_INTERVAL  =   (uint32_t)4 * 3600 * TICKS_PER_SECOND;  //  4 hours
-
-
-
-//  Time to return to the overworld after selecting a move.
-const uint16_t END_BATTLE_DELAY         =   22 * TICKS_PER_SECOND;
diff --git a/NativePrograms/PokemonSwSh/ShinyHuntUnattended-Regigigas2.c b/NativePrograms/PokemonSwSh/ShinyHuntUnattended-Regigigas2.c
deleted file mode 100644
index ffac48e6e2..0000000000
--- a/NativePrograms/PokemonSwSh/ShinyHuntUnattended-Regigigas2.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/*  Pokemon Sword & Shield: Soft-Reset for Regigigas
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- *      Please refer to the user manual for instructions and documentation.
- * 
- */
-
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-#include "Programs/ShinyHuntUnattended-Regigigas2.h"
-
-
-//  The amount of Reversal PP that you are saved with.
-const uint8_t REVERSAL_PP               =   24;
-
-
-//  This needs to be carefully calibrated.
-//    - If it's too short, it may stop on a non-shiny.
-//    - If it's too long, it may run from a shiny.
-//
-//  There is less than a 0.5 second window which this must land in.
-//
-//  The default value here is calibrated for the "average system". If it doesn't
-//  work, then you must calibrate it yourself.
-//
-const uint16_t START_TO_ATTACK_DELAY    =   3750;
-
-
-//  Rollover Prevention
-//
-//  Prevent a den from rolling over by periodically touching the date.
-//
-//  If set to zero, this feature is disabled.
-//  Otherwise, the program will touch the date at roughly this interval to
-//  prevent a den from rolling over. This feature requres time-sync be disabled.
-const uint32_t TOUCH_DATE_INTERVAL  =   (uint32_t)4 * 3600 * TICKS_PER_SECOND;  //  4 hours
-
-
-//  Time from when you attack to when you can decide to catch or not catch.
-const uint16_t ATTACK_TO_CATCH_DELAY    =   9 * TICKS_PER_SECOND;
-
-//  Time from deciding not to catch to returning to the overworld.
-const uint16_t CATCH_TO_OVERWORLD_DELAY =   8 * TICKS_PER_SECOND;
diff --git a/NativePrograms/PokemonSwSh/ShinyHuntUnattended-StrongSpawn.c b/NativePrograms/PokemonSwSh/ShinyHuntUnattended-StrongSpawn.c
deleted file mode 100644
index 8bd8ca26e6..0000000000
--- a/NativePrograms/PokemonSwSh/ShinyHuntUnattended-StrongSpawn.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/*  Pokemon Sword & Shield: Soft-Reset for Strong Spawn
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- *      Please refer to the user manual for instructions and documentation.
- * 
- */
-
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-#include "Programs/ShinyHuntUnattended-StrongSpawn.h"
-
-
-//  This needs to be carefully calibrated.
-//    - If it's too short, it may stop on a non-shiny.
-//    - If it's too long, it may run from a shiny.
-//
-//  There is less than a 0.5 second window which this must land in.
-//
-//  The default value here is unlikely to work for your setup since there are
-//  so many factors involved. You must calibrate it for your particular setup.
-//
-const uint16_t ENTER_GAME_TO_RUN_DELAY  =   2280;
-
-
-//  Time Rollback
-//
-//  Periodically roll back the time to keep the weather the same.
-//
-//  If set to zero, this feature is disabled.
-//  Otherwise, it roll the hour back by this amount every this many hours.
-//  This feature requres time-sync be disabled.
-const uint8_t TIME_ROLLBACK_HOURS   =   1;
-
-
-
-//  Wait this long for the game to start before pressing A to enter the game
-//  and start the encounter. You can try to decrease this to make resetting
-//  faster.
-const uint16_t PokemonSwSh_START_GAME_WAIT_DELAY    =   20 * TICKS_PER_SECOND;
diff --git a/NativePrograms/PokemonSwSh/ShinyHuntUnattended-SwordsOfJustice.c b/NativePrograms/PokemonSwSh/ShinyHuntUnattended-SwordsOfJustice.c
deleted file mode 100644
index aa23cdeb2b..0000000000
--- a/NativePrograms/PokemonSwSh/ShinyHuntUnattended-SwordsOfJustice.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/*  Pokemon Sword & Shield: Soft-Reset for Swords of Justice
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- *      Please refer to the user manual for instructions and documentation.
- * 
- */
-
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-#include "Programs/ShinyHuntUnattended-SwordsOfJustice.h"
-
-
-//  This needs to be carefully calibrated.
-//    - If it's too short, it may stop on a non-shiny.
-//    - If it's too long, it may run from a shiny.
-//
-//  There is less than a 0.5 second window which this must land in.
-//
-//  The default value here is calibrated for the "average system". If it doesn't
-//  work, then you must calibrate it yourself.
-//
-const uint16_t EXIT_CAMP_TO_RUN_DELAY   =   1890;
-
-//  Set this to true if you are running in airplane mode.
-const bool AIRPLANE_MODE                =   false;
-
-
-//  Time Rollback
-//
-//  Periodically roll back the time to keep the weather the same.
-//
-//  If set to zero, this feature is disabled.
-//  Otherwise, it roll the hour back by this amount every this many hours.
-//  This feature requres time-sync be disabled.
-const uint8_t TIME_ROLLBACK_HOURS   =   1;
-
-
-//  These timings are less important.
-const uint16_t ENTER_CAMP_DELAY         =   8 * TICKS_PER_SECOND;
-
diff --git a/NativePrograms/PokemonSwSh/SurpriseTrade.c b/NativePrograms/PokemonSwSh/SurpriseTrade.c
deleted file mode 100644
index d6faa69e3a..0000000000
--- a/NativePrograms/PokemonSwSh/SurpriseTrade.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/*  Pokemon Sword & Shield: Surprise Trader
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- *      Please refer to the user manual for instructions and documentation.
- * 
- */
-
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-#include "Programs/SurpriseTrade.h"
-
-
-
-const uint8_t BOXES_TO_TRADE    =   2;
-
-//  Time to wait for a trade partner.
-const uint16_t INITIAL_WAIT     =   30 * TICKS_PER_SECOND;
-
-
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-//  Advanced Settings (you shouldn't need to change these)
-
-const uint16_t TRADE_ANIMATION  =   23 * TICKS_PER_SECOND;
-const uint16_t EVOLVE_DELAY     =   30 * TICKS_PER_SECOND;
-
-
diff --git a/NativePrograms/PokemonSwSh/TradeBot.c b/NativePrograms/PokemonSwSh/TradeBot.c
deleted file mode 100644
index 7882df7651..0000000000
--- a/NativePrograms/PokemonSwSh/TradeBot.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/*  Pokemon Sword & Shield: Trade/Giveaway Bot
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- *      Please refer to the user manual for instructions and documentation.
- * 
- */
-
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-#include "Programs/TradeBot.h"
-
-
-//  Raid Code
-const char* TRADE_CODE              =   "1280 0000";
-
-const uint8_t BOXES_TO_TRADE        =   2;
-
-//  Set this if you are playing in German.
-const bool LINK_TRADE_EXTRA_LINE    =   false;
-
-//  Time to wait for a trade partner.
-const uint16_t SEARCH_DELAY         =   20 * TICKS_PER_SECOND;
-
-//  Time to wait for partner to confirm the trade.
-const uint16_t CONFIRM_DELAY        =   10 * TICKS_PER_SECOND;
-
-
-//  Increase these if your internet connection is slow.
-const uint16_t TRADE_START          =   10 * TICKS_PER_SECOND;
-const uint16_t TRADE_COMMUNICATION  =   20 * TICKS_PER_SECOND;
-
-
-////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////
-//  Advanced Settings (you shouldn't need to change these)
-
-const uint16_t TRADE_ANIMATION      =   23 * TICKS_PER_SECOND;
-const uint16_t EVOLVE_DELAY         =   30 * TICKS_PER_SECOND;
-
-
diff --git a/NativePrograms/PokemonSwSh/makefile b/NativePrograms/PokemonSwSh/makefile
deleted file mode 100644
index 0aaa59d827..0000000000
--- a/NativePrograms/PokemonSwSh/makefile
+++ /dev/null
@@ -1,133 +0,0 @@
-#
-#             LUFA Library
-#     Copyright (C) Dean Camera, 2014.
-#
-#  dean [at] fourwalledcubicle [dot] com
-#           www.lufa-lib.org
-# 
-#  Modified by https://github.com/PokemonAutomation/Arduino-Source
-#
-# --------------------------------------
-#         LUFA Project Makefile.
-# --------------------------------------
-
-#   MCU Types:
-#     atmega16u2    for Arduino UNO R3
-#     atmega32u4    for Arduino Micro, and Teensy 2.0
-#     at90usb1286   for Teensy 2.0++
-
-#   Set MCU and TARGET here:
-
-ifeq ($(BOARD_TYPE),)
-BOARD_TYPE := Teensy2
-endif
-ifeq ($(TARGET),)
-TARGET := TurboA
-#TARGET := Sandbox
-endif
-
-
-################################################################################
-#   Ignore all this stuff below.
-
-PATH_PUBLIC = ../../
-PATH_INTERNAL = ../../../Internal
-
-CATEGORY = PokemonSwSh
-
-#MCU          = atmega16u2
-ARCH         = AVR8
-F_CPU        = 16000000
-F_USB        = $(F_CPU)
-OPTIMIZATION = s
-#TARGET       = TurboA
-SRC          = $(TARGET).c
-LUFA_PATH    = $(PATH_PUBLIC)/NativePrograms/LUFA
-CC_FLAGS     = -DUSE_LUFA_CONFIG_HEADER -I$(PATH_PUBLIC) -I$(PATH_PUBLIC)/NativePrograms/LUFA/ -Wno-unused-function -Werror
-
-
-
-
-#   Board
-ifeq ($(BOARD_TYPE), ArduinoUnoR3)
-MCU := atmega16u2
-SRC += $(PATH_PUBLIC)/NativePrograms/DeviceFramework/Board-atmega16u2-ArduinoUnoR3.c
-endif
-ifeq ($(BOARD_TYPE), ArduinoLeonardo)
-MCU := atmega32u4
-SRC += $(PATH_PUBLIC)/NativePrograms/DeviceFramework/Board-atmega32u4-ArduinoLeonardo.c
-endif
-ifeq ($(BOARD_TYPE), ProMicro)
-MCU := atmega32u4
-SRC += $(PATH_PUBLIC)/NativePrograms/DeviceFramework/Board-atmega32u4-ProMicro.c
-endif
-ifeq ($(BOARD_TYPE), Teensy2)
-MCU := atmega32u4
-SRC += $(PATH_PUBLIC)/NativePrograms/DeviceFramework/Board-atmega32u4-Teensy2.c
-endif
-ifeq ($(BOARD_TYPE), TeensyPP2)
-MCU := at90usb1286
-SRC += $(PATH_PUBLIC)/NativePrograms/DeviceFramework/Board-at90usb1286-Teensy2.c
-endif
-
-#   Framework
-SRC += $(LUFA_SRC_USB)
-SRC += $(PATH_PUBLIC)/NativePrograms/DeviceFramework/Framework/DeviceSettings.c
-SRC += $(PATH_PUBLIC)/NativePrograms/NintendoSwitch/FrameworkSettings.c
-ifneq ("$(wildcard $(PATH_INTERNAL)/NativePrograms/NintendoSwitch/Framework/NintendoSwitch_PushButtons.c)","")
-CC_FLAGS += -I$(PATH_INTERNAL)
-SRC += $(PATH_PUBLIC)/Common/CRC32.c
-SRC += $(PATH_INTERNAL)/NativePrograms/NintendoSwitch/Framework/uart.c
-SRC += $(PATH_INTERNAL)/NativePrograms/NintendoSwitch/Framework/HardwareUSB.c
-ifeq ($(TARGET), PABotBase)
-SRC += $(PATH_INTERNAL)/NativePrograms/NintendoSwitch/Framework/CommandQueue.c
-else
-SRC += $(PATH_INTERNAL)/NativePrograms/NintendoSwitch/Framework/CommandQueueNull.c
-endif
-SRC += $(PATH_INTERNAL)/NativePrograms/NintendoSwitch/Framework/HardwareSerial.c
-SRC += $(PATH_INTERNAL)/NativePrograms/NintendoSwitch/Framework/Controller.c
-SRC += $(PATH_INTERNAL)/NativePrograms/NintendoSwitch/Framework/NintendoSwitch_PushButtons.c
-SRC += $(PATH_INTERNAL)/NativePrograms/NintendoSwitch/Framework/NintendoSwitch_ScalarButtons.c
-else
-LD_FLAGS += obj/obj-$(MCU)/CRC32.o
-LD_FLAGS += obj/obj-$(MCU)/uart.o
-LD_FLAGS += obj/obj-$(MCU)/HardwareUSB.o
-ifeq ($(TARGET), PABotBase)
-LD_FLAGS += obj/obj-$(MCU)/CommandQueue.o
-else
-LD_FLAGS += obj/obj-$(MCU)/CommandQueueNull.o
-endif
-LD_FLAGS += obj/obj-$(MCU)/HardwareSerial.o
-LD_FLAGS += obj/obj-$(MCU)/Controller.o
-LD_FLAGS += obj/obj-$(MCU)/NintendoSwitch_PushButtons.o
-LD_FLAGS += obj/obj-$(MCU)/NintendoSwitch_ScalarButtons.o
-endif
-
-#   Program
-SRC += $(PATH_PUBLIC)/NativePrograms/PokemonSwSh/PokemonSwSh_Settings.c
-SRC += $(PATH_PUBLIC)/NativePrograms/$(CATEGORY)/Programs/PokemonCallbacks.c
-ifneq ("$(wildcard $(PATH_INTERNAL)/NativePrograms/$(CATEGORY)/$(TARGET)_Core.c)","")
-SRC += $(PATH_INTERNAL)/NativePrograms/$(CATEGORY)/$(TARGET)_Core.c
-else ifneq ("$(wildcard Programs/$(TARGET)_Core.c)","")
-SRC += Programs/$(TARGET)_Core.c
-else ifneq ("$(wildcard obj/obj-$(MCU)/$(TARGET)_Core.o)","")
-LD_FLAGS += obj/obj-$(MCU)/$(TARGET)_Core.o
-endif
-
-#   Must go at the end or it blows up memory if floating-point is used.
-LD_FLAGS += -lm
-
-
-# Default target
-all:
-
-# Include LUFA build script makefiles
-include $(LUFA_PATH)/Build/lufa_core.mk
-include $(LUFA_PATH)/Build/lufa_sources.mk
-include $(LUFA_PATH)/Build/lufa_build.mk
-include $(LUFA_PATH)/Build/lufa_cppcheck.mk
-include $(LUFA_PATH)/Build/lufa_doxygen.mk
-include $(LUFA_PATH)/Build/lufa_dfu.mk
-include $(LUFA_PATH)/Build/lufa_hid.mk
-include $(LUFA_PATH)/Build/lufa_avrdude.mk
-include $(LUFA_PATH)/Build/lufa_atprogram.mk
diff --git a/NativePrograms/Scripts/Boards.txt b/NativePrograms/Scripts/Boards.txt
deleted file mode 100644
index 0b33355e13..0000000000
--- a/NativePrograms/Scripts/Boards.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-ArduinoUnoR3
-ArduinoLeonardo
-Teensy2
-ProMicro
-TeensyPP2
\ No newline at end of file
diff --git a/NativePrograms/Scripts/BuildAll.cmd b/NativePrograms/Scripts/BuildAll.cmd
deleted file mode 100644
index bea52ca920..0000000000
--- a/NativePrograms/Scripts/BuildAll.cmd
+++ /dev/null
@@ -1,115 +0,0 @@
-
-set board=%1
-
-if [%board%] == [] (
-    set /p board="Board Type: "
-)
-
-if [%board%] == [ArduinoUnoR3] (
-    set MCU=atmega16u2
-)
-if [%board%] == [ArduinoLeonardo] (
-    set MCU=atmega32u4
-)
-if [%board%] == [ProMicro] (
-    set MCU=atmega32u4
-)
-if [%board%] == [Teensy2] (
-    set MCU=atmega32u4
-)
-if [%board%] == [TeensyPP2] (
-    set MCU=at90usb1286
-)
-
-:: Just in case the PATH is messed up, but is installed in the usual place.
-set PATH=%PATH%C:\WinAVR-20100110\bin;
-set PATH=%PATH%C:\WinAVR-20100110\utils\bin;
-
-
-
-
-echo Checking make command...
-echo.
-
-make -v
-
-echo.
-echo.
-if %errorlevel% NEQ 0 (
-    echo make not found. Please install WinAVR.
-    echo.
-    pause
-    exit
-)
-
-
-:: Check MCU Compatibility
-if exist "obj\*.o" (
-    echo Existing build found. Checking MCU compatibility.
-    if not exist obj\build-%MCU% (
-        echo Incompatible MCU, cleaning...
-        @call !Cleanup.cmd >NUL 2>&1
-    ) else (
-        echo Existing build is compatible.
-    )
-) else (
-    echo No build found, continuing...
-)
-copy NUL obj\build-%MCU% > NUL
-
-
-echo.
-echo Starting build... This may take a while if your computer is slow.
-echo.
-
-if not exist obj\ (
-    mkdir obj\
-)
-
-
-::  Build one first to build all the shared libraries.
-::  Only then can we run the rest in parallel.
-
-for /F "tokens=*" %%p in (ProgramList.txt) do (
-    set first=%%p
-    if exist %%p.c (
-        @call %~dp0BuildOne.cmd %board% %%p > %%p.log  2>&1
-        goto :done
-    )
-)
-:done
-
-for /F "tokens=*" %%p in (ProgramList.txt) do (
-    if exist %%p.c (
-        if [%%p] NEQ [%first%] (
-            echo > %%p.tmp
-            START /B %~dp0BuildOne.cmd %board% %%p > %%p.log 2>&1
-        )
-    )
-)
-
-::@echo on
-
-:loop
-for /F "tokens=*" %%p in (ProgramList.txt) do (
-    if exist %%p.tmp goto :loop
-)
-
-for /F "tokens=*" %%p in (ProgramList.txt) do (
-    if exist %%p.c (
-        if not exist %%p.hex (
-            echo.
-            echo **Failed to build %%p.hex**.
-            echo Please see %%p.log for details.
-        )
-    )
-)
-
-echo.
-echo All Done! Double-check that the .hex have been made or updated.
-::echo Errors will logged in the respective .log file.
-::echo.
-
-echo You can now close this window.
-
-
diff --git a/NativePrograms/Scripts/BuildAllUnix.sh b/NativePrograms/Scripts/BuildAllUnix.sh
deleted file mode 100755
index f36b865725..0000000000
--- a/NativePrograms/Scripts/BuildAllUnix.sh
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/usr/bin/env bash
-# This bash script builds all of the different hex files for the programs included
-# NOTE: this script is a helper script that *should not be called directly*
-# please use the scripts provided in the root of this directory
-
-board=$1
-
-declare -a PROGRAMS=()
-
-#PROGRAMS+=("FriendDelete")
-#mapfile -t PROGRAMS < ProgramList.txt
-while IFS="$IFS"$'\r' read -r line; do
-    if [ -n "$line" ]; then
-        if [ -f "$line.c" ]; then
-            PROGRAMS+=("$line")
-        fi
-    fi
-done < ProgramList.txt
-
-
-echo "Now Checking the make command..."
-echo ""
-
-if ! command -v make -v &> /dev/null; then
-    echo "make could not be found. Please install make"
-    exit
-fi
-
-echo "Starting the build... This may take a while if your computer is slow"
-echo ""
-
-
-# check the obj directory and make it if it doesn't exist
-if [ ! -d obj/ ]; then
-    mkdir obj/
-fi
-
-if [ ! -d log/ ]; then
-    mkdir log/
-fi
-
-# build one of them first to establish the library
-for p in "${PROGRAMS[@]}"; do
-    first="$p"
-    echo "$first"
-
-    echo "sh ../Scripts/BuildOneUnix.sh $board $p"
-    sh ../Scripts/BuildOneUnix.sh $board $p
-
-    retVal=$?
-    if [ $retVal -ne 0 ]; then
-        echo ""
-        echo "WARNING: Something went wrong building $first" 1>&2
-        echo "WARNING: The most likely cause is remnants of builds from different boards." 1>&2
-        rm obj/*.d obj/*.o
-        echo "WARNING: Attempting build again..." 1>&2
-
-        sh ../Scripts/BuildOneUnix.sh $board $p
-        retVal=$?
-
-        # one last check, if it errors again, we'll exit
-        if [ $retVal -ne 0 ]; then
-            echo "ERROR - CRITICAL: Another error occured, so it was something else. Please run 'bash !CleanupUnix.sh' and try again."
-            echo "IF THIS PERSISTS: PLEASE LOOK AT THE LOG FILE FOR $first IN logs/"
-        else
-            echo "The rebuild was successful! Continuing other programs!"
-        fi
-    fi
-
-    # break out of the first value
-    break
-done
-
-# then we can actually run everything in the programs
-for p in "${PROGRAMS[@]}"; do
-    if [ "$p" != "$first" ]; then
-        # send it off and pipe it to a log file
-        sh ../Scripts/BuildOneUnix.sh $board $p 2>&1 | tee "log/$p.log" &
-    fi
-done
-
-FAIL=0
-
-# run a check to make sure that we're done with each program
-# this waiting ensures that we're finishing before we move on
-for job in `jobs -p`
-do
-    wait $job || let "FAIL+=1"
-done
-
-echo "$FAIL jobs failed"
-
-echo ""
-echo "Done building! Double-check that the .hex files have been made or updated."
-
-echo "You can close this window now!"
diff --git a/NativePrograms/Scripts/BuildOne.cmd b/NativePrograms/Scripts/BuildOne.cmd
deleted file mode 100644
index 2379101df0..0000000000
--- a/NativePrograms/Scripts/BuildOne.cmd
+++ /dev/null
@@ -1,30 +0,0 @@
-::echo off
-
-set board=%1
-set program=%2
-
-if [%board%] == [] (
-    set /p board="Board Type: "
-)
-if [%program%] == [] (
-    set /p program="Program Name: "
-)
-
-del "%program%.hex"
-make BOARD_TYPE="%board%" TARGET="%program%"
-avr-size --mcu=%MCU% -C %program%.elf
-
-::if %errorlevel% NEQ 0 (
-::   echo Build Failed. Error %errorlevel%
-::   del "%program%.hex"
-::   pause
-::)
-
-del "%program%.map"
-del "%program%.eep"
-del "%program%.bin"
-del "%program%.lss"
-del "%program%.sym"
-del "%program%.tmp"
-
-::pause
\ No newline at end of file
diff --git a/NativePrograms/Scripts/BuildOneUnix.sh b/NativePrograms/Scripts/BuildOneUnix.sh
deleted file mode 100755
index f84b3f96cd..0000000000
--- a/NativePrograms/Scripts/BuildOneUnix.sh
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/usr/bin/env bash
-# NOTE: this script is a helper script that *should not be called directly*
-# please use the scripts provided in the root of this directory
-
-# get the MCU from the first argument
-# define the MCU 
-board=$1
-
-if [ -z "$board" ]; then
-      read -p 'No MCU Type given, please enter: ' board
-fi
-
-# get the program from the second argument
-program=$2
-
-if [ -z "$program" ]; then
-      read -p 'No program given, please enter: ' program
-fi
-
-# delete the existing hex program if it exists
-if [ -f "$program.hex" ]; then
-    rm $program.hex
-fi
-
-# Allows running a cleanup. Adding for the MacOS port of the GUI
-# while maintaining compatibility with the CLI scripts
-
-gui=$3
-if [[ $gui == "gui" ]]; then 
-      obj_files=obj/*.o
-      if [[ ! -z $obj_files ]]; then
-            echo "Existing build found. Checking MCU compatibility."
-            if [[ ! -f "obj/build-$MCU" ]]; then
-                  echo "Incompatible MCU, cleaning..."
-                  bash 00-CleanupUnix.sh
-            else
-                  echo "Existing build is compatible."
-            fi
-      else
-            echo "No build found, continuing..."
-      fi
-fi
-
-# then call make
-make BOARD_TYPE="$board" TARGET="$program"
-
-# then we can clean up the map, eep, bin, lss, sym, tmp
-rm $program.map > /dev/null 2>&1
-rm $program.eep > /dev/null 2>&1
-rm $program.bin > /dev/null 2>&1
-rm $program.lss > /dev/null 2>&1
-rm $program.sym > /dev/null 2>&1
-rm $program.elf > /dev/null 2>&1
-
-# Also putting this behind the gui-wall
-if [[ $gui == "gui" ]]; then
-      CATEGORY="$(basename ${PWD})" # hex_file = settings.path + m_category + "-" + m_name + ("-" + board + ".hex").c_str();
-      mv "$program.hex" "../../${CATEGORY}-$program-$board.hex"
-fi
\ No newline at end of file
diff --git a/NativePrograms/Scripts/fzf-linux b/NativePrograms/Scripts/fzf-linux
deleted file mode 100755
index 0269f08e86..0000000000
Binary files a/NativePrograms/Scripts/fzf-linux and /dev/null differ
diff --git a/NativePrograms/Scripts/fzf-mac b/NativePrograms/Scripts/fzf-mac
deleted file mode 100755
index 10af58a840..0000000000
Binary files a/NativePrograms/Scripts/fzf-mac and /dev/null differ
diff --git a/README.md b/README.md
index 86c92bac2a..025f60cb21 100644
--- a/README.md
+++ b/README.md
@@ -1,23 +1,30 @@
-# Arduino-Source
-
-This is the source code for all the main Arduino programs.
-
-[<img src="https://canary.discordapp.com/api/guilds/695809740428673034/widget.png?style=banner2">](https://discord.gg/cQ4gWxN)
-
-
-# Licensing:
-- Unless otherwise specified, all source code in this repository is under the MIT license.
-- Some files may be under other (compatible) licenses.
-- All precompiled binaries and object files are free for non-commercial use only. For all other uses, please contact the Pokémon Automation server admins.
-
-# Dependencies:
-- Qt5 and Qt6 (LGPLv3)
-- [LUFA (MIT License)](https://github.com/abcminiuser/lufa)
-- [nlohmann json (MIT License)](https://github.com/nlohmann/json)
-- [Tesseract (Apache 2.0 License)](https://github.com/tesseract-ocr/tesseract)
-- [Tesseract for Windows (Apache 2.0 License)](https://github.com/peirick/Tesseract-OCR_for_Windows)
-- [OpenCV (Apache 2.0 License)](https://github.com/opencv/opencv)
-- [QDarkStyleSheet (MIT License)](https://github.com/ColinDuquesnoy/QDarkStyleSheet)
-- [Sleepy Discord (MIT License)](https://github.com/yourWaifu/sleepy-discord)
-- [D++ (Apache 2.0 License)](https://github.com/brainboxdotcc/DPP)
-- [Qt Wav Reader (BSD License)](https://code.qt.io/cgit/qt/qtmultimedia.git/tree/examples/multimedia/spectrum/app/wavfile.cpp?h=5.15)
+# Arduino-Source
+
+This is the source code for all the main Arduino programs.
+
+[<img src="https://canary.discordapp.com/api/guilds/695809740428673034/widget.png?style=banner2">](https://discord.gg/cQ4gWxN)
+
+
+# Licensing:
+- Unless otherwise specified, all source code in this repository is under the MIT license.
+- Some files may be under other (compatible) licenses.
+- All precompiled binaries and object files are free for non-commercial use only. For all other uses, please contact the Pokémon Automation server admins.
+
+# Dependencies:
+
+| **Dependency** | **License** |
+| --- | --- |
+| Qt6 | LGPLv3 |
+| [QDarkStyleSheet](https://github.com/ColinDuquesnoy/QDarkStyleSheet) | MIT |
+| [Qt Wav Reader](https://code.qt.io/cgit/qt/qtmultimedia.git/tree/examples/multimedia/spectrum/app/wavfile.cpp?h=5.15) | BSD |
+| [nlohmann json](https://github.com/nlohmann/json) | MIT |
+| [D++](https://github.com/brainboxdotcc/DPP) | Apache 2.0 |
+| [Tesseract](https://github.com/tesseract-ocr/tesseract) | Apache 2.0 |
+| [Tesseract for Windows](https://github.com/peirick/Tesseract-OCR_for_Windows) | Apache 2.0 |
+| [OpenCV](https://github.com/opencv/opencv) | Apache 2.0 |
+| [ONNX](https://github.com/microsoft/onnxruntime) | MIT |
+| [sdbus-c++](https://github.com/Kistler-Group/sdbus-cpp) | LGPLv2.1 |
+
+Vanilla GPL is disallowed, though LGPL is allowed. This is for the following reasons:
+1. A tiny portion of the project is not open-sourced. (mostly related to telemetry and internal research experiments)
+2. We reserve right to re-license the project in ways that do not abide by the copy-left requirement of GPL.
diff --git a/SerialPrograms/Build-Qt5.12.md b/SerialPrograms/Build-Qt5.12.md
deleted file mode 100644
index fcff81b3f5..0000000000
--- a/SerialPrograms/Build-Qt5.12.md
+++ /dev/null
@@ -1,60 +0,0 @@
-# How to Build (Qt 5.12) - Windows
-
-## Build Tools:
-
-1. Install Visual Studio 2019:
-    1. [Download Page](https://docs.microsoft.com/en-us/visualstudio/releases/2019/release-notes)
-    2. Make sure you select the C++ development tools.
-2. Install Windows Development SDK:
-    1. [Download Page](https://developer.microsoft.com/en-us/windows/downloads/windows-sdk/)
-3. Install CMake:
-    1. [Download Page](https://cmake.org/download/)
-    2. When prompted select, "Add CMake to the system PATH for all users".
-4. Install Qt 5.12.12:
-    1. [Download the offline installer.](https://www.qt.io/offline-installers) [Direct Download Link](https://download.qt.io/official_releases/qt/5.12/5.12.12/qt-opensource-windows-x86-5.12.12.exe)
-    2. Disconnect from the internet. This is needed to keep it from forcing you to create an account.
-    3. Run the installer.
-    4. When prompted for components, select all of the following:
-        - Qt 5.12.12
-            - MSVC 2017 32-bit
-            - MSVC 2017 64-bit
-            - MinGW 7.3.0 32-bit
-            - MinGW 7.3.0 64-bit
-        - Developer and Designer Tools
-            - Qt Creator 5.0.2 CDB Debugger Support
-            - MinGW 7.3.0 32-bit
-            - MinGW 7.3.0 64-bit
-
-![](../BuildSetup/Windows-Install-Qt.png)
-
-## Setup:
-
-1. Clone this repo.
-2. Clone the [Packages Repo](https://github.com/PokemonAutomation/Packages).
-3. In the `Packages` repo, copy the `SerialPrograms/Resources` folder into the root of the `Arduino-Source` repo.
-
-![](../BuildSetup/Directory.png)
-
-4. Open Qt Creator.
-5. Click on `Projects` -> `Open`.
-6. Navigate to [`SerialPrograms`](./) and select `CMakeLists.txt`.
-7. It will then ask you to configure the project. Select `Desktop Qt 5.12.12 MSVC2017 64bit`*.
-8. At the bottom left corner, click on the little monitor and select `Release with Debug Information`.
-9. Open up the file `CMakeLists.txt`. Change `QT_MAJOR` to `5`.![](../BuildSetup/QT_MAJOR-6.png)
-10. Click the upper green arrow** to compile and launch the program.
-
-![](../BuildSetup/Windows-Configuration.png)
-
-
-*Even though it says "MSVC2017", it will be using your MSVC 2019 installation instead.
-
-**Note that you will not be able to feasibly run with a debugger attached. This is because Qt Creator places a breakpoint on every single thrown exception and this application heavily uses exceptions even for non-error situations. So the debugger will break on literally everything. If you know how to disable break on exceptions, please let us know.
-
-
-<hr>
-
-**Discord Server:** 
-
-
-[<img src="https://canary.discordapp.com/api/guilds/695809740428673034/widget.png?style=banner2">](https://discord.gg/cQ4gWxN)
-
diff --git a/SerialPrograms/Build-Qt6.3.md b/SerialPrograms/Build-Qt6.3.md
deleted file mode 100644
index f032c21fd8..0000000000
--- a/SerialPrograms/Build-Qt6.3.md
+++ /dev/null
@@ -1,65 +0,0 @@
-# How to Build (Qt 6.3) - Windows
-
-## Build Tools:
-
-1. Install Visual Studio 2019:
-    1. [Download Page](https://docs.microsoft.com/en-us/visualstudio/releases/2019/release-notes)
-    2. Make sure you select the C++ development tools.
-2. Install Windows Development SDK:
-    1. [Download Page](https://developer.microsoft.com/en-us/windows/downloads/windows-sdk/)
-3. Install CMake:
-    1. [Download Page](https://cmake.org/download/)
-    2. When prompted select, "Add CMake to the system PATH for all users".
-
-## Install Qt 6.3:
-
-Unlike with Qt 5.12, there is no offline installer for it. So you have two options here, use the online installer, or use a copy of an installation.
-
-### Official Online Installer:
-
-If you are ok with creating an account with Qt and using their online installer, then use this method.
-
-1. Download the online installer from here: https://www.qt.io/download-qt-installer
-2. Select the following options: ![](../BuildSetup/Windows-Install-Qt6.3.1.png)
-
-If you repeatedly run into an error involving "SSL handshake failed", you will not be able to use the online installer. Please try the other option.
-
-### Unofficial Installation Copy:
-
-If you are unable or unwilling to use the online installer, the alternative is to copy an installation directly into your system. To do this, you will need to download the installation from us, and copy it into your C drive.
-
-1. Join our [Discord server](https://discord.gg/cQ4gWxN) and ask for the link to the Qt6 standalone. Someone will DM you with a link*.
-2. Download `Qt6.3.2.7z` and decompress it. You can use [7-zip](https://www.7-zip.org/) to decompress it. This will create a folder with the same name.
-3. Move this folder to `C:\`. It will probably ask you for permissions to do it.
-4. Navigate to: `C:\Qt6.3.2\Tools\QtCreator\bin\` and create a shortcut to `qtcreator.exe`. Copy this shortcut to somewhere convenient. (By default this shortcut is named, `Qt Creator 8.0.1 (Community)`)
-
-*This Qt6 standalone file is 3GB in size and is being hosted by our staff for our own developers. We don't want the entire world converging here and overrunning the server.
-
-## Setup:
-
-1. Clone this repo.
-2. Clone the [Packages Repo](https://github.com/PokemonAutomation/Packages).
-3. In the `Packages` repo, copy the `SerialPrograms/Resources` folder into the root of the `Arduino-Source` repo.
-
-![](../BuildSetup/Directory.png)
-
-4. Open Qt Creator.
-5. Click on `Projects` -> `Open`.
-6. Navigate to [`SerialPrograms`](./) and select `CMakeLists.txt`.
-7. It will then ask you to configure the project. Select `Desktop Qt 6.3.2 MSVC2019 64bit`.
-8. At the bottom left corner, click on the little monitor and select `Release with Debug Information`.
-9. Open up the file `CMakeLists.txt`. Change `QT_MAJOR` to `6`.![](../BuildSetup/QT_MAJOR-6.png)
-10. Click the upper green arrow to compile and launch the program.
-
-![](../BuildSetup/Windows-Configuration-Qt6.png)
-
-
-
-
-<hr>
-
-**Discord Server:** 
-
-
-[<img src="https://canary.discordapp.com/api/guilds/695809740428673034/widget.png?style=banner2">](https://discord.gg/cQ4gWxN)
-
diff --git a/SerialPrograms/Build-Qt6.4.md b/SerialPrograms/Build-Qt6.4.md
deleted file mode 100644
index 69c654e1a0..0000000000
--- a/SerialPrograms/Build-Qt6.4.md
+++ /dev/null
@@ -1,67 +0,0 @@
-# How to Build (Qt 6.4) - Windows
-
-***Note: Qt 6.4 is not recommended at this time due to a bug in their video pipeline that distorts colors.***
-
-## Build Tools:
-
-1. Install Visual Studio 2019:
-    1. [Download Page](https://docs.microsoft.com/en-us/visualstudio/releases/2019/release-notes)
-    2. Make sure you select the C++ development tools.
-2. Install Windows Development SDK:
-    1. [Download Page](https://developer.microsoft.com/en-us/windows/downloads/windows-sdk/)
-3. Install CMake:
-    1. [Download Page](https://cmake.org/download/)
-    2. When prompted select, "Add CMake to the system PATH for all users".
-
-## Install Qt 6.4:
-
-Unlike with Qt 5.12, there is no offline installer for it. So you have two options here, use the online installer, or use a copy of an installation.
-
-### Official Online Installer:
-
-If you are ok with creating an account with Qt and using their online installer, then use this method.
-
-1. Download the online installer from here: https://www.qt.io/download-qt-installer
-2. Select the following options: ![](../BuildSetup/Windows-Install-Qt6.4.0.png)
-
-If you repeatedly run into an error involving "SSL handshake failed", you will not be able to use the online installer. Please try the other option.
-
-### Unofficial Installation Copy:
-
-If you are unable or unwilling to use the online installer, the alternative is to copy an installation directly into your system. To do this, you will need to download the installation from us, and copy it into your C drive.
-
-1. Join our [Discord server](https://discord.gg/cQ4gWxN) and ask for the link to the Qt6 standalone. Someone will DM you with a link*.
-2. Download `Qt6.4.0.7z` and decompress it. You can use [7-zip](https://www.7-zip.org/) to decompress it. This will create a folder with the same name.
-3. Move this folder to `C:\`. It will probably ask you for permissions to do it.
-4. Navigate to: `C:\Qt6.4.0\Tools\QtCreator\bin\` and create a shortcut to `qtcreator.exe`. Copy this shortcut to somewhere convenient. (By default this shortcut is named, `Qt Creator 8.0.1 (Community)`)
-
-*This Qt6 standalone file is 3GB in size and is being hosted by our staff for our own developers. We don't want the entire world converging here and overrunning the server.
-
-## Setup:
-
-1. Clone this repo.
-2. Clone the [Packages Repo](https://github.com/PokemonAutomation/Packages).
-3. In the `Packages` repo, copy the `SerialPrograms/Resources` folder into the root of the `Arduino-Source` repo.
-
-![](../BuildSetup/Directory.png)
-
-4. Open Qt Creator.
-5. Click on `Projects` -> `Open`.
-6. Navigate to [`SerialPrograms`](./) and select `CMakeLists.txt`.
-7. It will then ask you to configure the project. Select `Desktop Qt 6.4.0 MSVC2019 64bit`.
-8. At the bottom left corner, click on the little monitor and select `Release with Debug Information`.
-9. Open up the file `CMakeLists.txt`. Change `QT_MAJOR` to `6`.![](../BuildSetup/QT_MAJOR-6.png)
-10. Click the upper green arrow to compile and launch the program.
-
-![](../BuildSetup/Windows-Configuration-Qt6.png)
-
-
-
-
-<hr>
-
-**Discord Server:** 
-
-
-[<img src="https://canary.discordapp.com/api/guilds/695809740428673034/widget.png?style=banner2">](https://discord.gg/cQ4gWxN)
-
diff --git a/SerialPrograms/BuildInstructions/Build-Ubuntu-ARM64-Qt6.8.3.md b/SerialPrograms/BuildInstructions/Build-Ubuntu-ARM64-Qt6.8.3.md
new file mode 100644
index 0000000000..7b2f481b45
--- /dev/null
+++ b/SerialPrograms/BuildInstructions/Build-Ubuntu-ARM64-Qt6.8.3.md
@@ -0,0 +1,106 @@
+# How to Build (Qt 6.8.3) - Ubuntu 24.04 aarch64 (ARM64)
+
+This covers building on **Linux ARM64/aarch64**, as opposed to x86\_64 Ubuntu (see `Build-Ubuntu-Qt6.8.2.md` for limited x86\_64 guidance) or macOS (see `CompilingForMac.md`).
+
+NOTE: This is only for ARM Linux server build testing. There is no GUI testing to guarantee the GUI of the built application works.
+
+NOTE: The content below in this document is generated by a local AI agent and Claude on Sep 5, 2026 as a build reference. 
+No humans have followed through the guide to ensure its correctness yet.
+
+Ubuntu's own Qt6 packages are far too old (Qt 6.4 on 24.04), and Qt does not publish prebuilt Linux ARM64 packages through its online installer, so Qt has to be built from source. Everything else (OpenCV, Tesseract, D-Bus) is available through `apt` on Ubuntu 24.04.
+
+This was verified with:
+- Ubuntu 24.04.4 LTS, kernel 6.17, aarch64
+- Qt 6.8.3 (built from source)
+- CMake 3.28, Ninja, GCC (system default)
+
+## 1. Install build tools and dependencies
+
+```bash
+sudo apt update
+sudo apt install build-essential cmake ninja-build git pkg-config
+
+# Libraries this project links against directly
+sudo apt install libopencv-dev libtesseract-dev libleptonica-dev \
+    libsystemd-dev libopenexr-dev libgl1-mesa-dev libglx-dev \
+    libglu1-mesa-dev
+
+# Dependencies needed to build Qt itself (xcb platform plugin, fonts, etc.)
+sudo apt install libxkbcommon-dev libxkbcommon-x11-dev libxcb-cursor-dev \
+    libxcb-icccm4-dev libxcb-image0-dev libxcb-keysyms1-dev libxcb-randr0-dev \
+    libxcb-render-util0-dev libxcb-shape0-dev libxcb-sync-dev libxcb-xfixes0-dev \
+    libxcb-xinerama0-dev libxcb-xkb-dev libxcb1-dev libx11-dev libx11-xcb-dev \
+    libxext-dev libxfixes-dev libxi-dev libxrender-dev libfontconfig1-dev \
+    libfreetype-dev libssl-dev
+
+# FFmpeg dev libs so Qt Multimedia gets a working webcam/video backend
+sudo apt install libavcodec-dev libavformat-dev libavutil-dev libswscale-dev \
+    libswresample-dev
+```
+
+Note: `libopencv-dev` on 24.04 provides OpenCV 4.6, and `libtesseract-dev` provides Tesseract 5.3.4. Both are picked up via `pkg-config` (`opencv4`, `tesseract`) by `SerialPrograms/CMakeLists.txt` — no manual OpenCV build is required on Linux (unlike Windows/Mac, which use prebuilt binaries from the `Packages` repo).
+
+## 2. Build Qt 6.8.3 from source
+
+```bash
+mkdir -p ~/src && cd ~/src
+wget https://download.qt.io/official_releases/qt/6.8/6.8.3/single/qt-everywhere-src-6.8.3.tar.xz
+tar xf qt-everywhere-src-6.8.3.tar.xz
+cd qt-everywhere-src-6.8.3
+
+mkdir build && cd build
+../configure -prefix "$HOME/qt/6.8.3" -release -opensource -confirm-license \
+    -nomake examples -nomake tests \
+    -skip qtwebengine -skip qt3d -skip qtwayland
+
+cmake --build . --parallel "$(nproc)"
+cmake --install .
+```
+
+This builds the full "everywhere" module set (qtbase, qtdeclarative, qtmultimedia, qtserialport, qtsvg, qttools, qtwebsockets, etc.), which is what this project needs (`Widgets`, `SerialPort`, `Multimedia`, `MultimediaWidgets`, `OpenGLWidgets`, `Qml`, `Quick`, `QuickWidgets`). Expect this step to take a long time (well over an hour on most ARM64 boards) and to need ~20-30 GB of free disk space during the build.
+
+If you already have a Qt 6.8.x install (e.g. built previously, or via `aqtinstall`/a distro package new enough to include the above modules), you can skip this step — you just need its install prefix for step 4.
+
+## 3. Get the `Resources` folder (Packages repo)
+
+`SerialPrograms/CMakeLists.txt` expects a sibling `Packages` checkout next to this repo (i.e. `Arduino-Source/Packages`, not a `Resources` folder copied inside `SerialPrograms/`):
+
+```bash
+cd /path/to/Arduino-Source   # the repo root, containing SerialPrograms/, Common/, etc.
+git clone https://github.com/PokemonAutomation/Packages
+```
+
+CMake copies `Packages/Resources` into the build output automatically on first configure/build.
+
+## 4. Configure and build
+
+From the repo root:
+
+```bash
+cmake -S SerialPrograms -B build/RelWithDebInfo -G Ninja \
+    -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+    -DCMAKE_PREFIX_PATH="$HOME/qt/6.8.3"
+
+cmake --build build/RelWithDebInfo --parallel "$(nproc)"
+```
+
+Notes:
+- **Discord Social SDK is auto-disabled on Linux ARM64.** Discord doesn't offer a Linux ARM64 build of the Social SDK (per their platform-compatibility docs, Linux support is x86_64-only; Windows ARM64 and macOS ARM64 are both fully supported). `CMakeLists.txt` defaults the `PA_SOCIAL_SDK` option to `OFF` automatically when it detects a non-Apple ARM/aarch64 target, so you don't need to pass anything for this — it's mentioned here only so you know why `Compiling with Discord social SDK integration disabled` shows up during configure. You can still force it on/off explicitly with `-DPA_SOCIAL_SDK=ON` or `=OFF` on any platform.
+- **ONNX Runtime** is downloaded automatically for you (aarch64 build, from the official `microsoft/onnxruntime` GitHub releases) if you don't already have one. If you want to point at a pre-downloaded copy instead, pass `-DONNX_ROOT_PATH=/path/to/onnxruntime-linux-aarch64-1.23.0`.
+- `DPP` (D++ / Discord bot library) is optional and auto-detected via `pkg-config`; it isn't installed by the apt commands above, so you'll see `Compiling with DPP integration disabled`, which is expected and fine.
+
+The two binaries are produced at `build/RelWithDebInfo/SerialPrograms` (GUI) and `build/RelWithDebInfo/SerialProgramsCommandLine`.
+
+## 5. Run
+
+```bash
+./build/RelWithDebInfo/SerialPrograms
+```
+
+Only the command-line tool and a headless (`QT_QPA_PLATFORM=offscreen`) launch of the GUI binary were exercised while verifying this build — both start up and resolve all shared libraries correctly (checked with `ldd`). Actual on-screen GUI behavior (e.g. the video-preview flicker noted for x86_64 Ubuntu in `Build-Ubuntu-Qt6.8.2.md`) has not been separately verified on ARM64.
+
+<hr>
+
+**Discord Server:**
+
+[<img src="https://canary.discordapp.com/api/guilds/695809740428673034/widget.png?style=banner2">](https://discord.gg/cQ4gWxN)
diff --git a/SerialPrograms/BuildInstructions/Build-Ubuntu-Qt6.8.2.md b/SerialPrograms/BuildInstructions/Build-Ubuntu-Qt6.8.2.md
new file mode 100644
index 0000000000..ad65c8191a
--- /dev/null
+++ b/SerialPrograms/BuildInstructions/Build-Ubuntu-Qt6.8.2.md
@@ -0,0 +1,54 @@
+# How to Build (Qt 6.8.2) - Ubuntu 24.04
+
+Note that our Ubuntu setup does not work. The video display flickers to the point of being unusable.
+
+## Build Tools:
+
+Install the following packages:
+
+```
+sudo apt install cmake
+sudo apt install libglx-dev libgl1-mesa-dev
+sudo apt install libopencv-dev
+```
+
+
+## Install Qt 6.8.2:
+
+1. Download the online installer from here: https://www.qt.io/download-qt-installer
+2. Select custom install settings.
+3. Select the following options: 
+    - Qt 6.8.2
+        - MSVC 2022 64-bit
+        - Sources
+        - Additional Libraries
+            - Qt Image Formats
+            - Qt Multimedia
+            - Qt Serial Port
+        - Qt Debug Information Files   
+
+![](Images/Windows-Install-Qt6.7.3-Custom.png)
+![](Images/Windows-Install-Qt6.8.2-Components.png)
+
+## Setup:
+
+1. Clone this repo.
+2. Clone the [Packages Repo](https://github.com/PokemonAutomation/Packages).
+3. In the `Packages` repo, copy the `SerialPrograms/Resources` folder into the root of the `Arduino-Source` repo.
+
+![](Images/Directory.png)
+
+4. Open Qt Creator.
+5. Click on `File` -> `Open File or Project`.
+6. Navigate to `SerialPrograms` and select `CMakeLists.txt`.
+7. Enable parallel build: Build & Run -> Build Steps -> Build -> Details -> CMake arguments: `-j16` (the # of cores you have)
+8. At the bottom left corner, click on the little monitor and select `Release with Debug Information`.
+9. Still in the bottom left corner, click the upper green arrow to compile and launch the program.
+
+<hr>
+
+**Discord Server:** 
+
+
+[<img src="https://canary.discordapp.com/api/guilds/695809740428673034/widget.png?style=banner2">](https://discord.gg/cQ4gWxN)
+
diff --git a/SerialPrograms/BuildInstructions/Build-Windows-Qt6.10.0.md b/SerialPrograms/BuildInstructions/Build-Windows-Qt6.10.0.md
new file mode 100644
index 0000000000..40407ab0b0
--- /dev/null
+++ b/SerialPrograms/BuildInstructions/Build-Windows-Qt6.10.0.md
@@ -0,0 +1,83 @@
+# How to Build (Qt 6.10.0) - Windows
+
+## Build Tools:
+
+The installation order here is important. While other orderings may work, this is the specific order that we have tested. And the Qt installation must be the last thing installed.
+
+1. Install Visual Studio 2022:
+    1. [Download Page](https://docs.microsoft.com/en-us/visualstudio/releases/2022/release-notes)
+    2. Make sure you select the C++ development tools.
+2. Install Windows Development SDK:
+    1. [Download Page](https://developer.microsoft.com/en-us/windows/downloads/windows-sdk/)
+3. Install CMake:
+    1. [Download Page](https://cmake.org/download/)
+    2. When prompted select, "Add CMake to the system PATH for all users".
+
+## Install Qt 6.10.0:
+
+Unlike with Qt 5.12, there is no offline installer for it. So you have two options here, use the online installer, or use a copy of an installation.
+
+### Official Online Installer:
+
+If you are ok with creating an account with Qt and using their online installer, then use this method.
+
+1. Download the online installer from here: [https://www.qt.io/download-qt-Images/](https://www.qt.io/development/download-qt-installer-oss)
+3. Select the following options: 
+    - Qt 6.10.0
+        - MSVC 2022 64-bit
+        - Sources
+        - Additional Libraries
+            - Qt Image Formats
+            - Qt Multimedia
+            - Qt Serial Port
+        - Qt Debug Information Files
+    - Qt Creator
+        - Qt Creator 17.0.2
+        - CDB Debugger Support
+        - Debugging Tools for Windows
+        - Debug Symbols
+
+![](Images/Windows-Install-Qt6.10.0-Custom.png)
+![](Images/Windows-Install-Qt6.10.0-Components.png)
+
+If you repeatedly run into an error involving "SSL handshake failed", you will not be able to use the online installer. Please try the other option.
+
+### Unofficial Installation Copy:
+
+If you are unable or unwilling to use the online installer, the alternative is to copy an installation directly into your system. To do this, you will need to download the installation from us, and copy it into your C drive.
+
+1. Join our [Discord server](https://discord.gg/cQ4gWxN) and ask for the link to the Qt6 standalone. Someone will DM you with a link*.
+2. Download `Qt6.10.0.7z` and decompress it. You can use [7-zip](https://www.7-zip.org/) to decompress it. This will create a folder with the same name.
+3. Move this folder to `C:\`. It will probably ask you for permissions to do it.
+4. Navigate to: `C:\Qt6.10.0\Tools\QtCreator\bin\` and create a shortcut to `qtcreator.exe`. Copy this shortcut to somewhere convenient. (By default this shortcut is named, `Qt Creator 17.0.2 (Community)`)
+
+*This Qt6 standalone file is 3GB in size and is being hosted by our staff for our own developers. We don't want the entire world converging here and overrunning the server.
+
+## Setup:
+
+1. Clone this repo.
+
+TODO
+
+![](Images/Windows-Install-Qt6.10.0-Configure.png)
+![](Images/Windows-Install-Qt6.10.0-Run.png)
+
+
+## Troubleshooting
+
+TODO
+
+
+## Upgrading Qt components
+
+TODO
+
+<hr>
+
+**Discord Server:** 
+
+
+[<img src="https://canary.discordapp.com/api/guilds/695809740428673034/widget.png?style=banner2">](https://discord.gg/cQ4gWxN)
+
+
+
diff --git a/SerialPrograms/BuildInstructions/Build-Windows-Qt6.8.3.md b/SerialPrograms/BuildInstructions/Build-Windows-Qt6.8.3.md
new file mode 100644
index 0000000000..e54cf6386d
--- /dev/null
+++ b/SerialPrograms/BuildInstructions/Build-Windows-Qt6.8.3.md
@@ -0,0 +1,126 @@
+# How to Build (Qt 6.8.3) - Windows
+
+**(Note: These instructions have not been fully tested for 6.8.3. Let us know if you encounter any issues.)**
+
+## Build Tools:
+
+The installation order here is important. While other orderings may work, this is the specific order that we have tested. And the Qt installation must be the last thing installed.
+
+1. Install Visual Studio 2022:
+   1. [Download Page](https://docs.microsoft.com/en-us/visualstudio/releases/2022/release-notes)
+   2. Make sure you select the C++ development tools.
+2. Install Windows Development SDK:
+   1. [Download Page](https://developer.microsoft.com/en-us/windows/downloads/windows-sdk/)
+3. Install CMake:
+   1. [Download Page](https://cmake.org/download/)
+   2. When prompted select, "Add CMake to the system PATH for all users".
+
+## Install Qt 6.8.3:
+
+Unlike with Qt 5.12, there is no offline installer for it. So you have two options here, use the online installer, or use a copy of an installation.
+
+### Official Online Installer:
+
+If you are ok with creating an account with Qt and using their online installer, then use this method.
+
+1. Download the online installer from here: https://www.qt.io/download-qt-installer-oss/
+2. Select the following options:
+   - Qt 6.8.3
+     - MSVC 2022 64-bit
+     - Sources
+     - Additional Libraries
+       - Qt Image Formats
+       - Qt Multimedia
+       - Qt Serial Port
+     - Qt Debug Information Files
+
+![](Images/Windows-Install-Qt6.8.3-Custom.png)
+![](Images/Windows-Install-Qt6.8.3-Components.png)
+
+If you repeatedly run into an error involving "SSL handshake failed", you will not be able to use the online installer. Please try the other option.
+
+### Unofficial Installation Copy:
+
+If you are unable or unwilling to use the online installer, the alternative is to copy an installation directly into your system. To do this, you will need to download the installation from us, and copy it into your C drive.
+
+1. Join our [Discord server](https://discord.gg/cQ4gWxN) and ask for the link to the Qt6 standalone. Someone will DM you with a link\*.
+2. Download `Qt6.8.3.7z` and decompress it. You can use [7-zip](https://www.7-zip.org/) to decompress it. This will create a folder with the same name.
+3. Move this folder to `C:\`. It will probably ask you for permissions to do it.
+4. Navigate to: `C:\Qt6.8.3\Tools\QtCreator\bin\` and create a shortcut to `qtcreator.exe`. Copy this shortcut to somewhere convenient. (By default this shortcut is named, `Qt Creator 16.0.0 (Community)`)
+
+\*This Qt6 standalone file is 3GB in size and is being hosted by our staff for our own developers. We don't want the entire world converging here and overrunning the server.
+
+## Setup:
+
+1. Clone this repo.
+2. Clone the [Packages Repo](https://github.com/PokemonAutomation/Packages).
+3. In the `Packages` repo, copy the `SerialPrograms/Resources` folder into the root of the `Arduino-Source` repo.
+
+![](Images/Directory.png)
+
+4. Open Qt Creator.
+5. Click on `File` -> `Open File or Project`.
+6. Navigate to `SerialPrograms` and select `CMakeLists.txt`.
+7. It will then ask you to configure the project. Ensure `Desktop Qt 6.8.3 MSVC2022 64bit` and `Release with Debug Information` are selected.
+   - Ensure the build directory for `Desktop_Qt_6_8_2_MSVC2022_64bit-RelWithDebInfo` is located in the root of the `Arduino-Source` repo, and not buried in subfolders (e.g. `build` or `SerialPrograms`).
+   - Click `Configure Project`.
+
+![](Images/Windows-configure-project-qt-creator-13.png)
+
+8. At the bottom left corner, click on the little monitor and select `Release with Debug Information`.
+
+![](Images/Windows-Configuration-Qt6.png)
+
+9. Still in the bottom left corner, click the upper green arrow to compile and launch the program.
+
+## Troubleshooting
+
+### Failed to open '../3rdPartyBinaries/opencv_world460d.zip', or file missing
+
+- Click `Projects` on the left sidebar.
+- In `Build directory`, ensure the build directory for `Desktop_Qt_6_8_3_MSVC2022_64bit-RelWithDebInfo` is located in the root of the `Arduino-Source` repo, and not buried in subfolders (e.g. `build` or `SerialPrograms`).
+  - e.g. change the default build directory from: `Arduino-Source/SerialPrograms/build/Desktop_Qt_6_8_3_MSVC2022_64bit-RelWithDebInfo`
+    - to: `Arduino-Source/build-SerialPrograms-Desktop_Qt_6_8_3_MSVC2022_64bit-RelWithDebInfo`
+
+## Upgrading Qt components
+
+### Installing newer Qt version
+
+If you have already have older versions of Qt installed, but need to upgrade Qt components, you can use the Maintenance tool, which comes pre-instaled with Qt (C:\Qt\MaintenanceTool.exe).
+
+- When prompted, in `Maintenance Actions`, choose `Add or remove components`.
+- You may select the components needed, as per the instructions above, for the newer version. And de-select old versions to remove them, if you wish.
+- Optional: In `Maintenance Actions`, you may also choose `Update components` as well. To update Qt Creator, and other components.
+
+### Building with the newer Qt version
+
+- Open the `SerialPrograms` project in Qt, as outlined in the "Setup" section above.
+- In the toolbar, click `Edit` -> `Preferences`
+- Under `Kits` tab, choose the newer Qt version (e.g. Desktop Qt 6.8.3)
+  <img src="Images/QT-kits.png">
+
+- Under `Compiler`, set it to Microsoft Visual C++ Compiler or Visual Studio, if not already set.
+- Click `Ok`, to save Kits preferences.
+- Click the Monitor symbol at the bottom left
+  <img src="Images/QT-kit-build.png">
+
+- Under `Kit`: choose the desired Qt version.
+- Under `Build`: choose `Release with Debug Information`
+- Click the green arrow to compile and launch the program.
+- Optional: Move the `UserSettings` folder from the old build folder to the new build folder, to keep your old settings, such as the dev key.
+
+### Upgrade compiler
+
+- Upgrade the compiler by installing a new version of Visual Studio. Ensure `Desktop development with C++` is checked, so the latest MSVC compiler is also installed.
+- Open the `SerialPrograms` project in Qt, as outlined in the "Setup" section above.
+- In the toolbar, click `Edit` -> `Preferences`
+- Click the `Kits` tab on the left. Then click the `Compilers` tab, click `Re-detect` to refresh the list of compilers. Then click `Apply` in the bottom right.
+- Back in the `Kits` tab, your newly installed compilers should now show up in the list of compilers.
+
+When building, if you get the error `yvals_core.h:931: error: STL1001: Unexpected compiler version, expected MSVC 19.42 or newer` (or something similar), consider deleting the old build folder, and rebuilding from scratch.
+
+<hr>
+
+**Discord Server:**
+
+[<img src="https://canary.discordapp.com/api/guilds/695809740428673034/widget.png?style=banner2">](https://discord.gg/cQ4gWxN)
diff --git a/SerialPrograms/BuildInstructions/CompilingForMac.md b/SerialPrograms/BuildInstructions/CompilingForMac.md
new file mode 100644
index 0000000000..8569cd0f76
--- /dev/null
+++ b/SerialPrograms/BuildInstructions/CompilingForMac.md
@@ -0,0 +1,368 @@
+# Guide for Installing SerialPrograms on Mac
+
+## Introduction
+Guide for how to install our open-source Pokémon automation software, **SerialPrograms** on Mac. This works for both Intel CPU and M1.
+
+Note we don't have all the optimization for M1 yet. So running on M1 macbook could be a bit slower.
+
+The guide involves some program development processes.
+But the guide is aimed for any Mac user. You don't need to know programming to follow the guide.
+
+If you have any questions regarding the documentation or find any errors in the doc, feel free to contact us directly in [our Discord server](https://discord.gg/cQ4gWxN).
+
+Warning: if you don't have software development experience and deviate from the guide steps, you are at your own risk.
+
+## Part 1: Install Pre-requisites
+### Install XCode App
+
+This is a program made by Apple for software development. It also comes with basic software tools to build **SerialPrograms**. So it's safe to install it first.
+
+1. Go to Mac App Store App: Click the Apple Logo at the top left of the screen. Click `App Store` to open.
+2. Search for XCode in the searchbar. The app should look like this:
+
+<img src="Images/Mac/xcode.png" alt="A photo of the XCode app" width="202" height="81">
+
+3. Click `Get` to install. This may take a while.
+
+### Launch Terminal
+
+The Terminal App comes with MacOS and is the place where commands are executed. We'll be using the Terminal app for the rest of the installation.
+
+1. Open the Spotlight Search tool: Spotlight Search allows you to search your Mac for programs to run. To open, press `Command-Space` or click the Magnifying Glass icon in the toolbar.
+2. Search for `Terminal` and press `return`/`Enter`
+
+To run the commands provided in the rest of the guide, simply paste the command into the window and hit `return`/`Enter`
+
+> Note: if you type a wrong letter in Terminal, press Delete key to delete it, or press `Control-C` to void the entire line and start with a fresh new line to input another command.
+
+Apps like Terminal are often shown in movies and shows as what hackers work with on their computers.
+If you haven't used one before, be extra careful! Commands in Terminal are powerful and certain commands delete your files or even destroy your MacOS!
+Only execute the commands in this guide in Terminal.
+
+### Install Homebrew
+
+[Homebrew](https://brew.sh/) is a Mac software that manages software packages. **SerialPrograms** relies on several other open-source software components (called libraries, or packages by software developers). Homebrew is a tool to download and manage those packages.
+
+To install it, the instruction on Homebrew [home page](https://brew.sh/) is to use the command:
+```
+/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
+```
+> Note: if the current Homebrew home page has a different instruction than the one above, follow that from the home page. If you don't know how to do that, contact [us](https://discord.gg/cQ4gWxN).
+
+Follow the prompted texts in Terminal to finish the installation.
+- You will need to type your macOS password to give permission to install Homebrew.
+- It will ask you to install Command Line Tools for XCode. XCode is the software development program made by Apple. It has some toolsets needed to build **SerialPrograms**. Follow the text guide on Terminal and install Command Line Tools for XCode.
+- After installation finishes, the prompted text will say
+
+```
+==> Next steps:
+- Run these three commands in your terminal to add Homebrew to your PATH:
+    echo '# Set PATH, MANPATH, etc., for Homebrew.' >> /Users/<YOUR_MAC_USERNAME>/.zprofile
+    echo 'eval "$(/opt/homebrew/bin/brew shellenv)"' >> /Users/<YOUR_MAC_USERNAME>/.zprofile
+    eval "$(/opt/homebrew/bin/brew shellenv)"
+```
+Copy each of the three lines of commands (two starts with "echo" and one starts with "eval") into Terminal and press Enter to execute them.
+You need to copy one line, press Enter to execute it, then move on to the next line. You cannot execute all three lines in one single copy-paste.
+These commands make the installed Homebrew and future packages it will install, accessible in Terminal.
+
+> Note: if the prompted text after installation finishes has a different set of commands than the one above, follow that from your Terminal.
+If you don't know how to do that, contact [us](https://discord.gg/cQ4gWxN).
+
+You can verify Homebrew installation is successful by executing `brew help` in Terminal.
+You should see a screen of Homebrew instruction shows up like
+```
+Example usage:
+  brew search TEXT|/REGEX/
+  brew info [FORMULA|CASK...]
+  brew install FORMULA|CASK...
+  brew update
+  brew upgrade [FORMULA|CASK...]
+  brew uninstall FORMULA|CASK...
+  brew list [FORMULA|CASK...]
+```
+
+> Note: you can scroll up and down in Terminal to see texts outside of the current screen.
+
+## Part 2: Install Packages
+
+### Install CMake
+
+CMake is a software tool that helps compile programs. Install it using Homebrew by running in Terminal
+```
+brew install cmake
+```
+
+### Install Ninja
+
+Ninja is a build tool that CMake can use to find out quickly what files need rebuilding. Install it using Homebrew by running in Terminal
+```
+brew install ninja
+```
+
+### Install Qt6
+
+We use Qt6 software library to build UI (windows, panels, buttons...) for **SerialPrograms**. It also plays and decodes audio.
+
+Our current Qt version is Qt 6.10.2 with its Multimedia and Serial Port modules, including a shipped FFmpeg for fast video encode/decode.
+Please don't use Homebrew to install Qt directly (`brew install qt6`). It is a different Qt version, and on Mac its Multimedia module is buggy and built without FFmpeg.
+
+We install Qt with aqtinstall, a tool that downloads Qt from Qt's official servers.
+Install aqtinstall by running in Terminal
+```
+brew install aqtinstall
+```
+Then install Qt by running in Terminal
+```
+aqt install-qt mac desktop 6.10.2 clang_64 -m qtmultimedia qtserialport --outputdir ~/Qt
+```
+This puts Qt in the folder `~/Qt/6.10.2/macos` (about 1.7 GB). It works on both Intel and Apple Silicon Macs.
+
+> Note: if you installed Qt with Homebrew before, you can leave it installed.
+The compile steps below tell CMake to use the Qt in `~/Qt`.
+
+### Install Tesseract
+
+We need Tesseract software package to support our OCR (optical character recognition) technique to read texts from images.
+
+Install it by running in Terminal
+```
+brew install tesseract
+```
+
+After installation, the prompted text may tell you that 
+```
+==> Caveats
+This formula contains only the "eng", "osd", and "snum" language data files.
+If you need any other supported languages, run `brew install tesseract-lang`.
+```
+This says currently installed Tesseract can only read English. If your game language is not English,
+run in Terminal
+```
+brew install tesseract-lang
+```
+to install other languages.
+Contact [us](https://discord.gg/cQ4gWxN) if you have questions when installing other languages.
+
+### Install OpenCV
+
+OpenCV is a software package for various computer vision algorithms. We need it for using advance video inference methods. Install it by running in Terminal
+```
+brew install opencv
+```
+
+### Install DPP (optional)
+DPP is a library for Discord integration. If you need discord webhooks for notification you need to install it.
+You can do this step after [Part 3: Download Codebase](#part-3-download-codebase).
+
+We pin DPP to version 10.1.6 for compatibility and stability. To install this exact version, create a local Homebrew tap:
+
+```shell
+brew tap-new --no-git <yourname>/libdpp # change <yourname> to any desired name, e.g. "my"
+```
+Copy the formula into the tap:
+```shell
+cp <SOURCE_DIR_ROOT>/3rdPartyBinaries/libdpp@10.1.6.rb $(brew --prefix)/Library/Taps/<yourname>/homebrew-libdpp/Formula/ # change <SOURCE_DIR_ROOT> to where *Arduino-Source* located
+```
+And then install it with:
+```shell
+brew unlink libdpp # if you have already install the official one
+brew install libdpp@10.1.6
+```
+
+### Verify Clang Version
+
+Before building the code of the automation program, make sure the software that builds the code into program is up-to-date. This software is called compilers by programmers. Apple provides a compiler called Clang on macOS. Verify its version by executing the command in Terminal:
+```
+g++ --version
+```
+You should see the output like
+```
+Apple clang version 14.0.0 (clang-1400.0.29.102)
+Target: arm64-apple-darwin21.6.0
+Thread model: posix
+InstalledDir: /Library/Developer/CommandLineTools
+```
+The exact version, target and installed directory may be different on your machine.
+But as long as your Clang version is higher than 13.0.0, you should be fine to proceed.
+
+If you find your Clang version is too low, check this [tutorial](UpdateClang.md) to address it.
+
+## Part 3: Download Codebase
+
+### Download SerialPrograms Source Code
+
+Go to **SerialPrograms** Github [webpage](https://github.com/PokemonAutomation/Arduino-Source).
+
+#### Option 1 - Use Git:
+If you know how to use Git to download code from Github, you can use Git and pick a release version based on Git branch names. Otherwise, use Option 2
+
+#### Option 2 - Download directly as a zip file:
+Otherwise, download code directly as follows.
+By default, when you visit this webpage, it lets you download the newest under-development version.
+The version may contain automation programs that are not fully developed or have major bugs.
+To use one of our stable release versions, first check the version numbers by pressing the dropdown menu currently shown as "main" on the webpage,
+on the same row as the green "Code" button.
+
+The dropdown menu shows recent version numbers. You can pick the latest version you find.
+Once you select a version, the text of the dropdown menu will be changed from "main" to that version.
+
+<img src="Images/Mac/branch-version.png" alt="A photo of the Arduino-Source branches on GitHub" width="166" height="286">
+
+After that, click the green "Code" button. It will show several download options.
+You can pick "Download ZIP" to download the code as a ZIP file.
+The code you download will be from the version you picked.
+The default ZIP filename will be "Arduino-Source-\<VERSION_NUMBER\>.zip"
+
+<img src="Images/Mac/download-zip.png" alt="A photo of the menu to download the Arduino-Source code as a zip file" width="205" height="185">
+
+Place the code into a suitable folder you like. But avoid placing it in a "remote/cloud" folder like in OneDrive.
+Cloud folders may give some trouble for programs running on those folders.
+Also avoid placing it in your macOS account's "Desktop" folder or "Documents" folder.
+macOS has strict folder access management. It may reject the program from accessing data in those folders.
+An example path is
+```
+/Users/<YOUR_MAC_USERNAME>/games/pokemon/
+```
+If you download as a ZIP, unzip it to a suitable folder. Double click the .zip file to unzip it.
+
+The downloaded code should be in a folder called "Arduino-Source". Using the above example, the full path of the folder is
+```
+/Users/<YOUR_MAC_USERNAME>/games/pokemon/Arduino-Source
+```
+
+
+### Download Program Package Files
+
+**SerialPrograms** needs some extra data (images, audio files and Pokémon data text files) to run.
+Go to our [Packages Github webpage](https://github.com/PokemonAutomation/Packages) and download the data as a zip file the same as before but you don't need to pick the versions.
+
+Unzip the download and move the `Packages` folder to inside `Arduino-Source`
+
+<img src="Images/Mac/packages.png" alt="A photo of the Resources folder inside Arduino-Source" width="460">
+
+## Part 4: Compile the Program
+
+### Enter source-code folder:
+
+Click the "Arduino-Source" folder to select it in Finder App. `Command-C` to copy the folder, then go to Terminal, type `cd`, followed by a Space key, then `Command-V` to paste the folder. It actually pastes the folder path in the MacOS file system to the Terminal. So you would have
+```
+cd <YOUR_PATH_TO_ARDUINO-SOURCE_FOLDER>
+```
+in your Terminal. Press `return`/`Enter` to execute it. 
+
+`cd` command moves the current active folder in Terminal to a new folder that you specify. Now your Terminal is running in the "Arduino-Source" folder. Verify this by executing
+```
+ls
+```
+in Terminal. It will list the files and folders in "Arduino-Source" folder.
+
+### Create a folder to host the compiled program:
+
+Make sure the current active folder in Terminal is the "Arduino-Source" folder, then execute the command in Terminal:
+```
+mkdir -p build_mac; cd build_mac
+```
+This makes a new folder called "build_mac" in "Arduino-Source" and moves the Terminal's current active folder to the new folder.
+
+### Use CMake to Configure Program:
+
+Execute the command in Terminal:
+```
+cmake ../SerialPrograms/ -G Ninja -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_PREFIX_PATH=$HOME/Qt/6.10.2/macos
+```
+This command uses CMake to configure our code to prepare for compilation. `-G Ninja` tells CMake to compile with Ninja, and `-DCMAKE_PREFIX_PATH` tells CMake where the Qt you installed is. If successful, it should print texts like
+```
+...
+-- Configuring done
+-- Generating done
+-- Build files have been written to: <YOUR_PATH_TO_ARDUINO-SOURCE_FOLDER>/build_mac
+```
+
+### Compile Program
+
+Make sure the current active folder in Terminal is "build_mac", then execute the command in Terminal:
+```
+cmake --build . -j 10
+```
+to compile and build the program in "build_mac" folder.
+It will take a while to build depending on your computer's speed.
+
+Each line starts with a counter like `[25/1613]`. If successful, the counter reaches the total, and the last lines in Terminal look like
+```
+[1613/1613] Linking CXX executable SerialPrograms.app/Contents/MacOS/SerialPrograms
+[Deploy] Copying resources ...
+[Deploy] Copying firmware
+[Deploy] Copying scripts
+```
+
+We have built the program on our mac computers, so in most cases you won't see any error during building.
+But in case your machine has very different hardware or software environment as ours,
+and as a result it prints out error messages about the code,
+please reach out to us in [our Discord server](https://discord.gg/cQ4gWxN) for help.
+
+## Part 5: Running the Program
+
+Now **SerialPrograms** is built! in the "build_mac" folder, double click the "SerialPrograms" app to open.
+
+If you're opening the program for the first time, MacOS may ask for Camera and Microphone permissions. These are required in order to read video and audio from your capture card. The program does not access your Mac's actual camera and microphone!
+
+<img src="Images/Mac/compiled-app.png" alt="A photo of the compiled SerialPrograms app" width="460" height="218">
+
+
+Enjoy shiny hunting!
+
+---------------------
+
+## Part 6: Upgrading
+
+### Upgrade to Newest Version
+
+To upgrade, in most cases you just need to repeat the process starting at [Download Codebase](#part-3-download-codebase).
+
+> Note: When updating an existing installation you can `cd` into the existing "build_mac" folder. This way, only the files that changed are recompiled, saving you a lot of time!
+
+```
+cd build_mac
+```
+instead of ...
+```
+mkdir -p build_mac; cd build_mac
+```
+
+> Note: if your "build_mac" folder was made before we switched to Ninja, the CMake command stops with `Does not match the generator used previously: Unix Makefiles`. [Install Ninja](#install-ninja) if you haven't yet, then in the "Arduino-Source" folder run `rm -rf build_mac` to delete the old folder, and start the build again with Ninja.
+
+### Package updating
+In rare cases when we add new software library dependencies, just follow the guide to install those new libraries.
+
+If we upgrade our Qt dependency to a higher Qt version, install the new version with aqtinstall, the same way as in [Install Qt6](#install-qt6).
+For example, for Qt 6.11.0 run in Terminal:
+```
+aqt install-qt mac desktop 6.11.0 clang_64 -m qtmultimedia qtserialport --outputdir ~/Qt
+```
+
+### Switching to a different Qt
+
+CMake remembers which Qt it used the first time it configured "build_mac".
+So when you switch Qt (from Homebrew's Qt to the Qt in `~/Qt`, or to a newer Qt version), start a new "build_mac" folder.
+In the "Arduino-Source" folder, run in Terminal
+```
+rm -rf build_mac
+```
+to delete the old "build_mac" folder. Then follow [Part 4: Compile the Program](#part-4-compile-the-program) again,
+with the new Qt version in the `-DCMAKE_PREFIX_PATH` part of the CMake command.
+
+
+
+<hr>
+
+Guide Written by: jw098
+
+**Discord Server:** 
+
+[<img src="https://canary.discordapp.com/api/guilds/695809740428673034/widget.png?style=banner2">](https://discord.gg/cQ4gWxN)
+
+
+
+
+
+
diff --git a/BuildSetup/Directory.png b/SerialPrograms/BuildInstructions/Images/Directory.png
similarity index 100%
rename from BuildSetup/Directory.png
rename to SerialPrograms/BuildInstructions/Images/Directory.png
diff --git a/SerialPrograms/BuildInstructions/Images/Mac/branch-version.png b/SerialPrograms/BuildInstructions/Images/Mac/branch-version.png
new file mode 100644
index 0000000000..e41fa96e47
Binary files /dev/null and b/SerialPrograms/BuildInstructions/Images/Mac/branch-version.png differ
diff --git a/SerialPrograms/BuildInstructions/Images/Mac/compiled-app.png b/SerialPrograms/BuildInstructions/Images/Mac/compiled-app.png
new file mode 100644
index 0000000000..3f44049d1e
Binary files /dev/null and b/SerialPrograms/BuildInstructions/Images/Mac/compiled-app.png differ
diff --git a/SerialPrograms/BuildInstructions/Images/Mac/download-zip.png b/SerialPrograms/BuildInstructions/Images/Mac/download-zip.png
new file mode 100644
index 0000000000..0a5548bbdc
Binary files /dev/null and b/SerialPrograms/BuildInstructions/Images/Mac/download-zip.png differ
diff --git a/SerialPrograms/BuildInstructions/Images/Mac/packages.png b/SerialPrograms/BuildInstructions/Images/Mac/packages.png
new file mode 100644
index 0000000000..d3c9495002
Binary files /dev/null and b/SerialPrograms/BuildInstructions/Images/Mac/packages.png differ
diff --git a/SerialPrograms/BuildInstructions/Images/Mac/xcode.png b/SerialPrograms/BuildInstructions/Images/Mac/xcode.png
new file mode 100644
index 0000000000..d1820f8abd
Binary files /dev/null and b/SerialPrograms/BuildInstructions/Images/Mac/xcode.png differ
diff --git a/SerialPrograms/BuildInstructions/Images/QT-kit-build.png b/SerialPrograms/BuildInstructions/Images/QT-kit-build.png
new file mode 100644
index 0000000000..53a19c8eb5
Binary files /dev/null and b/SerialPrograms/BuildInstructions/Images/QT-kit-build.png differ
diff --git a/SerialPrograms/BuildInstructions/Images/QT-kits.png b/SerialPrograms/BuildInstructions/Images/QT-kits.png
new file mode 100644
index 0000000000..ffc3d8f555
Binary files /dev/null and b/SerialPrograms/BuildInstructions/Images/QT-kits.png differ
diff --git a/BuildSetup/QT_MAJOR-6.png b/SerialPrograms/BuildInstructions/Images/QT_MAJOR-6.png
similarity index 100%
rename from BuildSetup/QT_MAJOR-6.png
rename to SerialPrograms/BuildInstructions/Images/QT_MAJOR-6.png
diff --git a/BuildSetup/Windows-Configuration-Qt6.png b/SerialPrograms/BuildInstructions/Images/Windows-Configuration-Qt6.png
similarity index 100%
rename from BuildSetup/Windows-Configuration-Qt6.png
rename to SerialPrograms/BuildInstructions/Images/Windows-Configuration-Qt6.png
diff --git a/BuildSetup/Windows-Configuration.png b/SerialPrograms/BuildInstructions/Images/Windows-Configuration.png
similarity index 100%
rename from BuildSetup/Windows-Configuration.png
rename to SerialPrograms/BuildInstructions/Images/Windows-Configuration.png
diff --git a/BuildSetup/Windows-Install-Qt.png b/SerialPrograms/BuildInstructions/Images/Windows-Install-Qt.png
similarity index 100%
rename from BuildSetup/Windows-Install-Qt.png
rename to SerialPrograms/BuildInstructions/Images/Windows-Install-Qt.png
diff --git a/SerialPrograms/BuildInstructions/Images/Windows-Install-Qt6.10.0-Components.png b/SerialPrograms/BuildInstructions/Images/Windows-Install-Qt6.10.0-Components.png
new file mode 100644
index 0000000000..8175004dd8
Binary files /dev/null and b/SerialPrograms/BuildInstructions/Images/Windows-Install-Qt6.10.0-Components.png differ
diff --git a/SerialPrograms/BuildInstructions/Images/Windows-Install-Qt6.10.0-Configure.png b/SerialPrograms/BuildInstructions/Images/Windows-Install-Qt6.10.0-Configure.png
new file mode 100644
index 0000000000..147d1bbb0d
Binary files /dev/null and b/SerialPrograms/BuildInstructions/Images/Windows-Install-Qt6.10.0-Configure.png differ
diff --git a/SerialPrograms/BuildInstructions/Images/Windows-Install-Qt6.10.0-Custom.png b/SerialPrograms/BuildInstructions/Images/Windows-Install-Qt6.10.0-Custom.png
new file mode 100644
index 0000000000..00794a1b5b
Binary files /dev/null and b/SerialPrograms/BuildInstructions/Images/Windows-Install-Qt6.10.0-Custom.png differ
diff --git a/SerialPrograms/BuildInstructions/Images/Windows-Install-Qt6.10.0-Run.png b/SerialPrograms/BuildInstructions/Images/Windows-Install-Qt6.10.0-Run.png
new file mode 100644
index 0000000000..f8dcdd094d
Binary files /dev/null and b/SerialPrograms/BuildInstructions/Images/Windows-Install-Qt6.10.0-Run.png differ
diff --git a/BuildSetup/Windows-Install-Qt6.3.1.png b/SerialPrograms/BuildInstructions/Images/Windows-Install-Qt6.3.1.png
similarity index 100%
rename from BuildSetup/Windows-Install-Qt6.3.1.png
rename to SerialPrograms/BuildInstructions/Images/Windows-Install-Qt6.3.1.png
diff --git a/BuildSetup/Windows-Install-Qt6.4.0.png b/SerialPrograms/BuildInstructions/Images/Windows-Install-Qt6.4.0.png
similarity index 100%
rename from BuildSetup/Windows-Install-Qt6.4.0.png
rename to SerialPrograms/BuildInstructions/Images/Windows-Install-Qt6.4.0.png
diff --git a/SerialPrograms/BuildInstructions/Images/Windows-Install-Qt6.5.3.png b/SerialPrograms/BuildInstructions/Images/Windows-Install-Qt6.5.3.png
new file mode 100644
index 0000000000..28cac7ee14
Binary files /dev/null and b/SerialPrograms/BuildInstructions/Images/Windows-Install-Qt6.5.3.png differ
diff --git a/SerialPrograms/BuildInstructions/Images/Windows-Install-Qt6.7.3-Components.png b/SerialPrograms/BuildInstructions/Images/Windows-Install-Qt6.7.3-Components.png
new file mode 100644
index 0000000000..13296edc3a
Binary files /dev/null and b/SerialPrograms/BuildInstructions/Images/Windows-Install-Qt6.7.3-Components.png differ
diff --git a/SerialPrograms/BuildInstructions/Images/Windows-Install-Qt6.7.3-Custom.png b/SerialPrograms/BuildInstructions/Images/Windows-Install-Qt6.7.3-Custom.png
new file mode 100644
index 0000000000..005298b53e
Binary files /dev/null and b/SerialPrograms/BuildInstructions/Images/Windows-Install-Qt6.7.3-Custom.png differ
diff --git a/SerialPrograms/BuildInstructions/Images/Windows-Install-Qt6.8.0-Components.png b/SerialPrograms/BuildInstructions/Images/Windows-Install-Qt6.8.0-Components.png
new file mode 100644
index 0000000000..176c4fd267
Binary files /dev/null and b/SerialPrograms/BuildInstructions/Images/Windows-Install-Qt6.8.0-Components.png differ
diff --git a/SerialPrograms/BuildInstructions/Images/Windows-Install-Qt6.8.1-Components.png b/SerialPrograms/BuildInstructions/Images/Windows-Install-Qt6.8.1-Components.png
new file mode 100644
index 0000000000..e5490c9f7c
Binary files /dev/null and b/SerialPrograms/BuildInstructions/Images/Windows-Install-Qt6.8.1-Components.png differ
diff --git a/SerialPrograms/BuildInstructions/Images/Windows-Install-Qt6.8.2-Components.png b/SerialPrograms/BuildInstructions/Images/Windows-Install-Qt6.8.2-Components.png
new file mode 100644
index 0000000000..a9494407be
Binary files /dev/null and b/SerialPrograms/BuildInstructions/Images/Windows-Install-Qt6.8.2-Components.png differ
diff --git a/SerialPrograms/BuildInstructions/Images/Windows-Install-Qt6.8.3-Components.png b/SerialPrograms/BuildInstructions/Images/Windows-Install-Qt6.8.3-Components.png
new file mode 100644
index 0000000000..c3760871b3
Binary files /dev/null and b/SerialPrograms/BuildInstructions/Images/Windows-Install-Qt6.8.3-Components.png differ
diff --git a/SerialPrograms/BuildInstructions/Images/Windows-Install-Qt6.8.3-Custom.png b/SerialPrograms/BuildInstructions/Images/Windows-Install-Qt6.8.3-Custom.png
new file mode 100644
index 0000000000..fbd65aa25a
Binary files /dev/null and b/SerialPrograms/BuildInstructions/Images/Windows-Install-Qt6.8.3-Custom.png differ
diff --git a/SerialPrograms/BuildInstructions/Images/Windows-Install-Qt6.9.0-Components.png b/SerialPrograms/BuildInstructions/Images/Windows-Install-Qt6.9.0-Components.png
new file mode 100644
index 0000000000..5fe593ed75
Binary files /dev/null and b/SerialPrograms/BuildInstructions/Images/Windows-Install-Qt6.9.0-Components.png differ
diff --git a/SerialPrograms/BuildInstructions/Images/Windows-Install-Qt6.9.0-Custom.png b/SerialPrograms/BuildInstructions/Images/Windows-Install-Qt6.9.0-Custom.png
new file mode 100644
index 0000000000..8299c7b385
Binary files /dev/null and b/SerialPrograms/BuildInstructions/Images/Windows-Install-Qt6.9.0-Custom.png differ
diff --git a/SerialPrograms/BuildInstructions/Images/Windows-configure-project-qt-creator-13.png b/SerialPrograms/BuildInstructions/Images/Windows-configure-project-qt-creator-13.png
new file mode 100644
index 0000000000..2ed418caf8
Binary files /dev/null and b/SerialPrograms/BuildInstructions/Images/Windows-configure-project-qt-creator-13.png differ
diff --git a/SerialPrograms/BuildInstructions/Images/Windows-configure-project.png b/SerialPrograms/BuildInstructions/Images/Windows-configure-project.png
new file mode 100644
index 0000000000..3bd217455f
Binary files /dev/null and b/SerialPrograms/BuildInstructions/Images/Windows-configure-project.png differ
diff --git a/SerialPrograms/CMakeLists.txt b/SerialPrograms/CMakeLists.txt
index 920405e01e..35bb597e32 100644
--- a/SerialPrograms/CMakeLists.txt
+++ b/SerialPrograms/CMakeLists.txt
@@ -1,17 +1,32 @@
-#set the minimum cmake version required
-cmake_minimum_required(VERSION 3.18.0)
+# Set the minimum cmake version required
+cmake_minimum_required(VERSION 3.24.0)
 
-#set the name of the project
+# Tell CMake to re-run configuration when these files change (get around Qt issues with stale CMake files)
+set(_cmake_files_to_watch
+    "${CMAKE_SOURCE_DIR}/CMakeLists.txt"
+    "${CMAKE_SOURCE_DIR}/CMakePresets.json"
+)
+
+# Watch any helper .cmake files under cmake/
+file(GLOB_RECURSE _cmake_helper_files "${CMAKE_SOURCE_DIR}/cmake/*.cmake")
+list(APPEND _cmake_files_to_watch ${_cmake_helper_files})
+
+# Append to the directory property so CMake will reconfigure when these change
+set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${_cmake_files_to_watch})
+#message(STATUS "CMake will reconfigure when these change: ${_cmake_files_to_watch}")
+
+# Set the project name
 project(SerialPrograms)
 
-#enable c++ 20
+# Enable C++23
 set(CMAKE_CXX_STANDARD 23)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-#produce clang tidy file
+# Produce clang tidy file
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 #set(CMAKE_VERBOSE_MAKEFILE ON)
 
+# Set these three on globally so all intermediate Qt targets can get processed automatically
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
@@ -19,1986 +34,639 @@ set(CMAKE_AUTOUIC ON)
 add_custom_target(build-time-make-directory ALL
     COMMAND ${CMAKE_COMMAND} -E make_directory Assembly/)
 
+# Internal repo or not, we're always building from the SerialPrograms folder
+set(REPO_ROOT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../")
+
+# Determine environment
+if(DEFINED ENV{GITHUB_ACTIONS})
+    message(STATUS "Detected CI environment, skipping qt deployment")
+    set(QT_DEPLOY_FILES FALSE)
+else()
+    message(STATUS "Detected local dev environment")
+    set(QT_DEPLOY_FILES TRUE)
+endif()
+
+if(APPLE)
+    set(DEST_DIR "$<TARGET_FILE_DIR:SerialPrograms>/../../..")
+elseif(PACKAGE_BUILD)
+    set(DEST_DIR "$<TARGET_FILE_DIR:SerialPrograms>/Output")
+    set(WIN_DEPLOY_DIR "${DEST_DIR}/Binaries64")
+else()
+    set(DEST_DIR "$<TARGET_FILE_DIR:SerialPrograms>")
+    set(WIN_DEPLOY_DIR "${DEST_DIR}")
+endif()
+
 #Find threads library
 set(THREADS_PREFER_PTHREAD_FLAG ON)
 find_package(Threads REQUIRED)
 
-#find Qt
+# Define a toggle option (ON by default)
+option(COMMAND_LINE_EXE "Build the optional executable" ON)
+
+# Build only the GUI-free core: CoreLib and SerialProgramsCommandLine. This needs
+# no Qt, OpenCV, ONNX Runtime, Tesseract, DPP or Discord SDK, so none of them are
+# searched for.
+option(PA_CORE_ONLY "Build only the GUI-free core (basic microcontroller functions, no Qt, OpenCV, etc.)" OFF)
+
+# With MSVC or clang-cl, write an assembly listing (/FAs) of every source file to
+# Assembly/ in the build folder, to check the code the compiler generates, e.g. for
+# the SIMD kernels. CI turns this off: ccache can't cache a compile that writes a
+# listing, so every file would be recompiled on every run.
+option(PA_ASSEMBLY_LISTINGS "Write an assembly listing of every source file to Assembly/ (MSVC and clang-cl only)" ON)
+
+if(PA_CORE_ONLY)
+    message(STATUS "PA_CORE_ONLY: building only the GUI-free core")
+    set(CMAKE_AUTOMOC OFF)
+    set(CMAKE_AUTORCC OFF)
+    set(CMAKE_AUTOUIC OFF)
+    include(cmake/SourceFiles.cmake)
+    include(cmake/CoreLib.cmake)
+    if(COMMAND_LINE_EXE)
+        include(Source/CommandLine/CommandLineExecutable.cmake)
+    endif()
+    return()
+endif()
+
+# Define the major version of Qt to search for
 if(NOT QT_MAJOR)
     set(QT_MAJOR 6)
 endif()
-find_package(Qt${QT_MAJOR} COMPONENTS Widgets SerialPort Multimedia MultimediaWidgets REQUIRED)
-#disable deprecated Qt APIs
+
+# Find Qt and windeployqt.exe relative to the Qt bin dir. If CI, not Windows, or not deploying, just find_package()
+if(WIN32 AND QT_DEPLOY_FILES)
+    # Define the base Qt installation directory
+    if(PREFERRED_QT_DIR AND PREFERRED_QT_VER)
+        set(QT_CANDIDATE_DIR "${PREFERRED_QT_DIR}/${PREFERRED_QT_VER}/msvc2022_64/lib/cmake")
+    endif()
+
+    # Set default base directory just in case, validate that Qt specified in CMakePresets.json exists
+    # Otherwise search out the latest available in the default Qt directory.
+    set(QT_BASE_DIR "C:/Qt")
+    if(QT_CANDIDATE_DIR AND EXISTS "${QT_CANDIDATE_DIR}")
+        message(STATUS "Using preferred Qt directory for Qt${QT_MAJOR} ${PREFERRED_QT_VER}: ${QT_CANDIDATE_DIR}")
+        list(APPEND CMAKE_PREFIX_PATH "${QT_CANDIDATE_DIR}")
+        find_package(Qt${QT_MAJOR} ${PREFERRED_QT_VER} REQUIRED COMPONENTS
+            Widgets
+            SerialPort
+            Multimedia
+            MultimediaWidgets
+            OpenGLWidgets
+            Qml
+            Quick
+            QuickWidgets
+        )
+    else()
+        # Find all subdirectories in the Qt base directory
+        find_package(Qt${QT_MAJOR} REQUIRED COMPONENTS
+            Widgets
+            SerialPort
+            Multimedia
+            MultimediaWidgets
+            OpenGLWidgets
+            Qml
+            Quick
+            QuickWidgets
+        )
+        file(GLOB QT_SUBDIRS LIST_DIRECTORIES true "${QT_BASE_DIR}/${QT_MAJOR}*")
+
+        # Filter and sort the directories to find the latest version
+        list(SORT QT_SUBDIRS)
+        list(REVERSE QT_SUBDIRS)
+
+        # Get the first directory in the sorted list (latest version)
+        list(GET QT_SUBDIRS 0 QT_LATEST_DIR)
+
+        # Debug message to verify the latest Qt directory
+        if(QT_LATEST_DIR)
+            message(STATUS "Latest Qt directory for Qt${QT_MAJOR}: ${QT_LATEST_DIR}")
+            list(APPEND CMAKE_PREFIX_PATH "${QT_LATEST_DIR}/msvc2022_64/lib/cmake")
+        else()
+            message(FATAL_ERROR "No Qt${QT_MAJOR} installation found in ${QT_BASE_DIR}")
+        endif()
+    endif()
+
+    # Find windeployqt.exe for Qt dependency deployment
+    get_target_property(qt_core_location Qt${QT_MAJOR}::Core LOCATION)
+    get_filename_component(qt_bin_dir "${qt_core_location}" DIRECTORY)
+    find_program(WINDEPLOYQT_EXECUTABLE windeployqt
+        HINTS "${qt_bin_dir}"
+        PATH_SUFFIXES ../bin bin
+        REQUIRED
+    )
+else()
+    find_package(Qt${QT_MAJOR} REQUIRED COMPONENTS
+        Widgets
+        SerialPort
+        Multimedia
+        MultimediaWidgets
+        OpenGLWidgets
+        Qml
+        Quick
+        QuickWidgets
+    )
+endif()
+
+# disable deprecated Qt APIs
 add_compile_definitions(QT_DISABLE_DEPRECATED_BEFORE=0x050F00)
 
-#add current directory to find tesseractPA.lib
+# add current directory to find tesseractPA.lib
 link_directories(${CMAKE_CURRENT_LIST_DIR})
 
-file(GLOB MAIN_SOURCES
-    ../3rdParty/QtWavFile/WavFile.cpp
-    ../3rdParty/QtWavFile/WavFile.h
-    ../3rdParty/TesseractPA/TesseractPA.cpp
-    ../3rdParty/TesseractPA/TesseractPA.h
-    ../3rdParty/qdarkstyle/dark/darkstyle.qrc
-    ../ClientSource/Connection/BotBase.cpp
-    ../ClientSource/Connection/BotBase.h
-    ../ClientSource/Connection/BotBaseMessage.h
-    ../ClientSource/Connection/MessageLogger.cpp
-    ../ClientSource/Connection/MessageLogger.h
-    ../ClientSource/Connection/MessageSniffer.h
-    ../ClientSource/Connection/PABotBase.cpp
-    ../ClientSource/Connection/PABotBase.h
-    ../ClientSource/Connection/PABotBaseConnection.cpp
-    ../ClientSource/Connection/PABotBaseConnection.h
-    ../ClientSource/Connection/SerialConnection.h
-    ../ClientSource/Connection/SerialConnectionPOSIX.h
-    ../ClientSource/Connection/SerialConnectionWinAPI.h
-    ../ClientSource/Connection/StreamInterface.h
-    ../ClientSource/Libraries/Logging.cpp
-    ../ClientSource/Libraries/Logging.h
-    ../ClientSource/Libraries/MessageConverter.cpp
-    ../ClientSource/Libraries/MessageConverter.h
-    ../Common/CRC32.cpp
-    ../Common/CRC32.h
-    ../Common/Compiler.h
-    ../Common/Cpp/AbstractLogger.h
-    ../Common/Cpp/CancellableScope.cpp
-    ../Common/Cpp/CancellableScope.h
-    ../Common/Cpp/Color.h
-    ../Common/Cpp/Concurrency/AsyncDispatcher.cpp
-    ../Common/Cpp/Concurrency/AsyncDispatcher.h
-    ../Common/Cpp/Concurrency/FireForgetDispatcher.cpp
-    ../Common/Cpp/Concurrency/FireForgetDispatcher.h
-    ../Common/Cpp/Concurrency/ParallelTaskRunner.cpp
-    ../Common/Cpp/Concurrency/ParallelTaskRunner.h
-    ../Common/Cpp/Concurrency/PeriodicScheduler.cpp
-    ../Common/Cpp/Concurrency/PeriodicScheduler.h
-    ../Common/Cpp/Concurrency/ScheduledTaskRunner.cpp
-    ../Common/Cpp/Concurrency/ScheduledTaskRunner.h
-    ../Common/Cpp/Concurrency/SpinLock.cpp
-    ../Common/Cpp/Concurrency/SpinLock.h
-    ../Common/Cpp/Concurrency/SpinPause.h
-    ../Common/Cpp/Concurrency/Watchdog.cpp
-    ../Common/Cpp/Concurrency/Watchdog.h
-    ../Common/Cpp/Containers/AlignedMalloc.cpp
-    ../Common/Cpp/Containers/AlignedMalloc.h
-    ../Common/Cpp/Containers/AlignedVector.h
-    ../Common/Cpp/Containers/AlignedVector.tpp
-    ../Common/Cpp/Containers/BoxSet.h
-    ../Common/Cpp/Containers/DllSafeString.h
-    ../Common/Cpp/Containers/FixedLimitVector.h
-    ../Common/Cpp/Containers/FixedLimitVector.tpp
-    ../Common/Cpp/Containers/Pimpl.h
-    ../Common/Cpp/Containers/Pimpl.tpp
-    ../Common/Cpp/CpuId/CpuId.cpp
-    ../Common/Cpp/CpuId/CpuId.h
-    ../Common/Cpp/CpuId/CpuId_arm64.h
-    ../Common/Cpp/CpuId/CpuId_arm64.tpp
-    ../Common/Cpp/CpuId/CpuId_x86.h
-    ../Common/Cpp/CpuId/CpuId_x86.tpp
-    ../Common/Cpp/EnumDatabase.cpp
-    ../Common/Cpp/EnumDatabase.h
-    ../Common/Cpp/EventRateTracker.h
-    ../Common/Cpp/Exceptions.cpp
-    ../Common/Cpp/Exceptions.h
-    ../Common/Cpp/ImageResolution.cpp
-    ../Common/Cpp/ImageResolution.h
-    ../Common/Cpp/Json/JsonArray.cpp
-    ../Common/Cpp/Json/JsonArray.h
-    ../Common/Cpp/Json/JsonObject.cpp
-    ../Common/Cpp/Json/JsonObject.h
-    ../Common/Cpp/Json/JsonTools.cpp
-    ../Common/Cpp/Json/JsonTools.h
-    ../Common/Cpp/Json/JsonValue.cpp
-    ../Common/Cpp/Json/JsonValue.h
-    ../Common/Cpp/LifetimeSanitizer.cpp
-    ../Common/Cpp/LifetimeSanitizer.h
-    ../Common/Cpp/Options/BatchOption.cpp
-    ../Common/Cpp/Options/BatchOption.h
-    ../Common/Cpp/Options/BooleanCheckBoxOption.cpp
-    ../Common/Cpp/Options/BooleanCheckBoxOption.h
-    ../Common/Cpp/Options/ConfigOption.cpp
-    ../Common/Cpp/Options/ConfigOption.h
-    ../Common/Cpp/Options/DateOption.cpp
-    ../Common/Cpp/Options/DateOption.h
-    ../Common/Cpp/Options/EditableTableOption.cpp
-    ../Common/Cpp/Options/EditableTableOption.h
-    ../Common/Cpp/Options/EnumDropdownOption.cpp
-    ../Common/Cpp/Options/EnumDropdownOption.h
-    ../Common/Cpp/Options/FixedCodeOption.cpp
-    ../Common/Cpp/Options/FixedCodeOption.h
-    ../Common/Cpp/Options/FloatingPointOption.cpp
-    ../Common/Cpp/Options/FloatingPointOption.h
-    ../Common/Cpp/Options/GroupOption.cpp
-    ../Common/Cpp/Options/GroupOption.h
-    ../Common/Cpp/Options/RandomCodeOption.cpp
-    ../Common/Cpp/Options/RandomCodeOption.h
-    ../Common/Cpp/Options/SimpleIntegerOption.cpp
-    ../Common/Cpp/Options/SimpleIntegerOption.h
-    ../Common/Cpp/Options/StaticTableOption.cpp
-    ../Common/Cpp/Options/StaticTableOption.h
-    ../Common/Cpp/Options/StaticTextOption.cpp
-    ../Common/Cpp/Options/StaticTextOption.h
-    ../Common/Cpp/Options/StringOption.cpp
-    ../Common/Cpp/Options/StringOption.h
-    ../Common/Cpp/Options/TextEditOption.cpp
-    ../Common/Cpp/Options/TextEditOption.h
-    ../Common/Cpp/Options/TimeExpressionOption.cpp
-    ../Common/Cpp/Options/TimeExpressionOption.h
-    ../Common/Cpp/PanicDump.cpp
-    ../Common/Cpp/PanicDump.h
-    ../Common/Cpp/PrettyPrint.cpp
-    ../Common/Cpp/PrettyPrint.h
-    ../Common/Cpp/PrintDebuggers.h
-    ../Common/Cpp/Rectangle.h
-    ../Common/Cpp/Rectangle.tpp
-    ../Common/Cpp/SIMDDebuggers.h
-    ../Common/Cpp/StreamConverters.cpp
-    ../Common/Cpp/StreamConverters.h
-    ../Common/Cpp/StringTools.cpp
-    ../Common/Cpp/StringTools.h
-    ../Common/Cpp/Time.cpp
-    ../Common/Cpp/Time.h
-    ../Common/Cpp/Unicode.cpp
-    ../Common/Cpp/Unicode.h
-    ../Common/Cpp/ValueDebouncer.h
-    ../Common/Microcontroller/DeviceRoutines.cpp
-    ../Common/Microcontroller/DeviceRoutines.h
-    ../Common/Microcontroller/MessageProtocol.h
-    ../Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h
-    ../Common/NintendoSwitch/NintendoSwitch_Protocol_DigitEntry.h
-    ../Common/NintendoSwitch/NintendoSwitch_Protocol_PushButtons.h
-    ../Common/NintendoSwitch/NintendoSwitch_Protocol_Routines.h
-    ../Common/NintendoSwitch/NintendoSwitch_Protocol_ScalarButtons.h
-    ../Common/NintendoSwitch/NintendoSwitch_SlotDatabase.h
-    ../Common/PokemonSwSh/PokemonProgramIDs.h
-    ../Common/PokemonSwSh/PokemonSwSh_FossilTable.h
-    ../Common/PokemonSwSh/PokemonSwSh_MultiHostTable.h
-    ../Common/PokemonSwSh/PokemonSwSh_Protocol_AutoHosts.h
-    ../Common/PokemonSwSh/PokemonSwSh_Protocol_DateSpam.h
-    ../Common/PokemonSwSh/PokemonSwSh_Protocol_DaySkippers.h
-    ../Common/PokemonSwSh/PokemonSwSh_Protocol_EggRoutines.h
-    ../Common/PokemonSwSh/PokemonSwSh_Protocol_GameEntry.h
-    ../Common/PokemonSwSh/PokemonSwSh_Protocol_Misc.h
-    ../Common/Qt/AutoHeightTable.cpp
-    ../Common/Qt/AutoHeightTable.h
-    ../Common/Qt/AutoWidthLineEdit.cpp
-    ../Common/Qt/AutoWidthLineEdit.h
-    ../Common/Qt/CodeValidator.cpp
-    ../Common/Qt/CodeValidator.h
-    ../Common/Qt/CollapsibleGroupBox.cpp
-    ../Common/Qt/CollapsibleGroupBox.h
-    ../Common/Qt/ExpressionEvaluator.cpp
-    ../Common/Qt/ExpressionEvaluator.h
-    ../Common/Qt/NoWheelComboBox.h
-    ../Common/Qt/Options/BatchWidget.cpp
-    ../Common/Qt/Options/BatchWidget.h
-    ../Common/Qt/Options/BooleanCheckBoxWidget.cpp
-    ../Common/Qt/Options/BooleanCheckBoxWidget.h
-    ../Common/Qt/Options/ConfigWidget.cpp
-    ../Common/Qt/Options/ConfigWidget.h
-    ../Common/Qt/Options/DateWidget.cpp
-    ../Common/Qt/Options/DateWidget.h
-    ../Common/Qt/Options/EditableTableWidget.cpp
-    ../Common/Qt/Options/EditableTableWidget.h
-    ../Common/Qt/Options/EnumDropdownWidget.cpp
-    ../Common/Qt/Options/EnumDropdownWidget.h
-    ../Common/Qt/Options/FixedCodeWidget.cpp
-    ../Common/Qt/Options/FixedCodeWidget.h
-    ../Common/Qt/Options/FloatingPointWidget.cpp
-    ../Common/Qt/Options/FloatingPointWidget.h
-    ../Common/Qt/Options/GroupWidget.cpp
-    ../Common/Qt/Options/GroupWidget.h
-    ../Common/Qt/Options/RandomCodeWidget.cpp
-    ../Common/Qt/Options/RandomCodeWidget.h
-    ../Common/Qt/Options/SimpleIntegerWidget.cpp
-    ../Common/Qt/Options/SimpleIntegerWidget.h
-    ../Common/Qt/Options/StaticTableWidget.cpp
-    ../Common/Qt/Options/StaticTableWidget.h
-    ../Common/Qt/Options/StaticTextWidget.cpp
-    ../Common/Qt/Options/StaticTextWidget.h
-    ../Common/Qt/Options/StringWidget.cpp
-    ../Common/Qt/Options/StringWidget.h
-    ../Common/Qt/Options/TextEditWidget.cpp
-    ../Common/Qt/Options/TextEditWidget.h
-    ../Common/Qt/Options/TimeExpressionWidget.cpp
-    ../Common/Qt/Options/TimeExpressionWidget.h
-    ../Common/Qt/Redispatch.cpp
-    ../Common/Qt/Redispatch.h
-    ../Common/Qt/StringToolsQt.cpp
-    ../Common/Qt/StringToolsQt.h
-    ../Common/Qt/TimeQt.cpp
-    ../Common/Qt/TimeQt.h
-    ../Common/Qt/WidgetStackFixedAspectRatio.cpp
-    ../Common/Qt/WidgetStackFixedAspectRatio.h
-    ../IconResource/IconResource.rc
-    Source/CommonFramework/AudioPipeline/AudioConstants.h
-    Source/CommonFramework/AudioPipeline/AudioFeed.h
-    Source/CommonFramework/AudioPipeline/AudioInfo.cpp
-    Source/CommonFramework/AudioPipeline/AudioInfo.h
-    Source/CommonFramework/AudioPipeline/AudioNormalization.h
-    Source/CommonFramework/AudioPipeline/AudioOption.cpp
-    Source/CommonFramework/AudioPipeline/AudioOption.h
-    Source/CommonFramework/AudioPipeline/AudioPassthroughPair.h
-    Source/CommonFramework/AudioPipeline/AudioSession.cpp
-    Source/CommonFramework/AudioPipeline/AudioSession.h
-    Source/CommonFramework/AudioPipeline/AudioStream.cpp
-    Source/CommonFramework/AudioPipeline/AudioStream.h
-    Source/CommonFramework/AudioPipeline/AudioTemplate.cpp
-    Source/CommonFramework/AudioPipeline/AudioTemplate.h
-    Source/CommonFramework/AudioPipeline/Backends/AudioPassthroughPairQt.cpp
-    Source/CommonFramework/AudioPipeline/Backends/AudioPassthroughPairQt.h
-    Source/CommonFramework/AudioPipeline/Backends/AudioPassthroughPairQtThread.cpp
-    Source/CommonFramework/AudioPipeline/Backends/AudioPassthroughPairQtThread.h
-    Source/CommonFramework/AudioPipeline/IO/AudioFileLoader.cpp
-    Source/CommonFramework/AudioPipeline/IO/AudioFileLoader.h
-    Source/CommonFramework/AudioPipeline/IO/AudioSink.cpp
-    Source/CommonFramework/AudioPipeline/IO/AudioSink.h
-    Source/CommonFramework/AudioPipeline/IO/AudioSource.cpp
-    Source/CommonFramework/AudioPipeline/IO/AudioSource.h
-    Source/CommonFramework/AudioPipeline/Spectrum/AudioSpectrumHolder.cpp
-    Source/CommonFramework/AudioPipeline/Spectrum/AudioSpectrumHolder.h
-    Source/CommonFramework/AudioPipeline/Spectrum/FFTStreamer.cpp
-    Source/CommonFramework/AudioPipeline/Spectrum/FFTStreamer.h
-    Source/CommonFramework/AudioPipeline/Spectrum/Spectrograph.cpp
-    Source/CommonFramework/AudioPipeline/Spectrum/Spectrograph.h
-    Source/CommonFramework/AudioPipeline/Tools/AudioFormatUtils.cpp
-    Source/CommonFramework/AudioPipeline/Tools/AudioFormatUtils.h
-    Source/CommonFramework/AudioPipeline/Tools/AudioNormalization.h
-    Source/CommonFramework/AudioPipeline/Tools/TimeSampleBuffer.cpp
-    Source/CommonFramework/AudioPipeline/Tools/TimeSampleBuffer.h
-    Source/CommonFramework/AudioPipeline/Tools/TimeSampleBufferReader.cpp
-    Source/CommonFramework/AudioPipeline/Tools/TimeSampleBufferReader.h
-    Source/CommonFramework/AudioPipeline/Tools/TimeSampleWriter.h
-    Source/CommonFramework/AudioPipeline/UI/AudioDisplayWidget.cpp
-    Source/CommonFramework/AudioPipeline/UI/AudioDisplayWidget.h
-    Source/CommonFramework/AudioPipeline/UI/AudioSelectorWidget.cpp
-    Source/CommonFramework/AudioPipeline/UI/AudioSelectorWidget.h
-    Source/CommonFramework/ControllerDevices/SerialPortGlobals.h
-    Source/CommonFramework/ControllerDevices/SerialPortOption.cpp
-    Source/CommonFramework/ControllerDevices/SerialPortOption.h
-    Source/CommonFramework/ControllerDevices/SerialPortSession.cpp
-    Source/CommonFramework/ControllerDevices/SerialPortSession.h
-    Source/CommonFramework/ControllerDevices/SerialPortWidget.cpp
-    Source/CommonFramework/ControllerDevices/SerialPortWidget.h
-    Source/CommonFramework/CrashDump.cpp
-    Source/CommonFramework/CrashDump.h
-    Source/CommonFramework/Environment/Environment.cpp
-    Source/CommonFramework/Environment/Environment.h
-    Source/CommonFramework/Environment/Environment_Linux.h
-    Source/CommonFramework/Environment/Environment_Linux.tpp
-    Source/CommonFramework/Environment/Environment_Windows.h
-    Source/CommonFramework/Environment/Environment_Windows.tpp
-    Source/CommonFramework/Environment/Environment_arm64_Linux.tpp
-    Source/CommonFramework/Environment/Environment_x86.tpp
-    Source/CommonFramework/Environment/Environment_x86_Linux.tpp
-    Source/CommonFramework/Environment/Environment_x86_Windows.tpp
-    Source/CommonFramework/Environment/HardwareValidation.cpp
-    Source/CommonFramework/Environment/HardwareValidation.h
-    Source/CommonFramework/Environment/HardwareValidation_arm64.tpp
-    Source/CommonFramework/Environment/HardwareValidation_x86.tpp
-    Source/CommonFramework/Exceptions/FatalProgramException.cpp
-    Source/CommonFramework/Exceptions/FatalProgramException.h
-    Source/CommonFramework/Exceptions/OperationFailedException.cpp
-    Source/CommonFramework/Exceptions/OperationFailedException.h
-    Source/CommonFramework/Exceptions/ProgramFinishedException.cpp
-    Source/CommonFramework/Exceptions/ProgramFinishedException.h
-    Source/CommonFramework/Exceptions/ScreenshotException.cpp
-    Source/CommonFramework/Exceptions/ScreenshotException.h
-    Source/CommonFramework/GlobalServices.cpp
-    Source/CommonFramework/GlobalServices.h
-    Source/CommonFramework/GlobalSettingsPanel.cpp
-    Source/CommonFramework/GlobalSettingsPanel.h
-    Source/CommonFramework/Globals.cpp
-    Source/CommonFramework/Globals.h
-    Source/CommonFramework/ImageMatch/CroppedImageDictionaryMatcher.cpp
-    Source/CommonFramework/ImageMatch/CroppedImageDictionaryMatcher.h
-    Source/CommonFramework/ImageMatch/ExactImageDictionaryMatcher.cpp
-    Source/CommonFramework/ImageMatch/ExactImageDictionaryMatcher.h
-    Source/CommonFramework/ImageMatch/ExactImageMatcher.cpp
-    Source/CommonFramework/ImageMatch/ExactImageMatcher.h
-    Source/CommonFramework/ImageMatch/FilterToAlpha.cpp
-    Source/CommonFramework/ImageMatch/FilterToAlpha.h
-    Source/CommonFramework/ImageMatch/ImageCropper.cpp
-    Source/CommonFramework/ImageMatch/ImageCropper.h
-    Source/CommonFramework/ImageMatch/ImageDiff.cpp
-    Source/CommonFramework/ImageMatch/ImageDiff.h
-    Source/CommonFramework/ImageMatch/ImageMatchOption.cpp
-    Source/CommonFramework/ImageMatch/ImageMatchOption.h
-    Source/CommonFramework/ImageMatch/ImageMatchResult.cpp
-    Source/CommonFramework/ImageMatch/ImageMatchResult.h
-    Source/CommonFramework/ImageMatch/SilhouetteDictionaryMatcher.cpp
-    Source/CommonFramework/ImageMatch/SilhouetteDictionaryMatcher.h
-    Source/CommonFramework/ImageMatch/SubObjectTemplateMatcher.cpp
-    Source/CommonFramework/ImageMatch/SubObjectTemplateMatcher.h
-    Source/CommonFramework/ImageMatch/WaterfillTemplateMatcher.cpp
-    Source/CommonFramework/ImageMatch/WaterfillTemplateMatcher.h
-    Source/CommonFramework/ImageTools/BinaryImage_FilterRgb32.cpp
-    Source/CommonFramework/ImageTools/BinaryImage_FilterRgb32.h
-    Source/CommonFramework/ImageTools/ColorClustering.cpp
-    Source/CommonFramework/ImageTools/ColorClustering.h
-    Source/CommonFramework/ImageTools/DistanceToLine.h
-    Source/CommonFramework/ImageTools/FloatPixel.cpp
-    Source/CommonFramework/ImageTools/FloatPixel.h
-    Source/CommonFramework/ImageTools/ImageBoxes.cpp
-    Source/CommonFramework/ImageTools/ImageBoxes.h
-    Source/CommonFramework/ImageTools/ImageFilter.cpp
-    Source/CommonFramework/ImageTools/ImageFilter.h
-    Source/CommonFramework/ImageTools/ImageGradient.cpp
-    Source/CommonFramework/ImageTools/ImageGradient.h
-    Source/CommonFramework/ImageTools/ImageManip.cpp
-    Source/CommonFramework/ImageTools/ImageManip.h
-    Source/CommonFramework/ImageTools/ImageStats.cpp
-    Source/CommonFramework/ImageTools/ImageStats.h
-    Source/CommonFramework/ImageTools/SolidColorTest.cpp
-    Source/CommonFramework/ImageTools/SolidColorTest.h
-    Source/CommonFramework/ImageTools/WaterfillUtilities.cpp
-    Source/CommonFramework/ImageTools/WaterfillUtilities.h
-    Source/CommonFramework/ImageTypes/BinaryImage.cpp
-    Source/CommonFramework/ImageTypes/BinaryImage.h
-    Source/CommonFramework/ImageTypes/ImageHSV32.cpp
-    Source/CommonFramework/ImageTypes/ImageHSV32.h
-    Source/CommonFramework/ImageTypes/ImageRGB32.cpp
-    Source/CommonFramework/ImageTypes/ImageRGB32.h
-    Source/CommonFramework/ImageTypes/ImageViewHSV32.cpp
-    Source/CommonFramework/ImageTypes/ImageViewHSV32.h
-    Source/CommonFramework/ImageTypes/ImageViewPlanar32.cpp
-    Source/CommonFramework/ImageTypes/ImageViewPlanar32.h
-    Source/CommonFramework/ImageTypes/ImageViewRGB32.cpp
-    Source/CommonFramework/ImageTypes/ImageViewRGB32.h
-    Source/CommonFramework/Inference/AnomalyDetector.cpp
-    Source/CommonFramework/Inference/AnomalyDetector.h
-    Source/CommonFramework/Inference/AudioPerSpectrumDetectorBase.cpp
-    Source/CommonFramework/Inference/AudioPerSpectrumDetectorBase.h
-    Source/CommonFramework/Inference/AudioTemplateCache.cpp
-    Source/CommonFramework/Inference/AudioTemplateCache.h
-    Source/CommonFramework/Inference/BlackBorderDetector.cpp
-    Source/CommonFramework/Inference/BlackBorderDetector.h
-    Source/CommonFramework/Inference/BlackScreenDetector.cpp
-    Source/CommonFramework/Inference/BlackScreenDetector.h
-    Source/CommonFramework/Inference/DetectionDebouncer.h
-    Source/CommonFramework/Inference/FrozenImageDetector.cpp
-    Source/CommonFramework/Inference/FrozenImageDetector.h
-    Source/CommonFramework/Inference/ImageMatchDetector.cpp
-    Source/CommonFramework/Inference/ImageMatchDetector.h
-    Source/CommonFramework/Inference/ImageTools.cpp
-    Source/CommonFramework/Inference/ImageTools.h
-    Source/CommonFramework/Inference/InferenceThrottler.h
-    Source/CommonFramework/Inference/SpectrogramMatcher.cpp
-    Source/CommonFramework/Inference/SpectrogramMatcher.h
-    Source/CommonFramework/Inference/StatAccumulator.cpp
-    Source/CommonFramework/Inference/StatAccumulator.h
-    Source/CommonFramework/Inference/TimeWindowStatTracker.h
-    Source/CommonFramework/Inference/VisualDetector.h
-    Source/CommonFramework/InferenceInfra/AudioInferenceCallback.h
-    Source/CommonFramework/InferenceInfra/AudioInferencePivot.cpp
-    Source/CommonFramework/InferenceInfra/AudioInferencePivot.h
-    Source/CommonFramework/InferenceInfra/InferenceCallback.h
-    Source/CommonFramework/InferenceInfra/InferenceRoutines.cpp
-    Source/CommonFramework/InferenceInfra/InferenceRoutines.h
-    Source/CommonFramework/InferenceInfra/InferenceSession.cpp
-    Source/CommonFramework/InferenceInfra/InferenceSession.h
-    Source/CommonFramework/InferenceInfra/VisualInferenceCallback.cpp
-    Source/CommonFramework/InferenceInfra/VisualInferenceCallback.h
-    Source/CommonFramework/InferenceInfra/VisualInferencePivot.cpp
-    Source/CommonFramework/InferenceInfra/VisualInferencePivot.h
-    Source/CommonFramework/Language.cpp
-    Source/CommonFramework/Language.h
-    Source/CommonFramework/Logging/FileWindowLogger.cpp
-    Source/CommonFramework/Logging/FileWindowLogger.h
-    Source/CommonFramework/Logging/Logger.cpp
-    Source/CommonFramework/Logging/Logger.h
-    Source/CommonFramework/Logging/OutputRedirector.cpp
-    Source/CommonFramework/Logging/OutputRedirector.h
-    Source/CommonFramework/Logging/QueuedLogger.cpp
-    Source/CommonFramework/Logging/QueuedLogger.h
-    Source/CommonFramework/Main.cpp
-    Source/CommonFramework/NewVersionCheck.cpp
-    Source/CommonFramework/NewVersionCheck.h
-    Source/CommonFramework/Notifications/EventNotificationOption.cpp
-    Source/CommonFramework/Notifications/EventNotificationOption.h
-    Source/CommonFramework/Notifications/EventNotificationsTable.cpp
-    Source/CommonFramework/Notifications/EventNotificationsTable.h
-    Source/CommonFramework/Notifications/MessageAttachment.cpp
-    Source/CommonFramework/Notifications/MessageAttachment.h
-    Source/CommonFramework/Notifications/ProgramInfo.h
-    Source/CommonFramework/Notifications/ProgramNotifications.cpp
-    Source/CommonFramework/Notifications/ProgramNotifications.h
-    Source/CommonFramework/Notifications/SenderNotificationTable.cpp
-    Source/CommonFramework/Notifications/SenderNotificationTable.h
-    Source/CommonFramework/OCR/OCR_DictionaryMatcher.cpp
-    Source/CommonFramework/OCR/OCR_DictionaryMatcher.h
-    Source/CommonFramework/OCR/OCR_DictionaryOCR.cpp
-    Source/CommonFramework/OCR/OCR_DictionaryOCR.h
-    Source/CommonFramework/OCR/OCR_LargeDictionaryMatcher.cpp
-    Source/CommonFramework/OCR/OCR_LargeDictionaryMatcher.h
-    Source/CommonFramework/OCR/OCR_NumberReader.cpp
-    Source/CommonFramework/OCR/OCR_NumberReader.h
-    Source/CommonFramework/OCR/OCR_RawOCR.cpp
-    Source/CommonFramework/OCR/OCR_RawOCR.h
-    Source/CommonFramework/OCR/OCR_Routines.cpp
-    Source/CommonFramework/OCR/OCR_Routines.h
-    Source/CommonFramework/OCR/OCR_SmallDictionaryMatcher.cpp
-    Source/CommonFramework/OCR/OCR_SmallDictionaryMatcher.h
-    Source/CommonFramework/OCR/OCR_StringMatchResult.cpp
-    Source/CommonFramework/OCR/OCR_StringMatchResult.h
-    Source/CommonFramework/OCR/OCR_StringNormalization.cpp
-    Source/CommonFramework/OCR/OCR_StringNormalization.h
-    Source/CommonFramework/OCR/OCR_TextMatcher.cpp
-    Source/CommonFramework/OCR/OCR_TextMatcher.h
-    Source/CommonFramework/OCR/OCR_TrainingTools.cpp
-    Source/CommonFramework/OCR/OCR_TrainingTools.h
-    Source/CommonFramework/Options/Environment/ProcessPriorityOption.h
-    Source/CommonFramework/Options/Environment/ProcessorLevelOption.cpp
-    Source/CommonFramework/Options/Environment/ProcessorLevelOption.h
-    Source/CommonFramework/Options/Environment/ThemeSelectorOption.cpp
-    Source/CommonFramework/Options/Environment/ThemeSelectorOption.h
-    Source/CommonFramework/Options/LabelCellOption.cpp
-    Source/CommonFramework/Options/LabelCellOption.h
-    Source/CommonFramework/Options/LanguageOCROption.cpp
-    Source/CommonFramework/Options/LanguageOCROption.h
-    Source/CommonFramework/Options/ScreenWatchOption.cpp
-    Source/CommonFramework/Options/ScreenWatchOption.h
-    Source/CommonFramework/Options/ScreenshotFormatOption.h
-    Source/CommonFramework/Options/StringSelectOption.cpp
-    Source/CommonFramework/Options/StringSelectOption.h
-    Source/CommonFramework/Options/StringSelectTableOption.h
-    Source/CommonFramework/Options/TrainOCRModeOption.h
-    Source/CommonFramework/Options/UI/LabelCellWidget.cpp
-    Source/CommonFramework/Options/UI/LabelCellWidget.h
-    Source/CommonFramework/Options/UI/LanguageOCRWidget.cpp
-    Source/CommonFramework/Options/UI/LanguageOCRWidget.h
-    Source/CommonFramework/Options/UI/ScreenWatchWidget.cpp
-    Source/CommonFramework/Options/UI/ScreenWatchWidget.h
-    Source/CommonFramework/Options/UI/StringSelectWidget.cpp
-    Source/CommonFramework/Options/UI/StringSelectWidget.h
-    Source/CommonFramework/Panels/PanelDescriptor.cpp
-    Source/CommonFramework/Panels/PanelDescriptor.h
-    Source/CommonFramework/Panels/PanelInstance.cpp
-    Source/CommonFramework/Panels/PanelInstance.h
-    Source/CommonFramework/Panels/PanelList.cpp
-    Source/CommonFramework/Panels/PanelList.h
-    Source/CommonFramework/Panels/PanelTools.h
-    Source/CommonFramework/Panels/ProgramDescriptor.cpp
-    Source/CommonFramework/Panels/ProgramDescriptor.h
-    Source/CommonFramework/Panels/SettingsPanel.cpp
-    Source/CommonFramework/Panels/SettingsPanel.h
-    Source/CommonFramework/Panels/UI/PanelElements.cpp
-    Source/CommonFramework/Panels/UI/PanelElements.h
-    Source/CommonFramework/Panels/UI/PanelListWidget.cpp
-    Source/CommonFramework/Panels/UI/PanelListWidget.h
-    Source/CommonFramework/Panels/UI/PanelWidget.cpp
-    Source/CommonFramework/Panels/UI/PanelWidget.h
-    Source/CommonFramework/Panels/UI/SettingsPanelWidget.cpp
-    Source/CommonFramework/Panels/UI/SettingsPanelWidget.h
-    Source/CommonFramework/PersistentSettings.cpp
-    Source/CommonFramework/PersistentSettings.h
-    Source/CommonFramework/ProgramSession.cpp
-    Source/CommonFramework/ProgramSession.h
-    Source/CommonFramework/Resources/SpriteDatabase.cpp
-    Source/CommonFramework/Resources/SpriteDatabase.h
-    Source/CommonFramework/SetupSettings.cpp
-    Source/CommonFramework/SetupSettings.h
-    Source/CommonFramework/Tools/BlackBorderCheck.cpp
-    Source/CommonFramework/Tools/BlackBorderCheck.h
-    Source/CommonFramework/Tools/BotBaseHandle.cpp
-    Source/CommonFramework/Tools/BotBaseHandle.h
-    Source/CommonFramework/Tools/ConsoleHandle.cpp
-    Source/CommonFramework/Tools/ConsoleHandle.h
-    Source/CommonFramework/Tools/DebugDumper.cpp
-    Source/CommonFramework/Tools/DebugDumper.h
-    Source/CommonFramework/Tools/ErrorDumper.cpp
-    Source/CommonFramework/Tools/ErrorDumper.h
-    Source/CommonFramework/Tools/FileDownloader.cpp
-    Source/CommonFramework/Tools/FileDownloader.h
-    Source/CommonFramework/Tools/InterruptableCommands.cpp
-    Source/CommonFramework/Tools/InterruptableCommands.h
-    Source/CommonFramework/Tools/MultiConsoleErrors.cpp
-    Source/CommonFramework/Tools/MultiConsoleErrors.h
-    Source/CommonFramework/Tools/ProgramEnvironment.cpp
-    Source/CommonFramework/Tools/ProgramEnvironment.h
-    Source/CommonFramework/Tools/StatsDatabase.cpp
-    Source/CommonFramework/Tools/StatsDatabase.h
-    Source/CommonFramework/Tools/StatsTracking.cpp
-    Source/CommonFramework/Tools/StatsTracking.h
-    Source/CommonFramework/Tools/SuperControlSession.cpp
-    Source/CommonFramework/Tools/SuperControlSession.h
-    Source/CommonFramework/Tools/VideoResolutionCheck.cpp
-    Source/CommonFramework/Tools/VideoResolutionCheck.h
-    Source/CommonFramework/VideoPipeline/Backends/CameraImplementations.cpp
-    Source/CommonFramework/VideoPipeline/Backends/CameraImplementations.h
-    Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt5.cpp
-    Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt5.h
-    Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt6.cpp
-    Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt6.h
-    Source/CommonFramework/VideoPipeline/Backends/VideoToolsQt5.cpp
-    Source/CommonFramework/VideoPipeline/Backends/VideoToolsQt5.h
-    Source/CommonFramework/VideoPipeline/CameraInfo.h
-    Source/CommonFramework/VideoPipeline/CameraOption.cpp
-    Source/CommonFramework/VideoPipeline/CameraOption.h
-    Source/CommonFramework/VideoPipeline/CameraSession.h
-    Source/CommonFramework/VideoPipeline/Stats/CpuUtilizationStats.h
-    Source/CommonFramework/VideoPipeline/Stats/ThreadUtilizationStats.cpp
-    Source/CommonFramework/VideoPipeline/Stats/ThreadUtilizationStats.h
-    Source/CommonFramework/VideoPipeline/UI/CameraSelectorWidget.cpp
-    Source/CommonFramework/VideoPipeline/UI/CameraSelectorWidget.h
-    Source/CommonFramework/VideoPipeline/UI/VideoDisplayWidget.cpp
-    Source/CommonFramework/VideoPipeline/UI/VideoDisplayWidget.h
-    Source/CommonFramework/VideoPipeline/UI/VideoDisplayWindow.cpp
-    Source/CommonFramework/VideoPipeline/UI/VideoDisplayWindow.h
-    Source/CommonFramework/VideoPipeline/UI/VideoOverlayWidget.cpp
-    Source/CommonFramework/VideoPipeline/UI/VideoOverlayWidget.h
-    Source/CommonFramework/VideoPipeline/UI/VideoWidget.h
-    Source/CommonFramework/VideoPipeline/VideoFeed.h
-    Source/CommonFramework/VideoPipeline/VideoOverlay.h
-    Source/CommonFramework/VideoPipeline/VideoOverlayOption.cpp
-    Source/CommonFramework/VideoPipeline/VideoOverlayOption.h
-    Source/CommonFramework/VideoPipeline/VideoOverlayScopes.h
-    Source/CommonFramework/VideoPipeline/VideoOverlaySession.cpp
-    Source/CommonFramework/VideoPipeline/VideoOverlaySession.h
-    Source/CommonFramework/VideoPipeline/VideoOverlayTypes.cpp
-    Source/CommonFramework/VideoPipeline/VideoOverlayTypes.h
-    Source/CommonFramework/Windows/ButtonDiagram.cpp
-    Source/CommonFramework/Windows/ButtonDiagram.h
-    Source/CommonFramework/Windows/DpiScaler.cpp
-    Source/CommonFramework/Windows/DpiScaler.h
-    Source/CommonFramework/Windows/MainWindow.cpp
-    Source/CommonFramework/Windows/MainWindow.h
-    Source/CommonFramework/Windows/WindowTracker.cpp
-    Source/CommonFramework/Windows/WindowTracker.h
-    Source/ComputerPrograms/ComputerProgram.cpp
-    Source/ComputerPrograms/ComputerProgram.h
-    Source/ComputerPrograms/Framework/ComputerProgramOption.cpp
-    Source/ComputerPrograms/Framework/ComputerProgramOption.h
-    Source/ComputerPrograms/Framework/ComputerProgramSession.cpp
-    Source/ComputerPrograms/Framework/ComputerProgramSession.h
-    Source/ComputerPrograms/Framework/ComputerProgramWidget.cpp
-    Source/ComputerPrograms/Framework/ComputerProgramWidget.h
-    Source/Integrations/DiscordIntegrationSettings.cpp
-    Source/Integrations/DiscordIntegrationSettings.h
-    Source/Integrations/DiscordIntegrationTable.cpp
-    Source/Integrations/DiscordIntegrationTable.h
-    Source/Integrations/DiscordSettingsOption.cpp
-    Source/Integrations/DiscordSettingsOption.h
-    Source/Integrations/DiscordWebhook.cpp
-    Source/Integrations/DiscordWebhook.h
-    Source/Integrations/DiscordWebhookSettings.cpp
-    Source/Integrations/DiscordWebhookSettings.h
-    Source/Integrations/DppIntegration/DppClient.cpp
-    Source/Integrations/DppIntegration/DppClient.h
-    Source/Integrations/DppIntegration/DppCommandHandler.cpp
-    Source/Integrations/DppIntegration/DppCommandHandler.h
-    Source/Integrations/DppIntegration/DppUtility.cpp
-    Source/Integrations/DppIntegration/DppUtility.h
-    Source/Integrations/IntegrationsAPI.cpp
-    Source/Integrations/IntegrationsAPI.h
-    Source/Integrations/ProgramTracker.cpp
-    Source/Integrations/ProgramTracker.h
-    Source/Integrations/SleepyDiscordRunner.cpp
-    Source/Integrations/SleepyDiscordRunner.h
-    Source/Kernels/AbsFFT/Kernels_AbsFFT.cpp
-    Source/Kernels/AbsFFT/Kernels_AbsFFT.h
-    Source/Kernels/AbsFFT/Kernels_AbsFFT_Arch.h
-    Source/Kernels/AbsFFT/Kernels_AbsFFT_Arch_Default.h
-    Source/Kernels/AbsFFT/Kernels_AbsFFT_Arch_x86_AVX2.h
-    Source/Kernels/AbsFFT/Kernels_AbsFFT_Arch_x86_SSE41.h
-    Source/Kernels/AbsFFT/Kernels_AbsFFT_BaseTransform_x86_AVX2.h
-    Source/Kernels/AbsFFT/Kernels_AbsFFT_BaseTransform_x86_SSE41.h
-    Source/Kernels/AbsFFT/Kernels_AbsFFT_BitReverse.h
-    Source/Kernels/AbsFFT/Kernels_AbsFFT_Butterflies.h
-    Source/Kernels/AbsFFT/Kernels_AbsFFT_ComplexScalar.h
-    Source/Kernels/AbsFFT/Kernels_AbsFFT_ComplexToAbs.h
-    Source/Kernels/AbsFFT/Kernels_AbsFFT_ComplexVector.h
-    Source/Kernels/AbsFFT/Kernels_AbsFFT_Core_Default.cpp
-    Source/Kernels/AbsFFT/Kernels_AbsFFT_Core_x86_AVX2.cpp
-    Source/Kernels/AbsFFT/Kernels_AbsFFT_Core_x86_SSE41.cpp
-    Source/Kernels/AbsFFT/Kernels_AbsFFT_FullTransform.h
-    Source/Kernels/AbsFFT/Kernels_AbsFFT_FullTransform.tpp
-    Source/Kernels/AbsFFT/Kernels_AbsFFT_Reductions.h
-    Source/Kernels/AbsFFT/Kernels_AbsFFT_TwiddleTable.h
-    Source/Kernels/AbsFFT/Kernels_AbsFFT_TwiddleTable.tpp
-    Source/Kernels/Algorithm/Kernels_Algorithm_DisjointSet.cpp
-    Source/Kernels/Algorithm/Kernels_Algorithm_DisjointSet.h
-    Source/Kernels/AudioStreamConversion/AudioStreamConversion.cpp
-    Source/Kernels/AudioStreamConversion/AudioStreamConversion.h
-    Source/Kernels/AudioStreamConversion/AudioStreamConversion_Core_Default.cpp
-    Source/Kernels/AudioStreamConversion/AudioStreamConversion_Core_x86_SSE41.cpp
-    Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters.cpp
-    Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters.h
-    Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters_Core_64x16_x64_AVX2.cpp
-    Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters_Core_64x32_x64_AVX512.cpp
-    Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters_Core_64x4_Default.cpp
-    Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters_Core_64x64_x64_AVX512.cpp
-    Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters_Core_64x8_x64_SSE42.cpp
-    Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters_Default.h
-    Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters_Routines.h
-    Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters_x64_AVX2.h
-    Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters_x64_AVX512.h
-    Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters_x64_SSE42.h
-    Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix.cpp
-    Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix.h
-    Source/Kernels/BinaryMatrix/Kernels_BinaryMatrixTile_64x16_x64_AVX2.h
-    Source/Kernels/BinaryMatrix/Kernels_BinaryMatrixTile_64x32_x64_AVX512.h
-    Source/Kernels/BinaryMatrix/Kernels_BinaryMatrixTile_64x4_Default.h
-    Source/Kernels/BinaryMatrix/Kernels_BinaryMatrixTile_64x64_x64_AVX512.h
-    Source/Kernels/BinaryMatrix/Kernels_BinaryMatrixTile_64x8_x64_SSE42.h
-    Source/Kernels/BinaryMatrix/Kernels_BinaryMatrixTile_64xH_Default.h
-    Source/Kernels/BinaryMatrix/Kernels_BinaryMatrixTile_Debugging.h
-    Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Arch_64x16_x64_AVX2.h
-    Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Arch_64x32_x64_AVX512.h
-    Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Arch_64x64_x64_AVX512.h
-    Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Arch_64x8_x64_SSE42.h
-    Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Arch_64xH_Default.h
-    Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Core_64x16_x64_AVX2.cpp
-    Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Core_64x32_x64_AVX512.cpp
-    Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Core_64x64_x64_AVX512.cpp
-    Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Core_64x8_x64_SSE42.cpp
-    Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Core_64xH_Default.cpp
-    Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_t.h
-    Source/Kernels/BinaryMatrix/Kernels_PackedBinaryMatrix.h
-    Source/Kernels/BinaryMatrix/Kernels_PackedBinaryMatrixCore.h
-    Source/Kernels/BinaryMatrix/Kernels_PackedBinaryMatrixCore.tpp
-    Source/Kernels/BinaryMatrix/Kernels_SparseBinaryMatrixCore.h
-    Source/Kernels/BinaryMatrix/Kernels_SparseBinaryMatrixCore.tpp
-    Source/Kernels/ImageFilters/Kernels_ImageFilter_Basic.cpp
-    Source/Kernels/ImageFilters/Kernels_ImageFilter_Basic.h
-    Source/Kernels/ImageFilters/Kernels_ImageFilter_Basic_Default.cpp
-    Source/Kernels/ImageFilters/Kernels_ImageFilter_Basic_Routines.h
-    Source/Kernels/ImageFilters/Kernels_ImageFilter_Basic_x64_AVX2.cpp
-    Source/Kernels/ImageFilters/Kernels_ImageFilter_Basic_x64_AVX512.cpp
-    Source/Kernels/ImageFilters/Kernels_ImageFilter_Basic_x64_SSE42.cpp
-    Source/Kernels/ImageScaleBrightness/Kernels_ImageScaleBrightness.cpp
-    Source/Kernels/ImageScaleBrightness/Kernels_ImageScaleBrightness.h
-    Source/Kernels/ImageScaleBrightness/Kernels_ImageScaleBrightness_Default.cpp
-    Source/Kernels/ImageScaleBrightness/Kernels_ImageScaleBrightness_arm64_NEON.cpp
-    Source/Kernels/ImageScaleBrightness/Kernels_ImageScaleBrightness_x64_AVX2.cpp
-    Source/Kernels/ImageScaleBrightness/Kernels_ImageScaleBrightness_x64_AVX512.cpp
-    Source/Kernels/ImageScaleBrightness/Kernels_ImageScaleBrightness_x64_SSE41.cpp
-    Source/Kernels/ImageStats/Kernels_ImagePixelSumSqr.cpp
-    Source/Kernels/ImageStats/Kernels_ImagePixelSumSqr.h
-    Source/Kernels/ImageStats/Kernels_ImagePixelSumSqrDev.cpp
-    Source/Kernels/ImageStats/Kernels_ImagePixelSumSqrDev.h
-    Source/Kernels/ImageStats/Kernels_ImagePixelSumSqrDev_Default.cpp
-    Source/Kernels/ImageStats/Kernels_ImagePixelSumSqrDev_x64_AVX2.cpp
-    Source/Kernels/ImageStats/Kernels_ImagePixelSumSqrDev_x64_AVX512.cpp
-    Source/Kernels/ImageStats/Kernels_ImagePixelSumSqrDev_x64_SSE41.cpp
-    Source/Kernels/ImageStats/Kernels_ImagePixelSumSqr_Default.cpp
-    Source/Kernels/ImageStats/Kernels_ImagePixelSumSqr_x64_AVX2.cpp
-    Source/Kernels/ImageStats/Kernels_ImagePixelSumSqr_x64_AVX512.cpp
-    Source/Kernels/ImageStats/Kernels_ImagePixelSumSqr_x64_SSE41.cpp
-    Source/Kernels/Kernels_Alignment.h
-    Source/Kernels/Kernels_BitScan.h
-    Source/Kernels/Kernels_BitSet.h
-    Source/Kernels/Kernels_x64_AVX2.h
-    Source/Kernels/Kernels_x64_AVX512.h
-    Source/Kernels/Kernels_x64_SSE41.h
-    Source/Kernels/PartialWordAccess/Kernels_PartialWordAccess_x64_AVX2.h
-    Source/Kernels/PartialWordAccess/Kernels_PartialWordAccess_x64_SSE41.h
-    Source/Kernels/ScaleInvariantMatrixMatch/Kernels_ScaleInvariantMatrixMatch.cpp
-    Source/Kernels/ScaleInvariantMatrixMatch/Kernels_ScaleInvariantMatrixMatch.h
-    Source/Kernels/ScaleInvariantMatrixMatch/Kernels_ScaleInvariantMatrixMatch_Core_Default.cpp
-    Source/Kernels/ScaleInvariantMatrixMatch/Kernels_ScaleInvariantMatrixMatch_Core_x86_AVX2.cpp
-    Source/Kernels/ScaleInvariantMatrixMatch/Kernels_ScaleInvariantMatrixMatch_Core_x86_AVX512.cpp
-    Source/Kernels/ScaleInvariantMatrixMatch/Kernels_ScaleInvariantMatrixMatch_Core_x86_SSE.cpp
-    Source/Kernels/ScaleInvariantMatrixMatch/Kernels_ScaleInvariantMatrixMatch_Routines.h
-    Source/Kernels/SpikeConvolution/Kernels_SpikeConvolution.cpp
-    Source/Kernels/SpikeConvolution/Kernels_SpikeConvolution.h
-    Source/Kernels/SpikeConvolution/Kernels_SpikeConvolution_Core_Default.cpp
-    Source/Kernels/SpikeConvolution/Kernels_SpikeConvolution_Core_x86_AVX2.cpp
-    Source/Kernels/SpikeConvolution/Kernels_SpikeConvolution_Core_x86_AVX512.cpp
-    Source/Kernels/SpikeConvolution/Kernels_SpikeConvolution_Core_x86_SSE41.cpp
-    Source/Kernels/SpikeConvolution/Kernels_SpikeConvolution_Routines.h
-    Source/Kernels/Waterfill/Kernels_Waterfill.cpp
-    Source/Kernels/Waterfill/Kernels_Waterfill.h
-    Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x16_x64_AVX2.cpp
-    Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x16_x64_AVX2.h
-    Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x32_x64_AVX512-GF.cpp
-    Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x32_x64_AVX512-GF.h
-    Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x32_x64_AVX512.cpp
-    Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x32_x64_AVX512.h
-    Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x4_Default.h
-    Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x64_x64_AVX512-GF.cpp
-    Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x64_x64_AVX512-GF.h
-    Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x64_x64_AVX512.cpp
-    Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x64_x64_AVX512.h
-    Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x8_x64_SSE42.cpp
-    Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x8_x64_SSE42.h
-    Source/Kernels/Waterfill/Kernels_Waterfill_Core_64xH_Default.cpp
-    Source/Kernels/Waterfill/Kernels_Waterfill_Core_64xH_Default.h
-    Source/Kernels/Waterfill/Kernels_Waterfill_Intrinsics_x64_AVX512-GF.h
-    Source/Kernels/Waterfill/Kernels_Waterfill_Intrinsics_x64_AVX512.h
-    Source/Kernels/Waterfill/Kernels_Waterfill_Routines.h
-    Source/Kernels/Waterfill/Kernels_Waterfill_Session.cpp
-    Source/Kernels/Waterfill/Kernels_Waterfill_Session.h
-    Source/Kernels/Waterfill/Kernels_Waterfill_Session.tpp
-    Source/Kernels/Waterfill/Kernels_Waterfill_Types.h
-    Source/NintendoSwitch/Commands/NintendoSwitch_Commands_Device.cpp
-    Source/NintendoSwitch/Commands/NintendoSwitch_Commands_Device.h
-    Source/NintendoSwitch/Commands/NintendoSwitch_Commands_DigitEntry.cpp
-    Source/NintendoSwitch/Commands/NintendoSwitch_Commands_DigitEntry.h
-    Source/NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.cpp
-    Source/NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h
-    Source/NintendoSwitch/Commands/NintendoSwitch_Commands_Routines.cpp
-    Source/NintendoSwitch/Commands/NintendoSwitch_Commands_Routines.h
-    Source/NintendoSwitch/Commands/NintendoSwitch_Commands_ScalarButtons.cpp
-    Source/NintendoSwitch/Commands/NintendoSwitch_Commands_ScalarButtons.h
-    Source/NintendoSwitch/Commands/NintendoSwitch_Messages_Device.h
-    Source/NintendoSwitch/Commands/NintendoSwitch_Messages_DigitEntry.h
-    Source/NintendoSwitch/Commands/NintendoSwitch_Messages_PushButtons.h
-    Source/NintendoSwitch/Commands/NintendoSwitch_Messages_Routines.h
-    Source/NintendoSwitch/Commands/NintendoSwitch_Messages_ScalarButtons.h
-    Source/NintendoSwitch/DevPrograms/BoxDraw.cpp
-    Source/NintendoSwitch/DevPrograms/BoxDraw.h
-    Source/NintendoSwitch/DevPrograms/TestProgramComputer.cpp
-    Source/NintendoSwitch/DevPrograms/TestProgramComputer.h
-    Source/NintendoSwitch/DevPrograms/TestProgramSwitch.cpp
-    Source/NintendoSwitch/DevPrograms/TestProgramSwitch.h
-    Source/NintendoSwitch/FixedInterval.h
-    Source/NintendoSwitch/Framework/NintendoSwitch_MultiSwitchProgramOption.cpp
-    Source/NintendoSwitch/Framework/NintendoSwitch_MultiSwitchProgramOption.h
-    Source/NintendoSwitch/Framework/NintendoSwitch_MultiSwitchProgramSession.cpp
-    Source/NintendoSwitch/Framework/NintendoSwitch_MultiSwitchProgramSession.h
-    Source/NintendoSwitch/Framework/NintendoSwitch_MultiSwitchSystemOption.cpp
-    Source/NintendoSwitch/Framework/NintendoSwitch_MultiSwitchSystemOption.h
-    Source/NintendoSwitch/Framework/NintendoSwitch_MultiSwitchSystemSession.cpp
-    Source/NintendoSwitch/Framework/NintendoSwitch_MultiSwitchSystemSession.h
-    Source/NintendoSwitch/Framework/NintendoSwitch_SingleSwitchProgramOption.cpp
-    Source/NintendoSwitch/Framework/NintendoSwitch_SingleSwitchProgramOption.h
-    Source/NintendoSwitch/Framework/NintendoSwitch_SingleSwitchProgramSession.cpp
-    Source/NintendoSwitch/Framework/NintendoSwitch_SingleSwitchProgramSession.h
-    Source/NintendoSwitch/Framework/NintendoSwitch_SwitchSystemOption.cpp
-    Source/NintendoSwitch/Framework/NintendoSwitch_SwitchSystemOption.h
-    Source/NintendoSwitch/Framework/NintendoSwitch_SwitchSystemSession.cpp
-    Source/NintendoSwitch/Framework/NintendoSwitch_SwitchSystemSession.h
-    Source/NintendoSwitch/Framework/NintendoSwitch_VirtualController.cpp
-    Source/NintendoSwitch/Framework/NintendoSwitch_VirtualController.h
-    Source/NintendoSwitch/Framework/NintendoSwitch_VirtualControllerMapping.cpp
-    Source/NintendoSwitch/Framework/NintendoSwitch_VirtualControllerMapping.h
-    Source/NintendoSwitch/Framework/NintendoSwitch_VirtualControllerState.cpp
-    Source/NintendoSwitch/Framework/NintendoSwitch_VirtualControllerState.h
-    Source/NintendoSwitch/Framework/UI/NintendoSwitch_CommandRow.cpp
-    Source/NintendoSwitch/Framework/UI/NintendoSwitch_CommandRow.h
-    Source/NintendoSwitch/Framework/UI/NintendoSwitch_MultiSwitchProgramWidget.cpp
-    Source/NintendoSwitch/Framework/UI/NintendoSwitch_MultiSwitchProgramWidget.h
-    Source/NintendoSwitch/Framework/UI/NintendoSwitch_MultiSwitchSystemWidget.cpp
-    Source/NintendoSwitch/Framework/UI/NintendoSwitch_MultiSwitchSystemWidget.h
-    Source/NintendoSwitch/Framework/UI/NintendoSwitch_SingleSwitchProgramWidget.cpp
-    Source/NintendoSwitch/Framework/UI/NintendoSwitch_SingleSwitchProgramWidget.h
-    Source/NintendoSwitch/Framework/UI/NintendoSwitch_SwitchSystemWidget.cpp
-    Source/NintendoSwitch/Framework/UI/NintendoSwitch_SwitchSystemWidget.h
-    Source/NintendoSwitch/Inference/NintendoSwitch_DateReader.cpp
-    Source/NintendoSwitch/Inference/NintendoSwitch_DateReader.h
-    Source/NintendoSwitch/Inference/NintendoSwitch_DetectHome.cpp
-    Source/NintendoSwitch/Inference/NintendoSwitch_DetectHome.h
-    Source/NintendoSwitch/NintendoSwitch_MultiSwitchProgram.cpp
-    Source/NintendoSwitch/NintendoSwitch_MultiSwitchProgram.h
-    Source/NintendoSwitch/NintendoSwitch_Panels.cpp
-    Source/NintendoSwitch/NintendoSwitch_Panels.h
-    Source/NintendoSwitch/NintendoSwitch_Settings.cpp
-    Source/NintendoSwitch/NintendoSwitch_Settings.h
-    Source/NintendoSwitch/NintendoSwitch_SingleSwitchProgram.cpp
-    Source/NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h
-    Source/NintendoSwitch/Options/NintendoSwitch_FriendCodeListOption.cpp
-    Source/NintendoSwitch/Options/NintendoSwitch_FriendCodeListOption.h
-    Source/NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.cpp
-    Source/NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h
-    Source/NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h
-    Source/NintendoSwitch/Options/TurboMacroTable.cpp
-    Source/NintendoSwitch/Options/TurboMacroTable.h
-    Source/NintendoSwitch/Options/UI/NintendoSwitch_FriendCodeListWidget.cpp
-    Source/NintendoSwitch/Options/UI/NintendoSwitch_FriendCodeListWidget.h
-    Source/NintendoSwitch/Programs/NintendoSwitch_FastCodeEntry.cpp
-    Source/NintendoSwitch/Programs/NintendoSwitch_FastCodeEntry.h
-    Source/NintendoSwitch/Programs/NintendoSwitch_FriendCodeAdder.cpp
-    Source/NintendoSwitch/Programs/NintendoSwitch_FriendCodeAdder.h
-    Source/NintendoSwitch/Programs/NintendoSwitch_FriendDelete.cpp
-    Source/NintendoSwitch/Programs/NintendoSwitch_FriendDelete.h
-    Source/NintendoSwitch/Programs/NintendoSwitch_GameEntry.cpp
-    Source/NintendoSwitch/Programs/NintendoSwitch_GameEntry.h
-    Source/NintendoSwitch/Programs/NintendoSwitch_PreventSleep.cpp
-    Source/NintendoSwitch/Programs/NintendoSwitch_PreventSleep.h
-    Source/NintendoSwitch/Programs/NintendoSwitch_PushJoySticks.cpp
-    Source/NintendoSwitch/Programs/NintendoSwitch_PushJoySticks.h
-    Source/NintendoSwitch/Programs/NintendoSwitch_SnapshotDumper.cpp
-    Source/NintendoSwitch/Programs/NintendoSwitch_SnapshotDumper.h
-    Source/NintendoSwitch/Programs/NintendoSwitch_SwitchViewer.cpp
-    Source/NintendoSwitch/Programs/NintendoSwitch_SwitchViewer.h
-    Source/NintendoSwitch/Programs/NintendoSwitch_TurboA.cpp
-    Source/NintendoSwitch/Programs/NintendoSwitch_TurboA.h
-    Source/NintendoSwitch/Programs/NintendoSwitch_TurboButton.cpp
-    Source/NintendoSwitch/Programs/NintendoSwitch_TurboButton.h
-    Source/NintendoSwitch/Programs/NintendoSwitch_TurboMacro.cpp
-    Source/NintendoSwitch/Programs/NintendoSwitch_TurboMacro.h
-    Source/NintendoSwitch/Programs/NintendoSwitch_VirtualConsole.cpp
-    Source/NintendoSwitch/Programs/NintendoSwitch_VirtualConsole.h
-    Source/PanelLists.cpp
-    Source/PanelLists.h
-    Source/Pokemon/Inference/Pokemon_BerryNameReader.cpp
-    Source/Pokemon/Inference/Pokemon_BerryNameReader.h
-    Source/Pokemon/Inference/Pokemon_BoxGenderDetector.cpp
-    Source/Pokemon/Inference/Pokemon_BoxGenderDetector.h
-    Source/Pokemon/Inference/Pokemon_IVCheckerReader.cpp
-    Source/Pokemon/Inference/Pokemon_IVCheckerReader.h
-    Source/Pokemon/Inference/Pokemon_NameReader.cpp
-    Source/Pokemon/Inference/Pokemon_NameReader.h
-    Source/Pokemon/Inference/Pokemon_NatureReader.cpp
-    Source/Pokemon/Inference/Pokemon_NatureReader.h
-    Source/Pokemon/Inference/Pokemon_PokeballNameReader.cpp
-    Source/Pokemon/Inference/Pokemon_PokeballNameReader.h
-    Source/Pokemon/Inference/Pokemon_ReadHpBar.cpp
-    Source/Pokemon/Inference/Pokemon_ReadHpBar.h
-    Source/Pokemon/Inference/Pokemon_TrainIVCheckerOCR.cpp
-    Source/Pokemon/Inference/Pokemon_TrainIVCheckerOCR.h
-    Source/Pokemon/Inference/Pokemon_TrainPokemonOCR.cpp
-    Source/Pokemon/Inference/Pokemon_TrainPokemonOCR.h
-    Source/Pokemon/Options/Pokemon_EggHatchFilter.cpp
-    Source/Pokemon/Options/Pokemon_EggHatchFilter.h
-    Source/Pokemon/Options/Pokemon_EncounterBotOptions.h
-    Source/Pokemon/Options/Pokemon_IVCheckerOption.cpp
-    Source/Pokemon/Options/Pokemon_IVCheckerOption.h
-    Source/Pokemon/Options/Pokemon_NameSelectOption.cpp
-    Source/Pokemon/Options/Pokemon_NameSelectOption.h
-    Source/Pokemon/Options/Pokemon_NameSelectWidget.cpp
-    Source/Pokemon/Options/Pokemon_NameSelectWidget.h
-    Source/Pokemon/Options/Pokemon_StatsResetFilter.cpp
-    Source/Pokemon/Options/Pokemon_StatsResetFilter.h
-    Source/Pokemon/Pokemon_DataTypes.h
-    Source/Pokemon/Pokemon_EncounterStats.cpp
-    Source/Pokemon/Pokemon_EncounterStats.h
-    Source/Pokemon/Pokemon_IVChecker.cpp
-    Source/Pokemon/Pokemon_IVChecker.h
-    Source/Pokemon/Pokemon_NatureChecker.cpp
-    Source/Pokemon/Pokemon_NatureChecker.h
-    Source/Pokemon/Pokemon_Notification.cpp
-    Source/Pokemon/Pokemon_Notification.h
-    Source/Pokemon/Pokemon_ShinySparkleSet.cpp
-    Source/Pokemon/Pokemon_ShinySparkleSet.h
-    Source/Pokemon/Pokemon_Strings.cpp
-    Source/Pokemon/Pokemon_Strings.h
-    Source/Pokemon/Pokemon_Types.cpp
-    Source/Pokemon/Pokemon_Types.h
-    Source/Pokemon/Resources/Pokemon_BerryNames.cpp
-    Source/Pokemon/Resources/Pokemon_BerryNames.h
-    Source/Pokemon/Resources/Pokemon_BerrySprites.cpp
-    Source/Pokemon/Resources/Pokemon_BerrySprites.h
-    Source/Pokemon/Resources/Pokemon_PokeballNames.cpp
-    Source/Pokemon/Resources/Pokemon_PokeballNames.h
-    Source/Pokemon/Resources/Pokemon_PokemonNames.cpp
-    Source/Pokemon/Resources/Pokemon_PokemonNames.h
-    Source/Pokemon/Resources/Pokemon_PokemonSlugs.cpp
-    Source/Pokemon/Resources/Pokemon_PokemonSlugs.h
-    Source/PokemonBDSP/Inference/Battles/PokemonBDSP_BattleBallReader.cpp
-    Source/PokemonBDSP/Inference/Battles/PokemonBDSP_BattleBallReader.h
-    Source/PokemonBDSP/Inference/Battles/PokemonBDSP_BattleMenuDetector.cpp
-    Source/PokemonBDSP/Inference/Battles/PokemonBDSP_BattleMenuDetector.h
-    Source/PokemonBDSP/Inference/Battles/PokemonBDSP_EndBattleDetector.cpp
-    Source/PokemonBDSP/Inference/Battles/PokemonBDSP_EndBattleDetector.h
-    Source/PokemonBDSP/Inference/Battles/PokemonBDSP_ExperienceGainDetector.cpp
-    Source/PokemonBDSP/Inference/Battles/PokemonBDSP_ExperienceGainDetector.h
-    Source/PokemonBDSP/Inference/Battles/PokemonBDSP_StartBattleDetector.cpp
-    Source/PokemonBDSP/Inference/Battles/PokemonBDSP_StartBattleDetector.h
-    Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxDetector.cpp
-    Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxDetector.h
-    Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxGenderDetector.cpp
-    Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxGenderDetector.h
-    Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxNatureDetector.cpp
-    Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxNatureDetector.h
-    Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxShinyDetector.cpp
-    Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxShinyDetector.h
-    Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_IVCheckerReader.cpp
-    Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_IVCheckerReader.h
-    Source/PokemonBDSP/Inference/PokemonBDSP_DialogDetector.cpp
-    Source/PokemonBDSP/Inference/PokemonBDSP_DialogDetector.h
-    Source/PokemonBDSP/Inference/PokemonBDSP_MapDetector.cpp
-    Source/PokemonBDSP/Inference/PokemonBDSP_MapDetector.h
-    Source/PokemonBDSP/Inference/PokemonBDSP_MarkFinder.cpp
-    Source/PokemonBDSP/Inference/PokemonBDSP_MarkFinder.h
-    Source/PokemonBDSP/Inference/PokemonBDSP_MenuDetector.cpp
-    Source/PokemonBDSP/Inference/PokemonBDSP_MenuDetector.h
-    Source/PokemonBDSP/Inference/PokemonBDSP_PokeballSpriteMatcher.cpp
-    Source/PokemonBDSP/Inference/PokemonBDSP_PokeballSpriteMatcher.h
-    Source/PokemonBDSP/Inference/PokemonBDSP_ReceivePokemonDetector.cpp
-    Source/PokemonBDSP/Inference/PokemonBDSP_ReceivePokemonDetector.h
-    Source/PokemonBDSP/Inference/PokemonBDSP_SelectionArrow.cpp
-    Source/PokemonBDSP/Inference/PokemonBDSP_SelectionArrow.h
-    Source/PokemonBDSP/Inference/PokemonBDSP_VSSeekerReaction.cpp
-    Source/PokemonBDSP/Inference/PokemonBDSP_VSSeekerReaction.h
-    Source/PokemonBDSP/Inference/ShinyDetection/PokemonBDSP_ShinyEncounterDetector.cpp
-    Source/PokemonBDSP/Inference/ShinyDetection/PokemonBDSP_ShinyEncounterDetector.h
-    Source/PokemonBDSP/Inference/ShinyDetection/PokemonBDSP_ShinySparkleSet.cpp
-    Source/PokemonBDSP/Inference/ShinyDetection/PokemonBDSP_ShinySparkleSet.h
-    Source/PokemonBDSP/Inference/Sounds/PokemonBDSP_ShinySoundDetector.cpp
-    Source/PokemonBDSP/Inference/Sounds/PokemonBDSP_ShinySoundDetector.h
-    Source/PokemonBDSP/Options/EncounterFilter/PokemonBDSP_EncounterFilterEnums.cpp
-    Source/PokemonBDSP/Options/EncounterFilter/PokemonBDSP_EncounterFilterEnums.h
-    Source/PokemonBDSP/Options/EncounterFilter/PokemonBDSP_EncounterFilterOption.cpp
-    Source/PokemonBDSP/Options/EncounterFilter/PokemonBDSP_EncounterFilterOption.h
-    Source/PokemonBDSP/Options/EncounterFilter/PokemonBDSP_EncounterFilterOverride.cpp
-    Source/PokemonBDSP/Options/EncounterFilter/PokemonBDSP_EncounterFilterOverride.h
-    Source/PokemonBDSP/Options/EncounterFilter/PokemonBDSP_EncounterFilterWidget.cpp
-    Source/PokemonBDSP/Options/EncounterFilter/PokemonBDSP_EncounterFilterWidget.h
-    Source/PokemonBDSP/Options/PokemonBDSP_BerrySelectOption.cpp
-    Source/PokemonBDSP/Options/PokemonBDSP_BerrySelectOption.h
-    Source/PokemonBDSP/Options/PokemonBDSP_BerryTable.cpp
-    Source/PokemonBDSP/Options/PokemonBDSP_BerryTable.h
-    Source/PokemonBDSP/Options/PokemonBDSP_EncounterBotCommon.h
-    Source/PokemonBDSP/Options/PokemonBDSP_LearnMove.h
-    Source/PokemonBDSP/Options/PokemonBDSP_ShortcutDirection.cpp
-    Source/PokemonBDSP/Options/PokemonBDSP_ShortcutDirection.h
-    Source/PokemonBDSP/Panels_PokemonBDSP.cpp
-    Source/PokemonBDSP/Panels_PokemonBDSP.h
-    Source/PokemonBDSP/PokemonBDSP_Panels.cpp
-    Source/PokemonBDSP/PokemonBDSP_Panels.h
-    Source/PokemonBDSP/PokemonBDSP_Settings.cpp
-    Source/PokemonBDSP/PokemonBDSP_Settings.h
-    Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggAutonomous.cpp
-    Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggAutonomous.h
-    Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggAutonomousState.cpp
-    Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggAutonomousState.h
-    Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggFeedback.cpp
-    Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggFeedback.h
-    Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggFetcher.cpp
-    Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggFetcher.h
-    Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggHatcher.cpp
-    Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggHatcher.h
-    Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggRoutines.cpp
-    Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggRoutines.h
-    Source/PokemonBDSP/Programs/Farming/PokemonBDSP_AmitySquarePickUpFarmer.cpp
-    Source/PokemonBDSP/Programs/Farming/PokemonBDSP_AmitySquarePickUpFarmer.h
-    Source/PokemonBDSP/Programs/Farming/PokemonBDSP_DoublesLeveling.cpp
-    Source/PokemonBDSP/Programs/Farming/PokemonBDSP_DoublesLeveling.h
-    Source/PokemonBDSP/Programs/Farming/PokemonBDSP_GiftBerryReset.cpp
-    Source/PokemonBDSP/Programs/Farming/PokemonBDSP_GiftBerryReset.h
-    Source/PokemonBDSP/Programs/Farming/PokemonBDSP_MoneyFarmerRoute210.cpp
-    Source/PokemonBDSP/Programs/Farming/PokemonBDSP_MoneyFarmerRoute210.h
-    Source/PokemonBDSP/Programs/Farming/PokemonBDSP_MoneyFarmerRoute212.cpp
-    Source/PokemonBDSP/Programs/Farming/PokemonBDSP_MoneyFarmerRoute212.h
-    Source/PokemonBDSP/Programs/General/PokemonBDSP_AutonomousBallThrower.cpp
-    Source/PokemonBDSP/Programs/General/PokemonBDSP_AutonomousBallThrower.h
-    Source/PokemonBDSP/Programs/General/PokemonBDSP_MassRelease.cpp
-    Source/PokemonBDSP/Programs/General/PokemonBDSP_MassRelease.h
-    Source/PokemonBDSP/Programs/Glitches/PokemonBDSP_ActivateMenuGlitch-1.1.2.cpp
-    Source/PokemonBDSP/Programs/Glitches/PokemonBDSP_ActivateMenuGlitch-1.1.2.h
-    Source/PokemonBDSP/Programs/Glitches/PokemonBDSP_ActivateMenuGlitch-1.1.3.cpp
-    Source/PokemonBDSP/Programs/Glitches/PokemonBDSP_ActivateMenuGlitch-1.1.3.h
-    Source/PokemonBDSP/Programs/Glitches/PokemonBDSP_CloneItemsBoxCopy2.cpp
-    Source/PokemonBDSP/Programs/Glitches/PokemonBDSP_CloneItemsBoxCopy2.h
-    Source/PokemonBDSP/Programs/PokemonBDSP_BasicCatcher.cpp
-    Source/PokemonBDSP/Programs/PokemonBDSP_BasicCatcher.h
-    Source/PokemonBDSP/Programs/PokemonBDSP_BoxRelease.cpp
-    Source/PokemonBDSP/Programs/PokemonBDSP_BoxRelease.h
-    Source/PokemonBDSP/Programs/PokemonBDSP_EncounterDetection.cpp
-    Source/PokemonBDSP/Programs/PokemonBDSP_EncounterDetection.h
-    Source/PokemonBDSP/Programs/PokemonBDSP_EncounterHandler.cpp
-    Source/PokemonBDSP/Programs/PokemonBDSP_EncounterHandler.h
-    Source/PokemonBDSP/Programs/PokemonBDSP_GameEntry.cpp
-    Source/PokemonBDSP/Programs/PokemonBDSP_GameEntry.h
-    Source/PokemonBDSP/Programs/PokemonBDSP_GameNavigation.cpp
-    Source/PokemonBDSP/Programs/PokemonBDSP_GameNavigation.h
-    Source/PokemonBDSP/Programs/PokemonBDSP_GlobalRoomHeal.cpp
-    Source/PokemonBDSP/Programs/PokemonBDSP_GlobalRoomHeal.h
-    Source/PokemonBDSP/Programs/PokemonBDSP_OverworldTrigger.cpp
-    Source/PokemonBDSP/Programs/PokemonBDSP_OverworldTrigger.h
-    Source/PokemonBDSP/Programs/PokemonBDSP_RunFromBattle.cpp
-    Source/PokemonBDSP/Programs/PokemonBDSP_RunFromBattle.h
-    Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_LegendaryReset.cpp
-    Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_LegendaryReset.h
-    Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_ShinyHunt-Fishing.cpp
-    Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_ShinyHunt-Fishing.h
-    Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_ShinyHunt-Overworld.cpp
-    Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_ShinyHunt-Overworld.h
-    Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_ShinyHunt-Shaymin.cpp
-    Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_ShinyHunt-Shaymin.h
-    Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_StarterReset.cpp
-    Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_StarterReset.h
-    Source/PokemonBDSP/Programs/TestPrograms/PokemonBDSP_ShinyEncounterTester.cpp
-    Source/PokemonBDSP/Programs/TestPrograms/PokemonBDSP_ShinyEncounterTester.h
-    Source/PokemonBDSP/Programs/TestPrograms/PokemonBDSP_SoundListener.cpp
-    Source/PokemonBDSP/Programs/TestPrograms/PokemonBDSP_SoundListener.h
-    Source/PokemonBDSP/Programs/Trading/PokemonBDSP_SelfBoxTrade.cpp
-    Source/PokemonBDSP/Programs/Trading/PokemonBDSP_SelfBoxTrade.h
-    Source/PokemonBDSP/Programs/Trading/PokemonBDSP_SelfTouchTrade.cpp
-    Source/PokemonBDSP/Programs/Trading/PokemonBDSP_SelfTouchTrade.h
-    Source/PokemonBDSP/Programs/Trading/PokemonBDSP_TradeRoutines.cpp
-    Source/PokemonBDSP/Programs/Trading/PokemonBDSP_TradeRoutines.h
-    Source/PokemonBDSP/Resources/PokemonBDSP_NameDatabase.cpp
-    Source/PokemonBDSP/Resources/PokemonBDSP_NameDatabase.h
-    Source/PokemonHome/Inference/PokemonHome_BallReader.cpp
-    Source/PokemonHome/Inference/PokemonHome_BallReader.h
-    Source/PokemonHome/Inference/PokemonHome_BoxGenderDetector.cpp
-    Source/PokemonHome/Inference/PokemonHome_BoxGenderDetector.h
-    Source/PokemonHome/Options/PokemonHome_BoxSortingTable.cpp
-    Source/PokemonHome/Options/PokemonHome_BoxSortingTable.h
-    Source/PokemonHome/PokemonHome_Panels.cpp
-    Source/PokemonHome/PokemonHome_Panels.h
-    Source/PokemonHome/PokemonHome_Settings.cpp
-    Source/PokemonHome/PokemonHome_Settings.h
-    Source/PokemonHome/Programs/PokemonHome_BoxSorting.cpp
-    Source/PokemonHome/Programs/PokemonHome_BoxSorting.h
-    Source/PokemonHome/Programs/PokemonHome_GenerateNameOCR.cpp
-    Source/PokemonHome/Programs/PokemonHome_GenerateNameOCR.h
-    Source/PokemonHome/Programs/PokemonHome_PageSwap.cpp
-    Source/PokemonHome/Programs/PokemonHome_PageSwap.h
-    Source/PokemonLA/Inference/Battles/PokemonLA_BattleMenuDetector.cpp
-    Source/PokemonLA/Inference/Battles/PokemonLA_BattleMenuDetector.h
-    Source/PokemonLA/Inference/Battles/PokemonLA_BattleMoveSelectionDetector.cpp
-    Source/PokemonLA/Inference/Battles/PokemonLA_BattleMoveSelectionDetector.h
-    Source/PokemonLA/Inference/Battles/PokemonLA_BattlePokemonSwitchDetector.cpp
-    Source/PokemonLA/Inference/Battles/PokemonLA_BattlePokemonSwitchDetector.h
-    Source/PokemonLA/Inference/Battles/PokemonLA_BattleSpriteWatcher.cpp
-    Source/PokemonLA/Inference/Battles/PokemonLA_BattleSpriteWatcher.h
-    Source/PokemonLA/Inference/Battles/PokemonLA_BattleStartDetector.cpp
-    Source/PokemonLA/Inference/Battles/PokemonLA_BattleStartDetector.h
-    Source/PokemonLA/Inference/Battles/PokemonLA_TransparentDialogueDetector.cpp
-    Source/PokemonLA/Inference/Battles/PokemonLA_TransparentDialogueDetector.h
-    Source/PokemonLA/Inference/Map/PokemonLA_MMOSpriteStarSymbolDetector.cpp
-    Source/PokemonLA/Inference/Map/PokemonLA_MMOSpriteStarSymbolDetector.h
-    Source/PokemonLA/Inference/Map/PokemonLA_MapDetector.cpp
-    Source/PokemonLA/Inference/Map/PokemonLA_MapDetector.h
-    Source/PokemonLA/Inference/Map/PokemonLA_MapMarkerLocator.cpp
-    Source/PokemonLA/Inference/Map/PokemonLA_MapMarkerLocator.h
-    Source/PokemonLA/Inference/Map/PokemonLA_MapMissionTabReader.cpp
-    Source/PokemonLA/Inference/Map/PokemonLA_MapMissionTabReader.h
-    Source/PokemonLA/Inference/Map/PokemonLA_MapWeatherAndTimeReader.cpp
-    Source/PokemonLA/Inference/Map/PokemonLA_MapWeatherAndTimeReader.h
-    Source/PokemonLA/Inference/Map/PokemonLA_MapZoomLevelReader.cpp
-    Source/PokemonLA/Inference/Map/PokemonLA_MapZoomLevelReader.h
-    Source/PokemonLA/Inference/Map/PokemonLA_OutbreakReader.cpp
-    Source/PokemonLA/Inference/Map/PokemonLA_OutbreakReader.h
-    Source/PokemonLA/Inference/Map/PokemonLA_PokemonMapSpriteReader.cpp
-    Source/PokemonLA/Inference/Map/PokemonLA_PokemonMapSpriteReader.h
-    Source/PokemonLA/Inference/Map/PokemonLA_SelectedRegionDetector.cpp
-    Source/PokemonLA/Inference/Map/PokemonLA_SelectedRegionDetector.h
-    Source/PokemonLA/Inference/Objects/PokemonLA_ArcDetector.cpp
-    Source/PokemonLA/Inference/Objects/PokemonLA_ArcDetector.h
-    Source/PokemonLA/Inference/Objects/PokemonLA_ArcPhoneDetector.cpp
-    Source/PokemonLA/Inference/Objects/PokemonLA_ArcPhoneDetector.h
-    Source/PokemonLA/Inference/Objects/PokemonLA_BattleSpriteArrowDetector.cpp
-    Source/PokemonLA/Inference/Objects/PokemonLA_BattleSpriteArrowDetector.h
-    Source/PokemonLA/Inference/Objects/PokemonLA_BubbleDetector.cpp
-    Source/PokemonLA/Inference/Objects/PokemonLA_BubbleDetector.h
-    Source/PokemonLA/Inference/Objects/PokemonLA_ButtonDetector.cpp
-    Source/PokemonLA/Inference/Objects/PokemonLA_ButtonDetector.h
-    Source/PokemonLA/Inference/Objects/PokemonLA_DialogueEllipseDetector.cpp
-    Source/PokemonLA/Inference/Objects/PokemonLA_DialogueEllipseDetector.h
-    Source/PokemonLA/Inference/Objects/PokemonLA_DialogueYellowArrowDetector.cpp
-    Source/PokemonLA/Inference/Objects/PokemonLA_DialogueYellowArrowDetector.h
-    Source/PokemonLA/Inference/Objects/PokemonLA_FlagDetector.cpp
-    Source/PokemonLA/Inference/Objects/PokemonLA_FlagDetector.h
-    Source/PokemonLA/Inference/Objects/PokemonLA_FlagTracker.cpp
-    Source/PokemonLA/Inference/Objects/PokemonLA_FlagTracker.h
-    Source/PokemonLA/Inference/Objects/PokemonLA_MMOQuestionMarkDetector.cpp
-    Source/PokemonLA/Inference/Objects/PokemonLA_MMOQuestionMarkDetector.h
-    Source/PokemonLA/Inference/Objects/PokemonLA_QuestMarkDetector.cpp
-    Source/PokemonLA/Inference/Objects/PokemonLA_QuestMarkDetector.h
-    Source/PokemonLA/Inference/Objects/PokemonLA_ShinySymbolDetector.cpp
-    Source/PokemonLA/Inference/Objects/PokemonLA_ShinySymbolDetector.h
-    Source/PokemonLA/Inference/Objects/PokemonLA_WhiteObjectDetector.cpp
-    Source/PokemonLA/Inference/Objects/PokemonLA_WhiteObjectDetector.h
-    Source/PokemonLA/Inference/PokemonLA_BerryTreeDetector.cpp
-    Source/PokemonLA/Inference/PokemonLA_BerryTreeDetector.h
-    Source/PokemonLA/Inference/PokemonLA_BlackOutDetector.cpp
-    Source/PokemonLA/Inference/PokemonLA_BlackOutDetector.h
-    Source/PokemonLA/Inference/PokemonLA_CommonColorCheck.cpp
-    Source/PokemonLA/Inference/PokemonLA_CommonColorCheck.h
-    Source/PokemonLA/Inference/PokemonLA_DialogDetector.cpp
-    Source/PokemonLA/Inference/PokemonLA_DialogDetector.h
-    Source/PokemonLA/Inference/PokemonLA_ItemCompatibilityDetector.cpp
-    Source/PokemonLA/Inference/PokemonLA_ItemCompatibilityDetector.h
-    Source/PokemonLA/Inference/PokemonLA_MountDetector.cpp
-    Source/PokemonLA/Inference/PokemonLA_MountDetector.h
-    Source/PokemonLA/Inference/PokemonLA_NotificationReader.cpp
-    Source/PokemonLA/Inference/PokemonLA_NotificationReader.h
-    Source/PokemonLA/Inference/PokemonLA_OverworldDetector.cpp
-    Source/PokemonLA/Inference/PokemonLA_OverworldDetector.h
-    Source/PokemonLA/Inference/PokemonLA_StatusInfoScreenDetector.cpp
-    Source/PokemonLA/Inference/PokemonLA_StatusInfoScreenDetector.h
-    Source/PokemonLA/Inference/PokemonLA_UnderAttackDetector.cpp
-    Source/PokemonLA/Inference/PokemonLA_UnderAttackDetector.h
-    Source/PokemonLA/Inference/PokemonLA_WildPokemonFocusDetector.cpp
-    Source/PokemonLA/Inference/PokemonLA_WildPokemonFocusDetector.h
-    Source/PokemonLA/Inference/Sounds/PokemonLA_AlphaMusicDetector.cpp
-    Source/PokemonLA/Inference/Sounds/PokemonLA_AlphaMusicDetector.h
-    Source/PokemonLA/Inference/Sounds/PokemonLA_AlphaRoarDetector.cpp
-    Source/PokemonLA/Inference/Sounds/PokemonLA_AlphaRoarDetector.h
-    Source/PokemonLA/Inference/Sounds/PokemonLA_ItemDropSoundDetector.cpp
-    Source/PokemonLA/Inference/Sounds/PokemonLA_ItemDropSoundDetector.h
-    Source/PokemonLA/Inference/Sounds/PokemonLA_ShinySoundDetector.cpp
-    Source/PokemonLA/Inference/Sounds/PokemonLA_ShinySoundDetector.h
-    Source/PokemonLA/Options/PokemonLA_BattlePokemonActionTable.cpp
-    Source/PokemonLA/Options/PokemonLA_BattlePokemonActionTable.h
-    Source/PokemonLA/Options/PokemonLA_CustomPathTable.cpp
-    Source/PokemonLA/Options/PokemonLA_CustomPathTable.h
-    Source/PokemonLA/Options/PokemonLA_IngoOpponent.cpp
-    Source/PokemonLA/Options/PokemonLA_IngoOpponent.h
-    Source/PokemonLA/Options/PokemonLA_MiscOptions.h
-    Source/PokemonLA/Options/PokemonLA_ShinyDetectedAction.cpp
-    Source/PokemonLA/Options/PokemonLA_ShinyDetectedAction.h
-    Source/PokemonLA/Options/PokemonLA_TradeCountTable.cpp
-    Source/PokemonLA/Options/PokemonLA_TradeCountTable.h
-    Source/PokemonLA/Options/PokemonLA_TravelLocation.cpp
-    Source/PokemonLA/Options/PokemonLA_TravelLocation.h
-    Source/PokemonLA/Panels_PokemonLA.cpp
-    Source/PokemonLA/Panels_PokemonLA.h
-    Source/PokemonLA/PokemonLA_Locations.cpp
-    Source/PokemonLA/PokemonLA_Locations.h
-    Source/PokemonLA/PokemonLA_Panels.cpp
-    Source/PokemonLA/PokemonLA_Panels.h
-    Source/PokemonLA/PokemonLA_Settings.cpp
-    Source/PokemonLA/PokemonLA_Settings.h
-    Source/PokemonLA/PokemonLA_TravelLocations.cpp
-    Source/PokemonLA/PokemonLA_TravelLocations.h
-    Source/PokemonLA/PokemonLA_WeatherAndTime.cpp
-    Source/PokemonLA/PokemonLA_WeatherAndTime.h
-    Source/PokemonLA/Programs/Farming/PokemonLA_IngoBattleGrinder.cpp
-    Source/PokemonLA/Programs/Farming/PokemonLA_IngoBattleGrinder.h
-    Source/PokemonLA/Programs/Farming/PokemonLA_IngoMoveGrinder.cpp
-    Source/PokemonLA/Programs/Farming/PokemonLA_IngoMoveGrinder.h
-    Source/PokemonLA/Programs/Farming/PokemonLA_LeapGrinder.cpp
-    Source/PokemonLA/Programs/Farming/PokemonLA_LeapGrinder.h
-    Source/PokemonLA/Programs/Farming/PokemonLA_MagikarpMoveGrinder.cpp
-    Source/PokemonLA/Programs/Farming/PokemonLA_MagikarpMoveGrinder.h
-    Source/PokemonLA/Programs/Farming/PokemonLA_NuggetFarmerHighlands.cpp
-    Source/PokemonLA/Programs/Farming/PokemonLA_NuggetFarmerHighlands.h
-    Source/PokemonLA/Programs/Farming/PokemonLA_TenacityCandyFarmer.cpp
-    Source/PokemonLA/Programs/Farming/PokemonLA_TenacityCandyFarmer.h
-    Source/PokemonLA/Programs/General/PokemonLA_ApplyGrits.cpp
-    Source/PokemonLA/Programs/General/PokemonLA_ApplyGrits.h
-    Source/PokemonLA/Programs/General/PokemonLA_BraviaryHeightGlitch.cpp
-    Source/PokemonLA/Programs/General/PokemonLA_BraviaryHeightGlitch.h
-    Source/PokemonLA/Programs/General/PokemonLA_ClothingBuyer.cpp
-    Source/PokemonLA/Programs/General/PokemonLA_ClothingBuyer.h
-    Source/PokemonLA/Programs/General/PokemonLA_DistortionWaiter.cpp
-    Source/PokemonLA/Programs/General/PokemonLA_DistortionWaiter.h
-    Source/PokemonLA/Programs/General/PokemonLA_OutbreakFinder.cpp
-    Source/PokemonLA/Programs/General/PokemonLA_OutbreakFinder.h
-    Source/PokemonLA/Programs/General/PokemonLA_PokedexTasksReader.cpp
-    Source/PokemonLA/Programs/General/PokemonLA_PokedexTasksReader.h
-    Source/PokemonLA/Programs/General/PokemonLA_RamanasIslandCombee.cpp
-    Source/PokemonLA/Programs/General/PokemonLA_RamanasIslandCombee.h
-    Source/PokemonLA/Programs/General/PokemonLA_SkipToFullMoon.cpp
-    Source/PokemonLA/Programs/General/PokemonLA_SkipToFullMoon.h
-    Source/PokemonLA/Programs/PokemonLA_BattleRoutines.cpp
-    Source/PokemonLA/Programs/PokemonLA_BattleRoutines.h
-    Source/PokemonLA/Programs/PokemonLA_EscapeFromAttack.cpp
-    Source/PokemonLA/Programs/PokemonLA_EscapeFromAttack.h
-    Source/PokemonLA/Programs/PokemonLA_FlagNavigationAir.cpp
-    Source/PokemonLA/Programs/PokemonLA_FlagNavigationAir.h
-    Source/PokemonLA/Programs/PokemonLA_GameEntry.cpp
-    Source/PokemonLA/Programs/PokemonLA_GameEntry.h
-    Source/PokemonLA/Programs/PokemonLA_GameSave.cpp
-    Source/PokemonLA/Programs/PokemonLA_LeapPokemonActions.cpp
-    Source/PokemonLA/Programs/PokemonLA_LeapPokemonActions.h
-    Source/PokemonLA/Programs/PokemonLA_MountChange.cpp
-    Source/PokemonLA/Programs/PokemonLA_MountChange.h
-    Source/PokemonLA/Programs/PokemonLA_RegionNavigation.cpp
-    Source/PokemonLA/Programs/PokemonLA_RegionNavigation.h
-    Source/PokemonLA/Programs/PokemonLA_TimeOfDayChange.cpp
-    Source/PokemonLA/Programs/PokemonLA_TimeOfDayChange.h
-    Source/PokemonLA/Programs/ShinyHunting/PokemonLA_AutoMultiSpawn.cpp
-    Source/PokemonLA/Programs/ShinyHunting/PokemonLA_AutoMultiSpawn.h
-    Source/PokemonLA/Programs/ShinyHunting/PokemonLA_BurmyFinder.cpp
-    Source/PokemonLA/Programs/ShinyHunting/PokemonLA_BurmyFinder.h
-    Source/PokemonLA/Programs/ShinyHunting/PokemonLA_CrobatFinder.cpp
-    Source/PokemonLA/Programs/ShinyHunting/PokemonLA_CrobatFinder.h
-    Source/PokemonLA/Programs/ShinyHunting/PokemonLA_FroslassFinder.cpp
-    Source/PokemonLA/Programs/ShinyHunting/PokemonLA_FroslassFinder.h
-    Source/PokemonLA/Programs/ShinyHunting/PokemonLA_GalladeFinder.cpp
-    Source/PokemonLA/Programs/ShinyHunting/PokemonLA_GalladeFinder.h
-    Source/PokemonLA/Programs/ShinyHunting/PokemonLA_PostMMOSpawnReset.cpp
-    Source/PokemonLA/Programs/ShinyHunting/PokemonLA_PostMMOSpawnReset.h
-    Source/PokemonLA/Programs/ShinyHunting/PokemonLA_ShinyHunt-CustomPath.cpp
-    Source/PokemonLA/Programs/ShinyHunting/PokemonLA_ShinyHunt-CustomPath.h
-    Source/PokemonLA/Programs/ShinyHunting/PokemonLA_ShinyHunt-FlagPin.cpp
-    Source/PokemonLA/Programs/ShinyHunting/PokemonLA_ShinyHunt-FlagPin.h
-    Source/PokemonLA/Programs/ShinyHunting/PokemonLA_ShinyHunt-LakeTrio.cpp
-    Source/PokemonLA/Programs/ShinyHunting/PokemonLA_ShinyHunt-LakeTrio.h
-    Source/PokemonLA/Programs/ShinyHunting/PokemonLA_UnownFinder.cpp
-    Source/PokemonLA/Programs/ShinyHunting/PokemonLA_UnownFinder.h
-    Source/PokemonLA/Programs/TestPrograms/PokemonLA_FlagNavigationTest.cpp
-    Source/PokemonLA/Programs/TestPrograms/PokemonLA_FlagNavigationTest.h
-    Source/PokemonLA/Programs/TestPrograms/PokemonLA_MountDetectionTest.cpp
-    Source/PokemonLA/Programs/TestPrograms/PokemonLA_MountDetectionTest.h
-    Source/PokemonLA/Programs/TestPrograms/PokemonLA_OverworldWatcher.cpp
-    Source/PokemonLA/Programs/TestPrograms/PokemonLA_OverworldWatcher.h
-    Source/PokemonLA/Programs/TestPrograms/PokemonLA_SoundListener.cpp
-    Source/PokemonLA/Programs/TestPrograms/PokemonLA_SoundListener.h
-    Source/PokemonLA/Programs/Trading/PokemonLA_SelfBoxTrade.cpp
-    Source/PokemonLA/Programs/Trading/PokemonLA_SelfBoxTrade.h
-    Source/PokemonLA/Programs/Trading/PokemonLA_SelfTouchTrade.cpp
-    Source/PokemonLA/Programs/Trading/PokemonLA_SelfTouchTrade.h
-    Source/PokemonLA/Programs/Trading/PokemonLA_TradeRoutines.cpp
-    Source/PokemonLA/Programs/Trading/PokemonLA_TradeRoutines.h
-    Source/PokemonLA/Resources/PokemonLA_AvailablePokemon.cpp
-    Source/PokemonLA/Resources/PokemonLA_AvailablePokemon.h
-    Source/PokemonLA/Resources/PokemonLA_NameDatabase.cpp
-    Source/PokemonLA/Resources/PokemonLA_NameDatabase.h
-    Source/PokemonLA/Resources/PokemonLA_PokemonInfo.cpp
-    Source/PokemonLA/Resources/PokemonLA_PokemonInfo.h
-    Source/PokemonLA/Resources/PokemonLA_PokemonSprites.cpp
-    Source/PokemonLA/Resources/PokemonLA_PokemonSprites.h
-    Source/PokemonLA/Resources/PokemonLA_WeatherAndTimeIcons.cpp
-    Source/PokemonLA/Resources/PokemonLA_WeatherAndTimeIcons.h
-    Source/PokemonSV/Inference/Battles/PokemonSV_BattleBallReader.cpp
-    Source/PokemonSV/Inference/Battles/PokemonSV_BattleBallReader.h
-    Source/PokemonSV/Inference/Battles/PokemonSV_EncounterWatcher.cpp
-    Source/PokemonSV/Inference/Battles/PokemonSV_EncounterWatcher.h
-    Source/PokemonSV/Inference/Battles/PokemonSV_NormalBattleMenus.cpp
-    Source/PokemonSV/Inference/Battles/PokemonSV_NormalBattleMenus.h
-    Source/PokemonSV/Inference/Battles/PokemonSV_PostCatchDetector.cpp
-    Source/PokemonSV/Inference/Battles/PokemonSV_PostCatchDetector.h
-    Source/PokemonSV/Inference/Battles/PokemonSV_ShinySoundDetector.cpp
-    Source/PokemonSV/Inference/Battles/PokemonSV_ShinySoundDetector.h
-    Source/PokemonSV/Inference/Battles/PokemonSV_TeraBattleMenus.cpp
-    Source/PokemonSV/Inference/Battles/PokemonSV_TeraBattleMenus.h
-    Source/PokemonSV/Inference/Boxes/PokemonSV_BoxDetection.cpp
-    Source/PokemonSV/Inference/Boxes/PokemonSV_BoxDetection.h
-    Source/PokemonSV/Inference/Boxes/PokemonSV_BoxEggDetector.cpp
-    Source/PokemonSV/Inference/Boxes/PokemonSV_BoxEggDetector.h
-    Source/PokemonSV/Inference/Boxes/PokemonSV_BoxGenderDetector.cpp
-    Source/PokemonSV/Inference/Boxes/PokemonSV_BoxGenderDetector.h
-    Source/PokemonSV/Inference/Boxes/PokemonSV_BoxNatureDetector.cpp
-    Source/PokemonSV/Inference/Boxes/PokemonSV_BoxNatureDetector.h
-    Source/PokemonSV/Inference/Boxes/PokemonSV_BoxShinyDetector.cpp
-    Source/PokemonSV/Inference/Boxes/PokemonSV_BoxShinyDetector.h
-    Source/PokemonSV/Inference/Boxes/PokemonSV_IVCheckerReader.cpp
-    Source/PokemonSV/Inference/Boxes/PokemonSV_IVCheckerReader.h
-    Source/PokemonSV/Inference/Boxes/PokemonSV_StatsResetChecker.cpp
-    Source/PokemonSV/Inference/Boxes/PokemonSV_StatsResetChecker.h
-    Source/PokemonSV/Inference/Dialogs/PokemonSV_DialogArrowDetector.cpp
-    Source/PokemonSV/Inference/Dialogs/PokemonSV_DialogArrowDetector.h
-    Source/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.cpp
-    Source/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h
-    Source/PokemonSV/Inference/Dialogs/PokemonSV_GradientArrowDetector.cpp
-    Source/PokemonSV/Inference/Dialogs/PokemonSV_GradientArrowDetector.h
-    Source/PokemonSV/Inference/Overworld/PokemonSV_AreaZeroSkyDetector.cpp
-    Source/PokemonSV/Inference/Overworld/PokemonSV_AreaZeroSkyDetector.h
-    Source/PokemonSV/Inference/Overworld/PokemonSV_LetsGoHpReader.cpp
-    Source/PokemonSV/Inference/Overworld/PokemonSV_LetsGoHpReader.h
-    Source/PokemonSV/Inference/Overworld/PokemonSV_LetsGoKillDetector.cpp
-    Source/PokemonSV/Inference/Overworld/PokemonSV_LetsGoKillDetector.h
-    Source/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.cpp
-    Source/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h
-    Source/PokemonSV/Inference/Picnics/PokemonSV_PicnicDetector.cpp
-    Source/PokemonSV/Inference/Picnics/PokemonSV_PicnicDetector.h
-    Source/PokemonSV/Inference/Picnics/PokemonSV_SandwichHandDetector.cpp
-    Source/PokemonSV/Inference/Picnics/PokemonSV_SandwichHandDetector.h
-    Source/PokemonSV/Inference/Picnics/PokemonSV_SandwichIngredientDetector.cpp
-    Source/PokemonSV/Inference/Picnics/PokemonSV_SandwichIngredientDetector.h
-    Source/PokemonSV/Inference/Picnics/PokemonSV_SandwichRecipeDetector.cpp
-    Source/PokemonSV/Inference/Picnics/PokemonSV_SandwichRecipeDetector.h
-    Source/PokemonSV/Inference/PokemonSV_AuctionItemNameReader.cpp
-    Source/PokemonSV/Inference/PokemonSV_AuctionItemNameReader.h
-    Source/PokemonSV/Inference/PokemonSV_ESPEmotionDetector.cpp
-    Source/PokemonSV/Inference/PokemonSV_ESPEmotionDetector.h
-    Source/PokemonSV/Inference/PokemonSV_MainMenuDetector.cpp
-    Source/PokemonSV/Inference/PokemonSV_MainMenuDetector.h
-    Source/PokemonSV/Inference/PokemonSV_MapDetector.cpp
-    Source/PokemonSV/Inference/PokemonSV_MapDetector.h
-    Source/PokemonSV/Inference/PokemonSV_MoneyReader.cpp
-    Source/PokemonSV/Inference/PokemonSV_MoneyReader.h
-    Source/PokemonSV/Inference/PokemonSV_PokePortalDetector.cpp
-    Source/PokemonSV/Inference/PokemonSV_PokePortalDetector.h
-    Source/PokemonSV/Inference/PokemonSV_PokemonSummaryReader.cpp
-    Source/PokemonSV/Inference/PokemonSV_PokemonSummaryReader.h
-    Source/PokemonSV/Inference/PokemonSV_SweatBubbleDetector.cpp
-    Source/PokemonSV/Inference/PokemonSV_SweatBubbleDetector.h
-    Source/PokemonSV/Inference/PokemonSV_TournamentPrizeNameReader.cpp
-    Source/PokemonSV/Inference/PokemonSV_TournamentPrizeNameReader.h
-    Source/PokemonSV/Inference/PokemonSV_WhiteButtonDetector.cpp
-    Source/PokemonSV/Inference/PokemonSV_WhiteButtonDetector.h
-    Source/PokemonSV/Inference/PokemonSV_ZeroGateWarpPromptDetector.cpp
-    Source/PokemonSV/Inference/PokemonSV_ZeroGateWarpPromptDetector.h
-    Source/PokemonSV/Inference/Tera/PokemonSV_TeraCardDetector.cpp
-    Source/PokemonSV/Inference/Tera/PokemonSV_TeraCardDetector.h
-    Source/PokemonSV/Inference/Tera/PokemonSV_TeraCodeReader.cpp
-    Source/PokemonSV/Inference/Tera/PokemonSV_TeraCodeReader.h
-    Source/PokemonSV/Inference/Tera/PokemonSV_TeraRaidSearchDetector.cpp
-    Source/PokemonSV/Inference/Tera/PokemonSV_TeraRaidSearchDetector.h
-    Source/PokemonSV/Inference/Tera/PokemonSV_TeraRewardsReader.cpp
-    Source/PokemonSV/Inference/Tera/PokemonSV_TeraRewardsReader.h
-    Source/PokemonSV/Inference/Tera/PokemonSV_TeraSilhouetteReader.cpp
-    Source/PokemonSV/Inference/Tera/PokemonSV_TeraSilhouetteReader.h
-    Source/PokemonSV/Inference/Tera/PokemonSV_TeraTypeReader.cpp
-    Source/PokemonSV/Inference/Tera/PokemonSV_TeraTypeReader.h
-    Source/PokemonSV/Options/PokemonSV_AuctionItemSelectOption.cpp
-    Source/PokemonSV/Options/PokemonSV_AuctionItemSelectOption.h
-    Source/PokemonSV/Options/PokemonSV_AuctionItemTable.cpp
-    Source/PokemonSV/Options/PokemonSV_AuctionItemTable.h
-    Source/PokemonSV/Options/PokemonSV_AutoHostOptions.h
-    Source/PokemonSV/Options/PokemonSV_EggPowerSandwichOption.cpp
-    Source/PokemonSV/Options/PokemonSV_EggPowerSandwichOption.h
-    Source/PokemonSV/Options/PokemonSV_EncounterActionsTable.cpp
-    Source/PokemonSV/Options/PokemonSV_EncounterActionsTable.h
-    Source/PokemonSV/Options/PokemonSV_EncounterBotCommon.h
-    Source/PokemonSV/Options/PokemonSV_PlayerList.cpp
-    Source/PokemonSV/Options/PokemonSV_PlayerList.h
-    Source/PokemonSV/Options/PokemonSV_SandwichIngredientsOption.cpp
-    Source/PokemonSV/Options/PokemonSV_SandwichIngredientsOption.h
-    Source/PokemonSV/Options/PokemonSV_SandwichIngredientsTable.cpp
-    Source/PokemonSV/Options/PokemonSV_SandwichIngredientsTable.h
-    Source/PokemonSV/Options/PokemonSV_SandwichMakerOption.cpp
-    Source/PokemonSV/Options/PokemonSV_SandwichMakerOption.h
-    Source/PokemonSV/Options/PokemonSV_TeraAIOption.cpp
-    Source/PokemonSV/Options/PokemonSV_TeraAIOption.h
-    Source/PokemonSV/Options/PokemonSV_TeraMoveTable.cpp
-    Source/PokemonSV/Options/PokemonSV_TeraMoveTable.h
-    Source/PokemonSV/Options/PokemonSV_TournamentPrizeSelectOption.cpp
-    Source/PokemonSV/Options/PokemonSV_TournamentPrizeSelectOption.h
-    Source/PokemonSV/Options/PokemonSV_TournamentPrizeTable.cpp
-    Source/PokemonSV/Options/PokemonSV_TournamentPrizeTable.h
-    Source/PokemonSV/PokemonSV_Panels.cpp
-    Source/PokemonSV/PokemonSV_Panels.h
-    Source/PokemonSV/PokemonSV_Settings.cpp
-    Source/PokemonSV/PokemonSV_Settings.h
-    Source/PokemonSV/Programs/Boxes/PokemonSV_BoxRoutines.cpp
-    Source/PokemonSV/Programs/Boxes/PokemonSV_BoxRoutines.h
-    Source/PokemonSV/Programs/Eggs/PokemonSV_EggAutonomous.cpp
-    Source/PokemonSV/Programs/Eggs/PokemonSV_EggAutonomous.h
-    Source/PokemonSV/Programs/Eggs/PokemonSV_EggFetcher.cpp
-    Source/PokemonSV/Programs/Eggs/PokemonSV_EggFetcher.h
-    Source/PokemonSV/Programs/Eggs/PokemonSV_EggHatcher.cpp
-    Source/PokemonSV/Programs/Eggs/PokemonSV_EggHatcher.h
-    Source/PokemonSV/Programs/Eggs/PokemonSV_EggRoutines.cpp
-    Source/PokemonSV/Programs/Eggs/PokemonSV_EggRoutines.h
-    Source/PokemonSV/Programs/FastCodeEntry/PokemonSV_ClipboardFastCodeEntry.cpp
-    Source/PokemonSV/Programs/FastCodeEntry/PokemonSV_ClipboardFastCodeEntry.h
-    Source/PokemonSV/Programs/FastCodeEntry/PokemonSV_CodeEntry.cpp
-    Source/PokemonSV/Programs/FastCodeEntry/PokemonSV_CodeEntry.h
-    Source/PokemonSV/Programs/FastCodeEntry/PokemonSV_FastCodeEntry.cpp
-    Source/PokemonSV/Programs/FastCodeEntry/PokemonSV_FastCodeEntry.h
-    Source/PokemonSV/Programs/FastCodeEntry/PokemonSV_VideoFastCodeEntry.cpp
-    Source/PokemonSV/Programs/FastCodeEntry/PokemonSV_VideoFastCodeEntry.h
-    Source/PokemonSV/Programs/General/PokemonSV_AuctionFarmer.cpp
-    Source/PokemonSV/Programs/General/PokemonSV_AuctionFarmer.h
-    Source/PokemonSV/Programs/General/PokemonSV_AutonomousBallThrower.cpp
-    Source/PokemonSV/Programs/General/PokemonSV_AutonomousBallThrower.h
-    Source/PokemonSV/Programs/General/PokemonSV_ESPTraining.cpp
-    Source/PokemonSV/Programs/General/PokemonSV_ESPTraining.h
-    Source/PokemonSV/Programs/General/PokemonSV_GimmighoulChestFarmer.cpp
-    Source/PokemonSV/Programs/General/PokemonSV_GimmighoulChestFarmer.h
-    Source/PokemonSV/Programs/General/PokemonSV_GimmighoulRoamingFarmer.cpp
-    Source/PokemonSV/Programs/General/PokemonSV_GimmighoulRoamingFarmer.h
-    Source/PokemonSV/Programs/General/PokemonSV_LPFarmer.cpp
-    Source/PokemonSV/Programs/General/PokemonSV_LPFarmer.h
-    Source/PokemonSV/Programs/General/PokemonSV_MassPurchase.cpp
-    Source/PokemonSV/Programs/General/PokemonSV_MassPurchase.h
-    Source/PokemonSV/Programs/General/PokemonSV_MassRelease.cpp
-    Source/PokemonSV/Programs/General/PokemonSV_MassRelease.h
-    Source/PokemonSV/Programs/General/PokemonSV_SizeChecker.cpp
-    Source/PokemonSV/Programs/General/PokemonSV_SizeChecker.h
-    Source/PokemonSV/Programs/General/PokemonSV_StatsReset.cpp
-    Source/PokemonSV/Programs/General/PokemonSV_StatsReset.h
-    Source/PokemonSV/Programs/General/PokemonSV_TournamentFarmer.cpp
-    Source/PokemonSV/Programs/General/PokemonSV_TournamentFarmer.h
-    Source/PokemonSV/Programs/Glitches/PokemonSV_CloneItems-1.0.1.cpp
-    Source/PokemonSV/Programs/Glitches/PokemonSV_CloneItems-1.0.1.h
-    Source/PokemonSV/Programs/Glitches/PokemonSV_RideCloner-1.0.1.cpp
-    Source/PokemonSV/Programs/Glitches/PokemonSV_RideCloner-1.0.1.h
-    Source/PokemonSV/Programs/PokemonSV_AreaZero.cpp
-    Source/PokemonSV/Programs/PokemonSV_AreaZero.h
-    Source/PokemonSV/Programs/PokemonSV_BasicCatcher.cpp
-    Source/PokemonSV/Programs/PokemonSV_BasicCatcher.h
-    Source/PokemonSV/Programs/PokemonSV_Battles.cpp
-    Source/PokemonSV/Programs/PokemonSV_Battles.h
-    Source/PokemonSV/Programs/PokemonSV_ConnectToInternet.cpp
-    Source/PokemonSV/Programs/PokemonSV_ConnectToInternet.h
-    Source/PokemonSV/Programs/PokemonSV_GameEntry.cpp
-    Source/PokemonSV/Programs/PokemonSV_GameEntry.h
-    Source/PokemonSV/Programs/PokemonSV_Navigation.cpp
-    Source/PokemonSV/Programs/PokemonSV_Navigation.h
-    Source/PokemonSV/Programs/PokemonSV_SaveGame.cpp
-    Source/PokemonSV/Programs/PokemonSV_SaveGame.h
-    Source/PokemonSV/Programs/Sandwiches/PokemonSV_IngredientSession.cpp
-    Source/PokemonSV/Programs/Sandwiches/PokemonSV_IngredientSession.h
-    Source/PokemonSV/Programs/Sandwiches/PokemonSV_SandwichMaker.cpp
-    Source/PokemonSV/Programs/Sandwiches/PokemonSV_SandwichMaker.h
-    Source/PokemonSV/Programs/Sandwiches/PokemonSV_SandwichRoutines.cpp
-    Source/PokemonSV/Programs/Sandwiches/PokemonSV_SandwichRoutines.h
-    Source/PokemonSV/Programs/ShinyHunting/PokemonSV_AreaZeroPlatform.cpp
-    Source/PokemonSV/Programs/ShinyHunting/PokemonSV_AreaZeroPlatform.h
-    Source/PokemonSV/Programs/ShinyHunting/PokemonSV_LetsGoTools.cpp
-    Source/PokemonSV/Programs/ShinyHunting/PokemonSV_LetsGoTools.h
-    Source/PokemonSV/Programs/ShinyHunting/PokemonSV_ShinyHunt-AreaZeroPlatform.cpp
-    Source/PokemonSV/Programs/ShinyHunting/PokemonSV_ShinyHunt-AreaZeroPlatform.h
-    Source/PokemonSV/Programs/TeraRaids/PokemonSV_AutoHost.cpp
-    Source/PokemonSV/Programs/TeraRaids/PokemonSV_AutoHost.h
-    Source/PokemonSV/Programs/TeraRaids/PokemonSV_AutoHostLobbyWaiter.cpp
-    Source/PokemonSV/Programs/TeraRaids/PokemonSV_AutoHostLobbyWaiter.h
-    Source/PokemonSV/Programs/TeraRaids/PokemonSV_AutoHostTools.cpp
-    Source/PokemonSV/Programs/TeraRaids/PokemonSV_AutoHostTools.h
-    Source/PokemonSV/Programs/TeraRaids/PokemonSV_JoinTracker.cpp
-    Source/PokemonSV/Programs/TeraRaids/PokemonSV_JoinTracker.h
-    Source/PokemonSV/Programs/TeraRaids/PokemonSV_TeraBattler.cpp
-    Source/PokemonSV/Programs/TeraRaids/PokemonSV_TeraBattler.h
-    Source/PokemonSV/Programs/TeraRaids/PokemonSV_TeraMultiFarmer.cpp
-    Source/PokemonSV/Programs/TeraRaids/PokemonSV_TeraMultiFarmer.h
-    Source/PokemonSV/Programs/TeraRaids/PokemonSV_TeraRoutines.cpp
-    Source/PokemonSV/Programs/TeraRaids/PokemonSV_TeraRoutines.h
-    Source/PokemonSV/Programs/TeraRaids/PokemonSV_TeraSelfFarmer.cpp
-    Source/PokemonSV/Programs/TeraRaids/PokemonSV_TeraSelfFarmer.h
-    Source/PokemonSV/Programs/TestPrograms/PokemonSV_SoundListener.cpp
-    Source/PokemonSV/Programs/TestPrograms/PokemonSV_SoundListener.h
-    Source/PokemonSV/Programs/Trading/PokemonSV_SelfBoxTrade.cpp
-    Source/PokemonSV/Programs/Trading/PokemonSV_SelfBoxTrade.h
-    Source/PokemonSV/Programs/Trading/PokemonSV_TradeRoutines.cpp
-    Source/PokemonSV/Programs/Trading/PokemonSV_TradeRoutines.h
-    Source/PokemonSV/Resources/PokemonSV_AuctionItemNames.cpp
-    Source/PokemonSV/Resources/PokemonSV_AuctionItemNames.h
-    Source/PokemonSV/Resources/PokemonSV_FillingsCoordinates.h
-    Source/PokemonSV/Resources/PokemonSV_Ingredients.cpp
-    Source/PokemonSV/Resources/PokemonSV_Ingredients.h
-    Source/PokemonSV/Resources/PokemonSV_ItemSprites.cpp
-    Source/PokemonSV/Resources/PokemonSV_ItemSprites.h
-    Source/PokemonSV/Resources/PokemonSV_NameDatabase.cpp
-    Source/PokemonSV/Resources/PokemonSV_NameDatabase.h
-    Source/PokemonSV/Resources/PokemonSV_PokemonSprites.cpp
-    Source/PokemonSV/Resources/PokemonSV_PokemonSprites.h
-    Source/PokemonSV/Resources/PokemonSV_TournamentPrizeNames.cpp
-    Source/PokemonSV/Resources/PokemonSV_TournamentPrizeNames.h
-    Source/PokemonSwSh/Commands/PokemonSwSh_Commands_AutoHosts.cpp
-    Source/PokemonSwSh/Commands/PokemonSwSh_Commands_AutoHosts.h
-    Source/PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.cpp
-    Source/PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.h
-    Source/PokemonSwSh/Commands/PokemonSwSh_Commands_DaySkippers.cpp
-    Source/PokemonSwSh/Commands/PokemonSwSh_Commands_DaySkippers.h
-    Source/PokemonSwSh/Commands/PokemonSwSh_Commands_EggRoutines.cpp
-    Source/PokemonSwSh/Commands/PokemonSwSh_Commands_EggRoutines.h
-    Source/PokemonSwSh/Commands/PokemonSwSh_Commands_GameEntry.cpp
-    Source/PokemonSwSh/Commands/PokemonSwSh_Commands_GameEntry.h
-    Source/PokemonSwSh/Commands/PokemonSwSh_Commands_Misc.cpp
-    Source/PokemonSwSh/Commands/PokemonSwSh_Commands_Misc.h
-    Source/PokemonSwSh/Commands/PokemonSwSh_Messages_AutoHosts.h
-    Source/PokemonSwSh/Commands/PokemonSwSh_Messages_DateSpam.h
-    Source/PokemonSwSh/Commands/PokemonSwSh_Messages_DaySkippers.h
-    Source/PokemonSwSh/Commands/PokemonSwSh_Messages_EggRoutines.h
-    Source/PokemonSwSh/Commands/PokemonSwSh_Messages_GameEntry.h
-    Source/PokemonSwSh/Commands/PokemonSwSh_Messages_Misc.h
-    Source/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleBallReader.cpp
-    Source/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleBallReader.h
-    Source/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleDialogDetector.cpp
-    Source/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleDialogDetector.h
-    Source/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleDialogTracker.cpp
-    Source/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleDialogTracker.h
-    Source/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleMenuDetector.cpp
-    Source/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleMenuDetector.h
-    Source/PokemonSwSh/Inference/Battles/PokemonSwSh_ExperienceGainDetector.cpp
-    Source/PokemonSwSh/Inference/Battles/PokemonSwSh_ExperienceGainDetector.h
-    Source/PokemonSwSh/Inference/Battles/PokemonSwSh_StartBattleDetector.cpp
-    Source/PokemonSwSh/Inference/Battles/PokemonSwSh_StartBattleDetector.h
-    Source/PokemonSwSh/Inference/Dens/PokemonSwSh_BeamSetter.cpp
-    Source/PokemonSwSh/Inference/Dens/PokemonSwSh_BeamSetter.h
-    Source/PokemonSwSh/Inference/Dens/PokemonSwSh_DenMonReader.cpp
-    Source/PokemonSwSh/Inference/Dens/PokemonSwSh_DenMonReader.h
-    Source/PokemonSwSh/Inference/Dens/PokemonSwSh_RaidCatchDetector.cpp
-    Source/PokemonSwSh/Inference/Dens/PokemonSwSh_RaidCatchDetector.h
-    Source/PokemonSwSh/Inference/Dens/PokemonSwSh_RaidLobbyReader.cpp
-    Source/PokemonSwSh/Inference/Dens/PokemonSwSh_RaidLobbyReader.h
-    Source/PokemonSwSh/Inference/PokemonSwSh_BoxGenderDetector.cpp
-    Source/PokemonSwSh/Inference/PokemonSwSh_BoxGenderDetector.h
-    Source/PokemonSwSh/Inference/PokemonSwSh_BoxNatureDetector.cpp
-    Source/PokemonSwSh/Inference/PokemonSwSh_BoxNatureDetector.h
-    Source/PokemonSwSh/Inference/PokemonSwSh_BoxShinySymbolDetector.cpp
-    Source/PokemonSwSh/Inference/PokemonSwSh_BoxShinySymbolDetector.h
-    Source/PokemonSwSh/Inference/PokemonSwSh_DialogBoxDetector.cpp
-    Source/PokemonSwSh/Inference/PokemonSwSh_DialogBoxDetector.h
-    Source/PokemonSwSh/Inference/PokemonSwSh_DialogTriangleDetector.cpp
-    Source/PokemonSwSh/Inference/PokemonSwSh_DialogTriangleDetector.h
-    Source/PokemonSwSh/Inference/PokemonSwSh_FishingDetector.cpp
-    Source/PokemonSwSh/Inference/PokemonSwSh_FishingDetector.h
-    Source/PokemonSwSh/Inference/PokemonSwSh_IVCheckerReader.cpp
-    Source/PokemonSwSh/Inference/PokemonSwSh_IVCheckerReader.h
-    Source/PokemonSwSh/Inference/PokemonSwSh_MarkFinder.cpp
-    Source/PokemonSwSh/Inference/PokemonSwSh_MarkFinder.h
-    Source/PokemonSwSh/Inference/PokemonSwSh_PokemonSpriteReader.cpp
-    Source/PokemonSwSh/Inference/PokemonSwSh_PokemonSpriteReader.h
-    Source/PokemonSwSh/Inference/PokemonSwSh_QuantityReader.cpp
-    Source/PokemonSwSh/Inference/PokemonSwSh_QuantityReader.h
-    Source/PokemonSwSh/Inference/PokemonSwSh_ReceivePokemonDetector.cpp
-    Source/PokemonSwSh/Inference/PokemonSwSh_ReceivePokemonDetector.h
-    Source/PokemonSwSh/Inference/PokemonSwSh_SelectionArrowFinder.cpp
-    Source/PokemonSwSh/Inference/PokemonSwSh_SelectionArrowFinder.h
-    Source/PokemonSwSh/Inference/PokemonSwSh_SummaryShinySymbolDetector.cpp
-    Source/PokemonSwSh/Inference/PokemonSwSh_SummaryShinySymbolDetector.h
-    Source/PokemonSwSh/Inference/PokemonSwSh_TypeSymbolFinder.cpp
-    Source/PokemonSwSh/Inference/PokemonSwSh_TypeSymbolFinder.h
-    Source/PokemonSwSh/Inference/PokemonSwSh_YCommDetector.cpp
-    Source/PokemonSwSh/Inference/PokemonSwSh_YCommDetector.h
-    Source/PokemonSwSh/Inference/RNG/PokemonSwSh_OrbeetleAttackAnimationDetector.cpp
-    Source/PokemonSwSh/Inference/RNG/PokemonSwSh_OrbeetleAttackAnimationDetector.h
-    Source/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_ShinyEncounterDetector.cpp
-    Source/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_ShinyEncounterDetector.h
-    Source/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_ShinySparkleSet.cpp
-    Source/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_ShinySparkleSet.h
-    Source/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_SparkleDetectorRadial.cpp
-    Source/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_SparkleDetectorRadial.h
-    Source/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_SparkleDetectorSquare.cpp
-    Source/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_SparkleDetectorSquare.h
-    Source/PokemonSwSh/Inference/Sounds/PokemonSwSh_BerryTreeRustlingSoundDetector.cpp
-    Source/PokemonSwSh/Inference/Sounds/PokemonSwSh_BerryTreeRustlingSoundDetector.h
-    Source/PokemonSwSh/InferenceTraining/PokemonSwSh_GenerateIVCheckerOCR.cpp
-    Source/PokemonSwSh/InferenceTraining/PokemonSwSh_GenerateIVCheckerOCR.h
-    Source/PokemonSwSh/InferenceTraining/PokemonSwSh_GenerateNameOCRPokedex.cpp
-    Source/PokemonSwSh/InferenceTraining/PokemonSwSh_GenerateNameOCRPokedex.h
-    Source/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI.cpp
-    Source/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI.h
-    Source/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_PathMatchup.cpp
-    Source/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_PathMatchup.h
-    Source/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_RentalBossMatchup.cpp
-    Source/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_RentalBossMatchup.h
-    Source/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_SelectItem.cpp
-    Source/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_SelectMove.cpp
-    Source/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_SelectPath.cpp
-    Source/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_SelectStarter.cpp
-    Source/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_SwapCatch.cpp
-    Source/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_SwapProfessor.cpp
-    Source/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_Tools.cpp
-    Source/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_Tools.h
-    Source/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_CatchScreenTracker.cpp
-    Source/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_CatchScreenTracker.h
-    Source/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_Notifications.cpp
-    Source/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_Notifications.h
-    Source/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_State.cpp
-    Source/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_State.h
-    Source/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_StateMachine.cpp
-    Source/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_StateMachine.h
-    Source/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_StateTracker.cpp
-    Source/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_StateTracker.h
-    Source/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_Stats.h
-    Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_BattleMenu.cpp
-    Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_BattleMenu.h
-    Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_EndBattle.cpp
-    Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_EndBattle.h
-    Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_Entrance.cpp
-    Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_Entrance.h
-    Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_HPPP.cpp
-    Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_HPPP.h
-    Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_ItemSelectMenu.cpp
-    Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_ItemSelectMenu.h
-    Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_Lobby.cpp
-    Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_Lobby.h
-    Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathMap.cpp
-    Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathMap.h
-    Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathSelect.cpp
-    Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathSelect.h
-    Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathSide.cpp
-    Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathSide.h
-    Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonReader.cpp
-    Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonReader.h
-    Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonSelectMenu.cpp
-    Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonSelectMenu.h
-    Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonSwapMenu.cpp
-    Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonSwapMenu.h
-    Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_ProfessorSwap.cpp
-    Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_ProfessorSwap.h
-    Source/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options.cpp
-    Source/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options.h
-    Source/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options_BossAction.cpp
-    Source/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options_BossAction.h
-    Source/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options_Consoles.cpp
-    Source/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options_Consoles.h
-    Source/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options_Hosting.cpp
-    Source/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options_Hosting.h
-    Source/PokemonSwSh/MaxLair/PokemonSwSh_MaxLair_BossFinder.cpp
-    Source/PokemonSwSh/MaxLair/PokemonSwSh_MaxLair_BossFinder.h
-    Source/PokemonSwSh/MaxLair/PokemonSwSh_MaxLair_Standard.cpp
-    Source/PokemonSwSh/MaxLair/PokemonSwSh_MaxLair_Standard.h
-    Source/PokemonSwSh/MaxLair/PokemonSwSh_MaxLair_StrongBoss.cpp
-    Source/PokemonSwSh/MaxLair/PokemonSwSh_MaxLair_StrongBoss.h
-    Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_Adventure.cpp
-    Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_Adventure.h
-    Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_Battle.cpp
-    Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_Battle.h
-    Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_CaughtScreen.cpp
-    Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_CaughtScreen.h
-    Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_EnterLobby.cpp
-    Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_EnterLobby.h
-    Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_Entrance.cpp
-    Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_Entrance.h
-    Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_ItemSelect.cpp
-    Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_ItemSelect.h
-    Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_PathSelect.cpp
-    Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_PathSelect.h
-    Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_PokemonSelect.cpp
-    Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_PokemonSelect.h
-    Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_PokemonSwap.cpp
-    Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_PokemonSwap.h
-    Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_ProfessorSwap.cpp
-    Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_ProfessorSwap.h
-    Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_Start.cpp
-    Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_Start.h
-    Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_StartSolo.cpp
-    Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_StartSolo.h
-    Source/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterEnums.cpp
-    Source/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterEnums.h
-    Source/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterOption.cpp
-    Source/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterOption.h
-    Source/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterOverride.cpp
-    Source/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterOverride.h
-    Source/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterWidget.cpp
-    Source/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterWidget.h
-    Source/PokemonSwSh/Options/PokemonSwSh_AutoHostNotification.cpp
-    Source/PokemonSwSh/Options/PokemonSwSh_AutoHostNotification.h
-    Source/PokemonSwSh/Options/PokemonSwSh_BallSelectOption.cpp
-    Source/PokemonSwSh/Options/PokemonSwSh_BallSelectOption.h
-    Source/PokemonSwSh/Options/PokemonSwSh_Catchability.h
-    Source/PokemonSwSh/Options/PokemonSwSh_CramomaticTable.cpp
-    Source/PokemonSwSh/Options/PokemonSwSh_CramomaticTable.h
-    Source/PokemonSwSh/Options/PokemonSwSh_DateToucher.cpp
-    Source/PokemonSwSh/Options/PokemonSwSh_DateToucher.h
-    Source/PokemonSwSh/Options/PokemonSwSh_EggStepCount.h
-    Source/PokemonSwSh/Options/PokemonSwSh_EncounterBotCommon.h
-    Source/PokemonSwSh/Options/PokemonSwSh_RegiSelector.h
-    Source/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Battle.cpp
-    Source/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Battle.h
-    Source/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Field.cpp
-    Source/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Field.h
-    Source/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Matchup.cpp
-    Source/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Matchup.h
-    Source/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Moves.cpp
-    Source/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Moves.h
-    Source/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Pokemon.cpp
-    Source/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Pokemon.h
-    Source/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Stats.cpp
-    Source/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Stats.h
-    Source/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Types.cpp
-    Source/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Types.h
-    Source/PokemonSwSh/PokemonSwSh_Panels.cpp
-    Source/PokemonSwSh/PokemonSwSh_Panels.h
-    Source/PokemonSwSh/PokemonSwSh_Settings.cpp
-    Source/PokemonSwSh/PokemonSwSh_Settings.h
-    Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-BerryFarmer.cpp
-    Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-BerryFarmer.h
-    Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-BerryFarmer2.cpp
-    Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-BerryFarmer2.h
-    Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-DailyHighlightFarmer.cpp
-    Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-DailyHighlightFarmer.h
-    Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-LotoFarmer.cpp
-    Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-LotoFarmer.h
-    Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-PokeJobsFarmer.cpp
-    Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-PokeJobsFarmer.h
-    Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-StowOnSideFarmer.cpp
-    Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-StowOnSideFarmer.h
-    Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-WattFarmer.cpp
-    Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-WattFarmer.h
-    Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_BeamReset.cpp
-    Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_BeamReset.h
-    Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperEU.cpp
-    Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperEU.h
-    Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperJPN-7.8k.cpp
-    Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperJPN-7.8k.h
-    Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperJPN.cpp
-    Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperJPN.h
-    Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperStats.h
-    Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperUS.cpp
-    Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperUS.h
-    Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_EventBeamFinder.cpp
-    Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_EventBeamFinder.h
-    Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_PurpleBeamFinder.cpp
-    Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_PurpleBeamFinder.h
-    Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggAutonomous.cpp
-    Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggAutonomous.h
-    Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggCombined2.cpp
-    Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggCombined2.h
-    Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggCombinedShared.h
-    Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggFetcher2.cpp
-    Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggFetcher2.h
-    Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggFetcherMultiple.cpp
-    Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggFetcherMultiple.h
-    Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggHatcher.cpp
-    Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggHatcher.h
-    Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggHelpers.h
-    Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggSuperCombined2.cpp
-    Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggSuperCombined2.h
-    Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_GodEggDuplication.cpp
-    Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_GodEggDuplication.h
-    Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_GodEggItemDupe.cpp
-    Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_GodEggItemDupe.h
-    Source/PokemonSwSh/Programs/General/PokemonSwSh_AutonomousBallThrower.cpp
-    Source/PokemonSwSh/Programs/General/PokemonSwSh_AutonomousBallThrower.h
-    Source/PokemonSwSh/Programs/General/PokemonSwSh_BallThrower.cpp
-    Source/PokemonSwSh/Programs/General/PokemonSwSh_BallThrower.h
-    Source/PokemonSwSh/Programs/General/PokemonSwSh_BoxReorderNationalDex.cpp
-    Source/PokemonSwSh/Programs/General/PokemonSwSh_BoxReorderNationalDex.h
-    Source/PokemonSwSh/Programs/General/PokemonSwSh_ClothingBuyer.cpp
-    Source/PokemonSwSh/Programs/General/PokemonSwSh_ClothingBuyer.h
-    Source/PokemonSwSh/Programs/General/PokemonSwSh_DexRecFinder.cpp
-    Source/PokemonSwSh/Programs/General/PokemonSwSh_DexRecFinder.h
-    Source/PokemonSwSh/Programs/General/PokemonSwSh_MassRelease.cpp
-    Source/PokemonSwSh/Programs/General/PokemonSwSh_MassRelease.h
-    Source/PokemonSwSh/Programs/General/PokemonSwSh_SurpriseTrade.cpp
-    Source/PokemonSwSh/Programs/General/PokemonSwSh_SurpriseTrade.h
-    Source/PokemonSwSh/Programs/General/PokemonSwSh_TradeBot.cpp
-    Source/PokemonSwSh/Programs/General/PokemonSwSh_TradeBot.h
-    Source/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHost-MultiGame.cpp
-    Source/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHost-MultiGame.h
-    Source/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHost-Rolling.cpp
-    Source/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHost-Rolling.h
-    Source/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHost.cpp
-    Source/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHost.h
-    Source/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHostStats.cpp
-    Source/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHostStats.h
-    Source/PokemonSwSh/Programs/Hosting/PokemonSwSh_DenRoller.cpp
-    Source/PokemonSwSh/Programs/Hosting/PokemonSwSh_DenRoller.h
-    Source/PokemonSwSh/Programs/Hosting/PokemonSwSh_DenTools.cpp
-    Source/PokemonSwSh/Programs/Hosting/PokemonSwSh_DenTools.h
-    Source/PokemonSwSh/Programs/Hosting/PokemonSwSh_LobbyWait.h
-    Source/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset-Calyrex.cpp
-    Source/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset-Calyrex.h
-    Source/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset-Moltres.cpp
-    Source/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset-Moltres.h
-    Source/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset-Regi.cpp
-    Source/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset-Regi.h
-    Source/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset.cpp
-    Source/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset.h
-    Source/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_OverworldMovement.cpp
-    Source/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_OverworldMovement.h
-    Source/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_OverworldTargetTracker.cpp
-    Source/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_OverworldTargetTracker.h
-    Source/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_OverworldTrajectory.cpp
-    Source/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_OverworldTrajectory.h
-    Source/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_OverworldTrigger.cpp
-    Source/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_OverworldTrigger.h
-    Source/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_ShinyHuntAutonomous-Overworld.cpp
-    Source/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_ShinyHuntAutonomous-Overworld.h
-    Source/PokemonSwSh/Programs/PokemonSwSh_BasicCatcher.cpp
-    Source/PokemonSwSh/Programs/PokemonSwSh_BasicCatcher.h
-    Source/PokemonSwSh/Programs/PokemonSwSh_EncounterDetection.cpp
-    Source/PokemonSwSh/Programs/PokemonSwSh_EncounterDetection.h
-    Source/PokemonSwSh/Programs/PokemonSwSh_EncounterHandler.cpp
-    Source/PokemonSwSh/Programs/PokemonSwSh_EncounterHandler.h
-    Source/PokemonSwSh/Programs/PokemonSwSh_GameEntry.cpp
-    Source/PokemonSwSh/Programs/PokemonSwSh_GameEntry.h
-    Source/PokemonSwSh/Programs/PokemonSwSh_Internet.cpp
-    Source/PokemonSwSh/Programs/PokemonSwSh_Internet.h
-    Source/PokemonSwSh/Programs/PokemonSwSh_MenuNavigation.cpp
-    Source/PokemonSwSh/Programs/PokemonSwSh_MenuNavigation.h
-    Source/PokemonSwSh/Programs/PokemonSwSh_RaidItemFarmerOKHO.cpp
-    Source/PokemonSwSh/Programs/PokemonSwSh_RaidItemFarmerOKHO.h
-    Source/PokemonSwSh/Programs/PokemonSwSh_SynchronizedSpinning.cpp
-    Source/PokemonSwSh/Programs/PokemonSwSh_SynchronizedSpinning.h
-    Source/PokemonSwSh/Programs/QoLMacros/PokemonSwSh_FastCodeEntry.cpp
-    Source/PokemonSwSh/Programs/QoLMacros/PokemonSwSh_FastCodeEntry.h
-    Source/PokemonSwSh/Programs/QoLMacros/PokemonSwSh_FriendSearchDisconnect.cpp
-    Source/PokemonSwSh/Programs/QoLMacros/PokemonSwSh_FriendSearchDisconnect.h
-    Source/PokemonSwSh/Programs/RNG/PokemonSwSh_BasicRNG.cpp
-    Source/PokemonSwSh/Programs/RNG/PokemonSwSh_BasicRNG.h
-    Source/PokemonSwSh/Programs/RNG/PokemonSwSh_CramomaticRNG.cpp
-    Source/PokemonSwSh/Programs/RNG/PokemonSwSh_CramomaticRNG.h
-    Source/PokemonSwSh/Programs/RNG/PokemonSwSh_SeedFinder.cpp
-    Source/PokemonSwSh/Programs/RNG/PokemonSwSh_SeedFinder.h
-    Source/PokemonSwSh/Programs/RNG/PokemonSwSh_Xoroshiro128Plus.cpp
-    Source/PokemonSwSh/Programs/RNG/PokemonSwSh_Xoroshiro128Plus.h
-    Source/PokemonSwSh/Programs/ReleaseHelpers.h
-    Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-BerryTree.cpp
-    Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-BerryTree.h
-    Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Fishing.cpp
-    Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Fishing.h
-    Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-IoATrade.cpp
-    Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-IoATrade.h
-    Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Regi.cpp
-    Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Regi.h
-    Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Regigigas2.cpp
-    Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Regigigas2.h
-    Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-StrongSpawn.cpp
-    Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-StrongSpawn.h
-    Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-SwordsOfJustice.cpp
-    Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-SwordsOfJustice.h
-    Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Whistling.cpp
-    Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Whistling.h
-    Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_CurryHunter.cpp
-    Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_CurryHunter.h
-    Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_MultiGameFossil.cpp
-    Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_MultiGameFossil.h
-    Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHunt-Regi.cpp
-    Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHunt-Regi.h
-    Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntTools.cpp
-    Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntTools.h
-    Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntUnattended-IoATrade.cpp
-    Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntUnattended-IoATrade.h
-    Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntUnattended-Regi.cpp
-    Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntUnattended-Regi.h
-    Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntUnattended-Regigigas2.cpp
-    Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntUnattended-Regigigas2.h
-    Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntUnattended-StrongSpawn.cpp
-    Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntUnattended-StrongSpawn.h
-    Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntUnattended-SwordsOfJustice.cpp
-    Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntUnattended-SwordsOfJustice.h
-    Source/PokemonSwSh/Programs/TestPrograms/PokemonSwSh_ShinyEncounterTester.cpp
-    Source/PokemonSwSh/Programs/TestPrograms/PokemonSwSh_ShinyEncounterTester.h
-    Source/PokemonSwSh/Resources/PokemonSwSh_MaxLairDatabase.cpp
-    Source/PokemonSwSh/Resources/PokemonSwSh_MaxLairDatabase.h
-    Source/PokemonSwSh/Resources/PokemonSwSh_NameDatabase.cpp
-    Source/PokemonSwSh/Resources/PokemonSwSh_NameDatabase.h
-    Source/PokemonSwSh/Resources/PokemonSwSh_PokeballSprites.cpp
-    Source/PokemonSwSh/Resources/PokemonSwSh_PokeballSprites.h
-    Source/PokemonSwSh/Resources/PokemonSwSh_PokemonSprites.cpp
-    Source/PokemonSwSh/Resources/PokemonSwSh_PokemonSprites.h
-    Source/PokemonSwSh/Resources/PokemonSwSh_TypeMatchup.cpp
-    Source/PokemonSwSh/Resources/PokemonSwSh_TypeMatchup.h
-    Source/PokemonSwSh/Resources/PokemonSwSh_TypeSprites.cpp
-    Source/PokemonSwSh/Resources/PokemonSwSh_TypeSprites.h
-    Source/PokemonSwSh/ShinyHuntTracker.cpp
-    Source/PokemonSwSh/ShinyHuntTracker.h
-    Source/Tests/CommandLineTests.cpp
-    Source/Tests/CommandLineTests.h
-    Source/Tests/CommonFramework_Tests.cpp
-    Source/Tests/CommonFramework_Tests.h
-    Source/Tests/Kernels_Tests.cpp
-    Source/Tests/Kernels_Tests.h
-    Source/Tests/NintendoSwitch_Tests.cpp
-    Source/Tests/NintendoSwitch_Tests.h
-    Source/Tests/PokemonLA_Tests.cpp
-    Source/Tests/PokemonLA_Tests.h
-    Source/Tests/PokemonSV_Tests.cpp
-    Source/Tests/PokemonSV_Tests.h
-    Source/Tests/PokemonSwSh_Tests.cpp
-    Source/Tests/PokemonSwSh_Tests.h
-    Source/Tests/TestMap.cpp
-    Source/Tests/TestMap.h
-    Source/Tests/TestUtils.cpp
-    Source/Tests/TestUtils.h
-    Source/ZeldaTotK/ZeldaTotK_Panels.cpp
-    Source/ZeldaTotK/ZeldaTotK_Panels.h
-    Source/ZeldaTotK/ZeldaTotK_Settings.cpp
-    Source/ZeldaTotK/ZeldaTotK_Settings.h
-    Source/ZeldaTotK/Programs/ZeldaTotK_BowItemDuper.cpp
-    Source/ZeldaTotK/Programs/ZeldaTotK_BowItemDuper.h
-    Source/ZeldaTotK/Programs/ZeldaTotK_MineruItemDuper.cpp
-    Source/ZeldaTotK/Programs/ZeldaTotK_MineruItemDuper.h
-    Source/ZeldaTotK/Programs/ZeldaTotK_ParaglideItemDuper.cpp
-    Source/ZeldaTotK/Programs/ZeldaTotK_ParaglideItemDuper.h
-    Source/ZeldaTotK/Programs/ZeldaTotK_SurfItemDuper.cpp
-    Source/ZeldaTotK/Programs/ZeldaTotK_SurfItemDuper.h
-    Source/ZeldaTotK/Programs/ZeldaTotK_WeaponDuper.cpp
-    Source/ZeldaTotK/Programs/ZeldaTotK_WeaponDuper.h
-)
-source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR}../../ FILES ${MAIN_SOURCES})
-add_executable(SerialPrograms WIN32 ${MAIN_SOURCES})
-set_target_properties(SerialPrograms PROPERTIES LINKER_LANGUAGE CXX)
-target_link_libraries(SerialPrograms Qt${QT_MAJOR}::Widgets Qt${QT_MAJOR}::SerialPort Qt${QT_MAJOR}::Multimedia Qt${QT_MAJOR}::MultimediaWidgets)
-target_link_libraries(SerialPrograms Threads::Threads)
+# add the list of all code file paths as ${CORE_LIBRARY_SOURCES}, ${LIBRARY_SOURCES} and ${EXECUTABLE_SOURCES}
+include(cmake/SourceFiles.cmake)
+
+# add extract_discord_sdk(), which unpacks the per-platform Discord Social SDK zips
+include(cmake/ExtractDiscordSDK.cmake)
+
+# Organize source files in IDE project view
+source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR}/../../ FILES ${CORE_LIBRARY_SOURCES})
+source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR}/../../ FILES ${LIBRARY_SOURCES})
+source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR}/../../ FILES ${EXECUTABLE_SOURCES})
+
+# Create GUI-free Controller library, CoreLib
+include(cmake/CoreLib.cmake)
+
+# see apply_common_target_properties() for target_include_directories, set_target_properties, target_compile_definitions
+
+
+
+# Create the GUI library
+add_library(SerialProgramsLib STATIC ${CORE_LIBRARY_SOURCES} ${LIBRARY_SOURCES})
 
-#add defines
-target_compile_definitions(SerialPrograms PRIVATE NOMINMAX)
 
-if (EXISTS "../../Internal/SerialPrograms/TelemetryURLs.h")
+# Create binary target
+if (APPLE)
+    set(SerialPrograms_ICON ${CMAKE_CURRENT_SOURCE_DIR}/../IconResource/icon.icns)
+    # set_source_files_properties(SerialPrograms_ICON PROPERTIES MACOSX_PACKAGE_LOCATION "Resources")
+
+    # Links on how to create a MacOS app bundle with cmake
+    # https://stackoverflow.com/questions/53560288/how-to-create-a-macos-app-bundle-with-cmake
+    # https://cmake.org/cmake/help/latest/command/add_executable.html
+    add_executable(SerialPrograms MACOSX_BUNDLE ${SerialPrograms_ICON} ${EXECUTABLE_SOURCES})
+    set_target_properties(SerialPrograms PROPERTIES
+        BUNDLE True
+        MACOSX_BUNDLE_GUI_IDENTIFIER PokemonAutomation.SerialPrograms
+        MACOSX_BUNDLE_BUNDLE_NAME SerialPrograms
+        MACOSX_BUNDLE_BUNDLE_VERSION "0.1"
+        MACOSX_BUNDLE_SHORT_VERSION_STRING "0.1"
+        MACOSX_BUNDLE_ICON_FILE "icon.icns"
+        # MacOSXBundleInfo.plist.in is modified from https://github.com/Kitware/CMake/blob/master/Modules/MacOSXBundleInfo.plist.in
+        MACOSX_BUNDLE_INFO_PLIST ${CMAKE_SOURCE_DIR}/cmake/MacOSXBundleInfo.plist.in
+        RESOURCE ${SerialPrograms_ICON}
+    )
+else()
+    add_executable(SerialPrograms WIN32 ${EXECUTABLE_SOURCES})
+    target_sources(SerialPrograms PRIVATE ../IconResource/IconResource.rc)
+endif()
+
+target_link_libraries(
+    SerialPrograms PRIVATE
+    $<LINK_LIBRARY:WHOLE_ARCHIVE,SerialProgramsLib>
+)
+
+# Add source code exclusive to the internal repo and add C++ macro of official release
+if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/../../Internal/SerialPrograms/Internal0.cpp")
+    message(STATUS "Building internal SerialPrograms")
+    target_compile_definitions(SerialProgramsLib PRIVATE PA_OFFICIAL)
     target_compile_definitions(SerialPrograms PRIVATE PA_OFFICIAL)
-    target_sources(SerialPrograms PRIVATE ../../Internal/SerialPrograms/TelemetryURLs.h)
-    target_sources(SerialPrograms PRIVATE ../../Internal/SerialPrograms/NintendoSwitch_TestPrograms.cpp)
-    target_sources(SerialPrograms PRIVATE ../../Internal/SerialPrograms/NintendoSwitch_TestPrograms.h)
+    target_sources(SerialProgramsLib PRIVATE ../../Internal/SerialPrograms/NintendoSwitch_TestPrograms.cpp)
+    target_sources(SerialProgramsLib PRIVATE ../../Internal/SerialPrograms/NintendoSwitch_TestPrograms.h)
+    target_sources(SerialProgramsLib PRIVATE ../../Internal/SerialPrograms/Internal0.cpp)
+    target_sources(SerialProgramsLib PRIVATE ../../Internal/SerialPrograms/Internal1.cpp)
 endif()
 
-#extract opencv_world460d.dll from archive on Windows Debug builds
-if (MSVC)
-    if (CMAKE_BUILD_TYPE MATCHES "Debug")
-        file(ARCHIVE_EXTRACT INPUT ../3rdPartyBinaries/opencv_world460d.zip DESTINATION ../3rdPartyBinaries/)
+if (IS_AZURE_BUILD)
+    target_compile_definitions(SerialProgramsLib PRIVATE
+        PA_VERSION_MAJOR=${VERSION_MAJOR}
+        PA_VERSION_MINOR=${VERSION_MINOR}
+        PA_VERSION_PATCH=${VERSION_PATCH}
+        PA_IS_BETA=${IS_BETA}
+    )
+
+    target_compile_definitions(SerialPrograms PRIVATE
+        PA_VERSION_MAJOR=${VERSION_MAJOR}
+        PA_VERSION_MINOR=${VERSION_MINOR}
+        PA_VERSION_PATCH=${VERSION_PATCH}
+        PA_IS_BETA=${IS_BETA}
+    )
+endif()
+
+# Function to apply common properties to both library and executable targets
+#   (pa_apply_*_target_properties() are defined in cmake/CoreLib.cmake.)
+function(apply_common_target_properties target_name)
+    if("NO_GUI" IN_LIST ARGN)
+        pa_apply_gui_free_target_properties(${target_name})
+        return()
     endif()
+
+    pa_apply_base_target_properties(${target_name})
+
+    # include Qt headers
+    target_link_libraries(${target_name} PRIVATE
+        Qt${QT_MAJOR}::Widgets
+        Qt${QT_MAJOR}::SerialPort
+        Qt${QT_MAJOR}::Multimedia
+        Qt${QT_MAJOR}::MultimediaWidgets
+        Qt${QT_MAJOR}::OpenGLWidgets
+        Qt${QT_MAJOR}::Qml
+        Qt${QT_MAJOR}::Quick
+        Qt${QT_MAJOR}::QuickWidgets
+    )    
+
+    # more include directories
+    target_include_directories(${target_name} SYSTEM PRIVATE ../3rdParty/)
+    target_link_directories(${target_name} PRIVATE ../3rdPartyBinaries/)
+
+endfunction()
+
+# Apply common properties to both targets
+apply_common_target_properties(SerialProgramsLib)
+apply_common_target_properties(SerialPrograms)
+
+if(MSVC)
+    set_source_files_properties("../3rdParty-Core/miniz-3.1.1/miniz.c" PROPERTIES COMPILE_FLAGS "/W0")
+else()
+    # For GCC/Clang
+    set_source_files_properties("../3rdParty-Core/miniz-3.1.1/miniz.c" PROPERTIES COMPILE_FLAGS "-w")
 endif()
 
-#add include directory
-target_include_directories(SerialPrograms SYSTEM PRIVATE ../3rdParty/)
-target_include_directories(SerialPrograms PRIVATE ../ ../../Internal/ Source/)
-target_link_directories(SerialPrograms PRIVATE ../3rdPartyBinaries/)
+# REPO_ROOT_DIR: the root folder of the git repository, "Arduino-Source/"
+set(PACKAGES_DIR "${REPO_ROOT_DIR}/Packages")
+set(FIRMWARE_DIR "${PACKAGES_DIR}/Firmware")
+set(SCRIPTS_DIR "${PACKAGES_DIR}/Scripts")
+set(RESOURCES_DIR "${PACKAGES_DIR}/Resources")
+
+# Clone Packages repo if not already present
+if (NOT EXISTS "${PACKAGES_DIR}")
+    message(STATUS "Cloning Packages repo at configure time...")
+    execute_process(
+        COMMAND git clone --branch master https://github.com/PokemonAutomation/Packages "${PACKAGES_DIR}"
+        WORKING_DIRECTORY "${REPO_ROOT_DIR}"
+    )
+    add_custom_target(clone_packages DEPENDS "${PACKAGES_DIR}")
+    add_dependencies(SerialPrograms clone_packages)
+else()
+    add_custom_target(clone_packages COMMENT "Packages repo already present, skipping clone.")
+endif()
 
+# Copy resources if not already present
+if(NOT EXISTS "${DEST_DIR}/Resources")
+    add_custom_command(
+        TARGET SerialPrograms POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E echo "[Deploy] Copying resources ${RESOURCES_DIR} to ${DEST_DIR}/Resources"
+        COMMAND ${CMAKE_COMMAND} -E copy_directory "${RESOURCES_DIR}" "${DEST_DIR}/Resources"
+    )
+endif()
 
+# Copy firmware if not already present
+if(NOT EXISTS "${DEST_DIR}/Firmware")
+    add_custom_command(
+        TARGET SerialPrograms POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E echo "[Deploy] Copying firmware"
+        COMMAND ${CMAKE_COMMAND} -E copy_directory "${FIRMWARE_DIR}" "${DEST_DIR}/Firmware"
+    )
+endif()
 
+# Copy scripts if not already present
+if(NOT EXISTS "${DEST_DIR}/Scripts")
+    add_custom_command(
+        TARGET SerialPrograms POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E echo "[Deploy] Copying scripts"
+        COMMAND ${CMAKE_COMMAND} -E copy_directory "${SCRIPTS_DIR}" "${DEST_DIR}/Scripts"
+    )
+endif()
 
-if (MSVC)
+if (WIN32)
     add_library(OpenCV_lib IMPORTED UNKNOWN)
+    target_include_directories(SerialProgramsLib SYSTEM PRIVATE ../3rdParty/opencv-4.12.0/)
     set_target_properties(OpenCV_lib PROPERTIES
-        IMPORTED_LOCATION_RELEASE   ../3rdPartyBinaries/opencv_world460.lib
-        IMPORTED_LOCATION_DEBUG     ../3rdPartyBinaries/opencv_world460d.lib)
-    set_target_properties(OpenCV_lib PROPERTIES
+        IMPORTED_LOCATION_RELEASE           ${CMAKE_CURRENT_SOURCE_DIR}/../3rdPartyBinaries/opencv_world4120.lib
+        IMPORTED_LOCATION_DEBUG             ${CMAKE_CURRENT_SOURCE_DIR}/../3rdPartyBinaries/opencv_world4120d.lib
         MAP_IMPORTED_CONFIG_DEBUG           DEBUG
         MAP_IMPORTED_CONFIG_RELEASE         RELEASE
         MAP_IMPORTED_CONFIG_RELWITHDEBINFO  RELEASE
         MAP_IMPORTED_CONFIG_MINSIZEREL      RELEASE
     )
 
+    add_library(ONNX_lib IMPORTED UNKNOWN)
+    target_include_directories(SerialProgramsLib SYSTEM PRIVATE ../3rdParty/ONNX/)
+    set_target_properties(ONNX_lib PROPERTIES
+        IMPORTED_LOCATION   ${CMAKE_CURRENT_SOURCE_DIR}/../3rdPartyBinaries/onnxruntime.lib
+    )
+
+    add_library(ONNX_Providers_lib IMPORTED UNKNOWN)
+    set_target_properties(ONNX_Providers_lib PROPERTIES
+        IMPORTED_LOCATION   ${CMAKE_CURRENT_SOURCE_DIR}/../3rdPartyBinaries/onnxruntime_providers_shared.lib
+    )
+
     add_library(dpp_lib IMPORTED UNKNOWN)
     set_target_properties(dpp_lib PROPERTIES
-        IMPORTED_LOCATION_RELEASE ../3rdPartyBinaries/dpp.lib
-        IMPORTED_LOCATION_DEBUG ../3rdPartyBinaries/dppd.lib)
-    set_target_properties(dpp_lib PROPERTIES
+        IMPORTED_LOCATION   ${CMAKE_CURRENT_SOURCE_DIR}/../3rdPartyBinaries/dpp.lib
+    )
+
+    add_library(discord_lib IMPORTED UNKNOWN)
+    target_include_directories(SerialProgramsLib SYSTEM PRIVATE ../3rdParty/discord_social_sdk/)
+    set_target_properties(discord_lib PROPERTIES
+        IMPORTED_LOCATION_RELEASE           ${CMAKE_CURRENT_SOURCE_DIR}/../3rdPartyBinaries/discord_social_sdk_win/lib/release/discord_partner_sdk.lib
+        IMPORTED_LOCATION_DEBUG             ${CMAKE_CURRENT_SOURCE_DIR}/../3rdPartyBinaries/discord_social_sdk_win/lib/debug/discord_partner_sdk.lib
         MAP_IMPORTED_CONFIG_DEBUG           DEBUG
         MAP_IMPORTED_CONFIG_RELEASE         RELEASE
         MAP_IMPORTED_CONFIG_RELWITHDEBINFO  RELEASE
         MAP_IMPORTED_CONFIG_MINSIZEREL      RELEASE
     )
 
-    target_link_libraries(SerialPrograms tesseractPA.lib OpenCV_lib Sleepy.lib dpp_lib)
-    target_compile_definitions(SerialPrograms PRIVATE PA_TESSERACT PA_SLEEPY PA_DPP _CRT_SECURE_NO_WARNINGS)
+    target_link_libraries(
+        SerialProgramsLib PRIVATE
+        tesseractPA.lib
+        OpenCV_lib
+        ONNX_lib
+        ONNX_Providers_lib
+        dpp_lib
+        discord_lib
+    )
+
+    target_compile_definitions(
+        SerialProgramsLib PUBLIC
+        _CRT_SECURE_NO_WARNINGS
+        _DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR
+        PA_TESSERACT
+        PA_DPP
+        PA_SOCIAL_SDK
+    )
 
-    target_compile_options(SerialPrograms PRIVATE /FAs /FaAssembly/ /MP /W4 /WX /utf-8)
-    target_compile_options(SerialPrograms PRIVATE /wd5054)  # Deprecated enum arithemtic
-    target_compile_options(SerialPrograms PRIVATE /wd4505)  # unreferenced local function has been removed
+    if(PA_ASSEMBLY_LISTINGS)
+        target_compile_options(SerialProgramsLib PRIVATE /FAs /FaAssembly/)
+    endif()
+    target_compile_options(SerialProgramsLib PRIVATE /W4 /WX /external:W0 /utf-8)
+    if(NOT CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+        # cl only: clang-cl ignores these, and /WX turns its unused-argument warning into an
+        # error. (Visual Studio's ClangCL toolset never passed them on to clang-cl.)
+        target_compile_options(SerialProgramsLib PRIVATE /MP /external:anglebrackets)
+    endif()
+    target_compile_options(SerialProgramsLib PRIVATE /wd5054)  # Deprecated enum arithemtic
+    target_compile_options(SerialProgramsLib PRIVATE /wd4505)  # unreferenced local function has been removed
 
     set(ARCH_FLAGS_09_Nehalem       /W4)    # Dummy parameter
     set(ARCH_FLAGS_13_Haswell       /arch:AVX2)
     set(ARCH_FLAGS_17_Skylake       /arch:AVX512)
     set(ARCH_FLAGS_19_IceLake       /arch:AVX512)
 
+    # clang-cl, whether from Visual Studio's ClangCL toolset (-T ClangCL) or from another
+    # generator such as Ninja, where CMAKE_GENERATOR_TOOLSET is empty.
+    if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+        target_compile_options(SerialProgramsLib PRIVATE -Wno-unused-function)
+        target_compile_options(SerialProgramsLib PRIVATE -march=nehalem)
+        set(ARCH_FLAGS_09_Nehalem       -march=nehalem)
+        set(ARCH_FLAGS_13_Haswell       -march=haswell)
+        set(ARCH_FLAGS_17_Skylake       -march=skylake-avx512)
+        set(ARCH_FLAGS_19_IceLake       -march=icelake-client)
+    endif()
+
     #   Run-time ISA dispatching
-    target_compile_definitions(SerialPrograms PRIVATE PA_AutoDispatch_x64_08_Nehalem)
-    target_compile_definitions(SerialPrograms PRIVATE PA_AutoDispatch_x64_13_Haswell)
-    target_compile_definitions(SerialPrograms PRIVATE PA_AutoDispatch_x64_17_Skylake)
-    target_compile_definitions(SerialPrograms PRIVATE PA_AutoDispatch_x64_19_IceLake)
-
-#    target_compile_options(SerialPrograms PRIVATE /arch:AVX2   /DPA_Arch_x64_AVX2)
-#    target_compile_options(SerialPrograms PRIVATE /arch:AVX512 /DPA_Arch_x64_AVX512)
-#    target_compile_options(SerialPrograms PRIVATE /arch:AVX512 /DPA_Arch_x64_AVX512GF)
-else()
-    # Find OpenCV
+    target_compile_definitions(SerialProgramsLib PRIVATE PA_AutoDispatch_x64_08_Nehalem)
+    target_compile_definitions(SerialProgramsLib PRIVATE PA_AutoDispatch_x64_13_Haswell)
+    target_compile_definitions(SerialProgramsLib PRIVATE PA_AutoDispatch_x64_17_Skylake)
+    target_compile_definitions(SerialProgramsLib PRIVATE PA_AutoDispatch_x64_19_IceLake)
+
+#    target_compile_options(SerialProgramsLib PRIVATE /arch:AVX2   /DPA_Arch_x64_AVX2)
+#    target_compile_options(SerialProgramsLib PRIVATE /arch:AVX512 /DPA_Arch_x64_AVX512)
+#    target_compile_options(SerialProgramsLib PRIVATE /arch:AVX512 /DPA_Arch_x64_AVX512GF)
+else() # macOS and Linux
+    find_package(PkgConfig REQUIRED)  # required to execute `pkg_search_module()` below
+    if (APPLE)
+        # prepare onnxruntime if needed
+        set(ONNXRUNTIME_VERSION "1.23.2")
+        set(ONNXRUNTIME_WORK_DIR "${REPO_ROOT_DIR}/3rdPartyBinaries")
+        if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm")
+            set(ONNXRUNTIME_ARCH "arm64")
+        else()
+            set(ONNXRUNTIME_ARCH "x86_64")
+        endif()
+        set(ONNXRUNTIME_LIB_DIR "${ONNXRUNTIME_WORK_DIR}/onnxruntime-osx-${ONNXRUNTIME_ARCH}-${ONNXRUNTIME_VERSION}")
+        set(ONNXRUNTIME_LIB_TAR "${ONNXRUNTIME_LIB_DIR}.tgz")
+        set(ONNXRUNTIME_DYLIB   "${ONNXRUNTIME_LIB_DIR}/lib/libonnxruntime.dylib")
+        if (NOT EXISTS "${ONNXRUNTIME_LIB_DIR}")
+            message(STATUS "ONNXRUNTIME not found, extracting from tgz...")
+            execute_process(
+                COMMAND ${CMAKE_COMMAND} -E tar xf "${ONNXRUNTIME_LIB_TAR}"
+                WORKING_DIRECTORY "${ONNXRUNTIME_WORK_DIR}"
+            )
+        endif()
+        target_include_directories(SerialProgramsLib SYSTEM PRIVATE "${ONNXRUNTIME_LIB_DIR}/include")
+        target_link_libraries(SerialProgramsLib PRIVATE "${ONNXRUNTIME_DYLIB}")
+    else() # Linux
+        # ONNX RUNTIME LINUX CONFIG
+        # NOTE: users can specify their own ONNX_ROOT_PATH (this is the base folder for ONNX) on the command line when evoking cmake.
+        # this can be done via -DONNX_ROOT_PATH=/path/to/onnx
+
+        # If the path isn't provided, it'll automatically download the 1.23.0 release to the build folder,
+        # extract it, and then link it up
+
+        # Set the ONNXRUNTIME version and arch, allows for quick updates
+        pkg_check_modules(ONNXRUNTIME QUIET libonnxruntime)
+
+        if(ONNXRUNTIME_FOUND)
+            message(STATUS "Found system installed ONNX Runtime")
+
+            message(STATUS "Found ONNX Include Dirs: ${ONNXRUNTIME_INCLUDE_DIRS}")
+            message(STATUS "Found ONNX Library: ${ONNXRUNTIME_LIBRARIES}")
+
+            target_include_directories(SerialProgramsLib PUBLIC ${ONNXRUNTIME_INCLUDE_DIRS})
+            target_link_libraries(SerialProgramsLib PUBLIC ${ONNXRUNTIME_LIBRARIES})
+
+        else() # linux, download onnxruntime
+            set(ONNXRUNTIME_VERSION "1.23.0")
+            if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^(arm|arm64|aarch64)")
+                set(ONNXRUNTIME_ARCH "aarch64")
+            else()
+                set(ONNXRUNTIME_ARCH "x64")
+            endif()
+            set(ONNXRUNTIME_DIR_NAME "onnxruntime-linux-${ONNXRUNTIME_ARCH}-${ONNXRUNTIME_VERSION}")
+            set(ONNXRUNTIME_TGZ_NAME "${ONNXRUNTIME_DIR_NAME}.tgz")
+            # build up the URL based on the version and name
+            set(ONNXRUNTIME_URL "https://github.com/microsoft/onnxruntime/releases/download/v${ONNXRUNTIME_VERSION}/${ONNXRUNTIME_TGZ_NAME}")
+
+            # Cache variable is editable by users *and* is properly stored
+            set(ONNX_ROOT_PATH "" CACHE PATH "Path to the root of a pre-installed ONNX Runtime (e.g., /path/to/onnxruntime-linux-x64-1.23.0)")
+
+            # Download the onnxruntime if it doesn't exist or if the path is bad
+            if(NOT ONNX_ROOT_PATH OR NOT EXISTS "${ONNX_ROOT_PATH}/include/onnxruntime_cxx_api.h")
+                set(EXTRACTED_ONNX_PATH "${CMAKE_BINARY_DIR}/${ONNXRUNTIME_DIR_NAME}")
+
+                if(NOT IS_DIRECTORY ${EXTRACTED_ONNX_PATH})
+                    message(STATUS "ONNX_ROOT_PATH not found. Downloading ONNX Runtime v${ONNXRUNTIME_VERSION}...")
+
+                    # logic for downloading...
+                    set(DOWNLOAD_LOCATION "${CMAKE_BINARY_DIR}/${ONNXRUNTIME_TGZ_NAME}")
+                    file(DOWNLOAD
+                        ${ONNXRUNTIME_URL}
+                        ${DOWNLOAD_LOCATION}
+                        SHOW_PROGRESS
+                        STATUS download_status
+                    )
+                    list(GET download_status 0 error_code)
+                    if(NOT error_code EQUAL 0)
+                        list(GET download_status 1 error_message)
+                        message(FATAL_ERROR "Failed to download ONNX Runtime: ${error_message}")
+                    endif()
+
+                    # logic for extracting the tarball to our working directory
+                    message(STATUS "Extracting ONNX Runtime...")
+                    execute_process(
+                        COMMAND ${CMAKE_COMMAND} -E tar xzf "${DOWNLOAD_LOCATION}"
+                        WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+                    )
+                endif()
+
+                # Update the ONNX_ROOT_PATH to point to our downloaded version, force ensures we update it
+                set(ONNX_ROOT_PATH "${EXTRACTED_ONNX_PATH}" CACHE PATH "Path to the downloaded ONNX Runtime" FORCE)
+                message(STATUS "Using downloaded ONNX Runtime at: ${ONNX_ROOT_PATH}")
+            else()
+                message(STATUS "Using user-provided ONNX Runtime at: ${ONNX_ROOT_PATH}")
+            endif()
+
+            # configure and find headers from the onnxruntime
+            find_path(ONNX_INCLUDE_DIRS
+                NAMES onnxruntime_cxx_api.h
+                HINTS "${ONNX_ROOT_PATH}/include"
+                REQUIRED
+            )
+
+            find_library(ONNX_RUNTIME_LIB
+                NAMES onnxruntime
+                HINTS "${ONNX_ROOT_PATH}/lib"
+                REQUIRED
+            )
+
+            if(ONNX_INCLUDE_DIRS AND ONNX_RUNTIME_LIB)
+                # only link if it was found, otherwise we error out
+                message(STATUS "Found ONNX Include Dirs: ${ONNX_INCLUDE_DIRS}")
+                message(STATUS "Found ONNX Library: ${ONNX_RUNTIME_LIB}")
+                target_include_directories(SerialProgramsLib PUBLIC "${ONNX_INCLUDE_DIRS}")
+                target_link_libraries(SerialProgramsLib PUBLIC "${ONNX_RUNTIME_LIB}")
+            else()
+                message(FATAL_ERROR "Could not find ONNX Runtime headers or library.")
+            endif()
+        endif () # end searching or downloading onnx runtime
+
+        # Systemd DBus Library
+	# Used for different programs on the same computer to communicate with each other.
+        # The bundled archive is prebuilt native object code, so it must be picked per-arch
+        # (a single .a cannot serve both x86_64 and aarch64 Linux).
+        if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^(arm|arm64|aarch64)")
+            set(SDBUS_CPP_LIB "${REPO_ROOT_DIR}/3rdParty/sdbus-cpp/lib/libsdbus-c++-aarch64.a")
+        else()
+            set(SDBUS_CPP_LIB "${REPO_ROOT_DIR}/3rdParty/sdbus-cpp/lib/libsdbus-c++-x86_64.a")
+        endif()
+        message(STATUS "Using bundled sdbus-c++ library: ${SDBUS_CPP_LIB}")
+
+        target_include_directories(SerialProgramsLib PRIVATE
+            ${REPO_ROOT_DIR}/3rdParty/sdbus-cpp/include
+        )
+        target_link_libraries(SerialProgramsLib PRIVATE
+            ${SDBUS_CPP_LIB}
+            systemd #sdbus-c++ relies on libsystemd, almost all distros should have this
+        )
+
+        target_include_directories(CoreLib PRIVATE
+            ${REPO_ROOT_DIR}/3rdParty/sdbus-cpp/include
+        )
+        target_link_libraries(CoreLib PRIVATE
+            ${SDBUS_CPP_LIB}
+            systemd #sdbus-c++ relies on libsystemd, almost all distros should have this
+        )
+    endif() # end Linux
 
-    # set(OPENCV_DIR, "/usr/local/opt/opencv/lib/cmake/opencv4")
-    find_package(OpenCV REQUIRED HINTS "/usr/local/opt/opencv/lib/cmake/opencv4/")
-    # set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:/usr/local/opt/opencv/lib/pkgconfig")
-    # pkg_search_module(OPENCV REQUIRED opencv)
-    include_directories(${OpenCV_INCLUDE_DIRS})
-    link_directories(${OpenCV_LIBRARY_DIRS})
-    target_link_libraries(SerialPrograms ${OpenCV_LIBS})
+    # Find OpenCV
+    pkg_search_module(OpenCV REQUIRED opencv4 opencv)
+    target_include_directories(SerialProgramsLib SYSTEM PRIVATE ${OpenCV_INCLUDE_DIRS}) # "SYSTEM" to suppress warnings
+    target_link_directories(SerialProgramsLib PUBLIC ${OpenCV_LIBRARY_DIRS})
+    target_link_libraries(SerialProgramsLib PUBLIC ${OpenCV_LINK_LIBRARIES})
 
     #we hope to use our own Tesseract build in future so we can rid that dependency
     #but right now to run on Linux and Mac we need to use external Tesseract library
-    if (UNIX_LINK_TESSERACT)
-        find_package(PkgConfig REQUIRED)
-        target_compile_definitions(SerialPrograms PRIVATE PA_TESSERACT UNIX_LINK_TESSERACT)
-        pkg_search_module(TESSERACT REQUIRED tesseract)
-        pkg_search_module(LEPTONICA REQUIRED lept)
-        include_directories(${TESSERACT_INCLUDE_DIRS})
-        include_directories(${LEPTONICA_INCLUDE_DIRS})
-        link_directories(${TESSERACT_LIBRARY_DIRS})
-        link_directories(${LEPTONICA_LIBRARY_DIRS})
-        target_link_libraries(SerialPrograms ${TESSERACT_LINK_LIBRARIES})
-        target_link_libraries(SerialPrograms ${LEPTONICA_LINK_LIBRARIES})
+    pkg_search_module(TESSERACT tesseract)
+    pkg_search_module(LEPTONICA lept)
+    if (TESSERACT_FOUND AND LEPTONICA_FOUND)
+        target_compile_definitions(SerialProgramsLib PRIVATE PA_TESSERACT UNIX_LINK_TESSERACT)
+        target_include_directories(SerialProgramsLib SYSTEM PRIVATE ${TESSERACT_INCLUDE_DIRS})
+        target_include_directories(SerialProgramsLib SYSTEM PRIVATE ${LEPTONICA_INCLUDE_DIRS})
+        target_link_directories(SerialProgramsLib PUBLIC ${TESSERACT_LIBRARY_DIRS})
+        target_link_directories(SerialProgramsLib PUBLIC ${LEPTONICA_LIBRARY_DIRS})
+        target_link_libraries(SerialProgramsLib PUBLIC ${TESSERACT_LINK_LIBRARIES})
+        target_link_libraries(SerialProgramsLib PUBLIC ${LEPTONICA_LINK_LIBRARIES})
     endif()
 
-    # Add -Wno-c11-extensions to avoid clang gives
-    # /usr/local/Cellar/opencv/4.5.5_3/include/opencv4/opencv2/core/mat.inl.hpp:2116:9: error: '_Atomic' is a C11 extension
-    # when compiling OpenCV
-    target_compile_options(SerialPrograms PRIVATE -Wall -Wextra -Wpedantic -Werror -Wno-c11-extensions)
-
-    IF(${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm")
-    # Arm CPU
-
-    #   Run-time ISA dispatching
-    target_compile_definitions(SerialPrograms PRIVATE PA_AutoDispatch_arm64_20_M1)
+    pkg_search_module(DPP dpp=10.1.6)
+    if (DPP_FOUND) # enable dpp integration
+        message(STATUS "Compiling with DPP integration enabled")
+        target_compile_definitions(SerialProgramsLib PUBLIC PA_DPP)
+        ## to build against headers within this repo and properly set flags ##
+        ## don't enable the following line ##
+        # target_include_directories(SerialProgramsLib PRIVATE ${DPP_INCLUDE_DIRS})
+        target_link_directories(SerialProgramsLib PUBLIC ${DPP_LIBRARY_DIRS})
+        target_link_libraries(SerialProgramsLib PUBLIC ${DPP_LIBRARIES})
+    else()
+        message(NOTICE "Compiling with DPP integration disabled")
+    endif()
 
+    # Discord's Social SDK does not offer a Linux ARM64 build as of 2026 Sep 5, so we set
+    # CMake option PA_SOCIAL_SDK_DEFAULT to off on ARM64 Linux and on for all other platforms.
+    # For future development, you can still force on/off explicitly on any platform via
+    # -DPA_SOCIAL_SDK=ON/OFF.
+    if (NOT APPLE AND CMAKE_SYSTEM_PROCESSOR MATCHES "^(arm|arm64|aarch64)")
+        set(PA_SOCIAL_SDK_DEFAULT OFF)
     else()
-    # Intel CPU
+        set(PA_SOCIAL_SDK_DEFAULT ON)
+    endif()
+    option(PA_SOCIAL_SDK "Enable Discord social SDK integration" ${PA_SOCIAL_SDK_DEFAULT})
+    if (PA_SOCIAL_SDK)
+        if (APPLE)
+            set(DISCORD_ZIP "${REPO_ROOT_DIR}/3rdPartyBinaries/discord_social_sdk_mac.zip")
+            set(DISCORD_DIR "${REPO_ROOT_DIR}/3rdPartyBinaries/discord_social_sdk_mac")
+            set(DISCORD_LIB_RELEASE "${REPO_ROOT_DIR}/3rdPartyBinaries/discord_social_sdk_mac/lib/release/libdiscord_partner_sdk.dylib")
+        else()
+            set(DISCORD_ZIP "${REPO_ROOT_DIR}/3rdPartyBinaries/discord_social_sdk_linux.zip")
+            set(DISCORD_DIR "${REPO_ROOT_DIR}/3rdPartyBinaries/discord_social_sdk_linux")
+            set(DISCORD_LIB_RELEASE "${REPO_ROOT_DIR}/3rdPartyBinaries/discord_social_sdk_linux/lib/release/libdiscord_partner_sdk.so")
+        endif()
+
+        extract_discord_sdk("${DISCORD_ZIP}" "${DISCORD_DIR}")
+
+        target_compile_definitions(SerialProgramsLib PUBLIC PA_SOCIAL_SDK)
+        target_include_directories(SerialProgramsLib SYSTEM PRIVATE ../3rdParty/discord_social_sdk/)
+        target_link_libraries(SerialProgramsLib PRIVATE ${DISCORD_LIB_RELEASE})
+    else()
+        message(NOTICE "Compiling with Discord social SDK integration disabled")
+    endif()
 
-    target_compile_options(SerialPrograms PRIVATE -msse4.2)
-    set(ARCH_FLAGS_09_Nehalem       -march=nehalem)
-    set(ARCH_FLAGS_13_Haswell       -march=haswell)
-    set(ARCH_FLAGS_17_Skylake       -march=skylake-avx512)
-    set(ARCH_FLAGS_19_IceLake       -march=icelake-client)
+    if(APPLE)
+        target_compile_options(SerialProgramsLib PRIVATE -Wall -Wextra -Wpedantic -Werror -Wshorten-64-to-32)
+        # on macOS, need these frameworks to query OS APIs: IOKit to control display sleep and system
+        # sleep behavior, CoreAudio to read the formats audio devices natively run in
+        target_link_libraries(SerialProgramsLib PRIVATE "-framework IOKit -framework CoreFoundation -framework CoreAudio")
+    else() # Linux
+        # Assume GCC
+        target_compile_options(SerialProgramsLib PRIVATE -Wall -Wextra -Wpedantic -Werror -fno-strict-aliasing)
+    endif()
 
-    #   Run-time ISA dispatching
-    target_compile_definitions(SerialPrograms PRIVATE PA_AutoDispatch_x64_08_Nehalem)
-    target_compile_definitions(SerialPrograms PRIVATE PA_AutoDispatch_x64_13_Haswell)
-    target_compile_definitions(SerialPrograms PRIVATE PA_AutoDispatch_x64_17_Skylake)
-    target_compile_definitions(SerialPrograms PRIVATE PA_AutoDispatch_x64_19_IceLake)
+    if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^(arm|arm64|aarch64)")
+        # Arm CPU (arm64 on macOS, aarch64 on Linux)
+        #   Run-time ISA dispatching
+        target_compile_definitions(SerialProgramsLib PRIVATE PA_AutoDispatch_arm64_20_M1)
+    else()
+        # Intel CPU
+        target_compile_options(SerialProgramsLib PRIVATE -march=nehalem)
+        set(ARCH_FLAGS_09_Nehalem       -march=nehalem)
+        set(ARCH_FLAGS_13_Haswell       -march=haswell)
+        set(ARCH_FLAGS_17_Skylake       -march=skylake-avx512)
+        set(ARCH_FLAGS_19_IceLake       -march=icelake-client)
+
+        #   Run-time ISA dispatching
+        target_compile_definitions(SerialProgramsLib PRIVATE PA_AutoDispatch_x64_08_Nehalem)
+        target_compile_definitions(SerialProgramsLib PRIVATE PA_AutoDispatch_x64_13_Haswell)
+        target_compile_definitions(SerialProgramsLib PRIVATE PA_AutoDispatch_x64_17_Skylake)
+        target_compile_definitions(SerialProgramsLib PRIVATE PA_AutoDispatch_x64_19_IceLake)
 
     endif()
 endif()
@@ -2009,9 +677,15 @@ endif()
 
 if (ARCH_FLAGS_09_Nehalem)
 SET_SOURCE_FILES_PROPERTIES(
+    Source/Kernels/AudioChannelInterleave/Kernels_AudioChannelInterleave_x64_SSE.cpp
+    Source/Kernels/AudioChannelMixer/Kernels_AudioChannelMixer_x64_SSE.cpp
+    Source/Kernels/AudioResampler/Kernels_AudioResampler_BlockKernel_x64_SSE2.cpp
     Source/Kernels/AudioStreamConversion/AudioStreamConversion_Core_x86_SSE41.cpp
+    Source/Kernels/AudioStreamConverter/Kernels_AudioStreamConverter_Kernels_x64_SSE41.cpp
     Source/Kernels/AbsFFT/Kernels_AbsFFT_Core_x86_SSE41.cpp
-    Source/Kernels/ImageFilters/Kernels_ImageFilter_Basic_x64_SSE42.cpp
+    Source/Kernels/ImageFilters/RGB32_Brightness/Kernels_ImageFilter_RGB32_Brightness_x64_SSE42.cpp
+    Source/Kernels/ImageFilters/RGB32_Range/Kernels_ImageFilter_RGB32_Range_x64_SSE42.cpp
+    Source/Kernels/ImageFilters/RGB32_EuclideanDistance/Kernels_ImageFilter_RGB32_Euclidean_x64_SSE42.cpp
     Source/Kernels/ImageScaleBrightness/Kernels_ImageScaleBrightness_x64_SSE41.cpp
     Source/Kernels/ImageStats/Kernels_ImagePixelSumSqr_x64_SSE41.cpp
     Source/Kernels/ImageStats/Kernels_ImagePixelSumSqrDev_x64_SSE41.cpp
@@ -2026,7 +700,13 @@ endif()
 if (ARCH_FLAGS_13_Haswell)
 SET_SOURCE_FILES_PROPERTIES(
     Source/Kernels/AbsFFT/Kernels_AbsFFT_Core_x86_AVX2.cpp
-    Source/Kernels/ImageFilters/Kernels_ImageFilter_Basic_x64_AVX2.cpp
+    Source/Kernels/AudioChannelInterleave/Kernels_AudioChannelInterleave_x64_AVX2.cpp
+    Source/Kernels/AudioChannelMixer/Kernels_AudioChannelMixer_x64_FMA3.cpp
+    Source/Kernels/AudioResampler/Kernels_AudioResampler_BlockKernel_x64_FMA3.cpp
+    Source/Kernels/AudioStreamConverter/Kernels_AudioStreamConverter_Kernels_x64_AVX2.cpp
+    Source/Kernels/ImageFilters/RGB32_Brightness/Kernels_ImageFilter_RGB32_Brightness_x64_AVX2.cpp
+    Source/Kernels/ImageFilters/RGB32_Range/Kernels_ImageFilter_RGB32_Range_x64_AVX2.cpp
+    Source/Kernels/ImageFilters/RGB32_EuclideanDistance/Kernels_ImageFilter_RGB32_Euclidean_x64_AVX2.cpp
     Source/Kernels/ImageScaleBrightness/Kernels_ImageScaleBrightness_x64_AVX2.cpp
     Source/Kernels/ImageStats/Kernels_ImagePixelSumSqr_x64_AVX2.cpp
     Source/Kernels/ImageStats/Kernels_ImagePixelSumSqrDev_x64_AVX2.cpp
@@ -2040,7 +720,13 @@ SET_SOURCE_FILES_PROPERTIES(
 endif()
 if (ARCH_FLAGS_17_Skylake)
 SET_SOURCE_FILES_PROPERTIES(
-    Source/Kernels/ImageFilters/Kernels_ImageFilter_Basic_x64_AVX512.cpp
+    Source/Kernels/AbsFFT/Kernels_AbsFFT_Core_x86_AVX512.cpp
+    Source/Kernels/AudioChannelInterleave/Kernels_AudioChannelInterleave_x64_AVX512.cpp
+    Source/Kernels/AudioChannelMixer/Kernels_AudioChannelMixer_x64_AVX512.cpp
+    Source/Kernels/AudioResampler/Kernels_AudioResampler_BlockKernel_x64_AVX512.cpp
+    Source/Kernels/AudioStreamConverter/Kernels_AudioStreamConverter_Kernels_x64_AVX512.cpp
+    Source/Kernels/ImageFilters/RGB32_Range/Kernels_ImageFilter_RGB32_Range_x64_AVX512.cpp
+    Source/Kernels/ImageFilters/RGB32_EuclideanDistance/Kernels_ImageFilter_RGB32_Euclidean_x64_AVX512.cpp
     Source/Kernels/ImageScaleBrightness/Kernels_ImageScaleBrightness_x64_AVX512.cpp
     Source/Kernels/ImageStats/Kernels_ImagePixelSumSqr_x64_AVX512.cpp
     Source/Kernels/ImageStats/Kernels_ImagePixelSumSqrDev_x64_AVX512.cpp
@@ -2057,20 +743,148 @@ SET_SOURCE_FILES_PROPERTIES(
 endif()
 if (ARCH_FLAGS_19_IceLake)
 SET_SOURCE_FILES_PROPERTIES(
+    Source/Kernels/ImageFilters/RGB32_Brightness/Kernels_ImageFilter_RGB32_Brightness_x64_AVX512-VNNI.cpp
     Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x32_x64_AVX512-GF.cpp
     Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x64_x64_AVX512-GF.cpp
     PROPERTIES COMPILE_FLAGS ${ARCH_FLAGS_19_IceLake}
 )
 endif()
 
+if (WIN32)
+    set(OPENCV_DEBUG_ZIP "${REPO_ROOT_DIR}/3rdPartyBinaries/opencv_world4120d.zip")
+    set(OPENCV_DEBUG_DLL "${REPO_ROOT_DIR}/3rdPartyBinaries/opencv_world4120d.dll")
+    set(OPENCV_RELEASE_ZIP "${REPO_ROOT_DIR}/3rdPartyBinaries/opencv_world4120.zip")
+    set(OPENCV_RELEASE_DLL "${REPO_ROOT_DIR}/3rdPartyBinaries/opencv_world4120.dll")
+
+    set(DISCORD_ZIP "${REPO_ROOT_DIR}/3rdPartyBinaries/discord_social_sdk_win.zip")
+    set(DISCORD_DIR "${REPO_ROOT_DIR}/3rdPartyBinaries/discord_social_sdk_win")
+    set(DISCORD_DLL_DEBUG "${REPO_ROOT_DIR}/3rdPartyBinaries/discord_social_sdk_win/bin/debug/discord_partner_sdk.dll")
+    set(DISCORD_DLL_RELEASE "${REPO_ROOT_DIR}/3rdPartyBinaries/discord_social_sdk_win/bin/release/discord_partner_sdk.dll")
+
+    set(DPP_DEBUG_DLL "${REPO_ROOT_DIR}/3rdPartyBinaries/dpp_debug/dpp.dll")
+    set(DPP_RELEASE_DLL "${REPO_ROOT_DIR}/3rdPartyBinaries/dpp_release/dpp.dll")
+
+    # Copy QML library dependencies.
+    get_target_property(_qt_widgets_location Qt6::Widgets LOCATION)
+    get_filename_component(_qt_bin_dir "${_qt_widgets_location}" DIRECTORY)
+    set(_qt_qml_source_dir "${_qt_bin_dir}/../qml/QtMultimedia")
+    set(_local_qml_dest_dir "${WIN_DEPLOY_DIR}/qml/QtMultimedia")
+    add_custom_command(
+        TARGET SerialPrograms POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E echo "[Deploy-Local] Auto-copying QML Multimedia modules from ${_qt_qml_source_dir}"
+        COMMAND ${CMAKE_COMMAND} -E make_directory "${_local_qml_dest_dir}"
+        COMMAND ${CMAKE_COMMAND} -E copy_directory "${_qt_qml_source_dir}" "${_local_qml_dest_dir}"
+        COMMENT "Syncing local dev environment QML bindings..."
+    )
 
+    if(QT_DEPLOY_FILES)
+        # Run windeployqt if Qt DLLs are missing
+        if(WINDEPLOYQT_EXECUTABLE AND NOT EXISTS "${WIN_DEPLOY_DIR}/Qt6Core.dll")
+            add_custom_command(
+                TARGET SerialPrograms POST_BUILD
+                COMMAND ${CMAKE_COMMAND} -E echo "[Deploy] Running windeployqt"
+                COMMAND "${WINDEPLOYQT_EXECUTABLE}"
+                    --dir "${WIN_DEPLOY_DIR}"
+                    $<IF:$<CONFIG:Debug>,--debug,--release>
+                    $<TARGET_FILE:SerialPrograms>
+            )
+            add_custom_target(run_windeployqt DEPENDS $<TARGET_FILE:SerialPrograms> COMMENT "Running windeployqt")
+        else()
+            add_custom_target(run_windeployqt COMMENT "Skipping windeployqt (not found)")
+        endif()
+    else()
+        add_custom_target(run_windeployqt COMMENT "Skipping windeployqt (CI environment)")
 
+    endif()
 
+    # Copy Discord SDK DLL
+    add_custom_command(
+        TARGET SerialPrograms POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E echo "[Deploy] Copying Discord SDK DLL"
+        COMMAND ${CMAKE_COMMAND} -E copy_if_different
+            "$<IF:$<CONFIG:Debug>,${DISCORD_DLL_DEBUG},${DISCORD_DLL_RELEASE}>"
+            "${WIN_DEPLOY_DIR}/discord_partner_sdk.dll"
+    )
+
+    # Move built .exe and .pdb to deploy folder, print if pdb is missing
+    add_custom_command(
+        TARGET SerialPrograms POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E echo "[Deploy] Moving built exe and pdb"
+        COMMAND ${CMAKE_COMMAND} -E rename $<TARGET_FILE:SerialPrograms> "${WIN_DEPLOY_DIR}/$<TARGET_FILE_NAME:SerialPrograms>"
+        COMMAND cmd /c "if exist \"$<TARGET_PDB_FILE:SerialPrograms>\" ( \"${CMAKE_COMMAND}\" -E rename \"$<TARGET_PDB_FILE:SerialPrograms>\" \"${WIN_DEPLOY_DIR}/$<TARGET_PDB_FILE_NAME:SerialPrograms>\" ) else ( echo [Deploy] PDB file missing: $<TARGET_PDB_FILE:SerialPrograms> )"
+    )
 
+    extract_discord_sdk("${DISCORD_ZIP}" "${DISCORD_DIR}")
 
-#copy needed dlls
-#file(COPY *.dll DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
-file(GLOB MY_DLLS
-  "../3rdPartyBinaries/*.dll"
-)
-file(COPY ${MY_DLLS} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+    # Copy dpp dll
+    add_custom_command(
+        TARGET SerialPrograms POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E echo "[Deploy] Copying dpp DLL"
+        COMMAND ${CMAKE_COMMAND} -E copy_if_different
+            "$<IF:$<CONFIG:Debug>,${DPP_DEBUG_DLL},${DPP_RELEASE_DLL}>"
+            "${WIN_DEPLOY_DIR}/dpp.dll"
+    )
+
+    # Extract OpenCV debug DLL if missing
+    if (NOT EXISTS "${OPENCV_DEBUG_DLL}")
+        message(STATUS "OpenCV debug DLL not found, extracting from zip...")
+        execute_process(
+            COMMAND ${CMAKE_COMMAND} -E tar xf "${OPENCV_DEBUG_ZIP}"
+            WORKING_DIRECTORY "${REPO_ROOT_DIR}/3rdPartyBinaries"
+        )
+    endif()
+
+    # Extract OpenCV release DLL if missing
+    if (NOT EXISTS "${OPENCV_RELEASE_DLL}")
+        message(STATUS "OpenCV release DLL not found, extracting from zip...")
+        execute_process(
+            COMMAND ${CMAKE_COMMAND} -E tar xf "${OPENCV_RELEASE_ZIP}"
+            WORKING_DIRECTORY "${REPO_ROOT_DIR}/3rdPartyBinaries"
+        )
+    endif()
+
+    # Copy 3rd party DLLs if missing/different
+    file(GLOB THIRD_PARTY_DLLS "${REPO_ROOT_DIR}/3rdPartyBinaries/*.dll")
+    foreach(DLL IN LISTS THIRD_PARTY_DLLS)
+        get_filename_component(DLL_NAME "${DLL}" NAME)
+        add_custom_command(
+            TARGET SerialPrograms POST_BUILD
+            COMMAND ${CMAKE_COMMAND} -E copy_if_different "${DLL}" "${WIN_DEPLOY_DIR}/${DLL_NAME}"
+        )
+    endforeach()
+
+    # Final target that depends on all deployment steps
+    add_custom_target(DeployRuntime ALL
+        DEPENDS SerialPrograms clone_packages run_windeployqt
+        COMMENT "Deploying runtime (Qt, packages, DLLs) to ${WIN_DEPLOY_DIR}"
+        VERBATIM
+    )
+endif() # end WIN32
+
+if (WIN32 OR DPP_FOUND)
+    # Deploy the CA bundle beside the executable for DPP certificate verification.
+    if (WIN32)
+        set(DPP_CERT_DIR "${WIN_DEPLOY_DIR}")
+    else()
+        set(DPP_CERT_DIR "$<TARGET_FILE_DIR:SerialPrograms>")
+    endif()
+    add_custom_command(
+        TARGET SerialPrograms POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E copy_if_different
+            "${REPO_ROOT_DIR}/3rdPartyBinaries/dpp-cacert.pem"
+            "${DPP_CERT_DIR}/dpp-cacert.pem"
+        VERBATIM
+    )
+endif()
+
+set_target_properties(SerialPrograms PROPERTIES QT_QML_IMPORT_DEPENDENCIES "QtMultimedia")
+
+if (QT_MAJOR GREATER_EQUAL 6)
+    qt_finalize_target(SerialPrograms)
+endif()
+
+
+if(COMMAND_LINE_EXE)
+    # Add command-line executable (GUI-free) from subdirectory
+    include(Source/CommandLine/CommandLineExecutable.cmake)
+endif()
diff --git a/SerialPrograms/CMakePresets.json b/SerialPrograms/CMakePresets.json
new file mode 100644
index 0000000000..1660f3f00b
--- /dev/null
+++ b/SerialPrograms/CMakePresets.json
@@ -0,0 +1,104 @@
+{
+  "version": 3,
+  "cmakeMinimumRequired": {
+    "major": 3,
+    "minor": 18,
+    "patch": 0
+  },
+  "configurePresets": [
+    {
+      "name": "default",
+      "hidden": true,
+      "generator": "Ninja",
+      "binaryDir": "${sourceParentDir}/build",
+      "cacheVariables": {
+        "CMAKE_CXX_STANDARD": "23",
+        "CMAKE_CXX_STANDARD_REQUIRED": "ON",
+        "CMAKE_EXPORT_COMPILE_COMMANDS": "ON",
+        "CMAKE_AUTOMOC": "ON",
+        "CMAKE_AUTORCC": "ON",
+        "CMAKE_AUTOUIC": "ON",
+        "PACKAGE_BUILD": "OFF",
+        "PREFERRED_QT_DIR": "C:/Qt",
+        "PREFERRED_QT_VER": "6.8.3"
+      }
+    },
+    {
+      "name": "Debug",
+      "inherits": "default",
+      "description": "Build with debug information",
+      "binaryDir": "${sourceParentDir}/build/${presetName}",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Debug",
+        "PACKAGE_BUILD": "OFF"
+      }
+    },
+    {
+      "name": "Release",
+      "inherits": "default",
+      "description": "Build for release",
+      "binaryDir": "${sourceParentDir}/build/${presetName}",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Release",
+        "PACKAGE_BUILD": "OFF"
+      }
+    },
+    {
+      "name": "RelWithDebInfo",
+      "inherits": "default",
+      "description": "Build for release with debug information",
+      "binaryDir": "${sourceParentDir}/build/${presetName}",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "RelWithDebInfo",
+        "PACKAGE_BUILD": "OFF"
+      }
+    },
+    {
+      "name": "MinSizeRel",
+      "inherits": "default",
+      "description": "Build for minimum size release",
+      "binaryDir": "${sourceParentDir}/build/${presetName}",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "MinSizeRel",
+        "PACKAGE_BUILD": "OFF"
+      }
+    },
+    {
+      "name": "Publish",
+      "inherits": "default",
+      "description": "Build for publishing with debug information and packaging enabled",
+      "binaryDir": "${sourceParentDir}/build/${presetName}",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "RelWithDebInfo",
+        "PACKAGE_BUILD": "ON"
+      }
+    }
+  ],
+  "buildPresets": [
+    {
+      "name": "default",
+      "hidden": true,
+      "configurePreset": "default"
+    },
+    {
+      "name": "Debug",
+      "configurePreset": "Debug"
+    },
+    {
+      "name": "Release",
+      "configurePreset": "Release"
+    },
+    {
+      "name": "RelWithDebInfo",
+      "configurePreset": "RelWithDebInfo"
+    },
+    {
+      "name": "MinSizeRel",
+      "configurePreset": "MinSizeRel"
+    },
+    {
+      "name": "Publish",
+      "configurePreset": "Publish"
+    }
+  ]
+}
diff --git a/SerialPrograms/Cleanup.cmd b/SerialPrograms/Cleanup.cmd
index 8f284f0a5f..17008ad81d 100644
--- a/SerialPrograms/Cleanup.cmd
+++ b/SerialPrograms/Cleanup.cmd
@@ -21,3 +21,4 @@ rd /s /q "ErrorDumps\"
 rd /s /q "UserSettings\"
 
 ::rd /s /q "..\build-SerialPrograms*"
+rd /s /q "build\"
diff --git a/SerialPrograms/README.md b/SerialPrograms/README.md
index b57dfae179..31a0d24004 100644
--- a/SerialPrograms/README.md
+++ b/SerialPrograms/README.md
@@ -6,9 +6,26 @@ Source code for the "Computer Control" programs.
 
 ## How to Build
 
-Currently, we build with Qt 6.3. But we still retain compatibility with Qt 5.12.
+Currently, we build with Qt 6.8.3.
 
-- [How to Build (Qt 6.3) - Windows](Build-Qt6.3.md)
-- [How to Build (Qt 5.12) - Windows](Build-Qt5.12.md)
+***We cannot use Qt 6.9 and later due to: https://github.com/PokemonAutomation/Arduino-Source/issues/570***
 
+### Windows:
+
+- [How to Build (Qt 6.8.3) - Windows](BuildInstructions/Build-Windows-Qt6.8.3.md)
+
+
+### Ubuntu Linux:
+
+This doesn't actually work. (flickering video display) But here are the instructions for setting it up anyway.
+
+- [How to Build (Qt 6.8.2) - Ubuntu](BuildInstructions/Build-Ubuntu-Qt6.8.2.md)
+
+### Mac:
+
+- [Compilling for Mac](BuildInstructions/CompilingForMac.md)
+
+## Developer guide
+
+https://github.com/PokemonAutomation/ComputerControl/blob/master/Wiki/Developer/README.md
 
diff --git a/SerialPrograms/Scripts/CodeTemplates/Program/GameName_ProgramName.cpp b/SerialPrograms/Scripts/CodeTemplates/Program/GameName_ProgramName.cpp
new file mode 100644
index 0000000000..4196837e0a
--- /dev/null
+++ b/SerialPrograms/Scripts/CodeTemplates/Program/GameName_ProgramName.cpp
@@ -0,0 +1,91 @@
+/*  Program Name
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Exceptions/OperationFailedException.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonTools/StartupChecks/VideoResolutionCheck.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "GameName_ProgramName.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace GameName{
+
+
+ProgramName_Descriptor::ProgramName_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "GameName:ProgramName",
+        "Game Name", "Program Name",
+        "Programs/GameName/ProgramName.html",
+        "<Description of this program>.",
+        PanelQualityStanding::UNCATEGORIZED,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+struct ProgramName_Descriptor::Stats : public StatsTracker{
+    Stats()
+        : m_attempts(m_stats["Attempts"])
+        , m_errors(m_stats["Errors"])
+    {
+        m_display_order.emplace_back("Attempts");
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+    }
+    std::atomic<uint64_t>& m_attempts;
+    std::atomic<uint64_t>& m_errors;
+};
+std::unique_ptr<StatsTracker> ProgramName_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+
+
+ProgramName::ProgramName()
+    : GO_HOME_WHEN_DONE(false)
+    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_STATUS_UPDATE,
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_RECOVERABLE,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+{
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+
+void ProgramName::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    assert_16_9_720p_min(env.logger(), env.console);
+
+    ProgramName_Descriptor::Stats& stats = env.current_stats<ProgramName_Descriptor::Stats>();
+
+    //  Connect the controller.
+    pbf_press_button(context, BUTTON_L, 10, 100);
+
+    try{
+        
+    } catch(OperationFailedException&){
+        stats.m_errors++;
+        env.update_stats();
+        throw;
+    }
+
+    env.update_stats();
+    GO_HOME_WHEN_DONE.run_end_of_program(context);
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+}
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Scripts/CodeTemplates/Program/GameName_ProgramName.h b/SerialPrograms/Scripts/CodeTemplates/Program/GameName_ProgramName.h
new file mode 100644
index 0000000000..c3fadc92de
--- /dev/null
+++ b/SerialPrograms/Scripts/CodeTemplates/Program/GameName_ProgramName.h
@@ -0,0 +1,51 @@
+/*  Program Name
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_GameName_ProgramName_H
+#define PokemonAutomation_GameName_ProgramName_H
+
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace GameName{
+
+
+class ProgramName_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    ProgramName_Descriptor();
+
+    struct Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+
+
+class ProgramName : public SingleSwitchProgramInstance{
+public:
+    ProgramName();
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    
+private:
+
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
+
+
+    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Scripts/CodeTemplates/VisualDetector/GameName_ObjectNameDetector.cpp b/SerialPrograms/Scripts/CodeTemplates/VisualDetector/GameName_ObjectNameDetector.cpp
new file mode 100644
index 0000000000..66c4864054
--- /dev/null
+++ b/SerialPrograms/Scripts/CodeTemplates/VisualDetector/GameName_ObjectNameDetector.cpp
@@ -0,0 +1,123 @@
+/*  Object Name Detector
+ *
+ *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *
+ */
+
+#include "Common/Cpp/Containers/FixedLimitVector.tpp"
+#include "Kernels/Waterfill/Kernels_Waterfill_Types.h"
+#include "CommonFramework/ImageMatch/WaterfillTemplateMatcher.h"
+#include "CommonFramework/ImageTools/WaterfillUtilities.h"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "GameName_ObjectNameDetector.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace GameName{
+
+
+class ObjectNameMatcher : public ImageMatch::WaterfillTemplateMatcher{
+public:
+    ObjectNameMatcher() : WaterfillTemplateMatcher(
+        "GameName/ObjectName-Template.png", Color(100,100,100), Color(255, 255, 255), 50
+    ) {
+        m_aspect_ratio_lower = 0.9;
+        m_aspect_ratio_upper = 1.1;
+        m_area_ratio_lower = 0.9;
+        m_area_ratio_upper = 1.1;
+    }
+
+    static const ImageMatch::WaterfillTemplateMatcher& instance() {
+        static ObjectNameMatcher matcher;
+        return matcher;
+    }
+};
+
+
+ObjectNameDetector::~ObjectNameDetector() = default;
+
+ObjectNameDetector::ObjectNameDetector(Color color, const ImageFloatBox& box)
+    : m_color(color)
+    , m_box(box)
+{}
+
+void ObjectNameDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_box);
+}
+
+bool ObjectNameDetector::detect(const ImageViewRGB32& screen) const{
+    std::vector<ImageFloatBox> hits = detect_all(screen);
+    return !hits.empty();
+}
+
+std::vector<ImageFloatBox> ObjectNameDetector::detect_all(const ImageViewRGB32& screen) const{
+    const std::vector<std::pair<uint32_t, uint32_t>> filters = {
+        {combine_rgb(150, 150, 150), combine_rgb(255, 255, 255)}
+    };
+
+    const double min_object_size = 5000.0;
+    const double rmsd_threshold = 60.0;
+
+    const double screen_rel_size = (screen.height() / 1080.0);
+    const size_t min_size = size_t(screen_rel_size * screen_rel_size * min_object_size);
+
+    std::vector<ImageFloatBox> found_locations;
+
+    ImagePixelBox pixel_search_area = floatbox_to_pixelbox(screen.width(), screen.height(), m_box);    
+    match_template_by_waterfill(
+        extract_box_reference(screen, m_box), 
+        ObjectNameMatcher::instance(),
+        filters,
+        {min_size, SIZE_MAX},
+        rmsd_threshold,
+        [&](Kernels::Waterfill::WaterfillObject& object) -> bool {
+            ImagePixelBox found_box(
+                object.min_x + pixel_search_area.min_x, object.min_y + pixel_search_area.min_y,
+                object.max_x + pixel_search_area.min_x, object.max_y + pixel_search_area.min_y);
+            found_locations.emplace_back(pixelbox_to_floatbox(screen.width(), screen.height(), found_box));
+            return false;
+        }
+    );
+
+    return found_locations;
+}
+
+
+
+ObjectNameWatcher::~ObjectNameWatcher() = default;
+
+ObjectNameWatcher::ObjectNameWatcher(Color color, VideoOverlay& overlay, const ImageFloatBox& box)
+    : VisualInferenceCallback("ObjectNameWatcher")
+    , m_overlay(overlay)
+    , m_detector(color, box)
+{}
+
+void ObjectNameWatcher::make_overlays(VideoOverlaySet& items) const{
+    m_detector.make_overlays(items);
+}
+
+bool ObjectNameWatcher::process_frame(const ImageViewRGB32& screen, WallClock timestamp){
+    std::vector<ImageFloatBox> hits = m_detector.detect_all(screen);
+
+    m_hits.reset(hits.size());
+    for (const ImageFloatBox& hit : hits){
+        m_hits.emplace_back(m_overlay, hit, COLOR_MAGENTA);
+    }
+    return !hits.empty();
+}
+
+
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Scripts/CodeTemplates/VisualDetector/GameName_ObjectNameDetector.h b/SerialPrograms/Scripts/CodeTemplates/VisualDetector/GameName_ObjectNameDetector.h
new file mode 100644
index 0000000000..0d3059b25e
--- /dev/null
+++ b/SerialPrograms/Scripts/CodeTemplates/VisualDetector/GameName_ObjectNameDetector.h
@@ -0,0 +1,66 @@
+/*  Object Name Detector
+ *
+ *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *
+ */
+
+#ifndef PokemonAutomation_GameName_ObjectNameDetector_H
+#define PokemonAutomation_GameName_ObjectNameDetector_H
+
+#include <vector>
+#include "Common/Cpp/Color.h"
+#include "Common/Cpp/Containers/FixedLimitVector.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+#include "CommonTools/VisualDetector.h"
+
+namespace PokemonAutomation{
+
+class VideoOverlaySet;
+class VideoOverlay;
+class OverlayBoxScope;
+
+namespace NintendoSwitch{
+namespace GameName{
+
+
+class ObjectNameDetector : public StaticScreenDetector{
+public:
+    ObjectNameDetector(Color color, const ImageFloatBox& box);
+    virtual ~ObjectNameDetector();
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) const override;
+
+    std::vector<ImageFloatBox> detect_all(const ImageViewRGB32& screen) const;
+
+protected:
+    Color m_color;
+    ImageFloatBox m_box;
+};
+
+
+
+class ObjectNameWatcher : public VisualInferenceCallback{
+public:
+    ObjectNameWatcher(Color color, VideoOverlay& overlay, const ImageFloatBox& box);
+    virtual ~ObjectNameWatcher();
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override;
+
+
+protected:
+    VideoOverlay& m_overlay;
+    ObjectNameDetector m_detector;
+    FixedLimitVector<OverlayBoxScope> m_hits;
+};
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Scripts/PokemonLZA/optical_flow.py b/SerialPrograms/Scripts/PokemonLZA/optical_flow.py
new file mode 100644
index 0000000000..3d3a892290
--- /dev/null
+++ b/SerialPrograms/Scripts/PokemonLZA/optical_flow.py
@@ -0,0 +1,653 @@
+#!/usr/bin/env python3
+"""
+Optical flow computation and visualization for motion detection between two images.
+Supports both dense (Farneback) and sparse (Lucas-Kanade) optical flow methods.
+"""
+
+import argparse
+import cv2
+import numpy as np
+import sys
+
+
+def create_circular_mask(image, center_x, center_y, radius):
+    """Create a circular mask for the image."""
+    mask = np.zeros(image.shape[:2], dtype=np.uint8)
+    cv2.circle(mask, (center_x, center_y), radius, 255, -1)
+    return mask
+
+
+def extract_circular_region(image, center_x, center_y, radius, cursor_radius=0):
+    """
+    Extract a circular region from the image.
+
+    Args:
+        image: Input image
+        center_x, center_y: Center of the circular region
+        radius: Radius of the circular region
+        cursor_radius: Radius of cursor at center to mask out (0 = no cursor masking)
+    """
+    # Create mask for the circular region
+    mask = create_circular_mask(image, center_x, center_y, radius)
+
+    # Mask out the cursor at the center if requested
+    if cursor_radius > 0:
+        # Create inverse mask for cursor (black circle at center)
+        cursor_mask = create_circular_mask(image, center_x, center_y, cursor_radius)
+        # Subtract cursor from the main mask
+        mask = cv2.subtract(mask, cursor_mask)
+
+    # Apply mask
+    masked_image = cv2.bitwise_and(image, image, mask=mask)
+
+    # Crop to bounding box
+    x_min = max(0, center_x - radius)
+    x_max = min(image.shape[1], center_x + radius)
+    y_min = max(0, center_y - radius)
+    y_max = min(image.shape[0], center_y + radius)
+
+    cropped = masked_image[y_min:y_max, x_min:x_max]
+    cropped_mask = mask[y_min:y_max, x_min:x_max]
+
+    return cropped, cropped_mask
+
+
+def compute_dense_optical_flow(img1, img2, pyr_scale=0.5, levels=3, winsize=15,
+                                iterations=3, poly_n=5, poly_sigma=1.2):
+    """
+    Compute dense optical flow using Farneback method.
+
+    Args:
+        img1, img2: Input images (grayscale)
+        pyr_scale: Image scale for pyramid
+        levels: Number of pyramid levels
+        winsize: Averaging window size
+        iterations: Number of iterations
+        poly_n: Size of pixel neighborhood
+        poly_sigma: Standard deviation of Gaussian for polynomial expansion
+
+    Returns:
+        flow: Optical flow array (height x width x 2), where flow[y,x] = [dx, dy]
+    """
+    # Convert to grayscale if needed
+    if len(img1.shape) == 3:
+        gray1 = cv2.cvtColor(img1, cv2.COLOR_BGR2GRAY)
+    else:
+        gray1 = img1.copy()
+
+    if len(img2.shape) == 3:
+        gray2 = cv2.cvtColor(img2, cv2.COLOR_BGR2GRAY)
+    else:
+        gray2 = img2.copy()
+
+    # Compute dense optical flow using Farneback method
+    flow = cv2.calcOpticalFlowFarneback(
+        gray1, gray2, None,
+        pyr_scale=pyr_scale,
+        levels=levels,
+        winsize=winsize,
+        iterations=iterations,
+        poly_n=poly_n,
+        poly_sigma=poly_sigma,
+        flags=0
+    )
+
+    return flow
+
+
+def compute_sparse_optical_flow(img1, img2, max_corners=200, quality_level=0.01,
+                                 min_distance=10, block_size=7):
+    """
+    Compute sparse optical flow using Lucas-Kanade method.
+
+    Args:
+        img1, img2: Input images (grayscale)
+        max_corners: Maximum number of corners to detect
+        quality_level: Quality level for corner detection
+        min_distance: Minimum distance between corners
+        block_size: Block size for corner detection
+
+    Returns:
+        pts1: Points in first image (N x 2 array)
+        pts2: Corresponding points in second image (N x 2 array)
+        status: Status array indicating successful tracking
+    """
+    # Convert to grayscale if needed
+    if len(img1.shape) == 3:
+        gray1 = cv2.cvtColor(img1, cv2.COLOR_BGR2GRAY)
+    else:
+        gray1 = img1.copy()
+
+    if len(img2.shape) == 3:
+        gray2 = cv2.cvtColor(img2, cv2.COLOR_BGR2GRAY)
+    else:
+        gray2 = img2.copy()
+
+    # Detect good features to track in first image
+    pts1 = cv2.goodFeaturesToTrack(
+        gray1,
+        maxCorners=max_corners,
+        qualityLevel=quality_level,
+        minDistance=min_distance,
+        blockSize=block_size
+    )
+
+    if pts1 is None or len(pts1) == 0:
+        return None, None, None
+
+    # Calculate optical flow (track points from img1 to img2)
+    pts2, status, err = cv2.calcOpticalFlowPyrLK(
+        gray1, gray2, pts1, None,
+        winSize=(15, 15),
+        maxLevel=2,
+        criteria=(cv2.TERM_CRITERIA_EPS | cv2.TERM_CRITERIA_COUNT, 10, 0.03)
+    )
+
+    # Select good points
+    if pts2 is not None:
+        pts1 = pts1[status.ravel() == 1]
+        pts2 = pts2[status.ravel() == 1]
+
+    return pts1, pts2, status
+
+
+def visualize_dense_flow(img, flow, step=16, scale=1.0, threshold=0.5):
+    """
+    Visualize dense optical flow as arrows on the image.
+
+    Args:
+        img: Original image to draw on
+        flow: Optical flow array
+        step: Step size for drawing arrows (to avoid clutter)
+        scale: Scale factor for arrow length
+        threshold: Minimum flow magnitude to draw
+
+    Returns:
+        vis: Visualization image
+    """
+    h, w = img.shape[:2]
+
+    # Convert to color if grayscale
+    if len(img.shape) == 2:
+        vis = cv2.cvtColor(img, cv2.COLOR_GRAY2BGR)
+    else:
+        vis = img.copy()
+
+    # Create grid of points
+    y, x = np.mgrid[step//2:h:step, step//2:w:step].reshape(2, -1).astype(int)
+
+    # Get flow at these points
+    fx, fy = flow[y, x].T
+
+    # Compute magnitude
+    mag = np.sqrt(fx*fx + fy*fy)
+
+    # Draw arrows for flow vectors above threshold
+    for i in range(len(x)):
+        if mag[i] > threshold:
+            pt1 = (x[i], y[i])
+            pt2 = (int(x[i] + fx[i] * scale), int(y[i] + fy[i] * scale))
+            cv2.arrowedLine(vis, pt1, pt2, (0, 255, 0), 1, tipLength=0.3)
+
+    return vis
+
+
+def visualize_flow_hsv(flow):
+    """
+    Visualize optical flow using HSV color coding.
+    Hue represents direction, Saturation represents magnitude.
+
+    Args:
+        flow: Optical flow array
+
+    Returns:
+        vis: HSV visualization image (BGR)
+    """
+    h, w = flow.shape[:2]
+
+    # Compute magnitude and angle
+    mag, ang = cv2.cartToPolar(flow[..., 0], flow[..., 1])
+
+    # Create HSV image
+    hsv = np.zeros((h, w, 3), dtype=np.uint8)
+    hsv[..., 0] = ang * 180 / np.pi / 2  # Hue: direction
+    hsv[..., 1] = 255  # Saturation: full
+    hsv[..., 2] = cv2.normalize(mag, None, 0, 255, cv2.NORM_MINMAX)  # Value: magnitude
+
+    # Convert to BGR
+    vis = cv2.cvtColor(hsv, cv2.COLOR_HSV2BGR)
+
+    return vis
+
+
+def visualize_sparse_flow(img, pts1, pts2):
+    """
+    Visualize sparse optical flow as arrows between tracked points.
+
+    Args:
+        img: Original image to draw on
+        pts1: Points in first image
+        pts2: Corresponding points in second image
+
+    Returns:
+        vis: Visualization image
+    """
+    # Convert to color if grayscale
+    if len(img.shape) == 2:
+        vis = cv2.cvtColor(img, cv2.COLOR_GRAY2BGR)
+    else:
+        vis = img.copy()
+
+    if pts1 is None or pts2 is None:
+        return vis
+
+    # Draw arrows from pts1 to pts2
+    for p1, p2 in zip(pts1, pts2):
+        pt1 = tuple(p1.ravel().astype(int))
+        pt2 = tuple(p2.ravel().astype(int))
+
+        # Draw the tracked point
+        cv2.circle(vis, pt1, 3, (0, 255, 0), -1)
+
+        # Draw the flow arrow
+        cv2.arrowedLine(vis, pt1, pt2, (0, 0, 255), 2, tipLength=0.3)
+
+    return vis
+
+
+def compute_flow_statistics(flow):
+    """
+    Compute statistics about the optical flow.
+
+    Args:
+        flow: Optical flow array
+
+    Returns:
+        stats: Dictionary containing flow statistics
+    """
+    # Compute magnitude
+    mag = np.sqrt(flow[..., 0]**2 + flow[..., 1]**2)
+
+    # Compute statistics
+    stats = {
+        'mean_magnitude': float(np.mean(mag)),
+        'median_magnitude': float(np.median(mag)),
+        'max_magnitude': float(np.max(mag)),
+        'mean_dx': float(np.mean(flow[..., 0])),
+        'mean_dy': float(np.mean(flow[..., 1])),
+        'std_dx': float(np.std(flow[..., 0])),
+        'std_dy': float(np.std(flow[..., 1]))
+    }
+
+    return stats
+
+
+def create_flow_visualization_panel(img1, img2, flow, pts1=None, pts2=None,
+                                     step=16, scale=1.0, threshold=0.5, mask1=None, mask2=None):
+    """
+    Create a comprehensive visualization panel showing:
+    - Original images side by side
+    - Dense flow visualization (arrows)
+    - HSV color-coded flow
+    - Sparse flow (if available)
+
+    Args:
+        img1, img2: Input images
+        flow: Dense optical flow
+        pts1, pts2: Sparse flow points (optional)
+        step, scale, threshold: Parameters for dense flow visualization
+        mask1, mask2: Optional masks to visualize masked regions
+
+    Returns:
+        panel: Combined visualization image
+    """
+    h1, w1 = img1.shape[:2]
+    h2, w2 = img2.shape[:2]
+
+    # Ensure images are in color
+    if len(img1.shape) == 2:
+        img1_color = cv2.cvtColor(img1, cv2.COLOR_GRAY2BGR)
+    else:
+        img1_color = img1.copy()
+
+    if len(img2.shape) == 2:
+        img2_color = cv2.cvtColor(img2, cv2.COLOR_GRAY2BGR)
+    else:
+        img2_color = img2.copy()
+
+    # Overlay masked regions (show in red tint where mask is 0)
+    if mask1 is not None:
+        masked_region = mask1 == 0
+        img1_color[masked_region] = (img1_color[masked_region].astype(float) * 0.5 + np.array([0, 0, 50])).astype(np.uint8)
+
+    if mask2 is not None:
+        masked_region = mask2 == 0
+        img2_color[masked_region] = (img2_color[masked_region].astype(float) * 0.5 + np.array([0, 0, 50])).astype(np.uint8)
+
+    # Create visualizations
+    dense_arrows = visualize_dense_flow(img2_color, flow, step, scale, threshold)
+    hsv_vis = visualize_flow_hsv(flow)
+
+    # Add labels
+    font = cv2.FONT_HERSHEY_SIMPLEX
+    cv2.putText(img1_color, "Image 1 (Reference)", (10, 30), font, 0.7, (255, 255, 255), 2)
+    cv2.putText(img2_color, "Image 2 (Target)", (10, 30), font, 0.7, (255, 255, 255), 2)
+    cv2.putText(dense_arrows, "Dense Flow (Arrows)", (10, 30), font, 0.7, (255, 255, 255), 2)
+    cv2.putText(hsv_vis, "Flow Direction (HSV)", (10, 30), font, 0.7, (255, 255, 255), 2)
+
+    # Create top row: original images
+    max_h_top = max(h1, h2)
+    top_row = np.zeros((max_h_top, w1 + w2, 3), dtype=np.uint8)
+    top_row[:h1, :w1] = img1_color
+    top_row[:h2, w1:w1+w2] = img2_color
+
+    # Create bottom row: flow visualizations
+    max_h_bottom = max(dense_arrows.shape[0], hsv_vis.shape[0])
+    bottom_row = np.zeros((max_h_bottom, w1 + w2, 3), dtype=np.uint8)
+    bottom_row[:dense_arrows.shape[0], :dense_arrows.shape[1]] = dense_arrows
+    bottom_row[:hsv_vis.shape[0], w1:w1+hsv_vis.shape[1]] = hsv_vis
+
+    # Combine rows
+    panel = np.vstack([top_row, bottom_row])
+
+    # Add statistics
+    stats = compute_flow_statistics(flow)
+    info_y = panel.shape[0] - 100
+
+    cv2.putText(panel, f"Mean magnitude: {stats['mean_magnitude']:.2f} px",
+                (10, info_y), font, 0.6, (0, 255, 255), 2)
+    cv2.putText(panel, f"Max magnitude: {stats['max_magnitude']:.2f} px",
+                (10, info_y + 25), font, 0.6, (0, 255, 255), 2)
+    cv2.putText(panel, f"Mean motion: ({stats['mean_dx']:.2f}, {stats['mean_dy']:.2f}) px",
+                (10, info_y + 50), font, 0.6, (0, 255, 255), 2)
+
+    # Add sparse flow count if available
+    if pts1 is not None and pts2 is not None:
+        cv2.putText(panel, f"Tracked points: {len(pts1)}",
+                    (w1 + 10, info_y), font, 0.6, (0, 255, 255), 2)
+
+    return panel
+
+
+def create_sparse_flow_visualization(img1, img2, pts1, pts2, mask1=None, mask2=None):
+    """
+    Create visualization for sparse optical flow.
+
+    Args:
+        img1, img2: Input images
+        pts1, pts2: Tracked points
+        mask1, mask2: Optional masks to visualize masked regions
+
+    Returns:
+        vis: Sparse flow visualization
+    """
+    h1, w1 = img1.shape[:2]
+    h2, w2 = img2.shape[:2]
+
+    # Convert to color if needed and apply mask overlays
+    if len(img1.shape) == 2:
+        img1_vis = cv2.cvtColor(img1, cv2.COLOR_GRAY2BGR)
+    else:
+        img1_vis = img1.copy()
+
+    if len(img2.shape) == 2:
+        img2_vis = cv2.cvtColor(img2, cv2.COLOR_GRAY2BGR)
+    else:
+        img2_vis = img2.copy()
+
+    # Overlay masked regions (show in red tint where mask is 0)
+    if mask1 is not None:
+        masked_region = mask1 == 0
+        img1_vis[masked_region] = (img1_vis[masked_region].astype(float) * 0.5 + np.array([0, 0, 50])).astype(np.uint8)
+
+    if mask2 is not None:
+        masked_region = mask2 == 0
+        img2_vis[masked_region] = (img2_vis[masked_region].astype(float) * 0.5 + np.array([0, 0, 50])).astype(np.uint8)
+
+    # Visualize on both images
+    sparse_vis1 = visualize_sparse_flow(img1_vis, pts1, pts2)
+    sparse_vis2 = visualize_sparse_flow(img2_vis, pts1, pts2)
+
+    # Add labels
+    font = cv2.FONT_HERSHEY_SIMPLEX
+    cv2.putText(sparse_vis1, "Sparse Flow (Image 1)", (10, 30), font, 0.7, (255, 255, 255), 2)
+    cv2.putText(sparse_vis2, "Sparse Flow (Image 2)", (10, 30), font, 0.7, (255, 255, 255), 2)
+
+    # Combine side by side
+    max_h = max(h1, h2)
+    vis = np.zeros((max_h, w1 + w2, 3), dtype=np.uint8)
+    vis[:h1, :w1] = sparse_vis1
+    vis[:h2, w1:w1+w2] = sparse_vis2
+
+    # Add statistics
+    if pts1 is not None and pts2 is not None:
+        flow_vectors = (pts2 - pts1).reshape(-1, 2)
+        mean_flow = np.mean(flow_vectors, axis=0)
+        max_flow = np.max(np.linalg.norm(flow_vectors, axis=1))
+
+        info_y = max_h - 80
+        cv2.putText(vis, f"Points tracked: {len(pts1)}",
+                    (10, info_y), font, 0.6, (0, 255, 255), 2)
+        cv2.putText(vis, f"Mean flow: ({mean_flow[0]:.2f}, {mean_flow[1]:.2f}) px",
+                    (10, info_y + 25), font, 0.6, (0, 255, 255), 2)
+        cv2.putText(vis, f"Max flow: {max_flow:.2f} px",
+                    (10, info_y + 50), font, 0.6, (0, 255, 255), 2)
+
+    return vis
+
+
+def main():
+    parser = argparse.ArgumentParser(
+        description='Optical flow computation and visualization',
+        formatter_class=argparse.RawDescriptionHelpFormatter,
+        epilog='''
+Optical flow detects motion between two images:
+  - Dense flow (Farneback): Computes flow for every pixel, good for understanding overall motion
+  - Sparse flow (Lucas-Kanade): Tracks specific feature points, faster and good for feature-based tracking
+
+Dense flow is better for:
+  - Understanding full motion field
+  - Visualizing complex motion patterns
+  - Working with textured images
+
+Sparse flow is better for:
+  - Tracking specific features/corners
+  - Real-time applications (faster)
+  - Working with images that have distinct features
+
+Examples:
+  # Compute dense flow
+  python optical_flow.py img1.png img2.png --method dense
+
+  # Compute sparse flow
+  python optical_flow.py img1.png img2.png --method sparse
+
+  # Compute both and show all visualizations
+  python optical_flow.py img1.png img2.png --method both --show-all
+
+  # Compute flow on circular region only
+  python optical_flow.py img1.png img2.png --center-x 300 --center-y 250 --radius 200
+
+  # Mask out cursor at center
+  python optical_flow.py img1.png img2.png --radius 200 --cursor-radius 20
+        '''
+    )
+    parser.add_argument('image1', help='Path to first image (reference)')
+    parser.add_argument('image2', help='Path to second image (target)')
+    parser.add_argument('--method', choices=['dense', 'sparse', 'both'], default='both',
+                        help='Optical flow method (default: both)')
+    parser.add_argument('--center-x', type=int, default=180,
+                        help='X coordinate of circle center (default: 180)')
+    parser.add_argument('--center-y', type=int, default=180,
+                        help='Y coordinate of circle center (default: 180)')
+    parser.add_argument('--radius', type=int, default=120,
+                        help='Radius of circular region (default: 120)')
+    parser.add_argument('--cursor-radius', type=int, default=0,
+                        help='Radius of cursor at center to mask out (default: 0, no masking)')
+    parser.add_argument('--output', default='optical_flow_result.png',
+                        help='Output image path (default: optical_flow_result.png)')
+    parser.add_argument('--step', type=int, default=16,
+                        help='Step size for dense flow arrows (default: 16)')
+    parser.add_argument('--scale', type=float, default=2.0,
+                        help='Scale factor for arrow length (default: 2.0)')
+    parser.add_argument('--threshold', type=float, default=0.5,
+                        help='Minimum flow magnitude to visualize (default: 0.5)')
+    parser.add_argument('--max-corners', type=int, default=200,
+                        help='Maximum corners for sparse flow (default: 200)')
+    parser.add_argument('--show-all', action='store_true',
+                        help='Show all visualizations in separate windows')
+
+    args = parser.parse_args()
+
+    # Read images
+    img1 = cv2.imread(args.image1)
+    img2 = cv2.imread(args.image2)
+
+    if img1 is None:
+        print(f"Error: Could not read image: {args.image1}")
+        sys.exit(1)
+
+    if img2 is None:
+        print(f"Error: Could not read image: {args.image2}")
+        sys.exit(1)
+
+    print(f"Image 1 size: {img1.shape[1]}x{img1.shape[0]}")
+    print(f"Image 2 size: {img2.shape[1]}x{img2.shape[0]}")
+    print(f"Method: {args.method}")
+    print(f"Circle center: ({args.center_x}, {args.center_y}), radius: {args.radius}")
+    if args.cursor_radius > 0:
+        print(f"Cursor masking: radius {args.cursor_radius} pixels at center")
+    print()
+
+    # Extract circular regions
+    img1, mask1 = extract_circular_region(
+        img1, args.center_x, args.center_y, args.radius, args.cursor_radius
+    )
+    img2, mask2 = extract_circular_region(
+        img2, args.center_x, args.center_y, args.radius, args.cursor_radius
+    )
+
+    print(f"Cropped region 1 size: {img1.shape[1]}x{img1.shape[0]}")
+    print(f"Cropped region 2 size: {img2.shape[1]}x{img2.shape[0]}")
+    print()
+
+    # Compute optical flow based on method
+    flow = None
+    pts1, pts2 = None, None
+
+    if args.method in ['dense', 'both']:
+        print("Computing dense optical flow (Farneback)...")
+        flow = compute_dense_optical_flow(img1, img2)
+
+        # Compute and print statistics
+        stats = compute_flow_statistics(flow)
+        print("\n" + "="*50)
+        print("=== Dense Optical Flow Statistics ===")
+        print("="*50)
+        print(f"Mean magnitude: {stats['mean_magnitude']:.2f} pixels")
+        print(f"Median magnitude: {stats['median_magnitude']:.2f} pixels")
+        print(f"Max magnitude: {stats['max_magnitude']:.2f} pixels")
+        print(f"Mean motion: ({stats['mean_dx']:.2f}, {stats['mean_dy']:.2f}) pixels")
+        print(f"Std deviation: ({stats['std_dx']:.2f}, {stats['std_dy']:.2f}) pixels")
+        print("="*50)
+        print()
+
+    if args.method in ['sparse', 'both']:
+        print("Computing sparse optical flow (Lucas-Kanade)...")
+        pts1, pts2, status = compute_sparse_optical_flow(
+            img1, img2,
+            max_corners=args.max_corners
+        )
+
+        if pts1 is not None and pts2 is not None:
+            flow_vectors = (pts2 - pts1).reshape(-1, 2)
+            mean_flow = np.mean(flow_vectors, axis=0)
+            max_flow = np.max(np.linalg.norm(flow_vectors, axis=1))
+
+            print("\n" + "="*50)
+            print("=== Sparse Optical Flow Statistics ===")
+            print("="*50)
+            print(f"Points tracked: {len(pts1)}")
+            print(f"Mean flow: ({mean_flow[0]:.2f}, {mean_flow[1]:.2f}) pixels")
+            print(f"Max flow: {max_flow:.2f} pixels")
+            print("="*50)
+            print()
+        else:
+            print("Warning: No features could be tracked")
+
+    # Create visualizations
+    if args.method == 'dense' and flow is not None:
+        panel = create_flow_visualization_panel(
+            img1, img2, flow,
+            step=args.step, scale=args.scale, threshold=args.threshold,
+            mask1=mask1, mask2=mask2
+        )
+        cv2.imwrite(args.output, panel)
+        print(f"Dense flow visualization saved to: {args.output}")
+        if args.cursor_radius > 0:
+            print(f"Note: Masked regions (cursor) shown with red tint in visualization")
+
+        # Always show the visualization
+        cv2.namedWindow('Dense Optical Flow', cv2.WINDOW_NORMAL)
+        cv2.imshow('Dense Optical Flow', panel)
+        cv2.waitKey(1)  # Small delay to ensure window renders
+
+    elif args.method == 'sparse' and pts1 is not None:
+        sparse_vis = create_sparse_flow_visualization(img1, img2, pts1, pts2, mask1, mask2)
+        cv2.imwrite(args.output, sparse_vis)
+        print(f"Sparse flow visualization saved to: {args.output}")
+        if args.cursor_radius > 0:
+            print(f"Note: Masked regions (cursor) shown with red tint in visualization")
+
+        # Always show the visualization
+        cv2.namedWindow('Sparse Optical Flow', cv2.WINDOW_NORMAL)
+        cv2.imshow('Sparse Optical Flow', sparse_vis)
+        cv2.waitKey(1)  # Small delay to ensure window renders
+
+    elif args.method == 'both':
+        # Create main panel with dense flow
+        if flow is not None:
+            panel = create_flow_visualization_panel(
+                img1, img2, flow, pts1, pts2,
+                step=args.step, scale=args.scale, threshold=args.threshold,
+                mask1=mask1, mask2=mask2
+            )
+            cv2.imwrite(args.output, panel)
+            print(f"Dense flow visualization saved to: {args.output}")
+            if args.cursor_radius > 0:
+                print(f"Note: Masked regions (cursor) shown with red tint in visualization")
+
+        # Create sparse flow visualization
+        if pts1 is not None:
+            sparse_vis = create_sparse_flow_visualization(img1, img2, pts1, pts2, mask1, mask2)
+            sparse_output = args.output.rsplit('.', 1)[0] + '_sparse.png'
+            cv2.imwrite(sparse_output, sparse_vis)
+            print(f"Sparse flow visualization saved to: {sparse_output}")
+            if args.cursor_radius > 0:
+                print(f"Note: Masked regions (cursor) shown with red tint in sparse flow visualization")
+
+        # Show visualizations
+        if args.show_all:
+            # Show both in separate windows
+            if flow is not None:
+                cv2.namedWindow('Dense Optical Flow', cv2.WINDOW_NORMAL)
+                cv2.imshow('Dense Optical Flow', panel)
+                cv2.waitKey(1)  # Small delay to ensure window renders
+            if pts1 is not None:
+                cv2.namedWindow('Sparse Optical Flow', cv2.WINDOW_NORMAL)
+                cv2.imshow('Sparse Optical Flow', sparse_vis)
+                cv2.waitKey(1)  # Small delay to ensure window renders
+        else:
+            # Show combined panel by default
+            if flow is not None:
+                cv2.namedWindow('Optical Flow', cv2.WINDOW_NORMAL)
+                cv2.imshow('Optical Flow', panel)
+                cv2.waitKey(1)  # Small delay to ensure window renders
+
+    print("\nPress any key to close the visualization window...")
+    cv2.waitKey(0)
+    cv2.destroyAllWindows()
+
+
+if __name__ == '__main__':
+    main()
diff --git a/SerialPrograms/Scripts/PokemonLZA/phase_correlation_match.py b/SerialPrograms/Scripts/PokemonLZA/phase_correlation_match.py
new file mode 100755
index 0000000000..ca83d376ba
--- /dev/null
+++ b/SerialPrograms/Scripts/PokemonLZA/phase_correlation_match.py
@@ -0,0 +1,358 @@
+#!/usr/bin/env python3
+"""
+Phase correlation-based translation estimation for circular regions.
+Ideal for flat-color images like game maps.
+"""
+
+import argparse
+import cv2
+import numpy as np
+import sys
+
+
+def create_circular_mask(image, center_x, center_y, radius):
+    """Create a circular mask for the image."""
+    mask = np.zeros(image.shape[:2], dtype=np.uint8)
+    cv2.circle(mask, (center_x, center_y), radius, 255, -1)
+    return mask
+
+
+def extract_circular_region(image, center_x, center_y, radius, cursor_radius=0):
+    """
+    Extract a circular region from the image.
+
+    Args:
+        image: Input image
+        center_x, center_y: Center of the circular region
+        radius: Radius of the circular region
+        cursor_radius: Radius of cursor at center to mask out (0 = no cursor masking)
+    """
+    # Create mask for the circular region
+    mask = create_circular_mask(image, center_x, center_y, radius)
+
+    # Mask out the cursor at the center if requested
+    if cursor_radius > 0:
+        # Create inverse mask for cursor (black circle at center)
+        cursor_mask = create_circular_mask(image, center_x, center_y, cursor_radius)
+        # Subtract cursor from the main mask
+        mask = cv2.subtract(mask, cursor_mask)
+
+    # Apply mask
+    masked_image = cv2.bitwise_and(image, image, mask=mask)
+
+    # Crop to bounding box
+    x_min = max(0, center_x - radius)
+    x_max = min(image.shape[1], center_x + radius)
+    y_min = max(0, center_y - radius)
+    y_max = min(image.shape[0], center_y + radius)
+
+    cropped = masked_image[y_min:y_max, x_min:x_max]
+    cropped_mask = mask[y_min:y_max, x_min:x_max]
+
+    return cropped, cropped_mask
+
+
+def compute_phase_correlation(img1, mask1, img2, mask2, use_hanning=True):
+    """
+    Compute translation between two images using phase correlation.
+
+    Args:
+        img1, img2: Input images (grayscale)
+        mask1, mask2: Masks for the images (0 = masked out, 255 = valid)
+                      Can include cursor masking at center
+        use_hanning: Apply Hanning window to reduce edge effects
+
+    Returns:
+        (dx, dy): Translation in pixels
+        response: Confidence of the match (higher is better)
+    """
+    # Convert to float32
+    gray1 = np.float32(img1)
+    gray2 = np.float32(img2)
+
+    # Apply mask (set masked regions to mean value to reduce artifacts)
+    if mask1 is not None:
+        mean_val = np.mean(gray1[mask1 > 0])
+        gray1 = gray1.copy()
+        gray1[mask1 == 0] = mean_val
+
+    if mask2 is not None:
+        mean_val = np.mean(gray2[mask2 > 0])
+        gray2 = gray2.copy()
+        gray2[mask2 == 0] = mean_val
+
+    # Apply Hanning window to reduce edge effects
+    if use_hanning:
+        hann = cv2.createHanningWindow((gray1.shape[1], gray1.shape[0]), cv2.CV_32F)
+        gray1 = gray1 * hann
+        gray2 = gray2 * hann
+
+    # Phase correlation
+    (dx, dy), response = cv2.phaseCorrelate(gray1, gray2)
+
+    return (dx, dy), response
+
+
+def visualize_translation(img1, img2, dx, dy, response, mask1=None, mask2=None):
+    """
+    Visualize the translation between two images.
+    Shows both images side by side with translation overlay.
+
+    Args:
+        img1, img2: Input images
+        dx, dy: Translation in pixels
+        response: Confidence score
+        mask1, mask2: Optional masks to visualize masked regions
+    """
+    h1, w1 = img1.shape[:2]
+    h2, w2 = img2.shape[:2]
+
+    # Create side-by-side visualization
+    max_h = max(h1, h2)
+    vis = np.zeros((max_h, w1 + w2, 3), dtype=np.uint8)
+
+    # Place images
+    if len(img1.shape) == 2:
+        img1_color = cv2.cvtColor(img1, cv2.COLOR_GRAY2BGR)
+    else:
+        img1_color = img1.copy()
+
+    if len(img2.shape) == 2:
+        img2_color = cv2.cvtColor(img2, cv2.COLOR_GRAY2BGR)
+    else:
+        img2_color = img2.copy()
+
+    vis[:h1, :w1] = img1_color
+    vis[:h2, w1:w1+w2] = img2_color
+
+    # Overlay masked regions (show in red tint where mask is 0)
+    if mask1 is not None:
+        # Create a red tint overlay for masked regions
+        masked_region = mask1 == 0
+        overlay_img = vis[:h1, :w1].copy()
+        overlay_img[masked_region] = (overlay_img[masked_region].astype(float) * 0.5 + np.array([0, 0, 50])).astype(np.uint8)
+        vis[:h1, :w1] = overlay_img
+
+    if mask2 is not None:
+        # Create a red tint overlay for masked regions
+        masked_region = mask2 == 0
+        overlay_img = vis[:h2, w1:w1+w2].copy()
+        overlay_img[masked_region] = (overlay_img[masked_region].astype(float) * 0.5 + np.array([0, 0, 50])).astype(np.uint8)
+        vis[:h2, w1:w1+w2] = overlay_img
+
+    # Draw center markers
+    center1 = (w1 // 2, h1 // 2)
+    center2 = (w1 + w2 // 2, h2 // 2)
+
+    cv2.drawMarker(vis, center1, (0, 255, 0), cv2.MARKER_CROSS, 20, 2)
+    cv2.drawMarker(vis, center2, (0, 255, 0), cv2.MARKER_CROSS, 20, 2)
+
+    # Draw translation vector from img1 center to corresponding point in img2
+    # The translation (dx, dy) means img2 is shifted by (dx, dy) relative to img1
+    # So a point at center1 in img1 corresponds to (center2 + translation) in img2's coordinate
+    translated_point = (int(center2[0] + dx), int(center2[1] + dy))
+
+    # Draw the translation vector
+    cv2.arrowedLine(vis, center2, translated_point, (0, 0, 255), 2, tipLength=0.3)
+
+    # Add text annotations
+    font = cv2.FONT_HERSHEY_SIMPLEX
+    cv2.putText(vis, "Image 1", (10, 30), font, 1, (255, 255, 255), 2)
+    cv2.putText(vis, "Image 2", (w1 + 10, 30), font, 1, (255, 255, 255), 2)
+
+    # Translation info
+    info_y = h1 - 80 if h1 == max_h else max_h - 80
+    cv2.putText(vis, f"Translation: ({dx:.2f}, {dy:.2f}) px",
+                (10, info_y), font, 0.7, (0, 255, 255), 2)
+    cv2.putText(vis, f"Confidence: {response:.4f}",
+                (10, info_y + 30), font, 0.7, (0, 255, 255), 2)
+
+    # Create overlay visualization
+    overlay = create_overlay_visualization(img1_color, img2_color, dx, dy)
+
+    return vis, overlay
+
+
+def create_overlay_visualization(img1, img2, dx, dy):
+    """
+    Create an overlay showing how well img2 aligns with img1 after translation.
+    """
+    h1, w1 = img1.shape[:2]
+    h2, w2 = img2.shape[:2]
+
+    # Create translation matrix
+    M = np.float32([[1, 0, -dx], [0, 1, -dy]])
+
+    # Warp img2 to align with img1
+    img2_aligned = cv2.warpAffine(img2, M, (w1, h1))
+
+    # Create overlay: img1 in red channel, img2_aligned in cyan
+    overlay = np.zeros((h1, w1, 3), dtype=np.uint8)
+
+    # Convert to grayscale if needed
+    if len(img1.shape) == 3:
+        gray1 = cv2.cvtColor(img1, cv2.COLOR_BGR2GRAY)
+    else:
+        gray1 = img1
+
+    if len(img2_aligned.shape) == 3:
+        gray2 = cv2.cvtColor(img2_aligned, cv2.COLOR_BGR2GRAY)
+    else:
+        gray2 = img2_aligned
+
+    # Red channel: img1
+    overlay[:, :, 2] = gray1
+    # Cyan (green + blue): img2_aligned
+    overlay[:, :, 0] = gray2
+    overlay[:, :, 1] = gray2
+
+    # Where they overlap perfectly, it will appear white/gray
+    # Where they differ, you'll see red or cyan
+
+    # Add text
+    font = cv2.FONT_HERSHEY_SIMPLEX
+    cv2.putText(overlay, "Overlay: Red=Img1, Cyan=Img2 (aligned)",
+                (10, 30), font, 0.6, (255, 255, 255), 2)
+    cv2.putText(overlay, "Perfect match = White/Gray",
+                (10, 55), font, 0.5, (255, 255, 255), 1)
+
+    return overlay
+
+
+def main():
+    parser = argparse.ArgumentParser(
+        description='Translation estimation using phase correlation on circular regions',
+        formatter_class=argparse.RawDescriptionHelpFormatter,
+        epilog='''
+Phase correlation is ideal for:
+  - Flat-color images (game maps, UI elements)
+  - Translation-only motion
+  - Fast processing with sub-pixel accuracy
+  - No feature detection needed
+
+The method works in frequency domain using FFT and is robust to uniform regions.
+
+Use --cursor-radius to mask out a cursor or marker at the center of the circular region,
+preventing it from affecting the phase correlation matching.
+
+Examples:
+  python phase_correlation_match.py img1.png img2.png --center-x 300 --center-y 250 --radius 200
+  python phase_correlation_match.py img1.png img2.png --radius 200 --cursor-radius 20
+        '''
+    )
+    parser.add_argument('image1', help='Path to first image')
+    parser.add_argument('image2', help='Path to second image')
+    parser.add_argument('--center-x', type=int, default=180,
+                        help='X coordinate of circle center (default: 180)')
+    parser.add_argument('--center-y', type=int, default=180,
+                        help='Y coordinate of circle center (default: 180)')
+    parser.add_argument('--radius', type=int, default=120,
+                        help='Radius of circular region (default: 120)')
+    parser.add_argument('--cursor-radius', type=int, default=50,
+                        help='Radius of cursor at center to mask out (default: 50)')
+    parser.add_argument('--output', default='phase_correlation_result.png',
+                        help='Output image path (default: phase_correlation_result.png)')
+    parser.add_argument('--no-hanning', action='store_true',
+                        help='Disable Hanning window (may reduce accuracy)')
+    parser.add_argument('--show-overlay', action='store_true',
+                        help='Also show overlay visualization')
+
+    args = parser.parse_args()
+
+    # Read images
+    img1 = cv2.imread(args.image1)
+    img2 = cv2.imread(args.image2)
+
+    if img1 is None:
+        print(f"Error: Could not read image: {args.image1}")
+        sys.exit(1)
+
+    if img2 is None:
+        print(f"Error: Could not read image: {args.image2}")
+        sys.exit(1)
+
+    print(f"Image 1 size: {img1.shape[1]}x{img1.shape[0]}")
+    print(f"Image 2 size: {img2.shape[1]}x{img2.shape[0]}")
+    print(f"Circle center: ({args.center_x}, {args.center_y}), radius: {args.radius}")
+    if args.cursor_radius > 0:
+        print(f"Cursor masking: radius {args.cursor_radius} pixels at center")
+    print()
+
+    # Extract circular regions
+    crop1, mask1 = extract_circular_region(
+        img1, args.center_x, args.center_y, args.radius, args.cursor_radius
+    )
+    crop2, mask2 = extract_circular_region(
+        img2, args.center_x, args.center_y, args.radius, args.cursor_radius
+    )
+
+    print(f"Cropped region 1 size: {crop1.shape[1]}x{crop1.shape[0]}")
+    print(f"Cropped region 2 size: {crop2.shape[1]}x{crop2.shape[0]}")
+
+    # Convert to grayscale
+    if len(crop1.shape) == 3:
+        gray1 = cv2.cvtColor(crop1, cv2.COLOR_BGR2GRAY)
+    else:
+        gray1 = crop1
+
+    if len(crop2.shape) == 3:
+        gray2 = cv2.cvtColor(crop2, cv2.COLOR_BGR2GRAY)
+    else:
+        gray2 = crop2
+
+    # Compute phase correlation
+    print("Computing phase correlation...")
+    (dx, dy), response = compute_phase_correlation(
+        gray1, mask1, gray2, mask2,
+        use_hanning=not args.no_hanning
+    )
+
+    print("\n" + "="*50)
+    print("=== Translation Estimation (Phase Correlation) ===")
+    print("="*50)
+    print(f"Translation: ({dx:.2f}, {dy:.2f}) pixels")
+    print(f"Confidence: {response:.6f}")
+    print()
+    print("Interpretation:")
+    print(f"  Image 2 is shifted by ({dx:.2f}, {dy:.2f}) relative to Image 1")
+    print(f"  To align Image 2 with Image 1, translate by ({-dx:.2f}, {-dy:.2f})")
+    print()
+    print(f"Confidence interpretation:")
+    if response > 0.8:
+        print(f"  Very high confidence - excellent match")
+    elif response > 0.5:
+        print(f"  Good confidence - reliable match")
+    elif response > 0.3:
+        print(f"  Moderate confidence - may have some differences")
+    else:
+        print(f"  Low confidence - images may be very different")
+    print("="*50)
+    print()
+
+    # Visualize
+    vis, overlay = visualize_translation(crop1, crop2, dx, dy, response, mask1, mask2)
+
+    # Save result
+    cv2.imwrite(args.output, vis)
+    print(f"Visualization saved to: {args.output}")
+    if args.cursor_radius > 0:
+        print(f"Note: Masked regions (cursor) shown with red tint in visualization")
+
+    if args.show_overlay:
+        overlay_path = args.output.rsplit('.', 1)[0] + '_overlay.png'
+        cv2.imwrite(overlay_path, overlay)
+        print(f"Overlay visualization saved to: {overlay_path}")
+
+    # Display result
+    cv2.imshow('Phase Correlation - Translation', vis)
+
+    if args.show_overlay:
+        cv2.imshow('Overlay Visualization', overlay)
+
+    print("\nPress any key to close the visualization window...")
+    cv2.waitKey(0)
+    cv2.destroyAllWindows()
+
+
+if __name__ == '__main__':
+    main()
diff --git a/SerialPrograms/Scripts/PokemonLZA/process_arrow_template_color.py b/SerialPrograms/Scripts/PokemonLZA/process_arrow_template_color.py
new file mode 100644
index 0000000000..feeeed4e0e
--- /dev/null
+++ b/SerialPrograms/Scripts/PokemonLZA/process_arrow_template_color.py
@@ -0,0 +1,96 @@
+from PIL import Image
+import numpy as np
+import argparse
+import sys
+
+# Parse command line arguments
+parser = argparse.ArgumentParser(
+    description='Transform image colors with linear scaling: [0,0,0] -> [255,255,255] and [255,255,255] -> target color'
+)
+parser.add_argument('input_image', type=str, help='Path to input image file')
+parser.add_argument('--target-color', '-c', type=str, default='180,240,60',
+                    help='Target RGB color for white pixels (format: R,G,B). Default: 180,240,60')
+parser.add_argument('--output', '-o', type=str, default='output.png',
+                    help='Output image path. Default: output.png')
+
+args = parser.parse_args()
+
+# Parse target color
+try:
+    target_rgb = [int(x.strip()) for x in args.target_color.split(',')]
+    if len(target_rgb) != 3:
+        raise ValueError("Target color must have exactly 3 values")
+    if not all(0 <= v <= 255 for v in target_rgb):
+        raise ValueError("RGB values must be between 0 and 255")
+    target_r, target_g, target_b = target_rgb
+except Exception as e:
+    print(f"Error parsing target color: {e}", file=sys.stderr)
+    print("Format should be: R,G,B (e.g., 180,240,60)", file=sys.stderr)
+    sys.exit(1)
+
+print(f"Input image: {args.input_image}")
+print(f"Target color: RGB({target_r}, {target_g}, {target_b})")
+print(f"Output image: {args.output}")
+
+# Load the image
+image_path = args.input_image
+try:
+    img = Image.open(image_path)
+except Exception as e:
+    print(f"Error loading image: {e}", file=sys.stderr)
+    sys.exit(1)
+
+# Convert to RGBA if not already
+img = img.convert('RGBA')
+
+# Convert to numpy array for easier manipulation
+img_array = np.array(img, dtype=np.float32)
+
+height, width = img_array.shape[0:2]
+print(f"height {height} x width {width}")
+
+# Extract RGBA channels
+r, g, b, a = img_array[:, :, 0], img_array[:, :, 1], img_array[:, :, 2], img_array[:, :, 3]
+
+# For pixels with alpha = 0, set RGB to 0
+mask = (a == 0)
+r[mask] = 0
+g[mask] = 0
+b[mask] = 0
+
+# Linear scaling: [0, 0, 0] -> [255, 255, 255] and [255, 255, 255] -> [target_r, target_g, target_b]
+# This creates an inverted color scheme with specific endpoints
+# Formula: output = 255 - input * (255 - target) / 255
+
+# Calculate scale factors
+scale_r = (255.0 - target_r) / 255.0
+scale_g = (255.0 - target_g) / 255.0
+scale_b = (255.0 - target_b) / 255.0
+
+print(f"Scale factors: R={scale_r:.4f}, G={scale_g:.4f}, B={scale_b:.4f}")
+
+# Apply linear transformation
+r = 255 - r * scale_r
+g = 255 - g * scale_g
+b = 255 - b * scale_b
+
+# Clip values to valid range [0, 255]
+r = np.clip(r, 0, 255)
+g = np.clip(g, 0, 255)
+b = np.clip(b, 0, 255)
+
+# Reconstruct the image array
+img_array[:, :, 0] = r
+img_array[:, :, 1] = g
+img_array[:, :, 2] = b
+# Alpha channel remains unchanged
+
+# Convert back to uint8
+img_array = img_array.astype(np.uint8)
+
+# Create new image from array
+output_img = Image.fromarray(img_array, 'RGBA')
+
+# Save the result
+output_img.save(args.output)
+print(f"Image processed and saved as {args.output}")
diff --git a/SerialPrograms/Scripts/PokemonLZA/sift_circle_match.py b/SerialPrograms/Scripts/PokemonLZA/sift_circle_match.py
new file mode 100755
index 0000000000..ee33d6cd83
--- /dev/null
+++ b/SerialPrograms/Scripts/PokemonLZA/sift_circle_match.py
@@ -0,0 +1,312 @@
+#!/usr/bin/env python3
+"""
+SIFT-based image matching on circular regions.
+Reads two images, extracts circular areas from top-left, and computes SIFT matches.
+"""
+
+import argparse
+import cv2
+import numpy as np
+import sys
+
+
+def create_circular_mask(image, center_x, center_y, radius):
+    """Create a circular mask for the image."""
+    mask = np.zeros(image.shape[:2], dtype=np.uint8)
+    cv2.circle(mask, (center_x, center_y), radius, 255, -1)
+    return mask
+
+
+def extract_circular_region(image, center_x, center_y, radius):
+    """Extract a circular region from the image."""
+    # Create mask
+    mask = create_circular_mask(image, center_x, center_y, radius)
+
+    # Apply mask
+    masked_image = cv2.bitwise_and(image, image, mask=mask)
+
+    # Crop to bounding box
+    x_min = max(0, center_x - radius)
+    x_max = min(image.shape[1], center_x + radius)
+    y_min = max(0, center_y - radius)
+    y_max = min(image.shape[0], center_y + radius)
+
+    cropped = masked_image[y_min:y_max, x_min:x_max]
+    cropped_mask = mask[y_min:y_max, x_min:x_max]
+
+    return cropped, cropped_mask, (x_min, y_min)
+
+
+def compute_sift_matches(img1, mask1, img2, mask2, contrast_threshold=0.02,
+                         edge_threshold=15, ratio_threshold=0.8, use_bfmatcher=False):
+    """Compute SIFT features and matches between two images."""
+    # Initialize SIFT detector with relaxed parameters for more features
+    sift = cv2.SIFT_create(
+        contrastThreshold=contrast_threshold,  # Lower = more keypoints (default 0.04)
+        edgeThreshold=edge_threshold,          # Higher = more edge features (default 10)
+        nOctaveLayers=3,                       # Default, controls scale space
+        sigma=1.6                              # Default
+    )
+
+    # Detect and compute keypoints and descriptors
+    kp1, desc1 = sift.detectAndCompute(img1, mask1)
+    kp2, desc2 = sift.detectAndCompute(img2, mask2)
+
+    print(f"Image 1: Found {len(kp1)} keypoints")
+    print(f"Image 2: Found {len(kp2)} keypoints")
+
+    if desc1 is None or desc2 is None or len(kp1) < 2 or len(kp2) < 2:
+        print("Not enough keypoints found for matching")
+        return None, None, None
+
+    # Match features
+    if use_bfmatcher:
+        # BFMatcher - more thorough but slower
+        bf = cv2.BFMatcher(cv2.NORM_L2, crossCheck=False)
+        matches = bf.knnMatch(desc1, desc2, k=2)
+        print("Using BFMatcher (slower but more thorough)")
+    else:
+        # FLANN-based matcher - faster
+        FLANN_INDEX_KDTREE = 1
+        index_params = dict(algorithm=FLANN_INDEX_KDTREE, trees=5)
+        search_params = dict(checks=100)  # Increased from 50 for more thorough search
+        flann = cv2.FlannBasedMatcher(index_params, search_params)
+        matches = flann.knnMatch(desc1, desc2, k=2)
+        print("Using FLANN matcher (faster)")
+
+    # Apply Lowe's ratio test
+    good_matches = []
+    for match_pair in matches:
+        if len(match_pair) == 2:
+            m, n = match_pair
+            if m.distance < ratio_threshold * n.distance:
+                good_matches.append(m)
+
+    print(f"Good matches (ratio < {ratio_threshold}): {len(good_matches)}")
+
+    return kp1, kp2, good_matches
+
+
+def estimate_transformation(kp1, kp2, good_matches, ransac_threshold=8.0):
+    """Estimate the translation-only transformation between two sets of matched keypoints."""
+    if len(good_matches) < 1:
+        print("Not enough matches to estimate transformation")
+        return None, None
+
+    # Extract matched point coordinates
+    src_pts = np.float32([kp1[m.queryIdx].pt for m in good_matches])
+    dst_pts = np.float32([kp2[m.trainIdx].pt for m in good_matches])
+
+    # Compute translation vectors for each match
+    translations = dst_pts - src_pts
+
+    # Use RANSAC-like approach to find inliers
+    # Compute median translation as initial estimate
+    median_tx = np.median(translations[:, 0])
+    median_ty = np.median(translations[:, 1])
+    median_translation = np.array([median_tx, median_ty])
+
+    print(f"Initial median translation: ({median_tx:.2f}, {median_ty:.2f}) pixels")
+
+    # Find inliers: matches whose translation is within threshold of median
+    distances = np.sqrt(np.sum((translations - median_translation)**2, axis=1))
+    inlier_mask = distances < ransac_threshold
+
+    num_inliers = np.sum(inlier_mask)
+    print(f"Inliers: {num_inliers}/{len(good_matches)} (within {ransac_threshold:.1f} pixels)")
+
+    if num_inliers == 0:
+        print("No inliers found - all matches are inconsistent")
+        return None, None
+
+    # Compute final translation from inliers
+    inlier_translations = translations[inlier_mask]
+    mean_tx = np.mean(inlier_translations[:, 0])
+    mean_ty = np.mean(inlier_translations[:, 1])
+    std_tx = np.std(inlier_translations[:, 0])
+    std_ty = np.std(inlier_translations[:, 1])
+
+    print("\n=== Estimated Translation (Translation-Only Model) ===")
+    print(f"Translation: ({mean_tx:.2f}, {mean_ty:.2f}) pixels")
+    print(f"Std deviation: ({std_tx:.2f}, {std_ty:.2f}) pixels")
+    print(f"Translation range X: [{np.min(inlier_translations[:, 0]):.2f}, {np.max(inlier_translations[:, 0]):.2f}]")
+    print(f"Translation range Y: [{np.min(inlier_translations[:, 1]):.2f}, {np.max(inlier_translations[:, 1]):.2f}]")
+
+    # Create transformation matrix for visualization (identity + translation)
+    T = np.array([
+        [1.0, 0.0, mean_tx],
+        [0.0, 1.0, mean_ty],
+        [0.0, 0.0, 1.0]
+    ])
+
+    print("\nTranslation Matrix:")
+    print(T)
+
+    # Convert mask to column vector for compatibility with visualization
+    mask = inlier_mask.reshape(-1, 1).astype(np.uint8)
+
+    return T, mask
+
+
+def visualize_matches(img1, kp1, img2, kp2, good_matches, mask=None):
+    """Create visualization of matched keypoints."""
+    # Filter matches by mask if provided
+    if mask is not None:
+        matches_to_draw = [m for m, inlier in zip(good_matches, mask.ravel()) if inlier]
+    else:
+        matches_to_draw = good_matches
+
+    # Draw matches
+    draw_params = dict(
+        matchColor=(0, 255, 0),
+        singlePointColor=(255, 0, 0),
+        matchesMask=None,
+        flags=cv2.DrawMatchesFlags_NOT_DRAW_SINGLE_POINTS
+    )
+
+    result = cv2.drawMatches(img1, kp1, img2, kp2, matches_to_draw, None, **draw_params)
+
+    return result
+
+
+def main():
+    parser = argparse.ArgumentParser(
+        description='Perform SIFT matching on circular regions of two images',
+        formatter_class=argparse.RawDescriptionHelpFormatter,
+        epilog='''
+This script estimates TRANSLATION ONLY (no rotation or scale).
+All matched keypoints vote for the best translation vector using RANSAC.
+
+Tuning tips:
+  - More keypoints: Lower --contrast-threshold (try 0.01) and raise --edge-threshold (try 20)
+  - More matches: Increase --ratio-threshold (try 0.85-0.9)
+  - More inliers: Increase --ransac-threshold (try 10-15)
+  - Low contrast images: Use --equalize for histogram equalization
+  - Use --bfmatcher for more thorough (but slower) matching
+
+Example: python sift_circle_match.py img1.jpg img2.jpg --contrast-threshold 0.01 --ratio-threshold 0.85
+        '''
+    )
+    parser.add_argument('image1', help='Path to first image')
+    parser.add_argument('image2', help='Path to second image')
+    parser.add_argument('--center-x', type=int, default=200,
+                        help='X coordinate of circle center (default: 200)')
+    parser.add_argument('--center-y', type=int, default=200,
+                        help='Y coordinate of circle center (default: 200)')
+    parser.add_argument('--radius', type=int, default=150,
+                        help='Radius of circular region (default: 150)')
+    parser.add_argument('--output', default='sift_matches.png',
+                        help='Output image path (default: sift_matches.png)')
+
+    # SIFT tuning parameters
+    parser.add_argument('--contrast-threshold', type=float, default=0.02,
+                        help='SIFT contrast threshold - lower = more keypoints (default: 0.02, standard: 0.04)')
+    parser.add_argument('--edge-threshold', type=float, default=15,
+                        help='SIFT edge threshold - higher = more edge features (default: 15, standard: 10)')
+    parser.add_argument('--ratio-threshold', type=float, default=0.8,
+                        help='Lowe\'s ratio test threshold - higher = more matches (default: 0.8, standard: 0.7)')
+    parser.add_argument('--ransac-threshold', type=float, default=8.0,
+                        help='RANSAC threshold: max distance from median translation for inliers (default: 8.0 pixels)')
+    parser.add_argument('--bfmatcher', action='store_true',
+                        help='Use BFMatcher instead of FLANN (slower but more thorough)')
+    parser.add_argument('--equalize', action='store_true',
+                        help='Apply histogram equalization to improve contrast')
+
+    args = parser.parse_args()
+
+    # Read images
+    img1 = cv2.imread(args.image1)
+    img2 = cv2.imread(args.image2)
+
+    if img1 is None:
+        print(f"Error: Could not read image: {args.image1}")
+        sys.exit(1)
+
+    if img2 is None:
+        print(f"Error: Could not read image: {args.image2}")
+        sys.exit(1)
+
+    print(f"Image 1 size: {img1.shape[1]}x{img1.shape[0]}")
+    print(f"Image 2 size: {img2.shape[1]}x{img2.shape[0]}")
+    print(f"Circle center: ({args.center_x}, {args.center_y}), radius: {args.radius}")
+    print(f"\nSIFT Parameters:")
+    print(f"  Contrast threshold: {args.contrast_threshold}")
+    print(f"  Edge threshold: {args.edge_threshold}")
+    print(f"  Ratio threshold: {args.ratio_threshold}")
+    print(f"  RANSAC threshold: {args.ransac_threshold}")
+    print()
+
+    # Extract circular regions
+    crop1, mask1, offset1 = extract_circular_region(img1, args.center_x, args.center_y, args.radius)
+    crop2, mask2, offset2 = extract_circular_region(img2, args.center_x, args.center_y, args.radius)
+
+    # Convert to grayscale for SIFT
+    if len(crop1.shape) == 3:
+        gray1 = cv2.cvtColor(crop1, cv2.COLOR_BGR2GRAY)
+    else:
+        gray1 = crop1
+
+    if len(crop2.shape) == 3:
+        gray2 = cv2.cvtColor(crop2, cv2.COLOR_BGR2GRAY)
+    else:
+        gray2 = crop2
+
+    # Apply histogram equalization if requested
+    if args.equalize:
+        gray1 = cv2.equalizeHist(gray1)
+        gray2 = cv2.equalizeHist(gray2)
+        print("Applied histogram equalization")
+
+    # Compute SIFT matches
+    kp1, kp2, good_matches = compute_sift_matches(
+        gray1, mask1, gray2, mask2,
+        contrast_threshold=args.contrast_threshold,
+        edge_threshold=args.edge_threshold,
+        ratio_threshold=args.ratio_threshold,
+        use_bfmatcher=args.bfmatcher
+    )
+
+    if good_matches is None or len(good_matches) == 0:
+        print("\n!!! No matches found !!!")
+        print("\nTry these adjustments:")
+        print("  1. Lower --contrast-threshold to 0.01 or even 0.005")
+        print("  2. Increase --edge-threshold to 20")
+        print("  3. Increase --ratio-threshold to 0.85 or 0.9")
+        print("  4. Try --equalize for histogram equalization")
+        print("  5. Try --bfmatcher for more thorough matching")
+        sys.exit(1)
+
+    # Print suggestions if matches are low
+    if len(good_matches) < 10:
+        print("\n*** Warning: Very few matches found ***")
+        print("Consider trying:")
+        print(f"  --contrast-threshold {args.contrast_threshold / 2:.4f}")
+        print(f"  --ratio-threshold {min(0.9, args.ratio_threshold + 0.05):.2f}")
+        if not args.equalize:
+            print("  --equalize")
+        print()
+
+    # Estimate transformation
+    H, inlier_mask = estimate_transformation(kp1, kp2, good_matches,
+                                              ransac_threshold=args.ransac_threshold)
+
+    # Visualize matches
+    result = visualize_matches(crop1, kp1, crop2, kp2, good_matches, inlier_mask)
+
+    # Save result
+    cv2.imwrite(args.output, result)
+    print(f"\nVisualization saved to: {args.output}")
+    if inlier_mask is not None:
+        num_visualized = np.sum(inlier_mask)
+        print(f"Note: Visualization shows {num_visualized} inlier matches (green lines)")
+        print(f"      ({len(good_matches) - num_visualized} outliers excluded)")
+
+    # Display result
+    cv2.imshow('SIFT Matches', result)
+    print("\nPress any key to close the visualization window...")
+    cv2.waitKey(0)
+    cv2.destroyAllWindows()
+
+
+if __name__ == '__main__':
+    main()
diff --git a/SerialPrograms/Scripts/PokemonLZA/template_match.py b/SerialPrograms/Scripts/PokemonLZA/template_match.py
new file mode 100644
index 0000000000..3e68734c2d
--- /dev/null
+++ b/SerialPrograms/Scripts/PokemonLZA/template_match.py
@@ -0,0 +1,455 @@
+#!/usr/bin/env python3
+"""
+Template matching-based translation estimation for circular regions.
+Good for textured images with distinct features.
+"""
+
+import argparse
+import cv2
+import numpy as np
+import sys
+from typing import Tuple, Optional
+
+
+def create_circular_mask(image: np.ndarray, center_x: int, center_y: int, radius: int) -> np.ndarray:
+    """Create a circular mask for the image."""
+    mask = np.zeros(image.shape[:2], dtype=np.uint8)
+    cv2.circle(mask, (center_x, center_y), radius, 255, -1)
+    return mask
+
+
+def extract_circular_region(
+    image: np.ndarray,
+    center_x: int,
+    center_y: int,
+    radius: int,
+    cursor_radius: int = 0
+) -> Tuple[np.ndarray, np.ndarray]:
+    """
+    Extract a circular region from the image.
+
+    Args:
+        image: Input image
+        center_x, center_y: Center of the circular region
+        radius: Radius of the circular region
+        cursor_radius: Radius of cursor at center to mask out (0 = no cursor masking)
+    """
+    # Create mask for the circular region
+    mask = create_circular_mask(image, center_x, center_y, radius)
+
+    # Mask out the cursor at the center if requested
+    if cursor_radius > 0:
+        # Create inverse mask for cursor (black circle at center)
+        cursor_mask = create_circular_mask(image, center_x, center_y, cursor_radius)
+        # Subtract cursor from the main mask
+        mask = cv2.subtract(mask, cursor_mask)
+
+    # Apply mask
+    masked_image = cv2.bitwise_and(image, image, mask=mask)
+
+    # Crop to bounding box
+    x_min = max(0, center_x - radius)
+    x_max = min(image.shape[1], center_x + radius)
+    y_min = max(0, center_y - radius)
+    y_max = min(image.shape[0], center_y + radius)
+
+    cropped = masked_image[y_min:y_max, x_min:x_max]
+    cropped_mask = mask[y_min:y_max, x_min:x_max]
+
+    return cropped, cropped_mask
+
+
+def compute_template_match(
+    img1: np.ndarray,
+    mask1: Optional[np.ndarray],
+    img2: np.ndarray,
+    mask2: Optional[np.ndarray],
+    method: int = cv2.TM_CCOEFF_NORMED
+) -> Tuple[Tuple[float, float], float, np.ndarray]:
+    """
+    Compute translation between two images using template matching.
+
+    Args:
+        img1: Template image (grayscale)
+        img2: Source image to search in (grayscale)
+        mask1: Mask for template (0 = masked out, 255 = valid)
+        mask2: Mask for source image (0 = masked out, 255 = valid)
+        method: Template matching method (default: cv2.TM_CCOEFF_NORMED)
+
+    Returns:
+        (dx, dy): Translation in pixels (from img1 center to matched location in img2)
+        confidence: Confidence of the match (0-1, higher is better)
+        result_map: Full matching result map for visualization
+    """
+    # Convert to uint8 if needed
+    assert img1.dtype == np.uint8
+    assert img2.dtype == np.uint8
+
+    # Template matching with mask
+    # XXX
+    sub_zone_width = sub_zone_height = 30
+    sub_zone_x = 10
+    sub_zone_y = 120
+    result = cv2.matchTemplate(img2, img1[sub_zone_y:sub_zone_y+sub_zone_height, sub_zone_x:sub_zone_x+sub_zone_width], cv2.TM_SQDIFF_NORMED)
+
+    # Find the best match location
+    min_val, max_val, min_loc, max_loc = cv2.minMaxLoc(result)
+
+    # For TM_CCOEFF_NORMED and TM_CCORR_NORMED, higher values are better
+    # For TM_SQDIFF_NORMED, lower values are better
+    match_loc = min_loc
+    match_loc = (match_loc[0] - sub_zone_x, match_loc[1] - sub_zone_y)
+    confidence = 1.0 - min_val
+    print(f"Matching location: {match_loc}")
+    
+    # Calculate translation
+    # The matched location is the top-left corner where template best matches
+    # We want translation from center of img1 to center of matched region
+    h1, w1 = img1.shape[:2]
+    template_center_x = w1 // 2
+    template_center_y = h1 // 2
+
+    # Matched region center in img2
+    matched_center_x = match_loc[0] + template_center_x
+    matched_center_y = match_loc[1] + template_center_y
+
+    # Center of img2
+    h2, w2 = img2.shape[:2]
+    img2_center_x = w2 // 2
+    img2_center_y = h2 // 2
+
+    # Translation from img1 center to matched location relative to img2 center
+    dx = matched_center_x - img2_center_x
+    dy = matched_center_y - img2_center_y
+
+    return (dx, dy), confidence, result
+
+
+def visualize_template_match(
+    img1: np.ndarray,
+    img2: np.ndarray,
+    dx: float,
+    dy: float,
+    confidence: float,
+    result_map: np.ndarray,
+    mask1: Optional[np.ndarray] = None,
+    mask2: Optional[np.ndarray] = None
+) -> Tuple[np.ndarray, np.ndarray, np.ndarray]:
+    """
+    Visualize the template matching results.
+    Shows both images side by side with match location overlay.
+
+    Args:
+        img1, img2: Input images
+        dx, dy: Translation in pixels
+        confidence: Confidence score
+        result_map: Template matching result map
+        mask1, mask2: Optional masks to visualize masked regions
+    """
+    h1, w1 = img1.shape[:2]
+    h2, w2 = img2.shape[:2]
+
+    # Create side-by-side visualization
+    max_h = max(h1, h2)
+    vis = np.zeros((max_h, w1 + w2, 3), dtype=np.uint8)
+
+    # Place images
+    if len(img1.shape) == 2:
+        img1_color = cv2.cvtColor(img1, cv2.COLOR_GRAY2BGR)
+    else:
+        img1_color = img1.copy()
+
+    if len(img2.shape) == 2:
+        img2_color = cv2.cvtColor(img2, cv2.COLOR_GRAY2BGR)
+    else:
+        img2_color = img2.copy()
+
+    vis[:h1, :w1] = img1_color
+    vis[:h2, w1:w1+w2] = img2_color
+
+    # Overlay masked regions (show in red tint where mask is 0)
+    if mask1 is not None:
+        # Create a red tint overlay for masked regions
+        masked_region = mask1 == 0
+        overlay_img = vis[:h1, :w1].copy()
+        overlay_img[masked_region] = (overlay_img[masked_region].astype(float) * 0.5 + np.array([0, 0, 50])).astype(np.uint8)
+        vis[:h1, :w1] = overlay_img
+
+    if mask2 is not None:
+        # Create a red tint overlay for masked regions
+        masked_region = mask2 == 0
+        overlay_img = vis[:h2, w1:w1+w2].copy()
+        overlay_img[masked_region] = (overlay_img[masked_region].astype(float) * 0.5 + np.array([0, 0, 50])).astype(np.uint8)
+        vis[:h2, w1:w1+w2] = overlay_img
+
+    # Draw center markers
+    center1 = (w1 // 2, h1 // 2)
+    center2 = (w1 + w2 // 2, h2 // 2)
+
+    cv2.drawMarker(vis, center1, (0, 255, 0), cv2.MARKER_CROSS, 20, 2)
+    cv2.drawMarker(vis, center2, (0, 255, 0), cv2.MARKER_CROSS, 20, 2)
+
+    # Draw matched region in img2
+    # Calculate where the template matched
+    matched_center_x = w1 + w2 // 2 + int(dx)
+    matched_center_y = h2 // 2 + int(dy)
+    matched_point = (matched_center_x, matched_center_y)
+
+    # Draw the matched location
+    cv2.drawMarker(vis, matched_point, (255, 0, 255), cv2.MARKER_STAR, 20, 2)
+
+    # Draw translation vector from img2 center to matched location
+    cv2.arrowedLine(vis, center2, matched_point, (0, 0, 255), 2, tipLength=0.3)
+
+    # Add text annotations
+    font = cv2.FONT_HERSHEY_SIMPLEX
+    cv2.putText(vis, "Template (Img1)", (10, 30), font, 1, (255, 255, 255), 2)
+    cv2.putText(vis, "Source (Img2)", (w1 + 10, 30), font, 1, (255, 255, 255), 2)
+
+    # Translation info
+    info_y = h1 - 80 if h1 == max_h else max_h - 80
+    cv2.putText(vis, f"Translation: ({dx:.2f}, {dy:.2f}) px",
+                (10, info_y), font, 0.7, (0, 255, 255), 2)
+    cv2.putText(vis, f"Confidence: {confidence:.4f}",
+                (10, info_y + 30), font, 0.7, (0, 255, 255), 2)
+
+    # Create overlay visualization
+    overlay = create_overlay_visualization(img1_color, img2_color, dx, dy)
+
+    # Create heatmap visualization of template matching result
+    heatmap = create_heatmap_visualization(result_map, dx, dy, w2, h2)
+
+    return vis, overlay, heatmap
+
+
+def create_overlay_visualization(img1: np.ndarray, img2: np.ndarray, dx: float, dy: float) -> np.ndarray:
+    """
+    Create an overlay showing how well img2 aligns with img1 after translation.
+    """
+    h1, w1 = img1.shape[:2]
+    h2, w2 = img2.shape[:2]
+
+    # Create translation matrix
+    M = np.float32([[1, 0, -dx], [0, 1, -dy]])
+
+    # Warp img2 to align with img1
+    img2_aligned = cv2.warpAffine(img2, M, (w1, h1))
+
+    # Create overlay: img1 in red channel, img2_aligned in cyan
+    overlay = np.zeros((h1, w1, 3), dtype=np.uint8)
+
+    # Convert to grayscale if needed
+    if len(img1.shape) == 3:
+        gray1 = cv2.cvtColor(img1, cv2.COLOR_BGR2GRAY)
+    else:
+        gray1 = img1
+
+    if len(img2_aligned.shape) == 3:
+        gray2 = cv2.cvtColor(img2_aligned, cv2.COLOR_BGR2GRAY)
+    else:
+        gray2 = img2_aligned
+
+    # Red channel: img1
+    overlay[:, :, 2] = gray1
+    # Cyan (green + blue): img2_aligned
+    overlay[:, :, 0] = gray2
+    overlay[:, :, 1] = gray2
+
+    # Where they overlap perfectly, it will appear white/gray
+    # Where they differ, you'll see red or cyan
+
+    # Add text
+    font = cv2.FONT_HERSHEY_SIMPLEX
+    cv2.putText(overlay, "Overlay: Red=Img1, Cyan=Img2 (aligned)",
+                (10, 30), font, 0.6, (255, 255, 255), 2)
+    cv2.putText(overlay, "Perfect match = White/Gray",
+                (10, 55), font, 0.5, (255, 255, 255), 1)
+
+    return overlay
+
+
+def create_heatmap_visualization(result_map: np.ndarray, dx: float, dy: float, w2: int, h2: int) -> np.ndarray:
+    """
+    Create a heatmap visualization of the template matching result.
+    """
+    # Normalize result map to 0-255
+    norm_result = cv2.normalize(result_map, None, 0, 255, cv2.NORM_MINMAX, cv2.CV_8U)
+
+    # Apply colormap
+    heatmap = cv2.applyColorMap(norm_result, cv2.COLORMAP_JET)
+
+    # Calculate matched location
+    center2_x = w2 // 2
+    center2_y = h2 // 2
+    matched_x = int(center2_x + dx)
+    matched_y = int(center2_y + dy)
+
+    # Draw marker at best match location
+    # The result map is smaller than the source image by (template_w-1, template_h-1)
+    # So we need to adjust coordinates
+    if 0 <= matched_y < result_map.shape[0] and 0 <= matched_x < result_map.shape[1]:
+        cv2.drawMarker(heatmap, (matched_x, matched_y), (255, 255, 255),
+                      cv2.MARKER_CROSS, 20, 2)
+
+    # Add text
+    font = cv2.FONT_HERSHEY_SIMPLEX
+    cv2.putText(heatmap, "Template Match Heatmap",
+                (10, 30), font, 0.7, (255, 255, 255), 2)
+    cv2.putText(heatmap, "Brighter = Better match",
+                (10, 55), font, 0.5, (255, 255, 255), 1)
+
+    return heatmap
+
+
+def main() -> None:
+    parser = argparse.ArgumentParser(
+        description='Translation estimation using template matching on circular regions',
+        formatter_class=argparse.RawDescriptionHelpFormatter,
+        epilog='''
+Template matching is ideal for:
+  - Textured images with distinct features
+  - When images have good contrast and detail
+  - Finding specific patterns or objects
+  - Works well with local features
+
+The method slides the template over the source image and computes similarity.
+
+Use --cursor-radius to mask out a cursor or marker at the center of the circular region,
+preventing it from affecting the template matching.
+
+Available matching methods:
+  - ccoeff (default): Correlation coefficient (normalized, robust to brightness changes)
+  - ccorr: Cross-correlation (sensitive to brightness)
+  - sqdiff: Sum of squared differences (good for similar brightness)
+
+Examples:
+  python template_match.py img1.png img2.png --center-x 300 --center-y 250 --radius 200
+  python template_match.py img1.png img2.png --radius 200 --cursor-radius 20
+  python template_match.py img1.png img2.png --method ccorr
+        '''
+    )
+    parser.add_argument('image1', help='Path to first image (template)')
+    parser.add_argument('image2', help='Path to second image (source)')
+    parser.add_argument('--center-x', type=int, default=180,
+                        help='X coordinate of circle center (default: 180)')
+    parser.add_argument('--center-y', type=int, default=180,
+                        help='Y coordinate of circle center (default: 180)')
+    parser.add_argument('--radius', type=int, default=120,
+                        help='Radius of circular region (default: 120)')
+    parser.add_argument('--cursor-radius', type=int, default=20,
+                        help='Radius of cursor at center to mask out (default: 20)')
+    parser.add_argument('--output', default='template_match_result.png',
+                        help='Output image path (default: template_match_result.png)')
+    parser.add_argument('--method', choices=['ccoeff', 'ccorr', 'sqdiff'], default='ccoeff',
+                        help='Template matching method (default: ccoeff)')
+    parser.add_argument('--show-overlay', action='store_true',
+                        help='Also show overlay visualization')
+    parser.add_argument('--show-heatmap', action='store_true',
+                        help='Also show template matching heatmap')
+
+    args = parser.parse_args()
+
+    # Map method name to OpenCV constant
+    method_map = {
+        'ccoeff': cv2.TM_CCOEFF_NORMED,
+        'ccorr': cv2.TM_CCORR_NORMED,
+        'sqdiff': cv2.TM_SQDIFF_NORMED
+    }
+    method = method_map[args.method]
+
+    # Read images
+    img1 = cv2.imread(args.image1)
+    img2 = cv2.imread(args.image2)
+
+    if img1 is None:
+        print(f"Error: Could not read image: {args.image1}")
+        sys.exit(1)
+
+    if img2 is None:
+        print(f"Error: Could not read image: {args.image2}")
+        sys.exit(1)
+
+    print(f"Image 1 size: {img1.shape[1]}x{img1.shape[0]}")
+    print(f"Image 2 size: {img2.shape[1]}x{img2.shape[0]}")
+    print(f"Circle center: ({args.center_x}, {args.center_y}), radius: {args.radius}")
+    if args.cursor_radius > 0:
+        print(f"Cursor masking: radius {args.cursor_radius} pixels at center")
+    print(f"Matching method: {args.method}")
+    print()
+
+    # Extract circular regions
+    crop1, mask1 = extract_circular_region(
+        img1, args.center_x, args.center_y, args.radius, args.cursor_radius
+    )
+    crop2, mask2 = extract_circular_region(
+        img2, args.center_x, args.center_y, args.radius, args.cursor_radius
+    )
+
+    print(f"Cropped region 1 size: {crop1.shape[1]}x{crop1.shape[0]}")
+    print(f"Cropped region 2 size: {crop2.shape[1]}x{crop2.shape[0]}")
+
+    # Compute template matching
+    print("Computing template matching...")
+    (dx, dy), confidence, result_map = compute_template_match(
+        crop1, mask1, crop2, mask2, method=method
+    )
+
+    print("\n" + "="*50)
+    print("=== Translation Estimation (Template Matching) ===")
+    print("="*50)
+    print(f"Translation: ({dx:.2f}, {dy:.2f}) pixels")
+    print(f"Confidence: {confidence:.6f}")
+    print()
+    print("Interpretation:")
+    print(f"  Template (Image 1) best matches in Image 2 at offset ({dx:.2f}, {dy:.2f})")
+    print(f"  To align Image 2 with Image 1, translate by ({-dx:.2f}, {-dy:.2f})")
+    print()
+    print(f"Confidence interpretation:")
+    if confidence > 0.8:
+        print(f"  Very high confidence - excellent match")
+    elif confidence > 0.6:
+        print(f"  Good confidence - reliable match")
+    elif confidence > 0.4:
+        print(f"  Moderate confidence - acceptable match")
+    else:
+        print(f"  Low confidence - images may be very different")
+    print("="*50)
+    print()
+
+    # Visualize
+    vis, overlay, heatmap = visualize_template_match(
+        crop1, crop2, dx, dy, confidence, result_map, mask1, mask2
+    )
+
+    # Save result
+    cv2.imwrite(args.output, vis)
+    print(f"Visualization saved to: {args.output}")
+    if args.cursor_radius > 0:
+        print(f"Note: Masked regions (cursor) shown with red tint in visualization")
+
+    if args.show_overlay:
+        overlay_path = args.output.rsplit('.', 1)[0] + '_overlay.png'
+        cv2.imwrite(overlay_path, overlay)
+        print(f"Overlay visualization saved to: {overlay_path}")
+
+    if args.show_heatmap:
+        heatmap_path = args.output.rsplit('.', 1)[0] + '_heatmap.png'
+        cv2.imwrite(heatmap_path, heatmap)
+        print(f"Heatmap visualization saved to: {heatmap_path}")
+
+    # Display result
+    cv2.imshow('Template Matching - Translation', vis)
+
+    if args.show_overlay:
+        cv2.imshow('Overlay Visualization', overlay)
+
+    if args.show_heatmap:
+        cv2.imshow('Match Heatmap', heatmap)
+
+    print("\nPress any key to close the visualization window...")
+    cv2.waitKey(0)
+    cv2.destroyAllWindows()
+
+
+if __name__ == '__main__':
+    main()
diff --git a/SerialPrograms/Scripts/TextProcessing/convert_display_name_list_to_json.py b/SerialPrograms/Scripts/TextProcessing/convert_display_name_list_to_json.py
new file mode 100644
index 0000000000..d644b5ded3
--- /dev/null
+++ b/SerialPrograms/Scripts/TextProcessing/convert_display_name_list_to_json.py
@@ -0,0 +1,106 @@
+#!/usr/bin/env python3
+"""
+Convert a display name txt file to a JSON slug list.
+Each line of the txt file is converted to a lowercase slug format.
+
+The display name txt file format is one line per item name.
+"""
+
+import argparse
+import json
+import re
+import unicodedata
+from pathlib import Path
+
+
+def normalize_display_name(name: str) -> str:
+    """
+    Convert a display name to a slug format.
+    - Converts to lowercase
+    - Removes accents/diacritics
+    - Non-alphanumeric characters become hyphens
+    """
+    # Remove accents and normalize unicode characters
+    # NFD = Canonical Decomposition
+    nfd = unicodedata.normalize('NFD', name)
+    # Filter out combining characters (accents)
+    name_no_accents = ''.join(char for char in nfd if unicodedata.category(char) != 'Mn')
+
+    # Convert to lowercase
+    slug = name_no_accents.lower()
+
+    # Replace non-alphanumeric characters with hyphens
+    # Keep only letters, numbers, and convert everything else to hyphen
+    slug = re.sub(r'[^a-z0-9]+', '-', slug)
+
+    # Remove leading/trailing hyphens
+    slug = slug.strip('-')
+
+    return slug
+
+
+def main(input_txt: Path, output_json: Path):
+    """
+    Convert display names from txt file to JSON slugs.
+
+    Args:
+        input_txt: Path to input text file with display names (one per line)
+        output_json: Path to output JSON file
+    """
+
+    # Read the input txt file and convert names
+    display_name_slugs = []
+
+    with open(input_txt, 'r', encoding='utf-8') as f:
+        for line_num, line in enumerate(f, 1):
+            line = line.strip()
+            if not line:
+                continue
+
+            # Display name is the entire line
+            display_name = line
+
+            # Convert to slug
+            slug = normalize_display_name(display_name)
+
+            display_name_slugs.append(slug)
+            print(f"{display_name} -> {slug}")
+
+    # Report results
+    print(f"\n{'='*60}")
+    print(f"Total items processed: {len(display_name_slugs)}")
+
+    # Write output JSON
+    with open(output_json, 'w', encoding='utf-8') as f:
+        json.dump(display_name_slugs, f, indent=4, ensure_ascii=False)
+
+    print(f"\n✓ Output written to: {output_json}")
+    print(f"  Total entries: {len(display_name_slugs)}")
+
+
+if __name__ == "__main__":
+    parser = argparse.ArgumentParser(
+        description="Convert display name txt file to JSON slug list.",
+        formatter_class=argparse.RawDescriptionHelpFormatter,
+        epilog="""
+Example usage:
+  %(prog)s input.txt output.json
+  %(prog)s items.txt items-slugs.json
+        """
+    )
+
+    parser.add_argument(
+        'input_txt',
+        type=Path,
+        help='Input text file with display names (one per line)'
+    )
+
+    parser.add_argument(
+        'output_json',
+        type=Path,
+        help='Output JSON file to save the slug list'
+    )
+
+    args = parser.parse_args()
+
+    main(args.input_txt, args.output_json)
diff --git a/SerialPrograms/Scripts/TextProcessing/convert_pokemon_txt_to_json.py b/SerialPrograms/Scripts/TextProcessing/convert_pokemon_txt_to_json.py
new file mode 100644
index 0000000000..df62bd3958
--- /dev/null
+++ b/SerialPrograms/Scripts/TextProcessing/convert_pokemon_txt_to_json.py
@@ -0,0 +1,137 @@
+#!/usr/bin/env python3
+"""
+Convert a Pokemon name txt file to a JSON slug list.
+Each line of the txt file is converted to a lowercase slug and validated against
+the National Pokedex database.
+
+The pokemon name txt file format is one line per pokemon name.
+Its content can be downloaded from a site like Serebii.
+"""
+
+import argparse
+import json
+import re
+import unicodedata
+from pathlib import Path
+
+
+def normalize_pokemon_name(name: str) -> str:
+    """
+    Convert a Pokemon name to a slug format.
+    - Converts to lowercase
+    - Removes accents/diacritics
+    - Handles special characters
+    """
+    # Remove accents and normalize unicode characters
+    # NFD = Canonical Decomposition
+    nfd = unicodedata.normalize('NFD', name)
+    # Filter out combining characters (accents)
+    name_no_accents = ''.join(char for char in nfd if unicodedata.category(char) != 'Mn')
+
+    # Convert to lowercase
+    slug = name_no_accents.lower()
+
+    # Handle special cases
+    # Replace apostrophes with '-d' for Farfetch'd and Sirfetch'd
+    slug = slug.replace("'d", "-d")
+
+    # Replace periods and spaces with hyphens for Mr. Mime, Mime Jr., Mr. Rime
+    slug = slug.replace(". ", "-")  # Handle "Mr. " -> "mr-"
+    slug = slug.replace(" ", "-")   # Handle remaining spaces
+    slug = slug.rstrip(".")         # Remove trailing periods (e.g., "mime-jr." -> "mime-jr")
+
+    return slug
+
+
+def main(input_txt: Path, database_json: Path, output_json: Path):
+    """
+    Convert Pokemon names from txt file to JSON slugs.
+
+    Args:
+        input_txt: Path to input text file with Pokemon names (one per line)
+        database_json: Path to National Pokedex JSON database for validation
+        output_json: Path to output JSON file
+    """
+
+    # Load the National Pokedex database
+    with open(database_json, 'r', encoding='utf-8') as f:
+        national_pokedex = json.load(f)
+
+    # Convert to set for faster lookup
+    national_pokedex_set = set(national_pokedex)
+
+    # Read the input txt file and convert names
+    pokemon_slugs = []
+    not_found = []
+
+    with open(input_txt, 'r', encoding='utf-8') as f:
+        for line_num, line in enumerate(f, 1):
+            line = line.strip()
+            if not line:
+                continue
+
+            # Pokemon name is the entire line
+            pokemon_name = line
+
+            # Convert to slug
+            slug = normalize_pokemon_name(pokemon_name)
+
+            # Validate against database
+            if slug in national_pokedex_set:
+                pokemon_slugs.append(slug)
+                print(f"✓ {pokemon_name} -> {slug}")
+            else:
+                not_found.append((pokemon_name, slug))
+                print(f"✗ {pokemon_name} -> {slug} (NOT FOUND in database)")
+
+    # Report results
+    print(f"\n{'='*60}")
+    print(f"Total Pokemon processed: {len(pokemon_slugs) + len(not_found)}")
+    print(f"Successfully validated: {len(pokemon_slugs)}")
+    print(f"Not found in database: {len(not_found)}")
+
+    if not_found:
+        print(f"\nPokemon not found in database:")
+        for name, slug in not_found:
+            print(f"  - {name} ({slug})")
+
+    # Write output JSON
+    with open(output_json, 'w', encoding='utf-8') as f:
+        json.dump(pokemon_slugs, f, indent=4, ensure_ascii=False)
+
+    print(f"\n✓ Output written to: {output_json}")
+    print(f"  Total entries: {len(pokemon_slugs)}")
+
+
+if __name__ == "__main__":
+    parser = argparse.ArgumentParser(
+        description="Convert Pokemon name txt file to JSON slug list.",
+        formatter_class=argparse.RawDescriptionHelpFormatter,
+        epilog="""
+Example usage:
+  %(prog)s input.txt Pokedex-National.json output.json
+  %(prog)s Pokedex-Lumiose.txt Pokedex-National.json Pokedex-Lumiose.json
+        """
+    )
+
+    parser.add_argument(
+        'input_txt',
+        type=Path,
+        help='Input text file with Pokemon names (one per line)'
+    )
+
+    parser.add_argument(
+        'database_json',
+        type=Path,
+        help='National Pokedex JSON database file for slug validation'
+    )
+
+    parser.add_argument(
+        'output_json',
+        type=Path,
+        help='Output JSON file to save the slug list'
+    )
+
+    args = parser.parse_args()
+
+    main(args.input_txt, args.database_json, args.output_json)
diff --git a/SerialPrograms/Scripts/add_new_file.py b/SerialPrograms/Scripts/add_new_file.py
index 46be0f3414..a76e97d6d2 100755
--- a/SerialPrograms/Scripts/add_new_file.py
+++ b/SerialPrograms/Scripts/add_new_file.py
@@ -1,152 +1,106 @@
-#!/usr/bin/python3
-
-"""
-Add a new file to CMakeList.txt and SerialPrograms.pro
-
-Usage: python3 add_new_file.py <path to new file relative to Arduino-Source/
-
-The script will try to find the root code folder "Arduino-Source/" from the path of the current directory
-where this script is executed.
-
-Then it will add the new file path (as the input parameter of this program) to proper places in CMakeList.txt
-and SerialPrograms.pro.
-"""
-
-import sys
-import os
-
-from typing import List, Tuple
-
-# Target path for the new flie, like 
-target_path = ""
-if len (sys.argv) > 1:
-	target_path = sys.argv[1]
-
-# Sanitize target path:
-SerialPrograms_prefix = "SerialPrograms/"
-if target_path.startswith(SerialPrograms_prefix):
-	target_path = target_path[len(SerialPrograms_prefix):]
-Common_prefix = "Common/"
-if target_path.startswith(Common_prefix) or target_path.startswith("ClientSource") or target_path.startswith("3rdParty"):
-	target_path = "../" + target_path
-
-cur_folder_path = os.path.abspath(os.getcwd())
-
-# print(cur_folder_path)
-
-split_path = cur_folder_path.split(os.sep)
-
-code_root_pos = split_path.index('Arduino-Source')
-code_root_path = os.sep.join(split_path[0:code_root_pos+1])
-# print(code_root_path)
-
-# My local code root path is /Users/<username>/games/pokemon/git/Arduino-Source
-
-
-def read_lines(file_path: str) -> List[str]:
-	with open(file_path, "r") as f:
-		file_lines = f.readlines()
-	file_lines = [line.rstrip() for line in file_lines]
-	return file_lines
-
-def get_code_file_range(file_lines: List[str], starting_line: str, ending_line: str) -> Tuple[int, int]:
-	"""
-	...
-	<starting_line>
-	code_line_1.cpp
-	code_line_2.cpp
-	<endling_line>
-	...
-
-	Return the tuple of indices (start, end) in the input `file_lines` so that code lines can be found
-	by file_lines[start:end]
-	"""
-	code_file_list_start_pos = file_lines.index(starting_line) + 1
-	code_file_list_end_pos = code_file_list_start_pos
-	for line_no in range(code_file_list_start_pos, len(file_lines)):
-		line = file_lines[line_no]
-		if line == ending_line:
-			code_file_list_end_pos = line_no
-			break
-	return code_file_list_start_pos, code_file_list_end_pos
-
-
-
-cmakelists_path = code_root_path + os.sep + "SerialPrograms" + os.sep + "CMakeLists.txt"
-pro_path = code_root_path + os.sep + "SerialPrograms" + os.sep + "SerialPrograms.pro"
-
-file_lines = read_lines(cmakelists_path)
-
-code_file_start, code_file_end = get_code_file_range(file_lines, "file(GLOB MAIN_SOURCES", ")")
-code_file_lines = set(file_lines[code_file_start:code_file_end])
-
-# Add new file
-if len(target_path) > 0:
-	code_file_lines.add("    " + target_path)
-
-code_file_lines = list(code_file_lines)
-code_file_lines.sort()
-
-# print(f"\"{code_file_lines[0]}\"")
-
-file_lines = file_lines[0:code_file_start] + code_file_lines + file_lines[code_file_end:]
-file_lines = [line + "\r\n" for line in file_lines]
-
-with open(cmakelists_path, "w") as f:
-	f.writelines(file_lines)
-
-
-file_lines = read_lines(pro_path)
-
-# print("\n".join(file_lines[0:70]))
-
-# lines = [line for line in file_lines if line.startswith("SOURCES")]
-# print(lines)
-
-
-def process_pro_lines(file_lines: List[str], starting_line: str, new_path: str) -> List[str]:
-
-	code_file_start, code_file_end = get_code_file_range(file_lines, starting_line, "")
-	# print(code_file_start, code_file_end)
-	# print(f"Starting line {file_lines[code_file_start]}")
-
-	code_file_lines = file_lines[code_file_start:code_file_end]
-
-	code_file_lines = [ line[0:-1].rstrip() if line.endswith("\\") else line for line in code_file_lines]
-
-	if len(new_path) > 0:
-		code_file_lines.append("    " + new_path)
-
-	# Remove duplicates and sort
-	code_file_lines = list(set(code_file_lines))
-	code_file_lines.sort()
-
-	# Add back " \\":
-	code_file_lines = [line + " \\" for line in code_file_lines]
-	code_file_lines[-1] = code_file_lines[-1][0:-2]
-
-	# print("\n".join(code_file_lines[0:10]))
-
-	file_lines = file_lines[0:code_file_start] + code_file_lines + file_lines[code_file_end:]
-
-	return file_lines
-
-if target_path.endswith(".cpp"):
-	file_lines = process_pro_lines(file_lines, "SOURCES += \\", target_path)
-elif target_path.endswith(".h") or target_path.endswith(".tpp"):
-	file_lines = process_pro_lines(file_lines, "HEADERS += \\", target_path)
-else:
-	file_lines = process_pro_lines(file_lines, "SOURCES += \\", "")
-	file_lines = process_pro_lines(file_lines, "HEADERS += \\", "")
-
-# print("\n".join(file_lines[0:30]))
-
-# Add back CRLF
-file_lines = [line + "\r\n" for line in file_lines]
-
-with open(pro_path, "w") as f:
-	f.writelines(file_lines)
-
-
-
-
+#!/usr/bin/python3
+
+"""
+Add a new file to SourceFiles.cmake, the CMake file that sets all code paths
+
+Usage: python3 add_new_file.py <path to new file relative to Arduino-Source/
+
+The script will try to find the root code folder "Arduino-Source/" from the path of the current directory
+where this script is executed.
+
+Then it will add the new file path (as the input parameter of this program) to proper places in SourceFiles.cmake.
+
+Example usage:
+python3 add_new_file.py Source/PokemonSV/Inference/Map/PokemonSV_MapFlyMenuDetectorDetector.h
+python3 add_new_file.py ../Common/Cpp/Color.cpp
+"""
+
+import sys
+import os
+
+from typing import List, Tuple
+
+# Target path for the new flie, like 
+target_path = ""
+if len (sys.argv) > 1:
+	target_path = sys.argv[1]
+	print(f"Adding a new file path {target_path}")
+
+# Sanitize target path:
+SerialPrograms_prefix = "SerialPrograms/"
+if target_path.startswith(SerialPrograms_prefix):
+	target_path = target_path[len(SerialPrograms_prefix):]
+Common_prefix = "Common/"
+if target_path.startswith(Common_prefix) or target_path.startswith("ClientSource") or target_path.startswith("3rdParty"):
+	target_path = "../" + target_path
+
+cur_folder_path = os.path.abspath(os.getcwd())
+
+# print(cur_folder_path)
+
+split_path = cur_folder_path.split(os.sep)
+
+code_root_pos = split_path.index('Arduino-Source')
+code_root_path = os.sep.join(split_path[0:code_root_pos+1])
+# print(code_root_path)
+
+
+def read_lines(file_path: str) -> List[str]:
+	with open(file_path, "r") as f:
+		file_lines = f.readlines()
+	file_lines = [line.rstrip() for line in file_lines]
+	return file_lines
+
+def get_code_file_range(file_lines: List[str], starting_line: str, ending_line: str) -> Tuple[int, int]:
+	"""
+	...
+	<starting_line>
+	code_line_1.cpp
+	code_line_2.cpp
+	<endling_line>
+	...
+
+	Return the tuple of indices (start, end) in the input `file_lines` so that code lines can be found
+	by file_lines[start:end]
+	"""
+	code_file_list_start_pos = file_lines.index(starting_line) + 1
+	code_file_list_end_pos = code_file_list_start_pos
+	for line_no in range(code_file_list_start_pos, len(file_lines)):
+		line = file_lines[line_no]
+		if line == ending_line:
+			code_file_list_end_pos = line_no
+			break
+	return code_file_list_start_pos, code_file_list_end_pos
+
+
+
+cmake_file_path = os.path.join(code_root_path, "SerialPrograms", "cmake", "SourceFiles.cmake")
+print(f"SourceFiles.cmake path: {cmake_file_path}")
+
+file_lines = read_lines(cmake_file_path)
+old_file_lines = file_lines
+
+code_file_start, code_file_end = get_code_file_range(file_lines, "file(GLOB LIBRARY_SOURCES", ")")
+code_file_lines = set(file_lines[code_file_start:code_file_end])
+old_num_code_files = len(code_file_lines)
+print(f"{old_num_code_files} lines from SourceFiles.cmake are for code file paths")
+
+# Add new file
+if len(target_path) > 0:
+	code_file_lines.add("    " + target_path)
+
+code_file_lines = list(code_file_lines)
+code_file_lines.sort()
+if len(target_path) > 0 and len(code_file_lines) == old_num_code_files:
+	print("Warning: you are adding an existing file! The added file is ignored")
+
+# print(f"\"{code_file_lines[0]}\"")
+
+file_lines = file_lines[0:code_file_start] + code_file_lines + file_lines[code_file_end:]
+file_lines = [line + "\r\n" for line in file_lines]
+with open(cmake_file_path, "w") as f:
+	f.writelines(file_lines)
+print(f"Writed changes back to {cmake_file_path}")
+
+
+
diff --git a/SerialPrograms/Scripts/build_code_from_template.py b/SerialPrograms/Scripts/build_code_from_template.py
new file mode 100644
index 0000000000..a3fa9032db
--- /dev/null
+++ b/SerialPrograms/Scripts/build_code_from_template.py
@@ -0,0 +1,145 @@
+#!Python3
+
+"""
+Build C++ code from a template file.
+
+This is used to remove the manual work of creating boilerplate code like visual detector classes.
+
+Example usage:
+
+- python3 build_code_from_template.py VisualDetector PokemonSV Map PokeCenter Icon
+  Generates PokemonSV_MapPokeCenterIconDetector.h and PokemonSV_MapPokeCenterIconDetector.cpp.
+- python3 build_code_from_template.py Program PokemonSV Auto Story
+  Generates PokemonSV_AutoStory.h and PokemonSV_AutoStory.cpp.
+"""
+
+import sys
+import os
+
+from typing import Dict, List
+
+
+def apply_line_replacement(line: str, mapping: Dict[str, str]) -> str:
+	for source, target in mapping.items():
+		line = line.replace(source, target)
+	return line
+
+
+def build_file_from_template(
+	mapping: Dict[str, str],
+	template_folder: str,
+	template_filename: str,
+) -> None:
+	"""
+	generate a file from a template file by mapping: template str -> target str
+	The file is saved at the current working dir.
+	"""
+
+	file_ext: str = template_filename.split('.')[-1]
+	template_filepath: str = os.path.join(template_folder, template_filename)
+
+	target_filename: str = apply_line_replacement(template_filename, mapping)
+
+	with open(template_filepath, "r") as f:
+		lines = f.readlines()
+	lines = [apply_line_replacement(line, mapping) for line in lines]
+	
+	with open(target_filename, "w", newline='\r\n') as f:
+		f.writelines(lines)
+
+	print(f"Saved template {file_ext} file to {target_filename}")
+
+
+def build_files_from_templates(
+	mapping: Dict[str, str],
+	template_folder: str,
+	template_filenames: List[str],
+) -> None:
+	"""
+	generate files from template files by a mapping: template str -> target str
+	The files are saved at the current working dir.
+	"""
+
+	for filename in template_filenames:
+		build_file_from_template(
+			mapping=mapping,
+			template_folder=template_folder,
+			template_filename=filename,
+		)
+
+
+def create_cpp_class_name(name: str) -> str:
+	"""
+	Given a name (e.g. "Three-Segment Dudunsparce Finder"), convert it into a C++ class name (like "ThreeSegmentDudunsparceFinder")
+	"""
+	return name.replace(" ", "").replace("-", "").replace("_", "")
+
+
+if len(sys.argv) == 1:
+	print(
+		"Usage:\n"
+		f"python3 {sys.argv[0]} VisualDetector PokemonSV Map PokeCenter Icon"
+		"  - Generates PokemonSV_MapPokeCenterIconDetector.h and PokemonSV_MapPokeCenterIconDetector.cpp"
+	)
+	exit(0)
+
+cur_folder_path = os.path.abspath(os.getcwd())
+
+split_path = cur_folder_path.split(os.sep)
+
+code_root_pos = split_path.index('Arduino-Source')
+code_root_path = os.sep.join(split_path[0:code_root_pos+1])
+
+print(f"Found code root folder: {code_root_path}")
+
+template_folder = os.path.join(code_root_path, "SerialPrograms", "Scripts", "CodeTemplates")
+print(f"Template folder: {template_folder}")
+
+template_folder = os.path.join(template_folder, sys.argv[1])
+
+if sys.argv[1] == "VisualDetector":
+	assert len(sys.argv) >= 4
+	game_name = sys.argv[2]  # e.g. "PokemonSV"
+	object_name = " ".join(sys.argv[3:])  # e.g. "Map PokeCenter Icon"
+	print(f"Building a visual detector for object {object_name} in game {game_name}.")
+
+	mapping = {
+		"GameName": game_name,
+		"Object Name": object_name,
+		"ObjectName": create_cpp_class_name(object_name)
+	}
+
+	build_files_from_templates(
+		mapping=mapping,
+		template_folder=template_folder,
+		template_filenames=[
+			"GameName_ObjectNameDetector.h",
+			"GameName_ObjectNameDetector.cpp",
+		]
+	)
+elif sys.argv[1] == "Program":
+	assert len(sys.argv) >= 4
+	game_name = sys.argv[2]  # e.g. "PokemonSV"
+	program_name = " ".join(sys.argv[3:])  # e.g. "Auto Story"
+	print(f"Building a Program with name {program_name} in game {game_name}.")
+
+	mapping = {
+		"GameName": game_name,
+		"Program Name": program_name,
+		"ProgramName": create_cpp_class_name(program_name)
+	}
+
+	build_files_from_templates(
+		mapping=mapping,
+		template_folder=template_folder,
+		template_filenames=[
+			"GameName_ProgramName.h",
+			"GameName_ProgramName.cpp",
+		]
+	)
+
+
+
+
+
+
diff --git a/SerialPrograms/Scripts/check_detector_regions.py b/SerialPrograms/Scripts/check_detector_regions.py
index b485586d7a..7af0df94a7 100755
--- a/SerialPrograms/Scripts/check_detector_regions.py
+++ b/SerialPrograms/Scripts/check_detector_regions.py
@@ -1,247 +1,394 @@
-#!/usr/local/bin/python3
-
-"""
-A script used to fine-tune detection box placements and check the color stats from those boxes.
-After using image_viewer.py to get an intial box placement, you can place the box values
-(x, y, width, height) into this script, repeating the line
-add_infer_box_to_image(raw_image, <x>, <y>, <width>, <height>, image) 
-to add a box onto the image.
-
-In the end of the script, it will call ImageViewer to render the image, with boxes added.
-You can inspect the boxes to fine tune their positions.
-"""
-
-import cv2
-import sys
-import numpy as np
-from typing import Tuple
-from dataclasses import dataclass
-
-from image_viewer import ImageViewer
-from image_region_check import RegionCheck, add_rect, add_infer_box_to_image
-
-
-assert len(sys.argv) == 2
-
-filename = sys.argv[1]
-
-image = cv2.imread(filename)
-height = image.shape[0]
-width = image.shape[1]
-print(f"Size: {width} x {height}")
-
-raw_image = image.copy()
-
-# ==================================================================
-# LA map weather symbol
-# add_infer_box_to_image(raw_image, 0.028, 0.069, 0.025, 0.044, image)
-
-# ==================================================================
-# LA mult-pokemon battle sprite arrow
-# for i in range(8):
-# 	loc = (0.936 - 0.035*i, 0.018, 0.015, 0.027)
-# 	add_infer_box_to_image(raw_image, *loc, image)
-
-# ==================================================================
-# LA battle sprite locations
-# for i in range(8):
-# 	loc = (0.957 - 0.035*i, 0.044, 0.021, 0.035)
-# 	add_infer_box_to_image(raw_image, *loc, image)
-
-# ==================================================================
-# LA battle + details pokemon info
-# add_infer_box_to_image(raw_image, 0.726, 0.133, 0.015, 0.023, image)
-# add_infer_box_to_image(raw_image, 0.750, 0.133, 0.015, 0.023, image)
-# add_infer_box_to_image(raw_image, 0.777, 0.138, 0.001, 0.015, image)
-# add_infer_box_to_image(raw_image, 0.525, 0.130, 0.100, 0.038, image)
-
-# ==================================================================
-# LA wild pokemon focus reading pokemon info
-# add_infer_box_to_image(raw_image, 0.108, 0.868, 0.135, 0.037, image)
-# add_infer_box_to_image(raw_image, 0.307, 0.873, 0.016, 0.030, image)
-# add_infer_box_to_image(raw_image, 0.307, 0.920, 0.016, 0.029, image)
-# add_infer_box_to_image(raw_image, 0.324, 0.868, 0.023, 0.04, image)
-# add_infer_box_to_image(raw_image, 0.244, 0.815, 0.026, 0.047, image)
-
-
-# ==================================================================
-# LA wild pokemon focus 
-# add_infer_box_to_image(raw_image, 0.109, 0.857, 0.24, 0.012, image)
-# add_infer_box_to_image(raw_image, 0.109, 0.949, 0.24, 0.012, image)
-# add_infer_box_to_image(raw_image, 0.102, 0.875, 0.007, 0.073, image)
-# add_infer_box_to_image(raw_image, 0.348, 0.873, 0.007, 0.073, image)
-
-# ==================================================================
-# LA battle start boundary lines
-# add_infer_box_to_image(raw_image, 0.0, 0.113, 1.0, 0.015, image)
-# add_infer_box_to_image(raw_image, 0.2, 0.871, 0.63, 0.015, image)
-
-
-# ==================================================================
-# LA map mission tab raised detection
-# add_infer_box_to_image(raw_image, 0.9235, 0.617, 0.003, 0.019, image)
-# add_infer_box_to_image(raw_image, 0.937, 0.62, 0.0035, 0.012, image)
-
-# ==================================================================
-# LA map zoom
-# add_infer_box_to_image(raw_image, 0.780, 0.085, 0.008, 0.014, image)
-# add_infer_box_to_image(raw_image, 0.795, 0.082, 0.010, 0.019, image)
-# add_infer_box_to_image(raw_image, 0.807, 0.081, 0.014, 0.022, image)
-
-# ==================================================================
-# LA MMO Map question mark locations
-# add_infer_box_to_image(raw_image, 0.362, 0.670, 0.045, 0.075, image)
-# add_infer_box_to_image(raw_image, 0.683, 0.555, 0.039, 0.076, image)
-# add_infer_box_to_image(raw_image, 0.828, 0.372, 0.042, 0.082, image)
-# add_infer_box_to_image(raw_image, 0.485, 0.440, 0.044, 0.080, image)
-# add_infer_box_to_image(raw_image, 0.393, 0.144, 0.050, 0.084, image)
-
-# ==================================================================
-# LA Map location detector
-# add_infer_box_to_image(raw_image, 0.252, 0.400, 0.025, 0.150, image)
-# add_infer_box_to_image(raw_image, 0.415, 0.550, 0.025, 0.150, image)
-# add_infer_box_to_image(raw_image, 0.750, 0.570, 0.025, 0.150, image)
-# add_infer_box_to_image(raw_image, 0.865, 0.240, 0.025, 0.150, image)
-# add_infer_box_to_image(raw_image, 0.508, 0.320, 0.025, 0.150, image)
-# add_infer_box_to_image(raw_image, 0.457, 0.060, 0.025, 0.150, image)
-# add_infer_box_to_image(raw_image, 0.635, 0.285, 0.025, 0.150, image)
-
-
-# ==================================================================
-# LA dropped items detection
-# add_infer_box_to_image(raw_image, 0.030, 0.177, 0.020, 0.038, image)
-# add_infer_box_to_image(raw_image, 0.030, 0.225, 0.020, 0.038, image)
-# add_infer_box_to_image(raw_image, 0.050, 0.177, 0.200, 0.038, image)
-# add_infer_box_to_image(raw_image, 0.050, 0.177, 0.055, 0.038, image) # MMO ??????
-
-# ==================================================================
-# LA dropped items detection
-# add_infer_box_to_image(raw_image, 0.439, 0.819, 0.029, 0.059, image)
-
-# add_infer_box_to_image(raw_image, 0.031, 0.900, 0.024, 0.017, image)
-# add_infer_box_to_image(raw_image, 0.026, 0.743, 0.021, 0.038, image)
-# add_infer_box_to_image(raw_image, 0.022, 0.581, 0.020, 0.018, image)
-# add_infer_box_to_image(raw_image, 0.152, 0.482, 0.017, 0.040, image)
-# add_infer_box_to_image(raw_image, 0.016, 0.218, 0.018, 0.021, image)
-# add_infer_box_to_image(raw_image, 0.169, 0.103, 0.024, 0.036, image)
-# add_infer_box_to_image(raw_image, 0.815, 0.244, 0.026, 0.026, image)
-# add_infer_box_to_image(raw_image, 0.737, 0.126, 0.045, 0.056, image)
-# add_infer_box_to_image(raw_image, 0.806, 0.431, 0.043, 0.026, image)
-# add_infer_box_to_image(raw_image, 0.827, 0.507, 0.023, 0.028, image)
-# add_infer_box_to_image(raw_image, 0.747, 0.603, 0.087, 0.086, image)
-# add_infer_box_to_image(raw_image, 0.885, 0.653, 0.041, 0.093, image)
-# add_infer_box_to_image(raw_image, 0.934, 0.556, 0.039, 0.038, image)
-# add_infer_box_to_image(raw_image, 0.761, 0.913, 0.071, 0.051, image)
-# add_infer_box_to_image(raw_image, 0.865, 0.098, 0.022, 0.030, image)
-# add_infer_box_to_image(raw_image, 0.202, 0.631, 0.057, 0.075, image)
-# add_infer_box_to_image(raw_image, 0.099, 0.265, 0.072, 0.070, image)
-# add_infer_box_to_image(raw_image, 0.908, 0.313, 0.020, 0.017, image)
-
-# ==================================================================
-# LA black out detection
-# add_infer_box_to_image(raw_image, 0.068, 0.088, 0.864, 0.581, image)
-# add_infer_box_to_image(raw_image, 0.720, 0.842, 0.028, 0.051, image)
-
-
-# ==================================================================
-# LA Transparent Dialogue Yellow arrow detection
-# add_infer_box_to_image(raw_image, 0.720, 0.759, 0.049, 0.128, image)
-
-# ==================================================================
-# LA Dialogue Ellipse detection
-# add_infer_box_to_image(raw_image, 0.741, 0.811, 0.028, 0.023, image)
-
-# ==================================================================
-# LA Tenacity path menu
-# add_infer_box_to_image(raw_image, 0.56, 0.46, 0.33, 0.27, image)
-
-# ==================================================================
-# LA wild pokemon name in focus
-# add_infer_box_to_image(raw_image, 0.11, 0.868, 0.135, 0.043, image)
-
-# ==================================================================
-# LA camp dialogue box
-# add_infer_box_to_image(raw_image, 0.741, 0.811, 0.028, 0.023, image)
-
-# ==================================================================
-# LA item compatibility
-# add_infer_box_to_image(raw_image, 0.838, 0.1815, 0.090, 0.024, image)
-
-# ==================================================================
-# LA battle move image match
-# for i in range(4):
-	# add_infer_box_to_image(raw_image, 0.66 - i * 0.0205, 0.622 + i * 0.0655, 0.25, 0.032, image)
-
-# ==================================================================
-# LA Ingo battle initial dialogue selection
-# add_infer_box_to_image(raw_image, 0.50, 0.350, 0.40, 0.400, image)
-# add_infer_box_to_image(raw_image, 0.50, 0.350, 0.40, 0.400, image)
-
-
-# ==================================================================
-# LA battle pokemon switch
-# add_infer_box_to_image(raw_image, 0.641, 0.178, 0.050, 0.023, image)
-# add_infer_box_to_image(raw_image, 0.641, 0.248, 0.050, 0.023, image)
-# add_infer_box_to_image(raw_image, 0.517, 0.195, 0.011, 0.061, image)
-# add_infer_box_to_image(raw_image, 0.924, 0.185, 0.019, 0.076, image)
-
-# add_infer_box_to_image(raw_image, 0.540, 0.216, 0.016, 0.018, image)
-# add_infer_box_to_image(raw_image, 0.676, 0.216, 0.016, 0.018, image)
-
-# add_infer_box_to_image(raw_image, 0.044, 0.091, 0.043, 0.077, image)
-
-
-# ==================================================================
-# LA battle move selection
-# for i in range(4):
-	# add_infer_box_to_image(raw_image, 0.8 - i * 0.021, 0.622 + i * 0.0655, 0.02, 0.032, image)
-
-# ==================================================================
-# LA battle menu
-# add_infer_box_to_image(raw_image, 0.056, 0.948, 0.013, 0.020, image)
-# add_infer_box_to_image(raw_image, 0.174, 0.948, 0.032, 0.046, image)
-
-# ==================================================================
-# LA normal opaque dialogue
-# add_infer_box_to_image(raw_image, 0.278, 0.712, 0.100, 0.005, image)
-# add_infer_box_to_image(raw_image, 0.278, 0.755, 0.100, 0.005, image)
-# add_infer_box_to_image(raw_image, 0.259, 0.715, 0.003, 0.043, image)
-# add_infer_box_to_image(raw_image, 0.390, 0.715, 0.003, 0.043, image)
-
-# add_infer_box_to_image(raw_image, 0.500, 0.750, 0.200, 0.020, image)
-# add_infer_box_to_image(raw_image, 0.400, 0.895, 0.200, 0.020, image)
-# add_infer_box_to_image(raw_image, 0.230, 0.805, 0.016, 0.057, image)
-# add_infer_box_to_image(raw_image, 0.755, 0.805, 0.016, 0.057, image)
-
-# ==================================================================
-# LA normal surprise dialogue
-# add_infer_box_to_image(raw_image, 0.295, 0.722, 0.100, 0.005, image)
-# add_infer_box_to_image(raw_image, 0.295, 0.765, 0.100, 0.005, image)
-
-# add_infer_box_to_image(raw_image, 0.500, 0.760, 0.200, 0.020, image)
-# add_infer_box_to_image(raw_image, 0.400, 0.900, 0.200, 0.020, image)
-# add_infer_box_to_image(raw_image, 0.720, 0.855, 0.030, 0.060, image)
-
-# ==================================================================
-# Pokemon Home Box Sorting
-
-# , m_box_sprite(console, {0.228, 0.095, 0.030, 0.049}) // ball
-# ImageFloatBox GENDER_BOX{0.417, 0.097, 0.031, 0.046}; // gender
-
-# add_infer_box_to_image(raw_image, 0.495, 0.0045, 0.01, 0.005, image) # square color to check which mode is active
-# add_infer_box_to_image(raw_image, 0.447, 0.250, 0.037, 0.034, image) # pokemon national dex number pos
-# add_infer_box_to_image(raw_image, 0.702, 0.09, 0.04, 0.06, image) # shiny symbol pos
-# add_infer_box_to_image(raw_image, 0.463, 0.09, 0.04, 0.06, image) # gmax symbol pos
-# add_infer_box_to_image(raw_image, 0.623, 0.095, 0.033, 0.05, image) # origin symbol pos
-# add_infer_box_to_image(raw_image, 0.69, 0.18, 0.28, 0.46, image) # pokemon render pos
-# add_infer_box_to_image(raw_image, 0.228, 0.095, 0.030, 0.049, image) # ball type pos
-# add_infer_box_to_image(raw_image, 0.417, 0.097, 0.031, 0.046, image) # gender pos
-# add_infer_box_to_image(raw_image, 0.546, 0.099, 0.044, 0.041, image) # Level box
-# add_infer_box_to_image(raw_image, 0.782, 0.719, 0.193, 0.046, image) # OT ID box
-# add_infer_box_to_image(raw_image, 0.492, 0.719, 0.165, 0.049, image) # OT box
-# add_infer_box_to_image(raw_image, 0.157, 0.783, 0.212, 0.042, image) # Nature box
-# add_infer_box_to_image(raw_image, 0.158, 0.838, 0.213, 0.042, image) # Ability box
-
-viewer = ImageViewer(image)
-viewer.run()
-
+#!/usr/local/bin/python3
+
+"""
+A script used to fine-tune detection box placements and check the color stats from those boxes.
+After using image_viewer.py to get an initial box placement, you can place the box values
+(x, y, width, height) into this script, repeating the line
+add_infer_box_to_image(raw_image, <x>, <y>, <width>, <height>, image) 
+to add a box onto the image.
+
+In the end of the script, it will call ImageViewer to render the image, with boxes added.
+You can inspect the boxes to fine tune their positions.
+"""
+
+import cv2
+import sys
+import numpy as np
+from typing import Tuple
+from dataclasses import dataclass
+
+from image_viewer import ImageViewer
+from image_region_check import RegionCheck, add_rect, add_infer_box_to_image
+
+
+assert len(sys.argv) == 2
+
+filename = sys.argv[1]
+
+image = cv2.imread(filename)
+height = image.shape[0]
+width = image.shape[1]
+print(f"Size: {width} x {height}")
+
+raw_image = image.copy()
+
+# ==================================================================
+# LZA Donut flavor power icon
+for i in range(3):
+    # Empty space after a subtype-free power icon
+    add_infer_box_to_image(raw_image, 0.1125, 0.7745 + 0.046*i,0.005,0.013, image)
+    # Number of a subtype-free power icon
+    # add_infer_box_to_image(raw_image, 0.102, 0.77 + 0.046*i,0.011,0.02, image)
+    # Nummber of a subtype power icon
+    # add_infer_box_to_image(raw_image, 0.108, 0.77 + 0.046*i,0.011,0.02, image)
+    # add_infer_box_to_image(raw_image, 0.081, 0.764 + 0.045*i, 0.043, 0.034, image)
+
+# ==================================================================
+# LZA Donut flavor power text
+# for i in range(3):
+#     add_infer_box_to_image(raw_image, 0.131, 0.759 + 0.045*i, 0.260, 0.043, image)
+
+# ==================================================================
+# LZA Donut Berry Selection
+#add_infer_box_to_image(raw_image, 0.001, 0.245, 0.006, 0.070, image)
+#add_infer_box_to_image(raw_image, 0.001, 0.332, 0.006, 0.070, image)
+#add_infer_box_to_image(raw_image, 0.001, 0.419, 0.006, 0.070, image)
+#add_infer_box_to_image(raw_image, 0.001, 0.506, 0.006, 0.070, image)
+#add_infer_box_to_image(raw_image, 0.001, 0.593, 0.006, 0.070, image)
+#add_infer_box_to_image(raw_image, 0.001, 0.68, 0.006, 0.070, image)
+#add_infer_box_to_image(raw_image, 0.001, 0.767, 0.006, 0.070, image)
+#add_infer_box_to_image(raw_image, 0.001, 0.854, 0.006, 0.070, image)
+
+# ==================================================================
+# LZA Donut Berry Text
+#add_infer_box_to_image(raw_image, 0.065, 0.250, 0.173, 0.037, image)
+#add_infer_box_to_image(raw_image, 0.065, 0.336, 0.173, 0.037, image)
+#add_infer_box_to_image(raw_image, 0.065, 0.422, 0.173, 0.037, image)
+#add_infer_box_to_image(raw_image, 0.065, 0.508, 0.173, 0.037, image)
+#add_infer_box_to_image(raw_image, 0.065, 0.594, 0.173, 0.037, image)
+#add_infer_box_to_image(raw_image, 0.065, 0.680, 0.173, 0.037, image)
+#add_infer_box_to_image(raw_image, 0.065, 0.766, 0.173, 0.037, image)
+#add_infer_box_to_image(raw_image, 0.065, 0.852, 0.173, 0.037, image)
+
+# ==================================================================
+# LZA Donut Berry Image
+#add_infer_box_to_image(raw_image, 0.029, 0.254, 0.030, 0.047, image)
+#add_infer_box_to_image(raw_image, 0.029, 0.341, 0.030, 0.047, image)
+#add_infer_box_to_image(raw_image, 0.029, 0.428, 0.030, 0.047, image)
+
+
+# ==================================================================
+# Home summary screen finish loading detector
+# add_infer_box_to_image(raw_image, 0.388, 0.238, 0.109, 0.062, image)
+
+# ==================================================================
+# LZA Hyperspace Timer detection
+# add_infer_box_to_image(raw_image, 0.044, 0.111, 0.060, 0.067, image)
+
+
+# ==================================================================
+# LZA Map detector
+# add_infer_box_to_image(raw_image, 0.760730, 0.937023, 0.241416, 0.064885, image)
+# add_infer_box_to_image(raw_image, 0.005000, 0.150000, 0.025000, 0.110000, image)
+# add_infer_box_to_image(raw_image, 0.005000, 0.210000, 0.025000, 0.110000, image)
+
+
+# ==================================================================
+# LZA alert eye detector
+# add_infer_box_to_image(raw_image, 0.485, 0.088, 0.029, 0.034, image)
+# add_infer_box_to_image(raw_image, 0.464, 0.142, 0.071, 0.074, image)
+
+
+# ==================================================================
+# LZA bench sit button A when running back
+# add_infer_box_to_image(raw_image, 0.486, 0.477, 0.115, 0.5, image)
+
+
+# ==================================================================
+# LZA overworld party selection buttons
+# for i in range(6):
+	# loctions for the dpad up buttons to send party pokemon from ball to outside
+	# add_infer_box_to_image(raw_image, 0.048 + 0.0398*i, 0.954, 0.017, 0.030, image)
+	# locations for the dpad down buttons to retrieve outside pokemon back to ball while
+	# current party selection is on another in-ball pokemon
+	# add_infer_box_to_image(raw_image, 0.048 + 0.0398*i, 0.926, 0.017, 0.030, image)
+	# locations for the dpad down buttons to retrieve outside pokemon back to ball while
+	# current party selection is this outside pokemon. In this case, dpad up button is not
+	# present.
+	# add_infer_box_to_image(raw_image, 0.048 + 0.0398*i, 0.939, 0.017, 0.030, image)
+	# combined boxes
+	# add_infer_box_to_image(raw_image, 0.048 + 0.0398*i, 0.926, 0.017, 0.058, image)
+
+
+# ==================================================================
+# LZA map view dialog change
+# add_infer_box_to_image(raw_image, 0.216, 0.757, 0.565, 0.174, image)
+
+# ==================================================================
+# LZA selection arrow
+# add_infer_box_to_image(raw_image, 0.654308, 0.481553, 0.295529, 0.312621, image)  # restaurant farmer
+# add_infer_box_to_image(raw_image, 0.543, 0.508, 0.365, 0.253, image)  # Jacinthe farmer
+
+# ==================================================================
+# LZA main menu detector
+# add_infer_box_to_image(raw_image, 0.87, 0.940, 0.077, 0.044, image)  # detect button B
+
+
+# ==================================================================
+# LZA fossil selection green arrow when reviving fossils
+# add_infer_box_to_image(raw_image, 0.630, 0.444, 0.226, 0.319, image)
+
+
+# ==================================================================
+# New LZA box system cursor detection
+# triangle_upper_edge_width = 0.008
+# traingle_full_height = 0.035
+# for row in range(6):
+# 	y = (0.122 if row == 0 else 0.333 + (0.797 - 0.331)/ 4.0 * (row-1)) - 0.003
+# 	for col in range(6):
+# 		x = 0.0545 + col*(0.386 - 0.059)/5.0
+# 		add_infer_box_to_image(raw_image, x, y, 0.025, traingle_full_height, image)
+
+
+# ==================================================================
+# LZA box system cursor detection
+# for row in range(6):
+# 	y = 0.122 if row == 0 else (0.333 + (0.797 - 0.331)/ 4.0 * (row-1))
+# 	for col in range(6):
+# 		x = 0.058 + col*(0.386 - 0.059)/5.0
+# 		# non-held positions
+# 		# add_infer_box_to_image(raw_image, x, y, 0.018, 0.026, image)
+# 		# held positions
+# 		# add_infer_box_to_image(raw_image, x+0.011, y-0.010, 0.023, 0.032, image)
+# 		# narrow gap to detect holding
+# 		add_infer_box_to_image(raw_image, x+0.011, y+0.010, 0.023, 0.004, image)
+
+# Pixel (x,y) = (775, 136), (0.404, 0.126), rgb=[255,188,245,71] hsv=[ 80 181 245]
+# Pixel (x,y) = (759, 135), (0.395, 0.125), rgb=[255,182,233,70] hsv=[ 81 178 233]
+# Pixel (x,y) = (796, 135), (0.415, 0.125), rgb=[255,181,239,63] hsv=[ 80 188 239]
+# Pixel (x,y) = (764, 133), (0.398, 0.123), rgb=[255,181,239,61] hsv=[ 80 190 239]
+# Pixel (x,y) = (754, 133), (0.393, 0.123), rgb=[255,182,240,63] hsv=[ 80 188 240]
+# Pixel (x,y) = (768, 141), (0.4, 0.131), rgb=[255,184,241,54] hsv=[ 81 198 241]
+# Pixel (x,y) = (748, 141), (0.39, 0.131), rgb=[255,176,232,62] hsv=[ 80 187 232]
+# Pixel (x,y) = (757, 150), (0.394, 0.139), rgb=[255,181,236,58] hsv=[ 81 192 236]
+# ==================================================================
+
+# ==================================================================
+# LA map weather symbol
+# add_infer_box_to_image(raw_image, 0.028, 0.069, 0.025, 0.044, image)
+
+# ==================================================================
+# LA mult-pokemon battle sprite arrow
+# for i in range(8):
+# 	loc = (0.936 - 0.035*i, 0.018, 0.015, 0.027)
+# 	add_infer_box_to_image(raw_image, *loc, image)
+
+# ==================================================================
+# LA battle sprite locations
+# for i in range(8):
+# 	loc = (0.957 - 0.035*i, 0.044, 0.021, 0.035)
+# 	add_infer_box_to_image(raw_image, *loc, image)
+
+# ==================================================================
+# LA battle + details pokemon info
+# add_infer_box_to_image(raw_image, 0.726, 0.133, 0.015, 0.023, image)
+# add_infer_box_to_image(raw_image, 0.750, 0.133, 0.015, 0.023, image)
+# add_infer_box_to_image(raw_image, 0.777, 0.138, 0.001, 0.015, image)
+# add_infer_box_to_image(raw_image, 0.525, 0.130, 0.100, 0.038, image)
+
+# ==================================================================
+# LA wild pokemon focus reading pokemon info
+# add_infer_box_to_image(raw_image, 0.108, 0.868, 0.135, 0.037, image)
+# add_infer_box_to_image(raw_image, 0.307, 0.873, 0.016, 0.030, image)
+# add_infer_box_to_image(raw_image, 0.307, 0.920, 0.016, 0.029, image)
+# add_infer_box_to_image(raw_image, 0.324, 0.868, 0.023, 0.04, image)
+# add_infer_box_to_image(raw_image, 0.244, 0.815, 0.026, 0.047, image)
+
+
+# ==================================================================
+# LA wild pokemon focus 
+# add_infer_box_to_image(raw_image, 0.109, 0.857, 0.24, 0.012, image)
+# add_infer_box_to_image(raw_image, 0.109, 0.949, 0.24, 0.012, image)
+# add_infer_box_to_image(raw_image, 0.102, 0.875, 0.007, 0.073, image)
+# add_infer_box_to_image(raw_image, 0.348, 0.873, 0.007, 0.073, image)
+
+# ==================================================================
+# LA battle start boundary lines
+# add_infer_box_to_image(raw_image, 0.0, 0.113, 1.0, 0.015, image)
+# add_infer_box_to_image(raw_image, 0.2, 0.871, 0.63, 0.015, image)
+
+
+# ==================================================================
+# LA map mission tab raised detection
+# add_infer_box_to_image(raw_image, 0.9235, 0.617, 0.003, 0.019, image)
+# add_infer_box_to_image(raw_image, 0.937, 0.62, 0.0035, 0.012, image)
+
+# ==================================================================
+# LA map zoom
+# add_infer_box_to_image(raw_image, 0.780, 0.085, 0.008, 0.014, image)
+# add_infer_box_to_image(raw_image, 0.795, 0.082, 0.010, 0.019, image)
+# add_infer_box_to_image(raw_image, 0.807, 0.081, 0.014, 0.022, image)
+
+# ==================================================================
+# LA MMO Map question mark locations
+# add_infer_box_to_image(raw_image, 0.362, 0.670, 0.045, 0.075, image)
+# add_infer_box_to_image(raw_image, 0.683, 0.555, 0.039, 0.076, image)
+# add_infer_box_to_image(raw_image, 0.828, 0.372, 0.042, 0.082, image)
+# add_infer_box_to_image(raw_image, 0.485, 0.440, 0.044, 0.080, image)
+# add_infer_box_to_image(raw_image, 0.393, 0.144, 0.050, 0.084, image)
+
+# ==================================================================
+# LA Map location detector
+# add_infer_box_to_image(raw_image, 0.252, 0.400, 0.025, 0.150, image)
+# add_infer_box_to_image(raw_image, 0.415, 0.550, 0.025, 0.150, image)
+# add_infer_box_to_image(raw_image, 0.750, 0.570, 0.025, 0.150, image)
+# add_infer_box_to_image(raw_image, 0.865, 0.240, 0.025, 0.150, image)
+# add_infer_box_to_image(raw_image, 0.508, 0.320, 0.025, 0.150, image)
+# add_infer_box_to_image(raw_image, 0.457, 0.060, 0.025, 0.150, image)
+# add_infer_box_to_image(raw_image, 0.635, 0.285, 0.025, 0.150, image)
+
+
+# ==================================================================
+# LA dropped items detection
+# add_infer_box_to_image(raw_image, 0.030, 0.177, 0.020, 0.038, image)
+# add_infer_box_to_image(raw_image, 0.030, 0.225, 0.020, 0.038, image)
+# add_infer_box_to_image(raw_image, 0.050, 0.177, 0.200, 0.038, image)
+# add_infer_box_to_image(raw_image, 0.050, 0.177, 0.055, 0.038, image) # MMO ??????
+
+# ==================================================================
+# LA dropped items detection
+# add_infer_box_to_image(raw_image, 0.439, 0.819, 0.029, 0.059, image)
+
+# add_infer_box_to_image(raw_image, 0.031, 0.900, 0.024, 0.017, image)
+# add_infer_box_to_image(raw_image, 0.026, 0.743, 0.021, 0.038, image)
+# add_infer_box_to_image(raw_image, 0.022, 0.581, 0.020, 0.018, image)
+# add_infer_box_to_image(raw_image, 0.152, 0.482, 0.017, 0.040, image)
+# add_infer_box_to_image(raw_image, 0.016, 0.218, 0.018, 0.021, image)
+# add_infer_box_to_image(raw_image, 0.169, 0.103, 0.024, 0.036, image)
+# add_infer_box_to_image(raw_image, 0.815, 0.244, 0.026, 0.026, image)
+# add_infer_box_to_image(raw_image, 0.737, 0.126, 0.045, 0.056, image)
+# add_infer_box_to_image(raw_image, 0.806, 0.431, 0.043, 0.026, image)
+# add_infer_box_to_image(raw_image, 0.827, 0.507, 0.023, 0.028, image)
+# add_infer_box_to_image(raw_image, 0.747, 0.603, 0.087, 0.086, image)
+# add_infer_box_to_image(raw_image, 0.885, 0.653, 0.041, 0.093, image)
+# add_infer_box_to_image(raw_image, 0.934, 0.556, 0.039, 0.038, image)
+# add_infer_box_to_image(raw_image, 0.761, 0.913, 0.071, 0.051, image)
+# add_infer_box_to_image(raw_image, 0.865, 0.098, 0.022, 0.030, image)
+# add_infer_box_to_image(raw_image, 0.202, 0.631, 0.057, 0.075, image)
+# add_infer_box_to_image(raw_image, 0.099, 0.265, 0.072, 0.070, image)
+# add_infer_box_to_image(raw_image, 0.908, 0.313, 0.020, 0.017, image)
+
+# ==================================================================
+# LA black out detection
+# add_infer_box_to_image(raw_image, 0.068, 0.088, 0.864, 0.581, image)
+# add_infer_box_to_image(raw_image, 0.720, 0.842, 0.028, 0.051, image)
+
+
+# ==================================================================
+# LA Transparent Dialogue Yellow arrow detection
+# add_infer_box_to_image(raw_image, 0.720, 0.759, 0.049, 0.128, image)
+
+# ==================================================================
+# LA Dialogue Ellipse detection
+# add_infer_box_to_image(raw_image, 0.741, 0.811, 0.028, 0.023, image)
+
+# ==================================================================
+# LA Tenacity path menu
+# add_infer_box_to_image(raw_image, 0.56, 0.46, 0.33, 0.27, image)
+
+# ==================================================================
+# LA wild pokemon name in focus
+# add_infer_box_to_image(raw_image, 0.11, 0.868, 0.135, 0.043, image)
+
+# ==================================================================
+# LA camp dialogue box
+# add_infer_box_to_image(raw_image, 0.741, 0.811, 0.028, 0.023, image)
+
+# ==================================================================
+# LA item compatibility
+# add_infer_box_to_image(raw_image, 0.838, 0.1815, 0.090, 0.024, image)
+
+# ==================================================================
+# LA battle move image match
+# for i in range(4):
+	# add_infer_box_to_image(raw_image, 0.66 - i * 0.0205, 0.622 + i * 0.0655, 0.25, 0.032, image)
+
+# ==================================================================
+# LA Ingo battle initial dialogue selection
+# add_infer_box_to_image(raw_image, 0.50, 0.350, 0.40, 0.400, image)
+# add_infer_box_to_image(raw_image, 0.50, 0.350, 0.40, 0.400, image)
+
+
+# ==================================================================
+# LA battle pokemon switch
+# add_infer_box_to_image(raw_image, 0.641, 0.178, 0.050, 0.023, image)
+# add_infer_box_to_image(raw_image, 0.641, 0.248, 0.050, 0.023, image)
+# add_infer_box_to_image(raw_image, 0.517, 0.195, 0.011, 0.061, image)
+# add_infer_box_to_image(raw_image, 0.924, 0.185, 0.019, 0.076, image)
+
+# add_infer_box_to_image(raw_image, 0.540, 0.216, 0.016, 0.018, image)
+# add_infer_box_to_image(raw_image, 0.676, 0.216, 0.016, 0.018, image)
+
+# add_infer_box_to_image(raw_image, 0.044, 0.091, 0.043, 0.077, image)
+
+
+# ==================================================================
+# LA battle move selection
+# for i in range(4):
+	# add_infer_box_to_image(raw_image, 0.8 - i * 0.021, 0.622 + i * 0.0655, 0.02, 0.032, image)
+
+# ==================================================================
+# LA battle menu
+# add_infer_box_to_image(raw_image, 0.056, 0.948, 0.013, 0.020, image)
+# add_infer_box_to_image(raw_image, 0.174, 0.948, 0.032, 0.046, image)
+
+# ==================================================================
+# LA normal opaque dialogue
+# add_infer_box_to_image(raw_image, 0.278, 0.712, 0.100, 0.005, image)
+# add_infer_box_to_image(raw_image, 0.278, 0.755, 0.100, 0.005, image)
+# add_infer_box_to_image(raw_image, 0.259, 0.715, 0.003, 0.043, image)
+# add_infer_box_to_image(raw_image, 0.390, 0.715, 0.003, 0.043, image)
+
+# add_infer_box_to_image(raw_image, 0.500, 0.750, 0.200, 0.020, image)
+# add_infer_box_to_image(raw_image, 0.400, 0.895, 0.200, 0.020, image)
+# add_infer_box_to_image(raw_image, 0.230, 0.805, 0.016, 0.057, image)
+# add_infer_box_to_image(raw_image, 0.755, 0.805, 0.016, 0.057, image)
+
+# ==================================================================
+# LA normal surprise dialogue
+# add_infer_box_to_image(raw_image, 0.295, 0.722, 0.100, 0.005, image)
+# add_infer_box_to_image(raw_image, 0.295, 0.765, 0.100, 0.005, image)
+
+# add_infer_box_to_image(raw_image, 0.500, 0.760, 0.200, 0.020, image)
+# add_infer_box_to_image(raw_image, 0.400, 0.900, 0.200, 0.020, image)
+# add_infer_box_to_image(raw_image, 0.720, 0.855, 0.030, 0.060, image)
+
+# ==================================================================
+# Pokemon Home Box Sorting
+
+# , m_box_sprite(console, {0.228, 0.095, 0.030, 0.049}) // ball
+# ImageFloatBox GENDER_BOX{0.417, 0.097, 0.031, 0.046}; // gender
+
+# add_infer_box_to_image(raw_image, 0.495, 0.0045, 0.01, 0.005, image) # square color to check which mode is active
+# add_infer_box_to_image(raw_image, 0.447, 0.250, 0.037, 0.034, image) # pokemon national dex number pos
+# add_infer_box_to_image(raw_image, 0.702, 0.09, 0.04, 0.06, image) # shiny symbol pos
+# add_infer_box_to_image(raw_image, 0.463, 0.09, 0.04, 0.06, image) # gmax symbol pos
+# add_infer_box_to_image(raw_image, 0.623, 0.095, 0.033, 0.05, image) # origin symbol pos
+# add_infer_box_to_image(raw_image, 0.69, 0.18, 0.28, 0.46, image) # pokemon render pos
+# add_infer_box_to_image(raw_image, 0.228, 0.095, 0.030, 0.049, image) # ball type pos
+# add_infer_box_to_image(raw_image, 0.417, 0.097, 0.031, 0.046, image) # gender pos
+# add_infer_box_to_image(raw_image, 0.546, 0.099, 0.044, 0.041, image) # Level box
+# add_infer_box_to_image(raw_image, 0.782, 0.719, 0.193, 0.046, image) # OT ID box
+# add_infer_box_to_image(raw_image, 0.492, 0.719, 0.165, 0.049, image) # OT box
+# add_infer_box_to_image(raw_image, 0.157, 0.783, 0.212, 0.042, image) # Nature box
+# add_infer_box_to_image(raw_image, 0.158, 0.838, 0.213, 0.042, image) # Ability box
+
+# ==================================================================
+# Pokemon BDSP Poffin Cooking
+
+# add_infer_box_to_image(raw_image, 0.56, 0.724, 0.012, 0.024, image) # green & blue arrow pos
+
+
+viewer = ImageViewer(image)
+viewer.run()
+
diff --git a/SerialPrograms/Scripts/check_pokemon_collection.py b/SerialPrograms/Scripts/check_pokemon_collection.py
new file mode 100755
index 0000000000..6df1f4841d
--- /dev/null
+++ b/SerialPrograms/Scripts/check_pokemon_collection.py
@@ -0,0 +1,213 @@
+#!/usr/bin/env python3
+"""
+Script to check which Pokemon from a subset you've already collected.
+
+Usage:
+    python check_pokemon_collection.py --subset SUBSET_FILE --pages BOX_PAGE_FILE1 [BOX_PAGE_FILE2 ...] --trainers TRAINER_FILE [--national NATIONAL_DEX]
+
+Example:
+    python check_pokemon_collection.py \
+        --subset /path/to/Pokedex-Lumiose.json \
+        --pages /path/to/box_order_page_1.json /path/to/box_order_page_2.json \
+        --trainers /path/to/my_ot.json \
+        --national /path/to/Pokedex-National.json
+
+    You can also use "*" when specifying pages:
+    python check_pokemon_collection.py \
+        --subset /path/to/Pokedex-Lumiose.json \
+        --pages /path/to/box_order_page_*.json \
+        --trainers /path/to/my_ot.json \
+        --national /path/to/Pokedex-National.json
+"""
+
+import json
+import argparse
+from pathlib import Path
+from typing import Dict, List, Set
+
+
+def load_json(filepath: str) -> any:
+    """Load a JSON file."""
+    # Use utf-8-sig to handle BOM if present
+    with open(filepath, 'r', encoding='utf-8-sig') as f:
+        return json.load(f)
+
+
+def load_national_pokedex(filepath: str) -> List[str]:
+    """Load the national pokedex mapping (dex number -> pokemon name)."""
+    pokedex = load_json(filepath)
+    # The array is 0-indexed but national dex starts at 1
+    # So index 0 = dex #1, index 1 = dex #2, etc.
+    return pokedex
+
+
+def load_subset(filepath: str) -> List[str]:
+    """Load the subset of pokemon names we're looking for (preserving order)."""
+    subset_list = load_json(filepath)
+    return subset_list
+
+
+def load_trainer_mapping(filepath: str) -> Dict[int, str]:
+    """Load trainer ID to name mapping."""
+    mapping_str = load_json(filepath)
+    # Convert string keys to integers
+    return {int(k): v for k, v in mapping_str.items()}
+
+
+def load_box_pages(filepaths: List[str]) -> List[dict]:
+    """Load all box page JSON files and combine them."""
+    all_pokemon = []
+    for page_idx, filepath in enumerate(filepaths):
+        pokemon_list = load_json(filepath)
+        for pokemon in pokemon_list:
+            pokemon['page'] = page_idx
+        all_pokemon.extend(pokemon_list)
+    return all_pokemon
+
+
+def get_pokemon_name(national_dex_number: int, national_pokedex: List[str]) -> str:
+    """Get pokemon name from national dex number."""
+    # national_dex_number 1 -> index 0
+    index = national_dex_number - 1
+    if 0 <= index < len(national_pokedex):
+        return national_pokedex[index]
+    return f"Unknown (#{national_dex_number})"
+
+
+def get_trainer_name(ot_id: int, trainer_mapping: Dict[int, str]) -> str:
+    """Get trainer name from OT ID, or return ID if not found."""
+    return trainer_mapping.get(ot_id, str(ot_id))
+
+
+def is_valid_pokemon(pokemon: dict) -> bool:
+    """Check if a pokemon object has the minimum required fields (not an empty slot)."""
+    required_fields = ['national_dex_number', 'ot_id']
+    return all(field in pokemon for field in required_fields)
+
+
+def format_gender(gender: str) -> str:
+    """Format gender for display."""
+    if gender == "Male":
+        return "♂"
+    elif gender == "Female":
+        return "♀"
+    else:
+        return "-"
+
+
+def format_ball(ball_slug: str) -> str:
+    """Format pokeball name for display."""
+    # Remove '-ball' suffix and capitalize
+    if ball_slug.endswith('-ball'):
+        ball_name = ball_slug[:-5]
+    else:
+        ball_name = ball_slug
+    return ball_name.capitalize()
+
+
+def main():
+    parser = argparse.ArgumentParser(
+        description='Check which Pokemon from a subset you have collected.',
+        formatter_class=argparse.RawDescriptionHelpFormatter,
+        epilog=__doc__
+    )
+    parser.add_argument('--subset', required=True, help='Path to subset pokedex JSON (e.g., Pokedex-Lumiose.json)')
+    parser.add_argument('--pages', nargs='+', required=True, help='Path(s) to one or more JSON files where each file stores a single page of box order')
+    parser.add_argument('--trainers', required=True, help='Path to trainer ID mapping JSON (my_ot.json)')
+    parser.add_argument('--national', help='Path to national pokedex JSON (default: auto-detect from subset location)')
+
+    args = parser.parse_args()
+
+    # Auto-detect national pokedex if not provided
+    if args.national:
+        national_path = args.national
+    else:
+        # Try to find Pokedex-National.json in the same directory as subset
+        subset_dir = Path(args.subset).parent
+        national_path = subset_dir / 'Pokedex-National.json'
+        if not national_path.exists():
+            # Try the Pokemon/Pokedex directory
+            national_path = subset_dir.parent / 'Pokedex' / 'Pokedex-National.json'
+        if not national_path.exists():
+            print(f"Error: Could not find Pokedex-National.json. Please specify with --national")
+            return 1
+
+    # Load all data
+    print(f"Loading national pokedex from: {national_path}")
+    national_pokedex = load_national_pokedex(str(national_path))
+
+    print(f"Loading subset from: {args.subset}")
+    subset = load_subset(args.subset)
+
+    print(f"Loading trainer mapping from: {args.trainers}")
+    trainer_mapping = load_trainer_mapping(args.trainers)
+
+    print(f"Loading {len(args.pages)} box page(s)...")
+    all_pokemon = load_box_pages(args.pages)
+
+    # Filter pokemon in subset
+    print(f"\nSearching for {len(subset)} pokemon in {len(all_pokemon)} slots...")
+    print("=" * 100)
+
+    # Build a mapping from pokemon name to list of found instances
+    found_pokemon_map = {}
+    for pokemon in all_pokemon:
+        if not is_valid_pokemon(pokemon):
+            continue
+
+        pokemon_name = get_pokemon_name(pokemon['national_dex_number'], national_pokedex)
+
+        if pokemon_name in subset:
+            if pokemon_name not in found_pokemon_map:
+                found_pokemon_map[pokemon_name] = []
+
+            found_pokemon_map[pokemon_name].append({
+                'name': pokemon_name,
+                'trainer': get_trainer_name(pokemon.get('ot_id'), trainer_mapping),
+                'gender': pokemon.get('gender', 'Unknown'),
+                'ball': pokemon.get('ball_slug', 'unknown'),
+                'alpha': pokemon.get('alpha', False),
+                'shiny': pokemon.get('shiny', False),
+                'page': pokemon.get('page') + 1,   # make them 1-indexed
+                'box': pokemon.get('box', -2) + 1,
+                'row': pokemon.get('row', -2) + 1,
+                'column': pokemon.get('column', -2) + 1,
+            })
+
+    # Flatten results in the order of the subset
+    found_pokemon = []
+    for pokemon_name in subset:
+        if pokemon_name in found_pokemon_map:
+            found_pokemon.extend(found_pokemon_map[pokemon_name])
+
+    # Print results
+    print(f"\n{'Pokemon':<20} {'Trainer':<15} {'Gender':<8} {'Ball':<15} {'Alpha':<7} {'Shiny':<7} {'Location'}")
+    print("=" * 110)
+
+    for p in found_pokemon:
+        alpha_str = "✓" if p['alpha'] else "-"
+        shiny_str = "✓" if p['shiny'] else "-"
+        location = f"Page {p['page']} Box {p['box']}, Row {p['row']} Col {p['column']}"
+
+        print(f"{p['name']:<20} {p['trainer']:<15} {format_gender(p['gender']):<8} "
+              f"{format_ball(p['ball']):<15} {alpha_str:<7} {shiny_str:<7} {location}")
+
+    # Summary
+    print("=" * 110)
+    # Count unique pokemon found
+    unique_found = len(set(p['name'] for p in found_pokemon))
+    print(f"\nFound {unique_found} / {len(subset)} unique pokemon from subset")
+    print(f"Total instances: {len(found_pokemon)}")
+    print(f"Missing {len(subset) - unique_found} pokemon")
+
+    # Show missing pokemon
+    if unique_found < len(subset):
+        found_names = {p['name'] for p in found_pokemon}
+        missing = [name for name in subset if name not in found_names]
+        print(f"\nMissing pokemon:")
+        for i, name in enumerate(missing, 1):
+            print(f"  {i}. {name}")
+
+
+if __name__ == '__main__':
+    main()
diff --git a/SerialPrograms/Scripts/fix_onnx_model_metadata.py b/SerialPrograms/Scripts/fix_onnx_model_metadata.py
new file mode 100644
index 0000000000..f7a72680db
--- /dev/null
+++ b/SerialPrograms/Scripts/fix_onnx_model_metadata.py
@@ -0,0 +1,126 @@
+#!/usr/bin/env python3
+"""
+Remove privacy-sensitive metadata (file paths in stack trace) from ONNX models.
+
+Usage:
+    python fix_onnx_model_metadata.py <input_onnx_file> [output_onnx_file]
+
+If output file is not specified, it will overwrite the input file.
+"""
+
+import onnx
+import sys
+import os
+
+
+def clean_onnx_metadata(model_path, output_path=None):
+    """
+    Remove privacy-sensitive metadata from an ONNX model.
+
+    Args:
+        model_path: Path to input ONNX model
+        output_path: Path to save cleaned model (defaults to overwriting input)
+    """
+    print(f"Loading ONNX model from: {model_path}")
+    model = onnx.load(model_path)
+
+    # What we don't clean currently:
+    # model.doc_string: top-level doc string
+    # model.metadata_props: top-level metadata
+    # model.graph.doc_string: graph doc string
+    # model.graph.node[...].docstring: node's doc string
+    # model.graph.initializer[...].metadata_props: intializer (tensor)'s metadata
+    # model.functions[...].doc_string: function doc string
+
+    # Track what we're cleaning
+    changes_made = []
+    removed_values = set()
+
+    # Clean metadata_props from nodes (this is where PyTorch stores stack traces)
+    node_metadata_cleaned = 0
+    for node in model.graph.node:
+        if not node.metadata_props:
+            continue
+        # Remove metadata containing paths or stack traces
+        kept_props = []
+        for prop in node.metadata_props:
+            # Remove stack traces and name scopes that contain file paths
+            if prop.key in ['pkg.torch.onnx.stack_trace', 'pkg.torch.onnx.name_scopes'] and ('/' in prop.value or '\\' in prop.value):
+                removed_values.add(prop.value)
+                node_metadata_cleaned += 1
+                continue  # Skip this prop
+            kept_props.append(prop)
+
+        # Clear and re-add only kept props:
+        # We can't directly assign value to node.metadat_props, otherwise will have following error:
+        # "Assignment not allowed to map  or repeated field "metadata_props" in protocol message object."
+        while len(node.metadata_props) > 0:
+            node.metadata_props.pop()
+        for prop in kept_props:
+            node.metadata_props.append(prop)
+
+    if node_metadata_cleaned > 0:
+        print(f"  Removed {node_metadata_cleaned} metadata_props entries from nodes")
+        changes_made.append(f"{node_metadata_cleaned} node metadata_props")
+
+    # Verify the model is still valid
+    print("  Verifying cleaned model...")
+    try:
+        onnx.checker.check_model(model)
+        print("  ✓ Model validation passed")
+    except Exception as e:
+        print(f"  ✗ Model validation failed: {e}")
+        print("  Aborting - model may be corrupted")
+        return False
+
+    # Save the cleaned model
+    if output_path is None:
+        output_path = model_path
+
+    print(f"Saving cleaned model to: {output_path}")
+    onnx.save(model, output_path)
+
+    # Report what was cleaned
+    if changes_made:
+        print(f"\nCleaned metadata:")
+        for change in changes_made:
+            print(f"  - {change}")
+        
+        print(f"Removed {len(removed_values)} values")
+    else:
+        print("\nNo privacy-sensitive filepath metadata found")
+
+    # Verify the paths are gone
+    print("\nVerifying paths are removed...")
+    with open(output_path, 'rb') as f:
+        content = f.read()
+        # Check for common path indicators
+        if b'/Users/' in content or b'C:\\' in content or b'/home/' in content:
+            print("  ⚠ Warning: Some path-like strings may still be present")
+            print("    (This could be in tensor names or other non-metadata)")
+        else:
+            print("  ✓ No obvious file paths detected in binary")
+
+    print(f"\n✓ Successfully cleaned ONNX model!")
+    return True
+
+
+def main():
+    if len(sys.argv) < 2:
+        print(__doc__)
+        print("\nError: No input file specified")
+        sys.exit(1)
+
+    input_path = sys.argv[1]
+    output_path = sys.argv[2] if len(sys.argv) > 2 else None
+
+    if not os.path.exists(input_path):
+        print(f"Error: Input file not found: {input_path}")
+        sys.exit(1)
+
+    success = clean_onnx_metadata(input_path, output_path)
+    sys.exit(0 if success else 1)
+
+
+if __name__ == "__main__":
+    main()
diff --git a/SerialPrograms/Scripts/function_replace.py b/SerialPrograms/Scripts/function_replace.py
new file mode 100644
index 0000000000..7418fea739
--- /dev/null
+++ b/SerialPrograms/Scripts/function_replace.py
@@ -0,0 +1,633 @@
+"""
+This replaces text for all files in the given folder.
+Run the find_replace() function, with the globpath parameter as well as the function parameter.
+    e.g. find_replace(globpath, replace_ssf_press_left_joystick)
+To set the folder, update `globpath`. You can either use a path relative to this file, or an absolute path.
+The function parameter should take a given file's contents, make the replacement, then return the new contents.
+This function will be applied recursively on all child files.
+
+The examples given below use re.sub to do the replacement.
+re.sub() has 3 parameters:
+1: the regex pattern that finds the selected strings.
+2: the function that takes in matches (as per the regex pattern) and returns the desired replacement string
+3: the old content
+
+"""
+
+
+
+import glob
+import fileinput
+import re
+import tempfile
+from pathlib import Path
+import os
+
+
+
+# look through each file, line by line (for very large files that you can't load into RAM)
+# write the changes to a temp file, then replace the original file
+def find_replace_line_by_line(top_dir, replace_content):
+    for filepath in glob.iglob(top_dir, recursive=True):
+        path = Path(filepath)
+        if not path.is_file():
+            continue
+
+        # Use delete=False so the file persists after close()
+        # Use 'dir=path.parent' to force the temp file onto the SAME DRIVE as the original. This prevents the "different disk drive" error.
+        with tempfile.NamedTemporaryFile('w', encoding='utf-8', dir=path.parent, delete=False, newline='') as tf:
+            temp_name = tf.name
+            with open(path, 'r', encoding='utf-8', newline='') as f:
+                for line in f:
+                    new_line = replace_content(line)  # if no replacement, new_line is the same as line
+                    tf.write(new_line)
+                    # if new_line != line:
+                    #     print(line)
+                    #     print(new_line)
+
+
+
+        # 2. FILE IS NOW CLOSED (Exit 'with' block)
+        # On Windows, you MUST close the file before os.replace can access it
+        # Replace the original file with the new one atomically
+        try:
+            # if os.path.exists(temp_name):
+            #     os.remove(temp_name)
+            os.replace(temp_name, path)
+        except Exception as e:
+            # 3. Clean up if the replacement fails
+            if os.path.exists(temp_name):
+                os.remove(temp_name)
+            print(f"Error updating {path}: {e}")
+            raise
+
+
+
+
+
+
+def replace_pbf_left_joystick(old_content: str) -> str:
+    # Regex pattern:
+    # 1. Matches "pbf_move_left_joystick_old("
+    function_name = r"pbf_move_left_joystick_old\("
+    # 2. Group 1: Captures first 3 arguments: (.*?, \d+, \d+)
+    group_1 = r"(.*?,\s*\d+,\s*\d+)"
+    # 3. Group 2, 3: Captures last 2 numeric durations: (\d+), (\d+)
+    group_2 = r"(\d+)"
+    group_3 = r"(\d+)"
+    pattern = function_name + group_1 + r",\s*" + group_2 + r",\s*" + group_3 + r"\);"
+
+    def replace_joystick_ticks_with_milliseconds(match):
+        # e.g. pbf_move_left_joystick_old(context, 128, 0, 10, 10);
+        # match.group(1) is "context, 128, 0"
+        # match.group(2) is "10" (first duration)
+        # match.group(3) is "10" (second duration)
+        prefix = match.group(1)
+        dur1 = int(match.group(2)) * 8
+        dur2 = int(match.group(3)) * 8
+
+        return f"pbf_move_left_joystick_old({prefix}, {dur1}ms, {dur2}ms);"
+
+    new_content: str = re.sub(pattern, replace_joystick_ticks_with_milliseconds, old_content)
+
+    return new_content
+
+def replace_pbf_left_joystick2(old_content: str) -> str:
+    # Regex pattern:
+    # 1. Matches "pbf_move_left_joystick_old("
+    function_name = r"pbf_move_left_joystick_old1\("
+    # 2. Group 1: Captures first 3 arguments: (.*?, .*?, .*?)
+    group_1 = r"(.*?,\s*.*?,\s*.*?)"
+    # 3. Group 2, 3: Captures last 2 numeric durations: (\d+), (\d+)
+    group_2 = r"(\d+)"
+    group_3 = r"(\d+)"
+    pattern = function_name + group_1 + r",\s*" + group_2 + r",\s*" + group_3 + r"\);"
+
+    def replace_joystick_ticks_with_milliseconds(match):
+        # e.g. pbf_move_left_joystick_old(context, 128, 0, 10, 10);
+        # match.group(1) is "context, 128, 0"
+        # match.group(2) is "10" (first duration)
+        # match.group(3) is "10" (second duration)
+        prefix = match.group(1)
+        dur1 = int(match.group(2)) * 8
+        dur2 = int(match.group(3)) * 8
+
+        return f"pbf_move_left_joystick_old({prefix}, {dur1}ms, {dur2}ms);"
+
+    new_content: str = re.sub(pattern, replace_joystick_ticks_with_milliseconds, old_content)
+
+    return new_content
+
+
+def replace_pbf_left_joystick3(old_content: str) -> str:
+    # Regex pattern:
+    # 1. Matches "pbf_move_left_joystick_old("
+    function_name = r"pbf_move_left_joystick_old1\("
+    # 2. Group 1: Captures first 4 arguments: (.*?, .*?, .*?, .*?)
+    group_1 = r"(.*?,\s*.*?,\s*.*?,\s*.*?)"
+    # 3. Group 2, 3: Captures last numeric duration: (\d+)
+    group_2 = r"(\d+)"
+    pattern = function_name + group_1 + r",\s*" + group_2 + r"\);"
+
+    def replace_joystick_ticks_with_milliseconds(match):
+        # e.g. pbf_move_left_joystick_old(context, 128, 0, 10, 10);
+        # match.group(1) is "context, 128, 0"
+        # match.group(2) is "10" (first duration)
+        # match.group(3) is "10" (second duration)
+        prefix = match.group(1)
+        dur1 = int(match.group(2)) * 8
+
+        return f"pbf_move_left_joystick_old1({prefix}, {dur1}ms);"
+
+    new_content: str = re.sub(pattern, replace_joystick_ticks_with_milliseconds, old_content)
+
+    return new_content
+
+def replace_mash_button(old_content: str) -> str:
+    # Regex pattern:
+    # 1. Matches "pbf_mash_button_old("
+    function_name = r"pbf_mash_button_old\("
+    # 2. Group 1: Captures first 2 arguments: (.*?, .*?)
+    group_1 = r"(.*?,\s*.*?)"
+    # 3. Group 2: Captures last numeric duration: (\d+)
+    group_2 = r"(\d+)"
+    pattern = function_name + group_1 + r",\s*" + group_2 + r"\);"
+
+
+    def replace_mash_button_ticks_with_milliseconds(match):
+        # e.g. pbf_mash_button_old(context, BUTTON_A, 10);
+        # match.group(1) is "context, BUTTON_A"
+        # match.group(2) is "10" (first duration)
+        prefix = match.group(1)
+        dur1 = int(match.group(2)) * 8
+
+        return f"pbf_mash_button({prefix}, {dur1}ms);"
+
+    new_content: str = re.sub(pattern, replace_mash_button_ticks_with_milliseconds, old_content)
+
+    return new_content
+
+
+
+def replace_pbf_wait(old_content: str) -> str:
+    # Regex pattern:
+    # 1. Matches "pbf_wait_old("
+    function_name = r"pbf_wait_old\("
+    # 2. Group 1: Captures first argument: (.*?)
+    group_1 = r"(.*?)"
+    # 3. Group 2: Captures last numeric duration: (\d+)
+    group_2 = r"(\d+)"
+    pattern = function_name + group_1 + r",\s*" + group_2 + r"\);"
+
+
+    def replace_pbf_wait_ticks_with_milliseconds(match):
+        # e.g. pbf_wait_old(context, BUTTON_A, 10);
+        # groups are defined as per the regex pattern above
+        # match.group(1) is "context, BUTTON_A"
+        # match.group(2) is "10" (first duration)
+        prefix = match.group(1)
+        dur1 = int(match.group(2)) * 8
+
+        return f"pbf_wait({prefix}, {dur1}ms);"
+
+    new_content: str = re.sub(pattern, replace_pbf_wait_ticks_with_milliseconds, old_content)
+
+    return new_content
+
+
+def replace_pbf_button(old_content: str) -> str:
+    # Regex pattern:
+    # 1. Matches "pbf_press_button_old("
+    function_name = r"pbf_press_button_old\("
+    # 2. Group 1: Captures first 2 arguments: (.*?, .*?)
+    group_1 = r"(.*?,\s*.*?)"
+    # 3. Group 2, 3: Captures last 2 numeric durations: (\d+), (\d+)
+    group_2 = r"(\d+)"
+    group_3 = r"(\d+)"
+    pattern = function_name + group_1 + r",\s*" + group_2 + r",\s*" + group_3 + r"\);"
+
+    def replace_button_ticks_with_milliseconds(match):
+        # e.g. pbf_press_button_old(context, BUTTON_A, 10, 20);
+        # match.group(1) is "context, BUTTON_A,"
+        # match.group(2) is "10" (first duration)
+        # match.group(3) is "20" (second duration)
+        prefix = match.group(1)
+        dur1 = int(match.group(2)) * 8
+        dur2 = int(match.group(3)) * 8
+
+        return f"pbf_press_button({prefix}, {dur1}ms, {dur2}ms);"
+
+    new_content: str = re.sub(pattern, replace_button_ticks_with_milliseconds, old_content)
+
+    return new_content
+
+
+def replace_pbf_dpad(old_content: str) -> str:
+    # Regex pattern:
+    # 1. Matches "pbf_press_button_old("
+    function_name = r"pbf_press_dpad_old\("
+    # 2. Group 1: Captures first 2 arguments: (.*?, .*?)
+    group_1 = r"(.*?,\s*.*?)"
+    # 3. Group 2, 3: Captures last 2 numeric durations: (\d+), (\d+)
+    group_2 = r"(\d+)"
+    group_3 = r"(\d+)"
+    pattern = function_name + group_1 + r",\s*" + group_2 + r",\s*" + group_3 + r"\);"
+
+    def replace_dpad_ticks_with_milliseconds(match):
+        # e.g. pbf_press_dpad_old(context, DPAD_UP, 10, 20);
+        # match.group(1) is "context, BUTTON_A,"
+        # match.group(2) is "10" (first duration)
+        # match.group(3) is "20" (second duration)
+        prefix = match.group(1)
+        dur1 = int(match.group(2)) * 8
+        dur2 = int(match.group(3)) * 8
+
+        return f"pbf_press_dpad({prefix}, {dur1}ms, {dur2}ms);"
+
+    new_content: str = re.sub(pattern, replace_dpad_ticks_with_milliseconds, old_content)
+
+    return new_content
+
+def replace_pbf_left_joystick4(old_content: str) -> str:
+    # Regex pattern:
+    # 1. Matches "pbf_move_left_joystick_old("
+    function_name = r"pbf_move_left_joystick_old\("
+    # 2. Group 1: Captures first argument: (.*?)
+    group_1 = r"(.*?)"
+    # 3. Group 2, 3: Captures next 2 numeric x, y: (\d+), (\d+)
+    group_2 = r"(\d+)"
+    group_3 = r"(\d+)"
+    # 4. Group 4 captures hold, delay duration: (\d+ms, \d+ms)
+    group_4 = r"(.*?,\s*.*?)"
+    pattern = function_name + group_1 + r",\s*" + group_2 + r",\s*" + group_3 +  r",\s*" + group_4 + r"\);"
+
+    def replace_joystick_u8_to_float(match):
+        # e.g. pbf_move_left_joystick_old(context, 128, 0, 160ms, 160ms);
+        # match.group(1) is "context"
+        # match.group(2) is 128 (x)
+        # match.group(3) is 0 (y)
+        # match.group(4) is 160ms, 160ms
+
+        # convert to: pbf_move_left_joystick(context, {0, +1}, 160ms, 160ms);
+        prefix = match.group(1)
+        x_float = linear_u8_to_float(int(match.group(2)))
+        y_float = -linear_u8_to_float(int(match.group(3)))
+
+        x_string = linear_float_to_string(x_float, 3)
+        y_string = linear_float_to_string(y_float, 3)
+
+        group_4 = match.group(4)
+
+        return f"pbf_move_left_joystick({prefix}, {{{x_string}, {y_string}}}, {group_4});"
+
+    new_content: str = re.sub(pattern, replace_joystick_u8_to_float, old_content)
+
+    return new_content
+
+def replace_pbf_left_joystick_flying_trial(old_content: str) -> str:
+    # Regex pattern:
+    # 1. Matches "pbf_move_left_joystick_old("
+    function_name = r"pbf_move_left_joystick_old\("
+    # 2. Group 1: Captures first argument: (.*?)
+    group_1 = r"(.*?)"
+    # 3. Group 2, 3: Captures next 2 numeric x, y: (\d+), (\d+)
+    group_2 = r"(\d+)"
+    group_3 = r"(-?\d+)"
+    # 4. Group 4 captures hold, delay duration: (\d+ms, \d+ms)
+    group_4 = r"(.*?,\s*.*?)"
+    pattern = function_name + group_1 + r",\s*" + group_2 + r",\s*get_final_y_axis\(\s*" + group_3 +  r"\),\s*" + group_4 + r"\);"
+
+    def replace_joystick_u8_to_float(match):
+        # e.g. pbf_move_left_joystick_old(context, 128, get_final_y_axis( 0), 160ms, 160ms);
+        # match.group(1) is "context"
+        # match.group(2) is 128 (x)
+        # match.group(3) is 0 (y)
+        # match.group(4) is 160ms, 160ms
+
+        # convert to: pbf_move_left_joystick(context, {0, +1}, 160ms, 160ms);
+        prefix = match.group(1)
+        x_float = linear_u8_to_float(int(match.group(2)))
+        y_magnitude = -float(match.group(3))/128.0
+
+        x_string = linear_float_to_string(x_float, 3)
+        y_string = linear_float_to_string(y_magnitude, 3)
+
+        group_4 = match.group(4)
+
+        return f"pbf_move_left_joystick({prefix}, {{{x_string}, get_final_y_axis({y_string})}}, {group_4});"
+
+    new_content: str = re.sub(pattern, replace_joystick_u8_to_float, old_content)
+
+    return new_content
+
+
+def replace_move_cursor_struct(old_content: str) -> str:
+    # Regex pattern:
+    # 1. Matches "pbf_move_left_joystick_old("
+    group_0 = r"\{ZoomChange::"
+    # 2. Group 1: Captures ZoomChange type: (.*?). e.g. KEEP_ZOOM
+    group_1 = r"(.*?)"
+    # 3. Group 2, 3: Captures next 2 numeric x, y: e.g. 0, 10
+    group_2 = r"(\d+)"
+    group_3 = r"(\d+)"
+    # 4. Group 4 captures move duration: e.g. 100ms
+    group_4 = r"(\d+ms)"
+    pattern = group_0 + group_1 + r",\s*" + group_2 + r",\s*"  + group_3 +  r",\s*"  + group_4 + r"\}"
+
+    def replace_joystick_u8_to_float(match):
+        # e.g. {ZoomChange::KEEP_ZOOM, 0, 10, 100ms}
+        # match.group(1) is "KEEP_ZOOM"
+        # match.group(2) is 0 (x)
+        # match.group(3) is 10 (y)
+        # match.group(4) is 100ms
+
+        zoom_change = match.group(1)
+        x_float = linear_u8_to_float(int(match.group(2)))
+        y_float = -linear_u8_to_float(int(match.group(3)))
+
+        x_string = linear_float_to_string(x_float, 3)
+        y_string = linear_float_to_string(y_float, 3)
+
+        group_4 = match.group(4)
+
+        return f"{{ZoomChange::{zoom_change}, {x_string}, {y_string}, {group_4}}}"
+
+    new_content: str = re.sub(pattern, replace_joystick_u8_to_float, old_content)
+
+    return new_content
+
+def replace_walk_forward_until_dialog(old_content: str) -> str:
+    # Regex pattern:
+    # 1. Matches "walk_forward_until_dialog("
+    function_name = r"walk_forward_until_dialog\("
+    # 2. Group 1: Captures first 5 arguments: e.g. env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_ONLY, 60000ms,
+    group_1 = r"(.*?,\s*.*?,\s*.*?,\s*.*?,\s*.*?)"
+    # 3. Group 2, 3: Captures last 2 numeric durations: e.g. 0, 128
+    group_2 = r"(\d+)"
+    group_3 = r"(\d+)"
+    pattern = function_name + group_1 + r",\s*" + group_2 +  r",\s*" + group_3 + r"\);"
+
+
+    def replace_joystick_u8_to_float(match):
+        # e.g. walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_ONLY, 60000ms, 0, 128);
+        # groups are defined as per the regex pattern above
+        # match.group(1) is "context, BUTTON_A"
+        # match.group(2) is "10" (first duration)
+        prefix = match.group(1)
+        x_float = linear_u8_to_float(int(match.group(2)))
+        y_float = -linear_u8_to_float(int(match.group(3)))
+
+        x_string = linear_float_to_string(x_float, 3)
+        y_string = linear_float_to_string(y_float, 3)
+
+        return f"walk_forward_until_dialog({prefix}, {x_string}, {y_string});"
+
+    new_content: str = re.sub(pattern, replace_joystick_u8_to_float, old_content)
+
+    return new_content
+
+def replace_realign_player(old_content: str) -> str:
+    # Regex pattern:
+    # 1. Matches "realign_player("
+    function_name = r"realign_player\("
+    # 2. Group 1: Captures first 4 arguments: e.g. env.program_info(), env.console, context, PlayerRealignMode::REALIGN_NEW_MARKER,
+    group_1 = r"(.*?,\s*.*?,\s*.*?,\s*.*?)"
+    # 3. Group 2, 3: Captures x, y: e.g. 0, 128
+    group_2 = r"(\d+)"
+    group_3 = r"(\d+)"
+    # 4. Group 4: Captures duration: e.g. 80 ticks
+    group_4 = r"(\d+)"
+    pattern = function_name + group_1 + r",\s*" + group_2 +  r",\s*" + group_3 +  r",\s*" + group_4 + r"\);"
+
+
+    def replace_joystick_u8_to_float(match):
+        # e.g. realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_NEW_MARKER, 128, 0, 80);
+        # groups are defined as per the regex pattern above
+        # match.group(1) is "env.program_info(), env.console, context, PlayerRealignMode::REALIGN_NEW_MARKER"
+        # match.group(2) is "128" (first duration)
+        # match.group(3) is "0" (first duration)
+        # match.group(4) is "80" (first duration)
+        prefix = match.group(1)
+        x_float = linear_u8_to_float(int(match.group(2)))
+        y_float = -linear_u8_to_float(int(match.group(3)))
+        duration = int(match.group(4)) * 8
+
+        x_string = linear_float_to_string(x_float, 3)
+        y_string = linear_float_to_string(y_float, 3)
+
+        return f"realign_player({prefix}, {x_string}, {y_string}, {duration}ms);"
+
+    new_content: str = re.sub(pattern, replace_joystick_u8_to_float, old_content)
+
+    return new_content
+
+def replace_map_move_cursor_fly(old_content: str) -> str:
+    # Regex pattern:
+    # 1. Matches "map_move_cursor_fly("
+    function_name = r"map_move_cursor_fly\("
+    # 2. Group 1: Captures first 3 arguments: e.g. info, stream, context
+    group_1 = r"(.*?,\s*.*?,\s*.*?)"
+    # 3. Group 2, 3: Captures x, y: e.g. 0, 128
+    group_2 = r"(\d+)"
+    group_3 = r"(\d+)"
+    # 4. Group 4: Captures rest of arguments: e.g. 1840ms, 160ms, "Polar Rest Area"
+    group_4 = r"(.*?)"
+    pattern = function_name + group_1 + r",\s*" + group_2 +  r",\s*" + group_3 +  r",\s*" + group_4 + r"\);"
+
+
+    def replace_joystick_u8_to_float(match):
+        # e.g. map_move_cursor_fly(info, stream, context, 75, 0, 1840ms, 160ms, "Polar Rest Area");
+        # groups are defined as per the regex pattern above
+        prefix = match.group(1)
+        x_float = linear_u8_to_float(int(match.group(2)))
+        y_float = -linear_u8_to_float(int(match.group(3)))
+        suffix = match.group(4)
+
+        x_string = linear_float_to_string(x_float, 3)
+        y_string = linear_float_to_string(y_float, 3)
+
+        return f"map_move_cursor_fly({prefix}, {x_string}, {y_string}, {suffix});"
+
+    new_content: str = re.sub(pattern, replace_joystick_u8_to_float, old_content)
+
+    return new_content
+    
+def replace_overworld_navigation(old_content: str) -> str:
+    # Regex pattern:
+    # 1. Matches "overworld_navigation("
+    function_name = r"overworld_navigation\("
+    # 2. Group 1: Captures first 5 arguments: e.g. env.program_info(), env.console, context, NavigationStopCondition::STOP_DIALOG, NavigationMovementMode::DIRECTIONAL_ONLY
+    group_1 = r"(.*?,\s*.*?,\s*.*?,\s*.*?,\s*.*?,\s*)"
+    # 3. Group 2, 3: Captures x, y: e.g. 0, 128
+    group_2 = r"(\d+)"
+    group_3 = r"(\d+)"
+    # 4. Group 4: Captures rest of arguments: e.g. 20, 20, true, true
+    group_4 = r"(.*?)"
+    pattern = function_name + group_1 + group_2 +  r",\s*" + group_3 +  r",\s*" + group_4 + r"\);"
+
+
+    def replace_joystick_u8_to_float(match):
+        # e.g. overworld_navigation(env.program_info(), env.console, context, NavigationStopCondition::STOP_DIALOG, NavigationMovementMode::DIRECTIONAL_ONLY, 128, 0, 20, 20, true, true);
+        # groups are defined as per the regex pattern above
+        prefix = match.group(1)
+        x_float = linear_u8_to_float(int(match.group(2)))
+        y_float = -linear_u8_to_float(int(match.group(3)))
+        suffix = match.group(4)
+
+        x_string = linear_float_to_string(x_float, 3)
+        y_string = linear_float_to_string(y_float, 3)
+
+        return f"overworld_navigation({prefix}{x_string}, {y_string}, {suffix});"
+
+    new_content: str = re.sub(pattern, replace_joystick_u8_to_float, old_content)
+
+    return new_content
+
+
+def replace_ssf_press_left_joystick(old_content: str) -> str:
+    # Regex pattern:
+    # 1. Matches "overworld_navigation("
+    function_name = r"ssf_press_left_joystick_old\("
+    # 2. Group 1: Captures first argument: e.g. context, STICK_MAX, STICK_MAX
+    group_1 = r"(.*?,\s*.*?,\s*.*?)"
+    # 3. Group 2, 3: Captures last 2 numeric durations: e.g. 0, 128
+    group_2 = r"(\d+)"
+    group_3 = r"(\d+)"
+    pattern = function_name + group_1 +  r",\s*" + group_2 +  r",\s*" + group_3 +  r"\);"
+
+
+    def replace_ticks_to_milliseconds(match):
+        # e.g. ssf_press_left_joystick_old(context, STICK_MAX, STICK_MAX, 400ms, 400ms);
+        # groups are defined as per the regex pattern above
+        prefix = match.group(1)
+        dur1 = int(match.group(2)) * 8
+        dur2 = int(match.group(3)) * 8
+
+        return f"ssf_press_left_joystick_old({prefix}, {dur1}ms, {dur2}ms);"
+
+    new_content: str = re.sub(pattern, replace_ticks_to_milliseconds, old_content)
+
+    return new_content
+
+def replace_ssf_press_left_joystick2(old_content: str) -> str:
+    # Regex pattern:
+    # 1. Matches "overworld_navigation("
+    function_name = r"ssf_press_left_joystick_old\("
+    # 2. Group 1: Captures first argument: e.g. context
+    group_1 = r"(.*?)"
+    # 3. Group 2, 3: Captures x, y: e.g. STICK_MAX, STICK_MAX
+    group_2 = r"(.*?)"
+    group_3 = r"(.*?)"
+    # 4. Group 4: Captures rest of arguments: e.g. 400ms, 400ms
+    group_4 = r"(.*?)"
+    pattern = function_name + group_1 +  r",\s*" + group_2 +  r",\s*" + group_3 +  r",\s*" + group_4 + r"\);"
+
+
+    def replace_joystick_u8_to_float(match):
+        # e.g. ssf_press_left_joystick_old(context, STICK_MAX, STICK_MAX, 400ms, 400ms);
+        # groups are defined as per the regex pattern above
+        prefix = match.group(1)
+        x = match.group(2)
+        y = match.group(3)
+        # print(match)
+        x_string = ""
+        y_string = ""
+        try:
+            x_float = -10
+            if x == "STICK_MAX":
+                x_float = 1
+            elif x == "STICK_CENTER":
+                x_float = 0
+            elif x == "STICK_MIN":
+                x_float = -1
+            else:
+                x_float = linear_u8_to_float(int(x))
+
+            x_string = linear_float_to_string(x_float, 3)
+        except ValueError:
+            x_string = x
+        
+        try:
+            y_float = -10
+            if y == "STICK_MIN":
+                y_float = 1
+            elif y == "STICK_CENTER":
+                y_float = 0
+            elif y == "STICK_MAX":
+                y_float = -1
+            else:
+                y_float = -linear_u8_to_float(int(y))
+
+            y_string = linear_float_to_string(y_float, 3)
+        except ValueError:
+            y_string = y
+
+
+        suffix = match.group(4)
+
+        return f"ssf_press_left_joystick({prefix}, {{{x_string}, {y_string}}}, {suffix});"
+
+    new_content: str = re.sub(pattern, replace_joystick_u8_to_float, old_content)
+
+    return new_content
+
+def linear_float_to_string(x: float, decimal_places: int) -> str:
+    if (x == 0):
+        return "0"
+    if (x == 1):
+        return "+1"
+    if (x == -1):
+        return "-1"
+    elif (x > 0):
+        return "+" + str(round(x, decimal_places))
+    else:  #(x < 0):
+        return str(round(x, decimal_places))
+
+def linear_u8_to_float(x: int) -> float:
+    if (x == 128):
+        return 0
+    elif (x == 64):
+        return -0.5
+    elif (x == 192):
+        return 0.5
+    elif (x < 128):
+        return (x - 128) * (1. / 128)
+    else: # x > 128
+        return (x - 128) * (1. / 127)
+
+
+# top_dir: top level directory, within which it will be recursively searched for .cpp files
+# replace_content: the function that returns the new file content that will replace the old
+def find_replace(top_dir, replace_content):
+    for filepath in glob.iglob(top_dir, recursive=True):
+        path = Path(filepath)
+        if not path.is_file():
+            continue
+
+        # 1. Read the file
+        # we need newline='' so that line endings are preserved
+        with open(filepath, 'r', encoding='utf-8', newline='') as f:
+            content = f.read()
+
+        # 2. Perform the global substitution
+        updated_content = replace_content(content)
+
+        if (updated_content == content): # don't overwrite the file if the file content is the same
+            continue
+
+        # 3. Overwrite the file
+        with open(filepath, 'w', encoding='utf-8', newline='') as f:
+            f.write(updated_content)
+
+
+
+# globpath = '../Pokemon-Arduino-Source/SerialPrograms/Source/**/*.cpp'
+globpath = '../Pokemon-Arduino-Source/SerialPrograms/Source/**/*.*'
+
+# find_replace(globpath, replace_pbf_left_joystick)
+# find_replace_line_by_line(globpath, replace_pbf_left_joystick)
+# find_replace(globpath, replace_mash_button)
+# find_replace(globpath, replace_pbf_wait)
+# find_replace(globpath, replace_pbf_button)
+# find_replace(globpath, replace_pbf_dpad)
+find_replace(globpath, replace_ssf_press_left_joystick2)
\ No newline at end of file
diff --git a/SerialPrograms/Scripts/image_region_check.py b/SerialPrograms/Scripts/image_region_check.py
index 4fc1004bdc..49dd4c6f12 100644
--- a/SerialPrograms/Scripts/image_region_check.py
+++ b/SerialPrograms/Scripts/image_region_check.py
@@ -1,159 +1,176 @@
-"""
-Functions to check stats on image regions: what's the average color of this region and the std dev of the color of this region.
-These stats is useful for image inferences like whether the current screen shows a pokemon battle menu.
-The code here matches the implementation in C++, so that we can quickly prototype and debug image inference code in Python.
-"""
-import cv2
-import sys
-import numpy as np
-from typing import Tuple, Union, List, NamedTuple
-from dataclasses import dataclass
-
-class Stats(NamedTuple):
-	# RGB order in this class
-	
-	avg: np.ndarray
-	
-	avg_sum: float
-	
-	stddev: np.ndarray
-	
-	stddev_sum: float
-
-	color_ratio: np.ndarray
-
-	# Crop size: width, height
-	crop_size: Tuple[int, int]
-
-	def to_str(self) -> str:
-		avg = self.avg
-		ratio = self.color_ratio
-		stdev = self.stddev
-		return (
-			f"RGB avg [{int(avg[0]+0.5)}, {int(avg[1]+0.5)}, {int(avg[2]+0.5)}]"
-			+ f" avg sum {int(self.avg_sum+0.5)} ratio [{ratio[0]:.3f}, {ratio[1]:.3f}, {ratio[2]:.3f}]"
-			+ f" stddev [{stdev[0]:.3f}, {stdev[1]:.3f}, {stdev[2]:.3f}] sum {self.stddev_sum:.3f}"
-			+ f" crop size {self.crop_size}"
-		)
-
-
-
-def _get_region(image: np.ndarray, x: float, y: float, w: float, h: float) -> Tuple[int, int, int, int]:
-	"""
-	Given an image and (x, y, w, h) denoting a resolution-independent region, return
-	the actual region in pixel counts.
-	"""
-	height = image.shape[0]
-	width = image.shape[1]
-	start_x = int(x * width + 0.5)
-	start_y = int(y * height + 0.5)
-	rect_width = int(w * width + 0.5)
-	rect_height = int(h * height + 0.5)
-	end_x = start_x + rect_width
-	end_y = start_y + rect_height
-	return start_x, start_y, end_x, end_y
-
-
-def add_rect(image: np.ndarray, x: float, y: float, w: float, h: float, color=(0, 0, 255)) -> np.ndarray:
-	"""
-	Add a red rectangle around a region, where (x, y, w, h) denoting a resolution-independent region.
-	"""
-	start_x, start_y, end_x, end_y = _get_region(image, x, y, w, h)
-	# print(start_x, start_y, end_x, end_y)
-	image = cv2.rectangle(image, (start_x, start_y), (end_x, end_y), color, 2)
-	return image
-
-def _get_stats(image: np.ndarray, x: float, y: float, w: float, h: float) -> Stats:
-	"""
-	Given (x, y, w, h) denoting a resolution-independent region, return the color stats of the region.
-	
-	Return the average color of the region and the std dev of the region.
-	"""
-	start_x, start_y, end_x, end_y = _get_region(image, x, y, w, h)
-	crop = image[start_y:end_y, start_x:end_x].astype(float)
-	num_pixels = crop.shape[0] * crop.shape[1]
-	crop_sum = np.sum(crop, (0, 1))
-	crop_avg = crop_sum / num_pixels
-	avg_sum = np.sum(crop_avg)
-	crop_color_ratio = [1/3., 1/3., 1/3.] if avg_sum <= 1e-6 else crop_avg / avg_sum
-	crop_color_ratio = np.array([crop_color_ratio[2], crop_color_ratio[1], crop_color_ratio[0]])
-
-	crop_sqr_sum = np.sum(np.square(crop), (0, 1))
-	crop_stddev = np.sqrt((crop_sqr_sum - (np.square(crop_sum) / num_pixels)) / (num_pixels-1))
-	crop_stddev_sum = np.sum(crop_stddev)
-	return Stats(
-		avg = np.flip(crop_avg), # from BGR to RGB
-		avg_sum = avg_sum,
-		stddev = np.flip(crop_stddev), # from BGR to RGB
-		stddev_sum = crop_stddev_sum,
-		color_ratio = crop_color_ratio,
-		crop_size=(end_x - start_x, end_y - start_y),
-	)
-
-def add_infer_box_to_image(
-	image: np.ndarray,
-	x: float, y: float, w: float, h: float,
-	rendered_image: np.ndarray,
-	color=(0,0,255)
-) -> np.ndarray:
-	stats = _get_stats(image, x, y, w, h)
-	ratio = stats.color_ratio
-	print(f"Add infer box: ({x:0.4f}, {y:0.4f}, {w:0.4f}, {h:0.4f}), {stats.to_str()}")
-	return add_rect(rendered_image, x, y, w, h, color)
-
-def _color_matched(
-	crop_color_ratio: np.ndarray,
-	crop_stddev_sum: float,
-	expected_color_ratio: Union[np.ndarray, Tuple[float, float, float]],
-	max_euclidean_distance: float,
-	max_stddev_sum: float
-) -> bool:
-	"""Check whether an inference box check is matched"""
-	dist = crop_color_ratio - np.array(expected_color_ratio)
-	dist = np.square(dist)
-	euclidean_distance = np.sqrt(np.sum(dist))
-
-	# print(f"stddev_sum: {stddev_sum} vs max {max_stddev_sum}, rgb actual: {actual}, eu_dist: {euclidean_distance} vs max {max_euclidean_distance}")
-	if crop_stddev_sum > max_stddev_sum:
-		return False
-	return euclidean_distance <= max_euclidean_distance
-
-
-@dataclass
-class RegionCheck:
-	# Name of the region
-	name: str
-	# (x, y, w, h) denoting a resolution-independent region
-	region: Tuple[float, float, float, float]
-	# extpected the color ratio, all three values sum to one
-	expected_color_ratio: Tuple[float, float, float]
-	# threshold for euclidendistance between the color aspect ratio (size-3 vecctor) of
-	# the current image and the expected ratio.
-	max_euclidean_distance: float
-	# threshold for sum of stddev from the three color channels.
-	max_stddev_sum: float
-
-	def check(self, image: np.ndarray) -> bool:
-		"""Check whether this image passes inference check."""
-		stats = _get_stats(image, *self.region)
-		crop_ratio = stats.color_ratio
-		crop_stddev_sum = stats.stddev_sum
-		print(f"Checking {self.name}")
-		print(stats.to_str())
-		solid = _color_matched(crop_ratio, crop_stddev_sum, self.expected_color_ratio, self.max_euclidean_distance, self.max_stddev_sum)
-		print(f"_color_matched? {solid}")
-		return solid
-
-
-def check_image(filename: str, regions: List[RegionCheck]) -> None:
-	"""Print whether an image saved in filename passes all region checks."""
-	image = cv2.imread(filename, cv2.IMREAD_UNCHANGED)
-	height = image.shape[0]
-	width = image.shape[1]
-	print(f"Load image {filename}, size: {width} x {height}")
-
-	for region in regions:
-		if region.check(image) == False:
-			print("====== Failed ======")
-			return
-	print("====== Passed ======")
\ No newline at end of file
+"""
+Functions to check stats on image regions: what's the average color of this region and the std dev of the color of this region.
+These stats is useful for image inferences like whether the current screen shows a pokemon battle menu.
+The code here matches the implementation in C++, so that we can quickly prototype and debug image inference code in Python.
+"""
+import cv2
+import sys
+import numpy as np
+from typing import Tuple, Union, List, NamedTuple
+from dataclasses import dataclass
+
+class Stats(NamedTuple):
+	# RGB order in this class
+	
+	avg: np.ndarray
+	
+	avg_sum: float
+	
+	stddev: np.ndarray
+	
+	stddev_sum: float
+
+	color_ratio: np.ndarray
+
+	# Crop size: width, height
+	crop_size: Tuple[int, int]
+
+	def to_str(self) -> str:
+		avg = self.avg
+		ratio = self.color_ratio
+		stdev = self.stddev
+		return (
+			f"RGB avg [{int(avg[0]+0.5)}, {int(avg[1]+0.5)}, {int(avg[2]+0.5)}]"
+			+ f" avg sum {int(self.avg_sum+0.5)} ratio [{ratio[0]:.3f}, {ratio[1]:.3f}, {ratio[2]:.3f}]"
+			+ f" stddev [{stdev[0]:.3f}, {stdev[1]:.3f}, {stdev[2]:.3f}] sum {self.stddev_sum:.3f}"
+			+ f" crop size {self.crop_size}"
+		)
+
+
+
+def _get_region(image: np.ndarray, x: float, y: float, w: float, h: float) -> Tuple[int, int, int, int]:
+	"""
+	Given an image and (x, y, w, h) denoting a resolution-independent region, return
+	the actual region in pixel counts.
+	"""
+	height = image.shape[0]
+	width = image.shape[1]
+	start_x = int(x * width + 0.5)
+	start_y = int(y * height + 0.5)
+	rect_width = int(w * width + 0.5)
+	rect_height = int(h * height + 0.5)
+	end_x = start_x + rect_width
+	end_y = start_y + rect_height
+	return start_x, start_y, end_x, end_y
+
+
+def add_rect(image: np.ndarray, x: float, y: float, w: float, h: float, color=(0, 0, 255)) -> np.ndarray:
+	"""
+	Add a red rectangle around a region, where (x, y, w, h) denoting a resolution-independent region.
+	"""
+	start_x, start_y, end_x, end_y = _get_region(image, x, y, w, h)
+	# print(start_x, start_y, end_x, end_y)
+	image = cv2.rectangle(image, (start_x, start_y), (end_x, end_y), color, 2)
+	return image
+
+def _get_stats(image: np.ndarray, x: float, y: float, w: float, h: float) -> Stats:
+	"""
+	Given (x, y, w, h) denoting a resolution-independent region, return the color stats of the region.
+	
+	Return the average color of the region and the std dev of the region.
+	"""
+	start_x, start_y, end_x, end_y = _get_region(image, x, y, w, h)
+	crop = image[start_y:end_y, start_x:end_x].astype(float)
+	num_pixels = crop.shape[0] * crop.shape[1]
+	crop_sum = np.sum(crop, (0, 1))
+	crop_avg = crop_sum / num_pixels
+	avg_sum = np.sum(crop_avg)
+	crop_color_ratio = [1/3., 1/3., 1/3.] if avg_sum <= 1e-6 else crop_avg / avg_sum
+	crop_color_ratio = np.array([crop_color_ratio[2], crop_color_ratio[1], crop_color_ratio[0]])
+
+	crop_sqr_sum = np.sum(np.square(crop), (0, 1))
+	crop_stddev = np.sqrt((crop_sqr_sum - (np.square(crop_sum) / num_pixels)) / (num_pixels-1))
+	crop_stddev_sum = np.sum(crop_stddev)
+	return Stats(
+		avg = np.flip(crop_avg), # from BGR to RGB
+		avg_sum = avg_sum,
+		stddev = np.flip(crop_stddev), # from BGR to RGB
+		stddev_sum = crop_stddev_sum,
+		color_ratio = crop_color_ratio,
+		crop_size=(end_x - start_x, end_y - start_y),
+	)
+
+def add_infer_box_to_image(
+	image: np.ndarray,
+	x: float, y: float, w: float, h: float,
+	rendered_image: np.ndarray,
+	color=(0,0,255)
+) -> np.ndarray:
+	stats = _get_stats(image, x, y, w, h)
+	width_p = int(w * image.shape[1] + 0.5)
+	height_p = int(h * image.shape[0] + 0.5)
+	print(f"Add infer box: ({x:0.4f}, {y:0.4f}, {w:0.4f}, {h:0.4f}), {width_p} x {height_p}, {stats.to_str()}")
+	return add_rect(rendered_image, x, y, w, h, color)
+
+def _color_matched(
+	crop_color_ratio: np.ndarray,
+	crop_stddev_sum: float,
+	expected_color_ratio: Union[np.ndarray, Tuple[float, float, float]],
+	max_euclidean_distance: float,
+	max_stddev_sum: float
+) -> bool:
+	"""Check whether an inference box check is matched"""
+	dist = crop_color_ratio - np.array(expected_color_ratio)
+	dist = np.square(dist)
+	euclidean_distance = np.sqrt(np.sum(dist))
+
+	# print(f"stddev_sum: {stddev_sum} vs max {max_stddev_sum}, rgb actual: {actual}, eu_dist: {euclidean_distance} vs max {max_euclidean_distance}")
+	if crop_stddev_sum > max_stddev_sum:
+		return False
+	return euclidean_distance <= max_euclidean_distance
+
+
+@dataclass
+class RegionCheck:
+	# Name of the region
+	name: str
+	# (x, y, w, h) denoting a resolution-independent region
+	region: Tuple[float, float, float, float]
+	# extpected the color ratio, all three values sum to one
+	expected_color_ratio: Tuple[float, float, float]
+	# threshold for euclidendistance between the color aspect ratio (size-3 vecctor) of
+	# the current image and the expected ratio.
+	max_euclidean_distance: float
+	# threshold for sum of stddev from the three color channels.
+	max_stddev_sum: float
+
+	def check(self, image: np.ndarray) -> bool:
+		"""Check whether this image passes inference check."""
+		stats = _get_stats(image, *self.region)
+		crop_ratio = stats.color_ratio
+		crop_stddev_sum = stats.stddev_sum
+		print(f"Checking {self.name}")
+		print(stats.to_str())
+		solid = _color_matched(crop_ratio, crop_stddev_sum, self.expected_color_ratio, self.max_euclidean_distance, self.max_stddev_sum)
+		print(f"_color_matched? {solid}")
+		return solid
+
+
+def check_image(filename: str, regions: List[RegionCheck]) -> None:
+	"""Print whether an image saved in filename passes all region checks."""
+	image = cv2.imread(filename, cv2.IMREAD_UNCHANGED)
+	height = image.shape[0]
+	width = image.shape[1]
+	print(f"Load image {filename}, size: {width} x {height}")
+
+	for region in regions:
+		if region.check(image) == False:
+			print("====== Failed ======")
+			return
+	print("====== Passed ======")
+
+
+def set_black_out_of_rect(image: np.ndarray, x: float, y: float, w: float, h: float):
+	"""Set regions outside of the rect on `image` to be black."""
+	height = image.shape[0]
+	width = image.shape[1]
+	start_x = int(x * width + 0.5)
+	start_y = int(y * height + 0.5)
+	rect_width = int(w * width + 0.5)
+	rect_height = int(h * height + 0.5)
+	end_x = start_x + rect_width
+	end_y = start_y + rect_height
+	
+	new_image = np.zeros(image.shape, dtype=image.dtype)
+	new_image[start_y:end_y, start_x:end_x] = image[start_y:end_y, start_x:end_x]
+	image[...] = new_image[...]
\ No newline at end of file
diff --git a/SerialPrograms/Scripts/image_viewer.py b/SerialPrograms/Scripts/image_viewer.py
index b7fd52bf9e..aea6ee590e 100755
--- a/SerialPrograms/Scripts/image_viewer.py
+++ b/SerialPrograms/Scripts/image_viewer.py
@@ -1,253 +1,334 @@
-#!/usr/local/bin/python3
-
-"""
-A simple image viewer (using OpenCV) with basic ability to check pixel location and color.
-It can also draw boxes on the image and print their locations. Useful for writing 
-PokemonAutomation visual inference methods.
-
-Single left clicking on a pixel shows you the info of that pixel. Note it may also print the
-alpha channel value.
-
-- Press 'w', 's', 'a', 'd' to move the slected pixels around.
-
-To draw a box: left click and drag the rectange.
-You can draw multiple boxes on the screen.
-
-- Press 'i' to dump the information of those boxes so you can copy them into the code,
-  or into check_detector_regions.py to fine tune the boxes.
-
-- Press 'backspace/delete' to delete the current selected box. If no box is selected,
-  delete the last added box. Select an existing box by right clicking.
-
-- Press 'ESC' to exit the program.
-"""
-
-
-import cv2
-import numpy as np
-
-class ImageViewer:
-	def __init__(self, image, highlight_list = []):
-		self.image = image
-		self.hsv_image = cv2.cvtColor(image, cv2.COLOR_RGB2HSV)
-		self.selected_pixel = (-1, -1)
-		self.buffer = image.copy()
-		self.window_name = 'image'
-		self.height = image.shape[0]
-		self.width = image.shape[1]
-		self.highlight_list = highlight_list
-		self.cur_highlight_index = -1
-		self.rects = [] # List of Tuple[int,int,int,int]: each tuple: start_x, start_y, end_x, end_y
-		self.cur_rect_index = -1
-		self.mouse_down = False
-		self.mouse_move_counter = 0
-		self.nc = image.shape[2]  # num_channel
-		# The size of the cross used to highlight a slected pixel
-		self.cross_size = max(1, min(self.width, self.height) // 200)
-
-	def _solid_color(self, color):
-		return color if self.image.shape[2] == 3 else color + [255]
-
-	def _set_color_to_buffer(self, coord, color):
-		x, y = coord
-		if x >= 0 and x < self.width and y >= 0 and y < self.height:
-			self.buffer[y, x] = self._solid_color(color)
-
-	def _render(self):
-		self.buffer = self.image.copy()
-		if self.selected_pixel[0] >= 0 and self.selected_pixel[1] >= 0:
-			p = self.selected_pixel
-			# Draw a red cross
-			self._set_color_to_buffer(p, color=[0, 0, 255])
-			for i in range(1, self.cross_size):
-				self._set_color_to_buffer((p[0]-i, p[1]), color=[0, 0, 255])
-				self._set_color_to_buffer((p[0]+i, p[1]), color=[0, 0, 255])
-				self._set_color_to_buffer((p[0], p[1]-i), color=[0, 0, 255])
-				self._set_color_to_buffer((p[0], p[1]+i), color=[0, 0, 255])
-
-		if self.cur_highlight_index >= 0 and len(self.highlight_list) > 0:
-			for pixel in self.highlight_list[self.cur_highlight_index]:
-				self.buffer[pixel[1], pixel[0]] = self._solid_color([255, 0, 0])
-
-		for i, rect in enumerate(self.rects):
-			# print(f"In render(): {rect}")
-			# rect: [start_x start_y end_x end_y]
-			width = 2
-			color = (0, 0, 255) if i == self.cur_rect_index else (255, 0, 0)
-			self.buffer = cv2.rectangle(self.buffer, (rect[0], rect[1]), (rect[2], rect[3]), color, width)
-
-		cv2.imshow(self.window_name, self.buffer)
-		# self.fullscreen = False
-
-	def _change_selected_rect(self, x, y):
-		if len(self.rects) == 0:
-			return
-
-		min_dist = 0
-		for i, rect in enumerate(self.rects):
-			min_x = min(rect[0], rect[2])
-			max_x = max(rect[0], rect[2])
-			min_y = min(rect[1], rect[3])
-			max_y = max(rect[1], rect[3])
-			dist_x = min_x - x if x <= min_x else (x - max_x if x >= max_x else 0)
-			dist_y = min_y - y if y <= min_y else (y - max_y if y >= max_y else 0)
-			dist = dist_x ** 2 + dist_y ** 2
-			if i == 0 or dist < min_dist:
-				min_dist = dist
-				self.cur_rect_index = i
-		print(f"Selected rect No.{self.cur_rect_index}/{len(self.rects)}: {rect}.")
-
-	def _print_pixel(self, coord):
-		p = self.image[coord[1], coord[0]]
-		print(f"Pixel (x,y) = ({coord[0]}, {coord[1]}), ({coord[0]/self.width:0.3}, {coord[1]/self.height:0.3}), "
-		+ f"rgb=[{str(p[3]) + ',' if self.nc == 4 else ''}{p[2]},{p[1]},{p[0]}] hsv={self.hsv_image[coord[1], coord[0]]}")
-
-	def _print_rect(self, i, rect):
-		crop = self.image[rect[1]:rect[3], rect[0]:rect[2]].astype(float) / 255.0
-		num_pixels = crop.shape[0] * crop.shape[1]
-		# crop_sum shape: (4), 4 is channel count
-		crop_sum = np.sum(crop, (0, 1))
-		# crop_avg shape: (4), 4 is channel count
-		crop_avg = crop_sum / num_pixels
-		# crop_sqr_sum shape: (4), 4 is channel count
-		crop_sqr_sum = np.sum(np.square(crop), (0, 1))
-		
-		crop_stddev = np.sqrt(  np.clip(crop_sqr_sum - (np.square(crop_sum) / num_pixels), 0, None) / (num_pixels-1))
-
-		avg_sum = np.sum(crop_avg)
-		avg_ratio = [1/3., 1/3., 1/3.] if avg_sum == 0. else crop_avg / avg_sum
-		avg_ratio = np.array([avg_ratio[2], avg_ratio[1], avg_ratio[0]])
-		x = rect[0] / self.width
-		y = rect[1] / self.height
-		w = (rect[2] - rect[0]) / self.width
-		h = (rect[3] - rect[1]) / self.height
-
-		stddev_sum = np.sum(crop_stddev)
-		print(f"Rect No.{i}, ({x:.3f}, {y:.3f}, {w:.3f}, {h:.3f}) rgb ratio: {avg_ratio[0]:.3f}:{avg_ratio[1]:.3f}:{avg_ratio[2]:.3f}, stddev sum: {stddev_sum:.3g}")
-
-	def _move_crop(self, o0, o1, o2, o3):
-		if self.cur_crop_index >= 0 and self.cur_crop_index < len(self.crops):
-			self.crops[self.cur_crop_index][0] += o0
-			self.crops[self.cur_crop_index][1] += o1
-			self.crops[self.cur_crop_index][2] += o2
-			self.crops[self.cur_crop_index][3] += o3
-			self._render()
-
-	def _mouse_callback(self, event, x, y, flags, param):
-		redraw = False
-
-		# Dragging selected_pixel rectangle
-		if event == cv2.EVENT_LBUTTONDOWN:
-			self.mouse_down = True
-			self.cur_rect_index = len(self.rects)
-			self.rects.append([x, y, x, y])
-			self.mouse_move_counter = 0
-		elif event == cv2.EVENT_LBUTTONUP:
-			self.mouse_down = False
-			assert len(self.rects) > 0
-			if self.rects[-1][0] == self.rects[-1][2] and self.rects[-1][1] == self.rects[-1][3]:
-				self.cur_rect_index -= 1
-				self.rects.pop()
-				self._change_selected_rect(x, y)
-				self._print_pixel((x, y))
-				if self.selected_pixel != (x, y):
-					self.selected_pixel = (x, y)
-					redraw = True
-			else:
-				# sanitize the rect:
-				if self.cur_rect_index >= 0 and self.cur_rect_index < len(self.rects):
-					rect = self.rects[self.cur_rect_index]
-					min_x = min(rect[0], rect[2])
-					max_x = max(rect[0], rect[2])
-					min_y = min(rect[1], rect[3])
-					max_y = max(rect[1], rect[3])
-					rect[0] = min_x
-					rect[1] = min_y
-					rect[2] = max_x
-					rect[3] = max_y
-			redraw = True
-			mouse_move_counter = 0
-		elif event == cv2.EVENT_RBUTTONUP: # right click to select existing rect to edit
-			if len(self.rects) > 0:
-				self._change_selected_rect(x, y)
-				redraw = True
-		elif event == cv2.EVENT_MOUSEMOVE and self.mouse_down:
-			if self.cur_rect_index >= 0 and self.cur_rect_index < len(self.rects):
-				old_loc = (self.rects[self.cur_rect_index][2], self.rects[self.cur_rect_index][3])
-				if old_loc != (x, y):
-					self.rects[self.cur_rect_index][2] = x
-					self.rects[self.cur_rect_index][3] = y
-					# if mouse_move_counter % 2 == 0:
-					redraw = True
-			self.mouse_move_counter += 1
-
-		if redraw:
-			self._render()
-
-	def run(self):
-		
-		cv2.imshow(self.window_name, self.buffer)
-		cv2.setWindowProperty(self.window_name, cv2.WND_PROP_TOPMOST, 1)
-		cv2.setMouseCallback(self.window_name, self._mouse_callback)
-		
-		while True:
-			key = cv2.waitKey(0)
-
-			if key == 27: # esc
-				cv2.destroyAllWindows()
-				break
-			elif key == 119: # w
-				if self.selected_pixel[0] >= 0 and self.selected_pixel[1] >= 1:
-					self.selected_pixel = (self.selected_pixel[0], self.selected_pixel[1]-1)
-					self._print_pixel(self.selected_pixel)
-			elif key == 115: # s
-				if self.selected_pixel[0] >= 0 and self.selected_pixel[1] >= 0 and self.selected_pixel[1] + 1 < self.height:
-					self.selected_pixel = (self.selected_pixel[0], self.selected_pixel[1]+1)
-					self._print_pixel(self.selected_pixel)
-			elif key == 97: # a
-				if self.selected_pixel[0] >= 1 and self.selected_pixel[1] >= 0:
-					self.selected_pixel = (self.selected_pixel[0]-1, self.selected_pixel[1])
-					self._print_pixel(self.selected_pixel)
-			elif key == 100: # d
-				if self.selected_pixel[0] >= 0 and self.selected_pixel[1] >= 0 and self.selected_pixel[0] + 1 < self.width:
-					self.selected_pixel = (self.selected_pixel[0]+1, self.selected_pixel[1])
-					self._print_pixel(self.selected_pixel)
-			elif key == 44: # ,
-				if len(self.highlight_list) > 0:
-					self.cur_highlight_index = len(self.highlight_list) - 1 if self.cur_highlight_index < 0 else self.cur_highlight_index-1
-					print(f"Change highlight index to {self.cur_highlight_index}/{len(self.highlight_list)}")
-			elif key == 46: # .
-				if len(self.highlight_list) > 0:
-					self.cur_highlight_index = -1 if self.cur_highlight_index == len(self.highlight_list)-1 else self.cur_highlight_index+1
-					print(f"Change highlight index to {self.cur_highlight_index}/{len(self.highlight_list)}")
-			elif key == 127: # backspace, remove selected rectangle
-				mouse_down = False
-				mouse_move_counter = 0
-				if len(self.rects) > 0:
-					if self.cur_rect_index < 0:
-						self.cur_rect_index = len(self.crops) - 1
-					del self.rects[self.cur_rect_index]
-					if len(self.rects) == 0:
-						self.cur_rect_index = -1
-					elif self.cur_rect_index >= len(self.rects):
-						self.cur_rect_index = len(self.rects) - 1
-			elif key == 105: # i
-				for i, rect in enumerate(self.rects):
-					self._print_rect(i, rect)
-			else:
-				print(f"Pressed key {key}")
-			self._render()
-
-if __name__ == '__main__':
-	import sys
-	assert len(sys.argv) == 2
-
-	filename = sys.argv[1]
-
-	image = cv2.imread(filename, cv2.IMREAD_UNCHANGED)
-
-	height = image.shape[0]
-	width = image.shape[1]
-	print(f"Load image from {filename}, size: {width} x {height}")
-	viewer = ImageViewer(image)
-	viewer.run()
\ No newline at end of file
+#!python3
+
+"""
+A simple image viewer (using OpenCV) with basic ability to check pixel location and color.
+It can also draw boxes on the image and print their locations. Useful for writing 
+PokemonAutomation visual inference methods.
+
+Single left clicking on a pixel shows you the info of that pixel. Note it may also print the
+alpha channel value.
+
+- Press 'w', 's', 'a', 'd' to move the selected pixels around.
+
+To draw a box: left click and drag the rectangle.
+You can draw multiple boxes on the screen.
+
+- Press 'i' to dump the information of those boxes so you can copy them into the code,
+  or into check_detector_regions.py to fine tune the boxes.
+
+- Press 'backspace/delete' to delete the current selected box. If no box is selected,
+  delete the last added box. Select an existing box by right clicking.
+
+- Press 'ESC' to exit the program.
+"""
+
+
+import argparse
+import cv2
+import numpy as np
+
+class ImageViewer:
+	def __init__(self, image: np.ndarray, highlight_list = []):
+		if image.ndim == 2:
+			# convert gray scale image to RGB image
+			image = cv2.cvtColor(image, cv2.COLOR_GRAY2BGR)
+		self.image = image  # bgr or bgra channel order
+		self.nc = image.shape[2]  # num_channel
+		if self.nc == 4:
+			alpha_free_image = cv2.cvtColor(image, cv2.COLOR_BGRA2BGR)
+		else:
+			alpha_free_image = image
+		self.hsv_image = cv2.cvtColor(alpha_free_image, cv2.COLOR_BGR2HSV)
+		self.selected_pixel = (-1, -1)
+		self.buffer = image.copy()
+		self.window_name = 'image'
+		self.height = image.shape[0]
+		self.width = image.shape[1]
+		self.highlight_list = highlight_list
+		self.cur_highlight_index = -1
+		self.rects = [] # List of Tuple[int,int,int,int]: each tuple: start_x, start_y, end_x, end_y
+		self.cur_rect_index = -1
+		self.mouse_down = False
+		self.mouse_move_counter = 0
+		# The size of the cross used to highlight a selected pixel
+		self.cross_size = max(1, min(self.width, self.height) // 200)
+
+	def _solid_color(self, color):
+		return color if self.image.shape[2] == 3 else color + [255]
+
+	def _set_color_to_buffer(self, coord, color):
+		x, y = coord
+		if x >= 0 and x < self.width and y >= 0 and y < self.height:
+			self.buffer[y, x] = self._solid_color(color)
+
+	def update_buffer(self) -> None:
+		self.buffer = self.image.copy()
+		if self.selected_pixel[0] >= 0 and self.selected_pixel[1] >= 0:
+			p = self.selected_pixel
+			# Draw a red cross
+			self._set_color_to_buffer(p, color=[0, 0, 255])
+			for i in range(1, self.cross_size):
+				self._set_color_to_buffer((p[0]-i, p[1]), color=[0, 0, 255])
+				self._set_color_to_buffer((p[0]+i, p[1]), color=[0, 0, 255])
+				self._set_color_to_buffer((p[0], p[1]-i), color=[0, 0, 255])
+				self._set_color_to_buffer((p[0], p[1]+i), color=[0, 0, 255])
+
+		if self.cur_highlight_index >= 0 and len(self.highlight_list) > 0:
+			for pixel in self.highlight_list[self.cur_highlight_index]:
+				self.buffer[pixel[1], pixel[0]] = self._solid_color([255, 0, 0])
+
+		for i, rect in enumerate(self.rects):
+			# print(f"In render(): {rect}")
+			# rect: [start_x start_y end_x end_y]
+			width = 2
+			color = (0, 0, 255) if i == self.cur_rect_index else (255, 0, 0)
+			self.buffer = cv2.rectangle(self.buffer, (rect[0], rect[1]), (rect[2], rect[3]), color, width)
+
+	def _render(self) -> None:
+		self.update_buffer()
+		cv2.imshow(self.window_name, self.buffer)
+		# self.fullscreen = False
+
+	def _change_selected_rect(self, x, y):
+		if len(self.rects) == 0:
+			return
+
+		min_dist = 0
+		for i, rect in enumerate(self.rects):
+			min_x = min(rect[0], rect[2])
+			max_x = max(rect[0], rect[2])
+			min_y = min(rect[1], rect[3])
+			max_y = max(rect[1], rect[3])
+			dist_x = min_x - x if x <= min_x else (x - max_x if x >= max_x else 0)
+			dist_y = min_y - y if y <= min_y else (y - max_y if y >= max_y else 0)
+			dist = dist_x ** 2 + dist_y ** 2
+			if i == 0 or dist < min_dist:
+				min_dist = dist
+				self.cur_rect_index = i
+		print(f"Selected rect No.{self.cur_rect_index}/{len(self.rects)}: {self.rects[self.cur_rect_index]}.")
+
+	def _print_pixel(self, coord):
+		p = self.image[coord[1], coord[0]]
+		msg = f"Pixel (x,y) = ({coord[0]}, {coord[1]}), ({coord[0]/self.width:0.3}, {coord[1]/self.height:0.3}), "
+		if self.nc == 4:
+			msg += f"argb=[{p[3]}, {p[2]}, {p[1]}, {p[0]}], {hex(((int(p[3])*256+int(p[2]))*256+int(p[1]))*256+int(p[0]))}"
+		else:
+			msg += f"rgb=[{p[2]}, {p[1]}, {p[0]}]"
+		p = self.hsv_image[coord[1], coord[0]]
+		msg += f", hsv=[{p[0]}, {p[1]}, {p[2]}]"
+		print(msg)
+
+	def _print_rect(self, i, rect):
+		crop = self.image[rect[1]:rect[3], rect[0]:rect[2]].astype(float)
+		num_pixels = crop.shape[0] * crop.shape[1]
+		# crop_sum shape: (4), 4 is channel count
+		crop_sum = np.sum(crop, (0, 1))
+		# crop_avg shape: (4), 4 is channel count
+		crop_avg = crop_sum / num_pixels
+		# crop_sqr_sum shape: (4), 4 is channel count
+		crop_sqr_sum = np.sum(np.square(crop), (0, 1))
+		
+		crop_stddev = np.sqrt(np.clip(crop_sqr_sum - (np.square(crop_sum) / num_pixels), 0, None) / (num_pixels-1))
+
+		# [0:3] to remove alpha channel
+		avg_sum = np.sum(crop_avg[0:3])
+		avg_ratio = [1/3., 1/3., 1/3.] if avg_sum == 0. else crop_avg / avg_sum
+		avg_ratio = np.array([avg_ratio[2], avg_ratio[1], avg_ratio[0]])
+		x = rect[0] / self.width
+		y = rect[1] / self.height
+		w = (rect[2] - rect[0]) / self.width
+		h = (rect[3] - rect[1]) / self.height
+
+		stddev_sum = np.sum(crop_stddev)
+		print(f"Rect No.{i}, ({x:.3f}, {y:.3f}, {w:.3f}, {h:.3f}) rgb ratio: {avg_ratio[0]:.3f}:{avg_ratio[1]:.3f}:{avg_ratio[2]:.3f}, stddev sum: {stddev_sum:.3g}")
+
+	def _mouse_callback(self, event, x, y, flags, param):
+		redraw = False
+
+		# Dragging selected_pixel rectangle
+		if event == cv2.EVENT_LBUTTONDOWN:
+			self.mouse_down = True
+			self.cur_rect_index = len(self.rects)
+			self.rects.append([x, y, x, y])
+			self.mouse_move_counter = 0
+		elif event == cv2.EVENT_LBUTTONUP:
+			self.mouse_down = False
+			assert len(self.rects) > 0
+			if self.rects[-1][0] == self.rects[-1][2] and self.rects[-1][1] == self.rects[-1][3]:
+				self.cur_rect_index -= 1
+				self.rects.pop()
+				self._change_selected_rect(x, y)
+				self._print_pixel((x, y))
+				if self.selected_pixel != (x, y):
+					self.selected_pixel = (x, y)
+					redraw = True
+			else:
+				# sanitize the rect:
+				if self.cur_rect_index >= 0 and self.cur_rect_index < len(self.rects):
+					rect = self.rects[self.cur_rect_index]
+					min_x = min(rect[0], rect[2])
+					max_x = max(rect[0], rect[2])
+					min_y = min(rect[1], rect[3])
+					max_y = max(rect[1], rect[3])
+					rect[0] = min_x
+					rect[1] = min_y
+					rect[2] = max_x
+					rect[3] = max_y
+			redraw = True
+			mouse_move_counter = 0
+		elif event == cv2.EVENT_RBUTTONUP: # right click to select existing rect to edit
+			if len(self.rects) > 0:
+				self._change_selected_rect(x, y)
+				redraw = True
+		elif event == cv2.EVENT_MOUSEMOVE and self.mouse_down:
+			if self.cur_rect_index >= 0 and self.cur_rect_index < len(self.rects):
+				old_loc = (self.rects[self.cur_rect_index][2], self.rects[self.cur_rect_index][3])
+				if old_loc != (x, y):
+					self.rects[self.cur_rect_index][2] = x
+					self.rects[self.cur_rect_index][3] = y
+					# if mouse_move_counter % 2 == 0:
+					redraw = True
+			self.mouse_move_counter += 1
+
+		if redraw:
+			self._render()
+
+	def run(self):
+		cv2.imshow(self.window_name, self.buffer)
+		cv2.setWindowProperty(self.window_name, cv2.WND_PROP_TOPMOST, 1)
+		cv2.setMouseCallback(self.window_name, self._mouse_callback)
+		
+		while True:
+			key = cv2.waitKey(0)
+
+			if key == 27: # esc
+				cv2.destroyAllWindows()
+				break
+			elif key == 119: # w
+				if self.selected_pixel[0] >= 0 and self.selected_pixel[1] >= 1:
+					self.selected_pixel = (self.selected_pixel[0], self.selected_pixel[1]-1)
+					self._print_pixel(self.selected_pixel)
+			elif key == 115: # s
+				if self.selected_pixel[0] >= 0 and self.selected_pixel[1] >= 0 and self.selected_pixel[1] + 1 < self.height:
+					self.selected_pixel = (self.selected_pixel[0], self.selected_pixel[1]+1)
+					self._print_pixel(self.selected_pixel)
+			elif key == 97: # a
+				if self.selected_pixel[0] >= 1 and self.selected_pixel[1] >= 0:
+					self.selected_pixel = (self.selected_pixel[0]-1, self.selected_pixel[1])
+					self._print_pixel(self.selected_pixel)
+			elif key == 100: # d
+				if self.selected_pixel[0] >= 0 and self.selected_pixel[1] >= 0 and self.selected_pixel[0] + 1 < self.width:
+					self.selected_pixel = (self.selected_pixel[0]+1, self.selected_pixel[1])
+					self._print_pixel(self.selected_pixel)
+			elif key == 44: # ,
+				if len(self.highlight_list) > 0:
+					self.cur_highlight_index = len(self.highlight_list) - 1 if self.cur_highlight_index < 0 else self.cur_highlight_index-1
+					print(f"Change highlight index to {self.cur_highlight_index}/{len(self.highlight_list)}")
+			elif key == 46: # .
+				if len(self.highlight_list) > 0:
+					self.cur_highlight_index = -1 if self.cur_highlight_index == len(self.highlight_list)-1 else self.cur_highlight_index+1
+					print(f"Change highlight index to {self.cur_highlight_index}/{len(self.highlight_list)}")
+			elif key == 127 or key == 8: # DEL or backspace (BS), remove selected rectangle
+				mouse_down = False
+				mouse_move_counter = 0
+				if len(self.rects) > 0:
+					if self.cur_rect_index < 0:
+						self.cur_rect_index = len(self.rects) - 1
+					del self.rects[self.cur_rect_index]
+					if len(self.rects) == 0:
+						self.cur_rect_index = -1
+					elif self.cur_rect_index >= len(self.rects):
+						self.cur_rect_index = len(self.rects) - 1
+			elif key == 105: # i
+				for i, rect in enumerate(self.rects):
+					self._print_rect(i, rect)
+			else:
+				print(f"Pressed key {key}")
+			self._render()
+
+
+def parse_box(box_str: str):
+	"""
+	Parse a box string in the format "start_x,start_y,width,height".
+	All values should be floats between 0.0 and 1.0 (inclusive).
+	Returns a tuple of (start_x, start_y, width, height).
+	"""
+	try:
+		parts = box_str.split(',')
+		if len(parts) != 4:
+			raise ValueError(f"Box must have exactly 4 values, got {len(parts)}")
+
+		values = [float(v) for v in parts]
+		for i, v in enumerate(values):
+			if not (0.0 <= v <= 1.0):
+				raise ValueError(f"Value at position {i} ({v}) is not between 0.0 and 1.0")
+
+		return tuple(values)
+	except ValueError as e:
+		raise argparse.ArgumentTypeError(f"Invalid box format '{box_str}': {e}")
+
+
+if __name__ == '__main__':
+	parser = argparse.ArgumentParser(
+		description='Interactive image viewer with pixel inspection and box drawing capabilities.',
+		epilog="""
+Controls:
+  Left click: Select pixel and show info
+  Left drag: Draw a box
+  Right click: Select existing box
+  w/s/a/d: Move selected pixel
+  i: Print info for all boxes
+  Backspace/Delete: Delete selected box (or last box if none selected)
+  ESC: Exit
+
+Box format:
+  Each box is specified as "start_x,start_y,width,height" where all values
+  are floats between 0.0 and 1.0 (inclusive), representing normalized coordinates.
+		""",
+		formatter_class=argparse.RawDescriptionHelpFormatter
+	)
+
+	parser.add_argument(
+		'image',
+		help='Path to the image file to view'
+	)
+
+	parser.add_argument(
+		'--box',
+		action='append',
+		type=parse_box,
+		metavar='START_X,START_Y,WIDTH,HEIGHT',
+		help='Add a box to render on the image. Format: "start_x,start_y,width,height" '
+		     'where each value is a float between 0.0 and 1.0. Can be specified multiple times.'
+	)
+
+	args = parser.parse_args()
+
+	# bgr or bgra channel order
+	image = cv2.imread(args.image, cv2.IMREAD_UNCHANGED)
+	if image is None:
+		parser.error(f"Could not load image from '{args.image}'")
+
+	height = image.shape[0]
+	width = image.shape[1]
+	print(f"Load image from {args.image}, size: {width} x {height}")
+
+	viewer = ImageViewer(image)
+
+	# Add boxes from command line arguments
+	if args.box:
+		for box in args.box:
+			start_x, start_y, box_width, box_height = box
+			# Convert normalized coordinates to absolute pixel coordinates
+			abs_start_x = int(start_x * width)
+			abs_start_y = int(start_y * height)
+			abs_end_x = int((start_x + box_width) * width)
+			abs_end_y = int((start_y + box_height) * height)
+
+			# Add to viewer's rect list in the format [start_x, start_y, end_x, end_y]
+			viewer.rects.append([abs_start_x, abs_start_y, abs_end_x, abs_end_y])
+			print(f"Added box: ({start_x:.3f}, {start_y:.3f}, {box_width:.3f}, {box_height:.3f}) -> "
+			      f"pixels ({abs_start_x}, {abs_start_y}, {abs_end_x}, {abs_end_y})")
+		viewer.update_buffer()
+
+	viewer.run()
diff --git a/SerialPrograms/Scripts/invert_json.py b/SerialPrograms/Scripts/invert_json.py
index 3308959ec6..ce89f6b425 100644
--- a/SerialPrograms/Scripts/invert_json.py
+++ b/SerialPrograms/Scripts/invert_json.py
@@ -1,25 +1,25 @@
-import json
-import sys
-
-
-def main():
-    if len(sys.argv) != 3:
-        print("usage: {} <input.json> <output.json>".format(sys.argv[0]))
-        sys.exit(1)
-
-    with open(sys.argv[1], "r", encoding="utf-8") as f:
-        data = json.load(f)
-
-    inverted = {}
-    for key, value in data.items():
-        for lang, word in value.items():
-            if lang not in inverted:
-                inverted[lang] = {}
-            inverted[lang][key] = word
-
-    with open(sys.argv[2], "w", encoding="utf-8") as f:
-        json.dump(inverted, f, indent=4, ensure_ascii=False)
-
-
-if __name__ == "__main__":
+import json
+import sys
+
+
+def main():
+    if len(sys.argv) != 3:
+        print("usage: {} <input.json> <output.json>".format(sys.argv[0]))
+        sys.exit(1)
+
+    with open(sys.argv[1], "r", encoding="utf-8") as f:
+        data = json.load(f)
+
+    inverted = {}
+    for key, value in data.items():
+        for lang, word in value.items():
+            if lang not in inverted:
+                inverted[lang] = {}
+            inverted[lang][key] = word
+
+    with open(sys.argv[2], "w", encoding="utf-8") as f:
+        json.dump(inverted, f, indent=4, ensure_ascii=False)
+
+
+if __name__ == "__main__":
     main()
\ No newline at end of file
diff --git a/SerialPrograms/Scripts/make_ocr_json.py b/SerialPrograms/Scripts/make_ocr_json.py
new file mode 100644
index 0000000000..988d23ce30
--- /dev/null
+++ b/SerialPrograms/Scripts/make_ocr_json.py
@@ -0,0 +1,154 @@
+"""
+Generates an OCR json file for dictionary matching
+
+Set-up:
+- Create a file named "target_words.txt". Put all your target dictionary words in this file,
+with a new line between each phrase. Put this file in the same folder as this script.
+- Adjust the start_line and end_line variables, which are hard-coded.
+This helps to limit the script's search of the text dump files.
+This helps with dealing with cases where the same English word is used by different parts of the game, but in a different
+language, different words may be used. e.g. "Close" in English can be "Nah" or "Schließen" in German.
+- Put all the text dump files for all languages in the same folder as this script. You can get the text dump files
+from data miners such as https://x.com/mattyoukhana_
+  - Ensure the names of the text dump files match the file names in the function `get_text_dump_filename_from_language()`
+
+How it works:
+- each target word from "target_words.txt" is converted to a slug.
+i.e. spaces are converted to dashes and converted to lowercase
+- for each target word, "English.txt" is searched to find the location (line number and column) of the word. All the
+text dump files for the various languages are formatted similarly. So, the above location will also point us to
+the corresponding target word in other languages.
+- the json OCR file is then created based on the slugs and the location of each target word for each of the languages
+"""
+
+from typing import TextIO
+
+
+start_line, end_line = 39560, 39665 # for menu option items
+# start_line, end_line = 50255, 51178  # for all moves
+
+def find_location_from_target_word(text_dump_filename: str, target_word: str, start: int, end: int) -> tuple[int, int]:
+    with open(text_dump_filename, 'r', encoding='utf-8', errors='ignore') as file:
+        for row, line in enumerate(file):
+            if row < start:
+                continue
+            if row > end:
+                break
+            split_line = line.split("\t")
+            for column, cell in enumerate(split_line):
+                if cell.strip() == target_word:
+                    return row, column
+        raise Exception("unable to find target word: " + target_word)
+
+def find_target_word_from_location(text_dump_filename: str, location: tuple[int, int]) -> str:
+    target_row = location[0]
+    target_column = location[1]
+    if target_row < 0:
+        raise IndexError("target_row index out of range")
+    with open(text_dump_filename, 'r', encoding='utf-8', errors='ignore') as file:
+        for row, line in enumerate(file):
+            if row == target_row:
+                split_line = line.split("\t")
+                if target_column < 0 or target_column >= len(split_line):
+                    raise IndexError("target_column index out of range")
+                for column, cell in enumerate(split_line):
+                    if column == target_column:
+                        return cell.strip()
+    raise IndexError("target_row index out of range")
+
+
+
+def get_slug_from_target_word(target_word: str) -> str:
+    slug = (target_word.replace(" ", "-")
+            .replace("'", "")
+            .replace("’", "")
+            .replace("é","e")
+            .casefold())
+    return slug
+
+def generate_ocr_json_file(target_words_filename: str, start: int, end: int):
+    list_of_slug_location_pair = get_list_of_slug_location_pair(target_words_filename, "English.txt", start, end)
+    json_output_filename = "OCR.json"
+    with open(json_output_filename, 'a', encoding='utf-8') as file:
+        file.truncate(0) # clear file contents first
+        file.write("{\n")
+        generate_ocr_json_file_one_language(file, "deu", list_of_slug_location_pair)
+        file.write(",\n")
+        generate_ocr_json_file_one_language(file, "eng", list_of_slug_location_pair)
+        file.write(",\n")
+        generate_ocr_json_file_one_language(file, "spa", list_of_slug_location_pair)
+        file.write(",\n")
+        generate_ocr_json_file_one_language(file, "fra", list_of_slug_location_pair)
+        file.write(",\n")
+        generate_ocr_json_file_one_language(file, "ita", list_of_slug_location_pair)
+        file.write(",\n")
+        generate_ocr_json_file_one_language(file, "kor", list_of_slug_location_pair)
+        file.write(",\n")
+        generate_ocr_json_file_one_language(file, "jpn", list_of_slug_location_pair)
+        file.write(",\n")
+        generate_ocr_json_file_one_language(file, "chi_sim", list_of_slug_location_pair)
+        file.write(",\n")
+        generate_ocr_json_file_one_language(file, "chi_tra", list_of_slug_location_pair)
+        file.write("\n}")
+
+
+# start and end parameter so we only search certain portions of file.
+# This helps with dealing with cases where the same English word is used by different parts of the game,
+# but in a different language, different words may be used.
+# e.g. "Close" in English can be "Nah" or "Schließen" in German.
+def get_list_of_slug_location_pair(target_words_filename: str, text_dump_filename: str, start: int, end: int) -> list[tuple[str, tuple[int, int]]]:
+    with open(target_words_filename, 'r', encoding='utf-8', errors='ignore') as file:
+        list_of_slug_location_pair = []
+        for line in file:
+            target_word = line.strip()
+            slug = get_slug_from_target_word(target_word)
+            location = find_location_from_target_word(text_dump_filename, target_word, start, end)
+            slug_location_pair = (slug, location)
+            list_of_slug_location_pair.append(slug_location_pair)
+    print("Done finding list_of_slug_location_pair")
+    return list_of_slug_location_pair
+
+
+def generate_ocr_json_file_one_language(file: TextIO, language: str, list_of_slug_location_pair: list[tuple[str, tuple[int, int]]]):
+    text_dump_filename = get_text_dump_filename_from_language(language)
+    file.write("\t" + "\"" + language + "\"" + ": " + "{" + "\n")
+    for i, slug_location_pair in enumerate(list_of_slug_location_pair):
+        slug = slug_location_pair[0]
+        location = slug_location_pair[1]
+        target_word = find_target_word_from_location(text_dump_filename, location)
+        if i != 0:
+            file.write(",\n")
+        file.write("\t\t" + "\"" + slug + "\"" + ": " + "[ " + "\"" + target_word + "\"" + " ]")
+    file.write("\n\t}")
+    print("Done language: " + language)
+
+def get_text_dump_filename_from_language(language: str) -> str:
+    text_dump_filename = ""
+    match language:
+        case "deu":
+            text_dump_filename = "Deutsch.txt"
+        case "eng":
+            text_dump_filename = "English.txt"
+        case "spa":
+            text_dump_filename = "Español (España).txt"
+        case "fra":
+            text_dump_filename = "Français.txt"
+        case "ita":
+            text_dump_filename = "Italiano.txt"
+        case "kor":
+            text_dump_filename = "한국어.txt"
+        case "jpn":
+            text_dump_filename = "日本語 (カタカナ).txt"
+        case "chi_sim":
+            text_dump_filename = "简体中文.txt"
+        case "chi_tra":
+            text_dump_filename = "繁體中文.txt"
+
+    if text_dump_filename == "":
+        raise Exception("Language not recognized")
+    return text_dump_filename
+
+
+generate_ocr_json_file("target_words.txt", start_line, end_line)
+
+
diff --git a/SerialPrograms/Scripts/print_onnx_model_metadata.py b/SerialPrograms/Scripts/print_onnx_model_metadata.py
new file mode 100644
index 0000000000..66dce9c666
--- /dev/null
+++ b/SerialPrograms/Scripts/print_onnx_model_metadata.py
@@ -0,0 +1,135 @@
+#!/usr/bin/env python3
+"""
+Print onnx model metadata for debugging and ensuring the metadata is correct
+
+Usage:
+    python print_onnx_model_metadata.py <input_onnx_file>
+"""
+
+import onnx
+import sys
+import os
+
+
+def clean_onnx_metadata(model_path, output_path=None):
+    """
+    Remove privacy-sensitive metadata from an ONNX model.
+
+    Args:
+        model_path: Path to input ONNX model
+        output_path: Path to save cleaned model (defaults to overwriting input)
+    """
+    print(f"Loading ONNX model from: {model_path}")
+    model = onnx.load(model_path)
+
+    # What we don't clean currently:
+    # model.doc_string: top-level doc string
+    # model.metadata_props: top-level metadata
+    # model.graph.doc_string: graph doc string
+    # model.graph.node[...].docstring: node's doc string
+    # model.graph.initializer[...].metadata_props: intializer (tensor)'s metadata
+    # model.functions[...].doc_string: function doc string
+
+    # Track what we're cleaning
+    changes_made = []
+    removed_values = set()
+
+    # Clean metadata_props from nodes (this is where PyTorch stores stack traces)
+    node_metadata_cleaned = 0
+    for node in model.graph.node:
+        if not node.metadata_props:
+            continue
+        # Remove metadata containing paths or stack traces
+        kept_props = []
+        for prop in node.metadata_props:
+            # Remove stack traces and name scopes that contain file paths
+            if prop.key in ['pkg.torch.onnx.stack_trace', 'pkg.torch.onnx.name_scopes'] and ('/' in prop.value or '\\' in prop.value):
+                removed_values.add(prop.value)
+                node_metadata_cleaned += 1
+                continue  # Skip this prop
+            kept_props.append(prop)
+
+        # Clear and re-add only kept props:
+        # We can't directly assign value to node.metadat_props, otherwise will have following error:
+        # "Assignment not allowed to map  or repeated field "metadata_props" in protocol message object."
+        while len(node.metadata_props) > 0:
+            node.metadata_props.pop()
+        for prop in kept_props:
+            node.metadata_props.append(prop)
+
+    if node_metadata_cleaned > 0:
+        print(f"  Removed {node_metadata_cleaned} metadata_props entries from nodes")
+        changes_made.append(f"{node_metadata_cleaned} node metadata_props")
+
+    # Verify the model is still valid
+    print("  Verifying cleaned model...")
+    try:
+        onnx.checker.check_model(model)
+        print("  ✓ Model validation passed")
+    except Exception as e:
+        print(f"  ✗ Model validation failed: {e}")
+        print("  Aborting - model may be corrupted")
+        return False
+
+    # Save the cleaned model
+    if output_path is None:
+        output_path = model_path
+
+    print(f"Saving cleaned model to: {output_path}")
+    onnx.save(model, output_path)
+
+    # Report what was cleaned
+    if changes_made:
+        print(f"\nCleaned metadata:")
+        for change in changes_made:
+            print(f"  - {change}")
+        
+        print(f"Removed {len(removed_values)} values")
+    else:
+        print("\nNo privacy-sensitive filepath metadata found")
+
+    # Verify the paths are gone
+    print("\nVerifying paths are removed...")
+    with open(output_path, 'rb') as f:
+        content = f.read()
+        # Check for common path indicators
+        if b'/Users/' in content or b'C:\\' in content or b'/home/' in content:
+            print("  ⚠ Warning: Some path-like strings may still be present")
+            print("    (This could be in tensor names or other non-metadata)")
+        else:
+            print("  ✓ No obvious file paths detected in binary")
+
+    print(f"\n✓ Successfully cleaned ONNX model!")
+    return True
+
+
+def main():
+    if len(sys.argv) < 2:
+        print(__doc__)
+        print("\nError: No input onnx file specified")
+        sys.exit(1)
+
+    model_path = sys.argv[1]
+
+    if not os.path.exists(model_path):
+        print(f"Error: Input onnx file not found: {model_path}")
+        sys.exit(1)
+
+    print(f"Loading ONNX model from: {model_path}")
+    model = onnx.load(model_path)
+    print(f"doc_string={model.doc_string}")
+    print(f"domain={model.domain}")
+    print(f"ir_version={model.ir_version}")
+    print(f"model_version={model.model_version}")
+    print(f"producer_name={model.producer_name}")
+    print(f"producer_version={model.producer_version}")
+    if model.metadata_props:
+        print("metadata_props:")
+        for prop in model.metadata_props:
+            print(f"  {prop.key}={prop.value}")
+    else:
+        print(f"metadata_props={model.metadata_props}")
+
+
+if __name__ == "__main__":
+    main()
diff --git a/SerialPrograms/Scripts/prune_json.py b/SerialPrograms/Scripts/prune_json.py
index ec51a7656a..c6932f71ce 100644
--- a/SerialPrograms/Scripts/prune_json.py
+++ b/SerialPrograms/Scripts/prune_json.py
@@ -1,125 +1,125 @@
-import json
-
-filling_slugs = [
-            "apple",
-            "avocado",
-            "bacon",
-            "baguette",
-            "banana",
-            "basil",
-            "cheese",
-            "cherry-tomatoes",
-            "chorizo",
-            "cucumber",
-            "egg",
-            "fried-fillet",
-            "green-bell-pepper",
-            "ham",
-            "hamburger",
-            "herbed-sausage",
-            "jalapeño",
-            "kiwi",
-            "klawf-stick",
-            "lettuce",
-            "noodles",
-            "onion",
-            "pickle",
-            "pineapple",
-            "potato-salad",
-            "potato-tortilla",
-            "prosciutto",
-            "red-bell-pepper",
-            "red-onion",
-            "rice",
-            "smoked-fillet",
-            "strawberry",
-            "tofu",
-            "tomato",
-            "watercress",
-            "yellow-bell-pepper"]
-
-condiment_slugs = [
-            "butter",
-            "chili-sauce",
-            "cream-cheese",
-            "curry-powder",
-            "horseradish",
-            "jam",
-            "ketchup",
-            "marmalade",
-            "mayonnaise",
-            "mustard",
-            "olive-oil",
-            "peanut-butter",
-            "pepper",
-            "salt",
-            "vinegar",
-            "wasabi",
-            "whipped-cream",
-            "yogurt",
-            "bitter-herba-mystica",
-            "spicy-herba-mystica",
-            "salty-herba-mystica",
-            "sour-herba-mystica",
-            "sweet-herba-mystica"]
-
-pick_slugs = [
-            "blue-flag-pick",
-            "blue-poke-ball-pick",
-            "blue-sky-flower-pick",
-            "gold-pick",
-            "green-poke-ball-pick",
-            "heroic-sword-pick",
-            "magical-heart-pick",
-            "magical-star-pick",
-            "parasol-pick",
-            "party-sparkler-pick",
-            "pika-pika-pick",
-            "red-flag-pick",
-            "red-poke-ball-pick",
-            "silver-pick",
-            "smiling-vee-pick",
-            "sunrise-flower-pick",
-            "sunset-flower-pick",
-            "vee-vee-pick",
-            "winking-pika-pick"]
-
-def filter_keys(obj, keys):
-    if isinstance(obj, dict):
-        return {k: filter_keys(v, keys) for k, v in obj.items() if k not in keys}
-    elif isinstance(obj, list):
-        return [filter_keys(elem, keys) for elem in obj]
-    else:
-        return obj
-
-with open("OCR.json", "r", encoding="utf-8") as f:
-    input_ocr = json.load(f)
-
-output_ocr_condiments = filter_keys(input_ocr, filling_slugs + pick_slugs)
-with open('SandwichCondimentOCR.json', 'w', encoding="utf-8") as f:
-    json.dump(output_ocr_condiments, f, indent=4, ensure_ascii=False)
-
-output_ocr_fillings = filter_keys(input_ocr, condiment_slugs + pick_slugs)
-with open('SandwichFillingOCR.json', 'w', encoding="utf-8") as f:
-    json.dump(output_ocr_fillings, f, indent=4, ensure_ascii=False)
-
-output_ocr_picks = filter_keys(input_ocr, condiment_slugs + filling_slugs)
-with open('SandwichPickOCR.json', 'w', encoding="utf-8") as f:
-    json.dump(output_ocr_picks, f, indent=4, ensure_ascii=False)
-
-
-
-with open("Sprites.json", "r", encoding="utf-8") as f:
-    input_sprite = json.load(f)
-
-output_sprite_condiments = filter_keys(input_sprite, filling_slugs + pick_slugs)
-with open('SandwichCondimentSprites.json', 'w', encoding="utf-8") as f:
-    json.dump(output_sprite_condiments, f, indent=4, ensure_ascii=False)
-
-output_sprite_fillings = filter_keys(input_sprite, condiment_slugs + pick_slugs)
-with open('SandwichFillingSprites.json', 'w', encoding="utf-8") as f:
-    json.dump(output_sprite_fillings, f, indent=4, ensure_ascii=False)
-
-output_sprite_picks = filter_keys(input_sprite, condiment_slugs + filling_slugs)
-with open('SandwichPickSprites.json', 'w', encoding="utf-8") as f:
+import json
+
+filling_slugs = [
+            "apple",
+            "avocado",
+            "bacon",
+            "baguette",
+            "banana",
+            "basil",
+            "cheese",
+            "cherry-tomatoes",
+            "chorizo",
+            "cucumber",
+            "egg",
+            "fried-fillet",
+            "green-bell-pepper",
+            "ham",
+            "hamburger",
+            "herbed-sausage",
+            "jalapeño",
+            "kiwi",
+            "klawf-stick",
+            "lettuce",
+            "noodles",
+            "onion",
+            "pickle",
+            "pineapple",
+            "potato-salad",
+            "potato-tortilla",
+            "prosciutto",
+            "red-bell-pepper",
+            "red-onion",
+            "rice",
+            "smoked-fillet",
+            "strawberry",
+            "tofu",
+            "tomato",
+            "watercress",
+            "yellow-bell-pepper"]
+
+condiment_slugs = [
+            "butter",
+            "chili-sauce",
+            "cream-cheese",
+            "curry-powder",
+            "horseradish",
+            "jam",
+            "ketchup",
+            "marmalade",
+            "mayonnaise",
+            "mustard",
+            "olive-oil",
+            "peanut-butter",
+            "pepper",
+            "salt",
+            "vinegar",
+            "wasabi",
+            "whipped-cream",
+            "yogurt",
+            "bitter-herba-mystica",
+            "spicy-herba-mystica",
+            "salty-herba-mystica",
+            "sour-herba-mystica",
+            "sweet-herba-mystica"]
+
+pick_slugs = [
+            "blue-flag-pick",
+            "blue-poke-ball-pick",
+            "blue-sky-flower-pick",
+            "gold-pick",
+            "green-poke-ball-pick",
+            "heroic-sword-pick",
+            "magical-heart-pick",
+            "magical-star-pick",
+            "parasol-pick",
+            "party-sparkler-pick",
+            "pika-pika-pick",
+            "red-flag-pick",
+            "red-poke-ball-pick",
+            "silver-pick",
+            "smiling-vee-pick",
+            "sunrise-flower-pick",
+            "sunset-flower-pick",
+            "vee-vee-pick",
+            "winking-pika-pick"]
+
+def filter_keys(obj, keys):
+    if isinstance(obj, dict):
+        return {k: filter_keys(v, keys) for k, v in obj.items() if k not in keys}
+    elif isinstance(obj, list):
+        return [filter_keys(elem, keys) for elem in obj]
+    else:
+        return obj
+
+with open("OCR.json", "r", encoding="utf-8") as f:
+    input_ocr = json.load(f)
+
+output_ocr_condiments = filter_keys(input_ocr, filling_slugs + pick_slugs)
+with open('SandwichCondimentOCR.json', 'w', encoding="utf-8") as f:
+    json.dump(output_ocr_condiments, f, indent=4, ensure_ascii=False)
+
+output_ocr_fillings = filter_keys(input_ocr, condiment_slugs + pick_slugs)
+with open('SandwichFillingOCR.json', 'w', encoding="utf-8") as f:
+    json.dump(output_ocr_fillings, f, indent=4, ensure_ascii=False)
+
+output_ocr_picks = filter_keys(input_ocr, condiment_slugs + filling_slugs)
+with open('SandwichPickOCR.json', 'w', encoding="utf-8") as f:
+    json.dump(output_ocr_picks, f, indent=4, ensure_ascii=False)
+
+
+
+with open("Sprites.json", "r", encoding="utf-8") as f:
+    input_sprite = json.load(f)
+
+output_sprite_condiments = filter_keys(input_sprite, filling_slugs + pick_slugs)
+with open('SandwichCondimentSprites.json', 'w', encoding="utf-8") as f:
+    json.dump(output_sprite_condiments, f, indent=4, ensure_ascii=False)
+
+output_sprite_fillings = filter_keys(input_sprite, condiment_slugs + pick_slugs)
+with open('SandwichFillingSprites.json', 'w', encoding="utf-8") as f:
+    json.dump(output_sprite_fillings, f, indent=4, ensure_ascii=False)
+
+output_sprite_picks = filter_keys(input_sprite, condiment_slugs + filling_slugs)
+with open('SandwichPickSprites.json', 'w', encoding="utf-8") as f:
     json.dump(output_sprite_picks, f, indent=4, ensure_ascii=False)
\ No newline at end of file
diff --git a/SerialPrograms/Scripts/resize_image.py b/SerialPrograms/Scripts/resize_image.py
new file mode 100755
index 0000000000..dd80420e61
--- /dev/null
+++ b/SerialPrograms/Scripts/resize_image.py
@@ -0,0 +1,80 @@
+#!/usr/bin/env python3
+"""
+Image resizing script using OpenCV.
+Resizes an input image to specified width and height.
+"""
+
+import argparse
+import sys
+import cv2
+import os
+
+
+def main():
+    parser = argparse.ArgumentParser(
+        description='Resize an image using OpenCV'
+    )
+
+    parser.add_argument(
+        'input',
+        help='Input image path'
+    )
+
+    parser.add_argument(
+        '-o', '--output',
+        default='output.png',
+        help='Output image path (default: output.png)'
+    )
+
+    parser.add_argument(
+        '-r', '--resolution',
+        type=int,
+        nargs=2,
+        required=True,
+        metavar=('WIDTH', 'HEIGHT'),
+        help='New resolution as width and height in pixels'
+    )
+
+    args = parser.parse_args()
+
+    # Extract width and height from resolution
+    width, height = args.resolution
+
+    # Validate input file exists
+    if not os.path.isfile(args.input):
+        print(f"Error: Input file '{args.input}' not found.", file=sys.stderr)
+        sys.exit(1)
+
+    # Validate dimensions
+    if width <= 0 or height <= 0:
+        print(f"Error: Width and height must be positive integers.", file=sys.stderr)
+        sys.exit(1)
+
+    # Read the image
+    img = cv2.imread(args.input)
+
+    if img is None:
+        print(f"Error: Failed to load image '{args.input}'. Please check if it's a valid image file.", file=sys.stderr)
+        sys.exit(1)
+
+    # Get original dimensions
+    original_height, original_width = img.shape[:2]
+    print(f"Original size: {original_width}x{original_height}")
+
+    # Resize the image
+    resized_img = cv2.resize(img, (width, height), interpolation=cv2.INTER_LANCZOS4)
+
+    print(f"Resized to: {width}x{height}")
+
+    # Save the resized image
+    success = cv2.imwrite(args.output, resized_img)
+
+    if success:
+        print(f"Image saved to: {args.output}")
+    else:
+        print(f"Error: Failed to save image to '{args.output}'", file=sys.stderr)
+        sys.exit(1)
+
+
+if __name__ == '__main__':
+    main()
diff --git a/SerialPrograms/Scripts/use_new_wiki.py b/SerialPrograms/Scripts/use_new_wiki.py
new file mode 100644
index 0000000000..9de67f6a4a
--- /dev/null
+++ b/SerialPrograms/Scripts/use_new_wiki.py
@@ -0,0 +1,132 @@
+#!/usr/bin/env python3
+"""
+Script to update wiki links from old format to new format.
+Old format: ComputerControl/blob/master/Wiki/Programs/PokemonSV/AutoStory.md
+New format: Programs/PokemonSV/AutoStory.html
+"""
+
+import os
+import re
+import sys
+from pathlib import Path
+
+
+def update_wiki_links(content):
+    """
+    Update wiki links from old format to new format.
+
+    Args:
+        content: File content as string
+
+    Returns:
+        Updated content with new wiki links
+    """
+    # Pattern to match old wiki links
+    # Matches: ComputerControl/blob/master/Wiki/ followed by path and .md extension
+    pattern = r'ComputerControl/blob/master/Wiki/([^)\s]+)\.md'
+
+    # Replace with new format: just the path with .html extension
+    replacement = r'\1.html'
+
+    updated_content = re.sub(pattern, replacement, content)
+
+    return updated_content
+
+
+def process_file(file_path):
+    """
+    Process a single file to update wiki links.
+
+    Args:
+        file_path: Path to the file to process
+
+    Returns:
+        True if file was modified, False otherwise
+    """
+    try:
+        with open(file_path, 'r', encoding='utf-8') as f:
+            content = f.read()
+
+        updated_content = update_wiki_links(content)
+
+        if content != updated_content:
+            # Convert to Windows line endings (CRLF)
+            updated_content = updated_content.replace('\r\n', '\n').replace('\n', '\r\n')
+
+            with open(file_path, 'w', encoding='utf-8', newline='') as f:
+                f.write(updated_content)
+            return True
+
+        return False
+    except Exception as e:
+        print(f"Error processing {file_path}: {e}", file=sys.stderr)
+        return False
+
+
+def find_files_with_wiki_links(root_dir, extensions=None):
+    """
+    Find all files that might contain wiki links.
+
+    Args:
+        root_dir: Root directory to search
+        extensions: List of file extensions to search (default: code files only)
+
+    Returns:
+        List of file paths
+    """
+    if extensions is None:
+        # Only process code files (.cpp, .h, .c, .hpp, .cc, .cxx)
+        extensions = ['.cpp', '.h', '.c', '.hpp', '.cc', '.cxx', '.tpp']
+
+    files_to_process = []
+
+    for root, dirs, files in os.walk(root_dir):
+        # Skip certain directories
+        dirs[:] = [d for d in dirs if d not in ['.git', 'build', 'Build', '__pycache__']]
+
+        for file in files:
+            if any(file.endswith(ext) for ext in extensions):
+                files_to_process.append(os.path.join(root, file))
+
+    return files_to_process
+
+
+def main():
+    """Main function to update wiki links in the repository."""
+    # Determine the root directory (SerialPrograms directory)
+    script_dir = Path(__file__).parent
+    serial_programs_dir = script_dir.parent
+
+    print(f"Searching for wiki links in: {serial_programs_dir}")
+    print("Looking for pattern: ComputerControl/blob/master/Wiki/.../*.md")
+    print("Replacing with: .../....html")
+    print("Target files: C/C++ code files (.cpp, .h, .c, .hpp, .cc, .cxx, .tpp)")
+    print("Output: Windows line endings (CRLF)\n")
+
+    # Find all relevant files
+    files = find_files_with_wiki_links(serial_programs_dir)
+    print(f"Found {len(files)} files to scan\n")
+
+    # Process each file
+    modified_count = 0
+    modified_files = []
+
+    for file_path in files:
+        if process_file(file_path):
+            modified_count += 1
+            modified_files.append(file_path)
+            print(f"Updated: {os.path.relpath(file_path, serial_programs_dir)}")
+
+    print(f"\n{'='*60}")
+    print(f"Summary: {modified_count} file(s) modified")
+
+    if modified_files:
+        print("\nModified files:")
+        for file_path in modified_files:
+            print(f"  - {os.path.relpath(file_path, serial_programs_dir)}")
+
+    return 0 if modified_count >= 0 else 1
+
+
+if __name__ == "__main__":
+    sys.exit(main())
diff --git a/SerialPrograms/SerialPrograms.pro b/SerialPrograms/SerialPrograms.pro
deleted file mode 100644
index b89bfad902..0000000000
--- a/SerialPrograms/SerialPrograms.pro
+++ /dev/null
@@ -1,1981 +0,0 @@
-QT += core gui
-QT += serialport
-QT += multimedia
-QT += multimediawidgets
-
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
-
-INCLUDEPATH += ../
-INCLUDEPATH += ../../Internal/
-INCLUDEPATH += Source/
-INCLUDEPATH += ../3rdParty/
-RESOURCES += ../3rdParty/qdarkstyle/dark/darkstyle.qrc
-RC_FILE = ../IconResource/IconResource.rc
-
-CONFIG += force_debug_info
-
-# You can make your code fail to compile if it uses deprecated APIs.
-# In order to do so, uncomment the following line.
-#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
-
-win32-g++{
-    CONFIG += c++1z
-
-    QMAKE_CXXFLAGS += -march=nehalem
-    QMAKE_CXXFLAGS += -Wno-comment
-    QMAKE_CXXFLAGS += -Wno-ignored-attributes
-#    QMAKE_CXXFLAGS += -Wnarrowing
-#    QMAKE_CXXFLAGS += -Wno-unused-parameter
-#    QMAKE_CXXFLAGS += -Wno-unused-function
-#    QMAKE_CXXFLAGS += -Wno-missing-field-initializers
-
-    QMAKE_CXXFLAGS += -D_WIN32_WINNT=0x0601
-
-    DEFINES += WIN32
-    DEFINES += PA_TESSERACT
-    DEFINES += PA_AutoDispatch_x64_08_Nehalem
-    LIBS += ../3rdPartyBinaries/tesseractPA.lib
-
-    DEFINES += PA_SLEEPY
-    LIBS += ../3rdPartyBinaries/Sleepy.lib
-
-    DEFINES += PA_DPP
-    LIBS += ../3rdPartyBinaries/dpp.lib
-}
-win32-msvc{
-    QMAKE_CXXFLAGS += /std:c++latest /utf-8
-    QMAKE_CXXFLAGS += -MP
-
-    DEFINES += WIN32
-    DEFINES += NOMINMAX
-    DEFINES += PA_AutoDispatch_x64_08_Nehalem
-
-    DEFINES += PA_TESSERACT
-    LIBS += ../3rdPartyBinaries/tesseractPA.lib
-
-    DEFINES += PA_SLEEPY
-    LIBS += ../3rdPartyBinaries/Sleepy.lib
-
-    DEFINES += PA_DPP
-    LIBS += ../3rdPartyBinaries/dpp.lib
-
-    LIBS += ../3rdPartyBinaries/opencv_world460.lib
-}
-macx{
-    QMAKE_CXXFLAGS += -std=c++14
-
-    DEFINES += PA_AutoDispatch_x64_08_Nehalem
-
-    QMAKE_INFO_PLIST = macos/Info.plist
-}
-
-
-SOURCES += \
-    ../3rdParty/QtWavFile/WavFile.cpp \
-    ../3rdParty/TesseractPA/TesseractPA.cpp \
-    ../ClientSource/Connection/BotBase.cpp \
-    ../ClientSource/Connection/MessageLogger.cpp \
-    ../ClientSource/Connection/PABotBase.cpp \
-    ../ClientSource/Connection/PABotBaseConnection.cpp \
-    ../ClientSource/Libraries/Logging.cpp \
-    ../ClientSource/Libraries/MessageConverter.cpp \
-    ../Common/CRC32.cpp \
-    ../Common/Cpp/CancellableScope.cpp \
-    ../Common/Cpp/Concurrency/AsyncDispatcher.cpp \
-    ../Common/Cpp/Concurrency/FireForgetDispatcher.cpp \
-    ../Common/Cpp/Concurrency/ParallelTaskRunner.cpp \
-    ../Common/Cpp/Concurrency/PeriodicScheduler.cpp \
-    ../Common/Cpp/Concurrency/ScheduledTaskRunner.cpp \
-    ../Common/Cpp/Concurrency/SpinLock.cpp \
-    ../Common/Cpp/Concurrency/Watchdog.cpp \
-    ../Common/Cpp/Containers/AlignedMalloc.cpp \
-    ../Common/Cpp/CpuId/CpuId.cpp \
-    ../Common/Cpp/EnumDatabase.cpp \
-    ../Common/Cpp/Exceptions.cpp \
-    ../Common/Cpp/ImageResolution.cpp \
-    ../Common/Cpp/Json/JsonArray.cpp \
-    ../Common/Cpp/Json/JsonObject.cpp \
-    ../Common/Cpp/Json/JsonTools.cpp \
-    ../Common/Cpp/Json/JsonValue.cpp \
-    ../Common/Cpp/LifetimeSanitizer.cpp \
-    ../Common/Cpp/Options/BatchOption.cpp \
-    ../Common/Cpp/Options/BooleanCheckBoxOption.cpp \
-    ../Common/Cpp/Options/ConfigOption.cpp \
-    ../Common/Cpp/Options/DateOption.cpp \
-    ../Common/Cpp/Options/EditableTableOption.cpp \
-    ../Common/Cpp/Options/EnumDropdownOption.cpp \
-    ../Common/Cpp/Options/FixedCodeOption.cpp \
-    ../Common/Cpp/Options/FloatingPointOption.cpp \
-    ../Common/Cpp/Options/GroupOption.cpp \
-    ../Common/Cpp/Options/RandomCodeOption.cpp \
-    ../Common/Cpp/Options/SimpleIntegerOption.cpp \
-    ../Common/Cpp/Options/StaticTableOption.cpp \
-    ../Common/Cpp/Options/StaticTextOption.cpp \
-    ../Common/Cpp/Options/StringOption.cpp \
-    ../Common/Cpp/Options/TextEditOption.cpp \
-    ../Common/Cpp/Options/TimeExpressionOption.cpp \
-    ../Common/Cpp/PanicDump.cpp \
-    ../Common/Cpp/PrettyPrint.cpp \
-    ../Common/Cpp/StreamConverters.cpp \
-    ../Common/Cpp/StringTools.cpp \
-    ../Common/Cpp/Time.cpp \
-    ../Common/Cpp/Unicode.cpp \
-    ../Common/Microcontroller/DeviceRoutines.cpp \
-    ../Common/Qt/AutoHeightTable.cpp \
-    ../Common/Qt/AutoWidthLineEdit.cpp \
-    ../Common/Qt/CodeValidator.cpp \
-    ../Common/Qt/CollapsibleGroupBox.cpp \
-    ../Common/Qt/ExpressionEvaluator.cpp \
-    ../Common/Qt/Options/BatchWidget.cpp \
-    ../Common/Qt/Options/BooleanCheckBoxWidget.cpp \
-    ../Common/Qt/Options/ConfigWidget.cpp \
-    ../Common/Qt/Options/DateWidget.cpp \
-    ../Common/Qt/Options/EditableTableWidget.cpp \
-    ../Common/Qt/Options/EnumDropdownWidget.cpp \
-    ../Common/Qt/Options/FixedCodeWidget.cpp \
-    ../Common/Qt/Options/FloatingPointWidget.cpp \
-    ../Common/Qt/Options/GroupWidget.cpp \
-    ../Common/Qt/Options/RandomCodeWidget.cpp \
-    ../Common/Qt/Options/SimpleIntegerWidget.cpp \
-    ../Common/Qt/Options/StaticTableWidget.cpp \
-    ../Common/Qt/Options/StaticTextWidget.cpp \
-    ../Common/Qt/Options/StringWidget.cpp \
-    ../Common/Qt/Options/TextEditWidget.cpp \
-    ../Common/Qt/Options/TimeExpressionWidget.cpp \
-    ../Common/Qt/Redispatch.cpp \
-    ../Common/Qt/StringToolsQt.cpp \
-    ../Common/Qt/TimeQt.cpp \
-    ../Common/Qt/WidgetStackFixedAspectRatio.cpp \
-    ../SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_DialogTriangleDetector.cpp \
-    Source/CommonFramework/AudioPipeline/AudioInfo.cpp \
-    Source/CommonFramework/AudioPipeline/AudioOption.cpp \
-    Source/CommonFramework/AudioPipeline/AudioSession.cpp \
-    Source/CommonFramework/AudioPipeline/AudioStream.cpp \
-    Source/CommonFramework/AudioPipeline/AudioTemplate.cpp \
-    Source/CommonFramework/AudioPipeline/Backends/AudioPassthroughPairQt.cpp \
-    Source/CommonFramework/AudioPipeline/Backends/AudioPassthroughPairQtThread.cpp \
-    Source/CommonFramework/AudioPipeline/IO/AudioFileLoader.cpp \
-    Source/CommonFramework/AudioPipeline/IO/AudioSink.cpp \
-    Source/CommonFramework/AudioPipeline/IO/AudioSource.cpp \
-    Source/CommonFramework/AudioPipeline/Spectrum/AudioSpectrumHolder.cpp \
-    Source/CommonFramework/AudioPipeline/Spectrum/FFTStreamer.cpp \
-    Source/CommonFramework/AudioPipeline/Spectrum/Spectrograph.cpp \
-    Source/CommonFramework/AudioPipeline/Tools/AudioFormatUtils.cpp \
-    Source/CommonFramework/AudioPipeline/Tools/TimeSampleBuffer.cpp \
-    Source/CommonFramework/AudioPipeline/Tools/TimeSampleBufferReader.cpp \
-    Source/CommonFramework/AudioPipeline/UI/AudioDisplayWidget.cpp \
-    Source/CommonFramework/AudioPipeline/UI/AudioSelectorWidget.cpp \
-    Source/CommonFramework/ControllerDevices/SerialPortOption.cpp \
-    Source/CommonFramework/ControllerDevices/SerialPortSession.cpp \
-    Source/CommonFramework/ControllerDevices/SerialPortWidget.cpp \
-    Source/CommonFramework/CrashDump.cpp \
-    Source/CommonFramework/Environment/Environment.cpp \
-    Source/CommonFramework/Environment/HardwareValidation.cpp \
-    Source/CommonFramework/Exceptions/FatalProgramException.cpp \
-    Source/CommonFramework/Exceptions/OperationFailedException.cpp \
-    Source/CommonFramework/Exceptions/ProgramFinishedException.cpp \
-    Source/CommonFramework/Exceptions/ScreenshotException.cpp \
-    Source/CommonFramework/GlobalServices.cpp \
-    Source/CommonFramework/GlobalSettingsPanel.cpp \
-    Source/CommonFramework/Globals.cpp \
-    Source/CommonFramework/ImageMatch/CroppedImageDictionaryMatcher.cpp \
-    Source/CommonFramework/ImageMatch/ExactImageDictionaryMatcher.cpp \
-    Source/CommonFramework/ImageMatch/ExactImageMatcher.cpp \
-    Source/CommonFramework/ImageMatch/FilterToAlpha.cpp \
-    Source/CommonFramework/ImageMatch/ImageCropper.cpp \
-    Source/CommonFramework/ImageMatch/ImageDiff.cpp \
-    Source/CommonFramework/ImageMatch/ImageMatchOption.cpp \
-    Source/CommonFramework/ImageMatch/ImageMatchResult.cpp \
-    Source/CommonFramework/ImageMatch/SilhouetteDictionaryMatcher.cpp \
-    Source/CommonFramework/ImageMatch/SubObjectTemplateMatcher.cpp \
-    Source/CommonFramework/ImageMatch/WaterfillTemplateMatcher.cpp \
-    Source/CommonFramework/ImageTools/BinaryImage_FilterRgb32.cpp \
-    Source/CommonFramework/ImageTools/ColorClustering.cpp \
-    Source/CommonFramework/ImageTools/FloatPixel.cpp \
-    Source/CommonFramework/ImageTools/ImageBoxes.cpp \
-    Source/CommonFramework/ImageTools/ImageFilter.cpp \
-    Source/CommonFramework/ImageTools/ImageGradient.cpp \
-    Source/CommonFramework/ImageTools/ImageManip.cpp \
-    Source/CommonFramework/ImageTools/ImageStats.cpp \
-    Source/CommonFramework/ImageTools/SolidColorTest.cpp \
-    Source/CommonFramework/ImageTools/WaterfillUtilities.cpp \
-    Source/CommonFramework/ImageTypes/BinaryImage.cpp \
-    Source/CommonFramework/ImageTypes/ImageHSV32.cpp \
-    Source/CommonFramework/ImageTypes/ImageRGB32.cpp \
-    Source/CommonFramework/ImageTypes/ImageViewHSV32.cpp \
-    Source/CommonFramework/ImageTypes/ImageViewPlanar32.cpp \
-    Source/CommonFramework/ImageTypes/ImageViewRGB32.cpp \
-    Source/CommonFramework/Inference/AnomalyDetector.cpp \
-    Source/CommonFramework/Inference/AudioPerSpectrumDetectorBase.cpp \
-    Source/CommonFramework/Inference/AudioTemplateCache.cpp \
-    Source/CommonFramework/Inference/BlackBorderDetector.cpp \
-    Source/CommonFramework/Inference/BlackScreenDetector.cpp \
-    Source/CommonFramework/Inference/FrozenImageDetector.cpp \
-    Source/CommonFramework/Inference/ImageMatchDetector.cpp \
-    Source/CommonFramework/Inference/ImageTools.cpp \
-    Source/CommonFramework/Inference/SpectrogramMatcher.cpp \
-    Source/CommonFramework/Inference/StatAccumulator.cpp \
-    Source/CommonFramework/InferenceInfra/AudioInferencePivot.cpp \
-    Source/CommonFramework/InferenceInfra/InferenceRoutines.cpp \
-    Source/CommonFramework/InferenceInfra/InferenceSession.cpp \
-    Source/CommonFramework/InferenceInfra/VisualInferenceCallback.cpp \
-    Source/CommonFramework/InferenceInfra/VisualInferencePivot.cpp \
-    Source/CommonFramework/Language.cpp \
-    Source/CommonFramework/Logging/FileWindowLogger.cpp \
-    Source/CommonFramework/Logging/Logger.cpp \
-    Source/CommonFramework/Logging/OutputRedirector.cpp \
-    Source/CommonFramework/Logging/QueuedLogger.cpp \
-    Source/CommonFramework/Main.cpp \
-    Source/CommonFramework/NewVersionCheck.cpp \
-    Source/CommonFramework/Notifications/EventNotificationOption.cpp \
-    Source/CommonFramework/Notifications/EventNotificationsTable.cpp \
-    Source/CommonFramework/Notifications/MessageAttachment.cpp \
-    Source/CommonFramework/Notifications/ProgramNotifications.cpp \
-    Source/CommonFramework/Notifications/SenderNotificationTable.cpp \
-    Source/CommonFramework/OCR/OCR_DictionaryMatcher.cpp \
-    Source/CommonFramework/OCR/OCR_DictionaryOCR.cpp \
-    Source/CommonFramework/OCR/OCR_LargeDictionaryMatcher.cpp \
-    Source/CommonFramework/OCR/OCR_NumberReader.cpp \
-    Source/CommonFramework/OCR/OCR_RawOCR.cpp \
-    Source/CommonFramework/OCR/OCR_Routines.cpp \
-    Source/CommonFramework/OCR/OCR_SmallDictionaryMatcher.cpp \
-    Source/CommonFramework/OCR/OCR_StringMatchResult.cpp \
-    Source/CommonFramework/OCR/OCR_StringNormalization.cpp \
-    Source/CommonFramework/OCR/OCR_TextMatcher.cpp \
-    Source/CommonFramework/OCR/OCR_TrainingTools.cpp \
-    Source/CommonFramework/Options/Environment/ProcessorLevelOption.cpp \
-    Source/CommonFramework/Options/Environment/ThemeSelectorOption.cpp \
-    Source/CommonFramework/Options/LabelCellOption.cpp \
-    Source/CommonFramework/Options/LanguageOCROption.cpp \
-    Source/CommonFramework/Options/ScreenWatchOption.cpp \
-    Source/CommonFramework/Options/StringSelectOption.cpp \
-    Source/CommonFramework/Options/UI/LabelCellWidget.cpp \
-    Source/CommonFramework/Options/UI/LanguageOCRWidget.cpp \
-    Source/CommonFramework/Options/UI/ScreenWatchWidget.cpp \
-    Source/CommonFramework/Options/UI/StringSelectWidget.cpp \
-    Source/CommonFramework/Panels/PanelDescriptor.cpp \
-    Source/CommonFramework/Panels/PanelInstance.cpp \
-    Source/CommonFramework/Panels/PanelList.cpp \
-    Source/CommonFramework/Panels/ProgramDescriptor.cpp \
-    Source/CommonFramework/Panels/SettingsPanel.cpp \
-    Source/CommonFramework/Panels/UI/PanelElements.cpp \
-    Source/CommonFramework/Panels/UI/PanelListWidget.cpp \
-    Source/CommonFramework/Panels/UI/PanelWidget.cpp \
-    Source/CommonFramework/Panels/UI/SettingsPanelWidget.cpp \
-    Source/CommonFramework/PersistentSettings.cpp \
-    Source/CommonFramework/ProgramSession.cpp \
-    Source/CommonFramework/Resources/SpriteDatabase.cpp \
-    Source/CommonFramework/SetupSettings.cpp \
-    Source/CommonFramework/Tools/BlackBorderCheck.cpp \
-    Source/CommonFramework/Tools/BotBaseHandle.cpp \
-    Source/CommonFramework/Tools/ConsoleHandle.cpp \
-    Source/CommonFramework/Tools/DebugDumper.cpp \
-    Source/CommonFramework/Tools/ErrorDumper.cpp \
-    Source/CommonFramework/Tools/FileDownloader.cpp \
-    Source/CommonFramework/Tools/InterruptableCommands.cpp \
-    Source/CommonFramework/Tools/MultiConsoleErrors.cpp \
-    Source/CommonFramework/Tools/ProgramEnvironment.cpp \
-    Source/CommonFramework/Tools/StatsDatabase.cpp \
-    Source/CommonFramework/Tools/StatsTracking.cpp \
-    Source/CommonFramework/Tools/SuperControlSession.cpp \
-    Source/CommonFramework/Tools/VideoResolutionCheck.cpp \
-    Source/CommonFramework/VideoPipeline/Backends/CameraImplementations.cpp \
-    Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt5.cpp \
-    Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt6.cpp \
-    Source/CommonFramework/VideoPipeline/Backends/VideoToolsQt5.cpp \
-    Source/CommonFramework/VideoPipeline/CameraOption.cpp \
-    Source/CommonFramework/VideoPipeline/Stats/ThreadUtilizationStats.cpp \
-    Source/CommonFramework/VideoPipeline/UI/CameraSelectorWidget.cpp \
-    Source/CommonFramework/VideoPipeline/UI/VideoDisplayWidget.cpp \
-    Source/CommonFramework/VideoPipeline/UI/VideoDisplayWindow.cpp \
-    Source/CommonFramework/VideoPipeline/UI/VideoOverlayWidget.cpp \
-    Source/CommonFramework/VideoPipeline/VideoOverlayOption.cpp \
-    Source/CommonFramework/VideoPipeline/VideoOverlaySession.cpp \
-    Source/CommonFramework/VideoPipeline/VideoOverlayTypes.cpp \
-    Source/CommonFramework/Windows/ButtonDiagram.cpp \
-    Source/CommonFramework/Windows/DpiScaler.cpp \
-    Source/CommonFramework/Windows/MainWindow.cpp \
-    Source/CommonFramework/Windows/WindowTracker.cpp \
-    Source/ComputerPrograms/ComputerProgram.cpp \
-    Source/ComputerPrograms/Framework/ComputerProgramOption.cpp \
-    Source/ComputerPrograms/Framework/ComputerProgramSession.cpp \
-    Source/ComputerPrograms/Framework/ComputerProgramWidget.cpp \
-    Source/Integrations/DiscordIntegrationSettings.cpp \
-    Source/Integrations/DiscordIntegrationTable.cpp \
-    Source/Integrations/DiscordSettingsOption.cpp \
-    Source/Integrations/DiscordWebhook.cpp \
-    Source/Integrations/DiscordWebhookSettings.cpp \
-    Source/Integrations/DppIntegration/DppClient.cpp \
-    Source/Integrations/DppIntegration/DppCommandHandler.cpp \
-    Source/Integrations/DppIntegration/DppUtility.cpp \
-    Source/Integrations/IntegrationsAPI.cpp \
-    Source/Integrations/ProgramTracker.cpp \
-    Source/Integrations/SleepyDiscordRunner.cpp \
-    Source/Kernels/AbsFFT/Kernels_AbsFFT.cpp \
-    Source/Kernels/AbsFFT/Kernels_AbsFFT_Core_Default.cpp \
-    Source/Kernels/AbsFFT/Kernels_AbsFFT_Core_x86_AVX2.cpp \
-    Source/Kernels/AbsFFT/Kernels_AbsFFT_Core_x86_SSE41.cpp \
-    Source/Kernels/Algorithm/Kernels_Algorithm_DisjointSet.cpp \
-    Source/Kernels/AudioStreamConversion/AudioStreamConversion.cpp \
-    Source/Kernels/AudioStreamConversion/AudioStreamConversion_Core_Default.cpp \
-    Source/Kernels/AudioStreamConversion/AudioStreamConversion_Core_x86_SSE41.cpp \
-    Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters.cpp \
-    Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters_Core_64x16_x64_AVX2.cpp \
-    Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters_Core_64x32_x64_AVX512.cpp \
-    Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters_Core_64x4_Default.cpp \
-    Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters_Core_64x64_x64_AVX512.cpp \
-    Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters_Core_64x8_x64_SSE42.cpp \
-    Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix.cpp \
-    Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Core_64x16_x64_AVX2.cpp \
-    Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Core_64x32_x64_AVX512.cpp \
-    Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Core_64x64_x64_AVX512.cpp \
-    Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Core_64x8_x64_SSE42.cpp \
-    Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Core_64xH_Default.cpp \
-    Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Core_x64_AVX2.cpp \
-    Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Core_x64_AVX512.cpp \
-    Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Core_x64_SSE42.cpp \
-    Source/Kernels/ImageFilters/Kernels_ImageFilter_Basic.cpp \
-    Source/Kernels/ImageFilters/Kernels_ImageFilter_Basic_Default.cpp \
-    Source/Kernels/ImageFilters/Kernels_ImageFilter_Basic_x64_AVX2.cpp \
-    Source/Kernels/ImageFilters/Kernels_ImageFilter_Basic_x64_AVX512.cpp \
-    Source/Kernels/ImageFilters/Kernels_ImageFilter_Basic_x64_SSE42.cpp \
-    Source/Kernels/ImageScaleBrightness/Kernels_ImageScaleBrightness.cpp \
-    Source/Kernels/ImageScaleBrightness/Kernels_ImageScaleBrightness_Default.cpp \
-    Source/Kernels/ImageScaleBrightness/Kernels_ImageScaleBrightness_arm64_NEON.cpp \
-    Source/Kernels/ImageScaleBrightness/Kernels_ImageScaleBrightness_x64_AVX2.cpp \
-    Source/Kernels/ImageScaleBrightness/Kernels_ImageScaleBrightness_x64_AVX512.cpp \
-    Source/Kernels/ImageScaleBrightness/Kernels_ImageScaleBrightness_x64_SSE41.cpp \
-    Source/Kernels/ImageStats/Kernels_ImagePixelSumSqr.cpp \
-    Source/Kernels/ImageStats/Kernels_ImagePixelSumSqrDev.cpp \
-    Source/Kernels/ImageStats/Kernels_ImagePixelSumSqrDev_Default.cpp \
-    Source/Kernels/ImageStats/Kernels_ImagePixelSumSqrDev_x64_AVX2.cpp \
-    Source/Kernels/ImageStats/Kernels_ImagePixelSumSqrDev_x64_AVX512.cpp \
-    Source/Kernels/ImageStats/Kernels_ImagePixelSumSqrDev_x64_SSE41.cpp \
-    Source/Kernels/ImageStats/Kernels_ImagePixelSumSqr_Default.cpp \
-    Source/Kernels/ImageStats/Kernels_ImagePixelSumSqr_x64_AVX2.cpp \
-    Source/Kernels/ImageStats/Kernels_ImagePixelSumSqr_x64_AVX512.cpp \
-    Source/Kernels/ImageStats/Kernels_ImagePixelSumSqr_x64_SSE41.cpp \
-    Source/Kernels/ScaleInvariantMatrixMatch/Kernels_ScaleInvariantMatrixMatch.cpp \
-    Source/Kernels/ScaleInvariantMatrixMatch/Kernels_ScaleInvariantMatrixMatch_Core_Default.cpp \
-    Source/Kernels/ScaleInvariantMatrixMatch/Kernels_ScaleInvariantMatrixMatch_Core_x86_AVX2.cpp \
-    Source/Kernels/ScaleInvariantMatrixMatch/Kernels_ScaleInvariantMatrixMatch_Core_x86_AVX512.cpp \
-    Source/Kernels/ScaleInvariantMatrixMatch/Kernels_ScaleInvariantMatrixMatch_Core_x86_SSE.cpp \
-    Source/Kernels/SpikeConvolution/Kernels_SpikeConvolution.cpp \
-    Source/Kernels/SpikeConvolution/Kernels_SpikeConvolution_Core_Default.cpp \
-    Source/Kernels/SpikeConvolution/Kernels_SpikeConvolution_Core_x86_AVX2.cpp \
-    Source/Kernels/SpikeConvolution/Kernels_SpikeConvolution_Core_x86_AVX512.cpp \
-    Source/Kernels/SpikeConvolution/Kernels_SpikeConvolution_Core_x86_SSE41.cpp \
-    Source/Kernels/Waterfill/Kernels_Waterfill.cpp \
-    Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x16_x64_AVX2.cpp \
-    Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x32_x64_AVX512-GF.cpp \
-    Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x32_x64_AVX512.cpp \
-    Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x64_x64_AVX512-GF.cpp \
-    Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x64_x64_AVX512.cpp \
-    Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x8_x64_SSE42.cpp \
-    Source/Kernels/Waterfill/Kernels_Waterfill_Core_64xH_Default.cpp \
-    Source/Kernels/Waterfill/Kernels_Waterfill_Session.cpp \
-    Source/NintendoSwitch/Commands/NintendoSwitch_Commands_Device.cpp \
-    Source/NintendoSwitch/Commands/NintendoSwitch_Commands_DigitEntry.cpp \
-    Source/NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.cpp \
-    Source/NintendoSwitch/Commands/NintendoSwitch_Commands_Routines.cpp \
-    Source/NintendoSwitch/Commands/NintendoSwitch_Commands_ScalarButtons.cpp \
-    Source/NintendoSwitch/DevPrograms/BoxDraw.cpp \
-    Source/NintendoSwitch/DevPrograms/TestProgramComputer.cpp \
-    Source/NintendoSwitch/DevPrograms/TestProgramSwitch.cpp \
-    Source/NintendoSwitch/Framework/NintendoSwitch_MultiSwitchProgramOption.cpp \
-    Source/NintendoSwitch/Framework/NintendoSwitch_MultiSwitchProgramSession.cpp \
-    Source/NintendoSwitch/Framework/NintendoSwitch_MultiSwitchSystemOption.cpp \
-    Source/NintendoSwitch/Framework/NintendoSwitch_MultiSwitchSystemSession.cpp \
-    Source/NintendoSwitch/Framework/NintendoSwitch_SingleSwitchProgramOption.cpp \
-    Source/NintendoSwitch/Framework/NintendoSwitch_SingleSwitchProgramSession.cpp \
-    Source/NintendoSwitch/Framework/NintendoSwitch_SwitchSystemOption.cpp \
-    Source/NintendoSwitch/Framework/NintendoSwitch_SwitchSystemSession.cpp \
-    Source/NintendoSwitch/Framework/NintendoSwitch_VirtualController.cpp \
-    Source/NintendoSwitch/Framework/NintendoSwitch_VirtualControllerMapping.cpp \
-    Source/NintendoSwitch/Framework/NintendoSwitch_VirtualControllerState.cpp \
-    Source/NintendoSwitch/Framework/UI/NintendoSwitch_CommandRow.cpp \
-    Source/NintendoSwitch/Framework/UI/NintendoSwitch_MultiSwitchProgramWidget.cpp \
-    Source/NintendoSwitch/Framework/UI/NintendoSwitch_MultiSwitchSystemWidget.cpp \
-    Source/NintendoSwitch/Framework/UI/NintendoSwitch_SingleSwitchProgramWidget.cpp \
-    Source/NintendoSwitch/Framework/UI/NintendoSwitch_SwitchSystemWidget.cpp \
-    Source/NintendoSwitch/Inference/NintendoSwitch_DateReader.cpp \
-    Source/NintendoSwitch/Inference/NintendoSwitch_DetectHome.cpp \
-    Source/NintendoSwitch/NintendoSwitch_MultiSwitchProgram.cpp \
-    Source/NintendoSwitch/NintendoSwitch_Panels.cpp \
-    Source/NintendoSwitch/NintendoSwitch_Settings.cpp \
-    Source/NintendoSwitch/NintendoSwitch_SingleSwitchProgram.cpp \
-    Source/NintendoSwitch/Options/NintendoSwitch_FriendCodeListOption.cpp \
-    Source/NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.cpp \
-    Source/NintendoSwitch/Options/TurboMacroTable.cpp \
-    Source/NintendoSwitch/Options/UI/NintendoSwitch_FriendCodeListWidget.cpp \
-    Source/NintendoSwitch/Programs/NintendoSwitch_FastCodeEntry.cpp \
-    Source/NintendoSwitch/Programs/NintendoSwitch_FriendCodeAdder.cpp \
-    Source/NintendoSwitch/Programs/NintendoSwitch_FriendDelete.cpp \
-    Source/NintendoSwitch/Programs/NintendoSwitch_GameEntry.cpp \
-    Source/NintendoSwitch/Programs/NintendoSwitch_PreventSleep.cpp \
-    Source/NintendoSwitch/Programs/NintendoSwitch_PushJoySticks.cpp \
-    Source/NintendoSwitch/Programs/NintendoSwitch_SnapshotDumper.cpp \
-    Source/NintendoSwitch/Programs/NintendoSwitch_SwitchViewer.cpp \
-    Source/NintendoSwitch/Programs/NintendoSwitch_TurboA.cpp \
-    Source/NintendoSwitch/Programs/NintendoSwitch_TurboButton.cpp \
-    Source/NintendoSwitch/Programs/NintendoSwitch_TurboMacro.cpp \
-    Source/NintendoSwitch/Programs/NintendoSwitch_VirtualConsole.cpp \
-    Source/PanelLists.cpp \
-    Source/Pokemon/Inference/Pokemon_BerryNameReader.cpp \
-    Source/Pokemon/Inference/Pokemon_BoxGenderDetector.cpp \
-    Source/Pokemon/Inference/Pokemon_IVCheckerReader.cpp \
-    Source/Pokemon/Inference/Pokemon_NameReader.cpp \
-    Source/Pokemon/Inference/Pokemon_NatureReader.cpp \
-    Source/Pokemon/Inference/Pokemon_PokeballNameReader.cpp \
-    Source/Pokemon/Inference/Pokemon_ReadHpBar.cpp \
-    Source/Pokemon/Inference/Pokemon_TrainIVCheckerOCR.cpp \
-    Source/Pokemon/Inference/Pokemon_TrainPokemonOCR.cpp \
-    Source/Pokemon/Options/Pokemon_EggHatchFilter.cpp \
-    Source/Pokemon/Options/Pokemon_IVCheckerOption.cpp \
-    Source/Pokemon/Options/Pokemon_NameSelectOption.cpp \
-    Source/Pokemon/Options/Pokemon_NameSelectWidget.cpp \
-    Source/Pokemon/Options/Pokemon_StatsResetFilter.cpp \
-    Source/Pokemon/Pokemon_EncounterStats.cpp \
-    Source/Pokemon/Pokemon_IVChecker.cpp \
-    Source/Pokemon/Pokemon_NatureChecker.cpp \
-    Source/Pokemon/Pokemon_Notification.cpp \
-    Source/Pokemon/Pokemon_ShinySparkleSet.cpp \
-    Source/Pokemon/Pokemon_Strings.cpp \
-    Source/Pokemon/Pokemon_Types.cpp \
-    Source/Pokemon/Resources/Pokemon_BerryNames.cpp \
-    Source/Pokemon/Resources/Pokemon_BerrySprites.cpp \
-    Source/Pokemon/Resources/Pokemon_PokeballNames.cpp \
-    Source/Pokemon/Resources/Pokemon_PokemonNames.cpp \
-    Source/Pokemon/Resources/Pokemon_PokemonSlugs.cpp \
-    Source/PokemonBDSP/Inference/Battles/PokemonBDSP_BattleBallReader.cpp \
-    Source/PokemonBDSP/Inference/Battles/PokemonBDSP_BattleMenuDetector.cpp \
-    Source/PokemonBDSP/Inference/Battles/PokemonBDSP_EndBattleDetector.cpp \
-    Source/PokemonBDSP/Inference/Battles/PokemonBDSP_ExperienceGainDetector.cpp \
-    Source/PokemonBDSP/Inference/Battles/PokemonBDSP_StartBattleDetector.cpp \
-    Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxDetector.cpp \
-    Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxGenderDetector.cpp \
-    Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxNatureDetector.cpp \
-    Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxShinyDetector.cpp \
-    Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_IVCheckerReader.cpp \
-    Source/PokemonBDSP/Inference/PokemonBDSP_DialogDetector.cpp \
-    Source/PokemonBDSP/Inference/PokemonBDSP_MapDetector.cpp \
-    Source/PokemonBDSP/Inference/PokemonBDSP_MarkFinder.cpp \
-    Source/PokemonBDSP/Inference/PokemonBDSP_MenuDetector.cpp \
-    Source/PokemonBDSP/Inference/PokemonBDSP_PokeballSpriteMatcher.cpp \
-    Source/PokemonBDSP/Inference/PokemonBDSP_ReceivePokemonDetector.cpp \
-    Source/PokemonBDSP/Inference/PokemonBDSP_SelectionArrow.cpp \
-    Source/PokemonBDSP/Inference/PokemonBDSP_VSSeekerReaction.cpp \
-    Source/PokemonBDSP/Inference/ShinyDetection/PokemonBDSP_ShinyEncounterDetector.cpp \
-    Source/PokemonBDSP/Inference/ShinyDetection/PokemonBDSP_ShinySparkleSet.cpp \
-    Source/PokemonBDSP/Inference/Sounds/PokemonBDSP_ShinySoundDetector.cpp \
-    Source/PokemonBDSP/Options/EncounterFilter/PokemonBDSP_EncounterFilterEnums.cpp \
-    Source/PokemonBDSP/Options/EncounterFilter/PokemonBDSP_EncounterFilterOption.cpp \
-    Source/PokemonBDSP/Options/EncounterFilter/PokemonBDSP_EncounterFilterOverride.cpp \
-    Source/PokemonBDSP/Options/EncounterFilter/PokemonBDSP_EncounterFilterWidget.cpp \
-    Source/PokemonBDSP/Options/PokemonBDSP_BerrySelectOption.cpp \
-    Source/PokemonBDSP/Options/PokemonBDSP_BerryTable.cpp \
-    Source/PokemonBDSP/Options/PokemonBDSP_ShortcutDirection.cpp \
-    Source/PokemonBDSP/PokemonBDSP_Panels.cpp \
-    Source/PokemonBDSP/PokemonBDSP_Settings.cpp \
-    Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggAutonomous.cpp \
-    Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggAutonomousState.cpp \
-    Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggFeedback.cpp \
-    Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggFetcher.cpp \
-    Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggHatcher.cpp \
-    Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggRoutines.cpp \
-    Source/PokemonBDSP/Programs/Farming/PokemonBDSP_AmitySquarePickUpFarmer.cpp \
-    Source/PokemonBDSP/Programs/Farming/PokemonBDSP_DoublesLeveling.cpp \
-    Source/PokemonBDSP/Programs/Farming/PokemonBDSP_GiftBerryReset.cpp \
-    Source/PokemonBDSP/Programs/Farming/PokemonBDSP_MoneyFarmerRoute210.cpp \
-    Source/PokemonBDSP/Programs/Farming/PokemonBDSP_MoneyFarmerRoute212.cpp \
-    Source/PokemonBDSP/Programs/General/PokemonBDSP_AutonomousBallThrower.cpp \
-    Source/PokemonBDSP/Programs/General/PokemonBDSP_MassRelease.cpp \
-    Source/PokemonBDSP/Programs/Glitches/PokemonBDSP_ActivateMenuGlitch-1.1.2.cpp \
-    Source/PokemonBDSP/Programs/Glitches/PokemonBDSP_ActivateMenuGlitch-1.1.3.cpp \
-    Source/PokemonBDSP/Programs/Glitches/PokemonBDSP_CloneItemsBoxCopy2.cpp \
-    Source/PokemonBDSP/Programs/PokemonBDSP_BasicCatcher.cpp \
-    Source/PokemonBDSP/Programs/PokemonBDSP_BoxRelease.cpp \
-    Source/PokemonBDSP/Programs/PokemonBDSP_EncounterDetection.cpp \
-    Source/PokemonBDSP/Programs/PokemonBDSP_EncounterHandler.cpp \
-    Source/PokemonBDSP/Programs/PokemonBDSP_GameEntry.cpp \
-    Source/PokemonBDSP/Programs/PokemonBDSP_GameNavigation.cpp \
-    Source/PokemonBDSP/Programs/PokemonBDSP_GlobalRoomHeal.cpp \
-    Source/PokemonBDSP/Programs/PokemonBDSP_OverworldTrigger.cpp \
-    Source/PokemonBDSP/Programs/PokemonBDSP_RunFromBattle.cpp \
-    Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_LegendaryReset.cpp \
-    Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_ShinyHunt-Fishing.cpp \
-    Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_ShinyHunt-Overworld.cpp \
-    Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_ShinyHunt-Shaymin.cpp \
-    Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_StarterReset.cpp \
-    Source/PokemonBDSP/Programs/TestPrograms/PokemonBDSP_ShinyEncounterTester.cpp \
-    Source/PokemonBDSP/Programs/TestPrograms/PokemonBDSP_SoundListener.cpp \
-    Source/PokemonBDSP/Programs/Trading/PokemonBDSP_SelfBoxTrade.cpp \
-    Source/PokemonBDSP/Programs/Trading/PokemonBDSP_SelfTouchTrade.cpp \
-    Source/PokemonBDSP/Programs/Trading/PokemonBDSP_TradeRoutines.cpp \
-    Source/PokemonBDSP/Resources/PokemonBDSP_NameDatabase.cpp \
-    Source/PokemonHome/Inference/PokemonHome_BallReader.cpp \
-    Source/PokemonHome/Inference/PokemonHome_BoxGenderDetector.cpp \
-    Source/PokemonHome/Options/PokemonHome_BoxSortingTable.cpp \
-    Source/PokemonHome/PokemonHome_Panels.cpp \
-    Source/PokemonHome/PokemonHome_Settings.cpp \
-    Source/PokemonHome/Programs/PokemonHome_BoxSorting.cpp \
-    Source/PokemonHome/Programs/PokemonHome_GenerateNameOCR.cpp \
-    Source/PokemonHome/Programs/PokemonHome_PageSwap.cpp \
-    Source/PokemonLA/Inference/Battles/PokemonLA_BattleMenuDetector.cpp \
-    Source/PokemonLA/Inference/Battles/PokemonLA_BattleMoveSelectionDetector.cpp \
-    Source/PokemonLA/Inference/Battles/PokemonLA_BattlePokemonSwitchDetector.cpp \
-    Source/PokemonLA/Inference/Battles/PokemonLA_BattleSpriteWatcher.cpp \
-    Source/PokemonLA/Inference/Battles/PokemonLA_BattleStartDetector.cpp \
-    Source/PokemonLA/Inference/Battles/PokemonLA_TransparentDialogueDetector.cpp \
-    Source/PokemonLA/Inference/Map/PokemonLA_MMOSpriteStarSymbolDetector.cpp \
-    Source/PokemonLA/Inference/Map/PokemonLA_MapDetector.cpp \
-    Source/PokemonLA/Inference/Map/PokemonLA_MapMarkerLocator.cpp \
-    Source/PokemonLA/Inference/Map/PokemonLA_MapMissionTabReader.cpp \
-    Source/PokemonLA/Inference/Map/PokemonLA_MapWeatherAndTimeReader.cpp \
-    Source/PokemonLA/Inference/Map/PokemonLA_MapZoomLevelReader.cpp \
-    Source/PokemonLA/Inference/Map/PokemonLA_OutbreakReader.cpp \
-    Source/PokemonLA/Inference/Map/PokemonLA_PokemonMapSpriteReader.cpp \
-    Source/PokemonLA/Inference/Map/PokemonLA_SelectedRegionDetector.cpp \
-    Source/PokemonLA/Inference/Objects/PokemonLA_ArcDetector.cpp \
-    Source/PokemonLA/Inference/Objects/PokemonLA_ArcPhoneDetector.cpp \
-    Source/PokemonLA/Inference/Objects/PokemonLA_BattleSpriteArrowDetector.cpp \
-    Source/PokemonLA/Inference/Objects/PokemonLA_BubbleDetector.cpp \
-    Source/PokemonLA/Inference/Objects/PokemonLA_ButtonDetector.cpp \
-    Source/PokemonLA/Inference/Objects/PokemonLA_DialogueEllipseDetector.cpp \
-    Source/PokemonLA/Inference/Objects/PokemonLA_DialogueYellowArrowDetector.cpp \
-    Source/PokemonLA/Inference/Objects/PokemonLA_FlagDetector.cpp \
-    Source/PokemonLA/Inference/Objects/PokemonLA_FlagTracker.cpp \
-    Source/PokemonLA/Inference/Objects/PokemonLA_MMOQuestionMarkDetector.cpp \
-    Source/PokemonLA/Inference/Objects/PokemonLA_QuestMarkDetector.cpp \
-    Source/PokemonLA/Inference/Objects/PokemonLA_ShinySymbolDetector.cpp \
-    Source/PokemonLA/Inference/Objects/PokemonLA_WhiteObjectDetector.cpp \
-    Source/PokemonLA/Inference/PokemonLA_BerryTreeDetector.cpp \
-    Source/PokemonLA/Inference/PokemonLA_BlackOutDetector.cpp \
-    Source/PokemonLA/Inference/PokemonLA_CommonColorCheck.cpp \
-    Source/PokemonLA/Inference/PokemonLA_DialogDetector.cpp \
-    Source/PokemonLA/Inference/PokemonLA_ItemCompatibilityDetector.cpp \
-    Source/PokemonLA/Inference/PokemonLA_MountDetector.cpp \
-    Source/PokemonLA/Inference/PokemonLA_NotificationReader.cpp \
-    Source/PokemonLA/Inference/PokemonLA_OverworldDetector.cpp \
-    Source/PokemonLA/Inference/PokemonLA_StatusInfoScreenDetector.cpp \
-    Source/PokemonLA/Inference/PokemonLA_UnderAttackDetector.cpp \
-    Source/PokemonLA/Inference/PokemonLA_WildPokemonFocusDetector.cpp \
-    Source/PokemonLA/Inference/Sounds/PokemonLA_AlphaMusicDetector.cpp \
-    Source/PokemonLA/Inference/Sounds/PokemonLA_AlphaRoarDetector.cpp \
-    Source/PokemonLA/Inference/Sounds/PokemonLA_ItemDropSoundDetector.cpp \
-    Source/PokemonLA/Inference/Sounds/PokemonLA_ShinySoundDetector.cpp \
-    Source/PokemonLA/Options/PokemonLA_BattlePokemonActionTable.cpp \
-    Source/PokemonLA/Options/PokemonLA_CustomPathTable.cpp \
-    Source/PokemonLA/Options/PokemonLA_IngoOpponent.cpp \
-    Source/PokemonLA/Options/PokemonLA_ShinyDetectedAction.cpp \
-    Source/PokemonLA/Options/PokemonLA_TradeCountTable.cpp \
-    Source/PokemonLA/Options/PokemonLA_TravelLocation.cpp \
-    Source/PokemonLA/PokemonLA_Locations.cpp \
-    Source/PokemonLA/PokemonLA_Panels.cpp \
-    Source/PokemonLA/PokemonLA_Settings.cpp \
-    Source/PokemonLA/PokemonLA_TravelLocations.cpp \
-    Source/PokemonLA/PokemonLA_WeatherAndTime.cpp \
-    Source/PokemonLA/Programs/Farming/PokemonLA_IngoBattleGrinder.cpp \
-    Source/PokemonLA/Programs/Farming/PokemonLA_IngoMoveGrinder.cpp \
-    Source/PokemonLA/Programs/Farming/PokemonLA_LeapGrinder.cpp \
-    Source/PokemonLA/Programs/Farming/PokemonLA_MagikarpMoveGrinder.cpp \
-    Source/PokemonLA/Programs/Farming/PokemonLA_NuggetFarmerHighlands.cpp \
-    Source/PokemonLA/Programs/Farming/PokemonLA_TenacityCandyFarmer.cpp \
-    Source/PokemonLA/Programs/General/PokemonLA_ApplyGrits.cpp \
-    Source/PokemonLA/Programs/General/PokemonLA_BraviaryHeightGlitch.cpp \
-    Source/PokemonLA/Programs/General/PokemonLA_ClothingBuyer.cpp \
-    Source/PokemonLA/Programs/General/PokemonLA_DistortionWaiter.cpp \
-    Source/PokemonLA/Programs/General/PokemonLA_OutbreakFinder.cpp \
-    Source/PokemonLA/Programs/General/PokemonLA_PokedexTasksReader.cpp \
-    Source/PokemonLA/Programs/General/PokemonLA_RamanasIslandCombee.cpp \
-    Source/PokemonLA/Programs/General/PokemonLA_SkipToFullMoon.cpp \
-    Source/PokemonLA/Programs/PokemonLA_BattleRoutines.cpp \
-    Source/PokemonLA/Programs/PokemonLA_EscapeFromAttack.cpp \
-    Source/PokemonLA/Programs/PokemonLA_FlagNavigationAir.cpp \
-    Source/PokemonLA/Programs/PokemonLA_GameEntry.cpp \
-    Source/PokemonLA/Programs/PokemonLA_GameSave.cpp \
-    Source/PokemonLA/Programs/PokemonLA_LeapPokemonActions.cpp \
-    Source/PokemonLA/Programs/PokemonLA_MountChange.cpp \
-    Source/PokemonLA/Programs/PokemonLA_RegionNavigation.cpp \
-    Source/PokemonLA/Programs/PokemonLA_TimeOfDayChange.cpp \
-    Source/PokemonLA/Programs/ShinyHunting/PokemonLA_AutoMultiSpawn.cpp \
-    Source/PokemonLA/Programs/ShinyHunting/PokemonLA_BurmyFinder.cpp \
-    Source/PokemonLA/Programs/ShinyHunting/PokemonLA_CrobatFinder.cpp \
-    Source/PokemonLA/Programs/ShinyHunting/PokemonLA_FroslassFinder.cpp \
-    Source/PokemonLA/Programs/ShinyHunting/PokemonLA_GalladeFinder.cpp \
-    Source/PokemonLA/Programs/ShinyHunting/PokemonLA_PostMMOSpawnReset.cpp \
-    Source/PokemonLA/Programs/ShinyHunting/PokemonLA_ShinyHunt-CustomPath.cpp \
-    Source/PokemonLA/Programs/ShinyHunting/PokemonLA_ShinyHunt-FlagPin.cpp \
-    Source/PokemonLA/Programs/ShinyHunting/PokemonLA_ShinyHunt-LakeTrio.cpp \
-    Source/PokemonLA/Programs/ShinyHunting/PokemonLA_UnownFinder.cpp \
-    Source/PokemonLA/Programs/TestPrograms/PokemonLA_FlagNavigationTest.cpp \
-    Source/PokemonLA/Programs/TestPrograms/PokemonLA_MountDetectionTest.cpp \
-    Source/PokemonLA/Programs/TestPrograms/PokemonLA_OverworldWatcher.cpp \
-    Source/PokemonLA/Programs/TestPrograms/PokemonLA_SoundListener.cpp \
-    Source/PokemonLA/Programs/Trading/PokemonLA_SelfBoxTrade.cpp \
-    Source/PokemonLA/Programs/Trading/PokemonLA_SelfTouchTrade.cpp \
-    Source/PokemonLA/Programs/Trading/PokemonLA_TradeRoutines.cpp \
-    Source/PokemonLA/Resources/PokemonLA_AvailablePokemon.cpp \
-    Source/PokemonLA/Resources/PokemonLA_NameDatabase.cpp \
-    Source/PokemonLA/Resources/PokemonLA_PokemonSprites.cpp \
-    Source/PokemonLA/Resources/PokemonLA_WeatherAndTimeIcons.cpp \
-    Source/PokemonSV/Inference/Battles/PokemonSV_BattleBallReader.cpp \
-    Source/PokemonSV/Inference/Battles/PokemonSV_EncounterWatcher.cpp \
-    Source/PokemonSV/Inference/Battles/PokemonSV_NormalBattleMenus.cpp \
-    Source/PokemonSV/Inference/Battles/PokemonSV_PostCatchDetector.cpp \
-    Source/PokemonSV/Inference/Battles/PokemonSV_ShinySoundDetector.cpp \
-    Source/PokemonSV/Inference/Battles/PokemonSV_TeraBattleMenus.cpp \
-    Source/PokemonSV/Inference/Boxes/PokemonSV_BoxDetection.cpp \
-    Source/PokemonSV/Inference/Boxes/PokemonSV_BoxEggDetector.cpp \
-    Source/PokemonSV/Inference/Boxes/PokemonSV_BoxGenderDetector.cpp \
-    Source/PokemonSV/Inference/Boxes/PokemonSV_BoxNatureDetector.cpp \
-    Source/PokemonSV/Inference/Boxes/PokemonSV_BoxShinyDetector.cpp \
-    Source/PokemonSV/Inference/Boxes/PokemonSV_IVCheckerReader.cpp \
-    Source/PokemonSV/Inference/Boxes/PokemonSV_StatsResetChecker.cpp \
-    Source/PokemonSV/Inference/Dialogs/PokemonSV_DialogArrowDetector.cpp \
-    Source/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.cpp \
-    Source/PokemonSV/Inference/Dialogs/PokemonSV_GradientArrowDetector.cpp \
-    Source/PokemonSV/Inference/Overworld/PokemonSV_AreaZeroSkyDetector.cpp \
-    Source/PokemonSV/Inference/Overworld/PokemonSV_LetsGoHpReader.cpp \
-    Source/PokemonSV/Inference/Overworld/PokemonSV_LetsGoKillDetector.cpp \
-    Source/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.cpp \
-    Source/PokemonSV/Inference/Picnics/PokemonSV_PicnicDetector.cpp \
-    Source/PokemonSV/Inference/Picnics/PokemonSV_SandwichHandDetector.cpp \
-    Source/PokemonSV/Inference/Picnics/PokemonSV_SandwichIngredientDetector.cpp \
-    Source/PokemonSV/Inference/Picnics/PokemonSV_SandwichRecipeDetector.cpp \
-    Source/PokemonSV/Inference/PokemonSV_AuctionItemNameReader.cpp \
-    Source/PokemonSV/Inference/PokemonSV_ESPEmotionDetector.cpp \
-    Source/PokemonSV/Inference/PokemonSV_MainMenuDetector.cpp \
-    Source/PokemonSV/Inference/PokemonSV_MapDetector.cpp \
-    Source/PokemonSV/Inference/PokemonSV_MoneyReader.cpp \
-    Source/PokemonSV/Inference/PokemonSV_PokePortalDetector.cpp \
-    Source/PokemonSV/Inference/PokemonSV_PokemonSummaryReader.cpp \
-    Source/PokemonSV/Inference/PokemonSV_SweatBubbleDetector.cpp \
-    Source/PokemonSV/Inference/PokemonSV_TournamentPrizeNameReader.cpp \
-    Source/PokemonSV/Inference/PokemonSV_WhiteButtonDetector.cpp \
-    Source/PokemonSV/Inference/PokemonSV_ZeroGateWarpPromptDetector.cpp \
-    Source/PokemonSV/Inference/Tera/PokemonSV_TeraCardDetector.cpp \
-    Source/PokemonSV/Inference/Tera/PokemonSV_TeraCodeReader.cpp \
-    Source/PokemonSV/Inference/Tera/PokemonSV_TeraRaidSearchDetector.cpp \
-    Source/PokemonSV/Inference/Tera/PokemonSV_TeraRewardsReader.cpp \
-    Source/PokemonSV/Inference/Tera/PokemonSV_TeraSilhouetteReader.cpp \
-    Source/PokemonSV/Inference/Tera/PokemonSV_TeraTypeReader.cpp \
-    Source/PokemonSV/Options/PokemonSV_AuctionItemSelectOption.cpp \
-    Source/PokemonSV/Options/PokemonSV_AuctionItemTable.cpp \
-    Source/PokemonSV/Options/PokemonSV_EggPowerSandwichOption.cpp \
-    Source/PokemonSV/Options/PokemonSV_EncounterActionsTable.cpp \
-    Source/PokemonSV/Options/PokemonSV_PlayerList.cpp \
-    Source/PokemonSV/Options/PokemonSV_SandwichIngredientsOption.cpp \
-    Source/PokemonSV/Options/PokemonSV_SandwichIngredientsTable.cpp \
-    Source/PokemonSV/Options/PokemonSV_SandwichMakerOption.cpp \
-    Source/PokemonSV/Options/PokemonSV_TeraAIOption.cpp \
-    Source/PokemonSV/Options/PokemonSV_TeraMoveTable.cpp \
-    Source/PokemonSV/Options/PokemonSV_TournamentPrizeSelectOption.cpp \
-    Source/PokemonSV/Options/PokemonSV_TournamentPrizeTable.cpp \
-    Source/PokemonSV/PokemonSV_Panels.cpp \
-    Source/PokemonSV/PokemonSV_Settings.cpp \
-    Source/PokemonSV/Programs/Boxes/PokemonSV_BoxRoutines.cpp \
-    Source/PokemonSV/Programs/Eggs/PokemonSV_EggAutonomous.cpp \
-    Source/PokemonSV/Programs/Eggs/PokemonSV_EggFetcher.cpp \
-    Source/PokemonSV/Programs/Eggs/PokemonSV_EggHatcher.cpp \
-    Source/PokemonSV/Programs/Eggs/PokemonSV_EggRoutines.cpp \
-    Source/PokemonSV/Programs/FastCodeEntry/PokemonSV_ClipboardFastCodeEntry.cpp \
-    Source/PokemonSV/Programs/FastCodeEntry/PokemonSV_CodeEntry.cpp \
-    Source/PokemonSV/Programs/FastCodeEntry/PokemonSV_FastCodeEntry.cpp \
-    Source/PokemonSV/Programs/FastCodeEntry/PokemonSV_VideoFastCodeEntry.cpp \
-    Source/PokemonSV/Programs/General/PokemonSV_AuctionFarmer.cpp \
-    Source/PokemonSV/Programs/General/PokemonSV_AutonomousBallThrower.cpp \
-    Source/PokemonSV/Programs/General/PokemonSV_ESPTraining.cpp \
-    Source/PokemonSV/Programs/General/PokemonSV_GimmighoulChestFarmer.cpp \
-    Source/PokemonSV/Programs/General/PokemonSV_GimmighoulRoamingFarmer.cpp \
-    Source/PokemonSV/Programs/General/PokemonSV_LPFarmer.cpp \
-    Source/PokemonSV/Programs/General/PokemonSV_MassPurchase.cpp \
-    Source/PokemonSV/Programs/General/PokemonSV_MassRelease.cpp \
-    Source/PokemonSV/Programs/General/PokemonSV_SizeChecker.cpp \
-    Source/PokemonSV/Programs/General/PokemonSV_StatsReset.cpp \
-    Source/PokemonSV/Programs/General/PokemonSV_TournamentFarmer.cpp \
-    Source/PokemonSV/Programs/Glitches/PokemonSV_CloneItems-1.0.1.cpp \
-    Source/PokemonSV/Programs/Glitches/PokemonSV_RideCloner-1.0.1.cpp \
-    Source/PokemonSV/Programs/PokemonSV_AreaZero.cpp \
-    Source/PokemonSV/Programs/PokemonSV_BasicCatcher.cpp \
-    Source/PokemonSV/Programs/PokemonSV_Battles.cpp \
-    Source/PokemonSV/Programs/PokemonSV_ConnectToInternet.cpp \
-    Source/PokemonSV/Programs/PokemonSV_GameEntry.cpp \
-    Source/PokemonSV/Programs/PokemonSV_Navigation.cpp \
-    Source/PokemonSV/Programs/PokemonSV_SaveGame.cpp \
-    Source/PokemonSV/Programs/Sandwiches/PokemonSV_IngredientSession.cpp \
-    Source/PokemonSV/Programs/Sandwiches/PokemonSV_SandwichMaker.cpp \
-    Source/PokemonSV/Programs/Sandwiches/PokemonSV_SandwichRoutines.cpp \
-    Source/PokemonSV/Programs/ShinyHunting/PokemonSV_AreaZeroPlatform.cpp \
-    Source/PokemonSV/Programs/ShinyHunting/PokemonSV_LetsGoTools.cpp \
-    Source/PokemonSV/Programs/ShinyHunting/PokemonSV_ShinyHunt-AreaZeroPlatform.cpp \
-    Source/PokemonSV/Programs/TeraRaids/PokemonSV_AutoHost.cpp \
-    Source/PokemonSV/Programs/TeraRaids/PokemonSV_AutoHostLobbyWaiter.cpp \
-    Source/PokemonSV/Programs/TeraRaids/PokemonSV_AutoHostTools.cpp \
-    Source/PokemonSV/Programs/TeraRaids/PokemonSV_JoinTracker.cpp \
-    Source/PokemonSV/Programs/TeraRaids/PokemonSV_TeraBattler.cpp \
-    Source/PokemonSV/Programs/TeraRaids/PokemonSV_TeraMultiFarmer.cpp \
-    Source/PokemonSV/Programs/TeraRaids/PokemonSV_TeraRoutines.cpp \
-    Source/PokemonSV/Programs/TeraRaids/PokemonSV_TeraSelfFarmer.cpp \
-    Source/PokemonSV/Programs/TestPrograms/PokemonSV_SoundListener.cpp \
-    Source/PokemonSV/Programs/Trading/PokemonSV_SelfBoxTrade.cpp \
-    Source/PokemonSV/Programs/Trading/PokemonSV_TradeRoutines.cpp \
-    Source/PokemonSV/Resources/PokemonSV_AuctionItemNames.cpp \
-    Source/PokemonSV/Resources/PokemonSV_Ingredients.cpp \
-    Source/PokemonSV/Resources/PokemonSV_ItemSprites.cpp \
-    Source/PokemonSV/Resources/PokemonSV_NameDatabase.cpp \
-    Source/PokemonSV/Resources/PokemonSV_PokemonSprites.cpp \
-    Source/PokemonSV/Resources/PokemonSV_TournamentPrizeNames.cpp \
-    Source/PokemonSwSh/Commands/PokemonSwSh_Commands_AutoHosts.cpp \
-    Source/PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.cpp \
-    Source/PokemonSwSh/Commands/PokemonSwSh_Commands_DaySkippers.cpp \
-    Source/PokemonSwSh/Commands/PokemonSwSh_Commands_EggRoutines.cpp \
-    Source/PokemonSwSh/Commands/PokemonSwSh_Commands_GameEntry.cpp \
-    Source/PokemonSwSh/Commands/PokemonSwSh_Commands_Misc.cpp \
-    Source/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleBallReader.cpp \
-    Source/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleDialogDetector.cpp \
-    Source/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleDialogTracker.cpp \
-    Source/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleMenuDetector.cpp \
-    Source/PokemonSwSh/Inference/Battles/PokemonSwSh_ExperienceGainDetector.cpp \
-    Source/PokemonSwSh/Inference/Battles/PokemonSwSh_StartBattleDetector.cpp \
-    Source/PokemonSwSh/Inference/Dens/PokemonSwSh_BeamSetter.cpp \
-    Source/PokemonSwSh/Inference/Dens/PokemonSwSh_DenMonReader.cpp \
-    Source/PokemonSwSh/Inference/Dens/PokemonSwSh_RaidCatchDetector.cpp \
-    Source/PokemonSwSh/Inference/Dens/PokemonSwSh_RaidLobbyReader.cpp \
-    Source/PokemonSwSh/Inference/PokemonSwSh_BoxGenderDetector.cpp \
-    Source/PokemonSwSh/Inference/PokemonSwSh_BoxNatureDetector.cpp \
-    Source/PokemonSwSh/Inference/PokemonSwSh_BoxShinySymbolDetector.cpp \
-    Source/PokemonSwSh/Inference/PokemonSwSh_DialogBoxDetector.cpp \
-    Source/PokemonSwSh/Inference/PokemonSwSh_FishingDetector.cpp \
-    Source/PokemonSwSh/Inference/PokemonSwSh_IVCheckerReader.cpp \
-    Source/PokemonSwSh/Inference/PokemonSwSh_MarkFinder.cpp \
-    Source/PokemonSwSh/Inference/PokemonSwSh_PokemonSpriteReader.cpp \
-    Source/PokemonSwSh/Inference/PokemonSwSh_QuantityReader.cpp \
-    Source/PokemonSwSh/Inference/PokemonSwSh_ReceivePokemonDetector.cpp \
-    Source/PokemonSwSh/Inference/PokemonSwSh_SelectionArrowFinder.cpp \
-    Source/PokemonSwSh/Inference/PokemonSwSh_SummaryShinySymbolDetector.cpp \
-    Source/PokemonSwSh/Inference/PokemonSwSh_TypeSymbolFinder.cpp \
-    Source/PokemonSwSh/Inference/PokemonSwSh_YCommDetector.cpp \
-    Source/PokemonSwSh/Inference/RNG/PokemonSwSh_OrbeetleAttackAnimationDetector.cpp \
-    Source/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_ShinyEncounterDetector.cpp \
-    Source/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_ShinySparkleSet.cpp \
-    Source/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_SparkleDetectorRadial.cpp \
-    Source/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_SparkleDetectorSquare.cpp \
-    Source/PokemonSwSh/Inference/Sounds/PokemonSwSh_BerryTreeRustlingSoundDetector.cpp \
-    Source/PokemonSwSh/InferenceTraining/PokemonSwSh_GenerateIVCheckerOCR.cpp \
-    Source/PokemonSwSh/InferenceTraining/PokemonSwSh_GenerateNameOCRPokedex.cpp \
-    Source/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI.cpp \
-    Source/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_PathMatchup.cpp \
-    Source/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_RentalBossMatchup.cpp \
-    Source/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_SelectItem.cpp \
-    Source/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_SelectMove.cpp \
-    Source/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_SelectPath.cpp \
-    Source/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_SelectStarter.cpp \
-    Source/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_SwapCatch.cpp \
-    Source/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_SwapProfessor.cpp \
-    Source/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_Tools.cpp \
-    Source/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_CatchScreenTracker.cpp \
-    Source/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_Notifications.cpp \
-    Source/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_State.cpp \
-    Source/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_StateMachine.cpp \
-    Source/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_StateTracker.cpp \
-    Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_BattleMenu.cpp \
-    Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_EndBattle.cpp \
-    Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_Entrance.cpp \
-    Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_HPPP.cpp \
-    Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_ItemSelectMenu.cpp \
-    Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_Lobby.cpp \
-    Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathMap.cpp \
-    Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathSelect.cpp \
-    Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathSide.cpp \
-    Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonReader.cpp \
-    Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonSelectMenu.cpp \
-    Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonSwapMenu.cpp \
-    Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_ProfessorSwap.cpp \
-    Source/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options.cpp \
-    Source/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options_BossAction.cpp \
-    Source/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options_Consoles.cpp \
-    Source/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options_Hosting.cpp \
-    Source/PokemonSwSh/MaxLair/PokemonSwSh_MaxLair_BossFinder.cpp \
-    Source/PokemonSwSh/MaxLair/PokemonSwSh_MaxLair_Standard.cpp \
-    Source/PokemonSwSh/MaxLair/PokemonSwSh_MaxLair_StrongBoss.cpp \
-    Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_Adventure.cpp \
-    Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_Battle.cpp \
-    Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_CaughtScreen.cpp \
-    Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_EnterLobby.cpp \
-    Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_Entrance.cpp \
-    Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_ItemSelect.cpp \
-    Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_PathSelect.cpp \
-    Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_PokemonSelect.cpp \
-    Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_PokemonSwap.cpp \
-    Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_ProfessorSwap.cpp \
-    Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_Start.cpp \
-    Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_StartSolo.cpp \
-    Source/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterEnums.cpp \
-    Source/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterOption.cpp \
-    Source/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterOverride.cpp \
-    Source/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterWidget.cpp \
-    Source/PokemonSwSh/Options/PokemonSwSh_AutoHostNotification.cpp \
-    Source/PokemonSwSh/Options/PokemonSwSh_BallSelectOption.cpp \
-    Source/PokemonSwSh/Options/PokemonSwSh_CramomaticTable.cpp \
-    Source/PokemonSwSh/Options/PokemonSwSh_DateToucher.cpp \
-    Source/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Battle.cpp \
-    Source/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Field.cpp \
-    Source/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Matchup.cpp \
-    Source/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Moves.cpp \
-    Source/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Pokemon.cpp \
-    Source/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Stats.cpp \
-    Source/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Types.cpp \
-    Source/PokemonSwSh/PokemonSwSh_Panels.cpp \
-    Source/PokemonSwSh/PokemonSwSh_Settings.cpp \
-    Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-BerryFarmer.cpp \
-    Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-BerryFarmer2.cpp \
-    Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-DailyHighlightFarmer.cpp \
-    Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-LotoFarmer.cpp \
-    Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-PokeJobsFarmer.cpp \
-    Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-StowOnSideFarmer.cpp \
-    Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-WattFarmer.cpp \
-    Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_BeamReset.cpp \
-    Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperEU.cpp \
-    Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperJPN-7.8k.cpp \
-    Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperJPN.cpp \
-    Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperUS.cpp \
-    Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_EventBeamFinder.cpp \
-    Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_PurpleBeamFinder.cpp \
-    Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggAutonomous.cpp \
-    Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggCombined2.cpp \
-    Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggFetcher2.cpp \
-    Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggFetcherMultiple.cpp \
-    Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggHatcher.cpp \
-    Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggSuperCombined2.cpp \
-    Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_GodEggDuplication.cpp \
-    Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_GodEggItemDupe.cpp \
-    Source/PokemonSwSh/Programs/General/PokemonSwSh_AutonomousBallThrower.cpp \
-    Source/PokemonSwSh/Programs/General/PokemonSwSh_BallThrower.cpp \
-    Source/PokemonSwSh/Programs/General/PokemonSwSh_BoxReorderNationalDex.cpp \
-    Source/PokemonSwSh/Programs/General/PokemonSwSh_ClothingBuyer.cpp \
-    Source/PokemonSwSh/Programs/General/PokemonSwSh_DexRecFinder.cpp \
-    Source/PokemonSwSh/Programs/General/PokemonSwSh_MassRelease.cpp \
-    Source/PokemonSwSh/Programs/General/PokemonSwSh_SurpriseTrade.cpp \
-    Source/PokemonSwSh/Programs/General/PokemonSwSh_TradeBot.cpp \
-    Source/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHost-MultiGame.cpp \
-    Source/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHost-Rolling.cpp \
-    Source/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHost.cpp \
-    Source/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHostStats.cpp \
-    Source/PokemonSwSh/Programs/Hosting/PokemonSwSh_DenRoller.cpp \
-    Source/PokemonSwSh/Programs/Hosting/PokemonSwSh_DenTools.cpp \
-    Source/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset-Calyrex.cpp \
-    Source/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset-Moltres.cpp \
-    Source/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset-Regi.cpp \
-    Source/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset.cpp \
-    Source/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_OverworldMovement.cpp \
-    Source/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_OverworldTargetTracker.cpp \
-    Source/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_OverworldTrajectory.cpp \
-    Source/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_OverworldTrigger.cpp \
-    Source/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_ShinyHuntAutonomous-Overworld.cpp \
-    Source/PokemonSwSh/Programs/PokemonSwSh_BasicCatcher.cpp \
-    Source/PokemonSwSh/Programs/PokemonSwSh_EncounterDetection.cpp \
-    Source/PokemonSwSh/Programs/PokemonSwSh_EncounterHandler.cpp \
-    Source/PokemonSwSh/Programs/PokemonSwSh_GameEntry.cpp \
-    Source/PokemonSwSh/Programs/PokemonSwSh_Internet.cpp \
-    Source/PokemonSwSh/Programs/PokemonSwSh_MenuNavigation.cpp \
-    Source/PokemonSwSh/Programs/PokemonSwSh_RaidItemFarmerOKHO.cpp \
-    Source/PokemonSwSh/Programs/PokemonSwSh_SynchronizedSpinning.cpp \
-    Source/PokemonSwSh/Programs/QoLMacros/PokemonSwSh_FastCodeEntry.cpp \
-    Source/PokemonSwSh/Programs/QoLMacros/PokemonSwSh_FriendSearchDisconnect.cpp \
-    Source/PokemonSwSh/Programs/RNG/PokemonSwSh_BasicRNG.cpp \
-    Source/PokemonSwSh/Programs/RNG/PokemonSwSh_CramomaticRNG.cpp \
-    Source/PokemonSwSh/Programs/RNG/PokemonSwSh_Seedfinder.cpp \
-    Source/PokemonSwSh/Programs/RNG/PokemonSwSh_Xoroshiro128Plus.cpp \
-    Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-BerryTree.cpp \
-    Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Fishing.cpp \
-    Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-IoATrade.cpp \
-    Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Regi.cpp \
-    Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Regigigas2.cpp \
-    Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-StrongSpawn.cpp \
-    Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-SwordsOfJustice.cpp \
-    Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Whistling.cpp \
-    Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_CurryHunter.cpp \
-    Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_MultiGameFossil.cpp \
-    Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHunt-Regi.cpp \
-    Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntTools.cpp \
-    Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntUnattended-IoATrade.cpp \
-    Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntUnattended-Regi.cpp \
-    Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntUnattended-Regigigas2.cpp \
-    Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntUnattended-StrongSpawn.cpp \
-    Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntUnattended-SwordsOfJustice.cpp \
-    Source/PokemonSwSh/Programs/TestPrograms/PokemonSwSh_ShinyEncounterTester.cpp \
-    Source/PokemonSwSh/Resources/PokemonSwSh_MaxLairDatabase.cpp \
-    Source/PokemonSwSh/Resources/PokemonSwSh_NameDatabase.cpp \
-    Source/PokemonSwSh/Resources/PokemonSwSh_PokeballSprites.cpp \
-    Source/PokemonSwSh/Resources/PokemonSwSh_PokemonSprites.cpp \
-    Source/PokemonSwSh/Resources/PokemonSwSh_TypeMatchup.cpp \
-    Source/PokemonSwSh/Resources/PokemonSwSh_TypeSprites.cpp \
-    Source/PokemonSwSh/ShinyHuntTracker.cpp \
-    Source/Tests/CommandLineTests.cpp \
-    Source/Tests/CommonFramework_Tests.cpp \
-    Source/Tests/Kernels_Tests.cpp \
-    Source/Tests/NintendoSwitch_Tests.cpp \
-    Source/Tests/PokemonLA_Tests.cpp \
-    Source/Tests/PokemonSV_Tests.cpp \
-    Source/Tests/PokemonSwSh_Tests.cpp \
-    Source/Tests/TestMap.cpp \
-    Source/Tests/TestUtils.cpp \
-    Source/ZeldaTotK/Programs/ZeldaTotK_MineruItemDuper.cpp \
-    Source/ZeldaTotK/Programs/ZeldaTotK_ParaglideItemDuper.cpp \
-    Source/ZeldaTotK/Programs/ZeldaTotK_SurfItemDuper.cpp \
-    Source/ZeldaTotK/Programs/ZeldaTotK_WeaponDuper.cpp \
-    Source/ZeldaTotK/ZeldaTotK_Panels.cpp \
-    Source/ZeldaTotK/ZeldaTotK_Panels.h \
-    Source/ZeldaTotK/ZeldaTotK_Settings.cpp \
-    Source/ZeldaTotK/ZeldaTotK_Settings.h \
-    Source/ZeldaTotK/Programs/ZeldaTotK_BowItemDuper.cpp
-
-HEADERS += \
-    ../3rdParty/QtWavFile/WavFile.h \
-    ../3rdParty/TesseractPA/TesseractPA.h \
-    ../3rdParty/dpp/appcommand.h \
-    ../3rdParty/dpp/application.h \
-    ../3rdParty/dpp/auditlog.h \
-    ../3rdParty/dpp/automod.h \
-    ../3rdParty/dpp/ban.h \
-    ../3rdParty/dpp/cache.h \
-    ../3rdParty/dpp/channel.h \
-    ../3rdParty/dpp/cluster.h \
-    ../3rdParty/dpp/cluster_coro_calls.h \
-    ../3rdParty/dpp/cluster_sync_calls.h \
-    ../3rdParty/dpp/collector.h \
-    ../3rdParty/dpp/colors.h \
-    ../3rdParty/dpp/commandhandler.h \
-    ../3rdParty/dpp/coro.h \
-    ../3rdParty/dpp/discordclient.h \
-    ../3rdParty/dpp/discordevents.h \
-    ../3rdParty/dpp/discordvoiceclient.h \
-    ../3rdParty/dpp/dispatcher.h \
-    ../3rdParty/dpp/dns.h \
-    ../3rdParty/dpp/dpp.h \
-    ../3rdParty/dpp/dtemplate.h \
-    ../3rdParty/dpp/emoji.h \
-    ../3rdParty/dpp/etf.h \
-    ../3rdParty/dpp/event.h \
-    ../3rdParty/dpp/event_router.h \
-    ../3rdParty/dpp/exception.h \
-    ../3rdParty/dpp/export.h \
-    ../3rdParty/dpp/guild.h \
-    ../3rdParty/dpp/httpsclient.h \
-    ../3rdParty/dpp/integration.h \
-    ../3rdParty/dpp/intents.h \
-    ../3rdParty/dpp/invite.h \
-    ../3rdParty/dpp/json_interface.h \
-    ../3rdParty/dpp/managed.h \
-    ../3rdParty/dpp/message.h \
-    ../3rdParty/dpp/misc-enum.h \
-    ../3rdParty/dpp/nlohmann/json.hpp \
-    ../3rdParty/dpp/nlohmann/json_fwd.hpp \
-    ../3rdParty/dpp/once.h \
-    ../3rdParty/dpp/permissions.h \
-    ../3rdParty/dpp/presence.h \
-    ../3rdParty/dpp/prune.h \
-    ../3rdParty/dpp/queues.h \
-    ../3rdParty/dpp/restrequest.h \
-    ../3rdParty/dpp/restresults.h \
-    ../3rdParty/dpp/role.h \
-    ../3rdParty/dpp/scheduled_event.h \
-    ../3rdParty/dpp/snowflake.h \
-    ../3rdParty/dpp/socket.h \
-    ../3rdParty/dpp/sslclient.h \
-    ../3rdParty/dpp/stage_instance.h \
-    ../3rdParty/dpp/stringops.h \
-    ../3rdParty/dpp/sync.h \
-    ../3rdParty/dpp/sysdep.h \
-    ../3rdParty/dpp/timed_listener.h \
-    ../3rdParty/dpp/timer.h \
-    ../3rdParty/dpp/user.h \
-    ../3rdParty/dpp/utility.h \
-    ../3rdParty/dpp/version.h \
-    ../3rdParty/dpp/voiceregion.h \
-    ../3rdParty/dpp/voicestate.h \
-    ../3rdParty/dpp/webhook.h \
-    ../3rdParty/dpp/win32_safe_warnings.h \
-    ../3rdParty/dpp/wsclient.h \
-    ../3rdParty/nlohmann/json.hpp \
-    ../ClientSource/Connection/BotBase.h \
-    ../ClientSource/Connection/BotBaseMessage.h \
-    ../ClientSource/Connection/MessageLogger.h \
-    ../ClientSource/Connection/MessageSniffer.h \
-    ../ClientSource/Connection/PABotBase.h \
-    ../ClientSource/Connection/PABotBaseConnection.h \
-    ../ClientSource/Connection/SerialConnection.h \
-    ../ClientSource/Connection/SerialConnectionPOSIX.h \
-    ../ClientSource/Connection/SerialConnectionWinAPI.h \
-    ../ClientSource/Connection/StreamInterface.h \
-    ../ClientSource/Libraries/Logging.h \
-    ../ClientSource/Libraries/MessageConverter.h \
-    ../Common/CRC32.h \
-    ../Common/Compiler.h \
-    ../Common/Cpp/AbstractLogger.h \
-    ../Common/Cpp/CancellableScope.h \
-    ../Common/Cpp/Color.h \
-    ../Common/Cpp/Concurrency/AsyncDispatcher.h \
-    ../Common/Cpp/Concurrency/FireForgetDispatcher.h \
-    ../Common/Cpp/Concurrency/ParallelTaskRunner.h \
-    ../Common/Cpp/Concurrency/PeriodicScheduler.h \
-    ../Common/Cpp/Concurrency/ScheduledTaskRunner.h \
-    ../Common/Cpp/Concurrency/SpinLock.h \
-    ../Common/Cpp/Concurrency/SpinPause.h \
-    ../Common/Cpp/Concurrency/Watchdog.h \
-    ../Common/Cpp/Containers/AlignedMalloc.h \
-    ../Common/Cpp/Containers/AlignedVector.h \
-    ../Common/Cpp/Containers/AlignedVector.tpp \
-    ../Common/Cpp/Containers/BoxSet.h \
-    ../Common/Cpp/Containers/DllSafeString.h \
-    ../Common/Cpp/Containers/FixedLimitVector.h \
-    ../Common/Cpp/Containers/FixedLimitVector.tpp \
-    ../Common/Cpp/Containers/Pimpl.h \
-    ../Common/Cpp/Containers/Pimpl.tpp \
-    ../Common/Cpp/CpuId/CpuId.h \
-    ../Common/Cpp/CpuId/CpuId_arm64.h \
-    ../Common/Cpp/CpuId/CpuId_arm64.tpp \
-    ../Common/Cpp/CpuId/CpuId_x86.h \
-    ../Common/Cpp/CpuId/CpuId_x86.tpp \
-    ../Common/Cpp/EnumDatabase.h \
-    ../Common/Cpp/EventRateTracker.h \
-    ../Common/Cpp/Exceptions.h \
-    ../Common/Cpp/ImageResolution.h \
-    ../Common/Cpp/Json/JsonArray.h \
-    ../Common/Cpp/Json/JsonObject.h \
-    ../Common/Cpp/Json/JsonTools.h \
-    ../Common/Cpp/Json/JsonValue.h \
-    ../Common/Cpp/LifetimeSanitizer.h \
-    ../Common/Cpp/Options/BatchOption.h \
-    ../Common/Cpp/Options/BooleanCheckBoxOption.h \
-    ../Common/Cpp/Options/ConfigOption.h \
-    ../Common/Cpp/Options/DateOption.h \
-    ../Common/Cpp/Options/EditableTableOption.h \
-    ../Common/Cpp/Options/EnumDropdownOption.h \
-    ../Common/Cpp/Options/FixedCodeOption.h \
-    ../Common/Cpp/Options/FloatingPointOption.h \
-    ../Common/Cpp/Options/GroupOption.h \
-    ../Common/Cpp/Options/RandomCodeOption.h \
-    ../Common/Cpp/Options/SimpleIntegerOption.h \
-    ../Common/Cpp/Options/StaticTableOption.h \
-    ../Common/Cpp/Options/StaticTextOption.h \
-    ../Common/Cpp/Options/StringOption.h \
-    ../Common/Cpp/Options/TextEditOption.h \
-    ../Common/Cpp/Options/TimeExpressionOption.h \
-    ../Common/Cpp/PanicDump.h \
-    ../Common/Cpp/PrettyPrint.h \
-    ../Common/Cpp/PrintDebuggers.h \
-    ../Common/Cpp/Rectangle.h \
-    ../Common/Cpp/SIMDDebuggers.h \
-    ../Common/Cpp/StreamConverters.h \
-    ../Common/Cpp/StringTools.h \
-    ../Common/Cpp/Time.h \
-    ../Common/Cpp/Unicode.h \
-    ../Common/Cpp/ValueDebouncer.h \
-    ../Common/Microcontroller/DeviceRoutines.h \
-    ../Common/Microcontroller/MessageProtocol.h \
-    ../Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h \
-    ../Common/NintendoSwitch/NintendoSwitch_Protocol_DigitEntry.h \
-    ../Common/NintendoSwitch/NintendoSwitch_Protocol_PushButtons.h \
-    ../Common/NintendoSwitch/NintendoSwitch_Protocol_Routines.h \
-    ../Common/NintendoSwitch/NintendoSwitch_Protocol_ScalarButtons.h \
-    ../Common/NintendoSwitch/NintendoSwitch_SlotDatabase.h \
-    ../Common/PokemonSwSh/PokemonProgramIDs.h \
-    ../Common/PokemonSwSh/PokemonSwSh_FossilTable.h \
-    ../Common/PokemonSwSh/PokemonSwSh_MultiHostTable.h \
-    ../Common/PokemonSwSh/PokemonSwSh_Protocol_AutoHosts.h \
-    ../Common/PokemonSwSh/PokemonSwSh_Protocol_DateSpam.h \
-    ../Common/PokemonSwSh/PokemonSwSh_Protocol_DaySkippers.h \
-    ../Common/PokemonSwSh/PokemonSwSh_Protocol_EggRoutines.h \
-    ../Common/PokemonSwSh/PokemonSwSh_Protocol_GameEntry.h \
-    ../Common/PokemonSwSh/PokemonSwSh_Protocol_Misc.h \
-    ../Common/Qt/AutoHeightTable.h \
-    ../Common/Qt/AutoWidthLineEdit.h \
-    ../Common/Qt/CodeValidator.h \
-    ../Common/Qt/CollapsibleGroupBox.h \
-    ../Common/Qt/ExpressionEvaluator.h \
-    ../Common/Qt/NoWheelComboBox.h \
-    ../Common/Qt/Options/BatchWidget.h \
-    ../Common/Qt/Options/BooleanCheckBoxWidget.h \
-    ../Common/Qt/Options/ConfigWidget.h \
-    ../Common/Qt/Options/DateWidget.h \
-    ../Common/Qt/Options/EditableTableWidget.h \
-    ../Common/Qt/Options/EnumDropdownWidget.h \
-    ../Common/Qt/Options/FixedCodeWidget.h \
-    ../Common/Qt/Options/FloatingPointWidget.h \
-    ../Common/Qt/Options/GroupWidget.h \
-    ../Common/Qt/Options/RandomCodeWidget.h \
-    ../Common/Qt/Options/SimpleIntegerWidget.h \
-    ../Common/Qt/Options/StaticTableWidget.h \
-    ../Common/Qt/Options/StaticTextWidget.h \
-    ../Common/Qt/Options/StringWidget.h \
-    ../Common/Qt/Options/TextEditWidget.h \
-    ../Common/Qt/Options/TimeExpressionWidget.h \
-    ../Common/Qt/Redispatch.h \
-    ../Common/Qt/StringToolsQt.h \
-    ../Common/Qt/TimeQt.h \
-    ../Common/Qt/WidgetStackFixedAspectRatio.h \
-    ../SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_DialogTriangleDetector.h \
-    Source/CommonFramework/AudioPipeline/AudioConstants.h \
-    Source/CommonFramework/AudioPipeline/AudioFeed.h \
-    Source/CommonFramework/AudioPipeline/AudioInfo.h \
-    Source/CommonFramework/AudioPipeline/AudioOption.h \
-    Source/CommonFramework/AudioPipeline/AudioPassthroughPair.h \
-    Source/CommonFramework/AudioPipeline/AudioSession.h \
-    Source/CommonFramework/AudioPipeline/AudioStream.h \
-    Source/CommonFramework/AudioPipeline/AudioTemplate.h \
-    Source/CommonFramework/AudioPipeline/Backends/AudioPassthroughPairQt.h \
-    Source/CommonFramework/AudioPipeline/Backends/AudioPassthroughPairQtThread.h \
-    Source/CommonFramework/AudioPipeline/IO/AudioFileLoader.h \
-    Source/CommonFramework/AudioPipeline/IO/AudioSink.h \
-    Source/CommonFramework/AudioPipeline/IO/AudioSource.h \
-    Source/CommonFramework/AudioPipeline/Spectrum/AudioSpectrumHolder.h \
-    Source/CommonFramework/AudioPipeline/Spectrum/FFTStreamer.h \
-    Source/CommonFramework/AudioPipeline/Spectrum/Spectrograph.h \
-    Source/CommonFramework/AudioPipeline/Tools/AudioFormatUtils.h \
-    Source/CommonFramework/AudioPipeline/Tools/AudioNormalization.h \
-    Source/CommonFramework/AudioPipeline/Tools/TimeSampleBuffer.h \
-    Source/CommonFramework/AudioPipeline/Tools/TimeSampleBufferReader.h \
-    Source/CommonFramework/AudioPipeline/Tools/TimeSampleWriter.h \
-    Source/CommonFramework/AudioPipeline/UI/AudioDisplayWidget.h \
-    Source/CommonFramework/AudioPipeline/UI/AudioSelectorWidget.h \
-    Source/CommonFramework/ControllerDevices/SerialPortGlobals.h \
-    Source/CommonFramework/ControllerDevices/SerialPortOption.h \
-    Source/CommonFramework/ControllerDevices/SerialPortSession.h \
-    Source/CommonFramework/ControllerDevices/SerialPortWidget.h \
-    Source/CommonFramework/CrashDump.h \
-    Source/CommonFramework/Environment/Environment.h \
-    Source/CommonFramework/Environment/Environment_Linux.h \
-    Source/CommonFramework/Environment/Environment_Linux.tpp \
-    Source/CommonFramework/Environment/Environment_Windows.h \
-    Source/CommonFramework/Environment/Environment_Windows.tpp \
-    Source/CommonFramework/Environment/Environment_arm64_Linux.tpp \
-    Source/CommonFramework/Environment/Environment_x86.tpp \
-    Source/CommonFramework/Environment/Environment_x86_Linux.tpp \
-    Source/CommonFramework/Environment/Environment_x86_Windows.tpp \
-    Source/CommonFramework/Environment/HardwareValidation.h \
-    Source/CommonFramework/Environment/HardwareValidation_arm64.tpp \
-    Source/CommonFramework/Environment/HardwareValidation_x86.tpp \
-    Source/CommonFramework/Exceptions/FatalProgramException.h \
-    Source/CommonFramework/Exceptions/OperationFailedException.h \
-    Source/CommonFramework/Exceptions/ProgramFinishedException.h \
-    Source/CommonFramework/Exceptions/ScreenshotException.h \
-    Source/CommonFramework/GlobalServices.h \
-    Source/CommonFramework/GlobalSettingsPanel.h \
-    Source/CommonFramework/Globals.h \
-    Source/CommonFramework/ImageMatch/CroppedImageDictionaryMatcher.h \
-    Source/CommonFramework/ImageMatch/ExactImageDictionaryMatcher.h \
-    Source/CommonFramework/ImageMatch/ExactImageMatcher.h \
-    Source/CommonFramework/ImageMatch/FilterToAlpha.h \
-    Source/CommonFramework/ImageMatch/ImageCropper.h \
-    Source/CommonFramework/ImageMatch/ImageDiff.h \
-    Source/CommonFramework/ImageMatch/ImageMatchOption.h \
-    Source/CommonFramework/ImageMatch/ImageMatchResult.h \
-    Source/CommonFramework/ImageMatch/SilhouetteDictionaryMatcher.h \
-    Source/CommonFramework/ImageMatch/SubObjectTemplateMatcher.h \
-    Source/CommonFramework/ImageMatch/WaterfillTemplateMatcher.h \
-    Source/CommonFramework/ImageTools/BinaryImage_FilterRgb32.h \
-    Source/CommonFramework/ImageTools/ColorClustering.h \
-    Source/CommonFramework/ImageTools/DistanceToLine.h \
-    Source/CommonFramework/ImageTools/FloatPixel.h \
-    Source/CommonFramework/ImageTools/ImageBoxes.h \
-    Source/CommonFramework/ImageTools/ImageFilter.h \
-    Source/CommonFramework/ImageTools/ImageGradient.h \
-    Source/CommonFramework/ImageTools/ImageManip.h \
-    Source/CommonFramework/ImageTools/ImageStats.h \
-    Source/CommonFramework/ImageTools/SolidColorTest.h \
-    Source/CommonFramework/ImageTools/WaterfillUtilities.h \
-    Source/CommonFramework/ImageTypes/BinaryImage.h \
-    Source/CommonFramework/ImageTypes/ImageHSV32.h \
-    Source/CommonFramework/ImageTypes/ImageRGB32.h \
-    Source/CommonFramework/ImageTypes/ImageViewHSV32.h \
-    Source/CommonFramework/ImageTypes/ImageViewPlanar32.h \
-    Source/CommonFramework/ImageTypes/ImageViewRGB32.h \
-    Source/CommonFramework/Inference/AnomalyDetector.h \
-    Source/CommonFramework/Inference/AudioPerSpectrumDetectorBase.h \
-    Source/CommonFramework/Inference/AudioTemplateCache.h \
-    Source/CommonFramework/Inference/BlackBorderDetector.h \
-    Source/CommonFramework/Inference/BlackScreenDetector.h \
-    Source/CommonFramework/Inference/DetectionDebouncer.h \
-    Source/CommonFramework/Inference/FrozenImageDetector.h \
-    Source/CommonFramework/Inference/ImageMatchDetector.h \
-    Source/CommonFramework/Inference/ImageTools.h \
-    Source/CommonFramework/Inference/InferenceThrottler.h \
-    Source/CommonFramework/Inference/SpectrogramMatcher.h \
-    Source/CommonFramework/Inference/StatAccumulator.h \
-    Source/CommonFramework/Inference/TimeWindowStatTracker.h \
-    Source/CommonFramework/Inference/VisualDetector.h \
-    Source/CommonFramework/InferenceInfra/AudioInferenceCallback.h \
-    Source/CommonFramework/InferenceInfra/AudioInferencePivot.h \
-    Source/CommonFramework/InferenceInfra/InferenceCallback.h \
-    Source/CommonFramework/InferenceInfra/InferenceRoutines.h \
-    Source/CommonFramework/InferenceInfra/InferenceSession.h \
-    Source/CommonFramework/InferenceInfra/VisualInferenceCallback.h \
-    Source/CommonFramework/InferenceInfra/VisualInferencePivot.h \
-    Source/CommonFramework/Language.h \
-    Source/CommonFramework/Logging/FileWindowLogger.h \
-    Source/CommonFramework/Logging/Logger.h \
-    Source/CommonFramework/Logging/OutputRedirector.h \
-    Source/CommonFramework/Logging/QueuedLogger.h \
-    Source/CommonFramework/NewVersionCheck.h \
-    Source/CommonFramework/Notifications/EventNotificationOption.h \
-    Source/CommonFramework/Notifications/EventNotificationsTable.h \
-    Source/CommonFramework/Notifications/MessageAttachment.h \
-    Source/CommonFramework/Notifications/ProgramInfo.h \
-    Source/CommonFramework/Notifications/ProgramNotifications.h \
-    Source/CommonFramework/Notifications/SenderNotificationTable.h \
-    Source/CommonFramework/OCR/OCR_DictionaryMatcher.h \
-    Source/CommonFramework/OCR/OCR_DictionaryOCR.h \
-    Source/CommonFramework/OCR/OCR_LargeDictionaryMatcher.h \
-    Source/CommonFramework/OCR/OCR_NumberReader.h \
-    Source/CommonFramework/OCR/OCR_RawOCR.h \
-    Source/CommonFramework/OCR/OCR_Routines.h \
-    Source/CommonFramework/OCR/OCR_SmallDictionaryMatcher.h \
-    Source/CommonFramework/OCR/OCR_StringMatchResult.h \
-    Source/CommonFramework/OCR/OCR_StringNormalization.h \
-    Source/CommonFramework/OCR/OCR_TextMatcher.h \
-    Source/CommonFramework/OCR/OCR_TrainingTools.h \
-    Source/CommonFramework/Options/Environment/ProcessPriorityOption.h \
-    Source/CommonFramework/Options/Environment/ProcessorLevelOption.h \
-    Source/CommonFramework/Options/LabelCellOption.h \
-    Source/CommonFramework/Options/LanguageOCROption.h \
-    Source/CommonFramework/Options/ScreenWatchOption.h \
-    Source/CommonFramework/Options/ScreenshotFormatOption.h \
-    Source/CommonFramework/Options/StringSelectOption.h \
-    Source/CommonFramework/Options/UI/LabelCellWidget.h \
-    Source/CommonFramework/Options/UI/LanguageOCRWidget.h \
-    Source/CommonFramework/Options/UI/ScreenWatchWidget.h \
-    Source/CommonFramework/Options/UI/StringSelectWidget.h \
-    Source/CommonFramework/Panels/PanelDescriptor.h \
-    Source/CommonFramework/Panels/PanelInstance.h \
-    Source/CommonFramework/Panels/PanelList.h \
-    Source/CommonFramework/Panels/PanelTools.h \
-    Source/CommonFramework/Panels/ProgramDescriptor.h \
-    Source/CommonFramework/Panels/SettingsPanel.h \
-    Source/CommonFramework/Panels/UI/PanelElements.h \
-    Source/CommonFramework/Panels/UI/PanelListWidget.h \
-    Source/CommonFramework/Panels/UI/PanelWidget.h \
-    Source/CommonFramework/Panels/UI/SettingsPanelWidget.h \
-    Source/CommonFramework/PersistentSettings.h \
-    Source/CommonFramework/ProgramSession.h \
-    Source/CommonFramework/Resources/SpriteDatabase.h \
-    Source/CommonFramework/SetupSettings.h \
-    Source/CommonFramework/Tools/BlackBorderCheck.h \
-    Source/CommonFramework/Tools/BotBaseHandle.h \
-    Source/CommonFramework/Tools/ConsoleHandle.h \
-    Source/CommonFramework/Tools/DebugDumper.h \
-    Source/CommonFramework/Tools/ErrorDumper.h \
-    Source/CommonFramework/Tools/FileDownloader.h \
-    Source/CommonFramework/Tools/InterruptableCommands.h \
-    Source/CommonFramework/Tools/MultiConsoleErrors.h \
-    Source/CommonFramework/Tools/ProgramEnvironment.h \
-    Source/CommonFramework/Tools/StatsDatabase.h \
-    Source/CommonFramework/Tools/StatsTracking.h \
-    Source/CommonFramework/Tools/SuperControlSession.h \
-    Source/CommonFramework/Tools/VideoResolutionCheck.h \
-    Source/CommonFramework/VideoPipeline/Backends/CameraImplementations.h \
-    Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt5.h \
-    Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt6.h \
-    Source/CommonFramework/VideoPipeline/Backends/VideoToolsQt5.h \
-    Source/CommonFramework/VideoPipeline/CameraInfo.h \
-    Source/CommonFramework/VideoPipeline/CameraOption.h \
-    Source/CommonFramework/VideoPipeline/CameraSession.h \
-    Source/CommonFramework/VideoPipeline/Stats/CpuUtilizationStats.h \
-    Source/CommonFramework/VideoPipeline/Stats/ThreadUtilizationStats.h \
-    Source/CommonFramework/VideoPipeline/UI/CameraSelectorWidget.h \
-    Source/CommonFramework/VideoPipeline/UI/VideoDisplayWidget.h \
-    Source/CommonFramework/VideoPipeline/UI/VideoDisplayWindow.h \
-    Source/CommonFramework/VideoPipeline/UI/VideoOverlayWidget.h \
-    Source/CommonFramework/VideoPipeline/UI/VideoWidget.h \
-    Source/CommonFramework/VideoPipeline/VideoFeed.h \
-    Source/CommonFramework/VideoPipeline/VideoOverlay.h \
-    Source/CommonFramework/VideoPipeline/VideoOverlayOption.h \
-    Source/CommonFramework/VideoPipeline/VideoOverlayScopes.h \
-    Source/CommonFramework/VideoPipeline/VideoOverlaySession.h \
-    Source/CommonFramework/VideoPipeline/VideoOverlayTypes.h \
-    Source/CommonFramework/Windows/ButtonDiagram.h \
-    Source/CommonFramework/Windows/DpiScaler.h \
-    Source/CommonFramework/Windows/MainWindow.h \
-    Source/CommonFramework/Windows/WindowTracker.h \
-    Source/ComputerPrograms/ComputerProgram.h \
-    Source/ComputerPrograms/Framework/ComputerProgramOption.h \
-    Source/ComputerPrograms/Framework/ComputerProgramSession.h \
-    Source/ComputerPrograms/Framework/ComputerProgramWidget.h \
-    Source/Integrations/DiscordIntegrationSettings.h \
-    Source/Integrations/DiscordIntegrationTable.h \
-    Source/Integrations/DiscordSettingsOption.h \
-    Source/Integrations/DiscordWebhook.h \
-    Source/Integrations/DiscordWebhookSettings.h \
-    Source/Integrations/DppIntegration/DppClient.h \
-    Source/Integrations/DppIntegration/DppCommandHandler.h \
-    Source/Integrations/DppIntegration/DppUtility.h \
-    Source/Integrations/IntegrationsAPI.h \
-    Source/Integrations/ProgramTracker.h \
-    Source/Integrations/ProgramTrackerInterfaces.h \
-    Source/Integrations/SleepyDiscordRunner.h \
-    Source/Kernels/AbsFFT/Kernels_AbsFFT.h \
-    Source/Kernels/AbsFFT/Kernels_AbsFFT_Arch.h \
-    Source/Kernels/AbsFFT/Kernels_AbsFFT_Arch_Default.h \
-    Source/Kernels/AbsFFT/Kernels_AbsFFT_Arch_x86_AVX2.h \
-    Source/Kernels/AbsFFT/Kernels_AbsFFT_Arch_x86_SSE41.h \
-    Source/Kernels/AbsFFT/Kernels_AbsFFT_BaseTransform_x86_AVX2.h \
-    Source/Kernels/AbsFFT/Kernels_AbsFFT_BaseTransform_x86_SSE41.h \
-    Source/Kernels/AbsFFT/Kernels_AbsFFT_BitReverse.h \
-    Source/Kernels/AbsFFT/Kernels_AbsFFT_Butterflies.h \
-    Source/Kernels/AbsFFT/Kernels_AbsFFT_ComplexScalar.h \
-    Source/Kernels/AbsFFT/Kernels_AbsFFT_ComplexToAbs.h \
-    Source/Kernels/AbsFFT/Kernels_AbsFFT_ComplexVector.h \
-    Source/Kernels/AbsFFT/Kernels_AbsFFT_FullTransform.h \
-    Source/Kernels/AbsFFT/Kernels_AbsFFT_FullTransform.tpp \
-    Source/Kernels/AbsFFT/Kernels_AbsFFT_Reductions.h \
-    Source/Kernels/AbsFFT/Kernels_AbsFFT_TwiddleTable.h \
-    Source/Kernels/AbsFFT/Kernels_AbsFFT_TwiddleTable.tpp \
-    Source/Kernels/Algorithm/Kernels_Algorithm_DisjointSet.h \
-    Source/Kernels/AudioStreamConversion/AudioStreamConversion.h \
-    Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters.h \
-    Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters_Routines.h \
-    Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters_x64_AVX2.h \
-    Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters_x64_AVX512.h \
-    Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters_x64_SSE42.h \
-    Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix.h \
-    Source/Kernels/BinaryMatrix/Kernels_BinaryMatrixTile_64x16_x64_AVX2.h \
-    Source/Kernels/BinaryMatrix/Kernels_BinaryMatrixTile_64x32_x64_AVX512.h \
-    Source/Kernels/BinaryMatrix/Kernels_BinaryMatrixTile_64x4_Default.h \
-    Source/Kernels/BinaryMatrix/Kernels_BinaryMatrixTile_64x64_x64_AVX512.h \
-    Source/Kernels/BinaryMatrix/Kernels_BinaryMatrixTile_64x8_x64_SSE42.h \
-    Source/Kernels/BinaryMatrix/Kernels_BinaryMatrixTile_64xH_Default.h \
-    Source/Kernels/BinaryMatrix/Kernels_BinaryMatrixTile_Debugging.h \
-    Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Arch_64x16_x64_AVX2.h \
-    Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Arch_64x32_x64_AVX512.h \
-    Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Arch_64x64_x64_AVX512.h \
-    Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Arch_64x8_x64_SSE42.h \
-    Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Arch_64xH_Default.h \
-    Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_t.h \
-    Source/Kernels/BinaryMatrix/Kernels_PackedBinaryMatrixCore.h \
-    Source/Kernels/BinaryMatrix/Kernels_PackedBinaryMatrixCore.tpp \
-    Source/Kernels/BinaryMatrix/Kernels_SparseBinaryMatrixCore.h \
-    Source/Kernels/BinaryMatrix/Kernels_SparseBinaryMatrixCore.tpp \
-    Source/Kernels/ImageFilters/Kernels_ImageFilter_Basic.h \
-    Source/Kernels/ImageScaleBrightness/Kernels_ImageScaleBrightness.h \
-    Source/Kernels/ImageStats/Kernels_ImagePixelSumSqr.h \
-    Source/Kernels/ImageStats/Kernels_ImagePixelSumSqrDev.h \
-    Source/Kernels/Kernels_Alignment.h \
-    Source/Kernels/Kernels_BitScan.h \
-    Source/Kernels/Kernels_BitSet.h \
-    Source/Kernels/Kernels_x64_AVX2.h \
-    Source/Kernels/Kernels_x64_AVX512.h \
-    Source/Kernels/Kernels_x64_SSE41.h \
-    Source/Kernels/PartialWordAccess/Kernels_PartialWordAccess_x64_AVX2.h \
-    Source/Kernels/PartialWordAccess/Kernels_PartialWordAccess_x64_SSE41.h \
-    Source/Kernels/ScaleInvariantMatrixMatch/Kernels_ScaleInvariantMatrixMatch.h \
-    Source/Kernels/ScaleInvariantMatrixMatch/Kernels_ScaleInvariantMatrixMatch_Routines.h \
-    Source/Kernels/SpikeConvolution/Kernels_SpikeConvolution.h \
-    Source/Kernels/SpikeConvolution/Kernels_SpikeConvolution_Routines.h \
-    Source/Kernels/Waterfill/Kernels_Waterfill.h \
-    Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x16_x64_AVX2.h \
-    Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x32_x64_AVX512-GF.h \
-    Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x32_x64_AVX512.h \
-    Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x4_Default.h \
-    Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x64_x64_AVX512-GF.h \
-    Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x64_x64_AVX512.h \
-    Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x8_x64_SSE42.h \
-    Source/Kernels/Waterfill/Kernels_Waterfill_Core_64xH_Default.h \
-    Source/Kernels/Waterfill/Kernels_Waterfill_Intrinsics_x64_AVX512-GF.h \
-    Source/Kernels/Waterfill/Kernels_Waterfill_Intrinsics_x64_AVX512.h \
-    Source/Kernels/Waterfill/Kernels_Waterfill_Routines.h \
-    Source/Kernels/Waterfill/Kernels_Waterfill_Session.h \
-    Source/Kernels/Waterfill/Kernels_Waterfill_Session.tpp \
-    Source/Kernels/Waterfill/Kernels_Waterfill_Types.h \
-    Source/NintendoSwitch/Commands/NintendoSwitch_Commands_Device.h \
-    Source/NintendoSwitch/Commands/NintendoSwitch_Commands_DigitEntry.h \
-    Source/NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h \
-    Source/NintendoSwitch/Commands/NintendoSwitch_Commands_Routines.h \
-    Source/NintendoSwitch/Commands/NintendoSwitch_Commands_ScalarButtons.h \
-    Source/NintendoSwitch/Commands/NintendoSwitch_Messages_Device.h \
-    Source/NintendoSwitch/Commands/NintendoSwitch_Messages_DigitEntry.h \
-    Source/NintendoSwitch/Commands/NintendoSwitch_Messages_PushButtons.h \
-    Source/NintendoSwitch/Commands/NintendoSwitch_Messages_Routines.h \
-    Source/NintendoSwitch/Commands/NintendoSwitch_Messages_ScalarButtons.h \
-    Source/NintendoSwitch/DevPrograms/BoxDraw.h \
-    Source/NintendoSwitch/DevPrograms/TestProgramComputer.h \
-    Source/NintendoSwitch/DevPrograms/TestProgramSwitch.h \
-    Source/NintendoSwitch/FixedInterval.h \
-    Source/NintendoSwitch/Framework/NintendoSwitch_MultiSwitchProgramOption.h \
-    Source/NintendoSwitch/Framework/NintendoSwitch_MultiSwitchProgramSession.h \
-    Source/NintendoSwitch/Framework/NintendoSwitch_MultiSwitchSystemOption.h \
-    Source/NintendoSwitch/Framework/NintendoSwitch_MultiSwitchSystemSession.h \
-    Source/NintendoSwitch/Framework/NintendoSwitch_SingleSwitchProgramOption.h \
-    Source/NintendoSwitch/Framework/NintendoSwitch_SingleSwitchProgramSession.h \
-    Source/NintendoSwitch/Framework/NintendoSwitch_SwitchSystemOption.h \
-    Source/NintendoSwitch/Framework/NintendoSwitch_SwitchSystemSession.h \
-    Source/NintendoSwitch/Framework/NintendoSwitch_VirtualController.h \
-    Source/NintendoSwitch/Framework/NintendoSwitch_VirtualControllerMapping.h \
-    Source/NintendoSwitch/Framework/NintendoSwitch_VirtualControllerState.h \
-    Source/NintendoSwitch/Framework/UI/NintendoSwitch_CommandRow.h \
-    Source/NintendoSwitch/Framework/UI/NintendoSwitch_MultiSwitchProgramWidget.h \
-    Source/NintendoSwitch/Framework/UI/NintendoSwitch_MultiSwitchSystemWidget.h \
-    Source/NintendoSwitch/Framework/UI/NintendoSwitch_SingleSwitchProgramWidget.h \
-    Source/NintendoSwitch/Framework/UI/NintendoSwitch_SwitchSystemWidget.h \
-    Source/NintendoSwitch/Inference/NintendoSwitch_DateReader.h \
-    Source/NintendoSwitch/Inference/NintendoSwitch_DetectHome.h \
-    Source/NintendoSwitch/NintendoSwitch_MultiSwitchProgram.h \
-    Source/NintendoSwitch/NintendoSwitch_Panels.h \
-    Source/NintendoSwitch/NintendoSwitch_Settings.h \
-    Source/NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h \
-    Source/NintendoSwitch/Options/NintendoSwitch_FriendCodeListOption.h \
-    Source/NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h \
-    Source/NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h \
-    Source/NintendoSwitch/Options/TurboMacroTable.h \
-    Source/NintendoSwitch/Options/UI/NintendoSwitch_FriendCodeListWidget.h \
-    Source/NintendoSwitch/Programs/NintendoSwitch_FastCodeEntry.h \
-    Source/NintendoSwitch/Programs/NintendoSwitch_FriendCodeAdder.h \
-    Source/NintendoSwitch/Programs/NintendoSwitch_FriendDelete.h \
-    Source/NintendoSwitch/Programs/NintendoSwitch_GameEntry.h \
-    Source/NintendoSwitch/Programs/NintendoSwitch_PreventSleep.h \
-    Source/NintendoSwitch/Programs/NintendoSwitch_PushJoySticks.h \
-    Source/NintendoSwitch/Programs/NintendoSwitch_SnapshotDumper.h \
-    Source/NintendoSwitch/Programs/NintendoSwitch_SwitchViewer.h \
-    Source/NintendoSwitch/Programs/NintendoSwitch_TurboA.h \
-    Source/NintendoSwitch/Programs/NintendoSwitch_TurboButton.h \
-    Source/NintendoSwitch/Programs/NintendoSwitch_TurboMacro.h \
-    Source/NintendoSwitch/Programs/NintendoSwitch_VirtualConsole.h \
-    Source/PanelLists.h \
-    Source/Pokemon/Inference/Pokemon_BerryNameReader.h \
-    Source/Pokemon/Inference/Pokemon_BoxGenderDetector.h \
-    Source/Pokemon/Inference/Pokemon_IVCheckerReader.h \
-    Source/Pokemon/Inference/Pokemon_NameReader.h \
-    Source/Pokemon/Inference/Pokemon_NatureReader.h \
-    Source/Pokemon/Inference/Pokemon_PokeballNameReader.h \
-    Source/Pokemon/Inference/Pokemon_ReadHpBar.h \
-    Source/Pokemon/Inference/Pokemon_TrainIVCheckerOCR.h \
-    Source/Pokemon/Inference/Pokemon_TrainPokemonOCR.h \
-    Source/Pokemon/Options/Pokemon_EggHatchFilter.h \
-    Source/Pokemon/Options/Pokemon_EncounterBotOptions.h \
-    Source/Pokemon/Options/Pokemon_IVCheckerOption.h \
-    Source/Pokemon/Options/Pokemon_NameSelectOption.h \
-    Source/Pokemon/Options/Pokemon_NameSelectWidget.h \
-    Source/Pokemon/Options/Pokemon_StatsResetFilter.h \
-    Source/Pokemon/Pokemon_DataTypes.h \
-    Source/Pokemon/Pokemon_EncounterStats.h \
-    Source/Pokemon/Pokemon_IVChecker.h \
-    Source/Pokemon/Pokemon_NatureChecker.h \
-    Source/Pokemon/Pokemon_Notification.h \
-    Source/Pokemon/Pokemon_ShinySparkleSet.h \
-    Source/Pokemon/Pokemon_Strings.h \
-    Source/Pokemon/Pokemon_Types.h \
-    Source/Pokemon/Resources/Pokemon_BerryNames.h \
-    Source/Pokemon/Resources/Pokemon_BerrySprites.h \
-    Source/Pokemon/Resources/Pokemon_PokeballNames.h \
-    Source/Pokemon/Resources/Pokemon_PokemonNames.h \
-    Source/Pokemon/Resources/Pokemon_PokemonSlugs.h \
-    Source/PokemonBDSP/Inference/Battles/PokemonBDSP_BattleBallReader.h \
-    Source/PokemonBDSP/Inference/Battles/PokemonBDSP_BattleMenuDetector.h \
-    Source/PokemonBDSP/Inference/Battles/PokemonBDSP_EndBattleDetector.h \
-    Source/PokemonBDSP/Inference/Battles/PokemonBDSP_ExperienceGainDetector.h \
-    Source/PokemonBDSP/Inference/Battles/PokemonBDSP_StartBattleDetector.h \
-    Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxDetector.h \
-    Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxGenderDetector.h \
-    Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxNatureDetector.h \
-    Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxShinyDetector.h \
-    Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_IVCheckerReader.h \
-    Source/PokemonBDSP/Inference/PokemonBDSP_DialogDetector.h \
-    Source/PokemonBDSP/Inference/PokemonBDSP_MapDetector.h \
-    Source/PokemonBDSP/Inference/PokemonBDSP_MarkFinder.h \
-    Source/PokemonBDSP/Inference/PokemonBDSP_MenuDetector.h \
-    Source/PokemonBDSP/Inference/PokemonBDSP_PokeballSpriteMatcher.h \
-    Source/PokemonBDSP/Inference/PokemonBDSP_ReceivePokemonDetector.h \
-    Source/PokemonBDSP/Inference/PokemonBDSP_SelectionArrow.h \
-    Source/PokemonBDSP/Inference/PokemonBDSP_VSSeekerReaction.h \
-    Source/PokemonBDSP/Inference/ShinyDetection/PokemonBDSP_ShinyEncounterDetector.h \
-    Source/PokemonBDSP/Inference/ShinyDetection/PokemonBDSP_ShinySparkleSet.h \
-    Source/PokemonBDSP/Inference/Sounds/PokemonBDSP_ShinySoundDetector.h \
-    Source/PokemonBDSP/Options/EncounterFilter/PokemonBDSP_EncounterFilterEnums.h \
-    Source/PokemonBDSP/Options/EncounterFilter/PokemonBDSP_EncounterFilterOption.h \
-    Source/PokemonBDSP/Options/EncounterFilter/PokemonBDSP_EncounterFilterOverride.h \
-    Source/PokemonBDSP/Options/EncounterFilter/PokemonBDSP_EncounterFilterWidget.h \
-    Source/PokemonBDSP/Options/PokemonBDSP_BerrySelectOption.h \
-    Source/PokemonBDSP/Options/PokemonBDSP_BerryTable.h \
-    Source/PokemonBDSP/Options/PokemonBDSP_EncounterBotCommon.h \
-    Source/PokemonBDSP/Options/PokemonBDSP_LearnMove.h \
-    Source/PokemonBDSP/Options/PokemonBDSP_ShortcutDirection.h \
-    Source/PokemonBDSP/PokemonBDSP_Panels.h \
-    Source/PokemonBDSP/PokemonBDSP_Settings.h \
-    Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggAutonomous.h \
-    Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggAutonomousState.h \
-    Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggFeedback.h \
-    Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggFetcher.h \
-    Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggHatcher.h \
-    Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggRoutines.h \
-    Source/PokemonBDSP/Programs/Farming/PokemonBDSP_AmitySquarePickUpFarmer.h \
-    Source/PokemonBDSP/Programs/Farming/PokemonBDSP_DoublesLeveling.h \
-    Source/PokemonBDSP/Programs/Farming/PokemonBDSP_GiftBerryReset.h \
-    Source/PokemonBDSP/Programs/Farming/PokemonBDSP_MoneyFarmerRoute210.h \
-    Source/PokemonBDSP/Programs/Farming/PokemonBDSP_MoneyFarmerRoute212.h \
-    Source/PokemonBDSP/Programs/General/PokemonBDSP_AutonomousBallThrower.h \
-    Source/PokemonBDSP/Programs/General/PokemonBDSP_MassRelease.h \
-    Source/PokemonBDSP/Programs/Glitches/PokemonBDSP_ActivateMenuGlitch-1.1.2.h \
-    Source/PokemonBDSP/Programs/Glitches/PokemonBDSP_ActivateMenuGlitch-1.1.3.h \
-    Source/PokemonBDSP/Programs/Glitches/PokemonBDSP_CloneItemsBoxCopy2.h \
-    Source/PokemonBDSP/Programs/PokemonBDSP_BasicCatcher.h \
-    Source/PokemonBDSP/Programs/PokemonBDSP_BoxRelease.h \
-    Source/PokemonBDSP/Programs/PokemonBDSP_EncounterDetection.h \
-    Source/PokemonBDSP/Programs/PokemonBDSP_EncounterHandler.h \
-    Source/PokemonBDSP/Programs/PokemonBDSP_GameEntry.h \
-    Source/PokemonBDSP/Programs/PokemonBDSP_GameNavigation.h \
-    Source/PokemonBDSP/Programs/PokemonBDSP_GlobalRoomHeal.h \
-    Source/PokemonBDSP/Programs/PokemonBDSP_OverworldTrigger.h \
-    Source/PokemonBDSP/Programs/PokemonBDSP_RunFromBattle.h \
-    Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_LegendaryReset.h \
-    Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_ShinyHunt-Fishing.h \
-    Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_ShinyHunt-Overworld.h \
-    Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_ShinyHunt-Shaymin.h \
-    Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_StarterReset.h \
-    Source/PokemonBDSP/Programs/TestPrograms/PokemonBDSP_ShinyEncounterTester.h \
-    Source/PokemonBDSP/Programs/TestPrograms/PokemonBDSP_SoundListener.h \
-    Source/PokemonBDSP/Programs/Trading/PokemonBDSP_SelfBoxTrade.h \
-    Source/PokemonBDSP/Programs/Trading/PokemonBDSP_SelfTouchTrade.h \
-    Source/PokemonBDSP/Programs/Trading/PokemonBDSP_TradeRoutines.h \
-    Source/PokemonBDSP/Resources/PokemonBDSP_NameDatabase.h \
-    Source/PokemonHome/Inference/PokemonHome_BallReader.h \
-    Source/PokemonHome/Inference/PokemonHome_BoxGenderDetector.h \
-    Source/PokemonHome/Options/PokemonHome_BoxSortingTable.h \
-    Source/PokemonHome/PokemonHome_Panels.h \
-    Source/PokemonHome/PokemonHome_Settings.h \
-    Source/PokemonHome/Programs/PokemonHome_BoxSorting.h \
-    Source/PokemonHome/Programs/PokemonHome_GenerateNameOCR.h \
-    Source/PokemonHome/Programs/PokemonHome_PageSwap.h \
-    Source/PokemonLA/Inference/Battles/PokemonLA_BattleMenuDetector.h \
-    Source/PokemonLA/Inference/Battles/PokemonLA_BattleMoveSelectionDetector.h \
-    Source/PokemonLA/Inference/Battles/PokemonLA_BattlePokemonSwitchDetector.h \
-    Source/PokemonLA/Inference/Battles/PokemonLA_BattleSpriteWatcher.h \
-    Source/PokemonLA/Inference/Battles/PokemonLA_BattleStartDetector.h \
-    Source/PokemonLA/Inference/Battles/PokemonLA_TransparentDialogueDetector.h \
-    Source/PokemonLA/Inference/Map/PokemonLA_MMOSpriteStarSymbolDetector.h \
-    Source/PokemonLA/Inference/Map/PokemonLA_MapDetector.h \
-    Source/PokemonLA/Inference/Map/PokemonLA_MapMarkerLocator.h \
-    Source/PokemonLA/Inference/Map/PokemonLA_MapMissionTabReader.h \
-    Source/PokemonLA/Inference/Map/PokemonLA_MapWeatherAndTimeReader.h \
-    Source/PokemonLA/Inference/Map/PokemonLA_MapZoomLevelReader.h \
-    Source/PokemonLA/Inference/Map/PokemonLA_OutbreakReader.h \
-    Source/PokemonLA/Inference/Map/PokemonLA_PokemonMapSpriteReader.h \
-    Source/PokemonLA/Inference/Map/PokemonLA_SelectedRegionDetector.h \
-    Source/PokemonLA/Inference/Objects/PokemonLA_ArcDetector.h \
-    Source/PokemonLA/Inference/Objects/PokemonLA_ArcPhoneDetector.h \
-    Source/PokemonLA/Inference/Objects/PokemonLA_BattleSpriteArrowDetector.h \
-    Source/PokemonLA/Inference/Objects/PokemonLA_BubbleDetector.h \
-    Source/PokemonLA/Inference/Objects/PokemonLA_ButtonDetector.h \
-    Source/PokemonLA/Inference/Objects/PokemonLA_DialogueEllipseDetector.h \
-    Source/PokemonLA/Inference/Objects/PokemonLA_DialogueYellowArrowDetector.h \
-    Source/PokemonLA/Inference/Objects/PokemonLA_FlagDetector.h \
-    Source/PokemonLA/Inference/Objects/PokemonLA_FlagTracker.h \
-    Source/PokemonLA/Inference/Objects/PokemonLA_MMOQuestionMarkDetector.h \
-    Source/PokemonLA/Inference/Objects/PokemonLA_QuestMarkDetector.h \
-    Source/PokemonLA/Inference/Objects/PokemonLA_ShinySymbolDetector.h \
-    Source/PokemonLA/Inference/Objects/PokemonLA_WhiteObjectDetector.h \
-    Source/PokemonLA/Inference/PokemonLA_BerryTreeDetector.h \
-    Source/PokemonLA/Inference/PokemonLA_BlackOutDetector.h \
-    Source/PokemonLA/Inference/PokemonLA_CommonColorCheck.h \
-    Source/PokemonLA/Inference/PokemonLA_DialogDetector.h \
-    Source/PokemonLA/Inference/PokemonLA_ItemCompatibilityDetector.h \
-    Source/PokemonLA/Inference/PokemonLA_MountDetector.h \
-    Source/PokemonLA/Inference/PokemonLA_NotificationReader.h \
-    Source/PokemonLA/Inference/PokemonLA_OverworldDetector.h \
-    Source/PokemonLA/Inference/PokemonLA_StatusInfoScreenDetector.h \
-    Source/PokemonLA/Inference/PokemonLA_UnderAttackDetector.h \
-    Source/PokemonLA/Inference/PokemonLA_WildPokemonFocusDetector.h \
-    Source/PokemonLA/Inference/Sounds/PokemonLA_AlphaMusicDetector.h \
-    Source/PokemonLA/Inference/Sounds/PokemonLA_AlphaRoarDetector.h \
-    Source/PokemonLA/Inference/Sounds/PokemonLA_ItemDropSoundDetector.h \
-    Source/PokemonLA/Inference/Sounds/PokemonLA_ShinySoundDetector.h \
-    Source/PokemonLA/Options/PokemonLA_BattlePokemonActionTable.h \
-    Source/PokemonLA/Options/PokemonLA_CustomPathTable.h \
-    Source/PokemonLA/Options/PokemonLA_IngoOpponent.h \
-    Source/PokemonLA/Options/PokemonLA_MiscOptions.h \
-    Source/PokemonLA/Options/PokemonLA_ShinyDetectedAction.h \
-    Source/PokemonLA/Options/PokemonLA_TradeCountTable.h \
-    Source/PokemonLA/Options/PokemonLA_TravelLocation.h \
-    Source/PokemonLA/PokemonLA_Locations.h \
-    Source/PokemonLA/PokemonLA_Panels.h \
-    Source/PokemonLA/PokemonLA_Settings.h \
-    Source/PokemonLA/PokemonLA_TravelLocations.h \
-    Source/PokemonLA/PokemonLA_WeatherAndTime.h \
-    Source/PokemonLA/Programs/Farming/PokemonLA_IngoBattleGrinder.h \
-    Source/PokemonLA/Programs/Farming/PokemonLA_IngoMoveGrinder.h \
-    Source/PokemonLA/Programs/Farming/PokemonLA_LeapGrinder.h \
-    Source/PokemonLA/Programs/Farming/PokemonLA_MagikarpMoveGrinder.h \
-    Source/PokemonLA/Programs/Farming/PokemonLA_NuggetFarmerHighlands.h \
-    Source/PokemonLA/Programs/Farming/PokemonLA_TenacityCandyFarmer.h \
-    Source/PokemonLA/Programs/General/PokemonLA_ApplyGrits.h \
-    Source/PokemonLA/Programs/General/PokemonLA_BraviaryHeightGlitch.h \
-    Source/PokemonLA/Programs/General/PokemonLA_ClothingBuyer.h \
-    Source/PokemonLA/Programs/General/PokemonLA_DistortionWaiter.h \
-    Source/PokemonLA/Programs/General/PokemonLA_OutbreakFinder.h \
-    Source/PokemonLA/Programs/General/PokemonLA_PokedexTasksReader.h \
-    Source/PokemonLA/Programs/General/PokemonLA_RamanasIslandCombee.h \
-    Source/PokemonLA/Programs/General/PokemonLA_SkipToFullMoon.h \
-    Source/PokemonLA/Programs/PokemonLA_BattleRoutines.h \
-    Source/PokemonLA/Programs/PokemonLA_EscapeFromAttack.h \
-    Source/PokemonLA/Programs/PokemonLA_FlagNavigationAir.h \
-    Source/PokemonLA/Programs/PokemonLA_GameEntry.h \
-    Source/PokemonLA/Programs/PokemonLA_LeapPokemonActions.h \
-    Source/PokemonLA/Programs/PokemonLA_MountChange.h \
-    Source/PokemonLA/Programs/PokemonLA_RegionNavigation.h \
-    Source/PokemonLA/Programs/PokemonLA_TimeOfDayChange.h \
-    Source/PokemonLA/Programs/ShinyHunting/PokemonLA_AutoMultiSpawn.h \
-    Source/PokemonLA/Programs/ShinyHunting/PokemonLA_BurmyFinder.h \
-    Source/PokemonLA/Programs/ShinyHunting/PokemonLA_CrobatFinder.h \
-    Source/PokemonLA/Programs/ShinyHunting/PokemonLA_FroslassFinder.h \
-    Source/PokemonLA/Programs/ShinyHunting/PokemonLA_GalladeFinder.h \
-    Source/PokemonLA/Programs/ShinyHunting/PokemonLA_PostMMOSpawnReset.h \
-    Source/PokemonLA/Programs/ShinyHunting/PokemonLA_ShinyHunt-CustomPath.h \
-    Source/PokemonLA/Programs/ShinyHunting/PokemonLA_ShinyHunt-FlagPin.h \
-    Source/PokemonLA/Programs/ShinyHunting/PokemonLA_ShinyHunt-LakeTrio.h \
-    Source/PokemonLA/Programs/ShinyHunting/PokemonLA_UnownFinder.h \
-    Source/PokemonLA/Programs/TestPrograms/PokemonLA_FlagNavigationTest.h \
-    Source/PokemonLA/Programs/TestPrograms/PokemonLA_MountDetectionTest.h \
-    Source/PokemonLA/Programs/TestPrograms/PokemonLA_OverworldWatcher.h \
-    Source/PokemonLA/Programs/TestPrograms/PokemonLA_SoundListener.h \
-    Source/PokemonLA/Programs/Trading/PokemonLA_SelfBoxTrade.h \
-    Source/PokemonLA/Programs/Trading/PokemonLA_SelfTouchTrade.h \
-    Source/PokemonLA/Programs/Trading/PokemonLA_TradeRoutines.h \
-    Source/PokemonLA/Resources/PokemonLA_AvailablePokemon.h \
-    Source/PokemonLA/Resources/PokemonLA_NameDatabase.h \
-    Source/PokemonLA/Resources/PokemonLA_PokemonSprites.h \
-    Source/PokemonLA/Resources/PokemonLA_WeatherAndTimeIcons.h \
-    Source/PokemonSV/Inference/Battles/PokemonSV_BattleBallReader.h \
-    Source/PokemonSV/Inference/Battles/PokemonSV_EncounterWatcher.h \
-    Source/PokemonSV/Inference/Battles/PokemonSV_NormalBattleMenus.h \
-    Source/PokemonSV/Inference/Battles/PokemonSV_PostCatchDetector.h \
-    Source/PokemonSV/Inference/Battles/PokemonSV_ShinySoundDetector.h \
-    Source/PokemonSV/Inference/Battles/PokemonSV_TeraBattleMenus.h \
-    Source/PokemonSV/Inference/Boxes/PokemonSV_BoxDetection.h \
-    Source/PokemonSV/Inference/Boxes/PokemonSV_BoxEggDetector.h \
-    Source/PokemonSV/Inference/Boxes/PokemonSV_BoxGenderDetector.h \
-    Source/PokemonSV/Inference/Boxes/PokemonSV_BoxNatureDetector.h \
-    Source/PokemonSV/Inference/Boxes/PokemonSV_BoxShinyDetector.h \
-    Source/PokemonSV/Inference/Boxes/PokemonSV_IVCheckerReader.h \
-    Source/PokemonSV/Inference/Boxes/PokemonSV_StatsResetChecker.h \
-    Source/PokemonSV/Inference/Dialogs/PokemonSV_DialogArrowDetector.h \
-    Source/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h \
-    Source/PokemonSV/Inference/Dialogs/PokemonSV_GradientArrowDetector.h \
-    Source/PokemonSV/Inference/Overworld/PokemonSV_AreaZeroSkyDetector.h \
-    Source/PokemonSV/Inference/Overworld/PokemonSV_LetsGoHpReader.h \
-    Source/PokemonSV/Inference/Overworld/PokemonSV_LetsGoKillDetector.h \
-    Source/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h \
-    Source/PokemonSV/Inference/Picnics/PokemonSV_PicnicDetector.h \
-    Source/PokemonSV/Inference/Picnics/PokemonSV_SandwichHandDetector.h \
-    Source/PokemonSV/Inference/Picnics/PokemonSV_SandwichIngredientDetector.h \
-    Source/PokemonSV/Inference/Picnics/PokemonSV_SandwichRecipeDetector.h \
-    Source/PokemonSV/Inference/PokemonSV_AuctionItemNameReader.h \
-    Source/PokemonSV/Inference/PokemonSV_ESPEmotionDetector.h \
-    Source/PokemonSV/Inference/PokemonSV_MainMenuDetector.h \
-    Source/PokemonSV/Inference/PokemonSV_MapDetector.h \
-    Source/PokemonSV/Inference/PokemonSV_MoneyReader.h \
-    Source/PokemonSV/Inference/PokemonSV_PokePortalDetector.h \
-    Source/PokemonSV/Inference/PokemonSV_PokemonSummaryReader.h \
-    Source/PokemonSV/Inference/PokemonSV_SweatBubbleDetector.h \
-    Source/PokemonSV/Inference/PokemonSV_TournamentPrizeNameReader.h \
-    Source/PokemonSV/Inference/PokemonSV_WhiteButtonDetector.h \
-    Source/PokemonSV/Inference/PokemonSV_ZeroGateWarpPromptDetector.h \
-    Source/PokemonSV/Inference/Tera/PokemonSV_TeraCardDetector.h \
-    Source/PokemonSV/Inference/Tera/PokemonSV_TeraCodeReader.h \
-    Source/PokemonSV/Inference/Tera/PokemonSV_TeraRaidSearchDetector.h \
-    Source/PokemonSV/Inference/Tera/PokemonSV_TeraRewardsReader.h \
-    Source/PokemonSV/Inference/Tera/PokemonSV_TeraSilhouetteReader.h \
-    Source/PokemonSV/Inference/Tera/PokemonSV_TeraTypeReader.h \
-    Source/PokemonSV/Options/PokemonSV_AuctionItemSelectOption.h \
-    Source/PokemonSV/Options/PokemonSV_AuctionItemTable.h \
-    Source/PokemonSV/Options/PokemonSV_AutoHostOptions.h \
-    Source/PokemonSV/Options/PokemonSV_EggPowerSandwichOption.h \
-    Source/PokemonSV/Options/PokemonSV_EncounterActionsTable.h \
-    Source/PokemonSV/Options/PokemonSV_EncounterBotCommon.h \
-    Source/PokemonSV/Options/PokemonSV_PlayerList.h \
-    Source/PokemonSV/Options/PokemonSV_SandwichIngredientsOption.h \
-    Source/PokemonSV/Options/PokemonSV_SandwichIngredientsTable.h \
-    Source/PokemonSV/Options/PokemonSV_SandwichMakerOption.h \
-    Source/PokemonSV/Options/PokemonSV_TeraAIOption.h \
-    Source/PokemonSV/Options/PokemonSV_TeraMoveTable.h \
-    Source/PokemonSV/Options/PokemonSV_TournamentPrizeSelectOption.h \
-    Source/PokemonSV/Options/PokemonSV_TournamentPrizeTable.h \
-    Source/PokemonSV/PokemonSV_Panels.h \
-    Source/PokemonSV/PokemonSV_Settings.h \
-    Source/PokemonSV/Programs/Boxes/PokemonSV_BoxRoutines.h \
-    Source/PokemonSV/Programs/Eggs/PokemonSV_EggAutonomous.h \
-    Source/PokemonSV/Programs/Eggs/PokemonSV_EggFetcher.h \
-    Source/PokemonSV/Programs/Eggs/PokemonSV_EggHatcher.h \
-    Source/PokemonSV/Programs/Eggs/PokemonSV_EggRoutines.h \
-    Source/PokemonSV/Programs/FastCodeEntry/PokemonSV_ClipboardFastCodeEntry.h \
-    Source/PokemonSV/Programs/FastCodeEntry/PokemonSV_CodeEntry.h \
-    Source/PokemonSV/Programs/FastCodeEntry/PokemonSV_FastCodeEntry.h \
-    Source/PokemonSV/Programs/FastCodeEntry/PokemonSV_VideoFastCodeEntry.h \
-    Source/PokemonSV/Programs/General/PokemonSV_AuctionFarmer.h \
-    Source/PokemonSV/Programs/General/PokemonSV_AutonomousBallThrower.h \
-    Source/PokemonSV/Programs/General/PokemonSV_ESPTraining.h \
-    Source/PokemonSV/Programs/General/PokemonSV_GimmighoulChestFarmer.h \
-    Source/PokemonSV/Programs/General/PokemonSV_GimmighoulRoamingFarmer.h \
-    Source/PokemonSV/Programs/General/PokemonSV_LPFarmer.h \
-    Source/PokemonSV/Programs/General/PokemonSV_MassPurchase.h \
-    Source/PokemonSV/Programs/General/PokemonSV_MassRelease.h \
-    Source/PokemonSV/Programs/General/PokemonSV_SizeChecker.h \
-    Source/PokemonSV/Programs/General/PokemonSV_StatsReset.h \
-    Source/PokemonSV/Programs/General/PokemonSV_TournamentFarmer.h \
-    Source/PokemonSV/Programs/Glitches/PokemonSV_CloneItems-1.0.1.h \
-    Source/PokemonSV/Programs/Glitches/PokemonSV_RideCloner-1.0.1.h \
-    Source/PokemonSV/Programs/PokemonSV_AreaZero.h \
-    Source/PokemonSV/Programs/PokemonSV_BasicCatcher.h \
-    Source/PokemonSV/Programs/PokemonSV_Battles.h \
-    Source/PokemonSV/Programs/PokemonSV_ConnectToInternet.h \
-    Source/PokemonSV/Programs/PokemonSV_GameEntry.h \
-    Source/PokemonSV/Programs/PokemonSV_Navigation.h \
-    Source/PokemonSV/Programs/PokemonSV_SaveGame.h \
-    Source/PokemonSV/Programs/Sandwiches/PokemonSV_IngredientSession.h \
-    Source/PokemonSV/Programs/Sandwiches/PokemonSV_SandwichMaker.h \
-    Source/PokemonSV/Programs/Sandwiches/PokemonSV_SandwichRoutines.h \
-    Source/PokemonSV/Programs/ShinyHunting/PokemonSV_AreaZeroPlatform.h \
-    Source/PokemonSV/Programs/ShinyHunting/PokemonSV_LetsGoTools.h \
-    Source/PokemonSV/Programs/ShinyHunting/PokemonSV_ShinyHunt-AreaZeroPlatform.h \
-    Source/PokemonSV/Programs/TeraRaids/PokemonSV_AutoHost.h \
-    Source/PokemonSV/Programs/TeraRaids/PokemonSV_AutoHostLobbyWaiter.h \
-    Source/PokemonSV/Programs/TeraRaids/PokemonSV_AutoHostTools.h \
-    Source/PokemonSV/Programs/TeraRaids/PokemonSV_JoinTracker.h \
-    Source/PokemonSV/Programs/TeraRaids/PokemonSV_TeraBattler.h \
-    Source/PokemonSV/Programs/TeraRaids/PokemonSV_TeraMultiFarmer.h \
-    Source/PokemonSV/Programs/TeraRaids/PokemonSV_TeraRoutines.h \
-    Source/PokemonSV/Programs/TeraRaids/PokemonSV_TeraSelfFarmer.h \
-    Source/PokemonSV/Programs/TestPrograms/PokemonSV_SoundListener.h \
-    Source/PokemonSV/Programs/Trading/PokemonSV_SelfBoxTrade.h \
-    Source/PokemonSV/Programs/Trading/PokemonSV_TradeRoutines.h \
-    Source/PokemonSV/Resources/PokemonSV_AuctionItemNames.h \
-    Source/PokemonSV/Resources/PokemonSV_FillingsCoordinates.h \
-    Source/PokemonSV/Resources/PokemonSV_Ingredients.h \
-    Source/PokemonSV/Resources/PokemonSV_ItemSprites.h \
-    Source/PokemonSV/Resources/PokemonSV_NameDatabase.h \
-    Source/PokemonSV/Resources/PokemonSV_PokemonSprites.h \
-    Source/PokemonSV/Resources/PokemonSV_TournamentPrizeNames.h \
-    Source/PokemonSwSh/Commands/PokemonSwSh_Commands_AutoHosts.h \
-    Source/PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.h \
-    Source/PokemonSwSh/Commands/PokemonSwSh_Commands_DaySkippers.h \
-    Source/PokemonSwSh/Commands/PokemonSwSh_Commands_EggRoutines.h \
-    Source/PokemonSwSh/Commands/PokemonSwSh_Commands_GameEntry.h \
-    Source/PokemonSwSh/Commands/PokemonSwSh_Commands_Misc.h \
-    Source/PokemonSwSh/Commands/PokemonSwSh_Messages_AutoHosts.h \
-    Source/PokemonSwSh/Commands/PokemonSwSh_Messages_DateSpam.h \
-    Source/PokemonSwSh/Commands/PokemonSwSh_Messages_DaySkippers.h \
-    Source/PokemonSwSh/Commands/PokemonSwSh_Messages_EggRoutines.h \
-    Source/PokemonSwSh/Commands/PokemonSwSh_Messages_GameEntry.h \
-    Source/PokemonSwSh/Commands/PokemonSwSh_Messages_Misc.h \
-    Source/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleBallReader.h \
-    Source/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleDialogDetector.h \
-    Source/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleDialogTracker.h \
-    Source/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleMenuDetector.h \
-    Source/PokemonSwSh/Inference/Battles/PokemonSwSh_ExperienceGainDetector.h \
-    Source/PokemonSwSh/Inference/Battles/PokemonSwSh_StartBattleDetector.h \
-    Source/PokemonSwSh/Inference/Dens/PokemonSwSh_BeamSetter.h \
-    Source/PokemonSwSh/Inference/Dens/PokemonSwSh_DenMonReader.h \
-    Source/PokemonSwSh/Inference/Dens/PokemonSwSh_RaidCatchDetector.h \
-    Source/PokemonSwSh/Inference/Dens/PokemonSwSh_RaidLobbyReader.h \
-    Source/PokemonSwSh/Inference/PokemonSwSh_BoxGenderDetector.h \
-    Source/PokemonSwSh/Inference/PokemonSwSh_BoxNatureDetector.h \
-    Source/PokemonSwSh/Inference/PokemonSwSh_BoxShinySymbolDetector.h \
-    Source/PokemonSwSh/Inference/PokemonSwSh_DialogBoxDetector.h \
-    Source/PokemonSwSh/Inference/PokemonSwSh_FishingDetector.h \
-    Source/PokemonSwSh/Inference/PokemonSwSh_IVCheckerReader.h \
-    Source/PokemonSwSh/Inference/PokemonSwSh_MarkFinder.h \
-    Source/PokemonSwSh/Inference/PokemonSwSh_PokemonSpriteReader.h \
-    Source/PokemonSwSh/Inference/PokemonSwSh_QuantityReader.h \
-    Source/PokemonSwSh/Inference/PokemonSwSh_ReceivePokemonDetector.h \
-    Source/PokemonSwSh/Inference/PokemonSwSh_SelectionArrowFinder.h \
-    Source/PokemonSwSh/Inference/PokemonSwSh_SummaryShinySymbolDetector.h \
-    Source/PokemonSwSh/Inference/PokemonSwSh_TypeSymbolFinder.h \
-    Source/PokemonSwSh/Inference/PokemonSwSh_YCommDetector.h \
-    Source/PokemonSwSh/Inference/RNG/PokemonSwSh_OrbeetleAttackAnimationDetector.h \
-    Source/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_ShinyEncounterDetector.h \
-    Source/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_ShinySparkleSet.h \
-    Source/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_SparkleDetectorRadial.h \
-    Source/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_SparkleDetectorSquare.h \
-    Source/PokemonSwSh/Inference/Sounds/PokemonSwSh_BerryTreeRustlingSoundDetector.h \
-    Source/PokemonSwSh/InferenceTraining/PokemonSwSh_GenerateIVCheckerOCR.h \
-    Source/PokemonSwSh/InferenceTraining/PokemonSwSh_GenerateNameOCRPokedex.h \
-    Source/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI.h \
-    Source/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_PathMatchup.h \
-    Source/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_RentalBossMatchup.h \
-    Source/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_Tools.h \
-    Source/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_CatchScreenTracker.h \
-    Source/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_Notifications.h \
-    Source/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_State.h \
-    Source/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_StateMachine.h \
-    Source/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_StateTracker.h \
-    Source/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_Stats.h \
-    Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_BattleMenu.h \
-    Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_EndBattle.h \
-    Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_Entrance.h \
-    Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_HPPP.h \
-    Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_ItemSelectMenu.h \
-    Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_Lobby.h \
-    Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathMap.h \
-    Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathSelect.h \
-    Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathSide.h \
-    Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonReader.h \
-    Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonSelectMenu.h \
-    Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonSwapMenu.h \
-    Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_ProfessorSwap.h \
-    Source/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options.h \
-    Source/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options_BossAction.h \
-    Source/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options_Consoles.h \
-    Source/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options_Hosting.h \
-    Source/PokemonSwSh/MaxLair/PokemonSwSh_MaxLair_BossFinder.h \
-    Source/PokemonSwSh/MaxLair/PokemonSwSh_MaxLair_Standard.h \
-    Source/PokemonSwSh/MaxLair/PokemonSwSh_MaxLair_StrongBoss.h \
-    Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_Adventure.h \
-    Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_Battle.h \
-    Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_CaughtScreen.h \
-    Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_EnterLobby.h \
-    Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_Entrance.h \
-    Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_ItemSelect.h \
-    Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_PathSelect.h \
-    Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_PokemonSelect.h \
-    Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_PokemonSwap.h \
-    Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_ProfessorSwap.h \
-    Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_Start.h \
-    Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_StartSolo.h \
-    Source/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterEnums.h \
-    Source/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterOption.h \
-    Source/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterOverride.h \
-    Source/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterWidget.h \
-    Source/PokemonSwSh/Options/PokemonSwSh_AutoHostNotification.h \
-    Source/PokemonSwSh/Options/PokemonSwSh_BallSelectOption.h \
-    Source/PokemonSwSh/Options/PokemonSwSh_Catchability.h \
-    Source/PokemonSwSh/Options/PokemonSwSh_CramomaticTable.h \
-    Source/PokemonSwSh/Options/PokemonSwSh_DateToucher.h \
-    Source/PokemonSwSh/Options/PokemonSwSh_EggStepCount.h \
-    Source/PokemonSwSh/Options/PokemonSwSh_EncounterBotCommon.h \
-    Source/PokemonSwSh/Options/PokemonSwSh_RegiSelector.h \
-    Source/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Battle.h \
-    Source/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Field.h \
-    Source/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Matchup.h \
-    Source/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Moves.h \
-    Source/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Pokemon.h \
-    Source/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Stats.h \
-    Source/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Types.h \
-    Source/PokemonSwSh/PokemonSwSh_Panels.h \
-    Source/PokemonSwSh/PokemonSwSh_Settings.h \
-    Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-BerryFarmer.h \
-    Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-BerryFarmer2.h \
-    Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-DailyHighlightFarmer.h \
-    Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-LotoFarmer.h \
-    Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-PokeJobsFarmer.h \
-    Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-StowOnSideFarmer.h \
-    Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-WattFarmer.h \
-    Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_BeamReset.h \
-    Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperEU.h \
-    Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperJPN-7.8k.h \
-    Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperJPN.h \
-    Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperStats.h \
-    Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperUS.h \
-    Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_EventBeamFinder.h \
-    Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_PurpleBeamFinder.h \
-    Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggAutonomous.h \
-    Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggCombined2.h \
-    Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggCombinedShared.h \
-    Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggFetcher2.h \
-    Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggFetcherMultiple.h \
-    Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggHatcher.h \
-    Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggHelpers.h \
-    Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggSuperCombined2.h \
-    Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_GodEggDuplication.h \
-    Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_GodEggItemDupe.h \
-    Source/PokemonSwSh/Programs/General/PokemonSwSh_AutonomousBallThrower.h \
-    Source/PokemonSwSh/Programs/General/PokemonSwSh_BallThrower.h \
-    Source/PokemonSwSh/Programs/General/PokemonSwSh_BoxReorderNationalDex.h \
-    Source/PokemonSwSh/Programs/General/PokemonSwSh_ClothingBuyer.h \
-    Source/PokemonSwSh/Programs/General/PokemonSwSh_DexRecFinder.h \
-    Source/PokemonSwSh/Programs/General/PokemonSwSh_MassRelease.h \
-    Source/PokemonSwSh/Programs/General/PokemonSwSh_SurpriseTrade.h \
-    Source/PokemonSwSh/Programs/General/PokemonSwSh_TradeBot.h \
-    Source/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHost-MultiGame.h \
-    Source/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHost-Rolling.h \
-    Source/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHost.h \
-    Source/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHostStats.h \
-    Source/PokemonSwSh/Programs/Hosting/PokemonSwSh_DenRoller.h \
-    Source/PokemonSwSh/Programs/Hosting/PokemonSwSh_DenTools.h \
-    Source/PokemonSwSh/Programs/Hosting/PokemonSwSh_LobbyWait.h \
-    Source/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset-Calyrex.h \
-    Source/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset-Moltres.h \
-    Source/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset-Regi.h \
-    Source/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset.h \
-    Source/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_OverworldMovement.h \
-    Source/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_OverworldTargetTracker.h \
-    Source/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_OverworldTrajectory.h \
-    Source/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_OverworldTrigger.h \
-    Source/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_ShinyHuntAutonomous-Overworld.h \
-    Source/PokemonSwSh/Programs/PokemonSwSh_BasicCatcher.h \
-    Source/PokemonSwSh/Programs/PokemonSwSh_EncounterDetection.h \
-    Source/PokemonSwSh/Programs/PokemonSwSh_EncounterHandler.h \
-    Source/PokemonSwSh/Programs/PokemonSwSh_GameEntry.h \
-    Source/PokemonSwSh/Programs/PokemonSwSh_Internet.h \
-    Source/PokemonSwSh/Programs/PokemonSwSh_MenuNavigation.h \
-    Source/PokemonSwSh/Programs/PokemonSwSh_RaidItemFarmerOKHO.h \
-    Source/PokemonSwSh/Programs/PokemonSwSh_SynchronizedSpinning.h \
-    Source/PokemonSwSh/Programs/QoLMacros/PokemonSwSh_FastCodeEntry.h \
-    Source/PokemonSwSh/Programs/QoLMacros/PokemonSwSh_FriendSearchDisconnect.h \
-    Source/PokemonSwSh/Programs/RNG/PokemonSwSh_BasicRNG.h \
-    Source/PokemonSwSh/Programs/RNG/PokemonSwSh_CramomaticRNG.h \
-    Source/PokemonSwSh/Programs/RNG/PokemonSwSh_SeedFinder.h \
-    Source/PokemonSwSh/Programs/RNG/PokemonSwSh_Xoroshiro128Plus.h \
-    Source/PokemonSwSh/Programs/ReleaseHelpers.h \
-    Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-BerryTree.h \
-    Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Fishing.h \
-    Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-IoATrade.h \
-    Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Regi.h \
-    Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Regigigas2.h \
-    Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-StrongSpawn.h \
-    Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-SwordsOfJustice.h \
-    Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Whistling.h \
-    Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_CurryHunter.h \
-    Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_MultiGameFossil.h \
-    Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHunt-Regi.h \
-    Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntTools.h \
-    Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntUnattended-IoATrade.h \
-    Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntUnattended-Regi.h \
-    Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntUnattended-Regigigas2.h \
-    Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntUnattended-StrongSpawn.h \
-    Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntUnattended-SwordsOfJustice.h \
-    Source/PokemonSwSh/Programs/TestPrograms/PokemonSwSh_ShinyEncounterTester.h \
-    Source/PokemonSwSh/Resources/PokemonSwSh_MaxLairDatabase.h \
-    Source/PokemonSwSh/Resources/PokemonSwSh_NameDatabase.h \
-    Source/PokemonSwSh/Resources/PokemonSwSh_PokeballSprites.h \
-    Source/PokemonSwSh/Resources/PokemonSwSh_PokemonSprites.h \
-    Source/PokemonSwSh/Resources/PokemonSwSh_TypeMatchup.h \
-    Source/PokemonSwSh/Resources/PokemonSwSh_TypeSprites.h \
-    Source/PokemonSwSh/ShinyHuntTracker.h \
-    Source/Tests/CommandLineTests.h \
-    Source/Tests/CommonFramework_Tests.h \
-    Source/Tests/Kernels_Tests.h \
-    Source/Tests/NintendoSwitch_Tests.h \
-    Source/Tests/PokemonLA_Tests.h \
-    Source/Tests/PokemonSV_Tests.h \
-    Source/Tests/PokemonSwSh_Tests.h \
-    Source/Tests/TestMap.h \
-    Source/Tests/TestUtils.h \
-    Source/ZeldaTotK/Programs/ZeldaTotK_BowItemDuper.h \
-    Source/ZeldaTotK/Programs/ZeldaTotK_MineruItemDuper.h \
-    Source/ZeldaTotK/Programs/ZeldaTotK_ParaglideItemDuper.h \
-    Source/ZeldaTotK/Programs/ZeldaTotK_SurfItemDuper.h \
-    Source/ZeldaTotK/Programs/ZeldaTotK_WeaponDuper.h
-
-
-
-
-exists(../../Internal/SerialPrograms/TelemetryURLs.h){
-    DEFINES += PA_OFFICIAL
-    SOURCES += ../../Internal/SerialPrograms/NintendoSwitch_TestPrograms.cpp
-    HEADERS += ../../Internal/SerialPrograms/NintendoSwitch_TestPrograms.h
-}
-
-
-
-# Default rules for deployment.
-qnx: target.path = /tmp/$${TARGET}/bin
-else: unix:!android: target.path = /opt/$${TARGET}/bin
-!isEmpty(target.path): INSTALLS += target
diff --git a/SerialPrograms/Source/CommandLine/CommandLineExecutable.cmake b/SerialPrograms/Source/CommandLine/CommandLineExecutable.cmake
new file mode 100644
index 0000000000..ce50e003d8
--- /dev/null
+++ b/SerialPrograms/Source/CommandLine/CommandLineExecutable.cmake
@@ -0,0 +1,20 @@
+# This cmake file is to be included by CMakeLists.txt to build
+# a GUI-free executable for Pokemon Automation utilities.
+
+# Define sources for command-line executable
+set(COMMANDLINE_SOURCES
+    Source/CommandLine/CommandLine_Main.cpp
+)
+
+# Create command-line executable (GUI-free)
+add_executable(SerialProgramsCommandLine ${COMMANDLINE_SOURCES})
+
+# Link to SerialProgramsLib (contains all the core functionality)
+target_link_libraries(SerialProgramsCommandLine PRIVATE CoreLib)
+
+# Ensure SerialProgramsCommandLine rebuilds when SerialProgramsLib is updated
+add_dependencies(SerialProgramsCommandLine CoreLib)
+
+# Apply common GUI-free target properties (includes, compile flags, etc.)
+# This function is defined in cmake/CoreLib.cmake
+pa_apply_gui_free_target_properties(SerialProgramsCommandLine)
diff --git a/SerialPrograms/Source/CommandLine/CommandLine_Main.cpp b/SerialPrograms/Source/CommandLine/CommandLine_Main.cpp
new file mode 100644
index 0000000000..09de8e1d98
--- /dev/null
+++ b/SerialPrograms/Source/CommandLine/CommandLine_Main.cpp
@@ -0,0 +1,115 @@
+/*  Command Line Tool Main
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  Command-line executable for Pokemon Automation utilities.
+ *  GUI-free tool for tasks like camera stream checks, debugging, etc.
+ */
+
+//#include <iostream>
+#include "Common/Cpp/Color.h"
+#include "Common/Cpp/Logging/MultiOutputLogger.h"
+#include "Common/Cpp/Logging/LastLogTracker.h"
+#include "Common/Cpp/Logging/FileLogger.h"
+#include "Common/Cpp/Logging/GlobalLogger.h"
+#include "CommonFramework/Logging/Logger.h"
+// #include "CommonFramework/Logging/OutputRedirector.h"
+#include "CommonFramework/Tools/GlobalThreadPools.h"
+#include "Integrations/PybindSwitchController.h"
+#include "NintendoSwitch/Controllers/NintendoSwitch_ControllerButtons.h"
+
+using namespace PokemonAutomation;
+using namespace PokemonAutomation::NintendoSwitch;
+
+namespace PokemonAutomation{
+
+bool use_qt_ui(){
+    return false;
+}
+
+
+FileLogger& global_file_logger(){
+    static FileLogger logger(
+        GlobalThreadPools::unlimited_normal(),
+        FileLoggerConfig{
+            .file_path = "./SerialProgramsCommandLine.log"
+        }
+    );
+    return logger;
+}
+
+
+}
+
+int main(int argc, char* argv[]){
+//     // Set up output redirection for logging
+//     OutputRedirector redirect_stdout(std::cout, "stdout", Color());
+//     OutputRedirector redirect_stderr(std::cerr, "stderr", COLOR_RED);
+
+    {
+        MultiOutputLogger& logger = global_multi_logger();
+        logger.add_listener(global_last_log_history());
+        logger.add_listener(global_file_logger());
+    }
+
+    // Get the global command-line logger (suitable for command-line tools)
+    Logger& logger = global_logger_command_line();
+
+    logger.log("================================================================================");
+    logger.log("Starting Program...");
+    logger.log("Pokemon Automation - Command Line Tool");
+
+    // Check if port name argument is provided
+    if (argc < 2){
+        logger.log("Usage: " + std::string(argv[0]) + " <port_name>", COLOR_RED);
+        logger.log("Example: " + std::string(argv[0]) + " cu.usbserial-0001");
+        return 1;
+    }
+
+    // Test PybindSwitchProController
+    logger.log("================================================================================");
+    logger.log("Testing PybindSwitchProController...");
+
+    try{
+        // Create controller with port name from command-line argument
+        const std::string port_name = argv[1];
+        logger.log("Creating PybindSwitchProController with port: " + port_name);
+
+        PybindSwitchProController controller(port_name);
+        controller.wait_for_ready(5000);
+
+        // Check if controller is ready
+        if (controller.is_ready()){
+            logger.log("Controller is ready!", COLOR_GREEN);
+            logger.log("Status: " + controller.current_status());
+
+            // Mash A button for 3 seconds
+            logger.log("Mashing A button for 3 seconds...");
+
+            for (int i = 0; i < 30; i++){
+                // Push A button: delay=0ms, hold=50ms, release=50ms, button=BUTTON_A
+                controller.push_button(0, 50, 50, static_cast<uint32_t>(BUTTON_A));
+            }
+
+            // Wait for all button commands to complete
+            logger.log("Waiting for all requests to complete...");
+            controller.wait_for_all_requests();
+
+            logger.log("A button mashing completed!", COLOR_GREEN);
+        }else{
+            logger.log("Controller is not ready!", COLOR_RED);
+            logger.log("Status: " + controller.current_status());
+        }
+
+    }catch (const std::exception& e){
+        logger.log("Error during controller test: " + std::string(e.what()), COLOR_RED);
+    }
+
+    logger.log("================================================================================");
+    logger.log("Program completed successfully.");
+    logger.log("================================================================================");
+
+    global_file_logger().stop();
+
+    return 0;
+}
diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioConstants.h b/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioConstants.h
index 2165659fa7..86810d4d2a 100644
--- a/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioConstants.h
+++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioConstants.h
@@ -1,20 +1,22 @@
 /*  Audio Constants
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifndef PokemonAutomation_AudioConstants_H
 #define PokemonAutomation_AudioConstants_H
 
-#include <cmath>
+//#include <cmath>
 
-//  Largest FFT that is no more than 1/10 of a second.
-const int FFT_LENGTH_POWER_OF_TWO = 12;
+//  ~42ms of samples
+const int FFT_LENGTH_POWER_OF_TWO = 11;
 
 const size_t NUM_FFT_SAMPLES = 1 << FFT_LENGTH_POWER_OF_TWO;
 //const int NUM_FFT_WINDOWS = 100;
-const size_t FFT_SLIDING_WINDOW_STEP = NUM_FFT_SAMPLES/4;
+const size_t FFT_SLIDING_WINDOW_STEP = NUM_FFT_SAMPLES / 4;
+
+const float VISUAL_JITTER_DECAY = 0.2f;
 
 
 #endif
diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioFeed.h b/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioFeed.h
index 67db87c00e..e1a6df2dd7 100644
--- a/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioFeed.h
+++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioFeed.h
@@ -1,6 +1,6 @@
 /*  Audio Feed Interface
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioFormat.cpp b/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioFormat.cpp
new file mode 100644
index 0000000000..f64be12cfa
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioFormat.cpp
@@ -0,0 +1,88 @@
+/*  Audio Format
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <QAudioFormat>
+#include "Common/Cpp/Exceptions.h"
+#include "Common/Cpp/Containers/Pimpl.tpp"
+#include "Kernels/AudioPipeline/Kernels_AudioPipeline.h"
+#include "AudioFormat.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+
+
+
+size_t sample_size(AudioSampleFormat format){
+    switch (format){
+    case AudioSampleFormat::UINT8:
+        return sizeof(uint8_t);
+    case AudioSampleFormat::SINT16:
+        return sizeof(int16_t);
+    case AudioSampleFormat::SINT32:
+        return sizeof(int32_t);
+    case AudioSampleFormat::FLOAT32:
+        return sizeof(float);
+    default:
+        throw InternalProgramError(
+            nullptr,
+            PA_CURRENT_FUNCTION,
+            "Invalid AudioSampleFormat: " + std::to_string((size_t)format)
+        );
+    }
+}
+
+
+AudioSampleFormat sample_format_of(const QAudioFormat& format){
+    switch (format.sampleFormat()){
+    case QAudioFormat::SampleFormat::Float:
+        return AudioSampleFormat::FLOAT32;
+    case QAudioFormat::SampleFormat::UInt8:
+        return AudioSampleFormat::UINT8;
+    case QAudioFormat::SampleFormat::Int16:
+        return AudioSampleFormat::SINT16;
+    case QAudioFormat::SampleFormat::Int32:
+        return AudioSampleFormat::SINT32;
+    default:
+        throw InternalProgramError(
+            nullptr,
+            PA_CURRENT_FUNCTION,
+            "Unsupported audio sample format."
+        );
+    }
+}
+
+
+
+AudioFormat::AudioFormat()
+    : m_native_format(CONSTRUCT_TOKEN)
+{}
+AudioFormat::AudioFormat(QAudioFormat native_format)
+    : m_native_format(CONSTRUCT_TOKEN, std::move(native_format))
+{}
+
+AudioSampleFormat AudioFormat::sample_format() const{
+    return sample_format_of(*m_native_format);
+}
+size_t AudioFormat::sample_rate() const{
+    return m_native_format->sampleRate();
+}
+size_t AudioFormat::channels() const{
+    return m_native_format->channelCount();
+}
+
+const QAudioFormat& AudioFormat::native_format() const{
+    return *m_native_format;
+}
+QAudioFormat& AudioFormat::native_format(){
+    return *m_native_format;
+}
+
+
+
+}
diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioFormat.h b/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioFormat.h
new file mode 100644
index 0000000000..b649c3b4e7
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioFormat.h
@@ -0,0 +1,52 @@
+/*  Audio Format
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_AudioPipeline_AudioFormat_H
+#define PokemonAutomation_AudioPipeline_AudioFormat_H
+
+#include "Common/Cpp/Containers/Pimpl.h"
+#include "Kernels/AudioPipeline/Kernels_AudioPipeline.h"
+
+class QAudioFormat;
+
+class QAudioDevice;
+using NativeAudioInfo = QAudioDevice;
+
+
+
+namespace PokemonAutomation{
+
+
+using AudioSampleFormat = Kernels::AudioPipeline::SampleFormat;
+size_t sample_size(AudioSampleFormat format);
+
+//  The pipeline's SampleFormat for a Qt sample format; throws for an
+//  unknown Qt format.
+AudioSampleFormat sample_format_of(const QAudioFormat& format);
+
+
+
+class AudioFormat{
+public:
+    AudioFormat();
+    AudioFormat(QAudioFormat native_format);
+
+    AudioSampleFormat sample_format() const;
+    size_t sample_rate() const;
+    size_t channels() const;
+
+    const QAudioFormat& native_format() const;
+    QAudioFormat& native_format();
+
+private:
+    Pimpl<QAudioFormat> m_native_format;
+};
+
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioInfo.cpp b/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioInfo.cpp
deleted file mode 100644
index e27d566f89..0000000000
--- a/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioInfo.cpp
+++ /dev/null
@@ -1,482 +0,0 @@
-/*  Audio Input Device Info
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <map>
-#include <QtGlobal>
-#include "Common/Cpp/Exceptions.h"
-#include "Common/Cpp/Containers/Pimpl.tpp"
-#include "CommonFramework/GlobalSettingsPanel.h"
-#include "AudioInfo.h"
-
-#include <iostream>
-using std::cout;
-using std::endl;
-
-
-#if QT_VERSION_MAJOR == 5
-#include <QAudioDeviceInfo>
-#elif QT_VERSION_MAJOR == 6
-#include <QAudioDevice>
-#include <QMediaDevices>
-#else
-#error "Unsupported Qt version."
-#endif
-namespace PokemonAutomation{
-
-
-
-const char* AUDIO_FORMAT_LABELS[] = {
-    "(none)",
-    "1 x 48,000 Hz (Mono)",
-    "2 x 44,100 Hz (Stereo)",
-    "2 x 48,000 Hz (Stereo)",
-    "1 x 96,000 Hz (Mono)",
-    "1 x 96,000 Hz (Interleaved Stereo L/R)",
-    "1 x 96,000 Hz (Interleaved Stereo R/L)",
-};
-
-void set_format(QAudioFormat& native_format, AudioChannelFormat format){
-    switch (format){
-    case AudioChannelFormat::MONO_48000:
-        if (native_format.channelCount() != 1){
-            native_format.setChannelCount(1);
-        }
-        if (native_format.sampleRate() != 48000){
-            native_format.setSampleRate(48000);
-        }
-        break;
-    case AudioChannelFormat::DUAL_44100:
-        if (native_format.channelCount() != 2){
-            native_format.setChannelCount(2);
-        }
-        if (native_format.sampleRate() != 44100){
-            native_format.setSampleRate(44100);
-        }
-        break;
-    case AudioChannelFormat::DUAL_48000:
-        if (native_format.channelCount() != 2){
-            native_format.setChannelCount(2);
-        }
-        if (native_format.sampleRate() != 48000){
-            native_format.setSampleRate(48000);
-        }
-        break;
-    case AudioChannelFormat::MONO_96000:
-    case AudioChannelFormat::INTERLEAVE_LR_96000:
-    case AudioChannelFormat::INTERLEAVE_RL_96000:
-        if (native_format.channelCount() != 1){
-            native_format.setChannelCount(1);
-        }
-        if (native_format.sampleRate() != 96000){
-            native_format.setSampleRate(96000);
-        }
-        break;
-    default:
-        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Invalid AudioFormat: " + std::to_string((size_t)format));
-    }
-}
-
-AudioSampleFormat get_sample_format(QAudioFormat& native_format){
-#if QT_VERSION_MAJOR == 5
-    if (native_format.sampleType() == QAudioFormat::SampleType::Float){
-        return AudioSampleFormat::FLOAT32;
-    }else if (native_format.sampleType() == QAudioFormat::SampleType::UnSignedInt && native_format.sampleSize() == 8){
-        return AudioSampleFormat::UINT8;
-    }else if (native_format.sampleType() == QAudioFormat::SampleType::SignedInt && native_format.sampleSize() == 16){
-        return AudioSampleFormat::SINT16;
-    }else if (native_format.sampleType() == QAudioFormat::SampleType::SignedInt && native_format.sampleSize() == 32){
-        return AudioSampleFormat::SINT32;
-    }else{
-        return AudioSampleFormat::INVALID;
-    }
-#elif QT_VERSION_MAJOR == 6
-    switch (native_format.sampleFormat()){
-    case QAudioFormat::SampleFormat::Float:
-        return AudioSampleFormat::FLOAT32;
-    case QAudioFormat::SampleFormat::UInt8:
-        return AudioSampleFormat::UINT8;
-    case QAudioFormat::SampleFormat::Int16:
-        return AudioSampleFormat::SINT16;
-    case QAudioFormat::SampleFormat::Int32:
-        return AudioSampleFormat::SINT32;
-    default:
-        return AudioSampleFormat::INVALID;
-    }
-#else
-#error "Unknown Qt version."
-#endif
-}
-
-
-//  Return a list of our formats that are supported by this device.
-//  "preferred_index" is set to the index of the list that is preferred by the device.
-//  If no preferred format matches our formats, -1 is returned.
-std::vector<AudioChannelFormat> supported_input_formats(int& preferred_index, const NativeAudioInfo& info, const std::string& display_name){
-    QAudioFormat preferred_format = info.preferredFormat();
-
-//    preferred_format.setSampleSize(16);
-//    preferred_format.setSampleType(QAudioFormat::SampleType::SignedInt);
-
-    int preferred_channels = preferred_format.channelCount();
-    int preferred_rate = preferred_format.sampleRate();
-//    cout << "display_name = " << display_name << endl;
-//    cout << "channelCount = " << preferred_format.channelCount() << endl;
-//    cout << "sample_rate = " << preferred_format.sample_rate() << endl;
-//    cout << "sampleSize = " << preferred_format.sampleSize() << endl;
-//    cout << "sampleFormat = " << preferred_format.sampleType() << endl;
-//    cout << "preferred_format = " << info.isFormatSupported(preferred_format) << endl;
-
-#if QT_VERSION_MAJOR == 6 || (QT_VERSION_MAJOR == 5 && __GNUC__)
-    //  On Qt6, "QAudioFormat::preferredFormat()" always returns stereo 44.1 kHz.
-    //  Unlike Qt5, it does not return the native format of the device
-    //  This actually makes it kind of impossible to figure out what the correct
-    //  format we need to use to give proper stereo. So instead, we just assume
-    //  mono 96000 which will be the case for standard capture cards.
-    preferred_channels = 1;
-    preferred_rate = 96000;
-#endif
-
-    std::vector<AudioChannelFormat> ret;
-    preferred_index = -1;
-
-//    bool stereo = false;
-    {
-        QAudioFormat format = preferred_format;
-        set_format(format, AudioChannelFormat::MONO_48000);
-        if (info.isFormatSupported(format)){
-            if (format.channelCount() == preferred_channels && format.sampleRate() == preferred_rate){
-                preferred_index = (int)ret.size();
-            }
-            ret.emplace_back(AudioChannelFormat::MONO_48000);
-        }
-    }
-#if 1
-    {
-        QAudioFormat format = preferred_format;
-        set_format(format, AudioChannelFormat::DUAL_44100);
-        if (info.isFormatSupported(format)){
-            if (format.channelCount() == preferred_channels && format.sampleRate() == preferred_rate){
-                preferred_index = (int)ret.size();
-            }
-            ret.emplace_back(AudioChannelFormat::DUAL_44100);
-//            stereo = true;
-        }
-    }
-    {
-        QAudioFormat format = preferred_format;
-        set_format(format, AudioChannelFormat::DUAL_48000);
-        if (info.isFormatSupported(format)){
-            if (format.channelCount() == preferred_channels && format.sampleRate() == preferred_rate){
-                preferred_index = (int)ret.size();
-            }
-            ret.emplace_back(AudioChannelFormat::DUAL_48000);
-//            stereo = true;
-        }
-    }
-#endif
-
-    {
-        QAudioFormat format = preferred_format;
-        set_format(format, AudioChannelFormat::INTERLEAVE_LR_96000);
-        if (info.isFormatSupported(format)){
-            if (format.channelCount() == preferred_channels && format.sampleRate() == preferred_rate){
-                preferred_index = (int)ret.size();
-                if (display_name.find("MiraBox") != std::string::npos){
-                    preferred_index += 2;
-                }else{
-                    preferred_index += 1;
-                }
-            }
-            ret.emplace_back(AudioChannelFormat::MONO_96000);
-            ret.emplace_back(AudioChannelFormat::INTERLEAVE_LR_96000);
-            ret.emplace_back(AudioChannelFormat::INTERLEAVE_RL_96000);
-        }
-    }
-
-//    cout << "supported formats = " << ret.size() << endl;
-    return ret;
-}
-std::vector<AudioChannelFormat> supported_output_formats(int& preferred_index, const NativeAudioInfo& info){
-    QAudioFormat preferred_format = info.preferredFormat();
-    int preferred_channels = preferred_format.channelCount();
-    int preferred_rate = preferred_format.sampleRate();
-
-    std::vector<AudioChannelFormat> ret;
-    preferred_index = -1;
-
-    {
-        QAudioFormat format = preferred_format;
-        set_format(format, AudioChannelFormat::MONO_48000);
-        if (info.isFormatSupported(format)){
-            if (format.channelCount() == preferred_channels && format.sampleRate() == preferred_rate){
-                preferred_index = (int)ret.size();
-            }
-            ret.emplace_back(AudioChannelFormat::MONO_48000);
-        }
-    }
-    {
-        QAudioFormat format = preferred_format;
-        set_format(format, AudioChannelFormat::DUAL_44100);
-        if (info.isFormatSupported(format)){
-            if (format.channelCount() == preferred_channels && format.sampleRate() == preferred_rate){
-                preferred_index = (int)ret.size();
-            }
-            ret.emplace_back(AudioChannelFormat::DUAL_44100);
-        }
-    }
-    {
-        QAudioFormat format = preferred_format;
-        set_format(format, AudioChannelFormat::DUAL_48000);
-        if (info.isFormatSupported(format)){
-            if (format.channelCount() == preferred_channels && format.sampleRate() == preferred_rate){
-                preferred_index = (int)ret.size();
-            }
-            ret.emplace_back(AudioChannelFormat::DUAL_48000);
-        }
-    }
-
-    return ret;
-}
-
-
-
-
-struct AudioDeviceInfo::Data{
-    std::string device_name;    //  For serialization
-    std::string display_name;
-
-    std::vector<AudioChannelFormat> supported_formats;
-    int preferred_format_index;
-
-#if QT_VERSION_MAJOR == 5
-    QAudioDeviceInfo info;
-#elif QT_VERSION_MAJOR == 6
-    QAudioDevice info;
-#endif
-
-};
-std::vector<AudioDeviceInfo> AudioDeviceInfo::all_input_devices(){
-    //  The device list that Qt provides above will include duplicates on Windows
-    //  due to Windows having a shadow device (winMM) that seems to be able to
-    //  resample to all formats.
-    //
-    //  https://bugreports.qt.io/browse/QTBUG-75781
-    //
-    //  What we need to do here it so try to de-dupe the list while keeping the
-    //  ones that actually support the formats we need the best.
-
-    //  To do this, for all duplicates we first determine if any of the have a
-    //  preferred format that matches a format that we want. If there is, we
-    //  immediately throw out all the dupes that don't have a preferred format.
-    //  This eliminates all the winMM devices if the primary can be used instead.
-    //
-    //  Then we throw away all the ones that have fewer supported formats than
-    //  the most. Identical (but different) devices will likely have identical
-    //  names and format support. They won't be deduped.
-
-    std::vector<AudioDeviceInfo> list;
-
-#if QT_VERSION_MAJOR == 5
-    for (NativeAudioInfo& device : QAudioDeviceInfo::availableDevices(QAudio::AudioInput)){
-        list.emplace_back();
-        Data& data = *list.back().m_body;
-
-        std::string name = device.deviceName().toStdString();
-        data.device_name = name;
-        data.display_name = std::move(name);
-        data.info = std::move(device);
-
-        data.supported_formats = supported_input_formats(data.preferred_format_index, data.info, data.display_name);
-//        cout << "data.supported_formats = " << data.supported_formats.size() << endl;
-    }
-#elif QT_VERSION_MAJOR == 6
-    for (NativeAudioInfo& device : QMediaDevices::audioInputs()){
-        list.emplace_back();
-        Data& data = *list.back().m_body;
-
-        data.device_name = device.id().toStdString();
-        data.display_name = device.description().toStdString();
-        data.info = std::move(device);
-
-        data.supported_formats = supported_input_formats(data.preferred_format_index, data.info, data.display_name);
-    }
-#endif
-
-    if (GlobalSettings::instance().SHOW_ALL_AUDIO_DEVICES){
-        return list;
-    }
-
-    //  Get map of best devices.
-    std::map<std::string, size_t> best_devices;
-    for (const AudioDeviceInfo& device : list){
-        size_t& best_score = best_devices[device.display_name()];
-        size_t current_score = device.supported_formats().size();
-        if (device.preferred_format_index() >= 0){
-            current_score += 100;
-        }
-        best_score = std::max(best_score, current_score);
-    }
-
-    //  Keep only devices with the most # of formats. Duplicates allowed.
-    std::vector<AudioDeviceInfo> ret;
-    for (AudioDeviceInfo& device : list){
-        size_t best_score = best_devices.find(device.display_name())->second;
-        size_t current_score = device.supported_formats().size();
-        if (device.preferred_format_index() >= 0){
-            current_score += 100;
-        }
-        if (current_score >= best_score || GlobalSettings::instance().SHOW_ALL_AUDIO_DEVICES){
-            ret.emplace_back(std::move(device));
-        }
-    }
-
-    return ret;
-}
-std::vector<AudioDeviceInfo> AudioDeviceInfo::all_output_devices(){
-    //  The device list that Qt provides above will include duplicates on Windows
-    //  due to Windows having a shadow device (winMM) that seems to be able to
-    //  resample to all formats.
-    //
-    //  https://bugreports.qt.io/browse/QTBUG-75781
-    //
-    //  What we need to do here it so try to de-dupe the list while keeping the
-    //  ones that actually support the formats we need the best.
-
-    //  To do this, for all duplicates we throw away the ones that have fewer
-    //  supported formats than the most. Identical (but different) devices will
-    //  likely have identical names and format support. They won't be deduped.
-    //
-    //  This method will keep the winMM device which we want for audio output.
-
-    std::vector<AudioDeviceInfo> list;
-
-#if QT_VERSION_MAJOR == 5
-    for (NativeAudioInfo& device : QAudioDeviceInfo::availableDevices(QAudio::AudioOutput)){
-        list.emplace_back();
-        Data& data = *list.back().m_body;
-
-        std::string name = device.deviceName().toStdString();
-        data.device_name = name;
-        data.display_name = std::move(name);
-        data.info = std::move(device);
-
-        data.supported_formats = supported_output_formats(data.preferred_format_index, data.info);
-    }
-#elif QT_VERSION_MAJOR == 6
-    for (NativeAudioInfo& device : QMediaDevices::audioOutputs()){
-        list.emplace_back();
-        Data& data = *list.back().m_body;
-
-        data.device_name = device.id().toStdString();
-        data.display_name = device.description().toStdString();
-        data.info = std::move(device);
-
-        data.supported_formats = supported_output_formats(data.preferred_format_index, data.info);
-    }
-#endif
-
-    //  Get map of greatest format counts.
-    std::map<std::string, size_t> most_formats;
-    for (AudioDeviceInfo& device : list){
-        size_t& count = most_formats[device.display_name()];
-        count = std::max(count, device.supported_formats().size());
-    }
-
-    //  Keep only devices with the most # of formats. Duplicates allowed.
-    std::vector<AudioDeviceInfo> ret;
-    for (AudioDeviceInfo& device : list){
-        auto iter = most_formats.find(device.display_name());
-        if (device.supported_formats().size() >= iter->second){
-            ret.emplace_back(std::move(device));
-        }
-    }
-
-    return ret;
-}
-
-
-AudioDeviceInfo::~AudioDeviceInfo(){}
-AudioDeviceInfo::AudioDeviceInfo(const AudioDeviceInfo& x) = default;
-void AudioDeviceInfo::operator=(const AudioDeviceInfo& x){
-    m_body = x.m_body;
-}
-
-AudioDeviceInfo::AudioDeviceInfo()
-    : m_body(CONSTRUCT_TOKEN)
-{}
-
-AudioDeviceInfo::AudioDeviceInfo(const std::string& device_name){
-    for (AudioDeviceInfo& info : all_input_devices()){
-        if (device_name == info.device_name()){
-            *this = std::move(info);
-            return;
-        }
-    }
-    for (AudioDeviceInfo& info : all_output_devices()){
-        if (device_name == info.device_name()){
-            *this = std::move(info);
-            return;
-        }
-    }
-    m_body.reset();
-}
-
-AudioDeviceInfo::operator bool() const{
-    return m_body && !m_body->device_name.empty();
-}
-const std::string& AudioDeviceInfo::display_name() const{
-    return m_body->display_name;
-}
-const std::string& AudioDeviceInfo::device_name() const{
-    return m_body->device_name;
-}
-const std::vector<AudioChannelFormat>& AudioDeviceInfo::supported_formats() const{
-    return m_body->supported_formats;
-}
-int AudioDeviceInfo::preferred_format_index() const{
-    return m_body->preferred_format_index;
-}
-QAudioFormat AudioDeviceInfo::preferred_format() const{
-    QAudioFormat format = native_info().preferredFormat();
-    int index = preferred_format_index();
-    if (index >= 0){
-        set_format(format, supported_formats()[index]);
-    }
-    return format;
-}
-const NativeAudioInfo& AudioDeviceInfo::native_info() const{
-    return m_body->info;
-}
-bool AudioDeviceInfo::operator==(const AudioDeviceInfo& info) const{
-    return device_name() == info.device_name();
-}
-
-
-
-
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioInfo.h b/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioInfo.h
deleted file mode 100644
index 7b5d2c71d2..0000000000
--- a/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioInfo.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/*  Audio Device Info
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_AudioPipeline_AudioInfo_H
-#define PokemonAutomation_AudioPipeline_AudioInfo_H
-
-#include <string>
-#include <vector>
-#include <QtConfig>
-#include "Common/Cpp/Containers/Pimpl.h"
-
-class QAudioFormat;
-
-#if QT_VERSION_MAJOR == 5
-class QAudioDeviceInfo;
-using NativeAudioInfo = QAudioDeviceInfo;
-#elif QT_VERSION_MAJOR == 6
-class QAudioDevice;
-using NativeAudioInfo = QAudioDevice;
-#else
-#error "Unknown Qt version."
-#endif
-
-
-
-namespace PokemonAutomation{
-
-
-enum class AudioSampleFormat{
-    INVALID,
-    UINT8,
-    SINT16,
-    SINT32,
-    FLOAT32,
-};
-size_t sample_size(AudioSampleFormat format);
-
-
-enum class AudioChannelFormat{
-    NONE,
-    MONO_48000,
-    DUAL_44100,
-    DUAL_48000,
-    MONO_96000,
-    INTERLEAVE_LR_96000,
-    INTERLEAVE_RL_96000,
-    END_LIST,
-};
-extern const char* AUDIO_FORMAT_LABELS[];
-
-//  Set the QAudioFormat to the our audio format enum.
-void set_format(QAudioFormat& native_format, AudioChannelFormat format);
-
-
-AudioSampleFormat get_sample_format(QAudioFormat& native_format);
-
-
-
-
-class AudioDeviceInfo{
-public:
-    ~AudioDeviceInfo();
-    AudioDeviceInfo(const AudioDeviceInfo& x);
-    void operator=(const AudioDeviceInfo& x);
-
-public:
-    AudioDeviceInfo();
-    explicit AudioDeviceInfo(const std::string& device_name);
-
-    explicit operator bool() const;
-
-    const std::string& display_name() const;
-    const std::string& device_name() const;
-
-    const std::vector<AudioChannelFormat>& supported_formats() const;
-    int preferred_format_index() const;
-    QAudioFormat preferred_format() const;
-
-    const NativeAudioInfo& native_info() const;
-
-    bool operator==(const AudioDeviceInfo& info) const;
-
-    static std::vector<AudioDeviceInfo> all_input_devices();
-    static std::vector<AudioDeviceInfo> all_output_devices();
-
-private:
-    struct Data;
-    Pimpl<Data> m_body;
-};
-
-
-
-
-
-}
-#endif
diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioInfo_Tests.cpp b/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioInfo_Tests.cpp
new file mode 100644
index 0000000000..97942c04ad
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioInfo_Tests.cpp
@@ -0,0 +1,527 @@
+/*  Audio Pipeline - AudioInfo / Input Choice Tests
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  Gate tests for the device-driven input format list
+ *  (AudioInputChoice / input_choices). Pure data tests: no audio I/O.
+ *
+ */
+
+#include <string>
+#include <vector>
+#include <QAudioFormat>
+#include "Common/Cpp/Containers/Pimpl.tpp"
+#include "Common/Cpp/TestRunners/UnitTest.h"
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "CommonFramework/AudioPipeline/AudioFormat.h"
+#include "AudioInputChoice.h"
+#include "AudioInfo_Tests.h"
+
+namespace PokemonAutomation{
+
+namespace{
+
+
+
+//  Builds a QAudioFormat. The channel count is set before the channel
+//  config, since Qt's setChannelCount() resets the config.
+QAudioFormat make_q_format(
+    int rate, int channels,
+    QAudioFormat::ChannelConfig config, QAudioFormat::SampleFormat sample_format
+){
+    QAudioFormat format;
+    format.setSampleRate(rate);
+    format.setSampleFormat(sample_format);
+    format.setChannelCount(channels);
+    if (config != QAudioFormat::ChannelConfigUnknown){
+        format.setChannelConfig(config);
+    }
+    return format;
+}
+
+AudioFormat make_format(
+    int rate, int channels,
+    QAudioFormat::ChannelConfig config = QAudioFormat::ChannelConfigUnknown,
+    QAudioFormat::SampleFormat sample_format = QAudioFormat::SampleFormat::Int16
+){
+    return AudioFormat(make_q_format(rate, channels, config, sample_format));
+}
+
+
+
+class InputChoiceNamingTest : public UnitTest{
+public:
+    InputChoiceNamingTest()
+        : UnitTest("AudioInfo - InputChoice_Naming")
+    {}
+
+    virtual UnitTestResult run(Logger&, CancellableScope&) const override{
+        std::string error;
+        const auto check_name = [](const std::string& what, const std::string& got, const std::string& want, std::string& err){
+            if (got == want){
+                return true;
+            }
+            err = what + ": got \"" + got + "\", expected \"" + want + "\".";
+            return false;
+        };
+
+        //  Standard layouts.
+        std::string got;
+        got = AudioInputChoice(make_format(48000, 1, QAudioFormat::ChannelConfig::ChannelConfigMono)).display_name();
+        if (!check_name("1ch mono", got, "1 x 48,000 Hz (Mono)", error)){
+            return error;
+        }
+        got = AudioInputChoice(make_format(44100, 2, QAudioFormat::ChannelConfig::ChannelConfigStereo)).display_name();
+        if (!check_name("2ch stereo 44.1k", got, "2 x 44,100 Hz (Stereo)", error)){
+            return error;
+        }
+        got = AudioInputChoice(make_format(96000, 1, QAudioFormat::ChannelConfig::ChannelConfigMono)).display_name();
+        if (!check_name("1ch mono 96k", got, "1 x 96,000 Hz (Mono)", error)){
+            return error;
+        }
+        got = AudioInputChoice(make_format(48000, 3, QAudioFormat::ChannelConfig::ChannelConfig2Dot1)).display_name();
+        if (!check_name("2.1", got, "3 x 48,000 Hz (2.1)", error)){
+            return error;
+        }
+        got = AudioInputChoice(make_format(48000, 6, QAudioFormat::ChannelConfig::ChannelConfigSurround5Dot1)).display_name();
+        if (!check_name("5.1", got, "6 x 48,000 Hz (5.1)", error)){
+            return error;
+        }
+        got = AudioInputChoice(make_format(48000, 8, QAudioFormat::ChannelConfig::ChannelConfigSurround7Dot1)).display_name();
+        if (!check_name("7.1", got, "8 x 48,000 Hz (7.1)", error)){
+            return error;
+        }
+        got = AudioInputChoice(make_format(192000, 2, QAudioFormat::ChannelConfig::ChannelConfigStereo)).display_name();
+        if (!check_name("comma thousands", got, "2 x 192,000 Hz (Stereo)", error)){
+            return error;
+        }
+
+        //  Unknown config falls back to the standard layout name.
+        got = AudioInputChoice(make_format(48000, 2, QAudioFormat::ChannelConfigUnknown)).display_name();
+        if (!check_name("unknown config 2ch", got, "2 x 48,000 Hz (Stereo)", error)){
+            return error;
+        }
+
+        //  Non-standard channel counts with no standard layout get no name.
+        got = AudioInputChoice(make_format(48000, 9, QAudioFormat::ChannelConfigUnknown)).display_name();
+        if (!check_name("9ch", got, "9 x 48,000 Hz", error)){
+            return error;
+        }
+
+        //  The reinterpreted capture-card choices keep the preset strings.
+        const AudioFormat physical = make_format(96000, 1, QAudioFormat::ChannelConfig::ChannelConfigMono);
+        const AudioFormat logical = make_format(48000, 2, QAudioFormat::ChannelConfig::ChannelConfigStereo);
+        got = AudioInputChoice::reinterpreted(AudioFormat(logical), AudioFormat(physical), false).display_name();
+        if (!check_name("reinterpret L/R", got, "2 x 48,000 Hz (Interleaved Stereo L/R)", error)){
+            return error;
+        }
+        got = AudioInputChoice::reinterpreted(AudioFormat(logical), AudioFormat(physical), true).display_name();
+        if (!check_name("reinterpret R/L", got, "2 x 48,000 Hz (Interleaved Stereo R/L)", error)){
+            return error;
+        }
+
+        //  An invalid choice has no name.
+        if (!AudioInputChoice().display_name().empty()){
+            return "Invalid choice should have an empty display name.";
+        }
+
+        return true;
+    }
+};
+
+
+
+class InputChoiceFlagsTest : public UnitTest{
+public:
+    InputChoiceFlagsTest()
+        : UnitTest("AudioInfo - InputChoice_Flags")
+    {}
+
+    virtual UnitTestResult run(Logger&, CancellableScope&) const override{
+        const AudioFormat format = make_format(48000, 2, QAudioFormat::ChannelConfig::ChannelConfigStereo);
+
+        //  Native choice: physical == format, no reinterpretation.
+        AudioInputChoice native(format);
+        if (!native.is_valid() || !native){
+            return "Native choice should be valid.";
+        }
+        if (native.is_reinterpreted() || native.swap_channels()){
+            return "Native choice should not be reinterpreted or swapped.";
+        }
+        if (native.physical_format().native_format() != format.native_format()){
+            return "Native choice's physical format should equal its format.";
+        }
+
+        //  Reinterpreted choice: distinct shapes, swap flag honored.
+        const AudioFormat physical = make_format(96000, 1, QAudioFormat::ChannelConfig::ChannelConfigMono);
+        for (bool swap : {false, true}){
+            AudioInputChoice choice = AudioInputChoice::reinterpreted(AudioFormat(format), AudioFormat(physical), swap);
+            if (!choice.is_reinterpreted()){
+                return "Reinterpreted choice should report is_reinterpreted().";
+            }
+            if (choice.swap_channels() != swap){
+                return "Reinterpreted choice's swap_channels() mismatch.";
+            }
+            if (choice.format().native_format() != format.native_format()
+                || choice.physical_format().native_format() != physical.native_format()){
+                return "Reinterpreted choice should carry the given format / physical format.";
+            }
+        }
+
+        //  Invalid: the default-constructed choice.
+        AudioInputChoice invalid;
+        if (invalid.is_valid() || invalid){
+            return "Default-constructed choice should be invalid.";
+        }
+
+        return true;
+    }
+};
+
+
+
+class InputChoicesSortDedupeTest : public UnitTest{
+public:
+    InputChoicesSortDedupeTest()
+        : UnitTest("AudioInfo - InputChoices_SortDedupe")
+    {}
+
+    virtual UnitTestResult run(Logger&, CancellableScope&) const override{
+        //  Unordered input with a (rate, ch, config) duplicate in a
+        //  different sample format.
+        std::vector<AudioFormat> supported = {
+            make_format(48000, 2, QAudioFormat::ChannelConfig::ChannelConfigStereo),
+            make_format(44100, 2, QAudioFormat::ChannelConfig::ChannelConfigStereo),
+            make_format(48000, 1, QAudioFormat::ChannelConfig::ChannelConfigMono),
+            make_format(48000, 2, QAudioFormat::ChannelConfig::ChannelConfigStereo, QAudioFormat::SampleFormat::Float),
+        };
+        const AudioFormat preferred = make_format(
+            48000, 2, QAudioFormat::ChannelConfig::ChannelConfigStereo, QAudioFormat::SampleFormat::Float
+        );
+
+        AudioInputChoiceList list = input_choices(supported, preferred);
+
+        if (list.choices.size() != 3){
+            return "Expected 3 choices after dedup, got " + std::to_string(list.choices.size()) + ".";
+        }
+        //  Display order: channel count desc, then sample rate desc.
+        if (list.choices[0].display_name() != "2 x 48,000 Hz (Stereo)"
+            || list.choices[1].display_name() != "2 x 44,100 Hz (Stereo)"
+            || list.choices[2].display_name() != "1 x 48,000 Hz (Mono)"){
+            return "Choices are not sorted by channel count desc, then sample rate desc: ["
+                + list.choices[0].display_name() + ", "
+                + list.choices[1].display_name() + ", "
+                + list.choices[2].display_name() + "].";
+        }
+
+        //  The higher quality sample format wins the duplicate collapse.
+        if (list.choices[0].format().sample_format() != AudioSampleFormat::FLOAT32){
+            return "float should beat int16 in the duplicate collapse.";
+        }
+        if (list.preferred_index != 0){
+            return "preferred_index should point at the exact match (48k stereo float, index 0), got "
+                + std::to_string(list.preferred_index) + ".";
+        }
+
+        //  No preferred match: the higher quality sample format still
+        //  wins the collapse, and the fallback score picks the only entry.
+        const AudioFormat preferred_elsewhere = make_format(44100, 1, QAudioFormat::ChannelConfig::ChannelConfigMono);
+        AudioInputChoiceList list2 = input_choices({
+            make_format(48000, 2, QAudioFormat::ChannelConfig::ChannelConfigStereo),
+            make_format(48000, 2, QAudioFormat::ChannelConfig::ChannelConfigStereo, QAudioFormat::SampleFormat::Float),
+        }, preferred_elsewhere);
+        if (list2.choices.size() != 1){
+            return "Expected 1 choice, got " + std::to_string(list2.choices.size()) + ".";
+        }
+        if (list2.choices[0].format().sample_format() != AudioSampleFormat::FLOAT32){
+            return "float should beat int16 in the duplicate collapse regardless of the preferred format.";
+        }
+        if (list2.preferred_index != 0){
+            return "preferred_index should fall back to the only entry without a match.";
+        }
+
+        //  No preferred match: preferred_index falls back to the highest
+        //  quality score, not the first entry. 2ch x 48000 float
+        //  (1.0 x 2.0 x sqrt(48000)) beats 8ch x 48000 float
+        //  (1.0 x 1.875 x sqrt(48000)) and 1ch x 44100 int16
+        //  (0.5 x 1.0 x sqrt(44100)).
+        AudioInputChoiceList list3 = input_choices({
+            make_format(44100, 1, QAudioFormat::ChannelConfig::ChannelConfigMono),
+            make_format(48000, 8, QAudioFormat::ChannelConfig::ChannelConfigSurround7Dot1, QAudioFormat::SampleFormat::Float),
+            make_format(48000, 2, QAudioFormat::ChannelConfig::ChannelConfigStereo, QAudioFormat::SampleFormat::Float),
+        }, make_format(32000, 1, QAudioFormat::ChannelConfig::ChannelConfigMono));
+        if (list3.choices.size() != 3){
+            return "Expected 3 choices, got " + std::to_string(list3.choices.size()) + ".";
+        }
+        if (list3.choices[0].display_name() != "8 x 48,000 Hz (7.1)"
+            || list3.choices[1].display_name() != "2 x 48,000 Hz (Stereo)"
+            || list3.choices[2].display_name() != "1 x 44,100 Hz (Mono)"){
+            return "Choices are not sorted by channel count desc, then sample rate desc: ["
+                + list3.choices[0].display_name() + ", "
+                + list3.choices[1].display_name() + ", "
+                + list3.choices[2].display_name() + "].";
+        }
+        if (list3.preferred_index != 1){
+            return "Without a preferred match, the highest-scoring choice should win (2ch x 48000 float, index 1), got "
+                + std::to_string(list3.preferred_index) + ".";
+        }
+
+        //  The preferred format wins its own shape over a higher quality
+        //  sample format, so the device opens in the format it runs in.
+        const AudioFormat preferred_int16 = make_format(48000, 2, QAudioFormat::ChannelConfig::ChannelConfigStereo);
+        AudioInputChoiceList list4 = input_choices({
+            make_format(48000, 2, QAudioFormat::ChannelConfig::ChannelConfigStereo, QAudioFormat::SampleFormat::Float),
+            preferred_int16,
+            make_format(44100, 2, QAudioFormat::ChannelConfig::ChannelConfigStereo, QAudioFormat::SampleFormat::Int32),
+            make_format(44100, 2, QAudioFormat::ChannelConfig::ChannelConfigStereo, QAudioFormat::SampleFormat::Float),
+        }, preferred_int16);
+        if (list4.choices.size() != 2){
+            return "Expected 2 choices, got " + std::to_string(list4.choices.size()) + ".";
+        }
+        if (list4.choices[0].format().sample_format() != AudioSampleFormat::SINT16){
+            return "The preferred int16 format should beat float for its own shape.";
+        }
+        if (list4.choices[1].format().sample_format() != AudioSampleFormat::FLOAT32){
+            return "Float should still win the other shape's collapse.";
+        }
+        if (list4.preferred_index != 0){
+            return "preferred_index should point at the preferred int16 entry (index 0), got "
+                + std::to_string(list4.preferred_index) + ".";
+        }
+
+        return true;
+    }
+};
+
+
+
+class InputChoicesCardQuirkTest : public UnitTest{
+public:
+    InputChoicesCardQuirkTest()
+        : UnitTest("AudioInfo - InputChoices_CardQuirk")
+    {}
+
+    virtual UnitTestResult run(Logger&, CancellableScope&) const override{
+        const AudioFormat card = make_format(96000, 1, QAudioFormat::ChannelConfig::ChannelConfigMono);
+
+        //  The misreporting card: the only supported format is 1ch x 96000.
+        AudioInputChoiceList list = input_choices({card}, card);
+        if (list.choices.size() != 3){
+            return "Expected 3 choices for a 1ch x 96000-only device, got "
+                + std::to_string(list.choices.size()) + ".";
+        }
+
+        //  [0] The native choice.
+        if (list.choices[0].is_reinterpreted()
+            || list.choices[0].format().native_format() != card.native_format()){
+            return "Choice 0 should be the native 1ch x 96000 entry.";
+        }
+
+        //  [1] / [2] The reinterpretations: the same physical stream read
+        //  as 2ch x 48000 stereo, in the physical sample format, L/R
+        //  first and R/L second.
+        for (size_t i = 1; i <= 2; i++){
+            const AudioInputChoice& choice = list.choices[i];
+            if (!choice.is_reinterpreted() || choice.swap_channels() != (i == 2)){
+                return "Choice " + std::to_string(i) + " should be reinterpreted"
+                    + (i == 2 ? " with swap" : " without swap") + ".";
+            }
+            const QAudioFormat& logical = choice.format().native_format();
+            if (logical.sampleRate() != 48000 || logical.channelCount() != 2
+                || logical.channelConfig() != QAudioFormat::ChannelConfig::ChannelConfigStereo
+                || logical.sampleFormat() != QAudioFormat::SampleFormat::Int16){
+                return "Choice " + std::to_string(i) + " should be 2ch x 48000 stereo in the physical sample format.";
+            }
+            if (choice.physical_format().native_format() != card.native_format()){
+                return "Choice " + std::to_string(i) + "'s physical format should be the 1ch x 96000 entry.";
+            }
+        }
+
+        //  Preferred index: exact match wins; without a match the
+        //  highest-scoring choice.
+        if (list.preferred_index != 0){
+            return "A 1ch x 96000 preferred format should match the native entry (index 0).";
+        }
+        //  No match: the L/R reinterpretation scores highest
+        //  (0.5 x 2.0 x sqrt(48000) > 0.5 x 1.0 x sqrt(96000)), and the
+        //  tie with R/L keeps the earlier index.
+        AudioInputChoiceList bogus = input_choices(
+            {card}, make_format(44100, 2, QAudioFormat::ChannelConfig::ChannelConfigStereo)
+        );
+        if (bogus.preferred_index != 1){
+            return "A non-matching preferred format should fall back to the highest-scoring choice (L/R, index 1), got "
+                + std::to_string(bogus.preferred_index) + ".";
+        }
+        AudioInputChoiceList logical_match = input_choices(
+            {card}, make_format(48000, 2, QAudioFormat::ChannelConfig::ChannelConfigStereo)
+        );
+        if (logical_match.preferred_index != 1){
+            return "A 2ch x 48000 stereo preferred format should match the L/R reinterpretation (index 1).";
+        }
+
+        //  Other supported formats don't hide the reinterpretations: they
+        //  follow the native 1ch x 96000 entry wherever it sorts.
+        AudioInputChoiceList mixed = input_choices({
+            make_format(48000, 1, QAudioFormat::ChannelConfig::ChannelConfigMono),
+            card,
+            make_format(48000, 2, QAudioFormat::ChannelConfig::ChannelConfigStereo),
+        }, card);
+        const std::vector<std::string> mixed_names = {
+            "2 x 48,000 Hz (Stereo)",
+            "1 x 96,000 Hz (Mono)",
+            "2 x 48,000 Hz (Interleaved Stereo L/R)",
+            "2 x 48,000 Hz (Interleaved Stereo R/L)",
+            "1 x 48,000 Hz (Mono)",
+        };
+        if (mixed.choices.size() != mixed_names.size()){
+            return "Expected " + std::to_string(mixed_names.size()) + " choices for a device with other formats, got "
+                + std::to_string(mixed.choices.size()) + ".";
+        }
+        for (size_t i = 0; i < mixed_names.size(); i++){
+            if (mixed.choices[i].display_name() != mixed_names[i]){
+                return "Mixed device choice " + std::to_string(i) + " should be \"" + mixed_names[i]
+                    + "\", got \"" + mixed.choices[i].display_name() + "\".";
+            }
+        }
+        if (mixed.choices[2].physical_format().native_format() != card.native_format()
+            || mixed.choices[3].physical_format().native_format() != card.native_format()){
+            return "The mixed device's reinterpretations should read the 1ch x 96000 entry.";
+        }
+        if (mixed.preferred_index != 1){
+            return "A 1ch x 96000 preferred format should match the mixed device's native entry (index 1), got "
+                + std::to_string(mixed.preferred_index) + ".";
+        }
+
+        //  The card's own sample format wins its shape, and the
+        //  reinterpretations read the stream in it: a 16-bit card stays
+        //  16-bit even when float is listed for the same shape.
+        AudioInputChoiceList int16_card = input_choices({
+            make_format(96000, 1, QAudioFormat::ChannelConfig::ChannelConfigMono, QAudioFormat::SampleFormat::Float),
+            card,
+        }, card);
+        if (int16_card.choices.size() != 3){
+            return "Expected 3 choices for a card listing two sample formats for 1ch x 96000, got "
+                + std::to_string(int16_card.choices.size()) + ".";
+        }
+        for (const AudioInputChoice& choice : int16_card.choices){
+            if (choice.physical_format().sample_format() != AudioSampleFormat::SINT16){
+                return "\"" + choice.display_name() + "\" should open the card in its own 16-bit format.";
+            }
+        }
+
+        //  The rule is specific to 1ch x 96000.
+        if (input_choices(
+            {make_format(44100, 1, QAudioFormat::ChannelConfig::ChannelConfigMono)},
+            make_format(44100, 1, QAudioFormat::ChannelConfig::ChannelConfigMono)
+        ).choices.size() != 1){
+            return "A 1ch x 44100-only device should not get reinterpretation entries.";
+        }
+        if (input_choices(
+            {make_format(48000, 2, QAudioFormat::ChannelConfig::ChannelConfigStereo)},
+            make_format(48000, 2, QAudioFormat::ChannelConfig::ChannelConfigStereo)
+        ).choices.size() != 1){
+            return "A 2ch x 48000-only device should not get reinterpretation entries.";
+        }
+
+        return true;
+    }
+};
+
+
+
+class InputChoicesEmptyTest : public UnitTest{
+public:
+    InputChoicesEmptyTest()
+        : UnitTest("AudioInfo - InputChoices_Empty")
+    {}
+
+    virtual UnitTestResult run(Logger&, CancellableScope&) const override{
+        const AudioFormat preferred = make_format(48000, 2);
+
+        AudioInputChoiceList empty = input_choices({}, preferred);
+        if (!empty.choices.empty() || empty.preferred_index != 0){
+            return "An empty supported list should yield no choices and preferred_index 0.";
+        }
+
+        //  Invalid entries are dropped.
+        QAudioFormat invalid;   //  zero rate / channels / unknown format
+        AudioInputChoiceList invalid_only = input_choices({AudioFormat(invalid)}, preferred);
+        if (!invalid_only.choices.empty()){
+            return "Invalid supported entries should be dropped.";
+        }
+
+        return true;
+    }
+};
+
+
+
+class InputChoiceEqualityTest : public UnitTest{
+public:
+    InputChoiceEqualityTest()
+        : UnitTest("AudioInfo - InputChoice_Equality")
+    {}
+
+    virtual UnitTestResult run(Logger&, CancellableScope&) const override{
+        const AudioFormat stereo_48k = make_format(48000, 2, QAudioFormat::ChannelConfig::ChannelConfigStereo);
+        const AudioFormat stereo_441 = make_format(44100, 2, QAudioFormat::ChannelConfig::ChannelConfigStereo);
+        const AudioFormat mono_96k = make_format(96000, 1, QAudioFormat::ChannelConfig::ChannelConfigMono);
+
+        //  Same shape: equal. Different shape: not equal (symmetric).
+        AudioInputChoice a(stereo_48k);
+        AudioInputChoice b = AudioInputChoice(stereo_48k);
+        AudioInputChoice c(stereo_441);
+        if (!(a == b)){
+            return "Native choices of the same shape should compare equal.";
+        }
+        if (a == c || c == a){
+            return "Choices with different sample rates should not compare equal.";
+        }
+
+        //  Reinterpreted LR vs RL: the swap flag distinguishes them.
+        const AudioInputChoice lr = AudioInputChoice::reinterpreted(AudioFormat(stereo_48k), AudioFormat(mono_96k), false);
+        const AudioInputChoice rl = AudioInputChoice::reinterpreted(AudioFormat(stereo_48k), AudioFormat(mono_96k), true);
+        if (lr == rl){
+            return "Interleaved L/R and R/L choices should not compare equal.";
+        }
+        const AudioInputChoice lr_copy = AudioInputChoice::reinterpreted(AudioFormat(stereo_48k), AudioFormat(mono_96k), false);
+        if (!(lr == lr_copy)){
+            return "Identical reinterpreted choices should compare equal.";
+        }
+        //  A reinterpreted choice is not equal to the native one of the
+        //  same logical shape.
+        if (lr == a){
+            return "A reinterpreted choice should not equal the native choice of the same shape.";
+        }
+
+        //  Invalid choices: equal to each other, not equal to any valid one.
+        AudioInputChoice invalid;
+        if (!(invalid == AudioInputChoice())){
+            return "Two invalid choices should compare equal.";
+        }
+        if (invalid == a || a == invalid){
+            return "An invalid choice should not equal a valid one.";
+        }
+
+        return true;
+    }
+};
+
+
+
+}
+
+
+
+void add_tests_AudioInfo(UnitTestDatabase& database){
+    database.add<InputChoiceNamingTest>();
+    database.add<InputChoiceFlagsTest>();
+    database.add<InputChoicesSortDedupeTest>();
+    database.add<InputChoicesCardQuirkTest>();
+    database.add<InputChoicesEmptyTest>();
+    database.add<InputChoiceEqualityTest>();
+}
+
+
+
+}
diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioInfo_Tests.h b/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioInfo_Tests.h
new file mode 100644
index 0000000000..e4b8a36c55
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioInfo_Tests.h
@@ -0,0 +1,27 @@
+/*  Audio Pipeline - AudioInfo / Input Choice Tests
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_AudioPipeline_AudioInfo_Tests_H
+#define PokemonAutomation_AudioPipeline_AudioInfo_Tests_H
+
+class UnitTestDatabase;
+
+namespace PokemonAutomation{
+
+
+
+//
+//  Registers the tests for AudioInputChoice / input_choices(): the
+//  device-driven input format list (display naming, dedup / sort, the
+//  1ch x 96000 misreporting capture-card reinterpretation, the
+//  preferred-index rules, and choice equality).
+//
+void add_tests_AudioInfo(UnitTestDatabase& database);
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioInputChoice.cpp b/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioInputChoice.cpp
new file mode 100644
index 0000000000..92af60c941
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioInputChoice.cpp
@@ -0,0 +1,302 @@
+/*  Audio Input Choice
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <algorithm>
+#include <cmath>
+#include <limits>
+#include <QAudioFormat>
+#include "Common/Cpp/Containers/Pimpl.tpp"
+#include "Common/Cpp/PrettyPrint.h"
+#include "CommonFramework/AudioPipeline/Backends/NativeAudioFormats.h"
+#include "AudioInputChoice.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+
+
+namespace{
+
+
+//  The semantic content of a QAudioFormat for the input pipeline: rate,
+//  channel count, channel layout, sample format. (Sample size / type /
+//  byte order are derived or irrelevant here.)
+bool audio_format_equal(const QAudioFormat& a, const QAudioFormat& b){
+    return a.sampleRate() == b.sampleRate()
+        && a.channelCount() == b.channelCount()
+        && a.channelConfig() == b.channelConfig()
+        && a.sampleFormat() == b.sampleFormat();
+}
+
+bool audio_format_valid(const QAudioFormat& format){
+    return format.sampleRate() > 0
+        && format.channelCount() > 0
+        && format.sampleFormat() != QAudioFormat::SampleFormat::Unknown;
+}
+
+
+//
+//  The standard layout name for a channel count, when the channel config
+//  is the standard one for that count (or unknown, in which case the
+//  pipeline assumes the standard layout anyway). Mirrors
+//  fallback_channel_config() in ChannelMixer.cpp. Returns "" for
+//  non-standard layouts and channel counts with no standard layout.
+//
+const char* standard_layout_name(size_t channels, QAudioFormat::ChannelConfig config){
+    const QAudioFormat::ChannelConfig standard = standard_channel_config(channels);
+    if (standard == QAudioFormat::ChannelConfigUnknown ||
+        (config != QAudioFormat::ChannelConfigUnknown && config != standard)
+    ){
+        return "";
+    }
+    switch (channels){
+    case 1: return "Mono";
+    case 2: return "Stereo";
+    case 3: return "2.1";
+    case 4: return "3.1";
+    case 5: return "5.0";
+    case 6: return "5.1";
+    case 7: return "7.0";
+    case 8: return "7.1";
+    default: return "";
+    }
+}
+
+
+//  Sample-format quality ranking used to collapse duplicate shapes:
+//  float > int32 > int16 > uint8 (higher wins).
+int choice_type_priority(QAudioFormat::SampleFormat sample_format){
+    switch (sample_format){
+    case QAudioFormat::SampleFormat::Float: return 4;
+    case QAudioFormat::SampleFormat::Int32: return 3;
+    case QAudioFormat::SampleFormat::Int16: return 2;
+    case QAudioFormat::SampleFormat::UInt8: return 1;
+    default: return 0;
+    }
+}
+
+//  Fallback quality score for the choice list, used to pick
+//  preferred_index when the device's preferred format is not among the
+//  choices: score = type x channel x sqrt(rate), with
+//      type:    float 1.0, int32 0.9, int16 0.5, uint8 0.1
+//      channel: 2ch 2.0, Nch 2 - 1/N
+//      rate:    sqrt(rate)
+//  so our usual float stereo 48k / 44.1k shapes rank at the top while
+//  higher quality unusual formats still climb.
+double choice_score(const QAudioFormat& format){
+    double type_score = 0.0;
+    switch (format.sampleFormat()){
+    case QAudioFormat::SampleFormat::Float: type_score = 1.0; break;
+    case QAudioFormat::SampleFormat::Int32: type_score = 0.9; break;
+    case QAudioFormat::SampleFormat::Int16: type_score = 0.5; break;
+    case QAudioFormat::SampleFormat::UInt8: type_score = 0.1; break;
+    default: break;
+    }
+    const int channels = format.channelCount();
+    const double channel_score =
+        (channels == 2) ? 2.0 : 2.0 - 1.0 / static_cast<double>(channels);
+    return type_score * channel_score * std::sqrt(static_cast<double>(format.sampleRate()));
+}
+
+
+//  The reinterpreted 2ch x 48000 view of a physical 1ch x 96000 stream,
+//  in the physical sample format.
+AudioInputChoice reinterpreted_96k_choice(
+    const AudioFormat& physical_96k_mono, bool swap_channels
+){
+    const QAudioFormat& physical = physical_96k_mono.native_format();
+    QAudioFormat logical;
+    //  The channel count must be set before the channel config:
+    //  QAudioFormat::setChannelCount() resets the config.
+    logical.setSampleRate(48000);
+    logical.setSampleFormat(physical.sampleFormat());
+    logical.setChannelCount(2);
+    logical.setChannelConfig(QAudioFormat::ChannelConfig::ChannelConfigStereo);
+    return AudioInputChoice::reinterpreted(
+        AudioFormat(logical), AudioFormat(physical), swap_channels
+    );
+}
+
+
+
+}
+
+
+
+AudioInputChoice::~AudioInputChoice() = default;
+AudioInputChoice::AudioInputChoice(const AudioInputChoice& x) = default;
+AudioInputChoice& AudioInputChoice::operator=(const AudioInputChoice& x) = default;
+
+AudioInputChoice::AudioInputChoice(){}
+AudioInputChoice::AudioInputChoice(AudioFormat format)
+    : m_format(format)
+    , m_physical(format)
+{}
+bool AudioInputChoice::operator==(const AudioInputChoice& x) const{
+    if (is_valid() != x.is_valid()){
+        return false;
+    }
+    if (!is_valid()){
+        return true;
+    }
+    return is_reinterpreted() == x.is_reinterpreted()
+        && swap_channels() == x.swap_channels()
+        && m_format.native_format() == x.m_format.native_format()
+        && m_physical.native_format() == x.m_physical.native_format();
+}
+AudioInputChoice AudioInputChoice::reinterpreted(
+    AudioFormat format, AudioFormat physical, bool swap_channels
+){
+    AudioInputChoice choice;
+    choice.m_format = std::move(format);
+    choice.m_physical = std::move(physical);
+    choice.m_reinterpreted = true;
+    choice.m_swap_channels = swap_channels;
+    return choice;
+}
+bool AudioInputChoice::is_valid() const{
+    return audio_format_valid(m_format.native_format());
+}
+AudioInputChoice::operator bool() const{
+    return is_valid();
+}
+const AudioFormat& AudioInputChoice::format() const{
+    return m_format;
+}
+const AudioFormat& AudioInputChoice::physical_format() const{
+    return m_physical;
+}
+bool AudioInputChoice::is_reinterpreted() const{
+    return m_reinterpreted;
+}
+bool AudioInputChoice::swap_channels() const{
+    return m_swap_channels;
+}
+std::string AudioInputChoice::display_name() const{
+    const QAudioFormat& format = m_format.native_format();
+    if (!audio_format_valid(format)){
+        return "";
+    }
+    std::string name = std::to_string(format.channelCount()) + " x "
+        + tostr_u_commas(format.sampleRate()) + " Hz";
+    std::string layout;
+    if (m_reinterpreted){
+        layout = m_swap_channels ? "Interleaved Stereo R/L" : "Interleaved Stereo L/R";
+    }else{
+        layout = standard_layout_name(
+            (size_t)format.channelCount(),
+            format.channelConfig()
+        );
+    }
+    if (!layout.empty()){
+        name += " (" + layout + ")";
+    }
+    return name;
+}
+
+
+AudioInputChoiceList input_choices(std::vector<AudioFormat> supported, const AudioFormat& preferred){
+    AudioInputChoiceList ret;
+
+    //  1. Drop invalid entries.
+    std::vector<AudioFormat> valid;
+    for (const AudioFormat& format : supported){
+        if (audio_format_valid(format.native_format())){
+            valid.emplace_back(format);
+        }
+    }
+
+    //  2. Collapse duplicates by (rate, channels, channel config). When
+    //  several sample formats are listed for the same shape, "preferred"
+    //  is prioritized. For any other shape the highest quality sample
+    //  format wins: float > int32 > int16 > uint8.
+    auto rank_audio_format = [](const QAudioFormat& format, const QAudioFormat& preferred) -> int{
+        if (audio_format_equal(format, preferred)){
+            return std::numeric_limits<int>::max();
+        }
+        return choice_type_priority(format.sampleFormat());
+    };
+
+    std::vector<AudioFormat> deduped;
+    for (const AudioFormat& format : valid){
+        bool found = false;
+        for (AudioFormat& kept : deduped){
+            const QAudioFormat& k = kept.native_format();
+            const QAudioFormat& f = format.native_format();
+            if (k.sampleRate() == f.sampleRate() &&
+                k.channelCount() == f.channelCount() &&
+                k.channelConfig() == f.channelConfig()
+            ){
+                found = true;
+                if (rank_audio_format(f, preferred.native_format()) > rank_audio_format(k, preferred.native_format())){
+                    kept = format;
+                }
+                break;
+            }
+        }
+        if (!found){
+            deduped.emplace_back(format);
+        }
+    }
+
+    //  3. Sort for display: channel count descending, then sample rate
+    //  descending, then channel config (deterministic tiebreak).
+    std::sort(deduped.begin(), deduped.end(), [](const AudioFormat& a, const AudioFormat& b){
+        const QAudioFormat& x = a.native_format();
+        const QAudioFormat& y = b.native_format();
+        if (x.channelCount() != y.channelCount()){
+            return x.channelCount() > y.channelCount();
+        }
+        if (x.sampleRate() != y.sampleRate()){
+            return x.sampleRate() > y.sampleRate();
+        }
+        return x.channelConfig() < y.channelConfig();
+    });
+
+    //  4. The misreporting capture-card case: 1ch x 96000, which is
+    //  physically two 48 kHz channels interleaved.
+    //  Offer the reinterpretations in addition to the native choice.
+    for (const AudioFormat& format : deduped){
+        ret.choices.emplace_back(format);
+        const QAudioFormat& only = format.native_format();
+        if (only.channelCount() == 1 && only.sampleRate() == 96000){
+            ret.choices.emplace_back(reinterpreted_96k_choice(format, false));
+            ret.choices.emplace_back(reinterpreted_96k_choice(format, true));
+        }
+    }
+
+    //  5. The preferred entry: the exact match of "preferred"; when there
+    //  is no match (preferred invalid or unsupported), the choice with the
+    //  highest quality score, ties keeping the earlier index.
+    ret.preferred_index = 0;
+    bool have_match = false;
+    size_t best_index = 0;
+    double best_score = -1.0;
+    for (size_t i = 0; i < ret.choices.size(); i++){
+        if (audio_format_equal(ret.choices[i].format().native_format(), preferred.native_format())){
+            ret.preferred_index = i;
+            have_match = true;
+            break;
+        }
+        const double score = choice_score(ret.choices[i].format().native_format());
+        if (score > best_score){
+            best_score = score;
+            best_index = i;
+        }
+    }
+    if (!have_match && !ret.choices.empty()){
+        ret.preferred_index = best_index;
+    }
+
+    return ret;
+}
+
+
+
+
+}
diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioInputChoice.h b/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioInputChoice.h
new file mode 100644
index 0000000000..545ab18cd4
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioInputChoice.h
@@ -0,0 +1,87 @@
+/*  Audio Input Choice
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_AudioPipeline_AudioInputChoice_H
+#define PokemonAutomation_AudioPipeline_AudioInputChoice_H
+
+#include <string>
+#include <vector>
+#include "AudioFormat.h"
+
+namespace PokemonAutomation{
+
+
+//
+//  An entry in the audio input format dropdown. It carries the shape the
+//  pipeline consumes ("format") and, for misreporting capture cards, how
+//  that shape relates to what the device physically emits
+//  ("physical_format").
+//
+//  Native choices have physical == format. Some capture
+//  cards only expose a 1ch x 96000 stream although they actually deliver
+//  two 48 kHz channels interleaved; for those, in addition to the native
+//  choice, two reinterpreted choices read the same physical stream as
+//  2ch x 48000: "Interleaved Stereo L/R" (the physical channel order) and
+//  "Interleaved Stereo R/L" (swapped).
+//
+class AudioInputChoice{
+public:
+    ~AudioInputChoice();
+    AudioInputChoice(const AudioInputChoice& x);
+    AudioInputChoice& operator=(const AudioInputChoice& x);
+
+public:
+    AudioInputChoice();                     //  invalid
+    AudioInputChoice(AudioFormat format);   //  native: physical == format
+
+    static AudioInputChoice reinterpreted(
+        AudioFormat format, AudioFormat physical, bool swap_channels
+    );
+
+    bool is_valid() const;
+    explicit operator bool() const;
+
+    bool operator==(const AudioInputChoice& x) const;
+
+    const AudioFormat& format() const;          //  what the pipeline consumes
+    const AudioFormat& physical_format() const; //  what the device emits
+    bool is_reinterpreted() const;
+    bool swap_channels() const;
+
+    std::string display_name() const;
+
+private:
+    AudioFormat m_format;
+    AudioFormat m_physical;
+    bool m_reinterpreted = false;
+    bool m_swap_channels = false;
+};
+
+struct AudioInputChoiceList{
+    std::vector<AudioInputChoice> choices;
+    size_t preferred_index = 0;
+};
+
+//  Builds the input format choices for a device from its supported formats
+//  and its preferred format.
+//
+//  1. Deduplicates formats that has the same shape but only differ in
+//  sample dtype.
+//  2. Sorted by channel count, then sample rate, both descending.
+//  3. A 1ch x 96000 entry is followed by its two reinterpreted stereo
+//     choices, "Interleaved Stereo L/R" then "Interleaved Stereo R/L".
+//  4. `AudioInputChoiceList.preferred_index` is the exact match of
+//     `preferred`, or the highest-scoring choice when nothing matches.
+AudioInputChoiceList input_choices(
+    std::vector<AudioFormat> supported,
+    const AudioFormat& preferred
+);
+
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioOption.cpp b/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioOption.cpp
index 46d198e675..8327b7e48a 100644
--- a/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioOption.cpp
+++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioOption.cpp
@@ -1,24 +1,37 @@
 /*  Audio Selector
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include "Common/Compiler.h"
+#include "Common/Cpp/EnumStringMap.h"
 #include "Common/Cpp/Json/JsonValue.h"
 #include "Common/Cpp/Json/JsonObject.h"
+#include "Sources/AudioSource_Null.h"
+#include "Sources/AudioSource_File.h"
+#include "Sources/AudioSource_Device.h"
 #include "AudioOption.h"
 
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
 namespace PokemonAutomation{
 
 
-const std::string AudioOption::JSON_INPUT_FILE = "InputFile";
-const std::string AudioOption::JSON_INPUT_DEVICE = "InputDevice";
 const std::string AudioOption::JSON_INPUT_FORMAT = "InputFormat";
 const std::string AudioOption::JSON_OUTPUT_DEVICE = "OutputDevice";
 const std::string AudioOption::JSON_AUDIO_VIS = "AudioVisualization";
 const std::string AudioOption::JSON_AUDIO_VOLUME = "Volume";
 
+
+const EnumStringMap<AudioSourceType> AUDIO_TYPE_STRINGS{
+    {AudioSourceType::None,     "InputSource_None"},
+    {AudioSourceType::File,     "InputSource_File"},
+    {AudioSourceType::Device,   "InputSource_Device"},
+};
+
+
 AudioOption::AudioDisplayType AudioOption::stringToAudioDisplayType(const std::string& value){
     if (value == "FREQ_BARS"){
         return AudioDisplayType::FREQ_BARS;
@@ -40,34 +53,76 @@ std::string AudioOption::audioDisplayTypeToString(AudioOption::AudioDisplayType
     }
 }
 
-AudioOption::AudioOption(){}
+AudioOption::AudioOption()
+    : m_input_source(new AudioSourceDescriptor_Null())
+{}
+
+void AudioOption::set_input(std::shared_ptr<AudioSourceDescriptor> descriptor){
+    m_input_cache[descriptor->type] = descriptor;
+    m_input_source = std::move(descriptor);
+}
+std::shared_ptr<AudioSourceDescriptor> AudioOption::get_input_from_cache(AudioSourceType type){
+    auto iter = m_input_cache.find(type);
+    if (iter != m_input_cache.end()){
+        return iter->second;
+    }
+//    cout << "Cache Miss: " << (int)type << endl;
+    std::shared_ptr<AudioSourceDescriptor> descriptor;
+    switch (type){
+    case AudioSourceType::None:
+        descriptor.reset(new AudioSourceDescriptor_Null());
+        break;
+    case AudioSourceType::File:
+        descriptor.reset(new AudioSourceDescriptor_File());
+        break;
+    case AudioSourceType::Device:
+        descriptor.reset(new AudioSourceDescriptor_Device());
+        break;
+    default:;
+        descriptor.reset(new AudioSourceDescriptor_Null());
+    }
+    m_input_cache[descriptor->type] = descriptor;
+    return descriptor;
+}
 
 void AudioOption::load_json(const JsonValue& json){
-    const JsonObject* obj = json.get_object();
+    const JsonObject* obj = json.to_object();
     if (obj == nullptr){
         return;
     }
+
+//    std::unique_ptr<AudioSourceDescriptor> input_source;
+
     const std::string* str;
-    str = obj->get_string(JSON_INPUT_FILE);
-    if (str != nullptr){
-        m_input_file = *str;
-    }
-    if (m_input_file.empty()){
-        str = obj->get_string(JSON_INPUT_DEVICE);
-        if (str != nullptr){
-            m_input_device = AudioDeviceInfo(*str);
+
+    for (const auto& item : AUDIO_TYPE_STRINGS){
+        const JsonValue* params = obj->get_value(AUDIO_TYPE_STRINGS.get_string(item.first));
+        if (params == nullptr){
+            continue;
         }
+        std::shared_ptr<AudioSourceDescriptor> descriptor = get_input_from_cache(item.first);
+        descriptor->load_json(*params);
+        m_input_cache[descriptor->type] = std::move(descriptor);
     }
+
+    str = obj->get_string("InputSourceType");
+    m_input_source = get_input_from_cache(
+        str != nullptr
+            ? AUDIO_TYPE_STRINGS.get_enum(*str, m_input_source->type)
+            : m_input_source->type
+    );
+
+
     str = obj->get_string(JSON_INPUT_FORMAT);
-    if (str != nullptr){
-        for (AudioChannelFormat format : m_input_device.supported_formats()){
-            if (AUDIO_FORMAT_LABELS[(size_t)format] == *str){
-                m_input_format = format;
+    if (str != nullptr && !str->empty()){
+        for (const AudioInputChoice& choice : m_input_source->supported_formats()){
+            if (choice.display_name() == *str){
+                m_input_choice = choice;
                 break;
             }
         }
     }
-//    cout << AUDIO_FORMAT_LABELS[(size_t)m_inputFormat] << endl;
+
     str = obj->get_string(JSON_OUTPUT_DEVICE);
     if (str != nullptr){
         m_output_device = AudioDeviceInfo(*str);
@@ -86,9 +141,14 @@ void AudioOption::load_json(const JsonValue& json){
 
 JsonValue AudioOption::to_json() const{
     JsonObject root;
-    root[JSON_INPUT_FILE] = m_input_file;
-    root[JSON_INPUT_DEVICE] = m_input_device.device_name();
-    root[JSON_INPUT_FORMAT] = AUDIO_FORMAT_LABELS[(size_t)m_input_format];
+
+    root["InputSourceType"] = AUDIO_TYPE_STRINGS.get_string(m_input_source->type);
+
+    for (const auto& item : m_input_cache){
+        root[AUDIO_TYPE_STRINGS.get_string(item.first)] = item.second->to_json();
+    }
+
+    root[JSON_INPUT_FORMAT] = m_input_choice.display_name();
     root[JSON_OUTPUT_DEVICE] = m_output_device.device_name();
     root[JSON_AUDIO_VIS] = audioDisplayTypeToString(m_display_type);
     root[JSON_AUDIO_VOLUME] = m_volume;
diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioOption.h b/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioOption.h
index af0e74cff7..73e002f2a8 100644
--- a/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioOption.h
+++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioOption.h
@@ -1,13 +1,17 @@
 /*  Audio Option
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifndef PokemonAutomation_AudioPipeline_AudioOption_H
 #define PokemonAutomation_AudioPipeline_AudioOption_H
 
-#include "AudioInfo.h"
+#include <memory>
+#include <map>
+#include "CommonFramework/AudioPipeline/Backends/AudioDeviceInfo.h"
+#include "AudioInputChoice.h"
+#include "AudioSourceDescriptor.h"
 
 namespace PokemonAutomation{
 
@@ -20,13 +24,12 @@ class AudioSelectorWidget;
 // TODO: if needed, can add state of FFT parameters (FFT length, sliding
 // window step, etc.) here.
 class AudioOption{
-    static const std::string JSON_INPUT_FILE;
-    static const std::string JSON_INPUT_DEVICE;
     static const std::string JSON_INPUT_FORMAT;
     static const std::string JSON_OUTPUT_DEVICE;
     static const std::string JSON_AUDIO_VIS;
     static const std::string JSON_AUDIO_VOLUME;
 
+
 public:
     enum class AudioDisplayType{
         NO_DISPLAY,
@@ -36,35 +39,40 @@ class AudioOption{
     static AudioDisplayType stringToAudioDisplayType(const std::string& value);
     static std::string audioDisplayTypeToString(AudioDisplayType type);
 
+
 public:
     AudioOption();
 
-    const std::string& input_file() const{ return m_input_file; }
-    const AudioDeviceInfo& input_device() const{ return m_input_device; }
-    AudioChannelFormat input_format() const{ return m_input_format; }
+    std::shared_ptr<AudioSourceDescriptor> input_source() const{ return m_input_source; }
+    AudioInputChoice input_choice() const{ return m_input_choice; }
+
+    //  Use a cache to help create a VideoSoruceDescriptor.
+    //  The cache remembers the last used descriptor for each interface type. That way when
+    //  the user switches back-and-forth between two interfaces, it will reload the previous
+    //  one and return faster.
+    //  If not found in cache, it will create a new one according to the type.
+    void set_input(std::shared_ptr<AudioSourceDescriptor> descriptor);
+    std::shared_ptr<AudioSourceDescriptor> get_input_from_cache(AudioSourceType type);
 
     const AudioDeviceInfo& output_device() const{ return m_output_device; }
     AudioDisplayType display_type() const{ return m_display_type; }
     double volume() const{ return m_volume; }
 
-//    void set_input_file(std::string&& value){ m_input_file = std::move(value); }
-//    void set_input_device(AudioDeviceInfo&& value){ m_input_device = std::move(value); }
-//    void set_input_format(AudioChannelFormat value){ m_input_format = value; }
-//    void set_output_device(AudioDeviceInfo&& value){ m_output_device = std::move(value); }
-//    void set_volume(double value){ m_volume = value; }
-//    void set_display_type(AudioDisplayType value){ m_display_type = value; }
 
 public:
     void load_json(const JsonValue& json);
     JsonValue to_json() const;
 
+
 private:
     friend class AudioSession;
-    std::string m_input_file;
-    AudioDeviceInfo m_input_device;
-    AudioChannelFormat m_input_format = AudioChannelFormat::NONE;
+
+    std::shared_ptr<AudioSourceDescriptor> m_input_source;
+    std::map<AudioSourceType, std::shared_ptr<AudioSourceDescriptor>> m_input_cache;
+
+    AudioInputChoice m_input_choice;
     AudioDeviceInfo m_output_device;
-    AudioDisplayType m_display_type = AudioDisplayType::NO_DISPLAY;
+    AudioDisplayType m_display_type = AudioDisplayType::FREQ_BARS;
     double m_volume = 1.0;  //  Volume Range: [0, 1.0]
 };
 
diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioPassthroughPair.h b/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioPassthroughPair.h
index 57e8d24745..d6345345c8 100644
--- a/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioPassthroughPair.h
+++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioPassthroughPair.h
@@ -1,23 +1,33 @@
 /*  Audio Passthrough Pair
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifndef PokemonAutomation_AudioPipeline_AudioPassthroughPair_H
 #define PokemonAutomation_AudioPipeline_AudioPassthroughPair_H
 
-#include "AudioInfo.h"
+#include "AudioFormat.h"
+#include "AudioSourceDescriptor.h"
 
 namespace PokemonAutomation{
 
 struct FFTListener;
+class AudioDeviceInfo;
+class AudioInputChoice;
+
+namespace Kernels{
+namespace AudioPipeline{
+class WorkingAudioStreamListener;
+}
+}
 
 
 //  Represents an audio source/sink pair where audio is passed through from
 //  source -> sink with minimal latency.
 //
-//  If desired, listeners can be attached to receive the FFT spectrums.
+//  If desired, listeners can be attached to receive the FFT spectrums, or to
+//  receive the working audio stream converted to a requested shape.
 //
 //  This class is fully thread-safe. Both source and sink can be changed
 //  asynchronously. Listeners can be attached/detached asynchronously.
@@ -27,21 +37,30 @@ class AudioPassthroughPair{
     virtual void add_listener(FFTListener& listener) = 0;
     virtual void remove_listener(FFTListener& listener) = 0;
 
+    //  Attach a listener that receives the working audio stream converted to
+    //  "format" (sample rate + channel count; the channel layout in
+    //  format.native_format() drives the channel mixing). The pair builds a
+    //  conversion node per listener; the listener receives planar float
+    //  samples in the requested shape, with the input volume applied.
+    //  Re-adding a listener (e.g. with a new format) rebuilds its node.
+    virtual void add_listener(const AudioFormat& format, Kernels::AudioPipeline::WorkingAudioStreamListener& listener) = 0;
+    virtual void remove_listener(Kernels::AudioPipeline::WorkingAudioStreamListener& listener) = 0;
+
 public:
     virtual ~AudioPassthroughPair() = default;
 
     virtual void reset(
-        const std::string& file,
-        const AudioDeviceInfo& output, double output_volume
-    ) = 0;
-    virtual void reset(
-        const AudioDeviceInfo& input, AudioChannelFormat format,
-        const AudioDeviceInfo& output, double output_volume
+        const std::shared_ptr<AudioSourceDescriptor>& descriptor,
+        const AudioInputChoice& format,
+        const AudioDeviceInfo& output,
+        double output_volume
     ) = 0;
 
     virtual void clear_audio_source() = 0;
-    virtual void set_audio_source(const std::string& file) = 0;
-    virtual void set_audio_source(const AudioDeviceInfo& device, AudioChannelFormat format) = 0;
+    virtual void set_audio_source(
+        const std::shared_ptr<AudioSourceDescriptor>& descriptor,
+        const AudioInputChoice& format
+    ) = 0;
 
     virtual void clear_audio_sink() = 0;
     virtual void set_audio_sink(const AudioDeviceInfo& device, double volume) = 0;
diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioPipelineOptions.h b/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioPipelineOptions.h
new file mode 100644
index 0000000000..5f4a889b8c
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioPipelineOptions.h
@@ -0,0 +1,81 @@
+/*  Audio Pipeline Options
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_AudioPipeline_AudioPipelineOptions_H
+#define PokemonAutomation_AudioPipeline_AudioPipelineOptions_H
+
+#include "Common/Cpp/Options/GroupOption.h"
+#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "Common/Cpp/Options/FloatingPointOption.h"
+#include "CommonFramework/StaticGlobals.h"
+
+namespace PokemonAutomation{
+
+
+class AudioPipelineOptions : public GroupOption{
+public:
+    AudioPipelineOptions()
+        : GroupOption(
+            "Audio Pipeline",
+            LockMode::LOCK_WHILE_RUNNING,
+            GroupOption::EnableMode::ALWAYS_ENABLED,
+            true,
+            false
+        )
+        , FILE_VOLUME_SCALE(
+            "<b>Audio File Input Volume Scale:</b><br>"
+            "Multiply audio file playback by this factor. (This is linear scale. So each factor of 10 is 20dB.)",
+            LockMode::UNLOCK_WHILE_RUNNING,
+            0.31622776601683793320, //  -10dB
+            -10000, 10000
+        )
+        , DEVICE_VOLUME_SCALE(
+            "<b>Audio Device Input Volume Scale:</b><br>"
+            "Multiply audio device input by this factor. (This is linear scale. So each factor of 10 is 20dB.)",
+            LockMode::UNLOCK_WHILE_RUNNING,
+            1.0, -10000, 10000
+        )
+        , USE_KAISER_WINDOW(
+            "<b>Use Kaiser Window:</b><br>"
+            "Use Kaiser Window for FFTs.",
+            LockMode::UNLOCK_WHILE_RUNNING,
+            true
+        )
+        , SHOW_RECORD_FREQUENCIES(
+            "<b>Show Record Frequencies:</b><br>"
+            "Show option to record audio frequencies.",
+            LockMode::UNLOCK_WHILE_RUNNING,
+            false
+        )
+        , AUTO_RESET_SECONDS(
+            "<b>Audio Auto-Reset:</b><br>"
+            "Attempt to reset the audio if this many seconds has elapsed since the last audio frame (in order to fix issues with RDP disconnection, etc).",
+            LockMode::UNLOCK_WHILE_RUNNING,
+            5
+        )
+    {
+        PA_ADD_OPTION(FILE_VOLUME_SCALE);
+        PA_ADD_OPTION(DEVICE_VOLUME_SCALE);
+        PA_ADD_OPTION(USE_KAISER_WINDOW);
+        if (STATIC_GLOBALS.DEVELOPER_MODE){
+            PA_ADD_OPTION(SHOW_RECORD_FREQUENCIES);
+        }
+        PA_ADD_OPTION(AUTO_RESET_SECONDS);
+    }
+
+public:
+    FloatingPointOption FILE_VOLUME_SCALE;
+    FloatingPointOption DEVICE_VOLUME_SCALE;
+    BooleanCheckBoxOption USE_KAISER_WINDOW;
+    BooleanCheckBoxOption SHOW_RECORD_FREQUENCIES;
+    SimpleIntegerOption<uint8_t> AUTO_RESET_SECONDS;
+};
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioSession.cpp b/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioSession.cpp
index 4ced546c6c..5fe04838f0 100644
--- a/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioSession.cpp
+++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioSession.cpp
@@ -1,13 +1,15 @@
 /*  Audio Session
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include "Common/Cpp/AbstractLogger.h"
+#include "Common/Cpp/Logging/AbstractLogger.h"
 #include "CommonFramework/GlobalServices.h"
 #include "CommonFramework/GlobalSettingsPanel.h"
 #include "Backends/AudioPassthroughPairQtThread.h"
+#include "Sources/AudioSource_Null.h"
+#include "AudioPipelineOptions.h"
 #include "AudioSession.h"
 
 //#include <iostream>
@@ -21,13 +23,19 @@ namespace PokemonAutomation{
 
 
 
-void AudioSession::add_ui_listener(Listener& listener){
-    std::lock_guard<std::mutex> lg(m_lock);
-    m_listeners.insert(&listener);
+void AudioSession::add_state_listener(StateListener& listener){
+    m_listeners.add(listener);
 }
-void AudioSession::remove_ui_listener(Listener& listener){
-    std::lock_guard<std::mutex> lg(m_lock);
-    m_listeners.erase(&listener);
+void AudioSession::remove_state_listener(StateListener& listener){
+    m_listeners.remove(listener);
+}
+void AudioSession::add_working_stream_listener(
+    const AudioFormat& format, WorkingAudioStreamListener& listener
+){
+    m_devices->add_listener(format, listener);
+}
+void AudioSession::remove_working_stream_listener(WorkingAudioStreamListener& listener){
+    m_devices->remove_listener(listener);
 }
 void AudioSession::add_spectrum_listener(AudioSpectrumHolder::Listener& listener){
     m_spectrum_holder.add_listener(listener);
@@ -45,7 +53,11 @@ AudioSession::AudioSession(Logger& logger, AudioOption& option)
 {
     AudioSession::reset();
     m_devices->add_listener(*this);
-    global_watchdog().add(*this, std::chrono::seconds(5));
+
+    uint8_t watchdog_timeout = GlobalSettings::instance().AUDIO_PIPELINE->AUTO_RESET_SECONDS;
+    if (watchdog_timeout != 0){
+        global_watchdog().add(*this, std::chrono::seconds(watchdog_timeout));
+    }
 }
 AudioSession::~AudioSession(){
     global_watchdog().remove(*this);
@@ -53,194 +65,166 @@ AudioSession::~AudioSession(){
 }
 
 
-void AudioSession::get(AudioOption& option){
-    std::lock_guard<std::mutex> lg(m_lock);
-    option.m_input_file     = m_option.m_input_file;
-    option.m_input_device   = m_option.m_input_device;
-    option.m_input_format   = m_option.m_input_format;
-    option.m_output_device  = m_option.m_output_device;
-    option.m_volume         = m_option.m_volume;
-    option.m_display_type   = m_option.m_display_type;
-}
-void AudioSession::set(const AudioOption& option){
-    std::lock_guard<std::mutex> lg(m_lock);
-    m_option.m_input_file       = option.m_input_file;
-    m_option.m_input_device     = option.m_input_device;
-    m_option.m_input_format     = option.m_input_format;
-    m_option.m_output_device    = option.m_output_device;
-    m_option.m_volume           = option.m_volume;
-    m_option.m_display_type     = option.m_display_type;
-
-    if (!m_option.m_input_file.empty()){
-        sanitize_format();
-        m_devices->set_audio_source(m_option.m_input_file);
-    }else if (sanitize_format()){
-        m_devices->set_audio_source(m_option.m_input_device, m_option.m_input_format);
-    }else{
-        m_devices->clear_audio_source();
-    }
-
-    m_devices->set_audio_sink(m_option.m_output_device, m_option.m_volume);
+void AudioSession::save(AudioOption& option) const{
+    std::lock_guard<Mutex> lg(m_lock);
+    option = m_option;
+}
+void AudioSession::load(const AudioOption& option){
+    {
+        std::lock_guard<Mutex> lg(m_lock);
+        signal_pre_input_change();
+
+        m_option = option;
+
+        if (sanitize_choice()){
+            m_devices->set_audio_source(
+                m_option.m_input_source,
+                m_option.m_input_choice
+            );
+        }else{
+            m_devices->clear_audio_source();
+        }
 
-    push_input_changed();
-    push_output_changed();
-    for (Listener* listener : m_listeners){
-        listener->volume_changed(m_option.volume());
-        listener->display_changed(m_option.m_display_type);
+        m_devices->set_audio_sink(m_option.m_output_device, m_option.m_volume);
     }
+
+    signal_post_input_change();
+    signal_post_output_change();
+    m_listeners.run_method(&StateListener::post_volume_change, m_option.volume());
+    m_listeners.run_method(&StateListener::post_display_change, m_option.m_display_type);
 }
-std::pair<std::string, AudioDeviceInfo> AudioSession::input_device() const{
-    std::lock_guard<std::mutex> lg(m_lock);
-    return {m_option.input_file(), m_option.m_input_device};
+std::shared_ptr<AudioSourceDescriptor> AudioSession::input_source() const{
+    std::lock_guard<Mutex> lg(m_lock);
+    return m_option.input_source();
 }
-AudioChannelFormat AudioSession::input_format() const{
-    std::lock_guard<std::mutex> lg(m_lock);
-    return m_option.m_input_format;
+AudioInputChoice AudioSession::input_choice() const{
+    std::lock_guard<Mutex> lg(m_lock);
+    return m_option.m_input_choice;
 }
 AudioDeviceInfo AudioSession::output_device() const{
-    std::lock_guard<std::mutex> lg(m_lock);
+    std::lock_guard<Mutex> lg(m_lock);
     return m_option.m_output_device;
 }
 double AudioSession::output_volume() const{
-    std::lock_guard<std::mutex> lg(m_lock);
+    std::lock_guard<Mutex> lg(m_lock);
     return m_option.m_volume;
 }
 AudioOption::AudioDisplayType AudioSession::display_type() const{
-    std::lock_guard<std::mutex> lg(m_lock);
+    std::lock_guard<Mutex> lg(m_lock);
     return m_option.m_display_type;
 }
 
 
 void AudioSession::clear_audio_input(){
-    std::lock_guard<std::mutex> lg(m_lock);
-    m_logger.log("Clearing audio input...");
-    m_spectrum_holder.clear();
-    m_devices->clear_audio_source();
-    m_option.m_input_file.clear();
-    m_option.m_input_device = AudioDeviceInfo();
-    push_input_changed();
-}
-void AudioSession::set_audio_input(std::string file){
-    std::lock_guard<std::mutex> lg(m_lock);
-    m_option.m_input_file = std::move(file);
-    sanitize_format();
-    m_devices->set_audio_source(m_option.m_input_file);
-    push_input_changed();
-}
-void AudioSession::set_audio_input(AudioDeviceInfo info){
-    std::lock_guard<std::mutex> lg(m_lock);
-    m_logger.log("Setting audio input to: " + info.display_name());
-    m_option.m_input_file.clear();
-    m_option.m_input_device = std::move(info);
-    m_option.m_input_format = AudioChannelFormat::NONE;
-    if (sanitize_format()){
-        m_devices->set_audio_source(info, m_option.m_input_format);
+    set_audio_input(std::make_unique<AudioSourceDescriptor_Null>());
+}
+void AudioSession::set_audio_input(const std::shared_ptr<AudioSourceDescriptor>& source){
+    std::lock_guard<Mutex> lg(m_lock);
+    m_logger.log("Setting audio input to: " + source->display_name());
+    signal_pre_input_change();
+
+//    cout << "set_audio_input(): " << (int)source->type << endl;
+
+    m_option.set_input(source);
+    m_option.m_input_source = source;
+    m_option.m_input_choice = AudioInputChoice();
+
+    if (source->sanitize_desired_format(m_logger, m_option.m_input_choice)){
+        m_devices->set_audio_source(source, m_option.m_input_choice);
     }else{
         m_devices->clear_audio_source();
     }
-    push_input_changed();
-}
-void AudioSession::set_format(AudioChannelFormat format){
-    std::lock_guard<std::mutex> lg(m_lock);
-    m_option.m_input_format = format;
-    if (sanitize_format()){
-        if (!m_option.m_input_file.empty()){
-            m_devices->set_audio_source(m_option.m_input_file);
-        }else{
-            m_devices->set_audio_source(m_option.m_input_device, m_option.m_input_format);
-        }
+
+    signal_post_input_change();
+
+    //  We need to do this at the end.
+    //  The previous line "signal_post_input_change()" is what will shut off the
+    //  audio stream. If we clear the history before that, a race condition can
+    //  add another spectrum to the history before the stream actually stops.
+    //  When this happens, we will be left with a non-empty history which will
+    //  be displayed as a non-moving freq-bars or spectrum instead of black.
+    m_spectrum_holder.clear();
+}
+void AudioSession::set_input_choice(const AudioInputChoice& choice){
+    std::lock_guard<Mutex> lg(m_lock);
+    signal_pre_input_change();
+    m_option.m_input_choice = choice;
+    if (sanitize_choice()){
+        m_devices->set_audio_source(
+            m_option.m_input_source,
+            m_option.m_input_choice
+        );
     }else{
         m_devices->clear_audio_source();
     }
-    push_input_changed();
+    signal_post_input_change();
 }
 void AudioSession::clear_audio_output(){
-    std::lock_guard<std::mutex> lg(m_lock);
+    std::lock_guard<Mutex> lg(m_lock);
     m_logger.log("Clearing audio output...");
     m_devices->clear_audio_sink();
     m_option.m_output_device = AudioDeviceInfo();
-    push_output_changed();
+    signal_post_output_change();
 }
 void AudioSession::set_audio_output(AudioDeviceInfo info){
-    std::lock_guard<std::mutex> lg(m_lock);
+    std::lock_guard<Mutex> lg(m_lock);
     m_logger.log("Setting audio output to: " + info.display_name());
     m_devices->set_audio_sink(info, m_option.m_volume);
     m_option.m_output_device = std::move(info);
-    push_output_changed();
+    signal_post_output_change();
 }
 void AudioSession::set_volume(double volume){
-    std::lock_guard<std::mutex> lg(m_lock);
-    m_devices->set_sink_volume(volume);
-    m_option.m_volume = volume;
-    for (Listener* listener : m_listeners){
-        listener->volume_changed(m_option.volume());
+    {
+        std::lock_guard<Mutex> lg(m_lock);
+        if (m_option.m_volume == volume){
+            return;
+        }
+        m_devices->set_sink_volume(volume);
+        m_option.m_volume = volume;
     }
+    m_listeners.run_method(&StateListener::post_volume_change, m_option.volume());
 }
 void AudioSession::set_display(AudioOption::AudioDisplayType display){
-    std::lock_guard<std::mutex> lg(m_lock);
-    m_option.m_display_type = display;
-    for (Listener* listener : m_listeners){
-        listener->display_changed(m_option.m_display_type);
+    {
+        std::lock_guard<Mutex> lg(m_lock);
+        if (m_option.m_display_type == display){
+            return;
+        }
+        m_option.m_display_type = display;
     }
+    m_listeners.run_method(&StateListener::post_display_change, m_option.m_display_type);
 }
 
-bool AudioSession::sanitize_format(){
-    if (!m_option.m_input_file.empty()){
-        m_option.m_input_format = AudioChannelFormat::NONE;
-        return true;
-    }
-    AudioDeviceInfo& info = m_option.m_input_device;
-    const std::vector<AudioChannelFormat>& supported_formats = info.supported_formats();
-    int preferred_index = info.preferred_format_index();
-    if (supported_formats.empty() || preferred_index < 0){
-//        cout << "supported_formats = " << supported_formats.size() << endl;
-//        cout << "preferred_index = " << preferred_index << endl;
-        m_logger.log("No supported formats for this input device.", COLOR_RED);
-        m_option.m_input_format = AudioChannelFormat::NONE;
-        return false;
-    }
-    if (m_option.m_input_format == AudioChannelFormat::NONE){
-        m_logger.log("No format set. Resetting to default...", COLOR_ORANGE);
-    }else{
-        for (AudioChannelFormat supported_format : supported_formats){
-            if (m_option.m_input_format == supported_format){
-                return true;
-            }
-        }
-        m_logger.log("Desired format not supported. Resetting to default...", COLOR_RED);
-    }
-    m_option.m_input_format = supported_formats[preferred_index];
-    return true;
+bool AudioSession::sanitize_choice(){
+    return m_option.m_input_source &&
+        m_option.m_input_source->sanitize_desired_format(m_logger, m_option.m_input_choice);
 }
-void AudioSession::push_input_changed(){
-    for (Listener* listener : m_listeners){
-        listener->input_changed(m_option.input_file(), m_option.input_device(), m_option.input_format());
-    }
+void AudioSession::signal_pre_input_change(){
+    m_listeners.run_method(&StateListener::pre_input_change);
 }
-void AudioSession::push_output_changed(){
-    for (Listener* listener : m_listeners){
-        listener->output_changed(m_option.output_device());
-    }
+void AudioSession::signal_post_input_change(){
+    m_listeners.run_method(
+        &StateListener::post_input_change,
+        m_option.m_input_source,
+        m_option.m_input_choice
+    );
+}
+void AudioSession::signal_post_output_change(){
+    m_listeners.run_method(&StateListener::post_output_change, m_option.output_device());
 }
 
 
 
 void AudioSession::reset(){
-    std::lock_guard<std::mutex> lg(m_lock);
+    std::lock_guard<Mutex> lg(m_lock);
     m_logger.log("AudioSession::reset()");
-    if (!m_option.m_input_file.empty()){
-//        cout << "AudioSession::reset() - file: " << m_option.m_input_file << " - " << m_option.m_input_file.size() << endl;
-        m_devices->reset(
-            m_option.m_input_file,
-            m_option.m_output_device, m_option.m_volume
-        );
-    }else{
-//        cout << "AudioSession::reset() - device: " << m_option.m_inputDevice.display_name() << endl;
-        m_devices->reset(
-            m_option.m_input_device, m_option.m_input_format,
-            m_option.m_output_device, m_option.m_volume
-        );
-    }
+    signal_pre_input_change();
+    m_devices->reset(
+        m_option.m_input_source,
+        m_option.m_input_choice,
+        m_option.m_output_device, m_option.m_volume
+    );
+    signal_post_input_change();
 }
 std::vector<AudioSpectrum> AudioSession::spectrums_since(uint64_t starting_seqnum){
     return m_spectrum_holder.spectrums_since(starting_seqnum);
@@ -253,18 +237,22 @@ void AudioSession::add_overlay(uint64_t starting_seqnum, size_t end_seqnum, Colo
 }
 
 
-void AudioSession::on_fft(size_t sample_rate, std::shared_ptr<AlignedVector<float>> fft_output){
+void AudioSession::on_fft(size_t sample_rate, std::shared_ptr<const AlignedVector<float>> fft_output){
     m_spectrum_holder.push_spectrum(sample_rate, std::move(fft_output));
     global_watchdog().delay(*this);
 }
 void AudioSession::on_watchdog_timeout(){
 //    m_logger.log("AudioSession::on_watchdog_timeout()", COLOR_RED);
-    if (m_option.m_input_file.empty() && !m_option.m_input_device){
+    if (m_option.m_input_source == nullptr ||
+        m_option.m_input_source->type == AudioSourceType::None
+    ){
         return;
     }
-    m_logger.log("No audio detected for 5 seconds...", COLOR_RED);
 
-    if (!GlobalSettings::instance().ENABLE_AUTO_RESET_AUDIO){
+    uint8_t watchdog_timeout = GlobalSettings::instance().AUDIO_PIPELINE->AUTO_RESET_SECONDS;
+    m_logger.log("No audio detected for " + std::to_string(watchdog_timeout) + " seconds...", COLOR_RED);
+
+    if (watchdog_timeout == 0){
         return;
     }
     m_logger.log("Resetting the audio...", COLOR_GREEN);
diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioSession.h b/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioSession.h
index 23d3af6e25..fc274b3b7d 100644
--- a/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioSession.h
+++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioSession.h
@@ -1,6 +1,6 @@
 /*  Audio Session
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  *      AudioSession represents a live audio session. It holds onto the audio
  *  input/output sessions which can be asynchronously set at any time.
@@ -16,11 +16,12 @@
 #ifndef PokemonAutomation_AudioPipeline_AudioSession_H
 #define PokemonAutomation_AudioPipeline_AudioSession_H
 
+#include "Common/Cpp/ListenerSet.h"
 #include "Common/Cpp/Concurrency/Watchdog.h"
-#include "AudioFeed.h"
-#include "AudioPassthroughPair.h"
 #include "Spectrum/FFTStreamer.h"
 #include "Spectrum/AudioSpectrumHolder.h"
+#include "AudioFeed.h"
+#include "AudioPassthroughPair.h"
 #include "AudioOption.h"
 
 namespace PokemonAutomation{
@@ -30,14 +31,26 @@ class Logger;
 
 class AudioSession final : public AudioFeed, private FFTListener, private WatchdogCallback{
 public:
-    struct Listener{
-        virtual void input_changed(const std::string& file, const AudioDeviceInfo& device, AudioChannelFormat format){}
-        virtual void output_changed(const AudioDeviceInfo& device){}
-        virtual void volume_changed(double volume){}
-        virtual void display_changed(AudioOption::AudioDisplayType display){}
+    using WorkingAudioStreamListener = Kernels::AudioPipeline::WorkingAudioStreamListener;
+
+    struct StateListener{
+        virtual void pre_input_change(){}
+        virtual void post_input_change(
+            const std::shared_ptr<const AudioSourceDescriptor>& source,
+            const AudioInputChoice& choice
+        ){}
+        virtual void post_output_change(const AudioDeviceInfo& device){}
+        virtual void post_volume_change(double volume){}
+        virtual void post_display_change(AudioOption::AudioDisplayType display){}
     };
-    void add_ui_listener(Listener& listener);
-    void remove_ui_listener(Listener& listener);
+    void add_state_listener(StateListener& listener);
+    void remove_state_listener(StateListener& listener);
+
+    //  Attach a listener that receives the working audio stream (float)
+    //  converted to the requested format. See AudioPassthroughPair.
+    void add_working_stream_listener(const AudioFormat& format, WorkingAudioStreamListener& listener);
+    void remove_working_stream_listener(WorkingAudioStreamListener& listener);
+
     void add_spectrum_listener(AudioSpectrumHolder::Listener& listener);
     void remove_spectrum_listener(AudioSpectrumHolder::Listener& listener);
 
@@ -46,11 +59,13 @@ class AudioSession final : public AudioFeed, private FFTListener, private Watchd
     ~AudioSession();
     AudioSession(Logger& logger, AudioOption& option);
 
-    void get(AudioOption& option);
-    void set(const AudioOption& option);
+    void save(AudioOption& option) const;
+    void load(const AudioOption& option);
+
+    Logger& logger(){ return m_logger; }
 
-    std::pair<std::string, AudioDeviceInfo> input_device() const;
-    AudioChannelFormat input_format() const;
+    std::shared_ptr<AudioSourceDescriptor> input_source() const;
+    AudioInputChoice input_choice() const;
 
     AudioDeviceInfo output_device() const;
     double output_volume() const;
@@ -59,9 +74,8 @@ class AudioSession final : public AudioFeed, private FFTListener, private Watchd
     AudioSpectrumHolder& spectrums(){ return m_spectrum_holder; }
 
     void clear_audio_input();
-    void set_audio_input(std::string file);
-    void set_audio_input(AudioDeviceInfo info);
-    void set_format(AudioChannelFormat format);
+    void set_audio_input(const std::shared_ptr<AudioSourceDescriptor>& source);
+    void set_input_choice(const AudioInputChoice& choice);
 
     void clear_audio_output();
     void set_audio_output(AudioDeviceInfo info);
@@ -77,12 +91,14 @@ class AudioSession final : public AudioFeed, private FFTListener, private Watchd
 
 
 private:
-    virtual void on_fft(size_t sample_rate, std::shared_ptr<AlignedVector<float>> fft_output) override;
+    virtual void on_fft(size_t sample_rate, std::shared_ptr<const AlignedVector<float>> fft_output) override;
     virtual void on_watchdog_timeout() override;
 
-    bool sanitize_format();
-    void push_input_changed();
-    void push_output_changed();
+    bool sanitize_choice();
+
+    void signal_pre_input_change();
+    void signal_post_input_change();
+    void signal_post_output_change();
 
 
 private:
@@ -91,8 +107,10 @@ class AudioSession final : public AudioFeed, private FFTListener, private Watchd
     AudioSpectrumHolder m_spectrum_holder;
     std::unique_ptr<AudioPassthroughPair> m_devices;
 
-    mutable std::mutex m_lock;
-    std::set<Listener*> m_listeners;
+    mutable Mutex m_lock;
+
+    ListenerSet<StateListener> m_listeners;
+
 };
 
 
diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioSource.h b/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioSource.h
new file mode 100644
index 0000000000..fb1c1fa48c
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioSource.h
@@ -0,0 +1,53 @@
+/*  Audio Source
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *      AudioSource represents an audio input stream. Once constructed, it
+ *  emits the raw frame-aligned stream to its RawAudioStreamListener
+ *  children (root of the pipeline tree).
+ *
+ */
+
+#ifndef PokemonAutomation_AudioPipeline_AudioSource_H
+#define PokemonAutomation_AudioPipeline_AudioSource_H
+
+#include "CommonFramework/AudioPipeline/AudioFormat.h"
+
+namespace PokemonAutomation{
+namespace Kernels{
+namespace AudioPipeline{
+    class RawAudioStreamListener;
+    class WorkingAudioStreamListener;
+}
+}
+
+
+class AudioSource{
+public:
+    virtual ~AudioSource() = default;
+
+
+public:
+    using RawAudioStreamListener = Kernels::AudioPipeline::RawAudioStreamListener;
+    using WorkingAudioStreamListener = Kernels::AudioPipeline::WorkingAudioStreamListener;
+
+    virtual void add_raw_listener(RawAudioStreamListener& listener) = 0;
+    virtual void remove_raw_listener(RawAudioStreamListener& listener) = 0;
+
+
+public:
+    //  Raw stream (pre-conversion) access. The raw stream is the source's
+    //  native frame-aligned output, before the pipeline tree applies any
+    //  conversion (resample / mix / sample-type / volume).
+    virtual AudioSampleFormat raw_sample_format() const = 0;
+
+    virtual size_t raw_sample_rate() const = 0;
+    virtual size_t raw_channels() const = 0;
+
+    virtual float volume_multiplier() const = 0;
+};
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioSourceDescriptor.cpp b/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioSourceDescriptor.cpp
new file mode 100644
index 0000000000..b93dba79a8
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioSourceDescriptor.cpp
@@ -0,0 +1,16 @@
+/*  Audio Source Descriptor
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+
+namespace PokemonAutomation{
+
+
+
+
+
+
+
+}
diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioSourceDescriptor.h b/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioSourceDescriptor.h
new file mode 100644
index 0000000000..ab68a25345
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioSourceDescriptor.h
@@ -0,0 +1,71 @@
+/*  Audio Source Descriptor
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_AudioPipeline_AudioSourceDescriptor_H
+#define PokemonAutomation_AudioPipeline_AudioSourceDescriptor_H
+
+#include <memory>
+#include <string>
+#include <vector>
+
+namespace PokemonAutomation{
+
+class Logger;
+class JsonValue;
+class AudioSource;
+class AudioInputChoice;
+
+
+
+enum class AudioSourceType{
+    None,
+    File,
+    Device,
+};
+
+
+class AudioSourceDescriptor{
+public:
+    const AudioSourceType type;
+
+    AudioSourceDescriptor(AudioSourceType p_type)
+        : type(p_type)
+    {}
+    virtual ~AudioSourceDescriptor() = default;
+
+public:
+    virtual bool should_reload() const{ return false; }
+    virtual bool operator==(const AudioSourceDescriptor& x) const = 0;
+    virtual std::string display_name() const = 0;
+
+    virtual std::vector<AudioInputChoice> supported_formats() const = 0;
+    virtual bool sanitize_desired_format(Logger& logger, AudioInputChoice& format) const = 0;
+
+public:
+    //  After user selects a new video source on the UI, call this function to
+    //  do some optional additional stuff, e.g. open a file selection dialog
+    //  box to continue user interaction.
+    virtual void run_post_select(){};
+    virtual JsonValue to_json() const = 0;
+    virtual void load_json(const JsonValue& json) = 0;
+
+public:
+    virtual std::unique_ptr<AudioSource> make_AudioSource(
+        Logger& logger,
+        const AudioInputChoice& format
+    ) const = 0;
+};
+
+
+
+
+
+
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioStream.cpp b/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioStream.cpp
deleted file mode 100644
index 486875eb5b..0000000000
--- a/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioStream.cpp
+++ /dev/null
@@ -1,206 +0,0 @@
-/*  Audio Source Reader
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Cpp/Exceptions.h"
-#include "Common/Cpp/Containers/AlignedVector.tpp"
-#include "Kernels/AudioStreamConversion/AudioStreamConversion.h"
-#include "Kernels/AbsFFT/Kernels_AbsFFT.h"
-#include "AudioConstants.h"
-#include "AudioStream.h"
-
-#include <iostream>
-using std::cout;
-using std::endl;
-
-namespace PokemonAutomation{
-
-
-//  Audio buffer size (measured in frames).
-const size_t AUDIO_BUFFER_SIZE = 4096;
-
-
-
-size_t sample_size(AudioSampleFormat format){
-    switch (format){
-    case AudioSampleFormat::UINT8:
-        return sizeof(uint8_t);
-    case AudioSampleFormat::SINT16:
-        return sizeof(int16_t);
-    case AudioSampleFormat::SINT32:
-        return sizeof(int32_t);
-    case AudioSampleFormat::FLOAT32:
-        return sizeof(float);
-    default:
-        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Invalid AudioSampleFormat: " + std::to_string((size_t)format));
-    }
-}
-
-
-
-void AudioStreamToFloat::add_listener(AudioFloatStreamListener& listener){
-    if (listener.samples_per_frame != m_samples_per_frame){
-        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Mismatching frame size.");
-    }
-    m_listeners.insert(&listener);
-}
-void AudioStreamToFloat::remove_listener(AudioFloatStreamListener& listener){
-    m_listeners.erase(&listener);
-}
-
-AudioStreamToFloat::~AudioStreamToFloat(){
-    MisalignedStreamConverter::remove_listener(*this);
-}
-AudioStreamToFloat::AudioStreamToFloat(
-    AudioSampleFormat input_format,
-    size_t samples_per_frame,
-    float volume_multiplier,
-    bool reverse_channels
-)
-    : MisalignedStreamConverter(
-        sample_size(input_format) * samples_per_frame,
-        sizeof(float) * samples_per_frame,
-        AUDIO_BUFFER_SIZE
-    )
-    , StreamListener(sizeof(float) * samples_per_frame)
-    , m_format(input_format)
-    , m_samples_per_frame(samples_per_frame)
-    , m_volume_multiplier(volume_multiplier)
-    , m_reverse_channels(reverse_channels)
-    , m_sample_size(sample_size(input_format))
-    , m_frame_size(m_sample_size * samples_per_frame)
-{
-    if (samples_per_frame == 0){
-        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Must have at least one sample.");
-    }
-    if (reverse_channels && samples_per_frame != 2){
-        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Reverse channels only works with 2 samples/frame.");
-    }
-    MisalignedStreamConverter::add_listener(*this);
-}
-void AudioStreamToFloat::on_objects(const void* data, size_t objects){
-    for (AudioFloatStreamListener* listener : m_listeners){
-        listener->on_samples((const float*)data, objects);
-    }
-}
-void AudioStreamToFloat::convert(void* out, const void* in, size_t count){
-    switch (m_format){
-    case AudioSampleFormat::UINT8:
-        Kernels::AudioStreamConversion::convert_audio_uint8_to_float(
-            (float*)out, (const uint8_t*)in, count * m_samples_per_frame, m_volume_multiplier
-        );
-        break;
-    case AudioSampleFormat::SINT16:
-        Kernels::AudioStreamConversion::convert_audio_sint16_to_float(
-            (float*)out, (const int16_t*)in, count * m_samples_per_frame, m_volume_multiplier
-        );
-        break;
-    case AudioSampleFormat::SINT32:
-        Kernels::AudioStreamConversion::convert_audio_sint32_to_float(
-            (float*)out, (const int32_t*)in, count * m_samples_per_frame, m_volume_multiplier
-        );
-        break;
-    case AudioSampleFormat::FLOAT32:
-        if (m_volume_multiplier == 1.0){
-            memcpy(out, in, count * m_frame_size);
-        }else{
-            float volume_multiplier = m_volume_multiplier;
-            float* o = (float*)out;
-            const float* i = (float*)in;
-            size_t stop = count * m_samples_per_frame;
-            for (size_t c = 0; c < stop; c++){
-                o[c] = i[c] * volume_multiplier;
-            }
-        }
-        break;
-    case AudioSampleFormat::INVALID:
-        break;
-    }
-    if (m_reverse_channels){
-        float* ptr = (float*)out;
-        for (size_t c = 0; c < count; c++){
-            float r0 = ptr[2*c + 0];
-            float r1 = ptr[2*c + 1];
-            ptr[2*c + 0] = r1;
-            ptr[2*c + 1] = r0;
-        }
-    }
-}
-
-
-
-
-void AudioFloatToStream::add_listener(StreamListener& listener){
-    if (listener.object_size != m_frame_size){
-        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Mismatching frame size.");
-    }
-    m_listeners.insert(&listener);
-}
-void AudioFloatToStream::remove_listener(StreamListener& listener){
-    m_listeners.erase(&listener);
-}
-
-AudioFloatToStream::AudioFloatToStream(AudioSampleFormat output_format, size_t samples_per_frame)
-    : AudioFloatStreamListener(samples_per_frame)
-    , m_format(output_format)
-    , m_samples_per_frame(samples_per_frame)
-    , m_sample_size(sample_size(output_format))
-    , m_frame_size(m_sample_size * samples_per_frame)
-    , m_buffer_size(AUDIO_BUFFER_SIZE)
-{
-    switch (output_format){
-    case AudioSampleFormat::INVALID:
-    case AudioSampleFormat::FLOAT32:
-        break;
-    default:
-        m_buffer = AlignedVector<char>(m_frame_size * m_buffer_size);
-    }
-}
-AudioFloatToStream::~AudioFloatToStream(){}
-void AudioFloatToStream::on_samples(const float* data, size_t frames){
-    if (m_format == AudioSampleFormat::INVALID){
-        return;
-    }
-    if (m_format == AudioSampleFormat::FLOAT32){
-        for (StreamListener* listener : m_listeners){
-            listener->on_objects(data, frames);
-        }
-        return;
-    }
-
-    while (frames > 0){
-        size_t block = std::min(frames, m_buffer_size);
-        switch (m_format){
-        case AudioSampleFormat::UINT8:
-            Kernels::AudioStreamConversion::convert_audio_float_to_uint8((uint8_t*)m_buffer.data(), data, block * m_samples_per_frame);
-            break;
-        case AudioSampleFormat::SINT16:
-            Kernels::AudioStreamConversion::convert_audio_float_to_sint16((int16_t*)m_buffer.data(), data, block * m_samples_per_frame);
-            break;
-        case AudioSampleFormat::SINT32:
-            Kernels::AudioStreamConversion::convert_audio_float_to_sint32((int32_t*)m_buffer.data(), data, block * m_samples_per_frame);
-            break;
-        case AudioSampleFormat::FLOAT32:
-            memcpy(m_buffer.data(), data, block * m_frame_size);
-            break;
-        default:
-            return;
-        }
-        for (StreamListener* listener : m_listeners){
-            listener->on_objects(m_buffer.data(), block);
-        }
-        data = (const float*)((const char*)data + block * m_frame_size);
-        frames -= block;
-    }
-}
-
-
-
-
-
-
-
-
-}
diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioStream.h b/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioStream.h
deleted file mode 100644
index 7a13339305..0000000000
--- a/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioStream.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/*  Audio Source Reader
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_AudioPipeline_AudioSourceReader_H
-#define PokemonAutomation_AudioPipeline_AudioSourceReader_H
-
-#include <memory>
-#include "Common/Cpp/StreamConverters.h"
-#include "Common/Cpp/Containers/AlignedVector.h"
-#include "AudioInfo.h"
-
-namespace PokemonAutomation{
-
-
-struct AudioFloatStreamListener{
-    AudioFloatStreamListener(size_t p_samples_per_frame)
-        : samples_per_frame(p_samples_per_frame)
-    {}
-    virtual ~AudioFloatStreamListener() = default;
-    virtual void on_samples(const float* data, size_t frames) = 0;
-
-    const size_t samples_per_frame;
-};
-
-
-
-//  Convert a stream of raw audio and output to aligned frames of float samples.
-class AudioStreamToFloat : private MisalignedStreamConverter, private StreamListener{
-public:
-    void add_listener(AudioFloatStreamListener& listener);
-    void remove_listener(AudioFloatStreamListener& listener);
-
-public:
-    AudioStreamToFloat(
-        AudioSampleFormat input_format,
-        size_t samples_per_frame,   //  Typically the # of channels. Can be higher if you want to group more into each frame.
-        float volume_multiplier,    //  Multiply every sample by this constant.
-        bool reverse_channels       //  Only valid if "samples_per_frame == 2".
-    );
-    virtual ~AudioStreamToFloat();
-
-    using MisalignedStreamConverter::push_bytes;
-
-private:
-    virtual void on_objects(const void* data, size_t objects) override;
-    virtual void convert(void* out, const void* in, size_t count) override;
-
-private:
-    AudioSampleFormat m_format;
-    size_t m_samples_per_frame;
-    float m_volume_multiplier;
-    bool m_reverse_channels;
-    size_t m_sample_size;
-    size_t m_frame_size;
-    std::set<AudioFloatStreamListener*> m_listeners;
-};
-
-
-
-//  Convert a stream of float samples to raw audio.
-class AudioFloatToStream : public AudioFloatStreamListener{
-public:
-    void add_listener(StreamListener& listener);
-    void remove_listener(StreamListener& listener);
-
-public:
-    AudioFloatToStream(AudioSampleFormat output_format, size_t samples_per_frame);
-    virtual ~AudioFloatToStream();
-    virtual void on_samples(const float* data, size_t frames) override;
-
-private:
-    AudioSampleFormat m_format;
-    size_t m_samples_per_frame;
-    size_t m_sample_size;
-    size_t m_frame_size;
-    size_t m_buffer_size;
-    AlignedVector<char> m_buffer;
-    std::set<StreamListener*> m_listeners;
-};
-
-
-
-}
-#endif
diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioTemplate.cpp b/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioTemplate.cpp
index 858dd357f3..b96d7d55b4 100644
--- a/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioTemplate.cpp
+++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioTemplate.cpp
@@ -1,18 +1,22 @@
 /*  Audio Template
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include <sstream>
 #include "Common/Cpp/Containers/AlignedVector.tpp"
-#include "CommonFramework/Logging/Logger.h"
+#include "Common/Qt/GlobalThreadPoolsQt.h"
 #include "Kernels/Kernels_Alignment.h"
+#include "Kernels/KaiserWindow/Kernels_KaiserWindow.h"
 #include "Kernels/AbsFFT/Kernels_AbsFFT.h"
-#include "AudioConstants.h"
-#include "AudioTemplate.h"
+#include "CommonFramework/GlobalSettingsPanel.h"
+#include "CommonFramework/Logging/Logger.h"
+#include "CommonFramework/AudioPipeline/AudioPipelineOptions.h"
 #include "Tools/AudioFormatUtils.h"
 #include "IO/AudioFileLoader.h"
+#include "AudioConstants.h"
+#include "AudioTemplate.h"
 
 //#include <iostream>
 //using std::cout;
@@ -29,68 +33,82 @@ AudioTemplate& AudioTemplate::operator=(const AudioTemplate&) = default;
 
 AudioTemplate::AudioTemplate(){}
 AudioTemplate::AudioTemplate(size_t frequencies, size_t windows)
-    : m_numWindows(windows)
-    , m_numFrequencies(frequencies)
+    : m_num_windows(windows)
+    , m_num_frequencies(frequencies)
     , m_bytes_per_spectrum(Kernels::align_int_up<PA_ALIGNMENT>(frequencies * sizeof(float)))
     , m_spectrogram(windows * (m_bytes_per_spectrum / sizeof(float)))
 {}
 
 
-AudioTemplate loadAudioTemplate(const std::string& filename, size_t sample_rate){
-    QAudioFormat outputAudioFormat;
-    outputAudioFormat.setChannelCount(1);
-#if QT_VERSION_MAJOR == 5
-    outputAudioFormat.setCodec("audio/pcm");
-#endif
-    outputAudioFormat.setSampleRate((int)sample_rate);
-    setSampleFormatToFloat(outputAudioFormat);
-    
-    AudioFileLoader loader(nullptr, filename, outputAudioFormat);
-    const auto ret = loader.loadFullAudio();
-    const float* data = reinterpret_cast<const float*>(std::get<0>(ret));
-    size_t numSamples = std::get<1>(ret) / sizeof(float);
-//    cout << "numSamples = " << numSamples << endl;
-    
-    if (data == nullptr){
-        return AudioTemplate();
-    }
-
-    size_t numFrequencies = NUM_FFT_SAMPLES / 2;
-    AlignedVector<float> input_buffer(NUM_FFT_SAMPLES);
-    AlignedVector<float> output_buffer(numFrequencies);
+AudioTemplate load_audio_template(const std::string& filename, size_t sample_rate){
+    QAudioFormat output_audio_format;
+    output_audio_format.setChannelCount(1);
+    output_audio_format.setSampleRate((int)sample_rate);
+    set_sample_format_to_float(output_audio_format);
 
-    size_t numWindows = 0;
     AudioTemplate audio_template;
 
-    // If sample count < FFT input requirement, we pad zeros in the end to do one FFT.
-    // Otherwise, we don't pad zeros and compute FFT as much as possible using fixed
-    // window step.
-    if (numSamples < NUM_FFT_SAMPLES){
-        numWindows = 1;
-        audio_template = AudioTemplate(numFrequencies, 1);
-
-        memset(input_buffer.data(), 0, sizeof(float) * NUM_FFT_SAMPLES);
-        memcpy(input_buffer.data(), data, sizeof(float) * numSamples);
-        Kernels::AbsFFT::fft_abs(FFT_LENGTH_POWER_OF_TWO, output_buffer.data(), input_buffer.data());
-        memcpy(audio_template.getWindow(0), output_buffer.data(), sizeof(float) * numFrequencies);
-    }else{
-        numWindows = (numSamples - NUM_FFT_SAMPLES) / FFT_SLIDING_WINDOW_STEP + 1;
-        audio_template = AudioTemplate(numFrequencies, numWindows);
-
-        for (size_t i = 0, start = 0; start+NUM_FFT_SAMPLES <= numSamples; i++, start += FFT_SLIDING_WINDOW_STEP){
-            assert(i < numWindows);
-            memcpy(input_buffer.data(), data + start, sizeof(float) * NUM_FFT_SAMPLES);
-            Kernels::AbsFFT::fft_abs(FFT_LENGTH_POWER_OF_TWO, output_buffer.data(), input_buffer.data());
-            memcpy(audio_template.getWindow(i), output_buffer.data(), sizeof(float) * numFrequencies);
+    GlobalThreadPools::qt_worker_threadpool().run_and_wait([&]{
+        AudioFileLoader loader(nullptr, filename, output_audio_format);
+        const auto ret = loader.load_full_audio();
+        const float* data = reinterpret_cast<const float*>(std::get<0>(ret));
+        size_t num_samples = std::get<1>(ret) / sizeof(float);
+    //    cout << "num_samples = " << num_samples << endl;
+
+        if (data == nullptr){
+            return;
         }
-    }
 
+        size_t num_frequencies = NUM_FFT_SAMPLES / 2;
+        AlignedVector<float> input_buffer(NUM_FFT_SAMPLES);
+        AlignedVector<float> output_buffer(num_frequencies);
+
+        size_t num_windows = 0;
+
+        const float* kaiser_weights = GlobalSettings::instance().AUDIO_PIPELINE->USE_KAISER_WINDOW
+            ? Kernels::KaiserWindow::get_kaiser_window_k(FFT_LENGTH_POWER_OF_TWO)
+            : nullptr;
+
+        // If sample count < FFT input requirement, we pad zeros in the end to do one FFT.
+        // Otherwise, we don't pad zeros and compute FFT as much as possible using fixed
+        // window step.
+        if (num_samples < NUM_FFT_SAMPLES){
+            num_windows = 1;
+            audio_template = AudioTemplate(num_frequencies, 1);
+
+            memset(input_buffer.data(), 0, sizeof(float) * NUM_FFT_SAMPLES);
+            memcpy(input_buffer.data(), data, sizeof(float) * num_samples);
+            Kernels::AbsFFT::fft_abs(
+                FFT_LENGTH_POWER_OF_TWO,
+                output_buffer.data(),
+                input_buffer.data(),
+                kaiser_weights
+            );
+            memcpy(audio_template.get_window(0), output_buffer.data(), sizeof(float) * num_frequencies);
+        }else{
+            num_windows = (num_samples - NUM_FFT_SAMPLES) / FFT_SLIDING_WINDOW_STEP + 1;
+            audio_template = AudioTemplate(num_frequencies, num_windows);
+
+            for (size_t i = 0, start = 0; start+NUM_FFT_SAMPLES <= num_samples; i++, start += FFT_SLIDING_WINDOW_STEP){
+                assert(i < num_windows);
+                memcpy(input_buffer.data(), data + start, sizeof(float) * NUM_FFT_SAMPLES);
+                Kernels::AbsFFT::fft_abs(
+                    FFT_LENGTH_POWER_OF_TWO,
+                    output_buffer.data(),
+                    input_buffer.data(),
+                    kaiser_weights
+                );
+                memcpy(audio_template.get_window(i), output_buffer.data(), sizeof(float) * num_frequencies);
+            }
+        }
 
-    std::stringstream ss;
-    ss << "Built audio template with sample rate " << sample_rate << ", " << numWindows << " windows and " << numFrequencies <<
-        " frequencies from " << filename;
-    global_logger_tagged().log(ss.str());
 
+        std::stringstream ss;
+        ss << "Built audio template with sample rate " << sample_rate << ", " << num_windows << " windows and " << num_frequencies <<
+            " frequencies from " << filename;
+        global_logger_tagged().log(ss.str());
+    });
+    
     return audio_template;
 }
 
diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioTemplate.h b/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioTemplate.h
index ec3ed59aec..0705b2b271 100644
--- a/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioTemplate.h
+++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/AudioTemplate.h
@@ -1,6 +1,6 @@
 /*  Audio Template
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -29,32 +29,32 @@ class AudioTemplate{
     AudioTemplate();
     AudioTemplate(size_t frequencies, size_t windows);
 
-    size_t numWindows() const{ return m_numWindows; }
-    size_t numFrequencies() const{ return m_numFrequencies; }
+    size_t num_windows() const{ return m_num_windows; }
+    size_t num_frequencies() const{ return m_num_frequencies; }
 
     //  Size of the buffer that holds this template.
-    //  This is "numFrequencies()", rounded up to the SIMD size.
-    size_t bufferSize() const{ return m_spectrogram.size(); }
+    //  This is "num_frequencies()", rounded up to the SIMD size.
+    size_t buffer_size() const{ return m_spectrogram.size(); }
 
-    const float* getWindow(size_t windowIndex) const{
-        return (const float*)((const char*)m_spectrogram.data() + windowIndex * m_bytes_per_spectrum);
+    const float* get_window(size_t window_index) const{
+        return (const float*)((const char*)m_spectrogram.data() + window_index * m_bytes_per_spectrum);
     }
-    float* getWindow(size_t windowIndex){
-        return (float*)((char*)m_spectrogram.data() + windowIndex * m_bytes_per_spectrum);
+    float* get_window(size_t window_index){
+        return (float*)((char*)m_spectrogram.data() + window_index * m_bytes_per_spectrum);
     }
 
-//    void scale(float s) { for(auto& v: m_spectrogram) v *= s; }
+//    void scale(float s){ for (auto& v: m_spectrogram) v *= s; }
 
 private:
-    size_t m_numWindows = 0;
-    size_t m_numFrequencies = 0;
+    size_t m_num_windows = 0;
+    size_t m_num_frequencies = 0;
     size_t m_bytes_per_spectrum;
     AlignedVector<float> m_spectrogram;
 };
 
 // Load AudioTemplate from disk. Accept .wav format on any OS.
 // Loading .mp3 format however is dependent on Qt's platform-dependent backend.
-AudioTemplate loadAudioTemplate(const std::string& filename, size_t sample_rate = 48000);
+AudioTemplate load_audio_template(const std::string& filename, size_t sample_rate = 48000);
 
 
 
diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/Backends/AudioDeviceInfo.cpp b/SerialPrograms/Source/CommonFramework/AudioPipeline/Backends/AudioDeviceInfo.cpp
new file mode 100644
index 0000000000..d9bb087bfb
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/Backends/AudioDeviceInfo.cpp
@@ -0,0 +1,230 @@
+/*  Audio Device Info
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <QAudioDevice>
+#include <QMediaDevices>
+#include "Common/Cpp/Containers/Pimpl.tpp"
+#include "Common/Cpp/PrettyPrint.h"
+#include "Common/Cpp/Time.h"
+#include "CommonFramework/AudioPipeline/AudioInputChoice.h"
+#include "CommonFramework/AudioPipeline/Backends/NativeAudioFormats.h"
+#include "CommonFramework/Logging/Logger.h"
+#include "CommonFramework/Options/DeviceDropdownAliases.h"
+#include "AudioDeviceInfo.h"
+
+namespace PokemonAutomation{
+
+
+namespace{
+
+
+//  A format for the log: its display name and sample format, e.g.
+//  "1 x 96,000 Hz (Mono) Int16".
+std::string format_to_log_str(const AudioFormat& format){
+    std::string str = AudioInputChoice(format).display_name();
+    switch (format.native_format().sampleFormat()){
+    case QAudioFormat::SampleFormat::UInt8: return str + " UInt8";
+    case QAudioFormat::SampleFormat::Int16: return str + " Int16";
+    case QAudioFormat::SampleFormat::Int32: return str + " Int32";
+    case QAudioFormat::SampleFormat::Float: return str + " Float";
+    default: return str;
+    }
+}
+
+
+//  One line for the log listing a device's input formats, e.g.
+//  "MiraBox Capture: input formats: 1 x 96,000 Hz (Mono) Int16. Current: 1 x 96,000 Hz (Mono) Int16."
+std::string native_formats_to_str(
+    const std::string& audio_source_display_name,
+    const std::vector<AudioFormat>& source_native_formats,
+    const AudioFormat& current
+){
+    std::string str = audio_source_display_name + ": input formats: ";
+    for (size_t i = 0; i < source_native_formats.size(); i++){
+        str += (i == 0 ? "" : ", ") + format_to_log_str(source_native_formats[i]);
+    }
+    str += ". Current: " + format_to_log_str(current) + ".";
+    return str;
+}
+
+
+//  Build the input format choices for a device.
+//  If the device is a Mirabox, set the preferred index to be 1x96k interpreted as interleaved 2x48k R/L.
+AudioInputChoiceList build_input_choices(
+    const NativeAudioInfo& info,
+    const std::string& display_name
+){
+    // Get native audio formats
+    NativeAudioFormats native = native_input_formats(info);
+    global_logger_tagged().log(native_formats_to_str(display_name, native.formats, native.current));
+
+    //  Build input choice list:
+    //  Note A 1ch x 96000 entry will be appened by its two reinterpreted stereo
+    //  choices, "Interleaved Stereo L/R" then "Interleaved Stereo R/L".
+    AudioInputChoiceList ret = input_choices(std::move(native.formats), native.current);
+
+    //  A capture card that runs in 1ch x 96000 is really sending two
+    //  48 kHz channels interleaved, so the sensible default is a stereo
+    //  reading of it: R/L for MiraBox, whose physical channel order is
+    //  reversed, and L/R for other cards.
+    const QAudioFormat& running = native.current.native_format();
+    if (running.channelCount() == 1 && running.sampleRate() == 96000){
+        const bool swap = display_name.find("MiraBox") != std::string::npos;
+        for (size_t i = 0; i < ret.choices.size(); i++){
+            if (ret.choices[i].is_reinterpreted() &&
+                ret.choices[i].swap_channels() == swap
+            ){
+                ret.preferred_index = i;
+                break;
+            }
+        }
+    }
+
+    return ret;
+}
+
+
+std::string format_to_str(const QAudioFormat& format){
+    std::string str;
+    str += "Preferred Format:\n";
+    str += "    Channels: " + std::to_string(format.channelCount()) + "\n";
+    str += "    Sample Rate: " + std::to_string(format.sampleRate()) + "\n";
+    str += "    Sample Format: " + std::to_string(format.sampleFormat()) + "\n";
+    return str;
+}
+
+
+
+}
+
+
+
+
+struct AudioDeviceInfo::Data{
+    std::string device_name;    //  For serialization
+    std::string display_name;
+
+    std::vector<AudioInputChoice> supported_choices;
+    size_t preferred_choice_index = 0;
+
+    QAudioDevice info;
+};
+std::vector<AudioDeviceInfo> AudioDeviceInfo::all_input_devices(){
+    std::vector<AudioDeviceInfo> list;
+
+    WallClock start = current_time();
+
+    for (NativeAudioInfo& device : QMediaDevices::audioInputs()){
+        list.emplace_back();
+        Data& data = *list.back().m_body;
+
+        data.device_name = device.id().toStdString();
+        data.display_name = device.description().toStdString();
+        data.info = std::move(device);
+
+        {
+            AudioInputChoiceList choices =
+                build_input_choices(data.info, data.display_name);
+            data.supported_choices = std::move(choices.choices);
+            data.preferred_choice_index = choices.preferred_index;
+        }
+    }
+
+    WallClock end = current_time();
+    double seconds = std::chrono::duration_cast<std::chrono::milliseconds>(end - start).count() / 1000.;
+    global_logger_tagged().log(
+        "Done querying audio inputs... " + tostr_fixed(seconds, 3) + " seconds",
+        COLOR_CYAN
+    );
+
+    return list;
+}
+std::vector<AudioDeviceInfo> AudioDeviceInfo::all_output_devices(){
+    std::vector<AudioDeviceInfo> list;
+
+    for (NativeAudioInfo& device : QMediaDevices::audioOutputs()){
+        list.emplace_back();
+        Data& data = *list.back().m_body;
+
+        std::string name = device.description().toStdString();
+
+        std::string str = name + "\n";
+        str += format_to_str(device.preferredFormat());
+        global_logger_tagged().log(str);
+
+        data.device_name = device.id().toStdString();
+        data.display_name = std::move(name);
+        data.info = std::move(device);
+    }
+
+    return list;
+}
+
+
+AudioDeviceInfo::~AudioDeviceInfo(){}
+AudioDeviceInfo::AudioDeviceInfo(const AudioDeviceInfo& x) = default;
+void AudioDeviceInfo::operator=(const AudioDeviceInfo& x){
+    m_body = x.m_body;
+}
+
+AudioDeviceInfo::AudioDeviceInfo()
+    : m_body(CONSTRUCT_TOKEN)
+{}
+
+AudioDeviceInfo::AudioDeviceInfo(const std::string& device_name){
+    for (AudioDeviceInfo& info : all_input_devices()){
+        if (device_name == info.device_name()){
+            *this = std::move(info);
+            return;
+        }
+    }
+    for (AudioDeviceInfo& info : all_output_devices()){
+        if (device_name == info.device_name()){
+            *this = std::move(info);
+            return;
+        }
+    }
+    m_body.reset();
+}
+
+AudioDeviceInfo::operator bool() const{
+    return m_body && !m_body->device_name.empty();
+}
+std::string AudioDeviceInfo::display_name() const{
+    if (!*this){
+        return std::string();
+    }
+    if (auto alias = device_dropdown_name(DeviceAliasType::AUDIO, m_body->device_name)){
+        return *alias;
+    }
+    return m_body->display_name;
+}
+const std::string& AudioDeviceInfo::original_name() const{
+    return m_body->display_name;
+}
+const std::string& AudioDeviceInfo::device_name() const{
+    return m_body->device_name;
+}
+const std::vector<AudioInputChoice>& AudioDeviceInfo::supported_choices() const{
+    return m_body->supported_choices;
+}
+size_t AudioDeviceInfo::preferred_choice_index() const{
+    return m_body->preferred_choice_index;
+}
+const NativeAudioInfo& AudioDeviceInfo::native_info() const{
+    return m_body->info;
+}
+bool AudioDeviceInfo::operator==(const AudioDeviceInfo& info) const{
+    return device_name() == info.device_name();
+}
+
+
+
+
+
+
+
+}
diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/Backends/AudioDeviceInfo.h b/SerialPrograms/Source/CommonFramework/AudioPipeline/Backends/AudioDeviceInfo.h
new file mode 100644
index 0000000000..7d6ef0bf92
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/Backends/AudioDeviceInfo.h
@@ -0,0 +1,57 @@
+/*  Audio Device Info
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_AudioPipeline_Backends_AudioDeviceInfo_H
+#define PokemonAutomation_AudioPipeline_Backends_AudioDeviceInfo_H
+
+#include <string>
+#include <vector>
+#include "CommonFramework/AudioPipeline/AudioFormat.h"
+#include "CommonFramework/AudioPipeline/AudioInputChoice.h"
+
+namespace PokemonAutomation{
+
+
+class AudioDeviceInfo{
+public:
+    ~AudioDeviceInfo();
+    AudioDeviceInfo(const AudioDeviceInfo& x);
+    void operator=(const AudioDeviceInfo& x);
+
+public:
+    AudioDeviceInfo();
+    explicit AudioDeviceInfo(const std::string& device_name);
+
+    explicit operator bool() const;
+
+    std::string display_name() const;
+    const std::string& original_name() const;
+    const std::string& device_name() const;
+
+    //  The device-driven format list (see input_choices()). Populated for
+    //  input devices only; empty for output devices (the sink opens in its
+    //  native format).
+    const std::vector<AudioInputChoice>& supported_choices() const;
+    size_t preferred_choice_index() const;
+
+    const NativeAudioInfo& native_info() const;
+
+    bool operator==(const AudioDeviceInfo& info) const;
+
+    static std::vector<AudioDeviceInfo> all_input_devices();
+    static std::vector<AudioDeviceInfo> all_output_devices();
+
+private:
+    struct Data;
+    Pimpl<Data> m_body;
+};
+
+
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/Backends/AudioPassthroughPairQt.cpp b/SerialPrograms/Source/CommonFramework/AudioPipeline/Backends/AudioPassthroughPairQt.cpp
index 0d27324e9b..4bb1f84370 100644
--- a/SerialPrograms/Source/CommonFramework/AudioPipeline/Backends/AudioPassthroughPairQt.cpp
+++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/Backends/AudioPassthroughPairQt.cpp
@@ -1,80 +1,145 @@
 /*  Audio Passthrough Pair (Qt)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-//#include "Common/Cpp/Exceptions.h"
+#include <QAudioFormat>
+#include "Common/Cpp/Exceptions.h"
+#include "Common/Cpp/Containers/Pimpl.tpp"
+#include "Common/Cpp/Logging/AbstractLogger.h"
+#include "Common/Cpp/PrettyPrint.h"
+#include "Kernels/AudioPipeline/Kernels_RawAudio2WorkingAudio.h"
+#include "Kernels/AudioPipeline/Kernels_WorkingAudio2RawAudio.h"
+#include "Kernels/AudioPipeline/Kernels_WorkingAudio2WorkingAudio.h"
 #include "CommonFramework/GlobalSettingsPanel.h"
-//#include "CommonFramework/AudioPipeline/AudioConstants.h"
-//#include "CommonFramework/AudioPipeline/Tools/AudioFormatUtils.h"
-#include "CommonFramework/AudioPipeline/IO/AudioSource.h"
-#include "CommonFramework/AudioPipeline/IO/AudioSink.h"
+#include "CommonFramework/AudioPipeline/Tools/AudioFormatUtils.h"
+#include "CommonFramework/AudioPipeline/Tools/ChannelMixer.h"
+#include "CommonFramework/AudioPipeline/AudioSource.h"
+#include "CommonFramework/AudioPipeline/IO/AudioOutputDevice.h"
 #include "CommonFramework/AudioPipeline/Spectrum/FFTStreamer.h"
 #include "AudioPassthroughPairQt.h"
 
-#include <iostream>
-using std::cout;
-using std::endl;
+//#include <iostream>
+//using std::cout;
+//using std::endl;
 
 namespace PokemonAutomation{
 
 
+namespace{
 
-void AudioPassthroughPairQt::add_listener(FFTListener& listener){
-    SpinLockGuard lg(m_lock);
-    m_listeners.insert(&listener);
+
+//  QAudioFormat with a channel count and, for 1 and 2 channels, the
+//  standard layout (mono, stereo L+R). For more channels the config is
+//  left unknown: resolve_positions() then falls back to the standard
+//  layout for that count (2.1, 3.1, 5.0, 5.1, 7.0, 7.1). Enough for
+//  build_channel_mixer_matrix(). (Setting a channel config also resets
+//  the channel count in Qt, so the count goes first and the config is
+//  only set where it matches the count.)
+QAudioFormat channel_format(size_t channels){
+    QAudioFormat format;
+    format.setChannelCount((int)channels);
+    if (channels <= 2){
+        format.setChannelConfig(
+            channels == 1
+                ? QAudioFormat::ChannelConfig::ChannelConfigMono
+                : QAudioFormat::ChannelConfig::ChannelConfigStereo
+        );
+    }
+    return format;
 }
-void AudioPassthroughPairQt::remove_listener(FFTListener& listener){
-    SpinLockGuard lg(m_lock);
-    m_listeners.erase(&listener);
+
+
 }
 
 
+//
+//  Per-listener working-stream conversion.
+//
+//  (Defined before the first use: remove_listener() destroys a
+//  WorkingListenerEntry - and with it the unique_ptr<InternalWorkingListener>
+//  in it - at its call site, so the type must be complete there.)
+//  Each attached working-stream listener gets its own
+//  WorkingAudio2WorkingAudio node (source shape -> the listener's requested
+//  shape) attached to the source decoder, plus an InternalWorkingListener
+//  forwarder that carries the requested shape as its nominal one (the node
+//  validates its listeners against it; the user's listener may have any
+//  nominal shape of its own).
+//
+//  The entries in m_working_entries survive tree rebuilds: when the input
+//  changes, build_tree() rebuilds each node for the new source shape, and
+//  teardown_tree() detaches them. All of these methods require the caller
+//  to hold m_lock. Detaching blocks on in-flight pushes, so no push can
+//  ever run through a node or forwarder that is about to be destroyed.
+//
 
-class AudioPassthroughPairQt::SampleListener final : public AudioFloatStreamListener{
+class AudioPassthroughPairQt::InternalWorkingListener final : public Kernels::AudioPipeline::WorkingAudioStreamListener{
 public:
-    SampleListener(AudioPassthroughPairQt& parent, size_t samples_per_frame)
-        : AudioFloatStreamListener(samples_per_frame)
-        , m_parent(parent)
-    {
-        parent.m_reader->add_listener(*this);
-    }
-    ~SampleListener(){
-        m_parent.m_reader->remove_listener(*this);
-    }
-    virtual void on_samples(const float* data, size_t frames) override{
-        AudioPassthroughPairQt& parent = m_parent;
-        SpinLockGuard lg(parent.m_lock);
-        if (parent.m_writer){
-            parent.m_writer->operator AudioFloatStreamListener&().on_samples(data, frames);
-        }
-        if (parent.m_fft_runner){
-            parent.m_fft_runner->on_samples(data, frames);
-        }
-
+    InternalWorkingListener(
+        Kernels::AudioPipeline::WorkingAudioStreamListener& target,
+        size_t sample_rate, size_t channels
+    )
+        : Kernels::AudioPipeline::WorkingAudioStreamListener(sample_rate, channels)
+        , m_target(target)
+    {}
+    //  The pair always detaches this from its node before destroying it
+    //  (detach_working_entry). "m_target" is the user's listener, owned by
+    //  the caller; it outlives the attach by contract.
+    virtual void push_samples(size_t samples, size_t stride, const float* data) override{
+        m_target.push_samples(samples, stride, data);
     }
 
 private:
-    AudioPassthroughPairQt& m_parent;
+    Kernels::AudioPipeline::WorkingAudioStreamListener& m_target;
 };
 
+
+void AudioPassthroughPairQt::add_listener(
+    const AudioFormat& format, WorkingAudioStreamListener& listener
+){
+    auto scope_check = m_sanitizer.check_scope();
+    WriteSpinLock lg(m_lock, PA_CURRENT_FUNCTION);
+    WorkingListenerEntry& entry = m_working_entries[&listener];
+    entry.m_format = format;
+    build_working_entry(entry, listener);
+}
+void AudioPassthroughPairQt::remove_listener(WorkingAudioStreamListener& listener){
+    auto scope_check = m_sanitizer.check_scope();
+    WriteSpinLock lg(m_lock, PA_CURRENT_FUNCTION);
+    auto iter = m_working_entries.find(&listener);
+    if (iter == m_working_entries.end()){
+        return;
+    }
+    detach_working_entry(iter->second);
+    m_working_entries.erase(iter);
+}
+void AudioPassthroughPairQt::add_listener(FFTListener& listener){
+    auto scope_check = m_sanitizer.check_scope();
+    m_fft_listeners.add(listener);
+}
+void AudioPassthroughPairQt::remove_listener(FFTListener& listener){
+    auto scope_check = m_sanitizer.check_scope();
+    m_fft_listeners.remove(listener);
+}
+
+
+
 class AudioPassthroughPairQt::InternalFFTListener final : public FFTListener{
 public:
     InternalFFTListener(AudioPassthroughPairQt& parent)
         : m_parent(parent)
     {
-        parent.m_fft_runner->add_listener(*this);
+        parent.m_fft_node->add_listener(*this);
     }
     ~InternalFFTListener(){
-        m_parent.m_fft_runner->remove_listener(*this);
+        m_parent.m_fft_node->remove_listener(*this);
     }
-    virtual void on_fft(size_t sample_rate, std::shared_ptr<AlignedVector<float>> fft_output) override{
-        //  This is already inside the lock.
-//        SpinLockGuard lg(m_parent.m_lock);
-        for (FFTListener* listener : m_parent.m_listeners){
-            listener->on_fft(sample_rate, fft_output);
-        }
+    virtual void on_fft(size_t sample_rate, std::shared_ptr<const AlignedVector<float>> fft_output) override{
+        m_parent.m_fft_listeners.run_method(
+            &FFTListener::on_fft,
+            sample_rate, fft_output
+        );
     }
 
 private:
@@ -84,171 +149,409 @@ class AudioPassthroughPairQt::InternalFFTListener final : public FFTListener{
 
 
 
+void AudioPassthroughPairQt::build_working_entry(
+    WorkingListenerEntry& entry, Kernels::AudioPipeline::WorkingAudioStreamListener& listener
+){
+    if (!m_source_decoder){
+        return;
+    }
+    //  Re-adding with a new format: detach the old node first.
+    if (entry.m_node){
+        detach_working_entry(entry);
+    }
+
+    const size_t raw_rate = m_reader->raw_sample_rate();
+    const size_t raw_channels = m_reader->raw_channels();
+    const size_t out_rate = entry.m_format.sample_rate();
+    const size_t out_channels = entry.m_format.channels();
+    if (out_rate == 0 || out_channels == 0){
+        m_logger.log("Working listener: invalid requested format; not attached.", COLOR_RED);
+        return;
+    }
+
+    //  A reinterpreted input choice with reversed channel order
+    //  (INTERLEAVE_RL_96000) plays the card's channel 1 (the odd physical
+    //  samples) as the left channel; the input reinterpretation preserves
+    //  the physical order, so the swap is applied to the matrix (the same
+    //  special case the sink branch uses).
+    std::vector<float> matrix;
+    if (m_input_choice.swap_channels() && raw_channels == 2 && out_channels == 2){
+        //  out = [in 1, in 0]; weight(in i -> out o) at index i + in_ch * o.
+        matrix = {0.0f, 1.0f, 1.0f, 0.0f};
+    }else{
+        matrix = build_channel_mixer_matrix(
+            channel_format(raw_channels), entry.m_format.native_format()
+        );
+    }
+    if (matrix.size() != raw_channels * out_channels){
+        m_logger.log("Working listener: no channel mixer matrix for this conversion; not attached.", COLOR_RED);
+        return;
+    }
+
+    entry.m_node.reset(new Kernels::AudioPipeline::WorkingAudio2WorkingAudio(
+        m_logger,
+        raw_rate, out_rate,
+        raw_channels, out_channels,
+        std::move(matrix)
+    ));
+    entry.m_forwarder.reset(new InternalWorkingListener(listener, out_rate, out_channels));
+    entry.m_node->add_listener(*entry.m_forwarder);
+    m_source_decoder->add_listener(*entry.m_node);
+}
+
+
+void AudioPassthroughPairQt::detach_working_entry(WorkingListenerEntry& entry){
+    if (entry.m_forwarder && entry.m_node){
+        entry.m_node->remove_listener(*entry.m_forwarder);
+    }
+    if (entry.m_node && m_source_decoder){
+        m_source_decoder->remove_listener(*entry.m_node);
+    }
+    entry.m_forwarder.reset();
+    entry.m_node.reset();
+}
+
+
+
+//
+//  The new pipeline tree.
+//
+//  All three methods below require the caller to hold m_lock. Rebuilding
+//  detaches the node heads from the decoder's listener set before the
+//  nodes are destroyed; ListenerSet::remove blocks on in-flight pushes, so
+//  no push can ever run through a node that is about to be destroyed.
+//
+
+
+void AudioPassthroughPairQt::teardown_tree(){
+    //  Destroy the tree's leaves first and propagate toward the root:
+    //  the FFT listener is registered on m_fft_node, and the branch
+    //  heads are registered on the decoder. Detaching the decoder from
+    //  the reader's raw stream first quiesces the tree, so none of the
+    //  destructions below can ever race an in-flight push.
+    if (m_source_decoder){
+        m_reader->remove_raw_listener(*m_source_decoder);
+    }
+    for (auto& entry : m_working_entries){
+        detach_working_entry(entry.second);
+    }
+    m_fft_listener.reset();
+    m_fft_node.reset();
+    m_fft_conv.reset();
+    teardown_sink_branch();
+    m_source_decoder.reset();
+}
+
+
+void AudioPassthroughPairQt::teardown_sink_branch(){
+    if (m_source_decoder){
+        if (m_sink_conv){
+            m_source_decoder->remove_listener(*m_sink_conv);
+        }else if (m_sink_encoder){
+            m_source_decoder->remove_listener(*m_sink_encoder);
+        }
+    }
+    //  Detach the device from the encoder's listener set before the
+    //  encoder is destroyed; remove blocks on in-flight pushes.
+    if (m_sink_encoder && m_sink_device){
+        m_sink_encoder->remove_listener(*m_sink_device);
+    }
+    m_sink_conv.reset();
+    m_sink_encoder.reset();
+}
+
+
+void AudioPassthroughPairQt::build_tree(float input_volume){
+    if (!m_reader){
+        return;
+    }
+    //  For reinterpreted input choices, m_reader reports the reinterpreted
+    //  2ch x 48000 stream; native choices keep the physical shape
+    //  (AudioInputFile / AudioInputDevice apply it).
+    size_t raw_rate = m_reader->raw_sample_rate();
+    size_t raw_channels = m_reader->raw_channels();
+
+    m_source_decoder.reset(new Kernels::AudioPipeline::RawAudio2WorkingAudio(
+        m_reader->raw_sample_format(),
+        raw_rate, raw_channels, input_volume
+    ));
+    m_reader->add_raw_listener(*m_source_decoder);
+
+    //  Rebuild the per-listener working-stream conversion nodes for the new
+    //  source shape (the entries themselves survive the rebuild).
+    for (auto& entry : m_working_entries){
+        build_working_entry(entry.second, *entry.first);
+    }
+
+    //  FFT branch: source channels -> 1 channel, source rate -> FFT rate.
+    //  The tree runs the FFT at 48 kHz for all inputs (the post-migration
+    //  standard); a 44.1 kHz source is resampled up here. The branch ends
+    //  in m_fft_node, the tree's FFT endpoint.
+    const size_t fft_rate = 48000;
+    m_fft_node.reset(new WorkingAudioToFFT(fft_rate));
+    if (raw_rate == fft_rate && raw_channels == 1){
+        //  No conversion needed: feed the FFT node directly.
+        m_source_decoder->add_listener(*m_fft_node);
+    }else{
+        std::vector<float> matrix = build_channel_mixer_matrix(
+            channel_format(raw_channels), channel_format(1)
+        );
+        if (matrix.size() != raw_channels){
+            throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "No channel mixer matrix.");
+        }
+        m_fft_conv.reset(new Kernels::AudioPipeline::WorkingAudio2WorkingAudio(
+            m_logger,
+            raw_rate, fft_rate,
+            raw_channels, 1,
+            std::move(matrix)
+        ));
+        m_fft_conv->add_listener(*m_fft_node);
+        m_source_decoder->add_listener(*m_fft_conv);
+    }
+
+    //  The sink branch may have been created by the init_audio_sink() call
+    //  that ran earlier in the same locked scope (which found no decoder
+    //  yet); build it now.
+    rebuild_sink_branch();
+}
+
+
+void AudioPassthroughPairQt::rebuild_sink_branch(){
+    if (!m_reader || !m_source_decoder){
+        return;
+    }
+    //  The sink branch exists only when the output device is open; it
+    //  plays in the device's native format (as opened by
+    //  init_audio_sink), and this branch resamples / mixes / converts
+    //  the working input to that shape.
+    if (!m_sink_device){
+        return;
+    }
+
+    const size_t sink_rate = m_sink_device->sample_rate();
+    const size_t sink_channels = m_sink_device->channels();
+    const Kernels::AudioPipeline::SampleFormat sink_sample_format = m_sink_device->sample_type();
+
+    size_t raw_rate = m_reader->raw_sample_rate();
+    size_t raw_channels = m_reader->raw_channels();
+
+    //  Detach the old sink head; the FFT head stays attached, and the new
+    //  sink head is pushed to the front of the decoder's listener set below
+    //  so it runs before the FFT head.
+    teardown_sink_branch();
+
+    m_sink_encoder.reset(new Kernels::AudioPipeline::WorkingAudio2RawAudio(
+        sink_sample_format,
+        sink_rate, sink_channels,
+        convert_audio_volume_from_slider(m_output_volume)
+    ));
+    //  A reinterpreted input choice with reversed channel order
+    //  (INTERLEAVE_RL_96000) plays the card's channel 1 (the odd physical
+    //  samples) as the left channel; the input reinterpretation preserves
+    //  the physical order, so the sink branch swaps the two channels.
+    //  (The FFT pair-average is order-invariant.)
+    //  Qt channel configs can't express a reversed channel order, so the
+    //  swap matrix stays literal; the choice now carries the card's
+    //  channel mapping (swap_channels()), which drives this special case.
+    bool swap_channels =
+        m_input_choice.swap_channels()
+        && raw_channels == 2 && sink_channels == 2;
+    if (raw_rate == sink_rate && raw_channels == sink_channels && !swap_channels){
+        //  No conversion needed: feed the encoder directly.
+        m_source_decoder->push_front_listener(*m_sink_encoder);
+    }else{
+        std::vector<float> matrix;
+        if (swap_channels){
+            //  out = [in 1, in 0]; weight(in i -> out o) at index i + in_ch * o.
+            matrix = {0.0f, 1.0f, 1.0f, 0.0f};
+        }else{
+            matrix = build_channel_mixer_matrix(
+                channel_format(raw_channels), channel_format(sink_channels)
+            );
+        }
+        if (matrix.size() != raw_channels * sink_channels){
+            throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "No channel mixer matrix.");
+        }
+        m_sink_conv.reset(new Kernels::AudioPipeline::WorkingAudio2WorkingAudio(
+            m_logger,
+            raw_rate, sink_rate,
+            raw_channels, sink_channels,
+            std::move(matrix)
+        ));
+        m_sink_conv->add_listener(*m_sink_encoder);
+        m_source_decoder->push_front_listener(*m_sink_conv);
+    }
+
+    //  The branch's open tail: raw bytes to the output device.
+    m_sink_encoder->add_listener(*m_sink_device);
+}
+
 
-AudioPassthroughPairQt::~AudioPassthroughPairQt(){}
+AudioPassthroughPairQt::~AudioPassthroughPairQt(){
+    auto scope_check = m_sanitizer.check_scope();
+    WriteSpinLock lg(m_lock, PA_CURRENT_FUNCTION);
+    teardown_tree();
+}
 
 AudioPassthroughPairQt::AudioPassthroughPairQt(Logger& logger)
     : m_logger(logger)
-    , m_file_input_multiplier((float)GlobalSettings::instance().AUDIO_FILE_VOLUME_SCALE)
-    , m_device_input_multiplier((float)GlobalSettings::instance().AUDIO_DEVICE_VOLUME_SCALE)
 {}
 
 void AudioPassthroughPairQt::reset(
-    const std::string& file,
-    const AudioDeviceInfo& output, double output_volume
+    const std::shared_ptr<AudioSourceDescriptor>& descriptor,
+    const AudioInputChoice& format,
+    const AudioDeviceInfo& output,
+    double output_volume
 ){
-    QMetaObject::invokeMethod(this, [this, file, output, output_volume]{
-        SpinLockGuard lg(m_lock);
-        if (m_reader){
-            m_fft_listener.reset();
-            m_fft_runner.reset();
-            m_writer.reset();
-            m_sample_listener.reset();
-            m_reader.reset();
-            m_input_format = AudioChannelFormat::NONE;
+    auto scope_check = m_sanitizer.check_scope();
+    QMetaObject::invokeMethod(this, [this, format, descriptor, output, output_volume]{
+        auto scope_check = m_sanitizer.check_scope();
+        std::unique_ptr<AudioSource> source;
+        if (descriptor){
+            source = descriptor->make_AudioSource(m_logger, format);
         }
-        m_input_format = AudioChannelFormat::DUAL_48000;
-        m_reader.reset(new AudioSource(m_logger, file, m_input_format, m_file_input_multiplier));
-        m_sample_listener.reset(new SampleListener(*this, m_reader->samples_per_frame()));
-        m_output_device = output;
-        m_output_volume = output_volume;
-        init_audio_sink();
-        m_fft_runner = make_FFT_streamer(m_input_format);
-        m_fft_listener.reset(new InternalFFTListener(*this));
-    });
-}
-void AudioPassthroughPairQt::reset(
-    const AudioDeviceInfo& input, AudioChannelFormat format,
-    const AudioDeviceInfo& output, double output_volume
-){
-//    cout << "AudioPassthroughPairQt::reset(): " << output.display_name() << endl;
-    QMetaObject::invokeMethod(this, [this, format, output, output_volume, input]{
-        SpinLockGuard lg(m_lock);
+        WriteSpinLock lg(m_lock, PA_CURRENT_FUNCTION);
         if (m_reader){
-            m_fft_listener.reset();
-            m_fft_runner.reset();
-            m_writer.reset();
-            m_sample_listener.reset();
+            teardown_tree();
+            m_sink_device.reset();
             m_reader.reset();
-            m_input_format = AudioChannelFormat::NONE;
         }
-        m_input_format = format;
+        m_input_choice = format;
         m_output_device = output;
         m_output_volume = output_volume;
-        if (input && format != AudioChannelFormat::NONE){
-            m_reader.reset(new AudioSource(m_logger, input, m_input_format, m_device_input_multiplier));
-            m_sample_listener.reset(new SampleListener(*this, m_reader->samples_per_frame()));
+        if (source){
+            m_reader = std::move(source);
             init_audio_sink();
-            m_fft_runner = make_FFT_streamer(m_input_format);
+            build_tree(m_reader->volume_multiplier());
             m_fft_listener.reset(new InternalFFTListener(*this));
         }
     });
 }
 void AudioPassthroughPairQt::clear_audio_source(){
+    auto scope_check = m_sanitizer.check_scope();
     QMetaObject::invokeMethod(this, [this]{
-        SpinLockGuard lg(m_lock);
+        auto scope_check = m_sanitizer.check_scope();
+        WriteSpinLock lg(m_lock, PA_CURRENT_FUNCTION);
         if (m_reader){
-            m_fft_listener.reset();
-            m_fft_runner.reset();
-            m_sample_listener.reset();
+            teardown_tree();
             m_reader.reset();
-            m_input_format = AudioChannelFormat::NONE;
+            m_input_choice = AudioInputChoice();
         }
     });
 }
-void AudioPassthroughPairQt::set_audio_source(const std::string& file){
-    QMetaObject::invokeMethod(this, [this, file]{
-        SpinLockGuard lg(m_lock);
-        if (m_reader){
-            m_fft_listener.reset();
-            m_fft_runner.reset();
-            m_writer.reset();
-            m_sample_listener.reset();
-            m_reader.reset();
-            m_input_format = AudioChannelFormat::NONE;
+void AudioPassthroughPairQt::set_audio_source(
+    const std::shared_ptr<AudioSourceDescriptor>& descriptor,
+    const AudioInputChoice& format
+){
+//    cout << "descriptor = " << descriptor->display_name() << endl;
+    auto scope_check = m_sanitizer.check_scope();
+    QMetaObject::invokeMethod(this, [this, descriptor, format]{
+        auto scope_check = m_sanitizer.check_scope();
+        std::unique_ptr<AudioSource> source;
+        if (descriptor){
+            source = descriptor->make_AudioSource(m_logger, format);
         }
-        m_input_format = AudioChannelFormat::DUAL_48000;
-        m_reader.reset(new AudioSource(m_logger, file, m_input_format, m_file_input_multiplier));
-        m_sample_listener.reset(new SampleListener(*this, m_reader->samples_per_frame()));
-        init_audio_sink();
-        m_fft_runner = make_FFT_streamer(m_input_format);
-        m_fft_listener.reset(new InternalFFTListener(*this));
-    });
-}
-void AudioPassthroughPairQt::set_audio_source(const AudioDeviceInfo& device, AudioChannelFormat format){
-    QMetaObject::invokeMethod(this, [this, format, device]{
-        SpinLockGuard lg(m_lock);
+        WriteSpinLock lg(m_lock, PA_CURRENT_FUNCTION);
         if (m_reader){
-            m_fft_listener.reset();
-            m_fft_runner.reset();
-            m_writer.reset();
-            m_sample_listener.reset();
+            teardown_tree();
+            m_sink_device.reset();
             m_reader.reset();
-            m_input_format = AudioChannelFormat::NONE;
         }
-        m_input_format = format;
-        if (device){
-            m_reader.reset(new AudioSource(m_logger, device, m_input_format, m_device_input_multiplier));
-            m_sample_listener.reset(new SampleListener(*this, m_reader->samples_per_frame()));
+        m_input_choice = format;
+        if (source){
+            m_reader = std::move(source);
             init_audio_sink();
-            m_fft_runner = make_FFT_streamer(m_input_format);
+            build_tree(m_reader->volume_multiplier());
             m_fft_listener.reset(new InternalFFTListener(*this));
         }
     });
 }
 
 void AudioPassthroughPairQt::clear_audio_sink(){
+    auto scope_check = m_sanitizer.check_scope();
     QMetaObject::invokeMethod(this, [this]{
-        SpinLockGuard lg(m_lock);
-        m_writer.reset();
+        auto scope_check = m_sanitizer.check_scope();
+        WriteSpinLock lg(m_lock, PA_CURRENT_FUNCTION);
         m_output_device = AudioDeviceInfo();
+        teardown_sink_branch();
+        m_sink_device.reset();
     });
 }
 void AudioPassthroughPairQt::set_audio_sink(const AudioDeviceInfo& device, double volume){
+    auto scope_check = m_sanitizer.check_scope();
     QMetaObject::invokeMethod(this, [this, device, volume]{
-        SpinLockGuard lg(m_lock);
-        m_writer.reset();
+        auto scope_check = m_sanitizer.check_scope();
+        WriteSpinLock lg(m_lock, PA_CURRENT_FUNCTION);
+        teardown_sink_branch();
+        m_sink_device.reset();
         m_output_device = device;
         m_output_volume = volume;
         init_audio_sink();
     });
 }
 void AudioPassthroughPairQt::init_audio_sink(){
+    //  Must be called under the lock.
+
 //    cout << "AudioPassthroughPairQt::init_audio_sink()" << endl;
-    QMetaObject::invokeMethod(this, [this]{
-        if (!m_output_device){
-//            cout << "AudioPassthroughPairQt::init_audio_sink() - early out" << endl;
-            return;
-        }
-        AudioChannelFormat output_format = m_input_format;
-        switch (output_format){
-        case AudioChannelFormat::NONE:
-            return;
-        case AudioChannelFormat::MONO_48000:
-        case AudioChannelFormat::MONO_96000:
-        case AudioChannelFormat::DUAL_44100:
-        case AudioChannelFormat::DUAL_48000:
-            break;
-        case AudioChannelFormat::INTERLEAVE_LR_96000:
-        case AudioChannelFormat::INTERLEAVE_RL_96000:
-            output_format = AudioChannelFormat::DUAL_48000;
-            break;
-        default:
-            m_logger.log(std::string("Invalid AudioFormat: ") + AUDIO_FORMAT_LABELS[(size_t)output_format], COLOR_RED);
-            return;
+    auto scope_check = m_sanitizer.check_scope();
+    if (!m_reader){
+        return;
+    }
+    if (!m_output_device){
+        return;
+    }
+
+    //  Open the device in its native format, as-is: the preferred rate,
+    //  channel count, and sample format of the device. The tree's sink
+    //  branch resamples / mixes / converts the working input to that
+    //  shape. The output volume is applied by the branch's encoder, so
+    //  the device stays at full volume.
+    NativeAudioInfo native_info = m_output_device.native_info();
+    QAudioFormat target_format = native_info.preferredFormat();
+    if (target_format.sampleFormat() == QAudioFormat::SampleFormat::Unknown){
+        //  The native sample format isn't one we can convert to; fall
+        //  back to a supported one we can.
+        QAudioFormat float_format = target_format;
+        set_sample_format_to_float(float_format);
+        if (native_info.isFormatSupported(float_format)){
+            target_format = float_format;
+        }else{
+            QAudioFormat sint16_format = target_format;
+            sint16_format.setSampleFormat(QAudioFormat::SampleFormat::Int16);
+            if (native_info.isFormatSupported(sint16_format)){
+                target_format = sint16_format;
+            }else{
+                m_logger.log(
+                    "Audio output device's native sample format is not supported, "
+                    "and neither float nor 16-bit is. Audio output is disabled.",
+                    COLOR_RED
+                );
+                return;
+            }
         }
-//        cout << "AudioPassthroughPairQt::init_audio_sink() - end" << endl;
-        m_writer.reset(new AudioSink(m_logger, m_output_device, output_format, m_output_volume));
-    });
+    }
+    m_logger.log("AudioOutputDevice(): Target: " + dump_audio_format(target_format));
+    m_logger.log("AudioOutputDevice(): Native: " + dump_audio_format(native_info.preferredFormat()));
+    m_sink_device.reset(new AudioOutputDevice(
+        m_logger, native_info, target_format,
+        sample_format_of(target_format),
+        (size_t)target_format.sampleRate(),
+        (size_t)target_format.channelCount()
+    ));
+    rebuild_sink_branch();
 }
 
 
 void AudioPassthroughPairQt::set_sink_volume(double volume){
+    auto scope_check = m_sanitizer.check_scope();
     QMetaObject::invokeMethod(this, [this, volume]{
-        SpinLockGuard lg(m_lock);
+        auto scope_check = m_sanitizer.check_scope();
+        WriteSpinLock lg(m_lock, PA_CURRENT_FUNCTION);
         m_output_volume = volume;
-        if (m_writer){
-            m_writer->set_volume(volume);
+        if (m_sink_encoder){
+            float absolute = convert_audio_volume_from_slider(volume);
+            m_logger.log("Volume set to: Slider = " + tostr_default(volume) + " -> Absolute = " + tostr_default(absolute));
+            m_sink_encoder->set_multiplier(absolute);
         }
     });
 }
diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/Backends/AudioPassthroughPairQt.h b/SerialPrograms/Source/CommonFramework/AudioPipeline/Backends/AudioPassthroughPairQt.h
index 4bc76c9f43..014b9c2da7 100644
--- a/SerialPrograms/Source/CommonFramework/AudioPipeline/Backends/AudioPassthroughPairQt.h
+++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/Backends/AudioPassthroughPairQt.h
@@ -1,6 +1,6 @@
 /*  Audio Passthrough Pair (Qt)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -8,21 +8,43 @@
 #define PokemonAutomation_AudioPipeline_AudioPassthroughPairQt_H
 
 #include <memory>
-#include <set>
+#include <map>
+//#include <set>
 #include <QObject>
+#include "Common/Cpp/ListenerSet.h"
+#include "Common/Cpp/LifetimeSanitizer.h"
 #include "Common/Cpp/Concurrency/SpinLock.h"
+#include "CommonFramework/AudioPipeline/AudioInputChoice.h"
 #include "CommonFramework/AudioPipeline/AudioPassthroughPair.h"
+#include "CommonFramework/AudioPipeline/Backends/AudioDeviceInfo.h"
 
 namespace PokemonAutomation{
 
 class Logger;
 class AudioSource;
-class AudioSink;
-class AudioFloatToFFT;
+class AudioOutputDevice;
+class WorkingAudioToFFT;
+
+namespace Kernels{
+namespace AudioPipeline{
+class RawAudio2WorkingAudio;
+class WorkingAudio2RawAudio;
+class WorkingAudio2WorkingAudio;
+class WorkingAudioStreamListener;
+}
+}
 
 
 class AudioPassthroughPairQt final : public QObject, public AudioPassthroughPair{
 public:
+    using RawAudio2WorkingAudio = Kernels::AudioPipeline::RawAudio2WorkingAudio;
+    using WorkingAudio2RawAudio = Kernels::AudioPipeline::WorkingAudio2RawAudio;
+    using WorkingAudio2WorkingAudio = Kernels::AudioPipeline::WorkingAudio2WorkingAudio;
+    using WorkingAudioStreamListener = Kernels::AudioPipeline::WorkingAudioStreamListener;
+
+    virtual void add_listener(const AudioFormat& format, WorkingAudioStreamListener& listener) override;
+    virtual void remove_listener(WorkingAudioStreamListener& listener) override;
+
     virtual void add_listener(FFTListener& listener) override;
     virtual void remove_listener(FFTListener& listener) override;
 
@@ -32,17 +54,17 @@ class AudioPassthroughPairQt final : public QObject, public AudioPassthroughPair
     AudioPassthroughPairQt(Logger& logger);
 
     virtual void reset(
-        const std::string& file,
-        const AudioDeviceInfo& output, double output_volume
-    ) override;
-    virtual void reset(
-        const AudioDeviceInfo& input, AudioChannelFormat format,
-        const AudioDeviceInfo& output, double output_volume
+        const std::shared_ptr<AudioSourceDescriptor>& descriptor,
+        const AudioInputChoice& format,
+        const AudioDeviceInfo& output,
+        double output_volume
     ) override;
 
     virtual void clear_audio_source() override;
-    virtual void set_audio_source(const std::string& file) override;
-    virtual void set_audio_source(const AudioDeviceInfo& device, AudioChannelFormat format) override;
+    virtual void set_audio_source(
+        const std::shared_ptr<AudioSourceDescriptor>& descriptor,
+        const AudioInputChoice& format
+    ) override;
 
     virtual void clear_audio_sink() override;
     virtual void set_audio_sink(const AudioDeviceInfo& device, double volume) override;
@@ -51,11 +73,38 @@ class AudioPassthroughPairQt final : public QObject, public AudioPassthroughPair
 
 
 private:
-    class SampleListener;
     class InternalFFTListener;
+    class InternalWorkingListener;
+
+    //  One entry per attached working-stream listener: the requested format
+    //  plus the conversion node (source shape -> requested shape) and the
+    //  forwarder that carries the requested shape as its nominal one. The
+    //  node attaches to m_source_decoder; the forwarder attaches to the node.
+    //  All of these are only touched while holding m_lock.
+    struct WorkingListenerEntry{
+        AudioFormat m_format;
+        std::unique_ptr<WorkingAudio2WorkingAudio> m_node;
+        std::unique_ptr<InternalWorkingListener> m_forwarder;
+    };
 
     void init_audio_sink();
 
+    //  New pipeline tree. Both endpoints have switched over: the FFT
+    //  branch feeds m_fft_node (m_fft_listener forwards its FFTs to the
+    //  pair's FFTListener set), and the sink branch's encoder pushes raw
+    //  bytes to m_sink_device, the open output device.
+    //  All of these are only touched while holding m_lock; the producing
+    //  thread only ever sees them through the node listener sets, where
+    //  ListenerSet::remove blocks on in-flight pushes so rebuilds never
+    //  race a live push.
+    void teardown_tree();
+    void teardown_sink_branch();
+    void build_tree(float input_volume);
+    void rebuild_sink_branch();
+
+    void build_working_entry(WorkingListenerEntry& entry, WorkingAudioStreamListener& listener);
+    void detach_working_entry(WorkingListenerEntry& entry);
+
 
 private:
     Logger& m_logger;
@@ -66,20 +115,39 @@ class AudioPassthroughPairQt final : public QObject, public AudioPassthroughPair
     //  Objects lower on this list attach to and hold references to those
     //  higher on the list.
 
-    AudioChannelFormat m_input_format;
+    //  The resolved input choice for the active device source (invalid
+    //  when no device source is attached; file sources have no choice).
+    AudioInputChoice m_input_choice;
     std::unique_ptr<AudioSource> m_reader;
-    std::unique_ptr<SampleListener> m_sample_listener;      //  Attaches to "m_reader".
+
+    //  New pipeline tree. The decoder attaches to m_reader's raw stream and
+    //  the branch heads attach to the decoder (sink head before FFT head).
+    //  Declared after m_reader so the nodes die before the reader does.
+    //  (For reinterpreted input choices, m_reader emits the two 48 kHz
+    //  channels reinterpreted from the physical 1ch x 96000 stream;
+    //  native choices keep the physical shape.)
+    std::unique_ptr<RawAudio2WorkingAudio> m_source_decoder;
+    std::unique_ptr<WorkingAudio2WorkingAudio> m_sink_conv;     //  Source shape -> sink shape (mix + resample).
+    std::unique_ptr<WorkingAudio2RawAudio> m_sink_encoder;
+    std::unique_ptr<WorkingAudio2WorkingAudio> m_fft_conv;      //  Source shape -> 48 kHz mono (mix + resample).
+    std::unique_ptr<WorkingAudioToFFT> m_fft_node;              //  The tree's FFT endpoint.
+
+    //  Per-listener working-stream conversion nodes. The entries survive
+    //  tree rebuilds (the listeners stay attached across input changes);
+    //  their nodes are rebuilt for each new source shape in build_tree()
+    //  and detached in teardown_tree().
+    std::map<WorkingAudioStreamListener*, WorkingListenerEntry> m_working_entries;
 
     AudioDeviceInfo m_output_device;
-    float m_file_input_multiplier = 1.0;
-    float m_device_input_multiplier = 1.0;
     double m_output_volume = 1.0;
-    std::unique_ptr<AudioSink> m_writer;
+    std::unique_ptr<AudioOutputDevice> m_sink_device;       //  Attaches to m_sink_encoder.
+
+
+    std::unique_ptr<InternalFFTListener> m_fft_listener;    //  Attaches to m_fft_node.
 
-    std::unique_ptr<AudioFloatToFFT> m_fft_runner;
-    std::unique_ptr<InternalFFTListener> m_fft_listener;    //  Attaches to m_fft_runner"".
+    ListenerSet<FFTListener> m_fft_listeners;
 
-    std::set<FFTListener*> m_listeners;
+    LifetimeSanitizer m_sanitizer;
 };
 
 
diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/Backends/AudioPassthroughPairQtThread.cpp b/SerialPrograms/Source/CommonFramework/AudioPipeline/Backends/AudioPassthroughPairQtThread.cpp
index bf4c5396a8..42a3b892b6 100644
--- a/SerialPrograms/Source/CommonFramework/AudioPipeline/Backends/AudioPassthroughPairQtThread.cpp
+++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/Backends/AudioPassthroughPairQtThread.cpp
@@ -1,11 +1,10 @@
 /*  Audio Passthrough Pair (Qt separate thread)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include "Common/Cpp/Concurrency/SpinPause.h"
-#include "CommonFramework/GlobalSettingsPanel.h"
+#include "Common/Qt/GlobalThreadPoolsQt.h"
 #include "AudioPassthroughPairQt.h"
 #include "AudioPassthroughPairQtThread.h"
 
@@ -17,81 +16,80 @@ namespace PokemonAutomation{
 
 
 void AudioPassthroughPairQtThread::add_listener(FFTListener& listener){
-    AudioPassthroughPairQt* body = m_body.load(std::memory_order_relaxed);
+    auto scope_check = m_sanitizer.check_scope();
+    AudioPassthroughPairQt* body = m_body;
     body->add_listener(listener);
 }
 void AudioPassthroughPairQtThread::remove_listener(FFTListener& listener){
-    AudioPassthroughPairQt* body = m_body.load(std::memory_order_relaxed);
+    auto scope_check = m_sanitizer.check_scope();
+    AudioPassthroughPairQt* body = m_body;
+    body->remove_listener(listener);
+}
+void AudioPassthroughPairQtThread::add_listener(
+    const AudioFormat& format, Kernels::AudioPipeline::WorkingAudioStreamListener& listener
+){
+    auto scope_check = m_sanitizer.check_scope();
+    AudioPassthroughPairQt* body = m_body;
+    body->add_listener(format, listener);
+}
+void AudioPassthroughPairQtThread::remove_listener(Kernels::AudioPipeline::WorkingAudioStreamListener& listener){
+    auto scope_check = m_sanitizer.check_scope();
+    AudioPassthroughPairQt* body = m_body;
     body->remove_listener(listener);
 }
 
 
 AudioPassthroughPairQtThread::AudioPassthroughPairQtThread(Logger& logger)
     : m_logger(logger)
-    , m_body(nullptr)
-{
-    start();
-
-    //  Wait for the thread to fully start up and construct the body.
-    while (m_body.load(std::memory_order_acquire) == nullptr){
-        pause();
-    }
-}
+    , m_body(static_cast<AudioPassthroughPairQt*>(
+        GlobalThreadPools::qt_event_threadpool().add_object(
+            [this]{
+                return std::make_unique<AudioPassthroughPairQt>(m_logger);
+            })
+        )
+    )
+{}
 AudioPassthroughPairQtThread::~AudioPassthroughPairQtThread(){
-    m_body.store(nullptr, std::memory_order_relaxed);
-    quit();
-    wait();
-}
-void AudioPassthroughPairQtThread::run(){
-    GlobalSettings::instance().REALTIME_THREAD_PRIORITY0.set_on_this_thread();
-
-    AudioPassthroughPairQt body(m_logger);
-    m_body.store(&body, std::memory_order_relaxed);
-    exec();
-
-    //  Wait until we are in the destructor before destroying the body.
-    while (m_body.load(std::memory_order_acquire) != nullptr){
-        pause();
-    }
+    GlobalThreadPools::qt_event_threadpool().remove_object(m_body);
 }
 
 
 void AudioPassthroughPairQtThread::reset(
-    const std::string& file,
-    const AudioDeviceInfo& output, double output_volume
+    const std::shared_ptr<AudioSourceDescriptor>& descriptor,
+    const AudioInputChoice& format,
+    const AudioDeviceInfo& output,
+    double output_volume
 ){
-    AudioPassthroughPairQt* body = m_body.load(std::memory_order_relaxed);
-    body->reset(file, output, output_volume);
-}
-void AudioPassthroughPairQtThread::reset(
-    const AudioDeviceInfo& input, AudioChannelFormat format,
-    const AudioDeviceInfo& output, double output_volume
-){
-    AudioPassthroughPairQt* body = m_body.load(std::memory_order_relaxed);
-    body->reset(input, format, output, output_volume);
+    auto scope_check = m_sanitizer.check_scope();
+    AudioPassthroughPairQt* body = m_body;
+    body->reset(descriptor, format, output, output_volume);
 }
 void AudioPassthroughPairQtThread::clear_audio_source(){
-    AudioPassthroughPairQt* body = m_body.load(std::memory_order_relaxed);
+    auto scope_check = m_sanitizer.check_scope();
+    AudioPassthroughPairQt* body = m_body;
     body->clear_audio_source();
 }
-void AudioPassthroughPairQtThread::set_audio_source(const std::string& file){
-    AudioPassthroughPairQt* body = m_body.load(std::memory_order_relaxed);
-    body->set_audio_source(file);
-}
-void AudioPassthroughPairQtThread::set_audio_source(const AudioDeviceInfo& device, AudioChannelFormat format){
-    AudioPassthroughPairQt* body = m_body.load(std::memory_order_relaxed);
-    body->set_audio_source(device, format);
+void AudioPassthroughPairQtThread::set_audio_source(
+    const std::shared_ptr<AudioSourceDescriptor>& descriptor,
+    const AudioInputChoice& format
+){
+    auto scope_check = m_sanitizer.check_scope();
+    AudioPassthroughPairQt* body = m_body;
+    body->set_audio_source(descriptor, format);
 }
 void AudioPassthroughPairQtThread::clear_audio_sink(){
-    AudioPassthroughPairQt* body = m_body.load(std::memory_order_relaxed);
+    auto scope_check = m_sanitizer.check_scope();
+    AudioPassthroughPairQt* body = m_body;
     body->clear_audio_sink();
 }
 void AudioPassthroughPairQtThread::set_audio_sink(const AudioDeviceInfo& device, double volume){
-    AudioPassthroughPairQt* body = m_body.load(std::memory_order_relaxed);
+    auto scope_check = m_sanitizer.check_scope();
+    AudioPassthroughPairQt* body = m_body;
     body->set_audio_sink(device, volume);
 }
 void AudioPassthroughPairQtThread::set_sink_volume(double volume){
-    AudioPassthroughPairQt* body = m_body.load(std::memory_order_relaxed);
+    auto scope_check = m_sanitizer.check_scope();
+    AudioPassthroughPairQt* body = m_body;
     body->set_sink_volume(volume);
 }
 
diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/Backends/AudioPassthroughPairQtThread.h b/SerialPrograms/Source/CommonFramework/AudioPipeline/Backends/AudioPassthroughPairQtThread.h
index 1307458f57..a4ed7c33ed 100644
--- a/SerialPrograms/Source/CommonFramework/AudioPipeline/Backends/AudioPassthroughPairQtThread.h
+++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/Backends/AudioPassthroughPairQtThread.h
@@ -1,6 +1,6 @@
 /*  Audio Passthrough Pair (Qt separate thread)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  *      Same as AudioPassthroughPairQt, but with the audio running
  *  on a separate thread to avoid UI thread noise.
@@ -10,7 +10,7 @@
 #ifndef PokemonAutomation_AudioPipeline_AudioPassthroughPairQtThread_H
 #define PokemonAutomation_AudioPipeline_AudioPassthroughPairQtThread_H
 
-#include <QThread>
+#include "Common/Cpp/LifetimeSanitizer.h"
 #include "CommonFramework/AudioPipeline/AudioPassthroughPair.h"
 
 namespace PokemonAutomation{
@@ -19,39 +19,40 @@ class Logger;
 class AudioPassthroughPairQt;
 
 
-class AudioPassthroughPairQtThread : private QThread, public AudioPassthroughPair{
+class AudioPassthroughPairQtThread : public AudioPassthroughPair{
 public:
     virtual void add_listener(FFTListener& listener) override;
     virtual void remove_listener(FFTListener& listener) override;
 
+    virtual void add_listener(const AudioFormat& format, Kernels::AudioPipeline::WorkingAudioStreamListener& listener) override;
+    virtual void remove_listener(Kernels::AudioPipeline::WorkingAudioStreamListener& listener) override;
+
 public:
     AudioPassthroughPairQtThread(Logger& logger);
     ~AudioPassthroughPairQtThread();
 
     virtual void reset(
-        const std::string& file,
-        const AudioDeviceInfo& output, double output_volume
-    ) override;
-    virtual void reset(
-        const AudioDeviceInfo& input, AudioChannelFormat format,
-        const AudioDeviceInfo& output, double output_volume
+        const std::shared_ptr<AudioSourceDescriptor>& descriptor,
+        const AudioInputChoice& format,
+        const AudioDeviceInfo& output,
+        double output_volume
     ) override;
 
     virtual void clear_audio_source() override;
-    virtual void set_audio_source(const std::string& file) override;
-    virtual void set_audio_source(const AudioDeviceInfo& device, AudioChannelFormat format) override;
+    virtual void set_audio_source(
+        const std::shared_ptr<AudioSourceDescriptor>& descriptor,
+        const AudioInputChoice& format
+    ) override;
 
     virtual void clear_audio_sink() override;
     virtual void set_audio_sink(const AudioDeviceInfo& device, double volume) override;
 
     virtual void set_sink_volume(double volume) override;
 
-private:
-    virtual void run() override;
-
 private:
     Logger& m_logger;
-    std::atomic<AudioPassthroughPairQt*> m_body;
+    AudioPassthroughPairQt* m_body;
+    LifetimeSanitizer m_sanitizer;
 };
 
 
diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/Backends/NativeAudioFormats.cpp b/SerialPrograms/Source/CommonFramework/AudioPipeline/Backends/NativeAudioFormats.cpp
new file mode 100644
index 0000000000..b2850e3125
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/Backends/NativeAudioFormats.cpp
@@ -0,0 +1,138 @@
+/*  Native Audio Formats
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <QAudioDevice>
+#include "Common/Cpp/Containers/Pimpl.tpp"
+#include "NativeAudioFormats.h"
+
+
+//  Each platform defines:
+//  `NativeAudioFormats query_input_formats(const NativeAudioInfo& device)`
+//  as the raw audio formats from OS lib or Qt.
+//  `native_input_formats()` calls `query_input_formats()`, then fixes any
+//  broken channel layouts from there.
+#ifdef __APPLE__
+#include "NativeAudioFormats_Apple.tpp"
+#else
+
+namespace PokemonAutomation{
+namespace{
+
+
+//  QAudioDevice (Qt6) does not enumerate full formats, only
+//  isFormatSupported() / preferredFormat() / supportedSampleFormats(), so
+//  the supported list is probed over the standard grid of sample rates
+//  and channel counts. For each (rate, channels) shape the sample
+//  formats are tried in fixed quality order (float, int32, int16,
+//  uint8) and the first supported one is kept, so our preferred types
+//  beat the device's preferred sample format.
+//
+//  The probed formats leave the channel config unknown (Qt's check does
+//  not look at it); `native_input_formats()` will fix it later.
+//
+//  Note: this Qt solution does not work on macOS. Its macOS implementation
+//  has some bugs that always returns true to whatever probed format.
+std::vector<AudioFormat> enumerate_supported_formats(const NativeAudioInfo& info){
+    std::vector<AudioFormat> supported;
+
+    const QAudioFormat& preferred = info.preferredFormat();
+
+    const QAudioFormat::SampleFormat sample_formats[] = {
+        QAudioFormat::SampleFormat::Float,
+        QAudioFormat::SampleFormat::Int32,
+        QAudioFormat::SampleFormat::Int16,
+        QAudioFormat::SampleFormat::UInt8,
+    };
+
+    for (int rate : {8000, 11025, 16000, 22050, 32000, 44100, 48000, 88200, 96000, 176400, 192000}){
+        for (int channels : {1, 2, 3, 4, 5, 6, 7, 8}){
+            for (QAudioFormat::SampleFormat sample_format : sample_formats){
+                QAudioFormat candidate;
+                candidate.setSampleRate(rate);
+                candidate.setSampleFormat(sample_format);
+                candidate.setChannelCount(channels);
+                if (info.isFormatSupported(candidate)){
+                    supported.emplace_back(candidate);
+                    break;
+                }
+            }
+        }
+    }
+
+    if (supported.empty()){
+        //  Backends that reject everything (or report no sample formats)
+        //  still get an entry so there is always a selection.
+        supported.emplace_back(preferred);
+    }
+
+    return supported;
+}
+
+
+//  The formats Qt's isFormatSupported() accepts, and the format Qt reports
+//  the device running in.
+NativeAudioFormats query_input_formats(const NativeAudioInfo& device){
+    NativeAudioFormats ret;
+    ret.formats = enumerate_supported_formats(device);
+    ret.current = AudioFormat(device.preferredFormat());
+    return ret;
+}
+
+
+}
+}
+#endif
+
+
+
+namespace PokemonAutomation{
+
+
+
+QAudioFormat::ChannelConfig standard_channel_config(size_t channels){
+    switch (channels){
+    case 1: return QAudioFormat::ChannelConfig::ChannelConfigMono;
+    case 2: return QAudioFormat::ChannelConfig::ChannelConfigStereo;
+    case 3: return QAudioFormat::ChannelConfig::ChannelConfig2Dot1;
+    case 4: return QAudioFormat::ChannelConfig::ChannelConfig3Dot1;
+    case 5: return QAudioFormat::ChannelConfig::ChannelConfigSurround5Dot0;
+    case 6: return QAudioFormat::ChannelConfig::ChannelConfigSurround5Dot1;
+    case 7: return QAudioFormat::ChannelConfig::ChannelConfigSurround7Dot0;
+    case 8: return QAudioFormat::ChannelConfig::ChannelConfigSurround7Dot1;
+    default: return QAudioFormat::ChannelConfig::ChannelConfigUnknown;
+    }
+}
+
+
+namespace{
+
+//  If `format` has unknown channel config but known channel count,
+//  use the channel count to fix the channel config.
+AudioFormat fix_channel_layout(AudioFormat format){
+    QAudioFormat& native = format.native_format();
+    const QAudioFormat::ChannelConfig standard = standard_channel_config((size_t)native.channelCount());
+    if (native.channelConfig() == QAudioFormat::ChannelConfigUnknown
+        && standard != QAudioFormat::ChannelConfigUnknown){
+        native.setChannelConfig(standard);
+    }
+    return format;
+}
+
+}
+
+
+NativeAudioFormats native_input_formats(const NativeAudioInfo& device){
+    NativeAudioFormats ret = query_input_formats(device);
+    for (AudioFormat& format : ret.formats){
+        format = fix_channel_layout(format);
+    }
+    ret.current = fix_channel_layout(ret.current);
+    return ret;
+}
+
+
+
+}
diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/Backends/NativeAudioFormats.h b/SerialPrograms/Source/CommonFramework/AudioPipeline/Backends/NativeAudioFormats.h
new file mode 100644
index 0000000000..aa5d64f683
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/Backends/NativeAudioFormats.h
@@ -0,0 +1,40 @@
+/*  Native Audio Formats
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_AudioPipeline_NativeAudioFormats_H
+#define PokemonAutomation_AudioPipeline_NativeAudioFormats_H
+
+#include <vector>
+#include <QAudioFormat>
+#include "CommonFramework/AudioPipeline/AudioFormat.h"
+
+namespace PokemonAutomation{
+
+
+
+//  The standard channel layout for a channel count, e.g. 1 -> Mono,
+//  2 -> Stereo, 6 -> 5.1. Returns ChannelConfigUnknown for counts with no
+//  standard layout (0, or more than 8).
+QAudioFormat::ChannelConfig standard_channel_config(size_t channels);
+
+
+
+//  Native formats supported by an audio input device, and the format it runs
+//  in right now.
+struct NativeAudioFormats{
+    std::vector<AudioFormat> formats;   //  the formats to offer
+    AudioFormat current;                //  the format the device runs in right now
+};
+
+
+//  Returns native formats supported by an audio input device and the format
+//  it runs in right now.
+NativeAudioFormats native_input_formats(const NativeAudioInfo& device);
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/Backends/NativeAudioFormats_Apple.tpp b/SerialPrograms/Source/CommonFramework/AudioPipeline/Backends/NativeAudioFormats_Apple.tpp
new file mode 100644
index 0000000000..ee49ce2281
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/Backends/NativeAudioFormats_Apple.tpp
@@ -0,0 +1,233 @@
+/*  Native Audio Formats (Apple)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <cmath>
+#include <string>
+#include <vector>
+#include <CoreAudio/CoreAudio.h>
+#include <QAudioFormat>
+#include "NativeAudioFormats.h"
+
+namespace PokemonAutomation{
+namespace{
+
+
+//  The format Qt reports the device running in, as the only format. The
+//  fallback when the CoreAudio query fails, e.g. the device was just
+//  unplugged.
+NativeAudioFormats preferred_format_only(const NativeAudioInfo& device){
+    NativeAudioFormats ret;
+    ret.current = AudioFormat(device.preferredFormat());
+    ret.formats.emplace_back(ret.current);
+    return ret;
+}
+
+
+//  Reads a CoreAudio property that holds a single value of "Type".
+//  Returns false if the property is missing or the read fails.
+template <typename Type>
+bool read_property(
+    AudioObjectID object,
+    AudioObjectPropertySelector selector,
+    AudioObjectPropertyScope scope,
+    Type& value
+){
+    const AudioObjectPropertyAddress address{selector, scope, kAudioObjectPropertyElementMain};
+    UInt32 bytes = (UInt32)sizeof(Type);
+    return AudioObjectGetPropertyData(object, &address, 0, nullptr, &bytes, &value) == noErr
+        && bytes == sizeof(Type);
+}
+
+
+//  Reads a CoreAudio property that holds an array of "Type", e.g. the
+//  system's device list, a device's streams, or a stream's formats.
+//  Returns an empty list if the property is missing or the read fails.
+template <typename Type>
+std::vector<Type> read_property_list(
+    AudioObjectID object,
+    AudioObjectPropertySelector selector,
+    AudioObjectPropertyScope scope
+){
+    const AudioObjectPropertyAddress address{selector, scope, kAudioObjectPropertyElementMain};
+    UInt32 bytes = 0;
+    if (AudioObjectGetPropertyDataSize(object, &address, 0, nullptr, &bytes) != noErr){
+        return {};
+    }
+    std::vector<Type> list(bytes / sizeof(Type));
+    if (list.empty()){
+        return list;
+    }
+    bytes = (UInt32)(list.size() * sizeof(Type));
+    if (AudioObjectGetPropertyData(object, &address, 0, nullptr, &bytes, list.data()) != noErr){
+        return {};
+    }
+    list.resize(bytes / sizeof(Type));
+    return list;
+}
+
+
+//  The device's UID, e.g.
+//  "AppleUSBAudioEngine:MACROSILICON:MiraBox Capture:100000:3".
+//  Qt uses the UID as QAudioDevice::id() on macOS.
+//  Returns "" if it can't be read.
+std::string read_device_uid(AudioObjectID device){
+    const AudioObjectPropertyAddress address{
+        kAudioDevicePropertyDeviceUID,
+        kAudioObjectPropertyScopeGlobal,
+        kAudioObjectPropertyElementMain
+    };
+    CFStringRef uid = nullptr;
+    UInt32 bytes = (UInt32)sizeof(uid);
+    if (AudioObjectGetPropertyData(device, &address, 0, nullptr, &bytes, &uid) != noErr || uid == nullptr){
+        return "";
+    }
+    char buffer[1024];
+    const bool ok = CFStringGetCString(uid, buffer, sizeof(buffer), kCFStringEncodingUTF8);
+    CFRelease(uid);
+    return ok ? buffer : "";
+}
+
+
+//  The CoreAudio device whose UID is "uid", or kAudioObjectUnknown if no
+//  connected device has it.
+AudioObjectID find_device(const std::string& uid){
+    for (AudioObjectID device : read_property_list<AudioObjectID>(
+        kAudioObjectSystemObject, kAudioHardwarePropertyDevices, kAudioObjectPropertyScopeGlobal
+    )){
+        if (read_device_uid(device) == uid){
+            return device;
+        }
+    }
+    return kAudioObjectUnknown;
+}
+
+
+//  The Qt sample format that holds a CoreAudio linear PCM format without
+//  losing precision: 32-bit float as Float, and integers as UInt8, Int16
+//  or Int32. 24-bit integers become Int32: Qt has no 24-bit type, and
+//  CoreAudio widens them losslessly. Returns Unknown for anything else,
+//  e.g. compressed formats or 64-bit float.
+QAudioFormat::SampleFormat to_sample_format(const AudioStreamBasicDescription& format){
+    if (format.mFormatID != kAudioFormatLinearPCM){
+        return QAudioFormat::SampleFormat::Unknown;
+    }
+    const UInt32 bits = format.mBitsPerChannel;
+    if (format.mFormatFlags & kAudioFormatFlagIsFloat){
+        return bits == 32 ? QAudioFormat::SampleFormat::Float : QAudioFormat::SampleFormat::Unknown;
+    }
+    if (bits == 0){
+        return QAudioFormat::SampleFormat::Unknown;
+    }
+    if (bits <= 8){
+        return QAudioFormat::SampleFormat::UInt8;
+    }
+    if (bits <= 16){
+        return QAudioFormat::SampleFormat::Int16;
+    }
+    if (bits <= 32){
+        return QAudioFormat::SampleFormat::Int32;
+    }
+    return QAudioFormat::SampleFormat::Unknown;
+}
+
+
+//  The Qt format for a CoreAudio stream format at "sample_rate": the
+//  sample rate, channel count and sample format are set, the channel
+//  config is left unknown. Returns an invalid format if the CoreAudio
+//  format has no Qt equivalent.
+QAudioFormat to_qt_format(const AudioStreamBasicDescription& format, double sample_rate){
+    QAudioFormat ret;
+    const QAudioFormat::SampleFormat sample_format = to_sample_format(format);
+    if (sample_format == QAudioFormat::SampleFormat::Unknown
+        || format.mChannelsPerFrame == 0
+        || sample_rate < 1
+    ){
+        return ret;
+    }
+    ret.setSampleRate((int)std::lround(sample_rate));
+    ret.setChannelCount((int)format.mChannelsPerFrame);
+    ret.setSampleFormat(sample_format);
+    return ret;
+}
+
+
+//  Adds "format" to "formats" if it is valid and not already there.
+//  CoreAudio can list the same format more than once with flags Qt has no
+//  use for: the MiraBox lists 16-bit, 1 channel, 96000 Hz twice, once
+//  mixable and once non-mixable.
+void add_unique_format(std::vector<AudioFormat>& formats, const QAudioFormat& format){
+    if (!format.isValid()){
+        return;
+    }
+    for (const AudioFormat& existing : formats){
+        if (existing.native_format() == format){
+            return;
+        }
+    }
+    formats.emplace_back(format);
+}
+
+
+//  The rates offered when a physical format reports a continuous range of
+//  rates instead of a single one.
+const double STANDARD_SAMPLE_RATES[] = {
+    8000, 11025, 16000, 22050, 32000, 44100, 48000, 88200, 96000, 176400, 192000,
+};
+
+
+
+//  The device's physical formats from CoreAudio, and the one it runs in
+//  right now.
+NativeAudioFormats query_input_formats(const NativeAudioInfo& device){
+    const AudioObjectID native_device = find_device(device.id().toStdString());
+    if (native_device == kAudioObjectUnknown){
+        return preferred_format_only(device);
+    }
+
+    const std::vector<AudioStreamID> streams = read_property_list<AudioStreamID>(
+        native_device, kAudioDevicePropertyStreams, kAudioObjectPropertyScopeInput
+    );
+
+    //  Every physical format of every input stream. Each entry is one
+    //  hardware format with the range of rates it runs at, which for most
+    //  devices is a single rate (min == max).
+    NativeAudioFormats ret;
+    for (AudioStreamID stream : streams){
+        for (const AudioStreamRangedDescription& entry : read_property_list<AudioStreamRangedDescription>(
+            stream, kAudioStreamPropertyAvailablePhysicalFormats, kAudioObjectPropertyScopeGlobal
+        )){
+            const AudioValueRange& rates = entry.mSampleRateRange;
+            if (rates.mMaximum - rates.mMinimum < 1){
+                add_unique_format(ret.formats, to_qt_format(entry.mFormat, rates.mMinimum));
+                continue;
+            }
+            for (double rate : STANDARD_SAMPLE_RATES){
+                if (rates.mMinimum <= rate && rate <= rates.mMaximum){
+                    add_unique_format(ret.formats, to_qt_format(entry.mFormat, rate));
+                }
+            }
+        }
+    }
+    if (ret.formats.empty()){
+        return preferred_format_only(device);
+    }
+
+    //  The format the device runs in right now: the current physical
+    //  format of its first input stream.
+    AudioStreamBasicDescription current;
+    if (read_property(streams[0], kAudioStreamPropertyPhysicalFormat, kAudioObjectPropertyScopeGlobal, current)){
+        ret.current = AudioFormat(to_qt_format(current, current.mSampleRate));
+    }
+    if (!ret.current.native_format().isValid()){
+        ret.current = AudioFormat(device.preferredFormat());
+    }
+
+    return ret;
+}
+
+
+}
+}
diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/IO/AudioFileLoader.cpp b/SerialPrograms/Source/CommonFramework/AudioPipeline/IO/AudioFileLoader.cpp
index 6a50f1b6e0..4a4ee9a587 100644
--- a/SerialPrograms/Source/CommonFramework/AudioPipeline/IO/AudioFileLoader.cpp
+++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/IO/AudioFileLoader.cpp
@@ -1,6 +1,6 @@
 /*  Audio File Loader
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -13,6 +13,7 @@
 #include <QEventLoop>
 #include "3rdParty/QtWavFile/WavFile.h"
 #include "Common/Qt/StringToolsQt.h"
+#include "Common/Qt/GlobalThreadPoolsQt.h"
 #include "CommonFramework/AudioPipeline/Tools/AudioFormatUtils.h"
 #include "AudioFileLoader.h"
 
@@ -23,157 +24,199 @@
 
 namespace PokemonAutomation{
 
-AudioFileLoader::AudioFileLoader(QObject* parent, const std::string& filename, const QAudioFormat& audioFormat):
-    QObject(parent), m_filename(filename), m_audioFormat(audioFormat) {}
+AudioFileLoader::AudioFileLoader(
+    QObject* parent,
+    const std::string& filename,
+    const QAudioFormat& audio_format
+):
+    QObject(parent), m_filename(filename), m_audio_format(audio_format) {}
 
 AudioFileLoader::~AudioFileLoader(){
-    if (m_audioDecoderWorker){
-        m_audioDecoderWorker->stop();
+    if (m_audio_decoder_worker){
+        m_audio_decoder_worker->stop();
     }
 
-    m_audioDecoderThread.quit();
-    m_audioDecoderThread.wait();
+    GlobalThreadPools::qt_event_threadpool().remove_object(m_audio_decoder_worker);
+//    m_audioDecoderThread.quit();
+//    m_audioDecoderThread.wait();
 
-    if (m_audioDecoderWorker){
-        delete m_audioDecoderWorker;
-        m_audioDecoderWorker = nullptr;
-    }
+//    if (m_audio_decoder_worker){
+//        delete m_audio_decoder_worker;
+        m_audio_decoder_worker = nullptr;
+//    }
 
-    if (m_wavFile){
-        m_wavFile->close();
-        delete m_wavFile;
-        m_wavFile = nullptr;
+    if (m_wav_file){
+        m_wav_file->close();
+        delete m_wav_file;
+        m_wav_file = nullptr;
     }
 }
 
 bool AudioFileLoader::start(){
 
-    m_frames_per_timeout = m_audioFormat.sampleRate() * m_timer_interval_ms / 1000;
+    m_frames_per_timeout = m_audio_format.sampleRate() * m_timer_interval_ms / 1000;
 
     if (has_extension(m_filename, "wav")){
         // Use WavFile to load unencoded samples:
-        if (!initWavFile()){
+        if (!init_wav_file()){
             return false;
         }
 
-        const int wavSampleRate = m_wavFile->audioFormat().sampleRate();
-        if (wavSampleRate != m_audioFormat.sampleRate()){
-            std::cout << "Error: we don't interpolate wav file sample rate " << wavSampleRate << " to " << 
-                m_audioFormat.sampleRate() << " during playback" << std::endl;
+        const QAudioFormat& wav_audio_format = m_wav_file->audioFormat();
+        //  Up to 8 channels: that is the range with a standard channel
+        //  layout (the mixer's fallback_channel_config), which is what the
+        //  tree's mix matrix is built from. Beyond that the tree cannot
+        //  mix the input, so the file is rejected up front.
+        if (wav_audio_format.channelCount() > 8){
+            std::cout << "Error: audio file input supports up to 8 channels; the wav file has "
+                << wav_audio_format.channelCount() << " channels." << std::endl;
             return false;
         }
 
-
-        buildTimer();
-        connect(m_timer, &QTimer::timeout, this, &AudioFileLoader::sendBufferFromWavFileOnTimer);
+        //  The loader streams the wav's native format: the caller
+        //  (AudioInputFile) sets m_audio_format to the file's own format
+        //  (probed from the header), so m_frames_per_timeout paces the timer
+        //  at the file's sample rate and the raw bytes are emitted as-is.
+        build_timer();
+        connect(m_timer, &QTimer::timeout, this, &AudioFileLoader::send_buffer_from_wav_file_on_timer);
         
         return true;
     }
 
     // Use QAudioDecoder to decode compressed audio file:
-    m_audioDecoderWorker = new AudioDecoderWorker(this, m_filename, m_audioFormat, m_rawBuffer);
+    m_audio_decoder_worker = static_cast<AudioDecoderWorker*>(
+        GlobalThreadPools::qt_event_threadpool().add_object([this]{
+            return std::make_unique<AudioDecoderWorker>(nullptr, m_filename, m_audio_format, m_raw_buffer);
+        })
+    );
 
     // When the decoder finishes decoding the entire file, launch a timer to send decoded audio
     // frames to outside at desired frame rate.
     // Note: here we save all the decoded raw samples to memory before sending them out.
     // For a large audio file this is problematic, will consume lots of memory. But for small audio
     // files this is OK.
-    connect(m_audioDecoderWorker, &AudioDecoderWorker::finished, this, [&](){
+    connect(m_audio_decoder_worker, &AudioDecoderWorker::finished, this, [&](){
         std::cout << "Audio decoder finishes decoding. Start playing audio at desired sample rate" << std::endl;
-        buildTimer();
-        connect(m_timer, &QTimer::timeout, this, &AudioFileLoader::sendDecodedBufferOnTimer);
+        if (m_raw_buffer.empty()){
+            std::cout << "Error: audio decoder produced no audio data for " << m_filename
+                << " (the decoder could not find usable audio in the file; nothing to play)." << std::endl;
+            return;
+        }
+        build_timer();
+        connect(m_timer, &QTimer::timeout, this, &AudioFileLoader::send_decoded_buffer_on_timer);
     });
 
-    m_audioDecoderWorker->start();
+    emit m_audio_decoder_worker->start();
 
-    return m_audioDecoderWorker->startSucceeded();
+    return m_audio_decoder_worker->start_succeeded();
 }
 
-void AudioFileLoader::buildTimer(){
+void AudioFileLoader::build_timer(){
     m_timer = new QTimer(this);
     m_timer->setTimerType(Qt::PreciseTimer);
     m_timer->start((int)m_timer_interval_ms);
 }
 
-std::tuple<const char*, size_t> AudioFileLoader::loadFullAudio(){
+std::tuple<const char*, size_t> AudioFileLoader::load_full_audio(){
     if (has_extension(m_filename, "wav")){
         // Use WavFile to load unencoded samples:
-        if (!initWavFile()){
+        if (!init_wav_file()){
             return std::make_tuple<const char*, size_t>(nullptr, 0);
         }
 
-        const size_t numBytes = m_wavFile->size() - m_wavFile->pos();
-        m_rawBuffer.resize(numBytes);
-        const size_t bytesRead = m_wavFile->read(m_rawBuffer.data(), numBytes);
-        if (bytesRead != numBytes){
-            std::cout << "Error: failed to read all bytes from wav file: " << bytesRead << " < " << numBytes << std::endl;
+        //  The batch API converts the sample type and channels to the
+        //  requested format, but not the sample rate: its consumer
+        //  (load_audio_template) assumes the returned data is at the requested
+        //  rate.
+        if (m_wav_file->audioFormat().sampleRate() != m_audio_format.sampleRate()){
+            std::cout << "Error: load_full_audio() requires the wav file's sample rate ("
+                << m_wav_file->audioFormat().sampleRate() << ") to match the requested sample rate ("
+                << m_audio_format.sampleRate() << "); it does not resample." << std::endl;
+            return std::make_tuple<const char*, size_t>(nullptr, 0);
         }
-        return convertRawWavSamples();
+
+        const size_t num_bytes = m_wav_file->size() - m_wav_file->pos();
+        m_raw_buffer.resize(num_bytes);
+        const size_t bytes_read = m_wav_file->read(m_raw_buffer.data(), num_bytes);
+        if (bytes_read != num_bytes){
+            std::cout << "Error: failed to read all bytes from wav file: " << bytes_read << " < " << num_bytes << std::endl;
+        }
+        return convert_raw_wav_samples();
     }
 
     // Use QAudioDecoder to decode compressed audio file:
-    m_audioDecoderWorker = new AudioDecoderWorker(nullptr, m_filename, m_audioFormat, m_rawBuffer);
-    m_audioDecoderWorker->moveToThread(&m_audioDecoderThread);
+    m_audio_decoder_worker = static_cast<AudioDecoderWorker*>(
+        GlobalThreadPools::qt_event_threadpool().add_object([this]{
+            return std::make_unique<AudioDecoderWorker>(nullptr, m_filename, m_audio_format, m_raw_buffer);
+        })
+    );
+//    m_audio_decoder_worker = new AudioDecoderWorker(nullptr, m_filename, m_audio_format, m_raw_buffer);
+//    m_audio_decoder_worker->moveToThread(&m_audioDecoderThread);
 
-    connect(this, &AudioFileLoader::runAudioDecoderAsync, m_audioDecoderWorker, &AudioDecoderWorker::start);
-    connect(&m_audioDecoderThread, &QThread::finished, m_audioDecoderWorker, &QObject::deleteLater);
+    connect(this, &AudioFileLoader::run_audio_decoder_async, m_audio_decoder_worker, &AudioDecoderWorker::start);
+//    connect(&m_audioDecoderThread, &QThread::finished, m_audio_decoder_worker, &QObject::deleteLater);
 
     QEventLoop loop;
-    connect(m_audioDecoderWorker, &AudioDecoderWorker::errored, &loop, &QEventLoop::quit);
-    connect(m_audioDecoderWorker, &AudioDecoderWorker::finished, &loop, &QEventLoop::quit);
+    connect(m_audio_decoder_worker, &AudioDecoderWorker::errored, &loop, &QEventLoop::quit);
+    connect(m_audio_decoder_worker, &AudioDecoderWorker::finished, &loop, &QEventLoop::quit);
 
-    // m_audioDecoderThread takes care of m_audioDecoderWorker via finished -> deleteLater connection.
-    // So we don't hold the pointer m_audioDecoderWorker anymore.
-    m_audioDecoderWorker = nullptr;
+    // m_audioDecoderThread takes care of m_audio_decoder_worker via finished -> deleteLater connection.
+    // So we don't hold the pointer m_audio_decoder_worker anymore.
+    m_audio_decoder_worker = nullptr;
 
-    m_audioDecoderThread.start();
-    emit runAudioDecoderAsync();
+//    m_audioDecoderThread.start();
+    emit run_audio_decoder_async();
 
-    // Block the current thread until the m_audioDecoderWorker errored or finished.
+    // Block the current thread until the m_audio_decoder_worker errored or finished.
     loop.exec();
+    if (m_raw_buffer.empty()){
+        std::cout << "Error: audio decoder produced no audio data for " << m_filename
+            << " (the decoder could not find usable audio in the file)." << std::endl;
+    }
     
-    m_audioDecoderThread.quit();
-    m_audioDecoderThread.wait();
-    return std::make_tuple<const char*, size_t>(m_rawBuffer.data(), m_rawBuffer.size());
+//    m_audioDecoderThread.quit();
+//    m_audioDecoderThread.wait();
+    GlobalThreadPools::qt_event_threadpool().remove_object(m_audio_decoder_worker);
+    return std::make_tuple<const char*, size_t>(m_raw_buffer.data(), m_raw_buffer.size());
 }
 
-bool AudioFileLoader::initWavFile(){
+bool AudioFileLoader::init_wav_file(){
     std::cout << "Initialize WavFile on " << m_filename << std::endl;
-    m_wavFile = new WavFile(this);
-    if (m_wavFile->open(QString::fromStdString(m_filename)) == false){
+    m_wav_file = new WavFile(this);
+    if (m_wav_file->open(QString::fromStdString(m_filename)) == false){
         std::cout << "Error: WavFile cannot open file " << m_filename << std::endl;
         return false;
     }
 
-    std::cout << "Wav file audio format: " << dumpAudioFormat(m_wavFile->audioFormat());
+    std::cout << "Wav file audio format: " << dump_audio_format(m_wav_file->audioFormat());
 
-    if (m_audioFormat.sampleRate() != m_wavFile->audioFormat().sampleRate()){
-        std::cout << "Error: WavFile sample rate " << m_wavFile->audioFormat().sampleRate() <<
-            " does not match required " << m_audioFormat.sampleRate() << std::endl;
-        return false;
-    }
+    //  The wav's native rate / channels / sample type are the stream's
+    //  format: the caller (AudioInputFile) probes the header and sets
+    //  m_audio_format to the file's own format, so the raw bytes stream
+    //  through unconverted at the file's rate. (load_full_audio() keeps the
+    //  "convert to the requested format" behavior for its batch consumer.)
 
     return true;
 }
 
 
-void AudioFileLoader::sendDecodedBufferOnTimer(){
-    const int bytesPerFrame = m_audioFormat.bytesPerFrame();
-    const size_t bytesToSend = bytesPerFrame * m_frames_per_timeout;
+void AudioFileLoader::send_decoded_buffer_on_timer(){
+    const int bytes_per_frame = m_audio_format.bytesPerFrame();
+    const size_t bytes_to_send = bytes_per_frame * m_frames_per_timeout;
 
-    const auto& buffer = m_rawBuffer;
+    const auto& buffer = m_raw_buffer;
 
-    const size_t m_bufferEnd = std::min(m_bufferNext + bytesToSend, buffer.size());
+    const size_t buffer_end = std::min(m_buffer_next + bytes_to_send, buffer.size());
 
-//    const float* floatData = reinterpret_cast<const float*>(buffer.data() + m_bufferNext);
-    // std::cout << "Timer: " << floatData[0] << " " << floatData[1] << "... " << buffer.size() << " " << m_bufferNext << std::endl;
+//    const float* float_data = reinterpret_cast<const float*>(buffer.data() + m_buffer_next);
+    // std::cout << "Timer: " << float_data[0] << " " << float_data[1] << "... " << buffer.size() << " " << m_buffer_next << std::endl;
 
-    const size_t sentLen = m_bufferEnd - m_bufferNext;
-    emit bufferReady(buffer.data() + m_bufferNext, sentLen);
+    const size_t sent_len = buffer_end - m_buffer_next;
+    emit buffer_ready(buffer.data() + m_buffer_next, sent_len);
 
-    m_bufferNext = m_bufferEnd;
+    m_buffer_next = buffer_end;
 
-    if (m_bufferEnd == buffer.size()){
+    if (buffer_end == buffer.size()){
         if (m_timer){
             m_timer->stop();
         }
@@ -181,15 +224,15 @@ void AudioFileLoader::sendDecodedBufferOnTimer(){
     }
 }
 
-void AudioFileLoader::sendBufferFromWavFileOnTimer(){
-    const QAudioFormat& wavAudioFormat = m_wavFile->audioFormat();
-    const int wavBytesPerFrame = wavAudioFormat.bytesPerFrame();
-    const int wavBytesToRead = (int)(wavBytesPerFrame * m_frames_per_timeout);
-    m_rawBuffer.resize(wavBytesToRead);
-    const int wavBytesRead = m_wavFile->read(m_rawBuffer.data(), wavBytesToRead);
-    m_rawBuffer.resize(wavBytesRead);
+void AudioFileLoader::send_buffer_from_wav_file_on_timer(){
+    const QAudioFormat& wav_audio_format = m_wav_file->audioFormat();
+    const int wav_bytes_per_frame = wav_audio_format.bytesPerFrame();
+    const int wav_bytes_to_read = (int)(wav_bytes_per_frame * m_frames_per_timeout);
+    m_raw_buffer.resize(wav_bytes_to_read);
+    const int64_t wav_bytes_read = m_wav_file->read(m_raw_buffer.data(), wav_bytes_to_read);
+    m_raw_buffer.resize(wav_bytes_read);
 
-    if (wavBytesRead == 0){
+    if (wav_bytes_read == 0){
         if (m_timer){
             m_timer->stop();
         }
@@ -197,139 +240,121 @@ void AudioFileLoader::sendBufferFromWavFileOnTimer(){
         return;
     }
 
-    const auto bufferPtrLen = convertRawWavSamples();
-    emit bufferReady(std::get<0>(bufferPtrLen), std::get<1>(bufferPtrLen));
+    //  The file's native format is the stream's format, so the raw bytes are
+    //  emitted as-is (no conversion).
+    emit buffer_ready(m_raw_buffer.data(), (size_t)wav_bytes_read);
 }
 
-std::pair<const char*, size_t> AudioFileLoader::convertRawWavSamples(){
-    const QAudioFormat& wavAudioFormat = m_wavFile->audioFormat();
+std::pair<const char*, size_t> AudioFileLoader::convert_raw_wav_samples(){
+    const QAudioFormat& wav_audio_format = m_wav_file->audioFormat();
 
-    const size_t wavBytesRead = m_rawBuffer.size();
+    const size_t wav_bytes_read = m_raw_buffer.size();
     
     // Simple case, the target audio format is the same as the format used in the wav file.
-    if (m_audioFormat == wavAudioFormat){
-        return {m_rawBuffer.data(), wavBytesRead};
+    if (m_audio_format == wav_audio_format){
+        return {m_raw_buffer.data(), wav_bytes_read};
     }
 
     // Now we need to convert the audio samples to the target format:
 
-    const size_t wavBytesPerFrame = wavAudioFormat.bytesPerFrame();
-    const size_t wavNumChannels = wavAudioFormat.channelCount();
-    const size_t wavBytesPerSample = wavBytesPerFrame / wavNumChannels;
-    const size_t framesRead = wavBytesRead / wavBytesPerFrame;
-    const size_t samplesRead = wavBytesRead / wavBytesPerSample;
+    const size_t wav_bytes_per_frame = wav_audio_format.bytesPerFrame();
+    const size_t wav_num_channels = wav_audio_format.channelCount();
+    const size_t wav_bytes_per_sample = wav_bytes_per_frame / wav_num_channels;
+    const size_t frames_read = wav_bytes_read / wav_bytes_per_frame;
+    const size_t samples_read = wav_bytes_read / wav_bytes_per_sample;
 
-    // m_floatBuffer holds the converted float-type samples
+    // m_float_buffer holds the converted float-type samples
     // TODO: design a general format conversion method
-    m_floatBuffer.resize(samplesRead);
-    convertSamplesToFloat(wavAudioFormat, m_rawBuffer.data(), wavBytesRead, m_floatBuffer.data());
+    m_float_buffer.resize(samples_read);
+    convert_samples_to_float(wav_audio_format, m_raw_buffer.data(), wav_bytes_read, m_float_buffer.data());
     
-    if (m_audioFormat.channelCount() == wavAudioFormat.channelCount()){
+    if (m_audio_format.channelCount() == wav_audio_format.channelCount()){
         return {
-            reinterpret_cast<const char*>(m_floatBuffer.data()),
-            m_floatBuffer.size() * sizeof(float)
+            reinterpret_cast<const char*>(m_float_buffer.data()),
+            m_float_buffer.size() * sizeof(float)
         };
     }
     
-    if(m_audioFormat.channelCount() == 1){
+    if(m_audio_format.channelCount() == 1){
         // Input wav file has stereo or more channels, but output format is mono,
         // average L and R channel samples per frame:
-        for(size_t i = 0; i < framesRead; i++){
-            m_floatBuffer[i] = (m_floatBuffer[2*i] + m_floatBuffer[2*i+1]) / 2.0f;
+        for (size_t i = 0; i < frames_read; i++){
+            m_float_buffer[i] = (m_float_buffer[2*i] + m_float_buffer[2*i+1]) / 2.0f;
         }
-        return {reinterpret_cast<const char*>(m_floatBuffer.data()), framesRead * sizeof(float)};
+        return {reinterpret_cast<const char*>(m_float_buffer.data()), frames_read * sizeof(float)};
     }
     
-    if(wavAudioFormat.channelCount() == 1){
+    if(wav_audio_format.channelCount() == 1){
         // Input wav is mono but output format is stereo,
         // Duplicate samples for each channel:
-        m_floatBuffer.resize(samplesRead * m_audioFormat.channelCount());
-        for(size_t i = samplesRead; i-- > 0;){
-            const float v = m_floatBuffer[i];
-            for(int j = m_audioFormat.channelCount()-1; j >= 0; j--){
-                m_floatBuffer[m_audioFormat.channelCount()*i+j] = v;
+        m_float_buffer.resize(samples_read * m_audio_format.channelCount());
+        for (size_t i = samples_read; i-- > 0;){
+            const float v = m_float_buffer[i];
+            for (int j = m_audio_format.channelCount()-1; j >= 0; j--){
+                m_float_buffer[m_audio_format.channelCount()*i+j] = v;
             }
         }
         return {
-            reinterpret_cast<const char*>(m_floatBuffer.data()),
-            framesRead * m_audioFormat.channelCount() * sizeof(float)
+            reinterpret_cast<const char*>(m_float_buffer.data()),
+            frames_read * m_audio_format.channelCount() * sizeof(float)
         };
     }
     
     std::cout << "Error format conversion" << std::endl;
-    std::cout << "Wav file format: " << dumpAudioFormat(wavAudioFormat);
-    std::cout << "Audio format to convert to: " << dumpAudioFormat(m_audioFormat);
-    return {reinterpret_cast<const char*>(m_floatBuffer.data()), 0};
+    std::cout << "Wav file format: " << dump_audio_format(wav_audio_format);
+    std::cout << "Audio format to convert to: " << dump_audio_format(m_audio_format);
+    return {reinterpret_cast<const char*>(m_float_buffer.data()), 0};
 }
 
 
 AudioDecoderWorker::AudioDecoderWorker(
     QObject* parent,
     const std::string& filename,
-    const QAudioFormat& audioFormat,
-    std::vector<char>& decodedBuffer
+    const QAudioFormat& audio_format,
+    std::vector<char>& decoded_buffer
 ):
-    QObject(parent), m_filename(filename), m_audioFormat(audioFormat), m_decodedBuffer(decodedBuffer){}
+    QObject(parent), m_filename(filename), m_audio_format(audio_format), m_decoded_buffer(decoded_buffer){}
 
 
-void AudioDecoderWorker::start(){
-    m_audioDecoder = new QAudioDecoder(this);
+void AudioDecoderWorker::internal_start(){
+    m_audio_decoder = new QAudioDecoder(this);
 
 #if 0
     connect(
-        m_audioDecoder, &QAudioDecoder::bufferAvailableChanged,
+        m_audio_decoder, &QAudioDecoder::bufferAvailableChanged,
         this, [](bool available){
             std::cout << "QAudioDecoder::bufferAvailableChanged(): " << available << std::endl;
         }
     );
 #endif
 
-#if QT_VERSION_MAJOR == 5
-    connect(
-        m_audioDecoder, &QAudioDecoder::stateChanged,
-        this, [this](QAudioDecoder::State state){
-            std::cout << "QAudioDecoder::stateChanged(): " << (int)state << std::endl;
-            emit this->finished();
-        }
-    );
-#endif
-
-    // Whenever a new buffer of audo frames decoded, save them by calling readAudioDecoderBuffer().
-    connect(m_audioDecoder, &QAudioDecoder::bufferReady, this, &AudioDecoderWorker::readAudioDecoderBuffer);
+    // Whenever a new buffer of audo frames decoded, save them by calling read_audio_decoder_buffer().
+    connect(m_audio_decoder, &QAudioDecoder::bufferReady, this, &AudioDecoderWorker::read_audio_decoder_buffer);
 
     // When the decoder finishes decoding the entire file, launch a timer to send decoded audio
     // frames to outside at desired frame rate.
     // Note: here we save all the decoded raw samples to memory before sending them out.
     // For a large audio file this is problematic, will consume lots of memory. But for small audio
     // files this is OK.
-    connect(m_audioDecoder, &QAudioDecoder::finished, this, &AudioDecoderWorker::finished);
+    connect(m_audio_decoder, &QAudioDecoder::finished, this, &AudioDecoderWorker::finished);
 
-    m_audioDecoder->setAudioFormat(m_audioFormat);
-    if (m_audioDecoder->error() != QAudioDecoder::NoError){
-        handleAudioDecoderError();
-        m_startSucceeded = false;
+    m_audio_decoder->setAudioFormat(m_audio_format);
+    if (m_audio_decoder->error() != QAudioDecoder::NoError){
+        handle_audio_decoder_error();
+        m_start_succeeded = false;
         return;
     }
 
-    // Using Qt5, there may be errors about:
-    // defaultServiceProvider::requestService(): no service found for - "org.qt-project.qt.audiodecode"
-    // The QAudioDecoder object does not have a valid service
-    // For solution, see https://stackoverflow.com/questions/22783381/qaudiodecoder-no-service-found
-    connect(m_audioDecoder, QOverload<QAudioDecoder::Error>::of(&QAudioDecoder::error), this, [&](QAudioDecoder::Error){
-        handleAudioDecoderError();
+    connect(m_audio_decoder, QOverload<QAudioDecoder::Error>::of(&QAudioDecoder::error), this, [&](QAudioDecoder::Error){
+        handle_audio_decoder_error();
     });
 
-    // m_audioDecoder->setSourceDevice(&m_file);
-#if QT_VERSION_MAJOR == 5
-    m_audioDecoder->setSourceFilename(QString::fromStdString(m_filename));
-#elif QT_VERSION_MAJOR == 6
-    m_audioDecoder->setSource(QUrl::fromLocalFile(QString::fromStdString(m_filename)));
-#endif
+    m_audio_decoder->setSource(QUrl::fromLocalFile(QString::fromStdString(m_filename)));
 
-    m_audioDecoder->start();
+    m_audio_decoder->start();
     std::cout << "Start audio decoder." << std::endl;
 
-    m_startSucceeded = true;
+    m_start_succeeded = true;
     return;
 }
 
@@ -337,59 +362,53 @@ AudioDecoderWorker::~AudioDecoderWorker(){
     stop();
 }
 
-void AudioDecoderWorker::stop(){
-    if (m_audioDecoder){
-        m_audioDecoder->stop();
+void AudioDecoderWorker::internal_stop(){
+    if (m_audio_decoder){
+        m_audio_decoder->stop();
     }
 }
 
-void AudioDecoderWorker::readAudioDecoderBuffer(){
-    if (m_audioDecoder == nullptr){
+void AudioDecoderWorker::read_audio_decoder_buffer(){
+    if (m_audio_decoder == nullptr){
         return;
     }
 
-    const QAudioBuffer& buffer = m_audioDecoder->read();
-    size_t oldSize = m_decodedBuffer.size();
-    m_decodedBuffer.resize(oldSize + buffer.byteCount());
-    memcpy(m_decodedBuffer.data() + oldSize, buffer.data<char>(), buffer.byteCount());
+    const QAudioBuffer& buffer = m_audio_decoder->read();
+    size_t old_size = m_decoded_buffer.size();
+    m_decoded_buffer.resize(old_size + buffer.byteCount());
+    memcpy(m_decoded_buffer.data() + old_size, buffer.data<char>(), buffer.byteCount());
 
 #ifdef DEBUG_AUDIO_DECODER_WORKER
     std::cout << "Read QAudioBuffer (size " << buffer.byteCount() << ") from audio decoder, cur pos " <<
-        m_audioDecoder->position() << " ms, total length " << m_audioDecoder->duration() << " ms, " << 
-        "buffer length now " << m_decodedBuffer.size() << std::endl;
+        m_audio_decoder->position() << " ms, total length " << m_audio_decoder->duration() << " ms, " << 
+        "buffer length now " << m_decoded_buffer.size() << std::endl;
 #endif
 }
 
 
-void AudioDecoderWorker::handleAudioDecoderError(){
-    if (m_audioDecoder){
-        QAudioDecoder::Error error = m_audioDecoder->error();
-        std::string errorStr;
+void AudioDecoderWorker::handle_audio_decoder_error(){
+    if (m_audio_decoder){
+        QAudioDecoder::Error error = m_audio_decoder->error();
+        std::string error_str;
         switch(error){
         case QAudioDecoder::ResourceError:
-            errorStr = "ResourceError";
+            error_str = "ResourceError";
             break;
         case QAudioDecoder::AccessDeniedError:
-            errorStr = "AccessDeniedError";
+            error_str = "AccessDeniedError";
             break;
         case QAudioDecoder::FormatError:
-            errorStr = "FormatError";
+            error_str = "FormatError";
             break;
-#if QT_VERSION_MAJOR == 5
-        case QAudioDecoder::ServiceMissingError:
-            errorStr = "ServiceMissingError";
-            break;
-#elif QT_VERSION_MAJOR == 6
         case QAudioDecoder::NotSupportedError:
-            errorStr = "NotSupportedError";
+            error_str = "NotSupportedError";
             break;
-#endif
         default:
-            errorStr = "UnownError";
+            error_str = "UnownError";
         }
 
         std::cout << "QAudioDecoder error when loading file: " << m_filename << ", " <<
-            errorStr << ": " << m_audioDecoder->errorString().toStdString() << std::endl;
+            error_str << ": " << m_audio_decoder->errorString().toStdString() << std::endl;
 
         emit errored();
     }
diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/IO/AudioFileLoader.h b/SerialPrograms/Source/CommonFramework/AudioPipeline/IO/AudioFileLoader.h
index 657ec280cf..ce1236fee6 100644
--- a/SerialPrograms/Source/CommonFramework/AudioPipeline/IO/AudioFileLoader.h
+++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/IO/AudioFileLoader.h
@@ -1,6 +1,6 @@
 /*  Audio File Loader
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -12,7 +12,6 @@
 #include <QObject>
 #include <QAudioFormat>
 #include <QFile>
-#include <QThread>
 
 class QAudioBuffer;
 class QAudioDecoder;
@@ -25,32 +24,42 @@ namespace PokemonAutomation{
 
 class AudioDecoderWorker;
 
-// Load .wav and .mp3 audio from disk and optionally play at desired sample rate.
+// Load .wav and .mp3 audio from disk and play at the file's sample rate.
 
 // Note: for ease of implementation this class saves all the decoded raw samples to
 // memory before sending them out when `start()` is called. For a large audio file this
 // is problematic as it will consume lots of memory. But the purpose of this functionality
 // is to load recorded audio for testing and developing audio inference programs.
 // So the input audio files should be small.
-// You can also call `loadFullAudio()` to load the audio directly into memory.
-// The loader tries to convert the audio data into the format specified as `audioFormat`
-// in the constructor. For .mp3 files this conversion is done by QtAudioDecoder, while
-// for .wav files the converion is done in `AudioFileLoader`.
-// Currently we hard code the code to only return float data because that's the rest of
-// the audio pipeline uses.
-// For .wav file the format conversion is not fully implement: we cannot convert sampling
-// rate during playback (after 'start()' called), but support it in `loadFullAudio()`.
+// You can also call `load_full_audio()` to load the audio directly into memory.
+//
+// For .wav files the loader streams the file's native format (rate, channels,
+// sample type): the caller is expected to set `audio_format` to the file's own
+// format (see probe_wav_native_format()), so the timer paces at the file's rate
+// and the raw bytes are emitted unconverted.
+// For .mp3 (and other compressed formats) the caller probes the decoder's
+// native output format (see probe_decoded_native_format()) and sets
+// `audio_format` to it, so QAudioDecoder decodes to that format (an identity
+// conversion) and the decoded bytes are emitted at the file's native rate.
+// load_full_audio() is the batch "convert to the requested format" API: it
+// converts the sample type and channels to `audio_format`, but not the sample
+// rate, which must already match (its consumer, load_audio_template, assumes the
+// returned data is at the requested rate).
 class AudioFileLoader: public QObject{
     Q_OBJECT
 
 public:
-    AudioFileLoader(QObject* parent, const std::string& filename, const QAudioFormat& audioFormat);
+    AudioFileLoader(
+        QObject* parent,
+        const std::string& filename,
+        const QAudioFormat& audio_format
+    );
     virtual ~AudioFileLoader();
 
     // Start loading and decoding audio samples.
-    // Send the sample buffers at the desired speed determined by sample rate in `audioFormat` passed
+    // Send the sample buffers at the desired speed determined by sample rate in `audio_format` passed
     // to the constructor.
-    // Retrieve sample buffer by connecting to signal `bufferReady` from the same thread.
+    // Retrieve sample buffer by connecting to signal `buffer_ready` from the same thread.
     // See comments of the class full more details.
     bool start();
 
@@ -58,55 +67,55 @@ class AudioFileLoader: public QObject{
     // the decoded audio data. If loading fails, the returned pointer is nullptr.
     // Note: this is a blocking operation.
     // See comments of the class full more details.
-    std::tuple<const char*, size_t> loadFullAudio();
+    std::tuple<const char*, size_t> load_full_audio();
 
-    const QAudioFormat& audioFormat() const { return m_audioFormat; }
+    const QAudioFormat& audio_format() const { return m_audio_format; }
 
 signals:
     // Send audio sample buffer at time interval `m_timer_interval_ms` after `start()` called
     // Pass raw pointer. So must be connected to objects in the same thread!
-    void bufferReady(const char* data, size_t len);
+    void buffer_ready(const char* data, size_t len);
 
     // When finished sending decoded audio frames after `start()` called
     void finished();
 
     // Used privately to launch audio decoder woker in a separate thread.
-    void runAudioDecoderAsync();
+    void run_audio_decoder_async();
 
 private:
-    void buildTimer();
+    void build_timer();
     
-    bool initWavFile();
+    bool init_wav_file();
 
-    // Send audio samples decoded from m_audioDecoder on m_timer.
-    void sendDecodedBufferOnTimer();
+    // Send audio samples decoded from m_audio_decoder on m_timer.
+    void send_decoded_buffer_on_timer();
 
-    // Convert raw samples read from m_wavFile (stored in m_rawBuffer) into
+    // Convert raw samples read from m_wav_file (stored in m_raw_buffer) into
     // float type and return the pointer and length of the converted data.
-    std::pair<const char*, size_t> convertRawWavSamples();
+    std::pair<const char*, size_t> convert_raw_wav_samples();
 
-    // Send audio samples read fomr m_wavFile on m_timer.
-    void sendBufferFromWavFileOnTimer();
+    // Send audio samples read fomr m_wav_file on m_timer.
+    void send_buffer_from_wav_file_on_timer();
 
 private:
     std::string m_filename;
 
-    QAudioFormat m_audioFormat;
+    QAudioFormat m_audio_format;
 
-    AudioDecoderWorker* m_audioDecoderWorker = nullptr;
-    QThread m_audioDecoderThread;
+    AudioDecoderWorker* m_audio_decoder_worker = nullptr;
+//    QThread m_audioDecoderThread;
 
-    WavFile* m_wavFile = nullptr;
+    WavFile* m_wav_file = nullptr;
 
-    // Buffer to store raw audio data from m_wavFile or output from m_audioDecoderWorker
-    std::vector<char> m_rawBuffer;
+    // Buffer to store raw audio data from m_wav_file or output from m_audio_decoder_worker
+    std::vector<char> m_raw_buffer;
 
-    // Since m_wavFile only reads raw audio file, we need to do sample type conversion ourselves.
+    // Since m_wav_file only reads raw audio file, we need to do sample type conversion ourselves.
     // Therefore we need a buffer to store converted audio samples.
-    std::vector<float> m_floatBuffer;
+    std::vector<float> m_float_buffer;
 
-    // When reading m_rawBuffer, which index to start reading.
-    size_t m_bufferNext = 0;
+    // When reading m_raw_buffer, which index to start reading.
+    size_t m_buffer_next = 0;
 
     // To playback the decoded audio frames at sample rate, we need a timer.
     QTimer* m_timer = nullptr;
@@ -124,17 +133,26 @@ class AudioFileLoader: public QObject{
 
 // Used to run QAudioDecoder and collect decoded results
 class AudioDecoderWorker: public QObject{
-Q_OBJECT
+    Q_OBJECT
 
 public:
-    AudioDecoderWorker(QObject* parent, const std::string& filename, const QAudioFormat& audioFormat, std::vector<char>& decodedBuffer);
+    AudioDecoderWorker(
+        QObject* parent,
+        const std::string& filename,
+        const QAudioFormat& audio_format,
+        std::vector<char>& decoded_buffer
+    );
     virtual ~AudioDecoderWorker();
 
-    void start();
+    void start(){
+        QMetaObject::invokeMethod(this, &AudioDecoderWorker::internal_start);
+    }
 
-    bool startSucceeded() { return m_startSucceeded; }
+    bool start_succeeded(){ return m_start_succeeded; }
 
-    void stop();
+    void stop(){
+        QMetaObject::invokeMethod(this, &AudioDecoderWorker::internal_stop);
+    }
 
 signals:
     void errored();
@@ -142,23 +160,26 @@ Q_OBJECT
     void finished();
 
 public slots:
-    // Read decoded buffer sent from m_audioDecoder and store it into m_decodedBuffer.
-    void readAudioDecoderBuffer();
+    void internal_start();
+    void internal_stop();
+
+    // Read decoded buffer sent from m_audio_decoder and store it into m_decoded_buffer.
+    void read_audio_decoder_buffer();
 
 private:
-    // Handle error from m_audioDecoder.
-    void handleAudioDecoderError();
+    // Handle error from m_audio_decoder.
+    void handle_audio_decoder_error();
 
 private:
 
     std::string m_filename;
-    QAudioFormat m_audioFormat;
+    QAudioFormat m_audio_format;
 
-    QAudioDecoder* m_audioDecoder = nullptr;
+    QAudioDecoder* m_audio_decoder = nullptr;
 
-    std::vector<char>& m_decodedBuffer;
+    std::vector<char>& m_decoded_buffer;
 
-    bool m_startSucceeded = true;
+    bool m_start_succeeded = true;
 };
 
 
diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/IO/AudioFileLoader_Tests.cpp b/SerialPrograms/Source/CommonFramework/AudioPipeline/IO/AudioFileLoader_Tests.cpp
new file mode 100644
index 0000000000..9e1d108ea3
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/IO/AudioFileLoader_Tests.cpp
@@ -0,0 +1,497 @@
+/*  Audio Pipeline - Audio File Loader Tests
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  WAV-native file input: WavFile header parsing (PCM 8/16/32-bit and
+ *  IEEE-float), probe_wav_native_format(), and AudioFileLoader's batch
+ *  API (load_full_audio still converts to a requested format; the sample
+ *  rate must match that request). The test WAVs are generated on the fly
+ *  in the system temp directory; no audio I/O is involved.
+ *
+ */
+
+#include <cstdint>
+#include <cstring>
+#include <filesystem>
+#include <fstream>
+#include <vector>
+#include <QAudioFormat>
+#include <QAudioDecoder>
+#include <QEventLoop>
+#include <QTimer>
+#include "Common/Cpp/TestRunners/UnitTest.h"
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "CommonFramework/GlobalAutoPaths.h"
+#include "CommonFramework/AudioPipeline/Tools/AudioFormatUtils.h"
+#include "CommonFramework/AudioPipeline/IO/AudioFileLoader.h"
+#include "CommonFramework/AudioPipeline/IO/AudioInputFile.h"
+#include "AudioFileLoader_Tests.h"
+
+namespace PokemonAutomation{
+
+namespace{
+
+
+
+//
+//  Writes a minimal canonical WAV file (RIFF + fmt + data, little-endian)
+//  with the given format tag, channels, rate, and bits per sample.
+//
+void write_wav_file(
+    const std::string& path,
+    uint16_t format_tag, uint16_t channels, uint32_t rate, uint16_t bits_per_sample,
+    const std::vector<uint8_t>& data
+){
+    auto append16 = [&](std::vector<uint8_t>& out, uint16_t v){
+        out.push_back((uint8_t)(v & 0xff));
+        out.push_back((uint8_t)(v >> 8));
+    };
+    auto append32 = [&](std::vector<uint8_t>& out, uint32_t v){
+        out.push_back((uint8_t)(v & 0xff));
+        out.push_back((uint8_t)((v >> 8) & 0xff));
+        out.push_back((uint8_t)((v >> 16) & 0xff));
+        out.push_back((uint8_t)((v >> 24) & 0xff));
+    };
+
+    const uint32_t data_size = (uint32_t)data.size();
+    const uint32_t byte_rate = rate * channels * (bits_per_sample / 8);
+    const uint16_t block_align = (uint16_t)(channels * (bits_per_sample / 8));
+
+    std::vector<uint8_t> out;
+    out.insert(out.end(), {'R', 'I', 'F', 'F'});
+    append32(out, 36 + data_size);
+    out.insert(out.end(), {'W', 'A', 'V', 'E'});
+    out.insert(out.end(), {'f', 'm', 't', ' '});
+    append32(out, 16);
+    append16(out, format_tag);
+    append16(out, channels);
+    append32(out, rate);
+    append32(out, byte_rate);
+    append16(out, block_align);
+    append16(out, bits_per_sample);
+    out.insert(out.end(), {'d', 'a', 't', 'a'});
+    append32(out, data_size);
+    out.insert(out.end(), data.begin(), data.end());
+
+    std::ofstream file(path, std::ios::binary | std::ios::trunc);
+    file.write((const char*)out.data(), (std::streamsize)out.size());
+}
+
+std::string temp_wav_path(const std::string& name){
+    return (std::filesystem::temp_directory_path() / ("pa_wav_test_" + name + ".wav")).string();
+}
+
+
+
+template <typename Type>
+std::vector<uint8_t> to_bytes(const std::vector<Type>& samples){
+    std::vector<uint8_t> out(samples.size() * sizeof(Type));
+    std::memcpy(out.data(), samples.data(), out.size());
+    return out;
+}
+
+
+
+//
+//  PCM variants: the probe must report the file's actual rate, channel
+//  count, and sample type.
+//
+class WavParsePcmFormatsTest : public UnitTest{
+public:
+    WavParsePcmFormatsTest()
+        : UnitTest("AudioFile - WavParse_PcmFormats")
+    {}
+
+    virtual UnitTestResult run(Logger& logger, CancellableScope& scope) const override{
+        {
+            //  S16 44100 stereo.
+            const std::vector<uint8_t> data = {0x01, 0x02, 0x03, 0x04};
+            const std::string path = temp_wav_path("s16_44100_2ch");
+            write_wav_file(path, 1, 2, 44100, 16, data);
+            QAudioFormat format;
+            if (!probe_wav_native_format(path, format)){
+                return "probe failed for the S16 44100 stereo wav.";
+            }
+            if (format.sampleRate() != 44100 || format.channelCount() != 2
+                || format.sampleFormat() != QAudioFormat::SampleFormat::Int16){
+                return "S16 wav parsed as: " + dump_audio_format(format) + ".";
+            }
+        }
+        {
+            //  S32 32000 mono.
+            const std::vector<uint8_t> data = {0x01, 0x02, 0x03, 0x04};
+            const std::string path = temp_wav_path("s32_32000_1ch");
+            write_wav_file(path, 1, 1, 32000, 32, data);
+            QAudioFormat format;
+            if (!probe_wav_native_format(path, format)){
+                return "probe failed for the S32 32000 mono wav.";
+            }
+            if (format.sampleRate() != 32000 || format.channelCount() != 1
+                || format.sampleFormat() != QAudioFormat::SampleFormat::Int32){
+                return "S32 wav parsed as: " + dump_audio_format(format) + ".";
+            }
+        }
+        {
+            //  U8 8000 stereo.
+            const std::vector<uint8_t> data = {0x00, 0x7f, 0x80, 0xff};
+            const std::string path = temp_wav_path("u8_8000_2ch");
+            write_wav_file(path, 1, 2, 8000, 8, data);
+            QAudioFormat format;
+            if (!probe_wav_native_format(path, format)){
+                return "probe failed for the U8 8000 stereo wav.";
+            }
+            if (format.sampleRate() != 8000 || format.channelCount() != 2
+                || format.sampleFormat() != QAudioFormat::SampleFormat::UInt8){
+                return "U8 wav parsed as: " + dump_audio_format(format) + ".";
+            }
+        }
+        return true;
+    }
+};
+
+
+
+//
+//  IEEE-float (format tag 3) WAVs: the probe must report a float format.
+//
+class WavParseIeeeFloatTest : public UnitTest{
+public:
+    WavParseIeeeFloatTest()
+        : UnitTest("AudioFile - WavParse_IeeeFloat")
+    {}
+
+    virtual UnitTestResult run(Logger& logger, CancellableScope& scope) const override{
+        const std::vector<float> samples = {0.5f, -0.5f, 0.0f, 1.0f};
+        const std::string path = temp_wav_path("f32_96000_1ch");
+        write_wav_file(path, 3, 1, 96000, 32, to_bytes(samples));
+
+        QAudioFormat format;
+        if (!probe_wav_native_format(path, format)){
+            return "probe failed for the IEEE-float 96000 mono wav.";
+        }
+        if (format.sampleRate() != 96000 || format.channelCount() != 1
+            || format.sampleFormat() != QAudioFormat::SampleFormat::Float){
+            return "float wav parsed as: " + dump_audio_format(format) + ".";
+        }
+        return true;
+    }
+};
+
+
+
+//
+//  Unsupported / invalid files: the probe must fail cleanly.
+//
+class WavParseRejectionsTest : public UnitTest{
+public:
+    WavParseRejectionsTest()
+        : UnitTest("AudioFile - WavParse_Rejections")
+    {}
+
+    virtual UnitTestResult run(Logger& logger, CancellableScope& scope) const override{
+        {
+            //  24-bit PCM is not supported.
+            const std::vector<uint8_t> data = {0x01, 0x02, 0x03};
+            const std::string path = temp_wav_path("s24_48000_1ch");
+            write_wav_file(path, 1, 1, 48000, 24, data);
+            QAudioFormat format;
+            if (probe_wav_native_format(path, format)){
+                return "24-bit wav should be rejected but parsed as: " + dump_audio_format(format) + ".";
+            }
+        }
+        {
+            //  Not a wav at all.
+            const std::string path = temp_wav_path("not_a_wav");
+            {
+                std::ofstream file(path, std::ios::binary | std::ios::trunc);
+                file.write("hello world, definitely not a wav", 32);
+            }
+            QAudioFormat format;
+            if (probe_wav_native_format(path, format)){
+                return "non-wav bytes should be rejected.";
+            }
+        }
+        {
+            //  Missing file.
+            QAudioFormat format;
+            if (probe_wav_native_format("/nonexistent/pa_wav_test_missing.wav", format)){
+                return "missing file should be rejected.";
+            }
+        }
+        return true;
+    }
+};
+
+
+
+//
+//  load_full_audio() with a matching target: the file's native bytes come
+//  back unconverted.
+//
+class LoadFullNativePassthroughTest : public UnitTest{
+public:
+    LoadFullNativePassthroughTest()
+        : UnitTest("AudioFile - LoadFull_NativePassthrough")
+    {}
+
+    virtual UnitTestResult run(Logger& logger, CancellableScope& scope) const override{
+        const std::vector<float> samples = {0.25f, -0.25f, 0.125f, -0.125f};
+        const std::vector<uint8_t> data = to_bytes(samples);
+        const std::string path = temp_wav_path("f32_48000_2ch_passthrough");
+        write_wav_file(path, 3, 2, 48000, 32, data);
+
+        QAudioFormat target;
+        target.setSampleFormat(QAudioFormat::SampleFormat::Float);
+        target.setSampleRate(48000);
+        target.setChannelCount(2);
+
+        AudioFileLoader loader(nullptr, path, target);
+        const auto ret = loader.load_full_audio();
+        if (std::get<0>(ret) == nullptr){
+            return "load_full_audio() returned null for a matching-format float wav.";
+        }
+        if (std::get<1>(ret) != data.size()){
+            return "Length mismatch: expected " + std::to_string(data.size())
+                + " bytes, got " + std::to_string(std::get<1>(ret)) + ".";
+        }
+        if (std::memcmp(std::get<0>(ret), data.data(), data.size()) != 0){
+            return "load_full_audio() modified the native float data.";
+        }
+        return true;
+    }
+};
+
+
+
+//
+//  load_full_audio() converts the sample type to the requested format
+//  (float, normalized by the type's max value, as the pipeline defines it).
+//
+class LoadFullS16ToFloatTest : public UnitTest{
+public:
+    LoadFullS16ToFloatTest()
+        : UnitTest("AudioFile - LoadFull_S16ToFloat")
+    {}
+
+    virtual UnitTestResult run(Logger& logger, CancellableScope& scope) const override{
+        const std::vector<int16_t> samples = {0, 32767, -32768, 16384, -16384, 8192, 24576, 1};
+        const std::string path = temp_wav_path("s16_48000_2ch");
+        write_wav_file(path, 1, 2, 48000, 16, to_bytes(samples));
+
+        QAudioFormat target;
+        target.setSampleFormat(QAudioFormat::SampleFormat::Float);
+        target.setSampleRate(48000);
+        target.setChannelCount(2);
+
+        AudioFileLoader loader(nullptr, path, target);
+        const auto ret = loader.load_full_audio();
+        if (std::get<0>(ret) == nullptr){
+            return "load_full_audio() returned null for the S16 wav.";
+        }
+        if (std::get<1>(ret) != samples.size() * sizeof(float)){
+            return "Length mismatch: expected " + std::to_string(samples.size() * sizeof(float))
+                + " bytes, got " + std::to_string(std::get<1>(ret)) + ".";
+        }
+        const float* out = (const float*)std::get<0>(ret);
+        //  The pipeline-wide convention (AudioStreamConverter::convert_from):
+        //  int16 is scaled by 1/32768, not 1/32767.
+        const float rcp = 1.0f / 32768.0f;
+        for (size_t c = 0; c < samples.size(); c++){
+            const float expected = (float)samples[c] * rcp;
+            if (out[c] != expected){
+                return "Sample " + std::to_string(c) + " = " + std::to_string(out[c])
+                    + ", expected " + std::to_string(expected) + ".";
+            }
+        }
+        return true;
+    }
+};
+
+
+
+//
+//  load_full_audio() does not resample: a rate mismatch is rejected.
+//
+class LoadFullRateMismatchTest : public UnitTest{
+public:
+    LoadFullRateMismatchTest()
+        : UnitTest("AudioFile - LoadFull_RateMismatch")
+    {}
+
+    virtual UnitTestResult run(Logger& logger, CancellableScope& scope) const override{
+        const std::vector<int16_t> samples = {0, 1, 0, 1};
+        const std::string path = temp_wav_path("s16_44100_2ch_rate_mismatch");
+        write_wav_file(path, 1, 2, 44100, 16, to_bytes(samples));
+
+        QAudioFormat target;
+        target.setSampleFormat(QAudioFormat::SampleFormat::Float);
+        target.setSampleRate(48000);
+        target.setChannelCount(2);
+
+        AudioFileLoader loader(nullptr, path, target);
+        const auto ret = loader.load_full_audio();
+        if (std::get<0>(ret) != nullptr){
+            return "load_full_audio() should reject a rate mismatch (44100 vs 48000).";
+        }
+        return true;
+    }
+};
+
+
+
+//  The mp3 fixture for the decoded-native tests (two sines, 440 Hz left /
+//  660 Hz right, 44100 Hz stereo, 2 s, 64 kbps), in the CommandLineTests
+//  repo next to the program (like the test images).
+std::string decoded_probe_fixture(){
+    return UNIT_TEST_RESOURCE_PATH() + "CommonFramework/AudioPipeline/decoded_probe_44100_2ch.mp3";
+}
+
+
+class DecodedNativeProbeTest : public UnitTest{
+public:
+    DecodedNativeProbeTest()
+        : UnitTest("AudioFileLoader - ProbeDecodedNative_Mp3")
+    {}
+
+    virtual UnitTestResult run(Logger& logger, CancellableScope&) const override{
+        //  The fixture (two 44100 Hz sines, one per channel):
+        //  the decoder's native output for it is 44100 Hz stereo float.
+        const std::string fixture = decoded_probe_fixture();
+        if (!std::filesystem::exists(std::filesystem::path(fixture))){
+            return "Missing mp3 fixture: " + fixture + ".";
+        }
+        if (!QAudioDecoder(nullptr).isSupported()){
+            return UnitTestResult(
+                UnitTestResult::SKIPPED,
+                "No audio decode backend (Qt Multimedia media plugin missing or failing to load)."
+            );
+        }
+
+        QAudioFormat format;
+        if (!probe_decoded_native_format(fixture, format)){
+            return "probe_decoded_native_format() failed on the mp3 fixture.";
+        }
+        if (format.sampleRate() != 44100 || format.channelCount() != 2
+            || format.sampleFormat() != QAudioFormat::SampleFormat::Float){
+            return "Unexpected native decoded format: " + dump_audio_format(format) + ".";
+        }
+
+        //  A nonexistent file must fail the probe, not crash or hang.
+        QAudioFormat unused;
+        if (probe_decoded_native_format("/nonexistent/pa_decoded_probe_missing.mp3", unused)){
+            return "probe_decoded_native_format() should fail on a missing file.";
+        }
+
+        return true;
+    }
+};
+
+
+//
+//  Full decode path with the native target: AudioFileLoader given the probed
+//  format as its target (an identity conversion for QAudioDecoder) must
+//  stream the file at its native 44100 Hz pace: about 2 s of stereo float,
+//  both channels carrying the fixture's tones, with the channel separation
+//  intact.
+//
+class DecodedNativePlaybackTest : public UnitTest{
+public:
+    DecodedNativePlaybackTest()
+        : UnitTest("AudioFileLoader - DecodedNative_44100Playback")
+    {}
+
+    virtual UnitTestResult run(Logger& logger, CancellableScope&) const override{
+        const std::string fixture = decoded_probe_fixture();
+        if (!std::filesystem::exists(std::filesystem::path(fixture))){
+            return "Missing mp3 fixture: " + fixture + ".";
+        }
+        if (!QAudioDecoder(nullptr).isSupported()){
+            return UnitTestResult(
+                UnitTestResult::SKIPPED,
+                "No audio decode backend (Qt Multimedia media plugin missing or failing to load)."
+            );
+        }
+
+        QAudioFormat native;
+        if (!probe_decoded_native_format(fixture, native)){
+            return "probe_decoded_native_format() failed on the mp3 fixture.";
+        }
+        if (native.sampleRate() != 44100 || native.channelCount() != 2
+            || native.sampleFormat() != QAudioFormat::SampleFormat::Float){
+            return "Unexpected native decoded format: " + dump_audio_format(native) + ".";
+        }
+
+        //  The loader streams the decoded file at the native pace.
+        AudioFileLoader loader(nullptr, fixture, native);
+        if (!loader.start()){
+            return "AudioFileLoader::start() failed.";
+        }
+
+        QEventLoop loop;
+        std::vector<float> interleaved;
+        QObject::connect(&loader, &AudioFileLoader::buffer_ready, &loader,
+            [&](const char* data, size_t len){
+                const auto* frames = reinterpret_cast<const float*>(data);
+                interleaved.insert(interleaved.end(), frames, frames + len / sizeof(float));
+            });
+        QObject::connect(&loader, &AudioFileLoader::finished, &loader, [&loop]{
+            loop.quit();
+        });
+        QTimer timeout;
+        timeout.setSingleShot(true);
+        QObject::connect(&timeout, &QTimer::timeout, &loop, &QEventLoop::quit);
+        timeout.start(15000);
+        loop.exec();
+        timeout.stop();
+
+        const size_t frame_count = interleaved.size() / 2;
+        if (frame_count > 88200 + 4000 || frame_count < 88200 - 4000){
+            return "Expected about 88200 frames (2 s at 44100 Hz), got "
+                + std::to_string(frame_count) + ".";
+        }
+
+        //  Both channels carry the fixture's tones, and they are different
+        //  tones (440 Hz left, 660 Hz right): the |L-R| energy must stay
+        //  well above the L energy if the channels are kept separate.
+        double el = 0, er = 0, elr = 0;
+        for (size_t i = 0; i < frame_count; i++){
+            const float l = interleaved[2 * i];
+            const float r = interleaved[2 * i + 1];
+            el += l * l;
+            er += r * r;
+            const float d = l - r;
+            elr += d * d;
+        }
+        if (el < 1.0 || er < 1.0){
+            return "A channel is silent: L energy " + std::to_string(el)
+                + ", R energy " + std::to_string(er) + ".";
+        }
+        if (elr < 1.5 * el){
+            return "Channel separation was lost: |L-R| energy " + std::to_string(elr)
+                + " is below 1.5x the L energy " + std::to_string(el) + ".";
+        }
+
+        return true;
+    }
+};
+
+
+
+}
+
+
+
+void add_tests_AudioFileLoader(UnitTestDatabase& database){
+    database.add<WavParsePcmFormatsTest>();
+    database.add<WavParseIeeeFloatTest>();
+    database.add<WavParseRejectionsTest>();
+    database.add<LoadFullNativePassthroughTest>();
+    database.add<LoadFullS16ToFloatTest>();
+    database.add<LoadFullRateMismatchTest>();
+    database.add<DecodedNativeProbeTest>();
+    database.add<DecodedNativePlaybackTest>();
+}
+
+
+
+}
diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/IO/AudioFileLoader_Tests.h b/SerialPrograms/Source/CommonFramework/AudioPipeline/IO/AudioFileLoader_Tests.h
new file mode 100644
index 0000000000..4c305e3e0f
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/IO/AudioFileLoader_Tests.h
@@ -0,0 +1,28 @@
+/*  Audio Pipeline - Audio File Loader Tests
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_AudioPipeline_AudioFileLoader_Tests_H
+#define PokemonAutomation_AudioPipeline_AudioFileLoader_Tests_H
+
+class UnitTestDatabase;
+
+namespace PokemonAutomation{
+
+
+
+//
+//  Registers the WAV-native file input tests: WavFile header parsing
+//  (PCM 8/16/32-bit and IEEE-float), probe_wav_native_format(), and
+//  AudioFileLoader::load_full_audio()'s batch conversion. The test WAVs are
+//  generated on the fly in the system temp directory; no audio I/O is
+//  involved.
+//
+void add_tests_AudioFileLoader(UnitTestDatabase& database);
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/IO/AudioInputDevice.cpp b/SerialPrograms/Source/CommonFramework/AudioPipeline/IO/AudioInputDevice.cpp
new file mode 100644
index 0000000000..758ccc70b8
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/IO/AudioInputDevice.cpp
@@ -0,0 +1,125 @@
+/*  Audio Input Device
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <cstring>
+#include <memory>
+#include "Common/Cpp/Exceptions.h"
+#include "Common/Cpp/PrettyPrint.h"
+#include "Common/Cpp/Time.h"
+#include "CommonFramework/AudioPipeline/Tools/AudioFormatUtils.h"
+#include "AudioInputDevice.h"
+
+namespace PokemonAutomation{
+
+
+
+namespace{
+
+
+//  Frames of raw audio buffered before the raw listeners are notified.
+const size_t RAW_BUFFER_CAPACITY = 4096;
+
+
+//  When the preset says the physical 1ch x 96000 stream is really the
+//  card's two 48 kHz channels, the raw listener output is that same byte
+//  stream reinterpreted as 2ch x 48000 (aligned to 2-sample stereo-frame
+//  boundaries). Every other case passes through with the physical frame
+//  size.
+bool is_96k_mono_reinterpret(const QAudioFormat& format, bool reinterpret_96k_mono_as_stereo){
+    return reinterpret_96k_mono_as_stereo
+        && format.channelCount() == 1 && format.sampleRate() == 96000;
+}
+
+size_t raw_output_frame_bytes(const QAudioFormat& format, bool reinterpret_96k_mono_as_stereo){
+    return format.bytesPerFrame() * (is_96k_mono_reinterpret(format, reinterpret_96k_mono_as_stereo) ? 2 : 1);
+}
+
+
+}
+
+
+
+AudioInputDevice::AudioInputDevice(
+    Logger& logger,
+    const NativeAudioInfo& device, const QAudioFormat& format,
+    bool reinterpret_96k_mono_as_stereo
+)
+    : MisalignedStreamConverter(
+        raw_output_frame_bytes(format, reinterpret_96k_mono_as_stereo),
+        raw_output_frame_bytes(format, reinterpret_96k_mono_as_stereo),
+        RAW_BUFFER_CAPACITY
+      )
+    , ObjectStreamListener(raw_output_frame_bytes(format, reinterpret_96k_mono_as_stereo))
+    , m_sample_type(sample_format_of(format))
+    , m_sample_rate(format.sampleRate())
+    , m_channels(format.channelCount())
+    , m_frame_bytes(format.bytesPerFrame())
+    , m_out_sample_rate(is_96k_mono_reinterpret(format, reinterpret_96k_mono_as_stereo) ? 48000 : format.sampleRate())
+    , m_out_channels(is_96k_mono_reinterpret(format, reinterpret_96k_mono_as_stereo) ? 2 : format.channelCount())
+    , m_out_frame_bytes(raw_output_frame_bytes(format, reinterpret_96k_mono_as_stereo))
+{
+    MisalignedStreamConverter::add_listener(*this);
+
+    logger.log("AudioInputDevice(): " + dump_audio_format(format));
+    if (!device.isFormatSupported(format)){
+//            throw InternalProgramError(&logger, PA_CURRENT_FUNCTION, "Format not supported: " + dump_audio_format(format));
+        logger.log("Format not supported: " + dump_audio_format(format), COLOR_RED);
+        return;
+    }
+    m_source = std::make_unique<NativeAudioSource>(device, format);
+
+    this->open(QIODevice::ReadWrite | QIODevice::Unbuffered);
+
+    WallClock start = current_time();
+    m_source->start(this);
+    WallClock end = current_time();
+    double seconds = std::chrono::duration_cast<std::chrono::milliseconds>(end - start).count() / 1000.;
+    logger.log("Done starting audio... " + tostr_fixed(seconds, 3) + " seconds", COLOR_CYAN);
+}
+AudioInputDevice::~AudioInputDevice(){
+    if (m_source){
+        m_source->stop();
+    }
+}
+
+void AudioInputDevice::add_listener(Kernels::AudioPipeline::RawAudioStreamListener& listener){
+    auto scope_check = m_sanitizer.check_scope();
+    if (listener.sample_type() != m_sample_type){
+        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Sample type doesn't match.");
+    }
+    if (listener.sample_rate() != m_out_sample_rate){
+        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Sample rate doesn't match.");
+    }
+    if (listener.channels() != m_out_channels){
+        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Channel count doesn't match.");
+    }
+    m_listeners.add(listener);
+}
+void AudioInputDevice::remove_listener(Kernels::AudioPipeline::RawAudioStreamListener& listener){
+    auto scope_check = m_sanitizer.check_scope();
+    m_listeners.remove(listener);
+}
+
+qint64 AudioInputDevice::writeData(const char* data, qint64 len){
+    MisalignedStreamConverter::push_bytes(data, len);
+    return len;
+}
+
+void AudioInputDevice::convert(void* out, const void* in, size_t count){
+    //  Raw pass-through: the input and output frame sizes are equal.
+    std::memcpy(out, in, count * m_out_frame_bytes);
+}
+
+void AudioInputDevice::on_objects(const void* data, size_t objects){
+    m_listeners.run_method(
+        &Kernels::AudioPipeline::RawAudioStreamListener::push_samples,
+        objects, data
+    );
+}
+
+
+
+}
diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/IO/AudioInputDevice.h b/SerialPrograms/Source/CommonFramework/AudioPipeline/IO/AudioInputDevice.h
new file mode 100644
index 0000000000..2ef2c7365b
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/IO/AudioInputDevice.h
@@ -0,0 +1,103 @@
+/*  Audio Input Device
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_AudioPipeline_AudioInputDevice_H
+#define PokemonAutomation_AudioPipeline_AudioInputDevice_H
+
+#include <QAudioSource>
+using NativeAudioSource = QAudioSource;
+
+#include <memory>
+#include <QIODevice>
+#include "Common/Cpp/ListenerSet.h"
+#include "Common/Cpp/LifetimeSanitizer.h"
+#include "Common/Cpp/StreamConverters.h"
+#include "Kernels/AudioPipeline/Kernels_AudioPipeline.h"
+#include "CommonFramework/AudioPipeline/AudioFormat.h"
+
+class QAudioFormat;
+
+namespace PokemonAutomation{
+
+class Logger;
+
+
+//
+//  Raw audio input from a capture device (QAudioSource / QAudioInput).
+//  Emits the raw stream to RawAudioStreamListener children (root of the new
+//  pipeline tree).
+//  Qt makes no contract about the frame alignment of the chunks that the
+//  audio backend writes into the QIODevice, so the raw output goes through a
+//  MisalignedStreamConverter / ObjectStreamListener byte-reassembly step.
+//  In practice the backends emit whole-frame chunks, so no splicing happens
+//  in the common case.
+//
+//  The reinterpreted input choices (INTERLEAVE_LR/RL_96000) open the
+//  device as a physical 1ch x 96000 stream that is really the card's two
+//  48 kHz channels (a misreporting capture card), so when
+//  "reinterpret_96k_mono_as_stereo" is set (the choice's is_reinterpreted())
+//  the raw output is that same byte stream reinterpreted as 2ch x 48000:
+//  only the (rate, channels) framing changes, aligned to 2-sample
+//  stereo-frame boundaries. The MONO_96000 native choice is a true 96 kHz
+//  mono stream and keeps that shape through the whole pipeline; every other
+//  native choice passes through unchanged.
+//
+class AudioInputDevice final
+    : public QIODevice
+    , private MisalignedStreamConverter
+    , private ObjectStreamListener
+{
+public:
+    ~AudioInputDevice();
+
+    AudioInputDevice(
+        Logger& logger,
+        const NativeAudioInfo& device, const QAudioFormat& format,
+        bool reinterpret_96k_mono_as_stereo
+    );
+
+    Kernels::AudioPipeline::SampleFormat sample_type() const{
+        return m_sample_type;
+    }
+    //  The raw listener output shape (the 96 kHz reinterpretation applied).
+    size_t sample_rate() const{
+        return m_out_sample_rate;
+    }
+    size_t channels() const{
+        return m_out_channels;
+    }
+
+    void add_listener(Kernels::AudioPipeline::RawAudioStreamListener& listener);
+    void remove_listener(Kernels::AudioPipeline::RawAudioStreamListener& listener);
+
+
+    virtual bool isSequential() const override { return true; }
+    virtual qint64 readData(char* data, qint64 maxlen) override { return 0; }
+    virtual qint64 writeData(const char* data, qint64 len) override;
+
+
+protected:
+    //  MisalignedStreamConverter: raw pass-through (in and out are the same size).
+    virtual void convert(void* out, const void* in, size_t count) override;
+    //  ObjectStreamListener: aligned frames out to the raw listeners.
+    virtual void on_objects(const void* data, size_t objects) override;
+
+
+private:
+    std::unique_ptr<NativeAudioSource> m_source;
+    Kernels::AudioPipeline::SampleFormat m_sample_type;
+    size_t m_sample_rate;
+    size_t m_channels;
+    size_t m_frame_bytes;
+    size_t m_out_sample_rate;
+    size_t m_out_channels;
+    size_t m_out_frame_bytes;
+    ListenerSet<Kernels::AudioPipeline::RawAudioStreamListener> m_listeners;
+    LifetimeSanitizer m_sanitizer;
+};
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/IO/AudioInputFile.cpp b/SerialPrograms/Source/CommonFramework/AudioPipeline/IO/AudioInputFile.cpp
new file mode 100644
index 0000000000..3b0474bb8c
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/IO/AudioInputFile.cpp
@@ -0,0 +1,168 @@
+/*  Audio Input File
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <memory>
+#include <QString>
+#include <QUrl>
+#include <QAudioBuffer>
+#include <QAudioDecoder>
+#include <QEventLoop>
+#include <QTimer>
+#include "3rdParty/QtWavFile/WavFile.h"
+#include "Common/Cpp/Exceptions.h"
+#include "CommonFramework/AudioPipeline/AudioFormat.h"
+#include "CommonFramework/AudioPipeline/Tools/AudioFormatUtils.h"
+#include "AudioFileLoader.h"
+#include "AudioInputFile.h"
+
+namespace PokemonAutomation{
+
+
+
+bool probe_wav_native_format(const std::string& filename, QAudioFormat& out_format){
+    WavFile wav_file;
+    if (!wav_file.open(QString::fromStdString(filename))){
+        return false;
+    }
+    out_format = wav_file.audioFormat();
+    wav_file.close();
+    if (out_format.channelCount() < 1 || out_format.sampleRate() < 1
+        || out_format.sampleFormat() == QAudioFormat::SampleFormat::Unknown){
+        return false;
+    }
+    return true;
+}
+
+
+bool probe_decoded_native_format(const std::string& filename, QAudioFormat& out_format){
+    //  A QAudioDecoder started without a target format decodes in the
+    //  source's native format, and the first decoded buffer carries that
+    //  format. The probe runs a nested event loop on the calling thread
+    //  until the first buffer, an error, or a 3 s timeout. The decoder is
+    //  throwaway: only its output format is kept.
+    QAudioDecoder decoder(nullptr);
+    if (!decoder.isSupported()){
+        return false;
+    }
+    decoder.setSource(QUrl::fromLocalFile(QString::fromStdString(filename)));
+
+    QEventLoop loop;
+    bool answered = false;
+    bool got_format = false;
+    bool finished_without_audio = false;
+    QObject::connect(
+        &decoder, &QAudioDecoder::bufferReady,
+        &decoder, [&decoder, &out_format, &got_format, &answered, &loop]{
+            const QAudioBuffer buffer = decoder.read();
+            if (buffer.isValid() && buffer.format().isValid()){
+                out_format = buffer.format();
+                got_format = true;
+            }
+            answered = true;
+            loop.quit();
+        }
+    );
+    QObject::connect(
+        &decoder, QOverload<QAudioDecoder::Error>::of(&QAudioDecoder::error),
+        &decoder, [&answered, &loop](QAudioDecoder::Error){
+            answered = true;
+            loop.quit();
+        }
+    );
+    QObject::connect(
+        &decoder, &QAudioDecoder::finished,
+        &decoder, [&finished_without_audio, &answered, &loop]{
+            finished_without_audio = true;
+            answered = true;
+            loop.quit();
+        }
+    );
+
+    QTimer timer;
+    timer.setSingleShot(true);
+    QObject::connect(&timer, &QTimer::timeout, &loop, &QEventLoop::quit);
+    decoder.start();
+
+    //  The decoder can set `answered` inside `start()`: it reports a
+    //  missing file as an error right away.
+    if (!answered){
+        timer.start(3000);
+        loop.exec();
+        timer.stop();
+    }
+    decoder.stop();
+    decoder.deleteLater();
+
+    if (got_format){
+        return true;
+    }
+    if (decoder.error() != QAudioDecoder::NoError){
+        std::cout << "probe_decoded_native_format: decoder error for " << filename
+            << ": " << decoder.errorString().toStdString() << std::endl;
+    }else if (finished_without_audio){
+        std::cout << "probe_decoded_native_format: decoder finished without producing any audio for "
+            << filename << " (the decoder found no usable audio in the file)." << std::endl;
+    }else{
+        std::cout << "probe_decoded_native_format: no decoded buffer within 3 s for " << filename
+            << std::endl;
+    }
+    return false;
+}
+
+
+
+AudioInputFile::AudioInputFile(
+    Logger& logger,
+    const std::string& file, const QAudioFormat& format
+)
+    : m_source(std::make_unique<AudioFileLoader>(nullptr, file, format))
+    , m_sample_type(sample_format_of(format))
+    , m_sample_rate(format.sampleRate())
+    , m_channels(format.channelCount())
+    , m_frame_bytes(format.bytesPerFrame())
+{
+    logger.log("AudioInputFile(): " + dump_audio_format(format));
+    connect(
+        m_source.get(), &AudioFileLoader::buffer_ready,
+        this, [this](const char* data, size_t len){
+            on_buffer_ready(data, len);
+        }
+    );
+    m_source->start();
+}
+AudioInputFile::~AudioInputFile(){}
+
+void AudioInputFile::add_listener(Kernels::AudioPipeline::RawAudioStreamListener& listener){
+    auto scope_check = m_sanitizer.check_scope();
+    if (listener.sample_type() != m_sample_type){
+        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Sample type doesn't match.");
+    }
+    if (listener.sample_rate() != m_sample_rate){
+        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Sample rate doesn't match.");
+    }
+    if (listener.channels() != m_channels){
+        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Channel count doesn't match.");
+    }
+    m_listeners.add(listener);
+}
+void AudioInputFile::remove_listener(Kernels::AudioPipeline::RawAudioStreamListener& listener){
+    auto scope_check = m_sanitizer.check_scope();
+    m_listeners.remove(listener);
+}
+
+void AudioInputFile::on_buffer_ready(const char* data, size_t len){
+    //  AudioFileLoader only emits whole multiples of the frame size, so the
+    //  raw listeners can take the data as-is.
+    m_listeners.run_method(
+        &Kernels::AudioPipeline::RawAudioStreamListener::push_samples,
+        len / m_frame_bytes,
+        data
+    );
+}
+
+
+
+}
diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/IO/AudioInputFile.h b/SerialPrograms/Source/CommonFramework/AudioPipeline/IO/AudioInputFile.h
new file mode 100644
index 0000000000..4778b30daf
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/IO/AudioInputFile.h
@@ -0,0 +1,85 @@
+/*  Audio Input File
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_AudioPipeline_AudioInputFile_H
+#define PokemonAutomation_AudioPipeline_AudioInputFile_H
+
+#include <memory>
+#include <string>
+#include <QObject>
+#include "Common/Cpp/ListenerSet.h"
+#include "Common/Cpp/LifetimeSanitizer.h"
+#include "Kernels/AudioPipeline/Kernels_AudioPipeline.h"
+
+class QAudioFormat;
+
+namespace PokemonAutomation{
+
+class Logger;
+class AudioFileLoader;
+
+
+//  Probes a .wav file's native audio format (sample rate, channel count,
+//  sample type) by reading its header. Returns false if the file cannot be
+//  opened or is not a supported WAV (PCM 8/16/32-bit or IEEE-float).
+bool probe_wav_native_format(const std::string& filename, QAudioFormat& out_format);
+
+//  Probes the native output format of a compressed audio file (.mp3, .ogg,
+//  .flac, ...) by starting a throwaway QAudioDecoder without a target
+//  format and reading the format off the first decoded buffer: that is
+//  the format the decoder will produce for this file. Returns false if no
+//  decode backend is available, the file cannot be opened, or no buffer
+//  arrives within 3 seconds.
+bool probe_decoded_native_format(const std::string& filename, QAudioFormat& out_format);
+
+
+//
+//  Raw audio input from a file (.wav via WavFile, compressed formats via
+//  QAudioDecoder). Emits the raw stream to RawAudioStreamListener children
+//  (root of the new pipeline tree).
+//  AudioFileLoader only ever emits chunks that are whole multiples of the
+//  frame size, so the raw output is frame-aligned by construction and is
+//  passed to the listeners as-is.
+//
+class AudioInputFile final : public QObject{
+public:
+    ~AudioInputFile();
+
+    AudioInputFile(
+        Logger& logger,
+        const std::string& file, const QAudioFormat& format
+    );
+
+    Kernels::AudioPipeline::SampleFormat sample_type() const{
+        return m_sample_type;
+    }
+    size_t sample_rate() const{
+        return m_sample_rate;
+    }
+    size_t channels() const{
+        return m_channels;
+    }
+
+    void add_listener(Kernels::AudioPipeline::RawAudioStreamListener& listener);
+    void remove_listener(Kernels::AudioPipeline::RawAudioStreamListener& listener);
+
+
+private:
+    void on_buffer_ready(const char* data, size_t len);
+
+
+private:
+    std::unique_ptr<AudioFileLoader> m_source;
+    Kernels::AudioPipeline::SampleFormat m_sample_type;
+    size_t m_sample_rate;
+    size_t m_channels;
+    size_t m_frame_bytes;
+    ListenerSet<Kernels::AudioPipeline::RawAudioStreamListener> m_listeners;
+    LifetimeSanitizer m_sanitizer;
+};
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/IO/AudioOutputDevice.cpp b/SerialPrograms/Source/CommonFramework/AudioPipeline/IO/AudioOutputDevice.cpp
new file mode 100644
index 0000000000..724bfbd48f
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/IO/AudioOutputDevice.cpp
@@ -0,0 +1,102 @@
+/*  Audio Output Device
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Exceptions.h"
+#include "Common/Cpp/Logging/AbstractLogger.h"
+#include "AudioOutputDevice.h"
+
+namespace PokemonAutomation{
+
+namespace{
+
+
+const char* audio_error_to_str(QAudio::Error error){
+    switch (error){
+    case QAudio::NoError:
+        return "NoError";
+    case QAudio::OpenError:
+        return "OpenError (device cannot be opened with the requested format)";
+    case QAudio::IOError:
+        return "IOError";
+    case QAudio::UnderrunError:
+        return "UnderrunError";
+    case QAudio::FatalError:
+        return "FatalError";
+    default:
+        return "UnknownError";
+    }
+}
+
+
+size_t raw_sample_size(Kernels::AudioPipeline::SampleFormat format){
+    switch (format){
+    case Kernels::AudioPipeline::SampleFormat::UINT8:   return sizeof(uint8_t);
+    case Kernels::AudioPipeline::SampleFormat::SINT16:  return sizeof(int16_t);
+    case Kernels::AudioPipeline::SampleFormat::SINT32:  return sizeof(int32_t);
+    case Kernels::AudioPipeline::SampleFormat::FLOAT32: return sizeof(float);
+    default:
+        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Unsupported audio sample format.");
+    }
+}
+
+
+}
+
+
+
+AudioOutputDevice::AudioOutputDevice(
+    Logger& logger,
+    const NativeAudioInfo& device,
+    const QAudioFormat& format,
+    Kernels::AudioPipeline::SampleFormat sample_format,
+    size_t sample_rate,
+    size_t channels
+)
+    : Kernels::AudioPipeline::RawAudioStreamListener(sample_format, sample_rate, channels)
+    , m_bytes_per_frame(channels * raw_sample_size(sample_format))
+    , m_logger(logger)
+    , m_sink(device, format)
+    , m_io_device(nullptr)
+{
+    m_sink.connect(
+        &m_sink, &QAudioSink::stateChanged,
+        &m_sink, [this](QAudio::State state){
+            if (state == QAudio::State::StoppedState){
+                m_io_device = nullptr;
+                QAudio::Error error = m_sink.error();
+                if (error == QAudio::NoError){
+                    m_logger.log("AudioOutputDevice has stopped.", COLOR_ORANGE);
+                }else{
+                    m_logger.log(
+                        std::string("AudioOutputDevice has stopped with error: ") + audio_error_to_str(error),
+                        COLOR_RED
+                    );
+                }
+            }
+        }
+    );
+
+    m_io_device = m_sink.start();
+    QAudio::Error error = m_sink.error();
+    if (m_io_device == nullptr || error != QAudio::NoError){
+        m_logger.log(
+            std::string("Unable to start audio output device: ") + audio_error_to_str(error),
+            COLOR_RED
+        );
+    }
+}
+AudioOutputDevice::~AudioOutputDevice(){}
+
+void AudioOutputDevice::push_samples(size_t frames, const void* data){
+    auto scope_check = m_sanitizer.check_scope();
+    if (m_io_device != nullptr){
+        m_io_device->write((const char*)data, frames * m_bytes_per_frame);
+    }
+}
+
+
+
+}
diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/IO/AudioOutputDevice.h b/SerialPrograms/Source/CommonFramework/AudioPipeline/IO/AudioOutputDevice.h
new file mode 100644
index 0000000000..2047d08070
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/IO/AudioOutputDevice.h
@@ -0,0 +1,52 @@
+/*  Audio Output Device
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *      AudioOutputDevice wraps an open QAudioSink and plays back the raw
+ *  byte stream pushed into it. It does no sample conversion: the pipeline
+ *  tree's sink branch (WorkingAudio2RawAudio) delivers samples in the
+ *  device's sample format, and this class just writes them to the device.
+ *
+ */
+
+#ifndef PokemonAutomation_AudioPipeline_AudioOutputDevice_H
+#define PokemonAutomation_AudioPipeline_AudioOutputDevice_H
+
+#include <QAudioSink>
+#include "Common/Cpp/LifetimeSanitizer.h"
+#include "Kernels/AudioPipeline/Kernels_AudioPipeline.h"
+#include "CommonFramework/AudioPipeline/AudioFormat.h"
+
+namespace PokemonAutomation{
+
+class Logger;
+
+class AudioOutputDevice : public Kernels::AudioPipeline::RawAudioStreamListener{
+public:
+    ~AudioOutputDevice();
+    AudioOutputDevice(
+        Logger& logger,
+        const NativeAudioInfo& device,
+        const QAudioFormat& format,
+        Kernels::AudioPipeline::SampleFormat sample_format,
+        size_t sample_rate,
+        size_t channels
+    );
+
+    virtual void push_samples(size_t frames, const void* data) override;
+
+
+private:
+    const size_t m_bytes_per_frame;
+
+    Logger& m_logger;
+    QAudioSink m_sink;
+    QIODevice* m_io_device;
+
+    LifetimeSanitizer m_sanitizer;
+};
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/IO/AudioSink.cpp b/SerialPrograms/Source/CommonFramework/AudioPipeline/IO/AudioSink.cpp
deleted file mode 100644
index d83fcaac7f..0000000000
--- a/SerialPrograms/Source/CommonFramework/AudioPipeline/IO/AudioSink.cpp
+++ /dev/null
@@ -1,156 +0,0 @@
-/*  Audio Output Writer
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <QtGlobal>
-#if QT_VERSION_MAJOR == 5
-#include <QAudioOutput>
-using NativeAudioSink = QAudioOutput;
-#elif QT_VERSION_MAJOR == 6
-#include <QAudioSink>
-using NativeAudioSink = QAudioSink;
-#endif
-
-#include "Common/Cpp/Exceptions.h"
-#include "Common/Cpp/PrettyPrint.h"
-#include "CommonFramework/AudioPipeline/Tools/AudioFormatUtils.h"
-#include "AudioSink.h"
-
-#include <iostream>
-using std::cout;
-using std::endl;
-
-namespace PokemonAutomation{
-
-
-
-// Slider bar volume: [0, 100], in log scale
-// Volume value passed to AudioDisplayWidget (and the audio thread it manages): [0.f, 1.f], linear scale
-float convertAudioVolumeFromSlider(double volume){
-    volume = std::max(volume, 0.0);
-    volume = std::min(volume, 1.0);
-    // The slider bar value is in the log scale because log scale matches human sound
-    // perception.
-    float linearVolume = QAudio::convertVolume(
-        (float)volume,
-        QAudio::LogarithmicVolumeScale, QAudio::LinearVolumeScale
-    );
-    return linearVolume;
-}
-
-
-
-
-class AudioOutputDevice : public AudioFloatToStream, private StreamListener{
-public:
-    AudioOutputDevice(
-        Logger& logger,
-        const NativeAudioInfo& device, const QAudioFormat& format,
-        AudioSampleFormat sample_format, size_t samples_per_frame,
-        double volume
-    )
-        : AudioFloatToStream(sample_format, samples_per_frame)
-        , StreamListener(samples_per_frame * sample_size(sample_format))
-        , m_logger(logger)
-        , m_sink(device, format)
-    {
-        m_io_device = m_sink.start();
-        m_sink.setVolume(convertAudioVolumeFromSlider(volume));
-        add_listener(*this);
-    }
-    ~AudioOutputDevice(){
-        remove_listener(*this);
-    }
-
-    void set_volume(double volume){
-        double absolute = convertAudioVolumeFromSlider(volume);
-        m_logger.log("Volume set to: Slider = " + tostr_default(volume) + " -> Absolute = " + tostr_default(absolute));
-        m_sink.setVolume(absolute);
-    }
-
-    virtual void on_objects(const void* data, size_t objects) override{
-        m_io_device->write((const char*)data, objects * object_size);
-    }
-
-private:
-    Logger& m_logger;
-    NativeAudioSink m_sink;
-    QIODevice* m_io_device;
-};
-
-
-AudioSink::~AudioSink(){}
-
-AudioSink::AudioSink(Logger& logger, const AudioDeviceInfo& device, AudioChannelFormat format, double volume){
-    NativeAudioInfo native_info = device.native_info();
-    QAudioFormat native_format = native_info.preferredFormat();
-
-    set_format(native_format, format);
-
-    AudioSampleFormat sample_format = get_sample_format(native_format);
-    if (sample_format == AudioSampleFormat::INVALID){
-        sample_format = AudioSampleFormat::FLOAT32;
-        setSampleFormatToFloat(native_format);
-    }
-
-    logger.log("AudioOutputDevice(): " + dumpAudioFormat(native_format));
-    if (!native_info.isFormatSupported(native_format)){
-        logger.log("Audio output device does not support the requested audio format.", COLOR_RED);
-        return;
-    }
-
-    switch (format){
-    case AudioChannelFormat::MONO_48000:
-        m_sample_rate = 48000;
-        m_channels = 1;
-        m_multiplier = 1;
-        break;
-    case AudioChannelFormat::DUAL_44100:
-        m_sample_rate = 44100;
-        m_channels = 2;
-        m_multiplier = 1;
-        break;
-    case AudioChannelFormat::DUAL_48000:
-        m_sample_rate = 48000;
-        m_channels = 2;
-        m_multiplier = 1;
-        break;
-    case AudioChannelFormat::MONO_96000:
-        //  Treat mono-96000 as 2-sample frames.
-        //  The FFT will then average each pair to produce 48000Hz.
-        //  The output will push the same stream at the original 4 bytes * 96000Hz.
-        m_sample_rate = 96000;
-        m_channels = 1;
-        m_multiplier = 2;
-        break;
-    case AudioChannelFormat::INTERLEAVE_LR_96000:
-    case AudioChannelFormat::INTERLEAVE_RL_96000:
-        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Interleaved format not allowed for audio output.");
-    default:
-        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Invalid AudioFormat: " + std::to_string((size_t)format));
-    }
-
-    m_writer = std::make_unique<AudioOutputDevice>(
-        logger,
-        native_info, native_format,
-        sample_format, m_channels * m_multiplier,
-        volume
-    );
-}
-
-AudioSink::operator AudioFloatStreamListener&(){
-    return *m_writer;
-}
-void AudioSink::set_volume(double volume){
-    if (!m_writer){
-        return;
-    }
-    m_writer->set_volume(volume);
-}
-
-
-
-
-}
diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/IO/AudioSink.h b/SerialPrograms/Source/CommonFramework/AudioPipeline/IO/AudioSink.h
deleted file mode 100644
index c42bec14df..0000000000
--- a/SerialPrograms/Source/CommonFramework/AudioPipeline/IO/AudioSink.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*  Audio Sink
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- *      AudioSink represents an audio output stream. Once constructed,
- *  you can push float audio samples to it and it will play it from the
- *  respective speaker or whatever.
- *
- */
-
-#ifndef PokemonAutomation_AudioPipeline_AudioSink_H
-#define PokemonAutomation_AudioPipeline_AudioSink_H
-
-#include <memory>
-#include "CommonFramework/AudioPipeline/AudioInfo.h"
-#include "CommonFramework/AudioPipeline/AudioStream.h"
-
-namespace PokemonAutomation{
-
-class Logger;
-class AudioOutputDevice;
-
-
-class AudioSink{
-public:
-    ~AudioSink();
-    AudioSink(Logger& logger, const AudioDeviceInfo& device, AudioChannelFormat format, double volume);
-
-    size_t sample_rate() const{ return m_sample_rate; }
-    size_t channels() const{ return m_channels; }
-    size_t samples_per_frame() const{ return m_channels * m_multiplier; }
-
-    operator AudioFloatStreamListener&();
-
-    void set_volume(double volume);
-
-
-private:
-    size_t m_sample_rate;
-    size_t m_channels;
-    size_t m_multiplier;
-
-    std::unique_ptr<AudioOutputDevice> m_writer;
-};
-
-
-
-}
-#endif
diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/IO/AudioSource.cpp b/SerialPrograms/Source/CommonFramework/AudioPipeline/IO/AudioSource.cpp
deleted file mode 100644
index 17cff4b521..0000000000
--- a/SerialPrograms/Source/CommonFramework/AudioPipeline/IO/AudioSource.cpp
+++ /dev/null
@@ -1,206 +0,0 @@
-/*  Audio Source
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <QtGlobal>
-#if QT_VERSION_MAJOR == 5
-#include <QAudioInput>
-using NativeAudioSource = QAudioInput;
-#elif QT_VERSION_MAJOR == 6
-#include <QAudioSource>
-using NativeAudioSource = QAudioSource;
-#endif
-
-#include "Common/Cpp/Exceptions.h"
-#include "Common/Cpp/StreamConverters.h"
-#include "CommonFramework/AudioPipeline/AudioStream.h"
-#include "CommonFramework/AudioPipeline/Tools/AudioFormatUtils.h"
-#include "AudioFileLoader.h"
-#include "AudioSource.h"
-
-#include <iostream>
-using std::cout;
-using std::endl;
-
-namespace PokemonAutomation{
-
-
-
-class AudioInputFile final : public QObject{
-public:
-    AudioInputFile(
-        Logger& logger, AudioStreamToFloat& reader,
-        const std::string& file, const QAudioFormat& format
-    )
-         : m_reader(reader)
-    {
-        logger.log("AudioInputFile(): " + dumpAudioFormat(format));
-        m_source = std::make_unique<AudioFileLoader>(nullptr, file, format);
-        connect(m_source.get(), &AudioFileLoader::bufferReady, this, [this](const char* data, size_t len){
-            m_reader.push_bytes(data, len);
-        });
-        m_source->start();
-    }
-
-private:
-    AudioStreamToFloat& m_reader;
-    std::unique_ptr<AudioFileLoader> m_source;
-};
-
-class AudioInputDevice final : public QIODevice{
-public:
-    AudioInputDevice(
-        Logger& logger, AudioStreamToFloat& reader,
-        const NativeAudioInfo& device, const QAudioFormat& format
-    )
-         : m_reader(reader)
-    {
-        logger.log("AudioInputDevice(): " + dumpAudioFormat(format));
-        if (!device.isFormatSupported(format)){
-//            throw InternalProgramError(&logger, PA_CURRENT_FUNCTION, "Format not supported: " + dumpAudioFormat(format));
-            logger.log("Format not supported: " + dumpAudioFormat(format), COLOR_RED);
-            return;
-        }
-        m_source = std::make_unique<NativeAudioSource>(device, format);
-
-        this->open(QIODevice::ReadWrite | QIODevice::Unbuffered);
-        m_source->start(this);
-    }
-    ~AudioInputDevice(){
-        if (m_source){
-            m_source->stop();
-        }
-    }
-
-    virtual bool isSequential() const override { return true; }
-    virtual qint64 readData(char* data, qint64 maxlen) override { return 0; }
-    virtual qint64 writeData(const char* data, qint64 len) override{
-        m_reader.push_bytes(data, len);
-        return len;
-    }
-
-private:
-    AudioStreamToFloat& m_reader;
-    std::unique_ptr<NativeAudioSource> m_source;
-};
-
-
-
-class AudioSource::InternalListener : public AudioFloatStreamListener{
-public:
-    InternalListener(AudioSource& parent)
-        : AudioFloatStreamListener(parent.m_channels * parent.m_multiplier)
-        , m_parent(parent)
-    {}
-
-private:
-    virtual void on_samples(const float* data, size_t objects) override{
-//        cout << "objects = " << objects << endl;
-        SpinLockGuard lg(m_parent.m_lock);
-        for (AudioFloatStreamListener* listener : m_parent.m_listeners){
-//            listener->on_samples(data, objects * m_parent.m_multiplier);
-            listener->on_samples(data, objects);
-        }
-    }
-
-    AudioSource& m_parent;
-};
-
-
-
-
-void AudioSource::add_listener(AudioFloatStreamListener& listener){
-    SpinLockGuard lg(m_lock);
-    m_listeners.insert(&listener);
-}
-void AudioSource::remove_listener(AudioFloatStreamListener& listener){
-    SpinLockGuard lg(m_lock);
-    m_listeners.erase(&listener);
-}
-
-
-AudioSource::~AudioSource(){}
-
-AudioSource::AudioSource(Logger& logger, const std::string& file, AudioChannelFormat format, float volume_multiplier){
-    QAudioFormat native_format;
-    setSampleFormatToFloat(native_format);
-    set_format(native_format, format);
-    init(format, AudioSampleFormat::FLOAT32, volume_multiplier);
-    m_input_file = std::make_unique<AudioInputFile>(logger, *m_reader, file, native_format);
-}
-AudioSource::AudioSource(Logger& logger, const AudioDeviceInfo& device, AudioChannelFormat format, float volume_multiplier){
-    NativeAudioInfo native_info = device.native_info();
-    QAudioFormat native_format = native_info.preferredFormat();
-
-    set_format(native_format, format);
-
-    AudioSampleFormat stream_format = get_sample_format(native_format);
-    if (stream_format == AudioSampleFormat::INVALID){
-        stream_format = AudioSampleFormat::FLOAT32;
-        setSampleFormatToFloat(native_format);
-    }
-
-    init(format, stream_format, volume_multiplier);
-    m_input_device = std::make_unique<AudioInputDevice>(logger, *m_reader, native_info, native_format);
-}
-
-void AudioSource::init(AudioChannelFormat format, AudioSampleFormat stream_format, float volume_multiplier){
-    switch (format){
-    case AudioChannelFormat::MONO_48000:
-        m_sample_rate = 48000;
-        m_channels = 1;
-        m_multiplier = 1;
-        m_reader.reset(new AudioStreamToFloat(stream_format, 1, volume_multiplier, false));
-        break;
-    case AudioChannelFormat::DUAL_44100:
-        m_sample_rate = 44100;
-        m_channels = 2;
-        m_multiplier = 1;
-        m_reader.reset(new AudioStreamToFloat(stream_format, 2, volume_multiplier, false));
-        break;
-    case AudioChannelFormat::DUAL_48000:
-        m_sample_rate = 48000;
-        m_channels = 2;
-        m_multiplier = 1;
-        m_reader.reset(new AudioStreamToFloat(stream_format, 2, volume_multiplier, false));
-        break;
-    case AudioChannelFormat::MONO_96000:
-        //  Treat mono-96000 as 2-sample frames.
-        //  The FFT will then average each pair to produce 48000Hz.
-        //  The output will push the same stream at the original 4 bytes * 96000Hz.
-        m_sample_rate = 96000;
-        m_channels = 1;
-        m_multiplier = 2;
-        m_reader.reset(new AudioStreamToFloat(stream_format, 2, volume_multiplier, false));
-        break;
-    case AudioChannelFormat::INTERLEAVE_LR_96000:
-        m_sample_rate = 48000;
-        m_channels = 2;
-        m_multiplier = 1;
-        m_reader.reset(new AudioStreamToFloat(stream_format, 2, volume_multiplier, false));
-        break;
-    case AudioChannelFormat::INTERLEAVE_RL_96000:
-        m_sample_rate = 48000;
-        m_channels = 2;
-        m_multiplier = 1;
-        m_reader.reset(new AudioStreamToFloat(stream_format, 2, volume_multiplier, true));
-        break;
-    default:
-        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Invalid AudioFormat: " + std::to_string((size_t)format));
-    }
-
-    m_internal_listener = std::make_unique<InternalListener>(*this);
-    m_reader->add_listener(*m_internal_listener);
-}
-
-
-
-
-
-
-
-
-
-}
diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/IO/AudioSource.h b/SerialPrograms/Source/CommonFramework/AudioPipeline/IO/AudioSource.h
deleted file mode 100644
index bbbba6eeb9..0000000000
--- a/SerialPrograms/Source/CommonFramework/AudioPipeline/IO/AudioSource.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*  Audio Source
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- *      AudioSource represents an audio input stream. Once constructed,
- *  it spits out the float samples. Listeners can attach themselves to this
- *  class to receive these audio frames.
- *
- */
-
-#ifndef PokemonAutomation_AudioPipeline_AudioSource_H
-#define PokemonAutomation_AudioPipeline_AudioSource_H
-
-#include <memory>
-#include <set>
-#include "Common/Cpp/Concurrency/SpinLock.h"
-#include "CommonFramework/AudioPipeline/AudioInfo.h"
-#include "CommonFramework/AudioPipeline/AudioStream.h"
-
-namespace PokemonAutomation{
-
-class Logger;
-class AudioStreamToFloat;
-class AudioInputFile;
-class AudioInputDevice;
-
-
-class AudioSource{
-public:
-    void add_listener(AudioFloatStreamListener& listener);
-    void remove_listener(AudioFloatStreamListener& listener);
-
-public:
-    ~AudioSource();
-
-    //  Read from an audio file. (i.e. .wav or .mp3)
-    AudioSource(Logger& logger, const std::string& file, AudioChannelFormat format, float volume_multiplier);
-
-    //  Read from an audio input device. (i.e. capture card)
-    AudioSource(Logger& logger, const AudioDeviceInfo& device, AudioChannelFormat format, float volume_multiplier);
-
-    size_t sample_rate() const{ return m_sample_rate; }
-    size_t channels() const{ return m_channels; }
-    size_t samples_per_frame() const{ return m_channels * m_multiplier; }
-
-private:
-    void init(AudioChannelFormat format, AudioSampleFormat stream_format, float volume_multiplier);
-
-private:
-    class InternalListener;
-
-    size_t m_sample_rate;
-    size_t m_channels;
-    size_t m_multiplier;
-
-    SpinLock m_lock;
-
-    std::unique_ptr<InternalListener> m_internal_listener;
-    std::unique_ptr<AudioStreamToFloat> m_reader;
-
-    std::unique_ptr<AudioInputFile> m_input_file;
-    std::unique_ptr<AudioInputDevice> m_input_device;
-
-    std::set<AudioFloatStreamListener*> m_listeners;
-};
-
-
-
-}
-#endif
diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/SinkPipeline_Tests.cpp b/SerialPrograms/Source/CommonFramework/AudioPipeline/SinkPipeline_Tests.cpp
new file mode 100644
index 0000000000..e72e70eb48
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/SinkPipeline_Tests.cpp
@@ -0,0 +1,732 @@
+/*  Audio Pipeline - Sink Gate Tests
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  Self-contained invariants for the pipeline tree's sink branch
+ *  (RawAudio2WorkingAudio -> [resampler] -> [mixer] -> WorkingAudio2RawAudio).
+ *  Everything runs on plain kernel objects, so no audio I/O is involved:
+ *
+ *   1. No-op cases (same rate, channel count, and sample format on both
+ *      sides): the tree's raw output must be bit-identical to the input
+ *      (float), or within 1 LSB of a plain-scalar reference (sint16).
+ *
+ *   2. Resampled / mixed cases: output length, tone amplitudes, and the
+ *      upmix / downmix channel behavior.
+ *
+ */
+
+#include <algorithm>
+#include <atomic>
+#include <cmath>
+#include <cstdint>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <filesystem>
+#include <numbers>
+#include <random>
+#include <thread>
+#include <vector>
+#include <QAudioDecoder>
+#include <QAudioFormat>
+#include <QCoreApplication>
+#include <QEventLoop>
+#include "Common/Cpp/Exceptions.h"
+#include "Common/Cpp/PrettyPrint.h"
+#include "Common/Cpp/TestRunners/UnitTest.h"
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "Common/Cpp/Containers/AlignedVector.tpp"
+#include "Kernels/AudioPipeline/Kernels_RawAudio2WorkingAudio.h"
+#include "Kernels/AudioPipeline/Kernels_WorkingAudio2RawAudio.h"
+#include "Kernels/AudioPipeline/Kernels_ChannelMixer.h"
+#include "Kernels/AudioResampler/Kernels_AudioResampler.h"
+#include "CommonFramework/GlobalAutoPaths.h"
+#include "CommonFramework/AudioPipeline/AudioFormat.h"
+#include "CommonFramework/AudioPipeline/AudioInputChoice.h"
+#include "CommonFramework/AudioPipeline/Backends/AudioDeviceInfo.h"
+#include "CommonFramework/AudioPipeline/Tools/ChannelMixer.h"
+#include "CommonFramework/AudioPipeline/Backends/AudioPassthroughPairQt.h"
+#include "CommonFramework/AudioPipeline/Sources/AudioSource_File.h"
+#include "SinkPipeline_Tests.h"
+
+namespace PokemonAutomation{
+
+namespace{
+
+
+//  QAudioFormat with just a channel count and, for 1 and 2 channels, the
+//  standard layout. More channels leave the config unknown so that
+//  resolve_positions() falls back to the standard layout for the count.
+//  (Same convention as AudioPassthroughPairQt's channel_format().)
+QAudioFormat channel_format(size_t channels){
+    QAudioFormat format;
+    format.setChannelCount((int)channels);
+    if (channels <= 2){
+        format.setChannelConfig(
+            channels == 1
+                ? QAudioFormat::ChannelConfig::ChannelConfigMono
+                : QAudioFormat::ChannelConfig::ChannelConfigStereo
+        );
+    }
+    return format;
+}
+
+
+
+//  Two tones plus low-level noise. Deterministic: the same generator
+//  state always produces the same signal, on every platform.
+std::vector<float> make_noisy_tones(
+    size_t n,
+    size_t rate,
+    double f0,
+    double f1,
+    std::mt19937& generator
+){
+    std::uniform_real_distribution<float> noise(-1.0f, 1.0f);
+    std::vector<float> out(n);
+    const double two_pi = 2.0 * std::numbers::pi;
+    for (size_t i = 0; i < n; i++){
+        out[i] = 0.35f * (float)std::sin(two_pi * f0 * i / rate)
+            + 0.25f * (float)std::sin(two_pi * f1 * i / rate)
+            + 0.01f * noise(generator);
+    }
+    return out;
+}
+
+
+
+//  A single pure tone.
+std::vector<float> make_tone(size_t n, size_t rate, double freq, float amplitude){
+    std::vector<float> out(n);
+    const double two_pi = 2.0 * std::numbers::pi;
+    for (size_t i = 0; i < n; i++){
+        out[i] = amplitude * (float)std::sin(two_pi * freq * i / rate);
+    }
+    return out;
+}
+
+
+
+//  The raw interleaved bytes of a set of float channels.
+std::vector<char> interleave_bytes(std::initializer_list<std::vector<float>> channels){
+    const size_t ch = channels.size();
+    const size_t n = (*channels.begin()).size();
+    std::vector<const float*> ptrs(ch);
+    size_t i = 0;
+    for (const auto& c : channels){
+        ptrs[i++] = c.data();
+    }
+    std::vector<char> out(n * ch * sizeof(float));
+    for (size_t s = 0; s < n; s++){
+        char* dst = out.data() + s * ch * sizeof(float);
+        for (size_t c = 0; c < ch; c++){
+            std::memcpy(dst, &ptrs[c][s], sizeof(float));
+            dst += sizeof(float);
+        }
+    }
+    return out;
+}
+
+
+
+//  (max - min) / 2 of one channel over [skip, end).
+float measure_amplitude(const std::vector<float>& interleaved, size_t channels, size_t channel, size_t skip){
+    const size_t frames = interleaved.size() / channels;
+    if (frames <= skip){
+        return 0.0f;
+    }
+    float lo = interleaved[skip * channels + channel];
+    float hi = lo;
+    for (size_t i = skip + 1; i < frames; i++){
+        float v = interleaved[i * channels + channel];
+        lo = std::min(lo, v);
+        hi = std::max(hi, v);
+    }
+    return (hi - lo) * 0.5f;
+}
+
+
+
+//  Records the raw byte stream at the end of the tree chain.
+class RecordingRawListener : public Kernels::AudioPipeline::RawAudioStreamListener{
+public:
+    RecordingRawListener(AudioSampleFormat format, size_t rate, size_t channels)
+        : Kernels::AudioPipeline::RawAudioStreamListener(format, rate, channels)
+        , m_frame_bytes(sample_size(format) * channels)
+    {}
+    virtual void push_samples(size_t frames, const void* data) override{
+        const char* bytes = (const char*)data;
+        const size_t count = frames * m_frame_bytes;
+        m_bytes.insert(m_bytes.end(), bytes, bytes + count);
+    }
+    const std::vector<char>& bytes() const{
+        return m_bytes;
+    }
+
+private:
+    const size_t m_frame_bytes;
+    std::vector<char> m_bytes;
+};
+
+
+
+//  Tree path: raw bytes -> RawAudio2WorkingAudio -> [resampler] -> [mixer]
+//  -> WorkingAudio2RawAudio, mirroring AudioPassthroughPairQt::
+//  rebuild_sink_branch().
+std::vector<char> run_tree(
+    Logger& logger,
+    const std::vector<char>& raw,
+    AudioSampleFormat in_format, size_t in_rate, size_t in_channels,
+    AudioSampleFormat out_format, size_t out_rate, size_t out_channels
+){
+    Kernels::AudioPipeline::RawAudio2WorkingAudio decoder(
+        in_format, in_rate, in_channels, 1.0f
+    );
+    Kernels::AudioPipeline::WorkingAudio2RawAudio encoder(
+        out_format, out_rate, out_channels, 1.0f
+    );
+    RecordingRawListener out(out_format, out_rate, out_channels);
+    encoder.add_listener(out);
+
+    std::unique_ptr<Kernels::AudioResampler::AudioResampler> resampler;
+    std::unique_ptr<Kernels::AudioPipeline::ChannelMixer> mixer;
+    Kernels::AudioPipeline::WorkingAudioStreamListener* head = &encoder;
+    if (in_rate != out_rate){
+        resampler.reset(
+            new Kernels::AudioResampler::AudioResampler(
+                logger,
+                in_rate,
+                out_rate,
+                out_channels
+            )
+        );
+        resampler->add_listener(*head);
+        head = resampler.get();
+    }
+    if (in_channels != out_channels){
+        std::vector<float> matrix = build_channel_mixer_matrix(
+            channel_format(in_channels), channel_format(out_channels)
+        );
+        if (matrix.size() != in_channels * out_channels){
+            throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "No channel mixer matrix.");
+        }
+        mixer.reset(new Kernels::AudioPipeline::ChannelMixer(
+            logger, in_rate, in_channels, out_channels, std::move(matrix)
+        ));
+        mixer->add_listener(*head);
+        head = mixer.get();
+    }
+    decoder.add_listener(*head);
+
+    //  Feed in odd-sized chunks. (The nodes die child-first with scope
+    //  exit, after the feed is done, like the pair's teardown.)
+    const size_t frame_size = sample_size(in_format) * in_channels;
+    const size_t frames_total = raw.size() / frame_size;
+    size_t done = 0;
+    while (done < frames_total){
+        size_t chunk = std::min((size_t)997, frames_total - done);
+        decoder.push_samples(chunk, raw.data() + done * frame_size);
+        done += chunk;
+    }
+
+    return out.bytes();
+}
+
+
+
+//
+//  No-op case: 2ch x 48000 FLOAT32 in, same out. The tree must pass the
+//  raw bytes through bit-identically.
+//
+class SinkGateDual48000Test : public UnitTest{
+public:
+    SinkGateDual48000Test()
+        : UnitTest("AudioPipeline - SinkGate_Dual48000_BitExact")
+    {}
+
+    virtual UnitTestResult run(Logger& logger, CancellableScope& scope) const override{
+        const size_t rate = 48000;
+        const size_t n = 8192;
+
+        std::mt19937 generator(42);
+        std::vector<float> l = make_noisy_tones(n, rate, 4031.25, 14062.5, generator);
+        std::vector<float> r = make_noisy_tones(n, rate, 4031.25, 14062.5, generator);
+        std::vector<char> raw = interleave_bytes({l, r});
+
+        std::vector<char> tree = run_tree(
+            logger, raw,
+            AudioSampleFormat::FLOAT32, rate, 2,
+            AudioSampleFormat::FLOAT32, rate, 2
+        );
+
+        if (tree.size() != raw.size()){
+            return "Length mismatch: raw = " + std::to_string(raw.size())
+                + ", tree = " + std::to_string(tree.size()) + " bytes.";
+        }
+        if (std::memcmp(raw.data(), tree.data(), tree.size()) != 0){
+            for (size_t c = 0; c < tree.size(); c++){
+                if (raw[c] != tree[c]){
+                    return "First differing byte at " + std::to_string(c)
+                        + ": raw = " + tostr_default((int)raw[c])
+                        + ", tree = " + tostr_default((int)tree[c]) + ".";
+                }
+            }
+        }
+
+        return true;
+    }
+};
+
+
+
+//
+//  No-op case: 1ch x 48000 FLOAT32 in, same out. Bit-identical pass-
+//  through, as the dual case above.
+//
+class SinkGateMono48000Test : public UnitTest{
+public:
+    SinkGateMono48000Test()
+        : UnitTest("AudioPipeline - SinkGate_Mono48000_BitExact")
+    {}
+
+    virtual UnitTestResult run(Logger& logger, CancellableScope& scope) const override{
+        const size_t rate = 48000;
+        const size_t n = 8192;
+
+        std::mt19937 generator(42);
+        std::vector<float> m = make_noisy_tones(n, rate, 4031.25, 14062.5, generator);
+        std::vector<char> raw = interleave_bytes({m});
+
+        std::vector<char> tree = run_tree(
+            logger, raw,
+            AudioSampleFormat::FLOAT32, rate, 1,
+            AudioSampleFormat::FLOAT32, rate, 1
+        );
+
+        if (tree.size() != raw.size()){
+            return "Length mismatch: raw = " + std::to_string(raw.size())
+                + ", tree = " + std::to_string(tree.size()) + " bytes.";
+        }
+        if (std::memcmp(raw.data(), tree.data(), tree.size()) != 0){
+            for (size_t c = 0; c < tree.size(); c++){
+                if (raw[c] != tree[c]){
+                    return "First differing byte at " + std::to_string(c)
+                        + ": raw = " + tostr_default((int)raw[c])
+                        + ", tree = " + tostr_default((int)tree[c]) + ".";
+                }
+            }
+        }
+
+        return true;
+    }
+};
+
+
+
+//
+//  No-op shape, different sample format: FLOAT32 in, SINT16 out, same
+//  rate / channels. Every converter variant (scalar or SIMD) must agree
+//  with the plain-scalar reference — x * 32768, clamped to int16 —
+//  within 1 LSB per sample (rounding / clamping policy).
+//
+class SinkGateSint16NoOpTest : public UnitTest{
+public:
+    SinkGateSint16NoOpTest()
+        : UnitTest("AudioPipeline - SinkGate_Sint16NoOp_1LSB")
+    {}
+
+    virtual UnitTestResult run(Logger& logger, CancellableScope& scope) const override{
+        const size_t rate = 48000;
+        const size_t n = 8192;
+
+        std::mt19937 generator(42);
+        std::vector<float> l = make_noisy_tones(n, rate, 4031.25, 14062.5, generator);
+        std::vector<float> r = make_noisy_tones(n, rate, 4031.25, 14062.5, generator);
+        std::vector<char> raw = interleave_bytes({l, r});
+
+        std::vector<char> tree = run_tree(
+            logger, raw,
+            AudioSampleFormat::FLOAT32, rate, 2,
+            AudioSampleFormat::SINT16, rate, 2
+        );
+        if (tree.size() != raw.size() / 2){
+            return "Length mismatch: raw = " + std::to_string(raw.size())
+                + ", tree = " + std::to_string(tree.size()) + " bytes.";
+        }
+
+        std::vector<int16_t> tree_samples(tree.size() / sizeof(int16_t));
+        std::memcpy(tree_samples.data(), tree.data(), tree.size());
+
+        for (size_t c = 0; c < tree_samples.size(); c++){
+            const float x = (c % 2 == 0) ? l[c / 2] : r[c / 2];
+            float v = x * 32768.0f;
+            v = std::clamp(v, -32768.0f, 32767.0f);
+            const int ref = (int)std::lround((double)v);
+            if (std::abs((int)tree_samples[c] - ref) > 1){
+                return "Sample " + std::to_string(c) + " differs from the scalar reference by more than 1 LSB: reference = "
+                    + std::to_string(ref) + ", tree = " + std::to_string(tree_samples[c]) + ".";
+            }
+        }
+
+        return true;
+    }
+};
+
+
+
+//
+//  Resample up: 2ch x 44100 -> 2ch x 48000 FLOAT32. The legacy path has
+//  no equivalent (it opened the device at the input rate), so verify the
+//  tree's output on its own: the right number of samples and each input
+//  tone at its input amplitude.
+//
+class SinkGateResampleUpTest : public UnitTest{
+public:
+    SinkGateResampleUpTest()
+        : UnitTest("AudioPipeline - SinkGate_ResampleUp_44100To48000")
+    {}
+
+    virtual UnitTestResult run(Logger& logger, CancellableScope& scope) const override{
+        const size_t in_rate = 44100;
+        const size_t out_rate = 48000;
+        //  Long stream: the resampler holds back a tail carry (less than a
+        //  kernel block; up to ~128 outputs on x86 AVX-512) that is never
+        //  flushed, so the relative slack must dwarf that.
+        const size_t n = 65536;
+
+        std::vector<float> l = make_tone(n, in_rate, 4031.25, 0.5f);
+        std::vector<float> r = make_tone(n, in_rate, 14062.5, 0.4f);
+        std::vector<char> raw = interleave_bytes({l, r});
+
+        std::vector<char> out = run_tree(
+            logger, raw,
+            AudioSampleFormat::FLOAT32, in_rate, 2,
+            AudioSampleFormat::FLOAT32, out_rate, 2
+        );
+        const size_t out_samples = out.size() / sizeof(float);
+        const double expected = (double)n * 2.0 * ((double)out_rate / (double)in_rate);
+        if (out_samples < expected * 0.98 || out_samples > expected * 1.02){
+            return "Output length out of range: " + std::to_string(out_samples)
+                + " samples, expected ~" + std::to_string((size_t)expected) + ".";
+        }
+
+        std::vector<float> out_floats(out_samples);
+        std::memcpy(out_floats.data(), out.data(), out.size());
+
+        //  Skip a few leading samples for the resampler transient.
+        const size_t skip = 512;
+        float amplitude_l = measure_amplitude(out_floats, 2, 0, skip);
+        float amplitude_r = measure_amplitude(out_floats, 2, 1, skip);
+        if (std::abs(amplitude_l - 0.5f) > 0.025f){
+            return "Left tone amplitude out of range: " + tostr_default(amplitude_l) + ", expected ~0.5.";
+        }
+        if (std::abs(amplitude_r - 0.4f) > 0.02f){
+            return "Right tone amplitude out of range: " + tostr_default(amplitude_r) + ", expected ~0.4.";
+        }
+
+        return true;
+    }
+};
+
+
+
+//
+//  Decimate: 1ch x 96000 -> 1ch x 48000 FLOAT32.
+//
+class SinkGateDecimateTest : public UnitTest{
+public:
+    SinkGateDecimateTest()
+        : UnitTest("AudioPipeline - SinkGate_Decimate_96000To48000")
+    {}
+
+    virtual UnitTestResult run(Logger& logger, CancellableScope& scope) const override{
+        const size_t in_rate = 96000;
+        const size_t out_rate = 48000;
+        //  Long stream: see the note in SinkGateResampleUpTest about the
+        //  unflushed tail carry.
+        const size_t n = 65536;
+
+        std::vector<float> m = make_tone(n, in_rate, 4031.25, 0.5f);
+        std::vector<char> raw = interleave_bytes({m});
+
+        std::vector<char> out = run_tree(
+            logger, raw,
+            AudioSampleFormat::FLOAT32, in_rate, 1,
+            AudioSampleFormat::FLOAT32, out_rate, 1
+        );
+        const size_t out_samples = out.size() / sizeof(float);
+        const double expected = (double)n * ((double)out_rate / (double)in_rate);
+        if (out_samples < expected * 0.99 || out_samples > expected * 1.01){
+            return "Output length out of range: " + std::to_string(out_samples)
+                + " samples, expected ~" + std::to_string((size_t)expected) + ".";
+        }
+
+        std::vector<float> out_floats(out_samples);
+        std::memcpy(out_floats.data(), out.data(), out.size());
+
+        const size_t skip = 512;
+        float amplitude = measure_amplitude(out_floats, 1, 0, skip);
+        if (std::abs(amplitude - 0.5f) > 0.015f){
+            return "Tone amplitude out of range: " + tostr_default(amplitude) + ", expected ~0.5.";
+        }
+
+        return true;
+    }
+};
+
+
+
+//
+//  Upmix: 1ch x 48000 -> 2ch x 48000 FLOAT32. The mixer's mono -> stereo
+//  matrix copies the channel to both sides at gain 1, so the two output
+//  channels must be bit-identical with the input amplitude.
+//
+class SinkGateUpmixTest : public UnitTest{
+public:
+    SinkGateUpmixTest()
+        : UnitTest("AudioPipeline - SinkGate_Upmix_MonoToStereo")
+    {}
+
+    virtual UnitTestResult run(Logger& logger, CancellableScope& scope) const override{
+        const size_t rate = 48000;
+        const size_t n = 8192;
+
+        std::vector<float> m = make_tone(n, rate, 4031.25, 0.5f);
+        std::vector<char> raw = interleave_bytes({m});
+
+        std::vector<char> out = run_tree(
+            logger, raw,
+            AudioSampleFormat::FLOAT32, rate, 1,
+            AudioSampleFormat::FLOAT32, rate, 2
+        );
+        if (out.size() != raw.size() * 2){
+            return "Output length mismatch: " + std::to_string(out.size())
+                + " bytes, expected " + std::to_string(raw.size() * 2) + ".";
+        }
+
+        std::vector<float> out_floats(out.size() / sizeof(float));
+        std::memcpy(out_floats.data(), out.data(), out.size());
+
+        for (size_t i = 0; i < n; i++){
+            if (out_floats[2 * i + 0] != out_floats[2 * i + 1]){
+                return "Channels differ at frame " + std::to_string(i) + ": L = "
+                    + tostr_default(out_floats[2 * i + 0])
+                    + ", R = " + tostr_default(out_floats[2 * i + 1]) + ".";
+            }
+        }
+        float amplitude = measure_amplitude(out_floats, 2, 0, 0);
+        if (std::abs(amplitude - 0.5f) > 0.005f){
+            return "Tone amplitude out of range: " + tostr_default(amplitude) + ", expected ~0.5.";
+        }
+
+        return true;
+    }
+};
+
+
+
+//
+//  Downmix: 2ch x 48000 -> 1ch x 48000 FLOAT32. The mixer's stereo ->
+//  mono matrix is a 0.5 / 0.5 average, so both input tones survive at
+//  their input amplitudes.
+//
+class SinkGateDownmixTest : public UnitTest{
+public:
+    SinkGateDownmixTest()
+        : UnitTest("AudioPipeline - SinkGate_Downmix_StereoToMono")
+    {}
+
+    virtual UnitTestResult run(Logger& logger, CancellableScope& scope) const override{
+        const size_t rate = 48000;
+        const size_t n = 8192;
+
+        std::vector<float> l = make_tone(n, rate, 4031.25, 0.5f);
+        std::vector<float> r = make_tone(n, rate, 14062.5, 0.4f);
+        std::vector<char> raw = interleave_bytes({l, r});
+
+        std::vector<char> out = run_tree(
+            logger, raw,
+            AudioSampleFormat::FLOAT32, rate, 2,
+            AudioSampleFormat::FLOAT32, rate, 1
+        );
+        if (out.size() != raw.size() / 2){
+            return "Output length mismatch: " + std::to_string(out.size())
+                + " bytes, expected " + std::to_string(raw.size() / 2) + ".";
+        }
+
+        std::vector<float> out_floats(out.size() / sizeof(float));
+        std::memcpy(out_floats.data(), out.data(), out.size());
+
+        //  Both tones are present in the mix; check the combined
+        //  amplitude against the two-tone reference measured the same way.
+        std::vector<float> reference(n);
+        for (size_t i = 0; i < n; i++){
+            reference[i] = l[i] * 0.5f + r[i] * 0.5f;
+        }
+        float out_amplitude = measure_amplitude(out_floats, 1, 0, 0);
+        float ref_amplitude = measure_amplitude(reference, 1, 0, 0);
+        if (ref_amplitude <= 0.0f){
+            return "Reference amplitude is not positive (" + tostr_default(ref_amplitude) + ").";
+        }
+        double ratio = out_amplitude / ref_amplitude;
+        if (ratio < 0.95 || ratio > 1.05){
+            return "Output / reference amplitude ratio out of range: " + tostr_default((float)ratio) + ".";
+        }
+
+        return true;
+    }
+};
+
+
+
+//
+//  Multichannel (5.1) file input: 6ch x 48000 in, 1ch / 2ch out, same
+//  Regression gate for the mp3-probe deadlock: the file source's
+//  constructor probes the decoder on a nested event loop, and events
+//  queued on the pair's thread are dispatched during that loop. A
+//  queued set_audio_sink must be able to take the pair's lock then, so
+//  the source has to be constructed outside the lock (a regression
+//  here deadlocks; the watchdog aborts the run instead of hanging it).
+class SinkGateFileSourceNoDeadlockTest : public UnitTest{
+public:
+    SinkGateFileSourceNoDeadlockTest()
+        : UnitTest("AudioPipeline - SinkGate_FileSource_NoDeadlock")
+    {}
+
+    virtual UnitTestResult run(Logger& logger, CancellableScope&) const override{
+        const std::string fixture =
+            UNIT_TEST_RESOURCE_PATH() + "CommonFramework/AudioPipeline/decoded_probe_44100_2ch.mp3";
+        if (!std::filesystem::exists(std::filesystem::path(fixture))){
+            return "Missing mp3 fixture: " + fixture + ".";
+        }
+        if (!QAudioDecoder(nullptr).isSupported()){
+            return UnitTestResult(
+                UnitTestResult::SKIPPED,
+                "No audio decode backend (Qt Multimedia media plugin missing or failing to load)."
+            );
+        }
+
+        std::atomic<bool> finished{false};
+        std::thread watchdog([&finished]{
+            for (int i = 0; i < 300 && !finished.load(std::memory_order_relaxed); i++){
+                std::this_thread::sleep_for(std::chrono::milliseconds(100));
+            }
+            if (!finished.load(std::memory_order_relaxed)){
+                std::fprintf(stderr, "SinkGate_FileSource_NoDeadlock: still running after 30 s: deadlock, aborting.\n");
+                std::abort();
+            }
+        });
+
+        AudioPassthroughPairQt pair(logger);
+        QMetaObject::invokeMethod(
+            &pair,
+            [&pair]{
+                pair.set_audio_sink(AudioDeviceInfo(), 1.0);
+            },
+            Qt::QueuedConnection
+        );
+        //  Must complete: the probe runs before the lock is taken, so the
+        //  queued sink event above can run through while it decodes.
+        pair.set_audio_source(
+            std::make_unique<AudioSourceDescriptor_File>(fixture),
+            AudioInputChoice()
+        );
+        QCoreApplication::processEvents(QEventLoop::AllEvents, 500);
+
+        finished.store(true, std::memory_order_relaxed);
+        watchdog.join();
+        return true;
+    }
+};
+
+
+
+//  rate, so the tree is a plain mix. The input format carries no channel
+//  config, so the matrix must come from the standard 5.1 fallback layout
+//  (resolve_positions), and the mix must match a scalar reference
+//  computed from the same matrix. This also pins that a 6ch input gets a
+//  real (non-empty) matrix at all: before channel_format() stopped
+//  forcing the stereo config on counts above 2, the 6ch shape resolved
+//  as 2ch and no matrix could be built.
+//
+class SinkGateMultichannel51Test : public UnitTest{
+public:
+    SinkGateMultichannel51Test()
+        : UnitTest("AudioPipeline - SinkGate_Multichannel51_Downmix")
+    {}
+
+    virtual UnitTestResult run(Logger& logger, CancellableScope&) const override{
+        //  6ch (5.1: FL FR C LFE BL BR) x 48000 float, one constant per
+        //  channel.
+        const size_t n = 4800;
+        std::vector<float> fl(n, 0.3f), fr(n, 0.1f), c(n, -0.2f), lfe(n, 0.4f), bl(n, 0.05f), br(n, -0.05f);
+        const std::vector<std::vector<float>> in_channels = {fl, fr, c, lfe, bl, br};
+        const std::vector<char> raw = interleave_bytes({fl, fr, c, lfe, bl, br});
+
+        for (size_t out_channels : {1, 2}){
+            std::vector<float> matrix = build_channel_mixer_matrix(
+                channel_format(6), channel_format(out_channels)
+            );
+            if (matrix.size() != 6 * out_channels){
+                return "Expected a 6x" + std::to_string(out_channels) + " mix matrix, got "
+                    + std::to_string(matrix.size()) + " entries.";
+            }
+
+            //  The LFE channel does not reach a mono mix.
+            if (out_channels == 1 && matrix[3] != 0.0f){
+                return "The LFE channel should have zero gain into mono.";
+            }
+
+            const std::vector<char> out = run_tree(
+                logger, raw,
+                AudioSampleFormat::FLOAT32, 48000, 6,
+                AudioSampleFormat::FLOAT32, 48000, out_channels
+            );
+            const size_t out_frames = out.size() / (sizeof(float) * out_channels);
+            if (out_frames != n){
+                return "Expected " + std::to_string(n) + " output frames, got "
+                    + std::to_string(out_frames) + ".";
+            }
+            for (size_t i = 0; i < n; i++){
+                for (size_t o = 0; o < out_channels; o++){
+                    float reference = 0.0f;
+                    for (size_t k = 0; k < 6; k++){
+                        reference += matrix[k + 6 * o] * in_channels[k][i];
+                    }
+                    const float got = *reinterpret_cast<const float*>(
+                        out.data() + (i * out_channels + o) * sizeof(float)
+                    );
+                    if (std::fabs(got - reference) > 1e-6f){
+                        return "Mix mismatch on output channel " + std::to_string(o)
+                            + " frame " + std::to_string(i) + ": got "
+                            + tostr_default(got) + ", expected " + tostr_default(reference) + ".";
+                    }
+                }
+            }
+        }
+
+        return true;
+    }
+};
+
+
+
+}
+
+
+
+void add_tests_SinkPipeline(UnitTestDatabase& database){
+    database.add<SinkGateDual48000Test>();
+    database.add<SinkGateMono48000Test>();
+    database.add<SinkGateSint16NoOpTest>();
+    database.add<SinkGateResampleUpTest>();
+    database.add<SinkGateDecimateTest>();
+    database.add<SinkGateUpmixTest>();
+    database.add<SinkGateDownmixTest>();
+    database.add<SinkGateMultichannel51Test>();
+    database.add<SinkGateFileSourceNoDeadlockTest>();
+}
+
+
+
+}
diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/SinkPipeline_Tests.h b/SerialPrograms/Source/CommonFramework/AudioPipeline/SinkPipeline_Tests.h
new file mode 100644
index 0000000000..2289fdd2e9
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/SinkPipeline_Tests.h
@@ -0,0 +1,28 @@
+/*  Audio Pipeline - Sink Gate Tests
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_AudioPipeline_SinkPipeline_Tests_H
+#define PokemonAutomation_AudioPipeline_SinkPipeline_Tests_H
+
+class UnitTestDatabase;
+
+namespace PokemonAutomation{
+
+
+
+//
+//  Registers the sink gate tests: self-contained invariants for the
+//  pipeline tree's sink branch (RawAudio2WorkingAudio -> [resampler] ->
+//  [mixer] -> WorkingAudio2RawAudio) - no-op bit-exactness, 1-LSB sint16
+//  against a plain-scalar reference, and the resampled / mixed shapes
+//  (output length, tone amplitudes, upmix / downmix channel behavior).
+//
+void add_tests_SinkPipeline(UnitTestDatabase& database);
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/Sources/AudioSource_Device.cpp b/SerialPrograms/Source/CommonFramework/AudioPipeline/Sources/AudioSource_Device.cpp
new file mode 100644
index 0000000000..18706767e7
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/Sources/AudioSource_Device.cpp
@@ -0,0 +1,125 @@
+/*  Audio Source (Device)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Json/JsonValue.h"
+#include "CommonFramework/GlobalSettingsPanel.h"
+#include "CommonFramework/AudioPipeline/AudioInputChoice.h"
+#include "CommonFramework/AudioPipeline/AudioPipelineOptions.h"
+#include "AudioSource_Device.h"
+
+namespace PokemonAutomation{
+
+
+
+bool AudioSourceDescriptor_Device::operator==(const AudioSourceDescriptor& x) const{
+    if (typeid(*this) != typeid(x)){
+        return false;
+    }
+    return m_info == static_cast<const AudioSourceDescriptor_Device&>(x).m_info;
+}
+std::string AudioSourceDescriptor_Device::display_name() const{
+    return m_info.display_name();
+}
+
+std::vector<AudioInputChoice> AudioSourceDescriptor_Device::supported_formats() const{
+    return m_info.supported_choices();
+}
+bool AudioSourceDescriptor_Device::sanitize_desired_format(Logger& logger, AudioInputChoice& format) const{
+    const std::vector<AudioInputChoice>& choices = m_info.supported_choices();
+    const size_t preferred_index = m_info.preferred_choice_index();
+    if (choices.empty()){
+        logger.log("No supported formats for this input device.", COLOR_RED);
+        format = AudioInputChoice();
+        return false;
+    }
+    if (!format){
+        logger.log("No format set. Resetting to default...", COLOR_ORANGE);
+    }else{
+        for (const AudioInputChoice& choice : choices){
+            if (choice == format){
+                return true;
+            }
+        }
+        logger.log("Desired format not supported. Resetting to default...", COLOR_RED);
+    }
+    format = choices[preferred_index];
+    return true;
+}
+
+
+JsonValue AudioSourceDescriptor_Device::to_json() const{
+    return m_info.device_name();
+}
+void AudioSourceDescriptor_Device::load_json(const JsonValue& json){
+    const std::string* name = json.to_string();
+    if (name != nullptr){
+        m_info = AudioDeviceInfo(*name);
+    }
+}
+
+std::unique_ptr<AudioSource> AudioSourceDescriptor_Device::make_AudioSource(
+    Logger& logger,
+    const AudioInputChoice& format
+) const{
+    if (!format){
+        return nullptr;
+    }
+//    cout << "format = " << (int)format << endl;
+    return std::make_unique<AudioSource_Device>(logger, m_info, format);
+}
+
+
+
+
+AudioSource_Device::AudioSource_Device(
+    Logger& logger,
+    const AudioDeviceInfo& device,
+    const AudioInputChoice& format
+){
+    if (!format){
+        throw InternalProgramError(
+            nullptr, PA_CURRENT_FUNCTION, "Invalid audio input choice."
+        );
+    }
+
+    NativeAudioInfo native_info = device.native_info();
+    QAudioFormat native_format = format.physical_format().native_format();
+
+    m_stream_format = format.format().sample_format();
+
+    m_input_device = std::make_unique<AudioInputDevice>(
+        logger,
+        native_info,
+        native_format,
+        format.is_reinterpreted()
+    );
+}
+
+void AudioSource_Device::add_raw_listener(RawAudioStreamListener& listener){
+    m_input_device->add_listener(listener);
+}
+void AudioSource_Device::remove_raw_listener(RawAudioStreamListener& listener){
+    m_input_device->remove_listener(listener);
+}
+
+size_t AudioSource_Device::raw_sample_rate() const{
+    return m_input_device->sample_rate();
+}
+size_t AudioSource_Device::raw_channels() const{
+    return m_input_device->channels();
+}
+
+float AudioSource_Device::volume_multiplier() const{
+    return (float)GlobalSettings::instance().AUDIO_PIPELINE->DEVICE_VOLUME_SCALE;
+}
+
+
+
+
+
+
+
+}
diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/Sources/AudioSource_Device.h b/SerialPrograms/Source/CommonFramework/AudioPipeline/Sources/AudioSource_Device.h
new file mode 100644
index 0000000000..9e620f144c
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/Sources/AudioSource_Device.h
@@ -0,0 +1,92 @@
+/*  Audio Source (Device)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_AudioPipeline_AudioSource_Device_H
+#define PokemonAutomation_AudioPipeline_AudioSource_Device_H
+
+#include "CommonFramework/AudioPipeline/AudioSourceDescriptor.h"
+#include "CommonFramework/AudioPipeline/AudioSource.h"
+#include "CommonFramework/AudioPipeline/Backends/AudioDeviceInfo.h"
+#include "CommonFramework/AudioPipeline/IO/AudioInputDevice.h"
+
+namespace PokemonAutomation{
+
+
+class AudioSourceDescriptor_Device : public AudioSourceDescriptor{
+public:
+    AudioSourceDescriptor_Device()
+        : AudioSourceDescriptor(AudioSourceType::Device)
+    {}
+    AudioSourceDescriptor_Device(const std::string& device_name)
+        : AudioSourceDescriptor(AudioSourceType::Device)
+        , m_info(std::move(device_name))
+    {}
+    AudioSourceDescriptor_Device(AudioDeviceInfo info)
+        : AudioSourceDescriptor(AudioSourceType::Device)
+        , m_info(std::move(info))
+    {}
+
+
+public:
+    const AudioDeviceInfo& device_info() const{
+        return m_info;
+    }
+
+    virtual bool operator==(const AudioSourceDescriptor& x) const override;
+    virtual std::string display_name() const override;
+
+    virtual std::vector<AudioInputChoice> supported_formats() const override;
+    virtual bool sanitize_desired_format(Logger& logger, AudioInputChoice& format) const override;
+
+    virtual JsonValue to_json() const override;
+    virtual void load_json(const JsonValue& json) override;
+
+    virtual std::unique_ptr<AudioSource> make_AudioSource(
+        Logger& logger,
+        const AudioInputChoice& format
+    ) const override;
+
+
+private:
+    AudioDeviceInfo m_info;
+};
+
+
+
+
+class AudioSource_Device : public AudioSource{
+public:
+    AudioSource_Device(
+        Logger& logger,
+        const AudioDeviceInfo& device,
+        const AudioInputChoice& format
+    );
+
+    virtual void add_raw_listener(RawAudioStreamListener& listener) override;
+    virtual void remove_raw_listener(RawAudioStreamListener& listener) override;
+
+
+public:
+    virtual AudioSampleFormat raw_sample_format() const override{
+        return m_stream_format;
+    }
+    virtual size_t raw_sample_rate() const override;
+    virtual size_t raw_channels() const override;
+
+    virtual float volume_multiplier() const override;
+
+
+private:
+    AudioSampleFormat m_stream_format;
+    std::unique_ptr<AudioInputDevice> m_input_device;
+};
+
+
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/Sources/AudioSource_File.cpp b/SerialPrograms/Source/CommonFramework/AudioPipeline/Sources/AudioSource_File.cpp
new file mode 100644
index 0000000000..079537b293
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/Sources/AudioSource_File.cpp
@@ -0,0 +1,160 @@
+/*  Audio Source (File)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <QAudioFormat>
+#include <QFileDialog>
+#include "Common/Cpp/Json/JsonValue.h"
+#include "Common/Qt/StringToolsQt.h"
+#include "CommonFramework/GlobalSettingsPanel.h"
+#include "CommonFramework/AudioPipeline/AudioInputChoice.h"
+#include "CommonFramework/AudioPipeline/AudioPipelineOptions.h"
+#include "CommonFramework/AudioPipeline/Tools/AudioFormatUtils.h"
+#include "AudioSource_File.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+
+
+
+
+std::string AudioSourceDescriptor_File::path() const{
+    ReadSpinLock lg(m_lock, PA_CURRENT_FUNCTION);
+    return m_path;
+}
+void AudioSourceDescriptor_File::set_path(std::string path){
+    WriteSpinLock lg(m_lock, PA_CURRENT_FUNCTION);
+    m_path = std::move(path);
+}
+
+bool AudioSourceDescriptor_File::operator==(const AudioSourceDescriptor& x) const{
+    if (typeid(*this) != typeid(x)){
+        return false;
+    }
+
+    std::string other_path = static_cast<const AudioSourceDescriptor_File&>(x).m_path;
+
+    ReadSpinLock lg(m_lock, PA_CURRENT_FUNCTION);
+//    cout << m_path << " == " << other_path << endl;
+    return m_path == other_path;
+}
+std::string AudioSourceDescriptor_File::display_name() const{
+    return "Play Audio File";
+}
+
+std::vector<AudioInputChoice> AudioSourceDescriptor_File::supported_formats() const{
+    return {};
+}
+bool AudioSourceDescriptor_File::sanitize_desired_format(Logger& logger, AudioInputChoice& format) const{
+    format = AudioInputChoice();
+    return true;
+}
+
+void AudioSourceDescriptor_File::run_post_select(){
+//    if (!m_path.empty()){
+//        return;
+//    }
+    std::string path = QFileDialog::getOpenFileName(
+        nullptr, "Open audio file", ".", "*.wav *.mp3"
+    ).toStdString();
+    set_path(std::move(path));
+}
+JsonValue AudioSourceDescriptor_File::to_json() const{
+    ReadSpinLock lg(m_lock, PA_CURRENT_FUNCTION);
+    return m_path;
+}
+void AudioSourceDescriptor_File::load_json(const JsonValue& json){
+//    cout << "load_json: " << m_path << endl;
+    const std::string* name = json.to_string();
+    if (name != nullptr){
+        WriteSpinLock lg(m_lock, PA_CURRENT_FUNCTION);
+        m_path = *name;
+    }
+}
+
+std::unique_ptr<AudioSource> AudioSourceDescriptor_File::make_AudioSource(
+    Logger& logger,
+    const AudioInputChoice& format
+) const{
+//    cout << "make_AudioSource: " << m_path << endl;
+    if (m_path.empty()){
+        //  E.g. the user cancelled the file dialog: no source.
+        return nullptr;
+    }
+    return std::make_unique<AudioSource_File>(logger, m_path);
+}
+
+
+
+
+AudioSource_File::AudioSource_File(
+    Logger& logger,
+    const std::string& file
+){
+    QAudioFormat native_format;
+    if (has_extension(file, "wav") && probe_wav_native_format(file, native_format)){
+        //  Native WAV: the stream is the file's own format (rate, channels,
+        //  sample type). The tree's decoder / resampler / mixer convert it to
+        //  the sink's format; no 96k reinterpretation for files.
+        m_stream_format = sample_format_of(native_format);
+    }else{
+        //  Compressed formats: probe the decoder's native output format
+        //  and stream the file at its own rate / channels / sample type,
+        //  like the native WAV path (the tree's decoder / resampler /
+        //  mixer convert it to the sink's format). If the probe fails
+        //  (no decode backend, unreadable file), fall back to the legacy
+        //  48k stereo float target; the loader logs the decode failure as
+        //  before. An unreadable .wav falls through here too.
+        if (probe_decoded_native_format(file, native_format)){
+            m_stream_format = sample_format_of(native_format);
+        }else{
+            //  The channel count must be set before the channel config:
+            //  QAudioFormat::setChannelCount() resets the config.
+            native_format.setChannelCount(2);
+            native_format.setChannelConfig(QAudioFormat::ChannelConfig::ChannelConfigStereo);
+            native_format.setSampleRate(48000);
+            set_sample_format_to_float(native_format);
+            m_stream_format = AudioSampleFormat::FLOAT32;
+        }
+    }
+    m_input_file = std::make_unique<AudioInputFile>(logger, file, native_format);
+}
+
+void AudioSource_File::add_raw_listener(RawAudioStreamListener& listener){
+    m_input_file->add_listener(listener);
+}
+void AudioSource_File::remove_raw_listener(RawAudioStreamListener& listener){
+    m_input_file->remove_listener(listener);
+}
+
+size_t AudioSource_File::raw_sample_rate() const{
+    return m_input_file->sample_rate();
+}
+size_t AudioSource_File::raw_channels() const{
+    return m_input_file->channels();
+}
+
+float AudioSource_File::volume_multiplier() const{
+    return (float)GlobalSettings::instance().AUDIO_PIPELINE->FILE_VOLUME_SCALE;
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}
diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/Sources/AudioSource_File.h b/SerialPrograms/Source/CommonFramework/AudioPipeline/Sources/AudioSource_File.h
new file mode 100644
index 0000000000..7dfa773526
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/Sources/AudioSource_File.h
@@ -0,0 +1,96 @@
+/*  Audio Source (File)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_AudioPipeline_AudioSource_File_H
+#define PokemonAutomation_AudioPipeline_AudioSource_File_H
+
+#include "Common/Cpp/Concurrency/SpinLock.h"
+#include "CommonFramework/AudioPipeline/AudioSourceDescriptor.h"
+#include "CommonFramework/AudioPipeline/AudioSource.h"
+#include "CommonFramework/AudioPipeline/IO/AudioInputFile.h"
+
+namespace PokemonAutomation{
+
+
+class AudioSourceDescriptor_File : public AudioSourceDescriptor{
+public:
+    AudioSourceDescriptor_File()
+        : AudioSourceDescriptor(AudioSourceType::File)
+    {}
+    AudioSourceDescriptor_File(std::string path)
+        : AudioSourceDescriptor(AudioSourceType::File)
+        , m_path(std::move(path))
+    {}
+
+
+public:
+    // get the image source path
+    std::string path() const;
+    // set the image source path
+    void set_path(std::string path);
+
+    virtual bool should_reload() const override{ return true; }
+    virtual bool operator==(const AudioSourceDescriptor& x) const override;
+    virtual std::string display_name() const override;
+
+    virtual std::vector<AudioInputChoice> supported_formats() const override;
+    virtual bool sanitize_desired_format(Logger& logger, AudioInputChoice& format) const override;
+
+
+public:
+    virtual void run_post_select() override;
+
+    virtual JsonValue to_json() const override;
+    virtual void load_json(const JsonValue& json) override;
+
+    virtual std::unique_ptr<AudioSource> make_AudioSource(
+        Logger& logger,
+        const AudioInputChoice& format
+    ) const override;
+
+
+private:
+    mutable SpinLock m_lock;
+    std::string m_path;
+};
+
+
+
+
+class AudioSource_File : public AudioSource{
+public:
+    AudioSource_File(
+        Logger& logger,
+        const std::string& file
+    );
+
+    virtual void add_raw_listener(RawAudioStreamListener& listener) override;
+    virtual void remove_raw_listener(RawAudioStreamListener& listener) override;
+
+
+public:
+    virtual AudioSampleFormat raw_sample_format() const override{
+        return m_stream_format;
+    }
+    virtual size_t raw_sample_rate() const override;
+    virtual size_t raw_channels() const override;
+
+    virtual float volume_multiplier() const override;
+
+
+private:
+    AudioSampleFormat m_stream_format;
+    std::unique_ptr<AudioInputFile> m_input_file;
+};
+
+
+
+
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/Sources/AudioSource_Null.cpp b/SerialPrograms/Source/CommonFramework/AudioPipeline/Sources/AudioSource_Null.cpp
new file mode 100644
index 0000000000..abba212659
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/Sources/AudioSource_Null.cpp
@@ -0,0 +1,50 @@
+/*  Audio Source (Null)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Json/JsonValue.h"
+#include "CommonFramework/AudioPipeline/AudioInputChoice.h"
+#include "AudioSource_Null.h"
+
+namespace PokemonAutomation{
+
+
+bool AudioSourceDescriptor_Null::operator==(const AudioSourceDescriptor& x) const{
+    return typeid(*this) == typeid(x);
+}
+std::string AudioSourceDescriptor_Null::display_name() const{
+    return "(none)";
+}
+
+
+std::vector<AudioInputChoice> AudioSourceDescriptor_Null::supported_formats() const{
+    return {};
+}
+bool AudioSourceDescriptor_Null::sanitize_desired_format(Logger& logger, AudioInputChoice& format) const{
+    format = AudioInputChoice();
+    return true;
+}
+
+JsonValue AudioSourceDescriptor_Null::to_json() const{
+    return JsonValue();
+}
+void AudioSourceDescriptor_Null::load_json(const JsonValue& json){
+
+}
+
+std::unique_ptr<AudioSource> AudioSourceDescriptor_Null::make_AudioSource(
+    Logger& logger,
+    const AudioInputChoice& format
+) const{
+    return nullptr;
+}
+
+
+
+
+
+
+
+}
diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/Sources/AudioSource_Null.h b/SerialPrograms/Source/CommonFramework/AudioPipeline/Sources/AudioSource_Null.h
new file mode 100644
index 0000000000..6dda87368c
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/Sources/AudioSource_Null.h
@@ -0,0 +1,44 @@
+/*  Audio Source (Null)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_AudioPipeline_AudioSource_Null_H
+#define PokemonAutomation_AudioPipeline_AudioSource_Null_H
+
+#include "CommonFramework/AudioPipeline/AudioSourceDescriptor.h"
+#include "CommonFramework/AudioPipeline/AudioSource.h"
+
+namespace PokemonAutomation{
+
+
+class AudioSourceDescriptor_Null : public AudioSourceDescriptor{
+public:
+    AudioSourceDescriptor_Null()
+        : AudioSourceDescriptor(AudioSourceType::None)
+    {}
+
+    virtual bool operator==(const AudioSourceDescriptor& x) const override;
+    virtual std::string display_name() const override;
+
+    virtual std::vector<AudioInputChoice> supported_formats() const override;
+    virtual bool sanitize_desired_format(Logger& logger, AudioInputChoice& format) const override;
+
+    virtual JsonValue to_json() const override;
+    virtual void load_json(const JsonValue& json) override;
+
+    virtual std::unique_ptr<AudioSource> make_AudioSource(
+        Logger& logger,
+        const AudioInputChoice& format
+    ) const override;
+};
+
+
+
+
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/Spectrum/AudioSpectrumHolder.cpp b/SerialPrograms/Source/CommonFramework/AudioPipeline/Spectrum/AudioSpectrumHolder.cpp
index a5f525945f..49048f5dfc 100644
--- a/SerialPrograms/Source/CommonFramework/AudioPipeline/Spectrum/AudioSpectrumHolder.cpp
+++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/Spectrum/AudioSpectrumHolder.cpp
@@ -1,258 +1,278 @@
 /*  Audio Display State
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include <string.h>
 #include <cmath>
-#include <cassert>
+#include <algorithm>
+#include <iostream>
+#include "CommonFramework/GlobalSettingsPanel.h"
 #include "CommonFramework/AudioPipeline/AudioConstants.h"
+#include "CommonFramework/AudioPipeline/AudioPipelineOptions.h"
 #include "AudioSpectrumHolder.h"
 
+//using std::cout;
+//using std::endl;
+
 namespace PokemonAutomation{
 
 
 
 AudioSpectrumHolder::AudioSpectrumHolder()
-    : m_num_freqs(NUM_FFT_SAMPLES/2)
-    , m_num_freq_windows(1000)
-    , m_num_freq_visualization_blocks(96)
-    , m_freq_visualization_block_boundaries(m_num_freq_visualization_blocks+1)
-    , m_spectrograph(m_num_freq_visualization_blocks, m_num_freq_windows)
-    , m_freqVisStamps(m_num_freq_windows)
+    : m_num_freqs(NUM_FFT_SAMPLES / 4)
+    , m_num_freq_windows(48000 / FFT_SLIDING_WINDOW_STEP * 20)  //  20 seconds
+//    , m_num_freq_visualization_blocks(384)
+//    , m_freq_visualization_block_boundaries(m_num_freq_visualization_blocks + 1)
+//    , m_spectrograph(m_num_freq_visualization_blocks, m_num_freq_windows)
+    , m_freq_vis_stamps(m_num_freq_windows)
 {
-    m_last_spectrum.values.resize(m_num_freq_visualization_blocks);
-    m_last_spectrum.colors.resize(m_num_freq_visualization_blocks);
-
     // We will display frequencies in log scale, so need to convert
     // log scale: 0, 1/m_numFreqVisBlocks, 2/m_numFreqVisBlocks, ..., 1.0
     // to linear scale:
     // The conversion function is: linear_value = (exp(log_value * LOG_MAX) - 1) / 10
 //    const float LOG_SCALE_MAX = std::log(11.0f);
 
-    m_freq_visualization_block_boundaries[0] = 1;
-    for (size_t i = 1; i < m_num_freq_visualization_blocks; i++){
-//        const float logValue = i / (float)m_numFreqVisBlocks;
-//        float linearValue = (std::exp(logValue * LOG_SCALE_MAX) - 1.f) / 10.f;
-//        linearValue = std::max(std::min(linearValue, 1.0f), 0.0f);
-//        m_freq_visualization_block_boundaries[i] = std::min(size_t(linearValue * m_num_freqs + 0.5), m_num_freqs);
+    size_t blocks = 384;
+    std::vector<size_t> boundaries(blocks);
+
+    boundaries[0] = 1;
+    for (size_t i = 1; i < blocks - 1; i++){
+//        const float log_value = i / (float)m_numFreqVisBlocks;
+//        float linear_value = (std::exp(log_value * LOG_SCALE_MAX) - 1.f) / 10.f;
+//        linear_value = std::max(std::min(linear_value, 1.0f), 0.0f);
+//        boundaries[i] = std::min(size_t(linear_value * m_num_freqs + 0.5), m_num_freqs);
 
-        //  (96 / 8 = 12) give us 12 bars per octave.
-        const float x = (float)i / m_num_freq_visualization_blocks;
+        //  (384 / 8 = 48) give us 48 bars per octave.
+        const float x = (float)i / blocks;
         float freq = std::exp2f(8.0f * x + 3);
         size_t index = (size_t)freq;
 
         index = std::max(index, (size_t)1);
         index = std::min(index, m_num_freqs);
-        m_freq_visualization_block_boundaries[i] = index;
+        boundaries[i] = index;
     }
-    m_freq_visualization_block_boundaries[m_num_freq_visualization_blocks] = m_num_freqs;
+    boundaries[blocks - 1] = m_num_freqs;
 
     //  Iterate buckets in reverse order and push the lower frequencies over so that everyone has
     //  a width of at least 1.
-    size_t last = m_freq_visualization_block_boundaries[m_num_freq_visualization_blocks - 1];
-    for (size_t c = m_num_freq_visualization_blocks - 1; c-- > 0;){
-        size_t current = m_freq_visualization_block_boundaries[c];
+    size_t last = boundaries[blocks - 1];
+    for (size_t c = blocks - 1; c-- > 0;){
+        size_t current = boundaries[c];
         if (current >= last){
             current = last - 1;
             if (current == 0){
                 current = 1;
             }
-            m_freq_visualization_block_boundaries[c] = current;
+        }
+        m_freq_visualization_block_boundaries.emplace_back(current);
+        if (current == 1){
+            break;
         }
         last = current;
     }
 
-    for (size_t i = 1; i <= m_num_freq_visualization_blocks; i++){
-        assert(m_freq_visualization_block_boundaries[i-1] < m_freq_visualization_block_boundaries[i]);
-    }
-    for (size_t i = 0; i < m_num_freq_visualization_blocks; i++){
+    blocks = m_freq_visualization_block_boundaries.size();
+    std::reverse(m_freq_visualization_block_boundaries.begin(), m_freq_visualization_block_boundaries.end());
+
+
+//    for (size_t i = 1; i <= m_num_freq_visualization_blocks; i++){
+//        assert(m_freq_visualization_block_boundaries[i-1] < m_freq_visualization_block_boundaries[i]);
+//    }
+//    for (size_t i = 0; i < m_num_freq_visualization_blocks; i++){
 //        cout << "index = " << m_freq_visualization_block_boundaries[i] << endl;
-    }
+//    }
 
-    // std::cout << "Freq vis block boundaries: ";
-    // for(const auto v : m_freq_visualization_block_boundaries){
-    //     std::cout << v << " ";
-    // }
-    // std::cout << std::endl;
+//    cout << "Freq vis block boundaries: ";
+//    for (const auto v : m_freq_visualization_block_boundaries){
+//        cout << v << " ";
+//    }
+//    cout << endl;
 
-    // saveAudioFrequenciesToDisk(true);
+    // save_audio_frequencies_to_disk(true);
+
+    m_spectrograph.reset(new Spectrograph(blocks, m_num_freq_windows));
+    m_last_spectrum.timestamp = current_time();
+    m_last_spectrum.values.resize(blocks);
+    m_last_spectrum.colors.resize(blocks);
 }
 
 
 void AudioSpectrumHolder::add_listener(Listener& listener){
-    std::lock_guard<std::mutex> lg(m_state_lock);
-    m_listeners.insert(&listener);
+    m_listeners.add(listener);
 }
 void AudioSpectrumHolder::remove_listener(Listener& listener){
-    std::lock_guard<std::mutex> lg(m_state_lock);
-    m_listeners.erase(&listener);
+    m_listeners.remove(listener);
 }
 
 void AudioSpectrumHolder::clear(){
-    std::lock_guard<std::mutex> lg(m_state_lock);
+    {
+        std::lock_guard<Mutex> lg(m_state_lock);
 
-    m_freqVisStamps.assign(m_freqVisStamps.size(), SIZE_MAX);
+        m_freq_vis_stamps.assign(m_freq_vis_stamps.size(), SIZE_MAX);
 
-    {
-        // update m_spectrum_stamp_start in case the audio widget is used
-        // again to store new spectrums.
-        if (m_spectrums.size() > 0){
-            m_spectrum_stamp_start = m_spectrums.front().stamp + 1;
+        {
+            // update m_spectrum_stamp_start in case the audio widget is used
+            // again to store new spectrums.
+            if (m_spectrums.size() > 0){
+                m_spectrum_stamp_start = m_spectrums.front().stamp + 1;
+            }
+            m_spectrums.clear();
+
+            m_spectrograph->clear();
+            m_last_spectrum.timestamp = current_time();
+            memset(m_last_spectrum.values.data(), 0, m_last_spectrum.values.size() * sizeof(float));
+            memset(m_last_spectrum.colors.data(), 0, m_last_spectrum.colors.size() * sizeof(uint32_t));
         }
-        m_spectrums.clear();
 
-        m_spectrograph.clear();
-        memset(m_last_spectrum.values.data(), 0, m_last_spectrum.values.size() * sizeof(float));
-        memset(m_last_spectrum.colors.data(), 0, m_last_spectrum.colors.size() * sizeof(uint32_t));
+        m_overlay.clear();
+//        cout << "AudioSpectrumHolder::clear()" << endl;
     }
 
-    m_overlay.clear();
-
-    for (Listener* listener : m_listeners){
-        listener->state_changed();
-    }
+    m_listeners.run_method(&Listener::state_changed);
 }
 
 //void AudioSpectrumHolder::reset(){}
 
 
 // TODO: move this to a common lib folder:
-PA_FORCE_INLINE uint32_t jetColorMap(float v){
+PA_FORCE_INLINE uint32_t jet_color_map(float v){
     if (v <= 0.f){
         return combine_rgb(0,0,0);
-    }
-    else if (v < 0.125f){
+    }else if (v < 0.125f){
 //        return qRgb(0, 0, int((0.5f + 4.f * v) * 255.f));
         return combine_rgb(0, 0, uint8_t((0.0f + 8.f * v) * 255.f));
-    }
-    else if (v < 0.375f){
+    }else if (v < 0.375f){
         return combine_rgb(0, uint8_t((v - 0.125f)*1020.f), 255);
-    }
-    else if (v < 0.625f){
+    }else if (v < 0.625f){
         uint8_t c = uint8_t((v - 0.375f) * 1020.f);
         return combine_rgb(c, 255, 255-c);
-    }
-    else if (v < 0.875f){
+    }else if (v < 0.875f){
         return combine_rgb(255, 255 - uint8_t((v-0.625f) * 1020.f), 0);
-    }
-    else if (v <= 1.0){
+    }else if (v <= 1.0){
         return combine_rgb(255 - uint8_t((v-0.875)*1020.f), 0, 0);
-    }
-    else {
+    }else{
         return combine_rgb(255, 255, 255);
     }
 }
 
-void AudioSpectrumHolder::push_spectrum(size_t sample_rate, std::shared_ptr<const AlignedVector<float>> fft_output){
-    std::lock_guard<std::mutex> lg(m_state_lock);
-
-    const AlignedVector<float>& output = *fft_output;
+void AudioSpectrumHolder::push_spectrum(
+    size_t sample_rate,
+    std::shared_ptr<const AlignedVector<float>> fft_output
+){
+    WallClock timestamp = current_time();
 
     {
-        const size_t stamp = (m_spectrums.size() > 0) ? m_spectrums.front().stamp + 1 : m_spectrum_stamp_start;
-        m_spectrums.emplace_front(stamp, sample_rate, fft_output);
-        if (m_spectrums.size() > m_spectrum_history_length){
-            m_spectrums.pop_back();
-        }
+        std::lock_guard<Mutex> lg(m_state_lock);
 
-        // std::cout << "Load FFT output , stamp " << spectrum->stamp << std::endl;
-        m_freqVisStamps[m_nextFFTWindowIndex] = stamp;
-    }
+        const AlignedVector<float>& output = *fft_output;
+
+        {
+            const size_t stamp = m_spectrums.size() > 0
+                ? m_spectrums.front().stamp + 1
+                : m_spectrum_stamp_start;
+            m_spectrums.emplace_front(stamp, sample_rate, fft_output);
+            if (m_spectrums.size() > m_spectrum_history_length){
+                m_spectrums.pop_back();
+            }
 
-    //  Scale the by the square root of the transform length.
-    //  For random noise input, the frequency domain will have an average
-    //  magnitude of sqrt(transform length).
-    float scale = std::sqrt(0.5f / (float)output.size());
-
-//    //  Divide by output size. Since samples can never be larger than 1.0, the
-//    //  frequency domain can never be larger than the FFT length. So we scale by
-//    //  the FFT length to guarantee that it also stays less than 1.0.
-//    float scale = 0.5f / (float)output.size();
-
-//    float skew_factor = 999.;
-//    float skew_scale = 1.f / (float)std::log1pf(skew_factor);
-
-    // For one window, use how many blocks to show all frequencies:
-    float previous = 0;
-    for (size_t i = 0; i < m_num_freq_visualization_blocks; i++){
-        float mag = 0.0f;
-        for(size_t j = m_freq_visualization_block_boundaries[i]; j < m_freq_visualization_block_boundaries[i+1]; j++){
-            mag += output[j];
+            // std::cout << "Load FFT output , stamp " << spectrum->stamp << std::endl;
+            m_freq_vis_stamps[m_next_fft_window_index] = stamp;
         }
 
-        size_t width = m_freq_visualization_block_boundaries[i+1] - m_freq_visualization_block_boundaries[i];
+        //  Scale the by the square root of the transform length.
+        //  For random noise input, the frequency domain will have an average
+        //  magnitude of sqrt(transform length).
+        float scale = std::sqrt(0.5f / (float)output.size());
 
-        if (width == 0){
-            mag = previous;
-        }else{
-            mag /= width;
-            mag *= scale;
-
-            mag = std::sqrt(mag);
-//            mag = std::log1pf(mag * skew_factor) * skew_scale;
-//            mag = std::log1pf(std::sqrtf(mag)) * std::log1pf(1);
-//            mag = std::sqrt(2*mag - mag*mag);
-//            float m1 = 1 - mag;
-//            mag = std::sqrtf(1 - m1*m1);
-
-            // Clamp to [0.0, 1.0]
-            mag = std::min(mag, 1.0f);
-            mag = std::max(mag, 0.0f);
-        }
+        bool log_scale = GlobalSettings::instance().AUDIO_PIPELINE->USE_KAISER_WINDOW;
 
-        m_last_spectrum.values[i] = mag;
-        m_last_spectrum.colors[i] = jetColorMap(mag);
-        previous = mag;
-    }
-    m_spectrograph.push_spectrum(m_last_spectrum.colors.data());
-    m_nextFFTWindowIndex = (m_nextFFTWindowIndex+1) % m_num_freq_windows;
-    // std::cout << "Computed FFT! "  << magSum << std::endl;
+        //  For one window, use how many blocks to show all frequencies:
+        float previous = 0;
+        m_last_spectrum.timestamp = timestamp;
+        for (size_t i = 0; i < m_freq_visualization_block_boundaries.size() - 1; i++){
+            size_t block_start = m_freq_visualization_block_boundaries[i];
+            size_t block_end = m_freq_visualization_block_boundaries[i + 1];
 
-    if (m_saveFreqToDisk){
-        for(size_t i = 0; i < m_num_freqs; i++){
-            m_freqStream << output[i] << " ";
-        }
-        m_freqStream << std::endl;
-    }
+            float mag = previous;
 
-    for (Listener* listener : m_listeners){
-        listener->state_changed();
-    }
-}
-void AudioSpectrumHolder::add_overlay(uint64_t starting_stamp, uint64_t end_stamp, Color color){
-    std::lock_guard<std::mutex> lg(m_state_lock);
+            size_t width = block_end - block_start;
+            if (width != 0){
+                for (size_t j = block_start; j < block_end; j++){
+                    mag += output[j];
+                }
 
-    m_overlay.emplace_front(std::forward_as_tuple(starting_stamp, end_stamp, color));
+                mag /= width;
+                mag *= scale;
 
-    // Now try to remove old overlays that are no longer showed on the spectrogram view.
+                if (log_scale){
+                    mag = std::log1pf(mag * 32) * 0.25;
+                }else{
+                    mag = std::sqrt(mag);
+                }
 
-    // get the timestamp of the oldest window in the display history.
-    uint64_t oldestStamp = m_freqVisStamps[m_nextFFTWindowIndex];
-    // SIZE_MAX means this slot is not yet assigned an FFT window
-    if (oldestStamp != SIZE_MAX){
-        // Note: in this file we never consider the case that stamp may overflow.
-        // It requires on the order of 1e10 years to overflow if we have about 25ms per stamp.
-        while(!m_overlay.empty() && std::get<1>(m_overlay.back()) <= oldestStamp){
-            m_overlay.pop_back();
+                // Clamp to [0.0, 1.0]
+                mag = std::min(mag, 1.0f);
+                mag = std::max(mag, 0.0f);
+            }
+
+            //  Exponential decay to reduce jitter.
+            mag = mag * VISUAL_JITTER_DECAY + (1 - VISUAL_JITTER_DECAY) * m_last_spectrum.values[i];
+
+            m_last_spectrum.values[i] = mag;
+            m_last_spectrum.colors[i] = jet_color_map(mag);
+            previous = mag;
+        }
+//        cout << "AudioSpectrumHolder::push_spectrum" << endl;
+        m_spectrograph->push_spectrum(m_last_spectrum.colors.data());
+        m_next_fft_window_index = (m_next_fft_window_index+1) % m_num_freq_windows;
+//        std::cout << "Computed FFT! "  << mag_sum << std::endl;
+
+        if (m_save_freq_to_disk){
+            for (size_t i = 0; i < m_num_freqs; i++){
+                m_freq_stream << output[i] << " ";
+            }
+            m_freq_stream << std::endl;
         }
     }
+    m_listeners.run_method(&Listener::state_changed);
+}
+void AudioSpectrumHolder::add_overlay(
+    uint64_t starting_stamp,
+    uint64_t end_stamp,
+    Color color
+){
+    {
+        std::lock_guard<Mutex> lg(m_state_lock);
 
-    for (Listener* listener : m_listeners){
-        listener->state_changed();
+        m_overlay.emplace_front(std::forward_as_tuple(starting_stamp, end_stamp, color));
+
+        // Now try to remove old overlays that are no longer showed on the spectrogram view.
+
+        // get the timestamp of the oldest window in the display history.
+        uint64_t oldest_stamp = m_freq_vis_stamps[m_next_fft_window_index];
+        // SIZE_MAX means this slot is not yet assigned an FFT window
+        if (oldest_stamp != SIZE_MAX){
+            // Note: in this file we never consider the case that stamp may overflow.
+            // It requires on the order of 1e10 years to overflow if we have about 25ms per stamp.
+            while(!m_overlay.empty() && std::get<1>(m_overlay.back()) <= oldest_stamp){
+                m_overlay.pop_back();
+            }
+        }
     }
+    m_listeners.run_method(&Listener::state_changed);
 }
 
 std::vector<AudioSpectrum> AudioSpectrumHolder::spectrums_since(uint64_t starting_stamp){
     std::vector<AudioSpectrum> spectrums;
 
-    std::lock_guard<std::mutex> lg(m_state_lock);
+    std::lock_guard<Mutex> lg(m_state_lock);
 
     for (const auto& ptr : m_spectrums){
         if (ptr.stamp >= starting_stamp){
             spectrums.emplace_back(ptr);
-        } else{
+        }else{
             break;
         }
     }
@@ -261,7 +281,7 @@ std::vector<AudioSpectrum> AudioSpectrumHolder::spectrums_since(uint64_t startin
 std::vector<AudioSpectrum> AudioSpectrumHolder::spectrums_latest(size_t num_latest_spectrums){
     std::vector<AudioSpectrum> spectrums;
 
-    std::lock_guard<std::mutex> lg(m_state_lock);
+    std::lock_guard<Mutex> lg(m_state_lock);
 
     size_t i = 0;
     for (const auto& ptr : m_spectrums){
@@ -274,37 +294,37 @@ std::vector<AudioSpectrum> AudioSpectrumHolder::spectrums_latest(size_t num_late
     return spectrums;
 }
 AudioSpectrumHolder::SpectrumSnapshot AudioSpectrumHolder::get_last_spectrum() const{
-    std::lock_guard<std::mutex> lg(m_state_lock);
+    std::lock_guard<Mutex> lg(m_state_lock);
     return m_last_spectrum;
 }
 AudioSpectrumHolder::SpectrographSnapshot AudioSpectrumHolder::get_spectrograph() const{
-    std::lock_guard<std::mutex> lg(m_state_lock);
+    std::lock_guard<Mutex> lg(m_state_lock);
 
     SpectrographSnapshot ret;
-    ret.image = m_spectrograph.to_image();
+    ret.image = m_spectrograph->to_image();
 
     //  Calculate overplay coordinates.
 
     //  The oldest window on the spectrogram view has the oldest timestamp,
     //  and its position is left most on the spectrogram, assigning a window ID of 0.
-    size_t oldestStamp = m_freqVisStamps[m_nextFFTWindowIndex];
-    size_t oldestWindowID = 0;
+    size_t oldest_stamp = m_freq_vis_stamps[m_next_fft_window_index];
+    size_t oldest_window_id = 0;
     //  When the audio stream starts coming in, the history of the spectrogram
     //  is not fully filled. So the oldest stamp may not be the leftmost one on the display.
     //  Here we use the validity of the time stamp to find the real oldest one.
-    for (; oldestWindowID < m_num_freq_windows; oldestWindowID++){
-        if (oldestStamp != SIZE_MAX){
+    for (; oldest_window_id < m_num_freq_windows; oldest_window_id++){
+        if (oldest_stamp != SIZE_MAX){
             // it's a window with valid stamp
             break;
         }
-        oldestStamp = m_freqVisStamps[(m_nextFFTWindowIndex+oldestWindowID) % m_num_freq_windows];
+        oldest_stamp = m_freq_vis_stamps[(m_next_fft_window_index+oldest_window_id) % m_num_freq_windows];
     }
-    if (oldestStamp == SIZE_MAX){
+    if (oldest_stamp == SIZE_MAX){
         // we have no valid windows in the spectrogram, so no overlays to render:
         return ret;
     }
-    size_t newestStamp = m_freqVisStamps[(m_nextFFTWindowIndex + m_num_freq_windows - 1) % m_num_freq_windows];
-    // size_t newestWindowID = m_num_freq_windows - 1;
+    size_t newest_stamp = m_freq_vis_stamps[(m_next_fft_window_index + m_num_freq_windows - 1) % m_num_freq_windows];
+    // size_t newest_window_id = m_num_freq_windows - 1;
 
     for (const auto& box : m_overlay){
         const size_t starting_stamp = std::get<0>(box);
@@ -315,14 +335,14 @@ AudioSpectrumHolder::SpectrographSnapshot AudioSpectrumHolder::get_spectrograph(
         }
 
         // std::cout << "Render overlay at (" << starting_stamp << ", " << end_stamp
-        //     << ") oldestStamp " << oldestStamp << " wID " << oldestWindowID << " newest stamp " << newestStamp << std::endl;
+        //     << ") oldest_stamp " << oldest_stamp << " w_id " << oldest_window_id << " newest stamp " << newest_stamp << std::endl;
 
-        if (end_stamp <= oldestStamp || starting_stamp > newestStamp){
+        if (end_stamp <= oldest_stamp || starting_stamp > newest_stamp){
             continue;
         }
 
         ret.overlays.emplace_back(
-            starting_stamp - oldestStamp + oldestWindowID,
+            starting_stamp - oldest_stamp + oldest_window_id,
             end_stamp - starting_stamp,
             color
         );
@@ -331,16 +351,16 @@ AudioSpectrumHolder::SpectrographSnapshot AudioSpectrumHolder::get_spectrograph(
 }
 
 
-void AudioSpectrumHolder::saveAudioFrequenciesToDisk(bool enable){
-    std::lock_guard<std::mutex> lg(m_state_lock);
+void AudioSpectrumHolder::save_audio_frequencies_to_disk(bool enable){
+    std::lock_guard<Mutex> lg(m_state_lock);
     if (enable){
-        if (m_saveFreqToDisk == false){
-            m_saveFreqToDisk = enable;
-            m_freqStream.open("./frequencies.txt");
+        if (m_save_freq_to_disk == false){
+            m_save_freq_to_disk = enable;
+            m_freq_stream.open("./frequencies.txt");
         }
-    }else if (m_saveFreqToDisk){
-        m_saveFreqToDisk = enable;
-        m_freqStream.close();
+    }else if (m_save_freq_to_disk){
+        m_save_freq_to_disk = enable;
+        m_freq_stream.close();
     }
 }
 
diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/Spectrum/AudioSpectrumHolder.h b/SerialPrograms/Source/CommonFramework/AudioPipeline/Spectrum/AudioSpectrumHolder.h
index 616b15ff59..25a9927ef0 100644
--- a/SerialPrograms/Source/CommonFramework/AudioPipeline/Spectrum/AudioSpectrumHolder.h
+++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/Spectrum/AudioSpectrumHolder.h
@@ -1,16 +1,18 @@
 /*  Audio Spectrum Holder
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifndef PokemonAutomation_AudioPipeline_AudioSpectrumHolder_H
 #define PokemonAutomation_AudioPipeline_AudioSpectrumHolder_H
 
-#include <list>
-#include <set>
-#include <mutex>
+#include <deque>
 #include <fstream>
+#include <list>
+#include "Common/Cpp/Time.h"
+#include "Common/Cpp/ListenerSet.h"
+#include "Common/Cpp/Concurrency/Mutex.h"
 #include "CommonFramework/ImageTypes/ImageRGB32.h"
 #include "CommonFramework/AudioPipeline/AudioFeed.h"
 #include "Spectrograph.h"
@@ -36,8 +38,15 @@ class AudioSpectrumHolder{
 
 
 public:
-    void push_spectrum(size_t sample_rate, std::shared_ptr<const AlignedVector<float>> fft_output);
-    void add_overlay(uint64_t starting_stamp, uint64_t end_stamp, Color color);
+    void push_spectrum(
+        size_t sample_rate,
+        std::shared_ptr<const AlignedVector<float>> fft_output
+    );
+    void add_overlay(
+        uint64_t starting_stamp,
+        uint64_t end_stamp,
+        Color color
+    );
 
 
 public:
@@ -47,6 +56,7 @@ class AudioSpectrumHolder{
     std::vector<AudioSpectrum> spectrums_latest(size_t num_latest_spectrums);
 
     struct SpectrumSnapshot{
+        WallClock timestamp;
         std::vector<float> values;
         std::vector<uint32_t> colors;
     };
@@ -62,7 +72,11 @@ class AudioSpectrumHolder{
 public:
     // Development usage: save the FFT results to disk so that it can be examined
     // and edited to be used as samples for future audio matching.
-    void saveAudioFrequenciesToDisk(bool enable);
+    void save_audio_frequencies_to_disk(bool enable);
+
+
+private:
+
 
 
 private:
@@ -71,7 +85,7 @@ class AudioSpectrumHolder{
     // Num sliding fft windows to visualize.
     const size_t m_num_freq_windows;
     // Num blocks of frequencies to visualize for one sliding window.
-    const size_t m_num_freq_visualization_blocks;
+//    const size_t m_num_freq_visualization_blocks;
 
     // The boundaries to separate each frequency vis block.
     // i-th freq vis block is made by frequencies whose indices in m_spectrums
@@ -79,25 +93,25 @@ class AudioSpectrumHolder{
     std::vector<size_t> m_freq_visualization_block_boundaries;
 
     SpectrumSnapshot m_last_spectrum;
-    Spectrograph m_spectrograph;
+    std::unique_ptr<Spectrograph> m_spectrograph;
 
     // The timestamp of each window that's been visualized.
-    std::vector<uint64_t> m_freqVisStamps;
-    // The index of the next window in m_freqVisBlocks.
-    size_t m_nextFFTWindowIndex = 0;
+    std::vector<uint64_t> m_freq_vis_stamps;
+    // The index of the next window in m_freq_vis_blocks.
+    size_t m_next_fft_window_index = 0;
 
     // record the past FFT output frequencies to serve as the interface
     // of audio inference for automation programs.
     // The head of the list is the most recent FFT window, while the tail
     // is the oldest in history.
-    std::list<AudioSpectrum> m_spectrums;
+    std::deque<AudioSpectrum> m_spectrums;
     size_t m_spectrum_history_length = 40;
     // The initial timestamp for the incoming spectrums.
     size_t m_spectrum_stamp_start = 0;
 
     // Develop purpose: used to save received frequencies to disk
-    bool m_saveFreqToDisk = false;
-    std::ofstream m_freqStream;
+    bool m_save_freq_to_disk = false;
+    std::ofstream m_freq_stream;
 
     // The inference boxes <box starting stamp, box end stamp, box color>
     // to highlight FFT windows on spectrogram. Used to tell user which part
@@ -105,8 +119,8 @@ class AudioSpectrumHolder{
     // The head of the list is the most recent overlay added.
     std::list<std::tuple<size_t, size_t, Color>> m_overlay;
 
-    mutable std::mutex m_state_lock;
-    std::set<Listener*> m_listeners;
+    mutable Mutex m_state_lock;
+    ListenerSet<Listener> m_listeners;
 };
 
 
diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/Spectrum/FFTStreamer.cpp b/SerialPrograms/Source/CommonFramework/AudioPipeline/Spectrum/FFTStreamer.cpp
index 5059e00094..ae6f5e3cdb 100644
--- a/SerialPrograms/Source/CommonFramework/AudioPipeline/Spectrum/FFTStreamer.cpp
+++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/Spectrum/FFTStreamer.cpp
@@ -1,12 +1,13 @@
 /*  FFT Streamer
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
-
-#include "Common/Cpp/Exceptions.h"
 #include "Common/Cpp/Containers/AlignedVector.tpp"
+#include "Kernels/KaiserWindow/Kernels_KaiserWindow.h"
 #include "Kernels/AbsFFT/Kernels_AbsFFT.h"
+#include "CommonFramework/GlobalSettingsPanel.h"
+#include "CommonFramework/AudioPipeline/AudioPipelineOptions.h"
 #include "CommonFramework/AudioPipeline/AudioConstants.h"
 #include "FFTStreamer.h"
 
@@ -14,92 +15,52 @@ namespace PokemonAutomation{
 
 
 
-std::unique_ptr<AudioFloatToFFT> make_FFT_streamer(AudioChannelFormat format){
-    switch (format){
-    case AudioChannelFormat::MONO_48000:
-        return std::make_unique<AudioFloatToFFT>(48000, 1, false);
-    case AudioChannelFormat::DUAL_44100:
-        return std::make_unique<AudioFloatToFFT>(44100, 2, true);
-    case AudioChannelFormat::DUAL_48000:
-    //  Treat mono-96000 as 2-sample frames.
-    //  The FFT will then average each pair to produce 48000Hz.
-    //  The output will push the same stream at the original 4 bytes * 96000Hz.
-    case AudioChannelFormat::MONO_96000:
-    case AudioChannelFormat::INTERLEAVE_LR_96000:
-    case AudioChannelFormat::INTERLEAVE_RL_96000:
-        return std::make_unique<AudioFloatToFFT>(48000, 2, true);
-    default:
-        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Invalid AudioFormat: " + std::to_string((size_t)format));
-    }
+void WorkingAudioToFFT::add_listener(FFTListener& listener){
+    m_listeners.add(listener);
 }
-
-
-
-void AudioFloatToFFT::add_listener(FFTListener& listener){
-    m_listeners.insert(&listener);
-}
-void AudioFloatToFFT::remove_listener(FFTListener& listener){
-    m_listeners.erase(&listener);
+void WorkingAudioToFFT::remove_listener(FFTListener& listener){
+    m_listeners.remove(listener);
 }
 
-AudioFloatToFFT::AudioFloatToFFT(
-    size_t sample_rate,
-    size_t samples_per_frame, bool average_pairs
-)
-    : AudioFloatStreamListener(samples_per_frame)
+WorkingAudioToFFT::WorkingAudioToFFT(size_t sample_rate)
+    : WorkingAudioStreamListener(sample_rate, 1)
     , m_sample_rate(sample_rate)
-    , m_average(average_pairs)
-    , m_fft_sample_size(average_pairs ? 2 : 1)
     , m_buffer(NUM_FFT_SAMPLES)
     , m_buffered(NUM_FFT_SAMPLES)
     , m_fft_input(NUM_FFT_SAMPLES)
 {
-    if (samples_per_frame == 0 || samples_per_frame > 2){
-        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Channels must be 1 or 2.");
-    }
     memset(m_buffer.data(), 0, m_buffer.size() * sizeof(float));
 }
-AudioFloatToFFT::~AudioFloatToFFT(){}
-void AudioFloatToFFT::on_samples(const float* data, size_t frames){
-//    cout << "objects = " << objects << endl;
+WorkingAudioToFFT::~WorkingAudioToFFT(){}
+void WorkingAudioToFFT::push_samples(size_t samples, size_t stride, const float* data){
+    //  The tree delivers a single-channel working stream; channel 0 is
+    //  contiguous regardless of stride (which may be 0 on the
+    //  zero-copy single-channel float path).
     const float* ptr = data;
-    while (frames > 0){
+    while (samples > 0){
         //  Figure out how much space we can write contiguously.
         size_t block = m_buffer.size() - std::max(m_buffered, m_end);
 
         //  Don't write more than we have.
-        block = std::min(block, frames);
+        block = std::min(block, samples);
 
-//        cout << "block = " << block << endl;
-
-        //  Write it.
-        convert(&m_buffer[m_end], ptr, block);
+        memcpy(&m_buffer[m_end], ptr, block * sizeof(float));
         m_buffered += block;
         m_end += block;
         if (m_end == m_buffer.size()){
             m_end = 0;
         }
-        ptr += block * m_fft_sample_size;
-        frames -= block;
+        ptr += block;
+        samples -= block;
 
         //  Buffer is full. Time to run FFT!
         if (m_buffered == m_buffer.size()){
-//            cout << "run_fft()" << endl;
             run_fft();
             drop_from_front(FFT_SLIDING_WINDOW_STEP);
         }
     }
 }
-void AudioFloatToFFT::convert(float* fft_input, const float* audio_stream, size_t frames){
-    if (!m_average){
-        memcpy(fft_input, audio_stream, frames * sizeof(float));
-        return;
-    }
-    for (size_t c = 0; c < frames; c++){
-        fft_input[c] = (audio_stream[2*c + 0] + audio_stream[2*c + 1]) * 0.5f;
-    }
-}
-void AudioFloatToFFT::run_fft(){
+void WorkingAudioToFFT::run_fft(){
     float* ptr = m_fft_input.data();
     size_t remaining = NUM_FFT_SAMPLES;
     size_t index = m_start;
@@ -114,12 +75,20 @@ void AudioFloatToFFT::run_fft(){
         }
     }
     std::shared_ptr<AlignedVector<float>> out = std::make_unique<AlignedVector<float>>(NUM_FFT_SAMPLES / 2);
-    Kernels::AbsFFT::fft_abs(FFT_LENGTH_POWER_OF_TWO, out->data(), m_fft_input.data());
-    for (FFTListener* listener : m_listeners){
-        listener->on_fft(m_sample_rate, out);
-    }
+    Kernels::AbsFFT::fft_abs(
+        FFT_LENGTH_POWER_OF_TWO,
+        out->data(),
+        m_fft_input.data(),
+        GlobalSettings::instance().AUDIO_PIPELINE->USE_KAISER_WINDOW
+            ? Kernels::KaiserWindow::get_kaiser_window_k(FFT_LENGTH_POWER_OF_TWO)
+            : nullptr
+    );
+    m_listeners.run_method(
+        &FFTListener::on_fft,
+        m_sample_rate, out
+    );
 }
-void AudioFloatToFFT::drop_from_front(size_t frames){
+void WorkingAudioToFFT::drop_from_front(size_t frames){
     if (frames >= m_buffered){
         m_buffered = 0;
         m_start = 0;
diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/Spectrum/FFTStreamer.h b/SerialPrograms/Source/CommonFramework/AudioPipeline/Spectrum/FFTStreamer.h
index 3e91f7a8de..ef28d4fab7 100644
--- a/SerialPrograms/Source/CommonFramework/AudioPipeline/Spectrum/FFTStreamer.h
+++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/Spectrum/FFTStreamer.h
@@ -1,48 +1,51 @@
 /*  FFT Streamer
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifndef PokemonAutomation_AudioPipeline_FFTStreamer_H
 #define PokemonAutomation_AudioPipeline_FFTStreamer_H
 
-#include "CommonFramework/AudioPipeline/AudioStream.h"
+#include <memory>
+#include "Common/Cpp/ListenerSet.h"
+#include "Common/Cpp/Containers/AlignedVector.h"
+#include "Kernels/AudioPipeline/Kernels_AudioPipeline.h"
+
+class UnitTestDatabase;
 
 namespace PokemonAutomation{
 
 
 
 struct FFTListener{
-    virtual void on_fft(size_t sample_rate, std::shared_ptr<AlignedVector<float>> fft_output) = 0;
+    virtual void on_fft(size_t sample_rate, std::shared_ptr<const AlignedVector<float>> fft_output) = 0;
 };
 
 
 
-//  Listen to an audio stream and compute FFTs on it.
-class AudioFloatToFFT : public AudioFloatStreamListener{
+//
+//  The FFT endpoint of the pipeline tree. Consumes the tree's
+//  single-channel working (float) stream, which the tree's mixer / resampler
+//  nodes have already mixed and resampled to the FFT rate (48 kHz), and
+//  produces FFTs for FFTListener children.
+//
+class WorkingAudioToFFT : public Kernels::AudioPipeline::WorkingAudioStreamListener{
 public:
     void add_listener(FFTListener& listener);
     void remove_listener(FFTListener& listener);
 
 public:
-    AudioFloatToFFT(
-        size_t sample_rate,
-        size_t samples_per_frame, bool average_pairs
-    );
-    virtual ~AudioFloatToFFT();
-    virtual void on_samples(const float* data, size_t frames) override;
+    explicit WorkingAudioToFFT(size_t sample_rate);
+    virtual ~WorkingAudioToFFT();
+    virtual void push_samples(size_t samples, size_t stride, const float* data) override;
 
 private:
-    void convert(float* fft_input, const float* audio_stream, size_t frames);
     void run_fft();
     void drop_from_front(size_t frames);
 
 private:
-    size_t m_sample_rate;
-
-    bool m_average;
-    size_t m_fft_sample_size;
+    const size_t m_sample_rate;
 
     AlignedVector<float> m_buffer;
     size_t m_buffered = 0;
@@ -51,12 +54,16 @@ class AudioFloatToFFT : public AudioFloatStreamListener{
 
     AlignedVector<float> m_fft_input;
 
-    std::set<FFTListener*> m_listeners;
+    ListenerSet<FFTListener> m_listeners;
 };
 
 
-std::unique_ptr<AudioFloatToFFT> make_FFT_streamer(AudioChannelFormat format);
 
+//
+//  Registers the FFT gate tests (self-contained invariants on the
+//  WorkingAudioToFFT node).
+//
+void add_tests_FFTStreamer(UnitTestDatabase& database);
 
 
 
diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/Spectrum/FFTStreamer_Tests.cpp b/SerialPrograms/Source/CommonFramework/AudioPipeline/Spectrum/FFTStreamer_Tests.cpp
new file mode 100644
index 0000000000..81522cb280
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/Spectrum/FFTStreamer_Tests.cpp
@@ -0,0 +1,317 @@
+/*  FFT Streamer - FFT Gate Tests
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  Self-contained invariants of the pipeline tree's FFT path
+ *  (RawAudio2WorkingAudio -> mixer/resampler -> WorkingAudioToFFT):
+ *  the reported rate, finiteness, the input tones peaking at their
+ *  exact bins, and the tones dominating the noise floor.
+ *
+ */
+
+#include <algorithm>
+#include <cmath>
+#include <numbers>
+#include <random>
+#include <vector>
+#include "Common/Cpp/Exceptions.h"
+#include "Common/Cpp/PrettyPrint.h"
+#include "Common/Cpp/TestRunners/UnitTest.h"
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "Common/Cpp/Containers/AlignedVector.tpp"
+#include "Kernels/AudioPipeline/Kernels_RawAudio2WorkingAudio.h"
+#include "Kernels/AudioPipeline/Kernels_ChannelMixer.h"
+#include "Kernels/AudioResampler/Kernels_AudioResampler.h"
+#include "FFTStreamer.h"
+
+namespace PokemonAutomation{
+
+namespace{
+
+
+
+//  Two tones (at exact 48 kHz FFT bin centers) plus low-level noise.
+//  Deterministic: the same generator state always produces the same
+//  signal, on every platform.
+AlignedVector<float> make_signal(
+    size_t n,
+    size_t rate,
+    double f0,
+    double f1,
+    std::mt19937& generator
+){
+    std::uniform_real_distribution<float> noise(-1.0f, 1.0f);
+    AlignedVector<float> out(n);
+    const double two_pi = 2.0 * std::numbers::pi;
+    for (size_t i = 0; i < n; i++){
+        out[i] = 0.35f * (float)std::sin(two_pi * f0 * i / rate)
+            + 0.25f * (float)std::sin(two_pi * f1 * i / rate)
+            + 0.01f * noise(generator);
+    }
+    return out;
+}
+
+
+
+//  Records FFTs from an FFTListener.
+class RecordingFFTListener : public FFTListener{
+public:
+    virtual void on_fft(size_t sample_rate, std::shared_ptr<const AlignedVector<float>> fft_output) override{
+        m_rates.push_back(sample_rate);
+        m_ffts.push_back(fft_output);
+    }
+    const std::vector<std::shared_ptr<const AlignedVector<float>>>& ffts() const{
+        return m_ffts;
+    }
+    const std::vector<size_t>& rates() const{
+        return m_rates;
+    }
+
+private:
+    std::vector<size_t> m_rates;
+    std::vector<std::shared_ptr<const AlignedVector<float>>> m_ffts;
+};
+
+
+
+//  Tree path: raw bytes -> RawAudio2WorkingAudio -> [mixer] -> [resampler]
+//  -> WorkingAudioToFFT, mirroring AudioPassthroughPairQt::build_tree().
+RecordingFFTListener run_tree(
+    Logger& logger,
+    const AlignedVector<float>& raw,
+    size_t raw_channels,
+    size_t raw_rate,
+    size_t fft_rate
+){
+    Kernels::AudioPipeline::RawAudio2WorkingAudio decoder(
+        Kernels::AudioPipeline::SampleFormat::FLOAT32, raw_rate, raw_channels, 1.0f
+    );
+    WorkingAudioToFFT fft(fft_rate);
+    RecordingFFTListener recorder;
+    fft.add_listener(recorder);
+    std::unique_ptr<Kernels::AudioResampler::AudioResampler> resampler;
+    std::unique_ptr<Kernels::AudioPipeline::ChannelMixer> mixer;
+    Kernels::AudioPipeline::WorkingAudioStreamListener* head = &fft;
+    if (raw_rate != fft_rate){
+        resampler.reset(new Kernels::AudioResampler::AudioResampler(logger, raw_rate, fft_rate, 1));
+        resampler->add_listener(*head);
+        head = resampler.get();
+    }
+    if (raw_channels != 1){
+        //  build_channel_mixer_matrix(stereo -> mono) is {0.5, 0.5}.
+        mixer.reset(new Kernels::AudioPipeline::ChannelMixer(
+            logger,
+            raw_rate,
+            raw_channels, 1,
+            std::vector<float>{0.5f, 0.5f}
+        ));
+        mixer->add_listener(*head);
+        head = mixer.get();
+    }
+    decoder.add_listener(*head);
+
+    //  Feed in odd-sized chunks. (The nodes die child-first with scope
+    //  exit, after the feed is done, like the pair's teardown.)
+    const size_t frames_total = raw.size() / raw_channels;
+    size_t done = 0;
+    while (done < frames_total){
+        size_t chunk = std::min((size_t)997, frames_total - done);
+        decoder.push_samples(chunk, raw.data() + done * raw_channels);
+        done += chunk;
+    }
+
+    return recorder;
+}
+
+
+
+//  Bin with the largest magnitude within +/- window of center.
+size_t peak_bin(const AlignedVector<float>& fft, size_t center, size_t window){
+    size_t lo = center > window ? center - window : 0;
+    size_t hi = std::min(fft.size(), center + window + 1);
+    size_t best = lo;
+    for (size_t b = lo + 1; b < hi; b++){
+        if (fft[b] > fft[best]){
+            best = b;
+        }
+    }
+    return best;
+}
+
+
+
+//  Invariants of the FFT path: every FFT reports the expected rate, all
+//  bins are finite, each input tone peaks at its exact bin, and each tone
+//  dominates the noise floor (measured on content-free bins far from the
+//  tones). An empty string means the invariants hold.
+std::string check_invariants(
+    const std::vector<std::shared_ptr<const AlignedVector<float>>>& ffts,
+    const std::vector<size_t>& rates,
+    size_t expected_rate,
+    size_t first_valid_fft,
+    const std::vector<size_t>& tone_bins
+){
+    if (ffts.size() <= first_valid_fft){
+        return "Not enough FFTs produced (" + std::to_string(ffts.size()) + ").";
+    }
+    for (size_t k = 0; k < rates.size(); k++){
+        if (rates[k] != expected_rate){
+            return "FFT " + std::to_string(k) + " reported rate " + std::to_string(rates[k])
+                + ", expected " + std::to_string(expected_rate) + ".";
+        }
+    }
+    for (size_t k = first_valid_fft; k < ffts.size(); k++){
+        if (!std::isfinite((*ffts[k])[0]) || !std::isfinite(ffts[k]->back())){
+            return "Non-finite value in FFT " + std::to_string(k) + ".";
+        }
+        float floor_max = 0.0f;
+        for (int b : {5, 6, 7, 300, 301, 302, 850, 851, 852}){
+            floor_max = std::max(floor_max, (*ffts[k])[b]);
+        }
+        for (size_t tone_bin : tone_bins){
+            size_t bin = peak_bin(*ffts[k], tone_bin, 2);
+            if (bin != tone_bin){
+                return "FFT " + std::to_string(k) + ": tone peak at bin " + std::to_string(bin)
+                    + ", expected " + std::to_string(tone_bin) + ".";
+            }
+            float peak = (*ffts[k])[tone_bin];
+            if (peak < 50.0f * floor_max){
+                return "FFT " + std::to_string(k) + ": tone at bin " + std::to_string(tone_bin)
+                    + " does not dominate the noise floor (peak " + tostr_default(peak)
+                    + ", floor " + tostr_default(floor_max) + ").";
+            }
+        }
+    }
+    return "";
+}
+
+
+
+//
+//  DUAL_48000: the no-op case (no mixer rate change, no resampler).
+//
+class FFTGateDual48000Test : public UnitTest{
+public:
+    FFTGateDual48000Test()
+        : UnitTest("AudioPipeline - FFTGate_Dual48000")
+    {}
+
+    virtual UnitTestResult run(Logger& logger, CancellableScope& scope) const override{
+        const size_t rate = 48000;
+        const size_t n = 16384;
+        const std::vector<size_t> tone_bins = {172, 600};   //  4031.25 / 14062.5 Hz at 48 kHz (14062.5 * 2048 / 48000 = 600).
+
+        std::mt19937 generator(42);
+        AlignedVector<float> l = make_signal(n, rate, 4031.25, 14062.5, generator);
+        AlignedVector<float> r = make_signal(n, rate, 4031.25, 14062.5, generator);
+        AlignedVector<float> raw(2 * n);
+        for (size_t i = 0; i < n; i++){
+            raw[2 * i + 0] = l[i];
+            raw[2 * i + 1] = r[i];
+        }
+
+        RecordingFFTListener tree = run_tree(logger, raw, 2, rate, rate);
+
+        //  The ring buffer is zero pre-filled, so the leading FFTs (0..3)
+        //  contain zero padding; the invariants start at the first full
+        //  window.
+        std::string error = check_invariants(tree.ffts(), tree.rates(), rate, 4, tone_bins);
+        if (!error.empty()){
+            return error;
+        }
+
+        return true;
+    }
+};
+
+
+
+//
+//  DUAL_44100: the tree resamples the 44.1 kHz source up to 48 kHz; the
+//  invariants verify the resampled FFTs on their own.
+//
+class FFTGateDual44100Test : public UnitTest{
+public:
+    FFTGateDual44100Test()
+        : UnitTest("AudioPipeline - FFTGate_Dual44100_Sanity")
+    {}
+
+    virtual UnitTestResult run(Logger& logger, CancellableScope& scope) const override{
+        const size_t raw_rate = 44100;
+        const size_t fft_rate = 48000;
+        const size_t n = 16384;
+        const std::vector<size_t> tone_bins = {172, 600};   //  4031.25 / 14062.5 Hz at 48 kHz (14062.5 * 2048 / 48000 = 600).
+
+        std::mt19937 generator(42);
+        AlignedVector<float> l = make_signal(n, raw_rate, 4031.25, 14062.5, generator);
+        AlignedVector<float> r = make_signal(n, raw_rate, 4031.25, 14062.5, generator);
+        AlignedVector<float> raw(2 * n);
+        for (size_t i = 0; i < n; i++){
+            raw[2 * i + 0] = l[i];
+            raw[2 * i + 1] = r[i];
+        }
+
+        RecordingFFTListener tree = run_tree(logger, raw, 2, raw_rate, fft_rate);
+
+        //  The ring buffer is zero pre-filled and the resampler has a
+        //  short transient, so the invariants start at the first full
+        //  window.
+        std::string error = check_invariants(tree.ffts(), tree.rates(), fft_rate, 4, tone_bins);
+        if (!error.empty()){
+            return error;
+        }
+
+        return true;
+    }
+};
+
+
+
+//
+//  MONO_96000: the tree decimates the 96 kHz mono stream to 48 kHz with
+//  the resampler; the invariants verify the decimated FFTs on their own.
+//
+class FFTGateMono96000Test : public UnitTest{
+public:
+    FFTGateMono96000Test()
+        : UnitTest("AudioPipeline - FFTGate_Mono96000_Sanity")
+    {}
+
+    virtual UnitTestResult run(Logger& logger, CancellableScope& scope) const override{
+        const size_t raw_rate = 96000;
+        const size_t fft_rate = 48000;
+        const size_t n = 16384;
+        const std::vector<size_t> tone_bins = {172, 600};   //  4031.25 / 14062.5 Hz at 48 kHz (14062.5 * 2048 / 48000 = 600).
+
+        std::mt19937 generator(42);
+        AlignedVector<float> raw = make_signal(n, raw_rate, 4031.25, 14062.5, generator);
+
+        RecordingFFTListener tree = run_tree(logger, raw, 1, raw_rate, fft_rate);
+
+        //  The ring buffer is zero pre-filled and the resampler has a
+        //  short transient, so the invariants start at the first full
+        //  window.
+        std::string error = check_invariants(tree.ffts(), tree.rates(), fft_rate, 4, tone_bins);
+        if (!error.empty()){
+            return error;
+        }
+
+        return true;
+    }
+};
+
+
+
+}
+
+
+
+void add_tests_FFTStreamer(UnitTestDatabase& database){
+    database.add<FFTGateDual48000Test>();
+    database.add<FFTGateDual44100Test>();
+    database.add<FFTGateMono96000Test>();
+}
+
+
+
+}
diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/Spectrum/Spectrograph.cpp b/SerialPrograms/Source/CommonFramework/AudioPipeline/Spectrum/Spectrograph.cpp
index 1d163a3c52..e5fe0dfbe1 100644
--- a/SerialPrograms/Source/CommonFramework/AudioPipeline/Spectrum/Spectrograph.cpp
+++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/Spectrum/Spectrograph.cpp
@@ -1,6 +1,6 @@
 /*  Audio Device Info
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/Spectrum/Spectrograph.h b/SerialPrograms/Source/CommonFramework/AudioPipeline/Spectrum/Spectrograph.h
index 0cd66fbfc1..6022c08919 100644
--- a/SerialPrograms/Source/CommonFramework/AudioPipeline/Spectrum/Spectrograph.h
+++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/Spectrum/Spectrograph.h
@@ -1,6 +1,6 @@
 /*  Audio Device Info
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  *      Holds a history of the most recent FFT spectrums as colors.
  *  This is used to render the spectrograph.
diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/Tools/AudioFormatUtils.cpp b/SerialPrograms/Source/CommonFramework/AudioPipeline/Tools/AudioFormatUtils.cpp
index f654ce75e0..384371610b 100644
--- a/SerialPrograms/Source/CommonFramework/AudioPipeline/Tools/AudioFormatUtils.cpp
+++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/Tools/AudioFormatUtils.cpp
@@ -1,110 +1,35 @@
 /*  Audio format Utils
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include <iostream>
 #include <sstream>
+#include <QAudio>
 #include <QAudioFormat>
+#include "Kernels/AudioStreamConverter/Kernels_AudioStreamConverter.h"
 #include "AudioFormatUtils.h"
-#include "AudioNormalization.h"
 
 
 
 namespace PokemonAutomation{
 
-#if QT_VERSION_MAJOR == 5
 
-std::string dumpAudioFormat(const QAudioFormat& format){
-    std::ostringstream ss;
-    ss << "Audio format: sample type ";
-    switch(format.sampleType()){
-        case QAudioFormat::SampleType::Float:
-            ss << "Float";
-            break;
-        case QAudioFormat::SampleType::SignedInt:
-            ss << "SignedInt";
-            break;
-        case QAudioFormat::SampleType::UnSignedInt:
-            ss << "UnSignedInt";
-            break;
-        default:
-            ss << "Error";
-    }
-
-    ss <<
-        ", bytes per sample " << format.bytesPerFrame() / format.channelCount() << 
-        ", num channels " << format.channelCount() << 
-        ", sample rate " << format.sampleRate() << 
-        ", codec " << format.codec().toStdString() << std::endl;
-
-    return ss.str();
-}
-
-void setSampleFormatToFloat(QAudioFormat& format){
-    format.setSampleType(QAudioFormat::SampleType::Float);
-    format.setSampleSize(32);
-}
-
-template <typename Type>
-void normalize_type(const QAudioFormat& format, const char* data, size_t len, float* out){
-    if (format.byteOrder() == QAudioFormat::Endian::LittleEndian){
-        normalize_audio_le<Type>(out, reinterpret_cast<const Type*>(data), len/sizeof(Type));
-    } else{
-        normalize_audio_be<Type>(out, reinterpret_cast<const Type*>(data), len/sizeof(Type));
-    }
-}
-
-void convertSamplesToFloat(const QAudioFormat& format, const char* data, size_t len, float* out){
-
-    switch(format.sampleType()){
-    case QAudioFormat::SampleType::Float:
-        if (format.sampleSize() == sizeof(float)*8){
-            memcpy(out, data, len);
-            return;
-        }
-        break;
-    case QAudioFormat::SampleType::SignedInt:
-        switch(format.sampleSize()){
-        case 8:
-            normalize_type<int8_t>(format, data, len, out);
-            return;
-        case 16:
-            normalize_type<int16_t>(format, data, len, out);
-            return;
-        case 32:
-            normalize_type<int32_t>(format, data, len, out);
-            return;
-        default:
-            break;
-        }
-        break;
-    case QAudioFormat::SampleType::UnSignedInt:
-        switch(format.sampleSize()){
-        case 8:
-            normalize_type<uint8_t>(format, data, len, out);
-            return;
-        case 16:
-            normalize_type<uint16_t>(format, data, len, out);
-            return;
-        case 32:
-            normalize_type<uint32_t>(format, data, len, out);
-            return;
-        default:
-            break;
-        }
-        break;
-    default:
-        break;
-    }
-    std::cout << "Error: Unkwnon sample format in convertSamplesToFloat(): ";
-    dumpAudioFormat(format);
+float convert_audio_volume_from_slider(double volume){
+    volume = std::max(volume, 0.0);
+    volume = std::min(volume, 1.0);
+    // The slider bar value is in the log scale because log scale matches human sound
+    // perception.
+    float linearVolume = QAudio::convertVolume(
+        (float)volume,
+        QAudio::LogarithmicVolumeScale, QAudio::LinearVolumeScale
+    );
+    return linearVolume;
 }
 
-#elif QT_VERSION_MAJOR == 6
 
-std::string dumpAudioFormat(const QAudioFormat& format){
+std::string dump_audio_format(const QAudioFormat& format){
     std::string sampleFormatStr = "";
     switch(format.sampleFormat()){
         case QAudioFormat::SampleFormat::Float:
@@ -146,46 +71,36 @@ std::string dumpAudioFormat(const QAudioFormat& format){
     return ss.str();
 }
 
-void setSampleFormatToFloat(QAudioFormat& format){
+void set_sample_format_to_float(QAudioFormat& format){
     format.setSampleFormat(QAudioFormat::SampleFormat::Float);
 }
 
-void convertSamplesToFloat(const QAudioFormat& format, const char* data, size_t len, float* out){
+void convert_samples_to_float(const QAudioFormat& format, const char* data, size_t len, float* out){
     switch(format.sampleFormat()){
     case QAudioFormat::SampleFormat::Float:
         memcpy(out, data, len);
         break;
     case QAudioFormat::SampleFormat::Int16:
-        normalize_audio_le<int16_t>(out, reinterpret_cast<const int16_t*>(data), len/sizeof(int16_t));
+        Kernels::AudioStreamConverter::convert_from<int16_t>(
+            out, reinterpret_cast<const int16_t*>(data), len/sizeof(int16_t), 1.0f
+        );
         break;
     case QAudioFormat::SampleFormat::Int32:
-        normalize_audio_le<int32_t>(out, reinterpret_cast<const int32_t*>(data), len/sizeof(int32_t));
+        Kernels::AudioStreamConverter::convert_from<int32_t>(
+            out, reinterpret_cast<const int32_t*>(data), len/sizeof(int32_t), 1.0f
+        );
         break;
     case QAudioFormat::SampleFormat::UInt8:
-        normalize_audio_le<uint8_t>(out, reinterpret_cast<const uint8_t*>(data), len/sizeof(uint8_t));
+        Kernels::AudioStreamConverter::convert_from<uint8_t>(
+            out, reinterpret_cast<const uint8_t*>(data), len/sizeof(uint8_t), 1.0f
+        );
         break;
     default:
-        std::cout << "Error: Unkwnon sample format in convertSamplesToFloat()" << std::endl;
+        std::cout << "Error: Unkwnon sample format in convert_samples_to_float()" << std::endl;
     }
 }
 
-#endif
 
 
-float audioSampleSum(const QAudioFormat& format, const char* data, size_t len){
-    const size_t frameBytes = format.bytesPerFrame();
-    const size_t numChannels = format.channelCount();
-    const size_t sampleBytes = frameBytes / numChannels;
-    const size_t numSamples = len / sampleBytes;
-    std::vector<float> buffer(numSamples);
-    convertSamplesToFloat(format, data, len, buffer.data());
-
-    float sum = 0.0f;
-    for(float v: buffer){
-        sum += v;
-    }
-    return sum;
-}
-
 
 }
diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/Tools/AudioFormatUtils.h b/SerialPrograms/Source/CommonFramework/AudioPipeline/Tools/AudioFormatUtils.h
index c43417003a..74958bd8d7 100644
--- a/SerialPrograms/Source/CommonFramework/AudioPipeline/Tools/AudioFormatUtils.h
+++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/Tools/AudioFormatUtils.h
@@ -1,6 +1,6 @@
 /*  Audio format Utils
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  *  Host various util functions for audio format related tasks.
  */
@@ -14,15 +14,19 @@ class QAudioFormat;
 
 namespace PokemonAutomation{
 
-std::string dumpAudioFormat(const QAudioFormat& format);
+std::string dump_audio_format(const QAudioFormat& format);
 
-void setSampleFormatToFloat(QAudioFormat& format);
+void set_sample_format_to_float(QAudioFormat& format);
 
-void convertSamplesToFloat(const QAudioFormat& format, const char* data, size_t len, float* out);
+// Slider bar volume: [0, 100], in log scale
+// Volume value passed to AudioDisplayWidget (and the audio thread it manages): [0.f, 1.f], linear scale
+float convert_audio_volume_from_slider(double volume);
+
+void convert_samples_to_float(const QAudioFormat& format, const char* data, size_t len, float* out);
 
 // Compute sum of the sample buffer.
 // Used to debug whether the audio stream is always the same values or always zeros.
-float audioSampleSum(const QAudioFormat& format, const char* data, size_t len);
+
 
 }
 
diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/Tools/AudioNormalization.h b/SerialPrograms/Source/CommonFramework/AudioPipeline/Tools/AudioNormalization.h
deleted file mode 100644
index aa5b6340fd..0000000000
--- a/SerialPrograms/Source/CommonFramework/AudioPipeline/Tools/AudioNormalization.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*  Audio Normalization
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_CommonFramework_AudioPipeline_AudioNormalization_H
-#define PokemonAutomation_CommonFramework_AudioPipeline_AudioNormalization_H
-
-#include <stdint.h>
-#include <limits>
-#include <type_traits>
-#include "Common/Compiler.h"
-
-#if _WIN32
-#include <stdlib.h>
-#endif
-
-namespace PokemonAutomation{
-
-
-PA_FORCE_INLINE uint8_t byte_swap(uint8_t x){
-    return x;
-}
-PA_FORCE_INLINE int8_t byte_swap(int8_t x){
-    return x;
-}
-PA_FORCE_INLINE uint16_t byte_swap(uint16_t x){
-#if _WIN32
-    return (uint32_t)_byteswap_ulong(x) >> 16;
-#elif  __GNUC__
-    return (uint32_t)__builtin_bswap32(x) >> 16;
-#else
-#error "No bswap() intrinsic for this compiler."
-#endif
-}
-PA_FORCE_INLINE int16_t byte_swap(int16_t x){
-#if _WIN32
-    return (int16_t)((uint32_t)_byteswap_ulong(x) >> 16);
-#elif  __GNUC__
-    return (int16_t)((uint32_t)__builtin_bswap32(x) >> 16);
-#else
-#error "No bswap() intrinsic for this compiler."
-#endif
-}
-PA_FORCE_INLINE uint32_t byte_swap(uint32_t x){
-#if _WIN32
-    return _byteswap_ulong(x);
-#elif  __GNUC__
-    return __builtin_bswap32(x);
-#else
-#error "No bswap() intrinsic for this compiler."
-#endif
-}
-PA_FORCE_INLINE int16_t byte_swap(int32_t x){
-#if _WIN32
-    return (int16_t)_byteswap_ulong(x);
-#elif  __GNUC__
-    return __builtin_bswap32(x);
-#else
-#error "No bswap() intrinsic for this compiler."
-#endif
-}
-
-
-template <typename Type>
-void normalize_audio_le(float* out, const Type* in, size_t count){
-    const float rcp = (std::is_unsigned<Type>::value ? 2.0f : 1.0f) / (float)std::numeric_limits<Type>::max();
-    const float sub = std::is_unsigned<Type>::value ? 1.0f : 0.0f;
-    for (size_t c = 0; c < count; c++){
-        out[c] = (float)in[c] * rcp - sub;
-    }
-}
-
-template <typename Type>
-void normalize_audio_be(float* out, const Type* in, size_t count){
-    const float rcp = (std::is_unsigned<Type>::value ? 2.0f : 1.0f) / (float)std::numeric_limits<Type>::max();
-    const float sub = std::is_unsigned<Type>::value ? 1.0f : 0.0f;
-    for (size_t c = 0; c < count; c++){
-        out[c] = (float)byte_swap(in[c]) * rcp - sub;
-    }
-}
-
-
-}
-#endif
diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/Tools/ChannelMixer.cpp b/SerialPrograms/Source/CommonFramework/AudioPipeline/Tools/ChannelMixer.cpp
new file mode 100644
index 0000000000..43a94bfbc2
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/Tools/ChannelMixer.cpp
@@ -0,0 +1,490 @@
+/*  Audio Channel Mixer - Matrix Builder
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <cstdint>
+#include <QAudioFormat>
+#include "Common/Cpp/TestRunners/UnitTest.h"
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "ChannelMixer.h"
+
+namespace PokemonAutomation{
+
+namespace{
+
+using AudioChannelPosition = QAudioFormat::AudioChannelPosition;
+
+
+//
+//  The logical mix groups that channel positions belong to.
+//
+enum class MixFamily{
+    LEFT_FRONT,
+    RIGHT_FRONT,
+    CENTER,
+    LEFT_SURROUND,
+    RIGHT_SURROUND,
+    LFE,
+    LFE2,
+    OTHER,
+};
+
+
+
+MixFamily mix_family(AudioChannelPosition position){
+    switch (position){
+    case AudioChannelPosition::FrontLeft:
+    case AudioChannelPosition::FrontLeftOfCenter:
+        return MixFamily::LEFT_FRONT;
+    case AudioChannelPosition::FrontRight:
+    case AudioChannelPosition::FrontRightOfCenter:
+        return MixFamily::RIGHT_FRONT;
+    case AudioChannelPosition::FrontCenter:
+        return MixFamily::CENTER;
+    case AudioChannelPosition::BackLeft:
+    case AudioChannelPosition::SideLeft:
+        return MixFamily::LEFT_SURROUND;
+    case AudioChannelPosition::BackRight:
+    case AudioChannelPosition::SideRight:
+        return MixFamily::RIGHT_SURROUND;
+    case AudioChannelPosition::LFE:
+        return MixFamily::LFE;
+    case AudioChannelPosition::LFE2:
+        return MixFamily::LFE2;
+    default:
+        return MixFamily::OTHER;
+    }
+}
+
+
+
+//
+//  Weight for the channel at input position `in` contributing to the channel at output
+//  position `out`. A position that has its own channel on the other side always passes
+//  through there (gain 1); the 0.7 downmix / upmix coefficients only apply when the
+//  destination layout has no channel of that family.
+//
+float mix_gain(
+    AudioChannelPosition in, AudioChannelPosition out,
+    const std::vector<bool>& in_has,
+    const std::vector<bool>& out_has,
+    const std::vector<size_t>& out_family_count,
+    bool in_mono, bool out_mono
+){
+    if (in_mono){
+        switch (mix_family(out)){
+        case MixFamily::LEFT_FRONT:
+        case MixFamily::RIGHT_FRONT:
+        case MixFamily::CENTER:
+            return 1.0f;
+        default:
+            return 0.0f;
+        }
+    }
+    if (out_mono){
+        switch (mix_family(in)){
+        case MixFamily::LEFT_FRONT:
+        case MixFamily::RIGHT_FRONT:
+        case MixFamily::CENTER:
+            return 0.5f;
+        default:
+            return 0.0f;
+        }
+    }
+    if (in == out){
+        return 1.0f;
+    }
+    const MixFamily in_family = mix_family(in);
+    const MixFamily out_family = mix_family(out);
+    //  Same-family cross-fill: e.g. 7.1 -> 5.1: BL <- 0.7 * SL, or 5.1 -> 7.1: SL <- 0.7 * BL.
+    if (in_family == out_family && (!out_has[in] || !in_has[out])){
+        switch (in_family){
+        case MixFamily::LEFT_FRONT:
+        case MixFamily::RIGHT_FRONT:
+        case MixFamily::LEFT_SURROUND:
+        case MixFamily::RIGHT_SURROUND:
+            return 0.7f;
+        default:
+            break;
+        }
+    }
+    //  Front bleed: the input family has no channel in the output at all.
+    if (out_family_count[(size_t)in_family] == 0){
+        //  e.g. 5.1 -> 2.0: L <- 0.7 * C + 0.7 * Ls
+        if ((in_family == MixFamily::CENTER && (out_family == MixFamily::LEFT_FRONT || out_family == MixFamily::RIGHT_FRONT))
+            || (in_family == MixFamily::LEFT_SURROUND && out_family == MixFamily::LEFT_FRONT)
+            || (in_family == MixFamily::RIGHT_SURROUND && out_family == MixFamily::RIGHT_FRONT)){
+            return 0.7f;
+        }
+    }
+    //  Center upmix: e.g. 2.0 -> 5.1: C <- 0.7 * (L + R) / 2
+    if (out_family == MixFamily::CENTER && !in_has[AudioChannelPosition::FrontCenter]){
+        if (in_family == MixFamily::LEFT_FRONT || in_family == MixFamily::RIGHT_FRONT){
+            return 0.35f;
+        }
+    }
+    //  LFE, LFE2, and top/bottom/back-center channels only pass through exactly.
+    return 0.0f;
+}
+
+
+
+//
+//  The standard layout assumed when the channel config is unknown but the channel count
+//  is a common one: 1 = mono, 2 = stereo, 3 = 2.1, 4 = 3.1, 5 = 5.0, 6 = 5.1, 7 = 7.0,
+//  8 = 7.1.
+//
+QAudioFormat::ChannelConfig fallback_channel_config(int channel_count){
+    switch (channel_count){
+    case 1: return QAudioFormat::ChannelConfig::ChannelConfigMono;
+    case 2: return QAudioFormat::ChannelConfig::ChannelConfigStereo;
+    case 3: return QAudioFormat::ChannelConfig::ChannelConfig2Dot1;
+    case 4: return QAudioFormat::ChannelConfig::ChannelConfig3Dot1;
+    case 5: return QAudioFormat::ChannelConfig::ChannelConfigSurround5Dot0;
+    case 6: return QAudioFormat::ChannelConfig::ChannelConfigSurround5Dot1;
+    case 7: return QAudioFormat::ChannelConfig::ChannelConfigSurround7Dot0;
+    case 8: return QAudioFormat::ChannelConfig::ChannelConfigSurround7Dot1;
+    default: return QAudioFormat::ChannelConfig::ChannelConfigUnknown;
+    }
+}
+
+
+
+//
+//  Maps each interleaved channel index of `format` to its position. Unknown channels
+//  (present in the frame but not named by the config) stay UnknownPosition.
+//
+//  Returns false when the format has a non-positive channel count, or when its channel
+//  layout is unknown and its channel count has no standard fallback layout.
+//
+bool resolve_positions(const QAudioFormat& format, std::vector<AudioChannelPosition>& out){
+    const int count = format.channelCount();
+    if (count <= 0){
+        return false;
+    }
+    //  A copy, since channelOffset() consults the format's own config.
+    QAudioFormat effective = format;
+    if (effective.channelConfig() == QAudioFormat::ChannelConfigUnknown){
+        const QAudioFormat::ChannelConfig fallback = fallback_channel_config(count);
+        if (fallback == QAudioFormat::ChannelConfigUnknown){
+            return false;
+        }
+        effective.setChannelConfig(fallback);
+    }
+    out.assign(count, AudioChannelPosition::UnknownPosition);
+    const quint32 config = effective.channelConfig();
+    for (int p = 1; p < QAudioFormat::NChannelPositions; p++){
+        if (config & (1u << p)){
+            int offset = effective.channelOffset((AudioChannelPosition)p);
+            if (offset >= 0 && offset < count){
+                out[offset] = (AudioChannelPosition)p;
+            }
+        }
+    }
+    return true;
+}
+
+
+
+}
+
+
+
+std::vector<float> build_channel_mixer_matrix(const QAudioFormat& input, const QAudioFormat& output){
+    std::vector<AudioChannelPosition> in_positions, out_positions;
+    if (!resolve_positions(input, in_positions) || !resolve_positions(output, out_positions)){
+        return {};
+    }
+
+    const size_t in_count = in_positions.size();
+    const size_t out_count = out_positions.size();
+    const bool in_mono = in_count == 1 && in_positions[0] == AudioChannelPosition::FrontCenter;
+    const bool out_mono = out_count == 1 && out_positions[0] == AudioChannelPosition::FrontCenter;
+
+    const size_t np = QAudioFormat::NChannelPositions;
+    std::vector<bool> in_has(np, false), out_has(np, false);
+    std::vector<size_t> out_family_count(8, 0);
+    for (AudioChannelPosition p : in_positions){
+        if (p != AudioChannelPosition::UnknownPosition){
+            in_has[p] = true;
+        }
+    }
+    for (AudioChannelPosition p : out_positions){
+        if (p != AudioChannelPosition::UnknownPosition){
+            out_has[p] = true;
+            out_family_count[(size_t)mix_family(p)]++;
+        }
+    }
+
+    std::vector<float> matrix(in_count * out_count, 0.0f);
+    for (size_t o = 0; o < out_count; o++){
+        const AudioChannelPosition out_position = out_positions[o];
+        if (out_position == AudioChannelPosition::UnknownPosition){
+            continue;
+        }
+        for (size_t i = 0; i < in_count; i++){
+            const AudioChannelPosition in_position = in_positions[i];
+            if (in_position == AudioChannelPosition::UnknownPosition){
+                continue;
+            }
+            matrix[i + in_count * o] = mix_gain(
+                in_position, out_position, in_has, out_has, out_family_count, in_mono, out_mono
+            );
+        }
+    }
+    return matrix;
+}
+
+
+
+namespace{
+
+
+//
+//  Builds a channel mixer matrix from a pair of QAudioFormat channel configs and verifies
+//  that it matches the expected matrix. A config of 0 means "no channel layout" with the
+//  given channel count, which uses the standard fallback layout when one exists.
+//
+class MixerMatrixTest : public UnitTest{
+public:
+    MixerMatrixTest(
+        const std::string& name,
+        uint32_t in_config, uint32_t in_unknown_count,
+        uint32_t out_config, uint32_t out_unknown_count,
+        std::vector<float> expected
+    );
+
+    virtual UnitTestResult run(Logger&, CancellableScope&) const override;
+
+
+private:
+    uint32_t m_in_config;
+    uint32_t m_in_unknown_count;
+    uint32_t m_out_config;
+    uint32_t m_out_unknown_count;
+    std::vector<float> m_expected;
+};
+
+
+
+void apply_config(QAudioFormat& format, uint32_t config, uint32_t unknown_count){
+    format.setSampleFormat(QAudioFormat::SampleFormat::Float);
+    format.setSampleRate(48000);
+    if (config == QAudioFormat::ChannelConfigUnknown){
+        //  No channel layout: channel count only, all positions unknown.
+        format.setChannelCount(unknown_count);
+        return;
+    }
+    format.setChannelConfig(QAudioFormat::ChannelConfig(config));
+}
+
+
+
+}
+
+
+
+
+MixerMatrixTest::MixerMatrixTest(
+    const std::string& name,
+    uint32_t in_config, uint32_t in_unknown_count,
+    uint32_t out_config, uint32_t out_unknown_count,
+    std::vector<float> expected
+)
+    : UnitTest("CommonFramework::AudioPipeline - " + name)
+    , m_in_config(in_config)
+    , m_in_unknown_count(in_unknown_count)
+    , m_out_config(out_config)
+    , m_out_unknown_count(out_unknown_count)
+    , m_expected(std::move(expected))
+{}
+
+UnitTestResult MixerMatrixTest::run(Logger&, CancellableScope&) const{
+    QAudioFormat in_format, out_format;
+    apply_config(in_format, m_in_config, m_in_unknown_count);
+    apply_config(out_format, m_out_config, m_out_unknown_count);
+
+    std::vector<float> actual = build_channel_mixer_matrix(in_format, out_format);
+
+    if (actual.size() != m_expected.size()){
+        return "Matrix size mismatch: got " + std::to_string(actual.size()) + ", expected " +
+            std::to_string(m_expected.size()) + ".";
+    }
+    for (size_t i = 0; i < actual.size(); i++){
+        if (actual[i] != m_expected[i]){
+            return "Mismatch at index " + std::to_string(i) + ": got " +
+                std::to_string(actual[i]) + ", expected " + std::to_string(m_expected[i]) + ".";
+        }
+    }
+    return true;
+}
+
+
+
+void add_tests_ChannelMixerMatrix(UnitTestDatabase& database){
+    //  Channel mixer matrix builder (industry-standard coefficients).
+    using CC = QAudioFormat::ChannelConfig;
+    database.add<MixerMatrixTest>(
+        "MixerMatrix(Mono->Stereo)", CC::ChannelConfigMono, 0, CC::ChannelConfigStereo, 0,
+        std::vector<float>{1.0f, 1.0f}
+    );
+    database.add<MixerMatrixTest>(
+        "MixerMatrix(Stereo->Mono)", CC::ChannelConfigStereo, 0, CC::ChannelConfigMono, 0,
+        std::vector<float>{0.5f, 0.5f}
+    );
+    database.add<MixerMatrixTest>(
+        "MixerMatrix(3.0->Stereo)", CC::ChannelConfig3Dot0, 0, CC::ChannelConfigStereo, 0,
+        std::vector<float>{
+            1.0f, 0.0f, 0.7f,
+            0.0f, 1.0f, 0.7f
+        }
+    );
+    database.add<MixerMatrixTest>(
+        "MixerMatrix(Stereo->3.0)", CC::ChannelConfigStereo, 0, CC::ChannelConfig3Dot0, 0,
+        std::vector<float>{
+            1.0f, 0.0f,
+            0.0f, 1.0f,
+            0.35f, 0.35f
+        }
+    );
+    database.add<MixerMatrixTest>(
+        "MixerMatrix(5.1->Stereo)", CC::ChannelConfigSurround5Dot1, 0, CC::ChannelConfigStereo, 0,
+        std::vector<float>{
+            1.0f, 0.0f, 0.7f, 0.0f, 0.7f, 0.0f,
+            0.0f, 1.0f, 0.7f, 0.0f, 0.0f, 0.7f
+        }
+    );
+    database.add<MixerMatrixTest>(
+        "MixerMatrix(Stereo->5.1)", CC::ChannelConfigStereo, 0, CC::ChannelConfigSurround5Dot1, 0,
+        std::vector<float>{
+            1.0f, 0.0f,
+            0.0f, 1.0f,
+            0.35f, 0.35f,
+            0.0f, 0.0f,
+            0.0f, 0.0f,
+            0.0f, 0.0f
+        }
+    );
+    database.add<MixerMatrixTest>(
+        "MixerMatrix(5.1->Mono)", CC::ChannelConfigSurround5Dot1, 0, CC::ChannelConfigMono, 0,
+        std::vector<float>{0.5f, 0.5f, 0.5f, 0.0f, 0.0f, 0.0f}
+    );
+    database.add<MixerMatrixTest>(
+        "MixerMatrix(2.1->Stereo)", CC::ChannelConfig2Dot1, 0, CC::ChannelConfigStereo, 0,
+        std::vector<float>{
+            1.0f, 0.0f, 0.0f,
+            0.0f, 1.0f, 0.0f
+        }
+    );
+    database.add<MixerMatrixTest>(
+        "MixerMatrix(7.1->5.1)", CC::ChannelConfigSurround7Dot1, 0, CC::ChannelConfigSurround5Dot1, 0,
+        std::vector<float>{
+            1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f,
+            0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f,
+            0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f,
+            0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f,
+            0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.7f, 0.0f,
+            0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.7f
+        }
+    );
+    database.add<MixerMatrixTest>(
+        "MixerMatrix(5.1->3.0)", CC::ChannelConfigSurround5Dot1, 0, CC::ChannelConfig3Dot0, 0,
+        std::vector<float>{
+            1.0f, 0.0f, 0.0f, 0.0f, 0.7f, 0.0f,
+            0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.7f,
+            0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f
+        }
+    );
+    database.add<MixerMatrixTest>(
+        "MixerMatrix(5.1->2.1)", CC::ChannelConfigSurround5Dot1, 0, CC::ChannelConfig2Dot1, 0,
+        std::vector<float>{
+            1.0f, 0.0f, 0.7f, 0.0f, 0.7f, 0.0f,
+            0.0f, 1.0f, 0.7f, 0.0f, 0.0f, 0.7f,
+            0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f
+        }
+    );
+    database.add<MixerMatrixTest>(
+        "MixerMatrix(5.1->7.1)", CC::ChannelConfigSurround5Dot1, 0, CC::ChannelConfigSurround7Dot1, 0,
+        std::vector<float>{
+            1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f,
+            0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f,
+            0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f,
+            0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f,
+            0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f,
+            0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f,
+            0.0f, 0.0f, 0.0f, 0.0f, 0.7f, 0.0f,
+            0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.7f
+        }
+    );
+    std::vector<float> identity_5_1(36, 0.0f);
+    for (size_t c = 0; c < 6; c++){
+        identity_5_1[c + 6 * c] = 1.0f;
+    }
+    database.add<MixerMatrixTest>(
+        "MixerMatrix(5.1->5.1)", CC::ChannelConfigSurround5Dot1, 0, CC::ChannelConfigSurround5Dot1, 0,
+        identity_5_1
+    );
+
+    //  Unknown channel layouts assume the standard layout for the channel count.
+    database.add<MixerMatrixTest>(
+        "MixerMatrix(UnknownIn1->Stereo)", 0, 1, CC::ChannelConfigStereo, 0,
+        std::vector<float>{1.0f, 1.0f}
+    );
+    database.add<MixerMatrixTest>(
+        "MixerMatrix(UnknownIn2->Stereo)", 0, 2, CC::ChannelConfigStereo, 0,
+        std::vector<float>{1.0f, 0.0f, 0.0f, 1.0f}
+    );
+    database.add<MixerMatrixTest>(
+        "MixerMatrix(UnknownIn3->Stereo)", 0, 3, CC::ChannelConfigStereo, 0,
+        std::vector<float>{
+            1.0f, 0.0f, 0.0f,
+            0.0f, 1.0f, 0.0f
+        }
+    );
+    database.add<MixerMatrixTest>(
+        "MixerMatrix(UnknownIn6->Stereo)", 0, 6, CC::ChannelConfigStereo, 0,
+        std::vector<float>{
+            1.0f, 0.0f, 0.7f, 0.0f, 0.7f, 0.0f,
+            0.0f, 1.0f, 0.7f, 0.0f, 0.0f, 0.7f
+        }
+    );
+    database.add<MixerMatrixTest>(
+        "MixerMatrix(UnknownIn8->5.1)", 0, 8, CC::ChannelConfigSurround5Dot1, 0,
+        std::vector<float>{
+            1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f,
+            0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f,
+            0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f,
+            0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f,
+            0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.7f, 0.0f,
+            0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.7f
+        }
+    );
+    database.add<MixerMatrixTest>(
+        "MixerMatrix(Stereo->UnknownOut6)", CC::ChannelConfigStereo, 0, 0, 6,
+        std::vector<float>{
+            1.0f, 0.0f,
+            0.0f, 1.0f,
+            0.35f, 0.35f,
+            0.0f, 0.0f,
+            0.0f, 0.0f,
+            0.0f, 0.0f
+        }
+    );
+
+    //  Channel counts with no standard fallback layout must fail.
+    database.add<MixerMatrixTest>(
+        "MixerMatrix(UnknownIn10->Stereo)", 0, 10, CC::ChannelConfigStereo, 0,
+        std::vector<float>{}
+    );
+    database.add<MixerMatrixTest>(
+        "MixerMatrix(Stereo->UnknownOut10)", CC::ChannelConfigStereo, 0, 0, 10,
+        std::vector<float>{}
+    );
+}
+
+
+
+}
+
diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/Tools/ChannelMixer.h b/SerialPrograms/Source/CommonFramework/AudioPipeline/Tools/ChannelMixer.h
new file mode 100644
index 0000000000..e982e98e70
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/Tools/ChannelMixer.h
@@ -0,0 +1,76 @@
+/*  Audio Channel Mixer - Matrix Builder
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_AudioPipeline_ChannelMixer_H
+#define PokemonAutomation_AudioPipeline_ChannelMixer_H
+
+#include <vector>
+
+class QAudioFormat;
+
+namespace PokemonAutomation{
+
+class UnitTestDatabase;
+
+
+//
+//  Builds the N x M channel mix weight matrix that converts the input format's channels
+//  into the output format's channels.
+//
+//  The returned vector has input.channelCount() * output.channelCount() floats, laid out
+//  one column per output channel, matching Kernels::AudioChannelMixer::mix_channels().
+//  The weight for input channel i contributing to output channel o is at index
+//  (i + in_channels * o).
+//
+//  Channel identities come from the channel configs (QAudioFormat::channelConfig() and
+//  channelOffset()). Mixing follows the conventional "industry standard" coefficients
+//  (ITU-R BS.1116-1 style downmixes). A position that exists on both sides always passes
+//  through to itself (gain 1); the 0.7 coefficients only apply to positions that the
+//  destination layout does not have:
+//
+//    - Same position on both sides: gain of 1.
+//    - Mono -> front channels: gain of 1 (stereo upmix duplicates the channel).
+//    - L/R -> mono: 0.5 each.
+//    - Center -> L/R (when the output has no center channel): 0.7 each.
+//    - Back/side surrounds -> the corresponding front channel (when the output has no
+//      back/side surround on that side): 0.7.
+//    - L/R -> center (upmix, when the input has no center): 0.7 * (L + R) / 2,
+//      i.e. 0.35 per front channel.
+//    - LFE passes through to LFE only; it is dropped otherwise.
+//    - Front-left/right-of-center follow their front channel, and back/side surround
+//      pairs follow each other (e.g. SideLeft <-> BackLeft), at 0.7 when the exact
+//      position is missing on either side.
+//    - Top, bottom, and back-center channels never mix (dropped in downmix, silent in
+//      upmix).
+//
+//  When a format's channel layout is unknown (channelConfig() == ChannelConfigUnknown),
+//  the standard layout for the channel count is assumed: 1 = mono, 2 = stereo,
+//  3 = 2.1, 4 = 3.1, 5 = 5.0, 6 = 5.1, 7 = 7.0, 8 = 7.1.
+//
+//  An empty vector is returned on failure:
+//    - Either format has a non-positive channel count, or
+//    - Either format's channel layout is unknown and its channel count has no standard
+//      fallback layout.
+//  A channel that exists in the frame but has no position in its config contributes
+//  nothing (its matrix row is all zeros), and an output channel with no position
+//  receives nothing (its column is all zeros).
+//
+//  No renormalization is applied: the standard coefficients are fixed, so a full-scale
+//  multichannel source can exceed full-scale in a narrow downmix.
+//
+std::vector<float> build_channel_mixer_matrix(const QAudioFormat& input, const QAudioFormat& output);
+
+
+
+//
+//  Registers unit tests for build_channel_mixer_matrix.
+//
+void add_tests_ChannelMixerMatrix(UnitTestDatabase& database);
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/Tools/TimeSampleBuffer.cpp b/SerialPrograms/Source/CommonFramework/AudioPipeline/Tools/TimeSampleBuffer.cpp
deleted file mode 100644
index 189de9baad..0000000000
--- a/SerialPrograms/Source/CommonFramework/AudioPipeline/Tools/TimeSampleBuffer.cpp
+++ /dev/null
@@ -1,184 +0,0 @@
-/*  Time Sample Buffer
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_CommonFramework_AudioPipeline_TimeSampleBuffer_TPP
-#define PokemonAutomation_CommonFramework_AudioPipeline_TimeSampleBuffer_TPP
-
-#include "Common/Cpp/Exceptions.h"
-#include "TimeSampleWriter.h"
-#include "TimeSampleBuffer.h"
-
-namespace PokemonAutomation{
-
-
-template <typename Type>
-TimeSampleBuffer<Type>::TimeSampleBuffer(
-    size_t samples_per_second,
-    Duration history,
-    Duration gap_threshold
-)
-    : m_samples_per_second(samples_per_second)
-    , m_sample_period(Duration(std::chrono::seconds(1)) / samples_per_second)
-    , m_samples_to_buffer(samples_per_second * std::chrono::duration_cast<std::chrono::milliseconds>(history).count() / 1000)
-    , m_duration_gap_threshold(gap_threshold)
-    , m_sample_gap_threshold(samples_per_second * std::chrono::duration_cast<std::chrono::milliseconds>(gap_threshold).count() / 1000)
-    , m_samples_stored(0)
-{
-    if (gap_threshold < m_sample_period){
-        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Gap threshold cannot be smaller than sample period.");
-    }
-}
-
-template <typename Type>
-void TimeSampleBuffer<Type>::push_samples(
-    const Type* samples, size_t count,
-    WallClock timestamp
-){
-    std::vector<Type> block(count);
-    memcpy(block.data(), samples, count * sizeof(Type));
-
-    SpinLockGuard lg(m_lock);
-
-#if 0
-    auto iter = m_samples.find(timestamp);
-    if (iter != m_samples.end()){
-        timestamp++;
-    }
-#endif
-
-    m_samples[timestamp] = std::move(block);
-    m_samples_stored += count;
-
-    //  Drop samples that are too old.
-    while (!m_samples.empty()){
-        auto iter = m_samples.begin();
-        size_t samples_to_drop = iter->second.size();
-        if (m_samples_stored < m_samples_to_buffer + samples_to_drop){
-            break;
-        }
-        m_samples.erase(iter);
-        m_samples_stored -= samples_to_drop;
-    }
-}
-
-template <typename Type>
-std::string TimeSampleBuffer<Type>::dump() const{
-    SpinLockGuard lg(m_lock);
-
-    std::string str;
-    if (m_samples.empty()){
-        str += "(buffer is empty)";
-        return str;
-    }
-    auto iter = m_samples.rbegin();
-    WallClock latest = iter->first;
-    for (; iter != m_samples.rend(); ++iter){
-        Duration last = iter->first - latest;
-        Duration first = last - m_sample_period * iter->second.size();
-        str += std::to_string(std::chrono::duration_cast<std::chrono::milliseconds>(last).count() / 1000.);
-        str += " - ";
-        str += std::to_string(std::chrono::duration_cast<std::chrono::milliseconds>(first).count() / 1000.);
-        str += " : ";
-        str += std::to_string(iter->second.size());
-        str += "\n";
-    }
-    return str;
-}
-
-
-template <typename Type>
-void TimeSampleBuffer<Type>::read_samples(
-    Type* samples, size_t count,
-    WallClock timestamp
-){
-    SpinLockGuard lg(m_lock);
-
-    if (m_samples.empty()){
-        memset(samples, 0, count * sizeof(Type));
-        return;
-    }
-
-    //  Setup output state.
-    WallClock requested_time = timestamp;
-    TimeSampleWriterReverse output_buffer(samples, count);
-
-    //  Jump to the latest block that's relevant to this request.
-//    cout << requested - reference << endl;
-//    cout << timestamp - reference << endl;
-    auto current_block = m_samples.lower_bound(requested_time);
-    if (current_block == m_samples.end()){
-//        cout << "front gap" << endl;
-        --current_block;
-    }
-
-    //  Setup input state.
-    WallClock current_time = current_block->first;
-    size_t current_index = current_block->second.size();
-
-    //  State machine loop. Look at the current input and output states to
-    //  decide on the next action. Stop when output is filled or we run out of
-    //  blocks.
-    while (output_buffer.samples_left() > 0){
-//        cout << "Requested: " << requested_time - reference << endl;
-//        cout << "Buffer   : " << current_time - reference << endl;
-
-        //  Current block is empty. Move to previous block.
-        if (current_index == 0){
-            if (current_block == m_samples.begin()){
-                output_buffer.fill_rest_with_zeros();
-                return;
-            }
-            --current_block;
-            current_time = current_block->first;
-            current_index = current_block->second.size();
-        }
-
-        Duration output_ahead = requested_time - current_time;
-
-        //  Requested is far ahead of what's next. Fill the gap with zeros.
-        if (output_ahead > m_duration_gap_threshold){
-//            cout << "Output Ahead" << endl;
-            size_t block = output_ahead.count() / m_sample_period.count();
-            output_buffer.push_zeros(block);
-            requested_time -= block * m_sample_period;
-            continue;
-        }
-
-        Duration input_ahead = current_time - requested_time;
-
-        //  Requested is far behind what's next. Skip ahead.
-        if (input_ahead > m_duration_gap_threshold){
-//            cout << "Input Ahead" << endl;
-            size_t block = input_ahead.count() / m_sample_period.count();
-            block = std::min(block, current_index);
-            current_index -= block;
-            current_time -= block * m_sample_period;
-            continue;
-        }
-
-        size_t block = output_buffer.push_block(current_block->second.data(), current_index);
-//        cout << "Push block: " << block << endl;
-        Duration block_time = block * m_sample_period;
-        current_index -= block;
-        current_time -= block_time;
-        requested_time -= block_time;
-    }
-}
-
-
-
-template class TimeSampleBuffer<uint8_t>;
-template class TimeSampleBuffer<int8_t>;
-template class TimeSampleBuffer<uint16_t>;
-template class TimeSampleBuffer<int16_t>;
-template class TimeSampleBuffer<uint32_t>;
-template class TimeSampleBuffer<int32_t>;
-template class TimeSampleBuffer<float>;
-
-
-
-}
-#endif
diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/Tools/TimeSampleBuffer.h b/SerialPrograms/Source/CommonFramework/AudioPipeline/Tools/TimeSampleBuffer.h
deleted file mode 100644
index 1567464387..0000000000
--- a/SerialPrograms/Source/CommonFramework/AudioPipeline/Tools/TimeSampleBuffer.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/*  Time Sample Buffer
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- *
- *  This is a buffer for raw audio samples taken from an audio input.
- *
- *  It will store at least "history" worth of samples before dropping old data.
- *
- *  This class isn't just a trivial circular buffer. It allows random write
- *  and random read access. Reads will intelligently try to construct a
- *  contiguous audio stream. If it can't, it will insert zeros or drop samples
- *  where appropriate to correct it.
- *
- *  This class in effect, is fault-tolerant to interruptions by both the writer
- *  and reader(s). Gaps or delays will self-correct to avoid a situation where
- *  the reader(s) perpetually fall behind or get ahead of the writers. Drifts
- *  where the writer/reader(s) are of slightly different speeds will also be
- *  corrected.
- *
- *
- *  Both read and write access to the buffer is done by blocks with a timestamp
- *  indicating the approximate time of the latest sample in the block.
- *
- *  If you need to read data contiguously, you need to use TimeSampleBufferReader
- *  to read it as it will ensure that the samples are contiguous across
- *  successive read calls.
- *
- */
-
-#ifndef PokemonAutomation_CommonFramework_AudioPipeline_TimeSampleBuffer_H
-#define PokemonAutomation_CommonFramework_AudioPipeline_TimeSampleBuffer_H
-
-#include <vector>
-#include <map>
-#include <string>
-#include "Common/Cpp/Time.h"
-#include "Common/Cpp/Concurrency/SpinLock.h"
-
-namespace PokemonAutomation{
-
-
-template <typename Type>
-class TimeSampleBufferReader;
-
-
-template <typename Type>
-class TimeSampleBuffer{
-    using Duration = std::chrono::system_clock::duration;
-
-public:
-    TimeSampleBuffer(
-        size_t samples_per_second,
-        Duration history,
-        Duration gap_threshold = std::chrono::milliseconds(100)
-    );
-
-    //  Write "count" samples ending on "timestamp".
-    void push_samples(
-        const Type* samples, size_t count,
-        WallClock timestamp = current_time()
-    );
-
-    //  Read "count" samples ending on "timestamp".
-    void read_samples(
-        Type* samples, size_t count,
-        WallClock timestamp = current_time()
-    );
-
-    std::string dump() const;
-
-private:
-    friend class TimeSampleBufferReader<Type>;
-    using MapType = std::map<WallClock, std::vector<Type>>;
-
-    const size_t m_samples_per_second;
-    const Duration m_sample_period;     //  Time between adjacent samples.
-
-    //  Minimum # of samples to keep.
-    const size_t m_samples_to_buffer;
-
-    //  # of samples in a gap or an overlap before we can no longer stretch.
-    const Duration m_duration_gap_threshold;
-    const size_t m_sample_gap_threshold;
-
-    mutable SpinLock m_lock;
-    MapType m_samples;
-    size_t m_samples_stored;
-};
-
-
-
-}
-#endif
diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/Tools/TimeSampleBufferReader.cpp b/SerialPrograms/Source/CommonFramework/AudioPipeline/Tools/TimeSampleBufferReader.cpp
deleted file mode 100644
index 456fa0d109..0000000000
--- a/SerialPrograms/Source/CommonFramework/AudioPipeline/Tools/TimeSampleBufferReader.cpp
+++ /dev/null
@@ -1,180 +0,0 @@
-/*  Time Sample Buffer Reader
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "TimeSampleWriter.h"
-#include "TimeSampleBufferReader.h"
-
-namespace PokemonAutomation{
-
-
-
-template <typename Type>
-TimeSampleBufferReader<Type>::TimeSampleBufferReader(TimeSampleBuffer<Type>& buffer)
-    : m_buffer(buffer)
-//    , m_last_timestamp(TimePoint::min())
-    , m_current_block(WallClock::min())
-    , m_current_index(0)
-{}
-
-template <typename Type>
-void TimeSampleBufferReader<Type>::set_to_timestamp(WallClock timestamp){
-    SpinLockGuard lg(m_buffer.m_lock);
-    set_to_timestamp_unprotected(timestamp);
-}
-
-template <typename Type>
-void TimeSampleBufferReader<Type>::set_to_timestamp_unprotected(WallClock timestamp){
-    m_current_block = WallClock::min();
-    m_current_index = 0;
-
-    const typename TimeSampleBuffer<Type>::MapType& buffer = m_buffer.m_samples;
-    if (buffer.empty()){
-        return;
-    }
-
-    auto current_block = buffer.upper_bound(timestamp);
-    if (current_block == buffer.end()){
-//        cout << "front gap" << endl;
-        --current_block;
-    }
-
-    WallClock end = current_block->first;
-    WallClock start = end - current_block->second.size() * m_buffer.m_sample_period;
-
-//    cout << start - REFERENCE << " - " << end - REFERENCE << endl;
-
-    //  Way ahead of the latest sample.
-    if (timestamp - end > m_buffer.m_duration_gap_threshold){
-//        cout << "way ahead" << endl;
-        return;
-    }
-
-    //  Way before the earliest sample.
-    if (start - timestamp > m_buffer.m_duration_gap_threshold){
-//        cout << "way behind" << endl;
-        return;
-    }
-
-    size_t block_size = current_block->second.size();
-    m_current_block = current_block->first;
-
-    //  Slightly ahead of latest sample. Clip to latest.
-    if (timestamp >= end){
-//        cout << "slightly ahead" << endl;
-        m_current_index = block_size;
-        return;
-    }
-
-    //  Slightly behind oldest sample. Clip to oldest.
-    if (timestamp <= start){
-//        cout << "slightly behind" << endl;
-        m_current_index = 0;
-        return;
-    }
-
-    //  Somewhere inside the block.
-    size_t block = (end - timestamp).count() / m_buffer.m_sample_period.count();
-    block = std::min(block, block_size);
-    m_current_index = block_size - block;
-}
-
-template <typename Type>
-void TimeSampleBufferReader<Type>::read_samples(
-    Type* samples, size_t count,
-    WallClock timestamp
-){
-    const typename TimeSampleBuffer<Type>::MapType& buffer = m_buffer.m_samples;
-
-    SpinLockGuard lg(m_buffer.m_lock);
-
-    if (buffer.empty()){
-        memset(samples, 0, count * sizeof(Type));
-        return;
-    }
-
-    //  Setup output state.
-    WallClock requested_time = timestamp - count * m_buffer.m_sample_period;
-    TimeSampleWriterForward output_buffer(samples, count);
-
-    auto current_block = buffer.lower_bound(m_current_block);
-    if (current_block == buffer.end()){
-//        cout << "front gap" << endl;
-        --current_block;
-    }
-
-    //  If the block no longer exists, jump to whatever is best block for the requested timestamp.
-    if (current_block->first != m_current_block || current_block->second.size() <= m_current_index){
-//        cout << "resetting state" << endl;
-        current_block = buffer.lower_bound(requested_time);
-        if (current_block == buffer.end()){
-            --current_block;
-        }
-        m_current_block = current_block->first;
-        m_current_index = 0;
-    }
-
-    //  Setup input state.
-    WallClock current_time = current_block->first - current_block->second.size() * m_buffer.m_sample_period;
-
-    while (output_buffer.samples_left() > 0){
-        //  Current block is empty. Move to next block.
-        if (m_current_index >= current_block->second.size()){
-            ++current_block;
-            if (current_block == buffer.end()){
-                output_buffer.fill_rest_with_zeros();
-                return;
-            }
-            m_current_block = current_block->first;
-            m_current_index = 0;
-            current_time = current_block->first - current_block->second.size() * m_buffer.m_sample_period;
-        }
-
-        const std::vector<Type>& data = current_block->second;
-        size_t samples_remaining_in_block = data.size() - m_current_index;
-
-        //  Requested is far ahead of what's next. Skip ahead.
-        Duration output_ahead = requested_time - current_time;
-        if (output_ahead > m_buffer.m_duration_gap_threshold){
-//            cout << "Output Ahead" << endl;
-            size_t block = output_ahead.count() / m_buffer.m_sample_period.count();
-            block = std::min(block, samples_remaining_in_block);
-            m_current_index += block;
-            current_time += block * m_buffer.m_sample_period;
-            continue;
-        }
-
-        //  Requested is far behind what's next. Fill the gap with zeros.
-        Duration input_ahead = current_time - requested_time;
-        if (input_ahead > m_buffer.m_duration_gap_threshold){
-//            cout << "Input Ahead" << endl;
-            size_t block = input_ahead.count() / m_buffer.m_sample_period.count();
-            output_buffer.push_zeros(block);
-            requested_time += block * m_buffer.m_sample_period;
-            continue;
-        }
-
-        size_t block = output_buffer.push_block(data.data() + m_current_index, samples_remaining_in_block);
-        Duration block_time = block * m_buffer.m_sample_period;
-        m_current_index += block;
-        current_time += block_time;
-        requested_time += block_time;
-    }
-}
-
-
-
-template class TimeSampleBufferReader<uint8_t>;
-template class TimeSampleBufferReader<int8_t>;
-template class TimeSampleBufferReader<uint16_t>;
-template class TimeSampleBufferReader<int16_t>;
-template class TimeSampleBufferReader<uint32_t>;
-template class TimeSampleBufferReader<int32_t>;
-template class TimeSampleBufferReader<float>;
-
-
-
-
-}
diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/Tools/TimeSampleBufferReader.h b/SerialPrograms/Source/CommonFramework/AudioPipeline/Tools/TimeSampleBufferReader.h
deleted file mode 100644
index 44d6a78209..0000000000
--- a/SerialPrograms/Source/CommonFramework/AudioPipeline/Tools/TimeSampleBufferReader.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*  Time Sample Buffer Reader
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_CommonFramework_AudioPipeline_TimeSampleBufferReader_H
-#define PokemonAutomation_CommonFramework_AudioPipeline_TimeSampleBufferReader_H
-
-#include "TimeSampleBuffer.h"
-
-namespace PokemonAutomation{
-
-
-template <typename Type>
-class TimeSampleBufferReader{
-    using Duration = std::chrono::system_clock::duration;
-
-public:
-    TimeSampleBufferReader(TimeSampleBuffer<Type>& buffer);
-
-    void set_to_timestamp(WallClock timestamp = current_time());
-
-    void read_samples(
-        Type* samples, size_t count,
-        WallClock timestamp = current_time()
-    );
-
-private:
-    void set_to_timestamp_unprotected(WallClock timestamp = current_time());
-
-public:
-    TimeSampleBuffer<Type>& m_buffer;
-
-//    TimePoint m_last_timestamp;
-
-    //  Last read sample.
-    WallClock m_current_block;
-    size_t m_current_index;
-};
-
-
-
-}
-#endif
diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/Tools/TimeSampleWriter.h b/SerialPrograms/Source/CommonFramework/AudioPipeline/Tools/TimeSampleWriter.h
deleted file mode 100644
index 500b73be4c..0000000000
--- a/SerialPrograms/Source/CommonFramework/AudioPipeline/Tools/TimeSampleWriter.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/*  Time Sample Writer
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_CommonFramework_AudioPipeline_TimeSampleWriter_H
-#define PokemonAutomation_CommonFramework_AudioPipeline_TimeSampleWriter_H
-
-#include <string.h>
-#include <algorithm>
-
-namespace PokemonAutomation{
-
-
-template <typename Type>
-class TimeSampleWriterForward{
-public:
-    TimeSampleWriterForward(Type* output, size_t count)
-        : m_output(output)
-        , m_samples_left(count)
-    {}
-
-    //  # of samples still left to fill before the output buffer is full.
-    size_t samples_left() const{ return m_samples_left; }
-
-    //  Push the current block of samples into the output buffer.
-    //  Returns the # of samples actually pushed.
-    size_t push_block(const Type* samples, size_t count){
-        size_t block = std::min(m_samples_left, count);
-        memcpy(m_output, samples, block * sizeof(Type));
-        m_output += block;
-        m_samples_left -= block;
-        return block;
-    }
-
-    //  Push zeros into the output buffer.
-    //  Returns the # of samples actually pushed.
-    size_t push_zeros(size_t count){
-        size_t block = std::min(m_samples_left, count);
-        memset(m_output, 0, block * sizeof(Type));
-        m_output += block;
-        m_samples_left -= block;
-        return block;
-    }
-
-    void fill_rest_with_zeros(){
-        memset(m_output, 0, m_samples_left * sizeof(Type));
-        m_output += m_samples_left;
-        m_samples_left = 0;
-    }
-
-
-private:
-    Type* m_output;
-    size_t m_samples_left;
-};
-
-
-
-template <typename Type>
-class TimeSampleWriterReverse{
-public:
-    TimeSampleWriterReverse(Type* output, size_t count)
-        : m_output(output + count)
-        , m_samples_left(count)
-    {}
-
-    //  # of samples still left to fill before the output buffer is full.
-    size_t samples_left() const{ return m_samples_left; }
-
-    //  Push the current block of samples into the output buffer.
-    //  Returns the # of samples actually pushed.
-    size_t push_block(const Type* samples, size_t count){
-        size_t block = std::min(m_samples_left, count);
-        memcpy(m_output - block, samples + count - block, block * sizeof(Type));
-        m_output -= block;
-        m_samples_left -= block;
-        return block;
-    }
-
-    //  Push zeros into the output buffer.
-    //  Returns the # of samples actually pushed.
-    size_t push_zeros(size_t count){
-        size_t block = std::min(m_samples_left, count);
-        memset(m_output - block, 0, block * sizeof(Type));
-        m_output -= block;
-        m_samples_left -= block;
-        return block;
-    }
-
-    void fill_rest_with_zeros(){
-        m_output -= m_samples_left;
-        memset(m_output, 0, m_samples_left * sizeof(Type));
-        m_samples_left = 0;
-    }
-
-
-private:
-    Type* m_output;
-    size_t m_samples_left;
-};
-
-
-
-}
-#endif
diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/UI/AudioDisplayWidget.cpp b/SerialPrograms/Source/CommonFramework/AudioPipeline/UI/AudioDisplayWidget.cpp
index d5ea82fdb2..067856b751 100644
--- a/SerialPrograms/Source/CommonFramework/AudioPipeline/UI/AudioDisplayWidget.cpp
+++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/UI/AudioDisplayWidget.cpp
@@ -1,16 +1,16 @@
 /*  Audio Display Widget
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 
+#include <iostream>
 #include <QPaintEvent>
 #include <QPainter>
-#include "Common/Qt/Redispatch.h"
+#include "CommonFramework/ImageTypes/ImageRGB32_Qt.h"
 #include "AudioDisplayWidget.h"
 
-#include <iostream>
 using std::cout;
 using std::endl;
 
@@ -24,13 +24,13 @@ AudioDisplayWidget::AudioDisplayWidget(QWidget& parent, Logger& logger, AudioSes
     , m_session(session)
     , m_display_type(session.display_type())
 {
-    m_session.add_ui_listener(*this);
+    m_session.add_state_listener(*this);
     m_session.add_spectrum_listener(*this);
 }
 
 AudioDisplayWidget::~AudioDisplayWidget(){
     m_session.remove_spectrum_listener(*this);
-    m_session.remove_ui_listener(*this);
+    m_session.remove_state_listener(*this);
 }
 
 
@@ -39,17 +39,28 @@ void AudioDisplayWidget::state_changed(){
 //    cout << "AudioDisplayWidget::state_changed()" << endl;
     QMetaObject::invokeMethod(
         this, [this]{
-            m_sanitizer.check_usage();
+            auto scope_check = m_sanitizer.check_scope();
+            update_size();
+            QWidget::update();
+        }, Qt::QueuedConnection
+    );
+}
+#if 0
+void AudioDisplayWidget::pre_input_change(){
+    QMetaObject::invokeMethod(
+        this, [this]{
+            auto scope_check = m_sanitizer.check_scope();
             update_size();
             QWidget::update();
         }, Qt::QueuedConnection
     );
 }
-void AudioDisplayWidget::display_changed(AudioOption::AudioDisplayType display){
+#endif
+void AudioDisplayWidget::post_display_change(AudioOption::AudioDisplayType display){
 //    cout << "AudioDisplayWidget::display_changed()" << endl;
     QMetaObject::invokeMethod(
         this, [this, display]{
-            m_sanitizer.check_usage();
+            auto scope_check = m_sanitizer.check_scope();
             m_display_type = display;
             update_size();
             QWidget::update();
@@ -60,6 +71,8 @@ void AudioDisplayWidget::display_changed(AudioOption::AudioDisplayType display){
 
 
 void AudioDisplayWidget::render_bars(){
+//    cout << "AudioDisplayWidget::render_bars()" << endl;
+
     QPainter painter(this);
     painter.fillRect(rect(), Qt::black);
 
@@ -67,17 +80,35 @@ void AudioDisplayWidget::render_bars(){
     const int widgetHeight = this->height();
 
     AudioSpectrumHolder::SpectrumSnapshot last_spectrum = m_session.spectrums().get_last_spectrum();
+
+    //  Don't render if it's too old.
+    if (last_spectrum.timestamp < current_time() - std::chrono::milliseconds(500)){
+        return;
+    }
+
     size_t num_buckets = last_spectrum.values.size();
 
+#if 0
+    for (int c = 0; c < 10; c++){
+        cout << last_spectrum.values[c] << ", ";
+    }
+    cout << endl;
+#endif
+
     const size_t barPlusGapWidth = widgetWidth / num_buckets;
     const size_t barWidth = 0.8 * barPlusGapWidth;
     const size_t gapWidth = barPlusGapWidth - barWidth;
     const size_t paddingWidth = widgetWidth - num_buckets * (barWidth + gapWidth);
     const size_t leftPaddingWidth = (paddingWidth + gapWidth) / 2;
     const size_t barHeight = widgetHeight - 2 * gapWidth;
-//        cout << "barHeight = " << barHeight << endl;
+//    cout << "barHeight = " << barHeight << endl;
+
+    double bucket_rcp = (double)widgetWidth / num_buckets;
 
     for (size_t i = 0; i < num_buckets; i++){
+        int s = (int)((i + 0  ) * bucket_rcp);    //  Start of bucket.
+        int e = (int)((i + 0.8) * bucket_rcp);    //  End of bucket.
+
 //        size_t curWindow = (m_nextFFTWindowIndex + m_num_freq_windows - 1) % m_num_freq_windows;
 //            // +1 here to skip the freq-0 value
 //        float value = m_freqVisBlocks[curWindow * m_numFreqVisBlocks + i];
@@ -88,6 +119,9 @@ void AudioDisplayWidget::render_bars(){
         bar.setTop((int)(rect().top() + gapWidth + (1.0 - value) * barHeight));
         bar.setBottom((int)(rect().bottom() - gapWidth));
 
+        bar.setLeft(s);
+        bar.setWidth(e - s);
+
         painter.fillRect(bar, last_spectrum.colors[i]);
     }
 }
@@ -99,7 +133,7 @@ void AudioDisplayWidget::render_spectrograph(){
 
     AudioSpectrumHolder::SpectrographSnapshot snapshot = m_session.spectrums().get_spectrograph();
     {
-        QImage graph_image = snapshot.image.to_QImage_ref();
+        QImage graph_image = to_QImage_ref(snapshot.image);
         graph_image = graph_image.scaled(
             widgetWidth, widgetHeight,
             Qt::IgnoreAspectRatio,
@@ -147,7 +181,7 @@ void AudioDisplayWidget::update_size(){
     }
 
     if (height > m_previous_height && height < m_previous_height + 10 && !m_debouncer.check(height)){
-//        cout << "Supressing potential infinite resizing loop." << endl;
+//        cout << "Suppressing potential infinite resizing loop." << endl;
         return;
     }
 
diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/UI/AudioDisplayWidget.h b/SerialPrograms/Source/CommonFramework/AudioPipeline/UI/AudioDisplayWidget.h
index 2497202313..c1daa96fdf 100644
--- a/SerialPrograms/Source/CommonFramework/AudioPipeline/UI/AudioDisplayWidget.h
+++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/UI/AudioDisplayWidget.h
@@ -1,6 +1,6 @@
 /*  Audio Display Widget
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -19,7 +19,11 @@ class AudioDeviceInfo;
 class Logger;
 
 
-class AudioDisplayWidget : public QWidget, public AudioSpectrumHolder::Listener, public AudioSession::Listener{
+class AudioDisplayWidget
+    : public QWidget
+    , public AudioSpectrumHolder::Listener
+    , public AudioSession::StateListener
+{
 public:
     using AudioDisplayType = AudioOption::AudioDisplayType;
 
@@ -32,7 +36,9 @@ class AudioDisplayWidget : public QWidget, public AudioSpectrumHolder::Listener,
 
 private:
     virtual void state_changed() override;
-    virtual void display_changed(AudioOption::AudioDisplayType display) override;
+
+//    virtual void pre_input_change() override;
+    virtual void post_display_change(AudioOption::AudioDisplayType display) override;
 
 
 private:
diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/UI/AudioSelectorWidget.cpp b/SerialPrograms/Source/CommonFramework/AudioPipeline/UI/AudioSelectorWidget.cpp
index a1f1f69d06..a592971bfb 100644
--- a/SerialPrograms/Source/CommonFramework/AudioPipeline/UI/AudioSelectorWidget.cpp
+++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/UI/AudioSelectorWidget.cpp
@@ -1,109 +1,112 @@
 /*  Audio Selector Widget
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include <QAudio>
 #include <QHBoxLayout>
 #include <QLabel>
 #include <QComboBox>
 #include <QPushButton>
 #include <QFileDialog>
 #include "Common/Qt/NoWheelComboBox.h"
+#include "CommonFramework/GlobalSettingsPanel.h"
+#include "CommonFramework/Panels/ConsoleSettingsStretch.h"
 #include "CommonFramework/AudioPipeline/AudioSession.h"
+#include "CommonFramework/AudioPipeline/AudioPipelineOptions.h"
+
+#include "CommonFramework/AudioPipeline/Sources/AudioSource_Null.h"
+//#include "CommonFramework/AudioPipeline/Sources/AudioSource_File.h"
+#include "CommonFramework/AudioPipeline/Sources/AudioSource_Device.h"
+
 #include "AudioDisplayWidget.h"
 #include "AudioSelectorWidget.h"
-#include "CommonFramework/GlobalSettingsPanel.h"
 
-#include <iostream>
-using std::cout;
-using std::endl;
+//#include <iostream>
+//using std::cout;
+//using std::endl;
 
 namespace PokemonAutomation{
 
 
 
 AudioSelectorWidget::~AudioSelectorWidget(){
-    m_session.remove_ui_listener(*this);
+    m_session.remove_state_listener(*this);
 }
 
-AudioSelectorWidget::AudioSelectorWidget(
-    QWidget& parent,
-    Logger& logger,
-    AudioSession& session
-)
+AudioSelectorWidget::AudioSelectorWidget(QWidget& parent, AudioSession& session)
     : QWidget(&parent)
     , m_session(session)
-    , m_slider_active(false)
+//    , m_slider_active(false)
 {
     QVBoxLayout* vbox = new QVBoxLayout(this);
     vbox->setContentsMargins(0, 0, 0, 0);
 
     {
-        QHBoxLayout* row0 = new QHBoxLayout();
-        row0->setContentsMargins(0, 0, 0, 0);
-        vbox->addLayout(row0);
+        QHBoxLayout* layout0 = new QHBoxLayout();
+        layout0->setContentsMargins(0, 0, 0, 0);
+        vbox->addLayout(layout0);
+
+        layout0->addWidget(new QLabel("<b>Audio Input:</b>", this), CONSOLE_SETTINGS_STRETCH_L0_LABEL);
 
-        row0->addWidget(new QLabel("<b>Audio Input:</b>", this), 2);
-        row0->addSpacing(5);
+        QHBoxLayout* layout1 = new QHBoxLayout();
+        layout0->addLayout(layout1, CONSOLE_SETTINGS_STRETCH_L0_RIGHT);
+        layout1->setContentsMargins(0, 0, 0, 0);
 
         QHBoxLayout* input_layout = new QHBoxLayout();
-        row0->addLayout(input_layout, 10);
-
-//        if (PreloadSettings::instance().DEVELOPER_MODE){
-//            m_audio_input_box = new NoWheelComboBox(this);
-//            input_layout->addWidget(m_audio_input_box, 7);
-//            m_load_file_button = new QPushButton("Load File", this);
-//            input_layout->addWidget(m_load_file_button, 3);
-//        }else{
-            m_audio_input_box = new NoWheelComboBox(this);
-            input_layout->addWidget(m_audio_input_box, 10);
-//        }
-        row0->addSpacing(5);
-
-        m_audio_format_box = new NoWheelComboBox(this);
-        row0->addWidget(m_audio_format_box, 6);
-        row0->addSpacing(5);
+        layout1->addLayout(input_layout, CONSOLE_SETTINGS_STRETCH_L1_BODY);
+        layout1->addSpacing(5);
+
+        m_audio_input_box = new NoWheelCompactComboBox(this);
+        m_audio_input_box->setMaxVisibleItems(20);
+        input_layout->addWidget(m_audio_input_box);
+
+        m_audio_format_box = new NoWheelCompactComboBox(this);
+        layout1->addWidget(m_audio_format_box, CONSOLE_SETTINGS_STRETCH_L1_RIGHT);
+        layout1->addSpacing(5);
 
         m_reset_button = new QPushButton("Reset Audio", this);
-        row0->addWidget(m_reset_button, 2);
+        layout1->addWidget(m_reset_button, CONSOLE_SETTINGS_STRETCH_L1_BUTTON);
     }
 
     {
-        QHBoxLayout* row1 = new QHBoxLayout();
-        row1->setContentsMargins(0, 0, 0, 0);
-        vbox->addLayout(row1);
+        QHBoxLayout* layout0 = new QHBoxLayout();
+        layout0->setContentsMargins(0, 0, 0, 0);
+        vbox->addLayout(layout0);
 
-        row1->addWidget(new QLabel("<b>Audio Output:</b>", this), 2);
-        row1->addSpacing(5);
+        layout0->addWidget(new QLabel("<b>Audio Output:</b>", this), CONSOLE_SETTINGS_STRETCH_L0_LABEL);
+
+        QHBoxLayout* layout1 = new QHBoxLayout();
+        layout0->addLayout(layout1, CONSOLE_SETTINGS_STRETCH_L0_RIGHT);
+        layout1->setContentsMargins(0, 0, 0, 0);
 
         QHBoxLayout* output_layout = new QHBoxLayout();
-        row1->addLayout(output_layout, 10);
-        if (GlobalSettings::instance().SHOW_RECORD_FREQUENCIES){
-            m_audio_output_box = new NoWheelComboBox(this);
+        layout1->addLayout(output_layout, CONSOLE_SETTINGS_STRETCH_L1_BODY);
+        layout1->addSpacing(5);
+
+        m_audio_output_box = new NoWheelCompactComboBox(this);
+        m_audio_output_box->setMaxVisibleItems(20);
+        if (GlobalSettings::instance().AUDIO_PIPELINE->SHOW_RECORD_FREQUENCIES){
             output_layout->addWidget(m_audio_output_box, 7);
             m_record_button = new QPushButton("Record Frequencies", this);
             output_layout->addWidget(m_record_button, 3);
         }else{
-            m_audio_output_box = new NoWheelComboBox(this);
             output_layout->addWidget(m_audio_output_box, 10);
         }
-        row1->addSpacing(5);
 
         m_volume_slider = new QSlider(Qt::Horizontal, this);
         m_volume_slider->setRange(0, 100);
         m_volume_slider->setTickInterval(10);
         m_volume_slider->setMinimumWidth(40);
         m_volume_slider->setTickPosition(QSlider::TicksBothSides);
-        row1->addWidget(m_volume_slider, 4);
-        row1->addSpacing(5);
+        layout1->addWidget(m_volume_slider, 2);
+        layout1->addSpacing(5);
 
-        m_audio_vis_box = new NoWheelComboBox(this);
+        m_audio_vis_box = new NoWheelCompactComboBox(this);
         m_audio_vis_box->addItem("No Display");
         m_audio_vis_box->addItem("Spectrum");
         m_audio_vis_box->addItem("Spectrogram");
-        row1->addWidget(m_audio_vis_box, 4);
+        layout1->addWidget(m_audio_vis_box, 2);
     }
 
     refresh_all();
@@ -111,27 +114,21 @@ AudioSelectorWidget::AudioSelectorWidget(
     connect(
         m_audio_input_box, static_cast<void(QComboBox::*)(int)>(&QComboBox::activated),
         this, [this](int index){
-            if (index <= 0 || index >= (int)m_input_audios.size() + 2){
-                m_session.clear_audio_input();
-            }else if (index == 1){
-                std::string path = QFileDialog::getOpenFileName(this, tr("Open audio file"), ".", "*.wav *.mp3").toStdString();
-                if (path.empty()){
-                    m_session.clear_audio_input();
-                }else{
-                    m_session.set_audio_input(std::move(path));
-                }
+            if (0 <= index && index < (int)m_input_sources.size()){
+                m_input_sources[index]->run_post_select();
+                m_session.set_audio_input(m_input_sources[index]);
             }else{
-                m_session.set_audio_input(m_input_audios[index - 2]);
+                m_session.set_audio_input(std::make_unique<AudioSourceDescriptor_Null>());
             }
         }
     );
     connect(
         m_audio_format_box, static_cast<void(QComboBox::*)(int)>(&QComboBox::activated),
         this, [this](int index){
-            if (index < 0 || index >= (int)m_input_formats.size()){
+            if (index < 0 || index >= (int)m_input_choices.size()){
                 return;
             }
-            m_session.set_format(m_input_formats[index]);
+            m_session.set_input_choice(m_input_choices[index]);
         }
     );
     connect(
@@ -161,6 +158,12 @@ AudioSelectorWidget::AudioSelectorWidget(
         }
     );
 
+    connect(
+        m_volume_slider, &QSlider::valueChanged, this, [this](int value){
+            m_session.set_volume(value / 100.);
+        }
+    );
+#if 0
     connect(
         m_volume_slider, &QSlider::sliderMoved, this, [this](){
             m_session.set_volume(m_volume_slider->value() / 100.);
@@ -176,41 +179,27 @@ AudioSelectorWidget::AudioSelectorWidget(
             m_slider_active.store(false, std::memory_order_release);
         }
     );
+#endif
 
     // only in developer mode:
     // record audio
-    if (GlobalSettings::instance().SHOW_RECORD_FREQUENCIES){
+    if (GlobalSettings::instance().AUDIO_PIPELINE->SHOW_RECORD_FREQUENCIES){
         connect(m_record_button, &QPushButton::clicked, this, [this](bool){
             m_record_is_on = !m_record_is_on;
-            m_session.spectrums().saveAudioFrequenciesToDisk(m_record_is_on);
+            m_session.spectrums().save_audio_frequencies_to_disk(m_record_is_on);
             if (m_record_is_on){
                 m_record_button->setText("Stop recording");
-            } else{
+            }else{
                 m_record_button->setText("Record Frequencies");
             }
         });
     }
 
-    session.add_ui_listener(*this);
+    session.add_state_listener(*this);
 }
 
 
 
-void AudioSelectorWidget::build_input_list(const std::string& file, const AudioDeviceInfo& device){
-    m_input_audios = AudioDeviceInfo::all_input_devices();
-    m_audio_input_box->clear();
-    m_audio_input_box->addItem("(none)");
-    m_audio_input_box->addItem("Play Audio File");
-    size_t index = file.empty() ? 0 : 1;
-    for (size_t c = 0; c < m_input_audios.size(); c++){
-        const AudioDeviceInfo& audio = m_input_audios[c];
-        m_audio_input_box->addItem(QString::fromStdString(audio.display_name()));
-        if (device == audio){
-            index = c + 2;
-        }
-    }
-    m_audio_input_box->setCurrentIndex((int)index);
-}
 void AudioSelectorWidget::build_output_list(const AudioDeviceInfo& device){
     m_output_audios = AudioDeviceInfo::all_output_devices();
     m_audio_output_box->clear();
@@ -228,52 +217,67 @@ void AudioSelectorWidget::build_output_list(const AudioDeviceInfo& device){
 
 
 void AudioSelectorWidget::refresh_all(){
-    auto input = m_session.input_device();
-    refresh_input_device(input.first, input.second);
-    refresh_formats(input.first, input.second, m_session.input_format());
+    refresh_input_device(m_session.input_source());
+    refresh_formats(m_session.input_source(), m_session.input_choice());
     refresh_output_device(m_session.output_device());
     refresh_volume(m_session.output_volume());
     refresh_display(m_session.display_type());
 }
-void AudioSelectorWidget::refresh_formats(const std::string& file, const AudioDeviceInfo& device, AudioChannelFormat format){
-//    cout << "AudioSelectorWidget::refresh_formats()" << endl;
-    if (!file.empty() || !device){
+void AudioSelectorWidget::refresh_formats(
+    const std::shared_ptr<const AudioSourceDescriptor>& source,
+    const AudioInputChoice& choice
+){
+    if (source == nullptr){
         m_audio_format_box->clear();
         return;
     }
-//    cout << "AudioSelectorWidget::refresh_formats() - inside" << endl;
 
-    m_input_formats = device.supported_formats();
+    m_input_choices = source->supported_formats();
+
     m_audio_format_box->clear();
     int index = -1;
-    for (size_t c = 0; c < m_input_formats.size(); c++){
-        m_audio_format_box->addItem(AUDIO_FORMAT_LABELS[(size_t)m_input_formats[c]]);
-        if (format == m_input_formats[c]){
+    for (size_t c = 0; c < m_input_choices.size(); c++){
+        m_audio_format_box->addItem(QString::fromStdString(m_input_choices[c].display_name()));
+        if (m_input_choices[c] == choice){
             index = (int)c;
         }
     }
     m_audio_format_box->setCurrentIndex(index);
 }
-void AudioSelectorWidget::refresh_input_device(const std::string& file, const AudioDeviceInfo& device){
-    if (m_input_audios.empty()){
-        build_input_list(file, device);
-        return;
+void AudioSelectorWidget::refresh_input_device(const std::shared_ptr<const AudioSourceDescriptor>& source){
+    std::shared_ptr<AudioSourceDescriptor> current_descriptor = m_session.input_source();
+
+    std::vector<std::shared_ptr<AudioSourceDescriptor>> sources;
+
+    //  Add all the static options.
+    {
+        AudioOption option;
+        m_session.save(option);
+        sources.emplace_back(option.get_input_from_cache(AudioSourceType::None));
+        sources.emplace_back(option.get_input_from_cache(AudioSourceType::File));
     }
 
-    if (!file.empty()){
-        m_audio_input_box->setCurrentIndex(1);
-        return;
+    //  Now add all the devices.
+    for (AudioDeviceInfo& info : AudioDeviceInfo::all_input_devices()){
+        sources.emplace_back(std::make_unique<AudioSourceDescriptor_Device>(std::move(info)));
     }
 
-    //  See if it's in our cached list.
-    for (size_t c = 0; c < m_input_audios.size(); c++){
-        if (device == m_input_audios[c]){
-            m_audio_input_box->setCurrentIndex((int)c + 2);
-            return;
+    m_input_sources = std::move(sources);
+    m_audio_input_box->clear();
+
+    int index = -1;
+    for (int c = 0; c < (int)m_input_sources.size(); c++){
+        const AudioSourceDescriptor& descriptor = *m_input_sources[c];
+        m_audio_input_box->addItem(QString::fromStdString(descriptor.display_name()));
+        if (*current_descriptor == descriptor){
+            index = c;
         }
     }
-
-    build_input_list(file, device);
+    if (index >= 0){
+        m_audio_input_box->setCurrentIndex((int)index);
+    }else{
+        m_session.logger().log("Unable to find entry for this source.", COLOR_RED);
+    }
 }
 void AudioSelectorWidget::refresh_output_device(const AudioDeviceInfo& device){
     if (m_output_audios.empty()){
@@ -311,30 +315,34 @@ void AudioSelectorWidget::refresh_display(AudioOption::AudioDisplayType display)
 }
 
 
-void AudioSelectorWidget::input_changed(const std::string& file, const AudioDeviceInfo& device, AudioChannelFormat format){
-//    cout << "AudioSelectorWidget::input_changed()" << endl;
-    QMetaObject::invokeMethod(this, [this, device, file, format]{
-        refresh_input_device(file, device);
-        refresh_formats(file, device, format);
-    });
+void AudioSelectorWidget::post_input_change(
+    const std::shared_ptr<const AudioSourceDescriptor>& source,
+    const AudioInputChoice& choice
+){
+//    cout << "AudioSelectorWidget::input_changed(): " << source.get() << endl;
+    QMetaObject::invokeMethod(this, [this, source, choice]{
+        refresh_input_device(source);
+        refresh_formats(source, choice);
+    }, Qt::QueuedConnection);   //  Queued due to potential recursive call to the same lock.
 }
-void AudioSelectorWidget::output_changed(const AudioDeviceInfo& device){
+void AudioSelectorWidget::post_output_change(const AudioDeviceInfo& device){
     QMetaObject::invokeMethod(this, [this, device]{
         refresh_output_device(device);
-    });
+    }, Qt::QueuedConnection);   //  Queued due to potential recursive call to the same lock.
 }
-void AudioSelectorWidget::volume_changed(double volume){
-    if (m_slider_active.load(std::memory_order_acquire)){
-        return;
-    }
-    QMetaObject::invokeMethod(this, [this, volume]{
-        refresh_volume(volume);
+void AudioSelectorWidget::post_volume_change(double volume){
+//    if (m_slider_active.load(std::memory_order_acquire)){
+//        return;
+//    }
+    QMetaObject::invokeMethod(this, [this]{
+//        refresh_volume(volume);
+        refresh_volume(m_session.output_volume());
     }, Qt::QueuedConnection);   //  Queued due to potential recursive call to the same lock.
 }
-void AudioSelectorWidget::display_changed(AudioOption::AudioDisplayType display){
-    QMetaObject::invokeMethod(this, [this, display]{
-        refresh_display(display);
-    });
+void AudioSelectorWidget::post_display_change(AudioOption::AudioDisplayType display){
+    QMetaObject::invokeMethod(this, [this]{
+        refresh_display(m_session.display_type());
+    }, Qt::QueuedConnection);   //  Queued due to potential recursive call to the same lock.
 }
 
 
diff --git a/SerialPrograms/Source/CommonFramework/AudioPipeline/UI/AudioSelectorWidget.h b/SerialPrograms/Source/CommonFramework/AudioPipeline/UI/AudioSelectorWidget.h
index 28ffebc176..b6fc5e73a5 100644
--- a/SerialPrograms/Source/CommonFramework/AudioPipeline/UI/AudioSelectorWidget.h
+++ b/SerialPrograms/Source/CommonFramework/AudioPipeline/UI/AudioSelectorWidget.h
@@ -1,6 +1,6 @@
 /*  Audio Selector Widget
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -9,12 +9,12 @@
 
 #include <string>
 #include <vector>
-#include <atomic>
-#include <mutex>
 #include <QWidget>
 #include <QSlider>
+#include "CommonFramework/AudioPipeline/AudioInputChoice.h"
 #include "CommonFramework/AudioPipeline/AudioOption.h"
 #include "CommonFramework/AudioPipeline/AudioSession.h"
+#include "CommonFramework/AudioPipeline/Backends/AudioDeviceInfo.h"
 
 class QComboBox;
 class QPushButton;
@@ -22,30 +22,28 @@ class QPushButton;
 namespace PokemonAutomation{
 
 
-class AudioSelectorWidget : public QWidget, private AudioSession::Listener{
+class AudioSelectorWidget : public QWidget, private AudioSession::StateListener{
 public:
-    AudioSelectorWidget(
-        QWidget& parent,
-        Logger& logger,
-        AudioSession& session
-    );
+    AudioSelectorWidget(QWidget& parent, AudioSession& session);
     ~AudioSelectorWidget();
 
 private:
-    void build_input_list(const std::string& file, const AudioDeviceInfo& device);
     void build_output_list(const AudioDeviceInfo& device);
 
     void refresh_all();
-    void refresh_formats(const std::string& file, const AudioDeviceInfo& device, AudioChannelFormat format);
-    void refresh_input_device(const std::string& file, const AudioDeviceInfo& device);
+    void refresh_formats(const std::shared_ptr<const AudioSourceDescriptor>& source, const AudioInputChoice& choice);
+    void refresh_input_device(const std::shared_ptr<const AudioSourceDescriptor>& source);
     void refresh_output_device(const AudioDeviceInfo& device);
     void refresh_volume(double volume);
     void refresh_display(AudioOption::AudioDisplayType display);
 
-    virtual void input_changed(const std::string& file, const AudioDeviceInfo& device, AudioChannelFormat format) override;
-    virtual void output_changed(const AudioDeviceInfo& device) override;
-    virtual void volume_changed(double volume) override;
-    virtual void display_changed(AudioOption::AudioDisplayType display) override;
+    virtual void post_input_change(
+        const std::shared_ptr<const AudioSourceDescriptor>& source,
+        const AudioInputChoice& choice
+    ) override;
+    virtual void post_output_change(const AudioDeviceInfo& device) override;
+    virtual void post_volume_change(double volume) override;
+    virtual void post_display_change(AudioOption::AudioDisplayType display) override;
 
 private:
     AudioSession& m_session;
@@ -63,13 +61,13 @@ class AudioSelectorWidget : public QWidget, private AudioSession::Listener{
     QPushButton* m_record_button = nullptr;
     bool m_record_is_on = false;
 
-    std::vector<AudioDeviceInfo> m_input_audios;
-    std::vector<AudioChannelFormat> m_input_formats;
+    std::vector<std::shared_ptr<AudioSourceDescriptor>> m_input_sources;
+    std::vector<AudioInputChoice> m_input_choices;
 
     std::vector<AudioDeviceInfo> m_output_audios;
 
-    std::mutex m_audio_lock;
-    std::atomic<bool> m_slider_active;
+//    Mutex m_audio_lock;
+//    std::atomic<bool> m_slider_active;
 };
 
 
diff --git a/SerialPrograms/Source/CommonFramework/ControllerDevices/SerialPortGlobals.h b/SerialPrograms/Source/CommonFramework/ControllerDevices/SerialPortGlobals.h
deleted file mode 100644
index a7f2c5dca8..0000000000
--- a/SerialPrograms/Source/CommonFramework/ControllerDevices/SerialPortGlobals.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*  Serial Port Globals
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_CommonFramework_SerialPortGlobals_H
-#define PokemonAutomation_CommonFramework_SerialPortGlobals_H
-
-#include <stdint.h>
-#include "Common/PokemonSwSh/PokemonProgramIDs.h"
-
-namespace PokemonAutomation{
-
-
-enum class AllowCommandsWhenRunning{
-    DISABLE_COMMANDS,
-    ENABLE_COMMANDS,
-};
-
-
-enum class PABotBaseLevel{
-    NOT_PABOTBASE = 0,
-    PABOTBASE_12KB = 1,
-    PABOTBASE_31KB = 2,
-};
-
-
-inline PABotBaseLevel program_id_to_botbase_level(uint8_t id){
-    switch (id){
-    case PABB_PID_PABOTBASE_12KB:
-        return PABotBaseLevel::PABOTBASE_12KB;
-    case PABB_PID_PABOTBASE_31KB:
-        return PABotBaseLevel::PABOTBASE_31KB;
-    }
-    return PABotBaseLevel::NOT_PABOTBASE;
-}
-
-
-
-}
-#endif
diff --git a/SerialPrograms/Source/CommonFramework/ControllerDevices/SerialPortOption.cpp b/SerialPrograms/Source/CommonFramework/ControllerDevices/SerialPortOption.cpp
deleted file mode 100644
index 00ab89e4c1..0000000000
--- a/SerialPrograms/Source/CommonFramework/ControllerDevices/SerialPortOption.cpp
+++ /dev/null
@@ -1,71 +0,0 @@
-/*  Serial Connection Selector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <QSerialPortInfo>
-#include "Common/Cpp/Containers/Pimpl.tpp"
-#include "Common/Cpp/Json/JsonValue.h"
-#include "SerialPortOption.h"
-#include "SerialPortWidget.h"
-
-namespace PokemonAutomation{
-
-
-SerialPortOption::~SerialPortOption(){}
-SerialPortOption::SerialPortOption(PABotBaseLevel minimum_pabotbase)
-    : m_minimum_pabotbase(minimum_pabotbase)
-{}
-
-void SerialPortOption::clear(){
-    m_port.clear();
-}
-
-void SerialPortOption::load_json(const JsonValue& json){
-    const std::string* name = json.get_string();
-    if (name == nullptr || name->empty()){
-        return;
-    }
-    m_port.reset(QSerialPortInfo(QString::fromStdString(*name)));
-}
-JsonValue SerialPortOption::to_json() const{
-    return m_port && !m_port->isNull() ? m_port->portName().toStdString() : "";
-}
-
-const QSerialPortInfo* SerialPortOption::port() const{
-    if (!m_port || m_port->isNull()){
-        return nullptr;
-    }
-    return m_port.get();
-}
-void SerialPortOption::set_port(QSerialPortInfo port){
-    if (!m_port){
-        m_port.reset(std::move(port));
-    }else{
-        *m_port = std::move(port);
-    }
-}
-void SerialPortOption::set_port(const QSerialPortInfo* port){
-    if (port == nullptr){
-        m_port.clear();
-        return;
-    }
-    if (!m_port){
-        m_port.reset(*port);
-    }else{
-        *m_port = *port;
-    }
-}
-
-
-
-
-
-
-
-}
-
-
-
-
diff --git a/SerialPrograms/Source/CommonFramework/ControllerDevices/SerialPortOption.h b/SerialPrograms/Source/CommonFramework/ControllerDevices/SerialPortOption.h
deleted file mode 100644
index 4861d03d6c..0000000000
--- a/SerialPrograms/Source/CommonFramework/ControllerDevices/SerialPortOption.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*  Serial Port Option
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_SerialPortOption_H
-#define PokemonAutomation_SerialPortOption_H
-
-#include <memory>
-#include "Common/Cpp/Containers/Pimpl.h"
-#include "CommonFramework/ControllerDevices/SerialPortGlobals.h"
-
-class QSerialPortInfo;
-
-namespace PokemonAutomation{
-
-class JsonValue;
-class SerialPortWidget;
-
-
-class SerialPortOption{
-public:
-    ~SerialPortOption();
-    SerialPortOption(PABotBaseLevel minimum_pabotbase);
-
-    void clear();
-
-    void load_json(const JsonValue& json);
-    JsonValue to_json() const;
-
-
-public:
-    PABotBaseLevel minimum_pabotbase() const{ return m_minimum_pabotbase; }
-
-    const QSerialPortInfo* port() const;
-    void set_port(QSerialPortInfo port);
-    void set_port(const QSerialPortInfo* port);
-
-
-private:
-    const PABotBaseLevel m_minimum_pabotbase;
-
-    Pimpl<QSerialPortInfo> m_port;
-};
-
-
-
-
-
-}
-#endif
-
-
diff --git a/SerialPrograms/Source/CommonFramework/ControllerDevices/SerialPortSession.cpp b/SerialPrograms/Source/CommonFramework/ControllerDevices/SerialPortSession.cpp
deleted file mode 100644
index 9224bc509a..0000000000
--- a/SerialPrograms/Source/CommonFramework/ControllerDevices/SerialPortSession.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-/*  Serial Port Option
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/GlobalSettingsPanel.h"
-#include "SerialPortSession.h"
-
-namespace PokemonAutomation{
-
-
-
-SerialPortSession::~SerialPortSession(){}
-SerialPortSession::SerialPortSession(Logger& logger, SerialPortOption& option)
-    : m_option(option)
-    , m_logger(logger, GlobalSettings::instance().LOG_EVERYTHING)
-    , m_connection(m_logger, option.port(), option.minimum_pabotbase())
-{}
-
-QSerialPortInfo SerialPortSession::get() const{
-    std::lock_guard<std::mutex> lg(m_lock);
-    const QSerialPortInfo* port = m_option.port();
-    if (port == nullptr){
-        return QSerialPortInfo();
-    }else{
-        return *port;
-    }
-}
-void SerialPortSession::set(QSerialPortInfo port){
-    std::lock_guard<std::mutex> lg(m_lock);
-    m_option.set_port(std::move(port));
-    m_connection.reset(m_option.port());
-}
-void SerialPortSession::set(const QSerialPortInfo* port){
-    set(port == nullptr ? QSerialPortInfo() : *port);
-}
-
-void SerialPortSession::add_listener(Listener& listener){
-    std::lock_guard<std::mutex> lg(m_lock);
-    m_listeners.insert(&listener);
-}
-void SerialPortSession::remove_listener(Listener& listener){
-    m_sanitizer.check_usage();
-    std::lock_guard<std::mutex> lg(m_lock);
-    m_listeners.erase(&listener);
-}
-void SerialPortSession::push_ready(bool ready){
-    std::lock_guard<std::mutex> lg(m_lock);
-    for (Listener* listener : m_listeners){
-        listener->on_ready(ready);
-    }
-}
-
-
-
-void SerialPortSession::stop(){
-    m_connection.stop();
-}
-void SerialPortSession::reset(){
-    std::lock_guard<std::mutex> lg(m_lock);
-    m_connection.stop();
-    for (Listener* listener : m_listeners){
-        listener->on_ready(false);
-    }
-    m_connection.reset(m_option.port());
-}
-
-
-
-
-
-}
diff --git a/SerialPrograms/Source/CommonFramework/ControllerDevices/SerialPortSession.h b/SerialPrograms/Source/CommonFramework/ControllerDevices/SerialPortSession.h
deleted file mode 100644
index 79f4211d66..0000000000
--- a/SerialPrograms/Source/CommonFramework/ControllerDevices/SerialPortSession.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*  Serial Port Option
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- *      SerialPortSession represents a live serial port. It holds onto a serial
- *  port object and can be configured, reset, etc...
- *
- *  This class is not responsible for any UI. However, any changes made to this
- *  class will be forwarded to any UI components that are attached to it.
- *
- *  The UI that allows a user to control this class is in SerialPortWidget.
- *
- *
- *
- *  This class isn't fully thread-safe like the rest of the session classes.
- *  TODO: This will be fixed in the future and will require a rewrite of BotBaseHandle.
- *
- */
-
-#ifndef PokemonAutomation_SerialPortSession_H
-#define PokemonAutomation_SerialPortSession_H
-
-#include <set>
-#include "Common/Cpp/LifetimeSanitizer.h"
-#include "CommonFramework/Tools/BotBaseHandle.h"
-#include "ClientSource/Connection/MessageLogger.h"
-#include "SerialPortOption.h"
-
-namespace PokemonAutomation{
-
-
-class SerialPortSession{
-public:
-    struct Listener{
-        virtual void on_ready(bool ready) = 0;
-    };
-
-    void add_listener(Listener& listener);
-    void remove_listener(Listener& listener);
-
-
-public:
-    ~SerialPortSession();
-    SerialPortSession(Logger& logger, SerialPortOption& option);
-
-    QSerialPortInfo get() const;
-    void set(QSerialPortInfo port);
-    void set(const QSerialPortInfo* port);
-
-public:
-//    SerialPortOption* operator->(){ return &m_option; }
-//    SerialPortOption& option(){ return m_option; }
-
-    bool is_ready() const{ return m_connection.state() == BotBaseHandle::State::READY; }
-    BotBaseHandle& botbase(){ return m_connection; }
-    PABotBaseLevel min_pabotbase() const{ return m_connection.min_pabotbase(); }
-
-    void stop();
-    void reset();
-
-
-private:
-    void push_ready(bool ready);
-
-
-private:
-    SerialPortOption& m_option;
-    SerialLogger m_logger;
-    BotBaseHandle m_connection;
-
-    mutable std::mutex m_lock;
-    std::set<Listener*> m_listeners;
-
-    LifetimeSanitizer m_sanitizer;
-};
-
-
-
-
-}
-#endif
diff --git a/SerialPrograms/Source/CommonFramework/ControllerDevices/SerialPortWidget.cpp b/SerialPrograms/Source/CommonFramework/ControllerDevices/SerialPortWidget.cpp
deleted file mode 100644
index e0020a6656..0000000000
--- a/SerialPrograms/Source/CommonFramework/ControllerDevices/SerialPortWidget.cpp
+++ /dev/null
@@ -1,202 +0,0 @@
-/*  Serial Connection Selector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <QSerialPortInfo>
-#include <QHBoxLayout>
-#include "Common/Qt/NoWheelComboBox.h"
-#include "CommonFramework/GlobalSettingsPanel.h"
-#include "SerialPortWidget.h"
-
-#include <iostream>
-using std::cout;
-using std::endl;
-
-namespace PokemonAutomation{
-
-
-SerialPortWidget::SerialPortWidget(
-    QWidget& parent,
-    SerialPortSession& session,
-    Logger& logger
-)
-    : QWidget(&parent)
-    , m_session(session)
-//    , m_logger(logger, GlobalSettings::instance().LOG_EVERYTHING)
-//    , m_connection(m_logger, *value.m_port, value.m_minimum_pabotbase)
-{
-    QHBoxLayout* serial_row = new QHBoxLayout(this);
-    serial_row->setContentsMargins(0, 0, 0, 0);
-
-    serial_row->addWidget(new QLabel("<b>Serial Port:</b>", this), 1);
-    serial_row->addSpacing(5);
-
-    m_serial_box = new NoWheelComboBox(this);
-    serial_row->addWidget(m_serial_box, 5);
-    refresh();
-    serial_row->addSpacing(5);
-
-    QWidget* status = new QWidget(this);
-    serial_row->addWidget(status, 3);
-    QVBoxLayout* sbox = new QVBoxLayout(status);
-    sbox->setContentsMargins(0, 0, 0, 0);
-    sbox->setSpacing(0);
-    m_serial_program = new QLabel(this);
-    sbox->addWidget(m_serial_program);
-    m_serial_uptime = new QLabel(this);
-    sbox->addWidget(m_serial_uptime);
-    serial_row->addSpacing(5);
-
-    m_serial_program->setText("<font color=\"red\">Not Connected</font>");
-    m_serial_uptime->hide();
-
-    m_reset_button = new QPushButton("Reset Serial", this);
-    serial_row->addWidget(m_reset_button, 1);
-
-    connect(
-        m_serial_box, static_cast<void(QComboBox::*)(int)>(&QComboBox::activated),
-        this, [this](int index){
-            QSerialPortInfo current_port = m_session.get();
-//            SerialPortOption& option = m_session.option();
-//            const QSerialPortInfo* current_port = option.port();
-            if (index <= 0 || (size_t)index > m_ports.size()){
-//                option.clear();
-                m_session.set(QSerialPortInfo());
-            }else{
-                const QSerialPortInfo& port = m_ports[index - 1];
-                if (!current_port.isNull() && current_port.systemLocation() == port.systemLocation()){
-                    return;
-                }
-                m_session.set(port);
-//                option.set_port(port);
-            }
-            reset();
-        }
-    );
-    connect(
-        &m_session.botbase(), &BotBaseHandle::on_not_connected,
-        this, [this](std::string error){
-            if (error.size() <= 0){
-                m_serial_program->setText("<font color=\"red\">Not Connected</font>");
-            }else{
-                m_serial_program->setText(QString::fromStdString(error));
-            }
-            m_serial_uptime->hide();
-        }
-    );
-    connect(
-        &m_session.botbase(), &BotBaseHandle::on_connecting,
-        this, [this](const std::string& port_name){
-            for (size_t i = 0; i < m_ports.size(); i++) {
-                if (m_ports[i].systemLocation().toUtf8().data() == port_name) {
-                    m_serial_box->setCurrentIndex(static_cast<int>(i + 1));
-                    break;
-                }
-            }
-            m_serial_program->setText("<font color=\"green\">Connecting...</font>");
-            m_serial_uptime->hide();
-        }
-    );
-    connect(
-        &m_session.botbase(), &BotBaseHandle::on_ready,
-        this, [this](std::string description){
-            m_serial_program->setText(QString::fromStdString(description));
-            emit signal_on_ready(true);
-        }
-    );
-    connect(
-        &m_session.botbase(), &BotBaseHandle::on_stopped,
-        this, [this](std::string error){
-            if (error.size() <= 0){
-                m_serial_program->setText("<font color=\"orange\">Stopping...</font>");
-            }else{
-                m_serial_program->setText(QString::fromStdString(error));
-            }
-        }
-    );
-    connect(
-        &m_session.botbase(), &BotBaseHandle::uptime_status,
-        this, [this](std::string status){
-            m_serial_uptime->setText(QString::fromStdString(status));
-            m_serial_uptime->show();
-        }
-    );
-    connect(
-        m_reset_button, &QPushButton::clicked,
-        this, [this](bool){
-            reset();
-        }
-    );
-
-    m_serial_program->setText(QString::fromStdString(m_session.botbase().label()));
-    m_session.add_listener(*this);
-}
-SerialPortWidget::~SerialPortWidget(){
-    m_session.remove_listener(*this);
-}
-void SerialPortWidget::refresh(){
-    m_serial_box->clear();
-    m_serial_box->addItem("(none)");
-
-    m_ports.clear();
-    for (QSerialPortInfo& port : QSerialPortInfo::availablePorts()){
-#ifdef _WIN32
-        //  COM1 is never the correct port on Windows.
-        if (port.portName() == "COM1"){
-            continue;
-        }
-#endif
-        m_ports.emplace_back(std::move(port));
-    }
-
-    QSerialPortInfo current_port = m_session.get();
-//    SerialPortOption& option = m_session.option();
-//    const QSerialPortInfo* current_port = option.port();
-
-    size_t index = 0;
-    for (size_t c = 0; c < m_ports.size(); c++){
-        const QSerialPortInfo& port = m_ports[c];
-        m_serial_box->addItem(port.portName() + " - " + port.description());
-
-        if (!current_port.isNull() && current_port.systemLocation() == port.systemLocation()){
-            index = c + 1;
-        }
-    }
-    if (index != 0){
-        m_serial_box->setCurrentIndex((int)index);
-    }else{
-//        option.clear();
-        m_session.set(QSerialPortInfo());
-        m_serial_box->setCurrentIndex(0);
-    }
-}
-void SerialPortWidget::on_ready(bool ready){
-    emit signal_on_ready(ready);
-}
-
-bool SerialPortWidget::is_ready() const{
-    return m_session.is_ready();
-}
-BotBaseHandle& SerialPortWidget::botbase(){
-    return m_session.botbase();
-}
-void SerialPortWidget::set_options_enabled(bool enabled){
-    m_serial_box->setEnabled(enabled);
-    m_reset_button->setEnabled(enabled);
-}
-
-void SerialPortWidget::stop(){
-    m_session.stop();
-}
-void SerialPortWidget::reset(){
-    m_session.reset();
-    refresh();
-}
-
-
-
-
-
-}
diff --git a/SerialPrograms/Source/CommonFramework/ControllerDevices/SerialPortWidget.h b/SerialPrograms/Source/CommonFramework/ControllerDevices/SerialPortWidget.h
deleted file mode 100644
index f5700fa37e..0000000000
--- a/SerialPrograms/Source/CommonFramework/ControllerDevices/SerialPortWidget.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*  Serial Port Widget
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_SerialPortWidget_H
-#define PokemonAutomation_SerialPortWidget_H
-
-#include <QLabel>
-#include <QComboBox>
-#include <QPushButton>
-#include "CommonFramework/Tools/BotBaseHandle.h"
-#include "SerialPortSession.h"
-
-namespace PokemonAutomation{
-
-
-class SerialPortWidget : public QWidget, public SerialPortSession::Listener{
-    Q_OBJECT
-
-public:
-    SerialPortWidget(
-        QWidget& parent,
-        SerialPortSession& session,
-        Logger& logger
-    );
-    ~SerialPortWidget();
-
-    bool is_ready() const;
-    BotBaseHandle& botbase();
-
-    void set_options_enabled(bool enabled);
-
-    void stop();
-    void reset();
-
-signals:
-    void signal_on_ready(bool ready);
-
-private:
-    void refresh();
-    virtual void on_ready(bool ready) override;
-
-private:
-    SerialPortSession& m_session;
-
-    QComboBox* m_serial_box;
-    QLabel* m_serial_program;
-    QLabel* m_serial_uptime;
-    QPushButton* m_reset_button;
-
-    std::vector<QSerialPortInfo> m_ports;
-};
-
-
-
-}
-#endif
diff --git a/SerialPrograms/Source/CommonFramework/CrashDump.cpp b/SerialPrograms/Source/CommonFramework/CrashDump.cpp
deleted file mode 100644
index 745692bdda..0000000000
--- a/SerialPrograms/Source/CommonFramework/CrashDump.cpp
+++ /dev/null
@@ -1,112 +0,0 @@
-/*  Crash Dump
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <time.h>
-#include <fstream>
-#include "Common/Cpp/Unicode.h"
-#include "Common/Cpp/PrettyPrint.h"
-//#include "ClientSource/Libraries/Logging.h"
-#include "CrashDump.h"
-
-#include <iostream>
-using std::cout;
-using std::endl;
-
-
-
-#if _WIN32 && _MSC_VER
-#pragma comment (lib, "Dbghelp.lib")
-#include <Windows.h>
-#include <winioctl.h>
-#include <Dbghelp.h>
-namespace PokemonAutomation{
-
-
-long WINAPI crash_handler(EXCEPTION_POINTERS* e){
-    static bool handled = false;
-    if (handled){
-        return EXCEPTION_CONTINUE_SEARCH;
-    }
-    handled = true;
-
-//    cout << "Oops... Program has crashed." << endl;
-//    cout << "Creating mini-dump file..." << endl;
-
-    _wmkdir(L"ErrorDumps");
-
-    std::string filename = "ErrorDumps/SerialPrograms-";
-    filename += now_to_filestring();
-
-    std::ofstream log;
-    log.open(filename + ".log");
-
-    log << "Oops... Program has crashed." << endl;
-    log << "Creating mini-dump file..." << endl;
-
-    HANDLE handle = CreateFileW(
-        utf8_to_wstr(filename + ".dmp").c_str(),
-        FILE_WRITE_ACCESS,
-        FILE_SHARE_READ,
-        nullptr,
-        OPEN_ALWAYS,
-        FILE_ATTRIBUTE_NORMAL,
-        0
-    );
-    if (handle == INVALID_HANDLE_VALUE){
-        DWORD error = GetLastError();
-//        cout << "Unable to create dump file: " << error << endl;
-        log << "Unable to create dump file: " << error << endl;
-        return EXCEPTION_EXECUTE_HANDLER;
-    }
-
-    MINIDUMP_EXCEPTION_INFORMATION exceptionInfo;
-    exceptionInfo.ThreadId = GetCurrentThreadId();
-    exceptionInfo.ExceptionPointers = e;
-    exceptionInfo.ClientPointers = FALSE;
-
-    int ret = MiniDumpWriteDump(
-        GetCurrentProcess(),
-        GetCurrentProcessId(),
-        handle,
-        MiniDumpNormal,
-        e != nullptr ? &exceptionInfo : nullptr,
-        nullptr,
-        nullptr
-    );
-    CloseHandle(handle);
-
-    if (!ret){
-        DWORD error = GetLastError();
-//        cout << "Unable to create minidump: " << error << endl;
-        log << "Unable to create minidump: " << error << endl;
-    }else{
-//        cout << "Minidump created!" << endl;
-        log << "Minidump created!" << endl;
-    }
-
-    Sleep(1000);
-
-    return EXCEPTION_CONTINUE_SEARCH;
-}
-
-
-
-void setup_crash_handler(){
-//    AddVectoredExceptionHandler(0, crash_handler);
-    SetUnhandledExceptionFilter(crash_handler);
-}
-
-
-}
-#else
-namespace PokemonAutomation{
-
-void setup_crash_handler(){
-    //  Not supported
-}
-
-}
-#endif
diff --git a/SerialPrograms/Source/CommonFramework/CrashDump.h b/SerialPrograms/Source/CommonFramework/CrashDump.h
deleted file mode 100644
index 1918717016..0000000000
--- a/SerialPrograms/Source/CommonFramework/CrashDump.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/*  Crash Dump
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_CrashDump_H
-#define PokemonAutomation_CrashDump_H
-
-namespace PokemonAutomation{
-
-
-void setup_crash_handler();
-
-
-}
-#endif
diff --git a/SerialPrograms/Source/CommonFramework/Environment/Environment.cpp b/SerialPrograms/Source/CommonFramework/Environment/Environment.cpp
index f1a5b91ef7..99a2917d85 100644
--- a/SerialPrograms/Source/CommonFramework/Environment/Environment.cpp
+++ b/SerialPrograms/Source/CommonFramework/Environment/Environment.cpp
@@ -1,31 +1,16 @@
 /*  Environment
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include <algorithm>
-#include "Common/Cpp/CpuId/CpuId.h"
-#include "Environment.h"
-
-#if _M_IX86 || _M_X64 || __i386__ || __x86_64__
-#include "Environment_x86.tpp"
-#endif
 
 #if _WIN32
 #include "Environment_Windows.tpp"
-#ifdef PA_ARCH_x86
-#include "Environment_x86_Windows.tpp"
-#endif
 #endif
 
 #if defined(__linux) || defined(__APPLE__)
 #include "Environment_Linux.tpp"
-#ifdef PA_ARCH_x86
-#include "Environment_x86_Linux.tpp"
-#elif PA_ARCH_arm64
-#include "Environment_arm64_Linux.tpp"
-#endif
 #endif
 
 
diff --git a/SerialPrograms/Source/CommonFramework/Environment/Environment.h b/SerialPrograms/Source/CommonFramework/Environment/Environment.h
index 9e7aa73c12..3550e47f51 100644
--- a/SerialPrograms/Source/CommonFramework/Environment/Environment.h
+++ b/SerialPrograms/Source/CommonFramework/Environment/Environment.h
@@ -1,6 +1,6 @@
 /*  Environment
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -8,10 +8,8 @@
 #define PokemonAutomation_Environment_H
 
 #include <string>
-#include <vector>
-#include <QThread>
-#include "Common/Cpp/EnumDatabase.h"
-#include "Common/Cpp/CpuId/CpuId.h"
+#include "Common/Cpp/Logging/AbstractLogger.h"
+#include "Common/Cpp/Options/EnumDropdownDatabase.h"
 
 #if _WIN32
 #include "Environment_Windows.h"
@@ -24,28 +22,15 @@
 namespace PokemonAutomation{
 
 
-const EnumDatabase<ThreadPriority>& PRIORITY_DATABASE();
+const EnumDropdownDatabase<ThreadPriority>& PRIORITY_DATABASE();
 
-bool set_thread_priority(ThreadPriority priority);
+bool set_thread_priority(Logger& logger, ThreadPriority priority);
 
 
 class ThreadHandle;
 
 
 
-std::string get_processor_name();
-struct ProcessorSpecs{
-    std::string name;
-    size_t threads = 0;
-    size_t cores = 0;
-    size_t sockets = 0;
-    size_t numa_nodes = 0;
-    size_t base_frequency = 0;
-};
-ProcessorSpecs get_processor_specs();
-
-
-
 
 
 
diff --git a/SerialPrograms/Source/CommonFramework/Environment/Environment_Linux.h b/SerialPrograms/Source/CommonFramework/Environment/Environment_Linux.h
index 31b5d6a776..6ad2c6d38a 100644
--- a/SerialPrograms/Source/CommonFramework/Environment/Environment_Linux.h
+++ b/SerialPrograms/Source/CommonFramework/Environment/Environment_Linux.h
@@ -1,17 +1,12 @@
 /*  Environment (Linux)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifndef PokemonAutomation_Environment_Linux_H
 #define PokemonAutomation_Environment_Linux_H
 
-#include <chrono>
-#include <pthread.h>
-#include <sys/time.h>
-#include "Common/Cpp/Time.h"
-
 namespace PokemonAutomation{
 
 
@@ -20,42 +15,13 @@ enum class ThreadPriority{
     Min,
 };
 
-constexpr ThreadPriority DEFAULT_PRIORITY_REALTIME  = ThreadPriority::Max;
-constexpr ThreadPriority DEFAULT_PRIORITY_INFERENCE = ThreadPriority::Max;
-constexpr ThreadPriority DEFAULT_PRIORITY_COMPUTE   = ThreadPriority::Min;
-
-
-
-class ThreadHandle{
-public:
-    pthread_t handle;
-};
-ThreadHandle current_thread_handle();
-// Get the cpu time of the thread.
-// This function must be called in the same process the thread belongs to.
-WallClock::duration thread_cpu_time(const ThreadHandle& handle);
-
+constexpr ThreadPriority DEFAULT_PRIORITY_UI                    = ThreadPriority::Max;
+constexpr ThreadPriority DEFAULT_PRIORITY_REALTIME              = ThreadPriority::Max;
+constexpr ThreadPriority DEFAULT_PRIORITY_REALTIME_INFERENCE    = ThreadPriority::Min;
+constexpr ThreadPriority DEFAULT_PRIORITY_NORMAL_INFERENCE      = ThreadPriority::Min;
+constexpr ThreadPriority DEFAULT_PRIORITY_COMPUTE               = ThreadPriority::Min;
 
 
-class SystemCpuTime{
-public:
-    static SystemCpuTime now();
-    static size_t vcores();
-
-    bool is_valid() const{
-        return m_usec != 0 || m_sec != 0;
-    }
-
-    std::chrono::microseconds operator-(const SystemCpuTime& x) const;
-
-private:
-    void set_to_now();
-    static size_t read_cores();
-
-private:
-    time_t m_sec = 0;
-    suseconds_t m_usec = 0;
-};
 
 
 
diff --git a/SerialPrograms/Source/CommonFramework/Environment/Environment_Linux.tpp b/SerialPrograms/Source/CommonFramework/Environment/Environment_Linux.tpp
index 118edf8ede..36f34daab3 100644
--- a/SerialPrograms/Source/CommonFramework/Environment/Environment_Linux.tpp
+++ b/SerialPrograms/Source/CommonFramework/Environment/Environment_Linux.tpp
@@ -30,15 +30,15 @@ namespace PokemonAutomation{
 
 
 
-const EnumDatabase<ThreadPriority>& PRIORITY_DATABASE(){
-    static EnumDatabase<ThreadPriority> database({
+const EnumDropdownDatabase<ThreadPriority>& PRIORITY_DATABASE(){
+    static EnumDropdownDatabase<ThreadPriority> database({
         {ThreadPriority::Max, "max", "Max Priority"},
         {ThreadPriority::Min, "min", "Min Priority"},
     });
     return database;
 }
 
-bool set_thread_priority(ThreadPriority priority){
+bool set_thread_priority(Logger& logger, ThreadPriority priority){
     int native_priority = sched_get_priority_min(SCHED_RR);
     switch (priority){
     case ThreadPriority::Max:
@@ -54,11 +54,12 @@ bool set_thread_priority(ThreadPriority priority){
     struct sched_param param;
     param.sched_priority = native_priority;
     if (pthread_setschedparam(pthread_self(), SCHED_RR, &param) == 0){
+        logger.log("Thread priority set to: " + PRIORITY_DATABASE().find(priority)->display, COLOR_BLUE);
         return true;
     }
 
     int errorcode = errno;
-    global_logger_tagged().log("Unable to set process priority. Error Code = " + std::to_string(errorcode), COLOR_RED);
+    logger.log("Unable to set process priority. Error Code = " + std::to_string(errorcode), COLOR_RED);
     return false;
 }
 
@@ -66,74 +67,6 @@ bool set_thread_priority(ThreadPriority priority){
 
 
 
-ThreadHandle current_thread_handle(){
-    return ThreadHandle{pthread_self()};
-}
-WallClock::duration thread_cpu_time(const ThreadHandle& handle){
-    uint64_t nanos = 0;
-
-#if defined(__APPLE__)
-    uint64_t tid = 0;
-    pthread_threadid_np(handle.handle, &tid);
-    struct proc_threadinfo pth;
-    if (PROC_PIDTHREADINFO_SIZE ==
-        proc_pidinfo(getpid(), PROC_PIDTHREADID64INFO, tid, &pth,
-                    PROC_PIDTHREADINFO_SIZE)) {
-        nanos = pth.pth_user_time + pth.pth_system_time; // user time + system time in ns
-    }
-    else{
-        return WallClock::duration::min();
-    }
-
-#else
-    clockid_t clockid;
-    int error = pthread_getcpuclockid(handle.handle, &clockid);
-    if (error){
-        return WallClock::duration::min();
-    }
-
-    struct timespec ts;
-    if (clock_gettime(clockid, &ts) == -1){
-        return WallClock::duration::min();
-    }
-
-    nanos = (uint64_t)ts.tv_sec * 1000000000 + ts.tv_nsec;
-#endif
-
-    return std::chrono::duration_cast<WallClock::duration>(std::chrono::nanoseconds(nanos));
-}
-
-
-
-
-
-
-std::chrono::microseconds SystemCpuTime::operator-(const SystemCpuTime& x) const{
-    return std::chrono::microseconds((m_sec - x.m_sec) * 1000000ull + (m_usec - x.m_usec));
-}
-SystemCpuTime SystemCpuTime::now(){
-    SystemCpuTime ret;
-    ret.set_to_now();
-    return ret;
-}
-size_t SystemCpuTime::vcores(){
-    static size_t cores = read_cores();
-    return cores;
-}
-void SystemCpuTime::set_to_now(){
-    struct rusage ru;
-    if (getrusage(RUSAGE_SELF, &ru) == -1){
-        m_sec = 0;
-        m_usec = 0;
-    }else{
-        m_sec = ru.ru_utime.tv_sec + ru.ru_stime.tv_sec;
-        m_usec = ru.ru_utime.tv_usec + ru.ru_stime.tv_usec;
-    }
-}
-size_t SystemCpuTime::read_cores(){
-    return std::thread::hardware_concurrency();
-}
-
 
 
 
diff --git a/SerialPrograms/Source/CommonFramework/Environment/Environment_Windows.h b/SerialPrograms/Source/CommonFramework/Environment/Environment_Windows.h
index 587cec8094..dff46d4f85 100644
--- a/SerialPrograms/Source/CommonFramework/Environment/Environment_Windows.h
+++ b/SerialPrograms/Source/CommonFramework/Environment/Environment_Windows.h
@@ -1,15 +1,12 @@
 /*  Environment (Windows)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifndef PokemonAutomation_Environment_Windows_H
 #define PokemonAutomation_Environment_Windows_H
 
-#include <chrono>
-#include "Common/Cpp/Time.h"
-
 namespace PokemonAutomation{
 
 
@@ -22,63 +19,18 @@ enum class ThreadPriority{
     Low,
 };
 
-constexpr ThreadPriority DEFAULT_PRIORITY_REALTIME  = ThreadPriority::High;
-constexpr ThreadPriority DEFAULT_PRIORITY_INFERENCE = ThreadPriority::AboveNormal;
-constexpr ThreadPriority DEFAULT_PRIORITY_COMPUTE   = ThreadPriority::BelowNormal;
-
-
-
+constexpr ThreadPriority DEFAULT_PRIORITY_UI                    = ThreadPriority::High;
+constexpr ThreadPriority DEFAULT_PRIORITY_REALTIME              = ThreadPriority::AboveNormal;
+constexpr ThreadPriority DEFAULT_PRIORITY_REALTIME_INFERENCE    = ThreadPriority::Normal;
+constexpr ThreadPriority DEFAULT_PRIORITY_NORMAL_INFERENCE      = ThreadPriority::BelowNormal;
+constexpr ThreadPriority DEFAULT_PRIORITY_COMPUTE               = ThreadPriority::Low;
 
 
-class WinApiHandleHolder;
-
-class ThreadHandle{
-public:
-    ThreadHandle(ThreadHandle&& x);
-    ThreadHandle& operator=(ThreadHandle&& x);
-    ThreadHandle(const ThreadHandle& x);
-    ThreadHandle& operator=(const ThreadHandle& x);
-    ~ThreadHandle();
-
-    ThreadHandle(std::shared_ptr<WinApiHandleHolder> ptr = nullptr);
-
-    std::shared_ptr<WinApiHandleHolder> m_ptr;
-};
-ThreadHandle current_thread_handle();
-WallClock::duration thread_cpu_time(const ThreadHandle& handle);
 
 
 
 
 
-class SystemCpuTime{
-public:
-    static SystemCpuTime now();
-    static size_t vcores();
-
-    bool is_valid() const{
-        return m_kernel != 0;
-    }
-
-    std::chrono::microseconds operator-(const SystemCpuTime& x) const{
-        uint64_t idle = m_idle - x.m_idle;
-        uint64_t kernel = m_kernel - x.m_kernel;
-        uint64_t user = m_user - x.m_user;
-        uint64_t total_utilization = kernel + user - idle;
-        return std::chrono::microseconds(total_utilization / 10);
-    }
-
-private:
-    void set_to_now();
-    static size_t read_cores();
-
-private:
-    uint64_t m_idle = 0;
-    uint64_t m_kernel = 0;
-    uint64_t m_user = 0;
-};
-
-
 
 
 
diff --git a/SerialPrograms/Source/CommonFramework/Environment/Environment_Windows.tpp b/SerialPrograms/Source/CommonFramework/Environment/Environment_Windows.tpp
index 8d47d8c703..e9b5c7f5f3 100644
--- a/SerialPrograms/Source/CommonFramework/Environment/Environment_Windows.tpp
+++ b/SerialPrograms/Source/CommonFramework/Environment/Environment_Windows.tpp
@@ -6,12 +6,9 @@
 
 #ifdef _WIN32
 
-#include <map>
-#include <iostream>
-#include <thread>
 #include <Windows.h>
 #include "Common/Cpp/Exceptions.h"
-#include "CommonFramework/Logging/Logger.h"
+#include "Common/Cpp/Logging/AbstractLogger.h"
 #include "Environment.h"
 #include "Environment_Windows.h"
 
@@ -30,29 +27,9 @@ namespace PokemonAutomation{
 
 
 
-class WinApiHandleHolder{
-public:
-    WinApiHandleHolder(const WinApiHandleHolder& x) = delete;
-    void operator=(const WinApiHandleHolder& x) = delete;
-    ~WinApiHandleHolder(){
-        CloseHandle(m_handle);
-    }
-    WinApiHandleHolder(HANDLE handle)
-        : m_handle(handle)
-    {}
-    operator HANDLE() const{
-        return m_handle;
-    }
-
-private:
-    HANDLE m_handle;
-};
-
 
-
-
-const EnumDatabase<ThreadPriority>& PRIORITY_DATABASE(){
-    static EnumDatabase<ThreadPriority> database({
+const EnumDropdownDatabase<ThreadPriority>& PRIORITY_DATABASE(){
+    static EnumDropdownDatabase<ThreadPriority> database({
         {ThreadPriority::Realtime,      "realtime",     "Realtime"},
         {ThreadPriority::High,          "high",         "High"},
         {ThreadPriority::AboveNormal,   "above-normal", "Above Normal"},
@@ -63,119 +40,43 @@ const EnumDatabase<ThreadPriority>& PRIORITY_DATABASE(){
     return database;
 }
 
-bool set_thread_priority(ThreadPriority priority){
-    DWORD native_priority;
+bool set_thread_priority(Logger& logger, ThreadPriority priority){
+    int native_priority;
     switch (priority){
     case ThreadPriority::Realtime:
-        native_priority = REALTIME_PRIORITY_CLASS;
+        native_priority = THREAD_PRIORITY_TIME_CRITICAL;
         break;
     case ThreadPriority::High:
-        native_priority = HIGH_PRIORITY_CLASS;
+        native_priority = THREAD_PRIORITY_HIGHEST;
         break;
     case ThreadPriority::AboveNormal:
-        native_priority = ABOVE_NORMAL_PRIORITY_CLASS;
+        native_priority = THREAD_PRIORITY_ABOVE_NORMAL;
         break;
     case ThreadPriority::Normal:
-        native_priority = NORMAL_PRIORITY_CLASS;
+        native_priority = THREAD_PRIORITY_NORMAL;
         break;
     case ThreadPriority::BelowNormal:
-        native_priority = BELOW_NORMAL_PRIORITY_CLASS;
+        native_priority = THREAD_PRIORITY_BELOW_NORMAL;
         break;
     case ThreadPriority::Low:
-        native_priority = IDLE_PRIORITY_CLASS;
+        native_priority = THREAD_PRIORITY_IDLE;
         break;
     default:
         throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Invalid Priority: " + std::to_string((int)priority));
     }
-    if (SetPriorityClass(GetCurrentProcess(), native_priority)){
+    if (SetThreadPriority(GetCurrentThread(), native_priority)){
 //        cout << "Thread priority set to: " + PRIORITY_DATABASE().find(priority)->display << endl;
-        global_logger_tagged().log("Thread priority set to: " + PRIORITY_DATABASE().find(priority)->display, COLOR_BLUE);
+        logger.log("Thread priority set to: " + PRIORITY_DATABASE().find(priority)->display, COLOR_BLUE);
         return true;
     }
     DWORD error = GetLastError();
-    global_logger_tagged().log("Unable to set process priority. Error Code = " + std::to_string(error), COLOR_RED);
+    logger.log("Unable to set thread priority. Error Code = " + std::to_string(error), COLOR_RED);
     return false;
 }
 
 
 
 
-ThreadHandle::ThreadHandle(ThreadHandle&& x) = default;
-ThreadHandle& ThreadHandle::operator=(ThreadHandle&& x) = default;
-ThreadHandle::ThreadHandle(const ThreadHandle& x) = default;
-ThreadHandle& ThreadHandle::operator=(const ThreadHandle& x) = default;
-ThreadHandle::~ThreadHandle() = default;
-ThreadHandle::ThreadHandle(std::shared_ptr<WinApiHandleHolder> ptr)
-    : m_ptr(std::move(ptr))
-{}
-
-
-
-ThreadHandle current_thread_handle(){
-    DWORD id = GetCurrentThreadId();
-    HANDLE handle = OpenThread(THREAD_QUERY_LIMITED_INFORMATION, false, id);
-//    cout << handle << endl;
-    if (handle == NULL){
-        return ThreadHandle();
-    }
-    return ThreadHandle{std::make_shared<WinApiHandleHolder>(handle)};
-}
-WallClock::duration thread_cpu_time(const ThreadHandle& handle){
-    FILETIME creation_time;
-    FILETIME exit_time;
-    FILETIME kernel_time;
-    FILETIME user_time;
-
-    if (!handle.m_ptr){
-        return WallClock::duration::min();
-    }
-
-    if (!GetThreadTimes(*handle.m_ptr, &creation_time, &exit_time, &kernel_time, &user_time)){
-        return WallClock::duration::min();
-    }
-
-    uint64_t nanos = user_time.dwLowDateTime + ((uint64_t)user_time.dwHighDateTime << 32);
-    nanos *= 100;
-    return std::chrono::duration_cast<WallClock::duration>(std::chrono::nanoseconds(nanos));
-}
-
-
-
-
-
-
-
-
-SystemCpuTime SystemCpuTime::now(){
-    SystemCpuTime ret;
-    ret.set_to_now();
-    return ret;
-}
-size_t SystemCpuTime::vcores(){
-    static size_t cores = read_cores();
-    return cores;
-}
-void SystemCpuTime::set_to_now(){
-    FILETIME idle_time, kernel_time, user_time;
-    if (GetSystemTimes(&idle_time, &kernel_time, &user_time)){
-        m_idle = idle_time.dwLowDateTime + ((uint64_t)idle_time.dwHighDateTime << 32);
-        m_kernel = kernel_time.dwLowDateTime + ((uint64_t)kernel_time.dwHighDateTime << 32);
-        m_user = user_time.dwLowDateTime + ((uint64_t)user_time.dwHighDateTime << 32);
-    }else{
-        m_idle = 0;
-        m_kernel = 0;
-        m_user = 0;
-    }
-}
-size_t SystemCpuTime::read_cores(){
-    size_t cores = 0;
-    WORD total_groups = GetActiveProcessorGroupCount();
-    for (WORD group = 0; group < total_groups; group++){
-        DWORD processors_within_group = GetActiveProcessorCount(group);
-        cores += processors_within_group;
-    }
-    return cores;
-}
 
 
 
diff --git a/SerialPrograms/Source/CommonFramework/Environment/Environment_arm64_Linux.tpp b/SerialPrograms/Source/CommonFramework/Environment/Environment_arm64_Linux.tpp
deleted file mode 100644
index 40a095bb3d..0000000000
--- a/SerialPrograms/Source/CommonFramework/Environment/Environment_arm64_Linux.tpp
+++ /dev/null
@@ -1,51 +0,0 @@
-/*  Environment (arm64 Linux)
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- *  Currently only used for M-series Apple environment
- */
-
-
-#include <stdio.h>
-#include <stdint.h>
-#include <sys/sysctl.h>
-
-#include "Environment.h"
-
-namespace PokemonAutomation{
-
-
-uint64_t get_cpu_freq()
-{
-    uint64_t freq = 0;
-    size_t size = sizeof(freq);
-
-    if (sysctlbyname("hw.cpufrequency", &freq, &size, NULL, 0) < 0)
-    {
-        perror("sysctl");
-    }
-    return freq;
-}
-
-std::string get_processor_name(){
-    char name_buffer[100] = "";
-    size_t size = 100;
-    if (sysctlbyname("machdep.cpu.brand_string", name_buffer, &size, NULL, 0) < 0)
-    {
-        perror("sysctl");
-    }
-    return name_buffer;
-}
-
-
-ProcessorSpecs get_processor_specs(){
-    ProcessorSpecs specs;
-    specs.name = get_processor_name();
-    specs.base_frequency = get_cpu_freq();
-    specs.threads = std::thread::hardware_concurrency();
-
-    return specs;
-}
-
-
-}
diff --git a/SerialPrograms/Source/CommonFramework/Environment/Environment_x86.tpp b/SerialPrograms/Source/CommonFramework/Environment/Environment_x86.tpp
deleted file mode 100644
index 597ae03e47..0000000000
--- a/SerialPrograms/Source/CommonFramework/Environment/Environment_x86.tpp
+++ /dev/null
@@ -1,52 +0,0 @@
-/*  Environment (x86)
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Cpp/CpuId/CpuId_x86.h"
-#include "Environment.h"
-
-namespace PokemonAutomation{
-
-
-uint64_t x86_measure_rdtsc_ticks_per_sec();
-
-
-void x86_CleanCPUName(char name[49]){
-    size_t c0 = 0;
-    size_t c1 = 0;
-    bool space_flag = true;
-    while (c1 < 48){
-        if (space_flag && name[c1] == ' '){
-            c1++;
-            continue;
-        }
-        space_flag = name[c1] == ' ';
-        name[c0++] = name[c1++];
-    }
-
-    while (c0 < 48){
-        name[c0++] = '\0';
-    }
-}
-std::string get_processor_name(){
-    union{
-        uint32_t reg[12];
-        char name[49];
-    };
-    x86_cpuid(reg + 0, 0x80000002, 0);
-    x86_cpuid(reg + 4, 0x80000003, 0);
-    x86_cpuid(reg + 8, 0x80000004, 0);
-
-    x86_CleanCPUName(name);
-    return name;
-}
-uint64_t x86_rdtsc_ticks_per_sec(){
-    static uint64_t cached = x86_measure_rdtsc_ticks_per_sec();
-    return cached;
-}
-
-
-
-}
diff --git a/SerialPrograms/Source/CommonFramework/Environment/Environment_x86_Linux.tpp b/SerialPrograms/Source/CommonFramework/Environment/Environment_x86_Linux.tpp
deleted file mode 100644
index 861fbbce23..0000000000
--- a/SerialPrograms/Source/CommonFramework/Environment/Environment_x86_Linux.tpp
+++ /dev/null
@@ -1,121 +0,0 @@
-/*  Environment (x86 Linux)
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <set>
-#include <map>
-#include <thread>
-#include <fstream>
-#include <iostream>
-#include <sys/types.h>
-#include <unistd.h>
-#include <sched.h>
-#include "Common/Cpp/Exceptions.h"
-#include "Common/Cpp/Time.h"
-#include "CommonFramework/Logging/Logger.h"
-#include "Environment.h"
-
-#ifndef cpuid_H
-#define cpuid_H
-#include <cpuid.h>
-#endif
-
-#include "Environment.h"
-
-namespace PokemonAutomation{
-
-
-uint64_t x86_rdtsc(){
-    unsigned int lo, hi;
-    __asm__ volatile ("rdtsc" : "=a" (lo), "=d" (hi));
-    return ((uint64_t)hi << 32) | lo;
-}
-
-
-
-uint64_t x86_measure_rdtsc_ticks_per_sec(){
-//    Time::WallClock w_start = Time::WallClock::Now();
-    auto w_start = current_time();
-    uint64_t r_start = x86_rdtsc();
-    while (current_time() - w_start < std::chrono::microseconds(62500));
-    auto w_end = current_time();
-//    while (w_start.SecondsElapsed() < 0.0625);
-//    Time::WallClock w_end = Time::WallClock::Now();
-    uint64_t r_end = x86_rdtsc();
-
-    auto elapsed = std::chrono::duration_cast<std::chrono::microseconds>(w_end - w_start);
-    double seconds = (double)elapsed.count() / 1000000.;
-
-    return (uint64_t)((double)(r_end - r_start) / seconds);
-}
-
-
-
-
-
-ProcessorSpecs get_processor_specs(){
-    ProcessorSpecs specs;
-    specs.name = get_processor_name();
-    specs.base_frequency = x86_rdtsc_ticks_per_sec();
-    specs.threads = std::thread::hardware_concurrency();
-
-#ifdef __linux
-    //  Cores + Sockets
-    {
-//        std::set<int> cores;
-        std::set<int> sockets;
-
-        int current_socket = 0;
-        std::map<int, std::set<int>> cores_per_socket;
-
-        std::ifstream file("/proc/cpuinfo");
-        std::string line;
-        while (std::getline(file, line)){
-            if (line.find("physical id") == 0){
-                size_t pos = line.find(": ");
-                if (pos == std::string::npos){
-                    throw InternalSystemError(nullptr, PA_CURRENT_FUNCTION, "Unable to parse: /proc/cpuinfo");
-                }
-                current_socket = atoi(&line[pos + 2]);
-                sockets.insert(current_socket);
-            }
-            if (line.find("core id") == 0){
-                size_t pos = line.find(": ");
-                if (pos == std::string::npos){
-                    throw InternalSystemError(nullptr, PA_CURRENT_FUNCTION, "Unable to parse: /proc/cpuinfo");
-                }
-//                specs.threads++;
-                int core = atoi(&line[pos + 2]);
-                cores_per_socket[current_socket].insert(core);
-//                cores.insert(core);
-            }
-        }
-        specs.sockets = sockets.size();
-        specs.cores = 0;
-        for (const auto& socket : cores_per_socket){
-            specs.cores += socket.second.size();
-        }
-    }
-
-    //  NUMA Nodes
-    {
-        std::set<int> nodes;
-
-        std::ifstream file("/proc/zoneinfo");
-        std::string line;
-        while (std::getline(file, line)){
-            if (line.find("Node ") == 0){
-                nodes.insert(atoi(&line[5]));
-            }
-        }
-        specs.numa_nodes = nodes.size();
-    }
-#endif
-
-    return specs;
-}
-
-
-}
diff --git a/SerialPrograms/Source/CommonFramework/Environment/Environment_x86_Windows.tpp b/SerialPrograms/Source/CommonFramework/Environment/Environment_x86_Windows.tpp
deleted file mode 100644
index d4e44f343d..0000000000
--- a/SerialPrograms/Source/CommonFramework/Environment/Environment_x86_Windows.tpp
+++ /dev/null
@@ -1,139 +0,0 @@
-/*  Environment (x86 Windows)
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <Windows.h>
-
-#if __GNUC__
-#ifndef cpuid_H
-#define cpuid_H
-#include <cpuid.h>
-#endif
-#endif
-
-#include "Common/Cpp/Exceptions.h"
-#include "Environment.h"
-
-namespace PokemonAutomation{
-
-
-uint64_t x86_rdtsc(){
-    return __rdtsc();
-}
-
-
-uint64_t x86_measure_rdtsc_ticks_per_sec(){
-    HANDLE thread = GetCurrentThread();
-
-    GROUP_AFFINITY before_affinity;
-    if (GetThreadGroupAffinity(thread, &before_affinity) == 0){
-        throw InternalSystemError(nullptr, PA_CURRENT_FUNCTION, "GetThreadGroupAffinity() failed: Unable to read thread affinity.");
-    }
-
-    KAFFINITY t = 1;
-    while ((t & before_affinity.Mask) == 0){
-        t <<= 1;
-    }
-
-    GROUP_AFFINITY placeholder;
-    GROUP_AFFINITY new_affinity = before_affinity;
-    new_affinity.Mask = t;
-    if (SetThreadGroupAffinity(thread, &new_affinity, &placeholder) == 0){
-        throw InternalSystemError(nullptr, PA_CURRENT_FUNCTION, "SetThreadGroupAffinity() failed: Unable to set Affinity Mask.");
-
-    }
-
-    LARGE_INTEGER frequency;
-    if (!QueryPerformanceFrequency(&frequency)){
-        throw InternalSystemError(nullptr, PA_CURRENT_FUNCTION, "QueryPerformanceFrequency() failed: Unable to measure clock speed.");
-    }
-    uint64_t freq = frequency.QuadPart;
-    freq >>= 4;
-
-
-    uint64_t start_cycles = __rdtsc();
-
-    LARGE_INTEGER start_timer;
-    if (!QueryPerformanceCounter(&start_timer)){
-        throw InternalSystemError(nullptr, PA_CURRENT_FUNCTION, "QueryPerformanceCounter() failed: Unable to measure clock speed.");
-    }
-    LARGE_INTEGER current_timer;
-    do {
-        if (!QueryPerformanceCounter(&current_timer)){
-            throw InternalSystemError(nullptr, PA_CURRENT_FUNCTION, "QueryPerformanceCounter() failed: Unable to measure clock speed.");
-        }
-    }while ((uint64_t)current_timer.QuadPart - (uint64_t)start_timer.QuadPart < freq);
-
-    uint64_t end_cycles = __rdtsc();
-
-    if (SetThreadGroupAffinity(thread, &before_affinity, &placeholder) == 0){
-        throw InternalSystemError(nullptr, PA_CURRENT_FUNCTION, "SetThreadGroupAffinity() failed: Unable to set Affinity Mask.");
-    }
-
-    double cycle_dif = (double)(end_cycles - start_cycles);
-    double timer_dif = (double)((uint64_t)current_timer.QuadPart - (uint64_t)start_timer.QuadPart);
-
-    return (uint64_t)(cycle_dif / timer_dif * frequency.QuadPart);
-}
-
-
-
-
-
-ProcessorSpecs get_processor_specs(){
-    ProcessorSpecs specs;
-    specs.name = get_processor_name();
-    specs.base_frequency = x86_rdtsc_ticks_per_sec();
-
-    DWORD bytes = 0;
-    GetLogicalProcessorInformationEx(LOGICAL_PROCESSOR_RELATIONSHIP::RelationAll, nullptr, &bytes);
-    if (GetLastError() != ERROR_INSUFFICIENT_BUFFER){
-        throw InternalSystemError(nullptr, PA_CURRENT_FUNCTION, "GetLogicalProcessorInformationEx() failed.");
-    }
-
-    std::vector<char> ptr(bytes);
-    if (!GetLogicalProcessorInformationEx(LOGICAL_PROCESSOR_RELATIONSHIP::RelationAll, (SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX*)ptr.data(), &bytes)){
-        throw InternalSystemError(nullptr, PA_CURRENT_FUNCTION, "GetLogicalProcessorInformationEx() failed.");
-    }
-
-    std::map<size_t, KAFFINITY> group_masks;
-
-    for (size_t c = 0; c < bytes;){
-        const SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX& info = *(const SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX*)(ptr.data() + c);
-        switch (info.Relationship){
-        case LOGICAL_PROCESSOR_RELATIONSHIP::RelationProcessorCore:
-            for (size_t g = 0; g < info.Processor.GroupCount; g++){
-                const GROUP_AFFINITY& affinity = info.Processor.GroupMask[g];
-                group_masks[affinity.Group] |= affinity.Mask;
-            }
-            specs.cores++;
-            break;
-        case LOGICAL_PROCESSOR_RELATIONSHIP::RelationProcessorPackage:
-            specs.sockets++;
-            break;
-        case LOGICAL_PROCESSOR_RELATIONSHIP::RelationNumaNode:
-            specs.numa_nodes++;
-            break;
-        default:;
-        }
-        c += info.Size;
-    }
-
-    if (group_masks.size() == 0){
-        specs.threads = std::thread::hardware_concurrency();
-    }else{
-        for (const auto& group : group_masks){
-            specs.threads += _mm_popcnt_u64(group.second);
-        }
-    }
-
-    return specs;
-}
-
-
-
-
-
-}
diff --git a/SerialPrograms/Source/CommonFramework/Environment/HardwareValidation.cpp b/SerialPrograms/Source/CommonFramework/Environment/HardwareValidation.cpp
index 348edf8fb8..8f3c9293c9 100644
--- a/SerialPrograms/Source/CommonFramework/Environment/HardwareValidation.cpp
+++ b/SerialPrograms/Source/CommonFramework/Environment/HardwareValidation.cpp
@@ -1,6 +1,6 @@
 /*  Hardware Validation
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/CommonFramework/Environment/HardwareValidation.h b/SerialPrograms/Source/CommonFramework/Environment/HardwareValidation.h
index c1aec51fc8..f9f6f5d1ff 100644
--- a/SerialPrograms/Source/CommonFramework/Environment/HardwareValidation.h
+++ b/SerialPrograms/Source/CommonFramework/Environment/HardwareValidation.h
@@ -1,6 +1,6 @@
 /*  Hardware Validation
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -9,7 +9,9 @@
 
 namespace PokemonAutomation{
 
-
+// Check user hardware.
+// If the hardware is too old, send a QMessageBox to tell user and return false.
+// If the hardware may not be powerful enough, send a QMessageBox to inform user.
 bool check_hardware();
 
 
diff --git a/SerialPrograms/Source/CommonFramework/Environment/HardwareValidation_x86.tpp b/SerialPrograms/Source/CommonFramework/Environment/HardwareValidation_x86.tpp
index 3c96afecc7..361ea8765c 100644
--- a/SerialPrograms/Source/CommonFramework/Environment/HardwareValidation_x86.tpp
+++ b/SerialPrograms/Source/CommonFramework/Environment/HardwareValidation_x86.tpp
@@ -4,11 +4,10 @@
  *
  */
 
-#include <thread>
 #include <QMessageBox>
 #include "Common/Cpp/PrettyPrint.h"
 #include "Common/Cpp/CpuId/CpuId.h"
-#include "Environment.h"
+#include "Common/Cpp/Hardware/Hardware.h"
 #include "HardwareValidation.h"
 
 namespace PokemonAutomation{
@@ -53,7 +52,7 @@ bool check_hardware(){
         box.warning(nullptr, "Warning", str);
     }
 
-    if (specs.base_frequency < 1'500'000'000){
+    if (specs.base_frequency < 2'000'000'000){
         QMessageBox box;
         QString str;
         str += "This computer may not be powerful enough to run this program.<br><br>";
@@ -71,7 +70,7 @@ bool check_hardware(){
         ? specs.threads - specs.cores
         : 0;
     double efreq = (specs.cores + 0.2 * vcores) * specs.base_frequency;
-    if (efreq < 6'000'000'000){
+    if (efreq < 8'000'000'000){
         QMessageBox box;
         QString str;
         str += "This computer may not be powerful enough to run this program.<br><br>";
diff --git a/SerialPrograms/Source/CommonFramework/Environment/SystemSleep.cpp b/SerialPrograms/Source/CommonFramework/Environment/SystemSleep.cpp
new file mode 100644
index 0000000000..3988946c81
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/Environment/SystemSleep.cpp
@@ -0,0 +1,88 @@
+/*  OS Sleep
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "SystemSleep.h"
+
+#if 0
+#elif _WIN32
+#include "SystemSleep_Windows.tpp"
+#elif __APPLE__
+#include "SystemSleep_Apple.tpp"
+#elif __linux__
+#include "SystemSleep_Linux.tpp"
+#else
+namespace PokemonAutomation{
+    SystemSleepController& SystemSleepController::instance(){
+        static SystemSleepController controller;
+        return controller;
+    }
+}
+#endif
+
+namespace PokemonAutomation{
+
+
+
+SystemSleepController::SystemSleepController()
+    : m_state(SleepSuppress::NONE)
+{}
+
+void SystemSleepController::add_listener(Listener& listener){
+    m_listeners.add(listener);
+}
+void SystemSleepController::remove_listener(Listener& listener){
+    m_listeners.remove(listener);
+}
+void SystemSleepController::notify_listeners(SleepSuppress state){
+    m_listeners.run_method(&Listener::sleep_suppress_state_changed, state);
+}
+
+SleepSuppress SystemSleepController::current_state() const{
+    return m_state.load(std::memory_order_relaxed);
+}
+
+
+
+
+
+
+
+void SleepSuppressScope::clear(){
+    switch (m_mode){
+    case SleepSuppress::NONE:
+        break;
+    case SleepSuppress::NO_SLEEP:
+        SystemSleepController::instance().pop_no_sleep();
+        break;
+    case SleepSuppress::SCREEN_ON:
+        SystemSleepController::instance().pop_screen_on();
+        break;
+    }
+        m_mode = SleepSuppress::NONE;
+}
+void SleepSuppressScope::operator=(SleepSuppress mode){
+    clear();
+    set(mode);
+}
+void SleepSuppressScope::set(SleepSuppress mode){
+    switch (mode){
+    case SleepSuppress::NONE:
+        break;
+    case SleepSuppress::NO_SLEEP:
+        SystemSleepController::instance().push_no_sleep();
+        break;
+    case SleepSuppress::SCREEN_ON:
+        SystemSleepController::instance().push_screen_on();
+        break;
+    }
+    m_mode = mode;
+}
+
+
+
+
+}
+
diff --git a/SerialPrograms/Source/CommonFramework/Environment/SystemSleep.h b/SerialPrograms/Source/CommonFramework/Environment/SystemSleep.h
new file mode 100644
index 0000000000..e1baa464ff
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/Environment/SystemSleep.h
@@ -0,0 +1,112 @@
+/*  System Sleep
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_SystemSleep_H
+#define PokemonAutomation_SystemSleep_H
+
+#include <atomic>
+#include "Common/Cpp/ListenerSet.h"
+#include "Common/Cpp/Concurrency/Mutex.h"
+
+#if _WIN32
+#define PA_ENABLE_SLEEP_SUPPRESS
+#define PA_ENABLE_SLEEP_SUPPRESS_NO_SLEEP
+#endif
+#if __APPLE__
+#define PA_ENABLE_SLEEP_SUPPRESS
+#define PA_ENABLE_SLEEP_SUPPRESS_NO_SLEEP
+#endif
+
+
+namespace PokemonAutomation{
+
+
+
+enum class SleepSuppress{
+    NONE,
+    NO_SLEEP,
+    SCREEN_ON,
+};
+
+
+//  Call OS API to prevent screen saver from running and OS from going to sleep.
+//  Useful for running some programs like PokemonSV_VideoFastCodeEntry that require
+//  the screen to be constantly on.
+class SystemSleepController{
+public:
+    struct Listener{
+        virtual void sleep_suppress_state_changed(SleepSuppress new_state) = 0;
+    };
+    void add_listener(Listener& listener);
+    void remove_listener(Listener& listener);
+
+
+protected:
+    SystemSleepController();
+    virtual ~SystemSleepController() = default;
+
+    //  Must be called under lock.
+    void notify_listeners(SleepSuppress state);
+
+
+public:
+    static SystemSleepController& instance();
+
+    virtual void stop() noexcept{}
+
+    SleepSuppress current_state() const;
+
+    //  Push: Add a request for this type of sleep-disable.
+    //  Pop: Remove a request for this type of sleep-disable.
+    //  The sleep-disable will be active as long as there is at least one
+    //  request is active for that type.
+
+    //  Keep the screen on and prevent sleep.
+    virtual void push_screen_on(){}
+    virtual void pop_screen_on(){}
+
+    //  Allow the screen to turn off, but don't sleep.
+    virtual void push_no_sleep(){}
+    virtual void pop_no_sleep(){}
+
+
+protected:
+    std::atomic<SleepSuppress> m_state;
+
+    Mutex m_lock;
+    ListenerSet<Listener> m_listeners;
+};
+
+
+
+
+
+class SleepSuppressScope{
+public:
+    SleepSuppressScope(SleepSuppress mode){
+        set(mode);
+    }
+    ~SleepSuppressScope(){
+        clear();
+    }
+    SleepSuppressScope(const SleepSuppressScope&) = delete;
+    void operator=(const SleepSuppressScope&) = delete;
+
+    void clear();
+    void operator=(SleepSuppress mode);
+
+private:
+    void set(SleepSuppress mode);
+
+private:
+    SleepSuppress m_mode;
+};
+
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/Environment/SystemSleep_Apple.tpp b/SerialPrograms/Source/CommonFramework/Environment/SystemSleep_Apple.tpp
new file mode 100644
index 0000000000..3c39b0ac7d
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/Environment/SystemSleep_Apple.tpp
@@ -0,0 +1,135 @@
+/*  OS Sleep (Apple)
+ *
+ *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *
+ */
+
+#include <mutex>
+#include <IOKit/pwr_mgt/IOPMLib.h>
+#include "CommonFramework/Logging/Logger.h"
+#include "SystemSleep.h"
+
+namespace PokemonAutomation{
+
+
+
+class AppleSleepController final : public SystemSleepController{
+public:
+    virtual ~AppleSleepController(){
+        stop();
+    }
+    virtual void stop() noexcept override{
+        std::lock_guard<Mutex> lg(m_lock);
+        update_state(SleepSuppress::NONE);
+    }
+    virtual void push_screen_on() override{
+        std::lock_guard<Mutex> lg(m_lock);
+        update_state(SleepSuppress::SCREEN_ON);
+    }
+    virtual void pop_screen_on() override{
+        std::lock_guard<Mutex> lg(m_lock);
+        update_state(SleepSuppress::NONE);
+    }
+    virtual void push_no_sleep() override{
+        std::lock_guard<Mutex> lg(m_lock);
+        update_state(SleepSuppress::NO_SLEEP);
+    }
+    virtual void pop_no_sleep() override{
+        std::lock_guard<Mutex> lg(m_lock);
+        update_state(SleepSuppress::NONE);
+    }
+
+
+private:
+    void update_state(SleepSuppress state); // call after holding the lock
+    bool disable_sleep(CFStringRef prevention_type); // call after holding the lock
+    bool enable_sleep(); // call after holding the lock
+
+    IOPMAssertionID m_session_id = kIOPMNullAssertionID;
+};
+
+
+bool AppleSleepController::disable_sleep(CFStringRef prevention_type){
+    if (m_session_id != kIOPMNullAssertionID){ // already disabled
+        return true;
+    }
+    auto ret = IOPMAssertionCreateWithDescription(
+        prevention_type,
+        CFSTR("SerialPrograms"),
+        CFSTR("SerialPrograms is running"),
+        nullptr,
+        nullptr,
+        0,
+        nullptr, &m_session_id
+    );
+    if (ret != kIOReturnSuccess){
+        m_session_id = kIOPMNullAssertionID;
+        global_logger_tagged().log("Unable to disaable sleep. Error code " + std::to_string(ret), COLOR_RED);
+        return false;
+    }
+    return true;
+}
+
+bool AppleSleepController::enable_sleep(){
+    if (m_session_id != kIOPMNullAssertionID){
+        auto ret = IOPMAssertionRelease(m_session_id);
+        if (ret != kIOReturnSuccess){
+            global_logger_tagged().log("Unable to enable sleep. Error code " + std::to_string(ret), COLOR_RED);
+            return false;
+        }
+        m_session_id = kIOPMNullAssertionID;
+    }
+    return true;
+}
+
+
+
+void AppleSleepController::update_state(SleepSuppress state){
+    SleepSuppress before_state = m_state.load(std::memory_order_relaxed);
+
+    // kIOPMAssertPreventUserIdleSystemSleep:
+    //    Prevents the system from sleeping automatically due to a lack of user activity.
+    // kIOPMAssertPreventUserIdleDisplaySleep:
+    //    Prevents the display from dimming automatically.
+    // kIOPMAssertionTypeNoDisplaySleep prevents display sleep - Deprecated in 10.7
+    // kIOPMAssertionTypeNoIdleSleep prevents idle sleep - Deprecated in 10.7
+
+    switch (state){
+    case SleepSuppress::NONE:
+        if (enable_sleep()){
+            global_logger_tagged().log("Enabled display sleep and OS sleep.", COLOR_BLUE);
+        }
+        break;
+    case SleepSuppress::NO_SLEEP:
+        global_logger_tagged().log("Disabling OS sleep...", COLOR_BLUE);
+        if (disable_sleep(kIOPMAssertPreventUserIdleSystemSleep)){
+            global_logger_tagged().log("Disabled OS sleep.", COLOR_BLUE);
+        }
+        break;
+    case SleepSuppress::SCREEN_ON:
+        global_logger_tagged().log("Disabling display sleep and OS sleep...", COLOR_BLUE);
+        if (disable_sleep(kIOPMAssertPreventUserIdleDisplaySleep)){
+            global_logger_tagged().log("Disabled display sleep and OS sleep.", COLOR_BLUE);
+        }
+        break;
+    }
+
+    m_state.store(state, std::memory_order_release);
+
+    if (before_state != state){
+        notify_listeners(state);
+    }
+}
+
+
+SystemSleepController& SystemSleepController::instance(){
+    static AppleSleepController controller;
+    return controller;
+}
+
+
+
+
+
+
+}
diff --git a/SerialPrograms/Source/CommonFramework/Environment/SystemSleep_Linux.tpp b/SerialPrograms/Source/CommonFramework/Environment/SystemSleep_Linux.tpp
new file mode 100644
index 0000000000..a6940957ed
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/Environment/SystemSleep_Linux.tpp
@@ -0,0 +1,165 @@
+/*  OS Sleep (Linux)
+ *
+ *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *
+ */
+
+#include <sdbus-c++/sdbus-c++.h>
+#include "Common/Cpp/Concurrency/ConditionVariable.h"
+#include "Common/Cpp/Concurrency/AsyncTask.h"
+#include "Common/Cpp/Concurrency/ThreadPool.h"
+#include "CommonFramework/Logging/Logger.h"
+#include "CommonFramework/Tools/GlobalThreadPools.h"
+#include "SystemSleep.h"
+
+namespace PokemonAutomation{
+
+
+class LinuxSleepController final : public SystemSleepController{
+public:
+    LinuxSleepController()
+        : m_screen_on_requests(0)
+        , m_no_sleep_requests(0)
+        , m_stopping(false)
+        , m_thread(GlobalThreadPools::unlimited_normal().dispatch_now_blocking(
+            [this]{ thread_loop(); })
+        )
+    {}
+    virtual ~LinuxSleepController(){
+        stop();
+    }
+    virtual void stop() noexcept override{
+        if (!m_thread){
+            return;
+        }
+        {
+            std::lock_guard<Mutex> lg(m_lock);
+            m_stopping = true;
+        }
+        m_cv.notify_all();
+        m_thread.wait_and_ignore_exceptions();
+        m_inhibit_fd.reset();
+        if (m_state.load(std::memory_order_relaxed) != SleepSuppress::NONE){
+            try{
+                global_logger_tagged().log(
+                    "Destroying LinuxSleepController with active requests...",
+                    COLOR_RED
+                );
+            }catch (...){}
+        }
+    }
+
+    virtual void push_screen_on() override{
+        std::lock_guard<Mutex> lg(m_lock);
+        m_screen_on_requests++;
+        m_cv.notify_all();
+    }
+    virtual void pop_screen_on() override{
+        std::lock_guard<Mutex> lg(m_lock);
+        m_screen_on_requests--;
+        m_cv.notify_all();
+    }
+    virtual void push_no_sleep() override{
+        std::lock_guard<Mutex> lg(m_lock);
+        m_no_sleep_requests++;
+        m_cv.notify_all();
+    }
+    virtual void pop_no_sleep() override{
+        std::lock_guard<Mutex> lg(m_lock);
+        m_no_sleep_requests--;
+        m_cv.notify_all();
+    }
+
+private:
+    void thread_loop()
+    {
+        auto connection = sdbus::createSystemBusConnection();
+        auto proxy = sdbus::createProxy(
+            *connection,
+            sdbus::BusName{"org.freedesktop.login1"},
+            sdbus::ObjectPath{"/org/freedesktop/login1"}
+        );
+
+        while (true)
+        {
+            std::unique_lock<std::mutex> lg(m_lock);
+            if (m_stopping)
+            {
+                return;
+            }
+
+            SleepSuppress before_state = m_state.load(std::memory_order_relaxed);
+            SleepSuppress after_state = SleepSuppress::NONE;
+
+            bool need_inhibit = false;
+            std::string what;
+            if (m_no_sleep_requests > 0)
+            {
+                need_inhibit = true;
+                what = "sleep";
+                after_state = SleepSuppress::NO_SLEEP;
+            }
+            else if (m_screen_on_requests > 0)
+            {
+                need_inhibit = true;
+                what = "idle";
+                after_state = SleepSuppress::SCREEN_ON;
+            }
+            if (need_inhibit && !m_inhibit_fd)
+            {
+                try
+                {
+                    sdbus::UnixFd fd;
+                    proxy->callMethod("Inhibit")
+                        .onInterface("org.freedesktop.login1.Manager")
+                        .withArguments(what, "PokemonAutomation", "Keeping system awake", "block")
+                        .storeResultsTo(fd);
+                    m_inhibit_fd = std::make_unique<sdbus::UnixFd>(std::move(fd));
+
+                    global_logger_tagged().log("Acquired sleep inhibitor", COLOR_BLUE);
+                }
+
+                catch (const sdbus::Error &e)
+                {
+                    global_logger_tagged().log(std::string("DBus error: ") + e.what(), COLOR_RED);
+                }
+            }
+            else if (!need_inhibit && m_inhibit_fd)
+            {
+                m_inhibit_fd.reset();
+                global_logger_tagged().log("Released sleep inhibitor", COLOR_BLUE);
+            }
+
+            if (before_state != after_state)
+            {
+                m_state.store(after_state, std::memory_order_release);
+                notify_listeners(after_state);
+            }
+
+            m_cv.wait(lg);
+        }
+    }
+
+private:
+    size_t m_screen_on_requests = 0;
+    size_t m_no_sleep_requests = 0;
+
+    bool m_stopping;
+    ConditionVariable m_cv;
+    AsyncTask m_thread;
+
+    std::unique_ptr<sdbus::UnixFd> m_inhibit_fd;
+};
+
+
+SystemSleepController& SystemSleepController::instance(){
+    static LinuxSleepController controller;
+    return controller;
+}
+
+
+
+
+
+
+}
diff --git a/SerialPrograms/Source/CommonFramework/Environment/SystemSleep_Windows.tpp b/SerialPrograms/Source/CommonFramework/Environment/SystemSleep_Windows.tpp
new file mode 100644
index 0000000000..d4f1610d9c
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/Environment/SystemSleep_Windows.tpp
@@ -0,0 +1,141 @@
+/*  OS Sleep (Windows)
+ *
+ *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *
+ */
+
+#include <Windows.h>
+#include "Common/Cpp/Concurrency/ConditionVariable.h"
+#include "Common/Cpp/Concurrency/AsyncTask.h"
+#include "Common/Cpp/Concurrency/ThreadPool.h"
+#include "CommonFramework/Logging/Logger.h"
+#include "CommonFramework/Tools/GlobalThreadPools.h"
+#include "SystemSleep.h"
+
+namespace PokemonAutomation{
+
+
+class WindowsSleepController final : public SystemSleepController{
+public:
+    WindowsSleepController()
+        : m_screen_on_requests(0)
+        , m_no_sleep_requests(0)
+        , m_stopping(false)
+        , m_thread(GlobalThreadPools::unlimited_normal().dispatch_now_blocking(
+            [this]{ thread_loop(); })
+        )
+    {}
+    virtual ~WindowsSleepController(){
+        stop();
+    }
+    virtual void stop() noexcept override{
+        if (!m_thread){
+            return;
+        }
+        {
+            std::lock_guard<Mutex> lg(m_lock);
+            m_stopping = true;
+        }
+        m_cv.notify_all();
+        m_thread.wait_and_ignore_exceptions();
+        if (m_state.load(std::memory_order_relaxed) != SleepSuppress::NONE){
+            try{
+                global_logger_tagged().log(
+                    "Destroying WindowsSleepController with active requests...",
+                    COLOR_RED
+                );
+            }catch (...){}
+        }
+    }
+
+    virtual void push_screen_on() override{
+        std::lock_guard<Mutex> lg(m_lock);
+        m_screen_on_requests++;
+        m_cv.notify_all();
+    }
+    virtual void pop_screen_on() override{
+        std::lock_guard<Mutex> lg(m_lock);
+        m_screen_on_requests--;
+        m_cv.notify_all();
+    }
+    virtual void push_no_sleep() override{
+        std::lock_guard<Mutex> lg(m_lock);
+        m_no_sleep_requests++;
+        m_cv.notify_all();
+    }
+    virtual void pop_no_sleep() override{
+        std::lock_guard<Mutex> lg(m_lock);
+        m_no_sleep_requests--;
+        m_cv.notify_all();
+    }
+
+private:
+    void thread_loop(){
+        //  SetThreadExecutionState(ES_CONTINUOUS) only lasts as long as the
+        //  thread is alive. So we use our own thread.
+        while (true){
+            std::unique_lock<Mutex> lg(m_lock);
+            if (m_stopping){
+                return;
+            }
+
+            SleepSuppress before_state = m_state.load(std::memory_order_relaxed);
+            SleepSuppress after_state = SleepSuppress::NONE;
+
+            EXECUTION_STATE flags = ES_CONTINUOUS;
+            if (m_no_sleep_requests > 0){
+                flags |= ES_SYSTEM_REQUIRED | ES_AWAYMODE_REQUIRED;
+                after_state = SleepSuppress::NO_SLEEP;
+            }
+            if (m_screen_on_requests > 0){
+                flags |= ES_SYSTEM_REQUIRED | ES_DISPLAY_REQUIRED;
+                after_state = SleepSuppress::SCREEN_ON;
+            }
+            EXECUTION_STATE ret = SetThreadExecutionState(flags);
+            if (ret == 0){
+                global_logger_tagged().log("Unable to set system sleep state.", COLOR_RED);
+            }else{
+                switch (after_state){
+                case SleepSuppress::NONE:
+                    global_logger_tagged().log("Setting sleep state to: None", COLOR_BLUE);
+                    break;
+                case SleepSuppress::NO_SLEEP:
+                    global_logger_tagged().log("Setting sleep state to: No Sleep", COLOR_BLUE);
+                    break;
+                case SleepSuppress::SCREEN_ON:
+                    global_logger_tagged().log("Setting sleep state to: Screen On", COLOR_BLUE);
+                    break;
+                }
+
+                m_state.store(after_state, std::memory_order_release);
+
+                if (before_state != after_state){
+                    notify_listeners(after_state);
+                }
+            }
+
+            m_cv.wait(lg);
+        }
+    }
+
+private:
+    size_t m_screen_on_requests = 0;
+    size_t m_no_sleep_requests = 0;
+
+    bool m_stopping;
+    ConditionVariable m_cv;
+    AsyncTask m_thread;
+};
+
+
+SystemSleepController& SystemSleepController::instance(){
+    static WindowsSleepController controller;
+    return controller;
+}
+
+
+
+
+
+
+}
diff --git a/SerialPrograms/Source/CommonFramework/ErrorReports/CrashBacktrace.cpp b/SerialPrograms/Source/CommonFramework/ErrorReports/CrashBacktrace.cpp
new file mode 100644
index 0000000000..195ee37071
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/ErrorReports/CrashBacktrace.cpp
@@ -0,0 +1,116 @@
+/*  Crash Backtrace
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+
+#include "CrashBacktrace.h"
+
+#if defined(__APPLE__) || defined(__linux__)
+#include <cstdint>
+#include <cstdio>
+#include <cstring>
+#include <execinfo.h>
+#include <pthread.h>
+#include <signal.h>
+#include <sys/ucontext.h>
+#if defined(__linux__) && defined(__x86_64__)
+#include <sys/reg.h>
+#endif
+#include <unistd.h>
+
+namespace PokemonAutomation{
+
+//  On a fatal signal, dump the signal, the faulting address (where the
+//  signal carries one), the thread id, and a native backtrace of the
+//  crashing thread straight to the stderr file descriptor (fd 2,
+//  unbuffered). When stdout/stderr are piped (as in CI) the stdio buffers
+//  are lost when the process dies, and the app redirects std::cerr into
+//  its logger, so writing to fd 2 directly is the only way the output
+//  reliably reaches the CI log.
+//
+//  backtrace() and backtrace_symbols_fd() are not strictly async-signal-
+//  safe, so a re-entrancy guard stops a crash inside the handler from
+//  looping: if we re-enter, just die immediately.
+static void crash_backtrace_handler(int sig, siginfo_t* info, void* ucontext_raw){
+
+    //  The faulting program counter: the exact instruction that died.
+    uintptr_t pc = 0;
+    if (ucontext_raw != nullptr){
+        ucontext_t* ucontext = (ucontext_t*)ucontext_raw;
+        #if defined(__APPLE__)
+        //  On Apple, uc_mcontext is a pointer (struct __darwin_mcontext64 *).
+        #if defined(__x86_64__)
+            pc = ucontext->uc_mcontext->__ss.__rip;
+        #elif defined(__aarch64__)
+            pc = ucontext->uc_mcontext->__ss.__pc;
+        #endif
+        #elif defined(__linux__)
+        #if defined(__x86_64__)
+            pc = (uintptr_t)ucontext->uc_mcontext.gregs[REG_RIP];
+        #elif defined(__aarch64__)
+            pc = (uintptr_t)ucontext->uc_mcontext.pc;
+        #endif
+        #endif
+    }
+    static volatile sig_atomic_t in_handler = 0;
+    if (in_handler){
+        _exit(128 + sig);
+    }
+    in_handler = 1;
+
+    //  For SIGSEGV/SIGBUS, si_addr is the faulting virtual address: which
+    //  region the bad pointer landed in (stack, heap, a library) narrows
+    //  the corruption source a lot. For SIGABRT it is typically null.
+    char msg[160];
+    int len = snprintf(
+        msg,
+        sizeof(msg),
+        "\n[PA-CRASH] Fatal signal %d, pc 0x%lx, fault address 0x%lx, thread 0x%lx; backtrace:\n",
+        sig,
+        (unsigned long)pc,
+        (sig == SIGSEGV || sig == SIGBUS)
+            ? (unsigned long)(uintptr_t)info->si_addr
+            : 0UL,
+        (unsigned long)(uintptr_t)pthread_self()
+    );
+    if (len > 0){
+        if (write(2, msg, (size_t)len) < 0){
+            //  Nothing more we can do.
+        }
+    }
+
+    void* frames[128];
+    int n = backtrace(frames, 128);
+    //  Writes one symbolized frame per line to fd 2. glibc declares the
+    //  return type as int, Apple's as void; ignore it on both.
+    backtrace_symbols_fd(frames, n, 2);
+
+    //  Let the OS do its normal crash handling (crash report + exit code).
+    signal(sig, SIG_DFL);
+    raise(sig);
+}
+
+void install_crash_backtrace_handlers(){
+    static const int sigs[] = { SIGSEGV, SIGBUS, SIGABRT, SIGILL, SIGFPE };
+    for (int sig : sigs){
+        //  SA_SIGINFO so the handler gets the faulting address.
+        struct sigaction sa;
+        std::memset(&sa, 0, sizeof(sa));
+        sa.sa_sigaction = crash_backtrace_handler;
+        sa.sa_flags = SA_SIGINFO;
+        sigemptyset(&sa.sa_mask);
+        sigaction(sig, &sa, nullptr);
+    }
+}
+
+}
+
+
+#else
+namespace PokemonAutomation{
+    //  Not supported
+    void install_crash_backtrace_handlers(){}
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/ErrorReports/CrashBacktrace.h b/SerialPrograms/Source/CommonFramework/ErrorReports/CrashBacktrace.h
new file mode 100644
index 0000000000..2350b6ff78
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/ErrorReports/CrashBacktrace.h
@@ -0,0 +1,27 @@
+/*  Crash Backtrace
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+
+#ifndef PokemonAutomation_CrashBacktrace_H
+#define PokemonAutomation_CrashBacktrace_H
+
+namespace PokemonAutomation{
+
+
+//  Install handlers for the fatal signals (SIGSEGV/SIGBUS/SIGABRT/
+//  SIGILL/SIGFPE) that write the signal number, the faulting address
+//  (where the signal carries one), the crashing thread's id, and a
+//  native backtrace of the crashing thread straight to fd 2, then
+//  restore the default disposition and re-raise the signal so the OS
+//  still does its normal crash handling (crash report + exit code).
+//
+//  Apple/Linux only; a no-op elsewhere (Windows has its own crash
+//  handling in ProgramDumper).
+void install_crash_backtrace_handlers();
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/ErrorReports/ErrorReports.cpp b/SerialPrograms/Source/CommonFramework/ErrorReports/ErrorReports.cpp
new file mode 100644
index 0000000000..450c3e6398
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/ErrorReports/ErrorReports.cpp
@@ -0,0 +1,442 @@
+/*  Error Reports
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <iostream>
+#include <QMessageBox>
+#include "Common/Cpp/Filesystem/FileIO.h"
+#include "Common/Cpp/Filesystem/Filesystem.h"
+#include "Common/Cpp/PrettyPrint.h"
+#include "Common/Cpp/Logging/GlobalLogger.h"
+#include "Common/Cpp/Logging/LastLogTracker.h"
+#include "Common/Cpp/Json/JsonArray.h"
+#include "Common/Cpp/Json/JsonObject.h"
+#include "Common/Cpp/Concurrency/AsyncTask.h"
+#include "Common/Cpp/Hardware/Hardware.h"
+#include "Common/Cpp/ColoredText.h"
+#include "CommonFramework/Globals.h"
+#include "CommonFramework/StaticGlobals.h"
+#include "CommonFramework/GlobalAutoPaths.h"
+#include "CommonFramework/GlobalSettingsPanel.h"
+#include "CommonFramework/Logging/Logger.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/Recording/StreamHistorySession.h"
+#include "CommonFramework/Tools/GlobalThreadPools.h"
+#include "ProgramDumper.h"
+#include "ErrorReports.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+
+
+
+const std::string& ERROR_LOGS_NAME = "Logs.log";
+const std::string& ERROR_DUMP_NAME = "Minidump.dmp";
+const std::string& ERROR_PATH_UNSENT = "ErrorReportsLocal";
+const std::string& ERROR_PATH_SENT = "ErrorReportsSent";
+
+
+
+ErrorReportOption::ErrorReportOption()
+    : GroupOption(
+        "Error Reports",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        GroupOption::EnableMode::ALWAYS_ENABLED,
+        true,
+        false
+    )
+    , DESCRIPTION(
+        "Send error reports to the " + PROGRAM_NAME + " server to help them resolve issues and improve the program."
+    )
+    , SEND_MODE(
+        "<b>When to Send Error Reports:</b>",
+        {
+            {ErrorReportSendMode::SEND_AUTOMATICALLY,       "automatic",    "Send automatically."},
+            {ErrorReportSendMode::PROMPT_WHEN_CONVENIENT,   "prompt",       "Prompt when convenient."},
+            {ErrorReportSendMode::NEVER_SEND_ANYTHING,      "never",        "Never send error reports."},
+        },
+        LockMode::UNLOCK_WHILE_RUNNING,
+        IS_BETA_VERSION
+            ? ErrorReportSendMode::SEND_AUTOMATICALLY
+            : ErrorReportSendMode::PROMPT_WHEN_CONVENIENT
+    )
+    , SCREENSHOT(
+        "<b>Include Screenshots:</b>",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        true
+    )
+    , VIDEO(
+        "<b>Include Video:</b><br>Include a video leading up to the error. (if available)",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        true
+    )
+    , LOGS(
+        "<b>Include Logs:</b><br>Include the recent log leading up to the error.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        true
+    )
+    , DUMPS(
+        "<b>Include Dumps:</b><br>Include stack-trace and related information.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        true
+    )
+    , FILES(
+        "<b>Include Other Files:</b><br>Include other files that may be helpful for the developers.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        true
+    )
+{
+    PA_ADD_STATIC(DESCRIPTION);
+    PA_ADD_OPTION(SEND_MODE);
+    PA_ADD_OPTION(SCREENSHOT);
+    PA_ADD_OPTION(VIDEO);
+    PA_ADD_OPTION(LOGS);
+    PA_ADD_OPTION(DUMPS);
+    if (STATIC_GLOBALS.DEVELOPER_MODE){
+        PA_ADD_OPTION(FILES);
+    }
+}
+
+
+SendableErrorReport::SendableErrorReport()
+    : m_timestamp(now_to_filestring())
+    , m_directory(RUNTIME_BASE_PATH() + ERROR_PATH_UNSENT + "/" + m_timestamp + "/")
+    , m_processor(get_processor_name())
+    , m_program(STATIC_GLOBALS.DEVELOPER_MODE
+        ? PROGRAM_NAME + " (" + PROGRAM_VERSION + "-dev)"
+        : PROGRAM_NAME + " (" + PROGRAM_VERSION + ")"
+    )
+    , m_program_runtime_millis(0)
+    , m_dump_name(ERROR_DUMP_NAME)
+{
+    Filesystem::create_directories(Filesystem::Path(m_directory));
+}
+SendableErrorReport::SendableErrorReport(
+    Logger* logger,
+    const ProgramInfo& info,
+    std::string title,
+    std::vector<std::pair<std::string, std::string>> messages,
+    const ImageViewRGB32& image,
+    const StreamHistorySession* stream_history
+)
+    : SendableErrorReport()
+{
+    if (logger){
+        logger->log("Compiling Error Report...");
+    }else{
+        std::cout << "Compiling Error Report..." << std::endl;
+    }
+    m_program_id = info.program_id;
+    if (info.start_time != WallClock::min()){
+        m_program_runtime_millis = std::chrono::duration_cast<Milliseconds>(current_time() - info.start_time).count();
+    }
+    m_title = std::move(title);
+    m_messages = std::move(messages);
+    m_image = image;
+    {
+        std::string log;
+        for (const LogLine& line : global_last_log_history().get_recent((size_t)-1)){
+            log += line.text;
+            log += "\r\n";
+        }
+        const Filesystem::Path log_file_path(m_directory + ERROR_LOGS_NAME);
+        bool exists = Filesystem::exists(log_file_path);
+        FileIO file(log_file_path, FileMode::WRITE);
+        if (file.is_open()){
+            if (!exists){
+                std::string bom = "\xef\xbb\xbf";
+                file.write(bom);
+            }
+            file.write(log);
+            file.flush();
+        }
+        m_logs_name = ERROR_LOGS_NAME;
+    }
+    if (stream_history){
+        if (stream_history->save(m_directory + "Video.mp4")){
+            m_video_name = "Video.mp4";
+        }
+    }
+    if (program_dump(logger, m_directory + ERROR_DUMP_NAME)){
+        m_dump_name = ERROR_DUMP_NAME;
+    }
+}
+
+SendableErrorReport::SendableErrorReport(std::string directory)
+    : m_directory(std::move(directory))
+{
+    if (m_directory.back() != '/'){
+        m_directory += '/';
+    }
+
+    JsonValue json = load_json_file(m_directory + "Report.json");
+    const JsonObject& obj = json.to_object_throw();
+    m_timestamp = obj.get_string_throw("Timestamp");
+
+    //  If we error from this point on, we'll just move it to the sent folder.
+    try{
+        m_processor = obj.get_string_throw("Processor");
+        m_program = obj.get_string_throw("Program");
+        m_program_id = obj.get_string_throw("ProgramID");
+        m_program_runtime_millis = obj.get_integer_throw("ElapsedTimeMillis");
+        m_title = obj.get_string_throw("Title");
+        {
+            const JsonArray& messages = obj.get_array_throw("Messages");
+            for (const JsonValue& message : messages){
+                const JsonArray& item = message.to_array_throw();
+                if (item.size() != 2){
+                    throw ParseException("Expected 2 values for message.");
+                }
+                m_messages.emplace_back(
+                    item[0].to_string_throw(),
+                    item[1].to_string_throw()
+                );
+            }
+        }
+        {
+            const std::string* image_name = obj.get_string("Screenshot");
+            if (image_name){
+                try{
+                    m_image_owner = ImageRGB32(m_directory + *image_name);
+                    m_image = m_image_owner;
+                }catch (FileException&){}
+            }
+        }
+        {
+            const std::string* video_name = obj.get_string("Video");
+            if (video_name){
+                m_video_name = *video_name;
+            }
+        }
+        {
+            const std::string* dump_name = obj.get_string("Dump");
+            if (dump_name){
+                m_dump_name = *dump_name;
+            }
+        }
+        {
+            const std::string* logs_name = obj.get_string("Logs");
+            if (logs_name){
+                m_logs_name = *logs_name;
+            }
+        }
+        {
+            const JsonArray& files = obj.get_array_throw("Files");
+            for (const JsonValue& file : files){
+                m_files.emplace_back(file.to_string_throw());
+            }
+        }
+    }catch (...){
+        move_to_sent();
+        throw;
+    }
+}
+void SendableErrorReport::add_file(std::string filename){
+    m_files.emplace_back(std::move(filename));
+}
+
+void SendableErrorReport::save_report_json(Logger* logger) const{
+    if (logger){
+        logger->log("Saving Error Report...");
+    }else{
+        std::cout << "Saving Error Report..." << std::endl;
+    }
+
+    JsonObject report;
+
+    report["Timestamp"] = m_timestamp;
+    report["Processor"] = m_processor;
+    report["Program"] = m_program;
+    report["ProgramID"] = m_program_id;
+    report["ElapsedTimeMillis"] = m_program_runtime_millis;
+    report["Title"] = m_title;
+    {
+        JsonArray messages;
+        for (const std::pair<std::string, std::string>& item : m_messages){
+            JsonArray array;
+            array.push_back(item.first);
+            array.push_back(item.second);
+            messages.push_back(std::move(array));
+        }
+        report["Messages"] = std::move(messages);
+    }
+    if (m_image){
+        //  4k .png images are too big for current Discord limits.
+        std::string extension = m_image.width() > 1920
+            ? ".jpg"
+            : ".png";
+        if (m_image.save(m_directory + "Screenshot" + extension)){
+            report["Screenshot"] = "Screenshot" + extension;
+        }
+    }
+    if (!m_video_name.empty()){
+        report["Video"] = m_video_name;
+    }
+    if (!m_dump_name.empty()){
+        report["Dump"] = m_dump_name;
+    }
+    if (!m_logs_name.empty()){
+        report["Logs"] = m_logs_name;
+    }
+
+    JsonArray array;
+    for (const std::string& file : m_files){
+        array.push_back(file);
+    }
+    report["Files"] = std::move(array);
+
+    report.dump(m_directory + "Report.json");
+}
+
+void SendableErrorReport::move_to_sent(){
+//    cout << "move_to_sent()" << endl;
+    Filesystem::create_directories(Filesystem::Path(ERROR_PATH_SENT));
+
+    std::string new_directory = ERROR_PATH_SENT + "/" + m_timestamp + "/";
+//    cout << "old: " << m_directory << endl;
+//    cout << "new: " << new_directory << endl;
+    std::error_code ec;
+    Filesystem::rename(Filesystem::Path(m_directory), Filesystem::Path(new_directory), ec);
+    bool success = !ec;
+    if (success){
+        global_logger_tagged().log("Moved error report " + m_timestamp + ".");
+    }else{
+        global_logger_tagged().log("Unable to move error report " + m_timestamp + ".", COLOR_RED);
+    }
+    m_directory = std::move(new_directory);
+}
+
+
+std::vector<std::string> SendableErrorReport::get_pending_reports(){
+    std::vector<std::string> ret;
+    for (const Filesystem::Path& entry : Filesystem::list_directory(Filesystem::Path(ERROR_PATH_UNSENT))){
+        if (!Filesystem::is_directory(entry)){
+            continue;
+        }
+        const std::string name = entry.filename().string();
+        if (name.back() == '.'){
+            continue;
+        }
+        ret.emplace_back(entry.string_slash_normalized());
+    }
+    return ret;
+}
+
+#ifndef PA_OFFICIAL
+void SendableErrorReport::send(Logger& logger, std::shared_ptr<SendableErrorReport> report){}
+#endif
+
+
+
+//  Send all the reports. This function will return early and all the reports
+//  will be sent asynchronously in the background.
+void send_reports(Logger& logger, const std::vector<std::string>& reports){
+    for (const std::string& path : reports){
+        try{
+//            static int c = 0;
+//            cout << "Sending... " << c++ << endl;
+            //  std:::shared_ptr because it needs to take ownership for
+            //  destruction at a later time.
+            SendableErrorReport::send(logger, std::make_shared<SendableErrorReport>(path));
+        }catch (Exception& e){
+            logger.log("Unable to send report: " + path + ", Message: " + e.to_str(), COLOR_RED);
+        }catch (...){
+            logger.log("Unable to send report: " + path, COLOR_RED);
+        }
+    }
+}
+AsyncTask send_all_unsent_reports(Logger& logger, bool allow_prompt){
+#ifdef PA_OFFICIAL
+    ErrorReportSendMode mode = GlobalSettings::instance().ERROR_REPORTS->SEND_MODE;
+    if (mode == ErrorReportSendMode::NEVER_SEND_ANYTHING){
+        return AsyncTask();
+    }
+
+    std::vector<std::string> reports = SendableErrorReport::get_pending_reports();
+    global_logger_tagged().log("Found " + std::to_string(reports.size()) + " unsent error reports.", COLOR_PURPLE);
+
+    if (reports.empty()){
+        return AsyncTask();
+    }
+
+    if (mode == ErrorReportSendMode::PROMPT_WHEN_CONVENIENT){
+        if (!allow_prompt){
+            return AsyncTask();
+        }
+        QMessageBox box;
+        QMessageBox::StandardButton button = box.information(
+            nullptr,
+            "Error Reporting",
+            QString::fromStdString(
+                (reports.size() == 1
+                    ? "There is " + tostr_u_commas(reports.size()) + " error report.<br><br>"
+                      "Would you like to help make this program better by sending it to the developers?<br><br>"
+                    : "There are " + tostr_u_commas(reports.size()) + " error reports.<br><br>"
+                      "Would you like to help make this program better by sending them to the developers?<br><br>"
+                ) +
+                make_text_url(ERROR_PATH_UNSENT, "View unsent error reports.")// + "<br><br>"
+//                "(You can change )"
+            ),
+            QMessageBox::Yes | QMessageBox::No,
+            QMessageBox::StandardButton::Yes
+        );
+        if (button != QMessageBox::StandardButton::Yes){
+            return AsyncTask();
+        }
+    }
+
+    global_logger_tagged().log("Attempting to send " + std::to_string(reports.size()) + " error reports.", COLOR_PURPLE);
+
+    return GlobalThreadPools::unlimited_normal().dispatch_now_blocking(
+        [reports = std::move(reports)]{
+            send_reports(global_logger_tagged(), reports);
+        }
+    );
+#else
+    return AsyncTask();
+#endif
+}
+
+void report_error_to_telemetry(
+    Logger* logger,
+    const ProgramInfo& info,
+    std::string title,
+    std::vector<std::pair<std::string, std::string>> messages,
+    const ImageViewRGB32& image,
+    const StreamHistorySession* stream_history,
+    const std::vector<std::string>& files
+){
+    if (logger == nullptr){
+        logger = &global_logger_tagged();
+    }
+
+    {
+        SendableErrorReport report(
+            logger,
+            info,
+            std::move(title),
+            std::move(messages),
+            image,
+            stream_history
+        );
+
+        std::vector<std::string> full_file_paths;
+        for (const std::string& file: files){
+            full_file_paths.emplace_back(report.directory() + file);
+        }
+
+        report.save_report_json(logger);
+    }
+
+    send_all_unsent_reports(*logger, false);
+}
+
+
+
+
+}
diff --git a/SerialPrograms/Source/CommonFramework/ErrorReports/ErrorReports.h b/SerialPrograms/Source/CommonFramework/ErrorReports/ErrorReports.h
new file mode 100644
index 0000000000..b7b6bdbeec
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/ErrorReports/ErrorReports.h
@@ -0,0 +1,198 @@
+/*  Error Reports
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_ErrorReports_H
+#define PokemonAutomation_ErrorReports_H
+
+#include <memory>
+#include "Common/Cpp/Logging/AbstractLogger.h"
+#include "Common/Cpp/Options/GroupOption.h"
+#include "Common/Cpp/Options/StaticTextOption.h"
+#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "Common/Cpp/Options/EnumDropdownOption.h"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/ImageTypes/ImageRGB32.h"
+#include "CommonFramework/Notifications/ProgramInfo.h"
+
+namespace PokemonAutomation{
+
+
+class AsyncTask;
+class StreamHistorySession;
+
+
+// Filename constants for error report components
+extern const std::string& ERROR_LOGS_NAME;        // "Logs.log" - The log file in each error report
+extern const std::string& ERROR_DUMP_NAME;        // "Minidump.dmp" - The minidump file if available
+extern const std::string& ERROR_PATH_UNSENT;      // "ErrorReportsLocal" - Directory path for unsent error reports
+extern const std::string& ERROR_PATH_SENT;        // "ErrorReportsSent" - Directory path for sent error reports
+
+
+
+// Determines when error reports should be sent to the developers
+enum class ErrorReportSendMode{
+    SEND_AUTOMATICALLY,         // Send error reports immediately without user interaction
+    PROMPT_WHEN_CONVENIENT,     // Ask user for confirmation before sending
+    NEVER_SEND_ANYTHING,        // Never send error reports
+};
+
+// UI options for configuring error report behavior and content
+class ErrorReportOption : public GroupOption{
+public:
+    ErrorReportOption();
+
+    StaticTextOption DESCRIPTION;
+
+    EnumDropdownOption<ErrorReportSendMode> SEND_MODE;  // When to send error reports
+
+    BooleanCheckBoxOption SCREENSHOT;  // Include screenshot in error report
+    BooleanCheckBoxOption VIDEO;       // Include video history leading up to error (if available)
+    BooleanCheckBoxOption LOGS;        // Include recent log entries
+    BooleanCheckBoxOption DUMPS;       // Include stack trace and minidump
+    BooleanCheckBoxOption FILES;       // Include additional files
+};
+
+
+
+// Represents a complete error report that can be saved locally and sent to developers.
+// Each report is stored in its own timestamped directory (e.g., ErrorReportsLocal/20250216-155318967416/)
+// containing: Screenshot.png, Logs.log, Report.json, and optionally Video.mp4 and Minidump.dmp
+class SendableErrorReport{
+public:
+    // Default constructor: Creates an empty error report with timestamp and directory
+    SendableErrorReport();
+
+    // Create a new error report from current error info.
+    // - Creates a timestamped directory in ErrorReportsLocal/
+    // - Generates Report.json with metadata
+    // Parameters:
+    //   logger: Logger for status messages during report creation
+    //   info: Program metadata (name, ID, runtime)
+    //   title: Human-readable title for the error (e.g., "UnexpectedSelectionArrow")
+    //   messages: Additional key-value message pairs to include
+    //   image: Screenshot to report
+    //   stream_history: Video history session to report
+    SendableErrorReport(
+        Logger* logger,
+        const ProgramInfo& info = ProgramInfo(),
+        std::string title = "",
+        std::vector<std::pair<std::string, std::string>> messages = {},
+        const ImageViewRGB32& image = ImageViewRGB32(),
+        const StreamHistorySession* stream_history = nullptr
+    );
+
+    // Load an existing error report from disk by reading its Report.json
+    // Used to reload previously saved reports for sending
+    // If it fails to read the saved report, it will just move the report
+    // files to ErrorReportsSent/ folder.
+    SendableErrorReport(std::string directory);
+
+    // Get the full directory path where this error report is stored or to be stored
+    // e.g. "ErrorReportsLocal/20250216-155318967416"
+    const std::string& directory() const{
+        return m_directory;
+    }
+
+    // Get the human-readable title of this error report
+    const std::string& title() const{
+        return m_title;
+    }
+
+    // Get the additional key-value message pairs included in this report
+    const std::vector<std::pair<std::string, std::string>>& messages() const{
+        return m_messages;
+    }
+
+    // Add an additional file to be included in this error report
+    void add_file(std::string filename);
+
+    // Save an error report JSON "Report.json" in `directory()`:
+    // Also save the image to the error report directory.
+    void save_report_json(Logger* logger) const;
+
+    // Move this error report from ErrorReportsLocal/ to ErrorReportsSent/
+    // Called after successfully sending a report to mark it as sent
+    void move_to_sent();
+
+    // Get a list of all pending (unsent) error report directories from ErrorReportsLocal/
+    static std::vector<std::string> get_pending_reports();
+
+    // Send single error report to the developers' server
+    // Only functional in official builds (PA_OFFICIAL defined)
+    static void send(Logger& logger, std::shared_ptr<SendableErrorReport> report);
+
+private:
+    std::string m_timestamp;
+    std::string m_directory;
+    std::string m_processor;
+    std::string m_program;
+    std::string m_program_id;
+    uint64_t m_program_runtime_millis = 0;
+    std::string m_title;
+    std::vector<std::pair<std::string, std::string>> m_messages;
+    ImageRGB32 m_image_owner;
+    ImageViewRGB32 m_image;
+    std::string m_logs_name;
+    std::string m_video_name;
+    std::string m_dump_name;
+    std::vector<std::string> m_files;
+};
+
+
+// Send multiple error reports asynchronously in the background
+// Loads each report from disk and sends it to the developers' server
+void send_reports(Logger& logger, const std::vector<std::string>& reports);
+
+// Only functional in official builds (PA_OFFICIAL defined):
+// Attempt to send all unsent error reports in ErrorReportsLocal/ by calling `send_reports()`.
+// Behavior depends on GlobalSettings ERROR_REPORTS.SEND_MODE:
+// - SEND_AUTOMATICALLY: Sends all reports immediately
+// - PROMPT_WHEN_CONVENIENT: Shows dialog asking user for permission (if allow_prompt is true)
+// - NEVER_SEND_ANYTHING: Does nothing
+// Returns: AsyncTask handle for background sending operation, or nullptr if not sending
+AsyncTask send_all_unsent_reports(Logger& logger, bool allow_prompt);
+
+
+// Create and save a complete error report. This is the main entry point for error reporting.
+// Workflow:
+// 1. Creates a SendableErrorReport with all provided information
+// 2. Saves it to ErrorReportsLocal/<timestamp>/ directory with:
+//    - Screenshot image
+//    - Logs.log (recent log entries)
+//    - Report.json (metadata including title, messages, timestamps)
+//    - Video.mp4 (if stream_history provided)
+//    - Minidump.dmp (if available)
+//    - other additional files
+// 3. Only functional in official builds (PA_OFFICIAL defined): call `send_all_unsent_reports()`
+//    to attempt to send all unsent error reports based on user settings
+//
+// Parameters:
+//   logger: Logger for status messages (uses global logger if nullptr)
+//   info: Program metadata (name, ID, start time for calculating runtime)
+//   title: Human-readable error name/label (e.g., "UnexpectedSelectionArrow", "NoHatchEnd")
+//   messages: Additional key-value diagnostic information
+//   image: Screenshot to include in the report
+//   stream_history: Video recording session to save (captures video leading up to error)
+//   files: Additional file paths to include in the report
+void report_error_to_telemetry(
+    Logger* logger = nullptr,
+    const ProgramInfo& info = ProgramInfo(),
+    std::string title = "",
+    std::vector<std::pair<std::string, std::string>> messages = {},
+    const ImageViewRGB32& image = ImageViewRGB32(),
+    const StreamHistorySession* stream_history = nullptr,
+    const std::vector<std::string>& files = {}
+);
+
+
+
+
+
+
+
+}
+
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/ErrorReports/ProgramDumper.cpp b/SerialPrograms/Source/CommonFramework/ErrorReports/ProgramDumper.cpp
new file mode 100644
index 0000000000..ccafa57691
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/ErrorReports/ProgramDumper.cpp
@@ -0,0 +1,23 @@
+/*  Program Dumper
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Compiler.h"
+#include "ProgramDumper.h"
+
+
+#if _WIN32 && _MSC_VER
+#include "ProgramDumper_Windows.tpp"
+
+#else
+namespace PokemonAutomation{
+    void setup_crash_handler(){
+        //  Not supported
+    }
+    bool program_dump(Logger* logger, const std::string& filename){
+        return false;
+    }
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/ErrorReports/ProgramDumper.h b/SerialPrograms/Source/CommonFramework/ErrorReports/ProgramDumper.h
new file mode 100644
index 0000000000..b7c3b3aee7
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/ErrorReports/ProgramDumper.h
@@ -0,0 +1,21 @@
+/*  Program Dumper
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_ProgramDumper_H
+#define PokemonAutomation_ProgramDumper_H
+
+#include <string>
+#include "Common/Cpp/Logging/AbstractLogger.h"
+
+namespace PokemonAutomation{
+
+
+void setup_crash_handler();
+bool program_dump(Logger* logger, const std::string& filename);
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/ErrorReports/ProgramDumper_Windows.tpp b/SerialPrograms/Source/CommonFramework/ErrorReports/ProgramDumper_Windows.tpp
new file mode 100644
index 0000000000..307b93d0df
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/ErrorReports/ProgramDumper_Windows.tpp
@@ -0,0 +1,132 @@
+/*  Program Dumper (Windows)
+ *
+ *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *
+ */
+
+#pragma comment (lib, "Dbghelp.lib")
+#include <iostream>
+#include <Windows.h>
+#include <winioctl.h>
+#include <Dbghelp.h>
+#include "Common/Cpp/PrettyPrint.h"
+#include "Common/Cpp/Strings/Unicode.h"
+#include "ErrorReports.h"
+#include "ProgramDumper.h"
+
+namespace PokemonAutomation{
+
+
+class HandleHolder{
+public:
+    HandleHolder(const HandleHolder&) = delete;
+    void operator=(const HandleHolder&) = delete;
+    ~HandleHolder(){
+        CloseHandle(m_handle);
+    }
+    HandleHolder(HANDLE handle)
+        : m_handle(handle)
+    {}
+    operator bool() const{
+        return m_handle != INVALID_HANDLE_VALUE;
+    }
+    operator HANDLE() const{
+        return m_handle;
+    }
+
+private:
+    HANDLE m_handle;
+};
+
+
+bool program_dump(Logger* logger, const std::string& filename, EXCEPTION_POINTERS* e){
+    HandleHolder handle = CreateFileW(
+        utf8_to_wstr(filename).c_str(),
+        FILE_WRITE_ACCESS,
+        FILE_SHARE_READ,
+        nullptr,
+        OPEN_ALWAYS,
+        FILE_ATTRIBUTE_NORMAL,
+        0
+    );
+    if (!handle){
+        DWORD error = GetLastError();
+        if (logger){
+            logger->log("Unable to create dump file: " + std::to_string(error), COLOR_RED);
+        }else{
+            std::cout << "Unable to create dump file: " << error << std::endl;
+        }
+        return false;
+    }
+
+    int ret;
+    if (e != nullptr){
+        MINIDUMP_EXCEPTION_INFORMATION exceptionInfo;
+        exceptionInfo.ThreadId = GetCurrentThreadId();
+        exceptionInfo.ExceptionPointers = e;
+        exceptionInfo.ClientPointers = FALSE;
+        ret = MiniDumpWriteDump(
+            GetCurrentProcess(),
+            GetCurrentProcessId(),
+            handle,
+            MiniDumpNormal,
+            &exceptionInfo,
+            nullptr,
+            nullptr
+        );
+    }else{
+        ret = MiniDumpWriteDump(
+            GetCurrentProcess(),
+            GetCurrentProcessId(),
+            handle,
+            MiniDumpNormal,
+            nullptr,
+            nullptr,
+            nullptr
+        );
+    }
+    if (!ret){
+        DWORD error = GetLastError();
+        if (logger){
+            logger->log("Unable to create dump file: " + std::to_string(error), COLOR_RED);
+        }else{
+            std::cout << "Unable to create dump file: " << error << std::endl;
+        }
+        return false;
+    }
+
+    return true;
+}
+bool program_dump(Logger* logger, const std::string& filename){
+    return program_dump(logger, filename, nullptr);
+}
+
+
+
+long WINAPI crash_handler(EXCEPTION_POINTERS* e){
+    static bool handled = false;
+    if (handled){
+        return EXCEPTION_CONTINUE_SEARCH;
+    }
+    handled = true;
+
+    SendableErrorReport report;
+
+//    _wmkdir(str_to_wstr(ERROR_PATH_UNSENT).c_str());
+    program_dump(nullptr, report.directory() + ERROR_DUMP_NAME, e);
+    report.save_report_json(nullptr);
+
+    Sleep(1000);
+
+    return EXCEPTION_CONTINUE_SEARCH;
+}
+
+
+void setup_crash_handler(){
+//    AddVectoredExceptionHandler(0, crash_handler);
+    SetUnhandledExceptionFilter(crash_handler);
+}
+
+
+
+}
diff --git a/SerialPrograms/Source/CommonFramework/Exceptions/FatalProgramException.cpp b/SerialPrograms/Source/CommonFramework/Exceptions/FatalProgramException.cpp
index 2b872a0fac..e39abc8f4d 100644
--- a/SerialPrograms/Source/CommonFramework/Exceptions/FatalProgramException.cpp
+++ b/SerialPrograms/Source/CommonFramework/Exceptions/FatalProgramException.cpp
@@ -1,66 +1,86 @@
 /*  Fatal Program Exception
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include "CommonFramework/ImageTypes/ImageRGB32.h"
-#include "CommonFramework/Notifications/ProgramNotifications.h"
-#include "CommonFramework/Tools/ErrorDumper.h"
+
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonFramework/Tools/VideoStream.h"
 #include "CommonFramework/Tools/ProgramEnvironment.h"
-#include "CommonFramework/Tools/ConsoleHandle.h"
+#include "CommonFramework/Notifications/EventNotificationOption.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
 #include "FatalProgramException.h"
 
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
 namespace PokemonAutomation{
 
 
-FatalProgramException::FatalProgramException(ScreenshotException&& e)
-    : ScreenshotException(e.m_send_error_report, std::move(e.m_message), std::move(e.m_screenshot))
+FatalProgramException::FatalProgramException(
+    ErrorReportMode error_report_mode,
+    std::string message
+)
+    : m_error_report_mode(error_report_mode)
+    , m_message(message)
 {}
-FatalProgramException::FatalProgramException(ErrorReport error_report, Logger& logger, std::string message)
-    : ScreenshotException(error_report, std::move(message))
-{
-    logger.log(std::string(FatalProgramException::name()) + ": " + m_message, COLOR_RED);
-}
-FatalProgramException::FatalProgramException(ErrorReport error_report, Logger& logger, std::string message, std::shared_ptr<const ImageRGB32> screenshot)
-    : ScreenshotException(error_report, std::move(message), std::move(screenshot))
-{
-    logger.log(std::string(FatalProgramException::name()) + ": " + m_message, COLOR_RED);
-}
-FatalProgramException::FatalProgramException(ErrorReport error_report, ConsoleHandle& console, std::string message, bool take_screenshot)
-    : ScreenshotException(error_report, console, std::move(message), take_screenshot)
-{
-    console.log(std::string(FatalProgramException::name()) + ": " + m_message, COLOR_RED);
-}
 
+FatalProgramException::FatalProgramException(
+    ErrorReportMode error_report_mode,
+    std::string message,
+    VideoStream& stream
+)
+    : m_error_report_mode(error_report_mode)
+    , m_message(message)
+    , m_stream(&stream)
+    , m_screenshot(stream.video().snapshot().frame)
+{}
 
-void FatalProgramException::send_notification(ProgramEnvironment& env, EventNotificationOption& notification) const{
-    std::vector<std::pair<std::string, std::string>> embeds;
-    if (!m_message.empty()){
-        embeds.emplace_back(std::pair<std::string, std::string>("Message:", m_message));
-    }
-    if (m_send_error_report == ErrorReport::SEND_ERROR_REPORT && m_screenshot){
-        std::string label = name();
-        std::string filename = dump_image_alone(env.logger(), env.program_info(), label, *m_screenshot);
-        send_program_telemetry(
-            env.logger(), true, COLOR_RED,
-            env.program_info(),
-            label,
-            embeds,
-            filename
-        );
-    }
-    send_program_notification(
-        env, notification,
-        COLOR_RED,
-        "Program Error",
-        std::move(embeds), "",
-        screenshot()
-    );
-}
+//  Construct exception with message with screenshot and (optionally) console information.
+//  Use the provided screenshot instead of taking one with the console.
+//  Store the console information (if provided) for stream history if requested later.
+FatalProgramException::FatalProgramException(
+    ErrorReportMode error_report_mode,
+    std::string message,
+    VideoStream* stream,
+    ImageRGB32 screenshot
+)
+    : m_error_report_mode(error_report_mode)
+    , m_message(message)
+    , m_stream(stream)
+    , m_screenshot(std::make_shared<ImageRGB32>(std::move(screenshot)))
+{}
 
+FatalProgramException::FatalProgramException(
+    ErrorReportMode error_report_mode,
+    std::string message,
+    VideoStream* stream,
+    std::shared_ptr<const ImageRGB32> screenshot
+)
+    : m_error_report_mode(error_report_mode)
+    , m_message(message)
+    , m_stream(stream)
+    , m_screenshot(std::move(screenshot))
+{}
 
 
+void FatalProgramException::send_fatal_error_notif_and_telemetry_report(
+    ProgramEnvironment& env,
+    EventNotificationOption& notif_settings
+){
+    send_program_fatal_error_notification_and_telemetry_report(
+        env, &env.logger(), env.program_info(),
+        notif_settings,
+        error_report_mode(),
+        message(),
+        name(),
+        screenshot_view(),
+        m_stream ? &m_stream->history() : nullptr
+    );
+}
+
 
 
 }
diff --git a/SerialPrograms/Source/CommonFramework/Exceptions/FatalProgramException.h b/SerialPrograms/Source/CommonFramework/Exceptions/FatalProgramException.h
index 9d46219965..c9cf726013 100644
--- a/SerialPrograms/Source/CommonFramework/Exceptions/FatalProgramException.h
+++ b/SerialPrograms/Source/CommonFramework/Exceptions/FatalProgramException.h
@@ -1,6 +1,6 @@
 /*  Fatal Program Exception
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -8,23 +8,72 @@
 #define PokemonAutomation_FatalProgramException_H
 
 #include <memory>
-#include "ScreenshotException.h"
+#include "Common/Cpp/Exceptions.h"
+#include "CommonFramework/ImageTypes/ImageRGB32.h"
 
 namespace PokemonAutomation{
 
+class VideoStream;
+class ProgramEnvironment;
+class EventNotificationOption;
+class ImageViewRGB32;
+class ImageRGB32;
 
 //  A generic exception that should not be caught outside of infra.
-class FatalProgramException : public ScreenshotException{
+class FatalProgramException : public Exception{
 public:
-    FatalProgramException(ScreenshotException&& e);
-    explicit FatalProgramException(ErrorReport error_report, Logger& logger, std::string message);
-    explicit FatalProgramException(ErrorReport error_report, Logger& logger, std::string message, std::shared_ptr<const ImageRGB32> screenshot);
-    explicit FatalProgramException(ErrorReport error_report, ConsoleHandle& console, std::string message, bool take_screenshot);
 
+    explicit FatalProgramException(
+        ErrorReportMode error_report_mode,
+        std::string message
+    );
+
+    explicit FatalProgramException(
+        ErrorReportMode error_report_mode,
+        std::string message,
+        VideoStream& stream
+    );
+
+    //  Construct exception with message with screenshot and (optionally) console information.
+    //  Use the provided screenshot instead of taking one with the console.
+    //  Store the console information (if provided) for stream history if requested later.
+    explicit FatalProgramException(
+        ErrorReportMode error_report_mode,
+        std::string message,
+        VideoStream* stream,
+        ImageRGB32 screenshot
+    );
+
+    explicit FatalProgramException(
+        ErrorReportMode error_report_mode,
+        std::string message,
+        VideoStream* stream,
+        std::shared_ptr<const ImageRGB32> screenshot
+    );
+
+    ErrorReportMode error_report_mode() const { return m_error_report_mode; }
     virtual const char* name() const override{ return "FatalProgramException"; }
     virtual std::string message() const override{ return m_message; }
+    ImageViewRGB32 screenshot_view() const {
+        if (m_screenshot){
+            return *m_screenshot;
+        }else{
+            return ImageViewRGB32();
+        }
+    }
+    std::shared_ptr<const ImageRGB32> screenshot() const {return m_screenshot;}
+    VideoStream* video_stream() const{return m_stream;}
+
+    void send_fatal_error_notif_and_telemetry_report(
+        ProgramEnvironment& env,
+        EventNotificationOption& notif_settings
+    );
 
-    virtual void send_notification(ProgramEnvironment& env, EventNotificationOption& notification) const override;
+private:
+    ErrorReportMode m_error_report_mode;
+    std::string m_message;
+    VideoStream* m_stream = nullptr;
+    std::shared_ptr<const ImageRGB32> m_screenshot;
 };
 
 
diff --git a/SerialPrograms/Source/CommonFramework/Exceptions/OperationFailedException.cpp b/SerialPrograms/Source/CommonFramework/Exceptions/OperationFailedException.cpp
index 4dcc4be56f..4805d744df 100644
--- a/SerialPrograms/Source/CommonFramework/Exceptions/OperationFailedException.cpp
+++ b/SerialPrograms/Source/CommonFramework/Exceptions/OperationFailedException.cpp
@@ -1,63 +1,57 @@
 /*  Operation Failed Exception
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include "CommonFramework/ImageTypes/ImageRGB32.h"
-#include "CommonFramework/Notifications/ProgramNotifications.h"
-#include "CommonFramework/Tools/ErrorDumper.h"
 #include "CommonFramework/Tools/ProgramEnvironment.h"
-#include "CommonFramework/Tools/ConsoleHandle.h"
+#include "CommonFramework/Notifications/EventNotificationOption.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
 #include "OperationFailedException.h"
 
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
 namespace PokemonAutomation{
 
 
-OperationFailedException::OperationFailedException(ErrorReport error_report, Logger& logger, std::string message)
-    : ScreenshotException(error_report, std::move(message))
-{
-    logger.log(std::string(OperationFailedException::name()) + ": " + m_message, COLOR_RED);
-}
-OperationFailedException::OperationFailedException(ErrorReport error_report, Logger& logger, std::string message, std::shared_ptr<const ImageRGB32> screenshot)
-    : ScreenshotException(error_report, std::move(message), std::move(screenshot))
-{
-    logger.log(std::string(OperationFailedException::name()) + ": " + m_message, COLOR_RED);
-}
-OperationFailedException::OperationFailedException(ErrorReport error_report, ConsoleHandle& console, std::string message, bool take_screenshot)
-    : ScreenshotException(error_report, console, std::move(message), take_screenshot)
-{
-    console.log(std::string(OperationFailedException::name()) + ": " + m_message, COLOR_RED);
+OperationFailedException::OperationFailedException(
+    ErrorReportMode error_report_mode,
+    std::string message
+)
+    : m_error_report_mode(error_report_mode)
+    , m_message(std::move(message))
+{}
+
+
+void OperationFailedException::send_fatal_error_notif_and_telemetry_report(
+    ProgramEnvironment& env,
+    EventNotificationOption& notif_settings
+){
+    send_program_fatal_error_notification_and_telemetry_report(
+        env, &env.logger(), env.program_info(),
+        notif_settings,
+        error_report_mode(),
+        message(),
+        name()
+    );
 }
 
 
-void OperationFailedException::send_notification(ProgramEnvironment& env, EventNotificationOption& notification) const{
-    std::vector<std::pair<std::string, std::string>> embeds;
-    if (!m_message.empty()){
-        embeds.emplace_back(std::pair<std::string, std::string>("Message:", m_message));
-    }
-    if (m_send_error_report == ErrorReport::SEND_ERROR_REPORT && m_screenshot){
-        std::string label = name();
-        std::string filename = dump_image_alone(env.logger(), env.program_info(), label, *m_screenshot);
-        send_program_telemetry(
-            env.logger(), true, COLOR_RED,
-            env.program_info(),
-            label,
-            embeds,
-            filename
-        );
-    }
-    send_program_notification(
-        env, notification,
-        COLOR_RED,
-        "Program Error",
-        std::move(embeds), "",
-        screenshot()
+void OperationFailedException::send_recoverable_error_notif_and_telemetry_report(
+    ProgramEnvironment& env,
+    EventNotificationOption& notif_settings
+){
+    send_program_recoverable_error_notification_and_telemetry_report(
+        env, &env.logger(), env.program_info(), 
+        notif_settings, 
+        error_report_mode(),
+        message(),
+        name()
     );
 }
 
 
 
-
-
 }
diff --git a/SerialPrograms/Source/CommonFramework/Exceptions/OperationFailedException.h b/SerialPrograms/Source/CommonFramework/Exceptions/OperationFailedException.h
index bfebb5d146..d2cd39acc5 100644
--- a/SerialPrograms/Source/CommonFramework/Exceptions/OperationFailedException.h
+++ b/SerialPrograms/Source/CommonFramework/Exceptions/OperationFailedException.h
@@ -1,32 +1,47 @@
 /*  Operation Failed Exception
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifndef PokemonAutomation_OperationFailedException_H
 #define PokemonAutomation_OperationFailedException_H
 
-#include <memory>
-#include "ScreenshotException.h"
+#include "Common/Cpp/Exceptions.h"
 
 namespace PokemonAutomation{
 
-class FatalProgramException;
-
+class ProgramEnvironment;
+class EventNotificationOption;
 
 //  Thrown by subroutines if they fail for an in-game reason.
 //  These include recoverable errors which can be consumed by the program.
-class OperationFailedException : public ScreenshotException{
+class OperationFailedException : public Exception{
 public:
-    explicit OperationFailedException(ErrorReport error_report, Logger& logger, std::string message);
-    explicit OperationFailedException(ErrorReport error_report, Logger& logger, std::string message, std::shared_ptr<const ImageRGB32> screenshot);
-    explicit OperationFailedException(ErrorReport error_report, ConsoleHandle& console, std::string message, bool take_screenshot);
+    OperationFailedException(
+        ErrorReportMode error_report_mode,
+        std::string message
+    );
+
+    ErrorReportMode error_report_mode() const { return m_error_report_mode; };
 
     virtual const char* name() const override{ return "OperationFailedException"; }
     virtual std::string message() const override{ return m_message; }
 
-    virtual void send_notification(ProgramEnvironment& env, EventNotificationOption& notification) const override;
+    virtual void send_recoverable_error_notif_and_telemetry_report(
+        ProgramEnvironment& env,
+        EventNotificationOption& notif_settings
+    );
+
+    virtual void send_fatal_error_notif_and_telemetry_report(
+        ProgramEnvironment& env,
+        EventNotificationOption& notif_settings
+    );
+
+
+private:
+    ErrorReportMode m_error_report_mode;
+    std::string m_message;
 };
 
 
diff --git a/SerialPrograms/Source/CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.cpp b/SerialPrograms/Source/CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.cpp
new file mode 100644
index 0000000000..984f6be2f8
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.cpp
@@ -0,0 +1,136 @@
+/*  Operation Failed Exception with Screenshot
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/ImageTypes/ImageRGB32.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonFramework/Tools/ProgramEnvironment.h"
+#include "CommonFramework/Notifications/EventNotificationOption.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "OperationFailedExceptionWithScreenshot.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+
+
+
+OperationFailedExceptionWithScreenshot::OperationFailedExceptionWithScreenshot(
+    ErrorReportMode error_report_mode,
+    std::string message,
+    VideoStream& stream
+)
+    : OperationFailedException(error_report_mode, std::move(message))
+    , m_stream(&stream)
+    , m_screenshot(stream.video().snapshot().frame)
+{
+    if (m_screenshot == nullptr || !*m_screenshot){
+        stream.log("Camera returned empty screenshot. Is the camera frozen?", COLOR_RED);
+    }
+}
+OperationFailedExceptionWithScreenshot::OperationFailedExceptionWithScreenshot(
+    ErrorReportMode error_report_mode,
+    std::string message,
+    VideoStream* stream,
+    ImageRGB32 screenshot
+)
+    : OperationFailedException(error_report_mode, std::move(message))
+    , m_stream(stream)
+    , m_screenshot(std::make_shared<ImageRGB32>(std::move(screenshot)))
+{}
+OperationFailedExceptionWithScreenshot::OperationFailedExceptionWithScreenshot(
+    ErrorReportMode error_report_mode,
+    std::string message,
+    VideoStream* stream,
+    std::shared_ptr<const ImageRGB32> screenshot
+)
+    : OperationFailedException(error_report_mode, std::move(message))
+    , m_stream(stream)
+    , m_screenshot(std::move(screenshot))
+{}
+
+
+[[noreturn]] void OperationFailedExceptionWithScreenshot::fire(
+    ErrorReportMode error_report_mode,
+    std::string message,
+    VideoStream& stream
+){
+    throw_and_log<OperationFailedExceptionWithScreenshot>(
+        stream.logger(),
+        error_report_mode,
+        std::move(message),
+        stream
+    );
+}
+[[noreturn]] void OperationFailedExceptionWithScreenshot::fire(
+    ErrorReportMode error_report_mode,
+    std::string message,
+    VideoStream& stream,
+    std::shared_ptr<const ImageRGB32> screenshot
+){
+    throw_and_log<OperationFailedExceptionWithScreenshot>(
+        stream.logger(),
+        error_report_mode,
+        std::move(message),
+        &stream,
+        std::move(screenshot)
+    );
+}
+
+
+
+ImageViewRGB32 OperationFailedExceptionWithScreenshot::screenshot_view() const{
+    if (m_screenshot){
+        return *m_screenshot;
+    }else{
+        return ImageViewRGB32();
+    }
+}
+std::shared_ptr<const ImageRGB32> OperationFailedExceptionWithScreenshot::screenshot() const{
+    return m_screenshot;
+}
+
+VideoStream* OperationFailedExceptionWithScreenshot::video_stream() const{
+    return m_stream;
+}
+
+void OperationFailedExceptionWithScreenshot::send_recoverable_error_notif_and_telemetry_report(
+    ProgramEnvironment& env,
+    EventNotificationOption& notif_settings
+){
+    send_program_recoverable_error_notification_and_telemetry_report(
+        env, &env.logger(), env.program_info(), 
+        notif_settings, 
+        error_report_mode(),
+        message(),
+        name(),
+        screenshot_view(),
+        m_stream ? &m_stream->history() : nullptr
+    );
+}
+
+void OperationFailedExceptionWithScreenshot::send_fatal_error_notif_and_telemetry_report(
+    ProgramEnvironment& env,
+    EventNotificationOption& notif_settings
+){
+    send_program_fatal_error_notification_and_telemetry_report(
+        env, &env.logger(), env.program_info(),
+        notif_settings,
+        error_report_mode(),
+        message(),
+        name(),
+        screenshot_view(),
+        m_stream ? &m_stream->history() : nullptr
+    );
+}
+
+
+
+
+
+
+}
diff --git a/SerialPrograms/Source/CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h b/SerialPrograms/Source/CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h
new file mode 100644
index 0000000000..94af054197
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h
@@ -0,0 +1,88 @@
+/*  Operation Failed Exception with Screenshot
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_OperationFailedExceptionWithScreenshot_H
+#define PokemonAutomation_OperationFailedExceptionWithScreenshot_H
+
+#include <memory>
+#include "CommonFramework/Tools/VideoStream.h"
+#include "CommonFramework/Exceptions/OperationFailedException.h"
+
+namespace PokemonAutomation{
+
+class ImageViewRGB32;
+class ImageRGB32;
+class EventNotificationOption;
+class VideoStream;
+class ProgramEnvironment;
+
+
+//  Thrown by subroutines if they fail for an in-game reason.
+//  These include recoverable errors which can be consumed by the program.
+class OperationFailedExceptionWithScreenshot : public OperationFailedException{
+public:
+    OperationFailedExceptionWithScreenshot(
+        ErrorReportMode error_report_mode,
+        std::string message,
+        VideoStream& stream
+    );
+
+    //  Construct exception with message with screenshot and (optionally) console information.
+    //  Use the provided screenshot instead of taking one with the console.
+    //  Store the console information (if provided) for stream history if requested later.
+    OperationFailedExceptionWithScreenshot(
+        ErrorReportMode error_report_mode,
+        std::string message,
+        VideoStream* stream,
+        ImageRGB32 screenshot
+    );
+    OperationFailedExceptionWithScreenshot(
+        ErrorReportMode error_report_mode,
+        std::string message,
+        VideoStream* stream,
+        std::shared_ptr<const ImageRGB32> screenshot
+    );
+
+    //  This is the most common use case. Throw and log exception.
+    //  Include console information for screenshot and stream history.
+    [[noreturn]] static void fire(
+        ErrorReportMode error_report_mode,
+        std::string message,
+        VideoStream& stream
+    );
+    [[noreturn]] static void fire(
+        ErrorReportMode error_report_mode,
+        std::string message,
+        VideoStream& stream,
+        std::shared_ptr<const ImageRGB32> screenshot
+    );
+
+    virtual const char* name() const override{ return "OperationFailedExceptionWithScreenshot"; }
+    ImageViewRGB32 screenshot_view() const;
+    std::shared_ptr<const ImageRGB32> screenshot() const;
+    VideoStream* video_stream() const;
+
+    void send_recoverable_error_notif_and_telemetry_report(
+        ProgramEnvironment& env,
+        EventNotificationOption& notif_settings
+    ) override;
+
+    void send_fatal_error_notif_and_telemetry_report(
+        ProgramEnvironment& env,
+        EventNotificationOption& notif_settings
+    ) override;
+
+private:
+    VideoStream* m_stream = nullptr;
+    std::shared_ptr<const ImageRGB32> m_screenshot;
+};
+
+
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/Exceptions/ProgramFinishedException.cpp b/SerialPrograms/Source/CommonFramework/Exceptions/ProgramFinishedException.cpp
index 0c5e56125b..a47c52dde4 100644
--- a/SerialPrograms/Source/CommonFramework/Exceptions/ProgramFinishedException.cpp
+++ b/SerialPrograms/Source/CommonFramework/Exceptions/ProgramFinishedException.cpp
@@ -1,53 +1,67 @@
 /*  Program Finished Exception
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
+#include "CommonFramework/ImageTypes/ImageRGB32.h"
 #include "CommonFramework/Notifications/ProgramNotifications.h"
-#include "CommonFramework/Tools/ProgramEnvironment.h"
-#include "CommonFramework/Tools/ConsoleHandle.h"
 #include "ProgramFinishedException.h"
 
 namespace PokemonAutomation{
 
 
 ProgramFinishedException::ProgramFinishedException(){}
-ProgramFinishedException::ProgramFinishedException(Logger& logger, std::string message)
-    : ScreenshotException(ErrorReport::NO_ERROR_REPORT, std::move(message))
-{
-    logger.log(std::string(ProgramFinishedException::name()) + ": " + m_message, COLOR_BLUE);
-}
-ProgramFinishedException::ProgramFinishedException(Logger& logger, std::string message, std::shared_ptr<const ImageRGB32> screenshot)
-    : ScreenshotException(ErrorReport::NO_ERROR_REPORT, std::move(message), std::move(screenshot))
-{
-    logger.log(std::string(ProgramFinishedException::name()) + " (with screenshot): " + m_message, COLOR_BLUE);
+ProgramFinishedException::ProgramFinishedException(std::string message)
+    : m_message(message)
+{}
+
+
+ProgramFinishedException::ProgramFinishedException(
+    std::string message,
+    VideoStream& stream
+)
+    : m_message(message)
+    , m_stream(&stream)
+    , m_screenshot(stream.video().snapshot().frame)
+{}
+ProgramFinishedException::ProgramFinishedException(
+    std::string message,
+    VideoStream* stream,
+    ImageRGB32 screenshot
+)
+    : m_message(message)
+    , m_stream(stream)
+    , m_screenshot(std::make_shared<ImageRGB32>(std::move(screenshot)))
+{}
+ProgramFinishedException::ProgramFinishedException(
+    std::string message,
+    VideoStream* stream,
+    std::shared_ptr<const ImageRGB32> screenshot
+)
+    : m_message(message)
+    , m_stream(stream)
+    , m_screenshot(std::move(screenshot))
+{}
+
+void ProgramFinishedException::log(Logger& logger) const{
+    logger.log(std::string(name()) + ": " + message(), COLOR_BLUE);
 }
-ProgramFinishedException::ProgramFinishedException(ConsoleHandle& console, std::string message, bool take_screenshot)
-    : ScreenshotException(ErrorReport::NO_ERROR_REPORT, console, std::move(message), take_screenshot)
-{
-    if (take_screenshot){
-        console.log(std::string(ProgramFinishedException::name()) + " (take screenshot): " + m_message, COLOR_BLUE);
+
+ImageViewRGB32 ProgramFinishedException::screenshot_view() const{
+    if (m_screenshot){
+        return *m_screenshot;
     }else{
-        console.log(std::string(ProgramFinishedException::name()) + " (no screenshot): " + m_message, COLOR_BLUE);
+        return ImageViewRGB32();
     }
 }
-
-
-void ProgramFinishedException::send_notification(ProgramEnvironment& env, EventNotificationOption& notification) const{
-    std::vector<std::pair<std::string, std::string>> embeds;
-    if (!m_message.empty()){
-        embeds.emplace_back(std::pair<std::string, std::string>("Message:", m_message));
-    }
-    send_program_notification(
-        env, notification,
-        COLOR_GREEN,
-        "Program Finished",
-        std::move(embeds), "",
-        screenshot()
-    );
+std::shared_ptr<const ImageRGB32> ProgramFinishedException::screenshot() const{
+    return m_screenshot;
 }
 
+VideoStream* ProgramFinishedException::video_stream() const{
+    return m_stream;
+}
 
 
 
diff --git a/SerialPrograms/Source/CommonFramework/Exceptions/ProgramFinishedException.h b/SerialPrograms/Source/CommonFramework/Exceptions/ProgramFinishedException.h
index dfe639fc98..cf39dc356f 100644
--- a/SerialPrograms/Source/CommonFramework/Exceptions/ProgramFinishedException.h
+++ b/SerialPrograms/Source/CommonFramework/Exceptions/ProgramFinishedException.h
@@ -1,6 +1,6 @@
 /*  Program Finished Exception
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -8,7 +8,9 @@
 #define PokemonAutomation_ProgramFinishedException_H
 
 #include <memory>
-#include "ScreenshotException.h"
+#include "Common/Cpp/Exceptions.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonFramework/Tools/VideoStream.h"
 
 namespace PokemonAutomation{
 
@@ -17,25 +19,52 @@ class ImageRGB32;
 class EventNotificationOption;
 struct ProgramInfo;
 class ProgramEnvironment;
-class ConsoleHandle;
 
 
 
 //  Thrown when the program requests a normal stop to the program.
 //    - This should not be consumed except by the infra.
 //    - Non-infra are allowed to catch and rethrow this exception.
-class ProgramFinishedException : public ScreenshotException{
+class ProgramFinishedException : public Exception{
 public:
     ProgramFinishedException();
-    explicit ProgramFinishedException(Logger& logger, std::string message);
-    explicit ProgramFinishedException(Logger& logger, std::string message, std::shared_ptr<const ImageRGB32> screenshot);
-    explicit ProgramFinishedException(ConsoleHandle& console, std::string message, bool take_screenshot);
+    explicit ProgramFinishedException(std::string message);
+
+    //  Construct exception with message and console information.
+    //  This will take a screenshot and store the console if the stream history if requested later.
+    explicit ProgramFinishedException(
+        std::string message,
+        VideoStream& stream
+    );
+
+    //  Construct exception with message with screenshot and (optionally) console information.
+    //  Use the provided screenshot instead of taking one with the console.
+    //  Store the console information (if provided) for stream history if requested later.
+    explicit ProgramFinishedException(
+        std::string message,
+        VideoStream* stream,
+        ImageRGB32 screenshot
+    );
+    explicit ProgramFinishedException(
+        std::string message,
+        VideoStream* stream,
+        std::shared_ptr<const ImageRGB32> screenshot
+    );
+
+    Color color() const{ return COLOR_GREEN; }
 
 public:
+    virtual void log(Logger& logger) const override;
     virtual const char* name() const override{ return "ProgramFinishedException"; }
-    virtual std::string message() const override{ return m_message; }
+    ImageViewRGB32 screenshot_view() const;
+    std::shared_ptr<const ImageRGB32> screenshot() const;
+    VideoStream* video_stream() const;
+
 
-    virtual void send_notification(ProgramEnvironment& env, EventNotificationOption& notification) const override;
+private:
+    std::string m_message;
+    VideoStream* m_stream = nullptr;
+    std::shared_ptr<const ImageRGB32> m_screenshot;
 };
 
 
diff --git a/SerialPrograms/Source/CommonFramework/Exceptions/ScreenshotException.cpp b/SerialPrograms/Source/CommonFramework/Exceptions/ScreenshotException.cpp
deleted file mode 100644
index 721da84e79..0000000000
--- a/SerialPrograms/Source/CommonFramework/Exceptions/ScreenshotException.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-/*  Screenshot Exception
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/ImageTypes/ImageRGB32.h"
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "CommonFramework/Tools/ConsoleHandle.h"
-#include "ScreenshotException.h"
-
-namespace PokemonAutomation{
-
-
-ScreenshotException::ScreenshotException(ErrorReport error_report, std::string message)
-    : m_send_error_report(error_report)
-    , m_message(std::move(message))
-{}
-ScreenshotException::ScreenshotException(ErrorReport error_report, std::string message, std::shared_ptr<const ImageRGB32> screenshot)
-    : m_send_error_report(error_report)
-    , m_message(std::move(message))
-    , m_screenshot(std::move(screenshot))
-{}
-ScreenshotException::ScreenshotException(ErrorReport error_report, ConsoleHandle& console, std::string message, bool take_screenshot)
-    : m_send_error_report(error_report)
-    , m_message(std::move(message))
-{
-    if (take_screenshot){
-        m_screenshot = console.video().snapshot().frame;
-        if (m_screenshot == nullptr || !*m_screenshot){
-            console.log("Camera returned empty screenshot. Is the camera frozen?", COLOR_RED);
-        }
-    }
-}
-ImageViewRGB32 ScreenshotException::screenshot() const{
-    if (m_screenshot){
-        return *m_screenshot;
-    }else{
-        return ImageViewRGB32();
-    }
-}
-
-
-
-
-
-
-}
diff --git a/SerialPrograms/Source/CommonFramework/Exceptions/ScreenshotException.h b/SerialPrograms/Source/CommonFramework/Exceptions/ScreenshotException.h
deleted file mode 100644
index 815bd65bfc..0000000000
--- a/SerialPrograms/Source/CommonFramework/Exceptions/ScreenshotException.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*  Screenshot Exception
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_ScreenshotException_H
-#define PokemonAutomation_ScreenshotException_H
-
-#include <memory>
-#include "Common/Cpp/Exceptions.h"
-
-namespace PokemonAutomation{
-
-class ImageViewRGB32;
-class ImageRGB32;
-class EventNotificationOption;
-struct ProgramInfo;
-class ProgramEnvironment;
-class ConsoleHandle;
-
-
-enum class ErrorReport{
-    NO_ERROR_REPORT,
-    SEND_ERROR_REPORT,
-};
-
-
-//  Do not use this class directly. It is just to reuse the screenshot holding
-//  logic that's shared by multiple exception types.
-class ScreenshotException : public Exception{
-public:
-    ScreenshotException() = default;
-    explicit ScreenshotException(ErrorReport error_report, std::string message);
-    explicit ScreenshotException(ErrorReport error_report, std::string message, std::shared_ptr<const ImageRGB32> screenshot);
-    explicit ScreenshotException(ErrorReport error_report, ConsoleHandle& console, std::string message, bool take_screenshot);
-
-public:
-//    virtual const char* name() const override{ return "ScreenshotException"; }
-    virtual std::string message() const override{ return m_message; }
-    ImageViewRGB32 screenshot() const;
-
-    virtual void send_notification(ProgramEnvironment& env, EventNotificationOption& notification) const = 0;
-
-public:
-    ErrorReport m_send_error_report;
-    std::string m_message;
-    std::shared_ptr<const ImageRGB32> m_screenshot;
-};
-
-
-
-
-
-}
-#endif
diff --git a/SerialPrograms/Source/CommonFramework/Exceptions/UnexpectedBattleException.h b/SerialPrograms/Source/CommonFramework/Exceptions/UnexpectedBattleException.h
new file mode 100644
index 0000000000..d94b122df0
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/Exceptions/UnexpectedBattleException.h
@@ -0,0 +1,36 @@
+/*  Unexpected Battle Exception
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_UnexpectedBattleException_H
+#define PokemonAutomation_UnexpectedBattleException_H
+
+#include "OperationFailedExceptionWithScreenshot.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+//  Thrown by subroutines if caught in an wild battle in-game unexpectedly.
+//  These include recoverable errors which can be consumed by the program.
+class UnexpectedBattleException : public OperationFailedExceptionWithScreenshot{
+public:
+    UnexpectedBattleException(
+        ErrorReportMode error_report_mode,
+        std::string message,
+        VideoStream& stream
+    )
+        : OperationFailedExceptionWithScreenshot(error_report_mode, std::move(message), stream)
+    {}
+
+    virtual const char* name() const override{ return "UnexpectedBattleException"; }
+};
+
+
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/GlobalAutoPaths.cpp b/SerialPrograms/Source/CommonFramework/GlobalAutoPaths.cpp
new file mode 100644
index 0000000000..3729840dcf
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/GlobalAutoPaths.cpp
@@ -0,0 +1,158 @@
+/*  Globals Auto-Paths
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Filesystem/Filesystem.h"
+#include "GlobalAutoPaths.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+
+
+namespace{
+
+
+std::string get_resource_path(){
+    //  Find the resource directory.
+    Filesystem::Path base = Filesystem::application_install_path();
+    Filesystem::Path path = base;
+    for (size_t c = 0; c < 5; c++){
+        Filesystem::Path try_path = path / "Resources/";
+        if (exists(try_path)){
+            return try_path.string_slash_normalized();
+        }
+        path = path / "..";
+    }
+    return (base / "Resources/").string_slash_normalized();
+}
+std::string get_unittest_resource_path(){
+    //  Find the unit test resource directory.
+
+    //  Try the intended folder name first.
+    Filesystem::Path base = Filesystem::application_install_path();
+    Filesystem::Path path = base;
+    for (size_t c = 0; c < 5; c++){
+        Filesystem::Path try_path = path / "UnitTestResources/";
+        if (exists(try_path)){
+            return try_path.string_slash_normalized();
+        }
+        path = path / "..";
+    }
+
+    //  Now try with the old command-line folder.
+    path = base;
+    for (size_t c = 0; c < 5; c++){
+        Filesystem::Path try_path = path / "CommandLineTests/";
+        if (exists(try_path)){
+            return try_path.string_slash_normalized();
+        }
+        path = path / "..";
+    }
+
+    return (base / "UnitTestResources/").string_slash_normalized();
+}
+
+std::string get_training_path(){
+    //  Find the training data directory.
+    Filesystem::Path base = Filesystem::application_install_path();
+    Filesystem::Path path = base;
+    for (size_t c = 0; c < 5; c++){
+        Filesystem::Path try_path = path / "TrainingData/";
+        if (exists(try_path)){
+            return try_path.string_slash_normalized();
+        }
+        path = path / "..";
+    }
+
+    return (base / "TrainingData/").string_slash_normalized();
+}
+
+std::string get_setting_path(){
+    return RUNTIME_BASE_PATH() + "UserSettings/";
+}
+std::string get_screenshot_path(){
+    return RUNTIME_BASE_PATH() + "Screenshots/";
+}
+std::string get_debug_path(){
+    return RUNTIME_BASE_PATH() + "DebugDumps/";
+}
+std::string get_error_path(){
+    return RUNTIME_BASE_PATH() + "ErrorDumps/";
+}
+std::string get_user_file_path(){
+    return RUNTIME_BASE_PATH();
+}
+
+} // anonymous namespace
+
+
+
+
+const std::string& RUNTIME_BASE_PATH(){
+    static std::string path = Filesystem::application_scratch_path().string();
+    return path;
+}
+
+const std::string& SETTINGS_PATH(){
+    static std::string path = get_setting_path();
+    return path;
+}
+const std::string& PROGRAM_SETTING_JSON_PATH(){
+    static std::string path = SETTINGS_PATH() + Filesystem::application_binary_name().replace_extension().string() + "-Settings.json";
+    return path;
+}
+const std::string& SCREENSHOTS_PATH(){
+    static std::string path = get_screenshot_path();
+    return path;
+}
+const std::string& DEBUG_PATH(){
+    static std::string path = get_debug_path();
+    return path;
+}
+const std::string& ERROR_PATH(){
+    static std::string path = get_error_path();
+    return path;
+}
+const std::string& USER_FILE_PATH(){
+    static std::string path = get_user_file_path();
+    return path;
+}
+const std::string& RESOURCE_PATH(){
+    static std::string path = get_resource_path();
+    return path;
+}
+const std::string& DOWNLOADED_RESOURCE_PATH(){
+    static std::string path = RUNTIME_BASE_PATH() + "DownloadedResources/";
+    return path;
+}
+const std::string& UNIT_TEST_RESOURCE_PATH(){
+    static std::string path = get_unittest_resource_path();
+    return path;
+}
+
+
+
+
+
+const std::string& TRAINING_PATH(){
+    static std::string path = get_training_path();
+    return path;
+}
+const std::string& ML_ANNOTATION_PATH(){
+    static const std::string path = RUNTIME_BASE_PATH() + "DataAnnotation/";
+    return path;
+}
+const std::string& ML_MODEL_CACHE_PATH(){
+    static const std::string path = RUNTIME_BASE_PATH() + "ModelCache/";
+    return path;
+}
+
+
+
+
+}
diff --git a/SerialPrograms/Source/CommonFramework/GlobalAutoPaths.h b/SerialPrograms/Source/CommonFramework/GlobalAutoPaths.h
new file mode 100644
index 0000000000..46d8526f51
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/GlobalAutoPaths.h
@@ -0,0 +1,59 @@
+/*  Globals Auto-Paths
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_GlobalAutoPaths_H
+#define PokemonAutomation_GlobalAutoPaths_H
+
+#include <string>
+
+namespace PokemonAutomation{
+
+
+// Path to the parent folder that holds all other folders, e.g. settings folder, screenshot folder, etc.
+const std::string& RUNTIME_BASE_PATH();
+
+// Folder path (end with "/") to hold program setting files.
+const std::string& SETTINGS_PATH();
+// The setting JSON file path. This path is a child of the folder SETTINGS_PATH().
+const std::string& PROGRAM_SETTING_JSON_PATH();
+
+// Folder path (end with "/") to hold screenshots from the program "Screenshot" button.
+const std::string& SCREENSHOTS_PATH();
+
+// Folder path (end with "/") to hold debugging images and other debugging files
+const std::string& DEBUG_PATH();
+
+// Folder path (end with "/") to hold error images and other related files here. Useful for debugging the errors.
+const std::string& ERROR_PATH();
+
+// Folder path (end with "/") that holds various user genereated files.
+// e.g. for a program that records and dumps screenshots, the saved images can go to USER_FILE_PATH()/ScreenshotDumper.
+const std::string& USER_FILE_PATH();
+
+// Resource folder path. Resources include JSON files, images, sound files and others required by
+// various automation programs.
+const std::string& RESOURCE_PATH();
+
+// Folder path that holds Downloaded resources
+const std::string& DOWNLOADED_RESOURCE_PATH();
+
+// Folder path that holds the unit test resources.
+const std::string& UNIT_TEST_RESOURCE_PATH();
+
+// Hold ML training data.
+const std::string& TRAINING_PATH();
+
+// Folder path (end with "/") to hold data annotation for ML labeling programs
+const std::string& ML_ANNOTATION_PATH();
+// Folder path (end with "/") to hold model cache for model inferences. This is only used on macOS
+// for the Apple CoreML model acceleration framework to create model cache for faster model inference
+// sessions.
+const std::string& ML_MODEL_CACHE_PATH();
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/GlobalServices.cpp b/SerialPrograms/Source/CommonFramework/GlobalServices.cpp
index ca94fed2e7..a9257efb8c 100644
--- a/SerialPrograms/Source/CommonFramework/GlobalServices.cpp
+++ b/SerialPrograms/Source/CommonFramework/GlobalServices.cpp
@@ -1,30 +1,25 @@
 /*  Global Services
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-//#include "Common/Cpp/Concurrency/ScheduledTaskRunner.h"
 #include "Common/Cpp/Concurrency/Watchdog.h"
+#include "Common/Cpp/Concurrency/PeriodicRunner.h"
+#include "CommonFramework/Tools/GlobalThreadPools.h"
 #include "GlobalServices.h"
 
 namespace PokemonAutomation{
 
 
-#if 0
-AsyncDispatcher& global_async_dispatcher(){
-    static AsyncDispatcher dispatcher(nullptr, 1);
-    return dispatcher;
-}
-ScheduledTaskRunner& global_scheduled_task_runner(){
-    static ScheduledTaskRunner runner(global_async_dispatcher());
-    return runner;
-}
-#endif
 Watchdog& global_watchdog(){
-    static Watchdog watchdog;
+    static Watchdog watchdog(GlobalThreadPools::unlimited_normal());
     return watchdog;
 }
+PeriodicRunner& global_periodic_runner(){
+    static PeriodicRunner runner;
+    return runner;
+}
 
 
 
diff --git a/SerialPrograms/Source/CommonFramework/GlobalServices.h b/SerialPrograms/Source/CommonFramework/GlobalServices.h
index 7d0161584c..7e2aaffb4d 100644
--- a/SerialPrograms/Source/CommonFramework/GlobalServices.h
+++ b/SerialPrograms/Source/CommonFramework/GlobalServices.h
@@ -1,6 +1,6 @@
 /*  Global Services
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -9,15 +9,12 @@
 
 namespace PokemonAutomation{
 
-class AsyncDispatcher;
-class ScheduledTaskRunner;
 class Watchdog;
+class PeriodicRunner;
 
 
-//AsyncDispatcher& global_async_dispatcher();
-//ScheduledTaskRunner& global_scheduled_task_runner();
 Watchdog& global_watchdog();
-
+PeriodicRunner& global_periodic_runner();
 
 
 }
diff --git a/SerialPrograms/Source/CommonFramework/GlobalSettingsPanel.cpp b/SerialPrograms/Source/CommonFramework/GlobalSettingsPanel.cpp
index 8be0a7d391..df38989010 100644
--- a/SerialPrograms/Source/CommonFramework/GlobalSettingsPanel.cpp
+++ b/SerialPrograms/Source/CommonFramework/GlobalSettingsPanel.cpp
@@ -1,92 +1,47 @@
 /*  Global Settings Panel
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include <iostream>
-#include <set>
-#include <QCryptographicHash>
+#ifdef QT_CORE_LIB
+#include <QDesktopServices>
+#include <QUrl>
+#endif
+#include "Common/Cpp/ColoredText.h"
+#include "Common/Cpp/Containers/Pimpl.tpp"
 #include "Common/Cpp/LifetimeSanitizer.h"
+#include "Common/Cpp/Filesystem/Filesystem.h"
 #include "Common/Cpp/Json/JsonValue.h"
 #include "Common/Cpp/Json/JsonArray.h"
 #include "Common/Cpp/Json/JsonObject.h"
-#include "CommonFramework/Globals.h"
+#include "Common/Cpp/Options/KeyboardLayoutOption.h"
+#include "CommonFramework/StaticGlobals.h"
+#include "CommonFramework/GlobalAutoPaths.h"
+#include "CommonFramework/Logging/Logger.h"
+#include "CommonFramework/Options/CheckForUpdatesOption.h"
+#include "CommonFramework/Options/ResolutionOption.h"
+#include "CommonFramework/Options/Environment/SleepSuppressOption.h"
+#include "CommonFramework/Options/Environment/ThemeSelectorOption.h"
+#include "CommonFramework/Options/Environment/PerformanceOptions.h"
+#include "CommonFramework/Recording/StreamHistoryOption.h"
+#include "CommonFramework/AudioPipeline/AudioPipelineOptions.h"
+#include "CommonFramework/VideoPipeline/VideoPipelineOptions.h"
+#include "CommonFramework/ErrorReports/ErrorReports.h"
+#include "Controllers/ControllerSettings.h"
 //#include "CommonFramework/Environment/Environment.h"
-#include "CommonFramework/Windows/DpiScaler.h"
+#include "Integrations/DiscordSettingsOption.h"
+#include "CommonFramework/Options/DeviceDropdownAliases.h"
 #include "GlobalSettingsPanel.h"
 
-//#include <iostream>
-//using std::cout;
-//using std::endl;
+// #include <iostream>
+// using std::cout;
+// using std::endl;
 
 namespace PokemonAutomation{
 
 
-const std::set<std::string> TOKENS{
-//    "f6538243092d8a3b9959bca988f054e1670f57c7246df2cbba25c4df3fe7a4e7",
-    "2d04af67f6520e3550842d7eeb292868c6d0d4809b607f5a454712023d8815e1",
-    "475d0a0a305a02cbf8b602bd47c3b275dccd5ac19fbe480729804a8e4e360b71",
-    "6643d9fe87b3e54dc75dfac8ac22f0cc8bd17f6a8a786debf5fc4c517ee65469",
-    "8e48e38e49bffc8462ada9d2d9d850d5b3b5c9529d20978c09bc548bc9a614a4",
-    "7694adee4419d62c6a923c4efc9e7b41def7b96bb84ea882701b0bf2e8c13bee",
-    "e8d168bc482e96553ea9f9ecaea5a817474dbccc2a6a228a6bde67f2b2aa2889", //  James' token.
-    "7555b7c63481cad42306718c67e7f9def5bfd1da8f6cd299ccd3d7dc95f307ae", //  Kuro's token.
-};
-
-
-
-ResolutionOption::ResolutionOption(
-    std::string label, std::string description,
-    int default_width, int default_height
-)
-    : GroupOption(std::move(label), LockWhileRunning::LOCKED)
-    , DESCRIPTION(std::move(description))
-    , WIDTH("<b>Width:</b>", LockWhileRunning::LOCKED, scale_dpi_width(default_width))
-    , HEIGHT("<b>Height:</b>", LockWhileRunning::LOCKED, scale_dpi_height(default_height))
-{
-    PA_ADD_STATIC(DESCRIPTION);
-    PA_ADD_OPTION(WIDTH);
-    PA_ADD_OPTION(HEIGHT);
-}
-
-
-
-
-PreloadSettings::PreloadSettings(){}
-PreloadSettings& PreloadSettings::instance(){
-    static PreloadSettings settings;
-    return settings;
-}
-DebugSettings& PreloadSettings::debug(){
-    return PreloadSettings::instance().DEBUG;
-}
-
-void PreloadSettings::load(const JsonValue& json){
-    const JsonObject* obj = json.get_object();
-    if (obj == nullptr){
-        return;
-    }
-
-    //  Naughty mode.
-    obj->read_boolean(NAUGHTY_MODE, "NAUGHTY_MODE");
-
-    //  Developer mode stuff.
-    const std::string* dev_token = obj->get_string("DEVELOPER_TOKEN");
-    if (dev_token){
-        QCryptographicHash hash(QCryptographicHash::Algorithm::Sha256);
-        hash.addData(dev_token->c_str(), (int)dev_token->size());
-        DEVELOPER_MODE = TOKENS.find(hash.result().toHex().toStdString()) != TOKENS.end();
-    }
-
-    const JsonObject* debug_obj = obj->get_object("DEBUG");
-    if (debug_obj){
-        debug_obj->read_boolean(DEBUG.COLOR_CHECK, "COLOR_CHECK");
-        debug_obj->read_boolean(DEBUG.IMAGE_TEMPLATE_MATCHING, "IMAGE_TEMPLATE_MATCHING");
-    }
-}
-
-
 
 
 GlobalSettings& GlobalSettings::instance(){
@@ -94,315 +49,310 @@ GlobalSettings& GlobalSettings::instance(){
     return settings;
 }
 GlobalSettings::~GlobalSettings(){
-    ENABLE_LIFETIME_SANITIZER.remove_listener(*this);
+    ENABLE_LIFETIME_SANITIZER0.remove_listener(*this);
+    OPEN_BASE_FOLDER_BUTTON.remove_listener(static_cast<ButtonListener&>(*this));
 }
 GlobalSettings::GlobalSettings()
-    : BatchOption(LockWhileRunning::LOCKED)
-    , SEND_ERROR_REPORTS(
-        "<b>Send Error Reports:</b><br>"
-        "Send error reports to the " + PROGRAM_NAME + " server to help them resolve issues and improve the program.",
-        LockWhileRunning::LOCKED,
-        false
+    : BatchOption(LockMode::LOCK_WHILE_RUNNING)
+    , CHECK_FOR_UPDATES(CONSTRUCT_TOKEN)
+    , OPEN_BASE_FOLDER_BUTTON(
+        "<b>Runtime Base Folder:</b>",
+        "Open Folder"
     )
     , STATS_FILE(
         false,
         "<b>Stats File:</b><br>Use the stats file here. Multiple instances of the program can use the same file.",
-        LockWhileRunning::LOCKED,
+        LockMode::LOCK_WHILE_RUNNING,
+#if defined(__APPLE__)
+        Filesystem::application_scratch_path().string() + "/UserSettings/PA-Stats.txt",
+        Filesystem::application_scratch_path().string() + "/UserSettings/PA-Stats.txt"
+#else
         "UserSettings/PA-Stats.txt",
         "UserSettings/PA-Stats.txt"
+#endif
     )
-    , ALL_STATS(
-        "<b>All Stats:</b><br>Include all-time stats for notifications.",
-        LockWhileRunning::UNLOCKED,
-        true
+    , TEMP_FOLDER(
+        false,
+        "<b>Temp Folder:</b><br>Place temporary files in this directory.",
+        LockMode::LOCK_WHILE_RUNNING,
+#if defined(__APPLE__)
+        Filesystem::application_scratch_path().string() + "/TempFiles/",
+        Filesystem::application_scratch_path().string() + "/TempFiles/"
+#else
+        "TempFiles/",
+        "TempFiles/"
+#endif
     )
-    , CHECK_FOR_UPDATES(
-        "<b>Check for Updates:</b><br>Automatically check for updates.",
-        LockWhileRunning::UNLOCKED,
-        true
+    , THEME(CONSTRUCT_TOKEN)
+    , OCR_LIBRARY(
+        "<b>OCR library:",
+        {
+            {OcrLibrary::PADDLE_OCR,         "paddle-ocr",           "Paddle OCR"},
+            {OcrLibrary::TESSERACT,            "tesseract",              "Tesseract"},
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        OcrLibrary::PADDLE_OCR
+    )
+    , OCR_WARNING(
+        "WARNING: If you change the OCR library away from the default (PaddleOCR), you must ensure that you have the necessary resource downloaded. "
+        "Otherwise, the programs that use OCR will throw an error."
     )
     , WINDOW_SIZE(
-        "Window Size:",
-        "Set the size of the window. Takes effect immediately.<br>"
+        CONSTRUCT_TOKEN,
+        "Window Size/Position:",
+        "Set the size/position of the window. Takes effect immediately.<br>"
         "Use this to easily set the window to a specific resolution for streaming alignment.",
-        1280, 720
+        1280, 1000,
+        0, 0,
+        false
+    )
+    , LOG_WINDOW_SIZE(
+        CONSTRUCT_TOKEN,
+        "Output Window Size/Position:",
+        "Set the size/position of the output window. Takes effect immediately.<br>",
+        600, 1200,
+        0, 0,
+        false
+    )
+    , LOG_WINDOW_STARTUP(
+        "<b>Open Output Window at startup:</b>",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        false
     )
+    , KEYBOARD_CONTROLS_LAYOUT(
+        CONSTRUCT_TOKEN,
+        "<b>System Keyboard Layout:</b><br>"
+        "This is the keyboard layout of your system. "
+        "This is needed for the HID keyboard controller to work correctly.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        KeyboardLayout::QWERTY
+    )
+    , DEVICE_ALIASES(CONSTRUCT_TOKEN)
+    , STREAM_HISTORY(CONSTRUCT_TOKEN)
+    , SLEEP_SUPPRESS(CONSTRUCT_TOKEN)
     , m_discord_settings(
         "<font size=4><b>Discord Settings:</b> Integrate with Discord. (" +
         make_text_url(
-            ONLINE_DOC_URL + "ComputerControl/blob/master/Wiki/Software/DiscordIntegration.md",
+            ONLINE_DOC_URL_BASE + "DiscordIntegration/index.html",
             "online documentation"
         ) + ")</font>"
     )
+    , RICH_PRESENCE(
+        "<b>Enable Rich Presence:</b><br>"
+        "Display program activity and status under your Discord user.<br>"
+        "Restart the program for the change to take effect.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        true
+    )
+    , ALL_STATS(
+        "<b>All Stats:</b><br>Include all-time stats for notifications.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        true
+    )
+    , DISCORD(CONSTRUCT_TOKEN)
     , m_advanced_options(
         "<font size=4><b>Advanced Options:</b> You should not need to touch anything below here.</font>"
     )
-    , LOG_EVERYTHING(
-        "<b>Log Everything:</b><br>Log everything to the output window and output log. Will be very spammy.",
-        LockWhileRunning::UNLOCKED,
+    , DUMP_VIDEO_FORMATS(
+        "<b>Dump Video Formats:</b><br>Log all video formats supported by your capture card.",
+        LockMode::UNLOCK_WHILE_RUNNING,
         false
     )
     , SAVE_DEBUG_IMAGES(
         "<b>Save Debug Images:</b><br>"
         "If the program fails to read something when it should succeed, save the image for debugging purposes.",
-        LockWhileRunning::LOCKED,
+        LockMode::LOCK_WHILE_RUNNING,
         true
     )
-//    , NAUGHTY_MODE_OPTION("<b>Naughty Mode:</b>", false)
-    , HIDE_NOTIF_DISCORD_LINK(
-        "<b>Hide Discord Link in Notifications:</b><br>"
-        "Many Discord servers have rules forbidding links to other Discord servers. "
-        "Checking this box will hide the support link that appears in the footer of every Discord notification.",
-        LockWhileRunning::UNLOCKED,
+    , SAVE_DEBUG_VIDEOS_ON_SWITCH(
+        "<b>Save Debug Videos on Switch:</b><br>"
+        "If the program fails, save a video on Switch for debugging purposes.",
+        LockMode::LOCK_WHILE_RUNNING,
         false
     )
-    , REALTIME_THREAD_PRIORITY0(
-        "<b>Realtime Thread Priority:</b><br>"
-        "Thread priority of real-time threads. (UI thread, audio threads)<br>"
-        "Restart the program for this to fully take effect.",
-        DEFAULT_PRIORITY_REALTIME
-    )
-    , INFERENCE_PRIORITY0(
-        "<b>Inference Priority:</b><br>"
-        "Thread priority of inference threads. (image/sound recognition)",
-        DEFAULT_PRIORITY_INFERENCE
-    )
-    , COMPUTE_PRIORITY0(
-        "<b>Compute Priority:</b><br>"
-        "Thread priority of computation threads.",
-        DEFAULT_PRIORITY_COMPUTE
-    )
-    , AUDIO_FILE_VOLUME_SCALE(
-        "<b>Audio File Input Volume Scale:</b><br>"
-        "Multiply audio file playback by this factor. (This is linear scale. So each factor of 10 is 20dB.)",
-        LockWhileRunning::UNLOCKED,
-        0.31622776601683793320, //  -10dB
-        -10000, 10000
-    )
-    , AUDIO_DEVICE_VOLUME_SCALE(
-        "<b>Audio Device Input Volume Scale:</b><br>"
-        "Multiply audio device input by this factor. (This is linear scale. So each factor of 10 is 20dB.)",
-        LockWhileRunning::UNLOCKED,
-        1.0, -10000, 10000
-    )
-    , SHOW_ALL_AUDIO_DEVICES(
-        "<b>Show all Audio Devices:</b><br>"
-        "Show all audio devices - including duplicates.",
-        LockWhileRunning::UNLOCKED,
-        false
-    )
-    , SHOW_RECORD_FREQUENCIES(
-        "<b>Show Record Frequencies:</b><br>"
-        "Show option to record audio frequencies.",
-        LockWhileRunning::UNLOCKED,
-        false
-    )
-    , ENABLE_AUTO_RESET_AUDIO(
-        "<b>Enable Auto reset of the audio:</b><br>"
-        "Attempt to reset the audio when there was no audio frame in the last 5 seconds (in order to fix issues with RDP disconnection, etc).",
-        LockWhileRunning::UNLOCKED,
-        true
-    )
-    , ENABLE_FRAME_SCREENSHOTS(
-        "<b>Enable Frame Screenshots:</b><br>"
-        "Attempt to use QVideoProbe and QVideoFrame for screenshots.",
-        LockWhileRunning::UNLOCKED,
-        true
-    )
-    , ENABLE_LIFETIME_SANITIZER(
+//    , NAUGHTY_MODE_OPTION("<b>Naughty Mode:</b>", false)
+    , AUDIO_PIPELINE(CONSTRUCT_TOKEN)
+    , VIDEO_PIPELINE(CONSTRUCT_TOKEN)
+    , ENABLE_LIFETIME_SANITIZER0(
         "<b>Enable Lifetime Sanitizer: (for debugging)</b><br>"
-        "Check for C++ object lifetime violations. Terminate program with stack dump if violations are found.",
-        LockWhileRunning::UNLOCKED,
-        IS_BETA_VERSION
+        "Check for C++ object lifetime violations. Terminate program with stack dump if violations are found. "
+        "If enabling, you must restart the program for it to take effect.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        true
+//        IS_BETA_VERSION
     )
+    , ERROR_REPORTS(CONSTRUCT_TOKEN)
     , DEVELOPER_TOKEN(
         true,
         "<b>Developer Token:</b><br>Restart application to take full effect after changing this.",
-        LockWhileRunning::LOCKED,
+        LockMode::LOCK_WHILE_RUNNING,
         "", ""
     )
 {
-    PA_ADD_OPTION(SEND_ERROR_REPORTS);
-    PA_ADD_OPTION(STATS_FILE);
-    PA_ADD_OPTION(ALL_STATS);
+    PA_ADD_OPTION(OPEN_BASE_FOLDER_BUTTON);
     PA_ADD_OPTION(CHECK_FOR_UPDATES);
-    PA_ADD_OPTION(WINDOW_SIZE);
+    PA_ADD_OPTION(STATS_FILE);
+    PA_ADD_OPTION(TEMP_FOLDER);
     PA_ADD_OPTION(THEME);
+    PA_ADD_OPTION(WALLPAPER);
+    PA_ADD_OPTION(OCR_LIBRARY);
+
+    // gated behind Dev mode. see GlobalSettings::load_json
+    // PA_ADD_OPTION(OCR_WARNING); // TODO: enable this when Tesseract is no longer a default resource.
+    PA_ADD_OPTION(RESOURCE_DOWNLOAD_TABLE);
+    PA_ADD_OPTION(DOWNLOAD_ERROR);
+
+    PA_ADD_OPTION(WINDOW_SIZE);
+    PA_ADD_OPTION(LOG_WINDOW_SIZE);
+    PA_ADD_OPTION(LOG_WINDOW_STARTUP);
+
+    PA_ADD_OPTION(KEYBOARD_CONTROLS_LAYOUT);
+    PA_ADD_OPTION(DEVICE_ALIASES);
+    PA_ADD_OPTION(STREAM_HISTORY);
+
+#ifdef PA_ENABLE_SLEEP_SUPPRESS
+    PA_ADD_OPTION(SLEEP_SUPPRESS);
+#endif
 
     PA_ADD_STATIC(m_discord_settings);
+#ifdef PA_SOCIAL_SDK
+    PA_ADD_OPTION(RICH_PRESENCE);
+#endif
+    PA_ADD_OPTION(ALL_STATS);
     PA_ADD_OPTION(DISCORD);
 
     PA_ADD_STATIC(m_advanced_options);
-    PA_ADD_OPTION(LOG_EVERYTHING);
+    add_option(PokemonAutomation::LOG_EVERYTHING(), "LOG_EVERYTHING");
+    PA_ADD_OPTION(DUMP_VIDEO_FORMATS);
     PA_ADD_OPTION(SAVE_DEBUG_IMAGES);
+
+    // gated behind Dev mode. see GlobalSettings::load_json
+    PA_ADD_OPTION(SAVE_DEBUG_VIDEOS_ON_SWITCH);
 //    PA_ADD_OPTION(NAUGHTY_MODE);
-    PA_ADD_OPTION(HIDE_NOTIF_DISCORD_LINK);
 
-    PA_ADD_OPTION(REALTIME_THREAD_PRIORITY0);
-    PA_ADD_OPTION(INFERENCE_PRIORITY0);
-    PA_ADD_OPTION(COMPUTE_PRIORITY0);
+    add_option(PerformanceOptions::instance(), "PERFORMANCE");
 
-    PA_ADD_OPTION(AUDIO_FILE_VOLUME_SCALE);
-    PA_ADD_OPTION(AUDIO_DEVICE_VOLUME_SCALE);
-    PA_ADD_OPTION(SHOW_ALL_AUDIO_DEVICES);
-    if (PreloadSettings::instance().DEVELOPER_MODE){
-        PA_ADD_OPTION(SHOW_RECORD_FREQUENCIES);
-    }
-    PA_ADD_OPTION(ENABLE_AUTO_RESET_AUDIO);
-    PA_ADD_OPTION(VIDEO_BACKEND);
-#if QT_VERSION_MAJOR == 5
-    PA_ADD_OPTION(ENABLE_FRAME_SCREENSHOTS);
-#endif
-    PA_ADD_OPTION(ENABLE_LIFETIME_SANITIZER);
+    PA_ADD_OPTION(AUDIO_PIPELINE);
+    PA_ADD_OPTION(VIDEO_PIPELINE);
+
+    add_option(ControllerSettings::instance().COMMAND_QUEUE_LIMIT, "COMMAND_QUEUE_LIMIT");
+    // gated behind Dev mode. see GlobalSettings::load_json
+    add_option(ControllerSettings::instance().DEVICE_LOGGING_FLAG, "DEVICE_LOGGING_FLAG");
 
-    PA_ADD_OPTION(PROCESSOR_LEVEL0);
+
+    PA_ADD_OPTION(ENABLE_LIFETIME_SANITIZER0);
+
+#ifdef PA_OFFICIAL
+    PA_ADD_OPTION(ERROR_REPORTS);
+#endif
 
     PA_ADD_OPTION(DEVELOPER_TOKEN);
 
-    GlobalSettings::value_changed();
-    ENABLE_LIFETIME_SANITIZER.add_listener(*this);
+    DOWNLOAD_ERROR.set_visibility(ConfigOptionState::HIDDEN);
+    SAVE_DEBUG_VIDEOS_ON_SWITCH.set_visibility(ConfigOptionState::HIDDEN);
+    ControllerSettings::instance().DEVICE_LOGGING_FLAG.set_visibility(ConfigOptionState::HIDDEN);
+
+    GlobalSettings::on_config_value_changed(this);
+    ENABLE_LIFETIME_SANITIZER0.add_listener(*this);
+    OPEN_BASE_FOLDER_BUTTON.add_listener(static_cast<ButtonListener&>(*this));
 }
 
+JsonValue GlobalSettings::to_json() const{
+    JsonObject obj = std::move(*BatchOption::to_json().to_object());
+    obj["NAUGHTY_MODE"] = STATIC_GLOBALS.NAUGHTY_MODE;
+
+    JsonObject command_line_test_obj;
+    command_line_test_obj["RUN"] = COMMAND_LINE_TEST_MODE;
+    obj["COMMAND_LINE_TESTS"] = std::move(command_line_test_obj);
+    obj["DEBUG"] = STATIC_GLOBALS.to_json_debug();
+
+    return obj;
+}
 void GlobalSettings::load_json(const JsonValue& json){
-    const JsonObject* obj = json.get_object();
+    const JsonObject* obj = json.to_object();
     if (obj == nullptr){
         return;
     }
 
-    PreloadSettings::instance().load(json);
-
+    STATIC_GLOBALS.load_json(json);
     BatchOption::load_json(json);
 
+    // cout << "DEVELOPER_MODE: " << STATIC_GLOBALS.DEVELOPER_MODE << endl;
+    // cout << "INTERNAL_DEVELOPER_MODE: " << STATIC_GLOBALS.INTERNAL_DEVELOPER_MODE << endl;
+    const bool developer_mode = STATIC_GLOBALS.DEVELOPER_MODE;
+
+    ConfigOptionState devmode_visibility = developer_mode
+        ? ConfigOptionState::ENABLED
+        : ConfigOptionState::HIDDEN;
+    DOWNLOAD_ERROR.set_visibility(devmode_visibility);
+    SAVE_DEBUG_VIDEOS_ON_SWITCH.set_visibility(devmode_visibility);
+    PerformanceOptions::instance().ONNX_OPTIONS.USE_GPU.set_visibility(devmode_visibility);
+    ControllerSettings::instance().DEVICE_LOGGING_FLAG.set_visibility(devmode_visibility);
+
     //  Remake this to update the color.
     m_discord_settings.set_text(
         "<font size=4><b>Discord Settings:</b> Integrate with Discord. (" +
         make_text_url(
-            ONLINE_DOC_URL + "ComputerControl/blob/master/Wiki/Software/DiscordIntegration.md",
+            ONLINE_DOC_URL_BASE + "DiscordIntegration/index.html",
             "online documentation"
         ) + ")</font>"
     );
 
-    COMMAND_LINE_TEST_LIST.clear();
-    COMMAND_LINE_IGNORE_LIST.clear();
     const JsonObject* command_line_tests_setting = obj->get_object("COMMAND_LINE_TESTS");
     if (command_line_tests_setting){
         command_line_tests_setting->read_boolean(COMMAND_LINE_TEST_MODE, "RUN");
-
-        if (!command_line_tests_setting->read_string(COMMAND_LINE_TEST_FOLDER, "FOLDER")){
-            COMMAND_LINE_TEST_FOLDER = "CommandLineTests";
-        }
-
-        const JsonArray* test_list = command_line_tests_setting->get_array("TEST_LIST");
-        if (test_list){
-            for (const auto& value: *test_list){
-                if (!value.is_string()){
-                    continue;
-                }
-                const std::string* test_name = value.get_string();
-                if (test_name != nullptr && !test_name->empty()){
-                    COMMAND_LINE_TEST_LIST.emplace_back(*test_name);
-                }
-            }
-        }
-        const JsonArray* ignore_list = command_line_tests_setting->get_array("IGNORE_LIST");
-        if (ignore_list){
-            for (const auto& value: *ignore_list){
-                if (!value.is_string()){
-                    continue;
-                }
-                const std::string* test_name = value.get_string();
-                if (test_name != nullptr && !test_name->empty()){
-                    COMMAND_LINE_IGNORE_LIST.emplace_back(*test_name);
-                }
-            }
-        }
-
         if (COMMAND_LINE_TEST_MODE){
-            std::cout << "Enter command line test mode:" << std::endl;
-            if (COMMAND_LINE_TEST_LIST.size() > 0){
-                std::cout << "Run following tests: " << std::endl;
-                for(const auto& name : COMMAND_LINE_TEST_LIST){
-                    std::cout << "- " << name << std::endl;
-                }
-            }
-            if (COMMAND_LINE_IGNORE_LIST.size() > 0){
-                std::cout << "Ignore following paths: " << std::endl;
-                for(const auto& name : COMMAND_LINE_IGNORE_LIST){
-                    std::cout << "- " << name << std::endl;
-                }
-            }
+            std::cout << "Enter command line test mode." << std::endl;
         }
     }
 }
 
 
-JsonValue GlobalSettings::to_json() const{
-    JsonObject obj = std::move(*BatchOption::to_json().get_object());
-    obj["NAUGHTY_MODE"] = PreloadSettings::instance().NAUGHTY_MODE;
-
-    JsonObject command_line_test_obj;
-    command_line_test_obj["RUN"] = COMMAND_LINE_TEST_MODE;
-    command_line_test_obj["FOLDER"] = COMMAND_LINE_TEST_FOLDER;
-
-    {
-        JsonArray test_list;
-        for(const auto& name : COMMAND_LINE_TEST_LIST){
-            test_list.push_back(name);
-        }
-        command_line_test_obj["TEST_LIST"] = std::move(test_list);
-    }
-
-    {
-        JsonArray ignore_list;
-        for(const auto& name : COMMAND_LINE_IGNORE_LIST){
-            ignore_list.push_back(name);
-        }
-        command_line_test_obj["IGNORE_LIST"] = std::move(ignore_list);
-    }
 
-    obj["COMMAND_LINE_TESTS"] = std::move(command_line_test_obj);
-
-    JsonObject debug_obj;
-    const auto& debug_settings = PreloadSettings::instance().DEBUG;
-    debug_obj["COLOR_CHECK"] = debug_settings.COLOR_CHECK;
-    debug_obj["IMAGE_TEMPLATE_MATCHING"] = debug_settings.IMAGE_TEMPLATE_MATCHING;
-    obj["DEBUG"] = std::move(debug_obj);
-
-    return obj;
-}
-
-void GlobalSettings::value_changed(){
-    bool enabled = ENABLE_LIFETIME_SANITIZER;
-    LifetimeSanitizer::set_enabled(enabled);
+void GlobalSettings::on_config_value_changed(void* object){
+    bool enabled = ENABLE_LIFETIME_SANITIZER0;
     if (enabled){
         global_logger_tagged().log("LifeTime Sanitizer: Enabled", COLOR_BLUE);
     }else{
         global_logger_tagged().log("LifeTime Sanitizer: Disabled", COLOR_BLUE);
+        LifetimeSanitizer::disable();
     }
 }
 
+void GlobalSettings::on_press(ButtonCell& button){
+#ifdef QT_CORE_LIB
+    if (&button == &OPEN_BASE_FOLDER_BUTTON){
+        // Open the runtime base folder in the system file manager
+        QDesktopServices::openUrl(QUrl::fromLocalFile(QString::fromStdString(RUNTIME_BASE_PATH())));
+        return;
+    }
+#endif
+}
 
+void GlobalSettings::connect_row_with_download(const std::string& resource_slug, std::shared_ptr<ResourceDownload>& download_ptr){
+    RESOURCE_DOWNLOAD_TABLE.connect_row_with_download(resource_slug, download_ptr);
+}
 
 
-
-
-PanelDescriptorWrapper<GlobalSettings_Descriptor, GlobalSettingsPanel> GlobalSettings_Descriptor::INSTANCE;
-
 GlobalSettings_Descriptor::GlobalSettings_Descriptor()
-    : PanelDescriptor(
-        Color(),
+    : OptionsPanelDescriptor(
         "",
         "Global Settings", "Global Settings",
         "",
-        "Global Settings"
+        "Global Settings",
+        PanelQualityStanding::OFFICIAL
     )
 {}
+GlobalSettings_Descriptor::Wrapper& GlobalSettings_Descriptor::instance(){
+    static Wrapper wrapper;
+    return wrapper;
+}
 
 
-GlobalSettingsPanel::GlobalSettingsPanel(const GlobalSettings_Descriptor& descriptor)
-    : SettingsPanelInstance(descriptor)
-    , settings(GlobalSettings::instance())
+GlobalSettingsPanel::GlobalSettingsPanel()
+    : settings(GlobalSettings::instance())
 {
+    settings.DEVICE_ALIASES->add_connected_devices();
     PA_ADD_OPTION(settings);
 }
 
diff --git a/SerialPrograms/Source/CommonFramework/GlobalSettingsPanel.h b/SerialPrograms/Source/CommonFramework/GlobalSettingsPanel.h
index 59e799fd80..29ef1fff03 100644
--- a/SerialPrograms/Source/CommonFramework/GlobalSettingsPanel.h
+++ b/SerialPrograms/Source/CommonFramework/GlobalSettingsPanel.h
@@ -1,25 +1,23 @@
 /*  Global Settings Panel
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifndef PokemonAutomation_GlobalSettingsPanel_H
 #define PokemonAutomation_GlobalSettingsPanel_H
 
+#include "Common/Cpp/Containers/Pimpl.h"
+#include "Common/Cpp/Options/EnumDropdownOption.h"
 #include "Common/Cpp/Options/ConfigOption.h"
 #include "Common/Cpp/Options/StaticTextOption.h"
 #include "Common/Cpp/Options/BooleanCheckBoxOption.h"
-#include "Common/Cpp/Options/SimpleIntegerOption.h"
-#include "Common/Cpp/Options/FloatingPointOption.h"
 #include "Common/Cpp/Options/StringOption.h"
-#include "CommonFramework/Options/Environment/ProcessPriorityOption.h"
-#include "CommonFramework/Options/Environment/ProcessorLevelOption.h"
-#include "CommonFramework/Options/Environment/ThemeSelectorOption.h"
-#include "CommonFramework/VideoPipeline/Backends/CameraImplementations.h"
-#include "CommonFramework/Panels/SettingsPanel.h"
-#include "CommonFramework/Panels/PanelTools.h"
-#include "Integrations/DiscordSettingsOption.h"
+#include "Common/Cpp/Options/ButtonOption.h"
+#include "CommonFramework/Options/WallpaperOption.h"
+#include "CommonFramework/Panels/OptionsPanel.h"
+#include "CommonFramework/ResourceDownload/SettingsResourceDownloadOptions.h"
+#include "CommonFramework/ResourceDownload/SettingsResourceDownloadTable.h"
 
 //#include <iostream>
 //using std::cout;
@@ -27,107 +25,105 @@
 
 namespace PokemonAutomation{
 
+class CheckForUpdatesOption;
+class ThemeSelectorOption;
+class ResolutionOption;
+class KeyboardLayoutOption;
+class StreamHistoryOption;
+class SleepSuppressOptions;
+class DeviceAliasOptions;
+namespace Integration{
+    class DiscordSettingsOption;
+}
+class AudioPipelineOptions;
+class VideoPipelineOptions;
+class ErrorReportOption;
+class ResourceDownload;
 
 
-
-class ResolutionOption : public GroupOption{
-public:
-    ResolutionOption(
-        std::string label, std::string description,
-        int default_width, int default_height
-    );
-
-    StaticTextOption DESCRIPTION;
-    SimpleIntegerOption<uint32_t> WIDTH;
-    SimpleIntegerOption<uint32_t> HEIGHT;
-};
-
-
-
-struct DebugSettings{
-    bool COLOR_CHECK = false;
-    bool IMAGE_TEMPLATE_MATCHING = false;
+enum class OcrLibrary{
+    PADDLE_OCR,
+    TESSERACT,
 };
 
 
-
-class PreloadSettings{
-    PreloadSettings();
+class FolderInputOption : public StringOption{
 public:
-    static PreloadSettings& instance();
-    static DebugSettings& debug();
-
-    void load(const JsonValue& json);
-
-    bool NAUGHTY_MODE = false;
-    bool DEVELOPER_MODE = false;
+    using StringOption::StringOption;
 
-    DebugSettings DEBUG;
+    virtual void sanitize(std::string& str) override{
+        if (!str.empty() && str.back() != '/'){
+            str += '/';
+        }
+    }
 };
 
 
 
-class GlobalSettings : public BatchOption, private ConfigOption::Listener{
+
+class GlobalSettings : public BatchOption, private ConfigOption::Listener, private ButtonListener{
     ~GlobalSettings();
     GlobalSettings();
 public:
     static GlobalSettings& instance();
 
-    virtual void load_json(const JsonValue& json) override;
     virtual JsonValue to_json() const override;
+    virtual void load_json(const JsonValue& json) override;
+
+    void connect_row_with_download(const std::string& resource_slug, std::shared_ptr<ResourceDownload>& download_ptr);
 
 private:
-    virtual void value_changed() override;
+    virtual void on_config_value_changed(void* object) override;
+    virtual void on_press(ButtonCell& button) override;
 
 public:
-    BooleanCheckBoxOption SEND_ERROR_REPORTS;
+    Pimpl<CheckForUpdatesOption> CHECK_FOR_UPDATES;
 
+    ButtonOption OPEN_BASE_FOLDER_BUTTON;
     StringOption STATS_FILE;
-    BooleanCheckBoxOption ALL_STATS;
-    BooleanCheckBoxOption CHECK_FOR_UPDATES;
+    FolderInputOption TEMP_FOLDER;
 
-    ResolutionOption WINDOW_SIZE;
-    ThemeSelectorOption THEME;
+    Pimpl<ThemeSelectorOption> THEME;
+    WallpaperOption WALLPAPER;
+    EnumDropdownOption<OcrLibrary> OCR_LIBRARY;
+    StaticTextOption OCR_WARNING;
+    SettingsResourceDownloadTable RESOURCE_DOWNLOAD_TABLE;
+    SettingsDownloadError DOWNLOAD_ERROR;
+    Pimpl<ResolutionOption> WINDOW_SIZE;
+    Pimpl<ResolutionOption> LOG_WINDOW_SIZE;
+    BooleanCheckBoxOption LOG_WINDOW_STARTUP;
+
+    Pimpl<KeyboardLayoutOption> KEYBOARD_CONTROLS_LAYOUT;
+
+    Pimpl<DeviceAliasOptions> DEVICE_ALIASES;
+
+    Pimpl<StreamHistoryOption> STREAM_HISTORY;
+    Pimpl<SleepSuppressOptions> SLEEP_SUPPRESS;
 
     SectionDividerOption m_discord_settings;
-    Integration::DiscordSettingsOption DISCORD;
+    BooleanCheckBoxOption RICH_PRESENCE;
+    BooleanCheckBoxOption ALL_STATS;
+    Pimpl<Integration::DiscordSettingsOption> DISCORD;
 
     SectionDividerOption m_advanced_options;
 
-    BooleanCheckBoxOption LOG_EVERYTHING;
+    BooleanCheckBoxOption DUMP_VIDEO_FORMATS;
     BooleanCheckBoxOption SAVE_DEBUG_IMAGES;
+    BooleanCheckBoxOption SAVE_DEBUG_VIDEOS_ON_SWITCH;
 //    BooleanCheckBoxOption NAUGHTY_MODE_OPTION;
 
-    BooleanCheckBoxOption HIDE_NOTIF_DISCORD_LINK;
-
-//    ProcessPriorityOption PROCESS_PRIORITY0;
-    ThreadPriorityOption REALTIME_THREAD_PRIORITY0;
-    ThreadPriorityOption INFERENCE_PRIORITY0;
-    ThreadPriorityOption COMPUTE_PRIORITY0;
+    Pimpl<AudioPipelineOptions> AUDIO_PIPELINE;
+    Pimpl<VideoPipelineOptions> VIDEO_PIPELINE;
 
-    FloatingPointOption AUDIO_FILE_VOLUME_SCALE;
-    FloatingPointOption AUDIO_DEVICE_VOLUME_SCALE;
-    BooleanCheckBoxOption SHOW_ALL_AUDIO_DEVICES;
-    BooleanCheckBoxOption SHOW_RECORD_FREQUENCIES;
-    BooleanCheckBoxOption ENABLE_AUTO_RESET_AUDIO;
-    VideoBackendOption VIDEO_BACKEND;
-    BooleanCheckBoxOption ENABLE_FRAME_SCREENSHOTS;
-    BooleanCheckBoxOption ENABLE_LIFETIME_SANITIZER;
+    BooleanCheckBoxOption ENABLE_LIFETIME_SANITIZER0;
 
-    ProcessorLevelOption PROCESSOR_LEVEL0;
+    Pimpl<ErrorReportOption> ERROR_REPORTS;
 
     StringOption DEVELOPER_TOKEN;
 
-    // The mode that does not run Qt GUI, but instead runs some tests for
-    // debugging, unit testing and developing purposes.
+    // The mode that does not run Qt GUI, but instead runs all the unit tests.
+    // See Tests/CommandLineTests.h.
     bool COMMAND_LINE_TEST_MODE = false;
-    // The path to the command line test folder.
-    std::string COMMAND_LINE_TEST_FOLDER;
-    // Which tests to run if in the command line test mode.
-    std::vector<std::string> COMMAND_LINE_TEST_LIST;
-    // Which tests to ignore running under the command line test mode.
-    // If a test path appears in both COMMAND_LINE_TEST_LIST and COMMAND_LINE_IGNORE_LIST, it's still ignored.
-    std::vector<std::string> COMMAND_LINE_IGNORE_LIST;
 };
 
 
@@ -136,17 +132,19 @@ class GlobalSettings : public BatchOption, private ConfigOption::Listener{
 
 class GlobalSettingsPanel;
 
-class GlobalSettings_Descriptor : public PanelDescriptor{
+class GlobalSettings_Descriptor : public OptionsPanelDescriptor{
 public:
     GlobalSettings_Descriptor();
 public:
-    static PanelDescriptorWrapper<GlobalSettings_Descriptor, GlobalSettingsPanel> INSTANCE;
+    using Wrapper = OptionsPanelWrapper<GlobalSettingsPanel>;
+    static Wrapper& instance();
 };
 
 
-class GlobalSettingsPanel : public SettingsPanelInstance{
+class GlobalSettingsPanel : public OptionsPanelInstance{
 public:
-    GlobalSettingsPanel(const GlobalSettings_Descriptor& descriptor);
+    using Descriptor = GlobalSettings_Descriptor;
+    GlobalSettingsPanel();
 private:
     GlobalSettings& settings;
 };
diff --git a/SerialPrograms/Source/CommonFramework/Globals.cpp b/SerialPrograms/Source/CommonFramework/Globals.cpp
index b21f1ebfbd..2807d2b204 100644
--- a/SerialPrograms/Source/CommonFramework/Globals.cpp
+++ b/SerialPrograms/Source/CommonFramework/Globals.cpp
@@ -1,11 +1,9 @@
-/*  Globals
+/*  Globals
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include <QCoreApplication>
-#include <QFile>
 #include "Globals.h"
 
 namespace PokemonAutomation{
@@ -20,10 +18,26 @@ namespace PokemonAutomation{
 //  misleading version information.
 //
 
-const bool IS_BETA_VERSION = true;
-const int PROGRAM_VERSION_MAJOR = 0;
-const int PROGRAM_VERSION_MINOR = 37;
-const int PROGRAM_VERSION_PATCH = 4;
+#ifndef PA_IS_BETA
+#define PA_IS_BETA true
+#endif
+
+#ifndef PA_VERSION_MAJOR
+#define PA_VERSION_MAJOR 0
+#endif
+
+#ifndef PA_VERSION_MINOR
+#define PA_VERSION_MINOR 72
+#endif
+
+#ifndef PA_VERSION_PATCH
+#define PA_VERSION_PATCH 1
+#endif
+
+const bool IS_BETA_VERSION = PA_IS_BETA;
+const int PROGRAM_VERSION_MAJOR = PA_VERSION_MAJOR;
+const int PROGRAM_VERSION_MINOR = PA_VERSION_MINOR;
+const int PROGRAM_VERSION_PATCH = PA_VERSION_PATCH;
 
 const std::string PROGRAM_VERSION_BASE =
     "v" + std::to_string(PROGRAM_VERSION_MAJOR) +
@@ -40,58 +54,56 @@ const std::string PROGRAM_VERSION = PROGRAM_VERSION_BASE + "-user";
 
 
 
-
 const std::string PROGRAM_NAME = "Pok\u00e9mon Automation";
 
-const std::string DISCORD_LINK = "discord.gg/PokemonAutomation";
-const std::string DISCORD_LINK_URL = "https://discord.gg/cQ4gWxN";
-const std::string ONLINE_DOC_URL = "https://github.com/PokemonAutomation/";
-const std::string PROJECT_GITHUB = "github.com/PokemonAutomation";
-const std::string PROJECT_GITHUB_URL = "https://github.com/PokemonAutomation/";
+const std::string ONLINE_DOC_URL_BASE = "https://pokemonautomation.github.io/";
 const std::string PROJECT_SOURCE_URL = "https://github.com/PokemonAutomation/Arduino-Source/";
+const std::string RESOURCES_URL_BASE = "https://github.com/PokemonAutomation/Packages/";
 
 
-std::string get_resource_path(){
-    //  Find the resource directory.
-    QString path = QCoreApplication::applicationDirPath();
-    for (size_t c = 0; c < 5; c++){
-        QString try_path = path + "/Resources/";
-        QFile file(try_path);
-//        cout << path.toUtf8().data() << endl;
-        if (file.exists()){
-            return try_path.toStdString();
-        }
-        path += "/..";
-    }
-    return (QCoreApplication::applicationDirPath() + "/../Resources/").toStdString();
-}
-std::string get_training_path(){
-    //  Find the resource directory.
-    QString path = QCoreApplication::applicationDirPath();
-    for (size_t c = 0; c < 5; c++){
-        QString try_path = path + "/TrainingData/";
-        QFile file(try_path);
-//        cout << path.toUtf8().data() << endl;
-        if (file.exists()){
-            return try_path.toStdString();
-        }
-        path += "/..";
-    }
-    return (QCoreApplication::applicationDirPath() + "/../TrainingData/").toStdString();
-}
+
+//  This the URL that we display. We don't actually use this for linking.
+const std::string GITHUB_LINK_TEXT = "pokemonautomation.github.io";
+
+//  This is the URL that we actually link to.
+const std::string GITHUB_LINK_URL = "https://pokemonautomation.github.io";
+
+
+
+//  URL to display. (the vanity link)
+//  We don't actually use this URL for linking since the vanity link will go
+//  away if we lose too many nitro boosts.
+const std::string DISCORD_LINK_TEXT = "discord.gg/PokemonAutomation";
+
+//  URL to use inside the program.
+const std::string DISCORD_LINK_URL_PROGRAM = "https://discord.gg/BSjDp27";
+
+//  URL to use in the Discord notifications/embeds.
+const std::string DISCORD_LINK_URL_EMBED = "https://discord.gg/xMJcveK";
+
+//  URL to use in the DiscordSocialSDK integration.
+const std::string DISCORD_LINK_URL_SDK = "https://discord.gg/gn9YEyjjAV";
+
+
+
+#if 0
+#elif __INTEL_LLVM_COMPILER
+const std::string COMPILER_VERSION = "ICX " + std::to_string(__VERSION__);
+#elif __INTEL_COMPILER
+const std::string COMPILER_VERSION = "ICC " + std::to_string(__INTEL_COMPILER) + "." + std::to_string(__INTEL_COMPILER_UPDATE);
+#elif _MSC_VER
+const std::string COMPILER_VERSION = "MSVC " + std::to_string(_MSC_FULL_VER);
+#elif __clang__
+const std::string COMPILER_VERSION = "Clang " + std::string(__clang_version__);
+#elif __GNUC__
+const std::string COMPILER_VERSION = "GCC " + std::to_string(__GNUC__) + "." + std::to_string(__GNUC_MINOR__);
+#else
+const std::string COMPILER_VERSION = "Unknown Compiler";
+#endif
 
 
-const std::string SETTINGS_PATH = "UserSettings/";
-const std::string SCREENSHOTS_PATH = "Screenshots/";
-const std::string& RESOURCE_PATH(){
-    static std::string path = get_resource_path();
-    return path;
-}
-const std::string& TRAINING_PATH(){
-    static std::string path = get_training_path();
-    return path;
-}
 
+const size_t LOG_HISTORY_LINES = 10000;
 
 
 }
diff --git a/SerialPrograms/Source/CommonFramework/Globals.h b/SerialPrograms/Source/CommonFramework/Globals.h
index 3d207eab82..c10ac2354f 100644
--- a/SerialPrograms/Source/CommonFramework/Globals.h
+++ b/SerialPrograms/Source/CommonFramework/Globals.h
@@ -1,13 +1,12 @@
 /*  Globals
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifndef PokemonAutomation_Globals_H
 #define PokemonAutomation_Globals_H
 
-#include <chrono>
 #include <string>
 
 namespace PokemonAutomation{
@@ -17,23 +16,31 @@ extern const bool IS_BETA_VERSION;
 extern const int PROGRAM_VERSION_MAJOR;
 extern const int PROGRAM_VERSION_MINOR;
 extern const int PROGRAM_VERSION_PATCH;
+extern const std::string PROGRAM_VERSION_BASE;
 extern const std::string PROGRAM_VERSION;
 
 extern const std::string PROGRAM_NAME;
 
-extern const std::string DISCORD_LINK;
-extern const std::string DISCORD_LINK_URL;
-extern const std::string ONLINE_DOC_URL;
-extern const std::string PROJECT_GITHUB;
-extern const std::string PROJECT_GITHUB_URL;
+extern const std::string ONLINE_DOC_URL_BASE;
 extern const std::string PROJECT_SOURCE_URL;
+extern const std::string RESOURCES_URL_BASE;
 
-const auto SERIAL_REFRESH_RATE = std::chrono::milliseconds(1000);
+extern const std::string GITHUB_LINK_TEXT;
+extern const std::string GITHUB_LINK_URL;
+
+extern const std::string DISCORD_LINK_TEXT;
+extern const std::string DISCORD_LINK_URL_PROGRAM;
+extern const std::string DISCORD_LINK_URL_EMBED;
+extern const std::string DISCORD_LINK_URL_SDK;
+
+extern const std::string COMPILER_VERSION;
+
+extern const size_t LOG_HISTORY_LINES;
+
+//  Whether this executable shows the Qt GUI. Each executable defines it next to its main().
+//  e.g. the serial port code only uses the GUI port list and message boxes when it is true.
+bool use_qt_ui();
 
-extern const std::string SETTINGS_PATH;
-extern const std::string SCREENSHOTS_PATH;
-const std::string& RESOURCE_PATH();
-const std::string& TRAINING_PATH();
 
 
 enum class ProgramState{
@@ -47,6 +54,7 @@ enum class FeedbackType{
     NONE,
     OPTIONAL_,  //  Naming conflict with macro.
     REQUIRED,
+    VIDEO_AUDIO,
 };
 
 
diff --git a/SerialPrograms/Source/CommonFramework/ImageMatch/CroppedImageDictionaryMatcher.cpp b/SerialPrograms/Source/CommonFramework/ImageMatch/CroppedImageDictionaryMatcher.cpp
deleted file mode 100644
index c42db42416..0000000000
--- a/SerialPrograms/Source/CommonFramework/ImageMatch/CroppedImageDictionaryMatcher.cpp
+++ /dev/null
@@ -1,87 +0,0 @@
-/*  Cropped Image Matcher
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <cmath>
-#include "Common/Cpp/Exceptions.h"
-#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
-#include "ImageCropper.h"
-//#include "ImageDiff.h"
-#include "CroppedImageDictionaryMatcher.h"
-
-//#include <iostream>
-//using std::cout;
-//using std::endl;
-
-namespace PokemonAutomation{
-namespace ImageMatch{
-
-
-
-CroppedImageDictionaryMatcher::CroppedImageDictionaryMatcher(const WeightedExactImageMatcher::InverseStddevWeight& weight)
-    : m_weight(weight)
-{}
-void CroppedImageDictionaryMatcher::add(const std::string& slug, const ImageViewRGB32& image){
-    if (!image){
-        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Null image.");
-    }
-    auto iter = m_database.find(slug);
-    if (iter != m_database.end()){
-        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Duplicate slug: " + slug);
-    }
-
-    ImageViewRGB32 cropped = trim_image_alpha(image);
-
-#if 0
-    if (slug == "hamburger"){
-        image.save("matcher-original.png");
-        cropped.save("matcher-cropped.png");
-    }
-#endif
-
-    iter = m_database.emplace(
-        std::piecewise_construct,
-        std::forward_as_tuple(slug),
-        std::forward_as_tuple(cropped.copy(), m_weight)
-    ).first;
-//    cout << iter->first << ": " << iter->second.stats().stddev.sum() << endl;
-}
-
-
-
-ImageMatchResult CroppedImageDictionaryMatcher::match(
-    const ImageViewRGB32& image,
-    double alpha_spread
-) const{
-    ImageMatchResult results;
-    if (!image){
-        return results;
-    }
-
-    Color background;
-    ImageRGB32 processed = process_image(image, background);
-//    cout << (uint32_t)background << endl;
-
-    for (const auto& item : m_database){
-#if 0
-        if (item.first != "onion"){
-            continue;
-        }
-#endif
-        double alpha = item.second.diff(processed, background);
-        results.add(alpha, item.first);
-        results.clear_beyond_spread(alpha_spread);
-    }
-
-    return results;
-}
-
-
-
-
-
-
-}
-}
diff --git a/SerialPrograms/Source/CommonFramework/ImageMatch/CroppedImageDictionaryMatcher.h b/SerialPrograms/Source/CommonFramework/ImageMatch/CroppedImageDictionaryMatcher.h
deleted file mode 100644
index ae56a884a7..0000000000
--- a/SerialPrograms/Source/CommonFramework/ImageMatch/CroppedImageDictionaryMatcher.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*  Cropped Image Dictionary Matcher
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_CommonFramework_CroppedImageDictionaryMatcher_H
-#define PokemonAutomation_CommonFramework_CroppedImageDictionaryMatcher_H
-
-#include "Common/Compiler.h"
-#include "CommonFramework/ImageTools/FloatPixel.h"
-#include "ImageMatchResult.h"
-#include "ExactImageMatcher.h"
-
-namespace PokemonAutomation{
-namespace ImageMatch{
-
-
-class CroppedImageDictionaryMatcher{
-public:
-    CroppedImageDictionaryMatcher(
-        const WeightedExactImageMatcher::InverseStddevWeight& weight = WeightedExactImageMatcher::InverseStddevWeight()
-    );
-    virtual ~CroppedImageDictionaryMatcher() = default;
-
-    void add(const std::string& slug, const ImageViewRGB32& image);
-
-    ImageMatchResult match(const ImageViewRGB32& image, double alpha_spread) const;
-
-
-protected:
-    virtual ImageRGB32 process_image(const ImageViewRGB32& image, Color& background) const = 0;
-
-
-private:
-    WeightedExactImageMatcher::InverseStddevWeight m_weight;
-    std::map<std::string, WeightedExactImageMatcher> m_database;
-};
-
-
-}
-}
-#endif
diff --git a/SerialPrograms/Source/CommonFramework/ImageMatch/FilterToAlpha.h b/SerialPrograms/Source/CommonFramework/ImageMatch/FilterToAlpha.h
deleted file mode 100644
index e409be9add..0000000000
--- a/SerialPrograms/Source/CommonFramework/ImageMatch/FilterToAlpha.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*  Filter to Alpha
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_CommonFramework_FilterToAlpha_H
-#define PokemonAutomation_CommonFramework_FilterToAlpha_H
-
-#include <stdint.h>
-
-namespace PokemonAutomation{
-    class ImageRGB32;
-namespace ImageMatch{
-
-
-
-//  For each pixel, set the alpha channel to 255 if the RGB sum is no greater than "max_rgb_sum".
-//  The rest pixels are set to 0 alpha.
-//  This function is fast.
-void set_alpha_black(ImageRGB32& image, uint32_t max_rgb_sum = 100);
-
-
-}
-}
-#endif
diff --git a/SerialPrograms/Source/CommonFramework/ImageMatch/ImageMatchOption.cpp b/SerialPrograms/Source/CommonFramework/ImageMatch/ImageMatchOption.cpp
deleted file mode 100644
index 58d0bf1f9a..0000000000
--- a/SerialPrograms/Source/CommonFramework/ImageMatch/ImageMatchOption.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-/*  Image Match Option
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "ImageMatchOption.h"
-
-namespace PokemonAutomation{
-namespace ImageMatch{
-
-
-
-
-
-}
-}
diff --git a/SerialPrograms/Source/CommonFramework/ImageMatch/ImageMatchOption.h b/SerialPrograms/Source/CommonFramework/ImageMatch/ImageMatchOption.h
deleted file mode 100644
index ad9429a4b2..0000000000
--- a/SerialPrograms/Source/CommonFramework/ImageMatch/ImageMatchOption.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*  Image Match Option
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_ImageMatchOption_H
-#define PokemonAutomation_ImageMatchOption_H
-
-#include "Common/Cpp/Options/ConfigOption.h"
-
-namespace PokemonAutomation{
-namespace ImageMatch{
-
-
-
-
-
-}
-}
-#endif
diff --git a/SerialPrograms/Source/CommonFramework/ImageMatch/SilhouetteDictionaryMatcher.cpp b/SerialPrograms/Source/CommonFramework/ImageMatch/SilhouetteDictionaryMatcher.cpp
deleted file mode 100644
index b5fb4eb0db..0000000000
--- a/SerialPrograms/Source/CommonFramework/ImageMatch/SilhouetteDictionaryMatcher.cpp
+++ /dev/null
@@ -1,67 +0,0 @@
-/*  Cropped Silhouette Matcher
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <cmath>
-#include "Common/Cpp/Exceptions.h"
-#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
-#include "ImageCropper.h"
-#include "ImageDiff.h"
-#include "SilhouetteDictionaryMatcher.h"
-
-#include <iostream>
-using std::cout;
-using std::endl;
-
-namespace PokemonAutomation{
-namespace ImageMatch{
-
-
-void SilhouetteDictionaryMatcher::add(const std::string& slug, const ImageViewRGB32& image){
-    if (!image){
-        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Null image.");
-    }
-    auto iter = m_database.find(slug);
-    if (iter != m_database.end()){
-        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Duplicate slug: " + slug);
-    }
-
-    m_database.emplace(
-        std::piecewise_construct,
-        std::forward_as_tuple(slug),
-        std::forward_as_tuple(trim_image_alpha(image).copy())
-    );
-}
-
-
-
-ImageMatchResult SilhouetteDictionaryMatcher::match(
-    const ImageViewRGB32& image,
-    double alpha_spread
-) const{
-    ImageMatchResult results;
-    if (!image){
-        return results;
-    }
-
-    for (const auto& item : m_database){
-//        if (item.first != "solosis"){
-//            continue;
-//        }
-        double alpha = item.second.rmsd_masked(image);
-        results.add(alpha, item.first);
-        results.clear_beyond_spread(alpha_spread);
-    }
-
-    return results;
-}
-
-
-
-
-
-
-}
-}
diff --git a/SerialPrograms/Source/CommonFramework/ImageMatch/SubObjectTemplateMatcher.h b/SerialPrograms/Source/CommonFramework/ImageMatch/SubObjectTemplateMatcher.h
deleted file mode 100644
index ce3b3a0328..0000000000
--- a/SerialPrograms/Source/CommonFramework/ImageMatch/SubObjectTemplateMatcher.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/*  Sub-Object Template Matcher
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- *      Suppose we have an object with a distinctive sub-feature.
- *
- *  We want to find this object in an image. But instead of searching for the
- *  entire object as a whole, we search for that distinctive sub-feature.
- *
- *  Once we've found that sub-feature and have it's bounding box, we want to
- *  verify that the rest of the object matches the template.
- *
- */
-
-#ifndef PokemonAutomation_CommonFramework_SubObjectTemplateMatcher_H
-#define PokemonAutomation_CommonFramework_SubObjectTemplateMatcher_H
-
-#include "Common/Cpp/Color.h"
-#include "CommonFramework/ImageTypes/BinaryImage.h"
-#include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "CommonFramework/ImageMatch/ExactImageMatcher.h"
-
-namespace PokemonAutomation{
-namespace ImageMatch{
-
-
-class SubObjectTemplateMatcher{
-protected:
-    using WaterfillObject = Kernels::Waterfill::WaterfillObject;
-
-public:
-    virtual ~SubObjectTemplateMatcher() = default;
-    SubObjectTemplateMatcher(const char* path, double max_rmsd);
-    SubObjectTemplateMatcher(const char* path, Color background_replacement, double max_rmsd);
-
-    ImagePixelBox object_from_subobject(
-        size_t width, size_t height,
-        const ImagePixelBox& subobject_in_image
-    ) const;
-
-    //  Compute RMSD of current object against the template as-is.
-    double rmsd(
-        ImagePixelBox& object_box,
-        const ImageViewRGB32& image, const ImagePixelBox& subobject_in_image
-    ) const;
-
-    //  Replace the background of the image with the "m_background_replacement".
-    //  Then compute RMSD of it against the template.
-    //  The background is defined by zero-bits in the binary matrix in "binary_image".
-    double rmsd_with_background_replace(
-        ImagePixelBox& object_box,
-        const ImageViewRGB32& image, const PackedBinaryMatrix& binary_image,
-        const ImagePixelBox& subobject_in_image
-    ) const;
-
-    virtual bool matches(
-        ImagePixelBox& object_box,
-        const ImageViewRGB32& image,
-        const WaterfillObject& subobject_in_image
-    ) const;
-    virtual bool matches_with_background_replace(
-        ImagePixelBox& object_box,
-        const ImageViewRGB32& image, const PackedBinaryMatrix& binary_image,
-        const WaterfillObject& subobject_in_image
-    ) const;
-
-
-protected:
-    virtual bool check_image(const ImageViewRGB32& image) const{ return true; };
-
-    void set_subobject(const WaterfillObject& subobject_in_object);
-    bool check_aspect_ratio(size_t candidate_width, size_t candidate_height) const;
-    bool check_area_ratio(double candidate_area_ratio) const;
-
-protected:
-    std::string m_path;
-    Color m_background_replacement;
-
-    double m_max_rmsd;
-    double m_aspect_ratio_lower = 0.80;
-    double m_aspect_ratio_upper = 1.25;
-    double m_area_ratio_lower = 0.80;
-    double m_area_ratio_upper = 1.25;
-
-    ExactImageMatcher m_matcher;
-    ImagePixelBox m_subobject_in_object_p;
-    ImageFloatBox m_subobject_in_object_f;
-    double m_subobject_area_ratio;
-};
-
-
-
-
-
-
-
-}
-}
-#endif
diff --git a/SerialPrograms/Source/CommonFramework/ImageMatch/WaterfillTemplateMatcher.cpp b/SerialPrograms/Source/CommonFramework/ImageMatch/WaterfillTemplateMatcher.cpp
deleted file mode 100644
index dff6f14552..0000000000
--- a/SerialPrograms/Source/CommonFramework/ImageMatch/WaterfillTemplateMatcher.cpp
+++ /dev/null
@@ -1,155 +0,0 @@
-/*  Waterfill Template Matcher
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Cpp/Exceptions.h"
-#include "Kernels/Waterfill/Kernels_Waterfill.h"
-#include "CommonFramework/Globals.h"
-#include "CommonFramework/GlobalSettingsPanel.h"
-#include "CommonFramework/ImageTools/BinaryImage_FilterRgb32.h"
-#include "CommonFramework/Logging/Logger.h"
-#include "CommonFramework/Tools/DebugDumper.h"
-#include "WaterfillTemplateMatcher.h"
-
-#include <iostream>
-using std::cout;
-using std::endl;
-
-namespace PokemonAutomation{
-namespace ImageMatch{
-
-using namespace Kernels;
-using namespace Kernels::Waterfill;
-
-
-WaterfillTemplateMatcher::WaterfillTemplateMatcher(
-    const char* path,
-    Color min_color, Color max_color,
-    size_t min_area
-){
-    std::string full_path = RESOURCE_PATH() + path;
-    ImageRGB32 reference(full_path);
-
-    PackedBinaryMatrix matrix = compress_rgb32_to_binary_range(reference, (uint32_t)min_color, (uint32_t)max_color);
-    std::vector<WaterfillObject> objects = find_objects_inplace(matrix, min_area);
-    if (objects.empty()){
-        throw FileException(
-            nullptr, PA_CURRENT_FUNCTION,
-            "Failed to find any waterfill objects in resource template file.",
-            std::move(full_path)
-        );
-    }
-
-    const WaterfillObject* best = &objects[0];
-    for (const WaterfillObject& object : objects){
-        if (best->area < object.area){
-            best = &object;
-        }
-    }
-
-    m_matcher.reset(new ExactImageMatcher(extract_box_reference(reference, *best).copy()));
-    m_area_ratio = best->area_ratio();
-
-    if (PreloadSettings::debug().IMAGE_TEMPLATE_MATCHING){
-        const auto exact_image = extract_box_reference(reference, *best);
-        cout << "Build waterfil template matcher from " << full_path << ", W x H: " << exact_image.width()
-             << " x " << exact_image.height() <<  ", area ratio: " << m_area_ratio << endl;
-        dump_debug_image(global_logger_command_line(), "CommonFramework/WaterfillTemplateMatcher", "matcher_exact_image", exact_image);
-    }
-}
-
-double WaterfillTemplateMatcher::rmsd(const ImageViewRGB32& image) const{
-    if (!image || !check_image(image)){
-        return 99999.;
-    }
-    return m_matcher->rmsd(image);
-}
-bool WaterfillTemplateMatcher::check_aspect_ratio(size_t candidate_width, size_t candidate_height) const{
-    ImageViewRGB32 image_template = m_matcher->image_template();
-
-    double error = (double)image_template.width() * candidate_height;
-    error /= (double)image_template.height() * candidate_width;
-    
-    bool pass = m_aspect_ratio_lower <= error && error <= m_aspect_ratio_upper;
-
-    if (!pass && PreloadSettings::debug().IMAGE_TEMPLATE_MATCHING){
-        cout << "Failed to pass WaterfillTemplateMatcher aspect ratio check (W/H): "
-             << "expected: " << image_template.width() << " : " << image_template.height()
-             << " (" << (double)image_template.width()/image_template.height() << "), "
-             << "actual: " << candidate_width << " : " << candidate_height 
-             << " (" << (double)candidate_width/candidate_height << ") "
-             << "error: " << error << " bound [" << m_aspect_ratio_lower << ", " << m_aspect_ratio_upper << "]" << endl;
-    }
-    return pass;
-}
-bool WaterfillTemplateMatcher::check_area_ratio(double candidate_area_ratio) const{
-    if (m_area_ratio == 0){
-        return true;
-    }
-    double error = candidate_area_ratio / m_area_ratio;
-    bool pass = m_area_ratio_lower <= error && error <= m_area_ratio_upper;
-    if (!pass && PreloadSettings::debug().IMAGE_TEMPLATE_MATCHING){
-        cout << "Failed to pass WaterfillTemplateMatcher area ratio check: "
-             << "Expected: " << m_area_ratio << ", actual: " << candidate_area_ratio << ", "
-             << "error: " << error << " bound [" << m_area_ratio_lower << ", " << m_area_ratio_upper << "]" << endl;
-    }
-    return pass;
-}
-double WaterfillTemplateMatcher::rmsd_precropped(const ImageViewRGB32& cropped_image, const WaterfillObject& object) const{
-
-    // XXX
-    // dump_debug_image(global_logger_command_line(), "CommonFramework/WaterfillTemplateMatcher", "rmsd_precropped_input", cropped_image);
-
-    if (!check_aspect_ratio(object.width(), object.height())){
-        // cout << "bad aspect ratio" << endl;
-        return 99999.;
-    }
-    if (!check_area_ratio(object.area_ratio())){
-        // cout << "bad area ratio" << endl;
-        return 99999.;
-    }
-
-//    static int c = 0;
-//    cout << c << endl;
-
-    double rmsd = this->rmsd(cropped_image);
-
-//    cout << "rmsd  = " << rmsd << endl;
-
-//    if (rmsd <= m_max_rmsd){
-//        static int c = 0;
-//        cropped_image.save("test-" + std::to_string(c++) + "-" + std::to_string(rmsd) + ".png");
-//    }
-
-    return rmsd;
-}
-double WaterfillTemplateMatcher::rmsd_original(const ImageViewRGB32& original_image, const WaterfillObject& object) const{
-
-    if (PreloadSettings::debug().IMAGE_TEMPLATE_MATCHING){
-        cout << "rmsd_original()" << endl;
-        dump_debug_image(global_logger_command_line(), "CommonFramework/WaterfillTemplateMatcher", "rmsd_original_input", extract_box_reference(original_image, object));
-    }
-
-    if (!check_aspect_ratio(object.width(), object.height())){
-        return 99999.;
-    }
-    if (!check_area_ratio(object.area_ratio())){
-        return 99999.;
-    }
-
-    double rmsd = this->rmsd(extract_box_reference(original_image, object));
-    if (PreloadSettings::debug().IMAGE_TEMPLATE_MATCHING){
-        cout << "Passed aspect and area ratio check, rmsd = " << rmsd << endl;
-    }
-   
-
-    return rmsd;
-}
-
-
-
-
-}
-}
diff --git a/SerialPrograms/Source/CommonFramework/ImageMatch/WaterfillTemplateMatcher.h b/SerialPrograms/Source/CommonFramework/ImageMatch/WaterfillTemplateMatcher.h
deleted file mode 100644
index 998179ebaf..0000000000
--- a/SerialPrograms/Source/CommonFramework/ImageMatch/WaterfillTemplateMatcher.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/*  Waterfill Template Matcher
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_CommonFramework_WaterfillTemplateMatcher_H
-#define PokemonAutomation_CommonFramework_WaterfillTemplateMatcher_H
-
-#include <memory>
-#include "Common/Compiler.h"
-#include "Common/Cpp/Color.h"
-#include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "CommonFramework/ImageMatch/ExactImageMatcher.h"
-
-namespace PokemonAutomation{
-namespace ImageMatch{
-
-
-// Used to match an image or a waterfill object against a template object.
-class WaterfillTemplateMatcher{
-protected:
-    using WaterfillObject = Kernels::Waterfill::WaterfillObject;
-
-public:
-    WaterfillTemplateMatcher(WaterfillTemplateMatcher&&) = default;
-    virtual ~WaterfillTemplateMatcher() = default;
-
-
-public:
-    // Load a template image from disk, min_color and max_color denote the color range of the object
-    // displayed in the image file while min_area is the minimum number of pixels required for the
-    // object in the template to be loaded.
-    // 
-    // The portion of the image holding the found object will get cropped and saved as the actual template image.
-    // So if someone changes the template image by padding it to make it larger, as long as the padded color
-    // does not fall into [min_color and max_color] range, it will not affect the template matching outcome
-    // in any way.
-    //
-    // Throw FileException when there is no object meeting the requirement in the template.
-    // If there are more than one objects meeting the requirement in the template, pick the one
-    // with the largest area (largest number of pixels).
-    WaterfillTemplateMatcher(
-        const char* path,
-        Color min_color, Color max_color,
-        size_t min_area
-    );
-
-    //  Compute RMSD of the current image against the template as-is, using `ExactImageMatcher`.
-    // `ExactImageMatcher` will resize the image to match template size and scale template brightness to match the image
-    //  before computing RMSD.
-    //  In case the image is invalid, return a large value.
-    //  It also calls the virtual function `check_image()` on the image.
-    //  If the function returns false, then return a large value. 
-    double rmsd(const ImageViewRGB32& image) const;
-
-    //  Compute RMSD of the object on the image against the template.
-    //  The input `cropped_image` is already cropped from a full image using the bounding box of the input waterfill `object`.
-    //  This cropped image is compared against the template as-is.
-    //  The waterfill object's aspect ratio and area ratio are checked against template's. Return a large value 
-    //  if the check fails.
-    //  See `double rmsd(const ImageViewRGB32& image) const` on the details of comparing the image against the template.
-    virtual double rmsd_precropped(const ImageViewRGB32& cropped_image, const WaterfillObject& object) const;
-
-    //  Compute RMSD of the object on the image against the template.
-    //  It will crop the original image using the bounding box of the waterfill object, then compare the cropped
-    //  image against the template as-is.
-    //  The waterfill object's aspect ratio and area ratio are checked against template's. Return a large value 
-    //  if the check fails.
-    //  See `double rmsd(const ImageViewRGB32& image) const` on the details of comparing the image against the template.
-    virtual double rmsd_original(const ImageViewRGB32& original_image, const WaterfillObject& object) const;
-
-protected:
-    virtual bool check_image(const ImageViewRGB32& image) const{ return true; };
-    bool check_aspect_ratio(size_t candidate_width, size_t candidate_height) const;
-    bool check_area_ratio(double candidate_area_ratio) const;
-
-protected:
-    // Below are thresholds of aspect ratio and area ratio to reject a candidate.
-    // They are ususally set by the derived class of `WaterfillTemplateMatcher`.
-    double m_aspect_ratio_lower = 0.80;
-    double m_aspect_ratio_upper = 1.25;
-    double m_area_ratio_lower = 0.80;
-    double m_area_ratio_upper = 1.25;
-
-    std::unique_ptr<ExactImageMatcher> m_matcher;
-    double m_area_ratio;
-};
-
-
-
-}
-}
-#endif
diff --git a/SerialPrograms/Source/CommonFramework/ImageTools/BinaryImage_FilterRgb32.h b/SerialPrograms/Source/CommonFramework/ImageTools/BinaryImage_FilterRgb32.h
deleted file mode 100644
index 81f5e3711a..0000000000
--- a/SerialPrograms/Source/CommonFramework/ImageTools/BinaryImage_FilterRgb32.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/*  Binary Image Filter RGB32
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_CommonFramework_BinaryImage_FilterRgb32_H
-#define PokemonAutomation_CommonFramework_BinaryImage_FilterRgb32_H
-
-#include <stdint.h>
-#include <vector>
-#include "Common/Cpp/Color.h"
-#include "Kernels/BinaryMatrix/Kernels_BinaryMatrix.h"
-#include "Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters.h"
-#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
-#include "CommonFramework/ImageTypes/BinaryImage.h"
-
-namespace PokemonAutomation{
-
-
-
-void filter_by_mask(
-    const PackedBinaryMatrix& matrix,
-    ImageRGB32& image,
-    Color replace_with,
-    bool replace_if_zero    //  If false, replace if one.
-);
-void filter_by_mask(
-    const PackedBinaryMatrix& matrix,
-    ImageRGB32& image, size_t offset_x, size_t offset_y,
-    Color replace_with,
-    bool replace_if_zero    //  If false, replace if one.
-);
-
-
-
-
-
-PackedBinaryMatrix compress_rgb32_to_binary_min(
-    const ImageViewRGB32& image,
-    uint8_t min_red,
-    uint8_t min_green,
-    uint8_t min_blue
-);
-PackedBinaryMatrix compress_rgb32_to_binary_max(
-    const ImageViewRGB32& image,
-    uint8_t max_red,
-    uint8_t max_green,
-    uint8_t max_blue
-);
-PackedBinaryMatrix compress_rgb32_to_binary_range(
-    const ImageViewRGB32& image,
-    uint8_t min_red, uint8_t max_red,
-    uint8_t min_green, uint8_t max_green,
-    uint8_t min_blue, uint8_t max_blue
-);
-PackedBinaryMatrix compress_rgb32_to_binary_range(
-    const ImageViewRGB32& image,
-    uint8_t min_alpha, uint8_t max_alpha,
-    uint8_t min_red, uint8_t max_red,
-    uint8_t min_green, uint8_t max_green,
-    uint8_t min_blue, uint8_t max_blue
-);
-PackedBinaryMatrix compress_rgb32_to_binary_range(
-    const ImageViewRGB32& image,
-    uint32_t mins, uint32_t maxs
-);
-
-
-
-//  Run multiple filters at once. This is more memory efficient than making
-//  multiple calls to one filter at a time.
-//  Pixels Within filter color ranges are marked as 1 in the corresponding binary matrices,
-//  while those output of range are 0.
-std::vector<PackedBinaryMatrix> compress_rgb32_to_binary_range(
-    const ImageViewRGB32& image,
-    const std::vector<std::pair<uint32_t, uint32_t>>& filters
-);
-
-
-
-//  Run multiple filters and OR them all together. (experimental)
-PackedBinaryMatrix compress_rgb32_to_binary_multirange(
-    const ImageViewRGB32& image,
-    const std::vector<std::pair<uint32_t, uint32_t>>& filters
-);
-
-
-
-
-
-PackedBinaryMatrix compress_rgb32_to_binary_euclidean(
-    const ImageViewRGB32& image,
-    uint32_t expected, double max_euclidean_distance
-);
-
-
-
-
-}
-#endif
diff --git a/SerialPrograms/Source/CommonFramework/ImageTools/ColorClustering.h b/SerialPrograms/Source/CommonFramework/ImageTools/ColorClustering.h
deleted file mode 100644
index fed3b03191..0000000000
--- a/SerialPrograms/Source/CommonFramework/ImageTools/ColorClustering.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*  Color Clustering
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_CommonFramework_ColorClustering_H
-#define PokemonAutomation_CommonFramework_ColorClustering_H
-
-#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
-#include "FloatPixel.h"
-
-namespace PokemonAutomation{
-
-
-class PixelEuclideanStatAccumulator{
-public:
-    void clear();
-    void operator+=(FloatPixel pixel);
-
-    uint64_t count() const;
-    FloatPixel center() const;
-    double deviation() const;
-
-private:
-    uint64_t m_count = 0;
-    double m_sum_x = 0;
-    double m_sum_y = 0;
-    double m_sum_z = 0;
-    double m_sqr_x = 0;
-    double m_sqr_y = 0;
-    double m_sqr_z = 0;
-};
-
-double cluster_fit_2(
-    const ImageViewRGB32& image,
-    Color color0, PixelEuclideanStatAccumulator& cluster0,
-    Color color1, PixelEuclideanStatAccumulator& cluster1
-);
-
-bool cluster_fit_2(
-    const ImageViewRGB32& image,
-    Color color0, double ratio0,
-    Color color1, double ratio1,
-    double ratio_threshold = 0.2,
-    double deviation_threshold = 50,
-    double distance_threshold = 0.2
-);
-
-
-}
-#endif
diff --git a/SerialPrograms/Source/CommonFramework/ImageTools/FloatPixel.cpp b/SerialPrograms/Source/CommonFramework/ImageTools/FloatPixel.cpp
index da6cfc9bb8..67dd042c60 100644
--- a/SerialPrograms/Source/CommonFramework/ImageTools/FloatPixel.cpp
+++ b/SerialPrograms/Source/CommonFramework/ImageTools/FloatPixel.cpp
@@ -1,6 +1,6 @@
 /*  Float Pixel
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/CommonFramework/ImageTools/FloatPixel.h b/SerialPrograms/Source/CommonFramework/ImageTools/FloatPixel.h
index e1f9d7779a..599ee6abed 100644
--- a/SerialPrograms/Source/CommonFramework/ImageTools/FloatPixel.h
+++ b/SerialPrograms/Source/CommonFramework/ImageTools/FloatPixel.h
@@ -1,6 +1,6 @@
 /*  Float Pixel
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/CommonFramework/ImageTools/ImageBoxes.cpp b/SerialPrograms/Source/CommonFramework/ImageTools/ImageBoxes.cpp
index 592a6a340f..af2735aae2 100644
--- a/SerialPrograms/Source/CommonFramework/ImageTools/ImageBoxes.cpp
+++ b/SerialPrograms/Source/CommonFramework/ImageTools/ImageBoxes.cpp
@@ -1,12 +1,11 @@
 /*  Image Boxes
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include <algorithm>
 #include "Common/Cpp/Exceptions.h"
-#include "Common/Cpp/Color.h"
 #include "Common/Cpp/Rectangle.tpp"
 #include "Kernels/Waterfill/Kernels_Waterfill_Types.h"
 #include "CommonFramework/ImageTypes/ImageViewHSV32.h"
@@ -14,9 +13,8 @@
 #include "CommonFramework/ImageTypes/ImageRGB32.h"
 #include "ImageBoxes.h"
 
-#include <iostream>
-using std::cout;
-using std::endl;
+//using std::cout;
+//using std::endl;
 
 namespace PokemonAutomation{
 
@@ -95,6 +93,60 @@ size_t ImagePixelBox::distance_y(const ImagePixelBox& box) const{
     return 0;
 }
 
+size_t ImagePixelBox::distance_to_point_x(const size_t x) const{
+    size_t min_x = std::max(this->min_x, x);
+    size_t max_x = std::min(this->max_x, x);
+    return min_x - max_x;
+}
+//  The distance to a point on y axis. If the point is in the box, the distance is 0.
+size_t ImagePixelBox::distance_to_point_y(const size_t y) const{
+    size_t min_y = std::max(this->min_y, y);
+    size_t max_y = std::min(this->max_y, y);
+    return min_y - max_y;
+}
+//  The distance from the box center to a point on x axis
+size_t ImagePixelBox::center_distance_to_point_x(const size_t x) const{
+    const size_t cx = center_x();
+    if (cx >= x){
+        return cx - x;
+    }
+    return x - cx;
+}
+//  The distance from the box center to a point on y axis
+size_t ImagePixelBox::center_distance_to_point_y(const size_t y) const{
+    const size_t cy = center_y();
+    if (cy >= y){
+        return cy - y;
+    }
+    return y - cy;
+}
+
+
+
+void ImageFloatBox::merge_with(const ImageFloatBox& box){
+    double max_x = std::max(x + width, box.x + box.width);
+    double max_y = std::max(y + height, box.y + box.height);
+    x = std::min(x, box.x);
+    y = std::min(y, box.y);
+    width = max_x - x;
+    height = max_y - y;
+}
+double ImageFloatBox::overlapping_area(const ImageFloatBox& box) const{
+    double min_x = std::max(this->x, box.x);
+    double max_x = std::min(this->x + this->width, box.x + box.width);
+    if (min_x >= max_x){
+        return 0;
+    }
+    double min_y = std::max(this->y, box.y);
+    double max_y = std::min(this->y + this->height, box.y + box.height);
+    if (min_y >= max_y){
+        return 0;
+    }
+    return (max_x - min_x) * (max_y - min_y);
+}
+
+
+
 
 ImageViewRGB32 extract_box_reference(const ImageViewRGB32& image, const ImagePixelBox& box){
     return image.sub_image(box.min_x, box.min_y, box.width(), box.height());
@@ -164,15 +216,41 @@ ImageFloatBox translate_to_parent(
     const ImageFloatBox& inference_box,
     const ImagePixelBox& box
 ){
-    double width = (double)original_image.width();
-    double height = (double)original_image.height();
-    ptrdiff_t box_x = (ptrdiff_t)(width * inference_box.x + 0.5);
-    ptrdiff_t box_y = (ptrdiff_t)(height * inference_box.y + 0.5);
+    size_t width = original_image.width();
+    size_t height = original_image.height();
+    size_t box_min_x = (size_t)(width * inference_box.x + 0.5);
+    size_t box_min_y = (size_t)(height * inference_box.y + 0.5);
+
+    double inv_width = 1. / (double)width;
+    double inv_height = 1. / (double)height;
+
     return ImageFloatBox(
-        (box_x + box.min_x) / width,
-        (box_y + box.min_y) / height,
-        (box.max_x - box.min_x) / width,
-        (box.max_y - box.min_y) / height
+        (box_min_x + box.min_x) * inv_width,
+        (box_min_y + box.min_y) * inv_height,
+        (box.max_x - box.min_x) * inv_width,
+        (box.max_y - box.min_y) * inv_height
+    );
+}
+ImageFloatBox translate_to_parent(
+    const ImageFloatBox& outer_relative_to_master,
+    const ImageFloatBox& inner_relative_to_outer
+){
+    return ImageFloatBox(
+        outer_relative_to_master.x + inner_relative_to_outer.x * outer_relative_to_master.width,
+        outer_relative_to_master.y + inner_relative_to_outer.y * outer_relative_to_master.height,
+        inner_relative_to_outer.width * outer_relative_to_master.width,
+        inner_relative_to_outer.height * outer_relative_to_master.height
+    );
+}
+ImageFloatBox translate_to_child(
+    const ImageFloatBox& outer_relative_to_master,
+    const ImageFloatBox& inner_relative_to_master
+){
+    return ImageFloatBox(
+        (inner_relative_to_master.x - outer_relative_to_master.x) / outer_relative_to_master.width,
+        (inner_relative_to_master.y - outer_relative_to_master.y) / outer_relative_to_master.height,
+        inner_relative_to_master.width / outer_relative_to_master.width,
+        inner_relative_to_master.height / outer_relative_to_master.height
     );
 }
 
@@ -185,6 +263,10 @@ ImagePixelBox floatbox_to_pixelbox(size_t width, size_t height, const ImageFloat
         (size_t)(height * (float_box.y + float_box.height) + 0.5)
     );
 }
+ImagePixelBox floatbox_to_pixelbox(const ImageViewRGB32& image, const ImageFloatBox& float_box){
+    return floatbox_to_pixelbox(image.width(), image.height(), float_box);
+}
+
 ImageFloatBox pixelbox_to_floatbox(size_t width, size_t height, const ImagePixelBox& pixel_box){
     double image_inverse_width = 1. / (double)width;
     double image_inverse_height = 1. / (double)height;
diff --git a/SerialPrograms/Source/CommonFramework/ImageTools/ImageBoxes.h b/SerialPrograms/Source/CommonFramework/ImageTools/ImageBoxes.h
index d01373004c..3fc4883cce 100644
--- a/SerialPrograms/Source/CommonFramework/ImageTools/ImageBoxes.h
+++ b/SerialPrograms/Source/CommonFramework/ImageTools/ImageBoxes.h
@@ -1,6 +1,6 @@
 /*  Image Boxes
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -56,6 +56,14 @@ struct ImagePixelBox : public Rectangle<size_t>{
     size_t distance_x(const ImagePixelBox& box) const;
     //  The distance to another box on y axis. If two boxes overlap, the distance is 0.
     size_t distance_y(const ImagePixelBox& box) const;
+    //  The distance to a point on x axis. If the point is in the box, the distance is 0.
+    size_t distance_to_point_x(const size_t x) const;
+    //  The distance to a point on y axis. If the point is in the box, the distance is 0.
+    size_t distance_to_point_y(const size_t y) const;
+    //  The distance from the box center to a point on x axis
+    size_t center_distance_to_point_x(const size_t x) const;
+    //  The distance from the box center to a point on y axis
+    size_t center_distance_to_point_y(const size_t y) const;
 };
 
 // An axis aligned box in the normalized image space. Used for getting a crop from an image for various
@@ -86,6 +94,12 @@ struct ImageFloatBox{
         : x(p_x), y(p_y)
         , width(p_width), height(p_height)
     {}
+
+    double area() const{
+        return width * height;
+    }
+    void merge_with(const ImageFloatBox& box);
+    double overlapping_area(const ImageFloatBox& box) const;
 };
 
 
@@ -116,9 +130,22 @@ ImageFloatBox translate_to_parent(
     const ImagePixelBox& box
 );
 
+//  Returns "inner_relative_to_master".
+ImageFloatBox translate_to_parent(
+    const ImageFloatBox& outer_relative_to_master,
+    const ImageFloatBox& inner_relative_to_outer
+);
+
+//  Returns "inner_relative_to_outer".
+ImageFloatBox translate_to_child(
+    const ImageFloatBox& outer_relative_to_master,
+    const ImageFloatBox& inner_relative_to_master
+);
+
 
 //  Given a ImagePixelBox within an image, get the ImageFloatBox for it.
 ImagePixelBox floatbox_to_pixelbox(size_t width, size_t height, const ImageFloatBox& float_box);
+ImagePixelBox floatbox_to_pixelbox(const ImageViewRGB32& image, const ImageFloatBox& float_box);
 ImageFloatBox pixelbox_to_floatbox(size_t width, size_t height, const ImagePixelBox& pixel_box);
 ImageFloatBox pixelbox_to_floatbox(const ImageViewRGB32& image, const ImagePixelBox& pixel_box);
 
diff --git a/SerialPrograms/Source/CommonFramework/ImageMatch/ImageDiff.cpp b/SerialPrograms/Source/CommonFramework/ImageTools/ImageDiff.cpp
similarity index 94%
rename from SerialPrograms/Source/CommonFramework/ImageMatch/ImageDiff.cpp
rename to SerialPrograms/Source/CommonFramework/ImageTools/ImageDiff.cpp
index ad907aed83..888fa2b3db 100644
--- a/SerialPrograms/Source/CommonFramework/ImageMatch/ImageDiff.cpp
+++ b/SerialPrograms/Source/CommonFramework/ImageTools/ImageDiff.cpp
@@ -1,6 +1,6 @@
 /*  Image Diff
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -14,9 +14,8 @@
 #include "CommonFramework/ImageTypes/ImageRGB32.h"
 #include "ImageDiff.h"
 
-#include <iostream>
-using std::cout;
-using std::endl;
+//using std::cout;
+//using std::endl;
 
 namespace PokemonAutomation{
 namespace ImageMatch{
diff --git a/SerialPrograms/Source/CommonFramework/ImageMatch/ImageDiff.h b/SerialPrograms/Source/CommonFramework/ImageTools/ImageDiff.h
similarity index 92%
rename from SerialPrograms/Source/CommonFramework/ImageMatch/ImageDiff.h
rename to SerialPrograms/Source/CommonFramework/ImageTools/ImageDiff.h
index 001aad8544..2f088c3be0 100644
--- a/SerialPrograms/Source/CommonFramework/ImageMatch/ImageDiff.h
+++ b/SerialPrograms/Source/CommonFramework/ImageTools/ImageDiff.h
@@ -1,6 +1,6 @@
 /*  Image Diff
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -32,7 +32,7 @@ void scale_brightness(ImageRGB32& image, const FloatPixel& multiplier);
 //
 //      If (reference.alpha == 255)  Count the pixel.
 //      If (reference.alpha ==   0)  Ignore the pixel and exclude from pixel count.
-//
+//      Alpha channel of "image" is ignored.
 double pixel_RMSD(const ImageViewRGB32& reference, const ImageViewRGB32& image);
 
 
@@ -42,7 +42,7 @@ double pixel_RMSD(const ImageViewRGB32& reference, const ImageViewRGB32& image);
 //
 //      If (reference.alpha == 255)  Count the pixel.
 //      If (reference.alpha ==   0)  Replace reference pixel with "background".
-//
+//      Alpha channel of "image" is ignored.
 double pixel_RMSD(const ImageViewRGB32& reference, const ImageViewRGB32& image, Color background);
 
 
diff --git a/SerialPrograms/Source/CommonFramework/ImageTools/ImageFilter.cpp b/SerialPrograms/Source/CommonFramework/ImageTools/ImageFilter.cpp
deleted file mode 100644
index 05ef878754..0000000000
--- a/SerialPrograms/Source/CommonFramework/ImageTools/ImageFilter.cpp
+++ /dev/null
@@ -1,149 +0,0 @@
-/*  Image Filter
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Cpp/Containers/FixedLimitVector.tpp"
-#include "Kernels/ImageFilters/Kernels_ImageFilter_Basic.h"
-#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
-#include "CommonFramework/ImageTypes/ImageRGB32.h"
-#include "ImageFilter.h"
-
-namespace PokemonAutomation{
-
-
-
-ImageRGB32 filter_rgb32_range(
-    const ImageViewRGB32& image,
-    uint32_t mins, uint32_t maxs, Color replace_with, bool replace_color_within_range
-){
-    ImageRGB32 ret(image.width(), image.height());
-    Kernels::filter_rgb32_range(
-        image.data(), image.bytes_per_row(), image.width(), image.height(),
-        ret.data(), ret.bytes_per_row(), mins, maxs, (uint32_t)replace_with, replace_color_within_range
-    );
-    return ret;
-}
-ImageRGB32 filter_rgb32_range(
-    size_t& pixels_in_range,
-    const ImageViewRGB32& image,
-    uint32_t mins, uint32_t maxs, Color replace_with, bool replace_color_within_range
-){
-    ImageRGB32 ret(image.width(), image.height());
-    pixels_in_range = Kernels::filter_rgb32_range(
-        image.data(), image.bytes_per_row(), image.width(), image.height(),
-        ret.data(), ret.bytes_per_row(), mins, maxs, (uint32_t)replace_with, replace_color_within_range
-    );
-    return ret;
-}
-std::vector<std::pair<ImageRGB32, size_t>> filter_rgb32_range(
-    const ImageViewRGB32& image,
-    const std::vector<FilterRgb32Range>& filters
-){
-    std::vector<std::pair<ImageRGB32, size_t>> ret(filters.size());
-    FixedLimitVector<Kernels::FilterRgb32RangeFilter> subfilters(filters.size());
-    for (size_t c = 0; c < filters.size(); c++){
-        ImageRGB32& out = ret[c].first;
-        out = ImageRGB32(image.width(), image.height());
-        subfilters.emplace_back(
-            out.data(), out.bytes_per_row(),
-            filters[c].mins, filters[c].maxs, (uint32_t)filters[c].replace_with, filters[c].replace_color_within_range
-        );
-    }
-    Kernels::filter_rgb32_range(
-        image.data(), image.bytes_per_row(), image.width(), image.height(),
-        subfilters.data(), subfilters.size()
-    );
-    for (size_t c = 0; c < filters.size(); c++){
-        ret[c].second = subfilters[c].pixels_in_range;
-    }
-    return ret;
-}
-
-
-
-
-
-ImageRGB32 filter_rgb32_euclidean(
-    const ImageViewRGB32& image,
-    uint32_t expected, double max_euclidean_distance,
-    Color replace_with, bool replace_color_within_range
-){
-    ImageRGB32 ret(image.width(), image.height());
-    Kernels::filter_rgb32_euclidean(
-        image.data(), image.bytes_per_row(), image.width(), image.height(),
-        ret.data(), ret.bytes_per_row(), expected, max_euclidean_distance, (uint32_t)replace_with, replace_color_within_range
-    );
-    return ret;
-}
-ImageRGB32 filter_rgb32_euclidean(
-    size_t& pixels_in_range,
-    const ImageViewRGB32& image,
-    uint32_t expected, double max_euclidean_distance,
-    Color replace_with, bool replace_color_within_range
-){
-    ImageRGB32 ret(image.width(), image.height());
-    pixels_in_range = Kernels::filter_rgb32_euclidean(
-        image.data(), image.bytes_per_row(), image.width(), image.height(),
-        ret.data(), ret.bytes_per_row(), expected, max_euclidean_distance, (uint32_t)replace_with, replace_color_within_range
-    );
-    return ret;
-}
-
-
-
-
-
-
-ImageRGB32 to_blackwhite_rgb32_range(
-    const ImageViewRGB32& image,
-    uint32_t mins, uint32_t maxs, bool in_range_black
-){
-    ImageRGB32 ret(image.width(), image.height());
-    Kernels::to_blackwhite_rgb32_range(
-        image.data(), image.bytes_per_row(), image.width(), image.height(),
-        ret.data(), ret.bytes_per_row(), mins, maxs, in_range_black
-    );
-    return ret;
-}
-ImageRGB32 to_blackwhite_rgb32_range(
-    size_t& pixels_in_range,
-    const ImageViewRGB32& image,
-    uint32_t mins, uint32_t maxs, bool in_range_black
-){
-    ImageRGB32 ret(image.width(), image.height());
-    pixels_in_range = Kernels::to_blackwhite_rgb32_range(
-        image.data(), image.bytes_per_row(), image.width(), image.height(),
-        ret.data(), ret.bytes_per_row(), mins, maxs, in_range_black
-    );
-    return ret;
-}
-std::vector<std::pair<ImageRGB32, size_t>> to_blackwhite_rgb32_range(
-    const ImageViewRGB32& image,
-    const std::vector<BlackWhiteRgb32Range>& filters
-){
-    std::vector<std::pair<ImageRGB32, size_t>> ret(filters.size());
-    FixedLimitVector<Kernels::ToBlackWhiteRgb32RangeFilter> subfilters(filters.size());
-    for (size_t c = 0; c < filters.size(); c++){
-        ImageRGB32& out = ret[c].first;
-        out = ImageRGB32(image.width(), image.height());
-        subfilters.emplace_back(
-            out.data(), out.bytes_per_row(),
-            filters[c].mins, filters[c].maxs, (uint32_t)filters[c].in_range_black
-        );
-    }
-    Kernels::to_blackwhite_rgb32_range(
-        image.data(), image.bytes_per_row(), image.width(), image.height(),
-        subfilters.data(), subfilters.size()
-    );
-    for (size_t c = 0; c < filters.size(); c++){
-        ret[c].second = subfilters[c].pixels_in_range;
-    }
-    return ret;
-}
-
-
-
-
-}
diff --git a/SerialPrograms/Source/CommonFramework/ImageTools/ImageFilter.h b/SerialPrograms/Source/CommonFramework/ImageTools/ImageFilter.h
deleted file mode 100644
index 317dc53701..0000000000
--- a/SerialPrograms/Source/CommonFramework/ImageTools/ImageFilter.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/*  Image Filter
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_CommonFramework_ImageFilter_H
-#define PokemonAutomation_CommonFramework_ImageFilter_H
-
-#include <cstddef>
-#include <vector>
-#include "Common/Cpp/Color.h"
-
-namespace PokemonAutomation{
-
-class ImageViewRGB32;
-class ImageRGB32;
-
-
-//  If `replace_color_within_range` is true, replace the color range [mins, maxs] with the color `replace_with`.
-//  If `replace_color_within_range` is false, replace the color outside of the range [mins, maxs] with the color `replace_with`.
-//  Returns the # of pixels inside the range [mins, maxs].
-ImageRGB32 filter_rgb32_range(
-    const ImageViewRGB32& image,
-    uint32_t mins, uint32_t maxs,
-    Color replace_with, bool replace_color_within_range
-);
-ImageRGB32 filter_rgb32_range(
-    size_t& pixels_in_range,
-    const ImageViewRGB32& image,
-    uint32_t mins, uint32_t maxs,
-    Color replace_with, bool replace_color_within_range
-);
-
-
-
-//  Run multiple filters at once. This is more memory efficient than making
-//  multiple calls to one filter at a time.
-struct FilterRgb32Range{
-    uint32_t mins;
-    uint32_t maxs;
-    Color replace_with;
-    bool replace_color_within_range;
-};
-std::vector<std::pair<ImageRGB32, size_t>> filter_rgb32_range(
-    const ImageViewRGB32& image,
-    const std::vector<FilterRgb32Range>& filters
-);
-
-
-//  If `replace_color_within_range` is true, replace the color range [mins, maxs] with the color `replace_with`.
-//  If `replace_color_within_range` is false, replace the color outside of the distance with the color `replace_with`.
-//  Returns the # of pixels inside the distance.
-ImageRGB32 filter_rgb32_euclidean(
-    const ImageViewRGB32& image,
-    uint32_t expected, double max_euclidean_distance,
-    Color replace_with, bool replace_color_within_range
-);
-ImageRGB32 filter_rgb32_euclidean(
-    size_t& pixels_in_range,
-    const ImageViewRGB32& image,
-    uint32_t expected, double max_euclidean_distance,
-    Color replace_with, bool replace_color_within_range
-);
-
-
-
-
-
-//  Convert the image to black and white.
-//  Inside [mins, maxs] is white, otherwise it's black.
-//  Set "in_range_black" to true to invert the colors.
-ImageRGB32 to_blackwhite_rgb32_range(
-    const ImageViewRGB32& image,
-    uint32_t mins, uint32_t maxs, bool in_range_black
-);
-ImageRGB32 to_blackwhite_rgb32_range(
-    size_t& pixels_in_range,
-    const ImageViewRGB32& image,
-    uint32_t mins, uint32_t maxs, bool in_range_black
-);
-
-
-
-//  Run multiple filters at once. This is more memory efficient than making
-//  multiple calls to one filter at a time.
-struct BlackWhiteRgb32Range{
-    uint32_t mins;
-    uint32_t maxs;
-    bool in_range_black;
-};
-std::vector<std::pair<ImageRGB32, size_t>> to_blackwhite_rgb32_range(
-    const ImageViewRGB32& image,
-    const std::vector<BlackWhiteRgb32Range>& filters
-);
-
-
-
-
-}
-#endif
diff --git a/SerialPrograms/Source/CommonFramework/ImageTools/ImageManip.h b/SerialPrograms/Source/CommonFramework/ImageTools/ImageManip.h
deleted file mode 100644
index ff0df1ae55..0000000000
--- a/SerialPrograms/Source/CommonFramework/ImageTools/ImageManip.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/*  Image Manipulation
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_CommonFramework_ImageManip_H
-#define PokemonAutomation_CommonFramework_ImageManip_H
-
-#include "CommonFramework/ImageTypes/ImageRGB32.h"
-
-namespace PokemonAutomation{
-
-
-ImageRGB32 pad_image(const ImageViewRGB32& image, size_t pixels_on_each_side, uint32_t pixel);
-
-
-}
-#endif
diff --git a/SerialPrograms/Source/CommonFramework/ImageTools/ImageStats.cpp b/SerialPrograms/Source/CommonFramework/ImageTools/ImageStats.cpp
index c5b9bcaa50..4a916423e8 100644
--- a/SerialPrograms/Source/CommonFramework/ImageTools/ImageStats.cpp
+++ b/SerialPrograms/Source/CommonFramework/ImageTools/ImageStats.cpp
@@ -1,17 +1,18 @@
 /*  Image Stats
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include <cmath>
+#include <iostream>
 #include "Kernels/ImageStats/Kernels_ImagePixelSumSqr.h"
-#include "CommonFramework/GlobalSettingsPanel.h"
+#include "CommonFramework/StaticGlobals.h"
 #include "CommonFramework/ImageTypes/ImageViewRGB32.h"
 #include "ImageBoxes.h"
+
 #include "ImageStats.h"
 
-#include <iostream>
 using std::cout;
 using std::endl;
 
@@ -63,6 +64,7 @@ ImageStats image_stats(const ImageViewRGB32& image){
 
     FloatPixel average = sum / (double)sums.count;
 
+    // (\sum (x_i^2) - (\sum x_i)^2 / n) / (n-1)
     FloatPixel variance = (sqr - sum*sum / (double)sums.count) / ((double)sums.count - 1);
     FloatPixel stddev = FloatPixel(
         std::sqrt(variance.r),
@@ -72,7 +74,7 @@ ImageStats image_stats(const ImageViewRGB32& image){
 
     ImageStats stats(average, stddev, sums.count);
 
-    if (PreloadSettings::debug().COLOR_CHECK){
+    if (STATIC_GLOBALS.COLOR_CHECK){
         std::cout << "Compute imageStats: avg " << stats.average.to_string() << " (sum " << stats.average.sum()
                   << ") stddev " << stats.stddev.to_string() << " (sum " << stats.stddev.sum()
                   << ") count " << stats.count << std::endl;
diff --git a/SerialPrograms/Source/CommonFramework/ImageTools/ImageStats.h b/SerialPrograms/Source/CommonFramework/ImageTools/ImageStats.h
index cefb7156f8..e4ed26bba7 100644
--- a/SerialPrograms/Source/CommonFramework/ImageTools/ImageStats.h
+++ b/SerialPrograms/Source/CommonFramework/ImageTools/ImageStats.h
@@ -1,6 +1,6 @@
 /*  Image Stats
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -14,9 +14,9 @@ namespace PokemonAutomation{
 
 // Store basic stats of a group of pixels
 struct ImageStats{
-    // Average color among the pixels.
+    // Average color among the pixels. Range 0.0 to 255.0.
     FloatPixel average;
-    // Stddev of the color for each color channel.
+    // Stddev of the color for each color channel. Range 0.0 to 255.0.
     // The smaller the stddev on one channel, the closer the pixel values are on this channel.
     FloatPixel stddev;
     // How many pixels in the group.
@@ -31,7 +31,7 @@ FloatPixel image_average(const ImageViewRGB32& image);
 FloatPixel image_stddev(const ImageViewRGB32& image);
 ImageStats image_stats(const ImageViewRGB32& image);
 
-
+// Get stats on the one-pixel-wide border of the image
 ImageStats image_border_stats(const ImageViewRGB32& image);
 
 
diff --git a/SerialPrograms/Source/CommonFramework/ImageTools/SolidColorTest.cpp b/SerialPrograms/Source/CommonFramework/ImageTools/SolidColorTest.cpp
deleted file mode 100644
index a2b8829d94..0000000000
--- a/SerialPrograms/Source/CommonFramework/ImageTools/SolidColorTest.cpp
+++ /dev/null
@@ -1,102 +0,0 @@
-/*  Solid Color Test
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/GlobalSettingsPanel.h"
-#include "ImageBoxes.h"
-#include "SolidColorTest.h"
-
-#include <sstream>
-#include <iostream>
-using std::cout;
-using std::endl;
-
-namespace PokemonAutomation{
-
-
-bool is_white(
-    const ImageStats& stats,
-    double min_rgb_sum,
-    double max_stddev_sum
-){
-    if (stats.average.sum() < min_rgb_sum){
-        return false;
-    }
-    return is_solid(stats, {0.333333, 0.333333, 0.333333}, 0.08, max_stddev_sum);
-}
-bool is_black(
-    const ImageStats& stats,
-    double max_rgb_sum,
-    double max_stddev_sum
-){
-    double average = stats.average.sum();
-    double stddev = stats.stddev.sum();
-    if (PreloadSettings::debug().COLOR_CHECK){
-        cout << "is_black(): stats.average " << stats.average.to_string() << "(sum " << average << ") stats.stddev " << stats.stddev.to_string()
-             << "(sum " << stddev << ") max_rgb_sum " << max_rgb_sum << " max_stddev_sum " << max_stddev_sum << endl;
-    }
-//    cout << stats.average << stats.stddev << endl;
-    return average <= max_rgb_sum && stddev <= max_stddev_sum;
-}
-bool is_grey(
-    const ImageStats& stats,
-    double min_rgb_sum, double max_rgb_sum,
-    double max_stddev_sum
-){
-    double sum = stats.average.sum();
-    if (sum < min_rgb_sum || sum > max_rgb_sum){
-        return false;
-    }
-    //  If it's too dark, color ratios will be unstable.
-    if (sum < 100){
-        return true;
-    }
-    return is_solid(stats, {0.333333, 0.333333, 0.333333}, 0.1, max_stddev_sum);
-}
-bool is_solid(
-    const ImageStats& stats,
-    const FloatPixel& expected_color_ratio,
-    double max_euclidean_distance,
-    double max_stddev_sum
-){
-    const double stddev = stats.stddev.sum();
-    if (stddev > max_stddev_sum){
-//       cout << "bad stddev = " << stddev << endl;
-        return false;
-    }
-
-    const double average = stats.average.sum();
-    const FloatPixel actual = stats.average / average;
-    const double distance = euclidean_distance(actual, expected_color_ratio);
-//   cout << "actual color ratio " << actual << endl;
-//   cout << "distance = " << distance << endl;
-
-    return distance <= max_euclidean_distance;
-}
-
-bool ImageSolidCheck::check(const ImageViewRGB32& frame) const{
-    const ImageStats stats = image_stats(extract_box_reference(frame, box));
-    return is_solid(stats, expected_color_ratio, max_euclidean_distance, max_stddev_sum);
-}
-
-std::string ImageSolidCheck::debug_string(const ImageViewRGB32& frame) const{
-    std::ostringstream oss;
-    const ImageStats stats = image_stats(extract_box_reference(frame, box));
-    oss << "Box (" << box.x << ", " << box.y << ", " << box.width << ", " << box.height << ") ";
-    
-    const double average = stats.average.sum();
-    const FloatPixel actual_ratio = stats.average / average;
-    oss << "expected color ratio: " << expected_color_ratio.to_string() << " ";
-    oss << "actual color ratio: " << actual_ratio.to_string() << " ";
-    oss << "dist: " << euclidean_distance(actual_ratio, expected_color_ratio) << " ";
-
-    const double actual_stddev = stats.stddev.sum();
-    oss << "max stddev sum: " << max_stddev_sum << " actual stddev sum: " << actual_stddev;
-
-    return oss.str();
-}
-
-
-}
diff --git a/SerialPrograms/Source/CommonFramework/ImageTools/SolidColorTest.h b/SerialPrograms/Source/CommonFramework/ImageTools/SolidColorTest.h
deleted file mode 100644
index b8b61fbcb5..0000000000
--- a/SerialPrograms/Source/CommonFramework/ImageTools/SolidColorTest.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/*  Solid Color Test
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_CommonFramework_SolidColorTest_H
-#define PokemonAutomation_CommonFramework_SolidColorTest_H
-
-#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
-#include "ImageStats.h"
-#include "ImageBoxes.h"
-
-namespace PokemonAutomation{
-
-
-bool is_white(
-    const ImageStats& stats,
-    double min_rgb_sum = 500,
-    double max_stddev_sum = 10
-);
-bool is_black(
-    const ImageStats& stats,
-    double max_rgb_sum = 100,
-    double max_stddev_sum = 10
-);
-bool is_grey(
-    const ImageStats& stats,
-    double min_rgb_sum, double max_rgb_sum,
-    double max_stddev_sum = 10
-);
-
-// expected_color_ratio: ratio of color channels to match, e.g. if a color is (127, 127, 254), it's color ratio is (0.25, 0.25, 0.5)
-bool is_solid(
-    const ImageStats& stats,
-    const FloatPixel& expected_color_ratio,
-    double max_euclidean_distance = 0.15,
-    double max_stddev_sum = 10
-);
-
-
-inline bool is_white(
-    const ImageViewRGB32& image,
-    double min_rgb_sum = 500,
-    double max_stddev_sum = 10
-){
-    return is_white(image_stats(image), min_rgb_sum, max_stddev_sum);
-}
-inline bool is_black(
-    const ImageViewRGB32& image,
-    double max_rgb_sum = 100,
-    double max_stddev_sum = 10
-){
-    ImageStats stats = image_stats(image);
-//    cout << stats.average << stats.stddev << endl;
-    return is_black(stats, max_rgb_sum, max_stddev_sum);
-}
-inline bool is_grey(
-    const ImageViewRGB32& image,
-    double min_rgb_sum, double max_rgb_sum,
-    double max_stddev_sum = 10
-){
-    return is_grey(image_stats(image), min_rgb_sum, max_rgb_sum, max_stddev_sum);
-}
-
-// expected_color_ratio: ratio of color channels to match, e.g. if a color is (127, 127, 254), it's color ratio is (0.25, 0.25, 0.5)
-inline bool is_solid(
-    const ImageViewRGB32& image,
-    const FloatPixel& expected_color_ratio,
-    double max_euclidean_distance = 0.15,
-    double max_stddev_sum = 10
-){
-    return is_solid(image_stats(image), expected_color_ratio, max_euclidean_distance, max_stddev_sum);
-}
-
-// A convenience struct to do solid checks on images.
-struct ImageSolidCheck{
-    ImageFloatBox box;
-    FloatPixel expected_color_ratio;
-    double max_euclidean_distance = 0.15;
-    double max_stddev_sum = 10;
-
-    ImageSolidCheck(
-        double x, double y, double width, double height,
-        double r, double g, double b,
-        double max_distance = 0.15, double max_stddev_sum = 10)
-        : box(x, y, width, height)
-        , expected_color_ratio(r, g, b)
-        , max_euclidean_distance(max_distance)
-        , max_stddev_sum(max_stddev_sum) {}
-    
-    // Check if the area on the image is a solid color.
-    bool check(const ImageViewRGB32& image) const;
-
-    // Return a debug string on the checks performed on the image.
-    std::string debug_string(const ImageViewRGB32& image) const;
-};
-
-
-
-
-}
-#endif
diff --git a/SerialPrograms/Source/CommonFramework/ImageTools/WaterfillUtilities.cpp b/SerialPrograms/Source/CommonFramework/ImageTools/WaterfillUtilities.cpp
deleted file mode 100644
index cbe49313fc..0000000000
--- a/SerialPrograms/Source/CommonFramework/ImageTools/WaterfillUtilities.cpp
+++ /dev/null
@@ -1,167 +0,0 @@
-/*  Waterfill Process
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <map>
-#include "Common/Cpp/Color.h"
-#include "CommonFramework/GlobalSettingsPanel.h"
-#include "Kernels/Waterfill/Kernels_Waterfill_Session.h"
-#include "Kernels/Waterfill/Kernels_Waterfill_Types.h"
-#include "CommonFramework/ImageMatch/WaterfillTemplateMatcher.h"
-#include "CommonFramework/ImageTools/BinaryImage_FilterRgb32.h"
-#include "CommonFramework/ImageTypes/ImageRGB32.h"
-#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
-#include "WaterfillUtilities.h"
-
-#include <iostream>
-
-
-namespace PokemonAutomation{
-
-
-std::pair<PackedBinaryMatrix, size_t> remove_center_pixels(
-    const Kernels::Waterfill::WaterfillObject& object,
-    size_t num_pixels_to_remove
-){
-    PackedBinaryMatrix matrix = object.packed_matrix();
-    size_t width = matrix.width();
-    size_t height = matrix.height();
-//    cout << matrix.dump() << endl;
-
-    //  Sort all pixels by distance from center.
-    size_t center_x = object.center_of_gravity_x() - object.min_x;
-    size_t center_y = object.center_of_gravity_y() - object.min_y;
-    std::map<uint64_t, size_t> distances;
-    for (size_t r = 0; r < height; r++){
-        for (size_t c = 0; c < width; c++){
-            if (matrix.get(c, r)){
-                size_t dist_x = c - center_x;
-                size_t dist_y = r - center_y;
-                uint64_t distance_sqr = (uint64_t)dist_x*dist_x + (uint64_t)dist_y*dist_y;
-                distances[distance_sqr]++;
-            }
-        }
-    }
-
-    //  Filter out pixels close to center
-    size_t count = 0;
-    uint64_t distance_sqr_th = 0;
-    for (auto& item : distances){
-        count += item.second;
-        if (count >= num_pixels_to_remove){
-            distance_sqr_th = item.first;
-            break;
-        }
-    }
-    for (size_t r = 0; r < height; r++){
-        for (size_t c = 0; c < width; c++){
-            size_t dist_x = c - center_x;
-            size_t dist_y = r - center_y;
-            uint64_t distance_sqr = (uint64_t)dist_x*dist_x + (uint64_t)dist_y*dist_y;
-            if (distance_sqr < distance_sqr_th){
-                matrix.set(c, r, false);
-            }
-        }
-    }
-
-    return std::pair<PackedBinaryMatrix, size_t>(std::move(matrix), distance_sqr_th);
-}
-
-bool match_template_by_waterfill(
-    const ImageViewRGB32 &image,
-    const ImageMatch::WaterfillTemplateMatcher &matcher,
-    const std::vector<std::pair<uint32_t, uint32_t>> &filters,
-    const std::pair<size_t, size_t> &area_thresholds,
-    double rmsd_threshold,
-    std::function<bool(Kernels::Waterfill::WaterfillObject& object)> check_matched_object)
-{
-    if (PreloadSettings::debug().IMAGE_TEMPLATE_MATCHING){
-        std::cout << "Match template by waterfill, " << filters.size() << " filter(s), size range ("
-                  << area_thresholds.first << ", ";
-        if (area_thresholds.second == SIZE_MAX){
-            std::cout << "SIZE_MAX";
-        }
-        else{
-            std::cout << area_thresholds.second;
-        }
-        std::cout << ")" << std::endl;
-    }
-    auto matrices = compress_rgb32_to_binary_range(image, filters);
-
-    bool detected = false;
-    bool stop_match = false;
-    for(PokemonAutomation::PackedBinaryMatrix &matrix : matrices){
-        std::unique_ptr<Kernels::Waterfill::WaterfillSession> session = Kernels::Waterfill::make_WaterfillSession();
-        Kernels::Waterfill::WaterfillObject object;
-        const size_t min_area = area_thresholds.first;
-        session->set_source(matrix);
-        auto finder = session->make_iterator(min_area);
-        const bool keep_object_matrix = false;
-        while (finder->find_next(object, keep_object_matrix)){
-            if (PreloadSettings::debug().IMAGE_TEMPLATE_MATCHING){
-                std::cout << "Object area: " << object.area << std::endl;
-            }
-
-            if (object.area > area_thresholds.second){
-                continue;
-            }
-            double rmsd = matcher.rmsd_original(image, object);
-            if (PreloadSettings::debug().IMAGE_TEMPLATE_MATCHING){
-                std::cout << "Object rmsd: " << rmsd << std::endl;
-            }
-
-            if (rmsd < rmsd_threshold){
-                detected = true;
-                
-                if (check_matched_object(object)){
-                    stop_match = true;
-                    break;
-                }
-            }
-        }
-
-        if (stop_match){
-            break;
-        }
-    }
-    if (PreloadSettings::debug().IMAGE_TEMPLATE_MATCHING){
-        std::cout << "End match template by waterfill" << std::endl;
-    }
-    return detected;
-}
-
-
-void draw_matrix_on_image(
-    const PackedBinaryMatrix& matrix,
-    uint32_t color, ImageRGB32& image, size_t offset_x, size_t offset_y
-){
-    for (size_t x = 0; x < matrix.width(); x++){
-        for (size_t y = 0; y < matrix.height(); y++){
-            if (matrix.get(x, y)){
-                image.pixel(offset_x + x, offset_y + y) = (uint32_t)color;
-            }
-        }
-    }
-}
-
-
-void draw_object_on_image(
-    const Kernels::Waterfill::WaterfillObject& obj,
-    const uint32_t& color, ImageRGB32& image, size_t offset_x, size_t offset_y
-){
-    for (size_t x = 0; x < obj.width(); x++){
-        for (size_t y = 0; y < obj.height(); y++){
-            if (obj.object->get(obj.min_x + x, obj.min_y + y)){
-                image.pixel(offset_x + obj.min_x + x, offset_y + obj.min_y + y) = color;
-                // cout << "Set color at " << offset_x + object.min_x + obj.min_x + x << ", " << offset_y + object.min_y + obj.min_y + y << endl;
-            }
-        }
-    }
-}
-
-
-
-
-}
diff --git a/SerialPrograms/Source/CommonFramework/ImageTypes/BinaryImage.cpp b/SerialPrograms/Source/CommonFramework/ImageTypes/BinaryImage.cpp
index 14a7ba8c0f..ca2c945783 100644
--- a/SerialPrograms/Source/CommonFramework/ImageTypes/BinaryImage.cpp
+++ b/SerialPrograms/Source/CommonFramework/ImageTypes/BinaryImage.cpp
@@ -1,6 +1,6 @@
 /*  Binary Image
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/CommonFramework/ImageTypes/BinaryImage.h b/SerialPrograms/Source/CommonFramework/ImageTypes/BinaryImage.h
index df8f005dd6..f9271a5aec 100644
--- a/SerialPrograms/Source/CommonFramework/ImageTypes/BinaryImage.h
+++ b/SerialPrograms/Source/CommonFramework/ImageTypes/BinaryImage.h
@@ -1,6 +1,6 @@
 /*  Binary Image
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -12,9 +12,13 @@
 namespace PokemonAutomation{
 
 // A wrapper class of the packed binary matrix base class `Kernels::PackedBinaryMatrix_IB`.
-// See the comments of `PackedBinaryMatrix_IB` for details on its usage.
+// Those binary matrices are memory-efficient: each binary element is stored as just one bit in memory.
+// They are mainly used by the Waterfill algorithm.
+// See the comments of `PackedBinaryMatrix_IB` for more implementation details.
 //
-// This wrapper is useful in making the usage of matrix as a class. Otherwise, because of
+// This wrapper is useful in making the usage of matrix as a locally-defined class: you can use it like
+// `PackedBinaryMatrix matrix;`
+// Otherwise, because of
 // `PackedBinaryMatrix_IB` being polymorphic, we have to write explictly
 // `std::unique_ptr<Kernels::PackedBinaryMatrix_IB>` to define a matrix.
 class PackedBinaryMatrix{
@@ -51,7 +55,9 @@ class PackedBinaryMatrix{
     void operator|=(const PackedBinaryMatrix& x){ *m_matrix |= *x.m_matrix; }
     void operator&=(const PackedBinaryMatrix& x){ *m_matrix &= *x.m_matrix; }
 
+    // Print entire binary matrix as 0s and 1s. Rows are ended with "\n".
     std::string dump() const{ return m_matrix->dump(); }
+    // Print part of max as 0s and 1s. Rows are ended with "\n".
     std::string dump(size_t min_x, size_t min_y, size_t max_x, size_t max_y) const{ return m_matrix->dump(min_x, min_y, max_x, max_y); }
 
 public:
diff --git a/SerialPrograms/Source/CommonFramework/ImageTypes/ImageHSV32.cpp b/SerialPrograms/Source/CommonFramework/ImageTypes/ImageHSV32.cpp
index be6f12c375..92a2761dab 100644
--- a/SerialPrograms/Source/CommonFramework/ImageTypes/ImageHSV32.cpp
+++ b/SerialPrograms/Source/CommonFramework/ImageTypes/ImageHSV32.cpp
@@ -1,12 +1,11 @@
 /*  Image (HSV 32)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include <utility>
 #include <cmath>
-#include "Common/Cpp/Exceptions.h"
 #include "Common/Cpp/Containers/Pimpl.tpp"
 #include "Common/Cpp/Containers/AlignedVector.tpp"
 #include "ImageViewRGB32.h"
@@ -80,10 +79,10 @@ uint32_t hsv_to_rgb(uint32_t p){
     double Hf = 0;
     if (delta > 0){
         if (M == r){
-            Hf = fmod((g - b)/(double)delta, 6.0);
-        } else if (M == g){
+            Hf = fmod(fmod((g - b)/(double)delta, 6.0)+6.0, 6.0);
+        }else if (M == g){
             Hf = (b - r)/(double)delta + 2.0;
-        } else{
+        }else{
             Hf = (r - g)/(double)delta + 4.0;
         }
     }
diff --git a/SerialPrograms/Source/CommonFramework/ImageTypes/ImageHSV32.h b/SerialPrograms/Source/CommonFramework/ImageTypes/ImageHSV32.h
index 9553160032..0721bdfb3f 100644
--- a/SerialPrograms/Source/CommonFramework/ImageTypes/ImageHSV32.h
+++ b/SerialPrograms/Source/CommonFramework/ImageTypes/ImageHSV32.h
@@ -1,6 +1,6 @@
 /*  Image (HSV 32)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/CommonFramework/ImageTypes/ImageRGB32.cpp b/SerialPrograms/Source/CommonFramework/ImageTypes/ImageRGB32.cpp
index c855cd1b0c..c6d9dc5b7a 100644
--- a/SerialPrograms/Source/CommonFramework/ImageTypes/ImageRGB32.cpp
+++ b/SerialPrograms/Source/CommonFramework/ImageTypes/ImageRGB32.cpp
@@ -1,30 +1,24 @@
-/*  Image (RGB 32)
+/*  Image (RGB32)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include <utility>
-#include <QImage>
-#include "Common/Cpp/Containers/Pimpl.tpp"
-#include "Common/Cpp/Exceptions.h"
 #include "Common/Cpp/Containers/AlignedVector.tpp"
+#include "CompileTimeBackends.h"
 #include "ImageViewRGB32.h"
 #include "ImageRGB32.h"
 
-#include <iostream>
-
+#ifdef PA_IMAGE_BACKEND_Qt
+#include "ImageRGB32_Qt.h"
+#endif
+#ifdef PA_IMAGE_BACKEND_OpenCV
+#include "ImageRGB32_OpenCV.h"
+#endif
 
 namespace PokemonAutomation{
 
-struct ImageRGB32::Data{
-    AlignedVector<uint32_t> self;
-    QImage qimage;
-
-    Data(size_t items) : self(items) {}
-    Data(QImage image) : qimage(std::move(image)) {}
-};
-
 
 
 ImageRGB32::~ImageRGB32() = default;
@@ -35,6 +29,7 @@ ImageRGB32& ImageRGB32::operator=(ImageRGB32&& x) noexcept{
     if (this != &x){
         ImageViewRGB32::operator=(x);
         m_data = std::move(x.m_data);
+        m_custom_owner = std::move(x.m_custom_owner);
         x.m_bytes_per_row = 0;
         x.m_ptr = nullptr;
         x.m_width = 0;
@@ -55,43 +50,33 @@ ImageRGB32::ImageRGB32() = default;
 
 ImageRGB32::ImageRGB32(size_t width, size_t height)
     : ImageViewRGB32(width, height)
-    , m_data(CONSTRUCT_TOKEN, m_bytes_per_row / sizeof(uint32_t) * height)
+    , m_data(m_bytes_per_row / sizeof(uint32_t) * height)
 {
-    m_ptr = m_data->self.data();
+    m_ptr = m_data.data();
 }
+
+#ifdef PA_IMAGE_BACKEND_Qt
 ImageRGB32::ImageRGB32(const std::string& filename){
-    QImage image(QString::fromStdString(filename));
-    if (image.isNull()){
-        throw FileException(nullptr, PA_CURRENT_FUNCTION, "Unable to open image.", filename);
-    }
-    if (image.format() != QImage::Format_RGB32 && image.format() != QImage::Format_ARGB32){
-        image = image.convertToFormat(QImage::Format_ARGB32);
-    }
-    *this = std::move(image);
+    *this = QImage_load_image(filename);
 }
+#endif
+#ifdef PA_IMAGE_BACKEND_OpenCV
+ImageRGB32::ImageRGB32(const std::string& filename){
+    *this = OpenCV_load_image(filename);
+}
+#endif
+#ifdef PA_IMAGE_BACKEND_None
+ImageRGB32::ImageRGB32(const std::string& filename){}
+#endif
 
+ImageRGB32::ImageRGB32(std::unique_ptr<CustomImageRGB32Owner> image)
+    : m_custom_owner(std::move(image))
+{
+    ImageViewRGB32::operator=(m_custom_owner->get_view());
+}
 
 
 
-ImageRGB32::ImageRGB32(QImage image){
-    if (image.isNull()){
-        return;
-    }
-    QImage::Format format = image.format();
-    if (format == QImage::Format_ARGB32_Premultiplied){
-        image = image.convertToFormat(QImage::Format_ARGB32);
-    }
-    else if (format != QImage::Format_ARGB32 && format != QImage::Format_RGB32){
-        std::cout << "Non standard QImage format: " + std::to_string((int)format) << std::endl;
-        // image = image.convertToFormat(QImage::Format_ARGB32);
-        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Invalid QImage format." + std::to_string((int)format));
-    }
-    m_width = image.width();
-    m_height = image.height();
-    m_bytes_per_row = image.bytesPerLine();
-    m_ptr = (uint32_t*)image.bits();
-    m_data.reset(std::move(image));
-}
 
 
 
diff --git a/SerialPrograms/Source/CommonFramework/ImageTypes/ImageRGB32.h b/SerialPrograms/Source/CommonFramework/ImageTypes/ImageRGB32.h
index 059d904e85..4019d9a6b0 100644
--- a/SerialPrograms/Source/CommonFramework/ImageTypes/ImageRGB32.h
+++ b/SerialPrograms/Source/CommonFramework/ImageTypes/ImageRGB32.h
@@ -1,19 +1,30 @@
-/*  Image (RGB 32)
+/*  Image (RGB32)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifndef PokemonAutomation_CommonFramework_ImageRGB32_H
 #define PokemonAutomation_CommonFramework_ImageRGB32_H
 
+#include <memory>
 #include <string>
-#include "Common/Cpp/Containers/Pimpl.h"
+#include "Common/Cpp/Containers/AlignedVector.h"
 #include "ImageViewRGB32.h"
 
 namespace PokemonAutomation{
 
 
+
+class CustomImageRGB32Owner{
+public:
+    virtual ~CustomImageRGB32Owner() = default;
+    virtual ImageViewRGB32 get_view() const = 0;
+};
+
+
+
+
 class ImageRGB32 : public ImageViewRGB32{
 public:
     ~ImageRGB32();
@@ -27,8 +38,14 @@ class ImageRGB32 : public ImageViewRGB32{
 
 public:
     ImageRGB32();
+
+    //  Create an ARGB32 image of shape width x height with uninitialized pixels.
     ImageRGB32(size_t width, size_t height);
-    ImageRGB32(const std::string& filename);
+
+    explicit ImageRGB32(const std::string& filename);
+
+    ImageRGB32(std::unique_ptr<CustomImageRGB32Owner> image);
+
 
     //  Fill the entire image with the specified pixel.
     using ImageViewPlanar32::fill;
@@ -55,25 +72,20 @@ class ImageRGB32 : public ImageViewRGB32{
 
 public:
     using ImageViewRGB32::sub_image;
+    using ImageViewRGB32::save;
+
+
+private:
+    AlignedVector<uint32_t> m_data;
+    std::unique_ptr<CustomImageRGB32Owner> m_custom_owner;
+};
 
 
-public:
-    using ImageViewRGB32::save;
 
 
-public:
-    //  QImage
 
-    ImageRGB32(QImage image);
-    using ImageViewRGB32::to_QImage_ref;
-    using ImageViewRGB32::to_QImage_owning;
-    using ImageViewRGB32::scaled_to_QImage;
 
 
-private:
-    struct Data;
-    Pimpl<Data> m_data;
-};
 
 
 
diff --git a/SerialPrograms/Source/CommonFramework/ImageTypes/ImageRGB32_OpenCV.cpp b/SerialPrograms/Source/CommonFramework/ImageTypes/ImageRGB32_OpenCV.cpp
new file mode 100644
index 0000000000..cad519e73e
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/ImageTypes/ImageRGB32_OpenCV.cpp
@@ -0,0 +1,148 @@
+/*  Image (RGB32) Qt
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <opencv2/opencv.hpp>
+#include "Common/Cpp/Filesystem/FileIO.h"
+#include "CommonFramework/Logging/Logger.h"
+#include "ImageRGB32_OpenCV.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+
+
+
+cv::Mat to_OpenCV_ref(const ImageViewRGB32& image){
+    return cv::Mat(
+        (int)image.height(),
+        (int)image.width(),
+        CV_8UC4,
+        (uint8_t*)image.data(),
+        image.bytes_per_row()
+    );
+}
+ImageRGB32 OpenCV_scale_image(const ImageViewRGB32& image, size_t width, size_t height){
+    ImageRGB32 ret(width, height);
+
+    cv::Mat src(
+        (int)image.height(),
+        (int)image.width(),
+        CV_8UC4,
+        (uint8_t*)image.data(),
+        image.bytes_per_row()
+    );
+    cv::Mat dst(
+        (int)height,
+        (int)width,
+        CV_8UC4,
+        (uint8_t*)ret.data(),
+        ret.bytes_per_row()
+    );
+
+    cv::resize(src, dst, dst.size(), 0, 0, cv::INTER_LINEAR);
+
+    return ret;
+}
+
+ImageRGB32 OpenCV_load_image(const std::string& filename){
+    std::string data = file_to_string(filename);
+
+    cv::Mat img = cv::imdecode(
+        cv::_InputArray(data.data(), (int)data.size()),
+        cv::IMREAD_UNCHANGED
+    );
+
+//    cout << "Image: " << filename << endl;
+    if (img.empty()){
+        global_logger_tagged().log("Image is empty:" + filename);
+        return ImageRGB32();
+    }
+
+    if (img.type() != CV_8UC4){
+        switch (img.channels()){
+        case 3: // BGR or RGB (OpenCV type 16)
+            // This adds a 100% opaque alpha channel (A=255) automatically
+            cv::cvtColor(img, img, cv::COLOR_BGR2BGRA);
+            break;
+
+        case 1: // Grayscale (OpenCV type 0)
+            // This replicates the gray channel to B, G, and R, and adds A=255
+            cv::cvtColor(img, img, cv::COLOR_GRAY2BGRA);
+            break;
+
+        case 2: // Rare format: Grayscale + Alpha
+            global_logger_tagged().log("2-channel image is not supported:" + filename);
+            return ImageRGB32();
+
+        default:
+            // Fallback for exotic formats (like 16-bit or float images):
+            // Force depth scale down to 8-bit, then recurse or convert
+            img.convertTo(img, CV_8UC4);
+        }
+    }
+
+    auto ret = ImageRGB32(std::make_unique<ImageRGB32OpenCV>(std::move(img)));
+
+    return ret;
+}
+bool OpenCV_save_image(const ImageViewRGB32& image, const std::string& filename){
+    Filesystem::Path path(filename);
+
+//    cout << (void*)image.data() << endl;
+//    cout << "width = " << image.width() << endl;
+//    cout << "height = " << image.height() << endl;
+//    cout << "step = " << image.bytes_per_row() << endl;
+
+    cv::Mat argb32(
+        (int)image.height(),
+        (int)image.width(),
+        CV_8UC4,
+        (uint8_t*)image.data(),
+        image.bytes_per_row()
+    );
+//    cv::Mat abgr32;
+//    cv::cvtColor(argb32, abgr32, cv::COLOR_RGB2BGR);
+
+    std::vector<uint8_t> compressed_buffer;
+    bool success = cv::imencode(path.extension().string(), argb32, compressed_buffer);
+    if (!success || compressed_buffer.empty()){
+        global_logger_tagged().log("Failed to save image:" + filename);
+        return false;
+    }
+
+    FileIO file(path, FileMode::WRITE | FileMode::BINARY);
+    size_t bytes_written = file.write(compressed_buffer.data(), compressed_buffer.size());
+    if (bytes_written < compressed_buffer.size()){
+        global_logger_tagged().log("Failed to save image:" + filename);
+        return false;
+    }
+
+    return true;
+}
+
+
+
+
+
+ImageRGB32OpenCV::ImageRGB32OpenCV(cv::Mat image)
+    : m_image(std::move(image))
+{}
+
+ImageViewRGB32 ImageRGB32OpenCV::get_view() const{
+    return ImageViewRGB32(
+        (uint32_t*)m_image.data,
+        m_image.step,
+        m_image.cols,
+        m_image.rows
+    );
+}
+
+
+
+
+}
diff --git a/SerialPrograms/Source/CommonFramework/ImageTypes/ImageRGB32_OpenCV.h b/SerialPrograms/Source/CommonFramework/ImageTypes/ImageRGB32_OpenCV.h
new file mode 100644
index 0000000000..88712b07cc
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/ImageTypes/ImageRGB32_OpenCV.h
@@ -0,0 +1,38 @@
+/*  Image (RGB32) Qt
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_CommonFramework_ImageRGB32_OpenCV_H
+#define PokemonAutomation_CommonFramework_ImageRGB32_OpenCV_H
+
+#include <opencv2/core/mat.hpp>
+#include "ImageRGB32.h"
+
+namespace PokemonAutomation{
+
+
+cv::Mat to_OpenCV_ref(const ImageViewRGB32& image);
+ImageRGB32 OpenCV_scale_image(const ImageViewRGB32& image, size_t width, size_t height);
+
+ImageRGB32 OpenCV_load_image(const std::string& filename);
+bool OpenCV_save_image(const ImageViewRGB32& image, const std::string& filename);
+
+
+
+class ImageRGB32OpenCV : public CustomImageRGB32Owner{
+public:
+    ImageRGB32OpenCV(cv::Mat image);
+
+    virtual ImageViewRGB32 get_view() const override;
+
+
+private:
+    cv::Mat m_image;
+};
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/ImageTypes/ImageRGB32_Qt.cpp b/SerialPrograms/Source/CommonFramework/ImageTypes/ImageRGB32_Qt.cpp
new file mode 100644
index 0000000000..e8c462db54
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/ImageTypes/ImageRGB32_Qt.cpp
@@ -0,0 +1,109 @@
+/*  Image (RGB32) Qt
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <iostream>
+#include <QImageReader>
+#include "Common/Cpp/Exceptions.h"
+#include "CommonFramework/Logging/Logger.h"
+#include "ImageRGB32_Qt.h"
+
+namespace PokemonAutomation{
+
+
+
+QImage to_QImage_ref(const ImageViewRGB32& image){
+    return QImage(
+        (const uchar*)image.data(),
+        (int)image.width(),
+        (int)image.height(),
+        (int)image.bytes_per_row(),
+        QImage::Format_ARGB32
+    );
+}
+QImage to_QImage_owning(const ImageViewRGB32& image){
+    return to_QImage_ref(image).copy();
+}
+QImage scaled_to_QImage(const ImageViewRGB32& image, size_t width, size_t height){
+    QImage tmp(
+        (const uchar*)image.data(),
+        (int)image.width(),
+        (int)image.height(),
+        (int)image.bytes_per_row(),
+        QImage::Format_ARGB32
+    );
+    if (image.width() == width && image.height() == height){
+        return tmp.copy();
+    }
+    return tmp.scaled((int)width, (int)height);
+//    return tmp.scaled((int)width, (int)height, Qt::IgnoreAspectRatio, Qt::TransformationMode::SmoothTransformation);
+}
+
+
+ImageRGB32 QImage_to_ImageRGB32(QImage image){
+    return ImageRGB32(std::make_unique<ImageRGB32Qt>(std::move(image)));
+}
+
+
+ImageRGB32 QImage_load_image(const std::string& filename){
+#if QT_VERSION_MAJOR == 6
+    //  Qt 6's default allocation limit for image readers is too small for the
+    //  large composite sprite sheets loaded from disk.
+    QImageReader::setAllocationLimit(0);
+#endif
+    QImage image(QString::fromStdString(filename));
+    if (image.isNull()){
+        throw FileException(nullptr, PA_CURRENT_FUNCTION, "Unable to open image.", filename);
+    }
+    if (image.format() != QImage::Format_RGB32 && image.format() != QImage::Format_ARGB32){
+        image = image.convertToFormat(QImage::Format_ARGB32);
+    }
+    return ImageRGB32(std::make_unique<ImageRGB32Qt>(std::move(image)));
+}
+bool QImage_save_image(const ImageViewRGB32& image, const std::string& filename){
+    const bool success = to_QImage_ref(image).save(QString::fromStdString(filename));
+    if (!success){
+        global_logger_tagged().log("Failed to save image to:" + filename);
+    }
+    return success;
+}
+
+
+
+
+ImageRGB32Qt::ImageRGB32Qt(QImage image)
+    : m_image(std::move(image))
+{
+    if (m_image.isNull()){
+        return;
+    }
+    QImage::Format format = m_image.format();
+    if (format == QImage::Format_ARGB32_Premultiplied){
+        m_image = m_image.convertToFormat(QImage::Format_ARGB32);
+    }else if (format != QImage::Format_ARGB32 && format != QImage::Format_RGB32){
+        std::cout << "Non standard QImage format: " + std::to_string((int)format) << std::endl;
+        // image = image.convertToFormat(QImage::Format_ARGB32);
+        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Invalid QImage format: " + std::to_string((int)format));
+    }
+}
+
+ImageViewRGB32 ImageRGB32Qt::get_view() const{
+    if (m_image.isNull()){
+        return ImageViewRGB32();
+    }
+    return ImageViewRGB32(
+        (uint32_t*)m_image.bits(),
+        m_image.bytesPerLine(),
+        m_image.width(),
+        m_image.height()
+    );
+}
+
+
+
+
+
+
+}
diff --git a/SerialPrograms/Source/CommonFramework/ImageTypes/ImageRGB32_Qt.h b/SerialPrograms/Source/CommonFramework/ImageTypes/ImageRGB32_Qt.h
new file mode 100644
index 0000000000..b4c94f9972
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/ImageTypes/ImageRGB32_Qt.h
@@ -0,0 +1,48 @@
+/*  Image (RGB32) Qt
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_CommonFramework_ImageRGB32_Qt_H
+#define PokemonAutomation_CommonFramework_ImageRGB32_Qt_H
+
+#include <QImage>
+#include "ImageRGB32.h"
+
+namespace PokemonAutomation{
+
+
+//  Return a shallow copy-on-write reference that points to this buffer. (fast)
+QImage to_QImage_ref(const ImageViewRGB32& image);
+
+//  Return a copy that owns its own buffer. (slow)
+QImage to_QImage_owning(const ImageViewRGB32& image);
+
+QImage scaled_to_QImage(const ImageViewRGB32& image, size_t width, size_t height);
+
+ImageRGB32 QImage_to_ImageRGB32(QImage image);
+
+ImageRGB32 QImage_load_image(const std::string& filename);
+bool QImage_save_image(const ImageViewRGB32& image, const std::string& filename);
+
+
+
+
+class ImageRGB32Qt : public CustomImageRGB32Owner{
+public:
+    ImageRGB32Qt(QImage image);
+
+    virtual ImageViewRGB32 get_view() const override;
+
+
+private:
+    QImage m_image;
+};
+
+
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/ImageTypes/ImageViewHSV32.cpp b/SerialPrograms/Source/CommonFramework/ImageTypes/ImageViewHSV32.cpp
index b8dbce8323..ed561fb4d3 100644
--- a/SerialPrograms/Source/CommonFramework/ImageTypes/ImageViewHSV32.cpp
+++ b/SerialPrograms/Source/CommonFramework/ImageTypes/ImageViewHSV32.cpp
@@ -1,11 +1,10 @@
 /*  Image HSV (HSV 32)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include <string.h>
-#include "Common/Cpp/Exceptions.h"
 #include "ImageHSV32.h"
 #include "ImageViewHSV32.h"
 
diff --git a/SerialPrograms/Source/CommonFramework/ImageTypes/ImageViewHSV32.h b/SerialPrograms/Source/CommonFramework/ImageTypes/ImageViewHSV32.h
index 48ff5788f9..95319984da 100644
--- a/SerialPrograms/Source/CommonFramework/ImageTypes/ImageViewHSV32.h
+++ b/SerialPrograms/Source/CommonFramework/ImageTypes/ImageViewHSV32.h
@@ -1,6 +1,6 @@
 /*  Image View (HSV 32)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/CommonFramework/ImageTypes/ImageViewPlanar32.cpp b/SerialPrograms/Source/CommonFramework/ImageTypes/ImageViewPlanar32.cpp
index 4e58ad11d6..4f65b07ec0 100644
--- a/SerialPrograms/Source/CommonFramework/ImageTypes/ImageViewPlanar32.cpp
+++ b/SerialPrograms/Source/CommonFramework/ImageTypes/ImageViewPlanar32.cpp
@@ -1,6 +1,6 @@
 /*  Image Reference (Planar 32)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/CommonFramework/ImageTypes/ImageViewPlanar32.h b/SerialPrograms/Source/CommonFramework/ImageTypes/ImageViewPlanar32.h
index e2c326dad6..1ae09f6733 100644
--- a/SerialPrograms/Source/CommonFramework/ImageTypes/ImageViewPlanar32.h
+++ b/SerialPrograms/Source/CommonFramework/ImageTypes/ImageViewPlanar32.h
@@ -1,6 +1,6 @@
 /*  Image Reference (Planar 32)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -9,6 +9,7 @@
 
 #include <stdint.h>
 #include "Common/Compiler.h"
+#include "Common/Cpp/ImageResolution.h"
 
 namespace PokemonAutomation{
 
@@ -35,6 +36,8 @@ class ImageViewPlanar32{
     PA_FORCE_INLINE size_t          bytes_per_row   () const{ return m_bytes_per_row; }
     PA_FORCE_INLINE size_t          width           () const{ return m_width; }
     PA_FORCE_INLINE size_t          height          () const{ return m_height; }
+    PA_FORCE_INLINE Resolution      size            () const{ return Resolution(m_width, m_height); }
+    PA_FORCE_INLINE size_t          total_pixels    () const{ return m_width * m_height; }
 
     //  Direct Pixel Access
     PA_FORCE_INLINE uint32_t pixel(size_t x, size_t y) const{
diff --git a/SerialPrograms/Source/CommonFramework/ImageTypes/ImageViewRGB32.cpp b/SerialPrograms/Source/CommonFramework/ImageTypes/ImageViewRGB32.cpp
index 73d8477903..e0556a7754 100644
--- a/SerialPrograms/Source/CommonFramework/ImageTypes/ImageViewRGB32.cpp
+++ b/SerialPrograms/Source/CommonFramework/ImageTypes/ImageViewRGB32.cpp
@@ -1,15 +1,26 @@
 /*  Image View (RGB 32)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include <QImage>
-#include <opencv2/core/mat.hpp>
-#include "Common/Cpp/Exceptions.h"
+#include "Common/Cpp/Filesystem/Filesystem.h"
+#include "CompileTimeBackends.h"
+#include "CommonFramework/Logging/Logger.h"
 #include "ImageRGB32.h"
 #include "ImageViewRGB32.h"
 
+#ifdef PA_IMAGE_BACKEND_Qt
+#include "ImageRGB32_Qt.h"
+#endif
+#ifdef PA_IMAGE_BACKEND_OpenCV
+#include "ImageRGB32_OpenCV.h"
+#endif
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
 namespace PokemonAutomation{
 
 
@@ -23,44 +34,50 @@ ImageRGB32 ImageViewRGB32::copy() const{
     ret.copy_from(*this);
     return ret;
 }
-bool ImageViewRGB32::save(const std::string& path) const{
-    return to_QImage_ref().save(QString::fromStdString(path));
-}
-ImageRGB32 ImageViewRGB32::scale_to(size_t width, size_t height) const{
-    return scaled_to_QImage(width, height);
-}
 
+bool ImageViewRGB32::save(const std::string& path) const{
+    Filesystem::Path folder = Filesystem::Path(path).parent_path();
 
+    try{
+        Filesystem::create_directories(folder);
+    }catch (...){}
 
-ImageViewRGB32::ImageViewRGB32(const QImage& image){
-    if (image.isNull()){
-        return;
-    }
-    QImage::Format format = image.format();
-    if (format != QImage::Format_ARGB32 && format != QImage::Format_RGB32){
-        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Invalid QImage format.");
+    if (!folder.empty() && !Filesystem::exists(folder)){
+        global_logger_tagged().log("Failed to create directory for saving image:" + folder.string());
+        return false;
     }
-    m_width = image.width();
-    m_height = image.height();
-    m_bytes_per_row = image.bytesPerLine();
-    m_ptr = (uint32_t*)image.bits();    //  Intentionally casting away const. It won't be modified.
-}
-QImage ImageViewRGB32::to_QImage_ref() const{
-    return QImage((const uchar*)m_ptr, (int)m_width, (int)m_height, (int)m_bytes_per_row, QImage::Format_ARGB32);
-}
-QImage ImageViewRGB32::to_QImage_owning() const{
-    return to_QImage_ref().copy();
+
+#ifdef PA_IMAGE_BACKEND_None
+    return false;
+#endif
+#ifdef PA_IMAGE_BACKEND_Qt
+    return QImage_save_image(*this, path);
+#endif
+#ifdef PA_IMAGE_BACKEND_OpenCV
+    return OpenCV_save_image(*this, path);
+#endif
+
 }
-QImage ImageViewRGB32::scaled_to_QImage(size_t width, size_t height) const{
-    QImage tmp((const uchar*)m_ptr, (int)m_width, (int)m_height, (int)m_bytes_per_row, QImage::Format_ARGB32);
-    if (m_width == width && m_height == height){
-        return tmp.copy();
+
+
+ImageRGB32 ImageViewRGB32::scale_to(size_t width, size_t height) const{
+    if (this->total_pixels() == 0){
+        ImageRGB32 ret(width, height);
+        ret.fill(0);
+        return ret;
     }
-    return tmp.scaled((int)width, (int)height);
-//    return tmp.scaled((int)width, (int)height, Qt::IgnoreAspectRatio, Qt::TransformationMode::SmoothTransformation);
-}
-cv::Mat ImageViewRGB32::to_opencv_Mat() const{
-    return cv::Mat{ static_cast<int>(m_height), static_cast<int>(m_width), CV_8UC4, (cv::Scalar*)m_ptr, m_bytes_per_row };
+    if (width * height == 0){
+        return ImageRGB32();
+    }
+#ifdef PA_IMAGE_BACKEND_Qt
+    return QImage_to_ImageRGB32(scaled_to_QImage(*this, width, height));
+#endif
+#ifdef PA_IMAGE_BACKEND_OpenCV
+    return OpenCV_scale_image(*this, width, height);
+#endif
+#ifdef PA_IMAGE_BACKEND_None
+    return ImageRGB32();
+#endif
 }
 
 
@@ -68,4 +85,5 @@ cv::Mat ImageViewRGB32::to_opencv_Mat() const{
 
 
 
+
 }
diff --git a/SerialPrograms/Source/CommonFramework/ImageTypes/ImageViewRGB32.h b/SerialPrograms/Source/CommonFramework/ImageTypes/ImageViewRGB32.h
index f8feaa293c..7f5dc7572e 100644
--- a/SerialPrograms/Source/CommonFramework/ImageTypes/ImageViewRGB32.h
+++ b/SerialPrograms/Source/CommonFramework/ImageTypes/ImageViewRGB32.h
@@ -1,6 +1,6 @@
 /*  Image View (RGB 32)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -10,11 +10,6 @@
 #include <string>
 #include "ImageViewPlanar32.h"
 
-class QImage;
-namespace cv{
-    class Mat;
-}
-
 namespace PokemonAutomation{
 
 
@@ -33,6 +28,7 @@ class ImageViewRGB32 : public ImageViewPlanar32{
     using ImageViewPlanar32::bytes_per_row;
     using ImageViewPlanar32::width;
     using ImageViewPlanar32::height;
+    using ImageViewPlanar32::total_pixels;
 
     //  Direct Pixel Access
     PA_FORCE_INLINE uint32_t pixel(size_t x, size_t y) const{
@@ -45,19 +41,11 @@ class ImageViewRGB32 : public ImageViewPlanar32{
 
 public:
     ImageRGB32 copy() const;
+    // Call QImage::save() to save image to file. Return whether the save is successful.
+    // If the path includes nonexistent folders, save() will create it first.
     bool save(const std::string& path) const;
     ImageRGB32 scale_to(size_t width, size_t height) const;
 
-public:
-    //  QImage
-
-    ImageViewRGB32(const QImage& image);
-    QImage to_QImage_ref() const;       //  Return a shallow copy-on-write reference that points to this buffer. (fast)
-    QImage to_QImage_owning() const;    //  Return a copy that owns its own buffer. (slow)
-    QImage scaled_to_QImage(size_t width, size_t height) const;
-
-    cv::Mat to_opencv_Mat() const;
-
 private:
     PA_FORCE_INLINE ImageViewRGB32(const ImageViewPlanar32& x)
         : ImageViewPlanar32(x)
diff --git a/SerialPrograms/Source/CommonFramework/Inference/BlackBorderDetector.cpp b/SerialPrograms/Source/CommonFramework/Inference/BlackBorderDetector.cpp
deleted file mode 100644
index 1d93582dad..0000000000
--- a/SerialPrograms/Source/CommonFramework/Inference/BlackBorderDetector.cpp
+++ /dev/null
@@ -1,75 +0,0 @@
-/*  Black Border Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/ImageTools/ImageStats.h"
-#include "CommonFramework/ImageTools/SolidColorTest.h"
-#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
-#include "BlackBorderDetector.h"
-
-#include <iostream>
-using std::cout;
-using std::endl;
-
-namespace PokemonAutomation{
-
-
-BlackBorderDetector::BlackBorderDetector()
-    : m_top(0.001, 0.001, 0.997, 0.002)
-    , m_bottom(0.001, 0.997, 0.997, 0.002)
-    , m_left(0.001, 0.001, 0.002, 0.997)
-    , m_right(0.997, 0.001, 0.002, 0.997)
-//    , m_body(0.100, 0.100, 0.800, 0.800)
-{}
-
-void BlackBorderDetector::make_overlays(VideoOverlaySet& items) const{
-    items.add(COLOR_RED, m_top);
-    items.add(COLOR_RED, m_bottom);
-    items.add(COLOR_RED, m_left);
-    items.add(COLOR_RED, m_right);
-//        items.add(COLOR_RED, m_body);
-}
-bool BlackBorderDetector::detect(const ImageViewRGB32& screen) const{
-    const double MAX_SUM = 50;
-    const double MAX_STDDEV = 20;
-
-    ImageStats top = image_stats(extract_box_reference(screen, m_top));
-//    cout << "top = " << top.average << top.stddev << endl;
-//    extract_box(screen, m_top).save("top.png");
-    if (!is_black(top, MAX_SUM, MAX_STDDEV)){
-        return false;
-    }
-    ImageStats bottom = image_stats(extract_box_reference(screen, m_bottom));
-    cout << "bottom = " << bottom.average << bottom.stddev << endl;
-    if (!is_black(bottom, MAX_SUM, MAX_STDDEV)){
-        return false;
-    }
-    ImageStats left = image_stats(extract_box_reference(screen, m_left));
-    cout << "left = " << left.average << left.stddev << endl;
-    if (!is_black(left, MAX_SUM, MAX_STDDEV)){
-        return false;
-    }
-    ImageStats right = image_stats(extract_box_reference(screen, m_right));
-    cout << "right = " << right.average << right.stddev << endl;
-    if (!is_black(right, MAX_SUM, MAX_STDDEV)){
-        return false;
-    }
-//    ImageStats body = image_stats(extract_box_reference(screen, m_body));
-//    cout << "body = " << body.average << body.stddev << endl;
-//    if (is_black(right, 30, 30)){
-//        return false;
-//    }
-
-
-//    for (int c = 0; c < screen.width(); c++){
-//        QRgb pixel = screen.pixel(c, 0);
-//        cout << "(" << qRed(pixel) << "," << qGreen(pixel) << "," << qBlue(pixel) << ")";
-//    }
-
-    return true;
-}
-
-
-}
diff --git a/SerialPrograms/Source/CommonFramework/Inference/BlackBorderDetector.h b/SerialPrograms/Source/CommonFramework/Inference/BlackBorderDetector.h
deleted file mode 100644
index 6685ecec41..0000000000
--- a/SerialPrograms/Source/CommonFramework/Inference/BlackBorderDetector.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*  Black Screen Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_CommonFramework_BlackBorderDetector_H
-#define PokemonAutomation_CommonFramework_BlackBorderDetector_H
-
-#include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "CommonFramework/Inference/VisualDetector.h"
-
-namespace PokemonAutomation{
-
-
-class BlackBorderDetector : public StaticScreenDetector{
-public:
-    BlackBorderDetector();
-
-    virtual void make_overlays(VideoOverlaySet& items) const override;
-    virtual bool detect(const ImageViewRGB32& screen) const override;
-
-private:
-    ImageFloatBox m_top;
-    ImageFloatBox m_bottom;
-    ImageFloatBox m_left;
-    ImageFloatBox m_right;
-//    ImageFloatBox m_body;
-};
-
-
-
-}
-#endif
diff --git a/SerialPrograms/Source/CommonFramework/Inference/BlackScreenDetector.cpp b/SerialPrograms/Source/CommonFramework/Inference/BlackScreenDetector.cpp
deleted file mode 100644
index b5d16e1cef..0000000000
--- a/SerialPrograms/Source/CommonFramework/Inference/BlackScreenDetector.cpp
+++ /dev/null
@@ -1,131 +0,0 @@
-/*  Black Border Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- *
- *      Returns true after a black screen has been detected and
- * the black screen has ended.
- *
- */
-
-#include "CommonFramework/ImageTools/SolidColorTest.h"
-#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
-#include "BlackScreenDetector.h"
-
-//#include <iostream>
-//using std::cout;
-//using std::endl;
-
-namespace PokemonAutomation{
-
-
-BlackScreenDetector::BlackScreenDetector(
-    Color color, const ImageFloatBox& box,
-    double max_rgb_sum,
-    double max_stddev_sum
-)
-    : m_color(color)
-    , m_box(box)
-    , m_max_rgb_sum(max_rgb_sum)
-    , m_max_stddev_sum(max_stddev_sum)
-{}
-void BlackScreenDetector::make_overlays(VideoOverlaySet& items) const{
-    items.add(m_color, m_box);
-}
-bool BlackScreenDetector::detect(const ImageViewRGB32& screen) const{
-    return is_black(extract_box_reference(screen, m_box), m_max_rgb_sum, m_max_stddev_sum);
-}
-
-
-
-WhiteScreenDetector::WhiteScreenDetector(
-    Color color, const ImageFloatBox& box,
-    double min_rgb_sum,
-    double max_stddev_sum
-)
-    : m_color(color)
-    , m_box(box)
-    , m_min_rgb_sum(min_rgb_sum)
-    , m_max_stddev_sum(max_stddev_sum)
-{}
-void WhiteScreenDetector::make_overlays(VideoOverlaySet& items) const{
-    items.add(m_color, m_box);
-}
-bool WhiteScreenDetector::detect(const ImageViewRGB32& screen) const{
-    return is_white(extract_box_reference(screen, m_box), m_min_rgb_sum, m_max_stddev_sum);
-}
-
-
-
-BlackScreenWatcher::BlackScreenWatcher(
-    Color color, const ImageFloatBox& box,
-    double max_rgb_sum,
-    double max_stddev_sum
-)
-    : BlackScreenDetector(color, box, max_rgb_sum, max_stddev_sum)
-    , VisualInferenceCallback("BlackScreenWatcher")
-{}
-void BlackScreenWatcher::make_overlays(VideoOverlaySet& items) const{
-    BlackScreenDetector::make_overlays(items);
-}
-bool BlackScreenWatcher::process_frame(const ImageViewRGB32& frame, WallClock timestamp){
-    return detect(frame);
-}
-
-
-
-
-BlackScreenOverWatcher::BlackScreenOverWatcher(
-    Color color, const ImageFloatBox& box,
-    double max_rgb_sum,
-    double max_stddev_sum
-)
-    : VisualInferenceCallback("BlackScreenOverWatcher")
-    , m_detector(color, box, max_rgb_sum, max_stddev_sum)
-{}
-void BlackScreenOverWatcher::make_overlays(VideoOverlaySet& items) const{
-    m_detector.make_overlays(items);
-}
-bool BlackScreenOverWatcher::process_frame(const ImageViewRGB32& frame, WallClock timestamp){
-    return black_is_over(frame);
-}
-bool BlackScreenOverWatcher::black_is_over(const ImageViewRGB32& frame){
-    if (m_detector.detect(frame)){
-        m_has_been_black = true;
-        return false;
-    }
-    return m_has_been_black;
-}
-
-
-
-
-WhiteScreenOverWatcher::WhiteScreenOverWatcher(
-    Color color, const ImageFloatBox& box,
-    double min_rgb_sum,
-    double max_stddev_sum
-)
-    : VisualInferenceCallback("BlackScreenOverWatcher")
-    , m_detector(color, box, min_rgb_sum, max_stddev_sum)
-{}
-void WhiteScreenOverWatcher::make_overlays(VideoOverlaySet& items) const{
-    m_detector.make_overlays(items);
-}
-
-bool WhiteScreenOverWatcher::process_frame(const ImageViewRGB32& frame, WallClock timestamp){
-    return white_is_over(frame);
-}
-bool WhiteScreenOverWatcher::white_is_over(const ImageViewRGB32& frame){
-    if (m_detector.detect(frame)){
-        m_has_been_white = true;
-        return false;
-    }
-    return m_has_been_white;
-}
-
-
-
-
-
-
-}
diff --git a/SerialPrograms/Source/CommonFramework/Inference/BlackScreenDetector.h b/SerialPrograms/Source/CommonFramework/Inference/BlackScreenDetector.h
deleted file mode 100644
index 261842cb5b..0000000000
--- a/SerialPrograms/Source/CommonFramework/Inference/BlackScreenDetector.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/*  Black Screen Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- *
- *      Returns true after a black screen has been detected and
- * the black screen has ended.
- *
- */
-
-#ifndef PokemonAutomation_CommonFramework_BlackScreenDetector_H
-#define PokemonAutomation_CommonFramework_BlackScreenDetector_H
-
-#include "Common/Cpp/Color.h"
-#include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "CommonFramework/InferenceInfra/VisualInferenceCallback.h"
-#include "CommonFramework/Inference/VisualDetector.h"
-
-namespace PokemonAutomation{
-
-
-class BlackScreenDetector : public StaticScreenDetector{
-public:
-    BlackScreenDetector(
-        Color color = COLOR_RED,
-        const ImageFloatBox& box = {0.1, 0.1, 0.8, 0.8},
-        double max_rgb_sum = 100,
-        double max_stddev_sum = 10
-    );
-
-    virtual void make_overlays(VideoOverlaySet& items) const override;
-    virtual bool detect(const ImageViewRGB32& screen) const override;
-
-private:
-    Color m_color;
-    ImageFloatBox m_box;
-    double m_max_rgb_sum;
-    double m_max_stddev_sum;
-};
-class WhiteScreenDetector : public StaticScreenDetector{
-public:
-    WhiteScreenDetector(
-        Color color = COLOR_RED,
-        const ImageFloatBox& box = {0.1, 0.1, 0.8, 0.8},
-        double min_rgb_sum = 500,
-        double max_stddev_sum = 10
-    );
-
-    virtual void make_overlays(VideoOverlaySet& items) const override;
-    virtual bool detect(const ImageViewRGB32& screen) const override;
-
-private:
-    Color m_color;
-    ImageFloatBox m_box;
-    double m_min_rgb_sum;
-    double m_max_stddev_sum;
-};
-
-
-class BlackScreenWatcher : public BlackScreenDetector, public VisualInferenceCallback{
-public:
-    BlackScreenWatcher(
-        Color color = COLOR_RED,
-        const ImageFloatBox& box = {0.1, 0.1, 0.8, 0.8},
-        double max_rgb_sum = 100,
-        double max_stddev_sum = 10
-    );
-
-    virtual void make_overlays(VideoOverlaySet& items) const override;
-    virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override;
-};
-
-// Detect when a period of black screen is over
-class BlackScreenOverWatcher : public VisualInferenceCallback{
-public:
-    BlackScreenOverWatcher(
-        Color color = COLOR_RED,
-        const ImageFloatBox& box = {0.1, 0.1, 0.8, 0.8},
-        double max_rgb_sum = 100,
-        double max_stddev_sum = 10
-    );
-
-    bool black_is_over(const ImageViewRGB32& frame);
-
-    virtual void make_overlays(VideoOverlaySet& items) const override;
-
-    virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override;
-
-private:
-    BlackScreenDetector m_detector;
-    bool m_has_been_black = false;
-};
-
-
-
-
-class WhiteScreenOverWatcher : public VisualInferenceCallback{
-public:
-    WhiteScreenOverWatcher(
-        Color color = COLOR_RED,
-        const ImageFloatBox& box = {0.1, 0.1, 0.8, 0.8},
-        double min_rgb_sum = 500,
-        double max_stddev_sum = 10
-    );
-
-    bool white_is_over(const ImageViewRGB32& frame);
-
-    virtual void make_overlays(VideoOverlaySet& items) const override;
-
-    virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override;
-
-private:
-    WhiteScreenDetector m_detector;
-    bool m_has_been_white = false;
-};
-
-
-
-}
-#endif
diff --git a/SerialPrograms/Source/CommonFramework/Inference/FrozenImageDetector.cpp b/SerialPrograms/Source/CommonFramework/Inference/FrozenImageDetector.cpp
deleted file mode 100644
index 86e0746cf9..0000000000
--- a/SerialPrograms/Source/CommonFramework/Inference/FrozenImageDetector.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-/*  Frozen Screen Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
-#include "CommonFramework/ImageMatch/ImageDiff.h"
-#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
-#include "FrozenImageDetector.h"
-
-#include <iostream>
-using std::cout;
-using std::endl;
-
-namespace PokemonAutomation{
-
-
-FrozenImageDetector::FrozenImageDetector(std::chrono::milliseconds timeout, double rmsd_threshold)
-    : VisualInferenceCallback("FrozenImageDetector")
-    , m_color(COLOR_CYAN)
-    , m_box(0.0, 0.0, 1.0, 1.0)
-    , m_timeout(timeout)
-    , m_rmsd_threshold(rmsd_threshold)
-{}
-FrozenImageDetector::FrozenImageDetector(
-    Color color, const ImageFloatBox& box,
-    std::chrono::milliseconds timeout, double rmsd_threshold
-)
-    : VisualInferenceCallback("FrozenImageDetector")
-    , m_color(color)
-    , m_box(box)
-    , m_timeout(timeout)
-    , m_rmsd_threshold(rmsd_threshold)
-{}
-void FrozenImageDetector::make_overlays(VideoOverlaySet& set) const{
-    set.add(m_color, m_box);
-}
-bool FrozenImageDetector::process_frame(const ImageViewRGB32& frame, WallClock timestamp){
-    ImageRGB32 image = extract_box_reference(frame, m_box).copy();
-    if (m_previous.width() != image.width() || m_previous.height() != image.height()){
-        m_timestamp = timestamp;
-        m_previous = std::move(image);
-        return false;
-    }
-
-    double rmsd = ImageMatch::pixel_RMSD(m_previous, image);
-//    cout << "rmsd = " << rmsd << endl;
-    if (rmsd > m_rmsd_threshold){
-        m_timestamp = timestamp;
-        m_previous = std::move(image);
-        return false;
-    }
-
-    return timestamp - m_timestamp > m_timeout;
-//    return false;
-}
-
-
-}
diff --git a/SerialPrograms/Source/CommonFramework/Inference/FrozenImageDetector.h b/SerialPrograms/Source/CommonFramework/Inference/FrozenImageDetector.h
deleted file mode 100644
index df77c35b3a..0000000000
--- a/SerialPrograms/Source/CommonFramework/Inference/FrozenImageDetector.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*  Frozen Screen Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- *  Detect if the entire screen is frozen.
- */
-
-#ifndef PokemonAutomation_CommonFramework_FrozenImageDetector_H
-#define PokemonAutomation_CommonFramework_FrozenImageDetector_H
-
-#include "Common/Cpp/Color.h"
-#include "CommonFramework/ImageTypes/ImageRGB32.h"
-#include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "CommonFramework/InferenceInfra/VisualInferenceCallback.h"
-
-namespace PokemonAutomation{
-
-
-class FrozenImageDetector : public VisualInferenceCallback{
-public:
-    FrozenImageDetector(std::chrono::milliseconds timeout, double rmsd_threshold);
-    FrozenImageDetector(
-        Color color, const ImageFloatBox& box,
-        std::chrono::milliseconds timeout, double rmsd_threshold
-    );
-
-    virtual void make_overlays(VideoOverlaySet& items) const override;
-    virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override;
-
-private:
-    Color m_color;
-    ImageFloatBox m_box;
-    std::chrono::milliseconds m_timeout;
-    double m_rmsd_threshold;
-    WallClock m_timestamp;
-    ImageRGB32 m_previous;
-};
-
-
-
-}
-#endif
diff --git a/SerialPrograms/Source/CommonFramework/Inference/ImageTools.cpp b/SerialPrograms/Source/CommonFramework/Inference/ImageTools.cpp
deleted file mode 100644
index 3fc99c0508..0000000000
--- a/SerialPrograms/Source/CommonFramework/Inference/ImageTools.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-/*  Image Tools
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <cmath>
-#include "CommonFramework/ImageTypes/ImageRGB32.h"
-#include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "CommonFramework/ImageTools/FloatPixel.h"
-#include "ImageTools.h"
-
-namespace PokemonAutomation{
-
-
-
-ImageRGB32 image_diff_greyscale(const ImageViewRGB32& x, const ImageViewRGB32& y){
-    if (!x || !y){
-        return ImageRGB32();
-    }
-    if (x.width() != y.width()){
-        return ImageRGB32();
-    }
-    if (x.height() != y.height()){
-        return ImageRGB32();
-    }
-
-    ImageRGB32 image(x.width(), x.height());
-    size_t width = x.width();
-    size_t height = x.height();
-    for (size_t r = 0; r < height; r++){
-        for (size_t c = 0; c < width; c++){
-            Color px(x.pixel(c, r));
-            Color py(y.pixel(c, r));
-            if (px.alpha() == 0 || py.alpha() == 0){
-                image.pixel(c, r) = 0xff000000;
-            }else{
-                double distance = euclidean_distance(px, py);
-                distance *= 0.57735026918962576451;  //  1 / sqrt(3)
-                uint32_t dist_int = std::min<uint32_t>((uint32_t)distance, 255);
-                image.pixel(c, r) = 0xff000000 + dist_int * 0x010101;
-            }
-        }
-    }
-    return image;
-}
-
-
-
-
-
-
-
-
-
-
-
-
-}
-
diff --git a/SerialPrograms/Source/CommonFramework/Inference/ImageTools.h b/SerialPrograms/Source/CommonFramework/Inference/ImageTools.h
deleted file mode 100644
index 5b745f465d..0000000000
--- a/SerialPrograms/Source/CommonFramework/Inference/ImageTools.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*  Image Tools
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_CommonFramework_ImageTools_H
-#define PokemonAutomation_CommonFramework_ImageTools_H
-
-
-namespace PokemonAutomation{
-
-class ImageViewRGB32;
-class ImageRGB32;
-
-
-//  Deprecated
-ImageRGB32 image_diff_greyscale(const ImageViewRGB32& x, const ImageViewRGB32& y);
-
-
-
-
-
-}
-#endif
-
diff --git a/SerialPrograms/Source/CommonFramework/Inference/SpectrogramMatcher.cpp b/SerialPrograms/Source/CommonFramework/Inference/SpectrogramMatcher.cpp
deleted file mode 100644
index b8a0f655d9..0000000000
--- a/SerialPrograms/Source/CommonFramework/Inference/SpectrogramMatcher.cpp
+++ /dev/null
@@ -1,404 +0,0 @@
-
-
-#include <cfloat>
-#include <cmath>
-#include <iostream>
-#include <fstream>
-//#include "Common/Cpp/Exceptions.h"
-#include "Common/Cpp/Containers/AlignedVector.tpp"
-#include "Kernels/ScaleInvariantMatrixMatch/Kernels_ScaleInvariantMatrixMatch.h"
-#include "Kernels/SpikeConvolution/Kernels_SpikeConvolution.h"
-#include "CommonFramework/AudioPipeline/AudioFeed.h"
-#include "CommonFramework/AudioPipeline/AudioTemplate.h"
-#include "SpectrogramMatcher.h"
-
-//#include <iostream>
-//using std::cout;
-//using std::endl;
-
-namespace PokemonAutomation{
-
-
-std::vector<float> buildSpikeKernel(size_t numFrequencies, size_t halfSampleRate){
-    std::vector<float> kernel;
-    // We find a good kernel when sample rate is 48K and numFrequencies is 2048:
-    // [-4.f, -3.f, -2.f, -1.f, 0.f, 1.f, 2.f, 3.f, 4.f, 4.f, 3.f, 2.f, 1.f, 0.f, -1.f, -2.f, -3.f, -4.f]
-    // This spans frenquency range of 17 * halfSampleRate / numFrequencies = 199.21875Hz, where 17 is the number of intervals in the above series.
-    // For another sample rate and numFrequencies combination, the number of intervals is
-    // 199.21875 * numFrequencies / halfSampleRate
-    size_t numKernelIntervals = int(199.21875 * numFrequencies / halfSampleRate + 0.5);
-    size_t slopeLen = numKernelIntervals / 2;
-    for(size_t i = 0; i <= slopeLen; i++){
-        kernel.push_back(-4.0f + 8.f * i / (float)slopeLen);
-    }
-    for(size_t i = ((numKernelIntervals+1) % 2); i <= slopeLen; i++){
-        kernel.push_back(-4.0f + 8.f * (slopeLen-i)/(float)slopeLen);
-    }
-    return kernel;
-}
-
-// std::vector<float> buildSmoothKernel(size_t numFrequencies, size_t halfSampleRate){
-//     std::vector<float> kernel;
-//     // We find a good kernel when sample rate is 48K and numFrequencies is 2048:
-//     // [0.0111, 0.135, 0.606, 1.0, 0.606, 0.135, 0.0111], built as Gaussian distribution with sigma(stddev) as 1.0
-//     // The equation for Gaussian is exp(-x^2/(2 sigma^2))
-//     // We can think sigma value as 1.0 * frequency_gap = 1.0 * halfSampleRate / numFrequencies = 11.71875 Hz
-// }
-
-
-SpectrogramMatcher::SpectrogramMatcher(
-    std::string name,
-    AudioTemplate audioTemplate, Mode mode, size_t sample_rate,
-    double low_frequency_filter, size_t templateSubdivision
-)
-    : m_name(std::move(name))
-    , m_template(std::move(audioTemplate))
-    , m_sample_rate(sample_rate)
-    , m_mode(mode)
-{
-    const size_t numTemplateWindows = m_template.numWindows();
-//    cout << "numTemplateWindows = " << numTemplateWindows << endl;
-    m_numOriginalFrequencies = m_template.numFrequencies();
-    if (m_template.numFrequencies() == 0){  // Error case, failed to load template
-        std::cout << "Error: load audio template failed" << std::endl;
-        return;
-//        throw FileException(nullptr, PA_CURRENT_FUNCTION, "Unable to load audio template file.", templateFilename.toStdString());
-    }
-
-    const size_t halfSampleRate = sample_rate / 2;
-
-    // The frquency range from [0.0, halfSampleRate / numFrequencies, 2.0 halfSampleRate / numFrequencies, ... (numFrequencies-1) halfSampleRate / numFrequencies]
-    // Since human can only hear as high as 20KHz sound, matching on frequencies >= 20KHz is meaningless.
-    // So the index i of the max frequency we should be matching is the one with
-    // i * halfSampleRate/numFrequencies  <= 20KHz
-    // i <= numFrequencies * 20K / halfSampleRate
-    // We also have a cut-off threshold to remove lower frequencies. We set it to be at frequency index 5 when sample rate is 48K and numFrequencies is 2048.
-    // So 5.0 24K / 2048 = 58.59375Hz. For other sample rate and numFrequencies combinations,
-    // j * halfSampleRate/numFrequencies >= 58.59375 -> j >= 58.59375 * numFrequnecies / halfSampleRate
-
-    m_originalFreqStart = int(low_frequency_filter * m_numOriginalFrequencies / halfSampleRate + 0.5);
-    m_originalFreqEnd = 20000 * m_numOriginalFrequencies / halfSampleRate + 1;
-
-    // Initialize the spike convolution kernel:
-    m_convKernel = buildSpikeKernel(m_numOriginalFrequencies, halfSampleRate);
-
-    switch(m_mode){
-    case Mode::SPIKE_CONV:
-    {
-        // Do convolution on audio template
-        const size_t numConvedFrequencies = (m_originalFreqEnd - m_originalFreqStart) - m_convKernel.size() + 1;
-
-        AudioTemplate audio_template(numConvedFrequencies, numTemplateWindows);
-        for (size_t i = 0; i < numTemplateWindows; i++){
-            conv(
-                m_template.getWindow(i) + m_originalFreqStart, m_originalFreqEnd - m_originalFreqStart,
-                audio_template.getWindow(i)
-            );
-        }
-
-        m_template = std::move(audio_template);
-        m_freqStart = 0;
-        m_freqEnd = numConvedFrequencies;
-        break;
-    }
-    case Mode::AVERAGE_5:
-    {
-        // Avereage every 5 frequencies
-        const size_t numNewFreq = (m_originalFreqEnd - m_originalFreqStart) / 5;
-
-        AudioTemplate audio_template(numNewFreq, numTemplateWindows);
-        for (size_t i = 0; i < numTemplateWindows; i++){
-            for (size_t j = 0; j < numNewFreq; j++){
-                const float * rawFreqMag = m_template.getWindow(i) + m_originalFreqStart + j*5;
-                const float newMag = (rawFreqMag[0] + rawFreqMag[1] + rawFreqMag[2] + rawFreqMag[3] + rawFreqMag[4]) / 5.0f;
-                audio_template.getWindow(i)[j] = newMag;
-            }
-        }
-
-        m_template = std::move(audio_template);
-        m_freqStart = 0;
-        m_freqEnd = numNewFreq;
-        break;
-    }
-    case Mode::RAW:
-        m_freqStart = m_originalFreqStart;
-        m_freqEnd = m_originalFreqEnd;
-        break;
-    }
-
-    if (templateSubdivision <= 1){
-        m_templateRange.emplace_back(0, numTemplateWindows);
-        m_numSpectrumsNeeded = numTemplateWindows;
-    } else{
-        // Number of subdivision cannot exceed number of windows in the template.
-        templateSubdivision = std::min(templateSubdivision, numTemplateWindows);
-        // num windows of each subdivided template
-        const size_t num_subWindows = numTemplateWindows / templateSubdivision;
-        m_numSpectrumsNeeded = num_subWindows;
-        for(size_t i = 0; i < templateSubdivision; i++){
-            const size_t windowStart = i * num_subWindows;
-            const size_t windowEnd = (i+1) * num_subWindows;
-            m_templateRange.emplace_back(windowStart, windowEnd);
-        }
-    }
-//    cout << "m_templateRange = " << m_templateRange.size() << endl;
-//    cout << "m_numSpectrumsNeeded = " << m_numSpectrumsNeeded << endl;
-
-    m_templateNorm = buildTemplateNorm();
-}
-
-uint64_t SpectrogramMatcher::latestTimestamp() const{
-    if (m_spectrums.size() == 0){
-        return SIZE_MAX;
-    }
-    return m_spectrums.front().stamp;
-}
-
-void SpectrogramMatcher::conv(const float* src, size_t num, float* dst){
-//    cout << (size_t)dst % 64 << endl;
-
-    const size_t numConvedFrequencies = num - m_convKernel.size() + 1;
-    if (num < m_convKernel.size()){
-        memset(dst, 0, numConvedFrequencies * sizeof(float));
-        return;
-    }
-
-#if 0
-    for (size_t i = 0; i < num-m_convKernel.size()+1; i++){
-        dst[i] = 0.0f;
-        for (size_t j = 0; j < m_convKernel.size(); j++){
-            dst[i] += src[i+j] * m_convKernel[j];
-        }
-    }
-#else
-    Kernels::SpikeConvolution::compute_spike_kernel(
-        dst, src, num, m_convKernel.data(), m_convKernel.size()
-    );
-#endif
-}
-
-std::vector<float> SpectrogramMatcher::buildTemplateNorm() const {
-    std::vector<float> ret(m_templateRange.size());
-
-    for (size_t sub_index = 0; sub_index < m_templateRange.size(); sub_index++){
-        float sumSqr = 0.0f;
-        for (size_t i = m_templateRange[sub_index].first; i < m_templateRange[sub_index].second; i++){
-            for(size_t j = m_freqStart; j < m_freqEnd; j++){
-                const float v = m_template.getWindow(i)[j];
-                sumSqr += v * v;
-            }
-        }
-        ret[sub_index] = std::sqrt(sumSqr);
-    }
-
-    return ret;
-}
-
-bool SpectrogramMatcher::update_to_new_spectrum(AudioSpectrum spectrum){
-    if (m_numOriginalFrequencies != spectrum.magnitudes->size()){
-        std::cout << "Error: number of frequencies don't match in SpectrogramMatcher::match() " << 
-            m_numOriginalFrequencies << " " << spectrum.magnitudes->size() << std::endl;
-        return false;
-    }
-
-    switch(m_mode){
-    case Mode::SPIKE_CONV:
-    {
-        // Do the conv on new spectrum too.
-        AlignedVector<float> convedSpectrum(m_template.bufferSize());
-        conv(spectrum.magnitudes->data() + m_originalFreqStart,
-            m_originalFreqEnd - m_originalFreqStart, convedSpectrum.data());
-        
-        spectrum.magnitudes = std::make_unique<AlignedVector<float>>(std::move(convedSpectrum));
-        break;
-    }
-    case Mode::AVERAGE_5:
-    {
-        AlignedVector<float> avgedSpectrum(m_template.bufferSize());
-        for(size_t j = 0; j < m_template.numFrequencies(); j++){
-            const float * rawFreqMag = spectrum.magnitudes->data() + m_originalFreqStart + j*5;
-            const float newMag = (rawFreqMag[0] + rawFreqMag[1] + rawFreqMag[2] + rawFreqMag[3] + rawFreqMag[4]) / 5.0f;
-            avgedSpectrum[j] = newMag;
-        }
-        spectrum.magnitudes = std::make_unique<AlignedVector<float>>(std::move(avgedSpectrum));
-        break;
-    }
-    case Mode::RAW:
-        break;
-    }
-
-    // Compute the norm square (= sum squares) of the spectrum, used for matching:
-    // TODO: if there will be multiple SpectrogramMatcher running on the same audio stream, can
-    // move this per-spectrum computation to a shared struct for those matchers to save computation.
-    float spectrumNormSqr = 0.0f;
-    for (size_t i = m_freqStart; i < m_freqEnd; i++){
-        float mag = (*spectrum.magnitudes)[i];
-        spectrumNormSqr += mag * mag;
-    }
-    m_spectrumNormSqrs.push_front(spectrumNormSqr);
-
-    m_spectrums.emplace_front(std::move(spectrum));
-
-    return true;
-}
-
-bool SpectrogramMatcher::update_to_new_spectrums(const std::vector<AudioSpectrum>& new_spectrums){
-    for (auto it = new_spectrums.rbegin(); it != new_spectrums.rend(); it++){
-        if(!update_to_new_spectrum(*it)){
-            return false;
-        }
-    }
-
-    // pop out too old spectrums
-    while (m_spectrums.size() > m_numSpectrumsNeeded){
-        m_spectrums.pop_back();
-        m_spectrumNormSqrs.pop_back();
-    }
-
-    return true;
-}
-
-std::pair<float, float> SpectrogramMatcher::match_sub_template(size_t sub_index) const {
-#if 0
-    auto iter = m_spectrums.begin();
-    auto iter2 = m_spectrumNormSqrs.begin();
-    float streamSumSqr = 0.0f;
-    float sumMulti = 0.0f;
-
-    const size_t template_start = m_templateRange[sub_index].first;
-    const size_t template_end = m_templateRange[sub_index].second;
-    for(size_t i = template_start; i < template_end; i++, iter++, iter2++){
-        // match in order from latest window to oldest
-        const float* templateData = m_template.getWindow(template_end-1-i);
-        const float* streamData = iter->magnitudes->data();
-        streamSumSqr += *iter2;
-        for(size_t j = m_freqStart; j < m_freqEnd; j++){
-            sumMulti += templateData[j] * streamData[j];
-        }
-    }
-//    cout << "sumMulti = " << sumMulti << ", streamSumSqr = " << streamSumSqr << endl;
-    const float scale = (streamSumSqr < 1e-6f ? 1.0f : sumMulti / streamSumSqr);
-
-    iter = m_spectrums.begin();
-    float sum = 0.0f;
-    for(size_t i = template_start; i < template_end; i++, iter++){
-        // match in order from latest window to oldest
-        const float* templateData = m_template.getWindow(template_end-1-i);
-        const float* streamData = iter->magnitudes->data();
-        for(size_t j = m_freqStart; j < m_freqEnd; j++){
-            float d = templateData[j] - scale * streamData[j];
-            sum += d * d;
-        }
-    }
-#else
-    //  Build matrix.
-    auto iter = m_spectrums.begin();
-    const size_t template_start = m_templateRange[sub_index].first;
-    const size_t template_end = m_templateRange[sub_index].second;
-    size_t windows = template_end - template_start;
-//    cout << windows << endl;
-//    cout << m_spectrums.size() << " / " << windows << endl;
-    size_t freqs = m_freqEnd - m_freqStart;
-    std::vector<const float*> matrixA(windows);
-    std::vector<const float*> matrixT(windows);
-    for (size_t i = 0; i < windows; i++, iter++){
-//        cout << "Template: " << ((size_t)m_template.getWindow(template_end - 1 - i) % 64) << endl;
-//        cout << "Samples:  " << ((size_t)iter->magnitudes->data() % 64) << endl;
-        matrixT[i] = m_freqStart + m_template.getWindow(windows - 1 - i);
-        matrixA[i] = m_freqStart + iter->magnitudes->data();
-//        cout << matrixT[i] << " : " << matrixA[i] << endl;
-    }
-
-    //  Compute scale.
-    float scale = Kernels::ScaleInvariantMatrixMatch::compute_scale(
-        freqs, windows,
-        matrixA.data(), matrixT.data()
-    );
-    scale = std::min<float>(scale, 1000000);
-
-    //  Compute error.
-    float sum = Kernels::ScaleInvariantMatrixMatch::compute_error(
-        freqs, windows,
-        scale,
-        matrixA.data(), matrixT.data()
-    );
-#endif
-
-
-    float score = sqrt(sum) / m_templateNorm[0];
-//    cout << "score = " << score << endl;
-    score = std::min<float>(score, 1.0);
-
-    return std::make_pair(score, scale);
-}
-
-float SpectrogramMatcher::match(const std::vector<AudioSpectrum>& new_spectrums){
-    if (!update_to_new_spectrums(new_spectrums)){
-        return FLT_MAX;
-    }
-
-    if (m_spectrums.size() < m_numSpectrumsNeeded){
-        return FLT_MAX;
-    }
-
-    // Check whether the stored spectrums' timestamps are continuous:
-    size_t curStamp = m_spectrums.front().stamp;
-    size_t lastStamp = curStamp + 1;
-    for (const auto& s : m_spectrums){
-        if (s.stamp != lastStamp - 1){
-            std::cout << "Error: SpectrogramMatcher (" + m_name + ") spectrum timestamps are not continuous:" << std::endl;
-
-            for(const auto& sp : m_spectrums){
-                std::cout << sp.stamp << ", ";
-            }
-            std::cout << std::endl;
-            return FLT_MAX;
-        }
-        lastStamp--;
-    }
-
-    if (m_lastStampTested != SIZE_MAX && curStamp <= m_lastStampTested){
-        return FLT_MAX;
-    }
-    m_lastStampTested = curStamp;
-    
-    // Do the match:
-    float score = FLT_MAX; // the lower the score, the better the match
-    if (m_templateRange.size() == 1){
-        // Match the full template
-        std::tie(score, m_lastScale) = match_sub_template(0);
-    }else{
-        // Match each indivdual sub-template
-        for (size_t sub_template = 0; sub_template < m_templateRange.size(); sub_template++){
-            float sub_template_score = FLT_MAX;
-            float sub_template_scale = 1.0f;
-            std::tie(sub_template_score, sub_template_scale) = match_sub_template(sub_template);
-            if (sub_template_score < score){
-                score = sub_template_score;
-                m_lastScale = sub_template_scale;
-            }
-        }
-    }
-
-    return score;
-}
-
-bool SpectrogramMatcher::skip(const std::vector<AudioSpectrum>& new_spectrums){
-    // Note: ideally we don't want to have any computation while skipping.
-    // But update_to_new_spectrums() may still do some filtering and vector norm computation.
-    // Since the computation is relatively small and we won't be skipping lots of frames anyway,
-    // this should be fine for now.
-    // We can improve this later.
-    return update_to_new_spectrums(new_spectrums);
-}
-
-void SpectrogramMatcher::clear(){
-    m_spectrums.clear();
-    m_spectrumNormSqrs.clear();
-    m_lastStampTested = SIZE_MAX;
-}
-
-
-
-
-}
diff --git a/SerialPrograms/Source/CommonFramework/Inference/SpectrogramMatcher.h b/SerialPrograms/Source/CommonFramework/Inference/SpectrogramMatcher.h
deleted file mode 100644
index 59cb3397d5..0000000000
--- a/SerialPrograms/Source/CommonFramework/Inference/SpectrogramMatcher.h
+++ /dev/null
@@ -1,134 +0,0 @@
-/*  Spectrogram Matcher
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_CommonFramework_SpectrogramMatcher_H
-#define PokemonAutomation_CommonFramework_SpectrogramMatcher_H
-
-#include <cstddef>
-#include <array>
-#include <memory>
-#include <vector>
-#include <list>
-#include "CommonFramework/AudioPipeline/AudioFeed.h"
-#include "CommonFramework/AudioPipeline/AudioTemplate.h"
-
-namespace PokemonAutomation{
-
-class AudioSpectrum;
-
-// Load an audio template from disk and use its spectrogram to match the
-// spectrogram of the incoming audio stream.
-class SpectrogramMatcher{
-public:
-    enum class Mode{
-        // Don't do any processing on each window of spectrum, matching raw spectrums.
-        RAW,
-        // Do convolution on each window of spectrum with a peak detection kernel, before matching spectrums.
-        SPIKE_CONV,
-        // Do convolution on each window of spectrum with a Gaussian smooth kernel, before matching spectrums.
-        // GAUSSIAN_CONV,
-        // Average every 5 frequencies to reduce computation.
-        AVERAGE_5,
-    };
-
-    // audioTemplate: the audio template for the audio stream to match against.
-    //  Use AudioTemplate::loadAudioTemplate() to load a template from disk, or
-    //  use AudioTemplateCache::instance().get_throw(audioResourceRelativePath, sample_rate) to get one from cache.
-    // mode: which type of spectrogram filtering to use before the actual match.
-    // sample_rate: audio sample rate.
-    // low_frequency_filter: only match the frequencies above this threshold.
-    // templateSubdivision: divide the template into how many sub-templates to match. <= 1 means no subdivision.
-    SpectrogramMatcher(
-        std::string name,
-        AudioTemplate audioTemplate, Mode mode, size_t sample_rate,
-        double low_frequency_filter, size_t templateSubdivision = 0
-    );
-
-    size_t sample_rate() const{ return m_sample_rate; }
-
-    // Match the newest spectrums and return a match score.
-    // Newer (larger timestamp) spectrums at beginning of `new_spectrums` while older (smaller
-    // timestamp) spectrums at the end.
-    // In invalid cases (internal error or not enough windows), return FLT_MAX
-    float match(const std::vector<AudioSpectrum>& new_spectrums);
-
-    // Pass some spectrums in but don't run match on them.
-    // Used for skipping some spectrums to avoid unnecessary matching.
-    // Newer (larger timestamp) spectrums at beginning of `new_spectrums` while older (smaller
-    // timestamp) spectrums at the end.
-    // Return true if there is no error.
-    bool skip(const std::vector<AudioSpectrum>& new_spectrums);
-
-    // Clear internal data to be used on another audio stream.
-    void clear();
-
-    // How many windows are used for matching.
-    size_t numMatchedWindows() const { return m_numSpectrumsNeeded; }
-
-    // Return latest timestamp from the stored audio spectrum stream.
-    // Return SIZE_MAX if there is no stored spectrum yet.
-    uint64_t latestTimestamp() const;
-
-    // Return the scale found by the matcher to scale the input audio stream to best
-    // match the template in the last `match()`.
-    // Return 0.0f if the last scale is not available.
-    float lastMatchedScale() const { return m_lastScale; }
-
-private:
-    void conv(const float* src, size_t num, float* dst);
-    
-    // The function to build `m_templateNorm`
-    std::vector<float> buildTemplateNorm() const;
-
-    // For a given sub-template, return its match score and scaling factor
-    std::pair<float, float> match_sub_template(size_t sub_index) const;
-
-    // Update internal data for the next new spectrum. Called by `update_to_new_spectrums()`.
-    // Return true if there is no error.
-    bool update_to_new_spectrum(AudioSpectrum newSpectrum);
-
-    // Update internal data for the new specttrums.
-    // Return true if there is no error.
-    bool update_to_new_spectrums(const std::vector<AudioSpectrum>& new_spectrums);
-
-
-
-private:
-    std::string m_name;
-    AudioTemplate m_template;
-
-    size_t m_sample_rate;
-
-    size_t m_numOriginalFrequencies = 0;
-    size_t m_originalFreqStart = 0;
-    size_t m_originalFreqEnd = 0;
-
-    size_t m_freqStart = 0;
-    size_t m_freqEnd = 0;
-    // Temporal ranges of the template to match with. Used when matching a subdivided template.
-    // If there is no subdivision, it will store only one pair: <0, m_template.numWindows()>
-    std::vector<std::pair<size_t, size_t>> m_templateRange;
-    // For each subdivided template, store its sepctrogram matrix norm
-    std::vector<float> m_templateNorm;
-
-    Mode m_mode = Mode::RAW;
-
-    std::vector<float> m_convKernel;
-
-    // Spectrums from audio feed. They will be matched against the template.
-    std::list<AudioSpectrum> m_spectrums;
-    // Norm squares of each spectrum in `m_spectrums`.
-    std::list<float> m_spectrumNormSqrs;
-    // How many spectrums needed to store.
-    size_t m_numSpectrumsNeeded = 0;
-
-    size_t m_lastStampTested = SIZE_MAX;
-    float m_lastScale = 0.0f;
-};
-
-
-}
-#endif
diff --git a/SerialPrograms/Source/CommonFramework/Inference/VisualDetector.h b/SerialPrograms/Source/CommonFramework/Inference/VisualDetector.h
deleted file mode 100644
index e9f3ed8947..0000000000
--- a/SerialPrograms/Source/CommonFramework/Inference/VisualDetector.h
+++ /dev/null
@@ -1,127 +0,0 @@
-/*  Visual Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_CommonFramework_VisualDetector_H
-#define PokemonAutomation_CommonFramework_VisualDetector_H
-
-#include "CommonFramework/InferenceInfra/VisualInferenceCallback.h"
-
-namespace PokemonAutomation{
-
-class ImageViewRGB32;
-class VideoOverlaySet;
-
-
-class StaticScreenDetector{
-public:
-    virtual void make_overlays(VideoOverlaySet& items) const = 0;
-    virtual bool detect(const ImageViewRGB32& screen) const = 0;
-};
-
-
-
-//  Wrap a detector into a finder.
-//  This one requires the detector to return the same result consecutively for X time
-//  before returning true from process_frame().
-template <typename Detector>
-class DetectorToFinder : public Detector, public VisualInferenceCallback{
-public:
-    //  Whether a finder is to find an object is detected by the detector or find
-    //  that it's no longer detected.
-    enum class FinderType {
-        PRESENT,    //  process_frame() returns true only when detected consecutively
-        GONE,       //  process_frame() returns true only when not detected consecutively
-        CONSISTENT, //  process_frame() returns true when detected consecutively or not detected consecutively
-    };
-
-    template <class... Args>
-    DetectorToFinder(
-        std::string label,
-        std::chrono::milliseconds duration,
-        Args&&... args
-    )
-        : Detector(std::forward<Args>(args)...)
-        , VisualInferenceCallback(std::move(label))
-        , m_duration(duration)
-        , m_finder_type(FinderType::PRESENT)
-    {}
-
-    
-    template <class... Args>
-    DetectorToFinder(
-        std::string label,
-        FinderType finder_type,
-        std::chrono::milliseconds duration,
-        Args&&... args
-    )
-        : Detector(std::forward<Args>(args)...)
-        , VisualInferenceCallback(std::move(label))
-        , m_duration(duration)
-        , m_finder_type(finder_type)
-    {}
-
-    virtual void make_overlays(VideoOverlaySet& items) const override{
-        Detector::make_overlays(items);
-    }
-
-    //  If m_finder_type is PRESENT, return true only when it is consecutively detected.
-    //  If m_finder_type is GONE, return true only when it is consecutively not detected.
-    //  if m_finder_type is CONSISTENT, return true when it is consecutively detected, or consecutively not detected.
-    using VisualInferenceCallback::process_frame;
-    virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override{
-        switch (m_finder_type){
-        case FinderType::PRESENT:
-        case FinderType::GONE:
-            if (this->detect(frame) == (m_finder_type == FinderType::GONE)){
-                m_start_of_detection = WallClock::min();
-                return false;
-            }
-            if (m_start_of_detection == WallClock::min()){
-                m_start_of_detection = timestamp;
-            }
-            return timestamp - m_start_of_detection >= m_duration;
-        case FinderType::CONSISTENT:{
-            const bool result = this->detect(frame);
-            const bool result_changed = (result && m_last_detected < 0) || (!result && m_last_detected > 0);
-
-            m_last_detected = (result ? 1 : -1);
-
-            if (result_changed){
-                m_start_of_detection = WallClock::min();
-                return false;
-            }
-            if (m_start_of_detection == WallClock::min()){
-                m_start_of_detection = timestamp;
-            }
-
-            const bool enough_time = timestamp - m_start_of_detection >= m_duration;
-            if (enough_time){
-                m_consistent_result = m_last_detected > 0;
-            }
-            return enough_time;
-        }
-        default:;
-        }
-        return false;
-    }
-
-    //  If m_finder_type is CONSISTENT and process_frame() returns true,
-    //  whether it is consecutively detected , or consecutively not detected.
-    bool consistent_result() const { return m_consistent_result; }
-
-private:
-    std::chrono::milliseconds m_duration;
-    FinderType m_finder_type;
-    WallClock m_start_of_detection = WallClock::min();
-    int8_t m_last_detected = 0; // 0: no prior detection, 1: last detected positive, -1: last detected negative
-    bool m_consistent_result = false;
-};
-
-
-
-
-}
-#endif
diff --git a/SerialPrograms/Source/CommonFramework/InferenceInfra/AudioInferencePivot.h b/SerialPrograms/Source/CommonFramework/InferenceInfra/AudioInferencePivot.h
deleted file mode 100644
index 0fc522ce6b..0000000000
--- a/SerialPrograms/Source/CommonFramework/InferenceInfra/AudioInferencePivot.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*  Audio Inference Pivot
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_CommonFramework_AudioInferencePivot_H
-#define PokemonAutomation_CommonFramework_AudioInferencePivot_H
-
-#include "Common/Cpp/Concurrency/SpinLock.h"
-#include "Common/Cpp/Concurrency/PeriodicScheduler.h"
-#include "CommonFramework/VideoPipeline/VideoOverlayTypes.h"
-#include "CommonFramework/Inference/StatAccumulator.h"
-#include "AudioInferenceCallback.h"
-
-namespace PokemonAutomation{
-
-class AudioFeed;
-
-
-
-class AudioInferencePivot final : public PeriodicRunner, public OverlayStat{
-public:
-    AudioInferencePivot(CancellableScope& scope, AudioFeed& feed, AsyncDispatcher& dispatcher);
-    virtual ~AudioInferencePivot();
-
-    //  If this callback returns true:
-    //      1.  Cancel "scope".
-    //      2.  Set "set_when_triggered" to the callback.
-    //  If the callback throws an exception, "scope" will be cancelled with that exception.
-    void add_callback(
-        Cancellable& scope,
-        std::atomic<InferenceCallback*>* set_when_triggered,
-        AudioInferenceCallback& callback,
-        std::chrono::milliseconds period
-    );
-
-    //  Returns the latency stats for the callback. Units are microseconds.
-    StatAccumulatorI32 remove_callback(AudioInferenceCallback& callback);
-
-private:
-    virtual void run(void* event, bool is_back_to_back) noexcept override;
-    virtual OverlayStatSnapshot get_current() override;
-
-private:
-    struct PeriodicCallback;
-
-    AudioFeed& m_feed;
-    SpinLock m_lock;
-    std::map<AudioInferenceCallback*, PeriodicCallback> m_map;
-
-//    uint64_t m_last_seqnum = ~(uint64_t)0;
-
-    OverlayStatUtilizationPrinter m_printer;
-};
-
-
-
-}
-#endif
diff --git a/SerialPrograms/Source/CommonFramework/InferenceInfra/InferenceCallback.h b/SerialPrograms/Source/CommonFramework/InferenceInfra/InferenceCallback.h
deleted file mode 100644
index a5119b23f0..0000000000
--- a/SerialPrograms/Source/CommonFramework/InferenceInfra/InferenceCallback.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/*  Inference Callback
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_CommonFramework_InferenceCallback_H
-#define PokemonAutomation_CommonFramework_InferenceCallback_H
-
-#include <string>
-#include <chrono>
-
-namespace PokemonAutomation{
-
-enum class InferenceType{
-    VISUAL,
-    AUDIO,
-};
-
-// Base class for an inference object to be called perioridically by
-// inference routines in InferenceRoutines.h.
-class InferenceCallback{
-    //  Disable these to prevent accidental copying/slicing.
-    InferenceCallback(const InferenceCallback&) = delete;
-    void operator=(const InferenceCallback&) = delete;
-
-public:
-    virtual ~InferenceCallback() = default;
-
-    // Is it a visual or audio inference.
-    InferenceType type() const{ return m_type; }
-    // Name of the inference object.
-    const std::string& label() const{ return m_label; }
-
-
-protected:
-    InferenceCallback(InferenceType type, std::string label)
-        : m_type(type)
-        , m_label(label)
-    {}
-
-
-private:
-    InferenceType m_type;
-    std::string m_label;
-};
-
-
-
-// Used by inference routines in InferenceRoutines.h.
-// The struct contains an inference callback and its inference period: how
-// long should an inference routine wait before calling the callback object
-// again.
-struct PeriodicInferenceCallback{
-    InferenceCallback* callback;
-    // inference period. 0 value means the inference routine should use the 
-    // default inference period, which is set as a parameter to the inference
-    // routine.
-    std::chrono::milliseconds period;
-
-    PeriodicInferenceCallback()
-        : callback(nullptr)
-        , period(std::chrono::milliseconds(0))
-    {}
-    PeriodicInferenceCallback(
-        InferenceCallback& p_callback,
-        std::chrono::milliseconds p_period = std::chrono::milliseconds(0)
-    )
-        : callback(&p_callback)
-        , period(p_period)
-    {
-#if 0
-        if (period > std::chrono::milliseconds(0)){
-            return;
-        }
-        switch (callback->type()){
-        case InferenceType::VISUAL:
-            period = std::chrono::milliseconds(50);
-            break;
-        case InferenceType::AUDIO:
-            period = std::chrono::milliseconds(20);
-            break;
-        }
-#endif
-    }
-};
-
-
-
-}
-#endif
diff --git a/SerialPrograms/Source/CommonFramework/InferenceInfra/InferenceRoutines.cpp b/SerialPrograms/Source/CommonFramework/InferenceInfra/InferenceRoutines.cpp
deleted file mode 100644
index cf8842a789..0000000000
--- a/SerialPrograms/Source/CommonFramework/InferenceInfra/InferenceRoutines.cpp
+++ /dev/null
@@ -1,123 +0,0 @@
-/*  Visual Inference Routines
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Cpp/Exceptions.h"
-#include "Common/Cpp/Concurrency/AsyncDispatcher.h"
-#include "ClientSource/Connection/BotBase.h"
-#include "CommonFramework/Tools/ProgramEnvironment.h"
-#include "InferenceSession.h"
-#include "InferenceRoutines.h"
-
-//#include <iostream>
-//using std::cout;
-//using std::endl;
-
-namespace PokemonAutomation{
-
-
-
-int wait_until(
-    ConsoleHandle& console, CancellableScope& scope,
-    WallClock deadline,
-    const std::vector<PeriodicInferenceCallback>& callbacks,
-    std::chrono::milliseconds default_video_period,
-    std::chrono::milliseconds default_audio_period
-){
-    CancellableHolder<CancellableScope> subscope(scope);
-    InferenceSession session(
-        subscope, console,
-        callbacks,
-        default_video_period, default_audio_period
-    );
-
-    try{
-        subscope.wait_until(deadline);
-    }catch (OperationCancelledException&){}
-
-    subscope.throw_if_cancelled_with_exception();
-    scope.throw_if_cancelled();
-
-    return session.triggered_index();
-}
-
-
-
-
-int run_until(
-    ConsoleHandle& console, BotBaseContext& context,
-    std::function<void(BotBaseContext& context)>&& command,
-    const std::vector<PeriodicInferenceCallback>& callbacks,
-    std::chrono::milliseconds default_video_period,
-    std::chrono::milliseconds default_audio_period
-){
-    BotBaseContext subcontext(context, console.botbase());
-    InferenceSession session(
-        subcontext, console,
-        callbacks,
-        default_video_period, default_audio_period
-    );
-
-    try{
-        if (command){
-            command(subcontext);
-        }
-        subcontext.wait_for_all_requests();
-    }catch (OperationCancelledException&){}
-
-    subcontext.throw_if_cancelled_with_exception();
-    context.throw_if_cancelled();
-
-    return session.triggered_index();
-}
-
-
-
-int run_until_with_time_limit(
-    ProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context,
-    WallClock deadline,
-    std::function<void(BotBaseContext& context)>&& command,
-    const std::vector<PeriodicInferenceCallback>& callbacks,
-    std::chrono::milliseconds default_video_period,
-    std::chrono::milliseconds default_audio_period
-){
-    BotBaseContext subcontext(context, console.botbase());
-    InferenceSession session(
-        subcontext, console,
-        callbacks,
-        default_video_period, default_audio_period
-    );
-
-    bool timed_out = false;
-    std::unique_ptr<AsyncTask> timer = env.realtime_dispatcher().dispatch([&]{
-        subcontext.wait_until(deadline);
-        timed_out = true;
-        subcontext.cancel_now();
-    });
-
-    try{
-        if (command){
-            command(subcontext);
-        }
-        subcontext.wait_for_all_requests();
-    }catch (OperationCancelledException&){}
-
-    timer->wait_and_rethrow_exceptions();
-    subcontext.throw_if_cancelled_with_exception();
-    context.throw_if_cancelled();
-
-    return timed_out ? -2 : session.triggered_index();
-}
-
-
-
-
-
-
-
-}
-
-
-
diff --git a/SerialPrograms/Source/CommonFramework/InferenceInfra/InferenceRoutines.h b/SerialPrograms/Source/CommonFramework/InferenceInfra/InferenceRoutines.h
deleted file mode 100644
index 3b7c8dd3b9..0000000000
--- a/SerialPrograms/Source/CommonFramework/InferenceInfra/InferenceRoutines.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/*  Inference Routines
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_CommonFramework_InferenceRoutines_H
-#define PokemonAutomation_CommonFramework_InferenceRoutines_H
-
-#include <functional>
-#include <chrono>
-#include <vector>
-#include "Common/Cpp/Time.h"
-#include "CommonFramework/Tools/ConsoleHandle.h"
-#include "InferenceCallback.h"
-
-namespace PokemonAutomation{
-
-class BotBaseContext;
-class ProgramEnvironment;
-
-
-//  Wait until one of the "callbacks" are triggered or it times out.
-//
-//  Returns:
-//      -   The index of the trigger if that's what stopped it.
-//      -   -1 if nothing triggered before timeout.
-//
-//  Exceptions thrown in either the commands or the callbacks will stop
-//  everything and will be propagated out of this function.
-int wait_until(
-    ConsoleHandle& console, CancellableScope& scope,
-    WallClock deadline,
-    const std::vector<PeriodicInferenceCallback>& callbacks,
-    std::chrono::milliseconds default_video_period = std::chrono::milliseconds(50),
-    std::chrono::milliseconds default_audio_period = std::chrono::milliseconds(20)
-);
-inline int wait_until(
-    ConsoleHandle& console, CancellableScope& scope,
-    std::chrono::milliseconds timeout,
-    const std::vector<PeriodicInferenceCallback>& callbacks,
-    std::chrono::milliseconds default_video_period = std::chrono::milliseconds(50),
-    std::chrono::milliseconds default_audio_period = std::chrono::milliseconds(20)
-){
-    return wait_until(
-        console, scope,
-        current_time() + timeout,
-        callbacks,
-        default_video_period, default_audio_period
-    );
-}
-
-
-//  Run the specified "command" until either it finishes or one of the
-//  "callbacks" are triggered.
-//
-//  Returns:
-//      -   The index of the trigger if that's what stopped it.
-//      -   -1 if nothing triggered before command finished.
-//
-//  Exceptions thrown in either the commands or the callbacks will stop
-//  everything and will be propagated out of this function.
-int run_until(
-    ConsoleHandle& console, BotBaseContext& context,
-    std::function<void(BotBaseContext& context)>&& command,
-    const std::vector<PeriodicInferenceCallback>& callbacks,
-    std::chrono::milliseconds default_video_period = std::chrono::milliseconds(50),
-    std::chrono::milliseconds default_audio_period = std::chrono::milliseconds(20)
-);
-
-
-//  Same as "run_until()", but will cancel the commands and return if a timeout
-//  is reached.
-//
-//  Returns:
-//      -   The index of the trigger if that's what stopped it.
-//      -   -1 if nothing triggered before command finished.
-//      -   -2 if timed out. Nothing triggered, and command did not finish.
-//
-int run_until_with_time_limit(
-    ProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context,
-    WallClock deadline,
-    std::function<void(BotBaseContext& context)>&& command,
-    const std::vector<PeriodicInferenceCallback>& callbacks,
-    std::chrono::milliseconds default_video_period,
-    std::chrono::milliseconds default_audio_period
-);
-
-
-
-
-
-
-}
-#endif
diff --git a/SerialPrograms/Source/CommonFramework/InferenceInfra/InferenceSession.cpp b/SerialPrograms/Source/CommonFramework/InferenceInfra/InferenceSession.cpp
deleted file mode 100644
index 5012eaf357..0000000000
--- a/SerialPrograms/Source/CommonFramework/InferenceInfra/InferenceSession.cpp
+++ /dev/null
@@ -1,154 +0,0 @@
-/*  Inference Session
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Cpp/Exceptions.h"
-#include "CommonFramework/Tools/ConsoleHandle.h"
-#include "InferenceCallback.h"
-#include "VisualInferenceCallback.h"
-#include "AudioInferenceCallback.h"
-#include "VisualInferencePivot.h"
-#include "AudioInferencePivot.h"
-#include "InferenceSession.h"
-
-namespace PokemonAutomation{
-
-
-
-
-#if 0
-InferenceSession::InferenceSession(
-    Cancellable& scope, ConsoleHandle& console,
-    const std::vector<InferenceCallback*>& callbacks,
-    std::chrono::milliseconds default_video_period,
-    std::chrono::milliseconds default_audio_period
-)
-    : m_console(console)
-    , m_overlays(console.overlay())
-    , m_triggered(nullptr)
-{
-    try{
-        for (size_t c = 0; c < callbacks.size(); c++){
-            InferenceCallback* callback = callbacks[c];
-            if (callback == nullptr){
-                continue;
-            }
-            if (!m_map.emplace(callback, c).second){
-                throw InternalProgramError(&console.logger(), PA_CURRENT_FUNCTION, "Attempted to add the same callback twice.");
-            }
-            switch (callback->type()){
-            case InferenceType::VISUAL:{
-                VisualInferenceCallback& visual_callback = static_cast<VisualInferenceCallback&>(*callback);
-                console.video_inference_pivot().add_callback(
-                    scope, &m_triggered,
-                    visual_callback,
-                    default_video_period
-                );
-                visual_callback.make_overlays(m_overlays);
-                break;
-            }
-            case InferenceType::AUDIO:
-                console.audio_inference_pivot().add_callback(
-                    scope, &m_triggered,
-                    static_cast<AudioInferenceCallback&>(*callback),
-                    default_audio_period
-                );
-                break;
-            }
-        }
-    }catch (...){
-        clear();
-        throw;
-    }
-}
-#endif
-InferenceSession::InferenceSession(
-    Cancellable& scope, ConsoleHandle& console,
-    const std::vector<PeriodicInferenceCallback>& callbacks,
-    std::chrono::milliseconds default_video_period,
-    std::chrono::milliseconds default_audio_period
-)
-    : m_console(console)
-    , m_overlays(console.overlay())
-    , m_triggered(nullptr)
-{
-    try{
-        for (size_t c = 0; c < callbacks.size(); c++){
-            const PeriodicInferenceCallback& callback = callbacks[c];
-            if (callback.callback == nullptr){
-                continue;
-            }
-            if (!m_map.emplace(callback.callback, c).second){
-                throw InternalProgramError(&console.logger(), PA_CURRENT_FUNCTION, "Attempted to add the same callback twice.");
-            }
-            switch (callback.callback->type()){
-            case InferenceType::VISUAL:{
-                VisualInferenceCallback& visual_callback = static_cast<VisualInferenceCallback&>(*callback.callback);
-                console.video_inference_pivot().add_callback(
-                    scope, &m_triggered,
-                    visual_callback,
-                    callback.period > std::chrono::milliseconds(0) ? callback.period : default_video_period
-                );
-                visual_callback.make_overlays(m_overlays);
-                break;
-            }
-            case InferenceType::AUDIO:
-                console.audio_inference_pivot().add_callback(
-                    scope, &m_triggered,
-                    static_cast<AudioInferenceCallback&>(*callback.callback),
-                    callback.period > std::chrono::milliseconds(0) ? callback.period : default_audio_period
-                );
-                break;
-            }
-        }
-    }catch (...){
-        clear();
-        throw;
-    }
-}
-InferenceSession::~InferenceSession(){
-    clear();
-}
-
-
-InferenceCallback* InferenceSession::triggered_ptr() const{
-    return m_triggered.load(std::memory_order_acquire);
-}
-int InferenceSession::triggered_index() const{
-    auto iter = m_map.find(m_triggered.load(std::memory_order_acquire));
-    if (iter != m_map.end()){
-        return (int)iter->second;
-    }
-    return -1;
-}
-
-
-void InferenceSession::clear() noexcept{
-    const double DIVIDER = (double)(std::chrono::milliseconds(1) / std::chrono::microseconds(1));
-    const char* UNITS = " ms";
-    for (auto& item : m_map){
-        switch (item.first->type()){
-        case InferenceType::VISUAL:{
-            StatAccumulatorI32 stats = m_console.video_inference_pivot().remove_callback(static_cast<VisualInferenceCallback&>(*item.first));
-            try{
-                stats.log(m_console, item.first->label(), UNITS, DIVIDER);
-            }catch (...){}
-            break;
-        }
-        case InferenceType::AUDIO:{
-            StatAccumulatorI32 stats = m_console.audio_inference_pivot().remove_callback(static_cast<AudioInferenceCallback&>(*item.first));
-            try{
-                stats.log(m_console, item.first->label(), UNITS, DIVIDER);
-            }catch (...){}
-            break;
-        }
-        }
-    }
-}
-
-
-
-
-}
diff --git a/SerialPrograms/Source/CommonFramework/InferenceInfra/InferenceSession.h b/SerialPrograms/Source/CommonFramework/InferenceInfra/InferenceSession.h
deleted file mode 100644
index 89ce497ebf..0000000000
--- a/SerialPrograms/Source/CommonFramework/InferenceInfra/InferenceSession.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*  Inference Session
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_CommonFramework_InferenceSession_H
-#define PokemonAutomation_CommonFramework_InferenceSession_H
-
-#include <chrono>
-#include <vector>
-#include <map>
-#include <atomic>
-#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
-#include "InferenceCallback.h"
-
-namespace PokemonAutomation{
-
-class Cancellable;
-class ConsoleHandle;
-
-
-
-//
-//  On construction, all the callbacks are attached to inference threads and
-//  begin running at their specified period.
-//
-//  Upon destruction, all callbacks are removed from the inference threads and
-//  stop running.
-//
-//  When a callback returns true or throws an exception, "scope.cancel()" will
-//  be called.
-//
-//  "triggered_ptr()/triggered_index()" gives the first callback that
-//  returned true. If nothing has returned true, it is null or -1 respectively.
-//
-//  Note that the callbacks will continue running even if one of them has
-//  returned true. So it is expected that the object will be destructed soon
-//  after "scope.cancel()" is called.
-//
-class InferenceSession{
-public:
-#if 0
-    InferenceSession(
-        Cancellable& scope, ConsoleHandle& console,
-        const std::vector<InferenceCallback*>& callbacks,
-        std::chrono::milliseconds default_video_period = std::chrono::milliseconds(50),
-        std::chrono::milliseconds default_audio_period = std::chrono::milliseconds(20)
-    );
-#endif
-    InferenceSession(
-        Cancellable& scope, ConsoleHandle& console,
-        const std::vector<PeriodicInferenceCallback>& callbacks,
-        std::chrono::milliseconds default_video_period = std::chrono::milliseconds(50),
-        std::chrono::milliseconds default_audio_period = std::chrono::milliseconds(20)
-    );
-    ~InferenceSession();
-
-    InferenceCallback* triggered_ptr() const;
-    int triggered_index() const;
-
-
-private:
-    void clear() noexcept;
-
-
-private:
-    ConsoleHandle& m_console;
-    VideoOverlaySet m_overlays;
-    std::map<InferenceCallback*, size_t> m_map;
-    std::atomic<InferenceCallback*> m_triggered;
-};
-
-
-
-
-
-}
-#endif
diff --git a/SerialPrograms/Source/CommonFramework/InferenceInfra/VisualInferenceCallback.h b/SerialPrograms/Source/CommonFramework/InferenceInfra/VisualInferenceCallback.h
deleted file mode 100644
index b0fbabfa22..0000000000
--- a/SerialPrograms/Source/CommonFramework/InferenceInfra/VisualInferenceCallback.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*  Visual Inference Callback
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_CommonFramework_VisualInferenceCallback_H
-#define PokemonAutomation_CommonFramework_VisualInferenceCallback_H
-
-#include <memory>
-#include <string>
-#include "Common/Compiler.h"
-#include "Common/Cpp/Time.h"
-#include "InferenceCallback.h"
-
-namespace PokemonAutomation{
-
-class ImageViewRGB32;
-class ImageRGB32;
-struct VideoSnapshot;
-class VideoOverlaySet;
-
-//  Base class for a visual inference object to be called perioridically by
-//  inference routines in InferenceRoutines.h.
-class VisualInferenceCallback : public InferenceCallback{
-public:
-    VisualInferenceCallback(std::string label)
-        : InferenceCallback(InferenceType::VISUAL, std::move(label))
-    {}
-
-    //  The inference routines call this function to create video overlays to visualize
-    //  regions of interest of the inference callback.
-    virtual void make_overlays(VideoOverlaySet& items) const = 0;
-
-    //  Return true if the inference session should stop.
-    //  You must override at least one of the overloaded `process_frame()`.
-    virtual bool process_frame(const VideoSnapshot& frame);
-    //  Return true if the inference session should stop.
-    //  You must override at least one of the overloaded `process_frame()`.
-    virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp);
-
-};
-
-
-
-
-}
-#endif
diff --git a/SerialPrograms/Source/CommonFramework/InferenceInfra/VisualInferencePivot.cpp b/SerialPrograms/Source/CommonFramework/InferenceInfra/VisualInferencePivot.cpp
deleted file mode 100644
index 242d15eff4..0000000000
--- a/SerialPrograms/Source/CommonFramework/InferenceInfra/VisualInferencePivot.cpp
+++ /dev/null
@@ -1,122 +0,0 @@
-/*  Visual Inference Pivot
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Cpp/Exceptions.h"
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "VisualInferencePivot.h"
-
-#include <iostream>
-using std::cout;
-using std::endl;
-
-namespace PokemonAutomation{
-
-
-
-struct VisualInferencePivot::PeriodicCallback{
-    Cancellable& scope;
-    std::atomic<InferenceCallback*>* set_when_triggered;
-    VisualInferenceCallback& callback;
-    std::chrono::milliseconds period;
-    StatAccumulatorI32 stats;
-    uint64_t last_seqnum;
-
-    PeriodicCallback(
-        Cancellable& p_scope,
-        std::atomic<InferenceCallback*>* p_set_when_triggered,
-        VisualInferenceCallback& p_callback,
-        std::chrono::milliseconds p_period
-    )
-        : scope(p_scope)
-        , set_when_triggered(p_set_when_triggered)
-        , callback(p_callback)
-        , period(p_period)
-        , last_seqnum(0)
-    {}
-};
-
-
-
-VisualInferencePivot::VisualInferencePivot(CancellableScope& scope, VideoFeed& feed, AsyncDispatcher& dispatcher)
-    : PeriodicRunner(dispatcher)
-    , m_feed(feed)
-{
-    attach(scope);
-}
-VisualInferencePivot::~VisualInferencePivot(){
-    detach();
-    stop_thread();
-}
-void VisualInferencePivot::add_callback(
-    Cancellable& scope,
-    std::atomic<InferenceCallback*>* set_when_triggered,
-    VisualInferenceCallback& callback,
-    std::chrono::milliseconds period
-){
-    SpinLockGuard lg(m_lock);
-    auto iter = m_map.find(&callback);
-    if (iter != m_map.end()){
-        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Attempted to add the same callback twice.");
-    }
-    iter = m_map.emplace(
-        std::piecewise_construct,
-        std::forward_as_tuple(&callback),
-        std::forward_as_tuple(scope, set_when_triggered, callback, period)
-    ).first;
-    try{
-        PeriodicRunner::add_event(&iter->second, period);
-    }catch (...){
-        m_map.erase(iter);
-        throw;
-    }
-}
-StatAccumulatorI32 VisualInferencePivot::remove_callback(VisualInferenceCallback& callback){
-    SpinLockGuard lg(m_lock);
-    auto iter = m_map.find(&callback);
-    if (iter == m_map.end()){
-        return StatAccumulatorI32();
-    }
-    StatAccumulatorI32 stats = iter->second.stats;
-    PeriodicRunner::remove_event(&iter->second);
-    m_map.erase(iter);
-    return stats;
-}
-void VisualInferencePivot::run(void* event, bool is_back_to_back) noexcept{
-    PeriodicCallback& callback = *(PeriodicCallback*)event;
-    try{
-        //  Reuse the cached screenshot.
-        if (!is_back_to_back || callback.last_seqnum == m_seqnum){
-//            cout << "back-to-back" << endl;
-            m_last = m_feed.snapshot();
-            m_seqnum++;
-        }
-
-        WallClock time0 = current_time();
-        bool stop = callback.callback.process_frame(m_last);
-        WallClock time1 = current_time();
-        callback.stats += (uint32_t)std::chrono::duration_cast<std::chrono::microseconds>(time1 - time0).count();
-        callback.last_seqnum = m_seqnum;
-        if (stop){
-            if (callback.set_when_triggered){
-                InferenceCallback* expected = nullptr;
-                callback.set_when_triggered->compare_exchange_strong(expected, &callback.callback);
-            }
-            callback.scope.cancel(nullptr);
-        }
-    }catch (...){
-        callback.scope.cancel(std::current_exception());
-    }
-}
-
-
-OverlayStatSnapshot VisualInferencePivot::get_current(){
-    return m_printer.get_snapshot("Video Pivot Utilization:", this->current_utilization());
-}
-
-
-
-
-}
diff --git a/SerialPrograms/Source/CommonFramework/InferenceInfra/VisualInferencePivot.h b/SerialPrograms/Source/CommonFramework/InferenceInfra/VisualInferencePivot.h
deleted file mode 100644
index 0d56e57c11..0000000000
--- a/SerialPrograms/Source/CommonFramework/InferenceInfra/VisualInferencePivot.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*  Visual Inference Pivot
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_CommonFramework_VisualInferencePivot_H
-#define PokemonAutomation_CommonFramework_VisualInferencePivot_H
-
-#include "Common/Cpp/Concurrency/SpinLock.h"
-#include "Common/Cpp/Concurrency/PeriodicScheduler.h"
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "CommonFramework/VideoPipeline/VideoOverlayTypes.h"
-#include "CommonFramework/Inference/StatAccumulator.h"
-#include "VisualInferenceCallback.h"
-
-namespace PokemonAutomation{
-
-class VideoFeed;
-
-
-
-class VisualInferencePivot final : public PeriodicRunner, public OverlayStat{
-public:
-    VisualInferencePivot(CancellableScope& scope, VideoFeed& feed, AsyncDispatcher& dispatcher);
-    virtual ~VisualInferencePivot();
-
-    //  If this callback returns true:
-    //      1.  Cancel "scope".
-    //      2.  Set "set_when_triggered" to the callback.
-    //  If the callback throws an exception, "scope" will be cancelled with that exception.
-    void add_callback(
-        Cancellable& scope,
-        std::atomic<InferenceCallback*>* set_when_triggered,
-        VisualInferenceCallback& callback,
-        std::chrono::milliseconds period
-    );
-
-    //  Returns the latency stats for the callback. Units are microseconds.
-    StatAccumulatorI32 remove_callback(VisualInferenceCallback& callback);
-
-private:
-    virtual void run(void* event, bool is_back_to_back) noexcept override;
-    virtual OverlayStatSnapshot get_current() override;
-
-private:
-    struct PeriodicCallback;
-
-    VideoFeed& m_feed;
-    SpinLock m_lock;
-    std::map<VisualInferenceCallback*, PeriodicCallback> m_map;
-    VideoSnapshot m_last;
-    uint64_t m_seqnum = 0;
-
-    OverlayStatUtilizationPrinter m_printer;
-};
-
-
-
-}
-#endif
diff --git a/SerialPrograms/Source/CommonFramework/Language.cpp b/SerialPrograms/Source/CommonFramework/Language.cpp
index 87cc18d38c..b0f18c2384 100644
--- a/SerialPrograms/Source/CommonFramework/Language.cpp
+++ b/SerialPrograms/Source/CommonFramework/Language.cpp
@@ -1,6 +1,6 @@
 /*  Language
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -10,8 +10,10 @@
 
 namespace PokemonAutomation{
 
-
-
+// Language metadata mapping. random_match_chance represents OCR false-positive probability:
+// - Latin alphabets (eng, spa, fra, etc.): 1/5 (higher confusion between similar characters)
+// - CJK scripts (jpn, kor): 1/10 (fewer similar glyphs)
+// - Chinese variants: 1/100 (more complex character set, lower random match rate)
 const std::map<Language, LanguageData> LANGUAGE_DATA{
     {Language::None,                {"none",    "None",                     0}},
     {Language::English,             {"eng",     "English",                  1. / 5}},
@@ -63,6 +65,7 @@ const LanguageData& language_data(Language language){
     return iter->second;
 }
 
+// Build reverse lookup map from language code string to enum
 std::map<std::string, Language> build_code_to_enum_map(){
     std::map<std::string, Language> ret;
     for (auto& iter : LANGUAGE_DATA){
@@ -84,5 +87,11 @@ Language language_code_to_enum(const std::string& language){
     return iter->second;
 }
 
+std::string language_warning(Language language){
+    return "Please ensure that you have set the correct Game Language in the program settings.\n"
+            "Current Language Set: " + language_data(language).name;
+
+}
+
 
 }
diff --git a/SerialPrograms/Source/CommonFramework/Language.h b/SerialPrograms/Source/CommonFramework/Language.h
index dc46a3e646..abb1ef4a94 100644
--- a/SerialPrograms/Source/CommonFramework/Language.h
+++ b/SerialPrograms/Source/CommonFramework/Language.h
@@ -1,7 +1,9 @@
 /*  Language
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
+ *  Language enum and utilities for managing game languages in Pokemon and Nintendo Switch automation.
+ *  Supports OCR, game text detection, and multi-language configurations.
  */
 
 #ifndef PokemonAutomation_Language_H
@@ -12,6 +14,7 @@
 
 namespace PokemonAutomation{
 
+// Supported game languages for OCR and text detection
 enum class Language{
     None,
     English,
@@ -26,12 +29,20 @@ enum class Language{
     EndOfList,
 };
 
+// Language metadata containing language code, display name, and OCR false-positive probability
 struct LanguageData{
+    // Tesseract OCR language code (e.g., "eng", "jpn")
+    // See SerialPrograms/Source/CommonFramework/Language.cpp:LANGUAGE_DATA for complete
+    // list of codes.
     std::string code;
+    // Human-readable language name
     std::string name;
+    // Probability of false positive OCR match. Range [0.0, 1.0].
+    // The lower the value the less chance an OCR detection is false positive.
     double random_match_chance;
 };
 
+// std::set-based container for specifying multiple languages.
 class LanguageSet{
 public:
     LanguageSet() = default;
@@ -39,11 +50,11 @@ class LanguageSet{
         : m_set(list)
     {}
 
-    bool operator[](Language language) const;
-    void operator+=(Language language);
-    void operator-=(Language language);
-    void operator+=(const LanguageSet& set);
-    void operator-=(const LanguageSet& set);
+    bool operator[](Language language) const;   // Check if language is in set
+    void operator+=(Language language);          // Add language to set
+    void operator-=(Language language);          // Remove language from set
+    void operator+=(const LanguageSet& set);     // Union with another set
+    void operator-=(const LanguageSet& set);     // Difference with another set
 
     std::set<Language>::const_iterator begin() const{
         return m_set.begin();
@@ -57,10 +68,18 @@ class LanguageSet{
     std::set<Language> m_set;
 };
 
-
+// Retrieve language metadata `LanguageData` for a given Language enum
 const LanguageData& language_data(Language language);
+
+// Convert language code string to Language enum.
+// See SerialPrograms/Source/CommonFramework/Language.cpp:LANGUAGE_DATA for complete
+// list of language codes
 Language language_code_to_enum(const std::string& language);
 
+// Generate user-facing warning message about language configuration:
+// "Please ensure that you have set the correct Game Language in the program settings"
+// "Current Language Set: <language>".
+std::string language_warning(Language language);
 
 
 
diff --git a/SerialPrograms/Source/CommonFramework/Logging/FileWindowLogger.cpp b/SerialPrograms/Source/CommonFramework/Logging/FileWindowLogger.cpp
deleted file mode 100644
index 8f493ed644..0000000000
--- a/SerialPrograms/Source/CommonFramework/Logging/FileWindowLogger.cpp
+++ /dev/null
@@ -1,246 +0,0 @@
-/*  File and Window Logger
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <QCoreApplication>
-#include <QMenuBar>
-#include "CommonFramework/Windows/DpiScaler.h"
-#include "CommonFramework/Windows/WindowTracker.h"
-#include "FileWindowLogger.h"
-
-//#include <iostream>
-//using std::cout;
-//using std::endl;
-
-namespace PokemonAutomation{
-
-
-Logger& global_logger_raw(){
-    static FileWindowLogger logger((QCoreApplication::applicationName() + ".log").toStdString());
-    return logger;
-}
-
-
-FileWindowLogger::~FileWindowLogger(){
-    {
-        std::lock_guard<std::mutex> lg(m_lock);
-        m_stopping = true;
-        m_cv.notify_all();
-    }
-    m_thread.join();
-}
-FileWindowLogger::FileWindowLogger(const std::string& path)
-    : m_file(QString::fromStdString(path))
-    , m_max_queue_size(10000)
-    , m_stopping(false)
-    , m_thread(&FileWindowLogger::thread_loop, this)
-{
-    bool exists = m_file.exists();
-    m_file.open(QIODevice::WriteOnly | QIODevice::Append);
-    if (!exists){
-        std::string bom = "\xef\xbb\xbf";
-        m_file.write(bom.c_str(), bom.size());
-    }
-}
-void FileWindowLogger::operator+=(FileWindowLoggerWindow& widget){
-    std::lock_guard<std::mutex> lg(m_lock);
-    m_windows.insert(&widget);
-}
-void FileWindowLogger::operator-=(FileWindowLoggerWindow& widget){
-    std::lock_guard<std::mutex> lg(m_lock);
-    m_windows.erase(&widget);
-}
-
-void FileWindowLogger::log(const std::string& msg, Color color){
-    std::unique_lock<std::mutex> lg(m_lock);
-    m_cv.wait(lg, [this]{ return m_queue.size() < m_max_queue_size; });
-    m_queue.emplace_back(msg, color);
-    m_cv.notify_all();
-}
-void FileWindowLogger::log(std::string&& msg, Color color){
-    std::unique_lock<std::mutex> lg(m_lock);
-    m_cv.wait(lg, [this]{ return m_queue.size() < m_max_queue_size; });
-    m_queue.emplace_back(std::move(msg), color);
-    m_cv.notify_all();
-}
-
-
-std::string FileWindowLogger::normalize_newlines(const std::string& msg){
-    std::string str;
-    size_t index = 0;
-
-    while (true){
-        auto pos = msg.find("\r\n", index);
-        if (pos == std::string::npos){
-            str += msg.substr(index, pos);
-            break;
-        }else{
-            str += msg.substr(index, pos);
-            str += "\n";
-            index = pos + 2;
-        }
-    }
-
-    if (!str.empty() && str.back() == '\n'){
-        str.pop_back();
-    }
-
-    return str;
-}
-std::string FileWindowLogger::to_file_str(const std::string& msg){
-    //  Replace all newlines with:
-    //      <br>    for the output window.
-    //      \r\n    for the log file.
-
-    std::string str;
-    for (char ch : msg){
-        if (ch == '\n'){
-            str += "\r\n";
-            continue;
-        }
-        str += ch;
-    }
-    str += "\r\n";
-
-    return str;
-}
-QString FileWindowLogger::to_window_str(const std::string& msg, Color color){
-    //  Replace all newlines with:
-    //      <br>    for the output window.
-    //      \r\n    for the log file.
-
-    std::string str;
-    if (color){
-        str += "<font color=\"" + QColor((uint32_t)color).name().toStdString() + "\">";
-    }else{
-        str += "<font>";
-    }
-    for (char ch : msg){
-        if (ch == ' '){
-            str += "&nbsp;";
-            continue;
-        }
-        if (ch == '\n'){
-            str += "<br>";
-            continue;
-        }
-        str += ch;
-    }
-//    if (color){
-        str += "</font>";
-//    }
-
-    return QString::fromStdString(str);
-}
-void FileWindowLogger::internal_log(const std::string& msg, Color color){
-    std::string line = normalize_newlines(msg);
-    {
-        if (!m_windows.empty()){
-            QString str = to_window_str(line, color);
-            for (FileWindowLoggerWindow* window : m_windows){
-                window->log(str);
-            }
-        }
-    }
-    {
-        m_file.write(to_file_str(msg).c_str());
-        m_file.flush();
-    }
-}
-void FileWindowLogger::thread_loop(){
-    std::unique_lock<std::mutex> lg(m_lock);
-    while (true){
-        m_cv.wait(lg, [&]{
-            return m_stopping || !m_queue.empty();
-        });
-        if (m_stopping){
-            break;
-        }
-        auto& item = m_queue.front();
-        std::string msg = std::move(item.first);
-        Color color = item.second;
-        m_queue.pop_front();
-
-        lg.unlock();
-        internal_log(msg, color);
-        lg.lock();
-
-        if (m_queue.size() <= m_max_queue_size / 2){
-            m_cv.notify_all();
-        }
-    }
-}
-
-
-
-
-
-
-FileWindowLoggerWindow::FileWindowLoggerWindow(FileWindowLogger& logger, QWidget* parent)
-    : QMainWindow(parent)
-    , m_logger(logger)
-{
-    if (objectName().isEmpty()){
-        setObjectName(QString::fromUtf8("TextWindow"));
-    }
-    resize(scale_dpi_width(1200), scale_dpi_height(600));
-    m_text = new QTextEdit(this);
-    m_text->setObjectName(QString::fromUtf8("centralwidget"));
-    setCentralWidget(m_text);
-    m_menubar = new QMenuBar(this);
-    m_menubar->setObjectName(QString::fromUtf8("menubar"));
-    setMenuBar(m_menubar);
-//    m_statusbar = new QStatusBar(this);
-//    m_statusbar->setObjectName(QString::fromUtf8("statusbar"));
-//    setStatusBar(m_statusbar);
-    setWindowTitle("Program Output");
-
-    m_text->setReadOnly(true);
-    m_text->setAcceptRichText(true);
-    m_text->document()->setMaximumBlockCount(1000);
-
-    connect(
-        this, &FileWindowLoggerWindow::signal_log,
-        m_text, [this](QString msg){
-//            cout << "signal_log(): " << msg.toStdString() << endl;
-            m_text->append(msg);
-        }
-    );
-
-    m_logger += *this;
-    log("================================================================================");
-    log("<b>Window Startup...</b>");
-    add_window(*this);
-}
-FileWindowLoggerWindow::~FileWindowLoggerWindow(){
-    remove_window(*this);
-    m_logger -= *this;
-}
-
-void FileWindowLoggerWindow::log(QString msg){
-//    cout << "FileWindowLoggerWindow::log(): " << msg.toStdString() << endl;
-    emit signal_log(msg);
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-}
diff --git a/SerialPrograms/Source/CommonFramework/Logging/FileWindowLogger.h b/SerialPrograms/Source/CommonFramework/Logging/FileWindowLogger.h
deleted file mode 100644
index 98a3957dd5..0000000000
--- a/SerialPrograms/Source/CommonFramework/Logging/FileWindowLogger.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*  File and Window Logger
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_Logging_FileWindowLogger_H
-#define PokemonAutomation_Logging_FileWindowLogger_H
-
-#include <deque>
-#include <set>
-#include <mutex>
-#include <condition_variable>
-#include <thread>
-#include <QFile>
-#include <QTextEdit>
-#include <QMainWindow>
-#include "Logger.h"
-
-namespace PokemonAutomation{
-
-class FileWindowLoggerWindow;
-
-
-class FileWindowLogger : public Logger{
-public:
-    ~FileWindowLogger();
-    FileWindowLogger(const std::string& path);
-
-    void operator+=(FileWindowLoggerWindow& widget);
-    void operator-=(FileWindowLoggerWindow& widget);
-
-    virtual void log(const std::string& msg, Color color = Color()) override;
-    virtual void log(std::string&& msg, Color color = Color()) override;
-
-private:
-    static std::string normalize_newlines(const std::string& msg);
-    static std::string to_file_str(const std::string& msg);
-    static QString to_window_str(const std::string& msg, Color color);
-
-    void internal_log(const std::string& msg, Color color);
-    void thread_loop();
-
-private:
-    QFile m_file;
-    size_t m_max_queue_size;
-    std::mutex m_lock;
-    std::condition_variable m_cv;
-    bool m_stopping;
-    std::deque<std::pair<std::string, Color>> m_queue;
-    std::set<FileWindowLoggerWindow*> m_windows;
-    std::thread m_thread;
-};
-
-
-class FileWindowLoggerWindow : public QMainWindow{
-    Q_OBJECT
-
-public:
-    FileWindowLoggerWindow(FileWindowLogger& logger, QWidget* parent = nullptr);
-    virtual ~FileWindowLoggerWindow();
-
-    void log(QString msg);
-
-signals:
-    void signal_log(QString msg);
-
-private:
-    FileWindowLogger& m_logger;
-    QMenuBar* m_menubar;
-    QTextEdit* m_text;
-};
-
-
-}
-#endif
diff --git a/SerialPrograms/Source/CommonFramework/Logging/Logger.cpp b/SerialPrograms/Source/CommonFramework/Logging/Logger.cpp
index f35a7abe31..d9c31e627a 100644
--- a/SerialPrograms/Source/CommonFramework/Logging/Logger.cpp
+++ b/SerialPrograms/Source/CommonFramework/Logging/Logger.cpp
@@ -1,14 +1,14 @@
 /*  Logger
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include <QString>
-#include "ClientSource/Libraries/Logging.h"
-#include "Logger.h"
-
 #include <iostream>
+#include "Common/Cpp/Logging/TaggedLogger.h"
+#include "Common/Cpp/Logging/GlobalLogger.h"
+#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "Logger.h"
 
 namespace PokemonAutomation{
 
@@ -19,42 +19,30 @@ Logger& global_logger_tagged(){
 }
 
 
-TaggedLogger::TaggedLogger(Logger& logger, std::string tag)
-    : m_logger(logger)
-    , m_tag(std::move(tag))
-{}
-
-void TaggedLogger::log(const std::string& msg, Color color){
-    std::string str =
-        current_time_to_str() +
-        " - [" + m_tag + "]: " +
-        msg;
-    m_logger.log(std::move(str), color);
-}
-
-
-
+// A logger that writes to both the base logger and stdout.
+// Useful for command-line tests.
 class CommandLineLogger : public Logger{
 public:
     CommandLineLogger(Logger& logger)
-    : m_logger(logger) {}
+        : m_logger(logger)
+    {}
 
     virtual void log(const std::string& msg, Color color = Color()) override{
+        printf("%s\n", msg.c_str());
         std::cout << msg << std::endl;
         m_logger.log(msg, color);
     }
     virtual void log(std::string&& msg, Color color = Color()) override{
-        std::cout << msg << std::endl;
+        printf("%s\n", msg.c_str());
         m_logger.log(std::move(msg), color);
     }
     virtual void log(const char* msg, Color color = Color()) override{
-        std::cout << msg << std::endl;
+        printf("%s\n", msg);
         m_logger.log(msg, color);
     }
 
 private:
     Logger& m_logger;
-    std::string m_tag;
 };
 
 
@@ -64,5 +52,25 @@ Logger& global_logger_command_line(){
 }
 
 
+
+
+
+BooleanCheckBoxOption& LOG_EVERYTHING(){
+    static BooleanCheckBoxOption option(
+        "<b>Log Everything:</b><br>Log everything to the output window and output log. Will be very spammy.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        false
+    );
+    return option;
 }
 
+
+
+
+
+
+
+
+
+
+}
diff --git a/SerialPrograms/Source/CommonFramework/Logging/Logger.h b/SerialPrograms/Source/CommonFramework/Logging/Logger.h
index ef1033ffab..0826755827 100644
--- a/SerialPrograms/Source/CommonFramework/Logging/Logger.h
+++ b/SerialPrograms/Source/CommonFramework/Logging/Logger.h
@@ -1,50 +1,33 @@
-/*  Logger Qt
+/*  Logger
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
+ *  Provides global logger accessors for the application.
+ *  The core logging types (TaggedLogger, etc.) are in Common/Cpp/Logging/.
  */
 
 #ifndef PokemonAutomation_Logging_Logger_H
 #define PokemonAutomation_Logging_Logger_H
 
-#include <string>
-#include "Common/Cpp/Color.h"
-#include "Common/Cpp/AbstractLogger.h"
+#include "Common/Cpp/Logging/AbstractLogger.h"
 
 namespace PokemonAutomation{
 
 
-
-//  Print as is. Use this to build other loggers.
-Logger& global_logger_raw();
-
-//  Print with timestamp and a default tag. use this directly.
+// This logger wraps around `global_logger_raw()` to print each log with a
+// timestamp and a default tag "Global". Use this logger directly in the
+// application codebase.
 Logger& global_logger_tagged();
 
-//  Print log also to command line. Useful for running command line tests.
+// This logger wraps around `global_logger_raw()` to also print the log
+// into command line using std::cout.
+// Useful for running command line tests.
 Logger& global_logger_command_line();
 
 
-
-class TaggedLogger : public Logger{
-public:
-    TaggedLogger(Logger& logger, std::string tag);
-
-    Logger& base_logger(){ return m_logger; }
-
-    virtual void log(const std::string& msg, Color color = Color()) override;
-
-private:
-    Logger& m_logger;
-    std::string m_tag;
-};
-
-
-
-
-
+class BooleanCheckBoxOption;
+BooleanCheckBoxOption& LOG_EVERYTHING();
 
 
 }
 #endif
-
diff --git a/SerialPrograms/Source/CommonFramework/Logging/LoggerWindow.cpp b/SerialPrograms/Source/CommonFramework/Logging/LoggerWindow.cpp
new file mode 100644
index 0000000000..ae4f51fcc7
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/Logging/LoggerWindow.cpp
@@ -0,0 +1,202 @@
+/*  File and Window Logger
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <QTimer>
+#include <QMenuBar>
+#include "Common/Cpp/Logging/LastLogTracker.h"
+#include "Common/Cpp/Logging/GlobalLogger.h"
+#include "CommonFramework/GlobalAutoPaths.h"
+#include "CommonFramework/GlobalSettingsPanel.h"
+#include "CommonFramework/Windows/DpiScaler.h"
+#include "CommonFramework/Windows/WindowTracker.h"
+#include "CommonFramework/Windows/MainWindow.h"
+#include "CommonFramework/Options/ResolutionOption.h"
+#include "LoggerWindow.h"
+
+namespace PokemonAutomation{
+
+
+void LoggerWindow::log(const std::string& msg, Color color){
+    QString new_lines = to_window_str(msg, color);
+
+    bool pending_update = false;
+    {
+        WriteSpinLock lg(m_lock, nullptr);
+        pending_update = m_pending_update;
+        m_pending_update = true;
+
+        QString* qstr = m_pending.try_push_back();
+        if (qstr == nullptr){
+            m_pending.pop_front();
+            qstr = &m_pending.push_back();
+        }
+        *qstr = std::move(new_lines);
+
+        WallClock now = current_time();
+        WallClock threshold = now - WINDOW_SIZE;
+        while (!m_timestamps.empty() && m_timestamps.front() < threshold){
+            m_timestamps.pop_front();
+        }
+
+        m_timestamps.try_push_back(now);
+
+//        printf("Pending = %d, Later = %d\n", pending_update, update_later);
+    }
+
+    if (pending_update){
+        return;
+    }
+
+    QMetaObject::invokeMethod(this, [this]{
+        update();
+    }, Qt::QueuedConnection);
+}
+
+QString LoggerWindow::to_window_str(const std::string& msg, Color color){
+    // Convert message to HTML for display in QTextEdit.
+    // Replace spaces with &nbsp; and newlines with <br>.
+    std::string str;
+    if (color){
+        str += "<font color=\"" + QColor((uint32_t)color).name().toStdString() + "\">";
+    }else{
+        str += "<font>";
+    }
+    for (char ch : msg){
+        if (ch == ' '){
+            str += "&nbsp;";
+            continue;
+        }
+        if (ch == '\n'){
+            str += "<br>";
+            continue;
+        }
+        str += ch;
+    }
+    str += "</font>";
+
+    return QString::fromStdString(str);
+}
+
+
+LoggerWindow::LoggerWindow(QWidget* parent)
+    : QMainWindow(parent)
+    , m_timestamps(MAX_LOGS_PER_WINDOW)
+    , m_pending(MAX_LINES)
+{
+    if (objectName().isEmpty()){
+        setObjectName(QString::fromUtf8("TextWindow"));
+    }
+    uint32_t width = GlobalSettings::instance().LOG_WINDOW_SIZE->WIDTH;
+    uint32_t height = GlobalSettings::instance().LOG_WINDOW_SIZE->HEIGHT;
+    resize(scale_dpi_width(width), scale_dpi_height(height));
+    m_text = new QTextEdit(this);
+    m_text->setObjectName(QString::fromUtf8("centralwidget"));
+    setCentralWidget(m_text);
+    m_menubar = new QMenuBar(this);
+    m_menubar->setObjectName(QString::fromUtf8("menubar"));
+    setMenuBar(m_menubar);
+//    m_statusbar = new QStatusBar(this);
+//    m_statusbar->setObjectName(QString::fromUtf8("statusbar"));
+//    setStatusBar(m_statusbar);
+    setWindowTitle("Program Output");
+    this->setWindowIcon(QIcon(QString::fromStdString(RESOURCE_PATH() + "icon.png")));
+
+    m_text->setReadOnly(true);
+    m_text->setAcceptRichText(true);
+    m_text->document()->setMaximumBlockCount(MAX_LINES);
+
+    connect(
+        this, &LoggerWindow::signal_log,
+        m_text, [this](){
+            update();
+        }
+    );
+
+    GlobalSettings::instance().LOG_WINDOW_SIZE->WIDTH.add_listener(*this);
+    GlobalSettings::instance().LOG_WINDOW_SIZE->HEIGHT.add_listener(*this);
+    GlobalSettings::instance().LOG_WINDOW_SIZE->X_POS.add_listener(*this);
+    GlobalSettings::instance().LOG_WINDOW_SIZE->Y_POS.add_listener(*this);
+
+    for (const LogLine& item : global_last_log_history().get_recent(MAX_LINES)){
+        log(item.text, item.color);
+    }
+
+    log("================================================================================");
+    log("<b>Window Startup...</b>");
+    add_window(*this);
+}
+
+LoggerWindow::~LoggerWindow(){
+    remove_window(*this);
+    GlobalSettings::instance().LOG_WINDOW_SIZE->WIDTH.remove_listener(*this);
+    GlobalSettings::instance().LOG_WINDOW_SIZE->HEIGHT.remove_listener(*this);
+    GlobalSettings::instance().LOG_WINDOW_SIZE->X_POS.remove_listener(*this);
+    GlobalSettings::instance().LOG_WINDOW_SIZE->Y_POS.remove_listener(*this);
+}
+
+void LoggerWindow::update(){
+    for (size_t c = 0; c < MAX_LOGS_PER_WINDOW; c++){
+        QString line;
+        bool full;
+        {
+            WriteSpinLock lg(m_lock, nullptr);
+            if (m_pending.empty()){
+                m_pending_update = false;
+                return;
+            }
+            full = m_pending.full();
+            line = std::move(m_pending.front());
+            m_pending.pop_front();
+        }
+        if (full){
+            m_text->clear();
+        }
+        m_text->append(line);
+    }
+    QTimer::singleShot(WINDOW_SIZE.count(), this, [this](){
+        emit signal_log();
+    });
+}
+
+
+void LoggerWindow::resizeEvent(QResizeEvent* event){
+    m_pending_resize = true;
+    GlobalSettings::instance().LOG_WINDOW_SIZE->WIDTH.set(width());
+    GlobalSettings::instance().LOG_WINDOW_SIZE->HEIGHT.set(height());
+    m_pending_resize = false;
+}
+
+void LoggerWindow::moveEvent(QMoveEvent* event){
+    m_pending_move = true;
+    GlobalSettings::instance().LOG_WINDOW_SIZE->X_POS.set(x());
+    GlobalSettings::instance().LOG_WINDOW_SIZE->Y_POS.set(y());
+    m_pending_move = false;
+}
+
+void LoggerWindow::on_config_value_changed(void* object){
+    if (object == &GlobalSettings::instance().LOG_WINDOW_SIZE->WIDTH || object == &GlobalSettings::instance().LOG_WINDOW_SIZE->HEIGHT){
+        QMetaObject::invokeMethod(this, [this]{
+            if (!m_pending_resize){
+                resize(
+                    GlobalSettings::instance().LOG_WINDOW_SIZE->WIDTH,
+                    GlobalSettings::instance().LOG_WINDOW_SIZE->HEIGHT
+                );
+            }
+        });
+    }else if (object == &GlobalSettings::instance().LOG_WINDOW_SIZE->X_POS || object == &GlobalSettings::instance().LOG_WINDOW_SIZE->Y_POS){
+        QMetaObject::invokeMethod(this, [this]{
+            if (!m_pending_move){
+                move(
+                    move_x_within_screen_bounds(GlobalSettings::instance().LOG_WINDOW_SIZE->X_POS),
+                    move_y_within_screen_bounds(GlobalSettings::instance().LOG_WINDOW_SIZE->Y_POS)
+                );
+            }
+        });
+    }
+}
+
+
+}
diff --git a/SerialPrograms/Source/CommonFramework/Logging/LoggerWindow.h b/SerialPrograms/Source/CommonFramework/Logging/LoggerWindow.h
new file mode 100644
index 0000000000..78ec46e558
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/Logging/LoggerWindow.h
@@ -0,0 +1,73 @@
+/*  File and Window Logger
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  Qt-dependent layer that adds GUI window support on top of the Qt-free FileLogger.
+ *  The actual file I/O is handled by Common/Cpp/Logging/FileLogger.
+ */
+
+#ifndef PokemonAutomation_Logging_FileWindowLogger_H
+#define PokemonAutomation_Logging_FileWindowLogger_H
+
+#include <QTextEdit>
+#include <QMainWindow>
+#include "Common/Cpp/Time.h"
+#include "Common/Cpp/Logging/AbstractLogger.h"
+#include "Common/Cpp/Concurrency/SpinLock.h"
+#include "Common/Cpp/Containers/CircularBuffer.h"
+#include "Common/Cpp/Options/ConfigOption.h"
+
+namespace PokemonAutomation{
+
+
+// A Qt window that displays log output from a FileWindowLogger.
+// Uses Qt signals/slots for thread-safe updates from the logger's background thread.
+class LoggerWindow final : public QMainWindow, public ConfigOption::Listener, public Logger{
+    Q_OBJECT
+
+public:
+    //  Don't display more than this many log lines. Too many will lag the window.
+    static constexpr size_t MAX_LINES = 1000;
+
+    //  Throttling: If there are more than MAX_LOGS_PER_WINDOW logs with in a
+    //  WINDOW_SIZE window, delay the window updates.
+    static constexpr size_t MAX_LOGS_PER_WINDOW = 10;
+    static constexpr Milliseconds WINDOW_SIZE = Milliseconds(50);
+
+public:
+    LoggerWindow(QWidget* parent);
+    virtual ~LoggerWindow();
+
+    // Called by FileWindowLogger to display a log message.
+
+    // Callback function registered to the global logger.
+    // The global logger's background thread call it to display a log to the window.
+    // Thread-safe: emits a signal that is handled on the UI thread.
+    void log(const std::string& msg, Color color = Color()) override;
+
+    virtual void resizeEvent(QResizeEvent* event) override;
+    virtual void moveEvent(QMoveEvent* event) override;
+
+signals:
+    void signal_log();
+
+private:
+    virtual void on_config_value_changed(void* object) override;
+    void update();
+    QString to_window_str(const std::string& msg, Color color);
+
+    QMenuBar* m_menubar;
+    QTextEdit* m_text;
+    bool m_pending_resize = false;
+    bool m_pending_move = false;
+
+    SpinLock m_lock;
+    bool m_pending_update = false;
+    CircularBuffer<WallClock> m_timestamps;
+
+    CircularBuffer<QString> m_pending;
+};
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/Logging/OutputRedirector.cpp b/SerialPrograms/Source/CommonFramework/Logging/OutputRedirector.cpp
deleted file mode 100644
index 003226dad5..0000000000
--- a/SerialPrograms/Source/CommonFramework/Logging/OutputRedirector.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-/*  Output Redirector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <ostream>
-#include "OutputRedirector.h"
-
-namespace PokemonAutomation{
-
-
-OutputRedirector::OutputRedirector(std::ostream& stream, std::string tag, Color color)
-    : m_stream(stream)
-    , m_old_buf(stream.rdbuf())
-    , m_logger(global_logger_raw(), tag)
-    , m_color(color)
-{
-    stream.rdbuf(this);
-}
-OutputRedirector::~OutputRedirector(){
-    this->m_stream.rdbuf(this->m_old_buf);
-}
-
-
-
-OutputRedirector::int_type OutputRedirector::overflow(int_type ch){
-    SpinLockGuard lg(m_lock);
-    m_old_buf->sputc((char)ch);
-    m_old_buf->pubsync();
-    m_buffer += (char)ch;
-    if (ch == '\n'){
-        m_logger.log(m_buffer, m_color);
-        m_buffer.clear();
-    }
-    return ch;
-}
-std::streamsize OutputRedirector::xsputn(const char_type* s, std::streamsize count){
-    SpinLockGuard lg(m_lock);
-    m_old_buf->sputn(s, count);
-    m_buffer.append(s, count);
-    if (!m_buffer.empty() && m_buffer.back() == '\n'){
-        m_logger.log(m_buffer, m_color);
-        m_buffer.clear();
-    }
-    return count;
-}
-
-
-}
diff --git a/SerialPrograms/Source/CommonFramework/Logging/OutputRedirector.h b/SerialPrograms/Source/CommonFramework/Logging/OutputRedirector.h
index bce451b87d..3f75027bce 100644
--- a/SerialPrograms/Source/CommonFramework/Logging/OutputRedirector.h
+++ b/SerialPrograms/Source/CommonFramework/Logging/OutputRedirector.h
@@ -1,35 +1,35 @@
 /*  Output Redirector
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
+ *  Convenience wrapper around Common/Cpp/Logging/OutputRedirector that
+ *  automatically uses the global logger.
  */
 
-#ifndef PokemonAutomation_Logging_OutputRedirector_H
-#define PokemonAutomation_Logging_OutputRedirector_H
+#ifndef PokemonAutomation_CommonFramework_Logging_OutputRedirector_H
+#define PokemonAutomation_CommonFramework_Logging_OutputRedirector_H
 
-#include <streambuf>
-#include "Common/Cpp/Concurrency/SpinLock.h"
-#include "Logger.h"
+#include "Common/Cpp/Logging/GlobalLogger.h"
+#include "Common/Cpp/Logging/OutputRedirector.h"
 
 namespace PokemonAutomation{
 
 
-class OutputRedirector : public std::basic_streambuf<char>{
+// Convenience class that redirects a stream to the global logger.
+// This is a thin wrapper around Common/Cpp/Logging/OutputRedirector that
+// automatically uses global_logger_raw() as the target logger.
+//
+// Example usage:
+//   OutputRedirector redirect_stdout(std::cout, "stdout", Color());
+//   OutputRedirector redirect_stderr(std::cerr, "stderr", COLOR_RED);
+class GlobalOutputRedirector{
 public:
-    OutputRedirector(std::ostream& stream, std::string tag, Color color);
-    ~OutputRedirector();
+    GlobalOutputRedirector(std::ostream& stream, std::string tag, Color color)
+        : m_redirector(stream, global_logger_raw(), std::move(tag), color)
+    {}
 
 private:
-    virtual int_type overflow(int_type ch) override;
-    virtual std::streamsize xsputn(const char_type* s, std::streamsize count) override;
-
-private:
-    SpinLock m_lock;
-    std::ostream& m_stream;
-    std::streambuf* m_old_buf;
-    TaggedLogger m_logger;
-    Color m_color;
-    std::string m_buffer;
+    OutputRedirector m_redirector;
 };
 
 
diff --git a/SerialPrograms/Source/CommonFramework/Logging/QueuedLogger.cpp b/SerialPrograms/Source/CommonFramework/Logging/QueuedLogger.cpp
index 1f8ce9d6e2..2e245aff3f 100644
--- a/SerialPrograms/Source/CommonFramework/Logging/QueuedLogger.cpp
+++ b/SerialPrograms/Source/CommonFramework/Logging/QueuedLogger.cpp
@@ -1,10 +1,10 @@
 /*  Queued Logger
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include "Common/Cpp/Unicode.h"
+#include "Common/Cpp/Strings/Unicode.h"
 #include "QueuedLogger.h"
 
 namespace PokemonAutomation{
@@ -15,7 +15,7 @@ void QueuedLogger::log(const char* msg, Color color){
     log(std::string(msg), color);
 }
 void QueuedLogger::log(const std::string& msg, Color color){
-    std::lock_guard<std::mutex> lg(m_lock);
+    std::lock_guard<Mutex> lg(m_lock);
     m_queue.emplace_back(new Entry{
         current_time(),
         color,
@@ -28,7 +28,7 @@ void QueuedLogger::log(const QString& msg, Color color){
 }
 
 std::unique_ptr<QueuedLogger::Entry> QueuedLogger::get(){
-    std::unique_lock<std::mutex> lg(m_lock);
+    std::unique_lock<Mutex> lg(m_lock);
     if (m_queue.empty()){
         m_cv.wait(lg);
     }
@@ -40,7 +40,7 @@ std::unique_ptr<QueuedLogger::Entry> QueuedLogger::get(){
     return entry;
 }
 void QueuedLogger::signal(){
-    std::lock_guard<std::mutex> lg(m_lock);
+    std::lock_guard<Mutex> lg(m_lock);
     m_cv.notify_all();
 }
 #endif
diff --git a/SerialPrograms/Source/CommonFramework/Logging/QueuedLogger.h b/SerialPrograms/Source/CommonFramework/Logging/QueuedLogger.h
index 25ee1298f3..8ac8a75302 100644
--- a/SerialPrograms/Source/CommonFramework/Logging/QueuedLogger.h
+++ b/SerialPrograms/Source/CommonFramework/Logging/QueuedLogger.h
@@ -1,6 +1,6 @@
 /*  Queued Logger
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -8,8 +8,7 @@
 #define PokemonAutomation_Logging_QueuedLogger_H
 
 #include <deque>
-#include <mutex>
-#include <condition_variable>
+#include "Common/Cpp/Concurrency/Mutex.h"
 #include "Logger.h"
 
 namespace PokemonAutomation{
@@ -37,8 +36,8 @@ class QueuedLogger : public Logger{
     void signal();
 
 private:
-    std::mutex m_lock;
-    std::condition_variable m_cv;
+    Mutex m_lock;
+    ConditionV m_cv;
     std::deque<std::unique_ptr<Entry>> m_queue;
 };
 #endif
diff --git a/SerialPrograms/Source/CommonFramework/Main.cpp b/SerialPrograms/Source/CommonFramework/Main.cpp
index 6696364cfd..0e7bb7fd3f 100644
--- a/SerialPrograms/Source/CommonFramework/Main.cpp
+++ b/SerialPrograms/Source/CommonFramework/Main.cpp
@@ -1,79 +1,239 @@
 
-#include <QDir>
-#include <QApplication>
+#include <iostream>
 //#include <QTextStream>
-#include <QMessageBox>
-#include <dpp/DPP_SilenceWarnings.h>
-#include <Integrations/DppIntegration/DppClient.h>
+#include <QApplication>
+#include "Common/Cpp/Logging/LastLogTracker.h"
+#include "Common/Cpp/Logging/FileLogger.h"
+#include "Common/Cpp/Logging/GlobalLogger.h"
+#include "Common/Cpp/Logging/MultiOutputLogger.h"
+#include "Common/Cpp/Filesystem/Filesystem.h"
+#include "Common/Cpp/Filesystem/FileIO.h"
+#include "Common/Cpp/Concurrency/Qt6.9ThreadBugWorkaround.h"
+#include "Common/Cpp/Concurrency/AsyncTask.h"
+#include "Common/Cpp/Concurrency/FireForgetDispatcher.h"
+#include "Common/Cpp/Concurrency/Watchdog.h"
 #include "Common/Cpp/Exceptions.h"
 #include "Common/Cpp/ImageResolution.h"
-#include "PersistentSettings.h"
+#include "Common/Cpp/ScopeExit.h"
+#include "Common/Qt/GlobalThreadPoolsQt.h"
+#include "StaticRegistration.h"
+#include "CommonFramework/GlobalAutoPaths.h"
+#include "CommonFramework/Tools/GlobalThreadPools.h"
+#include "CommonFramework/Panels/OptionsPanel.h"
+#include "CommonFramework/VideoPipeline/Backends/CameraImplementations.h"
+#include "CommonTools/OCR/OCR_Routines.h"
 #include "Tests/CommandLineTests.h"
-#include "CrashDump.h"
+#include "ControllerInput/ControllerInput.h"
+#include "Controllers/SerialPort/SerialPortPollerQt.h"
+#include "Integrations/DiscordSettingsOption.h"
+#include "Integrations/DiscordSocial/DiscordSocial.h"
+#include "Integrations/DppIntegration/DppClient.h"
+#include "Integrations/DiscordWebhook.h"
+#include "VideoPipeline/Backends/MediaServicesQt6.h"
+#include "ErrorReports/ProgramDumper.h"
+#include "ErrorReports/ErrorReports.h"
 #include "Environment/HardwareValidation.h"
-#include "Logging/Logger.h"
-#include "Logging/OutputRedirector.h"
 //#include "Tools/StatsDatabase.h"
-#include "Integrations/SleepyDiscordRunner.h"
-#include "Globals.h"
-#include "GlobalSettingsPanel.h"
 //#include "Windows/DpiScaler.h"
-#include "SetupSettings.h"
-#include "NewVersionCheck.h"
+#include "Logging/Logger.h"
+#include "Logging/OutputRedirector.h"
+#include "Startup/SetupSettings.h"
+#include "Startup/NewVersionCheck.h"
 #include "Windows/MainWindow.h"
+#include "GlobalSettingsPanel.h"
+#include "GlobalServices.h"
+#include "PersistentSettings.h"
+#include "NintendoSwitch/NintendoSwitch_SettingsPanel.h"
 
+using namespace PokemonAutomation;
 
-#include <iostream>
-using std::cout;
-using std::endl;
+namespace PokemonAutomation{
+    bool use_qt_ui(){
+        return true;
+    }
+}
 
+Q_DECLARE_METATYPE(std::string)
 
-using namespace PokemonAutomation;
+void set_working_directory(){
+    const std::string app_dir = Filesystem::application_binary_directory().string_slash_normalized();
+    const std::string bundle_dir = "/Contents/MacOS";
+    const std::string bundle_suffix = ".app" + bundle_dir;
+    if (app_dir.size() > bundle_suffix.size() &&
+        app_dir.compare(app_dir.size() - bundle_suffix.size(), bundle_suffix.size(), bundle_suffix) == 0){
+        // a macOS bundle. Change working directory to the folder that hosts the .app folder.
+        const std::string app_bundle_path = app_dir.substr(0, app_dir.size() - bundle_dir.size());
+        const Filesystem::Path base_folder_path = Filesystem::Path(app_bundle_path).parent_path();
+        std::error_code ec;
+        Filesystem::set_current_path(base_folder_path, ec);
+    }
+}
 
-Q_DECLARE_METATYPE(std::string)
+namespace PokemonAutomation{
 
 
-int main(int argc, char *argv[]){
-    setup_crash_handler();
 
-//#if QT_VERSION_MAJOR == 5 // AA_EnableHighDpiScaling is deprecated in Qt6
-//    QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
-//#endif
+FileLogger& global_file_logger(){
+    static FileLogger logger(
+        GlobalThreadPools::unlimited_normal(),
+        FileLoggerConfig{
+            .file_path = USER_FILE_PATH() + Filesystem::application_binary_name().stem().string() + ".log",
+        }
+    );
+    return logger;
+}
+
+}
+
+
+
+int run_program(int argc, char *argv[]){
+//    qputenv("QT_RHI_BACKEND", "opengl");
+
+#if defined(__APPLE__)
+    Filesystem::set_startup_profile(argc, argv);
+    QApplication application(argc, argv);
+#else
     QApplication application(argc, argv);
+#endif
+
+#ifdef PA_DPP
+    // Configure OpenSSL before DPP or background tasks create a TLS context.
+    std::string dpp_cert_message;
+    bool dpp_cert_error = false;
+    {
+        const std::string cert_env = qgetenv("SSL_CERT_FILE").toStdString();
+        const bool use_bundled_cert = cert_env.empty();
+        const std::string cert_path = use_bundled_cert
+            ? (Filesystem::application_binary_directory() / Filesystem::Path("dpp-cacert.pem")).string_slash_normalized()
+            : cert_env;
+        FileIO cert_file;
+        if (!cert_file.open(Filesystem::Path(cert_path), FileMode::READ | FileMode::BINARY)){
+            const std::string error = std::error_code(errno, std::generic_category()).message();
+            dpp_cert_error = true;
+            dpp_cert_message = "DPP CA certificate bundle cannot be read: " + cert_path +
+                " (" + error + "). Discord bot connections may fail.";
+        }else{
+            if (use_bundled_cert){
+                dpp_cert_error = !qputenv("SSL_CERT_FILE", cert_path.c_str());
+#ifdef _WIN32
+                // OpenSSL uses the release CRT even when Qt uses the debug CRT.
+                // Set both environment copies so OpenSSL can find the bundle.
+                const HMODULE crt = LoadLibraryExW(L"ucrtbase.dll", nullptr, LOAD_LIBRARY_SEARCH_SYSTEM32);
+                ScopeExit unload_crt([crt]{
+                    if (crt){
+                        FreeLibrary(crt);
+                    }
+                });
+                using PutEnv = int (__cdecl *)(const char*, const char*);
+                const PutEnv openssl_putenv = crt
+                    ? reinterpret_cast<PutEnv>(GetProcAddress(crt, "_putenv_s"))
+                    : nullptr;
+                dpp_cert_error = dpp_cert_error ||
+                    !openssl_putenv || openssl_putenv("SSL_CERT_FILE", cert_path.c_str()) != 0;
+#endif
+            }
+            dpp_cert_message = dpp_cert_error
+                ? "Failed to set SSL_CERT_FILE for DPP: " + cert_path
+                : "DPP CA certificate bundle: " + cert_path;
+        }
+    }
+#endif
 
-    global_logger_tagged().log("================================================================================");
-    global_logger_tagged().log("Starting Program...");
+    {
+        const std::string qml_import_path =
+            (Filesystem::application_binary_directory() / Filesystem::Path("qml")).string_slash_normalized();
+        qputenv("QML_IMPORT_PATH", qml_import_path.c_str());
+    }
+
+    GlobalOutputRedirector redirect_stdout(std::cout, "stdout", Color());
+    GlobalOutputRedirector redirect_stderr(std::cerr, "stderr", COLOR_RED);
+
+    {
+        MultiOutputLogger& logger = global_multi_logger();
+        logger.add_listener(global_last_log_history());
+        logger.add_listener(global_file_logger());
+    }
+
+    Logger& logger = global_logger_tagged();
+
+    logger.log("================================================================================");
+    logger.log("Starting Program...");
+    logger.log("Current path: " + Filesystem::current_path().string_slash_normalized());
+    logger.log("Executable path: " + Filesystem::application_binary_directory().string_slash_normalized());
+    logger.log("Program setting folder: " + SETTINGS_PATH());
+    logger.log("Program resources folder: " + RESOURCE_PATH());
+#ifdef PA_DPP
+    logger.log(dpp_cert_message, dpp_cert_error ? COLOR_RED : Color());
+#endif
 
     qRegisterMetaType<size_t>("size_t");
     qRegisterMetaType<uint8_t>("uint8_t");
     qRegisterMetaType<std::string>("std::string");
     qRegisterMetaType<Resolution>("Resolution");
 
-    OutputRedirector redirect_stdout(std::cout, "stdout", Color());
-    OutputRedirector redirect_stderr(std::cerr, "stderr", COLOR_RED);
+#if defined(__linux) || defined(__APPLE__)
+    // By default Qt uses native menubar but this only works on Windows.
+    // We use menubar in our ButtonDiagram window to choose which controller's button mapping image to show.
+    // So we fix it by don't using native menubar on non-Windows OS.
+    QCoreApplication::setAttribute(Qt::AA_DontUseNativeMenuBar);
+#endif
 
-    QDir().mkpath(QString::fromStdString(SETTINGS_PATH));
-    QDir().mkpath(QString::fromStdString(SCREENSHOTS_PATH));
+//#if QT_VERSION_MAJOR == 5 // AA_EnableHighDpiScaling is deprecated in Qt6
+//    QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
+//#endif
+
+    Filesystem::create_directories(Filesystem::Path(SETTINGS_PATH()));
+    Filesystem::create_directories(Filesystem::Path(SCREENSHOTS_PATH()));
+
+
+
+    ScopeExit cleanup([]{
+        SerialPortPoller::instance().stop();
+        GlobalMediaServices::instance().stop();
+    });
+
+    //  Several novice developers struggled to build and run the program due to missing Resources folder.
+    //  Add this check to pop a message box when Resources folder is missing.
+    if (!check_resource_folder(logger)){
+        return 1;
+    }
 
     //  Read program settings from json file: SerialPrograms-Settings.json.
     try{
-        if (!migrate_settings(global_logger_tagged(), application.applicationName().toStdString() + "-Settings.json")){
-            return 1;
-        }
-
         PERSISTENT_SETTINGS().read();
-
-        if (!migrate_stats(global_logger_tagged())){
-            return 1;
-        }
     }catch (const FileException& error){
-        global_logger_tagged().log(error.message(), COLOR_RED);
+        logger.log(error.message(), COLOR_RED);
     }catch (const ParseException& error){
-        global_logger_tagged().log(error.message(), COLOR_RED);
+        logger.log(error.message(), COLOR_RED);
+    }
+
+    //  Load the Switch framework settings now, not only when their panel is opened.
+    OptionsPanelWrapper<NintendoSwitch::ConsoleSettingsPanel>().make_panel()->load_json_from_global();
+
+    //  Preload a bunch of stuff now so they are ready later.
+    SerialPortPoller::instance().ports();
+    get_all_cameras();
+
+    //  Force all the Qt thread pools to be constructed now on the main thread.
+    GlobalThreadPools::qt_worker_threadpool();
+    GlobalThreadPools::qt_event_threadpool();
+
+    bool augment_test_color_distortions = false;
+    for (size_t i = 0; i < argc; i++){
+        constexpr const char* force_run_tests = "--command-line-test-mode";
+        constexpr const char* distort_test_images = "--augment-color-distortions";
+
+        if (strcmp(argv[i], force_run_tests) == 0){
+            GlobalSettings::instance().COMMAND_LINE_TEST_MODE = true;
+        }
+        if (strcmp(argv[i], distort_test_images) == 0){
+            augment_test_color_distortions = true;
+        }
     }
 
     if (GlobalSettings::instance().COMMAND_LINE_TEST_MODE){
-        return run_command_line_tests();
+        return run_command_line_tests(augment_test_color_distortions);
     }
 
     //  Check whether the hardware is powerful enough to run this program.
@@ -81,42 +241,114 @@ int main(int argc, char *argv[]){
         return 1;
     }
 
-    check_new_version(global_logger_tagged());
+    check_new_version(logger);
+
+    set_working_directory();
+
+    //  Run this asynchronously to we don't block startup.
+    AsyncTask task = send_all_unsent_reports(logger, true);
 
-    Integration::DiscordIntegrationSettingsOption& discord_settings = GlobalSettings::instance().DISCORD.integration;
+
+
+    Integration::DiscordIntegrationSettingsOption& discord_settings = GlobalSettings::instance().DISCORD->integration;
     if (discord_settings.run_on_start){
-#ifdef PA_SLEEPY
-        if (discord_settings.library0 == Integration::DiscordIntegrationSettingsOption::Library::SleepyDiscord){
-            Integration::SleepyDiscordRunner::sleepy_connect();
-        }
-#endif
 #ifdef PA_DPP
-        if (discord_settings.library0 == Integration::DiscordIntegrationSettingsOption::Library::DPP){
-            Integration::DppClient::Client::instance().connect();
-        }
+        Integration::DppClient::Client::instance().connect();
 #endif
-        discord_settings.value_changed();
+        discord_settings.on_config_value_changed(nullptr);
     }
 
-
-    int ret;
-    {
-        MainWindow w;
-        w.show();
-        w.raise(); // bring the window to front on macOS
-        ret = application.exec();
+#ifdef PA_SOCIAL_SDK
+    if (GlobalSettings::instance().RICH_PRESENCE){
+        Integration::DiscordSocialSDK::DiscordSocial::instance().run();
     }
+#endif
+
+
+    MainWindow w;
+    w.show();
+    w.raise(); // bring the window to front on macOS
+    set_permissions(w);
+
+    int ret = application.exec();
 
-    // Write program settings back to the json file.
+    //  Write program settings back to the json file.
+    std::cout << "Saving Settings..." << std::endl;
     PERSISTENT_SETTINGS().write();
 
-#ifdef PA_SLEEPY
-    Integration::SleepyDiscordRunner::sleepy_terminate();
+    return ret;
+}
+
+
+int main(int argc, char *argv[]){
+#if 0
+    // Retrieve and store program name
+    set_program_path(argv[0]);
+#endif
+
+#if defined(__linux__)
+    // Qt multimedia, default to gstreamer to prevent flickering
+    // Easier than the alternative which is compiling qt6multimedia with QT_DEFAULT_MEDIA_BACKEND
+    // See: https://doc.qt.io/qt-6.5/qtmultimedia-index.html
+    if (qEnvironmentVariableIsEmpty("QT_MEDIA_BACKEND")){
+        qputenv("QT_MEDIA_BACKEND", "gstreamer");
+    }
+#endif
+
+    //  So far, this is only needed on Mac where static initialization is fucked up.
+    PokemonAutomation::register_all_statics();
+
+    setup_crash_handler();
+
+    int ret = run_program(argc, argv);
+
+
+#ifdef PA_SOCIAL_SDK
+    Integration::DiscordSocialSDK::DiscordSocial::instance().stop();
 #endif
 
 #ifdef PA_DPP
-    Integration::DppClient::Client::instance().disconnect();
+    Integration::DppClient::Client::instance().stop();
 #endif
 
+    //  We must clear the OCR cache or it will crash on Linux when the library
+    //  unloads before the cache is destructed from static memory.
+    OCR::clear_ocr_cache();
+
+    //  Stop the controllers.
+    global_input_stop();
+
+    //  Stop misc. services.
+    Integration::DiscordWebhook::DiscordWebhookSender::instance().stop();
+    SystemSleepController::instance().stop();
+    global_periodic_runner().stop();
+    global_watchdog().stop();
+    global_file_logger().stop();
+
+//
+//  Workaround Qt 6.9 thread-adoption bug on Windows.
+//      https://github.com/PokemonAutomation/Arduino-Source/issues/570
+//      https://bugreports.qt.io/browse/QTBUG-131892
+//
+//  Joining threads on Qt 6.9+ Windows will hang!
+//
+#ifdef PA_ENABLE_QT_ADOPTION_WORKAROUND
+    std::cout << "Qt6.9 bug workaround: std::quick_exit() to avoid thread join hangs." << std::endl;
+    std::quick_exit(ret);
+#endif
+
+    //  Force stop the thread pools.
+    //  This is where all the threads in the program are joined.
+    PokemonAutomation::GlobalThreadPools::computation_realtime().stop();
+    PokemonAutomation::GlobalThreadPools::computation_normal().stop();
+    PokemonAutomation::GlobalThreadPools::unlimited_realtime().stop();
+    PokemonAutomation::GlobalThreadPools::unlimited_normal().stop();
+    PokemonAutomation::global_dispatcher.stop();
+
+    GlobalThreadPools::qt_worker_threadpool().stop();
+    GlobalThreadPools::qt_event_threadpool().stop();
+
+    std::cout << "Exiting main()..." << std::endl;
+
     return ret;
 }
diff --git a/SerialPrograms/Source/CommonFramework/NewVersionCheck.cpp b/SerialPrograms/Source/CommonFramework/NewVersionCheck.cpp
deleted file mode 100644
index b47185abe3..0000000000
--- a/SerialPrograms/Source/CommonFramework/NewVersionCheck.cpp
+++ /dev/null
@@ -1,140 +0,0 @@
-/*  New Version Check
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <QMessageBox>
-#include "Common/Cpp/Time.h"
-#include "Common/Cpp/Json/JsonObject.h"
-#include "Exceptions/OperationFailedException.h"
-#include "Options/Environment/ThemeSelectorOption.h"
-#include "Tools/FileDownloader.h"
-#include "Globals.h"
-#include "GlobalSettingsPanel.h"
-#include "NewVersionCheck.h"
-
-//#include <iostream>
-//using std::cout;
-//using std::endl;
-
-namespace PokemonAutomation{
-
-
-static auto CHECK_FOR_UPDATES_PERIOD = std::chrono::days(1);
-
-
-bool compare_version(Logger& logger, const JsonObject* json){
-    if (json == nullptr){
-        logger.log("Invalid version JSON.", COLOR_RED);
-        return false;
-    }
-
-    int major;
-    if (!json->read_integer(major, "VersionMajor")){
-        logger.log("Invalid version JSON: Missing major version.", COLOR_RED);
-        return false;
-    }
-    if (major > PROGRAM_VERSION_MAJOR){
-        return true;
-    }
-    if (major < PROGRAM_VERSION_MAJOR){
-        return false;
-    }
-
-    int minor;
-    if (!json->read_integer(minor, "VersionMinor")){
-        logger.log("Invalid version JSON: Missing minor version.", COLOR_RED);
-        return false;
-    }
-    if (minor > PROGRAM_VERSION_MINOR){
-        return true;
-    }
-    if (minor < PROGRAM_VERSION_MINOR){
-        return false;
-    }
-
-    int patch;
-    if (!json->read_integer(patch, "VersionPatch")){
-        logger.log("Invalid version JSON: Missing patch #.", COLOR_RED);
-        return false;
-    }
-    if (patch > PROGRAM_VERSION_PATCH){
-        return true;
-    }
-
-    return false;
-}
-void check_new_version(Logger& logger){
-    if (!GlobalSettings::instance().CHECK_FOR_UPDATES){
-        return;
-    }
-
-    static WallClock last_version_check = WallClock::min();
-//    static size_t check_count = 0;
-    WallClock now = current_time();
-    if (last_version_check != WallClock::min() && now - last_version_check < CHECK_FOR_UPDATES_PERIOD){
-        return;
-    }
-    last_version_check = now;
-//    check_count++;
-
-    logger.log("Checking for new version...");
-    JsonValue json;
-    try{
-        json = FileDownloader::download_json_file(
-            logger,
-            "https://raw.githubusercontent.com/PokemonAutomation/ComputerControl/master/LatestVersion.json"
-        );
-    }catch (OperationFailedException&){
-        return;
-    }
-
-//    cout << json.dump() << endl;
-
-    const JsonObject* obj = json.get_object();
-    if (obj == nullptr){
-        logger.log("Invalid version JSON.", COLOR_RED);
-        return;
-    }
-
-    const JsonObject* release = obj->get_object("Release");
-    if (compare_version(logger, release)){
-        QMessageBox box;
-        box.setTextFormat(Qt::RichText);
-        box.information(
-            nullptr,
-            "New Version Available!",
-            QString::fromStdString(
-                "A new version is available!<br>" +
-                make_text_url("https://github.com/PokemonAutomation/ComputerControl/releases", "Download here.")
-            )
-        );
-        return;
-    }
-
-    if (!IS_BETA_VERSION){
-        return;
-    }
-
-    const JsonObject* beta = obj->get_object("Beta");
-    if (compare_version(logger, beta)){
-        QMessageBox box;
-        box.setTextFormat(Qt::RichText);
-        box.information(
-            nullptr,
-            "New Beta Available!",
-            QString::fromStdString(
-                "A new beta is available!<br>" +
-                make_text_url("https://discord.com/channels/695809740428673034/732736538965704726", "Download from our Discord!")
-            )
-        );
-        return;
-    }
-}
-
-
-
-
-
-}
diff --git a/SerialPrograms/Source/CommonFramework/Notifications/EventNotificationOption.cpp b/SerialPrograms/Source/CommonFramework/Notifications/EventNotificationOption.cpp
index f3d9f3c575..6148e3b936 100644
--- a/SerialPrograms/Source/CommonFramework/Notifications/EventNotificationOption.cpp
+++ b/SerialPrograms/Source/CommonFramework/Notifications/EventNotificationOption.cpp
@@ -1,6 +1,6 @@
 /*  Event Notification Option
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -9,54 +9,17 @@
 #include "Common/Cpp/Options/BooleanCheckBoxOption.h"
 #include "Common/Cpp/Options/SimpleIntegerOption.h"
 #include "Common/Cpp/Options/StringOption.h"
-#include "CommonFramework/Logging/Logger.h"
 #include "CommonFramework/Options/LabelCellOption.h"
 #include "CommonFramework/Notifications/ProgramNotifications.h"
 #include "EventNotificationOption.h"
 
-#include <QFont>
-#include <QPushButton>
-#include "Common/Qt/Options/ConfigWidget.h"
-
 namespace PokemonAutomation{
 
 
-class TestButtonWidget : public ConfigWidget{
-public:
-    TestButtonWidget(QWidget& parent, TestMessageButton& value)
-        : ConfigWidget(value)
-    {
-        QPushButton* button = new QPushButton(&parent);
-        m_widget = button;
-
-        QFont font;
-        font.setBold(true);
-        button->setFont(font);
-        button->setText("Send Test Message");
-
-        button->connect(
-            button, &QPushButton::clicked,
-            button, [&](bool){
-                send_raw_program_notification(
-                    global_logger_tagged(), value.option,
-                    COLOR_GREEN,
-                    ProgramInfo("Test Message"),
-                    "Notification Test",
-                    {
-                        {"Event Type:", value.option.label()},
-                    }
-                );
-            }
-        );
-    }
-};
 TestMessageButton::TestMessageButton(EventNotificationOption& p_option)
-    : ConfigOption(LockWhileRunning::UNLOCKED)
+    : UiState<TestMessageButton, ConfigOption>(LockMode::UNLOCK_WHILE_RUNNING)
     , option(p_option)
 {}
-ConfigWidget* TestMessageButton::make_QtWidget(QWidget& parent){
-    return new TestButtonWidget(parent, *this);
-}
 
 
 
@@ -86,7 +49,7 @@ std::vector<std::string> EventNotificationOption::parse_tags(const std::string&
     std::vector<std::string> tags;
     size_t start = 0;
     
-    for (size_t end; (end = str.find(",", start)) != std::string::npos; start = end+1) {
+    for (size_t end; (end = str.find(",", start)) != std::string::npos; start = end+1){
         std::string token = str.substr(start, end - start);
         token = sanitize_tag(token);
         if (!token.empty()){
@@ -109,13 +72,13 @@ struct EventNotificationOption::Data{
         std::chrono::seconds rate_limit
     )
         : screenshot_supported(false)
-        , m_enabled(LockWhileRunning::UNLOCKED, enabled)
-        , m_label(LockWhileRunning::UNLOCKED, std::move(label))
-        , m_ping(LockWhileRunning::UNLOCKED, ping)
-        , m_null_screenshot(LockWhileRunning::UNLOCKED, "---")
+        , m_enabled(LockMode::UNLOCK_WHILE_RUNNING, enabled)
+        , m_label(LockMode::UNLOCK_WHILE_RUNNING, std::move(label))
+        , m_ping(LockMode::UNLOCK_WHILE_RUNNING, ping)
+        , m_null_screenshot(LockMode::UNLOCK_WHILE_RUNNING, "---")
         , m_screenshot(ImageAttachmentMode::NO_SCREENSHOT)
-        , m_tags(false, LockWhileRunning::UNLOCKED, "Notifs", "")
-        , m_rate_limit_seconds(LockWhileRunning::UNLOCKED, rate_limit.count())
+        , m_tags(false, LockMode::UNLOCK_WHILE_RUNNING, "Notifs", "")
+        , m_rate_limit_seconds(LockMode::UNLOCK_WHILE_RUNNING, uint32_t(rate_limit.count()))
         , m_last_sent(WallClock::min())
         , m_global_enable(true)
     {}
@@ -126,13 +89,13 @@ struct EventNotificationOption::Data{
         std::chrono::seconds rate_limit
     )
         : screenshot_supported(false)
-        , m_enabled(LockWhileRunning::UNLOCKED, enabled)
-        , m_label(LockWhileRunning::UNLOCKED, std::move(label))
-        , m_ping(LockWhileRunning::UNLOCKED, ping)
-        , m_null_screenshot(LockWhileRunning::UNLOCKED, "---")
+        , m_enabled(LockMode::UNLOCK_WHILE_RUNNING, enabled)
+        , m_label(LockMode::UNLOCK_WHILE_RUNNING, std::move(label))
+        , m_ping(LockMode::UNLOCK_WHILE_RUNNING, ping)
+        , m_null_screenshot(LockMode::UNLOCK_WHILE_RUNNING, "---")
         , m_screenshot(ImageAttachmentMode::NO_SCREENSHOT)
-        , m_tags(false, LockWhileRunning::UNLOCKED, tags_to_str(tags), "")
-        , m_rate_limit_seconds(LockWhileRunning::UNLOCKED, rate_limit.count())
+        , m_tags(false, LockMode::UNLOCK_WHILE_RUNNING, tags_to_str(tags), "")
+        , m_rate_limit_seconds(LockMode::UNLOCK_WHILE_RUNNING, uint32_t(rate_limit.count()))
         , m_last_sent(WallClock::min())
         , m_global_enable(true)
     {}
@@ -144,13 +107,13 @@ struct EventNotificationOption::Data{
         std::chrono::seconds rate_limit
     )
         : screenshot_supported(true)
-        , m_enabled(LockWhileRunning::UNLOCKED, enabled)
-        , m_label(LockWhileRunning::UNLOCKED, std::move(label))
-        , m_ping(LockWhileRunning::UNLOCKED, ping)
-        , m_null_screenshot(LockWhileRunning::UNLOCKED, "---")
+        , m_enabled(LockMode::UNLOCK_WHILE_RUNNING, enabled)
+        , m_label(LockMode::UNLOCK_WHILE_RUNNING, std::move(label))
+        , m_ping(LockMode::UNLOCK_WHILE_RUNNING, ping)
+        , m_null_screenshot(LockMode::UNLOCK_WHILE_RUNNING, "---")
         , m_screenshot(screenshot)
-        , m_tags(false, LockWhileRunning::UNLOCKED, tags_to_str(tags), "")
-        , m_rate_limit_seconds(LockWhileRunning::UNLOCKED, rate_limit.count())
+        , m_tags(false, LockMode::UNLOCK_WHILE_RUNNING, tags_to_str(tags), "")
+        , m_rate_limit_seconds(LockMode::UNLOCK_WHILE_RUNNING, uint32_t(rate_limit.count()))
         , m_last_sent(WallClock::min())
         , m_global_enable(true)
     {}
@@ -226,7 +189,7 @@ EventNotificationOption::EventNotificationOption(
     add_option(m_data->m_enabled, "Enabled");
     add_option(m_data->m_label, "");
     add_option(m_data->m_ping, "Ping");
-    add_option(m_data->m_screenshot, "Screenshot");
+    add_option(m_data->m_screenshot, "Screenshot0");
     add_option(m_data->m_tags, "Tags");
     add_option(m_data->m_rate_limit_seconds, "RateLimitSeconds");
     add_option(m_test_button, "");
@@ -290,6 +253,10 @@ bool EventNotificationOption::ok_to_send_now(Logger& logger){
 }
 
 
+EventNotificationOption& EventNotificationOption_NOOP(){
+    static EventNotificationOption ret("", false, false);
+    return ret;
+}
 
 
 
diff --git a/SerialPrograms/Source/CommonFramework/Notifications/EventNotificationOption.h b/SerialPrograms/Source/CommonFramework/Notifications/EventNotificationOption.h
index 44c3ebc3e9..938a0e2c5b 100644
--- a/SerialPrograms/Source/CommonFramework/Notifications/EventNotificationOption.h
+++ b/SerialPrograms/Source/CommonFramework/Notifications/EventNotificationOption.h
@@ -1,6 +1,6 @@
 /*  Event Notification Option
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -9,7 +9,7 @@
 
 #include <chrono>
 #include <vector>
-#include "Common/Cpp/AbstractLogger.h"
+#include "Common/Cpp/Logging/AbstractLogger.h"
 #include "Common/Cpp/Containers/Pimpl.h"
 #include "Common/Cpp/Options/StaticTableOption.h"
 #include "CommonFramework/Options/ScreenshotFormatOption.h"
@@ -20,10 +20,9 @@ namespace PokemonAutomation{
 class EventNotificationOption;
 
 
-class TestMessageButton : public ConfigOption{
+class TestMessageButton : public UiState<TestMessageButton, ConfigOption>{
 public:
     TestMessageButton(EventNotificationOption& p_option);
-    virtual ConfigWidget* make_QtWidget(QWidget& parent) override;
 
     EventNotificationOption& option;
 };
@@ -79,6 +78,9 @@ class EventNotificationOption : public StaticTableRow{
 };
 
 
+EventNotificationOption& EventNotificationOption_NOOP();
+
+
 
 }
 #endif
diff --git a/SerialPrograms/Source/CommonFramework/Notifications/EventNotificationWidget.cpp b/SerialPrograms/Source/CommonFramework/Notifications/EventNotificationWidget.cpp
new file mode 100644
index 0000000000..cbfd45f991
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/Notifications/EventNotificationWidget.cpp
@@ -0,0 +1,48 @@
+/*  Event Notification Option
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <QFont>
+#include <QPushButton>
+#include "CommonFramework/Logging/Logger.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "EventNotificationWidget.h"
+
+namespace PokemonAutomation{
+
+
+template class RegisterUiStateQtWidget<TestButtonWidget>;
+
+
+TestButtonWidget::TestButtonWidget(QWidget& parent, TestMessageButton& value)
+    : ConfigWidget(value)
+{
+    QPushButton* button = new QPushButton(&parent);
+    m_widget = button;
+
+    QFont font;
+    font.setBold(true);
+    button->setFont(font);
+    button->setText("Send Test Message");
+
+    button->connect(
+        button, &QPushButton::clicked,
+        button, [&](bool){
+            send_raw_program_notification(
+                global_logger_tagged(), value.option,
+                COLOR_GREEN,
+                ProgramInfo("Test Message"),
+                "Notification Test",
+                {
+                    {"Event Type:", value.option.label()},
+                }
+            );
+        }
+    );
+}
+
+
+
+}
diff --git a/SerialPrograms/Source/CommonFramework/Notifications/EventNotificationWidget.h b/SerialPrograms/Source/CommonFramework/Notifications/EventNotificationWidget.h
new file mode 100644
index 0000000000..3cf8e2de96
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/Notifications/EventNotificationWidget.h
@@ -0,0 +1,27 @@
+/*  Event Notification Option
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_EventNotificationWidget_H
+#define PokemonAutomation_EventNotificationWidget_H
+
+#include "Common/Qt/Options/ConfigWidget.h"
+#include "EventNotificationOption.h"
+
+namespace PokemonAutomation{
+
+
+class TestButtonWidget : public ConfigWidget{
+public:
+    using ParentState = TestMessageButton;
+
+public:
+    TestButtonWidget(QWidget& parent, TestMessageButton& value);
+};
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/Notifications/EventNotificationsTable.cpp b/SerialPrograms/Source/CommonFramework/Notifications/EventNotificationsTable.cpp
index fa6276617d..a865d1d8a0 100644
--- a/SerialPrograms/Source/CommonFramework/Notifications/EventNotificationsTable.cpp
+++ b/SerialPrograms/Source/CommonFramework/Notifications/EventNotificationsTable.cpp
@@ -1,20 +1,16 @@
 /*  Program Notification Table
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include "Common/Cpp/Exceptions.h"
-#include "Common/Cpp/Json/JsonValue.h"
-#include "Common/Cpp/Json/JsonObject.h"
-#include "ProgramNotifications.h"
 #include "EventNotificationsTable.h"
 
 namespace PokemonAutomation{
 
 
 EventNotificationsTable::EventNotificationsTable(std::vector<EventNotificationOption*> options)
-    : StaticTableOption("", LockWhileRunning::UNLOCKED, false)
+    : StaticTableOption("", LockMode::UNLOCK_WHILE_RUNNING, false)
 {
     for (EventNotificationOption* option : options){
         add_row(option);
@@ -44,7 +40,11 @@ std::vector<std::string> EventNotificationsTable::make_header() const{
 
 
 EventNotificationsOption::EventNotificationsOption(std::vector<EventNotificationOption*> options)
-    : GroupOption("Discord Notifications", LockWhileRunning::UNLOCKED, true)
+    : GroupOption(
+        "Discord Notifications",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        GroupOption::EnableMode::DEFAULT_ENABLED, false
+    )
     , m_table(std::move(options))
 {
     PA_ADD_OPTION(m_table);
diff --git a/SerialPrograms/Source/CommonFramework/Notifications/EventNotificationsTable.h b/SerialPrograms/Source/CommonFramework/Notifications/EventNotificationsTable.h
index bfc77b49d3..a91f1bd25c 100644
--- a/SerialPrograms/Source/CommonFramework/Notifications/EventNotificationsTable.h
+++ b/SerialPrograms/Source/CommonFramework/Notifications/EventNotificationsTable.h
@@ -1,6 +1,6 @@
 /*  Event Notifications Table
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/CommonFramework/Notifications/MessageAttachment.cpp b/SerialPrograms/Source/CommonFramework/Notifications/MessageAttachment.cpp
index 1a23f81358..02dd3ea60f 100644
--- a/SerialPrograms/Source/CommonFramework/Notifications/MessageAttachment.cpp
+++ b/SerialPrograms/Source/CommonFramework/Notifications/MessageAttachment.cpp
@@ -1,13 +1,13 @@
 /*  Message Attachment
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include <QDir>
-#include <QFile>
+#include "Common/Cpp/Filesystem/Filesystem.h"
 #include "Common/Cpp/PrettyPrint.h"
-#include "CommonFramework/Globals.h"
+#include "CommonFramework/GlobalAutoPaths.h"
+#include "CommonFramework/GlobalSettingsPanel.h"
 #include "MessageAttachment.h"
 
 namespace PokemonAutomation{
@@ -38,27 +38,15 @@ PendingFileSend::~PendingFileSend(){
         return;
     }
 
-    QFile file(QString::fromStdString(m_filepath));
-    file.remove();
+    Filesystem::remove(Filesystem::Path(m_filepath));
 }
 PendingFileSend::PendingFileSend(const std::string& file, bool keep_file)
     : m_keep_file(keep_file)
     , m_extend_lifetime(false)
     , m_filepath(file)
 {
-    QFileInfo info(QString::fromStdString(file));
-    m_filename = info.fileName().toStdString();
+    m_filename = Filesystem::Path(file).filename().string();
 }
-#if 0
-PendingFileSend::PendingFileSend(Logger& logger, const std::string& text_attachment)
-    : m_keep_file(false)
-    , m_extend_lifetime(false)
-    , m_filename(now_to_filestring() + ".txt")
-    , m_filepath("TempFiles/" + m_filename)
-{
-    QFile file(QString::fromStdString(m_filepath));
-}
-#endif
 PendingFileSend::PendingFileSend(Logger& logger, const ImageAttachment& image)
     : m_keep_file(image.keep_file)
     , m_extend_lifetime(false)
@@ -86,11 +74,11 @@ PendingFileSend::PendingFileSend(Logger& logger, const ImageAttachment& image)
     m_filename = now_to_filestring() + format;
 
     if (image.keep_file){
-        m_filepath = SCREENSHOTS_PATH + m_filename;
+        m_filepath = SCREENSHOTS_PATH() + m_filename;
     }else{
-        QDir().mkdir("TempFiles");
-//        m_filename = "temp-" + m_filename;
-        m_filepath = "TempFiles/" + m_filename;
+        m_filepath = GlobalSettings::instance().TEMP_FOLDER;
+        Filesystem::create_directories(Filesystem::Path(m_filepath));
+        m_filepath += m_filename;
     }
 
     if (image.image.save(m_filepath)){
diff --git a/SerialPrograms/Source/CommonFramework/Notifications/MessageAttachment.h b/SerialPrograms/Source/CommonFramework/Notifications/MessageAttachment.h
index 20104d0df2..c1f25e5304 100644
--- a/SerialPrograms/Source/CommonFramework/Notifications/MessageAttachment.h
+++ b/SerialPrograms/Source/CommonFramework/Notifications/MessageAttachment.h
@@ -1,6 +1,6 @@
 /*  Message Attachment
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/CommonFramework/Notifications/ProgramInfo.h b/SerialPrograms/Source/CommonFramework/Notifications/ProgramInfo.h
index 865dacfbf8..167abd990b 100644
--- a/SerialPrograms/Source/CommonFramework/Notifications/ProgramInfo.h
+++ b/SerialPrograms/Source/CommonFramework/Notifications/ProgramInfo.h
@@ -1,6 +1,6 @@
 /*  Program Information
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/CommonFramework/Notifications/ProgramNotifications.cpp b/SerialPrograms/Source/CommonFramework/Notifications/ProgramNotifications.cpp
index b667b604db..61d8843dde 100644
--- a/SerialPrograms/Source/CommonFramework/Notifications/ProgramNotifications.cpp
+++ b/SerialPrograms/Source/CommonFramework/Notifications/ProgramNotifications.cpp
@@ -1,28 +1,24 @@
 /*  Program Notifications
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include <QFile>
-#include <dpp/DPP_SilenceWarnings.h>
-#include <Integrations/DppIntegration/DppClient.h>
 #include "Common/Cpp/PrettyPrint.h"
 #include "Common/Cpp/Json/JsonValue.h"
 #include "Common/Cpp/Json/JsonArray.h"
 #include "Common/Cpp/Json/JsonObject.h"
+#include "CommonFramework/ErrorReports/ErrorReports.h"
 #include "CommonFramework/Globals.h"
+#include "CommonFramework/StaticGlobals.h"
 #include "CommonFramework/GlobalSettingsPanel.h"
 #include "CommonFramework/Tools/ProgramEnvironment.h"
-#include "CommonFramework/Tools/StatsTracking.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "Integrations/DiscordSettingsOption.h"
 #include "Integrations/DiscordWebhook.h"
-#include "Integrations/SleepyDiscordRunner.h"
+#include "Integrations/DppIntegration/DppClient.h"
 #include "ProgramNotifications.h"
 
-#ifdef PA_OFFICIAL
-#include "../Internal/SerialPrograms/TelemetryURLs.h"
-#endif
-
 //#include <iostream>
 //using std::cout;
 //using std::endl;
@@ -43,14 +39,10 @@ void append_body_fields(JsonArray& fields, const std::vector<std::pair<std::stri
 JsonObject make_credits_field(const ProgramInfo& info){
     JsonObject field;
     field["name"] = "Powered By:";
-    std::string text = PreloadSettings::instance().DEVELOPER_MODE
+    std::string text = STATIC_GLOBALS.DEVELOPER_MODE
         ? PROGRAM_NAME + " CC " + PROGRAM_VERSION + "-dev"
         : PROGRAM_NAME + " CC " + PROGRAM_VERSION + "";
-    if (GlobalSettings::instance().HIDE_NOTIF_DISCORD_LINK){
-        text += " ([GitHub](" + PROJECT_GITHUB_URL + "About/))";
-    }else{
-        text += " ([GitHub](" + PROJECT_GITHUB_URL + "About/)/[Discord](" + DISCORD_LINK_URL + "))";
-    }
+    text += " ([GitHub](" + GITHUB_LINK_URL + ")/[Discord](" + DISCORD_LINK_URL_EMBED + "))";
     field["value"] = std::move(text);
     return field;
 }
@@ -58,7 +50,7 @@ std::pair<std::string, std::string> make_session_field(
     const ProgramInfo& info,
     const StatsTracker* current_stats, const std::string& current_stats_addendum
 ){
-    const std::string& instance_name = GlobalSettings::instance().DISCORD.message.instance_name;
+    const std::string& instance_name = GlobalSettings::instance().DISCORD->message.instance_name;
     std::string name = instance_name.empty()
         ? "Current Session:"
         : "Current Session: (" + instance_name + ")";
@@ -74,7 +66,7 @@ std::pair<std::string, std::string> make_session_field(
     }
     if (current_stats){
         text += "\n";
-        text += current_stats->to_str();
+        text += current_stats->to_str(StatsTracker::DISPLAY_ON_SCREEN);
         if (!current_stats_addendum.empty()){
             text += "\n";
             text += current_stats_addendum;
@@ -93,8 +85,12 @@ void send_raw_notification(
     const std::vector<std::pair<std::string, std::string>>& messages,
     const ImageAttachment& image
 ){
-    std::shared_ptr<PendingFileSend> file(new PendingFileSend(logger, image));
-    bool hasFile = !file->filepath().empty();
+    bool hasImageFile = false;
+    std::shared_ptr<PendingFileSend> file;
+    if (image.image.width() > 0 && image.image.height() > 0){ // if image not empty
+        file = std::make_shared<PendingFileSend>(logger, image);
+        hasImageFile = !file->filepath().empty();
+    };
 
     JsonObject embed;
     JsonArray embeds;
@@ -111,7 +107,7 @@ void send_raw_notification(
         fields.push_back(make_credits_field(info));
         embed["fields"] = std::move(fields);
 
-        if (hasFile){
+        if (hasImageFile){
             JsonObject field;
             field["url"] = "attachment://" + file->filename();
             embed["image"] = std::move(field);
@@ -122,25 +118,14 @@ void send_raw_notification(
     Integration::DiscordWebhook::send_embed(
         logger, should_ping, tags,
         std::move(embeds),
-        hasFile ? file : nullptr
+        hasImageFile ? file : nullptr
     );
 
-#ifdef PA_SLEEPY
-    if (GlobalSettings::instance().DISCORD.integration.library0 == Integration::DiscordIntegrationSettingsOption::Library::SleepyDiscord){
-        Integration::SleepyDiscordRunner::send_embed_sleepy(
-            should_ping, tags, std::move(embed),
-            hasFile ? file : nullptr
-        );
-    }
-#endif
-
 #ifdef PA_DPP
-    if (GlobalSettings::instance().DISCORD.integration.library0 == Integration::DiscordIntegrationSettingsOption::Library::DPP){
-        Integration::DppClient::Client::instance().send_embed_dpp(
-            should_ping, color, tags, std::move(embed),
-            hasFile ? file : nullptr
-        );
-    }
+    Integration::DppClient::Client::instance().send_embed_dpp(
+        should_ping, color, tags, std::move(embed),
+        hasImageFile ? file : nullptr
+    );
 #endif
 }
 void send_raw_notification(
@@ -151,7 +136,7 @@ void send_raw_notification(
     const std::vector<std::pair<std::string, std::string>>& messages,
     const std::string& filepath
 ){
-    std::shared_ptr<PendingFileSend> file(new PendingFileSend(filepath, true));
+    std::shared_ptr<PendingFileSend> file = std::make_shared<PendingFileSend>(filepath, true);
     bool hasFile = !file->filepath().empty();
 
     JsonObject embed;
@@ -178,22 +163,11 @@ void send_raw_notification(
         hasFile ? file : nullptr
     );
 
-#ifdef PA_SLEEPY
-    if (GlobalSettings::instance().DISCORD.integration.library0 == Integration::DiscordIntegrationSettingsOption::Library::SleepyDiscord){
-        Integration::SleepyDiscordRunner::send_embed_sleepy(
-            should_ping, tags, std::move(embed),
-            hasFile ? file : nullptr
-        );
-    }
-#endif
-
 #ifdef PA_DPP
-    if (GlobalSettings::instance().DISCORD.integration.library0 == Integration::DiscordIntegrationSettingsOption::Library::DPP){
-        Integration::DppClient::Client::instance().send_embed_dpp(
-            should_ping, color, tags, std::move(embed),
-            hasFile ? file : nullptr
-        );
-    }
+    Integration::DppClient::Client::instance().send_embed_dpp(
+        should_ping, color, tags, std::move(embed),
+        hasFile ? file : nullptr
+    );
 #endif
 }
 
@@ -274,7 +248,10 @@ void send_program_notification_with_file(
 #endif
     const StatsTracker* historical_stats = env.historical_stats();
     if (GlobalSettings::instance().ALL_STATS && historical_stats){
-        messages.emplace_back("Historical Stats:", env.historical_stats()->to_str());
+        messages.emplace_back(
+            "Historical Stats:",
+            env.historical_stats()->to_str(StatsTracker::DISPLAY_ON_SCREEN)
+        );
     }
     send_raw_notification(
         env.logger(),
@@ -286,7 +263,7 @@ void send_program_notification_with_file(
         filepath
     );
 }
-void send_program_notification(
+bool send_program_notification(
     ProgramEnvironment& env, EventNotificationOption& settings,
     Color color,
     const std::string& title,
@@ -295,7 +272,7 @@ void send_program_notification(
     const ImageViewRGB32& image, bool keep_file
 ){
     if (!settings.ok_to_send_now(env.logger())){
-        return;
+        return false;
     }
 #if 1
     messages.emplace_back(
@@ -318,7 +295,10 @@ void send_program_notification(
 #endif
     const StatsTracker* historical_stats = env.historical_stats();
     if (GlobalSettings::instance().ALL_STATS && historical_stats){
-        messages.emplace_back("Historical Stats:", env.historical_stats()->to_str());
+        messages.emplace_back(
+            "Historical Stats:",
+            env.historical_stats()->to_str(StatsTracker::DISPLAY_ON_SCREEN)
+        );
     }
     send_raw_notification(
         env.logger(),
@@ -329,6 +309,8 @@ void send_program_notification(
         messages,
         ImageAttachment(image, settings.screenshot(), keep_file)
     );
+
+    return true;
 }
 
 
@@ -388,110 +370,56 @@ void send_program_fatal_error_notification(
     );
 }
 
-
-
-
-
-
-
-
-
-
-
-
-void send_program_telemetry(
-    Logger& logger, bool is_error, Color color,
+void send_program_recoverable_error_notification_and_telemetry_report(
+    ProgramEnvironment& env, 
+    Logger* logger,
     const ProgramInfo& info,
-    const std::string& title,
-    const std::vector<std::pair<std::string, std::string>>& messages,
-    const std::string& file
+    EventNotificationOption& notif_settings,
+    ErrorReportMode error_report_mode,
+    const std::string& message,
+    std::string error_type,
+    const ImageViewRGB32& image,
+    const StreamHistorySession* stream_history
 ){
-#ifdef PA_OFFICIAL
-    if (!GlobalSettings::instance().SEND_ERROR_REPORTS){
-        return;
-    }
-
-    //  Rate limit the telemetry to 10/hour.
-    static std::mutex lock;
-    static std::set<WallClock> sends;
-    {
-        std::lock_guard<std::mutex> lg(lock);
-
-        WallClock now = current_time();
-        WallClock threshold = now - std::chrono::minutes(1);
-        while (!sends.empty()){
-            auto iter = sends.begin();
-            if (*iter > threshold){
-                break;
-            }
-            sends.erase(iter);
-        }
-        if (sends.size() >= 10){
-            logger.log("Error report suppressed due to rate limit.", COLOR_RED);
-            return;
-        }
-        sends.insert(now);
+    send_program_recoverable_error_notification(env, notif_settings, message, image);
+    if (error_report_mode == ErrorReportMode::SEND_ERROR_REPORT){
+        report_error_to_telemetry(
+            logger,
+            info,
+            "Recoverable: " + error_type,
+            {{"Message:", message}},
+            image,
+            stream_history
+        );
     }
+}
 
-
-    bool hasFile = !file.empty();
-    std::shared_ptr<PendingFileSend> pending = !hasFile
-            ? nullptr
-            : std::shared_ptr<PendingFileSend>(new PendingFileSend(file, GlobalSettings::instance().SAVE_DEBUG_IMAGES));
-
-    JsonArray embeds;
-    {
-        JsonObject embed;
-        embed["title"] = title;
-        if (color){
-            embed["color"] = (uint32_t)color & 0xffffff;
-        }
-
-        JsonArray fields;
-        {
-            JsonObject field;
-            field["name"] = PreloadSettings::instance().DEVELOPER_MODE
-                ? PROGRAM_NAME + " (" + PROGRAM_VERSION + "-dev)"
-                : PROGRAM_NAME + " (" + PROGRAM_VERSION + ")";
-            field["value"] = info.program_name.empty() ? "(unknown)" : info.program_name;
-            fields.push_back(std::move(field));
-        }
-        for (const auto& item : messages){
-            JsonObject field;
-            field["name"] = item.first;
-            field["value"] = item.second;
-            if (!item.first.empty() && !item.second.empty()){
-                fields.push_back(std::move(field));
-            }
-        }
-        embed["fields"] = std::move(fields);
-
-        if (hasFile){
-            JsonObject image;
-            image["url"] = "attachment://" + pending->filename();
-            embed["image"] = std::move(image);
-        }
-        embeds.push_back(std::move(embed));
+void send_program_fatal_error_notification_and_telemetry_report(
+    ProgramEnvironment& env, 
+    Logger* logger,
+    const ProgramInfo& info,
+    EventNotificationOption& notif_settings,
+    ErrorReportMode error_report_mode,
+    const std::string& message,
+    std::string error_type,
+    const ImageViewRGB32& image,
+    const StreamHistorySession* stream_history
+){
+    send_program_fatal_error_notification(env, notif_settings, message, image);
+    if (error_report_mode == ErrorReportMode::SEND_ERROR_REPORT){
+        report_error_to_telemetry(
+            logger,
+            info,
+            "Fatal: " + error_type,
+            {{"Message:", message}},
+            image,
+            stream_history
+        );
     }
+}
 
-    JsonObject jsonContent;
-//    jsonContent["content"] = "asdf";
-    jsonContent["embeds"] = std::move(embeds);
-
-    std::string url = is_error
-            ? flip(ERROR_REPORTING_URL, sizeof(ERROR_REPORTING_URL))
-            : flip(TELEMETRY_URL, sizeof(TELEMETRY_URL));
 
-    using namespace Integration::DiscordWebhook;
 
-    DiscordWebhookSender& sender = DiscordWebhookSender::instance();
-    if (hasFile){
-        sender.send_json(logger, QString::fromStdString(url), std::chrono::milliseconds(0), jsonContent, pending);
-    }else{
-        sender.send_json(logger, QString::fromStdString(url), std::chrono::milliseconds(0), jsonContent, nullptr);
-    }
-#endif
-}
 
 
 
diff --git a/SerialPrograms/Source/CommonFramework/Notifications/ProgramNotifications.h b/SerialPrograms/Source/CommonFramework/Notifications/ProgramNotifications.h
index 07d90ae198..82f8290731 100644
--- a/SerialPrograms/Source/CommonFramework/Notifications/ProgramNotifications.h
+++ b/SerialPrograms/Source/CommonFramework/Notifications/ProgramNotifications.h
@@ -1,6 +1,6 @@
 /*  Program Notifications
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -9,6 +9,7 @@
 
 #include <vector>
 #include <string>
+#include "Common/Cpp/Exceptions.h"
 #include "CommonFramework/ImageTypes/ImageViewRGB32.h"
 #include "ProgramInfo.h"
 #include "EventNotificationOption.h"
@@ -18,10 +19,20 @@ namespace PokemonAutomation{
 class Logger;
 class StatsTracker;
 class ProgramEnvironment;
+class StreamHistorySession;
 
 
 
-//  Raw Notification
+//  Send raw Discord notification according to the notification settings.
+//  Can control the message sidebar color, message title, and message body.
+//  messages: vector<pair<string, string>>, the sections of the Discord message.
+//    The first string in the pair is the section title (will shown as bold) while the second
+//    string is the section content.
+//    e.g. {{"Message:", {"This is a message."}}} will shown as (in Markdown):
+//    **Message**
+//    This is a message.
+//  The function will add an additional section "Powered By".
+//  filepath: send the file as a message attachment.
 void send_raw_program_notification_with_file(
     Logger& logger, EventNotificationOption& settings,
     Color color,
@@ -30,6 +41,20 @@ void send_raw_program_notification_with_file(
     const std::vector<std::pair<std::string, std::string>>& messages,
     const std::string& filepath
 );
+
+//  Send raw Discord notification according to the notification settings.
+//  Can control the message sidebar color, message title, and message body.
+//  messages: vector<pair<string, string>>, the sections of the Discord message.
+//    The first string in the pair is the section title (will shown as bold) while the second
+//    string is the section content.
+//    e.g. {{"Message:", {"This is a message."}}} will shown as (in Markdown):
+//    **Message**
+//    This is a message.
+//  The function will add an additional section "Powered By".
+//  image: if not empty, send the screenshot image as part of the message according to the
+//    notification settings.
+//  keep_file: if true, the sent image will be saved to the screenshot dir on disk. Otherwise, it
+//    will be saved to the program TEMP_FOLDER.
 void send_raw_program_notification(
     Logger& logger, EventNotificationOption& settings,
     Color color,
@@ -41,7 +66,19 @@ void send_raw_program_notification(
 
 
 
-//  Program notification with stats.
+//  Send custom Discord notification according to the notification settings.
+//  Can control the message sidebar color, message title, and message body.
+//  messages: vector<pair<string, string>>, the sections of the Discord message.
+//    The first string in the pair is the section title (will shown as bold) while the second
+//    string is the section content.
+//    e.g. {{"Message:", {"This is a message."}}} will shown as (in Markdown):
+//    **Message**
+//    This is a message.
+//  The function will add additional sections: "Current Session", "Historical Stats"
+//    and "Powered By".
+//  current_stats_addendum: add additional message at the end of the "Current Session" section
+//  where it shows the current program stats message generated by StatsTracker.
+//  filepath: send the file as a message attachment.
 void send_program_notification_with_file(
     ProgramEnvironment& env, EventNotificationOption& settings,
     Color color,
@@ -50,7 +87,24 @@ void send_program_notification_with_file(
     const std::string& current_stats_addendum,
     const std::string& filepath
 );
-void send_program_notification(
+
+//  Send custom Discord notification according to the notification settings.
+//  Can control the message sidebar color, message title, and message body.
+//  messages: vector<pair<string, string>>, the sections of the Discord message.
+//    The first string in the pair is the section title (will shown as bold) while the second
+//    string is the section content.
+//    e.g. {{"Message:", {"This is a message."}}} will shown as (in Markdown):
+//    **Message**
+//    This is a message.
+//  The function will add additional sections: "Current Session", "Historical Stats"
+//    and "Powered By".
+//  current_stats_addendum: add additional message at the end of the "Current Session" section
+//  where it shows the current program stats message generated by StatsTracker.
+//  image: if not empty, send the screenshot image as part of the message according to the
+//    notification settings.
+//  keep_file: if true, the sent image will be saved to the screenshot dir on disk. Otherwise, it
+//    will be saved to the program TEMP_FOLDER.
+bool send_program_notification(
     ProgramEnvironment& env, EventNotificationOption& settings,
     Color color,
     const std::string& title,
@@ -61,24 +115,42 @@ void send_program_notification(
 
 
 
-//  Other common program notification types.
+//  Send Discord notification of the current program status according to the notification settings.
+//  Can send additional message and screenshot image.
+//  keep_file: if true, the sent image will be saved to the screenshot dir on disk. Otherwise, it
+//    will be saved to the program TEMP_FOLDER.
 void send_program_status_notification(
     ProgramEnvironment& env, EventNotificationOption& settings,
     const std::string& message = "",
     const ImageViewRGB32& image = ImageViewRGB32(), bool keep_file = false
 );
 
+//  Send Discord notification that the program has finished according to the notification settings.
+//  Can send additional message and screenshot image.
+//  keep_file: if true, the sent image will be saved to the screenshot dir on disk. Otherwise, it
+//    will be saved to the program TEMP_FOLDER.
 void send_program_finished_notification(
     ProgramEnvironment& env, EventNotificationOption& settings,
     const std::string& message = "",
     const ImageViewRGB32& image = ImageViewRGB32(), bool keep_file = false
 );
 
+//  Send Discord notification that the program has encountered a recoverable error according to the
+//  notification settings.
+//  Can send additional message and screenshot image.
+//  keep_file: if true, the sent image will be saved to the screenshot dir on disk. Otherwise, it
+//    will be saved to the program TEMP_FOLDER.
 void send_program_recoverable_error_notification(
     ProgramEnvironment& env, EventNotificationOption& settings,
     const std::string& message,
     const ImageViewRGB32& image = ImageViewRGB32(), bool keep_file = false
 );
+
+//  Send Discord notification that the program has a fatal error according to the notification
+//  settings.
+//  Can send additional message and screenshot image.
+//  keep_file: if true, the sent image will be saved to the screenshot dir on disk. Otherwise, it
+//    will be saved to the program TEMP_FOLDER.
 void send_program_fatal_error_notification(
     ProgramEnvironment& env, EventNotificationOption& settings,
     const std::string& message,
@@ -86,19 +158,31 @@ void send_program_fatal_error_notification(
 );
 
 
+void send_program_recoverable_error_notification_and_telemetry_report(
+    ProgramEnvironment& env, 
+    Logger* logger,
+    const ProgramInfo& info,
+    EventNotificationOption& notif_settings,
+    ErrorReportMode error_report_mode,
+    const std::string& message,
+    std::string error_type,
+    const ImageViewRGB32& image = ImageViewRGB32(),
+    const StreamHistorySession* stream_history = nullptr
+);
 
-
-
-
-
-void send_program_telemetry(
-    Logger& logger, bool is_error, Color color,
+void send_program_fatal_error_notification_and_telemetry_report(
+    ProgramEnvironment& env, 
+    Logger* logger,
     const ProgramInfo& info,
-    const std::string& title,
-    const std::vector<std::pair<std::string, std::string>>& messages,
-    const std::string& file
+    EventNotificationOption& notif_settings,
+    ErrorReportMode error_report_mode,
+    const std::string& message,
+    std::string error_type,
+    const ImageViewRGB32& image = ImageViewRGB32(),
+    const StreamHistorySession* stream_history = nullptr
 );
 
 
+
 }
 #endif
diff --git a/SerialPrograms/Source/CommonFramework/Notifications/SenderNotificationTable.cpp b/SerialPrograms/Source/CommonFramework/Notifications/SenderNotificationTable.cpp
index c556a668bd..a78d74be47 100644
--- a/SerialPrograms/Source/CommonFramework/Notifications/SenderNotificationTable.cpp
+++ b/SerialPrograms/Source/CommonFramework/Notifications/SenderNotificationTable.cpp
@@ -1,10 +1,9 @@
 /*  Sender Notification Table
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include "SenderNotificationTable.h"
 
 namespace PokemonAutomation{
 
diff --git a/SerialPrograms/Source/CommonFramework/Notifications/SenderNotificationTable.h b/SerialPrograms/Source/CommonFramework/Notifications/SenderNotificationTable.h
index 089ff930d0..b3a1fb824c 100644
--- a/SerialPrograms/Source/CommonFramework/Notifications/SenderNotificationTable.h
+++ b/SerialPrograms/Source/CommonFramework/Notifications/SenderNotificationTable.h
@@ -1,6 +1,6 @@
 /*  Sender Notification Table
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -10,8 +10,6 @@
 #include <vector>
 #include <map>
 #include "Common/Cpp/Options/ConfigOption.h"
-#include "Common/Qt/AutoHeightTable.h"
-
 namespace PokemonAutomation{
 
 
diff --git a/SerialPrograms/Source/CommonFramework/OCR/OCR_DictionaryMatcher.cpp b/SerialPrograms/Source/CommonFramework/OCR/OCR_DictionaryMatcher.cpp
deleted file mode 100644
index 476080987c..0000000000
--- a/SerialPrograms/Source/CommonFramework/OCR/OCR_DictionaryMatcher.cpp
+++ /dev/null
@@ -1,65 +0,0 @@
-/*  Dictionary Matcher
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Cpp/Exceptions.h"
-#include "OCR_DictionaryMatcher.h"
-
-namespace PokemonAutomation{
-namespace OCR{
-
-
-const DictionaryOCR& DictionaryMatcher::dictionary(Language language) const{
-    auto iter = m_database.find(language);
-    if (iter == m_database.end()){
-        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Language not loaded.");
-    }
-    return iter->second;
-}
-DictionaryOCR& DictionaryMatcher::dictionary(Language language){
-    SpinLockGuard lg(m_lock, "LargeDictionaryMatcher::dictionary()");
-    auto iter = m_database.find(language);
-    if (iter == m_database.end()){
-        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Language not loaded.");
-    }
-    return iter->second;
-}
-
-
-StringMatchResult DictionaryMatcher::match_substring(
-    Language language,
-    const std::string& text,
-    double log10p_spread
-) const{
-    return dictionary(language).match_substring(text, log10p_spread);
-}
-
-OCR::StringMatchResult DictionaryMatcher::match_substring_from_image_multifiltered(
-    Logger* logger,
-    Language language,
-    const ImageViewRGB32& image,
-    const std::vector<OCR::TextColorRange>& text_color_ranges,
-    double max_log10p, double log10p_spread,
-    double min_text_ratio, double max_text_ratio
-) const{
-    OCR::StringMatchResult ret = OCR::multifiltered_OCR(
-        language, *this, image,
-        text_color_ranges,
-        log10p_spread, min_text_ratio, max_text_ratio
-    );
-    if (logger){
-        ret.log(*logger, max_log10p);
-    }
-    ret.clear_beyond_log10p(max_log10p);
-    return ret;
-}
-
-void DictionaryMatcher::add_candidate(Language language, std::string token, const std::u32string& candidate){
-    dictionary(language).add_candidate(std::move(token), candidate);
-}
-
-
-}
-}
diff --git a/SerialPrograms/Source/CommonFramework/OCR/OCR_DictionaryMatcher.h b/SerialPrograms/Source/CommonFramework/OCR/OCR_DictionaryMatcher.h
deleted file mode 100644
index 5cd34d605f..0000000000
--- a/SerialPrograms/Source/CommonFramework/OCR/OCR_DictionaryMatcher.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*  Dictionary Matcher
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_OCR_DictionaryMatcher_H
-#define PokemonAutomation_OCR_DictionaryMatcher_H
-
-#include <map>
-#include "Common/Cpp/Concurrency/SpinLock.h"
-#include "CommonFramework/Language.h"
-#include "OCR_Routines.h"
-#include "OCR_DictionaryOCR.h"
-
-namespace PokemonAutomation{
-    class ImageViewRGB32;
-namespace OCR{
-
-// Base class for an OCR matcher. It matches a sub-string from a dictionary.
-// The construction of the dictionary is left to the derived class.
-class DictionaryMatcher{
-public:
-    const LanguageSet& languages() const{ return m_languages; }
-
-
-public:
-    const DictionaryOCR& dictionary(Language language) const;
-
-
-    StringMatchResult match_substring(
-        Language language,
-        const std::string& text, double log10p_spread = 0.50
-    ) const;
-
-    // Match a substring from `image`.
-    // text_color_ranges: the function will try multiple attempts of separating
-    //   text color and background color, and do OCR on the text with background color
-    //   removed. The text color range of attempt is specified by each element in
-    //   `text_color_ranges`.
-    // max_log10p: Threshold for finding any valid match.
-    //   The raw OCR result gives a probability for each dictionary key. The probility p
-    //   is that if this key is matched by accident. The lower this value, the closer
-    //   the match. Apply log10() to it to get log10p.
-    //   If all keys' log10p is above this `max_log10p`, there will be no match.
-    // log10p_spread: threshold for considering ambiguous match.
-    //   It specifies the minimum separation between the best candidate and
-    //   2nd best candidate's log10p for it to not be considered ambiguous.
-    // min/max_text_ratio: min/max_text_ratio is the range where the ratio of text color
-    //   pixel count to background color pixel count must fall into before the matcher
-    // even attempts to OCR. This is useful for pruning images with no appearant texts to
-    //   reduce expensive OCR computation.
-    OCR::StringMatchResult match_substring_from_image_multifiltered(
-        Logger* logger,
-        Language language,
-        const ImageViewRGB32& image,
-        const std::vector<OCR::TextColorRange>& text_color_ranges,
-        double max_log10p, double log10p_spread = 0.5,
-        double min_text_ratio = 0.01, double max_text_ratio = 0.50
-    ) const;
-
-
-public:
-    //  These functions are thread-safe with themselves, but not with any other
-    //  functions in this class.
-    DictionaryOCR& dictionary(Language language);
-    void add_candidate(Language language, std::string token, const std::u32string& candidate);
-
-
-protected:
-    LanguageSet m_languages;
-    std::map<Language, DictionaryOCR> m_database;
-    SpinLock m_lock;
-};
-
-
-}
-}
-#endif
diff --git a/SerialPrograms/Source/CommonFramework/OCR/OCR_NumberReader.cpp b/SerialPrograms/Source/CommonFramework/OCR/OCR_NumberReader.cpp
deleted file mode 100644
index bff8cc2f30..0000000000
--- a/SerialPrograms/Source/CommonFramework/OCR/OCR_NumberReader.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-/*  OCR Number Reader
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <map>
-#include "CommonFramework/Language.h"
-#include "OCR_RawOCR.h"
-#include "OCR_NumberReader.h"
-
-// #include <iostream>
-// using std::cout;
-// using std::endl;
-
-namespace PokemonAutomation{
-namespace OCR{
-
-
-
-int read_number(Logger& logger, const ImageViewRGB32& image){
-    static const std::map<char, char> SUBSTITUTION_TABLE{
-        {'0', '0'},
-        {'1', '1'},
-        {'2', '2'},
-        {'3', '3'},
-        {'4', '4'},
-        {'5', '5'},
-        {'6', '6'},
-        {'7', '7'},
-        {'8', '8'},
-        {'9', '9'},
-
-        //  Common misreads.
-        {'A', '4'},
-        {'a', '4'},
-        {'S', '5'},
-        {'s', '5'},
-    };
-
-    std::string ocr_text = OCR::ocr_read(Language::English, image);
-    std::string normalized;
-    bool has_digit = false;
-    for (char ch : ocr_text){
-        auto iter = SUBSTITUTION_TABLE.find(ch);
-        if (iter == SUBSTITUTION_TABLE.end()){
-            continue;
-        }
-        normalized += iter->second;
-        has_digit = true;
-    }
-
-    std::string str;
-    for (char ch : ocr_text){
-        if (ch != '\r' && ch != '\n'){
-            str += ch;
-        }
-    }
-
-    if (!has_digit){
-        logger.log("OCR Text: \"" + str + "\" -> \"" + normalized + "\" -> Unable to read.", COLOR_RED);
-        return -1;
-    }
-
-    int number = std::atoi(normalized.c_str());
-    logger.log("OCR Text: \"" + str + "\" -> \"" + normalized + "\" -> " + std::to_string(number));
-
-    return number;
-}
-
-
-
-}
-}
diff --git a/SerialPrograms/Source/CommonFramework/OCR/OCR_NumberReader.h b/SerialPrograms/Source/CommonFramework/OCR/OCR_NumberReader.h
deleted file mode 100644
index 41a2c85254..0000000000
--- a/SerialPrograms/Source/CommonFramework/OCR/OCR_NumberReader.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*  OCR Number Reader
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_OCR_NumberReader_H
-#define PokemonAutomation_OCR_NumberReader_H
-
-#include "CommonFramework/Logging/Logger.h"
-
-namespace PokemonAutomation{
-    class ImageViewRGB32;
-namespace OCR{
-
-
-//  Returns -1 if no number is found.
-int read_number(Logger& logger, const ImageViewRGB32& image);
-
-
-}
-}
-#endif
diff --git a/SerialPrograms/Source/CommonFramework/OCR/OCR_RawOCR.cpp b/SerialPrograms/Source/CommonFramework/OCR/OCR_RawOCR.cpp
deleted file mode 100644
index 49a6941739..0000000000
--- a/SerialPrograms/Source/CommonFramework/OCR/OCR_RawOCR.cpp
+++ /dev/null
@@ -1,197 +0,0 @@
-/*  Raw Text Recognition
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <memory>
-#include <deque>
-#include <QFile>
-#include <QDir>
-#include "3rdParty/TesseractPA/TesseractPA.h"
-#include "Common/Cpp/Exceptions.h"
-#include "Common/Cpp/Concurrency/SpinLock.h"
-#include "CommonFramework/Globals.h"
-#include "CommonFramework/Logging/Logger.h"
-#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
-#include "OCR_RawOCR.h"
-
-#include <iostream>
-using std::cout;
-using std::endl;
-
-namespace PokemonAutomation{
-namespace OCR{
-
-
-
-
-bool language_available(Language language){
-    std::string path = RESOURCE_PATH();
-    path += "Tesseract/";
-    path += language_data(language).code;
-    path += ".traineddata";
-    QFile file(QString::fromStdString(path));
-    return file.exists();
-}
-
-
-
-class TesseractPool{
-public:
-    TesseractPool(Language language)
-        : m_language_code(language_data(language).code)
-        , m_training_data_path(
-            QDir::current().relativeFilePath(QString::fromStdString(RESOURCE_PATH() + "Tesseract/")).toStdString()
-        )
-    {}
-
-    std::string run(const ImageViewRGB32& image){
-        TesseractAPI* instance;
-        while (true){
-            {
-                SpinLockGuard lg(m_lock, "TesseractPool::run()");
-                if (!m_idle.empty()){
-                    instance = m_idle.back();
-                    m_idle.pop_back();
-                    break;
-                }
-            }
-            add_instance();
-        }
-
-//        auto start = current_time();
-        TesseractString str = instance->read32(
-            (const unsigned char*)image.data(),
-            image.width(),
-            image.height(),
-            image.bytes_per_row()
-        );
-//        auto end = current_time();
-//        cout << std::chrono::duration_cast<std::chrono::milliseconds>(end - start).count() << endl;
-
-        {
-            SpinLockGuard lg(m_lock, "TesseractPool::run()");
-            m_idle.emplace_back(instance);
-        }
-
-        return str.c_str() == nullptr
-            ? std::string()
-            : str.c_str();
-    }
-
-    void add_instance(){
-        //  Check for non-ascii characters in path.
-        for (char ch : m_training_data_path){
-            if (ch < 0){
-                throw InternalSystemError(
-                    nullptr, PA_CURRENT_FUNCTION,
-                    "Detected non-ASCII character in Tesseract path. Please move the program to a path with only ASCII characters."
-                );
-            }
-        }
-
-        global_logger_tagged().log(
-            "Initializing TesseractAPI (" + m_language_code + "): " + m_training_data_path
-        );
-        std::unique_ptr<TesseractAPI> api(
-            new TesseractAPI(m_training_data_path.c_str(), m_language_code.c_str())
-        );
-        if (!api->valid()){
-            throw InternalSystemError(nullptr, PA_CURRENT_FUNCTION, "Could not initialize TesseractAPI.");
-        }
-
-        SpinLockGuard lg(m_lock, "TesseractPool::run()");
-
-        m_instances.emplace_back(std::move(api));
-        try{
-            m_idle.emplace_back(m_instances.back().get());
-        }catch (...){
-            m_instances.pop_back();
-            throw;
-        }
-    }
-
-    void ensure_instances(size_t instances){
-        size_t current_instances;
-        while (true){
-            {
-                SpinLockGuard lg(m_lock, "TesseractPool::run()");
-                current_instances = m_instances.size();
-            }
-            if (current_instances >= instances){
-                break;
-            }
-            add_instance();
-        }
-    }
-
-#ifdef __APPLE__
-#ifdef UNIX_LINK_TESSERACT
-    ~TesseractPool(){
-        // As of Feb 05, 2022, the newest Tesseract (5.0.1) installed by HomeBrew on macOS
-        // has a bug that will crash the program when deleting internal Tesseract API intances,
-        // giving error: 
-        // libc++abi.dylib: terminating with uncaught exception of type std::__1::system_error: mutex lock failed: Invalid argument
-        // A similar issue is posted on Tesseract Github: https://github.com/tesseract-ocr/tesseract/issues/3655
-        // There is no way of using HomeBrew to reinstall the older version.
-        // Fortunately this class TesseractPool will not get built and destroyed repeatedly in
-        // runtime. It will only get initialized once for each supported language. So I am able
-        // to use this ugly workaround by not deleting the Tesseract API intances.
-        std::cout << "Warning: not release Tesseract API istance due to mutex bug similar to https://github.com/tesseract-ocr/tesseract/issues/3655" << std::endl;
-        for(auto& api : m_instances){
-            api.release();
-        }
-    }
-#endif
-#endif
-
-private:
-    const std::string& m_language_code;
-    const std::string m_training_data_path;
-
-    SpinLock m_lock;
-    std::vector<std::unique_ptr<TesseractAPI>> m_instances;
-    std::vector<TesseractAPI*> m_idle;
-};
-
-SpinLock ocr_pool_lock;
-std::map<Language, TesseractPool> ocr_pool;
-
-
-std::string ocr_read(Language language, const ImageViewRGB32& image){
-//    static size_t c = 0;
-//    image.save("test-" + QString::number(c++) + ".png");
-
-    std::map<Language, TesseractPool>::iterator iter;
-    {
-        SpinLockGuard lg(ocr_pool_lock, "ocr_read()");
-        iter = ocr_pool.find(language);
-        if (iter == ocr_pool.end()){
-            iter = ocr_pool.emplace(language, language).first;
-        }
-    }
-    return iter->second.run(image);
-}
-void ensure_instances(Language language, size_t instances){
-    std::map<Language, TesseractPool>::iterator iter;
-    {
-        SpinLockGuard lg(ocr_pool_lock, "ocr_read()");
-        iter = ocr_pool.find(language);
-        if (iter == ocr_pool.end()){
-            iter = ocr_pool.emplace(language, language).first;
-        }
-    }
-    iter->second.ensure_instances(instances);
-}
-
-
-
-
-
-}
-}
-
-
-
-
diff --git a/SerialPrograms/Source/CommonFramework/OCR/OCR_RawOCR.h b/SerialPrograms/Source/CommonFramework/OCR/OCR_RawOCR.h
deleted file mode 100644
index 2c597fc577..0000000000
--- a/SerialPrograms/Source/CommonFramework/OCR/OCR_RawOCR.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*  Raw Text Recognition
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_OCR_RawOCR_H
-#define PokemonAutomation_OCR_RawOCR_H
-
-#include <string>
-#include "CommonFramework/Language.h"
-
-namespace PokemonAutomation{
-    class ImageViewRGB32;
-namespace OCR{
-
-
-bool language_available(Language language);
-
-
-//  OCR the image in the specified language.
-std::string ocr_read(Language language, const ImageViewRGB32& image);
-
-//  Ensure that there are this many parallel instances for this language.
-//  Call this if you expect to need to do many OCR instances in parallel and you
-//  want to preload the OCR instances.
-void ensure_instances(Language language, size_t instances);
-
-
-}
-}
-#endif
diff --git a/SerialPrograms/Source/CommonFramework/OCR/OCR_Routines.cpp b/SerialPrograms/Source/CommonFramework/OCR/OCR_Routines.cpp
deleted file mode 100644
index 6987817deb..0000000000
--- a/SerialPrograms/Source/CommonFramework/OCR/OCR_Routines.cpp
+++ /dev/null
@@ -1,117 +0,0 @@
-/*  OCR Routines
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/ImageTypes/ImageRGB32.h"
-#include "CommonFramework/ImageTools/ImageFilter.h"
-#include "OCR_RawOCR.h"
-#include "OCR_DictionaryMatcher.h"
-#include "OCR_Routines.h"
-
-namespace PokemonAutomation{
-namespace OCR{
-
-
-StringMatchResult multifiltered_OCR(
-    Language language, const DictionaryMatcher& dictionary, const ImageViewRGB32& image,
-    const std::vector<TextColorRange>& text_color_ranges,
-    double log10p_spread,
-    double min_text_ratio, double max_text_ratio
-){
-    if (image.width() == 0 || image.height() == 0){
-        return StringMatchResult();
-    }
-
-    std::vector<BlackWhiteRgb32Range> bw_filters;
-    for (const auto& range : text_color_ranges){
-        bw_filters.emplace_back(BlackWhiteRgb32Range{range.mins, range.maxs, true});
-    }
-    std::vector<std::pair<ImageRGB32, size_t>> filtered_images = to_blackwhite_rgb32_range(image, bw_filters);
-
-    double pixels_inv = 1. / (image.width() * image.height());
-
-    //  Run all the filters.
-    StringMatchResult ret;
-//    int c = 0;
-    for (const auto& filtered : filtered_images){
-        std::string text = ocr_read(language, filtered.first);
-//        cout << text.toStdString() << endl;
-//        filtered.first.save("test" + QString::number(c++) + ".png");
-
-        //  Compute ratio of image that matches text color. Skip if it's out of range.
-        double ratio = filtered.second * pixels_inv;
-//        cout << "ratio = " << ratio << endl;
-        if (ratio < min_text_ratio || ratio > max_text_ratio){
-            continue;
-        }
-
-        StringMatchResult current = dictionary.match_substring(language, text, log10p_spread);
-        ret.exact_match |= current.exact_match;
-        ret.results.insert(current.results.begin(), current.results.end());
-    }
-
-//    ret.log(global_logger_tagged(), -1.5);
-
-    //  Prune duplicates.
-    std::set<std::string> tokens;
-    for (auto iter = ret.results.begin(); iter != ret.results.end();){
-        if (tokens.find(iter->second.token) == tokens.end()){
-            tokens.insert(iter->second.token);
-            ++iter;
-        }else{
-            iter = ret.results.erase(iter);
-        }
-    }
-
-    ret.clear_beyond_spread(log10p_spread);
-    return ret;
-}
-
-
-
-const std::vector<TextColorRange>& BLACK_TEXT_FILTERS(){
-    static std::vector<TextColorRange> filters{
-        {0xff000000, 0xff404040},
-        {0xff000000, 0xff606060},
-        {0xff000000, 0xff808080},
-    };
-    return filters;
-}
-const std::vector<TextColorRange>& WHITE_TEXT_FILTERS(){
-    static std::vector<TextColorRange> filters{
-        {0xff808080, 0xffffffff},
-        {0xffa0a0a0, 0xffffffff},
-        {0xffc0c0c0, 0xffffffff},
-    };
-    return filters;
-}
-const std::vector<TextColorRange>& BLACK_OR_WHITE_TEXT_FILTERS(){
-    static std::vector<TextColorRange> filters{
-        {0xff000000, 0xff404040},
-        {0xff000000, 0xff606060},
-        {0xff000000, 0xff808080},
-        {0xff808080, 0xffffffff},
-        {0xffa0a0a0, 0xffffffff},
-    };
-    return filters;
-}
-const std::vector<TextColorRange>& BLUE_TEXT_FILTERS() {
-    static std::vector<TextColorRange> filters{
-        {0xFF3287A2, 0xFFA7F4FF},
-        {0xFF2283A2, 0xFF8EF1FF},
-        {0xFF428BA2, 0xFFC1F7FF},
-    };
-    return filters;
-}
-
-
-
-
-
-
-
-
-}
-}
diff --git a/SerialPrograms/Source/CommonFramework/OCR/OCR_Routines.h b/SerialPrograms/Source/CommonFramework/OCR/OCR_Routines.h
deleted file mode 100644
index 9fa65e4f5e..0000000000
--- a/SerialPrograms/Source/CommonFramework/OCR/OCR_Routines.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*  OCR Routines
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_OCR_Routines_H
-#define PokemonAutomation_OCR_Routines_H
-
-#include <vector>
-#include "CommonFramework/Language.h"
-
-namespace PokemonAutomation{
-    class ImageViewRGB32;
-namespace OCR{
-
-struct StringMatchResult;
-class DictionaryMatcher;
-
-
-
-struct TextColorRange{
-    uint32_t mins;
-    uint32_t maxs;
-
-    TextColorRange(uint32_t p_mins, uint32_t p_maxs)
-        : mins(p_mins)
-        , maxs(p_maxs)
-    {}
-};
-
-
-StringMatchResult multifiltered_OCR(
-    Language language, const DictionaryMatcher& dictionary, const ImageViewRGB32& image,
-    const std::vector<TextColorRange>& text_color_ranges,
-    double log10p_spread,
-    double min_text_ratio = 0.01, double max_text_ratio = 0.50
-);
-
-
-const std::vector<TextColorRange>& BLACK_TEXT_FILTERS();
-const std::vector<TextColorRange>& WHITE_TEXT_FILTERS();
-const std::vector<TextColorRange>& BLACK_OR_WHITE_TEXT_FILTERS();
-const std::vector<TextColorRange>& BLUE_TEXT_FILTERS();
-
-
-
-}
-}
-#endif
diff --git a/SerialPrograms/Source/CommonFramework/OCR/OCR_SmallDictionaryMatcher.cpp b/SerialPrograms/Source/CommonFramework/OCR/OCR_SmallDictionaryMatcher.cpp
deleted file mode 100644
index 403b510666..0000000000
--- a/SerialPrograms/Source/CommonFramework/OCR/OCR_SmallDictionaryMatcher.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-/*  Small Database Matcher
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <QtGlobal>
-#include "Common/Cpp/Json/JsonValue.h"
-#include "Common/Cpp/Json/JsonObject.h"
-#include "CommonFramework/Globals.h"
-#include "OCR_StringNormalization.h"
-#include "OCR_TextMatcher.h"
-#include "OCR_SmallDictionaryMatcher.h"
-
-namespace PokemonAutomation{
-namespace OCR{
-
-
-
-SmallDictionaryMatcher::SmallDictionaryMatcher(const std::string& json_path, bool first_only)
-    : SmallDictionaryMatcher(
-        load_json_file(RESOURCE_PATH() + json_path).get_object_throw(),
-        first_only
-    )
-{}
-SmallDictionaryMatcher::SmallDictionaryMatcher(const JsonObject& json, bool first_only){
-    for (const auto& item : json){
-        Language language = language_code_to_enum(item.first);
-        const LanguageData& data = language_data(language);
-        m_database.emplace(
-            std::piecewise_construct,
-            std::forward_as_tuple(language),
-            std::forward_as_tuple(item.second.get_object_throw(), nullptr, data.random_match_chance, first_only)
-        );
-        m_languages += language;
-    }
-}
-
-
-void SmallDictionaryMatcher::save(const std::string& json_path) const{
-    JsonObject root;
-    for (const auto& item : m_database){
-        root[language_data(item.first).code] = item.second.to_json();
-    }
-    root.dump(json_path);
-}
-
-
-
-}
-}
diff --git a/SerialPrograms/Source/CommonFramework/OCR/OCR_StringMatchResult.h b/SerialPrograms/Source/CommonFramework/OCR/OCR_StringMatchResult.h
deleted file mode 100644
index 1fb53d1d6a..0000000000
--- a/SerialPrograms/Source/CommonFramework/OCR/OCR_StringMatchResult.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*  String Match Results
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_OCR_StringMatchResult_H
-#define PokemonAutomation_OCR_StringMatchResult_H
-
-#include <string>
-#include <vector>
-#include <set>
-#include <map>
-#include "CommonFramework/Logging/Logger.h"
-
-namespace PokemonAutomation{
-namespace OCR{
-
-
-struct StringMatchData{
-    std::string original_text;
-    std::u32string normalized_text;
-
-    std::u32string target;
-    std::string token;
-
-    std::string to_str() const;
-};
-
-struct StringMatchResult{
-    bool exact_match = false;
-    std::multimap<double, StringMatchData> results;
-
-    void clear(){
-        exact_match = false;
-        results.clear();
-    }
-    void log(Logger& logger, double max_log10p, const std::string& extra = std::string()) const;
-
-    void add(double log10p, StringMatchData data);
-    void clear_beyond_spread(double log10p_spread);
-    void clear_beyond_log10p(double max_log10p);
-};
-
-
-
-
-}
-}
-#endif
diff --git a/SerialPrograms/Source/CommonFramework/OCR/OCR_StringNormalization.cpp b/SerialPrograms/Source/CommonFramework/OCR/OCR_StringNormalization.cpp
deleted file mode 100644
index b621ebc786..0000000000
--- a/SerialPrograms/Source/CommonFramework/OCR/OCR_StringNormalization.cpp
+++ /dev/null
@@ -1,93 +0,0 @@
-/*  String Normalization
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <map>
-#include <QString>
-#include "Common/Cpp/Exceptions.h"
-#include "Common/Cpp/Json/JsonValue.h"
-#include "Common/Cpp/Json/JsonObject.h"
-#include "Common/Qt/StringToolsQt.h"
-#include "CommonFramework/Globals.h"
-#include "OCR_StringNormalization.h"
-
-namespace PokemonAutomation{
-namespace OCR{
-
-
-std::u32string normalize_utf32(const std::string& text){
-    QString qstr = QString::fromStdString(text);
-    qstr = qstr.normalized(QString::NormalizationForm_KD);
-    std::u32string u32 = remove_non_alphanumeric(qstr.toStdU32String());
-    u32 = run_character_reductions(u32);
-    to_lower(u32);
-    return u32;
-}
-
-
-
-std::u32string remove_non_alphanumeric(const std::u32string& text){
-    std::u32string str;
-    for (char32_t ch : text){
-        if (QChar::isLetterOrNumber(ch)){
-            str += ch;
-            continue;
-        }
-    }
-    return str;
-}
-
-
-
-std::map<char32_t, std::u32string> make_substitution_map32(){
-    std::string path = RESOURCE_PATH() + "Tesseract/CharacterReductions.json";
-    JsonValue json = load_json_file(path);
-    JsonObject& obj = json.get_object_throw(path);
-
-    std::map<char32_t, std::u32string> map;
-    for (auto& item : obj){
-        const std::string& target = item.first;
-        std::string& sources = item.second.get_string_throw(path);
-        for (char32_t ch : to_utf32(sources)){
-            auto iter = map.find(ch);
-            if (iter != map.end()){
-                throw FileException(
-                    nullptr, PA_CURRENT_FUNCTION,
-                    to_utf8(to_utf32("Duplicate character reduction: ") + ch),
-                    std::move(path)
-                );
-            }
-            map[ch] = to_utf32(target);
-        }
-    }
-    return map;
-}
-const std::map<char32_t, std::u32string>& SUBSTITUTION_MAP32(){
-    static std::map<char32_t, std::u32string> map = make_substitution_map32();
-    return map;
-}
-std::u32string run_character_reductions(const std::u32string& text){
-    const std::map<char32_t, std::u32string>& map = SUBSTITUTION_MAP32();
-    std::u32string str;
-    for (char32_t ch : text){
-        auto iter = map.find(ch);
-        if (iter == map.end()){
-            str += ch;
-        }else{
-            str += iter->second;
-        }
-    }
-    return str;
-}
-
-
-
-
-
-
-
-}
-}
-
diff --git a/SerialPrograms/Source/CommonFramework/OCR/OCR_StringNormalization.h b/SerialPrograms/Source/CommonFramework/OCR/OCR_StringNormalization.h
deleted file mode 100644
index c0f60c28c8..0000000000
--- a/SerialPrograms/Source/CommonFramework/OCR/OCR_StringNormalization.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*  String Normalization
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_OCR_StringNormalization_H
-#define PokemonAutomation_OCR_StringNormalization_H
-
-#include <string>
-
-namespace PokemonAutomation{
-namespace OCR{
-
-
-std::u32string remove_non_alphanumeric(const std::u32string& text);
-std::u32string run_character_reductions(const std::u32string& text);
-
-std::u32string normalize_utf32(const std::string& text);
-
-
-
-}
-}
-#endif
diff --git a/SerialPrograms/Source/CommonFramework/OCR/OCR_TextMatcher.cpp b/SerialPrograms/Source/CommonFramework/OCR/OCR_TextMatcher.cpp
deleted file mode 100644
index bcfc675a80..0000000000
--- a/SerialPrograms/Source/CommonFramework/OCR/OCR_TextMatcher.cpp
+++ /dev/null
@@ -1,311 +0,0 @@
-/*  Text Inference Tools
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <cmath>
-#include <vector>
-#include "Common/Cpp/Exceptions.h"
-#include "Common/Cpp/Concurrency/SpinLock.h"
-#include "Common/Qt/StringToolsQt.h"
-#include "OCR_StringNormalization.h"
-#include "OCR_TextMatcher.h"
-
-#include <iostream>
-using std::cout;
-using std::endl;
-
-namespace PokemonAutomation{
-namespace OCR{
-
-void print(const std::vector<size_t>& v){
-    std::string str = "{";
-    bool first = true;
-    for (size_t x : v){
-        if (!first){
-            str += ", ";
-        }
-        first = false;
-        str += std::to_string(x);
-    }
-    str += "}";
-    cout << str << endl;
-}
-
-
-size_t levenshtein_distance(const QString& x, const QString& y){
-    size_t xlen = x.size();
-    size_t ylen = y.size();
-
-    std::vector<size_t> v0(ylen + 1);
-    std::vector<size_t> v1(ylen + 1);
-
-    for (size_t i = 0; i <= ylen; i++){
-        v0[i] = i;
-    }
-
-    for (size_t i = 0; i < xlen; i++){
-        v1[0] = i + 1;
-
-        for (size_t j = 0; j < ylen; j++){
-            size_t delete_cost = v0[j + 1] + 1;
-            size_t insert_cost = v1[j] + 1;
-            size_t sub_cost = v0[j];
-            if (x[(int)i] != y[(int)j]){
-                sub_cost += 1;
-            }
-            v1[j + 1] = std::min({delete_cost, insert_cost, sub_cost});
-        }
-
-        std::swap(v0, v1);
-    }
-
-    return v0[ylen];
-}
-size_t levenshtein_distance_substring(const QString& substring, const QString& fullstring){
-    size_t xlen = fullstring.size();
-    size_t ylen = substring.size();
-
-    std::vector<size_t> v0(ylen + 1);
-    std::vector<size_t> v1(ylen + 1);
-
-    for (size_t i = 0; i <= ylen; i++){
-        v0[i] = i;
-    }
-//    print(v0);
-
-    size_t min = ylen;
-
-    for (size_t i = 0; i < xlen; i++){
-        v1[0] = 0;
-
-        for (size_t j = 0; j < ylen; j++){
-            size_t delete_cost = v0[j + 1] + 1;
-            size_t insert_cost = v1[j] + 1;
-            size_t sub_cost = v0[j];
-            if (fullstring[(int)i] != substring[(int)j]){
-                sub_cost += 1;
-            }
-            v1[j + 1] = std::min({delete_cost, insert_cost, sub_cost});
-        }
-
-        std::swap(v0, v1);
-
-        min = std::min(min, v0[ylen]);
-//        print(v0);
-    }
-
-    return min;
-}
-
-template <typename StringType>
-size_t levenshtein_distance(const StringType& x, const StringType& y){
-    size_t xlen = x.size();
-    size_t ylen = y.size();
-
-    std::vector<size_t> v0(ylen + 1);
-    std::vector<size_t> v1(ylen + 1);
-
-    for (size_t i = 0; i <= ylen; i++){
-        v0[i] = i;
-    }
-
-    for (size_t i = 0; i < xlen; i++){
-        v1[0] = i + 1;
-
-        for (size_t j = 0; j < ylen; j++){
-            size_t delete_cost = v0[j + 1] + 1;
-            size_t insert_cost = v1[j] + 1;
-            size_t sub_cost = v0[j];
-            if (x[i] != y[j]){
-                sub_cost += 1;
-            }
-            v1[j + 1] = std::min({delete_cost, insert_cost, sub_cost});
-        }
-
-        std::swap(v0, v1);
-    }
-
-    return v0[ylen];
-}
-template <typename StringType>
-size_t levenshtein_distance_substring(const StringType& substring, const StringType& fullstring){
-    size_t xlen = fullstring.size();
-    size_t ylen = substring.size();
-
-    std::vector<size_t> v0(ylen + 1);
-    std::vector<size_t> v1(ylen + 1);
-
-    for (size_t i = 0; i <= ylen; i++){
-        v0[i] = i;
-    }
-//    print(v0);
-
-    size_t min = ylen;
-
-    for (size_t i = 0; i < xlen; i++){
-        v1[0] = 0;
-
-        for (size_t j = 0; j < ylen; j++){
-            size_t delete_cost = v0[j + 1] + 1;
-            size_t insert_cost = v1[j] + 1;
-            size_t sub_cost = v0[j];
-            if (fullstring[i] != substring[j]){
-                sub_cost += 1;
-            }
-            v1[j + 1] = std::min({delete_cost, insert_cost, sub_cost});
-        }
-
-        std::swap(v0, v1);
-
-        min = std::min(min, v0[ylen]);
-//        print(v0);
-    }
-
-    return min;
-}
-template size_t levenshtein_distance<std::u32string>(const std::u32string& x, const std::u32string& y);
-template size_t levenshtein_distance_substring<std::u32string>(const std::u32string& x, const std::u32string& y);
-
-
-std::map<size_t, std::vector<uint64_t>> binomial_table;
-SpinLock binomial_lock;
-std::vector<uint64_t> binomial_row_u64(size_t degree){
-    std::vector<uint64_t> row;
-
-    uint64_t a = (uint64_t)degree;
-    uint64_t b = 1;
-    {
-        row.emplace_back(1);
-    }
-    {
-        row.emplace_back(a);
-        a--;
-        b++;
-    }
-    while (a > b){
-        row.emplace_back(row.back() * a / b);
-        a--;
-        b++;
-    }
-
-    return row;
-}
-uint64_t binomial_coefficient_u64(size_t degree, size_t index){
-    if (degree > 62){
-        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Cannot go beyond degree 62.");
-    }
-
-    SpinLockGuard lg(binomial_lock, "binomial_coefficient_u64()");
-
-    auto iter = binomial_table.find(degree);
-    std::vector<uint64_t>& row = iter != binomial_table.end()
-        ? iter->second
-        : binomial_table[degree] = binomial_row_u64(degree);
-
-    if (index > degree / 2){
-        index = degree - index;
-    }
-
-    return row[index];
-}
-
-
-double random_match_probability(size_t total, size_t matched, double random_match_chance){
-    if (total > 62){
-        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Cannot go beyond degree 62.");
-    }
-
-    double c_match = 1 - random_match_chance;
-
-    double misses[62];
-    {
-        double miss = 1;
-        misses[0] = miss;
-        for (size_t c = 1; c <= total - matched; c++){
-            miss *= c_match;
-            misses[c] = miss;
-        }
-    }
-
-    double hits = 1;
-
-    size_t m = 0;
-    for (; m < matched; m++){
-        hits *= random_match_chance;
-    }
-
-    double probability = 0;
-    for (; m < total; m++){
-        double binomial = (double)binomial_coefficient_u64(total, m);
-        probability += hits * binomial * misses[total - m];
-        hits *= random_match_chance;
-    }
-    probability += hits;
-    return probability;
-}
-
-
-
-StringMatchResult match_substring(
-    const std::map<std::u32string, std::set<std::string>>& database, double random_match_chance,
-    const std::string& text, double log10p_spread
-){
-    StringMatchResult results;
-//    result.original_text = text;
-//    result.normalized_text = normalize(text);
-
-    std::u32string normalized = normalize_utf32(text);
-
-    //  Search for exact match of candidate.
-    auto iter = database.find(normalized);
-    if (iter != database.end()){
-        results.exact_match = true;
-        double probability = random_match_probability(normalized.size(), normalized.size(), random_match_chance);
-        double log10p = std::log10(probability);
-        for (const auto& target : iter->second){
-            results.add(
-                log10p,
-                StringMatchData{text, normalized, normalized, target}
-            );
-        }
-        return results;
-    }
-
-
-    for (const auto& item : database){
-        double token_length = item.first.size();
-
-        size_t distance = levenshtein_distance_substring(item.first, normalized);
-        size_t matched = token_length - distance;
-        if (matched == 0){
-            continue;
-        }
-
-        double probability = random_match_probability(token_length, matched, random_match_chance);
-        double log10p = std::log10(probability);
-
-        if (distance == 0){
-            results.exact_match = true;
-        }
-
-        for (const auto& slug : item.second){
-            results.add(log10p, StringMatchData{text, normalized, item.first, slug});
-            results.clear_beyond_spread(log10p_spread);
-        }
-    }
-
-    return results;
-}
-
-
-
-
-
-
-
-
-}
-}
-
diff --git a/SerialPrograms/Source/CommonFramework/OCR/OCR_TextMatcher.h b/SerialPrograms/Source/CommonFramework/OCR/OCR_TextMatcher.h
deleted file mode 100644
index 0348234112..0000000000
--- a/SerialPrograms/Source/CommonFramework/OCR/OCR_TextMatcher.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*  Text Matcher
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_OCR_TextMatcher_H
-#define PokemonAutomation_OCR_TextMatcher_H
-
-#include <string>
-#include <vector>
-#include <set>
-#include <map>
-#include <QString>
-#include "CommonFramework/Logging/Logger.h"
-#include "OCR_StringMatchResult.h"
-
-namespace PokemonAutomation{
-namespace OCR{
-
-
-size_t levenshtein_distance(const QString& x, const QString& y);
-size_t levenshtein_distance_substring(const QString& substring, const QString& fullstring);
-
-template <typename StringType>
-size_t levenshtein_distance(const StringType& x, const StringType& y);
-template <typename StringType>
-size_t levenshtein_distance_substring(const StringType& substring, const StringType& fullstring);
-
-//  Mathematically equivalent to:
-//      BinomialCDF[total, 1 - random_match_chance, total - matched]
-double random_match_probability(size_t total, size_t matched, double random_match_chance);
-
-
-
-StringMatchResult match_substring(
-    const std::map<std::u32string, std::set<std::string>>& database, double random_match_chance,
-    const std::string& text, double log10p_spread
-);
-
-
-
-
-}
-}
-#endif
diff --git a/SerialPrograms/Source/CommonFramework/Options/BoxOption.cpp b/SerialPrograms/Source/CommonFramework/Options/BoxOption.cpp
new file mode 100644
index 0000000000..6a0aebe2a4
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/Options/BoxOption.cpp
@@ -0,0 +1,105 @@
+/*  Box Option
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <vector>
+#include "Common/Cpp/Strings/StringTools.h"
+#include "BoxOption.h"
+
+namespace PokemonAutomation{
+
+
+BoxOption::~BoxOption(){
+    BOX_COORDINATES.remove_listener(*this);
+    HEIGHT.remove_listener(*this);
+    WIDTH.remove_listener(*this);
+    Y.remove_listener(*this);
+    X.remove_listener(*this);
+}
+BoxOption::BoxOption(
+    std::string label,
+    LockMode lock_while_program_is_running,
+    EnableMode enable_mode,
+    bool show_restore_defaults_button,
+    ImageFloatBox box
+)
+    : GroupOption(
+        std::move(label),
+        lock_while_program_is_running,
+        enable_mode,
+        show_restore_defaults_button
+    )
+    , X("<b>X Coordinate:</b>", LockMode::UNLOCK_WHILE_RUNNING, box.x, 0.0, 1.0)
+    , Y("<b>Y Coordinate:</b>", LockMode::UNLOCK_WHILE_RUNNING, box.y, 0.0, 1.0)
+    , WIDTH("<b>Width:</b>", LockMode::UNLOCK_WHILE_RUNNING, box.width, 0.0, 1.0)
+    , HEIGHT("<b>Height:</b>", LockMode::UNLOCK_WHILE_RUNNING, box.height, 0.0, 1.0)
+    , BOX_COORDINATES(
+        false,
+        "ImageFloatBox coordinates",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        make_full_str(),
+        "0.3, 0.3, 0.4, 0.4"
+    )
+{
+    PA_ADD_OPTION(X);
+    PA_ADD_OPTION(Y);
+    PA_ADD_OPTION(WIDTH);
+    PA_ADD_OPTION(HEIGHT);
+    PA_ADD_OPTION(BOX_COORDINATES);
+
+    BoxOption::on_config_value_changed(&X);
+    X.add_listener(*this);
+    Y.add_listener(*this);
+    WIDTH.add_listener(*this);
+    HEIGHT.add_listener(*this);
+    BOX_COORDINATES.add_listener(*this);
+}
+
+void BoxOption::on_config_value_changed(void* object){
+    if (object == &X || object == &Y || object == &WIDTH || object == &HEIGHT){
+        BOX_COORDINATES.set(make_full_str());
+        report_value_changed(this);
+    }else if(object == &BOX_COORDINATES){
+        std::string box_coord_string = BOX_COORDINATES;
+        std::vector<std::string> all_coords = StringTools::split(box_coord_string, ", ");
+
+        double x_coord = 0.0;
+        double y_coord = 0.0;
+        double width_coord = 0.0;
+        double height_coord = 0.0;
+
+        double* targets[] = { &x_coord, &y_coord, &width_coord, &height_coord };
+        size_t limit = std::min(all_coords.size(), size_t(4));
+
+        for (size_t i = 0; i < limit; ++i){
+            const auto& s = all_coords[i];
+            char* endptr;
+            // Parses directly from the buffer without locale or exception overhead
+            double value = std::strtod(s.data(), &endptr);
+            
+            // Validate that at least some characters were parsed successfully
+            if (endptr != s.data()){
+                *targets[i] = value;
+            }
+        }
+
+        // cout << box_coord_string << endl;
+        // cout << std::to_string(x_coord) << endl;
+        // cout << std::to_string(y_coord) << endl;
+        // cout << std::to_string(width_coord) << endl;
+        // cout << std::to_string(height_coord) << endl;
+
+        X.set(x_coord);
+        Y.set(y_coord);
+        WIDTH.set(width_coord);
+        HEIGHT.set(height_coord);
+    }else{
+        report_value_changed(object);
+    }
+}
+
+
+
+}
diff --git a/SerialPrograms/Source/CommonFramework/Options/BoxOption.h b/SerialPrograms/Source/CommonFramework/Options/BoxOption.h
new file mode 100644
index 0000000000..eaf8120c04
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/Options/BoxOption.h
@@ -0,0 +1,59 @@
+/*  Box Option
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_BoxOption_H
+#define PokemonAutomation_BoxOption_H
+
+#include "Common/Cpp/PrettyPrint.h"
+#include "Common/Cpp/Options/GroupOption.h"
+#include "Common/Cpp/Options/FloatingPointOption.h"
+#include "Common/Cpp/Options/StringOption.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+
+namespace PokemonAutomation{
+
+
+class BoxOption : public GroupOption, public ConfigOption::Listener{
+public:
+    ~BoxOption();
+    BoxOption(
+        std::string label,
+        LockMode lock_while_program_is_running,
+        EnableMode enable_mode = EnableMode::ALWAYS_ENABLED,
+        bool show_restore_defaults_button = false,
+        ImageFloatBox box = {0.3, 0.3, 0.4, 0.4}
+    );
+
+    operator ImageFloatBox() const{
+        return {X, Y, WIDTH, HEIGHT};
+    }
+    ImageFloatBox inner_to_outer(const ImageFloatBox& inner_box) const{
+        return translate_to_parent(*this, inner_box);
+    }
+
+    virtual void on_config_value_changed(void* object) override;
+
+private:
+    std::string make_full_str() const{
+        return
+            tostr_fixed_no_trailing_zero(double(X), 6) + ", " +
+            tostr_fixed_no_trailing_zero(double(Y), 6) + ", " +
+            tostr_fixed_no_trailing_zero(double(WIDTH), 6) + ", " +
+            tostr_fixed_no_trailing_zero(double(HEIGHT), 6);
+    }
+
+public:
+    FloatingPointOption X;
+    FloatingPointOption Y;
+    FloatingPointOption WIDTH;
+    FloatingPointOption HEIGHT;
+    StringOption BOX_COORDINATES;
+};
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/Options/CheckForUpdatesOption.h b/SerialPrograms/Source/CommonFramework/Options/CheckForUpdatesOption.h
new file mode 100644
index 0000000000..b18ee97e99
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/Options/CheckForUpdatesOption.h
@@ -0,0 +1,67 @@
+/*  Check for Updates Option
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Options_CheckForUpdatesOption_H
+#define PokemonAutomation_Options_CheckForUpdatesOption_H
+
+#include "Common/Cpp/Options/GroupOption.h"
+#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "Common/Cpp/Options/StringOption.h"
+#include "CommonFramework/Globals.h"
+
+namespace PokemonAutomation{
+
+
+class CheckForUpdatesOption : public GroupOption{
+public:
+    CheckForUpdatesOption()
+        : GroupOption(
+            "Check for Updates",
+            LockMode::UNLOCK_WHILE_RUNNING,
+            EnableMode::ALWAYS_ENABLED,
+            true
+        )
+        , RELEASE0(
+            "<b>New Releases:</b><br>Automatically check for new stable releases.",
+            LockMode::UNLOCK_WHILE_RUNNING,
+            true
+        )
+        , PUBLIC_BETA0(
+            "<b>Public Betas:</b><br>Automatically check for new public betas.",
+            LockMode::UNLOCK_WHILE_RUNNING,
+            IS_BETA_VERSION
+        )
+        , PRIVATE_BETA0(
+            "<b>Private Betas:</b><br>Automatically check for new private betas.",
+            LockMode::UNLOCK_WHILE_RUNNING,
+            IS_BETA_VERSION
+        )
+        ,SKIP_VERSION(
+            false,
+            "<b>Skip this Version:</b><br>Skip this version and don't notify until the next update.",
+            LockMode::UNLOCK_WHILE_RUNNING,
+            "",
+            "0.50.0"
+        )
+    {
+        PA_ADD_OPTION(RELEASE0);
+        PA_ADD_OPTION(PUBLIC_BETA0);
+        if (IS_BETA_VERSION){
+            PA_ADD_OPTION(PRIVATE_BETA0);
+        }
+        PA_ADD_OPTION(SKIP_VERSION);
+    }
+
+public:
+    BooleanCheckBoxOption RELEASE0;
+    BooleanCheckBoxOption PUBLIC_BETA0;
+    BooleanCheckBoxOption PRIVATE_BETA0;
+    StringOption SKIP_VERSION;
+};
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/Options/DeviceDropdownAliases.cpp b/SerialPrograms/Source/CommonFramework/Options/DeviceDropdownAliases.cpp
new file mode 100644
index 0000000000..81e0842d1e
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/Options/DeviceDropdownAliases.cpp
@@ -0,0 +1,134 @@
+/*  Device Dropdown Aliases
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Json/JsonValue.h"
+#include "CommonFramework/GlobalSettingsPanel.h"
+#include "CommonFramework/AudioPipeline/Backends/AudioDeviceInfo.h"
+#include "CommonFramework/VideoPipeline/Backends/CameraImplementations.h"
+#include "DeviceDropdownAliases.h"
+
+namespace PokemonAutomation{
+namespace{
+
+const EnumDropdownDatabase<DeviceAliasType>& categories(){
+    static const EnumDropdownDatabase<DeviceAliasType> database{
+        {DeviceAliasType::VIDEO, "Video", "Video"},
+        {DeviceAliasType::AUDIO, "Audio", "Audio"},
+    };
+    return database;
+}
+
+}
+
+DeviceAliasRow::DeviceAliasRow(EditableTableOption& parent)
+    : EditableTableRow(parent)
+    , category(categories(), LockMode::UNLOCK_WHILE_RUNNING, DeviceAliasType::VIDEO)
+    , device_id(false, LockMode::UNLOCK_WHILE_RUNNING, "", "Device ID")
+    , device_name(false, LockMode::READ_ONLY, "", "")
+    , alias(false, LockMode::UNLOCK_WHILE_RUNNING, "", "Use original name")
+{
+    PA_ADD_OPTION(category);
+    PA_ADD_OPTION(device_id);
+    PA_ADD_OPTION(device_name);
+    PA_ADD_OPTION(alias);
+}
+
+std::unique_ptr<EditableTableRow> DeviceAliasRow::clone() const{
+    auto row = std::make_unique<DeviceAliasRow>(parent());
+    row->category.set(category);
+    row->device_id.set(device_id);
+    row->device_name.set(device_name);
+    row->alias.set(alias);
+    return row;
+}
+
+DeviceDropdownAliases::DeviceDropdownAliases()
+    : EditableTableOption_t<DeviceAliasRow>(
+        "<b>Device Aliases:</b><br>"
+        "Choose names for cameras and audio devices. "
+        "Connected devices are added when Global Settings opens.<br>"
+        "An empty alias uses the original name.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        true,
+        10
+    )
+{}
+
+std::vector<std::string> DeviceDropdownAliases::make_header() const{
+    return {"Type", "Device ID", "Original Name", "Alias"};
+}
+
+std::optional<std::string> DeviceDropdownAliases::lookup(DeviceAliasType category, const std::string& device_id) const{
+    std::optional<std::string> result;
+    EditableTableOption::run_on_all_rows<DeviceAliasRow>([&](const DeviceAliasRow& row){
+        if (row.category != category || std::string(row.device_id) != device_id){
+            return false;
+        }
+        std::string alias = row.alias;
+        if (!alias.empty()){
+            result = std::move(alias);
+        }
+        return true;
+    });
+    return result;
+}
+
+void DeviceDropdownAliases::add_device(DeviceAliasType category, const std::string& id, const std::string& name){
+    bool found = false;
+    run_on_all_rows([&](DeviceAliasRow& row){
+        if (row.category != category || std::string(row.device_id) != id){
+            return false;
+        }
+        row.device_name.set(name);
+        found = true;
+        return true;
+    });
+    if (!found){
+        auto row = std::make_unique<DeviceAliasRow>(*this);
+        row->category.set(category);
+        row->device_id.set(id);
+        row->device_name.set(name);
+        append_row(std::move(row));
+    }
+}
+
+void DeviceDropdownAliases::add_connected_devices(){
+    for (const CameraInfo& info : get_all_cameras()){
+        add_device(DeviceAliasType::VIDEO, info.device_name(), get_camera_name(info));
+    }
+    for (const AudioDeviceInfo& info : AudioDeviceInfo::all_input_devices()){
+        add_device(DeviceAliasType::AUDIO, info.device_name(), info.original_name());
+    }
+    for (const AudioDeviceInfo& info : AudioDeviceInfo::all_output_devices()){
+        add_device(DeviceAliasType::AUDIO, info.device_name(), info.original_name());
+    }
+}
+
+DeviceAliasOptions::DeviceAliasOptions()
+    : BatchOption(LockMode::UNLOCK_WHILE_RUNNING, false)
+{
+    PA_ADD_OPTION(m_aliases);
+}
+
+JsonValue DeviceAliasOptions::to_json() const{
+    return m_aliases.to_json();
+}
+void DeviceAliasOptions::load_json(const JsonValue& json){
+    m_aliases.load_json(json);
+}
+
+void DeviceAliasOptions::add_connected_devices(){
+    m_aliases.add_connected_devices();
+}
+std::optional<std::string> DeviceAliasOptions::lookup(DeviceAliasType category, const std::string& device_id) const{
+    return m_aliases.lookup(category, device_id);
+}
+
+std::optional<std::string> device_dropdown_name(DeviceAliasType category, const std::string& device_id){
+    return GlobalSettings::instance().DEVICE_ALIASES->lookup(category, device_id);
+}
+
+}
diff --git a/SerialPrograms/Source/CommonFramework/Options/DeviceDropdownAliases.h b/SerialPrograms/Source/CommonFramework/Options/DeviceDropdownAliases.h
new file mode 100644
index 0000000000..b2daa88ab9
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/Options/DeviceDropdownAliases.h
@@ -0,0 +1,70 @@
+/*  Device Dropdown Aliases
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_DeviceDropdownAliases_H
+#define PokemonAutomation_DeviceDropdownAliases_H
+
+#include <optional>
+#include <string>
+#include "Common/Cpp/Options/EditableTableOption.h"
+#include "Common/Cpp/Options/EnumDropdownOption.h"
+#include "Common/Cpp/Options/BatchOption.h"
+#include "Common/Cpp/Options/StringOption.h"
+
+namespace PokemonAutomation{
+
+enum class DeviceAliasType{
+    VIDEO,
+    AUDIO,
+};
+
+class DeviceAliasRow : public EditableTableRow{
+public:
+    DeviceAliasRow(EditableTableOption& parent);
+    virtual std::unique_ptr<EditableTableRow> clone() const override;
+
+    EnumDropdownCell<DeviceAliasType> category;
+    StringCell device_id;
+    StringCell device_name;
+    StringCell alias;
+};
+
+class DeviceDropdownAliases : public EditableTableOption_t<DeviceAliasRow>{
+public:
+    DeviceDropdownAliases();
+
+    virtual std::vector<std::string> make_header() const override;
+    void add_connected_devices();
+    std::optional<std::string> lookup(DeviceAliasType category, const std::string& device_id) const;
+
+private:
+    void add_device(DeviceAliasType category, const std::string& id, const std::string& name);
+};
+
+class DeviceAliasOptions : public BatchOption{
+public:
+    DeviceAliasOptions();
+
+    virtual JsonValue to_json() const override;
+    virtual void load_json(const JsonValue& json) override;
+
+    void add_connected_devices();
+    std::optional<std::string> lookup(DeviceAliasType category, const std::string& device_id) const;
+
+private:
+    DeviceDropdownAliases m_aliases;
+};
+
+//  Presentation only: never use this result for device selection or serialization.
+//  Returns std::nullopt when no non-empty alias is configured.
+//  Configured in Global Settings. Device IDs remain unchanged.
+std::optional<std::string> device_dropdown_name(
+    DeviceAliasType category,
+    const std::string& device_id
+);
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/Options/Environment/CoreAffinityOption.cpp b/SerialPrograms/Source/CommonFramework/Options/Environment/CoreAffinityOption.cpp
new file mode 100644
index 0000000000..455d7993d9
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/Options/Environment/CoreAffinityOption.cpp
@@ -0,0 +1,177 @@
+/* Core Affinity Option
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifdef _WIN32
+#include <algorithm>
+#include <atomic>
+//#include <thread>
+#include <Windows.h>
+#include <tlhelp32.h>
+#include <processtopologyapi.h>
+#include "Common/Cpp/SparseRegion.h"
+#include "Common/Cpp/Containers/Pimpl.tpp"
+#include "Common/Cpp/Options/StaticTextOption.h"
+//#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "Common/Cpp/Options/StringOption.h"
+#include "CommonFramework/Logging/Logger.h"
+#include "CoreAffinityOption.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+
+
+
+class CoreAffinityOption::Internal : public ConfigOption::Listener{
+public:
+    Internal(CoreAffinityOption& parent)
+        : m_parent(parent)
+        , m_processor_groups(GetActiveProcessorGroupCount())
+        , m_text("<font color=\"red\">Core affinity is not available if there are multiple processor groups.</font>")
+        , m_cores(
+            false,
+            "<b>Allowed Cores:</b>",
+            LockMode::LOCK_WHILE_RUNNING,
+            generate_default_core_string(),
+            "4-8"
+        )
+        , m_cached_affinity_mask(get_all_core_mask())
+    {
+        if (m_processor_groups <= 1){
+            m_text.set_visibility(ConfigOptionState::HIDDEN);
+        }else{
+            m_text.set_visibility(ConfigOptionState::ENABLED);
+        }
+        parent.add_listener(*this);
+        m_cores.add_listener(*this);
+    }
+    virtual ~Internal(){
+        m_cores.remove_listener(*this);
+        m_parent.remove_listener(*this);
+    }
+
+    bool is_enabled() const{
+        return m_processor_groups <= 1;
+    }
+
+    static size_t get_all_core_mask(){
+        size_t cores = GetActiveProcessorCount(0) - 1;
+        if (cores >= CHAR_BIT * sizeof(size_t)){
+            return (size_t)-1;
+        }
+        return ((size_t)1 << GetActiveProcessorCount(0)) - 1;
+    }
+    std::string generate_default_core_string() const{
+        size_t max = 0;
+        for (size_t group = 0; group < m_processor_groups; group++){
+            max = std::max<size_t>(max, GetActiveProcessorCount((WORD)group) - 1);
+        }
+        return "0-" + std::to_string(max);
+    }
+
+    void update_cached_mask(){
+        if (m_processor_groups >= 2){
+            return;
+        }
+
+        size_t core_count = GetActiveProcessorCount(0);
+        size_t mask = 0;
+
+        SparseRegion<size_t> ranges(m_cores, true);
+        for (const auto& range : ranges){
+            size_t stop = std::min<size_t>(range.second, core_count);
+            for (size_t core = range.first; core < stop; core++){
+                mask |= (size_t)1 << core;
+            }
+        }
+
+        m_cached_affinity_mask.store(mask, std::memory_order_release);
+//        cout << "ranges = " << ranges.tostr(true) << endl;
+        m_cores.set(ranges.tostr(true));
+    }
+
+    void set_on_current_thread(){
+        if (m_processor_groups >= 2){
+            return;
+        }
+
+        if (SetThreadAffinityMask(GetCurrentThread(), m_cached_affinity_mask)){
+            return;
+        }
+        global_logger_tagged().log("Failed to set core affinity.", COLOR_RED);
+    }
+
+    virtual void on_config_value_changed(void* object) override{
+//        cout << "on_config_value_changed(): " << object << endl;
+
+        if (m_processor_groups >= 2){
+            return;
+        }
+        if (m_parent.enabled()){
+            update_cached_mask();
+        }else{
+            m_cached_affinity_mask.store(get_all_core_mask(), std::memory_order_release);
+        }
+
+//        cout << "m_cached_affinity_mask = " << m_cached_affinity_mask.load(std::memory_order_acquire) << endl;
+        if (SetProcessAffinityMask(
+            GetCurrentProcess(),
+            m_cached_affinity_mask.load(std::memory_order_acquire)
+        )){
+            return;
+        }
+        global_logger_tagged().log("Failed to set process fore affinity.", COLOR_RED);
+    }
+
+
+public:
+    CoreAffinityOption& m_parent;
+    size_t m_processor_groups;
+
+    StaticTextOption m_text;
+    StringOption m_cores;
+
+    std::atomic<size_t> m_cached_affinity_mask;
+};
+
+
+
+
+CoreAffinityOption::CoreAffinityOption()
+    : GroupOption(
+        "Core Affinity",
+        LockMode::LOCK_WHILE_RUNNING,
+        EnableMode::DEFAULT_DISABLED,
+        true
+    )
+    , m_internal(CONSTRUCT_TOKEN, *this)
+{
+    PA_ADD_STATIC(m_internal->m_text);
+    add_option(m_internal->m_cores, "Cores");
+
+    if (!m_internal->is_enabled()){
+        this->set_visibility(ConfigOptionState::DISABLED);
+    }
+}
+CoreAffinityOption::~CoreAffinityOption() = default;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/Options/Environment/CoreAffinityOption.h b/SerialPrograms/Source/CommonFramework/Options/Environment/CoreAffinityOption.h
new file mode 100644
index 0000000000..1e021632e1
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/Options/Environment/CoreAffinityOption.h
@@ -0,0 +1,30 @@
+/* Core Affinity Option
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_CoreAffinityOption_H
+#define PokemonAutomation_CoreAffinityOption_H
+
+#include "Common/Cpp/Containers/Pimpl.h"
+#include "Common/Cpp/Options/GroupOption.h"
+
+namespace PokemonAutomation{
+
+
+class CoreAffinityOption : public GroupOption{
+public:
+    CoreAffinityOption();
+    ~CoreAffinityOption();
+
+private:
+    class Internal;
+    Pimpl<Internal> m_internal;
+};
+
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/Options/Environment/OnnxOptions.h b/SerialPrograms/Source/CommonFramework/Options/Environment/OnnxOptions.h
new file mode 100644
index 0000000000..5e3f2c7642
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/Options/Environment/OnnxOptions.h
@@ -0,0 +1,103 @@
+/* ONNX Options
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_OnnxOptions_H
+#define PokemonAutomation_OnnxOptions_H
+
+#include <thread>
+#include "Common/Cpp/Options/StaticTextOption.h"
+#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "Common/Cpp/Options/GroupOption.h"
+#include "CommonFramework/StaticGlobals.h"
+#include "ProcessPriorityOption.h"
+
+namespace PokemonAutomation{
+
+
+class OnnxOptions : public GroupOption{
+public:
+    OnnxOptions()
+        : GroupOption(
+            "ONNX Library",
+            LockMode::UNLOCK_WHILE_RUNNING,
+            EnableMode::ALWAYS_ENABLED,
+            true
+        )
+        , m_default_max_threads(
+            std::max(
+                (int)std::thread::hardware_concurrency() - 2,
+                1
+            )
+        )
+        , HARDWARE_THREADS(
+            "<b>Hardware Threads:</b>",
+            LockMode::UNLOCK_WHILE_RUNNING,
+            std::thread::hardware_concurrency(),
+            1,
+            std::numeric_limits<decltype(std::thread::hardware_concurrency())>::max()
+        )
+        , m_description("ONNX Library options. All changes require restarting the program.")
+        , USE_GPU(
+            "<b>Use GPU Acceleration:</b><br>"
+            "Use the GPU by default for ONNX. Will fall-back to CPU if using the GPU fails.<br>"
+            "<font color=\"red\">WARNING: DirectML ONNX on Windows is not threadsafe. Using multithreaded PaddleOCR with DirectML will cause a crash with our current infra. "
+            "Furthermore, with PaddleOCR, DirectML is slower than using the CPU. With other models, such as SAM, DirectML seems to be ~10% "
+            "faster than the CPU. Cuda has not been tested.</font>",
+            LockMode::UNLOCK_WHILE_RUNNING,
+            false
+        )
+        , PRIORITY("<b>Thread Priority:</b>", DEFAULT_PRIORITY_NORMAL_INFERENCE)
+        , MAX_INTRA_OP_THREADS(
+            "<b>Maximum Intra-Op Threads:</b>",
+            LockMode::UNLOCK_WHILE_RUNNING,
+            m_default_max_threads,
+            1
+        )
+        , MAX_INTER_OP_THREADS(
+            "<b>Maximum Inter-Op Threads:</b><br>Zero means default behavior.",
+            LockMode::UNLOCK_WHILE_RUNNING,
+            0
+        )
+    {
+        PA_ADD_OPTION(HARDWARE_THREADS);
+        PA_ADD_STATIC(m_description);
+        PA_ADD_OPTION(USE_GPU);
+//        PA_ADD_OPTION(PRIORITY);  //  Not used yet.
+        PA_ADD_OPTION(MAX_INTRA_OP_THREADS);
+        PA_ADD_OPTION(MAX_INTER_OP_THREADS);
+
+        HARDWARE_THREADS.set_visibility(ConfigOptionState::HIDDEN);
+        USE_GPU.set_visibility(ConfigOptionState::HIDDEN);
+    }
+
+    virtual void load_json(const JsonValue& json) override{
+        GroupOption::load_json(json);
+
+        //  Reset the max threads if the hardware threads has changed.
+        if (HARDWARE_THREADS != std::thread::hardware_concurrency()){
+            MAX_INTRA_OP_THREADS.set(m_default_max_threads);
+        }
+    }
+
+private:
+    const int m_default_max_threads;
+    SimpleIntegerOption<size_t> HARDWARE_THREADS;
+
+public:
+    StaticTextOption m_description;
+    BooleanCheckBoxOption USE_GPU;
+    ThreadPriorityOption PRIORITY;
+    SimpleIntegerOption<int> MAX_INTRA_OP_THREADS;
+    SimpleIntegerOption<int> MAX_INTER_OP_THREADS;
+};
+
+
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/Options/Environment/PerformanceOptions.cpp b/SerialPrograms/Source/CommonFramework/Options/Environment/PerformanceOptions.cpp
new file mode 100644
index 0000000000..0a9dbff010
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/Options/Environment/PerformanceOptions.cpp
@@ -0,0 +1,92 @@
+/* Performance Options
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "PerformanceOptions.h"
+
+namespace PokemonAutomation{
+
+
+
+PerformanceOptions::PerformanceOptions()
+    : GroupOption(
+        "Performance",
+        LockMode::LOCK_WHILE_RUNNING,
+        GroupOption::EnableMode::ALWAYS_ENABLED,
+        true,
+        false
+    )
+    , UI_THREAD_PRIORITY(
+        "<b>UI Thread Priority:</b><br>"
+        "Thread priority of the UI thread. This affects the responsiveness of the UI under load.<br>"
+        "Restart the program for this to fully take effect.",
+        DEFAULT_PRIORITY_UI
+    )
+    , REALTIME_THREAD_PRIORITY0(
+        "<b>Realtime Thread Priority:</b><br>"
+        "Thread priority of real-time threads. (program/controller threads)<br>"
+        "Restart the program for this to fully take effect.",
+        DEFAULT_PRIORITY_REALTIME
+    )
+    , INFERENCE_PIVOT_PRIORITY0(
+        "<b>Inference Pivot Priority:</b><br>"
+        "Thread priority of inference dispatcher threads.",
+        DEFAULT_PRIORITY_REALTIME_INFERENCE
+    )
+    , COMPUTE_PRIORITY(
+        "<b>Compute Priority:</b><br>"
+        "Thread priority of computation threads.",
+        DEFAULT_PRIORITY_COMPUTE
+    )
+    , REALTIME_THREAD_POOL0(
+        "Real-time Thread Pool",
+        "Thread pool for tasks that must run fast enough to keep a "
+        "program running properly.<br>"
+        "Restart program for changes to take full effect.",
+        DEFAULT_PRIORITY_REALTIME_INFERENCE,
+        0.5
+    )
+    , NORMAL_THREAD_POOL(
+        "Normal Thread Pool",
+        "Thread pool for tasks that can be slow without negatively "
+        "affecting a program.<br>"
+        "Restart program for changes to take full effect.",
+        DEFAULT_PRIORITY_NORMAL_INFERENCE,
+        1.0
+    )
+    , PRECISE_WAKE_MARGIN(
+        "<b>Precise Wake Time Margin:</b><br>"
+        "Some operations require a thread to wake up at a very precise time - "
+        "more precise than what the operating system's scheduler can provide. "
+        "This option will force such operations to wake up this many "
+        "microseconds earlier, then busy wait until the time is reached. "
+        "The sys-botbase controller is an example of something that requires "
+        "extremely precise wake times.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        "2000 us"
+    )
+{
+    PA_ADD_OPTION(PROCESSOR_LEVEL);
+#ifdef _WIN32
+    PA_ADD_OPTION(CORE_AFFINITY);
+#endif
+
+    PA_ADD_OPTION(UI_THREAD_PRIORITY);
+    PA_ADD_OPTION(REALTIME_THREAD_PRIORITY0);
+    PA_ADD_OPTION(INFERENCE_PIVOT_PRIORITY0);
+    PA_ADD_OPTION(COMPUTE_PRIORITY);
+
+    PA_ADD_OPTION(REALTIME_THREAD_POOL0);
+    PA_ADD_OPTION(NORMAL_THREAD_POOL);
+
+    //  Used only by sys-botbase 2 which has been removed.
+//    PA_ADD_OPTION(PRECISE_WAKE_MARGIN);
+
+    PA_ADD_OPTION(ONNX_OPTIONS);
+}
+
+
+
+}
diff --git a/SerialPrograms/Source/CommonFramework/Options/Environment/PerformanceOptions.h b/SerialPrograms/Source/CommonFramework/Options/Environment/PerformanceOptions.h
new file mode 100644
index 0000000000..5881d1655d
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/Options/Environment/PerformanceOptions.h
@@ -0,0 +1,55 @@
+/* Performance Options
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PerformanceOptions_H
+#define PokemonAutomation_PerformanceOptions_H
+
+#include "Common/Cpp/Options/GroupOption.h"
+#include "Common/Cpp/Options/TimeDurationOption.h"
+#include "CommonFramework/Options/ThreadPoolOption.h"
+#include "ProcessPriorityOption.h"
+#include "ProcessorLevelOption.h"
+#include "CoreAffinityOption.h"
+#include "OnnxOptions.h"
+
+namespace PokemonAutomation{
+
+
+class PerformanceOptions : public GroupOption{
+public:
+    static PerformanceOptions& instance(){
+        static PerformanceOptions option;
+        return option;
+    }
+
+private:
+    PerformanceOptions();
+
+public:
+    ProcessorLevelOption PROCESSOR_LEVEL;
+#ifdef _WIN32
+    CoreAffinityOption CORE_AFFINITY;
+#endif
+
+    ThreadPriorityOption UI_THREAD_PRIORITY;
+    ThreadPriorityOption REALTIME_THREAD_PRIORITY0;
+    ThreadPriorityOption INFERENCE_PIVOT_PRIORITY0;
+    ThreadPriorityOption COMPUTE_PRIORITY;
+
+    ThreadPoolOption REALTIME_THREAD_POOL0;
+    ThreadPoolOption NORMAL_THREAD_POOL;
+
+    MicrosecondsOption PRECISE_WAKE_MARGIN;
+
+    OnnxOptions ONNX_OPTIONS;
+};
+
+
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/Options/Environment/ProcessPriorityOption.h b/SerialPrograms/Source/CommonFramework/Options/Environment/ProcessPriorityOption.h
index 87b499aa9e..08c0bc9e62 100644
--- a/SerialPrograms/Source/CommonFramework/Options/Environment/ProcessPriorityOption.h
+++ b/SerialPrograms/Source/CommonFramework/Options/Environment/ProcessPriorityOption.h
@@ -1,6 +1,6 @@
 /*  Process Priority Option
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -21,12 +21,12 @@ class ThreadPriorityOption : public EnumDropdownOption<ThreadPriority>{
         : EnumDropdownOption<ThreadPriority>(
             std::move(label),
             PRIORITY_DATABASE(),
-            LockWhileRunning::LOCKED,
+            LockMode::LOCK_WHILE_RUNNING,
             default_priority
         )
     {}
-    void set_on_this_thread() const{
-        set_thread_priority(*this);
+    void set_on_this_thread(Logger& logger) const{
+        set_thread_priority(logger, *this);
     }
 };
 
diff --git a/SerialPrograms/Source/CommonFramework/Options/Environment/ProcessorLevelOption.cpp b/SerialPrograms/Source/CommonFramework/Options/Environment/ProcessorLevelOption.cpp
index f2d20eac7c..527874397f 100644
--- a/SerialPrograms/Source/CommonFramework/Options/Environment/ProcessorLevelOption.cpp
+++ b/SerialPrograms/Source/CommonFramework/Options/Environment/ProcessorLevelOption.cpp
@@ -1,13 +1,13 @@
 /*  Processor Level Option
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include "Common/Cpp/Json/JsonValue.h"
 #include "Common/Cpp/Json/JsonObject.h"
-#include "CommonFramework/GlobalSettingsPanel.h"
-#include "CommonFramework/Environment/Environment.h"
+#include "Common/Cpp/CpuId/CpuId.h"
+#include "Common/Cpp/Hardware/Hardware.h"
 #include "CommonFramework/Logging/Logger.h"
 #include "ProcessorLevelOption.h"
 
@@ -33,7 +33,7 @@ ProcessorLevelOption::ProcessorLevelOption()
         "<b>Processor Specific Optimization:</b><br>"
         "Note that this only applies to this binary. External dependencies may ignore this and use higher instructions anyway.",
         CAPABILITIES_DATABASE(),
-        LockWhileRunning::LOCKED,
+        LockMode::LOCK_WHILE_RUNNING,
         get_default_ProcessorLevel_index()
     )
 {
@@ -46,8 +46,14 @@ bool ProcessorLevelOption::set_value(size_t value){
     set_global(value);
     return true;
 }
+JsonValue ProcessorLevelOption::to_json() const{
+    JsonObject obj;
+    obj["Level"] = IntegerEnumDropdownOption::to_json();
+    obj["ProcessorString"] = get_processor_name();
+    return obj;
+}
 void ProcessorLevelOption::load_json(const JsonValue& json){
-    const JsonObject* obj = json.get_object();
+    const JsonObject* obj = json.to_object();
     if (obj == nullptr){
         return;
     }
@@ -71,12 +77,6 @@ void ProcessorLevelOption::load_json(const JsonValue& json){
         global_logger_tagged().log("Mismatched processor string. Will not load saved processor level.", COLOR_RED);
     }
 }
-JsonValue ProcessorLevelOption::to_json() const{
-    JsonObject obj;
-    obj["Level"] = IntegerEnumDropdownOption::to_json();
-    obj["ProcessorString"] = get_processor_name();
-    return obj;
-}
 void ProcessorLevelOption::set_global(){
     set_global(current_value());
 }
diff --git a/SerialPrograms/Source/CommonFramework/Options/Environment/ProcessorLevelOption.h b/SerialPrograms/Source/CommonFramework/Options/Environment/ProcessorLevelOption.h
index 71974b620c..9dc3e2495d 100644
--- a/SerialPrograms/Source/CommonFramework/Options/Environment/ProcessorLevelOption.h
+++ b/SerialPrograms/Source/CommonFramework/Options/Environment/ProcessorLevelOption.h
@@ -1,13 +1,12 @@
 /*  Processor Level Option
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifndef PokemonAutomation_ProcessorLevelOption_H
 #define PokemonAutomation_ProcessorLevelOption_H
 
-#include "Common/Cpp/CpuId/CpuId.h"
 #include "Common/Cpp/Options/EnumDropdownOption.h"
 
 namespace PokemonAutomation{
@@ -19,8 +18,8 @@ class ProcessorLevelOption : public IntegerEnumDropdownOption{
 
     virtual bool set_value(size_t value) override;
 
-    virtual void load_json(const JsonValue& json) override;
     virtual JsonValue to_json() const override;
+    virtual void load_json(const JsonValue& json) override;
 
     void set_global();
     void set_global(size_t value);
diff --git a/SerialPrograms/Source/CommonFramework/Options/Environment/SleepSuppressOption.cpp b/SerialPrograms/Source/CommonFramework/Options/Environment/SleepSuppressOption.cpp
new file mode 100644
index 0000000000..957941985a
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/Options/Environment/SleepSuppressOption.cpp
@@ -0,0 +1,82 @@
+/*  Sleep Suppress Option
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "SleepSuppressOption.h"
+
+namespace PokemonAutomation{
+
+
+SleepSuppressOption::SleepSuppressOption(std::string label, SleepSuppress default_value)
+    : EnumDropdownOption<SleepSuppress>(
+        std::move(label),
+        {
+           {SleepSuppress::NONE,       "none",         "Do not suppress sleep or screensaver."},
+#ifdef PA_ENABLE_SLEEP_SUPPRESS_NO_SLEEP
+           {SleepSuppress::NO_SLEEP,   "no-sleep",     "Prevent computer from sleeping, but allow screen to turn off."},
+#endif
+           {SleepSuppress::SCREEN_ON,  "screen-on",    "Keep the screen on."},
+        },
+        LockMode::UNLOCK_WHILE_RUNNING,
+        default_value
+    )
+{}
+
+
+SleepSuppressOptions::~SleepSuppressOptions(){
+    PROGRAM_RUNNING.remove_listener(*this);
+    IDLE.remove_listener(*this);
+}
+SleepSuppressOptions::SleepSuppressOptions()
+    : GroupOption(
+        "Suppress Screensaver/Sleep:",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        GroupOption::EnableMode::ALWAYS_ENABLED,
+        true,
+        false
+    )
+    , IDLE("No Program Running:", SleepSuppress::NONE)
+#ifdef PA_ENABLE_SLEEP_SUPPRESS_NO_SLEEP
+    , PROGRAM_RUNNING("Program is Running:", SleepSuppress::NO_SLEEP)
+#else
+    , PROGRAM_RUNNING("Program is Running:", SleepSuppress::NONE)
+#endif
+    , m_idle_scope(IDLE)
+{
+    PA_ADD_OPTION(IDLE);
+    PA_ADD_OPTION(PROGRAM_RUNNING);
+
+    IDLE.add_listener(*this);
+    PROGRAM_RUNNING.add_listener(*this);
+}
+
+void SleepSuppressOptions::on_config_value_changed(void* object){
+    if (object == &IDLE){
+        m_idle_scope = IDLE;
+        PROGRAM_RUNNING.set_value(std::max(IDLE.current_value(), PROGRAM_RUNNING.current_value()));
+    }else{
+        IDLE.set_value(std::min(IDLE.current_value(), PROGRAM_RUNNING.current_value()));
+    }
+}
+
+
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/SerialPrograms/Source/CommonFramework/Options/Environment/SleepSuppressOption.h b/SerialPrograms/Source/CommonFramework/Options/Environment/SleepSuppressOption.h
new file mode 100644
index 0000000000..a4422d5a65
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/Options/Environment/SleepSuppressOption.h
@@ -0,0 +1,41 @@
+/*  Sleep Suppress Option
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_SleepSuppressOption_H
+#define PokemonAutomation_SleepSuppressOption_H
+
+#include "Common/Cpp/Options/EnumDropdownOption.h"
+#include "Common/Cpp/Options/GroupOption.h"
+#include "CommonFramework/Environment/SystemSleep.h"
+
+namespace PokemonAutomation{
+
+
+
+class SleepSuppressOption : public EnumDropdownOption<SleepSuppress>{
+public:
+    SleepSuppressOption(std::string label, SleepSuppress default_value);
+};
+
+
+class SleepSuppressOptions : public GroupOption, public ConfigOption::Listener{
+public:
+    ~SleepSuppressOptions();
+    SleepSuppressOptions();
+
+    virtual void on_config_value_changed(void* object) override;
+
+public:
+    SleepSuppressOption IDLE;
+    SleepSuppressOption PROGRAM_RUNNING;
+
+private:
+    SleepSuppressScope m_idle_scope;
+};
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/Options/Environment/ThemeSelectorOption.cpp b/SerialPrograms/Source/CommonFramework/Options/Environment/ThemeSelectorOption.cpp
index 519e044522..0ec28eb330 100644
--- a/SerialPrograms/Source/CommonFramework/Options/Environment/ThemeSelectorOption.cpp
+++ b/SerialPrograms/Source/CommonFramework/Options/Environment/ThemeSelectorOption.cpp
@@ -1,38 +1,37 @@
 /*  Theme Selector Option
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include <QFile>
 #include <QTextStream>
 #include <QApplication>
-#include "Common/Cpp/Exceptions.h"
 #include "CommonFramework/Windows/DpiScaler.h"
 #include "ThemeSelectorOption.h"
 
 namespace PokemonAutomation{
 
 
-size_t current_theme = 0;
 
-
-void set_theme(size_t index){
-    if (index == current_theme){
+void set_theme(UiThemeMode theme_mode){
+    if (theme_mode == CURRENT_THEME){
         return;
     }
     QString stylesheet;
-    switch (index){
-    case 0:
+    switch (theme_mode){
+    case UiThemeMode::DEFAULT_MODE:
         break;
-    case 1:
+    case UiThemeMode::DARK_MODE:
         stylesheet = ":qdarkstyle/dark/darkstyle.qss";
         break;
     }
 
     if (!stylesheet.isEmpty()){
         QFile f(stylesheet);
-        f.open(QFile::ReadOnly | QFile::Text);
+        if (!f.open(QFile::ReadOnly | QFile::Text)){
+            return;
+        }
         QTextStream ts(&f);
         stylesheet = scale_dpi_stylesheet(ts.readAll());
     }
@@ -40,19 +39,19 @@ void set_theme(size_t index){
     QApplication* app = static_cast<QApplication*>(QApplication::instance());
     app->setStyleSheet(stylesheet);
 
-    current_theme = index;
+    CURRENT_THEME = theme_mode;
 }
 
 
 ThemeSelectorOption::ThemeSelectorOption()
-    : IntegerEnumDropdownOption(
+    : EnumDropdownOption<UiThemeMode>(
         "<b>Theme:</b>",
         {
-            {0, "default", "Default"},
-            {1, "dark", "Dark Mode"},
+            {UiThemeMode::DEFAULT_MODE, "default", "Default"},
+            {UiThemeMode::DARK_MODE, "dark", "Dark Mode"},
         },
-        LockWhileRunning::LOCKED,
-        0
+        LockMode::LOCK_WHILE_RUNNING,
+        UiThemeMode::DEFAULT_MODE
     )
 {}
 
@@ -60,50 +59,13 @@ bool ThemeSelectorOption::set_value(size_t index){
     if (!IntegerEnumDropdownOption::set_value(index)){
         return false;
     }
-    set_theme(index);
+    set_theme(static_cast<UiThemeMode>(index));
     return true;
 }
 void ThemeSelectorOption::load_json(const JsonValue& json){
     IntegerEnumDropdownOption::load_json(json);
-    set_theme(current_value());
-}
-
-
-
-#if 1
-Color theme_friendly_darkblue(){
-    if (current_theme == 1){
-        return Color(0xff0080ff);
-    }
-    return COLOR_DARK_BLUE;
+    set_theme(static_cast<UiThemeMode>(current_value()));
 }
-#endif
-std::string html_color_text(const std::string& text, Color color){
-    const char HEX[] = "0123456789abcdef";
-    uint32_t rgb = (uint32_t)color;
-    std::string str;
-    str += HEX[(rgb >> 20) & 15];
-    str += HEX[(rgb >> 16) & 15];
-    str += HEX[(rgb >> 12) & 15];
-    str += HEX[(rgb >>  8) & 15];
-    str += HEX[(rgb >>  4) & 15];
-    str += HEX[(rgb >>  0) & 15];
-    return "<font color=#" + str + ">" + text + "</font>";
-}
-std::string make_text_url(const std::string& url, const std::string& text){
-#if 0
-    switch (current_theme){
-    case 0:
-        return "<a href=\"" + url + "\">" + text + "</a>";
-    case 1:
-        return "<a href=\"" + url + "\" style=\"color: #0080ff\">" + text + "</a>";
-    }
-    throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Invalid theme #.");
-#endif
-    return "<a href=\"" + url + "\" style=\"color: #0080ff\">" + text + "</a>";
-}
-
-
 
 
 
diff --git a/SerialPrograms/Source/CommonFramework/Options/Environment/ThemeSelectorOption.h b/SerialPrograms/Source/CommonFramework/Options/Environment/ThemeSelectorOption.h
index 43f561f7dd..a3b0d5b098 100644
--- a/SerialPrograms/Source/CommonFramework/Options/Environment/ThemeSelectorOption.h
+++ b/SerialPrograms/Source/CommonFramework/Options/Environment/ThemeSelectorOption.h
@@ -1,19 +1,19 @@
 /*  Theme Selector Option
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifndef PokemonAutomation_ThemeSelectorOption_H
 #define PokemonAutomation_ThemeSelectorOption_H
 
-#include "Common/Cpp/Color.h"
+#include "Common/Cpp/ColoredText.h"
 #include "Common/Cpp/Options/EnumDropdownOption.h"
 
 namespace PokemonAutomation{
 
 
-class ThemeSelectorOption : public IntegerEnumDropdownOption{
+class ThemeSelectorOption : public EnumDropdownOption<UiThemeMode>{
 public:
     ThemeSelectorOption();
 
@@ -22,9 +22,6 @@ class ThemeSelectorOption : public IntegerEnumDropdownOption{
 };
 
 
-Color theme_friendly_darkblue();
-std::string html_color_text(const std::string& text, Color color);
-std::string make_text_url(const std::string& url, const std::string& text);
 
 
 
diff --git a/SerialPrograms/Source/CommonFramework/Options/LabelCellOption.cpp b/SerialPrograms/Source/CommonFramework/Options/LabelCellOption.cpp
index 948424e870..749e7fa06f 100644
--- a/SerialPrograms/Source/CommonFramework/Options/LabelCellOption.cpp
+++ b/SerialPrograms/Source/CommonFramework/Options/LabelCellOption.cpp
@@ -1,13 +1,12 @@
 /*  Label Cell
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include "Common/Cpp/Containers/Pimpl.tpp"
-#include "Common/Cpp/Concurrency/SpinLock.h"
 #include "Common/Cpp/Json/JsonValue.h"
-#include "Common/Qt/Options/ConfigWidget.h"
+#include "Common/Cpp/Concurrency/SpinLock.h"
 #include "LabelCellOption.h"
 
 //#include <iostream>
@@ -17,8 +16,9 @@
 namespace PokemonAutomation{
 
 
+
 struct LabelCellOption::Data{
-//    mutable SpinLock m_lock;
+    mutable SpinLock m_lock;
     std::string m_text;
 //    ImageRGB32 m_icon_owner;
     ImageViewRGB32 m_icon;
@@ -57,30 +57,31 @@ struct LabelCellOption::Data{
 
 LabelCellOption::~LabelCellOption() = default;
 LabelCellOption::LabelCellOption(
-    LockWhileRunning lock_while_running,
+    LockMode lock_while_running,
     std::string text
 )
-    : ConfigOption(lock_while_running)
+    : UiState<LabelCellOption, ConfigOption>(lock_while_running)
     , m_data(CONSTRUCT_TOKEN, std::move(text))
 {}
 LabelCellOption::LabelCellOption(
-    LockWhileRunning lock_while_running,
+    LockMode lock_while_running,
     std::string text, const ImageViewRGB32& icon
 )
-    : ConfigOption(lock_while_running)
+    : UiState<LabelCellOption, ConfigOption>(lock_while_running)
     , m_data(CONSTRUCT_TOKEN, std::move(text), icon)
 {}
 LabelCellOption::LabelCellOption(
-    LockWhileRunning lock_while_running,
+    LockMode lock_while_running,
     std::string text, const ImageViewRGB32& icon, size_t icon_size
 )
-    : ConfigOption(lock_while_running)
+    : UiState<LabelCellOption, ConfigOption>(lock_while_running)
     , m_data(CONSTRUCT_TOKEN, std::move(text), icon, icon_size)
 {}
 //LabelCellOption::LabelCellOption(std::string text, ImageRGB32 icon)
 //    : m_data(CONSTRUCT_TOKEN, std::move(text), std::move(icon))
 //{}
 const std::string& LabelCellOption::text() const{
+    ReadSpinLock lg(m_data->m_lock);
     return m_data->m_text;
 }
 const ImageViewRGB32& LabelCellOption::icon() const{
@@ -89,11 +90,23 @@ const ImageViewRGB32& LabelCellOption::icon() const{
 Resolution LabelCellOption::resolution() const{
     return m_data->m_resolution;
 }
-void LabelCellOption::load_json(const JsonValue&){
-}
 JsonValue LabelCellOption::to_json() const{
     return JsonValue();
 }
+void LabelCellOption::load_json(const JsonValue&){
+}
+
+void LabelCellOption::set_text(std::string x){
+    // sanitize(x);
+    {
+        WriteSpinLock lg(m_data->m_lock);
+        if (m_data->m_text == x){
+            return;
+        }
+        m_data->m_text = std::move(x);
+    }
+    report_value_changed(this);
+}
 
 
 
diff --git a/SerialPrograms/Source/CommonFramework/Options/LabelCellOption.h b/SerialPrograms/Source/CommonFramework/Options/LabelCellOption.h
index d82c3c5af5..257e812c77 100644
--- a/SerialPrograms/Source/CommonFramework/Options/LabelCellOption.h
+++ b/SerialPrograms/Source/CommonFramework/Options/LabelCellOption.h
@@ -1,6 +1,6 @@
 /*  Label Cell
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -11,31 +11,31 @@
 #include "Common/Cpp/Containers/Pimpl.h"
 #include "Common/Cpp/Options/ConfigOption.h"
 #include "CommonFramework/ImageTypes/ImageViewRGB32.h"
-#include "CommonFramework/ImageTypes/ImageRGB32.h"
+//#include "CommonFramework/ImageTypes/ImageRGB32.h"
 
 namespace PokemonAutomation{
 
 
 
-class LabelCellOption : public ConfigOption{
+class LabelCellOption : public UiState<LabelCellOption, ConfigOption>{
 public:
     ~LabelCellOption();
 
     //  Make label with no icon.
     LabelCellOption(
-        LockWhileRunning lock_while_running,
+        LockMode lock_while_running,
         std::string text
     );
 
     //  Make label with the icon in its original resolution.
     LabelCellOption(
-        LockWhileRunning lock_while_running,
+        LockMode lock_while_running,
         std::string text, const ImageViewRGB32& icon
     );
 
     //  Make label with icon and scale it so that the largest dimension is "icon_size" pixels.
     LabelCellOption(
-        LockWhileRunning lock_while_running,
+        LockMode lock_while_running,
         std::string text, const ImageViewRGB32& icon, size_t icon_size
     );
 
@@ -45,12 +45,14 @@ class LabelCellOption : public ConfigOption{
     const ImageViewRGB32& icon() const;
     Resolution resolution() const;
 
-    virtual void load_json(const JsonValue& json) override;
-    virtual JsonValue to_json() const override;
+    void set_text(std::string x);
+
 
+public:
     virtual void restore_defaults() override{}
+    virtual JsonValue to_json() const override;
+    virtual void load_json(const JsonValue& json) override;
 
-    virtual ConfigWidget* make_QtWidget(QWidget& parent) override;
 
 private:
     struct Data;
diff --git a/SerialPrograms/Source/CommonFramework/Options/LanguageOCROption.h b/SerialPrograms/Source/CommonFramework/Options/LanguageOCROption.h
deleted file mode 100644
index d53b0453d2..0000000000
--- a/SerialPrograms/Source/CommonFramework/Options/LanguageOCROption.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*  Language OCR Option
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_Options_LanguageOCROption_H
-#define PokemonAutomation_Options_LanguageOCROption_H
-
-#include <atomic>
-#include <vector>
-#include <map>
-#include "Common/Cpp/Options/ConfigOption.h"
-#include "CommonFramework/Language.h"
-
-namespace PokemonAutomation{
-namespace OCR{
-
-
-class LanguageOCRCell : public ConfigOption{
-public:
-    LanguageOCRCell(
-        const LanguageSet& languages,
-        LockWhileRunning lock_while_running,
-        bool required = true
-    );
-
-//    explicit operator bool() const{ return m_case_list[m_current].first != Language::None && m_case_list[m_current].second; }
-
-    operator size_t() const{ return m_current; }
-    operator Language() const{ return m_case_list[m_current.load(std::memory_order_relaxed)].first; }
-    void set(Language language);
-
-    virtual void load_json(const JsonValue& json) override;
-    virtual JsonValue to_json() const override;
-
-    virtual std::string check_validity() const override;
-    virtual void restore_defaults() override;
-
-    virtual ConfigWidget* make_QtWidget(QWidget& parent) override;
-
-private:
-    friend class LanguageOCRCellWidget;
-
-    std::vector<std::pair<Language, bool>> m_case_list;
-    std::map<Language, size_t> m_case_map;
-    const size_t m_default;
-
-    std::atomic<size_t> m_current;
-};
-
-
-
-
-class LanguageOCROption : public LanguageOCRCell{
-public:
-    LanguageOCROption(
-        std::string label,
-        const LanguageSet& languages,
-        LockWhileRunning lock_while_running,
-        bool required = true
-    );
-
-    const std::string& label() const{ return m_label; }
-
-    virtual ConfigWidget* make_QtWidget(QWidget& parent) override;
-
-private:
-    friend class LanguageOCROptionWidget;
-
-    const std::string m_label;
-};
-
-
-
-
-}
-}
-#endif
diff --git a/SerialPrograms/Source/CommonFramework/Options/NestedBoxDrawOption.cpp b/SerialPrograms/Source/CommonFramework/Options/NestedBoxDrawOption.cpp
new file mode 100644
index 0000000000..f6f03159e0
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/Options/NestedBoxDrawOption.cpp
@@ -0,0 +1,163 @@
+/*  Nested Box Draw Option
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "NestedBoxDrawOption.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+
+
+
+NestedBoxDrawOption::~NestedBoxDrawOption(){
+    m_overlay.remove_hid_listener(*this);
+    CONTENT_BOX.remove_listener(*this);
+    INFERENCE_BOX.remove_listener(*this);
+}
+NestedBoxDrawOption::NestedBoxDrawOption(
+    LockMode lock_while_program_is_running,
+    VideoOverlay& overlay
+)
+    : BatchOption(lock_while_program_is_running)
+    , INFERENCE_BOX(
+        "Inference Box",
+        lock_while_program_is_running,
+        GroupOption::EnableMode::ALWAYS_ENABLED,
+        false
+    )
+    , CONTENT_BOX(
+        "Content Box",
+        lock_while_program_is_running,
+        GroupOption::EnableMode::DEFAULT_DISABLED,
+        true,
+        {0.1, 0.1, .8, .8}
+    )
+    , m_overlay(overlay)
+    , m_overlay_set(overlay)
+{
+    PA_ADD_OPTION(INFERENCE_BOX);
+    PA_ADD_OPTION(CONTENT_BOX);
+
+    INFERENCE_BOX.add_listener(*this);
+    CONTENT_BOX.add_listener(*this);
+    overlay.add_hid_listener(*this);
+}
+
+void NestedBoxDrawOption::on_config_value_changed(void* object){
+    if (this->visibility() != ConfigOptionState::ENABLED){
+        return;
+    }
+
+    std::lock_guard<Mutex> lg(m_lock);
+    m_overlay_set.clear();
+    double ix = INFERENCE_BOX.X;
+    double iy = INFERENCE_BOX.Y;
+    double iw = INFERENCE_BOX.WIDTH;
+    double ih = INFERENCE_BOX.HEIGHT;
+    if (CONTENT_BOX.enabled()){
+        double cx = CONTENT_BOX.X;
+        double cy = CONTENT_BOX.Y;
+        double cw = CONTENT_BOX.WIDTH;
+        double ch = CONTENT_BOX.HEIGHT;
+        m_overlay_set.add(COLOR_GREEN, {cx, cy, cw, ch});
+        ix *= cw;
+        iy *= ch;
+        iw *= cw;
+        ih *= ch;
+        ix += cx;
+        iy += cy;
+    }
+    m_overlay_set.add(COLOR_RED, {ix, iy, iw, ih});
+}
+void NestedBoxDrawOption::on_mouse_press(double x, double y){
+    if (this->visibility() != ConfigOptionState::ENABLED){
+        return;
+    }
+    m_mouse_start.emplace();
+    m_mouse_start->first = x;
+    m_mouse_start->second = y;
+}
+void NestedBoxDrawOption::on_mouse_release(double x, double y){
+    if (this->visibility() != ConfigOptionState::ENABLED){
+        return;
+    }
+    m_mouse_start.reset();
+}
+void NestedBoxDrawOption::on_mouse_move(double x, double y){
+    if (this->visibility() != ConfigOptionState::ENABLED){
+        return;
+    }
+    if (!m_mouse_start){
+        return;
+    }
+
+    x = std::max<double>(x, 0);
+    y = std::max<double>(y, 0);
+    x = std::min<double>(x, 1);
+    y = std::min<double>(y, 1);
+
+//    cout << "x = " << x << ", y = " << y << endl;
+
+    double xl = m_mouse_start->first;
+    double xh = x;
+    double yl = m_mouse_start->second;
+    double yh = y;
+
+    if (CONTENT_BOX.enabled()){
+        double cx = CONTENT_BOX.X;
+        double cy = CONTENT_BOX.Y;
+        double cw = CONTENT_BOX.WIDTH;
+        double ch = CONTENT_BOX.HEIGHT;
+
+        xl = (xl - cx) / cw;
+        xl = std::max(xl, 0.);
+        xl = std::min(xl, 1.);
+
+        yl = (yl - cy) / ch;
+        yl = std::max(yl, 0.);
+        yl = std::min(yl, 1.);
+
+        xh = (xh - cx) / cw;
+        xh = std::max(xh, 0.);
+        xh = std::min(xh, 1.);
+
+        yh = (yh - cy) / ch;
+        yh = std::max(yh, 0.);
+        yh = std::min(yh, 1.);
+    }
+
+    if (xl > xh){
+        std::swap(xl, xh);
+    }
+    if (yl > yh){
+        std::swap(yl, yh);
+    }
+
+    INFERENCE_BOX.X.set(xl);
+    INFERENCE_BOX.Y.set(yl);
+    INFERENCE_BOX.WIDTH.set(xh - xl);
+    INFERENCE_BOX.HEIGHT.set(yh - yl);
+}
+
+
+
+
+
+
+
+}
+
+
+
+
+
+
+
+
+
+
diff --git a/SerialPrograms/Source/CommonFramework/Options/NestedBoxDrawOption.h b/SerialPrograms/Source/CommonFramework/Options/NestedBoxDrawOption.h
new file mode 100644
index 0000000000..11a84c7974
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/Options/NestedBoxDrawOption.h
@@ -0,0 +1,49 @@
+/*  Nested Box Draw Option
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_NestedBoxDrawOption_H
+#define PokemonAutomation_NestedBoxDrawOption_H
+
+#include "Common/Cpp/Concurrency/Mutex.h"
+#include "CommonFramework/VideoPipeline/VideoOverlay.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "BoxOption.h"
+
+namespace PokemonAutomation{
+
+
+
+class NestedBoxDrawOption
+    : public BatchOption
+    , public ConfigOption::Listener
+    , public VideoDisplayHidListener
+{
+public:
+    ~NestedBoxDrawOption();
+    NestedBoxDrawOption(
+        LockMode lock_while_program_is_running,
+        VideoOverlay& overlay
+    );
+
+    virtual void on_config_value_changed(void* object) override;
+    virtual void on_mouse_press(double x, double y) override;
+    virtual void on_mouse_release(double x, double y) override;
+    virtual void on_mouse_move(double x, double y) override;
+
+public:
+    BoxOption INFERENCE_BOX;
+    BoxOption CONTENT_BOX;
+
+private:
+    VideoOverlay& m_overlay;
+    Mutex m_lock;
+    std::optional<std::pair<double, double>> m_mouse_start;
+    VideoOverlaySet m_overlay_set;
+};
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/Options/QtWidget/LabelCellWidget.cpp b/SerialPrograms/Source/CommonFramework/Options/QtWidget/LabelCellWidget.cpp
new file mode 100644
index 0000000000..562189d795
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/Options/QtWidget/LabelCellWidget.cpp
@@ -0,0 +1,69 @@
+/*  Label Cell
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <QHBoxLayout>
+#include <QLabel>
+#include "CommonFramework/ImageTypes/ImageRGB32_Qt.h"
+#include "LabelCellWidget.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+
+
+template class RegisterUiStateQtWidget<LabelCellWidget>;
+
+
+LabelCellWidget::~LabelCellWidget(){
+    m_value.remove_listener(*this);
+}
+LabelCellWidget::LabelCellWidget(QWidget& parent, LabelCellOption& value)
+    : QWidget(&parent)
+    , ConfigWidget(value, *this)
+    , m_value(value)
+{
+    QHBoxLayout* layout = new QHBoxLayout(this);
+    layout->setContentsMargins(0, 0, 0, 0);
+//    layout->setAlignment(Qt::AlignLeft);
+
+    if (value.icon()){
+        m_icon = new QLabel(this);
+        Resolution resolution = value.resolution();
+//        cout << resolution.width << " x " << resolution.height << endl;
+        QPixmap pixmap;
+        if (resolution.width == 0 || resolution.height == 0){
+            pixmap = QPixmap::fromImage(to_QImage_ref(value.icon()));
+        }else{
+            pixmap = QPixmap::fromImage(scaled_to_QImage(value.icon(), resolution.width, resolution.height));
+        }
+        m_icon->setPixmap(pixmap);
+        m_icon->setAlignment(Qt::AlignCenter);
+        layout->addWidget(m_icon);
+    }
+
+    m_text = new QLabel(QString::fromStdString(value.text()), this);
+    layout->addWidget(m_text, 1);
+//    text->setTextInteractionFlags(Qt::TextBrowserInteraction);
+//    m_text->setOpenExternalLinks(true);
+
+    m_value.add_listener(*this);
+}
+
+void LabelCellWidget::update_value(){
+    m_text->setText(QString::fromStdString(m_value.text()));
+}
+void LabelCellWidget::on_config_value_changed(void* object){
+    QMetaObject::invokeMethod(m_text, [this]{
+        update_value();
+    }, Qt::QueuedConnection);
+}
+
+
+
+
+}
diff --git a/SerialPrograms/Source/CommonFramework/Options/QtWidget/LabelCellWidget.h b/SerialPrograms/Source/CommonFramework/Options/QtWidget/LabelCellWidget.h
new file mode 100644
index 0000000000..489cd1a84e
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/Options/QtWidget/LabelCellWidget.h
@@ -0,0 +1,41 @@
+/*  Label Cell
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Options_LabelCellWidget_H
+#define PokemonAutomation_Options_LabelCellWidget_H
+
+#include <QWidget>
+#include "Common/Qt/Options/ConfigWidget.h"
+#include "CommonFramework/Options/LabelCellOption.h"
+
+class QLabel;
+
+namespace PokemonAutomation{
+
+
+
+class LabelCellWidget : public QWidget, public ConfigWidget{
+public:
+    using ParentState = LabelCellOption;
+
+public:
+    ~LabelCellWidget();
+    LabelCellWidget(QWidget& parent, LabelCellOption& value);
+
+    virtual void update_value() override;
+    virtual void on_config_value_changed(void* object) override;
+
+private:
+    LabelCellOption& m_value;
+    QLabel* m_icon = nullptr;
+    QLabel* m_text;
+};
+
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/Options/QtWidget/WallpaperWidget.cpp b/SerialPrograms/Source/CommonFramework/Options/QtWidget/WallpaperWidget.cpp
new file mode 100644
index 0000000000..253807ae5a
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/Options/QtWidget/WallpaperWidget.cpp
@@ -0,0 +1,164 @@
+/*  Wallpaper Widget
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+
+#include <utility>
+#include <QApplication>
+#include <QImageReader>
+#include <QPaintEvent>
+#include <QPainter>
+#include <QStyleOption>
+#include "CommonFramework/GlobalAutoPaths.h"
+#include "CommonFramework/GlobalSettingsPanel.h"
+#include "CommonFramework/Options/Environment/ThemeSelectorOption.h"
+#include "WallpaperWidget.h"
+
+namespace PokemonAutomation{
+
+namespace{
+
+WallpaperImageResult load_background_image(const QString& path){
+    QImageReader reader(path);
+    reader.setAutoTransform(true);
+    QImage image = reader.read();
+    if (image.isNull()){
+        return {{}, reader.errorString()};
+    }
+    return {std::move(image), {}};
+}
+
+QString get_theme_default_path(){
+    if (QApplication::palette().color(QPalette::Active, QPalette::Window).lightness() < 128 
+        || GlobalSettings::instance().THEME->get() == UiThemeMode::DARK_MODE){
+        return WallpaperWidget::DEFAULT_WALLPAPER_DARK_PATH;
+    }else{
+        return WallpaperWidget::DEFAULT_WALLPAPER_LIGHT_PATH;
+    }   
+}
+
+bool is_default_path(const QString& path){
+    return path == WallpaperWidget::DEFAULT_WALLPAPER_LIGHT_PATH || path == WallpaperWidget::DEFAULT_WALLPAPER_DARK_PATH;
+}
+
+}
+
+const QString WallpaperWidget::DEFAULT_WALLPAPER_LIGHT_PATH = QString::fromStdString(RESOURCE_PATH() + "Wallpapers/light-alpha.png");
+const QString WallpaperWidget::DEFAULT_WALLPAPER_DARK_PATH = QString::fromStdString(RESOURCE_PATH() + "Wallpapers/dark-alpha.png");
+
+WallpaperWidget::WallpaperWidget(QWidget* parent)
+    : QWidget(parent)
+{}
+
+
+void WallpaperWidget::set_appearance(
+    WallpaperImageFitMode fit_mode,
+    uint8_t overlay,
+    const QColor& surface_color
+){
+    if (m_fit_mode != fit_mode){
+        m_scaled_pixmap = QPixmap();
+    }
+    m_fit_mode = fit_mode;
+    m_overlay = overlay;
+    m_surface_color = surface_color;
+    update();
+}
+
+void WallpaperWidget::set_image(bool enabled, const QString& path){
+    if (!enabled){
+        m_pixmap = QPixmap();
+        m_scaled_pixmap = QPixmap();
+        return;
+    }
+
+    QString requested_path = path;
+    if (requested_path.isEmpty() || is_default_path(requested_path)){
+        requested_path = get_theme_default_path();
+    }
+
+    if (requested_path == m_path && !m_pixmap.isNull()){
+        return;
+    }
+
+    m_path = requested_path;
+    m_error.clear();
+    // Release the previous image before decoding its replacement.
+    m_pixmap = QPixmap();
+    m_scaled_pixmap = QPixmap();
+    update();
+    if (m_path.isEmpty()){
+        return;
+    }
+
+    WallpaperImageResult result;
+    try{
+        result = load_background_image(requested_path);
+        m_error = result.error;
+    }
+    catch (...){
+        m_error = "Unable to decode the background image.";
+    }
+
+    if (!result.image.isNull()){
+        m_pixmap = QPixmap::fromImage(std::move(result.image));
+        if (m_pixmap.isNull()){
+            m_error = "Unable to create the background pixmap.";
+        }
+    }
+
+    update();
+}
+
+bool WallpaperWidget::active() const{
+    return !m_pixmap.isNull();
+}
+
+QString WallpaperWidget::take_error(){
+    return std::exchange(m_error, QString());
+}
+
+void WallpaperWidget::paintEvent(QPaintEvent*){
+    QStyleOption option;
+    option.initFrom(this);
+    QPainter painter(this);
+    style()->drawPrimitive(QStyle::PE_Widget, &option, &painter, this);
+
+    if (m_pixmap.isNull()){
+        return;
+    }
+
+    if (m_fit_mode == WallpaperImageFitMode::TILE){
+        painter.drawTiledPixmap(rect(), m_pixmap);
+    }else{
+        const qreal pixel_ratio = devicePixelRatioF();
+        if (m_scaled_pixmap.isNull() || m_cached_size != size() || m_cached_pixel_ratio != pixel_ratio){
+            Qt::AspectRatioMode aspect_ratio = Qt::IgnoreAspectRatio;
+            if (m_fit_mode == WallpaperImageFitMode::FILL){
+                aspect_ratio = Qt::KeepAspectRatioByExpanding;
+            }else if (m_fit_mode == WallpaperImageFitMode::FIT){
+                aspect_ratio = Qt::KeepAspectRatio;
+            }
+            m_scaled_pixmap = m_pixmap.scaled(size() * pixel_ratio, aspect_ratio, Qt::SmoothTransformation);
+            m_scaled_pixmap.setDevicePixelRatio(pixel_ratio);
+            m_cached_size = size();
+            m_cached_pixel_ratio = pixel_ratio;
+        }
+        const QSizeF scaled_size = m_scaled_pixmap.deviceIndependentSize();
+        painter.drawPixmap(QPointF(
+            (width() - scaled_size.width()) / 2,
+            (height() - scaled_size.height()) / 2
+        ), m_scaled_pixmap);
+    }
+
+    if (m_overlay > 0){
+        int alpha = static_cast<int>(m_overlay) * 255 / 100;
+        QColor overlay = m_surface_color;
+        overlay.setAlpha(alpha);
+        painter.fillRect(rect(), overlay);
+    }
+}
+
+}
diff --git a/SerialPrograms/Source/CommonFramework/Options/QtWidget/WallpaperWidget.h b/SerialPrograms/Source/CommonFramework/Options/QtWidget/WallpaperWidget.h
new file mode 100644
index 0000000000..c25ac56b07
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/Options/QtWidget/WallpaperWidget.h
@@ -0,0 +1,57 @@
+/*  Wallpaper Widget
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_WallpaperWidget_H
+#define PokemonAutomation_WallpaperWidget_H
+
+#include <cstdint>
+#include <QImage>
+#include <QWidget>
+#include "CommonFramework/Options/WallpaperOption.h"
+
+class QPaintEvent;
+
+namespace PokemonAutomation{
+
+struct WallpaperImageResult{
+    QImage image;
+    QString error;
+};
+
+class WallpaperWidget : public QWidget{
+public:
+    static const QString DEFAULT_WALLPAPER_LIGHT_PATH;
+    static const QString DEFAULT_WALLPAPER_DARK_PATH;
+
+    WallpaperWidget(QWidget* parent);
+
+    void set_appearance(
+        WallpaperImageFitMode fit_mode,
+        uint8_t overlay,
+        const QColor& surface_color
+    );
+    void set_image(bool enabled, const QString& path);
+    bool active() const;
+    QString take_error();
+
+protected:
+    virtual void paintEvent(QPaintEvent*) override;
+
+private:
+    QString m_error;
+    QString m_path;
+    QPixmap m_pixmap;
+    QPixmap m_scaled_pixmap;
+    QSize m_cached_size;
+    qreal m_cached_pixel_ratio = 0;
+    WallpaperImageFitMode m_fit_mode = WallpaperImageFitMode::FILL;
+    uint8_t m_overlay = 35;
+    QColor m_surface_color;
+};
+
+}
+
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/Options/ResolutionOption.cpp b/SerialPrograms/Source/CommonFramework/Options/ResolutionOption.cpp
new file mode 100644
index 0000000000..b2bb683fb7
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/Options/ResolutionOption.cpp
@@ -0,0 +1,41 @@
+/*  Resolution Option
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/GlobalSettingsPanel.h"
+#include "CommonFramework/Windows/DpiScaler.h"
+#include "ResolutionOption.h"
+
+namespace PokemonAutomation{
+
+
+ResolutionOption::ResolutionOption(
+    std::string label, std::string description,
+    int default_width, int default_height,
+    int initial_x_pos, int initial_y_pos,
+    bool default_expanded
+)
+    : GroupOption(
+        std::move(label),
+        LockMode::LOCK_WHILE_RUNNING,
+        EnableMode::ALWAYS_ENABLED,
+        false,
+        default_expanded
+    )
+    , DESCRIPTION(std::move(description))
+    , WIDTH("<b>Width:</b>", LockMode::LOCK_WHILE_RUNNING, scale_dpi_width(default_width))
+    , HEIGHT("<b>Height:</b>", LockMode::LOCK_WHILE_RUNNING, scale_dpi_height(default_height))
+    , X_POS("<b>X-position:</b>", LockMode::LOCK_WHILE_RUNNING, scale_dpi_width(initial_x_pos))
+    , Y_POS("<b>Y-position:</b>", LockMode::LOCK_WHILE_RUNNING, scale_dpi_height(initial_y_pos))
+{
+    PA_ADD_STATIC(DESCRIPTION);
+    PA_ADD_OPTION(WIDTH);
+    PA_ADD_OPTION(HEIGHT);
+    PA_ADD_OPTION(X_POS);
+    PA_ADD_OPTION(Y_POS);
+}
+
+
+}
diff --git a/SerialPrograms/Source/CommonFramework/Options/ResolutionOption.h b/SerialPrograms/Source/CommonFramework/Options/ResolutionOption.h
new file mode 100644
index 0000000000..119494293f
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/Options/ResolutionOption.h
@@ -0,0 +1,35 @@
+/*  Resolution Option
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Options_ResolutionOption_H
+#define PokemonAutomation_Options_ResolutionOption_H
+
+#include "Common/Cpp/Options/StaticTextOption.h"
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "Common/Cpp/Options/GroupOption.h"
+
+namespace PokemonAutomation{
+
+
+class ResolutionOption : public GroupOption{
+public:
+    ResolutionOption(
+        std::string label, std::string description,
+        int default_width, int default_height,
+        int initial_x_pos, int initial_y_pos,
+        bool default_expanded
+    );
+
+    StaticTextOption DESCRIPTION;
+    SimpleIntegerOption<uint32_t> WIDTH;
+    SimpleIntegerOption<uint32_t> HEIGHT;
+    SimpleIntegerOption<int32_t> X_POS;
+    SimpleIntegerOption<int32_t> Y_POS;
+};
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/Options/ScreenWatchOption.h b/SerialPrograms/Source/CommonFramework/Options/ScreenWatchOption.h
deleted file mode 100644
index 522ab32f4e..0000000000
--- a/SerialPrograms/Source/CommonFramework/Options/ScreenWatchOption.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*  Screen Watch Option
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_Options_ScreenWatchOption_H
-#define PokemonAutomation_Options_ScreenWatchOption_H
-
-#include "Common/Cpp/Options/GroupOption.h"
-#include "Common/Cpp/Options/SimpleIntegerOption.h"
-#include "Common/Cpp/Options/FloatingPointOption.h"
-#include "CommonFramework/VideoPipeline/VideoOverlaySession.h"
-
-namespace PokemonAutomation{
-
-struct VideoSnapshot;
-class ScreenWatchOption;
-
-
-class ScreenWatchDisplay : public ConfigOption{
-public:
-    ScreenWatchDisplay(ScreenWatchOption& option)
-        : m_option(option)
-    {}
-
-    virtual ConfigWidget* make_QtWidget(QWidget& parent) override;
-
-    ScreenWatchOption& m_option;
-};
-class ScreenWatchButtons : public ConfigOption{
-public:
-    ScreenWatchButtons(ScreenWatchOption& option)
-        : m_option(option)
-    {}
-
-    virtual ConfigWidget* make_QtWidget(QWidget& parent) override;
-
-    ScreenWatchOption& m_option;
-};
-
-
-
-class ScreenWatchOption : public GroupOption{
-public:
-    ~ScreenWatchOption();
-    ScreenWatchOption(
-        std::string label,
-        double default_x = 0, double default_y = 0,
-        double default_width = 1, double default_height = 1
-    );
-
-//    virtual void load_json(const JsonValue& json) override;
-//    virtual JsonValue to_json() const override;
-
-//    virtual void restore_defaults() override;
-
-//    virtual ConfigWidget* make_QtWidget(QWidget& parent) override;
-
-    double aspect_ratio();
-    VideoSnapshot screenshot();
-
-    VideoOverlaySession& overlay();
-
-public:
-    SimpleIntegerOption<uint64_t> MONITOR_INDEX;
-    FloatingPointOption X;
-    FloatingPointOption Y;
-    FloatingPointOption WIDTH;
-    FloatingPointOption HEIGHT;
-
-private:
-    ScreenWatchDisplay m_display;
-    ScreenWatchButtons m_buttons;
-
-    VideoOverlayOption m_overlay_option;
-    VideoOverlaySession m_overlay;
-};
-
-
-
-
-
-
-}
-#endif
diff --git a/SerialPrograms/Source/CommonFramework/Options/ScreenshotFormatOption.h b/SerialPrograms/Source/CommonFramework/Options/ScreenshotFormatOption.h
index 71ebb6802c..ad351cfb06 100644
--- a/SerialPrograms/Source/CommonFramework/Options/ScreenshotFormatOption.h
+++ b/SerialPrograms/Source/CommonFramework/Options/ScreenshotFormatOption.h
@@ -1,6 +1,6 @@
 /*  Screenshot Format
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -17,8 +17,8 @@ enum class ImageAttachmentMode{
     JPG,
     PNG,
 };
-inline const EnumDatabase<ImageAttachmentMode>& ImageAttachmentMode_Database(){
-    static EnumDatabase<ImageAttachmentMode> database({
+inline const EnumDropdownDatabase<ImageAttachmentMode>& ImageAttachmentMode_Database(){
+    static EnumDropdownDatabase<ImageAttachmentMode> database({
         {ImageAttachmentMode::NO_SCREENSHOT,    "none", "No Screenshot."},
         {ImageAttachmentMode::JPG,              "jpg",  "Attach as .jpg."},
         {ImageAttachmentMode::PNG,              "png",  "Attach as .png."},
@@ -33,7 +33,7 @@ class ScreenshotCell : public EnumDropdownCell<ImageAttachmentMode>{
     ScreenshotCell(ImageAttachmentMode default_mode = ImageAttachmentMode::JPG)
         : EnumDropdownCell<ImageAttachmentMode>(
             ImageAttachmentMode_Database(),
-            LockWhileRunning::UNLOCKED,
+            LockMode::UNLOCK_WHILE_RUNNING,
             default_mode
         )
     {}
@@ -44,7 +44,7 @@ class ScreenshotOption : public EnumDropdownOption<ImageAttachmentMode>{
         : EnumDropdownOption<ImageAttachmentMode>(
             std::move(label),
             ImageAttachmentMode_Database(),
-            LockWhileRunning::UNLOCKED,
+            LockMode::UNLOCK_WHILE_RUNNING,
             ImageAttachmentMode::JPG
         )
     {}
diff --git a/SerialPrograms/Source/CommonFramework/Options/StringSelectOption.cpp b/SerialPrograms/Source/CommonFramework/Options/StringSelectOption.cpp
deleted file mode 100644
index a4b8a5a9af..0000000000
--- a/SerialPrograms/Source/CommonFramework/Options/StringSelectOption.cpp
+++ /dev/null
@@ -1,266 +0,0 @@
-/*  String Select
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <map>
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QComboBox>
-#include <QCompleter>
-#include "Common/Cpp/Exceptions.h"
-#include "Common/Cpp/Containers/Pimpl.tpp"
-#include "Common/Cpp/Json/JsonValue.h"
-#include "StringSelectOption.h"
-
-//#include <iostream>
-//using std::cout;
-//using std::endl;
-
-namespace PokemonAutomation{
-
-
-struct StringSelectDatabase::Data{
-    std::vector<StringSelectEntry> m_list;
-    std::map<std::string, size_t> m_slug_to_entry;
-    std::map<std::string, size_t> m_display_name_to_entry;
-
-    size_t search_index_by_slug(const std::string& slug) const{
-        auto iter = m_slug_to_entry.find(slug);
-        if (iter == m_slug_to_entry.end()){
-            return (size_t)0 - 1;
-        }
-        return iter->second;
-    }
-    size_t search_index_by_name(const std::string& display_name) const{
-        auto iter = m_display_name_to_entry.find(display_name);
-        if (iter == m_display_name_to_entry.end()){
-            return (size_t)0 - 1;
-        }
-        return iter->second;
-    }
-    void add_entry(StringSelectEntry entry){
-        size_t index = m_list.size();
-        StringSelectEntry& item = m_list.emplace_back(std::move(entry));
-
-        std::map<std::string, size_t>::const_iterator iter0 = m_slug_to_entry.end();
-        std::map<std::string, size_t>::const_iterator iter1 = m_display_name_to_entry.end();
-
-        try{
-            auto ret0 = m_slug_to_entry.emplace(item.slug, index);
-            if (ret0.second){
-                iter0 = ret0.first;
-            }else{
-                throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Duplicate Slug: " + item.slug);
-            }
-            auto ret1 = m_display_name_to_entry.emplace(item.display_name, index);
-            if (ret1.second){
-                iter1 = ret1.first;
-            }else{
-                throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Duplicate Display Name: " + item.display_name);
-            }
-        }catch (...){
-            m_list.pop_back();
-            if (iter0 != m_slug_to_entry.end()){
-                m_slug_to_entry.erase(iter0);
-            }
-            if (iter1 != m_display_name_to_entry.end()){
-                m_slug_to_entry.erase(iter1);
-            }
-            throw;
-        }
-    }
-};
-
-
-
-StringSelectDatabase::~StringSelectDatabase() = default;
-StringSelectDatabase::StringSelectDatabase(StringSelectDatabase&&) = default;
-StringSelectDatabase& StringSelectDatabase::operator=(StringSelectDatabase&&) = default;
-StringSelectDatabase::StringSelectDatabase(const StringSelectDatabase&) = default;
-StringSelectDatabase& StringSelectDatabase::operator=(const StringSelectDatabase&) = default;
-StringSelectDatabase::StringSelectDatabase()
-    : m_data(CONSTRUCT_TOKEN)
-{}
-
-const std::vector<StringSelectEntry>& StringSelectDatabase::case_list() const{
-    return m_data->m_list;
-}
-const StringSelectEntry& StringSelectDatabase::operator[](size_t index) const{
-    return m_data->m_list[index];
-}
-size_t StringSelectDatabase::search_index_by_slug(const std::string& slug) const{
-    return m_data->search_index_by_slug(slug);
-}
-size_t StringSelectDatabase::search_index_by_name(const std::string& display_name) const{
-    return m_data->search_index_by_name(display_name);
-}
-void StringSelectDatabase::add_entry(StringSelectEntry entry){
-    m_data->add_entry(std::move(entry));
-}
-
-
-
-
-
-struct StringSelectCell::Data{
-    const StringSelectDatabase& m_database;
-    const size_t m_default;
-    std::atomic<size_t> m_index;
-
-    Data(const StringSelectDatabase& database, size_t default_index)
-        : m_database(database)
-        , m_default(default_index)
-        , m_index(default_index)
-    {
-        if (default_index >= database.case_list().size()){
-            throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Invalid Default Index: " + std::to_string(default_index));
-        }
-    }
-    Data(const StringSelectDatabase& database, const std::string& default_slug)
-        : m_database(database)
-        , m_default(default_slug == "" ? 0 : database.search_index_by_slug(default_slug))
-        , m_index(m_default)
-    {
-        if (m_default == (size_t)0 - 1){
-            throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Invalid Default Slug: " + default_slug);
-        }
-    }
-
-    void set_by_index(size_t index){
-        if (index >= m_database.case_list().size()){
-            index = m_default;
-        }
-        m_index.store(index, std::memory_order_relaxed);
-    }
-    std::string set_by_slug(const std::string& slug){
-        size_t index = m_database.search_index_by_slug(slug);
-        if (index == (size_t)0 - 1){
-            return "Invalid Slug: " + slug;
-        }
-        m_index.store(index, std::memory_order_relaxed);
-        return "";
-    }
-    std::string set_by_name(const std::string& display_name){
-        size_t index = m_database.search_index_by_name(display_name);
-        if (index == (size_t)0 - 1){
-            return "Invalid Name: " + display_name;
-        }
-        m_index.store(index, std::memory_order_relaxed);
-        return "";
-    }
-
-    bool load_json(const JsonValue& json){
-        const std::string* str = json.get_string();
-        if (str == nullptr){
-            return false;
-        }
-        size_t index = m_database.search_index_by_slug(*str);
-        if (index == (size_t)0 - 1){
-            return false;
-        }
-        m_index.store(index, std::memory_order_relaxed);
-        return true;
-    }
-    JsonValue to_json() const{
-        return m_database.case_list()[m_index.load(std::memory_order_relaxed)].slug;
-    }
-    void restore_defaults(){
-        m_index.store(m_default, std::memory_order_relaxed);
-    }
-};
-
-
-
-
-
-StringSelectCell::~StringSelectCell() = default;
-
-
-StringSelectCell::StringSelectCell(
-    const StringSelectDatabase& database,
-    LockWhileRunning lock_while_running,
-    size_t default_index
-)
-    : ConfigOption(lock_while_running)
-    , m_data(CONSTRUCT_TOKEN, database, default_index)
-{}
-StringSelectCell::StringSelectCell(
-    const StringSelectDatabase& database,
-    LockWhileRunning lock_while_running,
-    const std::string& default_slug
-)
-    : ConfigOption(lock_while_running)
-    , m_data(CONSTRUCT_TOKEN, database, default_slug)
-{}
-
-
-size_t StringSelectCell::default_index() const{
-    return m_data->m_default;
-}
-const std::string& StringSelectCell::default_slug() const{
-    return m_data->m_database.case_list()[m_data->m_default].slug;
-}
-
-size_t StringSelectCell::index() const{
-    return m_data->m_index.load(std::memory_order_relaxed);
-}
-
-void StringSelectCell::set_by_index(size_t index){
-    m_data->set_by_index(index);
-    report_value_changed();
-}
-std::string StringSelectCell::set_by_slug(const std::string& slug){
-    std::string error = m_data->set_by_slug(slug);
-    if (error.empty()){
-        report_value_changed();
-    }
-    return "";
-}
-std::string StringSelectCell::set_by_name(const std::string& display_name){
-    std::string error = m_data->set_by_name(display_name);
-    if (error.empty()){
-        report_value_changed();
-    }
-    return "";
-}
-
-const StringSelectDatabase& StringSelectCell::database() const{
-    return m_data->m_database;
-}
-
-void StringSelectCell::load_json(const JsonValue& json){
-    if (m_data->load_json(json)){
-        report_value_changed();
-    }
-}
-JsonValue StringSelectCell::to_json() const{
-    return m_data->to_json();
-}
-void StringSelectCell::restore_defaults(){
-    m_data->restore_defaults();
-    report_value_changed();
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-}
diff --git a/SerialPrograms/Source/CommonFramework/Options/StringSelectOption.h b/SerialPrograms/Source/CommonFramework/Options/StringSelectOption.h
deleted file mode 100644
index fb31e69e16..0000000000
--- a/SerialPrograms/Source/CommonFramework/Options/StringSelectOption.h
+++ /dev/null
@@ -1,149 +0,0 @@
-/*  String Select
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_Options_StringSelectOption_H
-#define PokemonAutomation_Options_StringSelectOption_H
-
-#include <vector>
-#include "Common/Cpp/Containers/Pimpl.h"
-#include "Common/Cpp/Options/ConfigOption.h"
-#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
-
-namespace PokemonAutomation{
-
-
-
-
-struct StringSelectEntry{
-    std::string slug;
-    std::string display_name;
-    ImageViewRGB32 icon;
-
-    StringSelectEntry(std::string p_slug, std::string p_display_name)
-        : slug(std::move(p_slug))
-        , display_name(std::move(p_display_name))
-    {}
-    StringSelectEntry(std::string p_slug, std::string p_display_name, ImageViewRGB32 p_icon)
-        : slug(std::move(p_slug))
-        , display_name(std::move(p_display_name))
-        , icon(std::move(p_icon))
-    {}
-};
-
-
-
-class StringSelectDatabase{
-public:
-    ~StringSelectDatabase();
-    StringSelectDatabase(StringSelectDatabase&&);
-    StringSelectDatabase& operator=(StringSelectDatabase&&);
-    StringSelectDatabase(const StringSelectDatabase&);
-    StringSelectDatabase& operator=(const StringSelectDatabase&);
-
-public:
-    StringSelectDatabase();
-    void add_entry(StringSelectEntry entry);
-
-public:
-    const std::vector<StringSelectEntry>& case_list() const;
-
-    const StringSelectEntry& operator[](size_t index) const;
-    size_t search_index_by_slug(const std::string& slug) const;
-    size_t search_index_by_name(const std::string& display_name) const;
-
-private:
-    struct Data;
-    Pimpl<Data> m_data;
-};
-
-
-
-class StringSelectCell : public ConfigOption{
-public:
-    ~StringSelectCell();
-    StringSelectCell(const StringSelectCell&) = delete;
-    void operator=(const StringSelectCell&) = delete;
-
-public:
-    StringSelectCell(
-        const StringSelectDatabase& database,
-        LockWhileRunning lock_while_running,
-        size_t default_index
-    );
-    StringSelectCell(
-        const StringSelectDatabase& database,
-        LockWhileRunning lock_while_running,
-        const std::string& default_slug
-    );
-
-    size_t default_index() const;
-    const std::string& default_slug() const;
-
-    size_t index() const;
-    const std::string& slug() const{
-        return entry().slug;
-    }
-    const std::string& display_name() const{
-        return entry().display_name;
-    }
-    const StringSelectEntry& entry() const{
-        return database()[index()];
-    }
-
-    void set_by_index(size_t index);
-    std::string set_by_slug(const std::string& slug);
-    std::string set_by_name(const std::string& display_name);
-
-    const StringSelectDatabase& database() const;
-
-    virtual void load_json(const JsonValue& json) override;
-    virtual JsonValue to_json() const override;
-
-    virtual void restore_defaults() override;
-
-    virtual ConfigWidget* make_QtWidget(QWidget& parent) override;
-
-private:
-    struct Data;
-    Pimpl<Data> m_data;
-};
-
-
-
-class StringSelectOption : public StringSelectCell{
-public:
-    StringSelectOption(
-        std::string label,
-        const StringSelectDatabase& database,
-        LockWhileRunning lock_while_running,
-        size_t default_index
-    )
-        : StringSelectCell(database, lock_while_running, default_index)
-        , m_label(std::move(label))
-    {}
-    StringSelectOption(
-        std::string label,
-        const StringSelectDatabase& database,
-        LockWhileRunning lock_while_running,
-        const std::string& default_slug
-    )
-        : StringSelectCell(database, lock_while_running, default_slug)
-        , m_label(std::move(label))
-    {}
-
-    const std::string& label() const{ return m_label; }
-    virtual ConfigWidget* make_QtWidget(QWidget& parent) override;
-
-private:
-    std::string m_label;
-};
-
-
-
-
-
-}
-#endif
diff --git a/SerialPrograms/Source/CommonFramework/Options/StringSelectTableOption.h b/SerialPrograms/Source/CommonFramework/Options/StringSelectTableOption.h
deleted file mode 100644
index 3a185d3571..0000000000
--- a/SerialPrograms/Source/CommonFramework/Options/StringSelectTableOption.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*  String Select Table
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- *      A simple editable table of StringSelect options.
- *
- */
-
-#ifndef PokemonAutomation_Options_StringSelectTableOption_H
-#define PokemonAutomation_Options_StringSelectTableOption_H
-
-#include "Common/Cpp/Options/EditableTableOption.h"
-#include "StringSelectOption.h"
-
-namespace PokemonAutomation{
-
-
-class StringSelectTableRow : public EditableTableRow{
-public:
-    StringSelectTableRow(const StringSelectDatabase& database, const std::string& default_slug)
-        : cell(database, LockWhileRunning::LOCKED, default_slug)
-    {
-        PA_ADD_OPTION(cell);
-    }
-    virtual std::unique_ptr<EditableTableRow> clone() const{
-        std::unique_ptr<StringSelectTableRow> ret(new StringSelectTableRow(cell.database(), cell.default_slug()));
-        ret->cell.set_by_index(cell.index());
-        return ret;
-    }
-
-public:
-    StringSelectCell cell;
-};
-
-
-class StringSelectTableOption : public EditableTableOption{
-public:
-    StringSelectTableOption(
-        std::string label,
-        std::string header, const StringSelectDatabase& database, std::string default_slug
-    )
-        : EditableTableOption(std::move(label), LockWhileRunning::LOCKED)
-        , m_header(std::move(header))
-        , m_database(database)
-        , m_default_slug(std::move(default_slug))
-    {}
-
-    std::vector<std::string> all_slugs() const{
-        std::vector<std::string> slugs;
-        for (const auto& item : copy_snapshot<StringSelectTableRow>()){
-            slugs.emplace_back(item->cell.slug());
-        }
-        return slugs;
-    }
-
-    virtual std::vector<std::string> make_header() const{
-        return {m_header};
-    }
-    virtual std::unique_ptr<EditableTableRow> make_row() const{
-        return std::make_unique<StringSelectTableRow>(m_database, m_default_slug);
-    }
-
-private:
-    const std::string m_header;
-    const StringSelectDatabase& m_database;
-    const std::string m_default_slug;
-};
-
-
-
-}
-#endif
diff --git a/SerialPrograms/Source/CommonFramework/Options/ThreadPoolOption.cpp b/SerialPrograms/Source/CommonFramework/Options/ThreadPoolOption.cpp
new file mode 100644
index 0000000000..b74a86acaa
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/Options/ThreadPoolOption.cpp
@@ -0,0 +1,64 @@
+/*  Thread Pool Option
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <thread>
+#include "ThreadPoolOption.h"
+
+namespace PokemonAutomation{
+
+
+ThreadPoolOption::ThreadPoolOption(
+    std::string label,
+    std::string description,
+    ThreadPriority default_priority,
+    double default_max_thread_ratio
+)
+    : GroupOption(
+        std::move(label),
+        LockMode::UNLOCK_WHILE_RUNNING,
+        EnableMode::ALWAYS_ENABLED,
+        true
+    )
+    , m_default_max_threads(
+        std::max(
+            (size_t)(std::thread::hardware_concurrency() * default_max_thread_ratio),
+            (size_t)1
+        )
+    )
+    , HARDWARE_THREADS(
+        "<b>Hardware Threads:</b>",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        std::thread::hardware_concurrency(),
+        1,
+        std::numeric_limits<decltype(std::thread::hardware_concurrency())>::max()
+    )
+    , m_description(std::move(description))
+    , PRIORITY("<b>Thread Priority:</b>", default_priority)
+    , MAX_THREADS(
+        "<b>Maximum Threads:</b>",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        m_default_max_threads, 1
+    )
+{
+    PA_ADD_OPTION(HARDWARE_THREADS);
+    PA_ADD_STATIC(m_description);
+    PA_ADD_OPTION(PRIORITY);
+    PA_ADD_OPTION(MAX_THREADS);
+    HARDWARE_THREADS.set_visibility(ConfigOptionState::HIDDEN);
+}
+
+void ThreadPoolOption::load_json(const JsonValue& json){
+    GroupOption::load_json(json);
+
+    //  Reset the max threads if the hardware threads has changed.
+    if (HARDWARE_THREADS != std::thread::hardware_concurrency()){
+        MAX_THREADS.set(m_default_max_threads);
+    }
+}
+
+
+
+}
diff --git a/SerialPrograms/Source/CommonFramework/Options/ThreadPoolOption.h b/SerialPrograms/Source/CommonFramework/Options/ThreadPoolOption.h
new file mode 100644
index 0000000000..3c32908bc4
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/Options/ThreadPoolOption.h
@@ -0,0 +1,42 @@
+/*  Thread Pool Option
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Options_ThreadPoolOption_H
+#define PokemonAutomation_Options_ThreadPoolOption_H
+
+#include "Common/Cpp/Options/StaticTextOption.h"
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "Common/Cpp/Options/GroupOption.h"
+#include "Environment/ProcessPriorityOption.h"
+
+namespace PokemonAutomation{
+
+
+class ThreadPoolOption : public GroupOption{
+public:
+    ThreadPoolOption(
+        std::string label,
+        std::string description,
+        ThreadPriority default_priority,
+        double default_max_thread_ratio = 1.0
+    );
+
+    virtual void load_json(const JsonValue& json) override;
+
+private:
+    const size_t m_default_max_threads;
+    SimpleIntegerOption<size_t> HARDWARE_THREADS;
+
+public:
+    StaticTextOption m_description;
+    ThreadPriorityOption PRIORITY;
+    SimpleIntegerOption<size_t> MAX_THREADS;
+};
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/Options/UI/LabelCellWidget.cpp b/SerialPrograms/Source/CommonFramework/Options/UI/LabelCellWidget.cpp
deleted file mode 100644
index 9e52b24aaf..0000000000
--- a/SerialPrograms/Source/CommonFramework/Options/UI/LabelCellWidget.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-/*  Label Cell
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <QHBoxLayout>
-#include <QFrame>
-#include <QLabel>
-#include "LabelCellWidget.h"
-
-//#include <iostream>
-//using std::cout;
-//using std::endl;
-
-namespace PokemonAutomation{
-
-
-
-ConfigWidget* LabelCellOption::make_QtWidget(QWidget& parent){
-    return new LabelCellWidget(parent, *this);
-}
-
-
-LabelCellWidget::~LabelCellWidget(){
-}
-LabelCellWidget::LabelCellWidget(QWidget& parent, LabelCellOption& value)
-    : QWidget(&parent)
-    , ConfigWidget(value, *this)
-//    , m_value(value)
-{
-    QHBoxLayout* layout = new QHBoxLayout(this);
-    layout->setContentsMargins(0, 0, 0, 0);
-//    layout->setAlignment(Qt::AlignLeft);
-
-    if (value.icon()){
-        m_icon = new QLabel(this);
-        Resolution resolution = value.resolution();
-//        cout << resolution.width << " x " << resolution.height << endl;
-        QPixmap pixmap;
-        if (resolution.width == 0 || resolution.height == 0){
-            pixmap = QPixmap::fromImage(value.icon().to_QImage_ref());
-        }else{
-            pixmap = QPixmap::fromImage(value.icon().scaled_to_QImage(resolution.width, resolution.height));
-        }
-        m_icon->setPixmap(pixmap);
-        m_icon->setAlignment(Qt::AlignCenter);
-        layout->addWidget(m_icon);
-    }
-
-    m_text = new QLabel(QString::fromStdString(value.text()), this);
-    layout->addWidget(m_text, 1);
-//    text->setTextInteractionFlags(Qt::TextBrowserInteraction);
-//    m_text->setOpenExternalLinks(true);
-}
-
-
-
-
-}
diff --git a/SerialPrograms/Source/CommonFramework/Options/UI/LabelCellWidget.h b/SerialPrograms/Source/CommonFramework/Options/UI/LabelCellWidget.h
deleted file mode 100644
index 15ef36ecbc..0000000000
--- a/SerialPrograms/Source/CommonFramework/Options/UI/LabelCellWidget.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*  Label Cell
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_Options_LabelCellWidget_H
-#define PokemonAutomation_Options_LabelCellWidget_H
-
-#include <QWidget>
-#include "Common/Qt/Options/ConfigWidget.h"
-#include "CommonFramework/Options/LabelCellOption.h"
-
-class QLabel;
-
-namespace PokemonAutomation{
-
-
-
-class LabelCellWidget : public QWidget, public ConfigWidget{
-public:
-    ~LabelCellWidget();
-    LabelCellWidget(QWidget& parent, LabelCellOption& value);
-
-private:
-//    LabelCellOption& m_value;
-    QLabel* m_icon = nullptr;
-    QLabel* m_text;
-};
-
-
-
-
-}
-#endif
diff --git a/SerialPrograms/Source/CommonFramework/Options/UI/LanguageOCRWidget.h b/SerialPrograms/Source/CommonFramework/Options/UI/LanguageOCRWidget.h
deleted file mode 100644
index 34f99172f7..0000000000
--- a/SerialPrograms/Source/CommonFramework/Options/UI/LanguageOCRWidget.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*  Language OCR Option
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_Options_LanguageOCRWidget_H
-#define PokemonAutomation_Options_LanguageOCRWidget_H
-
-#include <QWidget>
-#include "Common/Qt/Options/ConfigWidget.h"
-#include "CommonFramework/Options/LanguageOCROption.h"
-
-class QLabel;
-class QComboBox;
-
-namespace PokemonAutomation{
-namespace OCR{
-
-
-class LanguageOCRCellWidget : public QWidget, public ConfigWidget{
-public:
-    LanguageOCRCellWidget(QWidget& parent, LanguageOCRCell& value);
-
-    virtual void update_value() override;
-    virtual void value_changed() override;
-
-private:
-    LanguageOCRCell& m_value;
-    QComboBox* m_box;
-    QLabel* m_status;
-    std::vector<Language> m_index_to_enum;
-//    std::map<Language, int> m_enum_to_index;
-};
-
-
-
-class LanguageOCROptionWidget : public QWidget, public ConfigWidget{
-public:
-    ~LanguageOCROptionWidget();
-    LanguageOCROptionWidget(QWidget& parent, LanguageOCROption& value);
-
-    virtual void update_value() override;
-    virtual void value_changed() override;
-
-private:
-    LanguageOCRCellWidget* m_cell;
-};
-
-
-
-}
-}
-#endif
diff --git a/SerialPrograms/Source/CommonFramework/Options/UI/ScreenWatchWidget.h b/SerialPrograms/Source/CommonFramework/Options/UI/ScreenWatchWidget.h
deleted file mode 100644
index 4c4a2d4a65..0000000000
--- a/SerialPrograms/Source/CommonFramework/Options/UI/ScreenWatchWidget.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*  Screen Watch Widget
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_Options_ScreenWatchWidget_H
-#define PokemonAutomation_Options_ScreenWatchWidget_H
-
-#include <mutex>
-#include <condition_variable>
-#include <thread>
-#include <QWidget>
-#include "Common/Qt/WidgetStackFixedAspectRatio.h"
-#include "Common/Qt/Options/ConfigWidget.h"
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "CommonFramework/VideoPipeline/UI/VideoOverlayWidget.h"
-#include "CommonFramework/Options/ScreenWatchOption.h"
-
-namespace PokemonAutomation{
-
-class ScreenWatchWidget;
-
-
-class ScreenWatchDisplayWidget : public QWidget{
-public:
-    ScreenWatchDisplayWidget(ScreenWatchOption& option, ScreenWatchWidget& parent);
-    ~ScreenWatchDisplayWidget();
-    void paintEvent(QPaintEvent* event) override;
-
-private:
-    void thread_loop();
-
-private:
-    ScreenWatchWidget& m_holder;
-    ScreenWatchOption& m_option;
-    std::mutex m_lock;
-    std::condition_variable m_cv;
-    bool m_stop;
-    VideoSnapshot m_last_frame;
-    std::thread m_updater;
-};
-
-class ScreenWatchWidget : public WidgetStackFixedAspectRatio, public ConfigWidget{
-public:
-    ScreenWatchWidget(ScreenWatchDisplay& option, QWidget& parent);
-
-private:
-    QWidget* m_widget;
-    VideoOverlayWidget* m_overlay;
-};
-
-class ScreenWatchButtonWidget : public QWidget, public ConfigWidget{
-public:
-    ScreenWatchButtonWidget(ScreenWatchOption& option, QWidget& parent);
-};
-
-
-}
-#endif
diff --git a/SerialPrograms/Source/CommonFramework/Options/UI/StringSelectWidget.cpp b/SerialPrograms/Source/CommonFramework/Options/UI/StringSelectWidget.cpp
deleted file mode 100644
index 0d25a84707..0000000000
--- a/SerialPrograms/Source/CommonFramework/Options/UI/StringSelectWidget.cpp
+++ /dev/null
@@ -1,168 +0,0 @@
-/*  String Select
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QCompleter>
-#include "Common/Cpp/PrettyPrint.h"
-#include "CommonFramework/Logging/Logger.h"
-#include "StringSelectWidget.h"
-
-//#include <iostream>
-//using std::cout;
-//using std::endl;
-
-namespace PokemonAutomation{
-
-
-
-ConfigWidget* StringSelectCell::make_QtWidget(QWidget& parent){
-    return new StringSelectCellWidget(parent, *this);
-}
-ConfigWidget* StringSelectOption::make_QtWidget(QWidget& parent){
-    return new StringSelectOptionWidget(parent, *this);
-}
-
-
-
-
-StringSelectCellWidget::~StringSelectCellWidget(){
-    m_value.remove_listener(*this);
-}
-StringSelectCellWidget::StringSelectCellWidget(QWidget& parent, StringSelectCell& value)
-    : NoWheelComboBox(&parent)
-    , ConfigWidget(value, *this)
-    , m_value(value)
-{
-    this->setEditable(true);
-    this->setInsertPolicy(QComboBox::NoInsert);
-    this->completer()->setCompletionMode(QCompleter::PopupCompletion);
-    this->completer()->setFilterMode(Qt::MatchContains);
-    this->setIconSize(QSize(25, 25));
-
-    const StringSelectEntry& entry = value.entry();
-    QPixmap pixmap = QPixmap::fromImage(entry.icon.to_QImage_ref());
-    this->addItem(pixmap, QString::fromStdString(entry.display_name));
-    this->setCurrentIndex(0);
-
-    StringSelectCellWidget::update_value();
-
-    connect(
-        this, static_cast<void(QComboBox::*)(int)>(&QComboBox::activated),
-        this, [this](int index){
-            if (index < 0){
-                m_value.restore_defaults();
-                return;
-            }
-            m_value.set_by_name(this->itemText(index).toStdString());
-//            cout << "index = " << index << endl;
-        }
-    );
-
-    value.add_listener(*this);
-}
-
-void StringSelectCellWidget::load_options(){
-//    cout << "load_options()" << endl;
-    if (this->count() <= 1){
-        const std::vector<StringSelectEntry>& cases = m_value.database().case_list();
-        global_logger_tagged().log("Loading dropdown with " + tostr_u_commas(cases.size()) + " elements.");
-        this->clear();
-        for (const auto& item : cases){
-            QPixmap pixmap = QPixmap::fromImage(item.icon.to_QImage_ref());
-            this->addItem(pixmap, QString::fromStdString(item.display_name));
-        }
-    }
-    this->setCurrentIndex((int)m_value.index());
-    update_size_cache();
-}
-void StringSelectCellWidget::hide_options(){
-//    cout << "hide_options()" << endl;
-    do{
-        //  All options shown.
-        if (this->count() > 1){
-            break;
-        }
-
-        //  No valid index.
-        int ui_index = this->currentIndex();
-        if (ui_index < 0){
-            break;
-        }
-
-        //  Mismatching selection.
-        std::string name = this->itemText(ui_index).toStdString();
-        if (name != m_value.display_name()){
-            break;
-        }
-
-        return;
-    }while (false);
-
-    //  Remove all elements and add the one that is selected.
-    this->clear();
-    const StringSelectEntry& entry = m_value.entry();
-    QPixmap pixmap = QPixmap::fromImage(entry.icon.to_QImage_ref());
-    this->addItem(pixmap, QString::fromStdString(entry.display_name));
-    this->setCurrentIndex(0);
-}
-QSize StringSelectCellWidget::sizeHint() const{
-    QSize ret = NoWheelComboBox::sizeHint();
-//    cout << ret.width() << " x " << ret.height() << endl;
-
-    double width = ret.width();
-    double height = ret.height();
-
-    width *= 1.25;
-    height *= 1.25;
-
-    return QSize((int)width, (int)height);
-}
-void StringSelectCellWidget::focusInEvent(QFocusEvent* event){
-//    cout << "focusInEvent()" << endl;
-    update_value();
-    NoWheelComboBox::focusInEvent(event);
-}
-void StringSelectCellWidget::focusOutEvent(QFocusEvent* event){
-//    cout << "focusOutEvent()" << endl;
-    NoWheelComboBox::focusOutEvent(event);
-//    update_value();
-}
-void StringSelectCellWidget::update_value(){
-    if (hasFocus()){
-        load_options();
-    }else{
-        hide_options();
-    }
-}
-void StringSelectCellWidget::value_changed(){
-    QMetaObject::invokeMethod(this, [this]{
-        update_value();
-    }, Qt::QueuedConnection);
-}
-
-
-
-
-
-StringSelectOptionWidget::StringSelectOptionWidget(QWidget& parent, StringSelectOption& value)
-    : QWidget(&parent)
-    , ConfigWidget(value, *this)
-    , m_cell(new StringSelectCellWidget(parent, value))
-{
-    QHBoxLayout* layout = new QHBoxLayout(this);
-    layout->setContentsMargins(0, 0, 0, 0);
-    QLabel* text = new QLabel(QString::fromStdString(value.label()), this);
-    text->setWordWrap(true);
-    layout->addWidget(text, 1);
-    layout->addWidget(m_cell, 1);
-}
-
-
-
-
-
-}
diff --git a/SerialPrograms/Source/CommonFramework/Options/UI/StringSelectWidget.h b/SerialPrograms/Source/CommonFramework/Options/UI/StringSelectWidget.h
deleted file mode 100644
index acabb8fafd..0000000000
--- a/SerialPrograms/Source/CommonFramework/Options/UI/StringSelectWidget.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*  String Select
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_Options_StringSelectWidget_H
-#define PokemonAutomation_Options_StringSelectWidget_H
-
-#include <QWidget>
-#include "Common/Qt/NoWheelComboBox.h"
-#include "Common/Qt/Options/ConfigWidget.h"
-#include "CommonFramework/Options/StringSelectOption.h"
-
-namespace PokemonAutomation{
-
-
-class StringSelectCellWidget : public NoWheelComboBox, public ConfigWidget{
-public:
-    ~StringSelectCellWidget();
-    StringSelectCellWidget(QWidget& parent, StringSelectCell& value);
-
-    virtual void update_value() override;
-    virtual void value_changed() override;
-
-private:
-    void load_options();
-    void hide_options();
-
-    virtual QSize sizeHint() const override;
-    virtual void focusInEvent(QFocusEvent* event) override;
-    virtual void focusOutEvent(QFocusEvent* event) override;
-
-private:
-    StringSelectCell& m_value;
-};
-
-
-
-class StringSelectOptionWidget : public QWidget, public ConfigWidget{
-public:
-    StringSelectOptionWidget(QWidget& parent, StringSelectOption& value);
-
-private:
-    StringSelectCellWidget* m_cell;
-};
-
-
-
-}
-#endif
diff --git a/SerialPrograms/Source/CommonFramework/Options/WallpaperOption.cpp b/SerialPrograms/Source/CommonFramework/Options/WallpaperOption.cpp
new file mode 100644
index 0000000000..7c907687c1
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/Options/WallpaperOption.cpp
@@ -0,0 +1,68 @@
+/*  Wallpaper Option
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+//#include "CommonFramework/Globals.h"
+#include "WallpaperOption.h"
+
+namespace PokemonAutomation{
+
+
+
+WallpaperOption::~WallpaperOption(){
+    IMAGE_OVERLAY.remove_listener(*this);
+    IMAGE_FIT.remove_listener(*this);
+    IMAGE_PATH.remove_listener(*this);
+}
+WallpaperOption::WallpaperOption()
+    : GroupOption(
+        "Wallpaper",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        EnableMode::DEFAULT_ENABLED
+    )
+    , IMAGE_PATH(
+        "<b>Wallpaper Path:</b>",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        "",
+        "Images (*.png *.jpg *.jpeg *.bmp *.webp);;All Files (*)",
+        "Select a PNG, JPEG, BMP, or WebP image"
+    )
+    , IMAGE_FIT(
+        "<b>Wallpaper Image Fit:</b>",
+        {
+            {WallpaperImageFitMode::FILL, "fill", "Fill (crop to window)"},
+            {WallpaperImageFitMode::FIT, "fit", "Fit (show entire image)"},
+            {WallpaperImageFitMode::STRETCH, "stretch", "Stretch"},
+            {WallpaperImageFitMode::TILE, "tile", "Tile"},
+        },
+        LockMode::UNLOCK_WHILE_RUNNING,
+        WallpaperImageFitMode::FILL
+    )
+    , IMAGE_OVERLAY(
+        "<b>Background Overlay (%):</b><br>Increase this to improve text readability over the image.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        35, 0, 100
+    )
+{
+    PA_ADD_OPTION(IMAGE_PATH);
+    PA_ADD_OPTION(IMAGE_FIT);
+    PA_ADD_OPTION(IMAGE_OVERLAY);
+
+    IMAGE_PATH.add_listener(*this);
+    IMAGE_FIT.add_listener(*this);
+    IMAGE_OVERLAY.add_listener(*this);
+}
+
+
+void WallpaperOption::on_config_value_changed(void* object){
+    ConfigOption::report_value_changed(this);
+}
+
+
+
+
+
+
+}
diff --git a/SerialPrograms/Source/CommonFramework/Options/WallpaperOption.h b/SerialPrograms/Source/CommonFramework/Options/WallpaperOption.h
new file mode 100644
index 0000000000..91e0a0fcd5
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/Options/WallpaperOption.h
@@ -0,0 +1,47 @@
+/*  Wallpaper Option
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_WallpaperOption_H
+#define PokemonAutomation_WallpaperOption_H
+
+#include "Common/Cpp/Options/EnumDropdownOption.h"
+#include "Common/Cpp/Options/GroupOption.h"
+#include "Common/Cpp/Options/PathOption.h"
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+
+namespace PokemonAutomation{
+
+
+
+enum class WallpaperImageFitMode{
+    FILL,
+    FIT,
+    STRETCH,
+    TILE,
+};
+
+
+
+class WallpaperOption : public GroupOption, private ConfigOption::Listener{
+public:
+    ~WallpaperOption();
+    WallpaperOption();
+
+protected:
+    virtual void on_config_value_changed(void* object) override;
+
+public:
+    PathOption IMAGE_PATH;
+    EnumDropdownOption<WallpaperImageFitMode> IMAGE_FIT;
+    SimpleIntegerOption<uint8_t> IMAGE_OVERLAY;
+};
+
+
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/Panels/ConsoleSettingsStretch.h b/SerialPrograms/Source/CommonFramework/Panels/ConsoleSettingsStretch.h
new file mode 100644
index 0000000000..fabac51daf
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/Panels/ConsoleSettingsStretch.h
@@ -0,0 +1,24 @@
+/*  Console Settings Stretch
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_ConsoleSettingsStretch_H
+#define PokemonAutomation_ConsoleSettingsStretch_H
+
+namespace PokemonAutomation{
+
+
+constexpr int CONSOLE_SETTINGS_STRETCH_L0_LABEL     =   1;
+constexpr int CONSOLE_SETTINGS_STRETCH_L0_RIGHT     =   9;
+
+constexpr int CONSOLE_SETTINGS_STRETCH_L1_BODY      =   5;
+constexpr int CONSOLE_SETTINGS_STRETCH_L1_RIGHT     =   3;
+constexpr int CONSOLE_SETTINGS_STRETCH_L1_BUTTON    =   1;
+
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/Panels/OptionsPanel.cpp b/SerialPrograms/Source/CommonFramework/Panels/OptionsPanel.cpp
new file mode 100644
index 0000000000..0738c56844
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/Panels/OptionsPanel.cpp
@@ -0,0 +1,62 @@
+/*  Options Panel
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Json/JsonValue.h"
+#include "OptionsPanel.h"
+#include "OptionsPanelSession.h"
+
+namespace PokemonAutomation{
+
+
+
+OptionsPanelDescriptor::OptionsPanelDescriptor(
+    std::string identifier,
+    std::string category, std::string display_name,
+    std::string doc_link,
+    std::string description,
+    PanelQualityStanding standing,
+    bool restore_defaults_button
+)
+    : PanelDescriptor(
+        std::move(identifier),
+        std::move(category), std::move(display_name),
+        std::move(doc_link),
+        std::move(description),
+        standing,
+        restore_defaults_button
+    )
+{}
+std::unique_ptr<PanelSession> OptionsPanelDescriptor::make_panel() const{
+    return std::make_unique<OptionsPanelSession>(*this);
+}
+
+
+
+
+OptionsPanelInstance::OptionsPanelInstance()
+    : m_options(LockMode::LOCK_WHILE_RUNNING)
+{}
+
+void OptionsPanelInstance::add_option(ConfigOption& option, std::string serialization_string){
+    m_options.add_option(option, std::move(serialization_string));
+}
+void OptionsPanelInstance::restore_defaults(){
+    m_options.restore_defaults();
+}
+JsonValue OptionsPanelInstance::to_json() const{
+    return m_options.to_json();
+}
+void OptionsPanelInstance::load_json(const JsonValue& json){
+    m_options.load_json(json);
+}
+
+
+
+
+
+
+
+}
diff --git a/SerialPrograms/Source/CommonFramework/Panels/OptionsPanel.h b/SerialPrograms/Source/CommonFramework/Panels/OptionsPanel.h
new file mode 100644
index 0000000000..83373958dc
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/Panels/OptionsPanel.h
@@ -0,0 +1,91 @@
+/*  Options Panel
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  ConsolePanel is a panel with:
+ *    - Has options.
+ *    - Has no console.
+ *    - Cannot be run.
+ *
+ */
+
+#ifndef PokemonAutomation_OptionsPanel_H
+#define PokemonAutomation_OptionsPanel_H
+
+#include "Common/Cpp/Options/ConfigOption.h"
+#include "Common/Cpp/Options/BatchOption.h"
+#include "CommonFramework/Panels/PanelSession.h"
+
+namespace PokemonAutomation{
+
+
+class OptionsPanelInstance;
+
+
+
+class OptionsPanelDescriptor : public PanelDescriptor{
+public:
+    OptionsPanelDescriptor(
+        std::string identifier,
+        std::string category, std::string display_name,
+        std::string doc_link,
+        std::string description,
+        PanelQualityStanding standing,
+        bool restore_defaults_button = true
+    );
+
+    virtual std::unique_ptr<PanelSession> make_panel() const override;
+    virtual std::unique_ptr<OptionsPanelInstance> make_instance() const = 0;
+};
+
+
+
+class OptionsPanelInstance{
+public:
+    virtual ~OptionsPanelInstance() = default;
+    OptionsPanelInstance(const OptionsPanelInstance&) = delete;
+    void operator=(const OptionsPanelInstance&) = delete;
+
+
+public:
+    OptionsPanelInstance();
+
+
+public:
+    //  Serialization
+    virtual void restore_defaults();
+    virtual JsonValue to_json() const;
+    virtual void load_json(const JsonValue& json);
+
+
+protected:
+    friend class OptionsPanelSession;
+
+    BatchOption m_options;
+    void add_option(ConfigOption& option, std::string serialization_string);
+};
+
+
+
+
+template <typename PanelInstance>
+class OptionsPanelWrapper : public PanelInstance::Descriptor{
+public:
+    virtual std::unique_ptr<OptionsPanelInstance> make_instance() const override{
+        return std::make_unique<PanelInstance>();
+    }
+};
+
+
+template <typename PanelInstance>
+std::unique_ptr<PanelDescriptor> make_OptionsPanel(){
+    return std::make_unique<OptionsPanelWrapper<PanelInstance>>();
+}
+
+
+
+
+}
+#endif
+
+
diff --git a/SerialPrograms/Source/CommonFramework/Panels/OptionsPanelSession.cpp b/SerialPrograms/Source/CommonFramework/Panels/OptionsPanelSession.cpp
new file mode 100644
index 0000000000..0cfc530a7b
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/Panels/OptionsPanelSession.cpp
@@ -0,0 +1,37 @@
+/*  Options Panel Session
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+#include "Common/Cpp/Json/JsonValue.h"
+#include "Common/Cpp/Json/JsonObject.h"
+#include "OptionsPanelSession.h"
+
+namespace PokemonAutomation{
+
+
+
+OptionsPanelSession::OptionsPanelSession(const OptionsPanelDescriptor& descriptor)
+    : UiState<OptionsPanelSession, PanelSession>(descriptor)
+    , m_descriptor(descriptor)
+    , m_instance(descriptor.make_instance())
+{}
+
+ConfigOption& OptionsPanelSession::options(){
+    return m_instance->m_options;
+}
+
+
+void OptionsPanelSession::restore_defaults(){
+    m_instance->restore_defaults();
+}
+JsonValue OptionsPanelSession::to_json() const{
+    return m_instance->to_json();
+}
+void OptionsPanelSession::load_json(const JsonValue& json){
+    m_instance->load_json(json);
+}
+
+
+
+}
diff --git a/SerialPrograms/Source/CommonFramework/Panels/OptionsPanelSession.h b/SerialPrograms/Source/CommonFramework/Panels/OptionsPanelSession.h
new file mode 100644
index 0000000000..0b9550d6d2
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/Panels/OptionsPanelSession.h
@@ -0,0 +1,43 @@
+/*  Options Panel Session
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_OptionsPanelSession_H
+#define PokemonAutomation_OptionsPanelSession_H
+
+#include "CommonFramework/Panels/PanelSession.h"
+#include "OptionsPanel.h"
+
+namespace PokemonAutomation{
+
+
+
+class OptionsPanelSession final : public UiState<OptionsPanelSession, PanelSession>{
+public:
+    OptionsPanelSession(const OptionsPanelDescriptor& descriptor);
+
+
+public:
+    const OptionsPanelDescriptor& descriptor() const{ return m_descriptor; }
+
+    ConfigOption& options();
+
+
+public:
+    virtual void restore_defaults() override;
+    virtual JsonValue to_json() const override;
+    virtual void load_json(const JsonValue& json) override;
+
+
+private:
+    const OptionsPanelDescriptor& m_descriptor;
+
+    std::unique_ptr<OptionsPanelInstance> m_instance;
+};
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/Panels/PanelDescriptor.cpp b/SerialPrograms/Source/CommonFramework/Panels/PanelDescriptor.cpp
index 80d6068bec..016d3cedc9 100644
--- a/SerialPrograms/Source/CommonFramework/Panels/PanelDescriptor.cpp
+++ b/SerialPrograms/Source/CommonFramework/Panels/PanelDescriptor.cpp
@@ -1,31 +1,56 @@
 /*  Panel Descriptor
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include "PanelDescriptor.h"
-#include "PanelInstance.h"
+#include "PanelSession.h"
 
 namespace PokemonAutomation{
 
 
+
+Color PanelDescriptor::pick_color(PanelQualityStanding standing){
+    switch (standing){
+    case PanelQualityStanding::OFFICIAL:
+        return COLOR_BLUE;
+    case PanelQualityStanding::OFFICIAL_BETA:
+        return COLOR_DARKGREEN;
+    case PanelQualityStanding::OFFICIAL_BELOW_STANDARDS:
+        return COLOR_MAGENTA;
+    case PanelQualityStanding::THIRD_PARTY:
+        return COLOR_PURPLE;
+    case PanelQualityStanding::THIRD_PARTY_UNVETTED:
+        return COLOR_ORANGE;
+    case PanelQualityStanding::UNMAINTAINED:
+    case PanelQualityStanding::DEPRECATED:
+        return COLOR_RED;
+    case PanelQualityStanding::DEVELOPER:
+        return COLOR_DARKCYAN;
+    }
+    return Color();
+}
+
 PanelDescriptor::PanelDescriptor(
-    Color color,
     std::string identifier,
     std::string category, std::string display_name,
     std::string doc_link,
-    std::string description
+    std::string description,
+    PanelQualityStanding standing,
+    bool restore_defaults_button
 )
-    : m_color(color)
-    , m_identifier(std::move(identifier))
+    : m_identifier(std::move(identifier))
     , m_category(std::move(category))
     , m_display_name(std::move(display_name))
     , m_doc_link(std::move(doc_link))
     , m_description(std::move(description))
+    , m_standing(standing)
+    , m_color(pick_color(standing))
+    , m_restore_defaults_button(restore_defaults_button)
 {}
-std::unique_ptr<PanelInstance> PanelDescriptor::make_panel() const{
-    return std::unique_ptr<PanelInstance>(new PanelInstance(*this));
+std::unique_ptr<PanelSession> PanelDescriptor::make_panel() const{
+    return std::unique_ptr<PanelSession>(new PanelSession(*this));
 }
 
 
diff --git a/SerialPrograms/Source/CommonFramework/Panels/PanelDescriptor.h b/SerialPrograms/Source/CommonFramework/Panels/PanelDescriptor.h
index 3f067368b4..a6a19ba657 100644
--- a/SerialPrograms/Source/CommonFramework/Panels/PanelDescriptor.h
+++ b/SerialPrograms/Source/CommonFramework/Panels/PanelDescriptor.h
@@ -1,6 +1,6 @@
 /*  Panel Descriptor
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -13,36 +13,63 @@
 
 namespace PokemonAutomation{
 
-class PanelInstance;
+class PanelSession;
 
 
+enum class PanelQualityStanding{
+    OFFICIAL,
+    OFFICIAL_BETA,
+    OFFICIAL_BELOW_STANDARDS,
+    THIRD_PARTY,
+    THIRD_PARTY_UNVETTED,
+    UNMAINTAINED,
+    DEPRECATED,
+    DEVELOPER,
+//    UNCATEGORIZED,
+};
+
+
+// Abstract base class that sets the interface for program descriptors.
+// A program descriptor contains various information (descriptions) of a program panel UI.
+// It can also use function `make_panel()` to create the corresponding panel.
 class PanelDescriptor{
 public:
     PanelDescriptor(
-        Color color,
         std::string identifier,
         std::string category, std::string display_name,
         std::string doc_link,
-        std::string description
+        std::string description,
+        PanelQualityStanding standing,
+        bool restore_defaults_button
     );
     virtual ~PanelDescriptor() = default;
 
-    Color color() const{ return m_color; }
     const std::string& identifier() const{ return m_identifier; }
     const std::string& category() const{ return m_category; }
     const std::string& display_name() const{ return m_display_name; }
     const std::string& doc_link() const{ return m_doc_link; }
     const std::string& description() const{ return m_description; }
+    PanelQualityStanding standing() const{ return m_standing; }
+
+    Color color() const{ return m_color; }
+    bool restore_defaults_button() const{ return m_restore_defaults_button; }
+
+    virtual std::unique_ptr<PanelSession> make_panel() const = 0;
+
+
+public:
+    static Color pick_color(PanelQualityStanding standing);
 
-    virtual std::unique_ptr<PanelInstance> make_panel() const = 0;
 
 private:
-    const Color m_color;
     const std::string m_identifier;
     const std::string m_category;
     const std::string m_display_name;
     const std::string m_doc_link;
     const std::string m_description;
+    const PanelQualityStanding m_standing;
+    const Color m_color;
+    const bool m_restore_defaults_button;
 };
 
 
diff --git a/SerialPrograms/Source/CommonFramework/Panels/PanelInstance.cpp b/SerialPrograms/Source/CommonFramework/Panels/PanelInstance.cpp
deleted file mode 100644
index 9af754ac90..0000000000
--- a/SerialPrograms/Source/CommonFramework/Panels/PanelInstance.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-/*  Panel Instance
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Cpp/Json/JsonValue.h"
-#include "CommonFramework/PersistentSettings.h"
-#include "CommonFramework/Logging/Logger.h"
-#include "PanelInstance.h"
-
-namespace PokemonAutomation{
-
-
-PanelInstance::PanelInstance(const PanelDescriptor& descriptor)
-    : m_descriptor(descriptor)
-{}
-
-void PanelInstance::from_json(){
-    JsonValue* node = PERSISTENT_SETTINGS().panels.get_value(m_descriptor.identifier());
-    if (node == nullptr){
-        return;
-    }
-    from_json(*node);
-}
-JsonValue PanelInstance::to_json() const{
-    return JsonValue();
-}
-void PanelInstance::save_settings() const{
-    const std::string& identifier = m_descriptor.identifier();
-    if (!identifier.empty()){
-        PERSISTENT_SETTINGS().panels[identifier] = to_json();
-    }
-    global_logger_tagged().log("Saving panel settings...");
-    PERSISTENT_SETTINGS().write();
-}
-
-
-
-}
diff --git a/SerialPrograms/Source/CommonFramework/Panels/PanelInstance.h b/SerialPrograms/Source/CommonFramework/Panels/PanelInstance.h
deleted file mode 100644
index 21e381a80e..0000000000
--- a/SerialPrograms/Source/CommonFramework/Panels/PanelInstance.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*  Panel Instance
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PanelInstance_H
-#define PokemonAutomation_PanelInstance_H
-
-#include "Common/Compiler.h"
-#include "PanelDescriptor.h"
-
-class QWidget;
-
-namespace PokemonAutomation{
-
-class JsonValue;
-struct PanelHolder;
-
-// Class to represent one instance of a pokemon automation program.
-// Since programs are listed in the program panels, so this class is called PanelInstance.
-// Its derived classes hold all the program data and program logic. It also calls
-// `make_widget()` to generate the UI for the program.
-class PanelInstance{
-public:
-    explicit PanelInstance(const PanelDescriptor& descriptor);
-    virtual ~PanelInstance() = default;
-
-    const PanelDescriptor& descriptor() const{ return m_descriptor; }
-
-    void save_settings() const;
-
-public:
-    virtual QWidget* make_widget(QWidget& parent, PanelHolder& holder);
-
-public:
-    //  Serialization
-    void from_json();
-    virtual void from_json(const JsonValue& json){}
-    virtual JsonValue to_json() const;
-
-protected:
-    const PanelDescriptor& m_descriptor;
-};
-
-
-
-}
-#endif
diff --git a/SerialPrograms/Source/CommonFramework/Panels/PanelList.cpp b/SerialPrograms/Source/CommonFramework/Panels/PanelList.cpp
index f4dde8540c..ae16768c86 100644
--- a/SerialPrograms/Source/CommonFramework/Panels/PanelList.cpp
+++ b/SerialPrograms/Source/CommonFramework/Panels/PanelList.cpp
@@ -1,9 +1,11 @@
 /*  Panel List
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
+#include "Common/Cpp/Exceptions.h"
+#include "CommonFramework/Logging/Logger.h"
 #include "PanelList.h"
 
 //#include <iostream>
@@ -16,11 +18,20 @@ namespace PokemonAutomation{
 
 PanelListDescriptor::PanelListDescriptor(
     std::string name,
+    const std::string& icon_path,
     bool enabled
 )
     : m_name(std::move(name))
     , m_enabled(enabled)
-{}
+{
+    if (!icon_path.empty()){
+        try{
+            m_icon = ImageRGB32(icon_path);
+        }catch (FileException& e){
+            e.log(global_logger_tagged());
+        }
+    }
+}
 
 
 
diff --git a/SerialPrograms/Source/CommonFramework/Panels/PanelList.h b/SerialPrograms/Source/CommonFramework/Panels/PanelList.h
index a957c1e2a4..995b028763 100644
--- a/SerialPrograms/Source/CommonFramework/Panels/PanelList.h
+++ b/SerialPrograms/Source/CommonFramework/Panels/PanelList.h
@@ -1,6 +1,6 @@
 /*  Panel List
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -8,6 +8,7 @@
 #define PokemonAutomation_PanelList_H
 
 #include <vector>
+#include "CommonFramework/ImageTypes/ImageRGB32.h"
 #include "CommonFramework/Panels/PanelTools.h"
 
 class QWidget;
@@ -22,18 +23,24 @@ class PanelListDescriptor{
 
 public:
     virtual ~PanelListDescriptor() = default;
-    PanelListDescriptor(std::string name, bool enabled = true);
+    PanelListDescriptor(
+        std::string name,
+        const std::string& icon_path = "",
+        bool enabled = true
+    );
 
     const std::string& name() const{ return m_name; }
+    const ImageRGB32& icon() const{ return m_icon; }
     bool enabled() const{ return m_enabled; }
 
-    virtual std::vector<PanelEntry> make_panels() const = 0;
-
-public:
     PanelListWidget* make_QWidget(QWidget& parent, PanelHolder& holder) const;
 
+protected:
+    virtual std::vector<PanelEntry> make_panels() const = 0;
+
 protected:
     std::string m_name;
+    ImageRGB32 m_icon;
     bool m_enabled;
 };
 
diff --git a/SerialPrograms/Source/CommonFramework/Panels/PanelSession.cpp b/SerialPrograms/Source/CommonFramework/Panels/PanelSession.cpp
new file mode 100644
index 0000000000..65dc9f8c77
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/Panels/PanelSession.cpp
@@ -0,0 +1,53 @@
+/*  Panel Instance
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Json/JsonValue.h"
+#include "CommonFramework/PersistentSettings.h"
+#include "CommonFramework/Logging/Logger.h"
+#include "PanelSession.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+
+
+PanelSession::PanelSession(const PanelDescriptor& descriptor)
+    : m_descriptor(descriptor)
+{}
+
+void PanelSession::load_json_from_global(){
+    JsonValue* node = PERSISTENT_SETTINGS().panels.get_value(m_descriptor.identifier());
+    if (node == nullptr){
+        return;
+    }
+    load_json(*node);
+}
+
+JsonValue PanelSession::to_json() const{
+    return JsonValue();
+}
+void PanelSession::load_json(const JsonValue& json){
+
+}
+void PanelSession::save_settings() const{
+    const std::string& identifier = m_descriptor.identifier();
+    if (!identifier.empty()){
+        PERSISTENT_SETTINGS().panels[identifier] = to_json();
+    }
+    global_logger_tagged().log("Saving panel settings...");
+    PERSISTENT_SETTINGS().write();
+}
+
+
+
+
+
+
+
+
+}
diff --git a/SerialPrograms/Source/CommonFramework/Panels/PanelSession.h b/SerialPrograms/Source/CommonFramework/Panels/PanelSession.h
new file mode 100644
index 0000000000..cefb4012f1
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/Panels/PanelSession.h
@@ -0,0 +1,47 @@
+/*  Panel Session
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PanelSession_H
+#define PokemonAutomation_PanelSession_H
+
+#include "Common/Cpp/UiWrapper.h"
+#include "PanelDescriptor.h"
+
+class QWidget;
+
+namespace PokemonAutomation{
+
+class JsonValue;
+
+// Class to represent one instance of a pokemon automation program.
+// Since programs are listed in the program panels, so this class is called PanelSession.
+// Its derived classes hold all the program data and program logic. It also calls
+// `make_widget()` to generate the UI for the program.
+class PanelSession : public UiState<PanelSession>{
+public:
+    explicit PanelSession(const PanelDescriptor& descriptor);
+    virtual ~PanelSession() = default;
+
+    const PanelDescriptor& descriptor() const{ return m_descriptor; }
+
+    void save_settings() const;
+
+
+public:
+    virtual void restore_defaults(){}
+    virtual JsonValue to_json() const;
+    virtual void load_json(const JsonValue& json);
+    void load_json_from_global();
+
+
+protected:
+    const PanelDescriptor& m_descriptor;
+};
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/Panels/PanelTools.h b/SerialPrograms/Source/CommonFramework/Panels/PanelTools.h
index 2ba38ed4a0..3e85833912 100644
--- a/SerialPrograms/Source/CommonFramework/Panels/PanelTools.h
+++ b/SerialPrograms/Source/CommonFramework/Panels/PanelTools.h
@@ -1,6 +1,6 @@
 /*  Panel
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -14,25 +14,46 @@ namespace PokemonAutomation{
 
 class Logger;
 class JsonValue;
-class PanelInstance;
+class PanelSession;
 class PanelDescriptor;
 
-
+// Abstract base class of a panel holder.
+// It is named as the owner of all the panel instances.
+// A panel instance, CommonFramework/Panels/PanelSession.h:PanelSession holds
+// both the program panel UI and the implementation of the actual program logic.
+//
+// Currently the main window is the only class that implements PanelHolder.
+// The reference of this panel holder is passed to various UI objects so that
+// when they do sth they can call back to the main window. e.g. when the progra
+// start button is pressed by user, the button code needs to lock the program
+// list UI. This is achieved by letting the button code calls PanelHolder::on_busy()
+// which is implemented by the main window
 struct PanelHolder{
     //  Returns true if ready for new panel.
     virtual bool report_new_panel_intent(const PanelDescriptor& descriptor) = 0;
 
     virtual void load_panel(
         std::shared_ptr<const PanelDescriptor> descriptor,
-        std::unique_ptr<PanelInstance> panel
+        std::unique_ptr<PanelSession> panel
     ) = 0;
-    virtual Logger& raw_logger() = 0;
+
+    // called when an automation program is running
     virtual void on_busy() = 0;
+    // called when no automation program is not running
     virtual void on_idle() = 0;
 };
 
 
 
+//  TODO: REMOVE: Temporary for refactor.
+inline PanelHolder*& global_panel_holder(){
+    static PanelHolder* holder;
+    return holder;
+}
+
+
+
+
 struct PanelEntry{
     std::string display_name;
     std::unique_ptr<PanelDescriptor> descriptor;
@@ -47,24 +68,32 @@ struct PanelEntry{
 };
 
 
-
-template <typename Descriptor, typename Instance>
-class PanelDescriptorWrapper : public Descriptor{
+// Used by `make_panel()` to link the panel instance to the panel descriptor.
+// For more details, see `make_panel()` defined below.
+template <typename Instance>
+class PanelDescriptorWrapper : public Instance::Descriptor{
 public:
-    virtual std::unique_ptr<PanelInstance> make_panel() const override{
-        return std::unique_ptr<PanelInstance>(new Instance(*this));
+    // Instance must be an inherited class of PanelSession and its constructor must be
+    // Instance(const Descriptor&)
+    virtual std::unique_ptr<PanelSession> make_panel() const override{
+        return std::make_unique<Instance>(*this);
     }
 };
 
-template <typename Descriptor, typename Instance>
+// Called by a program panel list factory to create a panel descriptor.
+// A panel descriptor holds various info (title, title color, etc.) about a program panel
+// and can also create the corresponding panel.
+//
+// template type `Descriptor` is a derived class of CommonFramework/Panels/PanelDescriptor.h:PanelDescriptor
+// and `Instance` is the program panel UI instance, derived class of 
+// CommonFramework/Panels/PanelSession.h:Panelnstance.
+//
+// Each panel descriptor instance should have implemented `make_panel()` to create the panel instance.
+// But writing this creation for each unique program implementation is repetitive. In stead, this function
+// uses `PanelDescriptorWrapper` to implement `make_panel()`.
+template <typename Instance>
 std::unique_ptr<PanelDescriptor> make_panel(){
-    return std::make_unique<PanelDescriptorWrapper<Descriptor, Instance>>();
-}
-template <typename Descriptor, typename Instance>
-std::unique_ptr<PanelDescriptor> make_settings(){
-    auto ret = std::make_unique<PanelDescriptorWrapper<Descriptor, Instance>>();
-    ret->make_panel()->from_json();
-    return ret;
+    return std::make_unique<PanelDescriptorWrapper<Instance>>();
 }
 
 
diff --git a/SerialPrograms/Source/CommonFramework/Panels/ProgramDescriptor.cpp b/SerialPrograms/Source/CommonFramework/Panels/ProgramDescriptor.cpp
index fbc8918371..cbac21d673 100644
--- a/SerialPrograms/Source/CommonFramework/Panels/ProgramDescriptor.cpp
+++ b/SerialPrograms/Source/CommonFramework/Panels/ProgramDescriptor.cpp
@@ -1,22 +1,82 @@
 /*  Program Descriptor
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include "CommonFramework/Tools/StatsTracking.h"
+#include "Common/Cpp/Json/JsonValue.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
 #include "ProgramDescriptor.h"
 
 namespace PokemonAutomation{
 
 
 
+ProgramDescriptor::ProgramDescriptor(
+    std::string identifier,
+    std::string category, std::string display_name,
+    std::string doc_link,
+    std::string description,
+    PanelQualityStanding standing,
+    bool restore_defaults_button,
+    std::vector<std::string> required_resources
+)
+    : PanelDescriptor(
+        std::move(identifier),
+        std::move(category), std::move(display_name),
+        std::move(doc_link),
+        std::move(description),
+        standing,
+        restore_defaults_button
+    )
+    , m_required_resources(std::move(required_resources))
+{}
 std::unique_ptr<StatsTracker> ProgramDescriptor::make_stats() const{
     return nullptr;
 }
 
 
 
+ProgramInstance::ProgramInstance(
+    const std::vector<std::string>& error_notification_tags,
+    LockMode options_lock_mode
+)
+    : m_options(options_lock_mode)
+    , NOTIFICATION_PROGRAM_FINISH(
+        "Program Finished",
+        true, true,
+        ImageAttachmentMode::JPG,
+        {"Notifs"}
+    )
+    , NOTIFICATION_ERROR_RECOVERABLE(
+        "Program Error (Recoverable)",
+        true, false,
+        ImageAttachmentMode::PNG,
+        error_notification_tags
+    )
+    , NOTIFICATION_ERROR_FATAL(
+        "Program Error (Fatal)",
+        true, true,
+        ImageAttachmentMode::PNG,
+        error_notification_tags
+    )
+{}
+void ProgramInstance::add_option(ConfigOption& option, std::string serialization_string){
+    m_options.add_option(option, std::move(serialization_string));
+}
+
+std::string ProgramInstance::check_validity() const{
+    return m_options.check_validity();
+}
+void ProgramInstance::restore_defaults(){
+    return m_options.restore_defaults();
+}
+JsonValue ProgramInstance::to_json() const{
+    return m_options.to_json();
+}
+void ProgramInstance::load_json(const JsonValue& json){
+    m_options.load_json(json);
+}
 
 
 
diff --git a/SerialPrograms/Source/CommonFramework/Panels/ProgramDescriptor.h b/SerialPrograms/Source/CommonFramework/Panels/ProgramDescriptor.h
index 55da979e29..b8dcbc06f1 100644
--- a/SerialPrograms/Source/CommonFramework/Panels/ProgramDescriptor.h
+++ b/SerialPrograms/Source/CommonFramework/Panels/ProgramDescriptor.h
@@ -1,29 +1,102 @@
 /*  Program Descriptor
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifndef PokemonAutomation_CommonFramework_ProgramDescriptor_H
 #define PokemonAutomation_CommonFramework_ProgramDescriptor_H
 
+#include "Common/Cpp/Options/BatchOption.h"
+#include "CommonFramework/Notifications/EventNotificationOption.h"
 #include "PanelDescriptor.h"
 
 namespace PokemonAutomation{
 
+class JsonValue;
 class StatsTracker;
+class ProgramEnvironment;
+
+
+enum class ProgramControllerClass{
+    StandardController_NoRestrictions,              //  Blue
+    StandardController_PerformanceClassSensitive,   //  Green
+    StandardController_RequiresPrecision,           //  Purple
+    StandardController_WithRestrictions,            //  Red
+    SpecializedController,                          //  Pink
+};
+enum class AllowCommandsWhenRunning{
+    DISABLE_COMMANDS,
+    ENABLE_COMMANDS,
+};
+
 
 
 class ProgramDescriptor : public PanelDescriptor{
 public:
-    using PanelDescriptor::PanelDescriptor;
+    ProgramDescriptor(
+        std::string identifier,
+        std::string category, std::string display_name,
+        std::string doc_link,
+        std::string description,
+        PanelQualityStanding standing,
+        bool restore_defaults_button,
+        std::vector<std::string> required_resources
+    );
+
+public:
+    const std::vector<std::string>& required_resources() const{ return m_required_resources; }
 
     virtual std::unique_ptr<StatsTracker> make_stats() const;
+
+private:
+    const std::vector<std::string> m_required_resources;
 };
 
 
 
 
+class ProgramInstance{
+public:
+    virtual ~ProgramInstance() = default;
+    ProgramInstance(const ProgramInstance&) = delete;
+    void operator=(const ProgramInstance&) = delete;
+
+public:
+    //  `options_lock_mode` is the lock mode of the program's options container
+    //  (`m_options`) while the program runs:
+    //  - LOCK_WHILE_RUNNING: the whole options panel is disabled while running.
+    //  - UNLOCK_WHILE_RUNNING: each option follows its own lock mode, so options
+    //    constructed with UNLOCK_WHILE_RUNNING (and buttons) stay usable while the
+    //    program runs. This is the default for all program instances.
+    ProgramInstance(
+        const std::vector<std::string>& error_notification_tags = {"Notifs"},
+        LockMode options_lock_mode = LockMode::UNLOCK_WHILE_RUNNING
+    );
+    ConfigOption& options(){ return m_options; }
+
+public:
+    virtual std::string check_validity() const;
+    virtual void restore_defaults();
+    virtual JsonValue to_json() const;
+    virtual void load_json(const JsonValue& json);
+
+public:
+    virtual void run_start_program_checks(
+        const ProgramDescriptor& descriptor,
+        ProgramEnvironment& env
+    ){}
+
+protected:
+    BatchOption m_options;
+    void add_option(ConfigOption& option, std::string serialization_string);
+
+public:
+    EventNotificationOption NOTIFICATION_PROGRAM_FINISH;
+    EventNotificationOption NOTIFICATION_ERROR_RECOVERABLE;
+    EventNotificationOption NOTIFICATION_ERROR_FATAL;
+};
+
 
 
 
diff --git a/SerialPrograms/Source/CommonFramework/Panels/SettingsPanel.cpp b/SerialPrograms/Source/CommonFramework/Panels/SettingsPanel.cpp
deleted file mode 100644
index 7ae586d986..0000000000
--- a/SerialPrograms/Source/CommonFramework/Panels/SettingsPanel.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-/*  Settings Panel
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Cpp/Json/JsonValue.h"
-#include "SettingsPanel.h"
-
-
-namespace PokemonAutomation{
-
-
-SettingsPanelInstance::SettingsPanelInstance(const PanelDescriptor& descriptor)
-    : PanelInstance(descriptor)
-    , m_options(LockWhileRunning::LOCKED)
-{}
-
-void SettingsPanelInstance::from_json(const JsonValue& json){
-    m_options.load_json(json);
-}
-JsonValue SettingsPanelInstance::to_json() const{
-    return m_options.to_json();
-}
-
-
-
-
-
-
-
-}
diff --git a/SerialPrograms/Source/CommonFramework/Panels/SettingsPanel.h b/SerialPrograms/Source/CommonFramework/Panels/SettingsPanel.h
deleted file mode 100644
index 270c3bd811..0000000000
--- a/SerialPrograms/Source/CommonFramework/Panels/SettingsPanel.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*  Settings Panel
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_SettingsPanel_H
-#define PokemonAutomation_SettingsPanel_H
-
-#include "Common/Cpp/Options/ConfigOption.h"
-#include "Common/Cpp/Options/BatchOption.h"
-#include "CommonFramework/Panels/PanelInstance.h"
-
-namespace PokemonAutomation{
-
-
-
-class SettingsPanelInstance : public PanelInstance{
-public:
-    SettingsPanelInstance(const PanelDescriptor& descriptor);
-
-    void add_option(ConfigOption& option, std::string serialization_string){
-        m_options.add_option(option, std::move(serialization_string));
-    }
-
-    virtual QWidget* make_widget(QWidget& parent, PanelHolder& holder) override;
-
-public:
-    //  Serialization
-    virtual void from_json(const JsonValue& json) override;
-    virtual JsonValue to_json() const override;
-
-protected:
-    friend class SettingsPanelWidget;
-    BatchOption m_options;
-};
-
-
-
-
-}
-#endif
-
-
diff --git a/SerialPrograms/Source/CommonFramework/Panels/UI/OptionsPanelWidget.cpp b/SerialPrograms/Source/CommonFramework/Panels/UI/OptionsPanelWidget.cpp
new file mode 100644
index 0000000000..17ef34dae6
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/Panels/UI/OptionsPanelWidget.cpp
@@ -0,0 +1,35 @@
+/*  Options Panel Widget
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Panels/UI/PanelElements.h"
+#include "OptionsPanelWidget.h"
+
+namespace PokemonAutomation{
+
+template class RegisterUiStateQtWidget<OptionsPanelWidget>;
+
+
+
+
+OptionsPanelWidget::OptionsPanelWidget(
+    QWidget& parent,
+    OptionsPanelSession& session
+)
+    : QWidget(&parent)
+{
+    populate_panel_widget(
+        *this,
+        session.descriptor(),
+        nullptr,
+        session.options(),
+        {make_actions_bar(*this, session)}
+    );
+}
+
+
+
+
+}
diff --git a/SerialPrograms/Source/CommonFramework/Panels/UI/OptionsPanelWidget.h b/SerialPrograms/Source/CommonFramework/Panels/UI/OptionsPanelWidget.h
new file mode 100644
index 0000000000..375a83b05a
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/Panels/UI/OptionsPanelWidget.h
@@ -0,0 +1,38 @@
+/*  Options Panel Widget
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_OptionsPanelWidget_H
+#define PokemonAutomation_OptionsPanelWidget_H
+
+#include <QWidget>
+#include <QVBoxLayout>
+#include "Common/Qt/UiStateQtWidget.h"
+#include "CommonFramework/Panels/OptionsPanel.h"
+#include "CommonFramework/Panels/OptionsPanelSession.h"
+
+class QPushButton;
+
+namespace PokemonAutomation{
+
+class BatchWidget;
+
+
+class OptionsPanelWidget final : public QWidget, public UiComponentQtWidget{
+public:
+    using ParentState = OptionsPanelSession;
+
+public:
+    OptionsPanelWidget(QWidget& parent, OptionsPanelSession& session);
+
+    virtual QWidget& widget() override{
+        return *this;
+    }
+};
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/Panels/UI/PanelElements.cpp b/SerialPrograms/Source/CommonFramework/Panels/UI/PanelElements.cpp
index 59d513f312..a61d84b49c 100644
--- a/SerialPrograms/Source/CommonFramework/Panels/UI/PanelElements.cpp
+++ b/SerialPrograms/Source/CommonFramework/Panels/UI/PanelElements.cpp
@@ -1,17 +1,25 @@
 /*  Panel Elements
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include <QMessageBox>
 #include <QVBoxLayout>
+#include <QScrollArea>
 #include <QLabel>
 #include <QPushButton>
-#include "CommonFramework/Globals.h"
-#include "CommonFramework/Options/Environment/ThemeSelectorOption.h"
+#include "Common/Cpp/ColoredText.h"
+#include "Common/Qt/Options/ConfigWidget.h"
+#include "CommonFramework/Panels/PanelSession.h"
+#include "CommonFramework/ProgramSession.h"
+#include "GameConsole/ConsoleProgram.h"
 #include "PanelElements.h"
 
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
 namespace PokemonAutomation{
 
 
@@ -23,14 +31,16 @@ CollapsibleGroupBox* make_panel_header(
     const std::string& description
 ){
     CollapsibleGroupBox* header = new CollapsibleGroupBox(parent, "Current Program");
+    header->setObjectName(QStringLiteral("backgroundProgramHeader"));
 
     QWidget* body = new QWidget(header);
+    body->setProperty("backgroundContainer", true);
     QVBoxLayout* vbox = new QVBoxLayout(body);
     vbox->setContentsMargins(0, 0, 0, 0);
 
     std::string name_text = "<b>Name:</b> " + display_name;
     if (!doc_link.empty()){
-        std::string path = ONLINE_DOC_URL + doc_link;
+        std::string path = ONLINE_DOC_URL_BASE + doc_link;
         name_text += " (" + make_text_url(path, "online documentation") + ")";
     }
     QLabel* name_label = new QLabel(QString::fromStdString(name_text), header);
@@ -50,64 +60,106 @@ CollapsibleGroupBox* make_panel_header(
 
     return header;
 }
+#if 0
 CollapsibleGroupBox* make_panel_header(
     QWidget& parent,
     const std::string& display_name,
     const std::string& doc_link,
     const std::string& description,
-    FeedbackType feedback,
-    PABotBaseLevel serial_level
+    ProgramControllerClass color_class
 ){
     CollapsibleGroupBox* header = make_panel_header(parent, display_name, doc_link, description);
     QLayout* layout = header->widget()->layout();
 
-    QLabel* text = nullptr;
-    switch (feedback){
-    case FeedbackType::NONE:
-        text = new QLabel(
-            QString::fromStdString(html_color_text("(This program does not use feedback. It can run without video input.)", COLOR_PURPLE)),
-            header
+    std::string text;
+    switch (color_class){
+    case ProgramControllerClass::StandardController_NoRestrictions:
+        return header;
+
+    case ProgramControllerClass::StandardController_PerformanceClassSensitive:
+        text = html_color_text(
+            "(This program is sensitive to the performance of the controller. "
+            "Wired controllers are better than wireless. "
+            "And wireless is better than tick-imprecise controller.)",
+            COLOR_DARKGREEN
         );
         break;
-    case FeedbackType::OPTIONAL_:
-        text = new QLabel(
-            QString::fromStdString(html_color_text("(This program will use video feedback if it is available. Video input is not required.)", COLOR_PURPLE)),
-            header
-        );
+
+    case ProgramControllerClass::StandardController_RequiresPrecision:
+        text = html_color_text("(This program requires a tick-precise controller.)", COLOR_PURPLE);
         break;
-    case FeedbackType::REQUIRED:
-        text = new QLabel(
-            "<font color=\"green\">(This program requires video feedback. Please make sure you choose the correct capture device.)</font>",
-            header
-        );
+
+    case ProgramControllerClass::StandardController_WithRestrictions:
+        text = html_color_text("(This program may require a specific controller in a specific environment.)", COLOR_RED);
         break;
-    }
-    text->setWordWrap(true);
-    layout->addWidget(text);
 
-    switch (serial_level){
-    case PABotBaseLevel::NOT_PABOTBASE:
+    case ProgramControllerClass::SpecializedController:
+        text = html_color_text("(This program requires a specific type of controller.)", COLOR_MAGENTA);
         break;
-    case PABotBaseLevel::PABOTBASE_12KB:{
-#if 0
-        QLabel* text = new QLabel(
-            "<font color=\"blue\">(This program will run on both Arduino Uno R3 and Teensy 2.0.</font>)",
-            header
-        );
-        text->setWordWrap(true);
-        layout->addWidget(text);
+
+    }
+
+    QLabel* label = new QLabel(QString::fromStdString(text), header);
+    label->setWordWrap(true);
+    layout->addWidget(label);
+
+    return header;
+}
 #endif
+CollapsibleGroupBox* make_panel_header(
+    QWidget& parent,
+    const std::string& display_name,
+    const std::string& doc_link,
+    const std::string& description,
+    PanelQualityStanding standing
+){
+    CollapsibleGroupBox* header = make_panel_header(parent, display_name, doc_link, description);
+    QLayout* layout = header->widget()->layout();
+
+    std::string text;
+    switch (standing){
+    case PanelQualityStanding::OFFICIAL:
+        return header;
+
+    case PanelQualityStanding::OFFICIAL_BETA:
+        text = "(This program is in beta and may not be fully stable.)";
         break;
-    }case PABotBaseLevel::PABOTBASE_31KB:{
-        QLabel* label = new QLabel(
-            "<font color=\"red\">(This program requires a Teensy or higher. PABotBase for Arduino Uno R3 does not have all the features required by this program.)</font>",
-            header
-        );
-        label->setWordWrap(true);
-        layout->addWidget(label);
+
+    case PanelQualityStanding::OFFICIAL_BELOW_STANDARDS:
+        text = "(This program does not meet our quality standards and may be difficult to use.)";
         break;
+
+    case PanelQualityStanding::THIRD_PARTY:
+        text = "(This is a 3rd party program that has not been fully vetted against our quality standards.)";
+        break;
+
+    case PanelQualityStanding::THIRD_PARTY_UNVETTED:
+        text = "(This is an unvetted 3rd party program. We take no responsibility for what happens.)";
+        break;
+
+    case PanelQualityStanding::UNMAINTAINED:
+        text = "(This program is no longer maintained and may no longer be stable.)";
+        break;
+
+    case PanelQualityStanding::DEPRECATED:
+        text = "(This program is deprecated and will likely be removed in the future.)";
+        break;
+
+    case PanelQualityStanding::DEVELOPER:
+        text = "(This is a developer program.)";
+        break;
+
     }
-    }
+
+    QLabel* label = new QLabel(
+        QString::fromStdString(
+            html_color_text(text, PanelDescriptor::pick_color(standing))
+        ),
+        header
+    );
+    label->setWordWrap(true);
+    layout->addWidget(label);
+
     return header;
 }
 
@@ -124,6 +176,11 @@ StatsBar::StatsBar(QWidget& parent)
     font.setPointSize(10);
     this->setFont(font);
 }
+StatsBar::StatsBar(QWidget& parent, ProgramSession& session)
+    : StatsBar(parent)
+{
+    set_stats("", session.historical_stats());
+}
 void StatsBar::set_stats(std::string current_stats, std::string historical_stats){
     if (current_stats.empty() && historical_stats.empty()){
         this->setText("");
@@ -154,7 +211,12 @@ void StatsBar::set_stats(std::string current_stats, std::string historical_stats
 
 
 
-RunnablePanelActionBar::RunnablePanelActionBar(QWidget& parent, ProgramState initial_state)
+RunnablePanelActionBar::RunnablePanelActionBar(
+    QWidget& parent,
+    PanelSession& panel_session,
+    ProgramSession& program_session,
+    ProgramState initial_state
+)
     : QGroupBox("Actions", &parent)
 {
     QVBoxLayout* layout = new QVBoxLayout(this);
@@ -184,11 +246,25 @@ RunnablePanelActionBar::RunnablePanelActionBar(QWidget& parent, ProgramState ini
 
     connect(
         m_start_button, &QPushButton::clicked,
-        this, [this](bool){ emit start_clicked(m_last_known_state); }
+        this, [&](bool){
+            std::string error;
+            switch (program_session.current_state()){
+            case ProgramState::STOPPED:
+                error = program_session.start_program();
+                break;
+            case ProgramState::RUNNING:
+                error = program_session.stop_program();
+                break;
+            default:;
+            }
+            if (!error.empty()){
+                program_session.report_error(error);
+            }
+        }
     );
     connect(
         m_default_button, &QPushButton::clicked,
-        this, [this](bool){
+        this, [&](bool){
             QMessageBox::StandardButton button = QMessageBox::question(
                 nullptr,
                 "Restore Defaults",
@@ -196,7 +272,7 @@ RunnablePanelActionBar::RunnablePanelActionBar(QWidget& parent, ProgramState ini
                 QMessageBox::Ok | QMessageBox::Cancel
             );
             if (button == QMessageBox::Ok){
-                emit defaults_clicked();
+                panel_session.restore_defaults();
             }
         }
     );
@@ -229,6 +305,142 @@ void RunnablePanelActionBar::set_state(ProgramState state){
 
 
 
+QWidget* make_actions_bar(
+    QWidget& panel,
+    PanelSession& session
+){
+    if (!session.descriptor().restore_defaults_button()){
+        return nullptr;
+    }
+
+    QWidget* actions_widget = new QGroupBox("Actions", &panel);
+
+    QHBoxLayout* action_layout = new QHBoxLayout(actions_widget);
+//    action_layout->setContentsMargins(0, 0, 0, 0);
+    QPushButton* default_button = new QPushButton("Restore Defaults", actions_widget);
+    {
+        action_layout->addWidget(default_button, 1);
+        QFont font = default_button->font();
+        font.setPointSize(16);
+        default_button->setFont(font);
+    }
+
+    panel.connect(
+        default_button, &QPushButton::clicked,
+        &panel, [&session](bool){
+            QMessageBox::StandardButton button = QMessageBox::question(
+                nullptr,
+                "Restore Defaults",
+                "Are you sure you wish to restore settings back to defaults? This will wipe the current settings.",
+                QMessageBox::Ok | QMessageBox::Cancel
+            );
+            if (button == QMessageBox::Ok){
+                session.restore_defaults();
+            }
+        }
+    );
+
+    return actions_widget;
+}
+
+
+
+
+void populate_panel_widget(
+    QWidget& panel,
+    const PanelDescriptor& descriptor,
+    UiState<>* console_system,
+    ConfigOption& options,
+    std::vector<QWidget*> footers
+){
+    panel.setObjectName(QString::fromUtf8("backgroundPanelRoot"));
+
+    switch (descriptor.standing()){
+    case PanelQualityStanding::DEPRECATED:{
+        QMessageBox box;
+        box.warning(
+            nullptr,
+            "Deprecation Notice",
+            QString::fromStdString(
+                "The program \"" + descriptor.display_name() + "\" is deprecated "
+                "and no longer maintained. Please consider using a newer alternative."
+            )
+        );
+        break;
+    }
+    case PanelQualityStanding::UNMAINTAINED:{
+        QMessageBox box;
+        box.warning(
+            nullptr,
+            "Reliability Notice",
+            QString::fromStdString(
+                "The program \"" + descriptor.display_name() + "\" is no longer "
+                "maintained and may not meet our quality standards."
+            )
+        );
+        break;
+    }
+    default:;
+    }
+
+    QVBoxLayout* layout = new QVBoxLayout(&panel);
+    layout->setContentsMargins(0, 0, 0, 0);
+
+    CollapsibleGroupBox* header;
+    const GameConsole::ConsoleProgramDescriptor* console_descriptor =
+        dynamic_cast<const GameConsole::ConsoleProgramDescriptor*>(&descriptor);
+    if (console_descriptor != nullptr){
+        header = make_panel_header(
+            panel,
+            descriptor.display_name(),
+            descriptor.doc_link(),
+            descriptor.description(),
+            console_descriptor->standing()
+        );
+    }else{
+        header = make_panel_header(
+            panel,
+            descriptor.display_name(),
+            descriptor.doc_link(),
+            descriptor.description()
+        );
+    }
+    layout->addWidget(header);
+
+    QScrollArea* scroll_outer = new QScrollArea(&panel);
+    scroll_outer->setObjectName(QString::fromUtf8("backgroundScrollArea"));
+    scroll_outer->viewport()->setObjectName(QString::fromUtf8("backgroundScrollViewport"));
+    layout->addWidget(scroll_outer);
+    scroll_outer->setWidgetResizable(true);
+
+    QWidget* scroll_inner = new QWidget(scroll_outer);
+    scroll_inner->setObjectName(QString::fromUtf8("backgroundScrollContents"));
+    scroll_outer->setWidget(scroll_inner);
+    QVBoxLayout* scroll_layout = new QVBoxLayout(scroll_inner);
+    scroll_layout->setAlignment(Qt::AlignTop);
+
+    if (console_system){
+        scroll_layout->addWidget(
+            dynamic_cast<QWidget*>(console_system->make_ui_component(&panel).release())
+        );
+    }
+
+    ConfigWidget* options_widget = ConfigWidget::make_from_option(options, &panel);
+    scroll_layout->addWidget(&options_widget->widget());
+
+    scroll_layout->addStretch(1);
+
+    for (QWidget* footer : footers){
+        if (footer){
+            layout->addWidget(footer);
+        }
+    }
+}
+
+
+
+
+
 
 
 
diff --git a/SerialPrograms/Source/CommonFramework/Panels/UI/PanelElements.h b/SerialPrograms/Source/CommonFramework/Panels/UI/PanelElements.h
index 940aea2c3a..550417e0e8 100644
--- a/SerialPrograms/Source/CommonFramework/Panels/UI/PanelElements.h
+++ b/SerialPrograms/Source/CommonFramework/Panels/UI/PanelElements.h
@@ -1,6 +1,6 @@
 /*  Panel Elements
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -8,16 +8,21 @@
 #define PokemonAutomation_PanelElements_H
 
 #include <string>
+#include <QGroupBox>
 #include <QLabel>
 #include "Common/Qt/CollapsibleGroupBox.h"
 #include "CommonFramework/Globals.h"
-#include "CommonFramework/ControllerDevices/SerialPortGlobals.h"
+#include "CommonFramework/Panels/ProgramDescriptor.h"
+//#include "Controllers/ControllerCapability.h"
 
 class QPushButton;
 
 namespace PokemonAutomation{
 
 
+class ConfigOption;
+class ProgramSession;
+
 
 CollapsibleGroupBox* make_panel_header(
     QWidget& parent,
@@ -25,40 +30,46 @@ CollapsibleGroupBox* make_panel_header(
     const std::string& doc_link,
     const std::string& description
 );
+#if 0
 CollapsibleGroupBox* make_panel_header(
     QWidget& parent,
     const std::string& display_name,
     const std::string& doc_link,
     const std::string& description,
-    FeedbackType feedback,
-    PABotBaseLevel serial_level
+    ProgramControllerClass color_class
+);
+#endif
+CollapsibleGroupBox* make_panel_header(
+    QWidget& parent,
+    const std::string& display_name,
+    const std::string& doc_link,
+    const std::string& description,
+    PanelQualityStanding standing
 );
 
 
 
 class StatsBar : public QLabel{
-    Q_OBJECT
 public:
     StatsBar(QWidget& parent);
+    StatsBar(QWidget& parent, ProgramSession& session);
 
-public slots:
     void set_stats(std::string current_stats, std::string historical_stats);
 };
 
 
 
 class RunnablePanelActionBar : public QGroupBox{
-    Q_OBJECT
 public:
-    RunnablePanelActionBar(QWidget& parent, ProgramState initial_state);
+    RunnablePanelActionBar(
+        QWidget& parent,
+        PanelSession& panel_session,
+        ProgramSession& program_session,
+        ProgramState initial_state
+    );
 
-public slots:
     void set_state(PokemonAutomation::ProgramState state);
 
-signals:
-    void start_clicked(ProgramState state);
-    void defaults_clicked();
-
 private:
     PokemonAutomation::ProgramState m_last_known_state;
     QPushButton* m_start_button;
@@ -68,6 +79,19 @@ public slots:
 
 
 
+QWidget* make_actions_bar(
+    QWidget& panel,
+    PanelSession& session
+);
+
+void populate_panel_widget(
+    QWidget& panel,
+    const PanelDescriptor& descriptor,
+    UiState<>* console_system,
+    ConfigOption& options,
+    std::vector<QWidget*> footers
+);
+
 
 
 
diff --git a/SerialPrograms/Source/CommonFramework/Panels/UI/PanelListWidget.cpp b/SerialPrograms/Source/CommonFramework/Panels/UI/PanelListWidget.cpp
index 14b7b32d20..387ca75331 100644
--- a/SerialPrograms/Source/CommonFramework/Panels/UI/PanelListWidget.cpp
+++ b/SerialPrograms/Source/CommonFramework/Panels/UI/PanelListWidget.cpp
@@ -1,13 +1,14 @@
 /*  Panel List Widget
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include <QMessageBox>
 #include "Common/Cpp/Exceptions.h"
 #include "CommonFramework/PersistentSettings.h"
-#include "CommonFramework/Panels/PanelInstance.h"
+//#include "CommonFramework/GlobalSettingsPanel.h"
+#include "CommonFramework/Panels/PanelSession.h"
 #include "PanelListWidget.h"
 
 namespace PokemonAutomation{
@@ -33,15 +34,30 @@ PanelListWidget::PanelListWidget(
     : QListWidget(&parent)
     , m_panel_holder(holder)
 {
+    setObjectName(QStringLiteral("backgroundProgramList"));
+    viewport()->setObjectName(QStringLiteral("backgroundProgramListViewport"));
 //    QFontMetrics fm(this->font());
+    // this->setStyleSheet(
+    //     "QListWidget::item {"
+    //     "    margin: 0px;"
+    //     "    padding: 0px;"     // Removes internal padding
+    //     "    border: none;"
+    //     "    height: 20px;"     // FORCE a specific height (adjust this number)
+    //     "}"
+    // );
+
+    int vertical_padding = 2;
+    int row_height = this->fontMetrics().height() + vertical_padding;
     for (PanelEntry& item : list){
         const std::string& display_name = item.display_name;
         PanelDescriptor* descriptor = item.descriptor.get();
 
+        addItem(QString::fromStdString(display_name));
+        QListWidgetItem* list_item = this->item(this->count() - 1);
+        list_item->setData(Qt::SizeHintRole, QSize(0, row_height));
+
         //  Label/divider
         if (descriptor == nullptr){
-            addItem(QString::fromStdString(display_name));
-            QListWidgetItem* list_item = this->item(this->count() - 1);
             QFont font = list_item->font();
             font.setBold(true);
             list_item->setFont(font);
@@ -54,9 +70,7 @@ PanelListWidget::PanelListWidget(
             throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Duplicate program name: " + display_name);
         }
 
-        addItem(QString::fromStdString(display_name));
 //        addItem(QString::fromStdString("DM Elvis for FREE SHINIES!!!"));
-        QListWidgetItem* list_item = this->item(this->count() - 1);
         Color color = descriptor->color();
         if (color){
             QColor qcolor = QColor((uint32_t)color);
@@ -85,8 +99,10 @@ void PanelListWidget::handle_panel_clicked(const std::string& text){
         return;
     }
     try{
-        std::unique_ptr<PanelInstance> panel = descriptor->make_panel();
-        panel->from_json(PERSISTENT_SETTINGS().panels[descriptor->identifier()]);
+        std::unique_ptr<PanelSession> panel = descriptor->make_panel();
+//        try{
+            panel->load_json(PERSISTENT_SETTINGS().panels[descriptor->identifier()]);
+//        }catch (ParseException&){}
         m_panel_holder.load_panel(descriptor, std::move(panel));
 
         PERSISTENT_SETTINGS().panels[JSON_PROGRAM_PANEL] = iter->first;
diff --git a/SerialPrograms/Source/CommonFramework/Panels/UI/PanelListWidget.h b/SerialPrograms/Source/CommonFramework/Panels/UI/PanelListWidget.h
index 9d4776998f..7f977747f7 100644
--- a/SerialPrograms/Source/CommonFramework/Panels/UI/PanelListWidget.h
+++ b/SerialPrograms/Source/CommonFramework/Panels/UI/PanelListWidget.h
@@ -1,6 +1,6 @@
 /*  Panel List Widget
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/CommonFramework/Panels/UI/PanelWidget.cpp b/SerialPrograms/Source/CommonFramework/Panels/UI/PanelWidget.cpp
index 733a488d6c..9d0dd998dd 100644
--- a/SerialPrograms/Source/CommonFramework/Panels/UI/PanelWidget.cpp
+++ b/SerialPrograms/Source/CommonFramework/Panels/UI/PanelWidget.cpp
@@ -1,43 +1,36 @@
 /*  Panel
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include <QVBoxLayout>
-#include <QGroupBox>
-#include <QLabel>
 #include "Common/Qt/CollapsibleGroupBox.h"
 #include "CommonFramework/Panels/PanelDescriptor.h"
-#include "CommonFramework/Panels/PanelInstance.h"
+#include "CommonFramework/Panels/PanelSession.h"
 #include "PanelElements.h"
 #include "PanelWidget.h"
 
 namespace PokemonAutomation{
 
+template class RegisterUiStateQtWidget<PanelWidget>;
 
 
-QWidget* PanelInstance::make_widget(QWidget& parent, PanelHolder& holder){
-    return new PanelWidget(parent, *this, holder);
-}
 
 
 PanelWidget::PanelWidget(
     QWidget& parent,
-    PanelInstance& instance,
-    PanelHolder& holder
+    PanelSession& session
 )
     : QWidget(&parent)
-    , m_instance(instance)
-    , m_holder(holder)
+    , m_session(session)
 {}
 
-CollapsibleGroupBox* PanelWidget::make_header(QWidget& parent){
+CollapsibleGroupBox* PanelWidget::make_header(){
     return make_panel_header(
         *this,
-        m_instance.descriptor().display_name(),
-        m_instance.descriptor().doc_link(),
-        m_instance.descriptor().description()
+        m_session.descriptor().display_name(),
+        m_session.descriptor().doc_link(),
+        m_session.descriptor().description()
     );
 }
 
diff --git a/SerialPrograms/Source/CommonFramework/Panels/UI/PanelWidget.h b/SerialPrograms/Source/CommonFramework/Panels/UI/PanelWidget.h
index 3a70c57d8b..be6abb1278 100644
--- a/SerialPrograms/Source/CommonFramework/Panels/UI/PanelWidget.h
+++ b/SerialPrograms/Source/CommonFramework/Panels/UI/PanelWidget.h
@@ -1,6 +1,6 @@
 /*  Panel
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -8,29 +8,39 @@
 #define PokemonAutomation_PanelWidget_H
 
 #include <QWidget>
+#include "Common/Qt/UiStateQtWidget.h"
 #include "CommonFramework/Panels/PanelTools.h"
+#include "CommonFramework/Panels/PanelSession.h"
 
 namespace PokemonAutomation{
 
 class CollapsibleGroupBox;
 
-class PanelWidget : public QWidget{
+// A base class to define the UI widgets of a program panel.
+// A PanelSession can call make_widget() to create it.
+// Its derived classes can call make_header() to create a collabspile program header
+// that shows program title, link to online documentation and others.
+class PanelWidget : public QWidget, public UiComponentQtWidget{
 public:
-    PanelWidget(
-        QWidget& parent,
-        PanelInstance& instance,
-        PanelHolder& holder
-    );
+    using ParentState = PanelSession;
+
+public:
+    PanelWidget(QWidget& parent, PanelSession& session);
     virtual ~PanelWidget() = default;
 
-    PanelInstance& instance(){ return m_instance; }
+//    PanelSession& session(){ return m_session; }
+
+    virtual QWidget& widget() override{
+        return *this;
+    }
 
 protected:
-    virtual CollapsibleGroupBox* make_header(QWidget& parent);
+    //  Generate a collapsible UI element that shows the program panel header.
+    //  It contains the name of the program and its description.
+    virtual CollapsibleGroupBox* make_header();
 
 protected:
-    PanelInstance& m_instance;
-    PanelHolder& m_holder;
+    PanelSession& m_session;
 };
 
 
diff --git a/SerialPrograms/Source/CommonFramework/Panels/UI/SettingsPanelWidget.cpp b/SerialPrograms/Source/CommonFramework/Panels/UI/SettingsPanelWidget.cpp
deleted file mode 100644
index e26abaead7..0000000000
--- a/SerialPrograms/Source/CommonFramework/Panels/UI/SettingsPanelWidget.cpp
+++ /dev/null
@@ -1,104 +0,0 @@
-/*  Settings Panel
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <QVBoxLayout>
-#include <QPushButton>
-#include <QScrollArea>
-#include <QGroupBox>
-#include <QMessageBox>
-#include "Common/Qt/CollapsibleGroupBox.h"
-#include "Common/Qt/Options/BatchWidget.h"
-#include "SettingsPanelWidget.h"
-
-namespace PokemonAutomation{
-
-
-QWidget* SettingsPanelInstance::make_widget(QWidget& parent, PanelHolder& holder){
-    return SettingsPanelWidget::make(parent, *this, holder);
-}
-
-
-SettingsPanelWidget* SettingsPanelWidget::make(
-    QWidget& parent,
-    SettingsPanelInstance& instance,
-    PanelHolder& holder
-){
-    SettingsPanelWidget* widget = new SettingsPanelWidget(parent, instance, holder);
-    widget->construct();
-    return widget;
-}
-SettingsPanelWidget::SettingsPanelWidget(
-    QWidget& parent,
-    SettingsPanelInstance& instance,
-    PanelHolder& holder
-)
-    : PanelWidget(parent, instance, holder)
-{}
-void SettingsPanelWidget::construct(){
-    QVBoxLayout* layout = new QVBoxLayout(this);
-    layout->setContentsMargins(0, 0, 0, 0);
-    layout->addWidget(make_header(*this));
-
-    QScrollArea* scroll = new QScrollArea(this);
-    layout->addWidget(scroll);
-    scroll->setWidgetResizable(true);
-
-    scroll->setWidget(make_options(*scroll));
-    layout->addWidget(make_actions(*this));
-}
-QWidget* SettingsPanelWidget::make_options(QWidget& parent){
-    QWidget* options_widget = new QWidget(&parent);
-    (new QVBoxLayout(&parent))->addWidget(options_widget);
-
-    QVBoxLayout* options_layout = new QVBoxLayout(options_widget);
-    options_layout->setAlignment(Qt::AlignTop);
-
-
-    SettingsPanelInstance& instance = static_cast<SettingsPanelInstance&>(m_instance);
-    m_options = static_cast<BatchWidget*>(instance.m_options.make_QtWidget(parent));
-    options_layout->addWidget(m_options);
-    options_layout->addStretch();
-
-    return options_widget;
-}
-QWidget* SettingsPanelWidget::make_actions(QWidget& parent){
-    QGroupBox* actions_widget = new QGroupBox("Actions", &parent);
-
-    QHBoxLayout* action_layout = new QHBoxLayout(actions_widget);
-//    action_layout->setContentsMargins(0, 0, 0, 0);
-    {
-        m_default_button = new QPushButton("Restore Defaults", actions_widget);
-        action_layout->addWidget(m_default_button, 1);
-        QFont font = m_default_button->font();
-        font.setPointSize(16);
-        m_default_button->setFont(font);
-    }
-
-    connect(
-        m_default_button, &QPushButton::clicked,
-        this, [this](bool){
-            QMessageBox::StandardButton button = QMessageBox::question(
-                nullptr,
-                "Restore Defaults",
-                "Are you sure you wish to restore settings back to defaults? This will wipe the current settings.",
-                QMessageBox::Ok | QMessageBox::Cancel
-            );
-            if (button == QMessageBox::Ok){
-                restore_defaults();
-            }
-        }
-    );
-
-    return actions_widget;
-}
-
-void SettingsPanelWidget::restore_defaults(){
-    m_options->option().restore_defaults();
-}
-
-
-
-}
diff --git a/SerialPrograms/Source/CommonFramework/Panels/UI/SettingsPanelWidget.h b/SerialPrograms/Source/CommonFramework/Panels/UI/SettingsPanelWidget.h
deleted file mode 100644
index 65a974f67c..0000000000
--- a/SerialPrograms/Source/CommonFramework/Panels/UI/SettingsPanelWidget.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*  Settings Panel
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_SettingsPanelWidget_H
-#define PokemonAutomation_SettingsPanelWidget_H
-
-#include "PanelWidget.h"
-#include "CommonFramework/Panels/SettingsPanel.h"
-
-class QPushButton;
-
-namespace PokemonAutomation{
-
-class BatchWidget;
-
-
-class SettingsPanelWidget : public PanelWidget{
-public:
-    static SettingsPanelWidget* make(
-        QWidget& parent,
-        SettingsPanelInstance& instance,
-        PanelHolder& holder
-    );
-
-    void restore_defaults();
-
-private:
-    SettingsPanelWidget(
-        QWidget& parent,
-        SettingsPanelInstance& instance,
-        PanelHolder& holder
-    );
-    void construct();
-    QWidget* make_options(QWidget& parent);
-    QWidget* make_actions(QWidget& parent);
-
-private:
-    friend class SettingsPanelInstance;
-
-    BatchWidget* m_options;
-    QPushButton* m_default_button;
-};
-
-
-
-}
-#endif
diff --git a/SerialPrograms/Source/CommonFramework/PersistentSettings.cpp b/SerialPrograms/Source/CommonFramework/PersistentSettings.cpp
index 8059f8b3f9..49062381db 100644
--- a/SerialPrograms/Source/CommonFramework/PersistentSettings.cpp
+++ b/SerialPrograms/Source/CommonFramework/PersistentSettings.cpp
@@ -1,22 +1,23 @@
 /*  Persistent Settings
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include <QCoreApplication>
 #include "Common/Cpp/Exceptions.h"
 #include "Common/Cpp/Json/JsonValue.h"
-#include "Common/Cpp/Json/JsonArray.h"
+//#include "Common/Cpp/Json/JsonArray.h"
 #include "Common/Cpp/Json/JsonObject.h"
-#include "CommonFramework/Globals.h"
+#include "CommonFramework/StaticGlobals.h"
+#include "CommonFramework/GlobalAutoPaths.h"
 #include "CommonFramework/GlobalSettingsPanel.h"
-#include "NintendoSwitch/Framework/NintendoSwitch_VirtualControllerMapping.h"
+#include "CommonFramework/Logging/Logger.h"
+#include "CommonFramework/Options/Environment/PerformanceOptions.h"
 #include "PersistentSettings.h"
 
-//#include <iostream>
-//using std::cout;
-//using std::endl;
+// #include <iostream>
+// using std::cout;
+// using std::endl;
 
 namespace PokemonAutomation{
 
@@ -36,46 +37,45 @@ void PersistentSettings::write() const{
     JsonObject root;
 
     root["20-GlobalSettings"] = GlobalSettings::instance().to_json();
-    root["50-SwitchKeyboardMapping"] = NintendoSwitch::read_keyboard_mapping();
+//    root["50-SwitchKeyboardMapping"] = NintendoSwitch::read_keyboard_mapping();
 
     root["99-Panels"] = panels.clone();
 
     try{
-        std::string settings_path = SETTINGS_PATH + QCoreApplication::applicationName().toStdString() + "-Settings.json";
-        root.dump(settings_path);
+        root.dump(PROGRAM_SETTING_JSON_PATH());
     }catch (FileException&){}
 }
 
 
 void PersistentSettings::read(){
-    std::string settings_path = SETTINGS_PATH + QCoreApplication::applicationName().toStdString() + "-Settings.json";
-    JsonValue json = load_json_file(settings_path);
-    JsonObject* obj = json.get_object();
+    JsonValue json = load_json_file(PROGRAM_SETTING_JSON_PATH());
+    JsonObject* obj = json.to_object();
     if (obj == nullptr){
-        throw FileException(nullptr, PA_CURRENT_FUNCTION, "Invalid settings file.", settings_path);
+        throw FileException(nullptr, PA_CURRENT_FUNCTION, "Invalid settings file.", PROGRAM_SETTING_JSON_PATH());
     }
 
     //  Need to load this subset of settings first because they will affect how
     //  "GlobalSettings" is constructed.
     const JsonValue* settings = obj->get_value("20-GlobalSettings");
     if (settings){
-        PreloadSettings::instance().load(*settings);
+        STATIC_GLOBALS.load_json(*settings);
         GlobalSettings::instance().load_json(*settings);
     }
 
 //    GlobalSettings::instance().PROCESS_PRIORITY0.update_priority_to_option();
-    GlobalSettings::instance().REALTIME_THREAD_PRIORITY0.set_on_this_thread();
+    PerformanceOptions::instance().UI_THREAD_PRIORITY.set_on_this_thread(global_logger_tagged());
 
+#if 0
     {
         const JsonArray* array = obj->get_array("50-SwitchKeyboardMapping");
         if (array){
             NintendoSwitch::set_keyboard_mapping(*array);
         }
     }
+#endif
     {
         JsonObject* value = obj->get_object("99-Panels");
         if (value){
-//            panels = to_QJson(*value).toObject();
             panels = std::move(*value);
         }
     }
diff --git a/SerialPrograms/Source/CommonFramework/PersistentSettings.h b/SerialPrograms/Source/CommonFramework/PersistentSettings.h
index 664a279e7c..d7e2f5d907 100644
--- a/SerialPrograms/Source/CommonFramework/PersistentSettings.h
+++ b/SerialPrograms/Source/CommonFramework/PersistentSettings.h
@@ -1,6 +1,6 @@
 /*  Persistent Settings
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/CommonFramework/ProgramSession.cpp b/SerialPrograms/Source/CommonFramework/ProgramSession.cpp
index 65c710b294..f4176b9199 100644
--- a/SerialPrograms/Source/CommonFramework/ProgramSession.cpp
+++ b/SerialPrograms/Source/CommonFramework/ProgramSession.cpp
@@ -1,28 +1,65 @@
 /*  Program Session
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
+#include <future>
 #include "Common/Cpp/Exceptions.h"
 #include "Common/Cpp/PanicDump.h"
+#include "Common/Cpp/Logging/GlobalLogger.h"
 #include "CommonFramework/GlobalSettingsPanel.h"
-#include "CommonFramework/Tools/StatsDatabase.h"
-#include "CommonFramework/Panels/ProgramDescriptor.h"
+#include "CommonFramework/Logging/Logger.h"
+#include "CommonFramework/Exceptions/FatalProgramException.h"
+#include "CommonFramework/Exceptions/ProgramFinishedException.h"
+#include "CommonFramework/Exceptions/OperationFailedException.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/Options/Environment/SleepSuppressOption.h"
 #include "CommonFramework/ProgramSession.h"
+#include "CommonFramework/ProgramStats/StatsDatabase.h"
+#include "CommonFramework/Notifications/ProgramInfo.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/Panels/ProgramDescriptor.h"
+#include "CommonFramework/Tools/GlobalThreadPools.h"
+#include "CommonFramework/ResourceDownload/ProgramMissingResourceTracker.h"
+#include "CommonFramework/ResourceDownload/GlobalResourceDownloadManager.h"
+#include "CommonFramework/ResourceDownload/ResourceDownloadHelpers.h"
 #include "Integrations/ProgramTracker.h"
 
 namespace PokemonAutomation{
 
 
 
+ProgramSession::RunningProgramScope::RunningProgramScope(ProgramSession& session)
+    : m_session(session)
+{
+    std::lock_guard<Mutex> lg(session.m_lock);
+    if (session.m_scope != nullptr){
+        throw InternalProgramError(
+            &session.m_logger,
+            PA_CURRENT_FUNCTION,
+            "Program is already running."
+        );
+    }
+    session.m_scope = &m_scope;
+}
+ProgramSession::RunningProgramScope::~RunningProgramScope(){
+    {
+        std::lock_guard<Mutex> lg(m_session.m_lock);
+        m_session.m_scope = nullptr;
+    }
+    m_session.m_cv.notify_all();
+}
+
+
+
+
+
 void ProgramSession::add_listener(Listener& listener){
-    std::lock_guard<std::mutex> lg(m_lock);
-    m_listeners.insert(&listener);
+    m_listeners.add(listener);
 }
 void ProgramSession::remove_listener(Listener& listener){
-    std::lock_guard<std::mutex> lg(m_lock);
-    m_listeners.erase(&listener);
+    m_listeners.remove(listener);
 }
 
 
@@ -32,10 +69,16 @@ ProgramSession::ProgramSession(const ProgramDescriptor& descriptor)
     , m_instance_id(ProgramTracker::instance().add_program(*this))
 //    , m_logger(global_logger_raw(), "Program:" + std::to_string(m_instance_id))
     , m_logger(global_logger_raw(), "Program")
-    , m_timestamp(current_time())
+    , m_last_state_change(current_time())
     , m_state(ProgramState::STOPPED)
+    , m_scope(nullptr)
 {
     load_historical_stats();
+    try{
+        validate_resource_list();
+    }catch (FileException& e){
+        e.log(global_logger_tagged());
+    }
 }
 ProgramSession::~ProgramSession(){
     ProgramTracker::instance().remove_program(m_instance_id);
@@ -43,10 +86,8 @@ ProgramSession::~ProgramSession(){
 //    join_program_thread();
 }
 
-void ProgramSession::join_program_thread(){
-    if (m_thread.joinable()){
-        m_thread.join();
-    }
+void ProgramSession::join_program_thread() noexcept{
+    m_program_thread.wait_and_ignore_exceptions();
 }
 
 
@@ -55,34 +96,69 @@ const std::string& ProgramSession::identifier() const{
     return m_descriptor.identifier();
 }
 std::string ProgramSession::current_stats() const{
-    std::lock_guard<std::mutex> lg(m_lock);
+    std::lock_guard<Mutex> lg(m_lock);
     if (m_current_stats){
-        return m_current_stats->to_str();
+        return m_current_stats->to_str(StatsTracker::DISPLAY_ON_SCREEN);
     }
     return "";
 }
 std::string ProgramSession::historical_stats() const{
-    std::lock_guard<std::mutex> lg(m_lock);
+    std::lock_guard<Mutex> lg(m_lock);
     if (m_historical_stats){
-        return m_historical_stats->to_str();
+        return m_historical_stats->to_str(StatsTracker::DISPLAY_ON_SCREEN);
     }
     return "";
 }
-WallClock ProgramSession::timestamp() const{
-    return m_timestamp.load(std::memory_order_relaxed);
+WallClock ProgramSession::last_state_change() const{
+    return m_last_state_change.load(std::memory_order_relaxed);
+}
+
+void ProgramSession::internal_stop_program(){
+    {
+        std::lock_guard<Mutex> lg(program_lock());
+        if (m_scope != nullptr){
+            m_scope->cancel(std::make_exception_ptr(ProgramCancelledException()));
+        }
+    }
+    wait_for_finish();
 }
 
 
 void ProgramSession::report_stats_changed(){
-    std::lock_guard<std::mutex> lg(m_lock);
+    std::lock_guard<Mutex> lg(m_lock);
     push_stats();
 }
 void ProgramSession::report_error(const std::string& message){
-    std::lock_guard<std::mutex> lg(m_lock);
+    std::lock_guard<Mutex> lg(m_lock);
     push_error(message);
 }
 
 
+void ProgramSession::validate_resource_list(){
+    const std::unordered_set<std::string>& master_list = all_resource_names();
+    for (const std::string& resource_string : m_descriptor.required_resources()){
+        if (!master_list.contains(resource_string)){
+            throw InternalProgramError(
+                nullptr,
+                PA_CURRENT_FUNCTION,
+                "validate_resource_list(): Invalid resource in descriptor."
+            );
+        }
+    }
+}
+void ProgramSession::report_download_error(const std::string& message){
+    std::lock_guard<Mutex> lg(m_lock);
+    push_download_error(message);
+}
+void ProgramSession::report_download_added(std::shared_ptr<ResourceDownload> download_ptr){
+    // std::lock_guard<Mutex> lg(m_lock);
+    m_listeners.run_method(&Listener::download_added, std::move(download_ptr));
+}
+void ProgramSession::report_all_downloads_done(){
+    m_listeners.run_method(&Listener::all_downloads_done);
+}
+
+
 void ProgramSession::set_state(ProgramState state){
     switch (state){
     case ProgramState::NOT_READY:
@@ -99,21 +175,24 @@ void ProgramSession::set_state(ProgramState state){
         break;
     }
     m_state.store(state, std::memory_order_relaxed);
-    for (Listener* listener : m_listeners){
-        listener->state_change(state);
-    }
+    m_listeners.run_method(&Listener::state_change, state);
 }
 void ProgramSession::push_stats(){
-    for (Listener* listener : m_listeners){
-        listener->stats_update(m_current_stats.get(), m_historical_stats.get());
-    }
+    m_listeners.run_method(
+        &Listener::stats_update,
+        m_current_stats.get(),
+        m_historical_stats.get()
+    );
 }
 void ProgramSession::push_error(const std::string& message){
-    for (Listener* listener : m_listeners){
-        listener->error(message);
-    }
+    m_listeners.run_method(&Listener::error, message);
 }
 
+void ProgramSession::push_download_error(const std::string& message){
+    m_listeners.run_method(&Listener::download_error, message);
+}
+
+
 void ProgramSession::load_historical_stats(){
     //  Load historical stats.
     std::unique_ptr<StatsTracker> stats = m_descriptor.make_stats();
@@ -150,7 +229,7 @@ void ProgramSession::update_historical_stats_with_current(){
 
 std::string ProgramSession::start_program(){
     m_logger.log("Received Program Start Request");
-    std::lock_guard<std::mutex> lg(m_lock);
+    std::lock_guard<Mutex> lg(m_lock);
 
     ProgramState state = this->current_state();
     switch (state){
@@ -170,14 +249,24 @@ std::string ProgramSession::start_program(){
 
         //  Now start the program.
         m_logger.log("Starting program...");
-        m_timestamp.store(current_time(), std::memory_order_relaxed);
+        m_last_state_change.store(current_time(), std::memory_order_relaxed);
         set_state(ProgramState::RUNNING);
-        m_thread = std::thread(
-            run_with_catch,
-            "ProgramSession::start_program()",
-            [this]{ run_program(); }
+        m_program_thread = GlobalThreadPools::unlimited_realtime().dispatch_now_blocking(
+            [this]{
+                run_with_catch(
+                    "ProgramSession::start_program()",
+                    [this]{ run_program(); }
+                );
+            }
         );
-
+#if 0
+        m_thread = Thread([this]{
+            run_with_catch(
+                "ProgramSession::start_program()",
+                [this]{ run_program(); }
+            );
+        });
+#endif
         return "";
     }
     case ProgramState::RUNNING:
@@ -198,7 +287,7 @@ std::string ProgramSession::start_program(){
 std::string ProgramSession::stop_program(){
     m_logger.log("Received Stop Request");
     {
-        std::lock_guard<std::mutex> lg(m_lock);
+        std::lock_guard<Mutex> lg(m_lock);
 
         ProgramState state = this->current_state();
         switch (state){
@@ -224,21 +313,140 @@ std::string ProgramSession::stop_program(){
         }
     }
     internal_stop_program();
+    m_last_state_change.store(current_time(), std::memory_order_relaxed);
     return "";
 }
 
 
 
 void ProgramSession::run_program(){
+    SleepSuppressScope sleep_scope(GlobalSettings::instance().SLEEP_SUPPRESS->PROGRAM_RUNNING);
+
     {
-        std::lock_guard<std::mutex> lg(m_lock);
+        std::lock_guard<Mutex> lg(m_lock);
+        if (current_state() != ProgramState::RUNNING){
+            return;
+        }
+
+        std::string error = check_validity();
+        if (!error.empty()){
+            throw UserSetupError(logger(), std::move(error));
+        }
+
         m_current_stats = m_descriptor.make_stats();
         load_historical_stats();
         push_stats();
     }
-    internal_run_program();
+
+    m_instance->options().reset_state();
+
+    ProgramInfo program_info(
+        identifier(),
+        m_descriptor.category(),
+        m_descriptor.display_name(),
+        last_state_change()
+    );
+
+    {
+        RunningProgramScope running_scope(*this);
+        if (!download_prereqs(*m_scope)){
+            return;
+        }
+        std::unique_ptr<ProgramEnvironment> env = make_env(program_info);
+        try{
+            logger().log("<b>Starting Program: " + identifier() + "</b>");
+            env->log_to_ui("- Starting Program -");
+            m_instance->run_start_program_checks(m_descriptor, *env);
+            internal_run_program(*env);
+            env->log_to_ui("- Program Finished -");
+            logger().log("Program finished normally!", COLOR_BLUE);
+        }catch (OperationCancelledException&){
+            env->log_to_ui("- Program Stopped -");
+        }catch (ProgramCancelledException&){
+            env->log_to_ui("- Program Stopped -");
+        }catch (ProgramFinishedException& e){
+            logger().log("Program finished early!", COLOR_BLUE);
+            env->log_to_ui("- Program Finished -");
+            send_program_finished_notification(
+                *env, m_instance->NOTIFICATION_PROGRAM_FINISH,
+                e.message(),
+                e.screenshot_view()
+            );
+        }catch (InvalidConnectionStateException& e){
+            logger().log("Program stopped due to connection issue.", COLOR_RED);
+            env->log_to_ui("- Invalid Connection -", COLOR_RED);
+            std::string message = e.message();
+            if (message.empty()){
+                message = e.name();
+            }
+            report_error(message);
+        }catch (FatalProgramException& e){
+            logger().log("Program stopped with an exception!", COLOR_RED);
+            env->log_to_ui("- Program Error -", COLOR_RED);
+
+            std::string message = e.message();
+            if (message.empty()){
+                message = e.name();
+            }
+            report_error(message);
+            e.send_fatal_error_notif_and_telemetry_report(*env, m_instance->NOTIFICATION_ERROR_FATAL);
+        }catch (OperationFailedExceptionWithScreenshot& e){
+            logger().log("Program stopped with an exception!", COLOR_RED);
+            env->log_to_ui("- Program Error -", COLOR_RED);
+
+            std::string message = e.message();
+            if (message.empty()){
+                message = e.name();
+            }
+            report_error(message);
+            e.send_fatal_error_notif_and_telemetry_report(*env, m_instance->NOTIFICATION_ERROR_FATAL);
+        }catch (OperationFailedException& e){ // no screenshot
+            logger().log("Program stopped with an exception!", COLOR_RED);
+            env->log_to_ui("- Program Error -", COLOR_RED);
+
+            std::string message = e.message();
+            if (message.empty()){
+                message = e.name();
+            }
+            report_error(message);
+            e.send_fatal_error_notif_and_telemetry_report(*env, m_instance->NOTIFICATION_ERROR_FATAL);
+        }catch (Exception& e){
+            logger().log("Program stopped with an exception!", COLOR_RED);
+            env->log_to_ui("- Program Error -", COLOR_RED);
+            std::string message = e.message();
+            if (message.empty()){
+                message = e.name();
+            }
+            report_error(message);
+            send_program_fatal_error_notification(
+                *env, m_instance->NOTIFICATION_ERROR_FATAL,
+                message
+            );
+        }catch (std::exception& e){
+            logger().log("Program stopped with an exception!", COLOR_RED);
+            env->log_to_ui("- Program Error -", COLOR_RED);
+            std::string message = e.what();
+            if (message.empty()){
+                message = "Unknown std::exception.";
+            }
+            report_error(message);
+            send_program_fatal_error_notification(
+                *env, m_instance->NOTIFICATION_ERROR_FATAL,
+                message
+            );
+        }catch (...){
+            logger().log("Program stopped with an exception!", COLOR_RED);
+            env->log_to_ui("- Unknown Error -", COLOR_RED);
+            report_error("Unknown error.");
+            send_program_fatal_error_notification(
+                *env, m_instance->NOTIFICATION_ERROR_FATAL,
+                "Unknown error."
+            );
+        }
+    }
+
     {
-        std::lock_guard<std::mutex> lg(m_lock);
+        std::lock_guard<Mutex> lg(m_lock);
         push_stats();
         update_historical_stats_with_current();
         set_state(ProgramState::STOPPED);
@@ -247,9 +455,118 @@ void ProgramSession::run_program(){
 
 
 
+RequiredResourceResult ProgramSession::find_missing_resources(){
 
+    bool upgrade_warning = false;
 
+    std::vector<std::string> missing_resources;
+    for(const std::string& resource_type : m_descriptor.required_resources()){
+        ResourceVersionStatus version_status = get_local_version_info(resource_type).version_status;
 
+        switch(version_status){
+        case ResourceVersionStatus::CURRENT:
+            // we have this resource, check the next one
+            continue;
+        case ResourceVersionStatus::FUTURE_VERSION:
+            // we have this resource, check the next one
+            // however, the resource that was downloaded is more updated than what the program is expecting
+            // warn the user to upgrade CC.
+            upgrade_warning = true;
+            continue;
+        case ResourceVersionStatus::OUTDATED:
+        case ResourceVersionStatus::NOT_APPLICABLE:{
+            // we don't have the resource. check remote to see if correct version is available.
+            DownloadedResourceMetadata remote_resource = get_remote_resource_metadata_from_resource_slug(resource_type);
+            DownloadedResourceMetadata expected_resource = get_expected_resource_metadata_from_resource_slug(resource_type);
+            uint16_t expected_version_num = expected_resource.version_num.value();
+            uint16_t remote_version_num = remote_resource.version_num.value();
+
+            if (expected_version_num < remote_version_num){
+                // remote version is more updated than we expect
+                // warn the user to upgrade CC.
+                upgrade_warning = true;
+
+            }else if (expected_version_num > remote_version_num){
+                throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "resources_to_download: expected_version_num > remote_version_num. This shouldn't happen."); 
+            }
+
+            missing_resources.emplace_back(remote_resource.resource_name);
+
+            break;
+        }
+        default:
+            throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "resources_to_download: Unknown enum."); 
+        }
+    }
+
+
+    return RequiredResourceResult{std::move(missing_resources), upgrade_warning};
+
+}
+
+
+
+bool ProgramSession::download_prereqs(CancellableScope& scope){
+    try{
+        auto [missing_resources, requires_upgrade] = find_missing_resources();
+
+        if (requires_upgrade){ 
+            std::string warning_string = 
+                "The program is expecting an older version of a resource than is available. "
+                "This likely means that your version of Computer Control is out of date. "
+                "We recommend that you upgrade the Computer Control program.";
+            report_error(warning_string);
+            // cout << warning_string << endl;
+        }
+        if (missing_resources.empty()){
+            // cout << "required_download_list is empty. Start the program." << endl;
+
+            return true;
+        }
+
+        // 1. Create a C++ standard promise to hold the final boolean result
+        std::promise<bool> download_promise;
+        std::future<bool> download_future = download_promise.get_future();
+
+        // ProgramMissingResourceTracker is responsible for calling report_error() if
+        // the download fails, or if exceptions are thrown within the download.
+        ProgramMissingResourceTracker missing_resource_tracker(scope, download_promise, *this);
+
+        GlobalResourceDownloadManager& global_download_manager = GlobalResourceDownloadManager::instance();
+        for (const std::string& resource_slug : missing_resources){
+            // cout << download_ptr->get_name() << endl;
+
+            auto download_ptr = global_download_manager.add_to_download_list(resource_slug);
+            if (!download_ptr){
+                std::cerr << "Error: Null download pointer for " << resource_slug << std::endl;
+                continue;
+            }
+            missing_resource_tracker.add_resource(download_ptr);
+            report_download_added(download_ptr);
+        }
+        missing_resource_tracker.finalize_initial_batch();
+
+        // Block until the ProgramMissingResourceTracker calls set_value(), 
+        // when the downloads all succeed, or one fails, or the user clicks "Stop Program"
+        bool success = download_future.get();
+
+        report_all_downloads_done();
+
+        return success;
+    }catch(OperationFailedException& e){
+        report_error(e.message());
+    }catch(InternalProgramError& e){
+        report_error(e.message());
+    }catch (const std::exception& e){
+        std::string message = std::string(e.what()) + "Report this as an error.";
+        report_error(message);
+    }catch(...){
+        report_error("show_download_prereqs_popup: Unknown exception caught. Report this as an error.");
+    }
+
+    return false;
+
+}
 
 
 
diff --git a/SerialPrograms/Source/CommonFramework/ProgramSession.h b/SerialPrograms/Source/CommonFramework/ProgramSession.h
index 4996966431..af12d8c820 100644
--- a/SerialPrograms/Source/CommonFramework/ProgramSession.h
+++ b/SerialPrograms/Source/CommonFramework/ProgramSession.h
@@ -1,6 +1,6 @@
 /*  Program Session
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  *      ProgramSession represents the real-time state of a program.
  *
@@ -16,13 +16,21 @@
 #ifndef PokemonAutomation_CommonFramework_ProgramSession_H
 #define PokemonAutomation_CommonFramework_ProgramSession_H
 
-#include <set>
-#include <mutex>
 #include <atomic>
-#include <thread>
+#include <vector>
+#include <string>
+#include "Common/Cpp/Logging/TaggedLogger.h"
 #include "Common/Cpp/Time.h"
+#include "Common/Cpp/ListenerSet.h"
+#include "Common/Cpp/CancellableScope.h"
+#include "Common/Cpp/Concurrency/Mutex.h"
+#include "Common/Cpp/Concurrency/ConditionVariable.h"
+#include "Common/Cpp/Concurrency/AsyncTask.h"
 #include "CommonFramework/Globals.h"
-#include "CommonFramework/Logging/Logger.h"
+//#include "CommonFramework/Logging/Logger.h"
+#include "CommonFramework/Panels/ProgramDescriptor.h"
+#include "CommonFramework/Tools/ProgramEnvironment.h"
+// #include "CommonFramework/ResourceDownload/ProgramMissingResourceTracker.h"
 #include "Integrations/ProgramTrackerInterfaces.h"
 
 namespace PokemonAutomation{
@@ -30,6 +38,13 @@ namespace PokemonAutomation{
 class StatsTracker;
 class CancellableScope;
 class ProgramDescriptor;
+class ResourceDownload;
+
+struct RequiredResourceResult{
+    std::vector<std::string> missing_resources;
+    bool requires_upgrade = false;
+};
+
 
 
 
@@ -39,6 +54,9 @@ class ProgramSession : public TrackableProgram{
         virtual void state_change(ProgramState state) = 0;
         virtual void stats_update(const StatsTracker* current_stats, const StatsTracker* historical_stats) = 0;
         virtual void error(const std::string& message) = 0;
+        virtual void download_error(const std::string& message) = 0;
+        virtual void download_added(std::shared_ptr<ResourceDownload> download_ptr) = 0;
+        virtual void all_downloads_done() = 0;
     };
 
     void add_listener(Listener& listener);
@@ -60,6 +78,16 @@ class ProgramSession : public TrackableProgram{
     Logger& logger(){ return m_logger; }
 
 
+    // - return struct that contains the list of missing resources and boolean upgrade_warning.
+    // - upgrade_warning: is true if we need to warn the user to upgrade CC. 
+    // i.e. the resource that was/will be downloaded is more updated than what the program is expecting
+    // - a resource is considered to be missing if its ResourceVersionStatus is OUTDATED or NOT_APPLICABLE.
+    // - throw OperationFailedException if one of the required_resources isn't found within remote_resource_download_list
+    RequiredResourceResult find_missing_resources();
+
+    bool download_prereqs(CancellableScope& scope);
+
+
 public:
     //  Getters
 
@@ -67,13 +95,13 @@ class ProgramSession : public TrackableProgram{
     virtual ProgramState current_state() const override final{ return m_state.load(std::memory_order_relaxed); }
     virtual std::string current_stats() const override final;
     std::string historical_stats() const;
-    virtual WallClock timestamp() const final;
+    virtual WallClock last_state_change() const final;
 
     //  Temporary for migration.
     StatsTracker* current_stats_tracker(){ return m_current_stats.get(); }
     const StatsTracker* historical_stats_tracker() const{ return m_historical_stats.get(); }
 
-    std::mutex& program_lock() const{ return m_lock; }
+    Mutex& program_lock() const{ return m_lock; }
 
 
 public:
@@ -91,8 +119,9 @@ class ProgramSession : public TrackableProgram{
 
 
 protected:
-    virtual void internal_run_program() = 0;
-    virtual void internal_stop_program() = 0;
+    virtual std::unique_ptr<ProgramEnvironment> make_env(const ProgramInfo& program_info) = 0;
+    virtual void internal_run_program(ProgramEnvironment& env) = 0;
+    virtual void internal_stop_program();
 
 //    virtual void restore_defaults(){ return; }
 
@@ -100,12 +129,17 @@ class ProgramSession : public TrackableProgram{
     void report_stats_changed();
     void report_error(const std::string& message);
 
+    void validate_resource_list();
+    void report_download_error(const std::string& message);
+    void report_download_added(std::shared_ptr<ResourceDownload> download_ptr);
+    void report_all_downloads_done();
+
 
 protected:
     //  Everything here must be called under the lock.
 
     virtual std::string check_validity() const{ return ""; }
-    void join_program_thread();
+    void join_program_thread() noexcept;
 
 private:
     //  Everything here must be called under the lock.
@@ -113,6 +147,7 @@ class ProgramSession : public TrackableProgram{
     void set_state(ProgramState state);
     void push_stats();
     void push_error(const std::string& message);
+    void push_download_error(const std::string& message);
     void load_historical_stats();
     void update_historical_stats_with_current();
 
@@ -127,18 +162,43 @@ class ProgramSession : public TrackableProgram{
     uint64_t m_instance_id = 0;
     TaggedLogger m_logger;
 
-    mutable std::mutex m_lock;
 
-    std::atomic<WallClock> m_timestamp;
+    mutable Mutex m_lock;
+    ConditionVariable m_cv;
+
+    std::atomic<WallClock> m_last_state_change;
     std::atomic<ProgramState> m_state;
-    std::thread m_thread;
 
-//    std::mutex m_stats_lock;
+    // ProgramMissingResourceTracker m_missing_resource_tracker;
+
+    AsyncTask m_program_thread;
+
+//    Mutex m_stats_lock;
     std::unique_ptr<StatsTracker> m_historical_stats;
     std::unique_ptr<StatsTracker> m_current_stats;
-//    CancellableScope* m_scope = nullptr;
 
-    std::set<Listener*> m_listeners;
+    ListenerSet<Listener> m_listeners;
+
+
+protected:
+    std::unique_ptr<ProgramInstance> m_instance;
+
+    class RunningProgramScope{
+    public:
+        RunningProgramScope(ProgramSession& session);
+        ~RunningProgramScope();
+
+    private:
+        ProgramSession& m_session;
+        CancellableHolder<CancellableScope> m_scope;
+    };
+
+    void wait_for_finish(){
+        std::unique_lock<Mutex> lg(m_lock);
+        m_cv.wait(lg, [this]{ return m_scope == nullptr; });
+    }
+
+    CancellableScope* m_scope;
 };
 
 
diff --git a/SerialPrograms/Source/CommonFramework/Tools/StatsDatabase.cpp b/SerialPrograms/Source/CommonFramework/ProgramStats/StatsDatabase.cpp
similarity index 80%
rename from SerialPrograms/Source/CommonFramework/Tools/StatsDatabase.cpp
rename to SerialPrograms/Source/CommonFramework/ProgramStats/StatsDatabase.cpp
index 8465a4e583..07d2610122 100644
--- a/SerialPrograms/Source/CommonFramework/Tools/StatsDatabase.cpp
+++ b/SerialPrograms/Source/CommonFramework/ProgramStats/StatsDatabase.cpp
@@ -1,17 +1,18 @@
 /*  Stats Database
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include <QFile>
-#include <QSaveFile>
-#include "ClientSource/Libraries/Logging.h"
+#include "Common/Cpp/Filesystem/FileIO.h"
+#include "Common/Cpp/Filesystem/Filesystem.h"
+#include "Common/Cpp/Time.h"
+
 #include "StatsDatabase.h"
 
-#include <iostream>
-using std::cout;
-using std::endl;
+//#include <iostream>
+//using std::cout;
+//using std::endl;
 
 namespace PokemonAutomation{
 
@@ -34,13 +35,17 @@ const std::map<std::string, std::string> STATS_DATABASE_ALIASES{
     {"Shiny Hunt Autonomous - Whistling", "PokemonSwSh:ShinyHuntAutonomousWhistling"},
     {"Shiny Hunt Autonomous - Fishing", "PokemonSwSh:ShinyHuntAutonomousFishing"},
     {"Shiny Hunt Autonomous - Overworld", "PokemonSwSh:ShinyHuntAutonomousOverworld"},
+    {"PokemonSV:StatsResetBloodmoon", "PokemonSV:StatsResetEventBattle"},
+    {"PokemonLZA:ShinyHunt-Bench", "PokemonLZA:ShinyHunt-BenchSit"},
+    {"PokemonLZA:BerryBuyer", "PokemonLZA:StallBuyer"},
+    {"PokemonFRLG:LuckyEggFarmer", "PokemonFRLG:HeldItemFarmerSafariZone"},
 };
 
 
 
 StatLine::StatLine(StatsTracker& tracker)
     : m_time(current_time_to_str())
-    , m_stats(tracker.to_str())
+    , m_stats(tracker.to_str(StatsTracker::SAVE_TO_STATS_FILE))
 {}
 StatLine::StatLine(const std::string& line){
     size_t pos = line.find(" - ");
@@ -131,18 +136,18 @@ std::string StatSet::to_str() const{
 }
 
 void StatSet::save_to_file(const std::string& filepath){
-    QFile file(QString::fromStdString(filepath));
-    file.open(QIODevice::WriteOnly);
-    std::string data = to_str();
-    file.write(data.c_str(), data.size());
+    FileIO file(Filesystem::Path(filepath), FileMode::WRITE);
+    if (file.is_open()){
+        std::string data = to_str();
+        file.write(data);
+    }
 }
 void StatSet::open_from_file(const std::string& filepath){
-    QFile file(QString::fromStdString(filepath));
-    if (!file.open(QIODevice::ReadOnly)){
+    std::string str;
+    if (!file_to_string(filepath, str)){
         return;
     }
 
-    std::string str = file.readAll().data();
     load_from_string(str.c_str());
 }
 
@@ -151,11 +156,10 @@ bool StatSet::update_file(
     const std::string& identifier,
     StatsTracker& tracker
 ){
-    QFile file(QString::fromStdString(filepath));
-    while (!file.open(QIODevice::ReadWrite)){
+    std::string data;
+    if (Filesystem::exists(filepath) && !file_to_string(filepath, data)){
         return false;
     }
-    std::string data = file.readAll().data();
 
     StatSet set;
     set.load_from_string(data.c_str());
@@ -163,11 +167,12 @@ bool StatSet::update_file(
     set[identifier] += tracker;
 
     data = set.to_str();
-    file.seek(0);
-    file.write(data.c_str(), data.size());
-    file.resize(data.size());
+    FileIO file(Filesystem::Path(filepath), FileMode::WRITE);
+    if (!file.is_open()){
+        return false;
+    }
 
-    return true;
+    return file.write(data.data(), data.size()) == data.size();
 }
 
 
diff --git a/SerialPrograms/Source/CommonFramework/Tools/StatsDatabase.h b/SerialPrograms/Source/CommonFramework/ProgramStats/StatsDatabase.h
similarity index 90%
rename from SerialPrograms/Source/CommonFramework/Tools/StatsDatabase.h
rename to SerialPrograms/Source/CommonFramework/ProgramStats/StatsDatabase.h
index dc3c143c13..18aa914f91 100644
--- a/SerialPrograms/Source/CommonFramework/Tools/StatsDatabase.h
+++ b/SerialPrograms/Source/CommonFramework/ProgramStats/StatsDatabase.h
@@ -1,6 +1,6 @@
 /*  Stats Database
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/CommonFramework/ProgramStats/StatsTracking.cpp b/SerialPrograms/Source/CommonFramework/ProgramStats/StatsTracking.cpp
new file mode 100644
index 0000000000..b60cc9846e
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/ProgramStats/StatsTracking.cpp
@@ -0,0 +1,194 @@
+/*  Stats Tracking
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Logging/AbstractLogger.h"
+#include "Common/Cpp/PrettyPrint.h"
+#include "StatsTracking.h"
+
+namespace PokemonAutomation{
+
+
+
+StatsTracker::Stat::Stat(std::string&& p_label, DisplayMode p_display_node)
+    : label(p_label)
+    , display_mode(p_display_node)
+{}
+std::string StatsTracker::to_str(PrintMode mode) const{
+    std::map<std::string, uint64_t> stats;
+    for (const auto& item : m_stats){
+        auto alias = m_aliases.find(item.first);
+
+        //  Not an alias.
+        if (alias == m_aliases.end()){
+            stats[item.first] += item.second.load(std::memory_order_relaxed);
+            continue;
+        }
+
+        //  Find alias target.
+        auto iter = m_stats.find(alias->second);
+        if (iter != m_stats.end()){
+            stats[alias->second] += item.second.load(std::memory_order_relaxed);
+        }
+    }
+
+    std::string str;
+    for (const Stat& stat : m_display_order){
+        auto iter = stats.find(stat.label);
+        uint64_t count = 0;
+        if (iter != stats.end()){
+            count += iter->second;
+        }
+
+        switch (stat.display_mode){
+        case ALWAYS_VISIBLE:
+            break;
+        case HIDDEN_IF_ZERO:
+            if (count == 0){
+                continue;
+            }else{
+                break;
+            }
+        case ALWAYS_HIDDEN:
+            switch (mode){
+            case DUMP:
+                break;
+            case DISPLAY_ON_SCREEN:
+                continue;
+            case SAVE_TO_STATS_FILE:
+                if (count == 0){
+                    continue;
+                }else{
+                    break;
+                }
+            }
+        }
+
+        if (!str.empty()){
+            str += " - ";
+        }
+        str += stat.label;
+        str += ": ";
+        str += tostr_u_commas(count);
+    }
+    return str;
+}
+
+
+
+void StatsTracker::parse_and_append_line(const std::string& line){
+    const char* ptr = line.c_str();
+    while (true){
+        //  Parse label.
+        std::string label;
+        while (true){
+            char ch = *ptr++;
+            if (ch < 32) return;
+            if (ch == ':') break;
+            label += ch;
+        }
+
+        //  Skip to number.
+        while (true){
+            char ch = *ptr;
+            if (ch < 32) return;
+            if ('0' <= ch && ch <= '9') break;
+            ptr++;
+        }
+
+        //  Parse number.
+        uint64_t count = 0;
+        while (true){
+            char ch = *ptr++;
+            if (ch < 32){
+                m_stats[label] += count;
+                return;
+            }
+            if (ch == ',') continue;
+            if (!('0' <= ch && ch <= '9')) break;
+            count *= 10;
+            count += ch - '0';
+        }
+
+//        cout << label << " = " << count << endl;
+        m_stats[label] += count;
+
+        //  Skip to next;
+        while (true){
+            char ch = *ptr;
+            if (ch < 32) return;
+            if (('A' <= ch && ch <= 'Z') || ('a' <= ch && ch <= 'z')) break;
+            ptr++;
+        }
+    }
+}
+
+
+
+std::string stats_to_bar(
+    Logger& logger,
+    const StatsTracker* historical,
+    const StatsTracker* current,
+    const std::string& override_current
+){
+    std::string current_str;
+    if (!override_current.empty()){
+        current_str = override_current;
+    }else if (current){
+        current_str = current->to_str(StatsTracker::DISPLAY_ON_SCREEN);
+    }
+
+    std::string historical_str;
+    if (historical){
+        historical_str = historical->to_str(StatsTracker::DISPLAY_ON_SCREEN);
+    }
+
+    if (current_str.empty() && historical_str.empty()){
+        return "";
+    }
+
+    if (!current_str.empty() && historical_str.empty()){
+        logger.log(current_str);
+        return current_str;
+    }
+    if (current_str.empty() && !historical_str.empty()){
+        return "<b>Past Runs</b> - " + historical_str;
+    }
+
+    logger.log(current_str);
+
+    std::string str;
+    str += "<b>Current Run</b> - " + current_str;
+    str += "<br>";
+    str += "<b>Past Totals</b> - " + historical_str;
+
+    return str;
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}
diff --git a/SerialPrograms/Source/CommonFramework/ProgramStats/StatsTracking.h b/SerialPrograms/Source/CommonFramework/ProgramStats/StatsTracking.h
new file mode 100644
index 0000000000..5af579c2d2
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/ProgramStats/StatsTracking.h
@@ -0,0 +1,86 @@
+/*  Stats Tracking
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_StatsTracking_H
+#define PokemonAutomation_StatsTracking_H
+
+#include <vector>
+#include <string>
+#include <map>
+#include <atomic>
+
+namespace PokemonAutomation{
+
+class Logger;
+
+class StatsTracker{
+    StatsTracker(const StatsTracker&) = delete;
+
+public:
+    StatsTracker() = default;
+    virtual ~StatsTracker() = default;
+
+    // How to print stats to string when calling to_str()
+    enum PrintMode{
+        DUMP,                // For logging: show all stats regardless of their DisplayMode. 
+        DISPLAY_ON_SCREEN,   // For UI display: obey each stat's DisplayMode.
+        SAVE_TO_STATS_FILE,  // For persisting stats to disk: skip ALWAYS_HIDDEN stats when
+                             // the stat value is 0 to improve stat file readability.
+    };
+
+    // Create a string showing the stats to display on UI
+    virtual std::string to_str(PrintMode mode) const;
+
+    void parse_and_append_line(const std::string& line);
+
+
+protected:
+//    static constexpr bool HIDDEN_IF_ZERO = true;
+//    static constexpr bool ALWAYS_VISIBLE = false;
+
+    // How stats are displayed on the UI
+    enum DisplayMode{
+        ALWAYS_VISIBLE, // this stat is always visible
+        HIDDEN_IF_ZERO, // if this stat value is 0, hide it from showing on UI
+        ALWAYS_HIDDEN,  // always hide this stat from UI
+    };
+
+    struct Stat{
+        std::string label;
+        DisplayMode display_mode;
+        Stat(std::string&& p_label, DisplayMode p_display_node = ALWAYS_VISIBLE);
+    };
+
+    std::vector<Stat> m_display_order;
+    std::map<std::string, std::atomic<uint64_t>> m_stats;
+
+    //  Maps old stat names to new stat names for backward compatibility.
+    //  Example:
+    //      // In constructor after setting up m_display_order:
+    //      m_display_order.emplace_back(Stat("Red"));  // New unified stat name
+    //      m_aliases["Red Detected"] = "Red";          // Old name -> new name
+    //      m_aliases["Red Presumed"] = "Red";          // Another old name -> same new name
+    //
+    //  Counts from previous "Red Detected" and "Red Presumed" will be combined and displayed under
+    //  the new name "Red" when to_str() is called.
+    std::map<std::string, std::string> m_aliases;
+};
+
+
+// Create a markup string to show current and past stats.
+// If override_current is not empty, replace the string for current stats with override_current.
+std::string stats_to_bar(
+    Logger& logger,
+    const StatsTracker* historical,
+    const StatsTracker* current,
+    const std::string& override_current = ""
+);
+
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/Recording/StreamHistoryOption.cpp b/SerialPrograms/Source/CommonFramework/Recording/StreamHistoryOption.cpp
new file mode 100644
index 0000000000..09d6628380
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/Recording/StreamHistoryOption.cpp
@@ -0,0 +1,146 @@
+/*  Stream History Option
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Globals.h"
+#include "StreamHistoryOption.h"
+
+namespace PokemonAutomation{
+
+StreamHistoryOption::StreamHistoryOption()
+    : GroupOption(
+        "Stream History",
+        LockMode::LOCK_WHILE_RUNNING,
+        IS_BETA_VERSION ? GroupOption::EnableMode::DEFAULT_ENABLED : GroupOption::EnableMode::DEFAULT_DISABLED,
+        true,
+        false
+    )
+    , DESCRIPTION(
+        "Keep a record of the recent video streams. This will allow video capture "
+        "for unexpected events.<br><br>"
+        // "<font color=\"red\">Warning: This feature has a known memory leak. It will leak ~3GB per day per "
+        // "video stream. You have been warned!</font>"
+        // "<br><br>"
+        "<font color=\"orange\">Warning: This feature is computationally expensive and "
+        "will require a more powerful computer to run (especially for multi-Switch programs).<br>"
+        // "Furthermore, the current implementation is inefficient as it will write a lot "
+        // "of data to disk. This feature is still a work-in-progress."
+        "</font>"
+    )
+    , HISTORY_SECONDS(
+        "<b>History (seconds):</b><br>"
+        "Keep this many seconds of video and audio feed for video capture and debugging purposes.<br><br>"
+        "<font color=\"orange\">Do not set this too large as it will consume a lot of memory and may exceed the "
+        "attachment size limit for Discord notifications."
+        "</font>",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        30
+    )
+    , RESOLUTION(
+        "<b>Resolution:</b>",
+        {
+            {Resolution::MATCH_INPUT,   "match",    "Match Input Resolution"},
+            {Resolution::FORCE_720p,    "720p",     "1280 x 720"},
+            {Resolution::FORCE_1080p,   "1080p",    "1920 x 1080"},
+        },
+        LockMode::UNLOCK_WHILE_RUNNING,
+        Resolution::FORCE_720p
+    )
+    , ENCODING_MODE(
+        "<b>Encoding Mode:</b>",
+        {
+            {EncodingMode::FIXED_QUALITY, "fixed-quality", "Fixed Quality"},
+            {EncodingMode::FIXED_BITRATE, "fixed-bitrate", "Fixed Bit Rate"},
+        },
+        LockMode::UNLOCK_WHILE_RUNNING,
+        EncodingMode::FIXED_QUALITY
+    )
+    , VIDEO_QUALITY(
+        "<b>Video Quality:</b><br>"
+        "<font color=\"orange\">High quality videos will take more disk space "
+        "and may exceed the attachment size limit for Discord notifications."
+        "</font>",
+        {
+            {VideoQuality::VERY_LOW,    "very-low",     "Very Low"},
+            {VideoQuality::LOW,         "low",          "Low"},
+            {VideoQuality::NORMAL,      "normal",       "Normal"},
+            {VideoQuality::HIGH,        "high",         "High"},
+            {VideoQuality::VERY_HIGH,   "very-high",    "Very High"},
+        },
+        LockMode::UNLOCK_WHILE_RUNNING,
+        VideoQuality::LOW
+    )
+    , VIDEO_BITRATE(
+        "<b>Video Bit-Rate (kbps):</b><br>"
+        "Lower = lower quality, smaller file size.<br>"
+        "Higher = high quality, larger file size.<br>"
+        "<font color=\"orange\">Large values can exceed the attachment size limit for Discord notifications."
+        "</font>",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        5000
+    )
+    , VIDEO_FPS(
+        "<b>Video Frames per second:</b><br>"
+        "Lower = choppier video, smaller file size.<br>"
+        "Higher = smoother video, larger file size.",
+        {
+            // {VideoFPS::MATCH_INPUT,    "match",     "Match Input FPS"},
+            {VideoFPS::FPS_30,         "fps-30",          "30 FPS"},
+            {VideoFPS::FPS_15,      "fps-15",       "15 FPS"},
+            {VideoFPS::FPS_10,        "fps-10",         "10 FPS"},
+            {VideoFPS::FPS_05,   "fps-05",    "5 FPS"},
+            {VideoFPS::FPS_01,   "fps-01",    "1 FPS"},
+        },
+        LockMode::UNLOCK_WHILE_RUNNING,
+        VideoFPS::FPS_10
+    )
+    , JPEG_QUALITY(
+        "<b>JPEG Quality:</b><br>"
+        "Video frames are compressed into JPEGs to save space in RAM.<br>"
+        "Lower = lower quality, lower RAM usage.<br>"
+        "Higher = high quality, higher RAM usage.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        80,
+        0, 100
+    )
+{
+    PA_ADD_STATIC(DESCRIPTION);
+    PA_ADD_OPTION(HISTORY_SECONDS);
+    PA_ADD_OPTION(RESOLUTION);
+    PA_ADD_OPTION(VIDEO_FPS);
+    PA_ADD_OPTION(JPEG_QUALITY);
+    // PA_ADD_OPTION(ENCODING_MODE);
+    // PA_ADD_OPTION(VIDEO_QUALITY);
+    // PA_ADD_OPTION(VIDEO_BITRATE);
+
+    StreamHistoryOption::on_config_value_changed(this);
+
+    ENCODING_MODE.add_listener(*this);
+}
+StreamHistoryOption::~StreamHistoryOption(){
+    ENCODING_MODE.remove_listener(*this);
+}
+
+void StreamHistoryOption::on_config_value_changed(void* object){
+    switch (ENCODING_MODE){
+    case EncodingMode::FIXED_QUALITY:
+        VIDEO_QUALITY.set_visibility(ConfigOptionState::ENABLED);
+        VIDEO_BITRATE.set_visibility(ConfigOptionState::HIDDEN);
+        break;
+    case EncodingMode::FIXED_BITRATE:
+        VIDEO_QUALITY.set_visibility(ConfigOptionState::HIDDEN);
+        VIDEO_BITRATE.set_visibility(ConfigOptionState::ENABLED);
+        break;
+    }
+}
+
+
+
+
+
+
+}
+
+
diff --git a/SerialPrograms/Source/CommonFramework/Recording/StreamHistoryOption.h b/SerialPrograms/Source/CommonFramework/Recording/StreamHistoryOption.h
new file mode 100644
index 0000000000..3ef7ea0b6b
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/Recording/StreamHistoryOption.h
@@ -0,0 +1,67 @@
+/*  Stream History Option
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_StreamHistoryOption_H
+#define PokemonAutomation_StreamHistoryOption_H
+
+#include "Common/Cpp/Options/StaticTextOption.h"
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "Common/Cpp/Options/EnumDropdownOption.h"
+#include "Common/Cpp/Options/GroupOption.h"
+
+namespace PokemonAutomation{
+
+
+
+class StreamHistoryOption : public GroupOption, public ConfigOption::Listener{
+public:
+    StreamHistoryOption();
+    ~StreamHistoryOption();
+
+    virtual void on_config_value_changed(void* object) override;
+
+    StaticTextOption DESCRIPTION;
+    SimpleIntegerOption<uint16_t> HISTORY_SECONDS;
+
+    enum class Resolution{
+        MATCH_INPUT,
+        FORCE_720p,
+        FORCE_1080p,
+    };
+    EnumDropdownOption<Resolution> RESOLUTION;
+
+    enum class EncodingMode{
+        FIXED_QUALITY,
+        FIXED_BITRATE,
+    };
+    EnumDropdownOption<EncodingMode> ENCODING_MODE;
+
+
+    enum class VideoQuality{
+        VERY_LOW,
+        LOW,
+        NORMAL,
+        HIGH,
+        VERY_HIGH,
+    };
+    EnumDropdownOption<VideoQuality> VIDEO_QUALITY;
+    SimpleIntegerOption<uint32_t> VIDEO_BITRATE;
+
+    enum class VideoFPS{
+        // MATCH_INPUT,
+        FPS_30,
+        FPS_15,
+        FPS_10,
+        FPS_05,
+        FPS_01,
+    };
+    EnumDropdownOption<VideoFPS> VIDEO_FPS;
+    SimpleIntegerOption<uint16_t> JPEG_QUALITY;
+};
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/Recording/StreamHistorySession.cpp b/SerialPrograms/Source/CommonFramework/Recording/StreamHistorySession.cpp
new file mode 100644
index 0000000000..f77c9dc064
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/Recording/StreamHistorySession.cpp
@@ -0,0 +1,270 @@
+/*  Stream History Session
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <vector>
+#include <QAudioFormat>
+#include "Common/Cpp/Exceptions.h"
+#include "Common/Cpp/Containers/Pimpl.tpp"   //  Pimpl<QAudioFormat> (AudioFormat) instantiations
+#include "Common/Cpp/Concurrency/SpinLock.h"
+#include "CommonFramework/GlobalSettingsPanel.h"
+#include "CommonFramework/AudioPipeline/AudioFormat.h"
+#include "CommonFramework/AudioPipeline/AudioInputChoice.h"
+#include "CommonFramework/VideoPipeline/Backends/VideoFrameQt.h"
+#include "CommonFramework/Recording/StreamHistoryOption.h"
+
+#if (QT_VERSION_MAJOR == 6) && (QT_VERSION_MINOR >= 8)
+#include "StreamHistoryTracker_SaveFrames.h"
+//#include "StreamHistoryTracker_RecordOnTheFly.h"
+//#include "StreamHistoryTracker_ParallelStreams.h"
+#else
+#include "StreamHistoryTracker_Null.h"
+#endif
+
+
+#include "StreamHistorySession.h"
+
+
+
+namespace PokemonAutomation{
+
+
+
+
+
+struct StreamHistorySession::Data{
+    Logger& m_logger;
+    mutable SpinLock m_lock;
+    std::chrono::seconds m_window;
+    //  The resolved input choice for the active device input (invalid
+    //  when there is no device input). Drives both the tracker's shape
+    //  and the working-stream attach shape.
+    AudioInputChoice m_audio_choice;
+    bool m_has_video;
+    //  The active input's physical working-stream shape (what the tree
+    //  delivers through the working listener, and what the tracker records
+    //  at). Set in initialize().
+    size_t m_active_channels = 0;
+    size_t m_active_rate = 0;
+    std::vector<float> m_interleaved;
+    //  The audio session the working listener attaches to (set_audio_session).
+    AudioSession* m_audio_session = nullptr;
+    std::shared_ptr<StreamHistoryTracker> m_current;
+
+    Data(Logger& logger)
+        : m_logger(logger)
+        , m_window(GlobalSettings::instance().STREAM_HISTORY->HISTORY_SECONDS)
+        , m_has_video(false)
+    {}
+};
+
+
+
+
+StreamHistorySession::~StreamHistorySession() = default;
+StreamHistorySession::StreamHistorySession(Logger& logger)
+    //  The working-stream nominal shape is metadata only: the pair's
+    //  per-listener forwarder carries the shape actually requested, and
+    //  nothing validates this one.
+    : Kernels::AudioPipeline::WorkingAudioStreamListener(48000, 2)
+    , m_data(CONSTRUCT_TOKEN, logger)
+{}
+void StreamHistorySession::start(
+    const AudioInputChoice& choice, bool has_video
+){
+    Data& data = *m_data;
+    {
+        WriteSpinLock lg(data.m_lock);
+        if (!data.m_current){
+            data.m_audio_choice = choice;
+            data.m_has_video = has_video;
+            initialize();
+        }
+    }
+    attach_working_listener();
+}
+void StreamHistorySession::set_audio_session(AudioSession& session){
+    Data& data = *m_data;
+    WriteSpinLock lg(data.m_lock);
+    data.m_audio_session = &session;
+}
+
+
+
+bool StreamHistorySession::save(const std::string& filename) const{
+    //  This will be coming in from random threads. It will block until the save
+    //  is finished or failed.
+
+    const Data& data = *m_data;
+
+    //  Get an owning reference to the current tracker.
+    //  This will allow us to promptly release the lock and unblock the UI from
+    //  changing the streams (which will wipe the history).
+    std::shared_ptr<StreamHistoryTracker> tracker;
+    {
+        WriteSpinLock lg(data.m_lock);
+        if (!data.m_current){
+            data.m_logger.log("Cannot save stream history: Stream history is not enabled.", COLOR_RED);
+            return false;
+        }
+        tracker = data.m_current;
+    }
+
+//    tracker->save(m_logger, filename);
+//    HistorySaverThread saver(*tracker, filename);
+//    return saver.save();
+
+    return tracker->save(filename);
+}
+void StreamHistorySession::push_samples(size_t samples, size_t stride, const float* data){
+    Data& state = *m_data;
+    WriteSpinLock lg(state.m_lock);
+    if (!state.m_current || samples == 0 || state.m_active_channels == 0){
+        return;
+    }
+    //  The working stream is split (planar) channels: channel "c" starts at
+    //  "data[c * stride]" and runs for "samples" samples. (stride may be 0
+    //  for the single-channel pass-through.) Re-interleave for the tracker.
+    //  The capture card's RL channel swap (INTERLEAVE_RL_96000) is already
+    //  applied by the pair's conversion node matrix, the same way as for
+    //  the sink branch.
+    const size_t channels = state.m_active_channels;
+    state.m_interleaved.resize(samples * channels);
+    for (size_t i = 0; i < samples; i++){
+        for (size_t c = 0; c < channels; c++){
+            state.m_interleaved[i * channels + c] = data[c * stride + i];
+        }
+    }
+    state.m_current->on_samples(state.m_interleaved.data(), samples);
+}
+void StreamHistorySession::on_frame(std::shared_ptr<const VideoFrame> frame){
+    Data& data = *m_data;
+    WriteSpinLock lg(data.m_lock);
+    if (data.m_current){
+        data.m_current->on_frame(std::move(frame));
+    }
+}
+
+
+void StreamHistorySession::clear(){
+//    cout << "clear()" << endl;
+
+    //  Must call under lock.
+    Data& data = *m_data;
+    data.m_logger.log("Clearing stream history...", COLOR_ORANGE);
+    data.m_current.reset();
+}
+void StreamHistorySession::initialize(){
+    if (!GlobalSettings::instance().STREAM_HISTORY->enabled()){
+        return;
+    }
+
+    //  Must call under lock.
+    Data& data = *m_data;
+    data.m_logger.log("Starting stream history...", COLOR_ORANGE);
+
+//    cout << "video = " << data.m_has_video << endl;
+
+    //  The tracker's audio shape is the input source's working-stream
+    //  shape (what the tree delivers through the working listener), i.e.
+    //  the resolved input choice's logical shape: the preset's framing,
+    //  with the capture-card 96 kHz reinterpretation applied for the
+    //  reinterpreted choices. No choice (file input or no input) records
+    //  at no shape.
+    const AudioInputChoice& choice = data.m_audio_choice;
+    const size_t channels = choice ? choice.format().channels() : 0;
+    const size_t rate = choice ? choice.format().sample_rate() : 0;
+    data.m_active_channels = channels;
+    data.m_active_rate = rate;
+    data.m_current.reset(new StreamHistoryTracker(data.m_logger, data.m_window, channels, rate, data.m_has_video));
+}
+void StreamHistorySession::pre_input_change(){
+//    cout << "pre_input_change()" << endl;
+    Data& data = *m_data;
+    WriteSpinLock lg(data.m_lock);
+    clear();
+}
+void StreamHistorySession::post_input_change(
+    const std::shared_ptr<const AudioSourceDescriptor>& source,
+    const AudioInputChoice& choice
+){
+//    cout << "post_input_change()" << endl;
+    Data& data = *m_data;
+    AudioSession* audio_session;
+    {
+        WriteSpinLock lg(data.m_lock);
+        audio_session = data.m_audio_session;
+    }
+    //  Detach the working listener first: after this returns, no pushes in
+    //  the old shape can reach push_samples() (the pair quiesces in-flight
+    //  pushes). Then update the shapes, then attach for the new shape.
+    if (audio_session){
+        audio_session->remove_working_stream_listener(*this);
+    }
+    {
+        WriteSpinLock lg(data.m_lock);
+        data.m_audio_choice = choice;
+        initialize();
+    }
+    attach_working_listener();
+}
+void StreamHistorySession::attach_working_listener(){
+    Data& data = *m_data;
+    AudioSession* audio_session;
+    AudioInputChoice target;
+    {
+        WriteSpinLock lg(data.m_lock);
+        audio_session = data.m_audio_session;
+        target = data.m_audio_choice;
+    }
+    if (!audio_session || !target){
+        return;
+    }
+    //  The remove quiesces any in-flight pushes in the old shape (and is a
+    //  no-op if not attached yet); the node is then built for the new one.
+    audio_session->remove_working_stream_listener(*this);
+    audio_session->add_working_stream_listener(
+        AudioFormat(target.format().native_format()), *this
+    );
+}
+void StreamHistorySession::pre_shutdown(){
+//    cout << "pre_shutdown()" << endl;
+    Data& data = *m_data;
+    WriteSpinLock lg(data.m_lock);
+    clear();
+}
+void StreamHistorySession::post_shutdown(){
+//    cout << "post_shutdown()" << endl;
+    Data& data = *m_data;
+    WriteSpinLock lg(data.m_lock);
+    data.m_has_video = false;
+    initialize();
+}
+void StreamHistorySession::post_startup(VideoSource* source){
+    Data& data = *m_data;
+    WriteSpinLock lg(data.m_lock);
+    data.m_has_video = source != nullptr;
+    initialize();
+}
+void StreamHistorySession::pre_resolution_change(Resolution resolution){
+//    cout << "pre_resolution_change()" << endl;
+    Data& data = *m_data;
+    WriteSpinLock lg(data.m_lock);
+    clear();
+}
+void StreamHistorySession::post_resolution_change(Resolution resolution){
+//    cout << "post_resolution_change()" << endl;
+    Data& data = *m_data;
+    WriteSpinLock lg(data.m_lock);
+    initialize();
+}
+
+
+
+
+
+
+
+}
diff --git a/SerialPrograms/Source/CommonFramework/Recording/StreamHistorySession.h b/SerialPrograms/Source/CommonFramework/Recording/StreamHistorySession.h
new file mode 100644
index 0000000000..7b3456072e
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/Recording/StreamHistorySession.h
@@ -0,0 +1,77 @@
+/*  Stream History Session
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  Capture the last X seconds of audio and video.
+ *
+ */
+
+#ifndef PokemonAutomation_StreamHistorySession_H
+#define PokemonAutomation_StreamHistorySession_H
+
+#include "Common/Cpp/Logging/AbstractLogger.h"
+#include "Common/Cpp/Containers/Pimpl.h"
+#include "Kernels/AudioPipeline/Kernels_AudioPipeline.h"
+#include "CommonFramework/AudioPipeline/AudioSession.h"
+#include "CommonFramework/VideoPipeline/VideoSession.h"
+
+namespace PokemonAutomation{
+
+
+class StreamHistorySession
+    : public Kernels::AudioPipeline::WorkingAudioStreamListener
+    , public VideoFrameListener
+    , public AudioSession::StateListener
+    , public VideoSession::StateListener
+{
+public:
+    ~StreamHistorySession();
+    StreamHistorySession(Logger& logger);
+    //  "device" / "format" are the audio session's active input state:
+    //  the tracker's shape and the working-stream attach shape are derived
+    //  from the resolved input choice (invalid when there is no device
+    //  input, i.e. file input or no input at all).
+    void start(const AudioInputChoice& choice, bool has_video);
+    bool save(const std::string& filename) const;
+
+    //  The audio session this session's working-stream listener attaches to
+    //  (set before start(); used to re-attach on input changes).
+    void set_audio_session(AudioSession& session);
+
+public:
+    //  Working stream, delivered in the shape requested at attach time
+    //  (the active preset's physical shape), split (planar) channels.
+    virtual void push_samples(size_t samples, size_t stride, const float* data) override;
+    virtual void on_frame(std::shared_ptr<const VideoFrame> frame) override;
+
+public:
+    virtual void pre_input_change() override;
+    virtual void post_input_change(
+        const std::shared_ptr<const AudioSourceDescriptor>& source,
+        const AudioInputChoice& choice
+    ) override;
+
+    virtual void pre_shutdown() override;
+    virtual void post_shutdown() override;
+    virtual void post_startup(VideoSource* source) override;
+    virtual void pre_resolution_change(Resolution resolution) override;
+    virtual void post_resolution_change(Resolution resolution) override;
+
+private:
+    void clear();
+    void initialize();
+
+    //  Attaches this session to the audio session's working stream at the
+    //  active preset's physical shape (removing any prior attach first).
+    //  Must be called with no locks held.
+    void attach_working_listener();
+
+private:
+    struct Data;
+    Pimpl<Data> m_data;
+};
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/Recording/StreamHistoryTracker_Null.h b/SerialPrograms/Source/CommonFramework/Recording/StreamHistoryTracker_Null.h
new file mode 100644
index 0000000000..7c69bebc05
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/Recording/StreamHistoryTracker_Null.h
@@ -0,0 +1,45 @@
+/*  Stream History Tracker
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  A null implementation that will compile before Qt 6.8.
+ *
+ */
+
+#ifndef PokemonAutomation_StreamHistoryTracker_Null_H
+#define PokemonAutomation_StreamHistoryTracker_Null_H
+#include "Common/Cpp/Logging/AbstractLogger.h"
+#include "CommonFramework/VideoPipeline/Backends/VideoFrameQt.h"
+
+namespace PokemonAutomation{
+
+
+class StreamHistoryTracker{
+public:
+    StreamHistoryTracker(
+        Logger& logger,
+        std::chrono::seconds window,
+        size_t audio_samples_per_frame,
+        size_t audio_frames_per_second,
+        bool has_video
+    )
+        : m_logger(logger)
+    {}
+    void set_window(std::chrono::seconds window){}
+
+    bool save(const std::string& filename) const{
+        m_logger.log("Cannot save stream history: Not implemented.", COLOR_RED);
+        return false;
+    }
+
+public:
+    void on_samples(const float* data, size_t frames){}
+    void on_frame(std::shared_ptr<const VideoFrame> frame){}
+
+private:
+    Logger& m_logger;
+};
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/Recording/StreamHistoryTracker_ParallelStreams.h b/SerialPrograms/Source/CommonFramework/Recording/StreamHistoryTracker_ParallelStreams.h
new file mode 100644
index 0000000000..e15146ab40
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/Recording/StreamHistoryTracker_ParallelStreams.h
@@ -0,0 +1,180 @@
+/*  Stream History Tracker
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  Implement by running two recordings in parallel.
+ *  When each reaches 2X seconds, delete it start over.
+ *  Both recordings are offset by X seconds - thus guaranteeing
+ *  that the last X seconds are available.
+ *
+ */
+
+#ifndef PokemonAutomation_StreamHistoryTracker_ParallelStreams_H
+#define PokemonAutomation_StreamHistoryTracker_ParallelStreams_H
+
+#include <map>
+#include "Common/Cpp/Logging/AbstractLogger.h"
+#include "Common/Cpp/Concurrency/SpinLock.h"
+//#include "Common/Qt/Redispatch.h"
+#include "CommonFramework/VideoPipeline/Backends/VideoFrameQt.h"
+#include "StreamRecorder.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+
+
+
+
+
+
+
+
+
+class StreamHistoryTracker{
+    static constexpr size_t PARALLEL_RECORDINGS = 2;
+
+public:
+    StreamHistoryTracker(
+        Logger& logger,
+        std::chrono::seconds window,
+        size_t audio_samples_per_frame,
+        size_t audio_frames_per_second,
+        bool has_video
+    )
+        : m_logger(logger)
+        , m_window(window)    //  REMOVE
+//        , m_window(100)
+        , m_audio_samples_per_frame(audio_samples_per_frame)
+        , m_audio_frames_per_second(audio_frames_per_second)
+        , m_has_video(has_video)
+    {
+        update_streams(current_time());
+    }
+    void set_window(std::chrono::seconds window){
+        WriteSpinLock lg(m_lock);
+        m_window = window;
+        update_streams(current_time());
+    }
+
+    bool save(const std::string& filename){
+        std::unique_ptr<StreamRecording> recording;
+        {
+            WriteSpinLock lg(m_lock);
+            if (m_recordings.empty()){
+                m_logger.log("Cannot save stream history. Recording is not enabled.", COLOR_RED);
+                return false;
+            }
+
+            m_logger.log("Saving stream history...", COLOR_BLUE);
+
+            auto iter = m_recordings.begin();
+            recording = std::move(iter->second);
+            m_recordings.erase(iter);
+            update_streams(current_time());
+        }
+        return recording->stop_and_save(filename);
+    }
+
+
+    void on_samples(const float* samples, size_t frames){
+        WallClock now = current_time();
+        WriteSpinLock lg(m_lock);
+        for (auto& item : m_recordings){
+            item.second->push_samples(now, samples, frames);
+        }
+        update_streams(now);
+    }
+    void on_frame(std::shared_ptr<const VideoFrame> frame){
+        WallClock now = current_time();
+        WriteSpinLock lg(m_lock);
+        for (auto& item : m_recordings){
+            item.second->push_frame(frame);
+        }
+        update_streams(now);
+    }
+
+
+private:
+    void update_streams(WallClock current_time){
+//        dispatch_to_main_thread([this, current_time]{
+            internal_update_streams(current_time);
+//        });
+    }
+    void internal_update_streams(WallClock current_time){
+//        cout << "streams = " << m_recordings.size() << endl;
+
+        //  Must call under the lock.
+        WallClock threshold = current_time - m_window;
+
+        //  Clear any streams that are not needed any more.
+        //  A stream is not needed anymore when there is a newer stream that
+        //  is at least "m_window" long.
+        if (PARALLEL_RECORDINGS >= 2){
+            while (m_recordings.size() >= PARALLEL_RECORDINGS){
+                auto first = m_recordings.begin();
+                auto second = first;
+                ++second;
+                if (second->first < threshold){
+//                    cout << "removing recording..." << endl;
+                    m_recordings.erase(first);
+                }else{
+                    break;
+                }
+            }
+        }
+
+        //  If all recordings start in the future, reset everything.
+        if (!m_recordings.empty() && m_recordings.begin()->first > current_time){
+            m_recordings.clear();
+        }
+
+        //  Add recordings until we've reached the desired amount.
+        while (m_recordings.size() < PARALLEL_RECORDINGS){
+//            cout << "adding recording = " << m_recordings.size() << endl;
+            //  If no recordings are live, start it now.
+            //  Otherwise, schedule to start "m_interval" after the start
+            //  of the newest recording.
+            WallClock start_time = m_recordings.empty()
+                ? current_time
+                : m_recordings.rbegin()->first + m_window;
+
+//            cout << std::chrono::duration_cast<std::chrono::milliseconds>(start_time - current_time).count() / 1000. << endl;
+
+            m_recordings.emplace(
+                std::piecewise_construct,
+                std::forward_as_tuple(start_time),
+                std::forward_as_tuple(new StreamRecording(
+                    m_logger, std::chrono::milliseconds(500),
+                    start_time,
+                    m_audio_samples_per_frame,
+                    m_audio_frames_per_second,
+                    m_has_video
+                ))
+            );
+        }
+    }
+
+
+private:
+    Logger& m_logger;
+    mutable SpinLock m_lock;
+    std::chrono::milliseconds m_window;
+    const size_t m_audio_samples_per_frame;
+    const size_t m_audio_frames_per_second;
+    const bool m_has_video;
+    std::map<WallClock, std::unique_ptr<StreamRecording>> m_recordings;
+};
+
+
+
+
+
+
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/Recording/StreamHistoryTracker_RecordOnTheFly.h b/SerialPrograms/Source/CommonFramework/Recording/StreamHistoryTracker_RecordOnTheFly.h
new file mode 100644
index 0000000000..2f8f0dfd20
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/Recording/StreamHistoryTracker_RecordOnTheFly.h
@@ -0,0 +1,192 @@
+/*  Stream History Tracker
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  Implement by recording in real-time.
+ *
+ */
+
+#ifndef PokemonAutomation_StreamHistoryTracker_RecordOnTheFly_H
+#define PokemonAutomation_StreamHistoryTracker_RecordOnTheFly_H
+
+#include <QCoreApplication>
+#include <QUrl>
+#include <QAudioBufferInput>
+#include <QVideoFrameInput>
+#include <QMediaFormat>
+#include <QMediaRecorder>
+#include <QMediaCaptureSession>
+#include "Common/Cpp/LifetimeSanitizer.h"
+#include "Common/Cpp/Filesystem/Filesystem.h"
+#include "Common/Cpp/PrettyPrint.h"
+#include "Common/Cpp/Logging/AbstractLogger.h"
+#include "Common/Cpp/Concurrency/SpinPause.h"
+#include "Common/Cpp/Concurrency/SpinLock.h"
+#include "CommonFramework/VideoPipeline/Backends/VideoFrameQt.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+
+
+class RollingStream : public QIODevice{
+public:
+    ~RollingStream(){
+        waitForBytesWritten(-1);
+//        cout << "~RollingStream()" << endl;
+    }
+    RollingStream(){
+        setOpenMode(QIODeviceBase::WriteOnly);
+    }
+    virtual qint64 readData(char* data, qint64 maxlen){ return 0; }
+    virtual qint64 writeData(const char* data, qint64 len){
+        auto scope_check = m_sanitizer.check_scope();
+        m_bytes += len;
+//        cout << "total = " << m_bytes << ", current = " << len << endl;
+        return len;
+    }
+
+private:
+    uint64_t m_bytes = 0;
+
+    LifetimeSanitizer m_sanitizer;
+};
+
+
+
+class StreamHistoryTracker{
+public:
+    ~StreamHistoryTracker();
+    StreamHistoryTracker(
+        size_t audio_samples_per_frame,
+        size_t audio_frames_per_second,
+        std::chrono::seconds window
+    );
+    void set_window(std::chrono::seconds window);
+
+    bool save(Logger& logger, const std::string& filename) const;
+
+public:
+//    void push_frame(QVideoFrame frame);
+
+    void on_samples(const float* data, size_t frames);
+    void on_frame(std::shared_ptr<VideoFrame> frame);
+
+private:
+//    void clear_old();
+
+private:
+    mutable SpinLock m_lock;
+    std::chrono::seconds m_window;
+
+    const size_t m_audio_samples_per_frame;
+//    const size_t m_audio_frames_per_second;
+//    const size_t m_audio_samples_per_second;
+//    const double m_microseconds_per_sample;
+
+//    mutable Mutex m_lock;
+//    ConditionVariable m_cv;
+
+    RollingStream m_stream;
+
+    QAudioFormat m_audio_format;
+    QAudioBufferInput m_audio_input;
+    QVideoFrameInput m_video_input;
+    QMediaCaptureSession m_session;
+
+    QMediaRecorder m_recorder;
+};
+
+
+StreamHistoryTracker::~StreamHistoryTracker(){
+    m_recorder.stop();
+    while (m_recorder.recorderState() != QMediaRecorder::StoppedState){
+//        cout << "StreamHistoryTracker: process" << endl;
+        try{
+            QCoreApplication::processEvents();
+            pause();
+        }catch (...){}
+    }
+//    cout << "~StreamHistoryTracker()" << endl;
+}
+StreamHistoryTracker::StreamHistoryTracker(
+    size_t audio_samples_per_frame,
+    size_t audio_frames_per_second,
+    std::chrono::seconds window
+)
+    : m_window(window)
+    , m_audio_samples_per_frame(audio_samples_per_frame)
+//    , m_audio_frames_per_second(audio_frames_per_second)
+//    , m_audio_samples_per_second(audio_samples_per_frame * audio_frames_per_second)
+//    , m_microseconds_per_sample(1. / (m_audio_samples_per_second * 1000000.))
+{
+    m_audio_format.setChannelCount((int)audio_samples_per_frame);
+    m_audio_format.setChannelConfig(audio_samples_per_frame == 1 ? QAudioFormat::ChannelConfigMono : QAudioFormat::ChannelConfigStereo);
+    m_audio_format.setSampleRate((int)audio_frames_per_second);
+    m_audio_format.setSampleFormat(QAudioFormat::Float);
+
+    m_session.setAudioBufferInput(&m_audio_input);
+    m_session.setVideoFrameInput(&m_video_input);
+    m_session.setRecorder(&m_recorder);
+    m_recorder.setMediaFormat(QMediaFormat::MPEG4);
+    m_recorder.setQuality(QMediaRecorder::HighQuality);
+
+#if 0
+    m_recorder.connect(
+        &m_recorder, &QMediaRecorder::recorderStateChanged,
+        &m_recorder, [](QMediaRecorder::RecorderState state){
+
+        }
+    );
+#endif
+
+#if 1
+    const std::string capture_filename = "capture-" + now_to_filestring() + ".mp4";
+    m_recorder.setOutputLocation(
+        QUrl::fromLocalFile(QString::fromStdString(
+            Filesystem::absolute(Filesystem::Path(capture_filename)).string_slash_normalized()
+        ))
+    );
+#else
+    m_recorder.setOutputDevice(&m_stream);
+#endif
+
+    m_recorder.record();
+}
+
+void StreamHistoryTracker::set_window(std::chrono::seconds window){
+    WriteSpinLock lg(m_lock, PA_CURRENT_FUNCTION);
+    m_window = window;
+}
+
+
+void StreamHistoryTracker::on_samples(const float* samples, size_t frames){
+    if (frames == 0){
+        return;
+    }
+    QByteArray buffer((const char*)samples, m_audio_samples_per_frame * frames * sizeof(float));
+    QAudioBuffer audio_buffer(buffer, m_audio_format);
+    m_audio_input.sendAudioBuffer(audio_buffer);
+}
+void StreamHistoryTracker::on_frame(std::shared_ptr<VideoFrame> frame){
+    m_video_input.sendVideoFrame(frame->frame);
+}
+
+bool StreamHistoryTracker::save(Logger& logger, const std::string& filename) const{
+    logger.log("Cannot save stream history: Not implemented.", COLOR_RED);
+
+    //  TODO
+
+    return false;
+}
+
+
+
+
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/Recording/StreamHistoryTracker_SaveFrames.cpp b/SerialPrograms/Source/CommonFramework/Recording/StreamHistoryTracker_SaveFrames.cpp
new file mode 100644
index 0000000000..e7ca41cbee
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/Recording/StreamHistoryTracker_SaveFrames.cpp
@@ -0,0 +1,397 @@
+/*  Stream History Tracker
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  Implement by saving the last X seconds of frames. This is currently not
+ *  viable because the QVideoFrames are uncompressed.
+ *
+ */
+
+// #include <QCoreApplication>
+// #include <QFileInfo>
+// #include <QUrl>
+// #include <QAudioBufferInput>
+// #include <QVideoFrameInput>
+// #include <QMediaFormat>
+// #include <QMediaRecorder>
+// #include <QMediaCaptureSession>
+// #include <QScopeGuard>
+#include <opencv2/opencv.hpp>
+#include "Common/Cpp/Exceptions.h"
+#include "Common/Cpp/Logging/AbstractLogger.h"
+#include "Common/Cpp/Concurrency/SpinLock.h"
+#include "CommonFramework/VideoPipeline/Backends/VideoFrameQt.h"
+#include "CommonFramework/GlobalSettingsPanel.h"
+#include "CommonFramework/Recording/StreamHistoryOption.h"
+#include "CommonFramework/Tools/GlobalThreadPools.h"
+#include "StreamHistoryTracker_SaveFrames.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+
+namespace PokemonAutomation{
+
+
+
+void simulate_cpu_load(int milliseconds){
+    auto start = std::chrono::steady_clock::now();
+    while (std::chrono::steady_clock::now() - start < std::chrono::milliseconds(milliseconds)){
+        // Waste cycles with dummy math to prevent compiler optimization
+        double d = 1.0;
+        d = std::sqrt(d * 1.1);
+    }
+}
+
+QImage decompress_video_frame(const std::vector<uchar> &compressed_buffer){
+    if (compressed_buffer.empty()) return {};
+
+    // 1. Decompress JPEG buffer into a QImage
+    // fromData handles the JPEG header and decompression automatically
+    QImage img = QImage::fromData(compressed_buffer.data(), 
+                                  static_cast<int>(compressed_buffer.size()), 
+                                  "JPG");
+
+    if (img.isNull()) return {};
+
+    return img.convertToFormat(QImage::Format_BGR888);
+}
+
+std::vector<uchar> compress_video_frame(const QVideoFrame& const_frame){
+    // simulate_cpu_load(100);  // for testing, to see what happens when the CPU is overwhelmed, and needs to drop frames.
+
+
+    // Create a local non-const copy (cheap, uses explicit sharing)
+    QVideoFrame frame = const_frame;
+
+    // 1. Map the frame to CPU memory
+    if (!frame.map(QVideoFrame::ReadOnly)){
+        return {};
+    }
+
+    // Ensure unmap() is called when this function exits (success or failure)
+    auto guard = qScopeGuard([&frame] { frame.unmap(); });
+
+    // 2. Convert to QImage (Qt 6.8+ handles internal conversions efficiently)
+    // For circular buffers, using a 3-channel RGB888 is common for OpenCV
+    QImage img = frame.toImage().convertToFormat(QImage::Format_RGB888);
+
+    int target_width;
+    const StreamHistoryOption& settings = GlobalSettings::instance().STREAM_HISTORY;
+    switch (settings.RESOLUTION){
+    case StreamHistoryOption::Resolution::MATCH_INPUT:
+        target_width = img.width();
+        break;
+    case StreamHistoryOption::Resolution::FORCE_720p:
+        target_width = 1280;
+        break;
+    case StreamHistoryOption::Resolution::FORCE_1080p:
+        target_width = 1920;
+        break;
+    default:
+        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Resolution: Unknown enum.");                
+    }
+
+    // scale to target resolution
+    int target_height = img.height() * target_width / img.width();
+    img = img.scaled(target_width, target_height, Qt::KeepAspectRatio, Qt::SmoothTransformation);
+
+
+    // 3. Wrap QImage memory into a cv::Mat (No-copy)
+    // Note: OpenCV expects BGR by default, but QImage is RGB. 
+    // we use cv::cvtColor later to fix this
+    cv::Mat mat(img.height(), img.width(), CV_8UC3, 
+                const_cast<unsigned char*>(img.bits()), img.bytesPerLine());
+
+    // 4. Compress using imencode
+    std::vector<uchar> compressed_buffer;
+    std::vector<int> params = {cv::IMWRITE_JPEG_QUALITY, settings.JPEG_QUALITY}; // 0-100
+    
+    // Convert RGB to BGR before encoding because imencode expects BGR
+    cv::Mat bgr_Mat;
+    cv::cvtColor(mat, bgr_Mat, cv::COLOR_RGB2BGR);
+    
+    cv::imencode(".jpg", bgr_Mat, compressed_buffer, params);
+
+    return compressed_buffer; // Store this in the circular buffer
+}
+
+size_t get_target_fps(){
+    const StreamHistoryOption& settings = GlobalSettings::instance().STREAM_HISTORY;
+    size_t target_fps;
+    switch (settings.VIDEO_FPS){
+    case StreamHistoryOption::VideoFPS::FPS_30:
+        target_fps = 30;
+        break;
+    case StreamHistoryOption::VideoFPS::FPS_15:
+        target_fps = 15;
+        break;
+    case StreamHistoryOption::VideoFPS::FPS_10:
+        target_fps = 10;
+        break;
+    case StreamHistoryOption::VideoFPS::FPS_05:
+        target_fps = 5;
+        break;
+    case StreamHistoryOption::VideoFPS::FPS_01:
+        target_fps = 1;
+        break;
+    default:
+        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "VideoFPS: Unknown enum.");                
+    }
+
+    return target_fps;
+}
+
+
+StreamHistoryTracker::~StreamHistoryTracker(){
+    m_stopping = true;
+    m_cv.notify_all();
+    m_worker.wait_and_ignore_exceptions();
+}
+
+StreamHistoryTracker::StreamHistoryTracker(
+    Logger& logger,
+    std::chrono::seconds window,
+    size_t audio_samples_per_frame,
+    size_t audio_frames_per_second,
+    bool has_video
+)
+    : m_logger(logger)
+    , m_window(window)
+    // , m_audio_samples_per_frame(audio_samples_per_frame)
+    // , m_audio_frames_per_second(audio_frames_per_second)
+    // , m_audio_samples_per_second(audio_samples_per_frame * audio_frames_per_second)
+    // , m_microseconds_per_sample(1. / (m_audio_samples_per_second * 1000000.))
+    // , m_has_video(has_video)
+    , m_target_fps(get_target_fps())
+    , m_frame_interval(1000000 / m_target_fps)
+    , m_next_frame_time(WallClock::min())
+{
+    m_worker = GlobalThreadPools::unlimited_normal().dispatch_now_blocking(
+        [this]{ worker_loop(); }
+    );
+}
+
+void StreamHistoryTracker::set_window(std::chrono::seconds window){
+    WriteSpinLock lg(m_lock, PA_CURRENT_FUNCTION);
+    m_window = window;
+    clear_old();
+}
+void StreamHistoryTracker::on_samples(const float* samples, size_t frames){
+    #if 0
+    if (frames == 0){
+        return;
+    }
+    WallClock now = current_time();
+    WriteSpinLock lg(m_lock, PA_CURRENT_FUNCTION);
+//    cout << "on_samples() = " << m_audio.size() << endl;
+    m_audio.emplace_back(std::make_shared<AudioBlock>(
+        now, samples, frames * m_audio_samples_per_frame
+    ));
+    clear_old();
+    #endif
+}
+
+
+
+
+void StreamHistoryTracker::on_frame(std::shared_ptr<const VideoFrame> frame){
+    {
+        WriteSpinLock lg(m_lock, PA_CURRENT_FUNCTION);
+    //    cout << "on_frame() = " << m_frames.size() << endl;
+
+        // Initialize on first frame
+        if (m_next_frame_time == WallClock::min()){
+            m_next_frame_time = frame->timestamp;
+        }
+
+        // don't save every frame. only save frames as per m_target_fps
+        // Only save when we've crossed the next sampling boundary
+        if (frame->timestamp < m_next_frame_time){
+            return; // skip frame
+        }
+
+        // Advance by fixed intervals
+        // Next frame time is anchored relative to the first frame's time, with increments by a multiple of m_frame_interval, 
+        // instead of being relative to the current frame's time. This prevents timing drift.
+
+        // If there is a massive jump in time (e.g. the stream pauses for 5 seconds), 
+        // the while loop advances the schedule multiple times until it is once again ahead of the 
+        // current timestamp. If this happens, there will be a matching gap in the saved frames. 
+        // We handle this gap by duplicating frames in the save() function, so that we maintain a constant frame rate.
+        while (m_next_frame_time <= frame->timestamp){
+            m_next_frame_time += std::chrono::microseconds(m_frame_interval);
+        }
+    } // Release SpinLock before hitting the queue mutex
+
+
+    // auto compressed_frame = compress_video_frame(frame->frame);
+    // m_compressed_frames.emplace_back(CompressedVideoFrame{frame->timestamp, std::move(compressed_frame)});
+    // // m_frames.emplace_back(std::move(frame));
+    // clear_old();
+
+    {
+        std::lock_guard<Mutex> lock(m_queue_lock);
+
+        // Drop oldest if we are falling behind
+        if (m_pending_frames.size() >= MAX_PENDING_FRAMES){
+            m_pending_frames.pop_front(); 
+            m_logger.log("StreamHistory worker thread lagging: Frame dropped.", COLOR_RED);
+        }
+        m_pending_frames.emplace_back(std::move(frame));
+
+    }
+    m_cv.notify_one();
+
+}
+
+
+
+void StreamHistoryTracker::clear_old(){
+    //  Must call under lock.
+    WallClock latest_frame = m_compressed_frames.back().timestamp;
+    WallClock threshold = latest_frame - m_window;
+
+    #if 0
+//    WriteSpinLock lg(m_lock, PA_CURRENT_FUNCTION);
+//    cout << "enter" << endl;
+    while (!m_audio.empty()){
+//        cout << "audio.size() = " << m_audio.size() << endl;
+        AudioBlock& block = *m_audio.front();
+
+        WallClock end_block = block.timestamp;
+        end_block += std::chrono::microseconds(
+            static_cast<std::chrono::microseconds::rep>((double)block.samples.size() * m_microseconds_per_sample)
+        );
+
+        if (end_block < threshold){  // todo: confirm if the audio deque clears properly
+            m_audio.pop_front();
+        }else{
+            break;
+        }
+    }
+    #endif
+//    cout << "exit" << endl;
+
+    while (!m_compressed_frames.empty()){
+        if (m_compressed_frames.front().timestamp < threshold){
+            m_compressed_frames.pop_front();
+        }else{
+            break;
+        }
+    }
+}
+
+
+bool StreamHistoryTracker::save(const std::string& filename) const{
+    m_logger.log("Saving stream history...", COLOR_BLUE);
+
+    std::deque<CompressedVideoFrame> frames;
+    {
+        //  Fast copy the current state of the stream.
+        WriteSpinLock lg(m_lock, PA_CURRENT_FUNCTION);
+        if (m_compressed_frames.empty()){
+            return false;
+        }
+        frames = m_compressed_frames;
+    }
+
+    m_logger.log("Total frames to save: " + std::to_string(frames.size()));
+
+    if (frames.empty()) return false;
+
+    // Use first frame to get size
+    QImage first_img = decompress_video_frame(frames.front().compressed_frame);
+    int width = first_img.width();
+    int height = first_img.height();
+
+    m_logger.log("Frame size: " + std::to_string(width) + " x " + std::to_string(height));
+
+    // 1. Initialize VideoWriter (e.g., MP4 with 30 FPS)
+    cv::VideoWriter writer(filename, cv::VideoWriter::fourcc('m', 'p', '4', 'v'), 
+                           m_target_fps, cv::Size(width, height), true);
+
+    if (!writer.isOpened()){
+        throw std::runtime_error("Could not open video file for writing.");
+    }
+
+    std::vector<unsigned char> last_good_buffer = frames[0].compressed_frame;
+
+    size_t frame_index = 0;
+    size_t frames_inserted = 0;
+    WallClock start_time = frames[0].timestamp;
+
+    // 2. Loop through frames
+    for (CompressedVideoFrame frame : frames){
+        if (frame_index % 100 == 0){
+            m_logger.log("Saving frame " + std::to_string(frame_index) + " / " + std::to_string(frames.size()));
+        }
+
+        // Insert duplicate frames if there is a gap due to dropping frames.
+        // Because VideoWriter can only handle a fixed frame rate.
+
+        // calculates the frame index that this timestamp SHOULD be at
+        double elapsed = std::chrono::duration_cast<std::chrono::milliseconds>(frame.timestamp - start_time).count();
+        double interval = std::chrono::duration_cast<std::chrono::milliseconds>(m_frame_interval).count();
+        size_t target_frame_index = (size_t)std::round(elapsed/interval);
+        // fill the gap with duplicate frames until we reach the target index
+        while (frames_inserted < target_frame_index){
+            // Decompress last known good frame and write again
+            QImage img = decompress_video_frame(last_good_buffer);
+            cv::Mat mat(height, width, CV_8UC3, (void*)img.bits(), img.bytesPerLine());
+            writer.write(mat);
+            frames_inserted++;
+        }
+
+        // 3. decompress frame and write to video
+        QImage img = decompress_video_frame(frame.compressed_frame);
+        cv::Mat mat(height, width, CV_8UC3, (void*)img.bits(), img.bytesPerLine());
+        writer.write(mat);
+
+        last_good_buffer = frame.compressed_frame;
+        frames_inserted++;
+        frame_index++;
+    }
+    // Writer automatically releases when going out of scope
+
+    m_logger.log("Done saving stream history...", COLOR_BLUE);
+    return true;
+}
+
+
+void StreamHistoryTracker::worker_loop(){
+    while (!m_stopping){
+        std::shared_ptr<const VideoFrame> frame;
+
+        // 1. Wait for a frame to process
+        {
+            std::unique_lock<Mutex> lock(m_queue_lock);
+            m_cv.wait(lock, [this] { return !m_pending_frames.empty() || m_stopping; });
+            
+            if (m_stopping && m_pending_frames.empty()) return;
+
+            frame = std::move(m_pending_frames.front());
+            m_pending_frames.pop_front();
+        }
+
+        // 2. Perform the expensive compression (Outside the lock)
+        auto compressed_data = compress_video_frame(frame->frame);
+
+        // 3. Move the result into the main storage
+        {
+            WriteSpinLock lg(m_lock, PA_CURRENT_FUNCTION);
+            m_compressed_frames.emplace_back(CompressedVideoFrame{
+                frame->timestamp, 
+                std::move(compressed_data)
+            });
+            clear_old(); // Cleanup happens here
+        }
+    }
+}
+
+
+
+}
+
+// #include "StreamHistoryTracker_SaveFrames.moc" 
diff --git a/SerialPrograms/Source/CommonFramework/Recording/StreamHistoryTracker_SaveFrames.h b/SerialPrograms/Source/CommonFramework/Recording/StreamHistoryTracker_SaveFrames.h
new file mode 100644
index 0000000000..6e846dae96
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/Recording/StreamHistoryTracker_SaveFrames.h
@@ -0,0 +1,111 @@
+/*  Stream History Tracker
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  Implement by saving the last X seconds of frames. This is currently not
+ *  viable because the QVideoFrames are uncompressed.
+ *
+ */
+
+#ifndef PokemonAutomation_StreamHistoryTracker_SaveFrames_H
+#define PokemonAutomation_StreamHistoryTracker_SaveFrames_H
+
+#include <deque>
+#include <QImage>
+#include <QVideoFrame>
+#include "Common/Cpp/Time.h"
+#include "Common/Cpp/Logging/AbstractLogger.h"
+#include "Common/Cpp/Concurrency/SpinLock.h"
+#include "Common/Cpp/Concurrency/Mutex.h"
+#include "Common/Cpp/Concurrency/ConditionVariable.h"
+#include "Common/Cpp/Concurrency/AsyncTask.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+
+
+namespace PokemonAutomation{
+
+
+struct AudioBlock{
+    WallClock timestamp;
+    std::vector<float> samples;
+
+    AudioBlock(const AudioBlock&) = delete;
+    void operator=(const AudioBlock&) = delete;
+
+    AudioBlock(WallClock p_timestamp, const float* p_samples, size_t p_count)
+        : timestamp(p_timestamp)
+        , samples(p_samples, p_samples + p_count)
+    {}
+};
+
+struct CompressedVideoFrame{
+    WallClock timestamp;
+    std::vector<unsigned char> compressed_frame;
+};
+
+QImage decompress_video_frame(const std::vector<uchar> &compressed_buffer);
+std::vector<uchar> compress_video_frame(const QVideoFrame& const_frame);
+
+class StreamHistoryTracker{
+public:
+    ~StreamHistoryTracker();
+    StreamHistoryTracker(
+        Logger& logger,
+        std::chrono::seconds window,
+        size_t audio_samples_per_frame,
+        size_t audio_frames_per_second,
+        bool has_video
+    );
+    void set_window(std::chrono::seconds window);
+
+    bool save(const std::string& filename) const;
+
+public:
+    void on_samples(const float* data, size_t frames);
+    void on_frame(std::shared_ptr<const VideoFrame> frame);
+
+private:
+    void clear_old();
+    void worker_loop(); // The function that runs in the thread
+
+private:
+    static constexpr size_t MAX_PENDING_FRAMES = 10;
+    Logger& m_logger;
+    mutable SpinLock m_lock;
+    std::chrono::seconds m_window;
+
+    // const size_t m_audio_samples_per_frame;
+    // const size_t m_audio_frames_per_second;
+    // const size_t m_audio_samples_per_second;
+    // const double m_microseconds_per_sample;
+    // const bool m_has_video;
+    size_t m_target_fps;
+    std::chrono::microseconds m_frame_interval;
+    WallClock m_next_frame_time;
+
+    //  We use shared_ptr here so it's fast to snapshot when we need to copy
+    //  everything asynchronously.
+    // std::deque<std::shared_ptr<AudioBlock>> m_audio;
+    // std::deque<std::shared_ptr<const VideoFrame>> m_frames;
+    std::deque<CompressedVideoFrame> m_compressed_frames;
+
+    AsyncTask m_worker;
+    std::atomic<bool> m_stopping{false};
+    
+    // Queue for the worker thread
+    Mutex m_queue_lock;
+    ConditionVariable m_cv;
+    std::deque<std::shared_ptr<const VideoFrame>> m_pending_frames;
+
+    
+
+    
+};
+
+
+
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/Recording/StreamRecorder.cpp b/SerialPrograms/Source/CommonFramework/Recording/StreamRecorder.cpp
new file mode 100644
index 0000000000..e693ed6480
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/Recording/StreamRecorder.cpp
@@ -0,0 +1,793 @@
+/*  Stream Recorder
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <QtConfig>
+#if (QT_VERSION_MAJOR == 6) && (QT_VERSION_MINOR >= 8)
+#include <iostream>
+#include <QUrl>
+#include <QAudioFormat>
+#include <QMediaFormat>
+#include <QCoreApplication>
+#include <QAudioBufferInput>
+#include <QVideoFrameInput>
+#include <QMediaCaptureSession>
+#include <QMediaRecorder>
+#include "Common/Cpp/Filesystem/Filesystem.h"
+//#include "Common/Qt/Redispatch.h"
+#include "Common/Cpp/PrettyPrint.h"
+#include "Common/Cpp/Concurrency/SpinPause.h"
+#include "CommonFramework/GlobalSettingsPanel.h"
+#include "CommonFramework/VideoPipeline/Backends/VideoFrameQt.h"
+#include "CommonFramework/Recording/StreamHistoryOption.h"
+#include "StreamRecorder.h"
+
+
+//  This doesn't work yet. QMediaRecorder writes different bytes with
+//  setOutputDevice() vs. setOutputLocation().
+//  So far I can't get setOutputDevice() to work. The bytes that it
+//  spits out is not a valid .mp4 file.
+
+//#define PA_STREAM_HISTORY_LOCAL_BUFFER
+
+using std::cout;
+using std::endl;
+
+
+namespace PokemonAutomation{
+
+
+StreamRecording::StreamRecording(
+    Logger& logger,
+    std::chrono::milliseconds buffer_limit,
+    WallClock start_time,
+    size_t audio_samples_per_frame,
+    size_t audio_frames_per_second,
+    bool has_video
+)
+    : m_logger(logger)
+    , m_buffer_limit(buffer_limit)
+    , m_start_time(start_time)
+    , m_audio_samples_per_frame(audio_samples_per_frame)
+    , m_has_video(has_video)
+    , m_filename(GlobalSettings::instance().TEMP_FOLDER)
+    , m_stopping(false)
+    , m_last_drop(current_time())
+    , m_last_frame_time(std::numeric_limits<qint64>::min())
+{
+    logger.log(
+        "StreamRecording: Audio = " + std::to_string(audio_samples_per_frame) +
+        ", Video = " + std::to_string(has_video)
+    );
+//    cout << "audio = " << audio_samples_per_frame << ", video = " << has_video << endl;
+
+    if (audio_samples_per_frame == 0 && !has_video){
+        return;
+    }
+
+    if (audio_samples_per_frame > 0){
+        m_audio_format.setChannelCount((int)audio_samples_per_frame);
+        m_audio_format.setChannelConfig(audio_samples_per_frame == 1 ? QAudioFormat::ChannelConfigMono : QAudioFormat::ChannelConfigStereo);
+        m_audio_format.setSampleRate((int)audio_frames_per_second);
+        m_audio_format.setSampleFormat(QAudioFormat::Float);
+    }
+
+#ifndef PA_STREAM_HISTORY_LOCAL_BUFFER
+    Filesystem::create_directories(Filesystem::Path(m_filename));
+#endif
+    if (has_video){
+        m_filename += now_to_filestring() + ".mp4";
+    }else{
+        m_filename += now_to_filestring() + ".m4a";
+    }
+
+    start();
+}
+StreamRecording::~StreamRecording(){
+    {
+        std::lock_guard<Mutex> lg(m_lock);
+        m_stopping = true;
+//        cout << "signalling: ~StreamRecording()" << endl;
+        m_cv.notify_all();
+    }
+    quit();
+    wait();
+#ifndef PA_STREAM_HISTORY_LOCAL_BUFFER
+    if (!m_filename.empty()){
+        Filesystem::remove(Filesystem::Path(m_filename));
+    }
+#endif
+}
+
+bool StreamRecording::stop_and_save(const std::string& filename){
+    auto scope_check = m_santizer.check_scope();
+    {
+        std::lock_guard<Mutex> lg(m_lock);
+        m_stopping = true;
+//        cout << "signalling: stop_and_save()" << endl;
+        m_cv.notify_all();
+    }
+    quit();
+    wait();
+
+#ifdef PA_STREAM_HISTORY_LOCAL_BUFFER
+    return m_write_buffer.write(m_logger, filename);
+#else
+    std::error_code ec;
+    Filesystem::rename(Filesystem::Path(m_filename), Filesystem::Path(filename), ec);
+    m_filename.clear();
+    return !ec;
+#endif
+}
+
+
+void StreamRecording::push_samples(WallClock timestamp, const float* data, size_t frames){
+    auto scope_check = m_santizer.check_scope();
+#if 1
+    WallClock now = current_time();
+    if (m_audio_samples_per_frame == 0 || now < m_start_time){
+        return;
+    }
+    WallClock threshold = timestamp - m_buffer_limit;
+
+    std::lock_guard<Mutex> lg(m_lock);
+    if (m_stopping){
+        return;
+    }
+
+    do{
+        if (m_buffered_audio.empty()){
+            break;
+        }
+
+        //  Too much has been buffered. Drop the block.
+        if (m_buffered_audio.front().timestamp < threshold){
+            //  Throttle the prints.
+            if (now - m_last_drop > std::chrono::seconds(5)){
+                m_last_drop = now;
+                m_logger.log("Unable to keep up with audio recording. Dropping samples.", COLOR_RED);
+            }
+            return;
+        }
+
+    }while (false);
+
+    //  Enqueue the sample block.
+    m_buffered_audio.emplace_back(
+        timestamp,
+        data, frames * m_audio_samples_per_frame
+    );
+    m_cv.notify_all();
+#endif
+}
+void StreamRecording::push_frame(std::shared_ptr<const VideoFrame> frame){
+    auto scope_check = m_santizer.check_scope();
+#if 1
+    WallClock now = current_time();
+    if (!m_has_video || now < m_start_time){
+        return;
+    }
+//    cout << "push_frame(): " << frame->frame.startTime() << " - " << frame->frame.endTime() << endl;
+    WallClock threshold = frame->timestamp - m_buffer_limit;
+
+    std::lock_guard<Mutex> lg(m_lock);
+    if (m_stopping){
+        return;
+    }
+
+    qint64 frame_time = frame->frame.startTime();
+    do{
+        if (m_buffered_frames.empty()){
+            break;
+        }
+
+        //  Too much has been buffered. Drop the frame.
+        if (m_buffered_frames.front()->timestamp < threshold){
+            //  Throttle the prints.
+            if (now - m_last_drop > std::chrono::seconds(5)){
+                m_last_drop = now;
+                m_logger.log("Unable to keep up with video recording. Dropping samples.", COLOR_RED);
+            }
+            return;
+        }
+
+        //  Non-increasing timestamp. Drop possible duplicate frame.
+        if (frame_time <= m_last_frame_time){
+            return;
+        }
+    }while (false);
+
+    //  Enqueue the frame.
+    m_buffered_frames.emplace_back(std::move(frame));
+    m_last_frame_time = frame_time;
+    m_cv.notify_all();
+#endif
+}
+
+
+
+std::unique_ptr<QAudioBufferInput> StreamRecording::initialize_audio(){
+    std::unique_ptr<QAudioBufferInput> ret(new QAudioBufferInput());
+    m_audio_input = ret.get();
+    m_session->setAudioBufferInput(m_audio_input);
+
+    connect(
+        m_audio_input, &QAudioBufferInput::readyToSendAudioBuffer,
+        m_recorder, [this](){
+            std::lock_guard<Mutex> lg(m_lock);
+            m_cv.notify_all();
+        },
+        Qt::DirectConnection
+    );
+
+    return ret;
+}
+std::unique_ptr<QVideoFrameInput> StreamRecording::initialize_video(){
+    std::unique_ptr<QVideoFrameInput> ret(new QVideoFrameInput());
+    m_video_input = ret.get();
+    m_session->setVideoFrameInput(m_video_input);
+
+    const StreamHistoryOption& settings = GlobalSettings::instance().STREAM_HISTORY;
+
+    switch (settings.RESOLUTION){
+    case StreamHistoryOption::Resolution::MATCH_INPUT:
+        break;
+    case StreamHistoryOption::Resolution::FORCE_720p:
+        m_recorder->setVideoResolution(1280, 720);
+        break;
+    case StreamHistoryOption::Resolution::FORCE_1080p:
+        m_recorder->setVideoResolution(1920, 1080);
+        break;
+    }
+
+    switch (settings.ENCODING_MODE){
+    case StreamHistoryOption::EncodingMode::FIXED_QUALITY:
+        switch (settings.VIDEO_QUALITY){
+        case StreamHistoryOption::VideoQuality::VERY_LOW:
+            m_recorder->setQuality(QMediaRecorder::VeryLowQuality);
+            break;
+        case StreamHistoryOption::VideoQuality::LOW:
+            m_recorder->setQuality(QMediaRecorder::LowQuality);
+            break;
+        case StreamHistoryOption::VideoQuality::NORMAL:
+            m_recorder->setQuality(QMediaRecorder::NormalQuality);
+            break;
+        case StreamHistoryOption::VideoQuality::HIGH:
+            m_recorder->setQuality(QMediaRecorder::HighQuality);
+            break;
+        case StreamHistoryOption::VideoQuality::VERY_HIGH:
+            m_recorder->setQuality(QMediaRecorder::VeryHighQuality);
+            break;
+        }
+        break;
+    case StreamHistoryOption::EncodingMode::FIXED_BITRATE:
+        m_recorder->setVideoBitRate(settings.VIDEO_BITRATE * 1000);
+        m_recorder->setEncodingMode(QMediaRecorder::AverageBitRateEncoding);
+        break;
+    }
+
+    connect(
+        m_video_input, &QVideoFrameInput::readyToSendVideoFrame,
+        m_recorder, [this](){
+            std::lock_guard<Mutex> lg(m_lock);
+            m_cv.notify_all();
+        },
+        Qt::DirectConnection
+    );
+
+    return ret;
+}
+
+void StreamRecording::internal_run(){
+    QMediaCaptureSession session;
+    QMediaRecorder recorder;
+    m_session = &session;
+    m_recorder = &recorder;
+    m_session->setRecorder(m_recorder);
+
+    std::unique_ptr<QAudioBufferInput> audio;
+    std::unique_ptr<QVideoFrameInput> video;
+
+    //  Only initialize the streams we intend to use.
+    if (m_audio_samples_per_frame > 0){
+        audio = initialize_audio();
+    }
+    if (m_has_video){
+        video = initialize_video();
+    }
+
+    m_recorder->setMediaFormat(QMediaFormat::MPEG4);
+
+    connect(
+        m_recorder, &QMediaRecorder::recorderStateChanged,
+        m_recorder, [this](QMediaRecorder::RecorderState state){
+            if (state == QMediaRecorder::StoppedState){
+                std::lock_guard<Mutex> lg(m_lock);
+//                cout << "signalling: StoppedState" << endl;
+                m_stopping = true;
+                m_cv.notify_all();
+            }
+        },
+        Qt::DirectConnection
+    );
+
+
+#ifdef PA_STREAM_HISTORY_LOCAL_BUFFER
+    m_recorder->setOutputDevice(&m_write_buffer);
+#else
+    m_recorder->setOutputLocation(
+        QUrl::fromLocalFile(QString::fromStdString(
+            Filesystem::absolute(Filesystem::Path(m_filename)).string_slash_normalized()
+        ))
+    );
+#endif
+
+//    cout << "Encoding Mode = " << (int)recorder.encodingMode() << endl;
+//    cout << "Bit Rate = " << (int)recorder.videoBitRate() << endl;
+
+
+#if 1
+//    cout << "starting recording" << endl;
+    m_recorder->record();
+
+    AudioBlock current_audio;
+    std::shared_ptr<const VideoFrame> current_frame;
+    QAudioBuffer audio_buffer;
+
+    while (true){
+        QCoreApplication::processEvents();
+
+        {
+            std::unique_lock<Mutex> lg(m_lock);
+            if (m_stopping){
+                break;
+            }
+
+            if (!current_audio.is_valid() && !m_buffered_audio.empty()){
+                current_audio = std::move(m_buffered_audio.front());
+                m_buffered_audio.pop_front();
+            }
+            if (!current_frame && !m_buffered_frames.empty()){
+                current_frame = std::move(m_buffered_frames.front());
+                m_buffered_frames.pop_front();
+            }
+
+            if (!current_audio.is_valid() && !current_frame){
+//                cout << "sleeping 0..." << endl;
+                m_cv.wait(lg);
+//                cout << "waking 0..." << endl;
+            }
+        }
+
+        bool progress_made = false;
+
+        if (current_audio.is_valid()){
+            if (!audio_buffer.isValid()){
+                const std::vector<float>& samples = current_audio.samples;
+                QByteArray bytes((const char*)samples.data(), samples.size() * sizeof(float));
+                audio_buffer = QAudioBuffer(bytes, m_audio_format);
+            }
+            if (audio_buffer.isValid() && m_audio_input->sendAudioBuffer(audio_buffer)){
+                current_audio.clear();
+                audio_buffer = QAudioBuffer();
+                progress_made = true;
+            }
+        }
+//        cout << "Before: " << m_video_input << endl;
+        if (current_frame && m_video_input->sendVideoFrame(current_frame->frame)){
+//            cout << "push frame: " << current_frame->frame.startTime() << endl;
+            current_frame.reset();
+            progress_made = true;
+        }
+//        cout << "After: " << m_video_input << endl;
+
+        if (!progress_made){
+            std::unique_lock<Mutex> lg(m_lock);
+            if (m_stopping){
+                break;
+            }
+//            cout << "sleeping 1..." << endl;
+            m_cv.wait(lg);
+//            cout << "waking 1..." << endl;
+        }
+    }
+
+    m_recorder->stop();
+//    cout << "recorder.stop()" << endl;
+#endif
+
+
+    while (m_recorder->recorderState() != QMediaRecorder::StoppedState){
+//        cout << "StreamHistoryTracker: process" << endl;
+        QCoreApplication::processEvents();
+        pause();
+    }
+
+    exec();
+
+}
+void StreamRecording::run(){
+    auto scope_check = m_santizer.check_scope();
+    try{
+        internal_run();
+    }catch (...){
+        m_logger.log("Exception thrown out of stream recorder...", COLOR_RED);
+        std::lock_guard<Mutex> lg(m_lock);
+        m_stopping = true;
+    }
+}
+
+
+
+
+
+StreamRecording2::StreamRecording2(
+    Logger& logger,
+    std::chrono::milliseconds buffer_limit,
+    WallClock start_time,
+    size_t audio_samples_per_frame,
+    size_t audio_frames_per_second,
+    bool has_video
+)
+    : m_logger(logger)
+    , m_buffer_limit(buffer_limit)
+    , m_start_time(start_time)
+    , m_audio_samples_per_frame(audio_samples_per_frame)
+    , m_has_video(has_video)
+    , m_filename(GlobalSettings::instance().TEMP_FOLDER)
+    , m_stopping(false)
+    , m_last_drop(current_time())
+    , m_last_frame_time(std::numeric_limits<qint64>::min())
+{
+    logger.log(
+        "StreamRecording: Audio = " + std::to_string(audio_samples_per_frame) +
+        ", Video = " + std::to_string(has_video)
+    );
+//    cout << "audio = " << audio_samples_per_frame << ", video = " << has_video << endl;
+
+    if (audio_samples_per_frame == 0 && !has_video){
+        return;
+    }
+
+    if (audio_samples_per_frame > 0){
+        m_audio_format.setChannelCount((int)audio_samples_per_frame);
+        m_audio_format.setChannelConfig(audio_samples_per_frame == 1 ? QAudioFormat::ChannelConfigMono : QAudioFormat::ChannelConfigStereo);
+        m_audio_format.setSampleRate((int)audio_frames_per_second);
+        m_audio_format.setSampleFormat(QAudioFormat::Float);
+    }
+
+#ifndef PA_STREAM_HISTORY_LOCAL_BUFFER
+    Filesystem::create_directories(Filesystem::Path(m_filename));
+#endif
+    if (has_video){
+        m_filename += now_to_filestring() + ".mp4";
+    }else{
+        m_filename += now_to_filestring() + ".m4a";
+    }
+
+    m_recorder.reset(new QMediaRecorder());
+    m_session.setRecorder(m_recorder.get());
+
+    //  Only initialize the streams we intend to use.
+    if (m_audio_samples_per_frame > 0){
+        initialize_audio();
+    }
+    if (m_has_video){
+        initialize_video();
+    }
+
+    m_recorder->setMediaFormat(QMediaFormat::MPEG4);
+
+
+
+#ifdef PA_STREAM_HISTORY_LOCAL_BUFFER
+    m_recorder->setOutputDevice(&m_write_buffer);
+#else
+    m_recorder->setOutputLocation(
+        QUrl::fromLocalFile(QString::fromStdString(
+            Filesystem::absolute(Filesystem::Path(m_filename)).string_slash_normalized()
+        ))
+    );
+#endif
+
+    m_recorder->record();
+}
+StreamRecording2::~StreamRecording2(){
+#if 1
+    stop();
+#else
+    {
+        std::unique_lock<Mutex> lg(m_lock);
+        if (m_stopping){
+            return;
+        }
+        m_stopping = true;
+    }
+
+    m_recorder->stop();
+    m_recorder.reset();
+#endif
+
+#ifndef PA_STREAM_HISTORY_LOCAL_BUFFER
+    cout << Filesystem::remove(Filesystem::Path(m_filename)) << endl;
+#endif
+}
+
+void StreamRecording2::stop(){
+    auto scope_check = m_santizer.check_scope();
+
+    {
+        std::unique_lock<Mutex> lg(m_lock);
+        if (m_stopping){
+            return;
+        }
+        m_stopping = true;
+    }
+
+#if 0
+    run_on_main_thread_and_wait([this]{
+        QEventLoop loop;
+        m_recorder.connect(
+            &m_recorder, &QMediaRecorder::recorderStateChanged,
+            &m_recorder, [&](QMediaRecorder::RecorderState state){
+                if (state == QMediaRecorder::StoppedState){
+                    loop.quit();
+                }
+            }
+        );
+
+        emit m_recorder.stop();
+
+        if (m_recorder.recorderState() != QMediaRecorder::StoppedState){
+            loop.exec();
+        }
+    });
+#endif
+
+    m_recorder->stop();
+
+    while (m_recorder->recorderState() != QMediaRecorder::StoppedState){
+        cout << "Spin waiting..." << endl;
+        pause();
+    }
+}
+
+
+void StreamRecording2::initialize_audio(){
+    m_audio_input.reset(new QAudioBufferInput());
+    m_session.setAudioBufferInput(m_audio_input.get());
+
+    m_recorder->connect(
+        m_audio_input.get(), &QAudioBufferInput::readyToSendAudioBuffer,
+        m_recorder.get(), [this](){
+//            cout << "readyToSendAudioBuffer()" << endl;
+//            std::lock_guard<Mutex> lg(m_lock);
+//            m_cv.notify_all();
+            process();
+        },
+        Qt::DirectConnection
+    );
+}
+void StreamRecording2::initialize_video(){
+    m_video_input.reset(new QVideoFrameInput());
+    m_session.setVideoFrameInput(m_video_input.get());
+
+    const StreamHistoryOption& settings = GlobalSettings::instance().STREAM_HISTORY;
+
+    switch (settings.RESOLUTION){
+    case StreamHistoryOption::Resolution::MATCH_INPUT:
+        break;
+    case StreamHistoryOption::Resolution::FORCE_720p:
+        m_recorder->setVideoResolution(1280, 720);
+        break;
+    case StreamHistoryOption::Resolution::FORCE_1080p:
+        m_recorder->setVideoResolution(1920, 1080);
+        break;
+    }
+
+    switch (settings.ENCODING_MODE){
+    case StreamHistoryOption::EncodingMode::FIXED_QUALITY:
+        switch (settings.VIDEO_QUALITY){
+        case StreamHistoryOption::VideoQuality::VERY_LOW:
+            m_recorder->setQuality(QMediaRecorder::VeryLowQuality);
+            break;
+        case StreamHistoryOption::VideoQuality::LOW:
+            m_recorder->setQuality(QMediaRecorder::LowQuality);
+            break;
+        case StreamHistoryOption::VideoQuality::NORMAL:
+            m_recorder->setQuality(QMediaRecorder::NormalQuality);
+            break;
+        case StreamHistoryOption::VideoQuality::HIGH:
+            m_recorder->setQuality(QMediaRecorder::HighQuality);
+            break;
+        case StreamHistoryOption::VideoQuality::VERY_HIGH:
+            m_recorder->setQuality(QMediaRecorder::VeryHighQuality);
+            break;
+        }
+        break;
+    case StreamHistoryOption::EncodingMode::FIXED_BITRATE:
+        m_recorder->setVideoBitRate(settings.VIDEO_BITRATE * 1000);
+        m_recorder->setEncodingMode(QMediaRecorder::AverageBitRateEncoding);
+        break;
+    }
+
+    m_recorder->connect(
+        m_video_input.get(), &QVideoFrameInput::readyToSendVideoFrame,
+        m_recorder.get(), [this](){
+//            cout << "readyToSendVideoFrame()" << endl;
+//            std::lock_guard<Mutex> lg(m_lock);
+//            m_cv.notify_all();
+            process();
+        },
+        Qt::DirectConnection
+    );
+}
+
+
+
+
+void StreamRecording2::push_samples(WallClock timestamp, const float* data, size_t frames){
+    auto scope_check = m_santizer.check_scope();
+#if 1
+    WallClock now = current_time();
+    if (m_audio_samples_per_frame == 0 || now < m_start_time){
+        return;
+    }
+    WallClock threshold = timestamp - m_buffer_limit;
+
+    {
+        std::lock_guard<Mutex> lg(m_lock);
+        if (m_stopping){
+            return;
+        }
+
+        do{
+            if (m_buffered_audio.empty()){
+                break;
+            }
+
+            //  Too much has been buffered. Drop the block.
+            if (m_buffered_audio.front().timestamp < threshold){
+                //  Throttle the prints.
+                if (now - m_last_drop > std::chrono::seconds(5)){
+                    m_last_drop = now;
+                    m_logger.log("Unable to keep up with audio recording. Dropping samples.", COLOR_RED);
+                }
+                return;
+            }
+
+        }while (false);
+
+        //  Enqueue the sample block.
+        m_buffered_audio.emplace_back(
+            timestamp,
+            data, frames * m_audio_samples_per_frame
+        );
+    }
+
+    emit m_audio_input->readyToSendAudioBuffer();
+#endif
+}
+void StreamRecording2::push_frame(std::shared_ptr<const VideoFrame> frame){
+    auto scope_check = m_santizer.check_scope();
+#if 1
+    WallClock now = current_time();
+    if (!m_has_video || now < m_start_time){
+        return;
+    }
+//    cout << "push_frame(): " << frame->frame.startTime() << " - " << frame->frame.endTime() << endl;
+    WallClock threshold = frame->timestamp - m_buffer_limit;
+
+    {
+        std::lock_guard<Mutex> lg(m_lock);
+        if (m_stopping){
+            return;
+        }
+
+        qint64 frame_time = frame->frame.startTime();
+        do{
+            if (m_buffered_frames.empty()){
+                break;
+            }
+
+            //  Too much has been buffered. Drop the frame.
+            if (m_buffered_frames.front()->timestamp < threshold){
+                //  Throttle the prints.
+                if (now - m_last_drop > std::chrono::seconds(5)){
+                    m_last_drop = now;
+                    m_logger.log("Unable to keep up with video recording. Dropping samples.", COLOR_RED);
+                }
+                return;
+            }
+
+            //  Non-increasing timestamp. Drop possible duplicate frame.
+            if (frame_time <= m_last_frame_time){
+                return;
+            }
+        }while (false);
+
+        //  Enqueue the frame.
+        m_buffered_frames.emplace_back(std::move(frame));
+        m_last_frame_time = frame_time;
+    }
+
+    emit m_video_input->readyToSendVideoFrame();
+#endif
+}
+
+
+bool StreamRecording2::stop_and_save(const std::string& filename){
+    stop();
+
+#ifdef PA_STREAM_HISTORY_LOCAL_BUFFER
+    return m_write_buffer.write(m_logger, filename);
+#else
+    std::error_code ec;
+    Filesystem::rename(Filesystem::Path(m_filename), Filesystem::Path(filename), ec);
+    m_filename.clear();
+    return !ec;
+#endif
+}
+
+void StreamRecording2::process(){
+    auto scope_check = m_santizer.check_scope();
+
+//    cout << "StreamRecording2::process()" << endl;
+
+    bool progress_made;
+    do{
+        {
+            std::unique_lock<Mutex> lg(m_lock);
+            if (m_stopping){
+                cout << "exit" << endl;
+                break;
+            }
+
+            if (!m_current_audio.is_valid() && !m_buffered_audio.empty()){
+                m_current_audio = std::move(m_buffered_audio.front());
+                m_buffered_audio.pop_front();
+            }
+            if (!m_current_frame && !m_buffered_frames.empty()){
+                m_current_frame = std::move(m_buffered_frames.front());
+                m_buffered_frames.pop_front();
+            }
+
+            if (!m_current_audio.is_valid() && !m_current_frame){
+                return;
+            }
+        }
+
+        progress_made = false;
+
+        if (m_current_audio.is_valid()){
+            if (!m_audio_buffer.isValid()){
+                const std::vector<float>& samples = m_current_audio.samples;
+                QByteArray bytes((const char*)samples.data(), samples.size() * sizeof(float));
+                m_audio_buffer = QAudioBuffer(bytes, m_audio_format);
+            }
+            if (m_audio_buffer.isValid() && m_audio_input->sendAudioBuffer(m_audio_buffer)){
+                m_current_audio.clear();
+                m_audio_buffer = QAudioBuffer();
+                progress_made = true;
+            }
+        }
+//        cout << "Before: " << m_video_input << endl;
+        if (m_current_frame && m_video_input->sendVideoFrame(m_current_frame->frame)){
+//            cout << "push frame: " << current_frame->frame.startTime() << endl;
+            m_current_frame.reset();
+            progress_made = true;
+        }
+
+    }while (progress_made);
+}
+
+
+
+
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/Recording/StreamRecorder.h b/SerialPrograms/Source/CommonFramework/Recording/StreamRecorder.h
new file mode 100644
index 0000000000..2bbe2f32b9
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/Recording/StreamRecorder.h
@@ -0,0 +1,237 @@
+/*  Stream Recorder
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_StreamRecorder_H
+#define PokemonAutomation_StreamRecorder_H
+
+#include <vector>
+#include <deque>
+#include <QIODevice>
+#include <QAudioFormat>
+#include <QAudioBuffer>
+#include <QThread>
+#include <QMediaCaptureSession>
+#include <QMediaRecorder>
+#include "Common/Cpp/LifetimeSanitizer.h"
+#include "Common/Cpp/Filesystem/FileIO.h"
+#include "Common/Cpp/Filesystem/Filesystem.h"
+#include "Common/Cpp/Time.h"
+#include "Common/Cpp/Concurrency/Mutex.h"
+#include "Common/Cpp/Concurrency/ConditionVariable.h"
+#include "Common/Cpp/Logging/AbstractLogger.h"
+#include "CommonFramework/VideoPipeline/Backends/VideoFrameQt.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+
+class QAudioBufferInput;
+class QVideoFrameInput;
+class QMediaCaptureSession;
+class QMediaRecorder;
+
+namespace PokemonAutomation{
+
+
+struct AudioBlock{
+    WallClock timestamp;
+    std::vector<float> samples;
+
+    AudioBlock(AudioBlock&&) = default;
+    AudioBlock& operator=(AudioBlock&&) = default;
+    AudioBlock(const AudioBlock&) = delete;
+    void operator=(const AudioBlock&) = delete;
+
+    AudioBlock()
+        : timestamp(WallClock::min())
+    {}
+    AudioBlock(WallClock p_timestamp, const float* p_samples, size_t p_count)
+        : timestamp(p_timestamp)
+        , samples(p_samples, p_samples + p_count)
+    {}
+
+    void clear(){
+        samples.clear();
+    }
+    bool is_valid() const{
+        return !samples.empty();
+    }
+};
+
+
+
+class WriteBuffer : public QIODevice{
+public:
+    ~WriteBuffer(){
+        waitForBytesWritten(-1);
+    }
+    WriteBuffer(){
+        setOpenMode(QIODeviceBase::WriteOnly);
+    }
+
+    virtual qint64 readData(char* data, qint64 maxlen){ return 0; }
+    virtual qint64 writeData(const char* data, qint64 len){
+        m_bytes += len;
+//        cout << "total = " << m_bytes << ", current = " << len << endl;
+        m_blocks.emplace_back(data, data + len);
+//        cout << "data = " << (unsigned)data[0] << endl;
+        return len;
+    }
+
+    bool write(Logger& logger, const std::string& filename) const{
+//        cout << "write()" << endl;
+        FileIO file(Filesystem::Path(filename), FileMode::WRITE);
+        if (!file.is_open()){
+            logger.log("Failed to write file: " + filename, COLOR_RED);
+            return false;
+        }
+        for (const std::vector<char>& block : m_blocks){
+            if (file.write(block.data(), block.size()) != block.size()){
+                logger.log("Failed to write file: " + filename, COLOR_RED);
+                return false;
+            }
+        }
+        file.close();
+        return true;
+    }
+
+private:
+    uint64_t m_bytes = 0;
+    std::deque<std::vector<char>> m_blocks;
+};
+
+
+
+
+//
+//  This one works, but it leaks a tiny bit of memory each time QMediaRecorder
+//  is started and stopped.
+//
+class StreamRecording : public QThread{
+public:
+    StreamRecording(
+        Logger& logger,
+        std::chrono::milliseconds buffer_limit,
+        WallClock start_time,
+        size_t audio_samples_per_frame,
+        size_t audio_frames_per_second,
+        bool has_video
+    );
+    ~StreamRecording();
+
+    void push_samples(WallClock timestamp, const float* data, size_t frames);
+    void push_frame(std::shared_ptr<const VideoFrame> frame);
+
+    bool stop_and_save(const std::string& filename);
+
+private:
+    std::unique_ptr<QAudioBufferInput> initialize_audio();
+    std::unique_ptr<QVideoFrameInput> initialize_video();
+    void internal_run();
+    virtual void run() override;
+
+private:
+    Logger& m_logger;
+    const std::chrono::milliseconds m_buffer_limit;
+    const WallClock m_start_time;
+    const size_t m_audio_samples_per_frame;
+    const bool m_has_video;
+
+    QAudioFormat m_audio_format;
+    std::string m_filename;
+
+    Mutex m_lock;
+    ConditionVariable m_cv;
+
+    bool m_stopping = false;
+    WallClock m_last_drop;
+
+    std::deque<AudioBlock> m_buffered_audio;
+
+    qint64 m_last_frame_time;
+    std::deque<std::shared_ptr<const VideoFrame>> m_buffered_frames;
+
+    WriteBuffer m_write_buffer;
+
+    QAudioBufferInput* m_audio_input = nullptr;
+    QVideoFrameInput* m_video_input = nullptr;
+    QMediaCaptureSession* m_session = nullptr;
+    QMediaRecorder* m_recorder = nullptr;
+
+    LifetimeSanitizer m_santizer;
+};
+
+
+//
+//  This one doesn't work. QMediaRecorder::stop() is an asynchronous operation
+//  that you must execute event loop to finish it. But we cannot call event
+//  loop because it leads to reentrancy issues with the destruction path.
+//
+class StreamRecording2{
+public:
+    StreamRecording2(
+        Logger& logger,
+        std::chrono::milliseconds buffer_limit,
+        WallClock start_time,
+        size_t audio_samples_per_frame,
+        size_t audio_frames_per_second,
+        bool has_video
+    );
+    ~StreamRecording2();
+
+    void push_samples(WallClock timestamp, const float* data, size_t frames);
+    void push_frame(std::shared_ptr<const VideoFrame> frame);
+
+    void stop();
+    bool stop_and_save(const std::string& filename);
+
+private:
+    void initialize_audio();
+    void initialize_video();
+    void process();
+
+
+private:
+    Logger& m_logger;
+    const std::chrono::milliseconds m_buffer_limit;
+    const WallClock m_start_time;
+    const size_t m_audio_samples_per_frame;
+    const bool m_has_video;
+
+    QAudioFormat m_audio_format;
+    std::string m_filename;
+
+    Mutex m_lock;
+//    ConditionVariable m_cv;
+
+    bool m_stopping = false;
+    WallClock m_last_drop;
+
+    std::deque<AudioBlock> m_buffered_audio;
+
+    qint64 m_last_frame_time;
+    std::deque<std::shared_ptr<const VideoFrame>> m_buffered_frames;
+
+    WriteBuffer m_write_buffer;
+
+    std::unique_ptr<QAudioBufferInput> m_audio_input;
+    std::unique_ptr<QVideoFrameInput> m_video_input;
+    QMediaCaptureSession m_session;
+    std::unique_ptr<QMediaRecorder> m_recorder;
+
+    AudioBlock m_current_audio;
+    std::shared_ptr<const VideoFrame> m_current_frame;
+    QAudioBuffer m_audio_buffer;
+
+    LifetimeSanitizer m_santizer;
+};
+
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/ResourceDownload/DownloadThread.cpp b/SerialPrograms/Source/CommonFramework/ResourceDownload/DownloadThread.cpp
new file mode 100644
index 0000000000..acb3dd7714
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/ResourceDownload/DownloadThread.cpp
@@ -0,0 +1,169 @@
+/*  DownloadThread
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <iostream>
+#include "Common/Cpp/ScopeExit.h"
+#include "Common/Cpp/Filesystem/Filesystem.h"
+#include "CommonFramework/GlobalAutoPaths.h"
+#include "CommonFramework/Logging/Logger.h"
+#include "CommonFramework/Exceptions/OperationFailedException.h"
+#include "CommonFramework/Tools/GlobalThreadPools.h"
+#include "CommonFramework/Tools/FileDownloader.h"
+#include "CommonFramework/Tools/FileUnzip.h"
+#include "CommonFramework/Tools/FileHash.h"
+#include "DownloadThread.h"
+
+namespace PokemonAutomation{
+
+
+
+DownloadThread::~DownloadThread(){
+    // cout << "~DownloadThread" << endl;
+    this->cancel();
+    m_worker.wait_and_ignore_exceptions();
+}
+DownloadThread::DownloadThread(Hooks hooks, const DownloadedResourceMetadata& remote_metadata, Mutex& lock, ConditionVariable& cv)
+    : m_hooks(std::move(hooks))
+    , m_remote_metadata(remote_metadata)
+    , m_download_lock(lock)
+    , m_download_cv(cv)
+{}
+
+void DownloadThread::start_download_thread(){
+    m_worker = GlobalThreadPools::unlimited_normal().dispatch_now_blocking(
+    [this]{
+
+        bool success = false;
+        {
+            std::unique_lock<Mutex> lock(m_download_lock);
+            m_download_cv.wait(lock, [this] { return m_hooks.is_ready_to_start(); });
+
+        }
+        
+        // runs when lambda is finished
+        ScopeExit on_exit([&, this]{
+            m_hooks.on_finished(success);
+        });
+
+        try{
+
+            // Logger& logger = global_logger_tagged();
+            // throw_and_log<OperationFailedException>(logger, ErrorReportMode::NO_ERROR_REPORT, 
+            //         "Test");
+            // throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Test."); 
+
+
+            // std::this_thread::sleep_for(std::chrono::seconds(7));
+
+            run_download(m_remote_metadata);
+
+            std::cout << "Done Download" << std::endl;
+            success = true;
+
+        }catch(OperationCancelledException&){
+            // user cancelled action
+            success = false;
+
+        }catch(OperationFailedException&){
+            success = false;
+            m_hooks.report_failed();
+        }catch (const std::exception& e){
+            std::string error_msg = "DownloadThread::start_download_thread: " + std::string(e.what());
+            success = false;
+            m_hooks.report_exception_caught(error_msg.c_str());
+        } catch(...){
+            success = false;
+            m_hooks.report_exception_caught("DownloadThread::start_download_thread: Unknown exception. Report this as an error.");
+        }
+
+    }
+    );
+
+}
+
+void DownloadThread::run_download(DownloadedResourceMetadata resource_metadata){
+    Logger& logger = global_logger_tagged();
+    // std::this_thread::sleep_for(std::chrono::seconds(5));
+
+    std::string url = resource_metadata.url;
+    std::string resource_name = resource_metadata.resource_name;
+    uint64_t expected_size = resource_metadata.size_compressed_bytes;
+
+    std::string resource_directory = DOWNLOADED_RESOURCE_PATH() + resource_name;
+    try{
+
+        // delete directory and the old resource
+        Filesystem::remove_all(resource_directory);
+
+        // download
+        std::string zip_path = resource_directory + "/temp.zip";
+        FileDownloader::download_file_to_disk(
+            *this,
+            logger, 
+            url, 
+            zip_path,
+            expected_size,
+            [this](uint64_t bytes_done, uint64_t total_bytes){
+                m_hooks.report_download_progress(bytes_done, total_bytes);
+            }
+        );
+
+        // hash
+        std::string hash = 
+            hash_file(
+                this,
+                zip_path,
+                [this](uint64_t bytes_done, uint64_t total_bytes){
+                    m_hooks.report_hash_progress(bytes_done, total_bytes);
+                }
+            );
+        std::string expected_hash = resource_metadata.sha256;
+        if (hash != expected_hash){
+            std::cerr << "current hash: " << hash << std::endl;
+            throw_and_log<OperationFailedException>(
+                logger,
+                ErrorReportMode::NO_ERROR_REPORT,
+                "Downloaded file failed verification. SHA 256 hash did not match the expected value."
+            );
+        }
+
+        // Filesystem::Path p{zip_path};
+        // cout << "File size: " << std::filesystem::file_size(p) << endl;
+
+        // unzip
+        unzip_file(
+            *this,
+            zip_path.c_str(), 
+            resource_directory.c_str(),
+            [this](uint64_t bytes_done, uint64_t total_bytes){
+                m_hooks.report_unzip_progress(bytes_done, total_bytes);
+            }
+        );
+
+        // delete old zip file
+        Filesystem::remove(zip_path);
+
+        throw_if_cancelled();
+
+    }catch(OperationCancelledException&){
+        // delete directory and the resource
+        Filesystem::remove_all(resource_directory);
+
+        throw;
+    }catch(OperationFailedException&){
+        // delete directory and the resource
+        Filesystem::remove_all(resource_directory);
+
+        throw;
+    }catch(...){
+        // delete directory and the resource
+        Filesystem::remove_all(resource_directory);
+
+        throw;
+    }
+
+}
+}
diff --git a/SerialPrograms/Source/CommonFramework/ResourceDownload/DownloadThread.h b/SerialPrograms/Source/CommonFramework/ResourceDownload/DownloadThread.h
new file mode 100644
index 0000000000..c94217323b
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/ResourceDownload/DownloadThread.h
@@ -0,0 +1,56 @@
+/*  DownloadThread
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_DownloadThread_H
+#define PokemonAutomation_DownloadThread_H
+
+#include <functional>
+#include "Common/Cpp/CancellableScope.h"
+#include "Common/Cpp/Concurrency/AsyncTask.h"
+#include "Common/Cpp/Concurrency/ConditionVariable.h"
+#include "Common/Cpp/Concurrency/Mutex.h"
+#include "ResourceDownloadHelpers.h"
+
+
+namespace PokemonAutomation{
+
+class DownloadThread : public CancellableScope{
+
+public:
+    struct Hooks {
+        std::function<bool()> is_ready_to_start;
+        std::function<void(bool success)> on_finished;
+        // std::function<void(const DownloadedResourceMetadata&)> run_download;
+        // std::function<void(bool success)> update_label;
+        std::function<void()> report_failed;
+        std::function<void(const char*)> report_exception_caught;
+        std::function<void(uint64_t bytes_done, uint64_t total_bytes)> report_download_progress;
+        std::function<void(uint64_t bytes_done, uint64_t total_bytes)> report_hash_progress;
+        std::function<void(uint64_t bytes_done, uint64_t total_bytes)> report_unzip_progress;
+    };
+
+public:
+    ~DownloadThread();
+    DownloadThread(Hooks hooks, const DownloadedResourceMetadata& remote_metadata, Mutex& lock, ConditionVariable& cv);
+
+public:
+    void start_download_thread();
+
+    // throws OperationCancelledException if the user cancels the action
+    void run_download(DownloadedResourceMetadata resource_metadata);
+
+    
+
+private:
+    Hooks m_hooks;
+    DownloadedResourceMetadata m_remote_metadata;
+    AsyncTask m_worker;
+
+    Mutex& m_download_lock;
+    ConditionVariable& m_download_cv;
+};
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/ResourceDownload/GlobalResourceDownloadManager.cpp b/SerialPrograms/Source/CommonFramework/ResourceDownload/GlobalResourceDownloadManager.cpp
new file mode 100644
index 0000000000..bdf6e944f5
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/ResourceDownload/GlobalResourceDownloadManager.cpp
@@ -0,0 +1,163 @@
+/*  Resource Download Manager
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Exceptions.h"
+#include "CommonFramework/GlobalSettingsPanel.h"
+#include "CommonFramework/ResourceDownload/ResourceDownloadHelpers.h"
+#include "CommonFramework/ResourceDownload/ResourceDownload.h"
+#include "GlobalResourceDownloadManager.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+
+
+GlobalResourceDownloadManager& GlobalResourceDownloadManager::instance(){
+    static GlobalResourceDownloadManager manager;
+    return manager;
+}
+
+
+std::shared_ptr<ResourceDownload> GlobalResourceDownloadManager::add_to_download_list(const std::string& resource_slug){
+    std::lock_guard<Mutex> lg(m_queue_lock);
+    auto iter = std::ranges::find_if(m_download_queue, [&](const auto& download_ptr){
+        return download_ptr->get_name() == resource_slug;
+    });
+
+    
+    if (iter == m_download_queue.end()){ // given Resource not already within the DownloadQueue
+        DownloadedResourceMetadata resource_metadata = get_remote_resource_metadata_from_resource_slug(resource_slug);
+        auto download_ptr = m_download_queue.emplace_back(std::make_shared<ResourceDownload>(*this, std::move(resource_metadata), m_queue_lock, m_cv));
+        
+        download_ptr->add_listener(*this);
+        GlobalSettings::instance().connect_row_with_download(resource_slug, download_ptr);
+        download_ptr->start_download();
+
+        return download_ptr;
+    }
+
+    // Return the existing shared_ptr found in the queue
+    return *iter;
+
+
+}
+
+void GlobalResourceDownloadManager::remove_from_download_list(const std::string& resource_slug){
+    // We need to delete the target ResourceDownloads outside of the lock
+    // (the reason isn't clear to me. I suspect its because GlobalResourceDownloadManager is one of the
+    // listeners within ResourceDownload's ListenerSet, which causes an issue during its destructor)
+    // This temporary vector holds ownership of the target ResourceDownloads
+    // while modifying m_download_queue occurs within the lock.
+    std::vector<std::shared_ptr<ResourceDownload>> to_destroy;
+
+    {
+        std::lock_guard<Mutex> lg(m_queue_lock);
+
+        // std::erase_if modifies the vector in-place
+        std::erase_if(m_download_queue, [&](auto& download_ptr){
+            if (!download_ptr) return false;
+            
+            if (download_ptr->get_name() == resource_slug){
+                // Move the download_ptr out of the m_download_queue and into our temporary vector
+                // This prevents immediate destruction of download_ptr, while
+                // it's still removed from m_download_queue.
+                to_destroy.push_back(std::move(download_ptr));
+                return true;
+            }
+            return false;
+        });
+        
+        m_cv.notify_all();
+    }
+
+    // The 'to_destroy' vector goes out of scope here.
+    // The ResourceDownload destructors run safely out of the lock.
+}
+
+bool GlobalResourceDownloadManager::is_download_ready_to_start(const std::string& resource_slug){
+    // ASSUMES: the calling thread holds the m_lock. therefore, this function doesn't lock the mutex when accessing download_queue.
+    // std::lock_guard<Mutex> lg(m_lock); 
+
+    uint16_t MAX_CONCURRENT_DOWNLOADS = 10;
+
+    auto iter = std::ranges::find_if(m_download_queue, [&](const auto& download_ptr){
+        return download_ptr->get_name() == resource_slug;
+    });
+
+    if (iter == m_download_queue.end()){
+        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "is_download_ready_to_start: resource_slug not found within download_queue.");
+    }
+
+    uint16_t download_position = (uint16_t)std::distance(m_download_queue.begin(), iter);
+
+    // cout << "download_position: " << std::to_string(download_position) << endl;
+
+    return download_position < MAX_CONCURRENT_DOWNLOADS;
+}
+
+
+void GlobalResourceDownloadManager::cancel_downloads(){
+    std::vector<std::shared_ptr<ResourceDownload>> downloads_to_cancel;
+
+    // Lock briefly to safely snapshot the queue
+    {
+        std::lock_guard<Mutex> lg(m_queue_lock);
+        downloads_to_cancel = m_download_queue; 
+    }
+
+    // We must call cancel_download() outside of the lock.
+    // The reason is that GlobalResourceDownloadManager is a listener to ResourceDownload. 
+    // ResourceDownload::cancel_download() will trigger GlobalResourceDownloadManager::on_download_finished,
+    // which then triggers GlobalResourceDownloadManager::remove_from_download_list(), which is 
+    // done under a lock.
+    // This prevents a deadlock.
+    for (auto& download : downloads_to_cancel){
+        if (download){
+            download->cancel_download(); 
+        }
+    }
+
+}
+
+
+//////////////////////////
+// Listener
+//////////////////////////
+void GlobalResourceDownloadManager::add_download_listener(Listener& listener){
+    m_download_listeners.add(listener);
+}
+void GlobalResourceDownloadManager::remove_download_listener(Listener& listener){
+    m_download_listeners.remove(listener);
+}
+
+void GlobalResourceDownloadManager::report_all_downloads_finished(){
+    m_download_listeners.run_method(&Listener::on_all_downloads_finished);
+}
+void GlobalResourceDownloadManager::report_download_failed(const std::string& resource_slug){
+    m_download_listeners.run_method(&Listener::on_download_failed, resource_slug);
+}
+void GlobalResourceDownloadManager::report_unexpected_exception_caught(const std::string& error_msg){
+    m_download_listeners.run_method(&Listener::on_exception_caught, error_msg);
+}
+
+/////////////////////
+// for ResourceDownload::Listener
+/////////////////////
+
+void GlobalResourceDownloadManager::on_download_finished(bool success, const std::string& resource_slug){
+    remove_from_download_list(resource_slug);
+    // check_if_all_downloads_done();
+}
+void GlobalResourceDownloadManager::on_download_failed(const std::string& resource_slug){
+    report_download_failed(resource_slug);
+}
+void GlobalResourceDownloadManager::on_exception_caught(const std::string& error_msg){
+    report_unexpected_exception_caught(error_msg);
+}
+
+}
diff --git a/SerialPrograms/Source/CommonFramework/ResourceDownload/GlobalResourceDownloadManager.h b/SerialPrograms/Source/CommonFramework/ResourceDownload/GlobalResourceDownloadManager.h
new file mode 100644
index 0000000000..ed7c413d7b
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/ResourceDownload/GlobalResourceDownloadManager.h
@@ -0,0 +1,88 @@
+/*  Resource Download Manager
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_ResourceDownloadManager_H
+#define PokemonAutomation_ResourceDownloadManager_H
+
+#include <vector>
+#include "Common/Cpp/Concurrency/Mutex.h"
+#include "Common/Cpp/Concurrency/ConditionVariable.h"
+#include "Common/Cpp/ListenerSet.h"
+#include "ResourceDownload.h"
+
+namespace PokemonAutomation{
+
+// class ResourceDownload;
+
+
+
+class GlobalResourceDownloadManager : public ResourceDownload::Listener{
+public:
+    struct Listener{
+        virtual void on_all_downloads_finished(){}
+        virtual void on_download_failed(const std::string& resource_slug){}
+        virtual void on_exception_caught(const std::string& error_msg){}
+    };
+
+    void add_download_listener(Listener& listener);
+    void remove_download_listener(Listener& listener);
+
+    void report_all_downloads_finished();
+    void report_download_failed(const std::string& resource_slug);
+    void report_unexpected_exception_caught(const std::string& error_msg);
+
+public:
+    static GlobalResourceDownloadManager& instance();
+
+public:  // ResourceDownload::Listener
+    virtual void on_download_finished(bool success, const std::string& resource_slug) override;
+    virtual void on_download_failed(const std::string& resource_slug) override;
+    virtual void on_exception_caught(const std::string& error_msg) override;
+
+
+public:
+    // check if the download queue already has the resource
+    // if not, add the download to the back of the download queue
+    // and start downloading it
+    // Also, add this manager as a listener to the download
+    std::shared_ptr<ResourceDownload> add_to_download_list(const std::string& resource_slug);
+
+    void remove_from_download_list(const std::string& resource_slug);
+
+    // return true if given resource_slug's position in m_download_queue is less than MAX_CONCURRENT_DOWNLOADS
+    // ASSUMES: the calling thread holds the m_lock. therefore, this function doesn't lock the mutex when accessing m_download_queue.
+    bool is_download_ready_to_start(const std::string& resource_slug);
+
+
+    void cancel_downloads();
+
+
+
+private:
+
+    // queue of downloads
+    // ResourceDownload must be a pointer for several reasons:
+    // - it contains a Mutex/CV, and so can't be moved unless it's a pointer. 
+    // Objects can't be added to a vector if they can't be moved/copied.
+    // - Other objects hold references to ResourceDownload. We will need to
+    // remove items in the middle of the vector. This forces the vector to shift 
+    // all subsequent elements forward in memory to fill the gap. This shifting 
+    // breaks (invalidates) any references or iterators pointing to elements 
+    // at or after the deletion point.
+    std::vector<std::shared_ptr<ResourceDownload>> m_download_queue;
+
+    Mutex m_queue_lock;
+    ConditionVariable m_cv;
+
+    ListenerSet<Listener> m_download_listeners;
+
+
+};
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/ResourceDownload/ProgramMissingResourceTracker.cpp b/SerialPrograms/Source/CommonFramework/ResourceDownload/ProgramMissingResourceTracker.cpp
new file mode 100644
index 0000000000..c6b39aab2d
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/ResourceDownload/ProgramMissingResourceTracker.cpp
@@ -0,0 +1,176 @@
+/*  ProgramMissingResourceTracker
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+
+// #include "Common/Cpp/Exceptions.h"
+#include <iostream>
+#include "CommonFramework/ProgramSession.h"
+
+
+#include "ProgramMissingResourceTracker.h"
+
+using std::cout;
+using std::endl;
+
+namespace PokemonAutomation{
+
+
+ProgramMissingResourceTracker::~ProgramMissingResourceTracker(){
+    m_scope.remove_cancel_listener(*this);
+    for (const auto& resource : m_missing_resources){
+        resource->remove_listener(*this);
+    }
+}
+
+ProgramMissingResourceTracker::ProgramMissingResourceTracker(CancellableScope& scope, std::promise<bool>& p, ProgramSession& session)
+    : m_scope(scope)
+    , m_promise(p)
+    , m_session(session)
+{
+    scope.add_cancel_listener(*this);
+}
+
+void ProgramMissingResourceTracker::add_resource(const std::shared_ptr<ResourceDownload>& resource){
+    std::lock_guard<Mutex> lg(m_lock);
+    
+    try {
+        m_missing_resources.insert(resource);
+        // throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "test."); 
+        resource->add_listener(*this);
+    }catch(...){
+        m_missing_resources.erase(resource);
+        resource->cancel_download();
+        throw;
+    }
+
+}
+
+
+void ProgramMissingResourceTracker::remove_resource(const std::string& resource_slug){
+    std::lock_guard<Mutex> lg(m_lock);
+
+    // this requires C++20
+    std::erase_if(m_missing_resources, [&](const auto& download_ptr){
+        return download_ptr->get_name() == resource_slug;
+    });
+
+}
+
+void ProgramMissingResourceTracker::finalize_initial_batch(){
+    std::lock_guard<Mutex> lg(m_lock);
+    m_is_accepting_jobs = false;
+
+    // Handles the edge case where everything finished before we even stopped adding jobs
+    if (m_missing_resources.empty()){
+        if (!m_failed){
+            fulfill_promise(true);
+        }
+    }
+}
+
+void ProgramMissingResourceTracker::check_if_all_downloads_done(){
+    std::lock_guard<Mutex> lg(m_lock);
+
+    // check if m_missing_resources is empty and that we are no longer accepting new jobs
+    // checking m_is_accepting_jobs covers for the case where Download 1 finishes before Download 2 is added. 
+    // this prevents the completion event from firing prematurely
+    if (m_missing_resources.empty() && !m_is_accepting_jobs){
+        if (!m_failed){
+            fulfill_promise(true);
+        }
+    }
+}
+
+void ProgramMissingResourceTracker::cancel_downloads(){
+    std::unordered_set<std::shared_ptr<ResourceDownload>> downloads_to_cancel;
+
+    // Lock briefly to safely snapshot the queue
+    {
+        std::lock_guard<Mutex> lg(m_lock);
+        downloads_to_cancel = m_missing_resources; 
+    }
+
+    // We must call cancel_download() outside of the lock.
+    // The reason is that ProgramMissingResourceTracker is a listener to ResourceDownload. 
+    // ResourceDownload::cancel_download() will trigger ProgramMissingResourceTracker::on_download_finished,
+    // which then triggers ProgramMissingResourceTracker::remove_resource(), which is 
+    // done under a lock.
+    // This prevents a deadlock.
+    for (auto& download : downloads_to_cancel){
+        if (download){
+            download->cancel_download(); 
+        }
+    }
+
+}
+
+void ProgramMissingResourceTracker::fulfill_promise(bool value){
+    std::call_once(m_fulfill_flag, [this, value](){
+        m_promise.set_value(value);
+    });
+}
+
+//////////////////////////
+// TrackerListener
+//////////////////////////
+
+// void ProgramMissingResourceTracker::add_tracker_listener(TrackerListener& listener){
+//     m_tracker_listeners.add(listener);
+// }
+// void ProgramMissingResourceTracker::remove_tracker_listener(TrackerListener& listener){
+//     m_tracker_listeners.remove(listener);
+// }
+
+// void ProgramMissingResourceTracker::report_all_downloads_finished(){
+//     m_tracker_listeners.run_method(&TrackerListener::on_all_missing_downloads_finished);
+// }
+
+// void ProgramMissingResourceTracker::report_download_failed(const std::string& resource_slug){
+//     m_tracker_listeners.run_method(&TrackerListener::on_download_failed, resource_slug);
+// }
+
+// void ProgramMissingResourceTracker::report_unexpected_exception_caught(const std::string& error_msg){
+//     m_tracker_listeners.run_method(&TrackerListener::on_unexpected_exception_caught, error_msg);
+// }
+
+/////////////////////
+// for ResourceDownload::Listener
+/////////////////////
+void ProgramMissingResourceTracker::on_download_finished(bool success, const std::string& resource_slug){
+    // cout << "ProgramMissingResourceTracker::on_download_finished " << resource_slug << endl;
+    remove_resource(resource_slug);
+    if (success){
+        check_if_all_downloads_done();
+    }
+}
+void ProgramMissingResourceTracker::on_download_failed(const std::string& resource_slug){
+    m_failed = true;
+    std::cerr << "ProgramMissingResourceTracker::on_download_failed: Error: Download failed for " << resource_slug << ". Check your internet connection and check you have enough disk space." << std::endl;
+    m_session.report_download_error("Error: Download failed for " + resource_slug + ". Check your internet connection and check you have enough disk space.");
+    fulfill_promise(false);
+}
+void ProgramMissingResourceTracker::on_exception_caught(const std::string& error_msg){
+    m_failed = true;
+    std::cerr << "ProgramMissingResourceTracker::on_download_failed: Error: " << error_msg << std::endl;
+    m_session.report_download_error(error_msg);
+    fulfill_promise(false);
+}
+
+/////////////////////
+// for Cancellable::CancelListener
+/////////////////////
+void ProgramMissingResourceTracker::on_cancellable_cancel(
+    Cancellable& cancellable,
+    std::exception_ptr reason
+){
+    m_failed = true;
+    cancel_downloads();
+    fulfill_promise(false);
+
+}
+
+
+}
diff --git a/SerialPrograms/Source/CommonFramework/ResourceDownload/ProgramMissingResourceTracker.h b/SerialPrograms/Source/CommonFramework/ResourceDownload/ProgramMissingResourceTracker.h
new file mode 100644
index 0000000000..0192b58297
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/ResourceDownload/ProgramMissingResourceTracker.h
@@ -0,0 +1,82 @@
+/*  ProgramMissingResourceTracker
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_MissingResourceTracker_H
+#define PokemonAutomation_MissingResourceTracker_H
+
+#include <unordered_set>
+#include <future>
+#include "Common/Cpp/Concurrency/Mutex.h"
+// #include "Common/Cpp/ListenerSet.h"
+#include "ResourceDownload.h"
+
+namespace PokemonAutomation{
+
+class ProgramSession;
+
+class ProgramMissingResourceTracker : public ResourceDownload::Listener, public Cancellable::CancelListener {
+
+public:
+    ~ProgramMissingResourceTracker();
+    ProgramMissingResourceTracker(CancellableScope& scope, std::promise<bool>& p, ProgramSession& session);
+
+    // struct TrackerListener{
+    //     virtual void on_all_missing_downloads_finished(){}
+    //     virtual void on_download_failed(const std::string& resource_slug){}
+    //     virtual void on_unexpected_exception_caught(const std::string& error_msg){}
+    // };
+
+    // void add_tracker_listener(TrackerListener& listener);
+    // void remove_tracker_listener(TrackerListener& listener);
+
+    // void report_all_downloads_finished();
+    // void report_download_failed(const std::string& resource_slug);
+    // void report_unexpected_exception_caught(const std::string& error_msg);
+
+public:  // ResourceDownload::Listener
+    // Remove the corresponding Resource from m_missing_resources
+    // if the download was a success, run check_if_all_downloads_done()
+    virtual void on_download_finished(bool success, const std::string& resource_slug) override;
+    
+    virtual void on_download_failed(const std::string& resource_slug) override;
+    virtual void on_exception_caught(const std::string& error_msg) override;
+
+public:  // Cancellable::CancelListener
+    virtual void on_cancellable_cancel(
+        Cancellable& cancellable,
+        std::exception_ptr reason
+    ) override;
+
+
+public:
+    void add_resource(const std::shared_ptr<ResourceDownload>& resource);
+    void remove_resource(const std::string& resource_slug);
+    void finalize_initial_batch();
+    void check_if_all_downloads_done();
+    void cancel_downloads();
+
+private:
+    void fulfill_promise(bool value);
+
+
+private:
+    CancellableScope& m_scope;
+    std::promise<bool>& m_promise;
+    ProgramSession& m_session;
+
+    std::unordered_set<std::shared_ptr<ResourceDownload>> m_missing_resources;
+
+    bool m_is_accepting_jobs = true;
+    Mutex m_lock;
+    // ListenerSet<TrackerListener> m_tracker_listeners;
+
+    std::atomic<bool> m_failed = false;
+    std::once_flag m_fulfill_flag;
+
+
+};
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/ResourceDownload/ProgramResourceDownloadWidget.cpp b/SerialPrograms/Source/CommonFramework/ResourceDownload/ProgramResourceDownloadWidget.cpp
new file mode 100644
index 0000000000..ac9b7ab058
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/ResourceDownload/ProgramResourceDownloadWidget.cpp
@@ -0,0 +1,145 @@
+/*  Required Download Dialog Widget
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <QMessageBox>
+#include "CommonFramework/ProgramSession.h"
+#include "ProgramResourceDownloadWidget.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+
+
+////////////////////////////////////////////
+// ProgramResourceDownloadRowWidget
+////////////////////////////////////////////
+
+ProgramResourceDownloadRowWidget::~ProgramResourceDownloadRowWidget(){
+    m_value->remove_listener(*this);
+}
+
+ProgramResourceDownloadRowWidget::ProgramResourceDownloadRowWidget(QWidget& parent, std::shared_ptr<ResourceDownload> download_ptr)
+    : QWidget(&parent)
+    , m_value(download_ptr)
+{
+
+    QHBoxLayout* mainLayout = new QHBoxLayout(this);
+    // Create a label for the specific task
+    m_resource_name = new QLabel(QString::fromStdString(download_ptr->get_name()), this);
+    m_resource_name->setFixedWidth(300);
+    mainLayout->addWidget(m_resource_name);
+
+    // Create a label for the status
+    m_status_label = new QLabel("", this);
+    m_status_label->setFixedWidth(70);
+    mainLayout->addWidget(m_status_label);
+
+    // Create the progress bar
+    m_progress_bar = new QProgressBar(this);
+    m_progress_bar->setRange(0, 100);
+    m_progress_bar->setValue(0);
+    m_progress_bar->setFixedWidth(100);
+    mainLayout->addWidget(m_progress_bar);
+
+    mainLayout->setContentsMargins(0, 0, 0, 0);
+
+    download_ptr->add_listener(*this);
+}
+
+
+void ProgramResourceDownloadRowWidget::update_progress_bar(uint64_t bytes_done, uint64_t total_bytes, const std::string& text){
+    double percent = total_bytes > 0 ? (static_cast<double>(bytes_done) / total_bytes) * 100.0 : 0;
+    int current_percent = static_cast<int>(percent);
+    int last_percentage = m_progress_bar->value();
+    // Only update UI if integer value has changed
+    if (current_percent == last_percentage){
+        return;
+    }
+
+    // current_percent has changed. update the progress bar
+    m_status_label->setText(QString::fromStdString(text));
+    m_progress_bar->setValue(current_percent);
+}
+
+void ProgramResourceDownloadRowWidget::on_download_progress(uint64_t bytes_done, uint64_t total_bytes){
+    QMetaObject::invokeMethod(this, [this, bytes_done, total_bytes]{
+        update_progress_bar(bytes_done, total_bytes, "Downloading");        
+    }, Qt::QueuedConnection);
+}
+void ProgramResourceDownloadRowWidget::on_unzip_progress(uint64_t bytes_done, uint64_t total_bytes){
+    QMetaObject::invokeMethod(this, [this, bytes_done, total_bytes]{
+        update_progress_bar(bytes_done, total_bytes, "Unzipping");        
+    }, Qt::QueuedConnection);
+}
+void ProgramResourceDownloadRowWidget::on_hash_progress(uint64_t bytes_done, uint64_t total_bytes){
+    QMetaObject::invokeMethod(this, [this, bytes_done, total_bytes]{
+        update_progress_bar(bytes_done, total_bytes, "Verifying");        
+    }, Qt::QueuedConnection);
+}
+
+// void ProgramResourceDownloadRowWidget::on_download_failed(const std::string& resource_slug){
+//     std::cerr << "ProgramResourceDownloadRowWidget::on_download_failed: Error" << std::endl;
+//     QMetaObject::invokeMethod(this, [resource_slug]{
+//         QMessageBox box;
+//         box.critical(nullptr, "Error", 
+//             QString::fromStdString("Error: Download failed for " + resource_slug + ". Check your internet connection and check you have enough disk space."));
+//     });
+// }
+
+////////////////////////////////////////////
+// ProgramResourceDownloadTableWidget
+////////////////////////////////////////////
+
+ProgramResourceDownloadTableWidget::~ProgramResourceDownloadTableWidget(){
+    // m_missing_resource_tracker.remove_tracker_listener(*this);
+    // GlobalResourceDownloadManager::instance().remove_download_listener(*this);
+}
+ProgramResourceDownloadTableWidget::ProgramResourceDownloadTableWidget(QWidget& parent)
+    : QWidget (&parent)
+{
+    m_layout = new QVBoxLayout(this);
+
+    setLayout(m_layout);
+
+    m_layout->setContentsMargins(0, 0, 0, 0);
+    m_layout->setSpacing(0);
+
+}
+
+void ProgramResourceDownloadTableWidget::add_download(std::shared_ptr<ResourceDownload> download_ptr){
+    ProgramResourceDownloadRowWidget* download_widget = new ProgramResourceDownloadRowWidget(*this, download_ptr);
+
+    m_layout->addWidget(download_widget);
+
+    if (m_layout->count() > 0){
+        this->show();
+    }
+}
+
+
+void ProgramResourceDownloadTableWidget::remove_all_downloads(){
+    QLayout* current_layout = layout();
+    if (!current_layout) return;
+
+    while (current_layout->count() > 0){
+        QLayoutItem* item = current_layout->takeAt(0); // Always take the current front item
+        if (QWidget* widget = item->widget()){
+            widget->deleteLater();
+        }
+        delete item;
+    }
+
+    if (m_layout->count() == 0){
+        this->hide();
+    }
+}
+
+
+
+
+}
diff --git a/SerialPrograms/Source/CommonFramework/ResourceDownload/ProgramResourceDownloadWidget.h b/SerialPrograms/Source/CommonFramework/ResourceDownload/ProgramResourceDownloadWidget.h
new file mode 100644
index 0000000000..e808d24a09
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/ResourceDownload/ProgramResourceDownloadWidget.h
@@ -0,0 +1,68 @@
+/*  Required Download Dialog Widget
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+// NOTE: These widgets do not inherit ConfigWidget.
+// So, they don't need to be added to StaticRegistrationQt
+
+#ifndef PokemonAutomation_ProgramResourceDownloadWidget_H
+#define PokemonAutomation_ProgramResourceDownloadWidget_H
+
+#include <QDialog>
+#include <QLabel>
+#include <QVBoxLayout>
+#include <QProgressBar>
+#include "CommonFramework/ResourceDownload/ResourceDownload.h"
+#include "ProgramMissingResourceTracker.h"
+#include "GlobalResourceDownloadManager.h"
+
+
+namespace PokemonAutomation{
+
+class ProgramSession;
+
+class ProgramResourceDownloadRowWidget : public QWidget, public ResourceDownload::Listener {
+public:
+    ~ProgramResourceDownloadRowWidget();
+    ProgramResourceDownloadRowWidget(QWidget& parent, std::shared_ptr<ResourceDownload> download_ptr);
+
+public:
+    virtual void on_download_progress(uint64_t bytes_done, uint64_t total_bytes) override;
+    virtual void on_unzip_progress(uint64_t bytes_done, uint64_t total_bytes) override;
+    virtual void on_hash_progress(uint64_t bytes_done, uint64_t total_bytes) override;
+
+    // virtual void on_download_failed(const std::string& resource_slug) override;
+
+
+    void update_progress_bar(uint64_t bytes_done, uint64_t total_bytes, const std::string& text);
+
+private:
+    std::shared_ptr<ResourceDownload> m_value;
+    QLabel* m_resource_name;
+    QLabel* m_status_label;
+    QProgressBar* m_progress_bar;
+
+};
+
+class ProgramResourceDownloadTableWidget : public QWidget {
+
+public:
+    ~ProgramResourceDownloadTableWidget();
+    ProgramResourceDownloadTableWidget(QWidget& parent);
+
+    void add_download(std::shared_ptr<ResourceDownload> download_ptr);
+
+    void remove_all_downloads();
+
+private:
+    QVBoxLayout* m_layout;
+    
+};
+
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/ResourceDownload/ResourceDownload.cpp b/SerialPrograms/Source/CommonFramework/ResourceDownload/ResourceDownload.cpp
new file mode 100644
index 0000000000..8b1f097b90
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/ResourceDownload/ResourceDownload.cpp
@@ -0,0 +1,102 @@
+/*  Required Download
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+
+#include <iostream>
+#include "CommonFramework/GlobalSettingsPanel.h"
+#include "GlobalResourceDownloadManager.h"
+
+#include "ResourceDownload.h"
+
+using std::cout;
+using std::endl;
+
+namespace PokemonAutomation{
+
+ResourceDownload::~ResourceDownload(){
+    m_download_thread.cancel();
+}
+
+ResourceDownload::ResourceDownload(GlobalResourceDownloadManager& download_manager, DownloadedResourceMetadata resource_metadata, Mutex& lock, ConditionVariable& cv)
+    : m_resource_metadata(resource_metadata)
+    , m_name(resource_metadata.resource_name)
+    , m_lock(lock)
+    , m_cv(cv)
+    , m_download_thread(initialize_download_thread())
+{
+    // start_download();
+}
+
+DownloadThread ResourceDownload::initialize_download_thread(){
+
+    DownloadThread::Hooks generic_row_hooks{
+        .is_ready_to_start = [this] { return GlobalResourceDownloadManager::instance().is_download_ready_to_start(m_name); },
+        .on_finished       = [this](bool success) { 
+            report_download_finished(success); 
+        },
+        .report_failed     = [this] { report_download_failed(); },
+        .report_exception_caught  = [this](const char* error_msg) { report_unexpected_exception_caught(error_msg); },
+        .report_download_progress  = [this](uint64_t bytes_done, uint64_t total_bytes) { report_download_progress(bytes_done, total_bytes); },
+        .report_hash_progress  = [this](uint64_t bytes_done, uint64_t total_bytes) { report_hash_progress(bytes_done, total_bytes); },
+        .report_unzip_progress  = [this](uint64_t bytes_done, uint64_t total_bytes) { report_unzip_progress(bytes_done, total_bytes); }
+    };
+
+    return DownloadThread{generic_row_hooks, m_resource_metadata, m_lock, m_cv};
+
+}
+
+
+
+void ResourceDownload::start_download(){
+    cout << "start_download" << endl;
+    m_download_thread.start_download_thread();
+}
+
+void ResourceDownload::cancel_download(){
+    m_download_thread.cancel();
+    // m_parent_session.remove_from_download_list(m_index);
+}
+
+
+
+//////////////////////////
+// Listeners
+//////////////////////////
+void ResourceDownload::add_listener(Listener& listener){
+    m_listeners.add(listener);
+}
+void ResourceDownload::remove_listener(Listener& listener){
+    m_listeners.remove(listener);
+} 
+
+// void ResourceDownload::report_download_started(){
+//     m_listeners.run_method(&Listener::on_download_started);
+// }
+
+void ResourceDownload::report_download_progress(uint64_t bytes_done, uint64_t total_bytes){
+    m_listeners.run_method(&Listener::on_download_progress, bytes_done, total_bytes);
+}
+void ResourceDownload::report_unzip_progress(uint64_t bytes_done, uint64_t total_bytes){
+    m_listeners.run_method(&Listener::on_unzip_progress, bytes_done, total_bytes);
+}
+void ResourceDownload::report_hash_progress(uint64_t bytes_done, uint64_t total_bytes){
+    m_listeners.run_method(&Listener::on_hash_progress, bytes_done, total_bytes);
+}
+
+void ResourceDownload::report_download_finished(bool success){
+    m_listeners.run_method(&Listener::on_download_finished, success, m_name);
+
+}
+
+void ResourceDownload::report_download_failed(){
+    m_listeners.run_method(&Listener::on_download_failed, m_name);
+}
+
+void ResourceDownload::report_unexpected_exception_caught(const std::string& error_msg){
+    m_listeners.run_method(&Listener::on_exception_caught, error_msg);
+}
+
+}
diff --git a/SerialPrograms/Source/CommonFramework/ResourceDownload/ResourceDownload.h b/SerialPrograms/Source/CommonFramework/ResourceDownload/ResourceDownload.h
new file mode 100644
index 0000000000..db24d7e97b
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/ResourceDownload/ResourceDownload.h
@@ -0,0 +1,84 @@
+/*  Required Download
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_ResourceDownload_H
+#define PokemonAutomation_ResourceDownload_H
+
+#include <string>
+// #include "ComputerPrograms/Framework/ComputerProgramSession.h"
+#include "Common/Cpp/Concurrency/Mutex.h"
+#include "Common/Cpp/Concurrency/ConditionVariable.h"
+#include "Common/Cpp/ListenerSet.h"
+#include "DownloadThread.h"
+#include "ResourceDownloadHelpers.h"
+
+
+namespace PokemonAutomation{
+
+
+class GlobalResourceDownloadManager;
+
+class ResourceDownload {
+public:
+    ~ResourceDownload();
+    ResourceDownload(GlobalResourceDownloadManager& download_manager, DownloadedResourceMetadata resource_metadata, Mutex& lock, ConditionVariable& cv);
+
+public:
+    inline std::string get_name() const { return m_name; }
+
+public: 
+    struct Listener{
+        // virtual void on_download_started(){}
+        virtual void on_download_progress(uint64_t bytes_done, uint64_t total_bytes){}
+        virtual void on_unzip_progress(uint64_t bytes_done, uint64_t total_bytes){}
+        virtual void on_hash_progress(uint64_t bytes_done, uint64_t total_bytes){}
+
+        virtual void on_download_finished(bool success, const std::string& resource_slug){}
+        virtual void on_download_failed(const std::string& resource_slug){}
+        virtual void on_exception_caught(const std::string& error_msg){}
+
+    };
+
+    void add_listener(Listener& listener);
+    void remove_listener(Listener& listener);    
+
+    // void report_download_started();
+    void report_download_progress(uint64_t bytes_done, uint64_t total_bytes);
+    void report_unzip_progress(uint64_t bytes_done, uint64_t total_bytes);
+    void report_hash_progress(uint64_t bytes_done, uint64_t total_bytes);
+
+    // NOTE: this runs regardless of success or failure
+    void report_download_finished(bool success);
+
+    void report_download_failed();
+
+    void report_unexpected_exception_caught(const std::string& error_msg);
+
+    void start_download();
+    void cancel_download();
+
+    // bool is_download_ready_to_start();
+    // void remove_self_from_download_queue();
+
+private:
+    DownloadThread initialize_download_thread();
+
+private:
+    DownloadedResourceMetadata m_resource_metadata;
+
+    std::string m_name;
+    Mutex& m_lock;
+    ConditionVariable& m_cv;
+    DownloadThread m_download_thread;
+
+    ListenerSet<Listener> m_listeners;
+
+};
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/ResourceDownload/ResourceDownloadHelpers.cpp b/SerialPrograms/Source/CommonFramework/ResourceDownload/ResourceDownloadHelpers.cpp
new file mode 100644
index 0000000000..417d727fb3
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/ResourceDownload/ResourceDownloadHelpers.cpp
@@ -0,0 +1,224 @@
+/*  Resource Download Helpers
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <iostream>
+#include "Common/Cpp/Json/JsonArray.h"
+#include "Common/Cpp/Json/JsonObject.h"
+#include "Common/Cpp/Json/JsonValue.h"
+#include "Common/Cpp/Filesystem/Filesystem.h"
+#include "CommonFramework/Tools/FileDownloader.h"
+#include "CommonFramework/GlobalAutoPaths.h"
+#include "CommonFramework/Logging/Logger.h"
+#include "CommonFramework/Exceptions/OperationFailedException.h"
+#include "ResourceDownloadHelpers.h"
+
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+
+
+std::vector<DownloadedResourceMetadata> deserialize_resource_list_json(const JsonValue& json){
+    std::vector<DownloadedResourceMetadata> resources;    
+
+    try{
+        const JsonObject& obj = json.to_object_throw();
+        const JsonArray& resource_list = obj.get_array_throw("ResourceList");
+        for (const JsonValue& resource_val : resource_list){
+            const JsonObject& resource_obj = resource_val.to_object_throw();
+
+            std::string resource_name = resource_obj.get_string_throw("ResourceName");
+            std::optional<uint16_t> version_num = (uint16_t)resource_obj.get_integer_throw("Version");
+            size_t compressed_bytes = (size_t)resource_obj.get_integer_throw("CompressedBytes");
+            size_t decompressed_bytes = (size_t)resource_obj.get_integer_throw("DecompressedBytes");
+            std::string url = resource_obj.get_string_throw("URL");
+            std::string sha256 = resource_obj.get_string_throw("SHA256");
+
+            DownloadedResourceMetadata resource = {
+                resource_name,
+                version_num,
+                compressed_bytes,
+                decompressed_bytes,
+                url,
+                sha256
+            };
+
+            resources.emplace_back(std::move(resource));
+
+        }
+
+    }catch (ParseException&){
+        std::cerr << "JSON parsing error. Given JSON file doesn't match the expected format." << std::endl;
+        // throw ParseException("JSON parsing error. Given JSON file doesn't match the expected format.");
+        return std::vector<DownloadedResourceMetadata>();
+    }
+
+    return resources;
+}
+
+
+const std::vector<DownloadedResourceMetadata>& expected_resource_download_list(){
+    // cout << "expected_resource_download_list" << endl;
+    static std::vector<DownloadedResourceMetadata> expected_resources = deserialize_resource_list_json(
+        load_json_file(RESOURCE_PATH() + "ResourceDownloadList.json")
+    );
+
+    return expected_resources;
+}
+
+
+
+std::optional<uint16_t> get_resource_version_num(Filesystem::Path folder_path){
+    try{
+        std::string file_name = folder_path.string() + "/version.json";
+        const JsonValue& json = load_json_file(file_name);
+
+        const JsonObject& obj = json.to_object_throw();
+        uint16_t version_num = (uint16_t)obj.get_integer_throw("version");
+        return version_num;
+    }catch(...){
+        std::cerr << "Unable to determine the version number from version.json." << std::endl;
+        return std::nullopt;
+    }
+
+}
+
+ResourceVersionStatus compare_version_num(uint16_t expected_version_num, std::optional<uint16_t> current_version_num){
+    if (!current_version_num.has_value()){
+        return ResourceVersionStatus::NOT_APPLICABLE;
+    }
+
+    if (current_version_num < expected_version_num){
+        return ResourceVersionStatus::OUTDATED;
+    }else if (current_version_num == expected_version_num){
+        return ResourceVersionStatus::CURRENT;
+    }else{ // current > expected
+        return ResourceVersionStatus::FUTURE_VERSION;
+    }
+}
+
+ResourceVersionInfo get_local_version_info(const std::string& target_resource_slug){
+    DownloadedResourceMetadata expected_resource = get_expected_resource_metadata_from_resource_slug(target_resource_slug);
+    uint16_t expected_version_num = expected_resource.version_num.value();
+
+    Filesystem::Path filepath{DOWNLOADED_RESOURCE_PATH() + expected_resource.resource_name};
+    bool is_downloaded = std::filesystem::is_directory(filepath);
+    std::optional<uint16_t> current_version_num;  // default nullopt
+    if (is_downloaded){
+        current_version_num = get_resource_version_num(filepath);
+    }
+
+    ResourceVersionStatus version_status = compare_version_num(expected_version_num, current_version_num);
+
+    return ResourceVersionInfo{
+        .is_downloaded = is_downloaded,
+        .version_status = version_status,
+        .current_version_num = current_version_num
+    };
+}
+
+
+DownloadedResourceMetadata get_resource_metadata_from_resource_type(
+    const std::string& target_resource_slug,
+    const std::vector<DownloadedResourceMetadata>& resource_list
+){
+
+    for (uint16_t index = 0; index < resource_list.size(); index++){
+        const DownloadedResourceMetadata& metadata = resource_list[index];
+        if (metadata.resource_name == target_resource_slug){
+            return metadata;
+        }
+    }
+
+    Logger& logger = global_logger_tagged();
+    throw_and_log<OperationFailedException>(logger, ErrorReportMode::NO_ERROR_REPORT, 
+        "get_resource_metadata_from_resource_type: Unable to find target_resource_slug within resource_list.");
+}
+
+
+
+DownloadedResourceMetadata get_expected_resource_metadata_from_resource_slug(const std::string& target_resource_slug){
+    try{
+        return get_resource_metadata_from_resource_type(target_resource_slug, expected_resource_download_list());
+    }catch(OperationFailedException&){
+        throw InternalProgramError(
+            nullptr,
+            PA_CURRENT_FUNCTION,
+            "get_expected_resource_metadata_from_resource_slug: Unable to find target_resource_slug within resource_list. This shouldn't happen."
+        );
+    }
+}
+
+
+const std::unordered_set<std::string>& all_resource_names(){
+    static std::unordered_set<std::string> names = [](){
+        std::unordered_set<std::string> resource_names;
+        for (const DownloadedResourceMetadata& resource : expected_resource_download_list()){
+            resource_names.insert(resource.resource_name);
+        }
+        return resource_names;
+    }();
+
+    return names;
+
+
+}
+
+
+
+
+JsonValue fetch_resource_download_list_json_from_remote(){
+    Logger& logger = global_logger_tagged();
+    JsonValue json = 
+        FileDownloader::download_json_file(
+            logger,
+            "https://raw.githubusercontent.com/PokemonAutomation/Packages/refs/heads/master/Resources/ResourceDownloadList.json"
+        );
+    
+    return json;
+}
+
+
+const JsonValue& remote_resource_download_list_json(){
+    static const JsonValue json = fetch_resource_download_list_json_from_remote();
+
+    return json;
+}
+
+const std::vector<DownloadedResourceMetadata>& remote_resource_download_list(){
+    // cout << "remote_resource_download_list" << endl;
+    static std::vector<DownloadedResourceMetadata> remote_resources = deserialize_resource_list_json(remote_resource_download_list_json());
+
+    return remote_resources;
+}
+
+DownloadedResourceMetadata get_remote_resource_metadata_from_resource_slug(const std::string& target_resource_slug){
+    Logger& logger = global_logger_tagged();
+    std::vector<DownloadedResourceMetadata> remote_resources;
+
+    // Step 1: Attempt to fetch the list of available downloads
+    try{
+        remote_resources = remote_resource_download_list();
+    }catch(OperationFailedException&){
+        std::cerr << "get_remote_resource_metadata_from_resource_slug: Error" << std::endl;
+        throw_and_log<OperationFailedException>(logger, ErrorReportMode::NO_ERROR_REPORT, 
+            "Error: Download failed. Failed to fetch the list of available downloads. Check your internet connection.");
+    }
+
+    // Step 2: Attempt to extract metadata for the specific slug
+    try{
+        return get_resource_metadata_from_resource_type(target_resource_slug, remote_resources);
+    }catch(OperationFailedException&){
+        std::cerr << "get_remote_resource_metadata_from_resource_slug: Error" << std::endl;
+        throw_and_log<OperationFailedException>(logger, ErrorReportMode::NO_ERROR_REPORT, 
+            "get_remote_resource_metadata_from_resource_slug: Unable to find " + target_resource_slug + " within resource_list. "
+            "Likely caused by resource being no longer available for download. We recommend updating the Computer Control program.");
+    }
+}
+
+
+
+}
diff --git a/SerialPrograms/Source/CommonFramework/ResourceDownload/ResourceDownloadHelpers.h b/SerialPrograms/Source/CommonFramework/ResourceDownload/ResourceDownloadHelpers.h
new file mode 100644
index 0000000000..a2ceec29bf
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/ResourceDownload/ResourceDownloadHelpers.h
@@ -0,0 +1,87 @@
+/*  Resource Download Helpers
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_ResourceDownloadHelpers_H
+#define PokemonAutomation_ResourceDownloadHelpers_H
+
+#include <optional>
+#include <string>
+#include <vector>
+#include <unordered_set>
+#include "Common/Cpp/Json/JsonValue.h"
+
+namespace PokemonAutomation{
+
+namespace Filesystem{
+    class Path;
+}
+
+
+
+struct DownloadedResourceMetadata{
+    std::string resource_name;
+    std::optional<uint16_t> version_num;
+    uint64_t size_compressed_bytes;
+    uint64_t size_decompressed_bytes;
+    std::string url;
+    std::string sha256;
+};
+
+enum class ResourceVersionStatus{
+    CURRENT,
+    OUTDATED, // still used, but newer version available
+    FUTURE_VERSION, // current version number is greater than the expected version number
+    NOT_APPLICABLE, // resource not downloaded locally, so can't get its version
+    // RETIRED, // no longer used
+};
+
+
+struct ResourceVersionInfo{
+    bool is_downloaded;
+    ResourceVersionStatus version_status;
+    std::optional<uint16_t> current_version_num;
+};
+
+std::vector<DownloadedResourceMetadata> deserialize_resource_list_json(const JsonValue& json);
+
+// there are three lists:
+// - expected_resource_download_list(): List of resources with the version numbers that the programs expect. from the local ResourceDownloadList.json
+// - list of resources downloaded locally. use get_local_version_info() to determine ResourceVersionStatus relative to the expected resource version number.
+// - remote_resource_download_list(): list of remote resources. the remote version numbers may or may not match the local list. from the remote ResourceDownloadList.json
+
+const std::vector<DownloadedResourceMetadata>& expected_resource_download_list();
+
+
+// - This returns the version information for a resource that has been downloaded locally.
+// - This returns a struct containing a boolean representing whether the resource has been downloaded, 
+// the resource's version status (e.g. CURRENT, OUTDATED, NOT_APPLICABLE etc.), and its version number
+// - for the version status, it compares the version of the locally downloaded file to the 
+// corresponding expected_resource from expected_resource_download_list()
+ResourceVersionInfo get_local_version_info(const std::string& target_resource_slug);
+
+DownloadedResourceMetadata get_resource_metadata_from_resource_type(const std::string& target_resource_slug, const std::vector<DownloadedResourceMetadata>& resource_list);
+
+
+// ASSUMES: given target_resource_slug is listed within expected_resource_download_list().
+// PanelSession::validate_resource_list() should ensure that target_resource_slug is valid.
+DownloadedResourceMetadata get_expected_resource_metadata_from_resource_slug(const std::string& target_resource_slug);
+
+
+const std::unordered_set<std::string>& all_resource_names();
+
+
+
+const std::vector<DownloadedResourceMetadata>& remote_resource_download_list();
+
+
+// - throws OperationFailedException if target_resource_slug isn't found within remote_resource_download_list
+// this would indicate that CC is out of date.
+// - also throws OperationFailedException if Internet is not turned on.
+DownloadedResourceMetadata get_remote_resource_metadata_from_resource_slug(const std::string& target_resource_slug);
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/ResourceDownload/SettingsResourceDownloadOptions.cpp b/SerialPrograms/Source/CommonFramework/ResourceDownload/SettingsResourceDownloadOptions.cpp
new file mode 100644
index 0000000000..da332ff555
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/ResourceDownload/SettingsResourceDownloadOptions.cpp
@@ -0,0 +1,138 @@
+/*  Resource Download Options
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "SettingsResourceDownloadRow.h"
+#include "SettingsResourceDownloadOptions.h"
+
+
+// #include <iostream>
+// using std::cout;
+// using std::endl;
+
+namespace PokemonAutomation{
+
+
+
+void SettingsResourceButton::add_button_listener(Listener& listener){
+    m_listeners.add(listener);
+}
+void SettingsResourceButton::remove_button_listener(Listener& listener){
+    m_listeners.remove(listener);
+}
+
+void SettingsResourceButton::change_text(const std::string& text){
+    m_listeners.run_method(&Listener::on_change_text, text);
+}
+
+
+//////////////////////////////////////
+// SettingsResourceDownloadButton
+//////////////////////////////////////
+// SettingsResourceDownloadButton::~SettingsResourceDownloadButton(){}
+SettingsResourceDownloadButton::SettingsResourceDownloadButton(SettingsResourceDownloadRow& p_row)
+    : UiState<SettingsResourceDownloadButton, ConfigOption>(LockMode::UNLOCK_WHILE_RUNNING)
+    , row(p_row)
+    , m_enabled(true)
+{}
+
+void SettingsResourceDownloadButton::set_enabled(bool enabled){ 
+    m_enabled = enabled; 
+    change_text(enabled ? "Download" : "Downloading...");
+    set_visibility(enabled ? ConfigOptionState::ENABLED : ConfigOptionState::DISABLED);
+}
+
+
+//////////////////////////////////////
+// SettingsResourceDeleteButton
+//////////////////////////////////////
+SettingsResourceDeleteButton::SettingsResourceDeleteButton(SettingsResourceDownloadRow& p_row)
+    : UiState<SettingsResourceDeleteButton, ConfigOption>(LockMode::UNLOCK_WHILE_RUNNING)
+    , row(p_row)
+    , m_enabled(true)
+{}
+
+void SettingsResourceDeleteButton::set_enabled(bool enabled){ 
+    m_enabled = enabled; 
+    change_text(enabled ? "Delete" : "Deleting...");
+    set_visibility(enabled ? ConfigOptionState::ENABLED : ConfigOptionState::DISABLED);
+}
+
+//////////////////////////////////////
+// SettingsResourceCancelButton
+//////////////////////////////////////
+SettingsResourceCancelButton::SettingsResourceCancelButton(SettingsResourceDownloadRow& p_row)
+    : UiState<SettingsResourceCancelButton, ConfigOption>(LockMode::UNLOCK_WHILE_RUNNING)
+    , row(p_row)
+    , m_enabled(true)
+{}
+
+void SettingsResourceCancelButton::set_enabled(bool enabled){ 
+    m_enabled = enabled; 
+    change_text(enabled ? "Cancel" : "Cancelling...");
+    set_visibility(enabled ? ConfigOptionState::ENABLED : ConfigOptionState::DISABLED);
+}
+//////////////////////////////////////
+// SettingsResourceProgressBar
+//////////////////////////////////////
+SettingsResourceProgressBar::SettingsResourceProgressBar(SettingsResourceDownloadRow& p_row)
+    : UiState<SettingsResourceProgressBar, ConfigOption>(LockMode::UNLOCK_WHILE_RUNNING)
+    , row(p_row)
+{}
+
+void SettingsResourceProgressBar::add_progress_listener(Listener& listener){
+    m_listeners.add(listener);
+}
+void SettingsResourceProgressBar::remove_progress_listener(Listener& listener){
+    m_listeners.remove(listener);
+}
+
+void SettingsResourceProgressBar::change_text(const std::string& text){
+    m_listeners.run_method(&Listener::on_change_text, text);
+}
+
+void SettingsResourceProgressBar::update_progress(uint64_t bytes_done, uint64_t total_bytes){
+    m_listeners.run_method(&Listener::on_update_progress, bytes_done, total_bytes);
+}
+
+void SettingsResourceProgressBar::reset_progress(){
+    m_listeners.run_method(&Listener::on_reset_progress);
+}
+
+////////////////////////////////
+// ResourceDownload::Listener
+////////////////////////////////
+void SettingsResourceProgressBar::on_download_progress(uint64_t bytes_done, uint64_t total_bytes){
+    change_text("Downloading");
+    set_visibility(ConfigOptionState::ENABLED);
+    update_progress(bytes_done, total_bytes);
+}
+void SettingsResourceProgressBar::on_unzip_progress(uint64_t bytes_done, uint64_t total_bytes){
+    change_text("Unzipping");
+    set_visibility(ConfigOptionState::ENABLED);
+    update_progress(bytes_done, total_bytes);
+}
+void SettingsResourceProgressBar::on_hash_progress(uint64_t bytes_done, uint64_t total_bytes){
+    change_text("Verifying");
+    set_visibility(ConfigOptionState::ENABLED);
+    update_progress(bytes_done, total_bytes);
+}
+
+//////////////////////////////////////
+// SettingsDownloadPopup
+//////////////////////////////////////
+SettingsDownloadPopup::SettingsDownloadPopup(SettingsResourceDownloadRow& p_row)
+    : UiState<SettingsDownloadPopup, ConfigOption>(LockMode::LOCK_WHILE_RUNNING)
+    , row(p_row)
+{}
+
+//////////////////////////////////////
+// SettingsDownloadError
+//////////////////////////////////////
+SettingsDownloadError::SettingsDownloadError()
+    : UiState<SettingsDownloadError, ConfigOption>(LockMode::LOCK_WHILE_RUNNING)
+{}
+
+}
diff --git a/SerialPrograms/Source/CommonFramework/ResourceDownload/SettingsResourceDownloadOptions.h b/SerialPrograms/Source/CommonFramework/ResourceDownload/SettingsResourceDownloadOptions.h
new file mode 100644
index 0000000000..cc1490cae9
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/ResourceDownload/SettingsResourceDownloadOptions.h
@@ -0,0 +1,147 @@
+/*  Resource Download Options
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_ResourceDownloadOptions_H
+#define PokemonAutomation_ResourceDownloadOptions_H
+
+#include "Common/Cpp/ListenerSet.h"
+#include "Common/Cpp/Options/ConfigOption.h"
+#include "ResourceDownload.h"
+
+namespace PokemonAutomation{
+
+class SettingsResourceDownloadRow;
+
+
+class SettingsResourceButton{
+public:
+    struct Listener{
+        virtual void on_change_text(const std::string& text){}
+    };
+
+    void add_button_listener(Listener& listener);
+    void remove_button_listener(Listener& listener);
+
+    void change_text(const std::string& text);
+
+private:
+    ListenerSet<Listener> m_listeners;
+
+};
+
+class SettingsResourceDownloadButton
+    : public UiState<SettingsResourceDownloadButton, ConfigOption>
+    , public SettingsResourceButton
+{
+public:
+    // ~SettingsResourceDownloadButton();
+    SettingsResourceDownloadButton(SettingsResourceDownloadRow& p_row);
+
+public:
+    inline bool get_enabled(){ return m_enabled; }
+    void set_enabled(bool enabled);
+
+public:
+    SettingsResourceDownloadRow& row;
+
+private:
+    bool m_enabled;  // button should be blocked during an active task. m_enabled is false when blocked
+
+    
+
+};
+
+class SettingsResourceDeleteButton
+    : public UiState<SettingsResourceDeleteButton, ConfigOption>
+    , public SettingsResourceButton
+{
+public:
+    SettingsResourceDeleteButton(SettingsResourceDownloadRow& p_row);
+
+public:
+    inline bool get_enabled(){ return m_enabled; }
+    void set_enabled(bool enabled);
+
+public:
+    SettingsResourceDownloadRow& row;
+
+private:
+    bool m_enabled;
+};
+
+class SettingsResourceCancelButton
+    : public UiState<SettingsResourceCancelButton, ConfigOption>
+    , public SettingsResourceButton
+{
+public:
+    SettingsResourceCancelButton(SettingsResourceDownloadRow& p_row);
+
+public:
+    inline bool get_enabled(){ return m_enabled; }
+    void set_enabled(bool enabled);
+
+public:
+    SettingsResourceDownloadRow& row;
+
+private:
+    bool m_enabled;    
+};
+
+class SettingsResourceProgressBar
+    : public UiState<SettingsResourceProgressBar, ConfigOption>
+    , public ResourceDownload::Listener
+{
+public:
+    SettingsResourceProgressBar(SettingsResourceDownloadRow& p_row);
+
+public:
+    struct Listener{
+        virtual void on_change_text(const std::string& text){}
+        virtual void on_update_progress(uint64_t bytes_done, uint64_t total_bytes){}
+        virtual void on_reset_progress(){}
+    };
+
+    void add_progress_listener(Listener& listener);
+    void remove_progress_listener(Listener& listener);
+
+    void change_text(const std::string& text);
+    void update_progress(uint64_t bytes_done, uint64_t total_bytes);
+    void reset_progress();
+
+public: // ResourceDownload::Listener
+    virtual void on_download_progress(uint64_t bytes_done, uint64_t total_bytes) override;
+    virtual void on_unzip_progress(uint64_t bytes_done, uint64_t total_bytes) override;
+    virtual void on_hash_progress(uint64_t bytes_done, uint64_t total_bytes) override;
+
+public:
+    SettingsResourceDownloadRow& row;
+
+private:
+    ListenerSet<Listener> m_listeners;
+
+};
+
+class SettingsDownloadPopup
+    : public UiState<SettingsDownloadPopup, ConfigOption>
+    , public ResourceDownload::Listener
+{
+public:
+    SettingsDownloadPopup(SettingsResourceDownloadRow& p_row);
+public:
+    SettingsResourceDownloadRow& row;
+
+};
+
+class SettingsDownloadError : public UiState<SettingsDownloadError, ConfigOption>{
+public:
+    SettingsDownloadError();
+
+
+};
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/ResourceDownload/SettingsResourceDownloadRow.cpp b/SerialPrograms/Source/CommonFramework/ResourceDownload/SettingsResourceDownloadRow.cpp
new file mode 100644
index 0000000000..1addec7e70
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/ResourceDownload/SettingsResourceDownloadRow.cpp
@@ -0,0 +1,537 @@
+/*  Resource Download Row
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Containers/Pimpl.tpp"
+#include "Common/Cpp/PrettyPrint.h"
+#include "Common/Cpp/ListenerSet.h"
+#include "Common/Cpp/Filesystem/Filesystem.h"
+#include "Common/Cpp/Concurrency/AsyncTask.h"
+#include "Common/Cpp/ScopeExit.h"
+#include "CommonFramework/GlobalAutoPaths.h"
+#include "CommonFramework/Options/LabelCellOption.h"
+#include "CommonFramework/Tools/GlobalThreadPools.h"
+#include "CommonFramework/Exceptions/OperationFailedException.h"
+#include "CommonFramework/Logging/Logger.h"
+#include "CommonFramework/ResourceDownload/GlobalResourceDownloadManager.h"
+#include "ResourceDownloadHelpers.h"
+#include "SettingsResourceDownloadRow.h"
+
+namespace PokemonAutomation{
+
+
+
+/////////////////////////////////////////////////////////////////////////////////////////////////////////
+// SettingsResourceDownloadRow
+/////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+
+std::string resource_version_to_string(ResourceVersionStatus version){
+    switch(version){
+    case ResourceVersionStatus::CURRENT:
+        return "Current";
+    case ResourceVersionStatus::OUTDATED:
+        return "Outdated";
+    case ResourceVersionStatus::NOT_APPLICABLE:
+        return "--";
+    case ResourceVersionStatus::FUTURE_VERSION:
+        return "Unsupported future version.<br>Please update the Computer Control program.";
+    default:
+        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "resource_version_to_string: Unknown enum.");  
+    }
+}
+
+std::string is_downloaded_string(bool is_downloaded){
+    return is_downloaded ? "Yes" : "--";
+}
+
+struct SettingsResourceDownloadRow::Data{
+    Data(
+        DownloadedResourceMetadata expected_metadata,
+        bool is_downloaded,
+        std::optional<uint16_t> version_num,
+        ResourceVersionStatus version_status
+    )
+        : m_local_metadata(expected_metadata)
+        , m_action_state(ActionState::READY)
+        , m_resource_slug(expected_metadata.resource_name)
+        , m_resource_name_label(LockMode::LOCK_WHILE_RUNNING, m_resource_slug)
+        , m_file_size(expected_metadata.size_decompressed_bytes)
+        , m_file_size_label(LockMode::LOCK_WHILE_RUNNING, tostr_bytes(m_file_size))
+        , m_is_downloaded(is_downloaded)
+        , m_is_downloaded_label(LockMode::LOCK_WHILE_RUNNING, is_downloaded_string(is_downloaded))
+        , m_version_num(version_num)
+        , m_version_status(version_status)
+        , m_version_status_label(LockMode::LOCK_WHILE_RUNNING, resource_version_to_string(version_status))
+    {}
+
+
+
+    DownloadedResourceMetadata m_local_metadata;
+
+    ActionState m_action_state;
+
+    std::string m_resource_slug;
+    LabelCellOption m_resource_name_label;
+
+    size_t m_file_size;
+    LabelCellOption m_file_size_label;
+
+    bool m_is_downloaded;
+    LabelCellOption m_is_downloaded_label;
+
+    std::optional<uint16_t> m_version_num;
+    ResourceVersionStatus m_version_status;
+    LabelCellOption m_version_status_label;
+
+    AsyncTask m_pre_download_thread;
+    AsyncTask m_delete_thread;
+
+    std::shared_ptr<ResourceDownload> m_download_ptr;
+
+    std::optional<DownloadedResourceMetadata> m_cached_metadata;
+
+    Mutex m_action_state_lock;
+
+
+    ListenerSet<Listener> listeners;
+
+
+
+};
+
+void SettingsResourceDownloadRow::set_version_status(ResourceVersionStatus version_status){
+    m_data->m_version_status = version_status;
+    m_data->m_version_status_label.set_text(resource_version_to_string(version_status));
+}
+
+std::string SettingsResourceDownloadRow::get_resource_slug(){ 
+    return m_data->m_resource_slug; 
+}
+
+void SettingsResourceDownloadRow::set_is_downloaded(bool is_downloaded){
+    m_data->m_is_downloaded = is_downloaded;
+    m_data->m_is_downloaded_label.set_text(is_downloaded_string(is_downloaded));
+}
+
+void SettingsResourceDownloadRow::update_table_label(bool success){
+    set_is_downloaded(success);
+    set_version_status(success ? ResourceVersionStatus::CURRENT : ResourceVersionStatus::NOT_APPLICABLE);
+}
+
+
+
+SettingsResourceDownloadRow::~SettingsResourceDownloadRow(){
+    // cout << "~SettingsResourceDownloadRow" << endl;
+    if (m_data->m_download_ptr){
+        m_data->m_download_ptr->remove_listener(*this); 
+    }
+    m_data->m_pre_download_thread.wait_and_ignore_exceptions();
+    m_data->m_delete_thread.wait_and_ignore_exceptions();
+}
+SettingsResourceDownloadRow::SettingsResourceDownloadRow(
+    DownloadedResourceMetadata local_metadata,
+    bool is_downloaded,
+    std::optional<uint16_t> version_num,
+    ResourceVersionStatus version_status
+)
+    : StaticTableRow(local_metadata.resource_name)
+    , m_data(CONSTRUCT_TOKEN, local_metadata, is_downloaded, version_num, version_status)
+    , m_download_button(*this)
+    , m_delete_button(*this)
+    , m_cancel_button(*this)
+    , m_progress_bar(*this)
+{
+    PA_ADD_STATIC(m_data->m_resource_name_label);
+    PA_ADD_STATIC(m_data->m_file_size_label);
+    PA_ADD_STATIC(m_data->m_is_downloaded_label);
+    PA_ADD_STATIC(m_data->m_version_status_label);
+
+    PA_ADD_STATIC(m_download_button);
+    PA_ADD_STATIC(m_delete_button);
+    PA_ADD_STATIC(m_cancel_button);
+    PA_ADD_STATIC(m_progress_bar);
+
+    update_action_state(ActionState::READY);
+}
+
+
+
+const DownloadedResourceMetadata& SettingsResourceDownloadRow::fetch_remote_metadata(){
+
+    if (m_data->m_cached_metadata.has_value()){
+        return m_data->m_cached_metadata.value();
+    }
+
+    Logger& logger = global_logger_tagged();
+    std::vector<DownloadedResourceMetadata> all_remote_metadata;
+
+    try{
+        all_remote_metadata = remote_resource_download_list();
+    }catch(OperationFailedException&){
+        global_logger_tagged().log(
+            "SettingsResourceDownloadRow::fetch_remote_metadata(): Error",
+            COLOR_RED
+        );
+        throw_and_log<OperationFailedException>(logger, ErrorReportMode::NO_ERROR_REPORT, 
+            "Error: Download failed. Failed to fetch the list of available downloads. Check your internet connection.");
+    }
+
+    std::string resource_name = m_data->m_resource_name_label.text();
+
+    for (const DownloadedResourceMetadata& remote_metadata : all_remote_metadata){
+        if (remote_metadata.resource_name == resource_name){
+            m_data->m_cached_metadata = remote_metadata;
+            return m_data->m_cached_metadata.value();
+        }
+    }
+
+    // if corresponding remote_metadata not found
+    throw_and_log<OperationFailedException>(logger, ErrorReportMode::NO_ERROR_REPORT, 
+            "fetch_remote_metadata: Resource no longer available for download. We recommend updating the Computer Control program.");
+
+}
+
+
+
+void SettingsResourceDownloadRow::ensure_remote_metadata_loaded(){
+    m_data->m_pre_download_thread = GlobalThreadPools::unlimited_normal().dispatch_now_blocking(
+    [this]{ 
+        try {
+            if (!is_given_action_state(ActionState::PRE_DOWNLOAD)){
+                return;
+            }
+
+
+            bool success = false;
+            ScopeExit on_exit([&success, this]{
+                if (!success){
+                    update_action_state(ActionState::READY);
+                }
+            });
+            
+            // std::this_thread::sleep_for(std::chrono::seconds(1));
+            std::string predownload_warning;
+            try {
+                const DownloadedResourceMetadata& remote_metadata = fetch_remote_metadata();
+                predownload_warning = predownload_warning_summary(remote_metadata);
+            }catch(OperationFailedException& e){
+                predownload_warning = e.message();
+            }
+            // cout << "Fetched remote metadata" << endl;
+            // throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "testing");
+            // Logger& logger = global_logger_tagged();
+            // throw_and_log<OperationFailedException>(logger, ErrorReportMode::NO_ERROR_REPORT, "test");
+
+            report_metadata_fetch_finished(predownload_warning);
+            success = true;
+
+        }catch(OperationFailedException&){
+            // cout << "failed" << endl;
+            GlobalResourceDownloadManager::instance().report_download_failed(m_data->m_resource_slug);
+            return;
+        }catch(...){
+            // cout << "Exception thrown in thread" << endl;
+            GlobalResourceDownloadManager::instance().report_unexpected_exception_caught("Error: SettingsResourceDownloadButton::ensure_remote_metadata_loaded: Unknown exception. Report this as an error.");
+            return;
+        }
+    
+    }
+    );
+
+}
+
+std::string SettingsResourceDownloadRow::predownload_warning_summary(const DownloadedResourceMetadata& remote_metadata){
+
+    std::string predownload_warning;
+
+    uint16_t local_version_num = m_data->m_local_metadata.version_num.value();
+
+    uint16_t remote_version_num = remote_metadata.version_num.value();
+    size_t compressed_size = remote_metadata.size_compressed_bytes;
+    size_t decompressed_size = remote_metadata.size_decompressed_bytes;
+
+    std::string disk_space_requirement = "This will require " + tostr_bytes(decompressed_size + compressed_size) + " of free space";
+
+    if (local_version_num < remote_version_num){
+        predownload_warning = "The resource you are downloading is a more updated version than the program expects. "
+        "This may or may not cause issues with the programs. "
+        "We recommend updating the Computer Control program.<br>" +
+        disk_space_requirement;
+    }else if (local_version_num == remote_version_num){
+        predownload_warning = "Update available.<br>" + disk_space_requirement;
+    }else if (local_version_num > remote_version_num){
+        predownload_warning = "The resource you are downloading is a less updated version than the program expects. "
+        "Please report this as a bug.<br>" +
+        disk_space_requirement;
+    }
+
+    return predownload_warning;
+}
+
+
+
+void SettingsResourceDownloadRow::start_download(){
+    if (!is_given_action_state(ActionState::PRE_DOWNLOAD)){
+        return;
+    }
+
+    update_action_state(ActionState::DOWNLOADING);
+
+    cancel_download_thread(); // cancels old download thread
+
+    try{
+        std::shared_ptr<ResourceDownload> download_ptr = GlobalResourceDownloadManager::instance().add_to_download_list(m_data->m_resource_slug);
+
+    }catch(OperationFailedException&){
+        update_action_state(ActionState::READY);
+    }
+    
+}
+
+
+void SettingsResourceDownloadRow::start_delete(){
+    m_data->m_delete_thread = GlobalThreadPools::unlimited_normal().dispatch_now_blocking(
+    [this]{ 
+        try {
+            ScopeExit on_exit([this]{
+                update_table_label(false);
+                update_action_state(ActionState::READY);
+            });
+
+            // throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "test.");
+            // Logger& logger = global_logger_tagged();
+            // throw_and_log<OperationFailedException>(logger, ErrorReportMode::NO_ERROR_REPORT, "test");
+
+            if (!is_given_action_state(ActionState::PRE_DELETE)){
+                return;
+            }
+            update_action_state(ActionState::DELETING);
+
+            std::string resource_name = m_data->m_local_metadata.resource_name;
+
+            std::string resource_directory = DOWNLOADED_RESOURCE_PATH() + resource_name;
+            // delete directory and the old resource
+            Filesystem::remove_all(resource_directory);
+
+        }catch(OperationFailedException& e){
+            global_logger_tagged().log(e.message(), COLOR_RED);
+            GlobalResourceDownloadManager::instance().report_unexpected_exception_caught(
+                "Error: SettingsResourceDownloadButton::start_delete: Unexpected OperationFailedException exception. Report this as an error.");
+            return;
+        }catch(...){
+            GlobalResourceDownloadManager::instance().report_unexpected_exception_caught(
+                "Error: SettingsResourceDownloadButton::start_delete: Unknown exception. Report this as an error.");
+            return;
+        }
+    }
+    );
+
+}
+
+
+void SettingsResourceDownloadRow::update_action_state(ActionState state){
+    std::lock_guard<Mutex> lock(m_data->m_action_state_lock);
+    {
+        switch (state){
+        case ActionState::PRE_DOWNLOAD:
+            // action state can only enter the PRE_DOWNLOAD state 
+            // if going from the READY state
+            if (m_data->m_action_state == ActionState::READY){
+                m_download_button.set_enabled(false);
+                m_delete_button.set_enabled(false);
+                m_cancel_button.set_enabled(true);
+                m_progress_bar.change_text("Downloading");
+                m_progress_bar.set_visibility(ConfigOptionState::ENABLED);
+                m_data->m_action_state = state;
+                global_logger_tagged().log(
+                    "ActionState::PRE_DOWNLOAD",
+                    COLOR_PURPLE
+                );
+            }
+            break;
+        case ActionState::DOWNLOADING:
+            if (m_data->m_action_state == ActionState::PRE_DOWNLOAD || m_data->m_action_state == ActionState::PRE_CANCEL || m_data->m_action_state == ActionState::READY){
+                m_download_button.set_enabled(false);
+                m_delete_button.set_enabled(false);
+                m_cancel_button.set_enabled(true);
+                m_progress_bar.change_text("Downloading");
+                m_progress_bar.set_visibility(ConfigOptionState::ENABLED);
+                m_data->m_action_state = state;
+                global_logger_tagged().log(
+                    "ActionState::DOWNLOADING",
+                    COLOR_PURPLE
+                );
+            }
+            break;
+        case ActionState::PRE_DELETE:
+            // action state can only enter the PRE_DELETE state 
+            // if going from the READY state
+            if (m_data->m_action_state == ActionState::READY){
+                m_download_button.set_enabled(false);
+                m_delete_button.set_enabled(false);
+                m_cancel_button.set_enabled(false);
+                m_progress_bar.reset_progress();
+                m_data->m_action_state = state;
+                global_logger_tagged().log(
+                    "ActionState::PRE_DELETE",
+                    COLOR_PURPLE
+                );
+            }
+            break;
+        case ActionState::DELETING:
+            // action state can only enter the DELETING state 
+            // if going from the PRE_DELETE state
+            if (m_data->m_action_state == ActionState::PRE_DELETE){
+                m_download_button.set_enabled(false);
+                m_delete_button.set_enabled(false);
+                m_cancel_button.set_enabled(false);
+                m_progress_bar.reset_progress();
+                m_data->m_action_state = state;
+                global_logger_tagged().log(
+                    "ActionState::DELETING",
+                    COLOR_PURPLE
+                );
+            }
+            break;
+        case ActionState::PRE_CANCEL:
+            // action state can only enter the PRE_CANCEL state 
+            // if going from the DOWNLOADING state
+            if (m_data->m_action_state == ActionState::DOWNLOADING){ 
+                m_download_button.set_enabled(false);
+                m_delete_button.set_enabled(false);
+                m_cancel_button.set_enabled(false);
+                m_progress_bar.reset_progress();
+                m_data->m_action_state = state;
+                global_logger_tagged().log(
+                    "ActionState::PRE_CANCEL",
+                    COLOR_PURPLE
+                );
+            }
+            break;
+        case ActionState::CANCELLING:
+            // action state can only enter the CANCELLING state 
+            // if going from the PRE_CANCEL state
+            if (m_data->m_action_state == ActionState::PRE_CANCEL){ 
+                m_download_button.set_enabled(false);
+                m_delete_button.set_enabled(false);
+                m_cancel_button.set_enabled(false);
+                m_progress_bar.reset_progress();
+                m_data->m_action_state = state;
+                global_logger_tagged().log(
+                    "ActionState::CANCELLING",
+                    COLOR_PURPLE
+                );
+            }
+            break;
+        case ActionState::READY:
+            m_download_button.set_enabled(true);
+            m_delete_button.set_enabled(true);
+            m_cancel_button.set_enabled(true);
+            m_progress_bar.change_text("");
+            m_progress_bar.set_visibility(ConfigOptionState::HIDDEN);
+            m_progress_bar.reset_progress();
+            m_data->m_action_state = state;
+            global_logger_tagged().log(
+                "ActionState::READY",
+                COLOR_PURPLE
+            );
+            break;
+        default:
+            throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "update_action_state: Unknown enum.");  
+        }
+    }
+
+    report_action_state_updated();
+}
+
+ActionState SettingsResourceDownloadRow::get_action_state(){
+    std::lock_guard<Mutex> lock(m_data->m_action_state_lock);
+    return m_data->m_action_state;
+}
+
+bool SettingsResourceDownloadRow::is_given_action_state(ActionState state){
+    std::lock_guard<Mutex> lock(m_data->m_action_state_lock);
+    return m_data->m_action_state == state;
+}
+
+void SettingsResourceDownloadRow::cancel_download_thread(){
+    if (m_data->m_download_ptr){ // if download is active
+        m_data->m_download_ptr->cancel_download();
+    }
+}
+
+
+void SettingsResourceDownloadRow::connect_with_download(std::shared_ptr<ResourceDownload> download_ptr){
+    if (m_data->m_download_ptr){
+        m_data->m_download_ptr->remove_listener(*this);
+    }
+    m_data->m_download_ptr = std::move(download_ptr);
+    m_data->m_download_ptr->add_listener(*this);
+    m_data->m_download_ptr->add_listener(m_progress_bar);
+    update_action_state(ActionState::DOWNLOADING);
+}
+
+
+/////////////////////////
+// Listener
+/////////////////////////
+void SettingsResourceDownloadRow::add_listener(Listener& listener){
+    auto scope = m_lifetime_sanitizer.check_scope();
+    m_data->listeners.add(listener);
+}
+void SettingsResourceDownloadRow::remove_listener(Listener& listener){
+    auto scope = m_lifetime_sanitizer.check_scope();
+    m_data->listeners.remove(listener);
+}
+
+void SettingsResourceDownloadRow::report_download_progress(uint64_t bytes_done, uint64_t total_bytes){
+    auto scope = m_lifetime_sanitizer.check_scope();
+    m_data->listeners.run_method(&Listener::on_download_progress, bytes_done, total_bytes);
+}
+void SettingsResourceDownloadRow::report_unzip_progress(uint64_t bytes_done, uint64_t total_bytes){
+    auto scope = m_lifetime_sanitizer.check_scope();
+    m_data->listeners.run_method(&Listener::on_unzip_progress, bytes_done, total_bytes);
+}
+void SettingsResourceDownloadRow::report_hash_progress(uint64_t bytes_done, uint64_t total_bytes){
+    auto scope = m_lifetime_sanitizer.check_scope();
+    m_data->listeners.run_method(&Listener::on_hash_progress, bytes_done, total_bytes);
+}
+
+void SettingsResourceDownloadRow::report_metadata_fetch_finished(const std::string& popup_message){
+    auto scope = m_lifetime_sanitizer.check_scope();
+    m_data->listeners.run_method(&Listener::on_metadata_fetch_finished, popup_message);
+}
+
+void SettingsResourceDownloadRow::report_action_state_updated(){
+    auto scope = m_lifetime_sanitizer.check_scope();
+    m_data->listeners.run_method(&Listener::on_action_state_updated);
+}
+
+
+////////////////////////////////
+// ResourceDownload::Listener
+////////////////////////////////
+void SettingsResourceDownloadRow::on_download_progress(uint64_t bytes_done, uint64_t total_bytes){
+    report_download_progress(bytes_done, total_bytes);
+}
+void SettingsResourceDownloadRow::on_unzip_progress(uint64_t bytes_done, uint64_t total_bytes){
+    report_unzip_progress(bytes_done, total_bytes);
+}
+void SettingsResourceDownloadRow::on_hash_progress(uint64_t bytes_done, uint64_t total_bytes){
+    report_hash_progress(bytes_done, total_bytes);
+}
+
+void SettingsResourceDownloadRow::on_download_finished(bool success, const std::string& resource_slug){
+    // we can't run `download_ptr->remove_listener(*this)` in this function
+    // since it results in deadlock, since this function is part of the listener loop
+//    m_data->m_download_ptr.reset();
+
+    update_action_state(ActionState::READY);
+    update_table_label(success);
+}
+
+
+}
diff --git a/SerialPrograms/Source/CommonFramework/ResourceDownload/SettingsResourceDownloadRow.h b/SerialPrograms/Source/CommonFramework/ResourceDownload/SettingsResourceDownloadRow.h
new file mode 100644
index 0000000000..4241e813bf
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/ResourceDownload/SettingsResourceDownloadRow.h
@@ -0,0 +1,117 @@
+/*  Resource Download Row
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_ResourceDownloadRow_H
+#define PokemonAutomation_ResourceDownloadRow_H
+
+#include "Common/Cpp/Containers/Pimpl.h"
+#include "Common/Cpp/LifetimeSanitizer.h"
+#include "Common/Cpp/Options/StaticTableOption.h"
+#include "ResourceDownload.h"
+#include "SettingsResourceDownloadOptions.h"
+
+namespace PokemonAutomation{
+
+
+enum class ActionState{
+    PRE_DOWNLOAD,
+    DOWNLOADING,
+    PRE_DELETE,
+    DELETING,
+    PRE_CANCEL,
+    CANCELLING,
+    READY,
+};
+class SettingsResourceDownloadRow : public StaticTableRow, public ResourceDownload::Listener{
+public:
+    ~SettingsResourceDownloadRow();
+    SettingsResourceDownloadRow(
+        DownloadedResourceMetadata local_metadata,
+        bool is_downloaded,
+        std::optional<uint16_t> version_num,
+        ResourceVersionStatus version_status
+    );
+
+public:
+    struct Listener{
+        virtual void on_download_progress(uint64_t bytes_done, uint64_t total_bytes){}
+        virtual void on_unzip_progress(uint64_t bytes_done, uint64_t total_bytes){}
+        virtual void on_hash_progress(uint64_t bytes_done, uint64_t total_bytes){}
+
+        virtual void on_metadata_fetch_finished(const std::string& popup_message){}
+
+        virtual void on_action_state_updated(){}
+    };
+
+    void add_listener(Listener& listener);
+    void remove_listener(Listener& listener);
+
+    void report_download_progress(uint64_t bytes_done, uint64_t total_bytes);
+    void report_unzip_progress(uint64_t bytes_done, uint64_t total_bytes);
+    void report_hash_progress(uint64_t bytes_done, uint64_t total_bytes);
+
+    void report_metadata_fetch_finished(const std::string& popup_message);
+
+    void report_action_state_updated();
+
+public: // ResourceDownload::Listener
+    virtual void on_download_progress(uint64_t bytes_done, uint64_t total_bytes) override;
+    virtual void on_unzip_progress(uint64_t bytes_done, uint64_t total_bytes) override;
+    virtual void on_hash_progress(uint64_t bytes_done, uint64_t total_bytes) override;
+
+    // NOTE: this runs regardless of success or failure
+    virtual void on_download_finished(bool success, const std::string& resource_slug) override;
+
+public:
+    std::string get_resource_slug();
+    void set_version_status(ResourceVersionStatus version_status);
+    void set_is_downloaded(bool is_downloaded);
+    void update_table_label(bool success);
+
+    void ensure_remote_metadata_loaded();
+    std::string predownload_warning_summary(const DownloadedResourceMetadata& remote_metadata);
+    // get the DownloadedResourceMetadata from the remote JSON, that corresponds to this button/row
+    const DownloadedResourceMetadata& fetch_remote_metadata();
+    // DownloadedResourceMetadata initialize_local_metadata();
+
+    void start_download();
+    
+    void start_delete();
+
+    // READY: can come from any state
+    // PRE_DOWNLOAD, PRE_DELETE, PRE_CANCEL: can only come from READY
+    // DELETING, CANCELLING: can only come from their respective PRE state
+    // DOWNLOADING: can come from either PRE_DOWNLOAD or PRE_CANCEL
+    void update_action_state(ActionState state);
+
+    ActionState get_action_state();
+
+    bool is_given_action_state(ActionState state);
+
+    void cancel_download_thread();
+
+    // - updates m_download_ptr to point to the given download_ptr
+    // - adds this object as a listener to download_ptr
+    void connect_with_download(std::shared_ptr<ResourceDownload> download_ptr);
+
+private:
+    struct Data;
+    Pimpl<Data> m_data;
+
+    SettingsResourceDownloadButton m_download_button;
+    SettingsResourceDeleteButton m_delete_button;
+    SettingsResourceCancelButton m_cancel_button;
+    SettingsResourceProgressBar m_progress_bar;
+
+    LifetimeSanitizer m_lifetime_sanitizer;
+
+
+
+
+};
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/ResourceDownload/SettingsResourceDownloadTable.cpp b/SerialPrograms/Source/CommonFramework/ResourceDownload/SettingsResourceDownloadTable.cpp
new file mode 100644
index 0000000000..771a40c464
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/ResourceDownload/SettingsResourceDownloadTable.cpp
@@ -0,0 +1,92 @@
+/*  Resource Download Table
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Exceptions.h"
+#include "ResourceDownload.h"
+#include "SettingsResourceDownloadRow.h"
+#include "SettingsResourceDownloadTable.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+
+
+std::vector<std::unique_ptr<SettingsResourceDownloadRow>> SettingsResourceDownloadTable::get_resource_download_rows(){
+    std::vector<std::unique_ptr<SettingsResourceDownloadRow>> resource_rows;
+    std::vector<DownloadedResourceMetadata> resource_list; 
+    try{
+        resource_list = expected_resource_download_list();
+    }catch(FileException&){
+        return {};
+    }
+    
+    for (uint16_t index = 0; index < resource_list.size(); index++){
+        DownloadedResourceMetadata resource = resource_list[index];
+        std::string resource_name = resource.resource_name;
+
+        auto [is_downloaded, version_status, current_version_num] = get_local_version_info(resource_name);
+
+        resource_rows.emplace_back(std::make_unique<SettingsResourceDownloadRow>(resource, is_downloaded, current_version_num, version_status));
+    }
+
+    return resource_rows;
+}
+
+
+
+
+SettingsResourceDownloadTable::~SettingsResourceDownloadTable(){
+    // m_worker.wait_and_ignore_exceptions();
+}
+
+SettingsResourceDownloadTable::SettingsResourceDownloadTable()
+    : StaticTableOption("<b>Resource Downloading:</b><br>Download resources not included in the initial download of the program.", LockMode::LOCK_WHILE_RUNNING, false)
+    , m_resource_rows(get_resource_download_rows())
+{
+    add_resource_download_rows();
+
+    finish_construction();
+}
+std::vector<std::string> SettingsResourceDownloadTable::make_header() const{
+    std::vector<std::string> ret{
+        "Resource",
+        "Size",
+        "Downloaded",
+        "Version",
+        "",
+        "",
+        "",
+        "",
+    };
+    return ret;
+}
+
+
+void SettingsResourceDownloadTable::add_resource_download_rows(){
+    for (std::unique_ptr<SettingsResourceDownloadRow>& row_ptr : m_resource_rows){
+        add_row(row_ptr.get());
+    }
+}
+
+void SettingsResourceDownloadTable::connect_row_with_download(const std::string& resource_slug, std::shared_ptr<ResourceDownload>& download_ptr){
+
+    for (const auto& row_ptr : m_resource_rows){
+        if (row_ptr->get_resource_slug() == resource_slug){
+            // download_ptr->add_listener(*row_ptr);
+            row_ptr->connect_with_download(download_ptr);
+            return; 
+        }
+    }
+
+    // resource_slug not found within m_resource_rows
+    throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "connect_row_with_download: resource_slug not found within m_resource_rows.");
+}
+
+
+
+}
diff --git a/SerialPrograms/Source/CommonFramework/ResourceDownload/SettingsResourceDownloadTable.h b/SerialPrograms/Source/CommonFramework/ResourceDownload/SettingsResourceDownloadTable.h
new file mode 100644
index 0000000000..4c346f43c4
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/ResourceDownload/SettingsResourceDownloadTable.h
@@ -0,0 +1,42 @@
+/*  Resource Download Table
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_ResourceDownloadTable_H
+#define PokemonAutomation_ResourceDownloadTable_H
+
+#include "Common/Cpp/Options/StaticTableOption.h"
+// #include "SettingsResourceDownloadRow.h"
+
+namespace PokemonAutomation{
+
+class SettingsResourceDownloadRow;
+class ResourceDownload;
+
+class SettingsResourceDownloadTable : public StaticTableOption{
+public:
+    ~SettingsResourceDownloadTable();
+    SettingsResourceDownloadTable();
+
+    virtual std::vector<std::string> make_header() const override;
+
+    void connect_row_with_download(const std::string& resource_slug, std::shared_ptr<ResourceDownload>& download_ptr);
+
+private:  
+    std::vector<std::unique_ptr<SettingsResourceDownloadRow>> get_resource_download_rows();
+    void add_resource_download_rows();
+
+
+private:
+    // must use a vector of pointers to the Row, since the Row class contains a mutex 
+    // and so can't be moved
+    std::vector<std::unique_ptr<SettingsResourceDownloadRow>> m_resource_rows;
+
+};
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/ResourceDownload/SettingsResourceDownloadWidget.cpp b/SerialPrograms/Source/CommonFramework/ResourceDownload/SettingsResourceDownloadWidget.cpp
new file mode 100644
index 0000000000..c8338b0ad5
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/ResourceDownload/SettingsResourceDownloadWidget.cpp
@@ -0,0 +1,483 @@
+/*  Resource Download Widget
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <iostream>
+#include <QFont>
+#include <QPushButton>
+#include <QMessageBox>
+#include <QHBoxLayout>
+#include "SettingsResourceDownloadWidget.h"
+
+using std::cout;
+using std::endl;
+
+namespace PokemonAutomation{
+
+
+/////////////////////////////////////////////////////////////////////////////////////////////////////////
+// SettingsDownloadButtonWidget
+/////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+template class RegisterUiStateQtWidget<SettingsDownloadButtonWidget>;
+SettingsDownloadButtonWidget::~SettingsDownloadButtonWidget(){
+    // cout << "Destructor for SettingsDownloadButtonWidget" << endl;
+    // m_value.disconnect(this);
+    m_value.remove_button_listener(*this);
+}
+SettingsDownloadButtonWidget::SettingsDownloadButtonWidget(QWidget& parent, SettingsResourceDownloadButton& value)
+    : QWidget(&parent)
+    , ConfigWidget(value, *this)
+    , m_value(value)
+    , m_row(value.row)
+{
+
+    QHBoxLayout* layout = new QHBoxLayout(this);
+    layout->setContentsMargins(0, 0, 0, 0);
+
+    m_button = new QPushButton("Download", this);
+    // m_widget = this;
+
+    layout->addWidget(m_button);
+
+    // cout << "Constructor for SettingsDownloadButtonWidget" << endl;
+
+    QFont font;
+    font.setBold(true);
+    m_button->setFont(font);
+    m_button->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+
+    QFontMetrics metrics(m_button->font());
+    int minWidth = metrics.horizontalAdvance("Downloading...");
+    m_button->setMinimumWidth(minWidth);
+
+
+    // when the button is clicked, runs row.update_action_state(), which updates the button state
+    // also, fetch json
+    connect(
+        m_button, &QPushButton::clicked,
+        this, [this](){
+            if (!m_row.is_given_action_state(ActionState::READY)){
+                return;
+            }
+            m_row.update_action_state(ActionState::PRE_DOWNLOAD);
+            m_row.ensure_remote_metadata_loaded();
+        }
+    );
+
+
+    // add QObject that manages the Download confirmation popup
+    SettingsDownloadPopupWidget* popup = new SettingsDownloadPopupWidget(m_row);
+    popup->setParent(this);
+
+    value.add_button_listener(*this);
+}
+
+
+void SettingsDownloadButtonWidget::on_change_text(const std::string& text){
+    QMetaObject::invokeMethod(this, [this, text]{
+        m_button->setText(QString::fromStdString(text));
+    }, Qt::QueuedConnection);
+}
+
+
+
+
+/////////////////////////////////////////////////////////////////////////////////////////////////////////
+// SettingsDeleteButtonWidget
+/////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+template class RegisterUiStateQtWidget<SettingsDeleteButtonWidget>;
+SettingsDeleteButtonWidget::~SettingsDeleteButtonWidget(){
+    m_value.remove_button_listener(*this);
+}
+SettingsDeleteButtonWidget::SettingsDeleteButtonWidget(QWidget& parent, SettingsResourceDeleteButton& value)
+    : QWidget(&parent)
+    , ConfigWidget(value, *this)
+    , m_value(value)
+    , m_row(value.row)
+{
+    QHBoxLayout* layout = new QHBoxLayout(this);
+    layout->setContentsMargins(0, 0, 0, 0);
+
+    m_button = new QPushButton("Delete", this);
+    // m_widget = m_button;
+
+    layout->addWidget(m_button);
+
+    QFont font;
+    font.setBold(true);
+    m_button->setFont(font);
+    m_button->setText("Delete");
+    m_button->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+
+    QFontMetrics metrics(m_button->font());
+    int minWidth = metrics.horizontalAdvance("Deleting...");
+    m_button->setMinimumWidth(minWidth);
+
+
+    // when the button is clicked, runs row.update_action_state(), which updates the button state
+    // also, show the delete confirm box
+    connect(
+        m_button, &QPushButton::clicked,
+        this, [&](bool){
+            if (!m_row.is_given_action_state(ActionState::READY)){
+                return;
+            }
+            m_row.update_action_state(ActionState::PRE_DELETE);
+            show_delete_confirm_box();
+            // cout << "Clicked Delete Button" << endl;
+        }
+    );
+
+    value.add_button_listener(*this);
+}
+
+void SettingsDeleteButtonWidget::on_change_text(const std::string& text){
+    QMetaObject::invokeMethod(this, [this, text]{
+        m_button->setText(QString::fromStdString(text));
+    }, Qt::QueuedConnection);
+}
+
+
+void SettingsDeleteButtonWidget::show_delete_confirm_box(){
+    QMessageBox box;
+    QPushButton* yes = box.addButton(QMessageBox::Yes);
+    QPushButton* cancel = box.addButton("Cancel", QMessageBox::NoRole);
+    box.setEscapeButton(cancel);
+//    cout << "ok = " << ok << endl;
+//    cout << "skip = " << skip << endl;
+
+    box.setTextFormat(Qt::RichText);
+    std::string title = "Delete";
+    std::string message_body = "Are you sure you want to delete this resource?";
+
+    box.setWindowTitle(QString::fromStdString(title));
+    box.setText(QString::fromStdString(message_body));
+
+//    box.open();
+
+    box.exec();
+
+    QAbstractButton* clicked = box.clickedButton();
+//    cout << "clicked = " << clicked << endl;
+    if (clicked == yes){
+        cout << "Clicked Yes to Delete" << endl;
+
+        m_row.start_delete();
+        return;
+    }
+    if (clicked == cancel){
+        m_row.update_action_state(ActionState::READY);
+        return;
+    }
+}
+
+
+/////////////////////////////////////////////////////////////////////////////////////////////////////////
+// SettingsCancelButtonWidget
+/////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+template class RegisterUiStateQtWidget<SettingsCancelButtonWidget>;
+SettingsCancelButtonWidget::~SettingsCancelButtonWidget(){
+    m_value.remove_button_listener(*this);
+}
+SettingsCancelButtonWidget::SettingsCancelButtonWidget(QWidget& parent, SettingsResourceCancelButton& value)
+    : QWidget(&parent)
+    , ConfigWidget(value, *this)
+    , m_value(value)
+    , m_row(value.row)
+{
+    QHBoxLayout* layout = new QHBoxLayout(this);
+    layout->setContentsMargins(0, 0, 0, 0);
+
+    m_button = new QPushButton("Cancel", this);
+    // m_widget = m_button;
+
+    layout->addWidget(m_button);
+
+    QFont font;
+    font.setBold(true);
+    m_button->setFont(font);
+    m_button->setText("Cancel");
+    m_button->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+
+    QFontMetrics metrics(m_button->font());
+    int minWidth = metrics.horizontalAdvance("Cancelling...");
+    m_button->setMinimumWidth(minWidth);
+
+    // when the button is clicked, runs row.update_action_state(), which updates the button state
+    // also, set cancel state to true
+    connect(
+        m_button, &QPushButton::clicked,
+        this, [&](bool){
+            if (!m_row.is_given_action_state(ActionState::DOWNLOADING)){
+                return;
+            }
+            m_row.update_action_state(ActionState::PRE_CANCEL);
+            show_cancel_confirm_box();
+            cout << "Clicked Cancel Button" << endl;
+        }
+    );
+
+    value.add_button_listener(*this);
+}
+
+void SettingsCancelButtonWidget::on_change_text(const std::string& text){
+    QMetaObject::invokeMethod(this, [this, text]{
+        m_button->setText(QString::fromStdString(text));
+    }, Qt::QueuedConnection);
+}
+
+void SettingsCancelButtonWidget::show_cancel_confirm_box(){
+    QMessageBox box;
+    QPushButton* yes = box.addButton(QMessageBox::Yes);
+    QPushButton* cancel = box.addButton("Cancel", QMessageBox::NoRole);
+    box.setEscapeButton(cancel);
+//    cout << "ok = " << ok << endl;
+//    cout << "skip = " << skip << endl;
+
+    box.setTextFormat(Qt::RichText);
+    std::string title = "Cancel Download";
+    std::string message_body = "Are you sure you want to cancel this download?";
+
+    box.setWindowTitle(QString::fromStdString(title));
+    box.setText(QString::fromStdString(message_body));
+
+//    box.open();
+
+    box.exec();
+
+    QAbstractButton* clicked = box.clickedButton();
+//    cout << "clicked = " << clicked << endl;
+    if (clicked == yes){
+        cout << "Clicked Yes to Cancel" << endl;
+
+        if (!m_row.is_given_action_state(ActionState::PRE_CANCEL)){ 
+            // if the download finishes and goes back to READY state before the user clicks Yes to cancel
+            // then nothing happens
+            return;
+        }
+
+        m_row.update_action_state(ActionState::CANCELLING);
+
+        m_row.cancel_download_thread();
+
+        return;
+    }
+    if (clicked == cancel){
+        if (!m_row.is_given_action_state(ActionState::PRE_CANCEL)){
+            return;
+        }
+
+        m_row.update_action_state(ActionState::DOWNLOADING);
+        return;
+    }
+}
+
+
+
+/////////////////////////////////////////////////////////////////////////////////////////////////////////
+// SettingsProgressBarWidget
+/////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+template class RegisterUiStateQtWidget<SettingsProgressBarWidget>;
+SettingsProgressBarWidget::~SettingsProgressBarWidget(){
+    // cout << "Destructor for SettingsProgressBarWidget" << endl;
+    m_value.remove_progress_listener(*this);
+}
+SettingsProgressBarWidget::SettingsProgressBarWidget(QWidget& parent, SettingsResourceProgressBar& value)
+    : QWidget(&parent)
+    , ConfigWidget(value, *this)
+    , m_value(value)
+    // , m_row(value.row)
+{
+
+    // 1. Instantiate the widgets
+    m_status_label = new QLabel("", this);
+    m_progress_bar = new QProgressBar(this);
+
+    // cout << "Constructor for SettingsProgressBarWidget" << endl;
+
+    // 2. Configure the progress bar
+    m_progress_bar->setRange(0, 100);
+    m_progress_bar->setValue(0);
+    m_progress_bar->setTextVisible(true); // Shows % inside the bar
+
+    // 3. Create a horizontal layout to hold them
+    QHBoxLayout *layout = new QHBoxLayout();
+    layout->addWidget(m_status_label);
+    layout->addWidget(m_progress_bar);
+
+    this->setLayout(layout);
+    this->setMinimumWidth(170);
+
+    value.add_progress_listener(*this);
+
+    update_visibility();
+}
+
+void SettingsProgressBarWidget::update_visibility(){
+    ConfigWidget::update_visibility();
+
+    switch (m_value.visibility()){
+    case ConfigOptionState::ENABLED:
+    case ConfigOptionState::DISABLED:
+        m_progress_bar->setVisible(true);
+        break;
+    case ConfigOptionState::HIDDEN:
+        m_progress_bar->setVisible(false);
+        break;
+    }
+
+}
+
+
+void SettingsProgressBarWidget::update_progress_bar(int percentage){
+    m_progress_bar->setValue(percentage);
+}
+
+void SettingsProgressBarWidget::update_progress_bar(uint64_t bytes_done, uint64_t total_bytes){
+    double percent = total_bytes > 0 ? (static_cast<double>(bytes_done) / total_bytes) * 100.0 : 0;
+    int current_percent = static_cast<int>(percent);
+    int last_percentage = m_progress_bar->value();
+    // Only update UI if integer value has changed
+    if (current_percent != last_percentage){
+        update_progress_bar(current_percent);
+    }
+}
+
+void SettingsProgressBarWidget::on_change_text(const std::string& text){
+    QMetaObject::invokeMethod(this, [this, text]{
+        m_status_label->setText(QString::fromStdString(text));
+    }, Qt::QueuedConnection);
+
+}
+void SettingsProgressBarWidget::on_update_progress(uint64_t bytes_done, uint64_t total_bytes){
+    QMetaObject::invokeMethod(this, [this, bytes_done, total_bytes]{
+        update_progress_bar(bytes_done, total_bytes);
+    }, Qt::QueuedConnection);
+}
+
+void SettingsProgressBarWidget::on_reset_progress(){
+    QMetaObject::invokeMethod(this, [this]{
+        m_progress_bar->setValue(0);
+    }, Qt::QueuedConnection);
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////////////////////
+// SettingsDownloadPopupWidget
+/////////////////////////////////////////////////////////////////////////////////////////////////////////
+SettingsDownloadPopupWidget::~SettingsDownloadPopupWidget(){
+    m_row.remove_listener(*this);
+}
+SettingsDownloadPopupWidget::SettingsDownloadPopupWidget(SettingsResourceDownloadRow& row)
+    : m_row(row)
+{
+    m_row.add_listener(*this);
+}
+
+void SettingsDownloadPopupWidget::show_download_confirm_box(
+    const std::string& title,
+    const std::string& message_body
+){
+    QMessageBox box;
+    QPushButton* ok = box.addButton(QMessageBox::Ok);
+    QPushButton* cancel = box.addButton("Cancel", QMessageBox::NoRole);
+    box.setEscapeButton(cancel);
+//    cout << "ok = " << ok << endl;
+//    cout << "skip = " << skip << endl;
+
+    box.setTextFormat(Qt::RichText);
+    std::string text = message_body;
+    // text += make_text_url(link_url, link_text);
+    // text += get_changes(node);
+
+
+    box.setWindowTitle(QString::fromStdString(title));
+    box.setText(QString::fromStdString(text));
+
+//    box.open();
+
+    box.exec();
+
+    QAbstractButton* clicked = box.clickedButton();
+//    cout << "clicked = " << clicked << endl;
+    if (clicked == ok){
+        cout << "Clicked Ok to Download" << endl;
+
+        m_row.start_download();
+        return;
+    }
+    if (clicked == cancel){
+        m_row.update_action_state(ActionState::READY);
+        return;
+    }
+}
+
+// when json has been fetched, open the update box. 
+// When click Ok in update box, start the download. If click cancel, re-enable the download button
+void SettingsDownloadPopupWidget::on_metadata_fetch_finished(const std::string& popup_message){
+    QMetaObject::invokeMethod(this, [this, popup_message]{
+        show_download_confirm_box("Download", popup_message);
+    }, Qt::QueuedConnection);
+
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////////////////////
+// SettingsDownloadErrorWidget
+/////////////////////////////////////////////////////////////////////////////////////////////////////////
+template class RegisterUiStateQtWidget<SettingsDownloadErrorWidget>;
+SettingsDownloadErrorWidget::~SettingsDownloadErrorWidget(){
+    GlobalResourceDownloadManager::instance().remove_download_listener(*this);
+}
+SettingsDownloadErrorWidget::SettingsDownloadErrorWidget(QWidget& parent, SettingsDownloadError& value)
+    : QWidget(&parent)
+    , ConfigWidget(value, *this)
+{
+    GlobalResourceDownloadManager::instance().add_download_listener(*this);
+    this->hide();
+}
+
+void SettingsDownloadErrorWidget::show_download_failed_box(const std::string& resource_slug){
+    std::cerr << "SettingsDownloadErrorWidget::show_download_failed_box: Error: Download failed for " << resource_slug << ". Check your internet connection and check you have enough disk space." << std::endl;
+    if (m_popup_is_open.exchange(true)){ // only show popups if one isn't already open
+        return;
+    }
+
+    QMessageBox box;
+    box.warning(nullptr, "Error:",
+        QString::fromStdString("Error: Download failed for " + resource_slug + " (and others possibly as well). Check your internet connection and check you have enough disk space."));
+
+    m_popup_is_open.store(false); 
+}
+
+void SettingsDownloadErrorWidget::show_error_box(std::string error_msg){
+    std::cerr << "SettingsDownloadErrorWidget::show_error_box: " << error_msg << std::endl;
+    if (m_popup_is_open.exchange(true)){
+        return;
+    }    
+    QMessageBox box;
+    box.warning(nullptr, "Error:",
+        QString::fromStdString(error_msg));
+
+    m_popup_is_open.store(false); 
+
+}
+
+// GlobalResourceDownloadManager::Listener
+//
+void SettingsDownloadErrorWidget::on_download_failed(const std::string& resource_slug){
+    QMetaObject::invokeMethod(this, [this, resource_slug]{
+        show_download_failed_box(resource_slug);
+    }, Qt::QueuedConnection);    
+}
+void SettingsDownloadErrorWidget::on_exception_caught(const std::string& error_msg){
+    QMetaObject::invokeMethod(this, [this, error_msg]{
+        show_error_box(error_msg);
+    }, Qt::QueuedConnection);
+}
+
+}
diff --git a/SerialPrograms/Source/CommonFramework/ResourceDownload/SettingsResourceDownloadWidget.h b/SerialPrograms/Source/CommonFramework/ResourceDownload/SettingsResourceDownloadWidget.h
new file mode 100644
index 0000000000..4973117a64
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/ResourceDownload/SettingsResourceDownloadWidget.h
@@ -0,0 +1,161 @@
+/*  Resource Download Widget
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_SettingsResourceDownloadWidget_H
+#define PokemonAutomation_SettingsResourceDownloadWidget_H
+
+#include <QLabel>
+#include <QPushButton>
+#include <QProgressBar>
+#include "Common/Qt/Options/ConfigWidget.h"
+#include "GlobalResourceDownloadManager.h"
+#include "SettingsResourceDownloadRow.h"
+
+namespace PokemonAutomation{
+
+
+class SettingsDownloadButtonWidget : public QWidget, public ConfigWidget, public SettingsResourceButton::Listener{
+public:
+    using ParentState = SettingsResourceDownloadButton;
+
+public:
+    ~SettingsDownloadButtonWidget();
+    SettingsDownloadButtonWidget(QWidget& parent, SettingsResourceDownloadButton& value);
+
+
+public: // SettingsResourceButton::Listener
+    virtual void on_change_text(const std::string& text) override;
+
+
+private:
+    SettingsResourceDownloadButton& m_value;
+    SettingsResourceDownloadRow& m_row;
+    QPushButton* m_button;
+    
+};
+
+
+class SettingsDeleteButtonWidget :  public QWidget, public ConfigWidget, SettingsResourceButton::Listener{
+public:
+    using ParentState = SettingsResourceDeleteButton;
+
+public:
+    ~SettingsDeleteButtonWidget();
+    SettingsDeleteButtonWidget(QWidget& parent, SettingsResourceDeleteButton& value);
+
+
+public: // SettingsResourceButton::Listener
+    virtual void on_change_text(const std::string& text) override;
+
+private:
+    void show_delete_confirm_box();
+
+private:
+    SettingsResourceDeleteButton& m_value;
+    SettingsResourceDownloadRow& m_row;
+    QPushButton* m_button;
+};
+
+class SettingsCancelButtonWidget :  public QWidget, public ConfigWidget, SettingsResourceButton::Listener{
+public:
+    using ParentState = SettingsResourceCancelButton;
+
+public:
+    ~SettingsCancelButtonWidget();
+    SettingsCancelButtonWidget(QWidget& parent, SettingsResourceCancelButton& value);
+
+public: // SettingsResourceButton::Listener
+    virtual void on_change_text(const std::string& text) override;
+
+private:
+    void show_cancel_confirm_box();
+
+private:
+    SettingsResourceCancelButton& m_value;
+    SettingsResourceDownloadRow& m_row;
+    QPushButton* m_button;
+};
+
+class SettingsProgressBarWidget : public QWidget, public ConfigWidget, public SettingsResourceProgressBar::Listener{
+public:
+    using ParentState = SettingsResourceProgressBar;
+
+public:
+    ~SettingsProgressBarWidget();
+    SettingsProgressBarWidget(QWidget& parent, SettingsResourceProgressBar& value);
+
+    // Because this widget is within a table, QT doesn't respect setVisible
+    // so we need to override update_visibility and manually hide/show the progress_bar.
+    virtual void update_visibility() override;
+
+public: // SettingsResourceProgressBar::Listener
+    virtual void on_change_text(const std::string& text) override;
+    virtual void on_update_progress(uint64_t bytes_done, uint64_t total_bytes) override;
+    virtual void on_reset_progress() override;
+
+private:    
+    void update_progress_bar(int percentage);
+    void update_progress_bar(uint64_t bytes_done, uint64_t total_bytes);
+    
+private:
+    SettingsResourceProgressBar& m_value;
+    // SettingsResourceDownloadRow& m_row;
+    QLabel* m_status_label;
+    QProgressBar* m_progress_bar;
+};
+
+
+// NOTE: This does not inherit ConfigWidget, so it doesn't need to be added to StaticRegistrationQt
+class SettingsDownloadPopupWidget : public QObject, public SettingsResourceDownloadRow::Listener{
+public:
+    ~SettingsDownloadPopupWidget();
+    SettingsDownloadPopupWidget(SettingsResourceDownloadRow& row);
+
+public: // SettingsResourceDownloadRow::Listener
+    virtual void on_metadata_fetch_finished(const std::string& popup_message) override;
+
+private:
+    void show_download_confirm_box(
+        const std::string& title,
+        const std::string& message_body
+    );
+
+private:
+    // SettingsDownloadPopup& m_value;
+    SettingsResourceDownloadRow& m_row;
+    
+};
+class SettingsDownloadErrorWidget : public QWidget, public ConfigWidget, public GlobalResourceDownloadManager::Listener{
+public:
+    using ParentState = SettingsDownloadError;
+
+public:
+    ~SettingsDownloadErrorWidget();
+    SettingsDownloadErrorWidget(QWidget& parent, SettingsDownloadError& value);
+
+public: // GlobalResourceDownloadManager::Listener
+    // virtual void on_all_downloads_finished(){}
+    virtual void on_download_failed(const std::string& resource_slug) override;
+    virtual void on_exception_caught(const std::string& error_msg) override;
+
+private:
+    // show popup for download failed. Will only show 1 pop-up at a time.
+    void show_download_failed_box(const std::string& resource_slug);
+
+    // show popup for download error. Will only show 1 pop-up at a time.
+    void show_error_box(std::string error_msg);
+
+private:
+    std::atomic<bool> m_popup_is_open{false};
+
+};
+
+
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/SetupSettings.cpp b/SerialPrograms/Source/CommonFramework/SetupSettings.cpp
deleted file mode 100644
index 9d14d4341e..0000000000
--- a/SerialPrograms/Source/CommonFramework/SetupSettings.cpp
+++ /dev/null
@@ -1,142 +0,0 @@
-/*  Setup Settings
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <QFile>
-#include <QMessageBox>
-#include "Globals.h"
-#include "GlobalSettingsPanel.h"
-#include "SetupSettings.h"
-
-namespace PokemonAutomation{
-
-bool migrate_settings(Logger& logger, std::string file_name){
-    QFile root_file(QString::fromStdString(file_name));
-    QFile folder_file(QString::fromStdString(SETTINGS_PATH + file_name));
-
-    logger.log("Checking settings configuration...");
-
-    if (!root_file.exists() && !folder_file.exists()){
-        logger.log("Clean install, nothing to do.");
-        return true;
-    }
-
-    if (!root_file.exists() && folder_file.exists()){
-        logger.log("Migrated, nothing to do.");
-        return true;
-    }
-
-    if (root_file.exists() && !folder_file.exists()){
-        logger.log("Migrating root file to the folder...");
-        root_file.copy(folder_file.fileName());
-        logger.log("Renaming root file as backup...");
-        root_file.rename(root_file.fileName() + ".bak");
-        logger.log("Migrated.");
-        QMessageBox box;
-        box.setTextFormat(Qt::RichText);
-        box.information(
-            nullptr,
-            "Settings Migrated!",
-            QString::fromStdString(
-                "Detected a settings file at the old location used by version 0.29 and earlier.<br>"
-                "It has been automatically moved into the \"" + SETTINGS_PATH + "\" folder."
-            )
-        );
-        return true;
-    }
-
-    if (root_file.exists() && folder_file.exists()){
-        logger.log("Two configs detected, showing prompt...");
-        QMessageBox box;
-        box.setTextFormat(Qt::RichText);
-        box.critical(
-            nullptr,
-            "Two settings files detected!",
-            QString::fromStdString(
-                "Detected two settings files at these locations:<br><br>" +
-                root_file.fileName().toStdString() + " (versions 0.29 and older)<br>" +
-                folder_file.fileName().toStdString() + " (version 0.30)" +
-                "<br><br>This probably happened because you used an early beta of v0.30.x which created a new settings file at the new location. "
-                "Please either delete or rename the file you do not want to use."
-            )
-        );
-        return false;
-    }
-
-    return true;
-}
-
-bool migrate_stats(Logger& logger){
-    logger.log("Checking if stats should be migrated...");
-
-    std::string path = GlobalSettings::instance().STATS_FILE;
-    if (path != "PA-Stats.txt"){
-        logger.log("Stats file not at old default location. Will not attempt to migrate...");
-        return true;
-    }
-
-    const std::string new_path = GlobalSettings::instance().STATS_FILE.default_value();
-
-    QFile root_file(QString::fromStdString(path));
-    QFile folder_file(QString::fromStdString(new_path));
-
-    if (!root_file.exists() && !folder_file.exists()){
-        logger.log("Clean install, nothing to do.");
-        return true;
-    }
-
-    if (!root_file.exists() && folder_file.exists()){
-        logger.log("File migrated. Stats path in settings not updated. Updating...");
-        GlobalSettings::instance().STATS_FILE.restore_defaults();
-        return true;
-    }
-
-    if (root_file.exists() && !folder_file.exists()){
-        logger.log("Migrating root file to the folder...");
-        root_file.copy(folder_file.fileName());
-        logger.log("Renaming root file as backup...");
-        root_file.rename(root_file.fileName() + ".bak");
-        GlobalSettings::instance().STATS_FILE.restore_defaults();
-        logger.log("Migrated.");
-        QMessageBox box;
-        box.setTextFormat(Qt::RichText);
-        box.information(
-            nullptr,
-            "Settings Migrated!",
-            QString::fromStdString(
-                "Detected a stats file at the old location used by version 0.29 and earlier.<br>"
-                "It has been automatically moved into the \"" + SETTINGS_PATH + "\" folder."
-            )
-        );
-        return true;
-    }
-
-    if (root_file.exists() && folder_file.exists()){
-        logger.log("Two stats files detected, showing prompt...");
-        QMessageBox box;
-        box.setTextFormat(Qt::RichText);
-        box.critical(
-            nullptr,
-            "Two settings files detected!",
-            QString::fromStdString(
-                "Detected two stats files at these locations:<br><br>" +
-                root_file.fileName().toStdString() + " (versions 0.29 and older)<br>" +
-                folder_file.fileName().toStdString() + " (version 0.30)" +
-                "<br><br>This probably happened because you used an early beta of v0.30.x which created a new stats file at the new location. "
-                "Please either delete or rename the file you do not want to use."
-            )
-        );
-        return false;
-    }
-
-    return true;
-}
-
-
-
-
-
-
-}
diff --git a/SerialPrograms/Source/CommonFramework/SetupSettings.h b/SerialPrograms/Source/CommonFramework/SetupSettings.h
deleted file mode 100644
index 793c028c00..0000000000
--- a/SerialPrograms/Source/CommonFramework/SetupSettings.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*  Setup Settings
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_SetupSettings_H
-#define PokemonAutomation_SetupSettings_H
-
-#include <string>
-
-namespace PokemonAutomation{
-
-class Logger;
-
-
-bool migrate_settings(Logger& logger, std::string file_name);
-bool migrate_stats(Logger& logger);
-
-
-}
-#endif
diff --git a/SerialPrograms/Source/CommonFramework/Startup/NewVersionCheck.cpp b/SerialPrograms/Source/CommonFramework/Startup/NewVersionCheck.cpp
new file mode 100644
index 0000000000..0b97087853
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/Startup/NewVersionCheck.cpp
@@ -0,0 +1,277 @@
+/*  New Version Check
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <QPushButton>
+#include <QMessageBox>
+#include "Common/Cpp/Time.h"
+#include "Common/Cpp/Json/JsonObject.h"
+#include "Common/Cpp/ColoredText.h"
+#include "CommonFramework/Exceptions/OperationFailedException.h"
+#include "CommonFramework/Options/CheckForUpdatesOption.h"
+#include "CommonFramework/Tools/FileDownloader.h"
+#include "CommonFramework/Globals.h"
+#include "CommonFramework/GlobalSettingsPanel.h"
+#include "NewVersionCheck.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+
+
+static auto CHECK_FOR_UPDATES_PERIOD = std::chrono::days(1);
+
+
+struct ProgramVersion{
+    int major;
+    int minor;
+    int patch;
+    std::string version_text;
+
+    ProgramVersion(Logger& logger, const JsonObject* json){
+        if (!json->read_integer(major, "VersionMajor")){
+            throw_and_log<ParseException>(logger, "Invalid version JSON: Missing major version.");
+        }
+        if (!json->read_integer(minor, "VersionMinor")){
+            throw_and_log<ParseException>(logger, "Invalid version JSON: Missing minor version.");
+        }
+        if (!json->read_integer(patch, "VersionPatch")){
+            throw_and_log<ParseException>(logger, "Invalid version JSON: Missing patch #.");
+        }
+        version_text = std::to_string(major)
+            + "." + std::to_string(minor)
+            + "." + std::to_string(patch);
+    }
+
+    bool is_newer() const{
+        if (major > PROGRAM_VERSION_MAJOR){
+            return true;
+        }
+        if (major < PROGRAM_VERSION_MAJOR){
+            return false;
+        }
+
+        if (minor > PROGRAM_VERSION_MINOR){
+            return true;
+        }
+        if (minor < PROGRAM_VERSION_MINOR){
+            return false;
+        }
+
+        if (patch > PROGRAM_VERSION_PATCH){
+            return true;
+        }
+
+        return false;
+    }
+
+    bool show_update_nag() const{
+        if (!is_newer()){
+            return false;
+        }
+        std::string skip_version = GlobalSettings::instance().CHECK_FOR_UPDATES->SKIP_VERSION;
+        return version_text != skip_version;
+    }
+};
+
+bool compare_version(Logger& logger, const JsonObject* json){
+    if (json == nullptr){
+        logger.log("Invalid version JSON.", COLOR_RED);
+        return false;
+    }
+
+    int major;
+    int minor;
+    int patch;
+    if (!json->read_integer(major, "VersionMajor")){
+        logger.log("Invalid version JSON: Missing major version.", COLOR_RED);
+        return false;
+    }
+    if (!json->read_integer(minor, "VersionMinor")){
+        logger.log("Invalid version JSON: Missing minor version.", COLOR_RED);
+        return false;
+    }
+    if (!json->read_integer(patch, "VersionPatch")){
+        logger.log("Invalid version JSON: Missing patch #.", COLOR_RED);
+        return false;
+    }
+    std::string full_version = std::to_string(major)
+        + "." + std::to_string(minor)
+        + "." + std::to_string(patch);
+    std::string skip_version = GlobalSettings::instance().CHECK_FOR_UPDATES->SKIP_VERSION;
+    if (full_version == skip_version){
+        return false;
+    }
+
+    if (major > PROGRAM_VERSION_MAJOR){
+        return true;
+    }
+    if (major < PROGRAM_VERSION_MAJOR){
+        return false;
+    }
+
+    if (minor > PROGRAM_VERSION_MINOR){
+        return true;
+    }
+    if (minor < PROGRAM_VERSION_MINOR){
+        return false;
+    }
+
+    if (patch > PROGRAM_VERSION_PATCH){
+        return true;
+    }
+
+    return false;
+}
+std::string get_changes(const JsonObject& json){
+    const std::string* changes = json.get_string("Changes");
+    if (changes == nullptr){
+        return "";
+    }
+    return "<br><br>" + *changes;
+}
+void show_update_box(
+    const std::string& title,
+    const std::string& link_text,
+    const std::string& link_url,
+    const std::string& header,
+    const ProgramVersion& version,
+    const JsonObject& node
+){
+    QMessageBox box;
+    QPushButton* ok = box.addButton(QMessageBox::Ok);
+    QPushButton* skip = box.addButton("Skip this Version", QMessageBox::NoRole);
+    box.setEscapeButton(ok);
+//    cout << "ok = " << ok << endl;
+//    cout << "skip = " << skip << endl;
+
+    box.setTextFormat(Qt::RichText);
+    std::string text = header + "<br>";
+    text += make_text_url(link_url, link_text);
+    text += get_changes(node);
+
+
+    box.setWindowTitle(QString::fromStdString(title));
+    box.setText(QString::fromStdString(text));
+
+//    box.open();
+
+    box.exec();
+
+    QAbstractButton* clicked = box.clickedButton();
+//    cout << "clicked = " << clicked << endl;
+    if (clicked == ok){
+        return;
+    }
+    if (clicked == skip){
+        GlobalSettings::instance().CHECK_FOR_UPDATES->SKIP_VERSION.set(version.version_text);
+        return;
+    }
+
+
+//    box.information(
+//        nullptr,
+//        QString::fromStdString(title),
+//        QString::fromStdString(text)
+//    );
+}
+
+
+void check_new_version(Logger& logger){
+    bool check_release = GlobalSettings::instance().CHECK_FOR_UPDATES->RELEASE0;
+    bool check_beta = GlobalSettings::instance().CHECK_FOR_UPDATES->PUBLIC_BETA0;
+    bool check_private_beta = GlobalSettings::instance().CHECK_FOR_UPDATES->PRIVATE_BETA0;
+    bool updates_enabled = false;
+    updates_enabled |= check_release;
+    updates_enabled |= check_beta;
+    updates_enabled |= check_private_beta;
+
+    if (!updates_enabled){
+        return;
+    }
+
+    static WallClock last_version_check = WallClock::min();
+    WallClock now = current_time();
+    if (last_version_check != WallClock::min() && now - last_version_check < CHECK_FOR_UPDATES_PERIOD){
+        return;
+    }
+    last_version_check = now;
+
+    logger.log("Checking for new version...");
+    JsonValue json;
+    try{
+        //  This runs on the UI thread (panel switching / on_idle), so the
+        //  request gets a hard deadline: setTransferTimeout() only covers
+        //  data transfer, and a connection that stalls would otherwise
+        //  freeze the UI until the OS gives up on the TCP attempt.
+        json = FileDownloader::download_json_file(
+            logger,
+            "https://raw.githubusercontent.com/PokemonAutomation/ComputerControl/master/LatestVersion.json",
+            std::chrono::seconds(3)
+        );
+    }catch (OperationFailedException&){
+        return;
+    }
+    const JsonObject* obj = json.to_object();
+    if (obj == nullptr){
+        logger.log("Invalid version JSON.", COLOR_RED);
+        return;
+    }
+
+
+//    cout << json.dump() << endl;
+
+    if (check_private_beta){
+        const JsonObject* node = obj->get_object("PrivateBeta");
+        ProgramVersion latest(logger, node);
+        if (latest.show_update_nag()){
+            show_update_box(
+                "New Private Beta Available!",
+                "Download from our Discord!",
+                "https://discord.com/channels/695809740428673034/732736538965704726",
+                "A new private beta is available!",
+                latest, *node
+            );
+            return;
+        }
+    }
+    if (check_beta){
+        const JsonObject* node = obj->get_object("Beta");
+        ProgramVersion latest(logger, node);
+        if (latest.show_update_nag()){
+            show_update_box(
+                "New Beta Available!",
+                "Download here.",
+                "https://github.com/PokemonAutomation/ComputerControl/releases",
+                "A new beta is available!",
+                latest, *node
+            );
+            return;
+        }
+    }
+    if (check_release){
+        const JsonObject* node = obj->get_object("Release");
+        ProgramVersion latest(logger, node);
+        if (latest.show_update_nag()){
+            show_update_box(
+                "New Version Available!",
+                "Download here.",
+                "https://github.com/PokemonAutomation/ComputerControl/releases",
+                "A new version is available!",
+                latest, *node
+            );
+            return;
+        }
+    }
+
+}
+
+
+
+
+
+}
diff --git a/SerialPrograms/Source/CommonFramework/NewVersionCheck.h b/SerialPrograms/Source/CommonFramework/Startup/NewVersionCheck.h
similarity index 77%
rename from SerialPrograms/Source/CommonFramework/NewVersionCheck.h
rename to SerialPrograms/Source/CommonFramework/Startup/NewVersionCheck.h
index 5d761dd5ee..174a609949 100644
--- a/SerialPrograms/Source/CommonFramework/NewVersionCheck.h
+++ b/SerialPrograms/Source/CommonFramework/Startup/NewVersionCheck.h
@@ -1,6 +1,6 @@
 /*  New Version Check
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/CommonFramework/Startup/SetupSettings.cpp b/SerialPrograms/Source/CommonFramework/Startup/SetupSettings.cpp
new file mode 100644
index 0000000000..615379189d
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/Startup/SetupSettings.cpp
@@ -0,0 +1,103 @@
+/*  Setup Settings
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <iostream>
+#include <QMessageBox>
+#include <QApplication>
+#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
+#if QT_CONFIG(permissions)
+#include <QPermissions>
+#endif
+#endif
+#include "Common/Compiler.h"
+#include "Common/Cpp/Filesystem/Filesystem.h"
+#include "Common/Cpp/Logging/AbstractLogger.h"
+#include "CommonFramework/GlobalAutoPaths.h"
+#include "SetupSettings.h"
+
+using std::cout;
+using std::endl;
+
+namespace PokemonAutomation{
+
+void set_permissions(QObject& object){
+    (void)object;
+#if defined(__APPLE__)
+#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
+#if QT_CONFIG(permissions)
+    cout << "Checking MacOS Permissions..." << endl;
+    QCameraPermission camera_permission;
+    switch(qApp->checkPermission(camera_permission)){
+    case Qt::PermissionStatus::Undetermined:
+        cout << "Camera permission undetermined" << endl;
+        qApp->requestPermission(camera_permission, &object, [](const QPermission& permission){
+            cout << "camera request is ready!" << endl;
+        });
+        cout << "Requested Camera permission" << endl;
+        break;
+    case Qt::PermissionStatus::Denied:
+        cout << "No camera permission found" << endl;
+        qApp->requestPermission(camera_permission, &object, [](const QPermission& permission){
+            cout << "camera request is ready!" << endl;
+        });
+        cout << "Requested Camera permission" << endl;
+        break;
+    case Qt::PermissionStatus::Granted:
+        cout << "Camera permission granted" << endl;
+        break;
+    }
+
+    QMicrophonePermission microphone_permission;
+    switch(qApp->checkPermission(microphone_permission)){
+    case Qt::PermissionStatus::Undetermined:
+        cout << "Microphone permission undetermined" << endl;
+        qApp->requestPermission(microphone_permission, &object, [](const QPermission& permission){
+            cout << "Microphone request is ready!" << endl;
+        });
+        cout << "Requested microphone permission" << endl;
+        break;
+    case Qt::PermissionStatus::Denied:
+        cout << "No microphone permission found" << endl;
+        qApp->requestPermission(microphone_permission, &object, [](const QPermission& permission){
+            cout << "Microphone request is ready!" << endl;
+        });
+        cout << "Requested microphone permission" << endl;
+        break;
+    case Qt::PermissionStatus::Granted:
+        cout << "Microphone permission granted" << endl;
+        break;
+    }
+#endif
+#endif
+#endif
+}
+
+
+bool check_resource_folder(Logger& logger){
+    if (Filesystem::exists(Filesystem::Path(RESOURCE_PATH()))){
+        logger.log("Found Resource folder at " + RESOURCE_PATH());
+        return true;
+    }
+    logger.log("No Resources/ folder at " + RESOURCE_PATH());
+    QMessageBox box;
+    box.setTextFormat(Qt::RichText);
+    box.critical(
+        nullptr,
+        "No Resources Folder!",
+        QString::fromStdString(
+            "No Resources Folder:<br><br>"
+            "Make sure you download Resources folder from latest release at<br>"
+            "https://github.com/PokemonAutomation/ComputerControl/releases/<br><br>"
+            "The Resources folder is part of PA-SerialPrograms-[VERSION]-[DATE].zip<br><br>"
+            "Extract the Resources folder from the zip file and place it at following path:<br><br>" + RESOURCE_PATH()
+        )
+    );
+    return false;
+}
+
+
+
+}
diff --git a/SerialPrograms/Source/CommonFramework/Startup/SetupSettings.h b/SerialPrograms/Source/CommonFramework/Startup/SetupSettings.h
new file mode 100644
index 0000000000..b9e41d2baf
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/Startup/SetupSettings.h
@@ -0,0 +1,27 @@
+/*  Setup Settings
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_SetupSettings_H
+#define PokemonAutomation_SetupSettings_H
+
+#include <string>
+
+class QObject;
+
+namespace PokemonAutomation{
+
+class Logger;
+
+// Use Qt to setup permissions of cameras and microphones on macOS.
+// See https://www.qt.io/blog/permission-apis-in-qt-6.5
+void set_permissions(QObject& object);
+
+// Return true if there is the required Resources/ folder.
+// When the folder is missing, it will also pop a critical error message box
+bool check_resource_folder(Logger& logger);
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/StaticGlobals.cpp b/SerialPrograms/Source/CommonFramework/StaticGlobals.cpp
new file mode 100644
index 0000000000..4ef8048fc6
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/StaticGlobals.cpp
@@ -0,0 +1,101 @@
+/*  Static Globals
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <set>
+#include "Common/Cpp/Json/JsonValue.h"
+#include "Common/Cpp/Json/JsonObject.h"
+#include "Common/Cpp/Cryptography/SHA256.h"
+#include "StaticGlobals.h"
+
+#ifdef PA_OFFICIAL
+#include "../../Internal/SerialPrograms/InternalDeveloper.h"
+#endif
+
+namespace PokemonAutomation{
+
+
+
+const std::set<std::string> TOKENS{
+    // new tokens - post regular/internal dev mode split
+    "4478663b6c92cb7eccd19131dce1c9a0f3fc113d9d21d87d602516c92756fc73",
+
+
+    // old tokens
+//    "f6538243092d8a3b9959bca988f054e1670f57c7246df2cbba25c4df3fe7a4e7",
+    "2d04af67f6520e3550842d7eeb292868c6d0d4809b607f5a454712023d8815e1",
+    "475d0a0a305a02cbf8b602bd47c3b275dccd5ac19fbe480729804a8e4e360b71",
+    "6643d9fe87b3e54dc75dfac8ac22f0cc8bd17f6a8a786debf5fc4c517ee65469",
+    "8e48e38e49bffc8462ada9d2d9d850d5b3b5c9529d20978c09bc548bc9a614a4",
+    "7694adee4419d62c6a923c4efc9e7b41def7b96bb84ea882701b0bf2e8c13bee",
+    "e8d168bc482e96553ea9f9ecaea5a817474dbccc2a6a228a6bde67f2b2aa2889", //  James' token.
+    "c8ff3102de1a8b773121bcca242e2a252f09b126cca22eb2400d603c8b9a8957", //  jw's token.
+    "7555b7c63481cad42306718c67e7f9def5bfd1da8f6cd299ccd3d7dc95f307ae", //  Kuro's token.
+    "3d475b46d121fc24559d100de2426feaa53cd6578aac2817c4857a610ccde2dd", //  kichi's token.
+    "9b41db8175b5f248a78e738c7bd63a36e33b57953cb4e80ccdd13c2a7e892eec", //  Dalton's token.
+};
+
+
+
+
+
+void StaticGlobals::load_json(const JsonValue& json){
+    const JsonObject* obj = json.to_object();
+    if (obj == nullptr){
+        return;
+    }
+
+    //  Naughty mode.
+    obj->read_boolean(NAUGHTY_MODE, "NAUGHTY_MODE");
+
+    //  Developer mode stuff.
+    const std::string* dev_token = obj->get_string("DEVELOPER_TOKEN");
+    if (dev_token){
+        SHA256 hash;
+        hash.push(dev_token->c_str(), dev_token->size());
+        hash.finish();
+        hash.get_hash_hex();
+
+        std::string str = hash.get_hash_hex();
+        DEVELOPER_MODE = TOKENS.find(str) != TOKENS.end();
+#ifdef PA_OFFICIAL
+        process_internal_dev(str);
+#endif
+    }
+
+    const JsonObject* debug_obj = obj->get_object("DEBUG");
+    if (debug_obj){
+        debug_obj->read_boolean(COLOR_CHECK, "COLOR_CHECK");
+        debug_obj->read_boolean(IMAGE_TEMPLATE_MATCHING, "IMAGE_TEMPLATE_MATCHING");
+        debug_obj->read_boolean(IMAGE_DICTIONARY_MATCHING, "IMAGE_DICTIONARY_MATCHING");
+        debug_obj->read_integer(BOX_SYSTEM_CELL_ROW, "BOX_SYSTEM_CELL_ROW");
+        debug_obj->read_integer(BOX_SYSTEM_CELL_COL, "BOX_SYSTEM_CELL_COL");
+        debug_obj->read_boolean(GENERATE_TEST_GOLDEN_FILES, "GENERATE_TEST_GOLDEN_FILES");
+        debug_obj->read_boolean(PADDLE_OCR_DEBUG, "PADDLE_OCR_DEBUG");
+        debug_obj->read_boolean(PADDLE_OCR_DEBUG_IMAGE, "PADDLE_OCR_DEBUG_IMAGE");
+    }
+}
+JsonValue StaticGlobals::to_json_debug() const{
+    JsonObject debug_obj;
+    debug_obj["COLOR_CHECK"] = COLOR_CHECK;
+    debug_obj["IMAGE_TEMPLATE_MATCHING"] = IMAGE_TEMPLATE_MATCHING;
+    debug_obj["IMAGE_DICTIONARY_MATCHING"] = IMAGE_DICTIONARY_MATCHING;
+    debug_obj["BOX_SYSTEM_CELL_ROW"] = BOX_SYSTEM_CELL_ROW;
+    debug_obj["BOX_SYSTEM_CELL_COL"] = BOX_SYSTEM_CELL_COL;
+    debug_obj["GENERATE_TEST_GOLDEN_FILES"] = GENERATE_TEST_GOLDEN_FILES;
+    debug_obj["PADDLE_OCR_DEBUG"] = PADDLE_OCR_DEBUG;
+    debug_obj["PADDLE_OCR_DEBUG_IMAGE"] = PADDLE_OCR_DEBUG_IMAGE;
+    return debug_obj;
+}
+
+
+
+StaticGlobals STATIC_GLOBALS;
+
+
+
+
+
+}
diff --git a/SerialPrograms/Source/CommonFramework/StaticGlobals.h b/SerialPrograms/Source/CommonFramework/StaticGlobals.h
new file mode 100644
index 0000000000..ee0870f75f
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/StaticGlobals.h
@@ -0,0 +1,72 @@
+/*  Static Globals
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_StaticGlobals_H
+#define PokemonAutomation_StaticGlobals_H
+
+#include <stdint.h>
+
+namespace PokemonAutomation{
+
+class JsonValue;
+
+
+//
+//  These are settings that are needed very early in the boot process.
+//  These do not come with UI and are loaded/saved manually (if required).
+//
+
+class StaticGlobals{
+public:
+    void load_json(const JsonValue& json);
+    JsonValue to_json_debug() const;
+
+public:
+    bool NAUGHTY_MODE = false;
+    bool DEVELOPER_MODE = false;
+    bool INTERNAL_DEVELOPER_MODE = false;
+
+
+    // Debug color stats like those in:
+    // - CommonFramework/ImageTools/ImageStats.cpp
+    bool COLOR_CHECK = false;
+    // Debug image tempalte matching like those in:
+    // - CommonTools/ImageMatch/WaterfillTemplateMatcher.cpp
+    bool IMAGE_TEMPLATE_MATCHING = false;
+    // Debug image dictionary matching like those in:
+    // - CommonTools/ImageMatch/CroppedImageDictionaryMatcher.cpp
+    bool IMAGE_DICTIONARY_MATCHING = false;
+    // Debug box system detection to only debug on a box cell at row:
+    // - SerialPrograms/Source/PokemonLZA/Inference/Boxes/PokemonLZA_BoxDetection.cpp
+    int8_t BOX_SYSTEM_CELL_ROW = -1;
+    // Debug box system detection to only debug on a box cell at col:
+    // - SerialPrograms/Source/PokemonLZA/Inference/Boxes/PokemonLZA_BoxDetection.cpp
+    // - SerialPrograms/Source/PokemonLZA/Inference/PokemonLZA_OverworldPartySelectionDetector.cpp
+    int8_t BOX_SYSTEM_CELL_COL = -1;
+    // A golden file is a file in software testing that contains the exact, expected output of the
+    // test code.
+    // If true, this bool changes some test functions' behavior from running the tests against golden
+    // files to generating golden files by writing detection outputs into them.
+    // This switch is useful for making tests for lots of detections on an image, e.g. menu item name
+    // OCR or outbreak/event detection on a map. It is time consuming and error-prone to write each
+    // expected result into a file manually. Instead, run the detection code to generate golden files
+    // then manually inspect to fix any errors.
+    bool GENERATE_TEST_GOLDEN_FILES = false;
+
+    bool PADDLE_OCR_DEBUG = false;
+
+    bool PADDLE_OCR_DEBUG_IMAGE = false;
+
+
+};
+
+
+extern StaticGlobals STATIC_GLOBALS;
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/Tools/BlackBorderCheck.cpp b/SerialPrograms/Source/CommonFramework/Tools/BlackBorderCheck.cpp
deleted file mode 100644
index 7966b16aaa..0000000000
--- a/SerialPrograms/Source/CommonFramework/Tools/BlackBorderCheck.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-/*  Black Border Check
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Cpp/Exceptions.h"
-#include "CommonFramework/ImageTypes/ImageRGB32.h"
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
-#include "CommonFramework/Tools/ConsoleHandle.h"
-#include "CommonFramework/Inference/BlackBorderDetector.h"
-#include "BlackBorderCheck.h"
-
-namespace PokemonAutomation{
-
-
-void start_program_video_check(ConsoleHandle& console, FeedbackType feedback){
-    if (feedback == FeedbackType::NONE){
-        return;
-    }
-
-    VideoSnapshot screen = console.video().snapshot();
-
-    if (!screen){
-        if (feedback == FeedbackType::REQUIRED){
-            throw UserSetupError(console, "This program requires video feedback. Please make sure the video is working.");
-        }
-        return;
-    }
-
-    BlackBorderDetector detector;
-    VideoOverlaySet set(console);
-    detector.make_overlays(set);
-
-    if (detector.detect(screen)){
-        throw UserSetupError(console, "Black border detected! Please set your screen size to 100% in the TV Settings on your Nintendo Switch.");
-    }
-}
-void start_program_video_check(FixedLimitVector<ConsoleHandle>& consoles, FeedbackType feedback){
-    for (ConsoleHandle& console : consoles){
-        start_program_video_check(console, feedback);
-    }
-}
-
-
-
-}
diff --git a/SerialPrograms/Source/CommonFramework/Tools/BlackBorderCheck.h b/SerialPrograms/Source/CommonFramework/Tools/BlackBorderCheck.h
deleted file mode 100644
index a4028df4d8..0000000000
--- a/SerialPrograms/Source/CommonFramework/Tools/BlackBorderCheck.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*  Black Border Check
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_CommonFramework_BlackBorderCheck_H
-#define PokemonAutomation_CommonFramework_BlackBorderCheck_H
-
-#include "Common/Cpp/Containers/FixedLimitVector.h"
-#include "CommonFramework/Globals.h"
-
-namespace PokemonAutomation{
-
-class ConsoleHandle;
-
-
-void start_program_video_check(ConsoleHandle& console, FeedbackType feedback);
-void start_program_video_check(FixedLimitVector<ConsoleHandle>& consoles, FeedbackType feedback);
-
-
-}
-#endif
diff --git a/SerialPrograms/Source/CommonFramework/Tools/BotBaseHandle.cpp b/SerialPrograms/Source/CommonFramework/Tools/BotBaseHandle.cpp
deleted file mode 100644
index 0c863c9d71..0000000000
--- a/SerialPrograms/Source/CommonFramework/Tools/BotBaseHandle.cpp
+++ /dev/null
@@ -1,401 +0,0 @@
-/*  Bot-Base Wrapper Handle
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <QtGlobal>
-#include <QMessageBox>
-#include "Common/Cpp/PrettyPrint.h"
-#include "Common/Cpp/Exceptions.h"
-#include "Common/Cpp/PanicDump.h"
-#include "Common/Cpp/Concurrency/SpinPause.h"
-#include "Common/Cpp/Options/TimeExpressionOption.h"
-#include "Common/Microcontroller/DeviceRoutines.h"
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-#include "ClientSource/Libraries/MessageConverter.h"
-#include "ClientSource/Connection/SerialConnection.h"
-#include "ClientSource/Connection/PABotBase.h"
-#include "CommonFramework/Globals.h"
-#include "CommonFramework/Options/Environment/ThemeSelectorOption.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Device.h"
-#include "BotBaseHandle.h"
-
-//#include <iostream>
-//using std::cout;
-//using std::endl;
-
-namespace PokemonAutomation{
-
-
-BotBaseHandle::BotBaseHandle(
-    SerialLogger& logger,
-    const QSerialPortInfo* port,
-    PABotBaseLevel minimum_pabotbase
-)
-    : m_logger(logger)
-    , m_port(port)
-    , m_minimum_pabotbase(minimum_pabotbase)
-    , m_current_pabotbase(PABotBaseLevel::NOT_PABOTBASE)
-    , m_state(State::NOT_CONNECTED)
-    , m_allow_user_commands(true)
-    , m_label("<font color=\"red\">Not Connected</font>")
-{
-    reset(port);
-}
-BotBaseHandle::~BotBaseHandle(){
-    stop();
-    m_botbase.reset();
-    m_state.store(State::NOT_CONNECTED, std::memory_order_release);
-    emit on_not_connected("");
-}
-
-BotBase* BotBaseHandle::botbase(){
-    BotBase* ret = m_botbase.get();
-    if (ret == nullptr){
-        m_logger.log("BotBaseHandle::botbase() called with null botbase...", COLOR_RED);
-    }
-    return ret;
-}
-
-BotBaseHandle::State BotBaseHandle::state() const{
-    return m_state.load(std::memory_order_acquire);
-}
-bool BotBaseHandle::accepting_commands() const{
-    return state() == State::READY &&
-        m_current_pabotbase.load(std::memory_order_acquire) > PABotBaseLevel::NOT_PABOTBASE;
-}
-std::string BotBaseHandle::label() const{
-    std::lock_guard<std::mutex> lg(m_lock);
-    return m_label;
-}
-
-void BotBaseHandle::set_allow_user_commands(bool allow){
-    m_allow_user_commands.store(allow, std::memory_order_release);
-}
-
-const char* BotBaseHandle::check_accepting_commands(){
-    //  Must call under the lock.
-    if (state() != State::READY){
-        return "Console is not accepting commands right now.";
-    }
-    if (m_current_pabotbase.load(std::memory_order_acquire) <= PABotBaseLevel::NOT_PABOTBASE){
-        return "Device is not running PABotBase.";
-    }
-    if (!m_allow_user_commands.load(std::memory_order_acquire)){
-        return "Handle is not accepting commands right now.";
-    }
-    return nullptr;
-}
-const char* BotBaseHandle::try_reset(){
-    std::unique_lock<std::mutex> lg(m_lock, std::defer_lock);
-    if (!lg.try_lock()){
-        return "Console is busy.";
-    }
-    if (state() != State::READY){
-        return "Console is not accepting commands right now.";
-    }
-    if (!m_allow_user_commands.load(std::memory_order_acquire)){
-        return "Cannot reset while a program is running.";
-    }
-    reset_unprotected(m_port);
-    return nullptr;
-}
-const char* BotBaseHandle::try_send_request(const BotBaseRequest& request){
-    std::unique_lock<std::mutex> lg(m_lock, std::defer_lock);
-    if (!lg.try_lock()){
-        return "Console is busy.";
-    }
-    const char* error = check_accepting_commands();
-    if (error){
-        return error;
-    }
-    if (!botbase()->try_issue_request(request)){
-        return "Command dropped.";
-    }
-    return nullptr;
-}
-const char* BotBaseHandle::try_stop_commands(){
-    std::unique_lock<std::mutex> lg(m_lock, std::defer_lock);
-    if (!lg.try_lock()){
-        return "Console is busy.";
-    }
-    const char* error = check_accepting_commands();
-    if (error){
-        return error;
-    }
-    if (!botbase()->try_stop_all_commands()){
-        return "Command dropped.";
-    }
-    return nullptr;
-}
-const char* BotBaseHandle::try_next_interrupt(){
-    std::unique_lock<std::mutex> lg(m_lock, std::defer_lock);
-    if (!lg.try_lock()){
-        return "Console is busy.";
-    }
-    const char* error = check_accepting_commands();
-    if (error){
-        return error;
-    }
-    if (!botbase()->try_next_command_interrupt()){
-        return "Command dropped.";
-    }
-    return nullptr;
-}
-
-void BotBaseHandle::stop_unprotected(){
-    {
-        State state = m_state.load(std::memory_order_acquire);
-        if (state == State::NOT_CONNECTED){
-            return;
-        }
-        if (state == State::SHUTDOWN){
-            while (m_state.load(std::memory_order_acquire) != State::NOT_CONNECTED){
-                pause();
-            }
-            return;
-        }
-
-        m_state.store(State::SHUTDOWN, std::memory_order_release);
-        emit on_stopped("");
-        m_botbase->stop();
-
-        std::lock_guard<std::mutex> lg(m_sleep_lock);
-        m_cv.notify_all();
-    }
-
-    if (m_status_thread.joinable()){
-        m_status_thread.join();
-    }
-
-    m_state.store(State::NOT_CONNECTED, std::memory_order_release);
-    m_label = "<font color=\"red\">Not Connected</font>";
-    emit on_not_connected("");
-}
-void BotBaseHandle::reset_unprotected(const QSerialPortInfo* port){
-    using namespace PokemonAutomation;
-
-    stop_unprotected();
-    if (port == nullptr || port->isNull()){
-        return;
-    }
-
-    std::string name = port->systemLocation().toUtf8().data();
-    std::string error;
-
-
-    if (port->description().indexOf("Prolific") != -1){
-        QMessageBox box;
-        box.critical(
-            nullptr,
-            "Error",
-            "Cannot select Prolific controller.<br><br>"
-            "Prolific controllers do not work for Arduino and similar microntrollers.<br>"
-            "You were warned of this in the setup instructions. Please buy a CP210x controller instead."
-        );
-        std::string text = "Cannot connect to Prolific controller.";
-        m_logger.log(text, COLOR_RED);
-        m_label = html_color_text(text, COLOR_RED);
-        emit on_not_connected(m_label);
-        return;
-    }
-
-    try{
-        std::unique_ptr<SerialConnection> connection(new SerialConnection(name, PABB_BAUD_RATE));
-        m_botbase.reset(new PABotBase(m_logger, std::move(connection), nullptr));
-        m_current_pabotbase.store(PABotBaseLevel::NOT_PABOTBASE, std::memory_order_release);
-    }catch (const ConnectionException& e){
-        error = e.message();
-    }catch (const SerialProtocolException& e){
-        error = e.message();
-    }catch (const ProgramCancelledException& e){
-        error = e.message();
-    }
-    if (error.empty()){
-        m_state.store(State::CONNECTING, std::memory_order_release);
-        m_label = "<font color=\"green\">Connecting...</font>";
-        emit on_connecting(name);
-    }else{
-        m_label = html_color_text("Unable to open port.", COLOR_RED);
-        emit on_not_connected(m_label);
-//        m_logger.log(error, Color());
-        return;
-    }
-
-    m_status_thread = std::thread(run_with_catch, "BotBaseHandle::thread_body()", [this]{ thread_body(); });
-}
-
-void BotBaseHandle::stop(){
-    std::lock_guard<std::mutex> lg(m_lock);
-    stop_unprotected();
-}
-void BotBaseHandle::reset(const QSerialPortInfo* port){
-    std::lock_guard<std::mutex> lg(m_lock);
-    reset_unprotected(port);
-}
-
-
-void BotBaseHandle::verify_protocol(){
-    uint32_t protocol = Microcontroller::protocol_version(*m_botbase);
-    uint32_t version_hi = protocol / 100;
-    uint32_t version_lo = protocol % 100;
-    if (version_hi != PABB_PROTOCOL_VERSION / 100 || version_lo < PABB_PROTOCOL_VERSION % 100){
-        throw SerialProtocolException(
-            m_logger, PA_CURRENT_FUNCTION,
-            "Incompatible version. Client: " + std::to_string(PABB_PROTOCOL_VERSION) + ", Device: " + std::to_string(protocol) + "<br>"
-            "Please install the .hex that came with this version of the program."
-        );
-    }
-}
-uint8_t BotBaseHandle::verify_pabotbase(){
-    using namespace PokemonAutomation;
-
-    uint8_t program_id = Microcontroller::program_id(*m_botbase);
-    PABotBaseLevel type = program_id_to_botbase_level(program_id);
-    m_current_pabotbase.store(type, std::memory_order_release);
-    if (type < m_minimum_pabotbase){
-        throw SerialProtocolException(
-            m_logger, PA_CURRENT_FUNCTION,
-            "PABotBase level not met. (" + program_name(program_id) + ")"
-        );
-    }
-    return program_id;
-}
-void BotBaseHandle::thread_body(){
-    using namespace PokemonAutomation;
-
-    m_botbase->set_sniffer(&m_logger);
-
-    //  Connect
-    {
-        std::string error;
-        try{
-            m_botbase->connect();
-        }catch (InvalidConnectionStateException&){
-            m_botbase->stop();
-            m_label = "";
-            emit on_stopped("");
-            return;
-        }catch (SerialProtocolException& e){
-            error = e.message();
-        }catch (ConnectionException& e){
-            error = e.message();
-        }
-        if (!error.empty()){
-            m_botbase->stop();
-            m_label = html_color_text(error, COLOR_RED);
-            emit on_stopped(m_label);
-            return;
-        }
-    }
-
-    //  Check protocol and version.
-    {
-        uint8_t program_id = 0;
-        uint32_t version = 0;
-        std::string error;
-        try{
-            verify_protocol();
-            program_id = verify_pabotbase();
-            version = Microcontroller::program_version(*m_botbase);
-        }catch (InvalidConnectionStateException&){
-            return;
-        }catch (SerialProtocolException& e){
-            error = e.message();
-        }catch (ConnectionException& e){
-            error = e.message();
-        }
-        if (error.empty()){
-            m_state.store(State::READY, std::memory_order_release);
-            std::string text = "Program: " + program_name(program_id) + " (" + std::to_string(version) + ")";
-            m_label = html_color_text(text, theme_friendly_darkblue());
-            emit on_ready(m_label);
-        }else{
-            m_state.store(State::STOPPED, std::memory_order_release);
-            m_label = html_color_text(error, COLOR_RED);
-            emit on_stopped(m_label);
-            m_botbase->stop();
-            return;
-        }
-    }
-
-    //  Stop pending commands.
-    m_botbase->stop_all_commands();
-
-    std::thread watchdog([this]{
-        while (true){
-            if (m_state.load(std::memory_order_acquire) != State::READY){
-                break;
-            }
-
-            auto last = current_time() - m_botbase->last_ack();
-            std::chrono::duration<double> seconds = last;
-            if (last > 2 * SERIAL_REFRESH_RATE){
-                std::string text = "Last Ack: " + tostr_fixed(seconds.count(), 3) + " seconds ago";
-                emit uptime_status(html_color_text(text, COLOR_RED));
-//                m_logger.log("Connection issue detected. Turning on all logging...");
-//                settings.log_everything.store(true, std::memory_order_release);
-            }
-
-            std::unique_lock<std::mutex> lg(m_sleep_lock);
-            if (m_state.load(std::memory_order_acquire) != State::READY){
-                break;
-            }
-            m_cv.wait_for(lg, SERIAL_REFRESH_RATE);
-        }
-    });
-
-    BotBaseContext context(*m_botbase);
-    while (true){
-        if (m_state.load(std::memory_order_acquire) != State::READY){
-            break;
-        }
-
-        std::string str;
-        std::string error;
-        try{
-//            cout << "system_clock()" << endl;
-            uint32_t wallclock = NintendoSwitch::system_clock(context);
-//            cout << "system_clock() - done" << endl;
-            str = ticks_to_time(TICKS_PER_SECOND, wallclock);
-        }catch (InvalidConnectionStateException&){
-            break;
-        }catch (SerialProtocolException& e){
-            error = e.message();
-        }catch (ConnectionException& e){
-            error = e.message();
-        }
-        if (error.empty()){
-            std::string text = "Up Time: " + str;
-            emit uptime_status(html_color_text(text, theme_friendly_darkblue()));
-        }else{
-            emit uptime_status(html_color_text(error, COLOR_RED));
-            error.clear();
-            std::lock_guard<std::mutex> lg(m_lock);
-            State state = m_state.load(std::memory_order_acquire);
-            if (state == State::READY){
-                m_state.store(State::ERRORED, std::memory_order_release);
-            }
-            break;
-        }
-
-//        cout << "lock()" << endl;
-        std::unique_lock<std::mutex> lg(m_sleep_lock);
-//        cout << "lock() - done" << endl;
-        if (m_state.load(std::memory_order_acquire) != State::READY){
-            break;
-        }
-        m_cv.wait_for(lg, SERIAL_REFRESH_RATE);
-    }
-
-    {
-        std::unique_lock<std::mutex> lg(m_sleep_lock);
-        m_cv.notify_all();
-    }
-    watchdog.join();
-}
-
-
-
-}
diff --git a/SerialPrograms/Source/CommonFramework/Tools/BotBaseHandle.h b/SerialPrograms/Source/CommonFramework/Tools/BotBaseHandle.h
deleted file mode 100644
index 27c4d6689f..0000000000
--- a/SerialPrograms/Source/CommonFramework/Tools/BotBaseHandle.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/*  Bot-Base Wrapper Handle
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_CommonFramework_BotBaseHandle_H
-#define PokemonAutomation_CommonFramework_BotBaseHandle_H
-
-#include <memory>
-#include <mutex>
-#include <condition_variable>
-#include <thread>
-#include <QObject>
-#include <QSerialPortInfo>
-#include "CommonFramework/ControllerDevices/SerialPortGlobals.h"
-#include "ClientSource/Connection/BotBase.h"
-#include "ClientSource/Connection/MessageLogger.h"
-
-namespace PokemonAutomation{
-
-class MessageSniffer;
-class PABotBase;
-
-
-class BotBaseHandle : public QObject{
-    Q_OBJECT
-public:
-    enum class State{
-        NOT_CONNECTED,  //  Connection doesn't exist.
-        CONNECTING,     //  Connection exists, but not ready.
-        READY,          //  Connection exists and ready to use.
-        ERRORED,
-        STOPPED,        //  Connection exists, but has been stopped.
-        SHUTDOWN,       //  Connection is in the process of being destroyed.
-    };
-
-public:
-    //  Must call on main thread.
-    BotBaseHandle(
-        SerialLogger& logger,
-        const QSerialPortInfo* port,
-        PABotBaseLevel minimum_pabotbase
-    );
-    ~BotBaseHandle();
-
-    void stop();
-    void reset(const QSerialPortInfo* port);
-
-    void set_allow_user_commands(bool allow);
-
-public:
-    //  Not thread-safe with stop() or reset(). The returned pointer
-    //  will only be valid until the next call to stop()/reset().
-    BotBase* botbase();
-
-    //  Safe to call anywhere anytime. If called asynchronously with
-    //  stop()/reset(), the result may be immediately out-of-date.
-    State state() const;
-    bool accepting_commands() const;
-
-    std::string label() const;
-    std::string status() const;
-    PABotBaseLevel min_pabotbase() const{ return m_minimum_pabotbase; }
-
-public:
-    //  Async external requests. (typically from integration commands)
-    //  Thread-safe with stop()/reset(). These may drop.
-    const char* try_reset();
-    const char* try_send_request(const BotBaseRequest& request);
-    const char* try_stop_commands();
-    const char* try_next_interrupt();
-
-signals:
-    void on_not_connected(std::string error);
-    void on_connecting(const std::string& port_name);
-    void on_ready(std::string description);
-    void on_stopped(std::string error);
-
-    void uptime_status(std::string status);
-
-private:
-    const char* check_accepting_commands();
-
-    void stop_unprotected();
-    void reset_unprotected(const QSerialPortInfo* port);
-
-    void verify_protocol();
-    uint8_t verify_pabotbase();
-    void thread_body();
-
-
-private:
-    SerialLogger& m_logger;
-
-    const QSerialPortInfo* m_port;
-    PABotBaseLevel m_minimum_pabotbase;
-    std::atomic<PABotBaseLevel> m_current_pabotbase;
-    std::atomic<State> m_state;
-    std::atomic<bool> m_allow_user_commands;
-
-    std::string m_label;
-
-    std::thread m_status_thread;
-    std::unique_ptr<PABotBase> m_botbase;
-    mutable std::mutex m_lock;
-    std::mutex m_sleep_lock;
-    std::condition_variable m_cv;
-};
-
-
-
-}
-#endif
diff --git a/SerialPrograms/Source/CommonFramework/Tools/ConsoleHandle.cpp b/SerialPrograms/Source/CommonFramework/Tools/ConsoleHandle.cpp
deleted file mode 100644
index eed57b590a..0000000000
--- a/SerialPrograms/Source/CommonFramework/Tools/ConsoleHandle.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-/*  Console Handle
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/VideoPipeline/VideoOverlay.h"
-#include "CommonFramework/VideoPipeline/Stats/ThreadUtilizationStats.h"
-#include "CommonFramework/InferenceInfra/VisualInferencePivot.h"
-#include "CommonFramework/InferenceInfra/AudioInferencePivot.h"
-#include "ConsoleHandle.h"
-
-//#include <iostream>
-//using std::cout;
-//using std::endl;
-
-namespace PokemonAutomation{
-
-
-ConsoleHandle::ConsoleHandle(ConsoleHandle&& x) = default;
-ConsoleHandle::~ConsoleHandle(){
-    m_overlay.remove_stat(*m_audio_pivot);
-    m_overlay.remove_stat(*m_video_pivot);
-    m_overlay.remove_stat(*m_thread_utilization);
-}
-
-
-ConsoleHandle::ConsoleHandle(
-    size_t index,
-    Logger& logger,
-//    ThreadHandle& handle,
-    BotBase* botbase,
-    VideoFeed& video,
-    VideoOverlay& overlay,
-    AudioFeed& audio
-)
-    : m_index(index)
-    , m_logger(logger)
-    , m_botbase(botbase)
-    , m_video(video)
-    , m_overlay(overlay)
-    , m_audio(audio)
-    , m_thread_utilization(new ThreadUtilizationStat(current_thread_handle(), "Program Thread:"))
-{
-    m_overlay.add_stat(*m_thread_utilization);
-}
-
-void ConsoleHandle::initialize_inference_threads(CancellableScope& scope, AsyncDispatcher& dispatcher){
-    m_video_pivot = std::make_unique<VisualInferencePivot>(scope, m_video, dispatcher);
-    m_audio_pivot = std::make_unique<AudioInferencePivot>(scope, m_audio, dispatcher);
-    m_overlay.add_stat(*m_video_pivot);
-    m_overlay.add_stat(*m_audio_pivot);
-}
-
-
-
-
-}
diff --git a/SerialPrograms/Source/CommonFramework/Tools/ConsoleHandle.h b/SerialPrograms/Source/CommonFramework/Tools/ConsoleHandle.h
deleted file mode 100644
index 32b105ce03..0000000000
--- a/SerialPrograms/Source/CommonFramework/Tools/ConsoleHandle.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/*  Console Handle
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_ConsoleHandle_H
-#define PokemonAutomation_ConsoleHandle_H
-
-#include <memory>
-#include "Common/Cpp/AbstractLogger.h"
-
-namespace PokemonAutomation{
-
-class CancellableScope;
-class AsyncDispatcher;
-class ThreadHandle;
-class BotBase;
-class VideoFeed;
-class VideoOverlay;
-class AudioFeed;
-class ThreadUtilizationStat;
-class VisualInferencePivot;
-class AudioInferencePivot;
-
-
-class ConsoleHandle{
-public:
-    ConsoleHandle(ConsoleHandle&& x);
-    void operator=(ConsoleHandle&& x) = delete;
-    ConsoleHandle(const ConsoleHandle& x) = delete;
-    void operator=(const ConsoleHandle& x) = delete;
-    ~ConsoleHandle();
-
-public:
-    ConsoleHandle(
-        size_t index,
-        Logger& logger,
-//        ThreadHandle& handle,
-        BotBase* botbase,
-        VideoFeed& video,
-        VideoOverlay& overlay,
-        AudioFeed& audio
-    );
-
-    // log(string-like msg, Color color = Color())
-    // string-like can be const char* or std::string
-    template <class... Args>
-    void log(Args&&... args){
-        m_logger.log(std::forward<Args>(args)...);
-    }
-
-    size_t index() const{ return m_index; }
-
-    Logger& logger(){ return m_logger; }
-    BotBase& botbase(){ return *m_botbase; }
-    VideoFeed& video(){ return m_video; }
-    VideoOverlay& overlay(){ return m_overlay; }
-    AudioFeed& audio(){ return m_audio; }
-
-    operator Logger&(){ return m_logger; }
-    operator VideoFeed&(){ return m_video; }
-    operator VideoOverlay&(){ return m_overlay; }
-    operator AudioFeed&() { return m_audio; }
-
-    VisualInferencePivot& video_inference_pivot(){ return *m_video_pivot; }
-    AudioInferencePivot& audio_inference_pivot(){ return *m_audio_pivot; }
-
-
-public:
-    void initialize_inference_threads(CancellableScope& scope, AsyncDispatcher& dispatcher);
-
-private:
-    size_t m_index;
-    Logger& m_logger;
-    BotBase* m_botbase;
-    VideoFeed& m_video;
-    VideoOverlay& m_overlay;
-    AudioFeed& m_audio;
-    std::unique_ptr<ThreadUtilizationStat> m_thread_utilization;
-    std::unique_ptr<VisualInferencePivot> m_video_pivot;
-    std::unique_ptr<AudioInferencePivot> m_audio_pivot;
-};
-
-
-
-
-
-}
-#endif
-
-
diff --git a/SerialPrograms/Source/CommonFramework/Tools/DebugDumper.cpp b/SerialPrograms/Source/CommonFramework/Tools/DebugDumper.cpp
index 0367017e80..9a225c78f0 100644
--- a/SerialPrograms/Source/CommonFramework/Tools/DebugDumper.cpp
+++ b/SerialPrograms/Source/CommonFramework/Tools/DebugDumper.cpp
@@ -1,26 +1,22 @@
 /*  Debug Dumper
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include <QDir>
-#include "DebugDumper.h"
+#include "Common/Cpp/Filesystem/Filesystem.h"
 #include "Common/Cpp/PrettyPrint.h"
-#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/GlobalAutoPaths.h"
 #include "CommonFramework/Logging/Logger.h"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "DebugDumper.h"
 
 namespace PokemonAutomation{
 
-namespace {
-const char* debug_dump_folder_name = "DebugDumps";
-}
-
 // create a folder with path ./DebugDumps/`folder_path`.
 // The function will create all parent folders necessary to create the folder.
 void create_debug_folder(const std::string& folder_path){
-    QDir().mkdir(debug_dump_folder_name);
-    QDir(debug_dump_folder_name).mkpath(folder_path.c_str());
+    Filesystem::create_directories(Filesystem::Path(DEBUG_PATH() + folder_path));
 }
 
 std::string dump_debug_image(
@@ -30,9 +26,8 @@ std::string dump_debug_image(
     const ImageViewRGB32& image
 ){
     create_debug_folder(path);
-    std::string full_path = debug_dump_folder_name;
-    full_path += "/" + path + "/" + now_to_filestring() + "-" + label + ".jpg";
-    logger.log("Saving debug image to: " + full_path, COLOR_YELLOW);
+    std::string full_path = DEBUG_PATH() + path + "/" + now_to_filestring() + "-" + label + ".png";
+    logger.log("Debug image: " + full_path, COLOR_YELLOW);
     image.save(full_path);
     return full_path;
 }
diff --git a/SerialPrograms/Source/CommonFramework/Tools/DebugDumper.h b/SerialPrograms/Source/CommonFramework/Tools/DebugDumper.h
index eb1b411d43..2f75afd5c9 100644
--- a/SerialPrograms/Source/CommonFramework/Tools/DebugDumper.h
+++ b/SerialPrograms/Source/CommonFramework/Tools/DebugDumper.h
@@ -1,6 +1,6 @@
 /*  Debug Dumper
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -14,7 +14,7 @@ namespace PokemonAutomation{
 class ImageViewRGB32;
 class Logger;
 
-// Dump debug image to ./DebugDumps/`path`/<timestamp>-`label`.jpg
+// Dump debug image to ./DebugDumps/`path`/<timestamp>-`label`.png
 // Return image path.
 std::string dump_debug_image(
     Logger& logger,
diff --git a/SerialPrograms/Source/CommonFramework/Tools/ErrorDumper.cpp b/SerialPrograms/Source/CommonFramework/Tools/ErrorDumper.cpp
index 85e5c0db2e..08eb18ce12 100644
--- a/SerialPrograms/Source/CommonFramework/Tools/ErrorDumper.cpp
+++ b/SerialPrograms/Source/CommonFramework/Tools/ErrorDumper.cpp
@@ -1,22 +1,23 @@
 /*  Error Dumper
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include <mutex>
-#include <QDir>
+#include "Common/Cpp/Filesystem/Filesystem.h"
 #include "Common/Cpp/PrettyPrint.h"
-#include "CommonFramework/Exceptions/OperationFailedException.h"
+#include "Common/Cpp/Concurrency/Mutex.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/GlobalAutoPaths.h"
 #include "CommonFramework/ImageTypes/ImageViewRGB32.h"
-#include "CommonFramework/Notifications/EventNotificationOption.h"
+//#include "CommonFramework/Notifications/EventNotificationOption.h"
 #include "CommonFramework/Notifications/ProgramInfo.h"
 #include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ErrorReports/ErrorReports.h"
 #include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "CommonFramework/VideoPipeline/VideoOverlay.h"
-#include "ConsoleHandle.h"
+//#include "CommonFramework/VideoPipeline/VideoOverlay.h"
 #include "ErrorDumper.h"
-#include "ProgramEnvironment.h"
+//#include "ProgramEnvironment.h"
 namespace PokemonAutomation{
 
 
@@ -26,12 +27,11 @@ std::string dump_image_alone(
     const ProgramInfo& program_info, const std::string& label,
     const ImageViewRGB32& image
 ){
-    static std::mutex lock;
-    std::lock_guard<std::mutex> lg(lock);
+    static Mutex lock;
+    std::lock_guard<Mutex> lg(lock);
 
-    QDir().mkdir("ErrorDumps");
-    std::string name = "ErrorDumps/";
-    name += now_to_filestring();
+    Filesystem::create_directories(Filesystem::Path(ERROR_PATH()));
+    std::string name = ERROR_PATH() + now_to_filestring();
     name += "-";
     name += label;
     name += ".png";
@@ -39,87 +39,44 @@ std::string dump_image_alone(
     image.save(name);
     return name;
 }
-std::string dump_image(
+void dump_image(
     Logger& logger,
     const ProgramInfo& program_info, const std::string& label,
-    const ImageViewRGB32& image
+    const ImageViewRGB32& image,
+    const StreamHistorySession* stream_history
 ){
-    std::string name = dump_image_alone(logger, program_info, label, image);
-    send_program_telemetry(
-        logger, true, COLOR_RED,
+    report_error_to_telemetry(
+        &logger,
         program_info,
         label,
         {},
-        name
+        image,
+        stream_history
     );
-    return name;
 }
-
-#if 0
-void dump_image_and_throw_recoverable_exception(
-    ProgramEnvironment& env,
-    ConsoleHandle& console,
-    EventNotificationOption& notification_error,
-    const std::string& error_name,
-    const std::string& message
+void dump_image(
+    Logger& logger,
+    const ProgramInfo& program_info,
+    VideoFeed& video,
+    const std::string& label
 ){
-#if 0
-    // m_stats.m_errors++;
-    console.overlay().add_log("Error: " + error_name, COLOR_RED);
-    VideoSnapshot screen = console.video().snapshot();
-    dump_image(
-        console, env.program_info(),
-        error_name,
-        screen
-    );
-    send_program_recoverable_error_notification(
-        env,
-        notification_error,
-        message,
-        screen
-    );
-    throw OperationFailedException(console, message);
-#else
-    throw OperationFailedException(
-        ErrorReport::SEND_ERROR_REPORT, console,
-        message,
-        true
-    );
-#endif
+    auto snapshot = video.snapshot();
+    dump_image(logger, program_info, label, snapshot);
 }
-#endif
+
 
 void dump_image_and_throw_recoverable_exception(
     const ProgramInfo& program_info,
-    ConsoleHandle& console,
+    VideoStream& stream,
     const std::string& error_name,
     const std::string& error_message,
     const ImageViewRGB32& screenshot
 ){
-#if 0
-    console.overlay().add_log("Error: " + error_name, COLOR_RED);
-    if (screenshot){
-        dump_image(
-            console, program_info,
-            error_name,
-            screenshot
-        );
-    }else{
-        VideoSnapshot screen = console.video().snapshot();
-        dump_image(
-            console, program_info,
-            error_name,
-            screen
-        );
-    }
-    throw OperationFailedException(console, error_message);
-#else
-    throw OperationFailedException(
-        ErrorReport::SEND_ERROR_REPORT, console,
+    OperationFailedExceptionWithScreenshot::fire(
+        ErrorReportMode::SEND_ERROR_REPORT,
         error_message,
-        true
+        stream
     );
-#endif
 }
 
 
diff --git a/SerialPrograms/Source/CommonFramework/Tools/ErrorDumper.h b/SerialPrograms/Source/CommonFramework/Tools/ErrorDumper.h
index a66dc953b6..32193c482c 100644
--- a/SerialPrograms/Source/CommonFramework/Tools/ErrorDumper.h
+++ b/SerialPrograms/Source/CommonFramework/Tools/ErrorDumper.h
@@ -1,6 +1,6 @@
 /*  Error Dumper
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -12,50 +12,48 @@
 
 namespace PokemonAutomation{
 
-class ConsoleHandle;
+class VideoFeed;
+class StreamHistorySession;
+class VideoStream;
 class EventNotificationOption;
 class ImageViewRGB32;
 class Logger;
+struct VideoSnapshot;
 class ProgramEnvironment;
 struct ProgramInfo;
 
+#if 0
 std::string dump_image_alone(
     Logger& logger,
     const ProgramInfo& program_info, const std::string& label,
     const ImageViewRGB32& image
 );
-// Dump error image to ./ErrorDumps/ folder. Also send image as telemetry if user allows.
-// Return image path.
-std::string dump_image(
+#endif
+
+// Call CommonFramework/ErrorReports/ErrorReports.h:report_error_to_telemetry() to create an error
+// report with image. Check the comments of report_error_to_telemetry() for more details.
+void dump_image(
     Logger& logger,
     const ProgramInfo& program_info, const std::string& label,
-    const ImageViewRGB32& image
+    const ImageViewRGB32& image,
+    const StreamHistorySession* stream_history = nullptr
 );
 
-#if 0
-// dump a screenshot to ./ErrorDumps/ folder and throw an OperationFailedException.
-// Also send image as telemetry if user allows.
-// notification_error: the notification option used to set whether user wants to receive notifiction for
-//   recoverable error.
-// error_name: the error name, used as the image name and show up on video overlay log. Typical format example:
-//   "NoHatchEnd", "NoYCommFound".
-// error_message: the exception mesage.
-[[noreturn]] void dump_image_and_throw_recoverable_exception(
-    ProgramEnvironment& env,
-    ConsoleHandle& console,
-    EventNotificationOption& notification_error,
-    const std::string& error_name,
-    const std::string& error_message
+// Take a screenshot from the video stream and call
+// CommonFramework/ErrorReports/ErrorReports.h:report_error_to_telemetry() to create an error
+// report with the screenshot. Check the comments of report_error_to_telemetry() for more details.
+void dump_image(
+    Logger& logger,
+    const ProgramInfo& program_info,
+    VideoFeed& video,
+    const std::string& label
 );
-#endif
 
-// dump a screenshot to ./ErrorDumps/ folder and throw an OperationFailedException.
-// error_name: the error name, used as the image name and show up on video overlay log. Typical format example:
-//   "NoHatchEnd", "NoYCommFound".
-// error_message: the exception mesage.
+// Throw an OperationFailedException that will trigger error report creation.
+// Check OperationFailedExceptionWithScreenshot::fire() for more details.
 [[noreturn]] void dump_image_and_throw_recoverable_exception(
     const ProgramInfo& program_info,
-    ConsoleHandle& console,
+    VideoStream& stream,
     const std::string& error_name,
     const std::string& error_message,
     const ImageViewRGB32& screenshot = ImageViewRGB32()
diff --git a/SerialPrograms/Source/CommonFramework/Tools/FileDownloader.cpp b/SerialPrograms/Source/CommonFramework/Tools/FileDownloader.cpp
index 6a25f145b7..9a71651d9b 100644
--- a/SerialPrograms/Source/CommonFramework/Tools/FileDownloader.cpp
+++ b/SerialPrograms/Source/CommonFramework/Tools/FileDownloader.cpp
@@ -1,6 +1,6 @@
 /*  File Downloader
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -8,12 +8,14 @@
 #include <QObject>
 #include <QByteArray>
 #include <QEventLoop>
-#include <QJsonDocument>
 #include <QNetworkAccessManager>
 #include <QNetworkRequest>
 #include <QNetworkReply>
 #include <QObject>
 #include <QTimer>
+#include <QSslError>
+#include "Common/Cpp/Filesystem/FileIO.h"
+#include "Common/Cpp/Filesystem/Filesystem.h"
 #include "Common/Cpp/Json/JsonValue.h"
 #include "CommonFramework/Exceptions/OperationFailedException.h"
 #include "FileDownloader.h"
@@ -25,41 +27,103 @@
 namespace PokemonAutomation{
 namespace FileDownloader{
 
-std::string download_file(Logger& logger, const std::string& url){
+std::string download_file(Logger& logger, const std::string& url, std::chrono::seconds overall_timeout){
+//    cout << "download_file()" << endl;
     QNetworkAccessManager network_access_manager;
     QByteArray downloaded_data;
+    std::unique_ptr<QNetworkReply> reply;
     QEventLoop loop;
+    QList<QSslError> ssl_errors;
 
     QObject::connect(
         &network_access_manager, &QNetworkAccessManager::finished,
         &loop, [&downloaded_data, &loop](QNetworkReply* reply){
-            downloaded_data = reply->readAll();
-            reply->deleteLater();
+//            cout << "QNetworkAccessManager::finished" << endl;
+            //  Only read on success: reading from a reply whose connection
+            //  already failed logs a spurious "QIODevice::read ... device
+            //  not open" warning.
+            if (reply->error() == QNetworkReply::NoError){
+                downloaded_data = reply->readAll();
+            }
+//            reply->deleteLater();
+            loop.exit();
+        }
+    );
+    QObject::connect(
+        &network_access_manager, &QNetworkAccessManager::sslErrors,
+        &loop, [&ssl_errors, &loop](QNetworkReply* reply, const QList<QSslError>& errors){
+//            cout << "QNetworkAccessManager::sslErrors" << endl;
+            //  Record the SSL errors and bail out; the handshake has already
+            //  failed, so don't read from the reply. Note: at this point the
+            //  reply is still marked as running, so this must be reported as
+            //  an SSL error (see below), not as a timeout.
+            ssl_errors = errors;
+//            reply->deleteLater();
             loop.exit();
         }
     );
 
     QNetworkRequest request(QUrl(QString::fromStdString(url)));
-    std::unique_ptr<QNetworkReply> reply(network_access_manager.get(request));
+    request.setTransferTimeout(std::chrono::seconds(5));
+    reply.reset(network_access_manager.get(request));
+
+    //  Deadline for the whole request, including the connection phase
+    //  (setTransferTimeout() above only limits data transfer). Without
+    //  this, a connection that stalls would block loop.exec() forever.
+    QTimer overall_timer;
+    if (overall_timeout.count() > 0){
+        overall_timer.setSingleShot(true);
+        QObject::connect(
+            &overall_timer, &QTimer::timeout,
+            &loop, [&loop]{ loop.exit(); }
+        );
+        overall_timer.start(
+            (int)std::chrono::duration_cast<std::chrono::milliseconds>(overall_timeout).count()
+        );
+    }
 
 #if 0
     QTimer timer;
     timer.singleShot(
         5000, [&downloaded_data, &url](){
         if (downloaded_data.isEmpty()){
-            throw ConnectionException(nullptr, "Couldn't retrieved file from url : " + url + " after 5s");
+            throw ConnectionException(nullptr, "Couldn't retrieved file from url : " + url + " after 5 seconds.");
         }
     });
     timer.stop();
     cout << "Stop timer" << endl;
 #endif
 
+//    cout << "loop.exec() - enter" << endl;
     loop.exec();
+//    cout << "loop.exec() - exit" << endl;
+    overall_timer.stop();
 
     if (!reply){
         std::string str = "QNetworkReply is null.";
 //        logger.log(str, COLOR_RED);
-        throw OperationFailedException(ErrorReport::NO_ERROR_REPORT, logger, str);
+        throw_and_log<OperationFailedException>(logger, ErrorReportMode::NO_ERROR_REPORT, str);
+    }else if (!ssl_errors.isEmpty()){
+        //  The TLS handshake failed (missing or expired certificate,
+        //  untrusted root CA, MITM proxy, ...). This branch must come
+        //  before the isRunning() check below: when sslErrors() fires,
+        //  the reply is still marked as running, so without this check an
+        //  SSL failure would be misreported as a timeout.
+        reply->abort();
+        std::string str = "SSL error downloading " + url + ": ";
+        for (int i = 0; i < ssl_errors.size(); i++){
+            if (i != 0){
+                str += "; ";
+            }
+            str += ssl_errors.at(i).errorString().toStdString();
+        }
+        throw_and_log<OperationFailedException>(logger, ErrorReportMode::NO_ERROR_REPORT, str);
+    }else if (overall_timeout.count() > 0 && reply->isRunning()){
+        //  The overall deadline elapsed while the request (typically the
+        //  connection) was still in progress.
+        reply->abort();
+        throw_and_log<OperationFailedException>(logger, ErrorReportMode::NO_ERROR_REPORT,
+            "Timed out after " + std::to_string(overall_timeout.count()) + " seconds downloading " + url + ".");
     }else if (reply->error() == QNetworkReply::NoError){
 //        QString contents = QString::fromUtf8(reply->readAll());
 //        qDebug() << contents;
@@ -67,15 +131,109 @@ std::string download_file(Logger& logger, const std::string& url){
         QString error_string = reply->errorString();
         std::string str = "Network Error: " + error_string.toStdString();
 //        logger.log(str, COLOR_RED);
-        throw OperationFailedException(ErrorReport::NO_ERROR_REPORT, logger, str);
+        throw_and_log<OperationFailedException>(logger, ErrorReportMode::NO_ERROR_REPORT, str);
 //        QString err = reply->errorString();
 //        qDebug() << err;
     }
 
     return std::string(downloaded_data.data(), downloaded_data.size());
 }
-JsonValue download_json_file(Logger& logger, const std::string& url){
-    std::string downloaded_data = download_file(logger, url);
+
+void download_file_to_disk(
+    CancellableScope& scope,
+    Logger& logger, 
+    const std::string& url, 
+    const std::string& file_path,
+    uint64_t expected_size,
+    std::function<void(uint64_t bytes_done, uint64_t total_bytes)> progress_callback
+){
+//    cout << "download_file()" << endl;
+    QNetworkAccessManager network_access_manager;
+    QEventLoop loop;
+
+    //  ensure the directory exists
+    const Filesystem::Path save_path(file_path);
+    Filesystem::create_directories(save_path.parent_path());
+
+    //  1. Write to a unique temporary file in the same directory, then
+    //     rename it onto the destination on success (atomic save).
+    const Filesystem::Path save_temp_path = Filesystem::unique_temp_path(save_path);
+    FileIO file(save_temp_path, FileMode::WRITE | FileMode::BINARY);
+    if (!file.is_open()){
+        throw_and_log<OperationFailedException>(logger, ErrorReportMode::NO_ERROR_REPORT, 
+            "Could not open save file: " + file_path);
+    }
+
+    QNetworkRequest request(QUrl(QString::fromStdString(url)));
+    // request.setAttribute(QNetworkRequest::AutoRedirectionPolicyAttribute, true);  // enable auto-redirects
+    request.setTransferTimeout(std::chrono::seconds(5));
+    
+    // 2. Start the GET request
+    QNetworkReply* reply = network_access_manager.get(request);
+
+    // Progress Bar Logic. and check for Cancel
+    QObject::connect(reply, &QNetworkReply::downloadProgress, 
+        [reply, &scope, expected_size, progress_callback](qint64 bytesReceived, qint64 bytesTotal){
+
+            if (scope.cancelled()){
+                reply->abort();
+            }
+            
+            // Use expected_size if the network doesn't provide one
+            uint64_t total = (bytesTotal > 0) ? (uint64_t)bytesTotal : expected_size;
+
+            progress_callback(bytesReceived, total);
+        }
+    );
+
+    // 3. Stream chunks directly to the temporary file
+    QObject::connect(reply, &QNetworkReply::readyRead, [&file, reply](){
+        QByteArray data = reply->readAll();
+        file.write(data.constData(), data.size());
+    });
+
+    // 4. Handle completion and errors
+    QObject::connect(reply, &QNetworkReply::finished, &loop, &QEventLoop::quit);
+    
+    // Start the loop. local wait mechanism that pauses execution of the function 
+    // while Qt handles the network request. 
+    // the loop stops once we see the signal QNetworkReply::finished.
+    loop.exec();
+
+    // // Final check for remaining data
+    if (reply->bytesAvailable() > 0){
+        QByteArray data = reply->readAll();
+        file.write(data.constData(), data.size());
+    }
+    file.close();
+
+    // 5. Finalize the transaction
+    if (reply->error() == QNetworkReply::NoError){
+        //  This moves the temporary file to the final destination 'file_path'
+        std::error_code ec;
+        Filesystem::rename(save_temp_path, save_path, ec);
+        if (ec){
+            Filesystem::remove(save_temp_path);
+            throw_and_log<OperationFailedException>(logger, ErrorReportMode::NO_ERROR_REPORT, 
+                "Failed to commit file to disk: " + file_path);
+        }
+    }else{
+        Filesystem::remove(save_temp_path);
+        if (scope.cancelled()){
+            logger.log("Download cancelled by user.");
+            throw OperationCancelledException();
+        }else{
+            QString error_string = reply->errorString();
+            throw_and_log<OperationFailedException>(logger, ErrorReportMode::NO_ERROR_REPORT, 
+                "Network Error: " + error_string.toStdString());
+        }
+    }
+
+    reply->deleteLater();
+}
+
+JsonValue download_json_file(Logger& logger, const std::string& url, std::chrono::seconds overall_timeout){
+    std::string downloaded_data = download_file(logger, url, overall_timeout);
     return parse_json(downloaded_data);
 }
 
diff --git a/SerialPrograms/Source/CommonFramework/Tools/FileDownloader.h b/SerialPrograms/Source/CommonFramework/Tools/FileDownloader.h
index 04216d6df1..b7263143f2 100644
--- a/SerialPrograms/Source/CommonFramework/Tools/FileDownloader.h
+++ b/SerialPrograms/Source/CommonFramework/Tools/FileDownloader.h
@@ -1,6 +1,6 @@
 /*  File Downloader
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -8,6 +8,10 @@
 #define PokemonAutomation_FileDownloader_H
 
 #include <string>
+#include <chrono>
+#include <functional>
+#include "Common/Cpp/CancellableScope.h"
+
 
 namespace PokemonAutomation{
     class Logger;
@@ -15,11 +19,34 @@ namespace PokemonAutomation{
 namespace FileDownloader{
 
 //  Throws OperationFailedException if failed to download.
-std::string download_file(Logger& logger, const std::string& url);
+//  overall_timeout is a deadline for the whole request including the
+//  connection phase (QNetworkRequest::setTransferTimeout() only limits
+//  data transfer, so without it a connection that stalls would block
+//  this call forever). std::chrono::seconds(0) (the default) imposes no
+//  overall limit.
+std::string download_file(
+    Logger& logger,
+    const std::string& url,
+    std::chrono::seconds overall_timeout = std::chrono::seconds(0)
+);
+
+//  Throws OperationFailedException if failed to download.
+void download_file_to_disk(
+    CancellableScope& scope,
+    Logger& logger, 
+    const std::string& url, 
+    const std::string& file_path, 
+    uint64_t expected_size,
+    std::function<void(uint64_t bytes_done, uint64_t total_bytes)> progress_callback
+);
 
 //  Throws OperationFailedException if failed to download.
 //  Returns empty value if invalid JSON.
-JsonValue download_json_file(Logger& logger, const std::string& url);
+JsonValue download_json_file(
+    Logger& logger,
+    const std::string& url,
+    std::chrono::seconds overall_timeout = std::chrono::seconds(0)
+);
 
 
 }
diff --git a/SerialPrograms/Source/CommonFramework/Tools/FileHash.cpp b/SerialPrograms/Source/CommonFramework/Tools/FileHash.cpp
new file mode 100644
index 0000000000..3fb1262880
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/Tools/FileHash.cpp
@@ -0,0 +1,65 @@
+/*  File Hash
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Exceptions.h"
+#include "Common/Cpp/ScopeExit.h"
+#include "Common/Cpp/Containers/AlignedMalloc.h"
+#include "Common/Cpp/Filesystem/FileIO.h"
+#include "Common/Cpp/Filesystem/Filesystem.h"
+#include "Common/Cpp/Cryptography/SHA256.h"
+#include "FileHash.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+
+
+
+std::string hash_file(
+    CancellableScope* scope,
+    const std::string& file_path,
+    std::function<void(uint64_t bytes_done, uint64_t total_bytes)> hash_progress
+){
+    Filesystem::Path path(file_path);
+    FileIO file(path, FileMode::READ | FileMode::BINARY);
+    if (!file.is_open()){
+        throw InternalProgramError(
+            nullptr,
+            PA_CURRENT_FUNCTION,
+            "hash_file: Could not open file."
+        );
+    }
+
+    SHA256 hash;
+    uint64_t file_size = Filesystem::file_size(path);
+    uint64_t total_bytes_read = 0;
+
+    constexpr size_t BUFFER_SIZE = 1024 * 1024;
+    void* buffer = aligned_malloc(BUFFER_SIZE, 4096);   // Pre-allocate 1MB once
+    ScopeExit sg([&]{ aligned_free(buffer); });
+
+    size_t bytes_read;
+    do{
+        if (scope != nullptr){
+            scope->throw_if_cancelled();
+        }
+
+        bytes_read = file.read(buffer, BUFFER_SIZE);
+        hash.push(buffer, bytes_read);
+        total_bytes_read += bytes_read;
+
+        if (hash_progress != nullptr){
+            hash_progress(total_bytes_read, file_size);
+        }
+    }while (bytes_read == BUFFER_SIZE);
+
+    hash.finish();
+    return hash.get_hash_hex();
+}
+
+}
diff --git a/SerialPrograms/Source/CommonFramework/Tools/FileHash.h b/SerialPrograms/Source/CommonFramework/Tools/FileHash.h
new file mode 100644
index 0000000000..ca6eff9b40
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/Tools/FileHash.h
@@ -0,0 +1,30 @@
+/*  File Hash
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_FileHash_H
+#define PokemonAutomation_FileHash_H
+
+#include <string>
+#include <functional>
+#include "Common/Cpp/CancellableScope.h"
+
+
+namespace PokemonAutomation{
+
+
+// uses SHA 256
+std::string hash_file(
+    CancellableScope* scope,
+    const std::string& file_path,
+    std::function<void(uint64_t bytes_done, uint64_t total_bytes)> hash_progress = nullptr
+);
+inline std::string hash_file(const std::string& file_path){
+    return hash_file(nullptr, file_path, nullptr);
+}
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/Tools/FileUnzip.cpp b/SerialPrograms/Source/CommonFramework/Tools/FileUnzip.cpp
new file mode 100644
index 0000000000..f0ac3d36d9
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/Tools/FileUnzip.cpp
@@ -0,0 +1,235 @@
+/*  File Unzip
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+
+#ifndef _LARGEFILE64_SOURCE
+#define _LARGEFILE64_SOURCE 1
+#endif
+#ifndef _FILE_OFFSET_BITS
+#define _FILE_OFFSET_BITS 64
+#endif
+
+
+#include <filesystem>
+#include <fstream>
+#include <iostream>
+#include "miniz-3.1.1/miniz.h"
+#include "Common/Cpp/ScopeExit.h"
+#include "Common/Cpp/Exceptions.h"
+#include "Common/Cpp/Filesystem/Filesystem.h"
+#include "FileUnzip.h"
+
+namespace PokemonAutomation{
+
+namespace fs = std::filesystem;
+
+struct ProgressData {
+    std::ofstream* out_file;
+    uint64_t total_bytes;
+    uint64_t processed_bytes;
+    int last_percentage;
+    std::function<void(uint64_t bytes_done, uint64_t total_bytes)> progress_callback;
+    CancellableScope& scope;
+};
+
+// Callback triggered for every chunk of decompressed data
+// pOpaque is an opaque pointer that actually represents ProgressData
+size_t write_callback(void* pOpaque, [[maybe_unused]] mz_uint64 file_ofs, const void* pBuf, size_t n){
+    ProgressData* data = static_cast<ProgressData*>(pOpaque);
+
+    if (data->scope.cancelled()){
+        return 0;  // this causes mz_zip_reader_extract_to_callback to return an error
+    }
+
+    // Check if we actually need to seek
+    // tellp() returns the current 'put' position.  get the current position of the write pointer in an output stream.
+    // if (static_cast<mz_uint64>(data->out_file->tellp()) != file_ofs){
+    //     data->out_file->seekp(file_ofs);
+    // }
+        
+    // Write chunk to disk
+    data->out_file->write(static_cast<const char*>(pBuf), n);
+    
+    // Update and display progress
+    data->processed_bytes += n;
+
+    data->progress_callback(data->processed_bytes, data->total_bytes);
+
+
+            
+    return n;
+}
+
+// ensure that entry_name is inside target_dir, to prevent path traversal attacks.
+// assumes target_dir exists
+bool is_safe(const std::string& target_dir, const std::string& entry_name){
+    try {
+        // 1. Get absolute, normalized paths
+        // handles symlinks. and resolves .. and . components. throws error if path doesn't exist
+        Filesystem::Path base = fs::absolute(Filesystem::Path(target_dir)).lexically_normal();
+        // confirms that base is a directory, and not a file
+        if (!fs::is_directory(base)) return false;
+        
+        // resolves .. and . components and returns an absolute path without requiring the final path to exist.
+        fs::path target = fs::absolute(Filesystem::Path(base / Filesystem::Path(entry_name))).lexically_normal();
+
+        // cout << base << endl;
+        // cout << target << endl;
+
+        // 2. Use lexically_relative to find the path from base to target
+        fs::path rel = target.lexically_relative(base);
+
+        // 3. Validation:
+        // - If rel is empty, they are likely different roots
+        // - If rel starts with "..", it escaped the base
+        // - If rel is ".", it IS the base directory (usually safe)
+        if (rel.empty() || *rel.begin() == ".."){
+            return false;
+        }
+
+        return true;
+    } catch (...){
+        std::cout << "target_dir path doesn't exist." << std::endl;
+        return false;
+    }
+}
+
+void unzip_file(
+    CancellableScope& scope,
+    const char* zip_path, 
+    const char* target_dir, 
+    std::function<void(uint64_t bytes_done, uint64_t total_bytes)> progress_callback
+){
+    Filesystem::Path p{zip_path};
+    if (!fs::exists(p)){
+        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "unzip_file: Attempted to unzip a file that doesn't exist.");
+    } 
+
+    {
+        Filesystem::Path dir{target_dir};
+        std::error_code ec{};
+        fs::create_directories(dir, ec);
+        if (ec){
+            throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "unzip_file: Error creating the target directory " + std::string(target_dir) + ": " + ec.message());
+        }
+    }
+
+    mz_zip_archive zip_archive;
+    memset(&zip_archive, 0, sizeof(zip_archive));
+
+    // Opens the ZIP file at zip_path
+    // zip_archive holds the state and metadata of the ZIP archive.
+    if (!mz_zip_reader_init_file(&zip_archive, zip_path, 0)){
+        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, 
+            "unzip_file: failed to run mz_zip_reader_init_file. mz_zip_error: " + std::to_string(mz_zip_get_last_error(&zip_archive)));
+    } 
+
+    // This automatically calls mz_zip_reader_end when this function exits for any reason.
+    ScopeExit on_exit([&]{
+        mz_zip_reader_end(&zip_archive);
+    });
+
+    // Get total number of files in the archive
+    int num_files = (int)mz_zip_reader_get_num_files(&zip_archive);
+
+    // calculate total uncompressed size
+    uint64_t total_uncompressed_size = 0;
+    for (int i = 0; i < num_files; i++){
+        scope.throw_if_cancelled();
+
+        mz_zip_archive_file_stat file_stat; // holds info on the specific file
+
+        // fills file_stat with the data for the current index
+        if (!mz_zip_reader_file_stat(&zip_archive, i, &file_stat)) continue;
+
+        // cout << std::to_string(file_stat.m_uncomp_size) << endl;
+        total_uncompressed_size += file_stat.m_uncomp_size;
+    }
+
+    uint64_t total_processed_bytes = 0;
+    for (int i = 0; i < num_files; i++){
+        scope.throw_if_cancelled();
+
+        mz_zip_archive_file_stat file_stat; // holds info on the specific file
+
+        // fills file_stat with the data for the current index
+        if (!mz_zip_reader_file_stat(&zip_archive, i, &file_stat)) continue;
+
+        // Checks if the current entry is a folder. Miniz treats folders as entries; 
+        // this code skips them to avoid trying to "write" a folder as if it were a file.
+        if (mz_zip_reader_is_file_a_directory(&zip_archive, i)){
+            continue;
+        }
+
+        // ensure that entry_name is inside target_dir. to prevent path traversal attacks.
+        if (!is_safe(target_dir, file_stat.m_filename)){
+            throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "unzip_file: Attempted to unzip a file that was trying to leave its base directory. This is a security risk.");
+        }
+
+        // Construct your output path (e.g., target_dir + file_stat.m_filename)
+        Filesystem::Path out_path = Filesystem::Path(target_dir) / Filesystem::Path(file_stat.m_filename);
+        Filesystem::Path const parent_dir{out_path.parent_path()};
+
+        // Create the entire directory, including intermediate directories for this file
+        std::error_code ec{};
+        fs::create_directories(parent_dir, ec);
+        if (ec){
+            std::cerr << "Error creating " << parent_dir << ": " << ec.message() << std::endl;
+            ec.clear(); 
+        }
+
+        
+        std::ofstream out_file(out_path.string(), std::ios::binary); // std::ios::binary is to prevent line-ending conversions.
+        ProgressData progress = { &out_file, total_uncompressed_size, total_processed_bytes, -1, progress_callback, scope };
+
+        // Extract using the callback
+        // decompresses the file in chunks and repeatedly calls write_callback to save those chunks to the disk via the out_file
+        mz_bool status = mz_zip_reader_extract_to_callback(&zip_archive, i, write_callback, &progress, 0);
+
+        if (!status){
+            out_file.close();
+            if (scope.cancelled()){
+                // close and delete the partially unzipped file
+                fs::remove(out_path, ec);
+                throw OperationCancelledException();
+            }
+        }
+
+        // std::cout << "\nFinished: " << file_stat.m_filename << std::endl;
+        total_processed_bytes += file_stat.m_uncomp_size;
+    }
+
+}
+
+// void unzip_file(const std::string& zip_path, const std::string& output_dir){
+//     cout << "try to unzip the file." << endl;
+//     miniz_cpp::zip_file archive(zip_path);
+
+//     // create folder structure before extracting.
+//     // since miniz-cpp does not automatically create subdirectories if they exist within the zip archive
+//     std::vector<miniz_cpp::zip_info> const info_list = archive.infolist();
+//     auto const current_directory = std::filesystem::current_path();
+//     std::error_code ec{};
+//     for(miniz_cpp::zip_info const & info: info_list ){
+//         std::filesystem::path const p{(std::filesystem::path(output_dir) / info.filename).parent_path()};
+//         // Create the entire directory tree for this file
+//         std::filesystem::create_directories(p, ec);
+        
+//         if (ec){
+//             std::cerr << "Error creating " << p << ": " << ec.message() << std::endl;
+//             ec.clear(); 
+//         }
+//     }
+
+//     // Extract all files to the specified path
+//     archive.extractall(output_dir);
+
+//     cout << "done unzipping the file." << endl;
+
+// }
+
+
+}
diff --git a/SerialPrograms/Source/CommonFramework/Tools/FileUnzip.h b/SerialPrograms/Source/CommonFramework/Tools/FileUnzip.h
new file mode 100644
index 0000000000..9c61003444
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/Tools/FileUnzip.h
@@ -0,0 +1,29 @@
+/*  File Unzip
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_FileUnzip_H
+#define PokemonAutomation_FileUnzip_H
+
+#include <string>
+#include <functional>
+#include "Common/Cpp/CancellableScope.h"
+
+
+namespace PokemonAutomation{
+
+// unzips the zip file located in zip_path, to target_dir
+// if target_dir doesn't already exist, it will create it.
+// throw OperationCancelledException if the CancellableScope is cancelled
+// throw InternalProgramError if unzipping fails.
+void unzip_file(
+    CancellableScope& scope,
+    const char* zip_path, 
+    const char* target_dir, 
+    std::function<void(uint64_t bytes_done, uint64_t total_bytes)> progress_callback
+);
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/Tools/GlobalThreadPools.cpp b/SerialPrograms/Source/CommonFramework/Tools/GlobalThreadPools.cpp
new file mode 100644
index 0000000000..82b9aefe2b
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/Tools/GlobalThreadPools.cpp
@@ -0,0 +1,67 @@
+/*  Global Thread Pools
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Concurrency/Backends/ThreadPool_Default.h"
+#include "CommonFramework/Logging/Logger.h"
+#include "CommonFramework/Options/Environment/PerformanceOptions.h"
+#include "GlobalThreadPools.h"
+
+namespace PokemonAutomation{
+namespace GlobalThreadPools{
+
+
+
+ThreadPool& computation_realtime(){
+    static ThreadPool_Default runner(
+        [](){
+            PerformanceOptions::instance().REALTIME_THREAD_POOL0.PRIORITY.set_on_this_thread(global_logger_tagged());
+        },
+        0, PerformanceOptions::instance().REALTIME_THREAD_POOL0.MAX_THREADS
+    );
+    return runner;
+}
+ThreadPool& computation_normal(){
+    static ThreadPool_Default runner(
+        [](){
+            PerformanceOptions::instance().NORMAL_THREAD_POOL.PRIORITY.set_on_this_thread(global_logger_tagged());
+        },
+        0, PerformanceOptions::instance().NORMAL_THREAD_POOL.MAX_THREADS
+    );
+    return runner;
+}
+
+ThreadPool& unlimited_realtime(){
+    static ThreadPool_Default runner(
+        [](){
+            PerformanceOptions::instance().REALTIME_THREAD_PRIORITY0.set_on_this_thread(global_logger_tagged());
+        },
+        0
+    );
+    return runner;
+}
+ThreadPool& unlimited_pivot(){
+    static ThreadPool_Default runner(
+        [](){
+            PerformanceOptions::instance().INFERENCE_PIVOT_PRIORITY0.set_on_this_thread(global_logger_tagged());
+        },
+        0
+    );
+    return runner;
+}
+ThreadPool& unlimited_normal(){
+    static ThreadPool_Default runner(
+        [](){
+            PerformanceOptions::instance().NORMAL_THREAD_POOL.PRIORITY.set_on_this_thread(global_logger_tagged());
+        },
+        0
+    );
+    return runner;
+}
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/CommonFramework/Tools/GlobalThreadPools.h b/SerialPrograms/Source/CommonFramework/Tools/GlobalThreadPools.h
new file mode 100644
index 0000000000..7ec89ede14
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/Tools/GlobalThreadPools.h
@@ -0,0 +1,33 @@
+/*  Global Thread Pools
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_CommonTools_GlobalThreadPools_H
+#define PokemonAutomation_CommonTools_GlobalThreadPools_H
+
+#include "Common/Cpp/Concurrency/ThreadPool.h"
+
+namespace PokemonAutomation{
+namespace GlobalThreadPools{
+
+
+//  Computational thread pools.
+//  These are capped to their respective MAX_THREADS and may block.
+//  Do not use these for threads that like to idle.
+ThreadPool& computation_realtime();
+ThreadPool& computation_normal();
+
+//  These are general purpose thread pools of unlimited size.
+//  Dispatching to these will never block.
+//  Use these for threads that like to idle.
+ThreadPool& unlimited_realtime();
+ThreadPool& unlimited_pivot();
+ThreadPool& unlimited_normal();
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/Tools/InterruptableCommands.cpp b/SerialPrograms/Source/CommonFramework/Tools/InterruptableCommands.cpp
deleted file mode 100644
index cd9ac95753..0000000000
--- a/SerialPrograms/Source/CommonFramework/Tools/InterruptableCommands.cpp
+++ /dev/null
@@ -1,199 +0,0 @@
-/*  Async Command Set
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Cpp/Exceptions.h"
-#include "InterruptableCommands.h"
-
-//#include <iostream>
-//using std::cout;
-//using std::endl;
-
-namespace PokemonAutomation{
-
-
-
-struct AsyncCommandSession::CommandSet{
-    CommandSet(
-        CancellableScope& parent, BotBase& botbase,
-        std::function<void(BotBaseContext&)>&& lambda
-    );
-    CancellableHolder<CancellableScope> scope;
-    BotBaseContext context;
-    std::function<void(BotBaseContext&)> commands;
-};
-
-
-
-AsyncCommandSession::CommandSet::CommandSet(
-    CancellableScope& parent, BotBase& botbase,
-    std::function<void(BotBaseContext&)>&& lambda
-)
-    : scope(parent)
-    , context(scope, botbase)
-    , commands(std::move(lambda))
-{}
-
-
-
-AsyncCommandSession::AsyncCommandSession(
-    CancellableScope& scope, Logger& logger, AsyncDispatcher& dispatcher,
-    BotBase& botbase
-)
-    : m_logger(logger)
-    , m_botbase(botbase)
-{
-    //  Attach first. If scope is already cancelled, we exit here with nothing
-    //  to clean up.
-    attach(scope);
-
-    //  Now start the thread. Destructor is guaranteed to run if this succeeds.
-    m_thread = dispatcher.dispatch([this]{ thread_loop(); });
-}
-AsyncCommandSession::~AsyncCommandSession(){
-//    cout << "~AsyncCommandSession()" << endl;
-    if (!cancelled() && std::uncaught_exceptions() == 0){
-        m_logger.log("AsyncCommandSession::stop_session() not called before normal destruction.", COLOR_RED);
-    }
-    detach();
-    AsyncCommandSession::cancel(nullptr);
-
-    //  Join the thread.
-    m_thread.reset();
-}
-
-bool AsyncCommandSession::command_is_running(){
-    m_sanitizer.check_usage();
-    std::lock_guard<std::mutex> lg(m_lock);
-    return m_current != nullptr;
-}
-
-void AsyncCommandSession::stop_command(){
-    m_sanitizer.check_usage();
-
-    std::unique_lock<std::mutex> lg(m_lock);
-    if (cancelled()){
-        return;
-    }
-
-    if (m_current){
-        //  Already a task running. Cancel it.
-        m_current->context.cancel_now();
-        m_cv.wait(lg, [this]{
-            return cancelled() || m_current == nullptr;
-        });
-    }
-}
-void AsyncCommandSession::dispatch(std::function<void(BotBaseContext&)>&& lambda){
-    m_sanitizer.check_usage();
-
-    //  Construct the CommandSet outside the lock.
-    //  If a cancellation comes from above while we are holding the lock,
-    //  it will deadlock.
-    std::unique_ptr<CommandSet> pending(new CommandSet(
-        *this->scope(),
-        m_botbase, std::move(lambda)
-    ));
-
-    std::unique_lock<std::mutex> lg(m_lock);
-    if (cancelled()){
-        return;
-    }
-
-    if (m_current){
-        //  Already a task running. Cancel it.
-        m_current->context.cancel_lazy();
-        m_cv.wait(lg, [this]{
-            return cancelled() || m_current == nullptr;
-        });
-        if (cancelled()){
-            return;
-        }
-    }
-
-    m_current = std::move(pending);
-    m_cv.notify_all();
-}
-
-
-bool AsyncCommandSession::cancel(std::exception_ptr exception) noexcept{
-    if (Cancellable::cancel(exception)){
-        return true;
-    }
-    std::lock_guard<std::mutex> lg(m_lock);
-    if (m_current != nullptr){
-        m_current->context.cancel(std::move(exception));
-    }else{
-        try{
-            m_botbase.stop_all_commands();
-        }catch (...){}
-    }
-    m_cv.notify_all();
-    return false;
-}
-void AsyncCommandSession::thread_loop(){
-    while (true){
-        CommandSet* current;
-        {
-            std::unique_lock<std::mutex> lg(m_lock);
-            m_cv.wait(lg, [this]{
-                return cancelled() || m_current != nullptr;
-            });
-            if (cancelled()){
-                break;
-            }
-            current = m_current.get();
-        }
-        try{
-//            cout << "start" << endl;
-            current->commands(current->context);
-            current->context.wait_for_all_requests();
-//            cout << "stop" << endl;
-        }catch (OperationCancelledException&){}
-
-        //  Destroy the CommandSet outside the lock.
-        //  If a cancellation comes from above while we are holding the lock,
-        //  it will deadlock.
-        std::unique_ptr<CommandSet> done;
-        {
-            std::lock_guard<std::mutex> lg(m_lock);
-            done = std::move(m_current);
-            m_cv.notify_all();
-        }
-    }
-
-    m_sanitizer.check_usage();
-}
-
-
-
-#if 0
-void AsyncCommandSession::stop_commands(){
-    std::lock_guard<std::mutex> lg(m_lock);
-    if (m_current){
-        m_current->context.cancel_now();
-    }
-}
-#endif
-void AsyncCommandSession::wait(){
-    std::unique_lock<std::mutex> lg(m_lock);
-//    cout << "wait() - start" << endl;
-    m_cv.wait(lg, [this]{
-        return m_current == nullptr;
-    });
-//    cout << "wait() - done" << endl;
-}
-void AsyncCommandSession::stop_session_and_rethrow(){
-    cancel(nullptr);
-    m_thread->wait_and_rethrow_exceptions();
-    throw_if_cancelled_with_exception();
-}
-
-
-
-
-
-}
-
diff --git a/SerialPrograms/Source/CommonFramework/Tools/InterruptableCommands.h b/SerialPrograms/Source/CommonFramework/Tools/InterruptableCommands.h
deleted file mode 100644
index eb544a3de5..0000000000
--- a/SerialPrograms/Source/CommonFramework/Tools/InterruptableCommands.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*  Interruptable Commands
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_InterruptableCommands_H
-#define PokemonAutomation_InterruptableCommands_H
-
-#include <mutex>
-#include <condition_variable>
-#include "Common/Cpp/Concurrency/AsyncDispatcher.h"
-#include "ClientSource/Connection/BotBase.h"
-
-
-namespace PokemonAutomation{
-
-class ProgramEnvironment;
-
-
-
-class AsyncCommandSession final : private Cancellable{
-public:
-    AsyncCommandSession(
-        CancellableScope& scope, Logger& logger, AsyncDispatcher& dispatcher,
-        BotBase& botbase
-    );
-    virtual ~AsyncCommandSession();
-
-    bool command_is_running();
-
-    //  Stop the entire session. If an exception was thrown from the command
-    //  thread, it will be rethrown here.
-    //
-    //  It is important that exceptions in the command thread be passed up
-    //  since it is how cancellations are implemented. Therefore you MUST
-    //  call this prior to all natural* destruction points.
-    //
-    //  *Do not call this during a stack-unwind as it's UB to throw while
-    //  unwinding. In such cases, the exception from the command thread will be
-    //  silently dropped in favor of the exception that's causing the current
-    //  unwind.
-    void stop_session_and_rethrow();
-
-
-public:
-    //  Stop the currently running command.
-    void stop_command();
-
-    //  Dispath the following lambda. If something is already running, it will be
-    //  stopped and replaced with this one.
-    void dispatch(std::function<void(BotBaseContext&)>&& lambda);
-
-    //  Wait for currently running command to finish.
-    void wait();
-
-
-private:
-    virtual bool cancel(std::exception_ptr exception) noexcept override;
-    void thread_loop();
-
-
-private:
-    struct CommandSet;
-
-    Logger& m_logger;
-    BotBase& m_botbase;
-    std::unique_ptr<CommandSet> m_current;
-
-    std::mutex m_lock;
-    std::condition_variable m_cv;
-    std::unique_ptr<AsyncTask> m_thread;
-
-    LifetimeSanitizer m_sanitizer;
-};
-
-
-
-
-
-
-
-}
-#endif
diff --git a/SerialPrograms/Source/CommonFramework/Tools/MultiConsoleErrors.cpp b/SerialPrograms/Source/CommonFramework/Tools/MultiConsoleErrors.cpp
deleted file mode 100644
index 36706a6d00..0000000000
--- a/SerialPrograms/Source/CommonFramework/Tools/MultiConsoleErrors.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-/*  Multi-Console Errors
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/Exceptions/OperationFailedException.h"
-#include "MultiConsoleErrors.h"
-
-namespace PokemonAutomation{
-
-
-
-void MultiConsoleErrorState::report_unrecoverable_error(Logger& logger, std::string msg){
-    logger.log(msg, COLOR_RED);
-    bool expected = false;
-    if (m_unrecoverable_error.compare_exchange_strong(expected, true)){
-        m_message = msg;
-    }
-    throw OperationFailedException(ErrorReport::NO_ERROR_REPORT, logger, std::move(msg));
-}
-void MultiConsoleErrorState::check_unrecoverable_error(Logger& logger){
-    if (m_unrecoverable_error.load(std::memory_order_acquire)){
-        logger.log("Unrecoverable error reported from a different console. Breaking out.", COLOR_RED);
-        throw OperationFailedException(ErrorReport::NO_ERROR_REPORT, logger, m_message);
-    }
-}
-
-
-
-}
diff --git a/SerialPrograms/Source/CommonFramework/Tools/MultiConsoleErrors.h b/SerialPrograms/Source/CommonFramework/Tools/MultiConsoleErrors.h
deleted file mode 100644
index 9888e825c7..0000000000
--- a/SerialPrograms/Source/CommonFramework/Tools/MultiConsoleErrors.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*  Multi-Console Errors
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_CommonFramework_MultiConsoleErrors_H
-#define PokemonAutomation_CommonFramework_MultiConsoleErrors_H
-
-#include <string>
-#include <atomic>
-
-namespace PokemonAutomation{
-
-class Logger;
-
-
-class MultiConsoleErrorState{
-public:
-    void report_unrecoverable_error(Logger& logger, std::string msg);
-    void check_unrecoverable_error(Logger& logger);
-
-private:
-    std::atomic<bool> m_unrecoverable_error;
-    std::string m_message;
-};
-
-
-
-
-}
-#endif
diff --git a/SerialPrograms/Source/CommonFramework/Tools/ProgramEnvironment.cpp b/SerialPrograms/Source/CommonFramework/Tools/ProgramEnvironment.cpp
index 6ab6e604de..07e95a1a16 100644
--- a/SerialPrograms/Source/CommonFramework/Tools/ProgramEnvironment.cpp
+++ b/SerialPrograms/Source/CommonFramework/Tools/ProgramEnvironment.cpp
@@ -1,86 +1,49 @@
 /*  Program Environment
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-//#include <mutex>
-#include <condition_variable>
-#include "Common/Cpp/Containers/Pimpl.tpp"
-#include "Common/Cpp/Exceptions.h"
-#include "Common/Cpp/Concurrency/AsyncDispatcher.h"
-#include "ClientSource/Connection/BotBase.h"
-#include "CommonFramework/GlobalSettingsPanel.h"
-#include "CommonFramework/Notifications/ProgramInfo.h"
 #include "CommonFramework/ProgramSession.h"
-#include "StatsTracking.h"
+#include "CommonFramework/Notifications/ProgramInfo.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
 #include "ProgramEnvironment.h"
 
 
 namespace PokemonAutomation{
 
 
-struct ProgramEnvironmentData{
-    const ProgramInfo& m_program_info;
-
-    AsyncDispatcher m_realtime_dispatcher;
-    AsyncDispatcher m_inference_dispatcher;
-
-    ProgramEnvironmentData(
-        const ProgramInfo& program_info
-    )
-        : m_program_info(program_info)
-        , m_realtime_dispatcher(
-            [](){
-                GlobalSettings::instance().REALTIME_THREAD_PRIORITY0.set_on_this_thread();
-            },
-            0
-        )
-        , m_inference_dispatcher(
-            [](){
-                GlobalSettings::instance().INFERENCE_PRIORITY0.set_on_this_thread();
-            },
-            0
-        )
-    {}
-};
 
 
 
-
-ProgramEnvironment::~ProgramEnvironment(){}
-
 ProgramEnvironment::ProgramEnvironment(
     const ProgramInfo& program_info,
     ProgramSession& session,
     StatsTracker* current_stats,
     const StatsTracker* historical_stats
 )
-    : m_session(session)
+    : m_program_info(program_info)
+    , m_session(session)
     , m_logger(session.logger())
     , m_current_stats(current_stats)
     , m_historical_stats(historical_stats)
-    , m_data(CONSTRUCT_TOKEN, program_info)
 {}
 
 const ProgramInfo& ProgramEnvironment::program_info() const{
-    return m_data->m_program_info;
-}
-AsyncDispatcher& ProgramEnvironment::realtime_dispatcher(){
-    return m_data->m_realtime_dispatcher;
-}
-AsyncDispatcher& ProgramEnvironment::inference_dispatcher(){
-    return m_data->m_inference_dispatcher;
+    return m_program_info;
 }
 
 
 void ProgramEnvironment::update_stats(){
     m_session.report_stats_changed();
+    if (m_current_stats){
+        m_logger.log("Current Stats: " + m_current_stats->to_str(StatsTracker::PrintMode::DUMP));
+    }
 }
 
 
 std::string ProgramEnvironment::historical_stats_str() const{
-    return m_historical_stats ? m_historical_stats->to_str() : "";
+    return m_historical_stats ? m_historical_stats->to_str(StatsTracker::DISPLAY_ON_SCREEN) : "";
 }
 
 
diff --git a/SerialPrograms/Source/CommonFramework/Tools/ProgramEnvironment.h b/SerialPrograms/Source/CommonFramework/Tools/ProgramEnvironment.h
index ea9f2ab396..72d6d812df 100644
--- a/SerialPrograms/Source/CommonFramework/Tools/ProgramEnvironment.h
+++ b/SerialPrograms/Source/CommonFramework/Tools/ProgramEnvironment.h
@@ -1,18 +1,17 @@
 /*  Program Environment
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifndef PokemonAutomation_ProgramEnvironment_H
 #define PokemonAutomation_ProgramEnvironment_H
 
-#include "Common/Cpp/Containers/Pimpl.h"
-#include "Common/Cpp/AbstractLogger.h"
+#include "Common/Compiler.h"
+#include "Common/Cpp/Logging/AbstractLogger.h"
 
 namespace PokemonAutomation{
 
-class AsyncDispatcher;
 class StatsTracker;
 class ProgramSession;
 struct ProgramInfo;
@@ -23,7 +22,7 @@ struct ProgramEnvironmentData;
 
 class ProgramEnvironment{
 public:
-    ~ProgramEnvironment();
+    virtual ~ProgramEnvironment() = default;
     ProgramEnvironment(
         const ProgramInfo& program_info,
         ProgramSession& session,
@@ -33,16 +32,15 @@ class ProgramEnvironment{
 
     const ProgramInfo& program_info() const;
 
+
 public:
     //  Logging
     Logger& logger(){ return m_logger; }
     void log(const char* msg, Color color = Color()){ m_logger.log(msg, color); }
     void log(const std::string& msg, Color color = Color()){ m_logger.log(msg, color); }
 
-public:
-    //  Thread Pools
-    AsyncDispatcher& realtime_dispatcher();
-    AsyncDispatcher& inference_dispatcher();
+    virtual void log_to_ui(const std::string& msg, Color color = Color()){}
+
 
 public:
     //  Stats Management
@@ -58,13 +56,12 @@ class ProgramEnvironment{
 
 
 private:
+    const ProgramInfo& m_program_info;
     ProgramSession& m_session;
     Logger& m_logger;
 
     StatsTracker* m_current_stats;
     const StatsTracker* m_historical_stats;
-
-    Pimpl<ProgramEnvironmentData> m_data;
 };
 
 
diff --git a/SerialPrograms/Source/CommonFramework/Inference/StatAccumulator.cpp b/SerialPrograms/Source/CommonFramework/Tools/StatAccumulator.cpp
similarity index 82%
rename from SerialPrograms/Source/CommonFramework/Inference/StatAccumulator.cpp
rename to SerialPrograms/Source/CommonFramework/Tools/StatAccumulator.cpp
index 322dd4f6c6..6a54ae2cd5 100644
--- a/SerialPrograms/Source/CommonFramework/Inference/StatAccumulator.cpp
+++ b/SerialPrograms/Source/CommonFramework/Tools/StatAccumulator.cpp
@@ -1,6 +1,6 @@
 /*  Stat Accumulator
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -10,9 +10,9 @@
 #include "CommonFramework/Logging/Logger.h"
 #include "StatAccumulator.h"
 
-#include <iostream>
-using std::cout;
-using std::endl;
+//#include <iostream>
+//using std::cout;
+//using std::endl;
 
 namespace PokemonAutomation{
 
@@ -57,23 +57,30 @@ void StatAccumulatorI32::log(Logger& logger, const std::string& label, const cha
 PeriodicStatsReporterI32::PeriodicStatsReporterI32(
     const char* label,
     const char* units, double divider,
-    std::chrono::milliseconds period
+    std::chrono::milliseconds period,
+    uint32_t min_report_time_threshold
 )
     : m_label(label)
     , m_units(units)
     , m_divider(divider)
     , m_period(period)
+    , m_min_report_time_threshold(min_report_time_threshold)
     , m_last_report(current_time())
 {}
 void PeriodicStatsReporterI32::report_data(Logger& logger, uint32_t x){
     StatAccumulatorI32::operator+=(x);
     WallClock now = current_time();
-    if (m_last_report + m_period <= now){
+    if (m_last_report + m_period > now){
+        return;
+    }
+
+    if (this->max() >= m_min_report_time_threshold){
         log(logger, m_label, m_units, m_divider);
-        clear();
-        m_last_report = now;
     }
 
+    clear();
+    m_last_report = now;
+
 }
 
 
diff --git a/SerialPrograms/Source/CommonFramework/Inference/StatAccumulator.h b/SerialPrograms/Source/CommonFramework/Tools/StatAccumulator.h
similarity index 86%
rename from SerialPrograms/Source/CommonFramework/Inference/StatAccumulator.h
rename to SerialPrograms/Source/CommonFramework/Tools/StatAccumulator.h
index ac8da7d2f2..1a563308c6 100644
--- a/SerialPrograms/Source/CommonFramework/Inference/StatAccumulator.h
+++ b/SerialPrograms/Source/CommonFramework/Tools/StatAccumulator.h
@@ -1,6 +1,6 @@
 /*  Stat Accumulator
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -46,7 +46,8 @@ class PeriodicStatsReporterI32 : public StatAccumulatorI32{
     PeriodicStatsReporterI32(
         const char* label,
         const char* units, double divider,
-        std::chrono::milliseconds period
+        std::chrono::milliseconds period,
+        uint32_t min_report_time_threshold = 0
     );
     void report_data(Logger& logger, uint32_t x);
 
@@ -55,6 +56,7 @@ class PeriodicStatsReporterI32 : public StatAccumulatorI32{
     const char* m_units;
     double m_divider;
     std::chrono::milliseconds m_period;
+    uint32_t m_min_report_time_threshold;
     WallClock m_last_report;
 };
 
diff --git a/SerialPrograms/Source/CommonFramework/Tools/StatsTracking.cpp b/SerialPrograms/Source/CommonFramework/Tools/StatsTracking.cpp
deleted file mode 100644
index 3e8f181a45..0000000000
--- a/SerialPrograms/Source/CommonFramework/Tools/StatsTracking.cpp
+++ /dev/null
@@ -1,172 +0,0 @@
-/*  Stats Tracking
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Cpp/AbstractLogger.h"
-#include "Common/Cpp/PrettyPrint.h"
-#include "StatsTracking.h"
-
-namespace PokemonAutomation{
-
-
-
-StatsTracker::Stat::Stat(std::string&& p_label, bool p_omit_if_zero)
-    : label(p_label)
-    , omit_if_zero(p_omit_if_zero)
-{}
-std::string StatsTracker::to_str() const{
-    std::map<std::string, uint64_t> stats;
-    for (const auto& item : m_stats){
-        auto alias = m_aliases.find(item.first);
-
-        //  Not an alias.
-        if (alias == m_aliases.end()){
-            stats[item.first] += item.second.load(std::memory_order_relaxed);
-            continue;
-        }
-
-        //  Find alias target.
-        auto iter = m_stats.find(alias->second);
-        if (iter != m_stats.end()){
-            stats[alias->second] += item.second.load(std::memory_order_relaxed);
-        }
-    }
-
-    std::string str;
-    for (const Stat& stat : m_display_order){
-        auto iter = stats.find(stat.label);
-        uint64_t count = 0;
-        if (iter != stats.end()){
-            count += iter->second;
-        }
-        if (stat.omit_if_zero && count == 0){
-            continue;
-        }
-        if (!str.empty()){
-            str += " - ";
-        }
-        str += stat.label;
-        str += ": ";
-        str += tostr_u_commas(count);
-    }
-    return str;
-}
-
-
-
-void StatsTracker::parse_and_append_line(const std::string& line){
-    const char* ptr = line.c_str();
-    while (true){
-        //  Parse label.
-        std::string label;
-        while (true){
-            char ch = *ptr++;
-            if (ch < 32) return;
-            if (ch == ':') break;
-            label += ch;
-        }
-
-        //  Skip to number.
-        while (true){
-            char ch = *ptr;
-            if (ch < 32) return;
-            if ('0' <= ch && ch <= '9') break;
-            ptr++;
-        }
-
-        //  Parse number.
-        uint64_t count = 0;
-        while (true){
-            char ch = *ptr++;
-            if (ch < 32){
-                m_stats[label] += count;
-                return;
-            }
-            if (ch == ',') continue;
-            if (!('0' <= ch && ch <= '9')) break;
-            count *= 10;
-            count += ch - '0';
-        }
-
-//        cout << label << " = " << count << endl;
-        m_stats[label] += count;
-
-        //  Skip to next;
-        while (true){
-            char ch = *ptr;
-            if (ch < 32) return;
-            if (('A' <= ch && ch <= 'Z') || ('a' <= ch && ch <= 'z')) break;
-            ptr++;
-        }
-    }
-}
-
-
-
-std::string stats_to_bar(
-    Logger& logger,
-    const StatsTracker* historical,
-    const StatsTracker* current,
-    const std::string& override_current
-){
-    std::string current_str;
-    if (!override_current.empty()){
-        current_str = override_current;
-    }else if (current){
-        current_str = current->to_str();
-    }
-
-    std::string historical_str;
-    if (historical){
-        historical_str = historical->to_str();
-    }
-
-    if (current_str.empty() && historical_str.empty()){
-        return "";
-    }
-
-    if (!current_str.empty() && historical_str.empty()){
-        logger.log(current_str);
-        return current_str;
-    }
-    if (current_str.empty() && !historical_str.empty()){
-        return "<b>Past Runs</b> - " + historical_str;
-    }
-
-    logger.log(current_str);
-
-    std::string str;
-    str += "<b>Current Run</b> - " + current_str;
-    str += "<br>";
-    str += "<b>Past Totals</b> - " + historical_str;
-
-    return str;
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-}
diff --git a/SerialPrograms/Source/CommonFramework/Tools/StatsTracking.h b/SerialPrograms/Source/CommonFramework/Tools/StatsTracking.h
deleted file mode 100644
index 236a78c111..0000000000
--- a/SerialPrograms/Source/CommonFramework/Tools/StatsTracking.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*  Stats Tracking
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_StatsTracking_H
-#define PokemonAutomation_StatsTracking_H
-
-#include <vector>
-#include <string>
-#include <map>
-#include <atomic>
-
-namespace PokemonAutomation{
-
-class Logger;
-
-class StatsTracker{
-    StatsTracker(const StatsTracker&) = delete;
-
-public:
-    StatsTracker() = default;
-    virtual ~StatsTracker() = default;
-
-    virtual std::string to_str() const;
-
-    void parse_and_append_line(const std::string& line);
-
-
-protected:
-    struct Stat{
-        std::string label;
-        bool omit_if_zero;
-        Stat(std::string&& p_label, bool p_omit_if_zero = false);
-    };
-
-    std::vector<Stat> m_display_order;
-    std::map<std::string, std::atomic<uint64_t>> m_stats;
-    std::map<std::string, std::string> m_aliases;
-};
-
-
-std::string stats_to_bar(
-    Logger& logger,
-    const StatsTracker* historical,
-    const StatsTracker* current,
-    const std::string& override_current = ""
-);
-
-
-
-
-}
-#endif
diff --git a/SerialPrograms/Source/CommonFramework/Tools/SuperControlSession.cpp b/SerialPrograms/Source/CommonFramework/Tools/SuperControlSession.cpp
deleted file mode 100644
index 760ecfd265..0000000000
--- a/SerialPrograms/Source/CommonFramework/Tools/SuperControlSession.cpp
+++ /dev/null
@@ -1,127 +0,0 @@
-/*  Super-Control Session
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Cpp/Exceptions.h"
-#include "CommonFramework/InferenceInfra/VisualInferenceCallback.h"
-#include "CommonFramework/InferenceInfra/AudioInferenceCallback.h"
-#include "CommonFramework/InferenceInfra/InferenceSession.h"
-#include "ProgramEnvironment.h"
-#include "ConsoleHandle.h"
-#include "InterruptableCommands.h"
-#include "SuperControlSession.h"
-
-#include <iostream>
-using std::cout;
-using std::endl;
-
-namespace PokemonAutomation{
-
-
-SuperControlSession::~SuperControlSession(){}
-
-SuperControlSession::SuperControlSession(
-    ProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context,
-        std::chrono::milliseconds state_period,
-        std::chrono::milliseconds visual_period,
-        std::chrono::milliseconds audio_period
-)
-    : m_env(env)
-    , m_console(console)
-    , m_context(context)
-    , m_state_period(state_period)
-    , m_visual_period(visual_period)
-    , m_audio_period(audio_period)
-    , m_last_state(0)
-    , m_last_state_change(current_time())
-{}
-
-void SuperControlSession::operator+=(VisualInferenceCallback& callback){
-    m_visual_callbacks.emplace_back(&callback);
-}
-void SuperControlSession::operator+=(AudioInferenceCallback& callback){
-    m_audio_callbacks.emplace_back(&callback);
-}
-void SuperControlSession::register_state_command(size_t state, std::function<bool()>&& action){
-    auto iter = m_state_actions.find(state);
-    if (iter != m_state_actions.end()){
-        throw InternalProgramError(&m_console.logger(), PA_CURRENT_FUNCTION, "Duplicate State Enum: " + std::to_string(state));
-    }
-    m_state_actions.emplace(state, std::move(action));
-}
-bool SuperControlSession::run_state_action(size_t state){
-    auto iter = m_state_actions.find(state);
-    if (iter == m_state_actions.end()){
-        throw InternalProgramError(&m_console.logger(), PA_CURRENT_FUNCTION, "Unknown State Enum: " + std::to_string(state));
-    }
-
-    //  Session isn't even active.
-    if (!m_active_command){
-        return false;
-    }
-
-    //  If we're already in the state and a command is running, don't overwrite it.
-    if (state == m_last_state && m_active_command->command_is_running()){
-        return false;
-    }
-
-    //  Run the state.
-    m_last_state = state;
-    m_last_state_change = current_time();
-    return iter->second();
-}
-
-void SuperControlSession::run_session(){
-    m_start_time = current_time();
-
-    m_active_command.reset(
-        new AsyncCommandSession(
-            m_context, m_env.logger(), m_env.realtime_dispatcher(),
-            m_console.botbase()
-        )
-    );
-
-    std::vector<PeriodicInferenceCallback> callbacks;
-    for (VisualInferenceCallback* callback : m_visual_callbacks){
-        callbacks.emplace_back(PeriodicInferenceCallback{*callback, m_visual_period});
-    }
-    for (AudioInferenceCallback* callback : m_audio_callbacks){
-        callbacks.emplace_back(PeriodicInferenceCallback{*callback, m_audio_period});
-    }
-    InferenceSession session(
-        m_context, m_console,
-        callbacks,
-        m_visual_period
-    );
-
-    WallClock now = current_time();
-    WallClock next_tick = now + m_state_period;
-
-    m_last_state = 0;
-
-    while (true){
-        //  Check stop conditions.
-        m_context.throw_if_cancelled();
-
-        if (run_state(*m_active_command, current_time())){
-            break;
-        }
-
-        now = current_time();
-        if (now >= next_tick){
-            next_tick = now + m_state_period;
-        }else{
-            m_context.wait_until(next_tick);
-            next_tick += m_state_period;
-        }
-    }
-    m_context.throw_if_cancelled();
-
-    m_active_command->stop_session_and_rethrow();
-}
-
-
-
-}
diff --git a/SerialPrograms/Source/CommonFramework/Tools/VideoResolutionCheck.cpp b/SerialPrograms/Source/CommonFramework/Tools/VideoResolutionCheck.cpp
deleted file mode 100644
index 697ec01c9f..0000000000
--- a/SerialPrograms/Source/CommonFramework/Tools/VideoResolutionCheck.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-/*  Video Resolution Check
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Cpp/Exceptions.h"
-#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "CommonFramework/Tools/ConsoleHandle.h"
-#include "VideoResolutionCheck.h"
-
-namespace PokemonAutomation{
-
-
-void assert_16_9_720p_min(Logger& logger, const ImageViewRGB32& frame){
-    if (!frame){
-        throw UserSetupError(logger, "No video detected.");
-    }
-    if (frame.height() < 720){
-        throw UserSetupError(logger, "Video resolution must be at least 720p.");
-    }
-    double aspect_ratio = (double)frame.width() / frame.height();
-    if (aspect_ratio < 1.77 || aspect_ratio > 1.78){
-        throw UserSetupError(logger, "Video aspect ratio must be 16:9.");
-    }
-}
-void assert_16_9_720p_min(Logger& logger, ConsoleHandle& console){
-    assert_16_9_720p_min(logger, console.video().snapshot());
-}
-
-void assert_16_9_1080p_min(Logger& logger, const ImageViewRGB32& frame){
-    if (!frame){
-        throw UserSetupError(logger, "No video detected.");
-    }
-    if (frame.height() < 1080){
-        throw UserSetupError(logger, "Video resolution must be at least 1080p.");
-    }
-    double aspect_ratio = (double)frame.width() / frame.height();
-    if (aspect_ratio < 1.77 || aspect_ratio > 1.78){
-        throw UserSetupError(logger, "Video aspect ratio must be 16:9.");
-    }
-}
-void assert_16_9_1080p_min(Logger& logger, ConsoleHandle& console){
-    assert_16_9_1080p_min(logger, console.video().snapshot());
-}
-
-
-
-}
diff --git a/SerialPrograms/Source/CommonFramework/Tools/VideoResolutionCheck.h b/SerialPrograms/Source/CommonFramework/Tools/VideoResolutionCheck.h
deleted file mode 100644
index c7d1f61214..0000000000
--- a/SerialPrograms/Source/CommonFramework/Tools/VideoResolutionCheck.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*  Video Resolution Check
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_VideoResolutionCheck_H
-#define PokemonAutomation_VideoResolutionCheck_H
-
-namespace PokemonAutomation{
-
-class Logger;
-class ImageViewRGB32;
-class ConsoleHandle;
-
-
-void assert_16_9_720p_min(Logger& logger, const ImageViewRGB32& frame);
-void assert_16_9_720p_min(Logger& logger, ConsoleHandle& console);
-
-void assert_16_9_1080p_min(Logger& logger, const ImageViewRGB32& frame);
-void assert_16_9_1080p_min(Logger& logger, ConsoleHandle& console);
-
-
-
-}
-#endif
diff --git a/SerialPrograms/Source/CommonFramework/Tools/VideoStream.cpp b/SerialPrograms/Source/CommonFramework/Tools/VideoStream.cpp
new file mode 100644
index 0000000000..87fc00972d
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/Tools/VideoStream.cpp
@@ -0,0 +1,52 @@
+/*  Video Stream
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Containers/Pimpl.tpp"
+#include "CommonFramework/VideoPipeline/VideoOverlay.h"
+#include "CommonFramework/Recording/StreamHistorySession.h"
+#include "CommonTools/InferencePivots/VisualInferencePivot.h"
+#include "CommonTools/InferencePivots/AudioInferencePivot.h"
+#include "VideoStream.h"
+
+namespace PokemonAutomation{
+
+
+
+VideoStream::VideoStream(VideoStream&& x) = default;
+VideoStream::~VideoStream(){
+    m_overlay.remove_stat(*m_audio_pivot);
+    m_overlay.remove_stat(*m_video_pivot);
+}
+VideoStream::VideoStream(
+    Logger& logger,
+    AudioFeed& audio,
+    VideoFeed& video,
+    const StreamHistorySession& history,
+    VideoOverlay& overlay
+)
+    : m_logger(logger)
+    , m_audio(audio)
+    , m_video(video)
+    , m_history(history)
+    , m_overlay(overlay)
+{}
+
+
+bool VideoStream::save_stream_history(const std::string& filename){
+    return history().save(filename);
+}
+
+
+void VideoStream::initialize_inference_threads(CancellableScope& scope){
+    m_video_pivot.reset(scope, m_video);
+    m_audio_pivot.reset(scope, m_audio);
+    m_overlay.add_stat(*m_video_pivot);
+    m_overlay.add_stat(*m_audio_pivot);
+}
+
+
+
+}
diff --git a/SerialPrograms/Source/CommonFramework/Tools/VideoStream.h b/SerialPrograms/Source/CommonFramework/Tools/VideoStream.h
new file mode 100644
index 0000000000..c93ebbf40a
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/Tools/VideoStream.h
@@ -0,0 +1,94 @@
+/*  Video Stream
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *      Represents a single video stream. Includes video, audio, as well
+ *  as their inference pivots. Also includes a logger and the video overlay.
+ *
+ *  This is the class that should be passed into inference modules as it
+ *  provides all the information needed for inference.
+ *
+ *  This class has been separated from ConsoleHandle which used to take this
+ *  role. But 95% of the uses don't require the controller. And the controller
+ *  is messy due to being heterogeneous.
+ *
+ */
+
+#ifndef PokemonAutomation_VideoPipeline_VideoStream_H
+#define PokemonAutomation_VideoPipeline_VideoStream_H
+
+#include <string>
+#include "Common/Cpp/Logging/AbstractLogger.h"
+#include "Common/Cpp/Containers/Pimpl.h"
+
+namespace PokemonAutomation{
+
+class CancellableScope;
+class Logger;
+class AudioFeed;
+class VideoFeed;
+class StreamHistorySession;
+class VideoOverlay;
+class VisualInferencePivot;
+class AudioInferencePivot;
+
+
+class VideoStream{
+public:
+    VideoStream(VideoStream&& x);
+    void operator=(VideoStream&& x) = delete;
+    VideoStream(const VideoStream& x) = delete;
+    void operator=(const VideoStream& x) = delete;
+    virtual ~VideoStream();
+
+public:
+    VideoStream(
+        Logger& logger,
+        AudioFeed& audio,
+        VideoFeed& video,
+        const StreamHistorySession& history,
+        VideoOverlay& overlay
+    );
+
+    //  log(string-like msg, Color color = Color())
+    //  string-like can be const char* or std::string
+    template <class... Args>
+    void log(Args&&... args){
+        m_logger.log(std::forward<Args>(args)...);
+    }
+
+    Logger& logger(){ return m_logger; }
+
+    AudioFeed& audio(){ return m_audio; }
+    VideoFeed& video(){ return m_video; }
+
+    const StreamHistorySession& history() const{ return m_history; }
+    bool save_stream_history(const std::string& filename);
+
+    VideoOverlay& overlay(){ return m_overlay; }
+
+    VisualInferencePivot& video_inference_pivot(){ return *m_video_pivot; }
+    AudioInferencePivot& audio_inference_pivot(){ return *m_audio_pivot; }
+
+
+public:
+    void initialize_inference_threads(CancellableScope& scope);
+
+
+private:
+    Logger& m_logger;
+
+    AudioFeed& m_audio;
+    VideoFeed& m_video;
+    const StreamHistorySession& m_history;
+
+    VideoOverlay& m_overlay;
+
+    Pimpl<VisualInferencePivot> m_video_pivot;
+    Pimpl<AudioInferencePivot> m_audio_pivot;
+};
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraImplementations.cpp b/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraImplementations.cpp
index 1ef034d0f5..3f42cbe10f 100644
--- a/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraImplementations.cpp
+++ b/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraImplementations.cpp
@@ -1,20 +1,23 @@
 /*  Camera Implementations
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include <QtGlobal>
+//#include "Common/Cpp/PrettyPrint.h"
+#include "CommonFramework/StaticGlobals.h"
+#include "CommonFramework/Globals.h"
 #include "CommonFramework/GlobalSettingsPanel.h"
+#include "CommonFramework/VideoPipeline/VideoPipelineOptions.h"
 #include "CameraImplementations.h"
 
-#if QT_VERSION_MAJOR == 5
-#include "VideoToolsQt5.h"
-#include "CameraWidgetQt5.h"
-//#include "CameraWidgetQt5v2.h"
-#elif QT_VERSION_MAJOR == 6
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
 #include "CameraWidgetQt6.h"
-#endif
+#include "CameraWidgetQt6.5.h"
+#include "CameraWidgetQt6_QQuickWidget.h"
 
 
 namespace PokemonAutomation{
@@ -44,17 +47,26 @@ struct CameraBackends{
     }
 
     CameraBackends(){
-#if QT_VERSION_MAJOR == 5
-        m_backends.emplace_back(
-            "qt5-QCameraViewfinder", "Qt5: QCameraViewfinder",
-            std::make_unique<CameraQt5QCameraViewfinder::CameraBackend>()
-        );
-#endif
-#if QT_VERSION_MAJOR == 6
         m_backends.emplace_back(
             "qt6-QVideoSink", "Qt6: QVideoSink",
             std::make_unique<CameraQt6QVideoSink::CameraBackend>()
         );
+        m_backends.emplace_back(
+            "qt6.5-QGraphicsScene", "Qt6.5: QGraphicsScene",
+            std::make_unique<CameraQt65QMediaCaptureSession::CameraBackend>()
+        );
+#ifdef _WIN32
+        m_backends.emplace_back(
+            "qt6-QQuickWidget", "Qt6: QQuickWidget",
+            std::make_unique<CameraQt6_QQuickWidget::CameraBackend>()
+        );
+#else
+        if (IS_BETA_VERSION || STATIC_GLOBALS.DEVELOPER_MODE){
+            m_backends.emplace_back(
+                "qt6-QQuickWidget", "Qt6: QQuickWidget",
+                std::make_unique<CameraQt6_QQuickWidget::CameraBackend>()
+            );
+        }
 #endif
 
         size_t items = 0;
@@ -65,7 +77,7 @@ struct CameraBackends{
     }
 
     std::vector<CameraEntry> m_backends;
-    IntegerEnumDatabase m_database;
+    IntegerEnumDropdownDatabase m_database;
 };
 
 
@@ -74,11 +86,11 @@ VideoBackendOption::VideoBackendOption()
     : IntegerEnumDropdownOption(
         "<b>Video Pipeline Backend:</b>",
         CameraBackends::instance().m_database,
-        LockWhileRunning::LOCKED,
-#if QT_VERSION_MAJOR == 5
-        0
-#elif QT_VERSION_MAJOR == 6
-        0
+        LockMode::LOCK_WHILE_RUNNING,
+#ifdef _WIN32
+        2
+#else
+        1
 #endif
     )
 {}
@@ -87,23 +99,37 @@ VideoBackendOption::VideoBackendOption()
 
 
 
+const CameraBackend& get_camera_backend(){
+    size_t index = GlobalSettings::instance().VIDEO_PIPELINE->VIDEO_BACKEND0.current_value();
+    const CameraBackends& backends = CameraBackends::instance();
+    if (index >= backends.m_backends.size()){
+        index = 1;
+    }
+    return *backends.m_backends[index].backend;
+}
+
 
 
 std::vector<CameraInfo> get_all_cameras(){
-    size_t index = GlobalSettings::instance().VIDEO_BACKEND.current_value();
-    const CameraBackend& backend = *CameraBackends::instance().m_backends[index].backend;
-    return backend.get_all_cameras();
+    const CameraBackend& backend = get_camera_backend();
+//    global_logger_tagged().log("Start loading camera list...");
+//    WallClock start = current_time();
+    std::vector<CameraInfo> ret = backend.get_all_cameras();
+//    WallClock end = current_time();
+//    double seconds = std::chrono::duration_cast<std::chrono::milliseconds>(end - start).count() / 1000.;
+//    global_logger_tagged().log("Done loading camera list... " + tostr_fixed(seconds, 3) + " seconds");
+    return ret;
 }
 std::string get_camera_name(const CameraInfo& info){
-    size_t index = GlobalSettings::instance().VIDEO_BACKEND.current_value();
-    const CameraBackend& backend = *CameraBackends::instance().m_backends[index].backend;
-    return backend.get_camera_name(info);
-}
-const CameraBackend& get_camera_backend(){
-    size_t index = GlobalSettings::instance().VIDEO_BACKEND.current_value();
-    return *CameraBackends::instance().m_backends[index].backend;
+    const CameraBackend& backend = get_camera_backend();
+//    global_logger_tagged().log("Start reading camera name...");
+//    WallClock start = current_time();
+    std::string ret = backend.get_camera_name(info);
+//    WallClock end = current_time();
+//    double seconds = std::chrono::duration_cast<std::chrono::milliseconds>(end - start).count() / 1000.;
+//    global_logger_tagged().log("Done reading camera name... " + tostr_fixed(seconds, 3) + " seconds");
+    return ret;
 }
 
 
-
 }
diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraImplementations.h b/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraImplementations.h
index 1da712d9b1..b7cac8f497 100644
--- a/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraImplementations.h
+++ b/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraImplementations.h
@@ -1,19 +1,16 @@
 /*  Camera Implementations
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifndef PokemonAutomation_VideoPipeline_CameraImplementations_H
 #define PokemonAutomation_VideoPipeline_CameraImplementations_H
 
-#include <functional>
 #include <vector>
 #include "Common/Cpp/Options/EnumDropdownOption.h"
-#include "CommonFramework/Logging/Logger.h"
+#include "CommonFramework/VideoPipeline/VideoSourceDescriptor.h"
 #include "CommonFramework/VideoPipeline/CameraInfo.h"
-#include "CommonFramework/VideoPipeline/CameraSession.h"
-#include "CommonFramework/VideoPipeline/UI/VideoWidget.h"
 
 namespace PokemonAutomation{
 
@@ -24,23 +21,43 @@ class VideoBackendOption : public IntegerEnumDropdownOption{
 };
 
 
-
+// Abstract base class for camera backend implementation.
+// Call `get_camera_backend()` to get the camera backend singleton.
+// Current camera backend is implemented in CameraWidgetQt6.h/cpp.
 class CameraBackend{
 public:
     virtual ~CameraBackend() = default;
 
+    // Get camera backend reference and get all cameras' info.
+    // Note: to avoid freezing the UI while launching the application, the camera backend when
+    // constructed, use a separate thread to query and load camera info. If you call
+    // `get_all_cameras()` immidiately after the backend is constructed, it may not give you
+    // all cameras' info.
     virtual std::vector<CameraInfo> get_all_cameras() const = 0;
     virtual std::string get_camera_name(const CameraInfo& info) const = 0;
 
-    virtual std::unique_ptr<CameraSession> make_camera(Logger& logger, Resolution default_resolution) const = 0;
+    virtual std::unique_ptr<VideoSource> make_video_source(
+        Logger& logger,
+        const CameraInfo& info,
+        Resolution resolution,
+        VideoFormat format,
+        FramesPerSecond fps
+    ) const = 0;
 };
 
 
+// Get the camera backend singleton.
+// Current camera backend is implemented in CameraWidgetQt6.h/cpp.
+const CameraBackend& get_camera_backend();
 
+// Call `get_camera_backend()` to get camera backend reference and get all cameras' info.
+// Note: to avoid freezing the UI while launching the application, the camera backend when
+// constructed, use a separate thread to query and load camera info. If you call
+// `get_all_cameras()` immidiately after the backend is constructed, it may not give you
+// all cameras' info.
 std::vector<CameraInfo> get_all_cameras();
 std::string get_camera_name(const CameraInfo& info);
 
-const CameraBackend& get_camera_backend();
 
 
 
diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt5.cpp b/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt5.cpp
deleted file mode 100644
index ecd258f277..0000000000
--- a/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt5.cpp
+++ /dev/null
@@ -1,460 +0,0 @@
-/*  Video Widget (Qt5)
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <QtGlobal>
-#if QT_VERSION_MAJOR == 5
-
-#include <QCameraInfo>
-#include <QVBoxLayout>
-#include "Common/Compiler.h"
-#include "Common/Cpp/Exceptions.h"
-#include "CommonFramework/GlobalSettingsPanel.h"
-#include "CommonFramework/VideoPipeline/CameraOption.h"
-#include "VideoToolsQt5.h"
-#include "CameraWidgetQt5.h"
-
-#include <iostream>
-using std::cout;
-using std::endl;
-
-namespace PokemonAutomation{
-namespace CameraQt5QCameraViewfinder{
-
-
-
-std::vector<CameraInfo> CameraBackend::get_all_cameras() const{
-    return qt5_get_all_cameras();
-}
-std::string CameraBackend::get_camera_name(const CameraInfo& info) const{
-    return qt5_get_camera_name(info);
-}
-std::unique_ptr<PokemonAutomation::CameraSession> CameraBackend::make_camera(Logger& logger, Resolution default_resolution) const{
-    return std::make_unique<CameraSession>(logger, default_resolution);
-}
-
-
-
-
-void CameraSession::add_listener(Listener& listener){
-    m_sanitizer.check_usage();
-    std::lock_guard<std::mutex> lg(m_lock);
-    m_listeners.insert(&listener);
-}
-void CameraSession::remove_listener(Listener& listener){
-    m_sanitizer.check_usage();
-    std::lock_guard<std::mutex> lg(m_lock);
-    m_listeners.erase(&listener);
-}
-
-CameraSession::~CameraSession(){
-    shutdown();
-}
-CameraSession::CameraSession(Logger& logger, Resolution default_resolution)
-    : m_logger(logger)
-    , m_default_resolution(default_resolution)
-    , m_last_orientation_attempt(WallClock::min())
-    , m_stats_conversion("ConvertFrame", "ms", 1000, std::chrono::seconds(10))
-{}
-
-void CameraSession::get(CameraOption& option){
-    std::lock_guard<std::mutex> lg(m_lock);
-    option.info = m_device;
-    option.current_resolution = m_resolution;
-}
-void CameraSession::set(const CameraOption& option){
-    QMetaObject::invokeMethod(this, [this, option]{
-        std::lock_guard<std::mutex> lg(m_lock);
-        shutdown();
-        m_device = option.info;
-        m_resolution = option.current_resolution;
-        startup();
-    });
-}
-void CameraSession::reset(){
-    QMetaObject::invokeMethod(this, [this]{
-        std::lock_guard<std::mutex> lg(m_lock);
-        shutdown();
-        startup();
-    });
-}
-void CameraSession::set_source(CameraInfo device){
-//    cout << "CameraSession::set_source()" << endl;
-    QMetaObject::invokeMethod(this, [this, device]{
-        std::lock_guard<std::mutex> lg(m_lock);
-        shutdown();
-        m_device = std::move(device);
-        startup();
-    });
-}
-void CameraSession::set_resolution(Resolution resolution){
-    QMetaObject::invokeMethod(this, [this, resolution]{
-        std::lock_guard<std::mutex> lg(m_lock);
-        if (!m_camera){
-            m_resolution = resolution;
-            return;
-        }
-        m_logger.log("Setting resolution to: " + resolution.to_string());
-        bool found = false;
-        for (const Resolution& res : m_resolutions){
-            if (res == resolution){
-                found = true;
-                break;
-            }
-        }
-        if (!found){
-            m_logger.log("Resolution not supported.", COLOR_RED);
-            return;
-        }
-        m_resolution = resolution;
-        QCameraViewfinderSettings settings = m_camera->viewfinderSettings();
-        settings.setResolution(QSize((int)resolution.width, (int)resolution.height));
-        m_camera->setViewfinderSettings(settings);
-        for (Listener* listener : m_listeners){
-            listener->resolution_change(resolution);
-        }
-    });
-}
-CameraInfo CameraSession::current_device() const{
-    std::lock_guard<std::mutex> lg(m_lock);
-    return m_device;
-}
-Resolution CameraSession::current_resolution() const{
-    std::lock_guard<std::mutex> lg(m_lock);
-    return m_resolution;
-}
-std::vector<Resolution> CameraSession::supported_resolutions() const{
-    std::lock_guard<std::mutex> lg(m_lock);
-    return m_resolutions;
-}
-
-
-
-VideoSnapshot CameraSession::direct_snapshot_image(){
-//    std::unique_lock<std::mutex> lg(m_lock);
-    if (m_camera == nullptr){
-        return VideoSnapshot();
-    }
-    return m_screenshotter->snapshot();
-}
-QImage CameraSession::direct_snapshot_probe(bool flip_vertical){
-//    std::lock_guard<std::mutex> lg(m_lock);
-    if (m_camera == nullptr){
-        return QImage();
-    }
-
-    QVideoFrame frame;
-    {
-        SpinLockGuard lg1(m_frame_lock);
-        frame = m_last_frame;
-    }
-
-    return frame_to_image(m_logger, frame, flip_vertical);
-}
-VideoSnapshot CameraSession::snapshot_image(){
-//    cout << "snapshot_image()" << endl;
-//    std::unique_lock<std::mutex> lg(m_lock);
-
-    auto now = current_time();
-
-    if (m_camera == nullptr){
-        return VideoSnapshot{QImage(), now};
-    }
-
-    //  Frame is already cached and is not stale.
-    uint64_t frame_seqnum;
-    {
-        SpinLockGuard lg1(m_frame_lock);
-        frame_seqnum = m_last_frame_seqnum;
-        if (m_last_snapshot){
-            if (m_probe){
-                //  If we have the probe enabled, we know if a new frame has been pushed.
-//                cout << now - m_last_snapshot.load(std::memory_order_acquire) << endl;
-                if (m_last_image_seqnum == frame_seqnum){
-//                    cout << "cached 0" << endl;
-                    return m_last_snapshot;
-                }
-            }else{
-                //  Otherwise, we have to use time.
-//                cout << now - m_last_snapshot.load(std::memory_order_acquire) << endl;
-                if (m_last_snapshot.timestamp + m_frame_period > now){
-//                    cout << "cached 1" << endl;
-                    return m_last_snapshot;
-                }
-            }
-        }
-    }
-
-    m_last_snapshot = m_screenshotter->snapshot();
-    m_last_image_seqnum = frame_seqnum;
-    return m_last_snapshot;
-}
-VideoSnapshot CameraSession::snapshot_probe(){
-//    cout << "snapshot_probe()" << endl;
-//    std::lock_guard<std::mutex> lg(m_lock);
-
-    if (m_camera == nullptr){
-        return VideoSnapshot{QImage(), current_time()};
-    }
-
-    //  Frame is already cached and is not stale.
-    QVideoFrame frame;
-    WallClock frame_timestamp;
-    uint64_t frame_seqnum;
-    {
-        SpinLockGuard lg0(m_frame_lock);
-        frame_seqnum = m_last_frame_seqnum;
-        if (m_last_snapshot && m_last_image_seqnum == frame_seqnum){
-            return m_last_snapshot;
-        }
-        frame = m_last_frame;
-        frame_timestamp = m_last_frame_timestamp;
-    }
-
-    WallClock time0 = current_time();
-
-    m_last_snapshot = VideoSnapshot(
-        frame_to_image(m_logger, frame, m_flip_vertical),
-        frame_timestamp
-    );
-    m_last_image_seqnum = frame_seqnum;
-
-    WallClock time1 = current_time();
-    m_stats_conversion.report_data(m_logger, std::chrono::duration_cast<std::chrono::microseconds>(time1 - time0).count());
-
-    return m_last_snapshot;
-}
-bool CameraSession::determine_frame_orientation(){
-    //  Qt 5.12 is really shitty in that there's no way to figure out the
-    //  orientation of a QVideoFrame. So here we'll try to figure it out
-    //  the poor man's way. Snapshot using both QCameraImageCapture and
-    //  QVideoProbe and compare them.
-
-    //  This function cannot be called on the UI thread.
-    //  This function must be called under the lock.
-
-    VideoSnapshot reference = direct_snapshot_image();
-    QImage frame = direct_snapshot_probe(false);
-    m_orientation_known = PokemonAutomation::determine_frame_orientation(m_logger, reference, frame, m_flip_vertical);
-    return m_orientation_known;
-}
-VideoSnapshot CameraSession::snapshot(){
-    std::unique_lock<std::mutex> lg(m_lock);
-
-    //  Frame screenshots are disabled.
-    if (!GlobalSettings::instance().ENABLE_FRAME_SCREENSHOTS){
-        return snapshot_image();
-    }
-
-    //  QVideoFrame is enabled and ready!
-    if (m_probe && m_orientation_known){
-        return snapshot_probe();
-    }
-
-    //  If probing is enabled and we don't know the frame orientation, try to
-    //  figure it out. But don't try too often if we fail.
-    if (m_probe && !m_orientation_known){
-        WallClock now = current_time();
-        if (m_last_orientation_attempt + std::chrono::seconds(10) < now){
-            m_orientation_known = determine_frame_orientation();
-            m_last_orientation_attempt = now;
-        }
-    }
-
-    if (m_orientation_known){
-        return snapshot_probe();
-    }else{
-        return snapshot_image();
-    }
-}
-double CameraSession::fps_source(){
-    SpinLockGuard lg(m_frame_lock);
-    return m_fps_tracker.events_per_second();
-}
-double CameraSession::fps_display(){
-    return -1;
-}
-
-
-
-
-void CameraSession::shutdown(){
-    if (m_camera == nullptr){
-        return;
-    }
-
-    m_logger.log("Stopping Camera...");
-
-    m_camera->stop();
-    for (Listener* listener : m_listeners){
-        listener->shutdown();
-    }
-
-    m_screenshotter.reset();
-
-    delete m_camera;
-    m_camera = nullptr;
-    m_probe = nullptr;
-
-    m_last_frame = QVideoFrame();
-    m_last_frame_timestamp = current_time();
-    m_last_frame_seqnum++;
-
-    SpinLockGuard lg(m_frame_lock);
-
-    m_last_frame = QVideoFrame();
-    m_last_frame_timestamp = current_time();
-    m_last_frame_seqnum++;
-
-    m_last_image_seqnum = m_last_frame_seqnum;
-}
-void CameraSession::startup(){
-    if (!m_device){
-        return;
-    }
-    m_logger.log("Starting Camera: Backend = CameraQt5QCameraViewfinder");
-
-    {
-        QByteArray data = QByteArray::fromStdString(m_device.device_name());
-        m_camera = new QCamera(QCameraInfo(data), this);
-    }
-
-    //  Setup the screenshot capture.
-    m_probe = new QVideoProbe(m_camera);
-#if 1
-    if (!m_probe->setSource(m_camera)){
-//        m_use_probe_frames = false;
-        m_logger.log("Unable to initialize QVideoProbe() capture.", COLOR_RED);
-        delete m_probe;
-        m_probe = nullptr;
-    }
-#endif
-
-    m_camera->start();
-
-    QCameraViewfinderSettings settings = m_camera->viewfinderSettings();
-    m_max_frame_rate = settings.maximumFrameRate();
-    m_frame_period = std::chrono::milliseconds(25);
-    if (0 < m_max_frame_rate){
-        m_frame_period = std::chrono::milliseconds((uint64_t)(1.0 / m_max_frame_rate * 1000));
-    }
-
-    bool default_found = false;
-    bool desired_found = false;
-    for (const auto& size : m_camera->supportedViewfinderResolutions()){
-        Resolution resolution = Resolution(size.width(), size.height());
-        m_resolutions.emplace_back(resolution);
-        default_found |= resolution == m_default_resolution;
-        desired_found |= resolution == m_resolution;
-    }
-
-    if (desired_found){
-        settings.setResolution(QSize((int)m_resolution.width, (int)m_resolution.height));
-        m_camera->setViewfinderSettings(settings);
-    }else if (default_found){
-        settings.setResolution(QSize((int)m_default_resolution.width, (int)m_default_resolution.height));
-        m_camera->setViewfinderSettings(settings);
-        m_resolution = m_default_resolution;
-    }else{
-        QSize resolution = settings.resolution();
-        m_resolution = Resolution(resolution.width(), resolution.height());
-    }
-
-    m_screenshotter.reset(new CameraScreenshotter(m_logger, *m_camera));
-
-    if (m_probe){
-        connect(
-            m_probe, &QVideoProbe::videoFrameProbed,
-            this, [this](const QVideoFrame& frame){
-                WallClock now = current_time();
-                SpinLockGuard lg(m_frame_lock);
-                if (GlobalSettings::instance().ENABLE_FRAME_SCREENSHOTS){
-                    m_last_frame = frame;
-                }
-                m_last_frame_timestamp = now;
-                m_last_frame_seqnum++;
-            },
-            Qt::DirectConnection
-        );
-    }
-
-    for (Listener* listener : m_listeners){
-        listener->new_source(m_device, m_resolution);
-    }
-}
-
-PokemonAutomation::VideoWidget* CameraSession::make_QtWidget(QWidget* parent){
-    return new VideoWidget(parent, *this);
-}
-
-
-
-
-
-
-VideoWidget::VideoWidget(QWidget* parent, CameraSession& session)
-    : PokemonAutomation::VideoWidget(parent)
-    , m_session(session)
-{
-    this->setMinimumSize(80, 45);
-
-    QVBoxLayout* layout = new QVBoxLayout(this);
-    layout->setAlignment(Qt::AlignTop);
-    layout->setContentsMargins(0, 0, 0, 0);
-
-    //  Setup the video display.
-    m_camera_view = new QCameraViewfinder(this);
-    layout->addWidget(m_camera_view);
-    m_camera_view->setMinimumSize(80, 45);
-    m_camera_view->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
-
-    if (session.m_camera){
-        session.m_camera->setViewfinder(m_camera_view);
-    }
-
-    session.add_listener(*this);
-}
-VideoWidget::~VideoWidget(){
-    m_session.remove_listener(*this);
-    if (m_session.m_camera){
-        m_session.m_camera->setViewfinder((QCameraViewfinder*)nullptr);
-    }
-}
-
-
-void VideoWidget::shutdown(){
-//    cout << "VideoWidget::shutdown() - start" << endl;
-    if (m_session.m_camera){
-        m_session.m_camera->setViewfinder((QCameraViewfinder*)nullptr);
-    }
-//    cout << "VideoWidget::shutdown() - end" << endl;
-}
-void VideoWidget::new_source(const CameraInfo& device, Resolution resolution){
-//    cout << "VideoWidget::new_source" << endl;
-    m_session.m_camera->setViewfinder(m_camera_view);
-}
-void VideoWidget::resolution_change(Resolution resolution){
-
-}
-//void VideoWidget::resizeEvent(QResizeEvent* event){
-//    cout << "VideoWidget: " << this->width() << " x " << this->height() << endl;
-//    cout << "Viewfinder: " << m_camera_view->width() << " x " << m_camera_view->height() << endl;
-//}
-
-
-
-
-
-
-
-
-
-
-
-
-}
-}
-#endif
-
diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt5.h b/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt5.h
deleted file mode 100644
index adc0c716f8..0000000000
--- a/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt5.h
+++ /dev/null
@@ -1,170 +0,0 @@
-/*  Video Widget (Qt5)
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_VideoPipeline_Qt5VideoWidget_H
-#define PokemonAutomation_VideoPipeline_Qt5VideoWidget_H
-
-#include <QtGlobal>
-#if QT_VERSION_MAJOR == 5
-
-#include <set>
-#include <condition_variable>
-#include <QThread>
-#include <QCameraViewfinder>
-#include <QCameraImageCapture>
-#include <QVideoProbe>
-#include "Common/Cpp/EventRateTracker.h"
-#include "Common/Cpp/LifetimeSanitizer.h"
-#include "Common/Cpp/Concurrency/SpinLock.h"
-#include "CommonFramework/Logging/Logger.h"
-#include "CommonFramework/Inference/StatAccumulator.h"
-#include "CommonFramework/VideoPipeline/CameraInfo.h"
-#include "CommonFramework/VideoPipeline/UI/VideoWidget.h"
-#include "CameraImplementations.h"
-#include "VideoToolsQt5.h"
-
-namespace PokemonAutomation{
-namespace CameraQt5QCameraViewfinder{
-
-class VideoWidget;
-
-
-class CameraBackend : public PokemonAutomation::CameraBackend{
-public:
-    virtual std::vector<CameraInfo> get_all_cameras() const override;
-    virtual std::string get_camera_name(const CameraInfo& info) const override;
-
-    virtual std::unique_ptr<PokemonAutomation::CameraSession> make_camera(Logger& logger, Resolution default_resolution) const override;
-};
-
-
-
-
-class CameraSession : public QObject, public PokemonAutomation::CameraSession{
-public:
-    virtual void add_listener(Listener& listener) override;
-    virtual void remove_listener(Listener& listener) override;
-
-
-public:
-    virtual ~CameraSession();
-    CameraSession(Logger& logger, Resolution default_resolution);
-
-    virtual void get(CameraOption& option) override;
-    virtual void set(const CameraOption& option) override;
-
-    virtual void reset() override;
-    virtual void set_source(CameraInfo device) override;
-    virtual void set_resolution(Resolution resolution) override;
-
-    virtual CameraInfo current_device() const override;
-    virtual Resolution current_resolution() const override;
-    virtual std::vector<Resolution> supported_resolutions() const override;
-
-    virtual VideoSnapshot snapshot() override;
-    virtual double fps_source() override;
-    virtual double fps_display() override;
-
-    QVideoFrame latest_frame();
-
-    virtual PokemonAutomation::VideoWidget* make_QtWidget(QWidget* parent) override;
-
-
-private:
-    //  These must be run on the UI thread.
-    void shutdown();
-    void startup();
-
-
-private:
-    //  All of these must be called under the lock.
-    VideoSnapshot direct_snapshot_image();
-    QImage direct_snapshot_probe(bool flip_vertical);
-
-    VideoSnapshot snapshot_image();
-    VideoSnapshot snapshot_probe();
-
-    bool determine_frame_orientation();
-
-
-private:
-    friend class VideoWidget;
-
-    Logger& m_logger;
-    Resolution m_default_resolution;
-
-    //  If you need both locks, acquire "m_lock" first.
-    mutable std::mutex m_lock;
-    SpinLock m_frame_lock;
-
-    CameraInfo m_device;
-    Resolution m_resolution;
-
-    QCamera* m_camera = nullptr;
-    std::unique_ptr<CameraScreenshotter> m_screenshotter;
-
-    size_t m_max_frame_rate;
-    std::chrono::milliseconds m_frame_period;
-    std::vector<Resolution> m_resolutions;
-
-    EventRateTracker m_fps_tracker;
-
-//    SpinLock m_capture_lock;
-    QVideoProbe* m_probe = nullptr;
-    WallClock m_last_orientation_attempt;
-    bool m_orientation_known = false;
-//    bool m_use_probe_frames = false;
-    bool m_flip_vertical = false;
-
-    //  Last Frame
-    QVideoFrame m_last_frame;
-    WallClock m_last_frame_timestamp;
-    uint64_t m_last_frame_seqnum = 0;
-
-    //  Last Cached Image
-//    QImage m_last_image;
-//    WallClock m_last_image_timestamp;
-    VideoSnapshot m_last_snapshot;
-    uint64_t m_last_image_seqnum = 0;
-    PeriodicStatsReporterI32 m_stats_conversion;
-
-    std::set<Listener*> m_listeners;
-
-    LifetimeSanitizer m_sanitizer;
-};
-
-
-
-class VideoWidget : public PokemonAutomation::VideoWidget, private CameraSession::Listener{
-public:
-    VideoWidget(QWidget* parent, CameraSession& session);
-    virtual ~VideoWidget();
-
-    virtual PokemonAutomation::CameraSession& camera() override{ return m_session; }
-
-private:
-    virtual void shutdown() override;
-    virtual void new_source(const CameraInfo& device, Resolution resolution) override;
-    virtual void resolution_change(Resolution resolution) override;
-
-//    virtual void resizeEvent(QResizeEvent* event) override;
-
-private:
-    CameraSession& m_session;
-    QCameraViewfinder* m_camera_view = nullptr;
-};
-
-
-
-
-
-
-
-
-}
-}
-#endif
-#endif
diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt6.5.cpp b/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt6.5.cpp
new file mode 100644
index 0000000000..fc6ceeceaf
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt6.5.cpp
@@ -0,0 +1,245 @@
+/*  Camera Widget (Qt6.5)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <QCamera>
+#include <QVideoSink>
+#include "Common/Qt/Redispatch.h"
+#include "CommonFramework/Logging/Logger.h"
+#include "VideoFrameQt.h"
+#include "QFormatAggregator.h"
+#include "MediaServicesQt6.h"
+#include "CameraWidgetQt6.5.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace CameraQt65QMediaCaptureSession{
+
+
+
+
+
+
+std::vector<CameraInfo> CameraBackend::get_all_cameras() const{
+    const auto cameras = GlobalMediaServices::instance().get_all_cameras();
+    std::vector<CameraInfo> ret;
+    for (const auto& info : cameras){
+        ret.emplace_back(info.id().toStdString());
+    }
+    return ret;
+}
+std::string CameraBackend::get_camera_name(const CameraInfo& info) const{
+    const auto cameras = GlobalMediaServices::instance().get_all_cameras();
+    for (const auto& camera : cameras){
+        if (camera.id().toStdString() == info.device_name()){
+            return camera.description().toStdString();
+        }
+    }
+    global_logger_tagged().log(
+        "Error: No such camera for CameraInfo: " + info.device_name(),
+        COLOR_RED
+    );
+    return "";
+}
+std::unique_ptr<VideoSource> CameraBackend::make_video_source(
+    Logger& logger,
+    const CameraInfo& info,
+    Resolution resolution,
+    VideoFormat format,
+    FramesPerSecond fps
+) const{
+    return std::make_unique<CameraVideoSource>(logger, info, resolution, format, fps);
+}
+
+
+
+
+
+
+
+CameraVideoSource::~CameraVideoSource(){
+    if (!m_capture_session){
+        return;
+    }
+    try{
+        m_logger.log("Stopping Camera...");
+    }catch (...){}
+
+    run_on_main_thread_and_wait([&]{
+//        m_camera->stop();
+        m_capture_session.reset();
+        m_camera.reset();
+    });
+}
+CameraVideoSource::CameraVideoSource(
+    Logger& logger,
+    const CameraInfo& info,
+    Resolution desired_resolution,
+    VideoFormat desired_format,
+    FramesPerSecond desired_fps
+)
+    : VideoSource(logger, true)
+    , m_logger(logger)
+    , m_last_frame(logger)
+    , m_snapshot_manager(logger, m_last_frame)
+{
+//    cout << "desired_resolution = " << desired_resolution.width << " x " << desired_resolution.height << endl;
+//    cout << "desired_fps = " << desired_fps << endl;
+
+    if (!info){
+        return;
+    }
+    m_logger.log("Starting Camera: Backend = CameraQt65QMediaCaptureSession");
+
+    run_on_main_thread_and_wait([&]{
+        init(info, desired_resolution, desired_format, desired_fps);
+    });
+}
+void CameraVideoSource::init(
+    const CameraInfo& info,
+    Resolution desired_resolution,
+    VideoFormat desired_format,
+    FramesPerSecond desired_fps
+){
+    m_metaobject.reset(new QObject());
+
+    auto cameras = QMediaDevices::videoInputs();
+    const QCameraDevice* device = nullptr;
+    for (const auto& camera : cameras){
+        if (camera.id().toStdString() == info.device_name()){
+            device = &camera;
+            break;
+        }
+    }
+    if (device == nullptr){
+        m_logger.log("Camera not found: " + info.device_name(), COLOR_RED);
+        return;
+    }
+    m_logger.log("Camera: " + device->description().toStdString());
+
+    QCameraFormat format = build_format_set(
+        m_logger,
+        m_formats,
+        *device,
+        desired_resolution,
+        desired_format,
+        desired_fps
+    );
+    if (format.isNull()){
+        return;
+    }
+
+    get_format(format, m_resolution, m_format, m_fps);
+    m_logger.log(
+        "Resolution: " + m_resolution.to_string() +
+        ", Format: " + VideoFormat_database().find(m_format)->display +
+        ", FPS: " + std::to_string(m_fps)
+    );
+
+    m_camera.reset(new QCameraThread(m_logger, *device, format));
+
+    m_capture_session.reset(new QMediaCaptureSession());
+    m_capture_session->setCamera(&m_camera->camera());
+
+#if 0
+    connect(m_camera.get(), &QCamera::errorOccurred, this, [&](){
+        if (m_camera->error() == QCamera::NoError){
+            return;
+        }
+        m_logger.log("QCamera error: " + m_camera->errorString().toStdString(), COLOR_RED);
+    });
+
+    m_camera->start();
+#endif
+}
+
+
+void CameraVideoSource::set_video_output(QGraphicsVideoItem& item){
+    if (m_capture_session == nullptr){
+        return;
+    }
+    if (m_capture_session->videoSink() == item.videoSink()){
+        return;
+    }
+    m_capture_session->setVideoOutput(&item);
+
+    m_metaobject->connect(
+        item.videoSink(), &QVideoSink::videoFrameChanged,
+        &m_camera->camera(), [&](const QVideoFrame& frame){
+            //  This runs on the QCamera's thread. So it is off the critical path.
+
+            WallClock now = current_time();
+            if (!m_last_frame.push_frame(frame, now)){
+                return;
+            }
+            report_source_frame(std::make_shared<VideoFrame>(now, frame));
+        }
+    );
+}
+
+
+
+
+
+
+QWidget* CameraVideoSource::make_display_QtWidget(QWidget* parent){
+    return new CameraVideoDisplay(parent, *this);
+}
+
+
+
+
+
+
+
+
+CameraVideoDisplay::CameraVideoDisplay(QWidget* parent, CameraVideoSource& source)
+    : QWidget(parent)
+    , m_source(source)
+    , m_view(new StaticQGraphicsView(this))
+    , m_sanitizer("CameraVideoDisplay")
+{
+    this->setMinimumSize(80, 45);
+    m_view->setFixedSize(this->size());
+    m_view->setScene(&m_scene);
+    m_video.setSize(this->size());
+    m_scene.setSceneRect(QRectF(QPointF(0, 0), this->size()));
+    m_scene.addItem(&m_video);
+    source.set_video_output(m_video);
+
+    connect(
+        &m_scene, &QGraphicsScene::changed,
+        this, [&](const QList<QRectF>&){
+            auto scope_check = m_sanitizer.check_scope();
+            m_source.report_rendered_frame(current_time());
+        }
+    );
+}
+void CameraVideoDisplay::resizeEvent(QResizeEvent* event){
+    auto scope_check = m_sanitizer.check_scope();
+    m_view->setFixedSize(this->size());
+    m_scene.setSceneRect(QRectF(QPointF(0, 0), this->size()));
+    m_video.setSize(this->size());
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt6.5.h b/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt6.5.h
new file mode 100644
index 0000000000..163f3d7be0
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt6.5.h
@@ -0,0 +1,185 @@
+/*  Camera Widget (Qt6.5)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  Use QGraphicsScene to display the video.
+ *
+ *  This is a failed attempt to get hardware acceleration.
+ *  QGraphicsScene does not do hardware acceleration.
+ *
+ */
+
+#ifndef PokemonAutomation_VideoPipeline_Qt65VideoWidget_H
+#define PokemonAutomation_VideoPipeline_Qt65VideoWidget_H
+
+#include <QCameraDevice>
+#include <QMediaCaptureSession>
+#include <QVideoFrame>
+#include <QVideoWidget>
+#include <QGraphicsView>
+#include <QGraphicsVideoItem>
+#include "CommonFramework/Tools/StatAccumulator.h"
+#include "CommonFramework/VideoPipeline/VideoSource.h"
+#include "CommonFramework/VideoPipeline/CameraInfo.h"
+#include "QCameraThread.h"
+#include "QVideoFrameCache.h"
+#include "SnapshotManager.h"
+#include "CameraImplementations.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+class QCamera;
+class QVideoSink;
+
+namespace PokemonAutomation{
+namespace CameraQt65QMediaCaptureSession{
+
+class VideoDisplayWidget;
+
+
+class CameraBackend : public PokemonAutomation::CameraBackend{
+public:
+    virtual std::vector<CameraInfo> get_all_cameras() const override;
+    virtual std::string get_camera_name(const CameraInfo& info) const override;
+
+    virtual std::unique_ptr<VideoSource> make_video_source(
+        Logger& logger,
+        const CameraInfo& info,
+        Resolution resolution,
+        VideoFormat format,
+        FramesPerSecond fps
+    ) const override;
+};
+
+
+class StaticQGraphicsView : public QGraphicsView{
+public:
+    StaticQGraphicsView(QWidget* parent)
+        : QGraphicsView(parent)
+    {
+        setContentsMargins(QMargins(0, 0, 0, 0));
+        setFrameShape(QFrame::NoFrame);
+        setStyleSheet("QGraphicsView { border-style: none; }");
+        setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+        setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+        setFocusPolicy(Qt::FocusPolicy::NoFocus);
+    }
+
+    virtual void wheelEvent(QWheelEvent* e) override{
+        QFrame::wheelEvent(e);
+    }
+    virtual void resizeEvent(QResizeEvent* e) override{
+        QFrame::resizeEvent(e);
+    }
+
+    //  QGraphicsView doesn't like to propagate mouse events.
+    //  https://forum.qt.io/topic/152138/struggling-with-mouse-events/2
+    virtual void mousePressEvent(QMouseEvent* event) override{
+        QWidget::mousePressEvent(event);
+    }
+    virtual void mouseReleaseEvent(QMouseEvent* event) override{
+        QWidget::mouseReleaseEvent(event);
+    }
+    virtual void mouseMoveEvent(QMouseEvent* event) override{
+        QWidget::mouseMoveEvent(event);
+    }
+
+};
+
+
+
+
+
+class CameraVideoSource : public VideoSource{
+public:
+    virtual ~CameraVideoSource();
+    CameraVideoSource(
+        Logger& logger,
+        const CameraInfo& info,
+        Resolution desired_resolution,
+        VideoFormat desired_format,
+        FramesPerSecond desired_fps
+    );
+
+    virtual Resolution current_resolution() const override{
+        return m_resolution;
+    }
+    virtual VideoFormat current_format() const override{
+        return m_format;
+    }
+    virtual FramesPerSecond current_fps() const override{
+        return m_fps;
+    }
+    virtual const VideoFormatSet& supported_formats() const override{
+        return m_formats;
+    }
+
+    virtual VideoSnapshot snapshot_latest_blocking() override{
+        return m_snapshot_manager.snapshot_latest_blocking();
+    }
+    virtual VideoSnapshot snapshot_recent_nonblocking(WallClock min_time) override{
+        return m_snapshot_manager.snapshot_recent_nonblocking(min_time);
+    }
+
+    virtual QWidget* make_display_QtWidget(QWidget* parent) override;
+
+private:
+    void init(
+        const CameraInfo& info,
+        Resolution desired_resolution,
+        VideoFormat desired_format,
+        FramesPerSecond desired_fps
+    );
+    void set_video_output(QGraphicsVideoItem& item);
+
+
+private:
+    friend class CameraVideoDisplay;
+
+    std::unique_ptr<QObject> m_metaobject;
+
+    Logger& m_logger;
+    Resolution m_resolution;
+    VideoFormat m_format;
+    FramesPerSecond m_fps;
+
+    std::unique_ptr<QCameraThread> m_camera;
+    std::unique_ptr<QVideoSink> m_video_sink;
+    std::unique_ptr<QMediaCaptureSession> m_capture_session;
+
+    VideoFormatSet m_formats;
+
+
+private:
+    QVideoFrameCache m_last_frame;
+    SnapshotManager m_snapshot_manager;
+};
+
+
+class CameraVideoDisplay : public QWidget{
+public:
+    CameraVideoDisplay(QWidget* parent, CameraVideoSource& source);
+
+private:
+    virtual void resizeEvent(QResizeEvent* event) override;
+
+private:
+    CameraVideoSource& m_source;
+
+    StaticQGraphicsView* m_view;
+    QGraphicsScene m_scene;
+    QGraphicsVideoItem m_video;
+
+    LifetimeSanitizer m_sanitizer;
+};
+
+
+
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt6.cpp b/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt6.cpp
index 170bbdfee4..13b6dff18d 100644
--- a/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt6.cpp
+++ b/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt6.cpp
@@ -1,22 +1,19 @@
-/*  Video Widget (Qt6)
+/*  Camera Widget (Qt6)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include <QtGlobal>
-#if QT_VERSION_MAJOR == 6
-
-#include <chrono>
-#include <iostream>
 #include <QCamera>
 #include <QPainter>
-#include <QMediaDevices>
 #include <QVideoSink>
-//#include "Common/Cpp/Exceptions.h"
-#include "CommonFramework/VideoPipeline/CameraOption.h"
+#include "Common/Qt/Redispatch.h"
+#include "VideoFrameQt.h"
+#include "QFormatAggregator.h"
+#include "MediaServicesQt6.h"
 #include "CameraWidgetQt6.h"
 
+//#include <iostream>
 //using std::cout;
 //using std::endl;
 
@@ -25,16 +22,19 @@ namespace CameraQt6QVideoSink{
 
 
 
+
+
+
 std::vector<CameraInfo> CameraBackend::get_all_cameras() const{
+    const auto cameras = GlobalMediaServices::instance().get_all_cameras();
     std::vector<CameraInfo> ret;
-    const auto cameras = QMediaDevices::videoInputs();
     for (const auto& info : cameras){
         ret.emplace_back(info.id().toStdString());
     }
     return ret;
 }
 std::string CameraBackend::get_camera_name(const CameraInfo& info) const{
-    const auto cameras = QMediaDevices::videoInputs();
+    const auto cameras = GlobalMediaServices::instance().get_all_cameras();
     for (const auto& camera : cameras){
         if (camera.id().toStdString() == info.device_name()){
             return camera.description().toStdString();
@@ -43,347 +43,167 @@ std::string CameraBackend::get_camera_name(const CameraInfo& info) const{
     std::cout << "Error: no such camera for CameraInfo: " << info.device_name() << std::endl;
     return "";
 }
-std::unique_ptr<PokemonAutomation::CameraSession> CameraBackend::make_camera(Logger& logger, Resolution default_resolution) const{
-    return std::make_unique<CameraSession>(logger, default_resolution);
-}
-
-
-
-
-
-
-
-void CameraSession::add_listener(Listener& listener){
-    m_sanitizer.check_usage();
-    std::lock_guard<std::mutex> lg(m_lock);
-    m_ui_listeners.insert(&listener);
-}
-void CameraSession::remove_listener(Listener& listener){
-    m_sanitizer.check_usage();
-    std::lock_guard<std::mutex> lg(m_lock);
-    m_ui_listeners.erase(&listener);
-}
-void CameraSession::add_listener(FrameListener& listener){
-    m_sanitizer.check_usage();
-    std::lock_guard<std::mutex> lg(m_lock);
-    m_frame_listeners.insert(&listener);
-}
-void CameraSession::remove_listener(FrameListener& listener){
-    m_sanitizer.check_usage();
-    std::lock_guard<std::mutex> lg(m_lock);
-    m_frame_listeners.erase(&listener);
-}
-
-CameraSession::~CameraSession(){
-    shutdown();
-}
-CameraSession::CameraSession(Logger& logger, Resolution default_resolution)
-    : m_logger(logger)
-    , m_default_resolution(default_resolution)
-    , m_resolution(default_resolution)
-    , m_last_frame_seqnum(0)
-    , m_last_image_timestamp(WallClock::min())
-    , m_stats_conversion("ConvertFrame", "ms", 1000, std::chrono::seconds(10))
-{}
-
-void CameraSession::get(CameraOption& option){
-    std::lock_guard<std::mutex> lg(m_lock);
-    option.info = m_device;
-    option.current_resolution = m_resolution;
-}
-void CameraSession::set(const CameraOption& option){
-    QMetaObject::invokeMethod(this, [this, option]{
-        std::lock_guard<std::mutex> lg(m_lock);
-        shutdown();
-        m_device = option.info;
-        m_resolution = option.current_resolution;
-        startup();
-    });
-}
-void CameraSession::reset(){
-    QMetaObject::invokeMethod(this, [this]{
-        std::lock_guard<std::mutex> lg(m_lock);
-        shutdown();
-        startup();
-    });
+std::unique_ptr<VideoSource> CameraBackend::make_video_source(
+    Logger& logger,
+    const CameraInfo& info,
+    Resolution resolution,
+    VideoFormat format,
+    FramesPerSecond fps
+) const{
+    return std::make_unique<CameraVideoSource>(logger, info, resolution, format, fps);
 }
-void CameraSession::set_source(CameraInfo device){
-//    cout << "CameraSession::set_source()" << endl;
-    QMetaObject::invokeMethod(this, [this, device]{
-        std::lock_guard<std::mutex> lg(m_lock);
-        shutdown();
-        m_device = std::move(device);
-        startup();
-    });
-}
-void CameraSession::set_resolution(Resolution resolution){
-    QMetaObject::invokeMethod(this, [this, resolution]{
-        std::lock_guard<std::mutex> lg(m_lock);
-        if (!m_capture){
-            m_resolution = resolution;
-            return;
-        }
-        m_logger.log("Setting resolution to: " + resolution.to_string());
-        auto iter = m_resolution_map.find(resolution);
-        if (iter == m_resolution_map.end()){
-            m_logger.log("Resolution not supported.", COLOR_RED);
-            return;
-        }
-        m_resolution = resolution;
-        m_camera->stop();
-        m_camera->setCameraFormat(*iter->second);
-        m_camera->start();
-        for (Listener* listener : m_ui_listeners){
-            listener->resolution_change(resolution);
-        }
-    });
-}
-CameraInfo CameraSession::current_device() const{
-    std::lock_guard<std::mutex> lg(m_lock);
-    return m_device;
-}
-Resolution CameraSession::current_resolution() const{
-    std::lock_guard<std::mutex> lg(m_lock);
-    return m_resolution;
-}
-std::vector<Resolution> CameraSession::supported_resolutions() const{
-    std::lock_guard<std::mutex> lg(m_lock);
-    std::vector<Resolution> ret;
-    for (const auto& item : m_resolution_map){
-        ret.emplace_back(item.first);
-    }
-    return ret;
-}
-std::pair<QVideoFrame, uint64_t> CameraSession::latest_frame(){
-    SpinLockGuard lg(m_frame_lock);
-    return {m_last_frame, m_last_frame_seqnum};
-}
-void CameraSession::report_rendered_frame(WallClock timestamp){
-    SpinLockGuard lg(m_frame_lock);
-    m_fps_tracker_display.push_event(timestamp);
-}
-
-VideoSnapshot CameraSession::snapshot(){
-    //  Prevent multiple concurrent screenshots from entering here.
-    std::lock_guard<std::mutex> lg(m_lock);
-
-    if (m_camera == nullptr){
-        return VideoSnapshot();
-    }
-
-    //  Frame is already cached and is not stale.
-    QVideoFrame frame;
-    WallClock frame_timestamp;
-    uint64_t frame_seqnum;
-    {
-        SpinLockGuard lg0(m_frame_lock);
-        frame_seqnum = m_last_frame_seqnum;
-        if (!m_last_image.isNull() && m_last_image_seqnum == frame_seqnum){
-            return VideoSnapshot(m_last_image, m_last_image_timestamp);
-        }
-        frame = m_last_frame;
-        frame_timestamp = m_last_frame_timestamp;
-    }
-
-    if (!frame.isValid()){
-        global_logger_tagged().log("QVideoFrame is null.", COLOR_RED);
-        return VideoSnapshot();
-    }
 
-    WallClock time0 = current_time();
 
-    QImage image = frame.toImage();
-    QImage::Format format = image.format();
-    if (format != QImage::Format_ARGB32 && format != QImage::Format_RGB32){
-        image = image.convertToFormat(QImage::Format_ARGB32);
-    }
 
-    m_last_image = std::move(image);
-    m_last_image_timestamp = frame_timestamp;
-    m_last_image_seqnum = frame_seqnum;
 
-    WallClock time1 = current_time();
-    m_stats_conversion.report_data(m_logger, std::chrono::duration_cast<std::chrono::microseconds>(time1 - time0).count());
 
-    return VideoSnapshot(m_last_image, m_last_image_timestamp);
-}
-double CameraSession::fps_source(){
-    SpinLockGuard lg(m_frame_lock);
-    return m_fps_tracker_source.events_per_second();
-}
-double CameraSession::fps_display(){
-    SpinLockGuard lg(m_frame_lock);
-    return m_fps_tracker_display.events_per_second();
-}
 
-
-void CameraSession::shutdown(){
+CameraVideoSource::~CameraVideoSource(){
     if (!m_capture){
         return;
     }
-    m_logger.log("Stopping Camera...");
-
-    m_camera->stop();
-    for (Listener* listener : m_ui_listeners){
-        listener->shutdown();
-    }
-    m_capture.reset();
-    m_video_sink.reset();
-    m_camera.reset();
-    m_resolution_map.clear();
-    m_formats.clear();
-
-    SpinLockGuard lg(m_frame_lock);
-
-    m_last_frame = QVideoFrame();
-    m_last_frame_timestamp = current_time();
-    m_last_frame_seqnum++;
+    try{
+        m_logger.log("Stopping Camera...");
+    }catch (...){}
 
-    m_last_image = QImage();
-    m_last_image_timestamp = m_last_frame_timestamp;
-    m_last_image_seqnum = m_last_frame_seqnum;
+//    cout << "Stopping Camera..." << endl;
 
+    run_on_main_thread_and_wait([&]{
+        m_metaobject.reset();
+//        m_camera->stop();
+        m_capture.reset();
+        m_video_sink.reset();
+        m_camera.reset();
+    });
 }
-void CameraSession::startup(){
-    if (!m_device){
+CameraVideoSource::CameraVideoSource(
+    Logger& logger,
+    const CameraInfo& info,
+    Resolution desired_resolution,
+    VideoFormat desired_format,
+    FramesPerSecond desired_fps
+)
+    : VideoSource(logger, true)
+    , m_logger(logger)
+    , m_last_frame(logger)
+    , m_snapshot_manager(logger, m_last_frame)
+{
+    if (!info){
         return;
     }
     m_logger.log("Starting Camera: Backend = CameraQt6QVideoSink");
 
+    run_on_main_thread_and_wait([&]{
+        init(info, desired_resolution, desired_format, desired_fps);
+    });
+}
+void CameraVideoSource::init(
+    const CameraInfo& info,
+    Resolution desired_resolution,
+    VideoFormat desired_format,
+    FramesPerSecond desired_fps
+){
+    m_metaobject.reset(new QObject());
+
     auto cameras = QMediaDevices::videoInputs();
     const QCameraDevice* device = nullptr;
     for (const auto& camera : cameras){
-        if (camera.id().toStdString() == m_device.device_name()){
+        if (camera.id().toStdString() == info.device_name()){
             device = &camera;
             break;
         }
     }
     if (device == nullptr){
-        m_logger.log("Camera not found: " + m_device.device_name(), COLOR_RED);
+        m_logger.log("Camera not found: " + info.device_name(), COLOR_RED);
         return;
     }
 
-    m_formats = device->videoFormats();
-    if (m_formats.empty()){
-        m_logger.log("No usable resolutions: " + device->description().toStdString(), COLOR_RED);
+    QCameraFormat format = build_format_set(
+        m_logger,
+        m_formats,
+        *device,
+        desired_resolution,
+        desired_format,
+        desired_fps
+    );
+    if (format.isNull()){
         return;
     }
 
-    m_resolution_map.clear();
-    for (const QCameraFormat& format : m_formats){
-        QSize resolution = format.resolution();
-        m_resolution_map.emplace(
-            std::piecewise_construct,
-            std::forward_as_tuple(resolution.width(), resolution.height()),
-            std::forward_as_tuple(&format)
-        );
-    }
-
-    const QCameraFormat* default_format = nullptr;
-    const QCameraFormat* desired_format = nullptr;
-    m_resolutions.clear();
-    for (const auto& item : m_resolution_map){
-        m_resolutions.emplace_back(item.first);
-        if (item.first == m_default_resolution){
-            default_format = item.second;
-        }
-        if (item.first == m_resolution){
-            desired_format = item.second;
-        }
-    }
-    if (desired_format == nullptr){
-        desired_format = default_format;
-    }
-    if (desired_format == nullptr){
-        desired_format = m_resolution_map.rbegin()->second;
-    }
-//    cout << "CameraSession::m_resolutions = " << m_resolutions.size() << endl;
-
-    QSize size = desired_format->resolution();
-    m_resolution = Resolution(size.width(), size.height());
+    get_format(format, m_resolution, m_format, m_fps);
+    m_logger.log(
+        "Resolution: " + m_resolution.to_string() +
+        ", Format: " + VideoFormat_database().find(m_format)->display +
+        ", FPS: " + std::to_string(m_fps)
+    );
 
-    m_camera.reset(new QCamera(*device));
-    m_camera->setCameraFormat(*desired_format);
+    m_camera.reset(new QCameraThread(m_logger, *device, format));
     m_video_sink.reset(new QVideoSink());
     m_capture.reset(new QMediaCaptureSession());
-    m_capture->setCamera(m_camera.get());
+    m_capture->setCamera(&m_camera->camera());
     m_capture->setVideoSink(m_video_sink.get());
 
+#if 0
     connect(m_camera.get(), &QCamera::errorOccurred, this, [&](){
         if (m_camera->error() != QCamera::NoError){
             m_logger.log("QCamera error: " + m_camera->errorString().toStdString());
         }
     });
-    connect(
+#endif
+    m_metaobject->connect(
         m_video_sink.get(), &QVideoSink::videoFrameChanged,
-        this, [&](const QVideoFrame& frame){
-            {
-                WallClock now = current_time();
-                SpinLockGuard lg(m_frame_lock);
-                m_last_frame = frame;
-                m_last_frame_timestamp = now;
-                m_last_frame_seqnum++;
-                m_fps_tracker_source.push_event(now);
-            }
-            std::lock_guard<std::mutex> lg(m_lock);
-            for (FrameListener* listener : m_frame_listeners){
-                listener->new_frame_available();
+        &m_camera->camera(), [&](const QVideoFrame& frame){
+            //  This runs on the QCamera's thread. So it is off the critical path.
+
+            WallClock now = current_time();
+            if (!m_last_frame.push_frame(frame, now)){
+                return;
             }
+            report_source_frame(std::make_shared<VideoFrame>(now, frame));
         }
     );
+}
 
-    m_camera->start();
 
-    for (Listener* listener : m_ui_listeners){
-        listener->new_source(m_device, m_resolution);
-    }
+QWidget* CameraVideoSource::make_display_QtWidget(QWidget* parent){
+    return new CameraVideoDisplay(parent, *this);
 }
 
-PokemonAutomation::VideoWidget* CameraSession::make_QtWidget(QWidget* parent){
-    return new VideoWidget(parent, *this);
-}
 
 
 
 
-VideoWidget::VideoWidget(QWidget* parent, CameraSession& camera)
-    : PokemonAutomation::VideoWidget(parent)
-    , m_session(camera)
-{
-    this->setMinimumSize(80, 45);
-    m_session.add_listener(*this);
+CameraVideoDisplay::~CameraVideoDisplay(){
+    m_source.remove_source_frame_listener(*this);
 }
-VideoWidget::~VideoWidget(){
-    m_session.remove_listener(*this);
+CameraVideoDisplay::CameraVideoDisplay(QWidget* parent, CameraVideoSource& source)
+    : QWidget(parent)
+    , m_source(source)
+{
+    source.add_source_frame_listener(*this);
 }
-
-void VideoWidget::new_frame_available(){
+void CameraVideoDisplay::on_frame(std::shared_ptr<const VideoFrame> frame){
+    m_last_frame = frame;
     this->update();
 }
-void VideoWidget::paintEvent(QPaintEvent* event){
-    // std::cout << "paintEvent start" << std::endl;
+void CameraVideoDisplay::paintEvent(QPaintEvent* event){
     QWidget::paintEvent(event);
 
-    //  Lock should not be needed since it's only updated on this UI thread.
-//    std::lock_guard<std::mutex> lg(m_lock);
-
-    std::pair<QVideoFrame, uint64_t> frame = m_session.latest_frame();
-    if (!frame.first.isValid()){
+    if (!m_last_frame){
         return;
     }
 
-//    cout << "frame: " << this->width() << " x " << this->height() << endl;
+    QVideoFrame frame = m_last_frame->frame;
+    if (!frame.isValid()){
+        return;
+    }
 
     QRect rect(0, 0, this->width(), this->height());
     QVideoFrame::PaintOptions options;
     QPainter painter(this);
-    frame.first.paint(&painter, rect, options);
-    // std::cout << "paintEvent end" << std::endl;
 
-    if (m_last_seqnum != frame.second){
-        m_last_seqnum = frame.second;
-        m_session.report_rendered_frame(current_time());
-    }
+    frame.paint(&painter, rect, options);
+    m_source.report_rendered_frame(current_time());
 }
 
 
@@ -404,7 +224,5 @@ void VideoWidget::paintEvent(QPaintEvent* event){
 
 
 
-
 }
 }
-#endif
diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt6.h b/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt6.h
index 1280f87333..64fc9966ed 100644
--- a/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt6.h
+++ b/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt6.h
@@ -1,27 +1,25 @@
-/*  Video Widget (Qt6)
+/*  Camera Widget (Qt6)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  Intercept video frames and directly paint them to the screen.
+ *  There is no hardware acceleration.
  *
  */
 
 #ifndef PokemonAutomation_VideoPipeline_Qt6VideoWidget_H
 #define PokemonAutomation_VideoPipeline_Qt6VideoWidget_H
 
-#include <QtGlobal>
-#if QT_VERSION_MAJOR == 6
-
-#include <set>
-#include <mutex>
+#include <QWidget>
 #include <QCameraDevice>
 #include <QMediaCaptureSession>
 #include <QVideoFrame>
-#include "Common/Cpp/EventRateTracker.h"
-#include "Common/Cpp/LifetimeSanitizer.h"
-#include "Common/Cpp/Concurrency/SpinLock.h"
-#include "CommonFramework/Inference/StatAccumulator.h"
+#include "CommonFramework/Tools/StatAccumulator.h"
+#include "CommonFramework/VideoPipeline/VideoSource.h"
 #include "CommonFramework/VideoPipeline/CameraInfo.h"
-#include "CommonFramework/VideoPipeline/CameraSession.h"
-#include "CommonFramework/VideoPipeline/UI/VideoWidget.h"
+#include "QCameraThread.h"
+#include "QVideoFrameCache.h"
+#include "SnapshotManager.h"
 #include "CameraImplementations.h"
 
 class QCamera;
@@ -33,94 +31,103 @@ namespace CameraQt6QVideoSink{
 
 class CameraBackend : public PokemonAutomation::CameraBackend{
 public:
+    // Get all cameras' info.
+    // Note: to avoid freezing the UI while launching the application, the camera backend when
+    // constructed, use a separate thread to query and load camera info. If you call
+    // `get_all_cameras()` immidiately after the backend is constructed, it may not give you
+    // all cameras' info.
     virtual std::vector<CameraInfo> get_all_cameras() const override;
     virtual std::string get_camera_name(const CameraInfo& info) const override;
 
-    virtual std::unique_ptr<PokemonAutomation::CameraSession> make_camera(Logger& logger, Resolution default_resolution) const override;
-};
-
-
-struct FrameListener{
-    virtual void new_frame_available() = 0;
+    virtual std::unique_ptr<VideoSource> make_video_source(
+        Logger& logger,
+        const CameraInfo& info,
+        Resolution resolution,
+        VideoFormat format,
+        FramesPerSecond fps
+    ) const override;
 };
 
 
 
-class CameraSession : public QObject, public PokemonAutomation::CameraSession{
+class CameraVideoSource : public VideoSource{
 public:
-    virtual void add_listener(Listener& listener) override;
-    virtual void remove_listener(Listener& listener) override;
-    void add_listener(FrameListener& listener);
-    void remove_listener(FrameListener& listener);
-
-
-public:
-    virtual ~CameraSession();
-    CameraSession(Logger& logger, Resolution default_resolution);
-
-    virtual void get(CameraOption& option) override;
-    virtual void set(const CameraOption& option) override;
-
-    virtual void reset() override;
-    virtual void set_source(CameraInfo device) override;
-    virtual void set_resolution(Resolution resolution) override;
-
-    virtual CameraInfo current_device() const override;
-    virtual Resolution current_resolution() const override;
-    virtual std::vector<Resolution> supported_resolutions() const override;
-
-    virtual VideoSnapshot snapshot() override;
-    virtual double fps_source() override;
-    virtual double fps_display() override;
-
-    std::pair<QVideoFrame, uint64_t> latest_frame();
-    void report_rendered_frame(WallClock timestamp);
-
-    virtual VideoWidget* make_QtWidget(QWidget* parent) override;
-
+    virtual ~CameraVideoSource();
+    CameraVideoSource(
+        Logger& logger,
+        const CameraInfo& info,
+        Resolution desired_resolution,
+        VideoFormat desired_format,
+        FramesPerSecond desired_fps
+    );
+
+    virtual Resolution current_resolution() const override{
+        return m_resolution;
+    }
+    virtual VideoFormat current_format() const override{
+        return m_format;
+    }
+    virtual FramesPerSecond current_fps() const override{
+        return m_fps;
+    }
+    virtual const VideoFormatSet& supported_formats() const override{
+        return m_formats;
+    }
+
+    virtual VideoSnapshot snapshot_latest_blocking() override{
+        return m_snapshot_manager.snapshot_latest_blocking();
+    }
+    virtual VideoSnapshot snapshot_recent_nonblocking(WallClock min_time) override{
+        return m_snapshot_manager.snapshot_recent_nonblocking(min_time);
+    }
+
+    virtual QWidget* make_display_QtWidget(QWidget* parent) override;
 
 private:
-    //  These must be run on the UI thread.
-    void shutdown();
-    void startup();
+    void init(
+        const CameraInfo& info,
+        Resolution desired_resolution,
+        VideoFormat desired_format,
+        FramesPerSecond desired_fps
+    );
+//    void set_video_output(QGraphicsVideoItem& item);
 
 
 private:
-    Logger& m_logger;
-    Resolution m_default_resolution;
+    friend class CameraVideoDisplay;
 
-    //  If you need both locks, acquire "m_lock" first.
-    mutable std::mutex m_lock;
-    mutable SpinLock m_frame_lock;
+    std::unique_ptr<QObject> m_metaobject;
 
-    CameraInfo m_device;
+    Logger& m_logger;
     Resolution m_resolution;
+    VideoFormat m_format;
+    FramesPerSecond m_fps;
 
-    QList<QCameraFormat> m_formats;
-    std::map<Resolution, const QCameraFormat*> m_resolution_map;
-
-    std::unique_ptr<QCamera> m_camera;
+    std::unique_ptr<QCameraThread> m_camera;
     std::unique_ptr<QVideoSink> m_video_sink;
     std::unique_ptr<QMediaCaptureSession> m_capture;
 
-    std::vector<Resolution> m_resolutions;
+    VideoFormatSet m_formats;
+
+
+private:
+    QVideoFrameCache m_last_frame;
+    SnapshotManager m_snapshot_manager;
+};
 
-    EventRateTracker m_fps_tracker_source;
-    EventRateTracker m_fps_tracker_display;
 
-    //  Last Frame
-    QVideoFrame m_last_frame;
-    WallClock m_last_frame_timestamp;
-    uint64_t m_last_frame_seqnum = 0;
+class CameraVideoDisplay : public QWidget, private VideoFrameListener{
+public:
+    ~CameraVideoDisplay();
+    CameraVideoDisplay(QWidget* parent, CameraVideoSource& source);
 
-    //  Last Cached Image
-    QImage m_last_image;
-    WallClock m_last_image_timestamp;
-    uint64_t m_last_image_seqnum = 0;
-    PeriodicStatsReporterI32 m_stats_conversion;
+private:
+    virtual void on_frame(std::shared_ptr<const VideoFrame> frame) override;
+    virtual void paintEvent(QPaintEvent* event) override;
 
-    std::set<Listener*> m_ui_listeners;
-    std::set<FrameListener*> m_frame_listeners;
+private:
+    CameraVideoSource& m_source;
+    std::shared_ptr<const VideoFrame> m_last_frame;
 
     LifetimeSanitizer m_sanitizer;
 };
@@ -128,22 +135,9 @@ class CameraSession : public QObject, public PokemonAutomation::CameraSession{
 
 
 
-class VideoWidget : public PokemonAutomation::VideoWidget, public FrameListener{
-public:
-    VideoWidget(QWidget* parent, CameraSession& session);
-    virtual ~VideoWidget();
-
-    virtual PokemonAutomation::CameraSession& camera() override{ return m_session; }
 
-private:
-    virtual void new_frame_available() override;
-    virtual void paintEvent(QPaintEvent* event) override;
 
 
-private:
-    CameraSession& m_session;
-    uint64_t m_last_seqnum = 0;
-};
 
 
 
@@ -156,4 +150,3 @@ class VideoWidget : public PokemonAutomation::VideoWidget, public FrameListener{
 }
 }
 #endif
-#endif
diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt6_QQuickWidget.cpp b/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt6_QQuickWidget.cpp
new file mode 100644
index 0000000000..5264a3aea9
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt6_QQuickWidget.cpp
@@ -0,0 +1,256 @@
+/*  Camera Widget (Qt6 QQuickWidget)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <QByteArray>
+#include <QUrl>
+#include <QCamera>
+#include <QVideoSink>
+#include <QQuickItem>
+#include "Common/Qt/Redispatch.h"
+#include "VideoFrameQt.h"
+#include "QFormatAggregator.h"
+#include "MediaServicesQt6.h"
+#include "CameraWidgetQt6_QQuickWidget.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace CameraQt6_QQuickWidget{
+
+
+
+
+
+
+std::vector<CameraInfo> CameraBackend::get_all_cameras() const{
+    const auto cameras = GlobalMediaServices::instance().get_all_cameras();
+    std::vector<CameraInfo> ret;
+    for (const auto& info : cameras){
+        ret.emplace_back(info.id().toStdString());
+    }
+    return ret;
+}
+std::string CameraBackend::get_camera_name(const CameraInfo& info) const{
+    const auto cameras = GlobalMediaServices::instance().get_all_cameras();
+    for (const auto& camera : cameras){
+        if (camera.id().toStdString() == info.device_name()){
+            return camera.description().toStdString();
+        }
+    }
+    std::cout << "Error: no such camera for CameraInfo: " << info.device_name() << std::endl;
+    return "";
+}
+std::unique_ptr<VideoSource> CameraBackend::make_video_source(
+    Logger& logger,
+    const CameraInfo& info,
+    Resolution resolution,
+    VideoFormat format,
+    FramesPerSecond fps
+) const{
+    return std::make_unique<CameraVideoSource>(logger, info, resolution, format, fps);
+}
+
+
+
+
+
+
+CameraVideoSource::~CameraVideoSource(){
+    if (!m_capture){
+        return;
+    }
+    try{
+        m_logger.log("Stopping Camera...");
+    }catch (...){}
+
+//    cout << "Stopping Camera..." << endl;
+
+    run_on_main_thread_and_wait([&]{
+        m_metaobject.reset();
+//        m_camera->stop();
+        m_capture.reset();
+        m_video_sink.reset();
+        m_camera.reset();
+    });
+}
+CameraVideoSource::CameraVideoSource(
+    Logger& logger,
+    const CameraInfo& info,
+    Resolution desired_resolution,
+    VideoFormat desired_format,
+    FramesPerSecond desired_fps
+)
+    : VideoSource(logger, true)
+    , m_logger(logger)
+    , m_last_frame(logger)
+    , m_snapshot_manager(logger, m_last_frame)
+{
+    if (!info){
+        return;
+    }
+    m_logger.log("Starting Camera: Backend = CameraQt6QVideoSink");
+
+    run_on_main_thread_and_wait([&]{
+        init(info, desired_resolution, desired_format, desired_fps);
+    });
+}
+void CameraVideoSource::init(
+    const CameraInfo& info,
+    Resolution desired_resolution,
+    VideoFormat desired_format,
+    FramesPerSecond desired_fps
+){
+    m_metaobject.reset(new QObject());
+
+    auto cameras = QMediaDevices::videoInputs();
+    const QCameraDevice* device = nullptr;
+    for (const auto& camera : cameras){
+        if (camera.id().toStdString() == info.device_name()){
+            device = &camera;
+            break;
+        }
+    }
+    if (device == nullptr){
+        m_logger.log("Camera not found: " + info.device_name(), COLOR_RED);
+        return;
+    }
+
+    QCameraFormat format = build_format_set(
+        m_logger,
+        m_formats,
+        *device,
+        desired_resolution,
+        desired_format,
+        desired_fps
+    );
+    if (format.isNull()){
+        return;
+    }
+
+    get_format(format, m_resolution, m_format, m_fps);
+    m_logger.log(
+        "Resolution: " + m_resolution.to_string() +
+        ", Format: " + VideoFormat_database().find(m_format)->display +
+        ", FPS: " + std::to_string(m_fps)
+    );
+
+    m_camera.reset(new QCameraThread(m_logger, *device, format));
+    m_video_sink.reset(new QVideoSink());
+    m_capture.reset(new QMediaCaptureSession());
+    m_capture->setCamera(&m_camera->camera());
+    m_capture->setVideoSink(m_video_sink.get());
+
+#if 0
+    connect(m_camera.get(), &QCamera::errorOccurred, this, [&](){
+        if (m_camera->error() != QCamera::NoError){
+            m_logger.log("QCamera error: " + m_camera->errorString().toStdString());
+        }
+    });
+#endif
+    m_metaobject->connect(
+        m_video_sink.get(), &QVideoSink::videoFrameChanged,
+        &m_camera->camera(), [&](const QVideoFrame& frame){
+            //  This runs on the QCamera's thread. So it is off the critical path.
+
+            WallClock now = current_time();
+            if (!m_last_frame.push_frame(frame, now)){
+                return;
+            }
+            report_source_frame(std::make_shared<VideoFrame>(now, frame));
+        }
+    );
+}
+
+
+QWidget* CameraVideoSource::make_display_QtWidget(QWidget* parent){
+    CameraVideoDisplay* display = new CameraVideoDisplay(parent);
+
+    QObject* root = display->rootObject();
+    if (root == nullptr){
+        m_logger.log("make_display_QtWidget(): display->rootObject() == nullptr", COLOR_RED);
+        return display;
+    }
+
+    QObject* vo = root->findChild<QObject*>("videoOutput");
+    if (vo == nullptr){
+        m_logger.log("make_display_QtWidget(): videoOutput == nullptr", COLOR_RED);
+        return display;
+    }
+
+    QVideoSink* qml_sink = vo->property("videoSink").value<QVideoSink*>();
+    if (qml_sink == nullptr){
+        m_logger.log("make_display_QtWidget(): videoSink == nullptr", COLOR_RED);
+        return display;
+    }
+
+    m_metaobject->disconnect();
+    m_metaobject->connect(
+        m_video_sink.get(), &QVideoSink::videoFrameChanged,
+        qml_sink, [this, qml_sink](const QVideoFrame& frame){
+            WallClock now = current_time();
+
+            QMetaObject::invokeMethod(qml_sink, [qml_sink, frame](){
+                qml_sink->setVideoFrame(frame);
+            }, Qt::QueuedConnection);
+
+            report_rendered_frame(now);
+        }
+    );
+
+    return display;
+}
+
+
+
+
+
+CameraVideoDisplay::~CameraVideoDisplay(){
+}
+CameraVideoDisplay::CameraVideoDisplay(QWidget* parent)
+    : QQuickWidget(parent)
+    , m_sanitizer("CameraVideoDisplay")
+{
+    this->setMinimumSize(80, 45);
+    this->setResizeMode(QQuickWidget::SizeRootObjectToView);
+    this->setFocusPolicy(Qt::NoFocus);
+
+    QString qml = QStringLiteral(
+        "import QtQuick\n"
+        "import QtMultimedia\n"
+        "Rectangle {\n"
+        "    color: \"black\"\n"
+        "    VideoOutput {\n"
+        "        id: videoOutput\n"
+        "        anchors.fill: parent\n"
+        "        objectName: \"videoOutput\"\n"
+        "        fillMode: VideoOutput.PreserveAspectFit\n"
+        "    }\n"
+        "}\n"
+    );
+
+    //  Load the QML from memory via a data URL, instead of writing a temporary file.
+    //  The QML engine reads the base64 payload directly; nothing touches the disk.
+    const QByteArray base64 = qml.toUtf8().toBase64();
+    this->setSource(QUrl(QStringLiteral("data:text/qml;base64,") + QString::fromLatin1(base64)));
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt6_QQuickWidget.h b/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt6_QQuickWidget.h
new file mode 100644
index 0000000000..ca4bce5588
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt6_QQuickWidget.h
@@ -0,0 +1,160 @@
+/*  Camera Widget (Qt6 QQuickWidget)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  Use QML QQuickWidget.
+ *  This is hardware accelerated.
+ *
+ */
+
+#ifndef PokemonAutomation_VideoPipeline_Qt6_QQuickWidget_H
+#define PokemonAutomation_VideoPipeline_Qt6_QQuickWidget_H
+
+#include <QWidget>
+#include <QVideoWidget>
+#include <QCameraDevice>
+#include <QMediaCaptureSession>
+#include <QVideoFrame>
+#include <QQuickWidget>
+#include "CommonFramework/Tools/StatAccumulator.h"
+#include "CommonFramework/VideoPipeline/VideoSource.h"
+#include "CommonFramework/VideoPipeline/CameraInfo.h"
+#include "QCameraThread.h"
+#include "QVideoFrameCache.h"
+#include "SnapshotManager.h"
+#include "CameraImplementations.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+class QCamera;
+class QVideoSink;
+
+namespace PokemonAutomation{
+namespace CameraQt6_QQuickWidget{
+
+
+class CameraBackend : public PokemonAutomation::CameraBackend{
+public:
+    // Get all cameras' info.
+    // Note: to avoid freezing the UI while launching the application, the camera backend when
+    // constructed, use a separate thread to query and load camera info. If you call
+    // `get_all_cameras()` immidiately after the backend is constructed, it may not give you
+    // all cameras' info.
+    virtual std::vector<CameraInfo> get_all_cameras() const override;
+    virtual std::string get_camera_name(const CameraInfo& info) const override;
+
+    virtual std::unique_ptr<VideoSource> make_video_source(
+        Logger& logger,
+        const CameraInfo& info,
+        Resolution resolution,
+        VideoFormat format,
+        FramesPerSecond fps
+    ) const override;
+};
+
+
+
+class CameraVideoSource : public VideoSource{
+public:
+    virtual ~CameraVideoSource();
+    CameraVideoSource(
+        Logger& logger,
+        const CameraInfo& info,
+        Resolution desired_resolution,
+        VideoFormat desired_format,
+        FramesPerSecond desired_fps
+    );
+
+    virtual Resolution current_resolution() const override{
+        return m_resolution;
+    }
+    virtual VideoFormat current_format() const override{
+        return m_format;
+    }
+    virtual FramesPerSecond current_fps() const override{
+        return m_fps;
+    }
+    virtual const VideoFormatSet& supported_formats() const override{
+        return m_formats;
+    }
+
+    virtual VideoSnapshot snapshot_latest_blocking() override{
+        return m_snapshot_manager.snapshot_latest_blocking();
+    }
+    virtual VideoSnapshot snapshot_recent_nonblocking(WallClock min_time) override{
+        return m_snapshot_manager.snapshot_recent_nonblocking(min_time);
+    }
+
+    virtual QWidget* make_display_QtWidget(QWidget* parent) override;
+
+private:
+    void init(
+        const CameraInfo& info,
+        Resolution desired_resolution,
+        VideoFormat desired_format,
+        FramesPerSecond desired_fps
+    );
+//    void set_video_output(QGraphicsVideoItem& item);
+
+
+private:
+    friend class CameraVideoDisplay;
+
+    std::unique_ptr<QObject> m_metaobject;
+
+    Logger& m_logger;
+    Resolution m_resolution;
+    VideoFormat m_format;
+    FramesPerSecond m_fps;
+
+    std::unique_ptr<QCameraThread> m_camera;
+    std::unique_ptr<QVideoSink> m_video_sink;
+    std::unique_ptr<QMediaCaptureSession> m_capture;
+
+    VideoFormatSet m_formats;
+
+
+private:
+    QVideoFrameCache m_last_frame;
+    SnapshotManager m_snapshot_manager;
+};
+
+
+
+class CameraVideoDisplay : public QQuickWidget{
+public:
+    virtual ~CameraVideoDisplay();
+    CameraVideoDisplay(QWidget* parent);
+
+    //  QQuickWidget drops mouseReleaseEvent.
+    virtual void mousePressEvent(QMouseEvent* event) override{
+        QWidget::mousePressEvent(event);
+    }
+    virtual void mouseReleaseEvent(QMouseEvent* event) override{
+        QWidget::mouseReleaseEvent(event);
+    }
+
+private:
+    LifetimeSanitizer m_sanitizer;
+};
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/MediaServicesQt6.cpp b/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/MediaServicesQt6.cpp
new file mode 100644
index 0000000000..ad72758911
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/MediaServicesQt6.cpp
@@ -0,0 +1,153 @@
+/*  Media Services (Qt6.5)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <QtGlobal>
+#if QT_VERSION_MAJOR == 6
+
+#include "Common/Cpp/PrettyPrint.h"
+#include "Common/Cpp/Time.h"
+#include "CommonFramework/Logging/Logger.h"
+#include "CommonFramework/Tools/GlobalThreadPools.h"
+#include "MediaServicesQt6.h"
+
+namespace PokemonAutomation{
+
+
+GlobalMediaServices::GlobalMediaServices()
+    : m_refresh_cameras(true)  // Request initial camera refresh on startup
+{
+    // Comment out: Don't refresh on main thread (would freeze UI on startup)
+    // refresh_cameras();
+
+    // Connect Qt signal to lambda that wakes worker thread when cameras change
+    m_media_devices.connect(
+        &m_media_devices, &QMediaDevices::videoInputsChanged,
+        this, [this]{
+            // LOCK ACQUISITION: protect m_refresh_cameras and notify worker thread
+            // waiting on the conditional variable m_cv.
+            std::lock_guard<Mutex> lg(m_sleep_lock);
+            m_refresh_cameras = true;  // Set work flag
+            m_cv.notify_all();         // Wake worker thread from cv.wait()
+        }
+    );
+
+    // Start the persistent background worker thread
+    m_thread = GlobalThreadPools::unlimited_normal().dispatch_now_blocking([this]{
+        thread_body();
+    });
+}
+GlobalMediaServices::~GlobalMediaServices(){
+    stop();
+}
+
+void GlobalMediaServices::stop() noexcept{
+    if (!m_thread){
+        return;
+    }
+
+    {
+        // LOCK ACQUISITION: acquire m_sleep_lock to set m_stopping and notify
+        // worker thread waiting on the conditional variable m_cv.
+        std::lock_guard<Mutex> lg(m_sleep_lock);
+        m_stopping = true;      // Tell worker to exit loop
+        m_cv.notify_all();      // Wake worker from cv.wait() if sleeping
+    }
+
+    // Wait for the worker thread to finish its current work and join
+    m_thread.wait_and_ignore_exceptions();
+}
+
+
+void GlobalMediaServices::thread_body(){
+    // LOCK ACQUISITION: Worker thread holds m_sleep_lock for entire loop
+    // to protect reads of m_stopping and m_refresh_cameras.
+    // unique_lock is used (not lock_guard) because cv.wait() needs to unlock/relock
+    std::unique_lock<Mutex> lg(m_sleep_lock);
+
+    while (!m_stopping){
+//        global_logger_tagged().log("GlobalMediaServices::thread_body() iteration", COLOR_CYAN);
+
+        // Check if camera refresh was requested
+        if (m_refresh_cameras){
+            // IMPORTANT: refresh_cameras() will acquire m_camera_lock (LOCK #2)
+            // We currently hold m_sleep_lock (LOCK #1), so we have both locks briefly
+            // This is safe because:
+            // - Lock order is always: m_sleep_lock -> m_camera_lock
+            // - No other code path takes them in reverse order
+            refresh_cameras();
+        }
+
+        // CONDITION VARIABLE WAIT - cv.wait(lg)
+        // 1. Releases m_sleep_lock (allows other threads to set flags and notify)
+        // 2. Puts thread to sleep until m_cv.notify_all() is called
+        // 3. When notified, re-acquires m_sleep_lock before returning
+        m_cv.wait(lg);
+    }
+    // Loop exits when m_stopping is true (set by stop() function)
+    // Lock is released when lg goes out of scope
+}
+
+
+// PRECONDITION: Called with m_sleep_lock already held by worker thread
+void GlobalMediaServices::refresh_cameras(){
+    try{
+        global_logger_tagged().log("Start refreshing camera list...", COLOR_CYAN);
+        WallClock start = current_time();
+
+        // Query Qt for camera devices - this is SLOW and can take seconds!
+        // NOTE: This happens OUTSIDE the camera lock, so readers can still
+        // access the old camera list while we query for the new one.
+        QList<QCameraDevice> cameras = QMediaDevices::videoInputs();
+
+        // LOCK ACQUISITION: Briefly acquire camera lock to update the cache
+        // `m_cameras`. This is the ONLY place we write to `m_cameras`.
+        {
+            WriteSpinLock lg(m_camera_lock, PA_CURRENT_FUNCTION);
+            m_cameras = std::move(cameras);
+        }
+        // Camera lock released - readers can now see updated list
+
+        WallClock end = current_time();
+        double seconds = std::chrono::duration_cast<std::chrono::milliseconds>(end - start).count() / 1000.;
+        global_logger_tagged().log("Done refreshing camera list... " + tostr_fixed(seconds, 3) + " seconds", COLOR_CYAN);
+    }catch (std::exception& e){
+        global_logger_tagged().log(
+            std::string("Refreshing camera list returned exception: ") + e.what(),
+            COLOR_RED
+        );
+    }
+
+    // Clear the refresh flag (protected by m_sleep_lock, which we still hold)
+    m_refresh_cameras = false;
+}
+
+
+QList<QCameraDevice> GlobalMediaServices::get_all_cameras_blocking(){
+    {
+        // LOCK ACQUISITION: protect m_stopping and m_refresh_cameras.
+        // - If the persistent worker thread has finished its update and is now
+        //   sleeping, m_refresh_cameras should be false and this function just
+        //   returns the camera info in the cache m_cameras by calling
+        //   get_all_cameras().
+        // - If the persistent thread has not yet finished updating, this function
+        //   will wait on m_sleep_lock and end up with m_refresh_cameras to be true
+        //   when getting the lock: same situation as above.
+        // - If the function gets the lock before the persistent thread can update
+        //   the camera, m_refresh_cameras is false, so this function will do the
+        //   thread's work and load the camera info in a blocking way. After this
+        //   function returns, the persistent thread sees m_refresh_cameras is now
+        //   true and will avoid doing the same camera update.
+        std::unique_lock<Mutex> lg(m_sleep_lock);
+        if (!m_stopping && m_refresh_cameras){
+            refresh_cameras();
+        }
+    }
+    return get_all_cameras();
+}
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/MediaServicesQt6.h b/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/MediaServicesQt6.h
new file mode 100644
index 0000000000..93d9d0d987
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/MediaServicesQt6.h
@@ -0,0 +1,128 @@
+/*  Media Services (Qt6)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_VideoPipeline_MediaServicesQt6_H
+#define PokemonAutomation_VideoPipeline_MediaServicesQt6_H
+
+#include <QCameraDevice>
+#include <QMediaDevices>
+#include "Common/Cpp/Concurrency/SpinLock.h"
+#include "Common/Cpp/Concurrency/Mutex.h"
+#include "Common/Cpp/Concurrency/ConditionVariable.h"
+#include "Common/Cpp/Concurrency/AsyncTask.h"
+
+namespace PokemonAutomation{
+
+
+// Singleton to provide all available camera info as a list of QCameraDevice
+// asynchronously.
+// It uses a persistent background thread to load camera info. The thread
+// sleeps on a conditional variable until it is notified by a camera update
+// event from QMediaDevices.
+class GlobalMediaServices : public QObject{
+public:
+    // Return the singleton GlobalMediaServices.
+    // Note: to avoid freezing the UI while launching the GUI application, when instance() is
+    // first called, it constructed a static GlobalMediaServices object and uses a separate
+    // thread to query and load camera info. If you call `instance()::get_all_cameras()`
+    // the first time the thread does not finish immidiately and it may not give you all
+    // the camera info.
+    // The proper usage is to call `instance()::get_all_cameras()` immidiately after
+    // starting the program to give time for the thread to finish before the UI is constructed
+    // and queries the cameras again.
+    static GlobalMediaServices& instance(){
+        static GlobalMediaServices self;
+        return self;
+    }
+
+    // Get all camera devices' info (thread safe: you can call this from any thread).
+    // Note: to avoid freezing the UI while launching the GUI application, when instance() is
+    // first called, it constructed a static GlobalMediaServices object and uses a separate
+    // thread to query and load camera info. If you call `instance()::get_all_cameras()`
+    // the first time the thread does not finish immidiately and it may not give you all
+    // the camera info.
+    // The proper usage is to call `instance()::get_all_cameras()` immidiately after
+    // starting the program to give time for the thread to finish before the UI is constructed
+    // and queries the cameras again.
+    QList<QCameraDevice> get_all_cameras(){
+        ReadSpinLock lg(m_camera_lock);
+        return m_cameras;
+    }
+
+    // Get all camera devices' info (thread safe: you can call this from any thread).
+    // Blocks the current thread until the camera info is queried, unlike `get_all_cameras()`
+    // which is non-blocking.
+    // Its usage is to be called at a command-line application/library to ensure you get
+    // the current up-to-date camera info.
+    QList<QCameraDevice> get_all_cameras_blocking();
+
+    // Shut down the service. Wake up and join the persistent worker thread. After this
+    // function is called, you are not supposed to query camera info any more from this
+    // class.
+    void stop() noexcept;
+
+private:
+    GlobalMediaServices();
+    ~GlobalMediaServices();
+
+    // Worker thread loop.
+    void thread_body();
+
+    // Called in worker thread main loop when `m_refresh_cameras` is true
+    // to load latest camera info and store it into `m_media_devices` (thread-safe:
+    // it uses `m_camera_lock`).
+    void refresh_cameras();
+
+private:
+    QMediaDevices m_media_devices;
+
+    // ========================================================================
+    // LOCK #1: Worker Thread Sleep/Wake Synchronization
+    // ========================================================================
+
+    // m_sleep_lock and m_cv work together as a classic condition variable pattern:
+    // - m_sleep_lock protects m_stopping and m_refresh_cameras flags
+    // - m_cv allows worker thread to sleep until signaled by camera update events
+    //   from QMediaDevices or from shut down request.
+    Mutex m_sleep_lock;
+    // m_sleep_lock and m_cv work together as a classic condition variable pattern:
+    // - m_sleep_lock protects m_stopping and m_refresh_cameras flags
+    // - m_cv allows worker thread to sleep until signaled by camera update events
+    //   from QMediaDevices or from shut down request.
+    ConditionVariable m_cv;
+
+    // Worker thread flag (protected by m_sleep_lock):
+    // Set by main thread to tell worker to exit.
+    bool m_stopping = false;
+    // Worker thread flag (protected by m_sleep_lock):
+    // Set by Qt signal or constructor to request querying newest camera info.
+    bool m_refresh_cameras = false;
+
+    // ========================================================================
+    // LOCK #2: Camera Data Access Protection (separate from worker lock!)
+    // ========================================================================
+
+    // Reader-writer SpinLock for camera list access (protect `m_cameras`):
+    // - Allows multiple concurrent readers (get_all_cameras() calls)
+    // - Allows a single writer (refresh_cameras()) to have exclusive access
+    // - Kept separate from `m_sleep_lock` so reads don't block on worker
+    //   thread's CV wait
+    SpinLock m_camera_lock;
+    // Internal cache of all the camera info protected by SpinLock `m_camera_lock`.
+    // - A single writer (refresh_cameras()) writes newest data to it.
+    // - Multiple readers (get_all_cameras() calls from any thread) gets the data
+    //   efficiently.
+    QList<QCameraDevice> m_cameras;
+
+    // Background persistent worker thread that waits for camera refresh requests
+    AsyncTask m_thread;
+};
+
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/QCameraThread.h b/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/QCameraThread.h
new file mode 100644
index 0000000000..9db0137e9d
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/QCameraThread.h
@@ -0,0 +1,75 @@
+/*  QCameraThread
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_VideoPipeline_QCameraThread_H
+#define PokemonAutomation_VideoPipeline_QCameraThread_H
+
+#include <QCamera>
+#include "Common/Cpp/Logging/AbstractLogger.h"
+#include "Common/Qt/GlobalThreadPoolsQt.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+
+
+class QCameraThread : public QObject{
+public:
+    QCameraThread(
+        Logger& logger,
+        QCameraDevice device,
+        QCameraFormat format
+    )
+        : m_logger(logger)
+        , m_device(std::move(device))
+        , m_format(std::move(format))
+        , m_camera(nullptr)
+    {
+        m_camera = static_cast<QCamera*>(GlobalThreadPools::qt_event_threadpool().add_object(
+            [this]{ return make_camera(); }
+        ));
+    }
+    ~QCameraThread(){
+        GlobalThreadPools::qt_event_threadpool().remove_object(m_camera);
+    }
+
+    QCamera& camera() const{
+        return *m_camera;
+    }
+
+
+private:
+    std::unique_ptr<QCamera> make_camera(){
+        auto camera = std::make_unique<QCamera>(m_device);
+        camera->setCameraFormat(m_format);
+        connect(
+            camera.get(), &QCamera::errorOccurred,
+            this, [this](){
+                if (m_camera->error() == QCamera::NoError){
+                    return;
+                }
+                m_logger.log("QCamera error: " + m_camera->errorString().toStdString(), COLOR_RED);
+            }
+        );
+
+        camera->start();
+        return camera;
+    }
+
+
+private:
+    Logger& m_logger;
+    QCameraDevice m_device;
+    QCameraFormat m_format;
+    QCamera* m_camera;
+};
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/QFormatAggregator.cpp b/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/QFormatAggregator.cpp
new file mode 100644
index 0000000000..1ea6e55265
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/QFormatAggregator.cpp
@@ -0,0 +1,154 @@
+/*  Format Aggregator
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/GlobalSettingsPanel.h"
+#include "VideoFrameQt.h"
+#include "QFormatAggregator.h"
+
+namespace PokemonAutomation{
+
+
+void get_format(
+    const QCameraFormat& qformat,
+    Resolution& resolution,
+    VideoFormat& format,
+    FramesPerSecond& fps
+){
+    resolution.width = qformat.resolution().width();
+    resolution.height = qformat.resolution().height();
+    format = QVideoFrameFormat_to_VideoFormat(qformat.pixelFormat());
+    float fps_f = qformat.maxFrameRate();
+    fps_f = std::max<float>(fps_f, 0);
+    fps = (size_t)(fps_f + 0.5);
+}
+
+
+struct FormatAggregator{
+    std::string m_format_dump_str;
+    std::map<
+        Resolution,
+        std::map<
+            VideoFormat,
+            std::map<size_t, QCameraFormat, std::greater<size_t>>
+        >
+    > m_formats;
+
+    void add_format(QCameraFormat qformat){
+        Resolution resolution;
+        VideoFormat oformat;
+        FramesPerSecond fps;
+        get_format(qformat, resolution, oformat, fps);
+
+        m_format_dump_str += "\n    ";
+        m_format_dump_str += std::to_string(resolution.width) + "x" + std::to_string(resolution.height);
+        m_format_dump_str += ": Format = " + std::to_string((int)qformat.pixelFormat());
+        m_format_dump_str += ", FPS Range = [" + std::to_string(qformat.minFrameRate()) + "," + std::to_string(qformat.maxFrameRate()) + "]";
+
+        auto& resolution_entry = m_formats[resolution];
+        auto iter0 = resolution_entry.find(oformat);
+
+        //  Format doesn't exist. Add it.
+        if (iter0 == resolution_entry.end()){
+            auto& entry = resolution_entry[oformat];
+            entry[fps] = std::move(qformat);
+            return;
+        }
+
+        //  Format already exists.
+
+        auto& oformat_node = iter0->second;
+
+        auto iter1 = oformat_node.find(fps);
+        if (iter1 == oformat_node.end()){
+            oformat_node[fps] = std::move(qformat);
+            return;
+        }
+
+        if (iter1->second.minFrameRate() < qformat.minFrameRate()){
+            iter1->second = std::move(qformat);
+        }
+    }
+};
+
+
+
+QCameraFormat build_format_set(
+    Logger& logger,
+    VideoFormatSet& format_set,
+    const QCameraDevice& device,
+    Resolution desired_resolution,
+    VideoFormat desired_format,
+    FramesPerSecond desired_fps
+){
+    QList<QCameraFormat> formats = device.videoFormats();
+    if (formats.empty()){
+        logger.log("No usable resolutions: " + device.description().toStdString(), COLOR_RED);
+        return QCameraFormat();
+    }
+
+    FormatAggregator aggregator;
+    for (QCameraFormat& format : formats){
+        aggregator.add_format(std::move(format));
+    }
+
+    if (GlobalSettings::instance().DUMP_VIDEO_FORMATS){
+        logger.log("Video Formats:" + aggregator.m_format_dump_str);
+    }
+
+//    cout << "Chosen: " << resolution_map[Resolution(3840, 2160)]->maxFrameRate() << endl;
+
+    //  Set a default.
+    const QCameraFormat* current_qformat = nullptr;
+    const std::vector<Resolution> RESOLUTION_PRIORITIES{
+        {3840, 2160},
+        {1920, 1080},
+        {2560, 1440},
+        {1280, 720},
+    };
+    for (const Resolution& res : RESOLUTION_PRIORITIES){
+        auto iter = aggregator.m_formats.find(res);
+        if (iter != aggregator.m_formats.end()){
+            current_qformat = &iter->second.begin()->second.begin()->second;
+            break;
+        }
+    }
+    if (current_qformat == nullptr){
+        current_qformat = &aggregator.m_formats.rbegin()->second.begin()->second.begin()->second;
+    }
+
+    format_set.clear();
+    for (const auto& res : aggregator.m_formats){
+        //  Resolution matches. Pick the first one as the default.
+        if (res.first == desired_resolution){
+            current_qformat = &res.second.begin()->second.begin()->second;
+        }
+
+        for (const auto& format : res.second){
+            //  Format matches. Pick the first one as the default.
+            if (res.first == desired_resolution && format.first == desired_format){
+                current_qformat = &format.second.begin()->second;
+            }
+
+            for (const auto& fps : format.second){
+                //  FPS matches. Pick it.
+                if (res.first == desired_resolution &&
+                    format.first == desired_format &&
+                    fps.first == desired_fps
+                ){
+                    current_qformat = &fps.second;
+                }
+
+                format_set[res.first][format.first].insert(fps.first);
+            }
+        }
+    }
+
+    return *current_qformat;
+}
+
+
+
+}
diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/QFormatAggregator.h b/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/QFormatAggregator.h
new file mode 100644
index 0000000000..d10b3c1587
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/QFormatAggregator.h
@@ -0,0 +1,39 @@
+/*  Format Aggregator
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_VideoPipeline_QFormatAggregator_H
+#define PokemonAutomation_VideoPipeline_QFormatAggregator_H
+
+#include <QCameraFormat>
+#include "Common/Cpp/Logging/AbstractLogger.h"
+#include "Common/Cpp/ImageResolution.h"
+#include "CommonFramework/VideoPipeline/VideoFormats.h"
+#include "CommonFramework/VideoPipeline/VideoSource.h"
+
+namespace PokemonAutomation{
+
+
+
+void get_format(
+    const QCameraFormat& qformat,
+    Resolution& resolution,
+    VideoFormat& format,
+    FramesPerSecond& fps
+);
+
+QCameraFormat build_format_set(
+    Logger& logger,
+    VideoFormatSet& format_set,
+    const QCameraDevice& device,
+    Resolution desired_resolution,
+    VideoFormat desired_format,
+    FramesPerSecond desired_fps
+);
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/QVideoFrameCache.h b/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/QVideoFrameCache.h
new file mode 100644
index 0000000000..575d2d1939
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/QVideoFrameCache.h
@@ -0,0 +1,111 @@
+/*  QVideoFrameCache
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *      A simple cache that stores the last QVideoFrame from a stream.
+ *
+ */
+
+#ifndef PokemonAutomation_VideoPipeline_QVideoFrameCache_H
+#define PokemonAutomation_VideoPipeline_QVideoFrameCache_H
+
+#include <QVideoFrame>
+#include "Common/Cpp/Time.h"
+#include "Common/Cpp/Concurrency/SpinLock.h"
+#include "CommonFramework/Tools/StatAccumulator.h"
+
+//#define PA_PROFILE_QVideoFrameCache
+
+namespace PokemonAutomation{
+
+
+
+class QVideoFrameCache{
+public:
+    QVideoFrameCache(Logger& logger)
+#ifdef PA_PROFILE_QVideoFrameCache
+        : m_logger(logger)
+        , m_last_frame_timestamp(WallClock::min())
+#else
+        : m_last_frame_timestamp(WallClock::min())
+#endif
+        , m_last_frame_seqnum(0)
+#ifdef PA_PROFILE_QVideoFrameCache
+        , m_stats_lock("QVideoFrameCache::push_frame()-Lock", "ms", 1000, std::chrono::seconds(10))
+        , m_stats_push_frame("QVideoFrameCache::push_frame()-All", "ms", 1000, std::chrono::seconds(10))
+#endif
+    {}
+
+    uint64_t seqnum() const{
+        return m_last_frame_seqnum.load(std::memory_order_relaxed);
+    }
+    uint64_t get_latest(QVideoFrame& frame, WallClock& timestamp) const{
+        WriteSpinLock lg(m_frame_lock, "QVideoFrameCache::get_latest()");
+        frame = m_last_frame;
+        timestamp = m_last_frame_timestamp;
+        return seqnum();
+    }
+
+    bool push_frame(QVideoFrame frame, WallClock timestamp){
+#ifdef PA_PROFILE_QVideoFrameCache
+        WallClock time0 = current_time();
+#endif
+
+        WriteSpinLock lg(m_frame_lock, "QVideoFrameCache::push_frame()");
+
+#ifdef PA_PROFILE_QVideoFrameCache
+        {
+            WallClock time1 = current_time();
+            uint32_t microseconds = (uint32_t)std::chrono::duration_cast<std::chrono::microseconds>(time1 - time0).count();
+            m_stats_lock.report_data(m_logger, microseconds);
+        }
+#endif
+
+        //  Skip duplicate frames.
+        if (frame.startTime() != -1 && frame.startTime() <= m_last_frame.startTime()){
+            return false;
+        }
+
+        m_last_frame = std::move(frame);
+        m_last_frame_timestamp = timestamp;
+        uint64_t seqnum = m_last_frame_seqnum.load(std::memory_order_relaxed);
+        seqnum++;
+        m_last_frame_seqnum.store(seqnum, std::memory_order_relaxed);
+
+#ifdef PA_PROFILE_QVideoFrameCache
+        {
+            WallClock time1 = current_time();
+            uint32_t microseconds = (uint32_t)std::chrono::duration_cast<std::chrono::microseconds>(time1 - time0).count();
+            m_stats_push_frame.report_data(m_logger, microseconds);
+        }
+#endif
+
+        return true;
+    }
+
+
+private:
+#ifdef PA_PROFILE_QVideoFrameCache
+    Logger& m_logger;
+#endif
+
+    mutable SpinLock m_frame_lock;
+
+    QVideoFrame m_last_frame;
+    WallClock m_last_frame_timestamp;
+    std::atomic<uint64_t> m_last_frame_seqnum;
+
+#ifdef PA_PROFILE_QVideoFrameCache
+    PeriodicStatsReporterI32 m_stats_lock;
+    PeriodicStatsReporterI32 m_stats_push_frame;
+#endif
+};
+
+
+
+
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/SnapshotManager.cpp b/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/SnapshotManager.cpp
new file mode 100644
index 0000000000..068d6ec418
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/SnapshotManager.cpp
@@ -0,0 +1,292 @@
+/*  Snapshot Manager
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+//#include "Common/Cpp/Concurrency/ReverseLockGuard.h"
+#include "Common/Cpp/Concurrency/AsyncTask.h"
+#include "CommonFramework/ImageTypes/ImageRGB32_Qt.h"
+#include "CommonFramework/Tools/GlobalThreadPools.h"
+#include "SnapshotManager.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+
+
+
+
+SnapshotManager::~SnapshotManager(){
+    std::unique_lock<Mutex> lg(m_lock);
+    m_cv.wait(lg, [this]{
+        cleanup();
+        return m_pending_conversions.empty();
+    });
+}
+SnapshotManager::SnapshotManager(Logger& logger, QVideoFrameCache& cache)
+    : m_logger(logger)
+    , m_cache(cache)
+    , m_stats_conversion("ConvertFrame", "ms", 1000, std::chrono::seconds(10))
+{}
+
+
+QImage SnapshotManager::frame_to_image(const QVideoFrame& frame){
+    QImage image = frame.toImage();
+    QImage::Format format = image.format();
+    if (format != QImage::Format_ARGB32 && format != QImage::Format_RGB32){
+        image = image.convertToFormat(QImage::Format_ARGB32);
+    }
+    return image;
+}
+VideoSnapshot SnapshotManager::convert(QVideoFrame frame, WallClock timestamp) noexcept{
+    VideoSnapshot snapshot;
+    snapshot.timestamp = timestamp;
+    try{
+        WallClock time0 = current_time();
+        snapshot.frame = std::make_shared<const ImageRGB32>(
+            QImage_to_ImageRGB32(frame_to_image(frame))
+        );
+        WallClock time1 = current_time();
+        WriteSpinLock lg(m_stats_lock);
+        m_stats_conversion.report_data(
+            m_logger,
+            (uint32_t)std::chrono::duration_cast<std::chrono::microseconds>(time1 - time0).count()
+        );
+    }catch (...){
+        try{
+            m_logger.log("Exception thrown while converting QVideoFrame -> QImage.", COLOR_RED);
+        }catch (...){}
+    }
+    return snapshot;
+}
+void SnapshotManager::convert(uint64_t seqnum, QVideoFrame frame, WallClock timestamp) noexcept{
+    VideoSnapshot snapshot = convert(std::move(frame), timestamp);
+
+    ObjectsToGC objects_to_gc;
+    {
+        std::lock_guard<Mutex> lg(m_lock);
+//        cout << "SnapshotManager::convert() - post convert: " << seqnum << endl;
+
+        push_new_screenshot(seqnum, std::move(snapshot));
+
+        if (m_queued_convert){
+            m_queued_convert = false;
+            seqnum = m_cache.get_latest(frame, timestamp);
+            dispatch_conversion(seqnum, std::move(frame), timestamp);
+        }
+
+        objects_to_gc = cleanup();
+    }
+    objects_to_gc.destroy_now();
+
+    m_cv.notify_all();
+}
+bool SnapshotManager::try_dispatch_conversion(uint64_t seqnum, QVideoFrame frame, WallClock timestamp) noexcept{
+    //  Must call under the lock.
+
+    AsyncTask* task;
+    try{
+        task = &m_pending_conversions[seqnum];
+
+        //  This frame is already being converted.
+        if (*task){
+            return false;
+        }
+    }catch (...){
+        return false;
+    }
+
+    try{
+        std::function<void()> lambda = [=, this, frame = std::move(frame)](){
+            convert(seqnum, std::move(frame), timestamp);
+        };
+
+        *task = GlobalThreadPools::computation_realtime().try_dispatch_now(lambda);
+
+        //  Dispatch was successful. We're done.
+        if (*task){
+            return true;
+        }
+
+        //  Dispatch failed. Queue it for later.
+        m_queued_convert = true;
+    }catch (...){}
+
+    m_pending_conversions.erase(seqnum);
+    m_cv.notify_all();
+
+    return false;
+}
+void SnapshotManager::dispatch_conversion(uint64_t seqnum, QVideoFrame frame, WallClock timestamp) noexcept{
+    //  Must call under the lock.
+    try_dispatch_conversion(seqnum, std::move(frame), timestamp);
+}
+
+bool SnapshotManager::push_new_screenshot(uint64_t seqnum, VideoSnapshot snapshot){
+    if (!m_converted_snapshot_archive.empty() && m_converted_snapshot_archive.rbegin()->first > seqnum){
+        return false;
+    }
+    m_converted_snapshot_archive[seqnum] = snapshot;
+    return true;
+}
+void SnapshotManager::ObjectsToGC::destroy_now(){
+    tasks_to_free.clear();
+    snapshots_to_free.clear();
+}
+SnapshotManager::ObjectsToGC SnapshotManager::cleanup(){
+    //  Must call under the lock!
+
+    //  Grab and return all objects that are ready to be garbage collected.
+
+    ObjectsToGC ret;
+
+    //  Cleanup finished tasks.
+    while (!m_pending_conversions.empty()){
+        auto iter = m_pending_conversions.begin();
+        if (iter->second.is_finished()){
+            ret.tasks_to_free.emplace_back(std::move(iter->second));
+            m_pending_conversions.erase(iter);
+            m_cv.notify_all();
+        }else{
+            break;
+        }
+    }
+
+    //  Walk through the snapshot archive and clear out everything with only
+    //  one reference. But leave behind the latest screenshot.
+
+    if (m_converted_snapshot_archive.size() <= 1){
+        return ret;
+    }
+
+    auto stop = m_converted_snapshot_archive.end();
+    --stop;
+
+    for (auto iter = m_converted_snapshot_archive.begin(); iter != stop;){
+        if (iter->second.frame.use_count() <= 1){
+            ret.snapshots_to_free.emplace_back(std::move(iter->second));
+            iter = m_converted_snapshot_archive.erase(iter);
+        }else{
+            ++iter;
+        }
+    }
+
+    return ret;
+}
+
+
+VideoSnapshot SnapshotManager::snapshot_latest_blocking(){
+    ObjectsToGC objects_to_gc;
+    {
+        std::unique_lock<Mutex> lg(m_lock);
+        objects_to_gc = cleanup();
+    }
+    objects_to_gc.destroy_now();
+
+    VideoSnapshot snapshot;
+    bool notify = false;
+    {
+        std::unique_lock<Mutex> lg(m_lock);
+
+//        cout << "snapshot_latest_blocking()" << endl;
+
+        //  Already up-to-date. Return it.
+        uint64_t seqnum = m_cache.seqnum();
+        if (!m_converted_snapshot_archive.empty()){
+            auto iter = m_converted_snapshot_archive.rbegin();
+            if (seqnum <= iter->first){
+//                cout << "snapshot_latest_blocking(): Cached" << endl;
+                return iter->second;
+            }
+        }
+
+        //  Check if we're already converting it.
+        if (!m_pending_conversions.empty() && m_pending_conversions.rbegin()->first >= seqnum){
+//            cout << "snapshot_latest_blocking(): Already Converting" << endl;
+            while (true){
+                std::map<uint64_t, VideoSnapshot>::reverse_iterator iter = m_converted_snapshot_archive.rbegin();
+                if (iter->first >= seqnum){
+                    return iter->second;
+                }
+                m_cv.wait(lg);
+            }
+        }
+
+
+        //  Otherwise, we use this thread to convert the latest frame.
+//        cout << "snapshot_latest_blocking(): Convert Now" << endl;
+
+        QVideoFrame frame;
+        WallClock timestamp;
+        seqnum = m_cache.get_latest(frame, timestamp);
+
+        notify = push_new_screenshot(seqnum, convert(std::move(frame), timestamp));
+
+        snapshot = m_converted_snapshot_archive.rbegin()->second;
+    }
+
+    if (notify){
+        m_cv.notify_all();
+    }
+
+//    cout << "snapshot_latest_blocking(): Convert Now - Done" << endl;
+    return snapshot;
+}
+
+VideoSnapshot SnapshotManager::snapshot_recent_nonblocking(WallClock min_time){
+//    WallClock now = current_time();
+
+    std::lock_guard<Mutex> lg(m_lock);
+
+    //  Already up-to-date. Return it.
+    uint64_t seqnum = m_cache.seqnum();
+    if (!m_converted_snapshot_archive.empty()){
+        auto iter = m_converted_snapshot_archive.rbegin();
+        if (seqnum <= iter->first){
+//            cout << "snapshot_latest_blocking(): Cached" << endl;
+            return iter->second;
+        }
+    }
+
+    QVideoFrame frame;
+    WallClock timestamp;
+    seqnum = m_cache.get_latest(frame, timestamp);
+
+    //  Dispatch this frame for conversion.
+    dispatch_conversion(seqnum, std::move(frame), timestamp);
+
+    //  No cached snapshot.
+    if (m_converted_snapshot_archive.empty()){
+        return VideoSnapshot();
+    }
+
+    //  Cached snapshot is too old.
+    auto iter = m_converted_snapshot_archive.rbegin();
+    if (min_time > iter->second.timestamp){
+        return VideoSnapshot();
+    }
+
+    return iter->second;
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}
diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/SnapshotManager.h b/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/SnapshotManager.h
new file mode 100644
index 0000000000..3e64a5eb2e
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/SnapshotManager.h
@@ -0,0 +1,73 @@
+/*  Snapshot Manager
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_VideoPipeline_SnapshotManager_H
+#define PokemonAutomation_VideoPipeline_SnapshotManager_H
+
+#include <map>
+#include "Common/Cpp/Concurrency/Mutex.h"
+#include "Common/Cpp/Concurrency/ConditionVariable.h"
+#include "Common/Cpp/Logging/AbstractLogger.h"
+#include "CommonFramework/Tools/StatAccumulator.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "QVideoFrameCache.h"
+
+namespace PokemonAutomation{
+
+class AsyncTask;
+
+class SnapshotManager{
+public:
+    ~SnapshotManager();
+    SnapshotManager(Logger& logger, QVideoFrameCache& cache);
+
+public:
+    VideoSnapshot snapshot_latest_blocking();
+    VideoSnapshot snapshot_recent_nonblocking(WallClock min_time);
+
+private:
+    static QImage frame_to_image(const QVideoFrame& frame);
+    VideoSnapshot convert(QVideoFrame frame, WallClock timestamp) noexcept;
+    void convert(uint64_t seqnum, QVideoFrame frame, WallClock timestamp) noexcept;
+    bool try_dispatch_conversion(uint64_t seqnum, QVideoFrame frame, WallClock timestamp) noexcept;
+    void dispatch_conversion(uint64_t seqnum, QVideoFrame frame, WallClock timestamp) noexcept;
+
+    bool push_new_screenshot(uint64_t seqnum, VideoSnapshot snapshot);
+
+    struct ObjectsToGC{
+        std::vector<AsyncTask> tasks_to_free;
+        std::vector<VideoSnapshot> snapshots_to_free;
+
+        void destroy_now();
+    };
+    ObjectsToGC cleanup();
+
+private:
+    Logger& m_logger;
+    QVideoFrameCache& m_cache;
+
+    Mutex m_lock;
+    ConditionVariable m_cv;
+
+    std::map<uint64_t, AsyncTask> m_pending_conversions;
+    bool m_queued_convert = false;
+
+    //  Keep an archive of older snapshots. The idea here is that we don't want
+    //  snapshots to be destroyed in other places (such as the video pivot)
+    //  because it's expensive. So instead, we keep a reference here which we
+    //  will periodically clear out on the conversion threads.
+    std::map<uint64_t, VideoSnapshot> m_converted_snapshot_archive;
+
+    SpinLock m_stats_lock;
+    PeriodicStatsReporterI32 m_stats_conversion;
+};
+
+
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/VideoFrameQt.cpp b/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/VideoFrameQt.cpp
new file mode 100644
index 0000000000..d663439275
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/VideoFrameQt.cpp
@@ -0,0 +1,49 @@
+/*  Video Frame
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <QVideoFrameFormat>
+#include "VideoFrameQt.h"
+
+namespace PokemonAutomation{
+
+
+VideoFormat QVideoFrameFormat_to_VideoFormat(QVideoFrameFormat::PixelFormat format){
+    switch (format){
+    case QVideoFrameFormat::Format_YUV420P:
+        return VideoFormat::YUV420P;
+    case QVideoFrameFormat::Format_YUYV:
+        return VideoFormat::YUYV;
+    case QVideoFrameFormat::Format_NV12:
+        return VideoFormat::NV12;
+    case QVideoFrameFormat::Format_P010:
+        return VideoFormat::P010;
+    case QVideoFrameFormat::Format_Jpeg:
+        return VideoFormat::MJPEG;
+    default:
+        return VideoFormat::OTHER;
+    }
+}
+QVideoFrameFormat::PixelFormat VideoFormat_to_QVideoFrameFormat(VideoFormat format){
+    switch (format){
+    case VideoFormat::OTHER:
+        return QVideoFrameFormat::Format_Invalid;
+    case VideoFormat::YUV420P:
+        return QVideoFrameFormat::Format_YUV420P;
+    case VideoFormat::YUYV:
+        return QVideoFrameFormat::Format_YUYV;
+    case VideoFormat::NV12:
+        return QVideoFrameFormat::Format_NV12;
+    case VideoFormat::P010:
+        return QVideoFrameFormat::Format_P010;
+    case VideoFormat::MJPEG:
+        return QVideoFrameFormat::Format_Jpeg;
+    }
+    return QVideoFrameFormat::Format_Invalid;
+}
+
+
+
+}
diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/VideoFrameQt.h b/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/VideoFrameQt.h
new file mode 100644
index 0000000000..90e9e6d4ef
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/VideoFrameQt.h
@@ -0,0 +1,50 @@
+/*  Video Frame
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_VideoFrame_H
+#define PokemonAutomation_VideoFrame_H
+
+#include <QVideoFrame>
+#include "Common/Cpp/Time.h"
+#include "CommonFramework/VideoPipeline/VideoFormats.h"
+
+namespace PokemonAutomation{
+
+
+VideoFormat QVideoFrameFormat_to_VideoFormat(QVideoFrameFormat::PixelFormat format);
+QVideoFrameFormat::PixelFormat VideoFormat_to_QVideoFrameFormat(VideoFormat format);
+
+
+
+class VideoFrame{
+public:
+    WallClock timestamp;
+    QVideoFrame frame;
+
+    VideoFrame(VideoFrame&&) = default;
+    VideoFrame& operator=(VideoFrame&&) = default;
+    VideoFrame(const VideoFrame&) = delete;
+    void operator=(const VideoFrame&) = delete;
+
+    VideoFrame()
+        : timestamp(WallClock::min())
+    {}
+    VideoFrame(WallClock p_timestamp, QVideoFrame p_frame)
+        : timestamp(p_timestamp)
+        , frame(std::move(p_frame))
+    {}
+
+    void clear(){
+        frame = QVideoFrame();
+    }
+    bool is_valid() const{
+        return frame.isValid();
+    }
+};
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/VideoToolsQt5.cpp b/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/VideoToolsQt5.cpp
deleted file mode 100644
index 067961e13a..0000000000
--- a/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/VideoToolsQt5.cpp
+++ /dev/null
@@ -1,252 +0,0 @@
-/*  Video Tools (QT5)
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <QtGlobal>
-#if QT_VERSION_MAJOR == 5
-
-#include <QCameraInfo>
-#include <QCoreApplication>
-#include "Common/Cpp/PrettyPrint.h"
-#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
-#include "CommonFramework/ImageTools/ImageStats.h"
-#include "CommonFramework/ImageMatch/ImageDiff.h"
-#include "VideoToolsQt5.h"
-
-#include <iostream>
-using std::cout;
-using std::endl;
-
-namespace PokemonAutomation{
-
-
-
-std::vector<CameraInfo> qt5_get_all_cameras(){
-    QList<QCameraInfo> cameras = QCameraInfo::availableCameras();
-    std::vector<CameraInfo> ret;
-    for (const QCameraInfo& info : cameras){
-        ret.emplace_back(info.deviceName().toStdString());
-    }
-    return ret;
-}
-
-std::string qt5_get_camera_name(const CameraInfo& info){
-    QCameraInfo qinfo(info.device_name().c_str());
-    return qinfo.description().toStdString();
-}
-
-
-
-
-QImage frame_to_image(Logger& logger, QVideoFrame frame, bool flip_vertical){
-    if (!frame.isValid()){
-        return QImage();
-    }
-    if (!frame.map(QAbstractVideoBuffer::ReadOnly)){
-        logger.log("Unable to map QVideoFrame.");
-        return QImage();
-    }
-
-    try{
-        if (frame.pixelFormat() == QVideoFrame::Format_Jpeg){
-            QImage image;
-            bool ok = image.loadFromData(frame.bits(0), frame.mappedBytes(), "JPG");
-            frame.unmap();
-            if (!ok){
-//                cout << frame.mappedBytes() << " " << frame.width() << endl;
-                return QImage();
-            }
-            if (flip_vertical){
-                image = image.mirrored(false, flip_vertical);
-            }
-            return image;
-        }
-
-        QImage::Format format = QVideoFrame::imageFormatFromPixelFormat(frame.pixelFormat());
-        QImage image(
-            frame.bits(),
-            frame.width(),
-            frame.height(),
-            frame.bytesPerLine(),
-            format
-        );
-        int64_t key = image.cacheKey();
-        image = image.convertToFormat(QImage::Format_RGB32);
-        frame.unmap();
-        image = image.mirrored(false, flip_vertical);
-        if (key == image.cacheKey()){
-            image = image.copy();
-        }
-        return image;
-    }catch (...){
-        frame.unmap();
-    }
-    return QImage();
-}
-
-
-bool determine_frame_orientation(
-    Logger& logger, const ImageViewRGB32& reference, const ImageViewRGB32& image,
-    bool& flip_vertical
-){
-    std::string str;
-    str += "Attempting to determine frame orientation... ";
-
-    if (!reference){
-        str += "Image is null.";
-        logger.log(str, COLOR_RED);
-        return false;
-    }
-    if (!image){
-        str += "Frame is null.";
-        logger.log(str, COLOR_RED);
-        return false;
-    }
-
-    ImageStats ref_stats = image_stats(reference);
-    double ref_stddev = ref_stats.stddev.sum();
-    if (ref_stddev < 10){
-        str += "Image has too little detail. (rmsd = " + tostr_default(ref_stddev) + ")";
-        logger.log(str, COLOR_RED);
-        return false;
-    }
-    ImageStats img_stats = image_stats(image);
-    double img_stddev = img_stats.stddev.sum();
-    if (img_stddev < 10){
-        str += "Frame has too little detail. (rmsd = " + tostr_default(img_stddev) + ")";
-        logger.log(str, COLOR_RED);
-        return false;
-    }
-
-    double stddev_inv = (ref_stddev + img_stddev) * 0.5;
-    str += "\n";
-    str += "    Stddev = " + tostr_default(stddev_inv) + "\n";
-
-    stddev_inv = 1 / stddev_inv;
-
-    double identity         = stddev_inv * ImageMatch::pixel_RMSD(reference, image);
-    double flipped_vertical = stddev_inv * ImageMatch::pixel_RMSD(reference, image.to_QImage_ref().mirrored(false, true));
-    str += "    Identity = " + tostr_default(identity) + "\n";
-    str += "    Flipped Vertical = " + tostr_default(flipped_vertical) + "\n";
-
-    str += "    Orientation: ";
-    bool ok = false;
-    do{
-        if (identity < 0.05 && identity * 10 < flipped_vertical){
-            flip_vertical = false;
-            ok = true;
-            str += "Identity";
-            break;
-        }
-        if (flipped_vertical < 0.05 && flipped_vertical * 10 < identity){
-            flip_vertical = true;
-            ok = true;
-            str += "Flipped Vertical";
-            break;
-        }
-        str += "Unknown";
-    }while (false);
-
-    logger.log(str, ok ? COLOR_BLUE : COLOR_RED);
-
-    return ok;
-}
-
-
-
-
-
-
-CameraScreenshotter::CameraScreenshotter(Logger& logger, QCamera& camera)
-    : m_logger(logger)
-    , m_camera(camera)
-    , m_stats_conversion("Snapshot", "ms", 1000, std::chrono::seconds(10))
-{
-    m_capture = new QCameraImageCapture(&m_camera, &m_camera);
-    m_capture->setCaptureDestination(QCameraImageCapture::CaptureToBuffer);
-    m_camera.setCaptureMode(QCamera::CaptureStillImage);
-
-    connect(
-        m_capture, &QCameraImageCapture::imageCaptured,
-        this, [&](int id, const QImage& preview){
-            std::lock_guard<std::mutex> lg(m_lock);
-            m_screenshot = preview;
-            m_pending_screenshot = false;
-            m_cv.notify_all();
-        },
-        Qt::ConnectionType::QueuedConnection
-    );
-    connect(
-        m_capture, static_cast<void(QCameraImageCapture::*)(int, QCameraImageCapture::Error, const QString&)>(&QCameraImageCapture::error),
-        this, [&](int id, QCameraImageCapture::Error error, const QString& errorString){
-            std::lock_guard<std::mutex> lg(m_lock);
-            m_logger.log(
-                "QCameraImageCapture::error(): Capture ID: " + errorString.toStdString(),
-                COLOR_RED
-            );
-            m_screenshot = QImage();
-            m_pending_screenshot = false;
-            m_cv.notify_all();
-        },
-        Qt::ConnectionType::QueuedConnection
-    );
-}
-CameraScreenshotter::~CameraScreenshotter(){
-    delete m_capture;
-}
-VideoSnapshot CameraScreenshotter::snapshot(){
-    //  Only allow one snapshot at a time.
-    WallClock timestamp = current_time();
-
-    m_pending_screenshot = true;
-    m_camera.searchAndLock();
-    m_capture->capture();
-    m_camera.unlock();
-
-    QImage image;
-    WallClock start = current_time();
-    do{
-        if (current_time() - start >= std::chrono::seconds(1)){
-            m_logger.log("Capture timed out.");
-            m_pending_screenshot = false;
-            return VideoSnapshot{QImage(), timestamp};
-        }
-        QCoreApplication::instance()->processEvents(QEventLoop::AllEvents, 1);
-        std::unique_lock<std::mutex> lg(m_lock);
-        m_cv.wait_for(
-            lg,
-            std::chrono::milliseconds(1),
-            [&]{ return !m_pending_screenshot; }
-        );
-        image = std::move(m_screenshot);
-    }while (m_pending_screenshot);
-
-    QImage::Format format = image.format();
-    if (format != QImage::Format_ARGB32 && format != QImage::Format_RGB32){
-        image = image.convertToFormat(QImage::Format_ARGB32);
-    }
-
-    WallClock time1 = current_time();
-    m_stats_conversion.report_data(m_logger, std::chrono::duration_cast<std::chrono::microseconds>(time1 - timestamp).count());
-    return VideoSnapshot(image, timestamp);
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-}
-#endif
diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/VideoToolsQt5.h b/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/VideoToolsQt5.h
deleted file mode 100644
index eee29a7e7a..0000000000
--- a/SerialPrograms/Source/CommonFramework/VideoPipeline/Backends/VideoToolsQt5.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*  Video Tools (QT5)
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_VideoPipeline_VideoToolsQt5_H
-#define PokemonAutomation_VideoPipeline_VideoToolsQt5_H
-
-#include <vector>
-#include <mutex>
-#include <condition_variable>
-#include <QImage>
-#include <QCamera>
-#include <QVideoFrame>
-#include <QCameraImageCapture>
-#include "CommonFramework/Logging/Logger.h"
-#include "CommonFramework/Inference/StatAccumulator.h"
-#include "CommonFramework/VideoPipeline/CameraInfo.h"
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
-
-namespace PokemonAutomation{
-
-
-std::vector<CameraInfo> qt5_get_all_cameras();
-std::string qt5_get_camera_name(const CameraInfo& info);
-
-
-
-
-QImage frame_to_image(Logger& logger, QVideoFrame frame, bool flip_vertical);
-
-bool determine_frame_orientation(
-    Logger& logger, const ImageViewRGB32& reference, const ImageViewRGB32& image,
-    bool& flip_vertical
-);
-
-
-
-class CameraScreenshotter : public QObject{
-public:
-    CameraScreenshotter(Logger& logger, QCamera& camera);
-    virtual ~CameraScreenshotter();
-    VideoSnapshot snapshot();
-
-private:
-    Logger& m_logger;
-    QCamera& m_camera;
-    PeriodicStatsReporterI32 m_stats_conversion;
-
-    std::mutex m_lock;
-    std::condition_variable m_cv;
-
-    QCameraImageCapture* m_capture = nullptr;
-
-    bool m_pending_screenshot;
-    QImage m_screenshot;
-};
-
-
-
-
-
-
-}
-#endif
diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/CameraInfo.cpp b/SerialPrograms/Source/CommonFramework/VideoPipeline/CameraInfo.cpp
new file mode 100644
index 0000000000..8962bdbf3f
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/VideoPipeline/CameraInfo.cpp
@@ -0,0 +1,23 @@
+/*  Camera Info
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Options/DeviceDropdownAliases.h"
+#include "Backends/CameraImplementations.h"
+#include "CameraInfo.h"
+
+namespace PokemonAutomation{
+
+std::string CameraInfo::display_name() const{
+    if (!*this){
+        return std::string();
+    }
+    if (auto alias = device_dropdown_name(DeviceAliasType::VIDEO, m_device_name)){
+        return *alias;
+    }
+    return get_camera_name(*this);
+}
+
+}
diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/CameraInfo.h b/SerialPrograms/Source/CommonFramework/VideoPipeline/CameraInfo.h
index ece0809475..b8127d27be 100644
--- a/SerialPrograms/Source/CommonFramework/VideoPipeline/CameraInfo.h
+++ b/SerialPrograms/Source/CommonFramework/VideoPipeline/CameraInfo.h
@@ -1,6 +1,6 @@
 /*  Camera Info
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -24,7 +24,9 @@ class CameraInfo{
     explicit operator bool() const{ return !m_device_name.empty(); }
     const std::string& device_name() const{ return m_device_name; }
 
-    bool operator==(const CameraInfo& info){
+    std::string display_name() const;
+
+    bool operator==(const CameraInfo& info) const{
         return m_device_name == info.m_device_name;
     }
 
diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/CameraOption.cpp b/SerialPrograms/Source/CommonFramework/VideoPipeline/CameraOption.cpp
deleted file mode 100644
index 1d653eb35d..0000000000
--- a/SerialPrograms/Source/CommonFramework/VideoPipeline/CameraOption.cpp
+++ /dev/null
@@ -1,68 +0,0 @@
-/*  Camera Selector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Compiler.h"
-#include "Common/Cpp/Json/JsonValue.h"
-#include "Common/Cpp/Json/JsonArray.h"
-#include "Common/Cpp/Json/JsonObject.h"
-#include "CameraOption.h"
-
-namespace PokemonAutomation{
-
-
-const std::string CameraOption::JSON_CAMERA       = "Device";
-const std::string CameraOption::JSON_RESOLUTION   = "Resolution";
-
-
-CameraOption::CameraOption(Resolution p_default_resolution)
-    : default_resolution(p_default_resolution)
-    , current_resolution(p_default_resolution)
-{}
-
-void CameraOption::load_json(const JsonValue& json){
-    const JsonObject* obj = json.get_object();
-    if (obj == nullptr){
-        return;
-    }
-    const std::string* name = obj->get_string(JSON_CAMERA);
-    if (name != nullptr){
-        info = CameraInfo(*name);
-    }
-    const JsonArray* res = obj->get_array(JSON_RESOLUTION);
-    if (res != nullptr && res->size() == 2){
-        do{
-            size_t width, height;
-            if (!(*res)[0].read_integer(width)){
-                break;
-            }
-            if (!(*res)[1].read_integer(height)){
-                break;
-            }
-            current_resolution = Resolution(width, height);
-        }while (false);
-    }
-}
-JsonValue CameraOption::to_json() const{
-    JsonObject root;
-    root[JSON_CAMERA] = info.device_name();
-    JsonArray res;
-    res.push_back(current_resolution.width);
-    res.push_back(current_resolution.height);
-    root[JSON_RESOLUTION] = std::move(res);
-    return root;
-}
-
-
-
-
-
-
-
-
-
-
-
-}
diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/CameraOption.h b/SerialPrograms/Source/CommonFramework/VideoPipeline/CameraOption.h
deleted file mode 100644
index 9157f9a4f7..0000000000
--- a/SerialPrograms/Source/CommonFramework/VideoPipeline/CameraOption.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*  Camera Selector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- *      This class handles the state of the camera selection.
- *
- */
-
-#ifndef PokemonAutomation_VideoPipeline_CameraOption_H
-#define PokemonAutomation_VideoPipeline_CameraOption_H
-
-#include "Common/Cpp/ImageResolution.h"
-#include "CameraInfo.h"
-
-namespace PokemonAutomation{
-
-class JsonValue;
-
-
-
-//  Handles the state of video selection.
-class CameraOption{
-    static const std::string JSON_CAMERA;
-    static const std::string JSON_RESOLUTION;
-
-public:
-    CameraOption(Resolution p_default_resolution);
-
-
-public:
-    void load_json(const JsonValue& json);
-    JsonValue to_json() const;
-
-
-public:
-    const Resolution default_resolution;
-    CameraInfo info;
-    Resolution current_resolution;
-};
-
-
-
-
-
-}
-#endif
diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/CameraSession.h b/SerialPrograms/Source/CommonFramework/VideoPipeline/CameraSession.h
deleted file mode 100644
index d0e77405cd..0000000000
--- a/SerialPrograms/Source/CommonFramework/VideoPipeline/CameraSession.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*  Camera Session
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- *      CameraSession represents a live camera. It holds onto a Camera object
- *  and can be started/stopped/queried, etc...
- *
- *  This class is not responsible for any UI. However, any changes made to this
- *  class will be forwarded to any UI components that are attached to it.
- *
- *  The UI that allows a user to control this class is in CameraSelectorWidget.
- *  The actual display of the video from the camera is in VideoDisplayWidget.
- *
- */
-
-#ifndef PokemonAutomation_VideoPipeline_CameraSession_H
-#define PokemonAutomation_VideoPipeline_CameraSession_H
-
-#include <vector>
-#include "Common/Cpp/ImageResolution.h"
-#include "CommonFramework/VideoPipeline/CameraInfo.h"
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
-
-class QWidget;
-
-namespace PokemonAutomation{
-
-class VideoWidget;
-class CameraOption;
-
-
-class CameraSession : public VideoFeed{
-public:
-    struct Listener{
-        //  Sent before the camera shuts down. Listeners should drop their
-        //  references to the internal camera implementation before returning.
-        virtual void shutdown() = 0;
-
-        virtual void new_source(const CameraInfo& device, Resolution resolution) = 0;  //  Send after a new camera goes up.
-        virtual void resolution_change(Resolution resolution) = 0;
-    };
-    virtual void add_listener(Listener& listener) = 0;
-    virtual void remove_listener(Listener& listener) = 0;
-
-
-public:
-    virtual ~CameraSession() = default;
-
-    virtual void get(CameraOption& option) = 0;
-    virtual void set(const CameraOption& option) = 0;
-
-    virtual void reset() = 0;
-    virtual void set_source(CameraInfo device) = 0;
-    virtual void set_resolution(Resolution resolution) = 0;
-
-    virtual CameraInfo current_device() const = 0;
-    virtual Resolution current_resolution() const = 0;
-    virtual std::vector<Resolution> supported_resolutions() const = 0;
-
-    //  This snapshot function will be called asynchronously from many threads
-    //  at a very high rate. It is advised to cache snapshots if the video frame
-    //  has not changed from the last call.
-    //
-    //  If "timestamp" is not "WallClock::min()", it will be set to the best
-    //  known timestamp of the screenshot that is returned.
-    virtual VideoSnapshot snapshot() = 0;
-
-
-public:
-    virtual VideoWidget* make_QtWidget(QWidget* parent){ return nullptr; };
-};
-
-
-
-
-}
-#endif
diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/Sources/VideoSource_Camera.cpp b/SerialPrograms/Source/CommonFramework/VideoPipeline/Sources/VideoSource_Camera.cpp
new file mode 100644
index 0000000000..be409b05b6
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/VideoPipeline/Sources/VideoSource_Camera.cpp
@@ -0,0 +1,60 @@
+/*  Video Source (Camera)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/VideoPipeline/Backends/CameraImplementations.h"
+#include "CommonFramework/VideoPipeline/VideoSource.h"
+#include "VideoSource_Camera.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+
+
+
+bool VideoSourceDescriptor_Camera::operator==(const VideoSourceDescriptor& x) const{
+    if (typeid(*this) != typeid(x)){
+        return false;
+    }
+    return m_info == static_cast<const VideoSourceDescriptor_Camera&>(x).m_info;
+}
+std::string VideoSourceDescriptor_Camera::display_name() const{
+    return m_info.display_name();
+}
+
+JsonValue VideoSourceDescriptor_Camera::to_json() const{
+    return m_info.device_name();
+}
+void VideoSourceDescriptor_Camera::load_json(const JsonValue& json){
+    const std::string* name = json.to_string();
+    if (name != nullptr){
+        m_info = CameraInfo(*name);
+    }
+}
+
+std::unique_ptr<VideoSource> VideoSourceDescriptor_Camera::make_VideoSource(
+    Logger& logger,
+    Resolution resolution,
+    VideoFormat format,
+    FramesPerSecond fps
+) const{
+//    cout << "format = " << (int)format << endl;
+    return get_camera_backend().make_video_source(
+        logger,
+        m_info,
+        resolution,
+        format,
+        fps
+    );
+}
+
+
+
+
+}
+
+
diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/Sources/VideoSource_Camera.h b/SerialPrograms/Source/CommonFramework/VideoPipeline/Sources/VideoSource_Camera.h
new file mode 100644
index 0000000000..9e8aa70fcc
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/VideoPipeline/Sources/VideoSource_Camera.h
@@ -0,0 +1,49 @@
+/*  Video Source (Camera)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_VideoPipeline_VideoSource_Camera_H
+#define PokemonAutomation_VideoPipeline_VideoSource_Camera_H
+
+#include "CommonFramework/VideoPipeline/CameraInfo.h"
+#include "CommonFramework/VideoPipeline/VideoSourceDescriptor.h"
+
+namespace PokemonAutomation{
+
+
+class VideoSourceDescriptor_Camera : public VideoSourceDescriptor{
+public:
+    VideoSourceDescriptor_Camera()
+        : VideoSourceDescriptor(VideoSourceType::Camera)
+    {}
+    VideoSourceDescriptor_Camera(CameraInfo info)
+        : VideoSourceDescriptor(VideoSourceType::Camera)
+        , m_info(std::move(info))
+    {}
+
+
+public:
+    virtual bool operator==(const VideoSourceDescriptor& x) const override;
+    virtual std::string display_name() const override;
+
+    virtual JsonValue to_json() const override;
+    virtual void load_json(const JsonValue& json) override;
+
+    virtual std::unique_ptr<VideoSource> make_VideoSource(
+        Logger& logger,
+        Resolution resolution,
+        VideoFormat format,
+        FramesPerSecond fps
+    ) const override;
+
+
+private:
+    CameraInfo m_info;
+};
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/Sources/VideoSource_Null.cpp b/SerialPrograms/Source/CommonFramework/VideoPipeline/Sources/VideoSource_Null.cpp
new file mode 100644
index 0000000000..4649cf2fc0
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/VideoPipeline/Sources/VideoSource_Null.cpp
@@ -0,0 +1,37 @@
+/*  Video Source (Null)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/VideoPipeline/VideoSource.h"
+#include "VideoSource_Null.h"
+
+namespace PokemonAutomation{
+
+
+bool VideoSourceDescriptor_Null::operator==(const VideoSourceDescriptor& x) const{
+    return typeid(*this) == typeid(x);
+}
+std::string VideoSourceDescriptor_Null::display_name() const{
+    return "(none)";
+}
+
+JsonValue VideoSourceDescriptor_Null::to_json() const{
+    return JsonValue();
+}
+void VideoSourceDescriptor_Null::load_json(const JsonValue& json){
+
+}
+
+std::unique_ptr<VideoSource> VideoSourceDescriptor_Null::make_VideoSource(
+    Logger& logger,
+    Resolution resolution,
+    VideoFormat format,
+    FramesPerSecond fps
+) const{
+    return nullptr;
+}
+
+
+}
diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/Sources/VideoSource_Null.h b/SerialPrograms/Source/CommonFramework/VideoPipeline/Sources/VideoSource_Null.h
new file mode 100644
index 0000000000..02553c21e1
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/VideoPipeline/Sources/VideoSource_Null.h
@@ -0,0 +1,38 @@
+/*  Video Source (Null)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_VideoPipeline_VideoSource_Null_H
+#define PokemonAutomation_VideoPipeline_VideoSource_Null_H
+
+#include "CommonFramework/VideoPipeline/VideoSourceDescriptor.h"
+
+namespace PokemonAutomation{
+
+
+class VideoSourceDescriptor_Null : public VideoSourceDescriptor{
+public:
+    VideoSourceDescriptor_Null()
+        : VideoSourceDescriptor(VideoSourceType::None)
+    {}
+
+    virtual bool operator==(const VideoSourceDescriptor& x) const override;
+    virtual std::string display_name() const override;
+
+    virtual JsonValue to_json() const override;
+    virtual void load_json(const JsonValue& json) override;
+
+    virtual std::unique_ptr<VideoSource> make_VideoSource(
+        Logger& logger,
+        Resolution resolution,
+        VideoFormat format,
+        FramesPerSecond fps
+    ) const override;
+};
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/Sources/VideoSource_StillImage.cpp b/SerialPrograms/Source/CommonFramework/VideoPipeline/Sources/VideoSource_StillImage.cpp
new file mode 100644
index 0000000000..3cf22bde94
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/VideoPipeline/Sources/VideoSource_StillImage.cpp
@@ -0,0 +1,148 @@
+/*  Video Source (Still Image)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <QWidget>
+#include <QPainter>
+#include <QFileDialog>
+#include "CommonFramework/ImageTypes/ImageRGB32_Qt.h"
+#include "VideoSource_StillImage.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+
+
+
+bool VideoSourceDescriptor_StillImage::operator==(const VideoSourceDescriptor& x) const{
+    if (typeid(*this) != typeid(x)){
+        return false;
+    }
+
+    std::string other_path = static_cast<const VideoSourceDescriptor_StillImage&>(x).m_path;
+
+    ReadSpinLock lg(m_lock, PA_CURRENT_FUNCTION);
+    return m_path == other_path;
+}
+
+std::string VideoSourceDescriptor_StillImage::path() const{
+    ReadSpinLock lg(m_lock, PA_CURRENT_FUNCTION);
+    return m_path;
+}
+void VideoSourceDescriptor_StillImage::set_path(std::string path){
+    WriteSpinLock lg(m_lock, PA_CURRENT_FUNCTION);
+    m_path = std::move(path);
+}
+
+void VideoSourceDescriptor_StillImage::run_post_select(){
+//    if (!m_path.empty()){
+//        return;
+//    }
+    std::string path = QFileDialog::getOpenFileName(
+        nullptr, "Open image file", ".", "*.png *.jpg"
+    ).toStdString();
+    set_path(std::move(path));
+}
+JsonValue VideoSourceDescriptor_StillImage::to_json() const{
+    ReadSpinLock lg(m_lock, PA_CURRENT_FUNCTION);
+    return m_path;
+}
+void VideoSourceDescriptor_StillImage::load_json(const JsonValue& json){
+//    cout << "load_json: " << m_path << endl;
+    const std::string* name = json.to_string();
+    if (name != nullptr){
+        WriteSpinLock lg(m_lock, PA_CURRENT_FUNCTION);
+        m_path = *name;
+    }
+}
+
+std::unique_ptr<VideoSource> VideoSourceDescriptor_StillImage::make_VideoSource(
+    Logger& logger,
+    Resolution resolution,
+    VideoFormat format,
+    FramesPerSecond fps
+) const{
+//    cout << "make_VideoSource: " << m_path << endl;
+    return std::make_unique<VideoSource_StillImage>(logger, path(), resolution, format);
+}
+
+
+
+
+
+VideoSource_StillImage::VideoSource_StillImage(
+    Logger& logger,
+    const std::string& path,
+    Resolution resolution,
+    VideoFormat format
+)
+    : VideoSource(logger, false)
+    , m_original_image(QString::fromStdString(path))
+    , m_format(VideoFormat::OTHER)
+{
+    if (resolution){
+        m_snapshot = VideoSnapshot(
+            QImage_to_ImageRGB32(
+                m_original_image.scaled(
+                    (int)resolution.width,
+                    (int)resolution.height
+                )
+            ),
+            current_time()
+        );
+    }else{
+        m_snapshot = VideoSnapshot(
+            QImage_to_ImageRGB32(m_original_image),
+            current_time()
+        );
+    }
+    if (m_original_image.isNull()){
+        return;
+    }
+    m_resolution = m_snapshot.frame->size();
+
+    m_formats[{1280, 720}][VideoFormat::OTHER] = {0};
+    m_formats[{1920, 1080}][VideoFormat::OTHER] = {0};
+    m_formats[{3840, 2160}][VideoFormat::OTHER] = {0};
+    m_formats[{(size_t)m_original_image.width(), (size_t)m_original_image.height()}][VideoFormat::OTHER] = {0};
+}
+
+
+
+class VideoWidget_StillImage : public QWidget{
+public:
+    VideoWidget_StillImage(QWidget* parent, VideoSource_StillImage& source)
+        : QWidget(parent)
+        , m_source(source)
+    {}
+
+private:
+    virtual void paintEvent(QPaintEvent* event) override{
+        QWidget::paintEvent(event);
+
+        QRect rect(0, 0, this->width(), this->height());
+        QPainter painter(this);
+        painter.drawImage(rect, m_source.m_original_image);
+    }
+
+private:
+    VideoSource_StillImage& m_source;
+};
+
+
+
+
+
+QWidget* VideoSource_StillImage::make_display_QtWidget(QWidget* parent){
+    return new VideoWidget_StillImage(parent, *this);
+}
+
+
+
+
+}
+
diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/Sources/VideoSource_StillImage.h b/SerialPrograms/Source/CommonFramework/VideoPipeline/Sources/VideoSource_StillImage.h
new file mode 100644
index 0000000000..f12cb60d56
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/VideoPipeline/Sources/VideoSource_StillImage.h
@@ -0,0 +1,111 @@
+/*  Video Source (Still Image)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_VideoPipeline_VideoSource_StillImage_H
+#define PokemonAutomation_VideoPipeline_VideoSource_StillImage_H
+
+#include <QImage>
+#include "CommonFramework/VideoPipeline/VideoSourceDescriptor.h"
+#include "CommonFramework/VideoPipeline/VideoSource.h"
+
+namespace PokemonAutomation{
+
+
+class VideoSourceDescriptor_StillImage : public VideoSourceDescriptor{
+public:
+    VideoSourceDescriptor_StillImage()
+        : VideoSourceDescriptor(VideoSourceType::StillImage)
+    {}
+    VideoSourceDescriptor_StillImage(std::string path)
+        : VideoSourceDescriptor(VideoSourceType::StillImage)
+        , m_path(std::move(path))
+    {}
+
+public:
+    // get the image source path
+    std::string path() const;
+    // set the image source path
+    void set_path(std::string path);
+
+    virtual bool should_reload() const override{ return true; }
+    virtual bool operator==(const VideoSourceDescriptor& x) const override;
+    virtual std::string display_name() const override{
+        return "Display Image";
+    }
+
+    virtual void run_post_select() override;
+
+    virtual JsonValue to_json() const override;
+    virtual void load_json(const JsonValue& json) override;
+
+    virtual std::unique_ptr<VideoSource> make_VideoSource(
+        Logger& logger,
+        Resolution resolution,
+        VideoFormat format,
+        FramesPerSecond fps
+    ) const override;
+
+
+private:
+    mutable SpinLock m_lock;
+    std::string m_path;
+};
+
+
+
+class VideoSource_StillImage : public VideoSource{
+public:
+    VideoSource_StillImage(
+        Logger& logger,
+        const std::string& path,
+        Resolution resolution,
+        VideoFormat format
+    );
+
+    const std::string path() const{
+        return m_path;
+    }
+
+    virtual Resolution current_resolution() const override{
+        return m_resolution;
+    }
+    virtual VideoFormat current_format() const override{
+        return m_format;
+    }
+    virtual FramesPerSecond current_fps() const override{
+        return 0;
+    }
+    virtual const VideoFormatSet& supported_formats() const override{
+        return m_formats;
+    }
+
+    virtual VideoSnapshot snapshot_latest_blocking() override{
+        return m_snapshot;
+    }
+    virtual VideoSnapshot snapshot_recent_nonblocking(WallClock min_time) override{
+        return m_snapshot;
+    }
+
+    virtual QWidget* make_display_QtWidget(QWidget* parent) override;
+
+    const QImage& original_image() const { return m_original_image;}
+private:
+    friend class VideoWidget_StillImage;
+
+    std::string m_path;
+    QImage m_original_image;
+    VideoSnapshot m_snapshot;
+    Resolution m_resolution;
+    VideoFormat m_format;
+    VideoFormatSet m_formats;
+};
+
+
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/Stats/CpuUtilizationStats.cpp b/SerialPrograms/Source/CommonFramework/VideoPipeline/Stats/CpuUtilizationStats.cpp
new file mode 100644
index 0000000000..1b3d1d3245
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/VideoPipeline/Stats/CpuUtilizationStats.cpp
@@ -0,0 +1,39 @@
+/*  CPU Utilization Stats
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Time.h"
+#include "CpuUtilizationStats.h"
+
+namespace PokemonAutomation{
+
+
+CpuUtilizationStat::CpuUtilizationStat()
+    : m_last_clock(SystemCpuTime::now())
+{}
+OverlayStatSnapshot CpuUtilizationStat::get_current(){
+    WallClock now = current_time();
+    SystemCpuTime current = SystemCpuTime::now();
+    size_t vcores = SystemCpuTime::vcores();
+    if (vcores == 0 || !current.is_valid()){
+        return OverlayStatSnapshot{"CPU Utilization: ---"};
+    }
+
+    std::lock_guard<Mutex> lg(m_lock);
+    if (m_last_clock.is_valid()){
+        auto duration = current - m_last_clock;
+        duration /= vcores;
+        m_tracker.push_event(std::chrono::duration_cast<WallDuration>(duration), now);
+    }
+    m_last_clock = current;
+
+    return m_printer.get_snapshot(
+        "CPU Utilization (x" + std::to_string(vcores) + "):",
+        m_tracker.utilization()
+    );
+}
+
+
+}
diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/Stats/CpuUtilizationStats.h b/SerialPrograms/Source/CommonFramework/VideoPipeline/Stats/CpuUtilizationStats.h
index 89ebee1b5c..72dfcac1d5 100644
--- a/SerialPrograms/Source/CommonFramework/VideoPipeline/Stats/CpuUtilizationStats.h
+++ b/SerialPrograms/Source/CommonFramework/VideoPipeline/Stats/CpuUtilizationStats.h
@@ -1,15 +1,15 @@
 /*  CPU Utilization Stats
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifndef PokemonAutomation_CpuUtilizationStats_H
 #define PokemonAutomation_CpuUtilizationStats_H
 
-#include "Common/Cpp/Time.h"
 #include "Common/Cpp/EventRateTracker.h"
-#include "CommonFramework/Environment/Environment.h"
+#include "Common/Cpp/Concurrency/Mutex.h"
+#include "Common/Cpp/CpuUtilization/CpuUtilization.h"
 #include "CommonFramework/VideoPipeline/VideoOverlayTypes.h"
 
 //#include <iostream>
@@ -26,7 +26,7 @@ class CpuUtilizationStat : public OverlayStat{
     virtual OverlayStatSnapshot get_current() override;
 
 private:
-    std::mutex m_lock;
+    Mutex m_lock;
     SystemCpuTime m_last_clock;
     UtilizationTracker m_tracker;
 
@@ -34,29 +34,10 @@ class CpuUtilizationStat : public OverlayStat{
 };
 
 
-inline CpuUtilizationStat::CpuUtilizationStat()
-    : m_last_clock(SystemCpuTime::now())
-{}
-inline OverlayStatSnapshot CpuUtilizationStat::get_current(){
-    std::lock_guard<std::mutex> lg(m_lock);
 
-    WallClock now = current_time();
-    SystemCpuTime current = SystemCpuTime::now();
-    size_t vcores = SystemCpuTime::vcores();
-    if (vcores == 0 || !current.is_valid()){
-        return OverlayStatSnapshot{"CPU Utilization: ---"};
-    }
 
 
-    if (m_last_clock.is_valid()){
-        auto duration = current - m_last_clock;
-        duration /= vcores;
-        m_tracker.push_event(std::chrono::duration_cast<WallClock::duration>(duration), now);
-    }
-    m_last_clock = current;
 
-    return m_printer.get_snapshot("CPU Utilization (x" + std::to_string(vcores) + "):", m_tracker.utilization());
-}
 
 
 
diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/Stats/MemoryUtilizationStats.cpp b/SerialPrograms/Source/CommonFramework/VideoPipeline/Stats/MemoryUtilizationStats.cpp
new file mode 100644
index 0000000000..77c96fc662
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/VideoPipeline/Stats/MemoryUtilizationStats.cpp
@@ -0,0 +1,99 @@
+/*  Memory Utilization Stats
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/PrettyPrint.h"
+#include "Common/Cpp/MemoryUtilization/MemoryUtilization.h"
+#include "MemoryUtilizationStats.h"
+
+namespace PokemonAutomation{
+
+
+
+OverlayStatSnapshot MemoryUtilizationStat::get_current(){
+    if (m_parent){
+        m_parent->update();
+    }
+    return m_snapshot;
+}
+
+
+
+void MemoryUtilizationStats::update(){
+    MemoryUsage memory = process_memory_usage();
+
+    double usage;
+
+    constexpr uint64_t GB = (uint64_t)1 << 30;
+
+    OverlayStatSnapshot system;
+    if (get_stat(
+        system.text, usage,
+        "Sys: ",
+        memory.total_system_memory,
+        memory.total_used_system_memory
+    )){
+        uint64_t free_memory = memory.total_system_memory - memory.total_used_system_memory;
+
+        if (usage >= 0.90 || free_memory < 2*GB){
+            system.color = COLOR_RED;
+        }else if (usage >= 0.75 || free_memory < 4*GB){
+            system.color = COLOR_ORANGE;
+        }else if (usage >= 0.50 || free_memory < 8*GB){
+            system.color = COLOR_YELLOW;
+        }
+    }
+
+    OverlayStatSnapshot process;
+    if (get_stat(
+        process.text, usage,
+        "App: ",
+        memory.process_virtual_memory,
+        memory.process_physical_memory
+    )){
+        if (memory.process_virtual_memory > 1*GB){
+            if (usage < 0.10){
+                process.color = COLOR_RED;
+            }else if (usage < 0.25){
+                process.color = COLOR_ORANGE;
+            }else if (usage < 0.50){
+                process.color = COLOR_YELLOW;
+            }
+        }
+    }
+
+    m_system.m_snapshot = std::move(system);
+    m_process.m_snapshot = std::move(process);
+}
+bool MemoryUtilizationStats::get_stat(
+    std::string& stat_text,
+    double& usage,
+    std::string label,
+    uint64_t total, uint64_t current
+){
+    stat_text = std::move(label);
+    stat_text += current != 0
+        ? tostr_bytes(current)
+        : "---";
+    stat_text += " / ";
+    stat_text += total != 0
+        ? tostr_bytes(total)
+        : "---";
+
+    if (current != 0 && total != 0){
+        usage = (double)current / total;
+        stat_text += " (";
+        stat_text += tostr_fixed(usage * 100, 1);
+        stat_text += "%)";
+        return true;
+    }
+
+    return false;
+}
+
+
+
+
+}
diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/Stats/MemoryUtilizationStats.h b/SerialPrograms/Source/CommonFramework/VideoPipeline/Stats/MemoryUtilizationStats.h
new file mode 100644
index 0000000000..bf91e00377
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/VideoPipeline/Stats/MemoryUtilizationStats.h
@@ -0,0 +1,66 @@
+/*  Memory Utilization Stats
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_MemoryUtilizationStats_H
+#define PokemonAutomation_MemoryUtilizationStats_H
+
+#include "CommonFramework/VideoPipeline/VideoOverlayTypes.h"
+
+namespace PokemonAutomation{
+
+
+
+class MemoryUtilizationStats;
+
+
+class MemoryUtilizationStat : public OverlayStat{
+public:
+    MemoryUtilizationStat(MemoryUtilizationStats* parent)
+        : m_parent(parent)
+    {}
+    virtual OverlayStatSnapshot get_current() override;
+
+private:
+    friend class MemoryUtilizationStats;
+
+    MemoryUtilizationStats* m_parent;
+    OverlayStatSnapshot m_snapshot;
+};
+
+
+
+
+class MemoryUtilizationStats{
+public:
+    MemoryUtilizationStats()
+        : m_system(this)
+        , m_process(this)
+    {}
+
+    void update();
+
+private:
+    static bool get_stat(
+        std::string& stat_text,
+        double& usage,
+        std::string label,
+        uint64_t total, uint64_t current
+    );
+
+private:
+    friend class MemoryUtilizationStat;
+
+public:
+    MemoryUtilizationStat m_system;
+    MemoryUtilizationStat m_process;
+};
+
+
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/Stats/ThreadUtilizationStats.cpp b/SerialPrograms/Source/CommonFramework/VideoPipeline/Stats/ThreadUtilizationStats.cpp
index 139a890d65..05ad1ff7bb 100644
--- a/SerialPrograms/Source/CommonFramework/VideoPipeline/Stats/ThreadUtilizationStats.cpp
+++ b/SerialPrograms/Source/CommonFramework/VideoPipeline/Stats/ThreadUtilizationStats.cpp
@@ -1,10 +1,11 @@
 /*  Thread Utilization Stats
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include "Common/Cpp/PrettyPrint.h"
+//#include "Common/Cpp/PrettyPrint.h"
+#include "Common/Cpp/Concurrency/ThreadPool.h"
 #include "ThreadUtilizationStats.h"
 
 //#include <iostream>
@@ -21,15 +22,15 @@ ThreadUtilizationStat::ThreadUtilizationStat(ThreadHandle handle, std::string la
 {}
 
 OverlayStatSnapshot ThreadUtilizationStat::get_current(){
-    std::lock_guard<std::mutex> lg(m_lock);
+    std::lock_guard<Mutex> lg(m_lock);
 
     WallClock now = current_time();
-    WallClock::duration clock = thread_cpu_time(m_handle);
-    if (clock == WallClock::duration::min()){
+    WallDuration clock = thread_cpu_time(m_handle);
+    if (clock == WallDuration::min()){
         return OverlayStatSnapshot{m_label + " ---"};
     }
 
-    if (m_last_clock != WallClock::duration::min()){
+    if (m_last_clock != WallDuration::min()){
         m_tracker.push_event(clock - m_last_clock, now);
     }
     m_last_clock = clock;
@@ -39,4 +40,36 @@ OverlayStatSnapshot ThreadUtilizationStat::get_current(){
 
 
 
+
+ThreadPoolUtilizationStat::ThreadPoolUtilizationStat(const ThreadPool& thread_pool, std::string label)
+    : m_thread_pool(thread_pool)
+    , m_label(std::move(label))
+    , m_last_clock(thread_pool.cpu_time())
+    , m_printer((double)thread_pool.max_threads())
+{}
+
+OverlayStatSnapshot ThreadPoolUtilizationStat::get_current(){
+    std::lock_guard<Mutex> lg(m_lock);
+
+    WallClock now = current_time();
+    WallDuration clock = m_thread_pool.cpu_time();
+    if (clock <= WallDuration::zero()){
+        return OverlayStatSnapshot();
+    }
+
+    if (m_last_clock != WallDuration::min()){
+        m_tracker.push_event(clock - m_last_clock, now);
+    }
+    m_last_clock = clock;
+
+    return m_printer.get_snapshot(
+        m_label + " (x" + std::to_string(m_thread_pool.current_threads()) + "):",
+        m_tracker.utilization()
+    );
+}
+
+
+
+
+
 }
diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/Stats/ThreadUtilizationStats.h b/SerialPrograms/Source/CommonFramework/VideoPipeline/Stats/ThreadUtilizationStats.h
index 809dc9b2e7..c405a25947 100644
--- a/SerialPrograms/Source/CommonFramework/VideoPipeline/Stats/ThreadUtilizationStats.h
+++ b/SerialPrograms/Source/CommonFramework/VideoPipeline/Stats/ThreadUtilizationStats.h
@@ -1,6 +1,6 @@
 /*  Thread Utilization Stats
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -9,12 +9,17 @@
 
 #include "Common/Cpp/Time.h"
 #include "Common/Cpp/EventRateTracker.h"
-#include "CommonFramework/Environment/Environment.h"
+#include "Common/Cpp/Concurrency/Mutex.h"
+#include "Common/Cpp/CpuUtilization/CpuUtilization.h"
 #include "CommonFramework/VideoPipeline/VideoOverlayTypes.h"
 
 namespace PokemonAutomation{
 
 
+class ThreadPool;
+
+
+
 class ThreadUtilizationStat : public OverlayStat{
 public:
     ThreadUtilizationStat(ThreadHandle handle, std::string label);
@@ -25,14 +30,33 @@ class ThreadUtilizationStat : public OverlayStat{
     ThreadHandle m_handle;
     std::string m_label;
 
-    std::mutex m_lock;
-    WallClock::duration m_last_clock;
+    Mutex m_lock;
+    WallDuration m_last_clock;
     UtilizationTracker m_tracker;
 
     OverlayStatUtilizationPrinter m_printer;
 };
 
 
+class ThreadPoolUtilizationStat : public OverlayStat{
+public:
+    ThreadPoolUtilizationStat(const ThreadPool& thread_pool, std::string label);
+
+    virtual OverlayStatSnapshot get_current() override;
+
+private:
+    const ThreadPool& m_thread_pool;
+    std::string m_label;
+
+    Mutex m_lock;
+    WallDuration m_last_clock;
+    UtilizationTracker m_tracker;
+
+    OverlayStatUtilizationPrinter m_printer;
+};
+
+
+
 
 }
 #endif
diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/UI/CameraSelectorWidget.cpp b/SerialPrograms/Source/CommonFramework/VideoPipeline/UI/CameraSelectorWidget.cpp
deleted file mode 100644
index 0b84ebf648..0000000000
--- a/SerialPrograms/Source/CommonFramework/VideoPipeline/UI/CameraSelectorWidget.cpp
+++ /dev/null
@@ -1,202 +0,0 @@
-/*  Camera Selector Widget
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QComboBox>
-#include <QPushButton>
-#include "Common/Qt/Redispatch.h"
-#include "Common/Qt/NoWheelComboBox.h"
-#include "CommonFramework/VideoPipeline/Backends/CameraImplementations.h"
-#include "VideoDisplayWidget.h"
-#include "CameraSelectorWidget.h"
-
-#include <iostream>
-using std::cout;
-using std::endl;
-
-namespace PokemonAutomation{
-
-
-
-CameraSelectorWidget::~CameraSelectorWidget(){
-//    cout << "~CameraSelectorUI()" << endl;
-    m_session.remove_listener(*this);
-}
-CameraSelectorWidget::CameraSelectorWidget(
-    CameraSession& session,
-    Logger& logger,
-    VideoDisplayWidget& holder
-)
-    : m_logger(logger)
-    , m_session(session)
-    , m_display(holder)
-    , m_camera_box(nullptr)
-    , m_resolution_box(nullptr)
-{
-    QHBoxLayout* camera_row = new QHBoxLayout(this);
-    camera_row->setContentsMargins(0, 0, 0, 0);
-
-    camera_row->addWidget(new QLabel("<b>Camera:</b>", this), 1);
-    camera_row->addSpacing(5);
-
-    m_camera_box = new NoWheelComboBox(this);
-    camera_row->addWidget(m_camera_box, 5);
-    update_camera_list();
-    camera_row->addSpacing(5);
-
-    m_resolution_box = new NoWheelComboBox(this);
-    camera_row->addWidget(m_resolution_box, 3);
-    camera_row->addSpacing(5);
-
-    m_reset_button = new QPushButton("Reset Camera", this);
-    camera_row->addWidget(m_reset_button, 1);
-
-    update_camera_list();
-    update_resolution_list();
-
-    connect(
-        m_camera_box, static_cast<void(QComboBox::*)(int)>(&QComboBox::activated),
-        this, [this](int index){
-//            cout << "m_camera_box" << endl;
-            if (index <= 0 || index > (int)m_cameras.size()){
-                m_session.set_source(CameraInfo());
-            }else{
-                m_session.set_source(m_cameras[index - 1]);
-            }
-        }
-    );
-    connect(
-        m_resolution_box, static_cast<void(QComboBox::*)(int)>(&QComboBox::activated),
-        this, [this](int index){
-//            cout << "m_resolution_box" << endl;
-            if (!m_display){
-                return;
-            }
-            if (index < 0 || index >= (int)m_resolutions.size()){
-                return;
-            }
-            Resolution resolution = m_resolutions[index];
-            m_session.set_resolution(resolution);
-            m_display.set_aspect_ratio(resolution.aspect_ratio());
-        }
-    );
-    connect(
-        m_reset_button, &QPushButton::clicked,
-        this, [this](bool){
-            m_session.reset();
-        }
-    );
-
-    m_session.add_listener(*this);
-}
-void CameraSelectorWidget::update_camera_list(){
-    m_camera_box->clear();
-    m_camera_box->addItem("(none)");
-
-    m_cameras = get_all_cameras();
-    CameraInfo info = m_session.current_device();
-
-    size_t index = 0;
-    for (size_t c = 0; c < m_cameras.size(); c++){
-        const CameraInfo& camera = m_cameras[c];
-        m_camera_box->addItem(QString::fromStdString(get_camera_name(camera)));
-
-        if (info == camera){
-            index = c + 1;
-        }
-    }
-    if (index != 0){
-        m_camera_box->setCurrentIndex((int)index);
-    }else{
-        info = CameraInfo();
-        m_camera_box->setCurrentIndex(0);
-    }
-}
-void CameraSelectorWidget::update_resolution_list(){
-    Resolution camera_resolution = m_session.current_resolution();
-//    cout << "camera_resolution = " << camera_resolution << endl;
-
-    m_resolution_box->clear();
-    m_resolutions.clear();
-
-    m_resolutions = m_session.supported_resolutions();
-//    cout << "CameraSelectorWidget::resolutions = " << m_resolutions.size() << endl;
-    if (m_resolutions.empty()){
-        return;
-    }
-
-    int camera_index = -1;
-//    int current_index = -1;
-    for (int c = 0; c < (int)m_resolutions.size(); c++){
-        const Resolution& size = m_resolutions[c];
-        m_resolution_box->addItem(
-            QString::fromStdString(
-                std::to_string(size.width) + " x " +
-                std::to_string(size.height) + " " +
-                aspect_ratio_as_string(size)
-            )
-        );
-//        cout << "size = " << camera_resolution << endl;
-        if (size == camera_resolution){
-            camera_index = c;
-        }
-//        if (size == m_session.){
-//            camera_index = c;
-//        }
-    }
-    if (camera_index >= 0){
-        m_resolution_box->setCurrentIndex(camera_index);
-    }else{
-        m_logger.log("Unable to find entry for this resolution.", COLOR_RED);
-    }
-}
-
-void CameraSelectorWidget::shutdown(){
-//    cout << "CameraSelectorWidget::shutdown()" << endl;
-    QMetaObject::invokeMethod(this, [&]{
-        m_resolution_box->clear();
-        m_resolutions.clear();
-    }, Qt::QueuedConnection);
-}
-void CameraSelectorWidget::new_source(const CameraInfo& device, Resolution resolution){
-//    cout << "CameraSelectorWidget::new_source()" << endl;
-    QMetaObject::invokeMethod(this, [&]{
-        //  See if it's in the cached list.
-        for (size_t c = 0; c < m_cameras.size(); c++){
-            if (m_cameras[c] == device){
-                m_camera_box->setCurrentIndex((int)c + 1);
-                update_resolution_list();
-                return;
-            }
-        }
-        update_camera_list();
-        update_resolution_list();
-    }, Qt::QueuedConnection);
-}
-void CameraSelectorWidget::resolution_change(Resolution resolution){
-    //  See if it's in the cached list.
-    for (size_t c = 0; c < m_resolutions.size(); c++){
-        if (m_resolutions[c] == resolution){
-            m_resolution_box->setCurrentIndex((int)c);
-            return;
-        }
-    }
-    QMetaObject::invokeMethod(this, [&]{
-        update_resolution_list();
-    }, Qt::QueuedConnection);
-}
-
-
-
-
-
-
-
-
-
-
-}
diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/UI/CameraSelectorWidget.h b/SerialPrograms/Source/CommonFramework/VideoPipeline/UI/CameraSelectorWidget.h
deleted file mode 100644
index 296b73a80f..0000000000
--- a/SerialPrograms/Source/CommonFramework/VideoPipeline/UI/CameraSelectorWidget.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*  Camera Selector Widget
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_VideoPipeline_CameraSelectorWidget_H
-#define PokemonAutomation_VideoPipeline_CameraSelectorWidget_H
-
-#include <vector>
-#include <atomic>
-#include <mutex>
-#include <QWidget>
-#include "Common/Cpp/ImageResolution.h"
-#include "CommonFramework/VideoPipeline/CameraSession.h"
-
-class QComboBox;
-class QPushButton;
-
-namespace PokemonAutomation{
-
-class Logger;
-class VideoDisplayWidget;
-
-
-//  Widget to handle UI that selects video source and resolution.
-//  The video state is managed by a class CameraSelector
-//  object passed in the constructor.
-//  CameraSelectorWidget is also responsible for updating
-//  VideoDisplayWidget, the video feed UI, when the video state
-//  is changed. The VideoDisplayWidget is passed in the constructor
-//  too.
-class CameraSelectorWidget : public QWidget, public CameraSession::Listener{
-    //  Need to define this Q_OBJECT to use Qt's extra features
-    //  like signals and slots on this class.
-    Q_OBJECT
-public:
-    CameraSelectorWidget(
-        CameraSession& session,
-        Logger& logger,
-        VideoDisplayWidget& holder
-    );
-    ~CameraSelectorWidget();
-
-private:
-    void update_camera_list();
-    void update_resolution_list();
-
-    virtual void shutdown() override;
-    virtual void new_source(const CameraInfo& device, Resolution resolution) override;
-    virtual void resolution_change(Resolution resolution) override;
-
-private:
-    Logger& m_logger;
-    CameraSession& m_session;
-
-    VideoDisplayWidget& m_display;
-    std::vector<Resolution> m_resolutions;
-
-    QComboBox* m_camera_box;
-    QComboBox* m_resolution_box;
-    QPushButton* m_reset_button;
-
-    std::vector<CameraInfo> m_cameras;
-
-//    std::atomic<bool> m_snapshots_allowed;
-    std::mutex m_camera_lock;
-};
-
-
-}
-#endif
diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/UI/VideoDisplayWidget.cpp b/SerialPrograms/Source/CommonFramework/VideoPipeline/UI/VideoDisplayWidget.cpp
index 6b8cb651ba..5c4e5c8a03 100644
--- a/SerialPrograms/Source/CommonFramework/VideoPipeline/UI/VideoDisplayWidget.cpp
+++ b/SerialPrograms/Source/CommonFramework/VideoPipeline/UI/VideoDisplayWidget.cpp
@@ -1,13 +1,16 @@
 /*  Video Display
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
+#include <QApplication>
 #include <QVBoxLayout>
 #include <QLabel>
 #include <QLineEdit>
+#include <QMouseEvent>
 #include "Common/Cpp/PrettyPrint.h"
+#include "Common/Qt/Redispatch.h"
 #include "VideoDisplayWidget.h"
 #include "VideoDisplayWindow.h"
 
@@ -22,25 +25,28 @@ namespace PokemonAutomation{
 VideoDisplayWidget::VideoDisplayWidget(
     QWidget& parent, QLayout& holder,
     size_t id,
-    CommandReceiver& command_receiver,
-    CameraSession& camera,
+    VideoSession& video_session,
     VideoOverlaySession& overlay
 )
     : WidgetStackFixedAspectRatio(parent, WidgetStackFixedAspectRatio::ADJUST_HEIGHT_TO_WIDTH)
     , m_holder(holder)
     , m_id(id)
-    , m_command_receiver(command_receiver)
+    , m_video_session(video_session)
     , m_overlay_session(overlay)
-    , m_video(camera.make_QtWidget(this))
     , m_overlay(new VideoOverlayWidget(*this, overlay))
     , m_underlay(new QWidget(this))
     , m_source_fps(*this)
     , m_display_fps(*this)
 {
-    this->add_widget(*m_video);
     this->add_widget(*m_overlay);
 
-    Resolution resolution = m_video->camera().current_resolution();
+    VideoSource* source = video_session.current_source();
+    if (source){
+        m_video = source->make_display_QtWidget(this);
+        this->add_widget(*m_video);
+    }
+
+    Resolution resolution = video_session.current_resolution();
     if (resolution){
         set_aspect_ratio(resolution.aspect_ratio());
     }
@@ -108,8 +114,31 @@ VideoDisplayWidget::VideoDisplayWidget(
 
     overlay.add_stat(m_source_fps);
     overlay.add_stat(m_display_fps);
+
+    video_session.add_state_listener(*this);
 }
 VideoDisplayWidget::~VideoDisplayWidget(){
+    //  This is an ugly work-around for deadlock that can occur if the
+    //  destructor of this is class is called while a reset on the VideoSession
+    //  is in flight.
+    //
+    //  Because Qt requires everything to run on the main thread, outside
+    //  threads that reset the VideoSession will get redispatched to the main
+    //  thread while holding a lock on the listener. If this redispatch gets
+    //  queued behind the task running here, it will wait on the same listener
+    //  thus deadlocking.
+    //
+    //  The work-around is that if we fail to acquire this lock, we process the
+    //  event queue to eventually run the task that is holding the lock.
+    //
+    while (!m_video_session.try_remove_state_listener(*this)){
+        m_video_session.logger().log(
+            "VideoDisplayWidget::~VideoDisplayWidget(): Lock already held. Processing events...",
+            COLOR_ORANGE
+        );
+        QApplication::processEvents();
+    }
+
     //  Close the window popout first since it holds references to this class.
     move_back_from_window();
     m_overlay_session.remove_stat(m_display_fps);
@@ -117,6 +146,35 @@ VideoDisplayWidget::~VideoDisplayWidget(){
     delete m_underlay;
 }
 
+void VideoDisplayWidget::clear_video_source(){
+//    cout << "clear_video_source() = " << m_video << endl;
+    if (m_video){
+        this->remove_widget(m_video);
+        m_video = nullptr;
+    }
+}
+
+void VideoDisplayWidget::post_startup(VideoSource* source){
+//    cout << "post_startup() = " << m_video << endl;
+    run_on_object_thread_and_wait(this, [&]{
+        clear_video_source();
+        if (source){
+            m_video = source->make_display_QtWidget(this);
+//            cout << "post_startup() - creating = " << m_video << endl;
+            this->add_widget(*m_video);
+            set_aspect_ratio(source->current_resolution().aspect_ratio());
+            m_overlay->raise();
+        }
+    });
+}
+void VideoDisplayWidget::pre_shutdown(){
+//    cout << "pre_shutdown()" << endl;
+    run_on_object_thread_and_wait(this, [&]{
+        clear_video_source();
+    });
+}
+
+
 
 void VideoDisplayWidget::move_to_new_window(){
     if (m_window){
@@ -138,7 +196,9 @@ void VideoDisplayWidget::move_back_from_window(){
     m_holder.addWidget(this);
 //    this->resize(this->size());
 //    cout << "VideoWidget Before: " << m_video->width() << " x " << m_video->height() << endl;
-    m_video->resize(this->size());
+    if (m_video){
+        m_video->resize(this->size());
+    }
 //    cout << "VideoWidget After: " << m_video->width() << " x " << m_video->height() << endl;
     m_holder.update();
     m_window.reset();
@@ -147,7 +207,7 @@ void VideoDisplayWidget::move_back_from_window(){
 
 
 void VideoDisplayWidget::mouseDoubleClickEvent(QMouseEvent* event){
-//    if (!PreloadSettings::instance().DEVELOPER_MODE){
+//    if (!STATIC_GLOBALS.DEVELOPER_MODE){
 //        return;
 //    }
     // If this widget is not already inside a VideoDisplayWindow, move it
@@ -171,16 +231,37 @@ void VideoDisplayWidget::resizeEvent(QResizeEvent* event){
     m_height_box->setText(QString::number(m_last_height));
 }
 
+void VideoDisplayWidget::mousePressEvent(QMouseEvent* event){
+//    cout << "VideoDisplayWidget::mousePressEvent()" << endl;
+    WidgetStackFixedAspectRatio::mousePressEvent(event);
+    double x = (double)event->pos().x() / this->width();
+    double y = (double)event->pos().y() / this->height();
+    m_overlay_session.report_mouse_press(x, y);
+}
+void VideoDisplayWidget::mouseReleaseEvent(QMouseEvent* event){
+//    cout << "VideoDisplayWidget::mouseReleaseEvent()" << endl;
+    WidgetStackFixedAspectRatio::mouseReleaseEvent(event);
+    double x = (double)event->pos().x() / this->width();
+    double y = (double)event->pos().y() / this->height();
+    m_overlay_session.report_mouse_release(x, y);
+}
+void VideoDisplayWidget::mouseMoveEvent(QMouseEvent* event){
+    WidgetStackFixedAspectRatio::mouseMoveEvent(event);
+    double x = (double)event->pos().x() / this->width();
+    double y = (double)event->pos().y() / this->height();
+    m_overlay_session.report_mouse_move(x, y);
+}
+
 
 OverlayStatSnapshot VideoSourceFPS::get_current(){
-    double fps = m_parent.m_video->camera().fps_source();
+    double fps = m_parent.m_video_session.fps_source();
     return OverlayStatSnapshot{
         "Video Source FPS: " + tostr_fixed(fps, 2),
         fps < 20 ? COLOR_RED : COLOR_WHITE
     };
 }
 OverlayStatSnapshot VideoDisplayFPS::get_current(){
-    double fps = m_parent.m_video->camera().fps_display();
+    double fps = m_parent.m_video_session.fps_display();
     return OverlayStatSnapshot{
         "Video Display FPS: " + (fps < 0 ? "???" : tostr_fixed(fps, 2)),
         fps >= 0 && fps < 20 ? COLOR_RED : COLOR_WHITE
diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/UI/VideoDisplayWidget.h b/SerialPrograms/Source/CommonFramework/VideoPipeline/UI/VideoDisplayWidget.h
index 1b21bed1cc..930ffd2cb1 100644
--- a/SerialPrograms/Source/CommonFramework/VideoPipeline/UI/VideoDisplayWidget.h
+++ b/SerialPrograms/Source/CommonFramework/VideoPipeline/UI/VideoDisplayWidget.h
@@ -1,15 +1,25 @@
-/*  Video Display
+/*  Video Display Widget
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
+ *  VideoDisplayWidget renders a window for video stream from a Switch console or 
+ *  other sources. Stream control UI is not part of this class.
+ * 
+ *  The actual QWidget that displays the video content is not created by this class.
+ *  But rather, this class receives the content widget from
+ *  VideoSession.current_source()->make_display_QtWidget().
+ * 
+ *  VideoDisplayWidget is repsonsible for handling aspect ratio and passing key events
+ *  around. It also uses VideoDisplayWindow to pop up the stream view into a standalone
+ *  QMainWindow.
  */
 
 #ifndef PokemonAutomation_VideoPipeline_VideoDisplayWidget_H
 #define PokemonAutomation_VideoPipeline_VideoDisplayWidget_H
 
-#include "Common/Cpp/ValueDebouncer.h"
+//#include "Common/Cpp/ValueDebouncer.h"
 #include "Common/Qt/WidgetStackFixedAspectRatio.h"
-#include "VideoWidget.h"
+#include "CommonFramework/VideoPipeline/VideoSession.h"
 #include "VideoOverlayWidget.h"
 
 class QLineEdit;
@@ -19,23 +29,10 @@ namespace PokemonAutomation{
 class VideoDisplayWindow;
 
 
-//  Interface for forwarding keyboard commands from the VideoDisplayWidget to
-//  whatever thing under it handles it.
-struct CommandReceiver{
-    //  Returns false if key is not handled. (pass it up to next handler)
-    virtual bool key_press(QKeyEvent* event) = 0;
-    virtual bool key_release(QKeyEvent* event) = 0;
-
-    virtual void focus_in(QFocusEvent* event) = 0;
-    virtual void focus_out(QFocusEvent* event) = 0;
-};
-
-
-
-
 
 class VideoDisplayWidget;
 
+// Render the FPS of the incoming video stream as a text overlay on the video window
 class VideoSourceFPS : public OverlayStat{
 public:
     VideoSourceFPS(VideoDisplayWidget& parent)
@@ -47,6 +44,7 @@ class VideoSourceFPS : public OverlayStat{
     VideoDisplayWidget& m_parent;
 };
 
+// Render the FPS of the rendering thread of the video window as a text overlay on the window
 class VideoDisplayFPS : public OverlayStat{
 public:
     VideoDisplayFPS(VideoDisplayWidget& parent)
@@ -60,16 +58,21 @@ class VideoDisplayFPS : public OverlayStat{
 
 
 
-//  The widget that owns the video window.
-//  It consists of a VideoWidget that loads the video content from Switch and a VideoOverlayWidget
-//  that renders inference boxes and other visualizations on top of the video content.
-class VideoDisplayWidget : public WidgetStackFixedAspectRatio{
+//  The widget that owns the video stream window.
+//  It consists of a VideoWidget that loads the video content from Switch or other sources
+//  and a VideoOverlayWidget that renders text overlays, inference boxes and other visualizations
+//  on top of the video content.
+class VideoDisplayWidget : public WidgetStackFixedAspectRatio, private VideoSession::StateListener{
 public:
+    // holder: parent's layout that holds this VideoDisplayWidget
+    // id: the ID to differentiate multiple video views. For multi-Switch automation programs, this id
+    //   is the console ID.
+    // command_receiver: whenever there is a keyboard or focus event, forward the event to this
+    //   command_receiver object.
     VideoDisplayWidget(
         QWidget& parent, QLayout& holder,
         size_t id,
-        CommandReceiver& command_receiver,
-        CameraSession& camera,
+        VideoSession& video_session,
         VideoOverlaySession& overlay
     );
     ~VideoDisplayWidget();
@@ -78,7 +81,6 @@ class VideoDisplayWidget : public WidgetStackFixedAspectRatio{
     size_t id() const{ return m_id; }
 
     VideoOverlayWidget& overlay(){ return *m_overlay; }
-    CommandReceiver& command_receiver(){ return m_command_receiver; }
 
     // Move the video display widget to a new Qt window, so that we can make it full screen.
     // We need to go to a new window to do fullscreen because Qt cannot fullscreen a widget unless
@@ -87,22 +89,33 @@ class VideoDisplayWidget : public WidgetStackFixedAspectRatio{
     void move_back_from_window();
 
 protected:
+    virtual void post_startup(VideoSource* source) override;
+    virtual void pre_shutdown() override;
+
     // Override QWidget::mouseDoubleClickEvent().
     // When double click, call move_to_new_window() to move to a new window to be ready for full screen.
     virtual void mouseDoubleClickEvent(QMouseEvent *event) override;
+
+    virtual void mousePressEvent(QMouseEvent* event) override;
+    virtual void mouseReleaseEvent(QMouseEvent* event) override;
+    virtual void mouseMoveEvent(QMouseEvent* event) override;
+
     virtual void paintEvent(QPaintEvent*) override;
     virtual void resizeEvent(QResizeEvent* event) override;
 
+private:
+    void clear_video_source();
+
 private:
     friend class VideoSourceFPS;
     friend class VideoDisplayFPS;
 
     QLayout& m_holder;
     const size_t m_id;
-    CommandReceiver& m_command_receiver;
+    VideoSession& m_video_session;
     VideoOverlaySession& m_overlay_session;
 
-    VideoWidget* m_video = nullptr;
+    QWidget* m_video = nullptr;
     VideoOverlayWidget* m_overlay = nullptr;
 
     QWidget* m_underlay = nullptr;
diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/UI/VideoDisplayWindow.cpp b/SerialPrograms/Source/CommonFramework/VideoPipeline/UI/VideoDisplayWindow.cpp
index 3d26e180a5..a95e131d33 100644
--- a/SerialPrograms/Source/CommonFramework/VideoPipeline/UI/VideoDisplayWindow.cpp
+++ b/SerialPrograms/Source/CommonFramework/VideoPipeline/UI/VideoDisplayWindow.cpp
@@ -1,13 +1,12 @@
 /*  Video Display Window
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include <QLayout>
 #include <QMainWindow>
 #include <QResizeEvent>
-#include "CommonFramework/Globals.h"
+#include "CommonFramework/GlobalAutoPaths.h"
 #include "CommonFramework/Windows/WindowTracker.h"
 #include "VideoDisplayWidget.h"
 #include "VideoDisplayWindow.h"
@@ -22,19 +21,20 @@ namespace PokemonAutomation{
 VideoDisplayWindow::VideoDisplayWindow(VideoDisplayWidget* display_widget)
     : m_display_widget(display_widget)
 {
-//    m_display_widget->setParent(this);
     setWindowTitle("Console: " + QString::number(m_display_widget->id()));
     this->setWindowIcon(QIcon(QString::fromStdString(RESOURCE_PATH() + "icon.png")));
 
-//    this->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
+    // Sets m_display_widget to be the VideoDisplayWindow's central widget.
+    // VideoDisplayWindow now takes ownership of m_display_widget as a QWidget
     this->setCentralWidget(m_display_widget);
-//    m_display_widget->setAlignment(Qt::AlignCenter);
 
-//    cout << "Display Widget: " << m_display_widget->width() << " x " << m_display_widget->height() << endl;
+    // this->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
+    // m_display_widget->setAlignment(Qt::AlignCenter);
 
+    // cout << "Display Widget: " << m_display_widget->width() << " x " << m_display_widget->height() << endl;
     m_normal_size = m_display_widget->size();
     this->resize(m_normal_size);
-//    cout << this->width() << " x " << this->height() << endl;
+    // cout << this->width() << " x " << this->height() << endl;
 
     this->show();
     this->raise(); // bring the window to front on macOS
@@ -50,10 +50,6 @@ VideoDisplayWindow::~VideoDisplayWindow(){
 
 void VideoDisplayWindow::changeEvent(QEvent* event){
     QMainWindow::changeEvent(event);
-    if (this->windowState() == Qt::WindowMaximized){
-        this->showFullScreen();
-//        cout << "Display Widget: " << m_display_widget->width() << " x " << m_display_widget->height() << endl;
-    }
 }
 void VideoDisplayWindow::closeEvent(QCloseEvent* event){
     close();
@@ -90,26 +86,28 @@ void VideoDisplayWindow::keyPressEvent(QKeyEvent* event){
         exit_full_screen();
         return;
     }
-    if (m_display_widget && m_display_widget->command_receiver().key_press(event)){
+    if (m_display_widget){
+        m_display_widget->overlay().session().report_key_press(event);
         return;
     }
     QWidget::keyPressEvent(event);
 }
 void VideoDisplayWindow::keyReleaseEvent(QKeyEvent* event){
-    if (m_display_widget && m_display_widget->command_receiver().key_release(event)){
+    if (m_display_widget){
+        m_display_widget->overlay().session().report_key_release(event);
         return;
     }
     QWidget::keyReleaseEvent(event);
 }
 void VideoDisplayWindow::focusInEvent(QFocusEvent* event){
     if (m_display_widget){
-        m_display_widget->command_receiver().focus_in(event);
+        m_display_widget->overlay().session().report_focus_in();
     }
     QWidget::focusInEvent(event);
 }
 void VideoDisplayWindow::focusOutEvent(QFocusEvent* event){
     if (m_display_widget){
-        m_display_widget->command_receiver().focus_out(event);
+        m_display_widget->overlay().session().report_focus_out();
     }
     QWidget::focusOutEvent(event);
 }
diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/UI/VideoDisplayWindow.h b/SerialPrograms/Source/CommonFramework/VideoPipeline/UI/VideoDisplayWindow.h
index 828a30b46a..e56112d1a5 100644
--- a/SerialPrograms/Source/CommonFramework/VideoPipeline/UI/VideoDisplayWindow.h
+++ b/SerialPrograms/Source/CommonFramework/VideoPipeline/UI/VideoDisplayWindow.h
@@ -1,6 +1,6 @@
 /*  Video Display Window
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -12,10 +12,6 @@
 
 namespace PokemonAutomation{
 
-namespace NintendoSwitch{
-    class SwitchSystemWidget;
-}
-
 
 //  A separate window to render video display.
 //  This is used when the user wants to pop out the video display widget to a separate window.
diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/UI/VideoOverlayWidget.cpp b/SerialPrograms/Source/CommonFramework/VideoPipeline/UI/VideoOverlayWidget.cpp
index f593f7ea9f..8a2ba7cfd7 100644
--- a/SerialPrograms/Source/CommonFramework/VideoPipeline/UI/VideoOverlayWidget.cpp
+++ b/SerialPrograms/Source/CommonFramework/VideoPipeline/UI/VideoOverlayWidget.cpp
@@ -1,11 +1,12 @@
 /*  Video Overlay
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include <QPainter>
 #include <QResizeEvent>
+#include "CommonFramework/ImageTypes/ImageRGB32_Qt.h"
 #include "CommonFramework/GlobalServices.h"
 #include "VideoOverlayWidget.h"
 
@@ -22,7 +23,7 @@ namespace PokemonAutomation{
 
 
 void VideoOverlayWidget::detach(){
-    m_session.remove_listener(*this);
+    m_session.remove_content_listener(*this);
     global_watchdog().remove(*this);
 }
 VideoOverlayWidget::~VideoOverlayWidget(){
@@ -33,57 +34,59 @@ VideoOverlayWidget::VideoOverlayWidget(QWidget& parent, VideoOverlaySession& ses
     , m_session(session)
     , m_boxes(std::make_shared<std::vector<OverlayBox>>(session.boxes()))
     , m_texts(std::make_shared<std::vector<OverlayText>>(session.texts()))
+    , m_images(std::make_shared<std::vector<OverlayImage>>(session.images()))
     , m_log(std::make_shared<std::vector<OverlayLogLine>>(session.log_texts()))
-    , m_stats(nullptr)
+//    , m_stats(nullptr)
+    , m_stats_paint(
+        "VideoOverlayWidget::paintEvent",
+        "ms", 1000,
+        std::chrono::seconds(10), 2000
+    )
 {
     setAttribute(Qt::WA_NoSystemBackground);
+    setAttribute(Qt::WA_TranslucentBackground);
     setAttribute(Qt::WA_TransparentForMouseEvents);
 
 //    m_boxes.insert(&ENTIRE_VIDEO);
     try{
         global_watchdog().add(*this, std::chrono::milliseconds(50));
-        m_session.add_listener(*this);
+        m_session.add_content_listener(*this);
     }catch (...){
         detach();
         throw;
     }
 }
 
-void VideoOverlayWidget::enabled_boxes(bool enabled){
-    QMetaObject::invokeMethod(this, [this]{ this->update(); });
-}
-void VideoOverlayWidget::enabled_text(bool enabled){
-    QMetaObject::invokeMethod(this, [this]{ this->update(); });
-}
-void VideoOverlayWidget::enabled_log(bool enabled){
-    QMetaObject::invokeMethod(this, [this]{ this->update(); });
-}
-void VideoOverlayWidget::enabled_stats(bool enabled){
+void VideoOverlayWidget::async_update(){
+    // by using QMetaObject::invokeMethod, we can call this->update() on a non-main thread
+    // without trigger Qt crash, as normally this->update() can only be called on the main
+    // thread.
     QMetaObject::invokeMethod(this, [this]{ this->update(); });
 }
 
-void VideoOverlayWidget::update_boxes(const std::shared_ptr<const std::vector<OverlayBox>>& boxes){
-    SpinLockGuard lg(m_lock, "VideoOverlay::update_boxes()");
+void VideoOverlayWidget::on_overlay_update_boxes(const std::shared_ptr<const std::vector<OverlayBox>>& boxes){
+    WriteSpinLock lg(m_lock, "VideoOverlay::update_boxes()");
     m_boxes = boxes;
 }
-void VideoOverlayWidget::update_text(const std::shared_ptr<const std::vector<OverlayText>>& texts){
-    SpinLockGuard lg(m_lock, "VideoOverlay::update_text()");
+void VideoOverlayWidget::on_overlay_update_text(const std::shared_ptr<const std::vector<OverlayText>>& texts){
+    WriteSpinLock lg(m_lock, "VideoOverlay::update_text()");
     m_texts = texts;
 }
-void VideoOverlayWidget::update_log(const std::shared_ptr<const std::vector<OverlayLogLine>>& texts){
-    SpinLockGuard lg(m_lock, "VideoOverlay::update_log_text()");
-    m_log = texts;
+void VideoOverlayWidget::on_overlay_update_images(const std::shared_ptr<const std::vector<OverlayImage>>& images){
+    WriteSpinLock lg(m_lock, "VideoOverlay::update_images()");
+    m_images = images;
+}
+
+void VideoOverlayWidget::on_overlay_update_log(const std::shared_ptr<const std::vector<OverlayLogLine>>& logs){
+    WriteSpinLock lg(m_lock, "VideoOverlay::update_log_text()");
+    m_log = logs;
 }
 #if 0
 void VideoOverlayWidget::update_log_background(const std::shared_ptr<const std::vector<VideoOverlaySession::Box>>& bg_boxes){
-    SpinLockGuard lg(m_lock, "VideoOverlay::update_log_background()");
+    WriteSpinLock lg(m_lock, "VideoOverlay::update_log_background()");
     m_log_text_bg_boxes = bg_boxes;
 }
 #endif
-void VideoOverlayWidget::update_stats(const std::list<OverlayStat*>* stats){
-    SpinLockGuard lg(m_lock, "VideoOverlay::update_stats()");
-    m_stats = stats;
-}
 
 void VideoOverlayWidget::on_watchdog_timeout(){
     QMetaObject::invokeMethod(this, [this]{ this->update(); });
@@ -91,34 +94,83 @@ void VideoOverlayWidget::on_watchdog_timeout(){
 //    cout << "VideoOverlayWidget::on_watchdog_timeout(): " << c++ << endl;
 }
 
+
 void VideoOverlayWidget::resizeEvent(QResizeEvent* event){}
+
 void VideoOverlayWidget::paintEvent(QPaintEvent*){
-    QPainter painter(this);
+    WallClock time0 = current_time();
 
+    QPainter painter(this);
     {
-        SpinLockGuard lg(m_lock, "VideoOverlay::paintEvent()");
+        WriteSpinLock lg(m_lock, "VideoOverlay::paintEvent()");
 
+        //  The order here is important since the latter ones will go on top
+        //  of the earlier ones.
+        if (m_session.enabled_images()){
+            render_images(painter);
+        }
         if (m_session.enabled_boxes()){
-            update_boxes(painter);
+            render_boxes(painter);
         }
         if (m_session.enabled_text()){
-            update_text(painter);
+            render_text(painter);
         }
         if (m_session.enabled_log()){
-            update_log(painter);
+            render_log(painter);
         }
-        if (m_session.enabled_stats() && m_stats){
-            update_stats(painter);
+        if (m_session.enabled_stats()){
+            render_stats(painter);
         }
     }
 
     global_watchdog().delay(*this);
+
+    WallClock time1 = current_time();
+    uint32_t microseconds = (uint32_t)std::chrono::duration_cast<std::chrono::microseconds>(time1 - time0).count();
+    m_stats_paint.report_data(m_session.logger(), microseconds);
 }
 
 
-void VideoOverlayWidget::update_boxes(QPainter& painter){
+void VideoOverlayWidget::render_stats(QPainter& painter){
+    const double TEXT_SIZE = 0.018;
+    const double ROW_HEIGHT = 0.025;
+
+    QColor box_color(10, 10, 10, 200);
+    painter.setPen(box_color);
+
     int width = this->width();
     int height = this->height();
+    int start_x = (int)(width * 0.78);
+
+    std::vector<OverlayStatSnapshot> lines = m_session.stats();
+
+    painter.fillRect(
+        start_x,
+        0,
+        width - start_x,
+        (int)(height * (lines.size() * ROW_HEIGHT + 0.02)),
+        box_color
+    );
+
+    size_t c = 0;
+    for (const auto& stat : lines){
+        painter.setPen(QColor((uint32_t)stat.color));
+
+        QFont text_font = this->font();
+        text_font.setPointSizeF(height * TEXT_SIZE);
+        painter.setFont(text_font);
+
+        int x = start_x + width * 0.01;
+        int y = height * ((c + 1) * ROW_HEIGHT + 0.005);
+
+        painter.drawText(QPoint(x, y), QString::fromStdString(stat.text));
+
+        c++;
+    }
+}
+void VideoOverlayWidget::render_boxes(QPainter& painter){
+    const int width = this->width();
+    const int height = this->height();
     for (const auto& item : *m_boxes){
         QColor color = QColor((uint32_t)item.color);
         painter.setPen(color);
@@ -140,8 +192,8 @@ void VideoOverlayWidget::update_boxes(QPainter& painter){
 //        cout << "m_video_size.width() = " << m_widget_size.width() << ", xmax = " << xmax << endl;
 
         painter.drawRect(
-            xmin,
-            ymin,
+            xmin + 1,   //  Qt displays these slightly off-center.
+            ymin + 1,   //  Correct for it here.
             xmax - xmin,
             ymax - ymin
         );
@@ -194,9 +246,9 @@ void VideoOverlayWidget::update_boxes(QPainter& painter){
         painter.drawText(QPoint(xmin + padding_width, ymin - 2*padding_height), text);
     }
 }
-void VideoOverlayWidget::update_text(QPainter& painter){
-    int width = this->width();
-    int height = this->height();
+void VideoOverlayWidget::render_text(QPainter& painter){
+    const int width = this->width();
+    const int height = this->height();
     for (const auto& item: *m_texts){
         painter.setPen(QColor((uint32_t)item.color));
         QFont text_font = this->font();
@@ -209,7 +261,25 @@ void VideoOverlayWidget::update_text(QPainter& painter){
         painter.drawText(QPoint(xmin, ymin), QString::fromStdString(item.message));
     }
 }
-void VideoOverlayWidget::update_log(QPainter& painter){
+void VideoOverlayWidget::render_images(QPainter& painter){
+    const double width = static_cast<double>(this->width());
+    const double height = static_cast<double>(this->height());
+
+    for (const auto& image_overlay: *m_images){
+        QImage q_image = to_QImage_ref(image_overlay.image);
+        // source rect is the entire portion of the q_image, in pixel units
+        QRectF source_rect(0.0, 0.0, static_cast<double>(q_image.width()), static_cast<double>(q_image.height()));
+        // build a target_rect. target_rect is what region the overlay image should appear inside the overlay viewport.
+        // target_rect is in pixel units of the viewport
+        const double target_start_x = width * image_overlay.box.x;
+        const double target_start_y = height * image_overlay.box.y;
+        const double target_width = width * image_overlay.box.width;
+        const double target_height = height * image_overlay.box.height;
+        QRectF target_rect(target_start_x, target_start_y, target_width, target_height);
+        painter.drawImage(target_rect, q_image, source_rect);
+    }
+}
+void VideoOverlayWidget::render_log(QPainter& painter){
     if (m_log->empty()){
         return;
     }
@@ -229,7 +299,9 @@ void VideoOverlayWidget::update_log(QPainter& painter){
 
     //  Draw the box.
     {
-        QColor box_color(10, 10, 10, 200);
+        // set a semi-transparent dark color so that user can see the log lines while can also see
+        // vaguely the video stream content behind it
+        QColor box_color(10, 10, 10, 200); // r=g=b=10, alpha=200
         painter.setPen(box_color);
         const int xmin = std::max((int)(width * LOG_MIN_X + 0.5), 1);
         const int ymin = std::max((int)(height * (LOG_MAX_Y - log_bg_height) + 0.5), 1);
@@ -255,52 +327,31 @@ void VideoOverlayWidget::update_log(QPainter& painter){
         y -= LOG_LINE_SPACING;
     }
 }
-void VideoOverlayWidget::update_stats(QPainter& painter){
-    const double TEXT_SIZE = 0.02;
-    const double ROW_HEIGHT = 0.03;
-
-    QColor box_color(10, 10, 10, 200);
-    painter.setPen(box_color);
-
-    int width = this->width();
-    int height = this->height();
-    int start_x = (int)(width * 0.75);
 
-    std::vector<OverlayStatSnapshot> lines;
-    for (const auto& stat : *m_stats){
-        OverlayStatSnapshot snapshot = stat->get_current();
-        if (!snapshot.text.empty()){
-            lines.emplace_back(std::move(snapshot));
-        }
-    }
 
 
-    painter.fillRect(
-        start_x,
-        0,
-        width - start_x,
-        (int)(height * (lines.size() * ROW_HEIGHT + 0.02)),
-        box_color
-    );
 
-    size_t c = 0;
-    for (const auto& stat : lines){
-        painter.setPen(QColor((uint32_t)stat.color));
-
-        QFont text_font = this->font();
-        text_font.setPointSizeF(height * TEXT_SIZE);
-        painter.setFont(text_font);
-
-        int x = start_x + width * 0.01;
-        int y = height * ((c + 1) * ROW_HEIGHT + 0.005);
-
-        painter.drawText(QPoint(x, y), QString::fromStdString(stat.text));
-
-        c++;
-    }
+#if 0
+void VideoOverlayWidget::mousePressEvent(QMouseEvent* event){
+    cout << "VideoOverlayWidget::mousePressEvent()" << endl;
+    QWidget::mousePressEvent(event);
+    double x = (double)event->pos().x() / this->width();
+    double y = (double)event->pos().y() / this->height();
+    m_session.on_mouse_press(x, y);
 }
-
-
+void VideoOverlayWidget::mouseReleaseEvent(QMouseEvent* event){
+    QWidget::mouseReleaseEvent(event);
+    double x = (double)event->pos().x() / this->width();
+    double y = (double)event->pos().y() / this->height();
+    m_session.on_mouse_release(x, y);
+}
+void VideoOverlayWidget::mouseMoveEvent(QMouseEvent* event){
+    QWidget::mouseMoveEvent(event);
+    double x = (double)event->pos().x() / this->width();
+    double y = (double)event->pos().y() / this->height();
+    m_session.on_mouse_move(x, y);
+}
+#endif
 
 
 
diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/UI/VideoOverlayWidget.h b/SerialPrograms/Source/CommonFramework/VideoPipeline/UI/VideoOverlayWidget.h
index d7baca1d01..c08b0c488b 100644
--- a/SerialPrograms/Source/CommonFramework/VideoPipeline/UI/VideoOverlayWidget.h
+++ b/SerialPrograms/Source/CommonFramework/VideoPipeline/UI/VideoOverlayWidget.h
@@ -1,58 +1,98 @@
 /*  Video Overlay Widget
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifndef PokemonAutomation_VideoPipeline_VideoOverlayWidget_H
 #define PokemonAutomation_VideoPipeline_VideoOverlayWidget_H
 
-#include <map>
 #include <QWidget>
 #include "Common/Cpp/Concurrency/SpinLock.h"
 #include "Common/Cpp/Concurrency/Watchdog.h"
+#include "CommonFramework/Tools/StatAccumulator.h"
 #include "CommonFramework/VideoPipeline/VideoOverlaySession.h"
 
 namespace PokemonAutomation{
 
 struct OverlayText;
 
-class VideoOverlayWidget : public QWidget, private VideoOverlaySession::Listener, private WatchdogCallback{
+class VideoOverlayWidget : public QWidget, private VideoOverlaySession::ContentListener, private WatchdogCallback{
 public:
     static constexpr bool DEFAULT_ENABLE_BOXES  = true;
     static constexpr bool DEFAULT_ENABLE_TEXT   = true;
+    static constexpr bool DEFAULT_ENABLE_IMAGES = true;
     static constexpr bool DEFAULT_ENABLE_LOG    = false;
     static constexpr bool DEFAULT_ENABLE_STATS  = true;
 
+
 public:
     ~VideoOverlayWidget();
     VideoOverlayWidget(QWidget& parent, VideoOverlaySession& session);
 
+    VideoOverlaySession& session(){
+        return m_session;
+    }
+
+
 private:
     void detach();
 
     //  Asynchronous changes to the overlays.
 
-    virtual void enabled_boxes(bool enabled) override;
-    virtual void enabled_text (bool enabled) override;
-    virtual void enabled_log  (bool enabled) override;
-    virtual void enabled_stats(bool enabled) override;
-
-    virtual void update_boxes(const std::shared_ptr<const std::vector<OverlayBox>>& boxes) override;
-    virtual void update_text (const std::shared_ptr<const std::vector<OverlayText>>& texts) override;
-    virtual void update_log  (const std::shared_ptr<const std::vector<OverlayLogLine>>& texts) override;
-    virtual void update_stats(const std::list<OverlayStat*>* stats) override;
+    // callback function from VideoOverlaySession on overlay boxes enabled
+    virtual void on_overlay_enabled_boxes (bool enabled) override{async_update();}
+    // callback function from VideoOverlaySession on overlay text enabled
+    virtual void on_overlay_enabled_text  (bool enabled) override{async_update();}
+    // callback function from VideoOverlaySession on overlay images enabled
+    virtual void on_overlay_enabled_images(bool enabled) override{async_update();}
+    // callback function from VideoOverlaySession on overlay log enabled
+    virtual void on_overlay_enabled_log   (bool enabled) override{async_update();}
+    // callback function from VideoOverlaySession on overlay stats enabled
+    virtual void on_overlay_enabled_stats (bool enabled) override{async_update();}
+
+    // callback function from VideoOverlaySession on overlay boxes updated
+    virtual void on_overlay_update_boxes (const std::shared_ptr<const std::vector<OverlayBox>>& boxes) override;
+    // callback function from VideoOverlaySession on overlay text updated
+    virtual void on_overlay_update_text  (const std::shared_ptr<const std::vector<OverlayText>>& texts) override;
+    // callback function from VideoOverlaySession on overlay images updated
+    virtual void on_overlay_update_images(const std::shared_ptr<const std::vector<OverlayImage>>& images) override;
+    // callback function from VideoOverlaySession on overlay images updated
+    virtual void on_overlay_update_log   (const std::shared_ptr<const std::vector<OverlayLogLine>>& logs) override;
 
     virtual void on_watchdog_timeout() override;
 
     virtual void resizeEvent(QResizeEvent* event) override;
+    // render video overlay, override QWidget::paintEvent()
     virtual void paintEvent(QPaintEvent*) override;
 
+
 private:
-    void update_boxes(QPainter& painter);
-    void update_text (QPainter& painter);
-    void update_log  (QPainter& painter);
-    void update_stats(QPainter& painter);
+//    virtual void mousePressEvent(QMouseEvent* event) override;
+//    virtual void mouseReleaseEvent(QMouseEvent* event) override;
+//    virtual void mouseMoveEvent(QMouseEvent* event) override;
+
+
+private:
+    // Call QWidget::update() to notify Qt to schedule a re-rendering of the overlay widget.
+    //
+    // Threads other than the main thread may change video overlay, causing this VideoOverlayWidget, which
+    // listens to video overlay change, to get called on the non-main thread.
+    // Since QWidget::update() must be called on the main thread to not crash, we have to use this
+    // async_update() to avoid that.
+    void async_update();
+
+    // render overlay stats
+    void render_stats  (QPainter& painter);
+    // render overlay boxes
+    void render_boxes  (QPainter& painter);
+    // render overlay texts
+    void render_text   (QPainter& painter);
+    // render overlay images
+    void render_images (QPainter& painter);
+    // render overlay log lines
+    void render_log    (QPainter& painter);
+
 
 private:
     VideoOverlaySession& m_session;
@@ -60,8 +100,10 @@ class VideoOverlayWidget : public QWidget, private VideoOverlaySession::Listener
     SpinLock m_lock;
     std::shared_ptr<const std::vector<OverlayBox>> m_boxes;
     std::shared_ptr<const std::vector<OverlayText>> m_texts;
+    std::shared_ptr<const std::vector<OverlayImage>> m_images;
     std::shared_ptr<const std::vector<OverlayLogLine>> m_log;
-    const std::list<OverlayStat*>* m_stats;
+
+    PeriodicStatsReporterI32 m_stats_paint;
 };
 
 
diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/UI/VideoSourceSelectorWidget.cpp b/SerialPrograms/Source/CommonFramework/VideoPipeline/UI/VideoSourceSelectorWidget.cpp
new file mode 100644
index 0000000000..10957abbd6
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/VideoPipeline/UI/VideoSourceSelectorWidget.cpp
@@ -0,0 +1,272 @@
+/*  Video Source Selector Widget
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <QHBoxLayout>
+#include <QLabel>
+#include <QComboBox>
+#include <QPushButton>
+#include "Common/Qt/NoWheelComboBox.h"
+#include "CommonFramework/GlobalSettingsPanel.h"
+#include "CommonFramework/VideoPipeline/VideoPipelineOptions.h"
+#include "CommonFramework/Panels/ConsoleSettingsStretch.h"
+#include "CommonFramework/VideoPipeline/Backends/CameraImplementations.h"
+
+#include "CommonFramework/VideoPipeline/Sources/VideoSource_Null.h"
+#include "CommonFramework/VideoPipeline/Sources/VideoSource_Camera.h"
+
+#include "VideoSourceSelectorWidget.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+
+
+VideoSourceSelectorWidget::~VideoSourceSelectorWidget(){
+    m_session.remove_state_listener(*this);
+}
+VideoSourceSelectorWidget::VideoSourceSelectorWidget(Logger& logger, VideoSession& session)
+    : m_logger(logger)
+    , m_session(session)
+{
+    QHBoxLayout* layout0 = new QHBoxLayout(this);
+    layout0->setContentsMargins(0, 0, 0, 0);
+
+    layout0->addWidget(new QLabel("<b>Video Input:</b>", this), CONSOLE_SETTINGS_STRETCH_L0_LABEL);
+
+    QHBoxLayout* layout1 = new QHBoxLayout();
+    layout0->addLayout(layout1, CONSOLE_SETTINGS_STRETCH_L0_RIGHT);
+    layout1->setContentsMargins(0, 0, 0, 0);
+
+    m_sources_box = new NoWheelCompactComboBox(this);
+    m_sources_box->setMaxVisibleItems(20);
+    layout1->addWidget(m_sources_box, CONSOLE_SETTINGS_STRETCH_L1_BODY);
+    layout1->addSpacing(5);
+
+    {
+        QHBoxLayout* layout2 = new QHBoxLayout();
+        layout1->addLayout(layout2, CONSOLE_SETTINGS_STRETCH_L1_RIGHT);
+        layout2->setContentsMargins(0, 0, 0, 0);
+
+        m_resolution_box = new NoWheelCompactComboBox(this);
+        m_resolution_box->setMaxVisibleItems(20);
+        layout2->addWidget(m_resolution_box, 3);
+        layout2->addSpacing(5);
+
+        m_format_box = new NoWheelCompactComboBox(this);
+        m_format_box->setMaxVisibleItems(20);
+        layout2->addWidget(m_format_box, 2);
+    }
+    layout1->addSpacing(5);
+
+    m_reset_button = new QPushButton("Reset Video", this);
+    layout1->addWidget(m_reset_button, CONSOLE_SETTINGS_STRETCH_L1_BUTTON);
+
+    update_source_list();
+    update_resolution_list();
+
+    // Set the action for the video source selection box
+    connect(
+        m_sources_box, static_cast<void(QComboBox::*)(int)>(&QComboBox::activated),
+        this, [this](int index){
+            if (0 <= index && index < (int)m_sources.size()){
+                m_sources[index]->run_post_select();
+                m_session.set_source(m_sources[index]);
+            }else{
+                m_session.set_source(std::make_unique<VideoSourceDescriptor_Null>());
+            }
+        }
+    );
+
+    // Set the action for the video resolution selection box
+    connect(
+        m_resolution_box, static_cast<void(QComboBox::*)(int)>(&QComboBox::activated),
+        this, [this](int index){
+            if (index < 0 || index >= (int)m_formats.size()){
+                return;
+            }
+            Resolution resolution = m_formats[index].first;
+            m_session.set_resolution(resolution);
+        }
+    );
+
+    // Set the action for the video format selection box
+    connect(
+        m_format_box, static_cast<void(QComboBox::*)(int)>(&QComboBox::activated),
+        this, [this](int index){
+            int resolution_index = m_resolution_box->currentIndex();
+            if (resolution_index < 0 || resolution_index > (int)m_formats.size()){
+                return;
+            }
+            const std::vector<std::pair<VideoFormat, size_t>>& format_list = m_formats[resolution_index].second;
+            if (index < 0 || index >= (int)format_list.size()){
+                return;
+            }
+            const std::pair<VideoFormat, size_t>& format = format_list[index];
+            m_session.set_format(format.first, format.second);
+        }
+    );
+
+    //  Set the action for the video reset button
+    connect(
+        m_reset_button, &QPushButton::clicked,
+        this, [this](bool){
+            update_source_list();
+            m_session.reset();
+        }
+    );
+
+    m_session.add_state_listener(*this);
+}
+
+
+
+
+void VideoSourceSelectorWidget::update_source_list(){
+    m_sources_box->clear();
+    m_sources.clear();
+
+    std::shared_ptr<const VideoSourceDescriptor> current_descriptor = m_session.descriptor();
+
+    //  Add all the static options.
+    {
+        VideoSourceOption option;
+        m_session.save(option);
+        m_sources.emplace_back(option.get_descriptor_from_cache(VideoSourceType::None));
+        m_sources.emplace_back(option.get_descriptor_from_cache(VideoSourceType::StillImage));
+    }
+
+    //  Now add all the cameras.
+    for (const CameraInfo& info : get_all_cameras()){
+        m_sources.emplace_back(std::make_unique<VideoSourceDescriptor_Camera>(info));
+    }
+
+    int index = -1;
+    for (int c = 0; c < (int)m_sources.size(); c++){
+        const VideoSourceDescriptor& descriptor = *m_sources[c];
+        m_sources_box->addItem(QString::fromStdString(descriptor.display_name()));
+        if (*current_descriptor == descriptor){
+            index = c;
+        }
+    }
+    if (index >= 0){
+        m_sources_box->setCurrentIndex((int)index);
+    }else{
+        m_logger.log("Unable to find entry for this source.", COLOR_RED);
+    }
+
+    //  Name the reset button after whatever the selected source actually is.
+    //  A still image is not video, so calling it "Reset Video" there is wrong.
+    m_reset_button->setText(
+        current_descriptor && current_descriptor->type == VideoSourceType::StillImage
+            ? "Reset Image"
+            : "Reset Video"
+    );
+}
+void VideoSourceSelectorWidget::update_resolution_list(){
+    m_resolution_box->clear();
+    m_format_box->clear();
+    m_formats.clear();
+
+    Resolution current_resolution;
+    VideoFormat current_format;
+    FramesPerSecond current_fps;
+    m_session.current_stream_format(current_resolution, current_format, current_fps);
+
+    VideoFormatSet format_set = m_session.supported_formats();
+
+    for (auto& resolution : format_set){
+        if (resolution.second.empty()){
+            continue;
+        }
+        std::pair<
+            Resolution,
+            std::vector<std::pair<VideoFormat, size_t>>
+        >& entry = m_formats.emplace_back();
+        entry.first = resolution.first;
+        for (auto& format : resolution.second){
+            for (size_t fps : format.second){
+                entry.second.emplace_back(format.first, fps);
+                if (!GlobalSettings::instance().VIDEO_PIPELINE->SHOW_ALL_FPS){
+                    break;
+                }
+            }
+        }
+    }
+
+    //  Make resolution box.
+    int resolution_index = -1;
+    {
+        for (int c = 0; c < (int)m_formats.size(); c++){
+            Resolution res = m_formats[c].first;
+            m_resolution_box->addItem(
+                QString::fromStdString(
+                    std::to_string(res.width) + " x " +
+                    std::to_string(res.height) + " " +
+                    aspect_ratio_as_string(res)
+                )
+            );
+            if (res == current_resolution){
+                resolution_index = c;
+            }
+        }
+        m_resolution_box->setCurrentIndex(resolution_index);
+
+        if (resolution_index < 0){
+            m_logger.log("Unable to find entry for this resolution.", COLOR_RED);
+            return;
+        }
+    }
+
+    //  Make format box.
+
+    const std::vector<std::pair<VideoFormat, size_t>>& format_list = m_formats[resolution_index].second;
+
+//    cout << "current_format = " << (int)current_format << endl;
+
+    int format_index = -1;
+    for (int c = 0; c < (int)format_list.size(); c++){
+        const std::pair<VideoFormat, size_t>& format = format_list[c];
+
+        std::string label = VideoFormat_database().find(format.first)->display;
+        if (format.second != 0){
+            label += " (" + std::to_string(format.second) + " fps)";
+        }
+
+        m_format_box->addItem(QString::fromStdString(label));
+        if (format.first == current_format && format.second == current_fps){
+            format_index = c;
+        }
+    }
+    m_format_box->setCurrentIndex(format_index);
+
+    if (format_index < 0){
+        m_logger.log("Unable to find entry for this format.", COLOR_RED);
+        return;
+    }
+
+
+}
+
+
+
+
+void VideoSourceSelectorWidget::post_startup(VideoSource* source){
+    QMetaObject::invokeMethod(this, [this]{
+        update_source_list();
+        update_resolution_list();
+    }, Qt::QueuedConnection);
+}
+
+
+
+
+
+
+
+
+}
diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/UI/VideoSourceSelectorWidget.h b/SerialPrograms/Source/CommonFramework/VideoPipeline/UI/VideoSourceSelectorWidget.h
new file mode 100644
index 0000000000..44fd61e44d
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/VideoPipeline/UI/VideoSourceSelectorWidget.h
@@ -0,0 +1,65 @@
+/*  Video Source Selector Widget
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_VideoPipeline_VideoSourceSelectorWidget_H
+#define PokemonAutomation_VideoPipeline_VideoSourceSelectorWidget_H
+
+#include <vector>
+#include <QWidget>
+#include "CommonFramework/VideoPipeline/VideoSession.h"
+
+class QComboBox;
+class QPushButton;
+
+namespace PokemonAutomation{
+
+
+//  UI to select what video source to use for an Switch automation program
+//  This class inherits VideoSession::StateListener so it has callbacks for state change
+//  in the video session.
+class VideoSourceSelectorWidget : public QWidget, public VideoSession::StateListener{
+public:
+    ~VideoSourceSelectorWidget();
+    VideoSourceSelectorWidget(Logger& logger, VideoSession& session);
+
+
+private:
+    //  Query the OS to get all the possible video sources and update the UI to show them.
+    void update_source_list();
+    //  Load all possible video resolutions from the current video source.
+    void update_resolution_list();
+
+    //  Overwrites VideoSession::StateListener::post_startup().
+    //  This function is called after setting a new video source or resetting the
+    //  existing video source.
+    //  This also includes after the video resolution is changed as we need to rebuild the video
+    //  source with the new resolution.
+    virtual void post_startup(VideoSource* source) override;
+
+
+private:
+    Logger& m_logger;
+    VideoSession& m_session;
+
+    QComboBox* m_sources_box;
+    QComboBox* m_resolution_box;
+    QComboBox* m_format_box;
+    QPushButton* m_reset_button;
+
+    std::vector<std::shared_ptr<VideoSourceDescriptor>> m_sources;
+    std::vector<
+        std::pair<
+            Resolution,
+            std::vector<std::pair<VideoFormat, size_t>>
+        >
+    > m_formats;
+
+};
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/UI/VideoWidget.h b/SerialPrograms/Source/CommonFramework/VideoPipeline/UI/VideoWidget.h
deleted file mode 100644
index 467578d648..0000000000
--- a/SerialPrograms/Source/CommonFramework/VideoPipeline/UI/VideoWidget.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*  Video Widget
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_VideoPipeline_VideoWidget_H
-#define PokemonAutomation_VideoPipeline_VideoWidget_H
-
-#include <QWidget>
-#include "CommonFramework/VideoPipeline/CameraSession.h"
-
-namespace PokemonAutomation{
-
-
-//  Base class for the widget that displays the camera video feed.
-class VideoWidget : public QWidget{
-public:
-    using QWidget::QWidget;
-    virtual ~VideoWidget() = default;
-
-    //  Get the camera associated with this VideoWidget.
-    virtual CameraSession& camera() = 0;
-};
-
-
-
-}
-#endif
diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoFeed.h b/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoFeed.h
index 2936727ea4..ac7af79a87 100644
--- a/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoFeed.h
+++ b/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoFeed.h
@@ -1,6 +1,6 @@
 /*  Video Feed Interface
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -46,22 +46,73 @@ struct VideoSnapshot{
 };
 
 
+//  Experimental:
+//  This video frame callback isn't guaranteed to be supported by all
+//  implementations. Unsupported implementations will never fire this callback.
+class VideoFrame;
+struct VideoFrameListener{
+    virtual void on_frame(std::shared_ptr<const VideoFrame> frame) = 0;
+};
 
 
-//  Define basic interface of a video feed to be used
-//  by programs.
+//  Define basic interface of a video feed to be used by programs.
 class VideoFeed{
 public:
+    virtual void add_frame_listener(VideoFrameListener& listener) = 0;
+    virtual void remove_frame_listener(VideoFrameListener& listener) = 0;
+
     //  Reset the video. Note that this may return early.
     virtual void reset() = 0;
 
-    //  Do not call this on the main thread or it may deadlock.
-    virtual VideoSnapshot snapshot() = 0;
 
-    //  Returns the currently measured frames/second for the video source + display.
+public:
+    //
+    //  Returns a snapshot of the latest available frame.
+    //
+    //  If the latest frame is not yet ready (not converted to ImageRGB32),
+    //  this function will block until it is ready.
+    //
+    //  If this returns a null snapshot, it means the video isn't available.
+    //
+    //  Implementations must be able to handle calls to this at high rate from
+    //  many different threads simultaneously. So it should perform caching.
+    //
+    VideoSnapshot snapshot(){
+        return snapshot_latest_blocking();
+    }
+    virtual VideoSnapshot snapshot_latest_blocking() = 0;
+
+    //  This is a non-blocking snapshot function. It will never block, but it
+    //  is not guaranteed to return the absolute latest snapshot or even a
+    //  valid snapshot at all.
+    //
+    //  If this returns a null snapshot, it can mean either that the video
+    //  isn't available or that no snapshot is cached and converted
+    //  to ImageRGB32 in the time range: >= min_time.
+    //
+    //  Converted frame cache is created by calling snapshot_latest_blocking() or
+    //  snapshot_recent_nonblocking(). In addition to looking for recent converted
+    //  frames, the latter also dispatches latest raw frames for conversion
+    //  asynchronously so future snapshot_recent_nonblocking() calls can return
+    //  valid frames.
+    //
+    //  Implementations must be able to handle calls to this at high rate from
+    //  many different threads simultaneously. So it should perform caching.
+    //
+    //  This function is intended to be called many times in a series. So calls
+    //  will be taken as a hint for future calls. Thus the first call to this
+    //  function will begin prefetch conversions of frames so they are ready
+    //  on future calls.
+    virtual VideoSnapshot snapshot_recent_nonblocking(WallClock min_time) = 0;
+
+
+public:
+    //  Returns the currently measured frames/second for the video source.
+    //  Use this for diagnostic purposes.
+    virtual double fps_source() const = 0;
+    //  Returns the currently measured frames/second for the video display thread.
     //  Use this for diagnostic purposes.
-    virtual double fps_source() = 0;
-    virtual double fps_display() = 0;
+    virtual double fps_display() const = 0;
 };
 
 
diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoFormats.cpp b/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoFormats.cpp
new file mode 100644
index 0000000000..58d1e172e2
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoFormats.cpp
@@ -0,0 +1,27 @@
+/*  Video Formats
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "VideoFormats.h"
+
+namespace PokemonAutomation{
+
+
+
+const EnumDropdownDatabase<VideoFormat>& VideoFormat_database(){
+    static EnumDropdownDatabase<VideoFormat> database{
+        {VideoFormat::OTHER,    "other",    "Unknown"},
+        {VideoFormat::YUV420P,  "YUV420P",  "YUV420P"},
+        {VideoFormat::YUYV,     "YUYV",     "YUYV"},
+        {VideoFormat::NV12,     "NV12",     "NV12"},
+        {VideoFormat::P010,     "P010",     "P010"},
+        {VideoFormat::MJPEG,    "MJPEG",    "MJPEG"},
+    };
+    return database;
+}
+
+
+
+}
diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoFormats.h b/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoFormats.h
new file mode 100644
index 0000000000..b186f115d3
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoFormats.h
@@ -0,0 +1,33 @@
+/*  Video Formats
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_VideoFormats_H
+#define PokemonAutomation_VideoFormats_H
+
+#include "Common/Cpp/Options/EnumDropdownDatabase.h"
+
+namespace PokemonAutomation{
+
+
+//  These should be ordered by preference.
+enum class VideoFormat{
+    P010,
+    NV12,
+    YUV420P,
+    YUYV,
+    MJPEG,
+    OTHER,
+};
+
+const EnumDropdownDatabase<VideoFormat>& VideoFormat_database();
+
+
+using FramesPerSecond = size_t;
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoOverlay.cpp b/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoOverlay.cpp
new file mode 100644
index 0000000000..645d252435
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoOverlay.cpp
@@ -0,0 +1,24 @@
+/*  Video Overlay
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+#include "Common/Cpp/Containers/Pimpl.tpp"
+#include "VideoOverlay.h"
+
+namespace PokemonAutomation{
+
+
+
+//VideoOverlay::VideoOverlay()
+//    : m_data(CONSTRUCT_TOKEN)
+//{}
+//VideoOverlay::~VideoOverlay() = default;
+
+
+
+
+
+
+
+}
diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoOverlay.h b/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoOverlay.h
index 8634c980f8..d58f402ac5 100644
--- a/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoOverlay.h
+++ b/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoOverlay.h
@@ -1,6 +1,6 @@
-/*  Video Overlay Set
+/*  Video Overlay
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -8,24 +8,58 @@
 #define PokemonAutomation_VideoOverlaySet_H
 
 #include <string>
+#include "Common/Compiler.h"
 #include "Common/Cpp/Color.h"
+#include "Common/Cpp/Containers/Pimpl.h"
 #include "VideoOverlayTypes.h"
 
+class QKeyEvent;
+
 namespace PokemonAutomation{
 
 
-class VideoOverlay{
+
+class VideoDisplayHidListener{
+public:
+    virtual void on_focus_in(){}
+    virtual void on_focus_out(){}
+
+    virtual void on_mouse_press(double x, double y){}
+    virtual void on_mouse_release(double x, double y){}
+    virtual void on_mouse_move(double x, double y){}
+
+    virtual void on_key_press(const void* key){}
+    virtual void on_key_release(const void* key){}
+};
+
+
+
+// Interface to add overlay objects (e.g. bounding boxes and texts) on top of rendered
+// video stream
+// The implementation is in CommonFramework/VideoPipeline/VideoOverlaySession.h:VideoOverlaySession
+// The reason to create this interface is to reduce the header dependency on other code that relies
+// on the overlay.
+class VideoOverlay : public VideoDisplayHidListener{
+public:
+    virtual void add_hid_listener(VideoDisplayHidListener& listener) = 0;
+    virtual void remove_hid_listener(VideoDisplayHidListener& listener) = 0;
+
+
+public:
+//    VideoOverlay();
+    virtual ~VideoOverlay() = default;
+
+
 public:
-    
     // Asychronously, add an inference box as part of the video overlay.
     // Once added, `box` cannot be destroyed until after `VideoOverlay::remove_box()` is called to remove it.
     // If a `box` with the same address is added, it will override the old box's position, shape and color. You only need to
     // call `remove_box()` once to remove it.
     //
     // Can use `InferenceBoxScope: public ImageFloatBox` to handle box removal automatically when it's destroyed.
-    // Can also use `VideoOverlay.h:VideoOverlaySet` to manage multiple boxes.
+    // Can also use `VideoOverlayScopes.h:VideoOverlaySet` to manage multiple boxes.
     virtual void add_box(const OverlayBox& box) = 0;
-    
+
     // Asychronously, remove an added inference box.
     // The box must be already added.
     // See `add_box()` for more info on managing boxes.
@@ -33,8 +67,8 @@ class VideoOverlay{
 
     // Asychronously, add a text, `OverlayText` as part of the video overlay.
     // Once added, `text` cannot be destroyed until after `VideoOverlay::remove_text()` is called to remove it.
-    // If a `text` with the same address is added, it will override the old text's position, content and color. You only need
-    // to call `remove_text()` once to remove it.
+    // If a `text` with the same address is added, it will override the old text's position, content and color.
+    // You only need to call `remove_text()` once to remove it.
     //
     // Can use `OverlayTextScope: public OverlayText` to handle text removal automatically when it's destroyed.
     virtual void add_text(const OverlayText& text) = 0;
@@ -44,17 +78,27 @@ class VideoOverlay{
     // See `add_text()` for more info on managing texts.
     virtual void remove_text(const OverlayText& text) = 0;
 
+    // Asychronously, add an image, `OverlayImage` as part of the video overlay.
+    // Allow transparency to create mask overlay.
+    // Once added, `image` cannot be destroyed until after `VideoOverlay::remove_image()` is called to remove it.
+    // If an `image` with the same address is added, it will override the old content. You only need
+    // to call `remove_text()` once to remove it.
+    virtual void add_image(const OverlayImage& image) = 0;
+    // Asychronously, remove an added `OverlayImage`.
+    // The OverlayImage must be already added.
+    // See `add_image()` for more info on managing overlay images.
+    virtual void remove_image(const OverlayImage& image) = 0;
+
     // Asynchronously, add a log message to the screen. The older messages added via `add_log_text()`
     // will be placed higher like in the logging window.
     // Use `OverlayLogTextScope` to remove the log messages automatically. 
-    virtual void add_log(std::string message, Color color) = 0;
+    virtual void add_log(std::string message, Color color = COLOR_WHITE) = 0;
     // Remove all messages added by `add_log_text()`.
     // Use `OverlayLogTextScope` to remove log messages automatically.
     virtual void clear_log() = 0;
 
     virtual void add_stat(OverlayStat& stat) = 0;
     virtual void remove_stat(OverlayStat& stat) = 0;
-
 };
 
 
diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoOverlayOption.cpp b/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoOverlayOption.cpp
index ad55b3f18a..078188fff3 100644
--- a/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoOverlayOption.cpp
+++ b/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoOverlayOption.cpp
@@ -1,6 +1,6 @@
 /*  Video Overlay Option
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -13,6 +13,7 @@ namespace PokemonAutomation{
 
 const std::string VideoOverlayOption::JSON_BOXES = "Boxes";
 const std::string VideoOverlayOption::JSON_TEXT = "Text";
+const std::string VideoOverlayOption::JSON_IMAGES = "Images";
 const std::string VideoOverlayOption::JSON_LOG = "Log";
 const std::string VideoOverlayOption::JSON_STATS = "Stats";
 
@@ -26,7 +27,7 @@ VideoOverlayOption::VideoOverlayOption()
 
 
 void VideoOverlayOption::load_json(const JsonValue& json){
-    const JsonObject* obj = json.get_object();
+    const JsonObject* obj = json.to_object();
     if (obj == nullptr){
         return;
     }
@@ -37,6 +38,12 @@ void VideoOverlayOption::load_json(const JsonValue& json){
     if (obj->read_boolean(tmp, JSON_TEXT)){
         text.store(tmp, std::memory_order_relaxed);
     }
+    if (obj->read_boolean(tmp, JSON_IMAGES)){
+        images.store(tmp, std::memory_order_relaxed);
+    }else{
+        // by default the image overlay is on
+        images.store(true, std::memory_order_relaxed);
+    }
     if (obj->read_boolean(tmp, JSON_LOG)){
         log.store(tmp, std::memory_order_relaxed);
     }
@@ -46,10 +53,11 @@ void VideoOverlayOption::load_json(const JsonValue& json){
 }
 JsonValue VideoOverlayOption::to_json() const{
     JsonObject root;
-    root[JSON_BOXES] = boxes.load(std::memory_order_relaxed);
-    root[JSON_TEXT]  = text.load(std::memory_order_relaxed);
-    root[JSON_LOG]   = log.load(std::memory_order_relaxed);
-    root[JSON_STATS] = stats.load(std::memory_order_relaxed);
+    root[JSON_BOXES]  = boxes.load(std::memory_order_relaxed);
+    root[JSON_TEXT]   = text.load(std::memory_order_relaxed);
+    root[JSON_IMAGES] = images.load(std::memory_order_relaxed);
+    root[JSON_LOG]    = log.load(std::memory_order_relaxed);
+    root[JSON_STATS]  = stats.load(std::memory_order_relaxed);
     return root;
 }
 
diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoOverlayOption.h b/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoOverlayOption.h
index dcb051a887..69d6fb3b62 100644
--- a/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoOverlayOption.h
+++ b/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoOverlayOption.h
@@ -1,6 +1,6 @@
 /*  Video Overlay Option
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -15,9 +15,12 @@ namespace PokemonAutomation{
 class JsonValue;
 
 
+// store data related to the checkerboxes on UI: whether user enabled box overlay,
+// text overlay, etc.
 class VideoOverlayOption{
     static const std::string JSON_BOXES;
     static const std::string JSON_TEXT;
+    static const std::string JSON_IMAGES;
     static const std::string JSON_LOG;
     static const std::string JSON_STATS;
 
@@ -28,10 +31,11 @@ class VideoOverlayOption{
     JsonValue to_json() const;
 
 public:
-    std::atomic<bool> boxes;
-    std::atomic<bool> text;
-    std::atomic<bool> log;
-    std::atomic<bool> stats;
+    std::atomic<bool> boxes;  // whether user enabled box overlay
+    std::atomic<bool> text;   // whether user enabled text overlay
+    std::atomic<bool> images; // whether user enabled image overlay
+    std::atomic<bool> log;    // whether user enabled log overlay
+    std::atomic<bool> stats;  // whether user enabled stats overlay
 };
 
 
diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoOverlayScopes.h b/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoOverlayScopes.h
index 3fc852c0f7..b36e9c9e63 100644
--- a/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoOverlayScopes.h
+++ b/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoOverlayScopes.h
@@ -1,15 +1,14 @@
 /*  Video Overlay Scopes
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifndef PokemonAutomation_VideoOverlayScopes_H
 #define PokemonAutomation_VideoOverlayScopes_H
 
-//#include <vector>
 #include <deque>
-//#include "VideoOverlayTypes.h"
+#include "CommonFramework/ImageTypes/ImageRGB32.h"
 #include "VideoOverlay.h"
 
 namespace PokemonAutomation{
@@ -55,10 +54,8 @@ class OverlayBoxScope : public OverlayBox{
 };
 
 
-
-
-// A text as part of the video overlay.
-// It handles its own life time on video overlay: once it's destroyed, it removes itself from VideoOverlay.
+//  A text as part of the video overlay.
+//  It handles its own life time on video overlay: once it's destroyed, it removes itself from VideoOverlay.
 class OverlayTextScope : public OverlayText{
     OverlayTextScope(const OverlayTextScope&) = delete;
     void operator=(const OverlayTextScope&) = delete;
@@ -86,6 +83,54 @@ class OverlayTextScope : public OverlayText{
 };
 
 
+//  An image as part of the video overlay.
+//  It owns the image data and handles its own life time on video overlay: once it's destroyed,
+//  it removes itself from VideoOverlay.
+class OverlayImageScope : public OverlayImage{
+    OverlayImageScope(const OverlayImageScope&) = delete;
+    void operator=(const OverlayImageScope&) = delete;
+
+public:
+    ~OverlayImageScope(){
+        m_overlay.remove_image(*this);
+    }
+
+public:
+    // the copied `image` is moved into OverlayImageScope
+    // so after this constructer, the caller can freely modify or delete `image`.
+    OverlayImageScope(
+        VideoOverlay& overlay,
+        ImageRGB32 image,
+        const ImageFloatBox& box
+    )
+        : OverlayImage(ImageViewRGB32(), box)
+        , m_overlay(overlay)
+        , m_image_data(std::move(image))
+    {
+        this->image = m_image_data;
+        overlay.add_image(*this);
+    }
+
+    OverlayImageScope(
+        VideoOverlay& overlay,
+        ImageViewRGB32 image,
+        const ImageFloatBox& box
+    )
+        : OverlayImage(ImageViewRGB32(), box)
+        , m_overlay(overlay)
+        , m_image_data(image.copy())
+    {
+        this->image = m_image_data;
+        overlay.add_image(*this);
+    }
+
+private:
+    VideoOverlay& m_overlay;
+    // owns image content, in contrast to OverlayImage::image which is just a pointer
+    ImageRGB32 m_image_data;
+};
+
+
 
 // Used to clear log messages on video overlay automatically.
 // Place this at the beginning of a program, so that when the program exits, it will
@@ -107,14 +152,6 @@ class OverlayLogTextScope{
 };
 
 
-
-
-
-
-
-
-
-
 // Used by video inference sessions to manage inference boxes.
 // VideoOverlaySet will be passed to the inference callbacks in a session
 // to store inference boxes. When the session ends, VideoOverlaySet::clear()
@@ -122,8 +159,6 @@ class OverlayLogTextScope{
 // automatically when VideoOverlaySet is destroyed.
 // In this way, the user will see the inference boxes on the video overlay UI
 // and those boxes will leave the UI after the session ends.
-//
-// TODO: shall we add text management to this class, or rename this class to BoxOverleySet?
 class VideoOverlaySet{
 public:
     VideoOverlaySet(VideoOverlay& overlay)
@@ -132,14 +167,22 @@ class VideoOverlaySet{
 
     void clear(){
         m_boxes.clear();
+        m_images.clear();
     }
     void add(Color color, const ImageFloatBox& box, std::string label = ""){
         m_boxes.emplace_back(m_overlay, color, box, std::move(label));
     }
+    void add(ImageRGB32 image, const ImageFloatBox& box){
+        m_images.emplace_back(m_overlay, std::move(image), box);
+    }
+    void add(ImageViewRGB32 image, const ImageFloatBox& box){
+        m_images.emplace_back(m_overlay, image, box);
+    }
 
 private:
     VideoOverlay& m_overlay;
     std::deque<OverlayBoxScope> m_boxes;
+    std::deque<OverlayImageScope> m_images;
 };
 
 
diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoOverlaySession.cpp b/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoOverlaySession.cpp
index a2a6e495fd..c22c068efd 100644
--- a/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoOverlaySession.cpp
+++ b/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoOverlaySession.cpp
@@ -1,9 +1,11 @@
 /*  Video Overlay Session
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
+#include "CommonFramework/Tools/GlobalThreadPools.h"
+#include "ControllerInput/Keyboard/GlobalKeyboardHidTracker.h"
 #include "VideoOverlaySession.h"
 
 //#include <iostream>
@@ -14,115 +16,155 @@ namespace PokemonAutomation{
 
 
 
-void VideoOverlaySession::add_listener(Listener& listener){
-    SpinLockGuard lg(m_lock);
-    m_listeners.insert(&listener);
+void VideoOverlaySession::add_content_listener(ContentListener& listener){
+    m_content_listeners.add(listener);
 }
-void VideoOverlaySession::remove_listener(Listener& listener){
-    SpinLockGuard lg(m_lock);
-    m_listeners.erase(&listener);
+void VideoOverlaySession::remove_content_listener(ContentListener& listener){
+    m_content_listeners.remove(listener);
 }
 
 
 VideoOverlaySession::~VideoOverlaySession(){
-    SpinLockGuard lg(m_lock);
-    for (Listener* listeners : m_listeners){
-        listeners->update_stats(nullptr);
+    {
+        std::lock_guard<Mutex> lg(m_stats_lock);
+        m_stopping = true;
     }
+    m_stats_cv.notify_all();
+    m_stats_updater.wait_and_ignore_exceptions();
 }
-VideoOverlaySession::VideoOverlaySession(VideoOverlayOption& option)
-    : m_option(option)
+VideoOverlaySession::VideoOverlaySession(Logger& logger, VideoOverlayOption& option)
+    : m_logger(logger)
+    , m_option(option)
+    , m_stats_updater(GlobalThreadPools::unlimited_normal().dispatch_now_blocking(
+        [this]{ stats_thread(); }
+    ))
 {}
 
 
-void VideoOverlaySession::get(VideoOverlayOption& option){
+void VideoOverlaySession::save(VideoOverlayOption& option) const{
+    bool stats = m_option.stats.load(std::memory_order_relaxed);
     bool boxes = m_option.boxes.load(std::memory_order_relaxed);
     bool text = m_option.text.load(std::memory_order_relaxed);
+    bool images = m_option.images.load(std::memory_order_relaxed);
     bool log = m_option.log.load(std::memory_order_relaxed);
-    bool stats = m_option.stats.load(std::memory_order_relaxed);
     option.boxes.store(boxes, std::memory_order_relaxed);
     option.text.store(text, std::memory_order_relaxed);
+    option.images.store(images, std::memory_order_relaxed);
     option.log.store(log, std::memory_order_relaxed);
     option.stats.store(stats, std::memory_order_relaxed);
 }
-void VideoOverlaySession::set(const VideoOverlayOption& option){
-    SpinLockGuard lg(m_lock, "VideoOverlaySession::set_enabled_boxes()");
+void VideoOverlaySession::load(const VideoOverlayOption& option){
+    bool stats = option.stats.load(std::memory_order_relaxed);
     bool boxes = option.boxes.load(std::memory_order_relaxed);
     bool text = option.text.load(std::memory_order_relaxed);
+    bool images = option.images.load(std::memory_order_relaxed);
     bool log = option.log.load(std::memory_order_relaxed);
-    bool stats = option.stats.load(std::memory_order_relaxed);
+    m_option.stats.store(stats, std::memory_order_relaxed);
     m_option.boxes.store(boxes, std::memory_order_relaxed);
     m_option.text.store(text, std::memory_order_relaxed);
+    m_option.images.store(images, std::memory_order_relaxed);
     m_option.log.store(log, std::memory_order_relaxed);
-    m_option.stats.store(stats, std::memory_order_relaxed);
-    for (Listener* listeners : m_listeners){
-        listeners->enabled_boxes(boxes);
-        listeners->enabled_text(text);
-        listeners->enabled_log(log);
-        listeners->enabled_stats(stats);
+    m_content_listeners.run_method(&ContentListener::on_overlay_enabled_stats, stats);
+    m_content_listeners.run_method(&ContentListener::on_overlay_enabled_boxes, boxes);
+    m_content_listeners.run_method(&ContentListener::on_overlay_enabled_text, text);
+    m_content_listeners.run_method(&ContentListener::on_overlay_enabled_images, images);
+    m_content_listeners.run_method(&ContentListener::on_overlay_enabled_log, log);
+}
+
+
+void VideoOverlaySession::stats_thread(){
+    std::unique_lock<Mutex> lg(m_stats_lock);
+    while (!m_stopping){
+        std::vector<OverlayStatSnapshot> lines;
+        m_stats.run_on_all([&](OverlayStat& stat){
+            OverlayStatSnapshot snapshot = stat.get_current();
+            if (!snapshot.text.empty()){
+                lines.emplace_back(std::move(snapshot));
+            }
+            return false;
+        });
+        {
+            WriteSpinLock lg0(m_lock, PA_CURRENT_FUNCTION);
+            m_stat_lines = std::move(lines);
+        }
+        m_stats_cv.wait_for(lg, std::chrono::milliseconds(100));
     }
 }
 
 
+void VideoOverlaySession::set_enabled_stats(bool enabled){
+    m_option.stats.store(enabled, std::memory_order_relaxed);
+    m_content_listeners.run_method(&ContentListener::on_overlay_enabled_stats, enabled);
+}
 void VideoOverlaySession::set_enabled_boxes(bool enabled){
-    SpinLockGuard lg(m_lock, "VideoOverlaySession::set_enabled_boxes()");
     m_option.boxes.store(enabled, std::memory_order_relaxed);
-    for (Listener* listeners : m_listeners){
-        listeners->enabled_boxes(enabled);
-    }
+    m_content_listeners.run_method(&ContentListener::on_overlay_enabled_boxes, enabled);
 }
 void VideoOverlaySession::set_enabled_text(bool enabled){
-    SpinLockGuard lg(m_lock, "VideoOverlaySession::set_enabled_text()");
     m_option.text.store(enabled, std::memory_order_relaxed);
-    for (Listener* listeners : m_listeners){
-        listeners->enabled_text(enabled);
-    }
+    m_content_listeners.run_method(&ContentListener::on_overlay_enabled_text, enabled);
+}
+void VideoOverlaySession::set_enabled_images(bool enabled){
+    m_option.images.store(enabled, std::memory_order_relaxed);
+    m_content_listeners.run_method(&ContentListener::on_overlay_enabled_images, enabled);
 }
 void VideoOverlaySession::set_enabled_log(bool enabled){
-    SpinLockGuard lg(m_lock, "VideoOverlaySession::set_enabled_log()");
     m_option.log.store(enabled, std::memory_order_relaxed);
-    for (Listener* listeners : m_listeners){
-        listeners->enabled_log(enabled);
-    }
-}
-void VideoOverlaySession::set_enabled_stats(bool enabled){
-    SpinLockGuard lg(m_lock, "VideoOverlaySession::set_enabled_stats()");
-    m_option.stats.store(enabled, std::memory_order_relaxed);
-    for (Listener* listeners : m_listeners){
-        listeners->enabled_stats(enabled);
-    }
+    m_content_listeners.run_method(&ContentListener::on_overlay_enabled_log, enabled);
 }
 
 
+//
+//  Stats
+//
 
-void VideoOverlaySession::add_box(const OverlayBox& box){
-    SpinLockGuard lg(m_lock, "VideoOverlaySession::add_box()");
-    m_boxes.insert(&box);
-    push_box_update();
+void VideoOverlaySession::add_stat(OverlayStat& stat){
+    m_stats.add(stat);
 }
-void VideoOverlaySession::remove_box(const OverlayBox& box){
-    SpinLockGuard lg(m_lock, "VideoOverlaySession::remove_box()");
-    m_boxes.erase(&box);
-    push_box_update();
+void VideoOverlaySession::remove_stat(OverlayStat& stat){
+    m_stats.remove(stat);
 }
 
-void VideoOverlaySession::push_box_update(){
-    if (m_listeners.empty()){
-        return;
-    }
-    
-    // We create a newly allocated Box vector to avoid listeners accessing `m_boxes` asynchronously.
+std::vector<OverlayStatSnapshot> VideoOverlaySession::stats() const{
+    ReadSpinLock lg(m_lock, PA_CURRENT_FUNCTION);
+    return m_stat_lines;
+}
+
+
+//
+//  Boxes
+//
+
+void VideoOverlaySession::add_box(const OverlayBox& box){
     std::shared_ptr<std::vector<OverlayBox>> ptr = std::make_shared<std::vector<OverlayBox>>();
-    for (const auto& item : m_boxes){
-        ptr->emplace_back(*item);
+    {
+        WriteSpinLock lg(m_lock, PA_CURRENT_FUNCTION);
+        m_boxes.insert(&box);
+
+        //  We create a newly allocated Box vector to avoid listener accessing
+        //  `m_boxes` asynchronously.
+        for (const auto& item : m_boxes){
+            ptr->emplace_back(*item);
+        }
     }
-    for (Listener* listeners : m_listeners){
-        listeners->update_boxes(ptr);
+    m_content_listeners.run_method(&ContentListener::on_overlay_update_boxes, ptr);
+}
+void VideoOverlaySession::remove_box(const OverlayBox& box){
+    std::shared_ptr<std::vector<OverlayBox>> ptr = std::make_shared<std::vector<OverlayBox>>();
+    {
+        WriteSpinLock lg(m_lock, PA_CURRENT_FUNCTION);
+        m_boxes.erase(&box);
+
+        //  We create a newly allocated Box vector to avoid listener accessing
+        //  `m_boxes` asynchronously.
+        for (const auto& item : m_boxes){
+            ptr->emplace_back(*item);
+        }
     }
+    m_content_listeners.run_method(&ContentListener::on_overlay_update_boxes, ptr);
 }
-
 std::vector<OverlayBox> VideoOverlaySession::boxes() const{
-    SpinLockGuard lg(m_lock);
+    ReadSpinLock lg(m_lock, PA_CURRENT_FUNCTION);
     std::vector<OverlayBox> ret;
     for (const auto& item : m_boxes){
         ret.emplace_back(*item);
@@ -130,34 +172,41 @@ std::vector<OverlayBox> VideoOverlaySession::boxes() const{
     return ret;
 }
 
-void VideoOverlaySession::add_text(const OverlayText& text){
-    SpinLockGuard lg(m_lock, "VideoOverlaySession::add_text()");
-    m_texts.insert(&text);
-    push_text_update();
-}
-void VideoOverlaySession::remove_text(const OverlayText& text){
-    SpinLockGuard lg(m_lock, "VideoOverlaySession::remove_text()");
-    m_texts.erase(&text);
-    push_text_update();
-}
 
-void VideoOverlaySession::push_text_update(){
-    if (m_listeners.empty()){
-        return;
-    }
+//
+//  Texts
+//
 
-    // We create a newly allocated Box vector to avoid listeners accessing `m_texts` asynchronously.
+void VideoOverlaySession::add_text(const OverlayText& text){
     std::shared_ptr<std::vector<OverlayText>> ptr = std::make_shared<std::vector<OverlayText>>();
-    for (const auto& item : m_texts){
-        ptr->emplace_back(*item);
+    {
+        WriteSpinLock lg(m_lock, PA_CURRENT_FUNCTION);
+        m_texts.insert(&text);
+
+        //  We create a newly allocated Box vector to avoid listener accessing
+        //  `m_texts` asynchronously.
+        for (const auto& item : m_texts){
+            ptr->emplace_back(*item);
+        }
     }
-    for (Listener* listeners : m_listeners){
-        listeners->update_text(ptr);
+    m_content_listeners.run_method(&ContentListener::on_overlay_update_text, ptr);
+}
+void VideoOverlaySession::remove_text(const OverlayText& text){
+    std::shared_ptr<std::vector<OverlayText>> ptr = std::make_shared<std::vector<OverlayText>>();
+    {
+        WriteSpinLock lg(m_lock, PA_CURRENT_FUNCTION);
+        m_texts.erase(&text);
+
+        //  We create a newly allocated Box vector to avoid listener accessing
+        //  `m_texts` asynchronously.
+        for (const auto& item : m_texts){
+            ptr->emplace_back(*item);
+        }
     }
+    m_content_listeners.run_method(&ContentListener::on_overlay_update_text, ptr);
 }
-
 std::vector<OverlayText> VideoOverlaySession::texts() const{
-    SpinLockGuard lg(m_lock);
+    ReadSpinLock lg(m_lock, PA_CURRENT_FUNCTION);
     std::vector<OverlayText> ret;
     for (const auto& item : m_texts){
         ret.emplace_back(*item);
@@ -165,42 +214,89 @@ std::vector<OverlayText> VideoOverlaySession::texts() const{
     return ret;
 }
 
-void VideoOverlaySession::add_log(std::string message, Color color){
-    SpinLockGuard lg(m_lock, "VideoOverlaySession::add_log_text()");
-    m_log_texts.emplace_front(color, std::move(message));
 
-    if (m_log_texts.size() > LOG_MAX_LINES){
-        m_log_texts.pop_back();
-    }
+//
+//  Images
+//
 
-    push_log_text_update();
-}
+void VideoOverlaySession::add_image(const OverlayImage& image){
+    std::shared_ptr<std::vector<OverlayImage>> ptr = std::make_shared<std::vector<OverlayImage>>();
+    {
+        WriteSpinLock lg(m_lock, PA_CURRENT_FUNCTION);
+        m_images.insert(&image);
 
-void VideoOverlaySession::clear_log(){
-    SpinLockGuard lg(m_lock, "VideoOverlaySession::clear_log_texts()");
-    m_log_texts.clear();
-    push_log_text_update();
+        //  We create a newly allocated Box vector to avoid listener accessing
+        //  `m_images` asynchronously.
+        for (const auto& item : m_images){
+            ptr->emplace_back(*item);
+        }
+    }
+    m_content_listeners.run_method(&ContentListener::on_overlay_update_images, ptr);
 }
-
-void VideoOverlaySession::push_log_text_update(){
-    if (m_listeners.empty()){
-        return;
+void VideoOverlaySession::remove_image(const OverlayImage& image){
+    std::shared_ptr<std::vector<OverlayImage>> ptr = std::make_shared<std::vector<OverlayImage>>();
+    {
+        WriteSpinLock lg(m_lock, PA_CURRENT_FUNCTION);
+        m_images.erase(&image);
+
+        //  We create a newly allocated Box vector to avoid listener accessing
+        //  `m_images` asynchronously.
+        for (const auto& item : m_images){
+            ptr->emplace_back(*item);
+        }
+    }
+    m_content_listeners.run_method(&ContentListener::on_overlay_update_images, ptr);
+}
+std::vector<OverlayImage> VideoOverlaySession::images() const{
+    ReadSpinLock lg(m_lock, PA_CURRENT_FUNCTION);
+    std::vector<OverlayImage> ret;
+    for (const auto& item : m_images){
+        ret.emplace_back(*item);
     }
-    
-    // We create a newly allocated Box vector to avoid listeners accessing `m_log_texts` asynchronously.
+    return ret;
+}
+
+
+//
+//  Log
+//
+
+void VideoOverlaySession::add_log(std::string message, Color color){
     std::shared_ptr<std::vector<OverlayLogLine>> ptr = std::make_shared<std::vector<OverlayLogLine>>();
-    for(const auto& item : m_log_texts){
-        ptr->emplace_back(item);
+    {
+        WriteSpinLock lg(m_lock, PA_CURRENT_FUNCTION);
+        m_log_texts.emplace_front(color, std::move(message));
+
+        if (m_log_texts.size() > LOG_MAX_LINES){
+            m_log_texts.pop_back();
+        }
+
+        //  We create a newly allocated Box vector to avoid listener accessing
+        //  `m_log_texts` asynchronously.
+        for (const auto& item : m_log_texts){
+            ptr->emplace_back(item);
+        }
     }
-    for (Listener* listeners : m_listeners){
-        listeners->update_log(ptr);
+    m_content_listeners.run_method(&ContentListener::on_overlay_update_log, ptr);
+}
+void VideoOverlaySession::clear_log(){
+    std::shared_ptr<std::vector<OverlayLogLine>> ptr = std::make_shared<std::vector<OverlayLogLine>>();
+    {
+        WriteSpinLock lg(m_lock, PA_CURRENT_FUNCTION);
+        m_log_texts.clear();
+
+        //  We create a newly allocated log text vector to avoid listener accessing
+        //  `m_log_texts` asynchronously.
+        for (const auto& item : m_log_texts){
+            ptr->emplace_back(item);
+        }
     }
+    m_content_listeners.run_method(&ContentListener::on_overlay_update_log, ptr);
 }
-
 std::vector<OverlayLogLine> VideoOverlaySession::log_texts() const{
-    SpinLockGuard lg(m_lock);
+    ReadSpinLock lg(m_lock, PA_CURRENT_FUNCTION);
     std::vector<OverlayLogLine> ret;
-    for(const auto& item : m_log_texts){
+    for (const auto& item : m_log_texts){
         ret.emplace_back(item);
     }
     return ret;
@@ -209,56 +305,43 @@ std::vector<OverlayLogLine> VideoOverlaySession::log_texts() const{
 
 
 
-void VideoOverlaySession::add_stat(OverlayStat& stat){
-    SpinLockGuard lg(m_lock);
-    auto map_iter = m_stats.find(&stat);
-    if (map_iter != m_stats.end()){
-        return;
-    }
-
-    //  Remove all stats so they aren't being referenced.
-    for (Listener* listeners : m_listeners){
-        listeners->update_stats(nullptr);
-    }
-
-    m_stats_order.emplace_back(&stat);
-    auto list_iter = m_stats_order.end();
-    --list_iter;
-    try{
-        m_stats.emplace(&stat, list_iter);
-    }catch (...){
-        m_stats_order.pop_back();
-        throw;
-    }
-
-    //  Add all the stats back.
-    for (Listener* listeners : m_listeners){
-        listeners->update_stats(&m_stats_order);
-    }
+void VideoOverlaySession::report_key_press(const void* key){
+    global_keyboard_tracker().on_key_press(key);
+    m_hid_listeners.run_method(&VideoDisplayHidListener::on_key_press, key);
 }
-void VideoOverlaySession::remove_stat(OverlayStat& stat){
-    SpinLockGuard lg(m_lock);
-    auto iter = m_stats.find(&stat);
-    if (iter == m_stats.end()){
-        return;
-    }
-
-    //  Remove all stats so they aren't being referenced.
-    for (Listener* listeners : m_listeners){
-        listeners->update_stats(nullptr);
-    }
-
-    m_stats_order.erase(iter->second);
-    m_stats.erase(iter);
-
-    //  Add all the stats back.
-    for (Listener* listeners : m_listeners){
-        listeners->update_stats(&m_stats_order);
-    }
+void VideoOverlaySession::report_key_release(const void* key){
+    global_keyboard_tracker().on_key_release(key);
+    m_hid_listeners.run_method(&VideoDisplayHidListener::on_key_release, key);
 }
 
 
-
+void VideoOverlaySession::add_hid_listener(VideoDisplayHidListener& listener){
+    m_hid_listeners.add(listener);
+}
+void VideoOverlaySession::remove_hid_listener(VideoDisplayHidListener& listener){
+    m_hid_listeners.remove(listener);
+}
+void VideoOverlaySession::on_focus_in(){
+    m_hid_listeners.run_method(&VideoDisplayHidListener::on_focus_in);
+}
+void VideoOverlaySession::on_focus_out(){
+    m_hid_listeners.run_method(&VideoDisplayHidListener::on_focus_out);
+}
+void VideoOverlaySession::on_mouse_press(double x, double y){
+    m_hid_listeners.run_method(&VideoDisplayHidListener::on_mouse_press, x, y);
+}
+void VideoOverlaySession::on_mouse_release(double x, double y){
+    m_hid_listeners.run_method(&VideoDisplayHidListener::on_mouse_release, x, y);
+}
+void VideoOverlaySession::on_mouse_move(double x, double y){
+    m_hid_listeners.run_method(&VideoDisplayHidListener::on_mouse_move, x, y);
+}
+void VideoOverlaySession::on_key_press(const void* key){
+    m_hid_listeners.run_method(&VideoDisplayHidListener::on_key_press, key);
+}
+void VideoOverlaySession::on_key_release(const void* key){
+    m_hid_listeners.run_method(&VideoDisplayHidListener::on_key_release, key);
+}
 
 
 
diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoOverlaySession.h b/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoOverlaySession.h
index fb5c695dce..ec07a931be 100644
--- a/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoOverlaySession.h
+++ b/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoOverlaySession.h
@@ -1,6 +1,6 @@
 /*  Video Overlay Session
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  *  This class holds the real-time state of the video overlays. You can
  *  asychronously add/remove objects to it.
@@ -19,10 +19,13 @@
 #include <set>
 #include <map>
 #include <deque>
-#include "Common/Compiler.h"
+#include "Common/Cpp/Logging/AbstractLogger.h"
 #include "Common/Cpp/Color.h"
+#include "Common/Cpp/ListenerSet.h"
 #include "Common/Cpp/Concurrency/SpinLock.h"
-#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "Common/Cpp/Concurrency/Mutex.h"
+#include "Common/Cpp/Concurrency/ConditionVariable.h"
+#include "Common/Cpp/Concurrency/AsyncTask.h"
 #include "VideoOverlay.h"
 #include "VideoOverlayOption.h"
 
@@ -39,85 +42,154 @@ class VideoOverlaySession : public VideoOverlay{
 public:
     // Video overlay UI class (e.g. VideoOverlayWidget) inherits this listener to listen
     // to the overlay session.
-    struct Listener{
+    struct ContentListener{
         //  VideoOverlaySession will call these when they change.
 
-        virtual void enabled_boxes(bool enabled){}
-        virtual void enabled_text (bool enabled){}
-        virtual void enabled_log  (bool enabled){}
-        virtual void enabled_stats(bool enabled){}
-
-        virtual void update_boxes(const std::shared_ptr<const std::vector<OverlayBox>>& boxes){}
-        virtual void update_text (const std::shared_ptr<const std::vector<OverlayText>>& texts){}
-        virtual void update_log  (const std::shared_ptr<const std::vector<OverlayLogLine>>& boxes){}
-
-        //  This one is different from the others. The listeners will store this
-        //  pointer and access it directly and asynchronously. If you need to
-        //  change the structure of the list itself, you must first call this
-        //  with null to remove it from all the listeners. Then add the updated
-        //  one back when you're done.
-        virtual void update_stats(const std::list<OverlayStat*>* stats){}
+        virtual void on_overlay_enabled_boxes  (bool enabled){}
+        virtual void on_overlay_enabled_text   (bool enabled){}
+        virtual void on_overlay_enabled_images (bool enabled){}
+        virtual void on_overlay_enabled_log    (bool enabled){}
+        virtual void on_overlay_enabled_stats  (bool enabled){}
+
+        // Returns a copy to avoid the caller (UI object) accessing the data async while the data
+        // is modified by VideoOverlaySession::add/remove_box().
+        virtual void on_overlay_update_boxes  (const std::shared_ptr<const std::vector<OverlayBox>>& boxes){}
+        // Returns a copy to avoid the caller (UI object) accessing the data async while the data
+        // is modified by VideoOverlaySession::add/remove_text().
+        virtual void on_overlay_update_text   (const std::shared_ptr<const std::vector<OverlayText>>& texts){}
+        // Returns a copy to avoid the caller (UI object) accessing the data async while the data
+        // is modified by VideoOverlaySession::add/remove_image().
+        virtual void on_overlay_update_images (const std::shared_ptr<const std::vector<OverlayImage>>& images){}
+        // Returns a copy to avoid the caller (UI object) accessing the data async while the data
+        // is modified by VideoOverlaySession::add/remove_log().
+        virtual void on_overlay_update_log    (const std::shared_ptr<const std::vector<OverlayLogLine>>& boxes){}
 
     };
 
-    // Add a UI class to listen to any overlay change. The UI class needs to inherit Listener.
-    // Must call `remove_listener()` before listener is destroyed.
-    void add_listener(Listener& listener);
-    // remove a UI class that listens to the overlay change, added by `add_listener()`.
-    void remove_listener(Listener& listener);
+    //  Add a UI class to listen to any overlay change. The UI class needs to inherit Listener.
+    //  Must call `remove_listener()` before listener is destroyed.
+    void add_content_listener(ContentListener& listener);
+    //  Remove a UI class that listens to the overlay change, added by `add_listener()`.
+    void remove_content_listener(ContentListener& listener);
+
 
 public:
     ~VideoOverlaySession();
-    VideoOverlaySession(VideoOverlayOption& option);
+    VideoOverlaySession(Logger& logger, VideoOverlayOption& option);
 
-    void get(VideoOverlayOption& option);
-    void set(const VideoOverlayOption& option);
+    Logger& logger() const{ return m_logger; }
 
-    bool enabled_boxes() const{ return m_option.boxes.load(std::memory_order_relaxed); }
-    bool enabled_text () const{ return m_option.text.load(std::memory_order_relaxed); }
-    bool enabled_log  () const{ return m_option.log.load(std::memory_order_relaxed); }
-    bool enabled_stats() const{ return m_option.stats.load(std::memory_order_relaxed); }
+    void save(VideoOverlayOption& option) const;
+    void load(const VideoOverlayOption& option);
 
-    void set_enabled_boxes(bool enabled);
-    void set_enabled_text (bool enabled);
-    void set_enabled_log  (bool enabled);
-    void set_enabled_stats(bool enabled);
+    bool enabled_boxes () const{ return m_option.boxes.load(std::memory_order_relaxed); }
+    bool enabled_text  () const{ return m_option.text.load(std::memory_order_relaxed); }
+    bool enabled_images() const{ return m_option.images.load(std::memory_order_relaxed); }
+    bool enabled_log   () const{ return m_option.log.load(std::memory_order_relaxed); }
+    bool enabled_stats () const{ return m_option.stats.load(std::memory_order_relaxed); }
 
+    void set_enabled_boxes (bool enabled);
+    void set_enabled_text  (bool enabled);
+    void set_enabled_images(bool enabled);
+    void set_enabled_log   (bool enabled);
+    void set_enabled_stats (bool enabled);
+
+    // Called by rendering infra to access a copy of the stored overlay boxes.
+    // Returns a copy to avoid the caller (UI object) accessing the data async while the data
+    // is modified by VideoOverlaySession::add/remove_box().
     std::vector<OverlayBox> boxes() const;
+    // Called by rendering infra to access the overlay texts.
+    // Returns a copy to avoid the caller (UI object) accessing the data async while the data
+    // is modified by VideoOverlaySession::add/remove_text().
     std::vector<OverlayText> texts() const;
+    // Called by rendering infra to access the overlay images.
+    // Returns a copy to avoid the caller (UI object) accessing the data async while the data
+    // is modified by VideoOverlaySession::add/remove_image().
+    std::vector<OverlayImage> images() const;
+    // Called by rendering infra to access the overlay logs.
+    // Returns a copy to avoid the caller (UI object) accessing the data async while the data
+    // is modified by VideoOverlaySession::add/remove_log().
     std::vector<OverlayLogLine> log_texts() const;
 
+    std::vector<OverlayStatSnapshot> stats() const;
+
+
     virtual void add_box(const OverlayBox& box) override;
     virtual void remove_box(const OverlayBox& box) override;
 
     virtual void add_text(const OverlayText& text) override;
     virtual void remove_text(const OverlayText& text) override;
 
-    virtual void add_log(std::string message, Color color) override;
+    virtual void add_image(const OverlayImage& image) override;
+    virtual void remove_image(const OverlayImage& image) override;
+
+    virtual void add_log(std::string message, Color color = COLOR_WHITE) override;
     virtual void clear_log() override;
 
     virtual void add_stat(OverlayStat& stat) override;
     virtual void remove_stat(OverlayStat& stat) override;
 
+
+public:
+    virtual void add_hid_listener(VideoDisplayHidListener& listener) override;
+    virtual void remove_hid_listener(VideoDisplayHidListener& listener) override;
+
+    void report_focus_in(){
+        m_hid_listeners.run_method(&VideoDisplayHidListener::on_focus_in);
+    }
+    void report_focus_out(){
+        m_hid_listeners.run_method(&VideoDisplayHidListener::on_focus_out);
+    }
+    void report_mouse_press(double x, double y){
+        m_hid_listeners.run_method(&VideoDisplayHidListener::on_mouse_press, x, y);
+    }
+    void report_mouse_release(double x, double y){
+        m_hid_listeners.run_method(&VideoDisplayHidListener::on_mouse_release, x, y);
+    }
+    void report_mouse_move(double x, double y){
+        m_hid_listeners.run_method(&VideoDisplayHidListener::on_mouse_move, x, y);
+    }
+    void report_key_press(const void* key);
+    void report_key_release(const void* key);
+
+
 private:
-    //  Push updates to the various listeners.
-    void push_box_update();
-    void push_text_update();
-    void push_log_text_update();
+    virtual void on_focus_in() override;
+    virtual void on_focus_out() override;
+
+    virtual void on_mouse_press(double x, double y) override;
+    virtual void on_mouse_release(double x, double y) override;
+    virtual void on_mouse_move(double x, double y) override;
+
+    virtual void on_key_press(const void* key) override;
+    virtual void on_key_release(const void* key) override;
+
 
 private:
-    mutable SpinLock m_lock;
+    void stats_thread();
 
+
+private:
+    Logger& m_logger;
     VideoOverlayOption& m_option;
 
+    mutable SpinLock m_lock;
+
     std::set<const OverlayBox*> m_boxes;
     std::set<const OverlayText*> m_texts;
+    std::set<const OverlayImage*> m_images;
     std::deque<OverlayLogLine> m_log_texts;
 
-    std::list<OverlayStat*> m_stats_order;
-    std::map<OverlayStat*, std::list<OverlayStat*>::iterator> m_stats;
+    ListenerSet<OverlayStat> m_stats;
+
+    ListenerSet<ContentListener> m_content_listeners;
+    ListenerSet<VideoDisplayHidListener> m_hid_listeners;
 
-    std::set<Listener*> m_listeners;
+    bool m_stopping = false;
+    std::vector<OverlayStatSnapshot> m_stat_lines;
+    Mutex m_stats_lock;
+    ConditionVariable m_stats_cv;
+    AsyncTask m_stats_updater;
 };
 
 
diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoOverlayTypes.cpp b/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoOverlayTypes.cpp
index e44efbc4fb..94efba1d53 100644
--- a/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoOverlayTypes.cpp
+++ b/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoOverlayTypes.cpp
@@ -1,6 +1,6 @@
 /*  Video Overlay Types
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -25,21 +25,22 @@ OverlayStat::OverlayStat()
 {}
 
 Color OverlayStat::get_text(std::string& text) const{
-    SpinLockGuard lg(m_data->m_lock);
+    ReadSpinLock lg(m_data->m_lock);
     text = m_data->m_current.text;
     return m_data->m_current.color;
 }
 
 void OverlayStat::set_text(std::string text, Color color){
-    SpinLockGuard lg(m_data->m_lock);
+    WriteSpinLock lg(m_data->m_lock);
     m_data->m_current.text = std::move(text);
     m_data->m_current.color = color;
 }
 #endif
 
 
-OverlayStatUtilizationPrinter::OverlayStatUtilizationPrinter()
-    : m_last_active(WallClock::min())
+OverlayStatUtilizationPrinter::OverlayStatUtilizationPrinter(double max_utilization)
+    : m_max_utilization(max_utilization)
+    , m_last_active(WallClock::min())
 {}
 OverlayStatSnapshot OverlayStatUtilizationPrinter::get_snapshot(const std::string& label, double utilization){
     WallClock now = current_time();
@@ -56,11 +57,11 @@ OverlayStatSnapshot OverlayStatUtilizationPrinter::get_snapshot(const std::strin
     }
 
     Color color = COLOR_WHITE;
-    if (utilization > 0.90){
+    if (utilization > 0.90 * m_max_utilization){
         color = COLOR_RED;
-    }else if (utilization > 0.80){
+    }else if (utilization > 0.80 * m_max_utilization){
         color = COLOR_ORANGE;
-    }else if (utilization > 0.50){
+    }else if (utilization > 0.50 * m_max_utilization){
         color = COLOR_YELLOW;
     }
     return OverlayStatSnapshot{
diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoOverlayTypes.h b/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoOverlayTypes.h
index 72c0fefdab..fe972636dc 100644
--- a/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoOverlayTypes.h
+++ b/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoOverlayTypes.h
@@ -1,6 +1,6 @@
 /*  Video Overlay Types
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -12,10 +12,12 @@
 #include "Common/Cpp/Time.h"
 #include "Common/Cpp/Containers/Pimpl.h"
 #include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
 
 namespace PokemonAutomation{
 
-
+// A bounding box as part of the video overlay
+// Check CommonFramework/VideoPipeline/VideoOverlay.h to see how it's used.
 struct OverlayBox{
     Color color;
     ImageFloatBox box;
@@ -33,6 +35,7 @@ struct OverlayBox{
 
 
 // A text as part of the video overlay.
+// Check CommonFramework/VideoPipeline/VideoOverlay.h to see how it's used.
 struct OverlayText{
     // Text color.
     Color color;
@@ -58,11 +61,36 @@ struct OverlayText{
         , x(x), y(y)
         , font_size(font_size)
     {}
-
 };
 
+// An image as part of the video overlay.
+// Allow transparency to create mask overlay.
+// Check CommonFramework/VideoPipeline/VideoOverlay.h to see how it's used.
+// e.g. OverlayImage(image, {x=0.5, y=0.5, width=0.5, height=0.5}) will render
+// an overlay image on the lower right quadrant of the view.
+// Note: for efficiency, the image stored is just a pointer. Be careful not to
+// modify the image data async or release it before the rendering code calls it.
+struct OverlayImage{
+    // Image view. The image data must live longer than the OverlayImage.
+    // Its alpha channel will be used during rendering.
+    ImageViewRGB32 image;
+    // starting x coordinate of the image in the video window, range: 0.0-1.0.
+    // starting y coordinate of the image in the video window, range: 0.0-1.0.
+    // relative width of the image in the video window, range: 0.0-1.0
+    // relative height of the image in the video window, range: 0.0-1.0
+    ImageFloatBox box;
+    
+    OverlayImage(
+        ImageViewRGB32 image, const ImageFloatBox& box
+    )
+        : image(image)
+        , box(box)
+    {}
+};
 
 
+// A log line to show as part of overlay.
+// Check CommonFramework/VideoPipeline/VideoOverlay.h to see how it's used.
 struct OverlayLogLine{
     Color color;
     std::string message;
@@ -98,10 +126,11 @@ class OverlayStat{
 
 class OverlayStatUtilizationPrinter{
 public:
-    OverlayStatUtilizationPrinter();
+    OverlayStatUtilizationPrinter(double max_utilization = 1.0);
     OverlayStatSnapshot get_snapshot(const std::string& label, double utilization);
 
 private:
+    double m_max_utilization;
     WallClock m_last_active;
 };
 
diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoPipelineOptions.h b/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoPipelineOptions.h
new file mode 100644
index 0000000000..f9969a1141
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoPipelineOptions.h
@@ -0,0 +1,62 @@
+/*  Video Pipeline Options
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_VideoPipeline_VideoPipelineOptions_H
+#define PokemonAutomation_VideoPipeline_VideoPipelineOptions_H
+
+#include "Common/Cpp/Options/GroupOption.h"
+#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "Backends/CameraImplementations.h"
+
+namespace PokemonAutomation{
+
+
+class VideoPipelineOptions : public GroupOption{
+public:
+    VideoPipelineOptions()
+        : GroupOption(
+            "Video Pipeline",
+            LockMode::LOCK_WHILE_RUNNING,
+            GroupOption::EnableMode::ALWAYS_ENABLED,
+            true,
+            false
+        )
+        , SHOW_ALL_FPS(
+            "<b>Show all FPS Options:</b><br>"
+            "Show all video format/FPS combinations. This is hidden by default since Qt usually ignores the FPS.",
+            LockMode::UNLOCK_WHILE_RUNNING,
+            false
+        )
+        , AUTO_RESET_SECONDS(
+            "<b>Video Auto-Reset:</b><br>"
+            "Attempt to reset the video if this many seconds has elapsed since the last video frame (in order to fix issues with RDP disconnection, etc).<br>"
+            "This option is not supported by all video frameworks. Set to a value of 0 to disable Auto-Reset.",
+            LockMode::UNLOCK_WHILE_RUNNING,
+#if defined(__linux__)
+            0 // Default to disabled on linux, auto-resets briefly output black frames
+#else
+            5
+#endif
+        )
+    {
+        PA_ADD_OPTION(SHOW_ALL_FPS);
+        PA_ADD_OPTION(VIDEO_BACKEND0);
+
+        PA_ADD_OPTION(AUTO_RESET_SECONDS);
+    }
+
+public:
+    BooleanCheckBoxOption SHOW_ALL_FPS;
+    VideoBackendOption VIDEO_BACKEND0;
+
+    SimpleIntegerOption<uint8_t> AUTO_RESET_SECONDS;
+};
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoSession.cpp b/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoSession.cpp
new file mode 100644
index 0000000000..2e1a3dbfd0
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoSession.cpp
@@ -0,0 +1,534 @@
+/*  Video Session
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/EarlyShutdown.h"
+#include "CommonFramework/GlobalSettingsPanel.h"
+#include "CommonFramework/GlobalServices.h"
+#include "CommonFramework/VideoPipeline/VideoPipelineOptions.h"
+#include "Backends/VideoFrameQt.h"
+#include "Sources/VideoSource_Null.h"
+#include "VideoSession.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+
+
+
+void VideoSession::add_state_listener(StateListener& listener){
+    m_state_listeners.add(listener);
+}
+void VideoSession::remove_state_listener(StateListener& listener){
+    m_state_listeners.remove(listener);
+}
+
+bool VideoSession::try_remove_state_listener(StateListener& listener){
+    return m_state_listeners.try_remove(listener);
+}
+
+void VideoSession::add_frame_listener(VideoFrameListener& listener){
+    m_frame_listeners.add(listener);
+}
+void VideoSession::remove_frame_listener(VideoFrameListener& listener){
+    m_frame_listeners.remove(listener);
+}
+
+
+
+
+bool VideoSession::try_shutdown() noexcept{
+    if (m_video_source){
+        m_video_source->remove_source_frame_listener(*this);
+        m_video_source->remove_rendered_frame_listener(*this);
+    }
+    return global_watchdog().try_remove(*this);
+}
+VideoSession::~VideoSession(){
+    blocking_shutdown(
+        m_logger,
+        "VideoSession",
+        [this]{ return try_shutdown(); }
+    );
+}
+VideoSession::VideoSession(Logger& logger, VideoSourceOption& option)
+    : m_logger(logger)
+    , m_option(option)
+    , m_descriptor(std::make_unique<VideoSourceDescriptor_Null>())
+{
+    uint8_t watchdog_timeout = GlobalSettings::instance().VIDEO_PIPELINE->AUTO_RESET_SECONDS;
+    if (watchdog_timeout != 0){
+        global_watchdog().add(*this, std::chrono::seconds(watchdog_timeout));
+    }
+    set_source(option.descriptor(), option.m_resolution, option.m_format, option.m_fps);
+}
+
+
+
+
+std::shared_ptr<const VideoSourceDescriptor> VideoSession::descriptor() const{
+    auto scope = m_sanitizer.check_scope();
+    ReadSpinLock lg(m_state_lock, PA_CURRENT_FUNCTION);
+    return m_descriptor;
+}
+void VideoSession::current_stream_format(
+    Resolution& resolution,
+    VideoFormat& format,
+    FramesPerSecond& fps
+){
+    auto scope = m_sanitizer.check_scope();
+    ReadSpinLock lg(m_state_lock, PA_CURRENT_FUNCTION);
+    if (m_video_source){
+        resolution = m_video_source->current_resolution();
+        format = m_video_source->current_format();
+        fps = m_video_source->current_fps();
+    }else{
+        resolution = Resolution();
+        format = VideoFormat::OTHER;
+        fps =0;
+    }
+}
+Resolution VideoSession::current_resolution(){
+    auto scope = m_sanitizer.check_scope();
+    ReadSpinLock lg(m_state_lock, PA_CURRENT_FUNCTION);
+    if (m_video_source){
+        return m_video_source->current_resolution();
+    }else{
+        return Resolution();
+    }
+}
+#if 0
+VideoFormat VideoSession::current_format(){
+    ReadSpinLock lg(m_state_lock, PA_CURRENT_FUNCTION);
+    if (m_video_source){
+        return m_video_source->current_format();
+    }else{
+        return VideoFormat::OTHER;
+    }
+}
+FramesPerSecond VideoSession::current_fps(){
+    ReadSpinLock lg(m_state_lock, PA_CURRENT_FUNCTION);
+    if (m_video_source){
+        return m_video_source->current_fps();
+    }else{
+        return 0;
+    }
+}
+#endif
+VideoFormatSet VideoSession::supported_formats() const{
+    auto scope = m_sanitizer.check_scope();
+    ReadSpinLock lg(m_state_lock, PA_CURRENT_FUNCTION);
+    if (m_video_source){
+        return m_video_source->supported_formats();
+    }else{
+        return {};
+    }
+}
+
+
+
+void VideoSession::save(VideoSourceOption& option) const{
+    auto scope = m_sanitizer.check_scope();
+    ReadSpinLock lg(m_state_lock, PA_CURRENT_FUNCTION);
+    option = m_option;
+}
+void VideoSession::load(const VideoSourceOption& option){
+    auto scope = m_sanitizer.check_scope();
+    set_source(
+        option.descriptor(),
+        option.m_resolution,
+        option.m_format,
+        option.m_fps
+    );
+}
+
+void VideoSession::reset(){
+    auto scope = m_sanitizer.check_scope();
+    {
+        WriteSpinLock lg(m_queue_lock, PA_CURRENT_FUNCTION);
+//        cout << "VideoSession::reset(): " << m_queued_commands.size() << endl;
+        m_queued_commands.emplace_back(
+            Command{
+                CommandType::RESET,
+                nullptr,
+                Resolution{},
+                VideoFormat::OTHER,
+                0
+            }
+        );
+    }
+    run_commands();
+}
+void VideoSession::set_source(
+    const std::shared_ptr<VideoSourceDescriptor>& device,
+    Resolution resolution,
+    VideoFormat format,
+    size_t fps
+){
+    auto scope = m_sanitizer.check_scope();
+    {
+        WriteSpinLock lg(m_queue_lock, PA_CURRENT_FUNCTION);
+//        cout << "VideoSession::set_source(): " << resolution.to_string() << endl;
+        m_queued_commands.emplace_back(
+            Command{
+                CommandType::SET_SOURCE,
+                device,
+                resolution,
+                format,
+                fps
+            }
+        );
+    }
+    run_commands();
+}
+void VideoSession::set_resolution(Resolution resolution){
+    auto scope = m_sanitizer.check_scope();
+    {
+        WriteSpinLock lg(m_queue_lock, PA_CURRENT_FUNCTION);
+//        cout << "VideoSession::set_resolution(): " << m_queued_commands.size() << endl;
+        m_queued_commands.emplace_back(
+            Command{
+                CommandType::SET_RESOLUTION,
+                nullptr,
+                resolution,
+                VideoFormat::OTHER,
+                0
+            }
+        );
+    }
+    run_commands();
+}
+void VideoSession::set_format(VideoFormat format, size_t fps){
+    auto scope = m_sanitizer.check_scope();
+    {
+        WriteSpinLock lg(m_queue_lock, PA_CURRENT_FUNCTION);
+//        cout << "VideoSession::set_resolution(): " << m_queued_commands.size() << endl;
+        m_queued_commands.emplace_back(
+            Command{
+                CommandType::SET_FORMAT,
+                nullptr,
+                {},
+                format,
+                fps
+            }
+        );
+    }
+    run_commands();
+}
+
+void VideoSession::internal_reset(){
+    auto scope = m_sanitizer.check_scope();
+    m_logger.log("Resetting the video...", COLOR_GREEN);
+    m_state_listeners.run_method(&StateListener::pre_shutdown);
+
+    Resolution resolution = m_option.m_resolution;
+    VideoFormat format = m_option.m_format;
+    FramesPerSecond fps = m_option.m_fps;
+    std::unique_ptr<VideoSource> source;
+    {
+        WriteSpinLock lg(m_state_lock, PA_CURRENT_FUNCTION);
+        source = std::move(m_video_source);
+    }
+    if (source){
+        source->remove_source_frame_listener(*this);
+        source->remove_rendered_frame_listener(*this);
+        source.reset();
+    }
+
+    source = m_descriptor->make_VideoSource(m_logger, resolution, format, fps);
+    if (source){
+        resolution = source->current_resolution();
+        format = source->current_format();
+        fps = source->current_fps();
+        source->add_source_frame_listener(*this);
+        source->add_rendered_frame_listener(*this);
+    }
+
+    {
+        WriteSpinLock lg(m_state_lock, PA_CURRENT_FUNCTION);
+        m_option.m_resolution = resolution;
+        m_option.m_format = format;
+        m_option.m_fps = fps;
+        m_video_source = std::move(source);
+    }
+
+    m_state_listeners.run_method(
+        &StateListener::post_startup,
+        m_video_source.get()
+    );
+}
+void VideoSession::internal_set_source(
+    const std::shared_ptr<VideoSourceDescriptor>& device,
+    Resolution resolution,
+    VideoFormat format,
+    FramesPerSecond fps
+){
+    auto scope = m_sanitizer.check_scope();
+    m_logger.log("Changing video...", COLOR_GREEN);
+    if (*m_descriptor == *device && !m_descriptor->should_reload() &&
+        m_option.m_resolution == resolution &&
+        m_option.m_format == format &&
+        m_option.m_fps == fps
+    ){
+        return;
+    }
+
+    m_state_listeners.run_method(&StateListener::pre_shutdown);
+
+    std::unique_ptr<VideoSource> source;
+    {
+        WriteSpinLock lg(m_state_lock, PA_CURRENT_FUNCTION);
+        source = std::move(m_video_source);
+    }
+    if (source){
+        source->remove_source_frame_listener(*this);
+        source->remove_rendered_frame_listener(*this);
+        source.reset();
+    }
+    {
+        WriteSpinLock lg(m_state_lock, PA_CURRENT_FUNCTION);
+        m_option.set_descriptor(device);
+        m_descriptor = device;
+    }
+
+    Resolution desired_resolution = resolution ? resolution : m_option.m_resolution;
+//    cout << "desired_resolution = " << desired_resolution.to_string() << endl;
+    source = device->make_VideoSource(m_logger, desired_resolution, format, fps);
+    if (source){
+        resolution = source->current_resolution();
+        format = source->current_format();
+        fps = source->current_fps();
+        source->add_source_frame_listener(*this);
+        source->add_rendered_frame_listener(*this);
+    }
+
+    {
+        WriteSpinLock lg(m_state_lock, PA_CURRENT_FUNCTION);
+        m_option.m_resolution = resolution;
+        m_option.m_format = format;
+        m_option.m_fps = fps;
+        m_video_source = std::move(source);
+    }
+
+    m_state_listeners.run_method(
+        &StateListener::post_startup,
+        m_video_source.get()
+    );
+}
+void VideoSession::internal_set_resolution(Resolution resolution){
+    auto scope = m_sanitizer.check_scope();
+    m_logger.log("Changing resolution...", COLOR_GREEN);
+    if (m_option.m_resolution == resolution){
+        return;
+    }
+
+    m_state_listeners.run_method(&StateListener::pre_shutdown);
+
+    std::unique_ptr<VideoSource> source;
+    {
+        WriteSpinLock lg(m_state_lock, PA_CURRENT_FUNCTION);
+        source = std::move(m_video_source);
+    }
+    if (source){
+        source->remove_source_frame_listener(*this);
+        source->remove_rendered_frame_listener(*this);
+        source.reset();
+    }
+
+    source = m_descriptor->make_VideoSource(
+        m_logger,
+        resolution,
+        m_option.m_format,
+        0   //  Intentionally force the default FPS.
+    );
+    VideoFormat format = VideoFormat::OTHER;
+    FramesPerSecond fps = 0;
+    if (source){
+        resolution = source->current_resolution();
+        format = source->current_format();
+        fps = source->current_fps();
+        source->add_source_frame_listener(*this);
+        source->add_rendered_frame_listener(*this);
+    }
+
+    {
+        WriteSpinLock lg(m_state_lock, PA_CURRENT_FUNCTION);
+        m_option.m_resolution = resolution;
+        m_option.m_format = format;
+        m_option.m_fps = fps;
+        m_video_source = std::move(source);
+    }
+
+    m_state_listeners.run_method(
+        &StateListener::post_startup,
+        m_video_source.get()
+    );
+}
+void VideoSession::internal_set_format(VideoFormat format, FramesPerSecond fps){
+    auto scope = m_sanitizer.check_scope();
+    m_logger.log("Changing format...", COLOR_GREEN);
+    if (m_option.m_format == format && m_option.m_fps == fps){
+        return;
+    }
+
+    m_state_listeners.run_method(&StateListener::pre_shutdown);
+
+    std::unique_ptr<VideoSource> source;
+    {
+        WriteSpinLock lg(m_state_lock, PA_CURRENT_FUNCTION);
+        source = std::move(m_video_source);
+    }
+    if (source){
+        source->remove_source_frame_listener(*this);
+        source->remove_rendered_frame_listener(*this);
+        source.reset();
+    }
+
+    source = m_descriptor->make_VideoSource(m_logger, m_option.m_resolution, format, fps);
+    if (source){
+        format = source->current_format();
+        fps = source->current_fps();
+        source->add_source_frame_listener(*this);
+        source->add_rendered_frame_listener(*this);
+    }
+
+    {
+        WriteSpinLock lg(m_state_lock, PA_CURRENT_FUNCTION);
+        m_option.m_format = format;
+        m_option.m_fps = fps;
+        m_video_source = std::move(source);
+    }
+
+    m_state_listeners.run_method(
+        &StateListener::post_startup,
+        m_video_source.get()
+    );
+}
+
+void VideoSession::run_commands(){
+    auto scope = m_sanitizer.check_scope();
+    if (!m_reset_lock.try_acquire_write()){
+        m_logger.log("Suppressing re-entrant command...", COLOR_RED);
+        return;
+    }
+
+    try{
+        while (true){
+            Command command;
+            {
+                WriteSpinLock lg1(m_queue_lock, PA_CURRENT_FUNCTION);
+//                cout << "VideoSession::run_commands(): " << m_queued_commands.size() << endl;
+                if (m_queued_commands.empty()){
+                    break;
+                }
+                command = std::move(m_queued_commands.front());
+                m_queued_commands.pop_front();
+            }
+
+            switch (command.command_type){
+            case CommandType::RESET:
+                internal_reset();
+                break;
+
+            case CommandType::SET_SOURCE:
+                internal_set_source(command.device, command.resolution, command.format, command.fps);
+                break;
+
+            case CommandType::SET_RESOLUTION:
+                internal_set_resolution(command.resolution);
+                break;
+
+            case CommandType::SET_FORMAT:
+                internal_set_format(command.format, command.fps);
+                break;
+            }
+        }
+        m_reset_lock.unlock_write();
+    }catch (...){
+        m_reset_lock.unlock_write();
+        throw;
+    }
+}
+
+
+VideoSnapshot VideoSession::snapshot_latest_blocking(){
+    ReadSpinLock lg(m_state_lock, PA_CURRENT_FUNCTION);
+    if (m_video_source){
+        return m_video_source->snapshot_latest_blocking();
+    }else{
+        return VideoSnapshot();
+    }
+}
+VideoSnapshot VideoSession::snapshot_recent_nonblocking(WallClock min_time){
+    ReadSpinLock lg(m_state_lock, PA_CURRENT_FUNCTION);
+    if (m_video_source){
+        return m_video_source->snapshot_recent_nonblocking(min_time);
+    }else{
+        return VideoSnapshot();
+    }
+}
+
+double VideoSession::fps_source() const{
+    ReadSpinLock lg(m_fps_lock, PA_CURRENT_FUNCTION);
+    return m_fps_tracker_source.events_per_second();
+}
+double VideoSession::fps_display() const{
+    ReadSpinLock lg(m_fps_lock, PA_CURRENT_FUNCTION);
+    return m_fps_tracker_rendered.events_per_second();
+}
+
+
+void VideoSession::on_watchdog_timeout(){
+    auto scope = m_sanitizer.check_scope();
+    {
+        ReadSpinLock lg(m_state_lock, PA_CURRENT_FUNCTION);
+        if (!m_video_source || !m_video_source->allow_watchdog_reset()){
+            return;
+        }
+    }
+
+    uint8_t watchdog_timeout = GlobalSettings::instance().VIDEO_PIPELINE->AUTO_RESET_SECONDS;
+    m_logger.log("No video detected for " + std::to_string(watchdog_timeout) + " seconds...", COLOR_RED);
+
+    if (watchdog_timeout == 0){
+        return;
+    }
+
+    reset();
+}
+
+
+void VideoSession::on_frame(std::shared_ptr<const VideoFrame> frame){
+    m_frame_listeners.run_method(&VideoFrameListener::on_frame, frame);
+    {
+        WriteSpinLock lg(m_fps_lock, PA_CURRENT_FUNCTION);
+        m_fps_tracker_source.push_event(frame->timestamp);
+    }
+    global_watchdog().delay(*this);
+}
+void VideoSession::on_rendered_frame(WallClock timestamp){
+    WriteSpinLock lg(m_fps_lock, PA_CURRENT_FUNCTION);
+    m_fps_tracker_rendered.push_event(timestamp);
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}
diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoSession.h b/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoSession.h
new file mode 100644
index 0000000000..3ae5db9756
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoSession.h
@@ -0,0 +1,262 @@
+/*  Video Session
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_VideoPipeline_VideoSession_H
+#define PokemonAutomation_VideoPipeline_VideoSession_H
+
+#include <memory>
+#include <deque>
+#include "Common/Cpp/EventRateTracker.h"
+#include "Common/Cpp/Concurrency/SpinLock.h"
+#include "Common/Cpp/Concurrency/Watchdog.h"
+#include "VideoSourceOption.h"
+#include "VideoSource.h"
+
+namespace PokemonAutomation{
+
+
+class VideoSession
+    : public VideoFeed  // interface class the automation programs have access to to query video snapshots
+                        // and reset the video source
+    , private VideoFrameListener  // listens to incoming frames from video source
+    , private VideoSource::RenderedFrameListener  // listens to frames rendered to the screen.
+    , private WatchdogCallback
+{
+public:
+    //  other classes can inherit this struct to react to state changes in the VideoSession.
+    //  You need to call VideoSession::add_state_listener() to add other classes as listeners
+    //  and remove them by VideoSession::remove_state_listener() when they are no longer needed.
+    //  When a state change happens, VideoSession will call the corresponding callback functions
+    //  in the StateListener.
+    struct StateListener{
+        //  Called whenever the video source is initialized or reset.
+        //  This also includes when the video resolution is changed as we need to rebuild the video
+        //  source with the new resolution.
+        virtual void post_startup(VideoSource* source){}
+
+        //  Sent before the video source resets or shuts down. Listeners should drop their
+        //  references to the internal video source before returning.
+        //  This also includes when the video resolution is changed as we need to rebuild the video
+        //  source with the new resolution.
+        virtual void pre_shutdown(){}
+        //  Currently not called by VideoSession yet.
+        virtual void post_shutdown(){}
+        //  Currently not called by VideoSession yet.
+        virtual void pre_resolution_change(Resolution resolution){}
+        //  Currently not called by VideoSession yet.
+        virtual void post_resolution_change(Resolution resolution){}
+    };
+
+    //  Add a state listener for it to react to state changes in the VideoSession.
+    //  When a state change happens, VideoSession will call the corresponding callback functions
+    //  in the StateListener.
+    void add_state_listener(StateListener& listener);
+    //  Remove the state listener.
+    void remove_state_listener(StateListener& listener);
+
+    bool try_remove_state_listener(StateListener& listener);
+
+    //  Implements VideoFeed::add_frame_listener().
+    //  Add a VideoFrameListener for it to react to incoming frames in the video source.
+    //  Whenever the video source sends a frame, VideoSession will call the callback functions
+    //  in added listeners.
+    virtual void add_frame_listener(VideoFrameListener& listener) override;
+    //  Implements VideoFeed::remove_frame_listener().
+    //  Remove the frame listener.
+    virtual void remove_frame_listener(VideoFrameListener& listener) override;
+
+
+public:
+    bool try_shutdown() noexcept;
+    ~VideoSession();
+    //  Built from a VideoSourceOption.
+    //  VideoSourceOption manages the current VideoSourceDescriptor, which are the descriptors
+    //  to build a VideoSource.
+    //  VideoSession stores a reference of the passed in VideoSourceOption to manipulate the
+    //  option according to user selection.
+    VideoSession(Logger& logger, VideoSourceOption& option);
+
+    Logger& logger(){
+        return m_logger;
+    }
+
+    //  Current video source descriptor.
+    //  This function is thread-safe. It has a lock to prevent concurrent calls
+    //  of other VideoSession functions.
+    std::shared_ptr<const VideoSourceDescriptor> descriptor() const;
+
+    //  Warning, not thread-safe with any source changes.
+    VideoSource* current_source(){
+        return m_video_source.get();
+    }
+
+    //  Return current resolution.
+    //  This function is thread-safe. It has a lock to prevent concurrent calls
+    //  of other VideoSession functions.
+    void current_stream_format(
+        Resolution& resolution,
+        VideoFormat& format,
+        FramesPerSecond& fps
+    );
+    Resolution current_resolution();
+#if 0
+    VideoFormat current_format();
+    FramesPerSecond current_fps();
+#endif
+
+    //  Return supported formats.
+    //  This function is thread-safe. It has a lock to prevent concurrent calls
+    //  of other VideoSession functions.
+    VideoFormatSet supported_formats() const;
+
+    //  Implements VideoFeed::snapshot() to provide a snapshot from the current video stream.
+    //  It will wait for a latest snapshot, blocking the current thread to wait for it.
+    //  This function is thread-safe. It has a lock to prevent concurrent calls
+    //  of other VideoSession functions.
+    virtual VideoSnapshot snapshot_latest_blocking() override;
+    //  Implements VideoFeed::snapshot_recent_nonblocking() to provide a snapshot from the
+    //  current video stream.
+    //  It will use the most recent available frame, therefore non-blocking.
+    //  This function is thread-safe. It has a lock to prevent concurrent calls
+    //  of other VideoSession functions.
+    virtual VideoSnapshot snapshot_recent_nonblocking(WallClock min_time) override;
+
+    //  Implements VideoFeed::fps_source().
+    //  Returns the currently measured frames/second for the video source.
+    //  Use this for diagnostic purposes.
+    //  This function is thread-safe. It has a lock to prevent concurrent fps calls.
+    virtual double fps_source() const override;
+    //  Implements VideoFeed::fps_display().
+    //  Returns the currently measured frames/second for the video display thread.
+    //  Use this for diagnostic purposes.
+    //  This function is thread-safe. It has a lock to prevent concurrent fps calls.
+    virtual double fps_display() const override;
+
+
+public:
+    //  Get current video source option
+    void save(VideoSourceOption& option) const;
+
+    //  Set a new video source. This will close the old video source.
+    //  This equals to calling VideoSession::set_source(option.descriptor()).
+    //  Change of video source and resolution will be reflected on the internal
+    //  referenced video source option (aka the VideoSourceOption passed to the
+    //  VideoSession constructor).
+    //  The change is dispatched to the Qt main thread to execute.
+    void load(const VideoSourceOption& option);
+
+    //  Implements VideoFeed::reset().
+    //  Reset the current video source. This equals to close the old video source
+    //  and reopen it.
+    //  This may also change the internal referenced video source option (aka the
+    //  VideoSourceOption passed to the VideoSession constructor).
+    //  The change is dispatched to the Qt main thread to execute.
+    virtual void reset() override;
+
+    //  Set a new video source. This will close the old video source.
+    //  Change of video source and resolution will be reflected on the internal
+    //  referenced video source option (aka the VideoSourceOption passed to the
+    //  VideoSession constructor).
+    //  The change is dispatched to the Qt main thread to execute.
+    void set_source(
+        const std::shared_ptr<VideoSourceDescriptor>& device,
+        Resolution resolution = {},
+        VideoFormat format = VideoFormat::OTHER,
+        size_t fps = 0
+    );
+
+    //  Change video resolution.
+    //  This will trigger a video source reset.
+    //  Change of resolution will be reflected on the internal referenced video
+    //  source option (aka the VideoSourceOption passed to the VideoSession
+    //  constructor).
+    //  The change is dispatched to the Qt main thread to execute.
+    void set_resolution(Resolution resolution);
+
+    //  Change video format.
+    //  This will trigger a video source reset.
+    //  Change of format will be reflected on the internal referenced video
+    //  source option (aka the VideoSourceOption passed to the VideoSession
+    //  constructor).
+    //  The change is dispatched to the Qt main thread to execute.
+    void set_format(VideoFormat format, size_t fps);
+
+
+private:
+    virtual void on_watchdog_timeout() override;
+
+    //  Overwrites VideoFrameListener::on_frame()
+    //  When this function is called, the VideoSession will update its internal fps record
+    //  and call frame listeners added by VideoSession::add_frame_listener().
+    //  This function is thread-safe as it has a lock to prevent concurrent fps calls.
+    //  Note the lock does not protect the other frame listeners added by
+    //  VideoSession::add_frame_listener().
+    virtual void on_frame(std::shared_ptr<const VideoFrame> frame) override;
+    //  Overwrites VideoSource::RenderedFrameListener::on_rendered_frame()
+    //  This function is called when the video source finds a new rendered frame so
+    //  VideoSession can update its internal fps record.
+    //  This function is thread-safe as it has a lock to prevent concurrent fps calls.
+    virtual void on_rendered_frame(WallClock timestamp) override;
+
+
+private:
+    enum CommandType{
+        RESET,
+        SET_SOURCE,
+        SET_RESOLUTION,
+        SET_FORMAT,
+    };
+    struct Command{
+        CommandType command_type;
+        std::shared_ptr<VideoSourceDescriptor> device;
+        Resolution resolution;
+        VideoFormat format;
+        size_t fps;
+    };
+    void run_commands();
+
+    void internal_reset();
+    void internal_set_source(
+        const std::shared_ptr<VideoSourceDescriptor>& device,
+        Resolution resolution,
+        VideoFormat format,
+        FramesPerSecond fps
+    );
+    void internal_set_resolution(Resolution resolution);
+    void internal_set_format(VideoFormat format, FramesPerSecond fps);
+
+
+private:
+    mutable SpinLock m_reset_lock;
+    mutable SpinLock m_state_lock;
+//    bool m_shutting_down = false;
+
+    Logger& m_logger;
+    VideoSourceOption& m_option;
+
+    mutable SpinLock m_fps_lock;
+    EventRateTracker m_fps_tracker_source;
+    EventRateTracker m_fps_tracker_rendered;
+
+    std::shared_ptr<const VideoSourceDescriptor> m_descriptor;
+    std::unique_ptr<VideoSource> m_video_source;
+
+    //  We need to queue up all reset commands and run them on the main thread.
+    //  This is needed to prevent re-entrant calls from event processing.
+    SpinLock m_queue_lock;
+    std::deque<Command> m_queued_commands;
+
+    ListenerSet<StateListener> m_state_listeners;
+    ListenerSet<VideoFrameListener> m_frame_listeners;
+
+    LifetimeSanitizer m_sanitizer;
+};
+
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoSource.cpp b/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoSource.cpp
new file mode 100644
index 0000000000..7e56a913d1
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoSource.cpp
@@ -0,0 +1,49 @@
+/*  Video Source
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "VideoSource.h"
+
+namespace PokemonAutomation{
+
+
+
+VideoSource::VideoSource(Logger& m_logger, bool allow_watchdog_reset)
+    : m_logger(m_logger)
+    , m_allow_watchdog_reset(allow_watchdog_reset)
+    , m_stats_report_source_frame(
+        "VideoSource::report_source_frame()",
+        "ms", 1000,
+        std::chrono::seconds(60), 1000
+    )
+    , m_stats_report_rendered_frame(
+        "VideoSource::report_rendered_frame()",
+        "ms", 1000,
+        std::chrono::seconds(60), 1000
+    )
+    , m_sanitizer("VideoSource")
+{}
+
+
+void VideoSource::report_source_frame(std::shared_ptr<const VideoFrame> frame){
+    auto scope_check = m_sanitizer.check_scope();
+    WallClock time0 = current_time();
+    m_source_frame_listeners.run_method(&VideoFrameListener::on_frame, frame);
+    WallClock time1 = current_time();
+    auto microseconds = (uint32_t)std::chrono::duration_cast<std::chrono::microseconds>(time1 - time0).count();
+    m_stats_report_source_frame.report_data(m_logger, microseconds);
+}
+void VideoSource::report_rendered_frame(WallClock timestamp){
+    auto scope_check = m_sanitizer.check_scope();
+    WallClock time0 = current_time();
+    m_rendered_frame_listeners.run_method(&RenderedFrameListener::on_rendered_frame, timestamp);
+    WallClock time1 = current_time();
+    auto microseconds = (uint32_t)std::chrono::duration_cast<std::chrono::microseconds>(time1 - time0).count();
+    m_stats_report_rendered_frame.report_data(m_logger, microseconds);
+}
+
+
+
+}
diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoSource.h b/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoSource.h
new file mode 100644
index 0000000000..503252e5bd
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoSource.h
@@ -0,0 +1,105 @@
+/*  Video Source
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_VideoPipeline_VideoSource_H
+#define PokemonAutomation_VideoPipeline_VideoSource_H
+
+#include <set>
+#include <map>
+#include "Common/Cpp/LifetimeSanitizer.h"
+#include "Common/Cpp/ImageResolution.h"
+#include "Common/Cpp/ListenerSet.h"
+#include "CommonFramework/VideoPipeline/VideoFormats.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonFramework/Tools/StatAccumulator.h"
+
+class QWidget;
+
+namespace PokemonAutomation{
+
+//enum class VideoFormat;
+
+using VideoFormatSet = std::map<
+    Resolution,
+    std::map<VideoFormat, std::set<size_t, std::greater<size_t>>>
+>;
+
+
+class VideoSource{
+public:
+    struct RenderedFrameListener{
+        virtual void on_rendered_frame(WallClock timestamp) = 0;
+    };
+
+    void add_source_frame_listener(VideoFrameListener& listener){
+        auto scope_check = m_sanitizer.check_scope();
+        m_source_frame_listeners.add(listener);
+    }
+    void remove_source_frame_listener(VideoFrameListener& listener){
+        auto scope_check = m_sanitizer.check_scope();
+        m_source_frame_listeners.remove(listener);
+    }
+    void add_rendered_frame_listener(RenderedFrameListener& listener){
+        auto scope_check = m_sanitizer.check_scope();
+        m_rendered_frame_listeners.add(listener);
+    }
+    void remove_rendered_frame_listener(RenderedFrameListener& listener){
+        auto scope_check = m_sanitizer.check_scope();
+        m_rendered_frame_listeners.remove(listener);
+    }
+
+
+public:
+    VideoSource(Logger& m_logger, bool allow_watchdog_reset);
+    virtual ~VideoSource() = default;
+
+
+public:
+    bool allow_watchdog_reset() const{
+        return m_allow_watchdog_reset;
+    }
+
+    virtual Resolution current_resolution() const = 0;
+    virtual VideoFormat current_format() const = 0;
+    virtual FramesPerSecond current_fps() const = 0;
+    virtual const VideoFormatSet& supported_formats() const = 0;
+
+    virtual VideoSnapshot snapshot_latest_blocking() = 0;
+    virtual VideoSnapshot snapshot_recent_nonblocking(WallClock min_time) = 0;
+
+
+protected:
+    //  These are not thread-safe.
+
+    void report_source_frame(std::shared_ptr<const VideoFrame> frame);
+
+    // Called by UI to report a frame is rendered
+    void report_rendered_frame(WallClock timestamp);
+
+
+public:
+    virtual QWidget* make_display_QtWidget(QWidget* parent) = 0;
+
+
+private:
+    Logger& m_logger;
+
+    ListenerSet<VideoFrameListener> m_source_frame_listeners;
+    ListenerSet<RenderedFrameListener> m_rendered_frame_listeners;
+
+    const bool m_allow_watchdog_reset;
+
+    PeriodicStatsReporterI32 m_stats_report_source_frame;
+    PeriodicStatsReporterI32 m_stats_report_rendered_frame;
+
+    LifetimeSanitizer m_sanitizer;
+};
+
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoSourceDescriptor.h b/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoSourceDescriptor.h
new file mode 100644
index 0000000000..24db4ea985
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoSourceDescriptor.h
@@ -0,0 +1,76 @@
+/*  Video Source Descriptor
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_VideoPipeline_VideoSourceDescriptor_H
+#define PokemonAutomation_VideoPipeline_VideoSourceDescriptor_H
+
+#include <memory>
+#include "Common/Cpp/ImageResolution.h"
+#include "Common/Cpp/Json/JsonValue.h"
+#include "VideoFormats.h"
+
+namespace PokemonAutomation{
+
+class VideoSource;
+
+
+
+enum class VideoSourceType{
+    None,
+    StillImage,
+    VideoPlayback,
+    Camera,
+};
+
+
+
+//  - Describe basic attributes of a video source. The source can be webcam or
+//    the capture card that streams a Switch console.
+//  - Can load and save the attributes to JSON.
+//  - Can call make_VideoSource() to create a VideoSource object that manages
+//    the video source and can create UI widget to display it.
+//  - After user selects a new video source on the UI, call run_post_select()
+//    to do some optional additional stuff after the user's selection, e.g.
+//    open a file selection dialog box to continue user interaction.
+class VideoSourceDescriptor{
+public:
+    const VideoSourceType type;
+
+public:
+    VideoSourceDescriptor(VideoSourceType p_type)
+        : type(p_type)
+    {}
+    virtual ~VideoSourceDescriptor() = default;
+
+public:
+    virtual bool should_reload() const{ return false; }
+    virtual bool operator==(const VideoSourceDescriptor& x) const = 0;
+    virtual std::string display_name() const = 0;
+
+public:
+    //  After user selects a new video source on the UI, call this function to
+    //  do some optional additional stuff, e.g. open a file selection dialog
+    //  box to continue user interaction.
+    virtual void run_post_select(){};
+    virtual JsonValue to_json() const = 0;
+    virtual void load_json(const JsonValue& json) = 0;
+
+public:
+    virtual std::unique_ptr<VideoSource> make_VideoSource(
+        Logger& logger,
+        Resolution resolution,
+        VideoFormat format,
+        FramesPerSecond fps
+    ) const = 0;
+};
+
+
+
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoSourceOption.cpp b/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoSourceOption.cpp
new file mode 100644
index 0000000000..6c11a5daca
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoSourceOption.cpp
@@ -0,0 +1,180 @@
+/*  Video Source Descriptor
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/EnumStringMap.h"
+#include "Common/Cpp/Json/JsonValue.h"
+#include "Common/Cpp/Json/JsonArray.h"
+#include "Common/Cpp/Json/JsonObject.h"
+
+#include "Sources/VideoSource_Null.h"
+#include "Sources/VideoSource_StillImage.h"
+#include "Sources/VideoSource_Camera.h"
+
+#include "VideoSourceOption.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+
+
+const EnumStringMap<VideoSourceType> VIDEO_TYPE_STRINGS{
+    {VideoSourceType::None,             "None"},
+    {VideoSourceType::StillImage,       "Still Image"},
+    {VideoSourceType::VideoPlayback,    "Video Playback"},
+    {VideoSourceType::Camera,           "Camera"},
+};
+
+
+VideoSourceOption::VideoSourceOption()
+    : m_resolution(1920, 1080)
+    , m_format(VideoFormat::OTHER)
+    , m_fps(0)
+    , m_descriptor(new VideoSourceDescriptor_Null())
+{}
+
+void VideoSourceOption::set_descriptor(std::shared_ptr<VideoSourceDescriptor> descriptor){
+    m_descriptor_cache[descriptor->type] = descriptor;
+    m_descriptor = std::move(descriptor);
+}
+std::shared_ptr<VideoSourceDescriptor> VideoSourceOption::get_descriptor_from_cache(VideoSourceType type){
+    auto iter = m_descriptor_cache.find(type);
+    if (iter != m_descriptor_cache.end()){
+        return iter->second;
+    }
+    std::shared_ptr<VideoSourceDescriptor> descriptor;
+    switch (type){
+    case VideoSourceType::None:
+        descriptor.reset(new VideoSourceDescriptor_Null());
+        break;
+    case VideoSourceType::StillImage:
+        descriptor.reset(new VideoSourceDescriptor_StillImage());
+        break;
+    case VideoSourceType::Camera:
+        descriptor.reset(new VideoSourceDescriptor_Camera());
+        break;
+    default:;
+        descriptor.reset(new VideoSourceDescriptor_Null());
+    }
+    m_descriptor_cache[descriptor->type] = descriptor;
+    return descriptor;
+}
+
+
+
+void VideoSourceOption::load_json(const JsonValue& json){
+    std::shared_ptr<VideoSourceDescriptor> descriptor;
+    do{
+        if (json.is_null()){
+            break;
+        }
+
+        const JsonObject* obj = json.to_object();
+        if (obj == nullptr){
+            break;
+        }
+
+        const JsonArray* res = obj->get_array("Resolution");
+        if (res != nullptr && res->size() == 2){
+            do{
+                size_t width, height;
+                if (!(*res)[0].read_integer(width)){
+                    break;
+                }
+                if (!(*res)[1].read_integer(height)){
+                    break;
+                }
+                m_resolution = Resolution(width, height);
+//                cout << "VideoSourceOption::load_json(): " << this << " - " << width << " x " << height << endl;
+            }while (false);
+        }
+
+        const std::string* format = obj->get_string("Format");
+        if (format != nullptr){
+            const EnumEntry* entry = VideoFormat_database().find_slug(*format);
+            if (entry != nullptr){
+//                cout << "loading format: " << *format << endl;
+                m_format = (VideoFormat)entry->enum_value;
+            }
+        }
+
+        obj->read_integer(m_fps, "Fps");
+
+        const std::string* type = obj->get_string("SourceType");
+        if (type == nullptr){
+            break;
+        }
+
+#if 0
+        for (const auto& item : VIDEO_TYPE_STRINGS){
+            const JsonValue* params = obj->get_value(VIDEO_TYPE_STRINGS.get_string(item.first));
+            if (params == nullptr){
+                continue;
+            }
+            m_descriptor_cache[item.first] = item.second->make(*params);
+        }
+#endif
+
+        const JsonValue* params;
+        params = obj->get_value(VIDEO_TYPE_STRINGS.get_string(VideoSourceType::StillImage));
+        if (params != nullptr){
+            auto x = std::make_unique<VideoSourceDescriptor_StillImage>();
+            x->load_json(*params);
+            m_descriptor_cache[VideoSourceType::StillImage] = std::move(x);
+        }
+        params = obj->get_value(VIDEO_TYPE_STRINGS.get_string(VideoSourceType::VideoPlayback));
+        if (params != nullptr){
+//            m_descriptor_cache[VideoSourceType::VideoPlayback] =
+        }
+        params = obj->get_value(VIDEO_TYPE_STRINGS.get_string(VideoSourceType::Camera));
+        if (params != nullptr){
+            auto x = std::make_unique<VideoSourceDescriptor_Camera>();
+            x->load_json(*params);
+            m_descriptor_cache[VideoSourceType::Camera] = std::move(x);
+        }
+
+        auto iter = m_descriptor_cache.find(VIDEO_TYPE_STRINGS.get_enum(*type, VideoSourceType::None));
+        if (iter == m_descriptor_cache.end()){
+            break;
+        }
+
+        descriptor = iter->second;
+    }while (false);
+
+    if (descriptor == nullptr){
+        descriptor.reset(new VideoSourceDescriptor_Null());
+    }
+
+    m_descriptor = std::move(descriptor);
+}
+JsonValue VideoSourceOption::to_json() const{
+    if (!m_descriptor){
+        return JsonValue();
+    }
+    JsonObject obj;
+    {
+        JsonArray res;
+        res.push_back(m_resolution.width);
+        res.push_back(m_resolution.height);
+        obj["Resolution"] = std::move(res);
+    }
+    const EnumEntry* entry = VideoFormat_database().find(m_format);
+    if (entry){
+        obj["Format"] = entry->slug;
+    }
+    obj["Fps"] = m_fps;
+    obj["SourceType"] = VIDEO_TYPE_STRINGS.get_string(m_descriptor->type);
+
+    for (const auto& item : m_descriptor_cache){
+        obj[VIDEO_TYPE_STRINGS.get_string(item.first)] = item.second->to_json();
+    }
+
+    return obj;
+}
+
+
+}
diff --git a/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoSourceOption.h b/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoSourceOption.h
new file mode 100644
index 0000000000..c2859a8bc9
--- /dev/null
+++ b/SerialPrograms/Source/CommonFramework/VideoPipeline/VideoSourceOption.h
@@ -0,0 +1,55 @@
+/*  Video Source Option
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_VideoPipeline_VideoSourceOption_H
+#define PokemonAutomation_VideoPipeline_VideoSourceOption_H
+
+#include <map>
+#include "VideoSourceDescriptor.h"
+
+namespace PokemonAutomation{
+
+
+//  VideoSourceOption manages VideoSourceDescriptor so user can switch between different
+//  video sources. User can set new VideoSourceDescriptor to it. It also stores the current
+//  video resolution.
+//  It has a cache to store last used VideoSourceDescriptor for faster video source switch.
+//  It is used as the input to build a VideoSession.
+class VideoSourceOption{
+public:
+    VideoSourceOption();
+
+    std::shared_ptr<VideoSourceDescriptor> descriptor() const{
+        return m_descriptor;
+    }
+
+    //  Use a cache to help create a VideoSoruceDescriptor.
+    //  The cache remembers the last used descriptor for each interface type. That way when
+    //  the user switches back-and-forth between two interfaces, it will reload the previous
+    //  one and return faster.
+    //  If not found in cache, it will create a new one according to the type.
+    void set_descriptor(std::shared_ptr<VideoSourceDescriptor> descriptor);
+    std::shared_ptr<VideoSourceDescriptor> get_descriptor_from_cache(VideoSourceType type);
+
+
+public:
+    void load_json(const JsonValue& json);
+    JsonValue to_json() const;
+
+
+public:
+    Resolution m_resolution;
+    VideoFormat m_format;
+    FramesPerSecond m_fps;
+
+private:
+    std::shared_ptr<VideoSourceDescriptor> m_descriptor;
+    std::map<VideoSourceType, std::shared_ptr<VideoSourceDescriptor>> m_descriptor_cache;
+};
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/Windows/ButtonDiagram.cpp b/SerialPrograms/Source/CommonFramework/Windows/ButtonDiagram.cpp
index d9896c04df..f1b85c31e9 100644
--- a/SerialPrograms/Source/CommonFramework/Windows/ButtonDiagram.cpp
+++ b/SerialPrograms/Source/CommonFramework/Windows/ButtonDiagram.cpp
@@ -1,33 +1,65 @@
 /*  Button Diagram
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include <QCoreApplication>
-//#include <QFile>
-#include <QMessageBox>
-//#include <QGraphicsScene>
-//#include <QGraphicsView>
-//#include <QGraphicsPixmapItem>
-#include "CommonFramework/Globals.h"
+#include <QMenuBar>
+#include "CommonFramework/GlobalAutoPaths.h"
 #include "WindowTracker.h"
 #include "ButtonDiagram.h"
 
-#include <iostream>
-using std::cout;
-using std::endl;
+// #include <iostream>
+// using std::cout;
+// using std::endl;
 
 
 namespace PokemonAutomation{
 
+const char* NS1_PRO_CONTROLLER_MAPPING_PATH = "/NintendoSwitch/Layout-ProController.png";
+const char* NS1_JOYCON_VERTICAL_MAPPING_PATH = "/NintendoSwitch/Layout-JoyconVertical.png";
+const char* NS1_JOYCON_HORIZONTAL_MAPPING_PATH = "/NintendoSwitch/Layout-JoyconHorizontal.png";
 
-ButtonDiagram::ButtonDiagram(QWidget& parent)
-    : QMainWindow(&parent)
+const char* NS2_PRO_CONTROLLER_MAPPING_PATH = "/NintendoSwitch2/Layout-ProController.png";
+
+
+ButtonDiagram::ButtonDiagram(QWidget* parent)
+    : QMainWindow(parent)
 {
     setWindowTitle("Controller Keyboard Mapping");
 
-    m_image = QPixmap(QString::fromStdString(RESOURCE_PATH() + "/NintendoSwitch/ButtonLayout.jpg"));
+    QMenuBar* menu = menuBar();
+    QMenu* ns1_pro_controller = menu->addMenu("NS1: Pro Controller");
+    QMenu* ns1_joycon_vertical = menu->addMenu("NS1: Joycon (Vertical)");
+    QMenu* ns1_joycon_horizontal = menu->addMenu("NS1: Joycon (Horizontal)");
+    QMenu* ns2_pro_controller = menu->addMenu("NS2: Pro Controller");
+
+//    pro_controller->addAction("asdfadf");
+
+    connect(
+        ns1_pro_controller, &QMenu::aboutToShow,
+        this, [this](){
+            set_image(NS1_PRO_CONTROLLER_MAPPING_PATH);
+        }
+    );
+    connect(
+        ns1_joycon_vertical, &QMenu::aboutToShow,
+        this, [this](){
+            set_image(NS1_JOYCON_VERTICAL_MAPPING_PATH);
+        }
+    );
+    connect(
+        ns1_joycon_horizontal, &QMenu::aboutToShow,
+        this, [this](){
+            set_image(NS1_JOYCON_HORIZONTAL_MAPPING_PATH);
+        }
+    );
+    connect(
+        ns2_pro_controller, &QMenu::aboutToShow,
+        this, [this](){
+            set_image(NS2_PRO_CONTROLLER_MAPPING_PATH);
+        }
+    );
 
     m_image_label = new QLabel(this);
     setCentralWidget(m_image_label);
@@ -40,19 +72,27 @@ ButtonDiagram::ButtonDiagram(QWidget& parent)
 //    image_label->resize(800, 600);
 //    image_label->setFixedSize(800, 600);
 
-    resize(800, 600);
+    resize(800, 600 + menu->sizeHint().height());
+
+    set_image(NS2_PRO_CONTROLLER_MAPPING_PATH);
+
     add_window(*this);
 }
 ButtonDiagram::~ButtonDiagram(){
     remove_window(*this);
 }
 
+void ButtonDiagram::set_image(const std::string& resource_name){
+    const std::string image_path = RESOURCE_PATH() + resource_name;
+    m_image = QPixmap(QString::fromStdString(image_path));
+    ButtonDiagram::resizeEvent(nullptr);
+}
 void ButtonDiagram::resizeEvent(QResizeEvent*){
-//    cout << "asdf" << endl;
     int iw = m_image.width();
     int ih = m_image.height();
     int ww = m_image_label->width();
     int wh = m_image_label->height();
+//    cout << "ww = " << ww << ", wh = " << wh << endl;
 
     double scale_w = (double)ww / iw;
     double scale_h = (double)wh / ih;
diff --git a/SerialPrograms/Source/CommonFramework/Windows/ButtonDiagram.h b/SerialPrograms/Source/CommonFramework/Windows/ButtonDiagram.h
index 9add173ded..98537595ce 100644
--- a/SerialPrograms/Source/CommonFramework/Windows/ButtonDiagram.h
+++ b/SerialPrograms/Source/CommonFramework/Windows/ButtonDiagram.h
@@ -1,6 +1,6 @@
 /*  Button Diagram
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -9,12 +9,15 @@
 
 namespace PokemonAutomation{
 
+// The window that shows button mapping: which keyboard keys are mapped to which
+// Switch controller buttons.
 class ButtonDiagram : public QMainWindow{
 public:
-    ButtonDiagram(QWidget& parent);
+    ButtonDiagram(QWidget* parent = nullptr);
     ~ButtonDiagram();
 
 private:
+    void set_image(const std::string& resource_name);
     void resizeEvent(QResizeEvent*);
 
 private:
diff --git a/SerialPrograms/Source/CommonFramework/Windows/DpiScaler.cpp b/SerialPrograms/Source/CommonFramework/Windows/DpiScaler.cpp
index a9f851ad86..171e00177a 100644
--- a/SerialPrograms/Source/CommonFramework/Windows/DpiScaler.cpp
+++ b/SerialPrograms/Source/CommonFramework/Windows/DpiScaler.cpp
@@ -1,10 +1,9 @@
 /*  DPI Scaler
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include <QApplication>
 #include <QScreen>
 #include "DpiScaler.h"
 
@@ -34,7 +33,7 @@ int scale_dpi_height(int height){
 
 
 void scale_dpi_token(QString& str, int dpi){
-    int length = str.length();
+    size_t length = str.length();
     if (length < 3){
         return;
     }
@@ -44,7 +43,7 @@ void scale_dpi_token(QString& str, int dpi){
 
     //  Parse the integer in front.
     int64_t value = 0;
-    for (int c = 0; c < length - 2; c++){
+    for (size_t c = 0; c < length - 2; c++){
         QChar ch = str[c];
         if (!('0' <= ch && ch <= '9')){
             return;
diff --git a/SerialPrograms/Source/CommonFramework/Windows/DpiScaler.h b/SerialPrograms/Source/CommonFramework/Windows/DpiScaler.h
index 394b78274f..02e27acb0c 100644
--- a/SerialPrograms/Source/CommonFramework/Windows/DpiScaler.h
+++ b/SerialPrograms/Source/CommonFramework/Windows/DpiScaler.h
@@ -1,6 +1,6 @@
 /*  DPI Scaler
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/CommonFramework/Windows/MainWindow.cpp b/SerialPrograms/Source/CommonFramework/Windows/MainWindow.cpp
index 3ada3b402d..c592430897 100644
--- a/SerialPrograms/Source/CommonFramework/Windows/MainWindow.cpp
+++ b/SerialPrograms/Source/CommonFramework/Windows/MainWindow.cpp
@@ -1,30 +1,46 @@
 /*  Main Window UI
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include <QMenuBar>
+#include <algorithm>
+#include <utility>
 //#include <QStatusBar>
+#include <QMenuBar>
 #include <QHBoxLayout>
 #include <QVBoxLayout>
 #include <QGroupBox>
+#include <QCheckBox>
 #include <QLabel>
 #include <QPushButton>
 #include <QMessageBox>
+#include "Common/Cpp/ScopeExit.h"
+#include "Common/Cpp/Exceptions.h"
+#include "Common/Cpp/Logging/MultiOutputLogger.h"
+#include "Common/Cpp/Logging/GlobalLogger.h"
+#include "Common/Cpp/Filesystem/Filesystem.h"
+#include "Common/Cpp/CpuId/CpuId.h"
+#include "Common/Cpp/ColoredText.h"
+#include "Common/Qt/CollapsibleGroupBox.h"
+#include "Common/Qt/UiStateQtWidget.h"
+#include "PanelLists.h"
 #include "CommonFramework/Globals.h"
+#include "CommonFramework/GlobalAutoPaths.h"
 #include "CommonFramework/GlobalSettingsPanel.h"
-#include "CommonFramework/Logging/FileWindowLogger.h"
-#include "CommonFramework/NewVersionCheck.h"
-#include "PanelLists.h"
+#include "CommonFramework/Logging/LoggerWindow.h"
+#include "CommonFramework/Startup/NewVersionCheck.h"
+#include "CommonFramework/Options/ResolutionOption.h"
+#include "CommonFramework/Options/Environment/ThemeSelectorOption.h"
+#include "CommonFramework/Options/QtWidget/WallpaperWidget.h"
+#include "CommonFramework/Windows/DpiScaler.h"
 #include "WindowTracker.h"
 #include "ButtonDiagram.h"
 #include "MainWindow.h"
 
-
-#include <iostream>
-using std::cout;
-using std::endl;
+//#include <iostream>
+//using std::cout;
+//using std::endl;
 
 namespace PokemonAutomation{
 
@@ -33,13 +49,28 @@ MainWindow::MainWindow(QWidget* parent)
     : QMainWindow(parent)
     , m_current_panel_widget(nullptr)
 {
+    global_panel_holder() = this;
+
     if (objectName().isEmpty()){
         setObjectName(QString::fromUtf8("MainWindow"));
     }
     this->setWindowIcon(QIcon(QString::fromStdString(RESOURCE_PATH() + "icon.png")));
 //    QSize window_size = PERSISTENT_SETTINGS().window_size;
-    resize(GlobalSettings::instance().WINDOW_SIZE.WIDTH, GlobalSettings::instance().WINDOW_SIZE.HEIGHT);
-    centralwidget = new QWidget(this);
+    resize(
+        GlobalSettings::instance().WINDOW_SIZE->WIDTH,
+        GlobalSettings::instance().WINDOW_SIZE->HEIGHT
+    );
+    // move main window to desired position on startup
+    // auto const screen_geometry = QGuiApplication::primaryScreen()->availableGeometry();
+    // uint32_t const screen_width = (uint32_t)screen_geometry.width();
+    // uint32_t const screen_height = (uint32_t)screen_geometry.height();
+    int32_t x_pos_main = GlobalSettings::instance().WINDOW_SIZE->X_POS;
+    int32_t y_pos_main = GlobalSettings::instance().WINDOW_SIZE->Y_POS;
+    int32_t move_x_main = move_x_within_screen_bounds(x_pos_main);
+    int32_t move_y_main = move_y_within_screen_bounds(y_pos_main);
+    move(move_x_main, move_y_main);
+
+    centralwidget = new WallpaperWidget(this);
     centralwidget->setObjectName(QString::fromUtf8("centralwidget"));
     setCentralWidget(centralwidget);
     menubar = new QMenuBar(this);
@@ -48,48 +79,90 @@ MainWindow::MainWindow(QWidget* parent)
 //    statusbar = new QStatusBar(this);
 //    statusbar->setObjectName(QString::fromUtf8("statusbar"));
 //    setStatusBar(statusbar);
-    setWindowTitle(QString::fromStdString(PROGRAM_NAME + " Computer-Control Programs (" + PROGRAM_VERSION + ")"));
+    std::string title = PROGRAM_NAME + " Computer-Control Programs (" + PROGRAM_VERSION + ")";
+#if defined(__APPLE__)
+    if (!Filesystem::STARTUP_PROFILE().empty()){
+        setWindowTitle(QString::fromStdString(title + " [Profile: " + Filesystem::STARTUP_PROFILE() + "]"));
+    }else{
+        setWindowTitle(QString::fromStdString(title));
+    }
+#else
+    setWindowTitle(QString::fromStdString(title));
+#endif
 
     QHBoxLayout* hbox = new QHBoxLayout(centralwidget);
-
-    QVBoxLayout* left_layout = new QVBoxLayout();
-    hbox->addLayout(left_layout, 0);
-
-#if 0
-    QGroupBox* program_box = new QGroupBox("Program Select", centralwidget);
-    left_layout->addWidget(program_box, 1);
-    QVBoxLayout* program_layout = new QVBoxLayout(program_box);
-    program_layout->setAlignment(Qt::AlignTop);
-
-//    NoWheelComboBox* program_dropdown = new NoWheelComboBox(this);
-//    program_layout->addWidget(program_dropdown);
-
-    m_program_list = new ProgramTabs(*this, *this);
-    program_layout->addWidget(m_program_list);
-#else
-    m_program_list = new ProgramSelect(*this, *this);
+    CollapsibleGroupBox* sidebar = new CollapsibleGroupBox(
+        *centralwidget, "Program Select", true, Qt::Horizontal
+    );
+    hbox->addWidget(sidebar, 0);
+    QWidget* sidebar_body = new QWidget(sidebar);
+    sidebar_body->setObjectName(QString::fromUtf8("backgroundSidebarBody"));
+    sidebar->set_widget(sidebar_body);
+    QVBoxLayout* left_layout = new QVBoxLayout(sidebar_body);
+    left_layout->setContentsMargins(0, 0, 0, 0);
+
+    m_program_list = new ProgramSelect(*sidebar_body, *this);
+    m_program_list->setObjectName(QStringLiteral("backgroundProgramSelect"));
+    m_program_list->setAttribute(Qt::WA_StyledBackground, true);
+    m_program_list->setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Preferred);
     left_layout->addWidget(m_program_list, 1);
-#endif
 
 
     QGroupBox* support_box = new QGroupBox(
         QString::fromStdString(PROGRAM_NAME + " " + PROGRAM_VERSION + " (" + PA_ARCH_STRING + ")"),
         centralwidget
     );
+    support_box->setObjectName(QString::fromUtf8("backgroundSupportBox"));
+
+
     left_layout->addWidget(support_box);
     QVBoxLayout* support_layout = new QVBoxLayout(support_box);
 
+    {
+        QHBoxLayout* layout = new QHBoxLayout();
+        support_layout->addLayout(layout);
+        layout->setAlignment(Qt::AlignHCenter);
+        layout->setContentsMargins(0, 0, 0, 0);
+        m_sleep_text = new QLabel(support_box);
+        layout->addWidget(m_sleep_text, 2);
+        m_sleep_box = new QCheckBox("Force On", support_box);
+        layout->addWidget(m_sleep_box, 1, Qt::AlignHCenter);
+        MainWindow::sleep_suppress_state_changed(SystemSleepController::instance().current_state());
+#if QT_VERSION < 0x060700
+        connect(
+            m_sleep_box, &QCheckBox::stateChanged,
+            this, [this](int){
+                if (m_sleep_box->isChecked()){
+                    m_sleep_scope.reset(new SleepSuppressScope(SleepSuppress::SCREEN_ON));
+                }else{
+                    m_sleep_scope.reset();
+                }
+            }
+        );
+#else
+        connect(
+            m_sleep_box, &QCheckBox::checkStateChanged,
+            this, [this](Qt::CheckState state){
+                if (state == Qt::CheckState::Checked){
+                    m_sleep_scope.reset(new SleepSuppressScope(SleepSuppress::SCREEN_ON));
+                }else{
+                    m_sleep_scope.reset();
+                }
+            }
+        );
+#endif
+    }
+
     QHBoxLayout* support = new QHBoxLayout();
     support_layout->addLayout(support);
 //    support->setContentsMargins(0, 0, 0, 0);
 
     QVBoxLayout* links = new QVBoxLayout();
     support->addLayout(links);
-
     {
         QLabel* github = new QLabel(support_box);
         links->addWidget(github);
-        github->setText(QString::fromStdString(make_text_url(ONLINE_DOC_URL + "ComputerControl/", "Online Documentation")));
+        github->setText(QString::fromStdString(make_text_url(ONLINE_DOC_URL_BASE + "", "Online Documentation")));
         github->setTextFormat(Qt::RichText);
         github->setTextInteractionFlags(Qt::TextBrowserInteraction);
         github->setOpenExternalLinks(true);
@@ -97,7 +170,7 @@ MainWindow::MainWindow(QWidget* parent)
     {
         QLabel* discord = new QLabel(support_box);
         links->addWidget(discord);
-        discord->setText(QString::fromStdString(make_text_url(DISCORD_LINK_URL, DISCORD_LINK)));
+        discord->setText(QString::fromStdString(make_text_url(DISCORD_LINK_URL_PROGRAM, DISCORD_LINK_TEXT)));
         discord->setTextFormat(Qt::RichText);
         discord->setTextInteractionFlags(Qt::TextBrowserInteraction);
         discord->setOpenExternalLinks(true);
@@ -105,7 +178,7 @@ MainWindow::MainWindow(QWidget* parent)
     {
         QLabel* github = new QLabel(support_box);
         links->addWidget(github);
-        github->setText(QString::fromStdString(make_text_url(PROJECT_GITHUB_URL, PROJECT_GITHUB)));
+        github->setText(QString::fromStdString(make_text_url(GITHUB_LINK_URL, GITHUB_LINK_TEXT)));
 //        github->setText("<a href=\"" + GITHUB_REPO + "\">GitHub Repository</a>");
         github->setTextFormat(Qt::RichText);
         github->setTextInteractionFlags(Qt::TextBrowserInteraction);
@@ -114,64 +187,90 @@ MainWindow::MainWindow(QWidget* parent)
     {
         QLabel* about = new QLabel(support_box);
         links->addWidget(about);
-        about->setText(QString::fromStdString(make_text_url(PROJECT_GITHUB_URL, "About this Program")));
+        about->setText(QString::fromStdString(make_text_url(GITHUB_LINK_URL, "About this Program")));
         about->setTextFormat(Qt::RichText);
         connect(
             about, &QLabel::linkActivated,
             this, [](const QString&){
+                std::string str;
+                str += PROGRAM_NAME + " Computer-Control Programs<br>";
+                str += "Copyright: 2020 - 2027<br>";
+                str += "Version: " + PROGRAM_VERSION + "<br>";
+                str += "<br>";
+                str += "Framework: Qt " + std::to_string(QT_VERSION_MAJOR);
+                str += "." + std::to_string(QT_VERSION_MINOR);
+                str += "." + std::to_string(QT_VERSION_PATCH);
+                str += "<br>";
+                str += "Compiler: " + COMPILER_VERSION;
+                str += "<br><br>";
+                str += "Made by the " + PROGRAM_NAME + " Discord Server.<br>";
+                str += "<br>";
+                str += "This program uses Qt and dynamically links to unmodified Qt libraries under LGPL.<br>";
+
                 QMessageBox box;
-                box.information(
-                    nullptr,
-                    "About",
-                    QString::fromStdString(
-                        PROGRAM_NAME + " Computer-Control Programs (" + PROGRAM_VERSION + ")<br>" +
-                        "Copyright: 2020 - 2022<br>" +
-                        "<br>"
-                        "Made by the " + PROGRAM_NAME + " Discord Server.<br>"
-                        "<br>"
-                        "This program uses Qt and dynamically links to unmodified Qt libraries under LGPL.<br>"
-                    )
-                );
+                box.information(nullptr, "About", QString::fromStdString(str));
             }
         );
     }
 
     QVBoxLayout* buttons = new QVBoxLayout();
     support->addLayout(buttons);
+    {
+        QPushButton* keyboard = new QPushButton("Keyboard Layout", support_box);
+        buttons->addWidget(keyboard);
+        m_button_diagram.reset(new ButtonDiagram());
+        connect(
+            keyboard, &QPushButton::clicked,
+            this, [button = m_button_diagram.get()](bool){
+                button->show();
+                button->raise(); // bring the window to front on macOS
+                button->activateWindow(); // bring the window to front on Windows
+            }
+        );
+    }
+    {
+        m_output_window.reset(new LoggerWindow(nullptr));
+        global_multi_logger().add_listener(*m_output_window);
 
-    QPushButton* keyboard = new QPushButton("Keyboard Layout", support_box);
-    buttons->addWidget(keyboard);
-    QMainWindow* keyboard_window = new ButtonDiagram(*support_box);
-    connect(
-        keyboard, &QPushButton::clicked,
-        this, [keyboard_window](bool){
-            keyboard_window->show();
-        }
-    );
+        QPushButton* output = new QPushButton("Output Window", support_box);
+        buttons->addWidget(output);
+        connect(
+            output, &QPushButton::clicked,
+            this, [&](bool){
+                m_output_window->show();
+                m_output_window->raise(); // bring the window to front on macOS
+                m_output_window->activateWindow(); // bring the window to front on Windows
+            }
+        );
+        // get snapshot of the saved initial x/y position, since activating the window seems to change the window coordinates, 
+        // which then causes initial x/y position to change, due to triggering moveEvent().
+        int32_t x_pos_log = GlobalSettings::instance().LOG_WINDOW_SIZE->X_POS;
+        int32_t y_pos_log = GlobalSettings::instance().LOG_WINDOW_SIZE->Y_POS;    
 
-    m_output_window.reset(new FileWindowLoggerWindow((FileWindowLogger&)global_logger_raw()));
-    QPushButton* output = new QPushButton("Output Window", support_box);
-    buttons->addWidget(output);
-    connect(
-        output, &QPushButton::clicked,
-        this, [this](bool){
+        if (GlobalSettings::instance().LOG_WINDOW_STARTUP){ // show the Output Window on startup
             m_output_window->show();
             m_output_window->raise(); // bring the window to front on macOS
             m_output_window->activateWindow(); // bring the window to front on Windows
         }
-    );
 
-    QPushButton* settings = new QPushButton("Settings", support_box);
-    m_settings = settings;
-    buttons->addWidget(settings);
-    connect(
-        settings, &QPushButton::clicked,
-        this, [this](bool){
-            if (report_new_panel_intent(GlobalSettings_Descriptor::INSTANCE)){
-                load_panel(nullptr, GlobalSettings_Descriptor::INSTANCE.make_panel());
+        // move the output window to desired position on startup
+        int32_t move_x_log = move_x_within_screen_bounds(x_pos_log);
+        int32_t move_y_log = move_y_within_screen_bounds(y_pos_log);
+        m_output_window->move(move_x_log, move_y_log);
+    }
+    {
+        QPushButton* settings = new QPushButton("Settings", support_box);
+        m_settings = settings;
+        buttons->addWidget(settings);
+        connect(
+            settings, &QPushButton::clicked,
+            this, [this](bool){
+                if (report_new_panel_intent(GlobalSettings_Descriptor::instance())){
+                    load_panel(nullptr, GlobalSettings_Descriptor::instance().make_panel());
+                }
             }
-        }
-    );
+        );
+    }
 
     QVBoxLayout* right = new QVBoxLayout();
     m_right_panel_layout = right;
@@ -181,14 +280,44 @@ MainWindow::MainWindow(QWidget* parent)
     // Load the program panel specified in the persistent setting.
     m_program_list->load_persistent_panel();
 
-    GlobalSettings::instance().WINDOW_SIZE.WIDTH.add_listener(*this);
-    GlobalSettings::instance().WINDOW_SIZE.HEIGHT.add_listener(*this);
+    GlobalSettings::instance().WINDOW_SIZE->WIDTH.add_listener(*this);
+    GlobalSettings::instance().WINDOW_SIZE->HEIGHT.add_listener(*this);
+    GlobalSettings::instance().WINDOW_SIZE->X_POS.add_listener(*this);
+    GlobalSettings::instance().WINDOW_SIZE->Y_POS.add_listener(*this);    
+    GlobalSettings::instance().THEME->add_listener(*this);
+    GlobalSettings::instance().WALLPAPER.add_listener(*this);
+    SystemSleepController::instance().add_listener(*this);
+    update_wallpaper();
 //    cout << "Done constructing" << endl;
 }
 MainWindow::~MainWindow(){
     close_panel();
-    GlobalSettings::instance().WINDOW_SIZE.WIDTH.remove_listener(*this);
-    GlobalSettings::instance().WINDOW_SIZE.HEIGHT.remove_listener(*this);
+    SystemSleepController::instance().remove_listener(*this);
+    GlobalSettings::instance().WINDOW_SIZE->WIDTH.remove_listener(*this);
+    GlobalSettings::instance().WINDOW_SIZE->HEIGHT.remove_listener(*this);
+    GlobalSettings::instance().WINDOW_SIZE->X_POS.remove_listener(*this);
+    GlobalSettings::instance().WINDOW_SIZE->Y_POS.remove_listener(*this);
+    GlobalSettings::instance().THEME->remove_listener(*this);
+    GlobalSettings::instance().WALLPAPER.remove_listener(*this);
+    if (m_output_window){
+        global_multi_logger().remove_listener(*m_output_window);
+    }
+}
+
+int32_t move_x_within_screen_bounds(int32_t x_pos){
+    auto static const screen_geometry = QGuiApplication::primaryScreen()->availableGeometry();
+    uint32_t static const screen_width = (uint32_t)screen_geometry.width();    
+     // ensure move_x is greater than 0, but less than screen_width
+    return scale_dpi_width(std::max(0, std::min(x_pos, (int32_t)(screen_width*0.97))));
+
+}
+
+int32_t move_y_within_screen_bounds(int32_t y_pos){
+    auto static const screen_geometry = QGuiApplication::primaryScreen()->availableGeometry();
+    uint32_t const screen_height = (uint32_t)screen_geometry.height();  
+    // ensure move_y is greater than 0, but less than screen_height
+    return scale_dpi_width(std::max(0, std::min(y_pos, (int32_t)(screen_height*0.97))));
+
 }
 
 
@@ -198,31 +327,42 @@ void MainWindow::closeEvent(QCloseEvent* event){
 }
 void MainWindow::resizeEvent(QResizeEvent* event){
     m_pending_resize = true;
-    GlobalSettings::instance().WINDOW_SIZE.WIDTH.set(width());
-    GlobalSettings::instance().WINDOW_SIZE.HEIGHT.set(height());
+    GlobalSettings::instance().WINDOW_SIZE->WIDTH.set(width());
+    GlobalSettings::instance().WINDOW_SIZE->HEIGHT.set(height());
     m_pending_resize = false;
 }
 
-void MainWindow::close_panel(){
+void MainWindow::moveEvent(QMoveEvent* event){
+    m_pending_move = true;
+    GlobalSettings::instance().WINDOW_SIZE->X_POS.set(x());
+    GlobalSettings::instance().WINDOW_SIZE->Y_POS.set(y());
+    m_pending_move = false;
+}
+
+void MainWindow::close_panel() noexcept{
+//    cout << "close_panel(): enter: " << m_current_panel_widget << endl;
     //  Must destroy the widget first since it references the instance.
     if (m_current_panel_widget != nullptr){
+        //  Possible optimization. Hide it so Qt doesn't need to recalculate
+        //  all the layouts.
+        m_current_panel_widget->hide();
+
         m_right_panel_layout->removeWidget(m_current_panel_widget);
-        delete m_current_panel_widget;
+        QWidget* widget = m_current_panel_widget;
         m_current_panel_widget = nullptr;
+        delete widget;
     }
 
+//    cout << "close_panel(): mid: " << m_current_panel_widget << endl;
+
     //  Now it's safe to destroy the instance.
     if (m_current_panel == nullptr){
         return;
     }
 
-    m_current_panel->save_settings();
-#if 0
-    const std::string& identifier = m_current_panel->descriptor().identifier();
-    if (!identifier.empty()){
-        PERSISTENT_SETTINGS().panels[QString::fromStdString(identifier)] = m_current_panel->to_json();
-    }
-#endif
+    try{
+        m_current_panel->save_settings();
+    }catch (...){}
 
     m_current_panel.reset();
     m_current_panel_descriptor.reset();
@@ -244,35 +384,162 @@ bool MainWindow::report_new_panel_intent(const PanelDescriptor& descriptor){
 }
 void MainWindow::load_panel(
     std::shared_ptr<const PanelDescriptor> descriptor,
-    std::unique_ptr<PanelInstance> panel
+    std::unique_ptr<PanelSession> panel
 ){
+    if (m_panel_transition){
+        global_logger_tagged().log(
+            "Ignoring attempted panel change while existing one is still in progress.",
+            COLOR_RED
+        );
+        return;
+    }
+
+    m_panel_transition = true;
+    ScopeExit cleanup([&]{
+        m_panel_transition = false;
+    });
     close_panel();
-    check_new_version();
 
     //  Make new widget.
-    m_current_panel_widget = panel->make_widget(*this, *this);
-    m_current_panel_descriptor = std::move(descriptor);
-    m_current_panel = std::move(panel);
-    m_right_panel_layout->addWidget(m_current_panel_widget);
+    try{
+        check_new_version();
+        m_current_panel_widget = &dynamic_cast<UiComponentQtWidget*>(
+            panel->make_ui_component(this).release()
+        )->widget();
+//        cout << "load_panel() = " << m_current_panel_widget << endl;
+        m_current_panel_descriptor = std::move(descriptor);
+        m_current_panel = std::move(panel);
+        m_right_panel_layout->addWidget(m_current_panel_widget);
+        return;
+    }catch (Exception& e){
+        e.log(global_logger_tagged());
+    }catch (std::exception& e){
+        global_logger_tagged().log(std::string("MainWindow::load_panel() - Exception: ") + e.what(), COLOR_RED);
+    }catch (...){
+        global_logger_tagged().log("MainWindow::load_panel() - Unknown Exception", COLOR_RED);
+    }
+    if (m_current_panel_widget != nullptr){
+        delete m_current_panel_widget;
+    }
 }
 void MainWindow::on_busy(){
     if (m_program_list){
-        m_program_list->setEnabled(false);
+        m_program_list->lock();
         m_settings->setEnabled(false);
     }
 }
 void MainWindow::on_idle(){
     if (m_program_list){
-        m_program_list->setEnabled(true);
+        m_program_list->unlock();
         m_settings->setEnabled(true);
     }
+    check_new_version();
+}
+
+
+void MainWindow::on_config_value_changed(void* object){
+    if (object == &GlobalSettings::instance().WINDOW_SIZE->WIDTH || object == &GlobalSettings::instance().WINDOW_SIZE->HEIGHT){
+        QMetaObject::invokeMethod(this, [this]{
+            if (!m_pending_resize){
+                resize(
+                    GlobalSettings::instance().WINDOW_SIZE->WIDTH,
+                    GlobalSettings::instance().WINDOW_SIZE->HEIGHT
+                );
+            }
+        });
+    }else if (object == &GlobalSettings::instance().WINDOW_SIZE->X_POS || object == &GlobalSettings::instance().WINDOW_SIZE->Y_POS){
+        QMetaObject::invokeMethod(this, [this]{
+            if (!m_pending_move){
+                move(
+                    move_x_within_screen_bounds(GlobalSettings::instance().WINDOW_SIZE->X_POS),
+                    move_y_within_screen_bounds(GlobalSettings::instance().WINDOW_SIZE->Y_POS)
+                );
+            }
+        });        
+    }else if (
+        object == &*GlobalSettings::instance().THEME ||
+        object == &GlobalSettings::instance().WALLPAPER
+    ){
+        update_wallpaper();
+    }
+}
+
+void MainWindow::changeEvent(QEvent* event){
+    QMainWindow::changeEvent(event);
+    if (event->type() == QEvent::PaletteChange || event->type() == QEvent::StyleChange){
+        update_wallpaper();
+    }
 }
 
+void MainWindow::update_wallpaper(){
+    GlobalSettings& settings = GlobalSettings::instance();
+    const QColor surface_color = palette().color(QPalette::Active, QPalette::Window);
+    centralwidget->set_appearance(
+        settings.WALLPAPER.IMAGE_FIT,
+        settings.WALLPAPER.IMAGE_OVERLAY,
+        surface_color
+    );
+    centralwidget->set_image(
+        settings.WALLPAPER.enabled(),
+        QString::fromStdString(static_cast<std::string>(settings.WALLPAPER.IMAGE_PATH))
+    );
+    const QString error = centralwidget->take_error();
+
+    if (!error.isEmpty()){
+        global_logger_tagged().log(
+            "Unable to load background image: " + error.toStdString(),
+            COLOR_RED
+        );
+    }
+
+    if (!centralwidget->active()){
+        if (!centralwidget->styleSheet().isEmpty()){
+            centralwidget->setStyleSheet(QString());
+        }
+        return;
+    }
+
+    const QString surface = QStringLiteral("rgba(%1, %2, %3, 215)")
+        .arg(surface_color.red()).arg(surface_color.green()).arg(surface_color.blue());
+    const QString stylesheet = QString::fromLatin1(
+        // Shared wallpaper surfaces: apply the same translucent theme color.
+        "QWidget#backgroundProgramSelect { background-color: %1; }"
+        "QGroupBox#backgroundSupportBox { background-color: %1; }"
+        "QWidget#backgroundProgramHeader { background-color: %1; }"
+        "QWidget#backgroundScrollContents { background-color: %1; }"
+
+        // Shared layout containers and viewports: reveal the wallpaper surfaces.
+        "QWidget#backgroundSidebarBody { background-color: transparent; }"
+        "QListWidget#backgroundProgramList { background-color: transparent; }"
+        "QWidget#backgroundProgramListViewport { background-color: transparent; }"
+        "QWidget#backgroundPanelRoot { background-color: transparent; }"
+        "QScrollArea#backgroundScrollArea { background-color: transparent; border: none; }"
+        "QWidget#backgroundScrollViewport { background-color: transparent; }"
+
+        // QDarkStyle compatibility: its global QWidget background makes these containers opaque.
+        "QLabel, QLabel:disabled { background-color: transparent; }"
+        "QGroupBox, QGroupBox:disabled { background-color: transparent; }"
+        "QWidget[backgroundContainer=\"true\"] { background-color: transparent; }"
+    ).arg(surface);
+    if (centralwidget->styleSheet() != stylesheet){
+        centralwidget->setStyleSheet(stylesheet);
+    }
+}
 
-void MainWindow::value_changed(){
-    QMetaObject::invokeMethod(this, [this]{
-        if (!m_pending_resize){
-            resize(GlobalSettings::instance().WINDOW_SIZE.WIDTH, GlobalSettings::instance().WINDOW_SIZE.HEIGHT);
+void MainWindow::sleep_suppress_state_changed(SleepSuppress new_state){
+    QMetaObject::invokeMethod(this, [=, this]{
+        switch (new_state){
+        case PokemonAutomation::SleepSuppress::NONE:
+            m_sleep_text->setText("Sleep Suppress: <font color=\"green\">None</font>");
+//            m_sleep_box->setEnabled();
+//            m_sleep_box->setCheckState(Qt::CheckState::Unchecked);
+            break;
+        case PokemonAutomation::SleepSuppress::NO_SLEEP:
+            m_sleep_text->setText("Sleep Suppress: <font color=\"orange\">No Sleep</font>");
+            break;
+        case PokemonAutomation::SleepSuppress::SCREEN_ON:
+            m_sleep_text->setText("Sleep Suppress: <font color=\"red\">Screen On</font>");
+            break;
         }
     });
 }
diff --git a/SerialPrograms/Source/CommonFramework/Windows/MainWindow.h b/SerialPrograms/Source/CommonFramework/Windows/MainWindow.h
index 53d0629ff8..8ee1a436a9 100644
--- a/SerialPrograms/Source/CommonFramework/Windows/MainWindow.h
+++ b/SerialPrograms/Source/CommonFramework/Windows/MainWindow.h
@@ -1,6 +1,6 @@
 /*  Main Window UI
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -9,42 +9,63 @@
 
 #include <QMainWindow>
 #include "Common/Cpp/Options/ConfigOption.h"
-#include "CommonFramework/Logging/Logger.h"
-#include "CommonFramework/Panels/PanelTools.h"
 #include "PanelLists.h"
+#include "CommonFramework/Environment/SystemSleep.h"
+#include "CommonFramework/Panels/PanelTools.h"
+#include "CommonFramework/Panels/PanelSession.h"
 
 class QVBoxLayout;
+class QLabel;
+class QCheckBox;
 
 namespace PokemonAutomation{
 
-class FileWindowLoggerWindow;
+class ButtonDiagram;
+class LoggerWindow;
+class WallpaperWidget;
 
 
-class MainWindow : public QMainWindow, public PanelHolder, public ConfigOption::Listener{
+class MainWindow
+    : public QMainWindow
+    , public PanelHolder
+    , public ConfigOption::Listener
+    , public SystemSleepController::Listener
+{
 public:
     MainWindow(QWidget* parent = nullptr);
     ~MainWindow();
 
+
 private:
+    virtual void changeEvent(QEvent* event) override;
     virtual void closeEvent(QCloseEvent* event) override;
     virtual void resizeEvent(QResizeEvent* event) override;
+    virtual void moveEvent(QMoveEvent* event) override;
 
-    void close_panel();
+    void close_panel() noexcept;
 
+    // implements PanelHolder::report_new_panel_intent()
     virtual bool report_new_panel_intent(const PanelDescriptor& descriptor) override;
+    // implements PanelHolder::load_panel()
     virtual void load_panel(
         std::shared_ptr<const PanelDescriptor> descriptor,
-        std::unique_ptr<PanelInstance> panel
+        std::unique_ptr<PanelSession> panel
     ) override;
-    virtual Logger& raw_logger() override{ return global_logger_raw(); }
 
 private:
+    // implements PanelHolder::on_busy()
+    // called when an automation program is running
     virtual void on_busy() override;
+    // implements PanelHolder::on_idle()
+    // called when no automation program is not running
     virtual void on_idle() override;
-    virtual void value_changed() override;
+    virtual void on_config_value_changed(void* object) override;
+    virtual void sleep_suppress_state_changed(SleepSuppress new_state) override;
+
+    void update_wallpaper();
 
 private:
-    QWidget* centralwidget;
+    WallpaperWidget* centralwidget = nullptr;
     QMenuBar* menubar;
 //    QStatusBar* statusbar;
 
@@ -57,15 +78,25 @@ class MainWindow : public QMainWindow, public PanelHolder, public ConfigOption::
     //  Keep a reference to the panel descriptor since it is referenced by the
     //  panel instance and the original descriptor may destroyed at any time.
     std::shared_ptr<const PanelDescriptor> m_current_panel_descriptor;
-    std::unique_ptr<PanelInstance> m_current_panel;
+    std::unique_ptr<PanelSession> m_current_panel;
     QWidget* m_current_panel_widget;
 
-    std::unique_ptr<FileWindowLoggerWindow> m_output_window;
+    std::unique_ptr<ButtonDiagram> m_button_diagram;
+    std::unique_ptr<LoggerWindow> m_output_window;
+
+    QLabel* m_sleep_text;
+    QCheckBox* m_sleep_box;
+    std::unique_ptr<SleepSuppressScope> m_sleep_scope;
 
     bool m_pending_resize = false;
+    bool m_pending_move = false;
+    bool m_panel_transition = false;
 };
 
-
+// returns given X value, but bounded by 0 and screen_width
+int32_t move_x_within_screen_bounds(int32_t x_pos);
+// returns given y value, but bounded by 0 and screen_height
+int32_t move_y_within_screen_bounds(int32_t y_pos);
 
 
 }
diff --git a/SerialPrograms/Source/CommonFramework/Windows/OutputWindow (disabled).cpp b/SerialPrograms/Source/CommonFramework/Windows/OutputWindow (disabled).cpp
index 218f7eb78d..e6ea78fa0f 100644
--- a/SerialPrograms/Source/CommonFramework/Windows/OutputWindow (disabled).cpp	
+++ b/SerialPrograms/Source/CommonFramework/Windows/OutputWindow (disabled).cpp	
@@ -1,18 +1,18 @@
 /*  Text Window for Output Logging
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
+#include "OutputWindow.h"
+//#include <QStatusBar>
 #include <QCoreApplication>
 #include <QMenuBar>
-//#include <QStatusBar>
 #include "CommonFramework/PersistentSettings.h"
-#include "OutputWindow.h"
 
-#include <iostream>
-using std::cout;
-using std::endl;
+//#include <iostream>
+//using std::cout;
+//using std::endl;
 
 namespace PokemonAutomation{
 
diff --git a/SerialPrograms/Source/CommonFramework/Windows/OutputWindow (disabled).h b/SerialPrograms/Source/CommonFramework/Windows/OutputWindow (disabled).h
index 3e9847af9c..bab5bdd91c 100644
--- a/SerialPrograms/Source/CommonFramework/Windows/OutputWindow (disabled).h	
+++ b/SerialPrograms/Source/CommonFramework/Windows/OutputWindow (disabled).h	
@@ -1,16 +1,16 @@
 /*  Text Window for Output Logging
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifndef PokemonAutomation_TextWindow_H
 #define PokemonAutomation_TextWindow_H
 
+#include "ClientSource/Libraries/Logging.h"
 #include <QFile>
 #include <QTextEdit>
 #include <QMainWindow>
-#include "ClientSource/Libraries/Logging.h"
 #include "CommonFramework/Logging/Logger.h"
 
 namespace PokemonAutomation{
diff --git a/SerialPrograms/Source/CommonFramework/Windows/WindowTracker.cpp b/SerialPrograms/Source/CommonFramework/Windows/WindowTracker.cpp
index f98fe3141e..bacbd465d6 100644
--- a/SerialPrograms/Source/CommonFramework/Windows/WindowTracker.cpp
+++ b/SerialPrograms/Source/CommonFramework/Windows/WindowTracker.cpp
@@ -1,12 +1,12 @@
 /*  WindowTracker.cpp
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include <set>
-#include <mutex>
 #include <QMainWindow>
+#include "Common/Cpp/Concurrency/Mutex.h"
 #include "WindowTracker.h"
 
 //#include <iostream>
@@ -17,22 +17,22 @@ namespace PokemonAutomation{
 
 
 
-std::mutex window_lock;
+Mutex window_lock;
 std::set<QMainWindow*> open_windows;
 
 void add_window(QMainWindow& window){
-    std::lock_guard<std::mutex> lock(window_lock);
+    std::lock_guard<Mutex> lock(window_lock);
     open_windows.insert(&window);
 }
 void remove_window(QMainWindow& window){
-    std::lock_guard<std::mutex> lock(window_lock);
+    std::lock_guard<Mutex> lock(window_lock);
     open_windows.erase(&window);
 }
 void close_all_windows(){
     while (true){
         QMainWindow* window = nullptr;
         {
-            std::lock_guard<std::mutex> lock(window_lock);
+            std::lock_guard<Mutex> lock(window_lock);
 //            cout << "open_windows.size() = " << open_windows.size() << endl;
             if (open_windows.empty()){
                 return;
diff --git a/SerialPrograms/Source/CommonFramework/Windows/WindowTracker.h b/SerialPrograms/Source/CommonFramework/Windows/WindowTracker.h
index 85d3a58e7d..0dcdd1c230 100644
--- a/SerialPrograms/Source/CommonFramework/Windows/WindowTracker.h
+++ b/SerialPrograms/Source/CommonFramework/Windows/WindowTracker.h
@@ -1,6 +1,6 @@
 /*  WindowTracker.h
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/CommonTools/Async/InferenceRoutines.cpp b/SerialPrograms/Source/CommonTools/Async/InferenceRoutines.cpp
new file mode 100644
index 0000000000..16864dae68
--- /dev/null
+++ b/SerialPrograms/Source/CommonTools/Async/InferenceRoutines.cpp
@@ -0,0 +1,208 @@
+/*  Visual Inference Routines
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Exceptions.h"
+#include "Common/Cpp/CancellableScope.h"
+#include "Common/Cpp/Concurrency/AsyncTask.h"
+#include "CommonFramework/Tools/ProgramEnvironment.h"
+#include "CommonFramework/Tools/GlobalThreadPools.h"
+#include "InferenceSession.h"
+#include "InferenceRoutines.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+
+
+
+class CancellableSetSession : public Cancellable::CancelListener{
+public:
+    CancellableSetSession(CancellableScope& scope, std::vector<Cancellable*> stoppers)
+        : m_scope(scope)
+        , m_subscope(scope)
+        , m_stoppers(std::move(stoppers))
+    {
+        for (Cancellable* stopper : m_stoppers){
+            stopper->add_cancel_listener(*this);
+        }
+    }
+    ~CancellableSetSession(){
+        detach();
+    }
+
+    virtual void on_cancellable_cancel(
+        Cancellable& cancellable,
+        std::exception_ptr reason
+    ) override{
+        m_subscope.cancel(std::move(reason));
+    }
+
+    int wait_until(WallClock deadline){
+        try{
+            m_subscope.wait_until(deadline);
+        }catch (OperationCancelledException&){}
+
+        m_subscope.throw_if_cancelled_with_exception();
+        m_scope.throw_if_cancelled();
+
+        for (size_t c = 0; c < m_stoppers.size(); c++){
+            if (m_stoppers[c]->cancelled()){
+                return (int)c;
+            }
+        }
+        return -1;
+    }
+    int run_until(std::function<void(CancellableScope& scope)>&& command){
+        try{
+            command(m_subscope);
+        }catch (OperationCancelledException&){}
+
+        m_subscope.throw_if_cancelled_with_exception();
+        m_scope.throw_if_cancelled();
+
+        for (size_t c = 0; c < m_stoppers.size(); c++){
+            if (m_stoppers[c]->cancelled()){
+                return (int)c;
+            }
+        }
+        return -1;
+    }
+
+private:
+    void detach() noexcept{
+        for (Cancellable* stopper : m_stoppers){
+            stopper->remove_cancel_listener(*this);
+        }
+    }
+
+private:
+    CancellableScope& m_scope;
+    CancellableHolder<CancellableScope> m_subscope;
+    std::vector<Cancellable*> m_stoppers;
+    std::atomic<size_t> m_triggered_index;
+};
+
+
+
+int wait_until(
+    CancellableScope& scope,
+    WallClock deadline,
+    std::vector<Cancellable*> stoppers
+){
+    CancellableSetSession session(scope, std::move(stoppers));
+    return session.wait_until(deadline);
+}
+int run_until(
+    CancellableScope& scope,
+    std::function<void(CancellableScope& scope)>&& command,
+    std::vector<Cancellable*> stoppers
+){
+    CancellableSetSession session(scope, std::move(stoppers));
+    return session.run_until(std::move(command));
+}
+
+
+
+
+
+
+
+
+int wait_until(
+    VideoStream& stream, CancellableScope& scope,
+    WallClock deadline,
+    const std::vector<PeriodicInferenceCallback>& callbacks,
+    std::chrono::milliseconds default_video_period,
+    std::chrono::milliseconds default_audio_period
+){
+    CancellableHolder<CancellableScope> subscope(scope);
+    InferenceSession session(
+        subscope, stream,
+        callbacks,
+        default_video_period, default_audio_period
+    );
+
+    try{
+        subscope.wait_until(deadline);
+    }catch (OperationCancelledException&){}
+
+    subscope.throw_if_cancelled_with_exception();
+    scope.throw_if_cancelled();
+
+    return session.triggered_index();
+}
+int run_until(
+    VideoStream& stream, CancellableScope& scope,
+    std::function<void(CancellableScope& scope)>&& command,
+    const std::vector<PeriodicInferenceCallback>& callbacks,
+    std::chrono::milliseconds default_video_period,
+    std::chrono::milliseconds default_audio_period
+){
+    CancellableHolder<CancellableScope> subscope(scope);
+    InferenceSession session(
+        subscope, stream,
+        callbacks,
+        default_video_period, default_audio_period
+    );
+
+    try{
+        command(subscope);
+    }catch (OperationCancelledException&){}
+
+    subscope.throw_if_cancelled_with_exception();
+    scope.throw_if_cancelled();
+
+    return session.triggered_index();
+}
+#if 1
+int run_until_with_time_limit(
+    ProgramEnvironment& env, VideoStream& stream, CancellableScope& scope,
+    WallClock deadline,
+    std::function<void(CancellableScope& scope)>&& command,
+    const std::vector<PeriodicInferenceCallback>& callbacks,
+    std::chrono::milliseconds default_video_period,
+    std::chrono::milliseconds default_audio_period
+){
+    CancellableHolder<CancellableScope> subscope(scope);
+    InferenceSession session(
+        subscope, stream,
+        callbacks,
+        default_video_period, default_audio_period
+    );
+
+    bool timed_out = false;
+    AsyncTask timer = GlobalThreadPools::unlimited_realtime().dispatch_now_blocking([&]{
+        subscope.wait_until(deadline);
+        timed_out = true;
+        subscope.cancel(nullptr);
+    });
+
+    try{
+        if (command){
+            command(subscope);
+        }
+//        subscope.wait_for_all_requests();
+    }catch (OperationCancelledException&){}
+
+    timer.wait_and_rethrow_exceptions();
+    subscope.throw_if_cancelled_with_exception();
+    scope.throw_if_cancelled();
+
+    return timed_out ? -2 : session.triggered_index();
+}
+#endif
+
+
+
+
+
+
+}
+
+
+
diff --git a/SerialPrograms/Source/CommonTools/Async/InferenceRoutines.h b/SerialPrograms/Source/CommonTools/Async/InferenceRoutines.h
new file mode 100644
index 0000000000..2a1aab6e9e
--- /dev/null
+++ b/SerialPrograms/Source/CommonTools/Async/InferenceRoutines.h
@@ -0,0 +1,182 @@
+/*  Inference Routines
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_CommonTools_InferenceRoutines_H
+#define PokemonAutomation_CommonTools_InferenceRoutines_H
+
+#include <functional>
+#include <chrono>
+#include <vector>
+#include "Common/Cpp/Time.h"
+#include "CommonFramework/Tools/VideoStream.h"
+#include "CommonTools/InferenceCallbacks/InferenceCallback.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+
+class Cancellable;
+class ProgramEnvironment;
+
+
+//
+//  Wait until one of the "stoppers" are cancelled or it times out.
+//
+//  Returns:
+//      -   The index of the trigger if that's what stopped it.
+//      -   -1 if nothing triggered before timeout.
+//
+//  If a stopper is cancelled due to an exception, that exception
+//  will be rethrown out of this function.
+//
+int wait_until(
+    CancellableScope& scope,
+    WallClock deadline,
+    std::vector<Cancellable*> stoppers
+);
+inline int wait_until(
+    CancellableScope& scope,
+    std::chrono::milliseconds timeout,
+    std::vector<Cancellable*> stoppers
+){
+    return wait_until(scope, current_time() + timeout, std::move(stoppers));
+}
+
+//
+//  Run the specified "command" until either it finishes or one of the
+//  "stoppers" is cancelled.
+//
+//  Returns:
+//      -   The index of the trigger if that's what stopped it.
+//      -   -1 if nothing triggered before timeout.
+//
+//  Exceptions thrown in either the commands or the stoppers will stop
+//  everything and will be propagated out of this function.
+//
+int run_until(
+    CancellableScope& scope,
+    std::function<void(CancellableScope& scope)>&& command,
+    std::vector<Cancellable*> stoppers
+);
+template <typename ControllerContext>
+int run_until(
+    ControllerContext& context,
+    std::function<void(CancellableScope& scope)>&& command,
+    std::vector<Cancellable*> stoppers
+){
+    return run_until(
+        context,
+        [&](CancellableScope& scope){
+            ControllerContext subcontext(scope, context);
+            command(subcontext);
+            subcontext.wait_for_all_requests();
+        },
+        std::move(stoppers)
+    );
+}
+
+
+
+//
+//  Wait until one of the "callbacks" are triggered or it times out.
+//
+//  Returns:
+//      -   The index of the trigger if that's what stopped it.
+//      -   -1 if nothing triggered before timeout.
+//
+//  Exceptions thrown in either the commands or the callbacks will stop
+//  everything and will be propagated out of this function.
+//
+int wait_until(
+    VideoStream& stream, CancellableScope& scope,
+    WallClock deadline,
+    const std::vector<PeriodicInferenceCallback>& callbacks,
+    std::chrono::milliseconds default_video_period = std::chrono::milliseconds(50),
+    std::chrono::milliseconds default_audio_period = std::chrono::milliseconds(20)
+);
+inline int wait_until(
+    VideoStream& stream, CancellableScope& scope,
+    std::chrono::milliseconds timeout,
+    const std::vector<PeriodicInferenceCallback>& callbacks,
+    std::chrono::milliseconds default_video_period = std::chrono::milliseconds(50),
+    std::chrono::milliseconds default_audio_period = std::chrono::milliseconds(20)
+){
+    return wait_until(
+        stream, scope,
+        current_time() + timeout,
+        callbacks,
+        default_video_period, default_audio_period
+    );
+}
+
+//
+//  Run the specified "command" until either it finishes or one of the
+//  "callbacks" are triggered.
+//
+//  Returns:
+//      -   The index of the trigger if that's what stopped it.
+//      -   -1 if nothing triggered before command finished.
+//
+//  Exceptions thrown in either the commands or the callbacks will stop
+//  everything and will be propagated out of this function.
+//
+int run_until(
+    VideoStream& stream, CancellableScope& scope,
+    std::function<void(CancellableScope& scope)>&& command,
+    const std::vector<PeriodicInferenceCallback>& callbacks,
+    std::chrono::milliseconds default_video_period = std::chrono::milliseconds(50),
+    std::chrono::milliseconds default_audio_period = std::chrono::milliseconds(20)
+);
+template <typename ControllerContext>
+int run_until(
+    VideoStream& stream, ControllerContext& context,
+    std::function<void(ControllerContext& context)>&& command,
+    const std::vector<PeriodicInferenceCallback>& callbacks,
+    std::chrono::milliseconds default_video_period = std::chrono::milliseconds(50),
+    std::chrono::milliseconds default_audio_period = std::chrono::milliseconds(20)
+){
+    return run_until(
+        stream, context,
+        [&](CancellableScope& scope){
+            ControllerContext subcontext(scope, context);
+            command(subcontext);
+            subcontext.wait_for_all_requests();
+        },
+        callbacks,
+        default_video_period,
+        default_audio_period
+    );
+}
+
+
+#if 1
+//
+//  Same as "run_until()", but will cancel the commands and return if a timeout
+//  is reached.
+//
+//  Returns:
+//      -   The index of the trigger if that's what stopped it.
+//      -   -1 if nothing triggered before command finished.
+//      -   -2 if timed out. Nothing triggered, and command did not finish.
+//
+int run_until_with_time_limit(
+    ProgramEnvironment& env, VideoStream& stream, CancellableScope& scope,
+    WallClock deadline,
+    std::function<void(CancellableScope& scope)>&& command,
+    const std::vector<PeriodicInferenceCallback>& callbacks,
+    std::chrono::milliseconds default_video_period,
+    std::chrono::milliseconds default_audio_period
+);
+#endif
+
+
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonTools/Async/InferenceSession.cpp b/SerialPrograms/Source/CommonTools/Async/InferenceSession.cpp
new file mode 100644
index 0000000000..4373312088
--- /dev/null
+++ b/SerialPrograms/Source/CommonTools/Async/InferenceSession.cpp
@@ -0,0 +1,135 @@
+/*  Inference Session
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Exceptions.h"
+#include "CommonFramework/Tools/VideoStream.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+#include "CommonTools/InferenceCallbacks/AudioInferenceCallback.h"
+#include "CommonTools/InferencePivots/VisualInferencePivot.h"
+#include "CommonTools/InferencePivots/AudioInferencePivot.h"
+#include "InferenceSession.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+
+
+InferenceSession::InferenceSession(
+    Cancellable& scope, VideoStream& stream,
+    const std::vector<PeriodicInferenceCallback>& callbacks,
+    std::chrono::milliseconds default_video_period,
+    std::chrono::milliseconds default_audio_period
+)
+    : m_scope(scope)
+    , m_stream(stream)
+    , m_overlays(stream.overlay())
+    , m_triggered(nullptr)
+{
+    WallClock start_time = current_time();
+    try{
+        for (size_t c = 0; c < callbacks.size(); c++){
+            const PeriodicInferenceCallback& callback = callbacks[c];
+            if (callback.callback == nullptr){
+                continue;
+            }
+            if (!m_map.emplace(callback.callback, c).second){
+                throw InternalProgramError(&stream.logger(), PA_CURRENT_FUNCTION, "Attempted to add the same callback twice.");
+            }
+            switch (callback.callback->type()){
+            case InferenceType::EXTERNAL:{
+                ExternalInferenceCallback& stopper = static_cast<ExternalInferenceCallback&>(*callback.callback);
+                stopper.add_cancel_listener(*this);
+                break;
+            }
+            case InferenceType::VISUAL:{
+                VisualInferenceCallback& visual_callback = static_cast<VisualInferenceCallback&>(*callback.callback);
+                stream.video_inference_pivot().add_callback(
+                    scope, &m_triggered,
+                    visual_callback,
+                    callback.period > std::chrono::milliseconds(0) ? callback.period : default_video_period,
+                    start_time
+                );
+                visual_callback.make_overlays(m_overlays);
+                break;
+            }
+            case InferenceType::AUDIO:
+                stream.audio_inference_pivot().add_callback(
+                    scope, &m_triggered,
+                    static_cast<AudioInferenceCallback&>(*callback.callback),
+                    callback.period > std::chrono::milliseconds(0) ? callback.period : default_audio_period,
+                    start_time
+                );
+                break;
+            }
+        }
+    }catch (...){
+        clear();
+        throw;
+    }
+}
+InferenceSession::~InferenceSession(){
+    clear();
+}
+
+
+InferenceCallback* InferenceSession::triggered_ptr() const{
+    return m_triggered.load(std::memory_order_acquire);
+}
+int InferenceSession::triggered_index() const{
+    auto iter = m_map.find(m_triggered.load(std::memory_order_acquire));
+    if (iter != m_map.end()){
+        return (int)iter->second;
+    }
+    return -1;
+}
+
+
+void InferenceSession::clear() noexcept{
+    const double DIVIDER = (double)(std::chrono::milliseconds(1) / std::chrono::microseconds(1));
+    const char* UNITS = " ms";
+    for (auto& item : m_map){
+        switch (item.first->type()){
+        case InferenceType::EXTERNAL:{
+            Cancellable& stopper = dynamic_cast<Cancellable&>(*item.first);
+            stopper.remove_cancel_listener(*this);
+        }
+        case InferenceType::VISUAL:{
+            StatAccumulatorI32 stats = m_stream.video_inference_pivot().remove_callback(
+                static_cast<VisualInferenceCallback&>(*item.first)
+            );
+            try{
+                stats.log(m_stream.logger(), item.first->label(), UNITS, DIVIDER);
+            }catch (...){}
+            break;
+        }
+        case InferenceType::AUDIO:{
+            StatAccumulatorI32 stats = m_stream.audio_inference_pivot().remove_callback(
+                static_cast<AudioInferenceCallback&>(*item.first)
+            );
+            try{
+                stats.log(m_stream.logger(), item.first->label(), UNITS, DIVIDER);
+            }catch (...){}
+            break;
+        }
+        }
+    }
+}
+
+void InferenceSession::on_cancellable_cancel(
+    Cancellable& cancellable,
+    std::exception_ptr reason
+){
+    m_triggered.store(&static_cast<ExternalInferenceCallback&>(cancellable), std::memory_order_release);
+    m_scope.cancel(std::move(reason));
+}
+
+
+
+
+
+}
diff --git a/SerialPrograms/Source/CommonTools/Async/InferenceSession.h b/SerialPrograms/Source/CommonTools/Async/InferenceSession.h
new file mode 100644
index 0000000000..2c8a78e04c
--- /dev/null
+++ b/SerialPrograms/Source/CommonTools/Async/InferenceSession.h
@@ -0,0 +1,77 @@
+/*  Inference Session
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_CommonTools_InferenceSession_H
+#define PokemonAutomation_CommonTools_InferenceSession_H
+
+#include <chrono>
+#include <vector>
+#include <map>
+#include <atomic>
+#include "Common/Cpp/CancellableScope.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/InferenceCallbacks/InferenceCallback.h"
+
+namespace PokemonAutomation{
+
+class VideoStream;
+
+
+
+//
+//  On construction, all the callbacks are attached to inference threads and
+//  begin running at their specified period.
+//
+//  Upon destruction, all callbacks are removed from the inference threads and
+//  stop running.
+//
+//  When a callback returns true or throws an exception, "scope.cancel()" will
+//  be called.
+//
+//  "triggered_ptr()/triggered_index()" gives the first callback that
+//  returned true. If nothing has returned true, it is null or -1 respectively.
+//
+//  Note that the callbacks will continue running even if one of them has
+//  returned true. So it is expected that the object will be destructed soon
+//  after "scope.cancel()" is called.
+//
+class InferenceSession : public Cancellable::CancelListener{
+public:
+    InferenceSession(
+        Cancellable& scope, VideoStream& stream,
+        const std::vector<PeriodicInferenceCallback>& callbacks,
+        std::chrono::milliseconds default_video_period = std::chrono::milliseconds(50),
+        std::chrono::milliseconds default_audio_period = std::chrono::milliseconds(20)
+    );
+    ~InferenceSession();
+
+    InferenceCallback* triggered_ptr() const;
+    int triggered_index() const;
+
+
+private:
+    void clear() noexcept;
+
+    virtual void on_cancellable_cancel(
+        Cancellable& cancellable,
+        std::exception_ptr reason
+    ) override;
+
+
+private:
+    Cancellable& m_scope;
+    VideoStream& m_stream;
+    VideoOverlaySet m_overlays;
+    std::map<InferenceCallback*, size_t> m_map;
+    std::atomic<InferenceCallback*> m_triggered;
+};
+
+
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonTools/Async/InterruptableCommands.cpp b/SerialPrograms/Source/CommonTools/Async/InterruptableCommands.cpp
new file mode 100644
index 0000000000..b3ddeb500a
--- /dev/null
+++ b/SerialPrograms/Source/CommonTools/Async/InterruptableCommands.cpp
@@ -0,0 +1,20 @@
+/*  Interruptable Commands
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Controllers/StandardHid/StandardHid_Keyboard.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+#include "NintendoSwitch/Controllers/Joycon/NintendoSwitch_Joycon.h"
+#include "InterruptableCommands.tpp"
+
+namespace PokemonAutomation{
+
+
+template class AsyncCommandSession<StandardHid::Keyboard>;
+template class AsyncCommandSession<NintendoSwitch::ProController>;
+template class AsyncCommandSession<NintendoSwitch::JoyconController>;
+
+
+}
diff --git a/SerialPrograms/Source/CommonTools/Async/InterruptableCommands.h b/SerialPrograms/Source/CommonTools/Async/InterruptableCommands.h
new file mode 100644
index 0000000000..f0cab8171e
--- /dev/null
+++ b/SerialPrograms/Source/CommonTools/Async/InterruptableCommands.h
@@ -0,0 +1,91 @@
+/*  Interruptable Commands
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_CommonTools_InterruptableCommands_H
+#define PokemonAutomation_CommonTools_InterruptableCommands_H
+
+#include <functional>
+#include "Common/Cpp/Concurrency/Mutex.h"
+#include "Common/Cpp/Concurrency/ConditionVariable.h"
+#include "Common/Cpp/Concurrency/AsyncTask.h"
+#include "Common/Cpp/CancellableScope.h"
+
+namespace PokemonAutomation{
+
+class Logger;
+class ProgramEnvironment;
+
+
+template <typename ControllerType>
+class AsyncCommandSession final : private Cancellable{
+    using ControllerContextType = typename ControllerType::ContextType;
+
+public:
+    AsyncCommandSession(
+        CancellableScope& scope, Logger& logger,
+        ControllerType& controller
+    );
+    virtual ~AsyncCommandSession();
+
+    bool command_is_running();
+
+    //  Stop the currently running command.
+    void stop_command();
+
+    //  Dispath a controller command function `lambda` asynchronously.
+    //
+    //  If some commands are already running (via a previous `dispatch()` call), they
+    //  will be stopped and atomically replaced with the new one.
+    //
+    //  This replacement maintains button states: if button A is being pressed from a
+    //  previous `dispatch()` while a new `dispatch()` presses button A and button B
+    //  at the same time, button A is not released during the transition.
+    //  You can use it to adjust button state continuously without interruption.
+    void dispatch(std::function<void(ControllerContextType&)>&& lambda);
+
+    //  Wait for currently running command to finish.
+    void wait();
+
+    //  Stop the entire session. If an exception was thrown from the command
+    //  thread, it will be rethrown here.
+    //
+    //  It is important that exceptions in the command thread be passed up
+    //  since it is how cancellations are implemented. Therefore you MUST
+    //  call this prior to all natural* destruction points.
+    //
+    //  *Do not call this during a stack-unwind as it's UB to throw while
+    //  unwinding. In such cases, the exception from the command thread will be
+    //  silently dropped in favor of the exception that's causing the current
+    //  unwind.
+    void stop_session_and_rethrow();
+
+private:
+    virtual bool cancel(std::exception_ptr exception) noexcept override;
+    void thread_loop();
+
+
+private:
+    struct CommandSet;
+
+    Logger& m_logger;
+    ControllerType& m_controller;
+    std::unique_ptr<CommandSet> m_current;
+
+    Mutex m_lock;
+    ConditionVariable m_cv;
+    AsyncTask m_thread;
+
+    LifetimeSanitizer m_sanitizer;
+};
+
+
+
+
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonTools/Async/InterruptableCommands.tpp b/SerialPrograms/Source/CommonTools/Async/InterruptableCommands.tpp
new file mode 100644
index 0000000000..193dad2d9b
--- /dev/null
+++ b/SerialPrograms/Source/CommonTools/Async/InterruptableCommands.tpp
@@ -0,0 +1,209 @@
+/*  Async Command Set
+ *
+ *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *
+ */
+
+#include "Common/Cpp/Exceptions.h"
+#include "Common/Cpp/Concurrency/AsyncTask.h"
+#include "CommonFramework/Tools/GlobalThreadPools.h"
+#include "InterruptableCommands.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+
+
+
+template <typename ControllerType>
+struct AsyncCommandSession<ControllerType>::CommandSet{
+    CommandSet(
+        CancellableScope& parent, ControllerType& controller,
+        std::function<void(ControllerContextType&)>&& lambda
+    );
+    CancellableHolder<CancellableScope> scope;
+    ControllerContextType context;
+    std::function<void(ControllerContextType&)> commands;
+};
+
+
+
+template <typename ControllerType>
+AsyncCommandSession<ControllerType>::CommandSet::CommandSet(
+    CancellableScope& parent, ControllerType& controller,
+    std::function<void(ControllerContextType&)>&& lambda
+)
+    : scope(parent)
+    , context(scope, controller)
+    , commands(std::move(lambda))
+{}
+
+
+
+template <typename ControllerType>
+AsyncCommandSession<ControllerType>::AsyncCommandSession(
+    CancellableScope& scope, Logger& logger,
+    ControllerType& controller
+)
+    : m_logger(logger)
+    , m_controller(controller)
+{
+    //  Attach first. If scope is already cancelled, we exit here with nothing
+    //  to clean up.
+    attach(scope);
+
+    //  Now start the thread. Destructor is guaranteed to run if this succeeds.
+    m_thread = GlobalThreadPools::unlimited_realtime().dispatch_now_blocking(
+        [this]{ thread_loop(); }
+    );
+}
+template <typename ControllerType>
+AsyncCommandSession<ControllerType>::~AsyncCommandSession(){
+//    cout << "~AsyncCommandSession()" << endl;
+    if (!cancelled() && std::uncaught_exceptions() == 0){
+        m_logger.log("AsyncCommandSession::stop_session() not called before normal destruction.", COLOR_RED);
+    }
+    detach();
+    AsyncCommandSession::cancel(nullptr);
+
+    //  Join the thread.
+    m_thread.wait_and_ignore_exceptions();
+}
+
+template <typename ControllerType>
+bool AsyncCommandSession<ControllerType>::command_is_running(){
+    auto scope_check = m_sanitizer.check_scope();
+    std::lock_guard<Mutex> lg(m_lock);
+    return m_current != nullptr;
+}
+
+template <typename ControllerType>
+void AsyncCommandSession<ControllerType>::stop_command(){
+    auto scope_check = m_sanitizer.check_scope();
+
+    std::unique_lock<Mutex> lg(m_lock);
+    if (cancelled()){
+        return;
+    }
+
+    if (m_current){
+        //  Already a task running. Cancel it.
+        m_current->context.cancel_now();
+        m_cv.wait(lg, [this]{
+            return cancelled() || m_current == nullptr;
+        });
+    }
+}
+template <typename ControllerType>
+void AsyncCommandSession<ControllerType>::dispatch(std::function<void(ControllerContextType&)>&& lambda){
+    auto scope_check = m_sanitizer.check_scope();
+
+    //  Construct the CommandSet outside the lock.
+    //  If a cancellation comes from above while we are holding the lock,
+    //  it will deadlock.
+    std::unique_ptr<CommandSet> pending(new CommandSet(
+        *this->scope(),
+        m_controller, std::move(lambda)
+    ));
+
+    std::unique_lock<Mutex> lg(m_lock);
+    if (cancelled()){
+        return;
+    }
+
+    if (m_current){
+        //  Already a task running. Cancel it.
+        m_current->context.cancel_lazy();
+        m_cv.wait(lg, [this]{
+            return cancelled() || m_current == nullptr;
+        });
+        if (cancelled()){
+            return;
+        }
+    }
+
+    m_current = std::move(pending);
+    m_cv.notify_all();
+}
+
+
+template <typename ControllerType>
+bool AsyncCommandSession<ControllerType>::cancel(std::exception_ptr exception) noexcept{
+//    cout << "AsyncCommandSession::cancel()" << endl;
+    if (Cancellable::cancel(exception)){
+        return true;
+    }
+    std::lock_guard<Mutex> lg(m_lock);
+    if (m_current != nullptr){
+        m_current->context.cancel(std::move(exception));
+    }
+    m_cv.notify_all();
+    return false;
+}
+template <typename ControllerType>
+void AsyncCommandSession<ControllerType>::thread_loop(){
+    while (true){
+        CommandSet* current;
+        {
+            std::unique_lock<Mutex> lg(m_lock);
+            m_cv.wait(lg, [this]{
+                return cancelled() || m_current != nullptr;
+            });
+            if (cancelled()){
+                break;
+            }
+            current = m_current.get();
+        }
+        try{
+            current->commands(current->context);
+            current->context.wait_for_all_requests();
+        }catch (OperationCancelledException&){}
+
+        //  Destroy the CommandSet outside the lock.
+        //  If a cancellation comes from above while we are holding the lock,
+        //  it will deadlock.
+        std::unique_ptr<CommandSet> done;
+        {
+            std::lock_guard<Mutex> lg(m_lock);
+            done = std::move(m_current);
+            m_cv.notify_all();
+        }
+    }
+
+    auto scope_check = m_sanitizer.check_scope();
+}
+
+
+
+#if 0
+template <typename ControllerType>
+void AsyncCommandSession::stop_commands(){
+    std::lock_guard<Mutex> lg(m_lock);
+    if (m_current){
+        m_current->context.cancel_now();
+    }
+}
+#endif
+template <typename ControllerType>
+void AsyncCommandSession<ControllerType>::wait(){
+    std::unique_lock<Mutex> lg(m_lock);
+//    cout << "wait() - start" << endl;
+    m_cv.wait(lg, [this]{
+        return m_current == nullptr;
+    });
+//    cout << "wait() - done" << endl;
+}
+template <typename ControllerType>
+void AsyncCommandSession<ControllerType>::stop_session_and_rethrow(){
+    cancel(nullptr);
+    m_thread.wait_and_rethrow_exceptions();
+    throw_if_cancelled_with_exception();
+}
+
+
+
+
+}
+
diff --git a/SerialPrograms/Source/CommonTools/Async/SuperControlSession.cpp b/SerialPrograms/Source/CommonTools/Async/SuperControlSession.cpp
new file mode 100644
index 0000000000..dc5ad62f71
--- /dev/null
+++ b/SerialPrograms/Source/CommonTools/Async/SuperControlSession.cpp
@@ -0,0 +1,21 @@
+/*  Super-Control Session
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Controllers/StandardHid/StandardHid_Keyboard.h"
+
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+#include "NintendoSwitch/Controllers/Joycon/NintendoSwitch_Joycon.h"
+#include "SuperControlSession.tpp"
+
+namespace PokemonAutomation{
+
+
+template class SuperControlSession<StandardHid::Keyboard>;
+template class SuperControlSession<NintendoSwitch::ProController>;
+template class SuperControlSession<NintendoSwitch::JoyconController>;
+
+
+}
diff --git a/SerialPrograms/Source/CommonFramework/Tools/SuperControlSession.h b/SerialPrograms/Source/CommonTools/Async/SuperControlSession.h
similarity index 75%
rename from SerialPrograms/Source/CommonFramework/Tools/SuperControlSession.h
rename to SerialPrograms/Source/CommonTools/Async/SuperControlSession.h
index 84fc2cff69..62d5ec99e3 100644
--- a/SerialPrograms/Source/CommonFramework/Tools/SuperControlSession.h
+++ b/SerialPrograms/Source/CommonTools/Async/SuperControlSession.h
@@ -1,11 +1,11 @@
 /*  Super-Control Session
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#ifndef PokemonAutomation_CommonFramework_SuperControlSession_H
-#define PokemonAutomation_CommonFramework_SuperControlSession_H
+#ifndef PokemonAutomation_CommonTools_SuperControlSession_H
+#define PokemonAutomation_CommonTools_SuperControlSession_H
 
 #include <memory>
 #include <vector>
@@ -17,9 +17,8 @@
 namespace PokemonAutomation{
 
 class ProgramEnvironment;
-class ConsoleHandle;
-class BotBaseContext;
-class AsyncCommandSession;
+class VideoStream;
+template <typename ControllerType> class AsyncCommandSession;
 class AudioInferenceCallback;
 class VisualInferenceCallback;
 
@@ -39,7 +38,10 @@ class VisualInferenceCallback;
 //  with a registered enum/action.
 //
 
+template <typename ControllerType>
 class SuperControlSession{
+    using ControllerContextType = typename ControllerType::ContextType;
+
 public:
     ~SuperControlSession();
     void run_session();
@@ -47,7 +49,7 @@ class SuperControlSession{
 protected:
     //  Construction
     SuperControlSession(
-        ProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context,
+        ProgramEnvironment& env, VideoStream& stream, ControllerContextType& context,
         std::chrono::milliseconds state_period = std::chrono::milliseconds(100),
         std::chrono::milliseconds visual_period = std::chrono::milliseconds(50),
         std::chrono::milliseconds audio_period = std::chrono::milliseconds(20)
@@ -66,7 +68,7 @@ class SuperControlSession{
     WallClock last_state_change() const{ return m_last_state_change; }
 
     //  Return true if we should stop.
-    virtual bool run_state(AsyncCommandSession& commands, WallClock timestamp) = 0;
+    virtual bool run_state(AsyncCommandSession<ControllerType>& commands, WallClock timestamp) = 0;
 
     //  Run the specified state. This is debounced such that the registered
     //  command will only run if we're not already in the state and the command
@@ -76,9 +78,9 @@ class SuperControlSession{
 
 protected:
     ProgramEnvironment& m_env;
-    ConsoleHandle& m_console;
-    BotBaseContext& m_context;
-    std::unique_ptr<AsyncCommandSession> m_active_command;
+    VideoStream& m_stream;
+    ControllerContextType& m_context;
+    std::unique_ptr<AsyncCommandSession<ControllerType>> m_active_command;
 
 private:
     const std::chrono::milliseconds m_state_period;
diff --git a/SerialPrograms/Source/CommonTools/Async/SuperControlSession.tpp b/SerialPrograms/Source/CommonTools/Async/SuperControlSession.tpp
new file mode 100644
index 0000000000..c8343ecf0e
--- /dev/null
+++ b/SerialPrograms/Source/CommonTools/Async/SuperControlSession.tpp
@@ -0,0 +1,137 @@
+/*  Super-Control Session
+ *
+ *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *
+ */
+
+#include "Common/Cpp/Exceptions.h"
+#include "CommonFramework/Tools/VideoStream.h"
+#include "CommonFramework/Tools/ProgramEnvironment.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+#include "CommonTools/InferenceCallbacks/AudioInferenceCallback.h"
+#include "InterruptableCommands.h"
+#include "InferenceSession.h"
+#include "SuperControlSession.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+
+
+template <typename ControllerType>
+SuperControlSession<ControllerType>::~SuperControlSession() = default;
+
+template <typename ControllerType>
+SuperControlSession<ControllerType>::SuperControlSession(
+    ProgramEnvironment& env, VideoStream& stream, ControllerContextType& context,
+        std::chrono::milliseconds state_period,
+        std::chrono::milliseconds visual_period,
+        std::chrono::milliseconds audio_period
+)
+    : m_env(env)
+    , m_stream(stream)
+    , m_context(context)
+    , m_state_period(state_period)
+    , m_visual_period(visual_period)
+    , m_audio_period(audio_period)
+    , m_last_state(0)
+    , m_last_state_change(current_time())
+{}
+
+template <typename ControllerType>
+void SuperControlSession<ControllerType>::operator+=(VisualInferenceCallback& callback){
+    m_visual_callbacks.emplace_back(&callback);
+}
+template <typename ControllerType>
+void SuperControlSession<ControllerType>::operator+=(AudioInferenceCallback& callback){
+    m_audio_callbacks.emplace_back(&callback);
+}
+template <typename ControllerType>
+void SuperControlSession<ControllerType>::register_state_command(size_t state, std::function<bool()>&& action){
+    auto iter = m_state_actions.find(state);
+    if (iter != m_state_actions.end()){
+        throw InternalProgramError(&m_stream.logger(), PA_CURRENT_FUNCTION, "Duplicate State Enum: " + std::to_string(state));
+    }
+    m_state_actions.emplace(state, std::move(action));
+}
+template <typename ControllerType>
+bool SuperControlSession<ControllerType>::run_state_action(size_t state){
+    auto iter = m_state_actions.find(state);
+    if (iter == m_state_actions.end()){
+        throw InternalProgramError(&m_stream.logger(), PA_CURRENT_FUNCTION, "Unknown State Enum: " + std::to_string(state));
+    }
+
+    //  Session isn't even active.
+    if (!m_active_command){
+        return false;
+    }
+
+    //  If we're already in the state and a command is running, don't overwrite it.
+    if (state == m_last_state && m_active_command->command_is_running()){
+        return false;
+    }
+
+    //  Run the state.
+    m_last_state = state;
+    m_last_state_change = current_time();
+    return iter->second();
+}
+
+template <typename ControllerType>
+void SuperControlSession<ControllerType>::run_session(){
+    m_start_time = current_time();
+
+    m_active_command.reset(
+        new AsyncCommandSession<ControllerType>(
+            m_context, m_env.logger(),
+            m_context.controller()
+        )
+    );
+
+    std::vector<PeriodicInferenceCallback> callbacks;
+    for (VisualInferenceCallback* callback : m_visual_callbacks){
+        callbacks.emplace_back(PeriodicInferenceCallback{*callback, m_visual_period});
+    }
+    for (AudioInferenceCallback* callback : m_audio_callbacks){
+        callbacks.emplace_back(PeriodicInferenceCallback{*callback, m_audio_period});
+    }
+    InferenceSession session(
+        m_context, m_stream,
+        callbacks,
+        m_visual_period
+    );
+
+    WallClock now = current_time();
+    WallClock next_tick = now + m_state_period;
+
+    m_last_state = 0;
+
+    while (true){
+        //  Check stop conditions.
+        m_context.throw_if_cancelled();
+
+        if (run_state(*m_active_command, current_time())){
+            break;
+        }
+
+        now = current_time();
+        if (now >= next_tick){
+            next_tick = now + m_state_period;
+        }else{
+            m_context.wait_until(next_tick);
+            next_tick += m_state_period;
+        }
+    }
+    m_context.throw_if_cancelled();
+
+    m_active_command->stop_session_and_rethrow();
+}
+
+
+
+
+
+
+}
diff --git a/SerialPrograms/Source/CommonFramework/Inference/AudioPerSpectrumDetectorBase.cpp b/SerialPrograms/Source/CommonTools/Audio/AudioPerSpectrumDetectorBase.cpp
similarity index 78%
rename from SerialPrograms/Source/CommonFramework/Inference/AudioPerSpectrumDetectorBase.cpp
rename to SerialPrograms/Source/CommonTools/Audio/AudioPerSpectrumDetectorBase.cpp
index 9b0958f494..db1ef063a6 100644
--- a/SerialPrograms/Source/CommonFramework/Inference/AudioPerSpectrumDetectorBase.cpp
+++ b/SerialPrograms/Source/CommonTools/Audio/AudioPerSpectrumDetectorBase.cpp
@@ -1,6 +1,6 @@
 /*  Audio Template Cache
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -9,29 +9,38 @@
 #include "Common/Cpp/PrettyPrint.h"
 #include "Common/Cpp/Exceptions.h"
 #include "CommonFramework/AudioPipeline/AudioFeed.h"
-#include "CommonFramework/Inference/SpectrogramMatcher.h"
-#include "CommonFramework/Tools/ConsoleHandle.h"
+#include "SpectrogramMatcher.h"
 #include "AudioPerSpectrumDetectorBase.h"
 
-#include <iostream>
-using std::cout;
-using std::endl;
+//#include <iostream>
+//using std::cout;
+//using std::endl;
 
 namespace PokemonAutomation{
 
 
+//std::atomic<bool> force_detected(false);
+
+
+
 AudioPerSpectrumDetectorBase::AudioPerSpectrumDetectorBase(
-    std::string label, std::string audio_name, Color detection_color,
-    ConsoleHandle& console, DetectedCallback detected_callback
+    Logger& logger,
+    std::string label,
+    std::string audio_name,
+    Color detection_color,
+    DetectedCallback detected_callback
 )
     : AudioInferenceCallback(std::move(label))
     , m_audio_name(std::move(audio_name))
     , m_detection_color(detection_color)
-    , m_console(console)
+    , m_logger(logger)
     , m_detected_callback(std::move(detected_callback))
     , m_start_timestamp(current_time())
     , m_spectrums_processed(0)
 {}
+void AudioPerSpectrumDetectorBase::set_detected_callback(DetectedCallback detected_callback){
+    m_detected_callback = std::move(detected_callback);
+}
 AudioPerSpectrumDetectorBase::~AudioPerSpectrumDetectorBase(){
     try{
         log_results();
@@ -47,17 +56,17 @@ void AudioPerSpectrumDetectorBase::throw_if_no_sound(std::chrono::milliseconds m
     if (m_spectrums_processed > 0){
         return;
     }
-    throw UserSetupError(m_console, "No sound detected.");
+    throw UserSetupError(m_logger, "No sound detected.");
 }
 
 void AudioPerSpectrumDetectorBase::log_results(){
     if (m_last_timestamp != WallClock::min()){
-        m_console.log(m_audio_name + " detected! Error Coefficient = " + tostr_default(m_lowest_error), COLOR_BLUE);
+        m_logger.log(m_audio_name + " detected! Error Coefficient = " + tostr_default(m_lowest_error), COLOR_BLUE);
     }else{
-        m_console.log(m_audio_name + " not detected. Error Coefficient = " + tostr_default(m_lowest_error), COLOR_PURPLE);
+        m_logger.log(m_audio_name + " not detected. Error Coefficient = " + tostr_default(m_lowest_error), COLOR_PURPLE);
     }
 
-#if 1
+#if 0
     if (m_lowest_error >= 1){
         std::stringstream ss;
         ss << "AudioPerSpectrumDetectorBase ended with error of 1.0: " << endl;
@@ -66,7 +75,7 @@ void AudioPerSpectrumDetectorBase::log_results(){
         for (const auto& error : m_errors){
             ss << "[" << error.first << ":" << error.second << "]";
         }
-//        m_console.log(ss.str(), COLOR_RED);
+//        m_logger.log(ss.str(), COLOR_RED);
         cout << ss.str() << endl;
     }
  #endif
@@ -93,9 +102,9 @@ bool AudioPerSpectrumDetectorBase::process_spectrums(
     }
 
     const size_t sample_rate = new_spectrums[0].sample_rate;
-    // Lazy intialization of the spectrogram matcher.
+    // Lazy initialization of the spectrogram matcher.
     if (m_matcher == nullptr || m_matcher->sample_rate() != sample_rate){
-        m_console.log("Loading spectrogram...");
+        m_logger.log("Loading spectrogram...");
         m_matcher = build_spectrogram_matcher(sample_rate);
     }
 
@@ -136,7 +145,7 @@ bool AudioPerSpectrumDetectorBase::process_spectrums(
 
         found = matcher_score <= threshold;
 
-        uint64_t curStamp = m_matcher->latestTimestamp();
+        uint64_t curStamp = m_matcher->latest_timestamp();
 
 #ifdef PA_DEBUG_FORCE_PLA_SOUND
         if (debug_count % 300 > 300 - 5){
@@ -155,9 +164,9 @@ bool AudioPerSpectrumDetectorBase::process_spectrums(
             m_last_error = std::min(m_last_error, matcher_score);
 
             std::ostringstream os;
-            os << m_audio_name << " found, score " << matcher_score << "/" << threshold << ", scale: " << m_matcher->lastMatchedScale();
-            m_console.log(os.str(), COLOR_BLUE);
-            audio_feed.add_overlay(curStamp+1-m_matcher->numMatchedWindows(), curStamp+1, m_detection_color);
+            os << m_audio_name << " found, score " << matcher_score << "/" << threshold << ", scale: " << m_matcher->last_matched_scale();
+            m_logger.log(os.str(), COLOR_BLUE);
+            audio_feed.add_overlay(curStamp+1-m_matcher->num_matched_windows(), curStamp+1, m_detection_color);
 
             // Since the target audio is found, no need to check detection on the rest of the spectrums in `new_spectrums`.
 
@@ -173,6 +182,10 @@ bool AudioPerSpectrumDetectorBase::process_spectrums(
         }
     }
 
+//    if (force_detected){
+//        return true;
+//    }
+
     //  No shiny detected.
     if (m_last_error >= 1.0){
         return false;
@@ -198,7 +211,9 @@ bool AudioPerSpectrumDetectorBase::process_spectrums(
 }
 
 void AudioPerSpectrumDetectorBase::clear(){
-    m_matcher->clear();
+    if (m_matcher != nullptr){
+        m_matcher->clear();
+    }
 }
 
 
diff --git a/SerialPrograms/Source/CommonFramework/Inference/AudioPerSpectrumDetectorBase.h b/SerialPrograms/Source/CommonTools/Audio/AudioPerSpectrumDetectorBase.h
similarity index 87%
rename from SerialPrograms/Source/CommonFramework/Inference/AudioPerSpectrumDetectorBase.h
rename to SerialPrograms/Source/CommonTools/Audio/AudioPerSpectrumDetectorBase.h
index 4fa369a98f..b6d896e3d8 100644
--- a/SerialPrograms/Source/CommonFramework/Inference/AudioPerSpectrumDetectorBase.h
+++ b/SerialPrograms/Source/CommonTools/Audio/AudioPerSpectrumDetectorBase.h
@@ -1,6 +1,6 @@
 /*  Audio Per-Spectrum Detector Base
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  *  A base class for audio detectors.
  * 
@@ -25,18 +25,19 @@
  *  audio matching and the matching algorithm can tolerate a few spectrums off on time axis.
  */
 
-#ifndef PokemonAutomation_CommonFramework_AudioPerSpectrumDetectorBase_H
-#define PokemonAutomation_CommonFramework_AudioPerSpectrumDetectorBase_H
+#ifndef PokemonAutomation_CommonTools_AudioPerSpectrumDetectorBase_H
+#define PokemonAutomation_CommonTools_AudioPerSpectrumDetectorBase_H
 
 #include <string>
 #include <functional>
 #include "Common/Cpp/Color.h"
 #include "Common/Cpp/Time.h"
-#include "CommonFramework/InferenceInfra/AudioInferenceCallback.h"
+#include "CommonTools/InferenceCallbacks/AudioInferenceCallback.h"
 
 namespace PokemonAutomation{
 
-class ConsoleHandle;
+
+class Logger;
 class SpectrogramMatcher;
 
 // A virtual base class for audio detectors to match an audio template starting at each incoming
@@ -46,6 +47,8 @@ class SpectrogramMatcher;
 // - std::unique_ptr<SpectrogramMatcher> build_spectrogram_matcher(size_t sample_rate)
 class AudioPerSpectrumDetectorBase : public AudioInferenceCallback{
 public:
+    virtual ~AudioPerSpectrumDetectorBase();
+
     using DetectedCallback = std::function<bool(float error_coefficient)>;
     // label: a name for this detector. Used for logging and profiling.
     // audio_name: the name of the audio to be detected (shiny sound etc). Capitalize first letter.
@@ -56,11 +59,18 @@ class AudioPerSpectrumDetectorBase : public AudioInferenceCallback{
     // function. If it returns true, the inference session will stop (by returning true from 
     // AudioPerSpectrumDetectorBase::process_spectrums()).
     AudioPerSpectrumDetectorBase(
-        std::string label, std::string audio_name, Color detection_color,
-        ConsoleHandle& console, DetectedCallback detected_callback
+        Logger& logger,
+        std::string label,
+        std::string audio_name,
+        Color detection_color,
+        DetectedCallback detected_callback = nullptr
     );
 
-    virtual ~AudioPerSpectrumDetectorBase();
+    virtual void set_detected_callback(DetectedCallback detected_callback);
+
+    WallClock last_detection() const{
+        return m_last_timestamp;
+    }
 
     void throw_if_no_sound(std::chrono::milliseconds min_duration = std::chrono::milliseconds(5000)) const;
 
@@ -93,7 +103,7 @@ class AudioPerSpectrumDetectorBase : public AudioInferenceCallback{
     // Color of the box to visualize the detection in the audio spectrogram UI.
     Color m_detection_color;
     
-    ConsoleHandle& m_console;
+    Logger& m_logger;
     // Callback function to determine whether to stop the inference session when the target audio
     // is detected.
     DetectedCallback m_detected_callback;
diff --git a/SerialPrograms/Source/CommonFramework/Inference/AudioTemplateCache.cpp b/SerialPrograms/Source/CommonTools/Audio/AudioTemplateCache.cpp
similarity index 79%
rename from SerialPrograms/Source/CommonFramework/Inference/AudioTemplateCache.cpp
rename to SerialPrograms/Source/CommonTools/Audio/AudioTemplateCache.cpp
index 39c2f87123..048401e89a 100644
--- a/SerialPrograms/Source/CommonFramework/Inference/AudioTemplateCache.cpp
+++ b/SerialPrograms/Source/CommonTools/Audio/AudioTemplateCache.cpp
@@ -1,14 +1,13 @@
 /*  Audio Template Cache
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include <QFileInfo>
-#include <QString>
 #include "Common/Cpp/Exceptions.h"
+#include "Common/Cpp/Filesystem/Filesystem.h"
 #include "Common/Cpp/Containers/AlignedVector.tpp"
-#include "CommonFramework/Globals.h"
+#include "CommonFramework/GlobalAutoPaths.h"
 #include "CommonFramework/AudioPipeline/AudioTemplate.h"
 #include "AudioTemplateCache.h"
 
@@ -26,19 +25,19 @@ AudioTemplateCache& AudioTemplateCache::instance(){
 
 
 const AudioTemplate* AudioTemplateCache::get_nothrow_internal(const std::string& full_path_no_ext, size_t sample_rate){
-    SpinLockGuard lg(m_lock);
+    WriteSpinLock lg(m_lock, PA_CURRENT_FUNCTION);
     auto iter = m_cache.find(full_path_no_ext);
     if (iter != m_cache.end()){
         return &iter->second;
     }
 
     std::string full_path = full_path_no_ext + ".wav";
-    if (!QFileInfo::exists(QString::fromStdString(full_path))){
+    if (!Filesystem::exists(Filesystem::Path(full_path))){
         full_path = full_path_no_ext + ".mp3";
     }
 
-    AudioTemplate audio_template = loadAudioTemplate(full_path, (int)sample_rate);
-    if (audio_template.numFrequencies() == 0){
+    AudioTemplate audio_template = load_audio_template(full_path, (int)sample_rate);
+    if (audio_template.num_frequencies() == 0){
         return nullptr;
     }
 
diff --git a/SerialPrograms/Source/CommonFramework/Inference/AudioTemplateCache.h b/SerialPrograms/Source/CommonTools/Audio/AudioTemplateCache.h
similarity index 85%
rename from SerialPrograms/Source/CommonFramework/Inference/AudioTemplateCache.h
rename to SerialPrograms/Source/CommonTools/Audio/AudioTemplateCache.h
index 906345d2bd..ebdc8b4bac 100644
--- a/SerialPrograms/Source/CommonFramework/Inference/AudioTemplateCache.h
+++ b/SerialPrograms/Source/CommonTools/Audio/AudioTemplateCache.h
@@ -1,11 +1,11 @@
 /*  Audio Template Cache
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#ifndef PokemonAutomation_CommonFramework_AudioTemplateCache_H
-#define PokemonAutomation_CommonFramework_AudioTemplateCache_H
+#ifndef PokemonAutomation_CommonTools_AudioTemplateCache_H
+#define PokemonAutomation_CommonTools_AudioTemplateCache_H
 
 #include <string>
 #include <map>
diff --git a/SerialPrograms/Source/CommonTools/Audio/SpectrogramMatcher.cpp b/SerialPrograms/Source/CommonTools/Audio/SpectrogramMatcher.cpp
new file mode 100644
index 0000000000..1ee4c7ac09
--- /dev/null
+++ b/SerialPrograms/Source/CommonTools/Audio/SpectrogramMatcher.cpp
@@ -0,0 +1,404 @@
+
+
+#include <cfloat>
+#include <cmath>
+#include <iostream>
+#include <fstream>
+//#include "Common/Cpp/Exceptions.h"
+#include "Common/Cpp/Containers/AlignedVector.tpp"
+#include "Kernels/ScaleInvariantMatrixMatch/Kernels_ScaleInvariantMatrixMatch.h"
+#include "Kernels/SpikeConvolution/Kernels_SpikeConvolution.h"
+#include "CommonFramework/AudioPipeline/AudioFeed.h"
+#include "CommonFramework/AudioPipeline/AudioTemplate.h"
+#include "SpectrogramMatcher.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+
+
+std::vector<float> build_spike_kernel(size_t num_frequencies, size_t half_sample_rate){
+    std::vector<float> kernel;
+    // We find a good kernel when sample rate is 48K and num_frequencies is 2048:
+    // [-4.f, -3.f, -2.f, -1.f, 0.f, 1.f, 2.f, 3.f, 4.f, 4.f, 3.f, 2.f, 1.f, 0.f, -1.f, -2.f, -3.f, -4.f]
+    // This spans frenquency range of 17 * half_sample_rate / num_frequencies = 199.21875Hz, where 17 is the number of intervals in the above series.
+    // For another sample rate and num_frequencies combination, the number of intervals is
+    // 199.21875 * num_frequencies / half_sample_rate
+    size_t num_kernel_intervals = int(199.21875 * num_frequencies / half_sample_rate + 0.5);
+    size_t slope_len = num_kernel_intervals / 2;
+    for (size_t i = 0; i <= slope_len; i++){
+        kernel.push_back(-4.0f + 8.f * i / (float)slope_len);
+    }
+    for (size_t i = ((num_kernel_intervals+1) % 2); i <= slope_len; i++){
+        kernel.push_back(-4.0f + 8.f * (slope_len-i)/(float)slope_len);
+    }
+    return kernel;
+}
+
+// std::vector<float> buildSmoothKernel(size_t num_frequencies, size_t half_sample_rate){
+//     std::vector<float> kernel;
+//     // We find a good kernel when sample rate is 48K and num_frequencies is 2048:
+//     // [0.0111, 0.135, 0.606, 1.0, 0.606, 0.135, 0.0111], built as Gaussian distribution with sigma(stddev) as 1.0
+//     // The equation for Gaussian is exp(-x^2/(2 sigma^2))
+//     // We can think sigma value as 1.0 * frequency_gap = 1.0 * half_sample_rate / num_frequencies = 11.71875 Hz
+// }
+
+
+SpectrogramMatcher::SpectrogramMatcher(
+    std::string name,
+    AudioTemplate audio_template, Mode mode, size_t sample_rate,
+    double low_frequency_filter, size_t template_subdivision
+)
+    : m_name(std::move(name))
+    , m_template(std::move(audio_template))
+    , m_sample_rate(sample_rate)
+    , m_mode(mode)
+{
+    const size_t num_template_windows = m_template.num_windows();
+//    cout << "num_template_windows = " << num_template_windows << endl;
+    m_num_original_frequencies = m_template.num_frequencies();
+    if (m_template.num_frequencies() == 0){  // Error case, failed to load template
+        std::cout << "Error: load audio template failed" << std::endl;
+        return;
+//        throw FileException(nullptr, PA_CURRENT_FUNCTION, "Unable to load audio template file.", templateFilename.toStdString());
+    }
+
+    const size_t half_sample_rate = sample_rate / 2;
+
+    // The frequency range from [0.0, half_sample_rate / num_frequencies, 2.0 half_sample_rate / num_frequencies, ... (num_frequencies-1) half_sample_rate / num_frequencies]
+    // Since human can only hear as high as 20KHz sound, matching on frequencies >= 20KHz is meaningless.
+    // So the index i of the max frequency we should be matching is the one with
+    // i * half_sample_rate/num_frequencies  <= 20KHz
+    // i <= num_frequencies * 20K / half_sample_rate
+    // We also have a cut-off threshold to remove lower frequencies. We set it to be at frequency index 5 when sample rate is 48K and num_frequencies is 2048.
+    // So 5.0 24K / 2048 = 58.59375Hz. For other sample rate and num_frequencies combinations,
+    // j * half_sample_rate/num_frequencies >= 58.59375 -> j >= 58.59375 * num_frequencies / half_sample_rate
+
+    m_original_freq_start = int(low_frequency_filter * m_num_original_frequencies / half_sample_rate + 0.5);
+    m_original_freq_end = 20000 * m_num_original_frequencies / half_sample_rate + 1;
+
+    // Initialize the spike convolution kernel:
+    m_conv_kernel = build_spike_kernel(m_num_original_frequencies, half_sample_rate);
+
+    switch(m_mode){
+    case Mode::SPIKE_CONV:
+    {
+        // Do convolution on audio template
+        const size_t num_conved_frequencies = (m_original_freq_end - m_original_freq_start) - m_conv_kernel.size() + 1;
+
+        AudioTemplate conved_template(num_conved_frequencies, num_template_windows);
+        for (size_t i = 0; i < num_template_windows; i++){
+            conv(
+                m_template.get_window(i) + m_original_freq_start, m_original_freq_end - m_original_freq_start,
+                conved_template.get_window(i)
+            );
+        }
+
+        m_template = std::move(conved_template);
+        m_freq_start = 0;
+        m_freq_end = num_conved_frequencies;
+        break;
+    }
+    case Mode::AVERAGE_5:
+    {
+        // Avereage every 5 frequencies
+        const size_t num_new_freq = (m_original_freq_end - m_original_freq_start) / 5;
+
+        AudioTemplate avged_template(num_new_freq, num_template_windows);
+        for (size_t i = 0; i < num_template_windows; i++){
+            for (size_t j = 0; j < num_new_freq; j++){
+                const float * raw_freq_mag = m_template.get_window(i) + m_original_freq_start + j*5;
+                const float new_mag = (raw_freq_mag[0] + raw_freq_mag[1] + raw_freq_mag[2] + raw_freq_mag[3] + raw_freq_mag[4]) / 5.0f;
+                avged_template.get_window(i)[j] = new_mag;
+            }
+        }
+
+        m_template = std::move(avged_template);
+        m_freq_start = 0;
+        m_freq_end = num_new_freq;
+        break;
+    }
+    case Mode::RAW:
+        m_freq_start = m_original_freq_start;
+        m_freq_end = m_original_freq_end;
+        break;
+    }
+
+    if (template_subdivision <= 1){
+        m_template_range.emplace_back(0, num_template_windows);
+        m_num_spectrums_needed = num_template_windows;
+    }else{
+        // Number of subdivision cannot exceed number of windows in the template.
+        template_subdivision = std::min(template_subdivision, num_template_windows);
+        // num windows of each subdivided template
+        const size_t num_sub_windows = num_template_windows / template_subdivision;
+        m_num_spectrums_needed = num_sub_windows;
+        for (size_t i = 0; i < template_subdivision; i++){
+            const size_t window_start = i * num_sub_windows;
+            const size_t window_end = (i+1) * num_sub_windows;
+            m_template_range.emplace_back(window_start, window_end);
+        }
+    }
+//    cout << "m_template_range = " << m_template_range.size() << endl;
+//    cout << "m_num_spectrums_needed = " << m_num_spectrums_needed << endl;
+
+    m_template_norm = build_template_norm();
+}
+
+uint64_t SpectrogramMatcher::latest_timestamp() const{
+    if (m_spectrums.size() == 0){
+        return SIZE_MAX;
+    }
+    return m_spectrums.front().stamp;
+}
+
+void SpectrogramMatcher::conv(const float* src, size_t num, float* dst){
+//    cout << (size_t)dst % 64 << endl;
+
+    const size_t num_conved_frequencies = num - m_conv_kernel.size() + 1;
+    if (num < m_conv_kernel.size()){
+        memset(dst, 0, num_conved_frequencies * sizeof(float));
+        return;
+    }
+
+#if 0
+    for (size_t i = 0; i < num-m_conv_kernel.size()+1; i++){
+        dst[i] = 0.0f;
+        for (size_t j = 0; j < m_conv_kernel.size(); j++){
+            dst[i] += src[i+j] * m_conv_kernel[j];
+        }
+    }
+#else
+    Kernels::SpikeConvolution::compute_spike_kernel(
+        dst, src, num, m_conv_kernel.data(), m_conv_kernel.size()
+    );
+#endif
+}
+
+std::vector<float> SpectrogramMatcher::build_template_norm() const{
+    std::vector<float> ret(m_template_range.size());
+
+    for (size_t sub_index = 0; sub_index < m_template_range.size(); sub_index++){
+        float sum_sqr = 0.0f;
+        for (size_t i = m_template_range[sub_index].first; i < m_template_range[sub_index].second; i++){
+            for (size_t j = m_freq_start; j < m_freq_end; j++){
+                const float v = m_template.get_window(i)[j];
+                sum_sqr += v * v;
+            }
+        }
+        ret[sub_index] = std::sqrt(sum_sqr);
+    }
+
+    return ret;
+}
+
+bool SpectrogramMatcher::update_to_new_spectrum(AudioSpectrum new_spectrum){
+    if (m_num_original_frequencies != new_spectrum.magnitudes->size()){
+        std::cout << "Error: number of frequencies don't match in SpectrogramMatcher::match() " << 
+            m_num_original_frequencies << " " << new_spectrum.magnitudes->size() << std::endl;
+        return false;
+    }
+
+    switch(m_mode){
+    case Mode::SPIKE_CONV:
+    {
+        // Do the conv on new spectrum too.
+        AlignedVector<float> conved_spectrum(m_template.buffer_size());
+        conv(new_spectrum.magnitudes->data() + m_original_freq_start,
+            m_original_freq_end - m_original_freq_start, conved_spectrum.data());
+        
+        new_spectrum.magnitudes = std::make_unique<AlignedVector<float>>(std::move(conved_spectrum));
+        break;
+    }
+    case Mode::AVERAGE_5:
+    {
+        AlignedVector<float> avged_spectrum(m_template.buffer_size());
+        for (size_t j = 0; j < m_template.num_frequencies(); j++){
+            const float * raw_freq_mag = new_spectrum.magnitudes->data() + m_original_freq_start + j*5;
+            const float new_mag = (raw_freq_mag[0] + raw_freq_mag[1] + raw_freq_mag[2] + raw_freq_mag[3] + raw_freq_mag[4]) / 5.0f;
+            avged_spectrum[j] = new_mag;
+        }
+        new_spectrum.magnitudes = std::make_unique<AlignedVector<float>>(std::move(avged_spectrum));
+        break;
+    }
+    case Mode::RAW:
+        break;
+    }
+
+    // Compute the norm square (= sum squares) of the spectrum, used for matching:
+    // TODO: if there will be multiple SpectrogramMatcher running on the same audio stream, can
+    // move this per-spectrum computation to a shared struct for those matchers to save computation.
+    float spectrum_norm_sqr = 0.0f;
+    for (size_t i = m_freq_start; i < m_freq_end; i++){
+        float mag = (*new_spectrum.magnitudes)[i];
+        spectrum_norm_sqr += mag * mag;
+    }
+    m_spectrum_norm_sqrs.push_front(spectrum_norm_sqr);
+
+    m_spectrums.emplace_front(std::move(new_spectrum));
+
+    return true;
+}
+
+bool SpectrogramMatcher::update_to_new_spectrums(const std::vector<AudioSpectrum>& new_spectrums){
+    for (auto it = new_spectrums.rbegin(); it != new_spectrums.rend(); it++){
+        if(!update_to_new_spectrum(*it)){
+            return false;
+        }
+    }
+
+    // pop out too old spectrums
+    while (m_spectrums.size() > m_num_spectrums_needed){
+        m_spectrums.pop_back();
+        m_spectrum_norm_sqrs.pop_back();
+    }
+
+    return true;
+}
+
+std::pair<float, float> SpectrogramMatcher::match_sub_template(size_t sub_index) const{
+#if 0
+    auto iter = m_spectrums.begin();
+    auto iter2 = m_spectrum_norm_sqrs.begin();
+    float stream_sum_sqr = 0.0f;
+    float sum_multi = 0.0f;
+
+    const size_t template_start = m_template_range[sub_index].first;
+    const size_t template_end = m_template_range[sub_index].second;
+    for (size_t i = template_start; i < template_end; i++, iter++, iter2++){
+        // match in order from latest window to oldest
+        const float* template_data = m_template.get_window(template_end-1-i);
+        const float* stream_data = iter->magnitudes->data();
+        stream_sum_sqr += *iter2;
+        for (size_t j = m_freq_start; j < m_freq_end; j++){
+            sum_multi += template_data[j] * stream_data[j];
+        }
+    }
+//    cout << "sum_multi = " << sum_multi << ", stream_sum_sqr = " << stream_sum_sqr << endl;
+    const float scale = (stream_sum_sqr < 1e-6f ? 1.0f : sum_multi / stream_sum_sqr);
+
+    iter = m_spectrums.begin();
+    float sum = 0.0f;
+    for (size_t i = template_start; i < template_end; i++, iter++){
+        // match in order from latest window to oldest
+        const float* template_data = m_template.get_window(template_end-1-i);
+        const float* stream_data = iter->magnitudes->data();
+        for (size_t j = m_freq_start; j < m_freq_end; j++){
+            float d = template_data[j] - scale * stream_data[j];
+            sum += d * d;
+        }
+    }
+#else
+    //  Build matrix.
+    auto iter = m_spectrums.begin();
+    const size_t template_start = m_template_range[sub_index].first;
+    const size_t template_end = m_template_range[sub_index].second;
+    size_t windows = template_end - template_start;
+//    cout << windows << endl;
+//    cout << m_spectrums.size() << " / " << windows << endl;
+    size_t freqs = m_freq_end - m_freq_start;
+    std::vector<const float*> matrix_a(windows);
+    std::vector<const float*> matrix_t(windows);
+    for (size_t i = 0; i < windows; i++, iter++){
+//        cout << "Template: " << ((size_t)m_template.get_window(template_end - 1 - i) % 64) << endl;
+//        cout << "Samples:  " << ((size_t)iter->magnitudes->data() % 64) << endl;
+        matrix_t[i] = m_freq_start + m_template.get_window(windows - 1 - i);
+        matrix_a[i] = m_freq_start + iter->magnitudes->data();
+//        cout << matrix_t[i] << " : " << matrix_a[i] << endl;
+    }
+
+    //  Compute scale.
+    float scale = Kernels::ScaleInvariantMatrixMatch::compute_scale(
+        freqs, windows,
+        matrix_a.data(), matrix_t.data()
+    );
+    scale = std::min<float>(scale, 1000000);
+
+    //  Compute error.
+    float sum = Kernels::ScaleInvariantMatrixMatch::compute_error(
+        freqs, windows,
+        scale,
+        matrix_a.data(), matrix_t.data()
+    );
+#endif
+
+
+    float score = sqrt(sum) / m_template_norm[0];
+//    cout << "score = " << score << endl;
+    score = std::min<float>(score, 1.0);
+
+    return std::make_pair(score, scale);
+}
+
+float SpectrogramMatcher::match(const std::vector<AudioSpectrum>& new_spectrums){
+    if (!update_to_new_spectrums(new_spectrums)){
+        return FLT_MAX;
+    }
+
+    if (m_spectrums.size() < m_num_spectrums_needed){
+        return FLT_MAX;
+    }
+
+    // Check whether the stored spectrums' timestamps are continuous:
+    size_t cur_stamp = m_spectrums.front().stamp;
+    size_t last_stamp = cur_stamp + 1;
+    for (const auto& s : m_spectrums){
+        if (s.stamp != last_stamp - 1){
+            std::cout << "Error: SpectrogramMatcher (" + m_name + ") spectrum timestamps are not continuous:" << std::endl;
+            for (const auto& sp : m_spectrums){
+                std::cout << sp.stamp << ", ";
+            }
+            std::cout << std::endl;
+            return FLT_MAX;
+        }
+        last_stamp--;
+    }
+
+    if (m_last_stamp_tested != SIZE_MAX && cur_stamp <= m_last_stamp_tested){
+        return FLT_MAX;
+    }
+    m_last_stamp_tested = cur_stamp;
+    
+    // Do the match:
+    float score = FLT_MAX; // the lower the score, the better the match
+    if (m_template_range.size() == 1){
+        // Match the full template
+        std::tie(score, m_last_scale) = match_sub_template(0);
+    }else{
+        // Match each individual sub-template
+        for (size_t sub_template = 0; sub_template < m_template_range.size(); sub_template++){
+            float sub_template_score = FLT_MAX;
+            float sub_template_scale = 1.0f;
+            std::tie(sub_template_score, sub_template_scale) = match_sub_template(sub_template);
+            if (sub_template_score < score){
+                score = sub_template_score;
+                m_last_scale = sub_template_scale;
+            }
+        }
+    }
+
+    return score;
+}
+
+bool SpectrogramMatcher::skip(const std::vector<AudioSpectrum>& new_spectrums){
+    // Note: ideally we don't want to have any computation while skipping.
+    // But update_to_new_spectrums() may still do some filtering and vector norm computation.
+    // Since the computation is relatively small and we won't be skipping lots of frames anyway,
+    // this should be fine for now.
+    // We can improve this later.
+    return update_to_new_spectrums(new_spectrums);
+}
+
+void SpectrogramMatcher::clear(){
+    m_spectrums.clear();
+    m_spectrum_norm_sqrs.clear();
+    m_last_stamp_tested = SIZE_MAX;
+    m_last_scale = 0.0;
+}
+
+
+
+
+}
diff --git a/SerialPrograms/Source/CommonTools/Audio/SpectrogramMatcher.h b/SerialPrograms/Source/CommonTools/Audio/SpectrogramMatcher.h
new file mode 100644
index 0000000000..c38c1b8161
--- /dev/null
+++ b/SerialPrograms/Source/CommonTools/Audio/SpectrogramMatcher.h
@@ -0,0 +1,134 @@
+/*  Spectrogram Matcher
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_CommonTools_SpectrogramMatcher_H
+#define PokemonAutomation_CommonTools_SpectrogramMatcher_H
+
+#include <cstddef>
+#include <array>
+#include <memory>
+#include <vector>
+#include <list>
+#include "CommonFramework/AudioPipeline/AudioFeed.h"
+#include "CommonFramework/AudioPipeline/AudioTemplate.h"
+
+namespace PokemonAutomation{
+
+class AudioSpectrum;
+
+// Load an audio template from disk and use its spectrogram to match the
+// spectrogram of the incoming audio stream.
+class SpectrogramMatcher{
+public:
+    enum class Mode{
+        // Don't do any processing on each window of spectrum, matching raw spectrums.
+        RAW,
+        // Do convolution on each window of spectrum with a peak detection kernel, before matching spectrums.
+        SPIKE_CONV,
+        // Do convolution on each window of spectrum with a Gaussian smooth kernel, before matching spectrums.
+        // GAUSSIAN_CONV,
+        // Average every 5 frequencies to reduce computation.
+        AVERAGE_5,
+    };
+
+    // audio_template: the audio template for the audio stream to match against.
+    //  Use AudioTemplate::load_audio_template() to load a template from disk, or
+    //  use AudioTemplateCache::instance().get_throw(audio_resource_relative_path, sample_rate) to get one from cache.
+    // mode: which type of spectrogram filtering to use before the actual match.
+    // sample_rate: audio sample rate.
+    // low_frequency_filter: only match the frequencies above this threshold.
+    // template_subdivision: divide the template into how many sub-templates to match. <= 1 means no subdivision.
+    SpectrogramMatcher(
+        std::string name,
+        AudioTemplate audio_template, Mode mode, size_t sample_rate,
+        double low_frequency_filter, size_t template_subdivision = 0
+    );
+
+    size_t sample_rate() const{ return m_sample_rate; }
+
+    // Match the newest spectrums and return a match score.
+    // Newer (larger timestamp) spectrums at beginning of `new_spectrums` while older (smaller
+    // timestamp) spectrums at the end.
+    // In invalid cases (internal error or not enough windows), return FLT_MAX
+    float match(const std::vector<AudioSpectrum>& new_spectrums);
+
+    // Pass some spectrums in but don't run match on them.
+    // Used for skipping some spectrums to avoid unnecessary matching.
+    // Newer (larger timestamp) spectrums at beginning of `new_spectrums` while older (smaller
+    // timestamp) spectrums at the end.
+    // Return true if there is no error.
+    bool skip(const std::vector<AudioSpectrum>& new_spectrums);
+
+    // Clear internal data to be used on another audio stream.
+    void clear();
+
+    // How many windows are used for matching.
+    size_t num_matched_windows() const { return m_num_spectrums_needed; }
+
+    // Return latest timestamp from the stored audio spectrum stream.
+    // Return SIZE_MAX if there is no stored spectrum yet.
+    uint64_t latest_timestamp() const;
+
+    // Return the scale found by the matcher to scale the input audio stream to best
+    // match the template in the last `match()`.
+    // Return 0.0f if the last scale is not available.
+    float last_matched_scale() const { return m_last_scale; }
+
+private:
+    void conv(const float* src, size_t num, float* dst);
+    
+    // The function to build `m_template_norm`
+    std::vector<float> build_template_norm() const;
+
+    // For a given sub-template, return its match score and scaling factor
+    std::pair<float, float> match_sub_template(size_t sub_index) const;
+
+    // Update internal data for the next new spectrum. Called by `update_to_new_spectrums()`.
+    // Return true if there is no error.
+    bool update_to_new_spectrum(AudioSpectrum new_spectrum);
+
+    // Update internal data for the new specttrums.
+    // Return true if there is no error.
+    bool update_to_new_spectrums(const std::vector<AudioSpectrum>& new_spectrums);
+
+
+
+private:
+    std::string m_name;
+    AudioTemplate m_template;
+
+    size_t m_sample_rate;
+
+    size_t m_num_original_frequencies = 0;
+    size_t m_original_freq_start = 0;
+    size_t m_original_freq_end = 0;
+
+    size_t m_freq_start = 0;
+    size_t m_freq_end = 0;
+    // Temporal ranges of the template to match with. Used when matching a subdivided template.
+    // If there is no subdivision, it will store only one pair: <0, m_template.num_windows()>
+    std::vector<std::pair<size_t, size_t>> m_template_range;
+    // For each subdivided template, store its sepctrogram matrix norm
+    std::vector<float> m_template_norm;
+
+    Mode m_mode = Mode::RAW;
+
+    std::vector<float> m_conv_kernel;
+
+    // Spectrums from audio feed. They will be matched against the template.
+    std::list<AudioSpectrum> m_spectrums;
+    // Norm squares of each spectrum in `m_spectrums`.
+    std::list<float> m_spectrum_norm_sqrs;
+    // How many spectrums needed to store.
+    size_t m_num_spectrums_needed = 0;
+
+    size_t m_last_stamp_tested = SIZE_MAX;
+    float m_last_scale = 0.0f;
+};
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonTools/DetectedBoxes.cpp b/SerialPrograms/Source/CommonTools/DetectedBoxes.cpp
new file mode 100644
index 0000000000..8bec9bffb3
--- /dev/null
+++ b/SerialPrograms/Source/CommonTools/DetectedBoxes.cpp
@@ -0,0 +1,97 @@
+/*  Detected Boxes
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <map>
+#include "DetectedBoxes.h"
+
+namespace PokemonAutomation{
+
+
+void merge_overlapping_boxes(
+    std::vector<ImagePixelBox>& input_boxes,
+    double tolerance
+){
+    std::multimap<size_t, ImagePixelBox> boxes; // detection box area -> box
+    for (const ImagePixelBox& box : input_boxes){
+        boxes.emplace(box.area(), box);
+    }
+    input_boxes.clear();
+//    cout << "boxes.size() = " << boxes.size() << endl;
+
+    // default ratio is 1.2
+    double ratio = 1.0 + tolerance;
+
+    while (!boxes.empty()){
+        // Start from the smallest box:
+        auto current = boxes.begin();
+        const size_t current_area = current->first;
+        // get a max limit of area, e.g. current_box_area * 1.2
+        const size_t limit = (size_t)(current_area * ratio);
+        auto candidate = current;
+        ++candidate;
+        while (candidate != boxes.end()){
+            // skip if candidate area > limit
+            if (candidate->first > limit){
+                break;
+            }
+            // candiate area <= limit, further testing there overlapped area
+            size_t overlap_area = current->second.overlapping_area(candidate->second);
+            if ((double)overlap_area * ratio > current_area){
+                current->second.merge_with(candidate->second);
+                candidate = boxes.erase(candidate);
+            }else{
+                ++candidate;
+            }
+        }
+        input_boxes.emplace_back(current->second);
+        boxes.erase(current);
+    }
+}
+
+
+void merge_overlapping_boxes(
+    std::vector<DetectedBox>& input_boxes,
+    double tolerance
+){
+    std::multimap<double, DetectedBox> boxes; // detection box area -> box
+    for (const DetectedBox& box : input_boxes){
+        boxes.emplace(box.box.area(), box);
+    }
+    input_boxes.clear();
+//    cout << "boxes.size() = " << boxes.size() << endl;
+
+    // default ratio is 1.2
+    double ratio = 1.0 + tolerance;
+
+    while (!boxes.empty()){
+        // Start from the smallest box:
+        auto current = boxes.begin();
+        const double current_area = current->first;
+        // get a max limit of area, e.g. current_box_area * 1.2
+        const double limit = (current_area * ratio);
+        auto candidate = current;
+        ++candidate;
+        while (candidate != boxes.end()){
+            // skip if candidate area > limit
+            if (candidate->first > limit){
+                break;
+            }
+            // candiate area <= limit, further testing there overlapped area
+            double overlap_area = current->second.box.overlapping_area(candidate->second.box);
+            if (overlap_area * ratio > current_area){
+                current->second.box.merge_with(candidate->second.box);
+                candidate = boxes.erase(candidate);
+            }else{
+                ++candidate;
+            }
+        }
+        input_boxes.emplace_back(current->second);
+        boxes.erase(current);
+    }
+}
+
+
+}
diff --git a/SerialPrograms/Source/CommonTools/DetectedBoxes.h b/SerialPrograms/Source/CommonTools/DetectedBoxes.h
new file mode 100644
index 0000000000..56e18bfb16
--- /dev/null
+++ b/SerialPrograms/Source/CommonTools/DetectedBoxes.h
@@ -0,0 +1,39 @@
+/*  Detected Boxes
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_CommonTools_DetectedBoxes_H
+#define PokemonAutomation_CommonTools_DetectedBoxes_H
+
+#include <string>
+#include <vector>
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+
+namespace PokemonAutomation{
+
+struct DetectedBox{
+    std::string name;
+    ImageFloatBox box;
+};
+
+// Merge heavily overlapping pixel boxes. Input boxes is modified in place.
+// Order detection boxes by their areas, then starting at the smallest box, trying to deduplicate
+// boxes close to the current box.
+// The duplication criteria is:
+//   candidate_box.area <= current_box_area * (1+tolerance), and
+//   overlap_area(candidate_box, current_box) * (1+tolerance) > current_box_area.
+void merge_overlapping_boxes(std::vector<ImagePixelBox>& boxes, double tolerance = 0.2);
+
+// Merge heavily overlapping pixel boxes. Input boxes is modified in place.
+// Order detection boxes by their areas, then starting at the smallest box, trying to deduplicate
+// boxes close to the current box.
+// The duplication criteria is:
+//   candidate_box.area <= current_box_area * (1+tolerance), and
+//   overlap_area(candidate_box, current_box) * (1+tolerance) > current_box_area.
+void merge_overlapping_boxes(std::vector<DetectedBox>& boxes, double tolerance = 0.2);
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/Inference/DetectionDebouncer.h b/SerialPrograms/Source/CommonTools/DetectionDebouncer.h
similarity index 84%
rename from SerialPrograms/Source/CommonFramework/Inference/DetectionDebouncer.h
rename to SerialPrograms/Source/CommonTools/DetectionDebouncer.h
index c6fae8a2b7..ee4f41cf24 100644
--- a/SerialPrograms/Source/CommonFramework/Inference/DetectionDebouncer.h
+++ b/SerialPrograms/Source/CommonTools/DetectionDebouncer.h
@@ -1,11 +1,11 @@
 /*  Detection Debouncer
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#ifndef PokemonAutomation_CommonFramework_DetectionDebouncer_H
-#define PokemonAutomation_CommonFramework_DetectionDebouncer_H
+#ifndef PokemonAutomation_CommonTools_DetectionDebouncer_H
+#define PokemonAutomation_CommonTools_DetectionDebouncer_H
 
 #include <functional>
 #include <atomic>
diff --git a/SerialPrograms/Source/CommonTools/FailureWatchdog.h b/SerialPrograms/Source/CommonTools/FailureWatchdog.h
new file mode 100644
index 0000000000..8ce85526c4
--- /dev/null
+++ b/SerialPrograms/Source/CommonTools/FailureWatchdog.h
@@ -0,0 +1,122 @@
+/*  Failure Watchdog
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_CommonTools_FailureWatchdog_H
+#define PokemonAutomation_CommonTools_FailureWatchdog_H
+
+#include "Common/Cpp/Logging/AbstractLogger.h"
+#include "Common/Cpp/Time.h"
+#include "Common/Cpp/Exceptions.h"
+#include "CommonFramework/Language.h"
+
+namespace PokemonAutomation{
+
+
+
+
+
+class FailureWatchdog{
+public:
+    FailureWatchdog(
+        Logger& logger,
+        Language language,
+//        std::string failure_message,
+        uint64_t min_count = 5,
+        double min_success_rate = 0.5,
+        std::chrono::seconds time_limit = std::chrono::seconds(120)
+    )
+        : m_logger(logger)
+        , m_language(language)
+//        , m_failure_message(std::move(failure_message))
+        , m_min_count(min_count)
+        , m_min_success_rate(min_success_rate)
+        , m_time_limit(time_limit)
+    {
+        restart();
+    }
+    void restart(){
+        m_expiration = current_time() + m_time_limit;
+        m_expired = false;
+        m_successes = 0;
+        m_total = 0;
+    }
+
+    void push_result(bool success){
+        m_successes += success ? 1 : 0;
+        m_total++;
+        if (success || m_expired){
+            return;
+        }
+
+        WallClock current = current_time();
+        if (current >= m_expiration){
+            m_expired = true;
+        }
+
+        if (m_total < m_min_count){
+            return;
+        }
+
+        double threshold = (double)m_total * m_min_success_rate;
+        if ((double)m_successes >= threshold){
+            return;
+        }
+
+
+        throw UserSetupError(
+            m_logger,
+            "Too many text recognition errors. Did you set the correct language?\n"
+            "Current Language: " + language_data(m_language).name
+        );
+    }
+
+
+private:
+    Logger& m_logger;
+    Language m_language;
+//    std::string m_failure_message;
+    uint64_t m_min_count;
+    double m_min_success_rate;
+    WallDuration m_time_limit;
+    WallClock m_expiration;
+    bool m_expired;
+
+    uint64_t m_successes;
+    uint64_t m_total;
+};
+
+
+
+
+
+class OcrFailureWatchdog : public FailureWatchdog{
+public:
+    OcrFailureWatchdog(
+        Logger& logger,
+        Language language,
+//        std::string failure_message = "Too many text recognition errors. Did you set the correct language?",
+        uint64_t min_count = 5,
+        double min_success_rate = 0.5,
+        std::chrono::seconds time_limit = std::chrono::seconds(120)
+    )
+        : FailureWatchdog(
+            logger,
+            language,
+//            std::move(failure_message),
+            min_count,
+            min_success_rate,
+            time_limit
+        )
+    {}
+};
+
+
+
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonTools/ImageMatch/CroppedImageDictionaryMatcher.cpp b/SerialPrograms/Source/CommonTools/ImageMatch/CroppedImageDictionaryMatcher.cpp
new file mode 100644
index 0000000000..63802485c9
--- /dev/null
+++ b/SerialPrograms/Source/CommonTools/ImageMatch/CroppedImageDictionaryMatcher.cpp
@@ -0,0 +1,133 @@
+/*  Cropped Image Matcher
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <iostream>
+#include "Common/Cpp/Exceptions.h"
+#include "CommonFramework/StaticGlobals.h"
+#include "CommonFramework/Logging/Logger.h"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/Tools/DebugDumper.h"
+//#include "ImageDiff.h"
+#include "ImageCropper.h"
+#include "CroppedImageDictionaryMatcher.h"
+
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace ImageMatch{
+
+
+
+CroppedImageDictionaryMatcher::CroppedImageDictionaryMatcher(const WeightedExactImageMatcher::InverseStddevWeight& weight)
+    : m_weight(weight)
+{}
+void CroppedImageDictionaryMatcher::add(const std::string& slug, const ImageViewRGB32& image){
+    if (!image){
+        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Null image.");
+    }
+    auto iter = m_database.find(slug);
+    if (iter != m_database.end()){
+        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Duplicate slug: " + slug);
+    }
+
+    ImageViewRGB32 cropped = trim_image_alpha(image);
+
+#if 0
+    if (slug == "hamburger"){
+        image.save("matcher-original.png");
+        cropped.save("matcher-cropped.png");
+    }
+#endif
+
+    iter = m_database.emplace(
+        std::piecewise_construct,
+        std::forward_as_tuple(slug),
+        std::forward_as_tuple(cropped.copy(), m_weight)
+    ).first;
+//    cout << iter->first << ": " << iter->second.stats().stddev.sum() << endl;
+}
+
+
+
+ImageMatchResult CroppedImageDictionaryMatcher::match(
+    const ImageViewRGB32& image,
+    double alpha_spread
+) const{
+    ImageMatchResult results;
+    if (!image){
+        return results;
+    }
+
+    if (STATIC_GLOBALS.IMAGE_DICTIONARY_MATCHING){
+        std::cout << "CroppedImageDictionaryMatcher: match input image: " << std::endl;
+        dump_debug_image(global_logger_command_line(), "CommonFramework/CroppedImageDictionaryMatcher", "match_input", image);
+    }
+
+    std::vector<ImageViewRGB32> crops = get_crop_candidates(image);
+
+    if (STATIC_GLOBALS.IMAGE_DICTIONARY_MATCHING){
+//        size_t c = 0;
+        for (const ImageViewRGB32& crop : crops){
+//            std::cout << "CroppedImageDictionaryMatcher: process input" << c << "image with background " << crop.background.to_string() << std::endl;
+            dump_debug_image(global_logger_command_line(), "CommonFramework/CroppedImageDictionaryMatcher", "match_input_processed", crop);
+//            c++;
+        }
+    }
+
+    for (const auto& item : m_database){
+        for (const ImageViewRGB32& crop : crops){
+            double alpha = item.second.diff(crop);
+            results.add(alpha, item.first);
+            results.clear_beyond_spread(alpha_spread);
+        }
+    }
+
+#if 0
+    Color background;
+    ImageViewRGB32 processed = cropped[0].image;
+    background = cropped[0].background;
+
+//    ImageRGB32 processed = process_image(image, background);
+    if (STATIC_GLOBALS.IMAGE_DICTIONARY_MATCHING){
+        std::cout << "CroppedImageDictionaryMatcher: process input image with background " << background.to_string() << std::endl;
+        dump_debug_image(global_logger_command_line(), "CommonFramework/CroppedImageDictionaryMatcher", "match_input_processed", processed);
+    }
+
+    processed.save("processed.png");
+
+    for (const auto& item : m_database){
+#if 0
+        if (item.first != "onion"){
+            continue;
+        }
+#endif
+        double alpha = item.second.diff(processed);
+        results.add(alpha, item.first);
+        results.clear_beyond_spread(alpha_spread);
+    }
+#endif
+
+    if (STATIC_GLOBALS.IMAGE_DICTIONARY_MATCHING){
+        std::cout << "CroppedImageDictionaryMatcher: results: " << std::endl;
+        size_t count = 0;
+        for (const auto& result : results.results){
+            std::cout << "alpha=" << result.first << ", " << result.second << std::endl;
+            const auto& image_template = m_database.find(result.second)->second.image_template();
+            dump_debug_image(global_logger_command_line(), "CommonFramework/CroppedImageDictionaryMatcher", "match_result_" + std::to_string(count) + "_" + result.second, image_template);
+            ++count;
+        }
+    }
+    return results;
+}
+
+
+
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/CommonTools/ImageMatch/CroppedImageDictionaryMatcher.h b/SerialPrograms/Source/CommonTools/ImageMatch/CroppedImageDictionaryMatcher.h
new file mode 100644
index 0000000000..575dfaca5d
--- /dev/null
+++ b/SerialPrograms/Source/CommonTools/ImageMatch/CroppedImageDictionaryMatcher.h
@@ -0,0 +1,43 @@
+/*  Cropped Image Dictionary Matcher
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_CommonTools_CroppedImageDictionaryMatcher_H
+#define PokemonAutomation_CommonTools_CroppedImageDictionaryMatcher_H
+
+#include <vector>
+#include "ImageMatchResult.h"
+#include "ExactImageMatcher.h"
+
+namespace PokemonAutomation{
+namespace ImageMatch{
+
+// Similar to `ExactImageDictionaryMatcher` but will crop the image based on background pixel colors before matching.
+class CroppedImageDictionaryMatcher{
+public:
+    CroppedImageDictionaryMatcher(
+        const WeightedExactImageMatcher::InverseStddevWeight& weight = WeightedExactImageMatcher::InverseStddevWeight()
+    );
+    virtual ~CroppedImageDictionaryMatcher() = default;
+
+    void add(const std::string& slug, const ImageViewRGB32& image);
+
+    ImageMatchResult match(const ImageViewRGB32& image, double alpha_spread) const;
+
+
+protected:
+    //  Return potential crops for this image.
+    virtual std::vector<ImageViewRGB32> get_crop_candidates(const ImageViewRGB32& image) const = 0;
+
+
+private:
+    WeightedExactImageMatcher::InverseStddevWeight m_weight;
+    std::map<std::string, WeightedExactImageMatcher> m_database;
+};
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/ImageMatch/ExactImageDictionaryMatcher.cpp b/SerialPrograms/Source/CommonTools/ImageMatch/ExactImageDictionaryMatcher.cpp
similarity index 94%
rename from SerialPrograms/Source/CommonFramework/ImageMatch/ExactImageDictionaryMatcher.cpp
rename to SerialPrograms/Source/CommonTools/ImageMatch/ExactImageDictionaryMatcher.cpp
index 0624d48061..711a1dcff0 100644
--- a/SerialPrograms/Source/CommonFramework/ImageMatch/ExactImageDictionaryMatcher.cpp
+++ b/SerialPrograms/Source/CommonTools/ImageMatch/ExactImageDictionaryMatcher.cpp
@@ -1,6 +1,6 @@
 /*  Exact Image Matcher
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -9,12 +9,12 @@
 #include "Common/Cpp/Exceptions.h"
 #include "CommonFramework/ImageTypes/ImageViewRGB32.h"
 #include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "ImageDiff.h"
+#include "CommonFramework/ImageTools/ImageDiff.h"
 #include "ExactImageDictionaryMatcher.h"
 
-#include <iostream>
-using std::cout;
-using std::endl;
+//#include <iostream>
+//using std::cout;
+//using std::endl;
 
 namespace PokemonAutomation{
 namespace ImageMatch{
@@ -23,7 +23,7 @@ namespace ImageMatch{
 
 // Generate candidate images to be matched against by translating the input image area
 // (`box` on `screen`) around.
-// The returned candidate images are scaled to match template shape `dimenstion`.
+// The returned candidate images are scaled to match template shape `dimension`.
 // `tolerance`: how much translation variances to produce.
 //   e.g. tolerance of 1 means translating the candidate images around so that it can match
 //   the template with at most 1 pixel off on the template image. 
diff --git a/SerialPrograms/Source/CommonFramework/ImageMatch/ExactImageDictionaryMatcher.h b/SerialPrograms/Source/CommonTools/ImageMatch/ExactImageDictionaryMatcher.h
similarity index 89%
rename from SerialPrograms/Source/CommonFramework/ImageMatch/ExactImageDictionaryMatcher.h
rename to SerialPrograms/Source/CommonTools/ImageMatch/ExactImageDictionaryMatcher.h
index 53b8e4f6d5..94e1658d88 100644
--- a/SerialPrograms/Source/CommonFramework/ImageMatch/ExactImageDictionaryMatcher.h
+++ b/SerialPrograms/Source/CommonTools/ImageMatch/ExactImageDictionaryMatcher.h
@@ -1,11 +1,11 @@
 /*  Exact Image Dictionary Matcher
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#ifndef PokemonAutomation_CommonFramework_ExactImageDictionaryMatcher_H
-#define PokemonAutomation_CommonFramework_ExactImageDictionaryMatcher_H
+#ifndef PokemonAutomation_CommonTools_ExactImageDictionaryMatcher_H
+#define PokemonAutomation_CommonTools_ExactImageDictionaryMatcher_H
 
 #include <string>
 #include <map>
diff --git a/SerialPrograms/Source/CommonFramework/ImageMatch/ExactImageMatcher.cpp b/SerialPrograms/Source/CommonTools/ImageMatch/ExactImageMatcher.cpp
similarity index 93%
rename from SerialPrograms/Source/CommonFramework/ImageMatch/ExactImageMatcher.cpp
rename to SerialPrograms/Source/CommonTools/ImageMatch/ExactImageMatcher.cpp
index 85cfd668e2..fc101bff81 100644
--- a/SerialPrograms/Source/CommonFramework/ImageMatch/ExactImageMatcher.cpp
+++ b/SerialPrograms/Source/CommonTools/ImageMatch/ExactImageMatcher.cpp
@@ -1,12 +1,12 @@
 /*  Image Match Preprocessed Data
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include <cmath>
 #include "Common/Cpp/Exceptions.h"
-#include "ImageDiff.h"
+#include "CommonFramework/ImageTools/ImageDiff.h"
 #include "ExactImageMatcher.h"
 
 //#include <iostream>
diff --git a/SerialPrograms/Source/CommonFramework/ImageMatch/ExactImageMatcher.h b/SerialPrograms/Source/CommonTools/ImageMatch/ExactImageMatcher.h
similarity index 88%
rename from SerialPrograms/Source/CommonFramework/ImageMatch/ExactImageMatcher.h
rename to SerialPrograms/Source/CommonTools/ImageMatch/ExactImageMatcher.h
index 11666ac8b3..3c1f109adc 100644
--- a/SerialPrograms/Source/CommonFramework/ImageMatch/ExactImageMatcher.h
+++ b/SerialPrograms/Source/CommonTools/ImageMatch/ExactImageMatcher.h
@@ -1,23 +1,22 @@
 /*  Exact Image Match Preprocessed Data
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#ifndef PokemonAutomation_ExactImageMatcher_H
-#define PokemonAutomation_ExactImageMatcher_H
+#ifndef PokemonAutomation_CommonTools_ExactImageMatcher_H
+#define PokemonAutomation_CommonTools_ExactImageMatcher_H
 
 #include "CommonFramework/ImageTypes/ImageRGB32.h"
-#include "CommonFramework/ImageTools/FloatPixel.h"
 #include "CommonFramework/ImageTools/ImageStats.h"
 
 namespace PokemonAutomation{
 namespace ImageMatch{
 
 
-//  Match images against a template.
+//  Match images against a template image.
 //  Before matching, resize the input image to the template shape and scale template brightness to
-//  match the input image. Alpha channels as used as masks in matching.
+//  match the input image. The template alpha channel is used as masks in matching.
 //  No other treatment like tolerating translation or scaling based on stddevs, hence the name "Exact".
 class ExactImageMatcher{
     ExactImageMatcher(ExactImageMatcher&&) = default;
@@ -26,6 +25,9 @@ class ExactImageMatcher{
     void operator=(const ExactImageMatcher&) = delete;
 
 public:
+    ExactImageMatcher(const std::string& image_template)
+        : ExactImageMatcher(ImageRGB32(image_template))
+    {}
     ExactImageMatcher(ImageRGB32 image_template);
     
     const ImageStats& stats() const{ return m_stats; }
diff --git a/SerialPrograms/Source/CommonFramework/ImageMatch/FilterToAlpha.cpp b/SerialPrograms/Source/CommonTools/ImageMatch/FilterToAlpha.cpp
similarity index 93%
rename from SerialPrograms/Source/CommonFramework/ImageMatch/FilterToAlpha.cpp
rename to SerialPrograms/Source/CommonTools/ImageMatch/FilterToAlpha.cpp
index 100465f58d..682bd1ffd9 100644
--- a/SerialPrograms/Source/CommonFramework/ImageMatch/FilterToAlpha.cpp
+++ b/SerialPrograms/Source/CommonTools/ImageMatch/FilterToAlpha.cpp
@@ -1,6 +1,6 @@
 /*  Filter to Alpha
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/CommonTools/ImageMatch/FilterToAlpha.h b/SerialPrograms/Source/CommonTools/ImageMatch/FilterToAlpha.h
new file mode 100644
index 0000000000..4e7611ca45
--- /dev/null
+++ b/SerialPrograms/Source/CommonTools/ImageMatch/FilterToAlpha.h
@@ -0,0 +1,26 @@
+/*  Filter to Alpha
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_CommonTools_FilterToAlpha_H
+#define PokemonAutomation_CommonTools_FilterToAlpha_H
+
+#include <stdint.h>
+
+namespace PokemonAutomation{
+    class ImageRGB32;
+namespace ImageMatch{
+
+
+
+//  For each pixel, set the alpha channel to 255 if the RGB sum is no greater than "max_rgb_sum".
+//  The rest pixels are set to 0 alpha.
+//  This function is fast.
+void set_alpha_black(ImageRGB32& image, uint32_t max_rgb_sum = 100);
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/ImageMatch/ImageCropper.cpp b/SerialPrograms/Source/CommonTools/ImageMatch/ImageCropper.cpp
similarity index 86%
rename from SerialPrograms/Source/CommonFramework/ImageMatch/ImageCropper.cpp
rename to SerialPrograms/Source/CommonTools/ImageMatch/ImageCropper.cpp
index 72793e99e0..7e3c66ea91 100644
--- a/SerialPrograms/Source/CommonFramework/ImageMatch/ImageCropper.cpp
+++ b/SerialPrograms/Source/CommonTools/ImageMatch/ImageCropper.cpp
@@ -1,6 +1,6 @@
 /*  Image Cropper
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -53,11 +53,16 @@ ImagePixelBox enclosing_rectangle_with_pixel_filter(const ImageViewRGB32& image,
     size_t cs = 0;
     size_t ce = image.width();
 
+//    cout << "Before: rs = " << rs << ", re = " << re << ", cs = " << cs << ", ce = " << ce << endl;
+
     // If we cannot find a foreground (aka, alpha != 0) pixel on one row or column, we trim it, until hitting a foreground pixel.
     while (rs < re && is_background_row(image, rs    , is_foreground)) rs++;
     while (re > rs && is_background_row(image, re - 1, is_foreground)) re--;
     while (cs < ce && is_background_col(image, cs    , is_foreground)) cs++;
     while (ce > cs && is_background_col(image, ce - 1, is_foreground)) ce--;
+
+//    cout << "After:  rs = " << rs << ", re = " << re << ", cs = " << cs << ", ce = " << ce << endl;
+
     return ImagePixelBox(cs, rs, ce, re);
 }
 
diff --git a/SerialPrograms/Source/CommonFramework/ImageMatch/ImageCropper.h b/SerialPrograms/Source/CommonTools/ImageMatch/ImageCropper.h
similarity index 75%
rename from SerialPrograms/Source/CommonFramework/ImageMatch/ImageCropper.h
rename to SerialPrograms/Source/CommonTools/ImageMatch/ImageCropper.h
index 1c85aa0adf..843196d107 100644
--- a/SerialPrograms/Source/CommonFramework/ImageMatch/ImageCropper.h
+++ b/SerialPrograms/Source/CommonTools/ImageMatch/ImageCropper.h
@@ -1,11 +1,11 @@
 /*  Image Cropper
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#ifndef PokemonAutomation_CommonFramework_ImageCropper_H
-#define PokemonAutomation_CommonFramework_ImageCropper_H
+#ifndef PokemonAutomation_CommonTools_ImageCropper_H
+#define PokemonAutomation_CommonTools_ImageCropper_H
 
 #include <functional>
 #include "Common/Cpp/Color.h"
@@ -22,7 +22,7 @@ namespace ImageMatch{
 ImageViewRGB32 trim_image_alpha(const ImageViewRGB32& image, uint8_t alpha_threshold = 128);
 
 
-//  Filter out object from background.
+//  Find a crop of the object based on background color.
 //  The pixels of the object are defined as is_object(pixel_color) == true.
 //  Return the rectangle enclosing the object.
 ImagePixelBox enclosing_rectangle_with_pixel_filter(const ImageViewRGB32& image, const std::function<bool(Color)>& is_object);
diff --git a/SerialPrograms/Source/CommonTools/ImageMatch/ImageMatchOption.cpp b/SerialPrograms/Source/CommonTools/ImageMatch/ImageMatchOption.cpp
new file mode 100644
index 0000000000..defc7f6a1e
--- /dev/null
+++ b/SerialPrograms/Source/CommonTools/ImageMatch/ImageMatchOption.cpp
@@ -0,0 +1,16 @@
+/*  Image Match Option
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+
+namespace PokemonAutomation{
+namespace ImageMatch{
+
+
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/CommonTools/ImageMatch/ImageMatchOption.h b/SerialPrograms/Source/CommonTools/ImageMatch/ImageMatchOption.h
new file mode 100644
index 0000000000..cbca6c1648
--- /dev/null
+++ b/SerialPrograms/Source/CommonTools/ImageMatch/ImageMatchOption.h
@@ -0,0 +1,21 @@
+/*  Image Match Option
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_CommonTools_ImageMatchOption_H
+#define PokemonAutomation_CommonTools_ImageMatchOption_H
+
+#include "Common/Cpp/Options/ConfigOption.h"
+
+namespace PokemonAutomation{
+namespace ImageMatch{
+
+
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/ImageMatch/ImageMatchResult.cpp b/SerialPrograms/Source/CommonTools/ImageMatch/ImageMatchResult.cpp
similarity index 92%
rename from SerialPrograms/Source/CommonFramework/ImageMatch/ImageMatchResult.cpp
rename to SerialPrograms/Source/CommonTools/ImageMatch/ImageMatchResult.cpp
index 9cac6f3e97..a271140405 100644
--- a/SerialPrograms/Source/CommonFramework/ImageMatch/ImageMatchResult.cpp
+++ b/SerialPrograms/Source/CommonTools/ImageMatch/ImageMatchResult.cpp
@@ -1,6 +1,6 @@
 /*  Image Match Result
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/CommonFramework/ImageMatch/ImageMatchResult.h b/SerialPrograms/Source/CommonTools/ImageMatch/ImageMatchResult.h
similarity index 75%
rename from SerialPrograms/Source/CommonFramework/ImageMatch/ImageMatchResult.h
rename to SerialPrograms/Source/CommonTools/ImageMatch/ImageMatchResult.h
index b4a7cce2fc..6e89f47e05 100644
--- a/SerialPrograms/Source/CommonFramework/ImageMatch/ImageMatchResult.h
+++ b/SerialPrograms/Source/CommonTools/ImageMatch/ImageMatchResult.h
@@ -1,15 +1,15 @@
 /*  Image Match Result
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#ifndef PokemonAutomation_CommonFramework_ImageMatchResult_H
-#define PokemonAutomation_CommonFramework_ImageMatchResult_H
+#ifndef PokemonAutomation_CommonTools_ImageMatchResult_H
+#define PokemonAutomation_CommonTools_ImageMatchResult_H
 
 #include <string>
 #include <map>
-#include "Common/Cpp/AbstractLogger.h"
+#include "Common/Cpp/Logging/AbstractLogger.h"
 
 namespace PokemonAutomation{
 namespace ImageMatch{
@@ -31,7 +31,7 @@ struct ImageMatchResult{
     // Assume there is at least one result in `results`:
     // Remove other weaker match results that have a score that's larger than the best match score + `max_alpha_spread`.
     void clear_beyond_spread(double max_alpha_spread);
-    // Remove match results with scores < `max_alpha`.
+    // Remove match results with scores > `max_alpha`.
     void clear_beyond_alpha(double max_alpha);
 };
 
diff --git a/SerialPrograms/Source/CommonTools/ImageMatch/SilhouetteDictionaryMatcher.cpp b/SerialPrograms/Source/CommonTools/ImageMatch/SilhouetteDictionaryMatcher.cpp
new file mode 100644
index 0000000000..0c2b424177
--- /dev/null
+++ b/SerialPrograms/Source/CommonTools/ImageMatch/SilhouetteDictionaryMatcher.cpp
@@ -0,0 +1,86 @@
+/*  Cropped Silhouette Matcher
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Exceptions.h"
+#include "Common/Cpp/Concurrency/SpinLock.h"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/ImageTools/ImageDiff.h"
+#include "CommonFramework/Tools/GlobalThreadPools.h"
+#include "ImageCropper.h"
+#include "SilhouetteDictionaryMatcher.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace ImageMatch{
+
+
+void SilhouetteDictionaryMatcher::add(const std::string& slug, const ImageViewRGB32& image){
+    if (!image){
+        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Null image.");
+    }
+    auto iter = m_database.find(slug);
+    if (iter != m_database.end()){
+        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Duplicate slug: " + slug);
+    }
+
+    iter = m_database.emplace(
+        std::piecewise_construct,
+        std::forward_as_tuple(slug),
+        std::forward_as_tuple(trim_image_alpha(image).copy())
+    ).first;
+    m_database_vector.emplace_back(&*iter);
+}
+
+
+
+ImageMatchResult SilhouetteDictionaryMatcher::match(
+    const ImageViewRGB32& image,
+    double alpha_spread
+) const{
+    ImageMatchResult results;
+    if (!image){
+        return results;
+    }
+
+    SpinLock lock;
+    GlobalThreadPools::computation_normal().run_in_parallel(
+        [&](size_t index){
+            const auto& matcher = *m_database_vector[index];
+            double alpha = matcher.second.rmsd_masked(image);
+            WriteSpinLock lg(lock);
+            results.add(alpha, matcher.first);
+            results.clear_beyond_spread(alpha_spread);
+        },
+        0, m_database_vector.size(),
+        100
+    );
+
+
+#if 0
+    for (const auto& item : m_database){
+//        if (item.first != "solosis"){
+//            continue;
+//        }
+        double alpha = item.second.rmsd_masked(image);
+//        WriteSpinLock lg(lock);
+        results.add(alpha, item.first);
+        results.clear_beyond_spread(alpha_spread);
+    }
+#endif
+
+    return results;
+}
+
+
+
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/CommonFramework/ImageMatch/SilhouetteDictionaryMatcher.h b/SerialPrograms/Source/CommonTools/ImageMatch/SilhouetteDictionaryMatcher.h
similarity index 85%
rename from SerialPrograms/Source/CommonFramework/ImageMatch/SilhouetteDictionaryMatcher.h
rename to SerialPrograms/Source/CommonTools/ImageMatch/SilhouetteDictionaryMatcher.h
index 18a0c06c4d..f44b4a377e 100644
--- a/SerialPrograms/Source/CommonFramework/ImageMatch/SilhouetteDictionaryMatcher.h
+++ b/SerialPrograms/Source/CommonTools/ImageMatch/SilhouetteDictionaryMatcher.h
@@ -1,11 +1,11 @@
 /*  Silhouette Dictionary Matcher
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#ifndef PokemonAutomation_CommonFramework_SilhouetteDictionaryMatcher_H
-#define PokemonAutomation_CommonFramework_SilhouetteDictionaryMatcher_H
+#ifndef PokemonAutomation_CommonTools_SilhouetteDictionaryMatcher_H
+#define PokemonAutomation_CommonTools_SilhouetteDictionaryMatcher_H
 
 //#include "Common/Compiler.h"
 //#include "CommonFramework/ImageTools/FloatPixel.h"
@@ -47,6 +47,7 @@ class SilhouetteDictionaryMatcher{
 
 private:
     std::map<std::string, ExactImageMatcher> m_database;
+    std::vector<const std::pair<const std::string, ExactImageMatcher>*> m_database_vector;
 };
 
 
diff --git a/SerialPrograms/Source/CommonFramework/ImageMatch/SubObjectTemplateMatcher.cpp b/SerialPrograms/Source/CommonTools/ImageMatch/SubObjectTemplateMatcher.cpp
similarity index 86%
rename from SerialPrograms/Source/CommonFramework/ImageMatch/SubObjectTemplateMatcher.cpp
rename to SerialPrograms/Source/CommonTools/ImageMatch/SubObjectTemplateMatcher.cpp
index 48fcdb92c7..3274301084 100644
--- a/SerialPrograms/Source/CommonFramework/ImageMatch/SubObjectTemplateMatcher.cpp
+++ b/SerialPrograms/Source/CommonTools/ImageMatch/SubObjectTemplateMatcher.cpp
@@ -1,18 +1,17 @@
 /*  Sub-Object Template Matcher
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include "Common/Cpp/Exceptions.h"
 #include "Kernels/Waterfill/Kernels_Waterfill_Types.h"
-#include "CommonFramework/Globals.h"
-#include "CommonFramework/ImageTools/BinaryImage_FilterRgb32.h"
+#include "CommonFramework/GlobalAutoPaths.h"
+#include "CommonTools/Images/BinaryImage_FilterRgb32.h"
 #include "SubObjectTemplateMatcher.h"
 
-#include <iostream>
-using std::cout;
-using std::endl;
+//#include <iostream>
+//using std::cout;
+//using std::endl;
 
 namespace PokemonAutomation{
 namespace ImageMatch{
@@ -98,12 +97,14 @@ void SubObjectTemplateMatcher::set_subobject(const WaterfillObject& subobject_in
     m_subobject_area_ratio = subobject_in_object.area_ratio();
 }
 bool SubObjectTemplateMatcher::check_aspect_ratio(size_t candidate_width, size_t candidate_height) const{
-//    double expected_aspect_ratio = (double)m_subobject_in_object_p.width() / m_subobject_in_object_p.height();
-//    double actual_aspect_ratio = (double)width / height;
+#if 0
+    double expected_aspect_ratio = (double)m_subobject_in_object_p.width() / m_subobject_in_object_p.height();
+    double actual_aspect_ratio = (double)candidate_width / candidate_height;
 //    double error = actual_aspect_ratio / expected_aspect_ratio;
 
-//    cout << "expected_aspect_ratio = " << expected_aspect_ratio << endl;
-//    cout << "actual_aspect_ratio = " << actual_aspect_ratio << endl;
+    cout << "expected_aspect_ratio = " << expected_aspect_ratio << endl;
+    cout << "actual_aspect_ratio = " << actual_aspect_ratio << endl;
+#endif
 
     double error = (double)m_subobject_in_object_p.width() * candidate_height;
     error /= (double)m_subobject_in_object_p.height() * candidate_width;
diff --git a/SerialPrograms/Source/CommonTools/ImageMatch/SubObjectTemplateMatcher.h b/SerialPrograms/Source/CommonTools/ImageMatch/SubObjectTemplateMatcher.h
new file mode 100644
index 0000000000..1440a35910
--- /dev/null
+++ b/SerialPrograms/Source/CommonTools/ImageMatch/SubObjectTemplateMatcher.h
@@ -0,0 +1,188 @@
+/*  Sub-Object Template Matcher
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *      Suppose we have an object with a distinctive sub-feature.
+ *
+ *  We want to find this object in an image. But instead of searching for the
+ *  entire object as a whole, we search for that distinctive sub-feature.
+ *
+ *  Once we've found that sub-feature and have it's bounding box, we want to
+ *  verify that the rest of the object matches the template.
+ *
+ */
+
+#ifndef PokemonAutomation_CommonTools_SubObjectTemplateMatcher_H
+#define PokemonAutomation_CommonTools_SubObjectTemplateMatcher_H
+
+#include "Common/Cpp/Color.h"
+#include "CommonFramework/ImageTypes/BinaryImage.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "ExactImageMatcher.h"
+
+namespace PokemonAutomation{
+namespace ImageMatch{
+
+
+// A base-class image matcher that uses the match of a sub-object feature inside an object to
+// locate the object and then checks the similarity between the object and the template.
+//
+// EXAMPLE: Detecting Pikachu Profile Picture by Red Cheek: we first match the red cheek, then
+// use the relative location of the cheek w.r.t the whole pikachu picture to locate a potential
+// pikachu candidate to match against a template pikachu picture.
+//
+// USAGE:
+// ======
+// 1. Create a derived class:
+//    class FlagMatcher : public SubObjectTemplateMatcher {
+//        FlagMatcher()
+//            : SubObjectTemplateMatcher("PokemonLA/Flag-Template.png", 100)
+//        {
+//            // Load template, find the left/right bar in it, set as sub-object
+//            std::vector<WaterfillObject> objects = find_objects_inplace(...);
+//            set_subobject(objects[0]);  // Set part of the template image is the sub-object
+//        }
+//    };
+//
+// 2. At runtime, use it to check candidates:
+//    FlagMatcher matcher(true);  // Looking for left bar
+//    ImagePixelBox object_box;
+//    if (matcher.matches(object_box, image, candidate_waterfill_object)){
+//        // Found a flag! object_box contains the full flag bounding box
+//    }
+class SubObjectTemplateMatcher{
+protected:
+    using WaterfillObject = Kernels::Waterfill::WaterfillObject;
+
+public:
+    virtual ~SubObjectTemplateMatcher() = default;
+
+    // Constructor: Load template image and set matching threshold
+    // - path: Relative path to template image (e.g., "PokemonLA/Flag-Template.png")
+    // - max_rmsd: Maximum RMSD (root mean square difference) to consider a match
+    //   Lower values = stricter matching. Typical range: 50-150
+    SubObjectTemplateMatcher(const char* path, double max_rmsd);
+
+    // Constructor with background replacement support
+    // Use this when the object has transparent or variable background pixels
+    // - path: Relative path to template image (e.g., "PokemonLA/Flag-Template.png")
+    // - background_replacement: Color to replace background pixels with before matching
+    // - max_rmsd: Maximum RMSD (root mean square difference) to consider a match
+    //   Lower values = stricter matching. Typical range: 50-150
+    SubObjectTemplateMatcher(const char* path, Color background_replacement, double max_rmsd);
+
+    // Calculate where the full object should be, given a detected sub-feature location
+    // - width, height: Dimensions of the full image being searched
+    // - subobject_in_image: Bounding box of the detected sub-feature w.r.t the full image.
+    // Returns: Bounding box where the full object should be located w.r.t the full image.
+    ImagePixelBox object_from_subobject(
+        size_t width, size_t height,
+        const ImagePixelBox& subobject_in_image
+    ) const;
+
+    // Compute RMSD between candidate object and template. RMSD = sqrt(mean((pixel_differences)^2))
+    // - object_box: [OUTPUT] Calculated bounding box of full object w.r.t to the input image
+    // - image: Input image to search in
+    // - subobject_in_image: Detected sub-feature location w.r.t. the image
+    // Returns: RMSD value (lower is better, 0 = perfect match)
+    double rmsd(
+        ImagePixelBox& object_box,
+        const ImageViewRGB32& image, const ImagePixelBox& subobject_in_image
+    ) const;
+
+    // Compute RMSD with background pixel replacement. RMSD = sqrt(mean((pixel_differences)^2))
+    // Before computing RMSD, replaces background pixels with `m_background_replacement` color
+    // - object_box: [OUTPUT] Calculated bounding box of full object w.r.t to the input image
+    // - image: Input image to search in
+    // - binary_image: Binary mask of the image where 0 = background, 1 = foreground
+    // - subobject_in_image: Detected sub-feature location w.r.t. the image
+    double rmsd_with_background_replace(
+        ImagePixelBox& object_box,
+        const ImageViewRGB32& image, const PackedBinaryMatrix& binary_image,
+        const ImagePixelBox& subobject_in_image
+    ) const;
+
+    // Given a found sub-feature as the waterfill object, check if the whole object matches the
+    // template.
+    // - object_box: [OUTPUT] If match succeeds, contains full object bounding box
+    // - image: Input image to search in
+    // - subobject_in_image: Candidate sub-feature as a waterfill object
+    // Returns: true if it matches the template
+    virtual bool matches(
+        ImagePixelBox& object_box,
+        const ImageViewRGB32& image,
+        const WaterfillObject& subobject_in_image
+    ) const;
+
+    // Given a found sub-feature as the waterfill object, check if the whole object matches the
+    // template.
+    // Before computing RMSD, replaces background pixels with `m_background_replacement` color
+    // - object_box: [OUTPUT] If match succeeds, contains full object bounding box
+    // - image: Input image to search in
+    // - binary_image: Binary mask of the image where 0 = background, 1 = foreground
+    // - subobject_in_image: Candidate sub-feature as a waterfill object
+    // Returns: true if it matches the template
+    virtual bool matches_with_background_replace(
+        ImagePixelBox& object_box,
+        const ImageViewRGB32& image, const PackedBinaryMatrix& binary_image,
+        const WaterfillObject& subobject_in_image
+    ) const;
+
+
+protected:
+    // Optional custom image validation hook called before rmsd checks.
+    // Override in derived class to add custom checks before matching.
+    // This will be called in all rmsd...() functions and therefore matches...() functions.
+    virtual bool check_image(const ImageViewRGB32& image) const{ return true; };
+
+    // Set which part of the template image is the sub-object to search for.
+    // MUST be called in derived class constructor to configure the matcher.
+    // - subobject_in_object: waterfill object to get the sub-object feature
+    //   within the template image.
+    void set_subobject(const WaterfillObject& subobject_in_object);
+
+    // Check if candidate sub-object has the expected aspect ratio
+    // Compares (width/height) of candidate against (width/height) of sub-object in template
+    // Tolerance: Must be within [0.80, 1.25] of expected ratio (configurable via member vars)
+    // Returns: true if aspect ratio is acceptable
+    bool check_aspect_ratio(size_t candidate_width, size_t candidate_height) const;
+
+    // Check if candidate sub-object has the expected area ratio
+    // Area ratio = (object area) / (bounding box area)
+    // Useful for filtering by "how much of the bounding box is filled"
+    // Returns: true if area ratio is within acceptable range
+    bool check_area_ratio(double candidate_area_ratio) const;
+
+protected:
+    std::string m_path;                   // Full path to template image file
+    Color m_background_replacement;       // Color to replace background with (if using background replacement)
+    double m_max_rmsd;                    // Maximum RMSD to consider a match (lower = stricter)
+
+    double m_aspect_ratio_lower = 0.80;   // aspect ratio comparison lower bound to match sub-object
+    double m_aspect_ratio_upper = 1.25;   // aspect ratio comparison upper bound to match sub-object
+    double m_area_ratio_lower = 0.80;     // area ratio comparison lower bound to match sub-object
+    double m_area_ratio_upper = 1.25;     // area ratio comparison upper bound to match sub-object
+
+    // Template image matcher used to compute RMSD comparison against the template full-object.
+    ExactImageMatcher m_matcher;
+
+    // sub-object bounding box w.r.t the full object, in pixel units, set by set_subobject()
+    ImagePixelBox m_subobject_in_object_p;
+    // sub-object bounding box w.r.t the full object, in normalized float units, set by set_subobject()
+    ImageFloatBox m_subobject_in_object_f;
+
+    // Area ratio of the sub-object, set by set_subobject()
+    // Area ratio is defined as the pixels of the sub-object over the total pixels of the bounding box of the
+    // sub-object.
+    double m_subobject_area_ratio;
+};
+
+
+
+
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/CommonTools/ImageMatch/WaterfillTemplateMatcher.cpp b/SerialPrograms/Source/CommonTools/ImageMatch/WaterfillTemplateMatcher.cpp
new file mode 100644
index 0000000000..3228d07473
--- /dev/null
+++ b/SerialPrograms/Source/CommonTools/ImageMatch/WaterfillTemplateMatcher.cpp
@@ -0,0 +1,190 @@
+/*  Waterfill Template Matcher
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <iostream>
+#include "Common/Cpp/Exceptions.h"
+#include "Kernels/Waterfill/Kernels_Waterfill.h"
+#include "CommonFramework/StaticGlobals.h"
+#include "CommonFramework/GlobalAutoPaths.h"
+#include "CommonFramework/Logging/Logger.h"
+#include "CommonFramework/Tools/DebugDumper.h"
+#include "CommonTools/Images/BinaryImage_FilterRgb32.h"
+#include "WaterfillTemplateMatcher.h"
+
+using std::cout;
+using std::endl;
+
+namespace PokemonAutomation{
+namespace ImageMatch{
+
+using namespace Kernels;
+using namespace Kernels::Waterfill;
+
+
+WaterfillTemplateMatcher::WaterfillTemplateMatcher(
+    const char* path,
+    Color min_color, Color max_color,
+    size_t min_area
+){
+    std::string full_path = RESOURCE_PATH() + path;
+    ImageRGB32 reference(full_path);
+
+    PackedBinaryMatrix matrix = compress_rgb32_to_binary_range(
+        reference,
+        (uint32_t)min_color, (uint32_t)max_color
+    );
+    if (STATIC_GLOBALS.IMAGE_TEMPLATE_MATCHING){
+        ImageRGB32 filtered_template = reference.copy();
+        // set background pixels to transparent and black so we can debug
+        // whether the image filter works as intended
+        filter_by_mask(matrix, filtered_template, Color(0), true);
+        dump_debug_image(global_logger_command_line(),  "CommonFramework/WaterfillTemplateMatcher", 
+            "template_no_bg",  filtered_template);
+    }
+
+//    cout << matrix.dump() << endl;
+
+    std::vector<WaterfillObject> objects = find_objects_inplace(matrix, min_area);
+    if (objects.empty()){
+        throw FileException(
+            nullptr, PA_CURRENT_FUNCTION,
+            "Failed to find any waterfill objects in resource template file.",
+            std::move(full_path)
+        );
+    }
+
+    const WaterfillObject* largest_object = &objects[0];
+    for (const WaterfillObject& object : objects){
+        if (largest_object->area < object.area){
+            largest_object = &object;
+        }
+    }
+
+    m_matcher.reset(new ExactImageMatcher(extract_box_reference(reference, *largest_object).copy()));
+    m_area_ratio = largest_object->area_ratio();
+
+//    cout << "template area ratio = " << m_area_ratio << endl;
+
+    if (STATIC_GLOBALS.IMAGE_TEMPLATE_MATCHING){
+        const auto exact_image = extract_box_reference(reference, *largest_object);
+        const double stddev_sum = image_stats(exact_image).stddev.sum();
+        cout << "Build waterfil template matcher from " << full_path << ", W x H: " << exact_image.width()
+             << " x " << exact_image.height() <<  ", area ratio: " << m_area_ratio << ", Object area: "
+             << largest_object->area << ", stddev sum: " << stddev_sum << endl;
+        dump_debug_image(global_logger_command_line(), "CommonFramework/WaterfillTemplateMatcher",
+            "template_cropped", exact_image);
+    }
+}
+
+double WaterfillTemplateMatcher::rmsd(Resolution input_resolution, const ImageViewRGB32& image) const{
+    if (!image || !check_image(input_resolution, image)){
+        return 99999.;
+    }
+    return m_matcher->rmsd(image);
+}
+bool WaterfillTemplateMatcher::check_aspect_ratio(size_t candidate_width, size_t candidate_height) const{
+    ImageViewRGB32 image_template = m_matcher->image_template();
+
+    double error = (double)image_template.width() * candidate_height;
+    error /= (double)image_template.height() * candidate_width;
+    
+    const bool pass = m_aspect_ratio_lower <= error && error <= m_aspect_ratio_upper;
+
+    if (STATIC_GLOBALS.IMAGE_TEMPLATE_MATCHING){
+        if (!pass){
+            cout << "Failed to pass WaterfillTemplateMatcher aspect ratio check (W/H): ";
+        }else{
+            cout << "Passed WaterfillTemplateMatcher aspect ratio check (W/H): ";
+        }
+        cout << "expected: " << image_template.width() << " : " << image_template.height()
+            << " (" << (double)image_template.width()/image_template.height() << "), "
+            << "actual: " << candidate_width << " : " << candidate_height 
+            << " (" << (double)candidate_width/candidate_height << ") "
+            << "error: " << error << " bound [" << m_aspect_ratio_lower << ", " << m_aspect_ratio_upper << "]" << endl;
+    }
+
+    return pass;
+}
+bool WaterfillTemplateMatcher::check_area_ratio(double candidate_area_ratio) const{
+    if (m_area_ratio == 0){
+        return true;
+    }
+
+    double error = candidate_area_ratio / m_area_ratio;
+    bool pass = m_area_ratio_lower <= error && error <= m_area_ratio_upper;
+
+    if (STATIC_GLOBALS.IMAGE_TEMPLATE_MATCHING){
+        if (!pass){
+            cout << "Failed to pass WaterfillTemplateMatcher area ratio check: ";
+        }else{
+            cout << "Passed WaterfillTemplateMatcher area ratio check: ";
+        }
+        cout << "Expected: " << m_area_ratio << ", actual: " << candidate_area_ratio << ", "
+            << "error: " << error << " bound [" << m_area_ratio_lower << ", " << m_area_ratio_upper << "]" << endl;
+    }
+
+    return pass;
+}
+
+double WaterfillTemplateMatcher::rmsd_precropped(
+    Resolution input_resolution,
+    const ImageViewRGB32& cropped_image,
+    const WaterfillObject& object
+) const{
+
+    if (STATIC_GLOBALS.IMAGE_TEMPLATE_MATCHING){
+        dump_debug_image(global_logger_command_line(), "CommonFramework/WaterfillTemplateMatcher",
+            "rmsd_precropped_input", cropped_image);
+    }
+
+    if (!check_aspect_ratio(object.width(), object.height())){
+        return 99999.;
+    }
+    if (!check_area_ratio(object.area_ratio())){
+        return 99999.;
+    }
+
+    const double rmsd = this->rmsd(input_resolution, cropped_image);
+    if (STATIC_GLOBALS.IMAGE_TEMPLATE_MATCHING){
+        cout << "Passed aspect and area ratio check, rmsd = " << rmsd << endl;
+    }
+    return rmsd;
+}
+
+double WaterfillTemplateMatcher::rmsd_original(
+    Resolution input_resolution,
+    const ImageViewRGB32& original_image,
+    const WaterfillObject& object
+) const{
+
+    if (STATIC_GLOBALS.IMAGE_TEMPLATE_MATCHING){
+        dump_debug_image(global_logger_command_line(), "CommonFramework/WaterfillTemplateMatcher",
+            "rmsd_original_input", extract_box_reference(original_image, object));
+    }
+
+    if (!check_aspect_ratio(object.width(), object.height())){
+        return 99999.;
+    }
+    if (!check_area_ratio(object.area_ratio())){
+        return 99999.;
+    }
+
+    double rmsd = this->rmsd(
+        input_resolution,
+        extract_box_reference(original_image, object)
+    );
+    if (STATIC_GLOBALS.IMAGE_TEMPLATE_MATCHING){
+        cout << "Passed aspect and area ratio check, rmsd = " << rmsd << endl;
+    }
+
+    return rmsd;
+}
+
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/CommonTools/ImageMatch/WaterfillTemplateMatcher.h b/SerialPrograms/Source/CommonTools/ImageMatch/WaterfillTemplateMatcher.h
new file mode 100644
index 0000000000..c2cc504d76
--- /dev/null
+++ b/SerialPrograms/Source/CommonTools/ImageMatch/WaterfillTemplateMatcher.h
@@ -0,0 +1,115 @@
+/*  Waterfill Template Matcher
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_CommonTools_WaterfillTemplateMatcher_H
+#define PokemonAutomation_CommonTools_WaterfillTemplateMatcher_H
+
+#include <memory>
+#include "Common/Cpp/Color.h"
+#include "Common/Cpp/ImageResolution.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonTools/ImageMatch/ExactImageMatcher.h"
+
+namespace PokemonAutomation{
+namespace ImageMatch{
+
+
+// Used to match an image or a waterfill object against a template object.
+class WaterfillTemplateMatcher{
+protected:
+    using WaterfillObject = Kernels::Waterfill::WaterfillObject;
+
+public:
+    WaterfillTemplateMatcher(WaterfillTemplateMatcher&&) = default;
+    virtual ~WaterfillTemplateMatcher() = default;
+
+
+public:
+    // Load a template image from disk, use waterfill to find the biggest object in the template image that
+    // matches the color range of min_color and max_color. 
+    // min_area is the minimum number of pixels required for the found object in the template.
+    // 
+    // The portion of the image holding the biggest object will get cropped and saved as the actual template
+    // image.
+    // So if someone changes the template image by padding it to make it larger, as long as the padded color
+    // does not fall into [min_color and max_color] range, it will not affect the template matching outcome
+    // in any way.
+    //
+    // Throw FileException when there is no object meeting the requirement in the template.
+    // If there are more than one objects meeting the requirement in the template, pick the one
+    // with the largest area (largest number of pixels).
+    WaterfillTemplateMatcher(
+        const char* path,
+        Color min_color, Color max_color,
+        size_t min_area
+    );
+
+    //  Compute RMSD of the current image against the template as-is, using `ExactImageMatcher`.
+    // `ExactImageMatcher` will resize the image to match template size and scale template brightness to match the image
+    //  before computing RMSD.
+    //  The part of the image template where alpha is 0 is not used to compare with the corresponding part in the input image.
+    //  In case the image is invalid, return a large value.
+    //  It also calls the virtual function `check_image(input_resolution, image)` on the image, where `input_resolution` is
+    //  the full screen resolution where the image is from. If the function returns false, then return a large value. 
+    double rmsd(Resolution input_resolution, const ImageViewRGB32& image) const;
+
+    //  Compute RMSD of the object on the image against the template.
+    //  The input `cropped_image` is already cropped from a full image using the bounding box of the input waterfill `object`.
+    //  This cropped image is compared against the template as-is.
+    //  The waterfill object's aspect ratio and area ratio are checked against template's. Return a large value 
+    //  if the check fails.
+    //  See `double rmsd(Resolution input_resolution, const ImageViewRGB32& image) const` on the details of comparing the
+    //  image against the template.
+    virtual double rmsd_precropped(
+        Resolution input_resolution,
+        const ImageViewRGB32& cropped_image,
+        const WaterfillObject& object
+    ) const;
+
+    //  Compute RMSD of the object on the image against the template.
+    //  It will crop the original image using the bounding box of the waterfill object, then compare the cropped
+    //  image against the template as-is.
+    //  The waterfill object's aspect ratio and area ratio are checked against template's. Return a large value 
+    //  if the check fails.
+    //  See `double rmsd(Resolution input_resolution, const ImageViewRGB32& image) const` on the details of comparing the
+    //  image against the template.
+    virtual double rmsd_original(
+        Resolution input_resolution,
+        const ImageViewRGB32& original_image,
+        const WaterfillObject& object
+    ) const;
+
+    //  Return the image template mesh
+    const ImageRGB32& image_template() const { return m_matcher->image_template(); }
+
+protected:
+    // This function is called inside each rmsd...() function before the actual RMSD computation.
+    // Derived classes can override this function to offer additional checks before computing RMSD.
+    // rmsd...() functions will proceed to RMSD computation if this function returns true. If false
+    // returns a large value.
+    // input_resolution: resolution of the full screen where the input image is from. This is useful for checks on
+    // input image pixel count or minimum size.
+    virtual bool check_image(Resolution input_resolution, const ImageViewRGB32& image) const{ return true; };
+    bool check_aspect_ratio(size_t candidate_width, size_t candidate_height) const;
+    bool check_area_ratio(double candidate_area_ratio) const;
+
+protected:
+    // Below are thresholds of aspect ratio and area ratio to reject a candidate.
+    // They are ususally set by the derived class of `WaterfillTemplateMatcher`.
+    double m_aspect_ratio_lower = 0.80;
+    double m_aspect_ratio_upper = 1.25;
+    double m_area_ratio_lower = 0.80;
+    double m_area_ratio_upper = 1.25;
+
+    std::unique_ptr<ExactImageMatcher> m_matcher;
+    double m_area_ratio;
+};
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/ImageTools/BinaryImage_FilterRgb32.cpp b/SerialPrograms/Source/CommonTools/Images/BinaryImage_FilterRgb32.cpp
similarity index 76%
rename from SerialPrograms/Source/CommonFramework/ImageTools/BinaryImage_FilterRgb32.cpp
rename to SerialPrograms/Source/CommonTools/Images/BinaryImage_FilterRgb32.cpp
index 21ceff4da2..a0d3cb2239 100644
--- a/SerialPrograms/Source/CommonFramework/ImageTools/BinaryImage_FilterRgb32.cpp
+++ b/SerialPrograms/Source/CommonTools/Images/BinaryImage_FilterRgb32.cpp
@@ -1,13 +1,16 @@
 /*  Binary Image
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include "Common/Cpp/Exceptions.h"
 #include "Common/Cpp/Containers/FixedLimitVector.tpp"
 #include "Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters.h"
+#include "CommonFramework/Notifications/ProgramInfo.h"
+#include "CommonFramework/Logging/Logger.h"
 #include "CommonFramework/ImageTypes/ImageRGB32.h"
+#include "CommonFramework/Tools/ErrorDumper.h"
 #include "BinaryImage_FilterRgb32.h"
 
 //#include <iostream>
@@ -21,31 +24,51 @@ namespace PokemonAutomation{
 void filter_by_mask(
     const PackedBinaryMatrix& matrix,
     ImageRGB32& image,
-    Color replace_with,
-    bool replace_if_zero    //  If false, replace if one.
+    Color replacement_color,
+    bool replace_zero_bits
 ){
     if (matrix.width() > image.width()){
+        dump_image(
+            global_logger_tagged(), ProgramInfo(),
+            "filter_by_mask-width-matrix" + std::to_string(matrix.width()) + "x" + std::to_string(matrix.height()),
+            image
+        );
         throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Image width is too small.");
     }
     if (matrix.height() > image.height()){
+        dump_image(
+            global_logger_tagged(), ProgramInfo(),
+            "filter_by_mask-width-matrix" + std::to_string(matrix.width()) + "x" + std::to_string(matrix.height()),
+            image
+        );
         throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Image height is too small.");
     }
     Kernels::filter_by_mask(
         matrix,
         image.data(), image.bytes_per_row(),
-        (uint32_t)replace_with, replace_if_zero
+        (uint32_t)replacement_color, replace_zero_bits
     );
 }
 void filter_by_mask(
     const PackedBinaryMatrix& matrix,
     ImageRGB32& image, size_t offset_x, size_t offset_y,
-    Color replace_with,
-    bool replace_if_zero    //  If false, replace if one.
+    Color replacement_color,
+    bool replace_zero_bits
 ){
     if (matrix.width() > image.width()){
+        dump_image(
+            global_logger_tagged(), ProgramInfo(),
+            "filter_by_mask-width-matrix" + std::to_string(matrix.width()) + "x" + std::to_string(matrix.height()),
+            image
+        );
         throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Image width is too small.");
     }
     if (matrix.height() > image.height()){
+        dump_image(
+            global_logger_tagged(), ProgramInfo(),
+            "filter_by_mask-width-matrix" + std::to_string(matrix.width()) + "x" + std::to_string(matrix.height()),
+            image
+        );
         throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Image height is too small.");
     }
     size_t bytes_per_row = image.bytes_per_row();
@@ -53,7 +76,7 @@ void filter_by_mask(
         matrix,
         (uint32_t*)((char*)image.data() + bytes_per_row * offset_y + offset_x * sizeof(uint32_t)),
         bytes_per_row,
-        (uint32_t)replace_with, replace_if_zero
+        (uint32_t)replacement_color, replace_zero_bits
     );
 }
 
diff --git a/SerialPrograms/Source/CommonTools/Images/BinaryImage_FilterRgb32.h b/SerialPrograms/Source/CommonTools/Images/BinaryImage_FilterRgb32.h
new file mode 100644
index 0000000000..3c8b87078b
--- /dev/null
+++ b/SerialPrograms/Source/CommonTools/Images/BinaryImage_FilterRgb32.h
@@ -0,0 +1,109 @@
+/*  Binary Image Filter RGB32
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_CommonTools_BinaryImage_FilterRgb32_H
+#define PokemonAutomation_CommonTools_BinaryImage_FilterRgb32_H
+
+#include <stdint.h>
+#include <vector>
+#include "Common/Cpp/Color.h"
+#include "Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters.h"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/ImageTypes/BinaryImage.h"
+
+namespace PokemonAutomation{
+
+
+//  Selectively replace pixels in `image` with the replacement color
+//  according to the respective bits in the binary matrix.
+//  If `replace_zero_bits` is true, replace pixels corresponding to the zero bits.
+//  Else, replace those with the one bits.
+void filter_by_mask(
+    const PackedBinaryMatrix& matrix,
+    ImageRGB32& image,
+    Color replacement_color,
+    bool replace_zero_bits
+);
+//  Selectively replace pixels in an area of the `image` with the replacement color
+//  according to the respective bits in the binary matrix.
+//  If `replace_zero_bits` is true, replace pixels corresponding to the zero bits.
+//  Else, replace those with the one bits.
+//  The image area starts at (offset_x, offset_y) with the same (width, height) as
+//  the matrix. 
+void filter_by_mask(
+    const PackedBinaryMatrix& matrix,
+    ImageRGB32& image, size_t offset_x, size_t offset_y,
+    Color replacement_color,
+    bool replace_zero_bits
+);
+
+
+
+
+
+PackedBinaryMatrix compress_rgb32_to_binary_min(
+    const ImageViewRGB32& image,
+    uint8_t min_red,
+    uint8_t min_green,
+    uint8_t min_blue
+);
+PackedBinaryMatrix compress_rgb32_to_binary_max(
+    const ImageViewRGB32& image,
+    uint8_t max_red,
+    uint8_t max_green,
+    uint8_t max_blue
+);
+PackedBinaryMatrix compress_rgb32_to_binary_range(
+    const ImageViewRGB32& image,
+    uint8_t min_red, uint8_t max_red,
+    uint8_t min_green, uint8_t max_green,
+    uint8_t min_blue, uint8_t max_blue
+);
+PackedBinaryMatrix compress_rgb32_to_binary_range(
+    const ImageViewRGB32& image,
+    uint8_t min_alpha, uint8_t max_alpha,
+    uint8_t min_red, uint8_t max_red,
+    uint8_t min_green, uint8_t max_green,
+    uint8_t min_blue, uint8_t max_blue
+);
+PackedBinaryMatrix compress_rgb32_to_binary_range(
+    const ImageViewRGB32& image,
+    uint32_t mins, uint32_t maxs
+);
+
+
+
+//  Run multiple filters at once. This is more memory efficient than making
+//  multiple calls to one filter at a time.
+//  Pixels Within filter color ranges are marked as 1 in the corresponding binary matrices,
+//  while those output of range are 0.
+std::vector<PackedBinaryMatrix> compress_rgb32_to_binary_range(
+    const ImageViewRGB32& image,
+    const std::vector<std::pair<uint32_t, uint32_t>>& filters
+);
+
+
+
+//  Run multiple filters and OR them all together. (experimental)
+PackedBinaryMatrix compress_rgb32_to_binary_multirange(
+    const ImageViewRGB32& image,
+    const std::vector<std::pair<uint32_t, uint32_t>>& filters
+);
+
+
+
+
+
+PackedBinaryMatrix compress_rgb32_to_binary_euclidean(
+    const ImageViewRGB32& image,
+    uint32_t expected, double max_euclidean_distance
+);
+
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/ImageTools/ColorClustering.cpp b/SerialPrograms/Source/CommonTools/Images/ColorClustering.cpp
similarity index 89%
rename from SerialPrograms/Source/CommonFramework/ImageTools/ColorClustering.cpp
rename to SerialPrograms/Source/CommonTools/Images/ColorClustering.cpp
index 598e577eb9..56d712501a 100644
--- a/SerialPrograms/Source/CommonFramework/ImageTools/ColorClustering.cpp
+++ b/SerialPrograms/Source/CommonTools/Images/ColorClustering.cpp
@@ -1,17 +1,16 @@
 /*  Color Clustering
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include <cmath>
-#include "ImageBoxes.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
 #include "ColorClustering.h"
 
-#include <fstream>
-#include <iostream>
-using std::cout;
-using std::endl;
+//#include <iostream>
+//using std::cout;
+//using std::endl;
 
 namespace PokemonAutomation{
 
@@ -117,14 +116,15 @@ bool cluster_fit_2(
     double count_ratio_desired[NUM_CLUSTERS] = {ratio0, ratio1};
 
     PixelEuclideanStatAccumulator cluster[NUM_CLUSTERS];
-    double deviation = cluster_fit_2(image, color0, cluster[0], color1, cluster[1]);
+    cluster_fit_2(image, color0, cluster[0], color1, cluster[1]);
     color0 = cluster[0].center().round();
     color1 = cluster[1].center().round();
-    deviation = cluster_fit_2(image, color0, cluster[0], color1, cluster[1]);
-//    cout << "deviation = " << deviation << endl;
+    double deviation = cluster_fit_2(image, color0, cluster[0], color1, cluster[1]);
+//    cout << "deviation = " << deviation << ", threshold = " << deviation_threshold << endl;
 //    cout << cluster[0].count() << " / " << cluster[1].count() << endl;
     if (deviation > deviation_threshold){
 //        cout << "deviation out" << endl;
+//        image.save("test.png");
         return false;
     }
 
@@ -136,6 +136,7 @@ bool cluster_fit_2(
         ratio_sum += count_ratio_desired[c];
         center_actual[c] = cluster[c].center();
     }
+//    cout << "---------------" << endl;
     for (size_t c = 0; c < NUM_CLUSTERS; c++){
 //        cout << cluster[c].count() << ": " << cluster[c].center() << ", " << cluster[c].deviation() << endl;
 
@@ -151,12 +152,14 @@ bool cluster_fit_2(
         }
 
         if (center_desired[c].sum() < 50){
+//            cout << "Black" << endl;
             double distance = euclidean_distance(center_desired[c], center_actual[c]) * count_ratio_desired[c];
             if (distance > 40){
 //                cout << "Black Distance is Too Large: " << distance << endl;
                 return false;
             }
         }else{
+//            cout << "Not Black" << endl;
             FloatPixel ratio_desired = center_desired[c] / center_desired[c].sum();
             FloatPixel ratio_actual = center_actual[c] / center_actual[c].sum();
             double distance = euclidean_distance(ratio_desired, ratio_actual);
diff --git a/SerialPrograms/Source/CommonTools/Images/ColorClustering.h b/SerialPrograms/Source/CommonTools/Images/ColorClustering.h
new file mode 100644
index 0000000000..4035dce92c
--- /dev/null
+++ b/SerialPrograms/Source/CommonTools/Images/ColorClustering.h
@@ -0,0 +1,52 @@
+/*  Color Clustering
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_CommonTools_ColorClustering_H
+#define PokemonAutomation_CommonTools_ColorClustering_H
+
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/ImageTools/FloatPixel.h"
+
+namespace PokemonAutomation{
+
+
+class PixelEuclideanStatAccumulator{
+public:
+    void clear();
+    void operator+=(FloatPixel pixel);
+
+    uint64_t count() const;
+    FloatPixel center() const;
+    double deviation() const;
+
+private:
+    uint64_t m_count = 0;
+    double m_sum_x = 0;
+    double m_sum_y = 0;
+    double m_sum_z = 0;
+    double m_sqr_x = 0;
+    double m_sqr_y = 0;
+    double m_sqr_z = 0;
+};
+
+double cluster_fit_2(
+    const ImageViewRGB32& image,
+    Color color0, PixelEuclideanStatAccumulator& cluster0,
+    Color color1, PixelEuclideanStatAccumulator& cluster1
+);
+
+bool cluster_fit_2(
+    const ImageViewRGB32& image,
+    Color color0, double ratio0,
+    Color color1, double ratio1,
+    double ratio_threshold = 0.2,
+    double deviation_threshold = 50,
+    double distance_threshold = 0.25
+);
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/ImageTools/DistanceToLine.h b/SerialPrograms/Source/CommonTools/Images/DistanceToLine.h
similarity index 81%
rename from SerialPrograms/Source/CommonFramework/ImageTools/DistanceToLine.h
rename to SerialPrograms/Source/CommonTools/Images/DistanceToLine.h
index 13ec73d2ad..8e56981674 100644
--- a/SerialPrograms/Source/CommonFramework/ImageTools/DistanceToLine.h
+++ b/SerialPrograms/Source/CommonTools/Images/DistanceToLine.h
@@ -1,16 +1,16 @@
 /*  Distance to Line
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  *
  *      Return a set of connected clusters.
  *
  */
 
-#ifndef PokemonAutomation_CommonFramework_DistanceToLine_H
-#define PokemonAutomation_CommonFramework_DistanceToLine_H
+#ifndef PokemonAutomation_CommonTools_DistanceToLine_H
+#define PokemonAutomation_CommonTools_DistanceToLine_H
 
-#include "ImageBoxes.h"
+#include <cstddef>
 
 namespace PokemonAutomation{
 
diff --git a/SerialPrograms/Source/CommonTools/Images/ImageFilter.cpp b/SerialPrograms/Source/CommonTools/Images/ImageFilter.cpp
new file mode 100644
index 0000000000..3b9303468c
--- /dev/null
+++ b/SerialPrograms/Source/CommonTools/Images/ImageFilter.cpp
@@ -0,0 +1,238 @@
+/*  Image Filter
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Containers/FixedLimitVector.tpp"
+#include "Kernels/ImageFilters/Kernels_ImageFilter_Misc.h"
+#include "Kernels/ImageFilters/RGB32_Range/Kernels_ImageFilter_RGB32_Range.h"
+#include "Kernels/ImageFilters/RGB32_EuclideanDistance/Kernels_ImageFilter_RGB32_Euclidean.h"
+#include "Kernels/ImageFilters/RGB32_Brightness/Kernels_ImageFilter_RGB32_Brightness.h"
+#include "CommonFramework/ImageTypes/ImageViewHSV32.h"
+#include "CommonFramework/ImageTypes/ImageHSV32.h"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/ImageTypes/ImageRGB32.h"
+#include "ImageFilter.h"
+
+namespace PokemonAutomation{
+
+
+
+ImageRGB32 filter_rgb32_range(
+    const ImageViewRGB32& image,
+    uint32_t mins, uint32_t maxs, Color replace_with, bool replace_color_within_range
+){
+    ImageRGB32 ret(image.width(), image.height());
+    Kernels::filter_rgb32_range(
+        image.data(), image.bytes_per_row(), image.width(), image.height(),
+        ret.data(), ret.bytes_per_row(),
+        (uint32_t)replace_with, replace_color_within_range,
+        mins, maxs
+    );
+    return ret;
+}
+ImageRGB32 filter_rgb32_range(
+    size_t& pixels_in_range,
+    const ImageViewRGB32& image,
+    uint32_t mins, uint32_t maxs, Color replace_with, bool replace_color_within_range
+){
+    ImageRGB32 ret(image.width(), image.height());
+    pixels_in_range = Kernels::filter_rgb32_range(
+        image.data(), image.bytes_per_row(), image.width(), image.height(),
+        ret.data(), ret.bytes_per_row(),
+        (uint32_t)replace_with, replace_color_within_range,
+        mins, maxs
+    );
+    return ret;
+}
+std::vector<std::pair<ImageRGB32, size_t>> filter_rgb32_range(
+    const ImageViewRGB32& image,
+    const std::vector<FilterRgb32Range>& filters
+){
+    std::vector<std::pair<ImageRGB32, size_t>> ret(filters.size());
+    FixedLimitVector<Kernels::FilterRgb32RangeFilter> subfilters(filters.size());
+    for (size_t c = 0; c < filters.size(); c++){
+        ImageRGB32& out = ret[c].first;
+        out = ImageRGB32(image.width(), image.height());
+        subfilters.emplace_back(
+            out.data(), out.bytes_per_row(),
+            (uint32_t)filters[c].replacement_color, filters[c].replace_color_within_range,
+            filters[c].mins, filters[c].maxs
+        );
+    }
+    Kernels::filter_rgb32_range(
+        image.data(), image.bytes_per_row(), image.width(), image.height(),
+        subfilters.data(), subfilters.size()
+    );
+    for (size_t c = 0; c < filters.size(); c++){
+        ret[c].second = subfilters[c].pixels_in_range;
+    }
+    return ret;
+}
+
+
+
+ImageRGB32 to_blackwhite_rgb32_range(
+    const ImageViewRGB32& image,
+    bool in_range_black,
+    uint32_t mins, uint32_t maxs
+){
+    ImageRGB32 ret(image.width(), image.height());
+    Kernels::to_blackwhite_rgb32_range(
+        image.data(), image.bytes_per_row(), image.width(), image.height(),
+        ret.data(), ret.bytes_per_row(),
+        in_range_black,
+        mins, maxs
+    );
+    return ret;
+}
+ImageRGB32 to_blackwhite_rgb32_range(
+    size_t& pixels_in_range,
+    const ImageViewRGB32& image,
+    bool in_range_black,
+    uint32_t mins, uint32_t maxs
+){
+    ImageRGB32 ret(image.width(), image.height());
+    pixels_in_range = Kernels::to_blackwhite_rgb32_range(
+        image.data(), image.bytes_per_row(), image.width(), image.height(),
+        ret.data(), ret.bytes_per_row(),
+        in_range_black,
+        mins, maxs
+    );
+    return ret;
+}
+std::vector<std::pair<ImageRGB32, size_t>> to_blackwhite_rgb32_range(
+    const ImageViewRGB32& image,
+    const std::vector<BlackWhiteRgb32Range>& filters
+){
+    std::vector<std::pair<ImageRGB32, size_t>> ret(filters.size());
+    FixedLimitVector<Kernels::ToBlackWhiteRgb32RangeFilter> subfilters(filters.size());
+    for (size_t c = 0; c < filters.size(); c++){
+        ImageRGB32& out = ret[c].first;
+        out = ImageRGB32(image.width(), image.height());
+        subfilters.emplace_back(
+            out.data(), out.bytes_per_row(),
+            filters[c].mins, filters[c].maxs, (uint32_t)filters[c].in_range_black
+        );
+    }
+    Kernels::to_blackwhite_rgb32_range(
+        image.data(), image.bytes_per_row(), image.width(), image.height(),
+        subfilters.data(), subfilters.size()
+    );
+    for (size_t c = 0; c < filters.size(); c++){
+        ret[c].second = subfilters[c].pixels_in_range;
+    }
+    return ret;
+}
+
+
+
+
+
+
+
+
+
+ImageRGB32 filter_rgb32_euclidean(
+    const ImageViewRGB32& image,
+    uint32_t expected, double max_euclidean_distance,
+    Color replace_with, bool replace_color_within_range
+){
+    ImageRGB32 ret(image.width(), image.height());
+    Kernels::filter_rgb32_euclidean(
+        image.data(), image.bytes_per_row(), image.width(), image.height(),
+        ret.data(), ret.bytes_per_row(),
+        (uint32_t)replace_with, replace_color_within_range,
+        expected, max_euclidean_distance
+    );
+    return ret;
+}
+ImageRGB32 filter_rgb32_euclidean(
+    size_t& pixels_in_range,
+    const ImageViewRGB32& image,
+    uint32_t expected, double max_euclidean_distance,
+    Color replace_with, bool replace_color_within_range
+){
+    ImageRGB32 ret(image.width(), image.height());
+    pixels_in_range = Kernels::filter_rgb32_euclidean(
+        image.data(), image.bytes_per_row(), image.width(), image.height(),
+        ret.data(), ret.bytes_per_row(),
+        (uint32_t)replace_with, replace_color_within_range,
+        expected, max_euclidean_distance
+    );
+    return ret;
+}
+
+
+
+
+
+
+
+
+
+ImageRGB32 filter_rgb32_brightness(
+    const ImageViewRGB32& image,
+    Color replacement_color, bool replace_color_within_range,
+    Kernels::Rgb32BrightnessWeights weights,
+    uint32_t min_brightness, uint32_t max_brightness
+){
+    ImageRGB32 ret(image.width(), image.height());
+    Kernels::filter_rgb32_brightness(
+        image.data(), image.bytes_per_row(), image.width(), image.height(),
+        ret.data(), ret.bytes_per_row(),
+        (uint32_t)replacement_color, replace_color_within_range,
+        weights,
+        min_brightness, max_brightness
+    );
+    return ret;
+}
+ImageRGB32 to_blackwhite_rgb32_brightness(
+    const ImageViewRGB32& image,
+    bool in_range_black,
+    Kernels::Rgb32BrightnessWeights weights,
+    uint32_t min_brightness, uint32_t max_brightness
+){
+    ImageRGB32 ret(image.width(), image.height());
+    Kernels::to_blackwhite_rgb32_brightness(
+        image.data(), image.bytes_per_row(), image.width(), image.height(),
+        ret.data(), ret.bytes_per_row(),
+        in_range_black,
+        weights,
+        min_brightness, max_brightness
+    );
+    return ret;
+}
+
+
+
+ImageRGB32 filter_green(
+    const ImageViewRGB32& image,    
+    Color replace_with,
+    uint8_t rgb_gap
+){
+    ImageRGB32 ret(image.width(), image.height());
+    Kernels::filter_green(
+        image.data(), image.bytes_per_row(), image.width(), image.height(),
+        ret.data(), ret.bytes_per_row(), (uint32_t)replace_with, rgb_gap
+    );
+    return ret;
+}
+
+ImageRGB32 to_blackwhite_hsv32_range(
+    const ImageViewHSV32& image,
+    bool in_range_black,
+    uint32_t mins, uint32_t maxs
+){
+    ImageRGB32 ret(image.width(), image.height());
+    Kernels::to_blackwhite_rgb32_range(
+        image.data(), image.bytes_per_row(), image.width(), image.height(),
+        ret.data(), ret.bytes_per_row(),
+        in_range_black,
+        mins, maxs
+    );
+    return ret;
+}
+
+}
diff --git a/SerialPrograms/Source/CommonTools/Images/ImageFilter.h b/SerialPrograms/Source/CommonTools/Images/ImageFilter.h
new file mode 100644
index 0000000000..3c76adcd55
--- /dev/null
+++ b/SerialPrograms/Source/CommonTools/Images/ImageFilter.h
@@ -0,0 +1,180 @@
+/*  Image Filter
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_CommonTools_ImageFilter_H
+#define PokemonAutomation_CommonTools_ImageFilter_H
+
+#include <cstddef>
+#include <vector>
+#include "Common/Cpp/Color.h"
+#include "Kernels/ImageFilters/RGB32_Brightness/Kernels_ImageFilter_RGB32_Brightness.h"
+
+namespace PokemonAutomation{
+
+class ImageViewHSV32;
+class ImageHSV32;
+class ImageViewRGB32;
+class ImageRGB32;
+
+
+//  If `replace_color_within_range` is true, replace the color range [mins, maxs] with the color `replacement_color`.
+//  If `replace_color_within_range` is false, replace the color outside of the range [mins, maxs] with the color
+//    `replacement_color`.
+ImageRGB32 filter_rgb32_range(
+    const ImageViewRGB32& image,
+    uint32_t mins, uint32_t maxs,
+    Color replacement_color, bool replace_color_within_range
+);
+//  If `replace_color_within_range` is true, replace the color range [mins, maxs] with the color `replacement_color`.
+//  If `replace_color_within_range` is false, replace the color outside of the range [mins, maxs] with the color
+//    `replacement_color`.
+//  Returns the # of pixels inside the range [mins, maxs] as `pixels_in_range`
+ImageRGB32 filter_rgb32_range(
+    size_t& pixels_in_range,
+    const ImageViewRGB32& image,
+    uint32_t mins, uint32_t maxs,
+    Color replacement_color, bool replace_color_within_range
+);
+//  Run multiple filters at once. This is more memory efficient than making
+//  multiple calls to one filter at a time.
+//  For each filter:
+//  If `replace_color_within_range` is true, replace the color range [mins, maxs] with the color `replacement_color`.
+//  If `replace_color_within_range` is false, replace the color outside of the range [mins, maxs] with the color
+//    `replacement_color`.
+//  For each filter, return the filtered image and the # of pixels inside the [mins, maxs] range of the filter.
+struct FilterRgb32Range{
+    Color replacement_color;
+    bool replace_color_within_range;
+    uint32_t mins;
+    uint32_t maxs;
+};
+std::vector<std::pair<ImageRGB32, size_t>> filter_rgb32_range(
+    const ImageViewRGB32& image,
+    const std::vector<FilterRgb32Range>& filters
+);
+
+
+
+//  Convert the image to black and white.
+//  Inside [mins, maxs] is white, otherwise it's black.
+//  Set "in_range_black" to true to invert the colors.
+//  Both white and black colors have alpha=255.
+ImageRGB32 to_blackwhite_rgb32_range(
+    const ImageViewRGB32& image,
+    bool in_range_black,
+    uint32_t mins, uint32_t maxs
+);
+//  Convert the image to black and white.
+//  Inside [mins, maxs] is white, otherwise it's black.
+//  Set "in_range_black" to true to invert the colors.
+//  Both white and black colors have alpha=255.
+//  Returns the # of pixels inside the distance as `pixels_in_range`.
+ImageRGB32 to_blackwhite_rgb32_range(
+    size_t& pixels_in_range,
+    const ImageViewRGB32& image,
+    bool in_range_black,
+    uint32_t mins, uint32_t maxs
+);
+
+struct BlackWhiteRgb32Range{
+    bool in_range_black;
+    uint32_t mins;
+    uint32_t maxs;
+};
+
+//  Run multiple filters at once. This is more memory efficient than making
+//  multiple calls to one filter at a time.
+//  For each filter:
+//  If `in_range_black` is true, replace the color range [mins, maxs] with color black while the rest white.
+//  If `in_range_black` is false, replace the color range [mins, maxs] with color white while the rest black.
+//  Both white and black colors have alpha=255.
+//  For each filter, return the filtered image and the # of pixels inside the [mins, maxs] range of the filter.
+std::vector<std::pair<ImageRGB32, size_t>> to_blackwhite_rgb32_range(
+    const ImageViewRGB32& image,
+    const std::vector<BlackWhiteRgb32Range>& filters
+);
+
+
+
+
+
+
+
+
+
+//  If `replace_color_within_range` is true, replace the colors within (<=) `max_euclidean_distance` of the
+//    `expected_color` with `replacement_color`.
+//  If `replace_color_within_range` is false, replace the color outside of the distance with the color `replacement_color`.
+ImageRGB32 filter_rgb32_euclidean(
+    const ImageViewRGB32& image,
+    uint32_t expected_color, double max_euclidean_distance,
+    Color replacement_color, bool replace_color_within_range
+);
+//  If `replace_color_within_range` is true, replace the colors within (<=) `max_euclidean_distance` of the
+//    `expected_color` with `replacement_color`.
+//  If `replace_color_within_range` is false, replace the color outside of the distance with the color `replacement_color`.
+//  Returns the # of pixels inside the distance as `pixels_in_range`.
+//  Note: the alpha channel of `image` and `expected_color` are ignored during computation.
+ImageRGB32 filter_rgb32_euclidean(
+    size_t& pixels_in_range,
+    const ImageViewRGB32& image,
+    uint32_t expected_color, double max_euclidean_distance,
+    Color replacement_color, bool replace_color_within_range
+);
+
+
+
+
+
+
+
+
+//  Similar to "filter_rgb32_range()". But instead of checking if each of
+//  the RGB components are within a range, we check if the dot product of the
+//  components and a set of weights is within a range. By selecting the weights,
+//  you can pick which components to check the brightness of.
+ImageRGB32 filter_rgb32_brightness(
+    const ImageViewRGB32& image,
+    Color replacement_color, bool replace_color_within_range,
+    Kernels::Rgb32BrightnessWeights weights,
+    uint32_t min_brightness, uint32_t max_brightness
+);
+//  Similar to "to_blackwhite_rgb32_range()". But instead of checking if each of
+//  the RGB components are within a range, we check if the dot product of the
+//  components and a set of weights is within a range. By selecting the weights,
+//  you can pick which components to check the brightness of.
+ImageRGB32 to_blackwhite_rgb32_brightness(
+    const ImageViewRGB32& image,
+    bool in_range_black,
+    Kernels::Rgb32BrightnessWeights weights,
+    uint32_t min_brightness, uint32_t max_brightness
+);
+
+
+
+
+// keep all pixels where green is the dominant RGB value. otherwise, replace the pixel with `replace_with`
+// `rgb_gap` is the amount that green has to exceed the red or blue value, in order to keep the pixel.
+ImageRGB32 filter_green(
+    const ImageViewRGB32& image,
+    Color replace_with,
+    uint8_t rgb_gap = 0
+);
+
+
+//  Convert an HSV-format image to black and white.
+//  Inside [mins, maxs] is white, otherwise it's black.
+//  Set "in_range_black" to true to invert the colors.
+//  Both white and black colors have alpha=255.
+ImageRGB32 to_blackwhite_hsv32_range(
+    const ImageViewHSV32& image,
+    bool in_range_black,
+    uint32_t mins, uint32_t maxs
+);
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/ImageTools/ImageGradient.cpp b/SerialPrograms/Source/CommonTools/Images/ImageGradient.cpp
similarity index 85%
rename from SerialPrograms/Source/CommonFramework/ImageTools/ImageGradient.cpp
rename to SerialPrograms/Source/CommonTools/Images/ImageGradient.cpp
index c7a3d03a78..e67e33f284 100644
--- a/SerialPrograms/Source/CommonFramework/ImageTools/ImageGradient.cpp
+++ b/SerialPrograms/Source/CommonTools/Images/ImageGradient.cpp
@@ -1,16 +1,15 @@
 /*  Image Filter
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include "CommonFramework/ImageTypes/ImageViewRGB32.h"
-#include "CommonFramework/ImageTypes/ImageRGB32.h"
 #include "ImageGradient.h"
 
-#include <iostream>
-using std::cout;
-using std::endl;
+//#include <iostream>
+//using std::cout;
+//using std::endl;
 
 namespace PokemonAutomation{
 
@@ -18,7 +17,7 @@ namespace PokemonAutomation{
 size_t count_horizontal_translucent_border_pixels(const ImageViewRGB32& image, const Color& threshold, bool dark_top){
     // Gradient on each color channel at each pixel in one row
     std::vector<int16_t> gradients(image.width() * 3, 0);
-    // Whetehr a color channel is zero for each pixel in one row
+    // Whether a color channel is zero for each pixel in one row
     std::vector<bool> is_zero(image.width() * 3, false);
 
     if (image.height() == 0 || image.width() == 0){
@@ -26,8 +25,8 @@ size_t count_horizontal_translucent_border_pixels(const ImageViewRGB32& image, c
     }
 
     size_t num_rows = image.height() - 1;
-    for(size_t row_index = 0; row_index < num_rows; row_index++){
-        for(size_t x = 0; x < image.width(); x++){
+    for (size_t row_index = 0; row_index < num_rows; row_index++){
+        for (size_t x = 0; x < image.width(); x++){
             uint32_t p_above = image.pixel(x, row_index);
             uint32_t p_below = image.pixel(x, row_index+1);
 
@@ -59,9 +58,9 @@ size_t count_horizontal_translucent_border_pixels(const ImageViewRGB32& image, c
     int16_t thres_c[3] = {threshold.red(), threshold.green(), threshold.blue()};
 
     size_t num_border_pixels = 0;
-    for(size_t x = 0; x < image.width(); x++){
+    for (size_t x = 0; x < image.width(); x++){
         bool has_non_border_channel = false;
-        for(int c = 0; c < 3; c++){
+        for (int c = 0; c < 3; c++){
             if (is_zero[3*x+c] == false && gradients[3*x+c] < thres_c[c]){
                 has_non_border_channel = true;
                 break;
@@ -72,12 +71,12 @@ size_t count_horizontal_translucent_border_pixels(const ImageViewRGB32& image, c
     }
     
     // int16_t min_color[3] = {255, 255, 255}; 
-    // for(size_t i = 0; i < image.width(); i++){
+    // for (size_t i = 0; i < image.width(); i++){
     //     if (is_zero[3*i] == false || is_zero[3*i+1] == false || is_zero[3*i+2] == false){
     //         cout << i << ": (" << gradients[3*i] << (is_zero[3*i] ? "*" : "");
     //         cout << ", " << gradients[3*i+1] << (is_zero[3*i+1] ? "*" : "");
     //         cout << ", " << gradients[3*i+2] << (is_zero[3*i+2] ? "*" : "") << ")\n";
-    //         for(int j = 0; j < 3; j++){
+    //         for (int j = 0; j < 3; j++){
     //             if (is_zero[3*i+j] == false){
     //                 min_color[j] = std::min(min_color[j], gradients[3*i + j]);
     //             }
@@ -101,11 +100,11 @@ size_t count_vertical_translucent_border_pixels(const ImageViewRGB32& image, con
 
     size_t num_cols = image.width() - 1;
     // Go through each row in the image
-    for(size_t y = 0; y < image.height(); y++){
+    for (size_t y = 0; y < image.height(); y++){
         // Record the border gradient of this row:
         bool is_zero[3] = {false};
         int16_t gradients[3] = {0};
-        for(size_t col_index = 0; col_index < num_cols; col_index++){
+        for (size_t col_index = 0; col_index < num_cols; col_index++){
             uint32_t p_left = image.pixel(col_index, y);
             uint32_t p_right = image.pixel(col_index+1, y);
 
@@ -134,7 +133,7 @@ size_t count_vertical_translucent_border_pixels(const ImageViewRGB32& image, con
         }
 
         bool has_non_border_channel = false;
-        for(int c = 0; c < 3; c++){
+        for (int c = 0; c < 3; c++){
             if (is_zero[c] == false && gradients[c] < thres_c[c]){
                 has_non_border_channel = true;
                 break;
diff --git a/SerialPrograms/Source/CommonFramework/ImageTools/ImageGradient.h b/SerialPrograms/Source/CommonTools/Images/ImageGradient.h
similarity index 88%
rename from SerialPrograms/Source/CommonFramework/ImageTools/ImageGradient.h
rename to SerialPrograms/Source/CommonTools/Images/ImageGradient.h
index cf3e249c01..fd9981e96f 100644
--- a/SerialPrograms/Source/CommonFramework/ImageTools/ImageGradient.h
+++ b/SerialPrograms/Source/CommonTools/Images/ImageGradient.h
@@ -1,12 +1,12 @@
 /*  Image Gradient
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *  
  *  Header for various image gradient related functions, mostly for visual inferences
  */
 
-#ifndef PokemonAutomation_CommonFramework_ImageGradient_H
-#define PokemonAutomation_CommonFramework_ImageGradient_H
+#ifndef PokemonAutomation_CommonTools_ImageGradient_H
+#define PokemonAutomation_CommonTools_ImageGradient_H
 
 #include <cstddef>
 #include <vector>
diff --git a/SerialPrograms/Source/CommonFramework/ImageTools/ImageManip.cpp b/SerialPrograms/Source/CommonTools/Images/ImageManip.cpp
similarity index 89%
rename from SerialPrograms/Source/CommonFramework/ImageTools/ImageManip.cpp
rename to SerialPrograms/Source/CommonTools/Images/ImageManip.cpp
index f2a56e92d3..1fdd51b8c2 100644
--- a/SerialPrograms/Source/CommonFramework/ImageTools/ImageManip.cpp
+++ b/SerialPrograms/Source/CommonTools/Images/ImageManip.cpp
@@ -1,6 +1,6 @@
 /*  Image Manipulation
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/CommonTools/Images/ImageManip.h b/SerialPrograms/Source/CommonTools/Images/ImageManip.h
new file mode 100644
index 0000000000..2d7894f820
--- /dev/null
+++ b/SerialPrograms/Source/CommonTools/Images/ImageManip.h
@@ -0,0 +1,19 @@
+/*  Image Manipulation
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_CommonTools_ImageManip_H
+#define PokemonAutomation_CommonTools_ImageManip_H
+
+#include "CommonFramework/ImageTypes/ImageRGB32.h"
+
+namespace PokemonAutomation{
+
+
+ImageRGB32 pad_image(const ImageViewRGB32& image, size_t pixels_on_each_side, uint32_t pixel);
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonTools/Images/ImageTools.cpp b/SerialPrograms/Source/CommonTools/Images/ImageTools.cpp
new file mode 100644
index 0000000000..be6233e449
--- /dev/null
+++ b/SerialPrograms/Source/CommonTools/Images/ImageTools.cpp
@@ -0,0 +1,103 @@
+/*  Image Tools
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+#include "CommonFramework/ImageTypes/ImageRGB32.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/ImageTools/FloatPixel.h"
+#include "CommonTools/Images/SolidColorTest.h"
+#include "ImageTools.h"
+
+namespace PokemonAutomation{
+
+
+
+ImageRGB32 image_diff_greyscale(const ImageViewRGB32& x, const ImageViewRGB32& y){
+    if (!x || !y){
+        return ImageRGB32();
+    }
+    if (x.width() != y.width()){
+        return ImageRGB32();
+    }
+    if (x.height() != y.height()){
+        return ImageRGB32();
+    }
+
+    ImageRGB32 image(x.width(), x.height());
+    size_t width = x.width();
+    size_t height = x.height();
+    for (size_t r = 0; r < height; r++){
+        for (size_t c = 0; c < width; c++){
+            Color px(x.pixel(c, r));
+            Color py(y.pixel(c, r));
+            if (px.alpha() == 0 || py.alpha() == 0){
+                image.pixel(c, r) = 0xff000000;
+            }else{
+                double distance = euclidean_distance(px, py);
+                distance *= 0.57735026918962576451;  //  1 / sqrt(3)
+                uint32_t dist_int = std::min<uint32_t>((uint32_t)distance, 255);
+                image.pixel(c, r) = 0xff000000 + dist_int * 0x010101;
+            }
+        }
+    }
+    return image;
+}
+
+
+
+ImagePixelBox find_contents_pixel_box(const ImageViewRGB32& image){
+    const double MAX_SUM = 10;
+    const double MAX_STDDEV = 10;
+
+    size_t top = 0;
+    for (; top < image.height(); top++){
+        ImageViewRGB32 line = image.sub_image(0, top, image.width(), 1);
+        if (!is_black(line, MAX_SUM, MAX_STDDEV)){
+            break;
+        }
+    }
+
+    size_t bot = image.height();
+    for (; bot > top; bot--){
+        ImageViewRGB32 line = image.sub_image(0, bot - 1, image.width(), 1);
+        if (!is_black(line, MAX_SUM, MAX_STDDEV)){
+            break;
+        }
+    }
+
+    size_t left = 0;
+    for (; left < image.width(); left++){
+        ImageViewRGB32 line = image.sub_image(left, 0, 1, image.height());
+        if (!is_black(line, MAX_SUM, MAX_STDDEV)){
+            break;
+        }
+    }
+
+    size_t right = image.width();
+    for (; right > left; right--){
+        ImageViewRGB32 line = image.sub_image(right - 1, 0, 1, image.height());
+        if (!is_black(line, MAX_SUM, MAX_STDDEV)){
+            break;
+        }
+    }
+
+    return ImagePixelBox(left, top, right, bot);
+}
+ImageFloatBox find_contents_float_box(const ImageViewRGB32& image){
+    return pixelbox_to_floatbox(
+        image.width(), image.height(),
+        find_contents_pixel_box(image)
+    );
+}
+
+
+
+
+
+
+
+
+
+}
+
diff --git a/SerialPrograms/Source/CommonTools/Images/ImageTools.h b/SerialPrograms/Source/CommonTools/Images/ImageTools.h
new file mode 100644
index 0000000000..43b206dbb6
--- /dev/null
+++ b/SerialPrograms/Source/CommonTools/Images/ImageTools.h
@@ -0,0 +1,32 @@
+/*  Image Tools
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_CommonTools_ImageTools_H
+#define PokemonAutomation_CommonTools_ImageTools_H
+
+
+namespace PokemonAutomation{
+
+class ImageViewRGB32;
+class ImageRGB32;
+struct ImagePixelBox;
+struct ImageFloatBox;
+
+
+//  Deprecated
+ImageRGB32 image_diff_greyscale(const ImageViewRGB32& x, const ImageViewRGB32& y);
+
+
+ImagePixelBox find_contents_pixel_box(const ImageViewRGB32& image);
+ImageFloatBox find_contents_float_box(const ImageViewRGB32& image);
+
+
+
+
+
+}
+#endif
+
diff --git a/SerialPrograms/Source/CommonTools/Images/SolidColorTest.cpp b/SerialPrograms/Source/CommonTools/Images/SolidColorTest.cpp
new file mode 100644
index 0000000000..faf0a8e65f
--- /dev/null
+++ b/SerialPrograms/Source/CommonTools/Images/SolidColorTest.cpp
@@ -0,0 +1,121 @@
+/*  Solid Color Test
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <sstream>
+#include <iostream>
+#include "CommonFramework/StaticGlobals.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "SolidColorTest.h"
+
+using std::cout;
+using std::endl;
+
+namespace PokemonAutomation{
+
+
+bool is_white(
+    const ImageStats& stats,
+    double min_rgb_sum,
+    double max_stddev_sum
+){
+    if (stats.average.sum() < min_rgb_sum){
+        return false;
+    }
+    return is_solid(stats, {0.333333, 0.333333, 0.333333}, 0.08, max_stddev_sum);
+}
+bool is_black(
+    const ImageStats& stats,
+    double max_rgb_sum,
+    double max_stddev_sum
+){
+    double average = stats.average.sum();
+    double stddev = stats.stddev.sum();
+    if (STATIC_GLOBALS.COLOR_CHECK){
+        cout << "is_black(): stats.average " << stats.average.to_string() << "(sum " << average << ") stats.stddev " << stats.stddev.to_string()
+             << "(sum " << stddev << ") max_rgb_sum " << max_rgb_sum << " max_stddev_sum " << max_stddev_sum << endl;
+    }
+//    cout << stats.average << stats.stddev << endl;
+    return average <= max_rgb_sum && stddev <= max_stddev_sum;
+}
+bool is_grey(
+    const ImageStats& stats,
+    double min_rgb_sum, double max_rgb_sum,
+    double max_stddev_sum
+){
+    double average = stats.average.sum();
+    if (average < min_rgb_sum || average > max_rgb_sum){
+        return false;
+    }
+
+    double stddev = stats.stddev.sum();
+    if (stddev > max_stddev_sum){
+//       cout << "bad stddev = " << stddev << endl;
+        return false;
+    }
+
+    //  If it's too dark, color ratios will be unstable.
+    if (average < 100){
+        return true;
+    }
+
+    FloatPixel actual = stats.average / average;
+    double distance = euclidean_distance(actual, {0.333333, 0.333333, 0.333333});
+    return distance <= 0.1;
+}
+bool is_solid(
+    const ImageStats& stats,
+    const FloatPixel& expected_color_ratio,
+    double max_euclidean_distance,
+    double max_stddev_sum
+){
+    const double stddev = stats.stddev.sum();
+    if (STATIC_GLOBALS.COLOR_CHECK){
+        cout << "is_solid(): stddev sum " << stddev << " vs max " << max_stddev_sum << endl;
+    }
+    if (stddev > max_stddev_sum){
+//        cout << "bad stddev = " << stddev << endl;
+        return false;
+    }
+
+    const double average = stats.average.sum();
+    const FloatPixel actual = stats.average / average;
+    const double distance = euclidean_distance(actual, expected_color_ratio);
+    if (STATIC_GLOBALS.COLOR_CHECK){
+        cout << "is_solid(): average: " << actual.to_string() << " vs "
+             << expected_color_ratio.to_string() << ", distance " << distance
+             << " vs max " << max_euclidean_distance << endl;
+    }
+
+//    cout << "actual color ratio " << actual << endl;
+//    cout << "distance = " << distance << endl;
+
+    return distance <= max_euclidean_distance;
+}
+
+bool ImageSolidCheck::check(const ImageViewRGB32& frame) const{
+    ImageStats stats = image_stats(extract_box_reference(frame, box));
+    return is_solid(stats, expected_color_ratio, max_euclidean_distance, max_stddev_sum);
+}
+
+std::string ImageSolidCheck::debug_string(const ImageViewRGB32& frame) const{
+    std::ostringstream oss;
+    ImageStats stats = image_stats(extract_box_reference(frame, box));
+    oss << "Box (" << box.x << ", " << box.y << ", " << box.width << ", " << box.height << ") ";
+    
+    double average = stats.average.sum();
+    FloatPixel actual_ratio = stats.average / average;
+    oss << "expected color ratio: " << expected_color_ratio.to_string() << " ";
+    oss << "actual color ratio: " << actual_ratio.to_string() << " ";
+    oss << "dist: " << euclidean_distance(actual_ratio, expected_color_ratio) << " ";
+
+    double actual_stddev = stats.stddev.sum();
+    oss << "max stddev sum: " << max_stddev_sum << " actual stddev sum: " << actual_stddev;
+
+    return oss.str();
+}
+
+
+}
diff --git a/SerialPrograms/Source/CommonTools/Images/SolidColorTest.h b/SerialPrograms/Source/CommonTools/Images/SolidColorTest.h
new file mode 100644
index 0000000000..b5f18796f8
--- /dev/null
+++ b/SerialPrograms/Source/CommonTools/Images/SolidColorTest.h
@@ -0,0 +1,121 @@
+/*  Solid Color Test
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_CommonTools_SolidColorTest_H
+#define PokemonAutomation_CommonTools_SolidColorTest_H
+
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/ImageTools/ImageStats.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+
+
+bool is_white(
+    const ImageStats& stats,
+    double min_rgb_sum = 500,
+    double max_stddev_sum = 10
+);
+bool is_black(
+    const ImageStats& stats,
+    double max_rgb_sum = 100,
+    double max_stddev_sum = 10
+);
+bool is_grey(
+    const ImageStats& stats,
+    double min_rgb_sum, double max_rgb_sum,
+    double max_stddev_sum = 10
+);
+
+// expected_color_ratio: ratio of color channels to match, 
+// for a color {r, g, b}: the color ratio is {r/(r+g+b), g/(r+g+b), b/(r+g+b)}
+// the sum of the ratios should add up to 1.0.
+// e.g. if a color is (127, 127, 254), it's color ratio is (0.25, 0.25, 0.5)
+bool is_solid(
+    const ImageStats& stats,
+    const FloatPixel& expected_color_ratio,
+    double max_euclidean_distance = 0.15,
+    double max_stddev_sum = 10
+);
+
+
+inline bool is_white(
+    const ImageViewRGB32& image,
+    double min_rgb_sum = 500,
+    double max_stddev_sum = 10
+){
+    ImageStats stats = image_stats(image);
+    bool ret = is_white(stats, min_rgb_sum, max_stddev_sum);
+//    cout << stats.average << stats.stddev << endl;
+//    cout << ret << endl;
+    return ret;
+}
+inline bool is_black(
+    const ImageViewRGB32& image,
+    double max_rgb_sum = 100,
+    double max_stddev_sum = 10
+){
+    ImageStats stats = image_stats(image);
+    bool ret = is_black(stats, max_rgb_sum, max_stddev_sum);
+//    cout << stats.average << stats.stddev << endl;
+//    cout << ret << endl;
+    return ret;
+}
+inline bool is_grey(
+    const ImageViewRGB32& image,
+    double min_rgb_sum, double max_rgb_sum,
+    double max_stddev_sum = 10
+){
+    return is_grey(image_stats(image), min_rgb_sum, max_rgb_sum, max_stddev_sum);
+}
+
+// expected_color_ratio: ratio of color channels to match, e.g. if a color is (127, 127, 254), it's color ratio is (0.25, 0.25, 0.5)
+inline bool is_solid(
+    const ImageViewRGB32& image,
+    const FloatPixel& expected_color_ratio,
+    double max_euclidean_distance = 0.15,
+    double max_stddev_sum = 10
+){
+    ImageStats stats = image_stats(image);
+    bool ret = is_solid(stats, expected_color_ratio, max_euclidean_distance, max_stddev_sum);
+//    cout << stats.average << stats.stddev << endl;
+//    cout << ret << endl;
+    return ret;
+}
+
+// A convenience struct to do solid checks on images.
+struct ImageSolidCheck{
+    ImageFloatBox box;
+    FloatPixel expected_color_ratio;
+    double max_euclidean_distance = 0.15;
+    double max_stddev_sum = 10;
+
+    ImageSolidCheck(
+        double x, double y, double width, double height,
+        double r, double g, double b,
+        double max_distance = 0.15, double max_stddev_sum = 10)
+        : box(x, y, width, height)
+        , expected_color_ratio(r, g, b)
+        , max_euclidean_distance(max_distance)
+        , max_stddev_sum(max_stddev_sum)
+    {}
+    
+    // Check if the area on the image is a solid color.
+    bool check(const ImageViewRGB32& image) const;
+
+    // Return a debug string on the checks performed on the image.
+    std::string debug_string(const ImageViewRGB32& image) const;
+};
+
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonTools/Images/WaterfillUtilities.cpp b/SerialPrograms/Source/CommonTools/Images/WaterfillUtilities.cpp
new file mode 100644
index 0000000000..577b21a89b
--- /dev/null
+++ b/SerialPrograms/Source/CommonTools/Images/WaterfillUtilities.cpp
@@ -0,0 +1,232 @@
+/*  Waterfill Process
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <iostream>
+#include "Common/Cpp/Color.h"
+#include "Kernels/Waterfill/Kernels_Waterfill_Session.h"
+#include "Kernels/Waterfill/Kernels_Waterfill_Types.h"
+#include "CommonFramework/StaticGlobals.h"
+#include "CommonFramework/Logging/Logger.h"
+#include "CommonFramework/ImageTypes/ImageRGB32.h"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/Tools/DebugDumper.h"
+#include "CommonTools/Images/BinaryImage_FilterRgb32.h"
+#include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h"
+#include "WaterfillUtilities.h"
+
+using std::cout;
+using std::endl;
+
+namespace PokemonAutomation{
+
+using namespace Kernels::Waterfill;
+
+
+std::pair<PackedBinaryMatrix, size_t> remove_center_pixels(
+    const WaterfillObject& object,
+    size_t num_pixels_to_remove
+){
+    PackedBinaryMatrix matrix = object.packed_matrix();
+    size_t width = matrix.width();
+    size_t height = matrix.height();
+//    cout << matrix.dump() << endl;
+
+    //  Sort all pixels by distance from center.
+    size_t center_x = (size_t)(object.center_of_gravity_x() - object.min_x);
+    size_t center_y = (size_t)(object.center_of_gravity_y() - object.min_y);
+    std::vector<uint64_t> distances;
+    distances.reserve(object.area);
+    for (size_t r = 0; r < height; r++){
+        for (size_t c = 0; c < width; c++){
+            if (matrix.get(c, r)){
+                size_t dist_x = c - center_x;
+                size_t dist_y = r - center_y;
+                uint64_t distance_sqr = (uint64_t)dist_x*dist_x + (uint64_t)dist_y*dist_y;
+                distances.emplace_back(distance_sqr);
+            }
+        }
+    }
+
+//    cout << "total = " << total << endl;
+
+    //  Filter out pixels close to center
+    size_t count = 0;
+    uint64_t distance_sqr_th = 0;
+    for (uint64_t item : distances){
+        count++;
+        if (count >= num_pixels_to_remove){
+            distance_sqr_th = item;
+            break;
+        }
+    }
+    for (size_t r = 0; r < height; r++){
+        for (size_t c = 0; c < width; c++){
+            size_t dist_x = c - center_x;
+            size_t dist_y = r - center_y;
+            uint64_t distance_sqr = (uint64_t)dist_x*dist_x + (uint64_t)dist_y*dist_y;
+            if (distance_sqr < distance_sqr_th){
+                matrix.set(c, r, false);
+            }
+        }
+    }
+
+    return std::pair<PackedBinaryMatrix, size_t>(std::move(matrix), distance_sqr_th);
+}
+
+
+namespace{
+
+void dump_inputs(
+    const ImageViewRGB32& image,
+    const std::vector<std::pair<uint32_t, uint32_t>>& filters,
+    const std::pair<size_t, size_t>& area_thresholds,
+    double rmsd_threshold
+){
+    dump_debug_image(global_logger_command_line(), "CommonFramework/match_template_by_waterfill", "input_image", image);
+    cout << "Use " << filters.size() << " filter(s), area range ("
+                << area_thresholds.first << ", ";
+    if (area_thresholds.second == SIZE_MAX){
+        cout << "SIZE_MAX";
+    }else{
+        cout << area_thresholds.second;
+    }
+    cout << "), rmsd threshold " << rmsd_threshold << endl;
+    
+}
+
+void dump_object(
+    const WaterfillObject& object,
+    const ImageViewRGB32& image,
+    const std::pair<size_t, size_t>& area_thresholds
+){
+    cout << "Object WxH: " << object.width() << " x " << object.height() << ", area: " << object.area;
+    if (area_thresholds.second == SIZE_MAX){
+        cout << " vs threshold SIZE_MAX" << endl;
+    }else{
+        cout << "Object area: " << object.area << " vs threshold " << area_thresholds.second << endl;
+    }
+
+    cout << "object binary matrix WxH: " << object.object->width() << " x " << object.object->height() << endl;
+
+    ImageRGB32 filtered_image = image.copy();
+    // set background pixels to transparent and black so we can debug
+    // whether the binary mask of the object works as intended
+    filter_by_mask(object.object->submatrix(0, 0, image.width(), image.height()), filtered_image, Color(0), true);
+    dump_debug_image(global_logger_command_line(), "CommonFramework/match_template_by_waterfill",
+        "waterfillobject", filtered_image);
+}
+}
+
+bool match_template_by_waterfill(
+    Resolution input_resolution,
+    const ImageViewRGB32& image,
+    const ImageMatch::WaterfillTemplateMatcher& matcher,
+    const std::vector<std::pair<uint32_t, uint32_t>>& filters,
+    const std::pair<size_t, size_t>& area_thresholds,
+    double rmsd_threshold,
+    std::function<bool(WaterfillObject& object)> check_matched_object)
+{
+    const bool debug_mode = STATIC_GLOBALS.IMAGE_TEMPLATE_MATCHING;
+    if (debug_mode){
+        cout << "============ match_template_by_waterfill ============" << endl;
+        dump_inputs(image, filters, area_thresholds, rmsd_threshold);
+    }
+
+    std::vector<PokemonAutomation::PackedBinaryMatrix> matrices = compress_rgb32_to_binary_range(image, filters);
+
+    bool detected = false;
+    bool stop_match = false;
+    size_t num_waterfill_objects_found = 0;
+    for (size_t i_matrix = 0; i_matrix < matrices.size(); i_matrix++){
+        PackedBinaryMatrix& matrix = matrices[i_matrix];
+        if (debug_mode){
+            ImageRGB32 filtered_image = image.copy();
+            // set background pixels to transparent and black so we can debug
+            // whether the image filter works as intended
+            filter_by_mask(matrix, filtered_image, Color(0), true);
+            dump_debug_image(global_logger_command_line(), "CommonFramework/match_template_by_waterfill",
+                "input_image_filtered_" + std::to_string(i_matrix), filtered_image);
+        }
+
+        std::unique_ptr<WaterfillSession> session = make_WaterfillSession();
+        WaterfillObject object;
+        const size_t min_area = area_thresholds.first;
+        session->set_source(matrix);
+        auto finder = session->make_iterator(min_area);
+        const bool keep_object_matrix = debug_mode;
+        while (finder->find_next(object, keep_object_matrix)){
+            num_waterfill_objects_found++;
+            if (debug_mode){
+                cout << "------------ Matching One WaterfillObject ------------" << endl;
+                dump_object(object, image, area_thresholds);
+            }
+
+            if (object.area > area_thresholds.second){
+                continue;
+            }
+
+            const  double rmsd = matcher.rmsd_original(input_resolution, image, object);
+            if (debug_mode){
+                cout << "Final rmsd: " << rmsd << " vs threshold " << rmsd_threshold << endl;
+                cout << "------------ End of Matching one WaterfillObject ------------" << endl;
+            }
+
+            if (rmsd < rmsd_threshold){
+                detected = true; 
+                if (check_matched_object(object)){
+                    stop_match = true;
+                    break;
+                }
+            }
+        }
+
+        if (stop_match){
+            break;
+        }
+    }
+    if (debug_mode){
+        if (num_waterfill_objects_found == 0){
+            cout << "None of the filters produced any waterfill objects. "
+            << "Either the color filters are too restrictive, or the min_area threshold is too high." << endl;
+        }
+        cout << "============ End of match_template_by_waterfill ============" << endl;
+    }
+    return detected;
+}
+
+
+void draw_matrix_on_image(
+    const PackedBinaryMatrix& matrix,
+    uint32_t color, ImageRGB32& image, size_t offset_x, size_t offset_y
+){
+    for (size_t x = 0; x < matrix.width(); x++){
+        for (size_t y = 0; y < matrix.height(); y++){
+            if (matrix.get(x, y)){
+                image.pixel(offset_x + x, offset_y + y) = (uint32_t)color;
+            }
+        }
+    }
+}
+
+
+void draw_object_on_image(
+    const WaterfillObject& obj,
+    const uint32_t& color, ImageRGB32& image, size_t offset_x, size_t offset_y
+){
+    for (size_t x = 0; x < obj.width(); x++){
+        for (size_t y = 0; y < obj.height(); y++){
+            if (obj.object->get(obj.min_x + x, obj.min_y + y)){
+                image.pixel(offset_x + obj.min_x + x, offset_y + obj.min_y + y) = color;
+                // cout << "Set color at " << offset_x + object.min_x + obj.min_x + x << ", " << offset_y + object.min_y + obj.min_y + y << endl;
+            }
+        }
+    }
+}
+
+
+
+
+}
diff --git a/SerialPrograms/Source/CommonFramework/ImageTools/WaterfillUtilities.h b/SerialPrograms/Source/CommonTools/Images/WaterfillUtilities.h
similarity index 84%
rename from SerialPrograms/Source/CommonFramework/ImageTools/WaterfillUtilities.h
rename to SerialPrograms/Source/CommonTools/Images/WaterfillUtilities.h
index 3fbe0a8782..5aaaeee06a 100644
--- a/SerialPrograms/Source/CommonFramework/ImageTools/WaterfillUtilities.h
+++ b/SerialPrograms/Source/CommonTools/Images/WaterfillUtilities.h
@@ -1,15 +1,16 @@
 /*  Waterfill Utilities
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *  
  *  Util functions that process waterfill objects and matrices.
  */
 
-#ifndef PokemonAutomation_CommonFramework_WaterfillUtilities_H
-#define PokemonAutomation_CommonFramework_WaterfillUtilities_H
+#ifndef PokemonAutomation_CommonTools_WaterfillUtilities_H
+#define PokemonAutomation_CommonTools_WaterfillUtilities_H
 
 #include <functional>
 #include <utility>
+#include "Common/Cpp/ImageResolution.h"
 #include "CommonFramework/ImageTypes/BinaryImage.h"
 
 namespace PokemonAutomation{
@@ -45,6 +46,7 @@ std::pair<PackedBinaryMatrix, size_t> remove_center_pixels(
 // checking aspect ratio thresholds, area thresholds and RMSD threshold.
 // If a template match is found, call the function `check_matched_object()` on it.
 //
+// input_resolution: full screen resolution. If WaterfillTemplateMatcher implements a `check_image()` member function
 // image: the image.
 // matcher: the template matcher holding the template. It is also responsible for checking aspect ratio thresholds.
 // filters: each filter is parameterized by min and max color thresholds for detected pixels. For each filter, the function checks
@@ -54,12 +56,14 @@ std::pair<PackedBinaryMatrix, size_t> remove_center_pixels(
 // check_matched_object: if a matcher is found, pass the matched object to this function. If the function returns true, stop the
 //   entire template matching operation.
 bool match_template_by_waterfill(
-    const ImageViewRGB32 &image,
-    const ImageMatch::WaterfillTemplateMatcher &matcher,
+    Resolution input_resolution,
+    const ImageViewRGB32& image,
+    const ImageMatch::WaterfillTemplateMatcher& matcher,
     const std::vector<std::pair<uint32_t, uint32_t>> &filters,
-    const std::pair<size_t, size_t> &area_thresholds,
+    const std::pair<size_t, size_t>& area_thresholds,
     double rmsd_threshold,
-    std::function<bool(Kernels::Waterfill::WaterfillObject& object)> check_matched_object);
+    std::function<bool(Kernels::Waterfill::WaterfillObject& object)> check_matched_object
+);
 
 // Draw matrix on an image. Used for debugging the matrix.
 // color: color of the pixels from the matrix to render on the image.
diff --git a/SerialPrograms/Source/CommonFramework/InferenceInfra/AudioInferenceCallback.h b/SerialPrograms/Source/CommonTools/InferenceCallbacks/AudioInferenceCallback.h
similarity index 79%
rename from SerialPrograms/Source/CommonFramework/InferenceInfra/AudioInferenceCallback.h
rename to SerialPrograms/Source/CommonTools/InferenceCallbacks/AudioInferenceCallback.h
index d6f84bcaae..281498e4dd 100644
--- a/SerialPrograms/Source/CommonFramework/InferenceInfra/AudioInferenceCallback.h
+++ b/SerialPrograms/Source/CommonTools/InferenceCallbacks/AudioInferenceCallback.h
@@ -1,11 +1,11 @@
 /*  Audio Inference Callback
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#ifndef PokemonAutomation_CommonFramework_AudioInferenceCallback_H
-#define PokemonAutomation_CommonFramework_AudioInferenceCallback_H
+#ifndef PokemonAutomation_CommonTools_AudioInferenceCallback_H
+#define PokemonAutomation_CommonTools_AudioInferenceCallback_H
 
 #include <memory>
 #include <vector>
diff --git a/SerialPrograms/Source/CommonTools/InferenceCallbacks/InferenceCallback.h b/SerialPrograms/Source/CommonTools/InferenceCallbacks/InferenceCallback.h
new file mode 100644
index 0000000000..29e71ce258
--- /dev/null
+++ b/SerialPrograms/Source/CommonTools/InferenceCallbacks/InferenceCallback.h
@@ -0,0 +1,86 @@
+/*  Inference Callback
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_CommonTools_InferenceCallback_H
+#define PokemonAutomation_CommonTools_InferenceCallback_H
+
+#include <string>
+#include <chrono>
+#include "Common/Cpp/CancellableScope.h"
+
+namespace PokemonAutomation{
+
+class Cancellable;
+
+enum class InferenceType{
+    EXTERNAL,
+    VISUAL,
+    AUDIO,
+};
+
+//  Base class for an inference object to be called perioridically by
+//  inference routines in InferenceRoutines.h.
+class InferenceCallback{
+    //  Disable these to prevent accidental copying/slicing.
+    InferenceCallback(const InferenceCallback&) = delete;
+    void operator=(const InferenceCallback&) = delete;
+
+public:
+    virtual ~InferenceCallback() = default;
+
+    //  Is it a visual or audio inference.
+    InferenceType type() const{ return m_type; }
+    //  Name of the inference object.
+    const std::string& label() const{ return m_label; }
+
+
+protected:
+    InferenceCallback(InferenceType type, std::string label)
+        : m_type(type)
+        , m_label(label)
+    {}
+
+
+private:
+    InferenceType m_type;
+    std::string m_label;
+};
+
+
+class ExternalInferenceCallback : public InferenceCallback, public Cancellable{
+public:
+    ExternalInferenceCallback(std::string label)
+        : InferenceCallback(InferenceType::EXTERNAL, std::move(label))
+    {}
+};
+
+
+
+//  Used by inference routines in InferenceRoutines.h.
+//  The struct contains an inference callback and its inference period: how long
+//  should an inference routine wait before calling the callback object again.
+struct PeriodicInferenceCallback{
+    InferenceCallback* callback = nullptr;
+
+    //  Inference period. 0 value means the inference routine should use the
+    //  default inference period, which is set as a parameter to the inference
+    //  routine.
+    std::chrono::milliseconds period = std::chrono::milliseconds(0);
+
+    PeriodicInferenceCallback(){}
+    PeriodicInferenceCallback(
+        InferenceCallback& p_callback,
+        std::chrono::milliseconds p_period = std::chrono::milliseconds(0)
+    )
+        : callback(&p_callback)
+        , period(p_period)
+    {}
+};
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/InferenceInfra/VisualInferenceCallback.cpp b/SerialPrograms/Source/CommonTools/InferenceCallbacks/VisualInferenceCallback.cpp
similarity index 80%
rename from SerialPrograms/Source/CommonFramework/InferenceInfra/VisualInferenceCallback.cpp
rename to SerialPrograms/Source/CommonTools/InferenceCallbacks/VisualInferenceCallback.cpp
index b9cad5686d..938a11f752 100644
--- a/SerialPrograms/Source/CommonFramework/InferenceInfra/VisualInferenceCallback.cpp
+++ b/SerialPrograms/Source/CommonTools/InferenceCallbacks/VisualInferenceCallback.cpp
@@ -1,11 +1,10 @@
 /*  Visual Inference Callback
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include "Common/Cpp/Exceptions.h"
-#include "CommonFramework/ImageTypes/ImageRGB32.h"
 #include "CommonFramework/VideoPipeline/VideoFeed.h"
 #include "VisualInferenceCallback.h"
 
diff --git a/SerialPrograms/Source/CommonTools/InferenceCallbacks/VisualInferenceCallback.h b/SerialPrograms/Source/CommonTools/InferenceCallbacks/VisualInferenceCallback.h
new file mode 100644
index 0000000000..b040b47de2
--- /dev/null
+++ b/SerialPrograms/Source/CommonTools/InferenceCallbacks/VisualInferenceCallback.h
@@ -0,0 +1,49 @@
+/*  Visual Inference Callback
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_CommonTools_VisualInferenceCallback_H
+#define PokemonAutomation_CommonTools_VisualInferenceCallback_H
+
+#include <string>
+#include "Common/Cpp/Time.h"
+#include "InferenceCallback.h"
+
+namespace PokemonAutomation{
+
+class ImageViewRGB32;
+class ImageRGB32;
+struct VideoSnapshot;
+class VideoOverlaySet;
+
+//  Base class for a visual inference object to be called perioridically by
+//  inference routines in InferenceRoutines.h.
+class VisualInferenceCallback : public InferenceCallback{
+public:
+    VisualInferenceCallback(std::string label)
+        : InferenceCallback(InferenceType::VISUAL, std::move(label))
+    {}
+
+    //  The inference routines call this function to create video overlays to visualize
+    //  regions of interest of the inference callback.
+    virtual void make_overlays(VideoOverlaySet& items) const = 0;
+
+    //  Return true if the inference session should stop.
+    //  You must override at least one of the overloaded `process_frame()`.
+    //  The base class's implementation is just calling the other overloaded
+    //  `process_frame(const ImageViewRGB32& frame, WallClock timestamp)`.
+    virtual bool process_frame(const VideoSnapshot& frame);
+    //  Return true if the inference session should stop.
+    //  You must override at least one of the overloaded `process_frame()`.
+    //  The base class's implementation throws `InternalProgramError`.
+    virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp);
+
+};
+
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/InferenceInfra/AudioInferencePivot.cpp b/SerialPrograms/Source/CommonTools/InferencePivots/AudioInferencePivot.cpp
similarity index 82%
rename from SerialPrograms/Source/CommonFramework/InferenceInfra/AudioInferencePivot.cpp
rename to SerialPrograms/Source/CommonTools/InferencePivots/AudioInferencePivot.cpp
index 31c8f7d7c3..d75d63b237 100644
--- a/SerialPrograms/Source/CommonFramework/InferenceInfra/AudioInferencePivot.cpp
+++ b/SerialPrograms/Source/CommonTools/InferencePivots/AudioInferencePivot.cpp
@@ -1,10 +1,11 @@
 /*  Audio Inference Pivot
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include "Common/Cpp/Exceptions.h"
+#include "CommonFramework/Tools/GlobalThreadPools.h"
 #include "CommonFramework/AudioPipeline/AudioFeed.h"
 #include "AudioInferencePivot.h"
 
@@ -21,6 +22,7 @@ struct AudioInferencePivot::PeriodicCallback{
     std::atomic<InferenceCallback*>* set_when_triggered;
     AudioInferenceCallback& callback;
     std::chrono::milliseconds period;
+    WallClock start_time;
 
     uint64_t last_seqnum = ~(uint64_t)0;
 
@@ -30,18 +32,20 @@ struct AudioInferencePivot::PeriodicCallback{
         Cancellable& p_scope,
         std::atomic<InferenceCallback*>* p_set_when_triggered,
         AudioInferenceCallback& p_callback,
-        std::chrono::milliseconds p_period
+        std::chrono::milliseconds p_period,
+        WallClock m_start_time
     )
         : scope(p_scope)
         , set_when_triggered(p_set_when_triggered)
         , callback(p_callback)
         , period(p_period)
+        , start_time(m_start_time)
     {}
 };
 
 
-AudioInferencePivot::AudioInferencePivot(CancellableScope& scope, AudioFeed& feed, AsyncDispatcher& dispatcher)
-    : PeriodicRunner(dispatcher)
+AudioInferencePivot::AudioInferencePivot(CancellableScope& scope, AudioFeed& feed)
+    : BusyPeriodicRunner(GlobalThreadPools::unlimited_pivot())
     , m_feed(feed)
 {
     attach(scope);
@@ -54,9 +58,10 @@ void AudioInferencePivot::add_callback(
     Cancellable& scope,
     std::atomic<InferenceCallback*>* set_when_triggered,
     AudioInferenceCallback& callback,
-    std::chrono::milliseconds period
+    std::chrono::milliseconds period,
+    WallClock start_time
 ){
-    SpinLockGuard lg(m_lock);
+    WriteSpinLock lg(m_lock, PA_CURRENT_FUNCTION);
     auto iter = m_map.find(&callback);
     if (iter != m_map.end()){
         throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Attempted to add the same callback twice.");
@@ -64,23 +69,23 @@ void AudioInferencePivot::add_callback(
     iter = m_map.emplace(
         std::piecewise_construct,
         std::forward_as_tuple(&callback),
-        std::forward_as_tuple(scope, set_when_triggered, callback, period)
+        std::forward_as_tuple(scope, set_when_triggered, callback, period, start_time)
     ).first;
     try{
-        PeriodicRunner::add_event(&iter->second, period);
+        BusyPeriodicRunner::add_event(&iter->second, period);
     }catch (...){
         m_map.erase(iter);
         throw;
     }
 }
 StatAccumulatorI32 AudioInferencePivot::remove_callback(AudioInferenceCallback& callback){
-    SpinLockGuard lg(m_lock);
+    WriteSpinLock lg(m_lock, PA_CURRENT_FUNCTION);
     auto iter = m_map.find(&callback);
     if (iter == m_map.end()){
         return StatAccumulatorI32();
     }
     StatAccumulatorI32 stats = iter->second.stats;
-    PeriodicRunner::remove_event(&iter->second);
+    BusyPeriodicRunner::remove_event(&iter->second);
     m_map.erase(iter);
     return stats;
 }
diff --git a/SerialPrograms/Source/CommonTools/InferencePivots/AudioInferencePivot.h b/SerialPrograms/Source/CommonTools/InferencePivots/AudioInferencePivot.h
new file mode 100644
index 0000000000..808f1c87d7
--- /dev/null
+++ b/SerialPrograms/Source/CommonTools/InferencePivots/AudioInferencePivot.h
@@ -0,0 +1,61 @@
+/*  Audio Inference Pivot
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_CommonTools_AudioInferencePivot_H
+#define PokemonAutomation_CommonTools_AudioInferencePivot_H
+
+#include "Common/Cpp/Concurrency/SpinLock.h"
+#include "Common/Cpp/Concurrency/BusyPeriodicRunner.h"
+#include "CommonFramework/Tools/StatAccumulator.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayTypes.h"
+#include "CommonTools/InferenceCallbacks/AudioInferenceCallback.h"
+
+namespace PokemonAutomation{
+
+class AudioFeed;
+
+
+
+class AudioInferencePivot final : public BusyPeriodicRunner, public OverlayStat{
+public:
+    AudioInferencePivot(CancellableScope& scope, AudioFeed& feed);
+    virtual ~AudioInferencePivot();
+
+    //  If this callback returns true:
+    //      1.  Cancel "scope".
+    //      2.  Set "set_when_triggered" to the callback.
+    //  If the callback throws an exception, "scope" will be cancelled with that exception.
+    void add_callback(
+        Cancellable& scope,
+        std::atomic<InferenceCallback*>* set_when_triggered,
+        AudioInferenceCallback& callback,
+        std::chrono::milliseconds period,
+        WallClock start_time
+    );
+
+    //  Returns the latency stats for the callback. Units are microseconds.
+    StatAccumulatorI32 remove_callback(AudioInferenceCallback& callback);
+
+private:
+    virtual void run(void* event, bool is_back_to_back) noexcept override;
+    virtual OverlayStatSnapshot get_current() override;
+
+private:
+    struct PeriodicCallback;
+
+    AudioFeed& m_feed;
+    SpinLock m_lock;
+    std::map<AudioInferenceCallback*, PeriodicCallback> m_map;
+
+//    uint64_t m_last_seqnum = ~(uint64_t)0;
+
+    OverlayStatUtilizationPrinter m_printer;
+};
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonTools/InferencePivots/VisualInferencePivot.cpp b/SerialPrograms/Source/CommonTools/InferencePivots/VisualInferencePivot.cpp
new file mode 100644
index 0000000000..5e3a430b90
--- /dev/null
+++ b/SerialPrograms/Source/CommonTools/InferencePivots/VisualInferencePivot.cpp
@@ -0,0 +1,128 @@
+/*  Visual Inference Pivot
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Exceptions.h"
+#include "CommonFramework/Tools/GlobalThreadPools.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "VisualInferencePivot.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+
+
+
+struct VisualInferencePivot::PeriodicCallback{
+    Cancellable& scope;
+    std::atomic<InferenceCallback*>* set_when_triggered;
+    VisualInferenceCallback& callback;
+    std::chrono::milliseconds period;
+    WallClock last_timestamp;
+    StatAccumulatorI32 stats;
+
+    PeriodicCallback(
+        Cancellable& p_scope,
+        std::atomic<InferenceCallback*>* p_set_when_triggered,
+        VisualInferenceCallback& p_callback,
+        std::chrono::milliseconds p_period,
+        WallClock p_start_time
+    )
+        : scope(p_scope)
+        , set_when_triggered(p_set_when_triggered)
+        , callback(p_callback)
+        , period(p_period)
+        , last_timestamp(p_start_time)
+    {}
+};
+
+
+
+VisualInferencePivot::VisualInferencePivot(CancellableScope& scope, VideoFeed& feed)
+    : BusyPeriodicRunner(GlobalThreadPools::unlimited_pivot())
+    , m_feed(feed)
+{
+    attach(scope);
+}
+VisualInferencePivot::~VisualInferencePivot(){
+    detach();
+    stop_thread();
+}
+void VisualInferencePivot::add_callback(
+    Cancellable& scope,
+    std::atomic<InferenceCallback*>* set_when_triggered,
+    VisualInferenceCallback& callback,
+    std::chrono::milliseconds period,
+    WallClock start_time
+){
+    WriteSpinLock lg(m_lock, PA_CURRENT_FUNCTION);
+    auto iter = m_map.find(&callback);
+    if (iter != m_map.end()){
+        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Attempted to add the same callback twice.");
+    }
+    iter = m_map.emplace(
+        std::piecewise_construct,
+        std::forward_as_tuple(&callback),
+        std::forward_as_tuple(scope, set_when_triggered, callback, period, start_time)
+    ).first;
+    try{
+        BusyPeriodicRunner::add_event(&iter->second, period);
+    }catch (...){
+        m_map.erase(iter);
+        throw;
+    }
+}
+StatAccumulatorI32 VisualInferencePivot::remove_callback(VisualInferenceCallback& callback){
+    WriteSpinLock lg(m_lock, PA_CURRENT_FUNCTION);
+    auto iter = m_map.find(&callback);
+    if (iter == m_map.end()){
+        return StatAccumulatorI32();
+    }
+    StatAccumulatorI32 stats = iter->second.stats;
+    BusyPeriodicRunner::remove_event(&iter->second);
+    m_map.erase(iter);
+    return stats;
+}
+void VisualInferencePivot::run(void* event, bool is_back_to_back) noexcept{
+    PeriodicCallback& callback = *(PeriodicCallback*)event;
+    try{
+        //  Reuse the cached screenshot.
+        if (!is_back_to_back || callback.last_timestamp == m_last.timestamp){
+            m_last = m_feed.snapshot_recent_nonblocking(callback.last_timestamp);
+        }
+
+        if (!m_last){
+            return;
+        }
+
+        WallClock time0 = current_time();
+        bool stop = callback.callback.process_frame(m_last);
+        WallClock time1 = current_time();
+        callback.stats += (uint32_t)std::chrono::duration_cast<std::chrono::microseconds>(time1 - time0).count();
+        callback.last_timestamp = m_last.timestamp;
+
+        if (stop){
+            if (callback.set_when_triggered){
+                InferenceCallback* expected = nullptr;
+                callback.set_when_triggered->compare_exchange_strong(expected, &callback.callback);
+            }
+            callback.scope.cancel(nullptr);
+        }
+    }catch (...){
+        callback.scope.cancel(std::current_exception());
+    }
+}
+
+
+OverlayStatSnapshot VisualInferencePivot::get_current(){
+    return m_printer.get_snapshot("Video Pivot Utilization:", this->current_utilization());
+}
+
+
+
+
+}
diff --git a/SerialPrograms/Source/CommonTools/InferencePivots/VisualInferencePivot.h b/SerialPrograms/Source/CommonTools/InferencePivots/VisualInferencePivot.h
new file mode 100644
index 0000000000..7203a10c5f
--- /dev/null
+++ b/SerialPrograms/Source/CommonTools/InferencePivots/VisualInferencePivot.h
@@ -0,0 +1,61 @@
+/*  Visual Inference Pivot
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_CommonTools_VisualInferencePivot_H
+#define PokemonAutomation_CommonTools_VisualInferencePivot_H
+
+#include "Common/Cpp/Concurrency/SpinLock.h"
+#include "Common/Cpp/Concurrency/BusyPeriodicRunner.h"
+#include "CommonFramework/Tools/StatAccumulator.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayTypes.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+
+namespace PokemonAutomation{
+
+class VideoFeed;
+
+
+
+class VisualInferencePivot final : public BusyPeriodicRunner, public OverlayStat{
+public:
+    VisualInferencePivot(CancellableScope& scope, VideoFeed& feed);
+    virtual ~VisualInferencePivot();
+
+    //  If this callback returns true:
+    //      1.  Cancel "scope".
+    //      2.  Set "set_when_triggered" to the callback.
+    //  If the callback throws an exception, "scope" will be cancelled with that exception.
+    void add_callback(
+        Cancellable& scope,
+        std::atomic<InferenceCallback*>* set_when_triggered,
+        VisualInferenceCallback& callback,
+        std::chrono::milliseconds period,
+        WallClock start_time
+    );
+
+    //  Returns the latency stats for the callback. Units are microseconds.
+    StatAccumulatorI32 remove_callback(VisualInferenceCallback& callback);
+
+private:
+    virtual void run(void* event, bool is_back_to_back) noexcept override;
+    virtual OverlayStatSnapshot get_current() override;
+
+private:
+    struct PeriodicCallback;
+
+    VideoFeed& m_feed;
+    SpinLock m_lock;
+    std::map<VisualInferenceCallback*, PeriodicCallback> m_map;
+    VideoSnapshot m_last;
+
+    OverlayStatUtilizationPrinter m_printer;
+};
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/Inference/InferenceThrottler.h b/SerialPrograms/Source/CommonTools/InferenceThrottler.h
similarity index 85%
rename from SerialPrograms/Source/CommonFramework/Inference/InferenceThrottler.h
rename to SerialPrograms/Source/CommonTools/InferenceThrottler.h
index 43d994f9f9..d549d3edc3 100644
--- a/SerialPrograms/Source/CommonFramework/Inference/InferenceThrottler.h
+++ b/SerialPrograms/Source/CommonTools/InferenceThrottler.h
@@ -1,11 +1,11 @@
 /*  Inference Throttler
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#ifndef PokemonAutomation_CommonFramework_InferenceThrottler_H
-#define PokemonAutomation_CommonFramework_InferenceThrottler_H
+#ifndef PokemonAutomation_CommonTools_InferenceThrottler_H
+#define PokemonAutomation_CommonTools_InferenceThrottler_H
 
 #include <chrono>
 #include "Common/Cpp/CancellableScope.h"
diff --git a/SerialPrograms/Source/CommonTools/MultiConsoleErrors.cpp b/SerialPrograms/Source/CommonTools/MultiConsoleErrors.cpp
new file mode 100644
index 0000000000..fdf9e46e7d
--- /dev/null
+++ b/SerialPrograms/Source/CommonTools/MultiConsoleErrors.cpp
@@ -0,0 +1,32 @@
+/*  Multi-Console Errors
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/Tools/VideoStream.h"
+#include "MultiConsoleErrors.h"
+
+namespace PokemonAutomation{
+
+
+
+void MultiConsoleErrorState::report_unrecoverable_error(VideoStream& stream, std::string msg){
+    stream.log(msg, COLOR_RED);
+    bool expected = false;
+    if (m_unrecoverable_error.compare_exchange_strong(expected, true)){
+        m_message = msg;
+    }
+    OperationFailedExceptionWithScreenshot::fire(ErrorReportMode::SEND_ERROR_REPORT, std::move(msg), stream);
+}
+void MultiConsoleErrorState::check_unrecoverable_error(Logger& logger){
+    if (m_unrecoverable_error.load(std::memory_order_acquire)){
+        logger.log("Unrecoverable error reported from a different console. Breaking out.", COLOR_RED);
+        throw_and_log<OperationFailedException>(logger, ErrorReportMode::NO_ERROR_REPORT, m_message);
+    }
+}
+
+
+
+}
diff --git a/SerialPrograms/Source/CommonTools/MultiConsoleErrors.h b/SerialPrograms/Source/CommonTools/MultiConsoleErrors.h
new file mode 100644
index 0000000000..573de98bb2
--- /dev/null
+++ b/SerialPrograms/Source/CommonTools/MultiConsoleErrors.h
@@ -0,0 +1,33 @@
+/*  Multi-Console Errors
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_CommonTools_MultiConsoleErrors_H
+#define PokemonAutomation_CommonTools_MultiConsoleErrors_H
+
+#include <string>
+#include <atomic>
+
+namespace PokemonAutomation{
+
+class Logger;
+class VideoStream;
+
+
+class MultiConsoleErrorState{
+public:
+    void report_unrecoverable_error(VideoStream& stream, std::string msg);
+    void check_unrecoverable_error(Logger& logger);
+
+private:
+    std::atomic<bool> m_unrecoverable_error;
+    std::string m_message;
+};
+
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonTools/OCR/OCR_DictionaryMatcher.cpp b/SerialPrograms/Source/CommonTools/OCR/OCR_DictionaryMatcher.cpp
new file mode 100644
index 0000000000..126f8716e8
--- /dev/null
+++ b/SerialPrograms/Source/CommonTools/OCR/OCR_DictionaryMatcher.cpp
@@ -0,0 +1,87 @@
+/*  Dictionary Matcher
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Exceptions.h"
+#include "OCR_DictionaryMatcher.h"
+
+namespace PokemonAutomation{
+namespace OCR{
+
+
+const DictionaryOCR& DictionaryMatcher::dictionary(Language language) const{
+    auto iter = m_database.find(language);
+    if (iter == m_database.end()){
+        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Language not loaded.");
+    }
+    return iter->second;
+}
+DictionaryOCR& DictionaryMatcher::dictionary(Language language){
+    ReadSpinLock lg(m_lock, "LargeDictionaryMatcher::dictionary()");
+    auto iter = m_database.find(language);
+    if (iter == m_database.end()){
+        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Language not loaded.");
+    }
+    return iter->second;
+}
+
+
+StringMatchResult DictionaryMatcher::match_substring(
+    Language language,
+    const std::string& text,
+    double log10p_spread
+) const{
+    return dictionary(language).match_substring(text, log10p_spread);
+}
+
+
+
+OCR::StringMatchResult DictionaryMatcher::match_substring_from_image(
+    Logger* logger,
+    Language language,
+    const ImageViewRGB32& image,
+    double max_log10p, double log10p_spread,
+    OCR::PageSegMode psm
+) const{
+    OCR::StringMatchResult ret = OCR::dictionary_OCR(
+        language, *this, image,
+        log10p_spread, psm
+    );
+    if (logger){
+        ret.log(*logger, max_log10p);
+    }
+    ret.clear_beyond_log10p(max_log10p);
+    return ret;
+}
+
+OCR::StringMatchResult DictionaryMatcher::match_substring_from_image_multifiltered(
+    Logger* logger,
+    Language language,
+    const ImageViewRGB32& image,
+    const std::vector<OCR::TextColorRange>& text_color_ranges,
+    double max_log10p, double log10p_spread,
+    double min_text_ratio, double max_text_ratio,
+    OCR::PageSegMode psm
+) const{
+    OCR::StringMatchResult ret = OCR::multifiltered_OCR(
+        language, *this, image,
+        text_color_ranges,
+        log10p_spread, min_text_ratio, max_text_ratio,
+        psm
+    );
+    if (logger){
+        ret.log(*logger, max_log10p);
+    }
+    ret.clear_beyond_log10p(max_log10p);
+    return ret;
+}
+
+void DictionaryMatcher::add_candidate(Language language, std::string token, const std::u32string& candidate){
+    dictionary(language).add_candidate(std::move(token), candidate);
+}
+
+
+}
+}
diff --git a/SerialPrograms/Source/CommonTools/OCR/OCR_DictionaryMatcher.h b/SerialPrograms/Source/CommonTools/OCR/OCR_DictionaryMatcher.h
new file mode 100644
index 0000000000..5d2a52568e
--- /dev/null
+++ b/SerialPrograms/Source/CommonTools/OCR/OCR_DictionaryMatcher.h
@@ -0,0 +1,101 @@
+/*  Dictionary Matcher
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_CommonTools_OCR_DictionaryMatcher_H
+#define PokemonAutomation_CommonTools_OCR_DictionaryMatcher_H
+
+#include <map>
+#include "Common/Cpp/Concurrency/SpinLock.h"
+#include "CommonFramework/Language.h"
+#include "OCR_Routines.h"
+#include "OCR_DictionaryOCR.h"
+
+namespace PokemonAutomation{
+    class ImageViewRGB32;
+namespace OCR{
+
+// Base class for an OCR matcher. It matches a sub-string from a dictionary.
+// The construction of the dictionary is left to the derived class.
+class DictionaryMatcher{
+public:
+    const LanguageSet& languages() const{ return m_languages; }
+
+
+public:
+    const DictionaryOCR& dictionary(Language language) const;
+
+    StringMatchResult match_substring(
+        Language language,
+        const std::string& text, double log10p_spread = 0.50
+    ) const;
+
+    // Match a substring from `image`.
+    // max_log10p: Threshold for finding any valid match.
+    //   The raw OCR result gives a probability for each dictionary key. The probility p
+    //   is that if this key is matched by accident. The lower this value, the closer
+    //   the match. Apply log10() to it to get log10p.
+    //   If all keys' log10p is above this `max_log10p`, there will be no match.
+    // log10p_spread: threshold for considering ambiguous match.
+    //   It specifies the minimum separation between the best candidate and
+    //   2nd best candidate's log10p for it to not be considered ambiguous.
+    // psm: Tesseract Page Segmentation mode. See
+    //   SerialPrograms/Source/CommonTools/OCR/OCR_RawTesseractOCR.h:PageSegMode
+    OCR::StringMatchResult match_substring_from_image(
+        Logger* logger,
+        Language language,
+        const ImageViewRGB32& image,
+        double max_log10p, double log10p_spread = 0.5,
+        OCR::PageSegMode psm = OCR::PageSegMode::SINGLE_LINE
+    ) const;
+
+    // Match a substring from `image` using multiple black-white filters.
+    // text_color_ranges: the function will try multiple attempts of separating
+    //   text color and background color, and do OCR on the text with background color
+    //   removed. The text color range of attempt is specified by each element in
+    //   `text_color_ranges`.
+    // max_log10p: Threshold for finding any valid match.
+    //   The raw OCR result gives a probability for each dictionary key. The probility p
+    //   is that if this key is matched by accident. The lower this value, the closer
+    //   the match. Apply log10() to it to get log10p.
+    //   If all keys' log10p is above this `max_log10p`, there will be no match.
+    // log10p_spread: threshold for considering ambiguous match.
+    //   It specifies the minimum separation between the best candidate and
+    //   2nd best candidate's log10p for it to not be considered ambiguous.
+    // min/max_text_ratio: min/max_text_ratio is the range where the ratio of text color
+    //   pixel count to background color pixel count must fall into before the matcher
+    //   even attempts to OCR. This is useful for pruning images with no appearant texts to
+    //   reduce expensive OCR computation.
+    // psm: Tesseract Page Segmentation mode. See
+    //   SerialPrograms/Source/CommonTools/OCR/OCR_RawTesseractOCR.h:PageSegMode
+    OCR::StringMatchResult match_substring_from_image_multifiltered(
+        Logger* logger,
+        Language language,
+        const ImageViewRGB32& image,
+        const std::vector<OCR::TextColorRange>& text_color_ranges,
+        double max_log10p, double log10p_spread = 0.5,
+        double min_text_ratio = 0.01, double max_text_ratio = 0.50,
+        OCR::PageSegMode psm = OCR::PageSegMode::SINGLE_LINE
+    ) const;
+
+
+
+public:
+    //  These functions are thread-safe with themselves, but not with any other
+    //  functions in this class.
+    DictionaryOCR& dictionary(Language language);
+    void add_candidate(Language language, std::string token, const std::u32string& candidate);
+
+
+protected:
+    LanguageSet m_languages;
+    std::map<Language, DictionaryOCR> m_database;
+    SpinLock m_lock;
+};
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/OCR/OCR_DictionaryOCR.cpp b/SerialPrograms/Source/CommonTools/OCR/OCR_DictionaryOCR.cpp
similarity index 75%
rename from SerialPrograms/Source/CommonFramework/OCR/OCR_DictionaryOCR.cpp
rename to SerialPrograms/Source/CommonTools/OCR/OCR_DictionaryOCR.cpp
index c277434031..50da685037 100644
--- a/SerialPrograms/Source/CommonFramework/OCR/OCR_DictionaryOCR.cpp
+++ b/SerialPrograms/Source/CommonTools/OCR/OCR_DictionaryOCR.cpp
@@ -1,20 +1,21 @@
 /*  Dictionary OCR
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
+#include "Common/Cpp/Strings/Unicode.h"
 #include "Common/Cpp/Json/JsonValue.h"
 #include "Common/Cpp/Json/JsonArray.h"
 #include "Common/Cpp/Json/JsonObject.h"
-#include "Common/Qt/StringToolsQt.h"
+#include "CommonFramework/Logging/Logger.h"
 #include "OCR_StringNormalization.h"
 #include "OCR_TextMatcher.h"
 #include "OCR_DictionaryOCR.h"
 
-#include <iostream>
-using std::cout;
-using std::endl;
+//#include <iostream>
+//using std::cout;
+//using std::endl;
 
 namespace PokemonAutomation{
 namespace OCR{
@@ -35,13 +36,15 @@ DictionaryOCR::DictionaryOCR(
             continue;
         }
         std::vector<std::string>& candidates = m_database[token];
-        for (const auto& item1 : item0.second.get_array_throw()){
-            const std::string& candidate = item1.get_string_throw();
+        for (const auto& item1 : item0.second.to_array_throw()){
+            const std::string& candidate = item1.to_string_throw();
             std::u32string normalized = normalize_utf32(candidate);
             std::set<std::string>& set = m_candidate_to_token[normalized];
             if (!set.empty()){
-                global_logger_tagged().log("DictionaryOCR - Duplicate Candidate: " + token);
-//                cout << "Duplicate Candidate: " << it.key().toUtf8().data() << endl;
+                global_logger_tagged().log(
+                    "DictionaryOCR - Duplicate Candidate: " + token + " (" + utf32_to_str(normalized) + ")"
+                );
+//                cout << "Duplicate Candidate: " << candidate << endl;
             }
             set.insert(token);
             candidates.emplace_back(candidate);
@@ -63,7 +66,7 @@ DictionaryOCR::DictionaryOCR(
     bool first_only
 )
     : DictionaryOCR(
-        load_json_file(json_path).get_object_throw(json_path),
+        load_json_file(json_path).to_object_throw(json_path),
         subset,
         random_match_chance,
         first_only
@@ -101,12 +104,12 @@ void DictionaryOCR::add_candidate(std::string token, const std::u32string& candi
         return;
     }
 
-    SpinLockGuard lg(m_lock, "DictionaryOCR::add_candidate()");
+    WriteSpinLock lg(m_lock, "DictionaryOCR::add_candidate()");
 
     auto iter = m_candidate_to_token.find(candidate);
     if (iter == m_candidate_to_token.end()){
         //  New candidate. Add it to both maps.
-        m_database[token].emplace_back(to_utf8(candidate));
+        m_database[token].emplace_back(utf32_to_str(candidate));
         m_candidate_to_token[candidate].insert(std::move(token));
         return;
     }
@@ -115,7 +118,7 @@ void DictionaryOCR::add_candidate(std::string token, const std::u32string& candi
     std::set<std::string>& tokens = iter->second;
     if (tokens.find(token) == tokens.end()){
         //  Add to database only if it isn't already there.
-        m_database[token].emplace_back(to_utf8(candidate));
+        m_database[token].emplace_back(utf32_to_str(candidate));
     }
 
     tokens.insert(std::move(token));
diff --git a/SerialPrograms/Source/CommonFramework/OCR/OCR_DictionaryOCR.h b/SerialPrograms/Source/CommonTools/OCR/OCR_DictionaryOCR.h
similarity index 84%
rename from SerialPrograms/Source/CommonFramework/OCR/OCR_DictionaryOCR.h
rename to SerialPrograms/Source/CommonTools/OCR/OCR_DictionaryOCR.h
index 887c4bca79..b95e796fbb 100644
--- a/SerialPrograms/Source/CommonFramework/OCR/OCR_DictionaryOCR.h
+++ b/SerialPrograms/Source/CommonTools/OCR/OCR_DictionaryOCR.h
@@ -1,11 +1,11 @@
 /*  Dictionary OCR
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#ifndef PokemonAutomation_OCR_DictionaryOCR_H
-#define PokemonAutomation_OCR_DictionaryOCR_H
+#ifndef PokemonAutomation_CommonTools_OCR_DictionaryOCR_H
+#define PokemonAutomation_CommonTools_OCR_DictionaryOCR_H
 
 #include <vector>
 #include <set>
diff --git a/SerialPrograms/Source/CommonFramework/OCR/OCR_LargeDictionaryMatcher.cpp b/SerialPrograms/Source/CommonTools/OCR/OCR_LargeDictionaryMatcher.cpp
similarity index 83%
rename from SerialPrograms/Source/CommonFramework/OCR/OCR_LargeDictionaryMatcher.cpp
rename to SerialPrograms/Source/CommonTools/OCR/OCR_LargeDictionaryMatcher.cpp
index 2447ea6cb2..faac37f6f4 100644
--- a/SerialPrograms/Source/CommonFramework/OCR/OCR_LargeDictionaryMatcher.cpp
+++ b/SerialPrograms/Source/CommonTools/OCR/OCR_LargeDictionaryMatcher.cpp
@@ -1,13 +1,11 @@
 /*  Large Database Matcher
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include "Common/Cpp/Exceptions.h"
-#include "CommonFramework/Globals.h"
-#include "OCR_StringNormalization.h"
-#include "OCR_TextMatcher.h"
+#include "CommonFramework/GlobalAutoPaths.h"
 #include "OCR_LargeDictionaryMatcher.h"
 
 namespace PokemonAutomation{
diff --git a/SerialPrograms/Source/CommonFramework/OCR/OCR_LargeDictionaryMatcher.h b/SerialPrograms/Source/CommonTools/OCR/OCR_LargeDictionaryMatcher.h
similarity index 87%
rename from SerialPrograms/Source/CommonFramework/OCR/OCR_LargeDictionaryMatcher.h
rename to SerialPrograms/Source/CommonTools/OCR/OCR_LargeDictionaryMatcher.h
index 40c16c8484..94eaac1ea2 100644
--- a/SerialPrograms/Source/CommonFramework/OCR/OCR_LargeDictionaryMatcher.h
+++ b/SerialPrograms/Source/CommonTools/OCR/OCR_LargeDictionaryMatcher.h
@@ -1,11 +1,11 @@
 /*  Large Dictionary Matcher
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#ifndef PokemonAutomation_OCR_LargeDictionaryMatcher_H
-#define PokemonAutomation_OCR_LargeDictionaryMatcher_H
+#ifndef PokemonAutomation_CommonTools_OCR_LargeDictionaryMatcher_H
+#define PokemonAutomation_CommonTools_OCR_LargeDictionaryMatcher_H
 
 #include "OCR_DictionaryMatcher.h"
 
diff --git a/SerialPrograms/Source/CommonTools/OCR/OCR_NumberReader.cpp b/SerialPrograms/Source/CommonTools/OCR/OCR_NumberReader.cpp
new file mode 100644
index 0000000000..36e50bee6c
--- /dev/null
+++ b/SerialPrograms/Source/CommonTools/OCR/OCR_NumberReader.cpp
@@ -0,0 +1,306 @@
+/*  OCR Number Reader
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <algorithm>
+#include <map>
+#include "Common/Cpp/Strings/Unicode.h"
+#include "Common/Cpp/Logging/AbstractLogger.h"
+#include "Common/Cpp/Concurrency/SpinLock.h"
+#include "Kernels/Waterfill/Kernels_Waterfill_Session.h"
+#include "CommonFramework/Language.h"
+#include "CommonFramework/ImageTypes/ImageRGB32.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonTools/Images/ImageManip.h"
+#include "CommonTools/Images/ImageFilter.h"
+#include "CommonTools/Images/BinaryImage_FilterRgb32.h"
+#include "OCR_Routines.h"
+#include "OCR_NumberReader.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace OCR{
+
+
+std::string run_number_normalization(const std::string& input){
+    static const std::map<char32_t, char> SUBSTITUTION_TABLE{
+        {'0', '0'},
+        {'1', '1'},
+        {'2', '2'},
+        {'3', '3'},
+        {'4', '4'},
+        {'5', '5'},
+        {'6', '6'},
+        {'7', '7'},
+        {'8', '8'},
+        {'9', '9'},
+
+        //  Common misreads.
+        {'U', '0'},
+        {'u', '0'},
+        {'|', '1'},
+        {']', '1'},
+        {'[', '6'},
+        {'l', '1'},
+        {'i', '1'},
+        {'A', '4'},
+        {'a', '4'},
+        {'S', '5'},
+        {'s', '5'},
+        {'/', '7'},
+        {'g', '9'},
+
+        //  Japanese OCR likes to do this.
+        {U'🄋', '0'},
+        {U'①', '1'},
+        {U'②', '2'},
+        {U'③', '3'},
+        {U'④', '4'},
+        {U'⑤', '5'},
+        {U'⑥', '6'},
+        {U'⑦', '7'},
+        {U'⑧', '8'},
+        {U'⑨', '9'},
+    };
+
+    std::string normalized;
+    for (char32_t ch : utf8_to_utf32(input)){
+        auto iter = SUBSTITUTION_TABLE.find(ch);
+        if (iter == SUBSTITUTION_TABLE.end()){
+            continue;
+        }
+        normalized += iter->second;
+    }
+
+    return normalized;
+}
+
+
+int read_number(Logger& logger, const ImageViewRGB32& image, Language language){
+    std::string ocr_text = OCR::ocr_read(language, image, OCR::PageSegMode::SINGLE_LINE);
+
+    std::string normalized = run_number_normalization(ocr_text);
+
+    std::string str;
+    for (char ch : ocr_text){
+        if (ch != '\r' && ch != '\n'){
+            str += ch;
+        }
+    }
+
+    if (normalized.empty()){
+        logger.log("OCR Text: \"" + str + "\" -> \"" + normalized + "\" -> Unable to read.", COLOR_RED);
+        return -1;
+    }
+
+    int number = std::atoi(normalized.c_str());
+    logger.log("OCR Text: \"" + str + "\" -> \"" + normalized + "\" -> " + std::to_string(number));
+
+    return number;
+}
+
+
+// Run OCR on each individual character in the string of numbers.
+// Return empty string if OCR fails.
+//
+// - text_inside_range: binary filter is applied to the image so that any pixels within
+//   the color range will be turned black, and everything else will be white
+// - width_max: return empty string if any character's width is greater than width_max
+//   (likely means that two characters are touching, and so are treated as one large
+//   character)
+// - min_digit_area: if a character has area (aka pixel count) smaller than this value
+//   (likely noise or punctuations), skip this character
+// - check_empty_string: if set to true, return empty string (and stop evaluation) if
+//   any character returns an empty string from OCR
+std::string read_number_waterfill_no_normalization(
+    Logger& logger, const ImageViewRGB32& image,
+    uint32_t rgb32_min, uint32_t rgb32_max,    
+    bool text_inside_range = true,
+    size_t width_max = (size_t)-1,
+    size_t min_digit_area = 20,
+    bool check_empty_string = false
+){
+    using namespace Kernels::Waterfill;
+
+    //  Direct OCR is unreliable. Instead, we will waterfill each character
+    //  to isolate them, then OCR them individually.
+
+    ImageRGB32 filtered = to_blackwhite_rgb32_range(
+        image,
+        text_inside_range,
+        rgb32_min, rgb32_max
+    );
+
+//    static int c = 0;
+//    int i = 0;
+//    filtered.save(std::format("zztest-{:#x}-{:#x}-{}.png", rgb32_min, rgb32_max, c++));
+
+    PackedBinaryMatrix matrix = compress_rgb32_to_binary_range(filtered, 0xff000000, 0xff7f7f7f);
+
+    std::map<size_t, WaterfillObject> map;
+    {
+        std::unique_ptr<WaterfillSession> session = make_WaterfillSession(matrix);
+        auto iter = session->make_iterator(min_digit_area);
+        WaterfillObject object;
+        while (map.size() < 16 && iter->find_next(object, true)){
+            if (object.width() > width_max){
+                logger.log("OCR fail: one of characters exceeded max width.", COLOR_RED);
+                return "";
+            }
+            map.emplace(object.min_x, std::move(object));
+        }
+    }
+
+    std::string ocr_text;
+    for (const auto& item : map){
+        const WaterfillObject& object = item.second;
+        ImageRGB32 cropped = extract_box_reference(filtered, object).copy();
+        PackedBinaryMatrix tmp(object.packed_matrix());
+        filter_by_mask(tmp, cropped, Color(0xffffffff), true);
+
+        //  Tesseract doesn't like numbers that are too big. So scale it down.
+//        cout << "height = " << cropped.height() << endl;
+        if (cropped.height() > 60){
+            cropped = cropped.scale_to(cropped.width() * 60 / cropped.height(), 60);
+        }
+
+        ImageRGB32 padded = pad_image(cropped, 1 * cropped.width(), 0xffffffff);
+        std::string ocr = OCR::ocr_read(Language::English, padded, OCR::PageSegMode::SINGLE_CHAR);
+
+//        padded.save("zztest-cropped" + std::to_string(c) + "-" + std::to_string(i++) + ".png");
+//        std::cout << ocr[0] << std::endl;
+
+        if (!ocr.empty()){
+            ocr_text += ocr[0];
+        }else if (check_empty_string){
+            logger.log("OCR fail: one of characters read as empty string.", COLOR_RED);
+            // static int i = 0;
+            // padded.save("zztest-cropped" + std::to_string(c) + "-" + std::to_string(i++) + ".png");
+            return "";
+        }
+    }
+
+    return ocr_text;
+
+}
+
+bool is_digits(const std::string &str)
+{
+    return std::all_of(str.begin(), str.end(), ::isdigit);
+}
+
+
+int read_number_waterfill(
+    Logger& logger, const ImageViewRGB32& image,
+    uint32_t rgb32_min, uint32_t rgb32_max,    
+    bool text_inside_range,
+    int8_t line_index
+){
+    std::string ocr_text = read_number_waterfill_no_normalization(
+        logger,
+        image,
+        rgb32_min, rgb32_max,
+        text_inside_range
+    );
+
+    std::string normalized = run_number_normalization(ocr_text);
+
+    std::string line_index_str = "";
+    if (line_index != -1){
+        line_index_str = "Line " + std::to_string(line_index) + ": ";
+    }
+    if (normalized.empty()){
+        logger.log(line_index_str + "OCR Text: \"" + ocr_text + "\" -> \"" + normalized + "\" -> Unable to read.", COLOR_RED);
+        return -1;
+    }
+
+    int number = std::atoi(normalized.c_str());
+    logger.log(line_index_str + "OCR Text: \"" + ocr_text + "\" -> \"" + normalized + "\" -> " + std::to_string(number));
+
+    return number;
+}
+
+
+int read_number_waterfill_multifilter(
+    Logger& logger,
+    ThreadPool& thread_pool,
+    const ImageViewRGB32& image,
+    std::vector<std::pair<uint32_t, uint32_t>> filters,    
+    bool text_inside_range,
+    bool prioritize_numeric_only_results, 
+    size_t width_max,
+    size_t min_digit_area,
+    int8_t line_index
+){
+    std::string line_index_str = "";
+    if (line_index != -1){
+        line_index_str = "Line " + std::to_string(line_index) + ": ";
+    }
+
+    SpinLock lock;
+    std::map<int, uint8_t> candidates;
+    thread_pool.run_in_parallel(
+        [&](size_t index){
+            std::pair<uint32_t, uint32_t> filter = filters[index];
+
+            uint32_t rgb32_min = filter.first;
+            uint32_t rgb32_max = filter.second;
+            bool check_empty_string = true;
+            std::string ocr_text = read_number_waterfill_no_normalization(
+                logger,
+                image,
+                rgb32_min, rgb32_max,
+                text_inside_range,
+                width_max,
+                min_digit_area,
+                check_empty_string
+            );
+
+            std::string normalized = run_number_normalization(ocr_text);
+            if (normalized.empty()){
+                // logger.log("OCR Text: \"" + ocr_text + "\" -> \"" + normalized + "\" -> Unable to read.", COLOR_RED);
+                return;
+            }
+
+            int candidate = std::atoi(normalized.c_str());
+            logger.log(line_index_str + "OCR Text: \"" + ocr_text + "\" -> \"" + normalized + "\" -> " + std::to_string(candidate));
+
+            uint8_t weight = prioritize_numeric_only_results && is_digits(ocr_text)
+                ? 2
+                : 1;
+
+            WriteSpinLock lg(lock);
+            candidates[candidate] += weight;
+
+        },
+        0, filters.size(),
+        allow_parallel_ocr() ? 1 : (size_t)-1
+    );
+
+    if (candidates.empty()){
+        logger.log(line_index_str + "No valid OCR candidates. Unable to read number.", COLOR_ORANGE);
+        return -1;
+    }
+
+    std::pair<int, uint8_t> best;
+    for (const auto& item : candidates){
+        logger.log(line_index_str + "Candidate " + std::to_string(item.first) + ": " + std::to_string(item.second) + " votes");
+        if (item.second > best.second){
+            best = item;
+        }
+    }
+
+    logger.log(line_index_str + "Best candidate: --------------------------> " + std::to_string(best.first));
+    return best.first;
+}
+
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/CommonTools/OCR/OCR_NumberReader.h b/SerialPrograms/Source/CommonTools/OCR/OCR_NumberReader.h
new file mode 100644
index 0000000000..c46d62d0ab
--- /dev/null
+++ b/SerialPrograms/Source/CommonTools/OCR/OCR_NumberReader.h
@@ -0,0 +1,66 @@
+/*  OCR Number Reader
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_CommonTools_OCR_NumberReader_H
+#define PokemonAutomation_CommonTools_OCR_NumberReader_H
+
+#include <stdint.h>
+#include <vector>
+#include "Common/Cpp/Concurrency/ThreadPool.h"
+#include "CommonFramework/Language.h"
+
+namespace PokemonAutomation{
+    class Logger;
+    class ImageViewRGB32;
+namespace OCR{
+
+
+//  Returns -1 if no number is found.
+//  No processing is done on the image. It is OCR'ed directly.
+//  The best way to use read_number() is to not give Language as a parameter.
+//  This is because the default language is English, since it works best for OCR for numbers.
+int read_number(Logger& logger, const ImageViewRGB32& image, Language language = Language::English);
+
+
+//  This version attempts to improve reliability by first isolating each number
+//  via waterfill. Then it OCRs each number by itself and recombines them at the
+//  end. This requires specifying the color range for the text.
+//
+// line_index: specifies the current number's row. for logging purposes, when multithreaded.
+int read_number_waterfill(
+    Logger& logger, const ImageViewRGB32& image,
+    uint32_t rgb32_min, uint32_t rgb32_max,
+    bool text_inside_range = true,
+    int8_t line_index = -1
+ );
+
+
+// Try OCR with all the given color filters. still running OCR on each individual character
+// Return the best majority candidate. return -1 if failed to read.
+// width_max: if a character width is greater than this value (likely means two characters are touching, will cause bad read), skip this filter.
+// min_digit_area: if a character has area (aka pixel count) smaller than this value (likely noise or punctuations), skip this character
+// 
+// prioritize_numeric_only_results: 
+//  - if true: if OCR reads only numeric characters, the candidate gets 2 votes. If OCR reads non-numeric characters, the candidate gets only 1 vote.
+//  - if false: all reads only get 1 vote
+//
+// log_line_index: adds an index prefix to the logging lines for logging purposes when calling this function in parallel.
+int read_number_waterfill_multifilter(
+    Logger& logger,
+    ThreadPool& thread_pool,
+    const ImageViewRGB32& image,
+    std::vector<std::pair<uint32_t, uint32_t>> filters,
+    bool text_inside_range = true,
+    bool prioritize_numeric_only_results = true,
+    size_t width_max = (size_t)-1,
+    size_t min_digit_area = 20,
+    int8_t log_line_index = -1
+ );
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/CommonTools/OCR/OCR_PaddleOCR.cpp b/SerialPrograms/Source/CommonTools/OCR/OCR_PaddleOCR.cpp
new file mode 100644
index 0000000000..90386df6be
--- /dev/null
+++ b/SerialPrograms/Source/CommonTools/OCR/OCR_PaddleOCR.cpp
@@ -0,0 +1,144 @@
+/*  Threadpools for PaddleOCR
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Exceptions.h"
+#include "Common/Cpp/Concurrency/SpinLock.h"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "ML/Inference/ML_PaddleOCRPipeline.h"
+#include "OCR_PaddleOCR.h"
+
+namespace PokemonAutomation{
+namespace OCR{
+
+
+
+enum class LanguageGroup {
+    None,
+    English,
+    ChineseJapanese,
+    Latin,
+    Korean,
+};
+
+LanguageGroup language_to_languagegroup(Language language){
+    switch(language){
+    case Language::None:
+        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Attempted to call OCR without a language.");
+    case Language::English:
+        return LanguageGroup::English;
+    case Language::Japanese:
+        return LanguageGroup::ChineseJapanese;
+    case Language::Spanish:
+        return LanguageGroup::Latin;
+    case Language::French:
+        return LanguageGroup::Latin;
+    case Language::German:
+        return LanguageGroup::Latin;
+    case Language::Italian:
+        return LanguageGroup::Latin;
+    case Language::Korean:
+        return LanguageGroup::Korean;
+    case Language::ChineseSimplified:
+        return LanguageGroup::ChineseJapanese;
+    case Language::ChineseTraditional:
+        return LanguageGroup::ChineseJapanese;
+    default:
+        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Attempted to call OCR on an unknown language.");
+    }
+}
+
+bool paddle_ocr_language_available(Language language){
+    std::string path = ML::PaddleOCRPipeline::get_paths(language).first;
+    Filesystem::Path p{path};
+    return std::filesystem::exists(p);
+}
+
+
+// Global singleton managing the single PaddleOCR instance for each language.
+//   ocr_pool_lock protects the map 
+struct PaddleOcrGlobals{
+    SpinLock ocr_pool_lock;                       // Protects ocr_pool map.
+    std::map<LanguageGroup, ML::PaddleOCRPipeline> ocr_pool;   // One instance per language.
+
+    static PaddleOcrGlobals& instance(){
+        static PaddleOcrGlobals globals;
+        return globals;
+    }
+};
+
+ML::PaddleOCRPipeline& ensure_paddle_ocr_instance(Language language){
+    if (language == Language::None){
+        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Attempted to call OCR without a language.");
+    }
+
+    LanguageGroup language_group = language_to_languagegroup(language);
+
+    PaddleOcrGlobals& globals = PaddleOcrGlobals::instance();
+    std::map<LanguageGroup, ML::PaddleOCRPipeline>& ocr_pool = globals.ocr_pool;
+
+    // Get or create the Paddle instance for this language.
+    std::map<LanguageGroup, ML::PaddleOCRPipeline>::iterator iter;
+    {
+        WriteSpinLock lg(globals.ocr_pool_lock, "ensure_paddle_ocr_instances()");
+        // std::lock_guard<Mutex> lg(globals.ocr_pool_lock);
+        iter = ocr_pool.find(language_group);
+        if (iter == ocr_pool.end()){
+            // This is creating a Paddle instance while under a lock; it isn't ideal if we need to run OCR on different languages at the same time. 
+            // In practice, however, this doesn't really happen in our code base.
+            iter = ocr_pool.try_emplace(language_group, language).first;
+        }
+    }
+
+    return iter->second;
+}
+
+
+std::string paddle_ocr_read(Language language, const ImageViewRGB32& image, PageSegMode psm){
+//    static size_t c = 0;
+//    image.save("ocr-" + std::to_string(c++) + ".png");
+
+    ML::PaddleOCRPipeline& paddle_instance = ensure_paddle_ocr_instance(language);
+    
+    // Run inference with the paddle model. 
+    // PaddleOCR with Onnx is threadsafe, so a single instance can be called by multiple threads.
+    std::string ret;
+    switch (psm){
+    case PageSegMode::AUTO:
+    case PageSegMode::SINGLE_BLOCK:
+    case PageSegMode::SINGLE_COLUMN:
+        // Multi-line: run text detection first, then recognize each line.
+        ret = paddle_instance.recognize_multiline(image);
+        break;
+    default:
+        // Single line: the image is already cropped to the text, skip detection.
+        ret = paddle_instance.recognize(image);
+    }
+
+//    global_logger_tagged().log(ret);
+
+    return ret;
+}
+
+
+
+
+void clear_paddle_ocr_cache(){
+    PaddleOcrGlobals& globals = PaddleOcrGlobals::instance();
+    std::map<LanguageGroup, ML::PaddleOCRPipeline>& ocr_pool = globals.ocr_pool;
+    WriteSpinLock lg(globals.ocr_pool_lock, "clear_paddle_ocr_cache()");
+    // std::lock_guard<Mutex> lg(globals.ocr_pool_lock);
+    ocr_pool.clear();  // Destroys all pools and their instances.
+}
+
+
+
+
+}
+}
+
+
+
+
diff --git a/SerialPrograms/Source/CommonTools/OCR/OCR_PaddleOCR.h b/SerialPrograms/Source/CommonTools/OCR/OCR_PaddleOCR.h
new file mode 100644
index 0000000000..7ff241287d
--- /dev/null
+++ b/SerialPrograms/Source/CommonTools/OCR/OCR_PaddleOCR.h
@@ -0,0 +1,65 @@
+/*  Threadpools for PaddleOCR
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+// NOTE: This file should only be inluded in OCR_Routines.h
+// This file should not be inluded in other files.
+// Use OCR_Routines.h instead
+
+#ifndef PokemonAutomation_CommonTools_OCR_PaddleOCR_H
+#define PokemonAutomation_CommonTools_OCR_PaddleOCR_H
+
+#include <string>
+#include "CommonFramework/Language.h"
+#include "OCR_RawTesseractOCR.h"
+
+namespace PokemonAutomation{
+    class ImageViewRGB32;
+    namespace ML {
+        class PaddleOCRPipeline;
+    }
+namespace OCR{
+
+bool paddle_ocr_language_available(Language language);
+
+
+//  Pre-warm the PaddleOCR instance pool for a language. Ensure one instance exists.
+//  Avoids lazy initialization delays during runtime. Thread-safe.
+//  returns a pointer to a Paddle instance, for the given language.
+ML::PaddleOCRPipeline& ensure_paddle_ocr_instance(Language language);
+
+//  OCR the image in the specified language.
+//  Main OCR entry point. Performs OCR on the image using the specified language.
+//  Thread-safe: internally uses a pool of PaddleOCR instances, able to accept
+//  multiple concurrent calls without delay or queueing.
+//  It creates one PaddleOCR instance for each language. You can
+//  call `ensure_instances()` to pre-warm to pool with a given number of instances.
+//
+//  psm: Page segmentation mode, same meaning as in `tesseract_ocr_read()`.
+//       Defaults to SINGLE_LINE.
+//     - AUTO, SINGLE_BLOCK, SINGLE_COLUMN: multi-line OCR. Runs the PaddleOCR text
+//       detection model to find every line of text in the image, then recognizes each
+//       line. Lines are returned top to bottom, separated by '\n'. Use this when the
+//       image is not pre-cropped to a single line, e.g. a whole dialog box.
+//     - Any other mode: single-line OCR. Assumes the image is already cropped to one
+//       line of text and skips the detection model.
+std::string paddle_ocr_read(
+    Language language,
+    const ImageViewRGB32& image,
+    PageSegMode psm = PageSegMode::SINGLE_LINE
+);
+
+
+
+//  Clear all PaddleOCR instances for all languages. Used for cleanup or
+//  forcing re-initialization.
+//  This is not safe to call while any OCR is still running!
+void clear_paddle_ocr_cache();
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/CommonTools/OCR/OCR_RawTesseractOCR.cpp b/SerialPrograms/Source/CommonTools/OCR/OCR_RawTesseractOCR.cpp
new file mode 100644
index 0000000000..fd7e2e8d39
--- /dev/null
+++ b/SerialPrograms/Source/CommonTools/OCR/OCR_RawTesseractOCR.cpp
@@ -0,0 +1,252 @@
+/*  Raw Text Recognition
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <map>
+#include <memory>
+#include "3rdParty/TesseractPA/TesseractPA.h"
+#include "Common/Cpp/Exceptions.h"
+#include "Common/Cpp/Filesystem/Filesystem.h"
+#include "Common/Cpp/Concurrency/SpinLock.h"
+#include "CommonFramework/GlobalAutoPaths.h"
+#include "CommonFramework/Logging/Logger.h"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "OCR_RawTesseractOCR.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace OCR{
+
+
+bool tesseract_language_available(Language language){
+    std::string path = DOWNLOADED_RESOURCE_PATH();
+    path += "Tesseract/";
+    path += language_data(language).code;
+    path += ".traineddata";
+    return Filesystem::exists(Filesystem::Path(path));
+}
+
+
+//  The path to the Tesseract resource folder relative to the current working directory.
+std::string tesseract_resource_relative_path(){
+    std::error_code ec;
+    return Filesystem::relative(
+        Filesystem::Path(DOWNLOADED_RESOURCE_PATH() + "Tesseract/"),
+        ec
+    ).string_slash_normalized();
+}
+
+// Thread-safe object pool for TesseractAPI instances for a specific language.
+// Allows concurrent OCR operations by maintaining multiple Tesseract instances that can be
+// checked out, used, and returned. Instances are created lazily on demand.
+class TesseractPool{
+public:
+    TesseractPool(Language language)
+        : m_language_code(language_data(language).code)
+        , m_training_data_path(tesseract_resource_relative_path())
+    {}
+
+    // Perform OCR on the given image. Thread-safe - can be called concurrently.
+    // Checkout pattern: (1) acquire idle instance from pool (or create new one if none available),
+    // (2) configure PSM, (3) run OCR without holding lock, (4) return instance to idle pool.
+    std::string run(const ImageViewRGB32& image, int psm){
+        TesseractAPI* instance;
+        // Checkout: Try to get an idle instance, create new one if the idle pool is empty.
+        while (true){
+            {
+                WriteSpinLock lg(m_lock, "TesseractPool::run()");
+                if (!m_idle.empty()){
+                    instance = m_idle.back();
+                    m_idle.pop_back();
+                    break;
+                }
+            }
+            // No idle instance available - create a new one.
+            add_instance();
+        }
+
+        // Configure PSM before OCR (safe to call between images on same instance).
+        // PSM is page segmentation mode for Tessearct.
+        instance->set_page_seg_mode(psm);
+
+        // Perform OCR without holding the lock (allows concurrent OCR operations).
+//        auto start = current_time();
+        TesseractString str = instance->read32(
+            (const unsigned char*)image.data(),
+            image.width(),
+            image.height(),
+            image.bytes_per_row()
+        );
+//        auto end = current_time();
+//        cout << std::chrono::duration_cast<std::chrono::milliseconds>(end - start).count() << endl;
+        // Checkin: Return instance to the idle pool.
+        {
+            WriteSpinLock lg(m_lock, "TesseractPool::run()");
+            m_idle.emplace_back(instance);
+        }
+
+        return str.c_str() == nullptr
+            ? std::string()
+            : str.c_str();
+    }
+
+    // Create a new TesseractAPI instance and add it to the pool.
+    // Thread-safe - can be called concurrently (using `m_lock` when modifying the pool).
+    void add_instance(){
+        //  Check for non-ascii characters in path.
+        for (char ch : m_training_data_path){
+            if ((unsigned char)ch > 127){
+                throw InternalSystemError(
+                    nullptr, PA_CURRENT_FUNCTION,
+                    "Detected non-ASCII character in Tesseract path. Please move the program to a path with only ASCII characters."
+                );
+            }
+        }
+
+        global_logger_tagged().log(
+            "Initializing TesseractAPI (" + m_language_code + "): " + m_training_data_path
+        );
+        // Create instance outside lock (initialization is expensive).
+        std::unique_ptr<TesseractAPI> api(
+            new TesseractAPI(m_training_data_path.c_str(), m_language_code.c_str())
+        );
+        if (!api->valid()){
+            throw InternalSystemError(nullptr, PA_CURRENT_FUNCTION, "Could not initialize TesseractAPI. Ensure that Tesseract has been downloaded.");
+        }
+
+        // Add to pool under lock.
+        WriteSpinLock lg(m_lock, "TesseractPool::run()");
+
+        m_instances.emplace_back(std::move(api));
+        try{
+            m_idle.emplace_back(m_instances.back().get());
+        }catch (...){
+            m_instances.pop_back();
+            throw;
+        }
+    }
+
+    // Pre-allocate a minimum number of instances to avoid lazy initialization during runtime.
+    // Useful for warming up the pool before heavy OCR workloads.
+    void ensure_instances(size_t instances){
+        size_t current_instances;
+        while (true){
+            {
+                ReadSpinLock lg(m_lock, "TesseractPool::run()");
+                current_instances = m_instances.size();
+            }
+            if (current_instances >= instances){
+                break;
+            }
+            add_instance();
+        }
+    }
+
+#ifdef __APPLE__
+#ifdef UNIX_LINK_TESSERACT
+    ~TesseractPool(){
+        for (auto& api : m_instances){
+            api.release();
+        }
+    }
+#endif
+#endif
+
+private:
+    const std::string& m_language_code;
+    const std::string m_training_data_path;
+
+    // Concurrency: m_lock protects both m_instances and m_idle vectors.
+    SpinLock m_lock;
+    // Owns all created Tesseract instances.
+    std::vector<std::unique_ptr<TesseractAPI>> m_instances;
+    // Current idle Tesseract instances in `m_instances`.
+    std::vector<TesseractAPI*> m_idle;
+};
+
+// Global singleton managing TesseractPools for all languages.
+// Two-level concurrency model:
+//   Level 1: ocr_pool_lock protects the map (language -> pool creation/lookup)
+//   Level 2: Each TesseractPool has its own m_lock (instance checkout/checkin)
+struct OcrGlobals{
+    SpinLock ocr_pool_lock;                       // Protects ocr_pool map.
+    std::map<Language, TesseractPool> ocr_pool;   // One pool per language.
+
+    static OcrGlobals& instance(){
+        static OcrGlobals globals;
+        return globals;
+    }
+};
+
+
+std::string tesseract_ocr_read(Language language, const ImageViewRGB32& image, PageSegMode psm){
+//    static size_t c = 0;
+//    image.save("ocr-" + std::to_string(c++) + ".png");
+
+    if (language == Language::None){
+        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Attempted to call OCR without a language.");
+    }
+
+    OcrGlobals& globals = OcrGlobals::instance();
+    std::map<Language, TesseractPool>& ocr_pool = globals.ocr_pool;
+
+    // Get or create the pool for this language (lock only during map access).
+    std::map<Language, TesseractPool>::iterator iter;
+    {
+        WriteSpinLock lg(globals.ocr_pool_lock, "tesseract_ocr_read()");
+        iter = ocr_pool.find(language);
+        if (iter == ocr_pool.end()){
+            iter = ocr_pool.emplace(language, language).first;
+        }
+    }
+    // Delegate to pool (which has its own locking for instance management).
+    std::string ret = iter->second.run(image, static_cast<int>(psm));
+
+//    global_logger_tagged().log(ret);
+
+    return ret;
+}
+
+
+void ensure_tesseract_instances(Language language, size_t instances){
+    if (language == Language::None){
+        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Attempted to call OCR without a language.");
+    }
+
+    OcrGlobals& globals = OcrGlobals::instance();
+    std::map<Language, TesseractPool>& ocr_pool = globals.ocr_pool;
+
+    // Get or create the pool for this language.
+    std::map<Language, TesseractPool>::iterator iter;
+    {
+        WriteSpinLock lg(globals.ocr_pool_lock, "tesseract_ocr_read()");
+        iter = ocr_pool.find(language);
+        if (iter == ocr_pool.end()){
+            iter = ocr_pool.emplace(language, language).first;
+        }
+    }
+    // Delegate to pool's ensure_instances (which handles its own locking).
+    iter->second.ensure_instances(instances);
+}
+
+void clear_tesseract_cache(){
+    OcrGlobals& globals = OcrGlobals::instance();
+    std::map<Language, TesseractPool>& ocr_pool = globals.ocr_pool;
+    WriteSpinLock lg(globals.ocr_pool_lock, "ocr_clear_cache()");
+    ocr_pool.clear();  // Destroys all pools and their instances.
+}
+
+
+
+
+}
+}
+
+
+
+
diff --git a/SerialPrograms/Source/CommonTools/OCR/OCR_RawTesseractOCR.h b/SerialPrograms/Source/CommonTools/OCR/OCR_RawTesseractOCR.h
new file mode 100644
index 0000000000..9b91188f0e
--- /dev/null
+++ b/SerialPrograms/Source/CommonTools/OCR/OCR_RawTesseractOCR.h
@@ -0,0 +1,81 @@
+/*  Raw Text Recognition
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+// NOTE: This file should only be inluded in OCR_Routines.h
+// This file should not be inluded in other files.
+// Use OCR_Routines.h instead
+
+#ifndef PokemonAutomation_CommonTools_OCR_RawTesseractOCR_H
+#define PokemonAutomation_CommonTools_OCR_RawTesseractOCR_H
+
+#include <string>
+#include "CommonFramework/Language.h"
+
+namespace PokemonAutomation{
+    class ImageViewRGB32;
+namespace OCR{
+
+
+// Tesseract page segmentation modes.
+// These correspond to tesseract::PageSegMode enum values.
+enum class PageSegMode : int {
+    // Fully automatic page segmentation but no OSD.
+    // OSD stands for Orientation and script detection.
+    // This mode is the default mode for Tesseract command line interface, but
+    // not the default for C++ API.
+    AUTO = 3,      
+    // Single column of text of variable sizes    
+    SINGLE_COLUMN = 4,
+    // Assume a single uniform block of text.
+    // This mode is the default mode for Tesseract C++ API and what our
+    // Tesseract wrapper uses as default.
+    SINGLE_BLOCK = 6,
+    // Treat the image as a single text line 
+    SINGLE_LINE = 7,
+    // Treat the image as a single word
+    SINGLE_WORD = 8,
+    // Treat the image as a single character
+    SINGLE_CHAR = 10,
+};
+
+
+// Check if Tesseract training data exists for the given language.
+bool tesseract_language_available(Language language);
+
+
+//  OCR the image in the specified language.
+//  Main OCR entry point. Performs OCR on the image using the specified language.
+//  Thread-safe: internally uses a pool of Tesseract API instances, able to accept
+//  multiple concurrent calls without delay or queueing.
+//  It creates a new Tesseract instances if no available idle instance. You can
+//  call `ensure_tesseract_instances()` to pre-warm to pool with a given number of instances.
+//
+//  psm: Page segmentation mode - controls how Tesseract interprets the image layout.
+//       Defaults to SINGLE_LINE
+std::string tesseract_ocr_read(
+    Language language,
+    const ImageViewRGB32& image,
+    PageSegMode psm = PageSegMode::SINGLE_LINE
+);
+
+
+//  Pre-warm the Tesseract API instance pool for a language by ensuring a minimum
+//  number of instances exist.
+//  Avoids lazy initialization delays during runtime. Thread-safe.
+//  Call this if you expect to need to do many OCR instances in parallel and you
+//  want to preload the OCR instances.
+void ensure_tesseract_instances(Language language, size_t instances);
+
+//  Clear all TesseractAPI instances for all languages. Used for cleanup or
+//  forcing re-initialization.
+//  This is not safe to call while in any OCR is still running!
+void clear_tesseract_cache();
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/CommonTools/OCR/OCR_Routines.cpp b/SerialPrograms/Source/CommonTools/OCR/OCR_Routines.cpp
new file mode 100644
index 0000000000..484976a94f
--- /dev/null
+++ b/SerialPrograms/Source/CommonTools/OCR/OCR_Routines.cpp
@@ -0,0 +1,205 @@
+/*  OCR Routines
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/ImageTypes/ImageRGB32.h"
+#include "CommonFramework/Tools/GlobalThreadPools.h"
+#include "CommonFramework/GlobalSettingsPanel.h"
+#include "CommonTools/Images/ImageFilter.h"
+#include "OCR_PaddleOCR.h"
+#include "OCR_RawTesseractOCR.h"
+#include "OCR_DictionaryMatcher.h"
+#include "OCR_Routines.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace OCR{
+
+
+bool ocr_language_available(Language language){
+    if (GlobalSettings::instance().OCR_LIBRARY == OcrLibrary::PADDLE_OCR){
+        return  OCR::paddle_ocr_language_available(language);
+    }else{
+        return OCR::tesseract_language_available(language);
+    }
+}
+
+
+std::string ocr_read(Language language, const ImageViewRGB32& image, PageSegMode psm){
+    if (GlobalSettings::instance().OCR_LIBRARY == OcrLibrary::PADDLE_OCR){
+        return OCR::paddle_ocr_read(language, image, psm);
+    }else{
+        return OCR::tesseract_ocr_read(language, image, psm);
+    }
+}
+
+bool allow_parallel_ocr(PageSegMode psm){
+    return GlobalSettings::instance().OCR_LIBRARY != OcrLibrary::PADDLE_OCR;
+}
+
+void ensure_ocr_instances(Language language, size_t instances){
+    if (GlobalSettings::instance().OCR_LIBRARY == OcrLibrary::PADDLE_OCR){
+        OCR::ensure_paddle_ocr_instance(language);
+    }else{
+        OCR::ensure_tesseract_instances(language, instances);
+    }
+}
+
+void clear_ocr_cache(){
+    if (GlobalSettings::instance().OCR_LIBRARY == OcrLibrary::PADDLE_OCR){
+        OCR::clear_paddle_ocr_cache();
+    }else{
+        OCR::clear_tesseract_cache();
+    }
+}
+
+
+
+StringMatchResult multifiltered_OCR(
+    Language language, const DictionaryMatcher& dictionary, const ImageViewRGB32& image,
+    const std::vector<TextColorRange>& text_color_ranges,
+    double log10p_spread,
+    double min_text_ratio, double max_text_ratio,
+    OCR::PageSegMode psm
+){
+    if (image.width() == 0 || image.height() == 0){
+        return StringMatchResult();
+    }
+
+    std::vector<BlackWhiteRgb32Range> bw_filters;
+    for (const auto& range : text_color_ranges){
+        bw_filters.emplace_back(
+            BlackWhiteRgb32Range{true, range.mins, range.maxs}
+        );
+    }
+    std::vector<std::pair<ImageRGB32, size_t>> filtered_images = to_blackwhite_rgb32_range(image, bw_filters);
+
+    double pixels_inv = 1. / (image.width() * image.height());
+
+    //  Run all the filters.
+    SpinLock lock;
+    StringMatchResult ret;
+    GlobalThreadPools::computation_normal().run_in_parallel(
+        [&](size_t index){
+            const std::pair<ImageRGB32, size_t>& filtered = filtered_images[index];
+
+            std::string text = OCR::ocr_read(language, filtered.first, psm);
+
+            // cout << "multifiltered_OCR: " << index << " -> " << text << endl;
+            // filtered.first.save("test_" + std::to_string(index) + ".png");
+
+            //  Compute ratio of image that matches text color. Skip if it's out of range.
+            double ratio = filtered.second * pixels_inv;
+//            cout << "ratio = " << ratio << endl;
+            if (ratio < min_text_ratio || ratio > max_text_ratio){
+                return;
+            }
+
+            StringMatchResult current = dictionary.match_substring(language, text, log10p_spread);
+
+            WriteSpinLock lg(lock);
+            ret.exact_match |= current.exact_match;
+            ret.results.insert(current.results.begin(), current.results.end());
+        },
+        0, filtered_images.size(),
+        allow_parallel_ocr(psm) ? 1 : (size_t)-1
+    );
+//    int c = 0;
+//    for (const auto& filtered : filtered_images){
+//    }
+
+//    ret.log(global_logger_tagged(), -1.5);
+
+    //  Prune duplicates.
+    std::set<std::string> tokens;
+    for (auto iter = ret.results.begin(); iter != ret.results.end();){
+        if (tokens.find(iter->second.token) == tokens.end()){
+            tokens.insert(iter->second.token);
+            ++iter;
+        }else{
+            iter = ret.results.erase(iter);
+        }
+    }
+
+    ret.clear_beyond_spread(log10p_spread);
+    return ret;
+}
+
+
+StringMatchResult dictionary_OCR(
+    Language language, const DictionaryMatcher& dictionary, const ImageViewRGB32& image,
+    double log10p_spread, OCR::PageSegMode psm
+){
+    if (image.width() == 0 || image.height() == 0){
+        return StringMatchResult();
+    }
+
+    //  Run all the filters.
+    std::string text = OCR::ocr_read(language, image, psm);
+
+    // cout << "dictionary_OCR: " << text << endl;
+    // image.save("test_dictionary_OCR.png");
+
+    return dictionary.match_substring(language, text, log10p_spread);
+}
+
+
+
+const std::vector<TextColorRange>& BLACK_TEXT_FILTERS(){
+    static std::vector<TextColorRange> filters{
+        {0xff000000, 0xff404040},
+        {0xff000000, 0xff606060},
+        {0xff000000, 0xff808080},
+        {0xff000000, 0xff909090},
+    };
+    return filters;
+}
+const std::vector<TextColorRange>& WHITE_TEXT_FILTERS(){
+    static std::vector<TextColorRange> filters{
+        {0xff808080, 0xffffffff},
+        {0xffa0a0a0, 0xffffffff},
+        {0xffc0c0c0, 0xffffffff},
+    };
+    return filters;
+}
+const std::vector<TextColorRange>& BLACK_OR_WHITE_TEXT_FILTERS(){
+    static std::vector<TextColorRange> filters{
+        {0xff000000, 0xff404040},
+        {0xff000000, 0xff606060},
+        {0xff000000, 0xff808080},
+        {0xff808080, 0xffffffff},
+        {0xffa0a0a0, 0xffffffff},
+    };
+    return filters;
+}
+const std::vector<TextColorRange>& BLUE_TEXT_FILTERS(){
+    static std::vector<TextColorRange> filters{
+        {0xFF3287A2, 0xFFA7F4FF},
+        {0xFF2283A2, 0xFF8EF1FF},
+        {0xFF428BA2, 0xFFC1F7FF},
+    };
+    return filters;
+}
+const std::vector<TextColorRange>& LIME_TEXT_FILTERS(){
+    static std::vector<TextColorRange> filters{
+        {0xff6FA60D, 0xffBEEF36},
+        {0xff5E9400, 0xffC9F95C},
+        {0xff4D8100, 0xffD3FB7E},
+    };
+    return filters;
+}
+
+
+
+
+
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/CommonTools/OCR/OCR_Routines.h b/SerialPrograms/Source/CommonTools/OCR/OCR_Routines.h
new file mode 100644
index 0000000000..dc49f41cee
--- /dev/null
+++ b/SerialPrograms/Source/CommonTools/OCR/OCR_Routines.h
@@ -0,0 +1,88 @@
+/*  OCR Routines
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_CommonTools_OCR_Routines_H
+#define PokemonAutomation_CommonTools_OCR_Routines_H
+
+#include <cstdint>
+#include <vector>
+#include "CommonFramework/Language.h"
+#include "OCR_RawTesseractOCR.h"
+
+namespace PokemonAutomation{
+    class ImageViewRGB32;
+namespace OCR{
+
+struct StringMatchResult;
+class DictionaryMatcher;
+
+
+struct TextColorRange{
+    uint32_t mins;
+    uint32_t maxs;
+
+    TextColorRange(uint32_t p_mins, uint32_t p_maxs)
+        : mins(p_mins)
+        , maxs(p_maxs)
+    {}
+};
+
+bool ocr_language_available(Language language);
+
+// Main OCR function for Pokemon automation.
+// It uses the OCR library as per the dropdown in GlobalSettings
+// If the preferred library's resource is missing (i.e. it has not been downloaded),
+// an error will be thrown within OCR initialization infra.
+// psm: text layout mode to help improve OCR model accuracy.
+//   with PaddleOCR, SINGLE_LINE (and other single-line modes) assume the image is
+//   already cropped to one line of text. AUTO, SINGLE_BLOCK and SINGLE_COLUMN run the
+//   PaddleOCR text detection model to find each line first, and return the lines
+//   separated by '\n'.
+std::string ocr_read(Language language, const ImageViewRGB32& image, PageSegMode psm = PageSegMode::SINGLE_LINE);
+
+//
+//  Return if we should allow multiple OCRs are run in parallel.
+//  The reason why this may return false is if the OCR backend is already
+//  parallelizing - in which case parallelizing on top may oversubscribe and
+//  lag the computer.
+//
+//  This is merely a performance hint. You are free to parallelize even if this
+//  returns false.
+//
+bool allow_parallel_ocr(PageSegMode psm = PageSegMode::SINGLE_LINE);
+
+
+void ensure_ocr_instances(Language language, size_t instances = 1);
+
+void clear_ocr_cache();
+
+// psm: Tesseract Page Segmentation mode. See
+//   SerialPrograms/Source/CommonTools/OCR/OCR_RawTesseractOCR.h:PageSegMode
+StringMatchResult multifiltered_OCR(
+    Language language, const DictionaryMatcher& dictionary, const ImageViewRGB32& image,
+    const std::vector<TextColorRange>& text_color_ranges,
+    double log10p_spread,
+    double min_text_ratio = 0.01, double max_text_ratio = 0.50,
+    OCR::PageSegMode psm = OCR::PageSegMode::SINGLE_LINE
+);
+
+StringMatchResult dictionary_OCR(
+    Language language, const DictionaryMatcher& dictionary, const ImageViewRGB32& image,
+    double log10p_spread, OCR::PageSegMode psm = OCR::PageSegMode::SINGLE_LINE
+);
+
+
+const std::vector<TextColorRange>& BLACK_TEXT_FILTERS();
+const std::vector<TextColorRange>& WHITE_TEXT_FILTERS();
+const std::vector<TextColorRange>& BLACK_OR_WHITE_TEXT_FILTERS();
+const std::vector<TextColorRange>& BLUE_TEXT_FILTERS();
+const std::vector<TextColorRange>& LIME_TEXT_FILTERS();
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/CommonTools/OCR/OCR_SmallDictionaryMatcher.cpp b/SerialPrograms/Source/CommonTools/OCR/OCR_SmallDictionaryMatcher.cpp
new file mode 100644
index 0000000000..5cc971fdcd
--- /dev/null
+++ b/SerialPrograms/Source/CommonTools/OCR/OCR_SmallDictionaryMatcher.cpp
@@ -0,0 +1,48 @@
+/*  Small Database Matcher
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Json/JsonValue.h"
+#include "Common/Cpp/Json/JsonObject.h"
+#include "CommonFramework/GlobalAutoPaths.h"
+#include "OCR_SmallDictionaryMatcher.h"
+
+namespace PokemonAutomation{
+namespace OCR{
+
+
+
+SmallDictionaryMatcher::SmallDictionaryMatcher(const std::string& json_path, bool first_only)
+    : SmallDictionaryMatcher(
+        load_json_file(RESOURCE_PATH() + json_path).to_object_throw(),
+        first_only
+    )
+{}
+SmallDictionaryMatcher::SmallDictionaryMatcher(const JsonObject& json, bool first_only){
+    for (const auto& item : json){
+        Language language = language_code_to_enum(item.first);
+        const LanguageData& data = language_data(language);
+        m_database.emplace(
+            std::piecewise_construct,
+            std::forward_as_tuple(language),
+            std::forward_as_tuple(item.second.to_object_throw(), nullptr, data.random_match_chance, first_only)
+        );
+        m_languages += language;
+    }
+}
+
+
+void SmallDictionaryMatcher::save(const std::string& json_path) const{
+    JsonObject root;
+    for (const auto& item : m_database){
+        root[language_data(item.first).code] = item.second.to_json();
+    }
+    root.dump(json_path);
+}
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/CommonFramework/OCR/OCR_SmallDictionaryMatcher.h b/SerialPrograms/Source/CommonTools/OCR/OCR_SmallDictionaryMatcher.h
similarity index 87%
rename from SerialPrograms/Source/CommonFramework/OCR/OCR_SmallDictionaryMatcher.h
rename to SerialPrograms/Source/CommonTools/OCR/OCR_SmallDictionaryMatcher.h
index 5fa6184af2..05ceebfdfd 100644
--- a/SerialPrograms/Source/CommonFramework/OCR/OCR_SmallDictionaryMatcher.h
+++ b/SerialPrograms/Source/CommonTools/OCR/OCR_SmallDictionaryMatcher.h
@@ -1,11 +1,11 @@
 /*  Small Dictionary Matcher
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#ifndef PokemonAutomation_OCR_SmallDictionaryMatcher_H
-#define PokemonAutomation_OCR_SmallDictionaryMatcher_H
+#ifndef PokemonAutomation_CommonTools_OCR_SmallDictionaryMatcher_H
+#define PokemonAutomation_CommonTools_OCR_SmallDictionaryMatcher_H
 
 #include "OCR_DictionaryMatcher.h"
 
diff --git a/SerialPrograms/Source/CommonFramework/OCR/OCR_StringMatchResult.cpp b/SerialPrograms/Source/CommonTools/OCR/OCR_StringMatchResult.cpp
similarity index 82%
rename from SerialPrograms/Source/CommonFramework/OCR/OCR_StringMatchResult.cpp
rename to SerialPrograms/Source/CommonTools/OCR/OCR_StringMatchResult.cpp
index 22297cb976..7d20d69268 100644
--- a/SerialPrograms/Source/CommonFramework/OCR/OCR_StringMatchResult.cpp
+++ b/SerialPrograms/Source/CommonTools/OCR/OCR_StringMatchResult.cpp
@@ -1,11 +1,11 @@
 /*  String Match Results
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include "Common/Cpp/PrettyPrint.h"
-#include "Common/Qt/StringToolsQt.h"
+#include "Common/Cpp/Strings/Unicode.h"
 #include "OCR_StringMatchResult.h"
 
 namespace PokemonAutomation{
@@ -22,9 +22,9 @@ std::string StringMatchData::to_str() const{
         }
     }
     str += "\" -> ";
-    str += "\"" + to_utf8(normalized_text) + "\" -> ";
+    str += "\"" + utf32_to_str(normalized_text) + "\" -> ";
 
-    str += "(" + to_utf8(target) + "): ";
+    str += "(" + utf32_to_str(target) + "): ";
     str += "(" + token + ")";
     return str;
 }
@@ -100,6 +100,14 @@ void StringMatchResult::clear_beyond_log10p(double max_log10p){
 }
 
 
+void StringMatchResult::operator+=(const StringMatchResult& result){
+    exact_match |= result.exact_match;
+    for (auto& item : result.results){
+        results.insert(item);
+    }
+}
+
+
 
 
 }
diff --git a/SerialPrograms/Source/CommonTools/OCR/OCR_StringMatchResult.h b/SerialPrograms/Source/CommonTools/OCR/OCR_StringMatchResult.h
new file mode 100644
index 0000000000..db6fa44557
--- /dev/null
+++ b/SerialPrograms/Source/CommonTools/OCR/OCR_StringMatchResult.h
@@ -0,0 +1,50 @@
+/*  String Match Results
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_CommonTools_OCR_StringMatchResult_H
+#define PokemonAutomation_CommonTools_OCR_StringMatchResult_H
+
+#include <string>
+#include <map>
+#include "Common/Cpp/Logging/AbstractLogger.h"
+
+namespace PokemonAutomation{
+namespace OCR{
+
+
+struct StringMatchData{
+    std::string original_text;
+    std::u32string normalized_text;
+
+    std::u32string target;
+    std::string token;
+
+    std::string to_str() const;
+};
+
+struct StringMatchResult{
+    bool exact_match = false;
+    std::multimap<double, StringMatchData> results;
+
+    void clear(){
+        exact_match = false;
+        results.clear();
+    }
+    void log(Logger& logger, double max_log10p, const std::string& extra = std::string()) const;
+
+    void add(double log10p, StringMatchData data);
+    void clear_beyond_spread(double log10p_spread);
+    void clear_beyond_log10p(double max_log10p);
+
+    void operator+=(const StringMatchResult& result);
+};
+
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/CommonTools/OCR/OCR_StringNormalization.cpp b/SerialPrograms/Source/CommonTools/OCR/OCR_StringNormalization.cpp
new file mode 100644
index 0000000000..caf17f0958
--- /dev/null
+++ b/SerialPrograms/Source/CommonTools/OCR/OCR_StringNormalization.cpp
@@ -0,0 +1,106 @@
+/*  String Normalization
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <map>
+#include <QString>
+#include "Common/Cpp/Exceptions.h"
+#include "Common/Cpp/Strings/Unicode.h"
+#include "Common/Cpp/Json/JsonValue.h"
+#include "Common/Cpp/Json/JsonObject.h"
+#include "Common/Qt/StringToolsQt.h"
+#include "CommonFramework/GlobalAutoPaths.h"
+#include "OCR_StringNormalization.h"
+
+namespace PokemonAutomation{
+namespace OCR{
+
+
+std::u32string normalize_utf32(const std::string& text){
+    QString qstr = QString::fromStdString(text);
+    qstr = QString::fromStdU32String(run_character_reductions(qstr.toStdU32String()));
+    qstr = qstr.normalized(QString::NormalizationForm_KD);
+    std::u32string u32 = remove_non_alphanumeric(qstr.toStdU32String());
+    u32 = run_character_reductions(u32);
+    to_lower(u32);
+    return u32;
+}
+
+
+
+std::u32string remove_non_alphanumeric(const std::u32string& text){
+    std::u32string str;
+    for (char32_t ch : text){
+        if (QChar::isLetterOrNumber(ch)){
+            str += ch;
+            continue;
+        }
+    }
+    return str;
+}
+
+
+std::map<char32_t, std::u32string> make_substitution_map32(){
+    std::string path = RESOURCE_PATH() + "OCR/CharacterReductions.json";
+    JsonValue json = load_json_file(path);
+    JsonObject& obj = json.to_object_throw(path);
+
+    std::map<char32_t, std::u32string> map;
+    for (auto& item : obj){
+        const std::string& target = item.first;
+        std::string& sources = item.second.to_string_throw(path);
+        for (char32_t ch : utf8_to_utf32(sources)){
+            auto iter = map.find(ch);
+            if (iter != map.end()){
+                throw FileException(
+                    nullptr, PA_CURRENT_FUNCTION,
+                    utf32_to_str(utf8_to_utf32("Duplicate character reduction: ") + ch),
+                    std::move(path)
+                );
+            }
+            map[ch] = utf8_to_utf32(target);
+        }
+    }
+    return map;
+}
+
+// Load character substitution rules from RESOURCE_PATH()/OCR/CharacterReductions.json
+// and build a lookup map. The JSON file maps target characters to source characters that
+// should be replaced, e.g. {"o": "0О"} means '0' and 'О' (Cyrillic O) should both map to 'o'.
+// This helps normalize OCR output where visually similar characters are often misrecognized.
+// Throws FileException if duplicate character mappings are found.
+// Return a map of raw unicode character -> unicode string to become to.
+// A map of {'0': 'o', 'O': 'o'} means for '0' and 'O' in the raw input text will be converted
+// to 'o'.
+const std::map<char32_t, std::u32string>& SUBSTITUTION_MAP32(){
+    static std::map<char32_t, std::u32string> map = make_substitution_map32();
+    return map;
+}
+
+
+std::u32string run_character_reductions(const std::u32string& text){
+    // raw unicode character from text -> disambiguated unicode string
+    const std::map<char32_t, std::u32string>& map = SUBSTITUTION_MAP32();
+    std::u32string str;
+    for (char32_t ch : text){
+        auto iter = map.find(ch);
+        if (iter == map.end()){
+            str += ch;
+        }else{
+            str += iter->second;
+        }
+    }
+    return str;
+}
+
+
+
+
+
+
+
+}
+}
+
diff --git a/SerialPrograms/Source/CommonTools/OCR/OCR_StringNormalization.h b/SerialPrograms/Source/CommonTools/OCR/OCR_StringNormalization.h
new file mode 100644
index 0000000000..73a43273d2
--- /dev/null
+++ b/SerialPrograms/Source/CommonTools/OCR/OCR_StringNormalization.h
@@ -0,0 +1,40 @@
+/*  String Normalization
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_CommonTools_OCR_StringNormalization_H
+#define PokemonAutomation_CommonTools_OCR_StringNormalization_H
+
+#include <string>
+
+namespace PokemonAutomation{
+namespace OCR{
+
+
+// Return only digits and word characters (no punctuation, whitespace or math operators).
+// This is called by `normalize_utf32()` as part of text processing for OCR matching
+// against a dictionary.
+std::u32string remove_non_alphanumeric(const std::u32string& text);
+
+// Apply character substitution rules loaded from RESOURCE_PATH()/OCR/CharacterReductions.json
+// to merge similar-looking characters. This is called by `normalize_utf32()` as a fix for OCR
+// failure on those similar-looking characters.
+std::u32string run_character_reductions(const std::u32string& text);
+
+// Convert UTF-8 string to UTF-32 and normalize it to make OCR matching against
+// a dictionary easier:
+// 1. Appy Unocide Compatibility Decomposition using QString, which decomposes
+//    each unicode into smaller easy-to-search components, e.g. '½' becomes "1/2".
+// 2. Call `remove_non_alphanumeric()` to remove punctuation, whitespace or math operators
+//    that are not part of any words or digits.
+// 3. Call `run_character_reductions()` to merge similar-look characters.
+// 4. Convert all uppercase letters to lowercase.
+std::u32string normalize_utf32(const std::string& text);
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/CommonTools/OCR/OCR_Tests.cpp b/SerialPrograms/Source/CommonTools/OCR/OCR_Tests.cpp
new file mode 100644
index 0000000000..780c7a3427
--- /dev/null
+++ b/SerialPrograms/Source/CommonTools/OCR/OCR_Tests.cpp
@@ -0,0 +1,540 @@
+/*  OCR Tests
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <cmath>
+#include <random>
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "Common/Cpp/Strings/Unicode.h"
+#include "CommonFramework/ImageTypes/ImageRGB32.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonTools/OCR/OCR_NumberReader.h"
+#include "Tests/ImageUnitTest.h"
+#include "Pokemon/Inference/Pokemon_NameReader.h"
+#include "OCR_Routines.h"
+#include "OCR_StringNormalization.h"
+#include "OCR_TextMatcher.h"
+#include "OCR_Tests.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace OCR{
+
+
+
+void add_tests(UnitTestDatabase& database){
+    add_tests_text_matcher(database);
+    add_tests_raw_OCR(database);
+    add_tests_number_waterfill_OCR(database);
+    Pokemon::add_tests_PokemonNameReader(database);
+    add_tests_multiline_OCR(database);
+}
+
+class Test_RawOCR : public ImageUnitTest{
+public:
+    Test_RawOCR(
+        const std::string& image,
+        Language language,
+        const std::string& expected
+    )
+        : ImageUnitTest("OCR::RawOCR - " + image, {image})
+        , m_language(language)
+        , m_expected(expected)
+    {
+        //  Plus the PaddleOCR (ONNX) recognition session and its working set.
+        m_memory += PADDLE_OCR_SINGLE_LINE_MEMORY_ESTIMATE;
+    }
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        const ImageRGB32& image = images[0];
+
+        std::string result = ocr_read(m_language, image);
+        logger.log("Raw OCR read: " + result);
+
+        return normalize_utf32(result) == normalize_utf32(m_expected);
+    };
+
+private:
+    Language m_language;
+    std::string m_expected;
+};
+
+class Test_NumberWaterfillOCR : public ImageUnitTest{
+public:
+    Test_NumberWaterfillOCR(
+        const std::string& image_path,
+        int expected,
+        uint32_t rgb32_min, uint32_t rgb32_max,
+        bool text_inside_range
+    )
+        : ImageUnitTest("OCR::NumberWaterfillOCR - " + image_path, {image_path})
+        , m_expected(expected)
+        , m_rgb32_min(rgb32_min)
+        , m_rgb32_max(rgb32_max)
+        , m_text_inside_range(text_inside_range)
+    {
+        //  Plus the PaddleOCR (ONNX) recognition session and its working set.
+        m_memory += PADDLE_OCR_SINGLE_LINE_MEMORY_ESTIMATE;
+    }
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        const ImageRGB32& image = images[0];
+
+        int result = OCR::read_number_waterfill(
+            logger, image,
+            m_rgb32_min, m_rgb32_max, m_text_inside_range
+        );
+        // logger.log("Raw OCR read: " + std::to_string(result));
+
+        return result == m_expected;
+    };
+
+private:
+    int m_expected;
+    uint32_t m_rgb32_min;
+    uint32_t m_rgb32_max;
+    bool m_text_inside_range;
+};
+
+void add_tests_raw_OCR(UnitTestDatabase& database){
+    database.add<Test_RawOCR>("OCR/letter-i-tall-1.jpg", Language::English, "I");
+    database.add<Test_RawOCR>("OCR/letter-i-tall-2.jpg", Language::English, "I");
+    database.add<Test_RawOCR>("OCR/letter-i-wide-1.jpg", Language::English, "I");
+    database.add<Test_RawOCR>("OCR/letter-i-wide-2.jpg", Language::English, "I");
+    database.add<Test_RawOCR>("OCR/sentence-1-1.jpg", Language::English, "You hurry to the Pokemon Center, shielding your");
+    database.add<Test_RawOCR>("OCR/sentence-1-1-wide.jpg", Language::English, "You hurry to the Pokemon Center, shielding your");
+    database.add<Test_RawOCR>("OCR/sentence-1-1-tall.jpg", Language::English, "You hurry to the Pokemon Center, shielding your");
+    database.add<Test_RawOCR>("OCR/sentence-1-2.jpg", Language::English, "You hurry to the Pokemon Center, shielding your");
+    database.add<Test_RawOCR>("OCR/sentence-1-2-wide.jpg", Language::English, "You hurry to the Pokemon Center, shielding your");
+    database.add<Test_RawOCR>("OCR/sentence-1-2-tall.jpg", Language::English, "You hurry to the Pokemon Center, shielding your");
+    database.add<Test_RawOCR>("OCR/sentence-1-3.jpg", Language::English, "You hurry to the Pokemon Center, shielding your");
+    database.add<Test_RawOCR>("OCR/sentence-1-3-wide.jpg", Language::English, "You hurry to the Pokemon Center, shielding your");
+    database.add<Test_RawOCR>("OCR/sentence-1-3-tall.jpg", Language::English, "You hurry to the Pokemon Center, shielding your");
+    database.add<Test_RawOCR>("OCR/german-nature-sanft.png", Language::German, "Wesen: SANFT");
+    database.add<Test_RawOCR>("OCR/Lv.1-0.png", Language::English, "Lv. 1");
+    database.add<Test_RawOCR>("OCR/Lv.1-1.png", Language::English, "Lv. 1");
+    database.add<Test_RawOCR>("OCR/Lv.1-2.png", Language::English, "Lv. 1");
+    database.add<Test_RawOCR>("OCR/Lv.1-3.png", Language::English, "Lv. 1");
+    database.add<Test_RawOCR>("OCR/Lv.1-4.png", Language::English, "Lv. 1");
+    database.add<Test_RawOCR>("OCR/Lv.1-5.png", Language::English, "Lv. 1");
+    database.add<Test_RawOCR>("OCR/dash-1.png", Language::English, "---");
+    // database.add<Test_RawOCR>("OCR/dash-2.png", Language::English, "---");
+    database.add<Test_RawOCR>("OCR/dash-3.png", Language::English, "---");
+    database.add<Test_RawOCR>("OCR/num-1.png", Language::English, "1");
+}
+
+
+void add_tests_number_waterfill_OCR(UnitTestDatabase& database){
+    database.add<Test_NumberWaterfillOCR>("OCR/date-1.png", 11, 0xff000000, 0xffff7fff, true);
+}
+
+
+
+// Crop `box` out of a screenshot, run multi-line OCR on it, and check that it finds
+// exactly the expected lines in order. Each line is compared after
+// `normalize_utf32()`, which ignores punctuation and whitespace.
+class Test_MultilineOCR : public ImageUnitTest{
+public:
+    Test_MultilineOCR(
+        const std::string& image,
+        const ImagePixelBox& box,
+        Language language,
+        std::vector<std::string> expected_lines
+    )
+        : ImageUnitTest("OCR::MultilineOCR - " + image, {image})
+        , m_box(box)
+        , m_language(language)
+        , m_expected_lines(std::move(expected_lines))
+    {
+        //  Plus the PaddleOCR (ONNX) recognition and detection sessions and their
+        //  working sets: multi-line OCR loads the detection model on top of the
+        //  recognition model.
+        m_memory += PADDLE_OCR_MULTILINE_MEMORY_ESTIMATE;
+    }
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        const ImageRGB32& image = images[0];
+        ImageViewRGB32 cropped = extract_box_reference(image, m_box);
+
+        std::string result = ocr_read(m_language, cropped, PageSegMode::SINGLE_BLOCK);
+        logger.log("Multi-line OCR read: " + result);
+
+        std::vector<std::string> lines;
+        size_t start = 0;
+        while (true){
+            size_t end = result.find('\n', start);
+            lines.emplace_back(result.substr(start, end - start));
+            if (end == std::string::npos){
+                break;
+            }
+            start = end + 1;
+        }
+
+        if (lines.size() != m_expected_lines.size()){
+            logger.log(
+                "Expected " + std::to_string(m_expected_lines.size()) +
+                " lines, got " + std::to_string(lines.size())
+            );
+            return false;
+        }
+        for (size_t c = 0; c < lines.size(); c++){
+            if (normalize_utf32(lines[c]) != normalize_utf32(m_expected_lines[c])){
+                logger.log("Line " + std::to_string(c) + " mismatch. Expected: " + m_expected_lines[c]);
+                return false;
+            }
+        }
+        return true;
+    };
+
+private:
+    ImagePixelBox m_box;
+    Language m_language;
+    std::vector<std::string> m_expected_lines;
+};
+
+void add_tests_multiline_OCR(UnitTestDatabase& database){
+    //  Already cropped to a single line, but with lots of empty space around it.
+    database.add<Test_MultilineOCR>(
+        "OCR/sentence-1-1-tall.jpg", ImagePixelBox(0, 0, 564, 500), Language::English,
+        std::vector<std::string>{"You hurry to the Pokemon Center, shielding your"}
+    );
+    database.add<Test_MultilineOCR>(
+        "OCR/sentence-1-1-wide.jpg", ImagePixelBox(0, 0, 1000, 41), Language::English,
+        std::vector<std::string>{"You hurry to the Pokemon Center, shielding your"}
+    );
+
+    //  Two-line FRLG dialog boxes: blue text on white.
+    database.add<Test_MultilineOCR>(
+        "PokemonFRLG/AdvanceWhiteDialogDetector/English-Bulba_True.png",
+        ImagePixelBox(270, 790, 1650, 1000), Language::English,
+        std::vector<std::string>{"I see! BULBASAUR is your choice.", "It's very easy to raise."}
+    );
+    database.add<Test_MultilineOCR>(
+        "PokemonFRLG/AdvanceWhiteDialogDetector/Ger-KennyExile-Char_True.png",
+        ImagePixelBox(270, 790, 1650, 1000), Language::German,
+        std::vector<std::string>{"Ah! GLUMANDA soll es sein!", "Trainiere es geduldig!"}
+    );
+
+    //  SV dialog box: speaker name (white on dark blue) above the dialog text (dark on white).
+    database.add<Test_MultilineOCR>(
+        "PokemonSV/DialogBoxDetector/French_True.png",
+        ImagePixelBox(430, 740, 1470, 975), Language::French,
+        std::vector<std::string>{"Clavel", "Poussacha, le Pokémon Chat Plante."}
+    );
+}
+
+
+
+// ============================================================================
+//  Weighted Levenshtein distance tests (pure logic, no images).
+// ============================================================================
+
+namespace {
+
+//  Substitution cost of 1.0 for every distinct pair: reproduces the
+//  unweighted Levenshtein distance.
+double unit_substitution_cost(char32_t ch0, char32_t ch1){
+    (void)ch0;
+    (void)ch1;
+    return 1.0;
+}
+
+//  A cheap "looks-alike" pair: k -> s costs 0.25, everything else 1.0.
+double kitten_substitution_cost(char32_t ch0, char32_t ch1){
+    if (ch0 == U'k' && ch1 == U's'){
+        return 0.25;
+    }
+    return 1.0;
+}
+
+int g_counting_sub_calls = 0;
+int g_counting_equal_calls = 0;
+double counting_substitution_cost(char32_t ch0, char32_t ch1){
+    if (ch0 == ch1){
+        g_counting_equal_calls++;
+    }
+    g_counting_sub_calls++;
+    return 42.0;
+}
+
+//  Fuzz machinery: a random substitution-cost table over a small alphabet,
+//  consulted through a plain function pointer.
+const char32_t FUZZ_ALPHABET[] = {'a', 'b', 'c', 'k', '0', u'霹'};
+const size_t FUZZ_ALPHABET_SIZE = sizeof(FUZZ_ALPHABET) / sizeof(FUZZ_ALPHABET[0]);
+double g_fuzz_sub_cost[FUZZ_ALPHABET_SIZE][FUZZ_ALPHABET_SIZE];
+
+size_t fuzz_alpha_index(char32_t ch){
+    for (size_t i = 0; i < FUZZ_ALPHABET_SIZE; i++){
+        if (FUZZ_ALPHABET[i] == ch){
+            return i;
+        }
+    }
+    return 0;
+}
+
+double fuzz_substitution_cost(char32_t ch0, char32_t ch1){
+    return g_fuzz_sub_cost[fuzz_alpha_index(ch0)][fuzz_alpha_index(ch1)];
+}
+
+//  Independent reference implementation: tries every possible matched region
+//  [s, e) of input. The region must align input[s..e) fully with
+//  match_target (1.0 per in-region insertion/deletion), and the context on
+//  both sides costs prepostfix_cost per character.
+double brute_force_weighted_levenshtein(
+    double prepostfix_cost,
+    const std::u32string& match_target, const std::u32string& input
+){
+    const size_t target_len = match_target.size();
+    const size_t input_len = input.size();
+    const double context_cost = std::min(prepostfix_cost, 1.0);
+
+    double best = (double)target_len + (double)input_len * context_cost;    //  Empty region.
+
+    for (size_t s = 0; s <= input_len; s++){
+        for (size_t e = s; e <= input_len; e++){
+            const size_t len = e - s;
+
+            //  cost[i][j] = cost of aligning input[s+i..e) with
+            //  match_target[j..target_len).
+            std::vector<std::vector<double>> cost(len + 1, std::vector<double>(target_len + 1, 0.0));
+            for (size_t i = 0; i <= len; i++){
+                cost[i][target_len] = (double)(len - i);    //  Delete the rest of the region.
+            }
+            for (size_t j = 0; j <= target_len; j++){
+                cost[len][j] = (double)(target_len - j);    //  Insert the rest of match_target.
+            }
+            for (size_t i = len; i-- > 0;){
+                const char32_t ch0 = input[s + i];
+                for (size_t j = target_len; j-- > 0;){
+                    const char32_t ch1 = match_target[j];
+                    double sub = cost[i + 1][j + 1];
+                    if (ch0 != ch1){
+                        sub += g_fuzz_sub_cost[fuzz_alpha_index(ch0)][fuzz_alpha_index(ch1)];
+                    }
+                    cost[i][j] = std::min(
+                        sub,
+                        std::min(cost[i + 1][j] + 1.0, cost[i][j + 1] + 1.0)
+                    );
+                }
+            }
+
+            best = std::min(
+                best, (double)(s + input_len - e) * context_cost + cost[0][0]
+            );
+        }
+    }
+
+    return best;
+}
+
+
+
+} //  namespace
+
+
+
+class Test_WeightedLevenshtein : public UnitTest{
+public:
+    Test_WeightedLevenshtein()
+        : UnitTest("OCR::TextMatcher - WeightedLevenshtein")
+    {}
+
+    virtual UnitTestResult run(Logger& logger, CancellableScope& scope) const override{
+        (void)scope;
+
+        const std::vector<std::pair<std::u32string, std::u32string>> pairs{
+            {std::u32string(), std::u32string()},
+            {U"abc", U""},
+            {U"", U"abc"},
+            {U"kitten", U"sitting"},
+            {U"abc", U"abc"},
+            {U"a", U"ab"},
+            {U"axb", U"ab"},
+            {U"abcde", U"ace"},
+            {U"the cat ran", U"cat"},
+            {utf8_to_utf32("霹雳火"), utf8_to_utf32("霹雳水")},
+        };
+
+        //  1. Unit substitution cost: free context must reproduce the
+        //     substring variant, and unit context the full-string variant.
+        for (size_t i = 0; i < pairs.size(); i++){
+            const std::u32string& input = pairs[i].first;
+            const std::u32string& match_target = pairs[i].second;
+
+            double free_context = levenshtein_distance(
+                0.0, unit_substitution_cost, match_target, input
+            );
+            double free_context_expected = (double)levenshtein_distance_substring(
+                match_target, input
+            );
+            if (free_context != free_context_expected){
+                logger.log(
+                    "Free-context mismatch: input = " + utf32_to_str(input) +
+                    ", match_target = " + utf32_to_str(match_target) +
+                    " (got " + std::to_string(free_context) + ", expected " +
+                    std::to_string(free_context_expected) + ")"
+                );
+                return false;
+            }
+
+            double full_context = levenshtein_distance(
+                1.0, unit_substitution_cost, match_target, input
+            );
+            double full_context_expected = (double)levenshtein_distance(input, match_target);
+            if (full_context != full_context_expected){
+                logger.log(
+                    "Full-context mismatch: input = " + utf32_to_str(input) +
+                    ", match_target = " + utf32_to_str(match_target) +
+                    " (got " + std::to_string(full_context) + ", expected " +
+                    std::to_string(full_context_expected) + ")"
+                );
+                return false;
+            }
+        }
+
+        //  2. A cheap "looks-alike" substitution: only k -> s differs.
+        if (levenshtein_distance(1.0, kitten_substitution_cost, U"sitten", U"kitten") != 0.25){
+            return UnitTestResult("Expected 0.25 for kitten -> sitten with k -> s costing 0.25.");
+        }
+
+        //  3. Context costs: 4 context characters around "cat" in "xxcatxx".
+        if (levenshtein_distance(0.0, unit_substitution_cost, U"cat", U"xxcatxx") != 0.0
+            || levenshtein_distance(0.25, unit_substitution_cost, U"cat", U"xxcatxx") != 1.0
+            || levenshtein_distance(1.0, unit_substitution_cost, U"cat", U"xxcatxx") != 4.0){
+            return UnitTestResult("Context costs for xxcatxx / cat were not 0 / 1.0 / 4.0.");
+        }
+
+        //  4. Context costs above 1.0 behave like 1.0 (skipping a character
+        //     is never more expensive than deleting it in the region).
+        if (levenshtein_distance(5.0, unit_substitution_cost, U"cat", U"xxcatxx") != 4.0){
+            return UnitTestResult("Context cost 5.0 should behave like 1.0.");
+        }
+
+        //  5. Empty strings.
+        if (levenshtein_distance(0.0, unit_substitution_cost, U"abc", U"") != 3.0
+            || levenshtein_distance(0.5, unit_substitution_cost, U"abc", U"") != 3.0){
+            return UnitTestResult("Empty input must cost len(match_target) insertions.");
+        }
+        if (levenshtein_distance(0.0, unit_substitution_cost, U"", U"abc") != 0.0
+            || levenshtein_distance(0.5, unit_substitution_cost, U"", U"abc") != 1.5
+            || levenshtein_distance(2.0, unit_substitution_cost, U"", U"abc") != 3.0){
+            return UnitTestResult("Empty match_target must cost len(input) context.");
+        }
+
+        //  6. Identical characters cost 0 without calling the cost function
+        //     for them (distinct pairs may still be evaluated).
+        g_counting_sub_calls = 0;
+        g_counting_equal_calls = 0;
+        if (levenshtein_distance(0.0, counting_substitution_cost, U"abc", U"abc") != 0.0
+            || g_counting_equal_calls != 0){
+            return UnitTestResult("The cost function must never be called with identical characters.");
+        }
+
+        //  7. A substitution cost above insert + delete decomposes into
+        //     delete + insert. In the substring variant the trailing "c" of
+        //     "abc" -> "abd" is free context (1.0); in the full-string
+        //     variant it costs 2.0, not the 42.0 substitution.
+        g_counting_sub_calls = 0;
+        g_counting_equal_calls = 0;
+        if (levenshtein_distance(0.0, counting_substitution_cost, U"abd", U"abc") != 1.0
+            || g_counting_equal_calls != 0){
+            return UnitTestResult("Substring variant of abc -> abd should cost 1.0 (free suffix).");
+        }
+        g_counting_sub_calls = 0;
+        g_counting_equal_calls = 0;
+        if (levenshtein_distance(1.0, counting_substitution_cost, U"abd", U"abc") != 2.0
+            || g_counting_equal_calls != 0){
+            return UnitTestResult("Full-string variant of abc -> abd should decompose into delete + insert.");
+        }
+
+        return true;
+    };
+
+};
+
+
+
+class Test_WeightedLevenshtein_Fuzz : public UnitTest{
+public:
+    Test_WeightedLevenshtein_Fuzz()
+        : UnitTest("OCR::TextMatcher - WeightedLevenshteinFuzz")
+    {}
+
+    virtual UnitTestResult run(Logger& logger, CancellableScope& scope) const override{
+        (void)scope;
+
+        const double COSTS[] = {0.0, 0.25, 0.5, 0.75, 1.0, 1.5};
+        const double CONTEXTS[] = {0.0, 0.3, 1.0, 2.5};
+
+        std::mt19937 rng(0xC0FFEE42u);
+        std::uniform_int_distribution<size_t> alpha_index(0, FUZZ_ALPHABET_SIZE - 1);
+        std::uniform_int_distribution<size_t> string_length(0, 5);
+        std::uniform_int_distribution<size_t> cost_index(0, sizeof(COSTS) / sizeof(COSTS[0]) - 1);
+        std::uniform_int_distribution<size_t> context_index(0, sizeof(CONTEXTS) / sizeof(CONTEXTS[0]) - 1);
+
+        for (int trial = 0; trial < 200; trial++){
+            //  Fresh random cost table.
+            for (auto& row : g_fuzz_sub_cost){
+                for (auto& entry : row){
+                    entry = COSTS[cost_index(rng)];
+                }
+            }
+
+            std::u32string match_target, input;
+            for (size_t i = 0; i < string_length(rng); i++){
+                match_target += FUZZ_ALPHABET[alpha_index(rng)];
+            }
+            for (size_t i = 0; i < string_length(rng); i++){
+                input += FUZZ_ALPHABET[alpha_index(rng)];
+            }
+            const double context = CONTEXTS[context_index(rng)];
+
+            const double expected = brute_force_weighted_levenshtein(
+                context, match_target, input
+            );
+            const double actual = levenshtein_distance(
+                context, fuzz_substitution_cost, match_target, input
+            );
+            const double tolerance = 1e-9 * std::max(1.0, std::max(expected, actual));
+            if (std::abs(actual - expected) > tolerance){
+                logger.log(
+                    "Fuzz mismatch (trial " + std::to_string(trial) + ", context = " +
+                    std::to_string(context) + "): match_target = " +
+                    utf32_to_str(match_target) + ", input = " + utf32_to_str(input) +
+                    ", expected = " + std::to_string(expected) +
+                    ", got = " + std::to_string(actual)
+                );
+                return false;
+            }
+        }
+
+        return true;
+    };
+
+};
+
+
+
+void add_tests_text_matcher(UnitTestDatabase& database){
+    database.add<Test_WeightedLevenshtein>();
+    database.add<Test_WeightedLevenshtein_Fuzz>();
+}
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/CommonTools/OCR/OCR_Tests.h b/SerialPrograms/Source/CommonTools/OCR/OCR_Tests.h
new file mode 100644
index 0000000000..11d5005e2e
--- /dev/null
+++ b/SerialPrograms/Source/CommonTools/OCR/OCR_Tests.h
@@ -0,0 +1,34 @@
+/*  OCR Tests
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_OCR_Tests_H
+#define PokemonAutomation_OCR_Tests_H
+
+#include "Common/Cpp/TestRunners/UnitTest.h"
+
+namespace PokemonAutomation{
+namespace OCR{
+
+
+
+void add_tests(UnitTestDatabase& database);
+
+void add_tests_raw_OCR(UnitTestDatabase& database);
+
+void add_tests_number_waterfill_OCR(UnitTestDatabase& database);
+
+// Multi-line OCR tests. These exercise the PaddleOCR detection + recognition pipeline
+// through `ocr_read()` with a multi-line page segmentation mode.
+void add_tests_multiline_OCR(UnitTestDatabase& database);
+
+// Pure-logic tests of the weighted Levenshtein distance in OCR_TextMatcher.
+void add_tests_text_matcher(UnitTestDatabase& database);
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/CommonTools/OCR/OCR_TextMatcher.cpp b/SerialPrograms/Source/CommonTools/OCR/OCR_TextMatcher.cpp
new file mode 100644
index 0000000000..320d57da72
--- /dev/null
+++ b/SerialPrograms/Source/CommonTools/OCR/OCR_TextMatcher.cpp
@@ -0,0 +1,303 @@
+/*  Text Inference Tools
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <algorithm>
+#include <cmath>
+#include <vector>
+#include "Common/Cpp/Exceptions.h"
+#include "Common/Cpp/Concurrency/SpinLock.h"
+#include "OCR_StringNormalization.h"
+#include "OCR_TextMatcher.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace OCR{
+
+#if 0
+void print(const std::vector<size_t>& v){
+    std::string str = "{";
+    bool first = true;
+    for (size_t x : v){
+        if (!first){
+            str += ", ";
+        }
+        first = false;
+        str += std::to_string(x);
+    }
+    str += "}";
+    cout << str << endl;
+}
+#endif
+
+
+template <typename StringType>
+size_t levenshtein_distance(const StringType& x, const StringType& y){
+    size_t xlen = x.size();
+    size_t ylen = y.size();
+
+    std::vector<size_t> v0(ylen + 1);
+    std::vector<size_t> v1(ylen + 1);
+
+    for (size_t i = 0; i <= ylen; i++){
+        v0[i] = i;
+    }
+
+    for (size_t i = 0; i < xlen; i++){
+        v1[0] = i + 1;
+
+        for (size_t j = 0; j < ylen; j++){
+            size_t delete_cost = v0[j + 1] + 1;
+            size_t insert_cost = v1[j] + 1;
+            size_t sub_cost = v0[j];
+            if (x[i] != y[j]){
+                sub_cost += 1;
+            }
+            v1[j + 1] = std::min({delete_cost, insert_cost, sub_cost});
+        }
+
+        std::swap(v0, v1);
+    }
+
+    return v0[ylen];
+}
+template <typename StringType>
+size_t levenshtein_distance_substring(const StringType& substring, const StringType& fullstring){
+    size_t xlen = fullstring.size();
+    size_t ylen = substring.size();
+
+    std::vector<size_t> v0(ylen + 1);
+    std::vector<size_t> v1(ylen + 1);
+
+    for (size_t i = 0; i <= ylen; i++){
+        v0[i] = i;
+    }
+//    print(v0);
+
+    size_t min = ylen;
+
+    for (size_t i = 0; i < xlen; i++){
+        v1[0] = 0;
+
+        for (size_t j = 0; j < ylen; j++){
+            size_t delete_cost = v0[j + 1] + 1;
+            size_t insert_cost = v1[j] + 1;
+            size_t sub_cost = v0[j];
+            if (fullstring[i] != substring[j]){
+                sub_cost += 1;
+            }
+            v1[j + 1] = std::min({delete_cost, insert_cost, sub_cost});
+        }
+
+        std::swap(v0, v1);
+
+        min = std::min(min, v0[ylen]);
+//        print(v0);
+    }
+
+    return min;
+}
+
+double levenshtein_distance(
+    double prepostfix_cost,
+    double (*substitution_cost)(char32_t ch0, char32_t ch1),
+    const std::u32string& match_target, const std::u32string& input
+){
+    const size_t target_len = match_target.size();
+    const size_t input_len = input.size();
+
+    //  A skipped character can always be charged as a mid-string deletion
+    //  (cost 1.0) instead, by growing the matched region to the whole of
+    //  input, so context costs above 1.0 behave like 1.0.
+    const double context_cost = std::min(prepostfix_cost, 1.0);
+
+    std::vector<double> v0(target_len + 1);
+    std::vector<double> v1(target_len + 1);
+
+    for (size_t j = 0; j <= target_len; j++){
+        v0[j] = (double)j;    //  match_target[0..j) must be inserted.
+    }
+
+    //  The match ends before the first character of input: all of input is
+    //  context.
+    double best = v0[target_len] + (double)input_len * context_cost;
+
+    for (size_t i = 0; i < input_len; i++){
+        v1[0] = v0[0] + context_cost;    //  input[0..i+1) is skipped as prefix.
+
+        const char32_t ch0 = input[i];
+        for (size_t j = 0; j < target_len; j++){
+            const double delete_cost = v0[j + 1] + 1.0;
+            const double insert_cost = v1[j] + 1.0;
+            double sub_cost = v0[j];
+            if (ch0 != match_target[j]){
+                sub_cost += substitution_cost(ch0, match_target[j]);
+            }
+            v1[j + 1] = std::min({delete_cost, insert_cost, sub_cost});
+        }
+
+        std::swap(v0, v1);
+
+        //  The match ends after input[i]: the rest of input is context.
+        best = std::min(best, v0[target_len] + (double)(input_len - i - 1) * context_cost);
+    }
+
+    return best;
+}
+
+template size_t levenshtein_distance<std::u32string>(const std::u32string& x, const std::u32string& y);
+template size_t levenshtein_distance_substring<std::u32string>(const std::u32string& x, const std::u32string& y);
+
+
+std::map<size_t, std::vector<uint64_t>> binomial_table;
+SpinLock binomial_lock;
+std::vector<uint64_t> binomial_row_u64(size_t degree){
+    std::vector<uint64_t> row;
+
+    uint64_t a = (uint64_t)degree;
+    uint64_t b = 1;
+    {
+        row.emplace_back(1);
+    }
+    {
+        row.emplace_back(a);
+        a--;
+        b++;
+    }
+    while (a > b){
+        row.emplace_back(row.back() * a / b);
+        a--;
+        b++;
+    }
+
+    return row;
+}
+double binomial_coefficient_double(size_t degree, size_t index){
+    if (degree > 1000){
+        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Cannot go beyond degree 1000.");
+    }
+
+    WriteSpinLock lg(binomial_lock, "binomial_coefficient_double()");
+
+    auto iter = binomial_table.find(degree);
+    std::vector<uint64_t>& row = iter != binomial_table.end()
+        ? iter->second
+        : binomial_table[degree] = binomial_row_u64(degree);
+
+    if (index > degree / 2){
+        index = degree - index;
+    }
+
+    return (double)row[index];
+}
+
+
+double random_match_probability(size_t total, size_t matched, double random_match_chance){
+    //  This effectively computes the binomial CDF function.
+    //  Mathematica: CDF[BinomialDistribution[total, random_match_chance], matched]
+    if (total > 1000){
+        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Cannot go beyond degree 1000.");
+    }
+    if (matched > total){
+        return 0;
+    }
+
+    double c_match = 1 - random_match_chance;
+
+//    double misses[62];
+    std::vector<double> misses(total - matched + 1);
+    {
+        double miss = 1;
+        misses[0] = miss;
+        for (size_t c = 1; c <= total - matched; c++){
+            miss *= c_match;
+            misses[c] = miss;
+        }
+    }
+
+    double hits = 1;
+
+    size_t m = 0;
+    for (; m < matched; m++){
+        hits *= random_match_chance;
+    }
+
+    double probability = 0;
+    for (; m < total; m++){
+        double binomial = (double)binomial_coefficient_double(total, m);
+        probability += hits * binomial * misses[total - m];
+        hits *= random_match_chance;
+    }
+    probability += hits;
+    return probability;
+}
+
+
+
+StringMatchResult match_substring(
+    const std::map<std::u32string, std::set<std::string>>& database, double random_match_chance,
+    const std::string& text, double log10p_spread
+){
+    StringMatchResult results;
+//    result.original_text = text;
+//    result.normalized_text = normalize(text);
+
+    std::u32string normalized = normalize_utf32(text);
+
+    //  Search for exact match of candidate.
+    auto iter = database.find(normalized);
+    if (iter != database.end()){
+        results.exact_match = true;
+        double probability = random_match_probability(normalized.size(), normalized.size(), random_match_chance);
+        double log10p = std::log10(probability);
+        for (const auto& target : iter->second){
+            results.add(
+                log10p,
+                StringMatchData{text, normalized, normalized, target}
+            );
+        }
+        return results;
+    }
+
+
+    for (const auto& item : database){
+        size_t token_length = item.first.size();
+
+        size_t distance = levenshtein_distance_substring(item.first, normalized);
+
+        size_t matched = token_length - distance;
+        if (matched == 0){
+            continue;
+        }
+
+        double probability = random_match_probability(token_length, matched, random_match_chance);
+        double log10p = std::log10(probability);
+
+        if (distance == 0){
+            results.exact_match = true;
+        }
+
+        for (const auto& slug : item.second){
+            results.add(log10p, StringMatchData{text, normalized, item.first, slug});
+            results.clear_beyond_spread(log10p_spread);
+        }
+    }
+
+    return results;
+}
+
+
+
+
+
+
+
+
+}
+}
+
diff --git a/SerialPrograms/Source/CommonTools/OCR/OCR_TextMatcher.h b/SerialPrograms/Source/CommonTools/OCR/OCR_TextMatcher.h
new file mode 100644
index 0000000000..4c37793c35
--- /dev/null
+++ b/SerialPrograms/Source/CommonTools/OCR/OCR_TextMatcher.h
@@ -0,0 +1,158 @@
+/*  Text Matcher
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_CommonTools_OCR_TextMatcher_H
+#define PokemonAutomation_CommonTools_OCR_TextMatcher_H
+
+#include <string>
+#include <set>
+#include <map>
+#include "OCR_StringMatchResult.h"
+
+namespace PokemonAutomation{
+namespace OCR{
+
+
+//  Calculate Levenshtein (edit) distance between two strings.
+//  This is the minimum number of single-character edits (insertions,
+//  deletions, substitutions)
+//  needed to transform string x into string y.
+template <typename StringType>
+size_t levenshtein_distance(const StringType& x, const StringType& y);
+
+//  Calculate minimum edit distance to find 'substring' anywhere within
+//  'fullstring'.
+//  This is a variant of Levenshtein distance that allows the match to
+//  start/end anywhere
+//  in fullstring without penalty.
+//
+//  Example:
+//    substring = "cat"
+//    fullstring = "the cat ran"
+//    Result: 0 (exact substring match found)
+//
+//    substring = "cet"
+//    fullstring = "the cat ran"
+//    Result: 1 (one substitution: e->a)
+template <typename StringType>
+size_t levenshtein_distance_substring(const StringType& substring, const StringType& fullstring);
+
+//  Calculate weighted Levenshtein (edit) distance between match_target and
+//  input, with a per-pair substitution cost and a per-character cost for the
+//  part of input that lies outside the matched region (pre/postfix).
+//
+//  match_target is the string being looked for (e.g. a dictionary token);
+//  input is the raw OCR'ed string, typically longer.
+//
+//  Edit costs:
+//    - Substitute input[i] with match_target[j]:
+//      substitution_cost(input[i], match_target[j]) (identical characters
+//      cost 0; the function is not called for them).
+//    - Delete a character of input / insert a character of match_target
+//      inside the matched region: 1.0 each.
+//    - Skip a character of input before/after the matched region
+//      (pre/postfix): prepostfix_cost each (0.0 = free, i.e. substring
+//      match; 1.0 = full string). Values above 1.0 behave like 1.0, since a
+//      skipped character can always be charged as a 1.0 deletion instead.
+//
+//  The whole of match_target must be explained; only input may have skipped
+//  context. All costs must be non-negative. The result is the minimum total
+//  cost, in the same units as the costs (so fractional, when the costs are
+//  fractional).
+//
+//  Example:
+//    input = "xxcatxx", match_target = "cat", prepostfix_cost = 0.25,
+//    unit substitution
+//    Result: 1.0 (the four context characters, 0.25 each)
+//
+//    input = "kitten", match_target = "sitten", prepostfix_cost = 1.0,
+//    substitution_cost('k', 's') = 0.25, 1.0 otherwise
+//    Result: 0.25
+
+double levenshtein_distance(
+    double prepostfix_cost,
+    double (*substitution_cost)(char32_t ch0, char32_t ch1),
+    const std::u32string& match_target, const std::u32string& input
+);
+
+//  Calculate probability that a match of 'matched' characters out of 'total'
+//  occurred by random chance.
+//  This uses the binomial cumulative distribution function (CDF) to determine
+//  statistical significance.
+//  Mathematically equivalent to:
+//      BinomialCDF[k=matched, n=total, p=random_match_chance]
+//
+//  This is the probability of getting 'matched' characters correct by pure
+//  luck.
+//
+//  Parameters:
+//    total: Total length of the dictionary token being compared
+//    matched: Number of characters that matched (total - levenshtein_distance)
+//    random_match_chance: Probability a random character matches
+//    (language-dependent)
+//
+//  Returns: Probability value in range [0, 1]. Lower values indicate
+//  better/more significant matches.
+//
+//  Example:
+//    total=6, matched=6, random_match_chance=0.05 => very low probability
+//    (strong match)
+//    total=6, matched=3, random_match_chance=0.05 => higher probability (weak
+//    match)
+//
+//  This probability is later converted to log10(p) for numerical range and
+//  used as a score to measure
+//  match closeness.
+double random_match_probability(size_t total, size_t matched, double random_match_chance);
+
+
+//  Core proximity matching algorithm for OCR results against a dictionary.
+//  This function matches OCR'd text against a database of known strings,
+//  handling OCR errors
+//  using Levenshtein edit distance and statistical probability scoring.
+//
+//  Parameters:
+//    database: Map of normalized UTF-32 strings to their token identifiers
+//    (slugs)
+//    random_match_chance: Probability that a character matches by pure chance
+//    (language-dependent)
+//    text: Raw OCR text to match
+//    log10p_spread: Maximum log10(probability) difference to keep multiple
+//    candidates
+//
+//  Returns: StringMatchResult with candidates sorted by match probability
+//
+//  MATCHING ALGORITHM:
+//  1. Normalize the OCR text (remove spaces, convert to lowercase, standardize
+//  characters)
+//  2. Try exact match first - if found, return immediately with high confidence
+//  3. For each dictionary entry:
+//     a. Calculate Levenshtein distance (min edit operations:
+//     insert/delete/substitute)
+//     b. Compute "matched" characters = token_length - distance
+//     c. Calculate probability this match occurred by random chance using
+//     binomial distribution
+//     d. Convert to log10(probability) for numerical stability (lower = better
+//     match)
+//     e. Add all slugs associated with this dictionary entry at this score
+//
+//  Limitation for East Asian characters:
+//  The Levenshtein distance treats all character substitutions equally (cost =
+//  1) regardless
+//  of different character complexity (e.g. 霹 is very close to 霸 but different
+//  from 火, but
+//  get the same cost).
+StringMatchResult match_substring(
+    const std::map<std::u32string, std::set<std::string>>& database, double random_match_chance,
+    const std::string& text, double log10p_spread
+);
+
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/OCR/OCR_TrainingTools.cpp b/SerialPrograms/Source/CommonTools/OCR/OCR_TrainingTools.cpp
similarity index 75%
rename from SerialPrograms/Source/CommonFramework/OCR/OCR_TrainingTools.cpp
rename to SerialPrograms/Source/CommonTools/OCR/OCR_TrainingTools.cpp
index 1c58f82def..84d54fc6c4 100644
--- a/SerialPrograms/Source/CommonFramework/OCR/OCR_TrainingTools.cpp
+++ b/SerialPrograms/Source/CommonTools/OCR/OCR_TrainingTools.cpp
@@ -1,17 +1,16 @@
 /*  Training Tools
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include <QDirIterator>
+#include "Common/Cpp/Filesystem/Filesystem.h"
+#include "Common/Cpp/Strings/StringTools.h"
 #include "Common/Cpp/PrettyPrint.h"
-#include "Common/Cpp/Concurrency/ParallelTaskRunner.h"
-#include "CommonFramework/Globals.h"
-#include "CommonFramework/GlobalSettingsPanel.h"
-#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
-#include "CommonFramework/OCR/OCR_RawOCR.h"
-#include "CommonFramework/OCR/OCR_StringNormalization.h"
+#include "Common/Cpp/Concurrency/Backends/ThreadPool_Default.h"
+#include "CommonFramework/GlobalAutoPaths.h"
+#include "CommonFramework/Options/Environment/PerformanceOptions.h"
+#include "CommonFramework/ImageTypes/ImageRGB32.h"
 #include "OCR_SmallDictionaryMatcher.h"
 #include "OCR_LargeDictionaryMatcher.h"
 #include "OCR_TrainingTools.h"
@@ -64,22 +63,31 @@ TrainingSession::TrainingSession(
 
     logger.log("Parsing training data in: " + m_directory);
 
-    QDirIterator iter(QString::fromStdString(m_directory), QDir::AllDirs);
-    while (iter.hasNext()){
-        iter.next();
-        QString sample_directory = iter.fileName() + "/";
+    const std::vector<Filesystem::Path> sample_dirs =
+        Filesystem::list_directory(Filesystem::Path(m_directory));
+    for (const Filesystem::Path& sample_dir : sample_dirs){
+        if (!Filesystem::is_directory(sample_dir)){
+            continue;
+        }
+        const std::string sample_directory = sample_dir.filename().string() + "/";
         for (size_t c = 1; c < (size_t)Language::EndOfList; c++){
             Language language = (Language)c;
             const std::string& code = language_data(language).code;
-            QString folder = sample_directory + QString::fromStdString(code) + "/";
-            QDirIterator iter1(QString::fromStdString(m_directory) + folder, QStringList() << "*.png", QDir::Files);
-            while (iter1.hasNext()){
-                iter1.next();
+            const std::string folder = sample_directory + code + "/";
+            const std::vector<Filesystem::Path> png_files =
+                Filesystem::list_directory(Filesystem::Path(m_directory + folder));
+            for (const Filesystem::Path& png_file : png_files){
+                if (!Filesystem::is_regular_file(png_file)){
+                    continue;
+                }
+                if (!StringTools::ends_with_ci(png_file.extension().string(), ".png")){
+                    continue;
+                }
 //                QString file = iter.next();
                 m_samples[language].emplace_back(
                     TrainingSample{
-                        OCR::extract_name(iter1.fileName().toStdString()),
-                        (folder + iter1.fileName()).toStdString()
+                        OCR::extract_name(png_file.filename().string()),
+                        folder + png_file.filename().string()
                     }
                 );
                 m_total_samples++;
@@ -111,8 +119,8 @@ void TrainingSession::generate_small_dictionary(
     OCR::SmallDictionaryMatcher baseline(ocr_json_file, !incremental);
     OCR::SmallDictionaryMatcher trained(ocr_json_file, !incremental);
 
-    ParallelTaskRunner task_runner(
-        [](){ GlobalSettings::instance().COMPUTE_PRIORITY0.set_on_this_thread(); },
+    ThreadPool_Default task_runner(
+        [&](){ PerformanceOptions::instance().COMPUTE_PRIORITY.set_on_this_thread(m_logger); },
         0, threads
     );
 
@@ -122,8 +130,13 @@ void TrainingSession::generate_small_dictionary(
         const LanguageData& language_info = language_data(language.first);
         m_logger.log("Starting Language: " + language_info.name);
 //        cout << (int)item.first << " : " << item.second.size() << endl;
-        for (const TrainingSample& sample : language.second){
-            task_runner.dispatch([&]{
+
+        task_runner.run_in_parallel(
+            [&](size_t index){
+                m_scope.throw_if_cancelled();
+
+                const TrainingSample& sample = language.second[index];
+
                 ImageRGB32 image(m_directory + sample.filepath);
                 if (!image){
                     m_logger.log("Skipping: " + sample.filepath);
@@ -164,10 +177,10 @@ void TrainingSession::generate_small_dictionary(
                     language.first, sample.token,
                     result0.results.begin()->second.normalized_text
                 );
-            });
-            m_scope.throw_if_cancelled();
-        }
-        task_runner.wait_for_everything();
+            },
+            0, language.second.size(), 1
+        );
+
         m_scope.throw_if_cancelled();
     }
 
@@ -193,8 +206,8 @@ void TrainingSession::generate_large_dictionary(
     OCR::LargeDictionaryMatcher baseline(ocr_json_directory + output_prefix, nullptr, !incremental);
     OCR::LargeDictionaryMatcher trained(ocr_json_directory + output_prefix, nullptr, !incremental);
 
-    ParallelTaskRunner task_runner(
-        [](){ GlobalSettings::instance().COMPUTE_PRIORITY0.set_on_this_thread(); },
+    ThreadPool_Default task_runner(
+        [&](){ PerformanceOptions::instance().COMPUTE_PRIORITY.set_on_this_thread(m_logger); },
         0, threads
     );
 
@@ -204,8 +217,13 @@ void TrainingSession::generate_large_dictionary(
         const LanguageData& language_info = language_data(language.first);
         m_logger.log("Starting Language: " + language_info.name);
 //        cout << (int)item.first << " : " << item.second.size() << endl;
-        for (const TrainingSample& sample : language.second){
-            task_runner.dispatch([&]{
+
+        task_runner.run_in_parallel(
+            [&](size_t index){
+                m_scope.throw_if_cancelled();
+
+                const TrainingSample& sample = language.second[index];
+
                 ImageRGB32 image(m_directory + sample.filepath);
                 if (!image){
                     m_logger.log("Skipping: " + sample.filepath);
@@ -246,10 +264,9 @@ void TrainingSession::generate_large_dictionary(
                     language.first, sample.token,
                     result0.results.begin()->second.normalized_text
                 );
-            });
-            m_scope.throw_if_cancelled();
-        }
-        task_runner.wait_for_everything();
+            },
+            0, language.second.size(), 1
+        );
 
         std::string json = output_prefix + language_info.code + ".json";
         trained.save(language.first, json);
diff --git a/SerialPrograms/Source/CommonFramework/OCR/OCR_TrainingTools.h b/SerialPrograms/Source/CommonTools/OCR/OCR_TrainingTools.h
similarity index 84%
rename from SerialPrograms/Source/CommonFramework/OCR/OCR_TrainingTools.h
rename to SerialPrograms/Source/CommonTools/OCR/OCR_TrainingTools.h
index b1c087397f..faafa66f94 100644
--- a/SerialPrograms/Source/CommonFramework/OCR/OCR_TrainingTools.h
+++ b/SerialPrograms/Source/CommonTools/OCR/OCR_TrainingTools.h
@@ -1,18 +1,18 @@
 /*  Training Tools
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#ifndef PokemonAutomation_OCR_TrainingTools_H
-#define PokemonAutomation_OCR_TrainingTools_H
+#ifndef PokemonAutomation_CommonTools_OCR_TrainingTools_H
+#define PokemonAutomation_CommonTools_OCR_TrainingTools_H
 
 #include <string>
 #include <vector>
 #include <map>
+#include "Common/Cpp/Logging/AbstractLogger.h"
 #include "Common/Cpp/CancellableScope.h"
 #include "CommonFramework/Language.h"
-#include "CommonFramework/Logging/Logger.h"
 #include "OCR_Routines.h"
 
 namespace PokemonAutomation{
diff --git a/SerialPrograms/Source/CommonFramework/Options/LanguageOCROption.cpp b/SerialPrograms/Source/CommonTools/Options/LanguageOCROption.cpp
similarity index 75%
rename from SerialPrograms/Source/CommonFramework/Options/LanguageOCROption.cpp
rename to SerialPrograms/Source/CommonTools/Options/LanguageOCROption.cpp
index 23eb50e93d..a93ffda4de 100644
--- a/SerialPrograms/Source/CommonFramework/Options/LanguageOCROption.cpp
+++ b/SerialPrograms/Source/CommonTools/Options/LanguageOCROption.cpp
@@ -1,16 +1,16 @@
 /*  Language OCR Option
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include "Common/Cpp/Exceptions.h"
 #include "Common/Cpp/Json/JsonValue.h"
 #include "CommonFramework/Logging/Logger.h"
-#include "CommonFramework/OCR/OCR_RawOCR.h"
+#include "CommonTools/OCR/OCR_Routines.h"
 #include "LanguageOCROption.h"
 
-#include <iostream>
+//#include <iostream>
 //using std::cout;
 //using std::endl;
 
@@ -21,10 +21,10 @@ namespace OCR{
 
 LanguageOCRCell::LanguageOCRCell(
     const LanguageSet& languages,
-    LockWhileRunning lock_while_running,
+    LockMode lock_while_running,
     bool required
 )
-    : ConfigOption(lock_while_running)
+    : UiState<LanguageOCRCell, ConfigOption>(lock_while_running)
     , m_default(0)
     , m_current(0)
 {
@@ -44,7 +44,7 @@ LanguageOCRCell::LanguageOCRCell(
     for (Language language : languages){
         m_case_list.emplace_back(
             language,
-            language == Language::None || OCR::language_available(language)
+            language == Language::None || OCR::ocr_language_available(language)
         );
         m_case_map.emplace(
             std::piecewise_construct,
@@ -61,13 +61,25 @@ void LanguageOCRCell::set(Language language){
     if (iter == m_case_map.end()){
         return;
     }
-    m_current.store(iter->second, std::memory_order_relaxed);
-    report_value_changed();
+    if (iter->second != m_current.exchange(iter->second, std::memory_order_relaxed)){
+        report_value_changed(this);
+    }
 }
 
 
+
+std::string LanguageOCRCell::check_validity() const{
+    return m_case_list[m_current.load(std::memory_order_relaxed)].second ? std::string() : "Language data is not available.";
+}
+void LanguageOCRCell::restore_defaults(){
+    m_current.store(m_default, std::memory_order_relaxed);
+    report_value_changed(this);
+}
+JsonValue LanguageOCRCell::to_json() const{
+    return language_data((Language)*this).code;
+}
 void LanguageOCRCell::load_json(const JsonValue& json){
-    const std::string* str = json.get_string();
+    const std::string* str = json.to_string();
     if (str == nullptr){
         return;
     }
@@ -89,19 +101,9 @@ void LanguageOCRCell::load_json(const JsonValue& json){
         return;
     }
     m_current.store(iter->second, std::memory_order_relaxed);
-    report_value_changed();
-}
-JsonValue LanguageOCRCell::to_json() const{
-    return language_data((Language)*this).code;
+    report_value_changed(this);
 }
 
-std::string LanguageOCRCell::check_validity() const{
-    return m_case_list[m_current.load(std::memory_order_relaxed)].second ? std::string() : "Language data is not available.";
-}
-void LanguageOCRCell::restore_defaults(){
-    m_current.store(m_default, std::memory_order_relaxed);
-    report_value_changed();
-}
 
 
 
@@ -116,10 +118,14 @@ void LanguageOCRCell::restore_defaults(){
 LanguageOCROption::LanguageOCROption(
     std::string label,
     const LanguageSet& languages,
-    LockWhileRunning lock_while_running,
+    LockMode lock_while_running,
     bool required
 )
-    : LanguageOCRCell(languages, lock_while_running, required)
+    : UiState<LanguageOCROption, LanguageOCRCell>(
+        languages,
+        lock_while_running,
+        required
+    )
     , m_label(std::move(label))
 {}
 
diff --git a/SerialPrograms/Source/CommonTools/Options/LanguageOCROption.h b/SerialPrograms/Source/CommonTools/Options/LanguageOCROption.h
new file mode 100644
index 0000000000..9b1de7dbd6
--- /dev/null
+++ b/SerialPrograms/Source/CommonTools/Options/LanguageOCROption.h
@@ -0,0 +1,77 @@
+/*  Language OCR Option
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_CommonTools_Options_LanguageOCROption_H
+#define PokemonAutomation_CommonTools_Options_LanguageOCROption_H
+
+#include <atomic>
+#include <vector>
+#include <map>
+#include "Common/Cpp/Options/ConfigOption.h"
+#include "CommonFramework/Language.h"
+
+namespace PokemonAutomation{
+namespace OCR{
+
+
+class LanguageOCRCell : public UiState<LanguageOCRCell, ConfigOption>{
+public:
+    LanguageOCRCell(
+        const LanguageSet& languages,
+        LockMode lock_while_running,
+        bool required = true
+    );
+
+//    explicit operator bool() const{ return m_case_list[m_current].first != Language::None && m_case_list[m_current].second; }
+
+    operator size_t() const{ return m_current; }
+    operator Language() const{ return m_case_list[m_current.load(std::memory_order_relaxed)].first; }
+    void set(Language language);
+
+
+public:
+    virtual std::string check_validity() const override;
+    virtual void restore_defaults() override;
+    virtual JsonValue to_json() const override;
+    virtual void load_json(const JsonValue& json) override;
+
+
+private:
+    friend class LanguageOCRCellWidget;
+
+    std::vector<std::pair<Language, bool>> m_case_list;
+    std::map<Language, size_t> m_case_map;
+    const size_t m_default;
+
+    std::atomic<size_t> m_current;
+};
+
+
+
+
+class LanguageOCROption : public UiState<LanguageOCROption, LanguageOCRCell>{
+public:
+    LanguageOCROption(
+        std::string label,
+        const LanguageSet& languages,
+        LockMode lock_while_running,
+        bool required = true
+    );
+
+    const std::string& label() const{ return m_label; }
+
+private:
+    friend class LanguageOCROptionWidget;
+
+    const std::string m_label;
+};
+
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/Options/UI/LanguageOCRWidget.cpp b/SerialPrograms/Source/CommonTools/Options/QtWidgets/LanguageOCRWidget.cpp
similarity index 82%
rename from SerialPrograms/Source/CommonFramework/Options/UI/LanguageOCRWidget.cpp
rename to SerialPrograms/Source/CommonTools/Options/QtWidgets/LanguageOCRWidget.cpp
index 053b4fcc37..3da7906c33 100644
--- a/SerialPrograms/Source/CommonFramework/Options/UI/LanguageOCRWidget.cpp
+++ b/SerialPrograms/Source/CommonTools/Options/QtWidgets/LanguageOCRWidget.cpp
@@ -1,6 +1,6 @@
 /*  Language OCR Option
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -9,8 +9,8 @@
 #include <QHBoxLayout>
 #include <QLabel>
 #include <QComboBox>
-#include "CommonFramework/Globals.h"
 #include "Common/Qt/NoWheelComboBox.h"
+#include "CommonFramework/Globals.h"
 #include "LanguageOCRWidget.h"
 
 //#include <iostream>
@@ -18,16 +18,11 @@
 //using std::endl;
 
 namespace PokemonAutomation{
-namespace OCR{
-
 
+template class RegisterUiStateQtWidget<OCR::LanguageOCRCellWidget>;
+template class RegisterUiStateQtWidget<OCR::LanguageOCROptionWidget>;
 
-ConfigWidget* LanguageOCRCell::make_QtWidget(QWidget& parent){
-    return new LanguageOCRCellWidget(parent, *this);
-}
-ConfigWidget* LanguageOCROption::make_QtWidget(QWidget& parent){
-    return new LanguageOCROptionWidget(parent, *this);
-}
+namespace OCR{
 
 
 
@@ -39,7 +34,7 @@ LanguageOCRCellWidget::LanguageOCRCellWidget(QWidget& parent, LanguageOCRCell& v
 {
     QVBoxLayout* vbox = new QVBoxLayout(this);
     vbox->setContentsMargins(0, 0, 0, 0);
-    m_box = new NoWheelComboBox(&parent);
+    m_box = new NoWheelCompactComboBox(&parent);
 
     for (const auto& item : m_value.m_case_list){
 //        m_enum_to_index[item.first] = (int)m_index_to_enum.size();
@@ -98,13 +93,13 @@ void LanguageOCRCellWidget::update_value(){
         m_status->setText(
             QString::fromStdString(
                 "<font color=\"red\">No text recognition data found for " + language.name + ".</font>\n" +
-                "<a href=\"" + PROJECT_GITHUB_URL + "Packages/blob/master/SerialPrograms/Resources/Tesseract/\">Download from here.</a>"
+                "<a href=\"" + RESOURCES_URL_BASE + "blob/master/SerialPrograms/Resources/Tesseract/\">Download from here.</a>"
             )
         );
         m_status->setVisible(true);
     }
 }
-void LanguageOCRCellWidget::value_changed(){
+void LanguageOCRCellWidget::on_config_value_changed(void* object){
     QMetaObject::invokeMethod(m_box, [this]{
         update_value();
     }, Qt::QueuedConnection);
@@ -136,8 +131,8 @@ LanguageOCROptionWidget::LanguageOCROptionWidget(QWidget& parent, LanguageOCROpt
 void LanguageOCROptionWidget::update_value(){
     m_cell->update_value();
 }
-void LanguageOCROptionWidget::value_changed(){
-    m_cell->value_changed();
+void LanguageOCROptionWidget::on_config_value_changed(void* object){
+    m_cell->on_config_value_changed(object);
 }
 
 
diff --git a/SerialPrograms/Source/CommonTools/Options/QtWidgets/LanguageOCRWidget.h b/SerialPrograms/Source/CommonTools/Options/QtWidgets/LanguageOCRWidget.h
new file mode 100644
index 0000000000..571f9a3b70
--- /dev/null
+++ b/SerialPrograms/Source/CommonTools/Options/QtWidgets/LanguageOCRWidget.h
@@ -0,0 +1,60 @@
+/*  Language OCR Option
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_CommonTools_Options_LanguageOCRWidget_H
+#define PokemonAutomation_CommonTools_Options_LanguageOCRWidget_H
+
+#include <QWidget>
+#include "Common/Qt/Options/ConfigWidget.h"
+#include "CommonTools/Options/LanguageOCROption.h"
+
+class QLabel;
+class QComboBox;
+
+namespace PokemonAutomation{
+namespace OCR{
+
+
+class LanguageOCRCellWidget : public QWidget, public ConfigWidget{
+public:
+    using ParentState = LanguageOCRCell;
+
+public:
+    LanguageOCRCellWidget(QWidget& parent, LanguageOCRCell& value);
+
+    virtual void update_value() override;
+    virtual void on_config_value_changed(void* object) override;
+
+private:
+    LanguageOCRCell& m_value;
+    QComboBox* m_box;
+    QLabel* m_status;
+    std::vector<Language> m_index_to_enum;
+//    std::map<Language, int> m_enum_to_index;
+};
+
+
+
+class LanguageOCROptionWidget : public QWidget, public ConfigWidget{
+public:
+    using ParentState = LanguageOCROption;
+
+public:
+    ~LanguageOCROptionWidget();
+    LanguageOCROptionWidget(QWidget& parent, LanguageOCROption& value);
+
+    virtual void update_value() override;
+    virtual void on_config_value_changed(void* object) override;
+
+private:
+    LanguageOCRCellWidget* m_cell;
+};
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/Options/UI/ScreenWatchWidget.cpp b/SerialPrograms/Source/CommonTools/Options/QtWidgets/ScreenWatchWidget.cpp
similarity index 76%
rename from SerialPrograms/Source/CommonFramework/Options/UI/ScreenWatchWidget.cpp
rename to SerialPrograms/Source/CommonTools/Options/QtWidgets/ScreenWatchWidget.cpp
index 88c0767c14..f9aa615c71 100644
--- a/SerialPrograms/Source/CommonFramework/Options/UI/ScreenWatchWidget.cpp
+++ b/SerialPrograms/Source/CommonTools/Options/QtWidgets/ScreenWatchWidget.cpp
@@ -1,6 +1,6 @@
 /*  Screen Watch Widget
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -11,31 +11,30 @@
 #include <QDialog>
 #include <QScreen>
 #include <QMouseEvent>
-#include <QApplication>
 #include <QGuiApplication>
+#include "CommonFramework/ImageTypes/ImageRGB32_Qt.h"
+#include "CommonFramework/Tools/GlobalThreadPools.h"
 #include "ScreenWatchWidget.h"
 
-#include <iostream>
-using std::cout;
-using std::endl;
+//#include <iostream>
+//using std::cout;
+//using std::endl;
 
 namespace PokemonAutomation{
 
 
-ConfigWidget* ScreenWatchDisplay::make_QtWidget(QWidget& parent){
-    return new ScreenWatchWidget(*this, parent);
-}
-ConfigWidget* ScreenWatchButtons::make_QtWidget(QWidget& parent){
-    return new ScreenWatchButtonWidget(m_option, parent);
-}
+template class RegisterUiStateQtWidget<ScreenWatchWidget>;
+template class RegisterUiStateQtWidget<ScreenWatchButtonWidget>;
 
 
-ScreenWatchDisplayWidget::ScreenWatchDisplayWidget(ScreenWatchOption& option, ScreenWatchWidget& parent)
+ScreenWatchDisplayWidget::ScreenWatchDisplayWidget(ScreenWatchWidget& parent, ScreenWatchOption& option)
     : QWidget(&parent)
     , m_holder(parent)
     , m_option(option)
     , m_stop(false)
-    , m_updater(&ScreenWatchDisplayWidget::thread_loop, this)
+    , m_updater(GlobalThreadPools::unlimited_normal().dispatch_now_blocking(
+        [this]{ thread_loop(); }
+    ))
 {}
 ScreenWatchDisplayWidget::~ScreenWatchDisplayWidget(){
     {
@@ -43,13 +42,16 @@ ScreenWatchDisplayWidget::~ScreenWatchDisplayWidget(){
         m_stop = true;
         m_cv.notify_all();
     }
-    m_updater.join();
+    m_updater.wait_and_ignore_exceptions();
 }
 void ScreenWatchDisplayWidget::paintEvent(QPaintEvent* event){
 //    cout << "ScreenWatchDisplayWidget::paintEvent: " << m_holder.width() << " x " << m_holder.height() << endl;
     QWidget::paintEvent(event);
 
     VideoSnapshot snapshot = m_last_frame;
+    if (!snapshot){
+        return;
+    }
 
     double aspect_ratio = (double)snapshot.frame->width() / snapshot.frame->height();
     if (aspect_ratio < 2.0){
@@ -63,7 +65,7 @@ void ScreenWatchDisplayWidget::paintEvent(QPaintEvent* event){
 
     QRect rect(0, 0, this->width(), this->height());
     QPainter painter(this);
-    painter.drawImage(rect, snapshot.frame->to_QImage_ref());
+    painter.drawImage(rect, to_QImage_ref(*snapshot.frame));
 }
 
 
@@ -78,11 +80,11 @@ void ScreenWatchDisplayWidget::thread_loop(){
     }
 }
 
-ScreenWatchWidget::ScreenWatchWidget(ScreenWatchDisplay& option, QWidget& parent)
+ScreenWatchWidget::ScreenWatchWidget(QWidget& parent, ScreenWatchDisplay& option)
     : WidgetStackFixedAspectRatio(parent, ADJUST_HEIGHT_TO_WIDTH)
     , ConfigWidget(option, *this)
 {
-    m_widget = new ScreenWatchDisplayWidget(option.m_option, *this);
+    m_widget = new ScreenWatchDisplayWidget(*this, option.m_option);
     add_widget(*m_widget);
     m_overlay = new VideoOverlayWidget(*this, option.m_option.overlay());
     add_widget(*m_overlay);
@@ -172,7 +174,7 @@ class SelectorOverlay : public QDialog{
 
 
 
-ScreenWatchButtonWidget::ScreenWatchButtonWidget(ScreenWatchOption& option, QWidget& parent)
+ScreenWatchButtonWidget::ScreenWatchButtonWidget(QWidget& parent, ScreenWatchButtons& option)
     : QWidget(&parent)
     , ConfigWidget(option, *this)
 {
@@ -191,13 +193,13 @@ ScreenWatchButtonWidget::ScreenWatchButtonWidget(ScreenWatchOption& option, QWid
     connect(
         draw_box, &QPushButton::clicked,
         this, [&](bool){
-            qsizetype index = (qsizetype)option.MONITOR_INDEX;
+            qsizetype index = (qsizetype)option.m_option.MONITOR_INDEX;
             auto screens = QGuiApplication::screens();
             if (screens.size() <= index){
                 return;
             }
 
-            SelectorOverlay w(option, *this, *screens[index]);
+            SelectorOverlay w(option.m_option, *this, *screens[index]);
             w.exec();
 
             ImageFloatBox box = w.get_box();
@@ -205,20 +207,20 @@ ScreenWatchButtonWidget::ScreenWatchButtonWidget(ScreenWatchOption& option, QWid
                 return;
             }
 
-            option.X.set(box.x);
-            option.Y.set(box.y);
-            option.WIDTH.set(box.width);
-            option.HEIGHT.set(box.height);
+            option.m_option.X.set(box.x);
+            option.m_option.Y.set(box.y);
+            option.m_option.WIDTH.set(box.width);
+            option.m_option.HEIGHT.set(box.height);
         }
     );
 
     connect(
         reset_button, &QPushButton::clicked,
         this, [&](bool){
-            option.X.set(0.0);
-            option.Y.set(0.0);
-            option.WIDTH.set(1.0);
-            option.HEIGHT.set(1.0);
+            option.m_option.X.set(0.0);
+            option.m_option.Y.set(0.0);
+            option.m_option.WIDTH.set(1.0);
+            option.m_option.HEIGHT.set(1.0);
         }
     );
 }
diff --git a/SerialPrograms/Source/CommonTools/Options/QtWidgets/ScreenWatchWidget.h b/SerialPrograms/Source/CommonTools/Options/QtWidgets/ScreenWatchWidget.h
new file mode 100644
index 0000000000..61055a25ed
--- /dev/null
+++ b/SerialPrograms/Source/CommonTools/Options/QtWidgets/ScreenWatchWidget.h
@@ -0,0 +1,66 @@
+/*  Screen Watch Widget
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_CommonTools_Options_ScreenWatchWidget_H
+#define PokemonAutomation_CommonTools_Options_ScreenWatchWidget_H
+
+#include <QWidget>
+#include "Common/Cpp/Concurrency/Mutex.h"
+#include "Common/Cpp/Concurrency/ConditionVariable.h"
+#include "Common/Cpp/Concurrency/AsyncTask.h"
+#include "Common/Qt/WidgetStackFixedAspectRatio.h"
+#include "Common/Qt/Options/ConfigWidget.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonFramework/VideoPipeline/UI/VideoOverlayWidget.h"
+#include "CommonTools/Options/ScreenWatchOption.h"
+
+namespace PokemonAutomation{
+
+class ScreenWatchWidget;
+
+
+class ScreenWatchDisplayWidget : public QWidget{
+public:
+    ScreenWatchDisplayWidget(ScreenWatchWidget& parent, ScreenWatchOption& option);
+    ~ScreenWatchDisplayWidget();
+    void paintEvent(QPaintEvent* event) override;
+
+private:
+    void thread_loop();
+
+private:
+    ScreenWatchWidget& m_holder;
+    ScreenWatchOption& m_option;
+    Mutex m_lock;
+    ConditionVariable m_cv;
+    bool m_stop;
+    VideoSnapshot m_last_frame;
+    AsyncTask m_updater;
+};
+
+class ScreenWatchWidget : public WidgetStackFixedAspectRatio, public ConfigWidget{
+public:
+    using ParentState = ScreenWatchDisplay;
+
+public:
+    ScreenWatchWidget(QWidget& parent, ScreenWatchDisplay& option);
+
+private:
+    QWidget* m_widget;
+    VideoOverlayWidget* m_overlay;
+};
+
+class ScreenWatchButtonWidget : public QWidget, public ConfigWidget{
+public:
+    using ParentState = ScreenWatchButtons;
+
+public:
+    ScreenWatchButtonWidget(QWidget& parent, ScreenWatchButtons& option);
+};
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonTools/Options/QtWidgets/StringSelectWidget.cpp b/SerialPrograms/Source/CommonTools/Options/QtWidgets/StringSelectWidget.cpp
new file mode 100644
index 0000000000..f64b47e7a7
--- /dev/null
+++ b/SerialPrograms/Source/CommonTools/Options/QtWidgets/StringSelectWidget.cpp
@@ -0,0 +1,187 @@
+/*  String Select
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <QHBoxLayout>
+#include <QLabel>
+#include <QCompleter>
+#include <QLineEdit>
+#include "Common/Cpp/PrettyPrint.h"
+#include "CommonFramework/Logging/Logger.h"
+#include "CommonFramework/ImageTypes/ImageRGB32_Qt.h"
+#include "StringSelectWidget.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+
+
+template class RegisterUiStateQtWidget<StringSelectCellWidget>;
+template class RegisterUiStateQtWidget<StringSelectOptionWidget>;
+
+
+
+
+StringSelectCellWidget::~StringSelectCellWidget(){
+    m_value.remove_listener(*this);
+}
+StringSelectCellWidget::StringSelectCellWidget(QWidget& parent, StringSelectCell& value)
+    : NoWheelCompactComboBox(&parent)
+    , ConfigWidget(value, *this)
+    , m_value(value)
+{
+    this->setEditable(true);
+    this->setInsertPolicy(QComboBox::NoInsert);
+    this->completer()->setCompletionMode(QCompleter::PopupCompletion);
+    this->completer()->setFilterMode(Qt::MatchContains);
+    this->setIconSize(QSize(25, 25));
+//    this->setFrame(false);
+
+    const StringSelectEntry& entry = value.entry();
+    QPixmap pixmap = QPixmap::fromImage(to_QImage_ref(entry.icon));
+    this->addItem(pixmap, QString::fromStdString(entry.display_name));
+    this->setCurrentIndex(0);
+//    this->setMinimumContentsLength((int)value.database().longest_text_length());
+
+    StringSelectCellWidget::update_value();
+
+    QPalette palette;
+    palette.setColor(QPalette::Text, QColor((uint32_t)entry.text_color));
+    this->lineEdit()->setPalette(palette);
+
+    connect(
+        this, static_cast<void(QComboBox::*)(int)>(&QComboBox::activated),
+        this, [this](int index){
+            if (index < 0){
+                m_value.restore_defaults();
+                return;
+            }
+            m_value.set_by_name(this->itemText(index).toStdString());
+//            cout << "index = " << index << endl;
+        }
+    );
+
+    value.add_listener(*this);
+}
+
+void StringSelectCellWidget::load_options(){
+//    cout << "load_options()" << endl;
+    const std::vector<StringSelectEntry>& cases = m_value.database().case_list();
+    if (this->count() <= 1){
+        global_logger_tagged().log("Loading dropdown with " + tostr_u_commas(cases.size()) + " elements.");
+        this->clear();
+        for (const StringSelectEntry& item : cases){
+            QPixmap pixmap = QPixmap::fromImage(to_QImage_ref(item.icon));
+            this->addItem(pixmap, QString::fromStdString(item.display_name));
+            if (item.text_color){
+                this->setItemData(this->count() - 1, QBrush(QColor((uint32_t)item.text_color)), Qt::ForegroundRole);
+            }
+        }
+    }
+    size_t index = m_value.index();
+    this->setCurrentIndex((int)index);
+
+    QPalette palette;
+    palette.setColor(QPalette::Text, QColor((uint32_t)cases[index].text_color));
+//    palette.setColor(QPalette::Text, Qt::red);
+    this->lineEdit()->setPalette(palette);
+
+    update_size_cache();
+}
+void StringSelectCellWidget::hide_options(){
+//    cout << "hide_options()" << endl;
+    do{
+        //  All options shown.
+        if (this->count() > 1){
+            break;
+        }
+
+        //  No valid index.
+        int ui_index = this->currentIndex();
+        if (ui_index < 0){
+            break;
+        }
+
+        //  Mismatching selection.
+        std::string name = this->itemText(ui_index).toStdString();
+        if (name != m_value.display_name()){
+            break;
+        }
+
+        return;
+    }while (false);
+
+    //  Remove all elements and add the one that is selected.
+    this->clear();
+    const StringSelectEntry& entry = m_value.entry();
+    QPixmap pixmap = QPixmap::fromImage(to_QImage_ref(entry.icon));
+    this->addItem(pixmap, QString::fromStdString(entry.display_name));
+    this->setCurrentIndex(0);
+
+    QPalette palette;
+    palette.setColor(QPalette::Text, QColor((uint32_t)entry.text_color));
+//    palette.setColor(QPalette::Text, Qt::red);
+    this->lineEdit()->setPalette(palette);
+
+}
+QSize StringSelectCellWidget::sizeHint() const{
+    QSize ret = NoWheelCompactComboBox::sizeHint();
+//    cout << ret.width() << " x " << ret.height() << endl;
+
+    double width = ret.width();
+    double height = ret.height();
+
+    width *= 1.25;
+    height *= 1.25;
+
+    return QSize((int)width, (int)height);
+}
+void StringSelectCellWidget::focusInEvent(QFocusEvent* event){
+//    cout << "focusInEvent()" << endl;
+    update_value();
+    NoWheelCompactComboBox::focusInEvent(event);
+}
+void StringSelectCellWidget::focusOutEvent(QFocusEvent* event){
+//    cout << "focusOutEvent()" << endl;
+    NoWheelCompactComboBox::focusOutEvent(event);
+//    update_value();
+}
+void StringSelectCellWidget::update_value(){
+    if (hasFocus()){
+        load_options();
+    }else{
+        hide_options();
+    }
+}
+void StringSelectCellWidget::on_config_value_changed(void* object){
+    QMetaObject::invokeMethod(this, [this]{
+        update_value();
+    }, Qt::QueuedConnection);
+}
+
+
+
+
+
+StringSelectOptionWidget::StringSelectOptionWidget(QWidget& parent, StringSelectOption& value)
+    : QWidget(&parent)
+    , ConfigWidget(value, *this)
+    , m_cell(new StringSelectCellWidget(parent, value))
+{
+    QHBoxLayout* layout = new QHBoxLayout(this);
+    layout->setContentsMargins(0, 0, 0, 0);
+    QLabel* text = new QLabel(QString::fromStdString(value.label()), this);
+    text->setWordWrap(true);
+    layout->addWidget(text, 1);
+    layout->addWidget(m_cell, 1);
+}
+
+
+
+
+
+}
diff --git a/SerialPrograms/Source/CommonTools/Options/QtWidgets/StringSelectWidget.h b/SerialPrograms/Source/CommonTools/Options/QtWidgets/StringSelectWidget.h
new file mode 100644
index 0000000000..8459cc9756
--- /dev/null
+++ b/SerialPrograms/Source/CommonTools/Options/QtWidgets/StringSelectWidget.h
@@ -0,0 +1,57 @@
+/*  String Select
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_CommonTools_Options_StringSelectWidget_H
+#define PokemonAutomation_CommonTools_Options_StringSelectWidget_H
+
+#include <QWidget>
+#include "Common/Qt/NoWheelComboBox.h"
+#include "Common/Qt/Options/ConfigWidget.h"
+#include "CommonTools/Options/StringSelectOption.h"
+
+namespace PokemonAutomation{
+
+
+class StringSelectCellWidget : public NoWheelCompactComboBox, public ConfigWidget{
+public:
+    using ParentState = StringSelectCell;
+
+public:
+    ~StringSelectCellWidget();
+    StringSelectCellWidget(QWidget& parent, StringSelectCell& value);
+
+    virtual void update_value() override;
+    virtual void on_config_value_changed(void* object) override;
+
+private:
+    void load_options();
+    void hide_options();
+
+    virtual QSize sizeHint() const override;
+    virtual void focusInEvent(QFocusEvent* event) override;
+    virtual void focusOutEvent(QFocusEvent* event) override;
+
+private:
+    StringSelectCell& m_value;
+};
+
+
+
+class StringSelectOptionWidget : public QWidget, public ConfigWidget{
+public:
+    using ParentState = StringSelectOption;
+
+public:
+    StringSelectOptionWidget(QWidget& parent, StringSelectOption& value);
+
+private:
+    StringSelectCellWidget* m_cell;
+};
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/Options/ScreenWatchOption.cpp b/SerialPrograms/Source/CommonTools/Options/ScreenWatchOption.cpp
similarity index 80%
rename from SerialPrograms/Source/CommonFramework/Options/ScreenWatchOption.cpp
rename to SerialPrograms/Source/CommonTools/Options/ScreenWatchOption.cpp
index b19ffa725e..7ec5ca95b9 100644
--- a/SerialPrograms/Source/CommonFramework/Options/ScreenWatchOption.cpp
+++ b/SerialPrograms/Source/CommonTools/Options/ScreenWatchOption.cpp
@@ -1,15 +1,16 @@
 /*  Screen Watch Option
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include <QGuiApplication>
 #include <QPixmap>
 #include <QScreen>
-#include <QWidget>
 #include <QPainter>
 #include "Common/Cpp/Containers/Pimpl.tpp"
+#include "CommonFramework/Logging/Logger.h"
+#include "CommonFramework/ImageTypes/ImageRGB32_Qt.h"
 #include "CommonFramework/VideoPipeline/VideoFeed.h"
 #include "ScreenWatchOption.h"
 
@@ -28,39 +29,42 @@ ScreenWatchOption::ScreenWatchOption(
     double default_x, double default_y,
     double default_width, double default_height
 )
-    : GroupOption(std::move(label), LockWhileRunning::UNLOCKED)
+    : GroupOption(
+        std::move(label),
+        LockMode::UNLOCK_WHILE_RUNNING
+    )
     , MONITOR_INDEX(
         "<b>Monitor Index:</b> For multi-monitor setups, this lets you choose which monitor to watch.",
-        LockWhileRunning::UNLOCKED,
+        LockMode::UNLOCK_WHILE_RUNNING,
         0
     )
     , X(
         "<b>X Coordinate:</b> The left edge of the box to watch.<br>"
         "0.0 is the left edge of the monitor. 1.0 is the right edge of the monitor.",
-        LockWhileRunning::UNLOCKED,
+        LockMode::UNLOCK_WHILE_RUNNING,
         default_x, 0.0, 1.0
     )
     , Y(
         "<b>Y Coordinate:</b> The top edge of the box to watch.<br>"
         "0.0 is the top edge of the monitor. 1.0 is the bottom edge of the monitor.",
-        LockWhileRunning::UNLOCKED,
+        LockMode::UNLOCK_WHILE_RUNNING,
         default_y, 0.0, 1.0
     )
     , WIDTH(
         "<b>Width:</b> The width of the box to watch.<br>"
         "The number is between 0 and 1 and is the proportion of the full width of the monitor.",
-        LockWhileRunning::UNLOCKED,
+        LockMode::UNLOCK_WHILE_RUNNING,
         default_width, 0.0, 1.0
     )
     , HEIGHT(
         "<b>Height:</b> The height of the box to watch.<br>"
         "The number is between 0 and 1 and is the proportion of the full height of the monitor.",
-        LockWhileRunning::UNLOCKED,
+        LockMode::UNLOCK_WHILE_RUNNING,
         default_height, 0.0, 1.0
     )
     , m_display(*this)
     , m_buttons(*this)
-    , m_overlay(m_overlay_option)
+    , m_overlay(global_logger_tagged(), m_overlay_option)
 {
     PA_ADD_OPTION(m_display);
     PA_ADD_OPTION(MONITOR_INDEX);
@@ -105,7 +109,7 @@ VideoSnapshot ScreenWatchOption::screenshot(){
     int height = (int)(size.height() * HEIGHT + 0.5);
     WallClock now = current_time();
     QPixmap pm = screen.grabWindow(0, min_x, min_y, width, height);
-    return VideoSnapshot(pm.toImage(), now);
+    return VideoSnapshot(QImage_to_ImageRGB32(pm.toImage()), now);
 }
 
 
diff --git a/SerialPrograms/Source/CommonTools/Options/ScreenWatchOption.h b/SerialPrograms/Source/CommonTools/Options/ScreenWatchOption.h
new file mode 100644
index 0000000000..12194a2a4d
--- /dev/null
+++ b/SerialPrograms/Source/CommonTools/Options/ScreenWatchOption.h
@@ -0,0 +1,79 @@
+/*  Screen Watch Option
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_CommonTools_Options_ScreenWatchOption_H
+#define PokemonAutomation_CommonTools_Options_ScreenWatchOption_H
+
+#include "Common/Cpp/Options/GroupOption.h"
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "Common/Cpp/Options/FloatingPointOption.h"
+#include "CommonFramework/VideoPipeline/VideoOverlaySession.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+
+struct VideoSnapshot;
+class ScreenWatchOption;
+
+
+class ScreenWatchDisplay : public UiState<ScreenWatchDisplay, ConfigOption>{
+public:
+    ScreenWatchDisplay(ScreenWatchOption& option)
+        : m_option(option)
+    {}
+
+    ScreenWatchOption& m_option;
+};
+class ScreenWatchButtons : public UiState<ScreenWatchButtons, ConfigOption>{
+public:
+    ScreenWatchButtons(ScreenWatchOption& option)
+        : m_option(option)
+    {}
+
+    ScreenWatchOption& m_option;
+};
+
+
+
+class ScreenWatchOption : public GroupOption{
+public:
+    ~ScreenWatchOption();
+    ScreenWatchOption(
+        std::string label,
+        double default_x = 0, double default_y = 0,
+        double default_width = 1, double default_height = 1
+    );
+
+    double aspect_ratio();
+    VideoSnapshot screenshot();
+
+    VideoOverlaySession& overlay();
+
+public:
+    SimpleIntegerOption<uint64_t> MONITOR_INDEX;
+    FloatingPointOption X;
+    FloatingPointOption Y;
+    FloatingPointOption WIDTH;
+    FloatingPointOption HEIGHT;
+
+private:
+    ScreenWatchDisplay m_display;
+    ScreenWatchButtons m_buttons;
+
+    VideoOverlayOption m_overlay_option;
+    VideoOverlaySession m_overlay;
+};
+
+
+
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonTools/Options/StringSelectOption.cpp b/SerialPrograms/Source/CommonTools/Options/StringSelectOption.cpp
new file mode 100644
index 0000000000..2f62a0c264
--- /dev/null
+++ b/SerialPrograms/Source/CommonTools/Options/StringSelectOption.cpp
@@ -0,0 +1,286 @@
+/*  String Select
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <map>
+#include <atomic>
+#include "Common/Cpp/Exceptions.h"
+#include "Common/Cpp/Containers/Pimpl.tpp"
+#include "Common/Cpp/Json/JsonValue.h"
+#include "Common/Cpp/Json/JsonArray.h"
+#include "StringSelectOption.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+
+
+struct StringSelectDatabase::Data{
+    size_t m_longest_text_length = 0;
+    std::vector<StringSelectEntry> m_list;
+    std::map<std::string, size_t> m_slug_to_entry;
+    std::map<std::string, size_t> m_display_name_to_entry;
+
+    size_t search_index_by_slug(const std::string& slug) const{
+        auto iter = m_slug_to_entry.find(slug);
+        if (iter == m_slug_to_entry.end()){
+            return (size_t)0 - 1;
+        }
+        return iter->second;
+    }
+    size_t search_index_by_name(const std::string& display_name) const{
+        auto iter = m_display_name_to_entry.find(display_name);
+        if (iter == m_display_name_to_entry.end()){
+            return (size_t)0 - 1;
+        }
+        return iter->second;
+    }
+    void add_entry(StringSelectEntry entry){
+        size_t index = m_list.size();
+        StringSelectEntry& item = m_list.emplace_back(std::move(entry));
+
+        std::map<std::string, size_t>::const_iterator iter0 = m_slug_to_entry.end();
+        std::map<std::string, size_t>::const_iterator iter1 = m_display_name_to_entry.end();
+
+        try{
+            auto ret0 = m_slug_to_entry.emplace(item.slug, index);
+            if (ret0.second){
+                iter0 = ret0.first;
+            }else{
+                throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Duplicate Slug: " + item.slug);
+            }
+            auto ret1 = m_display_name_to_entry.emplace(item.display_name, index);
+            if (ret1.second){
+                iter1 = ret1.first;
+            }else{
+                throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Duplicate Display Name: " + item.display_name);
+            }
+        }catch (...){
+            m_list.pop_back();
+            if (iter0 != m_slug_to_entry.end()){
+                m_slug_to_entry.erase(iter0);
+            }
+            if (iter1 != m_display_name_to_entry.end()){
+                m_slug_to_entry.erase(iter1);
+            }
+            throw;
+        }
+
+        m_longest_text_length = std::max(m_longest_text_length, item.display_name.size());
+    }
+    size_t size() const { return m_list.size(); }
+};
+
+
+
+StringSelectDatabase::~StringSelectDatabase() = default;
+StringSelectDatabase::StringSelectDatabase(StringSelectDatabase&&) = default;
+StringSelectDatabase& StringSelectDatabase::operator=(StringSelectDatabase&&) = default;
+StringSelectDatabase::StringSelectDatabase(const StringSelectDatabase&) = default;
+StringSelectDatabase& StringSelectDatabase::operator=(const StringSelectDatabase&) = default;
+StringSelectDatabase::StringSelectDatabase()
+    : m_data(CONSTRUCT_TOKEN)
+{}
+
+size_t StringSelectDatabase::longest_text_length() const{
+    return m_data->m_longest_text_length;
+}
+const std::vector<StringSelectEntry>& StringSelectDatabase::case_list() const{
+    return m_data->m_list;
+}
+const StringSelectEntry& StringSelectDatabase::operator[](size_t index) const{
+    return m_data->m_list[index];
+}
+size_t StringSelectDatabase::search_index_by_slug(const std::string& slug) const{
+    return m_data->search_index_by_slug(slug);
+}
+size_t StringSelectDatabase::search_index_by_name(const std::string& display_name) const{
+    return m_data->search_index_by_name(display_name);
+}
+void StringSelectDatabase::add_entry(StringSelectEntry entry){
+    m_data->add_entry(std::move(entry));
+}
+size_t StringSelectDatabase::size() const{
+    return m_data->size();
+}
+
+StringSelectDatabase create_string_select_database(const std::vector<std::string>& slugs){
+    StringSelectDatabase database;
+    for (const std::string& slug : slugs){
+        // slug name is also the display name
+        database.add_entry(StringSelectEntry(slug, slug));
+    }
+    return database;
+}
+
+bool load_json_to_string_select_database(const JsonValue& json, StringSelectDatabase& database){
+    const JsonArray* json_array = json.to_array();
+    std::vector<std::string> slugs;
+    if (json_array == nullptr){
+        return false;
+    }
+    for (const JsonValue& element : *json_array){
+        const std::string* str = element.to_string();
+        if (str == nullptr){
+            return false;
+        }
+        slugs.push_back(*str);
+    }
+    database = create_string_select_database(slugs);
+    return true;
+}
+
+
+
+
+struct StringSelectCell::Data{
+    const StringSelectDatabase& m_database;
+    const size_t m_default;
+    std::atomic<size_t> m_index;
+
+    Data(const StringSelectDatabase& database, size_t default_index)
+        : m_database(database)
+        , m_default(default_index)
+        , m_index(default_index)
+    {
+        if (default_index >= database.case_list().size()){
+            throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Invalid Default Index: " + std::to_string(default_index));
+        }
+    }
+    Data(const StringSelectDatabase& database, const std::string& default_slug)
+        : m_database(database)
+        , m_default(default_slug == "" ? 0 : database.search_index_by_slug(default_slug))
+        , m_index(m_default)
+    {
+        if (m_default == (size_t)0 - 1){
+            throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Invalid Default Slug: " + default_slug);
+        }
+    }
+
+    bool load_json(const JsonValue& json){
+        const std::string* str = json.to_string();
+        if (str == nullptr){
+            return false;
+        }
+        size_t index = m_database.search_index_by_slug(*str);
+        if (index == (size_t)0 - 1){
+            return false;
+        }
+        m_index.store(index, std::memory_order_relaxed);
+        return true;
+    }
+    JsonValue to_json() const{
+        return m_database.case_list()[m_index.load(std::memory_order_relaxed)].slug;
+    }
+    void restore_defaults(){
+        m_index.store(m_default, std::memory_order_relaxed);
+    }
+};
+
+
+
+
+
+StringSelectCell::~StringSelectCell() = default;
+
+
+StringSelectCell::StringSelectCell(
+    const StringSelectDatabase& database,
+    LockMode lock_while_running,
+    size_t default_index
+)
+    : UiState<StringSelectCell, ConfigOption>(lock_while_running)
+    , m_data(CONSTRUCT_TOKEN, database, default_index)
+{}
+StringSelectCell::StringSelectCell(
+    const StringSelectDatabase& database,
+    LockMode lock_while_running,
+    const std::string& default_slug
+)
+    : UiState<StringSelectCell, ConfigOption>(lock_while_running)
+    , m_data(CONSTRUCT_TOKEN, database, default_slug)
+{}
+
+
+size_t StringSelectCell::default_index() const{
+    return m_data->m_default;
+}
+const std::string& StringSelectCell::default_slug() const{
+    return m_data->m_database.case_list()[m_data->m_default].slug;
+}
+
+size_t StringSelectCell::index() const{
+    return m_data->m_index.load(std::memory_order_relaxed);
+}
+
+void StringSelectCell::set_by_index(size_t index){
+    if (index >= m_data->m_database.case_list().size()){
+        index = m_data->m_default;
+    }
+    if (index != m_data->m_index.exchange(index, std::memory_order_relaxed)){
+        report_value_changed(this);
+    }
+}
+std::string StringSelectCell::set_by_slug(const std::string& slug){
+    size_t index = m_data->m_database.search_index_by_slug(slug);
+    if (index == (size_t)0 - 1){
+        return "Invalid Slug: " + slug;
+    }
+    if (index != m_data->m_index.exchange(index, std::memory_order_relaxed)){
+        report_value_changed(this);
+    }
+    return "";
+}
+std::string StringSelectCell::set_by_name(const std::string& display_name){
+    size_t index = m_data->m_database.search_index_by_name(display_name);
+    if (index == (size_t)0 - 1){
+        return "Invalid Name: " + display_name;
+    }
+    if (index != m_data->m_index.exchange(index, std::memory_order_relaxed)){
+        report_value_changed(this);
+    }
+    return "";
+}
+
+const StringSelectDatabase& StringSelectCell::database() const{
+    return m_data->m_database;
+}
+
+void StringSelectCell::restore_defaults(){
+    m_data->restore_defaults();
+    report_value_changed(this);
+}
+JsonValue StringSelectCell::to_json() const{
+    return m_data->to_json();
+}
+void StringSelectCell::load_json(const JsonValue& json){
+    if (m_data->load_json(json)){
+        report_value_changed(this);
+    }
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}
diff --git a/SerialPrograms/Source/CommonTools/Options/StringSelectOption.h b/SerialPrograms/Source/CommonTools/Options/StringSelectOption.h
new file mode 100644
index 0000000000..600480f48f
--- /dev/null
+++ b/SerialPrograms/Source/CommonTools/Options/StringSelectOption.h
@@ -0,0 +1,178 @@
+/*  String Select
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_CommonTools_Options_StringSelectOption_H
+#define PokemonAutomation_CommonTools_Options_StringSelectOption_H
+
+#include <vector>
+#include "Common/Cpp/Color.h"
+#include "Common/Cpp/Containers/Pimpl.h"
+#include "Common/Cpp/Options/ConfigOption.h"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+
+namespace PokemonAutomation{
+
+class JsonValue;
+
+
+
+struct StringSelectEntry{
+    std::string slug;
+    std::string display_name;
+    ImageViewRGB32 icon;
+    Color text_color;
+
+    StringSelectEntry(
+        std::string p_slug,
+        std::string p_display_name,
+        ImageViewRGB32 p_icon = ImageViewRGB32(),
+        Color p_text_color = Color()
+    )
+        : slug(std::move(p_slug))
+        , display_name(std::move(p_display_name))
+        , icon(std::move(p_icon))
+        , text_color(p_text_color)
+    {}
+};
+
+
+
+class StringSelectDatabase{
+public:
+    ~StringSelectDatabase();
+    StringSelectDatabase(StringSelectDatabase&&);
+    StringSelectDatabase& operator=(StringSelectDatabase&&);
+    StringSelectDatabase(const StringSelectDatabase&);
+    StringSelectDatabase& operator=(const StringSelectDatabase&);
+
+public:
+    StringSelectDatabase();
+    void add_entry(StringSelectEntry entry);
+    size_t size() const;
+
+public:
+    const std::vector<StringSelectEntry>& case_list() const;
+    size_t longest_text_length() const;
+
+    const StringSelectEntry& operator[](size_t index) const;
+    // if not found, return SIZE_MAX
+    size_t search_index_by_slug(const std::string& slug) const;
+    // if not found, return SIZE_MAX
+    size_t search_index_by_name(const std::string& display_name) const;
+
+private:
+    struct Data;
+    Pimpl<Data> m_data;
+};
+
+// Create a simple StringSelectDatabase from a list of slugs.
+// The display names of each entry will be the same as their slugs.
+StringSelectDatabase create_string_select_database(const std::vector<std::string>& slugs);
+// Load a simple list of JSON strings to a StringSelectDatabase.
+// Previous content of the StringSelectDatabase is removed if loading is successful.
+// The display names of each loaded entry will be the same as their slugs.
+// Return whether we successfully loaded from the JSON. If loading failed, the initial content
+// of the database is not removed.
+bool load_json_to_string_select_database(const JsonValue& json, StringSelectDatabase& database);
+
+//  Config option that creates a cell where users can select a string from
+//  its dropdown menu. It is best to put this cell in a table widget.
+class StringSelectCell : public UiState<StringSelectCell, ConfigOption>{
+public:
+    ~StringSelectCell();
+    StringSelectCell(const StringSelectCell&) = delete;
+    void operator=(const StringSelectCell&) = delete;
+
+public:
+    StringSelectCell(
+        const StringSelectDatabase& database,
+        LockMode lock_while_running,
+        size_t default_index
+    );
+    StringSelectCell(
+        const StringSelectDatabase& database,
+        LockMode lock_while_running,
+        const std::string& default_slug
+    );
+
+    size_t default_index() const;
+    const std::string& default_slug() const;
+
+    size_t index() const;
+    const std::string& slug() const{
+        return entry().slug;
+    }
+    const std::string& display_name() const{
+        return entry().display_name;
+    }
+    const StringSelectEntry& entry() const{
+        return database()[index()];
+    }
+
+    void set_by_index(size_t index);
+    std::string set_by_slug(const std::string& slug);
+    std::string set_by_name(const std::string& display_name);
+
+    const StringSelectDatabase& database() const;
+
+
+public:
+    virtual void restore_defaults() override;
+    virtual JsonValue to_json() const override;
+    virtual void load_json(const JsonValue& json) override;
+
+
+private:
+    struct Data;
+    Pimpl<Data> m_data;
+};
+
+
+//  Config option that creates a dropdown menu for users to select
+//  a sring. Different from StringSelectCell which is typically used 
+//  in a table, StringSelectOption is considered a standalone option
+//  that comes with its own label.
+class StringSelectOption : public UiState<StringSelectOption, StringSelectCell>{
+public:
+    StringSelectOption(
+        std::string label,
+        const StringSelectDatabase& database,
+        LockMode lock_while_running,
+        size_t default_index
+    )
+        : UiState<StringSelectOption, StringSelectCell>(
+            database,
+            lock_while_running,
+            default_index
+        )
+        , m_label(std::move(label))
+    {}
+    StringSelectOption(
+        std::string label,
+        const StringSelectDatabase& database,
+        LockMode lock_while_running,
+        const std::string& default_slug
+    )
+        : UiState<StringSelectOption, StringSelectCell>(
+            database,
+            lock_while_running,
+            default_slug
+        )
+        , m_label(std::move(label))
+    {}
+
+    const std::string& label() const{ return m_label; }
+
+private:
+    std::string m_label;
+};
+
+
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonTools/Options/StringSelectTableOption.h b/SerialPrograms/Source/CommonTools/Options/StringSelectTableOption.h
new file mode 100644
index 0000000000..8363afad12
--- /dev/null
+++ b/SerialPrograms/Source/CommonTools/Options/StringSelectTableOption.h
@@ -0,0 +1,76 @@
+/*  String Select Table
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *      A simple editable table of StringSelect options.
+ *
+ */
+
+#ifndef PokemonAutomation_CommonTools_Options_StringSelectTableOption_H
+#define PokemonAutomation_CommonTools_Options_StringSelectTableOption_H
+
+#include "Common/Cpp/Options/EditableTableOption.h"
+#include "StringSelectOption.h"
+
+namespace PokemonAutomation{
+
+
+class StringSelectTableRow : public EditableTableRow{
+public:
+    StringSelectTableRow(
+        EditableTableOption& parent_table,
+        const StringSelectDatabase& database, const std::string& default_slug
+    )
+        : EditableTableRow(parent_table)
+        , cell(database, LockMode::LOCK_WHILE_RUNNING, default_slug)
+    {
+        PA_ADD_OPTION(cell);
+    }
+    virtual std::unique_ptr<EditableTableRow> clone() const{
+        std::unique_ptr<StringSelectTableRow> ret(new StringSelectTableRow(parent(), cell.database(), cell.default_slug()));
+        ret->cell.set_by_index(cell.index());
+        return ret;
+    }
+
+public:
+    StringSelectCell cell;
+};
+
+
+class StringSelectTableOption : public EditableTableOption{
+public:
+    StringSelectTableOption(
+        std::string label,
+        std::string header, const StringSelectDatabase& database, std::string default_slug
+    )
+        : EditableTableOption(std::move(label), LockMode::LOCK_WHILE_RUNNING)
+        , m_header(std::move(header))
+        , m_database(database)
+        , m_default_slug(std::move(default_slug))
+    {}
+
+    std::vector<std::string> all_slugs() const{
+        std::vector<std::string> slugs;
+        for (const auto& item : copy_snapshot<StringSelectTableRow>()){
+            slugs.emplace_back(item->cell.slug());
+        }
+        return slugs;
+    }
+
+    virtual std::vector<std::string> make_header() const{
+        return {m_header};
+    }
+    virtual std::unique_ptr<EditableTableRow> make_row(){
+        return std::make_unique<StringSelectTableRow>(*this, m_database, m_default_slug);
+    }
+
+private:
+    const std::string m_header;
+    const StringSelectDatabase& m_database;
+    const std::string m_default_slug;
+};
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/Options/TrainOCRModeOption.h b/SerialPrograms/Source/CommonTools/Options/TrainOCRModeOption.h
similarity index 77%
rename from SerialPrograms/Source/CommonFramework/Options/TrainOCRModeOption.h
rename to SerialPrograms/Source/CommonTools/Options/TrainOCRModeOption.h
index d9670e45a0..17294fe038 100644
--- a/SerialPrograms/Source/CommonFramework/Options/TrainOCRModeOption.h
+++ b/SerialPrograms/Source/CommonTools/Options/TrainOCRModeOption.h
@@ -1,11 +1,11 @@
 /*  Train OCR Mode Option
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#ifndef PokemonAutomation_Options_TrainOCRModeOption_H
-#define PokemonAutomation_Options_TrainOCRModeOption_H
+#ifndef PokemonAutomation_CommonTools_Options_TrainOCRModeOption_H
+#define PokemonAutomation_CommonTools_Options_TrainOCRModeOption_H
 
 #include "Common/Cpp/Options/EnumDropdownOption.h"
 
@@ -27,7 +27,7 @@ class TrainOCRModeOption : public EnumDropdownOption<TrainOCRMode>{
                 {TrainOCRMode::START_FRESH,         "start-fresh",  "Start Fresh: Use only baseline strings. (1st candidate of each entry in above path)"},
                 {TrainOCRMode::INCREMENTAL,         "incremental",  "Incremental: Build off of the existing training data in the above path."},
             },
-            LockWhileRunning::LOCKED,
+            LockMode::LOCK_WHILE_RUNNING,
             TrainOCRMode::GENERATE_BASELINE
         )
     {}
diff --git a/SerialPrograms/Source/CommonTools/Random.cpp b/SerialPrograms/Source/CommonTools/Random.cpp
new file mode 100644
index 0000000000..b96e43ce3c
--- /dev/null
+++ b/SerialPrograms/Source/CommonTools/Random.cpp
@@ -0,0 +1,53 @@
+/*  Randomization
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <chrono>
+#include "Common/Cpp/Exceptions.h"
+#include "Common/CRC32/pabb_CRC32.h"
+#include "Random.h"
+
+namespace PokemonAutomation{
+
+
+
+uint32_t random_u32(){
+    uint64_t seed = std::chrono::high_resolution_clock::now().time_since_epoch().count();
+    uint32_t crc = 0;
+    pabb_crc32c_buffer(&crc, &seed, sizeof(seed));
+    return crc;
+}
+uint32_t random_u32(uint32_t min, uint32_t max){
+    if (min > max){
+        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Invalid random_u32() range.");
+    }
+
+    max++;
+    uint32_t diff = max - min;
+
+    //  Full range
+    if (diff == 0){
+        return random_u32();
+    }
+
+    //  Power-of-two
+    if ((diff & (diff - 1)) == 0){
+        return (random_u32() & (diff - 1)) + min;
+    }
+
+    uint32_t quo = 0xffffffff / diff;
+    uint32_t retry_threshold = quo + diff;
+
+    while (true){
+        uint32_t u32 = random_u32();
+        if (u32 < retry_threshold){
+            return u32 % diff + min;
+        }
+    }
+}
+
+
+
+}
diff --git a/SerialPrograms/Source/CommonTools/Random.h b/SerialPrograms/Source/CommonTools/Random.h
new file mode 100644
index 0000000000..f482f48a80
--- /dev/null
+++ b/SerialPrograms/Source/CommonTools/Random.h
@@ -0,0 +1,22 @@
+/*  Randomization
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Randomization_H
+#define PokemonAutomation_Randomization_H
+
+#include <stdint.h>
+
+namespace PokemonAutomation{
+
+
+
+uint32_t random_u32();
+uint32_t random_u32(uint32_t min, uint32_t max);
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/Resources/SpriteDatabase.cpp b/SerialPrograms/Source/CommonTools/Resources/SpriteDatabase.cpp
similarity index 84%
rename from SerialPrograms/Source/CommonFramework/Resources/SpriteDatabase.cpp
rename to SerialPrograms/Source/CommonTools/Resources/SpriteDatabase.cpp
index f0c7ed4664..9a615e8b4c 100644
--- a/SerialPrograms/Source/CommonFramework/Resources/SpriteDatabase.cpp
+++ b/SerialPrograms/Source/CommonTools/Resources/SpriteDatabase.cpp
@@ -1,14 +1,14 @@
 /*  Sprite Composite Image
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include "Common/Cpp/Json/JsonValue.h"
 #include "Common/Cpp/Json/JsonObject.h"
-#include "CommonFramework/Globals.h"
+#include "CommonFramework/GlobalAutoPaths.h"
 #include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "CommonFramework/ImageMatch/ImageCropper.h"
+#include "CommonTools/ImageMatch/ImageCropper.h"
 #include "SpriteDatabase.h"
 
 namespace PokemonAutomation{
@@ -20,7 +20,7 @@ SpriteDatabase::SpriteDatabase(const char* sprite_path, const char* json_path)
 {
     std::string path = RESOURCE_PATH() + json_path;
     JsonValue json = load_json_file(path);
-    JsonObject& root = json.get_object_throw(path);
+    JsonObject& root = json.to_object_throw(path);
 
     int64_t width = root.get_integer_throw("spriteWidth", path);
     int64_t height = root.get_integer_throw("spriteHeight", path);
@@ -34,7 +34,7 @@ SpriteDatabase::SpriteDatabase(const char* sprite_path, const char* json_path)
     JsonObject& locations = root.get_object_throw("spriteLocations", path);
     for (auto& item : locations){
         const std::string& slug = item.first;
-        JsonObject& obj = item.second.get_object_throw(path);
+        JsonObject& obj = item.second.to_object_throw(path);
         int y = (int)obj.get_integer_throw("top", path);
         int x = (int)obj.get_integer_throw("left", path);
 
diff --git a/SerialPrograms/Source/CommonFramework/Resources/SpriteDatabase.h b/SerialPrograms/Source/CommonTools/Resources/SpriteDatabase.h
similarity index 84%
rename from SerialPrograms/Source/CommonFramework/Resources/SpriteDatabase.h
rename to SerialPrograms/Source/CommonTools/Resources/SpriteDatabase.h
index 5b8cdd73dd..3136ffd6ec 100644
--- a/SerialPrograms/Source/CommonFramework/Resources/SpriteDatabase.h
+++ b/SerialPrograms/Source/CommonTools/Resources/SpriteDatabase.h
@@ -1,11 +1,11 @@
 /*  Sprite Composite Image
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#ifndef PokemonAutomation_Resources_SpriteCompositeImage_H
-#define PokemonAutomation_Resources_SpriteCompositeImage_H
+#ifndef PokemonAutomation_CommonTools_Resources_SpriteCompositeImage_H
+#define PokemonAutomation_CommonTools_Resources_SpriteCompositeImage_H
 
 #include <map>
 #include "CommonFramework/ImageTypes/ImageRGB32.h"
@@ -42,10 +42,6 @@ class SpriteDatabase{
     const Sprite& get_throw(const std::string& slug) const;
     const Sprite* get_nothrow(const std::string& slug) const;
 
-    const std::map<std::string, Sprite>& get() const{
-        return m_database;
-    }
-
 public:
     using const_iterator = std::map<std::string, Sprite>::const_iterator;
     using       iterator = std::map<std::string, Sprite>::iterator;
diff --git a/SerialPrograms/Source/CommonTools/StartupChecks/StartProgramChecks.cpp b/SerialPrograms/Source/CommonTools/StartupChecks/StartProgramChecks.cpp
new file mode 100644
index 0000000000..548adeeab2
--- /dev/null
+++ b/SerialPrograms/Source/CommonTools/StartupChecks/StartProgramChecks.cpp
@@ -0,0 +1,71 @@
+/*  Start Program Checks
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Exceptions.h"
+//#include "CommonFramework/ImageTypes/ImageRGB32.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonFramework/Tools/VideoStream.h"
+#include "CommonTools/VisualDetectors/BlackBorderDetector.h"
+#include "Controllers/ControllerTypes.h"
+#include "Controllers/Controller.h"
+#include "StartProgramChecks.h"
+
+namespace PokemonAutomation{
+namespace StartProgramChecks{
+
+
+void check_feedback(VideoStream& stream, FeedbackType feedback){
+    if (feedback == FeedbackType::NONE){
+        return;
+    }
+    VideoSnapshot screen = stream.video().snapshot();
+    if (screen){
+        return;
+    }
+    if (feedback == FeedbackType::REQUIRED || feedback == FeedbackType::VIDEO_AUDIO){
+        throw UserSetupError(
+            stream.logger(),
+            "This program requires video feedback. Please make sure the video is working."
+        );
+    }
+}
+
+void check_border(VideoStream& stream){
+    BlackBorderDetector detector;
+    VideoOverlaySet set(stream.overlay());
+    detector.make_overlays(set);
+    VideoSnapshot screen = stream.video().snapshot();
+    if (!detector.detect(screen)){
+        return;
+    }
+    throw UserSetupError(
+        stream.logger(),
+        "Black border detected! Please set your screen size to 100% in the TV Settings on your Nintendo Switch."
+    );
+}
+
+
+
+void check_performance_class_wired_or_wireless(AbstractController& controller){
+    switch (controller.performance_class()){
+    case ControllerPerformanceClass::SerialPABotBase_Wired:
+    case ControllerPerformanceClass::SerialPABotBase_Wireless:
+        return;
+    default:
+        throw UserSetupError(
+            controller.logger(),
+            "Incompatible Controller:\n\n"
+            "This program requires a controller with performance class \"Wired\" or \"Wireless\".\n\n"
+            "If you are using sys-botbase 2, please upgrade to sys-botbase 3."
+        );
+    }
+}
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/CommonTools/StartupChecks/StartProgramChecks.h b/SerialPrograms/Source/CommonTools/StartupChecks/StartProgramChecks.h
new file mode 100644
index 0000000000..7e70d92953
--- /dev/null
+++ b/SerialPrograms/Source/CommonTools/StartupChecks/StartProgramChecks.h
@@ -0,0 +1,30 @@
+/*  Start Program Checks
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_CommonTools_StartProgramChecks_H
+#define PokemonAutomation_CommonTools_StartProgramChecks_H
+
+//#include <set>
+#include "CommonFramework/Globals.h"
+
+namespace PokemonAutomation{
+    class Logger;
+    class VideoStream;
+    class AbstractController;
+namespace StartProgramChecks{
+
+
+
+void check_feedback(VideoStream& stream, FeedbackType feedback);
+void check_border(VideoStream& stream);
+
+void check_performance_class_wired_or_wireless(AbstractController& controller);
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/CommonTools/StartupChecks/VideoResolutionCheck.cpp b/SerialPrograms/Source/CommonTools/StartupChecks/VideoResolutionCheck.cpp
new file mode 100644
index 0000000000..cb01c5ee7e
--- /dev/null
+++ b/SerialPrograms/Source/CommonTools/StartupChecks/VideoResolutionCheck.cpp
@@ -0,0 +1,49 @@
+/*  Video Resolution Check
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Exceptions.h"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "VideoResolutionCheck.h"
+
+namespace PokemonAutomation{
+
+
+void assert_16_9_720p_min(Logger& logger, const ImageViewRGB32& frame){
+    if (!frame){
+        throw UserSetupError(logger, "No video detected.");
+    }
+    if (frame.height() < 720){
+        throw UserSetupError(logger, "Video resolution must be at least 720p.");
+    }
+    double aspect_ratio = (double)frame.width() / frame.height();
+    if (aspect_ratio < 1.77 || aspect_ratio > 1.78){
+        throw UserSetupError(logger, "Video aspect ratio must be 16:9.");
+    }
+}
+void assert_16_9_720p_min(Logger& logger, VideoFeed& video){
+    assert_16_9_720p_min(logger, video.snapshot());
+}
+
+void assert_16_9_1080p_min(Logger& logger, const ImageViewRGB32& frame){
+    if (!frame){
+        throw UserSetupError(logger, "No video detected.");
+    }
+    if (frame.height() < 1080){
+        throw UserSetupError(logger, "Video resolution must be at least 1080p.");
+    }
+    double aspect_ratio = (double)frame.width() / frame.height();
+    if (aspect_ratio < 1.77 || aspect_ratio > 1.78){
+        throw UserSetupError(logger, "Video aspect ratio must be 16:9.");
+    }
+}
+void assert_16_9_1080p_min(Logger& logger, VideoFeed& video){
+    assert_16_9_1080p_min(logger, video.snapshot());
+}
+
+
+
+}
diff --git a/SerialPrograms/Source/CommonTools/StartupChecks/VideoResolutionCheck.h b/SerialPrograms/Source/CommonTools/StartupChecks/VideoResolutionCheck.h
new file mode 100644
index 0000000000..edf898e525
--- /dev/null
+++ b/SerialPrograms/Source/CommonTools/StartupChecks/VideoResolutionCheck.h
@@ -0,0 +1,26 @@
+/*  Video Resolution Check
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_CommonTools_VideoResolutionCheck_H
+#define PokemonAutomation_CommonTools_VideoResolutionCheck_H
+
+namespace PokemonAutomation{
+
+class Logger;
+class ImageViewRGB32;
+class VideoFeed;
+
+
+void assert_16_9_720p_min(Logger& logger, const ImageViewRGB32& frame);
+void assert_16_9_720p_min(Logger& logger, VideoFeed& video);
+
+void assert_16_9_1080p_min(Logger& logger, const ImageViewRGB32& frame);
+void assert_16_9_1080p_min(Logger& logger, VideoFeed& video);
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/Inference/AnomalyDetector.cpp b/SerialPrograms/Source/CommonTools/TrendInference/AnomalyDetector.cpp
similarity index 95%
rename from SerialPrograms/Source/CommonFramework/Inference/AnomalyDetector.cpp
rename to SerialPrograms/Source/CommonTools/TrendInference/AnomalyDetector.cpp
index ef50c89690..5a3f17828f 100644
--- a/SerialPrograms/Source/CommonFramework/Inference/AnomalyDetector.cpp
+++ b/SerialPrograms/Source/CommonTools/TrendInference/AnomalyDetector.cpp
@@ -1,6 +1,6 @@
 /*  Differential Anomaly Detector_H
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/CommonFramework/Inference/AnomalyDetector.h b/SerialPrograms/Source/CommonTools/TrendInference/AnomalyDetector.h
similarity index 81%
rename from SerialPrograms/Source/CommonFramework/Inference/AnomalyDetector.h
rename to SerialPrograms/Source/CommonTools/TrendInference/AnomalyDetector.h
index ed1fa941f9..f631c1481b 100644
--- a/SerialPrograms/Source/CommonFramework/Inference/AnomalyDetector.h
+++ b/SerialPrograms/Source/CommonTools/TrendInference/AnomalyDetector.h
@@ -1,11 +1,11 @@
 /*  Differential Anomaly Detector
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#ifndef PokemonAutomation_CommonFramework_DifferentialAnomalyDetector_H
-#define PokemonAutomation_CommonFramework_DifferentialAnomalyDetector_H
+#ifndef PokemonAutomation_CommonTools_DifferentialAnomalyDetector_H
+#define PokemonAutomation_CommonTools_DifferentialAnomalyDetector_H
 
 #include <deque>
 #include "Common/Cpp/Time.h"
diff --git a/SerialPrograms/Source/CommonFramework/Inference/TimeWindowStatTracker.h b/SerialPrograms/Source/CommonTools/TrendInference/TimeWindowStatTracker.h
similarity index 91%
rename from SerialPrograms/Source/CommonFramework/Inference/TimeWindowStatTracker.h
rename to SerialPrograms/Source/CommonTools/TrendInference/TimeWindowStatTracker.h
index 3c0848962e..a7fe560a39 100644
--- a/SerialPrograms/Source/CommonFramework/Inference/TimeWindowStatTracker.h
+++ b/SerialPrograms/Source/CommonTools/TrendInference/TimeWindowStatTracker.h
@@ -1,11 +1,11 @@
 /*  Time Window Stat Tracker
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#ifndef PokemonAutomation_CommonFramework_TimeWindowStatTracker_H
-#define PokemonAutomation_CommonFramework_TimeWindowStatTracker_H
+#ifndef PokemonAutomation_CommonTools_TimeWindowStatTracker_H
+#define PokemonAutomation_CommonTools_TimeWindowStatTracker_H
 
 #include <chrono>
 #include <map>
diff --git a/SerialPrograms/Source/CommonTools/VisualDetector.h b/SerialPrograms/Source/CommonTools/VisualDetector.h
new file mode 100644
index 0000000000..66dbc2c2cf
--- /dev/null
+++ b/SerialPrograms/Source/CommonTools/VisualDetector.h
@@ -0,0 +1,179 @@
+/*  Visual Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_CommonTools_VisualDetector_H
+#define PokemonAutomation_CommonTools_VisualDetector_H
+
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+
+namespace PokemonAutomation{
+
+class ImageViewRGB32;
+class VideoOverlaySet;
+
+
+// An abstract base class for per-frame (aka per-image) detector
+class StaticScreenDetector{
+public:
+    virtual ~StaticScreenDetector() = default;
+    virtual void make_overlays(VideoOverlaySet& items) const = 0;
+
+    //  This is not const so that detectors can save/cache state.
+    virtual bool detect(const ImageViewRGB32& screen) = 0;
+    //  Called this to lock in the detected state in the detector, if
+    //  needed. Leave this function empty if you don't wish the derived
+    //  class to "remember" past detection.
+    virtual void commit_state(){}
+    //  Reset the locked state so the detector is ready to work on a
+    //  new detection task.
+    //  If you implement some lock-in/memory mechanism in `commit_state()`,
+    //  implement this function to unlock/forget.
+    virtual void reset_state(){}
+};
+
+
+
+//  Wrap a detector into a finder.
+//  This one requires the detector to return the same result consecutively for X time
+//  before returning true from process_frame().
+template <typename Detector>
+class DetectorToFinder : public Detector, public VisualInferenceCallback{
+public:
+    //  Whether a finder is to find an object is detected by the detector or find
+    //  that it's no longer detected.
+    enum class FinderType{
+        PRESENT,    //  process_frame() returns true only when detected consecutively
+        GONE,       //  process_frame() returns true only when not detected consecutively
+        CONSISTENT, //  process_frame() returns true when detected consecutively or not detected consecutively
+    };
+
+    DetectorToFinder(
+        std::string label,
+        std::chrono::milliseconds duration
+    )
+        : Detector()
+        , VisualInferenceCallback(std::move(label))
+        , m_duration(duration)
+        , m_finder_type(FinderType::PRESENT)
+    {}
+    
+
+    template <class... Args>
+    DetectorToFinder(
+        std::string label,
+        std::chrono::milliseconds duration,
+        Args&&... args
+    )
+        : Detector(std::forward<Args>(args)...)
+        , VisualInferenceCallback(std::move(label))
+        , m_duration(duration)
+        , m_finder_type(FinderType::PRESENT)
+    {}
+
+    
+    template <class... Args>
+    DetectorToFinder(
+        std::string label,
+        FinderType finder_type,
+        std::chrono::milliseconds duration,
+        Args&&... args
+    )
+        : Detector(std::forward<Args>(args)...)
+        , VisualInferenceCallback(std::move(label))
+        , m_duration(duration)
+        , m_finder_type(finder_type)
+    {}
+
+    virtual void make_overlays(VideoOverlaySet& items) const override{
+        Detector::make_overlays(items);
+    }
+
+    // Pull the two overloaded functions of process_frame() from base class VisualInferenceCallback
+    // So that the user of `DetectorToFinder()` can use process_frame(const VideoSnapshot& frame) along
+    // side process_frame(const ImageViewRGB32& frame, WallClock timestamp) overridden below.
+    // If we don't have this declaration, user of DetectorToFinder can only see the single overridden
+    // `process_frame()` defined below.
+    using VisualInferenceCallback::process_frame;
+
+    //  If m_finder_type is PRESENT, return true only when it is consecutively detected for the duration.
+    //  If m_finder_type is GONE, return true only when it is consecutively not detected for the duration.
+    //  If m_finder_type is CONSISTENT, return true when it is consecutively detected, or consecutively not detected
+    //    for the duration.
+    //  Before returning True, this->commit_state() is called to lock-in the detection result if lock-in mechanism
+    //    is implemented.
+    virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override{
+        switch (m_finder_type){
+        case FinderType::PRESENT:
+        case FinderType::GONE:
+            if (this->detect(frame) == (m_finder_type == FinderType::GONE)){
+                m_start_of_detection = WallClock::min();
+                return false;
+            }
+            if (m_start_of_detection == WallClock::min()){
+                m_start_of_detection = timestamp;
+            }
+
+            if (timestamp - m_start_of_detection >= m_duration){
+                this->commit_state();
+                return true;
+            }else{
+                return false;
+            }
+        case FinderType::CONSISTENT:{
+            const bool result = this->detect(frame);
+            const bool result_changed = (result && m_last_detected < 0) || (!result && m_last_detected > 0);
+
+            m_last_detected = (result ? 1 : -1);
+
+            if (result_changed){
+                m_start_of_detection = WallClock::min();
+                return false;
+            }
+            if (m_start_of_detection == WallClock::min()){
+                m_start_of_detection = timestamp;
+            }
+
+            const bool enough_time = timestamp - m_start_of_detection >= m_duration;
+            if (enough_time){
+                m_consistent_result = m_last_detected > 0;
+                this->commit_state();
+                return true;
+            }
+            
+            return false;
+        }
+        default:;
+        }
+        return false;
+    }
+
+    //  If m_finder_type is CONSISTENT and process_frame() returns true,
+    //  whether it is consecutively detected , or consecutively not detected.
+    bool consistent_result() const { return m_consistent_result; }
+
+    //  Reset internal state so the finder is ready for next round of detection.
+    //  If there is some kind of "lock-in" mechanism to lock the detection result during
+    //  `process_frame()`, this function should unlock it.
+    virtual void reset_state() override {
+        Detector::reset_state();
+        m_start_of_detection = WallClock::min();
+        m_last_detected = 0;
+        m_consistent_result = false;
+    }
+
+private:
+    std::chrono::milliseconds m_duration;  // duration of frames to decide detection outcome
+    FinderType m_finder_type;
+    WallClock m_start_of_detection = WallClock::min();
+    int8_t m_last_detected = 0; // 0: no prior detection, 1: last detected positive, -1: last detected negative
+    bool m_consistent_result = false;
+};
+
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonTools/VisualDetectors/BlackBorderDetector.cpp b/SerialPrograms/Source/CommonTools/VisualDetectors/BlackBorderDetector.cpp
new file mode 100644
index 0000000000..75f3dfcd06
--- /dev/null
+++ b/SerialPrograms/Source/CommonTools/VisualDetectors/BlackBorderDetector.cpp
@@ -0,0 +1,102 @@
+/*  Black Border Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/ImageTools/ImageStats.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Images/SolidColorTest.h"
+#include "Tests/ImageUnitTest.h"
+#include "BlackBorderDetector.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+
+
+BlackBorderDetector::BlackBorderDetector()
+    : m_top(0.001, 0.001, 0.997, 0.002)
+    , m_bottom(0.001, 0.997, 0.997, 0.002)
+    , m_left(0.001, 0.001, 0.002, 0.997)
+    , m_right(0.997, 0.001, 0.002, 0.997)
+//    , m_body(0.100, 0.100, 0.800, 0.800)
+{}
+
+void BlackBorderDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(COLOR_RED, m_top);
+    items.add(COLOR_RED, m_bottom);
+    items.add(COLOR_RED, m_left);
+    items.add(COLOR_RED, m_right);
+//        items.add(COLOR_RED, m_body);
+}
+bool BlackBorderDetector::detect(const ImageViewRGB32& screen){
+    const double MAX_SUM = 50;
+    const double MAX_STDDEV = 20;
+
+    ImageStats top = image_stats(extract_box_reference(screen, m_top));
+//    cout << "top = " << top.average << top.stddev << endl;
+//    extract_box(screen, m_top).save("top.png");
+    if (!is_black(top, MAX_SUM, MAX_STDDEV)){
+        return false;
+    }
+    ImageStats bottom = image_stats(extract_box_reference(screen, m_bottom));
+//    cout << "bottom = " << bottom.average << bottom.stddev << endl;
+    if (!is_black(bottom, MAX_SUM, MAX_STDDEV)){
+        return false;
+    }
+    ImageStats left = image_stats(extract_box_reference(screen, m_left));
+//    cout << "left = " << left.average << left.stddev << endl;
+    if (!is_black(left, MAX_SUM, MAX_STDDEV)){
+        return false;
+    }
+    ImageStats right = image_stats(extract_box_reference(screen, m_right));
+//    cout << "right = " << right.average << right.stddev << endl;
+    if (!is_black(right, MAX_SUM, MAX_STDDEV)){
+        return false;
+    }
+//    ImageStats body = image_stats(extract_box_reference(screen, m_body));
+//    cout << "body = " << body.average << body.stddev << endl;
+//    if (is_black(right, 30, 30)){
+//        return false;
+//    }
+
+
+//    for (int c = 0; c < screen.width(); c++){
+//        QRgb pixel = screen.pixel(c, 0);
+//        cout << "(" << qRed(pixel) << "," << qGreen(pixel) << "," << qBlue(pixel) << ")";
+//    }
+
+    return true;
+}
+
+
+class Test_BlackBorderDetector : public ImageUnitTest{
+public:
+    Test_BlackBorderDetector(const std::string& image, bool expected)
+        : ImageUnitTest("CommonFramework::BlackBorderDetector - " + image, {image})
+        , m_expected(expected)
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        BlackBorderDetector detector;
+        const ImageRGB32& image = images[0];
+        return detector.detect(image) == m_expected;
+    }
+
+private:
+    bool m_expected;
+};
+
+
+void add_tests_BlackBorderDetector(UnitTestDatabase& database){
+    database.add<Test_BlackBorderDetector>("CommonFramework/BlackBorderDetector/Dark_SV_Crystal_False.png", false);
+}
+
+
+}
diff --git a/SerialPrograms/Source/CommonTools/VisualDetectors/BlackBorderDetector.h b/SerialPrograms/Source/CommonTools/VisualDetectors/BlackBorderDetector.h
new file mode 100644
index 0000000000..15689a1f43
--- /dev/null
+++ b/SerialPrograms/Source/CommonTools/VisualDetectors/BlackBorderDetector.h
@@ -0,0 +1,38 @@
+/*  Black Screen Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_CommonTools_BlackBorderDetector_H
+#define PokemonAutomation_CommonTools_BlackBorderDetector_H
+
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonTools/VisualDetector.h"
+
+namespace PokemonAutomation{
+
+
+class BlackBorderDetector : public StaticScreenDetector{
+public:
+    BlackBorderDetector();
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    ImageFloatBox m_top;
+    ImageFloatBox m_bottom;
+    ImageFloatBox m_left;
+    ImageFloatBox m_right;
+//    ImageFloatBox m_body;
+};
+
+
+void add_tests_BlackBorderDetector(UnitTestDatabase& database);
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonTools/VisualDetectors/BlackScreenDetector.cpp b/SerialPrograms/Source/CommonTools/VisualDetectors/BlackScreenDetector.cpp
new file mode 100644
index 0000000000..d4d919960f
--- /dev/null
+++ b/SerialPrograms/Source/CommonTools/VisualDetectors/BlackScreenDetector.cpp
@@ -0,0 +1,129 @@
+/*  Black Border Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *
+ *      Returns true after a black screen has been detected and
+ * the black screen has ended.
+ *
+ */
+
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Images/SolidColorTest.h"
+#include "BlackScreenDetector.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+
+
+BlackScreenDetector::BlackScreenDetector(
+    Color color, const ImageFloatBox& box,
+    double max_rgb_sum,
+    double max_stddev_sum
+)
+    : m_color(color)
+    , m_box(box)
+    , m_max_rgb_sum(max_rgb_sum)
+    , m_max_stddev_sum(max_stddev_sum)
+{}
+void BlackScreenDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_box);
+}
+bool BlackScreenDetector::detect(const ImageViewRGB32& screen){
+    return is_black(extract_box_reference(screen, m_box), m_max_rgb_sum, m_max_stddev_sum);
+}
+
+
+
+WhiteScreenDetector::WhiteScreenDetector(
+    Color color, const ImageFloatBox& box,
+    double min_rgb_sum,
+    double max_stddev_sum
+)
+    : m_color(color)
+    , m_box(box)
+    , m_min_rgb_sum(min_rgb_sum)
+    , m_max_stddev_sum(max_stddev_sum)
+{}
+void WhiteScreenDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_box);
+}
+bool WhiteScreenDetector::detect(const ImageViewRGB32& screen){
+    return is_white(extract_box_reference(screen, m_box), m_min_rgb_sum, m_max_stddev_sum);
+}
+
+
+
+
+
+
+BlackScreenOverWatcher::BlackScreenOverWatcher(
+    Color color, const ImageFloatBox& box,
+    double max_rgb_sum,
+    double max_stddev_sum,
+    std::chrono::milliseconds hold_duration,
+    std::chrono::milliseconds release_duration
+)
+    : VisualInferenceCallback("BlackScreenOverWatcher")
+    , m_on(color, box, max_rgb_sum, max_stddev_sum, BlackScreenWatcher::FinderType::PRESENT, hold_duration)
+    , m_off(color, box, max_rgb_sum, max_stddev_sum, BlackScreenWatcher::FinderType::GONE, release_duration)
+{}
+void BlackScreenOverWatcher::make_overlays(VideoOverlaySet& items) const{
+    m_on.make_overlays(items);
+}
+bool BlackScreenOverWatcher::process_frame(const ImageViewRGB32& frame, WallClock timestamp){
+    if (m_black_is_over.load(std::memory_order_acquire)){
+        return true;
+    }
+    if (!m_has_been_black){
+        m_has_been_black = m_on.process_frame(frame, timestamp);
+//        cout << "m_has_been_black = " << m_has_been_black << endl;
+        return false;
+    }
+
+    bool is_over = m_off.process_frame(frame, timestamp);
+    if (!is_over){
+        return false;
+    }
+    m_black_is_over.store(true, std::memory_order_release);
+    return true;
+}
+bool BlackScreenOverWatcher::black_is_over(const ImageViewRGB32& frame){
+    return m_black_is_over.load(std::memory_order_acquire);
+}
+
+
+
+
+WhiteScreenOverWatcher::WhiteScreenOverWatcher(
+    Color color, const ImageFloatBox& box,
+    double min_rgb_sum,
+    double max_stddev_sum
+)
+    : VisualInferenceCallback("BlackScreenOverWatcher")
+    , m_detector(color, box, min_rgb_sum, max_stddev_sum)
+{}
+void WhiteScreenOverWatcher::make_overlays(VideoOverlaySet& items) const{
+    m_detector.make_overlays(items);
+}
+
+bool WhiteScreenOverWatcher::process_frame(const ImageViewRGB32& frame, WallClock timestamp){
+    return white_is_over(frame);
+}
+bool WhiteScreenOverWatcher::white_is_over(const ImageViewRGB32& frame){
+    if (m_detector.detect(frame)){
+        m_has_been_white = true;
+        return false;
+    }
+    return m_has_been_white;
+}
+
+
+
+
+
+
+}
diff --git a/SerialPrograms/Source/CommonTools/VisualDetectors/BlackScreenDetector.h b/SerialPrograms/Source/CommonTools/VisualDetectors/BlackScreenDetector.h
new file mode 100644
index 0000000000..12c99b2a01
--- /dev/null
+++ b/SerialPrograms/Source/CommonTools/VisualDetectors/BlackScreenDetector.h
@@ -0,0 +1,126 @@
+/*  Black Screen Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *
+ *      Returns true after a black screen has been detected and
+ * the black screen has ended.
+ *
+ */
+
+#ifndef PokemonAutomation_CommonTools_BlackScreenDetector_H
+#define PokemonAutomation_CommonTools_BlackScreenDetector_H
+
+#include <atomic>
+#include "Common/Cpp/Color.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+#include "CommonTools/VisualDetector.h"
+
+namespace PokemonAutomation{
+
+
+class BlackScreenDetector : public StaticScreenDetector{
+public:
+    BlackScreenDetector(
+        Color color = COLOR_RED,
+        const ImageFloatBox& box = {0.1, 0.1, 0.8, 0.8},
+        double max_rgb_sum = 100,
+        double max_stddev_sum = 10
+    );
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    Color m_color;
+    ImageFloatBox m_box;
+    double m_max_rgb_sum;
+    double m_max_stddev_sum;
+};
+class WhiteScreenDetector : public StaticScreenDetector{
+public:
+    WhiteScreenDetector(
+        Color color = COLOR_RED,
+        const ImageFloatBox& box = {0.1, 0.1, 0.8, 0.8},
+        double min_rgb_sum = 500,
+        double max_stddev_sum = 10
+    );
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    Color m_color;
+    ImageFloatBox m_box;
+    double m_min_rgb_sum;
+    double m_max_stddev_sum;
+};
+
+
+class BlackScreenWatcher : public DetectorToFinder<BlackScreenDetector>{
+public:
+    BlackScreenWatcher(
+        Color color = COLOR_RED,
+        const ImageFloatBox& box = {0.1, 0.1, 0.8, 0.8},
+        double max_rgb_sum = 100,
+        double max_stddev_sum = 10,
+        FinderType finder_type = FinderType::PRESENT,
+        std::chrono::milliseconds duration = std::chrono::milliseconds(100)
+    )
+        : DetectorToFinder("BlackScreenWatcher", finder_type, duration, color, box, max_rgb_sum, max_stddev_sum)
+    {}
+};
+
+// Detect when a period of black screen is over
+class BlackScreenOverWatcher : public VisualInferenceCallback{
+public:
+    BlackScreenOverWatcher(
+        Color color = COLOR_RED,
+        const ImageFloatBox& box = {0.1, 0.1, 0.8, 0.8},
+        double max_rgb_sum = 100,
+        double max_stddev_sum = 10,
+        std::chrono::milliseconds hold_duration = std::chrono::milliseconds(100),
+        std::chrono::milliseconds release_duration = std::chrono::milliseconds(100)
+    );
+
+    bool black_is_over(const ImageViewRGB32& frame);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+
+    virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override;
+
+private:
+    BlackScreenWatcher m_on;
+    BlackScreenWatcher m_off;
+    bool m_has_been_black = false;
+    std::atomic<bool> m_black_is_over = false;
+};
+
+
+
+
+class WhiteScreenOverWatcher : public VisualInferenceCallback{
+public:
+    WhiteScreenOverWatcher(
+        Color color = COLOR_RED,
+        const ImageFloatBox& box = {0.1, 0.1, 0.8, 0.8},
+        double min_rgb_sum = 500,
+        double max_stddev_sum = 10
+    );
+
+    bool white_is_over(const ImageViewRGB32& frame);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+
+    virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override;
+
+private:
+    WhiteScreenDetector m_detector;
+    bool m_has_been_white = false;
+};
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonTools/VisualDetectors/FrozenImageDetector.cpp b/SerialPrograms/Source/CommonTools/VisualDetectors/FrozenImageDetector.cpp
new file mode 100644
index 0000000000..d3d07d81b7
--- /dev/null
+++ b/SerialPrograms/Source/CommonTools/VisualDetectors/FrozenImageDetector.cpp
@@ -0,0 +1,63 @@
+/*  Frozen Screen Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/ImageTools/ImageDiff.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "FrozenImageDetector.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+
+
+FrozenImageDetector::FrozenImageDetector(std::chrono::milliseconds timeout, double rmsd_threshold)
+    : VisualInferenceCallback("FrozenImageDetector")
+    , m_color(COLOR_CYAN)
+    , m_box(0.0, 0.0, 1.0, 1.0)
+    , m_timeout(timeout)
+    , m_rmsd_threshold(rmsd_threshold)
+{}
+FrozenImageDetector::FrozenImageDetector(
+    Color color, const ImageFloatBox& box,
+    std::chrono::milliseconds timeout, double rmsd_threshold
+)
+    : VisualInferenceCallback("FrozenImageDetector")
+    , m_color(color)
+    , m_box(box)
+    , m_timeout(timeout)
+    , m_rmsd_threshold(rmsd_threshold)
+{}
+void FrozenImageDetector::make_overlays(VideoOverlaySet& set) const{
+    set.add(m_color, m_box);
+}
+bool FrozenImageDetector::process_frame(const VideoSnapshot& frame){
+    if (m_previous->width() != frame->width() || m_previous->height() != frame->height()){
+        m_previous = frame;
+        return false;
+    }
+
+    double rmsd = ImageMatch::pixel_RMSD(
+        extract_box_reference(m_previous, m_box),
+        extract_box_reference(frame, m_box)
+    );
+//    cout << "rmsd = " << rmsd << endl;
+    if (rmsd > m_rmsd_threshold){
+        m_previous = frame;
+        return false;
+    }
+
+    return frame.timestamp - m_previous.timestamp > m_timeout;
+//    return false;
+}
+bool FrozenImageDetector::process_frame(const ImageViewRGB32& frame, WallClock timestamp){
+    return process_frame(VideoSnapshot(frame.copy(), timestamp));
+}
+
+
+}
diff --git a/SerialPrograms/Source/CommonTools/VisualDetectors/FrozenImageDetector.h b/SerialPrograms/Source/CommonTools/VisualDetectors/FrozenImageDetector.h
new file mode 100644
index 0000000000..6197f075bb
--- /dev/null
+++ b/SerialPrograms/Source/CommonTools/VisualDetectors/FrozenImageDetector.h
@@ -0,0 +1,43 @@
+/*  Frozen Screen Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  Detect if the entire screen or a part of it is frozen.
+ */
+
+#ifndef PokemonAutomation_CommonTools_FrozenImageDetector_H
+#define PokemonAutomation_CommonTools_FrozenImageDetector_H
+
+#include "Common/Cpp/Color.h"
+//#include "CommonFramework/ImageTypes/ImageRGB32.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+
+namespace PokemonAutomation{
+
+
+class FrozenImageDetector : public VisualInferenceCallback{
+public:
+    FrozenImageDetector(std::chrono::milliseconds timeout, double rmsd_threshold);
+    FrozenImageDetector(
+        Color color, const ImageFloatBox& box,
+        std::chrono::milliseconds timeout, double rmsd_threshold
+    );
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool process_frame(const VideoSnapshot& frame) override;
+    virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override;
+
+private:
+    Color m_color;
+    ImageFloatBox m_box;
+    std::chrono::milliseconds m_timeout;
+    double m_rmsd_threshold;
+    VideoSnapshot m_previous;
+};
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/CommonFramework/Inference/ImageMatchDetector.cpp b/SerialPrograms/Source/CommonTools/VisualDetectors/ImageMatchDetector.cpp
similarity index 90%
rename from SerialPrograms/Source/CommonFramework/Inference/ImageMatchDetector.cpp
rename to SerialPrograms/Source/CommonTools/VisualDetectors/ImageMatchDetector.cpp
index 3d180d67a2..f9c9544e59 100644
--- a/SerialPrograms/Source/CommonFramework/Inference/ImageMatchDetector.cpp
+++ b/SerialPrograms/Source/CommonTools/VisualDetectors/ImageMatchDetector.cpp
@@ -1,20 +1,20 @@
 /*  Image Match Detector
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include <cmath>
 #include "CommonFramework/ImageTypes/ImageViewRGB32.h"
 #include "CommonFramework/ImageTools/ImageStats.h"
-#include "CommonFramework/ImageMatch/ImageDiff.h"
+#include "CommonFramework/ImageTools/ImageDiff.h"
 #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
 #include "CommonFramework/Tools/ErrorDumper.h"
 #include "ImageMatchDetector.h"
 
-#include <iostream>
-using std::cout;
-using std::endl;
+//#include <iostream>
+//using std::cout;
+//using std::endl;
 
 namespace PokemonAutomation{
 
@@ -67,7 +67,7 @@ double ImageMatchDetector::rmsd(const ImageViewRGB32& frame) const{
 void ImageMatchDetector::make_overlays(VideoOverlaySet& items) const{
     items.add(m_color, m_box);
 }
-bool ImageMatchDetector::detect(const ImageViewRGB32& screen) const{
+bool ImageMatchDetector::detect(const ImageViewRGB32& screen){
     return rmsd(screen) <= m_max_rmsd;
 }
 
diff --git a/SerialPrograms/Source/CommonFramework/Inference/ImageMatchDetector.h b/SerialPrograms/Source/CommonTools/VisualDetectors/ImageMatchDetector.h
similarity index 77%
rename from SerialPrograms/Source/CommonFramework/Inference/ImageMatchDetector.h
rename to SerialPrograms/Source/CommonTools/VisualDetectors/ImageMatchDetector.h
index 056c4f5d35..1200bbcb37 100644
--- a/SerialPrograms/Source/CommonFramework/Inference/ImageMatchDetector.h
+++ b/SerialPrograms/Source/CommonTools/VisualDetectors/ImageMatchDetector.h
@@ -1,18 +1,19 @@
 /*  Image Match Detector
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#ifndef PokemonAutomation_CommonFramework_ImageMatchDetector_H
-#define PokemonAutomation_CommonFramework_ImageMatchDetector_H
+#ifndef PokemonAutomation_CommonTools_ImageMatchDetector_H
+#define PokemonAutomation_CommonTools_ImageMatchDetector_H
 
+#include <memory>
 #include "Common/Cpp/Color.h"
 #include "CommonFramework/ImageTypes/ImageRGB32.h"
 #include "CommonFramework/ImageTools/ImageBoxes.h"
 #include "CommonFramework/ImageTools/FloatPixel.h"
-#include "CommonFramework/Inference/VisualDetector.h"
-#include "CommonFramework/InferenceInfra/VisualInferenceCallback.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+#include "CommonTools/VisualDetector.h"
 
 namespace PokemonAutomation{
 
@@ -27,7 +28,7 @@ class ImageMatchDetector : public StaticScreenDetector{
     double rmsd(const ImageViewRGB32& frame) const;
 
     virtual void make_overlays(VideoOverlaySet& items) const override;
-    virtual bool detect(const ImageViewRGB32& screen) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
 
 private:
     std::shared_ptr<const ImageRGB32> m_reference_image;
diff --git a/SerialPrograms/Source/CompileTimeBackends.h b/SerialPrograms/Source/CompileTimeBackends.h
new file mode 100644
index 0000000000..b257a89949
--- /dev/null
+++ b/SerialPrograms/Source/CompileTimeBackends.h
@@ -0,0 +1,27 @@
+/*  Compile-Time Backends
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_CompileTimeBackends_H
+#define PokemonAutomation_CompileTimeBackends_H
+
+
+//  ImageRGB32 (select at most 1)
+#ifndef PA_IMAGE_BACKEND_None
+#ifndef PA_IMAGE_BACKEND_Qt
+#ifndef PA_IMAGE_BACKEND_OpenCV
+#define PA_IMAGE_BACKEND_OpenCV     //  <-- Default
+#endif
+#endif
+#endif
+
+#ifndef PA_FILE_SYSTEM_BACKEND_OS_SPECIFIC
+#ifndef PA_FILE_SYSTEM_BACKEND_Qt
+#define PA_FILE_SYSTEM_BACKEND_OS_SPECIFIC  //  <-- Default
+#endif
+#endif
+
+
+#endif
diff --git a/SerialPrograms/Source/ComputerPrograms/ComputerProgram.cpp b/SerialPrograms/Source/ComputerPrograms/ComputerProgram.cpp
index a6164b5a0b..68eccd5d0f 100644
--- a/SerialPrograms/Source/ComputerPrograms/ComputerProgram.cpp
+++ b/SerialPrograms/Source/ComputerPrograms/ComputerProgram.cpp
@@ -1,12 +1,11 @@
 /*  Runnable Computer Program
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include "Common/Cpp/Json/JsonObject.h"
+#include "ComputerPrograms/Framework/ComputerProgramSession.h"
 #include "ComputerProgram.h"
-#include "ComputerPrograms/Framework/ComputerProgramOption.h"
 
 namespace PokemonAutomation{
 
@@ -15,62 +14,27 @@ ComputerProgramDescriptor::ComputerProgramDescriptor(
     std::string identifier,
     std::string category, std::string display_name,
     std::string doc_link,
-    std::string description
+    std::string description,
+    PanelQualityStanding standing
 )
     : ProgramDescriptor(
-        COLOR_DARKCYAN,
         std::move(identifier),
         std::move(category), std::move(display_name),
         std::move(doc_link),
-        std::move(description)
+        std::move(description),
+        standing,
+        true,
+        {}
     )
 {}
-std::unique_ptr<PanelInstance> ComputerProgramDescriptor::make_panel() const{
-    return std::unique_ptr<PanelInstance>(new ComputerProgramOption(*this));
+std::unique_ptr<PanelSession> ComputerProgramDescriptor::make_panel() const{
+    return std::unique_ptr<PanelSession>(new ComputerProgramSession(*this));
 }
 
 
 
 
 
-ComputerProgramInstance::ComputerProgramInstance()
-    : m_options(LockWhileRunning::LOCKED)
-    , NOTIFICATION_PROGRAM_FINISH(
-        "Program Finished",
-        true, true,
-        ImageAttachmentMode::JPG,
-        {"Notifs"}
-    )
-    , NOTIFICATION_ERROR_RECOVERABLE(
-        "Program Error (Recoverable)",
-        true, false,
-        ImageAttachmentMode::PNG,
-        {"Notifs"}
-    )
-    , NOTIFICATION_ERROR_FATAL(
-        "Program Error (Fatal)",
-        true, true,
-        ImageAttachmentMode::PNG,
-        {"Notifs"}
-    )
-{}
-void ComputerProgramInstance::add_option(ConfigOption& option, std::string serialization_string){
-    m_options.add_option(option, std::move(serialization_string));
-}
-void ComputerProgramInstance::from_json(const JsonValue& json){
-    m_options.load_json(json);
-}
-JsonValue ComputerProgramInstance::to_json() const{
-    return m_options.to_json();
-}
-std::string ComputerProgramInstance::check_validity() const{
-    return m_options.check_validity();
-}
-void ComputerProgramInstance::restore_defaults(){
-    return m_options.restore_defaults();
-}
-
-
 
 
 
diff --git a/SerialPrograms/Source/ComputerPrograms/ComputerProgram.h b/SerialPrograms/Source/ComputerPrograms/ComputerProgram.h
index 98fbf6772e..ddbeb5725b 100644
--- a/SerialPrograms/Source/ComputerPrograms/ComputerProgram.h
+++ b/SerialPrograms/Source/ComputerPrograms/ComputerProgram.h
@@ -1,14 +1,12 @@
 /*  Runnable Computer Program
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifndef PokemonAutomation_RunnableComputerProgram_H
 #define PokemonAutomation_RunnableComputerProgram_H
 
-#include "Common/Cpp/Options/BatchOption.h"
-#include "CommonFramework/Notifications/EventNotificationOption.h"
 #include "CommonFramework/Tools/ProgramEnvironment.h"
 #include "CommonFramework/Panels/ProgramDescriptor.h"
 
@@ -24,83 +22,35 @@ class ComputerProgramDescriptor : public ProgramDescriptor{
         std::string identifier,
         std::string category, std::string display_name,
         std::string doc_link,
-        std::string description
+        std::string description,
+        PanelQualityStanding standing
     );
 
-    virtual std::unique_ptr<PanelInstance> make_panel() const override;
+    virtual std::unique_ptr<PanelSession> make_panel() const override;
     virtual std::unique_ptr<ComputerProgramInstance> make_instance() const = 0;
 };
 
 
 
-
-
-//
-//  As of this writing, this class will never be called in a manner where
-//  thread-safety is of concern. However, this may change in the future.
-//
-//  Here is the curent status:
-//
-//  Called from UI thread:
-//    - Construction/destruction
-//    - from/to_json()
-//    - restore_defaults()
-//
-//  Called from program thread:
-//    - program()
-//
-//  Called from both UI and program threads:
-//    - check_validity()
-//
-//  Calls to this class will never be concurrent from different threads.
-//
-class ComputerProgramInstance{
+class ComputerProgramInstance : public ProgramInstance{
 public:
-    virtual ~ComputerProgramInstance() = default;
-    ComputerProgramInstance(const ComputerProgramInstance&) = delete;
-    void operator=(const ComputerProgramInstance&) = delete;
-
-    ComputerProgramInstance();
-
+    using ProgramInstance::ProgramInstance;
     virtual void program(ProgramEnvironment& env, CancellableScope& scope) = 0;
-
-
-public:
-    //  Settings
-
-    virtual void from_json(const JsonValue& json);
-    virtual JsonValue to_json() const;
-
-    virtual std::string check_validity() const;
-    virtual void restore_defaults();
-
-
-protected:
-    friend class ComputerProgramOption;
-
-    BatchOption m_options;
-    void add_option(ConfigOption& option, std::string serialization_string);
-
-
-public:
-    EventNotificationOption NOTIFICATION_PROGRAM_FINISH;
-    EventNotificationOption NOTIFICATION_ERROR_RECOVERABLE;
-    EventNotificationOption NOTIFICATION_ERROR_FATAL;
 };
 
 
 
-template <typename Descriptor, typename Instance>
-class ComputerProgramWrapper : public Descriptor{
+template <typename Instance>
+class ComputerProgramWrapper : public Instance::Descriptor{
 public:
     virtual std::unique_ptr<ComputerProgramInstance> make_instance() const override{
         return std::unique_ptr<ComputerProgramInstance>(new Instance());
     }
 };
 
-template <typename Descriptor, typename Instance>
-std::unique_ptr<PanelDescriptor> make_computer_program(){
-    return std::make_unique<ComputerProgramWrapper<Descriptor, Instance>>();
+template <typename Instance>
+std::unique_ptr<PanelDescriptor> make_ComputerProgram(){
+    return std::make_unique<ComputerProgramWrapper<Instance>>();
 }
 
 
diff --git a/SerialPrograms/Source/ComputerPrograms/ComputerPrograms_UnitTestRunner.cpp b/SerialPrograms/Source/ComputerPrograms/ComputerPrograms_UnitTestRunner.cpp
new file mode 100644
index 0000000000..b97f283106
--- /dev/null
+++ b/SerialPrograms/Source/ComputerPrograms/ComputerPrograms_UnitTestRunner.cpp
@@ -0,0 +1,438 @@
+/*  Unit Test Runner
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/ListenerSet.h"
+#include "Common/Cpp/MoveOnlyFunction_Tests.h"
+#include "Common/Cpp/ScopeExit.h"
+#include "Common/Cpp/PrettyPrint.h"
+#include "Common/Cpp/Sockets/Sockets_Tests.h"
+#include "Common/Cpp/TestRunners/TestImageDistortionManager.h"
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "Common/Qt/QtThreadPool_Tests.h"
+#include "Kernels/Kernels_Tests.h"
+#include "CommonFramework/AudioPipeline/AudioInfo_Tests.h"
+#include "CommonFramework/AudioPipeline/Tools/ChannelMixer.h"
+#include "CommonFramework/AudioPipeline/SinkPipeline_Tests.h"
+#include "CommonFramework/AudioPipeline/IO/AudioFileLoader_Tests.h"
+#include "CommonFramework/AudioPipeline/Spectrum/FFTStreamer.h"
+#include "CommonFramework/GlobalAutoPaths.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/Tools/GlobalThreadPools.h"
+#include "CommonTools/VisualDetectors/BlackBorderDetector.h"
+#include "CommonTools/OCR/OCR_Tests.h"
+
+#include "NintendoSwitch/Inference/NintendoSwitch_CheckOnlineDetector.h"
+#include "NintendoSwitch/Inference/NintendoSwitch_FailedToConnectDetector.h"
+#include "NintendoSwitch/Inference/NintendoSwitch_UpdatePopupDetector.h"
+#include "NintendoSwitch/Programs/Typewriter/NintendoSwitch_Typewriter_Tests.h"
+#include "NintendoSwitch/Controllers/SysbotBase/SysbotBase_Connection.h"
+
+#include "VideoGames/PokemonHome/PokemonHome_Tests.h"
+#include "VideoGames/PokemonSwSh/PokemonSwSh_Tests.h"
+#include "VideoGames/PokemonLA/PokemonLA_Tests.h"
+#include "VideoGames/PokemonSV/PokemonSV_Tests.h"
+#include "VideoGames/PokemonLZA/PokemonLZA_Tests.h"
+#include "VideoGames/PokemonFRLG/PokemonFRLG_Tests.h"
+#include "VideoGames/PokemonRSE/PokemonRSE_Tests.h"
+
+#include "ComputerPrograms_UnitTestRunner.h"
+
+namespace PokemonAutomation{
+namespace ComputerPrograms{
+
+
+
+
+
+
+UnitTestDatabase make_UNIT_TESTS_ALL(){
+    UnitTestDatabase ret;
+
+    add_tests_QtEventThreadPool(ret, GlobalThreadPools::computation_normal());
+    add_tests_Sockets(ret, GlobalThreadPools::unlimited_normal());
+    add_tests_BlackBorderDetector(ret);
+    add_tests_ListenerSet(ret);
+    add_tests_MoveOnlyFunction(ret);
+    SysbotBase::add_tests_SysbotBasePing(ret);
+    add_tests_AudioInfo(ret);
+    add_tests_ChannelMixerMatrix(ret);
+    add_tests_FFTStreamer(ret);
+    add_tests_SinkPipeline(ret);
+    add_tests_AudioFileLoader(ret);
+    OCR::add_tests(ret);
+    Kernels::add_tests(ret);
+    NintendoSwitch::add_tests_CheckOnlineDetector(ret);
+    NintendoSwitch::add_tests_FailedToConnectDetector(ret);
+    NintendoSwitch::add_tests_UpdatePopupDetector(ret);
+    NintendoSwitch::Typewriter::add_tests_TypewriterTextMapping(ret);
+    NintendoSwitch::PokemonFRLG::add_tests(ret);
+    NintendoSwitch::PokemonRSE::add_tests(ret);
+    NintendoSwitch::PokemonHome::add_tests(ret);
+    NintendoSwitch::PokemonSwSh::add_tests(ret);
+    NintendoSwitch::PokemonLA::add_tests(ret);
+    NintendoSwitch::PokemonSV::add_tests(ret);
+    NintendoSwitch::PokemonLZA::add_tests(ret);
+
+    return ret;
+}
+
+
+
+
+const UnitTestDatabase& UNIT_TESTS_ALL(){
+    static UnitTestDatabase database = make_UNIT_TESTS_ALL();
+    return database;
+}
+StringSelectDatabase make_TEST_DATABASE(){
+    StringSelectDatabase database;
+    for (auto& test : UNIT_TESTS_ALL()){
+        database.add_entry(StringSelectEntry(test.first, test.first));
+    }
+    return database;
+}
+const StringSelectDatabase& TEST_DATABASE(){
+    static StringSelectDatabase DATABASE = make_TEST_DATABASE();
+    return DATABASE;
+}
+
+
+
+
+UnitTestRunner_Descriptor::UnitTestRunner_Descriptor()
+    : ComputerProgramDescriptor(
+        "UnitTestRunner",
+        "Nintendo Switch",
+        "Unit Test Runner",
+        "",
+        "UI to run unit tests.",
+        PanelQualityStanding::DEVELOPER
+    )
+{}
+class UnitTestRunner_Descriptor::Stats : public StatsTracker{
+public:
+    Stats()
+        : tests(m_stats["Tests"])
+        , passed(m_stats["Passed"])
+        , failed(m_stats["Failed"])
+        , skipped(m_stats["Skipped"])
+        , oom(m_stats["OOM"])
+    {
+        m_display_order.emplace_back("Tests");
+        m_display_order.emplace_back("Passed");
+        m_display_order.emplace_back("Failed");
+        m_display_order.emplace_back("Skipped");
+        m_display_order.emplace_back("OOM");
+    }
+
+    std::atomic<uint64_t>& tests;
+    std::atomic<uint64_t>& passed;
+    std::atomic<uint64_t>& failed;
+    std::atomic<uint64_t>& skipped;
+    std::atomic<uint64_t>& oom;
+};
+std::unique_ptr<StatsTracker> UnitTestRunner_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+
+
+
+
+UnitTestRunner::~UnitTestRunner(){
+    SUBSTRING_TEST.remove_listener(*this);
+    RUN_MODE.remove_listener(*this);
+}
+UnitTestRunner::UnitTestRunner()
+    : RESOURCE_LABEL("<b>Test Resources Path:</b>")
+    , RESOURCE_PATH(
+        false,
+        LockMode::READ_ONLY,
+        UNIT_TEST_RESOURCE_PATH(),
+        ""
+    )
+    , RUN_MODE(
+        "<b>Run Mode:</b>",
+        {
+            {RunMode::RUN_ONE,              "run-one",              "Run One Test"},
+            {RunMode::RUN_SUBSTRING_MATCH,  "run-substring-match",  "Run Matching Substrings"},
+            {RunMode::RUN_ALL,              "run-all",              "Run All Tests"},
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        RunMode::RUN_SUBSTRING_MATCH
+    )
+    , SINGLE_TEST_LABEL("<b>Test Name:</b>")
+    , SINGLE_TEST(
+        TEST_DATABASE(),
+        LockMode::LOCK_WHILE_RUNNING,
+        0
+    )
+    , SUBSTRING_TEST_LABEL("<b>Run All Tests Containing This Substring:</b>")
+    , SUBSTRING_TEST(false, LockMode::LOCK_WHILE_RUNNING, "", "PokemonSwSh")
+    , TESTS_TO_RUN(
+        "<b>Tests to Run:</b>",
+        LockMode::READ_ONLY,
+        "", ""
+    )
+    , PASSED_TESTS(
+        "<b>Passing Tests:</b>",
+        LockMode::READ_ONLY,
+        "", ""
+    )
+    , FAILED_TESTS(
+        "<b>Failing Tests:</b>",
+        LockMode::READ_ONLY,
+        "", ""
+    )
+{
+    PA_ADD_STATIC(RESOURCE_LABEL);
+    PA_ADD_STATIC(RESOURCE_PATH);
+    PA_ADD_OPTION(RUN_MODE);
+    PA_ADD_STATIC(SINGLE_TEST_LABEL);
+    PA_ADD_OPTION(SINGLE_TEST);
+    PA_ADD_STATIC(SUBSTRING_TEST_LABEL);
+    PA_ADD_OPTION(SUBSTRING_TEST);
+    PA_ADD_STATIC(TESTS_TO_RUN);
+    PA_ADD_OPTION(PASSED_TESTS);
+    PA_ADD_OPTION(FAILED_TESTS);
+
+    UnitTestRunner::on_config_value_changed(this);
+
+    RUN_MODE.add_listener(*this);
+    SUBSTRING_TEST.add_listener(*this);
+}
+void UnitTestRunner::on_config_value_changed(void* object){
+    if (object == &RUN_MODE){
+        SINGLE_TEST_LABEL.set_visibility(ConfigOptionState::HIDDEN);
+        SINGLE_TEST.set_visibility(ConfigOptionState::HIDDEN);
+        SUBSTRING_TEST_LABEL.set_visibility(ConfigOptionState::HIDDEN);
+        SUBSTRING_TEST.set_visibility(ConfigOptionState::HIDDEN);
+        TESTS_TO_RUN.set_visibility(ConfigOptionState::HIDDEN);
+
+        switch ((RunMode)RUN_MODE){
+        case RunMode::RUN_ONE:
+            SINGLE_TEST_LABEL.set_visibility(ConfigOptionState::ENABLED);
+            SINGLE_TEST.set_visibility(ConfigOptionState::ENABLED);
+            break;
+        case RunMode::RUN_SUBSTRING_MATCH:
+            SUBSTRING_TEST_LABEL.set_visibility(ConfigOptionState::ENABLED);
+            SUBSTRING_TEST.set_visibility(ConfigOptionState::ENABLED);
+            TESTS_TO_RUN.set_visibility(ConfigOptionState::ENABLED);
+            break;
+        case RunMode::RUN_ALL:
+            break;
+        }
+        return;
+    }
+    if (object == &SUBSTRING_TEST){
+        std::string name = SUBSTRING_TEST;
+        TESTS_TO_RUN.set("");
+        size_t count = 0;
+        for (const auto& test : UNIT_TESTS_ALL()){
+            if (test.first.contains(name)){
+                count++;
+                if (count <= 1000){
+                    TESTS_TO_RUN.append(test.first + "\n");
+                }
+            }
+        }
+        if (count > 1000){
+            TESTS_TO_RUN.append("<" + tostr_u_commas(count - 1000) + " more...>\n");
+        }
+        TESTS_TO_RUN.set_label("<b>Tests to Run: " + tostr_u_commas(count) + "</b>");
+    }
+}
+
+
+void UnitTestRunner::program(ProgramEnvironment& env, CancellableScope& scope){
+    m_total_failed.store(0, std::memory_order_release);
+    PASSED_TESTS.set("");
+    FAILED_TESTS.set("");
+
+    m_env = &env;
+    ScopeExit run_on_exit([this]{
+        m_env = nullptr;
+    });
+
+    //  Uncapped pool: the runner caps the # of concurrently running tests itself, and
+    //  dispatch_now_blocking() would stall the dispatcher once a capped pool saturates.
+    PokemonAutomation::UnitTestRunner runner(
+        &scope,
+        env.logger(),
+        GlobalThreadPools::unlimited_normal()
+    );
+    runner.add_listener(*this);
+
+
+    const UnitTestDatabase& all_tests = UNIT_TESTS_ALL();
+
+    switch ((RunMode)RUN_MODE){
+    case RunMode::RUN_ONE:{
+        auto iter = all_tests.find(SINGLE_TEST.slug());
+        if (iter == all_tests.end()){
+            throw InternalProgramError(
+                &env.logger(),
+                PA_CURRENT_FUNCTION,
+                "Test does not exist: " + SINGLE_TEST.display_name()
+            );
+        }
+        runner.add_test(iter->second);
+        break;
+    }
+    case RunMode::RUN_SUBSTRING_MATCH:{
+        std::string name = SUBSTRING_TEST;
+        for (const auto& test : all_tests){
+            if (test.first.contains(name)){
+                runner.add_test(test.second);
+            }
+        }
+        break;
+    }
+    case RunMode::RUN_ALL:{
+        for (const auto& test : all_tests){
+            runner.add_test(test.second);
+        }
+        break;
+    }
+    }
+
+    runner.run();
+}
+
+
+
+void UnitTestRunner::on_test_finished(
+    std::shared_ptr<const UnitTest> test,
+    UnitTestResult result
+){
+    if (m_env == nullptr){
+        return;
+    }
+    UnitTestRunner_Descriptor::Stats& stats = m_env->current_stats<UnitTestRunner_Descriptor::Stats>();
+    stats.tests++;
+    switch (result.result){
+    case UnitTestResult::NOT_RUN:
+        stats.skipped++;
+        break;
+    case UnitTestResult::PASSED:{
+        uint64_t passed = stats.passed.fetch_add(1) + 1;
+        if (passed <= 1000){
+            PASSED_TESTS.append(test->name() + "\n");
+        }else if (passed == 1001){
+            PASSED_TESTS.append("<more not shown...>\n");
+        }
+        break;
+    }
+    case UnitTestResult::FAILED:{
+        uint64_t failed = m_total_failed.fetch_add(1) + 1;
+        stats.failed++;
+        if (failed <= 1000){
+            FAILED_TESTS.append("FAILED: " + test->name() + "\n");
+        }else if (failed == 1001){
+            FAILED_TESTS.append("<more not shown...>\n");
+        }
+        break;
+    }
+    case UnitTestResult::SKIPPED:
+        stats.skipped++;
+        break;
+    case UnitTestResult::OOM:{
+        uint64_t failed = m_total_failed.fetch_add(1) + 1;
+        stats.oom++;
+        if (failed <= 1000){
+            FAILED_TESTS.append("OOM: " + test->name() + "\n");
+        }else if (failed == 1001){
+            FAILED_TESTS.append("<more not shown...>\n");
+        }
+        break;
+    }
+    }
+    m_env->update_stats();
+}
+
+
+
+
+
+
+bool CommandLineUnitTestRunner::run(bool augment_color_distortions){
+    if (augment_color_distortions){
+        //  Load the distortion data before any test runs. Each `ImageUnitTest` checks the global
+        //  manager when it runs, and only runs with distortions if it is loaded.
+        try{
+            initialize_test_image_distortions(UNIT_TEST_RESOURCE_PATH());
+        }catch (Exception& e){
+            m_logger.log("Unable to load the test image distortions: " + e.to_str(), COLOR_RED);
+            return true;
+        }
+        const TestImageDistortionManager& manager = *test_image_distortion_manager();
+        std::string labels;
+        for (size_t c = 0; c < manager.num_test_distortions(); c++){
+            labels += c == 0 ? "" : ", ";
+            labels += manager.test_distortion_label(c);
+        }
+        m_logger.log("Color distortion augmentation enabled. Image tests with labeled images also run with: " + labels);
+    }
+
+    //  Uncapped pool: the runner caps the # of concurrently running tests itself, and
+    //  dispatch_now_blocking() would stall the dispatcher once a capped pool saturates.
+    PokemonAutomation::UnitTestRunner runner(
+        m_logger,
+        GlobalThreadPools::unlimited_normal()
+    );
+    runner.add_listener(*this);
+    for (const auto& test : UNIT_TESTS_ALL()){
+        runner.add_test(test.second);
+    }
+    runner.run();
+
+    m_logger.log(
+        "Tests Finished:"
+        "\n    Passed:  " + tostr_u_commas(m_passed_tests.load(std::memory_order_acquire)) +
+        "\n    Failed:  " + tostr_u_commas(m_failed_tests.load(std::memory_order_acquire)) +
+        "\n    Skipped: " + tostr_u_commas(m_skipped_tests.load(std::memory_order_acquire))
+    );
+    return m_failed_tests.load(std::memory_order_acquire) > 0;
+}
+void CommandLineUnitTestRunner::on_test_finished(
+    std::shared_ptr<const UnitTest> test,
+    UnitTestResult result
+){
+    switch (result.result){
+    case UnitTestResult::NOT_RUN:
+        m_logger.log("NOT RUN: " + test->name(), COLOR_ORANGE);
+        m_skipped_tests++;
+        break;
+    case UnitTestResult::PASSED:
+        m_logger.log("PASSED: " + test->name(), COLOR_BLUE);
+        m_passed_tests++;
+        break;
+    case UnitTestResult::FAILED:
+        m_logger.log("FAILED: " + test->name(), COLOR_RED);
+        m_failed_tests++;
+        break;
+    case UnitTestResult::SKIPPED:
+        m_logger.log("SKIPPED: " + test->name(), COLOR_ORANGE);
+        m_skipped_tests++;
+        break;
+    case UnitTestResult::OOM:
+        m_logger.log("OOM: " + test->name(), COLOR_RED);
+        m_failed_tests++;
+        break;
+    }
+}
+
+
+
+
+
+
+
+
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/ComputerPrograms/ComputerPrograms_UnitTestRunner.h b/SerialPrograms/Source/ComputerPrograms/ComputerPrograms_UnitTestRunner.h
new file mode 100644
index 0000000000..c3aeb94f07
--- /dev/null
+++ b/SerialPrograms/Source/ComputerPrograms/ComputerPrograms_UnitTestRunner.h
@@ -0,0 +1,119 @@
+/*  Unit Test Runner
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_ComputerPrograms_UnitTestRunner_H
+#define PokemonAutomation_ComputerPrograms_UnitTestRunner_H
+
+#include <atomic>
+#include "Common/Cpp/TestRunners/ParallelUnitTestRunner.h"
+#include "Common/Cpp/Options/StaticTextOption.h"
+#include "Common/Cpp/Options/EnumDropdownOption.h"
+#include "Common/Cpp/Options/StringOption.h"
+#include "Common/Cpp/Options/TextEditOption.h"
+#include "CommonTools/Options/StringSelectOption.h"
+#include "ComputerPrograms/ComputerProgram.h"
+
+namespace PokemonAutomation{
+namespace ComputerPrograms{
+
+
+class UnitTestRunner_Descriptor : public ComputerProgramDescriptor{
+public:
+    UnitTestRunner_Descriptor();
+
+    class Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+
+
+class UnitTestRunner
+    : public ComputerProgramInstance
+    , public PokemonAutomation::UnitTestRunner::Listener
+    , public ConfigOption::Listener
+{
+public:
+    using Descriptor = UnitTestRunner_Descriptor;
+
+    ~UnitTestRunner();
+    UnitTestRunner();
+
+    virtual void program(ProgramEnvironment& env, CancellableScope& scope) override;
+
+
+private:
+    virtual void on_config_value_changed(void* object) override;
+
+    virtual void on_test_finished(
+        std::shared_ptr<const UnitTest> test,
+        UnitTestResult result
+    ) override;
+
+
+private:
+    StaticTextOption RESOURCE_LABEL;
+    StringCell RESOURCE_PATH;
+
+    enum class RunMode{
+        RUN_ONE,
+        RUN_SUBSTRING_MATCH,
+        RUN_ALL,
+    };
+    EnumDropdownOption<RunMode> RUN_MODE;
+
+    StaticTextOption SINGLE_TEST_LABEL;
+    StringSelectCell SINGLE_TEST;
+
+    StaticTextOption SUBSTRING_TEST_LABEL;
+    StringCell SUBSTRING_TEST;
+
+    TextEditOption TESTS_TO_RUN;
+    TextEditOption PASSED_TESTS;
+    TextEditOption FAILED_TESTS;
+
+    ProgramEnvironment* m_env = nullptr;
+    std::atomic<uint64_t> m_total_failed;
+};
+
+
+
+class CommandLineUnitTestRunner : public PokemonAutomation::UnitTestRunner::Listener{
+public:
+    CommandLineUnitTestRunner(Logger& logger)
+        : m_logger(logger)
+        , m_skipped_tests(0)
+        , m_passed_tests(0)
+        , m_failed_tests(0)
+    {}
+
+    //  Run all the unit tests. Return true if any test failed.
+    //  If `augment_color_distortions` is true, also run each image test under different color
+    //  distortion augmentation to widen the test coverage, using the distortion data in the
+    //  CaptureCardCalibration/ folder of the test repo. If that data can't be loaded, log the
+    //  error and return true without running any test.
+    bool run(bool augment_color_distortions);
+
+
+private:
+    virtual void on_test_finished(
+        std::shared_ptr<const UnitTest> test,
+        UnitTestResult result
+    ) override;
+
+
+private:
+    Logger& m_logger;
+    std::atomic<size_t> m_skipped_tests;
+    std::atomic<size_t> m_passed_tests;
+    std::atomic<size_t> m_failed_tests;
+};
+
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/ComputerPrograms/Framework/ComputerProgramOption.cpp b/SerialPrograms/Source/ComputerPrograms/Framework/ComputerProgramOption.cpp
deleted file mode 100644
index 4ce7ffabf9..0000000000
--- a/SerialPrograms/Source/ComputerPrograms/Framework/ComputerProgramOption.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-/*  Computer Program Option
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Cpp/Json/JsonValue.h"
-#include "Common/Cpp/Json/JsonObject.h"
-#include "ComputerProgramOption.h"
-#include "ComputerProgramWidget.h"
-
-namespace PokemonAutomation{
-
-
-
-
-ComputerProgramOption::ComputerProgramOption(const ComputerProgramDescriptor& descriptor)
-    : PanelInstance(descriptor)
-    , m_descriptor(descriptor)
-    , m_instance(descriptor.make_instance())
-{}
-
-void ComputerProgramOption::from_json(const JsonValue& json){
-    m_instance->from_json(json);
-}
-JsonValue ComputerProgramOption::to_json() const{
-    return m_instance->to_json();
-}
-
-ConfigOption& ComputerProgramOption::options(){
-    return m_instance->m_options;
-}
-
-std::string ComputerProgramOption::check_validity() const{
-    return m_instance->check_validity();
-}
-void ComputerProgramOption::restore_defaults(){
-    m_instance->restore_defaults();
-}
-
-
-QWidget* ComputerProgramOption::make_widget(QWidget& parent, PanelHolder& holder){
-    return new ComputerProgramWidget(parent, *this, holder);
-}
-
-
-
-}
diff --git a/SerialPrograms/Source/ComputerPrograms/Framework/ComputerProgramOption.h b/SerialPrograms/Source/ComputerPrograms/Framework/ComputerProgramOption.h
deleted file mode 100644
index c36fa5b249..0000000000
--- a/SerialPrograms/Source/ComputerPrograms/Framework/ComputerProgramOption.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*  Computer Program Option
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- *  This class represents the serializable state of a computer program.
- *  This class maintains no UI and is not thread-safe.
- *
- *  Note that this class does own the "ComputerProgramInstance", object
- *  which is controlled by the individual program itself. There the running
- *  program can do whatever it wants - including keeping run-time state.
- *
- */
-
-#ifndef PokemonAutomation_ComputerPrograms_ComputerProgramOption_H
-#define PokemonAutomation_ComputerPrograms_ComputerProgramOption_H
-
-#include "CommonFramework/Panels/PanelInstance.h"
-#include "ComputerPrograms/ComputerProgram.h"
-
-namespace PokemonAutomation{
-
-class ConfigOption;
-class ComputerProgramDescriptor;
-class ComputerProgramInstance;
-
-
-
-class ComputerProgramOption final : public PanelInstance{
-public:
-    ComputerProgramOption(const ComputerProgramDescriptor& descriptor);
-
-    virtual void from_json(const JsonValue& json) override;
-    virtual JsonValue to_json() const override;
-
-public:
-    const ComputerProgramDescriptor& descriptor() const{ return m_descriptor; }
-    ComputerProgramInstance& instance(){ return *m_instance; }
-    ConfigOption& options();
-
-    std::string check_validity() const;
-    void restore_defaults();
-
-private:
-    virtual QWidget* make_widget(QWidget& parent, PanelHolder& holder) override;
-
-private:
-    const ComputerProgramDescriptor& m_descriptor;
-    std::unique_ptr<ComputerProgramInstance> m_instance;
-};
-
-
-
-
-}
-#endif
diff --git a/SerialPrograms/Source/ComputerPrograms/Framework/ComputerProgramSession.cpp b/SerialPrograms/Source/ComputerPrograms/Framework/ComputerProgramSession.cpp
index def4eca64f..33e98d3a3c 100644
--- a/SerialPrograms/Source/ComputerPrograms/Framework/ComputerProgramSession.cpp
+++ b/SerialPrograms/Source/ComputerPrograms/Framework/ComputerProgramSession.cpp
@@ -1,17 +1,15 @@
 /*  Computer Program Session
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include "Common/Cpp/Exceptions.h"
-#include "Common/Cpp/CancellableScope.h"
-#include "CommonFramework/GlobalSettingsPanel.h"
+#include "Common/Cpp/Json/JsonValue.h"
+#include "CommonFramework/Exceptions/FatalProgramException.h"
 #include "CommonFramework/Exceptions/ProgramFinishedException.h"
-#include "CommonFramework/Exceptions/OperationFailedException.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
 #include "CommonFramework/Notifications/ProgramInfo.h"
 #include "CommonFramework/Notifications/ProgramNotifications.h"
-#include "ComputerProgramOption.h"
 #include "ComputerProgramSession.h"
 
 //#include <iostream>
@@ -21,10 +19,13 @@
 namespace PokemonAutomation{
 
 
-ComputerProgramSession::ComputerProgramSession(ComputerProgramOption& option)
-    : ProgramSession(option.descriptor())
-    , m_option(option)
-{}
+ComputerProgramSession::ComputerProgramSession(const ComputerProgramDescriptor& descriptor)
+    : UiState<ComputerProgramSession, PanelSession>(descriptor)
+    , ProgramSession(descriptor)
+    , m_descriptor(descriptor)
+{
+    m_instance = descriptor.make_instance();
+}
 
 ComputerProgramSession::~ComputerProgramSession(){
     ComputerProgramSession::internal_stop_program();
@@ -32,119 +33,43 @@ ComputerProgramSession::~ComputerProgramSession(){
 }
 
 
-void ComputerProgramSession::restore_defaults(){
-    std::lock_guard<std::mutex> lg(program_lock());
-    if (current_state() != ProgramState::STOPPED){
-        logger().log("Cannot change settings while program is running.", COLOR_RED);
-        return;
-    }
-    logger().log("Restoring settings to defaults...");
-    m_option.restore_defaults();
+ConfigOption& ComputerProgramSession::options(){
+    return m_instance->options();
 }
 std::string ComputerProgramSession::check_validity() const{
-    return m_option.check_validity();
+    return m_instance->check_validity();
 }
 
 
 
 
-
-void ComputerProgramSession::run_program_instance(ProgramEnvironment& env, CancellableScope& scope){
-    {
-        std::lock_guard<std::mutex> lg(program_lock());
-        std::string error = check_validity();
-        if (!error.empty()){
-            throw UserSetupError(logger(), std::move(error));
-        }
-    }
-
-    {
-        SpinLockGuard lg(m_lock);
-        m_scope = &scope;
-    }
-
-    try{
-        m_option.instance().program(env, scope);
-    }catch (...){
-        SpinLockGuard lg(m_lock);
-        m_scope = nullptr;
-        throw;
+void ComputerProgramSession::restore_defaults(){
+    std::lock_guard<Mutex> lg(program_lock());
+    if (current_state() != ProgramState::STOPPED){
+        logger().log("Cannot change settings while program is running.", COLOR_RED);
+        return;
     }
-    SpinLockGuard lg(m_lock);
-    m_scope = nullptr;
+    logger().log("Restoring settings to defaults...");
+    m_instance->restore_defaults();
 }
-void ComputerProgramSession::internal_stop_program(){
-    SpinLockGuard lg(m_lock);
-    if (m_scope != nullptr){
-        m_scope->cancel(std::make_exception_ptr(ProgramCancelledException()));
-    }
+JsonValue ComputerProgramSession::to_json() const{
+    return m_instance->to_json();
 }
-void ComputerProgramSession::internal_run_program(){
-    GlobalSettings::instance().REALTIME_THREAD_PRIORITY0.set_on_this_thread();
-    m_option.options().reset_state();
-
-    ProgramInfo program_info(
-        identifier(),
-        m_option.descriptor().category(),
-        m_option.descriptor().display_name(),
-        timestamp()
-    );
-    CancellableHolder<CancellableScope> scope;
-    ProgramEnvironment env(
+void ComputerProgramSession::load_json(const JsonValue& json){
+    m_instance->load_json(json);
+}
+
+
+std::unique_ptr<ProgramEnvironment> ComputerProgramSession::make_env(const ProgramInfo& program_info){
+    return std::make_unique<ProgramEnvironment>(
         program_info,
         *this,
         current_stats_tracker(), historical_stats_tracker()
     );
-
-    try{
-        logger().log("<b>Starting Program: " + identifier() + "</b>");
-        run_program_instance(env, scope);
-//        m_setup->wait_for_all_requests();
-        logger().log("Program finished normally!", COLOR_BLUE);
-    }catch (OperationCancelledException&){
-    }catch (ProgramCancelledException&){
-    }catch (ProgramFinishedException& e){
-        logger().log("Program finished early!", COLOR_BLUE);
-        e.send_notification(env, m_option.instance().NOTIFICATION_PROGRAM_FINISH);
-    }catch (InvalidConnectionStateException&){
-    }catch (OperationFailedException& e){
-        logger().log("Program stopped with an exception!", COLOR_RED);
-        std::string message = e.message();
-        if (message.empty()){
-            message = e.name();
-        }
-        report_error(message);
-        e.send_notification(env, m_option.instance().NOTIFICATION_ERROR_FATAL);
-    }catch (Exception& e){
-        logger().log("Program stopped with an exception!", COLOR_RED);
-        std::string message = e.message();
-        if (message.empty()){
-            message = e.name();
-        }
-        report_error(message);
-        send_program_fatal_error_notification(
-            env, m_option.instance().NOTIFICATION_ERROR_FATAL,
-            message
-        );
-    }catch (std::exception& e){
-        logger().log("Program stopped with an exception!", COLOR_RED);
-        std::string message = e.what();
-        if (message.empty()){
-            message = "Unknown std::exception.";
-        }
-        report_error(message);
-        send_program_fatal_error_notification(
-            env, m_option.instance().NOTIFICATION_ERROR_FATAL,
-            message
-        );
-    }catch (...){
-        logger().log("Program stopped with an exception!", COLOR_RED);
-        report_error("Unknown error.");
-        send_program_fatal_error_notification(
-            env, m_option.instance().NOTIFICATION_ERROR_FATAL,
-            "Unknown error."
-        );
-    }
+}
+void ComputerProgramSession::internal_run_program(ProgramEnvironment& env){
+    ComputerProgramInstance& instance = static_cast<ComputerProgramInstance&>(*m_instance);
+    instance.program(env, *m_scope);
 }
 
 
diff --git a/SerialPrograms/Source/ComputerPrograms/Framework/ComputerProgramSession.h b/SerialPrograms/Source/ComputerPrograms/Framework/ComputerProgramSession.h
index 3847775205..35bb74059e 100644
--- a/SerialPrograms/Source/ComputerPrograms/Framework/ComputerProgramSession.h
+++ b/SerialPrograms/Source/ComputerPrograms/Framework/ComputerProgramSession.h
@@ -1,6 +1,6 @@
 /*  Computer Program Session
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  *  This class holds the run-time state of a computer program.
  *
@@ -15,7 +15,7 @@
 #ifndef PokemonAutomation_ComputerPrograms_ComputerProgramSession_H
 #define PokemonAutomation_ComputerPrograms_ComputerProgramSession_H
 
-#include "Common/Cpp/Concurrency/SpinLock.h"
+#include "CommonFramework/Panels/PanelSession.h"
 #include "CommonFramework/ProgramSession.h"
 #include "ComputerPrograms/ComputerProgram.h"
 
@@ -26,28 +26,34 @@ class ComputerProgramOption;
 class ProgramEnvironment;
 
 
-class ComputerProgramSession final : public ProgramSession{
+class ComputerProgramSession final
+    : public UiState<ComputerProgramSession, PanelSession>
+    , public ProgramSession
+{
 public:
     virtual ~ComputerProgramSession();
-    ComputerProgramSession(ComputerProgramOption& option);
+    ComputerProgramSession(const ComputerProgramDescriptor& descriptor);
 
-    void restore_defaults();
 
-private:
-    virtual std::string check_validity() const override;
+public:
+    const ComputerProgramDescriptor& descriptor() const{ return m_descriptor; }
+    ConfigOption& options();
+
 
-    virtual void internal_run_program() override;
-    virtual void internal_stop_program() override;
+public:
+    virtual std::string check_validity() const override;
+    virtual void restore_defaults() override;
+    virtual JsonValue to_json() const override;
+    virtual void load_json(const JsonValue& json) override;
 
 
 private:
-    void run_program_instance(ProgramEnvironment& env, CancellableScope& scope);
+    virtual std::unique_ptr<ProgramEnvironment> make_env(const ProgramInfo& program_info) override;
+    virtual void internal_run_program(ProgramEnvironment& env) override;
 
-private:
-    ComputerProgramOption& m_option;
 
-    SpinLock m_lock;
-    CancellableScope* m_scope = nullptr;
+private:
+    const ComputerProgramDescriptor& m_descriptor;
 };
 
 
diff --git a/SerialPrograms/Source/ComputerPrograms/Framework/ComputerProgramWidget.cpp b/SerialPrograms/Source/ComputerPrograms/Framework/ComputerProgramWidget.cpp
index 4181edde5e..0387b85c13 100644
--- a/SerialPrograms/Source/ComputerPrograms/Framework/ComputerProgramWidget.cpp
+++ b/SerialPrograms/Source/ComputerPrograms/Framework/ComputerProgramWidget.cpp
@@ -1,131 +1,121 @@
 /*  Computer Program Widget
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include <QVBoxLayout>
-#include <QLabel>
 #include <QMessageBox>
-#include <QScrollArea>
-#include "Common/Qt/CollapsibleGroupBox.h"
-#include "Common/Qt/Options/ConfigWidget.h"
+#include "Common/Cpp/ScopeExit.h"
 #include "CommonFramework/Panels/PanelTools.h"
 #include "CommonFramework/Panels/UI/PanelElements.h"
-#include "CommonFramework/Tools/StatsTracking.h"
-#include "ComputerPrograms/ComputerProgram.h"
-#include "ComputerPrograms/Framework/ComputerProgramOption.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/ResourceDownload/ProgramResourceDownloadWidget.h"
 #include "ComputerProgramWidget.h"
 
+// #include <iostream>
+// using std::cout;
+// using std::endl;
+
 namespace PokemonAutomation{
 
+template class RegisterUiStateQtWidget<ComputerProgramWidget>;
+
 
 ComputerProgramWidget::~ComputerProgramWidget(){
     m_session.remove_listener(*this);
-    delete m_actions_bar;
-    delete m_stats_bar;
-    delete m_options;
 }
 ComputerProgramWidget::ComputerProgramWidget(
     QWidget& parent,
-    ComputerProgramOption& option,
-    PanelHolder& holder
+    ComputerProgramSession& session
 )
     : QWidget(&parent)
-    , m_holder(holder)
-    , m_session(option)
+    , m_session(session)
 {
-    QVBoxLayout* layout = new QVBoxLayout(this);
-    layout->setContentsMargins(0, 0, 0, 0);
-
-    const ComputerProgramDescriptor& descriptor = option.descriptor();
-
-    CollapsibleGroupBox* header = make_panel_header(
+    m_stats_bar = new StatsBar(*this, m_session);
+    m_actions_bar = new RunnablePanelActionBar(
         *this,
-        descriptor.display_name(),
-        descriptor.doc_link(),
-        descriptor.description()
+        session,
+        session,
+        m_session.current_state()
     );
-    layout->addWidget(header);
-
 
-    {
-        QScrollArea* scroll_outer = new QScrollArea(this);
-        layout->addWidget(scroll_outer);
-        scroll_outer->setWidgetResizable(true);
-
-        QWidget* scroll_inner = new QWidget(scroll_outer);
-        scroll_outer->setWidget(scroll_inner);
-        QVBoxLayout* scroll_layout = new QVBoxLayout(scroll_inner);
-        scroll_layout->setAlignment(Qt::AlignTop);
-
-        m_options = option.options().make_QtWidget(*this);
-        scroll_layout->addWidget(&m_options->widget());
-
-        scroll_layout->addStretch(1);
-    }
-
-    m_stats_bar = new StatsBar(*this);
-    m_stats_bar->set_stats("", m_session.historical_stats());
-    layout->addWidget(m_stats_bar);
-
-    m_actions_bar = new RunnablePanelActionBar(*this, m_session.current_state());
-    layout->addWidget(m_actions_bar);
-
-    connect(
-        m_actions_bar, &RunnablePanelActionBar::start_clicked,
-        this, [&](ProgramState state){
-            std::string error;
-            switch (state){
-            case ProgramState::STOPPED:
-                error = m_session.start_program();
-                break;
-            case ProgramState::RUNNING:
-                error = m_session.stop_program();
-                break;
-            default:;
-            }
-            if (!error.empty()){
-                this->error(error);
-            }
-        }
-    );
-    connect(
-        m_actions_bar, &RunnablePanelActionBar::defaults_clicked,
-        this, [&]{
-            std::lock_guard<std::mutex> lg(m_session.program_lock());
-            option.restore_defaults();
-            m_options->update_all(false);
-        }
+    populate_panel_widget(
+        *this,
+        session.descriptor(),
+        nullptr,
+        session.options(),
+        {m_stats_bar, m_actions_bar}
     );
 
+    m_layout = static_cast<QVBoxLayout*>(this->layout());
+
     m_session.add_listener(*this);
 }
 
 void ComputerProgramWidget::state_change(ProgramState state){
     QMetaObject::invokeMethod(this, [this, state]{
-        m_options->widget().setEnabled(state == ProgramState::STOPPED);
+        m_session.options().report_program_state(state != ProgramState::STOPPED);
         m_actions_bar->set_state(state);
         if (state == ProgramState::STOPPED){
-            m_holder.on_idle();
+            global_panel_holder()->on_idle();
         }else{
-            m_holder.on_busy();
+            global_panel_holder()->on_busy();
         }
-    });
+
+        if(state == ProgramState::STOPPING){
+            ensure_downloads_table()->remove_all_downloads();
+        }        
+    }, Qt::QueuedConnection);
 }
 void ComputerProgramWidget::stats_update(const StatsTracker* current_stats, const StatsTracker* historical_stats){
     QMetaObject::invokeMethod(this, [this, current_stats, historical_stats]{
         m_stats_bar->set_stats(
-            current_stats == nullptr ? "" : current_stats->to_str(),
-            historical_stats == nullptr ? "" : historical_stats->to_str()
+            current_stats == nullptr ? "" : current_stats->to_str(StatsTracker::DISPLAY_ON_SCREEN),
+            historical_stats == nullptr ? "" : historical_stats->to_str(StatsTracker::DISPLAY_ON_SCREEN)
         );
-    });
+    }, Qt::QueuedConnection);
 }
 void ComputerProgramWidget::error(const std::string& message){
     QMetaObject::invokeMethod(this, [message]{
         QMessageBox box;
         box.critical(nullptr, "Error", QString::fromStdString(message));
+    }, Qt::QueuedConnection);
+}
+
+void ComputerProgramWidget::download_error(const std::string& message){
+    if (m_popup_is_open.exchange(true)){ // only show popups if one isn't already open
+        return;
+    }
+
+    ScopeExit scope([&]{
+        m_popup_is_open.store(false, std::memory_order_release);
     });
+
+    QMetaObject::invokeMethod(this, [message]{
+        QMessageBox box;
+        box.critical(nullptr, "Error", QString::fromStdString(message));
+    }, Qt::QueuedConnection);
+}
+
+void ComputerProgramWidget::download_added(std::shared_ptr<ResourceDownload> download_ptr){
+    QMetaObject::invokeMethod(this, [this, download_ptr = std::move(download_ptr)]() mutable{
+        this->ensure_downloads_table()->add_download(std::move(download_ptr));
+    }, Qt::QueuedConnection);
+}
+
+void ComputerProgramWidget::all_downloads_done(){
+    QMetaObject::invokeMethod(this, [this]{
+        this->ensure_downloads_table()->remove_all_downloads();
+    }, Qt::QueuedConnection);
+}
+
+ProgramResourceDownloadTableWidget* ComputerProgramWidget::ensure_downloads_table(){
+    if (!m_internal_lazy_downloads_table){
+        m_internal_lazy_downloads_table = new ProgramResourceDownloadTableWidget(*this);
+        m_internal_lazy_downloads_table->setVisible(false);
+        m_layout->addWidget(m_internal_lazy_downloads_table);
+    }
+    return m_internal_lazy_downloads_table;
 }
 
 
diff --git a/SerialPrograms/Source/ComputerPrograms/Framework/ComputerProgramWidget.h b/SerialPrograms/Source/ComputerPrograms/Framework/ComputerProgramWidget.h
index 61cff1f222..dcd0953f18 100644
--- a/SerialPrograms/Source/ComputerPrograms/Framework/ComputerProgramWidget.h
+++ b/SerialPrograms/Source/ComputerPrograms/Framework/ComputerProgramWidget.h
@@ -1,6 +1,6 @@
 /*  Computer Program Widget
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  *  This is the Qt Widget implementation of the UI for ComputerProgramSession.
  *
@@ -18,35 +18,53 @@
 #ifndef PokemonAutomation_ComputerPrograms_ComputerProgramWidget_H
 #define PokemonAutomation_ComputerPrograms_ComputerProgramWidget_H
 
+#include <QVBoxLayout>
+#include "Common/Qt/UiStateQtWidget.h"
 #include "CommonFramework/Panels/UI/PanelElements.h"
-#include "ComputerPrograms/ComputerProgram.h"
 #include "ComputerPrograms/Framework/ComputerProgramSession.h"
 #include "ComputerProgramSession.h"
 
 namespace PokemonAutomation{
 
+    class ProgramResourceDownloadTableWidget;
 
 
-class ComputerProgramWidget : public QWidget, private ProgramSession::Listener{
+
+class ComputerProgramWidget
+    : public QWidget
+    , public UiComponentQtWidget
+    , private ProgramSession::Listener
+{
+public:
+    using ParentState = ComputerProgramSession;
+
 public:
     ~ComputerProgramWidget();
-    ComputerProgramWidget(
-        QWidget& parent,
-        ComputerProgramOption& option,
-        PanelHolder& holder
-    );
+    ComputerProgramWidget(QWidget& parent, ComputerProgramSession& session);
+
+    virtual QWidget& widget() override{
+        return *this;
+    }
 
 private:
     virtual void state_change(ProgramState state) override;
     virtual void stats_update(const StatsTracker* current_stats, const StatsTracker* historical_stats) override;
     virtual void error(const std::string& message) override;
+    virtual void download_error(const std::string& message) override;
+    virtual void download_added(std::shared_ptr<ResourceDownload> download_ptr) override;
+    virtual void all_downloads_done() override;
+
+    ProgramResourceDownloadTableWidget* ensure_downloads_table();
 
 private:
-    PanelHolder& m_holder;
-    ComputerProgramSession m_session;
-    ConfigWidget* m_options;
+    ComputerProgramSession& m_session;
+    QVBoxLayout* m_layout;
     StatsBar* m_stats_bar;
     RunnablePanelActionBar* m_actions_bar;
+
+    // WARNING: Do not use directly. Always use ensure_downloads_table().
+    ProgramResourceDownloadTableWidget* m_internal_lazy_downloads_table = nullptr;
+    std::atomic<bool> m_popup_is_open{false};
 };
 
 
diff --git a/SerialPrograms/Source/ControllerInput/ControllerInput.cpp b/SerialPrograms/Source/ControllerInput/ControllerInput.cpp
new file mode 100644
index 0000000000..3e6b059654
--- /dev/null
+++ b/SerialPrograms/Source/ControllerInput/ControllerInput.cpp
@@ -0,0 +1,81 @@
+/*  Controller Input
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <vector>
+#include "Keyboard/GlobalKeyboardHidTracker.h"
+#include "ControllerInput.h"
+
+namespace PokemonAutomation{
+
+
+
+class GlobalInputSources{
+public:
+    GlobalInputSources(){
+        //
+        //  When we add more input types, add them here.
+        //
+
+        m_input_sources.emplace_back(&global_keyboard_tracker());
+
+    }
+
+    void stop(){
+        for (ControllerInputSource* source : m_input_sources){
+            source->stop();
+        }
+    }
+    void clear_state(){
+        for (ControllerInputSource* source : m_input_sources){
+            source->clear_state();
+        }
+    }
+    void add_listener(ControllerInputListener& listener){
+        for (ControllerInputSource* source : m_input_sources){
+            source->add_listener(listener);
+        }
+    }
+    void remove_listener(ControllerInputListener& listener){
+        for (ControllerInputSource* source : m_input_sources){
+            source->remove_listener(listener);
+        }
+    }
+
+
+private:
+    std::vector<ControllerInputSource*> m_input_sources;
+};
+
+
+
+
+
+
+GlobalInputSources& global_input_sources(){
+    static GlobalInputSources sources;
+    return sources;
+}
+
+
+
+
+void global_input_stop(){
+    global_input_sources().stop();
+}
+void global_input_clear_state(){
+    global_input_sources().clear_state();
+}
+void global_input_add_listener(ControllerInputListener& listener){
+    global_input_sources().add_listener(listener);
+}
+void global_input_remove_listener(ControllerInputListener& listener){
+    global_input_sources().remove_listener(listener);
+}
+
+
+
+
+}
diff --git a/SerialPrograms/Source/ControllerInput/ControllerInput.h b/SerialPrograms/Source/ControllerInput/ControllerInput.h
new file mode 100644
index 0000000000..df2c99cc0d
--- /dev/null
+++ b/SerialPrograms/Source/ControllerInput/ControllerInput.h
@@ -0,0 +1,111 @@
+/*  Controller Input
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_ControllerInput_ControllerInput_H
+#define PokemonAutomation_ControllerInput_ControllerInput_H
+
+#include "Common/Compiler.h"
+#include "Common/Cpp/ListenerSet.h"
+
+namespace PokemonAutomation{
+
+
+enum class ControllerInputType{
+    HID_Keyboard,
+    StandardGamepad,
+};
+
+
+
+class ControllerInputState{
+public:
+    ControllerInputState(ControllerInputType type)
+        : m_type(type)
+    {}
+
+    ControllerInputType type() const{
+        return m_type;
+    }
+
+    virtual void clear() = 0;
+    virtual bool is_neutral() const = 0;
+    virtual bool operator==(const ControllerInputState& state) const = 0;
+    bool operator!=(const ControllerInputState& state) const{
+        return !operator==(state);
+    }
+
+private:
+    const ControllerInputType m_type;
+};
+
+
+
+struct ControllerInputListener{
+    virtual void run_controller_input(ControllerInputState& state) = 0;
+};
+
+
+
+
+
+class ControllerInputSource{
+public:
+    //  This called before program shutdown. Child classes should shutdown any
+    //  threads they own to avoid static-deinit shenanigans.
+    virtual void stop() noexcept = 0;
+
+    //  User has switched away from the current console.
+    //  Release all buttons and reset back to neutral state.
+    virtual void clear_state() = 0;
+
+    //  These are called when controller inputs are enabled/disabled.
+    void add_listener(ControllerInputListener& listener){
+        m_listeners.add(listener);
+    }
+    void remove_listener(ControllerInputListener& listener){
+        m_listeners.remove(listener);
+    }
+
+protected:
+    ListenerSet<ControllerInputListener> m_listeners;
+};
+
+
+
+//  This is called at the end of main() before program shutdown. This allows all
+//  inputs to end their threads to avoid static-deinit shenanigans.
+void global_input_stop();
+
+//  This is called whenever the user switches away from the current console.
+//  Release all buttons and reset back to neutral state.
+void global_input_clear_state();
+
+//  These are called when controller inputs are enabled/disabled as a result
+//  of switching to/from a console or starting/stopping a program.
+void global_input_add_listener(ControllerInputListener& listener);
+void global_input_remove_listener(ControllerInputListener& listener);
+
+
+
+
+
+
+
+
+
+
+
+}
+#endif
+
+
+
+
+
+
+
+
+
diff --git a/SerialPrograms/Source/ControllerInput/Keyboard/GlobalKeyboardHidTracker.cpp b/SerialPrograms/Source/ControllerInput/Keyboard/GlobalKeyboardHidTracker.cpp
new file mode 100644
index 0000000000..734b7d64a3
--- /dev/null
+++ b/SerialPrograms/Source/ControllerInput/Keyboard/GlobalKeyboardHidTracker.cpp
@@ -0,0 +1,221 @@
+/*  Global Keyboard HID Tracker
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Exceptions.h"
+#include "Common/Cpp/PanicDump.h"
+#include "Common/Cpp/Logging/GlobalLogger.h"
+#include "CommonFramework/Logging/Logger.h"
+#include "CommonFramework/Tools/GlobalThreadPools.h"
+#include "KeyboardInput_State.h"
+#include "KeyboardInput_KeyMappings.h"
+#include "GlobalKeyboardHidTracker.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+
+
+
+
+KeyboardHidTracker& global_keyboard_tracker(){
+    static KeyboardHidTracker tracker;
+    return tracker;
+}
+
+
+
+
+KeyboardHidTracker::~KeyboardHidTracker(){
+    stop();
+}
+KeyboardHidTracker::KeyboardHidTracker()
+    : m_logger(global_logger_raw(), "Keyboard")
+    , m_stopping(false)
+    , m_thread(
+        GlobalThreadPools::unlimited_realtime().dispatch_now_blocking([this]{
+            run_with_catch(
+                "KeyboardHidTracker::thread_loop()",
+                [this]{ thread_loop(); }
+            );
+        })
+    )
+{}
+
+
+void KeyboardHidTracker::stop() noexcept{
+    if (!m_thread){
+        return;
+    }
+    m_stopping.store(true, std::memory_order_release);
+    {
+        std::lock_guard<Mutex> lg(m_sleep_lock);
+    }
+    m_cv.notify_all();
+    m_thread.wait_and_ignore_exceptions();
+}
+
+
+void KeyboardHidTracker::clear_state(){
+    {
+        WriteSpinLock lg(m_state_lock);
+        m_state_tracker.clear();
+    }
+
+    std::lock_guard<Mutex> lg(m_sleep_lock);
+    m_cv.notify_all();
+}
+
+void KeyboardHidTracker::on_key_press(const void* key){
+    const QKeyEvent& qkey = *(const QKeyEvent*)key;
+    QtKeyMap::instance().record(qkey);
+    {
+        WriteSpinLock lg(m_state_lock);
+        m_state_tracker.press(qkey.nativeVirtualKey());
+    }
+
+    std::lock_guard<Mutex> lg(m_sleep_lock);
+    m_cv.notify_all();
+}
+void KeyboardHidTracker::on_key_release(const void* key){
+    const QKeyEvent& qkey = *(const QKeyEvent*)key;
+    QtKeyMap::instance().record(qkey);
+    {
+        WriteSpinLock lg(m_state_lock);
+        m_state_tracker.release(qkey.nativeVirtualKey());
+    }
+
+    std::lock_guard<Mutex> lg(m_sleep_lock);
+    m_cv.notify_all();
+}
+
+
+KeyboardInputState KeyboardHidTracker::keys_to_state(const std::set<uint32_t>& pressed_native_keys) const{
+    const QtKeyMap& qkey_map = QtKeyMap::instance();
+    const KeyboardInputMappings& hid_map = get_keyid_to_hid_map();
+
+    KeyboardInputState ret;
+    for (uint32_t native_key : pressed_native_keys){
+        std::set<QtKeyMap::QtKey> qkeys = qkey_map.get_QtKeys(native_key);
+        for (const QtKeyMap::QtKey& qkey : qkeys){
+//            cout << "qkey = " << qkey.key << " : " << qkey.keypad << endl;
+            KeyboardKey key = hid_map.get(qkey);
+            if (key != KeyboardKey::KEY_NONE){
+                ret.add(key);
+            }
+//            log_qtkey(m_logger, qkey);
+        }
+    }
+
+    return ret;
+}
+
+
+void KeyboardHidTracker::thread_loop(){
+    KeyboardInputState last;
+    KeyboardInputState current;
+
+    bool last_neutral = true;
+    WallClock last_press = current_time();
+    while (!m_stopping.load(std::memory_order_acquire)){
+        //  Get the raw keyboard state.
+        std::set<uint32_t> pressed_native_keys;
+        WallClock next_wake;
+        {
+            ReadSpinLock lg(m_state_lock);
+            pressed_native_keys = m_state_tracker.get_currently_pressed();
+            next_wake = m_state_tracker.next_state_change();
+        }
+
+        current = keys_to_state(pressed_native_keys);
+
+#if 0
+        std::string str;
+        for (KeyboardKey key : current.keys()){
+            if (!str.empty()){
+                str += ", ";
+            }
+            auto iter = KEYBOARDKEY_TO_STRING().find(key);
+            if (iter != KEYBOARDKEY_TO_STRING().end()){
+                str += iter->second;
+            }
+        }
+        if (!str.empty()){
+            cout << "Key State: " << str << endl;
+        }
+#endif
+
+        bool neutral = current.is_neutral();
+//        cout << "neutral = " << neutral << endl;
+
+        //  Send the command.
+        WallClock now;
+        do{
+            now = current_time();
+            if (neutral && last_neutral){
+                continue;
+            }
+            try{
+//                current.print();
+                if (current == last && last_press + std::chrono::milliseconds(1000) > now){
+//                    cout << "No state change." << endl;
+                    break;
+                }
+
+                //  If state is neutral, just issue a stop.
+                if (neutral){
+                    m_listeners.run_method(&ControllerInputListener::run_controller_input, current);
+//                    cancel_all_commands();
+                    last.clear();
+                    last_neutral = true;
+                    last_press = now;
+                    break;
+                }
+
+                //  If the new state is different, set next interrupt so the new
+                //  new command can replace the current one without gaps.
+                if (!last_neutral && current != last){
+//                    replace_on_next_command();
+                }
+
+                //  Send the command.
+//                cout << "send_state()" << endl;
+                m_listeners.run_method(&ControllerInputListener::run_controller_input, current);
+//                send_state(*current);
+
+                std::swap(last, current);
+                last_neutral = false;
+                last_press = now;
+            }catch (Exception& e){
+                e.log(global_logger_tagged());
+            }
+        }while (false);
+
+
+        //  Wait for next event.
+        std::unique_lock<Mutex> lg(m_sleep_lock);
+        if (m_stopping.load(std::memory_order_acquire)){
+            return;
+        }
+
+        //  Nothing held down.
+        if (last_neutral && next_wake == WallClock::max()){
+//            cout << "wait - long" << endl;
+            m_cv.wait(lg);
+        }else{
+//            cout << "wait - short" << endl;
+            m_cv.wait_until(lg, std::min(next_wake, now + std::chrono::milliseconds(1000)));
+        }
+    }
+}
+
+
+
+
+
+
+}
diff --git a/SerialPrograms/Source/ControllerInput/Keyboard/GlobalKeyboardHidTracker.h b/SerialPrograms/Source/ControllerInput/Keyboard/GlobalKeyboardHidTracker.h
new file mode 100644
index 0000000000..8c6b2059f6
--- /dev/null
+++ b/SerialPrograms/Source/ControllerInput/Keyboard/GlobalKeyboardHidTracker.h
@@ -0,0 +1,62 @@
+/*  Global Keyboard HID Tracker
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_ControllerInput_Keyboard_GlobalKeyboardHidTracker_H
+#define PokemonAutomation_ControllerInput_Keyboard_GlobalKeyboardHidTracker_H
+
+#include <set>
+#include "Common/Cpp/Logging/TaggedLogger.h"
+#include "Common/Cpp/Concurrency/SpinLock.h"
+#include "Common/Cpp/Concurrency/Mutex.h"
+#include "Common/Cpp/Concurrency/ConditionVariable.h"
+#include "Common/Cpp/Concurrency/AsyncTask.h"
+#include "ControllerInput/ControllerInput.h"
+//#include "KeyboardHidButtons.h"
+#include "KeyboardInput_State.h"
+#include "KeyboardInput_StateTracker.h"
+
+namespace PokemonAutomation{
+
+
+class KeyboardHidTracker final : public ControllerInputSource{
+public:
+    ~KeyboardHidTracker();
+    KeyboardHidTracker();
+
+    virtual void stop() noexcept override;
+    virtual void clear_state() override;
+
+    void on_key_press(const void* key);
+    void on_key_release(const void* key);
+
+
+private:
+    KeyboardInputState keys_to_state(const std::set<uint32_t>& pressed_native_keys) const;
+    void thread_loop();
+
+
+private:
+    TaggedLogger m_logger;
+
+    //  Controller State
+    SpinLock m_state_lock;
+    KeyboardStateTracker m_state_tracker;
+
+    std::atomic<bool> m_stopping;
+
+    Mutex m_sleep_lock;
+    ConditionVariable m_cv;
+    AsyncTask m_thread;
+};
+
+
+KeyboardHidTracker& global_keyboard_tracker();
+
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/ControllerInput/Keyboard/GlobalQtKeyMap.cpp b/SerialPrograms/Source/ControllerInput/Keyboard/GlobalQtKeyMap.cpp
new file mode 100644
index 0000000000..f2218a3d72
--- /dev/null
+++ b/SerialPrograms/Source/ControllerInput/Keyboard/GlobalQtKeyMap.cpp
@@ -0,0 +1,53 @@
+/*  Global Qt Key Map
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <QKeyEvent>
+#include "Common/Cpp/Concurrency/SpinLock.h"
+#include "GlobalQtKeyMap.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+
+
+
+QtKeyMap::QtKey QtKeyMap::record(const QKeyEvent& event){
+    int qt_key = event.key();
+    uint32_t native_key = event.nativeVirtualKey();
+
+    QtKeyMap::QtKey ret{Qt::Key_unknown};
+
+    if (native_key == 0 && (qt_key == 0 || qt_key == Qt::Key_unknown)){
+        // both native key and Qt key event is 0 or unknown, meaning we really don't know
+        // what key event it is. Skip
+        return ret;
+    }
+
+    ret.key = (Qt::Key)qt_key;
+    ret.keypad = (event.modifiers() & Qt::KeypadModifier) != 0;
+
+//    cout << "key: " << ret.key << ", keypad = " << ret.keypad << endl;
+
+    WriteSpinLock lg(m_lock, PA_CURRENT_FUNCTION);
+    m_map[native_key].insert(ret);
+
+    return ret;
+}
+
+std::set<QtKeyMap::QtKey> QtKeyMap::get_QtKeys(uint32_t native_key) const{
+    ReadSpinLock lg(m_lock, PA_CURRENT_FUNCTION);
+    auto iter = m_map.find(native_key);
+    if (iter != m_map.end()){
+        return iter->second;
+    }
+    return {};
+}
+
+
+
+}
diff --git a/SerialPrograms/Source/ControllerInput/Keyboard/GlobalQtKeyMap.h b/SerialPrograms/Source/ControllerInput/Keyboard/GlobalQtKeyMap.h
new file mode 100644
index 0000000000..b2dca8eab4
--- /dev/null
+++ b/SerialPrograms/Source/ControllerInput/Keyboard/GlobalQtKeyMap.h
@@ -0,0 +1,63 @@
+/*  Global Qt Key Map
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_ControllerInput_Keyboard_GlobalQtKeyMap_H
+#define PokemonAutomation_ControllerInput_Keyboard_GlobalQtKeyMap_H
+
+#include <set>
+#include <map>
+#include <QKeyEvent>
+#include "Common/Cpp/Concurrency/SpinLock.h"
+
+namespace PokemonAutomation{
+
+
+
+
+class QtKeyMap{
+public:
+    struct QtKey{
+        Qt::Key key;
+        bool keypad;
+
+        QtKey(Qt::Key key, bool keypad = false)
+            : key(key)
+            , keypad(keypad)
+        {}
+
+        bool operator<(const QtKey& x) const{
+            if (keypad != x.keypad){
+                return x.keypad;
+            }
+            return key < x.key;
+        }
+    };
+
+public:
+    static QtKeyMap& instance(){
+        static QtKeyMap map;
+        return map;
+    }
+
+    QtKeyMap::QtKey record(const QKeyEvent& event);
+
+    std::set<QtKey> get_QtKeys(uint32_t native_key) const;
+
+
+private:
+    QtKeyMap() = default;
+
+
+private:
+    mutable SpinLock m_lock;
+    //  Map of native key to Qt's key ID.
+    std::map<uint32_t, std::set<QtKey>> m_map;
+};
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/ControllerInput/Keyboard/KeyBindingOption.cpp b/SerialPrograms/Source/ControllerInput/Keyboard/KeyBindingOption.cpp
new file mode 100644
index 0000000000..9fbafb2228
--- /dev/null
+++ b/SerialPrograms/Source/ControllerInput/Keyboard/KeyBindingOption.cpp
@@ -0,0 +1,98 @@
+/*  Key Binding Option
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Json/JsonValue.h"
+#include "Common/Cpp/Containers/Pimpl.tpp"
+#include "Common/Cpp/Concurrency/SpinLock.h"
+#include "KeyBindingOption.h"
+
+namespace PokemonAutomation{
+
+
+
+struct KeyboardHidBindingCell::Data{
+    const KeyboardKey m_default;
+
+    mutable SpinLock m_lock;
+    KeyboardKey m_current;
+    std::string m_current_text;
+
+    Data(KeyboardKey default_value)
+        : m_default(default_value)
+        , m_current(default_value)
+    {}
+};
+
+
+
+KeyboardHidBindingCell::~KeyboardHidBindingCell(){
+
+}
+KeyboardHidBindingCell::KeyboardHidBindingCell(LockMode lock_while_program_is_running)
+    : UiState<KeyboardHidBindingCell, ConfigOption>(lock_while_program_is_running)
+    , m_data(CONSTRUCT_TOKEN, (KeyboardKey)0)
+{}
+
+
+KeyboardHidBindingCell::operator KeyboardKey() const{
+    ReadSpinLock lg(m_data->m_lock);
+    return m_data->m_current;
+}
+KeyboardHidBindingCell::operator std::string() const{
+    ReadSpinLock lg(m_data->m_lock);
+    return m_data->m_current_text;
+}
+void KeyboardHidBindingCell::set(KeyboardKey key){
+    {
+        ReadSpinLock lg(m_data->m_lock);
+        m_data->m_current = key;
+    }
+    report_value_changed(this);
+}
+void KeyboardHidBindingCell::set(std::string text){
+    ReadSpinLock lg(m_data->m_lock);
+    m_data->m_current_text = std::move(text);
+}
+
+
+
+void KeyboardHidBindingCell::restore_defaults(){
+    set(m_data->m_default);
+}
+JsonValue KeyboardHidBindingCell::to_json() const{
+    ReadSpinLock lg(m_data->m_lock);
+    return (uint64_t)m_data->m_current;
+}
+void KeyboardHidBindingCell::load_json(const JsonValue& json){
+    set((KeyboardKey)json.to_integer_default(0));
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}
diff --git a/SerialPrograms/Source/ControllerInput/Keyboard/KeyBindingOption.h b/SerialPrograms/Source/ControllerInput/Keyboard/KeyBindingOption.h
new file mode 100644
index 0000000000..73db70bca0
--- /dev/null
+++ b/SerialPrograms/Source/ControllerInput/Keyboard/KeyBindingOption.h
@@ -0,0 +1,49 @@
+/*  Key Binding Option
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Options_KeyBindingOption_H
+#define PokemonAutomation_Options_KeyBindingOption_H
+
+#include "Common/Cpp/Containers/Pimpl.h"
+#include "Common/Cpp/Options/ConfigOption.h"
+#include "ControllerInput/Keyboard/KeyboardHidButtons.h"
+
+namespace PokemonAutomation{
+
+
+
+
+class KeyboardHidBindingCell : public UiState<KeyboardHidBindingCell, ConfigOption>{
+public:
+    ~KeyboardHidBindingCell();
+    KeyboardHidBindingCell(LockMode lock_while_program_is_running);
+
+    operator KeyboardKey() const;
+    operator std::string() const;
+    void set(KeyboardKey key);
+
+
+public:
+    virtual void restore_defaults() override;
+    virtual JsonValue to_json() const override;
+    virtual void load_json(const JsonValue& json) override;
+
+
+public:
+    //  UI Functions
+    void set(std::string text);
+
+
+private:
+    struct Data;
+    Pimpl<Data> m_data;
+};
+
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/ControllerInput/Keyboard/KeyBindingWidget.cpp b/SerialPrograms/Source/ControllerInput/Keyboard/KeyBindingWidget.cpp
new file mode 100644
index 0000000000..a7e3c957b7
--- /dev/null
+++ b/SerialPrograms/Source/ControllerInput/Keyboard/KeyBindingWidget.cpp
@@ -0,0 +1,70 @@
+/*  Key Binding Widget
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <QKeyEvent>
+#include "CommonFramework/Logging/Logger.h"
+#include "ControllerInput/Keyboard/GlobalQtKeyMap.h"
+#include "ControllerInput/Keyboard/KeyboardInput_KeyMappings.h"
+#include "KeyBindingWidget.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+
+
+template class RegisterUiStateQtWidget<KeyboardHidBindingCellWidget>;
+
+
+
+KeyboardHidBindingCellWidget::~KeyboardHidBindingCellWidget(){
+    m_value.remove_listener(*this);
+}
+KeyboardHidBindingCellWidget::KeyboardHidBindingCellWidget(QWidget& parent, KeyboardHidBindingCell& value)
+    : QLineEdit(&parent)
+    , ConfigWidget(value, *this)
+    , m_value(value)
+{
+    KeyboardHidBindingCellWidget::update_value();
+    m_value.add_listener(*this);
+}
+
+
+void KeyboardHidBindingCellWidget::keyPressEvent(QKeyEvent* event){
+    QtKeyMap::QtKey qkey = QtKeyMap::instance().record(*event);
+
+    const KeyboardInputMappings& MAP = get_keyid_to_hid_map();
+    KeyboardKey key = MAP.get(qkey);
+
+    if (key == KeyboardKey::KEY_NONE){
+        global_logger_tagged().log("Unable to map Qt::Key to HID ID: " + std::to_string(event->key()));
+        return;
+    }
+
+    m_value.set(key);
+}
+
+
+void KeyboardHidBindingCellWidget::update_value(){
+    const std::map<KeyboardKey, std::string>& MAP = KEYBOARDKEY_TO_STRING();
+    auto iter = MAP.find(m_value);
+    if (iter != MAP.end()){
+        this->setText(QString::fromStdString(std::to_string((int)m_value) + ": " + iter->second));
+    }else{
+        this->setText(QString::fromStdString(std::to_string((int)m_value)));
+    }
+}
+void KeyboardHidBindingCellWidget::on_config_value_changed(void* object){
+    QMetaObject::invokeMethod(this, [this]{
+        update_value();
+    }, Qt::QueuedConnection);
+}
+
+
+
+
+}
diff --git a/SerialPrograms/Source/ControllerInput/Keyboard/KeyBindingWidget.h b/SerialPrograms/Source/ControllerInput/Keyboard/KeyBindingWidget.h
new file mode 100644
index 0000000000..00b63500da
--- /dev/null
+++ b/SerialPrograms/Source/ControllerInput/Keyboard/KeyBindingWidget.h
@@ -0,0 +1,40 @@
+/*  Key Binding Widget
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Options_KeyBindingWidget_H
+#define PokemonAutomation_Options_KeyBindingWidget_H
+
+#include <QLineEdit>
+#include "Common/Qt/Options/ConfigWidget.h"
+#include "KeyBindingOption.h"
+
+namespace PokemonAutomation{
+
+
+
+class KeyboardHidBindingCellWidget : public QLineEdit, public ConfigWidget{
+public:
+    using ParentState = KeyboardHidBindingCell;
+
+public:
+    ~KeyboardHidBindingCellWidget();
+    KeyboardHidBindingCellWidget(QWidget& parent, KeyboardHidBindingCell& value);
+
+    virtual void update_value() override;
+    virtual void on_config_value_changed(void* object) override;
+
+    virtual void keyPressEvent(QKeyEvent* event) override;
+
+private:
+    KeyboardHidBindingCell& m_value;
+};
+
+
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/ControllerInput/Keyboard/KeyboardHidButtons.h b/SerialPrograms/Source/ControllerInput/Keyboard/KeyboardHidButtons.h
new file mode 100644
index 0000000000..85f6a2504f
--- /dev/null
+++ b/SerialPrograms/Source/ControllerInput/Keyboard/KeyboardHidButtons.h
@@ -0,0 +1,197 @@
+/*  HID Keyboard Buttons
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_ControllerInput_Keyboard_KeyboardHidButtons_H
+#define PokemonAutomation_ControllerInput_Keyboard_KeyboardHidButtons_H
+
+#include <stdint.h>
+
+
+namespace PokemonAutomation{
+
+
+
+//  Taken from: https://gist.github.com/MightyPork/6da26e382a7ad91b5496ee55fdc73db2
+enum KeyboardKey : uint8_t{
+    KEY_NONE    =   0x00,
+
+    KEY_A   =   0x04,
+    KEY_B   =   0x05,
+    KEY_C   =   0x06,
+    KEY_D   =   0x07,
+    KEY_E   =   0x08,
+    KEY_F   =   0x09,
+    KEY_G   =   0x0a,
+    KEY_H   =   0x0b,
+    KEY_I   =   0x0c,
+    KEY_J   =   0x0d,
+    KEY_K   =   0x0e,
+    KEY_L   =   0x0f,
+    KEY_M   =   0x10,
+    KEY_N   =   0x11,
+    KEY_O   =   0x12,
+    KEY_P   =   0x13,
+    KEY_Q   =   0x14,
+    KEY_R   =   0x15,
+    KEY_S   =   0x16,
+    KEY_T   =   0x17,
+    KEY_U   =   0x18,
+    KEY_V   =   0x19,
+    KEY_W   =   0x1a,
+    KEY_X   =   0x1b,
+    KEY_Y   =   0x1c,
+    KEY_Z   =   0x1d,
+
+    KEY_1   =   0x1e,
+    KEY_2   =   0x1f,
+    KEY_3   =   0x20,
+    KEY_4   =   0x21,
+    KEY_5   =   0x22,
+    KEY_6   =   0x23,
+    KEY_7   =   0x24,
+    KEY_8   =   0x25,
+    KEY_9   =   0x26,
+    KEY_0   =   0x27,
+
+    KEY_ENTER       =   0x28,
+    KEY_ESC         =   0x29,
+    KEY_BACKSPACE   =   0x2a,
+    KEY_TAB         =   0x2b,
+    KEY_SPACE       =   0x2c,
+    KEY_MINUS       =   0x2d,   //  - and _
+    KEY_EQUAL       =   0x2e,   //  = and +
+    KEY_LEFT_BRACE  =   0x2f,   //  [ and {
+    KEY_RIGHT_BRACE =   0x30,   //  ] and }
+    KEY_BACKSLASH   =   0x31,   //  \ and |
+    KEY_HASHTILDE   =   0x32,   //  # and ~ (non-US)
+    KEY_SEMICOLON   =   0x33,   //  ; and :
+    KEY_APOSTROPHE  =   0x34,   //  ' and "
+    KEY_GRAVE       =   0x35,   //  ` and ~
+    KEY_COMMA       =   0x36,   //  , and <
+    KEY_DOT         =   0x37,   //  . and >
+    KEY_SLASH       =   0x38,   //  / and ?
+    KEY_CAPS_LOCK   =   0x39,
+
+    KEY_F1          =   0x3a,
+    KEY_F2          =   0x3b,
+    KEY_F3          =   0x3c,
+    KEY_F4          =   0x3d,
+    KEY_F5          =   0x3e,
+    KEY_F6          =   0x3f,
+    KEY_F7          =   0x40,
+    KEY_F8          =   0x41,
+    KEY_F9          =   0x42,
+    KEY_F10         =   0x43,
+    KEY_F11         =   0x44,
+    KEY_F12         =   0x45,
+
+    KEY_PRINT_SCREEN    =   0x46,
+    KEY_SCROLL_LOCK     =   0x47,
+    KEY_PAUSE           =   0x48,
+    KEY_INSERT          =   0x49,
+    KEY_HOME            =   0x4a,
+    KEY_PAGE_UP         =   0x4b,
+    KEY_DELETE          =   0x4c,
+    KEY_END             =   0x4d,
+    KEY_PAGE_DOWN       =   0x4e,
+    KEY_RIGHT           =   0x4f,
+    KEY_LEFT            =   0x50,
+    KEY_DOWN            =   0x51,
+    KEY_UP              =   0x52,
+    KEY_NUM_LOCK        =   0x53,
+    KEY_KP_SLASH        =   0x54,
+    KEY_KP_ASTERISK     =   0x55,
+    KEY_KP_MINUS        =   0x56,
+    KEY_KP_PLUS         =   0x57,
+    KEY_KP_ENTER        =   0x58,
+    KEY_KP_1            =   0x59,
+    KEY_KP_2            =   0x5a,
+    KEY_KP_3            =   0x5b,
+    KEY_KP_4            =   0x5c,
+    KEY_KP_5            =   0x5d,
+    KEY_KP_6            =   0x5e,
+    KEY_KP_7            =   0x5f,
+    KEY_KP_8            =   0x60,
+    KEY_KP_9            =   0x61,
+    KEY_KP_0            =   0x62,
+    KEY_KP_DOT          =   0x63,   //  . and Del
+
+    KEY_102ND           =   0x64,   //  \ and | (non-US)
+    KEY_COMPOSE         =   0x65,
+    KEY_POWER           =   0x66,
+    KEY_KP_EQUAL        =   0x67,
+
+    KEY_F13         =   0x68,
+    KEY_F14         =   0x69,
+    KEY_F15         =   0x6a,
+    KEY_F16         =   0x6b,
+    KEY_F17         =   0x6c,
+    KEY_F18         =   0x6d,
+    KEY_F19         =   0x6e,
+    KEY_F20         =   0x6f,
+    KEY_F21         =   0x70,
+    KEY_F22         =   0x71,
+    KEY_F23         =   0x72,
+    KEY_F24         =   0x73,
+
+    KEY_OPEN        =   0x74,
+    KEY_HELP        =   0x75,
+    KEY_MENU        =   0x76,
+    KEY_SELECT      =   0x77,
+    KEY_STOP        =   0x78,
+    KEY_AGAIN       =   0x79,
+    KEY_UNDO        =   0x7a,
+    KEY_CUT         =   0x7b,
+    KEY_COPY        =   0x7c,
+    KEY_PASTE       =   0x7d,
+    KEY_FIND        =   0x7e,
+
+    KEY_VOLUME_MUTE =   0x7f,
+    KEY_VOLUME_UP   =   0x80,
+    KEY_VOLUME_DOWN =   0x81,
+
+    KEY_KP_COMMA    =   0x85,
+
+    KEY_LEFT_CTRL   =   0xe0,
+    KEY_LEFT_SHIFT  =   0xe1,
+    KEY_LEFT_ALT    =   0xe2,
+    KEY_LEFT_META   =   0xe3,
+    KEY_RIGHT_CTRL  =   0xe4,
+    KEY_RIGHT_SHIFT =   0xe5,
+    KEY_RIGHT_ALT   =   0xe6,
+    KEY_RIGHT_META  =   0xe7,
+
+    KEY_MEDIA_PLAYPAUSE     =   0xe8,
+    KEY_MEDIA_STOPCD        =   0xe9,
+    KEY_MEDIA_PREVIOUS_SONG =   0xea,
+    KEY_MEDIA_NEXT_SONG     =   0xeb,
+    KEY_MEDIA_EJECTCD       =   0xec,
+    KEY_MEDIA_VOLUME_UP     =   0xed,
+    KEY_MEDIA_VOLUME_DOWN   =   0xee,
+    KEY_MEDIA_MUTE          =   0xef,
+    KEY_MEDIA_WWW           =   0xf0,
+    KEY_MEDIA_BACK          =   0xf1,
+    KEY_MEDIA_FORWARD       =   0xf2,
+    KEY_MEDIA_STOP          =   0xf3,
+    KEY_MEDIA_FIND          =   0xf4,
+    KEY_MEDIA_SCROLL_UP     =   0xf5,
+    KEY_MEDIA_SCROLL_DOWN   =   0xf6,
+    KEY_MEDIA_EDIT          =   0xf7,
+    KEY_MEDIA_SLEEP         =   0xf8,
+    KEY_MEDIA_COFFEE        =   0xf9,
+    KEY_MEDIA_REFRESH       =   0xfa,
+    KEY_MEDIA_CALC          =   0xfb,
+};
+
+
+
+
+
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/ControllerInput/Keyboard/KeyboardInput_KeyMappings.cpp b/SerialPrograms/Source/ControllerInput/Keyboard/KeyboardInput_KeyMappings.cpp
new file mode 100644
index 0000000000..39679d8e55
--- /dev/null
+++ b/SerialPrograms/Source/ControllerInput/Keyboard/KeyboardInput_KeyMappings.cpp
@@ -0,0 +1,792 @@
+/*  HID Keyboard Mappings
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Exceptions.h"
+#include "Common/Cpp/Options/KeyboardLayoutOption.h"
+#include "CommonFramework/GlobalSettingsPanel.h"
+#include "KeyboardInput_KeyMappings.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+
+
+
+
+KeyboardInputMappings::KeyboardInputMappings(std::initializer_list<KeyboardInputMappingEntry> list){
+    for (auto iter = list.begin(); iter != list.end(); ++iter){
+        add(*iter);
+    }
+//    for (auto& item : m_map){
+//        cout << item.first << " : " << (int)item.second.standard << ", " << (int)item.second.keypad << endl;
+//    }
+}
+void KeyboardInputMappings::add(const KeyboardInputMappingEntry& entry){
+    Entry& key = m_map[entry.key.key];
+
+    if (entry.key.keypad){
+        if (key.keypad != KeyboardKey::KEY_NONE){
+            throw InternalProgramError(
+                nullptr,
+                PA_CURRENT_FUNCTION,
+                "Duplicate Keyboard Mapping: " + std::to_string((int)key.keypad)
+            );
+        }
+        key.keypad = entry.hid_id;
+    }else{
+        if (key.standard != KeyboardKey::KEY_NONE){
+            throw InternalProgramError(
+                nullptr,
+                PA_CURRENT_FUNCTION,
+                "Duplicate Keyboard Mapping: " + std::to_string((int)key.keypad)
+            );
+        }
+        key.standard = entry.hid_id;
+    }
+}
+KeyboardKey KeyboardInputMappings::get(const QtKeyMap::QtKey& key) const{
+//    cout << key.key << " : " << key.keypad << endl;
+    auto iter = m_map.find(key.key);
+    if (iter == m_map.end()){
+        return KeyboardKey::KEY_NONE;
+    }
+
+    //  If we don't override keypad, just return standard.
+    if (iter->second.keypad == KeyboardKey::KEY_NONE){
+        return iter->second.standard;
+    }
+
+    bool keypad = key.keypad;
+    if (keypad){
+        return iter->second.keypad;
+    }
+
+    return iter->second.standard;
+}
+
+
+
+
+
+
+
+
+
+
+
+
+const KeyboardInputMappings& get_keyid_to_hid_map(){
+    KeyboardLayout layout = *GlobalSettings::instance().KEYBOARD_CONTROLS_LAYOUT;
+    switch (layout){
+    case KeyboardLayout::QWERTY:
+        return KEYID_TO_HID_QWERTY();
+    case KeyboardLayout::AZERTY:
+        return KEYID_TO_HID_AZERTY();
+    default:
+        throw InternalProgramError(
+            nullptr,
+            PA_CURRENT_FUNCTION,
+            "Invalid KeyboardLayout Enum: " + std::to_string((int)layout)
+        );
+    }
+}
+
+
+
+const std::map<Qt::Key, std::string>& QTKEY_TO_STRING(){
+    static const std::map<Qt::Key, std::string> database{
+        // Unicode Basic Latin block (0x00-0x7f)
+        {Qt::Key_Space, "Key_Space"},
+        {Qt::Key_Exclam, "Key_Exclam"},
+        {Qt::Key_QuoteDbl, "Key_QuoteDbl"},
+        {Qt::Key_NumberSign, "Key_NumberSign"},
+        {Qt::Key_Dollar, "Key_Dollar"},
+        {Qt::Key_Percent, "Key_Percent"},
+        {Qt::Key_Ampersand, "Key_Ampersand"},
+        {Qt::Key_Apostrophe, "Key_Apostrophe"},
+        {Qt::Key_ParenLeft, "Key_ParenLeft"},
+        {Qt::Key_ParenRight, "Key_ParenRight"},
+        {Qt::Key_Asterisk, "Key_Asterisk"},
+        {Qt::Key_Plus, "Key_Plus"},
+        {Qt::Key_Comma, "Key_Comma"},
+        {Qt::Key_Minus, "Key_Minus"},
+        {Qt::Key_Period, "Key_Period"},
+        {Qt::Key_Slash, "Key_Slash"},
+        {Qt::Key_0, "Key_0"},
+        {Qt::Key_1, "Key_1"},
+        {Qt::Key_2, "Key_2"},
+        {Qt::Key_3, "Key_3"},
+        {Qt::Key_4, "Key_4"},
+        {Qt::Key_5, "Key_5"},
+        {Qt::Key_6, "Key_6"},
+        {Qt::Key_7, "Key_7"},
+        {Qt::Key_8, "Key_8"},
+        {Qt::Key_9, "Key_9"},
+        {Qt::Key_Colon, "Key_Colon"},
+        {Qt::Key_Semicolon, "Key_Semicolon"},
+        {Qt::Key_Less, "Key_Less"},
+        {Qt::Key_Equal, "Key_Equal"},
+        {Qt::Key_Greater, "Key_Greater"},
+        {Qt::Key_Question, "Key_Question"},
+        {Qt::Key_At, "Key_At"},
+        {Qt::Key_A, "Key_A"},
+        {Qt::Key_B, "Key_B"},
+        {Qt::Key_C, "Key_C"},
+        {Qt::Key_D, "Key_D"},
+        {Qt::Key_E, "Key_E"},
+        {Qt::Key_F, "Key_F"},
+        {Qt::Key_G, "Key_G"},
+        {Qt::Key_H, "Key_H"},
+        {Qt::Key_I, "Key_I"},
+        {Qt::Key_J, "Key_J"},
+        {Qt::Key_K, "Key_K"},
+        {Qt::Key_L, "Key_L"},
+        {Qt::Key_M, "Key_M"},
+        {Qt::Key_N, "Key_N"},
+        {Qt::Key_O, "Key_O"},
+        {Qt::Key_P, "Key_P"},
+        {Qt::Key_Q, "Key_Q"},
+        {Qt::Key_R, "Key_R"},
+        {Qt::Key_S, "Key_S"},
+        {Qt::Key_T, "Key_T"},
+        {Qt::Key_U, "Key_U"},
+        {Qt::Key_V, "Key_V"},
+        {Qt::Key_W, "Key_W"},
+        {Qt::Key_X, "Key_X"},
+        {Qt::Key_Y, "Key_Y"},
+        {Qt::Key_Z, "Key_Z"},
+        {Qt::Key_BracketLeft, "Key_BracketLeft"},
+        {Qt::Key_Backslash, "Key_Backslash"},
+        {Qt::Key_BracketRight, "Key_BracketRight"},
+        {Qt::Key_AsciiCircum, "Key_AsciiCircum"},
+        {Qt::Key_Underscore, "Key_Underscore"},
+        {Qt::Key_QuoteLeft, "Key_QuoteLeft"},
+        {Qt::Key_BraceLeft, "Key_BraceLeft"},
+        {Qt::Key_Bar, "Key_Bar"},
+        {Qt::Key_BraceRight, "Key_BraceRight"},
+        {Qt::Key_AsciiTilde, "Key_AsciiTilde"},
+
+        // Unicode Latin-1 Supplement block (0x80-0xff)
+        {Qt::Key_nobreakspace, "Key_nobreakspace"},
+        {Qt::Key_exclamdown, "Key_exclamdown"},
+        {Qt::Key_cent, "Key_cent"},
+        {Qt::Key_sterling, "Key_sterling"},
+        {Qt::Key_currency, "Key_currency"},
+        {Qt::Key_yen, "Key_yen"},
+        {Qt::Key_brokenbar, "Key_brokenbar"},
+        {Qt::Key_section, "Key_section"},
+        {Qt::Key_diaeresis, "Key_diaeresis"},
+        {Qt::Key_copyright, "Key_copyright"},
+        {Qt::Key_ordfeminine, "Key_ordfeminine"},
+        {Qt::Key_guillemotleft, "Key_guillemotleft"},
+        {Qt::Key_notsign, "Key_notsign"},
+        {Qt::Key_hyphen, "Key_hyphen"},
+        {Qt::Key_registered, "Key_registered"},
+        {Qt::Key_macron, "Key_macron"},
+        {Qt::Key_degree, "Key_degree"},
+        {Qt::Key_plusminus, "Key_plusminus"},
+        {Qt::Key_twosuperior, "Key_twosuperior"},
+        {Qt::Key_threesuperior, "Key_threesuperior"},
+        {Qt::Key_acute, "Key_acute"},
+        {Qt::Key_micro, "Key_micro"},
+        {Qt::Key_paragraph, "Key_paragraph"},
+        {Qt::Key_periodcentered, "Key_periodcentered"},
+        {Qt::Key_cedilla, "Key_cedilla"},
+        {Qt::Key_onesuperior, "Key_onesuperior"},
+        {Qt::Key_masculine, "Key_masculine"},
+        {Qt::Key_guillemotright, "Key_guillemotright"},
+        {Qt::Key_onequarter, "Key_onequarter"},
+        {Qt::Key_onehalf, "Key_onehalf"},
+        {Qt::Key_threequarters, "Key_threequarters"},
+        {Qt::Key_questiondown, "Key_questiondown"},
+        {Qt::Key_Agrave, "Key_Agrave"},
+        {Qt::Key_Aacute, "Key_Aacute"},
+        {Qt::Key_Acircumflex, "Key_Acircumflex"},
+        {Qt::Key_Atilde, "Key_Atilde"},
+        {Qt::Key_Adiaeresis, "Key_Adiaeresis"},
+        {Qt::Key_Aring, "Key_Aring"},
+        {Qt::Key_AE, "Key_AE"},
+        {Qt::Key_Ccedilla, "Key_Ccedilla"},
+        {Qt::Key_Egrave, "Key_Egrave"},
+        {Qt::Key_Eacute, "Key_Eacute"},
+        {Qt::Key_Ecircumflex, "Key_Ecircumflex"},
+        {Qt::Key_Ediaeresis, "Key_Ediaeresis"},
+        {Qt::Key_Igrave, "Key_Igrave"},
+        {Qt::Key_Iacute, "Key_Iacute"},
+        {Qt::Key_Icircumflex, "Key_Icircumflex"},
+        {Qt::Key_Idiaeresis, "Key_Idiaeresis"},
+        {Qt::Key_ETH, "Key_ETH"},
+        {Qt::Key_Ntilde, "Key_Ntilde"},
+        {Qt::Key_Ograve, "Key_Ograve"},
+        {Qt::Key_Oacute, "Key_Oacute"},
+        {Qt::Key_Ocircumflex, "Key_Ocircumflex"},
+        {Qt::Key_Otilde, "Key_Otilde"},
+        {Qt::Key_Odiaeresis, "Key_Odiaeresis"},
+        {Qt::Key_multiply, "Key_multiply"},
+        {Qt::Key_Ooblique, "Key_Ooblique"},
+        {Qt::Key_Ugrave, "Key_Ugrave"},
+        {Qt::Key_Uacute, "Key_Uacute"},
+        {Qt::Key_Ucircumflex, "Key_Ucircumflex"},
+        {Qt::Key_Udiaeresis, "Key_Udiaeresis"},
+        {Qt::Key_Yacute, "Key_Yacute"},
+        {Qt::Key_THORN, "Key_THORN"},
+        {Qt::Key_ssharp, "Key_ssharp"},
+        {Qt::Key_division, "Key_division"},
+        {Qt::Key_ydiaeresis, "Key_ydiaeresis"},
+
+        // Misc keys
+        {Qt::Key_Escape, "Key_Escape"},
+        {Qt::Key_Tab, "Key_Tab"},
+        {Qt::Key_Backtab, "Key_Backtab"},
+        {Qt::Key_Backspace, "Key_Backspace"},
+        {Qt::Key_Return, "Key_Return"},
+        {Qt::Key_Enter, "Key_Enter"},
+        {Qt::Key_Insert, "Key_Insert"},
+        {Qt::Key_Delete, "Key_Delete"},
+        {Qt::Key_Pause, "Key_Pause"},
+        {Qt::Key_Print, "Key_Print"},
+        {Qt::Key_SysReq, "Key_SysReq"},
+        {Qt::Key_Clear, "Key_Clear"},
+
+        // Cursor movement
+        {Qt::Key_Home, "Key_Home"},
+        {Qt::Key_End, "Key_End"},
+        {Qt::Key_Left, "Key_Left"},
+        {Qt::Key_Up, "Key_Up"},
+        {Qt::Key_Right, "Key_Right"},
+        {Qt::Key_Down, "Key_Down"},
+        {Qt::Key_PageUp, "Key_PageUp"},
+        {Qt::Key_PageDown, "Key_PageDown"},
+
+        // Modifiers
+        {Qt::Key_Shift, "Key_Shift"},
+        {Qt::Key_Control, "Key_Control"},
+        {Qt::Key_Meta, "Key_Meta"},
+        {Qt::Key_Alt, "Key_Alt"},
+        {Qt::Key_CapsLock, "Key_CapsLock"},
+        {Qt::Key_NumLock, "Key_NumLock"},
+        {Qt::Key_ScrollLock, "Key_ScrollLock"},
+
+        // Function keys
+        {Qt::Key_F1, "Key_F1"},
+        {Qt::Key_F2, "Key_F2"},
+        {Qt::Key_F3, "Key_F3"},
+        {Qt::Key_F4, "Key_F4"},
+        {Qt::Key_F5, "Key_F5"},
+        {Qt::Key_F6, "Key_F6"},
+        {Qt::Key_F7, "Key_F7"},
+        {Qt::Key_F8, "Key_F8"},
+        {Qt::Key_F9, "Key_F9"},
+        {Qt::Key_F10, "Key_F10"},
+        {Qt::Key_F11, "Key_F11"},
+        {Qt::Key_F12, "Key_F12"},
+        {Qt::Key_F13, "Key_F13"},
+        {Qt::Key_F14, "Key_F14"},
+        {Qt::Key_F15, "Key_F15"},
+        {Qt::Key_F16, "Key_F16"},
+        {Qt::Key_F17, "Key_F17"},
+        {Qt::Key_F18, "Key_F18"},
+        {Qt::Key_F19, "Key_F19"},
+        {Qt::Key_F20, "Key_F20"},
+        {Qt::Key_F21, "Key_F21"},
+        {Qt::Key_F22, "Key_F22"},
+        {Qt::Key_F23, "Key_F23"},
+        {Qt::Key_F24, "Key_F24"},
+        {Qt::Key_F25, "Key_F25"},
+        {Qt::Key_F26, "Key_F26"},
+        {Qt::Key_F27, "Key_F27"},
+        {Qt::Key_F28, "Key_F28"},
+        {Qt::Key_F29, "Key_F29"},
+        {Qt::Key_F30, "Key_F30"},
+        {Qt::Key_F31, "Key_F31"},
+        {Qt::Key_F32, "Key_F32"},
+        {Qt::Key_F33, "Key_F33"},
+        {Qt::Key_F34, "Key_F34"},
+        {Qt::Key_F35, "Key_F35"},
+
+        // Extra keys
+        {Qt::Key_Super_L, "Key_Super_L"},
+        {Qt::Key_Super_R, "Key_Super_R"},
+        {Qt::Key_Menu, "Key_Menu"},
+        {Qt::Key_Hyper_L, "Key_Hyper_L"},
+        {Qt::Key_Hyper_R, "Key_Hyper_R"},
+        {Qt::Key_Help, "Key_Help"},
+        {Qt::Key_Direction_L, "Key_Direction_L"},
+        {Qt::Key_Direction_R, "Key_Direction_R"},
+
+        // International input method support
+        {Qt::Key_AltGr, "Key_AltGr"},
+        {Qt::Key_Multi_key, "Key_Multi_key"},
+        {Qt::Key_Codeinput, "Key_Codeinput"},
+        {Qt::Key_SingleCandidate, "Key_SingleCandidate"},
+        {Qt::Key_MultipleCandidate, "Key_MultipleCandidate"},
+        {Qt::Key_PreviousCandidate, "Key_PreviousCandidate"},
+        {Qt::Key_Mode_switch, "Key_Mode_switch"},
+
+        // Japanese keyboard support
+        {Qt::Key_Kanji, "Key_Kanji"},
+        {Qt::Key_Muhenkan, "Key_Muhenkan"},
+        {Qt::Key_Henkan, "Key_Henkan"},
+        {Qt::Key_Romaji, "Key_Romaji"},
+        {Qt::Key_Hiragana, "Key_Hiragana"},
+        {Qt::Key_Katakana, "Key_Katakana"},
+        {Qt::Key_Hiragana_Katakana, "Key_Hiragana_Katakana"},
+        {Qt::Key_Zenkaku, "Key_Zenkaku"},
+        {Qt::Key_Hankaku, "Key_Hankaku"},
+        {Qt::Key_Zenkaku_Hankaku, "Key_Zenkaku_Hankaku"},
+        {Qt::Key_Touroku, "Key_Touroku"},
+        {Qt::Key_Massyo, "Key_Massyo"},
+        {Qt::Key_Kana_Lock, "Key_Kana_Lock"},
+        {Qt::Key_Kana_Shift, "Key_Kana_Shift"},
+        {Qt::Key_Eisu_Shift, "Key_Eisu_Shift"},
+        {Qt::Key_Eisu_toggle, "Key_Eisu_toggle"},
+
+        // Korean keyboard support
+        {Qt::Key_Hangul, "Key_Hangul"},
+        {Qt::Key_Hangul_Start, "Key_Hangul_Start"},
+        {Qt::Key_Hangul_End, "Key_Hangul_End"},
+        {Qt::Key_Hangul_Hanja, "Key_Hangul_Hanja"},
+        {Qt::Key_Hangul_Jamo, "Key_Hangul_Jamo"},
+        {Qt::Key_Hangul_Romaja, "Key_Hangul_Romaja"},
+        {Qt::Key_Hangul_Jeonja, "Key_Hangul_Jeonja"},
+        {Qt::Key_Hangul_Banja, "Key_Hangul_Banja"},
+        {Qt::Key_Hangul_PreHanja, "Key_Hangul_PreHanja"},
+        {Qt::Key_Hangul_PostHanja, "Key_Hangul_PostHanja"},
+        {Qt::Key_Hangul_Special, "Key_Hangul_Special"},
+
+        // Dead keys
+        {Qt::Key_Dead_Grave, "Key_Dead_Grave"},
+        {Qt::Key_Dead_Acute, "Key_Dead_Acute"},
+        {Qt::Key_Dead_Circumflex, "Key_Dead_Circumflex"},
+        {Qt::Key_Dead_Tilde, "Key_Dead_Tilde"},
+        {Qt::Key_Dead_Macron, "Key_Dead_Macron"},
+        {Qt::Key_Dead_Breve, "Key_Dead_Breve"},
+        {Qt::Key_Dead_Abovedot, "Key_Dead_Abovedot"},
+        {Qt::Key_Dead_Diaeresis, "Key_Dead_Diaeresis"},
+        {Qt::Key_Dead_Abovering, "Key_Dead_Abovering"},
+        {Qt::Key_Dead_Doubleacute, "Key_Dead_Doubleacute"},
+        {Qt::Key_Dead_Caron, "Key_Dead_Caron"},
+        {Qt::Key_Dead_Cedilla, "Key_Dead_Cedilla"},
+        {Qt::Key_Dead_Ogonek, "Key_Dead_Ogonek"},
+        {Qt::Key_Dead_Iota, "Key_Dead_Iota"},
+        {Qt::Key_Dead_Voiced_Sound, "Key_Dead_Voiced_Sound"},
+        {Qt::Key_Dead_Semivoiced_Sound, "Key_Dead_Semivoiced_Sound"},
+        {Qt::Key_Dead_Belowdot, "Key_Dead_Belowdot"},
+        {Qt::Key_Dead_Hook, "Key_Dead_Hook"},
+        {Qt::Key_Dead_Horn, "Key_Dead_Horn"},
+        {Qt::Key_Dead_Stroke, "Key_Dead_Stroke"},
+        {Qt::Key_Dead_Abovecomma, "Key_Dead_Abovecomma"},
+        {Qt::Key_Dead_Abovereversedcomma, "Key_Dead_Abovereversedcomma"},
+        {Qt::Key_Dead_Doublegrave, "Key_Dead_Doublegrave"},
+        {Qt::Key_Dead_Belowring, "Key_Dead_Belowring"},
+        {Qt::Key_Dead_Belowmacron, "Key_Dead_Belowmacron"},
+        {Qt::Key_Dead_Belowcircumflex, "Key_Dead_Belowcircumflex"},
+        {Qt::Key_Dead_Belowtilde, "Key_Dead_Belowtilde"},
+        {Qt::Key_Dead_Belowbreve, "Key_Dead_Belowbreve"},
+        {Qt::Key_Dead_Belowdiaeresis, "Key_Dead_Belowdiaeresis"},
+        {Qt::Key_Dead_Invertedbreve, "Key_Dead_Invertedbreve"},
+        {Qt::Key_Dead_Belowcomma, "Key_Dead_Belowcomma"},
+        {Qt::Key_Dead_Currency, "Key_Dead_Currency"},
+        {Qt::Key_Dead_a, "Key_Dead_a"},
+        {Qt::Key_Dead_A, "Key_Dead_A"},
+        {Qt::Key_Dead_e, "Key_Dead_e"},
+        {Qt::Key_Dead_E, "Key_Dead_E"},
+        {Qt::Key_Dead_i, "Key_Dead_i"},
+        {Qt::Key_Dead_I, "Key_Dead_I"},
+        {Qt::Key_Dead_o, "Key_Dead_o"},
+        {Qt::Key_Dead_O, "Key_Dead_O"},
+        {Qt::Key_Dead_u, "Key_Dead_u"},
+        {Qt::Key_Dead_U, "Key_Dead_U"},
+        {Qt::Key_Dead_Small_Schwa, "Key_Dead_Small_Schwa"},
+        {Qt::Key_Dead_Capital_Schwa, "Key_Dead_Capital_Schwa"},
+        {Qt::Key_Dead_Greek, "Key_Dead_Greek"},
+        {Qt::Key_Dead_Lowline, "Key_Dead_Lowline"},
+        {Qt::Key_Dead_Aboveverticalline, "Key_Dead_Aboveverticalline"},
+        {Qt::Key_Dead_Belowverticalline, "Key_Dead_Belowverticalline"},
+        {Qt::Key_Dead_Longsolidusoverlay, "Key_Dead_Longsolidusoverlay"},
+
+        // Multimedia/Internet keys
+        {Qt::Key_Back, "Key_Back"},
+        {Qt::Key_Forward, "Key_Forward"},
+        {Qt::Key_Stop, "Key_Stop"},
+        {Qt::Key_Refresh, "Key_Refresh"},
+        {Qt::Key_VolumeDown, "Key_VolumeDown"},
+        {Qt::Key_VolumeMute, "Key_VolumeMute"},
+        {Qt::Key_VolumeUp, "Key_VolumeUp"},
+        {Qt::Key_BassBoost, "Key_BassBoost"},
+        {Qt::Key_BassUp, "Key_BassUp"},
+        {Qt::Key_BassDown, "Key_BassDown"},
+        {Qt::Key_TrebleUp, "Key_TrebleUp"},
+        {Qt::Key_TrebleDown, "Key_TrebleDown"},
+        {Qt::Key_MediaPlay, "Key_MediaPlay"},
+        {Qt::Key_MediaStop, "Key_MediaStop"},
+        {Qt::Key_MediaPrevious, "Key_MediaPrevious"},
+        {Qt::Key_MediaNext, "Key_MediaNext"},
+        {Qt::Key_MediaRecord, "Key_MediaRecord"},
+        {Qt::Key_MediaPause, "Key_MediaPause"},
+        {Qt::Key_MediaTogglePlayPause, "Key_MediaTogglePlayPause"},
+        {Qt::Key_HomePage, "Key_HomePage"},
+        {Qt::Key_Favorites, "Key_Favorites"},
+        {Qt::Key_Search, "Key_Search"},
+        {Qt::Key_Standby, "Key_Standby"},
+        {Qt::Key_OpenUrl, "Key_OpenUrl"},
+        {Qt::Key_LaunchMail, "Key_LaunchMail"},
+        {Qt::Key_LaunchMedia, "Key_LaunchMedia"},
+        {Qt::Key_Launch0, "Key_Launch0"},
+        {Qt::Key_Launch1, "Key_Launch1"},
+        {Qt::Key_Launch2, "Key_Launch2"},
+        {Qt::Key_Launch3, "Key_Launch3"},
+        {Qt::Key_Launch4, "Key_Launch4"},
+        {Qt::Key_Launch5, "Key_Launch5"},
+        {Qt::Key_Launch6, "Key_Launch6"},
+        {Qt::Key_Launch7, "Key_Launch7"},
+        {Qt::Key_Launch8, "Key_Launch8"},
+        {Qt::Key_Launch9, "Key_Launch9"},
+        {Qt::Key_LaunchA, "Key_LaunchA"},
+        {Qt::Key_LaunchB, "Key_LaunchB"},
+        {Qt::Key_LaunchC, "Key_LaunchC"},
+        {Qt::Key_LaunchD, "Key_LaunchD"},
+        {Qt::Key_LaunchE, "Key_LaunchE"},
+        {Qt::Key_LaunchF, "Key_LaunchF"},
+        {Qt::Key_MonBrightnessUp, "Key_MonBrightnessUp"},
+        {Qt::Key_MonBrightnessDown, "Key_MonBrightnessDown"},
+        {Qt::Key_KeyboardLightOnOff, "Key_KeyboardLightOnOff"},
+        {Qt::Key_KeyboardBrightnessUp, "Key_KeyboardBrightnessUp"},
+        {Qt::Key_KeyboardBrightnessDown, "Key_KeyboardBrightnessDown"},
+        {Qt::Key_PowerOff, "Key_PowerOff"},
+        {Qt::Key_WakeUp, "Key_WakeUp"},
+        {Qt::Key_Eject, "Key_Eject"},
+        {Qt::Key_ScreenSaver, "Key_ScreenSaver"},
+        {Qt::Key_WWW, "Key_WWW"},
+        {Qt::Key_Memo, "Key_Memo"},
+        {Qt::Key_LightBulb, "Key_LightBulb"},
+        {Qt::Key_Shop, "Key_Shop"},
+        {Qt::Key_History, "Key_History"},
+        {Qt::Key_AddFavorite, "Key_AddFavorite"},
+        {Qt::Key_HotLinks, "Key_HotLinks"},
+        {Qt::Key_BrightnessAdjust, "Key_BrightnessAdjust"},
+        {Qt::Key_Finance, "Key_Finance"},
+        {Qt::Key_Community, "Key_Community"},
+        {Qt::Key_AudioRewind, "Key_AudioRewind"},
+        {Qt::Key_BackForward, "Key_BackForward"},
+        {Qt::Key_ApplicationLeft, "Key_ApplicationLeft"},
+        {Qt::Key_ApplicationRight, "Key_ApplicationRight"},
+        {Qt::Key_Book, "Key_Book"},
+        {Qt::Key_CD, "Key_CD"},
+        {Qt::Key_Calculator, "Key_Calculator"},
+        {Qt::Key_ToDoList, "Key_ToDoList"},
+        {Qt::Key_ClearGrab, "Key_ClearGrab"},
+        {Qt::Key_Close, "Key_Close"},
+        {Qt::Key_Copy, "Key_Copy"},
+        {Qt::Key_Cut, "Key_Cut"},
+        {Qt::Key_Display, "Key_Display"},
+        {Qt::Key_DOS, "Key_DOS"},
+        {Qt::Key_Documents, "Key_Documents"},
+        {Qt::Key_Excel, "Key_Excel"},
+        {Qt::Key_Explorer, "Key_Explorer"},
+        {Qt::Key_Game, "Key_Game"},
+        {Qt::Key_Go, "Key_Go"},
+        {Qt::Key_iTouch, "Key_iTouch"},
+        {Qt::Key_LogOff, "Key_LogOff"},
+        {Qt::Key_Market, "Key_Market"},
+        {Qt::Key_Meeting, "Key_Meeting"},
+        {Qt::Key_MenuKB, "Key_MenuKB"},
+        {Qt::Key_MenuPB, "Key_MenuPB"},
+        {Qt::Key_MySites, "Key_MySites"},
+        {Qt::Key_News, "Key_News"},
+        {Qt::Key_OfficeHome, "Key_OfficeHome"},
+        {Qt::Key_Option, "Key_Option"},
+        {Qt::Key_Paste, "Key_Paste"},
+        {Qt::Key_Phone, "Key_Phone"},
+        {Qt::Key_Calendar, "Key_Calendar"},
+        {Qt::Key_Reply, "Key_Reply"},
+        {Qt::Key_Reload, "Key_Reload"},
+        {Qt::Key_RotateWindows, "Key_RotateWindows"},
+        {Qt::Key_RotationPB, "Key_RotationPB"},
+        {Qt::Key_RotationKB, "Key_RotationKB"},
+        {Qt::Key_Save, "Key_Save"},
+        {Qt::Key_Send, "Key_Send"},
+        {Qt::Key_Spell, "Key_Spell"},
+        {Qt::Key_SplitScreen, "Key_SplitScreen"},
+        {Qt::Key_Support, "Key_Support"},
+        {Qt::Key_TaskPane, "Key_TaskPane"},
+        {Qt::Key_Terminal, "Key_Terminal"},
+        {Qt::Key_Tools, "Key_Tools"},
+        {Qt::Key_Travel, "Key_Travel"},
+        {Qt::Key_Video, "Key_Video"},
+        {Qt::Key_Word, "Key_Word"},
+        {Qt::Key_Xfer, "Key_Xfer"},
+        {Qt::Key_ZoomIn, "Key_ZoomIn"},
+        {Qt::Key_ZoomOut, "Key_ZoomOut"},
+        {Qt::Key_Away, "Key_Away"},
+        {Qt::Key_Messenger, "Key_Messenger"},
+        {Qt::Key_WebCam, "Key_WebCam"},
+        {Qt::Key_MailForward, "Key_MailForward"},
+        {Qt::Key_Pictures, "Key_Pictures"},
+        {Qt::Key_Music, "Key_Music"},
+        {Qt::Key_Battery, "Key_Battery"},
+        {Qt::Key_Bluetooth, "Key_Bluetooth"},
+        {Qt::Key_WLAN, "Key_WLAN"},
+        {Qt::Key_UWB, "Key_UWB"},
+        {Qt::Key_AudioForward, "Key_AudioForward"},
+        {Qt::Key_AudioRepeat, "Key_AudioRepeat"},
+        {Qt::Key_AudioRandomPlay, "Key_AudioRandomPlay"},
+        {Qt::Key_Subtitle, "Key_Subtitle"},
+        {Qt::Key_AudioCycleTrack, "Key_AudioCycleTrack"},
+        {Qt::Key_Time, "Key_Time"},
+        {Qt::Key_Hibernate, "Key_Hibernate"},
+        {Qt::Key_View, "Key_View"},
+        {Qt::Key_TopMenu, "Key_TopMenu"},
+        {Qt::Key_PowerDown, "Key_PowerDown"},
+        {Qt::Key_Suspend, "Key_Suspend"},
+        {Qt::Key_ContrastAdjust, "Key_ContrastAdjust"},
+        {Qt::Key_LaunchG, "Key_LaunchG"},
+        {Qt::Key_LaunchH, "Key_LaunchH"},
+        {Qt::Key_TouchpadToggle, "Key_TouchpadToggle"},
+        {Qt::Key_TouchpadOn, "Key_TouchpadOn"},
+        {Qt::Key_TouchpadOff, "Key_TouchpadOff"},
+        {Qt::Key_MicMute, "Key_MicMute"},
+        {Qt::Key_Red, "Key_Red"},
+        {Qt::Key_Green, "Key_Green"},
+        {Qt::Key_Yellow, "Key_Yellow"},
+        {Qt::Key_Blue, "Key_Blue"},
+        {Qt::Key_ChannelUp, "Key_ChannelUp"},
+        {Qt::Key_ChannelDown, "Key_ChannelDown"},
+        {Qt::Key_Guide, "Key_Guide"},
+        {Qt::Key_Info, "Key_Info"},
+        {Qt::Key_Settings, "Key_Settings"},
+        {Qt::Key_MicVolumeUp, "Key_MicVolumeUp"},
+        {Qt::Key_MicVolumeDown, "Key_MicVolumeDown"},
+//        {Qt::Key_Keyboard, "Key_Keyboard"},
+        {Qt::Key_New, "Key_New"},
+        {Qt::Key_Open, "Key_Open"},
+        {Qt::Key_Find, "Key_Find"},
+        {Qt::Key_Undo, "Key_Undo"},
+        {Qt::Key_Redo, "Key_Redo"},
+        {Qt::Key_MediaLast, "Key_MediaLast"},
+
+        // Keypad navigation keys
+        {Qt::Key_Select, "Key_Select"},
+        {Qt::Key_Yes, "Key_Yes"},
+        {Qt::Key_No, "Key_No"},
+
+        // Newer misc keys
+        {Qt::Key_Cancel, "Key_Cancel"},
+        {Qt::Key_Printer, "Key_Printer"},
+        {Qt::Key_Execute, "Key_Execute"},
+        {Qt::Key_Sleep, "Key_Sleep"},
+        {Qt::Key_Play, "Key_Play"},
+        {Qt::Key_Zoom, "Key_Zoom"},
+        {Qt::Key_Exit, "Key_Exit"},
+
+        // Device keys
+        {Qt::Key_Context1, "Key_Context1"},
+        {Qt::Key_Context2, "Key_Context2"},
+        {Qt::Key_Context3, "Key_Context3"},
+        {Qt::Key_Context4, "Key_Context4"},
+        {Qt::Key_Call, "Key_Call"},
+        {Qt::Key_Hangup, "Key_Hangup"},
+        {Qt::Key_Flip, "Key_Flip"},
+        {Qt::Key_ToggleCallHangup, "Key_ToggleCallHangup"},
+        {Qt::Key_VoiceDial, "Key_VoiceDial"},
+        {Qt::Key_LastNumberRedial, "Key_LastNumberRedial"},
+        {Qt::Key_Camera, "Key_Camera"},
+        {Qt::Key_CameraFocus, "Key_CameraFocus"},
+
+        {Qt::Key_unknown, "Key_unknown"}
+    };
+    return database;
+}
+
+const std::map<KeyboardKey, std::string>& KEYBOARDKEY_TO_STRING(){
+    static const std::map<KeyboardKey, std::string> database{
+        // Letters
+        {KEY_A, "KEY_A"},
+        {KEY_B, "KEY_B"},
+        {KEY_C, "KEY_C"},
+        {KEY_D, "KEY_D"},
+        {KEY_E, "KEY_E"},
+        {KEY_F, "KEY_F"},
+        {KEY_G, "KEY_G"},
+        {KEY_H, "KEY_H"},
+        {KEY_I, "KEY_I"},
+        {KEY_J, "KEY_J"},
+        {KEY_K, "KEY_K"},
+        {KEY_L, "KEY_L"},
+        {KEY_M, "KEY_M"},
+        {KEY_N, "KEY_N"},
+        {KEY_O, "KEY_O"},
+        {KEY_P, "KEY_P"},
+        {KEY_Q, "KEY_Q"},
+        {KEY_R, "KEY_R"},
+        {KEY_S, "KEY_S"},
+        {KEY_T, "KEY_T"},
+        {KEY_U, "KEY_U"},
+        {KEY_V, "KEY_V"},
+        {KEY_W, "KEY_W"},
+        {KEY_X, "KEY_X"},
+        {KEY_Y, "KEY_Y"},
+        {KEY_Z, "KEY_Z"},
+
+        // Numbers
+        {KEY_1, "KEY_1"},
+        {KEY_2, "KEY_2"},
+        {KEY_3, "KEY_3"},
+        {KEY_4, "KEY_4"},
+        {KEY_5, "KEY_5"},
+        {KEY_6, "KEY_6"},
+        {KEY_7, "KEY_7"},
+        {KEY_8, "KEY_8"},
+        {KEY_9, "KEY_9"},
+        {KEY_0, "KEY_0"},
+
+        // Special keys
+        {KEY_ENTER, "KEY_ENTER"},
+        {KEY_ESC, "KEY_ESC"},
+        {KEY_BACKSPACE, "KEY_BACKSPACE"},
+        {KEY_TAB, "KEY_TAB"},
+        {KEY_SPACE, "KEY_SPACE"},
+        {KEY_MINUS, "KEY_MINUS"},
+        {KEY_EQUAL, "KEY_EQUAL"},
+        {KEY_LEFT_BRACE, "KEY_LEFT_BRACE"},
+        {KEY_RIGHT_BRACE, "KEY_RIGHT_BRACE"},
+        {KEY_BACKSLASH, "KEY_BACKSLASH"},
+        {KEY_HASHTILDE, "KEY_HASHTILDE"},
+        {KEY_SEMICOLON, "KEY_SEMICOLON"},
+        {KEY_APOSTROPHE, "KEY_APOSTROPHE"},
+        {KEY_GRAVE, "KEY_GRAVE"},
+        {KEY_COMMA, "KEY_COMMA"},
+        {KEY_DOT, "KEY_DOT"},
+        {KEY_SLASH, "KEY_SLASH"},
+        {KEY_CAPS_LOCK, "KEY_CAPS_LOCK"},
+
+        // Function keys
+        {KEY_F1, "KEY_F1"},
+        {KEY_F2, "KEY_F2"},
+        {KEY_F3, "KEY_F3"},
+        {KEY_F4, "KEY_F4"},
+        {KEY_F5, "KEY_F5"},
+        {KEY_F6, "KEY_F6"},
+        {KEY_F7, "KEY_F7"},
+        {KEY_F8, "KEY_F8"},
+        {KEY_F9, "KEY_F9"},
+        {KEY_F10, "KEY_F10"},
+        {KEY_F11, "KEY_F11"},
+        {KEY_F12, "KEY_F12"},
+        {KEY_F13, "KEY_F13"},
+        {KEY_F14, "KEY_F14"},
+        {KEY_F15, "KEY_F15"},
+        {KEY_F16, "KEY_F16"},
+        {KEY_F17, "KEY_F17"},
+        {KEY_F18, "KEY_F18"},
+        {KEY_F19, "KEY_F19"},
+        {KEY_F20, "KEY_F20"},
+        {KEY_F21, "KEY_F21"},
+        {KEY_F22, "KEY_F22"},
+        {KEY_F23, "KEY_F23"},
+        {KEY_F24, "KEY_F24"},
+
+        // Navigation keys
+        {KEY_PRINT_SCREEN, "KEY_PRINT_SCREEN"},
+        {KEY_SCROLL_LOCK, "KEY_SCROLL_LOCK"},
+        {KEY_PAUSE, "KEY_PAUSE"},
+        {KEY_INSERT, "KEY_INSERT"},
+        {KEY_HOME, "KEY_HOME"},
+        {KEY_PAGE_UP, "KEY_PAGE_UP"},
+        {KEY_DELETE, "KEY_DELETE"},
+        {KEY_END, "KEY_END"},
+        {KEY_PAGE_DOWN, "KEY_PAGE_DOWN"},
+        {KEY_RIGHT, "KEY_RIGHT"},
+        {KEY_LEFT, "KEY_LEFT"},
+        {KEY_DOWN, "KEY_DOWN"},
+        {KEY_UP, "KEY_UP"},
+
+        // Keypad keys
+        {KEY_NUM_LOCK, "KEY_NUM_LOCK"},
+        {KEY_KP_SLASH, "KEY_KP_SLASH"},
+        {KEY_KP_ASTERISK, "KEY_KP_ASTERISK"},
+        {KEY_KP_MINUS, "KEY_KP_MINUS"},
+        {KEY_KP_PLUS, "KEY_KP_PLUS"},
+        {KEY_KP_ENTER, "KEY_KP_ENTER"},
+        {KEY_KP_1, "KEY_KP_1"},
+        {KEY_KP_2, "KEY_KP_2"},
+        {KEY_KP_3, "KEY_KP_3"},
+        {KEY_KP_4, "KEY_KP_4"},
+        {KEY_KP_5, "KEY_KP_5"},
+        {KEY_KP_6, "KEY_KP_6"},
+        {KEY_KP_7, "KEY_KP_7"},
+        {KEY_KP_8, "KEY_KP_8"},
+        {KEY_KP_9, "KEY_KP_9"},
+        {KEY_KP_0, "KEY_KP_0"},
+        {KEY_KP_DOT, "KEY_KP_DOT"},
+        {KEY_KP_EQUAL, "KEY_KP_EQUAL"},
+        {KEY_KP_COMMA, "KEY_KP_COMMA"},
+
+        // Additional keys
+        {KEY_102ND, "KEY_102ND"},
+        {KEY_COMPOSE, "KEY_COMPOSE"},
+        {KEY_POWER, "KEY_POWER"},
+        {KEY_OPEN, "KEY_OPEN"},
+        {KEY_HELP, "KEY_HELP"},
+        {KEY_MENU, "KEY_MENU"},
+        {KEY_SELECT, "KEY_SELECT"},
+        {KEY_STOP, "KEY_STOP"},
+        {KEY_AGAIN, "KEY_AGAIN"},
+        {KEY_UNDO, "KEY_UNDO"},
+        {KEY_CUT, "KEY_CUT"},
+        {KEY_COPY, "KEY_COPY"},
+        {KEY_PASTE, "KEY_PASTE"},
+        {KEY_FIND, "KEY_FIND"},
+
+        // Volume keys
+        {KEY_VOLUME_MUTE, "KEY_VOLUME_MUTE"},
+        {KEY_VOLUME_UP, "KEY_VOLUME_UP"},
+        {KEY_VOLUME_DOWN, "KEY_VOLUME_DOWN"},
+
+        // Modifier keys
+        {KEY_LEFT_CTRL, "KEY_LEFT_CTRL"},
+        {KEY_LEFT_SHIFT, "KEY_LEFT_SHIFT"},
+        {KEY_LEFT_ALT, "KEY_LEFT_ALT"},
+        {KEY_LEFT_META, "KEY_LEFT_META"},
+        {KEY_RIGHT_CTRL, "KEY_RIGHT_CTRL"},
+        {KEY_RIGHT_SHIFT, "KEY_RIGHT_SHIFT"},
+        {KEY_RIGHT_ALT, "KEY_RIGHT_ALT"},
+        {KEY_RIGHT_META, "KEY_RIGHT_META"},
+
+        // Media keys
+        {KEY_MEDIA_PLAYPAUSE, "KEY_MEDIA_PLAYPAUSE"},
+        {KEY_MEDIA_STOPCD, "KEY_MEDIA_STOPCD"},
+        {KEY_MEDIA_PREVIOUS_SONG, "KEY_MEDIA_PREVIOUS_SONG"},
+        {KEY_MEDIA_NEXT_SONG, "KEY_MEDIA_NEXT_SONG"},
+        {KEY_MEDIA_EJECTCD, "KEY_MEDIA_EJECTCD"},
+        {KEY_MEDIA_VOLUME_UP, "KEY_MEDIA_VOLUME_UP"},
+        {KEY_MEDIA_VOLUME_DOWN, "KEY_MEDIA_VOLUME_DOWN"},
+        {KEY_MEDIA_MUTE, "KEY_MEDIA_MUTE"},
+        {KEY_MEDIA_WWW, "KEY_MEDIA_WWW"},
+        {KEY_MEDIA_BACK, "KEY_MEDIA_BACK"},
+        {KEY_MEDIA_FORWARD, "KEY_MEDIA_FORWARD"},
+        {KEY_MEDIA_STOP, "KEY_MEDIA_STOP"},
+        {KEY_MEDIA_FIND, "KEY_MEDIA_FIND"},
+        {KEY_MEDIA_SCROLL_UP, "KEY_MEDIA_SCROLL_UP"},
+        {KEY_MEDIA_SCROLL_DOWN, "KEY_MEDIA_SCROLL_DOWN"},
+        {KEY_MEDIA_EDIT, "KEY_MEDIA_EDIT"},
+        {KEY_MEDIA_SLEEP, "KEY_MEDIA_SLEEP"},
+        {KEY_MEDIA_COFFEE, "KEY_MEDIA_COFFEE"},
+        {KEY_MEDIA_REFRESH, "KEY_MEDIA_REFRESH"},
+        {KEY_MEDIA_CALC, "KEY_MEDIA_CALC"}
+    };
+    return database;
+}
+
+
+
+
+
+
+
+}
diff --git a/SerialPrograms/Source/ControllerInput/Keyboard/KeyboardInput_KeyMappings.h b/SerialPrograms/Source/ControllerInput/Keyboard/KeyboardInput_KeyMappings.h
new file mode 100644
index 0000000000..3ea711ea77
--- /dev/null
+++ b/SerialPrograms/Source/ControllerInput/Keyboard/KeyboardInput_KeyMappings.h
@@ -0,0 +1,70 @@
+/*  HID Keyboard Mappings
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_ControllerInput_KeyboardInput_KeyMappings_H
+#define PokemonAutomation_ControllerInput_KeyboardInput_KeyMappings_H
+
+#include <map>
+#include "GlobalQtKeyMap.h"
+#include "KeyboardHidButtons.h"
+
+namespace PokemonAutomation{
+
+
+struct KeyboardInputMappingKey{
+    Qt::Key key;
+    bool keypad;
+
+    KeyboardInputMappingKey(Qt::Key key)
+        : key(key)
+        , keypad(false)
+    {}
+    KeyboardInputMappingKey(Qt::Key key, bool keypad)
+        : key(key)
+        , keypad(keypad)
+    {}
+};
+
+struct KeyboardInputMappingEntry{
+    KeyboardInputMappingKey key;
+    KeyboardKey hid_id;
+};
+
+
+
+class KeyboardInputMappings{
+public:
+    KeyboardInputMappings(std::initializer_list<KeyboardInputMappingEntry> list);
+
+    void add(const KeyboardInputMappingEntry& entry);
+
+    KeyboardKey get(const QtKeyMap::QtKey& key) const;
+
+private:
+    struct Entry{
+        KeyboardKey standard = KeyboardKey::KEY_NONE;
+        KeyboardKey keypad = KeyboardKey::KEY_NONE;
+    };
+    std::map<Qt::Key, Entry> m_map;
+};
+
+
+
+
+
+
+const KeyboardInputMappings& get_keyid_to_hid_map();
+
+const std::map<Qt::Key, std::string>& QTKEY_TO_STRING();
+const std::map<KeyboardKey, std::string>& KEYBOARDKEY_TO_STRING();
+
+const KeyboardInputMappings& KEYID_TO_HID_QWERTY();
+const KeyboardInputMappings& KEYID_TO_HID_AZERTY();
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/ControllerInput/Keyboard/KeyboardInput_KeyMappings_AZERTY.cpp b/SerialPrograms/Source/ControllerInput/Keyboard/KeyboardInput_KeyMappings_AZERTY.cpp
new file mode 100644
index 0000000000..56ed2f2cf6
--- /dev/null
+++ b/SerialPrograms/Source/ControllerInput/Keyboard/KeyboardInput_KeyMappings_AZERTY.cpp
@@ -0,0 +1,167 @@
+/*  HID Keyboard Mappings
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "KeyboardInput_KeyMappings.h"
+
+namespace PokemonAutomation{
+
+
+
+const KeyboardInputMappings& KEYID_TO_HID_AZERTY(){
+    static const KeyboardInputMappings database{
+        {Qt::Key::Key_Q,                KeyboardKey::KEY_A},    // Q key -> HID A position
+        {Qt::Key::Key_B,                KeyboardKey::KEY_B},
+        {Qt::Key::Key_C,                KeyboardKey::KEY_C},
+        {Qt::Key::Key_D,                KeyboardKey::KEY_D},
+        {Qt::Key::Key_E,                KeyboardKey::KEY_E},
+        {Qt::Key::Key_F,                KeyboardKey::KEY_F},
+        {Qt::Key::Key_G,                KeyboardKey::KEY_G},
+        {Qt::Key::Key_H,                KeyboardKey::KEY_H},
+        {Qt::Key::Key_I,                KeyboardKey::KEY_I},
+        {Qt::Key::Key_J,                KeyboardKey::KEY_J},
+        {Qt::Key::Key_K,                KeyboardKey::KEY_K},
+        {Qt::Key::Key_L,                KeyboardKey::KEY_L},
+        {Qt::Key::Key_Comma,            KeyboardKey::KEY_M},    // , key -> HID M position
+        {Qt::Key::Key_N,                KeyboardKey::KEY_N},
+        {Qt::Key::Key_O,                KeyboardKey::KEY_O},
+        {Qt::Key::Key_P,                KeyboardKey::KEY_P},
+        {Qt::Key::Key_A,                KeyboardKey::KEY_Q},    // A key -> HID Q position
+        {Qt::Key::Key_R,                KeyboardKey::KEY_R},
+        {Qt::Key::Key_S,                KeyboardKey::KEY_S},
+        {Qt::Key::Key_T,                KeyboardKey::KEY_T},
+        {Qt::Key::Key_U,                KeyboardKey::KEY_U},
+        {Qt::Key::Key_V,                KeyboardKey::KEY_V},
+        {Qt::Key::Key_Z,                KeyboardKey::KEY_W},    // Z key -> HID W position
+        {Qt::Key::Key_X,                KeyboardKey::KEY_X},
+        {Qt::Key::Key_Y,                KeyboardKey::KEY_Y},
+        {Qt::Key::Key_W,                KeyboardKey::KEY_Z},    // W key -> HID Z position
+
+        {Qt::Key::Key_Ampersand,        KeyboardKey::KEY_1},    // & key -> HID 1 position
+        {Qt::Key::Key_Eacute,           KeyboardKey::KEY_2},    // e key -> HID 2 position
+        {Qt::Key::Key_QuoteDbl,         KeyboardKey::KEY_3},    // " key -> HID 3 position
+        {Qt::Key::Key_Apostrophe,       KeyboardKey::KEY_4},    // ' key -> HID 4 position
+        {Qt::Key::Key_ParenLeft,        KeyboardKey::KEY_5},    // ( key -> HID 5 position
+        {Qt::Key::Key_Minus,            KeyboardKey::KEY_6},    // - key -> HID 6 position
+        {Qt::Key::Key_Egrave,           KeyboardKey::KEY_7},    // e key -> HID 7 position
+        {Qt::Key::Key_Underscore,       KeyboardKey::KEY_8},    // _ key -> HID 8 position
+        {Qt::Key::Key_Ccedilla,         KeyboardKey::KEY_9},    // c key -> HID 9 position
+        {Qt::Key::Key_Agrave,           KeyboardKey::KEY_0},    // a key -> HID 0 position
+
+        {Qt::Key::Key_Return,           KeyboardKey::KEY_ENTER},
+        {Qt::Key::Key_Enter,            KeyboardKey::KEY_ENTER},
+        {Qt::Key::Key_Escape,           KeyboardKey::KEY_ESC},
+        {Qt::Key::Key_Backspace,        KeyboardKey::KEY_BACKSPACE},
+        {Qt::Key::Key_Tab,              KeyboardKey::KEY_TAB},
+        {Qt::Key::Key_Space,            KeyboardKey::KEY_SPACE},
+        {Qt::Key::Key_ParenRight,       KeyboardKey::KEY_MINUS},        // ) KEY -> HID - position
+        {Qt::Key::Key_Equal,            KeyboardKey::KEY_EQUAL},
+        {Qt::Key::Key_Dead_Circumflex,  KeyboardKey::KEY_LEFT_BRACE},   // ^ KEY -> HID [ position
+        {Qt::Key::Key_AsciiCircum,      KeyboardKey::KEY_LEFT_BRACE},   // ^ KEY -> HID [ position
+        {Qt::Key::Key_Dollar,           KeyboardKey::KEY_RIGHT_BRACE},  // $ KEY -> HID ] position
+                                                                        // Only one key there to replace two
+        {Qt::Key::Key_Asterisk,         KeyboardKey::KEY_BACKSLASH},    // * KEY -> HID \ position
+        {Qt::Key::Key_M,                KeyboardKey::KEY_SEMICOLON},    // m KEY -> HID ; position
+        {Qt::Key::Key_Ugrave,           KeyboardKey::KEY_APOSTROPHE},   // u KEY -> HID ' position
+
+        {Qt::Key::Key_twosuperior,      KeyboardKey::KEY_GRAVE},        // 2 KEY -> HID ` position
+
+        {Qt::Key::Key_Semicolon,        KeyboardKey::KEY_COMMA},        // ; KEY -> HID , position
+        {Qt::Key::Key_Colon,            KeyboardKey::KEY_DOT},          // : KEY -> HID . position
+        {Qt::Key::Key_Exclam,           KeyboardKey::KEY_SLASH},        // ! KEY -> HID / position
+        {Qt::Key::Key_CapsLock,         KeyboardKey::KEY_CAPS_LOCK},
+
+        {Qt::Key::Key_F1,               KeyboardKey::KEY_F1},
+        {Qt::Key::Key_F2,               KeyboardKey::KEY_F2},
+        {Qt::Key::Key_F3,               KeyboardKey::KEY_F3},
+        {Qt::Key::Key_F4,               KeyboardKey::KEY_F4},
+        {Qt::Key::Key_F5,               KeyboardKey::KEY_F5},
+        {Qt::Key::Key_F6,               KeyboardKey::KEY_F6},
+        {Qt::Key::Key_F7,               KeyboardKey::KEY_F7},
+        {Qt::Key::Key_F8,               KeyboardKey::KEY_F8},
+        {Qt::Key::Key_F9,               KeyboardKey::KEY_F9},
+        {Qt::Key::Key_F10,              KeyboardKey::KEY_F10},
+        {Qt::Key::Key_F11,              KeyboardKey::KEY_F11},
+        {Qt::Key::Key_F12,              KeyboardKey::KEY_F12},
+
+        {Qt::Key::Key_Print,            KeyboardKey::KEY_PRINT_SCREEN},
+        {Qt::Key::Key_ScrollLock,       KeyboardKey::KEY_SCROLL_LOCK},
+        {Qt::Key::Key_Pause,            KeyboardKey::KEY_PAUSE},
+        {Qt::Key::Key_Insert,           KeyboardKey::KEY_INSERT},
+        {Qt::Key::Key_Home,             KeyboardKey::KEY_HOME},
+        {Qt::Key::Key_PageUp,           KeyboardKey::KEY_PAGE_UP},
+        {Qt::Key::Key_Delete,           KeyboardKey::KEY_DELETE},
+        {Qt::Key::Key_End,              KeyboardKey::KEY_END},
+        {Qt::Key::Key_PageDown,         KeyboardKey::KEY_PAGE_DOWN},
+        {Qt::Key::Key_Right,            KeyboardKey::KEY_RIGHT},
+        {Qt::Key::Key_Left,             KeyboardKey::KEY_LEFT},
+        {Qt::Key::Key_Down,             KeyboardKey::KEY_DOWN},
+        {Qt::Key::Key_Up,               KeyboardKey::KEY_UP},
+        {Qt::Key::Key_NumLock,          KeyboardKey::KEY_NUM_LOCK},
+
+        {{Qt::Key::Key_Slash,       true},  KeyboardKey::KEY_KP_SLASH},
+        {{Qt::Key::Key_Asterisk,    true},  KeyboardKey::KEY_KP_ASTERISK},
+        {{Qt::Key::Key_Minus,       true},  KeyboardKey::KEY_KP_MINUS},
+        {{Qt::Key::Key_Plus,        true},  KeyboardKey::KEY_KP_PLUS},
+        {{Qt::Key::Key_Enter,       true},  KeyboardKey::KEY_KP_ENTER},
+        {{Qt::Key::Key_1,           true},  KeyboardKey::KEY_KP_1},
+        {{Qt::Key::Key_2,           true},  KeyboardKey::KEY_KP_2},
+        {{Qt::Key::Key_3,           true},  KeyboardKey::KEY_KP_3},
+        {{Qt::Key::Key_4,           true},  KeyboardKey::KEY_KP_4},
+        {{Qt::Key::Key_5,           true},  KeyboardKey::KEY_KP_5},
+        {{Qt::Key::Key_6,           true},  KeyboardKey::KEY_KP_6},
+        {{Qt::Key::Key_7,           true},  KeyboardKey::KEY_KP_7},
+        {{Qt::Key::Key_8,           true},  KeyboardKey::KEY_KP_8},
+        {{Qt::Key::Key_9,           true},  KeyboardKey::KEY_KP_9},
+        {{Qt::Key::Key_0,           true},  KeyboardKey::KEY_KP_0},
+        {{Qt::Key::Key_Period,      true},  KeyboardKey::KEY_KP_DOT},
+
+        {Qt::Key::Key_F13,              KeyboardKey::KEY_F13},
+        {Qt::Key::Key_F14,              KeyboardKey::KEY_F14},
+        {Qt::Key::Key_F15,              KeyboardKey::KEY_F15},
+        {Qt::Key::Key_F16,              KeyboardKey::KEY_F16},
+        {Qt::Key::Key_F17,              KeyboardKey::KEY_F17},
+        {Qt::Key::Key_F18,              KeyboardKey::KEY_F18},
+        {Qt::Key::Key_F19,              KeyboardKey::KEY_F19},
+        {Qt::Key::Key_F20,              KeyboardKey::KEY_F20},
+        {Qt::Key::Key_F21,              KeyboardKey::KEY_F21},
+        {Qt::Key::Key_F22,              KeyboardKey::KEY_F22},
+        {Qt::Key::Key_F23,              KeyboardKey::KEY_F23},
+        {Qt::Key::Key_F24,              KeyboardKey::KEY_F24},
+
+        {Qt::Key::Key_Open,             KeyboardKey::KEY_OPEN},
+        {Qt::Key::Key_Help,             KeyboardKey::KEY_HELP},
+        {Qt::Key::Key_Menu,             KeyboardKey::KEY_MENU},
+        {Qt::Key::Key_Select,           KeyboardKey::KEY_SELECT},
+        {Qt::Key::Key_Stop,             KeyboardKey::KEY_STOP},
+//        {Qt::Key::Key_Again,            KeyboardKey::KEY_AGAIN},
+        {Qt::Key::Key_Undo,             KeyboardKey::KEY_UNDO},
+        {Qt::Key::Key_Cut,              KeyboardKey::KEY_CUT},
+        {Qt::Key::Key_Copy,             KeyboardKey::KEY_COPY},
+        {Qt::Key::Key_Paste,            KeyboardKey::KEY_PASTE},
+        {Qt::Key::Key_Find,             KeyboardKey::KEY_FIND},
+        {Qt::Key::Key_VolumeMute,       KeyboardKey::KEY_VOLUME_MUTE},
+        {Qt::Key::Key_VolumeUp,         KeyboardKey::KEY_VOLUME_UP},
+        {Qt::Key::Key_VolumeDown,       KeyboardKey::KEY_VOLUME_DOWN},
+
+        {Qt::Key::Key_Control,          KeyboardKey::KEY_LEFT_CTRL},
+        {Qt::Key::Key_Shift,            KeyboardKey::KEY_LEFT_SHIFT},
+        {Qt::Key::Key_Alt,              KeyboardKey::KEY_LEFT_ALT},
+        {Qt::Key::Key_Meta,             KeyboardKey::KEY_LEFT_META},
+
+//        {Qt::Key::Key_MediaPlay,        KeyboardKey::KEY_MEDIA_PLAYPAUSE},
+//        {Qt::Key::Key_MediaStop,        KeyboardKey::KEY_MEDIA_STOPCD},
+//        {Qt::Key::Key_MediaPrevious,    KeyboardKey::KEY_MEDIA_PREVIOUS_SONG},
+//        {Qt::Key::Key_MediaNext,        KeyboardKey::KEY_MEDIA_NEXT_SONG},
+//        {Qt::Key::Key_Eject,            KeyboardKey::KEY_MEDIA_EJECTCD},
+//        {Qt::Key::Key_Eject,            KeyboardKey::KEY_MEDIA_VOLUME_UP},
+//        {Qt::Key::Key_Eject,            KeyboardKey::KEY_MEDIA_VOLUME_DOWN},
+    };
+    return database;
+};
+
+
+
+}
diff --git a/SerialPrograms/Source/ControllerInput/Keyboard/KeyboardInput_KeyMappings_QWERTY.cpp b/SerialPrograms/Source/ControllerInput/Keyboard/KeyboardInput_KeyMappings_QWERTY.cpp
new file mode 100644
index 0000000000..f168aecb2b
--- /dev/null
+++ b/SerialPrograms/Source/ControllerInput/Keyboard/KeyboardInput_KeyMappings_QWERTY.cpp
@@ -0,0 +1,167 @@
+/*  HID Keyboard Mappings
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "KeyboardInput_KeyMappings.h"
+
+namespace PokemonAutomation{
+
+
+
+const KeyboardInputMappings& KEYID_TO_HID_QWERTY(){
+    static const KeyboardInputMappings database{
+        {Qt::Key::Key_A,                KeyboardKey::KEY_A},
+        {Qt::Key::Key_B,                KeyboardKey::KEY_B},
+        {Qt::Key::Key_C,                KeyboardKey::KEY_C},
+        {Qt::Key::Key_D,                KeyboardKey::KEY_D},
+        {Qt::Key::Key_E,                KeyboardKey::KEY_E},
+        {Qt::Key::Key_F,                KeyboardKey::KEY_F},
+        {Qt::Key::Key_G,                KeyboardKey::KEY_G},
+        {Qt::Key::Key_H,                KeyboardKey::KEY_H},
+        {Qt::Key::Key_I,                KeyboardKey::KEY_I},
+        {Qt::Key::Key_J,                KeyboardKey::KEY_J},
+        {Qt::Key::Key_K,                KeyboardKey::KEY_K},
+        {Qt::Key::Key_L,                KeyboardKey::KEY_L},
+        {Qt::Key::Key_M,                KeyboardKey::KEY_M},
+        {Qt::Key::Key_N,                KeyboardKey::KEY_N},
+        {Qt::Key::Key_O,                KeyboardKey::KEY_O},
+        {Qt::Key::Key_P,                KeyboardKey::KEY_P},
+        {Qt::Key::Key_Q,                KeyboardKey::KEY_Q},
+        {Qt::Key::Key_R,                KeyboardKey::KEY_R},
+        {Qt::Key::Key_S,                KeyboardKey::KEY_S},
+        {Qt::Key::Key_T,                KeyboardKey::KEY_T},
+        {Qt::Key::Key_U,                KeyboardKey::KEY_U},
+        {Qt::Key::Key_V,                KeyboardKey::KEY_V},
+        {Qt::Key::Key_W,                KeyboardKey::KEY_W},
+        {Qt::Key::Key_X,                KeyboardKey::KEY_X},
+        {Qt::Key::Key_Y,                KeyboardKey::KEY_Y},
+        {Qt::Key::Key_Z,                KeyboardKey::KEY_Z},
+
+        {Qt::Key::Key_1,                KeyboardKey::KEY_1},
+        {Qt::Key::Key_2,                KeyboardKey::KEY_2},
+        {Qt::Key::Key_3,                KeyboardKey::KEY_3},
+        {Qt::Key::Key_4,                KeyboardKey::KEY_4},
+        {Qt::Key::Key_5,                KeyboardKey::KEY_5},
+        {Qt::Key::Key_6,                KeyboardKey::KEY_6},
+        {Qt::Key::Key_7,                KeyboardKey::KEY_7},
+        {Qt::Key::Key_8,                KeyboardKey::KEY_8},
+        {Qt::Key::Key_9,                KeyboardKey::KEY_9},
+        {Qt::Key::Key_0,                KeyboardKey::KEY_0},
+
+        {Qt::Key::Key_Return,           KeyboardKey::KEY_ENTER},
+        {Qt::Key::Key_Enter,            KeyboardKey::KEY_ENTER},
+        {Qt::Key::Key_Escape,           KeyboardKey::KEY_ESC},
+        {Qt::Key::Key_Backspace,        KeyboardKey::KEY_BACKSPACE},
+        {Qt::Key::Key_Tab,              KeyboardKey::KEY_TAB},
+        {Qt::Key::Key_Space,            KeyboardKey::KEY_SPACE},
+        {Qt::Key::Key_Minus,            KeyboardKey::KEY_MINUS},
+        {Qt::Key::Key_Equal,            KeyboardKey::KEY_EQUAL},
+        {Qt::Key::Key_BraceLeft,        KeyboardKey::KEY_LEFT_BRACE},
+        {Qt::Key::Key_BracketLeft,      KeyboardKey::KEY_LEFT_BRACE},
+        {Qt::Key::Key_BraceRight,       KeyboardKey::KEY_RIGHT_BRACE},
+        {Qt::Key::Key_BracketRight,     KeyboardKey::KEY_RIGHT_BRACE},
+        {Qt::Key::Key_Backslash,        KeyboardKey::KEY_BACKSLASH},
+        {Qt::Key::Key_Semicolon,        KeyboardKey::KEY_SEMICOLON},
+        {Qt::Key::Key_Apostrophe,       KeyboardKey::KEY_APOSTROPHE},
+
+        {Qt::Key::Key_AsciiTilde,       KeyboardKey::KEY_GRAVE},
+
+        {Qt::Key::Key_Comma,            KeyboardKey::KEY_COMMA},
+        {Qt::Key::Key_Period,           KeyboardKey::KEY_DOT},
+        {Qt::Key::Key_Slash,            KeyboardKey::KEY_SLASH},
+        {Qt::Key::Key_CapsLock,         KeyboardKey::KEY_CAPS_LOCK},
+
+        {Qt::Key::Key_F1,               KeyboardKey::KEY_F1},
+        {Qt::Key::Key_F2,               KeyboardKey::KEY_F2},
+        {Qt::Key::Key_F3,               KeyboardKey::KEY_F3},
+        {Qt::Key::Key_F4,               KeyboardKey::KEY_F4},
+        {Qt::Key::Key_F5,               KeyboardKey::KEY_F5},
+        {Qt::Key::Key_F6,               KeyboardKey::KEY_F6},
+        {Qt::Key::Key_F7,               KeyboardKey::KEY_F7},
+        {Qt::Key::Key_F8,               KeyboardKey::KEY_F8},
+        {Qt::Key::Key_F9,               KeyboardKey::KEY_F9},
+        {Qt::Key::Key_F10,              KeyboardKey::KEY_F10},
+        {Qt::Key::Key_F11,              KeyboardKey::KEY_F11},
+        {Qt::Key::Key_F12,              KeyboardKey::KEY_F12},
+
+        {Qt::Key::Key_Print,            KeyboardKey::KEY_PRINT_SCREEN},
+        {Qt::Key::Key_ScrollLock,       KeyboardKey::KEY_SCROLL_LOCK},
+        {Qt::Key::Key_Pause,            KeyboardKey::KEY_PAUSE},
+        {Qt::Key::Key_Insert,           KeyboardKey::KEY_INSERT},
+        {Qt::Key::Key_Home,             KeyboardKey::KEY_HOME},
+        {Qt::Key::Key_PageUp,           KeyboardKey::KEY_PAGE_UP},
+        {Qt::Key::Key_Delete,           KeyboardKey::KEY_DELETE},
+        {Qt::Key::Key_End,              KeyboardKey::KEY_END},
+        {Qt::Key::Key_PageDown,         KeyboardKey::KEY_PAGE_DOWN},
+        {Qt::Key::Key_Right,            KeyboardKey::KEY_RIGHT},
+        {Qt::Key::Key_Left,             KeyboardKey::KEY_LEFT},
+        {Qt::Key::Key_Down,             KeyboardKey::KEY_DOWN},
+        {Qt::Key::Key_Up,               KeyboardKey::KEY_UP},
+        {Qt::Key::Key_NumLock,          KeyboardKey::KEY_NUM_LOCK},
+
+        {{Qt::Key::Key_Slash,       true},  KeyboardKey::KEY_KP_SLASH},
+        {{Qt::Key::Key_Asterisk,    true},  KeyboardKey::KEY_KP_ASTERISK},
+        {{Qt::Key::Key_Minus,       true},  KeyboardKey::KEY_KP_MINUS},
+        {{Qt::Key::Key_Plus,        true},  KeyboardKey::KEY_KP_PLUS},
+        {{Qt::Key::Key_Enter,       true},  KeyboardKey::KEY_KP_ENTER},
+        {{Qt::Key::Key_1,           true},  KeyboardKey::KEY_KP_1},
+        {{Qt::Key::Key_2,           true},  KeyboardKey::KEY_KP_2},
+        {{Qt::Key::Key_3,           true},  KeyboardKey::KEY_KP_3},
+        {{Qt::Key::Key_4,           true},  KeyboardKey::KEY_KP_4},
+        {{Qt::Key::Key_5,           true},  KeyboardKey::KEY_KP_5},
+        {{Qt::Key::Key_6,           true},  KeyboardKey::KEY_KP_6},
+        {{Qt::Key::Key_7,           true},  KeyboardKey::KEY_KP_7},
+        {{Qt::Key::Key_8,           true},  KeyboardKey::KEY_KP_8},
+        {{Qt::Key::Key_9,           true},  KeyboardKey::KEY_KP_9},
+        {{Qt::Key::Key_0,           true},  KeyboardKey::KEY_KP_0},
+        {{Qt::Key::Key_Period,      true},  KeyboardKey::KEY_KP_DOT},
+
+        {Qt::Key::Key_F13,              KeyboardKey::KEY_F13},
+        {Qt::Key::Key_F14,              KeyboardKey::KEY_F14},
+        {Qt::Key::Key_F15,              KeyboardKey::KEY_F15},
+        {Qt::Key::Key_F16,              KeyboardKey::KEY_F16},
+        {Qt::Key::Key_F17,              KeyboardKey::KEY_F17},
+        {Qt::Key::Key_F18,              KeyboardKey::KEY_F18},
+        {Qt::Key::Key_F19,              KeyboardKey::KEY_F19},
+        {Qt::Key::Key_F20,              KeyboardKey::KEY_F20},
+        {Qt::Key::Key_F21,              KeyboardKey::KEY_F21},
+        {Qt::Key::Key_F22,              KeyboardKey::KEY_F22},
+        {Qt::Key::Key_F23,              KeyboardKey::KEY_F23},
+        {Qt::Key::Key_F24,              KeyboardKey::KEY_F24},
+
+        {Qt::Key::Key_Open,             KeyboardKey::KEY_OPEN},
+        {Qt::Key::Key_Help,             KeyboardKey::KEY_HELP},
+        {Qt::Key::Key_Menu,             KeyboardKey::KEY_MENU},
+        {Qt::Key::Key_Select,           KeyboardKey::KEY_SELECT},
+        {Qt::Key::Key_Stop,             KeyboardKey::KEY_STOP},
+//        {Qt::Key::Key_Again,            KeyboardKey::KEY_AGAIN},
+        {Qt::Key::Key_Undo,             KeyboardKey::KEY_UNDO},
+        {Qt::Key::Key_Cut,              KeyboardKey::KEY_CUT},
+        {Qt::Key::Key_Copy,             KeyboardKey::KEY_COPY},
+        {Qt::Key::Key_Paste,            KeyboardKey::KEY_PASTE},
+        {Qt::Key::Key_Find,             KeyboardKey::KEY_FIND},
+        {Qt::Key::Key_VolumeMute,       KeyboardKey::KEY_VOLUME_MUTE},
+        {Qt::Key::Key_VolumeUp,         KeyboardKey::KEY_VOLUME_UP},
+        {Qt::Key::Key_VolumeDown,       KeyboardKey::KEY_VOLUME_DOWN},
+
+        {Qt::Key::Key_Control,          KeyboardKey::KEY_LEFT_CTRL},
+        {Qt::Key::Key_Shift,            KeyboardKey::KEY_LEFT_SHIFT},
+        {Qt::Key::Key_Alt,              KeyboardKey::KEY_LEFT_ALT},
+        {Qt::Key::Key_Meta,             KeyboardKey::KEY_LEFT_META},
+
+//        {Qt::Key::Key_MediaPlay,        KeyboardKey::KEY_MEDIA_PLAYPAUSE},
+//        {Qt::Key::Key_MediaStop,        KeyboardKey::KEY_MEDIA_STOPCD},
+//        {Qt::Key::Key_MediaPrevious,    KeyboardKey::KEY_MEDIA_PREVIOUS_SONG},
+//        {Qt::Key::Key_MediaNext,        KeyboardKey::KEY_MEDIA_NEXT_SONG},
+//        {Qt::Key::Key_Eject,            KeyboardKey::KEY_MEDIA_EJECTCD},
+//        {Qt::Key::Key_Eject,            KeyboardKey::KEY_MEDIA_VOLUME_UP},
+//        {Qt::Key::Key_Eject,            KeyboardKey::KEY_MEDIA_VOLUME_DOWN},
+    };
+    return database;
+};
+
+
+
+}
diff --git a/SerialPrograms/Source/ControllerInput/Keyboard/KeyboardInput_State.cpp b/SerialPrograms/Source/ControllerInput/Keyboard/KeyboardInput_State.cpp
new file mode 100644
index 0000000000..750649d0eb
--- /dev/null
+++ b/SerialPrograms/Source/ControllerInput/Keyboard/KeyboardInput_State.cpp
@@ -0,0 +1,16 @@
+/*  Keyboard Input State
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+
+namespace PokemonAutomation{
+
+
+
+
+
+
+
+}
diff --git a/SerialPrograms/Source/ControllerInput/Keyboard/KeyboardInput_State.h b/SerialPrograms/Source/ControllerInput/Keyboard/KeyboardInput_State.h
new file mode 100644
index 0000000000..a97c4d6f74
--- /dev/null
+++ b/SerialPrograms/Source/ControllerInput/Keyboard/KeyboardInput_State.h
@@ -0,0 +1,81 @@
+/*  Keyboard Input State
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_ControllerInput_Keyboard_KeyboardInput_State_H
+#define PokemonAutomation_ControllerInput_Keyboard_KeyboardInput_State_H
+
+#include <set>
+#include "ControllerInput/ControllerInput.h"
+#include "KeyboardHidButtons.h"
+
+namespace PokemonAutomation{
+
+
+
+class KeyboardInputState final : public ControllerInputState{
+public:
+    KeyboardInputState(KeyboardInputState&& x)
+        : ControllerInputState(ControllerInputType::HID_Keyboard)
+        , m_keys(std::move(x.m_keys))
+    {}
+    void operator=(KeyboardInputState&& x){
+        if (this == &x){
+            return;
+        }
+        m_keys = std::move(x.m_keys);
+    }
+
+
+public:
+    KeyboardInputState()
+        : ControllerInputState(ControllerInputType::HID_Keyboard)
+    {}
+
+
+    virtual void clear() override{
+        m_keys.clear();
+    }
+    virtual bool is_neutral() const override{
+        return m_keys.empty();
+    }
+    virtual bool operator==(const ControllerInputState& state) const override{
+        const KeyboardInputState* x = dynamic_cast<const KeyboardInputState*>(&state);
+        if (x == nullptr){
+            return false;
+        }
+        if (m_keys.size() != x->m_keys.size()){
+            return false;
+        }
+        for (auto a = m_keys.begin(), b = x->m_keys.begin(); a != m_keys.end(); ++a, ++b){
+            KeyboardKey key_a = *a;
+            KeyboardKey key_b = *b;
+            if (key_a != key_b){
+                return false;
+            }
+        }
+        return true;
+    }
+
+    const std::set<KeyboardKey>& keys() const{
+        return m_keys;
+    }
+
+    void add(KeyboardKey key){
+        m_keys.insert(key);
+    }
+
+
+private:
+    std::set<KeyboardKey> m_keys;
+};
+
+
+
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/ControllerInput/Keyboard/KeyboardInput_StateTracker.cpp b/SerialPrograms/Source/ControllerInput/Keyboard/KeyboardInput_StateTracker.cpp
new file mode 100644
index 0000000000..b52389c459
--- /dev/null
+++ b/SerialPrograms/Source/ControllerInput/Keyboard/KeyboardInput_StateTracker.cpp
@@ -0,0 +1,85 @@
+/*  Keyboard State Tracker
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "KeyboardInput_StateTracker.h"
+
+namespace PokemonAutomation{
+
+
+
+KeyboardStateTracker::KeyboardStateTracker(std::chrono::milliseconds debounce_period)
+    : m_debounce_period(debounce_period)
+{}
+
+
+
+void KeyboardStateTracker::clear(){
+    m_committed.clear();
+    m_pending.clear();
+}
+void KeyboardStateTracker::press(uint32_t key){
+    WallClock now = current_time();
+    m_pending.emplace_back(Event{now, true, key});
+    move_old_events_unprotected(now);
+}
+void KeyboardStateTracker::release(uint32_t key){
+    WallClock now = current_time();
+    m_pending.emplace_back(Event{now, false, key});
+    move_old_events_unprotected(now);
+}
+
+
+
+WallClock KeyboardStateTracker::next_state_change() const{
+    return m_pending.empty()
+        ? WallClock::max()
+        : m_pending.begin()->timestamp + m_debounce_period;
+}
+std::set<uint32_t> KeyboardStateTracker::get_currently_pressed(){
+    WallClock now = current_time();
+    move_old_events_unprotected(now);
+
+    //  Copy the current committed set.
+    std::set<uint32_t> ret = m_committed;
+
+    //  Now process all the pending ones - ignoring the release events.
+    for (const Event& event : m_pending){
+        if (event.press){
+            ret.insert(event.key);
+        }
+    }
+
+    return ret;
+}
+void KeyboardStateTracker::move_old_events_unprotected(WallClock now){
+    WallClock threshold = now - m_debounce_period;
+    while (!m_pending.empty()){
+        Event& event = m_pending.front();
+
+        //  Always commit presses.
+        if (event.press){
+            m_committed.insert(event.key);
+            m_pending.pop_front();
+            continue;
+        }
+
+        //  Release is old enough. Commit it.
+        if (event.timestamp < threshold){
+            m_committed.erase(event.key);
+            m_pending.pop_front();
+            continue;
+        }
+
+        //  We've hit an uncommittable release. We're done.
+        break;
+    }
+}
+
+
+
+
+
+}
diff --git a/SerialPrograms/Source/ControllerInput/Keyboard/KeyboardInput_StateTracker.h b/SerialPrograms/Source/ControllerInput/Keyboard/KeyboardInput_StateTracker.h
new file mode 100644
index 0000000000..e74121a78f
--- /dev/null
+++ b/SerialPrograms/Source/ControllerInput/Keyboard/KeyboardInput_StateTracker.h
@@ -0,0 +1,58 @@
+/*  Keyboard State Tracker
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_ControllerInput_Keyboard_KeyboardInput_StateTracker_H
+#define PokemonAutomation_ControllerInput_Keyboard_KeyboardInput_StateTracker_H
+
+#include <deque>
+#include <set>
+#include "Common/Cpp/Time.h"
+
+namespace PokemonAutomation{
+
+
+
+class KeyboardStateTracker{
+public:
+    KeyboardStateTracker(std::chrono::milliseconds debounce_period = std::chrono::milliseconds(10));
+
+
+public:
+    void clear();
+    void press(uint32_t key);
+    void release(uint32_t key);
+
+
+public:
+    WallClock next_state_change() const;
+    std::set<uint32_t> get_currently_pressed();
+
+
+private:
+    //  Move all pending events that are old enough to the committed set.
+    void move_old_events_unprotected(WallClock now);
+
+
+private:
+    struct Event{
+        WallClock timestamp;
+        bool press;
+        uint32_t key;
+    };
+    const std::chrono::milliseconds m_debounce_period;
+
+    std::set<uint32_t> m_committed;
+    std::deque<Event> m_pending;
+};
+
+
+
+
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/Controllers/Controller.cpp b/SerialPrograms/Source/Controllers/Controller.cpp
new file mode 100644
index 0000000000..7187cfb646
--- /dev/null
+++ b/SerialPrograms/Source/Controllers/Controller.cpp
@@ -0,0 +1,57 @@
+/*  Controller
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Exceptions.h"
+#include "Common/Cpp/ListenerSet.h"
+#include "Common/Cpp/RecursiveThrottler.h"
+#include "Common/Cpp/Containers/Pimpl.tpp"
+#include "Controller.h"
+
+namespace PokemonAutomation{
+
+
+
+
+struct AbstractController::Data{
+    RecursiveThrottler recursive_throttler;
+    ListenerSet<InputSniffer> input_sniffers;
+};
+void AbstractController::add_input_sniffer(InputSniffer& listener){
+    m_data->input_sniffers.add(listener);
+}
+void AbstractController::remove_input_sniffer(InputSniffer& listener){
+    m_data->input_sniffers.remove(listener);
+}
+void AbstractController::on_command_input(WallClock timestamp, const ControllerState& state){
+    m_data->input_sniffers.run_method(&InputSniffer::on_command_input, timestamp, state);
+}
+
+
+AbstractController::AbstractController()
+    : m_data(CONSTRUCT_TOKEN)
+{}
+AbstractController::~AbstractController() = default;
+
+
+RecursiveThrottler& AbstractController::logging_throttler(){
+    return m_data->recursive_throttler;
+}
+
+
+void AbstractController::throw_bad_cast(const char* desired_typename){
+    throw UserSetupError(
+        logger(),
+        std::string("Incompatible Controller:\n\n") +
+        "Required:\n    " + desired_typename + "\n"
+        "Actual:\n    " + name()
+    );
+}
+
+
+
+}
+
+
diff --git a/SerialPrograms/Source/Controllers/Controller.h b/SerialPrograms/Source/Controllers/Controller.h
new file mode 100644
index 0000000000..f7f855e277
--- /dev/null
+++ b/SerialPrograms/Source/Controllers/Controller.h
@@ -0,0 +1,330 @@
+/*  Controller
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Controllers_Controller_H
+#define PokemonAutomation_Controllers_Controller_H
+
+#include "Common/Compiler.h"
+#include "Common/Cpp/Logging/AbstractLogger.h"
+#include "Common/Cpp/Time.h"
+#include "Common/Cpp/Containers/Pimpl.h"
+#include "Common/Cpp/CancellableScope.h"
+
+namespace PokemonAutomation{
+
+class RecursiveThrottler;
+enum class ControllerInputType;
+class ControllerInputState;
+class ControllerState;
+enum class ControllerType;
+enum class ControllerPerformanceClass;
+enum class ControllerClass;
+
+
+
+
+class AbstractController{
+public:
+    static const char NAME[];
+
+    AbstractController();
+    virtual ~AbstractController();
+
+    virtual Logger& logger() = 0;
+    RecursiveThrottler& logging_throttler();
+
+
+public:
+    template <typename ControllerType>
+    ControllerType* cast(){
+        return dynamic_cast<ControllerType*>(this);
+    }
+    template <typename ControllerType>
+    ControllerType& cast_with_exception(){
+        ControllerType* controller = dynamic_cast<ControllerType*>(this);
+        if (!controller){
+            throw_bad_cast(ControllerType::NAME);
+        }
+        return *controller;
+    }
+private:
+    void throw_bad_cast(const char* desired_typename);
+
+
+public:
+    //  Static Information
+
+    virtual const char* name() = 0;
+    virtual ControllerClass controller_class() const noexcept = 0;
+
+    //  Performance Metrics
+    virtual ControllerPerformanceClass performance_class() const = 0;
+
+    //  If the controller is polled at a fixed interval, this is that interval.
+    //  Otherwise, returns zero.
+    virtual Milliseconds ticksize() const = 0;
+
+    //  The minimum amount of time between two state reports. This effectively
+    //  limits how quickly you can change states.
+    //  Controllers with non-zero ticksize will have (ticksize == cooldown).
+    virtual Milliseconds cooldown() const = 0;
+
+    //  Some controllers are imprecise. This returns the variation.
+    //  Zero means "tick precise".
+    virtual Milliseconds timing_variation() const = 0;
+
+    //  If the controller can atomically press/release multiple buttons
+    //  return true. This means that if the program presses A and B
+    //  simultaneously, the console will never see an intermediate state where
+    //  either A or B is pressed by itself before the other is pressed as well.
+    virtual bool atomic_multibutton() const = 0;
+
+
+public:
+    //  Status
+
+    virtual bool is_ready() const = 0;
+
+
+public:
+    //
+    //  Cancellation
+    //
+    //  These functions will return immediately and are thread-safe with
+    //  everything. The intended use-case is for an inference thread to cancel
+    //  a running sequence of commands on a program thread.
+    //
+
+    //  Cancel all commands. This returns the controller to the neutral button
+    //  state and clears the command queue.
+    //  This does not wait for the commands to finish cancelling. This is an
+    //  asynchronous function that merely initiates the cancellation process.
+    virtual void cancel_all_commands() = 0;
+
+    //  Same as "cancel_all_commands()", but instead of cancelling the stream,
+    //  it lets it keep running. Then on the next command issued after this
+    //  cancel, it will atomically replace the stream without gapping.
+    //  This lets you do stuff like suddenly change joystick movement in
+    //  response to inference while simultaneously holding a button without
+    //  ever releasing it during the transition.
+    virtual void replace_on_next_command() = 0;
+
+    //  Same as "cancel_all_commands()", but unlike the two functions above,
+    //  this one blocks until the device acks the cancel or until "timeout".
+    //
+    //  Returns true if the device has received the cancel. Commands issued
+    //  after this returns are queued behind the cancel, so the controller is
+    //  immediately usable.
+    //  Returns false on timeout or if the controller cannot confirm cancels.
+    //
+    //  Commands issued from other threads while this is running may land
+    //  after the cancel and are not cancelled.
+    virtual bool cancel_all_and_wait(Milliseconds timeout) = 0;
+
+
+public:
+    //
+    //  Commands
+    //
+    //  Commands are actions like button presses or joystick movements that are
+    //  eventually sent to the console.
+    //
+    //  All commands are prefixed with "issue_".
+    //  Commands are not thread-safe with other commands.
+    //  Commands are thread-safe with the cancellation functions above.
+    //
+    //  Commands are asynchronous. When you call a command function on this,
+    //  class it gets enqueued into a FIFO and immediately returns. It will only
+    //  block if the FIFO is full.
+    //
+    //  If a command is called with a cancelled "cancellable" parameter, it will
+    //  throw an OperationCancelledException.
+    //  If a cancellation happens while you are inside a command function, it
+    //  will immediately stop and throw an OperationCancelledException.
+    //
+
+
+public:
+    //
+    //  Superscalar Commands (the "ssf" framework)
+    //
+
+    //
+    //  delay       Time to wait before moving onto the next command.
+    //  hold        Time to hold the button/stick down for.
+    //  cooldown    After the button has been released, prevent it from being
+    //              used again for this much time.
+    //
+    //  For "normal" use, you should always set (delay == hold + cooldown).
+    //  This is the easiest case to understand and is what the "pbf" interface
+    //  exposes.
+    //
+    //  If the button is busy (due to still being held down or is waiting out
+    //  the cooldown), the command will wait until the button is ready.
+    //
+    //  By setting (delay < hold), the command will "return" early and move onto
+    //  the next command while the button is still being held down.
+    //
+    //  If a command returns before it is finished (delay < hold + cooldown),
+    //  it is considered a "hanging" command.
+    //
+    //  This allows you to overlap buttons. But is confusing to use because it
+    //  implies a non-trivial controller state with pending button presses that
+    //  are scheduled to be released at a later time.
+    //
+    //  Each button/stick has its own independent timeline/schedule.
+    //  Users are responsible for understanding the controller state and
+    //  managing the timeline/scheduling.
+    //
+    //  It is important to remember that the "timeline" here is the timeline
+    //  being fed to the Switch. Thus the timing parameters written in the C++
+    //  code here is what you will get on the console (or as close as possible).
+    //
+    //  The actual calls to the methods in the class will return or block in an
+    //  unspecified manner as they merely enqueue into a FIFO which is then
+    //  "replayed" to the Switch in an implementation-dependent manner.
+    //
+
+    //  Wait for all unfinished commands to finish. This will also wait out
+    //  hanging commands including their cooldown periods.
+    //  This is not a true command function as it waits for the entire queue to
+    //  empty out rather than entering itself into the queue.
+    //  If a cancellation happens inside this function, it will immediately
+    //  throw an OperationCancelledException.
+    virtual void wait_for_all(Cancellable* cancellable) = 0;
+
+    //  Tell the scheduler to wait for all pending commands to finish
+    //  (including cooldowns) before executing further instructions.
+    //  This is used to prevent hanging commands from overlapping with new
+    //  commands issued after this barrier.
+    virtual void issue_barrier(Cancellable* cancellable) = 0;
+
+    //  Do nothing for this much time.
+    virtual void issue_nop(Cancellable* cancellable, Milliseconds duration) = 0;
+
+
+public:
+    //  External Inputs
+
+    virtual bool run_string_command(Milliseconds duration, const std::string& command){ return false; };
+    virtual void run_controller_input(const ControllerInputState& state){}
+
+
+public:
+    //  Input Sniffing
+
+    struct InputSniffer{
+        virtual void on_command_input(WallClock timestamp, const ControllerState& state) = 0;
+    };
+    void add_input_sniffer(InputSniffer& listener);
+    void remove_input_sniffer(InputSniffer& listener);
+protected:
+    void on_command_input(WallClock timestamp, const ControllerState& state);
+
+
+private:
+    struct Data;
+    Pimpl<Data> m_data;
+};
+
+
+inline const char AbstractController::NAME[] = "Controller";
+
+
+
+//
+//  The context wrapper to support asynchronous cancel.
+//
+template <typename Type>
+class ControllerContext final : public CancellableScope{
+public:
+    using ControllerType = Type;
+
+
+public:
+    virtual ~ControllerContext(){
+        detach();
+    }
+    ControllerContext(ControllerType& controller)
+        : m_controller(controller)
+    {}
+    ControllerContext(CancellableScope& parent, ControllerType& controller)
+        : m_controller(controller)
+    {
+        attach(parent);
+    }
+    template <typename T>
+    ControllerContext(ControllerContext<T>& context)
+        : m_controller(context.controller().template cast_with_exception<Type>())
+    {
+        attach(context);
+    }
+
+
+public:
+    ControllerType* operator->(){
+        m_lifetime_sanitizer.check_usage();
+        return &m_controller;
+    }
+
+    operator ControllerType&() const{ return m_controller; }
+    ControllerType& controller() const{ return m_controller; }
+
+
+public:
+    void wait_for_all_requests(){
+        auto scope = m_lifetime_sanitizer.check_scope();
+        m_controller.wait_for_all(this);
+    }
+
+    //  Stop all commands in this context now.
+    void cancel_now(){
+        auto scope = m_lifetime_sanitizer.check_scope();
+        CancellableScope::cancel(nullptr);
+        m_controller.cancel_all_commands();
+    }
+
+    //  Stop the commands in this context, but do it lazily.
+    //
+    //  1.  Stop new commands from being issued to the device from this context.
+    //  2.  Tell the device that the next command that is issued should replace
+    //      the command queue.
+    //
+    //  This cancel is used when you need continuity from an ongoing
+    //  sequence.
+    void cancel_lazy(){
+        auto scope = m_lifetime_sanitizer.check_scope();
+        CancellableScope::cancel(nullptr);
+        m_controller.replace_on_next_command();
+    }
+
+    virtual bool cancel(std::exception_ptr exception) noexcept override{
+        auto scope = m_lifetime_sanitizer.check_scope();
+        if (CancellableScope::cancel(std::move(exception))){
+            return true;
+        }
+        try{
+            m_controller.cancel_all_commands();
+        }catch (...){}
+        return false;
+    }
+
+
+private:
+    ControllerType& m_controller;
+    LifetimeSanitizer m_lifetime_sanitizer;
+};
+
+
+using AbstractControllerContext = ControllerContext<AbstractController>;
+
+
+
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/Controllers/ControllerConnection.cpp b/SerialPrograms/Source/Controllers/ControllerConnection.cpp
new file mode 100644
index 0000000000..f83b4fc0bb
--- /dev/null
+++ b/SerialPrograms/Source/Controllers/ControllerConnection.cpp
@@ -0,0 +1,90 @@
+/*  Controller Connection
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/ColoredText.h"
+#include "ControllerConnection.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+
+
+
+void ControllerConnection::add_status_listener(StatusListener& listener){
+    m_status_listeners.add(listener);
+    if (m_status.load(std::memory_order_acquire) == Status::READY){
+        listener.post_connection_ready(*this);
+    }
+}
+void ControllerConnection::remove_status_listener(StatusListener& listener){
+    m_status_listeners.remove(listener);
+}
+
+std::string ControllerConnection::status_text() const{
+    ReadSpinLock lg(m_status_text_lock);
+    std::string str = m_status_line0;
+    if (!str.empty() && !m_status_line1.empty()){
+        str += "<br>";
+        str += m_status_line1;
+    }
+    return str;
+}
+std::string ControllerConnection::raw_status_text() const{
+    ReadSpinLock lg(m_status_text_lock);
+    std::string str = m_raw_status_line0;
+    if (!str.empty() && !m_raw_status_line1.empty()){
+        str += "\n";
+        str += m_raw_status_line1;
+    }
+    return str;
+}
+
+
+void ControllerConnection::set_status_line0(const std::string& text, Color color){
+    {
+        WriteSpinLock lg(m_status_text_lock);
+        m_status_line0 = html_color_text(text, color);
+        m_raw_status_line0 = text;
+    }
+    signal_status_text_changed(status_text());
+}
+void ControllerConnection::set_status_line1(const std::string& text, Color color){
+    {
+        WriteSpinLock lg(m_status_text_lock);
+        m_status_line1 = html_color_text(text, color);
+        m_raw_status_line1 = text;
+    }
+    signal_status_text_changed(status_text());
+}
+void ControllerConnection::declare_ready(){
+    m_status.store(Status::READY, std::memory_order_release);
+    signal_post_ready();
+}
+void ControllerConnection::declare_failed(){
+    m_status.store(Status::FAILED_TO_CONNECT, std::memory_order_release);
+}
+
+
+//void ControllerConnection::signal_pre_not_ready(){
+//    m_status_listeners.run_method(&StatusListener::pre_connection_not_ready, *this);
+//}
+void ControllerConnection::signal_post_ready(){
+    m_status_listeners.run_method(&StatusListener::post_connection_ready, *this);
+}
+void ControllerConnection::signal_status_text_changed(const std::string& text){
+//    cout << "m_status_listeners.size() = " << m_status_listeners.count_unique() << endl;
+    m_status_listeners.run_method(&StatusListener::status_text_changed, *this, text);
+}
+void ControllerConnection::signal_error(const std::string& text){
+    m_status_listeners.run_method(&StatusListener::on_error, *this, text);
+}
+
+
+
+
+}
diff --git a/SerialPrograms/Source/Controllers/ControllerConnection.h b/SerialPrograms/Source/Controllers/ControllerConnection.h
new file mode 100644
index 0000000000..e69252328d
--- /dev/null
+++ b/SerialPrograms/Source/Controllers/ControllerConnection.h
@@ -0,0 +1,115 @@
+/*  Controller Connection
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Controllers_ControllerConnection_H
+#define PokemonAutomation_Controllers_ControllerConnection_H
+
+#include <vector>
+#include "Common/Cpp/ListenerSet.h"
+#include "Common/Cpp/Concurrency/SpinLock.h"
+#include "ControllerDescriptor.h"
+
+namespace PokemonAutomation{
+
+
+
+class ControllerConnection : public CancellableScope{
+public:
+    enum class Status{
+        NOT_CONNECTED,
+        READY,
+        FAILED_TO_CONNECT,
+    };
+
+public:
+    struct StatusListener{
+//        virtual void pre_connection_not_ready(ControllerConnection& connection){}
+        virtual void post_connection_ready(ControllerConnection& connection){}
+        virtual void status_text_changed(
+            ControllerConnection& connection, const std::string& text
+        ){}
+        virtual void on_error(
+            ControllerConnection& connection, const std::string& text
+        ){};
+    };
+
+    void add_status_listener(StatusListener& listener);
+    void remove_status_listener(StatusListener& listener);
+
+
+protected:
+    ControllerConnection()
+        : m_current_controller(ControllerType::None)
+        , m_status(Status::NOT_CONNECTED)
+    {}
+public:
+    virtual ~ControllerConnection() = default;
+
+    virtual void try_set_controller_type(
+        ControllerType controller_type,
+        bool clear_settings
+    ) noexcept{}
+
+
+public:
+    ControllerType current_controller() const noexcept{
+        return m_current_controller.load(std::memory_order_acquire);
+    }
+    bool is_ready() const noexcept{ return status() == Status::READY; }
+    Status status() const noexcept{ return m_status.load(std::memory_order_acquire); }
+    //  The status shown in the GUI's controller panel, formatted as HTML: each line is
+    //  colored with <font> tags and the two lines are joined with <br>.
+    std::string status_text() const;
+    //  The same status as plain text, for non-GUI callers (e.g. the Python bindings):
+    //  the text of each line as it was set, without colors, joined with a newline.
+    //  e.g. "PABotBase2-Pico1W (UART) (2026062701)"
+    std::string raw_status_text() const;
+
+    //  It it not safe to call this until "is_ready()" is true.
+    const std::vector<ControllerType>& controller_list() noexcept{
+        return m_controller_list;
+    }
+
+
+public:
+    void set_status_line0(const std::string& text, Color color = Color());
+    void set_status_line1(const std::string& text, Color color = Color());
+
+
+protected:
+    void declare_ready();
+    void declare_failed();
+
+
+private:
+//    void signal_pre_not_ready();
+    void signal_post_ready();
+    void signal_status_text_changed(const std::string& text);
+    void signal_error(const std::string& text);
+
+
+protected:
+    //  This is written to once and never modified again.
+    std::vector<ControllerType> m_controller_list;
+
+    std::atomic<ControllerType> m_current_controller;
+    std::atomic<Status> m_status;
+
+
+private:
+    mutable SpinLock m_status_text_lock;
+    std::string m_status_line0;     //  HTML, for status_text()
+    std::string m_status_line1;
+    std::string m_raw_status_line0; //  plain text, for raw_status_text()
+    std::string m_raw_status_line1;
+    ListenerSet<StatusListener> m_status_listeners;
+};
+
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/Controllers/ControllerDescriptor.cpp b/SerialPrograms/Source/Controllers/ControllerDescriptor.cpp
new file mode 100644
index 0000000000..03eb6f3b43
--- /dev/null
+++ b/SerialPrograms/Source/Controllers/ControllerDescriptor.cpp
@@ -0,0 +1,21 @@
+/*  Controller Interface
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+
+
+
+
+
+
+
+
+}
diff --git a/SerialPrograms/Source/Controllers/ControllerDescriptor.h b/SerialPrograms/Source/Controllers/ControllerDescriptor.h
new file mode 100644
index 0000000000..822aed513b
--- /dev/null
+++ b/SerialPrograms/Source/Controllers/ControllerDescriptor.h
@@ -0,0 +1,128 @@
+/*  Controller Interface
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Controllers_ControllerDescriptor_H
+#define PokemonAutomation_Controllers_ControllerDescriptor_H
+
+#include <string>
+#include <memory>
+#include "Common/Cpp/Logging/AbstractLogger.h"
+#include "Common/Cpp/UiWrapper.h"
+#include "ControllerTypes.h"
+#include "Controller.h"
+
+namespace PokemonAutomation{
+
+class JsonValue;
+class InterfaceType;
+class ControllerDescriptor;
+class ControllerConnection;
+class ControllerSelectorWidget;
+
+
+
+
+//
+//  Represents an entire controller interface.
+//
+//  For example:
+//      -   Serial PABotBase
+//      -   Direct USB to X (hypothetical)
+//      -   Emulator IPC (hypothetical)
+//
+//  One instance of this class exists for each interface.
+//
+class InterfaceType{
+public:
+    virtual ~InterfaceType() = default;
+
+    virtual std::unique_ptr<ControllerDescriptor> make() const = 0;
+
+    //  Construct a descriptor from a JSON config. (reloading saved controller settings)
+    virtual std::unique_ptr<ControllerDescriptor> make(const JsonValue& json) const = 0;
+
+protected:
+    static void register_factory(
+        ControllerInterface controller_interface,
+        std::unique_ptr<InterfaceType> factory
+    );
+};
+
+
+//
+//  Subclass helper for ControllerType.
+//
+template <typename DescriptorType>
+class InterfaceType_t : public InterfaceType{
+public:
+    virtual std::unique_ptr<ControllerDescriptor> make() const override{
+        return std::make_unique<DescriptorType>();
+    }
+    virtual std::unique_ptr<ControllerDescriptor> make(const JsonValue& json) const override{
+        std::unique_ptr<DescriptorType> ptr(new DescriptorType());
+        ptr->load_json(json);
+        return ptr;
+    }
+
+private:
+    static int register_class(){
+        InterfaceType::register_factory(
+            DescriptorType::INTERFACE_NAME,
+            std::make_unique<InterfaceType_t<DescriptorType>>()
+        );
+        return 0;
+    }
+    static int initializer;
+};
+template <typename DescriptorType>
+int InterfaceType_t<DescriptorType>::initializer = register_class();
+
+
+
+
+//
+//  Represents a user-selectable controller. When the user clicks on the
+//  "Controller" dropdown, every item in that list corresponds to an instance
+//  of this class.
+//
+class ControllerDescriptor : public UiState<>{
+public:
+    const ControllerInterface interface_type;
+
+    ControllerDescriptor(ControllerInterface p_interface_type)
+        : interface_type(p_interface_type)
+    {}
+    virtual ~ControllerDescriptor() = default;
+
+public:
+    virtual bool operator==(const ControllerDescriptor& x) const = 0;
+    virtual std::string display_name() const = 0;
+
+public:
+    virtual JsonValue to_json() const = 0;
+    virtual void load_json(const JsonValue& json) = 0;
+
+public:
+    virtual std::unique_ptr<ControllerConnection> open_connection(Logger& logger) const = 0;
+    virtual std::unique_ptr<AbstractController> make_controller(
+        Logger& logger,
+        ControllerConnection& connection,
+        ControllerType controller_type
+    ) const = 0;
+};
+
+
+
+
+
+
+
+
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/Controllers/ControllerOption.cpp b/SerialPrograms/Source/Controllers/ControllerOption.cpp
new file mode 100644
index 0000000000..cfe095ab9a
--- /dev/null
+++ b/SerialPrograms/Source/Controllers/ControllerOption.cpp
@@ -0,0 +1,151 @@
+/*  Controller Interface
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Exceptions.h"
+#include "Common/Cpp/Json/JsonValue.h"
+#include "Common/Cpp/Json/JsonObject.h"
+#include "ControllerTypeStrings.h"
+#include "ControllerDescriptor.h"
+#include "ControllerOption.h"
+#include "NullController.h"
+
+namespace PokemonAutomation{
+
+
+
+//
+//  Here we store a map of all controller types in the program.
+//
+static std::map<ControllerInterface, std::unique_ptr<InterfaceType>>& ALL_CONTROLLER_INTERFACES(){
+    static std::map<ControllerInterface, std::unique_ptr<InterfaceType>> instance;
+    return instance;
+}
+
+
+void InterfaceType::register_factory(
+    ControllerInterface controller_interface,
+    std::unique_ptr<InterfaceType> factory
+){
+    auto ret = ALL_CONTROLLER_INTERFACES().emplace(controller_interface, std::move(factory));
+    if (!ret.second){
+        throw InternalProgramError(
+            nullptr, PA_CURRENT_FUNCTION,
+            "Duplicate Factory Name: " + CONTROLLER_INTERFACE_STRINGS.get_string(controller_interface)
+        );
+    }
+}
+
+
+
+
+ControllerOption::ControllerOption(bool default_enable_mode)
+    : m_default_enable_mode(default_enable_mode)
+    , m_enable_input(default_enable_mode)
+    , m_descriptor(null_controller_descriptor())
+    , m_sanitizer("ControllerOption")
+{}
+
+
+void ControllerOption::set_interface(ControllerInterface interface_type){
+    m_sanitizer.check_scope();
+
+    m_descriptor_cache[m_descriptor->interface_type] = m_descriptor;
+    auto iter = m_descriptor_cache.find(interface_type);
+    if (iter != m_descriptor_cache.end()){
+        m_descriptor = iter->second;
+    }else{
+        m_descriptor = ALL_CONTROLLER_INTERFACES().find(interface_type)->second->make();
+    }
+}
+void ControllerOption::set_descriptor(std::shared_ptr<ControllerDescriptor> descriptor){
+    m_sanitizer.check_scope();
+
+    m_descriptor_cache[descriptor->interface_type] = descriptor;
+    m_descriptor = std::move(descriptor);
+}
+
+std::shared_ptr<ControllerDescriptor> ControllerOption::get_descriptor_from_cache(ControllerInterface interface_type) const{
+    m_sanitizer.check_scope();
+
+    auto iter = m_descriptor_cache.find(interface_type);
+    if (iter == m_descriptor_cache.end()){
+        return nullptr;
+    }
+    return iter->second;
+}
+
+
+
+void ControllerOption::load_json(const JsonValue& json){
+    m_sanitizer.check_scope();
+
+    std::shared_ptr<ControllerDescriptor> descriptor;
+    do{
+        if (json.is_null()){
+            break;
+        }
+
+        const JsonObject* obj = json.to_object();
+        if (obj == nullptr){
+            break;
+        }
+
+        obj->read_boolean(m_enable_input, "EnableInput");
+
+        const std::string* type = obj->get_string("Interface");
+        if (type == nullptr){
+            break;
+        }
+
+        for (const auto& item : ALL_CONTROLLER_INTERFACES()){
+            const JsonValue* params = obj->get_value(CONTROLLER_INTERFACE_STRINGS.get_string(item.first));
+            if (params == nullptr){
+                continue;
+            }
+            m_descriptor_cache[item.first] = item.second->make(*params);
+        }
+
+        try{
+            auto iter = m_descriptor_cache.find(CONTROLLER_INTERFACE_STRINGS.get_enum(*type));
+            if (iter == m_descriptor_cache.end()){
+                break;
+            }
+            descriptor = iter->second;
+        }catch (ParseException&){
+            break;
+        }
+
+    }while (false);
+
+    if (descriptor == nullptr){
+        descriptor = null_controller_descriptor();
+    }
+
+    m_descriptor = std::move(descriptor);
+}
+JsonValue ControllerOption::to_json() const{
+    m_sanitizer.check_scope();
+
+    if (!m_descriptor){
+        return JsonValue();
+    }
+    JsonObject obj;
+    obj["EnableInput"] = m_enable_input;
+    obj["Interface"] = CONTROLLER_INTERFACE_STRINGS.get_string(m_descriptor->interface_type);
+
+    for (const auto& item : m_descriptor_cache){
+        obj[CONTROLLER_INTERFACE_STRINGS.get_string(item.first)] = item.second->to_json();
+    }
+
+    return obj;
+}
+
+
+
+
+
+
+}
diff --git a/SerialPrograms/Source/Controllers/ControllerOption.h b/SerialPrograms/Source/Controllers/ControllerOption.h
new file mode 100644
index 0000000000..c695c249a8
--- /dev/null
+++ b/SerialPrograms/Source/Controllers/ControllerOption.h
@@ -0,0 +1,58 @@
+/*  Controller Option
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Controllers_ControllerOption_H
+#define PokemonAutomation_Controllers_ControllerOption_H
+
+#include <map>
+#include "ControllerDescriptor.h"
+
+namespace PokemonAutomation{
+
+
+
+//
+//  A configurable option type for the descriptor.
+//
+class ControllerOption{
+public:
+    ControllerOption(bool default_enable_mode);
+
+    void set_interface(ControllerInterface interface_type);
+
+    std::shared_ptr<ControllerDescriptor> descriptor() const{
+        return m_descriptor;
+    }
+    void set_descriptor(std::shared_ptr<ControllerDescriptor> descriptor);
+
+    //  Remember the last used descriptor for each interface type. That way when
+    //  the user switches back-and-forth between two interfaces, it will reload
+    //  the previous one.
+    std::shared_ptr<ControllerDescriptor> get_descriptor_from_cache(ControllerInterface interface_type) const;
+
+
+public:
+    void load_json(const JsonValue& json);
+    JsonValue to_json() const;
+
+
+public:
+    bool m_default_enable_mode;
+    bool m_enable_input = true;
+
+private:
+    std::shared_ptr<ControllerDescriptor> m_descriptor;
+    std::map<ControllerInterface, std::shared_ptr<ControllerDescriptor>> m_descriptor_cache;
+
+    LifetimeSanitizer m_sanitizer;
+};
+
+
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/Controllers/ControllerSelectorWidget.cpp b/SerialPrograms/Source/Controllers/ControllerSelectorWidget.cpp
new file mode 100644
index 0000000000..edb904f191
--- /dev/null
+++ b/SerialPrograms/Source/Controllers/ControllerSelectorWidget.cpp
@@ -0,0 +1,339 @@
+/*  Controller Selector Widget
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <QKeyEvent>
+#include <QHBoxLayout>
+#include <QCheckBox>
+#include <QMessageBox>
+#include "Common/Qt/NoWheelComboBox.h"
+#include "CommonFramework/Panels/ConsoleSettingsStretch.h"
+#include "Controllers/ControllerTypeStrings.h"
+#include "ControllerSelectorWidget.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+
+template class RegisterUiStateQtWidget<ControllerSelectorWidget>;
+
+
+
+
+
+ControllerSelectorWidget::~ControllerSelectorWidget(){
+    m_session.remove_listener(*this);
+}
+ControllerSelectorWidget::ControllerSelectorWidget(
+    QWidget& parent,
+    ControllerSession& session
+)
+    : QWidget(&parent)
+    , m_session(session)
+{
+//    cout << "ControllerSelectorWidget()" << endl;
+
+    QHBoxLayout* layoutL = new QHBoxLayout(this);
+    layoutL->setContentsMargins(0, 0, 0, 0);
+
+    if (!session.index().has_value()){
+        layoutL->addWidget(new QLabel("<b>Controller:</b>", this), CONSOLE_SETTINGS_STRETCH_L0_LABEL);
+    }else{
+        QHBoxLayout* layoutL0 = new QHBoxLayout();
+        layoutL->addLayout(layoutL0, CONSOLE_SETTINGS_STRETCH_L0_LABEL);
+        layoutL0->setContentsMargins(0, 0, 0, 0);
+
+        layoutL0->addWidget(
+            new QLabel(
+                QString::fromStdString("<b>Controller " + std::to_string(session.index().value()) + ":</b>"),
+                this
+            )
+        );
+
+        QCheckBox* check_box = new QCheckBox(this);
+        layoutL0->addWidget(check_box, 1, Qt::AlignRight);
+        if (session.input_enabled()){
+            check_box->setCheckState(Qt::Checked);
+        }else{
+            check_box->setCheckState(Qt::Unchecked);
+        }
+        connect(
+            check_box, &QCheckBox::checkStateChanged,
+            this, [this, check_box](int){
+                m_session.set_input_enabled(check_box->isChecked());
+            }
+        );
+    }
+
+    QHBoxLayout* layoutR = new QHBoxLayout();
+    layoutL->addLayout(layoutR, CONSOLE_SETTINGS_STRETCH_L0_RIGHT);
+    layoutR->setContentsMargins(0, 0, 0, 0);
+
+    m_dropdowns = new QHBoxLayout();
+    layoutR->addLayout(m_dropdowns, CONSOLE_SETTINGS_STRETCH_L1_BODY);
+    layoutR->addSpacing(5);
+
+    m_interface_dropdown = new NoWheelCompactComboBox(this);
+    m_dropdowns->addWidget(m_interface_dropdown);
+
+
+    //  Add all the supported interfaces.
+    {
+        m_interface_list.emplace_back(ControllerInterface::SerialPABotBase2);
+        m_interface_list.emplace_back(ControllerInterface::TcpSysbotBase);
+//        m_interface_list.emplace_back(ControllerInterface::UsbSysbotBase);
+    }
+
+
+    for (ControllerInterface item : m_interface_list){
+        m_interface_dropdown->addItem(QString::fromStdString(CONTROLLER_INTERFACE_STRINGS.get_string(item)));
+    }
+
+//    m_interface_dropdown->setHidden(true);
+
+    refresh_selection();
+
+
+//    m_dropdowns->addSpacing(5);
+    m_controllers_dropdown = new NoWheelCompactComboBox(this);
+//    m_controllers_dropdown->setSizeAdjustPolicy(QComboBox::AdjustToContents);
+    m_dropdowns->addWidget(m_controllers_dropdown, 3);
+    refresh_controllers(session.controller_type(), session.available_controllers());
+
+    m_status_text = new QLabel(this);
+    layoutR->addWidget(m_status_text, CONSOLE_SETTINGS_STRETCH_L1_RIGHT);
+    layoutR->addSpacing(5);
+
+    m_status_text->setText(QString::fromStdString(session.status_text()));
+    m_status_text->setTextFormat(Qt::RichText);
+    m_status_text->setTextInteractionFlags(Qt::TextBrowserInteraction);
+    m_status_text->setOpenExternalLinks(true);
+
+    m_reset_button = new QPushButton("Reset Ctrl.", this);
+#if 1
+    m_reset_button->setToolTip(
+        "<b>Click:</b> Reset controller and reconnect.<br><br>"
+        "<b>Shift+Click:</b> Reset and clear the controller of any state. "
+        "If the controller supports pairing, this will unpair it and allow it to pair with a new host."
+    );
+#endif
+    layoutR->addWidget(m_reset_button, CONSOLE_SETTINGS_STRETCH_L1_BUTTON);
+
+    bool options_locked = session.options_locked();
+    if (m_selector){
+        m_selector->setEnabled(!options_locked);
+    }
+    m_reset_button->setEnabled(!options_locked);
+
+    setFocusPolicy(Qt::StrongFocus);
+
+    connect(
+        m_interface_dropdown, static_cast<void(QComboBox::*)(int)>(&QComboBox::activated),
+        this, [this](int index){
+            index = std::max(index, 0);
+//            index = std::min(index, (int)m_device_list.size() - 1);
+
+            ControllerInterface incoming = m_interface_list[index];
+            ControllerInterface existing = m_session.descriptor()->interface_type;
+//            cout << "incoming = " << (int)incoming << endl;
+//            cout << "existing = " << (int)existing << endl;
+            if (incoming == existing){
+                return;
+            }
+
+            m_session.set_interface(incoming);
+
+            refresh_selection();
+        }
+    );
+    connect(
+        m_controllers_dropdown, static_cast<void(QComboBox::*)(int)>(&QComboBox::activated),
+        this, [this](int index){
+            index = std::max(index, 0);
+            ControllerType new_value = CONTROLLER_TYPE_STRINGS.get_enum(
+                m_controllers_dropdown->itemText(index).toStdString(),
+                ControllerType::None
+            );
+            ControllerType previous_controller = m_session.controller_type();
+            if (new_value == previous_controller){
+                return;
+            }
+
+            if (previous_controller != ControllerType::NintendoSwitch_WiredProController &&
+                previous_controller != ControllerType::NintendoSwitch2_WiredProController
+            ){
+                m_session.set_controller(new_value);
+                return;
+            }
+
+            if (new_value != ControllerType::NintendoSwitch_WiredController &&
+                new_value != ControllerType::NintendoSwitch2_WiredController
+            ){
+                m_session.set_controller(new_value);
+                return;
+            }
+
+            QMessageBox box;
+            QMessageBox::StandardButton reply = box.warning(
+                this,
+                "Warning",
+                "You are attempting to change from a Pro Controller to a 3rd party wired controller.<br><br>"
+                "Are you sure you wish to do this?<br><br>"
+                "If you are doing this because our YouTube video is telling you to do this, STOP. "
+                "That video is out of date.<br><br>"
+                "Since that video was made, we have added support for the Pro Controller which "
+                "supports many more features. You should not need to use the 3rd party wired controllers anymore.",
+                QMessageBox::Yes | QMessageBox::Cancel
+            );
+            if (reply == QMessageBox::Yes){
+                m_session.set_controller(new_value);
+            }else{
+                refresh_controllers(previous_controller, m_session.available_controllers());
+            }
+        }
+    );
+    connect(
+        m_reset_button, &QPushButton::clicked,
+        this, [this](bool){
+            bool shift_held = QGuiApplication::keyboardModifiers() & Qt::ShiftModifier;
+            m_session.reset(shift_held);
+        }
+    );
+
+    session.add_listener(*this);
+}
+
+
+
+void ControllerSelectorWidget::update_interface_dropdown(ControllerInterface interface_type){
+    for (size_t index = 0; index < m_interface_list.size(); index++){
+        if (interface_type == m_interface_list[index]){
+            m_interface_dropdown->setCurrentIndex((int)index);
+            return;
+        }
+    }
+
+//    m_session.set_controller(ControllerType::None);
+    m_interface_dropdown->setCurrentIndex(-1);
+}
+void ControllerSelectorWidget::refresh_selection(){
+//    cout << "refresh_selection()" << endl;
+
+    delete m_selector;
+    m_selector = nullptr;
+
+    auto current = m_session.descriptor();
+    if (current == nullptr){
+        m_selector = new QWidget(this);
+    }else{
+        update_interface_dropdown(current->interface_type);
+        m_selector = &static_cast<UiComponentQtWidget&>(*current->make_ui_component(this)).widget();
+        m_dropdowns->insertWidget(1, m_selector, 1);
+    }
+}
+
+void ControllerSelectorWidget::refresh_controllers(
+    ControllerType controller_type,
+    const std::vector<ControllerType>& available_controllers
+){
+    if (m_controllers_dropdown == nullptr){
+        return;
+    }
+//    cout << "refresh_controllers()" << endl;
+
+    m_controllers_dropdown->clear();
+
+    size_t index = 0;
+    for (size_t c = 0; c < available_controllers.size(); c++){
+        const std::string& name = CONTROLLER_TYPE_STRINGS.get_string(available_controllers[c]);
+        m_controllers_dropdown->addItem(QString::fromStdString(name));
+        if (controller_type == available_controllers[c]){
+            index = c;
+        }
+    }
+    m_controllers_dropdown->setCurrentIndex((int)index);
+}
+
+
+
+void ControllerSelectorWidget::descriptor_changed(
+    const std::shared_ptr<const ControllerDescriptor>& descriptor
+){
+//    cout << "descriptor_changed()" << endl;
+    QMetaObject::invokeMethod(this, [=, this]{
+        refresh_selection();
+        refresh_controllers(ControllerType::None, {});
+    }, Qt::QueuedConnection);
+}
+void ControllerSelectorWidget::controller_changed(
+    ControllerType controller_type,
+    const std::vector<ControllerType>& available_controllers
+){
+//    cout << "ControllerSelectorWidget::controller_changed()" << endl;
+    QMetaObject::invokeMethod(this, [=, this]{
+        refresh_controllers(controller_type, available_controllers);
+    }, Qt::QueuedConnection);
+}
+void ControllerSelectorWidget::post_status_text_changed(const std::string& text){
+//    cout << "ControllerSelectorWidget::status_text_changed(): " << text << endl;
+    QMetaObject::invokeMethod(this, [this, text]{
+        m_status_text->setText(QString::fromStdString(text));
+    });
+}
+void ControllerSelectorWidget::options_locked(bool locked){
+    QMetaObject::invokeMethod(this, [this, locked]{
+        if (m_selector){
+            m_selector->setEnabled(!locked);
+        }
+        m_interface_dropdown->setEnabled(!locked);
+        m_controllers_dropdown->setEnabled(!locked);
+        m_reset_button->setEnabled(!locked);
+    });
+}
+
+
+#if 0
+void ControllerSelectorWidget::update_buttons(){
+    if (m_shift_held){
+        m_reset_button->setText("Clear Ctrl.");
+    }else{
+        m_reset_button->setText("Reset Ctrl.");
+    }
+}
+
+
+void ControllerSelectorWidget::focusInEvent(QFocusEvent* event){
+//    cout << "ControllerSelectorWidget::focusInEvent()" << endl;
+    QWidget::focusInEvent(event);
+}
+void ControllerSelectorWidget::focusOutEvent(QFocusEvent* event){
+//    cout << "ControllerSelectorWidget::focusOutEvent()" << endl;
+    m_shift_held = false;
+    update_buttons();
+    QWidget::focusOutEvent(event);
+}
+void ControllerSelectorWidget::keyPressEvent(QKeyEvent* event){
+//    cout << "ControllerSelectorWidget::keyPressEvent()" << endl;
+    if (event->key() == Qt::Key_Shift){
+        m_shift_held = true;
+    }
+    update_buttons();
+//    QWidget::keyPressEvent(event);
+}
+void ControllerSelectorWidget::keyReleaseEvent(QKeyEvent* event){
+//    cout << "ControllerSelectorWidget::keyReleaseEvent()" << endl;
+    if (event->key() == Qt::Key_Shift){
+        m_shift_held = false;
+    }
+    update_buttons();
+//    QWidget::keyReleaseEvent(event);
+}
+#endif
+
+
+
+}
diff --git a/SerialPrograms/Source/Controllers/ControllerSelectorWidget.h b/SerialPrograms/Source/Controllers/ControllerSelectorWidget.h
new file mode 100644
index 0000000000..4ef08dcf4d
--- /dev/null
+++ b/SerialPrograms/Source/Controllers/ControllerSelectorWidget.h
@@ -0,0 +1,90 @@
+/*  Controller Selector Widget
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Controllers_ControllerWidget_H
+#define PokemonAutomation_Controllers_ControllerWidget_H
+
+#include <QHBoxLayout>
+#include <QWidget>
+#include <QLabel>
+#include <QPushButton>
+#include <QComboBox>
+#include "Common/Qt/UiStateQtWidget.h"
+#include "ControllerSession.h"
+
+namespace PokemonAutomation{
+
+
+
+
+class ControllerSelectorWidget final
+    : public QWidget
+    , public UiComponentQtWidget
+    , private ControllerSession::Listener
+{
+public:
+    using ParentState = ControllerSession;
+
+public:
+    ~ControllerSelectorWidget();
+    ControllerSelectorWidget(
+        QWidget& parent,
+        ControllerSession& session
+    );
+
+    ControllerSession& session(){
+        return m_session;
+    }
+
+public:
+    virtual QWidget& widget() override{ return *this; }
+    virtual void descriptor_changed(
+        const std::shared_ptr<const ControllerDescriptor>& descriptor
+    ) override;
+    virtual void controller_changed(
+        ControllerType controller_type,
+        const std::vector<ControllerType>& available_controllers
+    ) override;
+    virtual void post_status_text_changed(const std::string& text) override;
+    virtual void options_locked(bool locked) override;
+
+private:
+    void update_interface_dropdown(ControllerInterface interface_type);
+    void refresh_selection();
+    void refresh_controllers(
+        ControllerType controller_type,
+        const std::vector<ControllerType>& available_controllers
+    );
+
+private:
+    void update_buttons();
+
+#if 0
+    virtual void focusInEvent(QFocusEvent* event) override;
+    virtual void focusOutEvent(QFocusEvent* event) override;
+    virtual void keyPressEvent(QKeyEvent* event) override;
+    virtual void keyReleaseEvent(QKeyEvent* event) override;
+#endif
+
+private:
+    ControllerSession& m_session;
+
+    QHBoxLayout* m_dropdowns;
+    QWidget* m_selector = nullptr;
+    QComboBox* m_interface_dropdown = nullptr;
+    QComboBox* m_controllers_dropdown = nullptr;
+    QLabel* m_status_text = nullptr;
+    QPushButton* m_reset_button = nullptr;
+
+//    bool m_shift_held = false;
+    std::vector<ControllerInterface> m_interface_list;
+
+    std::vector<std::shared_ptr<const ControllerDescriptor>> m_device_list;
+};
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/Controllers/ControllerSession.cpp b/SerialPrograms/Source/Controllers/ControllerSession.cpp
new file mode 100644
index 0000000000..68715905c6
--- /dev/null
+++ b/SerialPrograms/Source/Controllers/ControllerSession.cpp
@@ -0,0 +1,506 @@
+/*  Controller Interface
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+//#include "Common/Cpp/Exceptions.h"
+//#include "ControllerTypeStrings.h"
+#include "ControllerSession.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+
+
+void ControllerSession::add_listener(Listener& listener){
+//    WriteSpinLock lg(m_state_lock);
+    m_listeners.add(listener);
+//    if (m_connection && m_connection->is_ready()){
+//        signal_controller_changed(m_option.m_controller_type, m_available_controllers);
+//    }
+}
+void ControllerSession::remove_listener(Listener& listener){
+//    WriteSpinLock lg(m_state_lock);
+    m_listeners.remove(listener);
+}
+
+
+
+ControllerSession::~ControllerSession(){
+    std::unique_ptr<AbstractController> controller;
+    std::unique_ptr<ControllerConnection> connection;
+    {
+        WriteSpinLock lg(m_state_lock);
+        controller = std::move(m_controller);
+        connection = std::move(m_connection);
+    }
+    controller.reset();
+    connection.reset();
+}
+ControllerSession::ControllerSession(
+    Logger& logger,
+    ControllerOption& option,
+    std::optional<size_t> index
+)
+    : m_logger(logger)
+    , m_option(option)
+    , m_index(index)
+    , m_options_locked(false)
+    , m_descriptor(option.descriptor())
+    , m_connection(m_descriptor->open_connection(logger))
+{
+    if (!m_connection){
+        return;
+    }
+
+    //  Add listener first so we don't miss the ready signal.
+    m_connection->add_status_listener(*this);
+    try{
+        //  If we already missed it, run it ourselves.
+        if (m_connection->is_ready()){
+//            cout << "ControllerSession::ControllerSession() - early ready" << endl;
+            m_change_controller_on_ready = m_connection->current_controller();
+            ControllerSession::post_connection_ready(*m_connection);
+        }
+    }catch (...){
+        m_connection->remove_status_listener(*this);
+        throw;
+    }
+}
+
+
+std::vector<ControllerType> ControllerSession::available_controllers() const{
+    ReadSpinLock lg(m_state_lock);
+    if (!m_connection || !m_connection->is_ready()){
+        return {};
+    }
+    return m_connection->controller_list();
+}
+
+void ControllerSession::save(ControllerOption& option) const{
+    ReadSpinLock lg(m_state_lock);
+    option = m_option;
+}
+void ControllerSession::load(const ControllerOption& option){
+    set_device(option.descriptor());
+}
+
+
+bool ControllerSession::input_enabled() const{
+    ReadSpinLock lg(m_state_lock);
+    return m_option.m_enable_input;
+}
+void ControllerSession::set_input_enabled(bool enabled){
+    WriteSpinLock lg(m_state_lock);
+    m_option.m_enable_input = enabled;
+}
+
+
+bool ControllerSession::ready() const{
+    ReadSpinLock lg(m_state_lock);
+    if (!m_controller){
+        return false;
+    }
+    return m_controller->is_ready();
+}
+ControllerConnection::Status ControllerSession::connection_status() const{
+    ReadSpinLock lg(m_state_lock);
+    if (!m_connection){
+        return ControllerConnection::Status::NOT_CONNECTED;
+    }
+    return m_connection->status();
+}
+
+std::shared_ptr<ControllerDescriptor> ControllerSession::descriptor() const{
+    ReadSpinLock lg(m_state_lock);
+    return m_descriptor;
+}
+ControllerClass ControllerSession::controller_class() const noexcept{
+    ReadSpinLock lg(m_state_lock);
+    if (!m_controller){
+        return ControllerClass::None;
+    }
+    return m_controller->controller_class();
+}
+ControllerType ControllerSession::controller_type() const noexcept{
+    ReadSpinLock lg(m_state_lock);
+    if (!m_connection){
+        return ControllerType::None;
+    }
+    return m_connection->current_controller();
+}
+std::string ControllerSession::status_text() const{
+    ReadSpinLock lg(m_state_lock);
+    if (!m_connection){
+        return "<font color=\"red\">No controller selected.</font>";
+    }
+    return m_connection->status_text();
+}
+AbstractController* ControllerSession::controller() const{
+    return m_controller.get();
+}
+
+
+
+
+std::string ControllerSession::user_input_blocked() const{
+    ReadSpinLock lg(m_state_lock);
+    if (!m_connection){
+        return "<font color=\"red\">No controller selected.</font>";
+    }
+    if (!m_connection->is_ready()){
+        return "<font color=\"red\">Connection is not ready.</font>";
+    }
+    if (!m_controller->is_ready()){
+        return "<font color=\"red\">Controller is not ready.</font>";
+    }
+    return m_user_input_disallow_reason;
+}
+void ControllerSession::set_user_input_blocked(std::string disallow_reason){
+    WriteSpinLock lg(m_state_lock);
+//    cout << "set_user_input_blocked() = " << disallow_reason << endl;
+    m_user_input_disallow_reason = std::move(disallow_reason);
+}
+
+bool ControllerSession::options_locked() const{
+    ReadSpinLock lg(m_state_lock);
+    return m_options_locked;
+}
+void ControllerSession::set_options_locked(bool locked){
+    bool original_value;
+    {
+        WriteSpinLock lg(m_state_lock);
+        original_value = m_options_locked;
+        m_options_locked = locked;
+    }
+    if (original_value != locked){
+        signal_options_locked(locked);
+    }
+}
+
+
+void ControllerSession::make_controller(
+    std::optional<ControllerType> change_controller,
+    bool clear_settings
+){
+//    cout << "ControllerSession::make_controller()" << endl;
+
+    //  Must be called under "m_reset_lock".
+
+    bool ready = false;
+    {
+        WriteSpinLock lg(m_state_lock);
+//        cout << "clear_settings = " << clear_settings << endl;
+        m_connection = m_descriptor->open_connection(m_logger);
+        if (m_connection){
+            m_connection->add_status_listener(*this);
+            ready = m_connection->is_ready();
+        }
+    }
+
+    m_change_controller_on_ready = change_controller;
+
+    //  If we already missed it, run it ourselves.
+    if (ready){
+        ControllerSession::post_connection_ready(*m_connection);
+    }
+
+    signal_descriptor_changed(m_descriptor);
+}
+
+
+
+
+bool ControllerSession::set_interface(ControllerInterface controller_interface){
+    std::shared_ptr<const ControllerDescriptor> device;
+    {
+        std::lock_guard<Mutex> lg0(m_reset_lock);
+
+        //  Destroy the current connection+controller.
+        std::unique_ptr<AbstractController> controller;
+        std::unique_ptr<ControllerConnection> connection;
+        {
+            WriteSpinLock lg1(m_state_lock);
+            if (m_options_locked){
+                return false;
+            }
+            if (controller_interface == m_descriptor->interface_type){
+                return true;
+            }
+
+            //  Move these out to indicate that we should no longer access them.
+            controller = std::move(m_controller);
+            connection = std::move(m_connection);
+
+            m_option.set_interface(controller_interface);
+            m_descriptor = m_option.descriptor();
+        }
+
+        //  With the lock released, it is now safe to destroy them.
+        //  We cannot destroy these under (m_state_lock) due to their asynchronous
+        //  callbacks into this class which will also acquire the same lock.
+        controller.reset();
+        connection.reset();
+
+        make_controller({}, false);
+    }
+//    cout << "ControllerSession::set_interface() - signal"<< endl;
+    signal_descriptor_changed(device);
+    signal_status_text_changed(status_text());
+    return true;
+}
+bool ControllerSession::set_device(const std::shared_ptr<ControllerDescriptor>& device){
+//    cout << "ControllerSession::set_device() = " << device->display_name() << endl;
+    {
+        std::lock_guard<Mutex> lg0(m_reset_lock);
+
+        //  Destroy the current connection+controller.
+        std::unique_ptr<AbstractController> controller;
+        std::unique_ptr<ControllerConnection> connection;
+        {
+            WriteSpinLock lg1(m_state_lock);
+            if (m_options_locked){
+                return false;
+            }
+            if (*m_descriptor == *device){
+                return true;
+            }
+
+            //  Move these out to indicate that we should no longer access them.
+            controller = std::move(m_controller);
+            connection = std::move(m_connection);
+
+//            cout << "setting..." << endl;
+            m_option.set_descriptor(device);
+            m_descriptor = device;
+        }
+
+        //  With the lock released, it is now safe to destroy them.
+        //  We cannot destroy these under (m_state_lock) due to their asynchronous
+        //  callbacks into this class which will also acquire the same lock.
+        controller.reset();
+        connection.reset();
+
+        make_controller({}, false);
+    }
+//    cout << "ControllerSession::set_device() - signal"<< endl;
+    signal_descriptor_changed(device);
+    signal_status_text_changed(status_text());
+    return true;
+}
+bool ControllerSession::set_controller(ControllerType controller_type){
+//    cout << "ControllerSession::set_controller()" << endl;
+    std::shared_ptr<const ControllerDescriptor> device;
+    {
+        std::lock_guard<Mutex> lg0(m_reset_lock);
+
+        //  Destroy the current connection+controller.
+        std::unique_ptr<AbstractController> controller;
+        std::unique_ptr<ControllerConnection> connection;
+        {
+            WriteSpinLock lg1(m_state_lock);
+            if (m_options_locked){
+                return false;
+            }
+            if (m_connection){
+//                cout << (int)m_connection->current_controller() << endl;
+                if (m_connection->current_controller() == controller_type){
+                    return true;
+                }
+                m_connection->try_set_controller_type(controller_type, false);
+            }
+
+            //  Move these out to indicate that we should no longer access them.
+            controller = std::move(m_controller);
+            connection = std::move(m_connection);
+        }
+
+        //  With the lock released, it is now safe to destroy them.
+        //  We cannot destroy these under (m_state_lock) due to their asynchronous
+        //  callbacks into this class which will also acquire the same lock.
+        controller.reset();
+        connection.reset();
+
+        make_controller(controller_type, false);
+        device = m_descriptor;
+    }
+    signal_descriptor_changed(device);
+    signal_status_text_changed(status_text());
+    return true;
+}
+
+
+
+std::string ControllerSession::reset(bool clear_settings){
+//    cout << "ControllerSession::reset()" << endl;
+
+    {
+        std::lock_guard<Mutex> lg0(m_reset_lock);
+
+//        std::optional<ControllerType> change_controller;
+
+        //  Destroy the current connection+controller.
+        std::unique_ptr<AbstractController> controller;
+        std::unique_ptr<ControllerConnection> connection;
+        {
+            WriteSpinLock lg1(m_state_lock);
+            if (m_options_locked){
+                return "Options are locked.";
+            }
+//            if (!m_connection){
+//                cout << "ControllerSession::reset() - early return" << endl;
+//                return "No connection set.";
+//            }
+
+//            cout << "Checking readiness... " << (int)m_desired_controller << endl;
+            if (m_connection && m_connection->is_ready()){
+                m_connection->try_set_controller_type(m_connection->current_controller(), clear_settings);
+            }
+
+            //  Move these out to indicate that we should no longer access them.
+            controller = std::move(m_controller);
+            connection = std::move(m_connection);
+        }
+
+        //  With the lock released, it is now safe to destroy them.
+        //  We cannot destroy these under (m_state_lock) due to their asynchronous
+        //  callbacks into this class which will also acquire the same lock.
+        controller.reset();
+        connection.reset();
+
+        make_controller({}, clear_settings);
+    }
+    signal_status_text_changed(status_text());
+    return "";
+}
+
+
+//void ControllerSession::pre_connection_not_ready(ControllerConnection& connection){
+//    m_listeners.run_method(&Listener::pre_connection_not_ready, connection);
+//}
+void ControllerSession::post_connection_ready(ControllerConnection& connection){
+//    cout << "ControllerSession::post_connection_ready()" << endl;
+
+//    ControllerType current_controller = mode_status.current_controller;
+
+//    cout << "sleeping" << endl;
+//    Sleep(10000);
+
+    std::vector<ControllerType> supported_controllers;
+    ControllerType current_controller = ControllerType::None;
+
+    ControllerType controller_type;
+
+    std::unique_ptr<AbstractController> controller;
+
+    bool ready;
+    {
+        ReadSpinLock lg(m_state_lock);
+
+        //  Connection has already been closed.
+        if (m_connection == nullptr){
+            return;
+        }
+
+        //  Controller already constructed.
+        if (m_controller){
+            return;
+        }
+
+        if (m_change_controller_on_ready.has_value()){
+            controller_type = m_change_controller_on_ready.value();
+        }else{
+            controller_type = m_connection->current_controller();
+        }
+
+        supported_controllers = m_connection->controller_list();
+        current_controller = m_connection->current_controller();
+    }
+    signal_controller_changed(current_controller, supported_controllers);
+
+    //  Construct the controller.
+    if (controller_type != ControllerType::None){
+        controller = m_descriptor->make_controller(
+            m_logger,
+            connection,
+            controller_type
+        );
+    }
+
+    {
+        WriteSpinLock lg(m_state_lock);
+
+        //  Connection has been wiped. ABA is safe here.
+        if (m_connection.get() != &connection){
+            return;
+        }
+
+        m_controller = std::move(controller);
+        m_change_controller_on_ready.reset();
+
+        supported_controllers = m_connection->controller_list();
+        current_controller = m_connection->current_controller();
+
+        //  Commit all changes.
+//        cout << "current_controller = " << CONTROLLER_TYPE_STRINGS.get_string(current_controller) << endl;
+        ready = m_controller && m_controller->is_ready();
+    }
+    signal_controller_changed(current_controller, supported_controllers);
+    signal_ready_changed(ready);
+    signal_status_text_changed(status_text());
+}
+void ControllerSession::status_text_changed(
+    ControllerConnection& connection,
+    const std::string& text
+){
+//    cout << "ControllerSession::status_text_changed() = " << text << endl;
+    std::string controller_error;
+    {
+        WriteSpinLock lg(m_message_lock);
+        controller_error = m_controller_error;
+    }
+//    cout << "ControllerSession::status_text_changed(): controller_error = " << controller_error << endl;
+    if (controller_error.empty()){
+        m_listeners.run_method(&Listener::post_status_text_changed, text);
+    }else{
+        m_listeners.run_method(&Listener::post_status_text_changed, controller_error);
+    }
+}
+void ControllerSession::on_error(
+    ControllerConnection& connection,
+    const std::string& text
+){
+    WriteSpinLock lg(m_message_lock);
+    m_controller_error = text;
+}
+
+
+
+
+void ControllerSession::signal_ready_changed(bool ready){
+    m_listeners.run_method(&Listener::ready_changed, ready);
+}
+void ControllerSession::signal_descriptor_changed(
+    const std::shared_ptr<const ControllerDescriptor>& descriptor
+){
+    m_listeners.run_method(&Listener::descriptor_changed, descriptor);
+}
+void ControllerSession::signal_controller_changed(
+    ControllerType controller_type,
+    const std::vector<ControllerType>& available_controllers
+){
+    m_listeners.run_method(&Listener::controller_changed, controller_type, available_controllers);
+}
+void ControllerSession::signal_status_text_changed(const std::string& text){
+//    cout << text << endl;
+    m_listeners.run_method(&Listener::post_status_text_changed, text);
+}
+void ControllerSession::signal_options_locked(bool locked){
+    m_listeners.run_method(&Listener::options_locked, locked);
+}
+
+
+}
diff --git a/SerialPrograms/Source/Controllers/ControllerSession.h b/SerialPrograms/Source/Controllers/ControllerSession.h
new file mode 100644
index 0000000000..9d80440c73
--- /dev/null
+++ b/SerialPrograms/Source/Controllers/ControllerSession.h
@@ -0,0 +1,191 @@
+/*  Controller Session
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Controllers_ControllerSession_H
+#define PokemonAutomation_Controllers_ControllerSession_H
+
+#include "Common/Cpp/Exceptions.h"
+#include "Common/Cpp/Concurrency/Mutex.h"
+#include "Common/Cpp/ListenerSet.h"
+#include "Common/Cpp/UiWrapper.h"
+#include "Controller.h"
+#include "ControllerDescriptor.h"
+#include "ControllerOption.h"
+#include "ControllerConnection.h"
+
+namespace PokemonAutomation{
+
+
+
+class ControllerSession final
+    : public UiState<ControllerSession>
+    , private ControllerConnection::StatusListener
+{
+public:
+    struct Listener{
+        virtual void ready_changed(bool ready){}
+        virtual void descriptor_changed(
+            const std::shared_ptr<const ControllerDescriptor>& descriptor
+        ){}
+        virtual void controller_changed(
+            ControllerType controller_type,
+            const std::vector<ControllerType>& available_controllers
+        ){}
+        virtual void post_status_text_changed(const std::string& text){}
+        virtual void options_locked(bool locked){}
+    };
+
+    void add_listener(Listener& listener);
+    void remove_listener(Listener& listener);
+
+
+public:
+    ~ControllerSession();
+    ControllerSession(
+        Logger& logger,
+        ControllerOption& option,
+        std::optional<size_t> index
+    );
+
+
+public:
+    Logger& logger(){
+        return m_logger;
+    }
+    std::vector<ControllerType> available_controllers() const;
+
+    void save(ControllerOption& option) const;
+    void load(const ControllerOption& option);
+
+    bool input_enabled() const;
+    void set_input_enabled(bool enabled);
+
+    bool ready() const;
+    ControllerConnection::Status connection_status() const;
+
+    std::shared_ptr<ControllerDescriptor> descriptor() const;
+    ControllerClass controller_class() const noexcept;
+    ControllerType controller_type() const noexcept;
+    std::string status_text() const;
+
+    std::optional<size_t> index() const{
+        return m_index;
+    }
+    const ControllerOption& option() const{
+        return m_option;
+    }
+    AbstractController* controller() const;
+
+
+public:
+    //  Empty String: User input is allowed.
+    //  Non-empty String: User input is blocked. The string is the reason.
+    std::string user_input_blocked() const;
+    void set_user_input_blocked(std::string disallow_reason);
+
+    bool options_locked() const;
+    void set_options_locked(bool locked);
+
+
+public:
+    bool set_interface(ControllerInterface controller_interface);
+    bool set_device(const std::shared_ptr<ControllerDescriptor>& device);
+    bool set_controller(ControllerType controller_type);
+
+
+public:
+    //  Returns empty string on success. Otherwise returns error message.
+    std::string reset(bool clear_settings);
+
+    //  Try to run the following lambda on the underlying controller type.
+    //  Returns empty string if successful. Otherwise returns error message.
+    template <typename ControllerType, typename Lambda>
+    std::string try_run(Lambda&& function) noexcept{
+        ReadSpinLock lg(m_state_lock);
+        if (!m_option.m_enable_input){
+            return "";
+        }
+        if (!m_controller){
+            return "Controller is null.";
+        }
+        try{
+            //  This will be a cross-cast in most cases.
+            ControllerType* child = dynamic_cast<ControllerType*>(m_controller.get());
+            if (child == nullptr){
+                m_logger.log("ControllerSession::try_run(): Incompatible controller type cast.", COLOR_RED);
+                return "Incompatible controller type cast.";
+            }
+            if (!m_user_input_disallow_reason.empty()){
+                return m_user_input_disallow_reason;
+            }
+            function(*child);
+        }catch (Exception& e){
+            return e.to_str();
+        }catch (...){
+            return "Unknown exception.";
+        }
+        return "";
+    }
+
+
+private:
+    void make_controller(
+        std::optional<ControllerType> change_controller,
+        bool clear_settings
+    );
+
+//    virtual void pre_connection_not_ready(ControllerConnection& connection) override;
+    virtual void post_connection_ready(ControllerConnection& connection) override;
+    virtual void status_text_changed(
+        ControllerConnection& connection,
+        const std::string& text
+    ) override;
+    virtual void on_error(
+        ControllerConnection& connection,
+        const std::string& text
+    ) override;
+
+    void signal_ready_changed(bool ready);
+    void signal_descriptor_changed(
+        const std::shared_ptr<const ControllerDescriptor>& descriptor
+    );
+    void signal_controller_changed(
+        ControllerType controller_type,
+        const std::vector<ControllerType>& available_controllers
+    );
+    void signal_status_text_changed(const std::string& text);
+    void signal_options_locked(bool locked);
+
+
+private:
+    Logger& m_logger;
+    ControllerOption& m_option;
+    std::optional<size_t> m_index;
+
+    Mutex m_reset_lock;
+    mutable SpinLock m_state_lock;
+
+    bool m_options_locked;
+    std::string m_user_input_disallow_reason;
+
+    SpinLock m_message_lock;
+    std::string m_controller_error;
+
+    //  Next Reset
+    std::optional<ControllerType> m_change_controller_on_ready;
+
+    std::shared_ptr<ControllerDescriptor> m_descriptor;
+    std::unique_ptr<ControllerConnection> m_connection;
+    std::unique_ptr<AbstractController> m_controller;
+
+    ListenerSet<Listener> m_listeners;
+};
+
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/Controllers/ControllerSettings.h b/SerialPrograms/Source/Controllers/ControllerSettings.h
new file mode 100644
index 0000000000..f3449ae6a8
--- /dev/null
+++ b/SerialPrograms/Source/Controllers/ControllerSettings.h
@@ -0,0 +1,45 @@
+/*  Controller Settings
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Controllers_ControllerSettings_H
+#define PokemonAutomation_Controllers_ControllerSettings_H
+
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+
+namespace PokemonAutomation{
+
+
+class ControllerSettings{
+public:
+    static ControllerSettings& instance(){
+        static ControllerSettings settings;
+        return settings;
+    }
+
+private:
+    ControllerSettings()
+        : COMMAND_QUEUE_LIMIT(
+            "<b>Maximum Command Queue Size:</b><br>"
+            "Do not queue more than this many commands to the controller at once. "
+            "Larger values will tolerate longer connection interrupts, but may increase cancellation latency after a burst of commands.",
+            LockMode::LOCK_WHILE_RUNNING,
+            64, 4, 255
+        )
+        , DEVICE_LOGGING_FLAG(
+            "<b>Configure Device-Specific Debug Logging:</b>",
+            LockMode::LOCK_WHILE_RUNNING,
+            0
+        )
+    {}
+
+public:
+    SimpleIntegerOption<uint8_t> COMMAND_QUEUE_LIMIT;
+    SimpleIntegerOption<uint32_t> DEVICE_LOGGING_FLAG;
+};
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/Controllers/ControllerState.cpp b/SerialPrograms/Source/Controllers/ControllerState.cpp
new file mode 100644
index 0000000000..105aec2198
--- /dev/null
+++ b/SerialPrograms/Source/Controllers/ControllerState.cpp
@@ -0,0 +1,46 @@
+/*  Controller State
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Json/JsonObject.h"
+// #include "CommonFramework/Exceptions/OperationFailedException.h"
+#include "Common/Cpp/Exceptions.h"
+#include "ControllerState.h"
+
+namespace PokemonAutomation{
+
+
+
+
+void ControllerState::load_json(const JsonObject& json){
+    throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION,
+        "This controller does not support serialization."
+    );
+}
+JsonObject ControllerState::to_json() const{
+    throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION,
+        "This controller does not support serialization."
+    );
+}
+void ControllerState::execute(
+    Cancellable* scope,
+    bool enable_logging,
+    AbstractController& controller,
+    Milliseconds duration
+) const{
+    throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION,
+        "This controller does not support execution."
+    );
+}
+std::string ControllerState::to_cpp(Milliseconds hold, Milliseconds release) const{
+    throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION,
+        "This controller does not support cpp conversion."
+    );
+}
+
+
+
+
+}
diff --git a/SerialPrograms/Source/Controllers/ControllerState.h b/SerialPrograms/Source/Controllers/ControllerState.h
new file mode 100644
index 0000000000..7845abab5f
--- /dev/null
+++ b/SerialPrograms/Source/Controllers/ControllerState.h
@@ -0,0 +1,58 @@
+/*  Controller State
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Controllers_ControllerState_H
+#define PokemonAutomation_Controllers_ControllerState_H
+
+#include "Common/Cpp/Time.h"
+
+namespace PokemonAutomation{
+
+class JsonObject;
+class Cancellable;
+class AbstractController;
+
+
+
+
+
+
+class ControllerState{
+public:
+    virtual ~ControllerState() = default;
+
+    virtual void clear() = 0;
+
+    virtual bool operator==(const ControllerState& x) const = 0;
+    virtual bool operator!=(const ControllerState& x) const{ return !(*this == x); }
+
+    virtual bool is_neutral() const = 0;
+
+public:
+    //  Serialization
+    virtual void load_json(const JsonObject& json);
+    virtual JsonObject to_json() const;
+
+public:
+    //  Execution
+    virtual void execute(
+        Cancellable* scope,
+        bool enable_logging,
+        AbstractController& controller,
+        Milliseconds duration
+    ) const;
+    virtual std::string to_cpp(Milliseconds hold, Milliseconds release) const;
+};
+
+
+
+
+
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/Controllers/ControllerStateTable.cpp b/SerialPrograms/Source/Controllers/ControllerStateTable.cpp
new file mode 100644
index 0000000000..dcb4c0713a
--- /dev/null
+++ b/SerialPrograms/Source/Controllers/ControllerStateTable.cpp
@@ -0,0 +1,453 @@
+/*  Controller State Table
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <map>
+#include "Common/Cpp/Exceptions.h"
+#include "Common/Cpp/Json/JsonArray.h"
+#include "Common/Cpp/Json/JsonObject.h"
+
+//#include "NintendoSwitch/Controllers/NintendoSwitch_ControllerButtons.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProControllerTable.h"
+#include "NintendoSwitch/Controllers/Joycon/NintendoSwitch_JoyconTable.h"
+#include "NintendoSwitch/Options/TurboMacroTable.h"
+
+#include "ControllerTypeStrings.h"
+#include "ControllerStateTable.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+
+
+
+struct ControllerTypeEntry{
+    ControllerCommandTable::RowFactory factory;
+    std::vector<std::string> headers;
+};
+
+
+std::map<ControllerClass, ControllerTypeEntry> controller_map;
+
+
+const std::map<ControllerClass, ControllerTypeEntry>& make_controller_map(){
+    NintendoSwitch::register_procon_tables();
+    NintendoSwitch::register_joycon_tables();
+    return controller_map;
+}
+
+const std::map<ControllerClass, ControllerTypeEntry>& get_controller_map(){
+    static const std::map<ControllerClass, ControllerTypeEntry>& map = make_controller_map();
+    return map;
+}
+
+
+
+void ControllerCommandTable::register_controller_type(
+    ControllerClass type,
+    RowFactory factory,
+    std::vector<std::string> headers
+){
+    auto& map = controller_map;
+    if (map.emplace(
+            type, ControllerTypeEntry{factory, std::move(headers)}
+        ).second
+    ){
+        return;
+    }
+    throw InternalProgramError(
+        nullptr,
+        PA_CURRENT_FUNCTION,
+        "Duplicate Controller Enum: " + std::to_string((int)type)
+    );
+}
+
+
+
+
+void ControllerCommandTable::load_json_NS_TurboMacro(const JsonValue& json){
+    using namespace NintendoSwitch;
+
+    if (m_type != ControllerClass::NintendoSwitch_ProController){
+        throw FileException(
+            nullptr, nullptr,
+            "Incompatible controller type.",
+            ""
+        );
+    }
+
+    JsonObject translated;
+    translated["ControllerClass"] = CONTROLLER_CLASS_STRINGS().get_string(m_type);
+
+    //  JSON to JSON translate to the new format.
+    JsonArray history;
+
+    for (const JsonValue& item : json.to_array_throw()){
+        const JsonObject& obj = item.to_object_throw();
+
+        const std::string& action_name = obj.get_string_throw("Action");
+        const auto* entry = TurboMacroAction_Database().find_slug(action_name);
+        if (entry == nullptr){
+            throw ParseException("Invalid Action: " + action_name);
+        }
+
+        const JsonValue* value;
+
+        TurboMacroAction action = (TurboMacroAction)entry->enum_value;
+
+        if (action == TurboMacroAction::NO_ACTION){
+            continue;
+        }
+
+        //  Wait has different timing fields.
+        if (action == TurboMacroAction::WAIT){
+            value = obj.get_value("Wait");
+            if (value != nullptr && value->is_integer()){
+                JsonObject out;
+                out["ms"] = std::to_string(value->to_integer_default() * 8) + " ms";
+                history.push_back(std::move(out));
+            }
+            value = obj.get_value("WaitMs");
+            if (value != nullptr){
+                JsonObject out;
+                out["ms"] = value->to_string_throw();
+                history.push_back(std::move(out));
+            }
+            continue;
+        }
+
+        JsonObject command;
+
+        value = obj.get_value("Hold");
+        if (value != nullptr && value->is_integer()){
+            command["ms"] = std::to_string(value->to_integer_default() * 8) + " ms";
+        }
+        value = obj.get_value("HoldMs");
+        if (value != nullptr){
+            command["ms"] = value->to_string_throw();
+        }
+        if (value == nullptr){
+            throw ParseException("Missing Duration: " + obj.dump());
+        }
+
+
+        switch (action){
+        case TurboMacroAction::B:
+            command["buttons"] = "B";
+            break;
+        case TurboMacroAction::A:
+            command["buttons"] = "A";
+            break;
+        case TurboMacroAction::Y:
+            command["buttons"] = "Y";
+            break;
+        case TurboMacroAction::X:
+            command["buttons"] = "X";
+            break;
+        case TurboMacroAction::R:
+            command["buttons"] = "R";
+            break;
+        case TurboMacroAction::L:
+            command["buttons"] = "L";
+            break;
+        case TurboMacroAction::ZR:
+            command["buttons"] = "ZR";
+            break;
+        case TurboMacroAction::ZL:
+            command["buttons"] = "ZL";
+            break;
+        case TurboMacroAction::PLUS:
+            command["buttons"] = "+";
+            break;
+        case TurboMacroAction::MINUS:
+            command["buttons"] = "-";
+            break;
+        case TurboMacroAction::LEFT_JOY_CLICK:
+            command["buttons"] = "LJ";
+            break;
+        case TurboMacroAction::RIGHT_JOY_CLICK:
+            command["buttons"] = "RJ";
+            break;
+        case TurboMacroAction::DPADLEFT:
+            command["dpad"] = "left";
+            break;
+        case TurboMacroAction::DPADRIGHT:
+            command["dpad"] = "right";
+            break;
+        case TurboMacroAction::DPADUP:
+            command["dpad"] = "up";
+            break;
+        case TurboMacroAction::DPADDOWN:
+            command["dpad"] = "down";
+            break;
+        case TurboMacroAction::LEFT_JOYSTICK:
+            value = obj.get_value("MoveDirectionX");
+            if (value != nullptr){
+                command["lx"] = value->to_integer_throw();
+            }
+            value = obj.get_value("MoveDirectionY");
+            if (value != nullptr){
+                command["ly"] = value->to_integer_throw();
+            }
+            break;
+        case TurboMacroAction::RIGHT_JOYSTICK:
+            value = obj.get_value("MoveDirectionX");
+            if (value != nullptr){
+                command["rx"] = value->to_integer_throw();
+            }
+            value = obj.get_value("MoveDirectionY");
+            if (value != nullptr){
+                command["ry"] = value->to_integer_throw();
+            }
+            break;
+        default:;
+        }
+
+        history.push_back(std::move(command));
+
+
+        JsonObject cooldown;
+        value = obj.get_value("Release");
+        if (value != nullptr && value->is_integer()){
+            cooldown["ms"] = std::to_string(value->to_integer_default() * 8) + " ms";
+        }
+        value = obj.get_value("ReleaseMs");
+        if (value != nullptr){
+            cooldown["ms"] = value->to_string_throw();
+        }
+        if (value != nullptr){
+            history.push_back(std::move(cooldown));
+        }
+    }
+
+    translated["Schedule"] = std::move(history);
+
+//    cout << translated.dump() << endl;
+
+    JsonValue value(std::move(translated));
+    load_json(value);
+}
+
+JsonValue ControllerCommandTable::to_json() const{
+    JsonObject obj;
+    obj["ControllerClass"] = CONTROLLER_CLASS_STRINGS().get_string(m_type);
+    JsonArray history;
+    run_on_all_rows<ControllerStateRow>([&](const ControllerStateRow& row){
+        history.push_back(row.to_json());
+        return false;
+    });
+    obj["Schedule"] = std::move(history);
+    return obj;
+}
+void ControllerCommandTable::load_json(const JsonValue& json){
+    clear();
+
+    if (json.is_array()){
+        load_json_NS_TurboMacro(json);
+        return;
+    }
+
+    const JsonObject& obj = json.to_object_throw();
+
+    const JsonValue* value = obj.get_value("controller_class");
+    if (value == nullptr){
+        value = obj.get_value("ControllerClass");
+    }
+    if (value == nullptr){
+        throw JsonParseException("", "ControllerClass");
+    }
+    const std::string& controller = value->to_string_throw();
+    m_type = CONTROLLER_CLASS_STRINGS().get_enum(controller);
+
+    value = obj.get_value("history");
+    if (value == nullptr){
+        value = obj.get_value("Schedule");
+    }
+    if (value == nullptr){
+        throw JsonParseException("", "Schedule");
+    }
+
+    EditableTableOption::load_json(*value);
+}
+
+std::vector<std::string> ControllerCommandTable::make_header() const{
+    auto& map = get_controller_map();
+    auto iter = map.find(m_type);
+    if (iter != map.end()){
+        return iter->second.headers;
+    }
+    throw InternalProgramError(
+        nullptr,
+        PA_CURRENT_FUNCTION,
+        "Unsupported Controller Type: " + CONTROLLER_CLASS_STRINGS().get_string(m_type)
+    );
+}
+std::unique_ptr<EditableTableRow> ControllerCommandTable::make_row(){
+    auto& map = get_controller_map();
+    auto iter = map.find(m_type);
+    if (iter != map.end()){
+        return iter->second.factory(*this);
+    }
+    throw InternalProgramError(
+        nullptr,
+        PA_CURRENT_FUNCTION,
+        "Unsupported Controller Type: " + CONTROLLER_CLASS_STRINGS().get_string(m_type)
+    );
+}
+
+
+
+
+
+
+
+ControllerCommandTables::~ControllerCommandTables(){
+    m_type.remove_listener(*this);
+}
+ControllerCommandTables::ControllerCommandTables(
+    std::string label,
+    const std::vector<ControllerClass>& controller_list
+)
+    : GroupOption(
+        std::move(label),
+        LockMode::UNLOCK_WHILE_RUNNING,
+        EnableMode::ALWAYS_ENABLED
+    )
+    , m_type(
+        "<b>Controller Type:</b>",
+        make_database(controller_list),
+        LockMode::LOCK_WHILE_RUNNING,
+        ControllerClass::NintendoSwitch_ProController
+    )
+    , m_table(
+        ControllerClass::NintendoSwitch_ProController,
+        "",
+        LockMode::UNLOCK_WHILE_RUNNING
+    )
+{
+    PA_ADD_OPTION(m_type);
+    PA_ADD_OPTION(m_table);
+    m_type.add_listener(*this);
+}
+
+
+void ControllerCommandTables::on_config_value_changed(void* object){
+    m_saved[m_table.m_type] = m_table.to_json();
+    auto iter = m_saved.find(m_type);
+
+//    for (const auto& item : m_saved){
+//        cout << item.second.dump() << endl;
+//    }
+
+    m_table.clear();
+    m_table.m_type = m_type;
+    if (iter == m_saved.end()){
+        return;
+    }
+    try{
+        m_table.load_json(iter->second);
+    }catch (...){}
+}
+void ControllerCommandTables::load_json(const JsonValue& json){
+    GroupOption::load_json(json);
+    const JsonObject& obj = json.to_object_throw();
+    const JsonObject* node = obj.get_object("Tables");
+    if (node == nullptr){
+        return;
+    }
+
+    for (const auto& item : *node){
+        try{
+            ControllerClass type = CONTROLLER_CLASS_STRINGS().get_enum(item.first);
+            m_saved[type] = item.second.clone();
+            if (type == m_type){
+                m_table.load_json(item.second);
+            }
+        }catch (...){}
+    }
+}
+JsonValue ControllerCommandTables::to_json() const{
+    JsonValue ret = GroupOption::to_json();
+    JsonObject& obj = ret.to_object_throw();
+    {
+        JsonObject node;
+        for (const auto& item : m_saved){
+            node[CONTROLLER_CLASS_STRINGS().get_string(item.first)] = m_type == item.first
+                ? m_table.to_json()
+                : item.second.clone();
+        }
+        obj["Tables"] = std::move(node);
+    }
+    return ret;
+}
+
+
+EnumDropdownDatabase<ControllerClass> ControllerCommandTables::make_database(
+    const std::vector<ControllerClass>& controller_list
+){
+    auto& map = get_controller_map();
+    EnumDropdownDatabase<ControllerClass> ret;
+    for (ControllerClass type : controller_list){
+        if (map.find(type) == map.end()){
+            throw InternalProgramError(
+                nullptr,
+                PA_CURRENT_FUNCTION,
+                "Unsupported Controller Type: " + CONTROLLER_CLASS_STRINGS().get_string(type)
+            );
+        }
+        const std::string& str = CONTROLLER_CLASS_STRINGS().get_string(type);
+        ret.add(type, str, str, true);
+    }
+    return ret;
+}
+
+
+
+std::string get_joystick_direction(const JoystickPosition& position){
+    std::string direction = "";
+    if (position.x > 0){
+        if (position.y < 0){
+            // right-down
+            direction = "\u2198";
+        }else if (position.y == 0){
+            // right
+            direction = "\u2192";
+        }else{ // y < STICK_CENTER
+            // right-up
+            direction = "\u2197";
+        }
+    }else if (position.x == 0){
+        if (position.y < 0){
+            // down
+            direction = "\u2193";
+        }else if (position.y == 0){
+            // neutral
+            direction = "neutral";
+        }else{ // y < STICK_CENTER
+            // up
+            direction = "\u2191";
+        }
+
+    }else{ // x < STICK_CENTER
+        if (position.y < 0){
+            // left-down
+            direction = "\u2199";
+        }else if (position.y == 0){
+            // left
+            direction = "\u2190";
+        }else{ // y < STICK_CENTER
+            // left-up
+            direction = "\u2196";
+        }
+    }
+
+    return direction;
+}
+
+
+
+}
diff --git a/SerialPrograms/Source/Controllers/ControllerStateTable.h b/SerialPrograms/Source/Controllers/ControllerStateTable.h
new file mode 100644
index 0000000000..2aea579c47
--- /dev/null
+++ b/SerialPrograms/Source/Controllers/ControllerStateTable.h
@@ -0,0 +1,144 @@
+/*  Controller State Table
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Controllers_ControllerStateTable_H
+#define PokemonAutomation_Controllers_ControllerStateTable_H
+
+#include <map>
+#include "Common/Cpp/CancellableScope.h"
+#include "Common/Cpp/Options/GroupOption.h"
+#include "Common/Cpp/Options/EnumDropdownOption.h"
+#include "Common/Cpp/Options/EditableTableOption.h"
+#include "Controllers/Joystick.h"
+#include "ControllerTypes.h"
+#include "ControllerState.h"
+
+namespace PokemonAutomation{
+
+
+class ControllerCommandTables;
+
+
+
+class ControllerStateRow : public EditableTableRow{
+public:
+    using EditableTableRow::EditableTableRow;
+    virtual std::unique_ptr<ControllerState> get_state(Milliseconds& duration) const = 0;
+};
+
+
+
+
+class ControllerCommandTable : public EditableTableOption{
+public:
+    using RowFactory = std::unique_ptr<ControllerStateRow> (*)(ControllerCommandTable& parent);
+
+    static void register_controller_type(
+        ControllerClass type,
+        RowFactory factory,
+        std::vector<std::string> headers
+    );
+
+    template <typename RowType>
+    static std::unique_ptr<ControllerStateRow> make_row(ControllerCommandTable& parent){
+        return std::unique_ptr<ControllerStateRow>(new RowType(parent));
+    }
+
+
+public:
+    ControllerCommandTable(
+        ControllerClass type,
+        std::string label,
+        LockMode lock_while_running
+    )
+        : EditableTableOption(
+            std::move(label),
+            lock_while_running,
+            true,
+            50
+        )
+        , m_type(type)
+    {}
+
+    ControllerClass type() const{
+        return m_type;
+    }
+
+    void run(CancellableScope& scope, AbstractController& controller){
+        std::vector<std::unique_ptr<ControllerStateRow>> table = EditableTableOption::copy_snapshot<ControllerStateRow>();
+        for (std::unique_ptr<ControllerStateRow>& command : table){
+            Milliseconds duration;
+            std::unique_ptr<ControllerState> state = command->get_state(duration);
+            state->execute(&scope, true, controller, duration);
+        }
+    }
+
+    virtual JsonValue to_json() const override;
+    virtual void load_json(const JsonValue& json) override;
+
+    virtual std::vector<std::string> make_header() const override;
+    virtual std::unique_ptr<EditableTableRow> make_row() override;
+
+
+private:
+    void load_json_NS_TurboMacro(const JsonValue& json);
+
+
+private:
+    friend class ControllerCommandTables;
+
+    ControllerClass m_type;
+};
+
+
+
+
+
+class ControllerCommandTables : public GroupOption, public ConfigOption::Listener{
+public:
+    ~ControllerCommandTables();
+    ControllerCommandTables(
+        std::string label,
+        const std::vector<ControllerClass>& controller_list
+    );
+
+    void run(CancellableScope& scope, AbstractController& controller){
+        m_table.run(scope, controller);
+    }
+
+
+public:
+    virtual void on_config_value_changed(void* object) override;
+
+    virtual void load_json(const JsonValue& json) override;
+    virtual JsonValue to_json() const override;
+
+private:
+    static EnumDropdownDatabase<ControllerClass> make_database(
+        const std::vector<ControllerClass>& controller_list
+    );
+
+private:
+    friend class ControllerCommandTable;
+
+    //  There is a race condition here if multiple threads try to change this
+    //  at the same time since it clears the table. But we only ever do this
+    //  from the main Qt thread.
+    EnumDropdownOption<ControllerClass> m_type;
+
+    ControllerCommandTable m_table;
+
+    std::map<ControllerClass, JsonValue> m_saved;
+};
+
+
+std::string get_joystick_direction(const JoystickPosition& position);
+
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/Controllers/ControllerStatusThread.h b/SerialPrograms/Source/Controllers/ControllerStatusThread.h
new file mode 100644
index 0000000000..fd0ef45403
--- /dev/null
+++ b/SerialPrograms/Source/Controllers/ControllerStatusThread.h
@@ -0,0 +1,171 @@
+/*  Controllers: Status Thread Helper
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  This is a helper class to reuse the code for the status updater thread.
+ *
+ */
+
+#ifndef PokemonAutomation_Controllers_StatusThread_H
+#define PokemonAutomation_Controllers_StatusThread_H
+
+#include "Common/Cpp/Exceptions.h"
+#include "Common/Cpp/PrettyPrint.h"
+#include "Common/Cpp/Concurrency/Mutex.h"
+#include "Common/Cpp/Concurrency/ConditionVariable.h"
+#include "Common/Cpp/Concurrency/AsyncTask.h"
+#include "Common/Cpp/Concurrency/ThreadPool.h"
+#include "CommonFramework/Tools/GlobalThreadPools.h"
+#include "Controllers/ControllerConnection.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+
+
+
+
+struct ControllerStatusThreadCallback{
+    virtual void update_status(Cancellable& cancellable) = 0;
+    virtual void stop_with_error(std::string message) = 0;
+};
+
+
+
+
+class ControllerStatusThread{
+public:
+    ControllerStatusThread(
+        ControllerConnection& connection,
+        ControllerStatusThreadCallback& callback
+    )
+        : m_connection(connection)
+        , m_callback(callback)
+        , m_stopping(false)
+        , m_error(false)
+        , m_status_thread(
+            GlobalThreadPools::unlimited_normal().dispatch_now_blocking(
+                [this]{ status_thread(); }
+            )
+        )
+    {}
+    ~ControllerStatusThread(){
+        if (m_stopping.exchange(true)){
+            return;
+        }
+        m_scope.cancel(nullptr);
+        {
+            std::unique_lock<Mutex> lg(m_sleep_lock);
+            m_connection.cancel();
+        }
+        m_cv.notify_all();
+        m_status_thread.wait_and_ignore_exceptions();
+    }
+
+private:
+    void status_thread(){
+        constexpr std::chrono::milliseconds PERIOD(1000);
+        std::atomic<WallClock> last_ack(current_time());
+
+        AsyncTask watchdog = GlobalThreadPools::unlimited_normal().dispatch_now_blocking(
+            [&, this]{
+                WallClock next_ping = current_time();
+                while (true){
+                    if (m_stopping.load(std::memory_order_relaxed) ||
+                        m_error.load(std::memory_order_acquire) ||
+                        !m_connection.is_ready()
+                    ){
+                        break;
+                    }
+
+                    auto last = current_time() - last_ack.load(std::memory_order_relaxed);
+                    std::chrono::duration<double> seconds = last;
+                    if (last > 2 * PERIOD){
+                        std::string text = "Last Ack: " + tostr_fixed(seconds.count(), 3) + " seconds ago";
+                        m_connection.set_status_line1(text, COLOR_RED);
+        //                m_logger.log("Connection issue detected. Turning on all logging...");
+        //                settings.log_everything.store(true, std::memory_order_release);
+                    }
+
+                    std::unique_lock<Mutex> lg(m_sleep_lock);
+                    if (m_stopping.load(std::memory_order_relaxed) ||
+                        m_error.load(std::memory_order_acquire) ||
+                        !m_connection.is_ready()
+                    ){
+                        break;
+                    }
+
+                    WallClock now = current_time();
+                    next_ping += PERIOD;
+                    if (now + PERIOD < next_ping){
+                        next_ping = now + PERIOD;
+                    }
+                    m_cv.wait_until(lg, next_ping);
+                }
+            }
+        );
+
+
+        WallClock next_ping = current_time();
+        while (true){
+            if (m_stopping.load(std::memory_order_relaxed) || !m_connection.is_ready()){
+                break;
+            }
+
+            std::string error;
+            try{
+                m_callback.update_status(m_scope);
+                last_ack.store(current_time(), std::memory_order_relaxed);
+            }catch (OperationCancelledException&){
+                break;
+            }catch (Exception& e){
+                error = e.message();
+            }catch (...){
+                error = "Unknown error.";
+            }
+            if (!error.empty()){
+                m_error.store(true, std::memory_order_release);
+                m_connection.set_status_line1(error, COLOR_RED);
+                m_callback.stop_with_error(std::move(error));
+            }
+
+            std::unique_lock<Mutex> lg(m_sleep_lock);
+            if (m_stopping.load(std::memory_order_relaxed) || !m_connection.is_ready()){
+                break;
+            }
+
+            WallClock now = current_time();
+            next_ping += PERIOD;
+            if (now + PERIOD < next_ping){
+                next_ping = now + PERIOD;
+            }
+            m_cv.wait_until(lg, next_ping);
+        }
+
+        {
+            std::unique_lock<Mutex> lg(m_sleep_lock);
+        }
+        m_cv.notify_all();
+        watchdog.wait_and_ignore_exceptions();
+    }
+
+private:
+    ControllerConnection& m_connection;
+    ControllerStatusThreadCallback& m_callback;
+    CancellableHolder<CancellableScope> m_scope;
+    std::atomic<bool> m_stopping;
+    std::atomic<bool> m_error;
+    Mutex m_sleep_lock;
+    ConditionVariable m_cv;
+    AsyncTask m_status_thread;
+};
+
+
+
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/Controllers/ControllerTypeStrings.cpp b/SerialPrograms/Source/Controllers/ControllerTypeStrings.cpp
new file mode 100644
index 0000000000..bbdddf11be
--- /dev/null
+++ b/SerialPrograms/Source/Controllers/ControllerTypeStrings.cpp
@@ -0,0 +1,54 @@
+/*  Controller Type Strings
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "ControllerTypeStrings.h"
+
+namespace PokemonAutomation{
+
+
+
+const EnumStringMap<ControllerInterface> CONTROLLER_INTERFACE_STRINGS{
+//    {ControllerInterface::None,                 "None"},
+//    {ControllerInterface::SerialPABotBase,      "Serial: PABotBase"},
+    {ControllerInterface::SerialPABotBase2,     "Serial: PABotBase2"},
+    {ControllerInterface::TcpSysbotBase,        "TCP: sys-botbase"},
+//    {ControllerInterface::UsbSysbotBase,        "USB: sys-botbase"},
+};
+
+const EnumStringMap<ControllerType> CONTROLLER_TYPE_STRINGS{
+    {ControllerType::None,                                  "None"},
+    {ControllerType::HID_Keyboard,                          "HID: Keyboard"},
+    {ControllerType::NintendoSwitch_WiredController,        "NS1: Wired Controller"},
+    {ControllerType::NintendoSwitch_WiredProController,     "NS1: Wired Pro Controller"},
+    {ControllerType::NintendoSwitch_WiredLeftJoycon,        "NS1: Wired Left Joycon"},
+    {ControllerType::NintendoSwitch_WiredRightJoycon,       "NS1: Wired Right Joycon"},
+    {ControllerType::NintendoSwitch_WirelessProController,  "NS1: Wireless Pro Controller"},
+    {ControllerType::NintendoSwitch_WirelessLeftJoycon,     "NS1: Wireless Left Joycon"},
+    {ControllerType::NintendoSwitch_WirelessRightJoycon,    "NS1: Wireless Right Joycon"},
+    {ControllerType::NintendoSwitch2_WiredController,       "NS2: Wired Controller"},
+    {ControllerType::NintendoSwitch2_WiredProController,    "NS2: Wired Pro Controller"},
+    {ControllerType::NintendoSwitch2_WiredLeftJoycon,       "NS2: Wired Left Joycon"},
+    {ControllerType::NintendoSwitch2_WiredRightJoycon,      "NS2: Wired Right Joycon"},
+    {ControllerType::NintendoSwitch2_WirelessProController, "NS2: Wireless Pro Controller"},
+    {ControllerType::NintendoSwitch2_WirelessLeftJoycon,    "NS2: Wireless Left Joycon"},
+    {ControllerType::NintendoSwitch2_WirelessRightJoycon,   "NS2: Wireless Right Joycon"},
+};
+
+const EnumStringMap<ControllerClass>& CONTROLLER_CLASS_STRINGS(){
+    static EnumStringMap<ControllerClass> database{
+        {ControllerClass::None,                             "None"},
+        {ControllerClass::HID_Keyboard,                     "HID: Keyboard"},
+        {ControllerClass::NintendoSwitch_ProController,     "NS1: Pro Controller"},
+        {ControllerClass::NintendoSwitch_LeftJoycon,        "NS1: Left Joycon"},
+        {ControllerClass::NintendoSwitch_RightJoycon,       "NS1: Right Joycon"},
+    };
+    return database;
+}
+
+
+
+
+}
diff --git a/SerialPrograms/Source/Controllers/ControllerTypeStrings.h b/SerialPrograms/Source/Controllers/ControllerTypeStrings.h
new file mode 100644
index 0000000000..e92bc84e75
--- /dev/null
+++ b/SerialPrograms/Source/Controllers/ControllerTypeStrings.h
@@ -0,0 +1,24 @@
+/*  Controller Type Strings
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Controllers_ControllerTypeStrings_H
+#define PokemonAutomation_Controllers_ControllerTypeStrings_H
+
+#include "Common/Cpp/EnumStringMap.h"
+#include "ControllerTypes.h"
+
+namespace PokemonAutomation{
+
+
+
+extern const EnumStringMap<ControllerInterface> CONTROLLER_INTERFACE_STRINGS;
+extern const EnumStringMap<ControllerType> CONTROLLER_TYPE_STRINGS;
+const EnumStringMap<ControllerClass>& CONTROLLER_CLASS_STRINGS();
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/Controllers/ControllerTypes.h b/SerialPrograms/Source/Controllers/ControllerTypes.h
new file mode 100644
index 0000000000..8a03518c01
--- /dev/null
+++ b/SerialPrograms/Source/Controllers/ControllerTypes.h
@@ -0,0 +1,65 @@
+/*  Controller Types
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Controllers_ControllerTypes_H
+#define PokemonAutomation_Controllers_ControllerTypes_H
+
+namespace PokemonAutomation{
+
+
+
+enum class ControllerInterface{
+//    None,
+//    SerialPABotBase,
+    SerialPABotBase2,
+    TcpSysbotBase,
+//    UsbSysbotBase,
+};
+
+enum class ControllerPerformanceClass{
+    Unknown,
+    SerialPABotBase_Wired,
+    SerialPABotBase_Wireless,
+    SysbotBase,
+};
+
+
+enum class ControllerClass{
+    None,
+    HID_Keyboard,
+    NintendoSwitch_ProController,
+    NintendoSwitch_LeftJoycon,
+    NintendoSwitch_RightJoycon,
+};
+
+
+enum class ControllerType{
+    None,
+
+    HID_Keyboard,
+
+    NintendoSwitch_WiredController,     //  Generic 3rd party wired controller.
+    NintendoSwitch_WiredProController,
+    NintendoSwitch_WiredLeftJoycon,
+    NintendoSwitch_WiredRightJoycon,
+    NintendoSwitch_WirelessProController,
+    NintendoSwitch_WirelessLeftJoycon,
+    NintendoSwitch_WirelessRightJoycon,
+
+    NintendoSwitch2_WiredController,    //  Generic 3rd party wired controller.
+    NintendoSwitch2_WiredProController,
+    NintendoSwitch2_WiredLeftJoycon,
+    NintendoSwitch2_WiredRightJoycon,
+    NintendoSwitch2_WirelessProController,
+    NintendoSwitch2_WirelessLeftJoycon,
+    NintendoSwitch2_WirelessRightJoycon,
+};
+
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/Controllers/Joystick.cpp b/SerialPrograms/Source/Controllers/Joystick.cpp
new file mode 100644
index 0000000000..f44d952ad3
--- /dev/null
+++ b/SerialPrograms/Source/Controllers/Joystick.cpp
@@ -0,0 +1,22 @@
+/*  Joystick
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <cmath>
+#include "Joystick.h"
+
+namespace PokemonAutomation{
+
+
+JoystickCardinal::operator JoystickPosition() const{
+    double radians = angle * (3.1415926535897932385 / 180);
+    return JoystickPosition(
+        magnitude * std::sin(radians),
+        magnitude * std::cos(radians)
+    );
+}
+
+
+}
diff --git a/SerialPrograms/Source/Controllers/Joystick.h b/SerialPrograms/Source/Controllers/Joystick.h
new file mode 100644
index 0000000000..0c03540505
--- /dev/null
+++ b/SerialPrograms/Source/Controllers/Joystick.h
@@ -0,0 +1,49 @@
+/*  Joystick
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Controllers_Joystick_H
+#define PokemonAutomation_Controllers_Joystick_H
+
+namespace PokemonAutomation{
+
+
+struct JoystickPosition{
+    double x = 0.0;
+    double y = 0.0;
+
+    JoystickPosition() = default;
+    JoystickPosition(double x, double y)
+        : x(x), y(y)
+    {}
+
+    bool is_neutral() const{
+        return x == 0 && y == 0;
+    }
+
+    friend bool operator==(const JoystickPosition& lhs, const JoystickPosition& rhs){
+        return lhs.x == rhs.x && lhs.y == rhs.y;
+    }
+    friend bool operator!=(const JoystickPosition& lhs, const JoystickPosition& rhs){
+        return lhs.x != rhs.x || lhs.y != rhs.y;
+    }
+};
+
+
+struct JoystickCardinal{
+    double magnitude = 0.0;
+    double angle = 0.0;
+
+    JoystickCardinal(double magnitude, double angle)
+        : magnitude(magnitude), angle(angle)
+    {}
+
+    operator JoystickPosition() const;
+};
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/Controllers/JoystickTools.h b/SerialPrograms/Source/Controllers/JoystickTools.h
new file mode 100644
index 0000000000..5c4736234d
--- /dev/null
+++ b/SerialPrograms/Source/Controllers/JoystickTools.h
@@ -0,0 +1,123 @@
+/*  Joystick Tools
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Controllers_JoystickTools_H
+#define PokemonAutomation_Controllers_JoystickTools_H
+
+#include <stdint.h>
+#include <cmath>
+#include <algorithm>
+
+namespace PokemonAutomation{
+namespace JoystickTools{
+
+
+inline void clip_magnitude(double& x, double& y){
+    double mag = x*x + y*y;
+    if (mag <= 1.0){
+        return;
+    }
+
+    double scale = 1 / std::sqrt(mag);
+
+    x *= scale;
+    y *= scale;
+}
+inline void max_out_magnitude(double& x, double& y){
+    double mag = x*x + y*y;
+    if (mag == 0){
+        return;
+    }
+
+    double abs_x = std::abs(x);
+    double abs_y = std::abs(y);
+
+    if (abs_x < abs_y){
+        x /= abs_y;
+        y = y < 0 ? -1 : 1;
+    }else{
+        y /= abs_x;
+        x = x < 0 ? -1 : 1;
+    }
+}
+inline double project_to_range(double x, double lo, double hi){
+    if (x <= -1){
+        return -1;
+    }
+    if (x >= 1){
+        return 1;
+    }
+    return x * (hi - lo) + lo;
+}
+
+
+
+
+inline double linear_u8_to_float(uint8_t x){
+    if (x <= 128){
+        return (x - 128) * (1. / 128);
+    }else{
+        return (x - 128) * (1. / 127);
+    }
+}
+inline uint8_t linear_float_to_u8(double f){
+    if (f <= 0){
+        f = std::max<double>(f, -1);
+        f = f * 128 + 128;
+        return (uint8_t)(f + 0.5);
+    }else{
+        f = std::min<double>(f, +1);
+        f = f * 127 + 128;
+        return (uint8_t)(f + 0.5);
+    }
+}
+inline int16_t linear_float_to_s16(double f){
+    if (f <= 0){
+        f = std::max<double>(f, -1);
+        f = f * 32768;
+        return (int16_t)(f + 0.5);
+    }else{
+        f = std::min<double>(f, +1);
+        f = f * 32767;
+        return (int16_t)(f + 0.5);
+    }
+}
+inline uint16_t linear_float_to_u16(double f){
+    if (f <= 0){
+        f = std::max<double>(f, -1);
+        f = f * 32768 + 32768;
+        return (uint16_t)(f + 0.5);
+    }else{
+        f = std::min<double>(f, +1);
+        f = f * 32767 + 32768;
+        return (uint16_t)(f + 0.5);
+    }
+}
+
+
+
+inline uint16_t linear_float_to_u12(double f){
+    if (f <= 0){
+        f = std::max<double>(f, -1);
+        f = f * 2048 + 2048;
+        return (uint16_t)(f + 0.5);
+    }else{
+        f = std::min<double>(f, +1);
+        f = f * 2047 + 2048;
+        return (uint16_t)(f + 0.5);
+    }
+}
+
+
+
+
+
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Controllers/NullController.cpp b/SerialPrograms/Source/Controllers/NullController.cpp
new file mode 100644
index 0000000000..0bc3e9182c
--- /dev/null
+++ b/SerialPrograms/Source/Controllers/NullController.cpp
@@ -0,0 +1,62 @@
+/*  Null Controller
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+//#include "Common/Cpp/Json/JsonValue.h"
+#include "Controllers/PABotBase2/SerialPABotBase2_Descriptor.h"
+
+#include "NullController.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+
+
+
+std::unique_ptr<ControllerDescriptor> null_controller_descriptor(){
+    return std::make_unique<SerialPABotBase::SerialPABotBase2_Descriptor>();
+}
+
+
+
+
+#if 0
+template class InterfaceType_t<NullControllerDescriptor>;
+
+
+bool NullControllerDescriptor::operator==(const ControllerDescriptor& x) const{
+    return typeid(*this) == typeid(x);
+}
+std::string NullControllerDescriptor::display_name() const{
+    return "(none)";
+}
+JsonValue NullControllerDescriptor::to_json() const{
+    return JsonValue();
+}
+void NullControllerDescriptor::load_json(const JsonValue& json){
+
+}
+std::unique_ptr<ControllerConnection> NullControllerDescriptor::open_connection(Logger& logger) const{
+    return nullptr;
+}
+std::unique_ptr<AbstractController> NullControllerDescriptor::make_controller(
+    Logger& logger,
+    ControllerConnection& connection,
+    ControllerType controller_type
+) const{
+    return nullptr;
+}
+#endif
+
+
+
+const char NullController::NAME[] = "(none)";
+
+
+
+
+}
diff --git a/SerialPrograms/Source/Controllers/NullController.h b/SerialPrograms/Source/Controllers/NullController.h
new file mode 100644
index 0000000000..3876990295
--- /dev/null
+++ b/SerialPrograms/Source/Controllers/NullController.h
@@ -0,0 +1,106 @@
+/*  Null Controller
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Controllers_NullController_H
+#define PokemonAutomation_Controllers_NullController_H
+
+#include "ControllerDescriptor.h"
+//#include "ControllerConnection.h"
+
+namespace PokemonAutomation{
+
+
+
+std::unique_ptr<ControllerDescriptor> null_controller_descriptor();
+
+
+
+#if 0
+class NullControllerDescriptor : public UiState<const NullControllerDescriptor&, ControllerDescriptor>{
+public:
+    static constexpr ControllerInterface INTERFACE_NAME = ControllerInterface::None;
+
+public:
+    NullControllerDescriptor()
+        : UiState<const NullControllerDescriptor&, ControllerDescriptor>(ControllerInterface::None)
+    {}
+    virtual bool operator==(const ControllerDescriptor& x) const override;
+    virtual std::string display_name() const override;
+    virtual JsonValue to_json() const override;
+    virtual void load_json(const JsonValue& json) override;
+
+    virtual std::unique_ptr<ControllerConnection> open_connection(Logger& logger) const override;
+    virtual std::unique_ptr<AbstractController> make_controller(
+        Logger& logger,
+        ControllerConnection& connection,
+        ControllerType controller_type
+    ) const override;
+};
+#endif
+
+
+
+class NullController final : public AbstractController{
+public:
+    static const char NAME[];
+
+    NullController(Logger& logger)
+        : m_logger(logger)
+    {}
+
+    virtual Logger& logger() override{
+        return m_logger;
+    }
+
+    virtual const char* name() override{
+        return NAME;
+    }
+    virtual ControllerClass controller_class() const noexcept override{
+        return ControllerClass::None;
+    }
+    virtual ControllerPerformanceClass performance_class() const override{
+        return ControllerPerformanceClass::Unknown;
+    }
+    virtual Milliseconds ticksize() const override{
+        return Milliseconds(0);
+    }
+    virtual Milliseconds cooldown() const override{
+        return Milliseconds(0);
+    }
+    virtual Milliseconds timing_variation() const override{
+        return Milliseconds(0);
+    }
+    virtual bool atomic_multibutton() const override{
+        return true;
+    }
+    virtual bool is_ready() const override{
+        return false;
+    }
+
+    virtual void cancel_all_commands() override{}
+    virtual void replace_on_next_command() override{}
+    virtual bool cancel_all_and_wait(Milliseconds timeout) override{
+        return false;
+    }
+    virtual void wait_for_all(Cancellable* cancellable) override{}
+    virtual void issue_barrier(Cancellable* cancellable) override{}
+    virtual void issue_nop(Cancellable* cancellable, Milliseconds duration) override{}
+
+
+private:
+    Logger& m_logger;
+};
+
+
+
+
+
+
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/Controllers/NullControllerWidget.cpp b/SerialPrograms/Source/Controllers/NullControllerWidget.cpp
new file mode 100644
index 0000000000..84e005d034
--- /dev/null
+++ b/SerialPrograms/Source/Controllers/NullControllerWidget.cpp
@@ -0,0 +1,19 @@
+/*  Null Controller Widget
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "NullControllerWidget.h"
+
+namespace PokemonAutomation{
+
+
+
+
+//template class RegisterUiStateQtWidget<NullControllerWidget>;
+
+
+
+
+}
diff --git a/SerialPrograms/Source/Controllers/NullControllerWidget.h b/SerialPrograms/Source/Controllers/NullControllerWidget.h
new file mode 100644
index 0000000000..4a0c328840
--- /dev/null
+++ b/SerialPrograms/Source/Controllers/NullControllerWidget.h
@@ -0,0 +1,33 @@
+/*  Null Controller Widget
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Controllers_NullControllerWidget_H
+#define PokemonAutomation_Controllers_NullControllerWidget_H
+
+#include <QWidget>
+#include "Common/Qt/UiStateQtWidget.h"
+#include "NullController.h"
+
+namespace PokemonAutomation{
+
+
+#if 0
+class NullControllerWidget : public QWidget, public UiComponentQtWidget{
+public:
+    using ParentState = const NullControllerDescriptor;
+
+    NullControllerWidget(QWidget& parent, const ParentState& descriptor)
+        : QWidget(&parent)
+    {}
+    virtual QWidget& widget() override{
+        return *this;
+    }
+};
+#endif
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/Controllers/PABotBase2/PABotBase2_CommandQueueManager.cpp b/SerialPrograms/Source/Controllers/PABotBase2/PABotBase2_CommandQueueManager.cpp
new file mode 100644
index 0000000000..590cd34192
--- /dev/null
+++ b/SerialPrograms/Source/Controllers/PABotBase2/PABotBase2_CommandQueueManager.cpp
@@ -0,0 +1,298 @@
+/*  PABotBase2 Command Queue
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <string.h>
+#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "Common/PABotBase2/PABotBase2CC_MessageDumper.h"
+#include "CommonFramework/Logging/Logger.h"
+#include "PABotBase2_CommandQueueManager.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace PABotBase2{
+
+
+void CommandQueueManager::set_command_queue_size(uint8_t command_queue_size){
+    {
+        std::unique_lock<Mutex> lg(m_lock);
+        m_command_queue_size = command_queue_size;
+    }
+    m_cv.notify_all();
+}
+
+
+bool CommandQueueManager::cancel(std::exception_ptr exception) noexcept{
+    bool ret = Cancellable::cancel(std::move(exception));
+    {
+        std::lock_guard<Mutex> lg(m_lock);
+#if 0
+        try{
+            send_cancel(std::chrono::milliseconds(100));
+        }catch (...){}
+#endif
+    }
+    m_cv.notify_all();
+    return ret;
+}
+
+
+void CommandQueueManager::wait_for_all(Cancellable* cancellable){
+    std::unique_lock<Mutex> lg(m_lock);
+    while (!m_pending_commands.empty()){
+        throw_if_cancelled(cancellable);
+        cv_wait(cancellable, lg);
+    }
+}
+
+
+void CommandQueueManager::wait_for_command_finish(Cancellable* cancellable, uint8_t id){
+    std::unique_lock<Mutex> lg(m_lock);
+    while (true){
+        throw_if_cancelled(cancellable);
+
+        //  Command doesn't exist.
+        auto iter = m_pending_commands.find(id);
+        if (iter == m_pending_commands.end()){
+            return;
+        }
+
+        cv_wait(cancellable, lg);
+    }
+}
+
+CommandQueueManager::CancelResult CommandQueueManager::send_cancel() noexcept{
+    bool success;
+    {
+        std::unique_lock<Mutex> lg(m_lock);
+        if (m_pending_special == PABB2_MESSAGE_OPCODE_CQ_CANCEL ||
+            m_pending_commands.empty()
+        ){
+            return CancelResult::SUPPRESSED_DUPLICATE;
+        }
+        m_pending_special = PABB2_MESSAGE_OPCODE_CQ_CANCEL;
+        success = try_push_pending_specials();
+    }
+    if (success){
+        m_cv.notify_all();
+        m_logger.log("cancel_all_commands()", COLOR_DARKGREEN);
+        return CancelResult::SUCCESS;
+    }
+    m_logger.log("cancel_all_commands() - Buffer Full", COLOR_RED);
+    return CancelResult::BUFFER_FULL;
+}
+
+
+bool CommandQueueManager::wait_for_cancel(WallDuration timeout){
+    WallClock deadline = current_time() + timeout;
+    {
+        std::unique_lock<Mutex> lg(m_lock);
+
+        //  If "send_cancel()" hit a full buffer, the cancel hasn't been sent
+        //  yet. Keep retrying as the device acks what's in flight.
+        while (m_pending_special == PABB2_MESSAGE_OPCODE_CQ_CANCEL &&
+            !try_push_pending_specials()
+        ){
+            WallClock now = current_time();
+            if (now >= deadline){
+                m_logger.log("wait_for_cancel(): Timed out sending the cancel.", COLOR_RED);
+                return false;
+            }
+            lg.unlock();
+            m_connection.wait_for_pending(deadline - now);
+            lg.lock();
+        }
+    }
+    m_cv.notify_all();
+
+    //  The device acks a packet once it lands in its receive buffer. Commands
+    //  are processed in order, so anything sent after this is behind the cancel.
+    WallClock now = current_time();
+    if (m_connection.wait_for_pending(now < deadline ? deadline - now : WallDuration::zero())){
+        return true;
+    }
+    m_logger.log("wait_for_cancel(): Timed out waiting for the device to ack the cancel.", COLOR_RED);
+    return false;
+}
+
+
+CommandQueueManager::CancelResult CommandQueueManager::send_replace_on_next() noexcept{
+    bool success;
+    {
+        std::unique_lock<Mutex> lg(m_lock);
+        if (m_pending_special != PABB2_MESSAGE_OPCODE_CQ_CANCEL){
+            m_pending_special = PABB2_MESSAGE_OPCODE_CQ_REPLACE_ON_NEXT;
+        }
+        if (m_pending_special == PABB2_MESSAGE_OPCODE_CQ_CANCEL ||
+            m_pending_special == PABB2_MESSAGE_OPCODE_CQ_REPLACE_ON_NEXT ||
+            m_pending_commands.empty()
+        ){
+            return CancelResult::SUPPRESSED_DUPLICATE;
+        }
+        success = try_push_pending_specials();
+    }
+    if (success){
+        m_cv.notify_all();
+        m_logger.log("replace_on_next_command()", COLOR_DARKGREEN);
+        return CancelResult::SUCCESS;
+    }
+    m_logger.log("replace_on_next_command() - Buffer Full", COLOR_RED);
+    return CancelResult::BUFFER_FULL;
+}
+
+
+uint8_t CommandQueueManager::send_command(Cancellable* cancellable, MessageHeader& command){
+    {
+        bool need_to_wait = false;
+        std::unique_lock<Mutex> lg(m_lock);
+        try_push_pending_specials();
+        while (true){
+            if (need_to_wait){
+                cv_wait(cancellable, lg);
+            }
+            need_to_wait = true;
+            throw_if_cancelled(cancellable);
+
+            if (m_pending_commands.size() >= m_command_queue_size){
+                continue;
+            }
+
+//            cout << "Send: " << (unsigned)m_command_seqnum << ", queue size = " << m_pending_commands.size() << endl;
+            command.id = m_command_seqnum;
+
+            //  Wait until the slot is available.
+            bool success = m_pending_commands.emplace(
+                command.id,
+                std::make_shared<CommandHandle>()
+            ).second;
+            if (!success){
+                continue;
+            }
+
+            m_lock.unlock();
+            try{
+                m_connection.reliable_send_all_or_nothing(
+                    cancellable,
+                    &command, command.message_bytes
+                );
+            }catch (...){
+                m_lock.lock();
+                m_pending_commands.erase(command.id);
+                throw;
+            }
+            m_lock.lock();
+
+            m_command_seqnum++;
+            break;
+        }
+    }
+//    cout << "Post send 0: " << (unsigned)command.id << endl;
+    m_message_loggers.log_send(m_logger, LOG_EVERYTHING(), &command);
+//    cout << "Post send 1: " << (unsigned)command.id << endl;
+    m_cv.notify_all();
+    return command.id;
+}
+
+
+void CommandQueueManager::report_command_finished(const MessageHeader& finished_message){
+    {
+        std::lock_guard<Mutex> lg(m_lock);
+//        cout << "Done: " << (unsigned)finished_message.id << endl;
+        auto iter = m_pending_commands.find(finished_message.id);
+        if (iter == m_pending_commands.end()){
+            m_logger.log("[MLC]: Received command finish for unknown ID: " + std::to_string(finished_message.id));
+            return;
+        }
+        iter->second->finished = true;
+        memcpy(
+            &iter->second->device_timestamp,
+            &((const Message_u32&)finished_message).data,
+            sizeof(uint32_t)
+        );
+        m_pending_commands.erase(iter);
+        try_push_pending_specials();
+    }
+    m_cv.notify_all();
+}
+
+
+bool CommandQueueManager::try_push_pending_specials() noexcept{
+    //  Must call under lock.
+    if (m_pending_special == PABB2_MESSAGE_OPCODE_INVALID){
+        return false;
+    }
+
+    MessageHeader message;
+    message.message_bytes = sizeof(MessageHeader);
+    message.opcode = m_pending_special;
+    message.id = 0;
+
+    m_lock.unlock();
+
+    bool sent = false;
+    try{
+        sent = m_connection.reliable_send_all_or_nothing(
+            nullptr,
+            &message, message.message_bytes,
+            current_time()
+        );
+    }catch (...){}
+
+    m_lock.lock();
+
+    if (!sent){
+        return false;
+    }
+
+    m_pending_special = PABB2_MESSAGE_OPCODE_INVALID;
+    m_pending_commands.clear();
+
+    m_message_loggers.log_send(m_logger, LOG_EVERYTHING(), &message);
+    return true;
+}
+
+
+void CommandQueueManager::on_cancellable_cancel(
+    Cancellable& cancellable,
+    std::exception_ptr reason
+){
+    {
+        std::unique_lock<Mutex> lg(m_lock);
+    }
+    m_cv.notify_all();
+}
+
+
+void CommandQueueManager::cv_wait(Cancellable* cancellable, std::unique_lock<Mutex>& lg){
+    if (cancellable == nullptr){
+        m_cv.wait(lg);
+        return;
+    }
+
+    cancellable->add_cancel_listener(*this);
+    m_cv.wait(lg);
+
+    //  Unlock to remove. Otherwise, it may deadlock with "on_cancellable_cancel()"
+    //  being called from a listener callback.
+    lg.unlock();
+    cancellable->remove_cancel_listener(*this);
+    lg.lock();
+}
+
+
+void CommandQueueManager::throw_if_cancelled(Cancellable* cancellable){
+    Cancellable::throw_if_cancelled();
+    if (cancellable){
+        cancellable->throw_if_cancelled();
+    }
+}
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/Controllers/PABotBase2/PABotBase2_CommandQueueManager.h b/SerialPrograms/Source/Controllers/PABotBase2/PABotBase2_CommandQueueManager.h
new file mode 100644
index 0000000000..27999c5a70
--- /dev/null
+++ b/SerialPrograms/Source/Controllers/PABotBase2/PABotBase2_CommandQueueManager.h
@@ -0,0 +1,106 @@
+/*  PABotBase2 Command Queue
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Controllers_PABotBase2_CommandQueue_H
+#define PokemonAutomation_Controllers_PABotBase2_CommandQueue_H
+
+#include <map>
+#include "Common/Cpp/Logging/AbstractLogger.h"
+#include "Common/Cpp/Concurrency/Mutex.h"
+#include "Common/Cpp/Concurrency/ConditionVariable.h"
+#include "Common/Cpp/CancellableScope.h"
+#include "Common/Cpp/StreamConnections/PushingStreamConnections.h"
+#include "Common/PABotBase2/PABotBase2_MessageProtocol.h"
+#include "Common/PABotBase2/PABotBase2CC_MessageDumper.h"
+#include "PABotBase2_MessageHandler.h"
+
+namespace PokemonAutomation{
+namespace PABotBase2{
+
+
+
+class CommandQueueManager final : public Cancellable, public Cancellable::CancelListener{
+public:
+    CommandQueueManager(
+        Logger& logger,
+        CancellableScope& scope,
+        ReliableStreamConnectionPushing& connection,
+        const MessageLogger& message_loggers
+    )
+        : m_logger(logger)
+        , m_connection(connection)
+        , m_message_loggers(message_loggers)
+    {
+        attach(scope);
+    }
+    ~CommandQueueManager(){
+        detach();
+    }
+
+    void set_command_queue_size(uint8_t command_queue_size);
+
+    virtual bool cancel(std::exception_ptr exception) noexcept override;
+
+
+public:
+    enum CancelResult{
+        SUCCESS,
+        BUFFER_FULL,
+        SUPPRESSED_DUPLICATE,
+    };
+
+    void wait_for_all(Cancellable* cancellable);
+    void wait_for_command_finish(Cancellable* cancellable, uint8_t id);
+
+    CancelResult send_cancel() noexcept;
+    CancelResult send_replace_on_next() noexcept;
+
+    //  Call after "send_cancel()". Blocks until the device has acked the
+    //  cancel (and everything sent before it) or until the timeout.
+    //  Returns true if acked. Throws if the connection is dead.
+    bool wait_for_cancel(WallDuration timeout);
+
+    uint8_t send_command(Cancellable* cancellable, MessageHeader& command);
+    void report_command_finished(const MessageHeader& finished_message);
+
+
+private:
+    bool try_push_pending_specials() noexcept;
+
+    virtual void on_cancellable_cancel(
+        Cancellable& cancellable,
+        std::exception_ptr reason
+    ) override;
+    void cv_wait(Cancellable* cancellable, std::unique_lock<Mutex>& lg);
+    void throw_if_cancelled(Cancellable* cancellable);
+
+
+private:
+    Logger& m_logger;
+    ReliableStreamConnectionPushing& m_connection;
+    const MessageLogger& m_message_loggers;
+
+    mutable Mutex m_lock;
+    ConditionVariable m_cv;
+    uint8_t m_command_queue_size = 4;
+    uint8_t m_command_seqnum = 0;
+
+    uint8_t m_pending_special = PABB2_MESSAGE_OPCODE_INVALID;
+
+    SpinLock m_pending_commands_lock;
+    struct CommandHandle{
+        bool finished = false;
+        uint32_t device_timestamp = 0;
+    };
+    std::map<uint8_t, std::shared_ptr<CommandHandle>> m_pending_commands;
+};
+
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Controllers/PABotBase2/PABotBase2_Connection.cpp b/SerialPrograms/Source/Controllers/PABotBase2/PABotBase2_Connection.cpp
new file mode 100644
index 0000000000..144d781703
--- /dev/null
+++ b/SerialPrograms/Source/Controllers/PABotBase2/PABotBase2_Connection.cpp
@@ -0,0 +1,89 @@
+/*  PABotBase2 Connection
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+//#include "Common/Cpp/CancellableScope.h"
+#include "NintendoSwitch/Controllers/PABotBase2/NintendoSwitch_PABotBase2_OemController.h"
+#include "PABotBase2_Connection.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace PABotBase2{
+
+
+
+void Connection::run_preconnect_configure(ControllerType controller_type){
+    //  If the controller has settings, set them now.
+    switch (controller_type){
+    case ControllerType::NintendoSwitch_WiredProController:
+    case ControllerType::NintendoSwitch_WiredLeftJoycon:
+    case ControllerType::NintendoSwitch_WiredRightJoycon:
+    case ControllerType::NintendoSwitch_WirelessProController:
+    case ControllerType::NintendoSwitch_WirelessLeftJoycon:
+    case ControllerType::NintendoSwitch_WirelessRightJoycon:
+        NintendoSwitch::PABotBase2_OemController::run_preconnect_configure(
+            m_device->logger(), *this, controller_type
+        );
+        break;
+    default:;
+    }
+}
+
+void Connection::try_set_controller_type(
+    ControllerType controller_type,
+    bool clear_settings
+) noexcept{
+    if (!is_ready()){
+        return;
+    }
+
+    try{
+        run_preconnect_configure(controller_type);
+    }catch (...){}
+
+    m_device->try_set_controller_type(controller_type, clear_settings);
+}
+
+void Connection::auto_select_controller_from_boot(){
+//    cout << "auto_select_controller_from_boot()" << endl;
+    ControllerType controller_type = ControllerType::NintendoSwitch_WiredProController;
+
+    //  Already set to a controller.
+    if (m_device->refresh_controller_type() != ControllerType::None){
+        return;
+    }
+
+    //  Does not support the NS1 procon.
+    auto iter = std::find(
+        m_controller_list.begin(),
+        m_controller_list.end(),
+        controller_type
+    );
+    if (iter == m_controller_list.end()){
+//        cout << "procon not supported: " << m_controller_list.size() << endl;
+        return;
+    }
+
+    //  Not the first session.
+    uint32_t session_num = m_device->query_u32(PABB2_MESSAGE_OPCODE_REQUEST_SESSION_NUM);
+    m_device->logger().log("Session: " + tostr_u_commas(session_num));
+    if (session_num != 0){
+        return;
+    }
+
+    //  Now we can try to set the controller to NS1 procon.
+    run_preconnect_configure(controller_type);
+    m_device->try_set_controller_type(controller_type, false);
+}
+
+
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/Controllers/PABotBase2/PABotBase2_Connection.h b/SerialPrograms/Source/Controllers/PABotBase2/PABotBase2_Connection.h
new file mode 100644
index 0000000000..90f391a8a0
--- /dev/null
+++ b/SerialPrograms/Source/Controllers/PABotBase2/PABotBase2_Connection.h
@@ -0,0 +1,47 @@
+/*  PABotBase2 Connection
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Controllers_PABotBase2_Connection_H
+#define PokemonAutomation_Controllers_PABotBase2_Connection_H
+
+#include <memory>
+#include "Controllers/ControllerConnection.h"
+#include "PABotBase2_DeviceHandle.h"
+
+namespace PokemonAutomation{
+namespace PABotBase2{
+
+
+class Connection : public ControllerConnection{
+public:
+    PABotBase2::DeviceHandle& device(){
+        return *m_device;
+    }
+    MessageLogger& message_logger(){
+        return m_device->message_logger();
+    }
+
+    virtual void try_set_controller_type(
+        ControllerType controller_type,
+        bool clear_settings
+    ) noexcept override;
+
+    void auto_select_controller_from_boot();
+
+
+private:
+    void run_preconnect_configure(ControllerType controller_type);
+
+
+protected:
+    std::unique_ptr<PABotBase2::DeviceHandle> m_device;
+};
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Controllers/PABotBase2/PABotBase2_DeviceHandle.cpp b/SerialPrograms/Source/Controllers/PABotBase2/PABotBase2_DeviceHandle.cpp
new file mode 100644
index 0000000000..27142afdf0
--- /dev/null
+++ b/SerialPrograms/Source/Controllers/PABotBase2/PABotBase2_DeviceHandle.cpp
@@ -0,0 +1,553 @@
+/*  PABotBase2 Device Handle
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <string.h>
+#include "Common/Cpp/Exceptions.h"
+#include "Common/Cpp/PrettyPrint.h"
+#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "Common/Cpp/ColoredText.h"
+#include "Common/PABotBase2/PABotBase2CC_MessageDumper.h"
+#include "CommonFramework/Globals.h"
+#include "CommonFramework/Logging/Logger.h"
+#include "Controllers/ControllerTypeStrings.h"
+#include "Controllers/ControllerSettings.h"
+#include "Controllers/SerialPort/SerialPABotBase.h"
+#include "PABotBase2_DeviceHandle.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace PABotBase2{
+
+
+
+DeviceHandle::DeviceHandle(
+    CancellableScope* parent,
+    Logger& logger,
+    ReliableStreamConnectionPushing& connection
+)
+    : m_logger(logger)
+    , m_connection(connection)
+    , m_command_queue(logger, *this, connection, m_message_loggers)
+{
+    connection.add_listener(*this);
+    if (parent){
+        attach(*parent);
+    }
+}
+DeviceHandle::~DeviceHandle(){
+    {
+        std::unique_lock<Mutex> lg(m_lock);
+        try{
+            m_logger.log(
+                "DeviceHandle::~DeviceHandle(): Waiting for " + std::to_string(m_pending_requests.size()) + " request(s) to finish."
+            );
+        }catch (...){}
+        size_t unacked = 0;
+         m_cv.wait_for(
+            lg, std::chrono::milliseconds(100),
+            [&, this]{
+                unacked = 0;
+                for (const auto& item : m_pending_requests){
+                    if (item.second.empty()){
+                        unacked++;
+                    }
+                }
+                return unacked == 0;
+            }
+        );
+        if (unacked != 0){
+            try{
+                m_logger.log(
+                    "DeviceHandle::~DeviceHandle(): Timed out waiting for " + std::to_string(unacked) + " request(s) to finish.",
+                    COLOR_RED
+                );
+            }catch (...){}
+        }
+    }
+
+    detach();
+    cancel(nullptr);
+    m_connection.remove_listener(*this);
+}
+
+
+void DeviceHandle::add_message_handler(
+    uint8_t opcode,
+    std::function<void(const MessageHeader*)> handler
+){
+    auto ret = m_message_handlers.emplace(opcode, std::move(handler));
+    if (!ret.second){
+        throw InternalProgramError(
+            &m_logger, PA_CURRENT_FUNCTION,
+            "Duplicate Message Opcode: 0x" + tostr_hex(opcode)
+        );
+    }
+}
+bool DeviceHandle::cancel(std::exception_ptr exception) noexcept{
+    if (CancellableScope::cancel(std::move(exception))){
+        return true;
+    }
+    {
+        std::lock_guard<Mutex> lg(m_lock);
+    }
+    m_cv.notify_all();
+    return false;
+}
+
+
+std::string DeviceHandle::dump_pending_requests() const{
+    std::string ret = "Pending Requests:\n";
+    std::lock_guard<Mutex> lg(m_lock);
+    for (const auto& item : m_pending_requests){
+        ret += std::to_string(item.first);
+        ret += " : ";
+        ret += tostr_hexbytes(item.second.data(), item.second.size());
+        ret += "\n";
+    }
+    return ret;
+}
+
+
+
+
+void DeviceHandle::throw_incompatible_protocol(){
+    m_logger.log(
+        "[MLC]: Remote Protocol: " + std::to_string(m_device_protocol) + " (incompatible)",
+        COLOR_RED
+    );
+
+    throw SerialProtocolException(
+        m_logger, PA_CURRENT_FUNCTION,
+        "Incompatible MLC protocol. Device: " + std::to_string(m_device_protocol) + "<br>"
+        "Please flash your microcontroller (e.g. ESP32, Pico W...) <br>"
+        "with the .bin/.uf2/.hex that came with this version of the program.<br>" +
+        make_text_url(ONLINE_DOC_URL_BASE + "SetupGuide/Reflash.html", "See documentation for more details.")
+    );
+}
+void DeviceHandle::query_protocol(){
+    const std::map<pabb_ProgramID, uint8_t>* PROGRAMS;
+    {
+        m_device_protocol = query_u32(PABB2_MESSAGE_OPCODE_PROTOCOL_VERSION);
+        const std::map<uint32_t, std::map<pabb_ProgramID, uint8_t>>& SUPPORTED_VERSIONS =
+            SerialPABotBase::SUPPORTED_VERSIONS2();
+        auto iter = SUPPORTED_VERSIONS.find(m_device_protocol / 100);
+        if (iter == SUPPORTED_VERSIONS.end()){
+            throw_incompatible_protocol();
+        }
+        PROGRAMS = &iter->second;
+    }
+    {
+        m_device_id = query_u32(PABB2_MESSAGE_OPCODE_DEVICE_IDENTIFIER);
+        m_logger.log("[MLC]: Device ID: 0x" + tostr_hex(m_device_id), COLOR_BLUE);
+        auto iter = PROGRAMS->find((uint8_t)m_device_id);
+        if (iter == PROGRAMS->end()){
+            m_logger.Logger::log(
+                "Unrecognized Program ID: (0x" + tostr_hex(m_device_id) + ") for this protocol version. "
+                "Compatibility is not guaranteed.",
+                COLOR_RED
+            );
+            iter = PROGRAMS->find(PABB_PID_UNSPECIFIED);
+            if (iter == PROGRAMS->end()){
+                throw_incompatible_protocol();
+            }
+        }else{
+            uint8_t minor_version = iter->second;
+            if (m_device_protocol % 100 < minor_version){
+                throw_incompatible_protocol();
+            }
+        }
+    }
+    m_logger.log(
+        "[MLC]: Remote Protocol: " + std::to_string(m_device_protocol) + " (compatible)",
+        COLOR_BLUE
+    );
+}
+void DeviceHandle::query_controller_list(){
+    std::string response = query_data(PABB2_MESSAGE_OPCODE_CONTROLLER_LIST);
+    if (response.size() % sizeof(pabb_ControllerID) != 0){
+        throw InternalProgramError(
+            &m_logger,
+            PA_CURRENT_FUNCTION,
+            "Controller list query expects a response length divisible by " + std::to_string(sizeof(pabb_ControllerID)) + "."
+        );
+    }
+
+    size_t length = response.size() / sizeof(pabb_ControllerID);
+    const pabb_ControllerID* list = (const pabb_ControllerID*)response.c_str();
+
+    std::string str;
+    bool first = true;
+    for (size_t c = 0; c < length; c++){
+        pabb_ControllerID id;
+        memcpy(&id, list + c, sizeof(pabb_ControllerID));
+        if (!first){
+            str += ", ";
+        }
+        first = false;
+        str += "0x" + tostr_hex(id);
+        if (SerialPABotBase::controller_is_valid(id)){
+            m_controller_list.emplace_back(SerialPABotBase::id_to_controller_type(id));
+        }
+    }
+    m_logger.Logger::log("Checking Controller List... (" + str + ")");
+}
+void DeviceHandle::query_command_queue(){
+    uint32_t command_queue_size = query_u32(PABB2_MESSAGE_OPCODE_CQ_CAPACITY);
+    m_logger.log("[MLC]: Command Queue Size: " + std::to_string(command_queue_size), COLOR_BLUE);
+
+    //  Clip the command queue sizes.
+    command_queue_size = std::max<uint32_t>(command_queue_size, 4);
+    command_queue_size = std::min<uint32_t>(command_queue_size, 255);
+
+    //  Don't let it get too large since we don't need it.
+    command_queue_size = std::min<uint8_t>(
+        (uint8_t)command_queue_size,
+        ControllerSettings::instance().COMMAND_QUEUE_LIMIT
+    );
+
+    m_logger.Logger::log("Setting queue size to: " + std::to_string(command_queue_size));
+    m_command_queue.set_command_queue_size((uint8_t)command_queue_size);
+}
+void DeviceHandle::set_logging_flag(uint32_t flag){
+    PABotBase2::Message_u32 message;
+    message.message_bytes = sizeof(message);
+    message.opcode = PABB2_MESSAGE_OPCODE_SET_LOGGING_FLAG;
+    message.data = flag;
+    send_request_with_no_response(message);
+}
+void DeviceHandle::connect(){
+    query_protocol();
+
+    m_device_firmware_version = query_u32(PABB2_MESSAGE_OPCODE_FIRMWARE_VERSION);
+    m_logger.log("[MLC]: Firmware Version: " + std::to_string(m_device_firmware_version), COLOR_BLUE);
+
+    m_device_name = query_data(PABB2_MESSAGE_OPCODE_DEVICE_NAME);
+    m_logger.log("[MLC]: Device Name: " + m_device_name, COLOR_BLUE);
+
+    set_logging_flag(ControllerSettings::instance().DEVICE_LOGGING_FLAG);
+    query_controller_list();
+    query_command_queue();
+}
+bool DeviceHandle::try_set_controller_type(
+    ControllerType controller_type,
+    bool clear_settings
+) noexcept{
+    PABotBase2::Message_u32 message;
+    message.message_bytes = sizeof(message);
+    message.opcode = clear_settings
+        ? PABB2_MESSAGE_OPCODE_RESET_TO_CONTROLLER
+        : PABB2_MESSAGE_OPCODE_CHANGE_CONTROLLER_MODE;
+
+    bool sent = false;
+    try{
+        message.data = SerialPABotBase::controller_type_to_id(controller_type);
+        sent = try_send_request_with_no_response(
+            message,
+            std::chrono::milliseconds(100)
+        );
+    }catch (...){}
+    return sent;
+}
+
+ControllerType DeviceHandle::refresh_controller_type(){
+    m_logger.log("Reading Controller Mode...");
+    uint32_t type_id = query_u32(PABB2_MESSAGE_OPCODE_READ_CONTROLLER_MODE);
+
+    ControllerType current_controller = SerialPABotBase::id_to_controller_type(type_id);
+    m_logger.log(
+        "Reading Controller Mode... Mode = " +
+        CONTROLLER_TYPE_STRINGS.get_string(current_controller)
+    );
+//    m_current_controller.store(current_controller, std::memory_order_release);
+    return current_controller;
+}
+
+void DeviceHandle::send_request_with_no_response(MessageHeader& request){
+    request.id = 0;
+    std::unique_lock<Mutex> lg(m_lock);
+    m_message_loggers.log_send(m_logger, LOG_EVERYTHING(), &request);
+    m_connection.reliable_send_all_or_nothing(
+        nullptr,
+        &request,
+        request.message_bytes
+    );
+}
+bool DeviceHandle::try_send_request_with_no_response(
+    MessageHeader& request,
+    WallDuration timeout
+) noexcept{
+    request.id = 0;
+    std::unique_lock<Mutex> lg(m_lock);
+    m_message_loggers.log_send(m_logger, LOG_EVERYTHING(), &request);
+    return m_connection.reliable_send_all_or_nothing(
+        nullptr,
+        &request,
+        request.message_bytes,
+        current_time() + timeout
+    );
+}
+uint8_t DeviceHandle::send_request_with_response(MessageHeader& request){
+    std::unique_lock<Mutex> lg(m_lock);
+    while (true){
+        throw_if_cancelled();
+
+        request.id = m_request_seqnum;
+
+        //  Wait until the slot is available.
+        auto iter = m_pending_requests.find(request.id);
+        if (iter != m_pending_requests.end()){
+            m_cv.wait(lg);
+            continue;
+        }
+
+        m_pending_requests[request.id];
+        m_request_seqnum++;
+        break;
+    }
+
+    m_message_loggers.log_send(m_logger, LOG_EVERYTHING(), &request);
+
+    try{
+        m_connection.reliable_send_all_or_nothing(
+            nullptr,
+            &request,
+            request.message_bytes
+        );
+    }catch (...){
+        m_pending_requests.erase(request.id);
+        m_request_seqnum--;
+        throw;
+    }
+
+    return request.id;
+}
+std::optional<uint8_t> DeviceHandle::try_send_request_with_response(
+    MessageHeader& request,
+    WallClock deadline
+){
+    std::map<uint8_t, std::string>::iterator iter;
+    std::unique_lock<Mutex> lg(m_lock);
+    while (true){
+        throw_if_cancelled();
+
+        request.id = m_request_seqnum;
+
+        //  Wait until the slot is available.
+        iter = m_pending_requests.find(request.id);
+        if (iter != m_pending_requests.end()){
+            if (m_cv.wait_until(lg, deadline) == std::cv_status::timeout){
+                return {};
+            }
+            continue;
+        }
+
+        m_pending_requests[request.id];
+        m_request_seqnum++;
+        break;
+    }
+
+    m_message_loggers.log_send(m_logger, LOG_EVERYTHING(), &request);
+
+    try{
+        if (m_connection.reliable_send_all_or_nothing(
+            nullptr,
+            &request,
+            request.message_bytes,
+            deadline
+        )){
+            return request.id;
+        }
+    }catch (...){
+        m_pending_requests.erase(iter);
+        m_request_seqnum--;
+        throw;
+    }
+
+    m_pending_requests.erase(iter);
+    m_request_seqnum--;
+    return {};
+}
+std::optional<uint8_t> DeviceHandle::try_send_request_with_response(
+    MessageHeader& request, WallDuration timeout
+){
+    WallClock deadline = current_time() + timeout;
+    return try_send_request_with_response(request, deadline);
+}
+std::string DeviceHandle::wait_for_request_response(
+    uint8_t id,
+    WallClock deadline
+){
+    std::unique_lock<Mutex> lg(m_lock);
+    while (true){
+        throw_if_cancelled();
+
+        //  Request doesn't exist.
+        auto iter = m_pending_requests.find(id);
+        if (iter == m_pending_requests.end()){
+            throw InternalProgramError(
+                &m_logger,
+                PA_CURRENT_FUNCTION,
+                "Attempted to wait for a request ID that doesn't exist."
+            );
+        }
+
+        if (iter->second.empty()){
+            if (m_cv.wait_until(lg, deadline) == std::cv_status::timeout){
+                break;
+            }
+            continue;
+        }
+
+        std::string str = std::move(iter->second);
+        m_pending_requests.erase(iter);
+        return str;
+    }
+    return "";
+}
+std::string DeviceHandle::wait_for_request_response(uint8_t id, WallDuration timeout){
+    WallClock deadline = timeout == WallDuration::max()
+        ? WallClock::max()
+        : current_time() + timeout;
+    return wait_for_request_response(id, deadline);
+}
+
+uint32_t DeviceHandle::query_u32(uint8_t opcode){
+    MessageHeader request;
+    request.message_bytes = sizeof(MessageHeader);
+    request.opcode = opcode;
+
+    send_request_with_response(request);
+
+    std::string response = wait_for_request_response(request.id);
+    if (response.size() != sizeof(Message_u32)){
+        throw InternalProgramError(
+            &m_logger,
+            PA_CURRENT_FUNCTION,
+            "Expected response length of: " + std::to_string(sizeof(Message_u32))
+        );
+    }
+
+    const Message_u32* msg = (const Message_u32*)response.c_str();
+    return msg->data;
+}
+std::string DeviceHandle::query_data(uint8_t opcode){
+    MessageHeader request;
+    request.message_bytes = sizeof(MessageHeader);
+    request.opcode = opcode;
+
+    send_request_with_response(request);
+
+    std::string response = wait_for_request_response(request.id);
+    if (response.size() < sizeof(MessageHeader)){
+        throw InternalProgramError(
+            &m_logger,
+            PA_CURRENT_FUNCTION,
+            "Response length of " + std::to_string(response.size()) + " is too short."
+        );
+    }
+
+    const MessageHeader* msg = (const MessageHeader*)response.c_str();
+    return std::string((const char*)(msg + 1), msg->message_bytes - sizeof(MessageHeader));
+}
+
+
+
+
+
+void DeviceHandle::on_recv(const void* data, size_t bytes){
+//    cout << "DeviceHandle::on_recv()" << endl;
+
+    if (m_stream_corrupted){
+        return;
+    }
+
+    m_buffer.insert(m_buffer.end(), (const char*)data, (const char*)data + bytes);
+
+    while (true){
+        //  Header is incomplete.
+        if (m_buffer.size() < sizeof(MessageHeader)){
+            return;
+        }
+
+        //  Message is incomplete.
+        uint16_t message_size;
+        std::copy(m_buffer.begin(), m_buffer.begin() + 2, (char*)&message_size);
+        if (message_size < sizeof(MessageHeader)){
+            m_logger.log("[MLC]: Corrupted Stream: Message Length =" + std::to_string(message_size), COLOR_RED);
+            m_stream_corrupted = true;
+            return;
+        }
+        if (m_buffer.size() < message_size){
+            return;
+        }
+
+        auto iter_s = m_buffer.begin();
+        auto iter_e = iter_s + message_size;
+        std::string message(iter_s, iter_e);
+        m_buffer.erase(iter_s, iter_e);
+
+        const MessageHeader* header = (const MessageHeader*)message.c_str();
+
+        m_message_loggers.log_recv(m_logger, LOG_EVERYTHING(), header);
+
+        //  Now we can process the message.
+        switch (header->opcode){
+        case PABB2_MESSAGE_OPCODE_INVALID:
+        case PABB2_MESSAGE_OPCODE_REQUEST_DROPPED:
+            continue;
+        case PABB2_MESSAGE_OPCODE_RET:
+        case PABB2_MESSAGE_OPCODE_RET_U32:
+        case PABB2_MESSAGE_OPCODE_RET_DATA:
+        case PABB2_MESSAGE_OPCODE_RET_U32_DATA:{
+            {
+                std::lock_guard<Mutex> lg(m_lock);
+                auto iter = m_pending_requests.find(header->id);
+                if (iter == m_pending_requests.end()){
+                    m_logger.log("[MLC]: Received request response for unknown ID: " + std::to_string(header->id));
+                    continue;
+                }
+                iter->second = std::move(message);
+            }
+            m_cv.notify_all();
+            continue;
+        }
+        case PABB2_MESSAGE_OPCODE_LOG_STRING:
+        case PABB2_MESSAGE_OPCODE_LOG_LABEL_H32:
+        case PABB2_MESSAGE_OPCODE_LOG_LABEL_U32:
+        case PABB2_MESSAGE_OPCODE_LOG_LABEL_I32:
+            continue;
+        case PABB2_MESSAGE_OPCODE_CQ_COMMAND_FINISHED:{
+            m_command_queue.report_command_finished(*header);
+            continue;
+        }
+        }
+
+        auto iter = m_message_handlers.find(header->opcode);
+        if (iter == m_message_handlers.end()){
+            return;
+        }
+
+//        MessageHandler& handler = *iter->second;
+//        handler.assert_is_valid(m_logger, header);
+//        handler.on_recv(m_logger, header);
+
+        iter->second(header);
+    }
+
+
+}
+
+
+
+
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/Controllers/PABotBase2/PABotBase2_DeviceHandle.h b/SerialPrograms/Source/Controllers/PABotBase2/PABotBase2_DeviceHandle.h
new file mode 100644
index 0000000000..ffbee53f0a
--- /dev/null
+++ b/SerialPrograms/Source/Controllers/PABotBase2/PABotBase2_DeviceHandle.h
@@ -0,0 +1,210 @@
+/*  PABotBase2 Device Handle
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Controllers_PABotBase2_DeviceHandle_H
+#define PokemonAutomation_Controllers_PABotBase2_DeviceHandle_H
+
+#include <string.h>
+#include <deque>
+#include <map>
+#include "Common/Cpp/Exceptions.h"
+#include "Common/Cpp/PrettyPrint.h"
+#include "Common/Cpp/Logging/AbstractLogger.h"
+#include "Common/Cpp/Concurrency/Mutex.h"
+#include "Common/Cpp/Concurrency/ConditionVariable.h"
+#include "Common/Cpp/CancellableScope.h"
+#include "Common/Cpp/StreamConnections/PushingStreamConnections.h"
+#include "Common/PABotBase2/PABotBase2_MessageProtocol.h"
+#include "Common/PABotBase2/PABotBase2CC_MessageDumper.h"
+#include "Controllers/ControllerTypes.h"
+#include "PABotBase2_CommandQueueManager.h"
+//#include "PABotBase2_MessageHandler.h"
+
+namespace PokemonAutomation{
+namespace PABotBase2{
+
+
+
+class DeviceHandle final : public CancellableScope, private StreamListener{
+public:
+    DeviceHandle(
+        CancellableScope* parent,
+        Logger& logger,
+        ReliableStreamConnectionPushing& connection
+    );
+    virtual ~DeviceHandle();
+    void add_message_handler(
+        uint8_t opcode,
+        std::function<void(const MessageHeader*)> handler
+    );
+
+    virtual bool cancel(std::exception_ptr exception) noexcept override;
+
+    void connect();
+    bool try_set_controller_type(
+        ControllerType controller_type,
+        bool clear_settings
+    ) noexcept;
+
+
+public:
+    Logger& logger() const{
+        return m_logger;
+    }
+    MessageLogger& message_logger(){
+        return m_message_loggers;
+    }
+    ReliableStreamConnectionPushing& connection(){
+        return m_connection;
+    }
+
+
+public:
+    uint32_t device_id() const{
+        return m_device_id;
+    }
+    const std::string& device_name() const{
+        return m_device_name;
+    }
+    uint32_t device_firmware_version() const{
+        return m_device_firmware_version;
+    }
+    uint32_t device_protocol_version() const{
+        return m_device_protocol;
+    }
+    const std::vector<ControllerType>& controller_list() const{
+        return m_controller_list;
+    }
+
+    CommandQueueManager& command_queue(){
+        return m_command_queue;
+    }
+
+
+public:
+    ControllerType refresh_controller_type();
+    uint32_t query_u32(uint8_t opcode);
+    std::string query_data(uint8_t opcode);
+
+    void send_request_with_no_response(MessageHeader& request);
+    bool try_send_request_with_no_response(
+        MessageHeader& request,
+        WallDuration timeout
+    ) noexcept;
+
+    uint8_t send_request_with_response(MessageHeader& request);
+
+    //  Returns {} if cannot send request.
+    //  Throws if connection is dead.
+    std::optional<uint8_t> try_send_request_with_response(
+        MessageHeader& request,
+        WallClock deadline = WallClock::min()
+    );
+    std::optional<uint8_t> try_send_request_with_response(
+        MessageHeader& request,
+        WallDuration timeout
+    );
+
+    std::string wait_for_request_response(
+        uint8_t id,
+        WallClock deadline = WallClock::max()
+    );
+    std::string wait_for_request_response(
+        uint8_t id,
+        WallDuration timeout
+    );
+
+    template <typename ResponseType, uint8_t response_opcode>
+    void wait_for_request_response(ResponseType& response, uint8_t id){
+        std::string raw = wait_for_request_response(id);
+        const MessageHeader* header = (const MessageHeader*)raw.data();
+        if (header->opcode != response_opcode){
+            throw SerialProtocolException(
+                m_logger, PA_CURRENT_FUNCTION,
+                "Received Incorrect Response Type: Expected = 0x" + tostr_hex(response_opcode) +
+                ", Actual = 0x" + tostr_hex(header->opcode)
+            );
+        }
+        if (header->message_bytes != sizeof(ResponseType)){
+            throw SerialProtocolException(
+                m_logger, PA_CURRENT_FUNCTION,
+                "Received Incorrect Response Size: Expected = " + std::to_string(sizeof(ResponseType)) +
+                ", Actual = " + std::to_string(header->message_bytes)
+            );
+        }
+        memcpy(&response, header, sizeof(ResponseType));
+    }
+    template <typename ResponseType, uint8_t response_opcode>
+    std::string wait_for_request_response_min_size(uint8_t id){
+        std::string raw = wait_for_request_response(id);
+        const MessageHeader* header = (const MessageHeader*)raw.data();
+        if (header->opcode != response_opcode){
+            throw SerialProtocolException(
+                m_logger, PA_CURRENT_FUNCTION,
+                "Received Incorrect Response Type: Expected = 0x" + tostr_hex(response_opcode) +
+                ", Actual = 0x" + tostr_hex(header->opcode)
+            );
+        }
+        if (header->message_bytes < sizeof(ResponseType)){
+            throw SerialProtocolException(
+                m_logger, PA_CURRENT_FUNCTION,
+                "Received Incorrect Response Size: Minimum = " + std::to_string(sizeof(ResponseType)) +
+                ", Actual = " + std::to_string(header->message_bytes)
+            );
+        }
+        return raw;
+    }
+
+
+public:
+    std::string dump_pending_requests() const;
+
+
+public:
+    void throw_incompatible_protocol();
+    void query_protocol();
+    void query_controller_list();
+    void query_command_queue();
+    void set_logging_flag(uint32_t flag);
+
+    virtual void on_recv(const void* data, size_t bytes) override;
+
+
+private:
+    Logger& m_logger;
+    ReliableStreamConnectionPushing& m_connection;
+    CommandQueueManager m_command_queue;
+
+    uint32_t m_device_protocol = 0;
+    uint32_t m_device_id = 0;
+    std::string m_device_name;
+    uint32_t m_device_firmware_version = 0;
+    std::vector<ControllerType> m_controller_list;
+
+//    std::atomic<ControllerType> m_controller_type;
+
+    uint8_t m_request_seqnum = 0;
+    bool m_stream_corrupted = false;
+
+    mutable Mutex m_lock;
+    ConditionVariable m_cv;
+    std::map<uint8_t, std::string> m_pending_requests;
+
+    std::deque<char> m_buffer;
+
+    MessageLogger m_message_loggers;
+    std::map<uint8_t, std::function<void(const MessageHeader*)>> m_message_handlers;
+};
+
+
+
+
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Controllers/PABotBase2/PABotBase2_MessageHandler.cpp b/SerialPrograms/Source/Controllers/PABotBase2/PABotBase2_MessageHandler.cpp
new file mode 100644
index 0000000000..78e8ce3d5d
--- /dev/null
+++ b/SerialPrograms/Source/Controllers/PABotBase2/PABotBase2_MessageHandler.cpp
@@ -0,0 +1,34 @@
+/*  PABotBase2 Message Handler
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Exceptions.h"
+#include "PABotBase2_MessageHandler.h"
+
+namespace PokemonAutomation{
+namespace PABotBase2{
+
+#if 0
+void MessageHandler::assert_size_eq(Logger& logger, uint16_t bytes, const MessageHeader* header) const{
+    if (header->message_bytes != bytes){
+        throw SerialProtocolException(
+            logger, PA_CURRENT_FUNCTION,
+            "Received Incorrect Response Size: Expected = " + std::to_string(bytes) + ", Actual = " + std::to_string(header->message_bytes)
+        );
+    }
+}
+void MessageHandler::assert_size_min(Logger& logger, uint16_t min_bytes, const MessageHeader* header) const{
+    if (header->message_bytes < min_bytes){
+        throw SerialProtocolException(
+            logger, PA_CURRENT_FUNCTION,
+            "Received too short Response: Minimum = " + std::to_string(min_bytes) + ", Actual = " + std::to_string(header->message_bytes)
+        );
+    }
+}
+#endif
+
+
+}
+}
diff --git a/SerialPrograms/Source/Controllers/PABotBase2/PABotBase2_MessageHandler.h b/SerialPrograms/Source/Controllers/PABotBase2/PABotBase2_MessageHandler.h
new file mode 100644
index 0000000000..7ae0f007fb
--- /dev/null
+++ b/SerialPrograms/Source/Controllers/PABotBase2/PABotBase2_MessageHandler.h
@@ -0,0 +1,46 @@
+/*  PABotBase2 Message Handler
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Controllers_PABotBase2_MessageHandler_H
+#define PokemonAutomation_Controllers_PABotBase2_MessageHandler_H
+
+#include "Common/Compiler.h"
+#include "Common/Cpp/Logging/AbstractLogger.h"
+#include "Common/PABotBase2/PABotBase2_MessageProtocol.h"
+
+namespace PokemonAutomation{
+namespace PABotBase2{
+
+
+#if 0
+class MessageHandler{
+public:
+    virtual ~MessageHandler() = default;
+    virtual void assert_is_valid(Logger& logger, const MessageHeader* header) const{}
+    virtual void on_recv(Logger& logger, const MessageHeader* header){}
+
+protected:
+    void assert_size_eq(Logger& logger, uint16_t bytes, const MessageHeader* header) const;
+    void assert_size_min(Logger& logger, uint16_t min_bytes, const MessageHeader* header) const;
+};
+
+
+template <uint8_t opcode, typename MessageType_t>
+class FixedLengthMesssageHandler : public MessageHandler{
+public:
+    using MessageType = MessageType_t;
+    static constexpr uint8_t OPCODE = opcode;
+
+    virtual void assert_is_valid(Logger& logger, const MessageHeader* header) const override{
+        assert_size_eq(logger, sizeof(MessageType), header);
+    }
+};
+#endif
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Controllers/PABotBase2/SerialPABotBase2_Connection.cpp b/SerialPrograms/Source/Controllers/PABotBase2/SerialPABotBase2_Connection.cpp
new file mode 100644
index 0000000000..c0823750ec
--- /dev/null
+++ b/SerialPrograms/Source/Controllers/PABotBase2/SerialPABotBase2_Connection.cpp
@@ -0,0 +1,353 @@
+/*  Serial Port (PABotBase) Connection
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifdef QT_CORE_LIB
+#include <QSerialPortInfo>
+#include <QMessageBox>
+#include "Controllers/SerialPort/SerialPortPollerQt.h"
+#endif
+#include "Common/Cpp/ScopeExit.h"
+#include "Common/Cpp/PrettyPrint.h"
+#include "Common/Cpp/PanicDump.h"
+#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "Common/Cpp/ColoredText.h"
+#include "Common/PABotBase2/ReliableConnectionLayer/PABotBase2_PacketProtocol.h"
+#include "CommonFramework/Globals.h"
+#include "CommonFramework/Logging/Logger.h"
+#include "CommonFramework/Tools/GlobalThreadPools.h"
+#include "SerialPABotBase2_Connection.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace SerialPABotBase{
+
+
+using namespace std::chrono_literals;
+
+
+
+
+SerialPABotBase2_Connection::SerialPABotBase2_Connection(
+    Logger& logger,
+    std::string name
+)
+    : m_logger(logger, LOG_EVERYTHING())
+    , m_device_name(std::move(name))
+{
+    set_status_line0("Not Connected", COLOR_RED);
+
+    m_connect_thread = GlobalThreadPools::unlimited_normal().dispatch_now_blocking([=, this]{
+        run_with_catch(
+            "SerialPABotBase_Connection::connect_thread_body()",
+            [=, this]{ connect_thread_body(); }
+        );
+    });
+};
+SerialPABotBase2_Connection::~SerialPABotBase2_Connection(){
+    SerialPABotBase2_Connection::cancel(nullptr);
+    m_device.reset();
+}
+bool SerialPABotBase2_Connection::cancel(std::exception_ptr exception) noexcept{
+    if (Connection::cancel(std::move(exception))){
+        return true;
+    }
+    m_status.store(Status::NOT_CONNECTED, std::memory_order_release);
+    m_connect_thread.wait_and_ignore_exceptions();
+
+    if (m_unreliable_connection == nullptr){
+        return false;
+    }
+
+    try{
+        bool dtr, rts;
+        m_unreliable_connection->get_control_state(dtr, rts);
+        if (rts){
+            rts = false;
+            m_unreliable_connection->set_control_state(dtr, rts);
+            naked_wait(50ms);
+            Mutex lock;
+            ConditionVariable cv;
+            WallClock deadline = current_time() + 50ms;
+            std::unique_lock<Mutex> lg(lock);
+            cv.wait_until(lg, deadline, [=]{ return current_time() >= deadline; });
+        }
+#if 0
+        if (!dtr){
+            dtr = false;
+            m_unreliable_connection->set_control_state(dtr, rts);
+            naked_wait(50ms);
+        }
+#endif
+        naked_wait(50ms);
+    }catch (...){
+//        cout << "exception thrown" << endl;
+    }
+
+    return false;
+}
+
+
+
+ControllerType SerialPABotBase2_Connection::refresh_controller_type(){
+    ControllerType ret = m_device->refresh_controller_type();
+    m_current_controller.store(ret, std::memory_order_release);
+    return ret;
+}
+
+
+
+void SerialPABotBase2_Connection::naked_wait(WallDuration duration){
+    Mutex lock;
+    ConditionVariable cv;
+    WallClock deadline = current_time() + duration;
+    std::unique_lock<Mutex> lg(lock);
+    cv.wait_until(lg, deadline, [=]{ return current_time() >= deadline; });
+}
+bool SerialPABotBase2_Connection::open_serial_port(){
+    {
+        std::string text = "Opening serial port...";
+        m_logger.log(text);
+        set_status_line0(text, COLOR_DARKGREEN);
+    }
+
+    if (cancelled()){
+        return false;
+    }
+
+
+    //  Validate the serial port.
+#ifdef QT_CORE_LIB
+    QSerialPortInfo info;
+    if (use_qt_ui()){
+        info = SerialPortPoller::instance().get_port(m_device_name);
+    }else{
+        info = QSerialPortInfo(QString::fromStdString(m_device_name));
+    }
+
+
+    if (use_qt_ui()){
+        //  Port is invalid.
+        if (info.isNull()){
+            std::string text = "Serial port " + m_device_name + " is invalid or not loaded.";
+            m_logger.log(text, COLOR_RED);
+            set_status_line0(text, COLOR_RED);
+            return false;
+        }
+
+        //  Prolific is banned
+        if (info.description().indexOf("Prolific") != -1){
+            QMessageBox box;
+            box.critical(
+                nullptr,
+                "Error",
+                "Cannot select Prolific controller.<br><br>"
+                "Prolific controllers do not work for Arduino and similar microcontrollers.<br>"
+                "You were warned of this in the setup instructions. Please buy a CP210x controller instead."
+            );
+            std::string text = "Cannot connect to Prolific controller.";
+            m_logger.log(text, COLOR_RED);
+            set_status_line0(text, COLOR_RED);
+            return false;
+        }
+    }
+#endif
+
+    if (cancelled()){
+        return false;
+    }
+
+    m_unreliable_connection = std::make_unique<SerialConnection>(
+        GlobalThreadPools::unlimited_realtime(),
+        m_device_name,
+        115200
+    );
+
+    return true;
+}
+bool SerialPABotBase2_Connection::try_connect_to_device(WallDuration timeout){
+    static const uint32_t BAUD_RATES[] = {
+        921600,
+        115200,
+    };
+
+    bool dtr;
+    bool rts;
+    m_unreliable_connection->get_control_state(dtr, rts);
+    m_logger.log("DTR = " + std::to_string(dtr) + ", RTS = " + std::to_string(rts));
+
+    WallClock deadline = current_time() + timeout;
+    do{
+        for (size_t c = 0; c < sizeof(BAUD_RATES) / sizeof(uint32_t); c++){
+            uint32_t baud_rate = BAUD_RATES[c];
+            m_logger.log("Trying baud " + tostr_u_commas(baud_rate) + " (with session ID)...");
+            m_unreliable_connection->set_baud_rate(baud_rate);
+            if (m_stream_connection->reset(std::chrono::milliseconds(100))){
+                return true;
+            }
+        }
+    }while (current_time() < deadline);
+
+    return false;
+}
+
+bool SerialPABotBase2_Connection::connect_to_device(){
+    //  ESP32 needs to avoid (DTR=0, RTS=1) as that will reset the board.
+    //  Pico debug probe wants DTS = 1 otherwise it shuts down the UART line.
+    //  When ESP32(-S3) is in bootloader, the only way to force it out is:
+    //      (DTS=0, RTS=1) -> (DTS=1, RTS=1)
+
+    bool dtr, rts;
+    m_unreliable_connection->get_control_state(dtr, rts);
+
+    //  Carefully bring the state to DTR=1, RTS=0.
+    if (rts){
+        wait_for(50ms);
+        rts = false;
+        m_unreliable_connection->set_control_state(dtr, rts);
+    }
+    if (!dtr){
+        wait_for(50ms);
+        dtr = true;
+        m_unreliable_connection->set_control_state(dtr, rts);
+    }
+
+    if (try_connect_to_device(3000ms)){
+        return true;
+    }
+
+    //  Now we can try this sequence to force the ESP32 out of bootloader.
+    m_logger.log("Forcing RTS -> true");
+    set_status_line0("ESP32 bootloader recovery...", COLOR_ORANGE);
+
+    m_unreliable_connection->set_control_state(false, true);
+    wait_for(50ms);
+    m_unreliable_connection->set_control_state(true, true);
+    wait_for(50ms);
+    m_unreliable_connection->set_control_state(true, false);
+
+    bool success = try_connect_to_device(2000ms);
+    //  Regardless of success or fail, set back to steady state: DTS=1, RTS=0
+    m_unreliable_connection->set_control_state(true, false);
+    if (success){
+        return true;
+    }
+
+    std::string str =
+        "Unable to connect to controller.<br>"
+        "Please make sure your microcontroller is flashed properly.<br>" +
+        make_text_url(ONLINE_DOC_URL_BASE + "SetupGuide/Reflash.html", "See documentation for more details.");
+    set_status_line0(str, COLOR_RED);
+    return false;
+}
+bool SerialPABotBase2_Connection::open_serial_connection(){
+    {
+        std::string text = "Opening up reliable channel...";
+        m_logger.log(text);
+        set_status_line0(text, COLOR_DARKGREEN);
+    }
+    m_stream_connection = std::make_unique<PABotBase2::ReliableStreamConnection>(
+        static_cast<CancellableScope*>(this),
+        m_logger, LOG_EVERYTHING(),
+        GlobalThreadPools::unlimited_realtime(),
+        *m_unreliable_connection,
+        std::chrono::milliseconds(80),
+        nullptr
+    );
+
+    {
+        std::string text = "Connecting...";
+        m_logger.log(text);
+        set_status_line0(text, COLOR_DARKGREEN);
+    }
+    if (!connect_to_device()){
+        return false;
+    }
+
+    m_stream_connection->send_request(PABB2_CONNECTION_OPCODE_ASK_VERSION);
+    m_stream_connection->wait_for_pending();
+    if (!m_stream_connection->remote_protocol_is_compatible()){
+        std::string str =
+            "Incompatible RSC protocol. Device: " + std::to_string(m_stream_connection->remote_protocol()) + "<br>"
+            "Please flash your microcontroller (e.g. ESP32, Pico W...)<br>"
+            "with the .bin/.uf2/.hex that came with this version of the program.<br>" +
+            make_text_url(ONLINE_DOC_URL_BASE + "SetupGuide/Reflash.html", "See documentation for more details.");
+        set_status_line0(str, COLOR_RED);
+        return false;
+    }
+    std::string error = m_stream_connection->error_string();
+    if (!error.empty()){
+        set_status_line0(error, COLOR_RED);
+        return false;
+    }
+
+    m_stream_connection->send_request(PABB2_CONNECTION_OPCODE_ASK_PACKET_SIZE);
+    m_stream_connection->wait_for_pending();
+
+    m_stream_connection->send_request(PABB2_CONNECTION_OPCODE_ASK_BUFFER_SLOTS);
+    m_stream_connection->wait_for_pending();
+
+    return true;
+}
+bool SerialPABotBase2_Connection::open_device_connection(){
+    {
+        std::string text = "Querying device...";
+        m_logger.log(text);
+        set_status_line0(text, COLOR_DARKGREEN);
+    }
+    {
+//        std::lock_guard<Mutex> lg(m_lock);
+        m_device = std::make_unique<PABotBase2::DeviceHandle>(
+            static_cast<CancellableScope*>(this),
+            m_logger, *m_stream_connection
+        );
+    }
+
+    m_device->connect();
+
+    set_status_line0(
+        m_device->device_name() + " (" + std::to_string(m_device->device_firmware_version()) + ")",
+        theme_friendly_darkblue()
+    );
+
+    m_controller_list = m_device->controller_list();
+    auto_select_controller_from_boot();
+    refresh_controller_type();
+
+    return true;
+}
+void SerialPABotBase2_Connection::connect_thread_body(){
+    bool ok = false;
+    ScopeExit scope([&]{
+        if (ok){
+            declare_ready();
+        }else{
+            declare_failed();
+        }
+    });
+    try{
+        if (!open_serial_port()){
+            return;
+        }
+        if (!open_serial_connection()){
+            return;
+        }
+        if (!open_device_connection()){
+            return;
+        }
+        ok = true;
+    }catch (Exception& e){
+        set_status_line0(e.message(), COLOR_RED);
+    }
+}
+
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/Controllers/PABotBase2/SerialPABotBase2_Connection.h b/SerialPrograms/Source/Controllers/PABotBase2/SerialPABotBase2_Connection.h
new file mode 100644
index 0000000000..61ab4af666
--- /dev/null
+++ b/SerialPrograms/Source/Controllers/PABotBase2/SerialPABotBase2_Connection.h
@@ -0,0 +1,62 @@
+/*  Serial Port (PABotBase2) Connection
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Controllers_SerialPABotBase2_Connection_H
+#define PokemonAutomation_Controllers_SerialPABotBase2_Connection_H
+
+#include "Common/Cpp/Concurrency/AsyncTask.h"
+#include "Common/Cpp/SerialConnection/SerialConnection.h"
+#include "Common/PABotBase2/ReliableConnectionLayer/PABotBase2CC_ReliableStreamConnection.h"
+#include "Controllers/SerialPort/SerialLogger.h"
+#include "Controllers/PABotBase2/PABotBase2_Connection.h"
+
+namespace PokemonAutomation{
+namespace SerialPABotBase{
+
+
+
+class SerialPABotBase2_Connection final : public PABotBase2::Connection{
+public:
+    SerialPABotBase2_Connection(
+        Logger& logger,
+        std::string name
+    );
+    ~SerialPABotBase2_Connection();
+
+    virtual bool cancel(std::exception_ptr exception = nullptr) noexcept override;
+
+
+public:
+    ControllerType refresh_controller_type();
+
+
+private:
+    void naked_wait(WallDuration duration);
+
+    bool open_serial_port();
+    bool try_connect_to_device(WallDuration timeout);
+    bool connect_to_device();
+    bool open_serial_connection();
+    bool open_device_connection();
+    void connect_thread_body();
+
+
+private:
+    SerialLogger m_logger;
+    std::string m_device_name;
+
+//    Mutex m_lock;
+    AsyncTask m_connect_thread;
+    std::unique_ptr<SerialConnection> m_unreliable_connection;
+    std::unique_ptr<PABotBase2::ReliableStreamConnection> m_stream_connection;
+};
+
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Controllers/PABotBase2/SerialPABotBase2_Descriptor.cpp b/SerialPrograms/Source/Controllers/PABotBase2/SerialPABotBase2_Descriptor.cpp
new file mode 100644
index 0000000000..068816d549
--- /dev/null
+++ b/SerialPrograms/Source/Controllers/PABotBase2/SerialPABotBase2_Descriptor.cpp
@@ -0,0 +1,139 @@
+/*  Serial Port (PABotBase2) Interface
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Json/JsonValue.h"
+#include "Controllers/ControllerTypeStrings.h"
+#ifdef QT_CORE_LIB
+#include "Controllers/SerialPort/SerialPortPollerQt.h"
+#endif
+
+#include "Controllers/StandardHid/StandardHid_Keyboard_PABotBase2.h"
+#include "NintendoSwitch/Controllers/PABotBase2/NintendoSwitch_PABotBase2_ProController.h"
+#include "NintendoSwitch/Controllers/PABotBase2/NintendoSwitch_PABotBase2_Joycon.h"
+#include "NintendoSwitch/Controllers/PABotBase2/NintendoSwitch_PABotBase2_WiredController.h"
+
+#include "SerialPABotBase2_Connection.h"
+#include "SerialPABotBase2_Descriptor.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+
+template class InterfaceType_t<SerialPABotBase::SerialPABotBase2_Descriptor>;
+
+namespace SerialPABotBase{
+
+
+
+
+bool SerialPABotBase2_Descriptor::operator==(const ControllerDescriptor& x) const{
+    if (typeid(*this) != typeid(x)){
+        return false;
+    }
+    return m_name == static_cast<const SerialPABotBase2_Descriptor&>(x).m_name;
+}
+
+
+std::string SerialPABotBase2_Descriptor::display_name() const{
+    if (m_name.empty()){
+        return "(none)";
+    }
+    return m_name;
+}
+JsonValue SerialPABotBase2_Descriptor::to_json() const{
+    return m_name;
+}
+void SerialPABotBase2_Descriptor::load_json(const JsonValue& json){
+    const std::string* name = json.to_string();
+    if (name == nullptr || name->empty()){
+        return;
+    }
+    m_name = *name;
+}
+
+std::unique_ptr<ControllerConnection> SerialPABotBase2_Descriptor::open_connection(Logger& logger) const{
+#ifdef QT_CORE_LIB
+    SerialPortPoller::instance().begin_refresh_now();
+#endif
+    if (m_name.empty()){
+        return nullptr;
+    }
+    return std::unique_ptr<ControllerConnection>(
+        new SerialPABotBase2_Connection(logger, m_name)
+    );
+}
+std::unique_ptr<AbstractController> SerialPABotBase2_Descriptor::make_controller(
+    Logger& logger,
+    ControllerConnection& connection,
+    ControllerType controller_type
+) const{
+    switch (controller_type){
+    case ControllerType::HID_Keyboard:
+        return std::unique_ptr<AbstractController>(
+            new PokemonAutomation::StandardHid::PABotBase2_Keyboard(
+                logger,
+                static_cast<PABotBase2::Connection&>(connection)
+            )
+        );
+    case ControllerType::NintendoSwitch_WiredController:
+    case ControllerType::NintendoSwitch2_WiredController:
+        return std::unique_ptr<AbstractController>(
+            new PokemonAutomation::NintendoSwitch::PABotBase2_WiredController(
+                logger,
+                static_cast<PABotBase2::Connection&>(connection)
+            )
+        );
+
+    case ControllerType::NintendoSwitch_WiredProController:
+    case ControllerType::NintendoSwitch_WirelessProController:
+        return std::unique_ptr<AbstractController>(
+            new PokemonAutomation::NintendoSwitch::PABotBase2_ProController(
+                logger,
+                static_cast<PABotBase2::Connection&>(connection),
+                controller_type
+            )
+        );
+
+    case ControllerType::NintendoSwitch_WiredLeftJoycon:
+    case ControllerType::NintendoSwitch_WirelessLeftJoycon:
+        return std::unique_ptr<AbstractController>(
+            new PokemonAutomation::NintendoSwitch::PABotBase2_LeftJoycon(
+                logger,
+                static_cast<PABotBase2::Connection&>(connection),
+                controller_type
+            )
+        );
+
+    case ControllerType::NintendoSwitch_WiredRightJoycon:
+    case ControllerType::NintendoSwitch_WirelessRightJoycon:
+        return std::unique_ptr<AbstractController>(
+            new PokemonAutomation::NintendoSwitch::PABotBase2_RightJoycon(
+                logger,
+                static_cast<PABotBase2::Connection&>(connection),
+                controller_type
+            )
+        );
+
+    default:;
+    }
+
+    logger.log(
+        std::string("Unsupported Controller Type: ") + CONTROLLER_TYPE_STRINGS.get_string(controller_type),
+        COLOR_RED
+    );
+    return nullptr;
+}
+
+
+
+
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/Controllers/PABotBase2/SerialPABotBase2_Descriptor.h b/SerialPrograms/Source/Controllers/PABotBase2/SerialPABotBase2_Descriptor.h
new file mode 100644
index 0000000000..f87c63c83c
--- /dev/null
+++ b/SerialPrograms/Source/Controllers/PABotBase2/SerialPABotBase2_Descriptor.h
@@ -0,0 +1,56 @@
+/*  Serial Port (PABotBase2) Interface
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Controllers_SerialPABotBase2_Descriptor_H
+#define PokemonAutomation_Controllers_SerialPABotBase2_Descriptor_H
+
+#include "Controllers/ControllerDescriptor.h"
+
+namespace PokemonAutomation{
+namespace SerialPABotBase{
+
+
+
+class SerialPABotBase2_Descriptor : public UiState<const SerialPABotBase2_Descriptor&, ControllerDescriptor>{
+public:
+    static constexpr ControllerInterface INTERFACE_NAME = ControllerInterface::SerialPABotBase2;
+
+
+public:
+    SerialPABotBase2_Descriptor()
+        : UiState<const SerialPABotBase2_Descriptor&, ControllerDescriptor>(INTERFACE_NAME)
+    {}
+    SerialPABotBase2_Descriptor(std::string name)
+        : UiState<const SerialPABotBase2_Descriptor&, ControllerDescriptor>(INTERFACE_NAME)
+        , m_name(std::move(name))
+    {}
+
+    const std::string& name() const{
+        return m_name;
+    }
+
+    virtual bool operator==(const ControllerDescriptor& x) const override;
+    virtual std::string display_name() const override;
+
+    virtual JsonValue to_json() const override;
+    virtual void load_json(const JsonValue& json) override;
+
+    virtual std::unique_ptr<ControllerConnection> open_connection(Logger& logger) const override;
+    virtual std::unique_ptr<AbstractController> make_controller(
+        Logger& logger,
+        ControllerConnection& connection,
+        ControllerType controller_type
+    ) const override;
+
+private:
+    std::string m_name;
+};
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Controllers/PABotBase2/SerialPABotBase2_SelectorWidget.cpp b/SerialPrograms/Source/Controllers/PABotBase2/SerialPABotBase2_SelectorWidget.cpp
new file mode 100644
index 0000000000..1df5607b2b
--- /dev/null
+++ b/SerialPrograms/Source/Controllers/PABotBase2/SerialPABotBase2_SelectorWidget.cpp
@@ -0,0 +1,167 @@
+/*  SerialPABotBase2 Selector Widget
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Filesystem/Filesystem.h"
+#include "SerialPABotBase2_Descriptor.h"
+#include "SerialPABotBase2_SelectorWidget.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+
+template class RegisterUiStateQtWidget<SerialPABotBase::SerialPABotBase2_SelectorWidget>;
+
+namespace SerialPABotBase{
+
+
+
+bool filter_serial_port(const QSerialPortInfo& port){
+    //  Exclude ports that are not backed by a USB device. All supported
+    //  controllers (Arduino, ESP32, Pico, USB-UART adapters) enumerate over
+    //  USB, so Qt can read a USB vendor ID for them from the OS device tree.
+    //  Non-USB ports have no vendor ID, e.g.:
+    //    - macOS: "cu.debug-console" (built-in SoC UART),
+    //      "cu.Bluetooth-Incoming-Port", and "cu.<DeviceName>" Bluetooth
+    //      serial ports created for paired devices like headphones.
+    //    - Windows: legacy motherboard ports like COM1 and
+    //      "Standard Serial over Bluetooth link" ports.
+    //    - Linux: onboard UARTs like /dev/ttyS* and Bluetooth /dev/rfcomm*.
+    if (!port.hasVendorIdentifier()){
+        return false;
+    }
+
+#if defined(__APPLE__)
+    // exlude tty
+    if (port.portName().startsWith("tty.")){
+        return false;
+    }
+#endif
+
+#if defined(__linux__)
+    const std::string path = port.systemLocation().toStdString();
+
+    // Exclude devices that don't have Read/Write access
+    if (!Filesystem::is_readable(Filesystem::Path(path)) ||
+        !Filesystem::is_writable(Filesystem::Path(path))){
+        return false;
+    }
+#endif
+
+    return true;
+}
+
+
+
+
+SerialPABotBase2_SelectorWidget::SerialPABotBase2_SelectorWidget(
+    ControllerSelectorWidget& parent,
+    const ControllerDescriptor* current
+)
+    : NoWheelCompactComboBox(&parent)
+    , m_parent(parent)
+{
+    SerialPortPoller::instance().begin_refresh_now();
+
+//    cout << "SerialPABotBase(): " << current << endl;
+    this->setMaxVisibleItems(32);
+//    this->setPlaceholderText("invalid/loading...");
+//    this->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
+
+    if (current == nullptr || current->interface_type != ControllerInterface::SerialPABotBase2){
+        std::shared_ptr<ControllerDescriptor> descriptor =
+            parent.session().option().get_descriptor_from_cache(ControllerInterface::SerialPABotBase2);
+        if (!descriptor){
+            descriptor.reset(new SerialPABotBase2_Descriptor());
+        }
+        parent.session().set_device(descriptor);
+    }
+
+    refresh_devices(SerialPortPoller::instance().ports());
+
+    connect(
+        this, static_cast<void(QComboBox::*)(int)>(&QComboBox::activated),
+        &parent, [this, &parent](int index){
+            if (index < 0){
+                return;
+            }
+            index = std::min(index, (int)m_ports.size() - 1);
+            std::shared_ptr<ControllerDescriptor>& selected = m_ports[index];
+
+            std::shared_ptr<ControllerDescriptor> current = parent.session().descriptor();
+            if (*current == *selected){
+                return;
+            }
+
+            parent.session().set_device(selected);
+            refresh_devices(SerialPortPoller::instance().ports());
+        }
+    );
+
+    SerialPortPoller::instance().add_listener(*this);
+}
+
+void SerialPABotBase2_SelectorWidget::refresh_devices(const QList<QSerialPortInfo>& ports){
+//    cout << "SerialPABotBase2_SelectorWidget::refresh_devices()" << endl;
+//    SerialPortPoller::instance().begin_refresh_now();
+//    cout << "Current = " << width() << " x " << height() << endl;
+//    cout << "sizeHint = " << sizeHint().width() << " x " << sizeHint().height() << endl;
+//    cout << "minimumContentsLength = " << this->minimumContentsLength() << endl;
+
+    m_ports.clear();
+    this->clear();
+
+//    cout << "SerialPABotBase_SelectorWidget::refresh_devices()" << endl;
+
+
+    m_ports.emplace_back(new SerialPABotBase2_Descriptor());
+    for (const QSerialPortInfo& port : ports){
+        if (filter_serial_port(port)){
+            m_ports.emplace_back(
+                new SerialPABotBase2_Descriptor(port.portName().toStdString())
+            );
+        }
+    }
+
+//    size_t width = 6;
+    int index = -1;
+    int c = 0;
+    for (const auto& port : m_ports){
+        QString display_name = QString::fromStdString(port->display_name());
+//        width = std::max<size_t>(width, display_name.size());
+        this->addItem(display_name);
+        if (*m_parent.session().descriptor() == *m_ports[c]){
+            index = c;
+        }
+        c++;
+    }
+
+    if (this->count() > this->maxVisibleItems()){
+//        width++;
+    }
+//    setMinimumContentsLength((int)width);
+    setCurrentIndex(index);
+
+    if (index < 0){
+        return;
+    }
+
+    //  If the program boots up faster than it can read the serial ports, the
+    //  controller will fail to connect. Once the serial poller finishes and
+    //  pushes a refresh, we return here.
+    //  If the port is now valid, but failed to connect before, reset it.
+    ControllerSession& session = m_parent.session();
+    if (session.connection_status() == ControllerConnection::Status::FAILED_TO_CONNECT){
+        session.reset(false);
+    }
+}
+
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/Controllers/PABotBase2/SerialPABotBase2_SelectorWidget.h b/SerialPrograms/Source/Controllers/PABotBase2/SerialPABotBase2_SelectorWidget.h
new file mode 100644
index 0000000000..ddf02a64f8
--- /dev/null
+++ b/SerialPrograms/Source/Controllers/PABotBase2/SerialPABotBase2_SelectorWidget.h
@@ -0,0 +1,71 @@
+/*  SerialPABotBase2 Selector Widget
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Controllers_SerialPABotBase2_SelectorWidget_H
+#define PokemonAutomation_Controllers_SerialPABotBase2_SelectorWidget_H
+
+#include <QSerialPortInfo>
+#include "Common/Qt/UiStateQtWidget.h"
+#include "Common/Qt/NoWheelComboBox.h"
+#include "Controllers/ControllerDescriptor.h"
+#include "Controllers/ControllerSelectorWidget.h"
+#include "Controllers/SerialPort/SerialPortPollerQt.h"
+#include "SerialPABotBase2_Descriptor.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace SerialPABotBase{
+
+
+
+
+class SerialPABotBase2_SelectorWidget
+    : public NoWheelCompactComboBox
+    , public UiComponentQtWidget
+    , public SerialPortPoller::Listener
+{
+public:
+    using ParentState = const SerialPABotBase2_Descriptor;
+
+    SerialPABotBase2_SelectorWidget(
+        QWidget& parent,
+        const ParentState& current
+    )
+        : SerialPABotBase2_SelectorWidget(static_cast<ControllerSelectorWidget&>(parent), &current)
+    {}
+    SerialPABotBase2_SelectorWidget(
+        ControllerSelectorWidget& parent,
+        const ControllerDescriptor* current
+    );
+    ~SerialPABotBase2_SelectorWidget(){
+        SerialPortPoller::instance().remove_listener(*this);
+    }
+
+    void refresh_devices(const QList<QSerialPortInfo>& ports);
+
+    virtual QWidget& widget() override{
+        return *this;
+    }
+    virtual void on_serial_ports_changed(const QList<QSerialPortInfo>& ports) override{
+        refresh_devices(ports);
+    }
+
+
+private:
+    ControllerSelectorWidget& m_parent;
+    std::vector<std::shared_ptr<ControllerDescriptor>> m_ports;
+};
+
+
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Controllers/RumbleListener.h b/SerialPrograms/Source/Controllers/RumbleListener.h
new file mode 100644
index 0000000000..dfa2c77d6f
--- /dev/null
+++ b/SerialPrograms/Source/Controllers/RumbleListener.h
@@ -0,0 +1,59 @@
+/*  Rumble Listener
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_RumbleListener_H
+#define PokemonAutomation_RumbleListener_H
+
+#include "CommonTools/InferenceCallbacks/InferenceCallback.h"
+
+namespace PokemonAutomation{
+
+
+struct RumbleListener{
+    virtual void on_rumble(double magnitude) = 0;
+};
+
+
+template <typename ControllerType>
+class RumbleWatcher : public ExternalInferenceCallback, public RumbleListener{
+public:
+    //  For now, the magnitudes are all over the place and inconsistent.
+    //  So the only thing this can really do is detect is *any* rumble is
+    //  happening. The magnitudes are trash.
+    RumbleWatcher(ControllerType& controller, double magnitude_threshold = 2)
+        : ExternalInferenceCallback("RumbleWatcher")
+        , m_controller(controller)
+        , m_magnitude_threshold(magnitude_threshold)
+        , m_max_magnitude(0)
+    {
+        controller.add_listener(*this);
+    }
+    ~RumbleWatcher(){
+        m_controller.remove_listener(*this);
+    }
+
+    double max_magnitude() const{
+        return m_max_magnitude;
+    }
+
+    virtual void on_rumble(double magnitude) override{
+        m_max_magnitude = std::max(m_max_magnitude, magnitude);
+        if (magnitude > m_magnitude_threshold){
+            cancel(nullptr);
+        }
+    }
+
+private:
+    ControllerType& m_controller;
+    const double m_magnitude_threshold;
+    double m_max_magnitude;
+};
+
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/Controllers/Schedulers/ControllerWithScheduler.h b/SerialPrograms/Source/Controllers/Schedulers/ControllerWithScheduler.h
new file mode 100644
index 0000000000..bab312ee92
--- /dev/null
+++ b/SerialPrograms/Source/Controllers/Schedulers/ControllerWithScheduler.h
@@ -0,0 +1,106 @@
+/*  Controller with Scheduler
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *      This is a helper class for all the common methods for a controller that
+ *  uses the SuperscalarScheduler.
+ *
+ */
+
+#ifndef PokemonAutomation_Controllers_ControllerWithScheduler_H
+#define PokemonAutomation_Controllers_ControllerWithScheduler_H
+
+#include "Common/Cpp/Concurrency/Mutex.h"
+#include "Common/Cpp/CancellableScope.h"
+#include "Common/Cpp/RecursiveThrottler.h"
+#include "SuperscalarScheduler.h"
+
+namespace PokemonAutomation{
+
+
+
+class ControllerWithScheduler{
+public:
+    ControllerWithScheduler(
+        Logger& logger,
+        RecursiveThrottler& logging_throttler
+    )
+        : m_logger(logger)
+        , m_logging_throttler(logging_throttler)
+        , m_scheduler(logger, Milliseconds(4))
+    {}
+
+
+public:
+    //  Superscalar Commands (the "ssf" framework)
+
+    void issue_barrier(Cancellable* cancellable){
+        SuperscalarScheduler::Schedule schedule;
+        std::lock_guard<Mutex> lg0(m_issue_lock);
+        {
+            std::lock_guard<Mutex> lg1(m_state_lock);
+            m_scheduler.issue_wait_for_all(schedule);
+        }
+        execute_schedule(cancellable, schedule);
+        if (m_logging_throttler){
+            m_logger.log("issue_barrier()", COLOR_DARKGREEN);
+        }
+    }
+    void issue_nop(Cancellable* cancellable, Milliseconds duration){
+        SuperscalarScheduler::Schedule schedule;
+        std::lock_guard<Mutex> lg0(m_issue_lock);
+        {
+            std::lock_guard<Mutex> lg1(m_state_lock);
+            if (cancellable){
+                cancellable->throw_if_cancelled();
+            }
+            m_scheduler.issue_nop(schedule, WallDuration(duration));
+        }
+        execute_schedule(cancellable, schedule);
+        if (m_logging_throttler){
+            m_logger.log(
+                "issue_nop(): duration = " + std::to_string(duration.count()) + "ms",
+                COLOR_DARKGREEN
+            );
+        }
+    }
+
+
+protected:
+    virtual void execute_state(
+        Cancellable* cancellable,
+        const SuperscalarScheduler::ScheduleEntry& entry
+    ) = 0;
+    virtual void execute_schedule(
+        Cancellable* cancellable,
+        const SuperscalarScheduler::Schedule& schedule
+    ){
+        for (const SuperscalarScheduler::ScheduleEntry& entry : schedule){
+            execute_state(cancellable, entry);
+        }
+    }
+
+
+protected:
+    Logger& m_logger;
+//    std::atomic<size_t> m_logging_suppress;
+    RecursiveThrottler& m_logging_throttler;
+
+    SuperscalarScheduler m_scheduler;
+
+    //  If you need both of these locks, always acquire "m_issue_lock" first.
+
+    //  This lock makes sure that only one command is issued at a time. It can
+    //  be held for long periods of time if the command queue is full.
+    Mutex m_issue_lock;
+
+    //  This lock protects the state/fields of this class and subclasses.
+    //  This lock is never held for a long time.
+    Mutex m_state_lock;
+};
+
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/Controllers/Schedulers/SuperscalarScheduler.cpp b/SerialPrograms/Source/Controllers/Schedulers/SuperscalarScheduler.cpp
new file mode 100644
index 0000000000..e8973eb027
--- /dev/null
+++ b/SerialPrograms/Source/Controllers/Schedulers/SuperscalarScheduler.cpp
@@ -0,0 +1,279 @@
+/*  Superscalar Scheduler
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+//#include "Common/Cpp/Exceptions.h"
+#include "Common/Cpp/Time.h"
+#include "SuperscalarScheduler.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+
+
+SuperscalarScheduler::SuperscalarScheduler(
+    Logger& logger,
+    WallDuration flush_threshold
+)
+    : m_logger(logger)
+    , m_flush_threshold(flush_threshold)
+{
+    clear();
+}
+
+
+void SuperscalarScheduler::clear() noexcept{
+//    WriteSpinLock lg(m_lock);
+//    m_logger.log("Clearing schedule...");
+    WallClock now = current_time();
+    m_local_start = now;
+    m_local_last_activity = now;
+    m_device_issue_time = now;
+    m_device_sent_time = now;
+    m_max_free_time = now;
+    m_state_changes.clear();
+    m_live_commands.clear();
+    m_pending_clear = false;
+}
+
+SuperscalarScheduler::State SuperscalarScheduler::current_live_commands(){
+    WallClock device_sent_time = m_device_sent_time;
+    State ret;
+//    cout << "device_sent_time = " << std::chrono::duration_cast<Milliseconds>(device_sent_time - m_local_start).count() << endl;
+    for (auto& item : m_live_commands){
+//        cout << "busy = " << std::chrono::duration_cast<Milliseconds>(item.second.busy_time - m_local_start).count()
+//             << ", done = " << std::chrono::duration_cast<Milliseconds>(item.second.done_time - m_local_start).count() << endl;
+        if (item.second.busy_time <= device_sent_time && device_sent_time < item.second.done_time){
+            ret.emplace_back(item.second.command);
+        }
+    }
+    return ret;
+}
+void SuperscalarScheduler::clear_finished_commands(){
+    WallClock device_sent_time = m_device_sent_time;
+    for (auto iter = m_live_commands.begin(); iter != m_live_commands.end();){
+//        cout << "device_sent_time = " << device_sent_time << ", free_time = " << iter->second.free_time << endl;
+        if (device_sent_time >= iter->second.free_time){
+            iter = m_live_commands.erase(iter);
+        }else{
+            ++iter;
+        }
+    }
+}
+bool SuperscalarScheduler::iterate_schedule(Schedule& schedule){
+//    cout << "----------------------------> " << m_state_changes.size() << endl;
+//    cout << "m_device_sent_time = " << std::chrono::duration_cast<Milliseconds>(m_device_sent_time - m_local_start) << endl;
+
+    if (m_state_changes.empty()){
+//        cout << "State is empty." << endl;
+        m_device_sent_time = m_device_issue_time;
+        return false;
+    }
+
+    auto iter = m_state_changes.begin();
+
+    WallClock next_state_change;
+    if (m_device_sent_time < *iter){
+        next_state_change = *iter;
+    }else{
+        auto next = iter;
+        ++next;
+        next_state_change = next == m_state_changes.end()
+            ? m_device_issue_time
+            : *next;
+    }
+
+    //  Things get complicated if we overshoot the issue time.
+    if (next_state_change > m_device_issue_time){
+//        m_logger.log("SuperscalarScheduler: Overshoot due to unfinished early return.", COLOR_RED);
+        next_state_change = m_device_issue_time;
+    }
+
+    WallDuration duration = next_state_change - m_device_sent_time;
+    if (duration == WallDuration::zero()){
+        //  This happens when the command has a delay of zero. A delay of zero
+        //  is almost always immediately followed by another command that is
+        //  intended to execute simultaneously. Thus we do not attempt to
+        //  execute the schedule any further.
+//        m_logger.log("SuperscalarScheduler: Scheduler is stalled.", COLOR_RED);
+        return false;
+    }
+
+    //  Compute the resource state at this timestamp.
+    std::vector<std::shared_ptr<const SchedulerResource>> state = current_live_commands();
+    clear_finished_commands();
+
+    m_device_sent_time = next_state_change;
+    if (next_state_change > *iter){
+        m_state_changes.erase(iter);
+    }
+
+    ScheduleEntry& entry = schedule.emplace_back();
+    entry.duration = duration;
+    entry.state = std::move(state);
+
+//    WriteSpinLock lg(m_lock);
+
+    WallClock now = current_time();
+    m_local_last_activity = now;
+
+    //  If we are not dangling anything, we can return now.
+    if (m_device_sent_time >= m_device_issue_time){
+        return true;
+    }
+
+#if 1
+    //
+    //  We are currently dangling a command. We don't know whether the current
+    //  ongoing commands will run out, or if something new will join them in the
+    //  near future.
+    //
+    //  If it's been long enough since the last issue, we can assume that
+    //  nothing will join and thus can gap. (We do require that dangling
+    //  commands be resolved promptly or they may run out.)
+    //
+    //  Thus we can fast forward whatever is scheduled into the future.
+    //
+    WallDuration time_since_last_activity = now - m_local_last_activity;
+    if (time_since_last_activity > m_flush_threshold){
+        m_logger.log("SuperscalarScheduler: A dangling early-return issue has gapped.", COLOR_RED);
+        m_device_issue_time += time_since_last_activity;
+
+        //  Since we're gapping, we might as well gap a bit more to we don't
+        //  re-enter here so quickly.
+        m_device_issue_time += m_flush_threshold;
+
+        m_max_free_time = std::max(m_max_free_time, m_device_issue_time);
+    }
+
+#endif
+
+    return true;
+}
+void SuperscalarScheduler::process_schedule(Schedule& schedule){
+    //  Any exception is either an unrecoverable error, or an async-cancel.
+    //  Both cases should clear the scheduler.
+    try{
+        while (iterate_schedule(schedule));
+    }catch (...){
+        clear();
+        throw;
+    }
+}
+
+void SuperscalarScheduler::issue_wait_for_all(Schedule& schedule){
+    if (m_pending_clear){
+        clear();
+        return;
+    }
+//    m_logger.log("issue_wait_for_all(): states = " + std::to_string(m_state_changes.size()), COLOR_DARKGREEN);
+//    cout << "issue_wait_for_all(): " << m_state_changes.size() << endl;
+//    cout << "issue_time = " << std::chrono::duration_cast<Milliseconds>((m_device_issue_time - m_local_start)).count()
+//         << ", sent_time = " << std::chrono::duration_cast<Milliseconds>((m_device_sent_time - m_local_start)).count()
+//         << ", max_free_time = " << std::chrono::duration_cast<Milliseconds>((m_max_free_time - m_local_start)).count()
+//         << endl;
+    m_device_issue_time = std::max(m_device_issue_time, m_max_free_time);
+    m_max_free_time = m_device_issue_time;
+    process_schedule(schedule);
+}
+void SuperscalarScheduler::issue_nop(Schedule& schedule, WallDuration delay){
+    if (delay <= WallDuration::zero()){
+        return;
+    }
+    if (m_pending_clear){
+        clear();
+    }
+//    cout << "issue_nop(): " << m_state_changes.size() << endl;
+//    cout << "issue_time = " << std::chrono::duration_cast<Milliseconds>((m_device_issue_time - m_local_start)).count()
+//         << ", sent_time = " << std::chrono::duration_cast<Milliseconds>((m_device_sent_time - m_local_start)).count()
+//         << ", max_free_time = " << std::chrono::duration_cast<Milliseconds>((m_max_free_time - m_local_start)).count()
+//         << endl;
+    WallClock next_issue_time = m_device_issue_time + delay;
+    m_state_changes.insert(next_issue_time);
+    m_device_issue_time = next_issue_time;
+    m_max_free_time = std::max(m_max_free_time, m_device_issue_time);
+    m_local_last_activity = current_time();
+    process_schedule(schedule);
+}
+void SuperscalarScheduler::issue_wait_for_resource(Schedule& schedule, size_t resource_id){
+    if (m_pending_clear){
+        clear();
+        return;
+    }
+//    cout << "wait_for_resource()" << endl;
+//    cout << "issue_time = " << std::chrono::duration_cast<Milliseconds>((m_device_issue_time - m_local_start)).count()
+//         << ", sent_time = " << std::chrono::duration_cast<Milliseconds>((m_device_sent_time - m_local_start)).count()
+//         << ", free_time = " << std::chrono::duration_cast<Milliseconds>((resource.m_free_time - m_local_start)).count()
+//         << endl;
+
+    //  Resource is not ready yet. Stall until it is.
+    auto iter = m_live_commands.find(resource_id);
+    if (iter != m_live_commands.end() && m_device_sent_time < iter->second.free_time){
+        m_device_issue_time = iter->second.free_time;
+        m_local_last_activity = current_time();
+    }
+
+    process_schedule(schedule);
+}
+void SuperscalarScheduler::issue_to_resource(
+    Schedule& schedule,
+    std::shared_ptr<const SchedulerResource> resource,
+    WallDuration delay, WallDuration hold, WallDuration cooldown
+){
+    if (m_pending_clear){
+        clear();
+    }
+
+    //  Resource is busy. Stall until it is free.
+    auto ret = m_live_commands.try_emplace(resource->id);
+    if (!ret.second){
+//        cout << m_device_sent_time << " : " << ret.first->second.free_time << endl;
+        m_device_issue_time = std::max(m_device_issue_time, ret.first->second.free_time);
+        process_schedule(schedule);
+    }
+    Command& command = ret.first->second;
+
+    delay    = std::max(delay, WallDuration::zero());
+    hold     = std::max(hold, WallDuration::zero());
+    cooldown = std::max(cooldown, WallDuration::zero());
+
+#if 0
+    cout << "issue_to_resource(): delay = " << std::chrono::duration_cast<Milliseconds>(delay).count()
+         << ", hold = " << std::chrono::duration_cast<Milliseconds>(hold).count()
+         << ", cooldown = " << std::chrono::duration_cast<Milliseconds>(cooldown).count()
+         << endl;
+    cout << "issue_time = " << std::chrono::duration_cast<Milliseconds>((m_device_issue_time - m_local_start)).count()
+         << ", sent_time = " << std::chrono::duration_cast<Milliseconds>((m_device_sent_time - m_local_start)).count()
+         << endl;
+#endif
+
+    WallClock release_time = m_device_issue_time + hold;
+    WallClock free_time = release_time + cooldown;
+
+    m_state_changes.insert(m_device_issue_time);
+    m_state_changes.insert(release_time);
+
+    command.command = std::move(resource);
+    command.busy_time = m_device_issue_time;
+    command.done_time = release_time;
+    command.free_time = free_time;
+
+    m_device_issue_time += delay;
+    m_max_free_time = std::max(m_max_free_time, free_time);
+    m_max_free_time = std::max(m_max_free_time, m_device_issue_time);
+    m_local_last_activity = current_time();
+
+    process_schedule(schedule);
+}
+
+
+
+
+
+
+}
+
diff --git a/SerialPrograms/Source/Controllers/Schedulers/SuperscalarScheduler.h b/SerialPrograms/Source/Controllers/Schedulers/SuperscalarScheduler.h
new file mode 100644
index 0000000000..959c0f9de8
--- /dev/null
+++ b/SerialPrograms/Source/Controllers/Schedulers/SuperscalarScheduler.h
@@ -0,0 +1,146 @@
+/*  Superscalar Scheduler
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Controllers_SuperscalarScheduler_H
+#define PokemonAutomation_Controllers_SuperscalarScheduler_H
+
+#include <memory>
+#include <set>
+#include <map>
+#include <vector>
+#include "Common/Compiler.h"
+#include "Common/Cpp/Time.h"
+#include "Common/Cpp/Logging/AbstractLogger.h"
+//#include "Common/Cpp/CancellableScope.h"
+
+namespace PokemonAutomation{
+
+class SuperscalarScheduler;
+
+
+
+
+class SchedulerResource{
+public:
+    const size_t id;
+
+    SchedulerResource(size_t id)
+        : id(id)
+    {}
+
+    virtual ~SchedulerResource() = default;
+};
+
+
+
+
+
+class SuperscalarScheduler{
+public:
+    using State = std::vector<std::shared_ptr<const SchedulerResource>>;
+    struct ScheduleEntry{
+        WallDuration duration;
+        State state;
+    };
+    using Schedule = std::vector<ScheduleEntry>;
+
+public:
+    SuperscalarScheduler(Logger& logger, WallDuration flush_threshold);
+
+    void clear_on_next() noexcept{
+        m_pending_clear = true;
+    }
+
+
+public:
+    //  These are the standard "issue" commands.
+    //
+    //  These functions are non-blocking and will append any new schedule
+    //  entries to "schedule".
+    //
+    //  These are not thread-safe with each other.
+    //
+
+    WallClock busy_until(size_t resource_id) const{
+        auto iter = m_live_commands.find(resource_id);
+        return iter != m_live_commands.end()
+            ? iter->second.free_time
+            : WallClock::min();
+    }
+
+    //  Wait until the pipeline has completely cleared and all resources have
+    //  returned to the ready state.
+    void issue_wait_for_all(Schedule& schedule);
+
+    //  Issue a do-nothing command for the specified delay.
+    //  This will advance the issue timestamp.
+    void issue_nop(Schedule& schedule, WallDuration delay);
+
+    //  Wait until the specified resource is ready to be used.
+    //  This will advance the issue timestamp until the resource is ready.
+    void issue_wait_for_resource(Schedule& schedule, size_t resource_id);
+
+    //  Issue a resource with the specified timing parameters.
+    void issue_to_resource(
+        Schedule& schedule,
+        std::shared_ptr<const SchedulerResource> resource,
+        WallDuration delay, WallDuration hold, WallDuration cooldown
+    );
+
+
+private:
+    void clear() noexcept;
+    State current_live_commands();
+    void clear_finished_commands();
+    bool iterate_schedule(Schedule& schedule);
+    void process_schedule(Schedule& schedule);
+
+
+private:
+    Logger& m_logger;
+
+    //  We are allowed to gap the timeline if nothing has been issued in this
+    //  much time.
+    const WallDuration m_flush_threshold;
+
+    bool m_pending_clear;
+
+    //  The construction time of this object. This is only used for debugging
+    //  purposes since it lets you print wall times relative to this.
+    WallClock m_local_start;
+
+    //  Wall clock of the last time "m_device_issue_time" was last updated.
+    //  This is used to decide when to gap the timeline.
+    WallClock m_local_last_activity;
+
+    //  The current timestamp of what has been issued to the scheduler.
+    WallClock m_device_issue_time;
+
+    //  The current timestamp of what has been sent to the device.
+    WallClock m_device_sent_time;
+
+    //  Maximum of: m_live_commands[]->second.free_time
+    WallClock m_max_free_time;
+
+    //  A set of all the scheduled state changes that will happen. Between
+    //  timestamps in this set, the state is constant.
+    std::set<WallClock> m_state_changes;
+
+    struct Command{
+        std::shared_ptr<const SchedulerResource> command;
+        WallClock busy_time;    //  Timestamp of when resource will be become busy.
+        WallClock done_time;    //  Timestamp of when resource will be done being busy.
+        WallClock free_time;    //  Timestamp of when resource can be used again.
+    };
+    std::map<size_t, Command> m_live_commands;
+};
+
+
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/Controllers/SerialPort/SerialLogger.cpp b/SerialPrograms/Source/Controllers/SerialPort/SerialLogger.cpp
new file mode 100644
index 0000000000..07ef703d29
--- /dev/null
+++ b/SerialPrograms/Source/Controllers/SerialPort/SerialLogger.cpp
@@ -0,0 +1,53 @@
+/*  Serial Logger
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/PrettyPrint.h"
+#include "SerialLogger.h"
+
+namespace PokemonAutomation{
+
+
+
+SerialLogger::SerialLogger(Logger& logger, bool log_everything)
+    : m_logger(logger)
+    , m_history(200)
+{}
+void SerialLogger::log(const char* msg, Color color){
+    if (ok_to_log()){
+        m_logger.log(msg, color);
+    }
+}
+void SerialLogger::log(const std::string& msg, Color color){
+    if (ok_to_log()){
+        m_logger.log(msg, color);
+    }
+}
+
+bool SerialLogger::ok_to_log(){
+    WallClock now = current_time();
+    WriteSpinLock lg(m_lock, PA_CURRENT_FUNCTION);
+    while (!m_history.empty()){
+        if (now - m_history.front() < std::chrono::seconds(1)){
+            break;
+        }
+        m_history.pop_front();
+    }
+    if (!m_history.try_push_back(now)){
+        m_messages_dropped++;
+        return false;
+    }
+
+    if (m_messages_dropped != 0){
+        m_logger.log("Dropped " + tostr_u_commas(m_messages_dropped) + " message(s) due to logging rate limit.", COLOR_RED);
+        m_messages_dropped = 0;
+    }
+
+    return true;
+}
+
+
+
+}
diff --git a/SerialPrograms/Source/Controllers/SerialPort/SerialLogger.h b/SerialPrograms/Source/Controllers/SerialPort/SerialLogger.h
new file mode 100644
index 0000000000..bd8b76d928
--- /dev/null
+++ b/SerialPrograms/Source/Controllers/SerialPort/SerialLogger.h
@@ -0,0 +1,40 @@
+/*  Serial Logger
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_SerialLogger_H
+#define PokemonAutomation_SerialLogger_H
+
+#include "Common/Cpp/Logging/AbstractLogger.h"
+#include "Common/Cpp/Time.h"
+#include "Common/Cpp/Containers/CircularBuffer.h"
+#include "Common/Cpp/Concurrency/SpinLock.h"
+
+namespace PokemonAutomation{
+
+
+
+class SerialLogger : public Logger{
+public:
+    SerialLogger(Logger& logger, bool log_everything);
+
+    virtual void log(const char* msg, Color color = COLOR_DARKGREEN) override;
+    virtual void log(const std::string& msg, Color color = COLOR_DARKGREEN) override;
+
+private:
+    bool ok_to_log();
+
+private:
+    Logger& m_logger;
+    SpinLock m_lock;
+    size_t m_messages_dropped = 0;
+    CircularBuffer<WallClock> m_history;
+};
+
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/Controllers/SerialPort/SerialPABotBase.cpp b/SerialPrograms/Source/Controllers/SerialPort/SerialPABotBase.cpp
new file mode 100644
index 0000000000..62c1aa045d
--- /dev/null
+++ b/SerialPrograms/Source/Controllers/SerialPort/SerialPABotBase.cpp
@@ -0,0 +1,177 @@
+/*  Serial Port (PABotBase)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Exceptions.h"
+#include "Common/SerialPABotBase/SerialPABotBase_Protocol_IDs.h"
+#include "CommonFramework/StaticGlobals.h"
+#include "SerialPABotBase.h"
+
+namespace PokemonAutomation{
+namespace SerialPABotBase{
+
+
+
+//
+//  PABotBase 2
+//
+
+//  These version #'s are for the MLC layer.
+const std::map<pabb_ProgramID, uint32_t>& SUPPORTED_DEVICES2(){
+    static const std::map<pabb_ProgramID, uint32_t> database{
+        {PABB_PID_UNSPECIFIED,              2026061800},
+        {PABB_PID_PABOTBASE_ESP32,          2026061800},
+        {PABB_PID_PABOTBASE_ESP32S3,        2026061800},
+        {PABB_PID_PABOTBASE_RP2040,         2026061800},
+        {PABB_PID_PABOTBASE_RP2350,         2026061800},
+        {PABB_PID_PABOTBASE_Pico1W,         2026061800},
+        {PABB_PID_PABOTBASE_Pico2W,         2026061800},
+    };
+    return database;
+}
+
+std::map<uint32_t, std::map<pabb_ProgramID, uint8_t>> make_SUPPORTED_VERSIONS2(){
+    std::map<uint32_t, std::map<pabb_ProgramID, uint8_t>> ret;
+    for (const auto& item : SUPPORTED_DEVICES2()){
+        ret[item.second / 100][item.first] = (uint8_t)(item.second % 100);
+    }
+    return ret;
+}
+const std::map<uint32_t, std::map<pabb_ProgramID, uint8_t>>& SUPPORTED_VERSIONS2(){
+    static const std::map<uint32_t, std::map<pabb_ProgramID, uint8_t>> database = make_SUPPORTED_VERSIONS2();
+    return database;
+}
+
+
+
+
+
+
+
+bool controller_is_valid(uint32_t id){
+    switch (id){
+    case PABB_CID_NONE:
+    case PABB_CID_StandardHid_Keyboard:
+    case PABB_CID_NintendoSwitch_WiredController:
+    case PABB_CID_NintendoSwitch2_WiredController:
+    case PABB_CID_NintendoSwitch_WirelessProController:
+    case PABB_CID_NintendoSwitch_WirelessLeftJoycon:
+    case PABB_CID_NintendoSwitch_WirelessRightJoycon:
+    case PABB_CID_NintendoSwitch_WiredProController:
+    case PABB_CID_NintendoSwitch_WiredLeftJoycon:
+    case PABB_CID_NintendoSwitch_WiredRightJoycon:
+        return true;
+//        return IS_BETA_VERSION || STATIC_GLOBALS.DEVELOPER_MODE;
+    case PABB_CID_NintendoSwitch2_WiredProController:
+    case PABB_CID_NintendoSwitch2_WiredLeftJoycon:
+    case PABB_CID_NintendoSwitch2_WiredRightJoycon:
+    case PABB_CID_NintendoSwitch2_WirelessProController:
+    case PABB_CID_NintendoSwitch2_WirelessLeftJoycon:
+    case PABB_CID_NintendoSwitch2_WirelessRightJoycon:
+        return STATIC_GLOBALS.DEVELOPER_MODE;
+    }
+    return false;
+}
+
+
+
+ControllerType id_to_controller_type(uint32_t id){
+    switch (id){
+    case PABB_CID_NONE:
+        return ControllerType::None;
+
+    case PABB_CID_StandardHid_Keyboard:
+        return ControllerType::HID_Keyboard;
+
+    case PABB_CID_NintendoSwitch_WiredController:
+        return ControllerType::NintendoSwitch_WiredController;
+    case PABB_CID_NintendoSwitch_WiredProController:
+        return ControllerType::NintendoSwitch_WiredProController;
+    case PABB_CID_NintendoSwitch_WiredLeftJoycon:
+        return ControllerType::NintendoSwitch_WiredLeftJoycon;
+    case PABB_CID_NintendoSwitch_WiredRightJoycon:
+        return ControllerType::NintendoSwitch_WiredRightJoycon;
+    case PABB_CID_NintendoSwitch_WirelessProController:
+        return ControllerType::NintendoSwitch_WirelessProController;
+    case PABB_CID_NintendoSwitch_WirelessLeftJoycon:
+        return ControllerType::NintendoSwitch_WirelessLeftJoycon;
+    case PABB_CID_NintendoSwitch_WirelessRightJoycon:
+        return ControllerType::NintendoSwitch_WirelessRightJoycon;
+
+    case PABB_CID_NintendoSwitch2_WiredController:
+        return ControllerType::NintendoSwitch2_WiredController;
+    case PABB_CID_NintendoSwitch2_WiredProController:
+        return ControllerType::NintendoSwitch2_WiredProController;
+    case PABB_CID_NintendoSwitch2_WiredLeftJoycon:
+        return ControllerType::NintendoSwitch2_WiredLeftJoycon;
+    case PABB_CID_NintendoSwitch2_WiredRightJoycon:
+        return ControllerType::NintendoSwitch2_WiredRightJoycon;
+    case PABB_CID_NintendoSwitch2_WirelessProController:
+        return ControllerType::NintendoSwitch2_WirelessProController;
+    case PABB_CID_NintendoSwitch2_WirelessLeftJoycon:
+        return ControllerType::NintendoSwitch2_WirelessLeftJoycon;
+    case PABB_CID_NintendoSwitch2_WirelessRightJoycon:
+        return ControllerType::NintendoSwitch2_WirelessRightJoycon;
+    }
+
+    throw InternalProgramError(
+        nullptr, PA_CURRENT_FUNCTION,
+        "Invalid Controller ID: " + std::to_string(id)
+    );
+}
+uint32_t controller_type_to_id(ControllerType controller_type){
+    switch (controller_type){
+    case ControllerType::None:
+        return PABB_CID_NONE;
+
+    case ControllerType::HID_Keyboard:
+        return PABB_CID_StandardHid_Keyboard;
+
+    case ControllerType::NintendoSwitch_WiredController:
+        return PABB_CID_NintendoSwitch_WiredController;
+    case ControllerType::NintendoSwitch_WiredProController:
+        return PABB_CID_NintendoSwitch_WiredProController;
+    case ControllerType::NintendoSwitch_WiredLeftJoycon:
+        return PABB_CID_NintendoSwitch_WiredLeftJoycon;
+    case ControllerType::NintendoSwitch_WiredRightJoycon:
+        return PABB_CID_NintendoSwitch_WiredRightJoycon;
+    case ControllerType::NintendoSwitch_WirelessProController:
+        return PABB_CID_NintendoSwitch_WirelessProController;
+    case ControllerType::NintendoSwitch_WirelessLeftJoycon:
+        return PABB_CID_NintendoSwitch_WirelessLeftJoycon;
+    case ControllerType::NintendoSwitch_WirelessRightJoycon:
+        return PABB_CID_NintendoSwitch_WirelessRightJoycon;
+
+    case ControllerType::NintendoSwitch2_WiredController:
+        return PABB_CID_NintendoSwitch2_WiredController;
+    case ControllerType::NintendoSwitch2_WiredProController:
+        return PABB_CID_NintendoSwitch2_WiredProController;
+    case ControllerType::NintendoSwitch2_WiredLeftJoycon:
+        return PABB_CID_NintendoSwitch2_WiredLeftJoycon;
+    case ControllerType::NintendoSwitch2_WiredRightJoycon:
+        return PABB_CID_NintendoSwitch2_WiredRightJoycon;
+    case ControllerType::NintendoSwitch2_WirelessProController:
+        return PABB_CID_NintendoSwitch2_WirelessProController;
+    case ControllerType::NintendoSwitch2_WirelessLeftJoycon:
+        return PABB_CID_NintendoSwitch2_WirelessLeftJoycon;
+    case ControllerType::NintendoSwitch2_WirelessRightJoycon:
+        return PABB_CID_NintendoSwitch2_WirelessRightJoycon;
+    }
+
+    throw InternalProgramError(
+        nullptr, PA_CURRENT_FUNCTION,
+        "Invalid Controller Enum: " + std::to_string((int)controller_type)
+    );
+}
+
+
+
+
+
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/Controllers/SerialPort/SerialPABotBase.h b/SerialPrograms/Source/Controllers/SerialPort/SerialPABotBase.h
new file mode 100644
index 0000000000..1e0c39ab10
--- /dev/null
+++ b/SerialPrograms/Source/Controllers/SerialPort/SerialPABotBase.h
@@ -0,0 +1,43 @@
+/*  Serial Port (PABotBase)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Controllers_SerialPABotBase_H
+#define PokemonAutomation_Controllers_SerialPABotBase_H
+
+#include <stdint.h>
+#include <map>
+#include "Common/SerialPABotBase/SerialPABotBase_Protocol_IDs.h"
+#include "Controllers/ControllerTypes.h"
+
+namespace PokemonAutomation{
+namespace SerialPABotBase{
+
+
+
+//
+//  PABotBase 2
+//
+const std::map<pabb_ProgramID, uint32_t>& SUPPORTED_DEVICES2();
+const std::map<
+    uint32_t,   //  Major protocol version. (version # / 100)
+    std::map<
+        pabb_ProgramID,
+        uint8_t //  Minimum minor protocol version (version # % 100)
+    >
+>& SUPPORTED_VERSIONS2();
+
+
+
+bool controller_is_valid(uint32_t id);
+
+ControllerType id_to_controller_type(uint32_t id);
+uint32_t controller_type_to_id(ControllerType controller_type);
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Controllers/SerialPort/SerialPortPollerQt.cpp b/SerialPrograms/Source/Controllers/SerialPort/SerialPortPollerQt.cpp
new file mode 100644
index 0000000000..f995137277
--- /dev/null
+++ b/SerialPrograms/Source/Controllers/SerialPort/SerialPortPollerQt.cpp
@@ -0,0 +1,149 @@
+/*  Serial Port Poller (Qt)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/PrettyPrint.h"
+#include "CommonFramework/GlobalSettingsPanel.h"
+#include "CommonFramework/Logging/Logger.h"
+#include "CommonFramework/GlobalServices.h"
+#include "SerialPortPollerQt.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+
+
+
+SerialPortPoller& SerialPortPoller::instance(){
+    static SerialPortPoller poller;
+    return poller;
+}
+
+SerialPortPoller::SerialPortPoller()
+    : m_last_change(current_time())
+    , m_highest(WallDuration(0))
+{
+    global_periodic_runner().add_runnable(*this, std::chrono::seconds(1));
+}
+SerialPortPoller::~SerialPortPoller(){
+    stop();
+}
+void SerialPortPoller::stop(){
+    global_periodic_runner().remove_runnable(*this);
+}
+
+
+void SerialPortPoller::begin_refresh_now(){
+//    cout << "begin_refresh_now()" << endl;
+    global_periodic_runner().trigger_run_now(*this);
+}
+WallClock SerialPortPoller::last_changed() const{
+    ReadSpinLock lg(m_lock);
+    return m_last_change;
+}
+QList<QSerialPortInfo> SerialPortPoller::ports() const{
+    ReadSpinLock lg(m_lock);
+    return m_list;
+}
+
+QSerialPortInfo SerialPortPoller::get_port(const std::string& name) const{
+    ReadSpinLock lg(m_lock);
+    auto iter = m_last.find(name);
+    if (iter == m_last.end()){
+        return QSerialPortInfo();
+    }
+    return iter->second;
+}
+
+void SerialPortPoller::run() noexcept{
+//    cout << "SerialPortPoller::run() - start" << endl;
+//    global_logger_tagged().log("Refreshing serial ports...");
+//    cout << "SerialPortPoller::run() - start" << endl;
+
+    try{
+        WallClock start = current_time();
+
+        QList<QSerialPortInfo> list = QSerialPortInfo::availablePorts();
+
+//        //  Test code to test delayed UI behavior.
+//        std::this_thread::sleep_for(std::chrono::seconds(5));
+
+        std::map<std::string, QSerialPortInfo> current;
+        for (auto& port : list){
+            current.emplace(port.portName().toStdString(), port);
+        }
+
+        WallClock now = current_time();
+        bool changed = false;
+
+        WriteSpinLock lg(m_lock);
+        auto iter0 = m_last.begin();
+        auto iter1 = current.begin();
+        while (iter0 != m_last.end() && iter1 != current.end()){
+            if (iter0->first < iter1->first){
+                global_logger_tagged().log("Serial Port Removed: " + iter0->first, COLOR_RED);
+                changed = true;
+                ++iter0;
+            }else if (iter0->first > iter1->first){
+                global_logger_tagged().log("Serial Port Added: " + iter1->first, COLOR_BLUE);
+                changed = true;
+                ++iter1;
+            }else{
+                ++iter0;
+                ++iter1;
+            }
+        }
+        for (; iter0 != m_last.end(); ++iter0){
+            global_logger_tagged().log("Serial Port Removed: " + iter0->first, COLOR_RED);
+            changed = true;
+        }
+        for (; iter1 != current.end(); ++iter1){
+            global_logger_tagged().log("Serial Port Added: " + iter1->first, COLOR_BLUE);
+            changed = true;
+        }
+        m_last = std::move(current);
+        m_list = std::move(list);
+
+        if (changed){
+            m_last_change = now;
+            m_listeners.run_method(&Listener::on_serial_ports_changed, m_list);
+        }
+
+        WallClock end = current_time();
+
+        //  Throttle the next call.
+        WallDuration duration = end - start;
+        WallDuration next_delay = duration * 10;
+        if (next_delay < std::chrono::seconds(1)){
+            next_delay = std::chrono::seconds(1);
+        }
+//        cout << tostr_u_commas(std::chrono::duration_cast<Milliseconds>(duration).count()) << endl;
+        if (LOG_EVERYTHING()){
+            global_logger_tagged().log(
+                "Serial port refresh took " + tostr_u_commas(std::chrono::duration_cast<Milliseconds>(duration).count()) + " ms.",
+                COLOR_ORANGE
+            );
+        }else if (m_highest < duration){
+            m_highest = duration;
+            global_logger_tagged().log(
+                "Serial port refresh took " + tostr_u_commas(std::chrono::duration_cast<Milliseconds>(duration).count()) + " ms. "
+                "Further updates shorter than this will be suppressed.",
+                COLOR_ORANGE
+            );
+        }
+        global_periodic_runner().edit_duration(*this, next_delay);
+
+    }catch (...){}
+//    cout << "SerialPortPoller::run() - end" << endl;
+}
+
+
+
+
+
+
+}
diff --git a/SerialPrograms/Source/Controllers/SerialPort/SerialPortPollerQt.h b/SerialPrograms/Source/Controllers/SerialPort/SerialPortPollerQt.h
new file mode 100644
index 0000000000..7381aa8475
--- /dev/null
+++ b/SerialPrograms/Source/Controllers/SerialPort/SerialPortPollerQt.h
@@ -0,0 +1,66 @@
+/*  Serial Port Poller (Qt)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  "QSerialPortInfo::availablePorts()" can take a long time to return.
+ *  This can hang the UI which is bad. So we run it in the background
+ *  as a poller.
+ *
+ */
+
+#ifndef PokemonAutomation_SerialPortPoller_H
+#define PokemonAutomation_SerialPortPoller_H
+
+#include <map>
+#include <QSerialPortInfo>
+#include "Common/Cpp/ListenerSet.h"
+#include "Common/Cpp/Concurrency/SpinLock.h"
+#include "Common/Cpp/Concurrency/PeriodicRunner.h"
+
+namespace PokemonAutomation{
+
+
+
+class SerialPortPoller : public PeriodicRunner::Runnable{
+public:
+    struct Listener{
+        virtual void on_serial_ports_changed(const QList<QSerialPortInfo>& ports) = 0;
+    };
+    void add_listener(Listener& listener){
+        m_listeners.add(listener);
+    }
+    void remove_listener(Listener& listener){
+        m_listeners.remove(listener);
+    }
+
+public:
+    static SerialPortPoller& instance();
+
+    void stop();
+
+    void begin_refresh_now();
+    WallClock last_changed() const;
+    QList<QSerialPortInfo> ports() const;
+    QSerialPortInfo get_port(const std::string& name) const;
+
+    virtual void run() noexcept override;
+
+private:
+    SerialPortPoller();
+    ~SerialPortPoller();
+
+    mutable SpinLock m_lock;
+    WallClock m_last_change;
+    std::map<std::string, QSerialPortInfo> m_last;
+    QList<QSerialPortInfo> m_list;
+    WallDuration m_highest;
+
+    ListenerSet<Listener> m_listeners;
+};
+
+
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/Controllers/StandardHid/StandardHid_Keyboard.cpp b/SerialPrograms/Source/Controllers/StandardHid/StandardHid_Keyboard.cpp
new file mode 100644
index 0000000000..364ee27502
--- /dev/null
+++ b/SerialPrograms/Source/Controllers/StandardHid/StandardHid_Keyboard.cpp
@@ -0,0 +1,154 @@
+/*  HID Keyboard
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Containers/Pimpl.tpp"
+#include "ControllerInput/ControllerInput.h"
+#include "ControllerInput/Keyboard/KeyboardInput_State.h"
+#ifdef QT_CORE_LIB
+#include "ControllerInput/Keyboard/KeyboardInput_KeyMappings.h"
+#endif
+#include "Controllers/ControllerState.h"
+#include "StandardHid_Keyboard.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace StandardHid{
+
+using namespace std::chrono_literals;
+
+
+const char Keyboard::NAME[] = "HID: Keyboard";
+
+
+
+
+class KeyboardState : public ControllerState{
+public:
+    virtual void clear() override{
+        keys.clear();
+    }
+    virtual bool operator==(const ControllerState& x) const override{
+        if (typeid(*this) != typeid(x)){
+            return false;
+        }
+
+        const KeyboardState& r = static_cast<const KeyboardState&>(x);
+        if (keys.size() != r.keys.size()){
+            return false;
+        }
+
+        auto iter0 = keys.begin();
+        auto iter1 = r.keys.begin();
+        for (; iter0 != keys.end(); ++iter0, ++iter1){
+            if (*iter0 != *iter1){
+                return false;
+            }
+        }
+
+        return true;
+    }
+    virtual bool is_neutral() const override{
+        return keys.empty();
+    }
+
+public:
+    std::set<KeyboardKey> keys;
+};
+
+
+
+
+
+
+#if 0
+void log_qtkey(Logger& logger, const QtKeyMap::QtKey& qtkey){
+    std::stringstream ss;
+    ss << "Pressed key " << QTKEY_TO_STRING().at(qtkey.key);
+    if (qtkey.keypad){
+        ss << " (keypad)";
+    }else{
+        ss << " (main keyboard)";
+    }
+
+    const KeyboardInputMappings& qwerty_hid_map = KEYID_TO_HID_QWERTY();
+    KeyboardKey key = qwerty_hid_map.get();
+    if (auto iter = qwerty_hid_map.find(qtkey); iter != qwerty_hid_map.end()){
+        ss << " mapped to QWERTY HID key " << KEYBOARDKEY_TO_STRING().at(iter->second);
+    }else{
+        ss << " has no QWERTY HID mapping";
+    }
+
+    const KeyboardInputMappings& azerty_hid_map = KEYID_TO_HID_AZERTY();
+    if (auto iter = azerty_hid_map.find(qtkey); iter != azerty_hid_map.end()){
+        ss << " mapped to AZERTY HID key " << KEYBOARDKEY_TO_STRING().at(iter->second);
+    }else{
+        ss << " has no AZERTY HID mapping";
+    }
+
+    logger.log(ss.str(), COLOR_BLUE);
+}
+#endif
+
+
+
+
+
+Keyboard::Keyboard(Logger& logger){
+
+}
+Keyboard::~Keyboard(){
+}
+
+
+bool Keyboard::run_string_command(Milliseconds duration, const std::string& command){
+#ifdef QT_CORE_LIB
+    const KeyboardInputMappings& map = get_keyid_to_hid_map();
+
+    for (char ch : command){
+        char upper = std::toupper(static_cast<unsigned char>(ch));
+        issue_key(
+            nullptr,
+            2*duration, duration, duration,
+            map.get(static_cast<Qt::Key>(upper))
+        );
+    }
+#endif
+    return true;
+}
+void Keyboard::run_controller_input(const ControllerInputState& state){
+    if (state.type() != ControllerInputType::HID_Keyboard){
+        return;
+    }
+
+    const KeyboardInputState& lstate = static_cast<const KeyboardInputState&>(state);
+
+//    WallClock timestamp;
+    if (lstate.is_neutral()){
+//        timestamp = current_time();
+        cancel_all_commands();
+    }else{
+        replace_on_next_command();
+//        timestamp = current_time();
+        issue_keys(
+            nullptr,
+            2000ms, 2000ms, 0ms,
+            std::vector<KeyboardKey>(lstate.keys().begin(), lstate.keys().end())
+        );
+    }
+
+//    on_command_input(timestamp, controller_state);
+}
+
+
+
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/Controllers/StandardHid/StandardHid_Keyboard.h b/SerialPrograms/Source/Controllers/StandardHid/StandardHid_Keyboard.h
new file mode 100644
index 0000000000..ef58fa0dba
--- /dev/null
+++ b/SerialPrograms/Source/Controllers/StandardHid/StandardHid_Keyboard.h
@@ -0,0 +1,75 @@
+/*  HID Keyboard
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  This is the raw (full) controller API that is exposed to programs.
+ *
+ */
+
+#ifndef PokemonAutomation_StandardHid_Keyboard_H
+#define PokemonAutomation_StandardHid_Keyboard_H
+
+#include <vector>
+#include "ControllerInput/Keyboard/KeyboardHidButtons.h"
+#include "Controllers/Controller.h"
+
+namespace PokemonAutomation{
+namespace StandardHid{
+
+
+class Keyboard;
+using KeyboardContext = ControllerContext<Keyboard>;
+
+
+
+
+class Keyboard : public AbstractController{
+public:
+    using ContextType = KeyboardContext;
+
+    Keyboard(Logger& logger);
+    virtual ~Keyboard();
+
+
+public:
+    static const char NAME[];
+    virtual const char* name() override{
+        return NAME;
+    };
+
+
+public:
+    //  Standard Commands
+
+    //  Note that only 6 keys (not counting modifiers) can be communicated at
+    //  once over the HID protocol. If you hold down more than 6, only the first
+    //  6 chronologically will be applied.
+
+    virtual void issue_key(
+        Cancellable* cancellable,
+        Milliseconds delay, Milliseconds hold, Milliseconds cooldown,
+        KeyboardKey key
+    ) = 0;
+    virtual void issue_keys(
+        Cancellable* cancellable,
+        Milliseconds delay, Milliseconds hold, Milliseconds cooldown,
+        const std::vector<KeyboardKey>& keys
+    ) = 0;
+
+
+public:
+    //  External Inputs
+
+    virtual bool run_string_command(Milliseconds duration, const std::string& command) override;
+    virtual void run_controller_input(const ControllerInputState& state) override;
+
+
+private:
+};
+
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Controllers/StandardHid/StandardHid_KeyboardWithScheduler.cpp b/SerialPrograms/Source/Controllers/StandardHid/StandardHid_KeyboardWithScheduler.cpp
new file mode 100644
index 0000000000..fb11343114
--- /dev/null
+++ b/SerialPrograms/Source/Controllers/StandardHid/StandardHid_KeyboardWithScheduler.cpp
@@ -0,0 +1,100 @@
+/*  HID Keyboard Controller (With Scheduler)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "StandardHid_KeyboardWithScheduler.h"
+
+namespace PokemonAutomation{
+namespace StandardHid{
+
+
+
+void KeyboardControllerWithScheduler::issue_key(
+    Cancellable* cancellable,
+    Milliseconds delay, Milliseconds hold, Milliseconds cooldown,
+    KeyboardKey key
+){
+    SuperscalarScheduler::Schedule schedule;
+    std::lock_guard<Mutex> lg0(m_issue_lock);
+    {
+        if (cancellable){
+            cancellable->throw_if_cancelled();
+        }
+        m_scheduler.issue_to_resource(
+            schedule, std::make_unique<KeyboardCommand>(key, m_seqnum++),
+            delay, hold, cooldown
+        );
+    }
+    execute_schedule(cancellable, schedule);
+    if (m_logging_throttler){
+        m_logger.log(
+            "issue_key(): " + std::to_string((size_t)key) +
+            ", delay = " + std::to_string(delay.count()) + "ms" +
+            ", hold = " + std::to_string(hold.count()) + "ms" +
+            ", cooldown = " + std::to_string(cooldown.count()) + "ms",
+            COLOR_DARKGREEN
+        );
+    }
+}
+void KeyboardControllerWithScheduler::issue_keys(
+    Cancellable* cancellable,
+    Milliseconds delay, Milliseconds hold, Milliseconds cooldown,
+    const std::vector<KeyboardKey>& keys
+){
+    SuperscalarScheduler::Schedule schedule;
+    std::lock_guard<Mutex> lg0(m_issue_lock);
+    {
+        if (cancellable){
+            cancellable->throw_if_cancelled();
+        }
+        for (KeyboardKey key : keys){
+            m_scheduler.issue_wait_for_resource(schedule, (size_t)key);
+        }
+        for (KeyboardKey key : keys){
+            m_scheduler.issue_to_resource(
+                schedule, std::make_unique<KeyboardCommand>(key, m_seqnum++),
+                WallDuration::zero(), hold, cooldown
+            );
+        }
+        m_scheduler.issue_nop(schedule, delay);
+    }
+    execute_schedule(cancellable, schedule);
+    if (m_logging_throttler){
+        //  Do not log the contents of the command due to privacy concerns.
+        //  (people entering passwords)
+        m_logger.log(
+            "issue_keys(): "
+            "delay = " + std::to_string(delay.count()) + "ms" +
+            ", hold = " + std::to_string(hold.count()) + "ms" +
+            ", cooldown = " + std::to_string(cooldown.count()) + "ms",
+            COLOR_DARKGREEN
+        );
+    }
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/Controllers/StandardHid/StandardHid_KeyboardWithScheduler.h b/SerialPrograms/Source/Controllers/StandardHid/StandardHid_KeyboardWithScheduler.h
new file mode 100644
index 0000000000..dc2aaafad5
--- /dev/null
+++ b/SerialPrograms/Source/Controllers/StandardHid/StandardHid_KeyboardWithScheduler.h
@@ -0,0 +1,74 @@
+/*  HID Keyboard Controller (With Scheduler)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  This implements most of the Keyboard API using only the controller
+ *  state function. It uses SuperscalarScheduler to do this.
+ *
+ */
+
+#ifndef PokemonAutomation_StandardHid_KeyboardWithScheduler_H
+#define PokemonAutomation_StandardHid_KeyboardWithScheduler_H
+
+#include <set>
+#include "Common/Cpp/CancellableScope.h"
+#include "ControllerInput/Keyboard/KeyboardHidButtons.h"
+#include "Controllers/Schedulers/ControllerWithScheduler.h"
+
+namespace PokemonAutomation{
+namespace StandardHid{
+
+
+
+struct KeyboardControllerState{
+    std::set<KeyboardKey> keys;
+};
+
+class KeyboardCommand : public SchedulerResource{
+public:
+    KeyboardCommand(KeyboardKey key, uint64_t seqnum)
+        : SchedulerResource((size_t)key)
+        , m_seqnum(seqnum)
+    {}
+    KeyboardKey key() const{
+        return (KeyboardKey)id;
+    }
+    uint64_t seqnum() const{
+        return m_seqnum;
+    }
+
+private:
+    uint64_t m_seqnum;
+};
+
+
+
+class KeyboardControllerWithScheduler : public PokemonAutomation::ControllerWithScheduler{
+public:
+    using PokemonAutomation::ControllerWithScheduler::ControllerWithScheduler;
+
+
+public:
+    //  Superscalar Commands (the "ssf" framework)
+
+    void issue_key(
+        Cancellable* cancellable,
+        Milliseconds delay, Milliseconds hold, Milliseconds cooldown,
+        KeyboardKey key
+    );
+    void issue_keys(
+        Cancellable* cancellable,
+        Milliseconds delay, Milliseconds hold, Milliseconds cooldown,
+        const std::vector<KeyboardKey>& keys
+    );
+
+private:
+    uint64_t m_seqnum = 0;
+};
+
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Controllers/StandardHid/StandardHid_Keyboard_PABotBase2.cpp b/SerialPrograms/Source/Controllers/StandardHid/StandardHid_Keyboard_PABotBase2.cpp
new file mode 100644
index 0000000000..b77b8af80d
--- /dev/null
+++ b/SerialPrograms/Source/Controllers/StandardHid/StandardHid_Keyboard_PABotBase2.cpp
@@ -0,0 +1,268 @@
+/*  PABotBase2: HID Keyboard
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/ColoredText.h"
+#include "Common/PABotBase2/Controllers/PABotBase2_Controller_HID_Keyboard.h"
+#include "Common/SerialPABotBase/SerialPABotBase_Protocol_IDs.h"
+#include "StandardHid_Keyboard_PABotBase2.h"
+
+namespace PokemonAutomation{
+namespace StandardHid{
+
+using namespace std::chrono_literals;
+
+
+
+void PABotBase2_Keyboard::add_message_loggers(PABotBase2::MessageLogger& message_logger){
+    using namespace PABotBase2;
+
+    message_logger.add_message<pabb2_Message_Command_HID_Keyboard_State>(
+        "PABB2_MESSAGE_CMD_HID_KEYBOARD_STATE",
+        PABB2_MESSAGE_CMD_HID_KEYBOARD_STATE,
+        false,
+        [](const pabb2_Message_Command_HID_Keyboard_State* message){
+            std::string str;
+            str += "id = " + std::to_string(message->id);
+            str += ", ms = " + std::to_string(message->milliseconds);
+            return str;
+        }
+    );
+}
+
+
+
+PABotBase2_Keyboard::PABotBase2_Keyboard(
+    Logger& logger,
+    PABotBase2::Connection& connection
+)
+    : Keyboard(logger)
+    , KeyboardControllerWithScheduler(logger, logging_throttler())
+    , m_connection(connection)
+{
+    //  Add controller-specific messages.
+    add_message_loggers(connection.message_logger());
+
+    m_status_thread.reset(new ControllerStatusThread(
+        connection, *this
+    ));
+}
+PABotBase2_Keyboard::~PABotBase2_Keyboard(){
+    stop();
+}
+void PABotBase2_Keyboard::stop(){
+    m_status_thread.reset();
+}
+
+
+
+void PABotBase2_Keyboard::update_status(Cancellable& cancellable){
+    PABotBase2::MessageHeader request;
+    request.message_bytes = sizeof(request);
+    request.opcode = PABB2_MESSAGE_OPCODE_REQUEST_STATUS;
+
+    uint8_t id = m_connection.device().send_request_with_response(request);
+    std::string response = m_connection.device().wait_for_request_response_min_size<
+        PABotBase2::Message_u32, PABB2_MESSAGE_OPCODE_RET_U32_DATA
+    >(id);
+
+    const PABotBase2::Message_u32* header = (const PABotBase2::Message_u32*)response.data();
+
+    if (header->data != PABB_CID_StandardHid_Keyboard){
+        m_connection.set_status_line1("");
+        return;
+    }
+
+    constexpr size_t EXPECTED_SIZE = sizeof(PABotBase2::Message_u32) + sizeof(pabb_HID_Keyboard_Status);
+    if (response.size() != EXPECTED_SIZE){
+        throw SerialProtocolException(
+            m_logger, PA_CURRENT_FUNCTION,
+            "Received Incorrect Response Size: Expected = " + std::to_string(EXPECTED_SIZE) +
+            ", Actual = " + std::to_string(response.size())
+        );
+    }
+
+    uint8_t status = *(const uint8_t*)(header + 1);
+
+    std::string str;
+    str += "Connected: " + (status & 1
+        ? html_color_text("Yes", theme_friendly_darkblue())
+        : html_color_text("No", COLOR_RED)
+    );
+    str += " -";
+    if (status & 1){
+        str += html_color_text(" NUM", status & 16 ? COLOR_GREEN : COLOR_BLACK);
+        str += html_color_text(" CAPS", status & 32 ? COLOR_GREEN : COLOR_BLACK);
+        str += html_color_text(" SCR", status & 64 ? COLOR_GREEN : COLOR_BLACK);
+    }else{
+        str += " " + html_color_text("No", COLOR_RED);
+    }
+
+    m_connection.set_status_line1(str);
+}
+void PABotBase2_Keyboard::stop_with_error(std::string error_message){
+    try{
+        WriteSpinLock lg(m_error_lock);
+        m_error_string = error_message;
+    }catch (...){}
+    m_connection.cancel();
+    m_connection.set_status_line1(std::move(error_message), COLOR_RED);
+}
+
+
+void PABotBase2_Keyboard::cancel_all_commands(){
+    std::lock_guard<Mutex> lg(m_state_lock);
+    if (!is_ready()){
+        throw InvalidConnectionStateException(error_string());
+    }
+    m_connection.device().command_queue().send_cancel();
+    m_scheduler.clear_on_next();
+}
+void PABotBase2_Keyboard::replace_on_next_command(){
+    std::lock_guard<Mutex> lg(m_state_lock);
+    if (!is_ready()){
+        throw InvalidConnectionStateException(error_string());
+    }
+    m_connection.device().command_queue().send_replace_on_next();
+    m_scheduler.clear_on_next();
+}
+bool PABotBase2_Keyboard::cancel_all_and_wait(Milliseconds timeout){
+    cancel_all_commands();
+
+    //  Wait outside "m_state_lock" since this can take a while.
+    return m_connection.device().command_queue().wait_for_cancel(timeout);
+}
+
+
+void PABotBase2_Keyboard::wait_for_all(Cancellable* cancellable){
+    SuperscalarScheduler::Schedule schedule;
+    std::lock_guard<Mutex> lg0(m_issue_lock);
+    {
+        std::lock_guard<Mutex> lg1(m_state_lock);
+
+        ThrottleScope scope(m_logging_throttler);
+        if (scope){
+            m_logger.log("wait_for_all()", COLOR_DARKGREEN);
+        }
+
+        if (!is_ready()){
+            throw InvalidConnectionStateException(error_string());
+        }
+
+        m_scheduler.issue_wait_for_all(schedule);
+    }
+    execute_schedule(cancellable, schedule);
+    m_connection.device().command_queue().wait_for_all(cancellable);
+}
+
+
+void PABotBase2_Keyboard::execute_state(
+    Cancellable* cancellable,
+    const SuperscalarScheduler::ScheduleEntry& entry
+){
+    std::map<KeyboardKey, uint64_t> state;
+    for (const auto& item : entry.state){
+        const KeyboardCommand& key = static_cast<const KeyboardCommand&>(*item);
+//        cout << (int)key << endl;
+        state.emplace(key.key(), key.seqnum());
+    }
+
+//    cout << "last = " << m_last_state.size() << ", now = " << state.size() << endl;
+
+    //  Add the modifier keys.
+    PABotBase2::pabb2_Message_Command_HID_Keyboard_State request;
+    request.message_bytes = sizeof(request);
+    request.opcode = PABB2_MESSAGE_CMD_HID_KEYBOARD_STATE;
+    request.report = {};
+    if (state.contains(KeyboardKey::KEY_LEFT_CTRL)){
+        state.erase(KeyboardKey::KEY_LEFT_CTRL);
+        request.report.modifiers |= 1 << 0;
+    }
+    if (state.contains(KeyboardKey::KEY_LEFT_SHIFT)){
+        state.erase(KeyboardKey::KEY_LEFT_SHIFT);
+        request.report.modifiers |= 1 << 1;
+    }
+    if (state.contains(KeyboardKey::KEY_LEFT_ALT)){
+        state.erase(KeyboardKey::KEY_LEFT_ALT);
+        request.report.modifiers |= 1 << 2;
+    }
+    if (state.contains(KeyboardKey::KEY_LEFT_META)){
+        state.erase(KeyboardKey::KEY_LEFT_CTRL);
+        request.report.modifiers |= 1 << 3;
+    }
+    if (state.contains(KeyboardKey::KEY_RIGHT_CTRL)){
+        state.erase(KeyboardKey::KEY_RIGHT_CTRL);
+        request.report.modifiers |= 1 << 4;
+    }
+    if (state.contains(KeyboardKey::KEY_RIGHT_SHIFT)){
+        state.erase(KeyboardKey::KEY_RIGHT_SHIFT);
+        request.report.modifiers |= 1 << 5;
+    }
+    if (state.contains(KeyboardKey::KEY_RIGHT_ALT)){
+        state.erase(KeyboardKey::KEY_RIGHT_ALT);
+        request.report.modifiers |= 1 << 6;
+    }
+    if (state.contains(KeyboardKey::KEY_RIGHT_META)){
+        state.erase(KeyboardKey::KEY_RIGHT_META);
+        request.report.modifiers |= 1 << 7;
+    }
+
+    //  Last State: Remove keys that are no longer pressed.
+    //  Current State: Remove keys that were already pressed.
+    for (auto iterL = m_last_state.begin(); iterL != m_last_state.end();){
+        auto iterS = state.find(iterL->second);
+        if (iterS == state.end()){
+            iterL = m_last_state.erase(iterL);
+        }else{
+            state.erase(iterS);
+            ++iterL;
+        }
+    }
+
+    //  Add the new keys to the state.
+    for (const auto& key : state){
+        m_last_state.emplace(key.second, key.first);
+    }
+
+    //  Get a searchable set of all currently pressed keys.
+    state.clear();
+    for (const auto& item : m_last_state){
+        state.emplace(item.second, item.first);
+    }
+
+//    cout << "modifiers = " << (int)report.modifiers << endl;
+
+    //  Add the remaining keys.
+    auto iter = m_last_state.begin();
+    for (size_t c = 0; c < 6; c++){
+        if (iter == m_last_state.end()){
+            break;
+        }
+        request.report.key[c] = iter->second;
+        ++iter;
+    }
+
+//    cout << m_last_state.size() << endl;
+    if (m_last_state.size() > 6){
+        m_logger.log("Unable to send more than 6 simultaneous keyboard presses due to HID limitation.", COLOR_RED);
+    }
+
+    //  Divide the controller state into smaller chunks that fit into the report
+    //  duration.
+    Milliseconds time_left = std::chrono::duration_cast<Milliseconds>(entry.duration);
+
+    while (time_left > Milliseconds::zero()){
+        Milliseconds current = std::min(time_left, 65535ms);
+        request.milliseconds = (uint16_t)current.count();
+        m_connection.device().command_queue().send_command(cancellable, request);
+        time_left -= current;
+    }
+}
+
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/Controllers/StandardHid/StandardHid_Keyboard_PABotBase2.h b/SerialPrograms/Source/Controllers/StandardHid/StandardHid_Keyboard_PABotBase2.h
new file mode 100644
index 0000000000..796105eb67
--- /dev/null
+++ b/SerialPrograms/Source/Controllers/StandardHid/StandardHid_Keyboard_PABotBase2.h
@@ -0,0 +1,144 @@
+/*  PABotBase2: HID Keyboard
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_StandardHid_Keyboard_PABotBase2_H
+#define PokemonAutomation_StandardHid_Keyboard_PABotBase2_H
+
+#include "Controllers/ControllerStatusThread.h"
+#include "Controllers/PABotBase2/PABotBase2_Connection.h"
+#include "StandardHid_Keyboard.h"
+#include "StandardHid_KeyboardWithScheduler.h"
+
+namespace PokemonAutomation{
+namespace StandardHid{
+
+
+
+class PABotBase2_Keyboard final :
+    public Keyboard,
+    public KeyboardControllerWithScheduler,
+    private ControllerStatusThreadCallback
+{
+public:
+    using ContextType = KeyboardContext;
+
+    static void add_message_loggers(PABotBase2::MessageLogger& message_logger);
+
+
+public:
+    PABotBase2_Keyboard(
+        Logger& logger,
+        PABotBase2::Connection& connection
+    );
+    ~PABotBase2_Keyboard();
+    void stop();
+
+    virtual Logger& logger() override{
+        return m_logger;
+    }
+    virtual bool is_ready() const override{
+        return m_connection.is_ready();
+    }
+
+
+public:
+//    virtual ControllerType controller_type() const override{
+//        return ControllerType::HID_Keyboard;
+//    }
+    virtual ControllerClass controller_class() const noexcept override{
+        return ControllerClass::HID_Keyboard;
+    }
+
+    virtual ControllerPerformanceClass performance_class() const override{
+        return ControllerPerformanceClass::SerialPABotBase_Wired;
+    }
+    virtual Milliseconds ticksize() const override{
+        return Milliseconds(0);
+    }
+    virtual Milliseconds cooldown() const override{
+        return Milliseconds(8);
+    }
+    virtual Milliseconds timing_variation() const override{
+        return Milliseconds(0);
+    }
+    virtual bool atomic_multibutton() const override{
+        return true;
+    }
+
+
+public:
+    //  Superscalar Commands (the "ssf" framework)
+
+    virtual void issue_barrier(Cancellable* cancellable) override{
+        KeyboardControllerWithScheduler::issue_barrier(cancellable);
+    }
+    virtual void issue_nop(Cancellable* cancellable, Milliseconds duration) override{
+        KeyboardControllerWithScheduler::issue_nop(cancellable, duration);
+    }
+    virtual void issue_key(
+        Cancellable* cancellable,
+        Milliseconds delay, Milliseconds hold, Milliseconds cooldown,
+        KeyboardKey key
+    ) override{
+        KeyboardControllerWithScheduler::issue_key(cancellable, delay, hold, cooldown, key);
+    }
+    virtual void issue_keys(
+        Cancellable* cancellable,
+        Milliseconds delay, Milliseconds hold, Milliseconds cooldown,
+        const std::vector<KeyboardKey>& keys
+    ) override{
+        KeyboardControllerWithScheduler::issue_keys(cancellable, delay, hold, cooldown, keys);
+    }
+
+
+public:
+    virtual void update_status(Cancellable& cancellable) override;
+    virtual void stop_with_error(std::string error_message) override;
+
+    std::string error_string() const{
+        ReadSpinLock lg(m_error_lock);
+        return m_error_string;
+    }
+
+
+public:
+    virtual void cancel_all_commands() override;
+    virtual void replace_on_next_command() override;
+    virtual bool cancel_all_and_wait(Milliseconds timeout) override;
+
+    virtual void wait_for_all(Cancellable* cancellable) override;
+
+
+private:
+    virtual void execute_state(
+        Cancellable* cancellable,
+        const SuperscalarScheduler::ScheduleEntry& entry
+    ) override;
+
+    void status_thread();
+
+
+protected:
+    std::map<uint64_t, KeyboardKey> m_last_state;
+
+    //  These are set on construction and never changed again. So it is safe to
+    //  access these asynchronously.
+    PABotBase2::Connection& m_connection;
+
+    mutable SpinLock m_error_lock;
+    std::string m_error_string;
+
+    std::unique_ptr<ControllerStatusThread> m_status_thread;
+};
+
+
+
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/GameConsole/ConsoleHandle.cpp b/SerialPrograms/Source/GameConsole/ConsoleHandle.cpp
new file mode 100644
index 0000000000..0b02773118
--- /dev/null
+++ b/SerialPrograms/Source/GameConsole/ConsoleHandle.cpp
@@ -0,0 +1,124 @@
+/*  Console Handle
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Exceptions.h"
+#include "Common/Cpp/Containers/Pimpl.tpp"
+#include "CommonFramework/Tools/GlobalThreadPools.h"
+#include "CommonFramework/VideoPipeline/Stats/ThreadUtilizationStats.h"
+#include "Controllers/NullController.h"
+#include "Framework/ConsoleSystemSession.h"
+#include "ConsoleHandle.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace GameConsole{
+
+
+
+struct ConsoleHandle::Data{
+    ConsoleSystemSession& m_session;
+    size_t m_index;
+    NullController m_null_controller;
+
+    ThreadPoolUtilizationStat m_realtime_inference_utilization;
+    ThreadPoolUtilizationStat m_normal_inference_utilization;
+    ThreadUtilizationStat m_thread_utilization;
+
+    Data(ConsoleSystemSession& session)
+        : m_session(session)
+        , m_index(session.console_number())
+        , m_null_controller(session.logger())
+        , m_realtime_inference_utilization(
+            GlobalThreadPools::computation_realtime(),
+            "Real-Time Pool"
+        )
+        , m_normal_inference_utilization(
+            GlobalThreadPools::computation_normal(),
+            "Normal Pool"
+        )
+        , m_thread_utilization(
+            current_thread_handle(),
+            "Program Thread:"
+        )
+    {}
+};
+
+
+
+
+
+
+//ConsoleHandle::ConsoleHandle(ConsoleHandle&& x) = default;
+ConsoleHandle::~ConsoleHandle(){
+    overlay().remove_stat(m_data->m_thread_utilization);
+    overlay().remove_stat(m_data->m_normal_inference_utilization);
+    overlay().remove_stat(m_data->m_realtime_inference_utilization);
+}
+
+
+ConsoleHandle::ConsoleHandle(ConsoleSystemSession& session)
+    : VideoStream(
+        session.logger(),
+        session.audio(),
+        session.video(),
+        session.stream_history(),
+        session.overlay()
+    )
+    , m_data(CONSTRUCT_TOKEN, session)
+{
+    session.overlay().add_stat(m_data->m_realtime_inference_utilization);
+    session.overlay().add_stat(m_data->m_normal_inference_utilization);
+    session.overlay().add_stat(m_data->m_thread_utilization);
+}
+
+
+
+size_t ConsoleHandle::index() const{
+    return m_data->m_index;
+}
+size_t ConsoleHandle::controllers() const{
+    return m_data->m_session.controllers();
+}
+AbstractController& ConsoleHandle::controller(size_t index){
+    if (index >= m_data->m_session.controllers()){
+        throw InternalProgramError(
+            &logger(),
+            PA_CURRENT_FUNCTION,
+            "Controller index is out-of-bounds: " + std::to_string(index)
+        );
+    }
+    AbstractController* ptr = m_data->m_session.controller(index).controller();
+    if (ptr == nullptr){
+        return m_data->m_null_controller;
+    }
+    return *ptr;
+}
+
+void ConsoleHandle::wait_for_all_controllers() noexcept{
+    size_t total = m_data->m_session.controllers();
+    for (size_t c = 0; c < total; c++){
+        m_data->m_session.controller(c).try_run<AbstractController>([](AbstractController& controller){
+            controller.wait_for_all(nullptr);
+        });
+    }
+}
+void ConsoleHandle::cancel_all_controllers() noexcept{
+    size_t total = m_data->m_session.controllers();
+    for (size_t c = 0; c < total; c++){
+        m_data->m_session.controller(c).try_run<AbstractController>([](AbstractController& controller){
+            controller.cancel_all_commands();
+        });
+    }
+}
+
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/GameConsole/ConsoleHandle.h b/SerialPrograms/Source/GameConsole/ConsoleHandle.h
new file mode 100644
index 0000000000..08d226fea3
--- /dev/null
+++ b/SerialPrograms/Source/GameConsole/ConsoleHandle.h
@@ -0,0 +1,69 @@
+/*  Console Handle
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_GameConsole_ConsoleHandle_H
+#define PokemonAutomation_GameConsole_ConsoleHandle_H
+
+#include "Common/Cpp/Containers/Pimpl.h"
+#include "CommonFramework/Tools/VideoStream.h"
+#include "Controllers/Controller.h"
+
+namespace PokemonAutomation{
+namespace GameConsole{
+
+class ConsoleSystemSession;
+
+
+
+class ConsoleHandle : public VideoStream{
+public:
+    virtual ~ConsoleHandle();
+    ConsoleHandle(ConsoleHandle&& x) = delete;
+    void operator=(ConsoleHandle&& x) = delete;
+    ConsoleHandle(const ConsoleHandle& x) = delete;
+    void operator=(const ConsoleHandle& x) = delete;
+
+
+public:
+    ConsoleHandle(ConsoleSystemSession& session);
+
+    size_t index() const;
+
+    operator Logger&(){ return logger(); }
+    operator VideoFeed&(){ return video(); }
+    operator VideoOverlay&(){ return overlay(); }
+    operator AudioFeed&(){ return audio(); }
+    operator const StreamHistorySession&() const{ return history(); }
+
+
+public:
+    size_t controllers() const;
+    AbstractController& controller(size_t index);
+
+    template <typename ControllerType = AbstractController>
+    ControllerType& controller(size_t index = 0){
+        return controller(index).cast_with_exception<ControllerType>();
+    }
+
+
+public:
+    void wait_for_all_controllers() noexcept;
+    void cancel_all_controllers() noexcept;
+
+
+private:
+    struct Data;
+    Pimpl<Data> m_data;
+};
+
+
+
+
+}
+}
+#endif
+
+
diff --git a/SerialPrograms/Source/GameConsole/ConsolePanel.cpp b/SerialPrograms/Source/GameConsole/ConsolePanel.cpp
new file mode 100644
index 0000000000..8736d5af45
--- /dev/null
+++ b/SerialPrograms/Source/GameConsole/ConsolePanel.cpp
@@ -0,0 +1,70 @@
+/*  Console Panel
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Json/JsonValue.h"
+#include "Framework/ConsolePanelSession.h"
+#include "ConsolePanel.h"
+
+namespace PokemonAutomation{
+namespace GameConsole{
+
+
+
+ConsolePanelDescriptor::ConsolePanelDescriptor(
+    std::string identifier,
+    std::string category, std::string display_name,
+    std::string doc_link,
+    std::string description,
+    PanelQualityStanding standing,
+    bool restore_defaults_button,
+    size_t num_controllers
+)
+    : PanelDescriptor(
+        std::move(identifier),
+        std::move(category), std::move(display_name),
+        std::move(doc_link),
+        std::move(description),
+        standing,
+        restore_defaults_button
+    )
+    , m_num_controllers(num_controllers)
+{}
+std::unique_ptr<PanelSession> ConsolePanelDescriptor::make_panel() const{
+    return std::make_unique<ConsolePanelSession>(*this);
+}
+
+
+
+ConsolePanelInstance::ConsolePanelInstance()
+    : m_options(LockMode::UNLOCK_WHILE_RUNNING)
+{}
+
+void ConsolePanelInstance::add_option(ConfigOption& option, std::string serialization_string){
+    m_options.add_option(option, std::move(serialization_string));
+}
+
+std::string ConsolePanelInstance::check_validity() const{
+    return m_options.check_validity();
+}
+void ConsolePanelInstance::restore_defaults(){
+    return m_options.restore_defaults();
+}
+JsonValue ConsolePanelInstance::to_json() const{
+    return m_options.to_json();
+}
+void ConsolePanelInstance::load_json(const JsonValue& json){
+    m_options.load_json(json);
+}
+
+
+
+
+
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/GameConsole/ConsolePanel.h b/SerialPrograms/Source/GameConsole/ConsolePanel.h
new file mode 100644
index 0000000000..cf8c6f95db
--- /dev/null
+++ b/SerialPrograms/Source/GameConsole/ConsolePanel.h
@@ -0,0 +1,105 @@
+/*  Console Panel
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  ConsolePanel is a panel with:
+ *    - Has options.
+ *    - Has a console.
+ *    - Cannot be run.
+ *
+ */
+
+#ifndef PokemonAutomation_GameConsole_ConsolePanel_H
+#define PokemonAutomation_GameConsole_ConsolePanel_H
+
+#include "Common/Cpp/Options/BatchOption.h"
+#include "CommonFramework/Panels/PanelDescriptor.h"
+
+namespace PokemonAutomation{
+namespace GameConsole{
+
+
+class ConsoleSystemSession;
+class ConsolePanelInstance;
+
+
+
+class ConsolePanelDescriptor : public PanelDescriptor{
+public:
+    ConsolePanelDescriptor(
+        std::string identifier,
+        std::string category, std::string display_name,
+        std::string doc_link,
+        std::string description,
+        PanelQualityStanding standing,
+        bool restore_defaults_button = true,
+        size_t num_controllers = 1
+    );
+
+    size_t num_controllers() const{ return m_num_controllers; }
+
+    virtual std::unique_ptr<PanelSession> make_panel() const override;
+    virtual std::unique_ptr<ConsolePanelInstance> make_instance(ConsoleSystemSession& system) const = 0;
+
+
+private:
+    const size_t m_num_controllers;
+};
+
+
+
+class ConsolePanelInstance{
+public:
+    virtual ~ConsolePanelInstance() = default;
+    ConsolePanelInstance(const ConsolePanelInstance&) = delete;
+    void operator=(const ConsolePanelInstance&) = delete;
+
+
+public:
+    ConsolePanelInstance();
+
+
+public:
+    //  Serialization
+
+    virtual std::string check_validity() const;
+    virtual void restore_defaults();
+    virtual JsonValue to_json() const;
+    virtual void load_json(const JsonValue& json);
+
+
+protected:
+    friend class ConsolePanelSession;
+
+    BatchOption m_options;
+    void add_option(ConfigOption& option, std::string serialization_string);
+
+};
+
+
+
+template <typename Instance>
+class ConsolePanelWrapper : public Instance::Descriptor{
+public:
+    virtual std::unique_ptr<ConsolePanelInstance> make_instance(
+        ConsoleSystemSession& system
+    ) const override{
+        if constexpr (std::is_constructible_v<Instance, ConsoleSystemSession&>){
+            return std::make_unique<Instance>(system);
+        }else{
+            return std::make_unique<Instance>();
+        }
+    }
+};
+
+template <typename Instance>
+std::unique_ptr<PanelDescriptor> make_ConsolePanel(){
+    return std::make_unique<ConsolePanelWrapper<Instance>>();
+}
+
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/GameConsole/ConsoleProgram.cpp b/SerialPrograms/Source/GameConsole/ConsoleProgram.cpp
new file mode 100644
index 0000000000..814305cf83
--- /dev/null
+++ b/SerialPrograms/Source/GameConsole/ConsoleProgram.cpp
@@ -0,0 +1,99 @@
+/*  Console Program
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Panels/PanelSession.h"
+#include "CommonTools/StartupChecks/StartProgramChecks.h"
+#include "Framework/ConsoleSystemSession.h"
+#include "Framework/ConsoleProgramSession.h"
+#include "ConsoleProgram.h"
+
+namespace PokemonAutomation{
+namespace GameConsole{
+
+
+
+ConsoleProgramEnvironment::ConsoleProgramEnvironment(
+    const ProgramInfo& program_info,
+    CancellableScope& scope,
+    ProgramSession& session,
+    StatsTracker* current_stats,
+    const StatsTracker* historical_stats,
+    ConsoleSystemSession& system
+)
+    : ProgramEnvironment(program_info, session, current_stats, historical_stats)
+    , m_console(new ConsoleHandle(system))
+{
+    m_console->initialize_inference_threads(scope);
+}
+ConsoleProgramEnvironment::ConsoleProgramEnvironment(
+    const ProgramInfo& program_info,
+    CancellableScope& scope,
+    ProgramSession& session,
+    StatsTracker* current_stats,
+    const StatsTracker* historical_stats,
+    std::unique_ptr<ConsoleHandle> console
+)
+    : ProgramEnvironment(program_info, session, current_stats, historical_stats)
+    , m_console(std::move(console))
+{
+    m_console->initialize_inference_threads(scope);
+}
+void ConsoleProgramEnvironment::log_to_ui(const std::string& msg, Color color){
+    m_console->overlay().add_log(msg, color);
+}
+
+
+ConsoleProgramDescriptor::ConsoleProgramDescriptor(
+    std::string identifier,
+    std::string category, std::string display_name,
+    std::string doc_link,
+    std::string description,
+    PanelQualityStanding standing,
+    ProgramControllerClass controller_class,
+    FeedbackType feedback,
+    AllowCommandsWhenRunning allow_commands_while_running,
+    std::vector<std::string> required_resources
+)
+    : ProgramDescriptor(
+        std::move(identifier),
+        std::move(category), std::move(display_name),
+        std::move(doc_link),
+        std::move(description),
+        standing,
+        true,
+        std::move(required_resources)
+    )
+    , m_controller_class(controller_class)
+    , m_feedback(feedback)
+    , m_allow_commands_while_running(
+        allow_commands_while_running == AllowCommandsWhenRunning::ENABLE_COMMANDS
+    )
+{}
+std::unique_ptr<PanelSession> ConsoleProgramDescriptor::make_panel() const{
+    return std::make_unique<ConsoleProgramSession>(*this);
+}
+
+
+
+void ConsoleProgramInstance::run_start_program_checks(
+    const ProgramDescriptor& descriptor,
+    ProgramEnvironment& env
+){
+    const ConsoleProgramDescriptor& ldescriptor = dynamic_cast<const ConsoleProgramDescriptor&>(descriptor);
+    ConsoleProgramEnvironment& lenv = dynamic_cast<ConsoleProgramEnvironment&>(env);
+    start_program_feedback_check(ldescriptor, lenv.console());
+}
+void ConsoleProgramInstance::start_program_feedback_check(
+    const ConsoleProgramDescriptor& descriptor,
+    VideoStream& stream
+){
+    StartProgramChecks::check_feedback(stream, descriptor.feedback());
+}
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/GameConsole/ConsoleProgram.h b/SerialPrograms/Source/GameConsole/ConsoleProgram.h
new file mode 100644
index 0000000000..a844d18678
--- /dev/null
+++ b/SerialPrograms/Source/GameConsole/ConsoleProgram.h
@@ -0,0 +1,144 @@
+/*  Console Program
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  ConsolePanel is a panel with:
+ *    - Has options.
+ *    - Has a console.
+ *    - Can be run.
+ *
+ *  This is the main header for game console programs.
+ *  This file is intentionally thin and has only the bare minimum dependencies
+ *  for programs.
+ *
+ */
+
+#ifndef PokemonAutomation_GameConsole_ConsoleProgram_H
+#define PokemonAutomation_GameConsole_ConsoleProgram_H
+
+#include <memory>
+#include "CommonFramework/Globals.h"
+#include "CommonFramework/Panels/ProgramDescriptor.h"
+#include "CommonFramework/Tools/ProgramEnvironment.h"
+#include "ConsoleHandle.h"
+
+namespace PokemonAutomation{
+namespace GameConsole{
+
+class ConsoleSystemSession;
+class ConsoleProgramInstance;
+
+
+
+class ConsoleProgramEnvironment : public ProgramEnvironment{
+public:
+    ConsoleProgramEnvironment(
+        const ProgramInfo& program_info,
+        CancellableScope& scope,
+        ProgramSession& session,
+        StatsTracker* current_stats,
+        const StatsTracker* historical_stats,
+        ConsoleSystemSession& system
+    );
+    ConsoleProgramEnvironment(
+        const ProgramInfo& program_info,
+        CancellableScope& scope,
+        ProgramSession& session,
+        StatsTracker* current_stats,
+        const StatsTracker* historical_stats,
+        std::unique_ptr<ConsoleHandle> console
+    );
+
+
+public:
+    ConsoleHandle& console(){ return *m_console; }
+    virtual void log_to_ui(const std::string& msg, Color color = Color()) override;
+
+
+private:
+    std::unique_ptr<ConsoleHandle> m_console;
+};
+
+
+
+class ConsoleProgramDescriptor : public ProgramDescriptor{
+public:
+    ConsoleProgramDescriptor(
+        std::string identifier,
+        std::string category, std::string display_name,
+        std::string doc_link,
+        std::string description,
+        PanelQualityStanding standing,
+        ProgramControllerClass controller_class,
+        FeedbackType feedback,
+        AllowCommandsWhenRunning allow_commands_while_running,
+        std::vector<std::string> required_resources = {}
+    );
+
+    ProgramControllerClass controller_class() const{ return m_controller_class; }
+    FeedbackType feedback() const{ return m_feedback; }
+    bool allow_commands_while_running() const{ return m_allow_commands_while_running; }
+
+    virtual std::unique_ptr<PanelSession> make_panel() const override;
+    virtual std::unique_ptr<ConsoleProgramInstance> make_instance(
+        ConsoleSystemSession& system
+    ) const = 0;
+
+
+private:
+    const ProgramControllerClass m_controller_class;
+    const FeedbackType m_feedback;
+    const bool m_allow_commands_while_running;
+};
+
+
+
+class ConsoleProgramInstance : public ProgramInstance{
+public:
+    using ProgramInstance::ProgramInstance;
+
+    virtual void program(ConsoleProgramEnvironment& env, CancellableScope& scope) = 0;
+
+
+public:
+    //  Startup Checks: Feel free to override to change behavior.
+
+    virtual void run_start_program_checks(
+        const ProgramDescriptor& descriptor,
+        ProgramEnvironment& env
+    ) override;
+    virtual void start_program_feedback_check(
+        const ConsoleProgramDescriptor& descriptor,
+        VideoStream& stream
+    );
+};
+
+
+
+
+
+template <typename Instance>
+class ConsoleProgramWrapper : public Instance::Descriptor{
+public:
+    virtual std::unique_ptr<ConsoleProgramInstance> make_instance(
+        ConsoleSystemSession& system
+    ) const override{
+        if constexpr (std::is_constructible_v<Instance, ConsoleSystemSession&>){
+            return std::make_unique<Instance>(system);
+        }else{
+            return std::make_unique<Instance>();
+        }
+    }
+};
+
+template <typename Instance>
+std::unique_ptr<PanelDescriptor> make_ConsoleProgram(){
+    return std::make_unique<ConsoleProgramWrapper<Instance>>();
+}
+
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/GameConsole/Framework/ConsolePanelSession.cpp b/SerialPrograms/Source/GameConsole/Framework/ConsolePanelSession.cpp
new file mode 100644
index 0000000000..2cf4ceb24d
--- /dev/null
+++ b/SerialPrograms/Source/GameConsole/Framework/ConsolePanelSession.cpp
@@ -0,0 +1,63 @@
+/*  Console Panel Session
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/EarlyShutdown.h"
+#include "Common/Cpp/Json/JsonValue.h"
+#include "Common/Cpp/Json/JsonObject.h"
+#include "ConsolePanelSession.h"
+
+namespace PokemonAutomation{
+namespace GameConsole{
+
+
+
+bool ConsolePanelSession::try_shutdown(){
+    return m_system.try_shutdown();
+}
+ConsolePanelSession::~ConsolePanelSession(){
+    blocking_shutdown(
+        m_system.logger(),
+        "ConsolePanelSession",
+        [this]{ return try_shutdown(); }
+    );
+}
+ConsolePanelSession::ConsolePanelSession(const ConsolePanelDescriptor& descriptor)
+    : UiState<ConsolePanelSession, PanelSession>(descriptor)
+    , m_descriptor(descriptor)
+    , m_system_option(descriptor.num_controllers())
+    , m_system(m_system_option, true, 0)
+    , m_instance(descriptor.make_instance(m_system))
+{}
+
+ConfigOption& ConsolePanelSession::options(){
+    return m_instance->m_options;
+}
+
+
+void ConsolePanelSession::restore_defaults(){
+    m_instance->restore_defaults();
+}
+JsonValue ConsolePanelSession::to_json() const{
+    JsonObject obj = std::move(*m_instance->to_json().to_object());
+    obj["ConsoleSetup"] = m_system_option.to_json();
+    return obj;
+}
+void ConsolePanelSession::load_json(const JsonValue& json){
+    const JsonObject* obj = json.to_object();
+    if (obj == nullptr){
+        return;
+    }
+    const JsonValue* value = obj->get_value("ConsoleSetup");
+    if (value){
+        m_system.load_json(*value);
+    }
+    m_instance->load_json(json);
+}
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/GameConsole/Framework/ConsolePanelSession.h b/SerialPrograms/Source/GameConsole/Framework/ConsolePanelSession.h
new file mode 100644
index 0000000000..7063d69f19
--- /dev/null
+++ b/SerialPrograms/Source/GameConsole/Framework/ConsolePanelSession.h
@@ -0,0 +1,55 @@
+/*  Console Panel Session
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_GameConsole_ConsolePanelSession_H
+#define PokemonAutomation_GameConsole_ConsolePanelSession_H
+
+#include "CommonFramework/Panels/PanelSession.h"
+#include "GameConsole/ConsolePanel.h"
+#include "ConsoleSystemSession.h"
+
+namespace PokemonAutomation{
+namespace GameConsole{
+
+
+
+class ConsolePanelSession final : public UiState<ConsolePanelSession, PanelSession>{
+public:
+    bool try_shutdown();
+    ~ConsolePanelSession();
+    ConsolePanelSession(const ConsolePanelDescriptor& descriptor);
+
+
+public:
+    const ConsolePanelDescriptor& descriptor() const{ return m_descriptor; }
+
+    Logger& logger(){ return m_system.logger(); }
+    ConsoleSystemSession& system(){ return m_system; }
+    ConfigOption& options();
+
+
+public:
+    virtual void restore_defaults() override;
+    virtual JsonValue to_json() const override;
+    virtual void load_json(const JsonValue& json) override;
+
+
+private:
+    const ConsolePanelDescriptor& m_descriptor;
+
+    ConsoleSystemOption m_system_option;
+    ConsoleSystemSession m_system;
+
+    std::unique_ptr<ConsolePanelInstance> m_instance;
+};
+
+
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/GameConsole/Framework/ConsoleProgramSession.cpp b/SerialPrograms/Source/GameConsole/Framework/ConsoleProgramSession.cpp
new file mode 100644
index 0000000000..f8c81bbd7a
--- /dev/null
+++ b/SerialPrograms/Source/GameConsole/Framework/ConsoleProgramSession.cpp
@@ -0,0 +1,123 @@
+/*  Console Program Session
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/ScopeExit.h"
+#include "Common/Cpp/Json/JsonObject.h"
+#include "Common/Cpp/Containers/FixedLimitVector.tpp"
+#include "ConsoleProgramSession.h"
+
+namespace PokemonAutomation{
+namespace GameConsole{
+
+
+bool ConsoleProgramSession::try_shutdown(){
+    ConsoleProgramSession::internal_stop_program();
+    join_program_thread();
+    return m_system.try_shutdown();
+}
+ConsoleProgramSession::~ConsoleProgramSession(){
+    blocking_shutdown(
+        logger(),
+        "ConsoleProgramSession",
+        [this]{ return try_shutdown(); }
+    );
+
+    //  The instance may hold references to m_system.
+    //  So it must be destroyed first.
+    m_instance.reset();
+}
+
+ConsoleProgramSession::ConsoleProgramSession(
+    const ConsoleProgramDescriptor& descriptor,
+    std::unique_ptr<ConfigOption> extra_option
+)
+    : UiState<ConsoleProgramSession, PanelSession>(descriptor)
+    , ProgramSession(descriptor)
+    , m_descriptor(descriptor)
+    , m_system_option(1, std::move(extra_option))
+    , m_system(
+        m_system_option,
+        descriptor.allow_commands_while_running(),
+        0,
+        instance_id()
+    )
+{
+    m_instance = descriptor.make_instance(m_system);
+}
+ConfigOption& ConsoleProgramSession::options(){
+    return m_instance->options();
+}
+std::string ConsoleProgramSession::check_validity() const{
+    return m_instance->check_validity();
+}
+void ConsoleProgramSession::restore_defaults(){
+    std::lock_guard<Mutex> lg(program_lock());
+    if (current_state() != ProgramState::STOPPED){
+        logger().log("Cannot change settings while program is running.", COLOR_RED);
+        return;
+    }
+    logger().log("Restoring settings to defaults...");
+    m_instance->restore_defaults();
+}
+JsonValue ConsoleProgramSession::to_json() const{
+    JsonObject obj = std::move(*m_instance->to_json().to_object());
+    obj["ConsoleSetup"] = m_system_option.to_json();
+    return obj;
+}
+void ConsoleProgramSession::load_json(const JsonValue& json){
+    const JsonObject* obj = json.to_object();
+    if (obj == nullptr){
+        return;
+    }
+    const JsonValue* value = obj->get_value("ConsoleSetup");
+    if (value){
+        m_system.load_json(*value);
+    }
+    m_instance->load_json(json);
+}
+
+
+std::unique_ptr<ProgramEnvironment> ConsoleProgramSession::make_env(const ProgramInfo& program_info){
+    auto env = std::make_unique<ConsoleProgramEnvironment>(
+        program_info,
+        *m_scope,
+        *this,
+        current_stats_tracker(),
+        historical_stats_tracker(),
+        m_system
+    );
+    return env;
+}
+void ConsoleProgramSession::internal_run_program(ProgramEnvironment& env){
+    ConsoleProgramInstance& instance = static_cast<ConsoleProgramInstance&>(*m_instance);
+    ConsoleProgramEnvironment& lenv = static_cast<ConsoleProgramEnvironment&>(env);
+
+    size_t controllers = lenv.console().controllers();
+
+    //  Attach all the controllers to the scope so they can be cancelled from the top.
+    FixedLimitVector<ControllerContext<AbstractController>> contexts(controllers);
+    for (size_t c = 0; c < controllers; c++){
+        contexts.emplace_back(*m_scope, lenv.console().controller(c));
+    }
+
+    ScopeExit on_exit([&]{
+        lenv.console().cancel_all_controllers();
+    });
+
+    instance.program(lenv, *m_scope);
+    lenv.console().wait_for_all_controllers();
+}
+
+
+
+
+
+
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/GameConsole/Framework/ConsoleProgramSession.h b/SerialPrograms/Source/GameConsole/Framework/ConsoleProgramSession.h
new file mode 100644
index 0000000000..97b373df80
--- /dev/null
+++ b/SerialPrograms/Source/GameConsole/Framework/ConsoleProgramSession.h
@@ -0,0 +1,61 @@
+/*  Console Program Session
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_GameConsole_ConsoleProgramSession_H
+#define PokemonAutomation_GameConsole_ConsoleProgramSession_H
+
+#include "CommonFramework/Panels/PanelSession.h"
+#include "CommonFramework/ProgramSession.h"
+#include "GameConsole/ConsoleProgram.h"
+#include "ConsoleSystemSession.h"
+
+namespace PokemonAutomation{
+namespace GameConsole{
+
+
+class ConsoleProgramSession
+    : public UiState<ConsoleProgramSession, PanelSession>
+    , public ProgramSession
+{
+public:
+    bool try_shutdown();
+    ~ConsoleProgramSession();
+    ConsoleProgramSession(
+        const ConsoleProgramDescriptor& descriptor,
+        std::unique_ptr<ConfigOption> extra_option = nullptr
+    );
+
+
+public:
+    const ConsoleProgramDescriptor& descriptor() const{ return m_descriptor; }
+    ConsoleSystemSession& system(){ return m_system; }
+    ConfigOption& options();
+
+
+public:
+    virtual std::string check_validity() const override;
+    virtual void restore_defaults() override;
+    virtual JsonValue to_json() const override;
+    virtual void load_json(const JsonValue& json) override;
+
+
+protected:
+    virtual std::unique_ptr<ProgramEnvironment> make_env(const ProgramInfo& program_info) override;
+    virtual void internal_run_program(ProgramEnvironment& env) override;
+
+
+private:
+    const ConsoleProgramDescriptor& m_descriptor;
+
+    ConsoleSystemOption m_system_option;
+    ConsoleSystemSession m_system;
+};
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/GameConsole/Framework/ConsoleSystemOption.cpp b/SerialPrograms/Source/GameConsole/Framework/ConsoleSystemOption.cpp
new file mode 100644
index 0000000000..4c87ef2cac
--- /dev/null
+++ b/SerialPrograms/Source/GameConsole/Framework/ConsoleSystemOption.cpp
@@ -0,0 +1,109 @@
+/*  Console System Option
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Exceptions.h"
+#include "Common/Cpp/Json/JsonValue.h"
+#include "Common/Cpp/Json/JsonArray.h"
+#include "Common/Cpp/Json/JsonObject.h"
+#include "Common/Cpp/Containers/FixedLimitVector.tpp"
+#include "GameConsole/Framework/ConsoleSystemOption.h"
+
+namespace PokemonAutomation{
+namespace GameConsole{
+
+
+const std::string ConsoleSystemOption::JSON_CAMERA      = "Camera";
+const std::string ConsoleSystemOption::JSON_VIDEO       = "Video";
+const std::string ConsoleSystemOption::JSON_AUDIO       = "Audio";
+const std::string ConsoleSystemOption::JSON_OVERLAY     = "Overlay";
+const std::string ConsoleSystemOption::JSON_CONTROLLER  = "Controller";
+const std::string ConsoleSystemOption::JSON_CONTROLLERS = "Controllers";
+const std::string ConsoleSystemOption::JSON_OPTIONS     = "Options";
+
+
+
+ConsoleSystemOption::ConsoleSystemOption(
+    size_t num_controllers,
+    std::unique_ptr<ConfigOption> extra_option
+)
+    : m_controllers(num_controllers)
+    , m_extra_option(std::move(extra_option))
+{
+    if (num_controllers == 0){
+        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "num_controllers cannot be 0.");
+    }
+    bool enable_input = true;
+    for (size_t c = 0; c < num_controllers; c++){
+        m_controllers.emplace_back(enable_input);
+        enable_input = false;
+    }
+}
+JsonValue ConsoleSystemOption::to_json() const{
+    JsonObject root;
+    root[JSON_VIDEO] = m_video.to_json();
+    root[JSON_AUDIO] = m_audio.to_json();
+    root[JSON_OVERLAY] = m_overlay.to_json();
+    if (m_controllers.size() == 1){
+        root[JSON_CONTROLLER] = m_controllers[0].to_json();
+    }else{
+        JsonArray list;
+        for (const ControllerOption& controller : m_controllers){
+            list.push_back(controller.to_json());
+        }
+        root[JSON_CONTROLLERS] = std::move(list);
+    }
+    if (m_extra_option){
+        root[JSON_OPTIONS] = m_extra_option->to_json();
+    }
+    return root;
+}
+void ConsoleSystemOption::load_json(const JsonValue& json){
+    const JsonObject* obj = json.to_object();
+    if (obj == nullptr){
+        return;
+    }
+    const JsonValue* value;
+    value = obj->get_value(JSON_VIDEO);
+    if (value){
+        m_video.load_json(*value);
+    }
+    value = obj->get_value(JSON_AUDIO);
+    if (value){
+        m_audio.load_json(*value);
+    }
+    value = obj->get_value(JSON_OVERLAY);
+    if (value){
+        m_overlay.load_json(*value);
+    }
+    value = obj->get_value(JSON_CONTROLLER);
+    if (value){
+        m_controllers[0].load_json(*value);
+    }
+    const JsonArray* array = obj->get_array(JSON_CONTROLLERS);
+    if (array){
+        size_t c = 0;
+        size_t stop = std::min(m_controllers.size(), array->size());
+        for (; c < stop; c++){
+            m_controllers[c].load_json((*array)[c]);
+        }
+//        stop = m_controllers.size();
+//        for (; c < stop; c++){
+//            m_controllers[c].set_descriptor(null_controller_descriptor());
+//        }
+    }
+    if (m_extra_option){
+        value = obj->get_value(JSON_OPTIONS);
+        if (value){
+            m_extra_option->load_json(*value);
+        }
+    }
+}
+
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/GameConsole/Framework/ConsoleSystemOption.h b/SerialPrograms/Source/GameConsole/Framework/ConsoleSystemOption.h
new file mode 100644
index 0000000000..128898297c
--- /dev/null
+++ b/SerialPrograms/Source/GameConsole/Framework/ConsoleSystemOption.h
@@ -0,0 +1,57 @@
+/*  Console System Option
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  This class represents the serializable state of a console.
+ *  This class maintains no runtime state or UI and is not thread-safe.
+ *
+ */
+
+#ifndef PokemonAutomation_GameConsole_ConsoleSystemOption_H
+#define PokemonAutomation_GameConsole_ConsoleSystemOption_H
+
+#include "Common/Cpp/Containers/FixedLimitVector.h"
+#include "Common/Cpp/Options/ConfigOption.h"
+#include "CommonFramework/AudioPipeline/AudioOption.h"
+#include "CommonFramework/VideoPipeline/VideoSourceOption.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayOption.h"
+#include "CommonFramework/Panels/ProgramDescriptor.h"
+#include "Controllers/ControllerOption.h"
+
+namespace PokemonAutomation{
+namespace GameConsole{
+
+
+class ConsoleSystemOption final{
+    static const std::string JSON_CAMERA;
+    static const std::string JSON_VIDEO;
+    static const std::string JSON_AUDIO;
+    static const std::string JSON_OVERLAY;
+    static const std::string JSON_CONTROLLER;
+    static const std::string JSON_CONTROLLERS;
+    static const std::string JSON_OPTIONS;
+
+public:
+    ConsoleSystemOption(
+        size_t num_controllers,
+        std::unique_ptr<ConfigOption> extra_option = nullptr
+    );
+
+    JsonValue to_json() const;
+    void load_json(const JsonValue& json);
+
+
+public:
+    VideoSourceOption m_video;
+    AudioOption m_audio;
+    VideoOverlayOption m_overlay;
+    FixedLimitVector<ControllerOption> m_controllers;
+    std::unique_ptr<ConfigOption> m_extra_option;
+};
+
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/GameConsole/Framework/ConsoleSystemSession.cpp b/SerialPrograms/Source/GameConsole/Framework/ConsoleSystemSession.cpp
new file mode 100644
index 0000000000..0e9e08a0a2
--- /dev/null
+++ b/SerialPrograms/Source/GameConsole/Framework/ConsoleSystemSession.cpp
@@ -0,0 +1,269 @@
+/*  Console System Session
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/ColoredText.h"
+#include "Common/Cpp/EarlyShutdown.h"
+#include "Common/Cpp/Logging/GlobalLogger.h"
+#include "Common/Cpp/Containers/FixedLimitVector.tpp"
+#include "CommonFramework/VideoPipeline/Stats/MemoryUtilizationStats.h"
+#include "CommonFramework/VideoPipeline/Stats/CpuUtilizationStats.h"
+#include "CommonFramework/VideoPipeline/Stats/ThreadUtilizationStats.h"
+#include "Integrations/ProgramTracker.h"
+#include "ConsoleSystemSession.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace GameConsole{
+
+
+bool ConsoleSystemSession::try_shutdown() noexcept{
+    bool success = true;
+
+    global_input_remove_listener(*this);
+
+    m_video.remove_state_listener(m_history);
+    m_video.remove_state_listener(m_history);
+    m_audio.remove_working_stream_listener(m_history);
+    m_audio.remove_state_listener(m_history);
+
+    m_overlay.remove_stat(*m_main_thread_utilization);
+    m_overlay.remove_stat(*m_cpu_utilization);
+    m_overlay.remove_stat(m_memory_usage->m_process);
+    m_overlay.remove_stat(m_memory_usage->m_system);
+
+    success &= m_video.try_shutdown();
+
+    return success;
+}
+ConsoleSystemSession::~ConsoleSystemSession(){
+    ProgramTracker::instance().remove_console(m_console_tracking_id);
+    blocking_shutdown(
+        m_logger,
+        "ConsoleSystemSession",
+        [this]{ return ConsoleSystemSession::try_shutdown(); }
+    );
+}
+ConsoleSystemSession::ConsoleSystemSession(
+    ConsoleSystemOption& option,
+    bool allow_commands_while_locked,
+    size_t console_number,
+    std::optional<uint64_t> program_tracking_id
+)
+    : m_allow_commands_while_locked(allow_commands_while_locked)
+    , m_console_number(console_number)
+    , m_logger(global_logger_raw(), "Console " + std::to_string(console_number))
+    , m_option(option)
+    , m_video(m_logger, option.m_video)
+    , m_audio(m_logger, option.m_audio)
+    , m_overlay(m_logger, option.m_overlay)
+    , m_controllers(option.m_controllers.size())
+    , m_history(m_logger)
+    , m_memory_usage(new MemoryUtilizationStats())
+    , m_cpu_utilization(new CpuUtilizationStat())
+    , m_main_thread_utilization(new ThreadUtilizationStat(current_thread_handle(), "Main Qt Thread:"))
+{
+    if (option.m_controllers.size() == 1){
+        m_controllers.emplace_back(m_logger, option.m_controllers[0]);
+    }else{
+        for (ControllerOption& controller : option.m_controllers){
+            m_controllers.emplace_back(m_logger, m_controllers.size(), controller);
+        }
+    }
+
+    update_status();
+    m_history.set_audio_session(m_audio);
+    m_history.start(
+        m_audio.input_choice(),
+        m_video.current_source() != nullptr
+    );
+
+    try{
+        m_overlay.add_stat(m_memory_usage->m_system);
+        m_overlay.add_stat(m_memory_usage->m_process);
+        m_overlay.add_stat(*m_cpu_utilization);
+        m_overlay.add_stat(*m_main_thread_utilization);
+
+        m_audio.add_state_listener(m_history);
+        m_video.add_state_listener(m_history);
+        m_video.add_frame_listener(m_history);
+
+        m_overlay.add_hid_listener(*this);
+    }catch (...){
+        ConsoleSystemSession::try_shutdown();
+        throw;
+    }
+
+    m_console_tracking_id = ProgramTracker::instance().add_console(program_tracking_id, *this);
+}
+
+
+std::string ConsoleSystemSession::status() const{
+    std::lock_guard<Mutex> lg(m_lock);
+    return m_status_text;
+}
+
+
+JsonValue ConsoleSystemSession::to_json() const{
+    std::lock_guard<Mutex> lg(m_lock);
+    return m_option.to_json();
+}
+void ConsoleSystemSession::load_json(const JsonValue& json){
+    std::lock_guard<Mutex> lg(m_lock);
+
+    m_option.load_json(json);
+    m_video.load(m_option.m_video);
+    m_audio.load(m_option.m_audio);
+    m_overlay.load(m_option.m_overlay);
+
+    size_t c = 0;
+
+    size_t stop = m_option.m_controllers.size();
+    for (; c < stop; c++){
+        m_controllers[c].session.load(m_option.m_controllers[c]);
+    }
+}
+
+
+void ConsoleSystemSession::lock_controllers(std::string reason){
+    std::string status;
+    {
+        std::lock_guard<Mutex> lg(m_lock);
+        m_lock_controllers_reason = std::move(reason);
+        for (ControllerEntry& controller : m_controllers){
+            controller.session.set_options_locked(true);
+        }
+        status = update_status();
+    }
+    m_listeners.run_method(&Listener::on_lock_controllers);
+    m_listeners.run_method(&Listener::on_input_status_change, status);
+}
+void ConsoleSystemSession::unlock_controllers(){
+    std::string status;
+    {
+        std::lock_guard<Mutex> lg(m_lock);
+        m_lock_controllers_reason.clear();
+        global_input_clear_state();
+        for (ControllerEntry& controller : m_controllers){
+            controller.session.set_options_locked(false);
+        }
+        status = update_status();
+    }
+    m_listeners.run_method(&Listener::on_unlock_controllers);
+    m_listeners.run_method(&Listener::on_input_status_change, status);
+}
+void ConsoleSystemSession::save_history(const std::string& filename){
+    m_history.save(filename);
+}
+
+
+std::string ConsoleSystemSession::update_status(){
+    //  Must call under the lock.
+
+    //  No controllers are ready.
+    bool ok = false;
+    for (ControllerEntry& controller : m_controllers){
+        if (controller.session.ready()){
+            ok = true;
+            break;
+        }
+    }
+    if (!ok){
+        m_status_text = "Keyboard: " + html_color_text("&#x2b24;", COLOR_RED);
+        return m_status_text;
+    }
+
+    //  Controllers are locked. (program is probably running)
+    if (!m_lock_controllers_reason.empty() && !allow_commands_while_locked()){
+        m_status_text = "Keyboard: " + html_color_text("&#x2b24;", COLOR_PURPLE);
+        return m_status_text;
+    }
+
+    //  Not focused.
+    if (!m_focused){
+        m_status_text = "Keyboard: " + html_color_text("&#x2b24;", COLOR_ORANGE);
+        return m_status_text;
+    }
+
+    //  Ready.
+    m_status_text = "Keyboard: " + html_color_text("&#x2b24;", COLOR_DARKGREEN);
+    return m_status_text;
+}
+void ConsoleSystemSession::on_focus_in(){
+//    cout << "ConsoleSystemSession::on_focus_in()" << endl;
+    std::string status;
+    {
+        std::lock_guard<Mutex> lg(m_lock);
+        if (m_focused){
+            return;
+        }
+        m_focused = true;
+
+        global_input_add_listener(*this);
+        status = update_status();
+    }
+    m_listeners.run_method(&Listener::on_input_status_change, status);
+}
+void ConsoleSystemSession::on_focus_out(){
+//    cout << "ConsoleSystemSession::on_focus_out()" << endl;
+    std::string status;
+    {
+        std::lock_guard<Mutex> lg(m_lock);
+        if (!m_focused){
+            return;
+        }
+        m_focused = false;
+        if (!m_lock_controllers_reason.empty() && !allow_commands_while_locked()){
+            return;
+        }
+
+        global_input_clear_state();
+        global_input_remove_listener(*this);
+
+        for (ControllerEntry& controller : m_controllers){
+            std::string error = controller.session.try_run<AbstractController>([](AbstractController& controller){
+                controller.cancel_all_commands();
+            });
+            if (!error.empty()){
+                controller.session.logger().log(error, COLOR_RED);
+            }
+        }
+
+        status = update_status();
+    }
+    m_listeners.run_method(&Listener::on_input_status_change, status);
+}
+void ConsoleSystemSession::run_controller_input(ControllerInputState& state){
+    std::lock_guard<Mutex> lg(m_lock);
+    if (!m_focused){
+        m_logger.log("Keyboard Command Suppressed: Not in focus.", COLOR_RED);
+        return;
+    }
+    if (!m_lock_controllers_reason.empty() && !allow_commands_while_locked()){
+        m_logger.log("Keyboard Command Suppressed: " + m_lock_controllers_reason, COLOR_RED);
+        return;
+    }
+
+//    cout << "ConsoleSystemSession::run_controller_input()" << endl;
+    for (ControllerEntry& controller : m_controllers){
+        std::string error = controller.session.try_run<AbstractController>([&](AbstractController& controller){
+            controller.run_controller_input(state);
+        });
+        if (!error.empty()){
+            controller.session.logger().log("Keyboard Command Failed: " + error, COLOR_RED);
+        }
+    }
+}
+
+
+
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/GameConsole/Framework/ConsoleSystemSession.h b/SerialPrograms/Source/GameConsole/Framework/ConsoleSystemSession.h
new file mode 100644
index 0000000000..62ec876c71
--- /dev/null
+++ b/SerialPrograms/Source/GameConsole/Framework/ConsoleSystemSession.h
@@ -0,0 +1,165 @@
+/*  Console System Session
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  This class holds the run-time state of an entire Switch system.
+ *
+ *    - Camera
+ *    - Audio
+ *    - Video Overlay
+ *    - Controllers
+ *
+ *  This class is fully thread-safe. You can call any functions from anywhere at
+ *  anytime.
+ *
+ *  Warning: Constructing this class requires an "option" parameter. It is not
+ *  safe to modify this "option" parameter during the lifetime of this class.
+ *
+ */
+
+#ifndef PokemonAutomation_GameConsole_ConsoleSystemSession_H
+#define PokemonAutomation_GameConsole_ConsoleSystemSession_H
+
+#include "Common/Cpp/UiWrapper.h"
+#include "Common/Cpp/EarlyShutdown.h"
+#include "Common/Cpp/Logging/TaggedLogger.h"
+#include "Common/Cpp/Containers/FixedLimitVector.h"
+#include "CommonFramework/AudioPipeline/AudioSession.h"
+#include "CommonFramework/VideoPipeline/VideoSession.h"
+#include "CommonFramework/VideoPipeline/VideoOverlaySession.h"
+#include "CommonFramework/Recording/StreamHistorySession.h"
+#include "ControllerInput/ControllerInput.h"
+#include "Controllers/ControllerSession.h"
+#include "Integrations/ProgramTrackerInterfaces.h"
+#include "ConsoleSystemOption.h"
+
+namespace PokemonAutomation{
+    class MemoryUtilizationStats;
+    class CpuUtilizationStat;
+    class ThreadUtilizationStat;
+namespace GameConsole{
+
+
+class ConsoleSystemSession final
+    : public UiState<ConsoleSystemSession>
+    , public TryShutdownable
+    , public TrackableConsole
+    , private VideoDisplayHidListener
+    , private ControllerInputListener
+{
+public:
+    struct Listener{
+        virtual void on_input_status_change(const std::string& status){}
+        virtual void on_lock_controllers(){}
+        virtual void on_unlock_controllers(){}
+    };
+
+    void add_listener(Listener& listener){
+        m_listeners.add(listener);
+    }
+    void remove_listener(Listener& listener){
+        m_listeners.remove(listener);
+    }
+
+
+public:
+    virtual bool try_shutdown() noexcept override;
+    ~ConsoleSystemSession();
+
+    ConsoleSystemSession(
+        ConsoleSystemOption& option,
+        bool allow_commands_while_locked,
+        size_t console_number,
+        std::optional<uint64_t> program_tracking_id = {}
+    );
+
+
+public:
+    size_t console_number() const{ return m_console_number; }
+    bool allow_commands_while_locked() const{ return m_allow_commands_while_locked; }
+    std::string status() const;
+
+    Logger& logger(){ return m_logger; }
+
+    VideoSession& video(){ return m_video; }
+    AudioSession& audio(){ return m_audio; }
+    VideoOverlaySession& overlay(){ return m_overlay; }
+    const StreamHistorySession& stream_history() const{ return m_history; }
+    ConfigOption* extra_option(){ return m_option.m_extra_option.get(); }
+
+
+public:
+    virtual VideoFeed& video_feed() noexcept override{ return video(); }
+    virtual AudioFeed& audio_feed() noexcept override{ return audio(); }
+    virtual size_t controllers() const noexcept override{ return m_controllers.size(); }
+    virtual ControllerSession& controller(size_t index) noexcept override{ return m_controllers[index].session; }
+
+    JsonValue to_json() const;
+    void load_json(const JsonValue& json);
+
+
+public:
+    void lock_controllers(std::string reason);
+    void unlock_controllers();
+    void save_history(const std::string& filename);
+
+
+private:
+    std::string update_status();
+
+    virtual void on_focus_in() override;
+    virtual void on_focus_out() override;
+
+    virtual void run_controller_input(ControllerInputState& state) override;
+
+
+private:
+    const bool m_allow_commands_while_locked;
+
+    //  The console # within a program.
+    const size_t m_console_number;
+    std::optional<uint64_t> m_console_tracking_id;
+
+    TaggedLogger m_logger;
+    ConsoleSystemOption& m_option;
+
+    VideoSession m_video;
+    AudioSession m_audio;
+    VideoOverlaySession m_overlay;
+
+    struct ControllerEntry{
+        TaggedLogger logger;
+        ControllerSession session;
+
+        ControllerEntry(TaggedLogger& p_logger, ControllerOption& option)
+            : logger(p_logger)
+            , session(logger, option, std::nullopt)
+        {}
+        ControllerEntry(TaggedLogger& p_logger, size_t p_controller_index, ControllerOption& option)
+            : logger(p_logger, std::to_string(p_controller_index))
+            , session(logger, option, p_controller_index)
+        {}
+    };
+    FixedLimitVector<ControllerEntry> m_controllers;
+
+    StreamHistorySession m_history;
+
+    mutable Mutex m_lock;
+    std::string m_lock_controllers_reason;
+    bool m_focused = false;
+    std::string m_status_text;
+
+    std::unique_ptr<MemoryUtilizationStats> m_memory_usage;
+    std::unique_ptr<CpuUtilizationStat> m_cpu_utilization;
+    std::unique_ptr<ThreadUtilizationStat> m_main_thread_utilization;
+
+    ListenerSet<Listener> m_listeners;
+};
+
+
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/GameConsole/Framework/MultiConsolePanelSession.cpp b/SerialPrograms/Source/GameConsole/Framework/MultiConsolePanelSession.cpp
new file mode 100644
index 0000000000..0b42002c1c
--- /dev/null
+++ b/SerialPrograms/Source/GameConsole/Framework/MultiConsolePanelSession.cpp
@@ -0,0 +1,69 @@
+/*  Multi-Console Panel Session
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/EarlyShutdown.h"
+#include "Common/Cpp/Json/JsonValue.h"
+#include "Common/Cpp/Json/JsonObject.h"
+#include "CommonFramework/Logging/Logger.h"
+#include "MultiConsolePanelSession.h"
+
+namespace PokemonAutomation{
+namespace GameConsole{
+
+
+
+bool MultiConsolePanelSession::try_shutdown(){
+    return m_system.try_shutdown();
+}
+MultiConsolePanelSession::~MultiConsolePanelSession(){
+    blocking_shutdown(
+        global_logger_tagged(),
+        "ConsolePanelSession",
+        [this]{ return try_shutdown(); }
+    );
+}
+MultiConsolePanelSession::MultiConsolePanelSession(const MultiConsolePanelDescriptor& descriptor)
+    : UiState<MultiConsolePanelSession, PanelSession>(descriptor)
+    , m_descriptor(descriptor)
+    , m_system_option(
+        descriptor.min_consoles(),
+        descriptor.max_consoles(),
+        descriptor.default_consoles(),
+        descriptor.option_factory()
+    )
+    , m_system(m_system_option, true)
+    , m_instance(descriptor.make_instance(m_system))
+{}
+
+ConfigOption& MultiConsolePanelSession::options(){
+    return m_instance->m_options;
+}
+
+
+void MultiConsolePanelSession::restore_defaults(){
+    m_instance->restore_defaults();
+}
+JsonValue MultiConsolePanelSession::to_json() const{
+    JsonObject obj = std::move(*m_instance->to_json().to_object());
+    obj["ConsoleSetup"] = m_system_option.to_json();
+    return obj;
+}
+void MultiConsolePanelSession::load_json(const JsonValue& json){
+    const JsonObject* obj = json.to_object();
+    if (obj == nullptr){
+        return;
+    }
+    const JsonValue* value = obj->get_value("ConsoleSetup");
+    if (value){
+        m_system.load_json(*value);
+    }
+    m_instance->load_json(json);
+}
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/GameConsole/Framework/MultiConsolePanelSession.h b/SerialPrograms/Source/GameConsole/Framework/MultiConsolePanelSession.h
new file mode 100644
index 0000000000..211288b23f
--- /dev/null
+++ b/SerialPrograms/Source/GameConsole/Framework/MultiConsolePanelSession.h
@@ -0,0 +1,57 @@
+/*  Multi-Console Panel Session
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_GameConsole_MultiConsolePanelSession_H
+#define PokemonAutomation_GameConsole_MultiConsolePanelSession_H
+
+#include "CommonFramework/Panels/PanelSession.h"
+#include "GameConsole/MultiConsolePanel.h"
+#include "MultiConsoleSystemSession.h"
+
+namespace PokemonAutomation{
+namespace GameConsole{
+
+
+
+class MultiConsolePanelSession final : public UiState<MultiConsolePanelSession, PanelSession>{
+public:
+    bool try_shutdown();
+    ~MultiConsolePanelSession();
+    MultiConsolePanelSession(const MultiConsolePanelDescriptor& descriptor);
+
+
+public:
+    const MultiConsolePanelDescriptor& descriptor() const{ return m_descriptor; }
+
+    Logger& logger(){ return m_system.logger(); }
+    MultiConsoleSystemSession& system(){ return m_system; }
+    ConfigOption& options();
+
+
+public:
+    //  Serialization
+
+    virtual void restore_defaults() override;
+    virtual JsonValue to_json() const override;
+    virtual void load_json(const JsonValue& json) override;
+
+
+private:
+    const MultiConsolePanelDescriptor& m_descriptor;
+
+    MultiConsoleSystemOption m_system_option;
+    MultiConsoleSystemSession m_system;
+
+    std::unique_ptr<MultiConsolePanelInstance> m_instance;
+};
+
+
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/GameConsole/Framework/MultiConsoleProgramSession.cpp b/SerialPrograms/Source/GameConsole/Framework/MultiConsoleProgramSession.cpp
new file mode 100644
index 0000000000..3f6cbb6e18
--- /dev/null
+++ b/SerialPrograms/Source/GameConsole/Framework/MultiConsoleProgramSession.cpp
@@ -0,0 +1,167 @@
+/*  Multi-Console Program Session
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/ScopeExit.h"
+#include "Common/Cpp/Json/JsonObject.h"
+#include "MultiConsoleProgramSession.h"
+
+namespace PokemonAutomation{
+namespace GameConsole{
+
+
+
+bool MultiConsoleProgramSession::try_shutdown(){
+    MultiConsoleProgramSession::internal_stop_program();
+    join_program_thread();
+    return m_system.try_shutdown();
+}
+MultiConsoleProgramSession::~MultiConsoleProgramSession(){
+    blocking_shutdown(
+        logger(),
+        "MultiConsoleProgramSession",
+        [this]{ return try_shutdown(); }
+    );
+
+    m_system.remove_listener(*this);
+
+    //  The instance may hold references to m_system.
+    //  So it must be destroyed first.
+    m_instance.reset();
+}
+MultiConsoleProgramSession::MultiConsoleProgramSession(
+    const MultiConsoleProgramDescriptor& descriptor,
+        std::unique_ptr<MultiConsoleSystemOption> option
+)
+    : UiState<MultiConsoleProgramSession, PanelSession>(descriptor)
+    , ProgramSession(descriptor)
+    , m_descriptor(descriptor)
+    , m_system_option(
+        option != nullptr
+            ? std::move(option)
+            : std::make_unique<MultiConsoleSystemOption>(
+                descriptor.min_consoles(),
+                descriptor.max_consoles(),
+                descriptor.default_consoles()
+            )
+    )
+    , m_system(*m_system_option, descriptor.allow_commands_while_running(), instance_id())
+{
+    auto instance = descriptor.make_instance(m_system);
+    instance->update_active_consoles(m_system_option->active_consoles());
+    m_instance = std::move(instance);
+    m_system.add_listener(*this);
+}
+
+
+
+ConfigOption& MultiConsoleProgramSession::options(){
+    return m_instance->options();
+}
+std::string MultiConsoleProgramSession::check_validity() const{
+    return m_instance->check_validity();
+}
+void MultiConsoleProgramSession::restore_defaults(){
+    std::lock_guard<Mutex> lg(program_lock());
+    if (current_state() != ProgramState::STOPPED){
+        logger().log("Cannot change settings while program is running.", COLOR_RED);
+        return;
+    }
+    logger().log("Restoring settings to defaults...");
+    m_instance->restore_defaults();
+}
+JsonValue MultiConsoleProgramSession::to_json() const{
+    JsonObject obj = std::move(*m_instance->to_json().to_object());
+    obj["ConsoleSetup"] = m_system_option->to_json();
+    return obj;
+}
+void MultiConsoleProgramSession::load_json(const JsonValue& json){
+    const JsonObject* obj = json.to_object();
+    if (obj == nullptr){
+        return;
+    }
+    const JsonValue* value = obj->get_value("ConsoleSetup");
+    if (value){
+        m_system.load_json(*value);
+    }
+    m_instance->load_json(json);
+}
+
+
+std::unique_ptr<ProgramEnvironment> MultiConsoleProgramSession::make_env(const ProgramInfo& program_info){
+    size_t consoles = m_system.active_consoles();
+    std::vector<std::unique_ptr<ConsoleHandle>> handles;
+    for (size_t c = 0; c < consoles; c++){
+        ConsoleSystemSession& session = m_system[c];
+        handles.emplace_back(std::make_unique<ConsoleHandle>(session));
+    }
+    return std::make_unique<MultiConsoleProgramEnvironment>(
+        program_info,
+        *m_scope,
+        *this,
+        current_stats_tracker(), historical_stats_tracker(),
+        std::move(handles)
+    );
+}
+void MultiConsoleProgramSession::internal_run_program(ProgramEnvironment& env){
+    MultiConsoleProgramInstance& instance = static_cast<MultiConsoleProgramInstance&>(*m_instance);
+    MultiConsoleProgramEnvironment& lenv = static_cast<MultiConsoleProgramEnvironment&>(env);
+
+    std::deque<ControllerContext<AbstractController>> contexts;
+    size_t total_consoles = m_system.active_consoles();
+    for (size_t console = 0; console < total_consoles; console++){
+        size_t total_controllers = lenv.console(console).controllers();
+
+        //  Attach all the controllers to the scope so they can be cancelled from the top.
+        for (size_t controller = 0; controller < total_controllers; controller++){
+            contexts.emplace_back(*m_scope, lenv.console(console).controller(controller));
+        }
+    }
+
+    {
+        std::lock_guard<Mutex> lg(program_lock());
+        if (current_state() != ProgramState::RUNNING){
+            return;
+        }
+    }
+
+    ScopeExit on_exit([&]{
+        for (size_t c = 0; c < total_consoles; c++){
+            lenv.console(c).cancel_all_controllers();
+        }
+    });
+
+    instance.program(lenv, *m_scope);
+    for (size_t c = 0; c < total_consoles; c++){
+        lenv.console(c).wait_for_all_controllers();
+    }
+}
+
+
+
+
+void MultiConsoleProgramSession::shutdown(){
+    internal_stop_program();
+}
+void MultiConsoleProgramSession::startup(size_t switch_count){
+    MultiConsoleProgramInstance& instance = static_cast<MultiConsoleProgramInstance&>(*m_instance);
+    instance.update_active_consoles(switch_count);
+//    m_listeners.run_method(&Listener::redraw_options);
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/GameConsole/Framework/MultiConsoleProgramSession.h b/SerialPrograms/Source/GameConsole/Framework/MultiConsoleProgramSession.h
new file mode 100644
index 0000000000..44fd2f03f4
--- /dev/null
+++ b/SerialPrograms/Source/GameConsole/Framework/MultiConsoleProgramSession.h
@@ -0,0 +1,68 @@
+/*  Multi-Console Program Session
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_GameConsole_MultiConsoleProgramSession_H
+#define PokemonAutomation_GameConsole_MultiConsoleProgramSession_H
+
+#include "CommonFramework/Panels/PanelSession.h"
+#include "CommonFramework/ProgramSession.h"
+#include "GameConsole/MultiConsoleProgram.h"
+#include "MultiConsoleSystemSession.h"
+
+namespace PokemonAutomation{
+namespace GameConsole{
+
+
+class MultiConsoleProgramSession
+    : public UiState<MultiConsoleProgramSession, PanelSession>
+    , public ProgramSession
+    , private GameConsole::MultiConsoleSystemSession::Listener
+{
+public:
+    bool try_shutdown();
+    ~MultiConsoleProgramSession();
+    MultiConsoleProgramSession(
+        const MultiConsoleProgramDescriptor& descriptor,
+        std::unique_ptr<MultiConsoleSystemOption> option = nullptr
+    );
+
+
+public:
+    const MultiConsoleProgramDescriptor& descriptor() const{ return m_descriptor; }
+    MultiConsoleSystemSession& system(){ return m_system; }
+    ConfigOption& options();
+
+
+public:
+    virtual std::string check_validity() const override;
+    virtual void restore_defaults() override;
+    virtual JsonValue to_json() const override;
+    virtual void load_json(const JsonValue& json) override;
+
+
+protected:
+    virtual std::unique_ptr<ProgramEnvironment> make_env(const ProgramInfo& program_info) override;
+    virtual void internal_run_program(ProgramEnvironment& env) override;
+
+    virtual void on_console_count_lock(bool locked) override{}
+    virtual void shutdown() override;
+    virtual void startup(size_t switch_count) override;
+
+
+private:
+    const MultiConsoleProgramDescriptor& m_descriptor;
+
+    std::unique_ptr<MultiConsoleSystemOption> m_system_option;
+    MultiConsoleSystemSession m_system;
+};
+
+
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/GameConsole/Framework/MultiConsoleSystemOption.cpp b/SerialPrograms/Source/GameConsole/Framework/MultiConsoleSystemOption.cpp
new file mode 100644
index 0000000000..2852ee893a
--- /dev/null
+++ b/SerialPrograms/Source/GameConsole/Framework/MultiConsoleSystemOption.cpp
@@ -0,0 +1,79 @@
+/*  Multi-Console System Option
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Json/JsonValue.h"
+#include "Common/Cpp/Json/JsonArray.h"
+#include "Common/Cpp/Json/JsonObject.h"
+#include "Common/Cpp/Containers/FixedLimitVector.tpp"
+#include "MultiConsoleSystemOption.h"
+
+namespace PokemonAutomation{
+namespace GameConsole{
+
+
+
+MultiConsoleSystemOption::~MultiConsoleSystemOption(){
+
+}
+MultiConsoleSystemOption::MultiConsoleSystemOption(
+    size_t min_consoles,
+    size_t max_consoles,
+    size_t consoles,
+    const OptionFactory& option_factory
+)
+    : m_min_consoles(std::max(min_consoles, (size_t)1))
+    , m_max_consoles(std::min(max_consoles, (size_t)MAX_CONSOLES))
+    , m_active_consoles(0)
+    , m_consoles(m_max_consoles)
+{
+    for (size_t c = 0; c < m_max_consoles; c++){
+        m_consoles.emplace_back(option_factory(c));
+    }
+    consoles = std::max(consoles, m_min_consoles);
+    consoles = std::min(consoles, m_max_consoles);
+    m_active_consoles = consoles;
+}
+
+JsonValue MultiConsoleSystemOption::to_json() const{
+    JsonObject obj;
+    obj["ActiveDevices"] = m_active_consoles;
+    {
+        JsonArray array;
+        for (const auto& item : m_consoles){
+            array.push_back(item->to_json());
+        }
+        obj["DeviceList"] = std::move(array);
+    }
+    return obj;
+}
+void MultiConsoleSystemOption::load_json(const JsonValue& json){
+    const JsonObject* obj = json.to_object();
+    if (obj == nullptr){
+        return;
+    }
+    obj->read_integer(
+        m_active_consoles,
+        "ActiveDevices",
+        m_min_consoles,
+        m_max_consoles
+    );
+    {
+        const JsonArray* array = obj->get_array("DeviceList");
+        if (array != nullptr){
+            size_t c = 0;
+            size_t stop = std::min(m_max_consoles, array->size());
+            for (; c < stop; c++){
+                m_consoles[c]->load_json((*array)[c]);
+            }
+        }
+    }
+}
+
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/GameConsole/Framework/MultiConsoleSystemOption.h b/SerialPrograms/Source/GameConsole/Framework/MultiConsoleSystemOption.h
new file mode 100644
index 0000000000..33044eb8ac
--- /dev/null
+++ b/SerialPrograms/Source/GameConsole/Framework/MultiConsoleSystemOption.h
@@ -0,0 +1,72 @@
+/*  Multi-Console System Option
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_GameConsole_MultiConsoleSystemOption_H
+#define PokemonAutomation_GameConsole_MultiConsoleSystemOption_H
+
+#include <functional>
+#include "Common/Cpp/Containers/FixedLimitVector.h"
+#include "ConsoleSystemOption.h"
+
+namespace PokemonAutomation{
+namespace GameConsole{
+
+
+class MultiConsoleSystemOption{
+public:
+    static const size_t MAX_CONSOLES = 4;
+
+public:
+    virtual ~MultiConsoleSystemOption();
+
+    using OptionFactory = std::function<
+        std::unique_ptr<ConsoleSystemOption>(
+            size_t console_index
+        )
+    >;
+
+    //  Construct the multi-console option.
+    //  By default it constructs the generic console. But you can inject your
+    //  own factory for your own custom subclass.
+    MultiConsoleSystemOption(
+        size_t min_consoles,
+        size_t max_consoles,
+        size_t consoles,
+        const OptionFactory& option_factory = [](size_t console_index){
+            return std::make_unique<ConsoleSystemOption>(1);
+        }
+    );
+
+    void resize(size_t count){
+        m_active_consoles = count;
+    }
+
+public:
+    size_t min_consoles() const{ return m_min_consoles; }
+    size_t max_consoles() const{ return m_max_consoles; }
+
+    size_t active_consoles() const{ return m_active_consoles; }
+    ConsoleSystemOption& operator[](size_t index){ return *m_consoles[index]; }
+
+
+public:
+    virtual JsonValue to_json() const;
+    virtual void load_json(const JsonValue& json);
+
+
+private:
+    const size_t m_min_consoles;
+    const size_t m_max_consoles;
+    size_t m_active_consoles;
+    FixedLimitVector<std::unique_ptr<ConsoleSystemOption>> m_consoles;
+};
+
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/GameConsole/Framework/MultiConsoleSystemSession.cpp b/SerialPrograms/Source/GameConsole/Framework/MultiConsoleSystemSession.cpp
new file mode 100644
index 0000000000..dde05b293c
--- /dev/null
+++ b/SerialPrograms/Source/GameConsole/Framework/MultiConsoleSystemSession.cpp
@@ -0,0 +1,155 @@
+/*  Multi-Console System Session
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/EarlyShutdown.h"
+#include "Common/Cpp/Containers/FixedLimitVector.tpp"
+#include "CommonFramework/Logging/Logger.h"
+#include "MultiConsoleSystemSession.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace GameConsole{
+
+
+void MultiConsoleSystemSession::add_listener(Listener& listener){
+    m_listeners.add(listener);
+}
+void MultiConsoleSystemSession::remove_listener(Listener& listener){
+    m_listeners.remove(listener);
+}
+
+bool MultiConsoleSystemSession::try_shutdown() noexcept{
+    bool success = true;
+    for (std::unique_ptr<ConsoleSystemSession>& console : m_consoles){
+        success &= console->try_shutdown();
+    }
+    return success;
+}
+MultiConsoleSystemSession::~MultiConsoleSystemSession(){
+    blocking_shutdown(
+        m_logger,
+        "MultiConsoleSystemSession",
+        [this]{ return MultiConsoleSystemSession::try_shutdown(); }
+    );
+}
+
+MultiConsoleSystemSession::MultiConsoleSystemSession(
+    MultiConsoleSystemOption& option,
+    bool allow_commands_while_locked,
+    std::optional<uint64_t> program_tracking_id
+)
+    : m_logger(global_logger_tagged())
+    , m_option(option)
+    , m_allow_commands_while_locked(allow_commands_while_locked)
+    , m_program_tracking_id(program_tracking_id)
+    , m_consoles(option.active_consoles())
+{
+    size_t count = option.active_consoles();
+    for (size_t c = 0; c < count; c++){
+        m_consoles.emplace_back(
+            std::make_unique<ConsoleSystemSession>(
+                option[c],
+                allow_commands_while_locked,
+                c,
+                program_tracking_id
+            )
+        );
+    }
+}
+
+void MultiConsoleSystemSession::lock_controllers(const std::string& reason){
+    std::unique_lock<Mutex> lg1(m_state_lock);
+    m_listeners.run_method(&Listener::on_console_count_lock, true);
+    for (std::unique_ptr<ConsoleSystemSession>& console : m_consoles){
+        console->lock_controllers(reason);
+    }
+}
+void MultiConsoleSystemSession::unlock_controllers(){
+    std::unique_lock<Mutex> lg1(m_state_lock);
+    for (std::unique_ptr<ConsoleSystemSession>& console : m_consoles){
+        console->unlock_controllers();
+    }
+    m_listeners.run_method(&Listener::on_console_count_lock, false);
+}
+
+
+void MultiConsoleSystemSession::add_console_count_lock(Listener& listener){
+//    cout << "add_console_count_lock()" << endl;
+    std::lock_guard<Mutex> lg(m_state_lock);
+    m_count_locks.insert(&listener);
+}
+void MultiConsoleSystemSession::remove_console_count_lock(Listener& listener){
+//    cout << "remove_console_count_lock()" << endl;
+    std::lock_guard<Mutex> lg(m_state_lock);
+    m_count_locks.erase(&listener);
+}
+
+void MultiConsoleSystemSession::set_active_consoles(size_t count){
+#if 0
+    //  Can't skip this or first time JSON loading fails.
+    {
+        std::lock_guard<Mutex> lg(m_state_lock);
+        if (count == m_option.active_consoles() &&
+            count == m_consoles.size()
+        ){
+            return;
+        }
+    }
+#endif
+
+    std::lock_guard<Mutex> lg0(m_resize_lock);
+
+    //  Signal all listeners to drop locks.
+    m_listeners.run_method(&Listener::shutdown);
+
+    {
+        std::unique_lock<Mutex> lg1(m_state_lock);
+
+        //  Wait for all locks to be dropped.
+        m_cv.wait(lg1, [this]{
+            return m_count_locks.empty();
+        });
+
+        m_consoles.reset(count);
+        m_option.resize(count);
+        for (size_t c = 0; c < count; c++){
+            m_consoles.emplace_back(
+                std::make_unique<ConsoleSystemSession>(
+                    m_option[c],
+                    m_allow_commands_while_locked,
+                    c,
+                    m_program_tracking_id
+                )
+            );
+        }
+    }
+
+    //  Signal all listeners it's ok to re-lock.
+    m_listeners.run_method(&Listener::startup, count);
+}
+
+
+JsonValue MultiConsoleSystemSession::to_json() const{
+    std::lock_guard<Mutex> lg(m_state_lock);
+    return m_option.to_json();
+}
+void MultiConsoleSystemSession::load_json(const JsonValue& json){
+    {
+        std::lock_guard<Mutex> lg(m_state_lock);
+        m_option.load_json(json);
+    }
+//    cout << "MultiConsoleSystemSession::load_json(): " << m_option.active_consoles() << endl;
+    set_active_consoles(m_option.active_consoles());
+}
+
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/GameConsole/Framework/MultiConsoleSystemSession.h b/SerialPrograms/Source/GameConsole/Framework/MultiConsoleSystemSession.h
new file mode 100644
index 0000000000..e31786be68
--- /dev/null
+++ b/SerialPrograms/Source/GameConsole/Framework/MultiConsoleSystemSession.h
@@ -0,0 +1,109 @@
+/*  Multi-Console System Session
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_GameConsole_MultiConsoleSystemSession_H
+#define PokemonAutomation_GameConsole_MultiConsoleSystemSession_H
+
+#include "Common/Cpp/ListenerSet.h"
+#include "Common/Cpp/UiWrapper.h"
+#include "Common/Cpp/Containers/FixedLimitVector.h"
+#include "ConsoleSystemSession.h"
+#include "MultiConsoleSystemOption.h"
+
+namespace PokemonAutomation{
+namespace GameConsole{
+
+
+class MultiConsoleSystemSession
+    : public UiState<MultiConsoleSystemSession>
+    , public TryShutdownable
+{
+public:
+    struct Listener{
+        //  Called when the console count is locked or unlocked.
+        virtual void on_console_count_lock(bool locked) = 0;
+
+        //  Sent before the console sessions are destroyed. Listeners should
+        //  drop their references to them before returning.
+        virtual void shutdown() = 0;
+
+        //  Sent after new consoles are started up.
+        //  This is called immediately when attaching a listener to give the
+        //  current console count. The listener must drop all references to the
+        //  console sessions before detaching.
+        virtual void startup(size_t console_count) = 0;
+    };
+    void add_listener(Listener& listener);
+    void remove_listener(Listener& listener);
+
+
+public:
+    virtual bool try_shutdown() noexcept override;
+    virtual ~MultiConsoleSystemSession();
+
+    //  Construct the multi-console session.
+    //  By default it constructs the generic console. But you can inject your
+    //  own factory for your own custom subclass.
+    MultiConsoleSystemSession(
+        MultiConsoleSystemOption& option,
+        bool allow_commands_while_locked,
+        std::optional<uint64_t> program_tracking_id = {}
+    );
+
+
+public:
+    Logger& logger(){ return m_logger; }
+
+    //  These are not thread-safe with "resize()".
+    size_t min_consoles() const{ return m_option.min_consoles(); }
+    size_t max_consoles() const{ return m_option.max_consoles(); }
+
+    size_t active_consoles() const{ return m_consoles.size(); }
+    ConsoleSystemSession& operator[](size_t index){ return *m_consoles[index]; }
+
+
+public:
+    void lock_controllers(const std::string& reason);
+    void unlock_controllers();
+
+
+public:
+    //  Lock/unlock the console count.
+    void add_console_count_lock(Listener& listener);
+    void remove_console_count_lock(Listener& listener);
+
+    void set_active_consoles(size_t count);
+
+
+public:
+    JsonValue to_json() const;
+    void load_json(const JsonValue& json);
+
+
+private:
+    Logger& m_logger;
+    MultiConsoleSystemOption& m_option;
+
+    bool m_allow_commands_while_locked;
+    std::optional<uint64_t> m_program_tracking_id;
+
+    Mutex m_resize_lock;
+    FixedLimitVector<std::unique_ptr<ConsoleSystemSession>> m_consoles;
+
+    //  Listeners who are currently locking the console count.
+    //  It is not safe to change the console count if this is not zero.
+    mutable Mutex m_state_lock;
+    ConditionVariable m_cv;
+    std::set<Listener*> m_count_locks;
+
+    ListenerSet<Listener> m_listeners;
+};
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/GameConsole/MultiConsolePanel.cpp b/SerialPrograms/Source/GameConsole/MultiConsolePanel.cpp
new file mode 100644
index 0000000000..604dfd8649
--- /dev/null
+++ b/SerialPrograms/Source/GameConsole/MultiConsolePanel.cpp
@@ -0,0 +1,95 @@
+/*  Multi-Console Panel
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Framework/MultiConsolePanelSession.h"
+#include "MultiConsolePanel.h"
+
+namespace PokemonAutomation{
+namespace GameConsole{
+
+
+MultiConsolePanelDescriptor::MultiConsolePanelDescriptor(
+    std::string identifier,
+    std::string category, std::string display_name,
+    std::string doc_link,
+    std::string description,
+    PanelQualityStanding standing,
+    size_t min_consoles,
+    size_t max_consoles,
+    size_t default_consoles,
+    bool restore_defaults_button
+)
+    : MultiConsolePanelDescriptor(
+        std::move(identifier),
+        std::move(category), std::move(display_name),
+        std::move(doc_link),
+        std::move(description),
+        standing,
+        min_consoles,
+        max_consoles,
+        default_consoles,
+        restore_defaults_button,
+        [](size_t console_index){
+            return std::make_unique<ConsoleSystemOption>(1);
+        }
+    )
+{}
+MultiConsolePanelDescriptor::MultiConsolePanelDescriptor(
+    std::string identifier,
+    std::string category, std::string display_name,
+    std::string doc_link,
+    std::string description,
+    PanelQualityStanding standing,
+    size_t min_consoles,
+    size_t max_consoles,
+    size_t default_consoles,
+    bool restore_defaults_button,
+    OptionFactory option_factory
+)
+    : PanelDescriptor(
+        std::move(identifier),
+        std::move(category), std::move(display_name),
+        std::move(doc_link),
+        std::move(description),
+        standing,
+        restore_defaults_button
+    )
+    , m_min_consoles(min_consoles)
+    , m_max_consoles(max_consoles)
+    , m_default_consoles(default_consoles)
+    , m_option_factory(std::move(option_factory))
+{}
+std::unique_ptr<PanelSession> MultiConsolePanelDescriptor::make_panel() const{
+    return std::make_unique<MultiConsolePanelSession>(*this);
+}
+
+
+
+MultiConsolePanelInstance::MultiConsolePanelInstance()
+    : m_options(LockMode::UNLOCK_WHILE_RUNNING)
+{}
+
+void MultiConsolePanelInstance::add_option(ConfigOption& option, std::string serialization_string){
+    m_options.add_option(option, std::move(serialization_string));
+}
+
+std::string MultiConsolePanelInstance::check_validity() const{
+    return m_options.check_validity();
+}
+void MultiConsolePanelInstance::restore_defaults(){
+    return m_options.restore_defaults();
+}
+JsonValue MultiConsolePanelInstance::to_json() const{
+    return m_options.to_json();
+}
+void MultiConsolePanelInstance::load_json(const JsonValue& json){
+    m_options.load_json(json);
+}
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/GameConsole/MultiConsolePanel.h b/SerialPrograms/Source/GameConsole/MultiConsolePanel.h
new file mode 100644
index 0000000000..16d754819f
--- /dev/null
+++ b/SerialPrograms/Source/GameConsole/MultiConsolePanel.h
@@ -0,0 +1,140 @@
+/*  Multi-Console Panel
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  ConsolePanel is a panel with:
+ *    - Has options.
+ *    - Has multiple consoles.
+ *    - Cannot be run.
+ *
+ */
+
+#ifndef PokemonAutomation_GameConsole_MultiConsolePanel_H
+#define PokemonAutomation_GameConsole_MultiConsolePanel_H
+
+#include <functional>
+#include "Common/Cpp/Options/BatchOption.h"
+#include "CommonFramework/Panels/PanelDescriptor.h"
+
+namespace PokemonAutomation{
+namespace GameConsole{
+
+class ConsoleSystemOption;
+class ConsoleSystemSession;
+class MultiConsoleSystemSession;
+class MultiConsolePanelInstance;
+
+
+
+class MultiConsolePanelDescriptor : public PanelDescriptor{
+public:
+    using OptionFactory = std::function<
+        std::unique_ptr<ConsoleSystemOption>(
+            size_t console_index
+        )
+    >;
+
+    MultiConsolePanelDescriptor(
+        std::string identifier,
+        std::string category, std::string display_name,
+        std::string doc_link,
+        std::string description,
+        PanelQualityStanding standing,
+        size_t min_consoles,
+        size_t max_consoles,
+        size_t default_consoles,
+        bool restore_defaults_button = true
+    );
+    MultiConsolePanelDescriptor(
+        std::string identifier,
+        std::string category, std::string display_name,
+        std::string doc_link,
+        std::string description,
+        PanelQualityStanding standing,
+        size_t min_consoles,
+        size_t max_consoles,
+        size_t default_consoles,
+        bool restore_defaults_button,
+        OptionFactory option_factory
+    );
+
+    size_t min_consoles() const{ return m_min_consoles; }
+    size_t max_consoles() const{ return m_max_consoles; }
+    size_t default_consoles() const{ return m_default_consoles; }
+
+    const OptionFactory& option_factory() const{ return m_option_factory; }
+
+    size_t num_controllers(size_t index) const{ return m_num_controllers[index]; }
+
+    virtual std::unique_ptr<PanelSession> make_panel() const override;
+    virtual std::unique_ptr<MultiConsolePanelInstance> make_instance(MultiConsoleSystemSession& system) const = 0;
+
+
+private:
+    size_t m_min_consoles;
+    size_t m_max_consoles;
+    size_t m_default_consoles;
+    std::vector<size_t> m_num_controllers;
+
+    OptionFactory m_option_factory;
+};
+
+
+
+
+class MultiConsolePanelInstance{
+public:
+    virtual ~MultiConsolePanelInstance() = default;
+    MultiConsolePanelInstance(const MultiConsolePanelInstance&) = delete;
+    void operator=(const MultiConsolePanelInstance&) = delete;
+
+
+public:
+    MultiConsolePanelInstance();
+
+
+public:
+    //  Serialization
+
+    virtual std::string check_validity() const;
+    virtual void restore_defaults();
+    virtual JsonValue to_json() const;
+    virtual void load_json(const JsonValue& json);
+
+
+protected:
+    friend class MultiConsolePanelSession;
+
+    BatchOption m_options;
+    void add_option(ConfigOption& option, std::string serialization_string);
+
+};
+
+
+
+
+template <typename Instance>
+class MultiConsolePanelWrapper : public Instance::Descriptor{
+public:
+    virtual std::unique_ptr<MultiConsolePanelInstance> make_instance(
+        MultiConsoleSystemSession& system
+    ) const override{
+        if constexpr (std::is_constructible_v<Instance, MultiConsoleSystemSession&>){
+            return std::make_unique<Instance>(system);
+        }else{
+            return std::make_unique<Instance>();
+        }
+    }
+};
+
+template <typename Instance>
+std::unique_ptr<PanelDescriptor> make_MultiConsolePanel(){
+    return std::make_unique<MultiConsolePanelWrapper<Instance>>();
+}
+
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/GameConsole/MultiConsoleProgram.cpp b/SerialPrograms/Source/GameConsole/MultiConsoleProgram.cpp
new file mode 100644
index 0000000000..1902ce6ab6
--- /dev/null
+++ b/SerialPrograms/Source/GameConsole/MultiConsoleProgram.cpp
@@ -0,0 +1,154 @@
+/*  Multi-Console Program
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/ScopeExit.h"
+#include "CommonFramework/VideoPipeline/Stats/ThreadUtilizationStats.h"
+#include "CommonFramework/Panels/PanelSession.h"
+#include "CommonFramework/Tools/GlobalThreadPools.h"
+#include "CommonTools/StartupChecks/StartProgramChecks.h"
+#include "Framework/MultiConsoleProgramSession.h"
+#include "MultiConsoleProgram.h"
+
+namespace PokemonAutomation{
+namespace GameConsole{
+
+
+
+MultiConsoleProgramEnvironment::MultiConsoleProgramEnvironment(
+    const ProgramInfo& program_info,
+    CancellableScope& scope,
+    ProgramSession& session,
+    StatsTracker* current_stats,
+    const StatsTracker* historical_stats,
+    std::vector<std::unique_ptr<ConsoleHandle>> consoles
+)
+    : ProgramEnvironment(program_info, session, current_stats, historical_stats)
+    , m_consoles(std::move(consoles))
+{
+    for (std::unique_ptr<ConsoleHandle>& console : m_consoles){
+        console->initialize_inference_threads(scope);
+    }
+}
+void MultiConsoleProgramEnvironment::log_to_ui(const std::string& msg, Color color){
+    for (std::unique_ptr<ConsoleHandle>& console : m_consoles){
+        console->overlay().add_log(msg, color);
+    }
+}
+
+void MultiConsoleProgramEnvironment::run_in_parallel(
+    CancellableScope& scope, size_t s, size_t e,
+    const std::function<void(CancellableScope& scope, ConsoleHandle& console)>& func
+){
+    GlobalThreadPools::unlimited_realtime().run_in_parallel(
+        [&](size_t index){
+            ConsoleHandle& console = *m_consoles[index];
+            ThreadUtilizationStat stat(current_thread_handle(), "Program Thread " + std::to_string(index) + ":");
+            console.overlay().add_stat(stat);
+            ScopeExit on_exit([&]{
+                console.overlay().remove_stat(stat);
+            });
+            func(scope, console);
+            console.controller().wait_for_all(&scope);
+        },
+        s, e
+    );
+}
+
+
+
+
+MultiConsoleProgramDescriptor::MultiConsoleProgramDescriptor(
+    std::string identifier,
+    std::string category, std::string display_name,
+    std::string doc_link,
+    std::string description,
+    PanelQualityStanding standing,
+    ProgramControllerClass controller_class,
+    FeedbackType feedback,
+    AllowCommandsWhenRunning allow_commands_while_running,
+    size_t min_consoles,
+    size_t max_consoles,
+    size_t default_consoles,
+    std::vector<std::string> required_resources
+)
+    : ProgramDescriptor(
+        std::move(identifier),
+        std::move(category), std::move(display_name),
+        std::move(doc_link),
+        std::move(description),
+        standing,
+        true,
+        std::move(required_resources)
+    )
+    , m_controller_class(controller_class)
+    , m_feedback(feedback)
+    , m_allow_commands_while_running(
+        allow_commands_while_running == AllowCommandsWhenRunning::ENABLE_COMMANDS
+    )
+    , m_min_consoles(min_consoles)
+    , m_max_consoles(max_consoles)
+    , m_default_consoles(default_consoles)
+{}
+std::unique_ptr<PanelSession> MultiConsoleProgramDescriptor::make_panel() const{
+    return std::make_unique<MultiConsoleProgramSession>(*this);
+}
+
+
+
+
+void MultiConsoleProgramInstance::run_start_program_checks(
+    const ProgramDescriptor& descriptor,
+    ProgramEnvironment& env
+){
+    const MultiConsoleProgramDescriptor& ldescriptor = dynamic_cast<const MultiConsoleProgramDescriptor&>(descriptor);
+    MultiConsoleProgramEnvironment& lenv = dynamic_cast<MultiConsoleProgramEnvironment&>(env);
+    size_t consoles = lenv.consoles();
+    for (size_t c = 0; c < consoles; c++){
+        start_program_feedback_check(ldescriptor, c, lenv.console(c));
+    }
+}
+void MultiConsoleProgramInstance::start_program_feedback_check(
+    const MultiConsoleProgramDescriptor& descriptor,
+    size_t console_index, VideoStream& stream
+){
+    StartProgramChecks::check_feedback(stream, descriptor.feedback());
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/GameConsole/MultiConsoleProgram.h b/SerialPrograms/Source/GameConsole/MultiConsoleProgram.h
new file mode 100644
index 0000000000..25f77c6af4
--- /dev/null
+++ b/SerialPrograms/Source/GameConsole/MultiConsoleProgram.h
@@ -0,0 +1,210 @@
+/*  Multi-Console Program
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_GameConsole_MultiConsoleProgram_H
+#define PokemonAutomation_GameConsole_MultiConsoleProgram_H
+
+#include <functional>
+#include <memory>
+#include <vector>
+#include "CommonFramework/Globals.h"
+#include "CommonFramework/Tools/ProgramEnvironment.h"
+#include "CommonFramework/Panels/ProgramDescriptor.h"
+#include "ConsoleHandle.h"
+
+namespace PokemonAutomation{
+namespace GameConsole{
+
+class MultiConsoleSystemSession;
+class MultiConsoleProgramInstance;
+
+
+
+class MultiConsoleProgramEnvironment : public ProgramEnvironment{
+public:
+    MultiConsoleProgramEnvironment(
+        const ProgramInfo& program_info,
+        CancellableScope& scope,
+        ProgramSession& session,
+        StatsTracker* current_stats,
+        const StatsTracker* historical_stats,
+        std::vector<std::unique_ptr<ConsoleHandle>> consoles
+    );
+
+
+public:
+    size_t consoles() const{ return m_consoles.size(); }
+    ConsoleHandle& console(size_t index){ return *m_consoles[index]; }
+    virtual void log_to_ui(const std::string& msg, Color color = Color()) override;
+
+
+public:
+    //  Run the specified lambda for all consoles in parallel.
+    void run_in_parallel(
+        CancellableScope& scope,
+        const std::function<void(CancellableScope& scope, ConsoleHandle& console)>& func
+    ){
+        run_in_parallel(scope, 0, m_consoles.size(), func);
+    }
+
+    //  Run the specified lambda for switch indices [s, e) in parallel.
+    void run_in_parallel(
+        CancellableScope& scope, size_t s, size_t e,
+        const std::function<void(CancellableScope& scope, ConsoleHandle& console)>& func
+    );
+
+
+protected:
+    template <typename ConsoleHandleType>
+    void run_in_parallel(
+        CancellableScope& scope,
+        const std::function<void(CancellableScope& scope, ConsoleHandleType& console)>& func
+    ){
+        run_in_parallel<ConsoleHandleType>(scope, 0, m_consoles.size(), func);
+    }
+    template <typename ConsoleHandleType>
+    void run_in_parallel(
+        CancellableScope& scope, size_t s, size_t e,
+        const std::function<void(CancellableScope& scope, ConsoleHandleType& console)>& func
+    ){
+        GameConsole::MultiConsoleProgramEnvironment::run_in_parallel(
+            scope, s, e,
+            [&](CancellableScope& scope, ConsoleHandle& console){
+                func(scope, dynamic_cast<ConsoleHandleType&>(console));
+            }
+        );
+    }
+
+    template <typename ConsoleHandleType, typename ControllerType>
+    void run_in_parallel(
+        CancellableScope& scope,
+        const std::function<void(ConsoleHandleType& console, ControllerContext<ControllerType>& context)>& func
+    ){
+        run_in_parallel<ConsoleHandleType, ControllerType>(scope, 0, m_consoles.size(), func);
+    }
+    template <typename ConsoleHandleType, typename ControllerType>
+    void run_in_parallel(
+        CancellableScope& scope, size_t s, size_t e,
+        const std::function<void(ConsoleHandleType& console, ControllerContext<ControllerType>& context)>& func
+    ){
+        GameConsole::MultiConsoleProgramEnvironment::run_in_parallel(
+            scope, s, e,
+            [&](CancellableScope& scope, ConsoleHandle& console){
+                ControllerContext<ControllerType> context(scope, console.controller<ControllerType>());
+                func(dynamic_cast<ConsoleHandleType&>(console), context);
+            }
+        );
+    }
+
+
+private:
+    std::vector<std::unique_ptr<ConsoleHandle>> m_consoles;
+};
+
+
+
+class MultiConsoleProgramDescriptor : public ProgramDescriptor{
+public:
+    MultiConsoleProgramDescriptor(
+        std::string identifier,
+        std::string category, std::string display_name,
+        std::string doc_link,
+        std::string description,
+        PanelQualityStanding standing,
+        ProgramControllerClass controller_class,
+        FeedbackType feedback,
+        AllowCommandsWhenRunning allow_commands_while_running,
+        size_t min_consoles,
+        size_t max_consoles,
+        size_t default_consoles,
+        std::vector<std::string> required_resources = {}
+    );
+
+    ProgramControllerClass controller_class() const{ return m_controller_class; }
+    FeedbackType feedback() const{ return m_feedback; }
+    bool allow_commands_while_running() const{ return m_allow_commands_while_running; }
+
+    size_t min_consoles() const{ return m_min_consoles; }
+    size_t max_consoles() const{ return m_max_consoles; }
+    size_t default_consoles() const{ return m_default_consoles; }
+
+    virtual std::unique_ptr<PanelSession> make_panel() const override;
+    virtual std::unique_ptr<MultiConsoleProgramInstance> make_instance(
+        MultiConsoleSystemSession& system
+    ) const = 0;
+
+private:
+    const ProgramControllerClass m_controller_class;
+    const FeedbackType m_feedback;
+    const bool m_allow_commands_while_running;
+
+    const size_t m_min_consoles;
+    const size_t m_max_consoles;
+    const size_t m_default_consoles;
+};
+
+
+
+class MultiConsoleProgramInstance : public ProgramInstance{
+public:
+    using ProgramInstance::ProgramInstance;
+
+    //  Called when the # of consoles changes.
+    virtual void update_active_consoles(size_t console_count){}
+
+    virtual void program(MultiConsoleProgramEnvironment& env, CancellableScope& scope) = 0;
+
+
+public:
+    //  Startup Checks: Feel free to override to change behavior.
+
+    virtual void run_start_program_checks(
+        const ProgramDescriptor& descriptor,
+        ProgramEnvironment& env
+    ) override;
+    virtual void start_program_feedback_check(
+        const MultiConsoleProgramDescriptor& descriptor,
+        size_t console_index, VideoStream& stream
+    );
+};
+
+
+
+
+
+template <typename Instance>
+class MultiConsoleProgramWrapper : public Instance::Descriptor{
+public:
+    virtual std::unique_ptr<MultiConsoleProgramInstance> make_instance(
+        MultiConsoleSystemSession& system
+    ) const override{
+        if constexpr (std::is_constructible_v<Instance, MultiConsoleSystemSession&>){
+            return std::make_unique<Instance>(system);
+        }else{
+            return std::make_unique<Instance>();
+        }
+    }
+};
+
+template <typename Instance>
+std::unique_ptr<PanelDescriptor> make_MultiConsoleProgram(){
+    return std::make_unique<MultiConsoleProgramWrapper<Instance>>();
+}
+
+
+
+
+
+
+
+
+
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/GameConsole/Panels/GameConsole_BoxDraw.cpp b/SerialPrograms/Source/GameConsole/Panels/GameConsole_BoxDraw.cpp
new file mode 100644
index 0000000000..c7c1598d00
--- /dev/null
+++ b/SerialPrograms/Source/GameConsole/Panels/GameConsole_BoxDraw.cpp
@@ -0,0 +1,45 @@
+/*  Box Draw
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "GameConsole/Framework/ConsoleSystemSession.h"
+#include "GameConsole_BoxDraw.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace GameConsole{
+
+
+
+BoxDraw_Descriptor::BoxDraw_Descriptor()
+    : ConsolePanelDescriptor(
+        "GameConsole:BoxDraw",
+        "Game Console", "Box Draw",
+        "",
+        "Test box coordinates for development.",
+        PanelQualityStanding::DEVELOPER,
+        false
+    )
+{}
+
+
+BoxDraw::BoxDraw(ConsoleSystemSession& system)
+    : BOX_DRAW(LockMode::UNLOCK_WHILE_RUNNING, system.overlay())
+{
+    PA_ADD_OPTION(BOX_DRAW);
+}
+
+
+
+
+
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/GameConsole/Panels/GameConsole_BoxDraw.h b/SerialPrograms/Source/GameConsole/Panels/GameConsole_BoxDraw.h
new file mode 100644
index 0000000000..06c3b81183
--- /dev/null
+++ b/SerialPrograms/Source/GameConsole/Panels/GameConsole_BoxDraw.h
@@ -0,0 +1,37 @@
+/*  Box Draw
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_GameConsole_BoxDraw_H
+#define PokemonAutomation_GameConsole_BoxDraw_H
+
+#include "CommonFramework/Options/NestedBoxDrawOption.h"
+#include "GameConsole/ConsolePanel.h"
+
+namespace PokemonAutomation{
+namespace GameConsole{
+
+
+class BoxDraw_Descriptor : public ConsolePanelDescriptor{
+public:
+    BoxDraw_Descriptor();
+};
+
+class BoxDraw : public ConsolePanelInstance{
+public:
+    using Descriptor = BoxDraw_Descriptor;
+    BoxDraw(ConsoleSystemSession& system);
+
+private:
+    NestedBoxDrawOption BOX_DRAW;
+};
+
+
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/GameConsole/Panels/GameConsole_MultiConsoleViewer.h b/SerialPrograms/Source/GameConsole/Panels/GameConsole_MultiConsoleViewer.h
new file mode 100644
index 0000000000..7483416505
--- /dev/null
+++ b/SerialPrograms/Source/GameConsole/Panels/GameConsole_MultiConsoleViewer.h
@@ -0,0 +1,43 @@
+/*  Multi-Console Viewer
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_GameConsole_MultiConsoleViewer_H
+#define PokemonAutomation_GameConsole_MultiConsoleViewer_H
+
+#include "GameConsole/MultiConsolePanel.h"
+
+namespace PokemonAutomation{
+namespace GameConsole{
+
+
+
+class MultiConsoleViewer_Descriptor : public MultiConsolePanelDescriptor{
+public:
+    MultiConsoleViewer_Descriptor()
+        : MultiConsolePanelDescriptor(
+            "GameConsole:MultiConsoleViewer",
+            "Game Console",
+            "Multi-Console Viewer",
+            "Programs/NintendoSwitch/SwitchViewer.html",
+            "View multiple consoles simultaneously. Use this to figure out your camera/audio/controller mappings.",
+            PanelQualityStanding::OFFICIAL,
+            1, 4, 2,
+            false
+        )
+    {}
+};
+class MultiConsoleViewer : public MultiConsolePanelInstance{
+public:
+    using Descriptor = MultiConsoleViewer_Descriptor;
+};
+
+
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/GameConsole/Panels/GameConsole_SnapshotDumper.cpp b/SerialPrograms/Source/GameConsole/Panels/GameConsole_SnapshotDumper.cpp
new file mode 100644
index 0000000000..f08cb88b21
--- /dev/null
+++ b/SerialPrograms/Source/GameConsole/Panels/GameConsole_SnapshotDumper.cpp
@@ -0,0 +1,184 @@
+/*  Snapshot Dumper
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Exceptions.h"
+#include "Common/Cpp/Filesystem/Filesystem.h"
+#include "Common/Cpp/PrettyPrint.h"
+#include "CommonFramework/Globals.h"
+#include "CommonFramework/GlobalAutoPaths.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonFramework/VideoPipeline/VideoOverlay.h"
+#include "ControllerInput/Keyboard/GlobalKeyboardHidTracker.h"
+#include "GameConsole_SnapshotDumper.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace GameConsole{
+
+
+SnapshotDumper_Descriptor::SnapshotDumper_Descriptor()
+    : ConsoleProgramDescriptor(
+        "GameConsole:SnapshotDumper",
+        "Game Console", "Snapshot Dumper",
+        "Programs/NintendoSwitch/SnapshotDumper.html",
+        "Periodically take screenshots.",
+        PanelQualityStanding::DEVELOPER,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::NONE,
+        AllowCommandsWhenRunning::ENABLE_COMMANDS
+    )
+{}
+
+SnapshotDumper::~SnapshotDumper(){
+    SNAPSHOT_MODE.remove_listener(*this);
+}
+
+SnapshotDumper::SnapshotDumper()
+    : PERIOD_MILLISECONDS(
+        "<b>Snapshot Period (milliseconds):</b><br>Take screenshot every this many milliseconds.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        1000
+    )
+    , SNAPSHOT_MODE(
+        "<b>Snapshot trigger:",
+        {
+            {SnapshotMode::KEYPRESS,    "key-press",    "Key Press. Press 'Page Down', while the screen is focused."},
+            {SnapshotMode::MOUSE_CLICK, "mouse-click",  "Mouse click on the screen."},
+            {SnapshotMode::PERIODIC,    "periodic",     "Periodic: every X milliseconds as defined below."},
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        SnapshotMode::KEYPRESS
+    ) 
+    , FORMAT(
+        "<b>Image Format:</b>",
+        {
+            {Format::PNG, "png", ".png"},
+            {Format::JPG, "jpg", ".jpg"},
+        },
+        LockMode::UNLOCK_WHILE_RUNNING,
+        Format::JPG
+    )
+{
+    PA_ADD_OPTION(SNAPSHOT_MODE);
+    PA_ADD_OPTION(PERIOD_MILLISECONDS);
+    PA_ADD_OPTION(FORMAT);
+    SNAPSHOT_MODE.add_listener(*this);
+}
+
+void SnapshotDumper::on_config_value_changed(void* object){
+    PERIOD_MILLISECONDS.set_visibility(SNAPSHOT_MODE == SnapshotMode::PERIODIC ? ConfigOptionState::ENABLED : ConfigOptionState::HIDDEN);
+}
+
+class SnapshotClickTrigger : public VideoDisplayHidListener{
+public:
+    ~SnapshotClickTrigger(){
+        detach();
+    }
+    SnapshotClickTrigger(VideoStream& stream, VideoOverlay& overlay, Format format)
+        : m_stream(stream)
+        , m_overlay(overlay)
+        , m_format(format)
+    {
+        try{
+            overlay.add_hid_listener(*this);
+        }catch (...){
+            detach();
+            throw;
+        }
+    }
+    
+    virtual void on_mouse_press(double x, double y) override{
+        dump_snapshot(m_stream, "ScreenshotDumper", to_format_string(m_format));
+    }
+    
+
+private:
+    void detach(){
+        m_overlay.remove_hid_listener(*this);
+    }
+
+private:
+    VideoStream& m_stream;
+    VideoOverlay& m_overlay;
+    Format m_format;
+
+};
+
+
+SnapshotKeyTrigger::~SnapshotKeyTrigger(){
+    detach();
+}
+SnapshotKeyTrigger::SnapshotKeyTrigger(VideoStream& stream, Format format)
+    : m_stream(stream)
+    , m_format(format)
+{
+    global_keyboard_tracker().add_listener(*this);
+}
+
+void SnapshotKeyTrigger::detach(){
+    global_keyboard_tracker().remove_listener(*this);
+}
+void SnapshotKeyTrigger::run_controller_input(ControllerInputState& state){
+    KeyboardInputState* keyboard_state = dynamic_cast<KeyboardInputState*>(&state);
+    if (keyboard_state == nullptr){
+        return;
+    }
+    if (!keyboard_state->keys().contains(KeyboardKey::KEY_PAGE_DOWN)){
+        return;
+    }
+    dump_snapshot(m_stream, "ScreenshotDumper", to_format_string(m_format));
+}
+
+
+void SnapshotDumper::program(ConsoleProgramEnvironment& env, CancellableScope& scope){
+    std::string folder_path = USER_FILE_PATH() + "ScreenshotDumper/";
+    Filesystem::create_directories(Filesystem::Path(folder_path));
+
+    if (SNAPSHOT_MODE == SnapshotMode::KEYPRESS){
+        SnapshotKeyTrigger key_trigger(env.console(), FORMAT);
+        scope.wait_until_cancel();
+    }else if (SNAPSHOT_MODE == SnapshotMode::MOUSE_CLICK){
+        SnapshotClickTrigger click_trigger(env.console(), env.console().overlay(), FORMAT);
+        scope.wait_until_cancel();
+    }else if (SNAPSHOT_MODE == SnapshotMode::PERIODIC){
+        while (true){
+            VideoSnapshot last = env.console().video().snapshot();
+            std::string filename = folder_path + now_to_filestring();
+            last->save(filename + to_format_string(FORMAT));
+            scope.wait_until(last.timestamp + std::chrono::milliseconds(PERIOD_MILLISECONDS));
+        }
+    }else{
+        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Unexpected SNAPSHOT_MODE enum.");
+    }
+}
+
+std::string to_format_string(Format format){
+    switch (format){
+    case Format::PNG:
+        return ".png";
+    case Format::JPG:
+        return ".jpg";
+    default:
+        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "to_format_string: Unknown Format enum.");
+        break;
+    }
+}
+
+void dump_snapshot(VideoStream& stream, std::string folder_name, std::string format){
+    std::string folder_path = USER_FILE_PATH() + folder_name + "/";
+    Filesystem::create_directories(Filesystem::Path(folder_path));
+    VideoSnapshot last = stream.video().snapshot();
+    std::string filename = folder_path + now_to_filestring() + format;
+    last->save(filename);
+}
+
+
+}
+}
+
diff --git a/SerialPrograms/Source/GameConsole/Panels/GameConsole_SnapshotDumper.h b/SerialPrograms/Source/GameConsole/Panels/GameConsole_SnapshotDumper.h
new file mode 100644
index 0000000000..392d316754
--- /dev/null
+++ b/SerialPrograms/Source/GameConsole/Panels/GameConsole_SnapshotDumper.h
@@ -0,0 +1,82 @@
+/*  Snapshot Dumper
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_GameConsole_SnapshotDumper_H
+#define PokemonAutomation_GameConsole_SnapshotDumper_H
+
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "Common/Cpp/Options/EnumDropdownOption.h"
+#include "ControllerInput/ControllerInput.h"
+#include "GameConsole/ConsoleProgram.h"
+
+namespace PokemonAutomation{
+namespace GameConsole{
+
+
+class SnapshotDumper_Descriptor : public ConsoleProgramDescriptor{
+public:
+    SnapshotDumper_Descriptor();
+};
+
+enum class Format{
+    PNG,
+    JPG,
+};
+
+class SnapshotDumper : public ConsoleProgramInstance, public ConfigOption::Listener{
+public:
+    using Descriptor = SnapshotDumper_Descriptor;
+    ~SnapshotDumper();
+    SnapshotDumper();
+
+    virtual void program(ConsoleProgramEnvironment& env, CancellableScope& scope) override;
+
+private:
+    virtual void on_config_value_changed(void* object) override;
+
+private:
+    SimpleIntegerOption<uint32_t> PERIOD_MILLISECONDS;
+    enum class SnapshotMode{
+        KEYPRESS,
+        MOUSE_CLICK,
+        PERIODIC,
+    };
+    EnumDropdownOption<SnapshotMode> SNAPSHOT_MODE;
+    EnumDropdownOption<Format> FORMAT;
+};
+
+
+class SnapshotKeyTrigger : public ControllerInputListener{
+public:
+    ~SnapshotKeyTrigger();
+    SnapshotKeyTrigger(VideoStream& stream, Format format);
+
+private:
+    void detach();
+
+    virtual void run_controller_input(ControllerInputState& state) override;
+
+private:
+    VideoStream& m_stream;
+    Format m_format;
+};
+
+
+std::string to_format_string(Format format);
+
+// takes a snapshot of the screen and saves it to the given folder_name
+void dump_snapshot(
+    VideoStream& stream,
+    std::string folder_name = "ScreenshotDumper",
+    std::string format = ".png"
+);
+
+}
+}
+#endif
+
+
+
diff --git a/SerialPrograms/Source/GameConsole/Panels/GameConsole_VirtualConsole.h b/SerialPrograms/Source/GameConsole/Panels/GameConsole_VirtualConsole.h
new file mode 100644
index 0000000000..7f65690aa0
--- /dev/null
+++ b/SerialPrograms/Source/GameConsole/Panels/GameConsole_VirtualConsole.h
@@ -0,0 +1,67 @@
+/*  Virtual Game Console
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_GameConsole_VirtualConsole_H
+#define PokemonAutomation_GameConsole_VirtualConsole_H
+
+#include "GameConsole/ConsolePanel.h"
+
+namespace PokemonAutomation{
+namespace GameConsole{
+
+
+
+class VirtualConsole_Descriptor : public ConsolePanelDescriptor{
+public:
+    VirtualConsole_Descriptor()
+        : ConsolePanelDescriptor(
+            "GameConsole:VirtualConsole",
+            "Game Console",
+            "Virtual Console",
+            "Programs/NintendoSwitch/VirtualConsole.html",
+            "Play your console from your computer.",
+            PanelQualityStanding::OFFICIAL,
+            false,
+            1
+        )
+    {}
+};
+class VirtualConsole : public ConsolePanelInstance{
+public:
+    using Descriptor = VirtualConsole_Descriptor;
+};
+
+
+
+class MultiControllerTester_Descriptor : public ConsolePanelDescriptor{
+public:
+    MultiControllerTester_Descriptor()
+        : ConsolePanelDescriptor(
+            "GameConsole:MultiControllerTester",
+            "Game Console",
+            "Multi-Controller Tester",
+            "Programs/NintendoSwitch/VirtualConsole.html",
+            "Test multiple controllers at once.",
+            PanelQualityStanding::OFFICIAL,
+            false,
+            8
+        )
+    {}
+};
+class MultiControllerTester : public ConsolePanelInstance{
+public:
+    using Descriptor = MultiControllerTester_Descriptor;
+};
+
+
+
+
+
+
+}
+}
+#endif
+
diff --git a/SerialPrograms/Source/GameConsole/Panels/GameConsole_WaterfillTemplateMaker.cpp b/SerialPrograms/Source/GameConsole/Panels/GameConsole_WaterfillTemplateMaker.cpp
new file mode 100644
index 0000000000..2a9a1ed5ab
--- /dev/null
+++ b/SerialPrograms/Source/GameConsole/Panels/GameConsole_WaterfillTemplateMaker.cpp
@@ -0,0 +1,177 @@
+/*  Waterfill Template Maker
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Kernels/Waterfill/Kernels_Waterfill_Session.h"
+#include "CommonFramework/Logging/Logger.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonTools/Images/BinaryImage_FilterRgb32.h"
+#include "GameConsole/Framework/ConsoleSystemSession.h"
+#include "GameConsole_WaterfillTemplateMaker.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace GameConsole{
+
+
+
+
+WaterfillTemplateMaker_Descriptor::WaterfillTemplateMaker_Descriptor()
+    : ConsoleProgramDescriptor(
+        "NintendoSwitch:WaterfillTemplateMaker",
+        "Nintendo Switch", "Waterfill Template Maker",
+        "",
+        "Helper to make waterfill templates.",
+        PanelQualityStanding::DEVELOPER,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::NONE,
+        AllowCommandsWhenRunning::ENABLE_COMMANDS
+    )
+{}
+
+
+
+WaterfillTemplateMaker::WaterfillTemplateMaker(ConsoleSystemSession& system)
+    : MIN_AREA("<b>Min Area (in pixels):</b>", LockMode::UNLOCK_WHILE_RUNNING, 100)
+    , FILTER_LOWER("<b>Filter (lower):</b>", LockMode::UNLOCK_WHILE_RUNNING, false, 0xff000000, 0xff000000)
+    , FILTER_UPPER("<b>Filter (upper):</b>", LockMode::UNLOCK_WHILE_RUNNING, false, 0xffffffff, 0xffffffff)
+    , BOX_DRAW(LockMode::UNLOCK_WHILE_RUNNING, system.overlay())
+{
+    PA_ADD_OPTION(MIN_AREA);
+    PA_ADD_OPTION(FILTER_LOWER);
+    PA_ADD_OPTION(FILTER_UPPER);
+    PA_ADD_OPTION(BOX_DRAW);
+}
+
+
+void WaterfillTemplateMaker::program(ConsoleProgramEnvironment& env, CancellableScope& scope){
+    using namespace Kernels;
+    using namespace Kernels::Waterfill;
+
+    global_logger_tagged().log("Attempting to make template.");
+
+    VideoSnapshot screenshot = env.console().video().snapshot_latest_blocking();
+    ImageViewRGB32 image;
+    if (BOX_DRAW.CONTENT_BOX.enabled()){
+        image = extract_box_reference(*screenshot.frame, BOX_DRAW.CONTENT_BOX);
+    }
+    image = extract_box_reference(*screenshot.frame, BOX_DRAW.INFERENCE_BOX);
+
+    image.save("WaterfillTemplateMaker-0-SearchBox.png");
+
+    PackedBinaryMatrix matrix = compress_rgb32_to_binary_range(
+        image,
+        FILTER_LOWER | 0xff000000,
+        FILTER_UPPER | 0xff000000
+    );
+
+    PackedBinaryMatrix inverse = matrix.copy();
+    inverse.invert();
+
+
+    auto session = make_WaterfillSession();
+    WaterfillObject largest_object;
+    {
+        session->set_source(matrix);
+        auto finder = session->make_iterator(MIN_AREA);
+        WaterfillObject object;
+        while (finder->find_next(object, true)){
+            if (object.area == 0 || largest_object.box_area() < object.box_area()){
+                largest_object = std::move(object);
+            }
+        }
+    }
+    if (largest_object.area == 0){
+        global_logger_tagged().log("Failed to find any waterfill objects.", COLOR_RED);
+        return;
+    }
+
+//    cout << matrix.dump() << endl;
+
+    ImageViewRGB32 cropped = extract_box_reference(image, largest_object);
+    cropped.save("WaterfillTemplateMaker-1-FoundObject.png");
+
+    //  Remove the background.
+    ImageRGB32 stripped = image.copy();
+    {
+        session->set_source(inverse);
+        auto finder = session->make_iterator(1);
+        WaterfillObject object;
+        if (!finder->find_next(object, true)){
+            global_logger_tagged().log("Failed to waterfill inverse.", COLOR_RED);
+            return;
+        }
+        filter_by_mask(object.packed_matrix(), stripped, Color(0), false);
+    }
+    stripped.save("WaterfillTemplateMaker-2-Stripped.png");
+
+
+#if 0
+
+    std::vector<WaterfillObject> objects = find_objects_inplace(matrix, MIN_AREA);
+    if (objects.empty()){
+        global_logger_tagged().log("Failed to find any waterfill objects.", COLOR_RED);
+        return;
+    }
+
+    const WaterfillObject* largest_object = &objects[0];
+    for (const WaterfillObject& object : objects){
+        if (largest_object->area < object.area){
+            largest_object = &object;
+        }
+    }
+
+    extract_box_reference(image, *largest_object).save("image-cropped.png");
+
+    cout << "Matrix: " << matrix.width() << " x " << matrix.height() << endl;
+    cout << "Image:  " << image.width() << " x " << image.height() << endl;
+
+    ImageRGB32 filtered = image.copy();
+    {
+        auto session = make_WaterfillSession(inverse);
+        auto finder = session->make_iterator(MIN_AREA);
+        WaterfillObject object;
+        if (!finder->find_next(object, true)){
+            global_logger_tagged().log("Failed to waterfill inverse.", COLOR_RED);
+            return;
+        }
+        filter_by_mask(object.packed_matrix(), filtered, Color(0), false);
+        filtered.save("image-filtered.png");
+//        extract_box_reference(filtered, *largest_object).save("image-filtered.png");
+    }
+
+//    filter_by_mask(*largest_object->object., filtered, Color(0), true);
+#endif
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/GameConsole/Panels/GameConsole_WaterfillTemplateMaker.h b/SerialPrograms/Source/GameConsole/Panels/GameConsole_WaterfillTemplateMaker.h
new file mode 100644
index 0000000000..d309568474
--- /dev/null
+++ b/SerialPrograms/Source/GameConsole/Panels/GameConsole_WaterfillTemplateMaker.h
@@ -0,0 +1,47 @@
+/*  Waterfill Template Maker
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_NintendoSwitch_WaterfillTemplateMaker_H
+#define PokemonAutomation_NintendoSwitch_WaterfillTemplateMaker_H
+
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "Common/Cpp/Options/ColorOption.h"
+#include "CommonFramework/Options/NestedBoxDrawOption.h"
+#include "GameConsole/ConsoleProgram.h"
+
+namespace PokemonAutomation{
+namespace GameConsole{
+
+
+
+
+class WaterfillTemplateMaker_Descriptor : public ConsoleProgramDescriptor{
+public:
+    WaterfillTemplateMaker_Descriptor();
+};
+
+
+class WaterfillTemplateMaker : public ConsoleProgramInstance{
+public:
+    using Descriptor = WaterfillTemplateMaker_Descriptor;
+    WaterfillTemplateMaker(GameConsole::ConsoleSystemSession& system);
+
+    virtual void program(ConsoleProgramEnvironment& env, CancellableScope& scope) override;
+
+private:
+    SimpleIntegerOption<size_t> MIN_AREA;
+    ColorOption FILTER_LOWER;
+    ColorOption FILTER_UPPER;
+    NestedBoxDrawOption BOX_DRAW;
+};
+
+
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/GameConsole/UI/CommandRowWidget.cpp b/SerialPrograms/Source/GameConsole/UI/CommandRowWidget.cpp
new file mode 100644
index 0000000000..45c084dfc4
--- /dev/null
+++ b/SerialPrograms/Source/GameConsole/UI/CommandRowWidget.cpp
@@ -0,0 +1,283 @@
+/*  Command Row (Qt Widget)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <QFileDialog>
+#include "Common/Cpp/PrettyPrint.h"
+#include "Common/Cpp/Concurrency/FireForgetDispatcher.h"
+#include "CommonFramework/StaticGlobals.h"
+#include "CommonFramework/GlobalAutoPaths.h"
+#include "CommonFramework/GlobalSettingsPanel.h"
+#include "CommonFramework/Recording/StreamHistoryOption.h"
+#include "CommonFramework/Panels/ConsoleSettingsStretch.h"
+#include "CommandRowWidget.h"
+
+namespace PokemonAutomation{
+namespace GameConsole{
+
+
+
+CommandRowWidget::~CommandRowWidget(){
+    m_session.remove_listener(*this);
+    m_session.overlay().remove_content_listener(*this);
+}
+CommandRowWidget::CommandRowWidget(
+    QWidget& parent,
+    ConsoleSystemSession& session
+)
+    : QWidget(&parent)
+    , m_session(session)
+{
+    QHBoxLayout* layout0 = new QHBoxLayout(this);
+    layout0->setContentsMargins(0, 0, 0, 0);
+
+    m_label = new QLabel("<b>Options:</b>", this);
+    layout0->addWidget(m_label, CONSOLE_SETTINGS_STRETCH_L0_LABEL);
+
+    m_layout = new QHBoxLayout();
+    layout0->addLayout(m_layout, CONSOLE_SETTINGS_STRETCH_L0_RIGHT);
+    m_layout->setContentsMargins(0, 0, 0, 0);
+
+    ConfigOption* extra_option = session.extra_option();
+    if (extra_option){
+        UiWrapper wrapper = extra_option->make_ui_component(this);
+        m_layout->addWidget(dynamic_cast<QWidget*>(wrapper.release()));
+    }
+    m_layout->addStretch(100);
+
+
+    m_status = new QLabel(QString::fromStdString(session.status()), this);
+//    m_status->setVisible(false);
+    m_layout->addWidget(m_status);
+    m_layout->addSpacing(5);
+
+
+    CheckboxDropdown* overlays = new CheckboxDropdown(this, "Overlays");
+    overlays->setMinimumWidth(80);
+    {
+        m_overlay_stats = overlays->addItem("Stats");
+        m_overlay_stats->setChecked(session.overlay().enabled_stats());
+    }
+    {
+        m_overlay_boxes = overlays->addItem("Boxes");
+        m_overlay_boxes->setChecked(session.overlay().enabled_boxes());
+    }
+    if (STATIC_GLOBALS.DEVELOPER_MODE){
+        m_overlay_text = overlays->addItem("Text");  //  Nothing uses text overlay yet.
+        m_overlay_text->setChecked(session.overlay().enabled_text());
+    }
+    if (STATIC_GLOBALS.DEVELOPER_MODE){
+        m_overlay_images = overlays->addItem("Masks");
+        m_overlay_images->setChecked(session.overlay().enabled_images());
+    }
+    {
+        m_overlay_log = overlays->addItem("Log");
+        m_overlay_log->setChecked(session.overlay().enabled_log());
+    }
+    m_layout->addWidget(overlays);
+
+    m_load_profile_button = new QPushButton("Load Profile", this);
+    m_layout->addWidget(m_load_profile_button, 2);
+
+    m_save_profile_button = new QPushButton("Save Profile", this);
+    m_layout->addWidget(m_save_profile_button, 2);
+
+    m_screenshot_button = new QPushButton("Screenshot", this);
+//    m_screenshot_button->setToolTip("Take a screenshot of the console and save to disk.");
+    m_layout->addWidget(m_screenshot_button, 2);
+
+    m_video_button = new QPushButton("Video Capture", this);
+    m_layout->addWidget(m_video_button, 2);
+
+
+    if (m_overlay_stats){
+        connect(
+            m_overlay_stats, &CheckboxDropdownItem::checkStateChanged,
+            this, [this](Qt::CheckState state){
+                m_session.overlay().set_enabled_stats(state == Qt::Checked);
+            }
+        );
+    }
+    if (m_overlay_boxes){
+        connect(
+            m_overlay_boxes, &CheckboxDropdownItem::checkStateChanged,
+            this, [this](Qt::CheckState state){
+
+                m_session.overlay().set_enabled_boxes(state == Qt::Checked);
+            }
+        );
+    }
+    if (m_overlay_text){
+        connect(
+            m_overlay_text, &CheckboxDropdownItem::checkStateChanged,
+            this, [this](Qt::CheckState state){
+                m_session.overlay().set_enabled_text(state == Qt::Checked);
+            }
+        );
+    }
+    if (m_overlay_images){
+        connect(
+            m_overlay_images, &CheckboxDropdownItem::checkStateChanged,
+            this, [this](Qt::CheckState state){
+                m_session.overlay().set_enabled_images(state == Qt::Checked);
+            }
+        );
+    }
+    if (m_overlay_log){
+        connect(
+            m_overlay_log, &CheckboxDropdownItem::checkStateChanged,
+            this, [this](Qt::CheckState state){
+                m_session.overlay().set_enabled_log(state == Qt::Checked);
+            }
+        );
+    }
+
+    connect(
+        m_load_profile_button, &QPushButton::clicked,
+        this, [this](bool){
+            std::string path = QFileDialog::getOpenFileName(
+                this,
+                tr("Choose the name of your profile file"),
+                "",
+                tr("JSON files (*.json)")
+            ).toStdString();
+            if (path.empty()){
+                return;
+            }
+
+            m_session.load_json(load_json_file(path));
+        }
+    );
+    connect(
+        m_save_profile_button, &QPushButton::clicked,
+        this, [this](bool){
+            std::string path = QFileDialog::getSaveFileName(
+                this,
+                tr("Choose the name of your profile file"),
+                "",
+                tr("JSON files (*.json)")
+            ).toStdString();
+            if (path.empty()){
+                return;
+            }
+
+            m_session.to_json().dump(path);
+        }
+    );
+    connect(
+        m_screenshot_button, &QPushButton::clicked,
+        this, [this](bool){
+            global_dispatcher.dispatch([this]{
+                VideoSnapshot image = m_session.video().snapshot();
+                if (!image){
+                    return;
+                }
+                std::string filename = SCREENSHOTS_PATH() + "screenshot-" + now_to_filestring() + ".png";
+                m_session.logger().log("Saving screenshot to: " + filename, COLOR_PURPLE);
+                image->save(filename);
+            });
+        }
+    );
+    if (GlobalSettings::instance().STREAM_HISTORY->enabled()){
+        connect(
+            m_video_button, &QPushButton::clicked,
+            this, [this](bool){
+                global_dispatcher.dispatch([this]{
+                    std::string filename = SCREENSHOTS_PATH() + "video-" + now_to_filestring() + ".mp4";
+                    m_session.logger().log("Saving screenshot to: " + filename, COLOR_PURPLE);
+                    m_session.save_history(filename);
+                });
+            }
+        );
+    }else{
+        m_video_button->setEnabled(false);
+        m_video_button->setToolTip("Please turn on Stream History to enable video capture.");
+    }
+
+    m_session.overlay().add_content_listener(*this);
+    m_session.add_listener(*this);
+}
+
+
+
+void CommandRowWidget::on_input_status_change(const std::string& status){
+    QMetaObject::invokeMethod(this, [this, status]{
+        m_status->setText(QString::fromStdString(status));
+    }, Qt::QueuedConnection);
+}
+void CommandRowWidget::on_lock_controllers(){
+    QMetaObject::invokeMethod(this, [this]{
+        m_load_profile_button->setEnabled(false);
+    }, Qt::QueuedConnection);
+}
+void CommandRowWidget::on_unlock_controllers(){
+    QMetaObject::invokeMethod(this, [this]{
+        m_load_profile_button->setEnabled(true);
+    }, Qt::QueuedConnection);
+}
+
+void CommandRowWidget::on_overlay_enabled_stats(bool enabled){
+    QMetaObject::invokeMethod(this, [this, enabled]{
+        if (m_overlay_stats){
+            m_overlay_stats->setChecked(enabled);
+        }
+    }, Qt::QueuedConnection);
+}
+void CommandRowWidget::on_overlay_enabled_boxes(bool enabled){
+    QMetaObject::invokeMethod(this, [this, enabled]{
+        if (m_overlay_boxes){
+            m_overlay_boxes->setChecked(enabled);
+        }
+    }, Qt::QueuedConnection);
+}
+void CommandRowWidget::on_overlay_enabled_text(bool enabled){
+    QMetaObject::invokeMethod(this, [this, enabled]{
+        if (m_overlay_text){
+            m_overlay_text->setChecked(enabled);
+        }
+    }, Qt::QueuedConnection);
+}
+void CommandRowWidget::on_overlay_enabled_images(bool enabled){
+    QMetaObject::invokeMethod(this, [this, enabled]{
+        if (m_overlay_images){
+            m_overlay_images->setChecked(enabled);
+        }
+    }, Qt::QueuedConnection);
+}
+void CommandRowWidget::on_overlay_enabled_log(bool enabled){
+    QMetaObject::invokeMethod(this, [this, enabled]{
+        if (m_overlay_log){
+            m_overlay_log->setChecked(enabled);
+        }
+    }, Qt::QueuedConnection);
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/GameConsole/UI/CommandRowWidget.h b/SerialPrograms/Source/GameConsole/UI/CommandRowWidget.h
new file mode 100644
index 0000000000..8f606107ca
--- /dev/null
+++ b/SerialPrograms/Source/GameConsole/UI/CommandRowWidget.h
@@ -0,0 +1,71 @@
+/*  Command Row (Qt Widget)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_GameConsole_CommandRowWidget_H
+#define PokemonAutomation_GameConsole_CommandRowWidget_H
+
+#include <QHBoxLayout>
+#include <QLabel>
+#include <QComboBox>
+#include <QPushButton>
+#include "Common/Qt/CheckboxDropdown.h"
+#include "CommonFramework/VideoPipeline/VideoOverlaySession.h"
+#include "GameConsole/Framework/ConsoleSystemSession.h"
+
+namespace PokemonAutomation{
+namespace GameConsole{
+
+
+class CommandRowWidget
+    : public QWidget
+    , public ConsoleSystemSession::Listener
+    , public VideoOverlaySession::ContentListener
+{
+public:
+    ~CommandRowWidget();
+    CommandRowWidget(
+        QWidget& parent,
+        ConsoleSystemSession& session
+    );
+
+
+private:
+    virtual void on_input_status_change(const std::string& status) override;
+    virtual void on_lock_controllers() override;
+    virtual void on_unlock_controllers() override;
+
+    virtual void on_overlay_enabled_stats  (bool enabled) override;
+    virtual void on_overlay_enabled_boxes  (bool enabled) override;
+    virtual void on_overlay_enabled_text   (bool enabled) override;
+    virtual void on_overlay_enabled_images (bool enabled) override;
+    virtual void on_overlay_enabled_log    (bool enabled) override;
+
+
+protected:
+    ConsoleSystemSession& m_session;
+
+    QLabel* m_label = nullptr;
+    QHBoxLayout* m_layout = nullptr;
+
+    QLabel* m_status = nullptr;
+
+    CheckboxDropdownItem* m_overlay_stats = nullptr;
+    CheckboxDropdownItem* m_overlay_boxes = nullptr;
+    CheckboxDropdownItem* m_overlay_text = nullptr;
+    CheckboxDropdownItem* m_overlay_images = nullptr;
+    CheckboxDropdownItem* m_overlay_log = nullptr;
+
+    QPushButton* m_load_profile_button = nullptr;
+    QPushButton* m_save_profile_button = nullptr;
+    QPushButton* m_screenshot_button = nullptr;
+    QPushButton* m_video_button = nullptr;
+};
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/GameConsole/UI/ConsolePanelWidget.cpp b/SerialPrograms/Source/GameConsole/UI/ConsolePanelWidget.cpp
new file mode 100644
index 0000000000..c6d2a4d535
--- /dev/null
+++ b/SerialPrograms/Source/GameConsole/UI/ConsolePanelWidget.cpp
@@ -0,0 +1,46 @@
+/*  Console Panel Widget
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Qt/ShutdownWithEvents.h"
+#include "CommonFramework/Panels/UI/PanelElements.h"
+#include "ConsolePanelWidget.h"
+
+namespace PokemonAutomation{
+
+template class RegisterUiStateQtWidget<GameConsole::ConsolePanelWidget>;
+
+namespace GameConsole{
+
+
+
+ConsolePanelWidget::~ConsolePanelWidget(){
+    shutdown_with_events(
+        m_session.logger(),
+        "ConsolePanelWidget",
+        [this]{ return m_session.try_shutdown(); }
+    );
+}
+ConsolePanelWidget::ConsolePanelWidget(
+    QWidget& parent,
+    ConsolePanelSession& session
+)
+    : QWidget(&parent)
+    , m_session(session)
+{
+    populate_panel_widget(
+        *this,
+        session.descriptor(),
+        &m_session.system(),
+        session.options(),
+        {make_actions_bar(*this, session)}
+    );
+}
+
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/GameConsole/UI/ConsolePanelWidget.h b/SerialPrograms/Source/GameConsole/UI/ConsolePanelWidget.h
new file mode 100644
index 0000000000..a22b1a380a
--- /dev/null
+++ b/SerialPrograms/Source/GameConsole/UI/ConsolePanelWidget.h
@@ -0,0 +1,38 @@
+/*  Console Panel Widget
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_GameConsole_ConsolePanelWidget_H
+#define PokemonAutomation_GameConsole_ConsolePanelWidget_H
+
+#include <QWidget>
+#include "Common/Qt/UiStateQtWidget.h"
+#include "GameConsole/Framework/ConsolePanelSession.h"
+namespace PokemonAutomation{
+namespace GameConsole{
+
+
+class ConsolePanelWidget : public QWidget, public UiComponentQtWidget{
+public:
+    using ParentState = ConsolePanelSession;
+
+public:
+    ~ConsolePanelWidget();
+    ConsolePanelWidget(QWidget& parent, ConsolePanelSession& session);
+
+    virtual QWidget& widget() override{
+        return *this;
+    }
+
+private:
+    ConsolePanelSession& m_session;
+};
+
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/GameConsole/UI/ConsoleProgramWidget.cpp b/SerialPrograms/Source/GameConsole/UI/ConsoleProgramWidget.cpp
new file mode 100644
index 0000000000..7887765280
--- /dev/null
+++ b/SerialPrograms/Source/GameConsole/UI/ConsoleProgramWidget.cpp
@@ -0,0 +1,124 @@
+/*  Console Program Widget
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <QMessageBox>
+#include "Common/Cpp/ScopeExit.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/ResourceDownload/ProgramResourceDownloadWidget.h"
+#include "CommonFramework/Panels/PanelTools.h"
+#include "ConsoleProgramWidget.h"
+
+namespace PokemonAutomation{
+
+template class RegisterUiStateQtWidget<GameConsole::ConsoleProgramWidget>;
+
+namespace GameConsole{
+
+
+ConsoleProgramWidget::~ConsoleProgramWidget(){
+    m_session.remove_listener(*this);
+}
+ConsoleProgramWidget::ConsoleProgramWidget(QWidget& parent, ConsoleProgramSession& session)
+    : QWidget(&parent)
+    , m_session(session)
+{
+    m_stats_bar = new StatsBar(*this, m_session);
+    m_actions_bar = new RunnablePanelActionBar(
+        *this,
+        session,
+        session,
+        m_session.current_state()
+    );
+
+    populate_panel_widget(
+        *this,
+        session.descriptor(),
+        &m_session.system(),
+        session.options(),
+        {m_stats_bar, m_actions_bar}
+    );
+
+    m_layout = static_cast<QVBoxLayout*>(this->layout());
+
+    m_session.add_listener(*this);
+}
+
+void ConsoleProgramWidget::state_change(ProgramState state){
+    QMetaObject::invokeMethod(this, [this, state]{
+        if (state != ProgramState::STOPPED){
+            m_session.system().lock_controllers("Program is Running");
+        }else{
+            m_session.system().unlock_controllers();
+        }
+        m_session.options().report_program_state(state != ProgramState::STOPPED);
+        m_actions_bar->set_state(state);
+        if (state == ProgramState::STOPPED){
+            global_panel_holder()->on_idle();
+        }else{
+            global_panel_holder()->on_busy();
+        }
+
+        if(state == ProgramState::STOPPING){
+            ensure_downloads_table()->remove_all_downloads();
+        }
+    }, Qt::QueuedConnection);
+}
+void ConsoleProgramWidget::stats_update(const StatsTracker* current_stats, const StatsTracker* historical_stats){
+    QMetaObject::invokeMethod(this, [this, current_stats, historical_stats]{
+        m_stats_bar->set_stats(
+            current_stats == nullptr ? "" : current_stats->to_str(StatsTracker::DISPLAY_ON_SCREEN),
+            historical_stats == nullptr ? "" : historical_stats->to_str(StatsTracker::DISPLAY_ON_SCREEN)
+        );
+    }, Qt::QueuedConnection);
+}
+void ConsoleProgramWidget::error(const std::string& message){
+    QMetaObject::invokeMethod(this, [message]{
+        QMessageBox box;
+        box.critical(nullptr, "Error", QString::fromStdString(message));
+    }, Qt::QueuedConnection);
+}
+
+
+void ConsoleProgramWidget::download_error(const std::string& message){
+    if (m_popup_is_open.exchange(true)){ // only show popups if one isn't already open
+        return;
+    }
+
+    ScopeExit scope([&]{
+        m_popup_is_open.store(false, std::memory_order_release);
+    });
+
+    QMetaObject::invokeMethod(this, [message]{
+        QMessageBox box;
+        box.critical(nullptr, "Error", QString::fromStdString(message));
+    }, Qt::QueuedConnection);
+}
+void ConsoleProgramWidget::download_added(std::shared_ptr<ResourceDownload> download_ptr){
+    QMetaObject::invokeMethod(this, [this, download_ptr = std::move(download_ptr)]() mutable{
+        this->ensure_downloads_table()->add_download(std::move(download_ptr));
+    }, Qt::QueuedConnection);
+}
+void ConsoleProgramWidget::all_downloads_done(){
+    QMetaObject::invokeMethod(this, [this]{
+        this->ensure_downloads_table()->remove_all_downloads();
+    }, Qt::QueuedConnection);
+}
+ProgramResourceDownloadTableWidget* ConsoleProgramWidget::ensure_downloads_table(){
+    if (!m_internal_lazy_downloads_table){
+        m_internal_lazy_downloads_table = new ProgramResourceDownloadTableWidget(*this);
+        m_internal_lazy_downloads_table->setVisible(false);
+        m_layout->addWidget(m_internal_lazy_downloads_table);
+    }
+    return m_internal_lazy_downloads_table;
+}
+
+
+
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/GameConsole/UI/ConsoleProgramWidget.h b/SerialPrograms/Source/GameConsole/UI/ConsoleProgramWidget.h
new file mode 100644
index 0000000000..a0d00c5673
--- /dev/null
+++ b/SerialPrograms/Source/GameConsole/UI/ConsoleProgramWidget.h
@@ -0,0 +1,68 @@
+/*  Console Program Widget
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_GameConsole_ConsoleProgramWidget_H
+#define PokemonAutomation_GameConsole_ConsoleProgramWidget_H
+
+#include <QVBoxLayout>
+#include <QWidget>
+#include "Common/Qt/UiStateQtWidget.h"
+#include "CommonFramework/ProgramSession.h"
+#include "CommonFramework/Panels/UI/PanelElements.h"
+#include "GameConsole/Framework/ConsoleProgramSession.h"
+
+namespace PokemonAutomation{
+
+class ProgramResourceDownloadTableWidget;
+
+namespace GameConsole{
+
+
+class ConsoleProgramWidget
+    : public QWidget
+    , public UiComponentQtWidget
+    , private ProgramSession::Listener
+{
+public:
+    using ParentState = ConsoleProgramSession;
+
+
+public:
+    ~ConsoleProgramWidget();
+    ConsoleProgramWidget(QWidget& parent, ConsoleProgramSession& session);
+
+    virtual QWidget& widget() override{
+        return *this;
+    }
+
+
+private:
+    virtual void state_change(ProgramState state) override;
+    virtual void stats_update(const StatsTracker* current_stats, const StatsTracker* historical_stats) override;
+    virtual void error(const std::string& message) override;
+    virtual void download_error(const std::string& message) override;
+    virtual void download_added(std::shared_ptr<ResourceDownload> download_ptr) override;
+    virtual void all_downloads_done() override;
+
+    ProgramResourceDownloadTableWidget* ensure_downloads_table();
+
+
+private:
+    ConsoleProgramSession& m_session;
+    QVBoxLayout* m_layout;
+    StatsBar* m_stats_bar;
+    RunnablePanelActionBar* m_actions_bar;
+
+    // WARNING: Do not use directly. Always use ensure_downloads_table().
+    ProgramResourceDownloadTableWidget* m_internal_lazy_downloads_table = nullptr;
+    std::atomic<bool> m_popup_is_open{false};
+};
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/GameConsole/UI/ConsoleSystemWidget.cpp b/SerialPrograms/Source/GameConsole/UI/ConsoleSystemWidget.cpp
new file mode 100644
index 0000000000..ec02dd74e1
--- /dev/null
+++ b/SerialPrograms/Source/GameConsole/UI/ConsoleSystemWidget.cpp
@@ -0,0 +1,116 @@
+/*  Console System (Qt Widget)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <QKeyEvent>
+#include <QVBoxLayout>
+#include "CommandRowWidget.h"
+#include "ConsoleSystemWidget.h"
+
+namespace PokemonAutomation{
+
+template class RegisterUiStateQtWidget<GameConsole::ConsoleSystemWidget>;
+
+namespace GameConsole{
+
+
+
+ConsoleSystemWidget::~ConsoleSystemWidget(){
+    //  We must delete the video early because it holds a reference to the
+    //  layout that it resides in. If the layout is destructed first, the
+    //  video's destructor will crash.
+    delete m_video_display;
+}
+
+ConsoleSystemWidget::ConsoleSystemWidget(
+    QWidget& parent,
+    ConsoleSystemSession& session
+)
+    : QWidget(&parent)
+    , m_session(session)
+{
+    setFocusPolicy(Qt::StrongFocus);
+
+    QVBoxLayout* layout = new QVBoxLayout(this);
+    layout->setContentsMargins(0, 0, 0, 0);
+    layout->setAlignment(Qt::AlignTop);
+
+    m_group_box = new CollapsibleGroupBox(*this, "Console " + QString::number(m_session.console_number()) + " Settings");
+    layout->addWidget(m_group_box);
+
+    {
+        m_audio_display = new AudioDisplayWidget(*this, m_session.logger(), m_session.audio());
+        layout->addWidget(m_audio_display);
+
+        QVBoxLayout* video_holder = new QVBoxLayout();
+        layout->addLayout(video_holder);
+        video_holder->setContentsMargins(0, 0, 0, 0);
+
+        m_video_display = new VideoDisplayWidget(
+            *this, *video_holder,
+            m_session.console_number(),
+            m_session.video(),
+            m_session.overlay()
+        );
+        video_holder->addWidget(m_video_display);
+    }
+
+    QWidget* widget = new QWidget(m_group_box);
+    m_group_box->set_widget(widget);
+    m_group_layout = new QVBoxLayout(widget);
+    m_group_layout->setAlignment(Qt::AlignTop);
+    m_group_layout->setContentsMargins(0, 0, 0, 0);
+
+    if (session.controllers() == 1){
+        UiWrapper wrapper = m_session.controller(0).make_ui_component(this);
+        m_group_layout->addWidget(dynamic_cast<QWidget*>(wrapper.release()));
+    }
+
+    m_video_selector = new VideoSourceSelectorWidget(m_session.logger(), m_session.video());
+    m_group_layout->addWidget(m_video_selector);
+
+    m_audio_widget = new AudioSelectorWidget(*m_group_box->widget(), m_session.audio());
+    m_group_layout->addWidget(m_audio_widget);
+
+    if (session.controllers() != 1){
+        for (size_t c = 0; c < m_session.controllers(); c++){
+            UiWrapper wrapper = m_session.controller(c).make_ui_component(this);
+            m_group_layout->addWidget(dynamic_cast<QWidget*>(wrapper.release()));
+        }
+    }
+
+    m_group_layout->addWidget(new CommandRowWidget(*this, m_session));
+}
+
+
+void ConsoleSystemWidget::focusInEvent(QFocusEvent* event){
+//    cout << "focusInEvent" << endl;
+    QWidget::focusInEvent(event);
+    m_session.overlay().report_focus_in();
+}
+void ConsoleSystemWidget::focusOutEvent(QFocusEvent* event){
+//    cout << "focusOutEvent" << endl;
+    QWidget::focusOutEvent(event);
+    m_session.overlay().report_focus_out();
+}
+void ConsoleSystemWidget::keyPressEvent(QKeyEvent* event){
+//    cout << "ConsoleSystemWidget::keyPressEvent()" << endl;
+    m_session.overlay().report_key_press(event);
+//    QWidget::keyPressEvent(event);
+}
+void ConsoleSystemWidget::keyReleaseEvent(QKeyEvent* event){
+//    cout << "ConsoleSystemWidget::keyReleaseEvent()" << endl;
+    m_session.overlay().report_key_release(event);
+//    QWidget::keyReleaseEvent(event);
+}
+
+
+
+
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/GameConsole/UI/ConsoleSystemWidget.h b/SerialPrograms/Source/GameConsole/UI/ConsoleSystemWidget.h
new file mode 100644
index 0000000000..c711c7e465
--- /dev/null
+++ b/SerialPrograms/Source/GameConsole/UI/ConsoleSystemWidget.h
@@ -0,0 +1,63 @@
+/*  Console System (Qt Widget)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_GameConsole_ConsoleSystemWidget_H
+#define PokemonAutomation_GameConsole_ConsoleSystemWidget_H
+
+#include <QVBoxLayout>
+#include <QWidget>
+#include "Common/Qt/UiStateQtWidget.h"
+#include "Common/Qt/CollapsibleGroupBox.h"
+#include "CommonFramework/AudioPipeline/UI/AudioSelectorWidget.h"
+#include "CommonFramework/AudioPipeline/UI/AudioDisplayWidget.h"
+#include "CommonFramework/VideoPipeline/UI/VideoSourceSelectorWidget.h"
+#include "CommonFramework/VideoPipeline/UI/VideoDisplayWidget.h"
+#include "GameConsole/Framework/ConsoleSystemSession.h"
+
+namespace PokemonAutomation{
+namespace GameConsole{
+
+
+class ConsoleSystemWidget : public QWidget, public UiComponentQtWidget{
+public:
+    using ParentState = ConsoleSystemSession;
+
+public:
+    virtual ~ConsoleSystemWidget();
+
+    ConsoleSystemWidget(QWidget& parent, ConsoleSystemSession& session);
+
+    ConsoleSystemSession& session(){
+        return m_session;
+    }
+
+
+private:
+    virtual QWidget& widget() override{ return *this; }
+    virtual void focusInEvent(QFocusEvent* event) override;
+    virtual void focusOutEvent(QFocusEvent* event) override;
+    virtual void keyPressEvent(QKeyEvent* event) override;
+    virtual void keyReleaseEvent(QKeyEvent* event) override;
+
+
+protected:
+    ConsoleSystemSession& m_session;
+
+    CollapsibleGroupBox* m_group_box;
+
+    VideoDisplayWidget* m_video_display;
+    AudioDisplayWidget* m_audio_display;
+
+    QVBoxLayout* m_group_layout;
+    VideoSourceSelectorWidget* m_video_selector;
+    AudioSelectorWidget* m_audio_widget;
+};
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/GameConsole/UI/MultiConsolePanelWidget.cpp b/SerialPrograms/Source/GameConsole/UI/MultiConsolePanelWidget.cpp
new file mode 100644
index 0000000000..fe614dd975
--- /dev/null
+++ b/SerialPrograms/Source/GameConsole/UI/MultiConsolePanelWidget.cpp
@@ -0,0 +1,46 @@
+/*  Multi-Console Panel Widget
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Qt/ShutdownWithEvents.h"
+#include "CommonFramework/Panels/UI/PanelElements.h"
+#include "MultiConsolePanelWidget.h"
+
+namespace PokemonAutomation{
+
+template class RegisterUiStateQtWidget<GameConsole::MultiConsolePanelWidget>;
+
+namespace GameConsole{
+
+
+
+MultiConsolePanelWidget::~MultiConsolePanelWidget(){
+    shutdown_with_events(
+        m_session.logger(),
+        "MultiConsolePanelWidget",
+        [this]{ return m_session.try_shutdown(); }
+    );
+}
+MultiConsolePanelWidget::MultiConsolePanelWidget(
+    QWidget& parent,
+    MultiConsolePanelSession& session
+)
+    : QWidget(&parent)
+    , m_session(session)
+{
+    populate_panel_widget(
+        *this,
+        session.descriptor(),
+        &m_session.system(),
+        session.options(),
+        {make_actions_bar(*this, session)}
+    );
+}
+
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/GameConsole/UI/MultiConsolePanelWidget.h b/SerialPrograms/Source/GameConsole/UI/MultiConsolePanelWidget.h
new file mode 100644
index 0000000000..1a6f81c0ed
--- /dev/null
+++ b/SerialPrograms/Source/GameConsole/UI/MultiConsolePanelWidget.h
@@ -0,0 +1,38 @@
+/*  Multi-Console Panel Widget
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_GameConsole_MultiConsolePanelWidget_H
+#define PokemonAutomation_GameConsole_MultiConsolePanelWidget_H
+
+#include <QWidget>
+#include "Common/Qt/UiStateQtWidget.h"
+#include "GameConsole/Framework/MultiConsolePanelSession.h"
+namespace PokemonAutomation{
+namespace GameConsole{
+
+
+class MultiConsolePanelWidget : public QWidget, public UiComponentQtWidget{
+public:
+    using ParentState = MultiConsolePanelSession;
+
+public:
+    ~MultiConsolePanelWidget();
+    MultiConsolePanelWidget(QWidget& parent, MultiConsolePanelSession& session);
+
+    virtual QWidget& widget() override{
+        return *this;
+    }
+
+private:
+    MultiConsolePanelSession& m_session;
+};
+
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/GameConsole/UI/MultiConsoleProgramWidget.cpp b/SerialPrograms/Source/GameConsole/UI/MultiConsoleProgramWidget.cpp
new file mode 100644
index 0000000000..12d69f8f41
--- /dev/null
+++ b/SerialPrograms/Source/GameConsole/UI/MultiConsoleProgramWidget.cpp
@@ -0,0 +1,124 @@
+/*  Multi-Console Program Widget
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <QMessageBox>
+#include "Common/Cpp/ScopeExit.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/ResourceDownload/ProgramResourceDownloadWidget.h"
+#include "CommonFramework/Panels/PanelTools.h"
+#include "MultiConsoleProgramWidget.h"
+
+namespace PokemonAutomation{
+
+template class RegisterUiStateQtWidget<GameConsole::MultiConsoleProgramWidget>;
+
+namespace GameConsole{
+
+
+MultiConsoleProgramWidget::~MultiConsoleProgramWidget(){
+    m_session.remove_listener(*this);
+}
+MultiConsoleProgramWidget::MultiConsoleProgramWidget(QWidget& parent, MultiConsoleProgramSession& session)
+    : QWidget(&parent)
+    , m_session(session)
+{
+    m_stats_bar = new StatsBar(*this, m_session);
+    m_actions_bar = new RunnablePanelActionBar(
+        *this,
+        session,
+        session,
+        m_session.current_state()
+    );
+
+    populate_panel_widget(
+        *this,
+        session.descriptor(),
+        &m_session.system(),
+        session.options(),
+        {m_stats_bar, m_actions_bar}
+    );
+
+    m_layout = static_cast<QVBoxLayout*>(this->layout());
+
+    m_session.add_listener(*this);
+}
+
+void MultiConsoleProgramWidget::state_change(ProgramState state){
+    QMetaObject::invokeMethod(this, [this, state]{
+        if (state != ProgramState::STOPPED){
+            m_session.system().lock_controllers("Program is Running");
+        }else{
+            m_session.system().unlock_controllers();
+        }
+        m_session.options().report_program_state(state != ProgramState::STOPPED);
+        m_actions_bar->set_state(state);
+        if (state == ProgramState::STOPPED){
+            global_panel_holder()->on_idle();
+        }else{
+            global_panel_holder()->on_busy();
+        }
+
+        if(state == ProgramState::STOPPING){
+            ensure_downloads_table()->remove_all_downloads();
+        }
+    }, Qt::QueuedConnection);
+}
+void MultiConsoleProgramWidget::stats_update(const StatsTracker* current_stats, const StatsTracker* historical_stats){
+    QMetaObject::invokeMethod(this, [this, current_stats, historical_stats]{
+        m_stats_bar->set_stats(
+            current_stats == nullptr ? "" : current_stats->to_str(StatsTracker::DISPLAY_ON_SCREEN),
+            historical_stats == nullptr ? "" : historical_stats->to_str(StatsTracker::DISPLAY_ON_SCREEN)
+        );
+    }, Qt::QueuedConnection);
+}
+void MultiConsoleProgramWidget::error(const std::string& message){
+    QMetaObject::invokeMethod(this, [message]{
+        QMessageBox box;
+        box.critical(nullptr, "Error", QString::fromStdString(message));
+    }, Qt::QueuedConnection);
+}
+
+
+void MultiConsoleProgramWidget::download_error(const std::string& message){
+    if (m_popup_is_open.exchange(true)){ // only show popups if one isn't already open
+        return;
+    }
+
+    ScopeExit scope([&]{
+        m_popup_is_open.store(false, std::memory_order_release);
+    });
+
+    QMetaObject::invokeMethod(this, [message]{
+        QMessageBox box;
+        box.critical(nullptr, "Error", QString::fromStdString(message));
+    }, Qt::QueuedConnection);
+}
+void MultiConsoleProgramWidget::download_added(std::shared_ptr<ResourceDownload> download_ptr){
+    QMetaObject::invokeMethod(this, [this, download_ptr = std::move(download_ptr)]() mutable{
+        this->ensure_downloads_table()->add_download(std::move(download_ptr));
+    }, Qt::QueuedConnection);
+}
+void MultiConsoleProgramWidget::all_downloads_done(){
+    QMetaObject::invokeMethod(this, [this]{
+        this->ensure_downloads_table()->remove_all_downloads();
+    }, Qt::QueuedConnection);
+}
+ProgramResourceDownloadTableWidget* MultiConsoleProgramWidget::ensure_downloads_table(){
+    if (!m_internal_lazy_downloads_table){
+        m_internal_lazy_downloads_table = new ProgramResourceDownloadTableWidget(*this);
+        m_internal_lazy_downloads_table->setVisible(false);
+        m_layout->addWidget(m_internal_lazy_downloads_table);
+    }
+    return m_internal_lazy_downloads_table;
+}
+
+
+
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/GameConsole/UI/MultiConsoleProgramWidget.h b/SerialPrograms/Source/GameConsole/UI/MultiConsoleProgramWidget.h
new file mode 100644
index 0000000000..9341ecb201
--- /dev/null
+++ b/SerialPrograms/Source/GameConsole/UI/MultiConsoleProgramWidget.h
@@ -0,0 +1,73 @@
+/*  Multi-Console Program Widget
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_GameConsole_MultiConsoleProgramWidget_H
+#define PokemonAutomation_GameConsole_MultiConsoleProgramWidget_H
+
+#include <QVBoxLayout>
+#include <QWidget>
+#include "Common/Qt/UiStateQtWidget.h"
+#include "CommonFramework/ProgramSession.h"
+#include "CommonFramework/Panels/UI/PanelElements.h"
+#include "GameConsole/Framework/MultiConsoleProgramSession.h"
+
+namespace PokemonAutomation{
+
+class ProgramResourceDownloadTableWidget;
+
+namespace GameConsole{
+
+
+class MultiConsoleProgramWidget
+    : public QWidget
+    , public UiComponentQtWidget
+    , private ProgramSession::Listener
+    , private MultiConsoleSystemSession::Listener
+{
+public:
+    using ParentState = MultiConsoleProgramSession;
+
+
+public:
+    ~MultiConsoleProgramWidget();
+    MultiConsoleProgramWidget(QWidget& parent, MultiConsoleProgramSession& session);
+
+    virtual QWidget& widget() override{
+        return *this;
+    }
+
+
+private:
+    virtual void on_console_count_lock(bool locked) override{}
+    virtual void shutdown() override{}
+    virtual void startup(size_t console_count) override{}
+
+    virtual void state_change(ProgramState state) override;
+    virtual void stats_update(const StatsTracker* current_stats, const StatsTracker* historical_stats) override;
+    virtual void error(const std::string& message) override;
+    virtual void download_error(const std::string& message) override;
+    virtual void download_added(std::shared_ptr<ResourceDownload> download_ptr) override;
+    virtual void all_downloads_done() override;
+
+    ProgramResourceDownloadTableWidget* ensure_downloads_table();
+
+
+private:
+    MultiConsoleProgramSession& m_session;
+    QVBoxLayout* m_layout;
+    StatsBar* m_stats_bar;
+    RunnablePanelActionBar* m_actions_bar;
+
+    // WARNING: Do not use directly. Always use ensure_downloads_table().
+    ProgramResourceDownloadTableWidget* m_internal_lazy_downloads_table = nullptr;
+    std::atomic<bool> m_popup_is_open{false};
+};
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/GameConsole/UI/MultiConsoleSystemWidget.cpp b/SerialPrograms/Source/GameConsole/UI/MultiConsoleSystemWidget.cpp
new file mode 100644
index 0000000000..78f391080c
--- /dev/null
+++ b/SerialPrograms/Source/GameConsole/UI/MultiConsoleSystemWidget.cpp
@@ -0,0 +1,145 @@
+/*  Multi-Console System Widget
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <QVBoxLayout>
+#include <QHBoxLayout>
+#include <QLabel>
+#include "Common/Qt/Redispatch.h"
+#include "Common/Qt/NoWheelComboBox.h"
+#include "MultiConsoleSystemWidget.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+
+template class RegisterUiStateQtWidget<GameConsole::MultiConsoleSystemWidget>;
+
+namespace GameConsole{
+
+
+MultiConsoleSystemWidget::~MultiConsoleSystemWidget(){
+    m_session.remove_console_count_lock(*this);
+    m_session.remove_listener(*this);
+
+    delete m_videos;
+}
+MultiConsoleSystemWidget::MultiConsoleSystemWidget(
+    QWidget& parent,
+    MultiConsoleSystemSession& session
+)
+    : QWidget(&parent)
+    , m_session(session)
+{
+    QVBoxLayout* vbox = new QVBoxLayout(this);
+    vbox->setContentsMargins(0, 0, 0, 0);
+
+    QHBoxLayout* row = new QHBoxLayout();
+    vbox->addLayout(row, 0);
+    row->setContentsMargins(0, 0, 0, 0);
+    row->addStretch(2);
+    row->addWidget(new QLabel("<b>Console Count:</b>", this), 0);
+    m_console_count_box = new NoWheelCompactComboBox(this);
+    row->addWidget(m_console_count_box, 1);
+    row->addStretch(2);
+
+    for (size_t c = session.min_consoles(); c <= session.max_consoles(); c++){
+        m_console_count_box->addItem(QString::number(c));
+    }
+
+    m_session.add_listener(*this);
+
+    redraw_videos();
+
+    connect(
+        m_console_count_box, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
+        this, [this](int index){
+            if (index < 0 || index > (int)(m_session.max_consoles() - m_session.min_consoles())){
+                return;
+            }
+            m_session.set_active_consoles(index + m_session.min_consoles());
+        }
+    );
+}
+
+
+void MultiConsoleSystemWidget::on_console_count_lock(bool locked){
+//    cout << "MultiConsoleSystemWidget::on_console_count_lock(): " << locked << endl;
+    QMetaObject::invokeMethod(this, [=, this]{
+        m_console_count_box->setEnabled(!locked);
+    }, Qt::QueuedConnection);
+}
+void MultiConsoleSystemWidget::shutdown(){
+    run_on_main_thread_and_wait([this]{
+        delete m_videos;
+        m_videos = nullptr;
+    });
+    m_session.remove_console_count_lock(*this);
+}
+void MultiConsoleSystemWidget::startup(size_t console_count){
+    QMetaObject::invokeMethod(this, [this]{
+        redraw_videos();
+    }, Qt::QueuedConnection);
+}
+
+void MultiConsoleSystemWidget::redraw_videos(){
+    int old_index = m_console_count_box->currentIndex();
+    int new_index = (int)(m_session.active_consoles() - m_session.min_consoles());
+    if (new_index != old_index){
+        m_console_count_box->setCurrentIndex(new_index);
+    }
+
+    delete m_videos;
+
+    m_videos = new QWidget(this);
+    this->layout()->addWidget(m_videos);
+    QVBoxLayout* vbox = new QVBoxLayout(m_videos);
+    vbox->setContentsMargins(0, 0, 0, 0);
+
+    std::vector<QWidget*> consoles;
+    consoles.reserve(m_session.active_consoles());
+
+    m_session.add_console_count_lock(*this);
+
+    for (size_t c = 0; c < m_session.active_consoles(); c++){
+        UiWrapper wrapper = m_session[c].make_ui_component(this);
+        consoles.emplace_back(dynamic_cast<QWidget*>(wrapper.release()));
+    }
+
+    QHBoxLayout* vrow0 = new QHBoxLayout();
+    vbox->addLayout(vrow0, 1);
+    vrow0->setContentsMargins(0, 0, 0, 0);
+
+    vrow0->addWidget(consoles[0], 1);
+    if (consoles.size() >= 2){
+        vrow0->addWidget(consoles[1], 1);
+    }
+    if (consoles.size() >= 3){
+        QHBoxLayout* vrow1 = new QHBoxLayout();
+        vbox->addLayout(vrow1, 1);
+        vrow1->setContentsMargins(0, 0, 0, 0);
+        vrow1->addWidget(consoles[2], 1);
+        if (consoles.size() >= MultiConsoleSystemOption::MAX_CONSOLES){
+            vrow1->addWidget(consoles[3], 1);
+        }else{
+            vrow1->addWidget(new QWidget(), 1);
+        }
+    }
+    static_assert(
+        MultiConsoleSystemOption::MAX_CONSOLES <= 4,
+        "Can't display more than 4 consoles."
+    );
+}
+
+
+
+
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/GameConsole/UI/MultiConsoleSystemWidget.h b/SerialPrograms/Source/GameConsole/UI/MultiConsoleSystemWidget.h
new file mode 100644
index 0000000000..801123762f
--- /dev/null
+++ b/SerialPrograms/Source/GameConsole/UI/MultiConsoleSystemWidget.h
@@ -0,0 +1,59 @@
+/*  Multi-Console System Widget
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomationn_GameConsole_MultiConsoleSystemWidget_H
+#define PokemonAutomationn_GameConsole_MultiConsoleSystemWidget_H
+
+#include <QWidget>
+#include <QComboBox>
+#include "Common/Qt/UiStateQtWidget.h"
+#include "GameConsole/Framework/MultiConsoleSystemSession.h"
+
+namespace PokemonAutomation{
+namespace GameConsole{
+
+
+class MultiConsoleSystemWidget final
+    : public QWidget
+    , public UiComponentQtWidget
+    , private MultiConsoleSystemSession::Listener
+{
+public:
+    using ParentState = MultiConsoleSystemSession;
+
+
+public:
+    virtual ~MultiConsoleSystemWidget();
+
+    MultiConsoleSystemWidget(
+        QWidget& parent,
+        MultiConsoleSystemSession& session
+    );
+
+    virtual QWidget& widget() override{
+        return *this;
+    }
+
+
+private:
+    virtual void on_console_count_lock(bool locked) override;
+    virtual void shutdown() override;
+    virtual void startup(size_t console_count) override;
+
+    void redraw_videos();
+
+
+private:
+    MultiConsoleSystemSession& m_session;
+    QComboBox* m_console_count_box;
+    QWidget* m_videos = nullptr;
+};
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Integrations/DiscordIntegrationSettings.cpp b/SerialPrograms/Source/Integrations/DiscordIntegrationSettings.cpp
index 97b7b0c66f..ec1fe03cd2 100644
--- a/SerialPrograms/Source/Integrations/DiscordIntegrationSettings.cpp
+++ b/SerialPrograms/Source/Integrations/DiscordIntegrationSettings.cpp
@@ -1,18 +1,12 @@
 /*  Discord Integration Settings
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QPushButton>
-#include <dpp/DPP_SilenceWarnings.h>
+#include "Common/Cpp/Strings/Unicode.h"
 #include "Common/Qt/StringToolsQt.h"
-//#include "CommonFramework/Globals.h"
-//#include "CommonFramework/GlobalSettingsPanel.h"
-#include "DppIntegration/DppClient.h"
-#include "SleepyDiscordRunner.h"
+#include "Integrations/DppIntegration/DppClient.h"
 #include "DiscordIntegrationSettings.h"
 
 //#include <iostream>
@@ -23,26 +17,35 @@ namespace PokemonAutomation{
 namespace Integration{
 
 
+
+
+
+
+
+
 DiscordIntegrationSettingsOption::~DiscordIntegrationSettingsOption(){
-    library0.remove_listener(*this);
+    m_start_button.remove_listener(static_cast<ButtonListener&>(*this));
+    m_stop_button.remove_listener(static_cast<ButtonListener&>(*this));
     this->remove_listener(*this);
 }
 DiscordIntegrationSettingsOption::DiscordIntegrationSettingsOption()
-    : GroupOption("Discord Integration Settings", LockWhileRunning::LOCKED, true, false)
-//    , m_integration_enabled(integration_enabled)
+    : GroupOption(
+        "Discord Integration Settings",
+        LockMode::LOCK_WHILE_RUNNING,
+        GroupOption::EnableMode::DEFAULT_DISABLED,
+        false,
+        false
+    )
+    , m_start_button("<b>Bot Control:</b>", "Start Bot")
+    , m_stop_button("", "Stop Bot")
     , run_on_start(
         "<b>Run Discord Integration on Launch:</b><br>Automatically connect to Discord as soon as the program is launched.",
-        LockWhileRunning::LOCKED,
+        LockMode::LOCK_WHILE_RUNNING,
         false
     )
-    , library0(
-        "<b>Discord Integration Library:</b><br>Restart the program for this to take effect.",
-        {
-            {Library::SleepyDiscord, "sleepy", "Sleepy Discord (normal commands, deprecated)"},
-            {Library::DPP, "dpp", "D++ (slash commands and normal commands)"},
-        },
-        LockWhileRunning::LOCKED,
-        Library::DPP
+    , register_slash_button(
+        "<b>Register Slash Commands on Start:</b><br>Only needs to be run once, or after additional commands are added.",
+        "Register Slash Commands"
     )
     , command_type(
         "<b>Discord Integration Command Type:</b><br>Restart the program for this to take effect.",
@@ -50,185 +53,88 @@ DiscordIntegrationSettingsOption::DiscordIntegrationSettingsOption()
             {CommandType::SlashCommands, "slash", "Slash commands"},
             {CommandType::MessageCommands, "message", "Message (prefix) commands"},
         },
-        LockWhileRunning::LOCKED,
+        LockMode::LOCK_WHILE_RUNNING,
         CommandType::SlashCommands
     )
     , token(
         true,
         "<b>Discord Token:</b><br>Enter your Discord bot's token. Keep it safe and don't share it with anyone.",
-        LockWhileRunning::LOCKED,
+        LockMode::LOCK_WHILE_RUNNING,
         "", "0123456789abcdefghijklmnopqrstuvwxyzABCDEGFHIJKLMNOPQRSTUVWXYZ"
     )
     , command_prefix(
         false,
         "<b>Discord Command Prefix:</b><br>Enter a command prefix for your bot.",
-        LockWhileRunning::LOCKED,
+        LockMode::LOCK_WHILE_RUNNING,
         "^", "^"
     )
-    , use_suffix(
-        "<b>Use Suffix (Sleepy):</b><br>Use a suffix instead of a prefix for commands.",
-        LockWhileRunning::LOCKED,
-        false
-    )
     , game_status(
         false,
         "<b>Discord Game Status:</b><br>Enter a status message your bot would display.",
-        LockWhileRunning::LOCKED,
+        LockMode::LOCK_WHILE_RUNNING,
         "", "Controlling your Switch. :)"
     )
     , hello_message(
         false,
         "<b>Discord Hello Message:</b><br>Enter a message you'd like the bot to respond with to the \"$hi\" command.",
-        LockWhileRunning::LOCKED,
+        LockMode::LOCK_WHILE_RUNNING,
         "", "Automation at your service!"
     )
-    , sudo(
-        false,
-        "<b>Discord Sudo (Sleepy):</b><br>Enter user ID(s) to grant sudo access to.",
-        LockWhileRunning::LOCKED,
-        "", "123456789012345678"
-    )
-    , owner(
-        false,
-        "<b>Discord Owner (Sleepy):</b><br>Enter the bot owner's ID (your own ID).",
-        LockWhileRunning::LOCKED,
-        "", "123456789012345678"
+    , allow_buttons_from_users(
+        "<b>Allow Buttons from Users:</b><br>Allow other users to issue button presses.",
+        LockMode::LOCK_WHILE_RUNNING,
+        false
     )
 {
+    PA_ADD_OPTION(m_start_button);
+    PA_ADD_OPTION(m_stop_button);
     PA_ADD_OPTION(run_on_start);
-    PA_ADD_OPTION(library0);
+    PA_ADD_OPTION(register_slash_button);
     PA_ADD_OPTION(command_type);
     PA_ADD_OPTION(token);
     PA_ADD_OPTION(command_prefix);
-    PA_ADD_OPTION(use_suffix);
     PA_ADD_OPTION(game_status);
     PA_ADD_OPTION(hello_message);
-    PA_ADD_OPTION(sudo);
-    PA_ADD_OPTION(owner);
+    PA_ADD_OPTION(allow_buttons_from_users);
     PA_ADD_OPTION(channels);
 
-    DiscordIntegrationSettingsOption::value_changed();
+    DiscordIntegrationSettingsOption::on_config_value_changed(this);
 
     this->add_listener(*this);
-    library0.add_listener(*this);
+    m_start_button.add_listener(static_cast<ButtonListener&>(*this));
+    m_stop_button.add_listener(static_cast<ButtonListener&>(*this));
 }
-void DiscordIntegrationSettingsOption::value_changed(){
+void DiscordIntegrationSettingsOption::on_config_value_changed([[maybe_unused]] void* object){
 //    cout << this->enabled() << endl;
-#if (defined PA_SLEEPY || defined PA_DPP)
-    bool options_enabled = this->enabled();
-    switch (library0){
-#ifdef PA_SLEEPY
-    case Library::SleepyDiscord:{
-        options_enabled &= !SleepyDiscordRunner::is_running();
-        ConfigOptionState state = options_enabled ? ConfigOptionState::ENABLED : ConfigOptionState::DISABLED;
-
-        library0.set_visibility(state);
-        command_type.set_visibility(ConfigOptionState::HIDDEN);
-        token.set_visibility(state);
-        game_status.set_visibility(state);
-        hello_message.set_visibility(state);
-
-        command_prefix.set_visibility(state);
-        use_suffix.set_visibility(state);
-        sudo.set_visibility(state);
-        owner.set_visibility(state);
-        break;
-    }
-#endif
 #ifdef PA_DPP
-    case Library::DPP:{
-        options_enabled &= !DppClient::Client::instance().is_initialized();
-        ConfigOptionState state = options_enabled ? ConfigOptionState::ENABLED : ConfigOptionState::DISABLED;
-
-        library0.set_visibility(state);
-        command_type.set_visibility(state);
-        token.set_visibility(state);
-        game_status.set_visibility(state);
-        hello_message.set_visibility(state);
-
-        command_prefix.set_visibility(state);
-        use_suffix.set_visibility(ConfigOptionState::HIDDEN);
-        sudo.set_visibility(ConfigOptionState::HIDDEN);
-        owner.set_visibility(ConfigOptionState::HIDDEN);
-        break;
-    }
-#endif
-    }
-#endif
-}
+    bool options_enabled = this->enabled();
+    options_enabled &= !DppClient::Client::instance().is_initialized();
+    ConfigOptionState state = options_enabled ? ConfigOptionState::ENABLED : ConfigOptionState::DISABLED;
 
+    command_type.set_visibility(state);
+    token.set_visibility(state);
+    game_status.set_visibility(state);
+    hello_message.set_visibility(state);
+    allow_buttons_from_users.set_visibility(state);
 
-class DiscordIntegrationSettingsWidget : public GroupWidget{
-public:
-    DiscordIntegrationSettingsWidget(QWidget& parent, DiscordIntegrationSettingsOption& value);
-};
-ConfigWidget* DiscordIntegrationSettingsOption::make_QtWidget(QWidget& parent){
-    return new DiscordIntegrationSettingsWidget(parent, *this);
+    command_prefix.set_visibility(state);
+#endif
 }
 
-DiscordIntegrationSettingsWidget::DiscordIntegrationSettingsWidget(QWidget& parent, DiscordIntegrationSettingsOption& value)
-    : GroupWidget(parent, value)
-{
-#if (defined PA_SLEEPY || defined PA_DPP)
-
-    QWidget* control_buttons = new QWidget(this);
-    m_options_layout->insertWidget(0, control_buttons);
-
-    QHBoxLayout* layout = new QHBoxLayout(control_buttons);
-    layout->setContentsMargins(5, 5, 5, 5);
-
-    QLabel* text = new QLabel("<b>Bot Control:</b>", control_buttons);
-    layout->addWidget(text, 2);
-    text->setWordWrap(true);
-
-    QPushButton* button_start = new QPushButton("Start Bot", this);
-    layout->addWidget(button_start, 1);
-
-    QPushButton* button_stop = new QPushButton("Stop Bot", this);
-    layout->addWidget(button_stop, 1);
-
-    QFont font = button_start->font();
-    font.setBold(true);
-    button_start->setFont(font);
-    button_stop->setFont(font);
-
-    connect(
-        button_start, &QPushButton::clicked,
-        this, [&value](bool) {
-            switch (value.library0){
-#ifdef PA_SLEEPY
-            case DiscordIntegrationSettingsOption::Library::SleepyDiscord:
-                SleepyDiscordRunner::sleepy_connect();
-                break;
-#endif
-#ifdef PA_DPP
-            case DiscordIntegrationSettingsOption::Library::DPP:
-                DppClient::Client::instance().connect();
-                break;
-#endif
-            }
-            value.value_changed();
-        }
-    );
-    connect(
-        button_stop, &QPushButton::clicked,
-        this, [&value](bool) {
-            switch (value.library0){
-#ifdef PA_SLEEPY
-            case DiscordIntegrationSettingsOption::Library::SleepyDiscord:
-                SleepyDiscordRunner::sleepy_terminate();
-                break;
-#endif
+void DiscordIntegrationSettingsOption::on_press(ButtonCell& button){
 #ifdef PA_DPP
-            case DiscordIntegrationSettingsOption::Library::DPP:
-                DppClient::Client::instance().disconnect();
-                break;
-#endif
-            }
-            value.value_changed();
-        }
-    );
-
+    if (&button == &m_start_button){
+        DppClient::Client::instance().connect();
+        on_config_value_changed(this);
+        return;
+    }
+    if (&button == &m_stop_button){
+        DppClient::Client::instance().disconnect();
+        on_config_value_changed(this);
+        return;
+    }
+#else
+    (void)button;
 #endif
 }
 
@@ -237,10 +143,11 @@ DiscordIntegrationSettingsWidget::DiscordIntegrationSettingsWidget(QWidget& pare
 
 
 
+
 std::string convert(const std::string& message){
     std::u32string ret;
     std::u32string block;
-    for (char32_t ch : to_utf32(message)){
+    for (char32_t ch : utf8_to_utf32(message)){
         switch (ch){
         case 38:
             if (block.empty() || block.back() != 64){
@@ -255,7 +162,7 @@ std::string convert(const std::string& message){
         block.clear();
     }
 
-    return to_utf8(ret);
+    return utf32_to_str(ret);
 }
 
 
diff --git a/SerialPrograms/Source/Integrations/DiscordIntegrationSettings.h b/SerialPrograms/Source/Integrations/DiscordIntegrationSettings.h
index 64f0d2f7cc..39591afca0 100644
--- a/SerialPrograms/Source/Integrations/DiscordIntegrationSettings.h
+++ b/SerialPrograms/Source/Integrations/DiscordIntegrationSettings.h
@@ -1,6 +1,6 @@
 /*  Discord Integration Settings
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -12,6 +12,7 @@
 #include "Common/Cpp/Options/BooleanCheckBoxOption.h"
 #include "Common/Cpp/Options/StringOption.h"
 #include "Common/Cpp/Options/EnumDropdownOption.h"
+#include "Common/Cpp/Options/ButtonOption.h"
 #include "Common/Qt/Options/GroupWidget.h"
 #include "DiscordIntegrationTable.h"
 
@@ -19,23 +20,30 @@ namespace PokemonAutomation{
 namespace Integration{
 
 
-class DiscordIntegrationSettingsOption : public GroupOption, private ConfigOption::Listener{
+
+
+
+class DiscordIntegrationSettingsOption
+    : public GroupOption
+    , private ConfigOption::Listener
+    , public ButtonListener
+{
 public:
     ~DiscordIntegrationSettingsOption();
     DiscordIntegrationSettingsOption();
 
-    virtual ConfigWidget* make_QtWidget(QWidget& parent) override;
-    virtual void value_changed() override;
+    virtual void on_config_value_changed(void* object) override;
+    virtual void on_press(ButtonCell& button) override;
 
-    BooleanCheckBoxOption run_on_start;
 
-    enum class Library{
-        SleepyDiscord,
-        DPP,
-    };
-    EnumDropdownOption<Library> library0;
+public:
+    ButtonOption m_start_button;
+    ButtonOption m_stop_button;
+
+    BooleanCheckBoxOption run_on_start;
+    ButtonOption register_slash_button;
 
-    enum class CommandType {
+    enum class CommandType{
         SlashCommands,
         MessageCommands,
     };
@@ -43,11 +51,9 @@ class DiscordIntegrationSettingsOption : public GroupOption, private ConfigOptio
 
     StringOption token;
     StringOption command_prefix;
-    BooleanCheckBoxOption use_suffix;
     StringOption game_status;
     StringOption hello_message;
-    StringOption sudo;
-    StringOption owner;
+    BooleanCheckBoxOption allow_buttons_from_users;
     DiscordIntegrationTable channels;
 };
 
diff --git a/SerialPrograms/Source/Integrations/DiscordIntegrationTable.cpp b/SerialPrograms/Source/Integrations/DiscordIntegrationTable.cpp
index 1723bbe0c9..36633c7337 100644
--- a/SerialPrograms/Source/Integrations/DiscordIntegrationTable.cpp
+++ b/SerialPrograms/Source/Integrations/DiscordIntegrationTable.cpp
@@ -1,6 +1,6 @@
 /*  Discord Integration Table
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -15,14 +15,15 @@ namespace Integration{
 
 
 
-DiscordIntegrationChannel::DiscordIntegrationChannel()
-    : enabled(LockWhileRunning::UNLOCKED, true)
-    , label(false, LockWhileRunning::UNLOCKED, "", "My test server")
-    , ping(LockWhileRunning::UNLOCKED, true)
-    , tags_text(false, LockWhileRunning::UNLOCKED, "Notifs, Showcase, LiveHost", "")
-    , allow_commands(LockWhileRunning::UNLOCKED, true)
-    , delay(LockWhileRunning::UNLOCKED, 0, 0, 10)
-    , channel_id(false, LockWhileRunning::UNLOCKED, "", "123456789012345678")
+DiscordIntegrationChannel::DiscordIntegrationChannel(EditableTableOption& parent_table)
+    : EditableTableRow(parent_table)
+    , enabled(LockMode::UNLOCK_WHILE_RUNNING, true)
+    , label(false, LockMode::UNLOCK_WHILE_RUNNING, "", "My test server")
+    , ping(LockMode::UNLOCK_WHILE_RUNNING, true)
+    , tags_text(false, LockMode::UNLOCK_WHILE_RUNNING, "Notifs, Showcase, LiveHost", "")
+    , allow_commands(LockMode::UNLOCK_WHILE_RUNNING, true)
+    , delay(LockMode::UNLOCK_WHILE_RUNNING, 0, 0, 10)
+    , channel_id(false, LockMode::UNLOCK_WHILE_RUNNING, "", "123456789012345678")
 {
     //  Keep the old JSON tags for backwards compatibility.
     add_option(enabled, "Enabled");
@@ -34,7 +35,7 @@ DiscordIntegrationChannel::DiscordIntegrationChannel()
     add_option(channel_id, "Channel");
 }
 std::unique_ptr<EditableTableRow> DiscordIntegrationChannel::clone() const{
-    std::unique_ptr<DiscordIntegrationChannel> ret(new DiscordIntegrationChannel());
+    std::unique_ptr<DiscordIntegrationChannel> ret(new DiscordIntegrationChannel(parent()));
     ret->enabled = (bool)enabled;
     ret->label.set(label);
     ret->ping = (bool)ping;
@@ -46,7 +47,7 @@ std::unique_ptr<EditableTableRow> DiscordIntegrationChannel::clone() const{
 }
 void DiscordIntegrationChannel::load_json(const JsonValue& json){
     EditableTableRow::load_json(json);
-    const JsonObject* obj = json.get_object();
+    const JsonObject* obj = json.to_object();
     if (obj == nullptr){
         return;
     }
@@ -56,7 +57,7 @@ void DiscordIntegrationChannel::load_json(const JsonValue& json){
     if (array){
         std::string tags;
         for (const auto& tag : *array){
-            const std::string* str = tag.get_string();
+            const std::string* str = tag.to_string();
             if (str == nullptr){
                 continue;
             }
@@ -77,7 +78,9 @@ void DiscordIntegrationChannel::load_json(const JsonValue& json){
 DiscordIntegrationTable::DiscordIntegrationTable()
     : EditableTableOption_t<DiscordIntegrationChannel>(
         "<b>Discord Channels:</b> Configure which channels to send notifications and accept commands in.",
-        LockWhileRunning::UNLOCKED
+        LockMode::UNLOCK_WHILE_RUNNING,
+        true,
+        10
     )
 {}
 std::vector<std::string> DiscordIntegrationTable::make_header() const{
diff --git a/SerialPrograms/Source/Integrations/DiscordIntegrationTable.h b/SerialPrograms/Source/Integrations/DiscordIntegrationTable.h
index 384af43499..651a530488 100644
--- a/SerialPrograms/Source/Integrations/DiscordIntegrationTable.h
+++ b/SerialPrograms/Source/Integrations/DiscordIntegrationTable.h
@@ -1,6 +1,6 @@
 /*  Discord Integration Table
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -15,11 +15,12 @@
 namespace PokemonAutomation{
 namespace Integration{
 
+class DiscordIntegrationTable;
 
 
 class DiscordIntegrationChannel : public EditableTableRow{
 public:
-    DiscordIntegrationChannel();
+    DiscordIntegrationChannel(EditableTableOption& parent_table);
     virtual std::unique_ptr<EditableTableRow> clone() const override;
     virtual void load_json(const JsonValue& json) override;
 
diff --git a/SerialPrograms/Source/Integrations/DiscordSettingsOption.cpp b/SerialPrograms/Source/Integrations/DiscordSettingsOption.cpp
index e240007a8b..9787872593 100644
--- a/SerialPrograms/Source/Integrations/DiscordSettingsOption.cpp
+++ b/SerialPrograms/Source/Integrations/DiscordSettingsOption.cpp
@@ -1,6 +1,6 @@
 /*  Discord Settings
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -18,47 +18,38 @@ namespace Integration{
 
 
 
-
 DiscordMessageSettingsOption::DiscordMessageSettingsOption()
-    : BatchOption(LockWhileRunning::LOCKED)
+    : BatchOption(LockMode::LOCK_WHILE_RUNNING)
     , instance_name(
         false,
         "<b>Instance Name:</b><br>If you are running multiple instances of this program, give it a name to distinguish them in notifications.",
-        LockWhileRunning::LOCKED,
+        LockMode::LOCK_WHILE_RUNNING,
         "",
         "(e.g. Living Room Switch)"
     )
     , user_id(
         false,
         "<b>Discord User ID:</b><br>Set this to your discord user ID to receive pings. Your ID is a number.",
-        LockWhileRunning::LOCKED,
+        LockMode::LOCK_WHILE_RUNNING,
         "",
         "123456789012345678"
     )
     , message(
         false,
         "<b>Discord Message:</b><br>Message to put on every discord notification.",
-        LockWhileRunning::LOCKED,
+        LockMode::LOCK_WHILE_RUNNING,
         "",
         "(e.g. Kim's Shiny Hunt)"
     )
 {
     PA_ADD_OPTION(instance_name);
     PA_ADD_OPTION(user_id);
-//    if (PreloadSettings::instance().DEVELOPER_MODE){
+//    if (STATIC_GLOBALS.DEVELOPER_MODE){
 //        PA_ADD_OPTION(message);
 //    }
 }
-class DiscordMessageSettingsOptionUI : public BatchWidget{
-public:
-    DiscordMessageSettingsOptionUI(QWidget& parent, DiscordMessageSettingsOption& value);
-};
-DiscordMessageSettingsOptionUI::DiscordMessageSettingsOptionUI(QWidget& parent, DiscordMessageSettingsOption& value)
-    : BatchWidget(parent, value)
-{}
-ConfigWidget* DiscordMessageSettingsOption::make_QtWidget(QWidget& parent){
-    return new DiscordMessageSettingsOptionUI(parent, *this);
-}
+
+
 
 
 
@@ -66,11 +57,11 @@ ConfigWidget* DiscordMessageSettingsOption::make_QtWidget(QWidget& parent){
 
 
 DiscordSettingsOption::DiscordSettingsOption()
-    : BatchOption(LockWhileRunning::LOCKED)
+    : BatchOption(LockMode::LOCK_WHILE_RUNNING)
 {
     PA_ADD_OPTION(message);
     PA_ADD_OPTION(webhooks);
-#if defined PA_SLEEPY || defined PA_DPP
+#ifdef PA_DPP
     PA_ADD_OPTION(integration);
 #endif
 }
diff --git a/SerialPrograms/Source/Integrations/DiscordSettingsOption.h b/SerialPrograms/Source/Integrations/DiscordSettingsOption.h
index b650b7d354..db96d92dc2 100644
--- a/SerialPrograms/Source/Integrations/DiscordSettingsOption.h
+++ b/SerialPrograms/Source/Integrations/DiscordSettingsOption.h
@@ -1,6 +1,6 @@
 /*  Discord Settings
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -19,7 +19,6 @@ namespace Integration{
 class DiscordMessageSettingsOption : public BatchOption{
 public:
     DiscordMessageSettingsOption();
-    virtual ConfigWidget* make_QtWidget(QWidget& parent) override;
 
     StringOption instance_name;
     StringOption user_id;
diff --git a/SerialPrograms/Source/Integrations/DiscordSocial/DiscordSocial.cpp b/SerialPrograms/Source/Integrations/DiscordSocial/DiscordSocial.cpp
new file mode 100644
index 0000000000..b4a16b1028
--- /dev/null
+++ b/SerialPrograms/Source/Integrations/DiscordSocial/DiscordSocial.cpp
@@ -0,0 +1,201 @@
+/*  Discord Social
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifdef PA_SOCIAL_SDK
+#define DISCORDPP_IMPLEMENTATION
+
+#include <thread>
+#include "Common/Cpp/Logging/TaggedLogger.h"
+#include "Common/Cpp/Logging/GlobalLogger.h"
+#include "CommonFramework/Globals.h"
+#include "CommonFramework/GlobalSettingsPanel.h"
+#include "CommonFramework/Tools/GlobalThreadPools.h"
+#include "Integrations/ProgramTracker.h"
+#include "DiscordSocial.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+using namespace discordpp;
+namespace PokemonAutomation{
+namespace Integration{
+namespace DiscordSocialSDK{
+
+DiscordSocial& DiscordSocial::instance(){
+    static DiscordSocial instance;
+    return instance;
+}
+
+void DiscordSocial::stop() noexcept{
+    m_running.store(false, std::memory_order_release);
+    m_thread.wait_and_ignore_exceptions();
+    if (m_client) m_client.reset();
+}
+void DiscordSocial::run(){
+    auto client = std::make_shared<Client>();
+    if (!client){
+        log("Failed to initialize DiscordSocialSDK.", "run()", LoggingSeverity::Error);
+        return;
+    }
+
+    m_client = std::move(client);
+    try{
+        m_client->SetApplicationId(m_app_id);
+        m_client->AddLogCallback([&](auto message, auto severity){
+            log(message, "Internal", severity);
+        }, m_log_level);
+
+        m_thread = GlobalThreadPools::unlimited_normal().dispatch_now_blocking(
+            [this]{ thread_loop(); }
+        );
+    }catch (...){
+        m_client.reset();
+        log("Failed to start DiscordSocialSDK.", "run()", LoggingSeverity::Error);
+        throw;
+    }
+}
+
+void DiscordSocial::thread_loop(){
+    log("Starting Discord Rich Presence update thread...", "thread_loop()", LoggingSeverity::Info);
+    m_running.store(true, std::memory_order_release);
+    m_activity = create_activity();
+    m_client->UpdateRichPresence(m_activity, [&](ClientResult result){
+        if (!result.Successful()){
+            log("Rich Presence initial update failed.", "thread_loop()", LoggingSeverity::Warning);
+        }
+    });
+
+    while (m_running.load(std::memory_order_relaxed)){
+        try{
+            if (!m_running.load(std::memory_order_relaxed) || !GlobalSettings::instance().RICH_PRESENCE){
+                break;
+            }
+
+            RunCallbacks();
+            update_rich_presence();
+            std::this_thread::sleep_for(std::chrono::seconds(1));
+        }catch (const std::exception& e){
+            log("Exception: " + std::string(e.what()), "thread_loop()", LoggingSeverity::Error);
+            break;
+        }
+    }
+
+    m_running.store(false, std::memory_order_release);
+    m_client.reset();
+    log("Discord Rich Presence update thread exiting...", "thread_loop()", LoggingSeverity::Info);
+}
+
+void DiscordSocial::update_rich_presence(){
+//    cout << "DiscordSocial::update_rich_presence()" << endl;
+    try{
+        std::string details = m_activity.Details().value();
+        std::string state = m_activity.State().value();
+
+        discordpp::ActivityAssets assets{};
+        assets.SetLargeImage("rotom");
+        assets.SetLargeText(PROGRAM_NAME);
+
+        for (const auto& item : ProgramTracker::instance().all_programs()){
+            switch (item.second.state){
+                case ProgramState::RUNNING:{
+                    assets.SetSmallImage("running");
+                    assets.SetSmallText("Running");
+                    state = "Running"; 
+                    m_activity.SetAssets(assets); break;
+                }
+                case ProgramState::STOPPED:{
+                    assets.SetSmallImage("stopped");
+                    assets.SetSmallText("Stopped");
+                    state = "Stopped";
+                    m_activity.SetAssets(assets); break;
+                }
+                default:{
+                    assets.SetSmallImage("idle");
+                    assets.SetSmallText("Idle");
+                    state = "Idle";
+                    m_activity.SetAssets(assets); break;
+                }
+            }
+
+            if (item.second.program_name != details){
+                details = item.second.program_name;
+            }
+
+            m_timestamps.SetStart(
+                std::chrono::duration_cast<std::chrono::seconds>(
+                    item.second.last_state_change.time_since_epoch()
+                ).count()
+            );
+        }
+
+        m_activity.SetTimestamps(m_timestamps);
+        m_activity.SetDetails(details);
+        m_activity.SetState(state);
+        m_client->UpdateRichPresence(m_activity, [&](ClientResult result){
+            if (!result.Successful()){
+                log("Rich Presence update failed.", "update_rp()", LoggingSeverity::Warning);
+            }
+        });
+    }catch (const std::exception& e){
+        m_running.store(false, std::memory_order_release);
+        log("Exception: " + std::string(e.what()), "update_rp()", LoggingSeverity::Error);
+    }
+}
+
+Logger& DiscordSocial::logger(){
+    static TaggedLogger logger(global_logger_raw(), "DiscordSocialSDK");
+    return logger;
+}
+
+void DiscordSocial::log(const std::string& message, const std::string& identity, const LoggingSeverity& severity){
+    if (severity < m_log_level){
+        return;
+    }
+
+    std::string log = identity + ": " + message;
+    Color color;
+    switch (severity){
+        case LoggingSeverity::Verbose: color = COLOR_GRAY; break;
+        case LoggingSeverity::Info: color = COLOR_CYAN; break;
+        case LoggingSeverity::Warning: color = COLOR_ORANGE; break;
+        case LoggingSeverity::Error: color = COLOR_MAGENTA; break;
+        default: color = COLOR_PURPLE; break;
+    };
+
+    logger().log(log, color);
+}
+
+Activity DiscordSocial::create_activity(){
+    Activity activity{};
+    activity.SetType(ActivityTypes::Playing);
+    activity.SetDetails("ComputerControl: Preparing to automate...");
+    activity.SetState("Idle");
+
+    ActivityButton button1{};
+    button1.SetLabel("Download from GitHub");
+    button1.SetUrl(m_github_release_latest);
+    activity.AddButton(button1);
+
+    ActivityButton button2{};
+    button2.SetLabel("Join our Discord");
+    button2.SetUrl(DISCORD_LINK_URL_SDK);
+    activity.AddButton(button2);
+
+    discordpp::ActivityAssets assets{};
+    assets.SetLargeImage("rotom");
+    assets.SetLargeText(PROGRAM_NAME);
+    assets.SetSmallImage("idle");
+    assets.SetSmallText("Idle");
+    activity.Assets().emplace(assets);
+    return activity;
+}
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Integrations/DiscordSocial/DiscordSocial.h b/SerialPrograms/Source/Integrations/DiscordSocial/DiscordSocial.h
new file mode 100644
index 0000000000..6198ade4eb
--- /dev/null
+++ b/SerialPrograms/Source/Integrations/DiscordSocial/DiscordSocial.h
@@ -0,0 +1,53 @@
+/*  Discord Social
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Integrations_DiscordSocial_H
+#define PokemonAutomation_Integrations_DiscordSocial_H
+
+#include <atomic>
+#include <discord_social_sdk/discordpp.h>
+#include "Common/Cpp/Logging/AbstractLogger.h"
+#include "Common/Cpp/Concurrency/AsyncTask.h"
+
+namespace PokemonAutomation{
+namespace Integration{
+namespace DiscordSocialSDK{
+
+
+class DiscordSocial{
+public:
+    DiscordSocial() : m_running(false) {}
+    ~DiscordSocial(){
+        stop();
+    }
+
+    static DiscordSocial& instance();
+    void run();
+    void stop() noexcept;
+
+private:
+    Logger& logger();
+    void log(const std::string& message, const std::string& identity, const discordpp::LoggingSeverity& severity);
+    discordpp::Activity create_activity();
+    void update_rich_presence();
+    void thread_loop();
+
+private:
+    AsyncTask m_thread;
+    std::shared_ptr<discordpp::Client> m_client = nullptr;
+    std::atomic<bool> m_running;
+    const uint64_t m_app_id = 1406867596585865326;
+    discordpp::Activity m_activity;
+    discordpp::ActivityTimestamps m_timestamps{};
+    discordpp::LoggingSeverity m_log_level = discordpp::LoggingSeverity::Error;
+    const std::string m_github_release_latest = "https://github.com/PokemonAutomation/ComputerControl/releases/latest";
+};
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Integrations/DiscordWebhook.cpp b/SerialPrograms/Source/Integrations/DiscordWebhook.cpp
index 591ac7352d..30e58621a6 100644
--- a/SerialPrograms/Source/Integrations/DiscordWebhook.cpp
+++ b/SerialPrograms/Source/Integrations/DiscordWebhook.cpp
@@ -1,6 +1,6 @@
 /*  Discord Webhook
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -11,14 +11,12 @@
 #include <QEventLoop>
 #include <QNetworkAccessManager>
 #include "Common/Cpp/PrettyPrint.h"
-//#include "Common/Cpp/PanicDump.h"
-//#include "Common/Cpp/Json/JsonValue.h"
+#include "Common/Cpp/Logging/GlobalLogger.h"
 #include "Common/Cpp/Json/JsonArray.h"
 #include "Common/Cpp/Json/JsonObject.h"
-#include "Common/Qt/StringToolsQt.h"
 #include "CommonFramework/GlobalSettingsPanel.h"
-#include "CommonFramework/Logging/Logger.h"
 #include "CommonFramework/Notifications/EventNotificationOption.h"
+#include "CommonFramework/Tools/GlobalThreadPools.h"
 #include "DiscordSettingsOption.h"
 #include "DiscordWebhook.h"
 
@@ -35,15 +33,22 @@ namespace DiscordWebhook{
 DiscordWebhookSender::DiscordWebhookSender()
     : m_logger(global_logger_raw(), "DiscordWebhookSender")
     , m_stopping(false)
-    , m_dispatcher(nullptr, 1)
-    , m_queue(m_dispatcher)
+    , m_queue(GlobalThreadPools::unlimited_normal())
 {}
 
 DiscordWebhookSender::~DiscordWebhookSender(){
+    stop();
+}
+void DiscordWebhookSender::stop(){
+    m_queue.stop();
+    m_stopping.store(true, std::memory_order_release);
     {
-        std::lock_guard<std::mutex> lg(m_lock);
-        m_stopping = true;
-        m_cv.notify_all();
+        std::lock_guard<Mutex> lg(m_lock);
+    }
+    m_cv.notify_all();
+    std::lock_guard<Mutex> lg(m_send_lock);
+    if (m_event_loop){
+        m_event_loop->exit();
     }
 }
 
@@ -52,58 +57,92 @@ DiscordWebhookSender& DiscordWebhookSender::instance(){
     return sender;
 }
 
-void DiscordWebhookSender::send_json(
+void DiscordWebhookSender::send(
     Logger& logger,
     const QUrl& url, std::chrono::milliseconds delay,
     const JsonObject& obj,
-    std::shared_ptr<PendingFileSend> file
+    std::shared_ptr<PendingFileSend> file,
+    std::function<void()> finish_callback
 ){
     cleanup_stuck_requests();
+    std::shared_ptr<JsonValue> json(new JsonValue(obj.clone()));
+//    cout << "Scheduling Webhook Message... (queue = " + tostr_u_commas(m_queue.size()) + ")" << endl;
+    logger.log("Scheduling Webhook Message... (queue = " + tostr_u_commas(m_queue.size()) + ")", COLOR_PURPLE);
     m_queue.add_event(
         delay,
-        [this, url, data = QByteArray::fromStdString(obj.dump()), file = std::move(file)]{
+        [
+            this, url,
+            json = std::move(json),
+            file = std::move(file),
+            finish_callback = std::move(finish_callback)
+        ]{
             throttle();
-            if (!file && !data.isEmpty()){
-                internal_send_json(url, data);
-            }else if (file && !data.isEmpty()){
-                internal_send_image_embed(url, data, file->filepath(), file->filename());
-            }else{
-                internal_send_file(url, file->filepath());
+            std::vector<DiscordFileAttachment> attachments;
+            if (file){
+                attachments.emplace_back(
+                    DiscordFileAttachment{file->filename(), file->filepath()}
+                );
+            }
+            internal_send(url, *json, attachments);
+            if (finish_callback){
+                finish_callback();
             }
         }
     );
-    logger.log("Scheduling Webhook Message... (queue = " + tostr_u_commas(m_queue.size()) + ")", COLOR_PURPLE);
 }
-
-void DiscordWebhookSender::send_file(
+void DiscordWebhookSender::send(
     Logger& logger,
     const QUrl& url, std::chrono::milliseconds delay,
-    std::shared_ptr<PendingFileSend> file
+    const JsonObject& obj,
+    std::vector<std::shared_ptr<PendingFileSend>> files,
+    std::function<void()> finish_callback
 ){
     cleanup_stuck_requests();
-//    m_queue.emplace_back(url, file);
+    std::shared_ptr<JsonValue> json(new JsonValue(obj.clone()));
+//    cout << "Scheduling Webhook Message... (queue = " + tostr_u_commas(m_queue.size()) + ")" << endl;
+    logger.log("Scheduling Webhook Message... (queue = " + tostr_u_commas(m_queue.size()) + ")", COLOR_PURPLE);
     m_queue.add_event(
         delay,
-        [this, url, file = std::move(file)]{
+        [
+            this, url,
+            json = std::move(json),
+            files = std::move(files),
+            finish_callback = std::move(finish_callback)
+        ]{
             throttle();
-            internal_send_file(url, file->filepath());
+            std::vector<DiscordFileAttachment> attachments;
+            for (auto& file : files){
+                attachments.emplace_back(
+                    DiscordFileAttachment{file->filename(), file->filepath()}
+                );
+            }
+            internal_send(url, *json, attachments);
+            if (finish_callback){
+                finish_callback();
+            }
         }
     );
-    logger.log("Scheduling Webhook Message... (queue = " + tostr_u_commas(m_queue.size()) + ")", COLOR_PURPLE);
 }
 
 void DiscordWebhookSender::cleanup_stuck_requests(){
-    std::lock_guard<std::mutex> lg(m_lock);
-    WallClock next = m_queue.next_event();
-    if (next == WallClock::max()){
-        return;
+    {
+        std::lock_guard<Mutex> lg(m_lock);
+        WallClock next = m_queue.next_event();
+        if (next == WallClock::max()){
+            return;
+        }
+
+        WallClock now = current_time();
+        WallClock threshold = now - std::chrono::seconds(60);
+        if (next >= threshold){
+            return;
+        }
     }
 
-    WallClock now = current_time();
-    WallClock threshold = now - std::chrono::seconds(60);
-    if (next < threshold){
-        m_logger.log("Purging request that appears to be stuck.", COLOR_RED);
-        emit stop_event_loop();
+    m_logger.log("Purging request that appears to be stuck.", COLOR_RED);
+    std::lock_guard<Mutex> lg(m_send_lock);
+    if (m_event_loop){
+        m_event_loop->exit();
     }
 }
 void DiscordWebhookSender::throttle(){
@@ -113,14 +152,14 @@ void DiscordWebhookSender::throttle(){
     while (!m_sent.empty() && m_sent[0] + duration < now){
         m_sent.pop_front();
     }
-    if (m_sent.size() >= GlobalSettings::instance().DISCORD.webhooks.sends_per_second){
+    if (!m_sent.empty() && m_sent.size() >= GlobalSettings::instance().DISCORD->webhooks.sends_per_second){
         m_logger.log("Throttling webhook messages due to rate limit...", COLOR_RED);
-        std::unique_lock<std::mutex> lg(m_lock);
+        std::unique_lock<Mutex> lg(m_lock);
         m_cv.wait_for(
             lg, duration,
-            [&]{ return m_sent[0] + duration < now || m_stopping; }
+            [&]{ return m_stopping.load(std::memory_order_relaxed) || m_sent.empty() || m_sent[0] + duration < now; }
         );
-        if (m_stopping){
+        if (m_stopping.load(std::memory_order_relaxed)){
             return;
         }
         m_sent.clear();
@@ -138,7 +177,7 @@ void DiscordWebhookSender::process_reply(QNetworkReply* reply){
     }else{
         QString error_string = reply->errorString();
         QString url = reply->url().toString();
-        int index = error_string.indexOf(url);
+        qsizetype index = error_string.indexOf(url);
         if (index >= 0){
             error_string.replace(index, url.size(), "****************");
         }
@@ -148,107 +187,131 @@ void DiscordWebhookSender::process_reply(QNetworkReply* reply){
     }
 }
 
-void DiscordWebhookSender::internal_send_json(const QUrl& url, const QByteArray& data){
-    QEventLoop event_loop;
-    connect(
-        this, &DiscordWebhookSender::stop_event_loop,
-        &event_loop, &QEventLoop::quit
-    );
+void DiscordWebhookSender::internal_send(
+    const QUrl& url, const JsonValue& json,
+    const std::vector<DiscordFileAttachment>& files
+){
+    if (m_stopping.load(std::memory_order_acquire)){
+        return;
+    }
 
-    QNetworkRequest request(url);
-    request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
+    {
+        std::lock_guard<Mutex> lg(m_send_lock);
+        m_event_loop.reset(new QEventLoop);
+    }
 
-    QNetworkAccessManager manager;
-    event_loop.connect(&manager, SIGNAL(finished(QNetworkReply*)), SLOT(quit()));
-    m_logger.log("Sending Webhook Message...", COLOR_BLUE);
-    std::unique_ptr<QNetworkReply> reply(manager.post(request, data));
-    event_loop.exec();
-    process_reply(reply.get());
-}
+    try{
+        QHttpMultiPart multiPart(QHttpMultiPart::FormDataType);
+        if (!json.is_null()){
+            QHttpPart json_part;
+            json_part.setHeader(
+                QNetworkRequest::ContentDispositionHeader,
+                QVariant("form-data; name=payload_json")
+            );
+            json_part.setBody(QByteArray::fromStdString(json.dump()));
+            multiPart.append(json_part);
+        }
 
-void DiscordWebhookSender::internal_send_file(const QUrl& url, const std::string& filename){
-    QEventLoop event_loop;
-    connect(
-        this, &DiscordWebhookSender::stop_event_loop,
-        &event_loop, &QEventLoop::quit
-    );
+        std::vector<QHttpPart> file_parts;
+        std::deque<QFile> file_readers;
+        file_parts.reserve(files.size());
+        size_t c = 0;
+        for (const auto& file : files){
+            QFile& reader = file_readers.emplace_back(QString::fromStdString(file.filepath));
+            if (!reader.open(QIODevice::ReadOnly)){
+                m_logger.log("File doesn't exist: " + file.filepath, COLOR_RED);
+                continue;
+            }
+            QHttpPart& part = file_parts.emplace_back();
+            part.setHeader(
+                QNetworkRequest::ContentDispositionHeader,
+                QVariant(QString::fromStdString("application/octet-stream; name=file" + std::to_string(c) + "; filename=" + file.name))
+            );
+            part.setBodyDevice(&reader);
+            multiPart.append(part);
+            c++;
+        }
 
-    QFile file(QString::fromStdString(filename));
-    if (!file.open(QIODevice::ReadOnly)){
-        m_logger.log("File doesn't exist: " + filename, COLOR_RED);
-        return;
-    }
+        QNetworkRequest request(url);
+        QNetworkAccessManager manager;
+        m_event_loop->connect(&manager, SIGNAL(finished(QNetworkReply*)), SLOT(quit()));
+//        cout << "Sending Webhook Message... (queue = " + tostr_u_commas(m_queue.size()) + ")" << endl;
+        m_logger.log("Sending Webhook Message... (queue = " + tostr_u_commas(m_queue.size()) + ")", COLOR_BLUE);
+        std::unique_ptr<QNetworkReply> reply(manager.post(request, &multiPart));
 
-    QNetworkRequest request(url);
+        if (!m_stopping.load(std::memory_order_acquire)){
+//            cout << "internal_send() - exec" << endl;
 
-    QHttpPart imagePart;
-    imagePart.setHeader(
-        QNetworkRequest::ContentDispositionHeader,
-        QVariant("form-data; name=\"file1\"; filename=\"" + file.fileName() + "\"")
-    );
-    imagePart.setBodyDevice(&file);
+            m_event_loop->exec();
+            process_reply(reply.get());
 
-    QHttpMultiPart multiPart(QHttpMultiPart::FormDataType);
-    multiPart.append(imagePart);
+//            cout << "internal_send() - end" << endl;
+        }
+    }catch (...){
+        std::lock_guard<Mutex> lg(m_send_lock);
+        m_event_loop.reset();
+        throw;
+    }
 
-    QNetworkAccessManager manager;
-    event_loop.connect(&manager, SIGNAL(finished(QNetworkReply*)), SLOT(quit()));
-    m_logger.log("Sending Webhook Message...", COLOR_BLUE);
-    std::unique_ptr<QNetworkReply> reply(manager.post(request, &multiPart));
-    event_loop.exec();
-    process_reply(reply.get());
+    std::lock_guard<Mutex> lg(m_send_lock);
+    m_event_loop.reset();
 }
 
-void DiscordWebhookSender::internal_send_image_embed(const QUrl& url, const QByteArray& data, const std::string& filepath, const std::string& filename){
-    QEventLoop event_loop;
-    connect(
-        this, &DiscordWebhookSender::stop_event_loop,
-        &event_loop, &QEventLoop::quit
-    );
 
-    QFile file(QString::fromStdString(filepath));
-    if (!file.open(QIODevice::ReadOnly)){
-        m_logger.log("File doesn't exist: " + filepath, COLOR_RED);
+
+void send_embed(
+    Logger& logger,
+    bool should_ping,
+    const std::vector<std::string>& tags,
+    const JsonArray& embeds,
+    std::shared_ptr<PendingFileSend> file
+){
+    DiscordSettingsOption& settings = GlobalSettings::instance().DISCORD;
+    if (!settings.webhooks.enabled()){
         return;
     }
 
-    QNetworkRequest request(url);
-
-    QHttpPart imagePart;
-    imagePart.setHeader(
-        QNetworkRequest::ContentDispositionHeader,
-        QVariant("application/octet-stream; name=file0; filename=" + QString::fromStdString(filename))
-    );
-    imagePart.setBodyDevice(&file);
+    MessageBuilder builder(tags);
 
-    QHttpPart jsonPart;
-    jsonPart.setHeader(
-        QNetworkRequest::ContentDispositionHeader,
-        QVariant("form-data; name=payload_json")
-    );
-    jsonPart.setBody(data);
-
-    QHttpMultiPart multiPart(QHttpMultiPart::FormDataType);
-    multiPart.append(imagePart);
-    multiPart.append(jsonPart);
-
-    QNetworkAccessManager manager;
-    event_loop.connect(&manager, SIGNAL(finished(QNetworkReply*)), SLOT(quit()));
-    m_logger.log("Sending Webhook Message...", COLOR_BLUE);
-    std::unique_ptr<QNetworkReply> reply(manager.post(request, &multiPart));
-    event_loop.exec();
-    process_reply(reply.get());
-}
+    std::vector<std::unique_ptr<DiscordWebhookUrl>> list = settings.webhooks.urls.copy_snapshot();
+    for (size_t c = 0; c < list.size(); c++){
+        const DiscordWebhookUrl& url = *list[c];
+        if (!url.enabled || ((std::string)url.url).empty()){
+            continue;
+        }
+        if (!builder.should_send(EventNotificationOption::parse_tags(url.tags_text))){
+            continue;
+        }
 
+        std::chrono::seconds delay(url.delay);
 
+        JsonObject json;
+        json["content"] = builder.build_message(
+            delay,
+            should_ping && url.ping,
+            settings.message.user_id,
+            settings.message.message
+        );
+        if (!embeds.empty()){
+            json["embeds"] = embeds.clone();
+        }
 
+        DiscordWebhookSender::instance().send(
+            logger,
+            QString::fromStdString(url.url),
+            delay,
+            std::move(json),
+            file
+        );
+    }
+}
 
 void send_embed(
     Logger& logger,
     bool should_ping,
     const std::vector<std::string>& tags,
     const JsonArray& embeds,
-    std::shared_ptr<PendingFileSend> file
+    const std::vector<std::shared_ptr<PendingFileSend>>& files
 ){
     DiscordSettingsOption& settings = GlobalSettings::instance().DISCORD;
     if (!settings.webhooks.enabled()){
@@ -280,19 +343,18 @@ void send_embed(
             json["embeds"] = embeds.clone();
         }
 
-        DiscordWebhookSender::instance().send_json(
+        DiscordWebhookSender::instance().send(
             logger,
             QString::fromStdString(url.url),
             delay,
             std::move(json),
-            file
+            files
         );
     }
 }
 
 
 
-
 }
 }
 }
diff --git a/SerialPrograms/Source/Integrations/DiscordWebhook.h b/SerialPrograms/Source/Integrations/DiscordWebhook.h
index 8d9b005a29..425d3ac7f3 100644
--- a/SerialPrograms/Source/Integrations/DiscordWebhook.h
+++ b/SerialPrograms/Source/Integrations/DiscordWebhook.h
@@ -1,6 +1,6 @@
 /*  Discord Webhook
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -8,12 +8,14 @@
 #define PokemonAutomation_DiscordWebhook_H
 
 #include <deque>
-#include <condition_variable>
 #include <QNetworkReply>
 #include "Common/Cpp/Time.h"
+#include "Common/Cpp/Concurrency/Mutex.h"
+#include "Common/Cpp/Concurrency/ConditionVariable.h"
 #include "Common/Cpp/Concurrency/ScheduledTaskRunner.h"
-#include "CommonFramework/Logging/Logger.h"
-#include "CommonFramework/Options/ScreenshotFormatOption.h"
+#include "Common/Cpp/Logging/TaggedLogger.h"
+//#include "CommonFramework/Logging/Logger.h"
+//#include "CommonFramework/Options/ScreenshotFormatOption.h"
 #include "CommonFramework/Notifications/MessageAttachment.h"
 
 class QEventLoop;
@@ -25,6 +27,11 @@ namespace Integration{
 namespace DiscordWebhook{
 
 
+struct DiscordFileAttachment{
+    std::string name;
+    std::string filepath;
+};
+
 
 class DiscordWebhookSender : public QObject{
     Q_OBJECT
@@ -38,16 +45,21 @@ class DiscordWebhookSender : public QObject{
 
 
 public:
-    void send_json(
+    void stop();
+
+    void send(
         Logger& logger,
         const QUrl& url, std::chrono::milliseconds delay,
         const JsonObject& obj,
-        std::shared_ptr<PendingFileSend> file
+        std::shared_ptr<PendingFileSend> file,
+        std::function<void()> finish_callback = nullptr
     );
-    void send_file(
+    void send(
         Logger& logger,
         const QUrl& url, std::chrono::milliseconds delay,
-        std::shared_ptr<PendingFileSend> file
+        const JsonObject& obj,
+        std::vector<std::shared_ptr<PendingFileSend>> files,
+        std::function<void()> finish_callback = nullptr
     );
 
     static DiscordWebhookSender& instance();
@@ -59,21 +71,21 @@ class DiscordWebhookSender : public QObject{
     void throttle();
 
     void process_reply(QNetworkReply* reply);
-    void internal_send_json(const QUrl& url, const QByteArray& data);
-    void internal_send_file(const QUrl& url, const std::string& filename);
-    void internal_send_image_embed(const QUrl& url, const QByteArray& data, const std::string& filepath, const std::string& filename);
-
-signals:
-    void stop_event_loop();
+    void internal_send(
+        const QUrl& url, const JsonValue& json,
+        const std::vector<DiscordFileAttachment>& files
+    );
 
 private:
     TaggedLogger m_logger;
-    bool m_stopping;
-    std::mutex m_lock;
-    std::condition_variable m_cv;
+    std::atomic<bool> m_stopping;
+    Mutex m_lock;
+    ConditionVariable m_cv;
+
+    Mutex m_send_lock;
+    std::unique_ptr<QEventLoop> m_event_loop;
 
     std::deque<WallClock> m_sent;
-    AsyncDispatcher m_dispatcher;
     ScheduledTaskRunner m_queue;
 };
 
@@ -87,6 +99,13 @@ void send_embed(
     const JsonArray& embeds,
     std::shared_ptr<PendingFileSend> file
 );
+void send_embed(
+    Logger& logger,
+    bool should_ping,
+    const std::vector<std::string>& tags,
+    const JsonArray& embeds,
+    const std::vector<std::shared_ptr<PendingFileSend>>& files
+);
 
 
 
diff --git a/SerialPrograms/Source/Integrations/DiscordWebhookSettings.cpp b/SerialPrograms/Source/Integrations/DiscordWebhookSettings.cpp
index 240b36bf69..402483b459 100644
--- a/SerialPrograms/Source/Integrations/DiscordWebhookSettings.cpp
+++ b/SerialPrograms/Source/Integrations/DiscordWebhookSettings.cpp
@@ -1,6 +1,6 @@
 /*  Discord Webhook Settings
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -15,13 +15,14 @@ namespace Integration{
 
 
 
-DiscordWebhookUrl::DiscordWebhookUrl()
-    : enabled(LockWhileRunning::LOCKED, true)
-    , label(false, LockWhileRunning::LOCKED, "", "My test server")
-    , ping(LockWhileRunning::LOCKED, true)
-    , tags_text(false, LockWhileRunning::LOCKED, "Notifs, Showcase, LiveHost", "")
-    , delay(LockWhileRunning::LOCKED, 0, 0, 10)
-    , url(true, LockWhileRunning::LOCKED, "", "https://discord.com/api/webhooks/123456789012345678/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx")
+DiscordWebhookUrl::DiscordWebhookUrl(EditableTableOption& parent_table)
+    : EditableTableRow(parent_table)
+    , enabled(LockMode::LOCK_WHILE_RUNNING, true)
+    , label(false, LockMode::LOCK_WHILE_RUNNING, "", "My test server")
+    , ping(LockMode::LOCK_WHILE_RUNNING, true)
+    , tags_text(false, LockMode::LOCK_WHILE_RUNNING, "Notifs, Showcase, LiveHost", "")
+    , delay(LockMode::LOCK_WHILE_RUNNING, 0, 0, 10)
+    , url(true, LockMode::LOCK_WHILE_RUNNING, "", "https://discord.com/api/webhooks/123456789012345678/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx")
 {
     //  Keep the old JSON tags for backwards compatibility.
     add_option(enabled, "Enabled");
@@ -32,7 +33,7 @@ DiscordWebhookUrl::DiscordWebhookUrl()
     add_option(url, "URL");
 }
 std::unique_ptr<EditableTableRow> DiscordWebhookUrl::clone() const{
-    std::unique_ptr<DiscordWebhookUrl> ret(new DiscordWebhookUrl());
+    std::unique_ptr<DiscordWebhookUrl> ret(new DiscordWebhookUrl(parent()));
     ret->enabled = (bool)enabled;
     ret->label.set(label);
     ret->ping = (bool)ping;
@@ -43,7 +44,7 @@ std::unique_ptr<EditableTableRow> DiscordWebhookUrl::clone() const{
 }
 void DiscordWebhookUrl::load_json(const JsonValue& json){
     EditableTableRow::load_json(json);
-    const JsonObject* obj = json.get_object();
+    const JsonObject* obj = json.to_object();
     if (obj == nullptr){
         return;
     }
@@ -53,7 +54,7 @@ void DiscordWebhookUrl::load_json(const JsonValue& json){
     if (array){
         std::string tags;
         for (const auto& tag : *array){
-            const std::string* str = tag.get_string();
+            const std::string* str = tag.to_string();
             if (str == nullptr){
                 continue;
             }
@@ -74,7 +75,9 @@ void DiscordWebhookUrl::load_json(const JsonValue& json){
 DiscordWebhookSettingsTable::DiscordWebhookSettingsTable()
     : EditableTableOption_t<DiscordWebhookUrl>(
         "<b>Discord Webhook URLs:</b> Notifications are sent to all enabled URLs that share a tag with the event.",
-        LockWhileRunning::LOCKED
+        LockMode::LOCK_WHILE_RUNNING,
+        true,
+        10
     )
 {}
 std::vector<std::string> DiscordWebhookSettingsTable::make_header() const{
@@ -92,10 +95,16 @@ std::vector<std::string> DiscordWebhookSettingsTable::make_header() const{
 
 
 DiscordWebhookSettingsOption::DiscordWebhookSettingsOption()
-    : GroupOption("Discord Webhook Settings", LockWhileRunning::LOCKED, true, false)
+    : GroupOption(
+        "Discord Webhook Settings",
+        LockMode::LOCK_WHILE_RUNNING,
+        GroupOption::EnableMode::DEFAULT_ENABLED,
+        false,
+        false
+    )
     , sends_per_second(
         "<b>Rate Limit:</b><br>Maximum number of sends per second.",
-        LockWhileRunning::LOCKED, 2
+        LockMode::LOCK_WHILE_RUNNING, 2, 1
     )
 {
     PA_ADD_OPTION(urls);
diff --git a/SerialPrograms/Source/Integrations/DiscordWebhookSettings.h b/SerialPrograms/Source/Integrations/DiscordWebhookSettings.h
index c87ec1d9f3..466f61db65 100644
--- a/SerialPrograms/Source/Integrations/DiscordWebhookSettings.h
+++ b/SerialPrograms/Source/Integrations/DiscordWebhookSettings.h
@@ -1,6 +1,6 @@
 /*  Discord Webhook Settings
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -19,7 +19,7 @@ namespace Integration{
 
 class DiscordWebhookUrl : public EditableTableRow{
 public:
-    DiscordWebhookUrl();
+    DiscordWebhookUrl(EditableTableOption& parent_table);
     virtual std::unique_ptr<EditableTableRow> clone() const override;
     virtual void load_json(const JsonValue& json) override;
 
diff --git a/SerialPrograms/Source/Integrations/DppIntegration/DppClient.cpp b/SerialPrograms/Source/Integrations/DppIntegration/DppClient.cpp
index cbee370e55..a41634cbf4 100644
--- a/SerialPrograms/Source/Integrations/DppIntegration/DppClient.cpp
+++ b/SerialPrograms/Source/Integrations/DppIntegration/DppClient.cpp
@@ -1,157 +1,220 @@
-#ifdef PA_DPP
-
-#include <set>
-#include <dpp/DPP_SilenceWarnings.h>
-#include <dpp/dpp.h>
-#include <Integrations/DppIntegration/DppClient.h>
-#include <Integrations/DppIntegration/DppCommandHandler.h>
-#include "Common/Cpp/Json/JsonArray.h"
-#include "Common/Cpp/Json/JsonObject.h"
-#include "Common/Qt/StringToolsQt.h"
-#include "CommonFramework/GlobalSettingsPanel.h"
-#include "CommonFramework/Notifications/EventNotificationOption.h"
-
-using namespace dpp;
-namespace PokemonAutomation{
-namespace Integration{
-namespace DppClient{
-
-
-Client& Client::instance() {
-    static Client client;
-    return client;
-}
-
-bool Client::is_initialized(){
-    std::lock_guard<std::mutex> lg(m_client_lock);
-    return m_bot != nullptr;
-}
-bool Client::is_running() {
-    return m_is_connected.load(std::memory_order_acquire);
-}
-
-void Client::connect() {
-    std::lock_guard<std::mutex> lg(m_client_lock);
-    if (m_bot == nullptr && !m_is_connected.load(std::memory_order_relaxed)) {
-        DiscordSettingsOption& settings = GlobalSettings::instance().DISCORD;
-        if (!Handler::check_if_empty(settings))
-            return;
-
-        std::string token = settings.integration.token;
-        uint32_t intents = intents::i_default_intents | intents::i_guild_members | intents::i_message_content;
-        try {
-            m_bot = std::make_unique<cluster>(token, intents);
-            m_handler = std::make_unique<commandhandler>(m_bot.get(), false);
-            m_bot->cache_policy = { cache_policy_setting_t::cp_lazy, cache_policy_setting_t::cp_lazy, cache_policy_setting_t::cp_aggressive };
-            std::thread(&Client::run, this, token).detach();
-        }
-        catch (std::exception& e) {
-            Handler::log_dpp("DPP thew an exception: " + (std::string)e.what(), "connect()", ll_critical);
-        }
-    }
-}
-
-void Client::disconnect() {
-    std::lock_guard<std::mutex> lg(m_client_lock);
-    if (m_bot != nullptr && m_is_connected.load(std::memory_order_relaxed)) {
-        try {
-            m_bot->shutdown();
-            m_handler.reset();
-            m_bot.reset();
-            m_is_connected.store(false, std::memory_order_release);
-        }
-        catch (std::exception& e) {
-            Handler::log_dpp("DPP thew an exception: " + (std::string)e.what(), "disconnect()", ll_critical);
-        }
-    }
-}
-
-void Client::send_embed_dpp(
-    bool should_ping,
-    const Color& color,
-    const std::vector<std::string>& tags,
-    const JsonObject& json_obj,
-    std::shared_ptr<PendingFileSend> file
-){
-    std::lock_guard<std::mutex> lg(m_client_lock);
-    DiscordSettingsOption& settings = GlobalSettings::instance().DISCORD;
-    if (!settings.integration.enabled()){
-        return;
-    }
-    if (!m_is_connected.load(std::memory_order_relaxed)){
-        return;
-    }
-
-
-    embed embed;
-    {
-        embed.set_title(*json_obj.get_string("title"));
-        embed.set_color((int)((uint32_t)color & 0xffffff));
-
-        auto fields = json_obj.get_array("fields");
-        for (auto& field : *fields) {
-            auto obj = field.get_object();
-            embed.add_field(*obj->get_string("name"), *obj->get_string("value"));
-        }
-    }
-
-    std::set<std::string> tag_set;
-    for (const std::string& tag : tags) {
-        tag_set.insert(to_lower(tag));
-    }
-
-    MessageBuilder builder(tags);
-    const DiscordIntegrationTable& channels = settings.integration.channels;
-
-    auto table = channels.copy_snapshot();
-    for (auto& ch : table) {
-        const Integration::DiscordIntegrationChannel& channel = *ch;
-        if (((std::string)channel.tags_text).empty() || !channel.enabled) {
-            continue;
-        }
-        if (!builder.should_send(EventNotificationOption::parse_tags(channel.tags_text))){
-            continue;
-        }
-
-        std::chrono::seconds delay(channel.delay);
-        Handler::send_message(
-            *m_bot.get(), embed,
-            channel.channel_id,
-            delay,
-            builder.build_message(
-                delay,
-                should_ping && channel.ping,
-                settings.message.user_id,
-                settings.message.message
-            ),
-            file
-        );
-    }
-}
-
-void Client::run(const std::string& token) {
-    std::lock_guard<std::mutex> lg(m_client_lock);
-    if (!m_bot){
-        Handler::log_dpp("DPP has been disconnected.", "run()", ll_warning);
-        return;
-    }
-    try {
-        Handler::initialize(*m_bot.get(), *m_handler.get());
-        m_bot->set_websocket_protocol(websocket_protocol_t::ws_etf);
-        m_bot->start(st_return);
-        m_bot->set_presence(presence(presence_status::ps_online, activity_type::at_game, (std::string)GlobalSettings::instance().DISCORD.integration.game_status));
-        m_is_connected.store(true, std::memory_order_release);
-    }
-    catch (std::exception& e) {
-        Handler::log_dpp("DPP thew an exception: " + (std::string)e.what(), "run()", ll_critical);
-        m_handler.reset();
-        m_bot.reset();
-        m_is_connected.store(false, std::memory_order_release);
-    }
-}
-
-
-}
-}
-}
-#endif
+/*  DPP Client
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifdef PA_DPP
+
+#include <set>
+#include "Common/Cpp/Json/JsonArray.h"
+#include "Common/Cpp/Json/JsonObject.h"
+#include "Common/Qt/StringToolsQt.h"
+#include "CommonFramework/GlobalSettingsPanel.h"
+#include "CommonFramework/Notifications/EventNotificationOption.h"
+#include "CommonFramework/Tools/GlobalThreadPools.h"
+#include "Integrations/DppIntegration/DppClient.h"
+#include "Integrations/DppIntegration/DppCommandHandler.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace Integration{
+namespace DppClient{
+
+using namespace dpp;
+
+
+Client& Client::instance(){
+    static Client client;
+    return client;
+}
+
+
+
+Client::~Client(){
+    stop();
+}
+
+void Client::stop(){
+    if (m_stopped){
+        return;
+    }
+    m_stopped = true;
+    GlobalSettings::instance().DISCORD->integration.register_slash_button.remove_listener(*this);
+    disconnect();
+    Handler::stop();
+}
+
+
+bool Client::is_initialized(){
+    std::lock_guard<Mutex> lg(m_client_lock);
+    return m_bot != nullptr;
+}
+bool Client::is_running(){
+    return m_is_connected.load(std::memory_order_acquire);
+}
+
+void Client::connect(){
+    std::lock_guard<Mutex> lg(m_client_lock);
+    if (m_bot == nullptr && !m_is_connected.load(std::memory_order_relaxed)){
+        DiscordSettingsOption& settings = GlobalSettings::instance().DISCORD;
+        if (!Handler::check_if_empty(settings))
+            return;
+
+        std::string token = settings.integration.token;
+        auto cmd_type = GlobalSettings::instance().DISCORD->integration.command_type.get();
+        uint32_t intents = intents::i_default_intents;
+        if (cmd_type == DiscordIntegrationSettingsOption::CommandType::MessageCommands){
+            intents = intents::i_default_intents | intents::i_message_content;
+        }
+
+        try{
+            m_bot = std::make_unique<cluster>(token, intents);
+            m_handler = std::make_unique<commandhandler>(m_bot.get(), false);
+            m_bot->cache_policy = {
+                cache_policy_setting_t::cp_lazy,
+                cache_policy_setting_t::cp_lazy,
+                cache_policy_setting_t::cp_aggressive
+            };
+            m_start_thread = GlobalThreadPools::unlimited_normal().dispatch_now_blocking(
+                [&, this]{ run(token); }
+            );
+        }catch (std::exception& e){
+            Handler::log_dpp("DPP thew an exception: " + (std::string)e.what(), "connect()", ll_critical);
+        }
+    }
+}
+
+void Client::disconnect(){
+    std::lock_guard<Mutex> lg(m_client_lock);
+//    cout << "Client::disconnect()" << endl;
+
+    m_start_thread.wait_and_ignore_exceptions();
+
+    if (m_bot == nullptr || !m_is_connected.load(std::memory_order_relaxed)){
+        return;
+    }
+    try{
+        m_bot->shutdown();
+        m_handler.reset();
+        m_bot.reset();
+        m_is_connected.store(false, std::memory_order_release);
+    }catch (std::exception& e){
+        Handler::log_dpp("DPP thew an exception: " + (std::string)e.what(), "disconnect()", ll_critical);
+    }
+}
+
+void Client::send_embed_dpp(
+    bool should_ping,
+    const Color& color,
+    const std::vector<std::string>& tags,
+    const JsonObject& json_obj,
+    std::shared_ptr<PendingFileSend> file
+){
+    std::lock_guard<Mutex> lg(m_client_lock);
+    DiscordSettingsOption& settings = GlobalSettings::instance().DISCORD;
+    if (!settings.integration.enabled()){
+        return;
+    }
+    if (!m_is_connected.load(std::memory_order_relaxed)){
+        return;
+    }
+
+
+    embed embed;
+    {
+        embed.set_title(*json_obj.get_string("title"));
+        embed.set_color((int)((uint32_t)color & 0xffffff));
+
+        auto fields = json_obj.get_array("fields");
+        for (auto& field : *fields){
+            auto obj = field.to_object();
+            embed.add_field(*obj->get_string("name"), *obj->get_string("value"));
+        }
+    }
+
+    std::set<std::string> tag_set;
+    for (const std::string& tag : tags){
+        tag_set.insert(to_lower(tag));
+    }
+
+    MessageBuilder builder(tags);
+    const DiscordIntegrationTable& channels = settings.integration.channels;
+
+    auto table = channels.copy_snapshot();
+    for (auto& ch : table){
+        const Integration::DiscordIntegrationChannel& channel = *ch;
+        if (((std::string)channel.tags_text).empty() || !channel.enabled){
+            continue;
+        }
+        if (!builder.should_send(EventNotificationOption::parse_tags(channel.tags_text))){
+            continue;
+        }
+
+        std::chrono::seconds delay(channel.delay);
+        Handler::send_message(
+            *m_bot.get(), embed,
+            channel.channel_id,
+            delay,
+            builder.build_message(
+                delay,
+                should_ping && channel.ping,
+                settings.message.user_id,
+                settings.message.message
+            ),
+            file
+        );
+    }
+}
+
+void Client::run(const std::string& token){
+    std::lock_guard<Mutex> lg(m_client_lock);
+    if (!m_bot){
+        Handler::log_dpp("DPP has been disconnected.", "run()", ll_warning);
+        return;
+    }
+    try{
+        Handler::initialize(*m_bot.get(), *m_handler.get());
+        m_bot->set_websocket_protocol(websocket_protocol_t::ws_etf);
+        m_bot->start(st_return);
+        m_is_connected.store(true, std::memory_order_release);
+        GlobalSettings::instance().DISCORD->integration.register_slash_button.add_listener(*this);
+    }catch (std::exception& e){
+        Handler::log_dpp("DPP thew an exception: " + (std::string)e.what(), "run()", ll_critical);
+        m_handler.reset();
+        m_bot.reset();
+        m_is_connected.store(false, std::memory_order_release);
+    }
+
+//    cout << "Client::run() - ending" << endl;
+}
+void Client::on_press(ButtonCell& button){
+    std::lock_guard<Mutex> lg(m_register_lock);
+    if (m_handler && m_handler->slash_commands_enabled){
+        GlobalSettings::instance().DISCORD->integration.register_slash_button.set_enabled(false);
+        log_dpp("Registering commands...", "Slash Command Registration", dpp::ll_info);
+        m_handler->register_commands();
+        log_dpp(
+            "Registered commands with Discord. You may have to wait or restart Discord for changes to take effect.",
+            "Slash Command Registration",
+            dpp::ll_info
+        );
+        GlobalSettings::instance().DISCORD->integration.register_slash_button.set_enabled(true);
+        return;
+    }
+
+    log_dpp(
+        "Failed to register commands. Make sure the bot is connected and Slash commands are enabled.",
+        "Slash Command Registration",
+        dpp::ll_error
+    );
+};
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Integrations/DppIntegration/DppClient.h b/SerialPrograms/Source/Integrations/DppIntegration/DppClient.h
index 6aa01de36b..3ed49268be 100644
--- a/SerialPrograms/Source/Integrations/DppIntegration/DppClient.h
+++ b/SerialPrograms/Source/Integrations/DppIntegration/DppClient.h
@@ -1,51 +1,68 @@
-#pragma once
-#ifndef DPP_CLIENT_H
-#define DPP_CLIENT_H
-
-#include <atomic>
-#include <dpp/dpp.h>
-#include <Integrations/DppIntegration/DppCommandHandler.h>
-#include "CommonFramework/Notifications/MessageAttachment.h"
-
-namespace PokemonAutomation{
-    class JsonObject;
-namespace Integration{
-namespace DppClient{
-
-
-
-class Client : protected DppCommandHandler::Handler{
-public:
-    Client() : m_is_connected(false) {}
-    static Client& instance();
-
-public:
-    bool is_initialized();
-    bool is_running();
-
-    void connect();
-    void disconnect();
-    void send_embed_dpp(
-        bool should_ping,
-        const Color& color,
-        const std::vector<std::string>& tags,
-        const JsonObject& json_obj,
-        std::shared_ptr<PendingFileSend> file
-    );
-
-private:
-    void run(const std::string& token);
-
-private:
-    std::unique_ptr<dpp::cluster> m_bot = nullptr;
-    std::unique_ptr<dpp::commandhandler> m_handler = nullptr;
-    std::atomic<bool> m_is_connected;
-    std::mutex m_client_lock;
-};
-
-
-
-}
-}
-}
-#endif
+/*  DPP Client
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Integrations_DppClient_H
+#define PokemonAutomation_Integrations_DppClient_H
+
+#ifdef PA_DPP
+#include <atomic>
+#include "Common/Cpp/Concurrency/AsyncTask.h"
+#include "Common/Cpp/Concurrency/Mutex.h"
+#include "Common/Cpp/Options/ButtonOption.h"
+#include "CommonFramework/Notifications/MessageAttachment.h"
+#include "Integrations/DppIntegration/DppCommandHandler.h"
+
+namespace PokemonAutomation{
+    class JsonObject;
+namespace Integration{
+namespace DppClient{
+
+
+
+class Client final : protected DppCommandHandler::Handler, public ButtonListener{
+public:
+    Client() : m_is_connected(false) {}
+    ~Client();
+    static Client& instance();
+
+    virtual void stop() override;
+
+public:
+    bool is_initialized();
+    bool is_running();
+
+    void connect();
+    void disconnect();
+    void send_embed_dpp(
+        bool should_ping,
+        const Color& color,
+        const std::vector<std::string>& tags,
+        const JsonObject& json_obj,
+        std::shared_ptr<PendingFileSend> file
+    );
+
+private:
+    void run(const std::string& token);
+    virtual void on_press(ButtonCell& button) override;
+
+private:
+    std::unique_ptr<dpp::cluster> m_bot = nullptr;
+    std::unique_ptr<dpp::commandhandler> m_handler = nullptr;
+    std::atomic<bool> m_is_connected;
+    bool m_stopped = false;
+    Mutex m_client_lock;
+    Mutex m_register_lock;
+    AsyncTask m_start_thread;
+};
+
+
+
+}
+}
+}
+#endif
+
+#endif
diff --git a/SerialPrograms/Source/Integrations/DppIntegration/DppCommandHandler.cpp b/SerialPrograms/Source/Integrations/DppIntegration/DppCommandHandler.cpp
index abf15b4c1e..e524a81e79 100644
--- a/SerialPrograms/Source/Integrations/DppIntegration/DppCommandHandler.cpp
+++ b/SerialPrograms/Source/Integrations/DppIntegration/DppCommandHandler.cpp
@@ -1,628 +1,831 @@
-#ifdef PA_DPP
-
-#include <format>
-#include <dpp/DPP_SilenceWarnings.h>
-#include <dpp/dpp.h>
-#include "Common/Cpp/Concurrency/ScheduledTaskRunner.h"
-#include "CommonFramework/Globals.h"
-#include "CommonFramework/GlobalSettingsPanel.h"
-#include "CommonFramework/Notifications/MessageAttachment.h"
-#include "Integrations/IntegrationsAPI.h"
-#include "Integrations/DiscordSettingsOption.h"
-#include "DppUtility.h"
-#include "DppCommandHandler.h"
-
-using namespace dpp;
-namespace PokemonAutomation{
-namespace Integration{
-namespace DppCommandHandler{
-
-user Handler::owner;
-Color Handler::color = COLOR_WHITE;
-
-void Handler::initialize(cluster& bot, commandhandler& handler) {
-    global_logger_tagged().log("Initializing DPP...");
-
-    bot.on_log([this](const log_t& log) {
-        log_dpp(log.message, "Internal Log", log.severity);
-    });
-
-    owner = bot.current_application_get_sync().owner;
-    auto cmd_type = GlobalSettings::instance().DISCORD.integration.command_type.get();
-    std::string prefix = GlobalSettings::instance().DISCORD.integration.command_prefix;
-
-    if (cmd_type == DiscordIntegrationSettingsOption::CommandType::MessageCommands && !prefix.empty()) {
-        handler.add_prefix(prefix);
-    } else {
-        handler.add_prefix("/").add_prefix("_cmd ");
-    }
-
-    bot.on_ready([&bot, &handler, this](const ready_t&) {
-        log_dpp("Logged in as: " + bot.current_user_get_sync().format_username() + ".", "Ready", ll_info);
-        Handler::create_unified_commands(handler);
-    });
-
-    bot.on_guild_create([&bot, this](const guild_create_t& event) {
-        try {
-            std::string id = std::to_string(event.created->id);
-            log_dpp("Loaded guild: " + event.created->name + " (" + id + ").", "Guild Create", ll_info);
-            std::lock_guard<std::mutex> lg(m_count_lock);
-            Utility::get_user_counts(bot, event);
-        }
-        catch (std::exception& e) {
-            log_dpp("Failed to get user counts: " + (std::string)e.what(), "Guild Create", ll_error);
-        }
-    });
-
-    bot.on_guild_member_add([this](const guild_member_add_t& event) {
-        std::string id = std::to_string(event.adding_guild->id);
-        if (!user_counts.empty() && user_counts.count(id)) {
-            log_dpp("New member joined " + event.adding_guild->name + ". Incrementing member count.", "Guild Member Add", ll_info);
-            user_counts.at(id)++;
-        }
-    });
-
-    bot.on_guild_member_remove([this](const guild_member_remove_t& event) {
-        std::string id = std::to_string(event.removing_guild->id);
-        if (!user_counts.empty() && user_counts.count(id)) {
-            log_dpp("Member left " + event.removing_guild->name + ". Decrementing member count.", "Guild Member Remove", ll_info);
-            user_counts.at(id)--;
-        }
-    });
-
-    bot.on_message_create([&handler](const message_create_t& event) {
-        std::string content = event.msg.content;
-        if (!event.msg.author.is_bot() && handler.string_has_prefix(content)) {
-            auto channels = GlobalSettings::instance().DISCORD.integration.channels.command_channels();
-            auto channel = std::find(channels.begin(), channels.end(), std::to_string(event.msg.channel_id));
-            if (channel != channels.end()) {
-                handler.route(event);
-            }
-        }
-    });
-
-    bot.on_slashcommand([&handler](const slashcommand_t& event) {
-        if (!event.command.usr.is_bot() && handler.slash_commands_enabled) {
-            auto channels = GlobalSettings::instance().DISCORD.integration.channels.command_channels();
-            auto channel = std::find(channels.begin(), channels.end(), std::to_string(event.command.channel_id));
-            if (channel != channels.end()) {
-                handler.route(event);
-            }
-        }
-    });
-}
-
-void Handler::send_message(cluster& bot, embed& embed, const std::string& channel, std::chrono::milliseconds delay, const std::string& msg, std::shared_ptr<PendingFileSend> file) {
-    Handler::m_queue.add_event(delay > std::chrono::milliseconds(10000) ? std::chrono::milliseconds(0) : delay,
-    [&bot, this, embed = std::move(embed), channel = channel, msg = msg, file = std::move(file)]() mutable {
-        message m;
-        if (file != nullptr && !file->filepath().empty() && !file->filename().empty()) {
-            std::string data;
-            std::string path = file->filepath();
-            try {
-                data = utility::read_file(path);
-                m.add_file(file->filename(), data);
-                if (path.find(".txt") == std::string::npos) {
-                    embed.set_image("attachment://" + file->filename());
-                }
-            }
-            catch (dpp::exception e) {
-                log_dpp("Exception thrown while reading screenshot data: " + (std::string)e.what(), "send_message()", ll_error);
-            }
-        }
-
-        if (!msg.empty() && msg != "") {
-            m.content = msg;
-        }
-
-        m.allowed_mentions.parse_users = true;
-        m.channel_id = channel;
-        m.add_embed(embed);
-        bot.message_create(m);
-    });
-    log_dpp("Sending message...", "send_message()", ll_info);
-}
-
-void Handler::update_response(const dpp::command_source& src, dpp::embed& embed, const std::string& msg, std::shared_ptr<PendingFileSend> file) {
-    message m;
-    if (file != nullptr && !file->filepath().empty() && !file->filename().empty()) {
-        std::string data;
-        try {
-            data = utility::read_file(file->filepath());
-            m.add_file(file->filename(), data);
-            embed.set_image("attachment://" + file->filename());
-        }
-        catch (dpp::exception e) {
-            log_dpp("Exception thrown while reading screenshot data: " + (std::string)e.what(), "send_message()", ll_error);
-        }
-    }
-
-    if (!msg.empty() && msg != "") {
-        m.content = msg;
-    }
-
-    m.add_embed(embed);
-    if (src.interaction_event.has_value()) {
-        src.interaction_event.value().edit_response(m);
-    } else {
-        src.message_event.value().reply(m);
-    }
-}
-
-void Handler::log_dpp(const std::string& message, const std::string& identity, const dpp::loglevel& ll) {
-    Utility::log(message, identity, ll);
-}
-
-bool Handler::check_if_empty(const DiscordSettingsOption& settings) {
-    if (!settings.integration.enabled()) {
-        return false;
-    }
-    if (((std::string)settings.integration.token).empty()) {
-        log_dpp("\"Token\" must not be empty. Stopping...", "check_if_empty()", loglevel::ll_error);
-        return false;
-    }
-    else if (((std::string)settings.integration.token).find(",") != std::string::npos) {
-        log_dpp("\"Token\" must only contain one token. Stopping...", "check_if_empty()", loglevel::ll_error);
-        return false;
-    }
-    return true;
-}
-
-void Handler::create_unified_commands(commandhandler& handler) {
-    handler
-    .add_command(
-        "ping",
-        {},
-        [&handler, this](const std::string& command, const parameter_list_t&, command_source src) {
-            log_dpp("Executing " + command + "...", "Unified Command Handler", ll_info);
-            handler.reply(message("Pong! :ping_pong:"), src);
-        },
-        "Ping pong!")
-
-    .add_command(
-        "about",
-        {},
-        [&handler, this](const std::string& command, const parameter_list_t&, command_source src) {
-            log_dpp("Executing " + command + "...", "Unified Command Handler", ll_info);
-            embed embed;
-            embed.set_color((uint32_t)color).set_title("Here's a little bit about me!");
-
-            int counts = 0;
-            if (!Utility::user_counts.empty()) {
-                for (auto& count : Utility::user_counts) {
-                    counts += count.second;
-                }
-            }
-
-            embed.add_field("Owner", owner.format_username() + "(" + std::to_string(owner.id) + ")");
-            embed.add_field("Guilds", std::to_string(Utility::user_counts.size()));
-            embed.add_field("Users", std::to_string(counts));
-            embed.add_field("Uptime", handler.owner->uptime().to_string());
-            embed.add_field("Powered By", PROGRAM_NAME + " " + PROGRAM_VERSION + "([GitHub](" + PROJECT_GITHUB_URL + "/About)/[Discord](" + DISCORD_LINK_URL + "))");
-
-            message message;
-            message.add_embed(embed);
-            handler.reply(message, src);
-        },
-        "Some info about me!")
-
-    .add_command(
-        "hi",
-        {},
-        [&handler, this](const std::string& command, const parameter_list_t&, command_source src) {
-            log_dpp("Executing " + command + "...", "Unified Command Handler", ll_info);
-            message message;
-            message.set_content((std::string)GlobalSettings::instance().DISCORD.integration.hello_message);
-            if (src.message_event.has_value()) {
-                message.set_reference(src.message_event.value().msg.id);
-            }
-            handler.reply(message, src);
-        },
-        "Hi!")
-
-    .add_command(
-        "resetserial",
-        {
-            {"id", param_info(pt_integer, false, "Console ID. Find yours by using the \"status\" command.")}
-        },
-        [&handler, this](const std::string& command, const parameter_list_t& params, command_source src) {
-            log_dpp("Executing " + command + "...", "Unified Command Handler", ll_info);
-            if (src.issuer.id != owner.id) {
-                handler.reply(message("You do not have permission to use this command."), src);
-                return;
-            }
-
-            message message;
-            embed embed;
-            embed.set_color((uint32_t)color).set_title("Command Response");
-
-            int64_t id = Utility::sanitize_integer_input(params, 0);
-            std::string response = Integration::reset_serial(id);
-            if (!response.empty()) {
-                embed.set_description(response);
-                message.add_embed(embed);
-                handler.reply(message, src);
-                return;
-            }
-
-            embed.set_description("Reset the serial connection for console ID " + std::to_string(id) + ".");
-            message.add_embed(embed);
-            handler.reply(message, src);
-        },
-        "Reset the serial connection.")
-
-    .add_command(
-        "resetcamera",
-        {
-            {"id", param_info(pt_integer, false, "Console ID. Find yours by using the \"status\" command.")}
-        },
-        [&handler, this](const std::string& command, const parameter_list_t& params, command_source src) {
-            log_dpp("Executing " + command + "...", "Unified Command Handler", ll_info);
-            if (src.issuer.id != owner.id) {
-                handler.reply(message("You do not have permission to use this command."), src);
-                return;
-            }
-
-            message message;
-            embed embed;
-            embed.set_color((uint32_t)color).set_title("Command Response");
-
-            int64_t id = Utility::sanitize_integer_input(params, 0);
-            std::string response = Integration::reset_camera(id);
-            if (!response.empty()) {
-                embed.set_description(response);
-                message.add_embed(embed);
-                handler.reply(message, src);
-                return;
-            }
-
-            embed.set_description("Reset the camera for console ID " + std::to_string(id) + ".");
-            message.add_embed(embed);
-            handler.reply(message, src);
-        },
-        "Reset the camera.")
-
-    .add_command(
-        "start",
-        {
-            {"id", param_info(pt_integer, false, "Console ID. Find yours by using the \"status\" command.")}
-        },
-        [&handler, this](const std::string& command, const parameter_list_t& params, command_source src) {
-            log_dpp("Executing " + command + "...", "Unified Command Handler", ll_info);
-            if (src.issuer.id != owner.id) {
-                handler.reply(message("You do not have permission to use this command."), src);
-                return;
-            }
-
-            message message;
-            embed embed;
-            embed.set_color((uint32_t)color).set_title("Command Response");
-
-            int64_t id = Utility::sanitize_integer_input(params, 0);
-            std::string response = Integration::start_program(id);
-            if (!response.empty()) {
-                embed.set_description(response);
-                message.add_embed(embed);
-                handler.reply(message, src);
-                return;
-            }
-
-            embed.set_description("Started the program for console ID " + std::to_string(id) + ".");
-            message.add_embed(embed);
-            handler.reply(message, src);
-        },
-        "Start the currently selected program.")
-
-    .add_command(
-        "stop",
-        {
-            {"id", param_info(pt_integer, false, "Console ID. Find yours by using the \"status\" command.")}
-        },
-        [&handler, this](const std::string& command, const parameter_list_t& params, command_source src) {
-            log_dpp("Executing " + command + "...", "Unified Command Handler", ll_info);
-            if (src.issuer.id != owner.id) {
-                handler.reply(message("You do not have permission to use this command."), src);
-                return;
-            }
-
-            message message;
-            embed embed;
-            embed.set_color((uint32_t)color).set_title("Command Response");
-
-            int64_t id = Utility::sanitize_integer_input(params, 0);
-            std::string response = Integration::stop_program(id);
-            if (!response.empty()) {
-                embed.set_description(response);
-                message.add_embed(embed);
-                handler.reply(message, src);
-                return;
-            }
-
-            embed.set_description("Stopped the program for console ID " + std::to_string(id) + ".");
-            message.add_embed(embed);
-            handler.reply(message, src);
-        },
-        "Stop the currently running program.")
-
-    .add_command(
-        "status",
-        {},
-        [&handler, this](const std::string& command, const parameter_list_t&, command_source src) {
-            log_dpp("Executing " + command + "...", "Unified Command Handler", ll_info);
-            message message;
-            embed embed;
-            embed.set_color((uint32_t)color).set_description(Integration::status()).set_title("Program Status");
-            message.add_embed(embed);
-            handler.reply(message, src);
-        },
-        "View program status.")
-
-    .add_command(
-        "click",
-        {
-            {"id", param_info(pt_integer, false, "Console ID. Find yours by using the \"status\" command.")},
-            {"button", param_info(pt_string, false, "Switch console button.",
-                {{"0", "Y"},
-                {"1", "B"},
-                {"2", "A"},
-                {"3", "X"},
-                {"4", "L"},
-                {"5", "R"},
-                {"6", "ZL"},
-                {"7", "ZR"},
-                {"8", "Minus"},
-                {"9", "Plus"},
-                {"10", "LStick"},
-                {"11", "RStick"},
-                {"12", "Home"},
-                {"13", "Capture"},
-                {"14", "DUP"},
-                {"15", "DDOWN"},
-                {"16", "DLEFT"},
-                {"17", "DRIGHT"},}
-            )}
-        },
-        [&handler, this](const std::string& command, const parameter_list_t& params, command_source src) {
-            log_dpp("Executing " + command + "...", "Unified Command Handler", ll_info);
-            if (src.issuer.id != owner.id) {
-                handler.reply(message("You do not have permission to use this command."), src);
-                return;
-            }
-
-            message message;
-            embed embed;
-            embed.set_color((uint32_t)color).set_title("Command Response");
-
-            if (params.size() < 2) {
-                embed.set_description("Missing command arguments.");
-                message.add_embed(embed);
-                handler.reply(message, src);
-                return;
-            }
-
-            int64_t id = Utility::sanitize_integer_input(params, 0);
-            std::string button_input = std::get<std::string>(params[1].second);
-
-            std::string name = "None";
-            int64_t button = Utility::get_value_from_input(handler, command, button_input, name);
-
-            if (button < 0) {
-                embed.set_description("No such button found: " + button_input);
-                message.add_embed(embed);
-                handler.reply(message, src);
-                return;
-            }
-
-            std::string response;
-            if (button > 13) {
-                response = Integration::press_dpad(id, Utility::get_button(button), 50);
-            } else {
-                response = Integration::press_button(id, Utility::get_button(button), 50);
-            }
-
-            if (!response.empty()) {
-                embed.set_description(response);
-                message.add_embed(embed);
-                handler.reply(message, src);
-                return;
-            }
-
-            embed.set_description("Console ID " + std::to_string(id) + " pressed button " + name + ".");
-            message.add_embed(embed);
-            handler.reply(message, src);
-        },
-        "Click a button for the specified console.")
-                
-    .add_command(
-        "joystick",
-        {
-            {"id", param_info(pt_integer, false, "Console ID. Find yours by using the \"status\" command.")},
-            {"stick", param_info(pt_string, false, "Switch console joystick.",
-                {{"0", "LStick"},
-                {"1", "RStick"},}
-            )},
-            {"magnitude_x", param_info(pt_integer, false, "Movement amount in the horizontal direction. \"Left\" is 0, \"right\" is 255, \"neutral\" is 127.")},
-            {"magnitude_y", param_info(pt_integer, false, "Movement amount in the vertical direction. \"Down\" is 0, \"up\" is 255, \"neutral\" is 127.")},
-            {"ticks", param_info(pt_integer, false, "How long to hold the stick for, in ticks.")},
-        },
-        [&handler, this](const std::string& command, const parameter_list_t& params, command_source src) {
-            log_dpp("Executing " + command + "...", "Unified Command Handler", ll_info);
-            if (src.issuer.id != owner.id) {
-                handler.reply(message("You do not have permission to use this command."), src);
-                return;
-            }
-
-            message message;
-            embed embed;
-            embed.set_color((uint32_t)color).set_title("Command Response");
-
-            if (params.size() < 5) {
-                embed.set_description("Missing command arguments.");
-                message.add_embed(embed);
-                handler.reply(message, src);
-                return;
-            }
-
-            std::string name = "None";
-            int64_t id = Utility::sanitize_integer_input(params, 0);
-            std::string stick_input = std::get<std::string>(params[1].second);
-            int64_t stick = Utility::get_value_from_input(handler, command, stick_input, name);
-
-            if (stick < 0) {
-                embed.set_description("No such joystick found: " + stick_input);
-                message.add_embed(embed);
-                handler.reply(message, src);
-                return;
-            }
-
-            int64_t x = Utility::sanitize_integer_input(params, 2);
-            int64_t y = Utility::sanitize_integer_input(params, 3);
-            int64_t ticks = Utility::sanitize_integer_input(params, 4);
-
-            std::string response;
-            if (stick == 0) {
-                response = Integration::press_left_joystick(id, x, y, ticks);
-            }
-            else {
-                response = Integration::press_right_joystick(id, x, y, ticks);
-            }
-
-            if (!response.empty()) {
-                embed.set_description(response);
-                message.add_embed(embed);
-                handler.reply(message, src);
-                return;
-            }
-
-            embed.set_description("Console ID " + std::to_string(id) + " moved " + name + " (X: " + std::to_string(x) + ", Y: " + std::to_string(y) + ") for " + std::to_string(ticks) + " ticks.");
-            message.add_embed(embed);
-            handler.reply(message, src);
-        },
-        "Click a button for the specified console.")
-            
-    .add_command(
-        "screenshot",
-        {
-            {"id", param_info(pt_integer, false, "Console ID. Find yours by using the \"status\" command.")},
-            {"format", param_info(pt_string, false, "Image format.",
-                {{"0", "png"},
-                {"1", "jpg"},}
-            )},
-        },
-        [&handler, this](const std::string& command, const parameter_list_t& params, command_source src) {
-            log_dpp("Executing " + command + "...", "Unified Command Handler", ll_info);
-            if (src.issuer.id != owner.id) {
-                handler.reply(message("You do not have permission to use this command."), src);
-                return;
-            }
-
-            message message;
-            embed embed;
-            embed.set_color((uint32_t)color).set_title("Program Screenshot");
-
-            if (params.size() < 2) {
-                embed.set_description("Missing command arguments.");
-                message.add_embed(embed);
-                handler.reply(message, src);
-                return;
-            }
-
-            handler.thinking(src);
-            std::string name = "None";
-            int64_t id = Utility::sanitize_integer_input(params, 0);
-            std::string button_input = std::get<std::string>(params[1].second);
-            int64_t format = Utility::get_value_from_input(handler, command, button_input, name);
-
-            std::string path;
-            if (format == 0) {
-                path = "screenshot_slash.png";
-            } else {
-                path = "screenshot_slash.jpg";
-            }
-
-            std::string response = Integration::screenshot(id, path.c_str());
-            if (!response.empty()) {
-                embed.set_description(response);
-                Handler::update_response(src, embed, "", nullptr);
-                return;
-            }
-
-            std::shared_ptr<PendingFileSend> file(new PendingFileSend(path, true));
-            embed_footer footer;
-            footer.set_text("Console ID: " + std::to_string(id) + " (" + name + ")");
-
-            embed.set_footer(footer);
-            Handler::update_response(src, embed, "", std::move(file));
-        },
-        "Take and upload a screenshot from the specified console.")
-            
-    .add_command(
-        "help",
-        {},
-        [&handler, this](const std::string& command, const parameter_list_t&, command_source src) {
-            log_dpp("Executing " + command + "...", "Unified Command Handler", ll_info);
-            message message;
-            embed embed;
-            embed.set_color((uint32_t)color).set_title("Command List");
-
-            auto& commands = handler.commands;
-            for (auto& cmd : commands) {
-                std::string name = cmd.first;
-                log_dpp(name, "help command", ll_info);
-                if (src.issuer.id != owner.id && name != "hi" && name != "ping" && name != "about" && name != "status" && name != "help") {
-                    continue;
-                }
-
-                std::string param_info;
-                for (auto& param : cmd.second.parameters) {
-                    param_info += ("\n**- " + param.first + "** - " + param.second.description);
-                    if (!param.second.choices.empty()) {
-                        param_info += " (";
-                        for (auto& choice : param.second.choices) {
-                            param_info += (choice.second + ", ");
-                        }
-                        param_info = param_info.substr(0, param_info.size() - 2);
-                        param_info += ")";
-                    }
-                }
-                embed.add_field(name, param_info);
-            }
-            embed_footer footer;
-            footer.set_text("Commands are case-sensitive!");
-            embed.set_footer(footer);
-            message.add_embed(embed);
-            handler.reply(message, src);
-        },
-        "View the command list.")
-            
-    .add_command(
-        "register",
-        {},
-        [&handler, this](const std::string& command, const parameter_list_t&, command_source src) {
-            log_dpp("Executing " + command + "...", "Unified Command Handler", ll_info);
-            if (src.issuer.id != owner.id) {
-                handler.reply(message("You do not have permission to use this command."), src);
-                return;
-            }
-
-            if (handler.slash_commands_enabled) {
-                handler.thinking(src);
-                log_dpp("Registering commands.", "Command Registration", ll_info);
-                handler.register_commands();
-
-                embed embed;
-                std::string desc = "Slash commands registered! Restart your Discord client or wait a few minutes for them to show up!";
-                embed.set_color((uint32_t)color).set_description(desc).set_title("Slash Command Registration");
-                Handler::update_response(src, embed, "", nullptr);
-            } else {
-                handler.reply(message("Enable slash commands before registering them."), src);
-            }
-        },
-        "Register global slash commands. For first-time slash command use and for updating commands.");
-}
-
-
-}
-}
-}
-#endif
+/*  DPP Command Handler
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifdef PA_DPP
+
+//#include <format>
+#include <unordered_set>
+#include "Common/Cpp/Concurrency/ScheduledTaskRunner.h"
+#include "CommonFramework/Globals.h"
+#include "CommonFramework/Notifications/MessageAttachment.h"
+#include "Integrations/IntegrationsAPI.h"
+#include "Integrations/DiscordSettingsOption.h"
+#include "DppUtility.h"
+#include "DppCommandHandler.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+using namespace dpp;
+namespace PokemonAutomation{
+namespace Integration{
+namespace DppCommandHandler{
+
+user Handler::owner;
+Color Handler::color = COLOR_WHITE;
+
+
+void Handler::initialize(cluster& bot, commandhandler& handler){
+    global_logger_tagged().log("Initializing DPP...");
+
+    bot.on_log([this](const log_t& log){
+        log_dpp(log.message, "Internal Log", log.severity);
+    });
+
+#if DPP_VERSION_LONG >= 0x00100100 // (dpp version 10.1.0)
+    // Do nothing, owner will be set below in on_ready callback
+#else
+    owner = bot.current_application_get_sync().owner;
+#endif
+    auto cmd_type = GlobalSettings::instance().DISCORD->integration.command_type.get();
+    std::string prefix = GlobalSettings::instance().DISCORD->integration.command_prefix;
+
+    if (cmd_type == DiscordIntegrationSettingsOption::CommandType::MessageCommands && !prefix.empty()){
+        handler.add_prefix(prefix);
+    }else{
+        handler.add_prefix("/");
+    }
+
+    bot.on_ready([&bot, &handler, this](const ready_t&){
+#if DPP_VERSION_LONG >= 0x00100100 // (dpp version 10.1.0)
+        log_dpp("Logged in as: " + bot.me.format_username() + ".", "Ready", ll_info);
+        Handler::create_unified_commands(handler);
+        bot.current_application_get([&](const dpp::confirmation_callback_t& cc){
+            if (cc.is_error()){
+                log_dpp("Error getting application details: " + cc.get_error().message, "Current App", ll_error);
+                return;
+            }
+            dpp::application app = cc.get<dpp::application>();
+            log_dpp("Application Name: " + app.name, "Current App", ll_info);
+            log_dpp("Application ID: " + std::to_string(app.id), "Current App", ll_info);
+            owner = app.owner;
+            bot.set_presence(
+                presence(
+                    presence_status::ps_online,
+                    activity_type::at_game,
+                    (std::string)GlobalSettings::instance().DISCORD->integration.game_status
+                )
+            );
+        });
+#else
+        log_dpp("Logged in as: " + bot.current_user_get_sync().format_username() + ".", "Ready", ll_info);
+        Handler::create_unified_commands(handler);
+#endif
+    });
+
+    bot.on_guild_create([&bot, this](const guild_create_t& event){
+        try{
+#if DPP_VERSION_LONG >= 0x00100100 // (dpp version 10.1.0)
+            std::string id = std::to_string(event.created.id);
+            log_dpp("Loaded guild: " + event.created.name + " (" + id + ").", "Guild Create", ll_info);
+#else
+            std::string id = std::to_string(event.created->id);
+            log_dpp("Loaded guild: " + event.created->name + " (" + id + ").", "Guild Create", ll_info);
+#endif
+            std::lock_guard<Mutex> lg(m_count_lock);
+            Utility::get_user_counts(bot, event);
+        }catch (std::exception& e){
+            log_dpp("Failed to get user counts: " + (std::string)e.what(), "Guild Create", ll_error);
+        }
+    });
+
+    if (cmd_type == DiscordIntegrationSettingsOption::CommandType::MessageCommands){
+        bot.on_message_create([&handler](const message_create_t& event){
+            std::string content = event.msg.content;
+            if (!event.msg.author.is_bot() && handler.string_has_prefix(content)){
+                auto channels = GlobalSettings::instance().DISCORD->integration.channels.command_channels();
+                auto channel = std::find(channels.begin(), channels.end(), std::to_string(event.msg.channel_id));
+                if (channel != channels.end()){
+                    handler.route(event);
+                }
+            }
+        });
+    }
+
+    bot.on_slashcommand([&handler](const slashcommand_t& event){
+        if (!event.command.usr.is_bot() && handler.slash_commands_enabled){
+            auto channels = GlobalSettings::instance().DISCORD->integration.channels.command_channels();
+            auto channel = std::find(channels.begin(), channels.end(), std::to_string(event.command.channel_id));
+            if (channel != channels.end()){
+                handler.route(event);
+            }
+        }
+    });
+}
+
+void Handler::send_message(
+    cluster& bot,
+    embed& embed,
+    const std::string& channel,
+    std::chrono::milliseconds delay,
+    const std::string& msg,
+    std::shared_ptr<PendingFileSend> file
+){
+    Handler::m_queue.add_event(delay > std::chrono::milliseconds(10000) ? std::chrono::milliseconds(0) : delay,
+    [&bot, this, embed = std::move(embed), channel = channel, msg = msg, file = std::move(file)]() mutable {
+        message m;
+        if (file != nullptr && !file->filepath().empty() && !file->filename().empty()){
+            std::string data;
+            std::string path = file->filepath();
+            try{
+                data = utility::read_file(path);
+                m.add_file(file->filename(), data);
+                if (path.find(".txt") == std::string::npos){
+                    embed.set_image("attachment://" + file->filename());
+                }
+            }catch (dpp::exception& e){
+                log_dpp("Exception thrown while reading screenshot data: " + (std::string)e.what(), "send_message()", ll_error);
+            }
+        }
+
+        if (!msg.empty() && msg != ""){
+            m.content = msg;
+        }
+
+        m.allowed_mentions.parse_users = true;
+        m.channel_id = channel;
+        m.add_embed(embed);
+        bot.message_create(m);
+    });
+    log_dpp("Sending message...", "send_message()", ll_info);
+}
+
+void Handler::update_response(const dpp::command_source& src, dpp::embed& embed, const std::string& msg, std::shared_ptr<PendingFileSend> file){
+    message m;
+    if (file != nullptr && !file->filepath().empty() && !file->filename().empty()){
+        std::string data;
+        try{
+            data = utility::read_file(file->filepath());
+            m.add_file(file->filename(), data);
+            embed.set_image("attachment://" + file->filename());
+        }catch (dpp::exception& e){
+            log_dpp("Exception thrown while reading screenshot data: " + (std::string)e.what(), "send_message()", ll_error);
+        }
+    }
+
+    if (!msg.empty() && msg != ""){
+        m.content = msg;
+    }
+
+    m.add_embed(embed);
+    if (src.interaction_event.has_value()){
+        src.interaction_event.value().edit_response(m);
+    }else{
+        src.message_event.value().reply(m);
+    }
+}
+
+void Handler::log_dpp(const std::string& message, const std::string& identity, const dpp::loglevel& ll){
+    Utility::log(message, identity, ll);
+}
+
+bool Handler::check_if_empty(const DiscordSettingsOption& settings){
+    if (!settings.integration.enabled()){
+        return false;
+    }
+    if (((std::string)settings.integration.token).empty()){
+        log_dpp("\"Token\" must not be empty. Stopping...", "check_if_empty()", loglevel::ll_error);
+        return false;
+    }else if (((std::string)settings.integration.token).find(",") != std::string::npos){
+        log_dpp("\"Token\" must only contain one token. Stopping...", "check_if_empty()", loglevel::ll_error);
+        return false;
+    }
+    return true;
+}
+
+uint8_t Handler::get_min_parameters(const dpp::parameter_registration_t& params){
+    uint8_t c = 0;
+    for (const auto& item : params){
+        if (item.second.optional){
+            break;
+        }
+        c++;
+    }
+    return c;
+}
+
+void Handler::add_command_hi(dpp::commandhandler& handler){
+    handler.add_command(
+        "hi",
+        {},
+        [&handler, this](const std::string& command, const parameter_list_t&, command_source src){
+            log_dpp("Executing " + command + "...", "Unified Command Handler", ll_info);
+            message message;
+            message.set_content((std::string)GlobalSettings::instance().DISCORD->integration.hello_message);
+            if (src.message_event.has_value()){
+                message.set_reference(src.message_event.value().msg.id);
+            }
+            handler.reply(message, src);
+        },
+        "Hi!"
+    );
+}
+void Handler::add_command_ping(dpp::commandhandler& handler){
+    handler.add_command(
+        "ping",
+        {},
+        [&handler, this](const std::string& command, const parameter_list_t&, command_source src){
+            log_dpp("Executing " + command + "...", "Unified Command Handler", ll_info);
+            handler.reply(message("Pong! :ping_pong:"), src);
+        },
+        "Ping pong!"
+    );
+}
+void Handler::add_command_about(dpp::commandhandler& handler){
+    handler.add_command(
+        "about",
+        {},
+        [&handler, this](const std::string& command, const parameter_list_t&, command_source src){
+            log_dpp("Executing " + command + "...", "Unified Command Handler", ll_info);
+            embed embed;
+            embed.set_color((uint32_t)color).set_title("Here's a little bit about me!");
+
+            int counts = 0;
+            if (!Utility::user_counts.empty()){
+                for (auto& count : Utility::user_counts){
+                    counts += count.second;
+                }
+            }
+
+            embed.add_field("Owner", owner.format_username() + "(" + std::to_string(owner.id) + ")");
+            embed.add_field("Guilds", std::to_string(Utility::user_counts.size()));
+            embed.add_field("Users", std::to_string(counts));
+            embed.add_field("Uptime", handler.owner->uptime().to_string());
+            embed.add_field(
+                "Powered By",
+                PROGRAM_NAME + " " + PROGRAM_VERSION + " ([GitHub](" + GITHUB_LINK_URL + ")/[Discord](" + DISCORD_LINK_URL_EMBED + "))"
+            );
+
+            message message;
+            message.add_embed(embed);
+            handler.reply(message, src);
+        },
+        "Some info about me!"
+    );
+}
+void Handler::add_command_help(dpp::commandhandler& handler){
+    handler  .add_command(
+        "help",
+        {},
+        [&handler, this](const std::string& command, const parameter_list_t&, command_source src){
+            log_dpp("Executing " + command + "...", "Unified Command Handler", ll_info);
+            message message;
+            embed embed;
+            embed.set_color((uint32_t)color).set_title("Command List");
+
+            static const std::unordered_set<std::string> base_commands{
+                "hi", "ping", "about", "status", "help"
+            };
+            static const std::unordered_set<std::string> button_commands{
+                "click", "joystick"
+            };
+
+            std::unordered_set<std::string> allowed = base_commands;
+            if (GlobalSettings::instance().DISCORD->integration.allow_buttons_from_users){
+                allowed.insert(button_commands.begin(), button_commands.end());
+            }
+
+            auto& commands = handler.commands;
+            for (auto& cmd : commands){
+                const std::string& cmd_name = cmd.first;
+                if (src.issuer.id != owner.id && allowed.find(cmd_name) == allowed.end()){
+                    continue;
+                }
+
+                auto& params = cmd.second.parameters;
+                std::string signature;
+                if (!params.empty()){
+                    signature = cmd_name + "(";
+                    for (size_t i = 0; i < params.size(); ++i){
+                        signature += params[i].first;
+                        if (i + 1 < params.size()){
+                            signature += ", ";
+                        }
+                    }
+                    signature += ")";
+                }else{
+                    signature = cmd_name;
+                }
+
+                std::string param_details;
+                for (auto& param : params){
+                    param_details += ("\n-" + param.first + ": " + param.second.description);
+                    if (!param.second.choices.empty()){
+                        std::string choices;
+                        for (auto& c : param.second.choices){
+                            choices += c.second + ", ";
+                        }
+                        if (!choices.empty()){
+                            choices = choices.substr(0, choices.size() - 2);
+                        }
+                        param_details += " (" + choices + ")";
+                    }
+                }
+                embed.add_field(signature, param_details);
+            }
+            embed_footer footer;
+            footer.set_text("Commands are case-sensitive!");
+            embed.set_footer(footer);
+            message.add_embed(embed);
+            handler.reply(message, src);
+        },
+        "View the command list."
+    );
+}
+void Handler::add_command_status(dpp::commandhandler& handler){
+    handler.add_command(
+        "status",
+        {},
+        [&handler, this](const std::string& command, const parameter_list_t&, command_source src){
+            log_dpp("Executing " + command + "...", "Unified Command Handler", ll_info);
+            message message;
+            embed embed;
+            embed.set_color((uint32_t)color).set_description(Integration::status()).set_title("Program Status");
+            message.add_embed(embed);
+            handler.reply(message, src);
+        },
+        "View program status."
+    );
+}
+void Handler::add_command_screenshot(dpp::commandhandler& handler, bool full_version){
+    parameter_registration_t parameters;
+    if (full_version){
+        parameters.insert(parameters.end(), {"id", param_info(pt_integer, false, "Console ID. Find yours by using the \"status\" command.")});
+    }
+    parameters.insert(parameters.end(), {
+        {"format", param_info(pt_string, false, "Image format.",
+            {
+                {"0", "png"},
+                {"1", "jpg"},
+            }
+        )},
+    });
+    uint8_t min_parameters = get_min_parameters(parameters);
+
+    handler.add_command(
+        full_version ? "screenshotX" : "screenshot",
+        parameters,
+        [=, &handler, this](const std::string& command, const parameter_list_t& params, command_source src){
+            log_dpp("Executing " + command + "...", "Unified Command Handler", ll_info);
+            if (!GlobalSettings::instance().DISCORD->integration.allow_buttons_from_users && src.issuer.id != owner.id){
+                handler.reply(message("You do not have permission to use this command."), src);
+                return;
+            }
+
+            message message;
+            embed embed;
+            embed.set_color((uint32_t)color).set_title("Program Screenshot");
+
+            if (params.size() < min_parameters){
+                embed.set_description("Missing command arguments.");
+                message.add_embed(embed);
+                handler.reply(message, src);
+                return;
+            }
+
+            handler.thinking(src);
+            std::string name = "None";
+
+            uint8_t c = 0;
+            int64_t id = -1;
+            if (full_version){
+                id = Utility::sanitize_integer_input(params, c++);
+            }
+            std::string button_input = std::get<std::string>(params[c++].second);
+            int64_t format = Utility::get_value_from_input(handler, command, min_parameters - 1, button_input, name);
+
+            std::string path;
+            if (format == 0){
+                path = "screenshot_slash.png";
+            }else{
+                path = "screenshot_slash.jpg";
+            }
+
+            std::string response = Integration::screenshot(id, path.c_str());
+            if (!response.empty()){
+                embed.set_description(response);
+                Handler::update_response(src, embed, "", nullptr);
+                return;
+            }
+
+            std::shared_ptr<PendingFileSend> file(new PendingFileSend(path, true));
+            embed_footer footer;
+            footer.set_text("Console ID: " + std::to_string(id) + " (" + name + ")");
+
+            embed.set_footer(footer);
+            Handler::update_response(src, embed, "", std::move(file));
+        },
+        "Take and upload a screenshot from the specified console."
+    );
+}
+void Handler::add_command_start(dpp::commandhandler& handler){
+    handler.add_command(
+        "start",
+        {
+            {"id", param_info(pt_integer, true, "Console ID. Find yours by using the \"status\" command.")}
+        },
+        [&handler, this](const std::string& command, const parameter_list_t& params, command_source src){
+            log_dpp("Executing " + command + "...", "Unified Command Handler", ll_info);
+            if (!GlobalSettings::instance().DISCORD->integration.allow_buttons_from_users && src.issuer.id != owner.id){
+                handler.reply(message("You do not have permission to use this command."), src);
+                return;
+            }
+
+            message message;
+            embed embed;
+            embed.set_color((uint32_t)color).set_title("Command Response");
+
+            int64_t id = Utility::sanitize_optional_integer_input(params, 0).value_or(-1);
+            std::string response = Integration::start_program(id);
+            if (!response.empty()){
+                embed.set_description(response);
+                message.add_embed(embed);
+                handler.reply(message, src);
+                return;
+            }
+
+            embed.set_description("Started the program for console ID " + std::to_string(id) + ".");
+            message.add_embed(embed);
+            handler.reply(message, src);
+        },
+        "Start the currently selected program."
+    );
+}
+void Handler::add_command_stop(dpp::commandhandler& handler){
+    handler.add_command(
+        "stop",
+        {
+            {"id", param_info(pt_integer, true, "Console ID. Find yours by using the \"status\" command.")}
+        },
+        [&handler, this](const std::string& command, const parameter_list_t& params, command_source src){
+            log_dpp("Executing " + command + "...", "Unified Command Handler", ll_info);
+            if (!GlobalSettings::instance().DISCORD->integration.allow_buttons_from_users && src.issuer.id != owner.id){
+                handler.reply(message("You do not have permission to use this command."), src);
+                return;
+            }
+
+            message message;
+            embed embed;
+            embed.set_color((uint32_t)color).set_title("Command Response");
+
+            int64_t id = Utility::sanitize_optional_integer_input(params, 0).value_or(-1);
+            std::string response = Integration::stop_program(id);
+            if (!response.empty()){
+                embed.set_description(response);
+                message.add_embed(embed);
+                handler.reply(message, src);
+                return;
+            }
+
+            embed.set_description("Stopped the program for console ID " + std::to_string(id) + ".");
+            message.add_embed(embed);
+            handler.reply(message, src);
+        },
+        "Stop the currently running program."
+    );
+}
+void Handler::add_command_resetcamera(dpp::commandhandler& handler){
+    handler.add_command(
+        "resetcamera",
+        {
+            {"id", param_info(pt_integer, true, "Console ID. Find yours by using the \"status\" command.")}
+        },
+        [&handler, this](const std::string& command, const parameter_list_t& params, command_source src){
+            log_dpp("Executing " + command + "...", "Unified Command Handler", ll_info);
+            if (!GlobalSettings::instance().DISCORD->integration.allow_buttons_from_users && src.issuer.id != owner.id){
+                handler.reply(message("You do not have permission to use this command."), src);
+                return;
+            }
+
+            message message;
+            embed embed;
+            embed.set_color((uint32_t)color).set_title("Command Response");
+
+            int64_t id = Utility::sanitize_optional_integer_input(params, 0).value_or(-1);
+            std::string response = Integration::reset_camera(id);
+            if (!response.empty()){
+                embed.set_description(response);
+                message.add_embed(embed);
+                handler.reply(message, src);
+                return;
+            }
+
+            embed.set_description("Reset the camera for console ID " + std::to_string(id) + ".");
+            message.add_embed(embed);
+            handler.reply(message, src);
+        },
+        "Reset the camera."
+    );
+}
+void Handler::add_command_resetcontroller(dpp::commandhandler& handler){
+    handler.add_command(
+        "resetcontroller",
+        {
+            {"id", param_info(pt_integer, true, "Console ID. Find yours by using the \"status\" command.")},
+            {"index", param_info(pt_integer, true, "Controller index.")},
+        },
+        [&handler, this](const std::string& command, const parameter_list_t& params, command_source src){
+            log_dpp("Executing " + command + "...", "Unified Command Handler", ll_info);
+            if (!GlobalSettings::instance().DISCORD->integration.allow_buttons_from_users && src.issuer.id != owner.id){
+                handler.reply(message("You do not have permission to use this command."), src);
+                return;
+            }
+
+            message message;
+            embed embed;
+            embed.set_color((uint32_t)color).set_title("Command Response");
+
+            int64_t id = Utility::sanitize_optional_integer_input(params, 0).value_or(-1);
+            int64_t index = Utility::sanitize_optional_integer_input(params, 1).value_or(0);
+            std::string response = Integration::reset_controller(id, index);
+            if (!response.empty()){
+                embed.set_description(response);
+                message.add_embed(embed);
+                handler.reply(message, src);
+                return;
+            }
+
+            embed.set_description("Reset the serial connection for console ID " + std::to_string(id) + ".");
+            message.add_embed(embed);
+            handler.reply(message, src);
+        },
+        "Reset the serial connection."
+    );
+}
+void Handler::add_command_click(dpp::commandhandler& handler, bool full_version){
+    parameter_registration_t parameters;
+    if (full_version){
+        parameters.insert(parameters.end(), {"id", param_info(pt_integer, false, "Console ID. Find yours by using the \"status\" command.")});
+        parameters.insert(parameters.end(), {"index", param_info(pt_integer, false, "Controller index.")});
+    }
+
+    const param_info BUTTON_MAP(pt_string, false, "Console button.", {
+        {"0", "Y"},
+        {"1", "B"},
+        {"2", "A"},
+        {"3", "X"},
+        {"4", "L"},
+        {"5", "R"},
+        {"6", "ZL"},
+        {"7", "ZR"},
+        {"8", "-"},
+        {"9", "+"},
+        {"10", "LJ"},
+        {"11", "RJ"},
+        {"12", "Home"},
+        {"13", "Capture"},
+        {"14", "GR"},
+        {"15", "GL"},
+        {"16", "Up"},
+        {"17", "Right"},
+        {"18", "Down"},
+        {"19", "Left"},
+        {"20", "Left-SL"},
+        {"21", "Left-SR"},
+        {"22", "Right-SL"},
+        {"23", "Right-SR"},
+        {"24", "C"},
+    });
+    parameters.insert(parameters.end(), {
+        {"button", BUTTON_MAP},
+        {"milliseconds", param_info(pt_integer, true, "How long to hold the button for, in milliseconds. (defaults to 100ms)")}
+    });
+    uint8_t min_parameters = get_min_parameters(parameters);
+
+    handler.add_command(
+        full_version ? "clickX" : "click",
+        parameters,
+        [=, &handler, this](const std::string& command, const parameter_list_t& params, command_source src){
+            log_dpp("Executing " + command + "...", "Unified Command Handler", ll_info);
+            if (!GlobalSettings::instance().DISCORD->integration.allow_buttons_from_users && src.issuer.id != owner.id){
+                handler.reply(message("You do not have permission to use this command."), src);
+                return;
+            }
+
+            message message;
+            embed embed;
+            embed.set_color((uint32_t)color).set_title("Command Response");
+
+            if (params.size() < min_parameters){
+                embed.set_description("Missing command arguments.");
+                message.add_embed(embed);
+                handler.reply(message, src);
+                return;
+            }
+
+            uint8_t c = 0;
+            int64_t id = -1;
+            int64_t index = 0;
+            if (full_version){
+                id = Utility::sanitize_integer_input(params, c++);
+                index = Utility::sanitize_optional_integer_input(params, c++).value_or(0);
+            }
+            std::string button_input = std::get<std::string>(params[c++].second);
+
+            std::string name = "None";
+            Utility::get_value_from_input(handler, command, full_version ? 2 : 0, button_input, name);
+            uint32_t milliseconds = (uint32_t)Utility::sanitize_optional_integer_input(params, c++).value_or(100);
+
+            std::string response = Integration::run_controller_command(
+                id, index,
+                milliseconds,
+                name.c_str()
+            );
+
+            if (!response.empty()){
+                embed.set_description(response);
+                message.add_embed(embed);
+                handler.reply(message, src);
+                return;
+            }
+
+            embed.set_description("Console ID " + std::to_string(id) + " pressed button " + name + ".");
+            message.add_embed(embed);
+            handler.reply(message, src);
+        },
+        "Click a button for the specified console."
+    );
+}
+void Handler::add_command_joystick(dpp::commandhandler& handler, bool full_version, JoystickSide side){
+    std::string side_str = "";
+    std::string command_name = "";
+    switch (side){
+    case JoystickSide::NEITHER:
+        side_str = "joystick";
+        command_name = "JS";
+        break;
+    case JoystickSide::LEFT:
+        side_str = "Lstick";
+        command_name = "JSL";
+        break;
+    case JoystickSide::RIGHT:
+        side_str = "Rstick";
+        command_name = "JSR";
+        break;
+    }
+    if (full_version){
+        side_str += "X";
+    }
+
+    parameter_registration_t parameters;
+    if (full_version){
+        parameters.insert(parameters.end(), {"id", param_info(pt_integer, false, "Console ID. Find yours by using the \"status\" command.")});
+        parameters.insert(parameters.end(), {"index", param_info(pt_integer, false, "Controller index.")});
+    }
+    parameters.insert(parameters.end(), {
+        {"magnitude_x", param_info(pt_double, false, "Movement amount in the horizontal direction. \"Left\" is -1.0, \"right\" is +1.0, \"neutral\" is 0.0.")},
+        {"magnitude_y", param_info(pt_double, false, "Movement amount in the vertical direction. \"Down\" is -1.0, \"up\" is +1.0, \"neutral\" is 0.0.")},
+        {"milliseconds", param_info(pt_integer, true, "How long to hold the stick for, in milliseconds. (defaults to 100ms)")},
+    });
+    uint8_t min_parameters = get_min_parameters(parameters);
+
+    handler.add_command(
+        side_str,
+        parameters,
+        [=, &handler, this](const std::string& command, const parameter_list_t& params, command_source src){
+            log_dpp("Executing " + command + "...", "Unified Command Handler", ll_info);
+            if (!GlobalSettings::instance().DISCORD->integration.allow_buttons_from_users && src.issuer.id != owner.id){
+                handler.reply(message("You do not have permission to use this command."), src);
+                return;
+            }
+
+            message message;
+            embed embed;
+            embed.set_color((uint32_t)color).set_title("Command Response");
+
+            if (params.size() < min_parameters){
+                embed.set_description("Missing command arguments.");
+                message.add_embed(embed);
+                handler.reply(message, src);
+                return;
+            }
+
+            uint8_t c = 0;
+            int64_t id = -1;
+            int64_t index = 0;
+            if (full_version){
+                id = Utility::sanitize_integer_input(params, c++);
+                index = Utility::sanitize_optional_integer_input(params, c++).value_or(0);
+            }
+
+            double x = std::get<double>(params[c++].second);
+            double y = std::get<double>(params[c++].second);
+            uint32_t milliseconds = (uint32_t)Utility::sanitize_optional_integer_input(params, c++).value_or(100);
+
+            std::string response = Integration::run_controller_command(
+                id, index,
+                milliseconds,
+                (command_name + ":" + std::to_string(x) + ":" + std::to_string(y)).c_str()
+            );
+            if (!response.empty()){
+                embed.set_description(response);
+                message.add_embed(embed);
+                handler.reply(message, src);
+                return;
+            }
+
+            embed.set_description(
+                "Console ID " + std::to_string(id) + " moved (X: " + std::to_string(x) +
+                ", Y: " + std::to_string(y) + ") for " + std::to_string(milliseconds) + "ms."
+            );
+            message.add_embed(embed);
+            handler.reply(message, src);
+        },
+        "Click a button for the specified console."
+    );
+}
+void Handler::add_command_string(dpp::commandhandler& handler, bool full_version){
+    parameter_registration_t parameters;
+    if (full_version){
+        parameters.insert(parameters.end(), {"id", param_info(pt_integer, false, "Console ID. Find yours by using the \"status\" command.")});
+        parameters.insert(parameters.end(), {"index", param_info(pt_integer, false, "Controller index.")});
+    }
+    parameters.insert(parameters.end(), {
+        {"command", param_info(pt_string, false, "String command.")},
+        {"milliseconds", param_info(pt_integer, true, "How long to hold the command for. (defaults to 24ms)")},
+    });
+    uint8_t min_parameters = get_min_parameters(parameters);
+
+    handler.add_command(
+        full_version ? "stringX" : "string",
+        parameters,
+        [=, &handler, this](const std::string& command, const parameter_list_t& params, command_source src){
+            log_dpp("Executing " + command + "...", "Unified Command Handler", ll_info);
+            if (!GlobalSettings::instance().DISCORD->integration.allow_buttons_from_users && src.issuer.id != owner.id){
+                handler.reply(message("You do not have permission to use this command."), src);
+                return;
+            }
+
+            message message;
+            embed embed;
+            embed.set_color((uint32_t)color).set_title("Command Response");
+
+            if (params.size() < min_parameters){
+                embed.set_description("Missing command arguments.");
+                message.add_embed(embed);
+                handler.reply(message, src);
+                return;
+            }
+
+            uint8_t c = 0;
+            int64_t id = -1;
+            int64_t index = 0;
+            if (full_version){
+                id = Utility::sanitize_integer_input(params, c++);
+                index = Utility::sanitize_optional_integer_input(params, c++).value_or(0);
+            }
+
+            std::string str = std::get<std::string>(params[c++].second);
+            uint32_t milliseconds = (uint32_t)Utility::sanitize_optional_integer_input(params, c++).value_or(24);
+
+            std::string response = Integration::run_controller_command(
+                id, index,
+                milliseconds,
+                str.c_str()
+            );
+            if (!response.empty()){
+                embed.set_description(response);
+                message.add_embed(embed);
+                handler.reply(message, src);
+                return;
+            }
+
+            embed.set_description("Console ID " + std::to_string(id) + " sent:" + str);
+            message.add_embed(embed);
+            handler.reply(message, src);
+        },
+        "Run a custom string command. (controller specific)"
+    );
+}
+
+void Handler::create_unified_commands(commandhandler& handler){
+    add_command_ping(handler);
+    add_command_about(handler);
+    add_command_hi(handler);
+    add_command_status(handler);
+    add_command_screenshot(handler, false);
+    add_command_screenshot(handler, true);
+    add_command_start(handler);
+    add_command_stop(handler);
+    add_command_resetcamera(handler);
+    add_command_resetcontroller(handler);
+    add_command_click(handler, false);
+    add_command_click(handler, true);
+    add_command_joystick(handler, false, JoystickSide::NEITHER);
+    add_command_joystick(handler, false, JoystickSide::LEFT);
+    add_command_joystick(handler, false, JoystickSide::RIGHT);
+    add_command_joystick(handler, true, JoystickSide::NEITHER);
+    add_command_joystick(handler, true, JoystickSide::LEFT);
+    add_command_joystick(handler, true, JoystickSide::RIGHT);
+    add_command_string(handler, false);
+    add_command_string(handler, true);
+}
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Integrations/DppIntegration/DppCommandHandler.h b/SerialPrograms/Source/Integrations/DppIntegration/DppCommandHandler.h
index 90c06a1158..b9a8c7560f 100644
--- a/SerialPrograms/Source/Integrations/DppIntegration/DppCommandHandler.h
+++ b/SerialPrograms/Source/Integrations/DppIntegration/DppCommandHandler.h
@@ -1,62 +1,95 @@
-#pragma once
-#ifndef DPP_HANDLER_H
-#define DPP_HANDLER_H
-
-#include <dpp/dpp.h>
-#include <Integrations/DppIntegration/DppUtility.h>
-#include "CommonFramework/Notifications/MessageAttachment.h"
-#include "Common/Cpp/Concurrency/ScheduledTaskRunner.h"
-#include "Integrations/DiscordSettingsOption.h"
-
-namespace PokemonAutomation{
-namespace Integration{
-namespace DppCommandHandler{
-
-
-
-class Handler : DppUtility::Utility{
-public:
-    Handler() {}
-
-private:
-    struct SlashCommand {
-        dpp::slashcommand command;
-        std::function<void(const dpp::slashcommand_t&)> func;
-    };
-
-    AsyncDispatcher m_dispatcher = AsyncDispatcher(nullptr, 1);
-    ScheduledTaskRunner m_queue = ScheduledTaskRunner(m_dispatcher);
-    std::mutex m_count_lock;
-    static dpp::user owner;
-    static Color color;
-
-protected:
-    void initialize(dpp::cluster& bot, dpp::commandhandler& handler);
-    bool check_if_empty(const DiscordSettingsOption& settings);
-    void log_dpp(const std::string& message, const std::string& identity, const dpp::loglevel& ll);
-    void send_message(
-        dpp::cluster& bot,
-        dpp::embed& embed,
-        const std::string& channel,
-        std::chrono::milliseconds delay,
-        const std::string& msg,
-        std::shared_ptr<PendingFileSend> file
-    );
-
-private:
-    void create_unified_commands(dpp::commandhandler& handler);
-    void update_response(
-        const dpp::command_source& src,
-        dpp::embed& embed,
-        const std::string& msg,
-        std::shared_ptr<PendingFileSend> file
-    );
-};
-
-
-
-
-}
-}
-}
-#endif
+/*  DPP Command Handler
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Integrations_DppCommandHandler_H
+#define PokemonAutomation_Integrations_DppCommandHandler_H
+
+#include "Common/Cpp/Concurrency/Mutex.h"
+#include "Common/Cpp/Concurrency/ScheduledTaskRunner.h"
+#include "CommonFramework/Notifications/MessageAttachment.h"
+#include "CommonFramework/GlobalSettingsPanel.h"
+#include "CommonFramework/Tools/GlobalThreadPools.h"
+#include "Integrations/DppIntegration/DppUtility.h"
+#include "Integrations/IntegrationsAPI.h"
+#include "Integrations/DiscordSettingsOption.h"
+
+namespace PokemonAutomation{
+namespace Integration{
+namespace DppCommandHandler{
+
+
+
+class Handler : DppUtility::Utility{
+public:
+    Handler()
+        : m_queue(GlobalThreadPools::unlimited_normal())
+    {}
+    ~Handler(){
+        m_queue.stop();
+    }
+
+    virtual void stop(){
+        m_queue.stop();
+    }
+
+private:
+    struct SlashCommand{
+        dpp::slashcommand command;
+        std::function<void(const dpp::slashcommand_t&)> func;
+    };
+
+    Mutex m_count_lock;
+    static dpp::user owner;
+    static Color color;
+    ScheduledTaskRunner m_queue;
+
+protected:
+    void initialize(dpp::cluster& bot, dpp::commandhandler& handler);
+    bool check_if_empty(const DiscordSettingsOption& settings);
+    void log_dpp(const std::string& message, const std::string& identity, const dpp::loglevel& ll);
+    void send_message(
+        dpp::cluster& bot,
+        dpp::embed& embed,
+        const std::string& channel,
+        std::chrono::milliseconds delay,
+        const std::string& msg,
+        std::shared_ptr<PendingFileSend> file
+    );
+
+private:
+    static uint8_t get_min_parameters(const dpp::parameter_registration_t& params);
+
+    void add_command_hi(dpp::commandhandler& handler);
+    void add_command_ping(dpp::commandhandler& handler);
+    void add_command_about(dpp::commandhandler& handler);
+    void add_command_help(dpp::commandhandler& handler);
+    void add_command_status(dpp::commandhandler& handler);
+    void add_command_screenshot(dpp::commandhandler& handler, bool full_version);
+    void add_command_start(dpp::commandhandler& handler);
+    void add_command_stop(dpp::commandhandler& handler);
+    void add_command_resetcamera(dpp::commandhandler& handler);
+    void add_command_resetcontroller(dpp::commandhandler& handler);
+    void add_command_click(dpp::commandhandler& handler, bool full_version);
+    void add_command_joystick(dpp::commandhandler& handler, bool full_version, JoystickSide side);
+    void add_command_string(dpp::commandhandler& handler, bool full_version);
+
+
+    void create_unified_commands(dpp::commandhandler& handler);
+    void update_response(
+        const dpp::command_source& src,
+        dpp::embed& embed,
+        const std::string& msg,
+        std::shared_ptr<PendingFileSend> file
+    );
+};
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Integrations/DppIntegration/DppUtility.cpp b/SerialPrograms/Source/Integrations/DppIntegration/DppUtility.cpp
index b72599aa2c..6aef6884d4 100644
--- a/SerialPrograms/Source/Integrations/DppIntegration/DppUtility.cpp
+++ b/SerialPrograms/Source/Integrations/DppIntegration/DppUtility.cpp
@@ -1,87 +1,128 @@
-#ifdef PA_DPP
-
-#include <dpp/DPP_SilenceWarnings.h>
-#include <dpp/dpp.h>
-#include <Integrations/DppIntegration/DppUtility.h>
-#include "CommonFramework/GlobalSettingsPanel.h"
-
-using namespace dpp;
-namespace PokemonAutomation{
-namespace Integration{
-namespace DppUtility{
-
-std::map<std::string, std::atomic_int> Utility::user_counts;
-
-Logger& Utility::dpp_logger() {
-    static TaggedLogger logger(global_logger_raw(), "DPP");
-    return logger;
-}
-
-void Utility::log(const std::string& message, const std::string& identity, const loglevel& ll) {
-    std::string log = identity + (std::string)": " + message;
-    Color color;
-    switch (ll) {
-        case ll_debug: color = COLOR_CYAN; break;
-        case ll_error: color = COLOR_RED; break;
-        case ll_critical: color = COLOR_MAGENTA; break;
-        default: color = COLOR_PURPLE; break;
-    };
-
-    dpp_logger().log(log, color);
-}
-
-void Utility::get_user_counts(cluster& bot, const guild_create_t& event) {
-    // Retrieve ID and exit early if we have already pulled members for this guild.
-    auto id = std::to_string(event.created->id);
-    if (!user_counts.empty() && user_counts.count(id)) {
-        log("Users for " + event.created->name + " already initialized.", "get_user_counts()", ll_info);
-        return;
-    }
-
-    uint32_t count = event.created->member_count;
-    user_counts.emplace(id, count);
-    log("User count: " + std::to_string(count) + " (" + event.created->name + ")", "get_user_counts()", ll_info);
-}
-
-uint16_t Utility::get_button(const uint16_t& bt) {
-    if (bt > 13) {
-        uint8_t dpad = 0;
-        switch (bt) {
-            case 14: dpad = 0; break; // DUP
-            case 15: dpad = 4; break; // DDown
-            case 16: dpad = 2; break; // DLeft
-            case 17: dpad = 6; break; // DRight
-            default: dpad = 0; break;
-        };
-        return dpad;
-    }
-    return 1 << bt;
-}
-
-int64_t Utility::get_value_from_input(const commandhandler& handler, const std::string& command_name, const std::string& input, std::string& out) {
-    auto cmd = handler.commands.find(command_name);
-    auto& choices = cmd->second.parameters[1].second.choices;
-    for (auto& choice : choices) {
-        std::string val = std::get<std::string>(choice.first);
-        if (val == input || choice.second == input) {
-            out = choice.second;
-            return std::stoi(val);
-        }
-    }
-    return -1;
-}
-
-int64_t Utility::sanitize_integer_input(const parameter_list_t& params, const uint8_t& index) {
-    int64_t val = std::get<int64_t>(params[index].second);
-    if (val < 0) {
-        return 0;
-    }
-    return val;
-}
-
-
-
-}
-}
-}
-#endif
+/*  DPP Utility
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifdef PA_DPP
+
+#include "Common/Compiler.h"
+#include "Common/Cpp/Logging/GlobalLogger.h"
+#include "Common/Cpp/Logging/TaggedLogger.h"
+#include "Integrations/DppIntegration/DppUtility.h"
+//#include "CommonFramework/GlobalSettingsPanel.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+using namespace dpp;
+namespace PokemonAutomation{
+namespace Integration{
+namespace DppUtility{
+
+std::map<std::string, std::atomic_int> Utility::user_counts;
+
+Logger& Utility::dpp_logger(){
+    static TaggedLogger logger(global_logger_raw(), "DPP");
+    return logger;
+}
+
+void Utility::log(const std::string& message, const std::string& identity, const loglevel& ll){
+    std::string log = identity + (std::string)": " + message;
+    Color color;
+    switch (ll){
+        case ll_debug: color = COLOR_CYAN; break;
+        case ll_error: color = COLOR_RED; break;
+        case ll_critical: color = COLOR_MAGENTA; break;
+        default:
+            //  This one is too spammy.
+            if (log.starts_with("Internal Log: W: <binary frame> size=")){
+                return;
+            }
+            color = COLOR_PURPLE;
+            break;
+    };
+
+    dpp_logger().log(log, color);
+}
+
+void Utility::get_user_counts(cluster& bot, const guild_create_t& event){
+    // Retrieve ID and exit early if we have already pulled members for this guild.
+#if DPP_VERSION_LONG >= 0x00100100 // (dpp version 10.1.0)
+    auto id = std::to_string(event.created.id);
+    if (!user_counts.empty() && user_counts.count(id)){
+        log("Users for " + event.created.name + " already initialized.", "get_user_counts()", ll_info);
+        return;
+    }
+
+    uint32_t count = event.created.member_count;
+    user_counts.emplace(id, count);
+    log("User count: " + std::to_string(count) + " (" + event.created.name + ")", "get_user_counts()", ll_info);
+#else
+    auto id = std::to_string(event.created->id);
+    if (!user_counts.empty() && user_counts.count(id)){
+        log("Users for " + event.created->name + " already initialized.", "get_user_counts()", ll_info);
+        return;
+    }
+
+    uint32_t count = event.created->member_count;
+    user_counts.emplace(id, count);
+    log("User count: " + std::to_string(count) + " (" + event.created->name + ")", "get_user_counts()", ll_info);
+#endif
+}
+
+
+int64_t Utility::get_value_from_input(
+    const commandhandler& handler,
+    const std::string& command_name,
+    uint8_t param_index,
+    const std::string& input,
+    std::string& out
+){
+    auto cmd = handler.commands.find(command_name);
+    auto& choices = cmd->second.parameters[param_index].second.choices;
+    for (auto& choice : choices){
+        std::string val = std::get<std::string>(choice.first);
+        if (val == input || choice.second == input){
+            out = choice.second;
+            return std::stoi(val);
+        }
+    }
+    return -1;
+}
+
+int64_t Utility::sanitize_integer_input(const parameter_list_t& params, const uint8_t& index){
+    int64_t val = std::get<int64_t>(params[index].second);
+    if (val < 0){
+        return 0;
+    }
+    return val;
+}
+
+std::optional<int64_t> Utility::sanitize_optional_integer_input(const dpp::parameter_list_t& params, const uint8_t& index){
+    if (index >= params.size()){
+        return std::nullopt;
+    }
+
+    const auto& value_variant = params[index].second;
+
+    // Check if the parameter was omitted
+    if (std::holds_alternative<std::monostate>(value_variant)){
+        return std::nullopt;
+    }
+
+    // Extract and sanitize the integer
+    int64_t val = std::get<int64_t>(value_variant);
+    if (val < 0){
+        return 0;
+    }
+    return val;
+}
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Integrations/DppIntegration/DppUtility.h b/SerialPrograms/Source/Integrations/DppIntegration/DppUtility.h
index ce7da1496f..3210bfbffb 100644
--- a/SerialPrograms/Source/Integrations/DppIntegration/DppUtility.h
+++ b/SerialPrograms/Source/Integrations/DppIntegration/DppUtility.h
@@ -1,36 +1,56 @@
-#pragma once
-#ifndef DPP_UTILITY_H
-#define DPP_UTILITY_H
-
-#include <dpp/dpp.h>
-#include "Common/Cpp/AbstractLogger.h"
-
-namespace PokemonAutomation{
-namespace Integration{
-namespace DppUtility{
-
-
-class Utility{
-public:
-    Utility(){}
-
-protected:
-    static std::map<std::string, std::atomic_int> user_counts;
-
-protected:
-    void log(const std::string& message, const std::string& identity, const dpp::loglevel& ll);
-    void get_user_counts(dpp::cluster& bot, const dpp::guild_create_t& event);
-    int64_t get_value_from_input(const dpp::commandhandler& handler, const std::string& cmd, const std::string& input, std::string& out);
-    int64_t sanitize_integer_input(const dpp::parameter_list_t& params, const uint8_t& index);
-    uint16_t get_button(const uint16_t& bt);
-
-private:
-    Logger& dpp_logger();
-};
-
-
-
-}
-}
-}
-#endif
+/*  DPP Utility
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Integrations_DppUtility_H
+#define PokemonAutomation_Integrations_DppUtility_H
+
+#if defined(__clang__)
+    #pragma clang diagnostic push
+    #pragma clang diagnostic ignored "-Wunused-parameter"
+#endif
+#include <dpp/dpp.h>
+#if defined(__clang__)
+    #pragma clang diagnostic pop
+#endif
+
+#include <atomic>
+#include "Common/Cpp/Logging/AbstractLogger.h"
+
+namespace PokemonAutomation{
+namespace Integration{
+namespace DppUtility{
+
+
+class Utility{
+public:
+    Utility(){}
+
+protected:
+    static std::map<std::string, std::atomic_int> user_counts;
+
+protected:
+    void log(const std::string& message, const std::string& identity, const dpp::loglevel& ll);
+    void get_user_counts(dpp::cluster& bot, const dpp::guild_create_t& event);
+    int64_t get_value_from_input(
+        const dpp::commandhandler& handler,
+        const std::string& cmd,
+        uint8_t param_index,
+        const std::string& input,
+        std::string& out
+    );
+    int64_t sanitize_integer_input(const dpp::parameter_list_t& params, const uint8_t& index);
+    std::optional<int64_t> sanitize_optional_integer_input(const dpp::parameter_list_t& params, const uint8_t& index);
+
+private:
+    Logger& dpp_logger();
+};
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Integrations/IntegrationsAPI.cpp b/SerialPrograms/Source/Integrations/IntegrationsAPI.cpp
index 6f86a998ef..d11b807d74 100644
--- a/SerialPrograms/Source/Integrations/IntegrationsAPI.cpp
+++ b/SerialPrograms/Source/Integrations/IntegrationsAPI.cpp
@@ -1,10 +1,10 @@
 /*  Integrations API
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include "Common/Compiler.h"
+#include <memory>
 #include "Common/Cpp/PrettyPrint.h"
 #include "CommonFramework/ImageTypes/ImageRGB32.h"
 #include "Integrations/ProgramTracker.h"
@@ -47,7 +47,9 @@ void pai_status(DllSafeString& description){
         case ProgramState::RUNNING:
             str += "Running";
             str += " (";
-            str += duration_to_string(std::chrono::duration_cast<std::chrono::milliseconds>(now - item.second.start_time));
+            str += duration_to_string(
+                std::chrono::duration_cast<std::chrono::milliseconds>(now - item.second.last_state_change)
+            );
             str += ")";
             break;
         case ProgramState::STOPPING:
@@ -94,8 +96,8 @@ void pai_screenshot(DllSafeString& error, uint64_t console_id, const char* path)
 void pai_reset_camera(DllSafeString& error, uint64_t console_id){
     error = ProgramTracker::instance().reset_camera(console_id);
 }
-void pai_reset_serial(DllSafeString& error, uint64_t console_id){
-    error = ProgramTracker::instance().reset_serial(console_id);
+void pai_reset_controller(DllSafeString& error, uint64_t console_id, uint64_t controller_index){
+    error = ProgramTracker::instance().reset_controller(console_id, controller_index);
 }
 
 void pai_start_program(DllSafeString& error, uint64_t program_id){
@@ -105,17 +107,16 @@ void pai_stop_program(DllSafeString& error, uint64_t program_id){
     error = ProgramTracker::instance().stop_program(program_id);
 }
 
-void pai_nsw_press_button(DllSafeString& error, uint64_t console_id, uint16_t button, uint16_t ticks){
-    error = ProgramTracker::instance().nsw_press_button(console_id, button, ticks);
-}
-void pai_nsw_press_dpad(DllSafeString& error, uint64_t console_id, uint8_t position, uint16_t ticks){
-    error = ProgramTracker::instance().nsw_press_dpad(console_id, position, ticks);
-}
-void pai_nsw_press_left_joystick(DllSafeString& error, uint64_t console_id, uint8_t x, uint8_t y, uint16_t ticks){
-    error = ProgramTracker::instance().nsw_press_left_joystick(console_id, x, y, ticks);
-}
-void pai_nsw_press_right_joystick(DllSafeString& error, uint64_t console_id, uint8_t x, uint8_t y, uint16_t ticks){
-    error = ProgramTracker::instance().nsw_press_right_joystick(console_id, x, y, ticks);
+void pai_run_controller_command(
+    DllSafeString& error,
+    uint64_t console_id, uint64_t controller_index,
+    uint32_t milliseconds,
+    const char* command
+){
+    error = ProgramTracker::instance().run_controller_command(
+        console_id, controller_index,
+        Milliseconds(milliseconds), command
+    );
 }
 
 
diff --git a/SerialPrograms/Source/Integrations/IntegrationsAPI.h b/SerialPrograms/Source/Integrations/IntegrationsAPI.h
index 2d3be6eb71..1590318721 100644
--- a/SerialPrograms/Source/Integrations/IntegrationsAPI.h
+++ b/SerialPrograms/Source/Integrations/IntegrationsAPI.h
@@ -1,6 +1,6 @@
 /*  Integrations API
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -14,6 +14,11 @@ namespace PokemonAutomation{
 namespace Integration{
 extern "C" {
 
+enum JoystickSide{
+    NEITHER,
+    LEFT,
+    RIGHT,
+};
 
 //  Empty error means no error.
 
@@ -23,15 +28,17 @@ void pai_status                     (DllSafeString& description);
 void pai_screenshot                 (DllSafeString& error, uint64_t console_id, const char* path);
 
 void pai_reset_camera               (DllSafeString& error, uint64_t console_id);
-void pai_reset_serial               (DllSafeString& error, uint64_t console_id);
+void pai_reset_controller           (DllSafeString& error, uint64_t console_id, uint64_t controller_index);
 
 void pai_start_program              (DllSafeString& error, uint64_t program_id);
 void pai_stop_program               (DllSafeString& error, uint64_t program_id);
 
-void pai_nsw_press_button           (DllSafeString& error, uint64_t console_id, uint16_t button, uint16_t ticks);
-void pai_nsw_press_dpad             (DllSafeString& error, uint64_t console_id, uint8_t position, uint16_t ticks);
-void pai_nsw_press_left_joystick    (DllSafeString& error, uint64_t console_id, uint8_t x, uint8_t y, uint16_t ticks);
-void pai_nsw_press_right_joystick   (DllSafeString& error, uint64_t console_id, uint8_t x, uint8_t y, uint16_t ticks);
+void pai_run_controller_command(
+    DllSafeString& error,
+    uint64_t console_id, uint64_t controller_index,
+    uint32_t milliseconds,
+    const char* command
+);
 
 
 }
@@ -53,9 +60,9 @@ inline std::string reset_camera(uint64_t console_id){
     pai_reset_camera(error, console_id);
     return error;
 }
-inline std::string reset_serial(uint64_t console_id){
+inline std::string reset_controller(uint64_t console_id, uint64_t controller_index){
     DllSafeString error;
-    pai_reset_serial(error, console_id);
+    pai_reset_controller(error, console_id, controller_index);
     return error;
 }
 inline std::string start_program(uint64_t program_id){
@@ -68,24 +75,13 @@ inline std::string stop_program(uint64_t program_id){
     pai_stop_program(error, program_id);
     return error;
 }
-inline std::string press_button(uint64_t console_id, uint16_t button, uint16_t ticks){
+inline std::string run_controller_command(
+    uint64_t console_id, uint64_t controller_index,
+    uint32_t milliseconds,
+    const char* command
+){
     DllSafeString error;
-    pai_nsw_press_button(error, console_id, button, ticks);
-    return error;
-}
-inline std::string press_dpad(uint64_t console_id, uint8_t position, uint16_t ticks){
-    DllSafeString error;
-    pai_nsw_press_dpad(error, console_id, position, ticks);
-    return error;
-}
-inline std::string press_left_joystick(uint64_t console_id, uint8_t x, uint8_t y, uint16_t ticks){
-    DllSafeString error;
-    pai_nsw_press_left_joystick(error, console_id, x, y, ticks);
-    return error;
-}
-inline std::string press_right_joystick(uint64_t console_id, uint8_t x, uint8_t y, uint16_t ticks){
-    DllSafeString error;
-    pai_nsw_press_right_joystick(error, console_id, x, y, ticks);
+    pai_run_controller_command(error, console_id, controller_index, milliseconds, command);
     return error;
 }
 
diff --git a/SerialPrograms/Source/Integrations/ProgramTracker.cpp b/SerialPrograms/Source/Integrations/ProgramTracker.cpp
index 8e9def9adc..ca3c242416 100644
--- a/SerialPrograms/Source/Integrations/ProgramTracker.cpp
+++ b/SerialPrograms/Source/Integrations/ProgramTracker.cpp
@@ -1,23 +1,23 @@
 /*  Panel Tracker
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include "CommonFramework/Logging/Logger.h"
 #include "CommonFramework/ImageTypes/ImageRGB32.h"
 #include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "CommonFramework/AudioPipeline/AudioFeed.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Messages_PushButtons.h"
+#include "Controllers/ControllerSession.h"
 #include "ProgramTracker.h"
 
-#include <iostream>
-using std::cout;
-using std::endl;
+//#include <iostream>
+//using std::cout;
+//using std::endl;
 
 namespace PokemonAutomation{
 
+using namespace std::chrono_literals;
+
 
 ProgramTracker& ProgramTracker::instance(){
     static ProgramTracker obj;
@@ -39,13 +39,13 @@ struct ProgramTracker::ProgramData{
 
 
 std::map<uint64_t, ProgramTrackingState> ProgramTracker::all_programs(){
-    std::lock_guard<std::mutex> lg(m_lock);
+    std::lock_guard<Mutex> lg(m_lock);
     std::map<uint64_t, ProgramTrackingState> info;
     for (const auto& item : m_programs){
         info[item.first] = ProgramTrackingState{
             item.second->program.identifier(),
             item.second->console_ids,
-            item.second->program.timestamp(),
+            item.second->program.last_state_change(),
             item.second->program.current_state(),
             item.second->program.current_stats()
         };
@@ -53,141 +53,172 @@ std::map<uint64_t, ProgramTrackingState> ProgramTracker::all_programs(){
     return info;
 }
 
-std::string ProgramTracker::grab_screenshot(uint64_t console_id, std::shared_ptr<const ImageRGB32>& image){
-    std::lock_guard<std::mutex> lg(m_lock);
-    auto iter = m_consoles.find(console_id);
+std::string ProgramTracker::make_header(const std::string& function_name, uint64_t id){
+    if (id == (uint64_t)-1){
+        return function_name + "()";
+    }
+    return function_name + "(ID = " + std::to_string(id) + ")";
+}
+TrackableProgram* ProgramTracker::get_program(
+    std::string& error,
+    const std::string& header,
+    uint64_t program_id
+){
+    auto iter = m_programs.end();
+    if (m_programs.empty()){
+        error = header + ": No programs found.";
+        global_logger_tagged().log("ProgramTracker::" + error, COLOR_RED);
+        return nullptr;
+    }else if (program_id != (uint64_t)-1){
+        iter = m_programs.find(program_id);
+    }else if (m_programs.size() == 1){
+        iter = m_programs.begin();
+    }else{
+        error = header + ": Multiple programs found. Please specify an ID.";
+        global_logger_tagged().log("ProgramTracker::" + error, COLOR_RED);
+        return nullptr;
+    }
+    if (iter == m_programs.end()){
+        error = header + ": ID not found.";
+        global_logger_tagged().log("ProgramTracker::" + error, COLOR_RED);
+        return nullptr;
+    }
+
+    return &iter->second->program;
+}
+TrackableConsole* ProgramTracker::get_console(
+    std::string& error,
+    const std::string& header,
+    uint64_t console_id
+){
+    auto iter = m_consoles.end();
+    if (m_consoles.empty()){
+        error = header + ": No consoles found.";
+        global_logger_tagged().log("ProgramTracker::" + error, COLOR_RED);
+        return nullptr;
+    }else if (console_id != (uint64_t)-1){
+        iter = m_consoles.find(console_id);
+    }else if (m_consoles.size() == 1){
+        iter = m_consoles.begin();
+    }else{
+        error = header + ": Multiple consoles found. Please specify an ID.";
+        global_logger_tagged().log("ProgramTracker::" + error, COLOR_RED);
+        return nullptr;
+    }
     if (iter == m_consoles.end()){
-        std::string error = "grab_screenshot(" + std::to_string(console_id) + ") - ID not found.";
-        global_logger_tagged().log("SwitchProgramTracker::" + error, COLOR_RED);
+        error = header + ": ID not found.";
+        global_logger_tagged().log("ProgramTracker::" + error, COLOR_RED);
+        return nullptr;
+    }
+
+    return iter->second.first;
+}
+ControllerSession* ProgramTracker::get_controller(
+    std::string& error,
+    const std::string& header,
+    uint64_t console_id,
+    uint64_t controller_index
+){
+    TrackableConsole* console = get_console(error, header, console_id);
+    if (console == nullptr){
+        return nullptr;
+    }
+    if (controller_index >= console->controllers()){
+        error = "reset_serial(" + std::to_string(console_id) + ") - Index out of bounds.";
+        global_logger_tagged().log("ProgramTracker::" + error, COLOR_RED);
+        return nullptr;
+    }
+    return &console->controller(controller_index);
+}
+
+std::string ProgramTracker::grab_screenshot(uint64_t console_id, std::shared_ptr<const ImageRGB32>& image){
+    std::string header = make_header("grab_screenshot", console_id);
+    std::lock_guard<Mutex> lg(m_lock);
+    std::string error;
+    TrackableConsole* console = get_console(error, header, console_id);
+    if (console == nullptr){
         return error;
     }
-    VideoSnapshot snapshot = iter->second.first->video().snapshot();
+    VideoSnapshot snapshot = console->video_feed().snapshot();
     image = std::move(snapshot.frame);
     return "";
 }
 std::string ProgramTracker::reset_camera(uint64_t console_id){
-    std::lock_guard<std::mutex> lg(m_lock);
-    auto iter = m_consoles.find(console_id);
-    if (iter == m_consoles.end()){
-        std::string error = "reset_camera(" + std::to_string(console_id) + ") - ID not found.";
-        global_logger_tagged().log("SwitchProgramTracker::" + error, COLOR_RED);
+    std::string header = make_header("reset_camera", console_id);
+    std::lock_guard<Mutex> lg(m_lock);
+    std::string error;
+    TrackableConsole* console = get_console(error, header, console_id);
+    if (console == nullptr){
         return error;
     }
-    iter->second.first->video().reset();
+    console->video_feed().reset();
     return "";
 }
-std::string ProgramTracker::reset_serial(uint64_t console_id){
-    std::lock_guard<std::mutex> lg(m_lock);
-    auto iter = m_consoles.find(console_id);
-    if (iter == m_consoles.end()){
-        std::string error = "reset_serial(" + std::to_string(console_id) + ") - ID not found.";
-        global_logger_tagged().log("SwitchProgramTracker::" + error, COLOR_RED);
+std::string ProgramTracker::reset_controller(uint64_t console_id, uint64_t controller_index){
+    std::string header = make_header("reset_controller", console_id);
+    std::lock_guard<Mutex> lg(m_lock);
+    std::string error;
+    ControllerSession* controller = get_controller(error, header, console_id, controller_index);
+    if (controller == nullptr){
         return error;
     }
-    const char* msg = iter->second.first->sender().try_reset();
-    return msg == nullptr ? "Serial connection was reset." : msg;
+    error = controller->reset(false);
+    return error.empty() ? "Controller was reset." : error;
 }
 std::string ProgramTracker::start_program(uint64_t program_id){
-    std::lock_guard<std::mutex> lg(m_lock);
-    auto iter = m_programs.find(program_id);
-    if (iter == m_programs.end()){
-        std::string error = "start_program(ID = " + std::to_string(program_id) + ") - ID not found.";
-        global_logger_tagged().log("SwitchProgramTracker::" + error, COLOR_RED);
+    std::string header = make_header("start_program", program_id);
+    std::lock_guard<Mutex> lg(m_lock);
+    std::string error;
+    TrackableProgram* program = get_program(error, header, program_id);
+    if (program == nullptr){
         return error;
     }
-    emit iter->second->program.async_start();
+    program->async_start();
     return "";
 }
 std::string ProgramTracker::stop_program(uint64_t program_id){
-    std::lock_guard<std::mutex> lg(m_lock);
-    auto iter = m_programs.find(program_id);
-    if (iter == m_programs.end()){
-        std::string error = "stop_program(ID = " + std::to_string(program_id) + ") - ID not found.";
-        global_logger_tagged().log("SwitchProgramTracker::" + error, COLOR_RED);
+    std::string header = make_header("stop_program", program_id);
+    std::lock_guard<Mutex> lg(m_lock);
+    std::string error;
+    TrackableProgram* program = get_program(error, header, program_id);
+    if (program == nullptr){
         return error;
     }
-    emit iter->second->program.async_stop();
+    program->async_stop();
     return "";
 }
-std::string ProgramTracker::nsw_press_button(uint64_t console_id, Button button, uint16_t ticks){
-    std::string header = "press_button(ID = " + std::to_string(console_id) + ")";
-    std::lock_guard<std::mutex> lg(m_lock);
-    auto iter = m_consoles.find(console_id);
-    if (iter == m_consoles.end()){
-        std::string error = header + ": ID not found.";
-        global_logger_tagged().log("SwitchProgramTracker::" + error, COLOR_RED);
+std::string ProgramTracker::run_controller_command(
+    uint64_t console_id, uint64_t controller_index,
+    Milliseconds duration,
+    const char* command
+){
+    std::string header = make_header("controller_command", console_id);
+
+    std::lock_guard<Mutex> lg(m_lock);
+
+    std::string error;
+    ControllerSession* controller = get_controller(error, header, console_id, controller_index);
+    if (controller == nullptr){
         return error;
     }
-    const char* err = iter->second.first->sender().try_send_request(
-        NintendoSwitch::DeviceRequest_pbf_press_button(button, ticks, 0)
-    );
-    if (err){
-        global_logger_tagged().log("SwitchProgramTracker::" + header + ": " + err, COLOR_RED);
-        return err;
-    }else{
-        global_logger_tagged().log("SwitchProgramTracker::" + header, COLOR_BLUE);
-        return "";
-    }
-}
-std::string ProgramTracker::nsw_press_dpad(uint64_t console_id, DpadPosition position, uint16_t ticks){
-    std::string header = "press_dpad(ID = " + std::to_string(console_id) + ")";
-    std::lock_guard<std::mutex> lg(m_lock);
-    auto iter = m_consoles.find(console_id);
-    if (iter == m_consoles.end()){
-        std::string error = header + ": ID not found.";
-        global_logger_tagged().log("SwitchProgramTracker::" + error, COLOR_RED);
-        return error;
+
+    try{
+        error = controller->try_run<AbstractController>(
+            [=](AbstractController& controller){
+                controller.run_string_command(duration, command);
+            }
+        );
+    }catch (Exception& e){
+        e.log(global_logger_tagged());
+        error = e.to_str();
     }
-    const char* err = iter->second.first->sender().try_send_request(
-        NintendoSwitch::DeviceRequest_pbf_press_dpad(position, ticks, 0)
-    );
-    if (err){
-        global_logger_tagged().log("SwitchProgramTracker::" + header + ": " + err, COLOR_RED);
-        return err;
-    }else{
-        global_logger_tagged().log("SwitchProgramTracker::" + header, COLOR_BLUE);
+    if (error.empty()){
+        global_logger_tagged().log("ProgramTracker::" + header, COLOR_BLUE);
         return "";
-    }
-}
-std::string ProgramTracker::nsw_press_left_joystick(uint64_t console_id, uint8_t x, uint8_t y, uint16_t ticks){
-    std::string header = "press_left_joystick(ID = " + std::to_string(console_id) + ")";
-    std::lock_guard<std::mutex> lg(m_lock);
-    auto iter = m_consoles.find(console_id);
-    if (iter == m_consoles.end()){
-        std::string error = header + ": ID not found.";
-        global_logger_tagged().log("SwitchProgramTracker::" + error, COLOR_RED);
-        return error;
-    }
-    const char* err = iter->second.first->sender().try_send_request(
-        NintendoSwitch::DeviceRequest_pbf_move_left_joystick(x, y, ticks, 0)
-    );
-    if (err){
-        global_logger_tagged().log("SwitchProgramTracker::" + header + ": " + err, COLOR_RED);
-        return err;
     }else{
-        global_logger_tagged().log("SwitchProgramTracker::" + header, COLOR_BLUE);
-        return "";
-    }
-}
-std::string ProgramTracker::nsw_press_right_joystick(uint64_t console_id, uint8_t x, uint8_t y, uint16_t ticks){
-    std::string header = "press_right_joystick(ID = " + std::to_string(console_id) + ")";
-    std::lock_guard<std::mutex> lg(m_lock);
-    auto iter = m_consoles.find(console_id);
-    if (iter == m_consoles.end()){
-        std::string error = header + ": ID not found.";
-        global_logger_tagged().log("SwitchProgramTracker::" + error, COLOR_RED);
+        global_logger_tagged().log("ProgramTracker::" + header + ": " + error, COLOR_RED);
         return error;
     }
-    const char* err = iter->second.first->sender().try_send_request(
-        NintendoSwitch::DeviceRequest_pbf_move_right_joystick(x, y, ticks, 0)
-    );
-    if (err){
-        global_logger_tagged().log("SwitchProgramTracker::" + header + ": " + err, COLOR_RED);
-        return err;
-    }else{
-        global_logger_tagged().log("SwitchProgramTracker::" + header, COLOR_BLUE);
-        return "";
-    }
 }
 
 
@@ -195,7 +226,7 @@ std::string ProgramTracker::nsw_press_right_joystick(uint64_t console_id, uint8_
 
 
 uint64_t ProgramTracker::add_program(TrackableProgram& program){
-    std::lock_guard<std::mutex> lg(m_lock);
+    std::lock_guard<Mutex> lg(m_lock);
     m_program_instance_counter++;
     m_programs.emplace(
         m_program_instance_counter,
@@ -204,11 +235,11 @@ uint64_t ProgramTracker::add_program(TrackableProgram& program){
     return m_program_instance_counter;
 }
 void ProgramTracker::remove_program(uint64_t program_id){
-    std::lock_guard<std::mutex> lg(m_lock);
+    std::lock_guard<Mutex> lg(m_lock);
     m_programs.erase(program_id);
 }
 uint64_t ProgramTracker::add_console(uint64_t program_id, TrackableConsole& console){
-    std::lock_guard<std::mutex> lg(m_lock);
+    std::lock_guard<Mutex> lg(m_lock);
     m_console_instance_counter++;
     m_consoles.emplace(
         std::piecewise_construct,
@@ -222,7 +253,7 @@ uint64_t ProgramTracker::add_console(uint64_t program_id, TrackableConsole& cons
     return m_console_instance_counter;
 }
 void ProgramTracker::remove_console(uint64_t console_id){
-    std::lock_guard<std::mutex> lg(m_lock);
+    std::lock_guard<Mutex> lg(m_lock);
     auto iter0 = m_consoles.find(console_id);
     if (iter0 == m_consoles.end()){
         return;
@@ -241,6 +272,17 @@ void ProgramTracker::remove_console(uint64_t console_id){
         }
     }
 }
+std::optional<uint64_t> ProgramTracker::add_console(std::optional<uint64_t> program_id, TrackableConsole& console){
+    if (!program_id.has_value()){
+        return std::nullopt;
+    }
+    return add_console(program_id.value(), console);
+}
+void ProgramTracker::remove_console(std::optional<uint64_t> console_id){
+    if (console_id.has_value()){
+        remove_console(console_id.value());
+    }
+}
 
 
 
diff --git a/SerialPrograms/Source/Integrations/ProgramTracker.h b/SerialPrograms/Source/Integrations/ProgramTracker.h
index 737759a729..de99c5151a 100644
--- a/SerialPrograms/Source/Integrations/ProgramTracker.h
+++ b/SerialPrograms/Source/Integrations/ProgramTracker.h
@@ -1,6 +1,6 @@
 /*  Program Tracker
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  *      A singleton class that keeps track of all live programs and handles.
  *  This allows Discord integration to safely interface with programs.
@@ -12,10 +12,12 @@
 
 #include <vector>
 #include <map>
-#include <mutex>
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
+#include <memory>
+#include "Common/Cpp/Concurrency/Mutex.h"
 #include "CommonFramework/Globals.h"
-#include "CommonFramework/Tools/BotBaseHandle.h"
+#include "Controllers/Joystick.h"
+#include "NintendoSwitch/Controllers/NintendoSwitch_ControllerButtons.h"
+#include "IntegrationsAPI.h"
 #include "ProgramTrackerInterfaces.h"
 
 namespace PokemonAutomation{
@@ -29,7 +31,7 @@ class AudioFeed;
 struct ProgramTrackingState{
     std::string program_name;
     std::vector<uint64_t> console_ids;
-    WallClock start_time;
+    WallClock last_state_change;
     ProgramState state;
     std::string stats;
 };
@@ -44,18 +46,34 @@ class ProgramTracker{
 
     std::string grab_screenshot     (uint64_t console_id, std::shared_ptr<const ImageRGB32>& image);
     std::string reset_camera        (uint64_t console_id);
-    std::string reset_serial        (uint64_t console_id);
+    std::string reset_controller    (uint64_t console_id, uint64_t controller_index);
 //    void change_program (uint64_t program_id, std::string program_identifier);
     std::string start_program       (uint64_t program_id);
     std::string stop_program        (uint64_t program_id);
 
 
 public:
-    //  Nintendo Switch
-    std::string nsw_press_button        (uint64_t console_id, Button button, uint16_t ticks);
-    std::string nsw_press_dpad          (uint64_t console_id, DpadPosition position, uint16_t ticks);
-    std::string nsw_press_left_joystick (uint64_t console_id, uint8_t x, uint8_t y, uint16_t ticks);
-    std::string nsw_press_right_joystick(uint64_t console_id, uint8_t x, uint8_t y, uint16_t ticks);
+    std::string run_controller_command(
+        uint64_t console_id, uint64_t controller_index,
+        Milliseconds duration,
+        const char* command
+    );
+    std::string nsw_press_button(
+        uint64_t console_id, uint64_t controller_index,
+        Milliseconds duration,
+        NintendoSwitch::Button button
+    );
+    std::string nsw_press_dpad(
+        uint64_t console_id, uint64_t controller_index,
+        Milliseconds duration,
+        NintendoSwitch::DpadPosition position
+    );
+    std::string nsw_press_joystick(
+        uint64_t console_id, uint64_t controller_index,
+        Milliseconds duration,
+        Integration::JoystickSide side,
+        JoystickPosition position
+    );
 
 
 private:
@@ -63,18 +81,41 @@ class ProgramTracker{
     ProgramTracker(const ProgramTracker&) = delete;
     void operator=(const ProgramTracker&) = delete;
 
+
 public:
     uint64_t add_program(TrackableProgram& program);
     void remove_program(uint64_t program_id);
 
     uint64_t add_console(uint64_t program_id, TrackableConsole& console);
     void remove_console(uint64_t console_id);
+    std::optional<uint64_t> add_console(std::optional<uint64_t> program_id, TrackableConsole& console);
+    void remove_console(std::optional<uint64_t> console_id);
+
+
+private:
+    static std::string make_header(const std::string& function_name, uint64_t id);
+    TrackableProgram* get_program(
+        std::string& error,
+        const std::string& header,
+        uint64_t program_id
+    );
+    TrackableConsole* get_console(
+        std::string& error,
+        const std::string& header,
+        uint64_t console_id
+    );
+    ControllerSession* get_controller(
+        std::string& error,
+        const std::string& header,
+        uint64_t console_id,
+        uint64_t controller_index
+    );
 
 
 private:
     struct ProgramData;
 
-    std::mutex m_lock;
+    Mutex m_lock;
     uint64_t m_program_instance_counter = 0;
     uint64_t m_console_instance_counter = 0;
     std::map<uint64_t, std::unique_ptr<ProgramData>> m_programs;
diff --git a/SerialPrograms/Source/Integrations/ProgramTrackerInterfaces.h b/SerialPrograms/Source/Integrations/ProgramTrackerInterfaces.h
index 373bf878aa..9d4f4c3125 100644
--- a/SerialPrograms/Source/Integrations/ProgramTrackerInterfaces.h
+++ b/SerialPrograms/Source/Integrations/ProgramTrackerInterfaces.h
@@ -1,6 +1,6 @@
 /*  Program Tracker
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  *      A singleton class that keeps track of all live programs and handles.
  *  This allows Discord integration to safely interface with programs.
@@ -15,22 +15,24 @@
 
 namespace PokemonAutomation{
 
-class BotBaseHandle;
 class VideoFeed;
 class AudioFeed;
+class ControllerSession;
+class BotBaseHandle;
 
 
 class TrackableConsole{
 public:
-    virtual BotBaseHandle& sender() = 0;
-    virtual VideoFeed& video() = 0;
-    virtual AudioFeed& audio() = 0;
+    virtual VideoFeed& video_feed() noexcept = 0;
+    virtual AudioFeed& audio_feed() noexcept = 0;
+    virtual size_t controllers() const noexcept = 0;
+    virtual ControllerSession& controller(size_t index) noexcept = 0;
 };
 
 class TrackableProgram{
 public:
     virtual const std::string& identifier() const = 0;
-    virtual WallClock timestamp() const = 0;
+    virtual WallClock last_state_change() const = 0;
     virtual ProgramState current_state() const = 0;
     virtual std::string current_stats() const = 0;
 
diff --git a/SerialPrograms/Source/Integrations/PybindSwitchController.cpp b/SerialPrograms/Source/Integrations/PybindSwitchController.cpp
new file mode 100644
index 0000000000..2e2ccf5b2b
--- /dev/null
+++ b/SerialPrograms/Source/Integrations/PybindSwitchController.cpp
@@ -0,0 +1,230 @@
+/*  Pybind Switch Controller
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Exceptions.h"
+#include "Common/Cpp/Concurrency/Mutex.h"
+#include "Common/Cpp/Concurrency/ConditionVariable.h"
+#include "Common/Cpp/Logging/GlobalLogger.h"
+#include "Common/Cpp/Logging/TaggedLogger.h"
+#include "Controllers/ControllerConnection.h"
+#include "Controllers/PABotBase2/SerialPABotBase2_Descriptor.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+#include "PybindSwitchController.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+
+
+class PybindSwitchProControllerInternal final : public ControllerConnection::StatusListener{
+public:
+    PybindSwitchProControllerInternal(const std::string& name)
+        : m_logger(global_logger_raw(), "Pybind")
+        , m_descriptor(name)
+        , m_connection(m_descriptor.open_connection(m_logger))
+    {
+        m_connection->add_status_listener(*this);
+    }
+    ~PybindSwitchProControllerInternal(){
+        m_connection->remove_status_listener(*this);
+    }
+
+    bool wait_for_ready(uint64_t timeout_millis){
+        std::unique_lock<Mutex> lg(m_lock);
+        m_cv.wait_for(lg, Milliseconds(timeout_millis), [this]{
+            return m_connected;
+        });
+        return controller_if_ready() != nullptr;
+    }
+
+    virtual void post_connection_ready(ControllerConnection& connection) override{
+//        cout << "post_connection_ready()" << endl;
+
+        m_controller = m_descriptor.make_controller(
+            m_logger,
+            connection,
+            connection.current_controller()
+        );
+        ProController* procon = dynamic_cast<ProController*>(m_controller.get());
+        if (procon == nullptr){
+//            cout << "post_connection_ready() - incompatible" << endl;
+            m_connection->set_status_line1(
+                "Incompatible controller type. Use the main program to set the device "
+                "to a Pro Controller or a wired controller.",
+                COLOR_RED
+            );
+        }else{
+//            cout << "post_connection_ready() - good" << endl;
+            m_procon.store(procon, std::memory_order_release);
+        }
+
+        {
+            std::unique_lock<Mutex> lg(m_lock);
+            m_connected = true;
+        }
+        m_cv.notify_all();
+    }
+
+    ProController* controller_if_ready(){
+        ProController* procon = m_procon.load(std::memory_order_acquire);
+        if (procon == nullptr || !procon->is_ready()){
+            return nullptr;
+        }
+        return procon;
+    }
+
+    // Return the current controller, or throw InvalidConnectionStateException if
+    // there is none.
+    ProController& controller(){
+        ProController* procon = controller_if_ready();
+        if (procon == nullptr){
+            throw InvalidConnectionStateException(
+                "Controller is not ready: " + m_connection->status_text()
+            );
+        }
+        return *procon;
+    }
+
+
+public:
+    TaggedLogger m_logger;
+    SerialPABotBase::SerialPABotBase2_Descriptor m_descriptor;
+    std::unique_ptr<ControllerConnection> m_connection;
+    std::unique_ptr<AbstractController> m_controller;
+    std::atomic<ProController*> m_procon;
+
+    bool m_connected = false;
+    Mutex m_lock;
+    ConditionVariable m_cv;
+};
+
+
+
+
+PybindSwitchProController::PybindSwitchProController(const std::string& port_name){
+    PybindSwitchProControllerInternal* internal = new PybindSwitchProControllerInternal(port_name);
+    m_internals = internal;
+}
+PybindSwitchProController::~PybindSwitchProController(){
+    delete (PybindSwitchProControllerInternal*)m_internals;
+}
+
+bool PybindSwitchProController::wait_for_ready(uint64_t timeout_millis){
+    PybindSwitchProControllerInternal* internal = (PybindSwitchProControllerInternal*)m_internals;
+    return internal->wait_for_ready(timeout_millis);
+}
+
+bool PybindSwitchProController::is_ready() const{
+    PybindSwitchProControllerInternal* internal = (PybindSwitchProControllerInternal*)m_internals;
+    return internal->controller_if_ready() != nullptr;
+}
+std::string PybindSwitchProController::current_status() const{
+    PybindSwitchProControllerInternal* internal = (PybindSwitchProControllerInternal*)m_internals;
+    return internal->m_connection->raw_status_text();
+}
+std::string PybindSwitchProController::controller_name() const{
+    PybindSwitchProControllerInternal* internal = (PybindSwitchProControllerInternal*)m_internals;
+    ProController* controller = internal->controller_if_ready();
+    return controller == nullptr ? "" : controller->name();
+}
+
+
+void PybindSwitchProController::wait_for_all_requests(){
+    PybindSwitchProControllerInternal* internal = (PybindSwitchProControllerInternal*)m_internals;
+    ProController* controller = internal->controller_if_ready();
+    if (controller == nullptr){
+        internal->m_logger.log("Controller is not ready.", COLOR_RED);
+        return;
+    }
+    controller->wait_for_all(nullptr);
+}
+bool PybindSwitchProController::cancel_all_and_wait(uint64_t timeout_millis){
+    PybindSwitchProControllerInternal* internal = (PybindSwitchProControllerInternal*)m_internals;
+    ProController* controller = internal->controller_if_ready();
+    if (controller == nullptr){
+        internal->m_logger.log("Controller is not ready.", COLOR_RED);
+        return false;
+    }
+    return controller->cancel_all_and_wait(Milliseconds(timeout_millis));
+}
+void PybindSwitchProController::wait(uint64_t duration){
+    PybindSwitchProControllerInternal* internal = (PybindSwitchProControllerInternal*)m_internals;
+    internal->controller().issue_nop(nullptr, Milliseconds(duration));
+}
+void PybindSwitchProController::push_button(uint64_t delay, uint64_t hold, uint64_t release, uint32_t bitfield){
+    PybindSwitchProControllerInternal* internal = (PybindSwitchProControllerInternal*)m_internals;
+    internal->controller().issue_buttons(
+        nullptr,
+        Milliseconds(delay),
+        Milliseconds(hold),
+        Milliseconds(release),
+        (Button)bitfield
+    );
+}
+void PybindSwitchProController::push_dpad(uint64_t delay, uint64_t hold, uint64_t release, uint8_t position){
+    PybindSwitchProControllerInternal* internal = (PybindSwitchProControllerInternal*)m_internals;
+    internal->controller().issue_dpad(
+        nullptr,
+        Milliseconds(delay),
+        Milliseconds(hold),
+        Milliseconds(release),
+        (DpadPosition)position
+    );
+}
+void PybindSwitchProController::push_left_joystick(uint64_t delay, uint64_t hold, uint64_t release, double x, double y){
+    PybindSwitchProControllerInternal* internal = (PybindSwitchProControllerInternal*)m_internals;
+    internal->controller().issue_left_joystick(
+        nullptr,
+        Milliseconds(delay),
+        Milliseconds(hold),
+        Milliseconds(release),
+        {x, y}
+    );
+}
+void PybindSwitchProController::push_right_joystick(uint64_t delay, uint64_t hold, uint64_t release, double x, double y){
+    PybindSwitchProControllerInternal* internal = (PybindSwitchProControllerInternal*)m_internals;
+    internal->controller().issue_right_joystick(
+        nullptr,
+        Milliseconds(delay),
+        Milliseconds(hold),
+        Milliseconds(release),
+        {x, y}
+    );
+}
+void PybindSwitchProController::controller_state(
+    uint64_t duration,
+    uint32_t button_bitfield,
+    uint8_t dpad_position,
+    double left_x, double left_y,
+    double right_x, double right_y
+){
+    PybindSwitchProControllerInternal* internal = (PybindSwitchProControllerInternal*)m_internals;
+    internal->controller().issue_full_controller_state(
+        nullptr,
+        true,
+        Milliseconds(duration),
+        (Button)button_bitfield,
+        (DpadPosition)dpad_position,
+        {left_x, left_y},
+        {right_x, right_y}
+    );
+}
+
+
+
+
+
+
+
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/Integrations/PybindSwitchController.h b/SerialPrograms/Source/Integrations/PybindSwitchController.h
new file mode 100644
index 0000000000..45a7d6e128
--- /dev/null
+++ b/SerialPrograms/Source/Integrations/PybindSwitchController.h
@@ -0,0 +1,174 @@
+/*  Pybind Switch Controller
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Integrations_PybindSwitchController_H
+#define PokemonAutomation_Integrations_PybindSwitchController_H
+
+#include <stdint.h>
+#include <string>
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+
+
+// Models a Nintendo Switch wired controller connected via serial port. This class is used
+// as an interface for Python API and AI agent use.
+//
+// Commands are queued: every `push_*()` call returns as soon as the command is
+// scheduled on the device, not when it finishes. Call `wait_for_all_requests()` to
+// block until everything queued so far has actually been executed. This mirrors how
+// `pbf_*()` functions work inside the main program.
+//
+// The wired controller type (Switch 1/2, Pro vs. 3rd-party controller) is
+// whatever the device firmware is currently set to. Use the main GUI program once to
+// choose it; the device remembers the setting.
+// TODO: we should make this PybindSwitchProController interface able to switch
+//   controller type in future.
+//
+// Button bitfields use `NintendoSwitch::Button` values, and d-pad positions use
+// `NintendoSwitch::DpadPosition` values (0 = up, clockwise to 7 = up-left, 8 = none).
+// Joystick coordinates are in [-1.0, 1.0] with +x = right and +y = up.
+//
+// Thread safety: all methods can be called from any thread. In particular
+// `cancel_all_and_wait()` may be called while another thread is blocked in
+// `wait_for_all_requests()`, e.g. to stop everything in an emergency.
+class PybindSwitchProController{
+    PybindSwitchProController(const PybindSwitchProController&) = delete;
+    void operator=(const PybindSwitchProController&) = delete;
+
+public:
+    // Open a connection to the PABotBase2 device on serial port `port_name`.
+    // `port_name` may be a full path ("/dev/cu.usbserial-0001") or a bare device name
+    // "cu.usbserial-0001" or "COM3".
+    // The connection is established asynchronously; After the constructor, call
+    // `wait_for_ready()` next to wait until it is ready.
+    // Log lines go to the global logger (`global_logger_raw()`) with tag "Pybind",
+    // never to stdout.
+    PybindSwitchProController(const std::string& port_name);
+    ~PybindSwitchProController();
+
+    // Block until the device handshake finishes and a Switch controller has been
+    // created, or `timeout_millis` passes.
+    // Returns true if the controller is ready to receive commands.
+    bool wait_for_ready(uint64_t timeout_millis);
+
+    bool is_ready() const;
+
+    // The connection status text: device name and firmware version,
+    // or the error message if the connection failed.
+    std::string current_status() const;
+
+    // Name of the active controller implementation, e.g. "Nintendo Switch: Pro Controller".
+    // Empty if not ready.
+    std::string controller_name() const;
+
+    // Block until every command queued so far has been executed by the device.
+    // Returns immediately if the controller is not ready.
+    void wait_for_all_requests();
+
+    // Drop every queued command that has not executed yet, return to the neutral
+    // state (no buttons pressed, sticks centered), and wait at most `timeout_millis`
+    // for the device to acknowledge that it received the cancel.
+    //
+    // Returns true if acknowledged, false on timeout or if the controller is not ready.
+    // Commands pushed from other threads while this is running may land after the
+    // cancel and are not cancelled.
+    bool cancel_all_and_wait(uint64_t timeout_millis);
+
+public:
+    //  Commands. These throw InvalidConnectionStateException if the controller is not
+    //  ready, and block only if the device's command queue is full.
+    //
+    //  `delay` is how long to wait before the next command may start, `hold` how long
+    //  the input is held, and `release` how long it must stay released before the same
+    //  button can be used again. `delay = hold + release` runs commands back to back
+    //  like `pbf_press_button()`; `delay < hold` overlaps them, e.g. to hold a button
+    //  while moving a stick.
+
+    // Send a wait command to the controller. Nothing is pressed during the wait time.
+    // duration: wait duration, milliseconds.
+    // If the controller is not ready, it throws InvalidConnectionStateException.
+    // The function will block only if the device's command queue is full.
+    void wait(uint64_t duration);
+
+    // Send a button press command to the controller. It will press all buttons in
+    // `bitfield` simultaneously. D-pad buttons are excluded and should be called via
+    // `push_dpad()`.
+    // delay: how long to wait before the next command may start.
+    // hold: how long the button press is held, milliseconds.
+    // release: how long the buttons stay released before the same button can be used again,
+    // milliseconds.
+    // bitfield: values from `NintendoSwitch::Button`.
+    //
+    // `delay = hold + release` runs commands back to back like `pbf_press_button()`;
+    // `delay < hold` overlaps commands, e.g. to hold a button while moving a stick.
+    // If the controller is not ready, it throws InvalidConnectionStateException.
+    // The function will block only if the device's command queue is full.
+    void push_button(uint64_t delay, uint64_t hold, uint64_t release, uint32_t bitfield);
+    // Send a D-pad press command to the controller. It will press one or two D-pad buttons to
+    // indicate a direction to the game.
+    // delay: how long to wait before the next command may start.
+    // hold: how long the button press is held, milliseconds.
+    // release: how long the buttons stay released before the same button can be used again,
+    // milliseconds.
+    // position: `NintendoSwitch::DpadPosition` values (0 = up, clockwise to 7 = up-left, 8 = none).
+    //
+    // `delay = hold + release` runs commands back to back like `pbf_press_button()`;
+    // `delay < hold` overlaps commands, e.g. to hold a button while moving a stick.
+    // If the controller is not ready, it throws InvalidConnectionStateException.
+    // The function will block only if the device's command queue is full.
+    void push_dpad(uint64_t delay, uint64_t hold, uint64_t release, uint8_t position);
+    // Send a left joystick push command to the controller.
+    // delay: how long to wait before the next command may start.
+    // hold: how long the joystick is pushed, milliseconds.
+    // release: how long the joystick stay released before the same the joystick can be used again,
+    // milliseconds.
+    // x, y: in [-1.0, 1.0] with +x = right and +y = up.
+    //
+    // `delay = hold + release` runs commands back to back like `pbf_press_button()`;
+    // `delay < hold` overlaps commands, e.g. to hold a button while moving a stick.
+    // If the controller is not ready, it throws InvalidConnectionStateException.
+    // The function will block only if the device's command queue is full.
+    void push_left_joystick(uint64_t delay, uint64_t hold, uint64_t release, double x, double y);
+    // Send a right joystick push command to the controller.
+    // delay: how long to wait before the next command may start.
+    // hold: how long the joystick is pushed, milliseconds.
+    // release: how long the joystick stay released before the same the joystick can be used again,
+    // milliseconds.
+    // x, y: in [-1.0, 1.0] with +x = right and +y = up.
+    //
+    // `delay = hold + release` runs commands back to back like `pbf_press_button()`;
+    // `delay < hold` overlaps commands, e.g. to hold a button while moving a stick.
+    // If the controller is not ready, it throws InvalidConnectionStateException.
+    // The function will block only if the device's command queue is full.
+    void push_right_joystick(uint64_t delay, uint64_t hold, uint64_t release, double x, double y);
+
+    // Set the entire controller state at once and hold it for `duration`.
+    // Everything not specified is released. This is the most direct way to hold
+    // arbitrary combinations, e.g. running (B + left stick) while turning the camera.
+    // duration: how long to hold the buttons/joysticks, milliseconds.
+    // button_bitfield: one or more non-D-pad buttons, values from `NintendoSwitch::Button`.
+    // dpad_position: `NintendoSwitch::DpadPosition` values (0 = up, clockwise to 7 = up-left, 8 = none).
+    // left_x, left_y: in [-1.0, 1.0] with +x = right and +y = up.
+    // right_x, right_y: in [-1.0, 1.0] with +x = right and +y = up.
+    void controller_state(
+        uint64_t duration,
+        uint32_t button_bitfield,
+        uint8_t dpad_position,
+        double left_x, double left_y,
+        double right_x, double right_y
+    );
+
+private:
+    void* m_internals;
+};
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Integrations/SleepyDiscordRunner.cpp b/SerialPrograms/Source/Integrations/SleepyDiscordRunner.cpp
deleted file mode 100644
index 2d34592775..0000000000
--- a/SerialPrograms/Source/Integrations/SleepyDiscordRunner.cpp
+++ /dev/null
@@ -1,638 +0,0 @@
-
-#ifdef PA_SLEEPY
-
-#include <deque>
-#include <condition_variable>
-#include <unordered_map>
-#include <thread>
-#include <QFile>
-#include "Common/Cpp/PrettyPrint.h"
-#include "Common/Cpp/StringTools.h"
-#include "Common/Cpp/PanicDump.h"
-#include "Common/Cpp/Concurrency/ScheduledTaskRunner.h"
-#include "Common/Qt/StringToolsQt.h"
-#include "CommonFramework/Globals.h"
-#include "CommonFramework/GlobalSettingsPanel.h"
-#include "CommonFramework/Logging/Logger.h"
-#include "CommonFramework/Notifications/EventNotificationOption.h"
-#include "IntegrationsAPI.h"
-#include "SleepyDiscordRunner.h"
-
-#include <iostream>
-using std::cout;
-using std::endl;
-
-namespace PokemonAutomation{
-namespace Integration{
-namespace SleepyDiscordRunner{
-
-using namespace SleepyDiscord;
-const char* enum_str_callback[] = {
-    "Fault",
-    "API",
-    "Disconnected",
-    "Connected",
-    "Settings Initialized",
-    "Settings Updated",
-    "Commands Initialized",
-    "Callbacks Set",
-    "Invalid Command",
-    "Terminating",
-    "Remove File",
-};
-
-const char* enum_str_command[] = {
-    "Click",
-    "Click DPad",
-
-    "Left Stick",
-    "Right Stick",
-
-    "Screenshot JPG",
-    "Screenshot PNG",
-    "Start",
-    "Stop",
-    "Shutdown",
-    "Get Connected Bots",
-    "Reload Settings",
-    "Reset Camera",
-    "Reset Serial",
-    "Terminate",
-
-    "Hi",
-    "Ping",
-    "About",
-    "Help",
-};
-
-const char* enum_str_state[] = {
-    "STOPPED",
-    "RUNNING",
-    "FINISHED",
-    "STOPPING",
-};
-
-std::unordered_map<uint16_t, std::string> str_buttons = {
-    { 1, "Y" },
-    { 2, "B" },
-    { 4, "A" },
-    { 8, "X" },
-    { 16, "L" },
-    { 32, "R" },
-    { 64, "ZL" },
-    { 128, "ZR" },
-    { 256, "MINUS" },
-    { 512, "PLUS" },
-    { 1024, "LStick" },
-    { 2048, "RStick" },
-    { 4096, "HOME" },
-    { 8192, "Capture" },
-};
-
-std::unordered_map<uint16_t, std::string> str_dpad = {
-    { 0, "DUp" },
-    { 2, "DRight" },
-    { 4, "DDown" },
-    { 6, "DLeft" },
-};
-
-
-Logger& sleepy_logger(){
-    static TaggedLogger logger(global_logger_raw(), "SleepyDiscord");
-    return logger;
-}
-
-
-struct SleepyDiscordRequest {
-    SleepyDiscordRequest() = default;
-    SleepyDiscordRequest(std::string embed, std::string channels, std::string messages, std::shared_ptr<PendingFileSend> file) :
-        embed(std::move(embed)),
-        channels(std::move(channels)),
-        messages(std::move(messages)),
-        file(std::move(file)) {}
-
-    std::string embed;
-    std::string channels;
-    std::string messages;
-    std::shared_ptr<PendingFileSend> file;
-};
-
-class SleepyDiscordSender {
-private:
-    SleepyDiscordSender()
-//        : m_stopping(false)
-//        , m_thread(run_with_catch, "SleepyDiscordSender::thread_loop()", [this]{ thread_loop(); })
-        : m_dispatcher(nullptr, 1)
-        , m_queue(m_dispatcher)
-    {}
-    ~SleepyDiscordSender() {
-//        {
-//            std::lock_guard<std::mutex> lg(m_lock);
-//            m_stopping = true;
-//            m_cv.notify_all();
-//        }
-//        m_thread.join();
-    }
-
-public:
-    static SleepyDiscordSender& instance() {
-        static SleepyDiscordSender sender;
-        return sender;
-    }
-
-    void send(
-        std::string embed,
-        std::string channels,
-        std::chrono::milliseconds delay,
-        std::string messages,
-        std::shared_ptr<PendingFileSend> file
-    ){
-//        std::lock_guard<std::mutex> lg(m_lock);
-        m_queue.add_event(
-            delay > std::chrono::milliseconds(10000) ? std::chrono::milliseconds(0) : delay,
-            [embed = std::move(embed), channels = std::move(channels), messages = std::move(messages), file = std::move(file)]() mutable {
-                if (file == nullptr || file->filepath().empty()){
-                    sendMessage(&channels[0], &messages[0], &embed[0], nullptr);
-                }else{
-                    std::string filepath = file->filepath();
-                    sendMessage(&channels[0], &messages[0], &embed[0], &filepath[0]);
-                }
-            }
-        );
-        sleepy_logger().log("Sending notification... (queue = " + tostr_u_commas(m_queue.size()) + ")", COLOR_PURPLE);
-//        m_queue.emplace_back(embed, channels, messages, std::move(file));
-//        m_cv.notify_all();
-
-    }
-
-private:
-#if 0
-    void thread_loop() {
-        while (true) {
-            SleepyDiscordRequest item;
-            {
-                std::unique_lock<std::mutex> lg(m_lock);
-                if (m_stopping) {
-                    break;
-                }
-                if (m_queue.empty()) {
-                    m_cv.wait(lg);
-                    continue;
-                }
-
-                item = std::move(m_queue.front());
-                m_queue.pop_front();
-            }
-
-            if (item.file != nullptr && !item.file->filepath().empty()) {
-                std::string filepath = item.file->filepath();
-                sendMessage(&item.channels[0], &item.messages[0], &item.embed[0], &filepath[0]);
-            }
-            else sendMessage(&item.channels[0], &item.messages[0], &item.embed[0], nullptr);
-        }
-    }
-#endif
-
-private:
-//    bool m_stopping;
-//    std::mutex m_lock;
-//    std::condition_variable m_cv;
-//    std::deque<SleepyDiscordRequest> m_queue;
-//    std::thread m_thread;
-    AsyncDispatcher m_dispatcher;
-    ScheduledTaskRunner m_queue;
-};
-
-class SleepyDiscordClient;
-std::unique_ptr<SleepyDiscordClient> m_sleepy_client;
-
-std::mutex m_connect_lock;
-std::mutex m_client_lock;
-
-
-
-
-
-struct CommandArgs{
-    uint64_t id;
-    uint16_t button;
-    uint16_t hold_ticks;
-    uint8_t x;
-    uint8_t y;
-};
-
-
-class SleepyDiscordClient {
-public:
-    bool m_connected = false;
-
-public:
-    void send(
-        std::string embed,
-        std::string channels,
-        std::chrono::milliseconds delay,
-        std::string messages,
-        std::shared_ptr<PendingFileSend> file
-    ) {
-        if (m_sleepy_client != nullptr) {
-            if (file){
-//                cout << "Sending: " << file->filepath().toStdString() << endl;
-                m_active_list.emplace(file->filepath(), file);
-            }
-            SleepyDiscordSender::instance().send(embed, channels, delay, messages, std::move(file));
-        }else{
-            sleepy_logger().log("SleepyDiscordClient::send(): Not connected.", COLOR_RED);
-        }
-    }
-
-    void callback(int response, const char* message) {
-        if (m_sleepy_client == nullptr) {
-            return;
-        }
-
-        std::string msg = (std::string)message + " (Callback: " + (std::string)enum_str_callback[response] + ")";
-        Color color = response == SleepyResponse::Disconnected || response == SleepyResponse::Fault ? COLOR_RED : COLOR_PURPLE;
-
-        switch (response) {
-        case SleepyResponse::Connected: m_connected = true; break;
-        case SleepyResponse::Disconnected: m_connected = false; break;
-        case SleepyResponse::RemoveFile:{
-#if 1
-            auto iter = m_active_list.find(message);
-//            cout << "Removing: " << message << endl;
-//            cout << "m_active_list = " << m_active_list.size() << endl;
-            if (iter != m_active_list.end()){
-                msg = "Marking sent file as done. (Callback: " + (std::string)enum_str_callback[response] + ")";
-                m_active_list.erase(iter);
-            }else{
-                msg = "Unknown sent file. (Callback: " + (std::string)enum_str_callback[response] + ")";
-//                color = COLOR_RED;
-            }
-            m_active_list.erase(message);
-#else
-            bool success = QFile(message).remove();
-            if (success){
-                msg = "Removed sent file. (Callback: " + (std::string)enum_str_callback[response] + ")";
-            }else{
-                msg = "Failed to remove sent file. (Callback: " + (std::string)enum_str_callback[response] + ")";
-                color = COLOR_RED;
-            }
-#endif
-            break;
-        }
-        }
-
-        sleepy_logger().log(msg, color);
-    }
-
-    void cmd_callback(SleepyRequest request, char* channel, uint64_t id, uint16_t button, uint16_t hold_ticks, uint8_t x, uint8_t y) {
-        if (m_sleepy_client == nullptr) {
-            return;
-        }
-
-        cout << "cmd_callback(): " << request << endl;
-
-        std::string cmd = "Received command: " + (std::string)enum_str_command[request] + ".";
-        sleepy_logger().log(cmd, COLOR_PURPLE);
-
-        switch (request) {
-        case SleepyRequest::Click:
-            run_Click(channel, id, hold_ticks, button);
-            break;
-        case SleepyRequest::DPad:
-            run_DPad(channel, id, hold_ticks, button);
-            break;
-        case SleepyRequest::SetLStick:
-            run_SetLStick(channel, id, hold_ticks, x, y);
-            return;
-        case SleepyRequest::SetRStick:
-            run_SetRStick(channel, id, hold_ticks, x, y);
-            return;
-        case SleepyRequest::ScreenshotJpg:
-            run_ScreenshotJpg(channel, id);
-            return;
-        case SleepyRequest::ScreenshotPng:
-            run_ScreenshotPng(channel, id);
-            return;
-        case SleepyRequest::Start:
-            run_start(channel, id);
-            break;
-        case SleepyRequest::Stop:
-            run_stop(channel, id);
-            break;
-        case SleepyRequest::Shutdown:
-            run_Shutdown();
-            return;
-        case SleepyRequest::GetConnectedBots:
-            run_GetConnectedBots(channel);
-            return;
-        case SleepyRequest::ReloadSettings:
-            run_ReloadSettings(channel);
-            return;
-        case SleepyRequest::ResetCamera:
-            run_ResetCamera(channel, id);
-            return;
-        case SleepyRequest::ResetSerial:
-            run_ResetSerial(channel, id);
-            return;
-        }
-    }
-
-
-
-private:
-    void send_response(SleepyRequest request, char* channel, std::string message, std::shared_ptr<PendingFileSend> file = nullptr){
-        std::string filename = file == nullptr ? "" : file->filepath();
-        if ((int)request <= 11) {
-            program_response(request, channel, &message[0], &filename[0]);
-        }else{
-            send("", channel, std::chrono::milliseconds(0), &message[0], std::move(file));
-        }
-    }
-
-    void run_Click(char* channel, uint64_t id, uint16_t hold_ticks, uint16_t button){
-        std::string message;
-        auto it = str_buttons.find(button);
-        if (it == str_buttons.end()) {
-            message = "Unrecognized button input";
-        }else{
-            message = Integration::press_button(id, button, hold_ticks);
-        }
-        if (message.empty()){
-            message = "Console ID " + std::to_string(id) + " clicked " + it->second + ".";
-        }
-        send_response(SleepyRequest::Click, channel, message);
-    }
-    void run_DPad(char* channel, uint64_t id, uint16_t hold_ticks, uint16_t button){
-        std::string message;
-        auto it = str_dpad.find(button);
-        if (it == str_dpad.end()) {
-            message = "Unrecognized button input";
-        }else{
-            message = Integration::press_dpad(id, button, hold_ticks);
-        }
-        if (message.empty()){
-            message = "Console ID " + std::to_string(id) + " clicked " + it->second + ".";
-        }
-        send_response(SleepyRequest::DPad, channel, message);
-    }
-    void run_SetLStick(char* channel, uint64_t id, uint16_t hold_ticks, uint8_t x, uint8_t y){
-        std::string message = Integration::press_left_joystick(id, x, y, hold_ticks);
-        if (message.empty()){
-            message = "Console ID " + std::to_string(id) + " moved the left joystick.";
-        }
-        send_response(SleepyRequest::SetLStick, channel, message);
-    }
-    void run_SetRStick(char* channel, uint64_t id, uint16_t hold_ticks, uint8_t x, uint8_t y){
-        std::string message = Integration::press_right_joystick(id, x, y, hold_ticks);
-        if (message.empty()){
-            message = "Console ID " + std::to_string(id) + " moved the right joystick.";
-        }
-        send_response(SleepyRequest::SetRStick, channel, message);
-    }
-    void run_ScreenshotPng(char* channel, uint64_t id){
-        std::string filepath = "capture.png";
-        std::string message = Integration::screenshot(id, filepath.c_str());
-        if (!message.empty()){
-            send_response(SleepyRequest::ScreenshotPng, channel, message);
-            return;
-        }else{
-            message = "Captured image from console ID " + std::to_string(id) + ".";
-        }
-
-        std::shared_ptr<PendingFileSend> file(new PendingFileSend(filepath, true));
-        send_response(SleepyRequest::ScreenshotPng, channel, message, std::move(file));
-    }
-    void run_ScreenshotJpg(char* channel, uint64_t id){
-        std::string filepath = "capture.jpg";
-        std::string message = Integration::screenshot(id, filepath.c_str());
-        if (!message.empty()){
-            send_response(SleepyRequest::ScreenshotJpg, channel, message);
-            return;
-        }else{
-            message = "Captured image from console ID " + std::to_string(id) + ".";
-        }
-
-        std::shared_ptr<PendingFileSend> file(new PendingFileSend(filepath, true));
-        send_response(SleepyRequest::ScreenshotJpg, channel, message, std::move(file));
-    }
-    void run_start(char* channel, uint64_t id){
-        std::string message = Integration::start_program(id);
-        if (!message.empty()){
-            send_response(SleepyRequest::Start, channel, message);
-            return;
-        }else{
-            message = "Console ID " + std::to_string(id) + " started the program.";
-        }
-        send_response(SleepyRequest::Start, channel, message);
-    }
-    void run_stop(char* channel, uint64_t id){
-        std::string message = Integration::stop_program(id);
-        if (!message.empty()){
-            send_response(SleepyRequest::Stop, channel, message);
-            return;
-        }else{
-            message = "Console ID " + std::to_string(id) + " stopped the program.";
-        }
-        send_response(SleepyRequest::Stop, channel, message);
-    }
-    void run_Shutdown(){
-        program_response(SleepyRequest::Terminate);
-        m_sleepy_client.reset();
-
-        //  TODO: Can't do this since it skips all the shutdown sequence from all the other threads.
-        exit(0);
-    }
-    void run_GetConnectedBots(char* channel){
-        std::string message = Integration::status();
-        send_response(SleepyRequest::GetConnectedBots, channel, message);
-    }
-    void run_ReloadSettings(char* channel){
-        std::string message = initialize_sleepy_settings()
-            ? "Successfully reloaded Discord settings."
-            : "Failed to reload Discord settings.";
-        send_response(SleepyRequest::ReloadSettings, channel, message);
-    }
-    void run_ResetCamera(char* channel, uint64_t id){
-        std::string message = Integration::reset_camera(id);
-        send_response(SleepyRequest::ResetCamera, channel, message.empty() ? "Camera was reset." : message);
-    }
-    void run_ResetSerial(char* channel, uint64_t id){
-        std::string message = Integration::reset_serial(id);
-        send_response(SleepyRequest::ResetSerial, channel, message);
-    }
-
-    std::map<std::string, std::shared_ptr<PendingFileSend>> m_active_list;
-};
-
-
-
-
-
-
-
-bool is_running(){
-    std::lock_guard<std::mutex> lg(m_connect_lock);
-    return m_sleepy_client != nullptr;
-}
-
-bool is_connected(){
-    std::lock_guard<std::mutex> lg(m_connect_lock);
-    return m_sleepy_client != nullptr && m_sleepy_client->m_connected;
-}
-
-void sleepy_connect(){
-    std::lock_guard<std::mutex> lg(m_connect_lock);
-    {
-//        std::lock_guard<std::mutex> lg(m_client_lock);
-//        if (!PreloadSettings::instance().DEVELOPER_MODE){
-//            return;
-//        }
-        if (m_sleepy_client != nullptr){
-            sleepy_logger().log("sleepy_connect(): Already initialized!", COLOR_PURPLE);
-            return;
-        }
-        if (!initialize_sleepy_settings()){
-            sleepy_logger().log("sleepy_connect(): initialize_sleepy_settings() failed.", COLOR_RED);
-            return;
-        }
-        sleepy_logger().log("Connecting...", COLOR_PURPLE);
-    }
-    client_connect();
-    sleepy_logger().log("Finished Connecting...", COLOR_PURPLE);
-}
-
-void sleepy_terminate() {
-    std::lock_guard<std::mutex> lg(m_client_lock);
-    program_response(SleepyRequest::Terminate);
-    if (m_sleepy_client != nullptr) {
-        m_sleepy_client.reset();
-    }
-}
-
-void sleepy_response(int response, char* message) {
-    //std::lock_guard<std::mutex> lg(m_client_lock);
-    if (m_sleepy_client != nullptr) {
-        return m_sleepy_client->callback(response, message);
-    }
-}
-
-void sleepy_cmd_response(int request, char* channel, uint64_t console_id, uint16_t button, uint16_t hold_ticks, uint8_t x, uint8_t y) {
-    std::lock_guard<std::mutex> lg(m_client_lock);
-    if (m_sleepy_client != nullptr) {
-        return m_sleepy_client->cmd_callback((SleepyRequest)request, channel, console_id, button, hold_ticks, x, y);
-    }
-}
-
-void send_embed_sleepy(
-    bool should_ping,
-    const std::vector<std::string>& tags,
-    const JsonObject& embed,
-    std::shared_ptr<PendingFileSend> file
-){
-    DiscordSettingsOption& settings = GlobalSettings::instance().DISCORD;
-    if (!settings.integration.enabled()){
-        return;
-    }
-
-    std::lock_guard<std::mutex> lg(m_client_lock);
-    if (m_sleepy_client == nullptr){
-        return;
-    }
-
-    MessageBuilder builder(tags);
-    const DiscordIntegrationTable& channels = settings.integration.channels;
-
-    std::vector<std::unique_ptr<DiscordIntegrationChannel>> table = channels.copy_snapshot();
-    for (size_t i = 0; i < table.size(); i++){
-        const Integration::DiscordIntegrationChannel& channel = *table[i];
-        if (((std::string)channel.tags_text).empty() || !channel.enabled){
-            continue;
-        }
-        if (!builder.should_send(EventNotificationOption::parse_tags(channel.tags_text))){
-            continue;
-        }
-
-        sleepy_logger().log("send_message_sleepy(): Sending...", COLOR_PURPLE);
-        std::chrono::seconds delay(channel.delay);
-        m_sleepy_client->send(
-            embed.dump(),
-            channel.channel_id,
-            std::chrono::seconds(delay),
-            builder.build_message(
-                std::chrono::seconds(delay),
-                should_ping && channel.ping,
-                settings.message.user_id,
-                settings.message.message
-            ),
-            file == nullptr ? nullptr : file
-        );
-    }
-}
-
-
-bool initialize_sleepy_settings() {
-    //  Must be called inside lock.
-//    std::lock_guard<std::mutex> lg(m_client_lock);
-    DiscordSettingsOption& settings = GlobalSettings::instance().DISCORD;
-    if (!check_if_empty(settings)) {
-        return false;
-    }
-
-    bool suffix = settings.integration.use_suffix;
-    std::string param_string;
-    param_string += StringTools::replace(settings.integration.token, " ", "") + "|";
-    param_string += (std::string)settings.integration.command_prefix + "|";
-    param_string += StringTools::replace(settings.integration.owner, " ", "") + "|";
-    param_string += (std::string)settings.integration.game_status + "|";
-    param_string += StringTools::replace(settings.integration.hello_message, "@", "") + "|";
-    param_string += PROGRAM_VERSION + "|";
-    param_string += PROJECT_SOURCE_URL;
-
-    std::string sudo = StringTools::replace(settings.integration.sudo, " ", "");
-
-//    std::string w_channels = StringTools::replace(settings.integration.channels_whitelist.get(), " ", "");
-    std::string w_channels;
-    for (const std::string& channel_id : settings.integration.channels.command_channels()){
-        if (!w_channels.empty()){
-            w_channels += ",";
-        }
-        w_channels += channel_id;
-    }
-
-    m_sleepy_client = std::unique_ptr<SleepyDiscordClient>(new SleepyDiscordClient());
-    apply_settings(sleepy_response, sleepy_cmd_response, &w_channels[0], &sudo[0], &param_string[0], suffix);
-    return true;
-}
-
-bool check_if_empty(const DiscordSettingsOption& settings) {
-
-    if (!settings.integration.enabled()){
-        return false;
-    }
-    if (((std::string)settings.integration.token).empty()) {
-        return false;
-    }
-    else if (((std::string)settings.integration.token).find(",") != std::string::npos) {
-        sleepy_logger().log("\"Token\" must only contain one token. Stopping...", COLOR_RED);
-        return false;
-    }
-    else if (((std::string)settings.integration.owner).find(",") != std::string::npos) {
-        sleepy_logger().log("\"Owner\" must only contain one Discord ID (yours). Stopping...", COLOR_RED);
-        return false;
-    }
-    else if (((std::string)settings.integration.command_prefix).empty()) {
-        sleepy_logger().log("Please enter a Discord command prefix. Stopping...", COLOR_RED);
-        return false;
-    }
-    return true;
-}
-
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/Integrations/SleepyDiscordRunner.h b/SerialPrograms/Source/Integrations/SleepyDiscordRunner.h
deleted file mode 100644
index f1d4cb66fc..0000000000
--- a/SerialPrograms/Source/Integrations/SleepyDiscordRunner.h
+++ /dev/null
@@ -1,105 +0,0 @@
-#ifndef PokemonAutomation_SleepyPA_H
-#define PokemonAutomation_SleepyPA_H
-
-#include <stdint.h>
-#include "CommonFramework/PersistentSettings.h"
-#include "CommonFramework/Options/ScreenshotFormatOption.h"
-#include "CommonFramework/Notifications/MessageAttachment.h"
-#include "Integrations/DiscordSettingsOption.h"
-
-#ifdef SLEEPY_STATIC
-    #define SLEEPY_EXPORT
-#else
-
-#ifdef _WIN32
-#ifdef _WINDLL
-    #define SLEEPY_EXPORT __declspec(dllexport)
-#else
-    #define SLEEPY_EXPORT __declspec(dllimport)
-#endif
-
-#else
-    #define SLEEPY_EXPORT __attribute__((visibility("default")))
-#endif
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-namespace SleepyDiscord {
-    typedef void (*SleepyCallback)(int response, char* message);
-    typedef void (*SleepyCommandCallback)(int request, char* channel, uint64_t console_id, uint16_t button, uint16_t hold_ticks, uint8_t x, uint8_t y);
-    SLEEPY_EXPORT void client_connect();
-    SLEEPY_EXPORT void client_disconnect();
-    SLEEPY_EXPORT void apply_settings(SleepyCallback callback, SleepyCommandCallback cmd_callback, char* w_channels, char* sudo, char* params, bool suffix);
-    SLEEPY_EXPORT void program_response(int response, char* channel = nullptr, char* message = nullptr, char* filepath = nullptr);
-    SLEEPY_EXPORT void sendMessage(char* channels, char* messages = nullptr, char* json = nullptr, char* filePath = nullptr);
-    void client_run();
-
-enum SleepyResponse {
-    Fault = 0,
-    API = 1,
-    Disconnected = 2,
-    Connected = 3,
-    SettingsInitialized = 4,
-    SettingsUpdated = 5,
-    CommandsInitialized = 6,
-    CallbacksSet = 7,
-    InvalidCommand = 8,
-    Terminating = 9,
-    RemoveFile = 10,
-};
-
-enum SleepyRequest {
-    Click = 0,
-    DPad = 1,
-
-    SetLStick = 2,
-    SetRStick = 3,
-
-    ScreenshotJpg = 4,
-    ScreenshotPng = 5,
-    Start = 6,
-    Stop = 7,
-    Shutdown = 8,
-    GetConnectedBots = 9,
-    ReloadSettings = 10,
-    ResetCamera = 11,
-    ResetSerial = 12,
-    Terminate = 13,
-
-    Hi = 14,
-    Ping = 15,
-    About = 16,
-    Help = 17,
-};
-}
-
-#ifdef __cplusplus
-}
-
-namespace PokemonAutomation{
-namespace Integration{
-namespace SleepyDiscordRunner{
-
-    bool is_running();
-    bool is_connected();
-    void send_embed_sleepy(
-        bool should_ping,
-        const std::vector<std::string>& tags,
-        const JsonObject& embed,
-        std::shared_ptr<PendingFileSend> file
-    );
-    void sleepy_response(int response, char* message);
-    void sleepy_cmd_response(int request, char* channel, uint64_t console_id, uint16_t button, uint16_t hold_ticks, uint8_t x, uint8_t y);
-    void sleepy_connect();
-    void sleepy_terminate();
-    bool initialize_sleepy_settings();
-    bool check_if_empty(const DiscordSettingsOption& settings);
-}
-}
-}
-
-#endif
-#endif
diff --git a/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT.cpp b/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT.cpp
index c202176920..e03d55a2f9 100644
--- a/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT.cpp
+++ b/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT.cpp
@@ -1,11 +1,12 @@
 /*  ABS FFT
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include <stddef.h>
 #include "Common/Cpp/CpuId/CpuId.h"
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
 #include "Kernels_AbsFFT.h"
 
 namespace PokemonAutomation{
@@ -14,12 +15,19 @@ namespace AbsFFT{
 
 
 
-void fft_abs_Default(int k, float* abs, float* real);
-void fft_abs_x86_SSE41(int k, float* abs, float* real);
-void fft_abs_x86_AVX2(int k, float* abs, float* real);
+void fft_abs_Default(int k, float* abs, float* real, const float* weights);
+void fft_abs_x86_SSE41(int k, float* abs, float* real, const float* weights);
+void fft_abs_x86_AVX2(int k, float* abs, float* real, const float* weights);
+void fft_abs_x86_AVX512(int k, float* abs, float* real, const float* weights);
+void fft_abs_arm64_NEON(int k, float* abs, float* real, const float* weights);
 
+void add_tests_x86_SSE41(UnitTestDatabase& database);
+void add_tests_x86_AVX2(UnitTestDatabase& database);
+void add_tests_x86_AVX512(UnitTestDatabase& database);
+void add_tests_arm64_NEON(UnitTestDatabase& database);
 
-void fft_abs(int k, float* abs, float* real){
+
+void fft_abs(int k, float* abs, float* real, const float* weights){
     if (k <= 0){
         throw "FFT length must be at least 2^1.";
     }
@@ -30,19 +38,61 @@ void fft_abs(int k, float* abs, float* real){
         throw "real must be aligned to 64 bytes.";
     }
 
+#ifdef PA_AutoDispatch_x64_17_Skylake
+    if (CPU_CAPABILITY_CURRENT.OK_17_Skylake){
+        fft_abs_x86_AVX512(k, abs, real, weights);
+        return;
+    }
+#endif
 #ifdef PA_AutoDispatch_x64_13_Haswell
     if (CPU_CAPABILITY_CURRENT.OK_13_Haswell){
-        fft_abs_x86_AVX2(k, abs, real);
+        fft_abs_x86_AVX2(k, abs, real, weights);
         return;
     }
 #endif
 #ifdef PA_AutoDispatch_x64_08_Nehalem
     if (CPU_CAPABILITY_CURRENT.OK_08_Nehalem){
-        fft_abs_x86_SSE41(k, abs, real);
+        fft_abs_x86_SSE41(k, abs, real, weights);
+        return;
+    }
+#endif
+#ifdef PA_AutoDispatch_arm64_20_M1
+    if (CPU_CAPABILITY_CURRENT.OK_M1){
+        fft_abs_arm64_NEON(k, abs, real, weights);
         return;
     }
 #endif
-    fft_abs_Default(k, abs, real);
+    fft_abs_Default(k, abs, real, weights);
+}
+
+
+
+//
+//  Register the tests for the ISAs this binary can run. Each ISA checks its
+//  results against the Default path, which is the source of truth, so the
+//  Default path itself gets no tests.
+//
+void add_tests(UnitTestDatabase& database){
+#ifdef PA_AutoDispatch_x64_08_Nehalem
+    if (CPU_CAPABILITY_CURRENT.OK_08_Nehalem){
+        add_tests_x86_SSE41(database);
+    }
+#endif
+#ifdef PA_AutoDispatch_x64_13_Haswell
+    if (CPU_CAPABILITY_CURRENT.OK_13_Haswell){
+        add_tests_x86_AVX2(database);
+    }
+#endif
+#ifdef PA_AutoDispatch_x64_17_Skylake
+    if (CPU_CAPABILITY_CURRENT.OK_17_Skylake){
+        add_tests_x86_AVX512(database);
+    }
+#endif
+#ifdef PA_AutoDispatch_arm64_20_M1
+    if (CPU_CAPABILITY_CURRENT.OK_M1){
+        add_tests_arm64_NEON(database);
+    }
+#endif
 }
 
 
diff --git a/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT.h b/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT.h
index 211d9f4f39..b4ab58e1a8 100644
--- a/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT.h
+++ b/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT.h
@@ -1,6 +1,6 @@
 /*  ABS FFT
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -9,6 +9,9 @@
 
 
 namespace PokemonAutomation{
+
+class UnitTestDatabase;
+
 namespace Kernels{
 namespace AbsFFT{
 
@@ -17,13 +20,18 @@ namespace AbsFFT{
 //  lower half into "abs".
 //
 //    - 2^k is the transform length.
-//    - "real" is the input time domain. It has length 2^k.
 //    - "abs" is the absolute values of the frequency domain. It has length 2^(k-1).
+//    - "real" is the input time domain. It has length 2^k.
+//    - "weights" is multiplied into "real" before the FFT. It has length 2^k.
 //    - Both "real" and "abs" must be aligned to 64 bytes.
 //
 //  This operation is destructive on "real" even though it is an input.
 //
-void fft_abs(int k, float* abs, float* real);
+void fft_abs(int k, float* abs, float* real, const float* weights = nullptr);
+
+
+
+void add_tests(UnitTestDatabase& database);
 
 
 
diff --git a/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_Arch.h b/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_Arch.h
index 77c548b3f4..bbf88402e8 100644
--- a/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_Arch.h
+++ b/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_Arch.h
@@ -1,6 +1,6 @@
 /*  ABS FFT Arch
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -15,6 +15,8 @@ namespace AbsFFT{
 
 
 const float TW8_1 = 0.70710678118654752440f;
+const float TW16_1 = 0.92387953251128675613f;
+const float TW16_3 = 0.38268343236508977173f;
 
 #if 0
 PA_FORCE_INLINE void cmul_pp(
diff --git a/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_Arch_Default.h b/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_Arch_Default.h
index 5a10f6a960..1ab07e316f 100644
--- a/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_Arch_Default.h
+++ b/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_Arch_Default.h
@@ -1,12 +1,13 @@
 /*  ABS FFT Arch (Default)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifndef PokemonAutomation_Kernels_AbsFFT_Arch_Default_H
 #define PokemonAutomation_Kernels_AbsFFT_Arch_Default_H
 
+#include <cstddef>
 #include <cmath>
 #include "Common/Compiler.h"
 
diff --git a/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_Arch_arm64_NEON.h b/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_Arch_arm64_NEON.h
new file mode 100644
index 0000000000..469be24fe9
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_Arch_arm64_NEON.h
@@ -0,0 +1,111 @@
+/*  ABS FFT Arch (arm64 NEON)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Kernels_AbsFFT_Arch_arm64_NEON_H
+#define PokemonAutomation_Kernels_AbsFFT_Arch_arm64_NEON_H
+
+#include <cstddef>
+#include <arm_neon.h>
+#include "Common/Compiler.h"
+
+namespace PokemonAutomation{
+namespace Kernels{
+namespace AbsFFT{
+struct Context_arm64_NEON{
+
+
+using vtype = float32x4_t;
+
+static const int VECTOR_K = 2;
+static const size_t VECTOR_LENGTH = (size_t)1 << VECTOR_K;
+
+static const int BASE_COMPLEX_TRANSFORM_K = 4;
+static const size_t MIN_TABLE_WIDTH = 1;
+
+
+static PA_FORCE_INLINE vtype vset1(float x){
+    return vdupq_n_f32(x);
+}
+static PA_FORCE_INLINE vtype vneg(vtype x){
+    return vnegq_f32(x);
+}
+static PA_FORCE_INLINE vtype vadd(vtype x, vtype y){
+    return vaddq_f32(x, y);
+}
+static PA_FORCE_INLINE vtype vsub(vtype x, vtype y){
+    return vsubq_f32(x, y);
+}
+static PA_FORCE_INLINE vtype vmul(vtype x, vtype y){
+    return vmulq_f32(x, y);
+}
+//  Complex multiply of two packed (re/im) pairs:
+//      Xr*Wr - Xi*Wi   /   Xi*Wr + Xr*Wi
+//  Fused with the vfmsq/vfmaq spellings (as opposed to vmlsq/vmlaq),
+//  which expand to the __builtin_aarch64_fma* builtins that both GCC and
+//  Clang keep as real FMLA/FMLS instructions; GCC 13 decomposes the
+//  vmlaq/vmlsq builtins back into mul + add.
+//  The accumulate form is used (first product pre-rounded, second
+//  product fused): it takes 4 instructions with no negation, which is
+//  also how the compiler naturally contracts the scalar Default path,
+//  so NEON stays bit-exact with it. (The x86 fmsub-shaped alternative,
+//  pre-rounded Xi*Wi with the fused Xr*Wr, needs a negate and differs
+//  from this by a ULP or so in edge cases.)
+//  t0/t1 are reused as the output registers; Xr/Xi are still the
+//  originals when the FMAs run.
+static PA_FORCE_INLINE void cmul_pp(
+    vtype& Xr, vtype& Xi,
+    vtype Wr, vtype Wi
+){
+    vtype t0 = vmulq_f32(Xr, Wr);
+    vtype t1 = vmulq_f32(Xi, Wr);
+    t0 = vfmsq_f32(t0, Xi, Wi);
+    t1 = vfmaq_f32(t1, Xr, Wi);
+    Xr = t0;
+    Xi = t1;
+}
+
+
+static PA_FORCE_INLINE vtype abs(vtype r, vtype i){
+    //  sqrt(r*r + i*i), with the mul/add contracted into an FMA
+    //  (x86: _mm256_fmadd_ps(r, r, i*i); the two products play swapped
+    //  roles here, as in cmul_pp, so it can differ from x86 by a ULP
+    //  in edge cases).
+    vtype r0 = vfmaq_f32(vmulq_f32(r, r), i, i);
+    return vsqrtq_f32(r0);
+}
+static PA_FORCE_INLINE void swap_odd(vtype& L, vtype& H){
+    //  L' = (L0, H3, L2, H1), H' = (H0, L3, H2, L1)
+    float l1 = vgetq_lane_f32(L, 1);
+    float l3 = vgetq_lane_f32(L, 3);
+    float h1 = vgetq_lane_f32(H, 1);
+    float h3 = vgetq_lane_f32(H, 3);
+    L = vsetq_lane_f32(h1, vsetq_lane_f32(h3, L, 1), 3);
+    H = vsetq_lane_f32(l1, vsetq_lane_f32(l3, H, 1), 3);
+}
+
+
+static PA_FORCE_INLINE void interleave_v0(
+    vtype& out0, vtype& out1,
+    vtype lo, vtype hi
+){
+    out0 = vzip1q_f32(lo, hi);
+    out1 = vzip2q_f32(lo, hi);
+}
+static PA_FORCE_INLINE void interleave_v1(
+    vtype& out0, vtype& out1,
+    vtype lo, vtype hi
+){
+    out0 = vcombine_f32(vget_low_f32(lo), vget_low_f32(hi));
+    out1 = vcombine_f32(vget_high_f32(lo), vget_high_f32(hi));
+}
+
+
+
+};
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_Arch_x86_AVX2.h b/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_Arch_x86_AVX2.h
index f91f57c9fd..1412b1afa3 100644
--- a/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_Arch_x86_AVX2.h
+++ b/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_Arch_x86_AVX2.h
@@ -1,6 +1,6 @@
 /*  ABS FFT Arch (AVX2)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_Arch_x86_AVX512.h b/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_Arch_x86_AVX512.h
new file mode 100644
index 0000000000..c55835e7d0
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_Arch_x86_AVX512.h
@@ -0,0 +1,85 @@
+/*  ABS FFT Arch (AVX512)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Kernels_AbsFFT_Arch_x86_AVX512_H
+#define PokemonAutomation_Kernels_AbsFFT_Arch_x86_AVX512_H
+
+#include <immintrin.h>
+#include "Common/Compiler.h"
+
+namespace PokemonAutomation{
+namespace Kernels{
+namespace AbsFFT{
+struct Context_x86_AVX512{
+
+
+using vtype = __m512;
+static const int VECTOR_K = 4;
+static const size_t VECTOR_LENGTH = (size_t)1 << VECTOR_K;
+
+static const int BASE_COMPLEX_TRANSFORM_K = 8;
+static const size_t MIN_TABLE_WIDTH = 8;
+
+
+static PA_FORCE_INLINE vtype vset1(float x){
+    return _mm512_set1_ps(x);
+}
+static PA_FORCE_INLINE vtype vneg(vtype x){
+    return _mm512_xor_ps(x, _mm512_set1_ps(-0.0));
+}
+static PA_FORCE_INLINE vtype vadd(vtype x, vtype y){
+    return _mm512_add_ps(x, y);
+}
+static PA_FORCE_INLINE vtype vsub(vtype x, vtype y){
+    return _mm512_sub_ps(x, y);
+}
+static PA_FORCE_INLINE vtype vmul(vtype x, vtype y){
+    return _mm512_mul_ps(x, y);
+}
+static PA_FORCE_INLINE void cmul_pp(
+    vtype& Xr, vtype& Xi,
+    vtype Wr, vtype Wi
+){
+    vtype t0 = _mm512_mul_ps(Xi, Wi);
+    vtype t1 = _mm512_mul_ps(Xr, Wi);
+    Xr = _mm512_fmsub_ps(Xr, Wr, t0);
+    Xi = _mm512_fmadd_ps(Xi, Wr, t1);
+}
+
+
+static PA_FORCE_INLINE vtype abs(vtype r, vtype i){
+    vtype r0 = _mm512_fmadd_ps(r, r, _mm512_mul_ps(i, i));
+    return _mm512_sqrt_ps(r0);
+}
+static PA_FORCE_INLINE void swap_odd(vtype& L, vtype& H){
+    vtype r0 = _mm512_permutex2var_ps(L, _mm512_setr_epi32( 0, 31,  2, 29,  4, 27,  6, 25,  8, 23, 10, 21, 12, 19, 14, 17), H);
+    vtype r1 = _mm512_permutex2var_ps(L, _mm512_setr_epi32(16, 15, 18, 13, 20, 11, 22,  9, 24,  7, 26,  5, 28,  3, 30,  1), H);
+    L = r0;
+    H = r1;
+}
+
+
+static PA_FORCE_INLINE void interleave_v0(
+    vtype& out0, vtype& out1,
+    vtype lo, vtype hi
+){
+    out0 = _mm512_permutex2var_ps(lo, _mm512_setr_epi32( 0, 16,  1, 17,  2, 18,  3, 19,  4, 20,  5, 21,  6, 22,  7, 23), hi);
+    out1 = _mm512_permutex2var_ps(lo, _mm512_setr_epi32( 8, 24,  9, 25, 10, 26, 11, 27, 12, 28, 13, 29, 14, 30, 15, 31), hi);
+}
+static PA_FORCE_INLINE void interleave_v1(
+    vtype& out0, vtype& out1,
+    vtype lo, vtype hi
+){
+    out0 = _mm512_permutex2var_ps(lo, _mm512_setr_epi32( 0,  1, 16, 17,  2,  3, 18, 19,  4,  5, 20, 21,  6,  7, 22, 23), hi);
+    out1 = _mm512_permutex2var_ps(lo, _mm512_setr_epi32( 8,  9, 24, 25, 10, 11, 26, 27, 12, 13, 28, 29, 14, 15, 30, 31), hi);
+}
+
+
+};
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_Arch_x86_SSE41.h b/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_Arch_x86_SSE41.h
index 593a14dcdb..20726e666c 100644
--- a/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_Arch_x86_SSE41.h
+++ b/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_Arch_x86_SSE41.h
@@ -1,6 +1,6 @@
 /*  ABS FFT Arch (SSE4.1)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_BaseTransform_arm64_NEON.h b/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_BaseTransform_arm64_NEON.h
new file mode 100644
index 0000000000..5795ab682b
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_BaseTransform_arm64_NEON.h
@@ -0,0 +1,82 @@
+/*  ABS FFT Base Transform (arm64 NEON)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Kernels_AbsFFT_BaseTransform_arm64_NEON_H
+#define PokemonAutomation_Kernels_AbsFFT_BaseTransform_arm64_NEON_H
+
+#include "Kernels_AbsFFT_Arch_arm64_NEON.h"
+#include "Kernels_AbsFFT_Butterflies.h"
+#include "Kernels_AbsFFT_ComplexVector.h"
+
+namespace PokemonAutomation{
+namespace Kernels{
+namespace AbsFFT{
+
+
+PA_FORCE_INLINE void vtranspose(float32x4_t& r0, float32x4_t& r1, float32x4_t& r2, float32x4_t& r3){
+    float32x4_t a0 = vzip1q_f32(r0, r1);
+    float32x4_t a1 = vzip2q_f32(r0, r1);
+    float32x4_t a2 = vzip1q_f32(r2, r3);
+    float32x4_t a3 = vzip2q_f32(r2, r3);
+    r0 = vcombine_f32(vget_low_f32(a0), vget_low_f32(a2));
+    r1 = vcombine_f32(vget_high_f32(a0), vget_high_f32(a2));
+    r2 = vcombine_f32(vget_low_f32(a1), vget_low_f32(a3));
+    r3 = vcombine_f32(vget_high_f32(a1), vget_high_f32(a3));
+}
+
+
+template <>
+void base_transform<Context_arm64_NEON>(const TwiddleTable<Context_arm64_NEON>& table, Context_arm64_NEON::vtype* T){
+    float32x4_t r0, r1, r2, r3;
+    float32x4_t i0, i1, i2, i3;
+
+    r0 = T[0];
+    i0 = T[1];
+    r1 = T[2];
+    i1 = T[3];
+    r2 = T[4];
+    r3 = T[6];
+    i2 = T[5];
+    i3 = T[7];
+
+    const vcomplex<Context_arm64_NEON>* w1 = table[3].w1.data();
+    const vcomplex<Context_arm64_NEON>* w2 = table[4].w1.data();
+    const vcomplex<Context_arm64_NEON>* w3 = table[4].w3.data();
+    Butterflies<Context_arm64_NEON>::butterfly4(
+        r0, i0,
+        r1, i1, w1[0].r, w1[0].i,
+        r2, i2, w2[0].r, w2[0].i,
+        r3, i3, w3[0].r, w3[0].i
+    );
+
+    vtranspose(r0, r1, r2, r3);
+    vtranspose(i0, i1, i2, i3);
+
+    Butterflies<Context_arm64_NEON>::butterfly4(
+        r0, i0,
+        r1, i1,
+        r2, i2,
+        r3, i3
+    );
+
+    vtranspose(r0, r1, r2, r3);
+    T[0] = r0;
+    T[2] = r1;
+    T[4] = r2;
+    T[6] = r3;
+    vtranspose(i0, i1, i2, i3);
+    T[1] = i0;
+    T[3] = i1;
+    T[5] = i2;
+    T[7] = i3;
+}
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_BaseTransform_x86_AVX2.h b/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_BaseTransform_x86_AVX2.h
index e661ef04c5..4a7bca6809 100644
--- a/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_BaseTransform_x86_AVX2.h
+++ b/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_BaseTransform_x86_AVX2.h
@@ -1,13 +1,13 @@
 /*  ABS FFT Base Transform (x86 AVX2)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifndef PokemonAutomation_Kernels_AbsFFT_BaseTransform_x86_AVX2_H
 #define PokemonAutomation_Kernels_AbsFFT_BaseTransform_x86_AVX2_H
 
-#include "Kernels/Kernels_x64_AVX2.h"
+//#include "Kernels/Kernels_x64_AVX2.h"
 #include "Kernels_AbsFFT_Arch_x86_AVX2.h"
 #include "Kernels_AbsFFT_Butterflies.h"
 #include "Kernels_AbsFFT_ComplexVector.h"
@@ -16,6 +16,7 @@ namespace PokemonAutomation{
 namespace Kernels{
 namespace AbsFFT{
 
+
 PA_FORCE_INLINE void vtranspose(
     __m256& r0, __m256& r1, __m256& r2, __m256& r3,
     __m256& r4, __m256& r5, __m256& r6, __m256& r7
diff --git a/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_BaseTransform_x86_AVX512.h b/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_BaseTransform_x86_AVX512.h
new file mode 100644
index 0000000000..a9c6cd1fa9
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_BaseTransform_x86_AVX512.h
@@ -0,0 +1,290 @@
+/*  ABS FFT Base Transform (x86 AVX512)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Kernels_AbsFFT_BaseTransform_x86_AVX512_H
+#define PokemonAutomation_Kernels_AbsFFT_BaseTransform_x86_AVX512_H
+
+//#include "Kernels/Kernels_x64_AVX512.h"
+#include "Kernels_AbsFFT_Arch_x86_AVX512.h"
+#include "Kernels_AbsFFT_Butterflies.h"
+#include "Kernels_AbsFFT_ComplexVector.h"
+
+namespace PokemonAutomation{
+namespace Kernels{
+namespace AbsFFT{
+
+
+PA_FORCE_INLINE void vtranspose(
+    __m512& r00, __m512& r01, __m512& r02, __m512& r03,
+    __m512& r04, __m512& r05, __m512& r06, __m512& r07,
+    __m512& r08, __m512& r09, __m512& r10, __m512& r11,
+    __m512& r12, __m512& r13, __m512& r14, __m512& r15
+){
+    __m512 s00, s01, s02, s03, s04, s05, s06, s07, s08, s09, s10, s11, s12, s13, s14, s15;
+
+    s00 = _mm512_unpacklo_ps(r00, r01);
+    s01 = _mm512_unpackhi_ps(r00, r01);
+    s02 = _mm512_unpacklo_ps(r02, r03);
+    s03 = _mm512_unpackhi_ps(r02, r03);
+    s04 = _mm512_unpacklo_ps(r04, r05);
+    s05 = _mm512_unpackhi_ps(r04, r05);
+    s06 = _mm512_unpacklo_ps(r06, r07);
+    s07 = _mm512_unpackhi_ps(r06, r07);
+    s08 = _mm512_unpacklo_ps(r08, r09);
+    s09 = _mm512_unpackhi_ps(r08, r09);
+    s10 = _mm512_unpacklo_ps(r10, r11);
+    s11 = _mm512_unpackhi_ps(r10, r11);
+    s12 = _mm512_unpacklo_ps(r12, r13);
+    s13 = _mm512_unpackhi_ps(r12, r13);
+    s14 = _mm512_unpacklo_ps(r14, r15);
+    s15 = _mm512_unpackhi_ps(r14, r15);
+
+    r00 = _mm512_shuffle_ps(s00, s02, 68);
+    r01 = _mm512_shuffle_ps(s00, s02, 238);
+    r02 = _mm512_shuffle_ps(s01, s03, 68);
+    r03 = _mm512_shuffle_ps(s01, s03, 238);
+    r04 = _mm512_shuffle_ps(s04, s06, 68);
+    r05 = _mm512_shuffle_ps(s04, s06, 238);
+    r06 = _mm512_shuffle_ps(s05, s07, 68);
+    r07 = _mm512_shuffle_ps(s05, s07, 238);
+    r08 = _mm512_shuffle_ps(s08, s10, 68);
+    r09 = _mm512_shuffle_ps(s08, s10, 238);
+    r10 = _mm512_shuffle_ps(s09, s11, 68);
+    r11 = _mm512_shuffle_ps(s09, s11, 238);
+    r12 = _mm512_shuffle_ps(s12, s14, 68);
+    r13 = _mm512_shuffle_ps(s12, s14, 238);
+    r14 = _mm512_shuffle_ps(s13, s15, 68);
+    r15 = _mm512_shuffle_ps(s13, s15, 238);
+
+    s00 = _mm512_shuffle_f32x4(r00, r04, 136);
+    s01 = _mm512_shuffle_f32x4(r01, r05, 136);
+    s02 = _mm512_shuffle_f32x4(r00, r04, 221);
+    s03 = _mm512_shuffle_f32x4(r01, r05, 221);
+    s04 = _mm512_shuffle_f32x4(r02, r06, 136);
+    s05 = _mm512_shuffle_f32x4(r03, r07, 136);
+    s06 = _mm512_shuffle_f32x4(r02, r06, 221);
+    s07 = _mm512_shuffle_f32x4(r03, r07, 221);
+    s08 = _mm512_shuffle_f32x4(r08, r12, 136);
+    s09 = _mm512_shuffle_f32x4(r09, r13, 136);
+    s10 = _mm512_shuffle_f32x4(r08, r12, 221);
+    s11 = _mm512_shuffle_f32x4(r09, r13, 221);
+    s12 = _mm512_shuffle_f32x4(r10, r14, 136);
+    s13 = _mm512_shuffle_f32x4(r11, r15, 136);
+    s14 = _mm512_shuffle_f32x4(r10, r14, 221);
+    s15 = _mm512_shuffle_f32x4(r11, r15, 221);
+
+    r00 = _mm512_shuffle_f32x4(s00, s08, 136);
+    r01 = _mm512_shuffle_f32x4(s01, s09, 136);
+    r02 = _mm512_shuffle_f32x4(s04, s12, 136);
+    r03 = _mm512_shuffle_f32x4(s05, s13, 136);
+    r04 = _mm512_shuffle_f32x4(s02, s10, 136);
+    r05 = _mm512_shuffle_f32x4(s03, s11, 136);
+    r06 = _mm512_shuffle_f32x4(s06, s14, 136);
+    r07 = _mm512_shuffle_f32x4(s07, s15, 136);
+    r08 = _mm512_shuffle_f32x4(s00, s08, 221);
+    r09 = _mm512_shuffle_f32x4(s01, s09, 221);
+    r10 = _mm512_shuffle_f32x4(s04, s12, 221);
+    r11 = _mm512_shuffle_f32x4(s05, s13, 221);
+    r12 = _mm512_shuffle_f32x4(s02, s10, 221);
+    r13 = _mm512_shuffle_f32x4(s03, s11, 221);
+    r14 = _mm512_shuffle_f32x4(s06, s14, 221);
+    r15 = _mm512_shuffle_f32x4(s07, s15, 221);
+}
+
+
+template <>
+void base_transform<Context_x86_AVX512>(const TwiddleTable<Context_x86_AVX512>& table, Context_x86_AVX512::vtype* T){
+    __m512 r00, r01, r02, r03, r04, r05, r06, r07, r08, r09, r10, r11, r12, r13, r14, r15;
+    __m512 i00, i01, i02, i03, i04, i05, i06, i07, i08, i09, i10, i11, i12, i13, i14, i15;
+
+    r00 = T[ 0];
+    i00 = T[ 1];
+    r01 = T[ 2];
+    i01 = T[ 3];
+    r02 = T[ 4];
+    i02 = T[ 5];
+    r03 = T[ 6];
+    i03 = T[ 7];
+    r04 = T[ 8];
+    i04 = T[ 9];
+    r05 = T[10];
+    i05 = T[11];
+    r06 = T[12];
+    i06 = T[13];
+    r07 = T[14];
+    i07 = T[15];
+    r08 = T[16];
+    i08 = T[17];
+    r09 = T[18];
+    i09 = T[19];
+    r10 = T[20];
+    i10 = T[21];
+    r11 = T[22];
+    i11 = T[23];
+    r12 = T[24];
+    i12 = T[25];
+    r13 = T[26];
+    i13 = T[27];
+    r14 = T[28];
+    i14 = T[29];
+    r15 = T[30];
+    i15 = T[31];
+
+
+    {
+        const vcomplex<Context_x86_AVX512>* w1 = table[7].w1.data();
+        const vcomplex<Context_x86_AVX512>* w2 = table[8].w1.data();
+        const vcomplex<Context_x86_AVX512>* w3 = table[8].w3.data();
+        Butterflies<Context_x86_AVX512>::butterfly4(
+            r00, i00,
+            r04, i04, w1[0].r, w1[0].i,
+            r08, i08, w2[0].r, w2[0].i,
+            r12, i12, w3[0].r, w3[0].i
+        );
+        Butterflies<Context_x86_AVX512>::butterfly4(
+            r01, i01,
+            r05, i05, w1[1].r, w1[1].i,
+            r09, i09, w2[1].r, w2[1].i,
+            r13, i13, w3[1].r, w3[1].i
+        );
+        Butterflies<Context_x86_AVX512>::butterfly4(
+            r02, i02,
+            r06, i06, w1[2].r, w1[2].i,
+            r10, i10, w2[2].r, w2[2].i,
+            r14, i14, w3[2].r, w3[2].i
+        );
+        Butterflies<Context_x86_AVX512>::butterfly4(
+            r03, i03,
+            r07, i07, w1[3].r, w1[3].i,
+            r11, i11, w2[3].r, w2[3].i,
+            r15, i15, w3[3].r, w3[3].i
+        );
+    }
+    {
+        const vcomplex<Context_x86_AVX512>* w1 = table[5].w1.data();
+        const vcomplex<Context_x86_AVX512>* w2 = table[6].w1.data();
+        const vcomplex<Context_x86_AVX512>* w3 = table[6].w3.data();
+        Butterflies<Context_x86_AVX512>::butterfly4(
+            r00, i00,
+            r01, i01, w1[0].r, w1[0].i,
+            r02, i02, w2[0].r, w2[0].i,
+            r03, i03, w3[0].r, w3[0].i
+        );
+        Butterflies<Context_x86_AVX512>::butterfly4(
+            r04, i04,
+            r05, i05, w1[0].r, w1[0].i,
+            r06, i06, w2[0].r, w2[0].i,
+            r07, i07, w3[0].r, w3[0].i
+        );
+        Butterflies<Context_x86_AVX512>::butterfly4(
+            r08, i08,
+            r09, i09, w1[0].r, w1[0].i,
+            r10, i10, w2[0].r, w2[0].i,
+            r11, i11, w3[0].r, w3[0].i
+        );
+        Butterflies<Context_x86_AVX512>::butterfly4(
+            r12, i12,
+            r13, i13, w1[0].r, w1[0].i,
+            r14, i14, w2[0].r, w2[0].i,
+            r15, i15, w3[0].r, w3[0].i
+        );
+    }
+
+    vtranspose(r00, r01, r02, r03, r04, r05, r06, r07, r08, r09, r10, r11, r12, r13, r14, r15);
+    vtranspose(i00, i01, i02, i03, i04, i05, i06, i07, i08, i09, i10, i11, i12, i13, i14, i15);
+
+    Butterflies<Context_x86_AVX512>::butterfly4(
+        r00, i00,
+        r04, i04,
+        r08, i08,
+        r12, i12
+    );
+    Butterflies<Context_x86_AVX512>::butterfly4(
+        r01, i01,
+        r05, i05, Context_x86_AVX512::vset1(TW8_1), Context_x86_AVX512::vset1(TW8_1),
+        r09, i09, Context_x86_AVX512::vset1(TW16_1), Context_x86_AVX512::vset1(TW16_3),
+        r13, i13, Context_x86_AVX512::vset1(TW16_3), Context_x86_AVX512::vset1(TW16_1)
+    );
+    Butterflies<Context_x86_AVX512>::butterfly4(
+        r02, i02,
+        r06, i06, Context_x86_AVX512::vset1(0), Context_x86_AVX512::vset1(1),
+        r10, i10, Context_x86_AVX512::vset1(TW8_1), Context_x86_AVX512::vset1(TW8_1),
+        r14, i14, Context_x86_AVX512::vset1(-TW8_1), Context_x86_AVX512::vset1(TW8_1)
+    );
+    Butterflies<Context_x86_AVX512>::butterfly4(
+        r03, i03,
+        r07, i07, Context_x86_AVX512::vset1(-TW8_1), Context_x86_AVX512::vset1(TW8_1),
+        r11, i11, Context_x86_AVX512::vset1(TW16_3), Context_x86_AVX512::vset1(TW16_1),
+        r15, i15, Context_x86_AVX512::vset1(-TW16_1), Context_x86_AVX512::vset1(-TW16_3)
+    );
+
+    Butterflies<Context_x86_AVX512>::butterfly4(
+        r00, i00,
+        r01, i01,
+        r02, i02,
+        r03, i03
+    );
+    Butterflies<Context_x86_AVX512>::butterfly4(
+        r04, i04,
+        r05, i05,
+        r06, i06,
+        r07, i07
+    );
+    Butterflies<Context_x86_AVX512>::butterfly4(
+        r08, i08,
+        r09, i09,
+        r10, i10,
+        r11, i11
+    );
+    Butterflies<Context_x86_AVX512>::butterfly4(
+        r12, i12,
+        r13, i13,
+        r14, i14,
+        r15, i15
+    );
+
+    vtranspose(r00, r01, r02, r03, r04, r05, r06, r07, r08, r09, r10, r11, r12, r13, r14, r15);
+    T[ 0] = r00;
+    T[ 2] = r01;
+    T[ 4] = r02;
+    T[ 6] = r03;
+    T[ 8] = r04;
+    T[10] = r05;
+    T[12] = r06;
+    T[14] = r07;
+    T[16] = r08;
+    T[18] = r09;
+    T[20] = r10;
+    T[22] = r11;
+    T[24] = r12;
+    T[26] = r13;
+    T[28] = r14;
+    T[30] = r15;
+    vtranspose(i00, i01, i02, i03, i04, i05, i06, i07, i08, i09, i10, i11, i12, i13, i14, i15);
+    T[ 1] = i00;
+    T[ 3] = i01;
+    T[ 5] = i02;
+    T[ 7] = i03;
+    T[ 9] = i04;
+    T[11] = i05;
+    T[13] = i06;
+    T[15] = i07;
+    T[17] = i08;
+    T[19] = i09;
+    T[21] = i10;
+    T[23] = i11;
+    T[25] = i12;
+    T[27] = i13;
+    T[29] = i14;
+    T[31] = i15;
+}
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_BaseTransform_x86_SSE41.h b/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_BaseTransform_x86_SSE41.h
index 8ba6d3c8ec..a5122e58a5 100644
--- a/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_BaseTransform_x86_SSE41.h
+++ b/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_BaseTransform_x86_SSE41.h
@@ -1,6 +1,6 @@
 /*  ABS FFT Base Transform (x86 SSE4.1)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -15,6 +15,7 @@ namespace PokemonAutomation{
 namespace Kernels{
 namespace AbsFFT{
 
+
 PA_FORCE_INLINE void vtranspose(__m128& r0, __m128& r1, __m128& r2, __m128& r3){
     __m128 a0, a1, a2, a3;
     a0 = _mm_unpacklo_ps(r0, r1);
diff --git a/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_BitReverse.h b/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_BitReverse.h
index bd16e7b579..7232e57948 100644
--- a/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_BitReverse.h
+++ b/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_BitReverse.h
@@ -1,6 +1,6 @@
 /*  ABS FFT Bit Reverse
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -153,7 +153,7 @@ static void bitreverse_u64_np(int len_k, uint64_t* out, uint64_t* in){
         out[0] = r0;
         out[1] = r2;
         out[2] = r1;
-        out[0] = r3;
+        out[3] = r3;
         return;
     }
     if (len_k == 3){
diff --git a/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_Butterflies.h b/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_Butterflies.h
index b8b832139a..dc602b9ef1 100644
--- a/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_Butterflies.h
+++ b/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_Butterflies.h
@@ -1,6 +1,6 @@
 /*  ABS FFT Butterflies
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_ComplexScalar.h b/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_ComplexScalar.h
index 1015cf4f0e..a37cbab96d 100644
--- a/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_ComplexScalar.h
+++ b/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_ComplexScalar.h
@@ -1,6 +1,6 @@
 /*  ABS FFT Complex Scalar
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_ComplexToAbs.h b/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_ComplexToAbs.h
index a413573040..97c499032e 100644
--- a/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_ComplexToAbs.h
+++ b/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_ComplexToAbs.h
@@ -1,6 +1,6 @@
 /*  ABS FFT Complex to Abs
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_ComplexVector.h b/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_ComplexVector.h
index ccd95d3ac9..0b9c7e696b 100644
--- a/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_ComplexVector.h
+++ b/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_ComplexVector.h
@@ -1,6 +1,6 @@
 /*  ABS FFT Complex Transform (Vector)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_Core_Default.cpp b/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_Core_Default.cpp
index 73f16d8963..917e2fe5d8 100644
--- a/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_Core_Default.cpp
+++ b/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_Core_Default.cpp
@@ -1,6 +1,6 @@
 /*  ABS FFT (Default)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -25,10 +25,14 @@ TwiddleTable<Context_Default>& global_table_Default(){
     static TwiddleTable<Context_Default> table(14);
     return table;
 }
-void fft_abs_Default(int k, float* abs, float* real){
+void fft_abs_Default(int k, float* abs, float* real, const float* weights){
     TwiddleTable<Context_Default>& table = global_table_Default();
     table.ensure(k);
-    fft_abs(table, k, abs, real);
+    if (weights == nullptr){
+        fft_abs<Context_Default, false>(table, k, abs, real, nullptr);
+    }else{
+        fft_abs<Context_Default, true>(table, k, abs, real, weights);
+    }
 }
 
 
diff --git a/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_Core_arm64_NEON.cpp b/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_Core_arm64_NEON.cpp
new file mode 100644
index 0000000000..0102f8776d
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_Core_arm64_NEON.cpp
@@ -0,0 +1,63 @@
+/*  ABS FFT (arm64 NEON)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifdef PA_AutoDispatch_arm64_20_M1
+
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "Kernels_AbsFFT_Arch_arm64_NEON.h"
+#include "Kernels_AbsFFT_BaseTransform_arm64_NEON.h"
+#include "Kernels_AbsFFT_TwiddleTable.tpp"
+#include "Kernels_AbsFFT_FullTransform.tpp"
+#include "Kernels_AbsFFT_TestInfra.h"
+
+namespace PokemonAutomation{
+namespace Kernels{
+namespace AbsFFT{
+
+
+
+TwiddleTable<Context_arm64_NEON>& global_table_arm64_NEON(){
+    static TwiddleTable<Context_arm64_NEON> table(14);
+    return table;
+}
+void fft_abs_arm64_NEON(int k, float* abs, float* real, const float* weights){
+    TwiddleTable<Context_arm64_NEON>& table = global_table_arm64_NEON();
+    table.ensure(k);
+    if (weights == nullptr){
+        fft_abs<Context_arm64_NEON, false>(table, k, abs, real, nullptr);
+    }else{
+        fft_abs<Context_arm64_NEON, true>(table, k, abs, real, weights);
+    }
+}
+
+
+
+void fft_abs_Default(int k, float* abs, float* real, const float* weights);
+
+class Test_arm64_NEON : public Test{
+public:
+    Test_arm64_NEON(int k, bool use_weights)
+        : Test(
+            "arm64_NEON",
+            k, use_weights,
+            fft_abs_Default,
+            fft_abs_arm64_NEON
+        )
+    {}
+};
+void add_tests_arm64_NEON(UnitTestDatabase& database){
+    for (int k = 1; k <= 16; k++){
+        database.add<Test_arm64_NEON>(k, false);
+        database.add<Test_arm64_NEON>(k, true);
+    }
+}
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_Core_x86_AVX2.cpp b/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_Core_x86_AVX2.cpp
index 420703430f..e124229559 100644
--- a/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_Core_x86_AVX2.cpp
+++ b/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_Core_x86_AVX2.cpp
@@ -1,15 +1,17 @@
 /*  ABS FFT (x86 AVX2)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifdef PA_AutoDispatch_x64_13_Haswell
 
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
 #include "Kernels_AbsFFT_Arch_x86_AVX2.h"
 #include "Kernels_AbsFFT_BaseTransform_x86_AVX2.h"
 #include "Kernels_AbsFFT_TwiddleTable.tpp"
 #include "Kernels_AbsFFT_FullTransform.tpp"
+#include "Kernels_AbsFFT_TestInfra.h"
 
 namespace PokemonAutomation{
 namespace Kernels{
@@ -21,10 +23,36 @@ TwiddleTable<Context_x86_AVX2>& global_table_x86_AVX2(){
     static TwiddleTable<Context_x86_AVX2> table(14);
     return table;
 }
-void fft_abs_x86_AVX2(int k, float* abs, float* real){
+void fft_abs_x86_AVX2(int k, float* abs, float* real, const float* weights){
     TwiddleTable<Context_x86_AVX2>& table = global_table_x86_AVX2();
     table.ensure(k);
-    fft_abs(table, k, abs, real);
+    if (weights == nullptr){
+        fft_abs<Context_x86_AVX2, false>(table, k, abs, real, nullptr);
+    }else{
+        fft_abs<Context_x86_AVX2, true>(table, k, abs, real, weights);
+    }
+}
+
+
+
+void fft_abs_Default(int k, float* abs, float* real, const float* weights);
+
+class Test_x86_AVX2 : public Test{
+public:
+    Test_x86_AVX2(int k, bool use_weights)
+        : Test(
+            "x86_AVX2",
+            k, use_weights,
+            fft_abs_Default,
+            fft_abs_x86_AVX2
+        )
+    {}
+};
+void add_tests_x86_AVX2(UnitTestDatabase& database){
+    for (int k = 1; k <= 16; k++){
+        database.add<Test_x86_AVX2>(k, false);
+        database.add<Test_x86_AVX2>(k, true);
+    }
 }
 
 
diff --git a/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_Core_x86_AVX512.cpp b/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_Core_x86_AVX512.cpp
new file mode 100644
index 0000000000..98ab6cca3d
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_Core_x86_AVX512.cpp
@@ -0,0 +1,63 @@
+/*  ABS FFT (x86 AVX512)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifdef PA_AutoDispatch_x64_17_Skylake
+
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "Kernels_AbsFFT_Arch_x86_AVX512.h"
+#include "Kernels_AbsFFT_BaseTransform_x86_AVX512.h"
+#include "Kernels_AbsFFT_TwiddleTable.tpp"
+#include "Kernels_AbsFFT_FullTransform.tpp"
+#include "Kernels_AbsFFT_TestInfra.h"
+
+namespace PokemonAutomation{
+namespace Kernels{
+namespace AbsFFT{
+
+
+
+TwiddleTable<Context_x86_AVX512>& global_table_x86_AVX512(){
+    static TwiddleTable<Context_x86_AVX512> table(14);
+    return table;
+}
+void fft_abs_x86_AVX512(int k, float* abs, float* real, const float* weights){
+    TwiddleTable<Context_x86_AVX512>& table = global_table_x86_AVX512();
+    table.ensure(k);
+    if (weights == nullptr){
+        fft_abs<Context_x86_AVX512, false>(table, k, abs, real, nullptr);
+    }else{
+        fft_abs<Context_x86_AVX512, true>(table, k, abs, real, weights);
+    }
+}
+
+
+
+void fft_abs_Default(int k, float* abs, float* real, const float* weights);
+
+class Test_x86_AVX512 : public Test{
+public:
+    Test_x86_AVX512(int k, bool use_weights)
+        : Test(
+            "x86_AVX512",
+            k, use_weights,
+            fft_abs_Default,
+            fft_abs_x86_AVX512
+        )
+    {}
+};
+void add_tests_x86_AVX512(UnitTestDatabase& database){
+    for (int k = 1; k <= 16; k++){
+        database.add<Test_x86_AVX512>(k, false);
+        database.add<Test_x86_AVX512>(k, true);
+    }
+}
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_Core_x86_SSE41.cpp b/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_Core_x86_SSE41.cpp
index d9071555c9..bd690740cb 100644
--- a/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_Core_x86_SSE41.cpp
+++ b/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_Core_x86_SSE41.cpp
@@ -1,15 +1,17 @@
 /*  ABS FFT (x86 SSE4.1)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifdef PA_AutoDispatch_x64_08_Nehalem
 
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
 #include "Kernels_AbsFFT_Arch_x86_SSE41.h"
 #include "Kernels_AbsFFT_BaseTransform_x86_SSE41.h"
 #include "Kernels_AbsFFT_TwiddleTable.tpp"
 #include "Kernels_AbsFFT_FullTransform.tpp"
+#include "Kernels_AbsFFT_TestInfra.h"
 
 namespace PokemonAutomation{
 namespace Kernels{
@@ -21,10 +23,36 @@ TwiddleTable<Context_x86_SSE41>& global_table_x86_SSE41(){
     static TwiddleTable<Context_x86_SSE41> table(14);
     return table;
 }
-void fft_abs_x86_SSE41(int k, float* abs, float* real){
+void fft_abs_x86_SSE41(int k, float* abs, float* real, const float* weights){
     TwiddleTable<Context_x86_SSE41>& table = global_table_x86_SSE41();
     table.ensure(k);
-    fft_abs(table, k, abs, real);
+    if (weights == nullptr){
+        fft_abs<Context_x86_SSE41, false>(table, k, abs, real, nullptr);
+    }else{
+        fft_abs<Context_x86_SSE41, true>(table, k, abs, real, weights);
+    }
+}
+
+
+
+void fft_abs_Default(int k, float* abs, float* real, const float* weights);
+
+class Test_x86_SSE41 : public Test{
+public:
+    Test_x86_SSE41(int k, bool use_weights)
+        : Test(
+            "x86_SSE41",
+            k, use_weights,
+            fft_abs_Default,
+            fft_abs_x86_SSE41
+        )
+    {}
+};
+void add_tests_x86_SSE41(UnitTestDatabase& database){
+    for (int k = 1; k <= 16; k++){
+        database.add<Test_x86_SSE41>(k, false);
+        database.add<Test_x86_SSE41>(k, true);
+    }
 }
 
 
diff --git a/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_FullTransform.h b/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_FullTransform.h
index f15ed88272..d2fbfca3ec 100644
--- a/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_FullTransform.h
+++ b/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_FullTransform.h
@@ -1,6 +1,6 @@
 /*  ABS FFT Full Transform
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -15,10 +15,19 @@ namespace AbsFFT{
 
 
 template <typename Context>
-void fft_abs_scalar(const TwiddleTable<Context>& table, int k, float* abs, float* real);
-
-template <typename Context>
-void fft_abs(const TwiddleTable<Context>& table, int k, float* abs, float* real);
+void fft_abs_scalar(
+    const TwiddleTable<Context>& table, int k,
+    float* abs,
+    float* real
+);
+
+template <typename Context, bool use_weights>
+void fft_abs(
+    const TwiddleTable<Context>& table, int k,
+    float* abs,
+    float* real,
+    const float* weights
+);
 
 
 
diff --git a/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_FullTransform.tpp b/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_FullTransform.tpp
index 2ac81118fe..b333de632e 100644
--- a/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_FullTransform.tpp
+++ b/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_FullTransform.tpp
@@ -12,9 +12,9 @@
 #include "Kernels_AbsFFT_ComplexVector.h"
 #include "Kernels_AbsFFT_FullTransform.h"
 
-#include <iostream>
-using std::cout;
-using std::endl;
+//#include <iostream>
+//using std::cout;
+//using std::endl;
 
 namespace PokemonAutomation{
 namespace Kernels{
@@ -62,7 +62,11 @@ void fft_abs_k3(const TwiddleTable<Context>& table, float abs[4], float real[8])
 }
 
 template <typename Context>
-void fft_abs_scalar(const TwiddleTable<Context>& table, int k, float* abs, float* real){
+void fft_abs_scalar(
+    const TwiddleTable<Context>& table, int k,
+    float* abs,
+    float* real
+){
     if (k == 1){
         fft_abs_k1(abs, real);
         return;
@@ -97,11 +101,22 @@ void fft_abs_scalar(const TwiddleTable<Context>& table, int k, float* abs, float
 }
 
 
-template <typename Context>
-void fft_abs(const TwiddleTable<Context>& table, int k, float* abs, float* real){
+template <typename Context, bool use_weights>
+void fft_abs(
+    const TwiddleTable<Context>& table, int k,
+    float* abs,
+    float* real,
+    const float* weights
+){
     using vtype = typename Context::vtype;
 
     if (k - 2 < Context::BASE_COMPLEX_TRANSFORM_K){
+        if constexpr (use_weights){
+            size_t length = (size_t)1 << k;
+            for (size_t c = 0; c < length; c++){
+                real[c] *= weights[c];
+            }
+        }
         fft_abs_scalar<Context>(table, k, abs, real);
         return;
     }
@@ -109,7 +124,12 @@ void fft_abs(const TwiddleTable<Context>& table, int k, float* abs, float* real)
     size_t block = (size_t)1 << (k - 2);
 
     //  Initial split-radix reduction.
-    Reductions<Context>::fft_real_split_reduce(table, k, (vtype*)real, (vtype*)abs);
+    Reductions<Context>::template fft_real_split_reduce<use_weights>(
+        table, k,
+        (vtype*)real,
+        (vtype*)abs,
+        (const vtype*)weights
+    );
 
     //  Transform complex upper-half.
     fft_complex_tk(table, k - 2, (vtype*)abs);
@@ -122,7 +142,12 @@ void fft_abs(const TwiddleTable<Context>& table, int k, float* abs, float* real)
     );
 
     //  Recurse into lower-half.
-    fft_abs(table, k - 1, real + 2*block, real);
+    fft_abs<Context, false>(
+        table, k - 1,
+        real + 2*block,
+        real,
+        nullptr
+    );
 
     //  Fix ordering.
     real += 2*block;
diff --git a/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_Reductions.h b/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_Reductions.h
index 951a42f59a..ba94f55675 100644
--- a/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_Reductions.h
+++ b/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_Reductions.h
@@ -1,6 +1,6 @@
 /*  ABS FFT Reductions
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -19,13 +19,27 @@ struct Reductions{
 using vtype = typename Context::vtype;
 
 
-static PA_FORCE_INLINE void fft_real_split_reduce_scalar(const TwiddleTable<Context>& table, int k, float* real, float* upper_complex){
+template <bool has_weights = false>
+static PA_FORCE_INLINE void fft_real_split_reduce_scalar(
+    const TwiddleTable<Context>& table, int k,
+    float* real,
+    float* upper_complex,
+    const float* weights = nullptr
+){
     size_t stride = (size_t)1 << (k - 2);
     for (size_t c = 0; c < stride; c++){
         float r0 = real[c + 0*stride];
         float r1 = real[c + 1*stride];
         float r2 = real[c + 2*stride];
         float r3 = real[c + 3*stride];
+
+        if constexpr(has_weights){
+            r0 *= weights[c + 0*stride];
+            r1 *= weights[c + 1*stride];
+            r2 *= weights[c + 2*stride];
+            r3 *= weights[c + 3*stride];
+        }
+
         real[c + 0*stride] = r0 + r2;
         real[c + 1*stride] = r1 + r3;
 
@@ -44,12 +58,22 @@ static PA_FORCE_INLINE void fft_real_split_reduce_scalar(const TwiddleTable<Cont
     }
 }
 
-static PA_FORCE_INLINE void fft_real_split_reduce(const TwiddleTable<Context>& table, int k, vtype* real, vtype* upper_complex){
+template <bool has_weights = false>
+static PA_FORCE_INLINE void fft_real_split_reduce(
+    const TwiddleTable<Context>& table, int k,
+    vtype* real,
+    vtype* upper_complex,
+    const vtype* weights
+){
     size_t vstride = (size_t)1 << (k - 2 - Context::VECTOR_K);
     vtype* R0 = real;
     vtype* R1 = R0 + vstride;
     vtype* R2 = R1 + vstride;
     vtype* R3 = R2 + vstride;
+    const vtype* W0 = weights;
+    const vtype* W1 = W0 + vstride;
+    const vtype* W2 = W1 + vstride;
+    const vtype* W3 = W2 + vstride;
     const vcomplex<Context>* w = table[k].w1.data();
     size_t lc = vstride;
     do{
@@ -58,6 +82,13 @@ static PA_FORCE_INLINE void fft_real_split_reduce(const TwiddleTable<Context>& t
         vtype r2 = R2[0];
         vtype r3 = R3[0];
 
+        if constexpr(has_weights){
+            r0 = Context::vmul(r0, W0[0]);
+            r1 = Context::vmul(r1, W1[0]);
+            r2 = Context::vmul(r2, W2[0]);
+            r3 = Context::vmul(r3, W3[0]);
+        }
+
         R0[0] = Context::vadd(r0, r2);
         R1[0] = Context::vadd(r1, r3);
 
@@ -72,6 +103,12 @@ static PA_FORCE_INLINE void fft_real_split_reduce(const TwiddleTable<Context>& t
         R1++;
         R2++;
         R3++;
+        if constexpr(has_weights){
+            W0++;
+            W1++;
+            W2++;
+            W3++;
+        }
         upper_complex += 2;
         w++;
     }while (--lc);
diff --git a/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_TestInfra.cpp b/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_TestInfra.cpp
new file mode 100644
index 0000000000..3669498a01
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_TestInfra.cpp
@@ -0,0 +1,155 @@
+/*  ABS FFT Test Infra
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <bit>
+#include <cfloat>
+#include <cmath>
+#include <cstdint>
+#include <cstdio>
+#include <random>
+#include "Common/Compiler.h"
+#include "Common/Cpp/Containers/GuardPageBuffer.h"
+#include "Kernels_AbsFFT_TestInfra.h"
+
+namespace PokemonAutomation{
+namespace Kernels{
+namespace AbsFFT{
+
+
+
+//
+//  Tolerances for the ULP comparison.
+//
+//  Both implementations compute the same transform in 32-bit float, but the
+//  order of the additions and multiplications differs. The accumulated
+//  rounding error grows with the transform length, so for large transforms
+//  the two results can drift apart by a few thousand ULPs. These bounds were
+//  measured against an independent double-precision DFT at every supported
+//  length (the Default path alone stays within ~350 ULPs of the reference at
+//  k=16), with ample headroom for the sum of both implementations' drift.
+//
+//  Values that are close to zero are compared by absolute difference instead
+//  of ULP distance: the ULP of a tiny value is far smaller than the
+//  accumulated error of the transform, so a pure ULP bound would be
+//  unreasonably strict there. The absolute bound is scaled to the magnitude
+//  of the input data.
+//
+static constexpr uint32_t MAX_ULP_DIFF = 4096;
+static constexpr double ABS_TOLERANCE_ULPS = 4096.0;
+
+
+
+//
+//  Map the float bit pattern to a monotonically increasing uint32_t, so that
+//  the difference of two mapped values is the number of ULPs between the two
+//  floats. +0.0 and -0.0 map to the same coordinate.
+//
+static uint32_t ulp_coordinate(float value){
+    uint32_t bits = std::bit_cast<uint32_t>(value);
+    if (bits & 0x80000000u){
+        return 0u - bits;
+    }
+    return bits + 0x80000000u;
+}
+static uint32_t ulp_distance(float a, float b){
+    uint32_t ia = ulp_coordinate(a);
+    uint32_t ib = ulp_coordinate(b);
+    return ia >= ib ? ia - ib : ib - ia;
+}
+static bool outputs_match(float a, float b, double abs_tolerance){
+    if (!std::isfinite(a) || !std::isfinite(b)){
+        return false;
+    }
+    if (ulp_distance(a, b) <= MAX_ULP_DIFF){
+        return true;
+    }
+    return std::fabs((double)a - (double)b) <= abs_tolerance;
+}
+
+
+
+Test::Test(
+    const std::string& arch_str,
+    int k,
+    bool use_weights,
+    FFTAbs fft0,
+    FFTAbs fft1
+)
+    : UnitTest(
+        "Kernels::AbsFFT - " + arch_str +
+        "(k=" + std::to_string(k) + (use_weights ? ", weights)" : ")")
+    )
+    , m_k(k)
+    , m_use_weights(use_weights)
+    , m_fft0(fft0)
+    , m_fft1(fft1)
+{}
+
+UnitTestResult Test::run(Logger& logger, CancellableScope& scope) const{
+    size_t length = (size_t)1 << m_k;
+    size_t half_length = length >> 1;
+
+    //
+    //  Random input with a fixed seed. fft_abs() is destructive on "real",
+    //  so each run gets its own copy of the same data.
+    //
+    //  Every buffer ends right before a guard page, so a read or write past
+    //  the end faults on every run. "real" and "abs" must be aligned to 64
+    //  bytes. Their sizes are powers of two, so for all but the smallest
+    //  transforms they still end exactly at the guard page.
+    //
+    GuardPageBuffer<float> real0(length, PA_ALIGNMENT);
+    GuardPageBuffer<float> real1(length, PA_ALIGNMENT);
+    GuardPageBuffer<float> abs0(half_length, PA_ALIGNMENT);
+    GuardPageBuffer<float> abs1(half_length, PA_ALIGNMENT);
+    GuardPageBuffer<float> weights(length);
+
+    std::mt19937 generator(42);
+    std::uniform_int_distribution<int> sample_distribution(-10000, 10000);
+    std::uniform_int_distribution<int> weight_distribution(500, 1500);
+    double input_scale = 0.0;
+    for (size_t c = 0; c < length; c++){
+        float sample = (float)sample_distribution(generator) / 10000.0f;
+        float weight = (float)weight_distribution(generator) / 1000.0f;
+        real0[c] = sample;
+        real1[c] = sample;
+        weights[c] = weight;
+        input_scale = std::max(
+            input_scale,
+            std::fabs((double)sample * (m_use_weights ? (double)weight : 1.0))
+        );
+    }
+
+    const float* weights_ptr = m_use_weights ? weights.data() : nullptr;
+
+    m_fft0(m_k, abs0.data(), real0.data(), weights_ptr);
+    m_fft1(m_k, abs1.data(), real1.data(), weights_ptr);
+
+    //
+    //  The Default path is the source of truth; the ISA result is allowed to
+    //  drift by a small ULP error.
+    //
+    const double abs_tolerance = ABS_TOLERANCE_ULPS * FLT_EPSILON * input_scale;
+    for (size_t c = 0; c < half_length; c++){
+        if (!outputs_match(abs0[c], abs1[c], abs_tolerance)){
+            char value0[32];
+            char value1[32];
+            std::snprintf(value0, sizeof(value0), "%.9g", (double)abs0[c]);
+            std::snprintf(value1, sizeof(value1), "%.9g", (double)abs1[c]);
+            return "Mismatch at " + std::to_string(c) + " of " + std::to_string(half_length) +
+                ": " + value0 + " != " + value1 +
+                " (" + std::to_string(ulp_distance(abs0[c], abs1[c])) + " ULPs)";
+        }
+    }
+
+    return true;
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_TestInfra.h b/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_TestInfra.h
new file mode 100644
index 0000000000..02cbf36bb7
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_TestInfra.h
@@ -0,0 +1,62 @@
+/*  ABS FFT Test Infra
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Compiler.h"
+#include "Common/Cpp/TestRunners/UnitTest.h"
+
+#ifndef PokemonAutomation_Kernels_AbsFFT_TestInfra_H
+#define PokemonAutomation_Kernels_AbsFFT_TestInfra_H
+
+namespace PokemonAutomation{
+namespace Kernels{
+namespace AbsFFT{
+
+
+
+//
+//  Signature of fft_abs_Default(), fft_abs_x86_SSE41(), etc.
+//
+using FFTAbs = void (*)(int k, float* abs, float* real, const float* weights);
+
+
+
+//
+//  Runs the transform twice on identical random input data, once with
+//  fft_abs_Default() and once with an ISA-specific implementation, and
+//  compares the two outputs in ULP space. The Default path is the source of
+//  truth: an ISA result may differ by a few ULPs since the implementations
+//  order their floating-point operations differently.
+//
+//  Warning, this file is compiled in multiple ISA contexts.
+//  We cannot define the functions here since they will be compiled differently.
+//  If a higher (AVX512) version wins out in the linker, all versions will use
+//  it and crash on older CPUs.
+//
+class Test : public UnitTest{
+public:
+    Test(
+        const std::string& arch_str,
+        int k,
+        bool use_weights,
+        FFTAbs fft0,
+        FFTAbs fft1
+    );
+
+    virtual UnitTestResult run(Logger& logger, CancellableScope& scope) const override;
+
+private:
+    int m_k;
+    bool m_use_weights;
+    FFTAbs m_fft0;
+    FFTAbs m_fft1;
+};
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_TwiddleTable.h b/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_TwiddleTable.h
index a9f9b55b25..064bb98370 100644
--- a/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_TwiddleTable.h
+++ b/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_TwiddleTable.h
@@ -1,6 +1,6 @@
 /*  ABS FFT Twiddle Table
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -35,7 +35,9 @@ class TwiddleTable{
     ~TwiddleTable();
     TwiddleTable(int initial_size = 14);
 
-    const PerSizeTables<Context>& operator[](int k) const;
+    PA_FORCE_INLINE const PerSizeTables<Context>& operator[](int k) const{
+        return m_tables[k];
+    }
     void ensure(int k);
 
 private:
diff --git a/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_TwiddleTable.tpp b/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_TwiddleTable.tpp
index 291bb77985..533e047486 100644
--- a/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_TwiddleTable.tpp
+++ b/SerialPrograms/Source/Kernels/AbsFFT/Kernels_AbsFFT_TwiddleTable.tpp
@@ -50,6 +50,7 @@ TwiddleTable<Context>::TwiddleTable(int initial_size)
     expand(initial_size);
 }
 
+#if 0
 template <typename Context>
 const PerSizeTables<Context>& TwiddleTable<Context>::operator[](int k) const{
     int size_k = m_size_k.load(std::memory_order_acquire);
@@ -58,6 +59,7 @@ const PerSizeTables<Context>& TwiddleTable<Context>::operator[](int k) const{
     }
     return m_tables[k];
 }
+#endif
 
 template <typename Context>
 void TwiddleTable<Context>::ensure(int k){
@@ -69,7 +71,7 @@ void TwiddleTable<Context>::ensure(int k){
 }
 template <typename Context>
 void TwiddleTable<Context>::expand(int k){
-    SpinLockGuard lg(m_resize_lock);
+    WriteSpinLock lg(m_resize_lock);
     int size_k = m_size_k.load(std::memory_order_acquire);
     if (size_k >= k){
         return;
diff --git a/SerialPrograms/Source/Kernels/Algorithm/Kernels_Algorithm_DisjointSet.cpp b/SerialPrograms/Source/Kernels/Algorithm/Kernels_Algorithm_DisjointSet.cpp
index a2d7e99af7..cc586330bf 100644
--- a/SerialPrograms/Source/Kernels/Algorithm/Kernels_Algorithm_DisjointSet.cpp
+++ b/SerialPrograms/Source/Kernels/Algorithm/Kernels_Algorithm_DisjointSet.cpp
@@ -1,10 +1,8 @@
 /*  Disjoint Set
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
-
-#include <vector>
 #include <numeric>
 
 #include "Kernels_Algorithm_DisjointSet.h"
@@ -12,7 +10,7 @@
 namespace PokemonAutomation{
 namespace Kernels{
 
-DisjointSet::DisjointSet(size_t size) : m_parent(size), m_size(size, 1) {
+DisjointSet::DisjointSet(size_t size) : m_parent(size), m_size(size, 1){
     std::iota(m_parent.begin(), m_parent.end(), 0);
 }
 
diff --git a/SerialPrograms/Source/Kernels/Algorithm/Kernels_Algorithm_DisjointSet.h b/SerialPrograms/Source/Kernels/Algorithm/Kernels_Algorithm_DisjointSet.h
index a0dfe85ddd..604e3725a2 100644
--- a/SerialPrograms/Source/Kernels/Algorithm/Kernels_Algorithm_DisjointSet.h
+++ b/SerialPrograms/Source/Kernels/Algorithm/Kernels_Algorithm_DisjointSet.h
@@ -1,6 +1,6 @@
 /*  Disjoint Set
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/Kernels/AudioChannelInterleave/Kernels_AudioChannelInterleave.cpp b/SerialPrograms/Source/Kernels/AudioChannelInterleave/Kernels_AudioChannelInterleave.cpp
new file mode 100644
index 0000000000..2a546c3eff
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/AudioChannelInterleave/Kernels_AudioChannelInterleave.cpp
@@ -0,0 +1,169 @@
+/*  Audio Channel Interleave
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/CpuId/CpuId.h"
+#include "Kernels_AudioChannelInterleave.h"
+
+#include "Kernels_AudioChannelInterleave_Default.h"
+
+namespace PokemonAutomation{
+namespace Kernels{
+namespace AudioChannelInterleave{
+
+
+
+void channel_deinterleave_x64_AVX2(
+    size_t channels, size_t samples,
+    size_t stride, r_ptr<float> strided_stream,
+    c_ptr<float> interleaved_stream
+);
+void channel_interleave_x64_AVX2(
+    size_t channels, size_t samples,
+    size_t stride, c_ptr<float> strided_stream,
+    r_ptr<float> interleaved_stream
+);
+void add_tests_x64_AVX2(UnitTestDatabase& database);
+
+
+void channel_deinterleave_x64_AVX512(
+    size_t channels, size_t samples,
+    size_t stride, r_ptr<float> strided_stream,
+    c_ptr<float> interleaved_stream
+);
+void channel_interleave_x64_AVX512(
+    size_t channels, size_t samples,
+    size_t stride, c_ptr<float> strided_stream,
+    r_ptr<float> interleaved_stream
+);
+void add_tests_x64_AVX512(UnitTestDatabase& database);
+
+
+void channel_deinterleave_x64_SSE(
+    size_t channels, size_t samples,
+    size_t stride, r_ptr<float> strided_stream,
+    c_ptr<float> interleaved_stream
+);
+void channel_interleave_x64_SSE(
+    size_t channels, size_t samples,
+    size_t stride, c_ptr<float> strided_stream,
+    r_ptr<float> interleaved_stream
+);
+void add_tests_x64_SSE(UnitTestDatabase& database);
+
+
+void channel_deinterleave_ARM64_NEON(
+    size_t channels, size_t samples,
+    size_t stride, r_ptr<float> strided_stream,
+    c_ptr<float> interleaved_stream
+);
+void channel_interleave_ARM64_NEON(
+    size_t channels, size_t samples,
+    size_t stride, c_ptr<float> strided_stream,
+    r_ptr<float> interleaved_stream
+);
+void add_tests_ARM64_NEON(UnitTestDatabase& database);
+
+
+
+
+void channel_deinterleave(
+    size_t channels, size_t samples,
+    size_t stride, r_ptr<float> strided_stream,
+    c_ptr<float> interleaved_stream
+){
+#ifdef PA_AutoDispatch_x64_17_Skylake
+    if (CPU_CAPABILITY_CURRENT.OK_17_Skylake){
+        channel_deinterleave_x64_AVX512(channels, samples, stride, strided_stream, interleaved_stream);
+        return;
+    }
+#endif
+#ifdef PA_AutoDispatch_x64_13_Haswell
+    if (CPU_CAPABILITY_CURRENT.OK_13_Haswell){
+        channel_deinterleave_x64_AVX2(channels, samples, stride, strided_stream, interleaved_stream);
+        return;
+    }
+#endif
+#ifdef PA_AutoDispatch_x64_08_Nehalem
+    if (CPU_CAPABILITY_CURRENT.OK_08_Nehalem){
+        channel_deinterleave_x64_SSE(channels, samples, stride, strided_stream, interleaved_stream);
+        return;
+    }
+#endif
+#ifdef PA_AutoDispatch_arm64_20_M1
+    if (CPU_CAPABILITY_CURRENT.OK_M1){
+        channel_deinterleave_ARM64_NEON(channels, samples, stride, strided_stream, interleaved_stream);
+        return;
+    }
+#endif
+
+    channel_deinterleave_Default(channels, samples, stride, strided_stream, interleaved_stream);
+    return;
+}
+void channel_interleave(
+    size_t channels, size_t samples,
+    size_t stride, c_ptr<float> strided_stream,
+    r_ptr<float> interleaved_stream
+){
+#ifdef PA_AutoDispatch_x64_17_Skylake
+    if (CPU_CAPABILITY_CURRENT.OK_17_Skylake){
+        channel_interleave_x64_AVX512(channels, samples, stride, strided_stream, interleaved_stream);
+        return;
+    }
+#endif
+#ifdef PA_AutoDispatch_x64_13_Haswell
+    if (CPU_CAPABILITY_CURRENT.OK_13_Haswell){
+        channel_interleave_x64_AVX2(channels, samples, stride, strided_stream, interleaved_stream);
+        return;
+    }
+#endif
+#ifdef PA_AutoDispatch_x64_08_Nehalem
+    if (CPU_CAPABILITY_CURRENT.OK_08_Nehalem){
+        channel_interleave_x64_SSE(channels, samples, stride, strided_stream, interleaved_stream);
+        return;
+    }
+#endif
+#ifdef PA_AutoDispatch_arm64_20_M1
+    if (CPU_CAPABILITY_CURRENT.OK_M1){
+        channel_interleave_ARM64_NEON(channels, samples, stride, strided_stream, interleaved_stream);
+        return;
+    }
+#endif
+
+    channel_interleave_Default(channels, samples, stride, strided_stream, interleaved_stream);
+    return;
+}
+
+
+
+void add_tests(UnitTestDatabase& database){
+    add_tests_Default(database);
+#ifdef PA_AutoDispatch_x64_08_Nehalem
+    if (CPU_CAPABILITY_CURRENT.OK_08_Nehalem){
+        add_tests_x64_SSE(database);
+    }
+#endif
+#ifdef PA_AutoDispatch_x64_13_Haswell
+    if (CPU_CAPABILITY_CURRENT.OK_13_Haswell){
+        add_tests_x64_AVX2(database);
+    }
+#endif
+#ifdef PA_AutoDispatch_x64_17_Skylake
+    if (CPU_CAPABILITY_CURRENT.OK_17_Skylake){
+        add_tests_x64_AVX512(database);
+    }
+#endif
+#ifdef PA_AutoDispatch_arm64_20_M1
+    if (CPU_CAPABILITY_CURRENT.OK_M1){
+        add_tests_ARM64_NEON(database);
+    }
+#endif
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/Kernels/AudioChannelInterleave/Kernels_AudioChannelInterleave.h b/SerialPrograms/Source/Kernels/AudioChannelInterleave/Kernels_AudioChannelInterleave.h
new file mode 100644
index 0000000000..b1d76e86f7
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/AudioChannelInterleave/Kernels_AudioChannelInterleave.h
@@ -0,0 +1,42 @@
+/*  Audio Channel Interleave
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Kernels_AudioChannelInterleave_H
+#define PokemonAutomation_Kernels_AudioChannelInterleave_H
+
+#include <cstddef>
+#include "Common/Compiler.h"
+
+namespace PokemonAutomation{
+
+class UnitTestDatabase;
+
+namespace Kernels{
+namespace AudioChannelInterleave{
+
+
+
+void channel_deinterleave(
+    size_t channels, size_t samples,
+    size_t stride, r_ptr<float> strided_stream,
+    c_ptr<float> interleaved_stream
+);
+void channel_interleave(
+    size_t channels, size_t samples,
+    size_t stride, c_ptr<float> strided_stream,
+    r_ptr<float> interleaved_stream
+);
+
+
+void add_tests(UnitTestDatabase& database);
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Kernels/AudioChannelInterleave/Kernels_AudioChannelInterleave_ARM64_NEON.cpp b/SerialPrograms/Source/Kernels/AudioChannelInterleave/Kernels_AudioChannelInterleave_ARM64_NEON.cpp
new file mode 100644
index 0000000000..7847193cdc
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/AudioChannelInterleave/Kernels_AudioChannelInterleave_ARM64_NEON.cpp
@@ -0,0 +1,160 @@
+/*  Audio Channel Interleave (ARM64 NEON)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifdef PA_AutoDispatch_arm64_20_M1
+
+#include <arm_neon.h>
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "Kernels_AudioChannelInterleave_TestInfra.h"
+#include "Kernels_AudioChannelInterleave_Default.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace Kernels{
+namespace AudioChannelInterleave{
+
+
+
+template <size_t channels>
+void channel_deinterleave_ARM64_NEON(
+    size_t samples,
+    size_t stride, r_ptr<float> strided_stream,
+    c_ptr<float> interleaved_stream
+);
+template <size_t channels>
+void channel_interleave_ARM64_NEON(
+    size_t samples,
+    size_t stride, c_ptr<float> strided_stream,
+    r_ptr<float> interleaved_stream
+);
+
+
+
+template <>
+void channel_deinterleave_ARM64_NEON<2>(
+    size_t samples,
+    size_t stride, r_ptr<float> strided_stream,
+    c_ptr<float> interleaved_stream
+){
+    //  Two 128-bit multi-structure loads deinterleave four samples at a
+    //  time: val[0] gets the even lanes (channel 0) and val[1] the odd
+    //  lanes (channel 1), so no explicit permutes are needed.
+    while (samples >= 4){
+        float32x4x2_t p = vld2q_f32(interleaved_stream);
+        vst1q_f32(strided_stream + 0*stride, p.val[0]);
+        vst1q_f32(strided_stream + 1*stride, p.val[1]);
+
+        strided_stream += 4;
+        interleaved_stream += 8;
+        samples -= 4;
+    }
+    if (samples > 0){
+        channel_deinterleave_Default(2, samples, stride, strided_stream, interleaved_stream);
+    }
+}
+template <>
+void channel_interleave_ARM64_NEON<2>(
+    size_t samples,
+    size_t stride, c_ptr<float> strided_stream,
+    r_ptr<float> interleaved_stream
+){
+    //  The inverse of the deinterleave: gather the two channels into a
+    //  multi-structure pair and store them interleaved.
+    while (samples >= 4){
+        float32x4x2_t p;
+        p.val[0] = vld1q_f32(strided_stream + 0*stride);
+        p.val[1] = vld1q_f32(strided_stream + 1*stride);
+        vst2q_f32(interleaved_stream, p);
+
+        strided_stream += 4;
+        interleaved_stream += 8;
+        samples -= 4;
+    }
+    if (samples > 0){
+        channel_interleave_Default(2, samples, stride, strided_stream, interleaved_stream);
+    }
+}
+
+
+
+
+void channel_deinterleave_ARM64_NEON(
+    size_t channels, size_t samples,
+    size_t stride, r_ptr<float> strided_stream,
+    c_ptr<float> interleaved_stream
+){
+    //  We pull out the common cases and force-inline them so the inner loop can
+    //  be unrolled.
+    switch (channels){
+    case 2:
+        channel_deinterleave_ARM64_NEON<2>(samples, stride, strided_stream, interleaved_stream);
+        break;
+    default:
+        channel_deinterleave_Default(channels, samples, stride, strided_stream, interleaved_stream);
+        break;
+    }
+}
+void channel_interleave_ARM64_NEON(
+    size_t channels, size_t samples,
+    size_t stride, c_ptr<float> strided_stream,
+    r_ptr<float> interleaved_stream
+){
+    //  We pull out the common cases and force-inline them so the inner loop can
+    //  be unrolled.
+    switch (channels){
+    case 2:
+        channel_interleave_ARM64_NEON<2>(samples, stride, strided_stream, interleaved_stream);
+        break;
+    default:
+        channel_interleave_Default(channels, samples, stride, strided_stream, interleaved_stream);
+        break;
+    }
+}
+
+
+
+
+class Test_deinterleave_ARM64_NEON : public Test{
+public:
+    Test_deinterleave_ARM64_NEON(size_t channels, size_t samples)
+        : Test(
+            "deinterleave_ARM64_NEON",
+            channels, samples,
+            channel_deinterleave_ARM64_NEON,
+            channel_interleave_Default
+        )
+    {}
+};
+class Test_interleave_ARM64_NEON : public Test{
+public:
+    Test_interleave_ARM64_NEON(size_t channels, size_t samples)
+        : Test(
+            "interleave_ARM64_NEON",
+            channels, samples,
+            channel_deinterleave_Default,
+            channel_interleave_ARM64_NEON
+        )
+    {}
+};
+void add_tests_ARM64_NEON(UnitTestDatabase& database){
+    for (size_t c = 1; c <= 8; c++){
+        for (size_t samples = 2; samples < 1000; samples = (size_t)(samples * 1.1) + 1){
+            database.add<Test_deinterleave_ARM64_NEON>(c, samples);
+            database.add<Test_interleave_ARM64_NEON>(c, samples);
+        }
+    }
+}
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Kernels/AudioChannelInterleave/Kernels_AudioChannelInterleave_Default.cpp b/SerialPrograms/Source/Kernels/AudioChannelInterleave/Kernels_AudioChannelInterleave_Default.cpp
new file mode 100644
index 0000000000..958eaae580
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/AudioChannelInterleave/Kernels_AudioChannelInterleave_Default.cpp
@@ -0,0 +1,112 @@
+/*  Audio Channel Interleave (Default)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <string.h>
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "Kernels_AudioChannelInterleave_TestInfra.h"
+#include "Kernels_AudioChannelInterleave_Default.h"
+
+namespace PokemonAutomation{
+namespace Kernels{
+namespace AudioChannelInterleave{
+
+
+
+void channel_deinterleave_Default(
+    size_t channels, size_t samples,
+    size_t stride, r_ptr<float> strided_stream,
+    c_ptr<float> interleaved_stream
+){
+    //  We pull out the common cases and force-inline them so the inner loop can
+    //  be unrolled.
+    switch (channels){
+    case 1:
+        memcpy(strided_stream, interleaved_stream, samples * sizeof(float));
+        break;
+    case 2:
+        channel_deinterleave_GenericDefault(2, samples, stride, strided_stream, interleaved_stream);
+        break;
+    case 3:
+        channel_deinterleave_GenericDefault(3, samples, stride, strided_stream, interleaved_stream);
+        break;
+    case 4:
+        channel_deinterleave_GenericDefault(4, samples, stride, strided_stream, interleaved_stream);
+        break;
+    case 5:
+        channel_deinterleave_GenericDefault(5, samples, stride, strided_stream, interleaved_stream);
+        break;
+    case 6:
+        channel_deinterleave_GenericDefault(6, samples, stride, strided_stream, interleaved_stream);
+        break;
+    case 7:
+        channel_deinterleave_GenericDefault(7, samples, stride, strided_stream, interleaved_stream);
+        break;
+    default:
+        channel_deinterleave_GenericDefault(channels, samples, stride, strided_stream, interleaved_stream);
+        break;
+    }
+}
+void channel_interleave_Default(
+    size_t channels, size_t samples,
+    size_t stride, c_ptr<float> strided_stream,
+    r_ptr<float> interleaved_stream
+){
+    //  We pull out the common cases and force-inline them so the inner loop can
+    //  be unrolled.
+    switch (channels){
+    case 1:
+        memcpy(interleaved_stream, strided_stream, samples * sizeof(float));
+        break;
+    case 2:
+        channel_interleave_GenericDefault(2, samples, stride, strided_stream, interleaved_stream);
+        break;
+    case 3:
+        channel_interleave_GenericDefault(3, samples, stride, strided_stream, interleaved_stream);
+        break;
+    case 4:
+        channel_interleave_GenericDefault(4, samples, stride, strided_stream, interleaved_stream);
+        break;
+    case 5:
+        channel_interleave_GenericDefault(5, samples, stride, strided_stream, interleaved_stream);
+        break;
+    case 6:
+        channel_interleave_GenericDefault(6, samples, stride, strided_stream, interleaved_stream);
+        break;
+    case 7:
+        channel_interleave_GenericDefault(7, samples, stride, strided_stream, interleaved_stream);
+        break;
+    default:
+        channel_interleave_GenericDefault(channels, samples, stride, strided_stream, interleaved_stream);
+        break;
+    }
+}
+
+
+class Test_Default : public Test{
+public:
+    Test_Default(size_t channels, size_t samples)
+        : Test(
+            "Default",
+            channels, samples,
+            channel_deinterleave_Default,
+            channel_interleave_Default
+        )
+    {}
+};
+void add_tests_Default(UnitTestDatabase& database){
+    for (size_t c = 1; c <= 8; c++){
+        for (size_t samples = 2; samples < 1000; samples = (size_t)(samples * 1.1) + 1){
+            database.add<Test_Default>(c, samples);
+        }
+    }
+}
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/Kernels/AudioChannelInterleave/Kernels_AudioChannelInterleave_Default.h b/SerialPrograms/Source/Kernels/AudioChannelInterleave/Kernels_AudioChannelInterleave_Default.h
new file mode 100644
index 0000000000..42602fe8ea
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/AudioChannelInterleave/Kernels_AudioChannelInterleave_Default.h
@@ -0,0 +1,68 @@
+/*  Audio Channel Interleave (Default)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Kernels_AudioChannelInterleave_Default_H
+#define PokemonAutomation_Kernels_AudioChannelInterleave_Default_H
+
+#include "Common/Compiler.h"
+
+namespace PokemonAutomation{
+
+class UnitTestDatabase;
+
+namespace Kernels{
+namespace AudioChannelInterleave{
+
+
+
+void channel_deinterleave_Default(
+    size_t channels, size_t samples,
+    size_t stride, r_ptr<float> strided_stream,
+    c_ptr<float> interleaved_stream
+);
+void channel_interleave_Default(
+    size_t channels, size_t samples,
+    size_t stride, c_ptr<float> strided_stream,
+    r_ptr<float> interleaved_stream
+);
+
+
+
+PA_FORCE_INLINE void channel_deinterleave_GenericDefault(
+    size_t channels, size_t samples,
+    size_t stride, r_ptr<float> strided_stream,
+    c_ptr<float> interleaved_stream
+){
+    for (size_t s = 0; s < samples; s++){
+        for (size_t c = 0; c < channels; c++){
+            strided_stream[c*stride] = interleaved_stream[c];
+        }
+        strided_stream++;
+        interleaved_stream += channels;
+    }
+}
+PA_FORCE_INLINE void channel_interleave_GenericDefault(
+    size_t channels, size_t samples,
+    size_t stride, c_ptr<float> strided_stream,
+    r_ptr<float> interleaved_stream
+){
+    for (size_t s = 0; s < samples; s++){
+        for (size_t c = 0; c < channels; c++){
+            interleaved_stream[c] = strided_stream[c*stride];
+        }
+        strided_stream++;
+        interleaved_stream += channels;
+    }
+}
+
+
+void add_tests_Default(UnitTestDatabase& database);
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Kernels/AudioChannelInterleave/Kernels_AudioChannelInterleave_TestInfra.cpp b/SerialPrograms/Source/Kernels/AudioChannelInterleave/Kernels_AudioChannelInterleave_TestInfra.cpp
new file mode 100644
index 0000000000..9064a2ba63
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/AudioChannelInterleave/Kernels_AudioChannelInterleave_TestInfra.cpp
@@ -0,0 +1,65 @@
+/*  Audio Channel Interleave Test Infra
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <random>
+#include "Common/Cpp/Containers/GuardPageBuffer.h"
+#include "Kernels_AudioChannelInterleave_TestInfra.h"
+
+namespace PokemonAutomation{
+namespace Kernels{
+namespace AudioChannelInterleave{
+
+
+
+Test::Test(
+    const std::string& arch_str,
+    size_t channels, size_t samples,
+    ConvertFrom convert_from,
+    ConvertTo convert_to
+)
+    : UnitTest(
+        "Kernels::AudioChannelInterleave - " + arch_str +
+        "(ch = " + std::to_string(channels) + ", samples=" + std::to_string(samples) + ")"
+    )
+    , m_channels(channels)
+    , m_samples(samples)
+    , m_convert_from(convert_from)
+    , m_convert_to(convert_to)
+{}
+UnitTestResult Test::run(Logger& logger, CancellableScope& scope) const{
+    size_t total = m_channels * m_samples;
+
+    //  Every buffer ends right before a guard page, so a kernel that reads or
+    //  writes past the end faults on every run.
+    GuardPageBuffer<float> interleaved0(total);
+    GuardPageBuffer<float> interleaved1(total);
+    GuardPageBuffer<float> strided(total);
+
+    std::mt19937 generator(42);
+
+    std::uniform_real_distribution<float> distribution(-1.0, +1.0);
+    for (size_t c = 0; c < total; c++){
+        interleaved0[c] = distribution(generator);
+    }
+
+    m_convert_from(m_channels, m_samples, m_samples, strided.data(), interleaved0.data());
+    m_convert_to(m_channels, m_samples, m_samples, strided.data(), interleaved1.data());
+
+    //  Check for errors.
+    for (size_t c = 0; c < total; c++){
+        if (interleaved0[c] != interleaved1[c]){
+            return "Mismatch at " + std::to_string(c) + ": " +
+                std::to_string(interleaved0[c]) + " != " + std::to_string(interleaved1[c]);
+        }
+    }
+
+    return true;
+}
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/Kernels/AudioChannelInterleave/Kernels_AudioChannelInterleave_TestInfra.h b/SerialPrograms/Source/Kernels/AudioChannelInterleave/Kernels_AudioChannelInterleave_TestInfra.h
new file mode 100644
index 0000000000..e29c4ff46e
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/AudioChannelInterleave/Kernels_AudioChannelInterleave_TestInfra.h
@@ -0,0 +1,66 @@
+/*  Audio Channel Interleave Test Infra
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Kernels_AudioChannelInterleave_TestInfra_H
+#define PokemonAutomation_Kernels_AudioChannelInterleave_TestInfra_H
+
+#include <cstddef>
+#include "Common/Compiler.h"
+#include "Common/Cpp/TestRunners/UnitTest.h"
+
+namespace PokemonAutomation{
+namespace Kernels{
+namespace AudioChannelInterleave{
+
+
+
+
+
+using ConvertFrom = void (*)(
+    size_t channels, size_t samples,
+    size_t stride, r_ptr<float> strided_stream,
+    c_ptr<float> interleaved_stream
+);
+using ConvertTo = void (*)(
+    size_t channels, size_t samples,
+    size_t stride, c_ptr<float> strided_stream,
+    r_ptr<float> interleaved_stream
+);
+
+
+
+
+//
+//  Warning, this file is compiled in multiple ISA contexts.
+//  We cannot define the functions here since they will be compiled differently.
+//  If a higher (AVX512) version wins out in the linker, all versions will use
+//  it and crash on older CPUs.
+//
+class Test : public UnitTest{
+public:
+    Test(
+        const std::string& arch_str,
+        size_t channels, size_t samples,
+        ConvertFrom convert_from,
+        ConvertTo convert_to
+    );
+
+    virtual UnitTestResult run(Logger& logger, CancellableScope& scope) const override;
+
+private:
+    size_t m_channels;
+    size_t m_samples;
+    ConvertFrom m_convert_from;
+    ConvertTo m_convert_to;
+};
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Kernels/AudioChannelInterleave/Kernels_AudioChannelInterleave_x64_AVX2.cpp b/SerialPrograms/Source/Kernels/AudioChannelInterleave/Kernels_AudioChannelInterleave_x64_AVX2.cpp
new file mode 100644
index 0000000000..aaab98a634
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/AudioChannelInterleave/Kernels_AudioChannelInterleave_x64_AVX2.cpp
@@ -0,0 +1,169 @@
+/*  Audio Channel Interleave (x64 AVX2)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifdef PA_AutoDispatch_x64_13_Haswell
+#include <immintrin.h>
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "Kernels_AudioChannelInterleave_TestInfra.h"
+#include "Kernels_AudioChannelInterleave_Default.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace Kernels{
+namespace AudioChannelInterleave{
+
+
+
+template <size_t channels>
+void channel_deinterleave_x64_AVX2(
+    size_t samples,
+    size_t stride, r_ptr<float> strided_stream,
+    c_ptr<float> interleaved_stream
+);
+template <size_t channels>
+void channel_interleave_x64_AVX2(
+    size_t samples,
+    size_t stride, c_ptr<float> strided_stream,
+    r_ptr<float> interleaved_stream
+);
+
+
+
+template <>
+void channel_deinterleave_x64_AVX2<2>(
+    size_t samples,
+    size_t stride, r_ptr<float> strided_stream,
+    c_ptr<float> interleaved_stream
+){
+    while (samples >= 8){
+        __m256 r0, r1;
+        __m256 s0, s1;
+        r0 = _mm256_loadu_ps(interleaved_stream + 0);
+        r1 = _mm256_loadu_ps(interleaved_stream + 8);
+        r0 = _mm256_permutevar8x32_ps(r0, _mm256_setr_epi32(0, 2, 4, 6, 1, 3, 5, 7));
+        r1 = _mm256_permutevar8x32_ps(r1, _mm256_setr_epi32(1, 3, 5, 7, 0, 2, 4, 6));
+        s0 = _mm256_blend_ps(r0, r1, 0xf0);
+        s1 = _mm256_permute2f128_ps(r0, r1, 33);
+        _mm256_storeu_ps(strided_stream + 0*stride, s0);
+        _mm256_storeu_ps(strided_stream + 1*stride, s1);
+
+        strided_stream += 8;
+        interleaved_stream += 16;
+        samples -= 8;
+    }
+    if (samples > 0){
+        channel_deinterleave_Default(2, samples, stride, strided_stream, interleaved_stream);
+    }
+}
+template <>
+void channel_interleave_x64_AVX2<2>(
+    size_t samples,
+    size_t stride, c_ptr<float> strided_stream,
+    r_ptr<float> interleaved_stream
+){
+    while (samples >= 8){
+        __m256 r0, r1;
+        __m256 s0, s1;
+        r0 = _mm256_loadu_ps(strided_stream + 0*stride);
+        r1 = _mm256_loadu_ps(strided_stream + 1*stride);
+        r0 = _mm256_permutevar8x32_ps(r0, _mm256_setr_epi32(0, 4, 1, 5, 2, 6, 3, 7));
+        r1 = _mm256_permutevar8x32_ps(r1, _mm256_setr_epi32(7, 0, 4, 1, 5, 2, 6, 3));
+        s0 = _mm256_blend_ps(r0, r1, 0xaa);
+        s1 = _mm256_blend_ps(r0, r1, 0x55);
+        s1 = _mm256_permutevar8x32_ps(s1, _mm256_setr_epi32(1, 2, 3, 4, 5, 6, 7, 0));
+        _mm256_storeu_ps(interleaved_stream + 0, s0);
+        _mm256_storeu_ps(interleaved_stream + 8, s1);
+
+        strided_stream += 8;
+        interleaved_stream += 16;
+        samples -= 8;
+    }
+    if (samples > 0){
+        channel_interleave_Default(2, samples, stride, strided_stream, interleaved_stream);
+    }
+}
+
+
+
+
+void channel_deinterleave_x64_AVX2(
+    size_t channels, size_t samples,
+    size_t stride, r_ptr<float> strided_stream,
+    c_ptr<float> interleaved_stream
+){
+    //  We pull out the common cases and force-inline them so the inner loop can
+    //  be unrolled.
+    switch (channels){
+    case 2:
+        channel_deinterleave_x64_AVX2<2>(samples, stride, strided_stream, interleaved_stream);
+        break;
+    default:
+        channel_deinterleave_Default(channels, samples, stride, strided_stream, interleaved_stream);
+        break;
+    }
+}
+void channel_interleave_x64_AVX2(
+    size_t channels, size_t samples,
+    size_t stride, c_ptr<float> strided_stream,
+    r_ptr<float> interleaved_stream
+){
+    //  We pull out the common cases and force-inline them so the inner loop can
+    //  be unrolled.
+    switch (channels){
+    case 2:
+        channel_interleave_x64_AVX2<2>(samples, stride, strided_stream, interleaved_stream);
+        break;
+    default:
+        channel_interleave_Default(channels, samples, stride, strided_stream, interleaved_stream);
+        break;
+    }
+}
+
+
+
+
+
+class Test_deinterleave_x64_AVX2 : public Test{
+public:
+    Test_deinterleave_x64_AVX2(size_t channels, size_t samples)
+        : Test(
+            "deinterleave_x64_AVX2",
+            channels, samples,
+            channel_deinterleave_x64_AVX2,
+            channel_interleave_Default
+        )
+    {}
+};
+class Test_interleave_x64_AVX2 : public Test{
+public:
+    Test_interleave_x64_AVX2(size_t channels, size_t samples)
+        : Test(
+            "interleave_x64_AVX2",
+            channels, samples,
+            channel_deinterleave_Default,
+            channel_interleave_x64_AVX2
+        )
+    {}
+};
+void add_tests_x64_AVX2(UnitTestDatabase& database){
+    for (size_t c = 1; c <= 8; c++){
+        for (size_t samples = 2; samples < 1000; samples = (size_t)(samples * 1.1) + 1){
+            database.add<Test_deinterleave_x64_AVX2>(c, samples);
+            database.add<Test_interleave_x64_AVX2>(c, samples);
+        }
+    }
+}
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Kernels/AudioChannelInterleave/Kernels_AudioChannelInterleave_x64_AVX512.cpp b/SerialPrograms/Source/Kernels/AudioChannelInterleave/Kernels_AudioChannelInterleave_x64_AVX512.cpp
new file mode 100644
index 0000000000..836f16b904
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/AudioChannelInterleave/Kernels_AudioChannelInterleave_x64_AVX512.cpp
@@ -0,0 +1,188 @@
+/*  Audio Channel Interleave (x64 AVX512)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifdef PA_AutoDispatch_x64_17_Skylake
+
+#include <stdint.h>
+#include <immintrin.h>
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "Kernels_AudioChannelInterleave_TestInfra.h"
+#include "Kernels_AudioChannelInterleave_Default.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace Kernels{
+namespace AudioChannelInterleave{
+
+
+
+template <size_t channels>
+void channel_deinterleave_x64_AVX512(
+    size_t samples,
+    size_t stride, r_ptr<float> strided_stream,
+    c_ptr<float> interleaved_stream
+);
+template <size_t channels>
+void channel_interleave_x64_AVX512(
+    size_t samples,
+    size_t stride, c_ptr<float> strided_stream,
+    r_ptr<float> interleaved_stream
+);
+
+
+
+template <>
+void channel_deinterleave_x64_AVX512<2>(
+    size_t samples,
+    size_t stride, r_ptr<float> strided_stream,
+    c_ptr<float> interleaved_stream
+){
+    while (samples > 16){
+        __m512 r0, r1;
+        __m512 s0, s1;
+        r0 = _mm512_loadu_ps(interleaved_stream +  0);
+        r1 = _mm512_loadu_ps(interleaved_stream + 16);
+        s0 = _mm512_permutex2var_ps(r0, _mm512_setr_epi32(0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30), r1);
+        s1 = _mm512_permutex2var_ps(r0, _mm512_setr_epi32(1, 3, 5, 7, 9, 11, 13, 15, 17, 19, 21, 23, 25, 27, 29, 31), r1);
+        _mm512_storeu_ps(strided_stream + 0*stride, s0);
+        _mm512_storeu_ps(strided_stream + 1*stride, s1);
+
+        strided_stream += 16;
+        interleaved_stream += 32;
+        samples -= 16;
+    }
+    {
+        __mmask16 mask = ((uint32_t)1 << samples) - 1;
+        uint64_t double_mask = ((uint64_t)1 << samples*2) - 1;
+        __mmask16 mask0 = (__mmask16)double_mask;
+        __mmask16 mask1 = (__mmask16)(double_mask >> 16);
+        __m512 r0, r1;
+        __m512 s0, s1;
+        r0 = _mm512_maskz_loadu_ps(mask0, interleaved_stream +  0);
+        r1 = _mm512_maskz_loadu_ps(mask1, interleaved_stream + 16);
+        s0 = _mm512_permutex2var_ps(r0, _mm512_setr_epi32(0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30), r1);
+        s1 = _mm512_permutex2var_ps(r0, _mm512_setr_epi32(1, 3, 5, 7, 9, 11, 13, 15, 17, 19, 21, 23, 25, 27, 29, 31), r1);
+        _mm512_mask_storeu_ps(strided_stream + 0*stride, mask, s0);
+        _mm512_mask_storeu_ps(strided_stream + 1*stride, mask, s1);
+    }
+}
+template <>
+void channel_interleave_x64_AVX512<2>(
+    size_t samples,
+    size_t stride, c_ptr<float> strided_stream,
+    r_ptr<float> interleaved_stream
+){
+    while (samples > 16){
+        __m512 r0, r1;
+        __m512 s0, s1;
+        r0 = _mm512_loadu_ps(strided_stream + 0*stride);
+        r1 = _mm512_loadu_ps(strided_stream + 1*stride);
+        s0 = _mm512_permutex2var_ps(r0, _mm512_setr_epi32( 0, 16,  1, 17,  2, 18,  3, 19,  4, 20,  5, 21,  6, 22,  7, 23), r1);
+        s1 = _mm512_permutex2var_ps(r0, _mm512_setr_epi32( 8, 24,  9, 25, 10, 26, 11, 27, 12, 28, 13, 29, 14, 30, 15, 31), r1);
+        _mm512_storeu_ps(interleaved_stream +  0, s0);
+        _mm512_storeu_ps(interleaved_stream + 16, s1);
+
+        strided_stream += 16;
+        interleaved_stream += 32;
+        samples -= 16;
+    }
+    {
+        __mmask16 mask = ((uint32_t)1 << samples) - 1;
+        uint64_t double_mask = ((uint64_t)1 << samples*2) - 1;
+        __mmask16 mask0 = (__mmask16)double_mask;
+        __mmask16 mask1 = (__mmask16)(double_mask >> 16);
+        __m512 r0, r1;
+        __m512 s0, s1;
+        r0 = _mm512_maskz_loadu_ps(mask, strided_stream + 0*stride);
+        r1 = _mm512_maskz_loadu_ps(mask, strided_stream + 1*stride);
+        s0 = _mm512_permutex2var_ps(r0, _mm512_setr_epi32( 0, 16,  1, 17,  2, 18,  3, 19,  4, 20,  5, 21,  6, 22,  7, 23), r1);
+        s1 = _mm512_permutex2var_ps(r0, _mm512_setr_epi32( 8, 24,  9, 25, 10, 26, 11, 27, 12, 28, 13, 29, 14, 30, 15, 31), r1);
+        _mm512_mask_storeu_ps(interleaved_stream +  0, mask0, s0);
+        _mm512_mask_storeu_ps(interleaved_stream + 16, mask1, s1);
+    }
+}
+
+
+
+
+void channel_deinterleave_x64_AVX512(
+    size_t channels, size_t samples,
+    size_t stride, r_ptr<float> strided_stream,
+    c_ptr<float> interleaved_stream
+){
+    //  We pull out the common cases and force-inline them so the inner loop can
+    //  be unrolled.
+    switch (channels){
+    case 2:
+        channel_deinterleave_x64_AVX512<2>(samples, stride, strided_stream, interleaved_stream);
+        break;
+    default:
+        channel_deinterleave_Default(channels, samples, stride, strided_stream, interleaved_stream);
+        break;
+    }
+}
+void channel_interleave_x64_AVX512(
+    size_t channels, size_t samples,
+    size_t stride, c_ptr<float> strided_stream,
+    r_ptr<float> interleaved_stream
+){
+    //  We pull out the common cases and force-inline them so the inner loop can
+    //  be unrolled.
+    switch (channels){
+    case 2:
+        channel_interleave_x64_AVX512<2>(samples, stride, strided_stream, interleaved_stream);
+        break;
+    default:
+        channel_interleave_Default(channels, samples, stride, strided_stream, interleaved_stream);
+        break;
+    }
+}
+
+
+
+
+
+class Test_deinterleave_x64_AVX512 : public Test{
+public:
+    Test_deinterleave_x64_AVX512(size_t channels, size_t samples)
+        : Test(
+            "deinterleave_x64_AVX512",
+            channels, samples,
+            channel_deinterleave_x64_AVX512,
+            channel_interleave_Default
+        )
+    {}
+};
+class Test_interleave_x64_AVX512 : public Test{
+public:
+    Test_interleave_x64_AVX512(size_t channels, size_t samples)
+        : Test(
+            "interleave_x64_AVX512",
+            channels, samples,
+            channel_deinterleave_Default,
+            channel_interleave_x64_AVX512
+        )
+    {}
+};
+void add_tests_x64_AVX512(UnitTestDatabase& database){
+    for (size_t c = 1; c <= 8; c++){
+        for (size_t samples = 2; samples < 1000; samples = (size_t)(samples * 1.1) + 1){
+            database.add<Test_deinterleave_x64_AVX512>(c, samples);
+            database.add<Test_interleave_x64_AVX512>(c, samples);
+        }
+    }
+}
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Kernels/AudioChannelInterleave/Kernels_AudioChannelInterleave_x64_SSE.cpp b/SerialPrograms/Source/Kernels/AudioChannelInterleave/Kernels_AudioChannelInterleave_x64_SSE.cpp
new file mode 100644
index 0000000000..68c229a8f8
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/AudioChannelInterleave/Kernels_AudioChannelInterleave_x64_SSE.cpp
@@ -0,0 +1,166 @@
+/*  Audio Channel Interleave (x64 SSE)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifdef PA_AutoDispatch_x64_08_Nehalem
+
+#include <emmintrin.h>
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "Kernels_AudioChannelInterleave_TestInfra.h"
+#include "Kernels_AudioChannelInterleave_Default.h"
+
+namespace PokemonAutomation{
+namespace Kernels{
+namespace AudioChannelInterleave{
+
+
+
+template <size_t channels>
+void channel_deinterleave_x64_SSE(
+    size_t samples,
+    size_t stride, r_ptr<float> strided_stream,
+    c_ptr<float> interleaved_stream
+);
+template <size_t channels>
+void channel_interleave_x64_SSE(
+    size_t samples,
+    size_t stride, c_ptr<float> strided_stream,
+    r_ptr<float> interleaved_stream
+);
+
+
+
+template <>
+void channel_deinterleave_x64_SSE<2>(
+    size_t samples,
+    size_t stride, r_ptr<float> strided_stream,
+    c_ptr<float> interleaved_stream
+){
+    while (samples >= 4){
+        __m128 in0, in1;
+        __m128 channel0, channel1;
+        in0 = _mm_loadu_ps(interleaved_stream + 0);
+        in1 = _mm_loadu_ps(interleaved_stream + 4);
+        //  Pull the even and odd lanes out of both registers:
+        //  channel0 = [in0[0], in0[2], in1[0], in1[2]]
+        //  channel1 = [in0[1], in0[3], in1[1], in1[3]]
+        channel0 = _mm_shuffle_ps(in0, in1, 136);
+        channel1 = _mm_shuffle_ps(in0, in1, 221);
+        _mm_storeu_ps(strided_stream + 0*stride, channel0);
+        _mm_storeu_ps(strided_stream + 1*stride, channel1);
+
+        strided_stream += 4;
+        interleaved_stream += 8;
+        samples -= 4;
+    }
+    if (samples > 0){
+        channel_deinterleave_Default(2, samples, stride, strided_stream, interleaved_stream);
+    }
+}
+template <>
+void channel_interleave_x64_SSE<2>(
+    size_t samples,
+    size_t stride, c_ptr<float> strided_stream,
+    r_ptr<float> interleaved_stream
+){
+    while (samples >= 4){
+        __m128 in0, in1;
+        __m128 channel0, channel1;
+        channel0 = _mm_loadu_ps(strided_stream + 0*stride);
+        channel1 = _mm_loadu_ps(strided_stream + 1*stride);
+        //  unpacklo/unpackhi are the exact inverse of the shuffles above:
+        //  in0 = [c0[0], c1[0], c0[1], c1[1]]
+        //  in1 = [c0[2], c1[2], c0[3], c1[3]]
+        in0 = _mm_unpacklo_ps(channel0, channel1);
+        in1 = _mm_unpackhi_ps(channel0, channel1);
+        _mm_storeu_ps(interleaved_stream + 0, in0);
+        _mm_storeu_ps(interleaved_stream + 4, in1);
+
+        strided_stream += 4;
+        interleaved_stream += 8;
+        samples -= 4;
+    }
+    if (samples > 0){
+        channel_interleave_Default(2, samples, stride, strided_stream, interleaved_stream);
+    }
+}
+
+
+
+
+void channel_deinterleave_x64_SSE(
+    size_t channels, size_t samples,
+    size_t stride, r_ptr<float> strided_stream,
+    c_ptr<float> interleaved_stream
+){
+    //  We pull out the common cases and force-inline them so the inner loop can
+    //  be unrolled.
+    switch (channels){
+    case 2:
+        channel_deinterleave_x64_SSE<2>(samples, stride, strided_stream, interleaved_stream);
+        break;
+    default:
+        channel_deinterleave_Default(channels, samples, stride, strided_stream, interleaved_stream);
+        break;
+    }
+}
+void channel_interleave_x64_SSE(
+    size_t channels, size_t samples,
+    size_t stride, c_ptr<float> strided_stream,
+    r_ptr<float> interleaved_stream
+){
+    //  We pull out the common cases and force-inline them so the inner loop can
+    //  be unrolled.
+    switch (channels){
+    case 2:
+        channel_interleave_x64_SSE<2>(samples, stride, strided_stream, interleaved_stream);
+        break;
+    default:
+        channel_interleave_Default(channels, samples, stride, strided_stream, interleaved_stream);
+        break;
+    }
+}
+
+
+
+
+class Test_deinterleave_x64_SSE : public Test{
+public:
+    Test_deinterleave_x64_SSE(size_t channels, size_t samples)
+        : Test(
+            "deinterleave_x64_SSE",
+            channels, samples,
+            channel_deinterleave_x64_SSE,
+            channel_interleave_Default
+        )
+    {}
+};
+class Test_interleave_x64_SSE : public Test{
+public:
+    Test_interleave_x64_SSE(size_t channels, size_t samples)
+        : Test(
+            "interleave_x64_SSE",
+            channels, samples,
+            channel_deinterleave_Default,
+            channel_interleave_x64_SSE
+        )
+    {}
+};
+void add_tests_x64_SSE(UnitTestDatabase& database){
+    for (size_t c = 1; c <= 8; c++){
+        for (size_t samples = 2; samples < 1000; samples = (size_t)(samples * 1.1) + 1){
+            database.add<Test_deinterleave_x64_SSE>(c, samples);
+            database.add<Test_interleave_x64_SSE>(c, samples);
+        }
+    }
+}
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Kernels/AudioChannelMixer/Kernels_AudioChannelMixer.cpp b/SerialPrograms/Source/Kernels/AudioChannelMixer/Kernels_AudioChannelMixer.cpp
new file mode 100644
index 0000000000..95aa5fe2a7
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/AudioChannelMixer/Kernels_AudioChannelMixer.cpp
@@ -0,0 +1,126 @@
+/*  Audio Channel Mixer
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/CpuId/CpuId.h"
+#include "Kernels_AudioChannelMixer.h"
+
+namespace PokemonAutomation{
+namespace Kernels{
+namespace AudioChannelMixer{
+
+
+
+void mix_channels_Default(
+    c_ptr<float> matrix, size_t samples,
+    size_t out_channels, size_t out_stride, r_ptr<float> out,
+    size_t in_channels, size_t in_stride, c_ptr<float> in
+);
+void add_tests_Default(UnitTestDatabase& database);
+
+
+
+void mix_channels_x64_SSE(
+    c_ptr<float> matrix, size_t samples,
+    size_t out_channels, size_t out_stride, r_ptr<float> out,
+    size_t in_channels, size_t in_stride, c_ptr<float> in
+);
+void add_tests_x64_SSE(UnitTestDatabase& database);
+
+
+
+void mix_channels_x64_FMA3(
+    c_ptr<float> matrix, size_t samples,
+    size_t out_channels, size_t out_stride, r_ptr<float> out,
+    size_t in_channels, size_t in_stride, c_ptr<float> in
+);
+void add_tests_x64_FMA3(UnitTestDatabase& database);
+
+
+
+void mix_channels_x64_AVX512(
+    c_ptr<float> matrix, size_t samples,
+    size_t out_channels, size_t out_stride, r_ptr<float> out,
+    size_t in_channels, size_t in_stride, c_ptr<float> in
+);
+void add_tests_x64_AVX512(UnitTestDatabase& database);
+
+
+
+void mix_channels_ARM64_NEON(
+    c_ptr<float> matrix, size_t samples,
+    size_t out_channels, size_t out_stride, r_ptr<float> out,
+    size_t in_channels, size_t in_stride, c_ptr<float> in
+);
+void add_tests_ARM64_NEON(UnitTestDatabase& database);
+
+
+
+
+
+void mix_channels(
+    c_ptr<float> matrix, size_t samples,
+    size_t out_channels, size_t out_stride, r_ptr<float> out,
+    size_t in_channels, size_t in_stride, c_ptr<float> in
+){
+#ifdef PA_AutoDispatch_x64_17_Skylake
+    if (CPU_CAPABILITY_CURRENT.OK_17_Skylake){
+        mix_channels_x64_AVX512(matrix, samples, out_channels, out_stride, out, in_channels, in_stride, in);
+        return;
+    }
+#endif
+#ifdef PA_AutoDispatch_x64_13_Haswell
+    if (CPU_CAPABILITY_CURRENT.OK_13_Haswell){
+        mix_channels_x64_FMA3(matrix, samples, out_channels, out_stride, out, in_channels, in_stride, in);
+        return;
+    }
+#endif
+#ifdef PA_AutoDispatch_x64_08_Nehalem
+    if (CPU_CAPABILITY_CURRENT.OK_08_Nehalem){
+        mix_channels_x64_SSE(matrix, samples, out_channels, out_stride, out, in_channels, in_stride, in);
+        return;
+    }
+#endif
+#ifdef PA_AutoDispatch_arm64_20_M1
+    if (CPU_CAPABILITY_CURRENT.OK_M1){
+        mix_channels_ARM64_NEON(matrix, samples, out_channels, out_stride, out, in_channels, in_stride, in);
+        return;
+    }
+#endif
+
+    mix_channels_Default(matrix, samples, out_channels, out_stride, out, in_channels, in_stride, in);
+    return;
+}
+
+
+
+
+void add_tests(UnitTestDatabase& database){
+#ifdef PA_AutoDispatch_x64_08_Nehalem
+    if (CPU_CAPABILITY_CURRENT.OK_08_Nehalem){
+        add_tests_x64_SSE(database);
+    }
+#endif
+#ifdef PA_AutoDispatch_x64_13_Haswell
+    if (CPU_CAPABILITY_CURRENT.OK_13_Haswell){
+        add_tests_x64_FMA3(database);
+    }
+#endif
+#ifdef PA_AutoDispatch_x64_17_Skylake
+    if (CPU_CAPABILITY_CURRENT.OK_17_Skylake){
+        add_tests_x64_AVX512(database);
+    }
+#endif
+#ifdef PA_AutoDispatch_arm64_20_M1
+    if (CPU_CAPABILITY_CURRENT.OK_M1){
+        add_tests_ARM64_NEON(database);
+    }
+#endif
+}
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/Kernels/AudioChannelMixer/Kernels_AudioChannelMixer.h b/SerialPrograms/Source/Kernels/AudioChannelMixer/Kernels_AudioChannelMixer.h
new file mode 100644
index 0000000000..76c08d2ad8
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/AudioChannelMixer/Kernels_AudioChannelMixer.h
@@ -0,0 +1,33 @@
+/*  Audio Channel Mixer
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Kernels_AudioChannelMixer_H
+#define PokemonAutomation_Kernels_AudioChannelMixer_H
+
+#include "Common/Compiler.h"
+
+namespace PokemonAutomation{
+
+class UnitTestDatabase;
+
+namespace Kernels{
+namespace AudioChannelMixer{
+
+
+void mix_channels(
+    c_ptr<float> matrix, size_t samples,
+    size_t out_channels, size_t out_stride, r_ptr<float> out,
+    size_t in_channels, size_t in_stride, c_ptr<float> in
+);
+
+
+void add_tests(UnitTestDatabase& database);
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Kernels/AudioChannelMixer/Kernels_AudioChannelMixer_ARM64_NEON.cpp b/SerialPrograms/Source/Kernels/AudioChannelMixer/Kernels_AudioChannelMixer_ARM64_NEON.cpp
new file mode 100644
index 0000000000..17eaf65423
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/AudioChannelMixer/Kernels_AudioChannelMixer_ARM64_NEON.cpp
@@ -0,0 +1,199 @@
+/*  Audio Channel Mixer (ARM64 NEON)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifdef PA_AutoDispatch_arm64_20_M1
+
+#include <arm_neon.h>
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "Kernels_AudioChannelMixer_TestInfra.h"
+#include "Kernels_AudioChannelMixer_Default.h"
+
+namespace PokemonAutomation{
+namespace Kernels{
+namespace AudioChannelMixer{
+
+
+
+PA_FORCE_INLINE void mix_channels_generic_ARM64_NEON(
+    c_ptr<float> matrix, size_t samples,
+    size_t out_channels, size_t out_stride, r_ptr<float> out,
+    size_t in_channels, size_t in_stride, c_ptr<float> in
+){
+    while (samples > 4){
+        for (size_t o = 0; o < out_channels; o++){
+            float32x4_t x = vdupq_n_f32(0.0f);
+            for (size_t i = 0; i < in_channels; i++){
+                x = vaddq_f32(
+                    x,
+                    vmulq_f32(
+                        vld1q_f32(in + in_stride * i),
+                        vdupq_n_f32(matrix[i + in_channels * o])
+                    )
+                );
+            }
+            vst1q_f32(out + out_stride * o, x);
+        }
+        in += 4;
+        out += 4;
+        samples -= 4;
+    }
+    mix_channels_GenericDefault(
+        matrix, samples,
+        out_channels, out_stride, out,
+        in_channels, in_stride, in
+    );
+}
+template <size_t in_channels, size_t out_channels>
+void mix_channels_ARM64_NEON(
+    c_ptr<float> matrix, size_t samples,
+    size_t out_stride, r_ptr<float> out,
+    size_t in_stride, c_ptr<float> in
+);
+template <>
+void mix_channels_ARM64_NEON<1, 1>(
+    c_ptr<float> matrix, size_t samples,
+    size_t out_stride, r_ptr<float> out,
+    size_t in_stride, c_ptr<float> in
+){
+    float32x4_t i0o0 = vdupq_n_f32(matrix[0]);
+    while (samples > 4){
+        float32x4_t in0 = vld1q_f32(in);
+        float32x4_t out0 = vmulq_f32(in0, i0o0);
+        vst1q_f32(out, out0);
+        in += 4;
+        out += 4;
+        samples -= 4;
+    }
+    mix_channels_Default<1, 1>(matrix, samples, out_stride, out, in_stride, in);
+}
+template <>
+void mix_channels_ARM64_NEON<1, 2>(
+    c_ptr<float> matrix, size_t samples,
+    size_t out_stride, r_ptr<float> out,
+    size_t in_stride, c_ptr<float> in
+){
+    float32x4_t i0o0 = vdupq_n_f32(matrix[0]);
+    float32x4_t i0o1 = vdupq_n_f32(matrix[1]);
+    while (samples > 4){
+        float32x4_t in0 = vld1q_f32(in);
+        float32x4_t out0 = vmulq_f32(in0, i0o0);
+        float32x4_t out1 = vmulq_f32(in0, i0o1);
+        vst1q_f32(out + out_stride * 0, out0);
+        vst1q_f32(out + out_stride * 1, out1);
+        in += 4;
+        out += 4;
+        samples -= 4;
+    }
+    mix_channels_Default<1, 2>(matrix, samples, out_stride, out, in_stride, in);
+}
+template <>
+void mix_channels_ARM64_NEON<2, 1>(
+    c_ptr<float> matrix, size_t samples,
+    size_t out_stride, r_ptr<float> out,
+    size_t in_stride, c_ptr<float> in
+){
+    float32x4_t i0o0 = vdupq_n_f32(matrix[0]);
+    float32x4_t i1o0 = vdupq_n_f32(matrix[1]);
+    while (samples > 4){
+        float32x4_t out0 = vmulq_f32(i0o0, vld1q_f32(in + in_stride * 0));
+        out0 = vaddq_f32(out0, vmulq_f32(i1o0, vld1q_f32(in + in_stride * 1)));
+        vst1q_f32(out, out0);
+        in += 4;
+        out += 4;
+        samples -= 4;
+    }
+    mix_channels_Default<2, 1>(matrix, samples, out_stride, out, in_stride, in);
+}
+template <>
+void mix_channels_ARM64_NEON<2, 2>(
+    c_ptr<float> matrix, size_t samples,
+    size_t out_stride, r_ptr<float> out,
+    size_t in_stride, c_ptr<float> in
+){
+    float32x4_t i0o0 = vdupq_n_f32(matrix[0]);
+    float32x4_t i1o0 = vdupq_n_f32(matrix[1]);
+    float32x4_t i0o1 = vdupq_n_f32(matrix[2]);
+    float32x4_t i1o1 = vdupq_n_f32(matrix[3]);
+    while (samples > 4){
+        float32x4_t in0 = vld1q_f32(in + in_stride * 0);
+        float32x4_t in1 = vld1q_f32(in + in_stride * 1);
+        float32x4_t out0 = vmulq_f32(in0, i0o0);
+        float32x4_t out1 = vmulq_f32(in0, i0o1);
+        out0 = vaddq_f32(out0, vmulq_f32(in1, i1o0));
+        out1 = vaddq_f32(out1, vmulq_f32(in1, i1o1));
+        vst1q_f32(out + out_stride * 0, out0);
+        vst1q_f32(out + out_stride * 1, out1);
+        in += 4;
+        out += 4;
+        samples -= 4;
+    }
+    mix_channels_Default<2, 2>(matrix, samples, out_stride, out, in_stride, in);
+}
+
+
+
+void mix_channels_ARM64_NEON(
+    c_ptr<float> matrix, size_t samples,
+    size_t out_channels, size_t out_stride, r_ptr<float> out,
+    size_t in_channels, size_t in_stride, c_ptr<float> in
+){
+    size_t combined = (in_channels << 16) | out_channels;
+    switch (combined){
+    case 0x00010001:
+        mix_channels_ARM64_NEON<1, 1>(matrix, samples, out_stride, out, in_stride, in);
+        return;
+    case 0x00020001:
+        mix_channels_ARM64_NEON<2, 1>(matrix, samples, out_stride, out, in_stride, in);
+        return;
+    case 0x00010002:
+        mix_channels_ARM64_NEON<1, 2>(matrix, samples, out_stride, out, in_stride, in);
+        return;
+    case 0x00020002:
+        mix_channels_ARM64_NEON<2, 2>(matrix, samples, out_stride, out, in_stride, in);
+        return;
+    default:
+        mix_channels_generic_ARM64_NEON(
+            matrix, samples,
+            out_channels, out_stride, out,
+            in_channels, in_stride, in
+        );
+    }
+}
+
+
+
+class Test_ARM64_NEON : public Test{
+public:
+    Test_ARM64_NEON(
+        size_t in_channels,
+        size_t out_channels,
+        size_t samples
+    )
+        : Test(
+            "ARM64_NEON",
+            in_channels,
+            out_channels,
+            samples,
+            (Convert)mix_channels_Default,
+            (Convert)mix_channels_ARM64_NEON
+        )
+    {}
+};
+void add_tests_ARM64_NEON(UnitTestDatabase& database){
+    for (size_t in_channels = 1; in_channels <= 4; in_channels++){
+        for (size_t out_channels = 1; out_channels <= 4; out_channels++){
+            for (size_t samples = 2; samples < 1000; samples = (size_t)(samples * 1.1) + 1){
+                database.add<Test_ARM64_NEON>(in_channels, out_channels, samples);
+            }
+        }
+    }
+}
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Kernels/AudioChannelMixer/Kernels_AudioChannelMixer_Default.cpp b/SerialPrograms/Source/Kernels/AudioChannelMixer/Kernels_AudioChannelMixer_Default.cpp
new file mode 100644
index 0000000000..2c4a81072b
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/AudioChannelMixer/Kernels_AudioChannelMixer_Default.cpp
@@ -0,0 +1,51 @@
+/*  Audio Channel Mixer (Default)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+//#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+//#include "Kernels_AudioStreamConverter_TestInfra.h"
+#include "Kernels_AudioChannelMixer_Default.h"
+
+namespace PokemonAutomation{
+namespace Kernels{
+namespace AudioChannelMixer{
+
+
+
+void mix_channels_Default(
+    c_ptr<float> matrix, size_t samples,
+    size_t out_channels, size_t out_stride, r_ptr<float> out,
+    size_t in_channels, size_t in_stride, c_ptr<float> in
+){
+    size_t combined = (in_channels << 16) | out_channels;
+    switch (combined){
+    case 0x00010001:
+        mix_channels_Default<1, 1>(matrix, samples, out_stride, out, in_stride, in);
+        return;
+    case 0x00020001:
+        mix_channels_Default<2, 1>(matrix, samples, out_stride, out, in_stride, in);
+        return;
+    case 0x00010002:
+        mix_channels_Default<1, 2>(matrix, samples, out_stride, out, in_stride, in);
+        return;
+    case 0x00020002:
+        mix_channels_Default<2, 2>(matrix, samples, out_stride, out, in_stride, in);
+        return;
+    default:
+        mix_channels_GenericDefault(
+            matrix, samples,
+            out_channels, out_stride, out,
+            in_channels, in_stride, in
+        );
+    }
+}
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/Kernels/AudioChannelMixer/Kernels_AudioChannelMixer_Default.h b/SerialPrograms/Source/Kernels/AudioChannelMixer/Kernels_AudioChannelMixer_Default.h
new file mode 100644
index 0000000000..efaf577188
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/AudioChannelMixer/Kernels_AudioChannelMixer_Default.h
@@ -0,0 +1,121 @@
+/*  Audio Channel Mixer (Default)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Kernels_AudioChannelMixer_Default_H
+#define PokemonAutomation_Kernels_AudioChannelMixer_Default_H
+
+#include <stddef.h>
+#include "Common/Compiler.h"
+
+namespace PokemonAutomation{
+namespace Kernels{
+namespace AudioChannelMixer{
+
+
+
+void mix_channels_Default(
+    c_ptr<float> matrix, size_t samples,
+    size_t out_channels, size_t out_stride, r_ptr<float> out,
+    size_t in_channels, size_t in_stride, c_ptr<float> in
+);
+
+
+
+PA_FORCE_INLINE void mix_channels_GenericDefault(
+    c_ptr<float> matrix, size_t samples,
+    size_t out_channels, size_t out_stride, r_ptr<float> out,
+    size_t in_channels, size_t in_stride, c_ptr<float> in
+){
+    for (size_t s = 0; s < samples; s++){
+        for (size_t o = 0; o < out_channels; o++){
+            float x = 0;
+            for (size_t i = 0; i < in_channels; i++){
+                x += in[in_stride * i] * matrix[i + in_channels * o];
+            }
+            out[out_stride * o] = x;
+        }
+        in++;
+        out++;
+    }
+}
+
+
+template <size_t in_channels, size_t out_channels>
+inline void mix_channels_Default(
+    c_ptr<float> matrix, size_t samples,
+    size_t out_stride, r_ptr<float> out,
+    size_t in_stride, c_ptr<float> in
+);
+template <>
+inline void mix_channels_Default<1, 1>(
+    c_ptr<float> matrix, size_t samples,
+    size_t out_stride, r_ptr<float> out,
+    size_t in_stride, c_ptr<float> in
+){
+    float i0o0 = matrix[0];
+    for (size_t s = 0; s < samples; s++){
+        float in0 = in[0];
+        out[0] = in0 * i0o0;
+        in++;
+        out++;
+    }
+}
+template <>
+inline void mix_channels_Default<1, 2>(
+    c_ptr<float> matrix, size_t samples,
+    size_t out_stride, r_ptr<float> out,
+    size_t in_stride, c_ptr<float> in
+){
+    float i0o0 = matrix[0];
+    float i0o1 = matrix[1];
+    for (size_t s = 0; s < samples; s++){
+        float in0 = in[0];
+        out[out_stride * 0] = in0 * i0o0;
+        out[out_stride * 1] = in0 * i0o1;
+        in++;
+        out++;
+    }
+}
+template <>
+inline void mix_channels_Default<2, 1>(
+    c_ptr<float> matrix, size_t samples,
+    size_t out_stride, r_ptr<float> out,
+    size_t in_stride, c_ptr<float> in
+){
+    float i0o0 = matrix[0];
+    float i1o0 = matrix[1];
+    for (size_t s = 0; s < samples; s++){
+        out[out_stride * 0] = in[in_stride * 0] * i0o0 + in[in_stride * 1] * i1o0;
+        in++;
+        out++;
+    }
+}
+template <>
+inline void mix_channels_Default<2, 2>(
+    c_ptr<float> matrix, size_t samples,
+    size_t out_stride, r_ptr<float> out,
+    size_t in_stride, c_ptr<float> in
+){
+    float i0o0 = matrix[0];
+    float i1o0 = matrix[1];
+    float i0o1 = matrix[2];
+    float i1o1 = matrix[3];
+    for (size_t s = 0; s < samples; s++){
+        float in0 = in[in_stride * 0];
+        float in1 = in[in_stride * 1];
+        out[out_stride * 0] = in0 * i0o0 + in1 * i1o0;
+        out[out_stride * 1] = in0 * i0o1 + in1 * i1o1;
+        in++;
+        out++;
+    }
+}
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Kernels/AudioChannelMixer/Kernels_AudioChannelMixer_TestInfra.cpp b/SerialPrograms/Source/Kernels/AudioChannelMixer/Kernels_AudioChannelMixer_TestInfra.cpp
new file mode 100644
index 0000000000..05e8d31358
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/AudioChannelMixer/Kernels_AudioChannelMixer_TestInfra.cpp
@@ -0,0 +1,85 @@
+/*  Audio Channel Mixer Test Infra
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <random>
+#include "Common/Cpp/Containers/GuardPageBuffer.h"
+#include "Kernels_AudioChannelMixer_TestInfra.h"
+
+namespace PokemonAutomation{
+namespace Kernels{
+namespace AudioChannelMixer{
+
+
+
+Test::Test(
+    const std::string& arch_str,
+    size_t in_channels,
+    size_t out_channels,
+    size_t samples,
+    Convert convert0,
+    Convert convert1
+)
+    : UnitTest(
+        "Kernels::AudioChannelMixer - " + arch_str +
+        "(" + std::to_string(in_channels) + " -> " + std::to_string(out_channels) + " x " + std::to_string(samples) + ")"
+    )
+    , m_in_channels(in_channels)
+    , m_out_channels(out_channels)
+    , m_samples(samples)
+    , m_convert0(convert0)
+    , m_convert1(convert1)
+{}
+
+UnitTestResult Test::run(Logger& logger, CancellableScope& scope) const{
+    std::vector<float> matrix(m_in_channels * m_out_channels);
+
+    //  The input and both outputs end right before a guard page. A tail that
+    //  reads or writes past the end then faults on every run, not just when
+    //  the heap happens to end there.
+    GuardPageBuffer<float> in(m_samples * m_in_channels);
+    GuardPageBuffer<float> out0(m_samples * m_out_channels);
+    GuardPageBuffer<float> out1(m_samples * m_out_channels);
+
+    std::mt19937 generator(42);
+
+    std::uniform_int_distribution<long long> distribution(-128, 128);
+    for (size_t c = 0; c < m_in_channels * m_out_channels; c++){
+        matrix[c] = (float)distribution(generator);
+    }
+    for (size_t c = 0; c < m_samples * m_in_channels; c++){
+        in[c] = (float)distribution(generator);
+    }
+
+    m_convert0(
+        matrix.data(),
+        m_samples,
+        m_out_channels, m_samples, out0.data(),
+        m_in_channels, m_samples, in.data()
+    );
+    m_convert1(
+        matrix.data(),
+        m_samples,
+        m_out_channels, m_samples, out1.data(),
+        m_in_channels, m_samples, in.data()
+    );
+
+    //  Check for errors.
+    for (size_t c = 0; c < m_samples * m_out_channels; c++){
+        if (out0[c] != out1[c]){
+            return "Mismatch at " + std::to_string(c) + ": " +
+                std::to_string(out0[c]) + " != " + std::to_string(out1[c]);
+        }
+    }
+
+    return true;
+}
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/Kernels/AudioChannelMixer/Kernels_AudioChannelMixer_TestInfra.h b/SerialPrograms/Source/Kernels/AudioChannelMixer/Kernels_AudioChannelMixer_TestInfra.h
new file mode 100644
index 0000000000..7772b166e5
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/AudioChannelMixer/Kernels_AudioChannelMixer_TestInfra.h
@@ -0,0 +1,64 @@
+/*  Audio Channel Mixer Test Infra
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Compiler.h"
+#include "Common/Cpp/TestRunners/UnitTest.h"
+
+#ifndef PokemonAutomation_Kernels_AudioChannelMixer_TestInfra_H
+#define PokemonAutomation_Kernels_AudioChannelMixer_TestInfra_H
+
+namespace PokemonAutomation{
+namespace Kernels{
+namespace AudioChannelMixer{
+
+
+
+
+
+using Convert = void (*)(
+    c_ptr<float> matrix, size_t samples,
+    size_t out_channels, size_t out_stride, r_ptr<float> out,
+    size_t in_channels, size_t in_stride, c_ptr<float> in
+);
+
+
+
+
+
+//
+//  Warning, this file is compiled in multiple ISA contexts.
+//  We cannot define the functions here since they will be compiled differently.
+//  If a higher (AVX512) version wins out in the linker, all versions will use
+//  it and crash on older CPUs.
+//
+class Test : public UnitTest{
+public:
+    Test(
+        const std::string& arch_str,
+        size_t in_channels,
+        size_t out_channels,
+        size_t samples,
+        Convert convert0,
+        Convert convert1
+    );
+
+    virtual UnitTestResult run(Logger& logger, CancellableScope& scope) const override;
+
+private:
+    size_t m_in_channels;
+    size_t m_out_channels;
+    size_t m_samples;
+    Convert m_convert0;
+    Convert m_convert1;
+};
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Kernels/AudioChannelMixer/Kernels_AudioChannelMixer_x64_AVX512.cpp b/SerialPrograms/Source/Kernels/AudioChannelMixer/Kernels_AudioChannelMixer_x64_AVX512.cpp
new file mode 100644
index 0000000000..ef2709fd52
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/AudioChannelMixer/Kernels_AudioChannelMixer_x64_AVX512.cpp
@@ -0,0 +1,234 @@
+/*  Audio Channel Mixer (x64 AVX512)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifdef PA_AutoDispatch_x64_17_Skylake
+
+#include <immintrin.h>
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "Kernels_AudioChannelMixer_TestInfra.h"
+#include "Kernels_AudioChannelMixer_Default.h"
+
+namespace PokemonAutomation{
+namespace Kernels{
+namespace AudioChannelMixer{
+
+
+
+PA_FORCE_INLINE void mix_channels_generic_x64_AVX512(
+    c_ptr<float> matrix, size_t samples,
+    size_t out_channels, size_t out_stride, r_ptr<float> out,
+    size_t in_channels, size_t in_stride, c_ptr<float> in
+){
+    while (samples > 16){
+        for (size_t o = 0; o < out_channels; o++){
+            __m512 x = _mm512_setzero_ps();
+            for (size_t i = 0; i < in_channels; i++){
+                x = _mm512_fmadd_ps(
+                    _mm512_loadu_ps(in + in_stride * i),
+                    _mm512_set1_ps(matrix[i + in_channels * o]),
+                    x
+                );
+            }
+            _mm512_storeu_ps(out + out_stride * o, x);
+        }
+        in += 16;
+        out += 16;
+        samples -= 16;
+    }
+    {
+        __mmask16 mask = ((uint32_t)1 << samples) - 1;
+        for (size_t o = 0; o < out_channels; o++){
+            __m512 x = _mm512_setzero_ps();
+            for (size_t i = 0; i < in_channels; i++){
+                x = _mm512_fmadd_ps(
+                    _mm512_maskz_loadu_ps(mask, in + in_stride * i),
+                    _mm512_set1_ps(matrix[i + in_channels * o]),
+                    x
+                );
+            }
+            _mm512_mask_storeu_ps(out + out_stride * o, mask, x);
+        }
+    }
+}
+template <size_t in_channels, size_t out_channels>
+void mix_channels_x64_AVX512(
+    c_ptr<float> matrix, size_t samples,
+    size_t out_stride, r_ptr<float> out,
+    size_t in_stride, c_ptr<float> in
+);
+template <>
+void mix_channels_x64_AVX512<1, 1>(
+    c_ptr<float> matrix, size_t samples,
+    size_t out_stride, r_ptr<float> out,
+    size_t in_stride, c_ptr<float> in
+){
+    __m512 i0o0 = _mm512_set1_ps(matrix[0]);
+    while (samples > 16){
+        __m512 in0 = _mm512_loadu_ps(in);
+        __m512 out0 = _mm512_mul_ps(in0, i0o0);
+        _mm512_storeu_ps(out, out0);
+        in += 16;
+        out += 16;
+        samples -= 16;
+    }
+    {
+        __mmask16 mask = ((uint32_t)1 << samples) - 1;
+        __m512 in0 = _mm512_maskz_loadu_ps(mask, in);
+        __m512 out0 = _mm512_mul_ps(in0, i0o0);
+        _mm512_mask_storeu_ps(out, mask, out0);
+    }
+}
+template <>
+void mix_channels_x64_AVX512<1, 2>(
+    c_ptr<float> matrix, size_t samples,
+    size_t out_stride, r_ptr<float> out,
+    size_t in_stride, c_ptr<float> in
+){
+    __m512 i0o0 = _mm512_set1_ps(matrix[0]);
+    __m512 i0o1 = _mm512_set1_ps(matrix[1]);
+    while (samples > 16){
+        __m512 in0 = _mm512_loadu_ps(in);
+        __m512 out0 = _mm512_mul_ps(in0, i0o0);
+        __m512 out1 = _mm512_mul_ps(in0, i0o1);
+        _mm512_storeu_ps(out + out_stride * 0, out0);
+        _mm512_storeu_ps(out + out_stride * 1, out1);
+        in += 16;
+        out += 16;
+        samples -= 16;
+    }
+    {
+        __mmask16 mask = ((uint32_t)1 << samples) - 1;
+        __m512 in0 = _mm512_maskz_loadu_ps(mask, in);
+        __m512 out0 = _mm512_mul_ps(in0, i0o0);
+        __m512 out1 = _mm512_mul_ps(in0, i0o1);
+        _mm512_mask_storeu_ps(out + out_stride * 0, mask, out0);
+        _mm512_mask_storeu_ps(out + out_stride * 1, mask, out1);
+    }
+}
+template <>
+void mix_channels_x64_AVX512<2, 1>(
+    c_ptr<float> matrix, size_t samples,
+    size_t out_stride, r_ptr<float> out,
+    size_t in_stride, c_ptr<float> in
+){
+    __m512 i0o0 = _mm512_set1_ps(matrix[0]);
+    __m512 i1o0 = _mm512_set1_ps(matrix[1]);
+    while (samples > 16){
+        __m512 out0 = _mm512_mul_ps(i0o0, _mm512_loadu_ps(in + in_stride * 0));
+        out0 = _mm512_fmadd_ps(i1o0, _mm512_loadu_ps(in + in_stride * 1), out0);
+        _mm512_storeu_ps(out, out0);
+        in += 16;
+        out += 16;
+        samples -= 16;
+    }
+    {
+        __mmask16 mask = ((uint32_t)1 << samples) - 1;
+        __m512 out0 = _mm512_mul_ps(i0o0, _mm512_maskz_loadu_ps(mask, in + in_stride * 0));
+        out0 = _mm512_fmadd_ps(i1o0, _mm512_maskz_loadu_ps(mask, in + in_stride * 1), out0);
+        _mm512_mask_storeu_ps(out, mask, out0);
+    }
+}
+template <>
+void mix_channels_x64_AVX512<2, 2>(
+    c_ptr<float> matrix, size_t samples,
+    size_t out_stride, r_ptr<float> out,
+    size_t in_stride, c_ptr<float> in
+){
+    __m512 i0o0 = _mm512_set1_ps(matrix[0]);
+    __m512 i1o0 = _mm512_set1_ps(matrix[1]);
+    __m512 i0o1 = _mm512_set1_ps(matrix[2]);
+    __m512 i1o1 = _mm512_set1_ps(matrix[3]);
+    while (samples > 16){
+        __m512 in0 = _mm512_loadu_ps(in + in_stride * 0);
+        __m512 in1 = _mm512_loadu_ps(in + in_stride * 1);
+        __m512 out0 = _mm512_mul_ps(in0, i0o0);
+        __m512 out1 = _mm512_mul_ps(in0, i0o1);
+        out0 = _mm512_fmadd_ps(in1, i1o0, out0);
+        out1 = _mm512_fmadd_ps(in1, i1o1, out1);
+        _mm512_storeu_ps(out + out_stride * 0, out0);
+        _mm512_storeu_ps(out + out_stride * 1, out1);
+        in += 16;
+        out += 16;
+        samples -= 16;
+    }
+    {
+        __mmask16 mask = ((uint32_t)1 << samples) - 1;
+        __m512 in0 = _mm512_maskz_loadu_ps(mask, in + in_stride * 0);
+        __m512 in1 = _mm512_maskz_loadu_ps(mask, in + in_stride * 1);
+        __m512 out0 = _mm512_mul_ps(in0, i0o0);
+        __m512 out1 = _mm512_mul_ps(in0, i0o1);
+        out0 = _mm512_fmadd_ps(in1, i1o0, out0);
+        out1 = _mm512_fmadd_ps(in1, i1o1, out1);
+        _mm512_mask_storeu_ps(out + out_stride * 0, mask, out0);
+        _mm512_mask_storeu_ps(out + out_stride * 1, mask, out1);
+    }
+}
+
+
+
+void mix_channels_x64_AVX512(
+    c_ptr<float> matrix, size_t samples,
+    size_t out_channels, size_t out_stride, r_ptr<float> out,
+    size_t in_channels, size_t in_stride, c_ptr<float> in
+){
+    size_t combined = (in_channels << 16) | out_channels;
+    switch (combined){
+    case 0x00010001:
+        mix_channels_x64_AVX512<1, 1>(matrix, samples, out_stride, out, in_stride, in);
+        return;
+    case 0x00020001:
+        mix_channels_x64_AVX512<2, 1>(matrix, samples, out_stride, out, in_stride, in);
+        return;
+    case 0x00010002:
+        mix_channels_x64_AVX512<1, 2>(matrix, samples, out_stride, out, in_stride, in);
+        return;
+    case 0x00020002:
+        mix_channels_x64_AVX512<2, 2>(matrix, samples, out_stride, out, in_stride, in);
+        return;
+    default:
+        mix_channels_generic_x64_AVX512(
+            matrix, samples,
+            out_channels, out_stride, out,
+            in_channels, in_stride, in
+        );
+    }
+}
+
+
+
+
+class Test_x64_AVX512 : public Test{
+public:
+    Test_x64_AVX512(
+        size_t in_channels,
+        size_t out_channels,
+        size_t samples
+    )
+        : Test(
+            "x64_AVX512",
+            in_channels,
+            out_channels,
+            samples,
+            (Convert)mix_channels_Default,
+            (Convert)mix_channels_x64_AVX512
+        )
+    {}
+};
+void add_tests_x64_AVX512(UnitTestDatabase& database){
+    for (size_t in_channels = 1; in_channels <= 4; in_channels++){
+        for (size_t out_channels = 1; out_channels <= 4; out_channels++){
+            for (size_t samples = 2; samples < 1000; samples = (size_t)(samples * 1.1) + 1){
+                database.add<Test_x64_AVX512>(in_channels, out_channels, samples);
+            }
+        }
+    }
+}
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Kernels/AudioChannelMixer/Kernels_AudioChannelMixer_x64_FMA3.cpp b/SerialPrograms/Source/Kernels/AudioChannelMixer/Kernels_AudioChannelMixer_x64_FMA3.cpp
new file mode 100644
index 0000000000..5123a86e93
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/AudioChannelMixer/Kernels_AudioChannelMixer_x64_FMA3.cpp
@@ -0,0 +1,198 @@
+/*  Audio Channel Mixer (x64 FMA3)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifdef PA_AutoDispatch_x64_13_Haswell
+
+#include <immintrin.h>
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "Kernels_AudioChannelMixer_TestInfra.h"
+#include "Kernels_AudioChannelMixer_Default.h"
+
+namespace PokemonAutomation{
+namespace Kernels{
+namespace AudioChannelMixer{
+
+
+
+PA_FORCE_INLINE void mix_channels_generic_x64_FMA3(
+    c_ptr<float> matrix, size_t samples,
+    size_t out_channels, size_t out_stride, r_ptr<float> out,
+    size_t in_channels, size_t in_stride, c_ptr<float> in
+){
+    while (samples > 8){
+        for (size_t o = 0; o < out_channels; o++){
+            __m256 x = _mm256_setzero_ps();
+            for (size_t i = 0; i < in_channels; i++){
+                x = _mm256_fmadd_ps(
+                    _mm256_loadu_ps(in + in_stride * i),
+                    _mm256_set1_ps(matrix[i + in_channels * o]),
+                    x
+                );
+            }
+            _mm256_storeu_ps(out + out_stride * o, x);
+        }
+        in += 8;
+        out += 8;
+        samples -= 8;
+    }
+    mix_channels_GenericDefault(
+        matrix, samples,
+        out_channels, out_stride, out,
+        in_channels, in_stride, in
+    );
+}
+template <size_t in_channels, size_t out_channels>
+void mix_channels_x64_FMA3(
+    c_ptr<float> matrix, size_t samples,
+    size_t out_stride, r_ptr<float> out,
+    size_t in_stride, c_ptr<float> in
+);
+template <>
+void mix_channels_x64_FMA3<1, 1>(
+    c_ptr<float> matrix, size_t samples,
+    size_t out_stride, r_ptr<float> out,
+    size_t in_stride, c_ptr<float> in
+){
+    __m256 i0o0 = _mm256_set1_ps(matrix[0]);
+    while (samples > 8){
+        __m256 in0 = _mm256_loadu_ps(in);
+        __m256 out0 = _mm256_mul_ps(in0, i0o0);
+        _mm256_storeu_ps(out, out0);
+        in += 8;
+        out += 8;
+        samples -= 8;
+    }
+    mix_channels_Default<1, 1>(matrix, samples, out_stride, out, in_stride, in);
+}
+template <>
+void mix_channels_x64_FMA3<1, 2>(
+    c_ptr<float> matrix, size_t samples,
+    size_t out_stride, r_ptr<float> out,
+    size_t in_stride, c_ptr<float> in
+){
+    __m256 i0o0 = _mm256_set1_ps(matrix[0]);
+    __m256 i0o1 = _mm256_set1_ps(matrix[1]);
+    while (samples > 8){
+        __m256 in0 = _mm256_loadu_ps(in);
+        __m256 out0 = _mm256_mul_ps(in0, i0o0);
+        __m256 out1 = _mm256_mul_ps(in0, i0o1);
+        _mm256_storeu_ps(out + out_stride * 0, out0);
+        _mm256_storeu_ps(out + out_stride * 1, out1);
+        in += 8;
+        out += 8;
+        samples -= 8;
+    }
+    mix_channels_Default<1, 2>(matrix, samples, out_stride, out, in_stride, in);
+}
+template <>
+void mix_channels_x64_FMA3<2, 1>(
+    c_ptr<float> matrix, size_t samples,
+    size_t out_stride, r_ptr<float> out,
+    size_t in_stride, c_ptr<float> in
+){
+    __m256 i0o0 = _mm256_set1_ps(matrix[0]);
+    __m256 i1o0 = _mm256_set1_ps(matrix[1]);
+    while (samples > 8){
+        __m256 out0 = _mm256_mul_ps(i0o0, _mm256_loadu_ps(in + in_stride * 0));
+        out0 = _mm256_fmadd_ps(i1o0, _mm256_loadu_ps(in + in_stride * 1), out0);
+        _mm256_storeu_ps(out, out0);
+        in += 8;
+        out += 8;
+        samples -= 8;
+    }
+    mix_channels_Default<2, 1>(matrix, samples, out_stride, out, in_stride, in);
+}
+template <>
+void mix_channels_x64_FMA3<2, 2>(
+    c_ptr<float> matrix, size_t samples,
+    size_t out_stride, r_ptr<float> out,
+    size_t in_stride, c_ptr<float> in
+){
+    __m256 i0o0 = _mm256_set1_ps(matrix[0]);
+    __m256 i1o0 = _mm256_set1_ps(matrix[1]);
+    __m256 i0o1 = _mm256_set1_ps(matrix[2]);
+    __m256 i1o1 = _mm256_set1_ps(matrix[3]);
+    while (samples > 8){
+        __m256 in0 = _mm256_loadu_ps(in + in_stride * 0);
+        __m256 in1 = _mm256_loadu_ps(in + in_stride * 1);
+        __m256 out0 = _mm256_mul_ps(in0, i0o0);
+        __m256 out1 = _mm256_mul_ps(in0, i0o1);
+        out0 = _mm256_fmadd_ps(in1, i1o0, out0);
+        out1 = _mm256_fmadd_ps(in1, i1o1, out1);
+        _mm256_storeu_ps(out + out_stride * 0, out0);
+        _mm256_storeu_ps(out + out_stride * 1, out1);
+        in += 8;
+        out += 8;
+        samples -= 8;
+    }
+    mix_channels_Default<2, 2>(matrix, samples, out_stride, out, in_stride, in);
+}
+
+
+
+void mix_channels_x64_FMA3(
+    c_ptr<float> matrix, size_t samples,
+    size_t out_channels, size_t out_stride, r_ptr<float> out,
+    size_t in_channels, size_t in_stride, c_ptr<float> in
+){
+    size_t combined = (in_channels << 16) | out_channels;
+    switch (combined){
+    case 0x00010001:
+        mix_channels_x64_FMA3<1, 1>(matrix, samples, out_stride, out, in_stride, in);
+        return;
+    case 0x00020001:
+        mix_channels_x64_FMA3<2, 1>(matrix, samples, out_stride, out, in_stride, in);
+        return;
+    case 0x00010002:
+        mix_channels_x64_FMA3<1, 2>(matrix, samples, out_stride, out, in_stride, in);
+        return;
+    case 0x00020002:
+        mix_channels_x64_FMA3<2, 2>(matrix, samples, out_stride, out, in_stride, in);
+        return;
+    default:
+        mix_channels_generic_x64_FMA3(
+            matrix, samples,
+            out_channels, out_stride, out,
+            in_channels, in_stride, in
+        );
+    }
+}
+
+
+
+
+class Test_x64_FMA3 : public Test{
+public:
+    Test_x64_FMA3(
+        size_t in_channels,
+        size_t out_channels,
+        size_t samples
+    )
+        : Test(
+            "x64_FMA3",
+            in_channels,
+            out_channels,
+            samples,
+            (Convert)mix_channels_Default,
+            (Convert)mix_channels_x64_FMA3
+        )
+    {}
+};
+void add_tests_x64_FMA3(UnitTestDatabase& database){
+    for (size_t in_channels = 1; in_channels <= 4; in_channels++){
+        for (size_t out_channels = 1; out_channels <= 4; out_channels++){
+            for (size_t samples = 2; samples < 1000; samples = (size_t)(samples * 1.1) + 1){
+                database.add<Test_x64_FMA3>(in_channels, out_channels, samples);
+            }
+        }
+    }
+}
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Kernels/AudioChannelMixer/Kernels_AudioChannelMixer_x64_SSE.cpp b/SerialPrograms/Source/Kernels/AudioChannelMixer/Kernels_AudioChannelMixer_x64_SSE.cpp
new file mode 100644
index 0000000000..4ccd7496bb
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/AudioChannelMixer/Kernels_AudioChannelMixer_x64_SSE.cpp
@@ -0,0 +1,200 @@
+/*  Audio Channel Mixer (x64 SSE)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifdef PA_AutoDispatch_x64_08_Nehalem
+
+#include <emmintrin.h>
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "Kernels_AudioChannelMixer_TestInfra.h"
+#include "Kernels_AudioChannelMixer_Default.h"
+
+namespace PokemonAutomation{
+namespace Kernels{
+namespace AudioChannelMixer{
+
+
+
+PA_FORCE_INLINE void mix_channels_generic_x64_SSE(
+    c_ptr<float> matrix, size_t samples,
+    size_t out_channels, size_t out_stride, r_ptr<float> out,
+    size_t in_channels, size_t in_stride, c_ptr<float> in
+){
+    while (samples > 4){
+        for (size_t o = 0; o < out_channels; o++){
+            __m128 x = _mm_setzero_ps();
+            for (size_t i = 0; i < in_channels; i++){
+                x = _mm_add_ps(
+                    x,
+                    _mm_mul_ps(
+                        _mm_loadu_ps(in + in_stride * i),
+                        _mm_set1_ps(matrix[i + in_channels * o])
+                    )
+                );
+            }
+            _mm_storeu_ps(out + out_stride * o, x);
+        }
+        in += 4;
+        out += 4;
+        samples -= 4;
+    }
+    mix_channels_GenericDefault(
+        matrix, samples,
+        out_channels, out_stride, out,
+        in_channels, in_stride, in
+    );
+}
+template <size_t in_channels, size_t out_channels>
+void mix_channels_x64_SSE(
+    c_ptr<float> matrix, size_t samples,
+    size_t out_stride, r_ptr<float> out,
+    size_t in_stride, c_ptr<float> in
+);
+template <>
+void mix_channels_x64_SSE<1, 1>(
+    c_ptr<float> matrix, size_t samples,
+    size_t out_stride, r_ptr<float> out,
+    size_t in_stride, c_ptr<float> in
+){
+    __m128 i0o0 = _mm_set1_ps(matrix[0]);
+    while (samples > 4){
+        __m128 in0 = _mm_loadu_ps(in);
+        __m128 out0 = _mm_mul_ps(in0, i0o0);
+        _mm_storeu_ps(out, out0);
+        in += 4;
+        out += 4;
+        samples -= 4;
+    }
+    mix_channels_Default<1, 1>(matrix, samples, out_stride, out, in_stride, in);
+}
+template <>
+void mix_channels_x64_SSE<1, 2>(
+    c_ptr<float> matrix, size_t samples,
+    size_t out_stride, r_ptr<float> out,
+    size_t in_stride, c_ptr<float> in
+){
+    __m128 i0o0 = _mm_set1_ps(matrix[0]);
+    __m128 i0o1 = _mm_set1_ps(matrix[1]);
+    while (samples > 4){
+        __m128 in0 = _mm_loadu_ps(in);
+        __m128 out0 = _mm_mul_ps(in0, i0o0);
+        __m128 out1 = _mm_mul_ps(in0, i0o1);
+        _mm_storeu_ps(out + out_stride * 0, out0);
+        _mm_storeu_ps(out + out_stride * 1, out1);
+        in += 4;
+        out += 4;
+        samples -= 4;
+    }
+    mix_channels_Default<1, 2>(matrix, samples, out_stride, out, in_stride, in);
+}
+template <>
+void mix_channels_x64_SSE<2, 1>(
+    c_ptr<float> matrix, size_t samples,
+    size_t out_stride, r_ptr<float> out,
+    size_t in_stride, c_ptr<float> in
+){
+    __m128 i0o0 = _mm_set1_ps(matrix[0]);
+    __m128 i1o0 = _mm_set1_ps(matrix[1]);
+    while (samples > 4){
+        __m128 out0 = _mm_mul_ps(i0o0, _mm_loadu_ps(in + in_stride * 0));
+        out0 = _mm_add_ps(out0, _mm_mul_ps(i1o0, _mm_loadu_ps(in + in_stride * 1)));
+        _mm_storeu_ps(out, out0);
+        in += 4;
+        out += 4;
+        samples -= 4;
+    }
+    mix_channels_Default<2, 1>(matrix, samples, out_stride, out, in_stride, in);
+}
+template <>
+void mix_channels_x64_SSE<2, 2>(
+    c_ptr<float> matrix, size_t samples,
+    size_t out_stride, r_ptr<float> out,
+    size_t in_stride, c_ptr<float> in
+){
+    __m128 i0o0 = _mm_set1_ps(matrix[0]);
+    __m128 i1o0 = _mm_set1_ps(matrix[1]);
+    __m128 i0o1 = _mm_set1_ps(matrix[2]);
+    __m128 i1o1 = _mm_set1_ps(matrix[3]);
+    while (samples > 4){
+        __m128 in0 = _mm_loadu_ps(in + in_stride * 0);
+        __m128 in1 = _mm_loadu_ps(in + in_stride * 1);
+        __m128 out0 = _mm_mul_ps(in0, i0o0);
+        __m128 out1 = _mm_mul_ps(in0, i0o1);
+        out0 = _mm_add_ps(out0, _mm_mul_ps(in1, i1o0));
+        out1 = _mm_add_ps(out1, _mm_mul_ps(in1, i1o1));
+        _mm_storeu_ps(out + out_stride * 0, out0);
+        _mm_storeu_ps(out + out_stride * 1, out1);
+        in += 4;
+        out += 4;
+        samples -= 4;
+    }
+    mix_channels_Default<2, 2>(matrix, samples, out_stride, out, in_stride, in);
+}
+
+
+
+void mix_channels_x64_SSE(
+    c_ptr<float> matrix, size_t samples,
+    size_t out_channels, size_t out_stride, r_ptr<float> out,
+    size_t in_channels, size_t in_stride, c_ptr<float> in
+){
+    size_t combined = (in_channels << 16) | out_channels;
+    switch (combined){
+    case 0x00010001:
+        mix_channels_x64_SSE<1, 1>(matrix, samples, out_stride, out, in_stride, in);
+        return;
+    case 0x00020001:
+        mix_channels_x64_SSE<2, 1>(matrix, samples, out_stride, out, in_stride, in);
+        return;
+    case 0x00010002:
+        mix_channels_x64_SSE<1, 2>(matrix, samples, out_stride, out, in_stride, in);
+        return;
+    case 0x00020002:
+        mix_channels_x64_SSE<2, 2>(matrix, samples, out_stride, out, in_stride, in);
+        return;
+    default:
+        mix_channels_generic_x64_SSE(
+            matrix, samples,
+            out_channels, out_stride, out,
+            in_channels, in_stride, in
+        );
+    }
+}
+
+
+
+
+class Test_x64_SSE : public Test{
+public:
+    Test_x64_SSE(
+        size_t in_channels,
+        size_t out_channels,
+        size_t samples
+    )
+        : Test(
+            "x64_SSE",
+            in_channels,
+            out_channels,
+            samples,
+            (Convert)mix_channels_Default,
+            (Convert)mix_channels_x64_SSE
+        )
+    {}
+};
+void add_tests_x64_SSE(UnitTestDatabase& database){
+    for (size_t in_channels = 1; in_channels <= 4; in_channels++){
+        for (size_t out_channels = 1; out_channels <= 4; out_channels++){
+            for (size_t samples = 2; samples < 1000; samples = (size_t)(samples * 1.1) + 1){
+                database.add<Test_x64_SSE>(in_channels, out_channels, samples);
+            }
+        }
+    }
+}
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Kernels/AudioPipeline/Kernels_AudioPipeline.h b/SerialPrograms/Source/Kernels/AudioPipeline/Kernels_AudioPipeline.h
new file mode 100644
index 0000000000..f3925201f1
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/AudioPipeline/Kernels_AudioPipeline.h
@@ -0,0 +1,147 @@
+/*  Audio Pipeline
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Kernels_AudioPipeline_H
+#define PokemonAutomation_Kernels_AudioPipeline_H
+
+#include <cstddef>
+
+namespace PokemonAutomation{
+
+class UnitTestDatabase;
+
+namespace Kernels{
+namespace AudioPipeline{
+
+
+
+enum class SampleFormat{
+    UINT8,
+    SINT16,
+    SINT32,
+    FLOAT32,
+};
+
+
+
+class RawAudioStreamListener{
+public:
+    virtual ~RawAudioStreamListener() = default;
+
+    RawAudioStreamListener(
+        SampleFormat sample_type,
+        size_t sample_rate,
+        size_t channels
+    )
+        : m_sample_type(sample_type)
+        , m_channels(channels)
+        , m_sample_rate(sample_rate)
+    {}
+
+    SampleFormat sample_type() const{
+        return m_sample_type;
+    }
+    size_t channels() const{
+        return m_channels;
+    }
+    size_t sample_rate() const{
+        return m_sample_rate;
+    }
+
+    virtual void push_samples(size_t frames, const void* data) = 0;
+
+
+private:
+    const SampleFormat m_sample_type;
+    const size_t m_channels;
+    const size_t m_sample_rate;
+};
+
+
+
+class WorkingAudioStreamListener{
+public:
+    virtual ~WorkingAudioStreamListener() = default;
+
+    WorkingAudioStreamListener(
+        size_t sample_rate,
+        size_t channels
+    )
+        : m_in_sample_rate(sample_rate)
+        , m_in_channels(channels)
+    {}
+
+    size_t sample_rate() const{
+        return m_in_sample_rate;
+    }
+    size_t channels() const{
+        return m_in_channels;
+    }
+
+    virtual void push_samples(size_t samples, size_t stride, const float* data) = 0;
+
+
+private:
+    const size_t m_in_sample_rate;
+    const size_t m_in_channels;
+};
+
+
+class WorkingAudioNode : public WorkingAudioStreamListener{
+public:
+    virtual ~WorkingAudioNode() = default;
+    WorkingAudioNode(
+        size_t in_sample_rate, size_t out_sample_rate,
+        size_t in_channels, size_t out_channels
+    )
+        : WorkingAudioStreamListener(in_sample_rate, in_channels)
+        , m_out_sample_rate(out_sample_rate)
+        , m_out_channels(out_channels)
+    {}
+
+    virtual void add_listener(WorkingAudioStreamListener& listener) = 0;
+    virtual void remove_listener(WorkingAudioStreamListener& listener) = 0;
+
+    //  time(output[0]) - time(input[0]), in seconds: how far into the
+    //  input stream the output stream's time 0 sits. Zero for nodes that
+    //  don't shift the time base; an AudioResampler returns its weight
+    //  table's median-tap shift.
+    virtual double time_shift() const{
+        return 0.0;
+    }
+
+    size_t in_sample_rate() const{
+        return WorkingAudioStreamListener::sample_rate();
+    }
+    size_t out_sample_rate() const{
+        return m_out_sample_rate;
+    }
+    size_t in_channels() const{
+        return WorkingAudioStreamListener::channels();
+    }
+    size_t out_channels() const{
+        return m_out_channels;
+    }
+
+
+private:
+    const size_t m_out_sample_rate;
+    const size_t m_out_channels;
+};
+
+
+
+
+
+void add_tests(UnitTestDatabase& database);
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Kernels/AudioPipeline/Kernels_AudioPipeline_RoundTrip_TestInfra.cpp b/SerialPrograms/Source/Kernels/AudioPipeline/Kernels_AudioPipeline_RoundTrip_TestInfra.cpp
new file mode 100644
index 0000000000..e1b77b0098
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/AudioPipeline/Kernels_AudioPipeline_RoundTrip_TestInfra.cpp
@@ -0,0 +1,195 @@
+/*  Audio Pipeline - Raw<->Working Round-Trip Test Infra
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <limits>
+#include <random>
+#include <type_traits>
+#include "Common/Cpp/Exceptions.h"
+#include "Common/Cpp/PrettyPrint.h"
+#include "Common/Cpp/Containers/AlignedVector.tpp"
+#include "Common/Cpp/Containers/GuardPageBuffer.h"
+#include "Kernels_AudioPipeline_RoundTrip_TestInfra.h"
+#include "Kernels_RawAudio2WorkingAudio.h"
+#include "Kernels_WorkingAudio2RawAudio.h"
+
+namespace PokemonAutomation{
+namespace Kernels{
+namespace AudioPipeline{
+
+
+
+
+namespace{
+
+
+
+template <typename Type>
+class RecordingRawAudioListener : public RawAudioStreamListener{
+public:
+    RecordingRawAudioListener(
+        SampleFormat sample_type,
+        size_t sample_rate,
+        size_t channels,
+        size_t total_samples
+    )
+        : RawAudioStreamListener(sample_type, sample_rate, channels)
+        , m_data(total_samples)
+    {}
+
+    virtual void push_samples(size_t frames, const void* data) override{
+        const Type* input = (const Type*)data;
+        size_t count = frames * channels();
+        for (size_t c = 0; c < count; c++){
+            m_data[m_write_index + c] = input[c];
+        }
+        m_write_index += count;
+    }
+
+    const AlignedVector<Type>& data() const{
+        return m_data;
+    }
+    size_t written() const{
+        return m_write_index;
+    }
+
+
+private:
+    AlignedVector<Type> m_data;
+    size_t m_write_index = 0;
+};
+
+
+
+std::string sample_typestr(SampleFormat sample_type){
+    switch (sample_type){
+    case SampleFormat::UINT8:   return "u8";
+    case SampleFormat::SINT16:  return "s16";
+    case SampleFormat::SINT32:  return "s32";
+    case SampleFormat::FLOAT32: return "f32";
+    default:;
+    }
+    return "?";
+}
+
+
+
+template <typename Type>
+UnitTestResult run_round_trip(
+    SampleFormat sample_type,
+    size_t channels,
+    size_t samples,
+    float multiplier
+){
+    //  Generate random input. It ends right before a guard page, so a read
+    //  past the end faults.
+    GuardPageBuffer<Type> input(samples * channels);
+    std::mt19937 generator(42);
+    if constexpr (std::is_same_v<Type, float>){
+        //  Random integer values, all exactly representable.
+        std::uniform_int_distribution<long long> distribution(-128, 128);
+        for (size_t c = 0; c < input.size(); c++){
+            input[c] = (float)distribution(generator);
+        }
+    }else{
+        std::uniform_int_distribution<long long> distribution(
+            std::numeric_limits<Type>::min(),
+            std::numeric_limits<Type>::max()
+        );
+        for (size_t c = 0; c < input.size(); c++){
+            input[c] = (Type)distribution(generator);
+        }
+    }
+
+    const size_t sample_rate = 44100;
+
+    //  Small buffer so the sample-size sweep hits multiple chunks.
+    const size_t buffer_size = 256;
+    RawAudio2WorkingAudio raw2working(sample_type, sample_rate, channels, multiplier, buffer_size);
+    WorkingAudio2RawAudio working2raw(sample_type, sample_rate, channels, 1.0f / multiplier, buffer_size);
+    RecordingRawAudioListener<Type> output(sample_type, sample_rate, channels, samples * channels);
+    raw2working.add_listener(working2raw);
+    working2raw.add_listener(output);
+
+    raw2working.push_samples(samples, input.data());
+
+    if (output.written() != samples * channels){
+        return "Received " + std::to_string(output.written()) + " samples, expected " +
+            std::to_string(samples * channels) + ".";
+    }
+
+    //  Check for errors.
+    for (size_t c = 0; c < input.size(); c++){
+        if constexpr (std::is_same_v<Type, int32_t>){
+            //  int32_t is lossy due to round-off.
+            int64_t diff = int64_t(input[c]) - output.data()[c];
+            if (std::abs(diff) > 16384){
+                return "Mismatch at " + std::to_string(c) + ": " +
+                    std::to_string(input[c]) + " != " + std::to_string(output.data()[c]);
+            }
+        }else if constexpr (std::is_same_v<Type, float>){
+            //  The gain round-trip (x * m * (1/m)) is not exactly x in
+            //  floating point; allow a few ULPs of round-off.
+            float diff = input[c] - output.data()[c];
+            if (std::abs(diff) > 1e-4f){
+                return "Mismatch at " + std::to_string(c) + ": " +
+                    tostr_default(input[c]) + " != " + tostr_default(output.data()[c]) +
+                    " (diff " + tostr_default(diff) + ").";
+            }
+        }else{
+            if (input[c] != output.data()[c]){
+                return "Mismatch at " + std::to_string(c) + ": " +
+                    std::to_string(input[c]) + " != " + std::to_string(output.data()[c]);
+            }
+        }
+
+    }
+
+    return true;
+}
+
+
+
+}
+
+
+
+
+RoundTripTest::RoundTripTest(
+    SampleFormat sample_type,
+    size_t channels,
+    size_t samples,
+    float multiplier
+)
+    : UnitTest(
+        "Kernels::AudioPipeline - RoundTrip_" + sample_typestr(sample_type) +
+        "(" + std::to_string(channels) + "ch x " + std::to_string(samples) + ", m=" + tostr_default(multiplier) + ")"
+    )
+    , m_sample_type(sample_type)
+    , m_channels(channels)
+    , m_samples(samples)
+    , m_multiplier(multiplier)
+{}
+UnitTestResult RoundTripTest::run(Logger& logger, CancellableScope& scope) const{
+    switch (m_sample_type){
+    case SampleFormat::UINT8:
+        return run_round_trip<uint8_t>(m_sample_type, m_channels, m_samples, m_multiplier);
+    case SampleFormat::SINT16:
+        return run_round_trip<int16_t>(m_sample_type, m_channels, m_samples, m_multiplier);
+    case SampleFormat::SINT32:
+        return run_round_trip<int32_t>(m_sample_type, m_channels, m_samples, m_multiplier);
+    case SampleFormat::FLOAT32:
+        return run_round_trip<float>(m_sample_type, m_channels, m_samples, m_multiplier);
+    default:
+        throw InternalProgramError(&logger, PA_CURRENT_FUNCTION, "Unknown sample type.");
+    }
+}
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/Kernels/AudioPipeline/Kernels_AudioPipeline_RoundTrip_TestInfra.h b/SerialPrograms/Source/Kernels/AudioPipeline/Kernels_AudioPipeline_RoundTrip_TestInfra.h
new file mode 100644
index 0000000000..bcecc667bf
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/AudioPipeline/Kernels_AudioPipeline_RoundTrip_TestInfra.h
@@ -0,0 +1,51 @@
+/*  Audio Pipeline - Raw<->Working Round-Trip Test Infra
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/TestRunners/UnitTest.h"
+
+#ifndef PokemonAutomation_Kernels_AudioPipeline_RoundTrip_TestInfra_H
+#define PokemonAutomation_Kernels_AudioPipeline_RoundTrip_TestInfra_H
+
+#include "Kernels_AudioPipeline.h"
+
+namespace PokemonAutomation{
+namespace Kernels{
+namespace AudioPipeline{
+
+
+
+
+//
+//  Pushes random samples through a RawAudio2WorkingAudio node and a
+//  WorkingAudio2RawAudio node (with a 1.0f multiplier), then compares the
+//  resulting raw samples to the input.
+//
+class RoundTripTest : public UnitTest{
+public:
+    RoundTripTest(
+        SampleFormat sample_type,
+        size_t channels,
+        size_t samples,
+        float multiplier
+    );
+
+    virtual UnitTestResult run(Logger& logger, CancellableScope& scope) const override;
+
+
+private:
+    const SampleFormat m_sample_type;
+    const size_t m_channels;
+    const size_t m_samples;
+    const float m_multiplier;
+};
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Kernels/AudioPipeline/Kernels_AudioPipeline_Tests.cpp b/SerialPrograms/Source/Kernels/AudioPipeline/Kernels_AudioPipeline_Tests.cpp
new file mode 100644
index 0000000000..f88f155fde
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/AudioPipeline/Kernels_AudioPipeline_Tests.cpp
@@ -0,0 +1,591 @@
+/*  Audio Pipeline Tests
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <random>
+#include <vector>
+#include <memory>
+#include <cstring>
+#include <QAudioFormat>
+#include "Common/Cpp/Exceptions.h"
+#include "Common/Cpp/PrettyPrint.h"
+#include "Common/Cpp/Containers/AlignedVector.tpp"
+#include "Common/Cpp/Containers/GuardPageBuffer.h"
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "Kernels/AudioResampler/Kernels_AudioResampler.h"
+#include "CommonFramework/AudioPipeline/Tools/ChannelMixer.h"
+#include "Kernels_AudioPipeline.h"
+#include "Kernels_RawAudio2WorkingAudio.h"
+#include "Kernels_WorkingAudio2RawAudio.h"
+#include "Kernels_AudioPipeline_RoundTrip_TestInfra.h"
+#include "Kernels_ChannelMixer_TestInfra.h"
+#include "Kernels_ChannelMixer.h"
+#include "Kernels_WorkingAudio2WorkingAudio.h"
+
+namespace PokemonAutomation{
+namespace Kernels{
+namespace AudioPipeline{
+
+
+
+namespace{
+
+
+
+class RecordingWorkingAudioListener : public WorkingAudioStreamListener{
+public:
+    RecordingWorkingAudioListener(size_t sample_rate, size_t channels, size_t total_frames)
+        : WorkingAudioStreamListener(sample_rate, channels)
+        , m_data(total_frames * channels)
+    {}
+
+    virtual void push_samples(size_t samples, size_t stride, const float* data) override{
+        for (size_t i = 0; i < samples; i++){
+            for (size_t c = 0; c < channels(); c++){
+                m_data[m_write_index + i * channels() + c] = data[c * stride + i];
+            }
+        }
+        m_write_index += samples * channels();
+    }
+
+    const AlignedVector<float>& data() const{
+        return m_data;
+    }
+    size_t frames_written() const{
+        return m_write_index / channels();
+    }
+
+
+private:
+    AlignedVector<float> m_data;
+    size_t m_write_index = 0;
+};
+
+
+
+class RecordingRawFloatListener : public RawAudioStreamListener{
+public:
+    RecordingRawFloatListener(size_t sample_rate, size_t channels, size_t total_frames)
+        : RawAudioStreamListener(SampleFormat::FLOAT32, sample_rate, channels)
+        , m_data(total_frames * channels)
+    {}
+
+    virtual void push_samples(size_t frames, const void* data) override{
+        const float* input = (const float*)data;
+        for (size_t c = 0; c < frames * channels(); c++){
+            m_data[m_write_index + c] = input[c];
+        }
+        m_write_index += frames * channels();
+    }
+
+    const AlignedVector<float>& data() const{
+        return m_data;
+    }
+    size_t frames_written() const{
+        return m_write_index / channels();
+    }
+
+
+private:
+    AlignedVector<float> m_data;
+    size_t m_write_index = 0;
+};
+
+
+
+//  The buffer ends right before a guard page, so a read past the end faults.
+GuardPageBuffer<float> random_float_input(size_t total_samples, uint32_t seed){
+    GuardPageBuffer<float> input(total_samples);
+    std::mt19937 generator(seed);
+    //  Integer values, all exactly representable in float.
+    std::uniform_int_distribution<long long> distribution(-128, 128);
+    for (size_t c = 0; c < total_samples; c++){
+        input[c] = (float)distribution(generator);
+    }
+    return input;
+}
+
+
+
+}
+
+
+
+//
+//  Pushes random float samples through a RawAudio2WorkingAudio and checks
+//  that the gain actually reaches the output (the FLOAT32 zero-copy fast
+//  path must not drop the multiplier).
+//
+class RawFloatGainTest : public UnitTest{
+public:
+    RawFloatGainTest(size_t channels, size_t samples, float multiplier)
+        : UnitTest(
+            "Kernels::AudioPipeline - RawFloatGain(" + std::to_string(channels) + "ch x " +
+            std::to_string(samples) + ", m=" + tostr_default(multiplier) + ")"
+        )
+        , m_channels(channels)
+        , m_samples(samples)
+        , m_multiplier(multiplier)
+    {}
+
+    virtual UnitTestResult run(Logger& logger, CancellableScope& scope) const override{
+        const size_t sample_rate = 44100;
+        const size_t buffer_size = 256; //  Small buffer so the sweep hits multiple chunks.
+
+        GuardPageBuffer<float> input = random_float_input(m_samples * m_channels, 42);
+        RawAudio2WorkingAudio raw2working(
+            SampleFormat::FLOAT32, sample_rate, m_channels, m_multiplier, buffer_size
+        );
+        RecordingWorkingAudioListener output(sample_rate, m_channels, m_samples);
+        raw2working.add_listener(output);
+
+        raw2working.push_samples(m_samples, input.data());
+
+        if (output.frames_written() != m_samples){
+            return "Received " + std::to_string(output.frames_written()) + " frames, expected " +
+                std::to_string(m_samples) + ".";
+        }
+
+        for (size_t c = 0; c < input.size(); c++){
+            float expected = input[c] * m_multiplier;
+            if (output.data()[c] != expected){
+                return "Mismatch at " + std::to_string(c) + ": " +
+                    tostr_default(input[c]) + " * " + tostr_default(m_multiplier) + " = " +
+                    tostr_default(expected) + " != " + tostr_default(output.data()[c]) + ".";
+            }
+        }
+
+        return true;
+    }
+
+
+private:
+    const size_t m_channels;
+    const size_t m_samples;
+    const float m_multiplier;
+};
+
+
+
+//
+//  Pushes random float samples through a WorkingAudio2RawAudio and checks
+//  that the gain actually reaches the output (the FLOAT32 zero-copy fast
+//  path must not drop the multiplier).
+//
+class WorkingFloatGainTest : public UnitTest{
+public:
+    WorkingFloatGainTest(size_t channels, size_t samples, float multiplier)
+        : UnitTest(
+            "Kernels::AudioPipeline - WorkingFloatGain(" + std::to_string(channels) + "ch x " +
+            std::to_string(samples) + ", m=" + tostr_default(multiplier) + ")"
+        )
+        , m_channels(channels)
+        , m_samples(samples)
+        , m_multiplier(multiplier)
+    {}
+
+    virtual UnitTestResult run(Logger& logger, CancellableScope& scope) const override{
+        const size_t sample_rate = 44100;
+        const size_t buffer_size = 256; //  Small buffer so the sweep hits multiple chunks.
+
+        //  Working format: channel-strided, one block per channel.
+        GuardPageBuffer<float> input = random_float_input(m_samples * m_channels, 42);
+        WorkingAudio2RawAudio working2raw(
+            SampleFormat::FLOAT32, sample_rate, m_channels, m_multiplier, buffer_size
+        );
+        RecordingRawFloatListener output(sample_rate, m_channels, m_samples);
+        working2raw.add_listener(output);
+
+        working2raw.push_samples(m_samples, m_samples, input.data());
+
+        if (output.frames_written() != m_samples){
+            return "Received " + std::to_string(output.frames_written()) + " frames, expected " +
+                std::to_string(m_samples) + ".";
+        }
+
+        for (size_t i = 0; i < m_samples; i++){
+            for (size_t c = 0; c < m_channels; c++){
+                float expected = input[c * m_samples + i] * m_multiplier;
+                if (output.data()[i * m_channels + c] != expected){
+                    return "Mismatch at " + std::to_string(i * m_channels + c) + ": " +
+                        tostr_default(input[c * m_samples + i]) + " * " + tostr_default(m_multiplier) +
+                        " = " + tostr_default(expected) + " != " +
+                        tostr_default(output.data()[i * m_channels + c]) + ".";
+                }
+            }
+        }
+
+        return true;
+    }
+
+
+private:
+    const size_t m_channels;
+    const size_t m_samples;
+    const float m_multiplier;
+};
+
+
+
+//
+//  Checks that set_multiplier() applies live: each batch is recorded with
+//  the gain that was in effect when it was pushed, for both nodes.
+//
+class FloatGainLiveUpdateTest : public UnitTest{
+public:
+    FloatGainLiveUpdateTest()
+        : UnitTest("Kernels::AudioPipeline - FloatGainLiveUpdate(3 batches)")
+    {}
+
+    virtual UnitTestResult run(Logger& logger, CancellableScope& scope) const override{
+        const size_t sample_rate = 44100;
+        const size_t channels = 1;
+        const size_t batch = 1000;
+        const size_t buffer_size = 256;
+
+        std::vector<float> gains = {1.0f, 0.5f, 1.0f};
+        std::vector<GuardPageBuffer<float>> inputs;
+        for (size_t b = 0; b < gains.size(); b++){
+            inputs.emplace_back(random_float_input(batch, 42));
+        }
+
+        //  RawAudio2WorkingAudio.
+        {
+            RawAudio2WorkingAudio raw2working(
+                SampleFormat::FLOAT32, sample_rate, channels, gains[0], buffer_size
+            );
+            RecordingWorkingAudioListener output(sample_rate, channels, batch * 3);
+            raw2working.add_listener(output);
+
+            for (size_t b = 0; b < inputs.size(); b++){
+                raw2working.set_multiplier(gains[b]);
+                raw2working.push_samples(batch, inputs[b].data());
+            }
+
+            if (output.frames_written() != batch * 3){
+                return "RawAudio2WorkingAudio: received " + std::to_string(output.frames_written()) +
+                    " frames, expected " + std::to_string(batch * 3) + ".";
+            }
+            for (size_t b = 0; b < inputs.size(); b++){
+                for (size_t i = 0; i < batch; i++){
+                    float expected = inputs[b][i] * gains[b];
+                    size_t index = b * batch + i;
+                    if (output.data()[index] != expected){
+                        return "RawAudio2WorkingAudio batch " + std::to_string(b) +
+                            " mismatch at " + std::to_string(i) + ": " + tostr_default(expected) +
+                            " != " + tostr_default(output.data()[index]) + ".";
+                    }
+                }
+            }
+        }
+
+        //  WorkingAudio2RawAudio.
+        {
+            WorkingAudio2RawAudio working2raw(
+                SampleFormat::FLOAT32, sample_rate, channels, gains[0], buffer_size
+            );
+            RecordingRawFloatListener output(sample_rate, channels, batch * 3);
+            working2raw.add_listener(output);
+
+            for (size_t b = 0; b < inputs.size(); b++){
+                working2raw.set_multiplier(gains[b]);
+                working2raw.push_samples(batch, batch, inputs[b].data());
+            }
+
+            if (output.frames_written() != batch * 3){
+                return "WorkingAudio2RawAudio: received " + std::to_string(output.frames_written()) +
+                    " frames, expected " + std::to_string(batch * 3) + ".";
+            }
+            for (size_t b = 0; b < inputs.size(); b++){
+                for (size_t i = 0; i < batch; i++){
+                    float expected = inputs[b][i] * gains[b];
+                    size_t index = b * batch + i;
+                    if (output.data()[index] != expected){
+                        return "WorkingAudio2RawAudio batch " + std::to_string(b) +
+                            " mismatch at " + std::to_string(i) + ": " + tostr_default(expected) +
+                            " != " + tostr_default(output.data()[index]) + ".";
+                    }
+                }
+            }
+        }
+
+        return true;
+    }
+};
+
+
+
+//
+//  WorkingAudio2WorkingAudio vs. the hand-wired chain of the same kernels.
+//
+//  The all-in-one node orders its internals by channel count:
+//    - in_channels >= out_channels: mixer (at the input rate) -> resampler,
+//    - in_channels <  out_channels: resampler (at the input channel count) ->
+//      mixer (at the output rate).
+//  Identical input is fed through the node and through that exact hand-wired
+//  chain, and the outputs are asserted bit-identical. The two orderings are
+//  mathematically equivalent (both are LTI - mixing and FIR resampling
+//  commute), so this pins the node's wiring, the shared matrix construction
+//  and the stride forwarding.
+//
+class Working2WorkingOrderTest : public UnitTest{
+public:
+    Working2WorkingOrderTest(size_t in_rate, size_t out_rate, size_t in_ch, size_t out_ch)
+        : UnitTest(
+            "Kernels::AudioPipeline - Working2WorkingOrder(" +
+            std::to_string(in_rate) + "->" + std::to_string(out_rate) + "Hz, " +
+            std::to_string(in_ch) + "ch->" + std::to_string(out_ch) + "ch)"
+        )
+        , m_in_rate(in_rate)
+        , m_out_rate(out_rate)
+        , m_in_ch(in_ch)
+        , m_out_ch(out_ch)
+    {}
+
+    virtual UnitTestResult run(Logger& logger, CancellableScope& scope) const override{
+        const size_t frames = 8192;
+
+        //  Planar input: channel c lives at [c * frames .. c * frames + frames).
+        AlignedVector<float> input(m_in_ch * frames);
+        std::mt19937 generator(42);
+        std::uniform_real_distribution<float> distribution(-1.0f, 1.0f);
+        for (size_t c = 0; c < m_in_ch; c++){
+            for (size_t i = 0; i < frames; i++){
+                input[c * frames + i] = distribution(generator);
+            }
+        }
+
+        auto channel_format = [](size_t channels){
+            QAudioFormat format;
+            format.setChannelCount((int)channels);
+            format.setChannelConfig(
+                channels == 1
+                    ? QAudioFormat::ChannelConfig::ChannelConfigMono
+                    : QAudioFormat::ChannelConfig::ChannelConfigStereo
+            );
+            return format;
+        };
+        const QAudioFormat in_format = channel_format(m_in_ch);
+        const QAudioFormat out_format = channel_format(m_out_ch);
+
+        //  The node under test.
+        std::vector<float> node_matrix = build_channel_mixer_matrix(in_format, out_format);
+        if (node_matrix.size() != m_in_ch * m_out_ch){
+            return "No channel mixer matrix for this conversion.";
+        }
+        WorkingAudio2WorkingAudio node(
+            logger, m_in_rate, m_out_rate, m_in_ch, m_out_ch, node_matrix
+        );
+        RecordingWorkingAudioListener node_output(m_out_rate, m_out_ch, frames * 2);
+        node.add_listener(node_output);
+
+        //  The hand-wired chain, in the node's internal ordering.
+        std::vector<float> chain_matrix = build_channel_mixer_matrix(in_format, out_format);
+        std::unique_ptr<ChannelMixer> chain_mixer;
+        std::unique_ptr<AudioResampler::AudioResampler> chain_resampler;
+        WorkingAudioNode* chain_head = nullptr;
+        WorkingAudioNode* chain_tail = nullptr;
+        if (m_in_ch >= m_out_ch){
+            chain_mixer.reset(new ChannelMixer(
+                logger, m_in_rate, m_in_ch, m_out_ch, chain_matrix
+            ));
+            chain_head = chain_mixer.get();
+            if (m_in_rate != m_out_rate){
+                chain_resampler.reset(new AudioResampler::AudioResampler(
+                    logger, m_in_rate, m_out_rate, m_out_ch
+                ));
+                chain_mixer->add_listener(*chain_resampler);
+                chain_tail = chain_resampler.get();
+            }else{
+                chain_tail = chain_mixer.get();
+            }
+        }else{
+            chain_mixer.reset(new ChannelMixer(
+                logger, m_out_rate, m_in_ch, m_out_ch, chain_matrix
+            ));
+            chain_tail = chain_mixer.get();
+            if (m_in_rate != m_out_rate){
+                chain_resampler.reset(new AudioResampler::AudioResampler(
+                    logger, m_in_rate, m_out_rate, m_in_ch
+                ));
+                chain_resampler->add_listener(*chain_tail);
+                chain_head = chain_resampler.get();
+            }else{
+                chain_head = chain_mixer.get();
+            }
+        }
+        RecordingWorkingAudioListener chain_output(m_out_rate, m_out_ch, frames * 2);
+        chain_tail->add_listener(chain_output);
+
+        //  Feed both in two chunks, each with a padded stride (stride >
+        //  samples exercises the channel-block layout handling).
+        size_t offset = 0;
+        const size_t chunk_sizes[] = {5000, frames - 5000};
+        for (size_t chunk : chunk_sizes){
+            AlignedVector<float> padded(m_in_ch * (chunk + 3));
+            for (size_t c = 0; c < m_in_ch; c++){
+                for (size_t i = 0; i < chunk; i++){
+                    padded[c * (chunk + 3) + i] = input[c * frames + offset + i];
+                }
+            }
+            node.push_samples(chunk, chunk + 3, padded.data());
+            chain_head->push_samples(chunk, chunk + 3, padded.data());
+            offset += chunk;
+        }
+
+        const size_t written = node_output.frames_written();
+        if (written == 0){
+            return "No output was produced.";
+        }
+        if (written != chain_output.frames_written()){
+            return "Frame count mismatch: node wrote " + std::to_string(written) +
+                " frames, chain wrote " + std::to_string(chain_output.frames_written()) + ".";
+        }
+        const auto& a = node_output.data();
+        const auto& b = chain_output.data();
+        const size_t count = written * m_out_ch;
+        if (std::memcmp(a.data(), b.data(), count * sizeof(float)) != 0){
+            for (size_t i = 0; i < count; i++){
+                if (a[i] != b[i]){
+                    return "Mismatch at " + std::to_string(i) + ": " + tostr_default(a[i]) +
+                        " != " + tostr_default(b[i]) + ".";
+                }
+            }
+            return "Bit-level mismatch with equal values (sign of zero or NaN payload).";
+        }
+
+        return true;
+    }
+
+
+private:
+    const size_t m_in_rate;
+    const size_t m_out_rate;
+    const size_t m_in_ch;
+    const size_t m_out_ch;
+};
+
+
+
+//
+//  ChannelMixer with pushes larger than its internal buffer.
+//
+//  mix_channels() strides the output buffer at the buffer size, so
+//  push_samples() must chunk larger pushes internally. An identity mix
+//  must pass every sample through unchanged, regardless of how the
+//  push is split up.
+//
+class MixerOverBufferPushTest : public UnitTest{
+public:
+    MixerOverBufferPushTest(size_t channels, size_t samples)
+        : UnitTest(
+            "Kernels::AudioPipeline - MixerOverBufferPush(" +
+            std::to_string(channels) + "ch x " + std::to_string(samples) + ")"
+        )
+        , m_channels(channels)
+        , m_samples(samples)
+    {}
+
+    virtual UnitTestResult run(Logger& logger, CancellableScope& scope) const override{
+        std::vector<float> matrix(m_channels * m_channels, 0.0f);
+        for (size_t c = 0; c < m_channels; c++){
+            matrix[c + m_channels * c] = 1.0f;
+        }
+
+        GuardPageBuffer<float> input = random_float_input(m_samples * m_channels, 42);
+
+        const size_t sample_rate = 44100;
+        ChannelMixer mixer(logger, sample_rate, m_channels, m_channels, std::move(matrix));
+        RecordingWorkingAudioListener listener(sample_rate, m_channels, m_samples);
+        mixer.add_listener(listener);
+
+        //  A single push larger than the mixer's internal buffer (4096 + 256).
+        mixer.push_samples(m_samples, m_samples, input.data());
+
+        if (listener.frames_written() != m_samples){
+            return "Received " + std::to_string(listener.frames_written()) + " frames, expected " +
+                std::to_string(m_samples) + ".";
+        }
+
+        for (size_t i = 0; i < m_samples; i++){
+            for (size_t c = 0; c < m_channels; c++){
+                float expected = input[c * m_samples + i];
+                if (expected != listener.data()[i * m_channels + c]){
+                    return "Mismatch at (" + std::to_string(i) + ", " + std::to_string(c) + "): " +
+                        tostr_default(expected) + " != " +
+                        tostr_default(listener.data()[i * m_channels + c]) + ".";
+                }
+            }
+        }
+
+        return true;
+    }
+
+
+private:
+    const size_t m_channels;
+    const size_t m_samples;
+};
+
+
+
+void add_tests(UnitTestDatabase& database){
+    //  Raw -> Working -> Raw round-trip.
+    for (size_t channels = 1; channels <= 4; channels++){
+        for (size_t samples = 2; samples < 1000; samples = (size_t)(samples * 1.1) + 1){
+            for (float multiplier = 0.1f; multiplier <= 1.0f; multiplier += 0.1f){
+                database.add<RoundTripTest>(SampleFormat::UINT8, channels, samples, multiplier);
+                database.add<RoundTripTest>(SampleFormat::SINT16, channels, samples, multiplier);
+                database.add<RoundTripTest>(SampleFormat::SINT32, channels, samples, multiplier);
+                database.add<RoundTripTest>(SampleFormat::FLOAT32, channels, samples, multiplier);
+            }
+        }
+    }
+
+    //  FLOAT32 gain: the zero-copy fast paths must not drop the multiplier.
+    //  (m == 1.0 exercises the fast path; the others the conversion path.)
+    for (size_t channels = 1; channels <= 2; channels++){
+        for (size_t samples = 2; samples < 1000; samples = (size_t)(samples * 1.1) + 1){
+            const float gain_multipliers[] = {0.1f, 0.4f, 0.7f, 1.0f};
+            for (float multiplier : gain_multipliers){
+                database.add<RawFloatGainTest>(channels, samples, multiplier);
+                database.add<WorkingFloatGainTest>(channels, samples, multiplier);
+            }
+        }
+    }
+
+    //  set_multiplier() applies live, switching the fast path on and off.
+    database.add<FloatGainLiveUpdateTest>();
+
+    //  ChannelMixer with an identity weight matrix.
+    for (size_t channels = 1; channels <= 4; channels++){
+        database.add<MixerIdentityTest>(channels, 1000);
+    }
+
+    //  1 -> 2 -> 1 averaging round-trip.
+    database.add<MixerRoundTripTest>(1000);
+
+    //  Pushes larger than the mixer's internal buffer get chunked.
+    for (size_t channels = 1; channels <= 3; channels++){
+        database.add<MixerOverBufferPushTest>(channels, 10000);
+    }
+
+    //  WorkingAudio2WorkingAudio vs. the hand-wired chain: both internal
+    //  orderings (mix -> resample, resample -> mix), plus the mix-only,
+    //  identity-matrix + resample and pure pass-through (identity matrix,
+    //  same rate) cases.
+    database.add<Working2WorkingOrderTest>(44100, 48000, 2, 1);
+    database.add<Working2WorkingOrderTest>(44100, 48000, 1, 2);
+    database.add<Working2WorkingOrderTest>(48000, 48000, 2, 1);
+    database.add<Working2WorkingOrderTest>(48000, 48000, 1, 2);
+    database.add<Working2WorkingOrderTest>(48000, 44100, 2, 2);
+    database.add<Working2WorkingOrderTest>(48000, 48000, 2, 2);
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/Kernels/AudioPipeline/Kernels_ChannelMixer.cpp b/SerialPrograms/Source/Kernels/AudioPipeline/Kernels_ChannelMixer.cpp
new file mode 100644
index 0000000000..cc048ff3b7
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/AudioPipeline/Kernels_ChannelMixer.cpp
@@ -0,0 +1,87 @@
+/*  Audio Pipeline - ChannelMixer
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <algorithm>
+#include "Common/Cpp/Exceptions.h"
+#include "Common/Cpp/PrettyPrint.h"
+#include "Common/Cpp/Containers/AlignedVector.tpp"
+#include "Kernels/AudioChannelMixer/Kernels_AudioChannelMixer.h"
+#include "Kernels/Kernels_Alignment.h"
+#include "Kernels_ChannelMixer.h"
+
+namespace PokemonAutomation{
+namespace Kernels{
+namespace AudioPipeline{
+
+
+
+ChannelMixer::~ChannelMixer() = default;
+ChannelMixer::ChannelMixer(
+    Logger& logger,
+    size_t sample_rate,
+    size_t in_channels,
+    size_t out_channels,
+    std::vector<float> weight_matrix,
+    size_t buffer_size
+)
+    : WorkingAudioNode(sample_rate, sample_rate, in_channels, out_channels)
+    //  Round the buffer up to PA_ALIGNMENT bytes so that channels beyond
+    //  channel 0 start aligned for the SIMD kernels.
+    , m_buffer_size(
+        align_int_up<PA_ALIGNMENT>(buffer_size * sizeof(float)) / sizeof(float)
+    )
+    , m_weight_matrix(std::move(weight_matrix))
+    , m_buffer(out_channels * m_buffer_size)
+{
+    if (m_weight_matrix.size() != in_channels * out_channels){
+        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Weight matrix size doesn't match.");
+    }
+    logger.log(
+        "Initializing ChannelMixer: " + tostr_u_commas(in_channels) +
+        " -> " + tostr_u_commas(out_channels) +
+        " x " + tostr_u_commas(sample_rate) + " Hz",
+        COLOR_PURPLE
+    );
+}
+
+void ChannelMixer::add_listener(WorkingAudioStreamListener& listener){
+    if (out_sample_rate() != listener.sample_rate()){
+        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Sample rate doesn't match.");
+    }
+    if (out_channels() != listener.channels()){
+        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Channel count doesn't match.");
+    }
+    m_listeners.add(listener);
+}
+void ChannelMixer::remove_listener(WorkingAudioStreamListener& listener){
+    m_listeners.remove(listener);
+}
+
+void ChannelMixer::push_samples(size_t samples, size_t stride, const float* data){
+    //  mix_channels() strides the output buffer at m_buffer_size, so it can
+    //  mix at most m_buffer_size samples per call; chunk larger pushes.
+    while (samples > 0){
+        const size_t block = std::min(samples, m_buffer_size);
+        AudioChannelMixer::mix_channels(
+            m_weight_matrix.data(),
+            block,
+            out_channels(), m_buffer_size, m_buffer.data(),
+            in_channels(), stride, data
+        );
+        m_listeners.run_method(
+            &WorkingAudioStreamListener::push_samples,
+            block, m_buffer_size, m_buffer.data()
+        );
+        data += block;
+        samples -= block;
+    }
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/Kernels/AudioPipeline/Kernels_ChannelMixer.h b/SerialPrograms/Source/Kernels/AudioPipeline/Kernels_ChannelMixer.h
new file mode 100644
index 0000000000..06738c59c7
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/AudioPipeline/Kernels_ChannelMixer.h
@@ -0,0 +1,53 @@
+/*  Audio Pipeline - ChannelMixer
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Kernels_AudioPipeline_ChannelMixer_H
+#define PokemonAutomation_Kernels_AudioPipeline_ChannelMixer_H
+
+#include <vector>
+#include "Common/Cpp/Logging/AbstractLogger.h"
+#include "Common/Cpp/ListenerSet.h"
+#include "Common/Cpp/Containers/AlignedVector.h"
+#include "Kernels_AudioPipeline.h"
+
+namespace PokemonAutomation{
+namespace Kernels{
+namespace AudioPipeline{
+
+
+
+class ChannelMixer : public WorkingAudioNode{
+public:
+    ~ChannelMixer();
+    ChannelMixer(
+        Logger& logger,
+        size_t sample_rate,
+        size_t in_channels,
+        size_t out_channels,
+        std::vector<float> weight_matrix,
+        size_t buffer_size = 4096 + 256 //  4k + break super-alignment
+    );
+
+    virtual void add_listener(WorkingAudioStreamListener& listener) override;
+    virtual void remove_listener(WorkingAudioStreamListener& listener) override;
+
+    virtual void push_samples(size_t samples, size_t stride, const float* data) override;
+
+
+private:
+    size_t m_buffer_size;
+    std::vector<float> m_weight_matrix;
+    AlignedVector<float> m_buffer;
+    ListenerSet<WorkingAudioStreamListener> m_listeners;
+};
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Kernels/AudioPipeline/Kernels_ChannelMixer_TestInfra.cpp b/SerialPrograms/Source/Kernels/AudioPipeline/Kernels_ChannelMixer_TestInfra.cpp
new file mode 100644
index 0000000000..6bbd8553ed
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/AudioPipeline/Kernels_ChannelMixer_TestInfra.cpp
@@ -0,0 +1,188 @@
+/*  Audio Pipeline - ChannelMixer Test Infra
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <random>
+#include "Common/Cpp/Containers/AlignedVector.tpp"
+#include "Common/Cpp/Containers/GuardPageBuffer.h"
+#include "Kernels_ChannelMixer_TestInfra.h"
+#include "Kernels_ChannelMixer.h"
+
+namespace PokemonAutomation{
+namespace Kernels{
+namespace AudioPipeline{
+
+
+
+
+namespace{
+
+
+
+class RecordingWorkingAudioListener : public WorkingAudioStreamListener{
+public:
+    RecordingWorkingAudioListener(size_t sample_rate, size_t channels)
+        : WorkingAudioStreamListener(sample_rate, channels)
+    {}
+
+    virtual void push_samples(size_t samples, size_t stride, const float* data) override{
+        if (m_data.empty()){
+            m_stride = stride;
+            m_data = AlignedVector<float>(channels() * stride);
+        }
+        for (size_t c = 0; c < channels(); c++){
+            for (size_t s = 0; s < samples; s++){
+                m_data[c * m_stride + s] = data[c * stride + s];
+            }
+        }
+        m_samples_pushed += samples;
+    }
+
+    const AlignedVector<float>& data() const{
+        return m_data;
+    }
+    size_t stride() const{
+        return m_stride;
+    }
+    size_t samples_pushed() const{
+        return m_samples_pushed;
+    }
+
+
+private:
+    AlignedVector<float> m_data;
+    size_t m_stride = 0;
+    size_t m_samples_pushed = 0;
+};
+
+
+
+//  Random integer samples, all exactly representable in a float. The buffer
+//  ends right before a guard page, so a read past the end faults.
+GuardPageBuffer<float> make_random_input(size_t channels, size_t samples){
+    GuardPageBuffer<float> input(channels * samples);
+    std::mt19937 generator(42);
+    std::uniform_int_distribution<long long> distribution(-128, 128);
+    for (size_t c = 0; c < input.size(); c++){
+        input[c] = (float)distribution(generator);
+    }
+    return input;
+}
+
+
+
+}
+
+
+
+
+MixerIdentityTest::MixerIdentityTest(size_t channels, size_t samples)
+    : UnitTest(
+        "Kernels::AudioPipeline - MixerIdentity(" +
+        std::to_string(channels) + "ch x " + std::to_string(samples) + ")"
+    )
+    , m_channels(channels)
+    , m_samples(samples)
+{}
+UnitTestResult MixerIdentityTest::run(Logger& logger, CancellableScope& scope) const{
+    std::vector<float> matrix(m_channels * m_channels, 0.0f);
+    for (size_t c = 0; c < m_channels; c++){
+        matrix[c + m_channels * c] = 1.0f;
+    }
+
+    GuardPageBuffer<float> input = make_random_input(m_channels, m_samples);
+
+    const size_t sample_rate = 44100;
+
+    ChannelMixer mixer(logger, sample_rate, m_channels, m_channels, std::move(matrix));
+    RecordingWorkingAudioListener listener(sample_rate, m_channels);
+    mixer.add_listener(listener);
+
+    mixer.push_samples(m_samples, m_samples, input.data());
+
+    if (listener.samples_pushed() != m_samples){
+        return "Received " + std::to_string(listener.samples_pushed()) + " samples, expected " +
+            std::to_string(m_samples) + ".";
+    }
+
+    //  Check for errors.
+    for (size_t c = 0; c < m_channels; c++){
+        for (size_t s = 0; s < m_samples; s++){
+            float expected = input[c * m_samples + s];
+            float actual = listener.data()[c * listener.stride() + s];
+            if (expected != actual){
+                return "Mismatch at (" + std::to_string(c) + ", " + std::to_string(s) + "): " +
+                    std::to_string(expected) + " != " + std::to_string(actual);
+            }
+        }
+    }
+
+    return true;
+}
+
+
+
+
+MixerRoundTripTest::MixerRoundTripTest(size_t samples)
+    : UnitTest(
+        "Kernels::AudioPipeline - Mixer_1to2_2to1(" + std::to_string(samples) + ")"
+    )
+    , m_samples(samples)
+{}
+UnitTestResult MixerRoundTripTest::run(Logger& logger, CancellableScope& scope) const{
+    //  1 -> 2: Averaging a single channel is the channel itself.
+    std::vector<float> duplicate_matrix{1.0f, 1.0f};
+    //  2 -> 1: Average the two channels.
+    std::vector<float> average_matrix{0.5f, 0.5f};
+
+    GuardPageBuffer<float> input = make_random_input(1, m_samples);
+
+    const size_t sample_rate = 44100;
+
+    ChannelMixer mixer0(logger, sample_rate, 1, 2, duplicate_matrix);
+    ChannelMixer mixer1(logger, sample_rate, 2, 1, average_matrix);
+    RecordingWorkingAudioListener middle(sample_rate, 2);
+    RecordingWorkingAudioListener output(sample_rate, 1);
+    mixer0.add_listener(mixer1);
+    mixer0.add_listener(middle);
+    mixer1.add_listener(output);
+
+    mixer0.push_samples(m_samples, m_samples, input.data());
+
+    if (middle.samples_pushed() != m_samples){
+        return "Received " + std::to_string(middle.samples_pushed()) + " samples, expected " +
+            std::to_string(m_samples) + ".";
+    }
+    if (output.samples_pushed() != m_samples){
+        return "Received " + std::to_string(output.samples_pushed()) + " samples, expected " +
+            std::to_string(m_samples) + ".";
+    }
+
+    //  Check for errors.
+    for (size_t s = 0; s < m_samples; s++){
+        float expected = input[s];
+        for (size_t c = 0; c < 2; c++){
+            float actual = middle.data()[c * middle.stride() + s];
+            if (expected != actual){
+                return "1->2 mismatch at (" + std::to_string(c) + ", " + std::to_string(s) + "): " +
+                    std::to_string(expected) + " != " + std::to_string(actual);
+            }
+        }
+        float round_trip = output.data()[s];
+        if (expected != round_trip){
+            return "2->1 mismatch at " + std::to_string(s) + ": " +
+                std::to_string(expected) + " != " + std::to_string(round_trip);
+        }
+    }
+
+    return true;
+}
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/Kernels/AudioPipeline/Kernels_ChannelMixer_TestInfra.h b/SerialPrograms/Source/Kernels/AudioPipeline/Kernels_ChannelMixer_TestInfra.h
new file mode 100644
index 0000000000..c73fae9021
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/AudioPipeline/Kernels_ChannelMixer_TestInfra.h
@@ -0,0 +1,59 @@
+/*  Audio Pipeline - ChannelMixer Test Infra
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/TestRunners/UnitTest.h"
+
+#ifndef PokemonAutomation_Kernels_AudioPipeline_ChannelMixer_TestInfra_H
+#define PokemonAutomation_Kernels_AudioPipeline_ChannelMixer_TestInfra_H
+
+namespace PokemonAutomation{
+namespace Kernels{
+namespace AudioPipeline{
+
+
+
+
+//
+//  Pushes random integer samples through a ChannelMixer with an identity
+//  weight matrix and verifies the output is unchanged.
+//
+class MixerIdentityTest : public UnitTest{
+public:
+    MixerIdentityTest(size_t channels, size_t samples);
+
+    virtual UnitTestResult run(Logger& logger, CancellableScope& scope) const override;
+
+
+private:
+    const size_t m_channels;
+    const size_t m_samples;
+};
+
+
+
+
+//
+//  Pushes random integer samples through a 1->2 ChannelMixer, then through
+//  a 2->1 averaging ChannelMixer, and verifies the round-trip is exact.
+//
+class MixerRoundTripTest : public UnitTest{
+public:
+    MixerRoundTripTest(size_t samples);
+
+    virtual UnitTestResult run(Logger& logger, CancellableScope& scope) const override;
+
+
+private:
+    const size_t m_samples;
+};
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Kernels/AudioPipeline/Kernels_RawAudio2WorkingAudio.cpp b/SerialPrograms/Source/Kernels/AudioPipeline/Kernels_RawAudio2WorkingAudio.cpp
new file mode 100644
index 0000000000..e43a31f525
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/AudioPipeline/Kernels_RawAudio2WorkingAudio.cpp
@@ -0,0 +1,176 @@
+/*  Audio Pipeline - RawAudio2WorkingAudio
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Exceptions.h"
+#include "Common/Cpp/Containers/AlignedVector.tpp"
+#include "Kernels/AudioStreamConverter/Kernels_AudioStreamConverter.h"
+#include "Kernels/AudioChannelInterleave/Kernels_AudioChannelInterleave.h"
+#include "Kernels/Kernels_Alignment.h"
+#include "Kernels_RawAudio2WorkingAudio.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace Kernels{
+namespace AudioPipeline{
+
+
+
+namespace{
+
+
+size_t sample_format_size(SampleFormat sample_type){
+    switch (sample_type){
+    case SampleFormat::UINT8:   return sizeof(uint8_t);
+    case SampleFormat::SINT16:  return sizeof(int16_t);
+    case SampleFormat::SINT32:  return sizeof(int32_t);
+    case SampleFormat::FLOAT32: return sizeof(float);
+    default:;
+    }
+    return 0;
+}
+
+
+}
+
+
+
+template <typename Type>
+void RawAudio2WorkingAudio::set_converter(){
+    m_convert = [this](const void* data, size_t samples){
+        Kernels::AudioStreamConverter::convert_from<Type>(
+            m_interleaved_floats.data(),
+            (const Type*)data,
+            samples,
+            m_multiplier
+        );
+    };
+}
+
+RawAudio2WorkingAudio::~RawAudio2WorkingAudio() = default;
+RawAudio2WorkingAudio::RawAudio2WorkingAudio(
+    SampleFormat sample_type,
+    size_t sample_rate,
+    size_t channels,
+    float multiplier,
+    size_t buffer_size
+)
+    : RawAudioStreamListener(sample_type, sample_rate, channels)
+    , m_multiplier(multiplier)
+    , m_buffer_size(buffer_size)
+{
+    //  Round the buffer up to PA_ALIGNMENT bytes so that channels beyond
+    //  channel 0 start aligned for the SIMD kernels.
+    m_buffer_size =
+        align_int_up<PA_ALIGNMENT>(buffer_size * sample_format_size(sample_type))
+        / sample_format_size(sample_type);
+
+    switch (sample_type){
+    case SampleFormat::UINT8:
+        set_converter<uint8_t>();
+        break;
+    case SampleFormat::SINT16:
+        set_converter<int16_t>();
+        break;
+    case SampleFormat::SINT32:
+        set_converter<int32_t>();
+        break;
+    case SampleFormat::FLOAT32:
+        //  Float is already the working type, so the conversion is just the gain.
+        set_converter<float>();
+        break;
+    default:;
+    }
+
+    //  Only allocate the interleaved buffer if we need to convert types.
+    if (m_convert != nullptr){
+        m_interleaved_floats = AlignedVector<float>(channels * m_buffer_size);
+    }
+
+    //  Only allocate the split buffer if we need to split channels.
+    if (channels != 1){
+        m_split_floats = AlignedVector<float>(channels * m_buffer_size);
+    }
+}
+
+void RawAudio2WorkingAudio::validate_listener(const WorkingAudioStreamListener& listener) const{
+    if (sample_rate() != listener.sample_rate()){
+        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Sample rate doesn't match.");
+    }
+    if (channels() != listener.channels()){
+        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Channel count doesn't match.");
+    }
+}
+
+void RawAudio2WorkingAudio::add_listener(WorkingAudioStreamListener& listener){
+    validate_listener(listener);
+    m_listeners.add(listener);
+}
+void RawAudio2WorkingAudio::push_front_listener(WorkingAudioStreamListener& listener){
+    validate_listener(listener);
+    m_listeners.push_front(listener);
+}
+void RawAudio2WorkingAudio::remove_listener(WorkingAudioStreamListener& listener){
+    m_listeners.remove(listener);
+}
+void RawAudio2WorkingAudio::set_multiplier(float multiplier){
+    m_multiplier.store(multiplier, std::memory_order_release);
+}
+
+void RawAudio2WorkingAudio::push_samples(size_t frames, const void* data){
+    //  Single-channel float pass-through. (Zero-copy, no gain.)
+    if (sample_type() == SampleFormat::FLOAT32 && channels() == 1 &&
+        m_multiplier.load(std::memory_order_acquire) == 1.0f){
+        m_listeners.run_method(
+            &WorkingAudioStreamListener::push_samples,
+            frames, 0, (const float*)data
+        );
+        return;
+    }
+
+    const size_t sample_size = sample_format_size(sample_type());
+    while (frames > 0){
+        size_t block = std::min(frames, m_buffer_size);
+
+        //  Convert to float. (if needed)
+        const float* interleaved_floats;
+        if (m_convert){
+            m_convert(data, block * channels());
+            interleaved_floats = m_interleaved_floats.data();
+        }else{
+            interleaved_floats = (const float*)data;
+        }
+
+        //  Now split the channels. (if needed)
+        const float* split_floats;
+        if (channels() != 1){
+            Kernels::AudioChannelInterleave::channel_deinterleave(
+                channels(), block,
+                m_buffer_size, m_split_floats.data(),
+                interleaved_floats
+            );
+            split_floats = m_split_floats.data();
+        }else{
+            split_floats = interleaved_floats;
+        }
+
+        m_listeners.run_method(
+            &WorkingAudioStreamListener::push_samples,
+            block, m_buffer_size, split_floats
+        );
+
+        frames -= block;
+        data = (const char*)data + block * channels() * sample_size;
+    }
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/Kernels/AudioPipeline/Kernels_RawAudio2WorkingAudio.h b/SerialPrograms/Source/Kernels/AudioPipeline/Kernels_RawAudio2WorkingAudio.h
new file mode 100644
index 0000000000..77a34d4b55
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/AudioPipeline/Kernels_RawAudio2WorkingAudio.h
@@ -0,0 +1,66 @@
+/*  Audio Pipeline - RawAudio2WorkingAudio
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Kernels_AudioPipeline_RawAudio2WorkingAudio_H
+#define PokemonAutomation_Kernels_AudioPipeline_RawAudio2WorkingAudio_H
+
+#include <atomic>
+#include <functional>
+#include "Common/Cpp/ListenerSet.h"
+#include "Common/Cpp/Containers/AlignedVector.h"
+#include "Kernels_AudioPipeline.h"
+
+namespace PokemonAutomation{
+namespace Kernels{
+namespace AudioPipeline{
+
+
+
+class RawAudio2WorkingAudio : public RawAudioStreamListener{
+public:
+    ~RawAudio2WorkingAudio();
+    RawAudio2WorkingAudio(
+        SampleFormat sample_type,
+        size_t sample_rate,
+        size_t channels,
+        float multiplier,
+        size_t buffer_size = 4096 + 256 //  4k + break super-alignment
+    );
+
+    void add_listener(WorkingAudioStreamListener& listener);
+    //  Attaches "listener" before all existing listeners (call order).
+    void push_front_listener(WorkingAudioStreamListener& listener);
+    void remove_listener(WorkingAudioStreamListener& listener);
+
+    void set_multiplier(float multiplier);
+
+    virtual void push_samples(size_t frames, const void* data) override;
+
+
+private:
+    void validate_listener(const WorkingAudioStreamListener& listener) const;
+
+    template <typename Type>
+    void set_converter();
+
+
+private:
+    std::atomic<float> m_multiplier;
+    size_t m_buffer_size;
+    std::function<void(const void* data, size_t frames)> m_convert = nullptr;
+
+    AlignedVector<float> m_interleaved_floats;
+    AlignedVector<float> m_split_floats;
+    ListenerSet<WorkingAudioStreamListener> m_listeners;
+};
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Kernels/AudioPipeline/Kernels_WorkingAudio2RawAudio.cpp b/SerialPrograms/Source/Kernels/AudioPipeline/Kernels_WorkingAudio2RawAudio.cpp
new file mode 100644
index 0000000000..75772db6c3
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/AudioPipeline/Kernels_WorkingAudio2RawAudio.cpp
@@ -0,0 +1,147 @@
+/*  Audio Pipeline - Kernels_WorkingAudio2RawAudio
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Exceptions.h"
+#include "Common/Cpp/Containers/AlignedVector.tpp"
+#include "Kernels/AudioStreamConverter/Kernels_AudioStreamConverter.h"
+#include "Kernels/AudioChannelInterleave/Kernels_AudioChannelInterleave.h"
+#include "Kernels/Kernels_Alignment.h"
+#include "Kernels_WorkingAudio2RawAudio.h"
+
+namespace PokemonAutomation{
+namespace Kernels{
+namespace AudioPipeline{
+
+
+
+template <typename Type>
+size_t WorkingAudio2RawAudio::set_converter(){
+    m_convert = [this](const void* data, size_t samples){
+        Kernels::AudioStreamConverter::convert_to<Type>(
+            (const float*)data, (Type*)m_interleaved_raw.data(), samples,
+            m_multiplier.load(std::memory_order_acquire)
+        );
+    };
+    return sizeof(Type);
+}
+
+
+WorkingAudio2RawAudio::~WorkingAudio2RawAudio() = default;
+WorkingAudio2RawAudio::WorkingAudio2RawAudio(
+    SampleFormat sample_type,
+    size_t sample_rate,
+    size_t channels,
+    float multiplier,
+    size_t buffer_size
+)
+    : WorkingAudioStreamListener(sample_rate, channels)
+    , m_sample_type(sample_type)
+    , m_multiplier(multiplier)
+    , m_buffer_size(buffer_size)
+{
+    size_t sample_size = sizeof(float);
+    switch (sample_type){
+    case SampleFormat::UINT8:
+        sample_size = set_converter<uint8_t>();
+        break;
+    case SampleFormat::SINT16:
+        sample_size = set_converter<int16_t>();
+        break;
+    case SampleFormat::SINT32:
+        sample_size = set_converter<int32_t>();
+        break;
+    case SampleFormat::FLOAT32:
+        //  Float is already the working type, so the conversion is just the gain.
+        sample_size = set_converter<float>();
+        break;
+    default:;
+    }
+
+    //  Round the buffer up to PA_ALIGNMENT bytes so that channels beyond
+    //  channel 0 start aligned for the SIMD kernels.
+    m_buffer_size = align_int_up<PA_ALIGNMENT>(buffer_size * sample_size) / sample_size;
+
+    //  Only allocate the interleaved buffer if we need to convert types.
+    if (m_convert != nullptr){
+        m_interleaved_raw = AlignedVector<char>(channels * m_buffer_size * sample_size);
+    }
+
+    //  Only allocate the split buffer if we need to split channels.
+    if (channels != 1){
+        m_interleaved_floats = AlignedVector<float>(channels * m_buffer_size);
+    }
+}
+
+void WorkingAudio2RawAudio::add_listener(RawAudioStreamListener& listener){
+    if (m_sample_type != listener.sample_type()){
+        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Sample type doesn't match.");
+    }
+    if (sample_rate() != listener.sample_rate()){
+        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Sample rate doesn't match.");
+    }
+    if (channels() != listener.channels()){
+        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Channel count doesn't match.");
+    }
+    m_listeners.add(listener);
+}
+void WorkingAudio2RawAudio::remove_listener(RawAudioStreamListener& listener){
+    m_listeners.remove(listener);
+}
+void WorkingAudio2RawAudio::set_multiplier(float multiplier){
+    m_multiplier.store(multiplier, std::memory_order_release);
+}
+
+void WorkingAudio2RawAudio::push_samples(size_t samples, size_t stride, const float* data){
+    //  Single-channel float pass-through. (Zero-copy, no gain.)
+    if (m_sample_type == SampleFormat::FLOAT32 && channels() == 1 &&
+        m_multiplier.load(std::memory_order_acquire) == 1.0f){
+        m_listeners.run_method(
+            &RawAudioStreamListener::push_samples,
+            samples, (const float*)data
+        );
+        return;
+    }
+
+    while (samples > 0){
+        size_t block = std::min(samples, m_buffer_size);
+
+        //  Combine the channels. (if needed)
+        const float* interleaved_floats;
+        if (channels() != 1){
+            Kernels::AudioChannelInterleave::channel_interleave(
+                channels(), block,
+                stride, data,
+                m_interleaved_floats.data()
+            );
+            interleaved_floats = m_interleaved_floats.data();
+        }else{
+            interleaved_floats = data;
+        }
+
+        //  Convert to output type. (if needed)
+        const void* interleaved_raw;
+        if (m_convert){
+            m_convert(interleaved_floats, block * channels());
+            interleaved_raw = m_interleaved_raw.data();
+        }else{
+            interleaved_raw = interleaved_floats;
+        }
+
+        m_listeners.run_method(
+            &RawAudioStreamListener::push_samples,
+            block, interleaved_raw
+        );
+
+        samples -= block;
+        data += block;
+    }
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/Kernels/AudioPipeline/Kernels_WorkingAudio2RawAudio.h b/SerialPrograms/Source/Kernels/AudioPipeline/Kernels_WorkingAudio2RawAudio.h
new file mode 100644
index 0000000000..cb22b9dd2c
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/AudioPipeline/Kernels_WorkingAudio2RawAudio.h
@@ -0,0 +1,64 @@
+/*  Audio Pipeline - Kernels_WorkingAudio2RawAudio
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Kernels_AudioPipeline_WorkingAudio2RawAudio_H
+#define PokemonAutomation_Kernels_AudioPipeline_WorkingAudio2RawAudio_H
+
+#include <atomic>
+#include <functional>
+#include "Common/Cpp/ListenerSet.h"
+#include "Common/Cpp/Containers/AlignedVector.h"
+#include "Kernels_AudioPipeline.h"
+
+namespace PokemonAutomation{
+namespace Kernels{
+namespace AudioPipeline{
+
+
+
+class WorkingAudio2RawAudio : public WorkingAudioStreamListener{
+public:
+    ~WorkingAudio2RawAudio();
+    WorkingAudio2RawAudio(
+        SampleFormat sample_type,
+        size_t sample_rate,
+        size_t channels,
+        float multiplier,
+        size_t buffer_size = 4096 + 256 //  4k + break super-alignment
+    );
+
+    void add_listener(RawAudioStreamListener& listener);
+    void remove_listener(RawAudioStreamListener& listener);
+
+    void set_multiplier(float multiplier);
+
+    virtual void push_samples(size_t samples, size_t stride, const float* data) override;
+
+
+private:
+    template <typename Type>
+    size_t set_converter();
+
+
+private:
+    SampleFormat m_sample_type;
+    std::atomic<float> m_multiplier;
+    size_t m_buffer_size;
+    std::function<void(const void* data, size_t frames)> m_convert = nullptr;
+
+    AlignedVector<char> m_interleaved_raw;
+    AlignedVector<float> m_interleaved_floats;
+    ListenerSet<RawAudioStreamListener> m_listeners;
+};
+
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Kernels/AudioPipeline/Kernels_WorkingAudio2WorkingAudio.cpp b/SerialPrograms/Source/Kernels/AudioPipeline/Kernels_WorkingAudio2WorkingAudio.cpp
new file mode 100644
index 0000000000..bc2f58c95c
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/AudioPipeline/Kernels_WorkingAudio2WorkingAudio.cpp
@@ -0,0 +1,174 @@
+/*  Audio Stream Converters
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <memory>
+#include "Common/Cpp/Containers/Pimpl.tpp"
+#include "Kernels/AudioResampler/Kernels_AudioResampler.h"
+#include "Kernels_ChannelMixer.h"
+#include "Kernels_WorkingAudio2WorkingAudio.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace Kernels{
+namespace AudioPipeline{
+
+namespace{
+
+//  The matrix is laid out weight(in i -> out o) at index i + in_channels * o;
+//  it can only be the identity for a square one. The matrices that reach
+//  this node are program-generated, so exact float comparison is safe.
+bool is_identity(const std::vector<float>& matrix, size_t channels){
+    if (matrix.size() != channels * channels){
+        return false;
+    }
+    for (size_t i = 0; i < channels; i++){
+        for (size_t o = 0; o < channels; o++){
+            const float w = matrix[i + channels * o];
+            if ((i == o ? w != 1.0f : w != 0.0f)){
+                return false;
+            }
+        }
+    }
+    return true;
+}
+
+}
+
+
+struct WorkingAudio2WorkingAudio::Data{
+    WorkingAudioNode* head = nullptr;
+    WorkingAudioNode* tail = nullptr;
+
+    std::unique_ptr<ChannelMixer> mixer;
+    std::unique_ptr<AudioResampler::AudioResampler> resampler;
+
+    //  Only in use when the chain is empty (same rate, same channel
+    //  count, identity matrix): the node itself is the pass-through.
+    ListenerSet<WorkingAudioStreamListener> listeners;
+};
+
+
+WorkingAudio2WorkingAudio::~WorkingAudio2WorkingAudio() = default;
+
+WorkingAudio2WorkingAudio::WorkingAudio2WorkingAudio(
+    Logger& logger,
+    size_t in_sample_rate, size_t out_sample_rate,
+    size_t in_channels, size_t out_channels,
+    std::vector<float> weight_matrix,
+    size_t buffer_size
+)
+    : WorkingAudioNode(in_sample_rate, out_sample_rate, in_channels, out_channels)
+    , m_data(CONSTRUCT_TOKEN)
+{
+    std::vector<WorkingAudioNode*> nodes;
+
+    Data& self = *m_data;
+    //  A square identity matrix is a no-op, so the mixer is only needed
+    //  when the channel counts differ or the matrix actually mixes.
+    const bool need_mixer = in_channels != out_channels
+        || !is_identity(weight_matrix, in_channels);
+    if (in_channels >= out_channels){
+        //  Mix first (at the input rate), then resample.
+        if (need_mixer){
+            self.mixer.reset(new ChannelMixer(
+                logger,
+                in_sample_rate,
+                in_channels, out_channels,
+                std::move(weight_matrix),
+                buffer_size
+            ));
+            nodes.emplace_back(self.mixer.get());
+        }
+        if (in_sample_rate != out_sample_rate){
+            self.resampler.reset(new AudioResampler::AudioResampler(
+                logger,
+                in_sample_rate, out_sample_rate,
+                out_channels,
+                buffer_size
+            ));
+            nodes.emplace_back(self.resampler.get());
+        }
+    }else{
+        //  Resample first (at the cheaper input channel count), then mix.
+        if (in_sample_rate != out_sample_rate){
+            self.resampler.reset(new AudioResampler::AudioResampler(
+                logger,
+                in_sample_rate, out_sample_rate,
+                in_channels,
+                buffer_size
+            ));
+            nodes.emplace_back(self.resampler.get());
+        }
+        if (need_mixer){
+            self.mixer.reset(new ChannelMixer(
+                logger,
+                out_sample_rate,
+                in_channels, out_channels,
+                std::move(weight_matrix),
+                buffer_size
+            ));
+            nodes.emplace_back(self.mixer.get());
+        }
+    }
+    populate_pointers(logger, nodes);
+}
+
+void WorkingAudio2WorkingAudio::populate_pointers(
+    Logger& logger,
+    const std::vector<WorkingAudioNode*>& nodes
+){
+    logger.log("WorkingAudio2WorkingAudio: Nodes = " + std::to_string(nodes.size()));
+
+    Data& self = *m_data;
+    for (size_t c = 0; c < nodes.size(); c++){
+        if (c > 0){
+            nodes[c - 1]->add_listener(*nodes[c]);
+        }
+    }
+    if (!nodes.empty()){
+        self.head = nodes.front();
+        self.tail = nodes.back();
+    }
+}
+
+void WorkingAudio2WorkingAudio::add_listener(WorkingAudioStreamListener& listener){
+    Data& self = *m_data;
+    if (self.tail){
+        self.tail->add_listener(listener);
+    }else{
+        self.listeners.add(listener);
+    }
+}
+void WorkingAudio2WorkingAudio::remove_listener(WorkingAudioStreamListener& listener){
+    Data& self = *m_data;
+    if (self.tail){
+        self.tail->remove_listener(listener);
+    }else{
+        self.listeners.remove(listener);
+    }
+}
+
+void WorkingAudio2WorkingAudio::push_samples(size_t samples, size_t stride, const float* data){
+    Data& self = *m_data;
+    if (self.head){
+        self.head->push_samples(samples, stride, data);
+    }else{
+        self.listeners.run_method(
+            &WorkingAudioStreamListener::push_samples,
+            samples, stride, data
+        );
+    }
+}
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/Kernels/AudioPipeline/Kernels_WorkingAudio2WorkingAudio.h b/SerialPrograms/Source/Kernels/AudioPipeline/Kernels_WorkingAudio2WorkingAudio.h
new file mode 100644
index 0000000000..07e189eb51
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/AudioPipeline/Kernels_WorkingAudio2WorkingAudio.h
@@ -0,0 +1,56 @@
+/*  Audio Stream Converters
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_AudioStreamConverters_H
+#define PokemonAutomation_AudioStreamConverters_H
+
+#include <vector>
+#include "Common/Cpp/Logging/AbstractLogger.h"
+#include "Common/Cpp/Containers/Pimpl.h"
+#include "Kernels_AudioPipeline.h"
+
+namespace PokemonAutomation{
+namespace Kernels{
+namespace AudioPipeline{
+
+
+
+class WorkingAudio2WorkingAudio : public WorkingAudioNode{
+public:
+    ~WorkingAudio2WorkingAudio();
+    WorkingAudio2WorkingAudio(
+        Logger& logger,
+        size_t in_sample_rate, size_t out_sample_rate,
+        size_t in_channels, size_t out_channels,
+        std::vector<float> weight_matrix,
+        size_t buffer_size = 4096 + 256 //  4k + break super-alignment
+    );
+
+    virtual void add_listener(WorkingAudioStreamListener& listener) override;
+    virtual void remove_listener(WorkingAudioStreamListener& listener) override;
+
+    virtual void push_samples(size_t samples, size_t stride, const float* data) override;
+
+
+private:
+    //  Walk the list of nodes and attach the next one to the previous
+    //  one; sets m_data's head / tail.
+    void populate_pointers(
+        Logger& logger,
+        const std::vector<WorkingAudioNode*>& nodes
+    );
+
+private:
+    struct Data;
+    Pimpl<Data> m_data;
+};
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Kernels/AudioResampler/Kernels_AudioResampler.cpp b/SerialPrograms/Source/Kernels/AudioResampler/Kernels_AudioResampler.cpp
new file mode 100644
index 0000000000..62ddf2f92a
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/AudioResampler/Kernels_AudioResampler.cpp
@@ -0,0 +1,418 @@
+/*  Audio Resampler
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <algorithm>
+#include <cstring>
+#include <map>
+#include <memory>
+#include "Common/Cpp/Concurrency/SpinLock.h"
+#include "Common/Cpp/Exceptions.h"
+#include "Common/Cpp/PrettyPrint.h"
+#include "Common/Cpp/Containers/AlignedVector.tpp"
+#include "Kernels/Kernels_Alignment.h"
+#include "Kernels_AudioResampler_BlockKernels.h"
+#include "Kernels_AudioResampler.h"
+
+namespace PokemonAutomation{
+namespace Kernels{
+namespace AudioResampler{
+
+namespace{
+
+struct ResamplerTableKey{
+    size_t in_sample_rate;
+    size_t out_sample_rate;
+    uint32_t taps;
+    double beta;
+
+    bool operator<(const ResamplerTableKey& o) const{
+        if (in_sample_rate != o.in_sample_rate){
+            return in_sample_rate < o.in_sample_rate;
+        }
+        if (out_sample_rate != o.out_sample_rate){
+            return out_sample_rate < o.out_sample_rate;
+        }
+        if (taps != o.taps){
+            return taps < o.taps;
+        }
+        return beta < o.beta;
+    }
+};
+
+
+//
+//  Process-wide cache of resampler weight tables. Building a table (the
+//  Kaiser window plus the index / weight allocations) is the expensive
+//  part of an AudioResampler, and most resamplers in a pipeline share the
+//  same (in rate, out rate, taps, beta) - only the block sizes differ.
+//  A table built for larger blocks is valid for smaller ones (the block
+//  sizes only extend the allocations, not the weights), so an entry is
+//  only replaced when a strictly larger block is requested; resamplers
+//  still holding the older, smaller table keep their shared_ptr.
+//
+class ResamplerTableCache{
+public:
+    static ResamplerTableCache& instance(){
+        static ResamplerTableCache cache;
+        return cache;
+    }
+
+    std::shared_ptr<const WeightTable> get_table(
+        size_t in_sample_rate,
+        size_t out_sample_rate,
+        uint32_t taps,
+        double beta,
+        size_t sample_block,
+        size_t tap_block
+    ){
+        const ResamplerTableKey key{in_sample_rate, out_sample_rate, taps, beta};
+
+        {
+            ReadSpinLock lg(m_lock, "ResamplerTableCache");
+            auto iter = m_tables.find(key);
+            if (iter != m_tables.end()
+                && iter->second->sample_block() >= sample_block
+                && iter->second->tap_block() >= tap_block
+            ){
+                return iter->second;
+            }
+        }
+
+        //  Built outside the lock: the window computation can be slow,
+        //  and concurrent misses may build the same table twice - the
+        //  loser's table is simply dropped.
+        auto table = std::make_shared<WeightTable>(
+            in_sample_rate, out_sample_rate, taps, beta, sample_block, tap_block
+        );
+
+        WriteSpinLock lg(m_lock, "ResamplerTableCache");
+        auto iter = m_tables.find(key);
+        if (iter != m_tables.end()
+            && iter->second->sample_block() >= sample_block
+            && iter->second->tap_block() >= tap_block
+        ){
+            return iter->second;
+        }
+        m_tables[key] = table;
+        return table;
+    }
+
+private:
+    SpinLockMRSW m_lock;
+    std::map<ResamplerTableKey, std::shared_ptr<const WeightTable>> m_tables;
+};
+
+}
+
+
+
+
+AudioResampler::~AudioResampler() = default;
+AudioResampler::AudioResampler(
+    Logger& logger,
+    size_t in_sample_rate,
+    size_t out_sample_rate,
+    size_t channels,
+    size_t buffer_size,
+    uint32_t taps,
+    double beta
+)
+    : AudioPipeline::WorkingAudioNode(in_sample_rate, out_sample_rate, channels, channels)
+    , m_taps(taps)
+    , m_block(get_block_kernel(in_sample_rate, out_sample_rate))
+    , m_table(
+        ResamplerTableCache::instance().get_table(
+            in_sample_rate, out_sample_rate, taps, beta,
+            m_block.sample_block, m_block.tap_block
+        )
+    )
+    , m_period_in_extended(m_table->period_in() * (m_table->period_out_extended() / m_table->period_out()))
+    , m_period_out_extended(m_table->period_out_extended())
+    //  Round the buffer up to PA_ALIGNMENT bytes (after the max, so the
+    //  result is aligned whichever of the two is larger) so that channels
+    //  beyond channel 0 start aligned for the SIMD kernels.
+    , m_buffer_stride(
+        align_int_up<PA_ALIGNMENT>(
+            std::max(buffer_size, m_block.sample_block) * sizeof(float)
+        ) / sizeof(float)
+    )
+    , m_buffer(channels * m_buffer_stride)
+    , m_flush_at((m_buffer_stride / m_block.sample_block) * m_block.sample_block)
+{
+    logger.log(
+        "Initializing AudioResampler: " + tostr_u_commas(in_sample_rate) +
+        " -> " + tostr_u_commas(out_sample_rate) +
+        " Hz, channels = " + tostr_u_commas(channels),
+        COLOR_PURPLE
+    );
+
+    if (in_sample_rate == 0 || out_sample_rate == 0){
+        throw InternalProgramError(&logger, PA_CURRENT_FUNCTION, "Invalid sample rate.");
+    }
+    if (channels == 0){
+        throw InternalProgramError(&logger, PA_CURRENT_FUNCTION, "Invalid channel count.");
+    }
+    if (buffer_size == 0){
+        throw InternalProgramError(&logger, PA_CURRENT_FUNCTION, "Invalid buffer size.");
+    }
+    if (taps == 0){
+        throw InternalProgramError(&logger, PA_CURRENT_FUNCTION, "Invalid tap count.");
+    }
+
+
+    //  Size the carry buffers. push_samples() never stages more than
+    //  input_samples_needed(wr) input samples for the block at wrapped index wr
+    //  - both the loop gate and the tail save bound against it - and need()
+    //  already includes the kernel's implied read overshoots, so the max over
+    //  all positions is an exact worst case and needs no slack.
+    size_t max_input_samples_needed = 0;
+    for (size_t wr = 0; wr < m_table->period_out(); wr++){
+        max_input_samples_needed = std::max(max_input_samples_needed, input_samples_needed(wr));
+    }
+    m_carry_capacity = max_input_samples_needed;
+    m_carry.reserve(channels);
+    for (size_t c = 0; c < channels; c++){
+        m_carry.emplace_back(m_carry_capacity);
+    }
+}
+
+void AudioResampler::add_listener(AudioPipeline::WorkingAudioStreamListener& listener){
+    if (out_sample_rate() != listener.sample_rate()){
+        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Sample rate doesn't match.");
+    }
+    if (this->channels() != listener.channels()){
+        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Channel count doesn't match.");
+    }
+    m_listeners.add(listener);
+}
+void AudioResampler::remove_listener(AudioPipeline::WorkingAudioStreamListener& listener){
+    m_listeners.remove(listener);
+}
+
+void AudioResampler::flush(size_t count){
+    if (count == 0){
+        return;
+    }
+    m_listeners.run_method(
+        &AudioPipeline::WorkingAudioStreamListener::push_samples,
+        count, m_buffer_stride, m_buffer.data()
+    );
+}
+
+size_t AudioResampler::input_samples_needed(size_t wr) const{
+    const uint32_t* index = m_table->in_sample_index();
+    const size_t block = m_block.sample_block;
+    //  taps_allocated() bounds the kernel's input reads: the unrolls'
+    //  final partial group reads at most
+    //  ceil(taps / tap_block) * tap_block taps, and the table's padding to
+    //  taps + tap_block - 1 rows is at least that.
+    return index[wr + block - 1] + m_table->taps_allocated() + (block - 1) - index[wr];
+}
+
+template <typename InBase>
+size_t AudioResampler::emit_block(
+    size_t in_index, InBase in_base,
+    size_t& out, size_t& wr, size_t& periods, size_t& cursor, size_t& out_off
+){
+    const uint32_t* index = m_table->in_sample_index();
+    const size_t block = m_block.sample_block;
+
+    if (out_off + block > m_flush_at){
+        flush(out_off);
+        out_off = 0;
+    }
+    float* out_base = m_buffer.data() + out_off;
+    for (size_t c = 0; c < this->channels(); c++){
+        m_block.fp(*m_table, in_index, in_base(c), wr, out_base + c * m_buffer_stride);
+    }
+    out_off += block;
+
+    size_t consumed = index[wr + block] - index[wr];
+    out += block;
+    wr += block;
+    //  block <= m_period_out_extended, so this wraps at most once.
+    if (wr >= m_period_out_extended){
+        wr -= m_period_out_extended;
+        periods += 1;
+    }
+    cursor += consumed;
+    return consumed;
+}
+
+void AudioResampler::push_samples(size_t samples, size_t stride, const float* data){
+    if (samples == 0){
+        return;
+    }
+
+    const uint32_t* index = m_table->in_sample_index();
+    const size_t block = m_block.sample_block;
+    const size_t channels = this->channels();
+
+    //  wr and periods decompose m_out_index over the extended output
+    //  period. They are carried across calls and only the block loop
+    //  below mutates them, so the push is division- and modulo-free
+    //  throughout.
+    size_t out_index = m_out_index;
+    size_t wr = m_wr;
+    size_t periods = m_periods;
+
+    //  Absolute input position of the next output's window start.
+    size_t cursor = index[wr] + periods * m_period_in_extended;
+    const size_t pushed_end = m_in_index + samples;
+
+    //  When downsampling by a lot the cursor jumps past the pushed data.
+    //  Drop the leading samples that no window will read.
+    size_t n = samples;
+    if (cursor > m_in_index){
+        size_t skip = std::min(n, cursor - m_in_index);
+        data += skip;
+        n -= skip;
+        m_in_index += skip;
+        if (n == 0){
+            m_in_index = pushed_end;
+            m_carry_avail = 0;
+            return;
+        }
+    }
+
+    //  `carry` is the count of input samples in the carry buffers, which
+    //  hold [cursor, cursor + carry). When negative the data pointer leads
+    //  the cursor by -carry samples. The data starts at absolute position
+    //  in_index.
+    size_t in_index = m_in_index;
+    ptrdiff_t carry = (ptrdiff_t)in_index - (ptrdiff_t)cursor;
+
+    //  Upper bound on the outputs this push can produce. With extreme
+    //  upsampling the cursor barely advances between blocks, so this keeps
+    //  the block loops from running away.
+    const size_t available = (pushed_end > cursor) ? (pushed_end - cursor) : 0;
+    const size_t out_limit = available * out_sample_rate() / this->sample_rate() + block;
+
+    size_t out_off = 0;
+
+    //  Run a block on the carry buffers.
+    auto emit_carry_block = [&]()->size_t{
+        size_t consumed = emit_block(
+            index[wr],
+            [&](size_t c){
+                return m_carry[c].data();
+            },
+            out_index, wr, periods, cursor, out_off
+        );
+        if ((ptrdiff_t)consumed < carry){
+            for (size_t c = 0; c < channels; c++){
+                memmove(
+                    m_carry[c].data(),
+                    m_carry[c].data() + consumed,
+                    (size_t)(carry - consumed) * sizeof(float)
+                );
+            }
+        }
+        return consumed;
+    };
+
+    while (out_index - m_out_index < out_limit){
+        const size_t need_w = input_samples_needed(wr);
+
+        //  Not enough input to complete the next block.
+        if ((ptrdiff_t)carry + (ptrdiff_t)n < (ptrdiff_t)need_w){
+            break;
+        }
+
+        if (carry >= 0 && (size_t)carry >= need_w){
+            //  The carry alone holds the full window.
+            emit_carry_block();
+        }else if (carry <= 0){
+            //  The window starts at or before the data start. The block's
+            //  window-start span can exceed the remaining data (strong
+            //  downsampling), so only advance as far as the data allows;
+            //  the reconciliation below drops whatever is now in the past.
+            //  Rewind the data base to the extended-period origin.
+            const size_t rewind = in_index - periods * m_period_in_extended;
+            const size_t consumed = emit_block(
+                rewind,
+                [&](size_t c){
+                    return data + c * stride;
+                },
+                out_index, wr, periods, cursor, out_off
+            );
+            const size_t advance = std::min(consumed, n);
+            data += advance;
+            in_index += advance;
+            n -= advance;
+        }else{
+            //  The window straddles the carry and the data. Copy the rest of
+            //  the window into the carry and run the block on it.
+            const size_t k = need_w - (size_t)carry;
+            for (size_t c = 0; c < channels; c++){
+                memcpy(
+                    m_carry[c].data() + (size_t)carry,
+                    data + c * stride,
+                    k * sizeof(float)
+                );
+            }
+            data += k;
+            in_index += k;
+            n -= k;
+            carry = (ptrdiff_t)need_w;
+            emit_carry_block();
+        }
+
+        //  The cursor advanced by the block's window-start span, which can
+        //  exceed the input that was staged for the block. Drop any data
+        //  samples that now sit before the cursor, and re-derive how far
+        //  the data leads or lags the cursor (the carry buffers only hold
+        //  [cursor, cursor + carry) when carry > 0).
+        if (in_index < cursor){
+            const size_t skip = std::min(n, cursor - in_index);
+            data += skip;
+            in_index += skip;
+            n -= skip;
+        }
+        carry = (ptrdiff_t)in_index - (ptrdiff_t)cursor;
+    }
+
+    //  Save the unprocessed input tail in the carry buffers.
+    if (n > 0){
+        if (carry < 0){
+            const size_t skip = (size_t)(-carry);
+            if (n <= skip){
+                n = 0;
+            }else{
+                data += skip;
+                n -= skip;
+                carry = 0;
+            }
+        }
+        if (n > 0){
+            for (size_t c = 0; c < channels; c++){
+                memcpy(
+                    m_carry[c].data() + (size_t)carry,
+                    data + c * stride,
+                    n * sizeof(float)
+                );
+            }
+            carry += (ptrdiff_t)n;
+        }
+    }
+
+    //  Empty the output buffer.
+    if (out_off > 0){
+        flush(out_off);
+    }
+
+    m_out_index = out_index;
+    m_wr = wr;
+    m_periods = periods;
+    m_in_index = pushed_end;
+    m_carry_avail = (carry > 0) ? (size_t)carry : 0;
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/Kernels/AudioResampler/Kernels_AudioResampler.h b/SerialPrograms/Source/Kernels/AudioResampler/Kernels_AudioResampler.h
new file mode 100644
index 0000000000..b080623591
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/AudioResampler/Kernels_AudioResampler.h
@@ -0,0 +1,136 @@
+/*  Audio Resampler
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Kernels_AudioResampler_H
+#define PokemonAutomation_Kernels_AudioResampler_H
+
+#include <cstddef>
+#include <memory>
+#include <vector>
+#include "Common/Cpp/Logging/AbstractLogger.h"
+#include "Common/Cpp/ListenerSet.h"
+#include "Common/Cpp/Containers/AlignedVector.h"
+#include "Kernels/AudioPipeline/Kernels_AudioPipeline.h"
+#include "Kernels_AudioResampler_BlockKernels.h"
+#include "Kernels_AudioResampler_WeightTable.h"
+
+namespace PokemonAutomation{
+namespace Kernels{
+namespace AudioResampler{
+
+
+
+//
+//  A streaming node that resamples a working-format (float, channel-strided)
+//  audio stream from one sample rate to another using the Kaiser-window
+//  sinc kernel from the weight table.
+//
+//  Input samples are pushed with push_samples(); the resampled output is
+//  delivered to the listeners in chunks of at most the output buffer size.
+//  All channels are operated on identically; the kernels read directly from
+//  the input buffer and write into the internal output buffer.
+//
+class AudioResampler : public AudioPipeline::WorkingAudioNode{
+public:
+    ~AudioResampler();
+    AudioResampler(
+        Logger& logger,
+        size_t in_sample_rate,
+        size_t out_sample_rate,
+        size_t channels,
+        size_t buffer_size = 4096 + 256, //  4k + break super-alignment
+        uint32_t taps = 32,
+        double beta = 9.0
+    );
+
+    uint32_t taps() const{
+        return m_taps;
+    }
+    size_t block_size() const{
+        return m_block.sample_block;
+    }
+
+    virtual void add_listener(AudioPipeline::WorkingAudioStreamListener& listener) override;
+    virtual void remove_listener(AudioPipeline::WorkingAudioStreamListener& listener) override;
+
+    //  The resampler's weight table shifts the output time base past the
+    //  input time base by (taps - 1) / 2 input samples (its median-tap
+    //  alignment); in seconds, via the table.
+    virtual double time_shift() const override{
+        return m_table->time_shift();
+    }
+
+    virtual void push_samples(size_t samples, size_t stride, const float* data) override;
+
+
+private:
+    //  Input samples a block starting at wrapped index wr needs, including
+    //  the kernel's reads past the last window. The kernel's implied input
+    //  overshoot is sample_block - 1 samples past the last window's start.
+    size_t input_samples_needed(size_t wr) const;
+
+    //  Emit one block over per-channel input bases and advance the
+    //  per-push stream progress (out / wr / periods / cursor / out_off).
+    //  in_base(c) is the input base pointer of channel c.
+    template <typename InBase>
+    size_t emit_block(
+        size_t in_index, InBase in_base,
+        size_t& out, size_t& wr, size_t& periods, size_t& cursor, size_t& out_off
+    );
+
+    void flush(size_t count);
+
+
+private:
+    const uint32_t m_taps;
+
+    //  The dispatched block kernel.
+    const BlockKernel m_block;
+
+    //  The weight table, shared from the process-wide resampler table
+    //  cache (see Kernels_AudioResampler.cpp); it extends its allocations
+    //  for the kernel's implied overshoots.
+    std::shared_ptr<const WeightTable> m_table;
+
+    //  Input samples per extended period (m_table.period_in() times the
+    //  period extension).
+    const size_t m_period_in_extended;
+
+    //  Extended output period: the smallest multiple of the table's period
+    //  that is >= sample_block, so a block wraps it at most once and
+    //  advancing the wrapped index is a compare-and-subtract, not a
+    //  modulo.
+    const size_t m_period_out_extended;
+
+    //  Floats per channel in m_buffer. At least the requested buffer size,
+    //  rounded up so a block never straddles the channel boundary.
+    const size_t m_buffer_stride;
+    AlignedVector<float> m_buffer;
+    size_t m_carry_capacity = 0;
+
+    //  Per-channel buffers for the input samples that don't line up with a
+    //  kernel block. The carry always starts at the next window's start.
+    std::vector<AlignedVector<float>> m_carry;
+
+    //  The largest multiple of the block size that fits in the buffer.
+    const size_t m_flush_at;
+
+    ListenerSet<AudioPipeline::WorkingAudioStreamListener> m_listeners;
+
+    //  Stream state.
+    size_t m_in_index = 0;   //  Absolute index of the next input to be pushed.
+    size_t m_out_index = 0;  //  Absolute index of the next output to produce.
+    size_t m_wr = 0;         //  m_out_index within the extended output period.
+    size_t m_periods = 0;    //  Extended output periods m_out_index spans.
+    size_t m_carry_avail = 0;  //  Unprocessed input samples in the carries.
+};
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Kernels/AudioResampler/Kernels_AudioResampler_BlockKernel_ARM64_NEON.cpp b/SerialPrograms/Source/Kernels/AudioResampler/Kernels_AudioResampler_BlockKernel_ARM64_NEON.cpp
new file mode 100644
index 0000000000..7332a6f059
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/AudioResampler/Kernels_AudioResampler_BlockKernel_ARM64_NEON.cpp
@@ -0,0 +1,352 @@
+/*  Audio Resampler Block Kernel (ARM64 NEON)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifdef PA_AutoDispatch_arm64_20_M1
+
+#include <arm_neon.h>
+#include "Common/Compiler.h"
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "Kernels_AudioResampler_BlockKernels.h"
+#include "Kernels_AudioResampler_Tests.h"
+
+namespace PokemonAutomation{
+namespace Kernels{
+namespace AudioResampler{
+
+
+
+namespace{
+
+
+
+//
+//  Opcount Ratios (per tap, per 4 outputs):
+//    - 1 x FMA
+//    - 1/2 x shuffle
+//    - 1 x aligned 128-bit load
+//    - 1 x misaligned 128-bit load
+//
+//
+//  The x86 kernels use the half-width transpose (4x2 for SSE, 8x4 for
+//  AVX, 16x8 for AVX512) because unaligned half-vector loads and
+//  half-vector insertions are cheap there. NEON has no unaligned 64-bit
+//  loads, but it does have unaligned full-vector loads, so use the 4x4
+//  square transpose instead: a given output's taps are adjacent in the
+//  input stream, so one 128-bit load grabs 4 taps per output, and the
+//  transpose itself is 2 x vtrnq + 4 x vcombine in-register.
+//
+PA_FORCE_INLINE void transposef32x4x4(
+    const float* I0, const float* I1, const float* I2, const float* I3,
+    float32x4_t& r0, float32x4_t& r1,
+    float32x4_t& r2, float32x4_t& r3
+){
+    //  I0..I3 each point at in_samples + index[k] + tap, and the next
+    //  three stream values are taps + 1 .. + 3 of the same output, so a
+    //  full 128-bit unaligned load grabs all 4 taps per output:
+    //      Lk = [Ik[t], Ik[t+1], Ik[t+2], Ik[t+3]]
+    float32x4_t L0 = vld1q_f32(I0);
+    float32x4_t L1 = vld1q_f32(I1);
+    float32x4_t L2 = vld1q_f32(I2);
+    float32x4_t L3 = vld1q_f32(I3);
+
+    //  Two 128-bit lane-pair transposes and four 64-bit combines give
+    //  the full 4x4 transpose:
+    //      rj = [I0[t+j], I1[t+j], I2[t+j], I3[t+j]]
+    float32x4x2_t AB = vtrnq_f32(L0, L1);
+    float32x4x2_t CD = vtrnq_f32(L2, L3);
+    r0 = vcombine_f32(vget_low_f32(AB.val[0]),  vget_low_f32(CD.val[0]));
+    r1 = vcombine_f32(vget_low_f32(AB.val[1]),  vget_low_f32(CD.val[1]));
+    r2 = vcombine_f32(vget_high_f32(AB.val[0]), vget_high_f32(CD.val[0]));
+    r3 = vcombine_f32(vget_high_f32(AB.val[1]), vget_high_f32(CD.val[1]));
+}
+
+
+
+//
+//  Byte-permute fast path: the NEON equivalent of the AVX512 fast
+//  kernels. Instead of transposing the tap rows into the output
+//  columns, build one TBL byte-index register per 4-output group and
+//  gather the input samples directly from the 128-bit table window.
+//
+//  The TBL byte index is the 4-byte input index converted to byte
+//  granularity: each 32-bit delta is multiplied by 0x04040404 and
+//  0x03020100 is added, so word c holds [4d, 4d+1, 4d+2, 4d+3] and
+//  picks out the 4 bytes of input sample d_c for the 4 output lanes.
+//
+//  Per-group input windows:
+//    - run_block32_up:      1 x misaligned 128-bit load (4-float window)
+//    - run_block32_down2:   2 x misaligned 128-bit loads (8-float window)
+//
+PA_FORCE_INLINE uint8x16_t build_group_byte_index(
+    const uint32_t* index, uint32_t base
+){
+    uint32x4_t d = vsubq_u32(vld1q_u32(index), vdupq_n_u32(base));
+    //  d < 16, so the replicated bytes never carry into each other.
+    uint32x4_t b = vmlaq_u32(vdupq_n_u32(0x03020100u), d, vdupq_n_u32(0x04040404u));
+    return vreinterpretq_u8_u32(b);
+}
+
+
+//
+//  TBL gathers of 4 floats by byte index.
+//
+//  The 128-bit TBL intrinsics cover both windows in one instruction on
+//  every compiler. Both GCC and Clang name them after the instruction
+//  mnemonics (VQTB1Q / VQTB2Q): vqtbl1q_u8 and vqtbl2q_u8 - the
+//  "vtbl1q_u8" / "vtbl2q_u8" spellings do not exist in either header.
+//  up needs a single 16-byte table, down2 a 32-byte one.
+//
+PA_FORCE_INLINE float32x4_t gather_group_up(
+    float32x4_t tab, uint8x16_t idx
+){
+    return vreinterpretq_f32_u8(vqtbl1q_u8(vreinterpretq_u8_f32(tab), idx));
+}
+PA_FORCE_INLINE float32x4_t gather_group_down2(
+    float32x4_t tab0, float32x4_t tab1, uint8x16_t idx
+){
+    uint8x16x2_t tab{ vreinterpretq_u8_f32(tab0), vreinterpretq_u8_f32(tab1) };
+    return vreinterpretq_f32_u8(vqtbl2q_u8(tab, idx));
+}
+
+
+template <int input_loads>
+PA_FORCE_INLINE void run_block32_permute_ARM64_NEON(
+    const WeightTable& table,
+    size_t in_index, const float* in_samples,
+    size_t out_index, float* out_samples
+){
+    in_samples -= in_index;
+
+    const uint32_t* index = table.in_sample_index() + out_index;
+
+    //
+    //  The index deltas of each 4-column group, relative to the group's
+    //  first column, are the TBL byte indices.
+    //
+    const uint8x16_t idx0 = build_group_byte_index(index + 4*0, index[4*0]);
+    const uint8x16_t idx1 = build_group_byte_index(index + 4*1, index[4*1]);
+    const uint8x16_t idx2 = build_group_byte_index(index + 4*2, index[4*2]);
+    const uint8x16_t idx3 = build_group_byte_index(index + 4*3, index[4*3]);
+    const uint8x16_t idx4 = build_group_byte_index(index + 4*4, index[4*4]);
+    const uint8x16_t idx5 = build_group_byte_index(index + 4*5, index[4*5]);
+    const uint8x16_t idx6 = build_group_byte_index(index + 4*6, index[4*6]);
+    const uint8x16_t idx7 = build_group_byte_index(index + 4*7, index[4*7]);
+
+    //
+    //  Each group's input window starts at its first column.
+    //
+    const float* in0 = in_samples + index[4*0];
+    const float* in1 = in_samples + index[4*1];
+    const float* in2 = in_samples + index[4*2];
+    const float* in3 = in_samples + index[4*3];
+    const float* in4 = in_samples + index[4*4];
+    const float* in5 = in_samples + index[4*5];
+    const float* in6 = in_samples + index[4*6];
+    const float* in7 = in_samples + index[4*7];
+
+    float32x4_t r0 = vdupq_n_f32(0.0f);
+    float32x4_t r1 = vdupq_n_f32(0.0f);
+    float32x4_t r2 = vdupq_n_f32(0.0f);
+    float32x4_t r3 = vdupq_n_f32(0.0f);
+    float32x4_t r4 = vdupq_n_f32(0.0f);
+    float32x4_t r5 = vdupq_n_f32(0.0f);
+    float32x4_t r6 = vdupq_n_f32(0.0f);
+    float32x4_t r7 = vdupq_n_f32(0.0f);
+
+    const float* tap_weights = table.tap_start(0) + out_index;
+    size_t tap_stride = table.tap_stride();
+
+    size_t tap = 0;
+    size_t stop = table.taps();
+    do{
+        float32x4_t i0, i1, i2, i3, i4, i5, i6, i7;
+        if constexpr (input_loads == 1){
+            i0 = gather_group_up(vld1q_f32(in0 + tap), idx0);
+            i1 = gather_group_up(vld1q_f32(in1 + tap), idx1);
+            i2 = gather_group_up(vld1q_f32(in2 + tap), idx2);
+            i3 = gather_group_up(vld1q_f32(in3 + tap), idx3);
+            i4 = gather_group_up(vld1q_f32(in4 + tap), idx4);
+            i5 = gather_group_up(vld1q_f32(in5 + tap), idx5);
+            i6 = gather_group_up(vld1q_f32(in6 + tap), idx6);
+            i7 = gather_group_up(vld1q_f32(in7 + tap), idx7);
+        }else{
+            i0 = gather_group_down2(vld1q_f32(in0 + tap + 0), vld1q_f32(in0 + tap + 4), idx0);
+            i1 = gather_group_down2(vld1q_f32(in1 + tap + 0), vld1q_f32(in1 + tap + 4), idx1);
+            i2 = gather_group_down2(vld1q_f32(in2 + tap + 0), vld1q_f32(in2 + tap + 4), idx2);
+            i3 = gather_group_down2(vld1q_f32(in3 + tap + 0), vld1q_f32(in3 + tap + 4), idx3);
+            i4 = gather_group_down2(vld1q_f32(in4 + tap + 0), vld1q_f32(in4 + tap + 4), idx4);
+            i5 = gather_group_down2(vld1q_f32(in5 + tap + 0), vld1q_f32(in5 + tap + 4), idx5);
+            i6 = gather_group_down2(vld1q_f32(in6 + tap + 0), vld1q_f32(in6 + tap + 4), idx6);
+            i7 = gather_group_down2(vld1q_f32(in7 + tap + 0), vld1q_f32(in7 + tap + 4), idx7);
+        }
+        r0 = vfmaq_f32(r0, i0, vld1q_f32(tap_weights + 4*0));
+        r1 = vfmaq_f32(r1, i1, vld1q_f32(tap_weights + 4*1));
+        r2 = vfmaq_f32(r2, i2, vld1q_f32(tap_weights + 4*2));
+        r3 = vfmaq_f32(r3, i3, vld1q_f32(tap_weights + 4*3));
+        r4 = vfmaq_f32(r4, i4, vld1q_f32(tap_weights + 4*4));
+        r5 = vfmaq_f32(r5, i5, vld1q_f32(tap_weights + 4*5));
+        r6 = vfmaq_f32(r6, i6, vld1q_f32(tap_weights + 4*6));
+        r7 = vfmaq_f32(r7, i7, vld1q_f32(tap_weights + 4*7));
+        tap_weights += tap_stride;
+        tap += 1;
+    }while (tap < stop);
+
+    vst1q_f32(out_samples + 4*0, r0);
+    vst1q_f32(out_samples + 4*1, r1);
+    vst1q_f32(out_samples + 4*2, r2);
+    vst1q_f32(out_samples + 4*3, r3);
+    vst1q_f32(out_samples + 4*4, r4);
+    vst1q_f32(out_samples + 4*5, r5);
+    vst1q_f32(out_samples + 4*6, r6);
+    vst1q_f32(out_samples + 4*7, r7);
+}
+
+
+
+}
+
+
+void run_block8_tap4_ARM64_NEON(
+    const WeightTable& table,
+    size_t in_index, const float* in_samples,
+    size_t out_index, float* out_samples
+){
+    in_samples -= in_index;
+
+    const uint32_t* index = table.in_sample_index() + out_index;
+
+    const float* tap_weights = table.tap_start(0) + out_index;
+    size_t tap_stride = table.tap_stride();
+
+    float32x4_t r0 = vdupq_n_f32(0.0f);
+    float32x4_t r1 = vdupq_n_f32(0.0f);
+
+    size_t tap = 0;
+    size_t stop = table.taps();
+    do{
+        float32x4_t a0, a1, a2, a3;
+        float32x4_t b0, b1, b2, b3;
+
+        transposef32x4x4(
+            in_samples + index[ 0],
+            in_samples + index[ 1],
+            in_samples + index[ 2],
+            in_samples + index[ 3],
+            a0, a1, a2, a3
+        );
+        transposef32x4x4(
+            in_samples + index[ 4],
+            in_samples + index[ 5],
+            in_samples + index[ 6],
+            in_samples + index[ 7],
+            b0, b1, b2, b3
+        );
+
+        r0 = vfmaq_f32(r0, a0, vld1q_f32(tap_weights + tap_stride*0 + 0));
+        r1 = vfmaq_f32(r1, b0, vld1q_f32(tap_weights + tap_stride*0 + 4));
+
+        r0 = vfmaq_f32(r0, a1, vld1q_f32(tap_weights + tap_stride*1 + 0));
+        r1 = vfmaq_f32(r1, b1, vld1q_f32(tap_weights + tap_stride*1 + 4));
+
+        r0 = vfmaq_f32(r0, a2, vld1q_f32(tap_weights + tap_stride*2 + 0));
+        r1 = vfmaq_f32(r1, b2, vld1q_f32(tap_weights + tap_stride*2 + 4));
+
+        r0 = vfmaq_f32(r0, a3, vld1q_f32(tap_weights + tap_stride*3 + 0));
+        r1 = vfmaq_f32(r1, b3, vld1q_f32(tap_weights + tap_stride*3 + 4));
+
+        tap_weights += tap_stride*4;
+        in_samples += 4;
+        tap += 4;
+    }while (tap < stop);
+
+    vst1q_f32(out_samples + 4*0, r0);
+    vst1q_f32(out_samples + 4*1, r1);
+}
+
+
+void run_block32_up_ARM64_NEON(
+    const WeightTable& table,
+    size_t in_index, const float* in_samples,
+    size_t out_index, float* out_samples
+){
+    run_block32_permute_ARM64_NEON<1>(
+        table, in_index, in_samples, out_index, out_samples
+    );
+}
+
+
+void run_block32_down2_ARM64_NEON(
+    const WeightTable& table,
+    size_t in_index, const float* in_samples,
+    size_t out_index, float* out_samples
+){
+    run_block32_permute_ARM64_NEON<2>(
+        table, in_index, in_samples, out_index, out_samples
+    );
+}
+
+
+
+void add_tests_ARM64_NEON(UnitTestDatabase& database){
+    database.add<BlockKernelTest>(
+        "NEON", run_block8_tap4_ARM64_NEON,
+        48000, 44100, 16, 8, 4, 0
+    );
+    //  The block straddles the table period (147) into the continuing
+    //  index columns.
+    database.add<BlockKernelTest>(
+        "NEON", run_block8_tap4_ARM64_NEON,
+        48000, 44100, 16, 8, 4, 140
+    );
+    database.add<BlockKernelTest>(
+        "NEON", run_block8_tap4_ARM64_NEON,
+        44100, 88200, 16, 8, 4, 0
+    );
+    database.add<BlockKernelTest>(
+        "NEON", run_block8_tap4_ARM64_NEON,
+        48000, 44100, 8, 8, 4, 140
+    );
+
+    database.add<BlockKernelTest>(
+        "NEON_Up", run_block32_up_ARM64_NEON,
+        44100, 48000, 16, 32, 1, 0
+    );
+    //  The block straddles the table period (160) into the continuing
+    //  index columns.
+    database.add<BlockKernelTest>(
+        "NEON_Up", run_block32_up_ARM64_NEON,
+        44100, 48000, 16, 32, 1, 130
+    );
+    database.add<BlockKernelTest>(
+        "NEON_Up", run_block32_up_ARM64_NEON,
+        44100, 88200, 16, 32, 1, 0
+    );
+
+    database.add<BlockKernelTest>(
+        "NEON_Down2", run_block32_down2_ARM64_NEON,
+        48000, 44100, 16, 32, 1, 0
+    );
+    //  The block straddles the table period (147) into the continuing
+    //  index columns.
+    database.add<BlockKernelTest>(
+        "NEON_Down2", run_block32_down2_ARM64_NEON,
+        48000, 44100, 16, 32, 1, 116
+    );
+    //  Downsampling just past the 2x boundary (in_rate = 2.0045 x
+    //  out_rate): the 4-column index deltas still fit in the 8-float
+    //  windows.
+    database.add<BlockKernelTest>(
+        "NEON_Down2", run_block32_down2_ARM64_NEON,
+        88200, 44000, 16, 32, 1, 0
+    );
+}
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Kernels/AudioResampler/Kernels_AudioResampler_BlockKernel_Default.cpp b/SerialPrograms/Source/Kernels/AudioResampler/Kernels_AudioResampler_BlockKernel_Default.cpp
new file mode 100644
index 0000000000..1a32832b0d
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/AudioResampler/Kernels_AudioResampler_BlockKernel_Default.cpp
@@ -0,0 +1,72 @@
+/*  Audio Resampler Block Kernel (Default)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Kernels_AudioResampler_BlockKernels.h"
+
+namespace PokemonAutomation{
+namespace Kernels{
+namespace AudioResampler{
+
+
+
+void run_block8_Default(
+    const WeightTable& table,
+    size_t in_index, const float* in_samples,
+    size_t out_index, float* out_samples
+){
+    in_samples -= in_index;
+
+    const uint32_t* index = table.in_sample_index() + out_index;
+    const float* in0 = in_samples + index[0];
+    const float* in1 = in_samples + index[1];
+    const float* in2 = in_samples + index[2];
+    const float* in3 = in_samples + index[3];
+    const float* in4 = in_samples + index[4];
+    const float* in5 = in_samples + index[5];
+    const float* in6 = in_samples + index[6];
+    const float* in7 = in_samples + index[7];
+
+    float r0 = 0;
+    float r1 = 0;
+    float r2 = 0;
+    float r3 = 0;
+    float r4 = 0;
+    float r5 = 0;
+    float r6 = 0;
+    float r7 = 0;
+
+    size_t tap = 0;
+    size_t stop = table.taps();
+    do{
+        const float* tap_weights = table.tap_start(tap) + out_index;
+
+        r0 += in0[tap] * tap_weights[0];
+        r1 += in1[tap] * tap_weights[1];
+        r2 += in2[tap] * tap_weights[2];
+        r3 += in3[tap] * tap_weights[3];
+        r4 += in4[tap] * tap_weights[4];
+        r5 += in5[tap] * tap_weights[5];
+        r6 += in6[tap] * tap_weights[6];
+        r7 += in7[tap] * tap_weights[7];
+
+        tap++;
+    }while (tap < stop);
+
+    out_samples[0] = r0;
+    out_samples[1] = r1;
+    out_samples[2] = r2;
+    out_samples[3] = r3;
+    out_samples[4] = r4;
+    out_samples[5] = r5;
+    out_samples[6] = r6;
+    out_samples[7] = r7;
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/Kernels/AudioResampler/Kernels_AudioResampler_BlockKernel_x64_AVX512.cpp b/SerialPrograms/Source/Kernels/AudioResampler/Kernels_AudioResampler_BlockKernel_x64_AVX512.cpp
new file mode 100644
index 0000000000..e1e63dd969
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/AudioResampler/Kernels_AudioResampler_BlockKernel_x64_AVX512.cpp
@@ -0,0 +1,372 @@
+/*  Audio Resampler Block Kernel (x64 AVX512)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifdef PA_AutoDispatch_x64_17_Skylake
+
+#include <immintrin.h>
+#include "Common/Compiler.h"
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "Kernels_AudioResampler_BlockKernels.h"
+#include "Kernels_AudioResampler_Tests.h"
+
+namespace PokemonAutomation{
+namespace Kernels{
+namespace AudioResampler{
+
+
+
+namespace{
+
+
+
+//
+//  This is the fast kernel. But it only works for:
+//    - input_loads = 1: Upsampling
+//    - input_loads = 2: Downsampling by no more than 2x
+//
+//  Opcount Ratios:
+//    - 1 x FMA
+//    - 1 x shuffle
+//    - 1 x aligned 512-bit load
+//    - 1 x misaligned 512-bit load
+//
+template <int input_loads>
+PA_FORCE_INLINE void run_block128_x64_AVX512(
+    const WeightTable& table,
+    size_t in_index, const float* in_samples,
+    size_t out_index, float* out_samples
+){
+    in_samples -= in_index;
+
+    const uint32_t* index = table.in_sample_index() + out_index;
+    const uint32_t* index0 = index + 16*0;
+    const uint32_t* index1 = index + 16*1;
+    const uint32_t* index2 = index + 16*2;
+    const uint32_t* index3 = index + 16*3;
+    const uint32_t* index4 = index + 16*4;
+    const uint32_t* index5 = index + 16*5;
+    const uint32_t* index6 = index + 16*6;
+    const uint32_t* index7 = index + 16*7;
+
+    __m512i shuffle0 = _mm512_loadu_si512(index0);
+    __m512i shuffle1 = _mm512_loadu_si512(index1);
+    __m512i shuffle2 = _mm512_loadu_si512(index2);
+    __m512i shuffle3 = _mm512_loadu_si512(index3);
+    __m512i shuffle4 = _mm512_loadu_si512(index4);
+    __m512i shuffle5 = _mm512_loadu_si512(index5);
+    __m512i shuffle6 = _mm512_loadu_si512(index6);
+    __m512i shuffle7 = _mm512_loadu_si512(index7);
+
+    shuffle0 = _mm512_sub_epi32(shuffle0, _mm512_set1_epi32(index0[0]));
+    shuffle1 = _mm512_sub_epi32(shuffle1, _mm512_set1_epi32(index1[0]));
+    shuffle2 = _mm512_sub_epi32(shuffle2, _mm512_set1_epi32(index2[0]));
+    shuffle3 = _mm512_sub_epi32(shuffle3, _mm512_set1_epi32(index3[0]));
+    shuffle4 = _mm512_sub_epi32(shuffle4, _mm512_set1_epi32(index4[0]));
+    shuffle5 = _mm512_sub_epi32(shuffle5, _mm512_set1_epi32(index5[0]));
+    shuffle6 = _mm512_sub_epi32(shuffle6, _mm512_set1_epi32(index6[0]));
+    shuffle7 = _mm512_sub_epi32(shuffle7, _mm512_set1_epi32(index7[0]));
+
+    const float* in0 = in_samples + index0[0];
+    const float* in1 = in_samples + index1[0];
+    const float* in2 = in_samples + index2[0];
+    const float* in3 = in_samples + index3[0];
+    const float* in4 = in_samples + index4[0];
+    const float* in5 = in_samples + index5[0];
+    const float* in6 = in_samples + index6[0];
+    const float* in7 = in_samples + index7[0];
+
+    __m512 r0 = _mm512_setzero_ps();
+    __m512 r1 = _mm512_setzero_ps();
+    __m512 r2 = _mm512_setzero_ps();
+    __m512 r3 = _mm512_setzero_ps();
+    __m512 r4 = _mm512_setzero_ps();
+    __m512 r5 = _mm512_setzero_ps();
+    __m512 r6 = _mm512_setzero_ps();
+    __m512 r7 = _mm512_setzero_ps();
+
+    size_t tap_stride = table.tap_stride();
+    const float* tap_weights = table.tap_start(0) + out_index;
+
+    size_t tap = 0;
+    size_t stop = table.taps();
+    do{
+        __m512 i0, i1, i2, i3, i4, i5, i6, i7;
+
+        if constexpr (input_loads == 1){
+            i0 = _mm512_permutexvar_ps(shuffle0, _mm512_loadu_ps(in0 + tap));
+            i1 = _mm512_permutexvar_ps(shuffle1, _mm512_loadu_ps(in1 + tap));
+            i2 = _mm512_permutexvar_ps(shuffle2, _mm512_loadu_ps(in2 + tap));
+            i3 = _mm512_permutexvar_ps(shuffle3, _mm512_loadu_ps(in3 + tap));
+            i4 = _mm512_permutexvar_ps(shuffle4, _mm512_loadu_ps(in4 + tap));
+            i5 = _mm512_permutexvar_ps(shuffle5, _mm512_loadu_ps(in5 + tap));
+            i6 = _mm512_permutexvar_ps(shuffle6, _mm512_loadu_ps(in6 + tap));
+            i7 = _mm512_permutexvar_ps(shuffle7, _mm512_loadu_ps(in7 + tap));
+        }else if constexpr (input_loads == 2){
+            i0 = _mm512_permutex2var_ps(_mm512_loadu_ps(in0 + tap + 0), shuffle0, _mm512_loadu_ps(in0 + tap + 16));
+            i1 = _mm512_permutex2var_ps(_mm512_loadu_ps(in1 + tap + 0), shuffle1, _mm512_loadu_ps(in1 + tap + 16));
+            i2 = _mm512_permutex2var_ps(_mm512_loadu_ps(in2 + tap + 0), shuffle2, _mm512_loadu_ps(in2 + tap + 16));
+            i3 = _mm512_permutex2var_ps(_mm512_loadu_ps(in3 + tap + 0), shuffle3, _mm512_loadu_ps(in3 + tap + 16));
+            i4 = _mm512_permutex2var_ps(_mm512_loadu_ps(in4 + tap + 0), shuffle4, _mm512_loadu_ps(in4 + tap + 16));
+            i5 = _mm512_permutex2var_ps(_mm512_loadu_ps(in5 + tap + 0), shuffle5, _mm512_loadu_ps(in5 + tap + 16));
+            i6 = _mm512_permutex2var_ps(_mm512_loadu_ps(in6 + tap + 0), shuffle6, _mm512_loadu_ps(in6 + tap + 16));
+            i7 = _mm512_permutex2var_ps(_mm512_loadu_ps(in7 + tap + 0), shuffle7, _mm512_loadu_ps(in7 + tap + 16));
+        }else{
+            static_assert(false);
+        }
+
+        r0 = _mm512_fmadd_ps(i0, _mm512_loadu_ps(tap_weights + 16*0), r0);
+        r1 = _mm512_fmadd_ps(i1, _mm512_loadu_ps(tap_weights + 16*1), r1);
+        r2 = _mm512_fmadd_ps(i2, _mm512_loadu_ps(tap_weights + 16*2), r2);
+        r3 = _mm512_fmadd_ps(i3, _mm512_loadu_ps(tap_weights + 16*3), r3);
+        r4 = _mm512_fmadd_ps(i4, _mm512_loadu_ps(tap_weights + 16*4), r4);
+        r5 = _mm512_fmadd_ps(i5, _mm512_loadu_ps(tap_weights + 16*5), r5);
+        r6 = _mm512_fmadd_ps(i6, _mm512_loadu_ps(tap_weights + 16*6), r6);
+        r7 = _mm512_fmadd_ps(i7, _mm512_loadu_ps(tap_weights + 16*7), r7);
+
+        tap_weights += tap_stride;
+        tap++;
+    }while (tap < stop);
+
+    _mm512_storeu_ps(out_samples + 16*0, r0);
+    _mm512_storeu_ps(out_samples + 16*1, r1);
+    _mm512_storeu_ps(out_samples + 16*2, r2);
+    _mm512_storeu_ps(out_samples + 16*3, r3);
+    _mm512_storeu_ps(out_samples + 16*4, r4);
+    _mm512_storeu_ps(out_samples + 16*5, r5);
+    _mm512_storeu_ps(out_samples + 16*6, r6);
+    _mm512_storeu_ps(out_samples + 16*7, r7);
+}
+
+
+
+//
+//  This is a proof-of-concept for a transpose approach. It works for both
+//  upsampling and downsampling by any amount.
+//
+//  This is not efficient though since the opcount ratios come down to:
+//    - 1 x FMA
+//    - 3 x shuffle
+//    - 1 x aligned 512-bit load
+//    - 2 x misaligned 256-bit load
+//    - 2 x GPR load for spills
+//
+PA_FORCE_INLINE __m512 splitload512(const float* L, const float* H){
+    return _mm512_insertf32x8(
+        _mm512_castps256_ps512(_mm256_loadu_ps(L)),
+        _mm256_loadu_ps(H),
+        1
+    );
+}
+PA_FORCE_INLINE void transposef32x16x8(
+    const float* I00, const float* I01, const float* I02, const float* I03,
+    const float* I04, const float* I05, const float* I06, const float* I07,
+    const float* I08, const float* I09, const float* I10, const float* I11,
+    const float* I12, const float* I13, const float* I14, const float* I15,
+    __m512& r0, __m512& r1, __m512& r2, __m512& r3,
+    __m512& r4, __m512& r5, __m512& r6, __m512& r7
+){
+    __m512 s0, s1, s2, s3, s4, s5, s6, s7;
+
+    s0 = splitload512(I00, I04);
+    s1 = splitload512(I01, I05);
+    s2 = splitload512(I02, I06);
+    s3 = splitload512(I03, I07);
+    s4 = splitload512(I08, I12);
+    s5 = splitload512(I09, I13);
+    s6 = splitload512(I10, I14);
+    s7 = splitload512(I11, I15);
+
+    r0 = _mm512_shuffle_f32x4(s0, s4, 136);
+    r4 = _mm512_shuffle_f32x4(s0, s4, 221);
+    r1 = _mm512_shuffle_f32x4(s1, s5, 136);
+    r5 = _mm512_shuffle_f32x4(s1, s5, 221);
+    r2 = _mm512_shuffle_f32x4(s2, s6, 136);
+    r6 = _mm512_shuffle_f32x4(s2, s6, 221);
+    r3 = _mm512_shuffle_f32x4(s3, s7, 136);
+    r7 = _mm512_shuffle_f32x4(s3, s7, 221);
+
+    s0 = _mm512_shuffle_ps(r0, r1, 136);
+    s1 = _mm512_shuffle_ps(r0, r1, 221);
+    s2 = _mm512_shuffle_ps(r2, r3, 136);
+    s3 = _mm512_shuffle_ps(r2, r3, 221);
+    s4 = _mm512_shuffle_ps(r4, r5, 136);
+    s5 = _mm512_shuffle_ps(r4, r5, 221);
+    s6 = _mm512_shuffle_ps(r6, r7, 136);
+    s7 = _mm512_shuffle_ps(r6, r7, 221);
+
+    r0 = _mm512_shuffle_ps(s0, s2, 136);
+    r2 = _mm512_shuffle_ps(s0, s2, 221);
+    r1 = _mm512_shuffle_ps(s1, s3, 136);
+    r3 = _mm512_shuffle_ps(s1, s3, 221);
+    r4 = _mm512_shuffle_ps(s4, s6, 136);
+    r6 = _mm512_shuffle_ps(s4, s6, 221);
+    r5 = _mm512_shuffle_ps(s5, s7, 136);
+    r7 = _mm512_shuffle_ps(s5, s7, 221);
+}
+
+
+
+}
+
+
+void run_block32_tap8_x64_AVX512(
+    const WeightTable& table,
+    size_t in_index, const float* in_samples,
+    size_t out_index, float* out_samples
+){
+    in_samples -= in_index;
+
+    const uint32_t* index = table.in_sample_index() + out_index;
+
+    const float* tap_weights = table.tap_start(0) + out_index;
+    size_t tap_stride = table.tap_stride();
+
+    __m512 r0 = _mm512_setzero_ps();
+    __m512 r1 = _mm512_setzero_ps();
+
+    size_t tap = 0;
+    size_t stop = table.taps();
+    do{
+        __m512 a0, a1, a2, a3, a4, a5, a6, a7;
+        __m512 b0, b1, b2, b3, b4, b5, b6, b7;
+
+        transposef32x16x8(
+            in_samples + index[ 0],
+            in_samples + index[ 1],
+            in_samples + index[ 2],
+            in_samples + index[ 3],
+            in_samples + index[ 4],
+            in_samples + index[ 5],
+            in_samples + index[ 6],
+            in_samples + index[ 7],
+            in_samples + index[ 8],
+            in_samples + index[ 9],
+            in_samples + index[10],
+            in_samples + index[11],
+            in_samples + index[12],
+            in_samples + index[13],
+            in_samples + index[14],
+            in_samples + index[15],
+            a0, a1, a2, a3, a4, a5, a6, a7
+        );
+        transposef32x16x8(
+            in_samples + index[16],
+            in_samples + index[17],
+            in_samples + index[18],
+            in_samples + index[19],
+            in_samples + index[20],
+            in_samples + index[21],
+            in_samples + index[22],
+            in_samples + index[23],
+            in_samples + index[24],
+            in_samples + index[25],
+            in_samples + index[26],
+            in_samples + index[27],
+            in_samples + index[28],
+            in_samples + index[29],
+            in_samples + index[30],
+            in_samples + index[31],
+            b0, b1, b2, b3, b4, b5, b6, b7
+        );
+
+        r0 = _mm512_fmadd_ps(a0, _mm512_loadu_ps(tap_weights + tap_stride*0 +  0), r0);
+        r1 = _mm512_fmadd_ps(b0, _mm512_loadu_ps(tap_weights + tap_stride*0 + 16), r1);
+
+        r0 = _mm512_fmadd_ps(a1, _mm512_loadu_ps(tap_weights + tap_stride*1 +  0), r0);
+        r1 = _mm512_fmadd_ps(b1, _mm512_loadu_ps(tap_weights + tap_stride*1 + 16), r1);
+
+        r0 = _mm512_fmadd_ps(a2, _mm512_loadu_ps(tap_weights + tap_stride*2 +  0), r0);
+        r1 = _mm512_fmadd_ps(b2, _mm512_loadu_ps(tap_weights + tap_stride*2 + 16), r1);
+
+        r0 = _mm512_fmadd_ps(a3, _mm512_loadu_ps(tap_weights + tap_stride*3 +  0), r0);
+        r1 = _mm512_fmadd_ps(b3, _mm512_loadu_ps(tap_weights + tap_stride*3 + 16), r1);
+
+        r0 = _mm512_fmadd_ps(a4, _mm512_loadu_ps(tap_weights + tap_stride*4 +  0), r0);
+        r1 = _mm512_fmadd_ps(b4, _mm512_loadu_ps(tap_weights + tap_stride*4 + 16), r1);
+
+        r0 = _mm512_fmadd_ps(a5, _mm512_loadu_ps(tap_weights + tap_stride*5 +  0), r0);
+        r1 = _mm512_fmadd_ps(b5, _mm512_loadu_ps(tap_weights + tap_stride*5 + 16), r1);
+
+        r0 = _mm512_fmadd_ps(a6, _mm512_loadu_ps(tap_weights + tap_stride*6 +  0), r0);
+        r1 = _mm512_fmadd_ps(b6, _mm512_loadu_ps(tap_weights + tap_stride*6 + 16), r1);
+
+        r0 = _mm512_fmadd_ps(a7, _mm512_loadu_ps(tap_weights + tap_stride*7 +  0), r0);
+        r1 = _mm512_fmadd_ps(b7, _mm512_loadu_ps(tap_weights + tap_stride*7 + 16), r1);
+
+        tap_weights += tap_stride*8;
+        in_samples += 8;
+        tap += 8;
+    }while (tap < stop);
+
+    _mm512_storeu_ps(out_samples + 16*0, r0);
+    _mm512_storeu_ps(out_samples + 16*1, r1);
+}
+
+
+
+void run_block128_up_x64_AVX512(
+    const WeightTable& table,
+    size_t in_index, const float* in_samples,
+    size_t out_index, float* out_samples
+){
+    run_block128_x64_AVX512<1>(table, in_index, in_samples, out_index, out_samples);
+}
+void run_block128_down2_x64_AVX512(
+    const WeightTable& table,
+    size_t in_index, const float* in_samples,
+    size_t out_index, float* out_samples
+){
+    run_block128_x64_AVX512<2>(table, in_index, in_samples, out_index, out_samples);
+}
+
+
+
+void add_tests_x64_AVX512(UnitTestDatabase& database){
+    //  Transpose POC: strong downsampling (in > 2 x out).
+    database.add<BlockKernelTest>(
+        "AVX512_POC", run_block32_tap8_x64_AVX512,
+        96000, 44100, 16, 32, 8, 0
+    );
+    //  The block straddles the table period (147) into the continuing
+    //  index columns.
+    database.add<BlockKernelTest>(
+        "AVX512_POC", run_block32_tap8_x64_AVX512,
+        96000, 44100, 16, 32, 8, 119
+    );
+    //  Permute fast path: upsampling. The period (160) barely exceeds the
+    //  block, so a nonzero out_index straddles it.
+    database.add<BlockKernelTest>(
+        "AVX512_Up", run_block128_up_x64_AVX512,
+        44100, 48000, 16, 128, 1, 0
+    );
+    database.add<BlockKernelTest>(
+        "AVX512_Up", run_block128_up_x64_AVX512,
+        44100, 48000, 16, 128, 1, 50
+    );
+    //  Permute fast path: downsampling by just past the 2x boundary:
+    //  the 16-column index deltas still fit the 32-lane permute.
+    database.add<BlockKernelTest>(
+        "AVX512_Down2", run_block128_down2_x64_AVX512,
+        88200, 44000, 16, 128, 1, 0
+    );
+    database.add<BlockKernelTest>(
+        "AVX512_Down2", run_block128_down2_x64_AVX512,
+        88200, 44000, 16, 128, 1, 150
+    );
+    //  The block straddles the table period (441) into the continuing
+    //  index columns.
+    database.add<BlockKernelTest>(
+        "AVX512_Down2", run_block128_down2_x64_AVX512,
+        88000, 44100, 16, 128, 1, 350
+    );
+}
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Kernels/AudioResampler/Kernels_AudioResampler_BlockKernel_x64_FMA3.cpp b/SerialPrograms/Source/Kernels/AudioResampler/Kernels_AudioResampler_BlockKernel_x64_FMA3.cpp
new file mode 100644
index 0000000000..ba69aec09e
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/AudioResampler/Kernels_AudioResampler_BlockKernel_x64_FMA3.cpp
@@ -0,0 +1,156 @@
+/*  Audio Resampler Block Kernel (x64 FMA3)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifdef PA_AutoDispatch_x64_13_Haswell
+
+#include <immintrin.h>
+#include "Common/Compiler.h"
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "Kernels_AudioResampler_BlockKernels.h"
+#include "Kernels_AudioResampler_Tests.h"
+
+namespace PokemonAutomation{
+namespace Kernels{
+namespace AudioResampler{
+
+
+
+namespace{
+
+
+
+//
+//  Opcount Ratios:
+//    - 1 x FMA
+//    - 2 x shuffle
+//    - 1 x aligned 256-bit load
+//    - 2 x misaligned 128-bit load
+//
+PA_FORCE_INLINE __m256 splitload256(const float* L, const float* H){
+    return _mm256_loadu2_m128(H, L);
+}
+PA_FORCE_INLINE void transposef32x8x4(
+    const float* I0, const float* I1, const float* I2, const float* I3,
+    const float* I4, const float* I5, const float* I6, const float* I7,
+    __m256& r0, __m256& r1, __m256& r2, __m256& r3
+){
+    __m256 s0, s1, s2, s3;
+
+    r0 = splitload256(I0, I4);
+    r1 = splitload256(I2, I6);
+    r2 = splitload256(I1, I5);
+    r3 = splitload256(I3, I7);
+
+    s0 = _mm256_unpacklo_ps(r0, r2);
+    s1 = _mm256_unpacklo_ps(r1, r3);
+    s2 = _mm256_unpackhi_ps(r0, r2);
+    s3 = _mm256_unpackhi_ps(r1, r3);
+
+    r0 = _mm256_shuffle_ps(s0, s1, 68);
+    r1 = _mm256_shuffle_ps(s0, s1, 238);
+    r2 = _mm256_shuffle_ps(s2, s3, 68);
+    r3 = _mm256_shuffle_ps(s2, s3, 238);
+}
+
+
+
+}
+
+
+void run_block16_tap4_x64_FMA3(
+    const WeightTable& table,
+    size_t in_index, const float* in_samples,
+    size_t out_index, float* out_samples
+){
+    in_samples -= in_index;
+
+    const uint32_t* index = table.in_sample_index() + out_index;
+
+    const float* tap_weights = table.tap_start(0) + out_index;
+    size_t tap_stride = table.tap_stride();
+
+    __m256 r0 = _mm256_setzero_ps();
+    __m256 r1 = _mm256_setzero_ps();
+
+    size_t tap = 0;
+    size_t stop = table.taps();
+    do{
+        __m256 a0, a1, a2, a3;
+        __m256 b0, b1, b2, b3;
+
+        transposef32x8x4(
+            in_samples + index[ 0],
+            in_samples + index[ 1],
+            in_samples + index[ 2],
+            in_samples + index[ 3],
+            in_samples + index[ 4],
+            in_samples + index[ 5],
+            in_samples + index[ 6],
+            in_samples + index[ 7],
+            a0, a1, a2, a3
+        );
+        transposef32x8x4(
+            in_samples + index[ 8],
+            in_samples + index[ 9],
+            in_samples + index[10],
+            in_samples + index[11],
+            in_samples + index[12],
+            in_samples + index[13],
+            in_samples + index[14],
+            in_samples + index[15],
+            b0, b1, b2, b3
+        );
+
+        r0 = _mm256_fmadd_ps(a0, _mm256_loadu_ps(tap_weights + tap_stride*0 + 0), r0);
+        r1 = _mm256_fmadd_ps(b0, _mm256_loadu_ps(tap_weights + tap_stride*0 + 8), r1);
+
+        r0 = _mm256_fmadd_ps(a1, _mm256_loadu_ps(tap_weights + tap_stride*1 + 0), r0);
+        r1 = _mm256_fmadd_ps(b1, _mm256_loadu_ps(tap_weights + tap_stride*1 + 8), r1);
+
+        r0 = _mm256_fmadd_ps(a2, _mm256_loadu_ps(tap_weights + tap_stride*2 + 0), r0);
+        r1 = _mm256_fmadd_ps(b2, _mm256_loadu_ps(tap_weights + tap_stride*2 + 8), r1);
+
+        r0 = _mm256_fmadd_ps(a3, _mm256_loadu_ps(tap_weights + tap_stride*3 + 0), r0);
+        r1 = _mm256_fmadd_ps(b3, _mm256_loadu_ps(tap_weights + tap_stride*3 + 8), r1);
+
+        tap_weights += tap_stride*4;
+        in_samples += 4;
+        tap += 4;
+    }while (tap < stop);
+
+    _mm256_storeu_ps(out_samples + 8*0, r0);
+    _mm256_storeu_ps(out_samples + 8*1, r1);
+}
+
+
+
+void add_tests_x64_FMA3(UnitTestDatabase& database){
+    database.add<BlockKernelTest>(
+        "FMA3", run_block16_tap4_x64_FMA3,
+        48000, 44100, 16, 16, 4, 0
+    );
+    //  The block straddles the table period (147) into the continuing
+    //  index columns.
+    database.add<BlockKernelTest>(
+        "FMA3", run_block16_tap4_x64_FMA3,
+        48000, 44100, 16, 16, 4, 139
+    );
+    database.add<BlockKernelTest>(
+        "FMA3", run_block16_tap4_x64_FMA3,
+        44100, 88200, 16, 16, 4, 0
+    );
+    database.add<BlockKernelTest>(
+        "FMA3", run_block16_tap4_x64_FMA3,
+        48000, 44100, 8, 16, 4, 139
+    );
+}
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Kernels/AudioResampler/Kernels_AudioResampler_BlockKernel_x64_SSE2.cpp b/SerialPrograms/Source/Kernels/AudioResampler/Kernels_AudioResampler_BlockKernel_x64_SSE2.cpp
new file mode 100644
index 0000000000..bff173a6f4
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/AudioResampler/Kernels_AudioResampler_BlockKernel_x64_SSE2.cpp
@@ -0,0 +1,138 @@
+/*  Audio Resampler Block Kernel (x64 SSE2)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifdef PA_AutoDispatch_x64_08_Nehalem
+
+#include <immintrin.h>
+#include "Common/Compiler.h"
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "Kernels_AudioResampler_BlockKernels.h"
+#include "Kernels_AudioResampler_Tests.h"
+
+namespace PokemonAutomation{
+namespace Kernels{
+namespace AudioResampler{
+
+
+
+namespace{
+
+
+
+//
+//  Opcount Ratios:
+//    - 1 x FMA
+//    - 1 x shuffle
+//    - 1 x aligned 128-bit load
+//    - 2 x misaligned 64-bit load
+//
+PA_FORCE_INLINE __m128 splitload128(const float* L, const float* H){
+    return _mm_castpd_ps(_mm_loadh_pd(_mm_load_sd((const double*)(L)), (const double*)(H)));
+}
+PA_FORCE_INLINE void transposef32x4x2(
+    const float* I0, const float* I1, const float* I2, const float* I3,
+    __m128& r0, __m128& r1
+){
+    __m128 s0, s1;
+
+    s0 = splitload128(I0, I1);
+    s1 = splitload128(I2, I3);
+
+    r0 = _mm_shuffle_ps(s0, s1, 136);
+    r1 = _mm_shuffle_ps(s0, s1, 221);
+}
+
+
+
+}
+
+
+void run_block8_tap2_x64_SSE2(
+    const WeightTable& table,
+    size_t in_index, const float* in_samples,
+    size_t out_index, float* out_samples
+){
+    in_samples -= in_index;
+
+    const uint32_t* index = table.in_sample_index() + out_index;
+
+    const float* tap_weights = table.tap_start(0) + out_index;
+    size_t tap_stride = table.tap_stride();
+
+    __m128 r0 = _mm_setzero_ps();
+    __m128 r1 = _mm_setzero_ps();
+
+    size_t tap = 0;
+    size_t stop = table.taps();
+    do{
+        __m128 a0, a1;
+        __m128 b0, b1;
+
+        transposef32x4x2(
+            in_samples + index[ 0],
+            in_samples + index[ 1],
+            in_samples + index[ 2],
+            in_samples + index[ 3],
+            a0, a1
+        );
+        transposef32x4x2(
+            in_samples + index[ 4],
+            in_samples + index[ 5],
+            in_samples + index[ 6],
+            in_samples + index[ 7],
+            b0, b1
+        );
+
+        a0 = _mm_mul_ps(a0, _mm_loadu_ps(tap_weights + tap_stride*0 + 0));
+        b0 = _mm_mul_ps(b0, _mm_loadu_ps(tap_weights + tap_stride*0 + 4));
+
+        a1 = _mm_mul_ps(a1, _mm_loadu_ps(tap_weights + tap_stride*1 + 0));
+        b1 = _mm_mul_ps(b1, _mm_loadu_ps(tap_weights + tap_stride*1 + 4));
+
+        r0 = _mm_add_ps(r0, a0);
+        r1 = _mm_add_ps(r1, b0);
+
+        r0 = _mm_add_ps(r0, a1);
+        r1 = _mm_add_ps(r1, b1);
+
+        tap_weights += tap_stride*2;
+        in_samples += 2;
+        tap += 2;
+    }while (tap < stop);
+
+    _mm_storeu_ps(out_samples + 4*0, r0);
+    _mm_storeu_ps(out_samples + 4*1, r1);
+}
+
+
+
+void add_tests_x64_SSE2(UnitTestDatabase& database){
+    database.add<BlockKernelTest>(
+        "SSE2", run_block8_tap2_x64_SSE2,
+        48000, 44100, 16, 8, 2, 0
+    );
+    //  The block straddles the table period (147) into the continuing
+    //  index columns.
+    database.add<BlockKernelTest>(
+        "SSE2", run_block8_tap2_x64_SSE2,
+        48000, 44100, 16, 8, 2, 140
+    );
+    database.add<BlockKernelTest>(
+        "SSE2", run_block8_tap2_x64_SSE2,
+        44100, 88200, 16, 8, 2, 0
+    );
+    database.add<BlockKernelTest>(
+        "SSE2", run_block8_tap2_x64_SSE2,
+        48000, 44100, 8, 8, 2, 140
+    );
+}
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Kernels/AudioResampler/Kernels_AudioResampler_BlockKernels.cpp b/SerialPrograms/Source/Kernels/AudioResampler/Kernels_AudioResampler_BlockKernels.cpp
new file mode 100644
index 0000000000..ef11bb7a09
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/AudioResampler/Kernels_AudioResampler_BlockKernels.cpp
@@ -0,0 +1,69 @@
+/*  Audio Resampler Block Kernels
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Compiler.h"
+#include "Common/Cpp/CpuId/CpuId.h"
+#include "Kernels_AudioResampler_BlockKernels.h"
+
+namespace PokemonAutomation{
+namespace Kernels{
+namespace AudioResampler{
+
+
+
+BlockKernel get_block_kernel(
+    size_t in_sample_rate,
+    size_t out_sample_rate
+){
+#ifdef PA_AutoDispatch_x64_17_Skylake
+    if (CPU_CAPABILITY_CURRENT.OK_17_Skylake){
+        //  The permute-based kernels handle any tap count. The index delta
+        //  within a 16-output group bounds how many input lanes each load
+        //  must span: 15 for upsampling (in <= out) and 31 for downsampling
+        //  up to 2x. Stronger downsampling falls back to the transpose POC.
+        if (in_sample_rate <= out_sample_rate){
+            return {run_block128_up_x64_AVX512, 128, 1};
+        }
+        if (in_sample_rate <= 2 * out_sample_rate){
+            return {run_block128_down2_x64_AVX512, 128, 1};
+        }
+        return {run_block32_tap8_x64_AVX512, 32, 8};
+    }
+#endif
+#ifdef PA_AutoDispatch_x64_13_Haswell
+    if (CPU_CAPABILITY_CURRENT.OK_13_Haswell){
+        return {run_block16_tap4_x64_FMA3, 16, 4};
+    }
+#endif
+#ifdef PA_AutoDispatch_x64_08_Nehalem
+    if (CPU_CAPABILITY_CURRENT.OK_08_Nehalem){
+        return {run_block8_tap2_x64_SSE2, 8, 2};
+    }
+#endif
+#ifdef PA_AutoDispatch_arm64_20_M1
+    if (CPU_CAPABILITY_CURRENT.OK_M1){
+        //  The byte-permute kernels handle any tap count. The index delta
+        //  within a 4-output group bounds how many input lanes each load
+        //  must span: 3 for upsampling (in <= out) and 7 for downsampling
+        //  up to 2x. Stronger downsampling falls back to the 4x4
+        //  transpose.
+        if (in_sample_rate <= out_sample_rate){
+            return {run_block32_up_ARM64_NEON, 32, 1};
+        }
+        if (in_sample_rate <= 2 * out_sample_rate){
+            return {run_block32_down2_ARM64_NEON, 32, 1};
+        }
+        return {run_block8_tap4_ARM64_NEON, 8, 4};
+    }
+#endif
+    return {run_block8_Default, 8, 1};
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/Kernels/AudioResampler/Kernels_AudioResampler_BlockKernels.h b/SerialPrograms/Source/Kernels/AudioResampler/Kernels_AudioResampler_BlockKernels.h
new file mode 100644
index 0000000000..f5094ec18e
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/AudioResampler/Kernels_AudioResampler_BlockKernels.h
@@ -0,0 +1,209 @@
+/*  Audio Resampler Block Kernels
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Kernels_AudioResampler_BlockKernels_H
+#define PokemonAutomation_Kernels_AudioResampler_BlockKernels_H
+
+#include "Kernels_AudioResampler_WeightTable.h"
+
+namespace PokemonAutomation{
+namespace Kernels{
+namespace AudioResampler{
+
+
+
+//
+//  Block kernels compute a run of consecutive output samples from the
+//  weight table:
+//
+//      out_samples[c] = sum over taps t of
+//          table.tap_start(t)[out_index + c] x
+//          in_samples[table.in_sample_index()[out_index + c] + t - in_index]
+//
+//  `in_index` is the absolute input stream index of in_samples[0].
+//  `out_index` is the absolute output stream index wrapped to the table
+//  period.
+//
+//  Each kernel processes a fixed block size. Fixed blocks can overshoot
+//  the end of the table in both dimensions, so construct the weight
+//  table with the kernel's sample_block / tap_block; the constructor
+//  extends the allocations for the block. The extra input samples read
+//  past the block's last window are never used for the outputs and only
+//  need to be valid memory.
+//
+//  The definitions are non-inline, one per ISA translation unit. The x64
+//  kernels are only defined when the matching PA_AutoDispatch_x64_* macro
+//  is set, and require the matching CPU features at run time.
+//
+
+
+
+//
+//  8 outputs. Any rate ratio, any tap count.
+//  Read overshoot: 0 input samples.
+//
+void run_block8_Default(
+    const WeightTable& table,
+    size_t in_index, const float* in_samples,
+    size_t out_index, float* out_samples
+);
+
+
+
+//
+//  8 outputs. Any rate ratio.
+//  Tap group of 2 (the table zero-pads to taps + 1 rows).
+//  Read overshoot: 1 input sample.
+//
+void run_block8_tap2_x64_SSE2(
+    const WeightTable& table,
+    size_t in_index, const float* in_samples,
+    size_t out_index, float* out_samples
+);
+
+
+
+//
+//  8 outputs. Any rate ratio.
+//  Tap group of 4 (the table zero-pads to taps + 3 rows).
+//  Read overshoot: 3 input samples.
+//
+void run_block8_tap4_ARM64_NEON(
+    const WeightTable& table,
+    size_t in_index, const float* in_samples,
+    size_t out_index, float* out_samples
+);
+
+
+
+//
+//  32 outputs. Fast byte-permute path (the NEON equivalent of the AVX512
+//  fast kernels): gathers the input samples with TBL byte permutes
+//  instead of transposing the tap rows.
+//  Upsampling only (in_rate <= out_rate): the index deltas between the
+//  first and last column of each 4-column group must fit in a 4-float
+//  window.
+//  Read overshoot: 3 input samples.
+//
+void run_block32_up_ARM64_NEON(
+    const WeightTable& table,
+    size_t in_index, const float* in_samples,
+    size_t out_index, float* out_samples
+);
+
+
+
+//
+//  32 outputs. Fast byte-permute path (the NEON equivalent of the AVX512
+//  fast kernels).
+//  Downsampling by no more than 2x (in_rate <= 2 x out_rate): the index
+//  deltas between the first and last column of each 4-column group must
+//  fit in an 8-float window.
+//  Read overshoot: 7 input samples.
+//
+void run_block32_down2_ARM64_NEON(
+    const WeightTable& table,
+    size_t in_index, const float* in_samples,
+    size_t out_index, float* out_samples
+);
+
+
+
+//
+//  16 outputs. Any rate ratio.
+//  Tap group of 4 (the table zero-pads to taps + 3 rows).
+//  Read overshoot: 3 input samples.
+//
+void run_block16_tap4_x64_FMA3(
+    const WeightTable& table,
+    size_t in_index, const float* in_samples,
+    size_t out_index, float* out_samples
+);
+
+
+
+//
+//  32 outputs. Any rate ratio.
+//  Tap group of 8 (the table zero-pads to taps + 7 rows).
+//  Read overshoot: 7 input samples.
+//
+void run_block32_tap8_x64_AVX512(
+    const WeightTable& table,
+    size_t in_index, const float* in_samples,
+    size_t out_index, float* out_samples
+);
+
+
+
+//
+//  128 outputs. Upsampling only (in_rate <= out_rate): the index deltas
+//  between the first and last column of each 16-column group must fit in
+//  a 16-lane permute.
+//  Read overshoot: 15 input samples.
+//
+void run_block128_up_x64_AVX512(
+    const WeightTable& table,
+    size_t in_index, const float* in_samples,
+    size_t out_index, float* out_samples
+);
+
+
+
+//
+//  128 outputs. Downsampling by no more than 2x (in_rate <= 2 x out_rate):
+//  the index deltas between the first and last column of each 16-column
+//  group must fit in a 32-lane permute.
+//  Read overshoot: 31 input samples.
+//
+void run_block128_down2_x64_AVX512(
+    const WeightTable& table,
+    size_t in_index, const float* in_samples,
+    size_t out_index, float* out_samples
+);
+
+
+
+//
+//  Dispatch descriptor for a block kernel.
+//
+//  `sample_block` is the number of consecutive output samples the kernel
+//  produces. `tap_block` is the number of weight table rows it may read.
+//  The implied overshoots at the caller are:
+//    - Input reads may extend `sample_block - 1` samples past the last
+//      window's start.
+//    - Weight reads may extend `tap_block - 1` rows past the tap count.
+//
+struct BlockKernel{
+    void (*fp)(
+        const WeightTable& table,
+        size_t in_index, const float* in_samples,
+        size_t out_index, float* out_samples
+    );
+    size_t sample_block;
+    size_t tap_block;
+};
+
+
+//
+//  Picks the fastest block kernel for the rate ratio on the current CPU.
+//  The returned kernel is valid for any out_index wrapped to the table
+//  period, provided the table was constructed with the kernel's
+//  sample_block and tap_block (the WeightTable constructor extends the
+//  allocations, zero padding the extra tap rows, which the unrolls'
+//  final partial group may read). It is the caller's responsibility to
+//  honor the implied overshoots when staging input.
+//
+BlockKernel get_block_kernel(
+    size_t in_sample_rate,
+    size_t out_sample_rate
+);
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Kernels/AudioResampler/Kernels_AudioResampler_Tests.cpp b/SerialPrograms/Source/Kernels/AudioResampler/Kernels_AudioResampler_Tests.cpp
new file mode 100644
index 0000000000..f9d2c642c4
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/AudioResampler/Kernels_AudioResampler_Tests.cpp
@@ -0,0 +1,689 @@
+/*  Audio Resampler Tests
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <algorithm>
+#include <bit>
+#include <cmath>
+#include <cstdint>
+#include <cstring>
+#include <numbers>
+#include <random>
+#include <utility>
+#include "Common/Cpp/CpuId/CpuId.h"
+#include "Common/Cpp/Containers/AlignedVector.tpp"
+#include "Common/Cpp/Containers/GuardPageBuffer.h"
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "Kernels/KaiserWindow/Kernels_KaiserWindow.h"
+#include "Kernels_AudioResampler_BlockKernels.h"
+#include "Kernels_AudioResampler_Tests.h"
+#include "Kernels_AudioResampler.h"
+
+namespace PokemonAutomation{
+namespace Kernels{
+namespace AudioResampler{
+
+
+
+namespace{
+
+
+
+//
+//  Scalar reference for one output sample:
+//      out[out_index + c] = sum_t weight[t][out_index + c] x
+//          input[index[out_index + c] + t]
+//
+float block_reference(
+    const WeightTable& table, const float* input, size_t out_index, size_t c
+){
+    const uint32_t* index = table.in_sample_index();
+    const uint32_t base = index[out_index + c];
+    float acc = 0;
+    for (size_t t = 0; t < table.taps(); t++){
+        acc += table.tap_start(t)[out_index + c] * input[base + t];
+    }
+    return acc;
+}
+AlignedVector<float> reference_lanes(
+    const WeightTable& table, const float* input, size_t out_index, size_t block
+){
+    AlignedVector<float> out(block);
+    for (size_t c = 0; c < block; c++){
+        out[c] = block_reference(table, input, out_index, c);
+    }
+    return out;
+}
+std::string format_lanes(const float* v, size_t n){
+    std::string s;
+    const size_t count = n < 4 ? n : 4;
+    for (size_t i = 0; i < count; i++){
+        if (i > 0){
+            s += ", ";
+        }
+        s += std::to_string(v[i]);
+    }
+    return s;
+}
+
+
+//
+//  Number of ULPs between two floats, in a monotonic bit ordering.
+//  Returns a distance larger than any real one if either value is NaN.
+//
+int64_t ulp_distance(float a, float b){
+    if (a == b){
+        return 0;
+    }
+    if (a != a || b != b){
+        return INT64_MAX;
+    }
+    const int32_t ia = std::bit_cast<int32_t>(a);
+    const int32_t ib = std::bit_cast<int32_t>(b);
+    const int64_t ma = ia < 0 ? -(int64_t)(uint32_t)ia : ia;
+    const int64_t mb = ib < 0 ? -(int64_t)(uint32_t)ib : ib;
+    return ma > mb ? ma - mb : mb - ma;
+}
+//
+//  The SIMD kernels use the same coefficients as the reference; only the
+//  floating-point rounding can differ (FMA contraction, accumulation
+//  order). The tolerance is 32 ULPs of the result magnitude, anchored at
+//  1.0 so near-zero results keep an absolute floor. Any indexing or
+//  coefficient bug shows up as an O(0.01) difference, far outside this.
+//
+bool within_ulp_tolerance(float got, float want, int64_t& ulp_diff){
+    ulp_diff = ulp_distance(got, want);
+    if (std::isinf(got) || std::isinf(want)){
+        return got == want;
+    }
+    const float scale = std::max(std::max(std::fabs(got), std::fabs(want)), 1.0f);
+    const float ulp = std::nextafterf(scale, INFINITY) - scale;
+    return std::fabs(got - want) <= 32.0f * ulp;
+}
+
+
+class RecordingWorkingAudioListener : public AudioPipeline::WorkingAudioStreamListener{
+public:
+    RecordingWorkingAudioListener(size_t sample_rate, size_t channels, size_t capacity)
+        : AudioPipeline::WorkingAudioStreamListener(sample_rate, channels)
+        , m_capacity(capacity)
+        , m_data(capacity * channels)
+    {}
+
+    virtual void push_samples(size_t samples, size_t stride, const float* data) override{
+        for (size_t c = 0; c < channels(); c++){
+            memcpy(
+                m_data.data() + c * m_capacity + m_write,
+                data + c * stride,
+                samples * sizeof(float)
+            );
+        }
+        m_write += samples;
+    }
+
+    const AlignedVector<float>& data() const{
+        return m_data;
+    }
+    size_t written() const{
+        return m_write;
+    }
+    size_t capacity_per_channel() const{
+        return m_capacity;
+    }
+
+
+private:
+    const size_t m_capacity;
+    AlignedVector<float> m_data;
+    size_t m_write = 0;
+};
+
+
+
+UnitTestResult run_resampler_stream(
+    Logger& logger,
+    size_t in_rate, size_t out_rate, size_t channels,
+    size_t samples, size_t push, uint32_t taps, double beta
+){
+    //  Generate random input. It ends right before a guard page, so a read
+    //  past the end faults.
+    GuardPageBuffer<float> input(samples * channels);
+    std::mt19937 generator(42);
+    std::uniform_real_distribution<float> distribution(-1.f, 1.f);
+    for (size_t c = 0; c < input.size(); c++){
+        input[c] = distribution(generator);
+    }
+
+    //  Small output buffer so a single push flushes multiple times.
+    AudioResampler resampler(logger, in_rate, out_rate, channels, 512, taps, beta);
+    size_t capacity = samples * out_rate / in_rate + 4096;
+    RecordingWorkingAudioListener output(out_rate, channels, capacity);
+    resampler.add_listener(output);
+
+    //  Push the input in chunks. The input is channel-planar: channel c is
+    //  the block [c * samples, (c + 1) * samples).
+    size_t offset = 0;
+    while (offset < samples){
+        size_t chunk = std::min(push, samples - offset);
+        resampler.push_samples(chunk, samples, input.data() + offset);
+        offset += chunk;
+    }
+
+    const size_t got = output.written();
+    if (got == 0){
+        return "No output produced.";
+    }
+
+    //  Reference: out_c[o] = sum_t weight[t][o] x in_c[round(o * in/out) + t].
+    //  The reference only reads index/weight columns 0..got - 1, so the
+    //  block size is got itself and the tap group 1.
+    WeightTable reference(in_rate, out_rate, taps, beta, got, 1);
+    const uint32_t* ref_index = reference.in_sample_index();
+
+    //  How many outputs should have been produced? The resampler may be
+    //  holding back the unprocessed input tail: at most the next block's
+    //  window span plus its taps plus the kernel's read overshoot
+    //  (block - 1) input samples, scaled to the output rate. The span
+    //  grows with the dispatched block size (up to 128 samples on the
+    //  wide permute kernels), so bound it exactly from the table.
+    const size_t block = resampler.block_size();
+    size_t max_span = 0;
+    for (size_t wr = 0; wr < reference.period_out(); wr++){
+        max_span = std::max(max_span, (size_t)(ref_index[wr + block - 1] - ref_index[wr]));
+    }
+    const double expected = (double)samples * out_rate / in_rate;
+    const double tail = ((double)max_span + taps + block) * out_rate / in_rate + 32.0;
+    if ((double)got > expected + 2.0){
+        return "Produced " + std::to_string(got) + " outputs, expected at most " +
+            std::to_string((size_t)expected) + ".";
+    }
+    if ((double)got < expected - tail){
+        return "Produced only " + std::to_string(got) + " outputs, expected at least " +
+            std::to_string((size_t)(expected - tail)) + ".";
+    }
+
+    double max_diff = 0;
+    size_t first_bad = 0;
+    for (size_t o = 0; o < got; o++){
+        const uint32_t in_base = ref_index[o];
+        for (size_t c = 0; c < channels; c++){
+            const float* in = input.data() + c * samples;
+            float acc = 0;
+            for (uint32_t t = 0; t < taps; t++){
+                acc += reference.tap_start(t)[o] * in[in_base + t];
+            }
+            float diff = output.data()[c * capacity + o] - acc;
+            if (diff < 0){
+                diff = -diff;
+            }
+            if (diff > max_diff){
+                max_diff = diff;
+                first_bad = o * channels + c;
+            }
+        }
+    }
+    if (max_diff > 1e-5f){
+        return "Max diff " + std::to_string(max_diff) + " at output " +
+            std::to_string(first_bad) + ".";
+    }
+
+    return true;
+}
+
+
+
+}
+
+
+
+//  Per-ISA test registration, defined in the matching block kernel
+//  translation unit next to the kernel it tests.
+void add_tests_x64_SSE2(UnitTestDatabase& database);
+void add_tests_x64_FMA3(UnitTestDatabase& database);
+void add_tests_x64_AVX512(UnitTestDatabase& database);
+void add_tests_ARM64_NEON(UnitTestDatabase& database);
+
+
+
+
+BlockKernelTest::BlockKernelTest(
+    const char* p_kernel,
+    KernelFn p_kernel_fn,
+    size_t in_sample_rate,
+    size_t out_sample_rate,
+    uint32_t taps,
+    size_t sample_block,
+    size_t tap_block,
+    size_t out_index
+)
+    : UnitTest(
+        "Kernels::AudioResampler - Block(" + std::string(p_kernel) +
+        ", " + std::to_string(in_sample_rate) + "->" + std::to_string(out_sample_rate) +
+        ", " + std::to_string(taps) + " taps) @" + std::to_string(out_index)
+      )
+    , m_kernel_fn(p_kernel_fn)
+    , m_in_rate(in_sample_rate)
+    , m_out_rate(out_sample_rate)
+    , m_taps(taps)
+    , m_block(sample_block)
+    , m_tap_block(tap_block)
+    , m_out_index(out_index)
+{}
+UnitTestResult BlockKernelTest::run(Logger& logger, CancellableScope& scope) const{
+    (void)logger;
+    (void)scope;
+
+    WeightTable table(
+        m_in_rate, m_out_rate, m_taps, 9.0,
+        m_block, m_tap_block
+    );
+    if (m_out_index >= table.period_out()){
+        return "out_index must wrap to the period.";
+    }
+
+    //  Deterministic pseudo-random input. input[i] is absolute stream
+    //  sample i, so the kernel's in_index is 0 (k = 0 periods in).
+    //  The index columns keep counting past the period, so a block that
+    //  wraps the period reads samples up to about period_in + block + taps.
+    //  The input and the output both end right before a guard page.
+    GuardPageBuffer<float> input(table.period_in() + m_block + m_taps + 128);
+    std::mt19937 generator(42);
+    std::uniform_real_distribution<float> distribution(-1.0f, 1.0f);
+    for (size_t i = 0; i < input.size(); i++){
+        input[i] = distribution(generator);
+    }
+
+    GuardPageBuffer<float> got(m_block);
+    m_kernel_fn(table, 0, input.data(), m_out_index, got.data());
+
+    AlignedVector<float> want = reference_lanes(table, input.data(), m_out_index, m_block);
+
+    for (size_t c = 0; c < m_block; c++){
+        int64_t ulp = 0;
+        if (!within_ulp_tolerance(got[c], want[c], ulp)){
+            return "Kernels disagree; max diff " + std::to_string(std::fabs(got[c] - want[c])) +
+                " at output " + std::to_string(c) +
+                "; got[" + std::to_string(c) + "] = " + std::to_string(got[c]) +
+                ", want[" + std::to_string(c) + "] = " + std::to_string(want[c]) +
+                " (" + std::to_string(ulp) + " ULP); got0..3 = [" + format_lanes(got.data(), m_block) +
+                "], want0..3 = [" + format_lanes(want.data(), m_block) + "]";
+        }
+    }
+
+    return true;
+}
+
+
+
+BlockDispatchTest::BlockDispatchTest(
+    size_t in_sample_rate,
+    size_t out_sample_rate,
+    uint32_t taps
+)
+    : UnitTest(
+        "Kernels::AudioResampler - Dispatch(" + std::to_string(in_sample_rate) +
+        "->" + std::to_string(out_sample_rate) + ", " +
+        std::to_string(taps) + " taps)"
+      )
+    , m_in_rate(in_sample_rate)
+    , m_out_rate(out_sample_rate)
+    , m_taps(taps)
+{}
+UnitTestResult BlockDispatchTest::run(Logger& logger, CancellableScope& scope) const{
+    (void)logger;
+    (void)scope;
+
+    BlockKernel bk = get_block_kernel(m_in_rate, m_out_rate);
+    if (bk.fp == nullptr){
+        return "get_block_kernel returned a null function pointer.";
+    }
+
+    //  Table sized exactly to the kernel's block.
+    WeightTable table(
+        m_in_rate, m_out_rate, m_taps, 9.0,
+        bk.sample_block, bk.tap_block
+    );
+
+    //  The kernel's input reads may extend sample_block - 1 samples past
+    //  the last window's start. The input and the output both end right
+    //  before a guard page.
+    const uint32_t* index = table.in_sample_index();
+    GuardPageBuffer<float> input(index[bk.sample_block - 1] + m_taps + bk.sample_block + 64);
+    std::mt19937 generator(42);
+    std::uniform_real_distribution<float> distribution(-1.0f, 1.0f);
+    for (size_t i = 0; i < input.size(); i++){
+        input[i] = distribution(generator);
+    }
+
+    GuardPageBuffer<float> got(bk.sample_block);
+    bk.fp(table, 0, input.data(), 0, got.data());
+
+    AlignedVector<float> want = reference_lanes(table, input.data(), 0, bk.sample_block);
+
+    for (size_t c = 0; c < bk.sample_block; c++){
+        int64_t ulp = 0;
+        if (!within_ulp_tolerance(got[c], want[c], ulp)){
+            return "Dispatched kernel disagrees; max diff " +
+                std::to_string(std::fabs(got[c] - want[c])) +
+                " at output " + std::to_string(c) +
+                "; got[" + std::to_string(c) + "] = " + std::to_string(got[c]) +
+                ", want[" + std::to_string(c) + "] = " + std::to_string(want[c]) +
+                " (" + std::to_string(ulp) + " ULP)";
+        }
+    }
+
+    return true;
+}
+
+
+
+ResamplerStreamTest::ResamplerStreamTest(
+    size_t in_sample_rate,
+    size_t out_sample_rate,
+    size_t channels,
+    size_t samples,
+    size_t push_size,
+    uint32_t taps,
+    double beta
+)
+    : UnitTest(
+        "Kernels::AudioResampler - Stream(" +
+        std::to_string(in_sample_rate) + "->" + std::to_string(out_sample_rate) +
+        ", " + std::to_string(channels) + "ch, " + std::to_string(samples) +
+        " samples, " + std::to_string(push_size) + " push, " +
+        std::to_string(taps) + " taps, beta " + std::to_string((int)beta) + ")"
+    )
+    , m_in_rate(in_sample_rate)
+    , m_out_rate(out_sample_rate)
+    , m_channels(channels)
+    , m_samples(samples)
+    , m_push(push_size)
+    , m_taps(taps)
+    , m_beta(beta)
+{}
+UnitTestResult ResamplerStreamTest::run(Logger& logger, CancellableScope& scope) const{
+    return run_resampler_stream(
+        logger,
+        m_in_rate, m_out_rate, m_channels,
+        m_samples, m_push, m_taps, m_beta
+    );
+}
+
+
+
+WeightTableTimeShiftTest::WeightTableTimeShiftTest(
+    size_t in_sample_rate,
+    size_t out_sample_rate,
+    uint32_t taps
+)
+    : UnitTest(
+        "Kernels::AudioResampler - TimeShift(" + std::to_string(in_sample_rate) +
+        "->" + std::to_string(out_sample_rate) + ", " +
+        std::to_string(taps) + " taps)"
+    )
+    , m_in_rate(in_sample_rate)
+    , m_out_rate(out_sample_rate)
+    , m_taps(taps)
+{}
+UnitTestResult WeightTableTimeShiftTest::run(Logger& logger, CancellableScope& scope) const{
+    (void)logger;
+    (void)scope;
+
+    WeightTable table(m_in_rate, m_out_rate, m_taps, 9.0, 8, 1);
+
+    //  The shift must be the 1st-tap to median-tap distance, in seconds
+    //  of the input stream.
+    const double want_shift = ((double)m_taps - 1.0) * 0.5 / (double)m_in_rate;
+    if (table.time_shift() != want_shift){
+        return "time_shift() = " + std::to_string(table.time_shift()) +
+            ", expected " + std::to_string(want_shift) + " seconds."
+        ;
+    }
+
+    //  The table must actually reconstruct at the shifted time: a delta
+    //  at input sample p0 produces, at output sample c, the windowed sinc
+    //  centered on input time p0 evaluated at the output's time,
+    //  c * ratio + (taps - 1) / 2 input samples (zero when p0 is outside
+    //  c's input window). The delta makes exactly one tap nonzero, so the
+    //  output is that tap's stored float weight, no accumulation error.
+    using namespace Kernels::KaiserWindow;
+    const double ratio = (double)m_in_rate / m_out_rate;
+    const double shift = ((double)m_taps - 1.0) * 0.5;
+    const double tap_radius = m_taps * 0.5;
+    const double scale = (m_in_rate > m_out_rate)
+        ? ((double)m_out_rate / m_in_rate)
+        : 1.0;
+    const double ibeta = bessel_i0(9.0);
+    auto weight_at = [&](double x)->double{
+        //  The table constructor's windowed sinc, in doubles.
+        if (x == 0.0){
+            return scale;
+        }
+        if (std::fabs(x) >= tap_radius){
+            return 0.0;
+        }
+        double arg = std::numbers::pi * x * scale;
+        double sinc = std::sin(arg) / arg;
+        double kaiser = x / tap_radius;
+        kaiser *= kaiser;
+        kaiser = 1 - kaiser;
+        kaiser = kaiser <= 0 ? 0 : std::sqrt(kaiser);
+        kaiser *= 9.0;
+        kaiser = bessel_i0(kaiser) / ibeta;
+        double w = kaiser * sinc * scale;
+        if (std::abs(w) < 1e-12){
+            w = 0;
+        }
+        return w;
+    };
+
+    //  Well inside the stream, away from the period's start edge.
+    const size_t p0 = table.period_in() * 4 + m_taps + 128;
+    AlignedVector<float> input(p0 + 1024);
+    memset(input.data(), 0, input.size() * sizeof(float));
+    input[p0] = 1.0f;
+
+    //  Output sample c from the table alone, with the resampler's
+    //  wrapped-period cursor arithmetic.
+    auto out_sample = [&](size_t c)->std::pair<float, size_t>{
+        const size_t poe = table.period_out_extended();
+        const size_t wr = c % poe;
+        const size_t periods = c / poe;
+        const size_t base = table.in_sample_index()[wr]
+            + periods * poe * table.period_in() / table.period_out();
+        float acc = 0.0f;
+        for (uint32_t t = 0; t < m_taps; t++){
+            acc += table.tap_start(t)[wr] * input[base + t];
+        }
+        return {acc, base};
+    };
+
+    const double center = ((double)p0 - shift) / ratio;
+    double max_diff = 0;
+    size_t first_bad = 0;
+    const double from = std::max(0.0, center - 32.0);
+    const double to = center + 32.0;
+    for (size_t c = (size_t)std::floor(from); c <= (size_t)std::ceil(to); c++){
+        const auto got_base = out_sample(c);
+        const double want = (got_base.second <= p0 && p0 < got_base.second + m_taps)
+            ? weight_at((double)p0 - (double)c * ratio - shift)
+            : 0.0;
+        const double diff = std::fabs((double)got_base.first - want);
+        if (diff > max_diff){
+            max_diff = diff;
+            first_bad = c;
+        }
+    }
+    if (max_diff > 1e-6){
+        return "Impulse response at output " + std::to_string(first_bad) +
+            " differs by " + std::to_string(max_diff) +
+            " from the windowed sinc centered on input time p0 evaluated at "
+            "c * ratio + (taps - 1) / 2; the table does not reconstruct at "
+            "time_shift()."
+        ;
+    }
+
+    return true;
+}
+
+
+
+void add_tests(UnitTestDatabase& database){
+    struct Combo{
+        size_t in_rate;
+        size_t out_rate;
+        size_t channels;
+        size_t samples;
+        size_t push;
+        uint32_t taps;
+        double beta;
+    };
+    //  1:1, upsample, downsample, strong downsampling and irrational
+    //  ratios, with chunk sizes that stress the carry buffer on either
+    //  side of the block size. The strong-downsampling combos stress the
+    //  case where a block's window-start span exceeds the staged input.
+    const Combo combos[] = {
+        { 44100, 44100, 1, 4000, 100, 16, 9.0 },
+        { 44100, 44100, 2, 4000, 250, 16, 9.0 },
+        { 44100, 48000, 1, 4000, 100, 16, 9.0 },
+        { 48000, 44100, 1, 4000, 250, 16, 9.0 },
+        { 44100, 88200, 2, 4000, 4096, 16, 9.0 },
+        { 88200, 44100, 2, 4000, 4096, 16, 9.0 },
+        { 32000, 44100, 1, 4000, 7, 16, 5.0 },
+        { 44100, 22050, 8, 4000, 250, 8, 9.0 },
+        { 8000, 44100, 1, 4000, 100, 8, 9.0 },
+        { 90000, 20000, 1, 4000, 250, 4, 9.0 },
+        { 128000, 8000, 1, 4000, 250, 8, 9.0 },
+        //  Odd tap count: on the unrolling kernels the final partial
+        //  group reads the zero-padded tap row's input samples, which is
+        //  what taps_allocated() in need() accounts for.
+        { 44100, 22050, 1, 4000, 250, 3, 9.0 },
+    };
+    for (auto& combo : combos){
+        database.add<ResamplerStreamTest>(
+            combo.in_rate, combo.out_rate, combo.channels,
+            combo.samples, combo.push, combo.taps, combo.beta
+        );
+    }
+
+    //  A spread of tap counts across the supported range on the 1:1 combo
+    //  (16 taps is the first combo above): counts below the kernels' tap
+    //  blocks are zero padded, odd counts exercise the unrolls' final
+    //  partial group, and the wide counts stress the carry sizing and the
+    //  Kaiser window width.
+    const uint32_t sweep_taps[] = { 1, 2, 3, 4, 5, 8, 32, 48, 63, 64 };
+    for (uint32_t taps : sweep_taps){
+        database.add<ResamplerStreamTest>(44100, 44100, 1, 4000, 100, taps, 9.0);
+    }
+    //  Degenerate and wide tap counts on the strongest upsampling combo,
+    //  where the tap count dominates the next block's input requirement.
+    database.add<ResamplerStreamTest>(8000, 44100, 1, 4000, 100, 1, 9.0);
+    database.add<ResamplerStreamTest>(8000, 44100, 1, 4000, 100, 64, 9.0);
+
+    //  Dispatch choices across rate ratios, with a spread of tap counts
+    //  for the table itself. Odd tap counts exercise the unrolls' final
+    //  partial group reading the table's zero padded rows.
+    const struct{
+        size_t in_rate;
+        size_t out_rate;
+        uint32_t taps;
+    } dispatch_combos[] = {
+        { 44100, 44100, 16 },
+        { 44100, 48000, 16 },
+        { 48000, 44100, 16 },
+        { 44100, 88200, 16 },
+        { 88200, 44100, 16 },
+        { 96000, 44100, 16 },
+        { 44100, 22050, 8 },
+        { 90000, 20000, 4 },
+        { 8000, 44100, 3 },
+        //  The tap extremes across the kernel families.
+        { 44100, 44100, 1 },
+        { 44100, 48000, 64 },
+        { 88200, 44100, 32 },
+        { 128000, 8000, 64 },
+    };
+    for (auto& combo : dispatch_combos){
+        database.add<BlockDispatchTest>(
+            combo.in_rate, combo.out_rate, combo.taps
+        );
+    }
+
+    //  The output time base is shifted (taps - 1) / 2 input samples past
+    //  the input time base (the median-tap alignment). Verify the
+    //  accessor's value and the actual alignment across ratios and tap
+    //  parities.
+    const struct{
+        size_t in_rate;
+        size_t out_rate;
+        uint32_t taps;
+    } timeshift_combos[] = {
+        { 44100, 44100, 16 },
+        { 44100, 44100, 31 },
+        { 44100, 48000, 16 },
+        { 48000, 44100, 31 },
+        { 88200, 44100, 32 },
+        { 44100, 88200, 3 },
+        { 8000, 44100, 8 },
+        { 128000, 8000, 64 },
+    };
+    for (auto& combo : timeshift_combos){
+        database.add<WeightTableTimeShiftTest>(
+            combo.in_rate, combo.out_rate, combo.taps
+        );
+    }
+
+    //  The Default kernel doubles as the reference for the SIMD variants,
+    //  with the tap extremes alongside the standard count.
+    database.add<BlockKernelTest>(
+        "Default", run_block8_Default,
+        48000, 44100, 1, 8, 1, 0
+    );
+    database.add<BlockKernelTest>(
+        "Default", run_block8_Default,
+        48000, 44100, 16, 8, 1, 0
+    );
+    database.add<BlockKernelTest>(
+        "Default", run_block8_Default,
+        48000, 44100, 64, 8, 1, 0
+    );
+    //  The block straddles the table period (147) into the continuing
+    //  index columns.
+    database.add<BlockKernelTest>(
+        "Default", run_block8_Default,
+        48000, 44100, 16, 8, 1, 140
+    );
+    database.add<BlockKernelTest>(
+        "Default", run_block8_Default,
+        96000, 44100, 16, 8, 1, 0
+    );
+
+#ifdef PA_AutoDispatch_x64_08_Nehalem
+    if (CPU_CAPABILITY_CURRENT.OK_08_Nehalem){
+        add_tests_x64_SSE2(database);
+    }
+#endif
+#ifdef PA_AutoDispatch_x64_13_Haswell
+    if (CPU_CAPABILITY_CURRENT.OK_13_Haswell){
+        add_tests_x64_FMA3(database);
+    }
+#endif
+#ifdef PA_AutoDispatch_x64_17_Skylake
+    if (CPU_CAPABILITY_CURRENT.OK_17_Skylake){
+        add_tests_x64_AVX512(database);
+    }
+#endif
+#ifdef PA_AutoDispatch_arm64_20_M1
+    if (CPU_CAPABILITY_CURRENT.OK_M1){
+        add_tests_ARM64_NEON(database);
+    }
+#endif
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/Kernels/AudioResampler/Kernels_AudioResampler_Tests.h b/SerialPrograms/Source/Kernels/AudioResampler/Kernels_AudioResampler_Tests.h
new file mode 100644
index 0000000000..9cd555418e
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/AudioResampler/Kernels_AudioResampler_Tests.h
@@ -0,0 +1,156 @@
+/*  Audio Resampler Tests
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Kernels_AudioResampler_Tests_H
+#define PokemonAutomation_Kernels_AudioResampler_Tests_H
+
+#include "Common/Cpp/TestRunners/UnitTest.h"
+#include "Kernels_AudioResampler_WeightTable.h"
+
+namespace PokemonAutomation{
+
+class UnitTestDatabase;
+
+namespace Kernels{
+namespace AudioResampler{
+
+
+
+void add_tests(UnitTestDatabase& database);
+
+
+
+//
+//  Warning, this file is compiled in multiple ISA contexts.
+//  We cannot define the functions here since they will be compiled differently.
+//  If a higher (AVX512) version wins out in the linker, all versions will use
+//  it and crash on older CPUs.
+//
+//
+//  Runs one block of a block kernel on deterministic input and compares
+//  every output sample, in ULPs, to a scalar reference computed straight
+//  from the weight table. The coefficients are shared with the reference,
+//  so only floating-point rounding differences (FMA contraction,
+//  accumulation order) are allowed, bounded by a small ULP tolerance.
+//
+class BlockKernelTest : public UnitTest{
+public:
+    using KernelFn = void(*)(const WeightTable&, size_t, const float*, size_t, float*);
+
+    BlockKernelTest(
+        const char* p_kernel,
+        KernelFn p_kernel_fn,
+        size_t in_sample_rate,
+        size_t out_sample_rate,
+        uint32_t taps,
+        size_t sample_block,
+        size_t tap_block,
+        size_t out_index
+    );
+
+    virtual UnitTestResult run(Logger& logger, CancellableScope& scope) const override;
+
+
+private:
+    const KernelFn m_kernel_fn;
+    const size_t m_in_rate;
+    const size_t m_out_rate;
+    const uint32_t m_taps;
+    const size_t m_block;
+    const size_t m_tap_block;
+    const size_t m_out_index;
+};
+
+
+
+//
+//  Runs one block of the kernel chosen by get_block_kernel() on
+//  deterministic input and compares every output sample, in ULPs, to a
+//  scalar reference. This validates that the dispatch result is a kernel
+//  that is actually valid for the rate ratio and tap count.
+//
+class BlockDispatchTest : public UnitTest{
+public:
+    BlockDispatchTest(
+        size_t in_sample_rate,
+        size_t out_sample_rate,
+        uint32_t taps
+    );
+
+    virtual UnitTestResult run(Logger& logger, CancellableScope& scope) const override;
+
+
+private:
+    const size_t m_in_rate;
+    const size_t m_out_rate;
+    const uint32_t m_taps;
+};
+
+
+
+//
+//  Checks that WeightTable::time_shift() is the 1st-tap to median-tap
+//  distance in input-sample seconds, and that the table actually
+//  reconstructs at that shifted time: a delta at input sample p0 must
+//  produce, at every output sample c, the windowed sinc centered on
+//  input time p0 evaluated at c * in_rate / out_rate + (taps - 1) / 2
+//  input samples.
+//
+class WeightTableTimeShiftTest : public UnitTest{
+public:
+    WeightTableTimeShiftTest(
+        size_t in_sample_rate,
+        size_t out_sample_rate,
+        uint32_t taps
+    );
+
+    virtual UnitTestResult run(Logger& logger, CancellableScope& scope) const override;
+
+
+private:
+    const size_t m_in_rate;
+    const size_t m_out_rate;
+    const uint32_t m_taps;
+};
+
+
+
+//
+//  Pushes random input through an AudioResampler in chunks and compares
+//  every produced output sample to a scalar reference computed from the
+//  weight table.
+//
+class ResamplerStreamTest : public UnitTest{
+public:
+    ResamplerStreamTest(
+        size_t in_sample_rate,
+        size_t out_sample_rate,
+        size_t channels,
+        size_t samples,
+        size_t push_size,
+        uint32_t taps,
+        double beta
+    );
+
+    virtual UnitTestResult run(Logger& logger, CancellableScope& scope) const override;
+
+
+private:
+    const size_t m_in_rate;
+    const size_t m_out_rate;
+    const size_t m_channels;
+    const size_t m_samples;
+    const size_t m_push;
+    const uint32_t m_taps;
+    const double m_beta;
+};
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Kernels/AudioResampler/Kernels_AudioResampler_WeightTable.cpp b/SerialPrograms/Source/Kernels/AudioResampler/Kernels_AudioResampler_WeightTable.cpp
new file mode 100644
index 0000000000..744471ca4f
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/AudioResampler/Kernels_AudioResampler_WeightTable.cpp
@@ -0,0 +1,146 @@
+/*  Audio Resampler - Weight Table
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <numeric>
+#include <cmath>
+#include <numbers>
+#include "Common/Cpp/Containers/AlignedVector.tpp"
+#include "Kernels/Kernels_Alignment.h"
+#include "Kernels/KaiserWindow/Kernels_KaiserWindow.h"
+#include "Kernels_AudioResampler_WeightTable.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace Kernels{
+namespace AudioResampler{
+
+
+
+WeightTable::WeightTable(
+    size_t in_sample_rate,
+    size_t out_sample_rate,
+    uint32_t taps,
+    double beta,
+    size_t sample_block,
+    size_t tap_block
+)
+    : m_taps(taps)
+    , m_in_sample_rate(in_sample_rate)
+    , m_out_sample_rate(out_sample_rate)
+    , m_sample_block(sample_block)
+    , m_tap_block(tap_block)
+{
+    using namespace Kernels::KaiserWindow;
+
+    double ratio = (double)in_sample_rate / out_sample_rate;
+    double ibeta = bessel_i0(beta);
+    double tap_radius = taps * 0.5;
+    double downsample_scale = 1.0;
+    if (in_sample_rate > out_sample_rate){
+        downsample_scale = (double)out_sample_rate / in_sample_rate;
+    }
+//    uint32_t window_shift = taps / 2;
+//    cout << "window_shift = " << window_shift << endl;
+
+    size_t gcd = std::gcd(in_sample_rate, out_sample_rate);
+    m_period_in = in_sample_rate / gcd;
+    m_period_out = out_sample_rate / gcd;
+
+    //  The smallest multiple of the period that is >= sample_block, so a
+    //  block wraps it at most once.
+    m_period_out_extended = (sample_block + m_period_out - 1) / m_period_out * m_period_out;
+
+    m_samples_allocated = m_period_out_extended + sample_block;
+    m_taps_allocated = taps + tap_block - 1;
+
+    //  Calculate the starting input indices.
+    {
+        m_index = AlignedVector<uint32_t>(m_samples_allocated);
+        for (size_t c = 0; c < m_samples_allocated; c++){
+            m_index[c] = (uint32_t)std::round(c * ratio);
+//            cout << "target = " << target << endl;
+//            cout << center << ",";
+        }
+//        cout << endl;
+    }
+
+    m_tap_stride = m_samples_allocated * sizeof(float);
+
+    //  Round up to the cache way.
+    constexpr size_t CACHE_WAY = 4096;
+    m_tap_stride = Kernels::align_int_up<CACHE_WAY>(m_tap_stride);
+
+    //  Extra padding to break superalignment.
+    m_tap_stride += 4096 / m_taps_allocated;
+
+    //  Round up to min alignment.
+    m_tap_stride = Kernels::align_int_up<PA_ALIGNMENT>(m_tap_stride);
+    m_tap_stride /= sizeof(float);
+
+
+    m_data = AlignedVector<float>(m_taps_allocated * m_tap_stride);
+    memset(m_data.data(), 0, m_taps_allocated * m_tap_stride * sizeof(float));
+//    cout << "items = " << taps * m_tap_stride << endl;
+
+    for (uint32_t tap_index = 0; tap_index < taps; tap_index++){
+        float* tap_row = internal_tap_start(tap_index);
+        double tap_shift = tap_index - tap_radius + 0.5;
+//        cout << "-----------------" << endl;
+//        cout << "tap_shift = " << tap_shift << endl;
+
+        for (size_t c = 0; c < m_samples_allocated; c++){
+            double in_index = m_index[c] + tap_shift;
+            double x = in_index - c * ratio;
+//            cout << "in[" << in_index << "]: x = " << x << endl;
+            if (x == 0){
+                tap_row[c] = (float)downsample_scale;
+                continue;
+            }
+            if (std::abs(x) >= tap_radius){
+                tap_row[c] = 0;
+                continue;
+            }
+
+            //  The sinc argument is in output-sample units (the ideal
+            //  anti-aliasing lowpass), so scale x. The Kaiser window is
+            //  defined over the tap radius in input-sample units, so it
+            //  is evaluated on the unscaled x.
+            double arg = std::numbers::pi * x * downsample_scale;
+            double sinc = std::sin(arg) / arg;
+//            cout << "sinc = " << sinc << endl;
+
+            x /= tap_radius;
+            x *= x;
+            x = 1 - x;
+            x = x <= 0 ? 0 : std::sqrt(x);
+            x *= beta;
+            x = bessel_i0(x) / ibeta;
+//            cout << "bessel = " << x << endl;
+            x *= sinc;
+            x *= downsample_scale;
+
+            //  Truncate small values that are likely zero.
+            if (std::abs(x) < 1e-12){
+                x = 0;
+            }
+
+//            cout << x << endl;
+            tap_row[c] = (float)x;
+        }
+    }
+}
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/Kernels/AudioResampler/Kernels_AudioResampler_WeightTable.h b/SerialPrograms/Source/Kernels/AudioResampler/Kernels_AudioResampler_WeightTable.h
new file mode 100644
index 0000000000..dc2a70bf49
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/AudioResampler/Kernels_AudioResampler_WeightTable.h
@@ -0,0 +1,138 @@
+/*  Audio Resampler - Weight Table
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Kernels_AudioSampler_WeightTable_H
+#define PokemonAutomation_Kernels_AudioSampler_WeightTable_H
+
+#include <stdint.h>
+#include "Common/Cpp/Containers/AlignedVector.h"
+
+namespace PokemonAutomation{
+namespace Kernels{
+namespace AudioResampler{
+
+
+class WeightTable{
+public:
+    WeightTable(
+        size_t in_sample_rate,
+        size_t out_sample_rate,
+        uint32_t taps,
+        double beta,
+
+        //  The block kernel's input block size in output samples. The
+        //  index/weight allocation is extended so a block starting at any
+        //  position of the extended period stays in bounds.
+        size_t sample_block,
+
+        //  The block kernel's tap group size. The tap allocation is
+        //  extended so the kernel's final partial tap group stays in
+        //  bounds.
+        size_t tap_block
+    );
+
+    //  The sample rates the table was built for.
+    size_t in_sample_rate() const{
+        return m_in_sample_rate;
+    }
+
+    size_t out_sample_rate() const{
+        return m_out_sample_rate;
+    }
+
+    size_t taps() const{
+        return m_taps;
+    }
+
+    //  The block sizes the table was built for. A table built for larger
+    //  blocks is valid for smaller ones (the block sizes only extend the
+    //  allocations, not the weights).
+    size_t sample_block() const{
+        return m_sample_block;
+    }
+    size_t tap_block() const{
+        return m_tap_block;
+    }
+
+    //  Input samples per output period (in_sample_rate / gcd).
+    size_t period_in() const{
+        return m_period_in;
+    }
+
+    //  Output samples per period (out_sample_rate / gcd).
+    size_t period_out() const{
+        return m_period_out;
+    }
+
+    //  The extended output period: the smallest multiple of period_out()
+    //  that is >= the sample block, so a block wraps it at most once.
+    size_t period_out_extended() const{
+        return m_period_out_extended;
+    }
+
+    //  time(output[0]) - time(input[0]), in seconds. Output sample c
+    //  reconstructs the input at c * in_rate / out_rate + (taps - 1) / 2
+    //  input samples: the window's time alignment sits at the median tap
+    //  (the midpoint between the two middle taps for even tap counts),
+    //  which is (taps - 1) / 2 input samples past the 1st tap, anchored
+    //  at the ideal output time. Positive: the output's time 0 is this
+    //  far into the input stream.
+    double time_shift() const{
+        return ((double)m_taps - 1.0) * 0.5 / (double)m_in_sample_rate;
+    }
+
+    //  Tap rows in the table (the requested taps, zero-padded for the
+    //  kernel's tap group).
+    size_t taps_allocated() const{
+        return m_taps_allocated;
+    }
+
+    //  Index entries (and weight columns) in the table.
+    size_t samples_allocated() const{
+        return m_samples_allocated;
+    }
+
+    const uint32_t* in_sample_index() const{
+        return m_index.data();
+    }
+
+    const float* tap_start(size_t tap_index) const{
+        return m_data.data() + tap_index * m_tap_stride;
+    }
+
+    size_t tap_stride() const{
+        return m_tap_stride;
+    }
+
+
+private:
+    float* internal_tap_start(size_t tap_index){
+        return m_data.data() + tap_index * m_tap_stride;
+    }
+
+
+private:
+    size_t m_taps;
+    size_t m_in_sample_rate;
+    size_t m_out_sample_rate;
+    size_t m_sample_block;
+    size_t m_tap_block;
+    size_t m_period_in;
+    size_t m_period_out;
+    size_t m_period_out_extended;
+    size_t m_taps_allocated;
+    size_t m_samples_allocated;
+    size_t m_tap_stride;
+    AlignedVector<uint32_t> m_index;
+    AlignedVector<float> m_data;
+};
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Kernels/AudioStreamConversion/AudioStreamConversion.cpp b/SerialPrograms/Source/Kernels/AudioStreamConversion/AudioStreamConversion.cpp
deleted file mode 100644
index 439ac041f1..0000000000
--- a/SerialPrograms/Source/Kernels/AudioStreamConversion/AudioStreamConversion.cpp
+++ /dev/null
@@ -1,92 +0,0 @@
-/*  Audio Stream Conversion
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Cpp/CpuId/CpuId.h"
-#include "AudioStreamConversion.h"
-
-namespace PokemonAutomation{
-namespace Kernels{
-namespace AudioStreamConversion{
-
-
-
-void convert_audio_uint8_to_float_Default(float* f, const uint8_t* i, size_t length, float output_multiplier);
-void convert_audio_float_to_uint8_Default(uint8_t* i, const float* f, size_t length);
-void convert_audio_sint16_to_float_Default(float* f, const int16_t* i, size_t length, float output_multiplier);
-void convert_audio_float_to_sint16_Default(int16_t* i, const float* f, size_t length);
-void convert_audio_sint32_to_float_Default(float* f, const int32_t* i, size_t length, float output_multiplier);
-void convert_audio_float_to_sint32_Default(int32_t* i, const float* f, size_t length);
-
-void convert_audio_uint8_to_float_x86_SSE41(float* f, const uint8_t* i, size_t length, float output_multiplier);
-void convert_audio_float_to_uint8_x86_SSE41(uint8_t* i, const float* f, size_t length);
-void convert_audio_sint16_to_float_x86_SSE41(float* f, const int16_t* i, size_t length, float output_multiplier);
-void convert_audio_float_to_sint16_x86_SSE41(int16_t* i, const float* f, size_t length);
-void convert_audio_sint32_to_float_x86_SSE2(float* f, const int32_t* i, size_t length, float output_multiplier);
-void convert_audio_float_to_sint32_x86_SSE2(int32_t* i, const float* f, size_t length);
-
-
-
-
-void convert_audio_uint8_to_float(float* f, const uint8_t* i, size_t length, float output_multiplier){
-#ifdef PA_AutoDispatch_x64_08_Nehalem
-    if (CPU_CAPABILITY_CURRENT.OK_08_Nehalem){
-        convert_audio_uint8_to_float_x86_SSE41(f, i, length, output_multiplier);
-        return;
-    }
-#endif
-    convert_audio_uint8_to_float_Default(f, i, length, output_multiplier);
-}
-void convert_audio_float_to_uint8(uint8_t* i, const float* f, size_t length){
-#ifdef PA_AutoDispatch_x64_08_Nehalem
-    if (CPU_CAPABILITY_CURRENT.OK_08_Nehalem){
-        convert_audio_float_to_uint8_x86_SSE41(i, f, length);
-        return;
-    }
-#endif
-    convert_audio_float_to_uint8_Default(i, f, length);
-}
-void convert_audio_sint16_to_float(float* f, const int16_t* i, size_t length, float output_multiplier){
-#ifdef PA_AutoDispatch_x64_08_Nehalem
-    if (CPU_CAPABILITY_CURRENT.OK_08_Nehalem){
-        convert_audio_sint16_to_float_x86_SSE41(f, i, length, output_multiplier);
-        return;
-    }
-#endif
-    convert_audio_sint16_to_float_Default(f, i, length, output_multiplier);
-}
-void convert_audio_float_to_sint16(int16_t* i, const float* f, size_t length){
-#ifdef PA_AutoDispatch_x64_08_Nehalem
-    if (CPU_CAPABILITY_CURRENT.OK_08_Nehalem){
-        convert_audio_float_to_sint16_x86_SSE41(i, f, length);
-        return;
-    }
-#endif
-    convert_audio_float_to_sint16_Default(i, f, length);
-}
-void convert_audio_sint32_to_float(float* f, const int32_t* i, size_t length, float output_multiplier){
-#ifdef PA_AutoDispatch_x64_08_Nehalem
-    if (CPU_CAPABILITY_CURRENT.OK_08_Nehalem){
-        convert_audio_sint32_to_float_x86_SSE2(f, i, length, output_multiplier);
-        return;
-    }
-#endif
-    convert_audio_sint32_to_float_Default(f, i, length, output_multiplier);
-}
-void convert_audio_float_to_sint32(int32_t* i, const float* f, size_t length){
-#ifdef PA_AutoDispatch_x64_08_Nehalem
-    if (CPU_CAPABILITY_CURRENT.OK_08_Nehalem){
-        convert_audio_float_to_sint32_x86_SSE2(i, f, length);
-        return;
-    }
-#endif
-    convert_audio_float_to_sint32_Default(i, f, length);
-}
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/Kernels/AudioStreamConversion/AudioStreamConversion.h b/SerialPrograms/Source/Kernels/AudioStreamConversion/AudioStreamConversion.h
deleted file mode 100644
index 9487800790..0000000000
--- a/SerialPrograms/Source/Kernels/AudioStreamConversion/AudioStreamConversion.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*  Audio Stream Conversion
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_Kernels_AudioStreamConversion_H
-#define PokemonAutomation_Kernels_AudioStreamConversion_H
-
-#include <stddef.h>
-#include <stdint.h>
-
-namespace PokemonAutomation{
-namespace Kernels{
-namespace AudioStreamConversion{
-
-
-void convert_audio_uint8_to_float(float* f, const uint8_t* i, size_t length, float output_multiplier);
-void convert_audio_float_to_uint8(uint8_t* i, const float* f, size_t length);
-
-void convert_audio_sint16_to_float(float* f, const int16_t* i, size_t length, float output_multiplier);
-void convert_audio_float_to_sint16(int16_t* i, const float* f, size_t length);
-
-void convert_audio_sint32_to_float(float* f, const int32_t* i, size_t length, float output_multiplier);
-void convert_audio_float_to_sint32(int32_t* i, const float* f, size_t length);
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/Kernels/AudioStreamConversion/AudioStreamConversion_Core_Default.cpp b/SerialPrograms/Source/Kernels/AudioStreamConversion/AudioStreamConversion_Core_Default.cpp
deleted file mode 100644
index 202baaddec..0000000000
--- a/SerialPrograms/Source/Kernels/AudioStreamConversion/AudioStreamConversion_Core_Default.cpp
+++ /dev/null
@@ -1,78 +0,0 @@
-/*  Audio Stream Conversion (Default)
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <algorithm>
-#include "AudioStreamConversion.h"
-
-namespace PokemonAutomation{
-namespace Kernels{
-namespace AudioStreamConversion{
-
-
-
-void convert_audio_uint8_to_float_Default(float* f, const uint8_t* i, size_t length, float output_multiplier){
-    const float SCALE = output_multiplier / 127.f;
-    for (size_t c = 0; c < length; c++){
-        float x = (float)i[c] * SCALE - output_multiplier;
-        x = std::max(x, -1.0f);
-        x = std::min(x, 1.0f);
-        f[c] = x;
-    }
-}
-void convert_audio_float_to_uint8_Default(uint8_t* i, const float* f, size_t length){
-    for (size_t c = 0; c < length; c++){
-        float r = (f[c] + 1.0f) * 127.f;
-        r = std::min(r, 255.f);
-        r = std::max(r, 0.f);
-        r += 0.5;
-        i[c] = (uint8_t)r;
-    }
-}
-
-void convert_audio_sint16_to_float_Default(float* f, const int16_t* i, size_t length, float output_multiplier){
-    const float SCALE = output_multiplier / 32767.f;
-    for (size_t c = 0; c < length; c++){
-        float x = (float)i[c] * SCALE;
-        x = std::max(x, -1.0f);
-        x = std::min(x, 1.0f);
-        f[c] = x;
-    }
-}
-void convert_audio_float_to_sint16_Default(int16_t* i, const float* f, size_t length){
-    for (size_t c = 0; c < length; c++){
-        float r = f[c] * 32767.f;
-        r = std::min(r, 32767.f);
-        r = std::max(r, -32768.f);
-        r += r > 0 ? 0.5f : -0.5f;
-        i[c] = (int16_t)r;
-    }
-}
-
-void convert_audio_sint32_to_float_Default(float* f, const int32_t* i, size_t length, float output_multiplier){
-    const float SCALE = output_multiplier / 2147483647.f;
-    for (size_t c = 0; c < length; c++){
-        float x = (float)i[c] * SCALE;
-        x = std::max(x, -1.0f);
-        x = std::min(x, 1.0f);
-        f[c] = x;
-    }
-}
-void convert_audio_float_to_sint32_Default(int32_t* i, const float* f, size_t length){
-    for (size_t c = 0; c < length; c++){
-        double r = f[c] * 2147483647.;
-        r = std::min(r, 2147483647.);
-        r = std::max(r, -2147483648.);
-        r += r > 0 ? 0.5 : -0.5;
-        i[c] = (int32_t)r;
-    }
-}
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/Kernels/AudioStreamConversion/AudioStreamConversion_Core_x86_SSE41.cpp b/SerialPrograms/Source/Kernels/AudioStreamConversion/AudioStreamConversion_Core_x86_SSE41.cpp
deleted file mode 100644
index b641980275..0000000000
--- a/SerialPrograms/Source/Kernels/AudioStreamConversion/AudioStreamConversion_Core_x86_SSE41.cpp
+++ /dev/null
@@ -1,190 +0,0 @@
-/*  Audio Stream Conversion (x86 SSE4.1)
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifdef PA_AutoDispatch_x64_08_Nehalem
-
-#include <immintrin.h>
-#include <smmintrin.h>
-#include "AudioStreamConversion.h"
-
-namespace PokemonAutomation{
-namespace Kernels{
-namespace AudioStreamConversion{
-
-
-
-void convert_audio_uint8_to_float_x86_SSE41(float* f, const uint8_t* i, size_t length, float output_multiplier){
-    const __m128 SCALE = _mm_set1_ps(output_multiplier / 127.f);
-    const __m128 SUB = _mm_set1_ps(output_multiplier);
-    size_t lc = length / 4;
-    while (lc--){
-#if __GNUC__
-        __m128i i0 = _mm_cvtepu8_epi32(_mm_cvtsi32_si128(*(int32_t*)i));
-#else
-        __m128i i0 = _mm_cvtepu8_epi32(_mm_loadu_si32(i));
-#endif
-        __m128 f0 = _mm_cvtepi32_ps(i0);
-        f0 = _mm_mul_ps(f0, SCALE);
-        f0 = _mm_sub_ps(f0, SUB);
-        f0 = _mm_max_ps(f0, _mm_set1_ps(-1.0f));
-        f0 = _mm_min_ps(f0, _mm_set1_ps(1.0f));
-        _mm_storeu_ps(f, f0);
-        f += 4;
-        i += 4;
-    }
-
-    length %= 4;
-    while (length--){
-        __m128 f0 = _mm_cvtsi32_ss(_mm_setzero_ps(), i[0]);
-        f0 = _mm_mul_ss(f0, SCALE);
-        f0 = _mm_sub_ss(f0, SUB);
-        f0 = _mm_max_ss(f0, _mm_set1_ps(-1.0f));
-        f0 = _mm_min_ss(f0, _mm_set1_ps(1.0f));
-        _mm_store_ss(f, f0);
-        f += 1;
-        i += 1;
-    }
-}
-void convert_audio_float_to_uint8_x86_SSE41(uint8_t* i, const float* f, size_t length){
-    size_t lc = length / 4;
-    while (lc--){
-        __m128 f0 = _mm_loadu_ps(f);
-        f0 = _mm_add_ps(f0, _mm_set1_ps(1.0f));
-        f0 = _mm_mul_ps(f0, _mm_set1_ps(127.f));
-        f0 = _mm_min_ps(f0, _mm_set1_ps(255.f));
-        f0 = _mm_max_ps(f0, _mm_set1_ps(0.f));
-        __m128i i0 = _mm_cvtps_epi32(f0);
-        i0 = _mm_shuffle_epi8(i0, _mm_setr_epi8(0, 4, 8, 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0));
-#if __GNUC__ && __GNUC__ < 9
-        *(int32_t*)i = _mm_cvtsi128_si32(i0);
-#else
-        _mm_storeu_si32((__m128i*)i, i0);
-#endif
-        f += 4;
-        i += 4;
-    }
-
-    length %= 4;
-    while (length--){
-        __m128 f0 = _mm_load_ss(f);
-        f0 = _mm_add_ss(f0, _mm_set1_ps(1.0f));
-        f0 = _mm_mul_ss(f0, _mm_set1_ps(127.f));
-        f0 = _mm_min_ss(f0, _mm_set1_ps(255.f));
-        f0 = _mm_max_ss(f0, _mm_set1_ps(0.f));
-        i[0] = (uint8_t)_mm_cvt_ss2si(f0);
-        f += 1;
-        i += 1;
-    }
-}
-
-void convert_audio_sint16_to_float_x86_SSE41(float* f, const int16_t* i, size_t length, float output_multiplier){
-    const __m128 SCALE = _mm_set1_ps(output_multiplier / 32767.f);
-    size_t lc = length / 4;
-    while (lc--){
-        __m128i i0 = _mm_cvtepi16_epi32(_mm_loadl_epi64((const __m128i*)i));
-        __m128 f0 = _mm_cvtepi32_ps(i0);
-        f0 = _mm_mul_ps(f0, SCALE);
-        f0 = _mm_max_ps(f0, _mm_set1_ps(-1.0f));
-        f0 = _mm_min_ps(f0, _mm_set1_ps(1.0f));
-        _mm_storeu_ps(f, f0);
-        f += 4;
-        i += 4;
-    }
-
-    length %= 4;
-    while (length--){
-        __m128 f0 = _mm_cvtsi32_ss(_mm_setzero_ps(), i[0]);
-        f0 = _mm_mul_ss(f0, SCALE);
-        f0 = _mm_max_ss(f0, _mm_set1_ps(-1.0f));
-        f0 = _mm_min_ss(f0, _mm_set1_ps(1.0f));
-        _mm_store_ss(f, f0);
-        f += 1;
-        i += 1;
-    }
-}
-void convert_audio_float_to_sint16_x86_SSE41(int16_t* i, const float* f, size_t length){
-    size_t lc = length / 4;
-    while (lc--){
-        __m128 f0 = _mm_loadu_ps(f);
-        f0 = _mm_mul_ps(f0, _mm_set1_ps(32767.f));
-        f0 = _mm_min_ps(f0, _mm_set1_ps(32767.f));
-        f0 = _mm_max_ps(f0, _mm_set1_ps(-32768.f));
-        __m128i i0 = _mm_cvtps_epi32(f0);
-        i0 = _mm_shuffle_epi8(i0, _mm_setr_epi8(0, 1, 4, 5, 8, 9, 12, 13, -1, -1, -1, -1, -1, -1, -1, -1));
-        _mm_storel_epi64((__m128i*)i, i0);
-        f += 4;
-        i += 4;
-    }
-
-    length %= 4;
-    while (length--){
-        __m128 f0 = _mm_load_ss(f);
-        f0 = _mm_mul_ss(f0, _mm_set1_ps(32767.f));
-        f0 = _mm_min_ss(f0, _mm_set1_ps(32767.f));
-        f0 = _mm_max_ss(f0, _mm_set1_ps(-32768.f));
-        i[0] = (int16_t)_mm_cvt_ss2si(f0);
-        f += 1;
-        i += 1;
-    }
-}
-
-void convert_audio_sint32_to_float_x86_SSE2(float* f, const int32_t* i, size_t length, float output_multiplier){
-    const __m128 SCALE = _mm_set1_ps(output_multiplier / 2147483647.f);
-    size_t lc = length / 4;
-    while (lc--){
-        __m128i i0 = _mm_loadu_si128((const __m128i*)i);
-        __m128 f0 = _mm_cvtepi32_ps(i0);
-        f0 = _mm_mul_ps(f0, SCALE);
-        f0 = _mm_max_ps(f0, _mm_set1_ps(-1.0f));
-        f0 = _mm_min_ps(f0, _mm_set1_ps(1.0f));
-        _mm_storeu_ps(f, f0);
-        f += 4;
-        i += 4;
-    }
-
-    length %= 4;
-    while (length--){
-        __m128 f0 = _mm_cvtsi32_ss(_mm_setzero_ps(), i[0]);
-        f0 = _mm_mul_ss(f0, SCALE);
-        f0 = _mm_min_ss(f0, _mm_set1_ps(32767.f));
-        f0 = _mm_max_ss(f0, _mm_set1_ps(-32768.f));
-        _mm_store_ss(f, f0);
-        f += 1;
-        i += 1;
-    }
-}
-void convert_audio_float_to_sint32_x86_SSE2(int32_t* i, const float* f, size_t length){
-    size_t lc = length / 4;
-    while (lc--){
-        __m128 f0 = _mm_loadu_ps(f);
-        f0 = _mm_mul_ps(f0, _mm_set1_ps(2147483647.f));
-        f0 = _mm_min_ps(f0, _mm_set1_ps(2147483520.f)); //  2^31 - 2^6
-        f0 = _mm_max_ps(f0, _mm_set1_ps(-2147483648.f));
-        __m128i i0 = _mm_cvtps_epi32(f0);
-        _mm_storeu_si128((__m128i*)i, i0);
-        f += 4;
-        i += 4;
-    }
-
-    length %= 4;
-    while (length--){
-        __m128 f0 = _mm_load_ss(f);
-        f0 = _mm_mul_ss(f0, _mm_set1_ps(2147483647.f));
-        f0 = _mm_min_ss(f0, _mm_set1_ps(2147483520.f)); //  2^31 - 2^6
-        f0 = _mm_max_ss(f0, _mm_set1_ps(-2147483648.f));
-        i[0] = _mm_cvt_ss2si(f0);
-        f += 1;
-        i += 1;
-    }
-}
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/Kernels/AudioStreamConverter/Kernels_AudioStreamConverter.cpp b/SerialPrograms/Source/Kernels/AudioStreamConverter/Kernels_AudioStreamConverter.cpp
new file mode 100644
index 0000000000..7b1fa371e1
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/AudioStreamConverter/Kernels_AudioStreamConverter.cpp
@@ -0,0 +1,167 @@
+/*  Audio Stream Converter
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+
+#include "Common/Cpp/CpuId/CpuId.h"
+#include "Kernels_AudioStreamConverter.h"
+
+namespace PokemonAutomation{
+namespace Kernels{
+namespace AudioStreamConverter{
+
+
+
+template <typename ExternalType>
+void convert_from_Default(r_ptr<float> native, c_ptr<ExternalType> ext, size_t samples, float multiplier);
+template <typename ExternalType>
+void convert_to_Default(c_ptr<float> native, r_ptr<ExternalType> ext, size_t samples, float multiplier);
+void add_tests_Default(UnitTestDatabase& database);
+
+
+
+template <typename ExternalType>
+void convert_from_x64_SSE41(r_ptr<float> native, c_ptr<ExternalType> ext, size_t samples, float multiplier);
+template <typename ExternalType>
+void convert_to_x64_SSE41(c_ptr<float> native, r_ptr<ExternalType> ext, size_t samples, float multiplier);
+void add_tests_x64_SSE41(UnitTestDatabase& database);
+
+
+
+template <typename ExternalType>
+void convert_from_x64_AVX2(r_ptr<float> native, c_ptr<ExternalType> ext, size_t samples, float multiplier);
+template <typename ExternalType>
+void convert_to_x64_AVX2(c_ptr<float> native, r_ptr<ExternalType> ext, size_t samples, float multiplier);
+void add_tests_x64_AVX2(UnitTestDatabase& database);
+
+
+
+template <typename ExternalType>
+void convert_from_x64_AVX512(r_ptr<float> native, c_ptr<ExternalType> ext, size_t samples, float multiplier);
+template <typename ExternalType>
+void convert_to_x64_AVX512(c_ptr<float> native, r_ptr<ExternalType> ext, size_t samples, float multiplier);
+void add_tests_x64_AVX512(UnitTestDatabase& database);
+
+
+
+template <typename ExternalType>
+void convert_from_ARM64_NEON(r_ptr<float> native, c_ptr<ExternalType> ext, size_t samples, float multiplier);
+template <typename ExternalType>
+void convert_to_ARM64_NEON(c_ptr<float> native, r_ptr<ExternalType> ext, size_t samples, float multiplier);
+void add_tests_ARM64_NEON(UnitTestDatabase& database);
+
+
+
+
+
+template <typename ExternalType>
+void convert_from(
+    r_ptr<float> native, c_ptr<ExternalType> ext,
+    size_t samples, float multiplier
+){
+#ifdef PA_AutoDispatch_x64_17_Skylake
+    if (CPU_CAPABILITY_CURRENT.OK_17_Skylake){
+        convert_from_x64_AVX512(native, ext, samples, multiplier);
+        return;
+    }
+#endif
+#ifdef PA_AutoDispatch_x64_13_Haswell
+    if (CPU_CAPABILITY_CURRENT.OK_13_Haswell){
+        convert_from_x64_AVX2(native, ext, samples, multiplier);
+        return;
+    }
+#endif
+#ifdef PA_AutoDispatch_x64_08_Nehalem
+    if (CPU_CAPABILITY_CURRENT.OK_08_Nehalem){
+        convert_from_x64_SSE41(native, ext, samples, multiplier);
+        return;
+    }
+#endif
+#ifdef PA_AutoDispatch_arm64_20_M1
+    if (CPU_CAPABILITY_CURRENT.OK_M1){
+        convert_from_ARM64_NEON(native, ext, samples, multiplier);
+        return;
+    }
+#endif
+    convert_from_Default(native, ext, samples, multiplier);
+    return;
+}
+template <typename ExternalType>
+void convert_to(
+    c_ptr<float> native, r_ptr<ExternalType> ext,
+    size_t samples, float multiplier
+){
+#ifdef PA_AutoDispatch_x64_17_Skylake
+    if (CPU_CAPABILITY_CURRENT.OK_17_Skylake){
+        convert_to_x64_AVX512(native, ext, samples, multiplier);
+        return;
+    }
+#endif
+#ifdef PA_AutoDispatch_x64_13_Haswell
+    if (CPU_CAPABILITY_CURRENT.OK_13_Haswell){
+        convert_to_x64_AVX2(native, ext, samples, multiplier);
+        return;
+    }
+#endif
+#ifdef PA_AutoDispatch_x64_08_Nehalem
+    if (CPU_CAPABILITY_CURRENT.OK_08_Nehalem){
+        convert_to_x64_SSE41(native, ext, samples, multiplier);
+        return;
+    }
+#endif
+#ifdef PA_AutoDispatch_arm64_20_M1
+    if (CPU_CAPABILITY_CURRENT.OK_M1){
+        convert_to_ARM64_NEON(native, ext, samples, multiplier);
+        return;
+    }
+#endif
+    convert_to_Default(native, ext, samples, multiplier);
+    return;
+}
+
+
+
+template void convert_from<uint8_t>(r_ptr<float> native, c_ptr<uint8_t> ext, size_t samples, float multiplier);
+template void convert_from<int16_t>(r_ptr<float> native, c_ptr<int16_t> ext, size_t samples, float multiplier);
+template void convert_from<int32_t>(r_ptr<float> native, c_ptr<int32_t> ext, size_t samples, float multiplier);
+template void convert_from<float>(r_ptr<float> native, c_ptr<float> ext, size_t samples, float multiplier);
+template void convert_to<uint8_t>(c_ptr<float> native, r_ptr<uint8_t> ext, size_t samples, float multiplier);
+template void convert_to<int16_t>(c_ptr<float> native, r_ptr<int16_t> ext, size_t samples, float multiplier);
+template void convert_to<int32_t>(c_ptr<float> native, r_ptr<int32_t> ext, size_t samples, float multiplier);
+template void convert_to<float>(c_ptr<float> native, r_ptr<float> ext, size_t samples, float multiplier);
+
+
+
+
+
+void add_tests(UnitTestDatabase& database){
+    add_tests_Default(database);
+#ifdef PA_AutoDispatch_x64_08_Nehalem
+    if (CPU_CAPABILITY_CURRENT.OK_08_Nehalem){
+        add_tests_x64_SSE41(database);
+    }
+#endif
+#ifdef PA_AutoDispatch_x64_13_Haswell
+    if (CPU_CAPABILITY_CURRENT.OK_13_Haswell){
+        add_tests_x64_AVX2(database);
+    }
+#endif
+#ifdef PA_AutoDispatch_x64_17_Skylake
+    if (CPU_CAPABILITY_CURRENT.OK_17_Skylake){
+        add_tests_x64_AVX512(database);
+    }
+#endif
+#ifdef PA_AutoDispatch_arm64_20_M1
+    if (CPU_CAPABILITY_CURRENT.OK_M1){
+        add_tests_ARM64_NEON(database);
+    }
+#endif
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/Kernels/AudioStreamConverter/Kernels_AudioStreamConverter.h b/SerialPrograms/Source/Kernels/AudioStreamConverter/Kernels_AudioStreamConverter.h
new file mode 100644
index 0000000000..122c9435f3
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/AudioStreamConverter/Kernels_AudioStreamConverter.h
@@ -0,0 +1,44 @@
+/*  Audio Stream Converter
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Kernels_AudioStreamConverter_H
+#define PokemonAutomation_Kernels_AudioStreamConverter_H
+
+#include <cstddef>
+#include "Common/Compiler.h"
+
+namespace PokemonAutomation{
+
+class UnitTestDatabase;
+
+namespace Kernels{
+namespace AudioStreamConverter{
+
+
+
+template <typename ExternalType>
+void convert_from(
+    r_ptr<float> native, c_ptr<ExternalType> ext,
+    size_t samples, float multiplier
+);
+
+template <typename ExternalType>
+void convert_to(
+    c_ptr<float> native, r_ptr<ExternalType> ext,
+    size_t samples, float multiplier
+);
+
+
+
+void add_tests(UnitTestDatabase& database);
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Kernels/AudioStreamConverter/Kernels_AudioStreamConverter_Kernels_ARM64_NEON.cpp b/SerialPrograms/Source/Kernels/AudioStreamConverter/Kernels_AudioStreamConverter_Kernels_ARM64_NEON.cpp
new file mode 100644
index 0000000000..e460a937fc
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/AudioStreamConverter/Kernels_AudioStreamConverter_Kernels_ARM64_NEON.cpp
@@ -0,0 +1,248 @@
+/*  Audio Stream Converter (ARM64 NEON)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifdef PA_AutoDispatch_arm64_20_M1
+
+#include <arm_neon.h>
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+//#include "Kernels/Kernels_arm64_NEON.h"
+#include "Kernels_AudioStreamConverter_TestInfra.h"
+#include "Kernels_AudioStreamConverter_Kernels_Default.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace Kernels{
+namespace AudioStreamConverter{
+
+
+
+PA_FORCE_INLINE float32x4_t convert_from_u8(uint32x4_t x, float multiplier){
+    const float32x4_t SCALE0 = vdupq_n_f32(multiplier * (1.f / 128.f));
+    const float32x4_t SCALE1 = vdupq_n_f32(multiplier * -1.f);
+    //  The multiply and add are fused into a single FMA. The vfmaq
+    //  (accumulate) spelling lowers to a real FMLA/FMLS in both GCC and
+    //  Clang; GCC 13 decomposes the vmlsq spelling back into mul + add.
+    return vfmaq_f32(SCALE1, vcvtq_f32_u32(x), SCALE0);
+}
+PA_FORCE_INLINE int32x4_t convert_to_u8(float32x4_t x, float multiplier){
+    const float32x4_t SCALE = vdupq_n_f32(multiplier);
+    x = vmulq_f32(x, SCALE);
+    x = vminq_f32(x, vdupq_n_f32(127.0f / 128.0f));
+    x = vmaxq_f32(x, vdupq_n_f32(-1.0f));
+    //  Fused into a single FMA, as above.
+    x = vfmaq_f32(vdupq_n_f32(128.f), x, vdupq_n_f32(128.f));
+    return vcvtnq_s32_f32(x);
+}
+PA_FORCE_INLINE float32x4_t convert_from_s16(int32x4_t x, float multiplier){
+    const float32x4_t SCALE = vdupq_n_f32(multiplier * (1.0f / 32768.0f));
+    return vmulq_f32(vcvtq_f32_s32(x), SCALE);
+}
+PA_FORCE_INLINE int16x4_t convert_to_s16(float32x4_t x, float multiplier){
+    const float32x4_t SCALE = vdupq_n_f32(multiplier * 32768.f);
+    x = vmulq_f32(x, SCALE);
+    x = vminq_f32(x, vdupq_n_f32(32767.f));
+    x = vmaxq_f32(x, vdupq_n_f32(-32768.f));
+    return vqmovn_s32(vcvtnq_s32_f32(x));
+}
+PA_FORCE_INLINE float32x4_t convert_from_s32(int32x4_t x, float multiplier){
+    const float32x4_t SCALE = vdupq_n_f32(multiplier * (1.0f / 2147483648.0f));
+    return vmulq_f32(vcvtq_f32_s32(x), SCALE);
+}
+PA_FORCE_INLINE int32x4_t convert_to_s32(float32x4_t x, float multiplier){
+    const float32x4_t SCALE = vdupq_n_f32(multiplier * 2147483648.f);
+    x = vmulq_f32(x, SCALE);
+    x = vminq_f32(x, vdupq_n_f32(2147483520.f)); // 2^31 - 128
+    x = vmaxq_f32(x, vdupq_n_f32(-2147483648.f));
+    return vcvtnq_s32_f32(x);
+}
+
+
+
+template <typename ExternalType>
+void convert_from_ARM64_NEON(r_ptr<float> native, c_ptr<ExternalType> ext, size_t samples, float multiplier);
+template <typename ExternalType>
+void convert_to_ARM64_NEON(c_ptr<float> native, r_ptr<ExternalType> ext, size_t samples, float multiplier);
+
+
+
+template <>
+void convert_from_ARM64_NEON<uint8_t>(r_ptr<float> native, c_ptr<uint8_t> ext, size_t samples, float multiplier){
+    while (samples >= 8){
+        uint8x8_t x = vld1_u8(ext);
+        uint16x8_t x16 = vmovl_u8(x);
+        uint32x4_t x32_0 = vmovl_u16(vget_low_u16(x16));
+        uint32x4_t x32_1 = vmovl_u16(vget_high_u16(x16));
+        vst1q_f32(native + 0, convert_from_u8(x32_0, multiplier));
+        vst1q_f32(native + 4, convert_from_u8(x32_1, multiplier));
+
+        native += 8;
+        ext += 8;
+        samples -= 8;
+    }
+    if (samples > 0){
+        convert_from_Default(native, ext, samples, multiplier);
+    }
+}
+template <>
+void convert_to_ARM64_NEON<uint8_t>(c_ptr<float> native, r_ptr<uint8_t> ext, size_t samples, float multiplier){
+    while (samples >= 8){
+        int32x4_t x0 = convert_to_u8(vld1q_f32(native + 0), multiplier);
+        int32x4_t x1 = convert_to_u8(vld1q_f32(native + 4), multiplier);
+        //  Pack the low byte of each lane.
+        uint16x4_t h0 = vmovn_u32(vreinterpretq_u32_s32(x0));
+        uint16x4_t h1 = vmovn_u32(vreinterpretq_u32_s32(x1));
+        uint8x8_t bytes = vmovn_u16(vcombine_u16(h0, h1));
+        vst1_u8(ext, bytes);
+
+        native += 8;
+        ext += 8;
+        samples -= 8;
+    }
+    if (samples > 0){
+        convert_to_Default(native, ext, samples, multiplier);
+    }
+}
+template <>
+void convert_from_ARM64_NEON<int16_t>(r_ptr<float> native, c_ptr<int16_t> ext, size_t samples, float multiplier){
+    while (samples >= 4){
+        int16x4_t x = vld1_s16(ext);
+        int32x4_t x32 = vmovl_s16(x);
+        vst1q_f32(native, convert_from_s16(x32, multiplier));
+
+        native += 4;
+        ext += 4;
+        samples -= 4;
+    }
+    if (samples > 0){
+        convert_from_Default(native, ext, samples, multiplier);
+    }
+}
+template <>
+void convert_to_ARM64_NEON<int16_t>(c_ptr<float> native, r_ptr<int16_t> ext, size_t samples, float multiplier){
+    while (samples >= 4){
+        int16x4_t x = convert_to_s16(vld1q_f32(native), multiplier);
+        vst1_s16(ext, x);
+
+        native += 4;
+        ext += 4;
+        samples -= 4;
+    }
+    if (samples > 0){
+        convert_to_Default(native, ext, samples, multiplier);
+    }
+}
+template <>
+void convert_from_ARM64_NEON<int32_t>(r_ptr<float> native, c_ptr<int32_t> ext, size_t samples, float multiplier){
+    while (samples >= 4){
+        int32x4_t x = vld1q_s32(ext);
+        vst1q_f32(native, convert_from_s32(x, multiplier));
+
+        native += 4;
+        ext += 4;
+        samples -= 4;
+    }
+    if (samples > 0){
+        convert_from_Default(native, ext, samples, multiplier);
+    }
+}
+template <>
+void convert_to_ARM64_NEON<int32_t>(c_ptr<float> native, r_ptr<int32_t> ext, size_t samples, float multiplier){
+    while (samples >= 4){
+        float32x4_t x = vld1q_f32(native);
+        vst1q_s32(ext, convert_to_s32(x, multiplier));
+
+        native += 4;
+        ext += 4;
+        samples -= 4;
+    }
+    if (samples > 0){
+        convert_to_Default(native, ext, samples, multiplier);
+    }
+}
+template <>
+void convert_from_ARM64_NEON<float>(r_ptr<float> native, c_ptr<float> ext, size_t samples, float multiplier){
+    while (samples >= 4){
+        float32x4_t x = vld1q_f32(ext);
+        vst1q_f32(native, vmulq_f32(x, vdupq_n_f32(multiplier)));
+
+        native += 4;
+        ext += 4;
+        samples -= 4;
+    }
+    if (samples > 0){
+        convert_from_Default(native, ext, samples, multiplier);
+    }
+}
+template <>
+void convert_to_ARM64_NEON<float>(c_ptr<float> native, r_ptr<float> ext, size_t samples, float multiplier){
+    while (samples >= 4){
+        float32x4_t x = vld1q_f32(native);
+        vst1q_f32(ext, vmulq_f32(x, vdupq_n_f32(multiplier)));
+
+        native += 4;
+        ext += 4;
+        samples -= 4;
+    }
+    if (samples > 0){
+        convert_to_Default(native, ext, samples, multiplier);
+    }
+}
+
+
+
+
+template <typename Type>
+class Test_from_ARM64_NEON : public Test<Type>{
+public:
+    Test_from_ARM64_NEON(size_t samples, float multiplier)
+        : Test<Type>(
+            "from_ARM64_NEON",
+            samples, multiplier,
+            (ConvertFrom<Type>)convert_from_ARM64_NEON<Type>,
+            (ConvertTo<Type>)convert_to_Default<Type>
+        )
+    {}
+};
+template <typename Type>
+class Test_to_ARM64_NEON : public Test<Type>{
+public:
+    Test_to_ARM64_NEON(size_t samples, float multiplier)
+        : Test<Type>(
+            "to_ARM64_NEON",
+            samples, multiplier,
+            (ConvertFrom<Type>)convert_from_Default<Type>,
+            (ConvertTo<Type>)convert_to_ARM64_NEON<Type>
+        )
+    {}
+};
+void add_tests_ARM64_NEON(UnitTestDatabase& database){
+    for (size_t samples = 2; samples < 1000; samples = (size_t)(samples * 1.1) + 1){
+        for (float multiplier = 0.1f; multiplier <= 1.0f; multiplier += 0.1f){
+            database.add<Test_from_ARM64_NEON<uint8_t>>(samples, multiplier);
+            database.add<Test_to_ARM64_NEON<uint8_t>>(samples, multiplier);
+
+            database.add<Test_from_ARM64_NEON<int16_t>>(samples, multiplier);
+            database.add<Test_to_ARM64_NEON<int16_t>>(samples, multiplier);
+
+            database.add<Test_from_ARM64_NEON<int32_t>>(samples, multiplier);
+            database.add<Test_to_ARM64_NEON<int32_t>>(samples, multiplier);
+
+            database.add<Test_from_ARM64_NEON<float>>(samples, multiplier);
+            database.add<Test_to_ARM64_NEON<float>>(samples, multiplier);
+        }
+    }
+}
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Kernels/AudioStreamConverter/Kernels_AudioStreamConverter_Kernels_Default.cpp b/SerialPrograms/Source/Kernels/AudioStreamConverter/Kernels_AudioStreamConverter_Kernels_Default.cpp
new file mode 100644
index 0000000000..5dfdc48703
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/AudioStreamConverter/Kernels_AudioStreamConverter_Kernels_Default.cpp
@@ -0,0 +1,123 @@
+/*  Audio Stream Converter (Default)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <algorithm>
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "Kernels_AudioStreamConverter_TestInfra.h"
+
+namespace PokemonAutomation{
+namespace Kernels{
+namespace AudioStreamConverter{
+
+
+
+template <typename ExternalType>
+void convert_from_Default(r_ptr<float> native, c_ptr<ExternalType> ext, size_t samples, float multiplier);
+template <typename ExternalType>
+void convert_to_Default(c_ptr<float> native, r_ptr<ExternalType> ext, size_t samples, float multiplier);
+void add_tests_Default(UnitTestDatabase& database);
+
+
+
+template <>
+void convert_from_Default<uint8_t>(r_ptr<float> native, c_ptr<uint8_t> ext, size_t samples, float multiplier){
+    const float SCALE = multiplier * (1.0f / 128.0f);
+    for (size_t c = 0; c < samples; c++){
+        native[c] = ((int)ext[c] - 128) * SCALE;
+    }
+}
+template <>
+void convert_to_Default<uint8_t>(c_ptr<float> native, r_ptr<uint8_t> ext, size_t samples, float multiplier){
+    for (size_t c = 0; c < samples; c++){
+        float x = native[c] * multiplier;
+        x = std::clamp(x, -1.0f, 127.0f / 128.0f);
+        x = x * 128.0f + 128.5f;
+        ext[c] = (uint8_t)x;
+    }
+}
+template <>
+void convert_from_Default<int16_t>(r_ptr<float> native, c_ptr<int16_t> ext, size_t samples, float multiplier){
+    const float SCALE = multiplier * (1.0f / 32768.0f);
+    for (size_t c = 0; c < samples; c++){
+        native[c] = (float)ext[c] * SCALE;
+    }
+}
+template <>
+void convert_to_Default<int16_t>(c_ptr<float> native, r_ptr<int16_t> ext, size_t samples, float multiplier){
+    multiplier *= 32768.0f;
+    for (size_t c = 0; c < samples; c++){
+        float x = native[c] * multiplier;
+        x = std::min(x, 32767.0f);
+        x = std::max(x, -32768.0f);
+        x += x > 0 ? 0.5f : -0.5f;
+        ext[c] = (int16_t)x;
+    }
+}
+template <>
+void convert_from_Default<int32_t>(r_ptr<float> native, c_ptr<int32_t> ext, size_t samples, float multiplier){
+    const float SCALE = multiplier * (1.0f / 2147483648.0f);
+    for (size_t c = 0; c < samples; c++){
+        native[c] = (float)ext[c] * SCALE;
+    }
+}
+template <>
+void convert_to_Default<int32_t>(c_ptr<float> native, r_ptr<int32_t> ext, size_t samples, float multiplier){
+    constexpr float SCALE = 2147483648.0f;
+    constexpr float MAX_SAFE = 2147483520.0f; // 2^31 - 128
+    multiplier *= SCALE;
+    for (size_t c = 0; c < samples; c++){
+        float x = native[c] * multiplier;
+        x = std::min(x, MAX_SAFE);
+        x = std::max(x, -2147483648.0f);
+        x += x > 0 ? 0.5f : -0.5f;
+        ext[c] = (int32_t)x;
+    }
+}
+template <>
+void convert_from_Default<float>(r_ptr<float> native, c_ptr<float> ext, size_t samples, float multiplier){
+    for (size_t c = 0; c < samples; c++){
+        native[c] = ext[c] * multiplier;
+    }
+}
+template <>
+void convert_to_Default<float>(c_ptr<float> native, r_ptr<float> ext, size_t samples, float multiplier){
+    for (size_t c = 0; c < samples; c++){
+        ext[c] = native[c] * multiplier;
+    }
+}
+
+
+
+
+
+
+template <typename Type>
+class Test_Default : public Test<Type>{
+public:
+    Test_Default(size_t samples, float multiplier)
+        : Test<Type>(
+            "Default",
+            samples, multiplier,
+            (ConvertFrom<Type>)convert_from_Default<Type>,
+            (ConvertTo<Type>)convert_to_Default<Type>
+        )
+    {}
+};
+void add_tests_Default(UnitTestDatabase& database){
+    for (size_t samples = 2; samples < 1000; samples = (size_t)(samples * 1.1) + 1){
+        for (float multiplier = 0.1f; multiplier <= 1.0f; multiplier += 0.1f){
+            database.add<Test_Default<uint8_t>>(samples, multiplier);
+            database.add<Test_Default<int16_t>>(samples, multiplier);
+            database.add<Test_Default<int32_t>>(samples, multiplier);
+            database.add<Test_Default<float>>(samples, multiplier);
+        }
+    }
+}
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/Kernels/AudioStreamConverter/Kernels_AudioStreamConverter_Kernels_Default.h b/SerialPrograms/Source/Kernels/AudioStreamConverter/Kernels_AudioStreamConverter_Kernels_Default.h
new file mode 100644
index 0000000000..eef3de22e1
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/AudioStreamConverter/Kernels_AudioStreamConverter_Kernels_Default.h
@@ -0,0 +1,70 @@
+/*  Audio Stream Converter Kernels (Default)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Kernels_AudioStreamConverter_Kernels_Default_H
+#define PokemonAutomation_Kernels_AudioStreamConverter_Kernels_Default_H
+
+#include <stddef.h>
+#include "Common/Compiler.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+
+class UnitTestDatabase;
+
+namespace Kernels{
+namespace AudioStreamConverter{
+
+
+
+template <typename ExternalType>
+void convert_from_Default(
+    r_ptr<float> native, c_ptr<ExternalType> ext,
+    size_t samples, float multiplier
+);
+template <typename ExternalType>
+void convert_to_Default(
+    c_ptr<float> native, r_ptr<ExternalType> ext,
+    size_t samples, float multiplier
+);
+
+
+
+
+
+PA_FORCE_INLINE void convolve_channels_Default(
+    const float* matrix, size_t samples,
+    size_t out_channels, size_t out_stride, float* out,
+    size_t in_channels, size_t in_stride, const float* in
+){
+    for (size_t s = 0; s < samples; s++){
+        for (size_t o = 0; o < out_channels; o++){
+            float x = 0;
+            for (size_t i = 0; i < in_channels; i++){
+                x += in[in_stride * i] * matrix[i + in_channels * o];
+            }
+            out[out_stride * o] = x;
+        }
+        in++;
+        out++;
+    }
+}
+
+
+
+
+void add_tests_Default(UnitTestDatabase& database);
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Kernels/AudioStreamConverter/Kernels_AudioStreamConverter_Kernels_x64_AVX2.cpp b/SerialPrograms/Source/Kernels/AudioStreamConverter/Kernels_AudioStreamConverter_Kernels_x64_AVX2.cpp
new file mode 100644
index 0000000000..7ef677bb61
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/AudioStreamConverter/Kernels_AudioStreamConverter_Kernels_x64_AVX2.cpp
@@ -0,0 +1,264 @@
+/*  Audio Stream Converter (x64 AVX2)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifdef PA_AutoDispatch_x64_13_Haswell
+
+#include <immintrin.h>
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+//#include "Kernels/Kernels_x64_AVX2.h"
+#include "Kernels_AudioStreamConverter_TestInfra.h"
+#include "Kernels_AudioStreamConverter_Kernels_Default.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace Kernels{
+namespace AudioStreamConverter{
+
+
+
+PA_FORCE_INLINE __m256 convert_from_u8(__m256i x, float multiplier){
+    const __m256 SCALE0 = _mm256_set1_ps(multiplier * (1.f / 128.f));
+    const __m256 SCALE1 = _mm256_set1_ps(multiplier * -1.f);
+    return _mm256_fmadd_ps(_mm256_cvtepi32_ps(x), SCALE0, SCALE1);
+}
+PA_FORCE_INLINE __m256i convert_to_u8(__m256 x, float multiplier){
+    const __m256 SCALE = _mm256_set1_ps(multiplier);
+    x = _mm256_mul_ps(x, SCALE);
+    x = _mm256_min_ps(x, _mm256_set1_ps(127.0f / 128.0f));
+    x = _mm256_max_ps(x, _mm256_set1_ps(-1.0f));
+    x = _mm256_fmadd_ps(x, _mm256_set1_ps(128.f), _mm256_set1_ps(128.f));
+    return _mm256_cvtps_epi32(x);
+}
+PA_FORCE_INLINE __m256 convert_from_s16(__m256i x, float multiplier){
+    const __m256 SCALE = _mm256_set1_ps(multiplier * (1.0f / 32768.0f));
+    return _mm256_mul_ps(_mm256_cvtepi32_ps(x), SCALE);
+}
+PA_FORCE_INLINE __m256i convert_to_s16(__m256 x, float multiplier){
+    x = _mm256_mul_ps(x, _mm256_set1_ps(multiplier * 32768.f));
+    x = _mm256_min_ps(x, _mm256_set1_ps(32767.f));
+    x = _mm256_max_ps(x, _mm256_set1_ps(-32768.f));
+    return _mm256_cvtps_epi32(x);
+}
+PA_FORCE_INLINE __m256 convert_from_s32(__m256i x, float multiplier){
+    const __m256 SCALE = _mm256_set1_ps(multiplier * (1.0f / 2147483648.0f));
+    return _mm256_mul_ps(_mm256_cvtepi32_ps(x), SCALE);
+}
+PA_FORCE_INLINE __m256i convert_to_s32(__m256 x, float multiplier){
+    x = _mm256_mul_ps(x, _mm256_set1_ps(multiplier * 2147483648.f));
+    x = _mm256_min_ps(x, _mm256_set1_ps(2147483520.f)); // 2^31 - 128
+    x = _mm256_max_ps(x, _mm256_set1_ps(-2147483648.f));
+    return _mm256_cvtps_epi32(x);
+}
+
+
+
+template <typename ExternalType>
+void convert_from_x64_AVX2(r_ptr<float> native, c_ptr<ExternalType> ext, size_t samples, float multiplier);
+template <typename ExternalType>
+void convert_to_x64_AVX2(c_ptr<float> native, r_ptr<ExternalType> ext, size_t samples, float multiplier);
+
+
+
+template <>
+void convert_from_x64_AVX2<uint8_t>(r_ptr<float> native, c_ptr<uint8_t> ext, size_t samples, float multiplier){
+    while (samples >= 8){
+        __m256i x = _mm256_cvtepu8_epi32(
+            _mm_loadl_epi64((const __m128i*)ext)
+        );
+        _mm256_storeu_ps(native, convert_from_u8(x, multiplier));
+
+        native += 8;
+        ext += 8;
+        samples -= 8;
+    }
+    if (samples > 0){
+        convert_from_Default(native, ext, samples, multiplier);
+    }
+}
+template <>
+void convert_to_x64_AVX2<uint8_t>(c_ptr<float> native, r_ptr<uint8_t> ext, size_t samples, float multiplier){
+    while (samples >= 8){
+        __m256i x = convert_to_u8(_mm256_loadu_ps(native), multiplier);
+        x = _mm256_shuffle_epi8(x, _mm256_setr_epi8(
+            0, 4, 8, 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 4, 8, 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+        ));
+        _mm_storeu_si32(
+            (__m128i*)(ext + 0),
+            _mm256_castsi256_si128(x)
+        );
+        _mm_storeu_si32(
+            (__m128i*)(ext + 4),
+            _mm256_extracti128_si256(x, 1)
+        );
+
+        native += 8;
+        ext += 8;
+        samples -= 8;
+    }
+    if (samples > 0){
+        convert_to_Default(native, ext, samples, multiplier);
+    }
+}
+template <>
+void convert_from_x64_AVX2<int16_t>(r_ptr<float> native, c_ptr<int16_t> ext, size_t samples, float multiplier){
+    while (samples >= 8){
+        __m256i x = _mm256_cvtepi16_epi32(
+            _mm_loadu_si128((const __m128i*)ext)
+        );
+        _mm256_storeu_ps(native, convert_from_s16(x, multiplier));
+
+        native += 8;
+        ext += 8;
+        samples -= 8;
+    }
+    if (samples > 0){
+        convert_from_Default(native, ext, samples, multiplier);
+    }
+}
+template <>
+void convert_to_x64_AVX2<int16_t>(c_ptr<float> native, r_ptr<int16_t> ext, size_t samples, float multiplier){
+    while (samples >= 8){
+        __m256i x = convert_to_s16(_mm256_loadu_ps(native), multiplier);
+        x = _mm256_shuffle_epi8(x, _mm256_setr_epi8(
+            0, 1, 4, 5, 8, 9, 12, 13, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 1, 4, 5, 8, 9, 12, 13, 0, 0, 0, 0, 0, 0, 0, 0
+        ));
+        _mm_storeu_si64(
+            (__m128i*)(ext + 0),
+            _mm256_castsi256_si128(x)
+        );
+        _mm_storeu_si64(
+            (__m128i*)(ext + 4),
+            _mm256_extracti128_si256(x, 1)
+        );
+
+        native += 8;
+        ext += 8;
+        samples -= 8;
+    }
+    if (samples > 0){
+        convert_to_Default(native, ext, samples, multiplier);
+    }
+}
+template <>
+void convert_from_x64_AVX2<int32_t>(r_ptr<float> native, c_ptr<int32_t> ext, size_t samples, float multiplier){
+    while (samples >= 8){
+        __m256i x = _mm256_loadu_si256((const __m256i*)ext);
+        _mm256_storeu_ps(native, convert_from_s32(x, multiplier));
+
+        native += 8;
+        ext += 8;
+        samples -= 8;
+    }
+    if (samples > 0){
+        convert_from_Default(native, ext, samples, multiplier);
+    }
+}
+template <>
+void convert_to_x64_AVX2<int32_t>(c_ptr<float> native, r_ptr<int32_t> ext, size_t samples, float multiplier){
+    while (samples >= 8){
+        __m256 x = _mm256_loadu_ps(native);
+        _mm256_storeu_si256((__m256i*)ext, convert_to_s32(x, multiplier));
+
+        native += 8;
+        ext += 8;
+        samples -= 8;
+    }
+    if (samples > 0){
+        convert_to_Default(native, ext, samples, multiplier);
+    }
+}
+template <>
+void convert_from_x64_AVX2<float>(r_ptr<float> native, c_ptr<float> ext, size_t samples, float multiplier){
+    while (samples >= 8){
+        __m256 x = _mm256_loadu_ps(ext);
+        x = _mm256_mul_ps(x, _mm256_set1_ps(multiplier));
+        _mm256_storeu_ps(native, x);
+
+        native += 8;
+        ext += 8;
+        samples -= 8;
+    }
+    if (samples > 0){
+        convert_from_Default(native, ext, samples, multiplier);
+    }
+}
+template <>
+void convert_to_x64_AVX2<float>(c_ptr<float> native, r_ptr<float> ext, size_t samples, float multiplier){
+    while (samples >= 8){
+        __m256 x = _mm256_loadu_ps(native);
+        x = _mm256_mul_ps(x, _mm256_set1_ps(multiplier));
+        _mm256_storeu_ps(ext, x);
+
+        native += 8;
+        ext += 8;
+        samples -= 8;
+    }
+    if (samples > 0){
+        convert_to_Default(native, ext, samples, multiplier);
+    }
+}
+
+
+
+
+
+
+
+template <typename Type>
+class Test_from_x64_AVX2 : public Test<Type>{
+public:
+    Test_from_x64_AVX2(size_t samples, float multiplier)
+        : Test<Type>(
+            "from_x64_AVX2",
+            samples, multiplier,
+            (ConvertFrom<Type>)convert_from_x64_AVX2<Type>,
+            (ConvertTo<Type>)convert_to_Default<Type>
+        )
+    {}
+};
+template <typename Type>
+class Test_to_x64_AVX2 : public Test<Type>{
+public:
+    Test_to_x64_AVX2(size_t samples, float multiplier)
+        : Test<Type>(
+            "to_x64_AVX2",
+            samples, multiplier,
+            (ConvertFrom<Type>)convert_from_Default<Type>,
+            (ConvertTo<Type>)convert_to_x64_AVX2<Type>
+        )
+    {}
+};
+void add_tests_x64_AVX2(UnitTestDatabase& database){
+    for (size_t samples = 2; samples < 1000; samples = (size_t)(samples * 1.1) + 1){
+        for (float multiplier = 0.1f; multiplier <= 1.0f; multiplier += 0.1f){
+            database.add<Test_from_x64_AVX2<uint8_t>>(samples, multiplier);
+            database.add<Test_to_x64_AVX2<uint8_t>>(samples, multiplier);
+
+            database.add<Test_from_x64_AVX2<int16_t>>(samples, multiplier);
+            database.add<Test_to_x64_AVX2<int16_t>>(samples, multiplier);
+
+            database.add<Test_from_x64_AVX2<int32_t>>(samples, multiplier);
+            database.add<Test_to_x64_AVX2<int32_t>>(samples, multiplier);
+
+            database.add<Test_from_x64_AVX2<float>>(samples, multiplier);
+            database.add<Test_to_x64_AVX2<float>>(samples, multiplier);
+        }
+    }
+}
+
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Kernels/AudioStreamConverter/Kernels_AudioStreamConverter_Kernels_x64_AVX512.cpp b/SerialPrograms/Source/Kernels/AudioStreamConverter/Kernels_AudioStreamConverter_Kernels_x64_AVX512.cpp
new file mode 100644
index 0000000000..b9332b34eb
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/AudioStreamConverter/Kernels_AudioStreamConverter_Kernels_x64_AVX512.cpp
@@ -0,0 +1,278 @@
+/*  Audio Stream Converter (x64 AVX512)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifdef PA_AutoDispatch_x64_17_Skylake
+
+#include <immintrin.h>
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+//#include "Kernels/Kernels_x64_AVX512.h"
+#include "Kernels_AudioStreamConverter_TestInfra.h"
+#include "Kernels_AudioStreamConverter_Kernels_Default.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace Kernels{
+namespace AudioStreamConverter{
+
+
+
+PA_FORCE_INLINE __m512 convert_from_u8(__m512i x, float multiplier){
+    const __m512 SCALE0 = _mm512_set1_ps(multiplier * (1.f / 128.f));
+    const __m512 SCALE1 = _mm512_set1_ps(multiplier * -1.f);
+    return _mm512_fmadd_ps(_mm512_cvtepi32_ps(x), SCALE0, SCALE1);
+}
+PA_FORCE_INLINE __m512i convert_to_u8(__m512 x, float multiplier){
+    const __m512 SCALE = _mm512_set1_ps(multiplier);
+    x = _mm512_mul_ps(x, SCALE);
+    x = _mm512_min_ps(x, _mm512_set1_ps(127.0f / 128.0f));
+    x = _mm512_max_ps(x, _mm512_set1_ps(-1.0f));
+    x = _mm512_fmadd_ps(x, _mm512_set1_ps(128.f), _mm512_set1_ps(128.f));
+    return _mm512_cvtps_epi32(x);
+}
+PA_FORCE_INLINE __m512 convert_from_s16(__m512i x, float multiplier){
+    const __m512 SCALE = _mm512_set1_ps(multiplier * (1.0f / 32768.0f));
+    return _mm512_mul_ps(_mm512_cvtepi32_ps(x), SCALE);
+}
+PA_FORCE_INLINE __m512i convert_to_s16(__m512 x, float multiplier){
+    x = _mm512_mul_ps(x, _mm512_set1_ps(multiplier * 32768.f));
+    x = _mm512_min_ps(x, _mm512_set1_ps(32767.f));
+    x = _mm512_max_ps(x, _mm512_set1_ps(-32768.f));
+    return _mm512_cvtps_epi32(x);
+}
+PA_FORCE_INLINE __m512 convert_from_s32(__m512i x, float multiplier){
+    const __m512 SCALE = _mm512_set1_ps(multiplier * (1.0f / 2147483648.0f));
+    return _mm512_mul_ps(_mm512_cvtepi32_ps(x), SCALE);
+}
+PA_FORCE_INLINE __m512i convert_to_s32(__m512 x, float multiplier){
+    x = _mm512_mul_ps(x, _mm512_set1_ps(multiplier * 2147483648.f));
+    x = _mm512_min_ps(x, _mm512_set1_ps(2147483520.f)); // 2^31 - 128
+    x = _mm512_max_ps(x, _mm512_set1_ps(-2147483648.f));
+    return _mm512_cvtps_epi32(x);
+}
+
+
+
+template <typename ExternalType>
+void convert_from_x64_AVX512(r_ptr<float> native, c_ptr<ExternalType> ext, size_t samples, float multiplier);
+template <typename ExternalType>
+void convert_to_x64_AVX512(c_ptr<float> native, r_ptr<ExternalType> ext, size_t samples, float multiplier);
+void add_tests_x64_AVX512(UnitTestDatabase& database);
+
+
+
+template <>
+void convert_from_x64_AVX512<uint8_t>(r_ptr<float> native, c_ptr<uint8_t> ext, size_t samples, float multiplier){
+    while (samples > 16){
+        __m512i x = _mm512_cvtepu8_epi32(
+            _mm_loadu_si128((const __m128i*)ext)
+        );
+        _mm512_storeu_ps(native, convert_from_u8(x, multiplier));
+
+        native += 16;
+        ext += 16;
+        samples -= 16;
+    }
+    {
+        __mmask16 mask = ((uint32_t)1 << samples) - 1;
+        __m512i i = _mm512_cvtepu8_epi32(
+            _mm_maskz_loadu_epi8(mask, (const __m128i*)ext)
+        );
+        _mm512_mask_storeu_ps(native, mask, convert_from_u8(i, multiplier));
+    }
+}
+template <>
+void convert_to_x64_AVX512<uint8_t>(c_ptr<float> native, r_ptr<uint8_t> ext, size_t samples, float multiplier){
+    while (samples > 16){
+        __m512 x = _mm512_loadu_ps(native);
+        _mm_storeu_si128(
+            (__m128i*)ext,
+            _mm512_cvtepi32_epi8(convert_to_u8(x, multiplier))
+        );
+
+        native += 16;
+        ext += 16;
+        samples -= 16;
+    }
+    {
+        __mmask16 mask = ((uint32_t)1 << samples) - 1;
+        __m512 x = _mm512_maskz_loadu_ps(mask, native);
+        _mm_mask_storeu_epi8(
+            (__m128i*)ext, mask,
+            _mm512_cvtepi32_epi8(convert_to_u8(x, multiplier))
+        );
+    }
+}
+template <>
+void convert_from_x64_AVX512<int16_t>(r_ptr<float> native, c_ptr<int16_t> ext, size_t samples, float multiplier){
+    while (samples > 16){
+        __m512i x = _mm512_cvtepi16_epi32(
+            _mm256_loadu_si256((const __m256i*)ext)
+        );
+        _mm512_storeu_ps(native, convert_from_s16(x, multiplier));
+
+        native += 16;
+        ext += 16;
+        samples -= 16;
+    }
+    {
+        __mmask16 mask = ((uint32_t)1 << samples) - 1;
+        __m512i x = _mm512_cvtepi16_epi32(
+            _mm256_maskz_loadu_epi16(mask, ext)
+        );
+        _mm512_mask_storeu_ps(native, mask, convert_from_s16(x, multiplier));
+    }
+}
+template <>
+void convert_to_x64_AVX512<int16_t>(c_ptr<float> native, r_ptr<int16_t> ext, size_t samples, float multiplier){
+    while (samples > 16){
+        __m512 x = _mm512_loadu_ps(native);
+        _mm256_storeu_si256(
+            (__m256i*)ext,
+            _mm512_cvtepi32_epi16(convert_to_s16(x, multiplier))
+        );
+
+        native += 16;
+        ext += 16;
+        samples -= 16;
+    }
+    {
+        __mmask16 mask = ((uint32_t)1 << samples) - 1;
+        __m512 x = _mm512_maskz_loadu_ps(mask, native);
+        _mm256_mask_storeu_epi16(
+            (__m256i*)ext, mask,
+            _mm512_cvtepi32_epi16(convert_to_s16(x, multiplier))
+        );
+    }
+}
+template <>
+void convert_from_x64_AVX512<int32_t>(r_ptr<float> native, c_ptr<int32_t> ext, size_t samples, float multiplier){
+    while (samples > 16){
+        __m512i x = _mm512_loadu_si512(ext);
+        _mm512_storeu_ps(native, convert_from_s32(x, multiplier));
+
+        native += 16;
+        ext += 16;
+        samples -= 16;
+    }
+    {
+        __mmask16 mask = ((uint32_t)1 << samples) - 1;
+        __m512i x = _mm512_maskz_loadu_epi32(mask, ext);
+        _mm512_mask_storeu_ps(native, mask, convert_from_s32(x, multiplier));
+    }
+}
+template <>
+void convert_to_x64_AVX512<int32_t>(c_ptr<float> native, r_ptr<int32_t> ext, size_t samples, float multiplier){
+    while (samples > 16){
+        __m512 x = _mm512_loadu_ps(native);
+        _mm512_storeu_si512(ext, convert_to_s32(x, multiplier));
+
+        native += 16;
+        ext += 16;
+        samples -= 16;
+    }
+    {
+        __mmask16 mask = ((uint32_t)1 << samples) - 1;
+        __m512 x = _mm512_maskz_loadu_ps(mask, native);
+        _mm512_mask_storeu_epi32(ext, mask, convert_to_s32(x, multiplier));
+    }
+}
+template <>
+void convert_from_x64_AVX512<float>(r_ptr<float> native, c_ptr<float> ext, size_t samples, float multiplier){
+    while (samples > 16){
+        __m512 x = _mm512_loadu_ps(ext);
+        x = _mm512_mul_ps(x, _mm512_set1_ps(multiplier));
+        _mm512_storeu_ps(native, x);
+
+        native += 16;
+        ext += 16;
+        samples -= 16;
+    }
+    {
+        __mmask16 mask = ((uint32_t)1 << samples) - 1;
+        __m512 x = _mm512_maskz_loadu_ps(mask, ext);
+        x = _mm512_mul_ps(x, _mm512_set1_ps(multiplier));
+        _mm512_mask_storeu_ps(native, mask, x);
+    }
+}
+template <>
+void convert_to_x64_AVX512<float>(c_ptr<float> native, r_ptr<float> ext, size_t samples, float multiplier){
+    while (samples > 16){
+        __m512 x = _mm512_loadu_ps(native);
+        x = _mm512_mul_ps(x, _mm512_set1_ps(multiplier));
+        _mm512_storeu_ps(ext, x);
+
+        native += 16;
+        ext += 16;
+        samples -= 16;
+    }
+    {
+        __mmask16 mask = ((uint32_t)1 << samples) - 1;
+        __m512 x = _mm512_maskz_loadu_ps(mask, native);
+        x = _mm512_mul_ps(x, _mm512_set1_ps(multiplier));
+        _mm512_mask_storeu_ps(ext, mask, x);
+    }
+}
+
+
+
+
+
+
+
+template <typename Type>
+class Test_from_x64_AVX512 : public Test<Type>{
+public:
+    Test_from_x64_AVX512(size_t samples, float multiplier)
+        : Test<Type>(
+            "from_x64_AVX512",
+            samples, multiplier,
+            (ConvertFrom<Type>)convert_from_x64_AVX512<Type>,
+            (ConvertTo<Type>)convert_to_Default<Type>
+        )
+    {}
+};
+template <typename Type>
+class Test_to_x64_AVX512 : public Test<Type>{
+public:
+    Test_to_x64_AVX512(size_t samples, float multiplier)
+        : Test<Type>(
+            "to_x64_AVX512",
+            samples, multiplier,
+            (ConvertFrom<Type>)convert_from_Default<Type>,
+            (ConvertTo<Type>)convert_to_x64_AVX512<Type>
+        )
+    {}
+};
+void add_tests_x64_AVX512(UnitTestDatabase& database){
+    for (size_t samples = 2; samples < 1000; samples = (size_t)(samples * 1.1) + 1){
+        for (float multiplier = 0.1f; multiplier <= 1.0f; multiplier += 0.1f){
+            database.add<Test_from_x64_AVX512<uint8_t>>(samples, multiplier);
+            database.add<Test_to_x64_AVX512<uint8_t>>(samples, multiplier);
+
+            database.add<Test_from_x64_AVX512<int16_t>>(samples, multiplier);
+            database.add<Test_to_x64_AVX512<int16_t>>(samples, multiplier);
+
+            database.add<Test_from_x64_AVX512<int32_t>>(samples, multiplier);
+            database.add<Test_to_x64_AVX512<int32_t>>(samples, multiplier);
+
+            database.add<Test_from_x64_AVX512<float>>(samples, multiplier);
+            database.add<Test_to_x64_AVX512<float>>(samples, multiplier);
+        }
+    }
+}
+
+
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Kernels/AudioStreamConverter/Kernels_AudioStreamConverter_Kernels_x64_SSE41.cpp b/SerialPrograms/Source/Kernels/AudioStreamConverter/Kernels_AudioStreamConverter_Kernels_x64_SSE41.cpp
new file mode 100644
index 0000000000..7247eca2cf
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/AudioStreamConverter/Kernels_AudioStreamConverter_Kernels_x64_SSE41.cpp
@@ -0,0 +1,252 @@
+/*  Audio Stream Converter (x64 SSE4.1)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifdef PA_AutoDispatch_x64_08_Nehalem
+
+#include <immintrin.h>
+#include <smmintrin.h>
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+//#include "Kernels/Kernels_x64_SSE41.h"
+#include "Kernels_AudioStreamConverter_TestInfra.h"
+#include "Kernels_AudioStreamConverter_Kernels_Default.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace Kernels{
+namespace AudioStreamConverter{
+
+
+
+PA_FORCE_INLINE __m128 convert_from_u8(__m128i x, float multiplier){
+    const __m128 SCALE0 = _mm_set1_ps(multiplier * (1.f / 128.f));
+    const __m128 SCALE1 = _mm_set1_ps(multiplier * -1.f);
+    return _mm_add_ps(
+        _mm_mul_ps(_mm_cvtepi32_ps(x), SCALE0),
+        SCALE1
+    );
+}
+PA_FORCE_INLINE __m128i convert_to_u8(__m128 x, float multiplier){
+    const __m128 SCALE = _mm_set1_ps(multiplier);
+    x = _mm_mul_ps(x, SCALE);
+    x = _mm_min_ps(x, _mm_set1_ps(127.0f / 128.0f));
+    x = _mm_max_ps(x, _mm_set1_ps(-1.0f));
+    x = _mm_add_ps(_mm_mul_ps(x, _mm_set1_ps(128.f)), _mm_set1_ps(128.f));
+    return _mm_cvtps_epi32(x);
+}
+PA_FORCE_INLINE __m128 convert_from_s16(__m128i x, float multiplier){
+    const __m128 SCALE = _mm_set1_ps(multiplier * (1.0f / 32768.0f));
+    return _mm_mul_ps(_mm_cvtepi32_ps(x), SCALE);
+}
+PA_FORCE_INLINE __m128i convert_to_s16(__m128 x, float multiplier){
+    x = _mm_mul_ps(x, _mm_set1_ps(multiplier * 32768.f));
+    x = _mm_min_ps(x, _mm_set1_ps(32767.f));
+    x = _mm_max_ps(x, _mm_set1_ps(-32768.f));
+    return _mm_cvtps_epi32(x);
+}
+PA_FORCE_INLINE __m128 convert_from_s32(__m128i x, float multiplier){
+    const __m128 SCALE = _mm_set1_ps(multiplier * (1.0f / 2147483648.0f));
+    return _mm_mul_ps(_mm_cvtepi32_ps(x), SCALE);
+}
+PA_FORCE_INLINE __m128i convert_to_s32(__m128 x, float multiplier){
+    x = _mm_mul_ps(x, _mm_set1_ps(multiplier * 2147483648.f));
+    x = _mm_min_ps(x, _mm_set1_ps(2147483520.f)); // 2^31 - 128
+    x = _mm_max_ps(x, _mm_set1_ps(-2147483648.f));
+    return _mm_cvtps_epi32(x);
+}
+
+
+
+template <typename ExternalType>
+void convert_from_x64_SSE41(r_ptr<float> native, c_ptr<ExternalType> ext, size_t samples, float multiplier);
+template <typename ExternalType>
+void convert_to_x64_SSE41(c_ptr<float> native, r_ptr<ExternalType> ext, size_t samples, float multiplier);
+
+
+
+template <>
+void convert_from_x64_SSE41<uint8_t>(r_ptr<float> native, c_ptr<uint8_t> ext, size_t samples, float multiplier){
+    while (samples >= 4){
+        __m128i x = _mm_cvtepu8_epi32(
+            _mm_loadu_si32(ext)
+        );
+        _mm_storeu_ps(native, convert_from_u8(x, multiplier));
+
+        native += 4;
+        ext += 4;
+        samples -= 4;
+    }
+    if (samples > 0){
+        convert_from_Default(native, ext, samples, multiplier);
+    }
+}
+template <>
+void convert_to_x64_SSE41<uint8_t>(c_ptr<float> native, r_ptr<uint8_t> ext, size_t samples, float multiplier){
+    while (samples >= 4){
+        __m128i x = convert_to_u8(_mm_loadu_ps(native), multiplier);
+        x = _mm_shuffle_epi8(x, _mm_setr_epi8(
+            0, 4, 8, 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+        ));
+        _mm_storeu_si32((__m128i*)ext, x);
+
+        native += 4;
+        ext += 4;
+        samples -= 4;
+    }
+    if (samples > 0){
+        convert_to_Default(native, ext, samples, multiplier);
+    }
+}
+template <>
+void convert_from_x64_SSE41<int16_t>(r_ptr<float> native, c_ptr<int16_t> ext, size_t samples, float multiplier){
+    while (samples >= 4){
+        __m128i x = _mm_cvtepi16_epi32(
+            _mm_loadl_epi64((const __m128i*)ext)
+        );
+        _mm_storeu_ps(native, convert_from_s16(x, multiplier));
+
+        native += 4;
+        ext += 4;
+        samples -= 4;
+    }
+    if (samples > 0){
+        convert_from_Default(native, ext, samples, multiplier);
+    }
+}
+template <>
+void convert_to_x64_SSE41<int16_t>(c_ptr<float> native, r_ptr<int16_t> ext, size_t samples, float multiplier){
+    while (samples >= 4){
+        __m128i x = convert_to_s16(_mm_loadu_ps(native), multiplier);
+        x = _mm_shuffle_epi8(x, _mm_setr_epi8(
+            0, 1, 4, 5, 8, 9, 12, 13, 0, 0, 0, 0, 0, 0, 0, 0
+        ));
+        _mm_storeu_si64((__m128i*)ext, x);
+
+        native += 4;
+        ext += 4;
+        samples -= 4;
+    }
+    if (samples > 0){
+        convert_to_Default(native, ext, samples, multiplier);
+    }
+}
+template <>
+void convert_from_x64_SSE41<int32_t>(r_ptr<float> native, c_ptr<int32_t> ext, size_t samples, float multiplier){
+    while (samples >= 4){
+        __m128i x = _mm_loadu_si128((const __m128i*)ext);
+        _mm_storeu_ps(native, convert_from_s32(x, multiplier));
+
+        native += 4;
+        ext += 4;
+        samples -= 4;
+    }
+    if (samples > 0){
+        convert_from_Default(native, ext, samples, multiplier);
+    }
+}
+template <>
+void convert_to_x64_SSE41<int32_t>(c_ptr<float> native, r_ptr<int32_t> ext, size_t samples, float multiplier){
+    while (samples >= 4){
+        __m128 x = _mm_loadu_ps(native);
+        _mm_storeu_si128((__m128i*)ext, convert_to_s32(x, multiplier));
+
+        native += 4;
+        ext += 4;
+        samples -= 4;
+    }
+    if (samples > 0){
+        convert_to_Default(native, ext, samples, multiplier);
+    }
+}
+template <>
+void convert_from_x64_SSE41<float>(r_ptr<float> native, c_ptr<float> ext, size_t samples, float multiplier){
+    while (samples >= 4){
+        __m128 x = _mm_loadu_ps(ext);
+        x = _mm_mul_ps(x, _mm_set1_ps(multiplier));
+        _mm_storeu_ps(native, x);
+
+        native += 4;
+        ext += 4;
+        samples -= 4;
+    }
+    if (samples > 0){
+        convert_from_Default(native, ext, samples, multiplier);
+    }
+}
+template <>
+void convert_to_x64_SSE41<float>(c_ptr<float> native, r_ptr<float> ext, size_t samples, float multiplier){
+    while (samples >= 4){
+        __m128 x = _mm_loadu_ps(native);
+        x = _mm_mul_ps(x, _mm_set1_ps(multiplier));
+        _mm_storeu_ps(ext, x);
+
+        native += 4;
+        ext += 4;
+        samples -= 4;
+    }
+    if (samples > 0){
+        convert_to_Default(native, ext, samples, multiplier);
+    }
+}
+
+
+
+
+
+
+
+template <typename Type>
+class Test_from_x64_SSE41 : public Test<Type>{
+public:
+    Test_from_x64_SSE41(size_t samples, float multiplier)
+        : Test<Type>(
+            "from_x64_SSE41",
+            samples, multiplier,
+            (ConvertFrom<Type>)convert_from_x64_SSE41<Type>,
+            (ConvertTo<Type>)convert_to_Default<Type>
+        )
+    {}
+};
+template <typename Type>
+class Test_to_x64_SSE41 : public Test<Type>{
+public:
+    Test_to_x64_SSE41(size_t samples, float multiplier)
+        : Test<Type>(
+            "to_x64_SSE41",
+            samples, multiplier,
+            (ConvertFrom<Type>)convert_from_Default<Type>,
+            (ConvertTo<Type>)convert_to_x64_SSE41<Type>
+        )
+    {}
+};
+void add_tests_x64_SSE41(UnitTestDatabase& database){
+    for (size_t samples = 2; samples < 1000; samples = (size_t)(samples * 1.1) + 1){
+        for (float multiplier = 0.1f; multiplier <= 1.0f; multiplier += 0.1f){
+            database.add<Test_from_x64_SSE41<uint8_t>>(samples, multiplier);
+            database.add<Test_to_x64_SSE41<uint8_t>>(samples, multiplier);
+
+            database.add<Test_from_x64_SSE41<int16_t>>(samples, multiplier);
+            database.add<Test_to_x64_SSE41<int16_t>>(samples, multiplier);
+
+            database.add<Test_from_x64_SSE41<int32_t>>(samples, multiplier);
+            database.add<Test_to_x64_SSE41<int32_t>>(samples, multiplier);
+
+            database.add<Test_from_x64_SSE41<float>>(samples, multiplier);
+            database.add<Test_to_x64_SSE41<float>>(samples, multiplier);
+        }
+    }
+}
+
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Kernels/AudioStreamConverter/Kernels_AudioStreamConverter_TestInfra.cpp b/SerialPrograms/Source/Kernels/AudioStreamConverter/Kernels_AudioStreamConverter_TestInfra.cpp
new file mode 100644
index 0000000000..202e74b79e
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/AudioStreamConverter/Kernels_AudioStreamConverter_TestInfra.cpp
@@ -0,0 +1,128 @@
+/*  Audio Stream Converter Test Infra
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <type_traits>
+#include <random>
+#include "Common/Cpp/Exceptions.h"
+#include "Common/Cpp/PrettyPrint.h"
+#include "Common/Cpp/Containers/GuardPageBuffer.h"
+#include "Kernels_AudioStreamConverter_TestInfra.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace Kernels{
+namespace AudioStreamConverter{
+
+
+
+
+template <typename Type>
+Test<Type>::Test(
+    const std::string& arch_str,
+    size_t samples,
+    float multiplier,
+    ConvertFrom<Type> convert_from,
+    ConvertTo<Type> convert_to
+)
+    : UnitTest(
+        "Kernels::AudioStreamConverter - " + typestr() + "_" + arch_str +
+        "(" + std::to_string(samples) + ", m=" + tostr_default(multiplier) + ")"
+    )
+    , m_samples(samples)
+    , m_multiplier(multiplier)
+    , m_convert_from(convert_from)
+    , m_convert_to(convert_to)
+{}
+template <typename Type>
+UnitTestResult Test<Type>::run(Logger& logger, CancellableScope& scope) const{
+    if (m_samples < 2){
+        throw InternalProgramError(&logger, PA_CURRENT_FUNCTION, "Test size is too small.");
+    }
+
+    //  Every buffer ends right before a guard page, so a kernel that reads or
+    //  writes past the end faults on every run.
+    GuardPageBuffer<Type> ext0(m_samples);
+    GuardPageBuffer<Type> ext1(m_samples);
+    GuardPageBuffer<float> native(m_samples);
+
+    std::mt19937 generator(42);
+
+    if constexpr (std::is_same_v<Type, float>){
+        std::uniform_real_distribution<float> distribution(-1.0, +1.0);
+        for (size_t c = 0; c < m_samples; c++){
+            ext0[c] = (Type)distribution(generator);
+        }
+    }else{
+        std::uniform_int_distribution<long long> distribution(
+            std::numeric_limits<Type>::min(),
+            std::numeric_limits<Type>::max()
+        );
+        ext0[0] = std::numeric_limits<Type>::min();
+        ext0[1] = std::numeric_limits<Type>::max();
+        for (size_t c = 2; c < m_samples; c++){
+            ext0[c] = (Type)distribution(generator);
+        }
+    }
+
+    m_convert_from(native.data(), ext0.data(), m_samples, m_multiplier);
+    m_convert_to(native.data(), ext1.data(), m_samples, 1.0f / m_multiplier);
+
+    //  Check for errors.
+    for (size_t c = 0; c < m_samples; c++){
+        if constexpr (std::is_same_v<Type, int32_t>){
+            //  int32_t is lossy due to round-off.
+            int64_t diff = int64_t(ext0[c]) - ext1[c];
+            if (std::abs(diff) > 16384){
+                return "Mismatch at " + std::to_string(c) + ": " +
+                    std::to_string(ext0[c]) + " != " + std::to_string(ext1[c]);
+            }
+        }else if constexpr (std::is_same_v<Type, float>){
+            float diff = ext0[c] - ext1[c];
+            if (std::abs(diff) > 0.000001){
+                return "Mismatch at " + std::to_string(c) + ": " +
+                    std::to_string(ext0[c]) + " != " + std::to_string(ext1[c]);
+            }
+        }else{
+            if (ext0[c] != ext1[c]){
+                return "Mismatch at " + std::to_string(c) + ": " +
+                    std::to_string(ext0[c]) + " != " + std::to_string(ext1[c]);
+            }
+        }
+
+    }
+
+    return true;
+}
+template <typename Type>
+std::string Test<Type>::typestr(){
+    if constexpr (std::is_same_v<Type, uint8_t>){
+        return "u8";
+    }else if constexpr (std::is_same_v<Type, int16_t>){
+        return "s16";
+    }else if constexpr (std::is_same_v<Type, int32_t>){
+        return "s32";
+    }else if constexpr (std::is_same_v<Type, float>){
+        return "f32";
+    }else{
+        static_assert(false);
+    }
+}
+
+
+template class Test<uint8_t>;
+template class Test<int16_t>;
+template class Test<int32_t>;
+template class Test<float>;
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/Kernels/AudioStreamConverter/Kernels_AudioStreamConverter_TestInfra.h b/SerialPrograms/Source/Kernels/AudioStreamConverter/Kernels_AudioStreamConverter_TestInfra.h
new file mode 100644
index 0000000000..142c9f381a
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/AudioStreamConverter/Kernels_AudioStreamConverter_TestInfra.h
@@ -0,0 +1,72 @@
+/*  Audio Stream Converter Test Infra
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/TestRunners/UnitTest.h"
+
+#ifndef PokemonAutomation_Kernels_AudioStreamConverter_TestInfra_H
+#define PokemonAutomation_Kernels_AudioStreamConverter_TestInfra_H
+
+#include "Common/Compiler.h"
+
+namespace PokemonAutomation{
+namespace Kernels{
+namespace AudioStreamConverter{
+
+
+
+
+
+template <typename ExternalType>
+using ConvertFrom = void (*)(
+    r_ptr<float> native, c_ptr<ExternalType> ext,
+    size_t samples, float multiplier
+);
+template <typename ExternalType>
+using ConvertTo = void (*)(
+    c_ptr<float> native, r_ptr<ExternalType> ext,
+    size_t samples, float multiplier
+);
+
+
+
+
+
+
+//
+//  Warning, this file is compiled in multiple ISA contexts.
+//  We cannot define the functions here since they will be compiled differently.
+//  If a higher (AVX512) version wins out in the linker, all versions will use
+//  it and crash on older CPUs.
+//
+template <typename Type>
+class Test : public UnitTest{
+public:
+    Test(
+        const std::string& arch_str,
+        size_t samples,
+        float multiplier,
+        ConvertFrom<Type> convert_from,
+        ConvertTo<Type> convert_to
+    );
+
+    virtual UnitTestResult run(Logger& logger, CancellableScope& scope) const override;
+
+    static std::string typestr();
+
+private:
+    size_t m_samples;
+    float m_multiplier;
+    ConvertFrom<Type> m_convert_from;
+    ConvertTo<Type> m_convert_to;
+};
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters.cpp b/SerialPrograms/Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters.cpp
index 8ca7989ed2..8d8c3d1792 100644
--- a/SerialPrograms/Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters.cpp
+++ b/SerialPrograms/Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters.cpp
@@ -1,27 +1,28 @@
 /*  Binary Image Basic Filters
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include "Common/Cpp/Exceptions.h"
-#include "Kernels_BinaryImage_BasicFilters_Routines.h"
+//#include "Kernels_BinaryImage_BasicFilters_Routines.h"
 #include "Kernels_BinaryImage_BasicFilters.h"
 
-#include <iostream>
-using std::cout;
-using std::endl;
+//#include <iostream>
+//using std::cout;
+//using std::endl;
 
 namespace PokemonAutomation{
 namespace Kernels{
 
 
 
-void filter_by_mask_64x4_Default      (const PackedBinaryMatrix_IB& matrix, uint32_t* image, size_t bytes_per_row, uint32_t replace_with, bool replace_if_zero);
-void filter_by_mask_64x8_x64_SSE42    (const PackedBinaryMatrix_IB& matrix, uint32_t* image, size_t bytes_per_row, uint32_t replace_with, bool replace_if_zero);
-void filter_by_mask_64x16_x64_AVX2    (const PackedBinaryMatrix_IB& matrix, uint32_t* image, size_t bytes_per_row, uint32_t replace_with, bool replace_if_zero);
-void filter_by_mask_64x32_x64_AVX512  (const PackedBinaryMatrix_IB& matrix, uint32_t* image, size_t bytes_per_row, uint32_t replace_with, bool replace_if_zero);
-void filter_by_mask_64x64_x64_AVX512  (const PackedBinaryMatrix_IB& matrix, uint32_t* image, size_t bytes_per_row, uint32_t replace_with, bool replace_if_zero);
+void filter_by_mask_64x4_Default    (const PackedBinaryMatrix_IB& matrix, uint32_t* image, size_t bytes_per_row, uint32_t replace_with, bool replace_if_zero);
+void filter_by_mask_64x8_x64_SSE42  (const PackedBinaryMatrix_IB& matrix, uint32_t* image, size_t bytes_per_row, uint32_t replace_with, bool replace_if_zero);
+void filter_by_mask_64x16_x64_AVX2  (const PackedBinaryMatrix_IB& matrix, uint32_t* image, size_t bytes_per_row, uint32_t replace_with, bool replace_if_zero);
+void filter_by_mask_64x32_x64_AVX512(const PackedBinaryMatrix_IB& matrix, uint32_t* image, size_t bytes_per_row, uint32_t replace_with, bool replace_if_zero);
+void filter_by_mask_64x64_x64_AVX512(const PackedBinaryMatrix_IB& matrix, uint32_t* image, size_t bytes_per_row, uint32_t replace_with, bool replace_if_zero);
+void filter_by_mask_64x8_arm64_NEON (const PackedBinaryMatrix_IB& matrix, uint32_t* image, size_t bytes_per_row, uint32_t replace_with, bool replace_if_zero);
 
 void filter_by_mask(
     const PackedBinaryMatrix_IB& matrix,
@@ -47,12 +48,17 @@ void filter_by_mask(
     case BinaryMatrixType::i64x8_x64_SSE42:
         filter_by_mask_64x8_x64_SSE42(matrix, image, bytes_per_row, replace_with, replace_if_zero);
         return;
+#endif
+#ifdef PA_AutoDispatch_arm64_20_M1
+    case BinaryMatrixType::arm64x8_x64_NEON:
+        filter_by_mask_64x8_arm64_NEON(matrix, image, bytes_per_row, replace_with, replace_if_zero);
+        return;
 #endif
     case BinaryMatrixType::i64x4_Default:
         filter_by_mask_64x4_Default(matrix, image, bytes_per_row, replace_with, replace_if_zero);
         return;
     default:
-        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Unsupported matrix format.");
+        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Unsupported matrix format in filter_by_mask().");
     }
 }
 
@@ -108,6 +114,15 @@ void compress_rgb32_to_binary_range_64x64_x64_AVX512(
     CompressRgb32ToBinaryRangeFilter* filters, size_t filter_count
 );
 
+void compress_rgb32_to_binary_range_64x8_arm64_NEON(
+    const uint32_t* image, size_t bytes_per_row,
+    PackedBinaryMatrix_IB& matrix0, uint32_t mins0, uint32_t maxs0
+);
+void compress_rgb32_to_binary_range_64x8_arm64_NEON(
+    const uint32_t* image, size_t bytes_per_row,
+    CompressRgb32ToBinaryRangeFilter* filters, size_t filter_count
+);
+
 void compress_rgb32_to_binary_range(
     const uint32_t* image, size_t bytes_per_row,
     PackedBinaryMatrix_IB& matrix,
@@ -131,6 +146,11 @@ void compress_rgb32_to_binary_range(
     case BinaryMatrixType::i64x8_x64_SSE42:
         compress_rgb32_to_binary_range_64x8_x64_SSE42(image, bytes_per_row, matrix, mins, maxs);
         return;
+#endif
+#ifdef PA_AutoDispatch_arm64_20_M1
+    case BinaryMatrixType::arm64x8_x64_NEON:
+        compress_rgb32_to_binary_range_64x8_arm64_NEON(image, bytes_per_row, matrix, mins, maxs);
+        return;
 #endif
     case BinaryMatrixType::i64x4_Default:
         compress_rgb32_to_binary_range_64x4_Default(image, bytes_per_row, matrix, mins, maxs);
@@ -170,6 +190,11 @@ void compress_rgb32_to_binary_range(
     case BinaryMatrixType::i64x8_x64_SSE42:
         compress_rgb32_to_binary_range_64x8_x64_SSE42(image, bytes_per_row, filters, filter_count);
         return;
+#endif
+#ifdef PA_AutoDispatch_arm64_20_M1
+    case BinaryMatrixType::arm64x8_x64_NEON:
+        compress_rgb32_to_binary_range_64x8_arm64_NEON(image, bytes_per_row, filters, filter_count);
+        return;
 #endif
     case BinaryMatrixType::i64x4_Default:
         compress_rgb32_to_binary_range_64x4_Default(image, bytes_per_row, filters, filter_count);
@@ -180,7 +205,6 @@ void compress_rgb32_to_binary_range(
 }
 
 
-
 void compress_rgb32_to_binary_euclidean_64x64_x64_AVX512(
     const uint32_t* image, size_t bytes_per_row,
     PackedBinaryMatrix_IB& matrix,
@@ -201,6 +225,11 @@ void compress_rgb32_to_binary_euclidean_64x8_x64_SSE42(
     PackedBinaryMatrix_IB& matrix,
     uint32_t expected, double max_euclidean_distance
 );
+void compress_rgb32_to_binary_euclidean_64x8_arm64_NEON(
+    const uint32_t* image, size_t bytes_per_row,
+    PackedBinaryMatrix_IB& matrix,
+    uint32_t expected, double max_euclidean_distance
+);
 void compress_rgb32_to_binary_euclidean_64x4_Default(
     const uint32_t* image, size_t bytes_per_row,
     PackedBinaryMatrix_IB& matrix,
@@ -229,6 +258,11 @@ void compress_rgb32_to_binary_euclidean(
     case BinaryMatrixType::i64x8_x64_SSE42:
         compress_rgb32_to_binary_euclidean_64x8_x64_SSE42(image, bytes_per_row, matrix, expected, max_euclidean_distance);
         return;
+#endif
+#ifdef PA_AutoDispatch_arm64_20_M1
+    case BinaryMatrixType::arm64x8_x64_NEON:
+        compress_rgb32_to_binary_euclidean_64x8_arm64_NEON(image, bytes_per_row, matrix, expected, max_euclidean_distance);
+        return;
 #endif
     case BinaryMatrixType::i64x4_Default:
         compress_rgb32_to_binary_euclidean_64x4_Default(image, bytes_per_row, matrix, expected, max_euclidean_distance);
diff --git a/SerialPrograms/Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters.h b/SerialPrograms/Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters.h
index 1f545be824..c16748db7b 100644
--- a/SerialPrograms/Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters.h
+++ b/SerialPrograms/Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters.h
@@ -1,6 +1,6 @@
 /*  Binary Image Basic Filters
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  *      Perform a filter over an image and store the results in a binary image.
  *
@@ -28,31 +28,31 @@ namespace PokemonAutomation{
 namespace Kernels{
 
 
-
-//  Selectively replace each pixel in an image with the specified pixel
-//  according to the respective bit in the binary matrix.
+//  Selectively replace pixels in an image with the replacement color
+//  according to the respective bits in the binary matrix.
+//  If `replace_zero_bits` is true, replace pixels corresponding to the zero bits.
+//  Else, replace those with the one bits.
 void filter_by_mask(
     const PackedBinaryMatrix_IB& matrix,
     uint32_t* image, size_t bytes_per_row,
-    uint32_t replace_with,
-    bool replace_if_zero    //  If false, replace if one.
+    uint32_t replacement_color,
+    bool replace_zero_bits
 );
 
 
 
-//  Compress (image, bytes_per_row) into a binary_image.
-//  Use the specified RGB ranges to determine whether each pixel
-//  becomes a 0 or a 1.
+//  Compress (image, bytes_per_row) into a binary_image represented as the binary matrix `matrix`
+//  Pixels in the specified RGB ranges [`mins`, `maxs`] are assigned 1 in the binary matrix,
+//  otherwise 0.
 void compress_rgb32_to_binary_range(
     const uint32_t* image, size_t bytes_per_row,
     PackedBinaryMatrix_IB& matrix,
     uint32_t mins, uint32_t maxs
 );
 
-
-//  Same as above, but multiple filters.
-//  The purpose is to reduce passes over the entire image.
-//  All matricies must have the same dimensions.
+//  Helper struct to store filtering related data for the multi-filter overload of `compress_rgb32_to_binary_range()`.
+//  It stores `matrix`, the filtering result: a binary matrix, where 1-bits are the pixels that are in the filter RGB
+//  range [`mins`, `maxs`], and 0-bits are otherwise.
 struct CompressRgb32ToBinaryRangeFilter{
     PackedBinaryMatrix_IB& matrix;
     uint32_t mins;
@@ -64,6 +64,14 @@ struct CompressRgb32ToBinaryRangeFilter{
         , maxs(p_maxs)
     {}
 };
+
+//  Compress (image, bytes_per_row) into multiple binary_images represented as binary matrices stored in
+//  `CompressRgb32ToBinaryRangeFilter.matrix` for each `filters`. 
+//  For each filter, pixels in the specified RGB ranges [`Filter.mins`, `Filter.maxs`] are assigned 1 in `Filter.matrix`,
+//  otherwise 0.
+//  This function is like multiple calls to the single-filter overload of `compress_rgb32_to_binary_range()`, but 
+//  with the benefit of reducing passes over the entire image.
+//  All matrices in `filters` must have the same dimensions.
 void compress_rgb32_to_binary_range(
     const uint32_t* image, size_t bytes_per_row,
     CompressRgb32ToBinaryRangeFilter* filters, size_t filter_count
@@ -73,11 +81,11 @@ void compress_rgb32_to_binary_range(
 
 
 //  Compress (image, bytes_per_row) into a binary_image.
-//  For each pixel, set to 1 if distance is within the expected value.
+//  For each pixel, set to 1 if the Euclidean distance of the pixel color to the expected color <= max distance.
 void compress_rgb32_to_binary_euclidean(
     const uint32_t* image, size_t bytes_per_row,
     PackedBinaryMatrix_IB& matrix,
-    uint32_t expected, double max_euclidean_distance
+    uint32_t expected_color, double max_euclidean_distance
 );
 
 
diff --git a/SerialPrograms/Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters_Core_64x16_x64_AVX2.cpp b/SerialPrograms/Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters_Core_64x16_x64_AVX2.cpp
index 5aa026922a..52e18e415c 100644
--- a/SerialPrograms/Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters_Core_64x16_x64_AVX2.cpp
+++ b/SerialPrograms/Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters_Core_64x16_x64_AVX2.cpp
@@ -1,6 +1,6 @@
 /*  Binary Image Basic Filters (x64 AVX2)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters_Core_64x32_x64_AVX512.cpp b/SerialPrograms/Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters_Core_64x32_x64_AVX512.cpp
index 6316f77715..341d945ba9 100644
--- a/SerialPrograms/Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters_Core_64x32_x64_AVX512.cpp
+++ b/SerialPrograms/Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters_Core_64x32_x64_AVX512.cpp
@@ -1,6 +1,6 @@
 /*  Binary Image Basic Filters (x64 AVX512)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters_Core_64x4_Default.cpp b/SerialPrograms/Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters_Core_64x4_Default.cpp
index 56810c3ca7..58345678cb 100644
--- a/SerialPrograms/Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters_Core_64x4_Default.cpp
+++ b/SerialPrograms/Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters_Core_64x4_Default.cpp
@@ -1,6 +1,6 @@
 /*  Binary Image Basic Filters (Default)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters_Core_64x64_x64_AVX512.cpp b/SerialPrograms/Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters_Core_64x64_x64_AVX512.cpp
index 06ff8685bf..a051eea35a 100644
--- a/SerialPrograms/Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters_Core_64x64_x64_AVX512.cpp
+++ b/SerialPrograms/Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters_Core_64x64_x64_AVX512.cpp
@@ -1,6 +1,6 @@
 /*  Binary Image Basic Filters (x64 AVX512)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters_Core_64x8_arm64_NEON.cpp b/SerialPrograms/Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters_Core_64x8_arm64_NEON.cpp
new file mode 100644
index 0000000000..45675ca4f8
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters_Core_64x8_arm64_NEON.cpp
@@ -0,0 +1,66 @@
+/*  Binary Image Basic Filters (arm64 NEON)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifdef PA_AutoDispatch_arm64_20_M1
+
+#include "Kernels/BinaryMatrix/Kernels_BinaryMatrix_Arch_64x8_arm64_NEON.h"
+#include "Kernels_BinaryImage_BasicFilters_Routines.h"
+#include "Kernels_BinaryImage_BasicFilters_arm64_NEON.h"
+
+
+namespace PokemonAutomation{
+namespace Kernels{
+
+
+void filter_by_mask_64x8_arm64_NEON(
+    const PackedBinaryMatrix_IB& matrix,
+    uint32_t* image, size_t bytes_per_row,
+    uint32_t replacement_color, bool replace_zero_bits
+){
+    FilterByMask_arm64_NEON filter(replacement_color, replace_zero_bits);
+    filter_by_mask(static_cast<const PackedBinaryMatrix_64x8_arm64_NEON&>(matrix).get(), image, bytes_per_row, filter);
+}
+
+
+
+
+void compress_rgb32_to_binary_range_64x8_arm64_NEON(
+    const uint32_t* image, size_t bytes_per_row,
+    PackedBinaryMatrix_IB& matrix0, uint32_t mins0, uint32_t maxs0
+){
+    Compressor_RgbRange_arm64_NEON compressor0(mins0, maxs0);
+    compress_rgb32_to_binary(
+        image, bytes_per_row,
+        static_cast<PackedBinaryMatrix_64x8_arm64_NEON&>(matrix0).get(), compressor0
+    );
+}
+void compress_rgb32_to_binary_range_64x8_arm64_NEON(
+    const uint32_t* image, size_t bytes_per_row,
+    CompressRgb32ToBinaryRangeFilter* filters, size_t filter_count
+){
+    compress_rgb32_to_binary<PackedBinaryMatrix_64x8_arm64_NEON, Compressor_RgbRange_arm64_NEON>(
+        image, bytes_per_row, filters, filter_count
+    );
+}
+
+
+void compress_rgb32_to_binary_euclidean_64x8_arm64_NEON(
+    const uint32_t* image, size_t bytes_per_row,
+    PackedBinaryMatrix_IB& matrix,
+    uint32_t expected, double max_euclidean_distance
+){
+    Compressor_RgbEuclidean_arm64_NEON compressor(expected, max_euclidean_distance);
+    compress_rgb32_to_binary(
+        image, bytes_per_row,
+        static_cast<PackedBinaryMatrix_64x8_arm64_NEON&>(matrix).get(), compressor
+    );
+}
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters_Core_64x8_x64_SSE42.cpp b/SerialPrograms/Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters_Core_64x8_x64_SSE42.cpp
index e2a6d4d95a..621c61bede 100644
--- a/SerialPrograms/Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters_Core_64x8_x64_SSE42.cpp
+++ b/SerialPrograms/Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters_Core_64x8_x64_SSE42.cpp
@@ -1,6 +1,6 @@
 /*  Binary Image Basic Filters (x64 SSE4.2)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters_Default.h b/SerialPrograms/Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters_Default.h
index b82443c20d..10ed7916fb 100644
--- a/SerialPrograms/Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters_Default.h
+++ b/SerialPrograms/Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters_Default.h
@@ -1,6 +1,6 @@
 /*  Binary Image Basic Filters (Default)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -11,9 +11,9 @@
 #include <cstddef>
 #include "Common/Compiler.h"
 
-#include <iostream>
-using std::cout;
-using std::endl;
+//#include <iostream>
+//using std::cout;
+//using std::endl;
 
 namespace PokemonAutomation{
 namespace Kernels{
diff --git a/SerialPrograms/Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters_Routines.h b/SerialPrograms/Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters_Routines.h
index 61e5c5784c..3aaa373d74 100644
--- a/SerialPrograms/Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters_Routines.h
+++ b/SerialPrograms/Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters_Routines.h
@@ -1,6 +1,6 @@
 /*  Binary Image Basic Filters
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -118,6 +118,44 @@ void compress_rgb32_to_binary(
 }
 
 
+// Change pixel (as uint32_t) color of image based on bits in a binary matrix
+// If `filter` is constructed with `replace_if_zero` being true, image pixels corresponding to 0-bits in `matrix`
+//    are replaced with color `replace_with` which is provided by the filter.
+// If `filter` is constructed with `replace_if_zero` being false, image pixels corresponding to 1-bits in `matrix`
+//    are replaced with color `replace_with`.
+// `BinaryMatrixType` is a PackedBinaryMatrixCore<BinaryMatrixTileType>,
+// where BinaryMatrixTileType is an implementation of a tile, defined for every simd architecture.
+template <typename BinaryMatrixType, typename Filter>
+void filter_rgb32(
+    const BinaryMatrixType& matrix,
+    uint32_t* image, size_t bytes_per_row,
+    const Filter& filter
+){
+    size_t bit_width = matrix.width();
+//    size_t bit_height = binary_image.height();
+//    size_t word_width = binary_image.word64_width();
+
+    // How many words in a row. Each word is 64-bit long
+    size_t word_height = matrix.word64_height();
+    for (size_t r = 0; r < word_height; r++){ // For each row
+        uint32_t* img = image;
+        // c: current index of the word. One word has 64-bit wide
+        size_t c = 0;
+        size_t left = bit_width;
+        while (left >= 64){
+            // Modify some pixels in the 64-pixel-long area of the image,
+            // starting at pointr `img`
+            filter.filter64(matrix.word64(c, r), img);
+            c++;
+            img += 64;
+            left -= 64;
+        }
+        if (left > 0){
+            filter.filter64(matrix.word64(c, r), img, left);
+        }
+        image = (uint32_t*)((const char*)image + bytes_per_row);
+    }
+}
 
 
 }
diff --git a/SerialPrograms/Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters_arm64_NEON.h b/SerialPrograms/Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters_arm64_NEON.h
new file mode 100644
index 0000000000..2a5a1c89f7
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters_arm64_NEON.h
@@ -0,0 +1,328 @@
+/*  Binary Image Basic Filters (arm64 NEON)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Kernels_BinaryImage_BasicFilters_arm64_NEON_H
+#define PokemonAutomation_Kernels_BinaryImage_BasicFilters_arm64_NEON_H
+
+#include <cstring>
+#include "Kernels/PartialWordAccess/Kernels_PartialWordAccess_arm64_NEON.h"
+
+// #include <iostream>
+// using std::cout;
+// using std::endl;
+
+namespace PokemonAutomation{
+namespace Kernels{
+
+// Change color of an array of pixels based on values from a bitmap that corresponds to the pixel array.
+// If `replace_zero_bits` is true, change color of pixels that correspond to 0 bits.
+// Otherwise, chagne color of pixels that correspond to 1 bits.
+class FilterByMask_arm64_NEON{
+public:
+    FilterByMask_arm64_NEON(uint32_t replacement, bool replace_zero_bits)
+        : m_replacement_u32(vdupq_n_u32(replacement))
+        , m_replace_if_zero(replace_zero_bits)
+        , m_zeros(vreinterpretq_u32_u8(vdupq_n_u8(0)))
+    {}
+
+    // Given 64 bits stored in `uint64_t`, use it to set colors to 64 pixels in `pixels`.
+    // If filter constructor parameter `replace_zero_bits` is true, the pixels corresponding to
+    // 0-bits are set to color `replacement` (another filter constructor parameter).
+    // Otherwise, pixels corresponding to 1-bits are set to the color.
+    PA_FORCE_INLINE void filter64(uint64_t bits, uint32_t* pixels) const{
+        for (int i = 0; i < 64; i+=16){
+            filter16((bits >> i) & 0xFFFF, pixels + i);
+        }
+    }
+
+    // partial version of filter64(bits, pixels): instead of setting colors to 64 pixels,
+    // only setting `count` (count <= 64) pixels.
+    PA_FORCE_INLINE void filter64(uint64_t bits, uint32_t* pixels, size_t count) const{
+        const size_t count_round_4 = (count / 4) * 4;
+        for (size_t i = 0; i < count_round_4; i+=4){
+            filter4((bits >> i) & 0xF, pixels + i);
+        }
+        
+        size_t left = count % 4;
+        if (left){
+            uint32_t buffer[4];
+            memcpy(buffer, pixels + count_round_4, sizeof(uint32_t) * left);
+            filter4((bits >> count_round_4) & 0xF, buffer);
+            memcpy(pixels + count_round_4, buffer, sizeof(uint32_t) * left);
+        }
+    }
+
+private:
+    // Change color in the 8 pixels according to the lowest 4 bits in `bits`
+    PA_FORCE_INLINE void filter4(uint64_t bits64, uint32_t* pixels) const{
+        // Duplicate 4-bit pattern into four uint16_t places in `bits`
+        bits64 *= 0x0001000100010001;
+        // convert each uint16_t to be one bit from the lowest four bits in input `bits`
+        bits64 &= 0x0008000400020001;
+
+        uint32x4_t pixels_u32 = vld1q_u32(pixels);
+
+        // Load `bits` into simd 64-bit vector register
+        uint16x4_t mask_u16 = vcreate_u16(bits64);
+        // Expand mask to cover each pixel (uint32_t)
+        uint32x4_t mask_u32 = vmovl_u16(mask_u16);
+        // Expand mask to be all-1 or all-0 mask for each pixel
+        mask_u32 = vcgtq_u32(mask_u32, m_zeros);
+
+        uint32x4_t out_u32;
+        if (m_replace_if_zero){
+            // bit select intrinsic: 
+            // vbslq_u32(a, b, c), for 1 bits in a, choose b; for 0 bits in a, choose c
+            out_u32 = vbslq_u32(mask_u32, pixels_u32, m_replacement_u32);
+        }else{
+            out_u32 = vbslq_u32(mask_u32, m_replacement_u32, pixels_u32);
+        }
+        vst1q_u32(pixels, out_u32);
+    }
+
+    PA_FORCE_INLINE void filter16(uint64_t bits64, uint32_t* pixels) const{
+        uint64_t bits_0 = bits64 & 0xF;
+        uint64_t bits_1 = (bits64 >> 4) & 0xF;
+        uint64_t bits_2 = (bits64 >> 8) & 0xF;
+        uint64_t bits_3 = bits64 >> 12;
+
+        // Duplicate 4-bit pattern into four uint16_t places in `bits`
+        bits_0 *= 0x0001000100010001;
+        // convert each uint16_t to be one bit from the lowest four bits in input `bits`
+        bits_0 &= 0x0008000400020001;
+        
+        bits_1 *= 0x0001000100010001;
+        bits_1 &= 0x0008000400020001;
+
+        bits_2 *= 0x0001000100010001;
+        bits_2 &= 0x0008000400020001;
+
+        bits_3 *= 0x0001000100010001;
+        bits_3 &= 0x0008000400020001;
+
+        uint32x4_t pixels_0_u32 = vld1q_u32(pixels);
+        uint32x4_t pixels_1_u32 = vld1q_u32(pixels + 4);
+        uint32x4_t pixels_2_u32 = vld1q_u32(pixels + 8);
+        uint32x4_t pixels_3_u32 = vld1q_u32(pixels + 12);
+
+        // Load `bits` into simd 64-bit vector register
+        uint16x4_t mask_0_u16x4 = vcreate_u16(bits_0);
+        uint16x4_t mask_1_u16x4 = vcreate_u16(bits_1);
+        uint16x4_t mask_2_u16x4 = vcreate_u16(bits_2);
+        uint16x4_t mask_3_u16x4 = vcreate_u16(bits_3);
+        // Expand mask to cover each pixel (uint32_t)
+        uint32x4_t mask_0_u32 = vmovl_u16(mask_0_u16x4);
+        uint32x4_t mask_1_u32 = vmovl_u16(mask_1_u16x4);
+        uint32x4_t mask_2_u32 = vmovl_u16(mask_2_u16x4);
+        uint32x4_t mask_3_u32 = vmovl_u16(mask_3_u16x4);
+        // Expand mask to be all-1 or all-0 mask for each pixel
+        mask_0_u32 = vcgtq_u32(mask_0_u32, m_zeros);
+        mask_1_u32 = vcgtq_u32(mask_1_u32, m_zeros);
+        mask_2_u32 = vcgtq_u32(mask_2_u32, m_zeros);
+        mask_3_u32 = vcgtq_u32(mask_3_u32, m_zeros);
+
+        uint32x4_t out_0_u32, out_1_u32, out_2_u32, out_3_u32;
+        if (m_replace_if_zero){
+            // bit select intrinsic: 
+            // vbslq_u32(a, b, c), for 1 bits in a, choose b; for 0 bits in a, choose c
+            out_0_u32 = vbslq_u32(mask_0_u32, pixels_0_u32, m_replacement_u32);
+            out_1_u32 = vbslq_u32(mask_1_u32, pixels_1_u32, m_replacement_u32);
+            out_2_u32 = vbslq_u32(mask_2_u32, pixels_2_u32, m_replacement_u32);
+            out_3_u32 = vbslq_u32(mask_3_u32, pixels_3_u32, m_replacement_u32);
+        }else{
+            out_0_u32 = vbslq_u32(mask_0_u32, m_replacement_u32, pixels_0_u32);
+            out_1_u32 = vbslq_u32(mask_1_u32, m_replacement_u32, pixels_1_u32);
+            out_2_u32 = vbslq_u32(mask_2_u32, m_replacement_u32, pixels_2_u32);
+            out_3_u32 = vbslq_u32(mask_3_u32, m_replacement_u32, pixels_3_u32);
+        }
+        vst1q_u32(pixels, out_0_u32);
+        vst1q_u32(pixels + 4, out_1_u32);
+        vst1q_u32(pixels + 8, out_2_u32);
+        vst1q_u32(pixels + 12, out_3_u32);
+    }
+
+private:
+    const uint32x4_t m_replacement_u32;
+    const bool m_replace_if_zero;
+    const uint32x4_t m_zeros;
+};
+
+// Compress given pixels buffer (of up to 64-pixel long) into bit map and store in one uint64_t.
+class Compressor_RgbRange_arm64_NEON{
+public:
+    Compressor_RgbRange_arm64_NEON(uint32_t mins, uint32_t maxs)
+        : m_mins_u8(vreinterpretq_u8_u32(vdupq_n_u32(mins)))
+        , m_maxs_u8(vreinterpretq_u8_u32(vdupq_n_u32(maxs)))
+        , m_zeros(vreinterpretq_u32_u8(vdupq_n_u8(0)))
+    {}
+
+    // Convert a row of 64 pixels to bit map fit into uint64_t
+    PA_FORCE_INLINE uint64_t convert64(const uint32_t* pixels) const{
+        uint64_t bits = 0;
+        for (size_t c = 0; c < 64; c += 16){
+            bits |= convert16(pixels + c) << c;
+        }
+        return bits;
+    }
+    // Convert a row of `count` pixels to bit map fit into uint64_t
+    // count <= 64
+    PA_FORCE_INLINE uint64_t convert64(const uint32_t* pixels, size_t count) const{
+        uint64_t bits = 0;
+        size_t c = 0;
+
+        for (size_t i = 0; i < count / 16; i++){
+            bits |= convert16(pixels + c) << c;
+            c += 16;
+        }
+
+        count %= 16;
+        for (size_t i = 0; i < count / 4; i++, c+=4){
+            const uint8x16_t pixel = vld1q_u8((const uint8_t*)(pixels + c));
+            bits |= convert4(pixel) << c;
+        }
+        count %= 4;
+        if (count){
+            PartialWordAccess_arm64_NEON loader(count * sizeof(uint32_t));
+            const uint8x16_t pixel = loader.load(pixels + c);
+            const uint64_t mask = ((uint64_t)1 << count) - 1;
+            bits |= (convert4(pixel) & mask) << c;
+        }
+        return bits;
+    }
+
+private:
+    // Convert four pixels to four 0/1 bits according to RGB color range
+    // Return a uint64_t where the lowest four bits contain the converted bits for each pixel.
+    PA_FORCE_INLINE uint64_t convert4(const uint8x16_t& pixel) const{
+        // Check if mins > pixel per color channel
+        uint8x16_t cmp0 = vcgtq_u8(m_mins_u8, pixel);
+        // Check if pixel > maxs per color channel
+        uint8x16_t cmp1 = vcgtq_u8(pixel, m_maxs_u8);
+        // cmp: if mins > pixel or pixel > maxs per color channel
+        uint8x16_t cmp = vorrq_u8(cmp0, cmp1);
+        // cmp_32x4: if each pixel is within the range
+        // If a pixel is within range, its uint32_t in `cmp_32x4` is all 1 bits, otherwise, all 0 bits
+        uint32x4_t cmp_32x4 = vceqq_u32(vreinterpretq_u32_u8(cmp), m_zeros);
+        return (cmp_32x4[0] & 0x1) | (cmp_32x4[1] & 0x2) | (cmp_32x4[2] & 0x4) | (cmp_32x4[3] & 0x8);
+    }
+
+    // Convert 16 pixels to 16 0/1 bits according to RGB color range
+    // Return a uint64_t where the lowest bits contain the converted bits for each pixel.
+    PA_FORCE_INLINE uint64_t convert16(const uint32_t* pixels) const{
+        uint8x16x4_t pixelx4 = vld1q_u8_x4((const uint8_t*)pixels);
+
+        // cmpx_min: Check if mins > pixel per color channel
+        // cmpx_max: Check if pixel > maxs per color channel
+        uint8x16_t cmp0_min = vcgtq_u8(m_mins_u8, pixelx4.val[0]);
+        uint8x16_t cmp0_max = vcgtq_u8(pixelx4.val[0], m_maxs_u8);
+        uint8x16_t cmp1_min = vcgtq_u8(m_mins_u8, pixelx4.val[1]);
+        uint8x16_t cmp1_max = vcgtq_u8(pixelx4.val[1], m_maxs_u8);
+        uint8x16_t cmp2_min = vcgtq_u8(m_mins_u8, pixelx4.val[2]);
+        uint8x16_t cmp2_max = vcgtq_u8(pixelx4.val[2], m_maxs_u8);
+        uint8x16_t cmp3_min = vcgtq_u8(m_mins_u8, pixelx4.val[3]);
+        uint8x16_t cmp3_max = vcgtq_u8(pixelx4.val[3], m_maxs_u8);
+
+        // cmp: if mins > pixel or pixel > maxs per color channel
+        uint8x16_t cmp0 = vorrq_u8(cmp0_min, cmp0_max);
+        uint8x16_t cmp1 = vorrq_u8(cmp1_min, cmp1_max);
+        uint8x16_t cmp2 = vorrq_u8(cmp2_min, cmp2_max);
+        uint8x16_t cmp3 = vorrq_u8(cmp3_min, cmp3_max);
+
+        // cmp_32x4: if each pixel is within the range
+        // If a pixel is within range, its uint32_t in `cmp_32x4` is all 1 bits, otherwise, all 0 bits
+        uint32x4_t cmp0_32x4 = vceqq_u32(vreinterpretq_u32_u8(cmp0), m_zeros);
+        uint32x4_t cmp1_32x4 = vceqq_u32(vreinterpretq_u32_u8(cmp1), m_zeros);
+        uint32x4_t cmp2_32x4 = vceqq_u32(vreinterpretq_u32_u8(cmp2), m_zeros);
+        uint32x4_t cmp3_32x4 = vceqq_u32(vreinterpretq_u32_u8(cmp3), m_zeros);
+
+        // Combine pixel bits together
+        return (cmp0_32x4[0] & 0x01) | (cmp0_32x4[1] & 0x02) | (cmp0_32x4[2] & 0x04) | (cmp0_32x4[3] & 0x08)
+             | (cmp1_32x4[0] & 0x10) | (cmp1_32x4[1] & 0x20) | (cmp1_32x4[2] & 0x40) | (cmp1_32x4[3] & 0x80)
+             | (cmp2_32x4[0] & 0x100) | (cmp2_32x4[1] & 0x200) | (cmp2_32x4[2] & 0x400) | (cmp2_32x4[3] & 0x800)
+             | (cmp3_32x4[0] & 0x1000) | (cmp3_32x4[1] & 0x2000) | (cmp3_32x4[2] & 0x4000) | (cmp3_32x4[3] & 0x8000);
+    }
+
+private:
+    uint8x16_t m_mins_u8;
+    uint8x16_t m_maxs_u8;
+    const uint32x4_t m_zeros;
+};
+
+
+class Compressor_RgbEuclidean_arm64_NEON{
+public:
+    Compressor_RgbEuclidean_arm64_NEON(uint32_t expected_color, double max_euclidean_distance)
+        : m_expected_color_rgb_u8(vreinterpretq_u8_u32(vdupq_n_u32(expected_color & 0x00ffffff)))
+        , m_distance_squared_u32(vdupq_n_u32((uint32_t)(max_euclidean_distance * max_euclidean_distance)))
+    {}
+
+    PA_FORCE_INLINE uint64_t convert64(const uint32_t* pixels) const{
+        uint64_t bits = 0;
+        for (size_t c = 0; c < 64; c += 4){
+            bits |= convert4(pixels + c) << c;
+        }
+        return bits;
+    }
+    PA_FORCE_INLINE uint64_t convert64(const uint32_t* pixels, size_t count) const{
+        uint64_t bits = 0;
+        size_t c = 0;
+
+        for (size_t i = 0; i < count / 4; i++, c+=4){
+            bits |= convert4(pixels + c) << c;
+        }
+        count %= 4;
+        if (count){
+            PartialWordAccess_arm64_NEON loader(count * sizeof(uint32_t));
+            const uint8x16_t pixel = loader.load(pixels + c);
+            const uint64_t mask = ((uint64_t)1 << count) - 1;
+            bits |= (convert4(pixel) & mask) << c;
+        }
+        return bits;
+    }
+
+private:
+    PA_FORCE_INLINE uint64_t convert4(const uint32_t* pixel) const{
+        uint32x4_t in_u32 = vld1q_u32(pixel);
+        return convert4(vreinterpretq_u8_u32(in_u32));
+    }
+    PA_FORCE_INLINE uint64_t convert4(const uint8x16_t& in_u8) const{
+        return convert4(vreinterpretq_u32_u8(in_u8));
+    }
+    PA_FORCE_INLINE uint64_t convert4(const uint32x4_t& in_u32) const{
+        // subtract the expected values
+        uint32x4_t in_dif_u32 = vreinterpretq_u32_u8(vabdq_u8(vreinterpretq_u8_u32(in_u32), m_expected_color_rgb_u8));
+
+        // Get green channel
+        uint32x4_t in_g_u32 = vandq_u32(in_dif_u32, vdupq_n_u32(0x0000ff00));
+        // Move green channel to the lower end of the 16-bit regions
+        uint16x8_t in_g_u16 = vshrq_n_u16(vreinterpretq_u16_u32(in_g_u32), 8);
+        // in_rb_u16 contains the red and blue channels. Each channel occupies a 16-bit region
+        uint16x8_t in_rb_u16 = vandq_u16(vreinterpretq_u16_u32(in_dif_u32), vdupq_n_u16(0x00ff));
+
+        // Square operation
+        uint16x8_t in_g2_u16 = vmulq_u16(in_g_u16, in_g_u16);
+        uint16x8_t in_r2b2_u16 = vmulq_u16(in_rb_u16, in_rb_u16);
+
+        uint32x4_t in_g2_u32 = vreinterpretq_u32_u16(in_g2_u16);
+        // Use pairwise addition and accumulate to add r2, g2, and b2 together
+        uint32x4_t sum_sqr_u32 = vpadalq_u16(in_g2_u32, in_r2b2_u16);
+
+        // cmp_u32: if each pixel is within range (sum_sqr <= max_distance_squared), its uint32_t in `cmp_u32` is all 1 bits,
+        // otherwise, all 0 bits
+        uint32x4_t cmp_u32 = vcleq_u32(sum_sqr_u32, m_distance_squared_u32);
+        return (cmp_u32[0] & 0x01) | (cmp_u32[1] & 0x02) | (cmp_u32[2] & 0x04) | (cmp_u32[3] & 0x08);
+    }
+
+private:
+    uint8x16_t m_expected_color_rgb_u8;
+    uint32x4_t m_distance_squared_u32;
+};
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters_x64_AVX2.h b/SerialPrograms/Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters_x64_AVX2.h
index 22ad1af02b..7c77f1881d 100644
--- a/SerialPrograms/Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters_x64_AVX2.h
+++ b/SerialPrograms/Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters_x64_AVX2.h
@@ -1,6 +1,6 @@
 /*  Binary Image Basic Filters (x64 AVX2)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -169,7 +169,7 @@ class Compressor_RgbEuclidean_x64_AVX2{
         __m256i sum_sqr = _mm256_add_epi32(r, g);
         sum_sqr = _mm256_add_epi32(sum_sqr, b);
 
-        __m256i cmp = _mm256_cmpgt_epi32(m_distance_squared, sum_sqr);
+        __m256i cmp = _mm256_cmpeq_epi32(_mm256_min_epu32(sum_sqr, m_distance_squared), sum_sqr);
         return _mm256_movemask_ps(_mm256_castsi256_ps(cmp));
     }
 
diff --git a/SerialPrograms/Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters_x64_AVX512.h b/SerialPrograms/Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters_x64_AVX512.h
index 0e482f3b25..b175f2bada 100644
--- a/SerialPrograms/Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters_x64_AVX512.h
+++ b/SerialPrograms/Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters_x64_AVX512.h
@@ -1,6 +1,6 @@
 /*  Binary Image Basic Filters (x64 AVX512)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -168,7 +168,7 @@ class Compressor_RgbEuclidean_x64_AVX512{
         __m512i sum_sqr = _mm512_add_epi32(r, g);
         sum_sqr = _mm512_add_epi32(sum_sqr, b);
 
-        __mmask16 cmp = _mm512_cmpgt_epi32_mask(m_distance_squared, sum_sqr);
+        __mmask16 cmp = _mm512_cmple_epu32_mask(sum_sqr, m_distance_squared);
         return cmp;
     }
 
diff --git a/SerialPrograms/Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters_x64_SSE42.h b/SerialPrograms/Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters_x64_SSE42.h
index eebd2f2047..f575461e76 100644
--- a/SerialPrograms/Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters_x64_SSE42.h
+++ b/SerialPrograms/Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters_x64_SSE42.h
@@ -1,6 +1,6 @@
 /*  Binary Image Basic Filters (x64 SSE4.2)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -44,13 +44,32 @@ class FilterByMask_x64_SSE41{
     }
 
 private:
+    // Change color in the four pixels according to the lowest four bits in `bits`
     PA_FORCE_INLINE __m128i filter4(uint32_t bits, __m128i pixel) const{
+        // Duplicate 4-bit pattern into four uint8_t places in `bits`
         bits *= 0x01010101;
+        // convert each uint8_t to be one bit from the lowest four bits in input `bits`
         bits &= 0x08040201;
+        // Load uint32_t `bits` into a 128-bit simd register
         __m128i mask = _mm_cvtsi32_si128(bits);
+        // Expand uint8 values into uint32 values
+        // So now each pixel (uint32) corresponds to a mask value in `mask`
         mask = _mm_cvtepu8_epi32(mask);
+        // set a pixel in mask to 1 if original mask for the pixel is 0
         mask = _mm_cmpeq_epi32(mask, _mm_setzero_si128());
+        // If constructor `replace_if_zero` is true: `m_replace_if_zero` is all 0-bits
+        // then XOR it, mask becomes the same, so it's the inverse of the original mask
+        // ----
+        // If constructor `replace_if_zero` is false: `m_replace_if_zero` is all 1-bits
+        // then XOR it, masks becomes the inverse, so it's the same as the original maask
         mask = _mm_xor_si128(mask, m_replace_if_zero);
+        // If constructor `replace_if_zero` is true,
+        //   If mask is non-zero, which means if original mask is zero, use m_replacement
+        //   Otherwise, remain the old pixel color
+        // --- 
+        // If constructor `replace_if_zero` is false,
+        //   If mask is non-zero, which means the original mask non-zero, use m_replacement
+        //   Otherwise, remain the old pixel color
         return _mm_blendv_epi8(pixel, m_replacement, mask);
     }
 
@@ -169,7 +188,7 @@ class Compressor_RgbEuclidean_x64_SSE41{
         __m128i sum_sqr = _mm_add_epi32(r, g);
         sum_sqr = _mm_add_epi32(sum_sqr, b);
 
-        __m128i cmp = _mm_cmpgt_epi32(m_distance_squared, sum_sqr);
+        __m128i cmp = _mm_cmpeq_epi32(_mm_min_epu32(sum_sqr, m_distance_squared), sum_sqr);
         return _mm_movemask_ps(_mm_castsi128_ps(cmp));
     }
 
diff --git a/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix.cpp b/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix.cpp
index 350942283d..5fb4f5f45b 100644
--- a/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix.cpp
+++ b/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix.cpp
@@ -1,6 +1,6 @@
 /*  Binary Matrix
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -30,6 +30,10 @@ BinaryMatrixType get_BinaryMatrixType(){
     if (CPU_CAPABILITY_CURRENT.OK_08_Nehalem){
         return BinaryMatrixType::i64x8_x64_SSE42;
     }
+#elif PA_ARCH_arm64
+    if (CPU_CAPABILITY_CURRENT.OK_M1){
+        return BinaryMatrixType::arm64x8_x64_NEON;
+    }
 #endif
 
 //    return BinaryMatrixType::i64x8_Default;
@@ -51,6 +55,9 @@ std::unique_ptr<PackedBinaryMatrix_IB> make_PackedBinaryMatrix_64x32_x64_AVX512(
 std::unique_ptr<PackedBinaryMatrix_IB> make_PackedBinaryMatrix_64x64_x64_AVX512();
 std::unique_ptr<PackedBinaryMatrix_IB> make_PackedBinaryMatrix_64x64_x64_AVX512(size_t width, size_t height);
 
+std::unique_ptr<PackedBinaryMatrix_IB> make_PackedBinaryMatrix_64x8_arm64_NEON();
+std::unique_ptr<PackedBinaryMatrix_IB> make_PackedBinaryMatrix_64x8_arm64_NEON(size_t width, size_t height);
+
 std::unique_ptr<PackedBinaryMatrix_IB> make_PackedBinaryMatrix(BinaryMatrixType type){
     switch (type){
 
@@ -71,6 +78,11 @@ std::unique_ptr<PackedBinaryMatrix_IB> make_PackedBinaryMatrix(BinaryMatrixType
     case BinaryMatrixType::i64x8_x64_SSE42:
         return make_PackedBinaryMatrix_64x8_x64_SSE42();
 #endif
+#elif PA_ARCH_arm64
+#ifdef PA_AutoDispatch_arm64_20_M1
+    case BinaryMatrixType::arm64x8_x64_NEON:
+        return make_PackedBinaryMatrix_64x8_arm64_NEON();
+#endif
 #endif
 
     case BinaryMatrixType::i64x8_Default:
@@ -101,6 +113,11 @@ std::unique_ptr<PackedBinaryMatrix_IB> make_PackedBinaryMatrix(BinaryMatrixType
     case BinaryMatrixType::i64x8_x64_SSE42:
         return make_PackedBinaryMatrix_64x8_x64_SSE42(width, height);
 #endif
+#elif PA_ARCH_arm64
+#ifdef PA_AutoDispatch_arm64_20_M1
+    case BinaryMatrixType::arm64x8_x64_NEON:
+        return make_PackedBinaryMatrix_64x8_arm64_NEON(width, height);
+#endif
 #endif
 
     case BinaryMatrixType::i64x8_Default:
@@ -127,6 +144,9 @@ std::unique_ptr<SparseBinaryMatrix_IB> make_SparseBinaryMatrix_64x32_x64_AVX512(
 std::unique_ptr<SparseBinaryMatrix_IB> make_SparseBinaryMatrix_64x64_x64_AVX512();
 std::unique_ptr<SparseBinaryMatrix_IB> make_SparseBinaryMatrix_64x64_x64_AVX512(size_t width, size_t height);
 
+std::unique_ptr<SparseBinaryMatrix_IB> make_SparseBinaryMatrix_64x8_arm64_NEON();
+std::unique_ptr<SparseBinaryMatrix_IB> make_SparseBinaryMatrix_64x8_arm64_NEON(size_t width, size_t height);
+
 std::unique_ptr<SparseBinaryMatrix_IB> make_SparseBinaryMatrix(BinaryMatrixType type){
     switch (type){
 
@@ -143,6 +163,11 @@ std::unique_ptr<SparseBinaryMatrix_IB> make_SparseBinaryMatrix(BinaryMatrixType
     case BinaryMatrixType::i64x8_x64_SSE42:
         return make_SparseBinaryMatrix_64x8_x64_SSE42();
 #endif
+#elif PA_ARCH_arm64
+#ifdef PA_AutoDispatch_arm64_20_M1
+    case BinaryMatrixType::arm64x8_x64_NEON:
+        return make_SparseBinaryMatrix_64x8_arm64_NEON();
+#endif
 #endif
 
     case BinaryMatrixType::i64x8_Default:
@@ -169,6 +194,11 @@ std::unique_ptr<SparseBinaryMatrix_IB> make_SparseBinaryMatrix(BinaryMatrixType
     case BinaryMatrixType::i64x8_x64_SSE42:
         return make_SparseBinaryMatrix_64x8_x64_SSE42(width, height);
 #endif
+#elif PA_ARCH_arm64
+#ifdef PA_AutoDispatch_arm64_20_M1
+    case BinaryMatrixType::arm64x8_x64_NEON:
+        return make_SparseBinaryMatrix_64x8_arm64_NEON(width, height);
+#endif
 #endif
 
     case BinaryMatrixType::i64x8_Default:
diff --git a/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix.h b/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix.h
index 76090fba58..10d09affbe 100644
--- a/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix.h
+++ b/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix.h
@@ -1,6 +1,6 @@
 /*  Binary Matrix
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  *  This class represents a memory-efficient binary matrix where each bit
  *  is stored as just one bit in memory.
@@ -11,9 +11,52 @@
  *
  *  This class is mainly used by the Waterfill algorithm which needs vertical
  *  locality in memory.
- *
+ * 
  */
 
+//  Folder structure:
+//  - Kernels_BinaryMatrix.h:
+//    Defines BinaryMatrixType, PackedBinaryMatrix_IB, SparseBinaryMatrix_IB and declares the basic functions to get/create them.
+//    PackedBinaryMatrix_IB and SparseBinaryMatrix_IB are abstract base classes (ABCs) with no function definitions.
+//
+//  - Kernels_BinaryMatrix.cpp:
+//    Defines the basic functions to create BinaryMatrixType and the two matrices.
+//    Note the matrix creation functions are large switch-case code based on CPU architecture. In each case, it calls the
+//    functinos like make_PackedBinaryMatrix_<row>>x<col>_<cpu_arch>() which do the actual work. Those architecture-specific
+//    functions are defined in Kernels_BinaryMatrix_Core_<cpu_arch>.cpp.
+//
+//  - Kernels_BinaryMatrix_t.h:
+//    Defines PackedBinaryMatrix_t and SparseBinaryMatrix_t: template classes that implement the ABCs defined in
+//    Kernels_BinaryMatrix.h.
+//    The template parameter is Tile, an architecture-specific class that handles SIMD operations on a tile of the matrix content.
+//    The template classes are just wrappers of PackedBinaryMatrixCore<Tile> and SparseBinaryMatrixCore<Tile> defined in
+//    Kernels_PackedBinaryMatrixCore.h and Kernels_SparseBinaryMatrixCore.h, which host the actual implementation of matrix
+//    functions.
+//
+//  - Kernels_PackedBinaryMatrixCore.h:
+//    Defines PackedBinaryMatrixCore<Tile> wrapped by PackedBinaryMatrix_t. The native code in PackedBinaryMatrixCore is
+//    architecture-agnostic. It relies on the template parameter Tile for architecture-specific code.
+//    The Tiles are difined in Kernels_BinaryMatrix_Tile_<row>x<col>_<cpu_arch>.h.
+//
+//  - Kernels_PackedBinaryMatrixCore.tpp:
+//    Defines the functions in PackedBinaryMatrixCore<Tile>.
+//
+//  - Kernels_SparseBinaryMatrixCore.h, Kernels_SparseBinaryMatrixCore.tpp:
+//    Same to Kernels_PackedBinaryMatrixCore.h and Kernels_PackedBinaryMatrixCore.tpp but for SparseBinaryMatrixCore<Tile>.
+//
+//  - Kernels_BinaryMatrix_Arch_<row>x<col>_<cpu_arch>.h:
+//    Defines aliases for PackedBinaryMatrix_t<Tile> and PackedBinaryMatrixCore<Tile> so they are easier to use.
+//    e.g. PackedBinaryMatrix_t<BinaryTile_<row>x<col>_<cpu_arch>> is defined as PackedBinaryMatrix_<row>x<col>_<cpu_arch>.
+//
+//  - Kernels_BinaryMatrix_Core_<cpu_arch>.cpp:
+//    Defines the boiler-plate functions of creating architecture-specific matrices, needed by Kernels_BinaryMatrix.cpp.
+//    Those functions just call the constructors of the architecture-specific template classes e.g.
+//    PackedBinaryMatrix_<row>x<col>_<cpu_arch>.
+//
+//  - Kernels_BinaryMatrixTile_<row>x<col>_<cpu_arch>.h:
+//    The implementation of the architecture-specific tile class BinaryTile_<row>x<col>_<cpu_arch> used as template parameter
+//    of Kernels_Packed/SparseBinaryMatrixCore<> and Packed/SparseBinaryMatrix_t<>
+
 #ifndef PokemonAutomation_Kernels_PackedBinaryMatrix_H
 #define PokemonAutomation_Kernels_PackedBinaryMatrix_H
 
@@ -27,12 +70,20 @@ namespace Kernels{
 // The shape of the tile is associated with what CPU feature to use.
 // For example, for AVX2 feature, the optimized shape is 64x16.
 enum class BinaryMatrixType{
+    // Default impl. with no SIMD intrinsics, tile size 64-bit width x 4-bit height
     i64x4_Default,
+    // Default impl. with no SIMD intrinsics, tile size 64-bit width x 8-bit height
     i64x8_Default,
+    // Use Intel SSE4.2, tile size 64-bit width x 8-bit height
     i64x8_x64_SSE42,
+    // Use Intel AVX 2, tile size 64-bit width x 16-bit height
     i64x16_x64_AVX2,
+    // Use Intel AVX 512, tile size 64-bit width x 64-bit height
     i64x64_x64_AVX512,
+    // Use Intel AVX 512, tile size 64-bit width x 32-bit height
     i64x32_x64_AVX512,
+    // Use Arm NEON, tile size 64-bit width x 8-bit height
+    arm64x8_x64_NEON,
 };
 
 // Get the current active binary matrix type that will be used or is being used
@@ -73,8 +124,12 @@ class PackedBinaryMatrix_IB{
     virtual void operator|=(const PackedBinaryMatrix_IB& x) = 0;
     virtual void operator&=(const PackedBinaryMatrix_IB& x) = 0;
 
+    // Print entire binary matrix as 0s and 1s. Rows are ended with "\n".
     virtual std::string dump() const = 0;
+    // Print part of max as 0s and 1s. Rows are ended with "\n".
     virtual std::string dump(size_t min_x, size_t min_y, size_t max_x, size_t max_y) const = 0;
+    // Print all the underlying tiles that form this binary matrix. The result is a matrix that may be larger
+    // than the original matrix.
     virtual std::string dump_tiles() const = 0;
 
 public:
diff --git a/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrixTile_64x16_x64_AVX2.h b/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrixTile_64x16_x64_AVX2.h
index edadd73f2f..26938619d0 100644
--- a/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrixTile_64x16_x64_AVX2.h
+++ b/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrixTile_64x16_x64_AVX2.h
@@ -1,6 +1,6 @@
 /*  Binary Matrix Tile (x64 AVX2)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrixTile_64x32_x64_AVX512.h b/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrixTile_64x32_x64_AVX512.h
index f78c665baa..887b557d13 100644
--- a/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrixTile_64x32_x64_AVX512.h
+++ b/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrixTile_64x32_x64_AVX512.h
@@ -1,6 +1,6 @@
 /*  Binary Matrix Tile (x64 AVX512)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -182,10 +182,10 @@ struct BinaryTile_64x32_x64_AVX512{
                 _mm512_setr_epi64(32, 31, 30, 29, 28, 27, 26, 25),
                 _mm512_set1_epi64(shift_y)
             );
-            __m512i r0 = _mm512_maskz_load_epi64(mask, (const int64_t*)(src + shift_y));
+            __m512i r0 = _mm512_maskz_loadu_epi64(mask, (const int64_t*)(src + shift_y));
             r0 = _mm512_srlv_epi64(r0, shift);
-            r0 = _mm512_or_si512(r0, _mm512_load_si512((__m256i*)dest));
-            _mm512_store_si512((__m256i*)dest, r0);
+            r0 = _mm512_or_si512(r0, _mm512_load_si512((__m512i*)dest));
+            _mm512_store_si512((__m512i*)dest, r0);
         }
     }
     void copy_to_shift_np(BinaryTile_64x32_x64_AVX512& tile, size_t shift_x, size_t shift_y) const{
@@ -206,10 +206,10 @@ struct BinaryTile_64x32_x64_AVX512{
                 _mm512_setr_epi64(32, 31, 30, 29, 28, 27, 26, 25),
                 _mm512_set1_epi64(shift_y)
             );
-            __m512i r0 = _mm512_maskz_load_epi64(mask, (const int64_t*)(src + shift_y));
+            __m512i r0 = _mm512_maskz_loadu_epi64(mask, (const int64_t*)(src + shift_y));
             r0 = _mm512_sllv_epi64(r0, shift);
-            r0 = _mm512_or_si512(r0, _mm512_load_si512((__m256i*)dest));
-            _mm512_store_si512((__m256i*)dest, r0);
+            r0 = _mm512_or_si512(r0, _mm512_load_si512((__m512i*)dest));
+            _mm512_store_si512((__m512i*)dest, r0);
         }
     }
     void copy_to_shift_pn(BinaryTile_64x32_x64_AVX512& tile, size_t shift_x, size_t shift_y) const{
@@ -225,7 +225,7 @@ struct BinaryTile_64x32_x64_AVX512{
                 _mm512_set1_epi64(align),
                 _mm512_setr_epi64(7, 6, 5, 4, 3, 2, 1, 0)
             );
-            __m512i r0 = _mm512_maskz_load_epi64(mask, (const int64_t*)src);
+            __m512i r0 = _mm512_maskz_loadu_epi64(mask, (const int64_t*)src);
             r0 = _mm512_srlv_epi64(r0, shift);
             r0 = _mm512_or_si512(r0, _mm512_load_si512((__m512i*)(dest + shift_y)));
             _mm512_store_si512((__m512i*)(dest + shift_y), r0);
@@ -254,7 +254,7 @@ struct BinaryTile_64x32_x64_AVX512{
                 _mm512_set1_epi64(align),
                 _mm512_setr_epi64(7, 6, 5, 4, 3, 2, 1, 0)
             );
-            __m512i r0 = _mm512_maskz_load_epi64(mask, (const int64_t*)src);
+            __m512i r0 = _mm512_maskz_loadu_epi64(mask, (const int64_t*)src);
             r0 = _mm512_sllv_epi64(r0, shift);
             r0 = _mm512_or_si512(r0, _mm512_load_si512((__m512i*)(dest + shift_y)));
             _mm512_store_si512((__m512i*)(dest + shift_y), r0);
diff --git a/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrixTile_64x4_Default.h b/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrixTile_64x4_Default.h
index 78729f82b4..cc8f16e0d0 100644
--- a/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrixTile_64x4_Default.h
+++ b/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrixTile_64x4_Default.h
@@ -1,6 +1,6 @@
 /*  Binary Matrix Tile (Default)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrixTile_64x64_x64_AVX512.h b/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrixTile_64x64_x64_AVX512.h
index 0b21877253..8fbeedc1f9 100644
--- a/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrixTile_64x64_x64_AVX512.h
+++ b/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrixTile_64x64_x64_AVX512.h
@@ -1,6 +1,6 @@
 /*  Binary Matrix Tile (x64 AVX512)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -218,10 +218,10 @@ struct BinaryTile_64x64_x64_AVX512{
                 _mm512_setr_epi64(64, 63, 62, 61, 60, 59, 58, 57),
                 _mm512_set1_epi64(shift_y)
             );
-            __m512i r0 = _mm512_maskz_load_epi64(mask, (const int64_t*)(src + shift_y));
+            __m512i r0 = _mm512_maskz_loadu_epi64(mask, (const int64_t*)(src + shift_y));
             r0 = _mm512_srlv_epi64(r0, shift);
-            r0 = _mm512_or_si512(r0, _mm512_load_si512((__m256i*)dest));
-            _mm512_store_si512((__m256i*)dest, r0);
+            r0 = _mm512_or_si512(r0, _mm512_load_si512((__m512i*)dest));
+            _mm512_store_si512((__m512i*)dest, r0);
         }
     }
     void copy_to_shift_np(BinaryTile_64x64_x64_AVX512& tile, size_t shift_x, size_t shift_y) const{
@@ -242,10 +242,10 @@ struct BinaryTile_64x64_x64_AVX512{
                 _mm512_setr_epi64(64, 63, 62, 61, 60, 59, 58, 57),
                 _mm512_set1_epi64(shift_y)
             );
-            __m512i r0 = _mm512_maskz_load_epi64(mask, (const int64_t*)(src + shift_y));
+            __m512i r0 = _mm512_maskz_loadu_epi64(mask, (const int64_t*)(src + shift_y));
             r0 = _mm512_sllv_epi64(r0, shift);
-            r0 = _mm512_or_si512(r0, _mm512_load_si512((__m256i*)dest));
-            _mm512_store_si512((__m256i*)dest, r0);
+            r0 = _mm512_or_si512(r0, _mm512_load_si512((__m512i*)dest));
+            _mm512_store_si512((__m512i*)dest, r0);
         }
     }
     void copy_to_shift_pn(BinaryTile_64x64_x64_AVX512& tile, size_t shift_x, size_t shift_y) const{
@@ -261,7 +261,7 @@ struct BinaryTile_64x64_x64_AVX512{
                 _mm512_set1_epi64(align),
                 _mm512_setr_epi64(7, 6, 5, 4, 3, 2, 1, 0)
             );
-            __m512i r0 = _mm512_maskz_load_epi64(mask, (const int64_t*)src);
+            __m512i r0 = _mm512_maskz_loadu_epi64(mask, (const int64_t*)src);
             r0 = _mm512_srlv_epi64(r0, shift);
             r0 = _mm512_or_si512(r0, _mm512_load_si512((__m512i*)(dest + shift_y)));
             _mm512_store_si512((__m512i*)(dest + shift_y), r0);
@@ -290,7 +290,7 @@ struct BinaryTile_64x64_x64_AVX512{
                 _mm512_set1_epi64(align),
                 _mm512_setr_epi64(7, 6, 5, 4, 3, 2, 1, 0)
             );
-            __m512i r0 = _mm512_maskz_load_epi64(mask, (const int64_t*)src);
+            __m512i r0 = _mm512_maskz_loadu_epi64(mask, (const int64_t*)src);
             r0 = _mm512_sllv_epi64(r0, shift);
             r0 = _mm512_or_si512(r0, _mm512_load_si512((__m512i*)(dest + shift_y)));
             _mm512_store_si512((__m512i*)(dest + shift_y), r0);
diff --git a/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrixTile_64x8_arm64_NEON.h b/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrixTile_64x8_arm64_NEON.h
new file mode 100644
index 0000000000..a7d092b40f
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrixTile_64x8_arm64_NEON.h
@@ -0,0 +1,304 @@
+/*  Binary Matrix Tile (arm64 NEON)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Kernels_BinaryMatrixTile_64x8_arm64_NEON_H
+#define PokemonAutomation_Kernels_BinaryMatrixTile_64x8_arm64_NEON_H
+
+#include <arm_neon.h>
+#include "Common/Compiler.h"
+#include "Kernels_BinaryMatrixTile_Debugging.h"
+#include "Kernels_BinaryMatrix.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace Kernels{
+
+
+struct BinaryTile_64x8_arm64_NEON{
+    static constexpr BinaryMatrixType TYPE = BinaryMatrixType::arm64x8_x64_NEON;
+    static constexpr size_t WIDTH = 64;
+    static constexpr size_t HEIGHT = 8;
+
+    uint64x2x4_t vec;
+
+public:
+    PA_FORCE_INLINE BinaryTile_64x8_arm64_NEON(){
+        set_zero();
+    }
+    PA_FORCE_INLINE BinaryTile_64x8_arm64_NEON(const BinaryTile_64x8_arm64_NEON& x){
+        vec.val[0] = x.vec.val[0];
+        vec.val[1] = x.vec.val[1];
+        vec.val[2] = x.vec.val[2];
+        vec.val[3] = x.vec.val[3];
+    }
+    PA_FORCE_INLINE void operator=(const BinaryTile_64x8_arm64_NEON& x){
+        vec.val[0] = x.vec.val[0];
+        vec.val[1] = x.vec.val[1];
+        vec.val[2] = x.vec.val[2];
+        vec.val[3] = x.vec.val[3];
+    }
+
+
+public:
+    PA_FORCE_INLINE void set_zero(){
+        vec.val[0] = vreinterpretq_u64_u8(vdupq_n_u8(0));
+        vec.val[1] = vreinterpretq_u64_u8(vdupq_n_u8(0));
+        vec.val[2] = vreinterpretq_u64_u8(vdupq_n_u8(0));
+        vec.val[3] = vreinterpretq_u64_u8(vdupq_n_u8(0));
+    }
+    PA_FORCE_INLINE void set_ones(){
+        vec.val[0] = vreinterpretq_u64_u8(vdupq_n_u8(0xff));
+        vec.val[1] = vreinterpretq_u64_u8(vdupq_n_u8(0xff));
+        vec.val[2] = vreinterpretq_u64_u8(vdupq_n_u8(0xff));
+        vec.val[3] = vreinterpretq_u64_u8(vdupq_n_u8(0xff));
+    }
+    // Set a tile with partial 1 bits. The 1-bits are in a sub-block (0, 0, width, height).
+    // The rest of the tile is filled with 0 bits.
+    PA_FORCE_INLINE void set_ones(size_t width, size_t height){
+        uint64x2_t word = vdupq_n_u64(
+            width < 64
+                ? ((uint64_t)1 << width) - 1
+                : 0xffffffffffffffff
+        );
+        uint64x2_t vheight = vdupq_n_u64(height);
+        uint64x2_t mask;
+        // If height > (0, 1)
+        mask = vcgtq_u64(vheight, vcombine_u64(vcreate_u64(0), vcreate_u64(1))); // low, high
+        vec.val[0] = vandq_u64(mask, word);
+        // If height > (2, 3)
+        mask = vcgtq_u64(vheight, vcombine_u64(vcreate_u64(2), vcreate_u64(3))); // low, high
+        vec.val[1] = vandq_u64(mask, word);
+        // If height > (4, 5)
+        mask = vcgtq_u64(vheight, vcombine_u64(vcreate_u64(4), vcreate_u64(5))); // low, high
+        vec.val[2] = vandq_u64(mask, word);
+        // If height > (6, 7)
+        mask = vcgtq_u64(vheight, vcombine_u64(vcreate_u64(6), vcreate_u64(7))); // low, high
+        vec.val[3] = vandq_u64(mask, word);
+    }
+    // Retain the tile content in sub-block (0, 0, width, height), clear the rest with 0 bits.
+    PA_FORCE_INLINE void clear_padding(size_t width, size_t height){
+        uint64x2_t word = vdupq_n_u64(
+            width < 64
+                ? ((uint64_t)1 << width) - 1
+                : 0xffffffffffffffff
+        );
+        uint64x2_t vheight = vdupq_n_u64(height);
+        uint64x2_t mask;
+        // If height > (0, 1)
+        mask = vcgtq_u64(vheight, vcombine_u64(vcreate_u64(0), vcreate_u64(1))); // low, high
+        vec.val[0] = vandq_u64(vec.val[0], vandq_u64(mask, word));
+        // If height > (2, 3)
+        mask = vcgtq_u64(vheight, vcombine_u64(vcreate_u64(2), vcreate_u64(3))); // low, high
+        vec.val[1] = vandq_u64(vec.val[1], vandq_u64(mask, word));
+        // If height > (4, 5)
+        mask = vcgtq_u64(vheight, vcombine_u64(vcreate_u64(4), vcreate_u64(5))); // low, high
+        vec.val[2] = vandq_u64(vec.val[2], vandq_u64(mask, word));
+        // If height > (6, 7)
+        mask = vcgtq_u64(vheight, vcombine_u64(vcreate_u64(6), vcreate_u64(7))); // low, high
+        vec.val[3] = vandq_u64(vec.val[3], vandq_u64(mask, word));
+    }
+    // Invert all bits by logical XOR with all 1 bits
+    PA_FORCE_INLINE void invert(){
+        vec.val[0] = veorq_u64(vec.val[0], vreinterpretq_u64_u8(vdupq_n_u8(0xff)));
+        vec.val[1] = veorq_u64(vec.val[1], vreinterpretq_u64_u8(vdupq_n_u8(0xff)));
+        vec.val[2] = veorq_u64(vec.val[2], vreinterpretq_u64_u8(vdupq_n_u8(0xff)));
+        vec.val[3] = veorq_u64(vec.val[3], vreinterpretq_u64_u8(vdupq_n_u8(0xff)));
+    }
+    // logical XOR assign
+    PA_FORCE_INLINE void operator^=(const BinaryTile_64x8_arm64_NEON& x){
+        vec.val[0] = veorq_u64(vec.val[0], x.vec.val[0]);
+        vec.val[1] = veorq_u64(vec.val[1], x.vec.val[1]);
+        vec.val[2] = veorq_u64(vec.val[2], x.vec.val[2]);
+        vec.val[3] = veorq_u64(vec.val[3], x.vec.val[3]);
+    }
+    // logical OR assign
+    PA_FORCE_INLINE void operator|=(const BinaryTile_64x8_arm64_NEON& x){
+        vec.val[0] = vorrq_u64(vec.val[0], x.vec.val[0]);
+        vec.val[1] = vorrq_u64(vec.val[1], x.vec.val[1]);
+        vec.val[2] = vorrq_u64(vec.val[2], x.vec.val[2]);
+        vec.val[3] = vorrq_u64(vec.val[3], x.vec.val[3]);
+    }
+    // logical AND assign
+    PA_FORCE_INLINE void operator&=(const BinaryTile_64x8_arm64_NEON& x){
+        vec.val[0] = vandq_u64(vec.val[0], x.vec.val[0]);
+        vec.val[1] = vandq_u64(vec.val[1], x.vec.val[1]);
+        vec.val[2] = vandq_u64(vec.val[2], x.vec.val[2]);
+        vec.val[3] = vandq_u64(vec.val[3], x.vec.val[3]);
+    }
+    // this = (NOT x) AND this
+    PA_FORCE_INLINE void andnot(const BinaryTile_64x8_arm64_NEON& x){
+        // vbicq_u64(a, b): a AND (NOT b)
+        vec.val[0] = vbicq_u64(vec.val[0], x.vec.val[0]);
+        vec.val[1] = vbicq_u64(vec.val[1], x.vec.val[1]);
+        vec.val[2] = vbicq_u64(vec.val[2], x.vec.val[2]);
+        vec.val[3] = vbicq_u64(vec.val[3], x.vec.val[3]);
+    }
+
+
+public:
+    PA_FORCE_INLINE uint64_t top() const{
+        return vec.val[0][0];
+    }
+    PA_FORCE_INLINE uint64_t& top(){
+        return ((uint64_t*)&vec.val[0])[0];
+    }
+    PA_FORCE_INLINE uint64_t bottom() const{
+        return vec.val[3][1];
+    }
+    PA_FORCE_INLINE uint64_t& bottom(){
+        return ((uint64_t*)&vec.val[3])[1];
+    }
+
+    PA_FORCE_INLINE uint64_t row(size_t index) const{
+        return vec.val[index/2][index%2];
+    }
+    PA_FORCE_INLINE uint64_t& row(size_t index){
+        return ((uint64_t*)&vec.val[index/2])[index%2];
+    }
+
+    // Slow function: get bit at coordinate (x, y), x: [0, width), y: [0, height)
+    bool get_bit(size_t x, size_t y) const{
+        return (row(y) >> x) & 1;
+    }
+    // Slow function: set bit at coordinate (x, y), x: [0, width), y: [0, height)
+    void set_bit(size_t x, size_t y){
+        row(y) |= (uint64_t)1 << x;
+    }
+    void set_bit(size_t x, size_t y, bool set){
+        uint64_t bit = (uint64_t)(set ? 1 : 0) << x;
+        uint64_t mask = (uint64_t)1 << x;
+        uint64_t& word = row(y);
+        word = (word & ~mask) | bit;
+    }
+
+    std::string dump() const{
+        std::string str;
+        for (size_t c = 0; c < 8; c++){
+            str += dump64(row(c)) + "\n";
+        }
+        return str;
+    }
+
+
+public:
+    // Copy part of this tile into `tile` while applying the specified shifts.
+    // These are used to implement submatrix extraction where the desired
+    // sub-matrix may have arbitrary shift and alignment.
+    // The area covered by `tile` on the image is (+shift_x, +shift_y) from the area of this tile.
+    //
+    // The suffix "_pp" stands for positive (x), positive (y).
+    // The shifted values are first performend a logical OR with the values in `tile` before assigned to `tile`.
+    // In this way the operation does not damage other un-assigned regions on `tile`.
+    void copy_to_shift_pp(BinaryTile_64x8_arm64_NEON& tile, size_t shift_x, size_t shift_y) const{
+        int64x2_t neg_shift_x_u64x2 = vmovq_n_s64(-(int64_t)shift_x);
+        const uint64_t* src = (const uint64_t*)&vec;
+        uint64_t* dest = (uint64_t*)&tile.vec;
+        while (shift_y < 7){
+            uint64x2_t row_64x2 = vld1q_u64(src + shift_y);
+            // NEON only has left shift with a variable. So have to left shift by a negative value
+            // to create right shift.
+            row_64x2 = vshlq_u64(row_64x2, neg_shift_x_u64x2);
+            row_64x2 = vorrq_u64(row_64x2, vld1q_u64(dest));
+            vst1q_u64(dest, row_64x2);
+            dest += 2;
+            shift_y += 2;
+        }
+        if (shift_y < 8){
+            dest[0] |= src[shift_y] >> shift_x;
+        }
+    }
+    // Copy part of this tile into `tile` while applying the specified shifts.
+    // These are used to implement submatrix extraction where the desired
+    // sub-matrix may have arbitrary shift and alignment.
+    // The area covered by `tile` on the image is (-shift_x, +shift_y) from the area of this tile.
+    //
+    // The suffix "_np" stands for negative (x), positive (y).
+    // The shifted values are first performend a logical OR with the values in `tile` before assigned to `tile`.
+    // In this way it the operation does not damage other un-assigned regions on `tile`.
+    void copy_to_shift_np(BinaryTile_64x8_arm64_NEON& tile, size_t shift_x, size_t shift_y) const{
+        int64x2_t shift_x_s64x2 = vreinterpretq_s64_u64(vdupq_n_u64(shift_x));
+        const uint64_t* src = (const uint64_t*)&vec;
+        uint64_t* dest = (uint64_t*)&tile.vec;
+        while (shift_y < 7){
+            uint64x2_t row_64x2 = vld1q_u64(src + shift_y);
+            // left shift
+            row_64x2 = vshlq_u64(row_64x2, shift_x_s64x2);
+            row_64x2 = vorrq_u64(row_64x2, vld1q_u64(dest));
+            vst1q_u64(dest, row_64x2);
+            dest += 2;
+            shift_y += 2;
+        }
+        if (shift_y < 8){
+            dest[0] |= src[shift_y] << shift_x;
+        }
+    }
+    // Copy part of this tile into `tile` while applying the specified shifts.
+    // These are used to implement submatrix extraction where the desired
+    // sub-matrix may have arbitrary shift and alignment.
+    // The area covered by `tile` on the image is (+shift_x, -shift_y) from the area of this tile.
+    //
+    // The suffix "_pn" stands for positive (x), negative (y).
+    // The shifted values are first performend a logical OR with the values in `tile` before assigned to `tile`.
+    // In this way it the operation does not damage other un-assigned regions on `tile`.
+    void copy_to_shift_pn(BinaryTile_64x8_arm64_NEON& tile, size_t shift_x, size_t shift_y) const{
+        int64x2_t neg_shift_x_u64x2 = vmovq_n_s64(-(int64_t)shift_x);
+        const uint64_t* src = (const uint64_t*)&vec;
+        uint64_t* dest = (uint64_t*)&tile.vec;
+        if (shift_y & 1){
+            dest[shift_y] |= src[0] >> shift_x;
+            src++;
+            shift_y++;
+        }
+        while (shift_y < 8){
+            uint64x2_t row_64x2 = vld1q_u64(src);
+            // NEON only has left shift with a variable. So have to left shift by a negative value
+            // to create right shift.
+            row_64x2 = vshlq_u64(row_64x2, neg_shift_x_u64x2);
+            row_64x2 = vorrq_u64(row_64x2, vld1q_u64(dest + shift_y));
+            vst1q_u64((dest + shift_y), row_64x2);
+            src += 2;
+            shift_y += 2;
+        }
+    }
+    // Copy part of this tile into `tile` while applying the specified shifts.
+    // These are used to implement submatrix extraction where the desired
+    // sub-matrix may have arbitrary shift and alignment.
+    // The area covered by `tile` on the image is (-shift_x, -shift_y) from the area of this tile.
+    //
+    // The suffix "_nn" stands for negative (x), negative (y).
+    // The shifted values are first performend a logical OR with the values in `tile` before assigned to `tile`.
+    // In this way it the operation does not damage other un-assigned regions on `tile`.
+    void copy_to_shift_nn(BinaryTile_64x8_arm64_NEON& tile, size_t shift_x, size_t shift_y) const{
+        int64x2_t shift_x_s64x2 = vreinterpretq_s64_u64(vdupq_n_u64(shift_x));
+        const uint64_t* src = (const uint64_t*)&vec;
+        uint64_t* dest = (uint64_t*)&tile.vec;
+        if (shift_y & 1){
+            dest[shift_y] |= src[0] << shift_x;
+            src++;
+            shift_y++;
+        }
+        while (shift_y < 8){
+            uint64x2_t row_64x2 = vld1q_u64(src);
+            // left shift
+            row_64x2 = vshlq_u64(row_64x2, shift_x_s64x2);
+            row_64x2 = vorrq_u64(row_64x2, vld1q_u64(dest + shift_y));
+            vst1q_u64((dest + shift_y), row_64x2);
+            src += 2;
+            shift_y += 2;
+        }
+    }
+};
+
+
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrixTile_64x8_x64_SSE42.h b/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrixTile_64x8_x64_SSE42.h
index 0ff670cd7e..a6bf6c28ff 100644
--- a/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrixTile_64x8_x64_SSE42.h
+++ b/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrixTile_64x8_x64_SSE42.h
@@ -1,6 +1,6 @@
 /*  Binary Matrix Tile (x64 SSE4.2)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrixTile_64xH_Default.h b/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrixTile_64xH_Default.h
index 1757c14e19..5068fa7213 100644
--- a/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrixTile_64xH_Default.h
+++ b/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrixTile_64xH_Default.h
@@ -1,6 +1,6 @@
 /*  Binary Matrix Tile (Default)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrixTile_Debugging.h b/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrixTile_Debugging.h
index f74cd99396..fd0b99f01d 100644
--- a/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrixTile_Debugging.h
+++ b/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrixTile_Debugging.h
@@ -1,15 +1,16 @@
 /*  Binary Matrix Tile Debugging
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifndef PokemonAutomation_Kernels_BinaryMatrixTile_Debugging_H
 #define PokemonAutomation_Kernels_BinaryMatrixTile_Debugging_H
 
+#include <cstdint>
 #include <string>
-
 #include <iostream>
+
 using std::cout;
 using std::endl;
 
@@ -18,9 +19,9 @@ namespace Kernels{
 
 
 inline std::string dump64(uint64_t x){
-    std::string str;
+    std::string str(64, 0);
     for (size_t c = 0; c < 64; c++){
-        str += ((x >> c) & 1) ? "1" : "0";
+        str[c] = ((x >> c) & 1) ? '1' : '0';
     }
     return str;
 }
diff --git a/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Arch_64x16_x64_AVX2.h b/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Arch_64x16_x64_AVX2.h
index 1262fcbd28..abba220394 100644
--- a/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Arch_64x16_x64_AVX2.h
+++ b/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Arch_64x16_x64_AVX2.h
@@ -1,6 +1,6 @@
 /*  Binary Matrix (x64 AVX2)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Arch_64x32_x64_AVX512.h b/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Arch_64x32_x64_AVX512.h
index 1823e195f5..30c3a75a1b 100644
--- a/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Arch_64x32_x64_AVX512.h
+++ b/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Arch_64x32_x64_AVX512.h
@@ -1,6 +1,6 @@
 /*  Binary Matrix (x64 AVX512)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Arch_64x64_x64_AVX512.h b/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Arch_64x64_x64_AVX512.h
index ff1236cfac..510c2c35ca 100644
--- a/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Arch_64x64_x64_AVX512.h
+++ b/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Arch_64x64_x64_AVX512.h
@@ -1,6 +1,6 @@
 /*  Binary Matrix (x64 AVX512)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Arch_64x8_arm64_NEON.h b/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Arch_64x8_arm64_NEON.h
new file mode 100644
index 0000000000..d20344971e
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Arch_64x8_arm64_NEON.h
@@ -0,0 +1,29 @@
+/*  Binary Matrix (arm64 NEON)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Kernels_BinaryMatrix_Arch_arm64_NEON_H
+#define PokemonAutomation_Kernels_BinaryMatrix_Arch_arm64_NEON_H
+
+#include "Kernels_BinaryMatrixTile_64x8_arm64_NEON.h"
+#include "Kernels_BinaryMatrix_t.h"
+#include "Kernels_PackedBinaryMatrixCore.h"
+#include "Kernels_SparseBinaryMatrixCore.h"
+
+namespace PokemonAutomation{
+namespace Kernels{
+
+
+using PackedBinaryMatrixCore_64x8_arm64_NEON = PackedBinaryMatrixCore<BinaryTile_64x8_arm64_NEON>;
+using SparseBinaryMatrixCore_64x8_arm64_NEON = SparseBinaryMatrixCore<BinaryTile_64x8_arm64_NEON>;
+
+using PackedBinaryMatrix_64x8_arm64_NEON = PackedBinaryMatrix_t<BinaryTile_64x8_arm64_NEON>;
+using SparseBinaryMatrix_64x8_arm64_NEON = SparseBinaryMatrix_t<BinaryTile_64x8_arm64_NEON>;
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Arch_64x8_x64_SSE42.h b/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Arch_64x8_x64_SSE42.h
index 77273537b0..1131d14e69 100644
--- a/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Arch_64x8_x64_SSE42.h
+++ b/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Arch_64x8_x64_SSE42.h
@@ -1,6 +1,6 @@
 /*  Binary Matrix (x64 SSE4.2)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Arch_64xH_Default.h b/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Arch_64xH_Default.h
index 29a991d108..2bc2a9df7f 100644
--- a/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Arch_64xH_Default.h
+++ b/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Arch_64xH_Default.h
@@ -1,6 +1,6 @@
 /*  Binary Matrix (Default)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Core_64x16_x64_AVX2.cpp b/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Core_64x16_x64_AVX2.cpp
index 1b293c9cff..20c9518905 100644
--- a/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Core_64x16_x64_AVX2.cpp
+++ b/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Core_64x16_x64_AVX2.cpp
@@ -1,6 +1,6 @@
 /*  Binary Matrix (x64 AVX2)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Core_64x32_x64_AVX512.cpp b/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Core_64x32_x64_AVX512.cpp
index b3c229eb61..7120b8128f 100644
--- a/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Core_64x32_x64_AVX512.cpp
+++ b/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Core_64x32_x64_AVX512.cpp
@@ -1,6 +1,6 @@
 /*  Binary Matrix (x64 AVX512)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Core_64x64_x64_AVX512.cpp b/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Core_64x64_x64_AVX512.cpp
index 8a723779cc..e3b350a48b 100644
--- a/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Core_64x64_x64_AVX512.cpp
+++ b/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Core_64x64_x64_AVX512.cpp
@@ -1,6 +1,6 @@
 /*  Binary Matrix (x64 AVX512)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Core_64x8_x64_SSE42.cpp b/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Core_64x8_x64_SSE42.cpp
index 7f3d1d0811..6361daacc1 100644
--- a/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Core_64x8_x64_SSE42.cpp
+++ b/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Core_64x8_x64_SSE42.cpp
@@ -1,6 +1,6 @@
 /*  Binary Matrix (x64 SSE4.2)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Core_64xH_Default.cpp b/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Core_64xH_Default.cpp
index b17f79fac1..89f4ea1b8a 100644
--- a/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Core_64xH_Default.cpp
+++ b/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Core_64xH_Default.cpp
@@ -1,6 +1,6 @@
 /*  Binary Matrix (Default)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Core_arm64_NEON.cpp b/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Core_arm64_NEON.cpp
new file mode 100644
index 0000000000..e544f406cc
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Core_arm64_NEON.cpp
@@ -0,0 +1,41 @@
+/*  Binary Matrix (arm64 NEON)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifdef PA_AutoDispatch_arm64_20_M1
+
+#include "Kernels_PackedBinaryMatrixCore.tpp"
+#include "Kernels_SparseBinaryMatrixCore.tpp"
+#include "Kernels_BinaryMatrix_Arch_64x8_arm64_NEON.h"
+
+namespace PokemonAutomation{
+namespace Kernels{
+
+
+template class PackedBinaryMatrixCore<BinaryTile_64x8_arm64_NEON>;
+template class SparseBinaryMatrixCore<BinaryTile_64x8_arm64_NEON>;
+template class PackedBinaryMatrix_t<BinaryTile_64x8_arm64_NEON>;
+template class SparseBinaryMatrix_t<BinaryTile_64x8_arm64_NEON>;
+
+
+std::unique_ptr<PackedBinaryMatrix_IB> make_PackedBinaryMatrix_64x8_arm64_NEON(){
+    return std::make_unique<PackedBinaryMatrix_64x8_arm64_NEON>();
+}
+std::unique_ptr<PackedBinaryMatrix_IB> make_PackedBinaryMatrix_64x8_arm64_NEON(size_t width, size_t height){
+    return std::make_unique<PackedBinaryMatrix_64x8_arm64_NEON>(width, height);
+}
+
+std::unique_ptr<SparseBinaryMatrix_IB> make_SparseBinaryMatrix_64x8_arm64_NEON(){
+    return std::make_unique<SparseBinaryMatrix_64x8_arm64_NEON>(); 
+}
+std::unique_ptr<SparseBinaryMatrix_IB> make_SparseBinaryMatrix_64x8_arm64_NEON(size_t width, size_t height){
+    return std::make_unique<SparseBinaryMatrix_64x8_arm64_NEON>(width, height);
+}
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Core_x64_AVX2.cpp b/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Core_x64_AVX2.cpp
deleted file mode 100644
index b91e5dfd12..0000000000
--- a/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Core_x64_AVX2.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-/*  Binary Matrix (x64 AVX2)
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifdef PA_AutoDispatch_13_Haswell
-
-#include "Kernels_PackedBinaryMatrixCore.tpp"
-#include "Kernels_SparseBinaryMatrixCore.tpp"
-#include "Kernels_BinaryMatrix_Arch_x64_AVX2.h"
-
-namespace PokemonAutomation{
-namespace Kernels{
-
-
-template class PackedBinaryMatrixCore<BinaryTile_AVX2>;
-template class SparseBinaryMatrixCore<BinaryTile_AVX2>;
-template class PackedBinaryMatrix_t<BinaryTile_AVX2>;
-template class SparseBinaryMatrix_t<BinaryTile_AVX2>;
-
-
-std::unique_ptr<PackedBinaryMatrix_IB> make_PackedBinaryMatrix_x64_AVX2(){
-    return std::make_unique<PackedBinaryMatrix_x64_AVX2>();
-}
-std::unique_ptr<PackedBinaryMatrix_IB> make_PackedBinaryMatrix_x64_AVX2(size_t width, size_t height){
-    return std::make_unique<PackedBinaryMatrix_x64_AVX2>(width, height);
-}
-
-std::unique_ptr<SparseBinaryMatrix_IB> make_SparseBinaryMatrix_x64_AVX2(){
-    return std::make_unique<SparseBinaryMatrix_x64_AVX2>();
-}
-std::unique_ptr<SparseBinaryMatrix_IB> make_SparseBinaryMatrix_x64_AVX2(size_t width, size_t height){
-    return std::make_unique<SparseBinaryMatrix_x64_AVX2>(width, height);
-}
-
-
-
-}
-}
-#endif
diff --git a/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Core_x64_AVX512.cpp b/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Core_x64_AVX512.cpp
deleted file mode 100644
index 77b6d233b8..0000000000
--- a/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Core_x64_AVX512.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-/*  Binary Matrix (x64 AVX512)
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifdef PA_AutoDispatch_17_Skylake
-
-#include "Kernels_PackedBinaryMatrixCore.tpp"
-#include "Kernels_SparseBinaryMatrixCore.tpp"
-#include "Kernels_BinaryMatrix_Arch_x64_AVX512.h"
-
-namespace PokemonAutomation{
-namespace Kernels{
-
-
-template class PackedBinaryMatrixCore<BinaryTile_AVX512>;
-template class SparseBinaryMatrixCore<BinaryTile_AVX512>;
-template class PackedBinaryMatrix_t<BinaryTile_AVX512>;
-template class SparseBinaryMatrix_t<BinaryTile_AVX512>;
-
-
-std::unique_ptr<PackedBinaryMatrix_IB> make_PackedBinaryMatrix_x64_AVX512(){
-    return std::make_unique<PackedBinaryMatrix_x64_AVX512>();
-}
-std::unique_ptr<PackedBinaryMatrix_IB> make_PackedBinaryMatrix_x64_AVX512(size_t width, size_t height){
-    return std::make_unique<PackedBinaryMatrix_x64_AVX512>(width, height);
-}
-
-std::unique_ptr<SparseBinaryMatrix_IB> make_SparseBinaryMatrix_x64_AVX512(){
-    return std::make_unique<SparseBinaryMatrix_x64_AVX512>();
-}
-std::unique_ptr<SparseBinaryMatrix_IB> make_SparseBinaryMatrix_x64_AVX512(size_t width, size_t height){
-    return std::make_unique<SparseBinaryMatrix_x64_AVX512>(width, height);
-}
-
-
-}
-}
-#endif
diff --git a/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Core_x64_SSE42.cpp b/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Core_x64_SSE42.cpp
deleted file mode 100644
index 64f74c228b..0000000000
--- a/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Core_x64_SSE42.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-/*  Binary Matrix (x64 SSE4.2)
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifdef PA_AutoDispatch_08_Nehalem
-
-#include "Kernels_PackedBinaryMatrixCore.tpp"
-#include "Kernels_SparseBinaryMatrixCore.tpp"
-#include "Kernels_BinaryMatrix_Arch_x64_SSE42.h"
-
-namespace PokemonAutomation{
-namespace Kernels{
-
-
-template class PackedBinaryMatrixCore<BinaryTile_SSE42>;
-template class SparseBinaryMatrixCore<BinaryTile_SSE42>;
-template class PackedBinaryMatrix_t<BinaryTile_SSE42>;
-template class SparseBinaryMatrix_t<BinaryTile_SSE42>;
-
-
-std::unique_ptr<PackedBinaryMatrix_IB> make_PackedBinaryMatrix_x64_SSE42(){
-    return std::make_unique<PackedBinaryMatrix_x64_SSE42>();
-}
-std::unique_ptr<PackedBinaryMatrix_IB> make_PackedBinaryMatrix_x64_SSE42(size_t width, size_t height){
-    return std::make_unique<PackedBinaryMatrix_x64_SSE42>(width, height);
-}
-
-std::unique_ptr<SparseBinaryMatrix_IB> make_SparseBinaryMatrix_x64_SSE42(){
-    return std::make_unique<SparseBinaryMatrix_x64_SSE42>();
-}
-std::unique_ptr<SparseBinaryMatrix_IB> make_SparseBinaryMatrix_x64_SSE42(size_t width, size_t height){
-    return std::make_unique<SparseBinaryMatrix_x64_SSE42>(width, height);
-}
-
-
-
-}
-}
-#endif
diff --git a/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Tests.cpp b/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Tests.cpp
new file mode 100644
index 0000000000..91a8d484f7
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Tests.cpp
@@ -0,0 +1,572 @@
+/*  BinaryMatrix Tests
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <format>
+#include <iterator>
+#include <memory>
+#include <random>
+#include <vector>
+#include "Common/Cpp/CancellableScope.h"
+#include "Common/Cpp/CpuId/CpuId.h"
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters.h"
+#include "CommonFramework/ImageTypes/ImageRGB32.h"
+#include "Kernels_BinaryMatrixTile_64x4_Default.h"
+#ifdef PA_AutoDispatch_arm64_20_M1
+#include "Kernels/PartialWordAccess/Kernels_PartialWordAccess_arm64_NEON.h"
+#include "Kernels_BinaryMatrixTile_64x8_arm64_NEON.h"
+#endif
+#include "Tests/GuardPageImage.h"
+#include "Tests/ImageUnitTest.h"
+#include "Kernels_BinaryMatrix_Tests.h"
+
+namespace PokemonAutomation{
+namespace Kernels{
+
+
+namespace{
+
+//  Tile tests: check one binary matrix tile class against `get_bit()`. Only the tiles
+//  that compile with this file's default compiler flags are tested here: Default, and NEON
+//  on arm64. The x86 tiles need AVX2 or AVX512 flags. They are tested through the matrix
+//  tests below and the Waterfill tests.
+
+template <typename Tile>
+Tile random_tile(std::mt19937& generator){
+    Tile tile;
+    for (size_t y = 0; y < Tile::HEIGHT; y++){
+        for (size_t x = 0; x < Tile::WIDTH; x++){
+            tile.set_bit(x, y, generator() & 1);
+        }
+    }
+    return tile;
+}
+
+//  Compare each bit of `tile` with `expected_bit(x, y)`. Return a description of the first
+//  wrong bit, or an empty string if all bits are right.
+template <typename Tile, typename ExpectedBit>
+std::string find_wrong_tile_bit(const Tile& tile, ExpectedBit expected_bit){
+    for (size_t y = 0; y < Tile::HEIGHT; y++){
+        for (size_t x = 0; x < Tile::WIDTH; x++){
+            const bool expected = expected_bit(x, y);
+            if (tile.get_bit(x, y) != expected){
+                return std::format("tile bit ({}, {}) should be {}", x, y, (int)expected);
+            }
+        }
+    }
+    return "";
+}
+
+//  `set_ones(width, height)` sets the bits (x, y) with x < width and y < height, and clears
+//  the others. `clear_padding(width, height)` clears the other bits and keeps these.
+template <typename Tile>
+std::string check_tile_masks(std::mt19937& generator){
+    for (size_t height = 0; height <= Tile::HEIGHT; height++){
+        for (size_t width = 0; width <= Tile::WIDTH; width++){
+            auto inside = [=](size_t x, size_t y){
+                return x < width && y < height;
+            };
+
+            Tile tile = random_tile<Tile>(generator);
+            tile.set_ones(width, height);
+            std::string error = find_wrong_tile_bit(tile, inside);
+            if (!error.empty()){
+                return std::format("set_ones({}, {}): {}", width, height, error);
+            }
+
+            const Tile original = random_tile<Tile>(generator);
+            tile = original;
+            tile.clear_padding(width, height);
+            error = find_wrong_tile_bit(tile, [&](size_t x, size_t y){
+                return inside(x, y) && original.get_bit(x, y);
+            });
+            if (!error.empty()){
+                return std::format("clear_padding({}, {}): {}", width, height, error);
+            }
+        }
+    }
+    return "";
+}
+
+//  `invert()`, `^=`, `|=`, `&=` and `andnot()` on random tiles. `a.andnot(b)` keeps the
+//  bits of `a` that are not set in `b`.
+template <typename Tile>
+std::string check_tile_bitwise(std::mt19937& generator){
+    const Tile a = random_tile<Tile>(generator);
+    const Tile b = random_tile<Tile>(generator);
+
+    Tile tile = a;
+    tile.invert();
+    std::string error = find_wrong_tile_bit(tile, [&](size_t x, size_t y){ return !a.get_bit(x, y); });
+    if (!error.empty()){
+        return "invert(): " + error;
+    }
+    tile = a;
+    tile ^= b;
+    error = find_wrong_tile_bit(tile, [&](size_t x, size_t y){ return a.get_bit(x, y) != b.get_bit(x, y); });
+    if (!error.empty()){
+        return "operator^=(): " + error;
+    }
+    tile = a;
+    tile |= b;
+    error = find_wrong_tile_bit(tile, [&](size_t x, size_t y){ return a.get_bit(x, y) || b.get_bit(x, y); });
+    if (!error.empty()){
+        return "operator|=(): " + error;
+    }
+    tile = a;
+    tile &= b;
+    error = find_wrong_tile_bit(tile, [&](size_t x, size_t y){ return a.get_bit(x, y) && b.get_bit(x, y); });
+    if (!error.empty()){
+        return "operator&=(): " + error;
+    }
+    tile = a;
+    tile.andnot(b);
+    error = find_wrong_tile_bit(tile, [&](size_t x, size_t y){ return a.get_bit(x, y) && !b.get_bit(x, y); });
+    if (!error.empty()){
+        return "andnot(): " + error;
+    }
+    return "";
+}
+
+//  `row(y)` is the 64-bit word of row y, with bit x of the word at (x, y). `top()` is row 0
+//  and `bottom()` is the last row. `set_bit()` changes only one bit.
+template <typename Tile>
+std::string check_tile_rows(std::mt19937& generator){
+    std::vector<uint64_t> words(Tile::HEIGHT);
+    Tile tile;
+    for (size_t y = 0; y < Tile::HEIGHT; y++){
+        words[y] = ((uint64_t)generator() << 32) | generator();
+        tile.row(y) = words[y];
+    }
+    std::string error = find_wrong_tile_bit(tile, [&](size_t x, size_t y){ return (words[y] >> x) & 1; });
+    if (!error.empty()){
+        return "row(): " + error;
+    }
+    if (tile.top() != words[0] || tile.bottom() != words[Tile::HEIGHT - 1]){
+        return "top() or bottom() is not the first or last row";
+    }
+    tile.top() = words[0] = ~words[0];
+    tile.bottom() = words[Tile::HEIGHT - 1] = ~words[Tile::HEIGHT - 1];
+    error = find_wrong_tile_bit(tile, [&](size_t x, size_t y){ return (words[y] >> x) & 1; });
+    if (!error.empty()){
+        return "writing top() or bottom(): " + error;
+    }
+
+    for (size_t y = 0; y < Tile::HEIGHT; y++){
+        for (size_t x = 0; x < Tile::WIDTH; x++){
+            const Tile original = tile;
+            const bool value = !original.get_bit(x, y);
+            tile.set_bit(x, y, value);
+            error = find_wrong_tile_bit(tile, [&](size_t bit_x, size_t bit_y){
+                return bit_x == x && bit_y == y ? value : original.get_bit(bit_x, bit_y);
+            });
+            if (!error.empty()){
+                return std::format("set_bit({}, {}, {}): {}", x, y, (int)value, error);
+            }
+        }
+    }
+    return "";
+}
+
+//  One of the `copy_to_shift_*()` functions, which OR a shifted copy of a tile into another
+//  tile. They are used by `submatrix()` to build each output tile from the (up to 4) input
+//  tiles that it overlaps. The first letter of the suffix is for x and the second for y:
+//  "p" means that destination bit x gets source bit x + shift, and "n" means that
+//  destination bit x gets source bit x - shift.
+template <typename Tile>
+struct CopyToShift{
+    const char* name;
+    void (Tile::*function)(Tile& tile, size_t shift_x, size_t shift_y) const;
+    bool positive_x;
+    bool positive_y;
+
+    //  The source bit that lands on destination bit (x, y), or false if none does. Going
+    //  below 0 wraps around to a huge size_t, which is out of the tile too.
+    bool source_bit(const Tile& source, size_t shift_x, size_t shift_y, size_t x, size_t y) const{
+        const size_t source_x = positive_x ? x + shift_x : x - shift_x;
+        const size_t source_y = positive_y ? y + shift_y : y - shift_y;
+        return source_x < Tile::WIDTH && source_y < Tile::HEIGHT && source.get_bit(source_x, source_y);
+    }
+};
+
+template <typename Tile>
+std::string check_tile_shifts(std::mt19937& generator){
+    const CopyToShift<Tile> shifts[] = {
+        {"copy_to_shift_pp", &Tile::copy_to_shift_pp, true,  true},
+        {"copy_to_shift_np", &Tile::copy_to_shift_np, false, true},
+        {"copy_to_shift_pn", &Tile::copy_to_shift_pn, true,  false},
+        {"copy_to_shift_nn", &Tile::copy_to_shift_nn, false, false},
+    };
+    const Tile source = random_tile<Tile>(generator);
+    const Tile destination = random_tile<Tile>(generator);
+    for (const CopyToShift<Tile>& shift : shifts){
+        for (size_t shift_y = 0; shift_y < Tile::HEIGHT; shift_y++){
+            for (size_t shift_x = 0; shift_x < Tile::WIDTH; shift_x++){
+                Tile tile = destination;
+                (source.*shift.function)(tile, shift_x, shift_y);
+                const std::string error = find_wrong_tile_bit(tile, [&](size_t x, size_t y){
+                    return destination.get_bit(x, y) || shift.source_bit(source, shift_x, shift_y, x, y);
+                });
+                if (!error.empty()){
+                    return std::format("{}(shift_x = {}, shift_y = {}): {}", shift.name, shift_x, shift_y, error);
+                }
+            }
+        }
+    }
+    return "";
+}
+
+template <typename Tile>
+class Test_BinaryTile : public UnitTest{
+public:
+    Test_BinaryTile(const std::string& tile_name)
+        : UnitTest("Kernels::BinaryMatrix - tile - " + tile_name)
+    {}
+
+    virtual UnitTestResult run(Logger& logger, CancellableScope& scope) const override{
+        std::mt19937 generator(0);
+        for (auto check : {check_tile_masks<Tile>, check_tile_bitwise<Tile>, check_tile_rows<Tile>, check_tile_shifts<Tile>}){
+            const std::string error = check(generator);
+            if (!error.empty()){
+                return "Error: " + error + ".";
+            }
+        }
+        return true;
+    }
+};
+
+
+
+#ifdef PA_AutoDispatch_arm64_20_M1
+//  Check `PartialWordAccess_arm64_NEON`, which loads and stores only the first 0 to 16
+//  bytes of a 16-byte NEON vector. NEON kernels use it for the leftover pixels at the end
+//  of a row. The test data sits in the middle of a buffer filled with `UNTOUCHED`:
+//  - Both loads must return the data bytes in the low lanes and 0 in the other lanes.
+//  - The store must write the data bytes and keep every other byte of the buffer.
+class Test_PartialWordAccess_arm64_NEON : public UnitTest{
+public:
+    Test_PartialWordAccess_arm64_NEON()
+        : UnitTest("Kernels::PartialWordAccess - arm64_NEON")
+    {}
+
+    virtual UnitTestResult run(Logger& logger, CancellableScope& scope) const override{
+        constexpr uint8_t UNTOUCHED = 99;
+        constexpr size_t START = 16;
+
+        for (size_t bytes = 0; bytes <= 16; bytes++){
+            const PartialWordAccess_arm64_NEON access(bytes);
+
+            uint8_t buffer[48];
+            for (size_t i = 0; i < 48; i++){
+                buffer[i] = i < START || i >= START + bytes ? UNTOUCHED : (uint8_t)(100 + i);
+            }
+            const uint8x16_t loads[] = {
+                access.load_int_no_read_past_end(buffer + START),
+                access.load_int_no_read_before_ptr(buffer + START),
+            };
+            for (const uint8x16_t& loaded : loads){
+                uint8_t lanes[16];
+                vst1q_u8(lanes, loaded);
+                for (size_t i = 0; i < 16; i++){
+                    const int expected = i < bytes ? buffer[START + i] : 0;
+                    if (lanes[i] != expected){
+                        return std::format("Error: loading {} bytes: lane {} is {} but should be {}.", bytes, i, (int)lanes[i], expected);
+                    }
+                }
+            }
+
+            uint8_t stored[48];
+            for (size_t i = 0; i < 48; i++){
+                stored[i] = UNTOUCHED;
+            }
+            access.store_int_no_past_end(stored + START, vld1q_u8(buffer + START));
+            for (size_t i = 0; i < 48; i++){
+                if (stored[i] != buffer[i]){
+                    return std::format("Error: storing {} bytes: byte {} is {} but should be {}.", bytes, i, (int)stored[i], (int)buffer[i]);
+                }
+            }
+        }
+        return true;
+    }
+};
+#endif
+
+
+
+//  Matrix tests: check every matrix operation that has code per matrix type, through the
+//  `PackedBinaryMatrix_IB` interface, against the pixels of a real image.
+
+//  An ARGB color range: a pixel is in range if each of its A, R, G and B bytes is within
+//  the bytes of `mins` and `maxs`.
+struct ColorRange{
+    uint32_t mins;
+    uint32_t maxs;
+};
+
+//  The ranges to test. Each has pixels both in and out of range on every test image.
+constexpr ColorRange RANGES[] = {
+    {0xff000000, 0xff8080ff},
+    {0xff204060, 0xffe0c0ff},
+    {0xff60607f, 0xffc8c8c8},
+    {0xffa0a0a0, 0xffffffff},
+};
+
+bool in_range(uint32_t pixel, const ColorRange& range){
+    for (int shift = 0; shift < 32; shift += 8){
+        const uint32_t value = (pixel >> shift) & 0xff;
+        if (value < ((range.mins >> shift) & 0xff) || value > ((range.maxs >> shift) & 0xff)){
+            return false;
+        }
+    }
+    return true;
+}
+
+//  Compare `matrix` with `expected_bit(x, y)`: its size must be `width` x `height`, each bit
+//  must match, and each padding bit must be 0. The padding bits are the bits of the edge
+//  tiles past the right and bottom of the matrix. They must stay 0, since Waterfill and
+//  other code read whole tiles. Return a description of the first problem, or an empty
+//  string if there is none.
+template <typename ExpectedBit>
+std::string find_wrong_bit(
+    const PackedBinaryMatrix_IB& matrix, size_t width, size_t height,
+    ExpectedBit expected_bit
+){
+    if (matrix.width() != width || matrix.height() != height){
+        return std::format("size is {} x {} but should be {} x {}", matrix.width(), matrix.height(), width, height);
+    }
+    for (size_t y = 0; y < height; y++){
+        for (size_t x = 0; x < width; x++){
+            const bool expected = expected_bit(x, y);
+            if (matrix.get(x, y) != expected){
+                return std::format("bit ({}, {}) should be {}", x, y, (int)expected);
+            }
+        }
+    }
+
+    //  `dump_tiles()` prints every bit of every tile, padding included, as rows of '0' and
+    //  '1' that end with '\n'.
+    size_t x = 0, y = 0;
+    for (char bit : matrix.dump_tiles()){
+        if (bit == '\n'){
+            x = 0;
+            y++;
+            continue;
+        }
+        if (bit == '1' && (x >= width || y >= height)){
+            return std::format("padding bit ({}, {}) is 1", x, y);
+        }
+        x++;
+    }
+    return "";
+}
+
+
+//  A rectangle to cut out with `submatrix()`.
+struct SubmatrixBox{
+    size_t x;
+    size_t y;
+    size_t width;
+    size_t height;
+};
+
+
+//  Check one binary matrix type on a real image:
+//  1. `compress_rgb32_to_binary_range()` with one range at a time, and with all of `RANGES`
+//     in one pass. Bit (x, y) must be 1 if pixel (x, y) is in range.
+//  2. `invert()`, `^=`, `|=`, `&=`, `set_ones()` and `set_zero()` on those matrices.
+//  3. `submatrix()` on boxes that start inside or outside a tile, that end at a tile
+//     edge or inside a tile, and that go past the edge of the matrix.
+//  The image is a guard-page image, so the test also crashes if a compress function reads
+//  past the last pixel.
+class Test_BinaryMatrix : public ImageUnitTest{
+public:
+    Test_BinaryMatrix(const std::string& type_name, BinaryMatrixType type, const std::string& image)
+        : ImageUnitTest("Kernels::BinaryMatrix - " + type_name + " - " + image, {image})
+        , m_type(type)
+    {
+        //  Plus a guard-page copy of the image and a handful of packed binary matrices.
+        m_memory += MAX_TEST_IMAGE_RGB32_BYTES + MAX_TEST_IMAGE_RGB32_BYTES / 16;
+    }
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        const ImageRGB32& file_image = images[0];
+        const GuardPageImageRGB32 image(file_image);
+        const size_t width = image.width();
+        const size_t height = image.height();
+        auto bit_in_range = [&](size_t range_index){
+            return [&, range_index](size_t x, size_t y){
+                return in_range(image.pixel(x, y), RANGES[range_index]);
+            };
+        };
+
+        //  1. Compress, one range at a time.
+        std::vector<std::unique_ptr<PackedBinaryMatrix_IB>> matrices;
+        for (size_t c = 0; c < std::size(RANGES); c++){
+            matrices.emplace_back(make_PackedBinaryMatrix(m_type, width, height));
+            compress_rgb32_to_binary_range(
+                image.data(), image.bytes_per_row(), *matrices.back(),
+                RANGES[c].mins, RANGES[c].maxs
+            );
+            const std::string error = find_wrong_bit(*matrices.back(), width, height, bit_in_range(c));
+            if (!error.empty()){
+                return std::format("Error: compress range [{:08x}, {:08x}]: {}.", RANGES[c].mins, RANGES[c].maxs, error);
+            }
+        }
+
+        //  1. Compress, all ranges in one pass.
+        std::vector<std::unique_ptr<PackedBinaryMatrix_IB>> multi_matrices;
+        std::vector<CompressRgb32ToBinaryRangeFilter> filters;
+        for (const ColorRange& range : RANGES){
+            multi_matrices.emplace_back(make_PackedBinaryMatrix(m_type, width, height));
+            filters.emplace_back(*multi_matrices.back(), range.mins, range.maxs);
+        }
+        compress_rgb32_to_binary_range(image.data(), image.bytes_per_row(), filters.data(), filters.size());
+        for (size_t c = 0; c < std::size(RANGES); c++){
+            const std::string error = find_wrong_bit(*multi_matrices[c], width, height, bit_in_range(c));
+            if (!error.empty()){
+                return std::format("Error: compress all ranges at once, range [{:08x}, {:08x}]: {}.", RANGES[c].mins, RANGES[c].maxs, error);
+            }
+        }
+        scope.throw_if_cancelled();
+
+        //  2. Operations on the matrices of the first two ranges.
+        const PackedBinaryMatrix_IB& a = *matrices[0];
+        const PackedBinaryMatrix_IB& b = *matrices[1];
+        auto bit_a = bit_in_range(0);
+        auto bit_b = bit_in_range(1);
+
+        std::unique_ptr<PackedBinaryMatrix_IB> matrix = a.clone();
+        matrix->invert();
+        std::string error = find_wrong_bit(*matrix, width, height, [&](size_t x, size_t y){ return !bit_a(x, y); });
+        if (!error.empty()){
+            return "Error: invert(): " + error + ".";
+        }
+        matrix = a.clone();
+        *matrix ^= b;
+        error = find_wrong_bit(*matrix, width, height, [&](size_t x, size_t y){ return bit_a(x, y) != bit_b(x, y); });
+        if (!error.empty()){
+            return "Error: operator^=(): " + error + ".";
+        }
+        matrix = a.clone();
+        *matrix |= b;
+        error = find_wrong_bit(*matrix, width, height, [&](size_t x, size_t y){ return bit_a(x, y) || bit_b(x, y); });
+        if (!error.empty()){
+            return "Error: operator|=(): " + error + ".";
+        }
+        matrix = a.clone();
+        *matrix &= b;
+        error = find_wrong_bit(*matrix, width, height, [&](size_t x, size_t y){ return bit_a(x, y) && bit_b(x, y); });
+        if (!error.empty()){
+            return "Error: operator&=(): " + error + ".";
+        }
+        matrix->set_ones();
+        error = find_wrong_bit(*matrix, width, height, [](size_t, size_t){ return true; });
+        if (!error.empty()){
+            return "Error: set_ones(): " + error + ".";
+        }
+        matrix->set_zero();
+        error = find_wrong_bit(*matrix, width, height, [](size_t, size_t){ return false; });
+        if (!error.empty()){
+            return "Error: set_zero(): " + error + ".";
+        }
+        scope.throw_if_cancelled();
+
+        //  3. Submatrices of the first range's matrix. The parts past the edge of the matrix
+        //  must be 0. The 64 x 64 box ends at a tile edge for every matrix type.
+        const SubmatrixBox boxes[] = {
+            {0, 0, width, height},
+            {1, 1, width - 1, height - 1},
+            {5, 3, 64, 64},
+            {37, 11, 40, 32},
+            {70, 9, 100, 100},
+            {width + 3, 0, 10, 10},
+        };
+        for (const SubmatrixBox& box : boxes){
+            const std::unique_ptr<PackedBinaryMatrix_IB> sub = a.submatrix(
+                box.x, box.y, box.width, box.height
+            );
+            error = find_wrong_bit(*sub, box.width, box.height, [&](size_t x, size_t y){
+                x += box.x;
+                y += box.y;
+                return x < width && y < height && bit_a(x, y);
+            });
+            if (!error.empty()){
+                return std::format(
+                    "Error: submatrix({}, {}, {}, {}): {}.",
+                    box.x, box.y, box.width, box.height, error
+                );
+            }
+        }
+        return true;
+    }
+
+private:
+    BinaryMatrixType m_type;
+};
+
+}
+
+
+
+//  Add the tile tests, and a matrix test for each image and each binary matrix type that
+//  this build has and this CPU supports, including Default.
+void add_tests_BinaryMatrix(UnitTestDatabase& database){
+    database.add<Test_BinaryTile<BinaryTile_64x4_Default>>("64x4_Default");
+
+    struct MatrixType{
+        std::string name;
+        BinaryMatrixType type;
+    };
+    std::vector<MatrixType> types{
+        {"64x4_Default", BinaryMatrixType::i64x4_Default},
+    };
+#ifdef PA_AutoDispatch_x64_08_Nehalem
+    if (CPU_CAPABILITY_CURRENT.OK_08_Nehalem){
+        types.push_back({"64x8_x64_SSE42", BinaryMatrixType::i64x8_x64_SSE42});
+    }
+#endif
+#ifdef PA_AutoDispatch_x64_13_Haswell
+    if (CPU_CAPABILITY_CURRENT.OK_13_Haswell){
+        types.push_back({"64x16_x64_AVX2", BinaryMatrixType::i64x16_x64_AVX2});
+    }
+#endif
+#ifdef PA_AutoDispatch_x64_17_Skylake
+    if (CPU_CAPABILITY_CURRENT.OK_17_Skylake){
+        types.push_back({"64x32_x64_AVX512", BinaryMatrixType::i64x32_x64_AVX512});
+        types.push_back({"64x64_x64_AVX512", BinaryMatrixType::i64x64_x64_AVX512});
+    }
+#endif
+#ifdef PA_AutoDispatch_arm64_20_M1
+    if (CPU_CAPABILITY_CURRENT.OK_M1){
+        database.add<Test_BinaryTile<BinaryTile_64x8_arm64_NEON>>("64x8_arm64_NEON");
+        database.add<Test_PartialWordAccess_arm64_NEON>();
+        types.push_back({"64x8_arm64_NEON", BinaryMatrixType::arm64x8_x64_NEON});
+    }
+#endif
+
+    //  Images in the CommandLineTests repo. No width or height is a multiple of 8, so the
+    //  tiles at the right and bottom edges are only partly used.
+    const std::vector<std::string> images{
+        "NintendoSwitch/Switch2/ghostassassin/system_settings_display_dark.png",    //  1916 x 1078
+        "OCR/Lv.1-0.png",                                                           //  237 x 77
+        "PokemonSwSh/SelectionArrowFinder/mac_neon_error_1.png",                    //  106 x 410
+        "OCR/german-nature-sanft.png",                                              //  511 x 91
+    };
+
+    for (const MatrixType& type : types){
+        for (const std::string& image : images){
+            database.add<Test_BinaryMatrix>(type.name, type.type, image);
+        }
+    }
+}
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Tests.h b/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Tests.h
new file mode 100644
index 0000000000..3f80bc2bea
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Tests.h
@@ -0,0 +1,23 @@
+/*  BinaryMatrix Tests
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Kernels_BinaryMatrix_Tests_H
+#define PokemonAutomation_Kernels_BinaryMatrix_Tests_H
+
+#include "Common/Cpp/TestRunners/UnitTest.h"
+
+namespace PokemonAutomation{
+namespace Kernels{
+
+
+
+void add_tests_BinaryMatrix(UnitTestDatabase& database);
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_t.h b/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_t.h
index 624f8d5cee..1ad0aee238 100644
--- a/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_t.h
+++ b/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_t.h
@@ -1,6 +1,6 @@
 /*  Binary Matrix (internal template)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -24,10 +24,10 @@ namespace Kernels{
 // For example, for AVX2 feature, the optimized shape is 64x16.
 // See Kernels_BinaryMatrix.h:BinaryMatrixType as enums of different matrix types.
 //
-// `PackedBinaryMatrix_t` serves as the base class for each different implmenentations
-// for each CPU feature set. It hosts a lot of boilerplate matrix related code that
-// are agonstic to actual tile difinition and tile processing.
-// Suffix _t stands for "template".
+// `PackedBinaryMatrix_t` serves as the template class for each different implmenentations
+// for each CPU feature set. It uses template class PackedBinaryMatrixCore<Tile> to
+// implement all the actual matrix functions.
+// Suffix "_t" stands for "template".
 template <typename Tile>
 class PackedBinaryMatrix_t final : public PackedBinaryMatrix_IB{
 public:
@@ -71,8 +71,12 @@ class PackedBinaryMatrix_t final : public PackedBinaryMatrix_IB{
         m_matrix &= static_cast<const PackedBinaryMatrix_t<Tile>&>(x).m_matrix;
     }
 
+    // Print entire binary matrix as 0s and 1s. Rows are ended with "\n".
     virtual std::string dump() const override{ return m_matrix.dump(); }
+    // Print part of max as 0s and 1s. Rows are ended with "\n".
     virtual std::string dump(size_t min_x, size_t min_y, size_t max_x, size_t max_y) const override{ return m_matrix.dump(min_x, min_y, max_x, max_y); }
+    // Print all the underlying tiles that form this binary matrix. The result is a matrix that may be larger
+    // than the original matrix.
     virtual std::string dump_tiles() const override{ return m_matrix.dump_tiles(); }
 
 public:
diff --git a/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_PackedBinaryMatrixCore.h b/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_PackedBinaryMatrixCore.h
index eeaf825ba5..e5997c31ab 100644
--- a/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_PackedBinaryMatrixCore.h
+++ b/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_PackedBinaryMatrixCore.h
@@ -1,6 +1,6 @@
 /*  Packed Binary Matrix Base
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -17,7 +17,7 @@ namespace PokemonAutomation{
 namespace Kernels{
 
 
-
+// The 2D index of a tile inside binary matrix `PackedBinaryMatrixCore`
 class TileIndex{
 public:
     TileIndex(size_t x, size_t y)
@@ -72,7 +72,9 @@ class PackedBinaryMatrixCore{
     void operator&=(const PackedBinaryMatrixCore& x);
 
 public:
+    // How many pixels in an image row, which is equal to how many bits in a binary matrix row 
     size_t width() const{ return m_logical_width; }
+    // How many pixels in an image column, which is equal to how many bits in a binary matrix column
     size_t height() const{ return m_logical_height; }
 
     //  These are slow.
@@ -81,35 +83,50 @@ class PackedBinaryMatrixCore{
 
     PackedBinaryMatrixCore submatrix(size_t x, size_t y, size_t width, size_t height) const;
 
+    // Print entire binary matrix as 0s and 1s. Rows are ended with "\n".
     std::string dump() const;
+    // Print part of max as 0s and 1s. Rows are ended with "\n".
     std::string dump(size_t min_x, size_t min_y, size_t max_x, size_t max_y) const;
+    // Print all the underlying tiles that form this binary matrix. The result is a matrix that may be larger
+    // than the original matrix.
     std::string dump_tiles() const;
 
 public:
-    //  Tile Access
+    // How many tiles in a row.
     size_t tile_width() const{ return m_tile_width; }
+    // How many tiles in a column
     size_t tile_height() const{ return m_tile_height; }
 
+    // Get (index.x()-th, index.y()-th) tile
     const TileType& tile(TileIndex index) const;
           TileType& tile(TileIndex index);
+    // Get (x-th, y-th) tile
     const TileType& tile(size_t x, size_t y) const;
           TileType& tile(size_t x, size_t y);
 
 public:
-    //  Word Access
+    //  Word Access. How many words in a row. One word is 8 bytes (aka 64 bits).
+    //  For different simd implementations, every tile is always one word wide.
     size_t word64_width() const{ return m_tile_width; }
+    //  Word Access. How many words in a column. One word is 8 bytes (aka 64 bits).
     size_t word64_height() const{ return m_logical_height; }
 
+    // Get (x-th, y-th) word. One word is 8 bytes (aka 64 bits), one row in a tile.
     uint64_t word64(size_t x, size_t y) const;
+    // Get (x-th, y-th) word. One word is 8 bytes (aka 64 bits), one row in a tile.
     uint64_t& word64(size_t x, size_t y);
 
 private:
     static constexpr size_t TILE_WIDTH = TileType::WIDTH;
     static constexpr size_t TILE_HEIGHT = TileType::HEIGHT;
 
+    // How many bits in a row (aka how many pixels in an image row)
     size_t m_logical_width;
+    // How many bits in a column (aka how many pixels in an image column)
     size_t m_logical_height;
+    // How many tiles in a row
     size_t m_tile_width;
+    // How many tiles in a column
     size_t m_tile_height;
     AlignedVector<TileType> m_data;
 };
@@ -162,11 +179,14 @@ uint64_t& PackedBinaryMatrixCore<Tile>::word64(size_t x, size_t y){
 
 //  Bit Access
 
+//  Get the bit at bit location (x, y)
 template <typename Tile>
 bool PackedBinaryMatrixCore<Tile>::get(size_t x, size_t y) const{
     const Tile& tile = this->tile(x / TILE_WIDTH, y / TILE_HEIGHT);
     return tile.get_bit(x % TILE_WIDTH, y % TILE_HEIGHT);
 }
+
+//  Set the bit at bit location (x, y) to `set`
 template <typename Tile>
 void PackedBinaryMatrixCore<Tile>::set(size_t x, size_t y, bool set){
     Tile& tile = this->tile(x / TILE_WIDTH, y / TILE_HEIGHT);
diff --git a/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_PackedBinaryMatrixCore.tpp b/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_PackedBinaryMatrixCore.tpp
index acef198332..45c593eabf 100644
--- a/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_PackedBinaryMatrixCore.tpp
+++ b/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_PackedBinaryMatrixCore.tpp
@@ -300,13 +300,20 @@ PackedBinaryMatrixCore<Tile> PackedBinaryMatrixCore<Tile>::submatrix(
     }
 
 #if 1
+    //  Clear the bits past the right and bottom edges, which came from outside the
+    //  box. Skip an edge that ends at a tile boundary: `clear_padding()` with 0 bits
+    //  would clear the whole last column or row of tiles.
     size_t wbits = width % TILE_WIDTH;
-    for (size_t r = 0; r < tile_height; r++){
-        ret.tile(tile_width - 1, r).clear_padding(wbits, TILE_HEIGHT);
+    if (wbits != 0){
+        for (size_t r = 0; r < tile_height; r++){
+            ret.tile(tile_width - 1, r).clear_padding(wbits, TILE_HEIGHT);
+        }
     }
     size_t hbits = height % TILE_HEIGHT;
-    for (size_t c = 0; c < tile_width; c++){
-        ret.tile(c, tile_height - 1).clear_padding(TILE_WIDTH, hbits);
+    if (hbits != 0){
+        for (size_t c = 0; c < tile_width; c++){
+            ret.tile(c, tile_height - 1).clear_padding(TILE_WIDTH, hbits);
+        }
     }
 #endif
 
diff --git a/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_SparseBinaryMatrixCore.h b/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_SparseBinaryMatrixCore.h
index d078555506..413ef4d7d8 100644
--- a/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_SparseBinaryMatrixCore.h
+++ b/SerialPrograms/Source/Kernels/BinaryMatrix/Kernels_SparseBinaryMatrixCore.h
@@ -1,6 +1,6 @@
 /*  Packed Binary Matrix Base
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/Kernels/ImageFilters/Kernels_ImageFilter_Basic.cpp b/SerialPrograms/Source/Kernels/ImageFilters/Kernels_ImageFilter_Basic.cpp
deleted file mode 100644
index c2348fab48..0000000000
--- a/SerialPrograms/Source/Kernels/ImageFilters/Kernels_ImageFilter_Basic.cpp
+++ /dev/null
@@ -1,333 +0,0 @@
-/*  Image Filters Basic
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Cpp/Exceptions.h"
-#include "Common/Cpp/CpuId/CpuId.h"
-#include "Kernels_ImageFilter_Basic_Routines.h"
-#include "Kernels_ImageFilter_Basic.h"
-
-namespace PokemonAutomation{
-namespace Kernels{
-
-
-size_t filter_rgb32_range_Default(
-    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
-    uint32_t* out, size_t out_bytes_per_row,
-    uint32_t mins, uint32_t maxs,
-    uint32_t replacement, bool invert
-);
-size_t filter_rgb32_range_x64_SSE42(
-    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
-    uint32_t* out, size_t out_bytes_per_row,
-    uint32_t mins, uint32_t maxs,
-    uint32_t replacement, bool invert
-);
-size_t filter_rgb32_range_x64_AVX2(
-    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
-    uint32_t* out, size_t out_bytes_per_row,
-    uint32_t mins, uint32_t maxs,
-    uint32_t replacement, bool invert
-);
-size_t filter_rgb32_range_x64_AVX512(
-    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
-    uint32_t* out, size_t out_bytes_per_row,
-    uint32_t mins, uint32_t maxs,
-    uint32_t replacement, bool invert
-);
-
-
-size_t filter_rgb32_range(
-    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
-    uint32_t* out, size_t out_bytes_per_row,
-    uint32_t mins, uint32_t maxs,
-    uint32_t replacement, bool invert
-){
-    if (width * height > 0xffffffff){
-        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Image is too large. more than 2^32 pixels.");
-    }
-#ifdef PA_AutoDispatch_x64_17_Skylake
-    if (CPU_CAPABILITY_CURRENT.OK_17_Skylake){
-        return filter_rgb32_range_x64_AVX512(
-            in, in_bytes_per_row, width, height,
-            out, out_bytes_per_row, mins, maxs, replacement, invert
-        );
-    }
-#endif
-#ifdef PA_AutoDispatch_x64_13_Haswell
-    if (CPU_CAPABILITY_CURRENT.OK_13_Haswell){
-        return filter_rgb32_range_x64_AVX2(
-            in, in_bytes_per_row, width, height,
-            out, out_bytes_per_row, mins, maxs, replacement, invert
-        );
-    }
-#endif
-#ifdef PA_AutoDispatch_x64_08_Nehalem
-    if (CPU_CAPABILITY_CURRENT.OK_08_Nehalem){
-        return filter_rgb32_range_x64_SSE42(
-            in, in_bytes_per_row, width, height,
-            out, out_bytes_per_row, mins, maxs, replacement, invert
-        );
-    }
-#endif
-    return filter_rgb32_range_Default(
-        in, in_bytes_per_row, width, height,
-        out, out_bytes_per_row, mins, maxs, replacement, invert
-    );
-}
-
-
-
-
-
-
-void filter_rgb32_range_Default(
-    const uint32_t* image, size_t bytes_per_row, size_t width, size_t height,
-    FilterRgb32RangeFilter* filter, size_t filter_count
-);
-void filter_rgb32_range_x64_SSE42(
-    const uint32_t* image, size_t bytes_per_row, size_t width, size_t height,
-    FilterRgb32RangeFilter* filter, size_t filter_count
-);
-void filter_rgb32_range_x64_AVX2(
-    const uint32_t* image, size_t bytes_per_row, size_t width, size_t height,
-    FilterRgb32RangeFilter* filter, size_t filter_count
-);
-void filter_rgb32_range_x64_AVX512(
-    const uint32_t* image, size_t bytes_per_row, size_t width, size_t height,
-    FilterRgb32RangeFilter* filter, size_t filter_count
-);
-
-
-void filter_rgb32_range(
-    const uint32_t* image, size_t bytes_per_row, size_t width, size_t height,
-    FilterRgb32RangeFilter* filter, size_t filter_count
-){
-    if (width * height > 0xffffffff){
-        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Image is too large. more than 2^32 pixels.");
-    }
-#ifdef PA_AutoDispatch_x64_17_Skylake
-    if (CPU_CAPABILITY_CURRENT.OK_17_Skylake){
-        filter_rgb32_range_x64_AVX512(image, bytes_per_row, width, height, filter, filter_count);
-        return;
-    }
-#endif
-#ifdef PA_AutoDispatch_x64_13_Haswell
-    if (CPU_CAPABILITY_CURRENT.OK_13_Haswell){
-        filter_rgb32_range_x64_AVX2(image, bytes_per_row, width, height, filter, filter_count);
-        return;
-    }
-#endif
-#ifdef PA_AutoDispatch_x64_08_Nehalem
-    if (CPU_CAPABILITY_CURRENT.OK_08_Nehalem){
-        filter_rgb32_range_x64_SSE42(image, bytes_per_row, width, height, filter, filter_count);
-        return;
-    }
-#endif
-    filter_rgb32_range_Default(image, bytes_per_row, width, height, filter, filter_count);
-}
-
-
-
-
-
-
-
-size_t filter_rgb32_euclidean_Default(
-    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
-    uint32_t* out, size_t out_bytes_per_row,
-    uint32_t expected, double max_euclidean_distance,
-    uint32_t replacement, bool invert
-);
-size_t filter_rgb32_euclidean_x64_SSE42(
-    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
-    uint32_t* out, size_t out_bytes_per_row,
-    uint32_t expected, double max_euclidean_distance,
-    uint32_t replacement, bool invert
-);
-size_t filter_rgb32_euclidean_x64_AVX2(
-    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
-    uint32_t* out, size_t out_bytes_per_row,
-    uint32_t expected, double max_euclidean_distance,
-    uint32_t replacement, bool invert
-);
-size_t filter_rgb32_euclidean_x64_AVX512(
-    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
-    uint32_t* out, size_t out_bytes_per_row,
-    uint32_t expected, double max_euclidean_distance,
-    uint32_t replacement, bool invert
-);
-
-
-
-size_t filter_rgb32_euclidean(
-    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
-    uint32_t* out, size_t out_bytes_per_row,
-    uint32_t expected, double max_euclidean_distance,
-    uint32_t replacement, bool invert
-){
-    if (width * height > 0xffffffff){
-        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Image is too large. more than 2^32 pixels.");
-    }
-#ifdef PA_AutoDispatch_x64_17_Skylake
-    if (CPU_CAPABILITY_CURRENT.OK_17_Skylake){
-        return filter_rgb32_euclidean_x64_AVX512(
-            in, in_bytes_per_row, width, height,
-            out, out_bytes_per_row,
-            expected, max_euclidean_distance,
-            replacement, invert
-        );
-    }
-#endif
-#ifdef PA_AutoDispatch_x64_13_Haswell
-    if (CPU_CAPABILITY_CURRENT.OK_13_Haswell){
-        return filter_rgb32_euclidean_x64_AVX2(
-            in, in_bytes_per_row, width, height,
-            out, out_bytes_per_row,
-            expected, max_euclidean_distance,
-            replacement, invert
-        );
-    }
-#endif
-#ifdef PA_AutoDispatch_x64_08_Nehalem
-    if (CPU_CAPABILITY_CURRENT.OK_08_Nehalem){
-        return filter_rgb32_euclidean_x64_SSE42(
-            in, in_bytes_per_row, width, height,
-            out, out_bytes_per_row,
-            expected, max_euclidean_distance,
-            replacement, invert
-        );
-    }
-#endif
-    return filter_rgb32_euclidean_Default(
-        in, in_bytes_per_row, width, height,
-        out, out_bytes_per_row,
-        expected, max_euclidean_distance,
-        replacement, invert
-    );
-}
-
-
-
-
-
-
-
-size_t to_blackwhite_rgb32_range_Default(
-    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
-    uint32_t* out, size_t out_bytes_per_row,
-    uint32_t mins, uint32_t maxs, bool in_range_black
-);
-size_t to_blackwhite_rgb32_range_x64_SSE42(
-    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
-    uint32_t* out, size_t out_bytes_per_row,
-    uint32_t mins, uint32_t maxs, bool in_range_black
-);
-size_t to_blackwhite_rgb32_range_x64_AVX2(
-    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
-    uint32_t* out, size_t out_bytes_per_row,
-    uint32_t mins, uint32_t maxs, bool in_range_black
-);
-size_t to_blackwhite_rgb32_range_x64_AVX512(
-    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
-    uint32_t* out, size_t out_bytes_per_row,
-    uint32_t mins, uint32_t maxs, bool in_range_black
-);
-
-
-size_t to_blackwhite_rgb32_range(
-    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
-    uint32_t* out, size_t out_bytes_per_row,
-    uint32_t mins, uint32_t maxs, bool in_range_black
-){
-#ifdef PA_AutoDispatch_x64_17_Skylake
-    if (CPU_CAPABILITY_CURRENT.OK_17_Skylake){
-        return to_blackwhite_rgb32_range_x64_AVX512(in, in_bytes_per_row, width, height, out, out_bytes_per_row, mins, maxs, in_range_black);
-    }
-#endif
-#ifdef PA_AutoDispatch_x64_13_Haswell
-    if (CPU_CAPABILITY_CURRENT.OK_13_Haswell){
-        return to_blackwhite_rgb32_range_x64_AVX2(in, in_bytes_per_row, width, height, out, out_bytes_per_row, mins, maxs, in_range_black);
-    }
-#endif
-#ifdef PA_AutoDispatch_x64_08_Nehalem
-    if (CPU_CAPABILITY_CURRENT.OK_08_Nehalem){
-        return to_blackwhite_rgb32_range_x64_SSE42(in, in_bytes_per_row, width, height, out, out_bytes_per_row, mins, maxs, in_range_black);
-    }
-#endif
-    return to_blackwhite_rgb32_range_Default(in, in_bytes_per_row, width, height, out, out_bytes_per_row, mins, maxs, in_range_black);
-}
-
-
-
-
-
-
-
-void to_blackwhite_rgb32_range_Default(
-    const uint32_t* image, size_t bytes_per_row, size_t width, size_t height,
-    ToBlackWhiteRgb32RangeFilter* filter, size_t filter_count
-);
-void to_blackwhite_rgb32_range_x64_SSE42(
-    const uint32_t* image, size_t bytes_per_row, size_t width, size_t height,
-    ToBlackWhiteRgb32RangeFilter* filter, size_t filter_count
-);
-void to_blackwhite_rgb32_range_x64_AVX2(
-    const uint32_t* image, size_t bytes_per_row, size_t width, size_t height,
-    ToBlackWhiteRgb32RangeFilter* filter, size_t filter_count
-);
-void to_blackwhite_rgb32_range_x64_AVX512(
-    const uint32_t* image, size_t bytes_per_row, size_t width, size_t height,
-    ToBlackWhiteRgb32RangeFilter* filter, size_t filter_count
-);
-
-
-void to_blackwhite_rgb32_range(
-    const uint32_t* image, size_t bytes_per_row, size_t width, size_t height,
-    ToBlackWhiteRgb32RangeFilter* filter, size_t filter_count
-){
-#ifdef PA_AutoDispatch_x64_17_Skylake
-    if (CPU_CAPABILITY_CURRENT.OK_17_Skylake){
-        return to_blackwhite_rgb32_range_x64_AVX512(image, bytes_per_row, width, height, filter, filter_count);
-    }
-#endif
-#ifdef PA_AutoDispatch_x64_13_Haswell
-    if (CPU_CAPABILITY_CURRENT.OK_13_Haswell){
-        return to_blackwhite_rgb32_range_x64_AVX2(image, bytes_per_row, width, height, filter, filter_count);
-    }
-#endif
-#ifdef PA_AutoDispatch_x64_08_Nehalem
-    if (CPU_CAPABILITY_CURRENT.OK_08_Nehalem){
-        return to_blackwhite_rgb32_range_x64_SSE42(image, bytes_per_row, width, height, filter, filter_count);
-    }
-#endif
-    return to_blackwhite_rgb32_range_Default(image, bytes_per_row, width, height, filter, filter_count);
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-}
-}
diff --git a/SerialPrograms/Source/Kernels/ImageFilters/Kernels_ImageFilter_Basic.h b/SerialPrograms/Source/Kernels/ImageFilters/Kernels_ImageFilter_Basic.h
deleted file mode 100644
index 48579c547e..0000000000
--- a/SerialPrograms/Source/Kernels/ImageFilters/Kernels_ImageFilter_Basic.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/*  Image Filters Basic
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- *  Perform a filter over an image and replace pixels that match the filter.
- *
- */
-
-#ifndef PokemonAutomation_Kernels_ImageFilter_Basic_H
-#define PokemonAutomation_Kernels_ImageFilter_Basic_H
-
-#include <stdint.h>
-#include <cstddef>
-
-namespace PokemonAutomation{
-namespace Kernels{
-
-
-size_t filter_rgb32_range(
-    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
-    uint32_t* out, size_t out_bytes_per_row,
-    uint32_t mins, uint32_t maxs,
-    uint32_t replacement, bool invert
-);
-
-
-//  Same as above, but multiple filters.
-//  The purpose is to reduce passes over the entire image.
-//  All matricies must have the same dimensions.
-struct FilterRgb32RangeFilter{
-    uint32_t* data;     //  Pointer will be overwritten.
-    const size_t bytes_per_row;
-    const uint32_t mins;
-    const uint32_t maxs;
-    const uint32_t replacement;
-    const bool invert;
-
-    size_t pixels_in_range;
-
-    FilterRgb32RangeFilter(
-        uint32_t* p_data, size_t p_bytes_per_row,
-        uint32_t p_mins, uint32_t p_maxs, uint32_t p_replacement, bool p_invert
-    )
-        : data(p_data)
-        , bytes_per_row(p_bytes_per_row)
-        , mins(p_mins)
-        , maxs(p_maxs)
-        , replacement(p_replacement)
-        , invert(p_invert)
-    {}
-};
-void filter_rgb32_range(
-    const uint32_t* image, size_t bytes_per_row, size_t width, size_t height,
-    FilterRgb32RangeFilter* filter, size_t filter_count
-);
-
-
-
-size_t filter_rgb32_euclidean(
-    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
-    uint32_t* out, size_t out_bytes_per_row,
-    uint32_t expected, double max_euclidean_distance,
-    uint32_t replacement, bool invert
-);
-
-
-
-
-
-
-
-
-size_t to_blackwhite_rgb32_range(
-    const uint32_t* image, size_t bytes_per_row, size_t width, size_t height,
-    uint32_t* out0, size_t bytes_per_row0, uint32_t mins0, uint32_t maxs0, bool in_range_black0
-);
-
-
-//  Same as above, but multiple filters.
-//  The purpose is to reduce passes over the entire image.
-//  All matricies must have the same dimensions.
-struct ToBlackWhiteRgb32RangeFilter{
-    uint32_t* data;     //  Pointer will be overwritten.
-    const size_t bytes_per_row;
-    const uint32_t mins;
-    const uint32_t maxs;
-    const bool in_range_black;
-
-    size_t pixels_in_range;
-
-    ToBlackWhiteRgb32RangeFilter(
-        uint32_t* p_data, size_t p_bytes_per_row,
-        uint32_t p_mins, uint32_t p_maxs, bool p_in_range_black
-    )
-        : data(p_data)
-        , bytes_per_row(p_bytes_per_row)
-        , mins(p_mins)
-        , maxs(p_maxs)
-        , in_range_black(p_in_range_black)
-    {}
-};
-void to_blackwhite_rgb32_range(
-    const uint32_t* image, size_t bytes_per_row, size_t width, size_t height,
-    ToBlackWhiteRgb32RangeFilter* filter, size_t filter_count
-);
-
-
-
-
-
-
-
-}
-}
-#endif
diff --git a/SerialPrograms/Source/Kernels/ImageFilters/Kernels_ImageFilter_Basic_Default.cpp b/SerialPrograms/Source/Kernels/ImageFilters/Kernels_ImageFilter_Basic_Default.cpp
deleted file mode 100644
index c3a517fdac..0000000000
--- a/SerialPrograms/Source/Kernels/ImageFilters/Kernels_ImageFilter_Basic_Default.cpp
+++ /dev/null
@@ -1,291 +0,0 @@
-/*  Image Filters Basic (Default)
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <stdint.h>
-#include <cstddef>
-#include "Kernels_ImageFilter_Basic_Routines.h"
-
-namespace PokemonAutomation{
-namespace Kernels{
-
-
-class ImageFilter_RgbRange_Default{
-public:
-    static const size_t VECTOR_SIZE = 1;
-
-public:
-    ImageFilter_RgbRange_Default(uint32_t mins, uint32_t maxs, uint32_t replacement, bool invert)
-        : m_replacement(replacement)
-        , m_invert(invert ? 1 : 0)
-        , m_minB(mins & 0x000000ff)
-        , m_maxB(maxs & 0x000000ff)
-        , m_minG(mins & 0x0000ff00)
-        , m_maxG(maxs & 0x0000ff00)
-        , m_minR(mins & 0x00ff0000)
-        , m_maxR(maxs & 0x00ff0000)
-        , m_minA(mins & 0xff000000)
-        , m_maxA(maxs & 0xff000000)
-        , m_count(0)
-    {}
-
-    PA_FORCE_INLINE size_t count() const{
-        return m_count;
-    }
-
-    PA_FORCE_INLINE void process_full(uint32_t* out, const uint32_t* in){
-        uint32_t pixel = in[0];
-        uint64_t ret = 1;
-        {
-            uint32_t p = pixel & 0xff000000;
-            ret &= p >= m_minA;
-            ret &= p <= m_maxA;
-        }
-        {
-            uint32_t p = pixel & 0x00ff0000;
-            ret &= p >= m_minR;
-            ret &= p <= m_maxR;
-        }
-        {
-            uint32_t p = pixel & 0x0000ff00;
-            ret &= p >= m_minG;
-            ret &= p <= m_maxG;
-        }
-        {
-            uint32_t p = pixel & 0x000000ff;
-            ret &= p >= m_minB;
-            ret &= p <= m_maxB;
-        }
-        m_count += ret;
-        ret ^= m_invert;
-        out[0] = ret ? pixel : m_replacement;
-    }
-    PA_FORCE_INLINE void process_partial(uint32_t* out, const uint32_t* in, size_t left){
-        process_full(out, in);
-    }
-
-private:
-    const uint32_t m_replacement;
-    const uint32_t m_invert;
-    const uint32_t m_minB;
-    const uint32_t m_maxB;
-    const uint32_t m_minG;
-    const uint32_t m_maxG;
-    const uint32_t m_minR;
-    const uint32_t m_maxR;
-    const uint32_t m_minA;
-    const uint32_t m_maxA;
-    size_t m_count;
-};
-size_t filter_rgb32_range_Default(
-    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
-    uint32_t* out, size_t out_bytes_per_row,
-    uint32_t mins, uint32_t maxs,
-    uint32_t replacement, bool invert
-){
-    ImageFilter_RgbRange_Default filter(mins, maxs, replacement, invert);
-    filter_per_pixel(in, in_bytes_per_row, width, height, filter, out, out_bytes_per_row);
-    return filter.count();
-}
-void filter_rgb32_range_Default(
-    const uint32_t* image, size_t bytes_per_row, size_t width, size_t height,
-    FilterRgb32RangeFilter* filter, size_t filter_count
-){
-    filter_per_pixel<ImageFilter_RgbRange_Default>(
-        image, bytes_per_row, width, height, filter, filter_count
-    );
-}
-
-
-
-
-
-class ImageFilter_RgbEuclidean_Default{
-public:
-    static const size_t VECTOR_SIZE = 1;
-
-public:
-    ImageFilter_RgbEuclidean_Default(uint32_t expected, double max_euclidean_distance, uint32_t replacement, bool invert)
-        : m_replacement(replacement)
-        , m_invert(invert ? 1 : 0)
-        , m_expected_r((expected & 0x00ff0000) >> 16)
-        , m_expected_g((expected & 0x0000ff00) >> 8)
-        , m_expected_b(expected & 0x000000ff)
-        , m_distance_squared((uint32_t)(max_euclidean_distance * max_euclidean_distance))
-        , m_count(0)
-    {}
-
-    PA_FORCE_INLINE size_t count() const{
-        return m_count;
-    }
-
-    PA_FORCE_INLINE void process_full(uint32_t* out, const uint32_t* in){
-        uint32_t pixel = in[0];
-        uint32_t ret = 1;
-        uint32_t sum_sqr = 0;
-        {
-            uint32_t p = (pixel & 0x00ff0000) >> 16;
-            p -= m_expected_r;
-            sum_sqr += p * p;
-        }
-        {
-            uint32_t p = (pixel & 0x0000ff00) >> 8;
-            p -= m_expected_g;
-            sum_sqr += p * p;
-        }
-        {
-            uint32_t p = pixel & 0x000000ff;
-            p -= m_expected_b;
-            sum_sqr += p * p;
-        }
-        ret = sum_sqr <= m_distance_squared;
-        m_count += ret;
-        ret ^= m_invert;
-        out[0] = ret ? pixel : m_replacement;
-    }
-    PA_FORCE_INLINE void process_partial(uint32_t* out, const uint32_t* in, size_t left){
-        process_full(out, in);
-    }
-
-private:
-    const uint32_t m_replacement;
-    const uint32_t m_invert;
-    uint32_t m_expected_r;
-    uint32_t m_expected_g;
-    uint32_t m_expected_b;
-    uint32_t m_distance_squared;
-    size_t m_count;
-};
-size_t filter_rgb32_euclidean_Default(
-    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
-    uint32_t* out, size_t out_bytes_per_row,
-    uint32_t expected, double max_euclidean_distance,
-    uint32_t replacement, bool invert
-){
-    ImageFilter_RgbEuclidean_Default filter(expected, max_euclidean_distance, replacement, invert);
-    filter_per_pixel(in, in_bytes_per_row, width, height, filter, out, out_bytes_per_row);
-    return filter.count();
-}
-
-
-
-
-
-
-
-
-class ToBlackWhite_RgbRange_Default{
-public:
-    static const size_t VECTOR_SIZE = 1;
-
-public:
-    ToBlackWhite_RgbRange_Default(uint32_t mins, uint32_t maxs, bool in_range_black)
-        : m_in_range_black(in_range_black ? 1 : 0)
-        , m_minB(mins & 0x000000ff)
-        , m_maxB(maxs & 0x000000ff)
-        , m_minG(mins & 0x0000ff00)
-        , m_maxG(maxs & 0x0000ff00)
-        , m_minR(mins & 0x00ff0000)
-        , m_maxR(maxs & 0x00ff0000)
-        , m_minA(mins & 0xff000000)
-        , m_maxA(maxs & 0xff000000)
-        , m_count(0)
-    {}
-
-    PA_FORCE_INLINE size_t count() const{
-        return m_count;
-    }
-
-    PA_FORCE_INLINE void process_full(uint32_t* out, const uint32_t* in){
-        uint32_t pixel = in[0];
-        uint64_t ret = 1;
-        {
-            uint32_t p = pixel & 0xff000000;
-            ret &= p >= m_minA;
-            ret &= p <= m_maxA;
-        }
-        {
-            uint32_t p = pixel & 0x00ff0000;
-            ret &= p >= m_minR;
-            ret &= p <= m_maxR;
-        }
-        {
-            uint32_t p = pixel & 0x0000ff00;
-            ret &= p >= m_minG;
-            ret &= p <= m_maxG;
-        }
-        {
-            uint32_t p = pixel & 0x000000ff;
-            ret &= p >= m_minB;
-            ret &= p <= m_maxB;
-        }
-        m_count += ret;
-        ret ^= m_in_range_black;
-        out[0] = ret ? 0xffffffff : 0xff000000;
-    }
-    PA_FORCE_INLINE void process_partial(uint32_t* out, const uint32_t* in, size_t left){
-        process_full(out, in);
-    }
-
-private:
-    const uint32_t m_in_range_black;
-    const uint32_t m_minB;
-    const uint32_t m_maxB;
-    const uint32_t m_minG;
-    const uint32_t m_maxG;
-    const uint32_t m_minR;
-    const uint32_t m_maxR;
-    const uint32_t m_minA;
-    const uint32_t m_maxA;
-    size_t m_count;
-};
-
-
-
-size_t to_blackwhite_rgb32_range_Default(
-    const uint32_t* image, size_t in_bytes_per_row, size_t width, size_t height,
-    uint32_t* out, size_t out_bytes_per_row,
-    uint32_t mins, uint32_t maxs, bool in_range_black
-){
-    ToBlackWhite_RgbRange_Default filter(mins, maxs, in_range_black);
-    filter_per_pixel(image, in_bytes_per_row, width, height, filter, out, out_bytes_per_row);
-    return filter.count();
-}
-void to_blackwhite_rgb32_range_Default(
-    const uint32_t* image, size_t bytes_per_row, size_t width, size_t height,
-    ToBlackWhiteRgb32RangeFilter* filter, size_t filter_count
-){
-    to_blackwhite_rbg32<ToBlackWhite_RgbRange_Default>(
-        image, bytes_per_row, width, height, filter, filter_count
-    );
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-}
-}
diff --git a/SerialPrograms/Source/Kernels/ImageFilters/Kernels_ImageFilter_Basic_Routines.h b/SerialPrograms/Source/Kernels/ImageFilters/Kernels_ImageFilter_Basic_Routines.h
index a64d07ef73..6f3d63895a 100644
--- a/SerialPrograms/Source/Kernels/ImageFilters/Kernels_ImageFilter_Basic_Routines.h
+++ b/SerialPrograms/Source/Kernels/ImageFilters/Kernels_ImageFilter_Basic_Routines.h
@@ -1,6 +1,6 @@
 /*  Image Filters Basic Routines
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -10,13 +10,16 @@
 #include <stddef.h>
 #include <stdint.h>
 #include "Common/Compiler.h"
-#include "Common/Cpp/Containers/FixedLimitVector.tpp"
-#include "Kernels_ImageFilter_Basic.h"
 
 namespace PokemonAutomation{
 namespace Kernels{
 
-
+// Runner interface:
+// - static size_t Runner::VECTOR_SIZE, how many uint32_t in an SIMD vector. Note one pixel is one uint32_t.
+// - Runner::process_full(uint32_t* out, const uint32_t* in), process a full vector: replace pixels in
+//   or out of a specific color range with a particular color.
+// - Runner::process_partial(uint32_t* out, const uint32_t* in, size_t left), process a partial vector:
+//   work only on the first `left` pixels.
 template <typename Runner>
 PA_FORCE_INLINE void filter_per_pixel(
     const uint32_t* image, size_t in_bytes_per_row, size_t width, size_t height,
@@ -25,128 +28,57 @@ PA_FORCE_INLINE void filter_per_pixel(
     if (width == 0 || height == 0){
         return;
     }
-    const size_t VECTOR_SIZE = Runner::VECTOR_SIZE;
-    do{
-        const uint32_t* in = image;
-        uint32_t* o0 = out;
-        size_t lc = width / VECTOR_SIZE;
-        while (lc--){
-            filter.process_full(o0, in);
-            in += VECTOR_SIZE;
-            o0 += VECTOR_SIZE;
-        }
-        size_t left = width % VECTOR_SIZE;
-        if (left != 0){
-            filter.process_partial(o0, in, left);
-        }
-        image = (const uint32_t*)((const char*)image + in_bytes_per_row);
-        out = (uint32_t*)((const char*)out + out_bytes_per_row);
-    }while (--height);
-}
-
-
-template <typename Runner>
-PA_FORCE_INLINE void filter_per_pixel(
-    const uint32_t* image, size_t bytes_per_row, size_t width, size_t height,
-    FilterRgb32RangeFilter* filter, size_t filter_count
-){
-    if (width == 0 || height == 0){
-        return;
-    }
-
-    FixedLimitVector<Runner> entries(filter_count);
-    for (size_t c = 0; c < filter_count; c++){
-        entries.emplace_back(filter[c].mins, filter[c].maxs, filter[c].replacement, filter[c].invert);
-    }
 
     const size_t VECTOR_SIZE = Runner::VECTOR_SIZE;
-    do{
-        const uint32_t* in = image;
-        size_t shift = 0;
-        size_t lc = width / VECTOR_SIZE;
-        while (lc--){
-            for (size_t c = 0; c < filter_count; c++){
-                entries[c].process_full(filter[c].data + shift, in);
-            }
-            in += VECTOR_SIZE;
-            shift += VECTOR_SIZE;
-        }
-        size_t left = width % VECTOR_SIZE;
-        if (left != 0){
-            for (size_t c = 0; c < filter_count; c++){
-                entries[c].process_partial(filter[c].data + shift, in, left);
-            }
-        }
-        image = (const uint32_t*)((const char*)image + bytes_per_row);
-        for (size_t c = 0; c < filter_count; c++){
-            filter[c].data = (uint32_t*)((const char*)filter[c].data + filter[c].bytes_per_row);
-        }
-    }while (--height);
-    for (size_t c = 0; c < filter_count; c++){
-        filter[c].pixels_in_range = entries[c].count();
-    }
-}
-
 
-template <typename Runner>
-PA_FORCE_INLINE void to_blackwhite_rbg32(
-    const uint32_t* image, size_t bytes_per_row, size_t width, size_t height,
-    ToBlackWhiteRgb32RangeFilter* filter, size_t filter_count
-){
-    if (width == 0 || height == 0){
+    //  Less than vector width. No need for steady-state loop.
+    if (width < VECTOR_SIZE){
+        typename Runner::Mask mask(width);
+        do{
+            const uint32_t* in = image;
+            uint32_t* o0 = out;
+            filter.process_partial(o0, in, mask);
+            image = (const uint32_t*)((const char*)image + in_bytes_per_row);
+            out = (uint32_t*)((const char*)out + out_bytes_per_row);
+        }while (--height);
         return;
     }
 
-    FixedLimitVector<Runner> entries(filter_count);
-    for (size_t c = 0; c < filter_count; c++){
-        entries.emplace_back(filter[c].mins, filter[c].maxs, filter[c].in_range_black);
+    //  Divisible by vector width. No need for peel iteration.
+    size_t left = width % VECTOR_SIZE;
+    if (left == 0){
+        do{
+            const uint32_t* in = image;
+            uint32_t* o0 = out;
+            size_t lc = width / VECTOR_SIZE;
+            do{
+                filter.process_full(o0, in);
+                in += VECTOR_SIZE;
+                o0 += VECTOR_SIZE;
+            }while (--lc);
+            image = (const uint32_t*)((const char*)image + in_bytes_per_row);
+            out = (uint32_t*)((const char*)out + out_bytes_per_row);
+        }while (--height);
+        return;
     }
 
-    const size_t VECTOR_SIZE = Runner::VECTOR_SIZE;
-    do{
-        const uint32_t* in = image;
-        size_t shift = 0;
-        size_t lc = width / VECTOR_SIZE;
+    //  Need both steady-state and peel iteration.
+    {
         do{
-            for (size_t c = 0; c < filter_count; c++){
-                entries[c].process_full(filter[c].data + shift, in);
-            }
-            in += VECTOR_SIZE;
-            shift += VECTOR_SIZE;
-        }while (--lc);
-        size_t left = width % VECTOR_SIZE;
-        if (left != 0){
-            for (size_t c = 0; c < filter_count; c++){
-                entries[c].process_partial(filter[c].data + shift, in, left);
-            }
-        }
-        image = (const uint32_t*)((const char*)image + bytes_per_row);
-        for (size_t c = 0; c < filter_count; c++){
-            filter[c].data = (uint32_t*)((const char*)filter[c].data + filter[c].bytes_per_row);
-        }
-    }while (--height);
-    for (size_t c = 0; c < filter_count; c++){
-        filter[c].pixels_in_range = entries[c].count();
+            const uint32_t* in = image;
+            uint32_t* o0 = out;
+            size_t lc = width / VECTOR_SIZE;
+            do{
+                filter.process_full(o0, in);
+                in += VECTOR_SIZE;
+                o0 += VECTOR_SIZE;
+            }while (--lc);
+            filter.process_partial(o0, in, left);
+            image = (const uint32_t*)((const char*)image + in_bytes_per_row);
+            out = (uint32_t*)((const char*)out + out_bytes_per_row);
+        }while (--height);
     }
 }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 }
 }
 #endif
diff --git a/SerialPrograms/Source/Kernels/ImageFilters/Kernels_ImageFilter_Basic_Routines_ARM64_NEON.h b/SerialPrograms/Source/Kernels/ImageFilters/Kernels_ImageFilter_Basic_Routines_ARM64_NEON.h
new file mode 100644
index 0000000000..652c4899fd
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/ImageFilters/Kernels_ImageFilter_Basic_Routines_ARM64_NEON.h
@@ -0,0 +1,155 @@
+/*  Image Filters Basic Routines
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <stdint.h>
+#include <cstring>
+#include "Common/Compiler.h"
+#include "Kernels/PartialWordAccess/Kernels_PartialWordAccess_arm64_NEON.h"
+#include "Kernels/Kernels_arm64_NEON.h"
+
+namespace PokemonAutomation{
+namespace Kernels{
+
+
+
+
+template <typename PixelTester>
+class FilterImage_Rgb32_ARM64_NEON{
+public:
+    static const size_t VECTOR_SIZE = 4;
+    using Mask = size_t;
+
+public:
+    FilterImage_Rgb32_ARM64_NEON(
+        const PixelTester& tester,
+        uint32_t replacement_color, bool replace_color_within_range
+    )
+        : m_tester(tester)
+        , m_replacement_color_u32(vdupq_n_u32(replacement_color))
+        , m_replace_color_within_range(replace_color_within_range)
+        , m_count_u32(vdupq_n_u32(0))
+    {}
+
+    PA_FORCE_INLINE size_t count() const{
+        // long pairwise add
+        uint64x2_t sum_u64 = vpaddlq_u32(m_count_u32);
+        return sum_u64[0] + sum_u64[1];
+    }
+
+    // Given 4 pixels from in[4], apply color range comparison and count the pixels that are in range.
+    // The counts are stored in m_count_u32.
+    // If a per-pixel mask, cmp_mask_u32 is not nullptr, it only counts the pixels covered by the mask.
+    // It also changes pixels in or out of the range to have the new color m_replacement_color_u32.
+    // The resulting pixels are saved in out[4]
+    PA_FORCE_INLINE void process_full(uint32_t out[4], const uint32_t in[4], const uint32x4_t* cmp_mask_u32 = nullptr){
+        uint32x4_t pixel = vld1q_u32(in);
+        // If a pixel is within [mins, maxs], its uint32_t in `cmp_u32` is all 1 bits, otherwise, all 0 bits
+        uint32x4_t cmp_u32 = m_tester.test_word(pixel);
+        if (cmp_mask_u32){
+            cmp_u32 = vandq_u32(cmp_u32, *cmp_mask_u32);
+        }
+        // Increase count for each pixel in range. Each uint32 lane is counted separately.
+        // We achieve +=1 by substracting 0xFFFFFFFF
+        m_count_u32 = vsubq_u32(m_count_u32, cmp_u32);
+        // select replacement color or in_u8 based on cmp_u32:
+        uint32x4_t out_u32;
+        if (m_replace_color_within_range){
+            // vbslq_u32(a, b, c) for 1 bits in a, choose b; for 0 bits in a, choose c
+            out_u32 = vbslq_u32(cmp_u32, m_replacement_color_u32, pixel);
+        }else{
+            out_u32 = vbslq_u32(cmp_u32, pixel, m_replacement_color_u32);
+        }
+        vst1q_u32(out, out_u32);
+    }
+    // Same as `process_full()` but only process `left` (< 4) pixels
+    PA_FORCE_INLINE void process_partial(uint32_t* out, const uint32_t* in, size_t left){
+        uint32x4_t cmp_mask_u32 = vreinterpretq_u32_u8(PartialWordAccess_arm64_NEON::create_front_mask(left * 4));
+        uint32_t buffer_in[4], buffer_out[4];
+        memcpy(buffer_in, in, sizeof(uint32_t) * left);
+        process_full(buffer_out, buffer_in, &cmp_mask_u32);
+        memcpy(out, buffer_out, sizeof(uint32_t) * left);
+    }
+
+private:
+    const PixelTester m_tester;
+    uint32x4_t m_replacement_color_u32;
+    bool m_replace_color_within_range;
+    uint32x4_t m_count_u32;
+};
+
+
+
+
+
+
+
+template <typename PixelTester>
+class ToBlackWhite_Rgb32_ARM64_NEON{
+public:
+    static const size_t VECTOR_SIZE = 4;
+    using Mask = size_t;
+
+public:
+    ToBlackWhite_Rgb32_ARM64_NEON(
+        const PixelTester& tester,
+        bool in_range_black
+    )
+        : m_tester(tester)
+        , m_in_range_color_u32(vdupq_n_u32(in_range_black ? 0xFF000000 : 0xFFFFFFFF))
+        , m_out_of_range_color_u32(vdupq_n_u32(in_range_black ? 0xFFFFFFFF : 0xFF000000))
+        , m_count_u32(vdupq_n_u32(0))
+    {}
+
+    PA_FORCE_INLINE size_t count() const{
+        uint64x2_t sum_u64 = vpaddlq_u32(m_count_u32);
+        return sum_u64[0] + sum_u64[1];
+    }
+
+    // Given 4 pixels from in[4], apply color range comparison and count the pixels that are in range.
+    // The counts are stored in m_count_u32.
+    // If a per-pixel mask, cmp_mask_u32 is not nullptr, it only counts the pixels covered by the mask.
+    // It also changes pixels into black or white depending on whether they are in range.
+    // The resulting pixels are saved in out[4]
+    PA_FORCE_INLINE void process_full(uint32_t* out, const uint32_t* in, const uint32x4_t* cmp_mask_u32 = nullptr){
+        uint32x4_t pixel = vld1q_u32(in);
+        // If a pixel is within [mins, maxs], its uint32_t in `cmp_u32` is all 1 bits, otherwise, all 0 bits
+        uint32x4_t cmp_u32 = m_tester.test_word(pixel);
+        if (cmp_mask_u32){
+            cmp_u32 = vandq_u32(cmp_u32, *cmp_mask_u32);
+        }
+        // Increase count for each pixel in range. Each uint32 lane is counted separately.
+        // We achieve +=1 by substracting 0xFFFFFFFF
+        m_count_u32 = vsubq_u32(m_count_u32, cmp_u32);
+        // select replacement color or in_u8 based on cmp_u32:
+        uint32x4_t out_u32;
+        // vbslq_u32(a, b, c) for 1 bits in a, choose b; for 0 bits in a, choose c
+        out_u32 = vbslq_u32(cmp_u32, m_in_range_color_u32, m_out_of_range_color_u32);
+
+        vst1q_u32(out, out_u32);
+    }
+
+    // Same as `process_full()` but only process `left` (< 4) pixels
+    PA_FORCE_INLINE void process_partial(uint32_t* out, const uint32_t* in, size_t left){
+        uint32x4_t cmp_mask_u32 = vreinterpretq_u32_u8(PartialWordAccess_arm64_NEON::create_front_mask(left * 4));
+        uint32_t buffer_in[4], buffer_out[4];
+        memcpy(buffer_in, in, sizeof(uint32_t) * left);
+        process_full(buffer_out, buffer_in, &cmp_mask_u32);
+        memcpy(out, buffer_out, sizeof(uint32_t) * left);
+    }
+
+private:
+    const PixelTester m_tester;
+    uint32x4_t m_in_range_color_u32;
+    uint32x4_t m_out_of_range_color_u32;
+    uint32x4_t m_count_u32;
+};
+
+
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/Kernels/ImageFilters/Kernels_ImageFilter_Basic_Routines_Default.h b/SerialPrograms/Source/Kernels/ImageFilters/Kernels_ImageFilter_Basic_Routines_Default.h
new file mode 100644
index 0000000000..94635b245c
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/ImageFilters/Kernels_ImageFilter_Basic_Routines_Default.h
@@ -0,0 +1,102 @@
+/*  Image Filters Basic Routines
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <stdint.h>
+#include "Common/Compiler.h"
+
+namespace PokemonAutomation{
+namespace Kernels{
+
+
+
+
+
+template <typename PixelTester>
+class FilterImage_Rgb32_Default{
+public:
+    static const size_t VECTOR_SIZE = 1;
+    using Mask = size_t;
+
+public:
+    FilterImage_Rgb32_Default(
+        const PixelTester& tester,
+        uint32_t replacement_color, bool replace_color_within_range
+    )
+        : m_tester(tester)
+        , m_replacement_color(replacement_color)
+        , m_replace_color_within_range(replace_color_within_range)
+        , m_count(0)
+    {}
+
+    PA_FORCE_INLINE size_t count() const{
+        return m_count;
+    }
+
+    PA_FORCE_INLINE void process_full(uint32_t* out, const uint32_t* in){
+        uint32_t pixel = in[0];
+        bool passed = m_tester.test_word(pixel);
+        m_count += passed;
+        passed ^= m_replace_color_within_range;
+        out[0] = passed ? pixel : m_replacement_color;
+    }
+    PA_FORCE_INLINE void process_partial(uint32_t* out, const uint32_t* in, size_t left){
+        process_full(out, in);
+    }
+
+private:
+    const PixelTester m_tester;
+    const uint32_t m_replacement_color;
+    const bool m_replace_color_within_range;
+    size_t m_count;
+};
+
+
+
+
+
+
+template <typename PixelTester>
+class ToBlackWhite_Rgb32_Default{
+public:
+    static const size_t VECTOR_SIZE = 1;
+    using Mask = size_t;
+
+public:
+    ToBlackWhite_Rgb32_Default(
+        const PixelTester& tester,
+        bool in_range_black
+    )
+        : m_tester(tester)
+        , m_in_range_black(in_range_black ? 1 : 0)
+        , m_count(0)
+    {}
+
+    PA_FORCE_INLINE size_t count() const{
+        return m_count;
+    }
+
+    PA_FORCE_INLINE void process_full(uint32_t* out, const uint32_t* in){
+        uint32_t pixel = in[0];
+        bool passed = m_tester.test_word(pixel);
+        m_count += passed;
+        passed ^= m_in_range_black;
+        out[0] = passed ? 0xffffffff : 0xff000000;
+    }
+    PA_FORCE_INLINE void process_partial(uint32_t* out, const uint32_t* in, size_t left){
+        process_full(out, in);
+    }
+
+private:
+    const PixelTester m_tester;
+    const bool m_in_range_black;
+    size_t m_count;
+};
+
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/Kernels/ImageFilters/Kernels_ImageFilter_Basic_Routines_x64_AVX2.h b/SerialPrograms/Source/Kernels/ImageFilters/Kernels_ImageFilter_Basic_Routines_x64_AVX2.h
new file mode 100644
index 0000000000..bd20966008
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/ImageFilters/Kernels_ImageFilter_Basic_Routines_x64_AVX2.h
@@ -0,0 +1,132 @@
+/*  Image Filters Basic Routines
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <stdint.h>
+#include <immintrin.h>
+#include "Common/Compiler.h"
+#include "Kernels/Kernels_x64_AVX2.h"
+#include "Kernels/PartialWordAccess/Kernels_PartialWordAccess_x64_AVX2.h"
+
+namespace PokemonAutomation{
+namespace Kernels{
+
+
+
+template <typename PixelTester>
+class FilterImage_Rgb32_x64_AVX2{
+public:
+    static const size_t VECTOR_SIZE = 8;
+    using Mask = PartialWordAccess32_x64_AVX2;
+
+public:
+    FilterImage_Rgb32_x64_AVX2(
+        const PixelTester& tester,
+        uint32_t replacement, bool replace_color_within_range
+    )
+        : m_tester(tester)
+        , m_replacement(_mm256_set1_epi32(replacement))
+        , m_invert(replace_color_within_range ? _mm256_set1_epi32(-1) : _mm256_setzero_si256())
+        , m_count(_mm256_setzero_si256())
+    {}
+
+    PA_FORCE_INLINE size_t count() const{
+        return reduce_add32_x64_AVX2(m_count);
+    }
+
+    PA_FORCE_INLINE void process_full(uint32_t* out, const uint32_t* in){
+        __m256i pixel = _mm256_loadu_si256((const __m256i*)in);
+        __m256i in_range_pixels = process_word(pixel);
+        m_count = _mm256_sub_epi32(m_count, in_range_pixels);
+        _mm256_storeu_si256((__m256i*)out, pixel);
+    }
+    PA_FORCE_INLINE void process_partial(uint32_t* out, const uint32_t* in, const Mask& mask){
+        __m256i pixel = mask.load_i32(in);
+        __m256i in_range_pixels = process_word(pixel);
+        in_range_pixels = _mm256_and_si256(in_range_pixels, mask.mask());
+        m_count = _mm256_sub_epi32(m_count, in_range_pixels);
+        mask.store(out, pixel);
+    }
+
+private:
+    //  Process the pixel in-place.
+    //  Return a mask indicating which lanes are in range.
+    PA_FORCE_INLINE __m256i process_word(__m256i& pixel) const{
+        __m256i mask = m_tester.test_word(pixel);
+        pixel = _mm256_blendv_epi8(
+            m_replacement,
+            pixel,
+            _mm256_xor_si256(mask, m_invert)
+        );
+        return mask;
+    }
+
+private:
+    const PixelTester m_tester;
+    const __m256i m_replacement;
+    const __m256i m_invert;
+    __m256i m_count;
+};
+
+
+
+
+template <typename PixelTester>
+class ToBlackWhite_Rgb32_x64_AVX2{
+public:
+    static const size_t VECTOR_SIZE = 8;
+    using Mask = PartialWordAccess32_x64_AVX2;
+
+public:
+    ToBlackWhite_Rgb32_x64_AVX2(
+        const PixelTester& tester,
+        bool in_range_black
+    )
+        : m_tester(tester)
+        , m_in_range_black(_mm256_set1_epi32(in_range_black ? -1 : 0))
+        , m_count(_mm256_setzero_si256())
+    {}
+
+    PA_FORCE_INLINE size_t count() const{
+        return reduce_add32_x64_AVX2(m_count);
+    }
+
+    PA_FORCE_INLINE void process_full(uint32_t* out, const uint32_t* in){
+        __m256i pixel = _mm256_loadu_si256((const __m256i*)in);
+        __m256i in_range_pixels = process_word(pixel);
+        m_count = _mm256_sub_epi32(m_count, in_range_pixels);
+        _mm256_storeu_si256((__m256i*)out, pixel);
+    }
+    PA_FORCE_INLINE void process_partial(uint32_t* out, const uint32_t* in, const Mask& mask){
+        __m256i pixel = mask.load_i32(in);
+        __m256i in_range_pixels = process_word(pixel);
+        in_range_pixels = _mm256_and_si256(in_range_pixels, mask.mask());
+        m_count = _mm256_sub_epi32(m_count, in_range_pixels);
+        mask.store(out, pixel);
+    }
+
+private:
+    //  Process the pixel in-place.
+    //  Return a mask indicating which lanes are in range.
+    PA_FORCE_INLINE __m256i process_word(__m256i& pixel) const{
+        __m256i mask = m_tester.test_word(pixel);
+        pixel = _mm256_or_si256(
+            _mm256_xor_si256(mask, m_in_range_black),
+            _mm256_set1_epi32(0xff000000)
+        );
+        return mask;
+    }
+
+private:
+    const PixelTester m_tester;
+    const __m256i m_in_range_black;
+    __m256i m_count;
+};
+
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/Kernels/ImageFilters/Kernels_ImageFilter_Basic_Routines_x64_AVX512.h b/SerialPrograms/Source/Kernels/ImageFilters/Kernels_ImageFilter_Basic_Routines_x64_AVX512.h
new file mode 100644
index 0000000000..a1f1f54685
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/ImageFilters/Kernels_ImageFilter_Basic_Routines_x64_AVX512.h
@@ -0,0 +1,147 @@
+/*  Image Filters Basic Routines
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <stdint.h>
+#include <immintrin.h>
+#include "Common/Compiler.h"
+
+
+namespace PokemonAutomation{
+namespace Kernels{
+
+
+
+struct PartialWordMask_x64_AVX512{
+    __mmask16 m;
+
+    PA_FORCE_INLINE PartialWordMask_x64_AVX512(size_t left)
+        : m(((__mmask16)1 << left) - 1)
+    {}
+};
+
+
+
+
+template <typename PixelTester>
+class FilterImage_Rgb32_x64_AVX512{
+public:
+    static const size_t VECTOR_SIZE = 16;
+    using Mask = PartialWordMask_x64_AVX512;
+
+public:
+    FilterImage_Rgb32_x64_AVX512(
+        const PixelTester& tester,
+        uint32_t replacement, bool replace_color_within_range
+    )
+        : m_tester(tester)
+        , m_replacement(_mm512_set1_epi32(replacement))
+        , m_invert(replace_color_within_range ? 0xffff : 0)
+        , m_count(_mm512_setzero_si512())
+    {}
+
+    PA_FORCE_INLINE size_t count() const{
+        return _mm512_reduce_add_epi32(m_count);
+    }
+
+    PA_FORCE_INLINE void process_full(uint32_t* out, const uint32_t* in){
+        __m512i pixel = _mm512_loadu_si512((const __m512i*)in);
+        __mmask16 in_range_pixels = process_word(pixel);
+        m_count = _mm512_mask_sub_epi32(m_count, in_range_pixels, m_count, _mm512_set1_epi32(-1));
+        _mm512_storeu_si512((__m512i*)out, pixel);
+    }
+    PA_FORCE_INLINE void process_partial(uint32_t* out, const uint32_t* in, const Mask& mask){
+        __m512i pixel = _mm512_maskz_loadu_epi32(mask.m, in);
+        __mmask16 in_range_pixels = process_word(pixel);
+        in_range_pixels &= mask.m;
+        m_count = _mm512_mask_sub_epi32(m_count, in_range_pixels, m_count, _mm512_set1_epi32(-1));
+        _mm512_mask_storeu_epi32(out, mask.m, pixel);
+    }
+
+private:
+    //  Process the pixel in-place.
+    //  Return a mask indicating which lanes are in range.
+    PA_FORCE_INLINE __mmask16 process_word(__m512i& pixel) const{
+        __mmask16 mask = m_tester.test_word(pixel);
+        pixel = _mm512_mask_blend_epi32(
+            mask ^ m_invert,
+            m_replacement,
+            pixel
+        );
+        return mask;
+    }
+
+private:
+    const PixelTester m_tester;
+    const __m512i m_replacement;
+    const __mmask16 m_invert;
+    __m512i m_count;
+};
+
+
+
+
+
+template <typename PixelTester>
+class ToBlackWhite_Rgb32_x64_AVX512{
+public:
+    static const size_t VECTOR_SIZE = 16;
+    using Mask = PartialWordMask_x64_AVX512;
+
+public:
+    ToBlackWhite_Rgb32_x64_AVX512(
+        const PixelTester& tester,
+        bool in_range_black
+    )
+        : m_tester(tester)
+        , m_in_range_color(_mm512_set1_epi32(in_range_black ? 0xff000000 : 0xffffffff))
+        , m_out_range_color(_mm512_set1_epi32(in_range_black ? 0xffffffff : 0xff000000))
+        , m_count(_mm512_setzero_si512())
+    {}
+
+    PA_FORCE_INLINE size_t count() const{
+        return _mm512_reduce_add_epi32(m_count);
+    }
+
+    PA_FORCE_INLINE void process_full(uint32_t* out, const uint32_t* in){
+        __m512i pixel = _mm512_loadu_si512((const __m512i*)in);
+        __mmask16 in_range_pixels = process_word(pixel);
+        m_count = _mm512_mask_sub_epi32(m_count, in_range_pixels, m_count, _mm512_set1_epi32(-1));
+        _mm512_storeu_si512((__m512i*)out, pixel);
+    }
+    PA_FORCE_INLINE void process_partial(uint32_t* out, const uint32_t* in, const Mask& mask){
+        __m512i pixel = _mm512_maskz_loadu_epi32(mask.m, in);
+        __mmask16 in_range_pixels = process_word(pixel);
+        in_range_pixels &= mask.m;
+        m_count = _mm512_mask_sub_epi32(m_count, in_range_pixels, m_count, _mm512_set1_epi32(-1));
+        _mm512_mask_storeu_epi32(out, mask.m, pixel);
+    }
+
+private:
+    //  Process the pixel in-place.
+    //  Return a mask indicating which lanes are in range.
+    PA_FORCE_INLINE __mmask16 process_word(__m512i& pixel) const{
+        __mmask16 mask = m_tester.test_word(pixel);
+        pixel = _mm512_mask_blend_epi32(
+            mask,
+            m_out_range_color,
+            m_in_range_color
+        );
+        return mask;
+    }
+
+private:
+    const PixelTester m_tester;
+    const __m512i m_in_range_color;
+    const __m512i m_out_range_color;
+    __m512i m_count;
+};
+
+
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/Kernels/ImageFilters/Kernels_ImageFilter_Basic_Routines_x64_SSE42.h b/SerialPrograms/Source/Kernels/ImageFilters/Kernels_ImageFilter_Basic_Routines_x64_SSE42.h
new file mode 100644
index 0000000000..2482c4ab22
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/ImageFilters/Kernels_ImageFilter_Basic_Routines_x64_SSE42.h
@@ -0,0 +1,169 @@
+/*  Image Filters Basic Routines
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <stdint.h>
+#include <immintrin.h>
+#include "Common/Compiler.h"
+#include "Kernels/Kernels_x64_SSE41.h"
+#include "Kernels/PartialWordAccess/Kernels_PartialWordAccess_x64_SSE41.h"
+
+namespace PokemonAutomation{
+namespace Kernels{
+
+
+
+struct PartialWordMask_x64_SSE42{
+    size_t left;
+    PartialWordAccess_x64_SSE41 loader;
+
+    PA_FORCE_INLINE PartialWordMask_x64_SSE42(size_t p_left)
+        : left(p_left)
+        , loader(left * sizeof(uint32_t))
+    {}
+};
+
+
+
+
+
+template <typename PixelTester>
+class FilterImage_Rgb32_x64_SSE42{
+public:
+    static const size_t VECTOR_SIZE = 4;
+    using Mask = PartialWordMask_x64_SSE42;
+
+public:
+    FilterImage_Rgb32_x64_SSE42(
+        const PixelTester& tester,
+        uint32_t replacement, bool replace_color_within_range
+    )
+        : m_tester(tester)
+        , m_replacement(_mm_set1_epi32(replacement))
+        , m_invert(replace_color_within_range ? _mm_set1_epi32(-1) : _mm_setzero_si128())
+        , m_count(_mm_setzero_si128())
+    {}
+
+    PA_FORCE_INLINE size_t count() const{
+        return reduce32_x64_SSE41(m_count);
+    }
+
+    PA_FORCE_INLINE void process_full(uint32_t* out, const uint32_t* in){
+        __m128i pixel = _mm_loadu_si128((const __m128i*)in);
+        __m128i in_range_pixels = process_word(pixel);
+        m_count = _mm_sub_epi32(m_count, in_range_pixels);
+        _mm_storeu_si128((__m128i*)out, pixel);
+    }
+    PA_FORCE_INLINE void process_partial(uint32_t* out, const uint32_t* in, const Mask& mask){
+        __m128i vmask = _mm_cmpgt_epi32(
+            _mm_set1_epi32((uint32_t)mask.left),
+            _mm_setr_epi32(0, 1, 2, 3)
+        );
+
+        __m128i pixel = mask.loader.load(in);
+        __m128i in_range_pixels = process_word(pixel);
+        in_range_pixels = _mm_and_si128(in_range_pixels, vmask);
+        m_count = _mm_sub_epi32(m_count, in_range_pixels);
+        size_t left = mask.left;
+        do{
+            out[0] = _mm_cvtsi128_si32(pixel);
+            pixel = _mm_srli_si128(pixel, 4);
+            out++;
+        }while(--left);
+    }
+
+private:
+    //  Process the pixel in-place.
+    //  Return a mask indicating which lanes are in range.
+    PA_FORCE_INLINE __m128i process_word(__m128i& pixel) const{
+        __m128i mask = m_tester.test_word(pixel);
+        pixel = _mm_blendv_epi8(
+            m_replacement,
+            pixel,
+            _mm_xor_si128(mask, m_invert)
+        );
+        return mask;
+    }
+
+private:
+    const PixelTester m_tester;
+    const __m128i m_replacement;
+    const __m128i m_invert;
+    __m128i m_count;
+};
+
+
+
+
+
+
+
+template <typename PixelTester>
+class ToBlackWhite_Rgb32_x64_SSE42{
+public:
+    static const size_t VECTOR_SIZE = 4;
+    using Mask = PartialWordMask_x64_SSE42;
+
+public:
+    ToBlackWhite_Rgb32_x64_SSE42(
+        const PixelTester& tester,
+        bool in_range_black
+    )
+        : m_tester(tester)
+        , m_in_range_black(_mm_set1_epi32(in_range_black ? -1 : 0))
+        , m_count(_mm_setzero_si128())
+    {}
+
+    PA_FORCE_INLINE size_t count() const{
+        return reduce32_x64_SSE41(m_count);
+    }
+
+    PA_FORCE_INLINE void process_full(uint32_t* out, const uint32_t* in){
+        __m128i pixel = _mm_loadu_si128((const __m128i*)in);
+        __m128i in_range_pixels = process_word(pixel);
+        m_count = _mm_sub_epi32(m_count, in_range_pixels);
+        _mm_storeu_si128((__m128i*)out, pixel);
+    }
+    PA_FORCE_INLINE void process_partial(uint32_t* out, const uint32_t* in, const Mask& mask){
+        __m128i vmask = _mm_cmpgt_epi32(
+            _mm_set1_epi32((uint32_t)mask.left),
+            _mm_setr_epi32(0, 1, 2, 3)
+        );
+
+        __m128i pixel = mask.loader.load(in);
+        __m128i in_range_pixels = process_word(pixel);
+        in_range_pixels = _mm_and_si128(in_range_pixels, vmask);
+        m_count = _mm_sub_epi32(m_count, in_range_pixels);
+        size_t left = mask.left;
+        do{
+            out[0] = _mm_cvtsi128_si32(pixel);
+            pixel = _mm_srli_si128(pixel, 4);
+            out++;
+        }while(--left);
+    }
+
+private:
+    //  Process the pixel in-place.
+    //  Return a mask indicating which lanes are in range.
+    PA_FORCE_INLINE __m128i process_word(__m128i& pixel) const{
+        __m128i mask = m_tester.test_word(pixel);
+        pixel = _mm_or_si128(
+            _mm_xor_si128(mask, m_in_range_black),
+            _mm_set1_epi32(0xff000000)
+        );
+        return mask;
+    }
+
+private:
+    const PixelTester m_tester;
+    const __m128i m_in_range_black;
+    __m128i m_count;
+};
+
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/Kernels/ImageFilters/Kernels_ImageFilter_Basic_x64_AVX2.cpp b/SerialPrograms/Source/Kernels/ImageFilters/Kernels_ImageFilter_Basic_x64_AVX2.cpp
deleted file mode 100644
index 1d9bba22ae..0000000000
--- a/SerialPrograms/Source/Kernels/ImageFilters/Kernels_ImageFilter_Basic_x64_AVX2.cpp
+++ /dev/null
@@ -1,249 +0,0 @@
-/*  Image Filters Basic (x64 AVX2)
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifdef PA_AutoDispatch_x64_13_Haswell
-
-#include <stdint.h>
-#include <cstddef>
-#include <immintrin.h>
-#include "Kernels/Kernels_x64_AVX2.h"
-#include "Kernels/PartialWordAccess/Kernels_PartialWordAccess_x64_AVX2.h"
-#include "Kernels_ImageFilter_Basic_Routines.h"
-
-namespace PokemonAutomation{
-namespace Kernels{
-
-
-class ImageFilterByMask_x64_AVX2{
-public:
-    static const size_t VECTOR_SIZE = 8;
-
-public:
-    ImageFilterByMask_x64_AVX2(uint32_t mins, uint32_t maxs, uint32_t replacement, bool invert)
-        : m_replacement(_mm256_set1_epi32(replacement))
-        , m_invert(invert ? _mm256_set1_epi32(-1) : _mm256_setzero_si256())
-        , m_mins(_mm256_set1_epi32(mins ^ 0x80808080))
-        , m_maxs(_mm256_set1_epi32(maxs ^ 0x80808080))
-        , m_count(_mm256_setzero_si256())
-    {}
-
-    PA_FORCE_INLINE size_t count() const{
-        return reduce_add32_x64_AVX2(m_count);
-    }
-
-    PA_FORCE_INLINE void process_full(uint32_t* out, const uint32_t* in){
-        __m256i pixel = _mm256_loadu_si256((const __m256i*)in);
-        pixel = process_word(pixel);
-        _mm256_storeu_si256((__m256i*)out, pixel);
-    }
-    PA_FORCE_INLINE void process_partial(uint32_t* out, const uint32_t* in, size_t left){
-        PartialWordAccess32_x64_AVX2 loader(left);
-        __m256i pixel = loader.load_i32(in);
-        pixel = process_word(pixel);
-        loader.store(out, pixel);
-    }
-
-private:
-    PA_FORCE_INLINE __m256i process_word(__m256i pixel){
-        __m256i adj = _mm256_xor_si256(pixel, _mm256_set1_epi8((uint8_t)0x80));
-        __m256i cmp0 = _mm256_cmpgt_epi8(m_mins, adj);
-        __m256i cmp1 = _mm256_cmpgt_epi8(adj, m_maxs);
-        cmp0 = _mm256_or_si256(cmp0, cmp1);
-        cmp0 = _mm256_cmpeq_epi32(cmp0, _mm256_setzero_si256());
-        m_count = _mm256_sub_epi32(m_count, cmp0);
-        cmp0 = _mm256_xor_si256(cmp0, m_invert);
-        return _mm256_blendv_epi8(m_replacement, pixel, cmp0);
-    }
-
-private:
-    const __m256i m_replacement;
-    const __m256i m_invert;
-    const __m256i m_mins;
-    const __m256i m_maxs;
-    __m256i m_count;
-};
-
-
-
-size_t filter_rgb32_range_x64_AVX2(
-    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
-    uint32_t* out, size_t out_bytes_per_row,
-    uint32_t mins, uint32_t maxs,
-    uint32_t replacement, bool invert
-){
-    ImageFilterByMask_x64_AVX2 filter(mins, maxs, replacement, invert);
-    filter_per_pixel(in, in_bytes_per_row, width, height, filter, out, out_bytes_per_row);
-    return filter.count();
-}
-void filter_rgb32_range_x64_AVX2(
-    const uint32_t* image, size_t bytes_per_row, size_t width, size_t height,
-    FilterRgb32RangeFilter* filter, size_t filter_count
-){
-    filter_per_pixel<ImageFilterByMask_x64_AVX2>(
-        image, bytes_per_row, width, height, filter, filter_count
-    );
-}
-
-
-
-
-
-class ImageFilter_RgbEuclidean_x64_AVX2{
-public:
-    static const size_t VECTOR_SIZE = 8;
-
-public:
-    ImageFilter_RgbEuclidean_x64_AVX2(uint32_t expected, double max_euclidean_distance, uint32_t replacement, bool invert)
-        : m_replacement(_mm256_set1_epi32(replacement))
-        , m_invert(invert ? _mm256_set1_epi32(-1) : _mm256_setzero_si256())
-        , m_expected_ag(_mm256_set1_epi32((expected >> 8) & 0x000000ff))
-        , m_expected_rb(_mm256_set1_epi32(expected & 0x00ff00ff))
-        , m_distance_squared(_mm256_set1_epi32((uint32_t)(max_euclidean_distance * max_euclidean_distance)))
-        , m_count(_mm256_setzero_si256())
-    {}
-
-    PA_FORCE_INLINE size_t count() const{
-        return reduce_add32_x64_AVX2(m_count);
-    }
-
-    PA_FORCE_INLINE void process_full(uint32_t* out, const uint32_t* in){
-        __m256i pixel = _mm256_loadu_si256((const __m256i*)in);
-        pixel = process_word(pixel);
-        _mm256_storeu_si256((__m256i*)out, pixel);
-    }
-    PA_FORCE_INLINE void process_partial(uint32_t* out, const uint32_t* in, size_t left){
-        PartialWordAccess32_x64_AVX2 loader(left);
-        __m256i pixel = loader.load_i32(in);
-        pixel = process_word(pixel);
-        loader.store(out, pixel);
-    }
-
-private:
-    PA_FORCE_INLINE __m256i process_word(__m256i pixel){
-        __m256i ag = _mm256_and_si256(_mm256_srli_epi16(pixel, 8), _mm256_set1_epi32(0x000000ff));
-        __m256i rb = _mm256_and_si256(pixel, _mm256_set1_epi32(0x00ff00ff));
-
-        ag = _mm256_sub_epi16(ag, m_expected_ag);
-        rb = _mm256_sub_epi16(rb, m_expected_rb);
-
-        __m256i g = _mm256_mullo_epi16(ag, ag);
-        rb = _mm256_mullo_epi16(rb, rb);
-        __m256i r = _mm256_srli_epi32(rb, 16);
-        __m256i b = _mm256_and_si256(rb, _mm256_set1_epi32(0x0000ffff));
-
-        __m256i sum_sqr = _mm256_add_epi32(r, g);
-        sum_sqr = _mm256_add_epi32(sum_sqr, b);
-
-        __m256i cmp = _mm256_cmpgt_epi32(m_distance_squared, sum_sqr);
-
-        m_count = _mm256_sub_epi32(m_count, cmp);
-        cmp = _mm256_xor_si256(cmp, m_invert);
-        return _mm256_blendv_epi8(m_replacement, pixel, cmp);
-    }
-
-private:
-    const __m256i m_replacement;
-    const __m256i m_invert;
-    const __m256i m_expected_ag;
-    const __m256i m_expected_rb;
-    const __m256i m_distance_squared;
-    __m256i m_count;
-};
-size_t filter_rgb32_euclidean_x64_AVX2(
-    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
-    uint32_t* out, size_t out_bytes_per_row,
-    uint32_t expected, double max_euclidean_distance,
-    uint32_t replacement, bool invert
-){
-    ImageFilter_RgbEuclidean_x64_AVX2 filter(expected, max_euclidean_distance, replacement, invert);
-    filter_per_pixel(in, in_bytes_per_row, width, height, filter, out, out_bytes_per_row);
-    return filter.count();
-}
-
-
-
-
-
-
-class ToBlackWhite_RgbRange_x64_AVX2{
-public:
-    static const size_t VECTOR_SIZE = 8;
-
-public:
-    ToBlackWhite_RgbRange_x64_AVX2(uint32_t mins, uint32_t maxs, bool in_range_black)
-        : m_in_range_black(in_range_black ? _mm256_set1_epi32(-1) : _mm256_setzero_si256())
-        , m_mins(_mm256_set1_epi32(mins ^ 0x80808080))
-        , m_maxs(_mm256_set1_epi32(maxs ^ 0x80808080))
-        , m_count(_mm256_setzero_si256())
-    {}
-
-    PA_FORCE_INLINE size_t count() const{
-        return reduce_add32_x64_AVX2(m_count);
-    }
-
-    PA_FORCE_INLINE void process_full(uint32_t* out, const uint32_t* in){
-        __m256i pixel = _mm256_loadu_si256((const __m256i*)in);
-        pixel = process_word(pixel);
-        _mm256_storeu_si256((__m256i*)out, pixel);
-    }
-    PA_FORCE_INLINE void process_partial(uint32_t* out, const uint32_t* in, size_t left){
-        PartialWordAccess32_x64_AVX2 loader(left);
-        __m256i pixel = loader.load_i32(in);
-        pixel = process_word(pixel);
-        loader.store(out, pixel);
-    }
-
-private:
-    PA_FORCE_INLINE __m256i process_word(__m256i pixel){
-        __m256i adj = _mm256_xor_si256(pixel, _mm256_set1_epi8((uint8_t)0x80));
-        __m256i cmp0 = _mm256_cmpgt_epi8(m_mins, adj);
-        __m256i cmp1 = _mm256_cmpgt_epi8(adj, m_maxs);
-        cmp0 = _mm256_or_si256(cmp0, cmp1);
-        cmp0 = _mm256_cmpeq_epi32(cmp0, _mm256_setzero_si256());
-        m_count = _mm256_sub_epi32(m_count, cmp0);
-        cmp0 = _mm256_xor_si256(cmp0, m_in_range_black);
-        return _mm256_or_si256(cmp0, _mm256_set1_epi32(0xff000000));
-    }
-
-private:
-    const __m256i m_in_range_black;
-    const __m256i m_mins;
-    const __m256i m_maxs;
-    __m256i m_count;
-};
-
-
-
-size_t to_blackwhite_rgb32_range_x64_AVX2(
-    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
-    uint32_t* out, size_t out_bytes_per_row,
-    uint32_t mins, uint32_t maxs, bool in_range_black
-){
-    ToBlackWhite_RgbRange_x64_AVX2 filter(mins, maxs, in_range_black);
-    filter_per_pixel(in, in_bytes_per_row, width, height, filter, out, out_bytes_per_row);
-    return filter.count();
-}
-void to_blackwhite_rgb32_range_x64_AVX2(
-    const uint32_t* image, size_t bytes_per_row, size_t width, size_t height,
-    ToBlackWhiteRgb32RangeFilter* filter, size_t filter_count
-){
-    to_blackwhite_rbg32<ToBlackWhite_RgbRange_x64_AVX2>(
-        image, bytes_per_row, width, height, filter, filter_count
-    );
-}
-
-
-
-
-
-
-
-
-
-
-}
-}
-#endif
diff --git a/SerialPrograms/Source/Kernels/ImageFilters/Kernels_ImageFilter_Basic_x64_AVX512.cpp b/SerialPrograms/Source/Kernels/ImageFilters/Kernels_ImageFilter_Basic_x64_AVX512.cpp
deleted file mode 100644
index 9c72122628..0000000000
--- a/SerialPrograms/Source/Kernels/ImageFilters/Kernels_ImageFilter_Basic_x64_AVX512.cpp
+++ /dev/null
@@ -1,265 +0,0 @@
-/*  Image Filters Basic (x64 AVX512)
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifdef PA_AutoDispatch_x64_17_Skylake
-
-#include <stdint.h>
-#include <cstddef>
-#include <immintrin.h>
-#include "Kernels/Kernels_x64_AVX512.h"
-#include "Kernels_ImageFilter_Basic_Routines.h"
-
-namespace PokemonAutomation{
-namespace Kernels{
-
-
-class ImageFilterByMask_x64_AVX512{
-public:
-    static const size_t VECTOR_SIZE = 16;
-
-public:
-    ImageFilterByMask_x64_AVX512(uint32_t mins, uint32_t maxs, uint32_t replacement, bool invert)
-        : m_replacement(_mm512_set1_epi32(replacement))
-        , m_invert(invert ? 0xffff : 0)
-        , m_mins(_mm512_set1_epi32(mins))
-        , m_maxs(_mm512_set1_epi32(maxs))
-        , m_count(_mm512_setzero_si512())
-    {}
-
-    PA_FORCE_INLINE size_t count() const{
-        return _mm512_reduce_add_epi32(m_count);
-    }
-
-    PA_FORCE_INLINE void process_full(uint32_t* out, const uint32_t* in){
-        __m512i pixel = _mm512_loadu_si512((const __m512i*)in);
-        pixel = process_word(pixel);
-        _mm512_storeu_si512((__m512i*)out, pixel);
-    }
-    PA_FORCE_INLINE void process_partial(uint32_t* out, const uint32_t* in, size_t left){
-        uint64_t mask = ((uint64_t)1 << left) - 1;
-        __m512i pixel = _mm512_maskz_loadu_epi32((__mmask16)mask, in);
-        pixel = process_word(pixel);
-        _mm512_mask_storeu_epi32(out, (__mmask16)mask, pixel);
-    }
-
-private:
-    PA_FORCE_INLINE __m512i process_word(__m512i pixel){
-#if 0
-        __mmask64 cmp64A = _mm512_cmpgt_epu8_mask(m_mins, pixel);
-        __mmask64 cmp64B = _mm512_cmpgt_epu8_mask(pixel, m_maxs);
-        __m512i mask = _mm512_movm_epi8(cmp64A | cmp64B);
-        __mmask16 cmp16 = _mm512_cmpeq_epi32_mask(mask, _mm512_setzero_si512());
-#else
-        __mmask64 cmp64A = _mm512_cmple_epu8_mask(m_mins, pixel);
-        __mmask64 cmp64B = _mm512_mask_cmple_epu8_mask(cmp64A, pixel, m_maxs);
-        __m512i mask = _mm512_movm_epi8(cmp64B);
-        __mmask16 cmp16 = _mm512_cmpeq_epi32_mask(mask, _mm512_set1_epi32(-1));
-#endif
-        m_count = _mm512_mask_sub_epi32(m_count, cmp16, m_count, _mm512_set1_epi32(-1));
-        cmp16 ^= m_invert;
-        return _mm512_mask_blend_epi32(cmp16, m_replacement, pixel);
-    }
-
-private:
-    const __m512i m_replacement;
-    const __mmask16 m_invert;
-    const __m512i m_mins;
-    const __m512i m_maxs;
-    __m512i m_count;
-};
-
-
-
-size_t filter_rgb32_range_x64_AVX512(
-    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
-    uint32_t* out, size_t out_bytes_per_row, uint32_t mins, uint32_t maxs, uint32_t replacement, bool invert
-){
-    ImageFilterByMask_x64_AVX512 filter(mins, maxs, replacement, invert);
-    filter_per_pixel(in, in_bytes_per_row, width, height, filter, out, out_bytes_per_row);
-    return filter.count();
-}
-void filter_rgb32_range_x64_AVX512(
-    const uint32_t* image, size_t bytes_per_row, size_t width, size_t height,
-    FilterRgb32RangeFilter* filter, size_t filter_count
-){
-    filter_per_pixel<ImageFilterByMask_x64_AVX512>(
-        image, bytes_per_row, width, height, filter, filter_count
-    );
-}
-
-
-
-
-
-class ImageFilter_RgbEuclidean_x64_AVX512{
-public:
-    static const size_t VECTOR_SIZE = 16;
-
-public:
-    ImageFilter_RgbEuclidean_x64_AVX512(uint32_t expected, double max_euclidean_distance, uint32_t replacement, bool invert)
-        : m_replacement(_mm512_set1_epi32(replacement))
-        , m_invert(invert ? 0xffff : 0)
-        , m_expected_ag(_mm512_set1_epi32((expected >> 8) & 0x000000ff))
-        , m_expected_rb(_mm512_set1_epi32(expected & 0x00ff00ff))
-        , m_distance_squared(_mm512_set1_epi32((uint32_t)(max_euclidean_distance * max_euclidean_distance)))
-        , m_count(_mm512_setzero_si512())
-    {}
-
-    PA_FORCE_INLINE size_t count() const{
-        return _mm512_reduce_add_epi32(m_count);
-    }
-
-    PA_FORCE_INLINE void process_full(uint32_t* out, const uint32_t* in){
-        __m512i pixel = _mm512_loadu_si512((const __m512i*)in);
-        pixel = process_word(pixel);
-        _mm512_storeu_si512((__m512i*)out, pixel);
-    }
-    PA_FORCE_INLINE void process_partial(uint32_t* out, const uint32_t* in, size_t left){
-        uint64_t mask = ((uint64_t)1 << left) - 1;
-        __m512i pixel = _mm512_maskz_loadu_epi32((__mmask16)mask, in);
-        pixel = process_word(pixel);
-        _mm512_mask_storeu_epi32(out, (__mmask16)mask, pixel);
-    }
-
-private:
-    PA_FORCE_INLINE __m512i process_word(__m512i pixel){
-        __m512i ag = _mm512_and_si512(_mm512_srli_epi16(pixel, 8), _mm512_set1_epi32(0x000000ff));
-        __m512i rb = _mm512_and_si512(pixel, _mm512_set1_epi32(0x00ff00ff));
-
-        ag = _mm512_sub_epi16(ag, m_expected_ag);
-        rb = _mm512_sub_epi16(rb, m_expected_rb);
-
-        __m512i g = _mm512_mullo_epi16(ag, ag);
-        rb = _mm512_mullo_epi16(rb, rb);
-        __m512i r = _mm512_srli_epi32(rb, 16);
-        __m512i b = _mm512_and_si512(rb, _mm512_set1_epi32(0x0000ffff));
-
-        __m512i sum_sqr = _mm512_add_epi32(r, g);
-        sum_sqr = _mm512_add_epi32(sum_sqr, b);
-
-        __mmask16 cmp = _mm512_cmpgt_epi32_mask(m_distance_squared, sum_sqr);
-
-        m_count = _mm512_mask_sub_epi32(m_count, cmp, m_count, _mm512_set1_epi32(-1));
-        cmp ^= m_invert;
-        return _mm512_mask_blend_epi32(cmp, m_replacement, pixel);
-    }
-
-private:
-    const __m512i m_replacement;
-    const __mmask16 m_invert;
-    const __m512i m_expected_ag;
-    const __m512i m_expected_rb;
-    const __m512i m_distance_squared;
-    __m512i m_count;
-};
-size_t filter_rgb32_euclidean_x64_AVX512(
-    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
-    uint32_t* out, size_t out_bytes_per_row,
-    uint32_t expected, double max_euclidean_distance,
-    uint32_t replacement, bool invert
-){
-    ImageFilter_RgbEuclidean_x64_AVX512 filter(expected, max_euclidean_distance, replacement, invert);
-    filter_per_pixel(in, in_bytes_per_row, width, height, filter, out, out_bytes_per_row);
-    return filter.count();
-}
-
-
-
-
-
-
-
-
-
-class ToBlackWhite_RgbRange_x64_AVX512{
-public:
-    static const size_t VECTOR_SIZE = 16;
-
-public:
-    ToBlackWhite_RgbRange_x64_AVX512(uint32_t mins, uint32_t maxs, bool in_range_black)
-        : m_in_range_black(in_range_black ? 0xffff : 0)
-        , m_mins(_mm512_set1_epi32(mins))
-        , m_maxs(_mm512_set1_epi32(maxs))
-        , m_count(_mm512_setzero_si512())
-    {}
-
-    PA_FORCE_INLINE size_t count() const{
-        return _mm512_reduce_add_epi32(m_count);
-    }
-
-    PA_FORCE_INLINE void process_full(uint32_t* out, const uint32_t* in){
-        __m512i pixel = _mm512_loadu_si512((const __m512i*)in);
-        pixel = process_word(pixel);
-        _mm512_storeu_si512((__m512i*)out, pixel);
-    }
-    PA_FORCE_INLINE void process_partial(uint32_t* out, const uint32_t* in, size_t left){
-        uint64_t mask = ((uint64_t)1 << left) - 1;
-        __m512i pixel = _mm512_maskz_loadu_epi32((__mmask16)mask, in);
-        pixel = process_word(pixel);
-        _mm512_mask_storeu_epi32(out, (__mmask16)mask, pixel);
-    }
-
-private:
-    PA_FORCE_INLINE __m512i process_word(__m512i pixel){
-#if 0
-        __mmask64 cmp64A = _mm512_cmpgt_epu8_mask(m_mins, pixel);
-        __mmask64 cmp64B = _mm512_cmpgt_epu8_mask(pixel, m_maxs);
-        __m512i mask = _mm512_movm_epi8(cmp64A | cmp64B);
-        __mmask16 cmp16 = _mm512_cmpeq_epi32_mask(mask, _mm512_setzero_si512());
-#else
-        __mmask64 cmp64A = _mm512_cmple_epu8_mask(m_mins, pixel);
-        __mmask64 cmp64B = _mm512_mask_cmple_epu8_mask(cmp64A, pixel, m_maxs);
-        __m512i mask = _mm512_movm_epi8(cmp64B);
-        __mmask16 cmp16 = _mm512_cmpeq_epi32_mask(mask, _mm512_set1_epi32(-1));
-#endif
-        m_count = _mm512_mask_sub_epi32(m_count, cmp16, m_count, _mm512_set1_epi32(-1));
-        cmp16 ^= m_in_range_black;
-        return _mm512_mask_blend_epi32(cmp16, _mm512_set1_epi32(0xff000000), _mm512_set1_epi32(-1));
-    }
-
-private:
-    const __mmask16 m_in_range_black;
-    const __m512i m_mins;
-    const __m512i m_maxs;
-    __m512i m_count;
-};
-
-
-
-size_t to_blackwhite_rgb32_range_x64_AVX512(
-    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
-    uint32_t* out, size_t out_bytes_per_row,
-    uint32_t mins, uint32_t maxs, bool in_range_black
-){
-    ToBlackWhite_RgbRange_x64_AVX512 filter(mins, maxs, in_range_black);
-    filter_per_pixel(in, in_bytes_per_row, width, height, filter, out, out_bytes_per_row);
-    return filter.count();
-}
-void to_blackwhite_rgb32_range_x64_AVX512(
-    const uint32_t* image, size_t bytes_per_row, size_t width, size_t height,
-    ToBlackWhiteRgb32RangeFilter* filter, size_t filter_count
-){
-    to_blackwhite_rbg32<ToBlackWhite_RgbRange_x64_AVX512>(
-        image, bytes_per_row, width, height, filter, filter_count
-    );
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-}
-}
-#endif
diff --git a/SerialPrograms/Source/Kernels/ImageFilters/Kernels_ImageFilter_Basic_x64_SSE42.cpp b/SerialPrograms/Source/Kernels/ImageFilters/Kernels_ImageFilter_Basic_x64_SSE42.cpp
deleted file mode 100644
index 256083588a..0000000000
--- a/SerialPrograms/Source/Kernels/ImageFilters/Kernels_ImageFilter_Basic_x64_SSE42.cpp
+++ /dev/null
@@ -1,261 +0,0 @@
-/*  Image Filters Basic (x64 SSE4.2)
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifdef PA_AutoDispatch_x64_08_Nehalem
-
-#include <stdint.h>
-#include <cstddef>
-#include <nmmintrin.h>
-#include "Kernels/Kernels_x64_SSE41.h"
-#include "Kernels/PartialWordAccess/Kernels_PartialWordAccess_x64_SSE41.h"
-#include "Kernels_ImageFilter_Basic_Routines.h"
-
-namespace PokemonAutomation{
-namespace Kernels{
-
-
-class ImageFilter_RgbRange_x64_SSE42{
-public:
-    static const size_t VECTOR_SIZE = 4;
-
-public:
-    ImageFilter_RgbRange_x64_SSE42(uint32_t mins, uint32_t maxs, uint32_t replacement, bool invert)
-        : m_replacement(_mm_set1_epi32(replacement))
-        , m_invert(invert ? _mm_set1_epi32(-1) : _mm_setzero_si128())
-        , m_mins(_mm_set1_epi32(mins ^ 0x80808080))
-        , m_maxs(_mm_set1_epi32(maxs ^ 0x80808080))
-        , m_count(_mm_setzero_si128())
-    {}
-
-    PA_FORCE_INLINE size_t count() const{
-        return reduce32_x64_SSE41(m_count);
-    }
-
-    PA_FORCE_INLINE void process_full(uint32_t* out, const uint32_t* in){
-        __m128i pixel = _mm_loadu_si128((const __m128i*)in);
-        pixel = process_word(pixel);
-        _mm_storeu_si128((__m128i*)out, pixel);
-    }
-    PA_FORCE_INLINE void process_partial(uint32_t* out, const uint32_t* in, size_t left){
-        PartialWordAccess_x64_SSE41 loader(left * sizeof(uint32_t));
-        __m128i pixel = loader.load(in);
-        pixel = process_word(pixel);
-        do{
-            out[0] = _mm_cvtsi128_si32(pixel);
-            pixel = _mm_srli_si128(pixel, 4);
-            out++;
-        }while(--left);
-    }
-
-private:
-    PA_FORCE_INLINE __m128i process_word(__m128i pixel){
-        __m128i adj = _mm_xor_si128(pixel, _mm_set1_epi8((uint8_t)0x80));
-        __m128i cmp0 = _mm_cmpgt_epi8(m_mins, adj);
-        __m128i cmp1 = _mm_cmpgt_epi8(adj, m_maxs);
-        cmp0 = _mm_or_si128(cmp0, cmp1);
-        cmp0 = _mm_cmpeq_epi32(cmp0, _mm_setzero_si128());
-        m_count = _mm_sub_epi32(m_count, cmp0);
-        cmp0 = _mm_xor_si128(cmp0, m_invert);
-        return _mm_blendv_epi8(m_replacement, pixel, cmp0);
-    }
-
-private:
-    const __m128i m_replacement;
-    const __m128i m_invert;
-    const __m128i m_mins;
-    const __m128i m_maxs;
-    __m128i m_count;
-};
-
-
-
-size_t filter_rgb32_range_x64_SSE42(
-    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
-    uint32_t* out, size_t out_bytes_per_row,
-    uint32_t mins, uint32_t maxs,
-    uint32_t replacement, bool invert
-){
-    ImageFilter_RgbRange_x64_SSE42 filter(mins, maxs, replacement, invert);
-    filter_per_pixel(in, in_bytes_per_row, width, height, filter, out, out_bytes_per_row);
-    return filter.count();
-}
-void filter_rgb32_range_x64_SSE42(
-    const uint32_t* image, size_t bytes_per_row, size_t width, size_t height,
-    FilterRgb32RangeFilter* filter, size_t filter_count
-){
-    filter_per_pixel<ImageFilter_RgbRange_x64_SSE42>(
-        image, bytes_per_row, width, height, filter, filter_count
-    );
-}
-
-
-
-
-
-class ImageFilter_RgbEuclidean_x64_SSE42{
-public:
-    static const size_t VECTOR_SIZE = 4;
-
-public:
-    ImageFilter_RgbEuclidean_x64_SSE42(uint32_t expected, double max_euclidean_distance, uint32_t replacement, bool invert)
-        : m_replacement(_mm_set1_epi32(replacement))
-        , m_invert(invert ? _mm_set1_epi32(-1) : _mm_setzero_si128())
-        , m_expected_ag(_mm_set1_epi32((expected >> 8) & 0x000000ff))
-        , m_expected_rb(_mm_set1_epi32(expected & 0x00ff00ff))
-        , m_distance_squared(_mm_set1_epi32((uint32_t)(max_euclidean_distance * max_euclidean_distance)))
-        , m_count(_mm_setzero_si128())
-    {}
-
-    PA_FORCE_INLINE size_t count() const{
-        return reduce32_x64_SSE41(m_count);
-    }
-
-    PA_FORCE_INLINE void process_full(uint32_t* out, const uint32_t* in){
-        __m128i pixel = _mm_loadu_si128((const __m128i*)in);
-        pixel = process_word(pixel);
-        _mm_storeu_si128((__m128i*)out, pixel);
-    }
-    PA_FORCE_INLINE void process_partial(uint32_t* out, const uint32_t* in, size_t left){
-        PartialWordAccess_x64_SSE41 loader(left * sizeof(uint32_t));
-        __m128i pixel = loader.load(in);
-        pixel = process_word(pixel);
-        do{
-            out[0] = _mm_cvtsi128_si32(pixel);
-            pixel = _mm_srli_si128(pixel, 4);
-            out++;
-        }while(--left);
-    }
-
-private:
-    PA_FORCE_INLINE __m128i process_word(__m128i pixel){
-        __m128i ag = _mm_and_si128(_mm_srli_epi16(pixel, 8), _mm_set1_epi32(0x000000ff));
-        __m128i rb = _mm_and_si128(pixel, _mm_set1_epi32(0x00ff00ff));
-
-        ag = _mm_sub_epi16(ag, m_expected_ag);
-        rb = _mm_sub_epi16(rb, m_expected_rb);
-
-        __m128i g = _mm_mullo_epi16(ag, ag);
-        rb = _mm_mullo_epi16(rb, rb);
-        __m128i r = _mm_srli_epi32(rb, 16);
-        __m128i b = _mm_and_si128(rb, _mm_set1_epi32(0x0000ffff));
-
-        __m128i sum_sqr = _mm_add_epi32(r, g);
-        sum_sqr = _mm_add_epi32(sum_sqr, b);
-
-        __m128i cmp = _mm_cmpgt_epi32(m_distance_squared, sum_sqr);
-
-        m_count = _mm_sub_epi32(m_count, cmp);
-        cmp = _mm_xor_si128(cmp, m_invert);
-        return _mm_blendv_epi8(m_replacement, pixel, cmp);
-    }
-
-private:
-    const __m128i m_replacement;
-    const __m128i m_invert;
-    const __m128i m_expected_ag;
-    const __m128i m_expected_rb;
-    const __m128i m_distance_squared;
-    __m128i m_count;
-};
-size_t filter_rgb32_euclidean_x64_SSE42(
-    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
-    uint32_t* out, size_t out_bytes_per_row,
-    uint32_t expected, double max_euclidean_distance,
-    uint32_t replacement, bool invert
-){
-    ImageFilter_RgbEuclidean_x64_SSE42 filter(expected, max_euclidean_distance, replacement, invert);
-    filter_per_pixel(in, in_bytes_per_row, width, height, filter, out, out_bytes_per_row);
-    return filter.count();
-}
-
-
-
-
-
-
-
-
-class ToBlackWhite_RgbRange_x64_SSE42{
-public:
-    static const size_t VECTOR_SIZE = 4;
-
-public:
-    ToBlackWhite_RgbRange_x64_SSE42(uint32_t mins, uint32_t maxs, bool in_range_black)
-        : m_in_range_black(in_range_black ? _mm_set1_epi32(-1) : _mm_setzero_si128())
-        , m_mins(_mm_set1_epi32(mins ^ 0x80808080))
-        , m_maxs(_mm_set1_epi32(maxs ^ 0x80808080))
-        , m_count(_mm_setzero_si128())
-    {}
-
-    PA_FORCE_INLINE size_t count() const{
-        return reduce32_x64_SSE41(m_count);
-    }
-
-    PA_FORCE_INLINE void process_full(uint32_t* out, const uint32_t* in){
-        __m128i pixel = _mm_loadu_si128((const __m128i*)in);
-        pixel = process_word(pixel);
-        _mm_storeu_si128((__m128i*)out, pixel);
-    }
-    PA_FORCE_INLINE void process_partial(uint32_t* out, const uint32_t* in, size_t left){
-        PartialWordAccess_x64_SSE41 loader(left * sizeof(uint32_t));
-        __m128i pixel = loader.load(in);
-        pixel = process_word(pixel);
-        do{
-            out[0] = _mm_cvtsi128_si32(pixel);
-            pixel = _mm_srli_si128(pixel, 4);
-            out++;
-        }while(--left);
-    }
-
-private:
-    PA_FORCE_INLINE __m128i process_word(__m128i pixel){
-        __m128i adj = _mm_xor_si128(pixel, _mm_set1_epi8((uint8_t)0x80));
-        __m128i cmp0 = _mm_cmpgt_epi8(m_mins, adj);
-        __m128i cmp1 = _mm_cmpgt_epi8(adj, m_maxs);
-        cmp0 = _mm_or_si128(cmp0, cmp1);
-        cmp0 = _mm_cmpeq_epi32(cmp0, _mm_setzero_si128());
-        m_count = _mm_sub_epi32(m_count, cmp0);
-        cmp0 = _mm_xor_si128(cmp0, m_in_range_black);
-        return _mm_or_si128(cmp0, _mm_set1_epi32(0xff000000));
-    }
-
-private:
-    const __m128i m_in_range_black;
-    const __m128i m_mins;
-    const __m128i m_maxs;
-    __m128i m_count;
-};
-
-
-
-size_t to_blackwhite_rgb32_range_x64_SSE42(
-    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
-    uint32_t* out, size_t out_bytes_per_row,
-    uint32_t mins, uint32_t maxs, bool in_range_black
-){
-    ToBlackWhite_RgbRange_x64_SSE42 filter(mins, maxs, in_range_black);
-    filter_per_pixel(in, in_bytes_per_row, width, height, filter, out, out_bytes_per_row);
-    return filter.count();
-}
-void to_blackwhite_rgb32_range_x64_SSE42(
-    const uint32_t* image, size_t bytes_per_row, size_t width, size_t height,
-    ToBlackWhiteRgb32RangeFilter* filter, size_t filter_count
-){
-    to_blackwhite_rbg32<ToBlackWhite_RgbRange_x64_SSE42>(
-        image, bytes_per_row, width, height, filter, filter_count
-    );
-}
-
-
-
-
-
-
-
-
-}
-}
-#endif
diff --git a/SerialPrograms/Source/Kernels/ImageFilters/Kernels_ImageFilter_Misc.cpp b/SerialPrograms/Source/Kernels/ImageFilters/Kernels_ImageFilter_Misc.cpp
new file mode 100644
index 0000000000..c64000c503
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/ImageFilters/Kernels_ImageFilter_Misc.cpp
@@ -0,0 +1,34 @@
+/*  Image Filters Misc
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Exceptions.h"
+#include "Kernels_ImageFilter_Misc.h"
+
+namespace PokemonAutomation{
+namespace Kernels{
+
+size_t filter_green_Default(
+    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
+    uint32_t* out, size_t out_bytes_per_row,
+    uint32_t replacement, uint8_t rgb_gap
+);
+
+size_t filter_green(
+    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
+    uint32_t* out, size_t out_bytes_per_row,
+    uint32_t replacement, uint8_t rgb_gap
+){
+    if (width * height > 0xffffffff){
+        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Image is too large. more than 2^32 pixels.");
+    }
+    return filter_green_Default(
+        in, in_bytes_per_row, width, height,
+        out, out_bytes_per_row, replacement, rgb_gap
+    );
+}
+
+}
+}
diff --git a/SerialPrograms/Source/Kernels/ImageFilters/Kernels_ImageFilter_Misc.h b/SerialPrograms/Source/Kernels/ImageFilters/Kernels_ImageFilter_Misc.h
new file mode 100644
index 0000000000..32e6e38693
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/ImageFilters/Kernels_ImageFilter_Misc.h
@@ -0,0 +1,26 @@
+/*  Image Filters Misc
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  Perform a filter over an image and replace pixels that match the filter.
+ *
+ */
+
+#ifndef PokemonAutomation_Kernels_ImageFilter_Misc_H
+#define PokemonAutomation_Kernels_ImageFilter_Misc_H
+
+#include <stdint.h>
+#include <cstddef>
+
+namespace PokemonAutomation{
+namespace Kernels{
+
+size_t filter_green(
+    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
+    uint32_t* out, size_t out_bytes_per_row,
+    uint32_t replacement, uint8_t rgb_gap
+);
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Kernels/ImageFilters/Kernels_ImageFilter_Misc_Default.cpp b/SerialPrograms/Source/Kernels/ImageFilters/Kernels_ImageFilter_Misc_Default.cpp
new file mode 100644
index 0000000000..0f6393bc57
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/ImageFilters/Kernels_ImageFilter_Misc_Default.cpp
@@ -0,0 +1,64 @@
+/*  Image Filters Misc (Default)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <stdint.h>
+#include <cstddef>
+#include "Kernels_ImageFilter_Basic_Routines.h"
+
+namespace PokemonAutomation{
+namespace Kernels{
+
+class ImageFilter_Green_Default{
+public:
+    static const size_t VECTOR_SIZE = 1;
+    using Mask = size_t;
+
+public:
+    ImageFilter_Green_Default(uint32_t replacement_color, uint8_t rgb_gap)
+        : m_replacement_color(replacement_color)
+        , m_rgb_gap(rgb_gap)
+        , m_count(0)
+    {}
+
+    PA_FORCE_INLINE size_t count() const{
+        return m_count;
+    }
+
+    PA_FORCE_INLINE void process_full(uint32_t* out, const uint32_t* in){
+        uint32_t pixel = in[0];
+        uint64_t ret = 1;
+
+        uint16_t red = ((pixel >> 16) & 0xff);
+        uint16_t green = ((pixel >> 8) & 0xff);
+        uint16_t blue = ((pixel) & 0xff);
+
+        ret &= (green >= red + m_rgb_gap) && (green >= blue + m_rgb_gap);
+
+        m_count += ret;
+        out[0] = ret ? pixel : m_replacement_color;
+    }
+    PA_FORCE_INLINE void process_partial(uint32_t* out, const uint32_t* in, size_t left){
+        process_full(out, in);
+    }
+
+private:
+    const uint32_t m_replacement_color;
+    const uint16_t m_rgb_gap;
+    size_t m_count;
+};
+
+size_t filter_green_Default(
+    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
+    uint32_t* out, size_t out_bytes_per_row,
+    uint32_t replacement_color, uint8_t rgb_gap
+){
+    ImageFilter_Green_Default filter(replacement_color, rgb_gap);
+    filter_per_pixel(in, in_bytes_per_row, width, height, filter, out, out_bytes_per_row);
+    return filter.count();
+}
+
+}
+}
diff --git a/SerialPrograms/Source/Kernels/ImageFilters/Kernels_ImageFilter_Tests.cpp b/SerialPrograms/Source/Kernels/ImageFilters/Kernels_ImageFilter_Tests.cpp
new file mode 100644
index 0000000000..c3349772b1
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/ImageFilters/Kernels_ImageFilter_Tests.cpp
@@ -0,0 +1,522 @@
+/*  Image Filters Tests
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <format>
+#include <memory>
+#include "Common/Cpp/CancellableScope.h"
+#include "Common/Cpp/CpuId/CpuId.h"
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "Kernels/BinaryMatrix/Kernels_BinaryMatrix.h"
+#include "CommonFramework/ImageTypes/ImageRGB32.h"
+#include "Tests/GuardPageImage.h"
+#include "Tests/ImageUnitTest.h"
+#include "RGB32_Range/Kernels_ImageFilter_RGB32_Range.h"
+#include "Kernels_ImageFilter_Tests.h"
+
+namespace PokemonAutomation{
+namespace Kernels{
+
+
+//  The range filter implementations, defined in RGB32_Range/Kernels_ImageFilter_RGB32_Range_*.cpp.
+//  `filter_rgb32_range()` and `to_blackwhite_rgb32_range()` in Kernels_ImageFilter_RGB32_Range.cpp
+//  declare the same functions and call the best one for the CPU. These tests call them directly,
+//  so that every implementation this CPU supports is tested.
+size_t filter_rgb32_range_Default(
+    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
+    uint32_t* out, size_t out_bytes_per_row,
+    uint32_t replacement, bool replace_color_within_range,
+    uint32_t mins, uint32_t maxs
+);
+size_t to_blackwhite_rgb32_range_Default(
+    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
+    uint32_t* out, size_t out_bytes_per_row,
+    bool in_range_black,
+    uint32_t mins, uint32_t maxs
+);
+size_t filter_rgb32_range_x64_SSE42(
+    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
+    uint32_t* out, size_t out_bytes_per_row,
+    uint32_t replacement, bool replace_color_within_range,
+    uint32_t mins, uint32_t maxs
+);
+size_t to_blackwhite_rgb32_range_x64_SSE42(
+    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
+    uint32_t* out, size_t out_bytes_per_row,
+    bool in_range_black,
+    uint32_t mins, uint32_t maxs
+);
+size_t filter_rgb32_range_x64_AVX2(
+    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
+    uint32_t* out, size_t out_bytes_per_row,
+    uint32_t replacement, bool replace_color_within_range,
+    uint32_t mins, uint32_t maxs
+);
+size_t to_blackwhite_rgb32_range_x64_AVX2(
+    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
+    uint32_t* out, size_t out_bytes_per_row,
+    bool in_range_black,
+    uint32_t mins, uint32_t maxs
+);
+size_t filter_rgb32_range_x64_AVX512(
+    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
+    uint32_t* out, size_t out_bytes_per_row,
+    uint32_t replacement, bool replace_color_within_range,
+    uint32_t mins, uint32_t maxs
+);
+size_t to_blackwhite_rgb32_range_x64_AVX512(
+    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
+    uint32_t* out, size_t out_bytes_per_row,
+    bool in_range_black,
+    uint32_t mins, uint32_t maxs
+);
+size_t filter_rgb32_range_arm64_NEON(
+    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
+    uint32_t* out, size_t out_bytes_per_row,
+    uint32_t replacement, bool replace_color_within_range,
+    uint32_t mins, uint32_t maxs
+);
+size_t to_blackwhite_rgb32_range_arm64_NEON(
+    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
+    uint32_t* out, size_t out_bytes_per_row,
+    bool in_range_black,
+    uint32_t mins, uint32_t maxs
+);
+
+//  The filter_by_mask() implementations, one per binary matrix type, defined in
+//  BinaryImageFilters/Kernels_BinaryImage_BasicFilters_Core_*.cpp. `filter_by_mask()` in
+//  Kernels_BinaryImage_BasicFilters.cpp declares the same functions and calls the one for
+//  the matrix type.
+void filter_by_mask_64x4_Default      (const PackedBinaryMatrix_IB& matrix, uint32_t* image, size_t bytes_per_row, uint32_t replace_with, bool replace_if_zero);
+void filter_by_mask_64x8_x64_SSE42    (const PackedBinaryMatrix_IB& matrix, uint32_t* image, size_t bytes_per_row, uint32_t replace_with, bool replace_if_zero);
+void filter_by_mask_64x16_x64_AVX2    (const PackedBinaryMatrix_IB& matrix, uint32_t* image, size_t bytes_per_row, uint32_t replace_with, bool replace_if_zero);
+void filter_by_mask_64x32_x64_AVX512  (const PackedBinaryMatrix_IB& matrix, uint32_t* image, size_t bytes_per_row, uint32_t replace_with, bool replace_if_zero);
+void filter_by_mask_64x64_x64_AVX512  (const PackedBinaryMatrix_IB& matrix, uint32_t* image, size_t bytes_per_row, uint32_t replace_with, bool replace_if_zero);
+void filter_by_mask_64x8_arm64_NEON   (const PackedBinaryMatrix_IB& matrix, uint32_t* image, size_t bytes_per_row, uint32_t replace_with, bool replace_if_zero);
+
+
+namespace{
+
+//  One range filter implementation to test: its name in the test name, and its two functions.
+struct RangeFilterImplementation{
+    using Filter = size_t (*)(
+        const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
+        uint32_t* out, size_t out_bytes_per_row,
+        uint32_t replacement, bool replace_color_within_range,
+        uint32_t mins, uint32_t maxs
+    );
+    using ToBlackWhite = size_t (*)(
+        const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
+        uint32_t* out, size_t out_bytes_per_row,
+        bool in_range_black,
+        uint32_t mins, uint32_t maxs
+    );
+
+    std::string name;
+    Filter filter;
+    ToBlackWhite to_blackwhite;
+};
+
+//  One filter_by_mask() implementation to test: its name in the test name, the binary
+//  matrix type it works on, and the function.
+struct FilterByMaskImplementation{
+    using Function = void (*)(
+        const PackedBinaryMatrix_IB& matrix,
+        uint32_t* image, size_t bytes_per_row,
+        uint32_t replace_with, bool replace_if_zero
+    );
+
+    std::string name;
+    BinaryMatrixType matrix_type;
+    Function filter_by_mask;
+};
+
+
+//  An ARGB color range: a pixel is in range if each of its A, R, G and B bytes is within
+//  the bytes of `mins` and `maxs`.
+struct ColorRange{
+    uint32_t mins;
+    uint32_t maxs;
+};
+
+//  The ranges to test. Each has pixels both in and out of range on every test image. The
+//  bounds include 0x00, 0x7f, 0x80 and 0xff, the edges of signed and unsigned bytes.
+constexpr ColorRange RANGES[] = {
+    {0xff000000, 0xff8080ff},
+    {0xff204060, 0xffe0c0ff},
+    {0xff60607f, 0xffc8c8c8},
+    {0xffa0a0a0, 0xffffffff},
+};
+
+constexpr uint32_t REPLACEMENT_COLOR = 0x13572468;
+constexpr uint32_t BLACK = 0xff000000;
+constexpr uint32_t WHITE = 0xffffffff;
+
+//  Whether `pixel` is in `range`. For example, 0xff7f3080 is in the range
+//  [0xff000000, 0xff8080ff], but 0xff813080 is not, since its R (0x81) is above 0x80.
+bool in_range(uint32_t pixel, const ColorRange& range){
+    for (int shift = 0; shift < 32; shift += 8){
+        const uint32_t value = (pixel >> shift) & 0xff;
+        if (value < ((range.mins >> shift) & 0xff) || value > ((range.maxs >> shift) & 0xff)){
+            return false;
+        }
+    }
+    return true;
+}
+
+size_t count_in_range(const GuardPageImageRGB32& image, const ColorRange& range){
+    size_t count = 0;
+    for (size_t y = 0; y < image.height(); y++){
+        for (size_t x = 0; x < image.width(); x++){
+            count += in_range(image.pixel(x, y), range);
+        }
+    }
+    return count;
+}
+
+//  Compare each pixel of `output` with `expected_pixel(<the input pixel>)`. Return a
+//  description of the first wrong pixel, or an empty string if all pixels are right.
+template <typename ExpectedPixel>
+std::string find_wrong_pixel(
+    const GuardPageImageRGB32& input, const GuardPageImageRGB32& output,
+    ExpectedPixel expected_pixel
+){
+    for (size_t y = 0; y < input.height(); y++){
+        for (size_t x = 0; x < input.width(); x++){
+            const uint32_t pixel = input.pixel(x, y);
+            const uint32_t expected = expected_pixel(pixel);
+            if (output.pixel(x, y) != expected){
+                return std::format(
+                    "pixel ({}, {}) is {:08x}: got {:08x} but should be {:08x}",
+                    x, y, pixel, output.pixel(x, y), expected
+                );
+            }
+        }
+    }
+    return "";
+}
+
+std::string describe(const ColorRange& range){
+    return std::format("range [{:08x}, {:08x}]", range.mins, range.maxs);
+}
+
+//  Check one result of `filter_rgb32_range()` on `image`: the number of pixels in range
+//  that it returned, and its output image. Return a description of the first problem, or
+//  an empty string if there is none.
+std::string check_filter_result(
+    const GuardPageImageRGB32& image, const GuardPageImageRGB32& output, size_t count,
+    const ColorRange& range, bool replace_color_within_range
+){
+    const size_t expected_count = count_in_range(image, range);
+    if (count != expected_count){
+        return std::format("counted {} pixels in range but should be {}", count, expected_count);
+    }
+    return find_wrong_pixel(image, output, [&](uint32_t pixel){
+        return in_range(pixel, range) == replace_color_within_range ? REPLACEMENT_COLOR : pixel;
+    });
+}
+
+//  Same as `check_filter_result()`, for one result of `to_blackwhite_rgb32_range()`.
+std::string check_blackwhite_result(
+    const GuardPageImageRGB32& image, const GuardPageImageRGB32& output, size_t count,
+    const ColorRange& range, bool in_range_black
+){
+    const size_t expected_count = count_in_range(image, range);
+    if (count != expected_count){
+        return std::format("counted {} pixels in range but should be {}", count, expected_count);
+    }
+    return find_wrong_pixel(image, output, [&](uint32_t pixel){
+        return in_range(pixel, range) == in_range_black ? BLACK : WHITE;
+    });
+}
+
+
+
+//  Check one implementation of `filter_rgb32_range()` and `to_blackwhite_rgb32_range()`
+//  on a real image, for each of `RANGES`, against `in_range()`:
+//  - `filter_rgb32_range()` copies the image, but replaces the pixels in range (or the
+//    pixels out of range) with `REPLACEMENT_COLOR`.
+//  - `to_blackwhite_rgb32_range()` makes the pixels in range black and the others white
+//    (or the opposite).
+//  Both must return the number of pixels in range. The input and output are guard-page
+//  images, so the test also crashes if the implementation reads or writes past the last
+//  pixel.
+class Test_ImageFilterRGB32Range : public ImageUnitTest{
+public:
+    Test_ImageFilterRGB32Range(
+        const RangeFilterImplementation& implementation,
+        const std::string& image
+    )
+        : ImageUnitTest("Kernels::ImageFilterRGB32Range - " + implementation.name + " - " + image, {image})
+        , m_implementation(implementation)
+    {
+        //  Plus a guard-page input copy and a full-size output copy.
+        m_memory += MAX_TEST_IMAGE_RGB32_BYTES * 2;
+    }
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        const ImageRGB32& file_image = images[0];
+        const GuardPageImageRGB32 image(file_image);
+        GuardPageImageRGB32 output(image.width(), image.height());
+
+        for (const ColorRange& range : RANGES){
+            scope.throw_if_cancelled();
+
+            for (bool replace_color_within_range : {true, false}){
+                const size_t count = m_implementation.filter(
+                    image.data(), image.bytes_per_row(), image.width(), image.height(),
+                    output.data(), output.bytes_per_row(),
+                    REPLACEMENT_COLOR, replace_color_within_range,
+                    range.mins, range.maxs
+                );
+                const std::string error = check_filter_result(image, output, count, range, replace_color_within_range);
+                if (!error.empty()){
+                    return std::format(
+                        "Error: filter_rgb32_range(), {}, replace_color_within_range = {}: {}.",
+                        describe(range), replace_color_within_range, error
+                    );
+                }
+            }
+
+            for (bool in_range_black : {true, false}){
+                const size_t count = m_implementation.to_blackwhite(
+                    image.data(), image.bytes_per_row(), image.width(), image.height(),
+                    output.data(), output.bytes_per_row(),
+                    in_range_black,
+                    range.mins, range.maxs
+                );
+                const std::string error = check_blackwhite_result(image, output, count, range, in_range_black);
+                if (!error.empty()){
+                    return std::format(
+                        "Error: to_blackwhite_rgb32_range(), {}, in_range_black = {}: {}.",
+                        describe(range), in_range_black, error
+                    );
+                }
+            }
+        }
+        return true;
+    }
+
+private:
+    RangeFilterImplementation m_implementation;
+};
+
+
+
+//  Check the overloads of `filter_rgb32_range()` and `to_blackwhite_rgb32_range()` that
+//  run several filters in one call, like `MountDetector` in PokemonLA does. They call the
+//  single-filter versions through the CPU dispatch, so this test runs once, not once per
+//  implementation. There is one filter for each of `RANGES` and each flag value, so the
+//  test also checks that each filter uses its own range and flag.
+class Test_ImageFilterRGB32RangeMultiple : public ImageUnitTest{
+public:
+    Test_ImageFilterRGB32RangeMultiple(const std::string& image)
+        : ImageUnitTest("Kernels::ImageFilterRGB32Range - multiple filters - " + image, {image})
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        const ImageRGB32& file_image = images[0];
+        const GuardPageImageRGB32 image(file_image);
+
+        struct FilterSetting{
+            ColorRange range;
+            bool flag;
+        };
+        std::vector<FilterSetting> settings;
+        std::vector<std::unique_ptr<GuardPageImageRGB32>> outputs;
+        for (const ColorRange& range : RANGES){
+            for (bool flag : {true, false}){
+                settings.push_back({range, flag});
+                outputs.emplace_back(std::make_unique<GuardPageImageRGB32>(image.width(), image.height()));
+            }
+        }
+
+        std::vector<FilterRgb32RangeFilter> filters;
+        for (size_t c = 0; c < settings.size(); c++){
+            filters.emplace_back(
+                outputs[c]->data(), outputs[c]->bytes_per_row(),
+                REPLACEMENT_COLOR, settings[c].flag,
+                settings[c].range.mins, settings[c].range.maxs
+            );
+        }
+        filter_rgb32_range(
+            image.data(), image.bytes_per_row(), image.width(), image.height(),
+            filters.data(), filters.size()
+        );
+        for (size_t c = 0; c < settings.size(); c++){
+            const std::string error = check_filter_result(
+                image, *outputs[c], filters[c].pixels_in_range, settings[c].range, settings[c].flag
+            );
+            if (!error.empty()){
+                return std::format(
+                    "Error: filter_rgb32_range() with {} filters, {}, replace_color_within_range = {}: {}.",
+                    filters.size(), describe(settings[c].range), settings[c].flag, error
+                );
+            }
+        }
+
+        std::vector<ToBlackWhiteRgb32RangeFilter> blackwhite_filters;
+        for (size_t c = 0; c < settings.size(); c++){
+            blackwhite_filters.emplace_back(
+                outputs[c]->data(), outputs[c]->bytes_per_row(),
+                settings[c].range.mins, settings[c].range.maxs, settings[c].flag
+            );
+        }
+        to_blackwhite_rgb32_range(
+            image.data(), image.bytes_per_row(), image.width(), image.height(),
+            blackwhite_filters.data(), blackwhite_filters.size()
+        );
+        for (size_t c = 0; c < settings.size(); c++){
+            const std::string error = check_blackwhite_result(
+                image, *outputs[c], blackwhite_filters[c].pixels_in_range, settings[c].range, settings[c].flag
+            );
+            if (!error.empty()){
+                return std::format(
+                    "Error: to_blackwhite_rgb32_range() with {} filters, {}, in_range_black = {}: {}.",
+                    blackwhite_filters.size(), describe(settings[c].range), settings[c].flag, error
+                );
+            }
+        }
+        return true;
+    }
+};
+
+
+
+//  Check one `filter_by_mask()` implementation on a real image, for each of `RANGES`.
+//  The mask is a binary matrix of the implementation's type with a 1 bit for each pixel
+//  in range. It is made one bit at a time with `PackedBinaryMatrix_IB::set()`, so it does
+//  not depend on the SIMD code of `compress_rgb32_to_binary_range()`. Then
+//  `filter_by_mask()` must replace the pixels with 0 bits (or the pixels with 1 bits) with
+//  `REPLACEMENT_COLOR`, and keep the other pixels. The image is a guard-page image, so the
+//  test also crashes if the implementation reads or writes past the last pixel.
+class Test_ImageFilterByMask : public ImageUnitTest{
+public:
+    Test_ImageFilterByMask(
+        const FilterByMaskImplementation& implementation,
+        const std::string& image
+    )
+        : ImageUnitTest("Kernels::ImageFilterByMask - " + implementation.name + " - " + image, {image})
+        , m_implementation(implementation)
+    {
+        //  Plus a guard-page input copy and a full-size filtered copy.
+        m_memory += MAX_TEST_IMAGE_RGB32_BYTES * 2;
+    }
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        const ImageRGB32& file_image = images[0];
+        const GuardPageImageRGB32 image(file_image);
+
+        for (const ColorRange& range : RANGES){
+            scope.throw_if_cancelled();
+            std::unique_ptr<PackedBinaryMatrix_IB> mask = make_PackedBinaryMatrix(
+                m_implementation.matrix_type, image.width(), image.height()
+            );
+            for (size_t y = 0; y < image.height(); y++){
+                for (size_t x = 0; x < image.width(); x++){
+                    mask->set(x, y, in_range(image.pixel(x, y), range));
+                }
+            }
+
+            for (bool replace_if_zero : {true, false}){
+                GuardPageImageRGB32 filtered(file_image);
+                m_implementation.filter_by_mask(
+                    *mask, filtered.data(), filtered.bytes_per_row(),
+                    REPLACEMENT_COLOR, replace_if_zero
+                );
+                //  The mask bit is 1 if the pixel is in range. The pixel is replaced if
+                //  that bit is 0 and `replace_if_zero` is true, or if it is 1 and
+                //  `replace_if_zero` is false.
+                const std::string error = find_wrong_pixel(image, filtered, [&](uint32_t pixel){
+                    return in_range(pixel, range) != replace_if_zero ? REPLACEMENT_COLOR : pixel;
+                });
+                if (!error.empty()){
+                    return std::format(
+                        "Error: mask of {}, replace_if_zero = {}: {}.",
+                        describe(range), replace_if_zero, error
+                    );
+                }
+            }
+        }
+        return true;
+    }
+
+private:
+    FilterByMaskImplementation m_implementation;
+};
+
+}
+
+
+
+//  Add a test for each image and each range filter and filter_by_mask() implementation
+//  that this build has and this CPU supports, including Default.
+void add_tests_ImageFilters(UnitTestDatabase& database){
+    std::vector<RangeFilterImplementation> range_filters{
+        {"Default", filter_rgb32_range_Default, to_blackwhite_rgb32_range_Default},
+    };
+    std::vector<FilterByMaskImplementation> mask_filters{
+        {"64x4_Default", BinaryMatrixType::i64x4_Default, filter_by_mask_64x4_Default},
+    };
+#ifdef PA_AutoDispatch_x64_08_Nehalem
+    if (CPU_CAPABILITY_CURRENT.OK_08_Nehalem){
+        range_filters.push_back({"x64_SSE42", filter_rgb32_range_x64_SSE42, to_blackwhite_rgb32_range_x64_SSE42});
+        mask_filters.push_back({"64x8_x64_SSE42", BinaryMatrixType::i64x8_x64_SSE42, filter_by_mask_64x8_x64_SSE42});
+    }
+#endif
+#ifdef PA_AutoDispatch_x64_13_Haswell
+    if (CPU_CAPABILITY_CURRENT.OK_13_Haswell){
+        range_filters.push_back({"x64_AVX2", filter_rgb32_range_x64_AVX2, to_blackwhite_rgb32_range_x64_AVX2});
+        mask_filters.push_back({"64x16_x64_AVX2", BinaryMatrixType::i64x16_x64_AVX2, filter_by_mask_64x16_x64_AVX2});
+    }
+#endif
+#ifdef PA_AutoDispatch_x64_17_Skylake
+    if (CPU_CAPABILITY_CURRENT.OK_17_Skylake){
+        range_filters.push_back({"x64_AVX512", filter_rgb32_range_x64_AVX512, to_blackwhite_rgb32_range_x64_AVX512});
+        mask_filters.push_back({"64x32_x64_AVX512", BinaryMatrixType::i64x32_x64_AVX512, filter_by_mask_64x32_x64_AVX512});
+        mask_filters.push_back({"64x64_x64_AVX512", BinaryMatrixType::i64x64_x64_AVX512, filter_by_mask_64x64_x64_AVX512});
+    }
+#endif
+#ifdef PA_AutoDispatch_arm64_20_M1
+    if (CPU_CAPABILITY_CURRENT.OK_M1){
+        range_filters.push_back({"arm64_NEON", filter_rgb32_range_arm64_NEON, to_blackwhite_rgb32_range_arm64_NEON});
+        mask_filters.push_back({"64x8_arm64_NEON", BinaryMatrixType::arm64x8_x64_NEON, filter_by_mask_64x8_arm64_NEON});
+    }
+#endif
+
+    //  Images in the CommandLineTests repo. Their widths cover every remainder mod 4, and
+    //  no width or height is a multiple of 8, so the leftover pixels after the SIMD loops
+    //  and the binary matrix tiles at the right and bottom edges are tested too.
+    const std::vector<std::string> images{
+        "NintendoSwitch/Switch2/ghostassassin/system_settings_display_dark.png",    //  1916 x 1078
+        "OCR/Lv.1-0.png",                                                           //  237 x 77
+        "PokemonSwSh/SelectionArrowFinder/mac_neon_error_1.png",                    //  106 x 410
+        "OCR/german-nature-sanft.png",                                              //  511 x 91
+    };
+
+    database.add<Test_ImageFilterRGB32RangeMultiple>(images[2]);
+    for (const std::string& image : images){
+        for (const RangeFilterImplementation& implementation : range_filters){
+            database.add<Test_ImageFilterRGB32Range>(implementation, image);
+        }
+        for (const FilterByMaskImplementation& implementation : mask_filters){
+            database.add<Test_ImageFilterByMask>(implementation, image);
+        }
+    }
+}
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/Kernels/ImageFilters/Kernels_ImageFilter_Tests.h b/SerialPrograms/Source/Kernels/ImageFilters/Kernels_ImageFilter_Tests.h
new file mode 100644
index 0000000000..db37a23881
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/ImageFilters/Kernels_ImageFilter_Tests.h
@@ -0,0 +1,23 @@
+/*  Image Filters Tests
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Kernels_ImageFilter_Tests_H
+#define PokemonAutomation_Kernels_ImageFilter_Tests_H
+
+#include "Common/Cpp/TestRunners/UnitTest.h"
+
+namespace PokemonAutomation{
+namespace Kernels{
+
+
+
+void add_tests_ImageFilters(UnitTestDatabase& database);
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Kernels/ImageFilters/RGB32_Brightness/Kernels_ImageFilter_RGB32_Brightness.cpp b/SerialPrograms/Source/Kernels/ImageFilters/RGB32_Brightness/Kernels_ImageFilter_RGB32_Brightness.cpp
new file mode 100644
index 0000000000..a26aac47bc
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/ImageFilters/RGB32_Brightness/Kernels_ImageFilter_RGB32_Brightness.cpp
@@ -0,0 +1,174 @@
+/*  Image Filters RGB32 Brightness
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Exceptions.h"
+#include "Common/Cpp/CpuId/CpuId.h"
+#include "Kernels_ImageFilter_RGB32_Brightness.h"
+
+namespace PokemonAutomation{
+namespace Kernels{
+
+
+
+size_t filter_rgb32_brightness_x64_AVX512VNNI(
+    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
+    uint32_t* out, size_t out_bytes_per_row,
+    uint32_t replacement, bool replace_color_within_range,
+    Rgb32BrightnessWeights weights,
+    uint32_t min_brightness, uint32_t max_brightness
+);
+size_t filter_rgb32_brightness_x64_AVX2(
+    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
+    uint32_t* out, size_t out_bytes_per_row,
+    uint32_t replacement, bool replace_color_within_range,
+    Rgb32BrightnessWeights weights,
+    uint32_t min_brightness, uint32_t max_brightness
+);
+size_t filter_rgb32_brightness_x64_SSE42(
+    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
+    uint32_t* out, size_t out_bytes_per_row,
+    uint32_t replacement, bool replace_color_within_range,
+    Rgb32BrightnessWeights weights,
+    uint32_t min_brightness, uint32_t max_brightness
+);
+size_t filter_rgb32_brightness_Default(
+    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
+    uint32_t* out, size_t out_bytes_per_row,
+    uint32_t replacement, bool replace_color_within_range,
+    Rgb32BrightnessWeights weights,
+    uint32_t min_brightness, uint32_t max_brightness
+);
+size_t filter_rgb32_brightness(
+    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
+    uint32_t* out, size_t out_bytes_per_row,
+    uint32_t replacement, bool replace_color_within_range,
+    Rgb32BrightnessWeights weights,
+    uint32_t min_brightness, uint32_t max_brightness
+){
+    if (width * height > 0xffffffff){
+        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Image is too large. more than 2^32 pixels.");
+    }
+#ifdef PA_AutoDispatch_x64_19_IceLake
+    if (CPU_CAPABILITY_CURRENT.OK_19_IceLake){
+        return filter_rgb32_brightness_x64_AVX512VNNI(
+            in, in_bytes_per_row, width, height,
+            out, out_bytes_per_row,
+            replacement, replace_color_within_range,
+            weights, min_brightness, max_brightness
+        );
+    }
+#endif
+#ifdef PA_AutoDispatch_x64_13_Haswell
+    if (CPU_CAPABILITY_CURRENT.OK_13_Haswell){
+        return filter_rgb32_brightness_x64_AVX2(
+            in, in_bytes_per_row, width, height,
+            out, out_bytes_per_row,
+            replacement, replace_color_within_range,
+            weights, min_brightness, max_brightness
+        );
+    }
+#endif
+#ifdef PA_AutoDispatch_x64_08_Nehalem
+    if (CPU_CAPABILITY_CURRENT.OK_08_Nehalem){
+        return filter_rgb32_brightness_x64_SSE42(
+            in, in_bytes_per_row, width, height,
+            out, out_bytes_per_row,
+            replacement, replace_color_within_range,
+            weights, min_brightness, max_brightness
+        );
+    }
+#endif
+    return filter_rgb32_brightness_Default(
+        in, in_bytes_per_row, width, height,
+        out, out_bytes_per_row,
+        replacement, replace_color_within_range,
+        weights, min_brightness, max_brightness
+    );
+}
+
+
+
+size_t to_blackwhite_rgb32_brightness_x64_AVX512VNNI(
+    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
+    uint32_t* out, size_t out_bytes_per_row,
+    bool in_range_black,
+    Rgb32BrightnessWeights weights,
+    uint32_t min_brightness, uint32_t max_brightness
+);
+size_t to_blackwhite_rgb32_brightness_x64_AVX2(
+    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
+    uint32_t* out, size_t out_bytes_per_row,
+    bool in_range_black,
+    Rgb32BrightnessWeights weights,
+    uint32_t min_brightness, uint32_t max_brightness
+);
+size_t to_blackwhite_rgb32_brightness_x64_SSE42(
+    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
+    uint32_t* out, size_t out_bytes_per_row,
+    bool in_range_black,
+    Rgb32BrightnessWeights weights,
+    uint32_t min_brightness, uint32_t max_brightness
+);
+size_t to_blackwhite_rgb32_brightness_Default(
+    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
+    uint32_t* out, size_t out_bytes_per_row,
+    bool in_range_black,
+    Rgb32BrightnessWeights weights,
+    uint32_t min_brightness, uint32_t max_brightness
+);
+size_t to_blackwhite_rgb32_brightness(
+    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
+    uint32_t* out, size_t out_bytes_per_row,
+    bool in_range_black,
+    Rgb32BrightnessWeights weights,
+    uint32_t min_brightness, uint32_t max_brightness
+){
+    if (width * height > 0xffffffff){
+        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Image is too large. more than 2^32 pixels.");
+    }
+#ifdef PA_AutoDispatch_x64_19_IceLake
+    if (CPU_CAPABILITY_CURRENT.OK_19_IceLake){
+        return to_blackwhite_rgb32_brightness_x64_AVX512VNNI(
+            in, in_bytes_per_row, width, height,
+            out, out_bytes_per_row,
+            in_range_black,
+            weights, min_brightness, max_brightness
+        );
+    }
+#endif
+#ifdef PA_AutoDispatch_x64_13_Haswell
+    if (CPU_CAPABILITY_CURRENT.OK_13_Haswell){
+        return to_blackwhite_rgb32_brightness_x64_AVX2(
+            in, in_bytes_per_row, width, height,
+            out, out_bytes_per_row,
+            in_range_black,
+            weights, min_brightness, max_brightness
+        );
+    }
+#endif
+#ifdef PA_AutoDispatch_x64_08_Nehalem
+    if (CPU_CAPABILITY_CURRENT.OK_08_Nehalem){
+        return to_blackwhite_rgb32_brightness_x64_SSE42(
+            in, in_bytes_per_row, width, height,
+            out, out_bytes_per_row,
+            in_range_black,
+            weights, min_brightness, max_brightness
+        );
+    }
+#endif
+    return to_blackwhite_rgb32_brightness_Default(
+        in, in_bytes_per_row, width, height,
+        out, out_bytes_per_row,
+        in_range_black,
+        weights, min_brightness, max_brightness
+    );
+}
+
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/Kernels/ImageFilters/RGB32_Brightness/Kernels_ImageFilter_RGB32_Brightness.h b/SerialPrograms/Source/Kernels/ImageFilters/RGB32_Brightness/Kernels_ImageFilter_RGB32_Brightness.h
new file mode 100644
index 0000000000..27907ad38e
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/ImageFilters/RGB32_Brightness/Kernels_ImageFilter_RGB32_Brightness.h
@@ -0,0 +1,68 @@
+/*  Image Filters RGB32 Brightness
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  Perform a filter over an image and replace pixels that match the filter.
+ *
+ */
+
+#ifndef PokemonAutomation_Kernels_ImageFilter_RGB32_Brightness_H
+#define PokemonAutomation_Kernels_ImageFilter_RGB32_Brightness_H
+
+#include <stdint.h>
+#include <cstddef>
+namespace PokemonAutomation{
+namespace Kernels{
+
+
+
+union Rgb32BrightnessWeights{
+    struct{
+        int8_t blue;
+        int8_t green;
+        int8_t red;
+        int8_t alpha;
+    } parts;
+    uint32_t u32;
+
+    Rgb32BrightnessWeights(uint32_t value)
+        : u32(value)
+    {}
+    Rgb32BrightnessWeights(uint8_t red, uint8_t green, uint8_t blue){
+        parts.alpha = 0;
+        parts.red = red;
+        parts.green = green;
+        parts.blue = blue;
+    }
+    Rgb32BrightnessWeights(uint8_t alpha, uint8_t red, uint8_t green, uint8_t blue){
+        parts.alpha = alpha;
+        parts.red = red;
+        parts.green = green;
+        parts.blue = blue;
+    }
+};
+
+
+
+size_t filter_rgb32_brightness(
+    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
+    uint32_t* out, size_t out_bytes_per_row,
+    uint32_t replacement, bool replace_color_within_range,
+    Rgb32BrightnessWeights weights,
+    uint32_t min_brightness, uint32_t max_brightness
+);
+
+size_t to_blackwhite_rgb32_brightness(
+    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
+    uint32_t* out, size_t out_bytes_per_row,
+    bool in_range_black,
+    Rgb32BrightnessWeights weights,
+    uint32_t min_brightness, uint32_t max_brightness
+);
+
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Kernels/ImageFilters/RGB32_Brightness/Kernels_ImageFilter_RGB32_Brightness_Default.cpp b/SerialPrograms/Source/Kernels/ImageFilters/RGB32_Brightness/Kernels_ImageFilter_RGB32_Brightness_Default.cpp
new file mode 100644
index 0000000000..24ea06a05f
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/ImageFilters/RGB32_Brightness/Kernels_ImageFilter_RGB32_Brightness_Default.cpp
@@ -0,0 +1,94 @@
+/*  Image Filters RGB32 Brightness
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Kernels/ImageFilters/Kernels_ImageFilter_Basic_Routines.h"
+#include "Kernels/ImageFilters/Kernels_ImageFilter_Basic_Routines_Default.h"
+#include "Kernels_ImageFilter_RGB32_Brightness.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace Kernels{
+
+
+class PixelTest_Rgb32Brightness_Default{
+public:
+    PA_FORCE_INLINE PixelTest_Rgb32Brightness_Default(
+        Rgb32BrightnessWeights weights, int32_t min_sum, int32_t max_sum
+    )
+        : m_weight_a(weights.parts.alpha)
+        , m_weight_r(weights.parts.red)
+        , m_weight_g(weights.parts.green)
+        , m_weight_b(weights.parts.blue)
+        , m_shift(min_sum)
+        , m_threshold(max_sum - min_sum)
+    {}
+    PA_FORCE_INLINE bool test_word(uint32_t pixel) const{
+        uint32_t brightness = 0;
+        brightness += ((pixel >> 24) & 0x000000ff) * m_weight_a;
+        brightness += ((pixel >> 16) & 0x000000ff) * m_weight_r;
+        brightness += ((pixel >>  8) & 0x000000ff) * m_weight_g;
+        brightness += ((pixel >>  0) & 0x000000ff) * m_weight_b;
+        return brightness - m_shift <= m_threshold;
+    }
+
+private:
+    int32_t m_weight_a;
+    int32_t m_weight_r;
+    int32_t m_weight_g;
+    int32_t m_weight_b;
+    uint32_t m_shift;
+    uint32_t m_threshold;
+};
+
+
+
+
+
+
+
+size_t filter_rgb32_brightness_Default(
+    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
+    uint32_t* out, size_t out_bytes_per_row,
+    uint32_t replacement, bool replace_color_within_range,
+    Rgb32BrightnessWeights weights,
+    uint32_t min_brightness, uint32_t max_brightness
+){
+    PixelTest_Rgb32Brightness_Default tester(
+        weights,
+        min_brightness, max_brightness
+    );
+    FilterImage_Rgb32_Default<PixelTest_Rgb32Brightness_Default> filter(
+        tester, replacement, replace_color_within_range
+    );
+    filter_per_pixel(in, in_bytes_per_row, width, height, filter, out, out_bytes_per_row);
+    return filter.count();
+}
+size_t to_blackwhite_rgb32_brightness_Default(
+    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
+    uint32_t* out, size_t out_bytes_per_row,
+    bool in_range_black,
+    Rgb32BrightnessWeights weights,
+    uint32_t min_brightness, uint32_t max_brightness
+){
+    PixelTest_Rgb32Brightness_Default tester(
+        weights,
+        min_brightness, max_brightness
+    );
+    ToBlackWhite_Rgb32_Default<PixelTest_Rgb32Brightness_Default> filter(
+        tester, in_range_black
+    );
+    filter_per_pixel(in, in_bytes_per_row, width, height, filter, out, out_bytes_per_row);
+    return filter.count();
+}
+
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/Kernels/ImageFilters/RGB32_Brightness/Kernels_ImageFilter_RGB32_Brightness_x64_AVX2.cpp b/SerialPrograms/Source/Kernels/ImageFilters/RGB32_Brightness/Kernels_ImageFilter_RGB32_Brightness_x64_AVX2.cpp
new file mode 100644
index 0000000000..9723c610ba
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/ImageFilters/RGB32_Brightness/Kernels_ImageFilter_RGB32_Brightness_x64_AVX2.cpp
@@ -0,0 +1,107 @@
+/*  Image Filters RGB32 Brightness
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifdef PA_AutoDispatch_x64_13_Haswell
+
+#include <limits>
+#include <immintrin.h>
+#include "Kernels/ImageFilters/Kernels_ImageFilter_Basic_Routines.h"
+#include "Kernels/ImageFilters/Kernels_ImageFilter_Basic_Routines_x64_AVX2.h"
+#include "Kernels_ImageFilter_RGB32_Brightness.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace Kernels{
+
+
+
+class PixelTest_Rgb32Brightness_x64_AVX2{
+public:
+    static const size_t VECTOR_SIZE = 8;
+    using Mask = PartialWordAccess32_x64_AVX2;
+
+public:
+    PA_FORCE_INLINE PixelTest_Rgb32Brightness_x64_AVX2(
+        Rgb32BrightnessWeights weights, int32_t min_sum, int32_t max_sum
+    )
+        : m_weightsL(_mm256_srai_epi16(_mm256_set1_epi32((weights.u32 << 8) & 0xff00ff00), 8))
+        , m_weightsH(_mm256_srai_epi16(_mm256_set1_epi32((weights.u32     ) & 0xff00ff00), 8))
+        , m_min(_mm256_set1_epi32(min_sum == std::numeric_limits<int32_t>::min() ? min_sum : min_sum - 1))
+        , m_max(_mm256_set1_epi32(max_sum == std::numeric_limits<int32_t>::max() ? max_sum : max_sum + 1))
+    {}
+
+    //  Return a mask indicating which lanes are in range.
+    PA_FORCE_INLINE __m256i test_word(__m256i pixel) const{
+        __m256i rb = _mm256_and_si256(pixel, _mm256_set1_epi32(0x00ff00ff));
+        __m256i ag = _mm256_and_si256(_mm256_srli_epi16(pixel, 8), _mm256_set1_epi32(0x00ff00ff));
+
+        rb = _mm256_madd_epi16(rb, m_weightsL);
+        ag = _mm256_madd_epi16(ag, m_weightsH);
+        pixel = _mm256_add_epi32(rb, ag);
+
+        __m256i cmp0 = _mm256_cmpgt_epi32(pixel, m_min);
+        __m256i cmp1 = _mm256_cmpgt_epi32(m_max, pixel);
+        return _mm256_and_si256(cmp0, cmp1);
+    }
+
+private:
+    const __m256i m_weightsL;
+    const __m256i m_weightsH;
+    const __m256i m_min;
+    const __m256i m_max;
+};
+
+
+
+
+size_t filter_rgb32_brightness_x64_AVX2(
+    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
+    uint32_t* out, size_t out_bytes_per_row,
+    uint32_t replacement, bool replace_color_within_range,
+    Rgb32BrightnessWeights weights,
+    uint32_t min_brightness, uint32_t max_brightness
+){
+    PixelTest_Rgb32Brightness_x64_AVX2 tester(
+        weights,
+        min_brightness, max_brightness
+    );
+    FilterImage_Rgb32_x64_AVX2<PixelTest_Rgb32Brightness_x64_AVX2> filter(
+        tester, replacement, replace_color_within_range
+    );
+    filter_per_pixel(in, in_bytes_per_row, width, height, filter, out, out_bytes_per_row);
+    return filter.count();
+}
+size_t to_blackwhite_rgb32_brightness_x64_AVX2(
+    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
+    uint32_t* out, size_t out_bytes_per_row,
+    bool in_range_black,
+    Rgb32BrightnessWeights weights,
+    uint32_t min_brightness, uint32_t max_brightness
+){
+    PixelTest_Rgb32Brightness_x64_AVX2 tester(
+        weights,
+        min_brightness, max_brightness
+    );
+    ToBlackWhite_Rgb32_x64_AVX2<PixelTest_Rgb32Brightness_x64_AVX2> filter(
+        tester, in_range_black
+    );
+    filter_per_pixel(in, in_bytes_per_row, width, height, filter, out, out_bytes_per_row);
+    return filter.count();
+}
+
+
+
+
+
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Kernels/ImageFilters/RGB32_Brightness/Kernels_ImageFilter_RGB32_Brightness_x64_AVX512-VNNI.cpp b/SerialPrograms/Source/Kernels/ImageFilters/RGB32_Brightness/Kernels_ImageFilter_RGB32_Brightness_x64_AVX512-VNNI.cpp
new file mode 100644
index 0000000000..a5e207b09d
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/ImageFilters/RGB32_Brightness/Kernels_ImageFilter_RGB32_Brightness_x64_AVX512-VNNI.cpp
@@ -0,0 +1,110 @@
+/*  Image Filters RGB32 Brightness
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifdef PA_AutoDispatch_x64_19_IceLake
+
+#include <immintrin.h>
+#include "Kernels/ImageFilters/Kernels_ImageFilter_Basic_Routines.h"
+#include "Kernels/ImageFilters/Kernels_ImageFilter_Basic_Routines_x64_AVX512.h"
+#include "Kernels_ImageFilter_RGB32_Brightness.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace Kernels{
+
+
+
+class PixelTest_Rgb32Brightness_x64_AVX512VNNI{
+public:
+    static const size_t VECTOR_SIZE = 16;
+    using Mask = PartialWordMask_x64_AVX512;
+
+public:
+    PA_FORCE_INLINE PixelTest_Rgb32Brightness_x64_AVX512VNNI(
+        Rgb32BrightnessWeights weights, int32_t min_sum, int32_t max_sum
+    )
+        : m_weights(_mm512_set1_epi32(weights.u32))
+        , m_shift(_mm512_set1_epi32(-min_sum))
+        , m_threshold(_mm512_set1_epi32(max_sum - min_sum))
+    {}
+
+    //  Return a mask indicating which lanes are in range.
+    PA_FORCE_INLINE __mmask16 test_word(__m512i pixel) const{
+        pixel = _mm512_dpbusd_epi32(m_shift, pixel, m_weights);
+        return _mm512_cmple_epu32_mask(pixel, m_threshold);
+    }
+
+private:
+    const __m512i m_weights;
+    const __m512i m_shift;
+    const __m512i m_threshold;
+};
+
+
+
+
+
+size_t filter_rgb32_brightness_x64_AVX512VNNI(
+    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
+    uint32_t* out, size_t out_bytes_per_row,
+    uint32_t replacement, bool replace_color_within_range,
+    Rgb32BrightnessWeights weights,
+    uint32_t min_brightness, uint32_t max_brightness
+){
+    PixelTest_Rgb32Brightness_x64_AVX512VNNI tester(
+        weights,
+        min_brightness, max_brightness
+    );
+    FilterImage_Rgb32_x64_AVX512<PixelTest_Rgb32Brightness_x64_AVX512VNNI> filter(
+        tester, replacement, replace_color_within_range
+    );
+    filter_per_pixel(in, in_bytes_per_row, width, height, filter, out, out_bytes_per_row);
+    return filter.count();
+}
+size_t to_blackwhite_rgb32_brightness_x64_AVX512VNNI(
+    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
+    uint32_t* out, size_t out_bytes_per_row,
+    bool in_range_black,
+    Rgb32BrightnessWeights weights,
+    uint32_t min_brightness, uint32_t max_brightness
+){
+    PixelTest_Rgb32Brightness_x64_AVX512VNNI tester(
+        weights,
+        min_brightness, max_brightness
+    );
+    ToBlackWhite_Rgb32_x64_AVX512<PixelTest_Rgb32Brightness_x64_AVX512VNNI> filter(
+        tester, in_range_black
+    );
+    filter_per_pixel(in, in_bytes_per_row, width, height, filter, out, out_bytes_per_row);
+    return filter.count();
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Kernels/ImageFilters/RGB32_Brightness/Kernels_ImageFilter_RGB32_Brightness_x64_SSE42.cpp b/SerialPrograms/Source/Kernels/ImageFilters/RGB32_Brightness/Kernels_ImageFilter_RGB32_Brightness_x64_SSE42.cpp
new file mode 100644
index 0000000000..7b8479900e
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/ImageFilters/RGB32_Brightness/Kernels_ImageFilter_RGB32_Brightness_x64_SSE42.cpp
@@ -0,0 +1,107 @@
+/*  Image Filters RGB32 Brightness
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifdef PA_AutoDispatch_x64_08_Nehalem
+
+#include <limits>
+#include <immintrin.h>
+#include "Kernels/ImageFilters/Kernels_ImageFilter_Basic_Routines.h"
+#include "Kernels/ImageFilters/Kernels_ImageFilter_Basic_Routines_x64_SSE42.h"
+#include "Kernels_ImageFilter_RGB32_Brightness.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace Kernels{
+
+
+
+class PixelTest_Rgb32Brightness_x64_SSE42{
+public:
+    static const size_t VECTOR_SIZE = 4;
+    using Mask = PartialWordMask_x64_SSE42;
+
+public:
+    PA_FORCE_INLINE PixelTest_Rgb32Brightness_x64_SSE42(
+        Rgb32BrightnessWeights weights, int32_t min_sum, int32_t max_sum
+    )
+        : m_weightsL(_mm_srai_epi16(_mm_set1_epi32((weights.u32 << 8) & 0xff00ff00), 8))
+        , m_weightsH(_mm_srai_epi16(_mm_set1_epi32((weights.u32     ) & 0xff00ff00), 8))
+        , m_min(_mm_set1_epi32(min_sum == std::numeric_limits<int32_t>::min() ? min_sum : min_sum - 1))
+        , m_max(_mm_set1_epi32(max_sum == std::numeric_limits<int32_t>::max() ? max_sum : max_sum + 1))
+    {}
+
+    //  Return a mask indicating which lanes are in range.
+    PA_FORCE_INLINE __m128i test_word(__m128i pixel) const{
+        __m128i rb = _mm_and_si128(pixel, _mm_set1_epi32(0x00ff00ff));
+        __m128i ag = _mm_and_si128(_mm_srli_epi16(pixel, 8), _mm_set1_epi32(0x00ff00ff));
+
+        rb = _mm_madd_epi16(rb, m_weightsL);
+        ag = _mm_madd_epi16(ag, m_weightsH);
+        pixel = _mm_add_epi32(rb, ag);
+
+        __m128i cmp0 = _mm_cmpgt_epi32(pixel, m_min);
+        __m128i cmp1 = _mm_cmpgt_epi32(m_max, pixel);
+        return _mm_and_si128(cmp0, cmp1);
+    }
+
+private:
+    const __m128i m_weightsL;
+    const __m128i m_weightsH;
+    const __m128i m_min;
+    const __m128i m_max;
+};
+
+
+
+
+size_t filter_rgb32_brightness_x64_SSE42(
+    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
+    uint32_t* out, size_t out_bytes_per_row,
+    uint32_t replacement, bool replace_color_within_range,
+    Rgb32BrightnessWeights weights,
+    uint32_t min_brightness, uint32_t max_brightness
+){
+    PixelTest_Rgb32Brightness_x64_SSE42 tester(
+        weights,
+        min_brightness, max_brightness
+    );
+    FilterImage_Rgb32_x64_SSE42<PixelTest_Rgb32Brightness_x64_SSE42> filter(
+        tester, replacement, replace_color_within_range
+    );
+    filter_per_pixel(in, in_bytes_per_row, width, height, filter, out, out_bytes_per_row);
+    return filter.count();
+}
+size_t to_blackwhite_rgb32_brightness_x64_SSE42(
+    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
+    uint32_t* out, size_t out_bytes_per_row,
+    bool in_range_black,
+    Rgb32BrightnessWeights weights,
+    uint32_t min_brightness, uint32_t max_brightness
+){
+    PixelTest_Rgb32Brightness_x64_SSE42 tester(
+        weights,
+        min_brightness, max_brightness
+    );
+    ToBlackWhite_Rgb32_x64_SSE42<PixelTest_Rgb32Brightness_x64_SSE42> filter(
+        tester, in_range_black
+    );
+    filter_per_pixel(in, in_bytes_per_row, width, height, filter, out, out_bytes_per_row);
+    return filter.count();
+}
+
+
+
+
+
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Kernels/ImageFilters/RGB32_EuclideanDistance/Kernels_ImageFilter_RGB32_Euclidean.cpp b/SerialPrograms/Source/Kernels/ImageFilters/RGB32_EuclideanDistance/Kernels_ImageFilter_RGB32_Euclidean.cpp
new file mode 100644
index 0000000000..6fe7d5c0ea
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/ImageFilters/RGB32_EuclideanDistance/Kernels_ImageFilter_RGB32_Euclidean.cpp
@@ -0,0 +1,109 @@
+/*  Image Filters RGB32 Range
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Exceptions.h"
+#include "Common/Cpp/CpuId/CpuId.h"
+#include "Kernels_ImageFilter_RGB32_Euclidean.h"
+
+namespace PokemonAutomation{
+namespace Kernels{
+
+
+size_t filter_rgb32_euclidean_Default(
+    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
+    uint32_t* out, size_t out_bytes_per_row,
+    uint32_t replacement, bool replace_color_within_range,
+    uint32_t expected, double max_euclidean_distance
+);
+size_t filter_rgb32_euclidean_x64_SSE42(
+    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
+    uint32_t* out, size_t out_bytes_per_row,
+    uint32_t replacement, bool replace_color_within_range,
+    uint32_t expected, double max_euclidean_distance
+);
+size_t filter_rgb32_euclidean_x64_AVX2(
+    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
+    uint32_t* out, size_t out_bytes_per_row,
+    uint32_t replacement, bool replace_color_within_range,
+    uint32_t expected, double max_euclidean_distance
+);
+size_t filter_rgb32_euclidean_x64_AVX512(
+    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
+    uint32_t* out, size_t out_bytes_per_row,
+    uint32_t replacement, bool replace_color_within_range,
+    uint32_t expected, double max_euclidean_distance
+);
+size_t filter_rgb32_euclidean_ARM64_NEON(
+    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
+    uint32_t* out, size_t out_bytes_per_row,
+    uint32_t replacement, bool replace_color_within_range,
+    uint32_t expected, double max_euclidean_distance
+);
+size_t filter_rgb32_euclidean(
+    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
+    uint32_t* out, size_t out_bytes_per_row,
+    uint32_t replacement, bool replace_color_within_range,
+    uint32_t expected, double max_euclidean_distance
+){
+    if (width * height > 0xffffffff){
+        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Image is too large. more than 2^32 pixels.");
+    }
+#ifdef PA_AutoDispatch_x64_17_Skylake
+    if (CPU_CAPABILITY_CURRENT.OK_17_Skylake){
+        return filter_rgb32_euclidean_x64_AVX512(
+            in, in_bytes_per_row, width, height,
+            out, out_bytes_per_row,
+            replacement, replace_color_within_range,
+            expected, max_euclidean_distance
+        );
+    }
+#endif
+#ifdef PA_AutoDispatch_x64_13_Haswell
+    if (CPU_CAPABILITY_CURRENT.OK_13_Haswell){
+        return filter_rgb32_euclidean_x64_AVX2(
+            in, in_bytes_per_row, width, height,
+            out, out_bytes_per_row,
+            replacement, replace_color_within_range,
+            expected, max_euclidean_distance
+        );
+    }
+#endif
+#ifdef PA_AutoDispatch_x64_08_Nehalem
+    if (CPU_CAPABILITY_CURRENT.OK_08_Nehalem){
+        return filter_rgb32_euclidean_x64_SSE42(
+            in, in_bytes_per_row, width, height,
+            out, out_bytes_per_row,
+            replacement, replace_color_within_range,
+            expected, max_euclidean_distance
+        );
+    }
+#endif
+#ifdef PA_AutoDispatch_arm64_20_M1
+    if (CPU_CAPABILITY_CURRENT.OK_M1){
+        return filter_rgb32_euclidean_ARM64_NEON(
+            in, in_bytes_per_row, width, height,
+            out, out_bytes_per_row,
+            replacement, replace_color_within_range,
+            expected, max_euclidean_distance
+        );
+    }
+#endif
+    return filter_rgb32_euclidean_Default(
+        in, in_bytes_per_row, width, height,
+        out, out_bytes_per_row,
+            replacement, replace_color_within_range,
+            expected, max_euclidean_distance
+    );
+}
+
+
+
+
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/Kernels/ImageFilters/RGB32_EuclideanDistance/Kernels_ImageFilter_RGB32_Euclidean.h b/SerialPrograms/Source/Kernels/ImageFilters/RGB32_EuclideanDistance/Kernels_ImageFilter_RGB32_Euclidean.h
new file mode 100644
index 0000000000..91125a15a9
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/ImageFilters/RGB32_EuclideanDistance/Kernels_ImageFilter_RGB32_Euclidean.h
@@ -0,0 +1,32 @@
+/*  Image Filters RGB32 Euclidean Distance
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  Perform a filter over an image and replace pixels that match the filter.
+ *
+ */
+
+#ifndef PokemonAutomation_Kernels_ImageFilter_RGB32_Euclidean_H
+#define PokemonAutomation_Kernels_ImageFilter_RGB32_Euclidean_H
+
+#include <stdint.h>
+#include <cstddef>
+
+namespace PokemonAutomation{
+namespace Kernels{
+
+
+
+size_t filter_rgb32_euclidean(
+    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
+    uint32_t* out, size_t out_bytes_per_row,
+    uint32_t replacement, bool replace_color_within_range,
+    uint32_t expected, double max_euclidean_distance
+);
+
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Kernels/ImageFilters/RGB32_EuclideanDistance/Kernels_ImageFilter_RGB32_Euclidean_ARM64_NEON.cpp b/SerialPrograms/Source/Kernels/ImageFilters/RGB32_EuclideanDistance/Kernels_ImageFilter_RGB32_Euclidean_ARM64_NEON.cpp
new file mode 100644
index 0000000000..c0b85069fa
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/ImageFilters/RGB32_EuclideanDistance/Kernels_ImageFilter_RGB32_Euclidean_ARM64_NEON.cpp
@@ -0,0 +1,203 @@
+/*  Image Filters RGB32 Euclidean
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifdef PA_AutoDispatch_arm64_20_M1
+
+#include <cstring>
+#include "Kernels/ImageFilters/Kernels_ImageFilter_Basic_Routines.h"
+#include "Kernels/PartialWordAccess/Kernels_PartialWordAccess_arm64_NEON.h"
+#include "Kernels/ImageFilters/Kernels_ImageFilter_Basic_Routines_ARM64_NEON.h"
+
+namespace PokemonAutomation{
+namespace Kernels{
+
+
+
+class PixelTest_Rgb32Euclidean_ARM64_NEON{
+public:
+    static const size_t VECTOR_SIZE = 4;
+    using Mask = size_t;
+
+public:
+    PA_FORCE_INLINE PixelTest_Rgb32Euclidean_ARM64_NEON(
+        uint32_t expected_color, double max_euclidean_distance
+    )
+        : m_expected_color_rgb_u8(vreinterpretq_u8_u32(vdupq_n_u32(expected_color & 0x00ffffff)))
+        , m_distance_squared_u32(vdupq_n_u32((uint32_t)(max_euclidean_distance * max_euclidean_distance)))
+    {}
+
+    //  Return a mask indicating which lanes are in range.
+    PA_FORCE_INLINE uint32x4_t test_word(uint32x4_t& pixel) const{
+        uint32x4_t& in_u32 = pixel;
+        // subtract the expected values
+        uint32x4_t in_dif_u32 = vreinterpretq_u32_u8(vabdq_u8(vreinterpretq_u8_u32(in_u32), m_expected_color_rgb_u8));
+
+        // Get green channel
+        uint32x4_t in_g_u32 = vandq_u32(in_dif_u32, vdupq_n_u32(0x0000ff00));
+        // Move green channel to the lower end of the 16-bit regions
+        uint16x8_t in_g_u16 = vshrq_n_u16(vreinterpretq_u16_u32(in_g_u32), 8);
+        // in_rb_u16 contains the red and blue channels. Each channel occupies a 16-bit region
+        uint16x8_t in_rb_u16 = vandq_u16(vreinterpretq_u16_u32(in_dif_u32), vdupq_n_u16(0x00ff));
+
+        // Square operation
+        uint16x8_t in_g2_u16 = vmulq_u16(in_g_u16, in_g_u16);
+        uint16x8_t in_r2b2_u16 = vmulq_u16(in_rb_u16, in_rb_u16);
+
+        uint32x4_t in_g2_u32 = vreinterpretq_u32_u16(in_g2_u16);
+        // Use pairwise addition and accumulate to add r2, g2, and b2 together
+        uint32x4_t sum_sqr_u32 = vpadalq_u16(in_g2_u32, in_r2b2_u16);
+
+        // cmp_u32: if each pixel is within the range, its uint32_t in `cmp_u32` is all 1 bits, otherwise, all 0 bits
+        return vcleq_u32(sum_sqr_u32, m_distance_squared_u32);
+    }
+
+private:
+    uint8x16_t m_expected_color_rgb_u8;
+    uint32x4_t m_distance_squared_u32;
+};
+
+
+
+size_t filter_rgb32_euclidean_ARM64_NEON(
+    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
+    uint32_t* out, size_t out_bytes_per_row,
+    uint32_t replacement, bool replace_color_within_range,
+    uint32_t expected, double max_euclidean_distance
+){
+    PixelTest_Rgb32Euclidean_ARM64_NEON tester(
+        expected, max_euclidean_distance
+    );
+    FilterImage_Rgb32_ARM64_NEON<PixelTest_Rgb32Euclidean_ARM64_NEON> filter(
+        tester, replacement, replace_color_within_range
+    );
+    filter_per_pixel(in, in_bytes_per_row, width, height, filter, out, out_bytes_per_row);
+    return filter.count();
+}
+size_t to_blackwhite_rgb32_euclidean_ARM64_NEON(
+    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
+    uint32_t* out, size_t out_bytes_per_row,
+    bool in_range_black,
+    uint32_t expected, double max_euclidean_distance
+){
+    PixelTest_Rgb32Euclidean_ARM64_NEON tester(
+        expected, max_euclidean_distance
+    );
+    ToBlackWhite_Rgb32_ARM64_NEON<PixelTest_Rgb32Euclidean_ARM64_NEON> filter(
+        tester, in_range_black
+    );
+    filter_per_pixel(in, in_bytes_per_row, width, height, filter, out, out_bytes_per_row);
+    return filter.count();
+}
+
+
+
+#if 0
+
+class ImageFilter_RgbEuclidean_arm64_NEON{
+public:
+    static const size_t VECTOR_SIZE = 4;
+    using Mask = size_t;
+
+public:
+    ImageFilter_RgbEuclidean_arm64_NEON(
+        uint32_t replacement_color, bool replace_color_within_range,
+        uint32_t expected_color, double max_euclidean_distance
+    )
+        : m_expected_color_rgb_u8(vreinterpretq_u8_u32(vdupq_n_u32(expected_color & 0x00ffffff)))
+        , m_distance_squared_u32(vdupq_n_u32((uint32_t)(max_euclidean_distance * max_euclidean_distance)))
+        , m_replacement_color_u32(vdupq_n_u32(replacement_color))
+        , m_replace_color_within_range(replace_color_within_range)
+        , m_count_u32(vdupq_n_u32(0))
+    {}
+
+    PA_FORCE_INLINE size_t count() const{
+        uint64x2_t sum_u64 = vpaddlq_u32(m_count_u32);
+        return sum_u64[0] + sum_u64[1];
+    }
+
+    // Given 4 pixels from in[4], apply color range comparison and count the pixels that are in range.
+    // The counts are stored in m_count_u32.
+    // If a per-pixel mask, cmp_mask_u32 is not nullptr, it only counts the pixels covered by the mask.
+    // It also changes pixels in or out of the range to have the new color m_replacement_color_u32.
+    // The resulting pixels are saved in out[4]
+    PA_FORCE_INLINE void process_full(uint32_t out[4], const uint32_t in[4], const uint32x4_t* cmp_mask_u32 = nullptr){
+        uint32x4_t in_u32 = vld1q_u32(in);
+        // subtract the expected values
+        uint32x4_t in_dif_u32 = vreinterpretq_u32_u8(vabdq_u8(vreinterpretq_u8_u32(in_u32), m_expected_color_rgb_u8));
+
+        // Get green channel
+        uint32x4_t in_g_u32 = vandq_u32(in_dif_u32, vdupq_n_u32(0x0000ff00));
+        // Move green channel to the lower end of the 16-bit regions
+        uint16x8_t in_g_u16 = vshrq_n_u16(vreinterpretq_u16_u32(in_g_u32), 8);
+        // in_rb_u16 contains the red and blue channels. Each channel occupies a 16-bit region
+        uint16x8_t in_rb_u16 = vandq_u16(vreinterpretq_u16_u32(in_dif_u32), vdupq_n_u16(0x00ff));
+
+        // Square operation
+        uint16x8_t in_g2_u16 = vmulq_u16(in_g_u16, in_g_u16);
+        uint16x8_t in_r2b2_u16 = vmulq_u16(in_rb_u16, in_rb_u16);
+
+        uint32x4_t in_g2_u32 = vreinterpretq_u32_u16(in_g2_u16);
+        // Use pairwise addition and accumulate to add r2, g2, and b2 together
+        uint32x4_t sum_sqr_u32 = vpadalq_u16(in_g2_u32, in_r2b2_u16);
+
+        // cmp_u32: if each pixel is within the range, its uint32_t in `cmp_u32` is all 1 bits, otherwise, all 0 bits
+        uint32x4_t cmp_u32 = vcleq_u32(sum_sqr_u32, m_distance_squared_u32);
+        if (cmp_mask_u32){
+            cmp_u32 = vandq_u32(cmp_u32, *cmp_mask_u32);
+        }
+        // Increase count for each pixel in range. Each uint32 lane is counted separately.
+        // We achieve +=1 by subtracting 0xFFFFFFFF
+        m_count_u32 = vsubq_u32(m_count_u32, cmp_u32);
+        // select replacement color or in_u8 based on cmp_u32:
+        uint32x4_t out_u32;
+        if (m_replace_color_within_range){
+            // vbslq_u32(a, b, c) for 1 bits in a, choose b; for 0 bits in a, choose c
+            out_u32 = vbslq_u32(cmp_u32, m_replacement_color_u32, in_u32);
+        }else{
+            out_u32 = vbslq_u32(cmp_u32, in_u32, m_replacement_color_u32);
+        }
+        vst1q_u32(out, out_u32);
+    }
+    // Same as `process_full()` but only process `left` (< 4) pixels
+    PA_FORCE_INLINE void process_partial(uint32_t* out, const uint32_t* in, size_t left){
+        uint32x4_t cmp_mask_u32 = vreinterpretq_u32_u8(PartialWordAccess_arm64_NEON::create_front_mask(left * 4));
+        uint32_t buffer_in[4], buffer_out[4];
+        memcpy(buffer_in, in, sizeof(uint32_t) * left);
+        process_full(buffer_out, buffer_in, &cmp_mask_u32);
+        memcpy(out, buffer_out, sizeof(uint32_t) * left);
+    }
+
+private:
+    uint8x16_t m_expected_color_rgb_u8;
+    uint32x4_t m_distance_squared_u32;
+    uint32x4_t m_replacement_color_u32;
+    bool m_replace_color_within_range;
+    uint32x4_t m_count_u32;
+
+private:
+
+};
+size_t filter_rgb32_euclidean_arm64_NEON(
+    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
+    uint32_t* out, size_t out_bytes_per_row,
+    uint32_t replacement, bool replace_color_within_range,
+    uint32_t expected, double max_euclidean_distance
+){
+    ImageFilter_RgbEuclidean_arm64_NEON filter(
+        replacement, replace_color_within_range,
+        expected, max_euclidean_distance
+    );
+    filter_per_pixel(in, in_bytes_per_row, width, height, filter, out, out_bytes_per_row);
+    return filter.count();
+}
+#endif
+
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Kernels/ImageFilters/RGB32_EuclideanDistance/Kernels_ImageFilter_RGB32_Euclidean_Default.cpp b/SerialPrograms/Source/Kernels/ImageFilters/RGB32_EuclideanDistance/Kernels_ImageFilter_RGB32_Euclidean_Default.cpp
new file mode 100644
index 0000000000..2fc0ba065e
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/ImageFilters/RGB32_EuclideanDistance/Kernels_ImageFilter_RGB32_Euclidean_Default.cpp
@@ -0,0 +1,99 @@
+/*  Image Filters RGB32 Euclidean
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Kernels/ImageFilters/Kernels_ImageFilter_Basic_Routines.h"
+#include "Kernels/ImageFilters/Kernels_ImageFilter_Basic_Routines_Default.h"
+
+namespace PokemonAutomation{
+namespace Kernels{
+
+
+
+
+class PixelTest_Rgb32Euclidean_Default{
+public:
+    static const size_t VECTOR_SIZE = 1;
+    using Mask = size_t;
+
+public:
+    PA_FORCE_INLINE PixelTest_Rgb32Euclidean_Default(
+        uint32_t expected, double max_euclidean_distance
+    )
+        : m_expected_r((expected & 0x00ff0000) >> 16)
+        , m_expected_g((expected & 0x0000ff00) >> 8)
+        , m_expected_b(expected & 0x000000ff)
+        , m_max_distance_squared((uint32_t)(max_euclidean_distance * max_euclidean_distance))
+    {}
+
+    //  Return a mask indicating which lanes are in range.
+    PA_FORCE_INLINE bool test_word(uint32_t pixel) const{
+        uint32_t sum_sqr = 0;
+        {
+            uint32_t p = (pixel & 0x00ff0000) >> 16;
+            p -= m_expected_r;
+            sum_sqr += p * p;
+        }
+        {
+            uint32_t p = (pixel & 0x0000ff00) >> 8;
+            p -= m_expected_g;
+            sum_sqr += p * p;
+        }
+        {
+            uint32_t p = pixel & 0x000000ff;
+            p -= m_expected_b;
+            sum_sqr += p * p;
+        }
+        return sum_sqr <= m_max_distance_squared;
+    }
+
+private:
+    uint32_t m_expected_r;
+    uint32_t m_expected_g;
+    uint32_t m_expected_b;
+    uint32_t m_max_distance_squared;
+};
+
+
+
+size_t filter_rgb32_euclidean_Default(
+    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
+    uint32_t* out, size_t out_bytes_per_row,
+    uint32_t replacement, bool replace_color_within_range,
+    uint32_t expected, double max_euclidean_distance
+){
+    PixelTest_Rgb32Euclidean_Default tester(
+        expected, max_euclidean_distance
+    );
+    FilterImage_Rgb32_Default<PixelTest_Rgb32Euclidean_Default> filter(
+        tester, replacement, replace_color_within_range
+    );
+    filter_per_pixel(in, in_bytes_per_row, width, height, filter, out, out_bytes_per_row);
+    return filter.count();
+}
+size_t to_blackwhite_rgb32_euclidean_Default(
+    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
+    uint32_t* out, size_t out_bytes_per_row,
+    bool in_range_black,
+    uint32_t expected, double max_euclidean_distance
+){
+    PixelTest_Rgb32Euclidean_Default tester(
+        expected, max_euclidean_distance
+    );
+    ToBlackWhite_Rgb32_Default<PixelTest_Rgb32Euclidean_Default> filter(
+        tester, in_range_black
+    );
+    filter_per_pixel(in, in_bytes_per_row, width, height, filter, out, out_bytes_per_row);
+    return filter.count();
+}
+
+
+
+
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/Kernels/ImageFilters/RGB32_EuclideanDistance/Kernels_ImageFilter_RGB32_Euclidean_Tests.cpp b/SerialPrograms/Source/Kernels/ImageFilters/RGB32_EuclideanDistance/Kernels_ImageFilter_RGB32_Euclidean_Tests.cpp
new file mode 100644
index 0000000000..da9cc8166f
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/ImageFilters/RGB32_EuclideanDistance/Kernels_ImageFilter_RGB32_Euclidean_Tests.cpp
@@ -0,0 +1,400 @@
+/*  Image Filters RGB32 Euclidean Tests
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  Checks every ISA's Euclidean distance filters against a scalar reference.
+ *  A pixel is in range when the sum of the squared differences of its R, G
+ *  and B to the expected color is <= the squared distance limit (rounded down
+ *  to an integer). Alpha is ignored.
+ *
+ *  Most test pixels sit exactly at, one below, or one above the squared limit,
+ *  so an implementation that gets the boundary wrong fails.
+ *
+ */
+
+#include <algorithm>
+#include <cmath>
+#include <cstdio>
+#include <format>
+#include <memory>
+#include <random>
+#include <string>
+#include <vector>
+#include "Common/Cpp/CancellableScope.h"
+#include "Common/Cpp/CpuId/CpuId.h"
+#include "Common/Cpp/Containers/AlignedVector.tpp"
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "Kernels/BinaryMatrix/Kernels_BinaryMatrix.h"
+#include "Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters.h"
+#include "Kernels_ImageFilter_RGB32_Euclidean_Tests.h"
+
+namespace PokemonAutomation{
+namespace Kernels{
+
+
+
+using FilterRgb32Euclidean = size_t (*)(
+    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
+    uint32_t* out, size_t out_bytes_per_row,
+    uint32_t replacement, bool replace_color_within_range,
+    uint32_t expected, double max_euclidean_distance
+);
+using ToBlackWhiteRgb32Euclidean = size_t (*)(
+    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
+    uint32_t* out, size_t out_bytes_per_row,
+    bool in_range_black,
+    uint32_t expected, double max_euclidean_distance
+);
+
+size_t filter_rgb32_euclidean_Default(
+    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
+    uint32_t* out, size_t out_bytes_per_row,
+    uint32_t replacement, bool replace_color_within_range,
+    uint32_t expected, double max_euclidean_distance
+);
+size_t to_blackwhite_rgb32_euclidean_Default(
+    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
+    uint32_t* out, size_t out_bytes_per_row,
+    bool in_range_black,
+    uint32_t expected, double max_euclidean_distance
+);
+#ifdef PA_AutoDispatch_x64_08_Nehalem
+size_t filter_rgb32_euclidean_x64_SSE42(
+    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
+    uint32_t* out, size_t out_bytes_per_row,
+    uint32_t replacement, bool replace_color_within_range,
+    uint32_t expected, double max_euclidean_distance
+);
+size_t to_blackwhite_rgb32_euclidean_x64_SSE42(
+    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
+    uint32_t* out, size_t out_bytes_per_row,
+    bool in_range_black,
+    uint32_t expected, double max_euclidean_distance
+);
+#endif
+#ifdef PA_AutoDispatch_x64_13_Haswell
+size_t filter_rgb32_euclidean_x64_AVX2(
+    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
+    uint32_t* out, size_t out_bytes_per_row,
+    uint32_t replacement, bool replace_color_within_range,
+    uint32_t expected, double max_euclidean_distance
+);
+size_t to_blackwhite_rgb32_euclidean_x64_AVX2(
+    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
+    uint32_t* out, size_t out_bytes_per_row,
+    bool in_range_black,
+    uint32_t expected, double max_euclidean_distance
+);
+#endif
+#ifdef PA_AutoDispatch_x64_17_Skylake
+size_t filter_rgb32_euclidean_x64_AVX512(
+    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
+    uint32_t* out, size_t out_bytes_per_row,
+    uint32_t replacement, bool replace_color_within_range,
+    uint32_t expected, double max_euclidean_distance
+);
+size_t to_blackwhite_rgb32_euclidean_x64_AVX512(
+    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
+    uint32_t* out, size_t out_bytes_per_row,
+    bool in_range_black,
+    uint32_t expected, double max_euclidean_distance
+);
+#endif
+#ifdef PA_AutoDispatch_arm64_20_M1
+size_t filter_rgb32_euclidean_ARM64_NEON(
+    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
+    uint32_t* out, size_t out_bytes_per_row,
+    uint32_t replacement, bool replace_color_within_range,
+    uint32_t expected, double max_euclidean_distance
+);
+size_t to_blackwhite_rgb32_euclidean_ARM64_NEON(
+    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
+    uint32_t* out, size_t out_bytes_per_row,
+    bool in_range_black,
+    uint32_t expected, double max_euclidean_distance
+);
+#endif
+
+
+
+namespace{
+
+//  R = 122, G = 128, B = 134: every test offset (at most 120 per channel)
+//  stays inside 0..255.
+const uint32_t EXPECTED_COLOR = 0xff7a8086;
+const int MAX_OFFSET = 120;
+const uint32_t REPLACEMENT_COLOR = 0x13572468;
+
+const double MAX_DISTANCES[] = {0.0, 1.0, 50.0, 100.5};
+
+//  Widths around the SIMD vector sizes (4, 8, 16 pixels) and the binary
+//  matrix tile width (64 pixels), so the full words and the partial tails
+//  both see boundary pixels.
+const size_t TEST_SIZES[][2] = {
+    {1, 1}, {2, 1}, {3, 2}, {4, 2}, {5, 3}, {7, 2}, {8, 2}, {9, 3},
+    {15, 2}, {16, 2}, {17, 3}, {31, 2}, {32, 2}, {33, 2},
+    {63, 2}, {64, 2}, {65, 3}, {100, 3}, {128, 2}, {129, 3}, {200, 5},
+};
+
+struct Offset{
+    int r;
+    int g;
+    int b;
+};
+
+int channel(uint32_t pixel, int shift){
+    return (int)((pixel >> shift) & 0xff);
+}
+uint32_t distance_squared(uint32_t pixel){
+    int r = channel(pixel, 16) - channel(EXPECTED_COLOR, 16);
+    int g = channel(pixel,  8) - channel(EXPECTED_COLOR,  8);
+    int b = channel(pixel,  0) - channel(EXPECTED_COLOR,  0);
+    return (uint32_t)(r * r + g * g + b * b);
+}
+
+//  Up to "limit" RGB offsets whose squared length is exactly "target".
+void add_offsets(std::vector<Offset>& offsets, uint32_t target, size_t limit){
+    size_t added = 0;
+    for (int r = 0; r <= MAX_OFFSET && (uint32_t)(r * r) <= target; r++){
+        for (int g = 0; g <= MAX_OFFSET && (uint32_t)(r * r + g * g) <= target; g++){
+            uint32_t left = target - (uint32_t)(r * r + g * g);
+            int b = (int)std::lround(std::sqrt((double)left));
+            if (b > MAX_OFFSET || (uint32_t)(b * b) != left){
+                continue;
+            }
+            //  Same length with other signs and channel orders.
+            offsets.push_back({ r,  g,  b});
+            offsets.push_back({-r,  g, -b});
+            offsets.push_back({ g, -b,  r});
+            offsets.push_back({-b, -r, -g});
+            added += 4;
+            if (added >= limit){
+                return;
+            }
+        }
+    }
+}
+
+AlignedVector<uint32_t> make_image(double max_distance, size_t width, size_t height){
+    uint32_t limit = (uint32_t)(max_distance * max_distance);
+
+    std::vector<Offset> boundary;
+    if (limit > 0){
+        add_offsets(boundary, limit - 1, 16);
+    }
+    add_offsets(boundary, limit, 16);
+    add_offsets(boundary, limit + 1, 16);
+
+    int spread = std::min((int)max_distance + 2, MAX_OFFSET);
+
+    std::mt19937 generator((unsigned)(width * 1000003u + height * 7919u + limit));
+    std::uniform_int_distribution<size_t> pick(0, boundary.size() - 1);
+    std::uniform_int_distribution<int> coin(0, 3);
+    std::uniform_int_distribution<int> random_offset(-spread, spread);
+    std::uniform_int_distribution<uint32_t> random_alpha(0, 255);
+
+    AlignedVector<uint32_t> image(width * height);
+    for (size_t c = 0; c < width * height; c++){
+        //  Three in four pixels are boundary cases, the rest are random
+        //  colors near the expected one.
+        Offset offset = coin(generator) != 0
+            ? boundary[pick(generator)]
+            : Offset{random_offset(generator), random_offset(generator), random_offset(generator)};
+        uint32_t r = (uint32_t)(channel(EXPECTED_COLOR, 16) + offset.r);
+        uint32_t g = (uint32_t)(channel(EXPECTED_COLOR,  8) + offset.g);
+        uint32_t b = (uint32_t)(channel(EXPECTED_COLOR,  0) + offset.b);
+        image[c] = (random_alpha(generator) << 24) | (r << 16) | (g << 8) | b;
+    }
+    return image;
+}
+
+std::string hex(uint32_t x){
+    char buffer[16];
+    std::snprintf(buffer, sizeof(buffer), "0x%08x", x);
+    return buffer;
+}
+std::string describe_case(double max_distance, size_t width, size_t height){
+    //  std::format uses the same "g" presentation for doubles as %g.
+    return std::format("max distance {}, {}x{}", max_distance, width, height);
+}
+std::string describe_pixel(uint32_t pixel, size_t x, size_t y, uint32_t limit){
+    return "pixel " + hex(pixel) + " at (" + std::to_string(x) + ", " + std::to_string(y) +
+        "), distance squared " + std::to_string(distance_squared(pixel)) +
+        ", limit " + std::to_string(limit);
+}
+
+
+
+class Test_FilterRgb32Euclidean : public UnitTest{
+public:
+    Test_FilterRgb32Euclidean(
+        const std::string& arch_str,
+        FilterRgb32Euclidean filter,
+        ToBlackWhiteRgb32Euclidean to_blackwhite
+    )
+        : UnitTest("Kernels::RGB32Euclidean - filter_" + arch_str)
+        , m_filter(filter)
+        , m_to_blackwhite(to_blackwhite)
+    {}
+
+    virtual UnitTestResult run(Logger& logger, CancellableScope& scope) const override{
+        for (double max_distance : MAX_DISTANCES){
+            uint32_t limit = (uint32_t)(max_distance * max_distance);
+            for (const auto& size : TEST_SIZES){
+                scope.throw_if_cancelled();
+                const size_t width = size[0];
+                const size_t height = size[1];
+                const size_t bytes_per_row = width * sizeof(uint32_t);
+                const std::string name = describe_case(max_distance, width, height);
+
+                AlignedVector<uint32_t> in = make_image(max_distance, width, height);
+                AlignedVector<uint32_t> out(width * height);
+
+                size_t expected_count = 0;
+                for (size_t c = 0; c < width * height; c++){
+                    expected_count += distance_squared(in[c]) <= limit;
+                }
+
+                for (bool replace_color_within_range : {true, false}){
+                    size_t count = m_filter(
+                        in.data(), bytes_per_row, width, height,
+                        out.data(), bytes_per_row,
+                        REPLACEMENT_COLOR, replace_color_within_range,
+                        EXPECTED_COLOR, max_distance
+                    );
+                    if (count != expected_count){
+                        return "filter, " + name + ": counted " + std::to_string(count) +
+                            " pixels in range, expected " + std::to_string(expected_count);
+                    }
+                    for (size_t c = 0; c < width * height; c++){
+                        bool in_range = distance_squared(in[c]) <= limit;
+                        uint32_t expected = in_range == replace_color_within_range ? REPLACEMENT_COLOR : in[c];
+                        if (out[c] != expected){
+                            return "filter, " + name + ", " + describe_pixel(in[c], c % width, c / width, limit) +
+                                ": got " + hex(out[c]) + ", expected " + hex(expected);
+                        }
+                    }
+                }
+
+                for (bool in_range_black : {true, false}){
+                    size_t count = m_to_blackwhite(
+                        in.data(), bytes_per_row, width, height,
+                        out.data(), bytes_per_row,
+                        in_range_black,
+                        EXPECTED_COLOR, max_distance
+                    );
+                    if (count != expected_count){
+                        return "to_blackwhite, " + name + ": counted " + std::to_string(count) +
+                            " pixels in range, expected " + std::to_string(expected_count);
+                    }
+                    for (size_t c = 0; c < width * height; c++){
+                        bool in_range = distance_squared(in[c]) <= limit;
+                        uint32_t expected = in_range == in_range_black ? 0xff000000 : 0xffffffff;
+                        if (out[c] != expected){
+                            return "to_blackwhite, " + name + ", " + describe_pixel(in[c], c % width, c / width, limit) +
+                                ": got " + hex(out[c]) + ", expected " + hex(expected);
+                        }
+                    }
+                }
+            }
+        }
+        return true;
+    }
+
+private:
+    FilterRgb32Euclidean m_filter;
+    ToBlackWhiteRgb32Euclidean m_to_blackwhite;
+};
+
+
+
+class Test_CompressRgb32Euclidean : public UnitTest{
+public:
+    Test_CompressRgb32Euclidean(const std::string& matrix_str, BinaryMatrixType type)
+        : UnitTest("Kernels::RGB32Euclidean - compress_" + matrix_str)
+        , m_type(type)
+    {}
+
+    virtual UnitTestResult run(Logger& logger, CancellableScope& scope) const override{
+        for (double max_distance : MAX_DISTANCES){
+            uint32_t limit = (uint32_t)(max_distance * max_distance);
+            for (const auto& size : TEST_SIZES){
+                scope.throw_if_cancelled();
+                const size_t width = size[0];
+                const size_t height = size[1];
+
+                AlignedVector<uint32_t> in = make_image(max_distance, width, height);
+                std::unique_ptr<PackedBinaryMatrix_IB> matrix = make_PackedBinaryMatrix(m_type, width, height);
+                compress_rgb32_to_binary_euclidean(
+                    in.data(), width * sizeof(uint32_t), *matrix,
+                    EXPECTED_COLOR, max_distance
+                );
+
+                for (size_t y = 0; y < height; y++){
+                    for (size_t x = 0; x < width; x++){
+                        uint32_t pixel = in[x + y * width];
+                        bool expected = distance_squared(pixel) <= limit;
+                        if (matrix->get(x, y) != expected){
+                            return "compress, " + describe_case(max_distance, width, height) + ", " +
+                                describe_pixel(pixel, x, y, limit) +
+                                ": got " + (expected ? "out of range" : "in range");
+                        }
+                    }
+                }
+            }
+        }
+        return true;
+    }
+
+private:
+    BinaryMatrixType m_type;
+};
+
+}
+
+
+
+void add_tests_ImageFilter_RGB32_Euclidean(UnitTestDatabase& database){
+    database.add<Test_FilterRgb32Euclidean>(
+        "Default", filter_rgb32_euclidean_Default, to_blackwhite_rgb32_euclidean_Default
+    );
+    database.add<Test_CompressRgb32Euclidean>("64x4_Default", BinaryMatrixType::i64x4_Default);
+#ifdef PA_AutoDispatch_x64_08_Nehalem
+    if (CPU_CAPABILITY_CURRENT.OK_08_Nehalem){
+        database.add<Test_FilterRgb32Euclidean>(
+            "x64_SSE42", filter_rgb32_euclidean_x64_SSE42, to_blackwhite_rgb32_euclidean_x64_SSE42
+        );
+        database.add<Test_CompressRgb32Euclidean>("64x8_x64_SSE42", BinaryMatrixType::i64x8_x64_SSE42);
+    }
+#endif
+#ifdef PA_AutoDispatch_x64_13_Haswell
+    if (CPU_CAPABILITY_CURRENT.OK_13_Haswell){
+        database.add<Test_FilterRgb32Euclidean>(
+            "x64_AVX2", filter_rgb32_euclidean_x64_AVX2, to_blackwhite_rgb32_euclidean_x64_AVX2
+        );
+        database.add<Test_CompressRgb32Euclidean>("64x16_x64_AVX2", BinaryMatrixType::i64x16_x64_AVX2);
+    }
+#endif
+#ifdef PA_AutoDispatch_x64_17_Skylake
+    if (CPU_CAPABILITY_CURRENT.OK_17_Skylake){
+        database.add<Test_FilterRgb32Euclidean>(
+            "x64_AVX512", filter_rgb32_euclidean_x64_AVX512, to_blackwhite_rgb32_euclidean_x64_AVX512
+        );
+        database.add<Test_CompressRgb32Euclidean>("64x32_x64_AVX512", BinaryMatrixType::i64x32_x64_AVX512);
+        database.add<Test_CompressRgb32Euclidean>("64x64_x64_AVX512", BinaryMatrixType::i64x64_x64_AVX512);
+    }
+#endif
+#ifdef PA_AutoDispatch_arm64_20_M1
+    if (CPU_CAPABILITY_CURRENT.OK_M1){
+        database.add<Test_FilterRgb32Euclidean>(
+            "arm64_NEON", filter_rgb32_euclidean_ARM64_NEON, to_blackwhite_rgb32_euclidean_ARM64_NEON
+        );
+        database.add<Test_CompressRgb32Euclidean>("64x8_arm64_NEON", BinaryMatrixType::arm64x8_x64_NEON);
+    }
+#endif
+}
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/Kernels/ImageFilters/RGB32_EuclideanDistance/Kernels_ImageFilter_RGB32_Euclidean_Tests.h b/SerialPrograms/Source/Kernels/ImageFilters/RGB32_EuclideanDistance/Kernels_ImageFilter_RGB32_Euclidean_Tests.h
new file mode 100644
index 0000000000..38f996cd9d
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/ImageFilters/RGB32_EuclideanDistance/Kernels_ImageFilter_RGB32_Euclidean_Tests.h
@@ -0,0 +1,23 @@
+/*  Image Filters RGB32 Euclidean Tests
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Kernels_ImageFilter_RGB32_Euclidean_Tests_H
+#define PokemonAutomation_Kernels_ImageFilter_RGB32_Euclidean_Tests_H
+
+#include "Common/Cpp/TestRunners/UnitTest.h"
+
+namespace PokemonAutomation{
+namespace Kernels{
+
+
+
+void add_tests_ImageFilter_RGB32_Euclidean(UnitTestDatabase& database);
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Kernels/ImageFilters/RGB32_EuclideanDistance/Kernels_ImageFilter_RGB32_Euclidean_x64_AVX2.cpp b/SerialPrograms/Source/Kernels/ImageFilters/RGB32_EuclideanDistance/Kernels_ImageFilter_RGB32_Euclidean_x64_AVX2.cpp
new file mode 100644
index 0000000000..5f79d49d70
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/ImageFilters/RGB32_EuclideanDistance/Kernels_ImageFilter_RGB32_Euclidean_x64_AVX2.cpp
@@ -0,0 +1,95 @@
+/*  Image Filters RGB32 Euclidean
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifdef PA_AutoDispatch_x64_13_Haswell
+
+#include <immintrin.h>
+#include "Kernels/PartialWordAccess/Kernels_PartialWordAccess_x64_AVX2.h"
+#include "Kernels/ImageFilters/Kernels_ImageFilter_Basic_Routines.h"
+#include "Kernels/ImageFilters/Kernels_ImageFilter_Basic_Routines_x64_AVX2.h"
+namespace PokemonAutomation{
+namespace Kernels{
+
+
+
+class PixelTest_Rgb32Euclidean_x64_AVX2{
+public:
+    static const size_t VECTOR_SIZE = 8;
+    using Mask = PartialWordAccess32_x64_AVX2;
+
+public:
+    PA_FORCE_INLINE PixelTest_Rgb32Euclidean_x64_AVX2(
+        uint32_t expected, double max_euclidean_distance
+    )
+        : m_expected_ag(_mm256_set1_epi32((expected >> 8) & 0x000000ff))
+        , m_expected_rb(_mm256_set1_epi32(expected & 0x00ff00ff))
+        , m_distance_squared(_mm256_set1_epi32((uint32_t)(max_euclidean_distance * max_euclidean_distance)))
+    {}
+
+    //  Return a mask indicating which lanes are in range.
+    PA_FORCE_INLINE __m256i test_word(__m256i pixel) const{
+        __m256i ag = _mm256_and_si256(_mm256_srli_epi16(pixel, 8), _mm256_set1_epi32(0x000000ff));
+        __m256i rb = _mm256_and_si256(pixel, _mm256_set1_epi32(0x00ff00ff));
+
+        ag = _mm256_sub_epi16(ag, m_expected_ag);
+        rb = _mm256_sub_epi16(rb, m_expected_rb);
+
+        __m256i g = _mm256_mullo_epi16(ag, ag);
+        rb = _mm256_mullo_epi16(rb, rb);
+        __m256i r = _mm256_srli_epi32(rb, 16);
+        __m256i b = _mm256_and_si256(rb, _mm256_set1_epi32(0x0000ffff));
+
+        __m256i sum_sqr = _mm256_add_epi32(r, g);
+        sum_sqr = _mm256_add_epi32(sum_sqr, b);
+
+        return _mm256_cmpeq_epi32(_mm256_min_epu32(sum_sqr, m_distance_squared), sum_sqr);
+    }
+
+private:
+    const __m256i m_expected_ag;
+    const __m256i m_expected_rb;
+    const __m256i m_distance_squared;
+};
+
+
+
+size_t filter_rgb32_euclidean_x64_AVX2(
+    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
+    uint32_t* out, size_t out_bytes_per_row,
+    uint32_t replacement, bool replace_color_within_range,
+    uint32_t expected, double max_euclidean_distance
+){
+    PixelTest_Rgb32Euclidean_x64_AVX2 tester(
+        expected, max_euclidean_distance
+    );
+    FilterImage_Rgb32_x64_AVX2<PixelTest_Rgb32Euclidean_x64_AVX2> filter(
+        tester, replacement, replace_color_within_range
+    );
+    filter_per_pixel(in, in_bytes_per_row, width, height, filter, out, out_bytes_per_row);
+    return filter.count();
+}
+size_t to_blackwhite_rgb32_euclidean_x64_AVX2(
+    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
+    uint32_t* out, size_t out_bytes_per_row,
+    bool in_range_black,
+    uint32_t expected, double max_euclidean_distance
+){
+    PixelTest_Rgb32Euclidean_x64_AVX2 tester(
+        expected, max_euclidean_distance
+    );
+    ToBlackWhite_Rgb32_x64_AVX2<PixelTest_Rgb32Euclidean_x64_AVX2> filter(
+        tester, in_range_black
+    );
+    filter_per_pixel(in, in_bytes_per_row, width, height, filter, out, out_bytes_per_row);
+    return filter.count();
+}
+
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Kernels/ImageFilters/RGB32_EuclideanDistance/Kernels_ImageFilter_RGB32_Euclidean_x64_AVX512.cpp b/SerialPrograms/Source/Kernels/ImageFilters/RGB32_EuclideanDistance/Kernels_ImageFilter_RGB32_Euclidean_x64_AVX512.cpp
new file mode 100644
index 0000000000..85fabfd865
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/ImageFilters/RGB32_EuclideanDistance/Kernels_ImageFilter_RGB32_Euclidean_x64_AVX512.cpp
@@ -0,0 +1,97 @@
+/*  Image Filters RGB32 Euclidean
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifdef PA_AutoDispatch_x64_17_Skylake
+
+#include <immintrin.h>
+#include "Kernels/ImageFilters/Kernels_ImageFilter_Basic_Routines.h"
+#include "Kernels/ImageFilters/Kernels_ImageFilter_Basic_Routines_x64_AVX512.h"
+#include "Kernels_ImageFilter_RGB32_Euclidean.h"
+
+namespace PokemonAutomation{
+namespace Kernels{
+
+
+
+
+class PixelTest_Rgb32Euclidean_x64_AVX512{
+public:
+    static const size_t VECTOR_SIZE = 16;
+    using Mask = PartialWordMask_x64_AVX512;
+
+public:
+    PA_FORCE_INLINE PixelTest_Rgb32Euclidean_x64_AVX512(
+        uint32_t expected, double max_euclidean_distance
+    )
+        : m_expected_ag(_mm512_set1_epi32((expected >> 8) & 0x000000ff))
+        , m_expected_rb(_mm512_set1_epi32(expected & 0x00ff00ff))
+        , m_distance_squared(_mm512_set1_epi32((uint32_t)(max_euclidean_distance * max_euclidean_distance)))
+    {}
+
+    //  Return a mask indicating which lanes are in range.
+    PA_FORCE_INLINE __mmask16 test_word(__m512i pixel) const{
+        __m512i ag = _mm512_and_si512(_mm512_srli_epi16(pixel, 8), _mm512_set1_epi32(0x000000ff));
+        __m512i rb = _mm512_and_si512(pixel, _mm512_set1_epi32(0x00ff00ff));
+
+        ag = _mm512_sub_epi16(ag, m_expected_ag);
+        rb = _mm512_sub_epi16(rb, m_expected_rb);
+
+        __m512i g = _mm512_mullo_epi16(ag, ag);
+        rb = _mm512_mullo_epi16(rb, rb);
+        __m512i r = _mm512_srli_epi32(rb, 16);
+        __m512i b = _mm512_and_si512(rb, _mm512_set1_epi32(0x0000ffff));
+
+        __m512i sum_sqr = _mm512_add_epi32(r, g);
+        sum_sqr = _mm512_add_epi32(sum_sqr, b);
+
+        return _mm512_cmple_epu32_mask(sum_sqr, m_distance_squared);
+    }
+
+private:
+    const __m512i m_expected_ag;
+    const __m512i m_expected_rb;
+    const __m512i m_distance_squared;
+};
+
+
+
+size_t filter_rgb32_euclidean_x64_AVX512(
+    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
+    uint32_t* out, size_t out_bytes_per_row,
+    uint32_t replacement, bool replace_color_within_range,
+    uint32_t expected, double max_euclidean_distance
+){
+    PixelTest_Rgb32Euclidean_x64_AVX512 tester(
+        expected, max_euclidean_distance
+    );
+    FilterImage_Rgb32_x64_AVX512<PixelTest_Rgb32Euclidean_x64_AVX512> filter(
+        tester, replacement, replace_color_within_range
+    );
+    filter_per_pixel(in, in_bytes_per_row, width, height, filter, out, out_bytes_per_row);
+    return filter.count();
+}
+size_t to_blackwhite_rgb32_euclidean_x64_AVX512(
+    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
+    uint32_t* out, size_t out_bytes_per_row,
+    bool in_range_black,
+    uint32_t expected, double max_euclidean_distance
+){
+    PixelTest_Rgb32Euclidean_x64_AVX512 tester(
+        expected, max_euclidean_distance
+    );
+    ToBlackWhite_Rgb32_x64_AVX512<PixelTest_Rgb32Euclidean_x64_AVX512> filter(
+        tester, in_range_black
+    );
+    filter_per_pixel(in, in_bytes_per_row, width, height, filter, out, out_bytes_per_row);
+    return filter.count();
+}
+
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Kernels/ImageFilters/RGB32_EuclideanDistance/Kernels_ImageFilter_RGB32_Euclidean_x64_SSE42.cpp b/SerialPrograms/Source/Kernels/ImageFilters/RGB32_EuclideanDistance/Kernels_ImageFilter_RGB32_Euclidean_x64_SSE42.cpp
new file mode 100644
index 0000000000..284e463132
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/ImageFilters/RGB32_EuclideanDistance/Kernels_ImageFilter_RGB32_Euclidean_x64_SSE42.cpp
@@ -0,0 +1,112 @@
+/*  Image Filters RGB32 Euclidean
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifdef PA_AutoDispatch_x64_08_Nehalem
+
+#include <immintrin.h>
+#include "Kernels/ImageFilters/Kernels_ImageFilter_Basic_Routines.h"
+#include "Kernels/ImageFilters/Kernels_ImageFilter_Basic_Routines_x64_SSE42.h"
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace Kernels{
+
+
+
+
+class PixelTest_Rgb32Euclidean_x64_SSE42{
+public:
+    static const size_t VECTOR_SIZE = 4;
+    using Mask = PartialWordMask_x64_SSE42;
+
+public:
+    PA_FORCE_INLINE PixelTest_Rgb32Euclidean_x64_SSE42(
+        uint32_t expected, double max_euclidean_distance
+    )
+        : m_expected_g(_mm_set1_epi32((expected >> 8) & 0x000000ff))
+        , m_expected_rb(_mm_set1_epi32(expected & 0x00ff00ff))
+        , m_distance_squared(_mm_set1_epi32((uint32_t)(max_euclidean_distance * max_euclidean_distance)))
+    {}
+
+    //  Return a mask indicating which lanes are in range.
+    PA_FORCE_INLINE __m128i test_word(__m128i pixel) const{
+        // _mm_srli_epi16: Shift 16-bit integers in pixels right by 8 while shifting in zeros,
+        // ng: green channels of each pixel, but shifted right by 8 bits
+        __m128i ng = _mm_and_si128(_mm_srli_epi16(pixel, 8), _mm_set1_epi32(0x000000ff));
+        // rb: the red and blue channels of each pixel
+        __m128i rb = _mm_and_si128(pixel, _mm_set1_epi32(0x00ff00ff));
+        // g: the difference between input pixel channels and the expected values
+        ng = _mm_sub_epi16(ng, m_expected_g);
+        rb = _mm_sub_epi16(rb, m_expected_rb);
+        // compute square operation:
+        // now each 16-bit region is a squared channel difference
+        // here we assume alpha channel from input image is the same as the expected,
+        // so the alpha channel difference is always 0, therefore:
+        // g: each 32-bit integer contains the green channel squared difference
+        __m128i g = _mm_mullo_epi16(ng, ng);
+        rb = _mm_mullo_epi16(rb, rb);
+        // r: each 32-bit integer contains the red channel squared difference
+        __m128i r = _mm_srli_epi32(rb, 16);
+        // b: each 32-bit integer contains the blue channel squared difference
+        __m128i b = _mm_and_si128(rb, _mm_set1_epi32(0x0000ffff));
+        // compute r^2 + g^2 + b^2
+        __m128i sum_sqr = _mm_add_epi32(r, g);
+        sum_sqr = _mm_add_epi32(sum_sqr, b);
+
+        return _mm_cmpeq_epi32(_mm_min_epu32(sum_sqr, m_distance_squared), sum_sqr);
+    }
+
+private:
+    const __m128i m_expected_g;
+    const __m128i m_expected_rb;
+    const __m128i m_distance_squared;
+};
+
+
+
+size_t filter_rgb32_euclidean_x64_SSE42(
+    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
+    uint32_t* out, size_t out_bytes_per_row,
+    uint32_t replacement, bool replace_color_within_range,
+    uint32_t expected, double max_euclidean_distance
+){
+    PixelTest_Rgb32Euclidean_x64_SSE42 tester(
+        expected, max_euclidean_distance
+    );
+    FilterImage_Rgb32_x64_SSE42<PixelTest_Rgb32Euclidean_x64_SSE42> filter(
+        tester, replacement, replace_color_within_range
+    );
+    filter_per_pixel(in, in_bytes_per_row, width, height, filter, out, out_bytes_per_row);
+    return filter.count();
+}
+size_t to_blackwhite_rgb32_euclidean_x64_SSE42(
+    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
+    uint32_t* out, size_t out_bytes_per_row,
+    bool in_range_black,
+    uint32_t expected, double max_euclidean_distance
+){
+    PixelTest_Rgb32Euclidean_x64_SSE42 tester(
+        expected, max_euclidean_distance
+    );
+    ToBlackWhite_Rgb32_x64_SSE42<PixelTest_Rgb32Euclidean_x64_SSE42> filter(
+        tester, in_range_black
+    );
+    filter_per_pixel(in, in_bytes_per_row, width, height, filter, out, out_bytes_per_row);
+    return filter.count();
+}
+
+
+
+
+
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Kernels/ImageFilters/RGB32_Range/Kernels_ImageFilter_RGB32_Range.cpp b/SerialPrograms/Source/Kernels/ImageFilters/RGB32_Range/Kernels_ImageFilter_RGB32_Range.cpp
new file mode 100644
index 0000000000..12e94686ac
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/ImageFilters/RGB32_Range/Kernels_ImageFilter_RGB32_Range.cpp
@@ -0,0 +1,349 @@
+/*  Image Filters RGB32 Range
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Exceptions.h"
+#include "Common/Cpp/CpuId/CpuId.h"
+#include "Kernels_ImageFilter_RGB32_Range.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace Kernels{
+
+
+
+
+size_t filter_rgb32_range_Default(
+    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
+    uint32_t* out, size_t out_bytes_per_row,
+    uint32_t replacement, bool replace_color_within_range,
+    uint32_t mins, uint32_t maxs
+);
+size_t filter_rgb32_range_x64_SSE42(
+    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
+    uint32_t* out, size_t out_bytes_per_row,
+    uint32_t replacement, bool replace_color_within_range,
+    uint32_t mins, uint32_t maxs
+);
+size_t filter_rgb32_range_x64_AVX2(
+    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
+    uint32_t* out, size_t out_bytes_per_row,
+    uint32_t replacement, bool replace_color_within_range,
+    uint32_t mins, uint32_t maxs
+);
+size_t filter_rgb32_range_x64_AVX512(
+    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
+    uint32_t* out, size_t out_bytes_per_row,
+    uint32_t replacement, bool replace_color_within_range,
+    uint32_t mins, uint32_t maxs
+);
+size_t filter_rgb32_range_arm64_NEON(
+    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
+    uint32_t* out, size_t out_bytes_per_row,
+    uint32_t replacement, bool replace_color_within_range,
+    uint32_t mins, uint32_t maxs
+);
+size_t filter_rgb32_range(
+    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
+    uint32_t* out, size_t out_bytes_per_row,
+    uint32_t replacement, bool replace_color_within_range,
+    uint32_t mins, uint32_t maxs
+){
+    if (width * height > 0xffffffff){
+        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Image is too large. more than 2^32 pixels.");
+    }
+#ifdef PA_AutoDispatch_x64_17_Skylake
+    if (CPU_CAPABILITY_CURRENT.OK_17_Skylake){
+        return filter_rgb32_range_x64_AVX512(
+            in, in_bytes_per_row, width, height,
+            out, out_bytes_per_row,
+            replacement, replace_color_within_range,
+            mins, maxs
+        );
+    }
+#endif
+#ifdef PA_AutoDispatch_x64_13_Haswell
+    if (CPU_CAPABILITY_CURRENT.OK_13_Haswell){
+        return filter_rgb32_range_x64_AVX2(
+            in, in_bytes_per_row, width, height,
+            out, out_bytes_per_row,
+            replacement, replace_color_within_range,
+            mins, maxs
+        );
+    }
+#endif
+#ifdef PA_AutoDispatch_x64_08_Nehalem
+    if (CPU_CAPABILITY_CURRENT.OK_08_Nehalem){
+        return filter_rgb32_range_x64_SSE42(
+            in, in_bytes_per_row, width, height,
+            out, out_bytes_per_row,
+            replacement, replace_color_within_range,
+            mins, maxs
+        );
+    }
+#endif
+#ifdef PA_AutoDispatch_arm64_20_M1
+    if (CPU_CAPABILITY_CURRENT.OK_M1){
+        return filter_rgb32_range_arm64_NEON(
+            in, in_bytes_per_row, width, height,
+            out, out_bytes_per_row,
+            replacement, replace_color_within_range,
+            mins, maxs
+        );
+    }
+#endif
+    return filter_rgb32_range_Default(
+        in, in_bytes_per_row, width, height,
+        out, out_bytes_per_row,
+        replacement, replace_color_within_range,
+        mins, maxs
+    );
+}
+
+
+#if 0
+void filter_rgb32_range_Default(
+    const uint32_t* image, size_t bytes_per_row, size_t width, size_t height,
+    FilterRgb32RangeFilter* filter, size_t filter_count
+);
+void filter_rgb32_range_x64_SSE42(
+    const uint32_t* image, size_t bytes_per_row, size_t width, size_t height,
+    FilterRgb32RangeFilter* filter, size_t filter_count
+);
+void filter_rgb32_range_x64_AVX2(
+    const uint32_t* image, size_t bytes_per_row, size_t width, size_t height,
+    FilterRgb32RangeFilter* filter, size_t filter_count
+);
+void filter_rgb32_range_x64_AVX512(
+    const uint32_t* image, size_t bytes_per_row, size_t width, size_t height,
+    FilterRgb32RangeFilter* filter, size_t filter_count
+);
+void filter_rgb32_range_arm64_NEON(
+    const uint32_t* image, size_t bytes_per_row, size_t width, size_t height,
+    FilterRgb32RangeFilter* filter, size_t filter_count
+);
+void filter_rgb32_range(
+    const uint32_t* image, size_t bytes_per_row, size_t width, size_t height,
+    FilterRgb32RangeFilter* filter, size_t filter_count
+){
+    if (width * height > 0xffffffff){
+        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Image is too large. more than 2^32 pixels.");
+    }
+#ifdef PA_AutoDispatch_x64_17_Skylake
+    if (CPU_CAPABILITY_CURRENT.OK_17_Skylake){
+        filter_rgb32_range_x64_AVX512(image, bytes_per_row, width, height, filter, filter_count);
+        return;
+    }
+#endif
+#ifdef PA_AutoDispatch_x64_13_Haswell
+    if (CPU_CAPABILITY_CURRENT.OK_13_Haswell){
+        filter_rgb32_range_x64_AVX2(image, bytes_per_row, width, height, filter, filter_count);
+        return;
+    }
+#endif
+#ifdef PA_AutoDispatch_x64_08_Nehalem
+    if (CPU_CAPABILITY_CURRENT.OK_08_Nehalem){
+        filter_rgb32_range_x64_SSE42(image, bytes_per_row, width, height, filter, filter_count);
+        return;
+    }
+#endif
+#ifdef PA_AutoDispatch_arm64_20_M1
+    if (CPU_CAPABILITY_CURRENT.OK_M1){
+        filter_rgb32_range_arm64_NEON(image, bytes_per_row, width, height, filter, filter_count);
+        return;
+    }
+#endif
+    filter_rgb32_range_Default(image, bytes_per_row, width, height, filter, filter_count);
+}
+#endif
+
+void filter_rgb32_range(
+    const uint32_t* image, size_t bytes_per_row, size_t width, size_t height,
+    FilterRgb32RangeFilter* filter, size_t filter_count
+){
+    for (size_t c = 0; c < filter_count; c++){
+        filter[c].pixels_in_range = filter_rgb32_range(
+            image, bytes_per_row, width, height,
+            filter[c].data, filter[c].bytes_per_row,
+            filter[c].replacement,
+            filter[c].invert,
+            filter[c].mins,
+            filter[c].maxs
+        );
+    }
+}
+
+
+
+
+
+
+size_t to_blackwhite_rgb32_range_Default(
+    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
+    uint32_t* out, size_t out_bytes_per_row,
+    bool in_range_black,
+    uint32_t mins, uint32_t maxs
+);
+size_t to_blackwhite_rgb32_range_x64_SSE42(
+    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
+    uint32_t* out, size_t out_bytes_per_row,
+    bool in_range_black,
+    uint32_t mins, uint32_t maxs
+);
+size_t to_blackwhite_rgb32_range_x64_AVX2(
+    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
+    uint32_t* out, size_t out_bytes_per_row,
+    bool in_range_black,
+    uint32_t mins, uint32_t maxs
+);
+size_t to_blackwhite_rgb32_range_x64_AVX512(
+    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
+    uint32_t* out, size_t out_bytes_per_row,
+    bool in_range_black,
+    uint32_t mins, uint32_t maxs
+);
+size_t to_blackwhite_rgb32_range_arm64_NEON(
+    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
+    uint32_t* out, size_t out_bytes_per_row,
+    bool in_range_black,
+    uint32_t mins, uint32_t maxs
+);
+size_t to_blackwhite_rgb32_range(
+    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
+    uint32_t* out, size_t out_bytes_per_row,
+    bool in_range_black,
+    uint32_t mins, uint32_t maxs
+){
+    if (width * height > 0xffffffff){
+        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Image is too large. more than 2^32 pixels.");
+    }
+#ifdef PA_AutoDispatch_x64_17_Skylake
+    if (CPU_CAPABILITY_CURRENT.OK_17_Skylake){
+        return to_blackwhite_rgb32_range_x64_AVX512(
+            in, in_bytes_per_row, width, height,
+            out, out_bytes_per_row,
+            in_range_black,
+            mins, maxs
+        );
+    }
+#endif
+#ifdef PA_AutoDispatch_x64_13_Haswell
+    if (CPU_CAPABILITY_CURRENT.OK_13_Haswell){
+        return to_blackwhite_rgb32_range_x64_AVX2(
+            in, in_bytes_per_row, width, height,
+            out, out_bytes_per_row,
+            in_range_black,
+            mins, maxs
+        );
+    }
+#endif
+#ifdef PA_AutoDispatch_x64_08_Nehalem
+    if (CPU_CAPABILITY_CURRENT.OK_08_Nehalem){
+        return to_blackwhite_rgb32_range_x64_SSE42(
+            in, in_bytes_per_row, width, height,
+            out, out_bytes_per_row,
+            in_range_black,
+            mins, maxs
+        );
+    }
+#endif
+#ifdef PA_AutoDispatch_arm64_20_M1
+    if (CPU_CAPABILITY_CURRENT.OK_M1){
+        return to_blackwhite_rgb32_range_arm64_NEON(
+            in, in_bytes_per_row, width, height,
+            out, out_bytes_per_row,
+            in_range_black,
+            mins, maxs
+        );
+    }
+#endif
+    return to_blackwhite_rgb32_range_Default(
+        in, in_bytes_per_row, width, height,
+        out, out_bytes_per_row,
+        in_range_black,
+        mins, maxs
+    );
+}
+
+
+
+#if 0
+void to_blackwhite_rgb32_range_Default(
+    const uint32_t* image, size_t bytes_per_row, size_t width, size_t height,
+    ToBlackWhiteRgb32RangeFilter* filter, size_t filter_count
+);
+void to_blackwhite_rgb32_range_x64_SSE42(
+    const uint32_t* image, size_t bytes_per_row, size_t width, size_t height,
+    ToBlackWhiteRgb32RangeFilter* filter, size_t filter_count
+);
+void to_blackwhite_rgb32_range_x64_AVX2(
+    const uint32_t* image, size_t bytes_per_row, size_t width, size_t height,
+    ToBlackWhiteRgb32RangeFilter* filter, size_t filter_count
+);
+void to_blackwhite_rgb32_range_x64_AVX512(
+    const uint32_t* image, size_t bytes_per_row, size_t width, size_t height,
+    ToBlackWhiteRgb32RangeFilter* filter, size_t filter_count
+);
+void to_blackwhite_rgb32_range_arm64_NEON(
+    const uint32_t* image, size_t bytes_per_row, size_t width, size_t height,
+    ToBlackWhiteRgb32RangeFilter* filter, size_t filter_count
+);
+void to_blackwhite_rgb32_range(
+    const uint32_t* image, size_t bytes_per_row, size_t width, size_t height,
+    ToBlackWhiteRgb32RangeFilter* filter, size_t filter_count
+){
+#ifdef PA_AutoDispatch_x64_17_Skylake
+    if (CPU_CAPABILITY_CURRENT.OK_17_Skylake){
+        return to_blackwhite_rgb32_range_x64_AVX512(image, bytes_per_row, width, height, filter, filter_count);
+    }
+#endif
+#ifdef PA_AutoDispatch_x64_13_Haswell
+    if (CPU_CAPABILITY_CURRENT.OK_13_Haswell){
+        return to_blackwhite_rgb32_range_x64_AVX2(image, bytes_per_row, width, height, filter, filter_count);
+    }
+#endif
+#ifdef PA_AutoDispatch_x64_08_Nehalem
+    if (CPU_CAPABILITY_CURRENT.OK_08_Nehalem){
+        return to_blackwhite_rgb32_range_x64_SSE42(image, bytes_per_row, width, height, filter, filter_count);
+    }
+#endif
+#ifdef PA_AutoDispatch_arm64_20_M1
+    if (CPU_CAPABILITY_CURRENT.OK_M1){
+        return to_blackwhite_rgb32_range_arm64_NEON(image, bytes_per_row, width, height, filter, filter_count);
+    }
+#endif
+    return to_blackwhite_rgb32_range_Default(image, bytes_per_row, width, height, filter, filter_count);
+}
+#endif
+
+void to_blackwhite_rgb32_range(
+    const uint32_t* image, size_t bytes_per_row, size_t width, size_t height,
+    ToBlackWhiteRgb32RangeFilter* filter, size_t filter_count
+){
+    for (size_t c = 0; c < filter_count; c++){
+        filter[c].pixels_in_range = to_blackwhite_rgb32_range(
+            image, bytes_per_row, width, height,
+            filter[c].data, filter[c].bytes_per_row,
+            filter[c].in_range_black,
+            filter[c].mins,
+            filter[c].maxs
+        );
+    }
+}
+
+
+
+
+
+
+
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/Kernels/ImageFilters/RGB32_Range/Kernels_ImageFilter_RGB32_Range.h b/SerialPrograms/Source/Kernels/ImageFilters/RGB32_Range/Kernels_ImageFilter_RGB32_Range.h
new file mode 100644
index 0000000000..23c9ddfc10
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/ImageFilters/RGB32_Range/Kernels_ImageFilter_RGB32_Range.h
@@ -0,0 +1,112 @@
+/*  Image Filters RGB32 Range
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  Perform a filter over an image and replace pixels that match the filter.
+ *
+ */
+
+#ifndef PokemonAutomation_Kernels_ImageFilter_RGB32_Range_H
+#define PokemonAutomation_Kernels_ImageFilter_RGB32_Range_H
+
+#include <stdint.h>
+#include <cstddef>
+
+namespace PokemonAutomation{
+namespace Kernels{
+
+
+// Change certain color in `image_in` and save output to `image_out`.
+//  If `replace_color_within_range` is true, replace the color within range [mins, maxs] with the color `replacement`.
+//  If `replace_color_within_range` is false, replace the color outside of the range with the color `replacement`.
+//  Returns the # of pixels inside the range [mins, maxs].
+size_t filter_rgb32_range(
+    const uint32_t* image_in, size_t image_in_bytes_per_row, size_t width, size_t height,
+    uint32_t* image_out, size_t image_out_bytes_per_row,
+    uint32_t replacement, bool replace_color_within_range,
+    uint32_t mins, uint32_t maxs
+);
+
+
+//  Same as above, but multiple filters.
+//  The purpose is to reduce passes over the entire image.
+//  All matricies must have the same dimensions.
+struct FilterRgb32RangeFilter{
+    uint32_t* data;       //  Pointer will be overwritten.
+    const size_t bytes_per_row;
+    const uint32_t replacement;
+    const bool invert;
+    const uint32_t mins;
+    const uint32_t maxs;
+
+    size_t pixels_in_range;
+
+    FilterRgb32RangeFilter(
+        uint32_t* p_data, size_t p_bytes_per_row,
+        uint32_t p_replacement, bool p_invert,
+        uint32_t p_mins, uint32_t p_maxs
+    )
+        : data(p_data)
+        , bytes_per_row(p_bytes_per_row)
+        , replacement(p_replacement)
+        , invert(p_invert)
+        , mins(p_mins)
+        , maxs(p_maxs)
+        , pixels_in_range(0)
+    {}
+};
+void filter_rgb32_range(
+    const uint32_t* image, size_t bytes_per_row, size_t width, size_t height,
+    FilterRgb32RangeFilter* filter, size_t filter_count
+);
+
+
+
+
+
+
+
+size_t to_blackwhite_rgb32_range(
+    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
+    uint32_t* out, size_t out_bytes_per_row,
+    bool in_range_black,
+    uint32_t mins, uint32_t maxs
+);
+
+
+//  Same as above, but multiple filters.
+//  The purpose is to reduce passes over the entire image.
+//  All matricies must have the same dimensions.
+struct ToBlackWhiteRgb32RangeFilter{
+    uint32_t* const data;
+    const size_t bytes_per_row;
+    const uint32_t mins;
+    const uint32_t maxs;
+    const bool in_range_black;
+
+    size_t pixels_in_range;
+
+    ToBlackWhiteRgb32RangeFilter(
+        uint32_t* p_data, size_t p_bytes_per_row,
+        uint32_t p_mins, uint32_t p_maxs, bool p_in_range_black
+    )
+        : data(p_data)
+        , bytes_per_row(p_bytes_per_row)
+        , mins(p_mins)
+        , maxs(p_maxs)
+        , in_range_black(p_in_range_black)
+        , pixels_in_range(0)
+    {}
+};
+void to_blackwhite_rgb32_range(
+    const uint32_t* image, size_t bytes_per_row, size_t width, size_t height,
+    ToBlackWhiteRgb32RangeFilter* filter, size_t filter_count
+);
+
+
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Kernels/ImageFilters/RGB32_Range/Kernels_ImageFilter_RGB32_Range_ARM64_NEON.cpp b/SerialPrograms/Source/Kernels/ImageFilters/RGB32_Range/Kernels_ImageFilter_RGB32_Range_ARM64_NEON.cpp
new file mode 100644
index 0000000000..c0838d14bc
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/ImageFilters/RGB32_Range/Kernels_ImageFilter_RGB32_Range_ARM64_NEON.cpp
@@ -0,0 +1,103 @@
+/*  Image Filters RGB32 Range
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifdef PA_AutoDispatch_arm64_20_M1
+#include "Kernels/ImageFilters/Kernels_ImageFilter_Basic_Routines.h"
+#include "Kernels/ImageFilters/Kernels_ImageFilter_Basic_Routines_ARM64_NEON.h"
+#include "Kernels_ImageFilter_RGB32_Range_Routines.h"
+#include "Kernels_ImageFilter_RGB32_Range.h"
+
+
+
+namespace PokemonAutomation{
+namespace Kernels{
+
+
+
+
+class PixelTest_Rgb32Range_ARM64_NEON{
+public:
+    static const size_t VECTOR_SIZE = 4;
+    using Mask = size_t;
+
+public:
+    PA_FORCE_INLINE PixelTest_Rgb32Range_ARM64_NEON(
+        uint32_t mins, uint32_t maxs
+    )
+        : m_mins_u8(vreinterpretq_u8_u32(vdupq_n_u32(mins)))
+        , m_maxs_u8(vreinterpretq_u8_u32(vdupq_n_u32(maxs)))
+        , m_zeros_u8(vdupq_n_u8(0))
+    {}
+    PA_FORCE_INLINE PixelTest_Rgb32Range_ARM64_NEON(
+        const ToBlackWhiteRgb32RangeFilter& filter
+    )
+        : m_mins_u8(vreinterpretq_u8_u32(vdupq_n_u32(filter.mins)))
+        , m_maxs_u8(vreinterpretq_u8_u32(vdupq_n_u32(filter.maxs)))
+        , m_zeros_u8(vdupq_n_u8(0))
+    {}
+
+    //  Return a mask indicating which lanes are in range.
+    PA_FORCE_INLINE uint32x4_t test_word(uint32x4_t& pixel) const{
+        uint8x16_t in_u8 = vreinterpretq_u8_u32(pixel);
+
+        // Check if mins > pixel per color channel
+        uint8x16_t cmp0 = vcgtq_u8(m_mins_u8, in_u8);
+        // Check if pixel > maxs per color channel
+        uint8x16_t cmp1 = vcgtq_u8(in_u8, m_maxs_u8);
+        // cmp: if mins > pixel or pixel > maxs per color channel
+        uint8x16_t cmp_u8 = vorrq_u8(cmp0, cmp1);
+        // vceqq_u32: compare bitwise equal
+        // cmp_u32: if each pixel is within the range
+        // If a pixel is within [mins, maxs], its uint32_t in `cmp_u32` is all 1 bits, otherwise, all 0 bits
+        return vceqq_u32(vreinterpretq_u32_u8(cmp_u8), vreinterpretq_u32_u8(m_zeros_u8));
+    }
+
+private:
+    uint8x16_t m_mins_u8;
+    uint8x16_t m_maxs_u8;
+    uint8x16_t m_zeros_u8;
+};
+
+
+
+
+
+size_t filter_rgb32_range_arm64_NEON(
+    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
+    uint32_t* out, size_t out_bytes_per_row,
+    uint32_t replacement, bool replace_color_within_range,
+    uint32_t mins, uint32_t maxs
+){
+    PixelTest_Rgb32Range_ARM64_NEON tester(mins, maxs);
+    FilterImage_Rgb32_ARM64_NEON<PixelTest_Rgb32Range_ARM64_NEON> filter(
+        tester,
+        replacement, replace_color_within_range
+    );
+    filter_per_pixel(in, in_bytes_per_row, width, height, filter, out, out_bytes_per_row);
+    return filter.count();
+}
+size_t to_blackwhite_rgb32_range_arm64_NEON(
+    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
+    uint32_t* out, size_t out_bytes_per_row,
+    bool in_range_black,
+    uint32_t mins, uint32_t maxs
+){
+    PixelTest_Rgb32Range_ARM64_NEON tester(mins, maxs);
+    ToBlackWhite_Rgb32_ARM64_NEON<PixelTest_Rgb32Range_ARM64_NEON> filter(
+        tester, in_range_black
+    );
+    filter_per_pixel(in, in_bytes_per_row, width, height, filter, out, out_bytes_per_row);
+    return filter.count();
+}
+
+
+
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Kernels/ImageFilters/RGB32_Range/Kernels_ImageFilter_RGB32_Range_Default.cpp b/SerialPrograms/Source/Kernels/ImageFilters/RGB32_Range/Kernels_ImageFilter_RGB32_Range_Default.cpp
new file mode 100644
index 0000000000..9a1dfedf36
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/ImageFilters/RGB32_Range/Kernels_ImageFilter_RGB32_Range_Default.cpp
@@ -0,0 +1,109 @@
+/*  Image Filters RGB32 Range
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Kernels/ImageFilters/Kernels_ImageFilter_Basic_Routines.h"
+#include "Kernels/ImageFilters/Kernels_ImageFilter_Basic_Routines_Default.h"
+#include "Kernels_ImageFilter_RGB32_Range.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace Kernels{
+
+
+
+class PixelTest_Rgb32Range_Default{
+public:
+    static const size_t VECTOR_SIZE = 1;
+    using Mask = size_t;
+
+public:
+    PA_FORCE_INLINE PixelTest_Rgb32Range_Default(
+        uint32_t mins, uint32_t maxs
+    )
+        : m_shiftB(mins & 0x000000ff)
+        , m_shiftG(mins & 0x0000ff00)
+        , m_shiftR(mins & 0x00ff0000)
+        , m_shiftA(mins & 0xff000000)
+        , m_thresholdB((maxs & 0x000000ff) - m_shiftB)
+        , m_thresholdG((maxs & 0x0000ff00) - m_shiftG)
+        , m_thresholdR((maxs & 0x00ff0000) - m_shiftR)
+        , m_thresholdA((maxs & 0xff000000) - m_shiftA)
+    {}
+    PA_FORCE_INLINE PixelTest_Rgb32Range_Default(
+        const ToBlackWhiteRgb32RangeFilter& filter
+    )
+        : m_shiftB(filter.mins & 0x000000ff)
+        , m_shiftG(filter.mins & 0x0000ff00)
+        , m_shiftR(filter.mins & 0x00ff0000)
+        , m_shiftA(filter.mins & 0xff000000)
+        , m_thresholdB((filter.maxs & 0x000000ff) - m_shiftB)
+        , m_thresholdG((filter.maxs & 0x0000ff00) - m_shiftG)
+        , m_thresholdR((filter.maxs & 0x00ff0000) - m_shiftR)
+        , m_thresholdA((filter.maxs & 0xff000000) - m_shiftA)
+    {}
+
+    //  Return a mask indicating which lanes are in range.
+    PA_FORCE_INLINE bool test_word(uint32_t pixel) const{
+        bool ret = true;
+        ret &= (pixel & 0x000000ff) - m_shiftB <= m_thresholdB;
+        ret &= (pixel & 0x0000ff00) - m_shiftG <= m_thresholdG;
+        ret &= (pixel & 0x00ff0000) - m_shiftR <= m_thresholdR;
+        ret &= (pixel & 0xff000000) - m_shiftA <= m_thresholdA;
+        return ret;
+    }
+
+private:
+    const uint32_t m_shiftB;
+    const uint32_t m_shiftG;
+    const uint32_t m_shiftR;
+    const uint32_t m_shiftA;
+    const uint32_t m_thresholdB;
+    const uint32_t m_thresholdG;
+    const uint32_t m_thresholdR;
+    const uint32_t m_thresholdA;
+};
+
+
+
+
+
+
+size_t filter_rgb32_range_Default(
+    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
+    uint32_t* out, size_t out_bytes_per_row,
+    uint32_t replacement, bool replace_color_within_range,
+    uint32_t mins, uint32_t maxs
+){
+    PixelTest_Rgb32Range_Default tester(mins, maxs);
+    FilterImage_Rgb32_Default<PixelTest_Rgb32Range_Default> filter(
+        tester,
+        replacement, replace_color_within_range
+    );
+    filter_per_pixel(in, in_bytes_per_row, width, height, filter, out, out_bytes_per_row);
+    return filter.count();
+}
+size_t to_blackwhite_rgb32_range_Default(
+    const uint32_t* image, size_t in_bytes_per_row, size_t width, size_t height,
+    uint32_t* out, size_t out_bytes_per_row,
+    bool in_range_black,
+    uint32_t mins, uint32_t maxs
+){
+    PixelTest_Rgb32Range_Default tester(mins, maxs);
+    ToBlackWhite_Rgb32_Default<PixelTest_Rgb32Range_Default> filter(
+        tester, in_range_black
+    );
+    filter_per_pixel(image, in_bytes_per_row, width, height, filter, out, out_bytes_per_row);
+    return filter.count();
+}
+
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/Kernels/ImageFilters/RGB32_Range/Kernels_ImageFilter_RGB32_Range_Routines.h b/SerialPrograms/Source/Kernels/ImageFilters/RGB32_Range/Kernels_ImageFilter_RGB32_Range_Routines.h
new file mode 100644
index 0000000000..e215b95764
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/ImageFilters/RGB32_Range/Kernels_ImageFilter_RGB32_Range_Routines.h
@@ -0,0 +1,115 @@
+/*  Image Filters Basic Routines
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Kernels_ImageFilter_RGB32_Range_Routines_H
+#define PokemonAutomation_Kernels_ImageFilter_RGB32_Range_Routines_H
+
+#include "Common/Compiler.h"
+#include "Common/Cpp/Containers/FixedLimitVector.tpp"
+#include "Kernels_ImageFilter_RGB32_Range.h"
+
+namespace PokemonAutomation{
+namespace Kernels{
+
+
+
+template <typename Runner>
+PA_FORCE_INLINE void filter_per_pixel(
+    const uint32_t* image, size_t bytes_per_row, size_t width, size_t height,
+    FilterRgb32RangeFilter* filters, size_t filter_count
+){
+    if (width == 0 || height == 0){
+        return;
+    }
+
+//    cout << "filter_per_pixel(" << filter_count << "): " << width << " x " << height << endl;
+
+    FixedLimitVector<Runner> entries(filter_count);
+    for (size_t c = 0; c < filter_count; c++){
+        FilterRgb32RangeFilter& filter = filters[c];
+        entries.emplace_back(filter);
+    }
+
+    const size_t VECTOR_SIZE = Runner::VECTOR_SIZE;
+    do{
+        //  Less than vector width. No need for steady-state loop.
+        if (width < VECTOR_SIZE){
+            typename Runner::Mask mask(width);
+            do{
+                const uint32_t* in = image;
+                for (size_t c = 0; c < filter_count; c++){
+                    entries[c].process_partial(filters[c].data, in, mask);
+                }
+                image = (const uint32_t*)((const char*)image + bytes_per_row);
+                for (size_t c = 0; c < filter_count; c++){
+                    FilterRgb32RangeFilter& filter = filters[c];
+                    filter.data = (uint32_t*)((const char*)filter.data + filter.bytes_per_row);
+                }
+            }while (--height);
+            break;
+        }
+
+        //  Divisible by vector width. No need for peel loop.
+        size_t left = width % VECTOR_SIZE;
+        if (left == 0){
+            do{
+                const uint32_t* in = image;
+                size_t shift = 0;
+                size_t lc = width / VECTOR_SIZE;
+                do{
+                    for (size_t c = 0; c < filter_count; c++){
+                        entries[c].process_full(filters[c].data + shift, in);
+                    }
+                    in += VECTOR_SIZE;
+                    shift += VECTOR_SIZE;
+                }while (--lc);
+                image = (const uint32_t*)((const char*)image + bytes_per_row);
+                for (size_t c = 0; c < filter_count; c++){
+                    FilterRgb32RangeFilter& filter = filters[c];
+                    filter.data = (uint32_t*)((const char*)filter.data + filter.bytes_per_row);
+                }
+            }while (--height);
+            break;
+        }
+
+        //  Need both steady-state and peel loops.
+        {
+            typename Runner::Mask mask(left);
+            do{
+                const uint32_t* in = image;
+                size_t shift = 0;
+                size_t lc = width / VECTOR_SIZE;
+                do{
+                    for (size_t c = 0; c < filter_count; c++){
+                        entries[c].process_full(filters[c].data + shift, in);
+                    }
+                    in += VECTOR_SIZE;
+                    shift += VECTOR_SIZE;
+                }while (--lc);
+                for (size_t c = 0; c < filter_count; c++){
+                    entries[c].process_partial(filters[c].data + shift, in, mask);
+                }
+                image = (const uint32_t*)((const char*)image + bytes_per_row);
+                for (size_t c = 0; c < filter_count; c++){
+                    FilterRgb32RangeFilter& filter = filters[c];
+                    filter.data = (uint32_t*)((const char*)filter.data + filter.bytes_per_row);
+                }
+            }while (--height);
+            break;
+        }
+    }while (false);
+
+    for (size_t c = 0; c < filter_count; c++){
+        filters[c].pixels_in_range = entries[c].count();
+    }
+}
+
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Kernels/ImageFilters/RGB32_Range/Kernels_ImageFilter_RGB32_Range_x64_AVX2.cpp b/SerialPrograms/Source/Kernels/ImageFilters/RGB32_Range/Kernels_ImageFilter_RGB32_Range_x64_AVX2.cpp
new file mode 100644
index 0000000000..095d402d82
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/ImageFilters/RGB32_Range/Kernels_ImageFilter_RGB32_Range_x64_AVX2.cpp
@@ -0,0 +1,98 @@
+/*  Image Filters RGB32 Range
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifdef PA_AutoDispatch_x64_13_Haswell
+
+#include <immintrin.h>
+#include "Kernels/PartialWordAccess/Kernels_PartialWordAccess_x64_AVX2.h"
+#include "Kernels/ImageFilters/Kernels_ImageFilter_Basic_Routines.h"
+#include "Kernels/ImageFilters/Kernels_ImageFilter_Basic_Routines_x64_AVX2.h"
+#include "Kernels_ImageFilter_RGB32_Range.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace Kernels{
+
+
+
+
+
+class PixelTest_Rgb32Range_x64_AVX2{
+public:
+    static const size_t VECTOR_SIZE = 8;
+    using Mask = PartialWordAccess32_x64_AVX2;
+
+public:
+    PA_FORCE_INLINE PixelTest_Rgb32Range_x64_AVX2(
+        uint32_t mins, uint32_t maxs
+    )
+        : m_mins(_mm256_set1_epi32(mins ^ 0x80808080))
+        , m_maxs(_mm256_set1_epi32(maxs ^ 0x80808080))
+    {}
+    PA_FORCE_INLINE PixelTest_Rgb32Range_x64_AVX2(
+        const ToBlackWhiteRgb32RangeFilter& filter
+    )
+        : m_mins(_mm256_set1_epi32(filter.mins ^ 0x80808080))
+        , m_maxs(_mm256_set1_epi32(filter.maxs ^ 0x80808080))
+    {}
+
+    //  Return a mask indicating which lanes are in range.
+    PA_FORCE_INLINE __m256i test_word(__m256i pixel) const{
+        __m256i adj = _mm256_xor_si256(pixel, _mm256_set1_epi8((uint8_t)0x80));
+        __m256i cmp0 = _mm256_cmpgt_epi8(m_mins, adj);
+        __m256i cmp1 = _mm256_cmpgt_epi8(adj, m_maxs);
+        cmp0 = _mm256_or_si256(cmp0, cmp1);
+        return _mm256_cmpeq_epi32(cmp0, _mm256_setzero_si256());
+    }
+
+private:
+    const __m256i m_mins;
+    const __m256i m_maxs;
+};
+
+
+
+
+
+
+
+size_t filter_rgb32_range_x64_AVX2(
+    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
+    uint32_t* out, size_t out_bytes_per_row,
+    uint32_t replacement, bool replace_color_within_range,
+    uint32_t mins, uint32_t maxs
+){
+    PixelTest_Rgb32Range_x64_AVX2 tester(mins, maxs);
+    FilterImage_Rgb32_x64_AVX2<PixelTest_Rgb32Range_x64_AVX2> filter(
+        tester,
+        replacement, replace_color_within_range
+    );
+    filter_per_pixel(in, in_bytes_per_row, width, height, filter, out, out_bytes_per_row);
+    return filter.count();
+}
+size_t to_blackwhite_rgb32_range_x64_AVX2(
+    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
+    uint32_t* out, size_t out_bytes_per_row,
+    bool in_range_black,
+    uint32_t mins, uint32_t maxs
+){
+    PixelTest_Rgb32Range_x64_AVX2 tester(mins, maxs);
+    ToBlackWhite_Rgb32_x64_AVX2<PixelTest_Rgb32Range_x64_AVX2> filter(
+        tester, in_range_black
+    );
+    filter_per_pixel(in, in_bytes_per_row, width, height, filter, out, out_bytes_per_row);
+    return filter.count();
+}
+
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Kernels/ImageFilters/RGB32_Range/Kernels_ImageFilter_RGB32_Range_x64_AVX512.cpp b/SerialPrograms/Source/Kernels/ImageFilters/RGB32_Range/Kernels_ImageFilter_RGB32_Range_x64_AVX512.cpp
new file mode 100644
index 0000000000..2a0d85d1cd
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/ImageFilters/RGB32_Range/Kernels_ImageFilter_RGB32_Range_x64_AVX512.cpp
@@ -0,0 +1,106 @@
+/*  Image Filters RGB32 Range
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifdef PA_AutoDispatch_x64_17_Skylake
+
+#include <immintrin.h>
+#include "Kernels/ImageFilters/Kernels_ImageFilter_Basic_Routines.h"
+#include "Kernels/ImageFilters/Kernels_ImageFilter_Basic_Routines_x64_AVX512.h"
+#include "Kernels_ImageFilter_RGB32_Range.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace Kernels{
+
+
+
+
+
+class PixelTest_Rgb32Range_x64_AVX512{
+public:
+    static const size_t VECTOR_SIZE = 16;
+    using Mask = PartialWordMask_x64_AVX512;
+
+public:
+    PA_FORCE_INLINE PixelTest_Rgb32Range_x64_AVX512(
+        uint32_t mins, uint32_t maxs
+    )
+        : m_shift(_mm512_set1_epi32(mins))
+        , m_threshold(_mm512_sub_epi8(_mm512_set1_epi32(maxs), m_shift))
+    {}
+    PA_FORCE_INLINE PixelTest_Rgb32Range_x64_AVX512(
+        const ToBlackWhiteRgb32RangeFilter& filter
+    )
+        : m_shift(_mm512_set1_epi32(filter.mins))
+        , m_threshold(_mm512_sub_epi8(_mm512_set1_epi32(filter.maxs), m_shift))
+    {}
+
+    //  Return a mask indicating which lanes are in range.
+    PA_FORCE_INLINE __mmask16 test_word(__m512i pixel) const{
+        pixel = _mm512_sub_epi8(pixel, m_shift);
+        __mmask64 cmp64 = _mm512_cmple_epu8_mask(pixel, m_threshold);
+        __m512i mask = _mm512_movm_epi8(cmp64);
+        return _mm512_cmpeq_epi32_mask(mask, _mm512_set1_epi32(-1));
+    }
+
+private:
+    const __m512i m_shift;
+    const __m512i m_threshold;
+};
+
+
+
+
+
+size_t filter_rgb32_range_x64_AVX512(
+    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
+    uint32_t* out, size_t out_bytes_per_row,
+    uint32_t replacement, bool replace_color_within_range,
+    uint32_t mins, uint32_t maxs
+){
+    PixelTest_Rgb32Range_x64_AVX512 tester(mins, maxs);
+    FilterImage_Rgb32_x64_AVX512<PixelTest_Rgb32Range_x64_AVX512> filter(
+        tester,
+        replacement, replace_color_within_range
+    );
+    filter_per_pixel(in, in_bytes_per_row, width, height, filter, out, out_bytes_per_row);
+    return filter.count();
+}
+size_t to_blackwhite_rgb32_range_x64_AVX512(
+    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
+    uint32_t* out, size_t out_bytes_per_row,
+    bool in_range_black,
+    uint32_t mins, uint32_t maxs
+){
+    PixelTest_Rgb32Range_x64_AVX512 tester(mins, maxs);
+    ToBlackWhite_Rgb32_x64_AVX512<PixelTest_Rgb32Range_x64_AVX512> filter(
+        tester, in_range_black
+    );
+    filter_per_pixel(in, in_bytes_per_row, width, height, filter, out, out_bytes_per_row);
+    return filter.count();
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Kernels/ImageFilters/RGB32_Range/Kernels_ImageFilter_RGB32_Range_x64_SSE42.cpp b/SerialPrograms/Source/Kernels/ImageFilters/RGB32_Range/Kernels_ImageFilter_RGB32_Range_x64_SSE42.cpp
new file mode 100644
index 0000000000..fee757680a
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/ImageFilters/RGB32_Range/Kernels_ImageFilter_RGB32_Range_x64_SSE42.cpp
@@ -0,0 +1,99 @@
+/*  Image Filters RGB32 Range
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifdef PA_AutoDispatch_x64_08_Nehalem
+
+#include <immintrin.h>
+#include "Kernels/PartialWordAccess/Kernels_PartialWordAccess_x64_SSE41.h"
+#include "Kernels/ImageFilters/Kernels_ImageFilter_Basic_Routines.h"
+#include "Kernels/ImageFilters/Kernels_ImageFilter_Basic_Routines_x64_SSE42.h"
+#include "Kernels_ImageFilter_RGB32_Range.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace Kernels{
+
+
+
+
+
+class PixelTest_Rgb32Range_x64_SSE42{
+public:
+    static const size_t VECTOR_SIZE = 4;
+    using Mask = PartialWordMask_x64_SSE42;
+
+public:
+    PA_FORCE_INLINE PixelTest_Rgb32Range_x64_SSE42(
+        uint32_t mins, uint32_t maxs
+    )
+        : m_mins(_mm_set1_epi32(mins ^ 0x80808080))
+        , m_maxs(_mm_set1_epi32(maxs ^ 0x80808080))
+    {}
+    PA_FORCE_INLINE PixelTest_Rgb32Range_x64_SSE42(
+        const ToBlackWhiteRgb32RangeFilter& filter
+    )
+        : m_mins(_mm_set1_epi32(filter.mins ^ 0x80808080))
+        , m_maxs(_mm_set1_epi32(filter.maxs ^ 0x80808080))
+    {}
+
+    //  Return a mask indicating which lanes are in range.
+    PA_FORCE_INLINE __m128i test_word(__m128i pixel) const{
+        __m128i adj = _mm_xor_si128(pixel, _mm_set1_epi8((uint8_t)0x80));
+        __m128i cmp0 = _mm_cmpgt_epi8(m_mins, adj);
+        __m128i cmp1 = _mm_cmpgt_epi8(adj, m_maxs);
+        cmp0 = _mm_or_si128(cmp0, cmp1);
+        return _mm_cmpeq_epi32(cmp0, _mm_setzero_si128());
+    }
+
+private:
+    const __m128i m_mins;
+    const __m128i m_maxs;
+};
+
+
+
+
+
+
+
+size_t filter_rgb32_range_x64_SSE42(
+    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
+    uint32_t* out, size_t out_bytes_per_row,
+    uint32_t replacement, bool replace_color_within_range,
+    uint32_t mins, uint32_t maxs
+){
+    PixelTest_Rgb32Range_x64_SSE42 tester(mins, maxs);
+    FilterImage_Rgb32_x64_SSE42<PixelTest_Rgb32Range_x64_SSE42> filter(
+        tester,
+        replacement, replace_color_within_range
+    );
+    filter_per_pixel(in, in_bytes_per_row, width, height, filter, out, out_bytes_per_row);
+    return filter.count();
+}
+size_t to_blackwhite_rgb32_range_x64_SSE42(
+    const uint32_t* in, size_t in_bytes_per_row, size_t width, size_t height,
+    uint32_t* out, size_t out_bytes_per_row,
+    bool in_range_black,
+    uint32_t mins, uint32_t maxs
+){
+    PixelTest_Rgb32Range_x64_SSE42 tester(mins, maxs);
+    ToBlackWhite_Rgb32_x64_SSE42<PixelTest_Rgb32Range_x64_SSE42> filter(
+        tester, in_range_black
+    );
+    filter_per_pixel(in, in_bytes_per_row, width, height, filter, out, out_bytes_per_row);
+    return filter.count();
+}
+
+
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Kernels/ImageScaleBrightness/Kernels_ImageScaleBrightness.cpp b/SerialPrograms/Source/Kernels/ImageScaleBrightness/Kernels_ImageScaleBrightness.cpp
index 85dd27a729..f2f2afd678 100644
--- a/SerialPrograms/Source/Kernels/ImageScaleBrightness/Kernels_ImageScaleBrightness.cpp
+++ b/SerialPrograms/Source/Kernels/ImageScaleBrightness/Kernels_ImageScaleBrightness.cpp
@@ -1,6 +1,6 @@
 /*  Scale Brightness
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/Kernels/ImageScaleBrightness/Kernels_ImageScaleBrightness.h b/SerialPrograms/Source/Kernels/ImageScaleBrightness/Kernels_ImageScaleBrightness.h
index cbfbde4ed2..bac8fc3be3 100644
--- a/SerialPrograms/Source/Kernels/ImageScaleBrightness/Kernels_ImageScaleBrightness.h
+++ b/SerialPrograms/Source/Kernels/ImageScaleBrightness/Kernels_ImageScaleBrightness.h
@@ -1,6 +1,6 @@
 /*  Scale Brightness
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/Kernels/ImageScaleBrightness/Kernels_ImageScaleBrightness_Default.cpp b/SerialPrograms/Source/Kernels/ImageScaleBrightness/Kernels_ImageScaleBrightness_Default.cpp
index 2385317b39..9cfae84f7f 100644
--- a/SerialPrograms/Source/Kernels/ImageScaleBrightness/Kernels_ImageScaleBrightness_Default.cpp
+++ b/SerialPrograms/Source/Kernels/ImageScaleBrightness/Kernels_ImageScaleBrightness_Default.cpp
@@ -1,6 +1,6 @@
 /*  Scale Brightness (Default)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -25,9 +25,12 @@ PA_FORCE_INLINE void scale_brightness_Default(
         g *= scaleG;
         b *= scaleB;
 
-        uint32_t r_u32 = std::min((uint32_t)r, (uint32_t)255);
-        uint32_t g_u32 = std::min((uint32_t)g, (uint32_t)255);
-        uint32_t b_u32 = std::min((uint32_t)b, (uint32_t)255);
+        //  Round to the nearest integer, like the SIMD versions. Adding 0.5 rounds an
+        //  exact tie like 50.5 up, while the SIMD code rounds it to even. That 1-unit
+        //  difference at ties is fine.
+        uint32_t r_u32 = std::min((uint32_t)(r + 0.5f), (uint32_t)255);
+        uint32_t g_u32 = std::min((uint32_t)(g + 0.5f), (uint32_t)255);
+        uint32_t b_u32 = std::min((uint32_t)(b + 0.5f), (uint32_t)255);
 
         pixel &= 0xff000000;
         pixel |= r_u32 << 16;
diff --git a/SerialPrograms/Source/Kernels/ImageScaleBrightness/Kernels_ImageScaleBrightness_Tests.cpp b/SerialPrograms/Source/Kernels/ImageScaleBrightness/Kernels_ImageScaleBrightness_Tests.cpp
new file mode 100644
index 0000000000..8311883033
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/ImageScaleBrightness/Kernels_ImageScaleBrightness_Tests.cpp
@@ -0,0 +1,179 @@
+/*  Image Scale Brightness Tests
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <algorithm>
+#include <cmath>
+#include <format>
+#include "Common/Cpp/CpuId/CpuId.h"
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "CommonFramework/ImageTypes/ImageRGB32.h"
+#include "Tests/GuardPageImage.h"
+#include "Tests/ImageUnitTest.h"
+#include "Kernels_ImageScaleBrightness_Tests.h"
+
+namespace PokemonAutomation{
+namespace Kernels{
+
+
+//  The scale_brightness() implementations, defined in Kernels_ImageScaleBrightness_*.cpp.
+//  `scale_brightness()` in Kernels_ImageScaleBrightness.cpp declares the same functions
+//  and calls the best one for the CPU. These tests call them directly, so that every
+//  implementation this CPU supports is tested.
+void scale_brightness_Default    (size_t width, size_t height, uint32_t* image, size_t bytes_per_row, float scaleR, float scaleG, float scaleB);
+void scale_brightness_x64_SSE41  (size_t width, size_t height, uint32_t* image, size_t bytes_per_row, float scaleR, float scaleG, float scaleB);
+void scale_brightness_x64_AVX2   (size_t width, size_t height, uint32_t* image, size_t bytes_per_row, float scaleR, float scaleG, float scaleB);
+void scale_brightness_x64_AVX512 (size_t width, size_t height, uint32_t* image, size_t bytes_per_row, float scaleR, float scaleG, float scaleB);
+void scale_brightness_arm64_NEON (size_t width, size_t height, uint32_t* image, size_t bytes_per_row, float scaleR, float scaleG, float scaleB);
+
+
+namespace{
+
+//  One scale_brightness() implementation to test: its name in the test name, and the function.
+struct ScaleBrightnessImplementation{
+    using Function = void (*)(
+        size_t width, size_t height, uint32_t* image, size_t bytes_per_row,
+        float scaleR, float scaleG, float scaleB
+    );
+
+    std::string name;
+    Function scale_brightness;
+};
+
+//  The (R, G, B) scales to test: below 1, above 1 so that some channels reach the 255
+//  cap, exactly 1, and a negative scale, which turns the channel to 0. Scales 0.5 and 2.5
+//  give exact .5 ties on odd channel values.
+constexpr float SCALES[][3] = {
+    {1.2f, 1.3f, 0.5f},
+    {0.7f, 2.5f, 1.0f},
+    {1.0f, -1.0f, 3.0f},
+};
+
+//  Whether `result` is right for one channel `value` scaled by `scale`. The scaled value
+//  is rounded to the nearest integer and capped at 255. A negative scale counts as 0. For
+//  example, with scale 1.3 a channel of 102 becomes 133 (132.6 rounded), and a channel of
+//  200 becomes 255. At an exact tie like 50.5, both 50 and 51 are right: Default rounds
+//  ties up, but the SIMD code rounds them to even. That is a 1-unit error we accept.
+bool is_right_channel(uint32_t result, uint32_t value, float scale){
+    const float scaled = (float)value * std::max(scale, 0.0f);
+    const float down = std::floor(scaled);
+    auto capped = [](float x){
+        return std::min((uint32_t)x, (uint32_t)255);
+    };
+    if (scaled - down == 0.5f){
+        return result == capped(down) || result == capped(down + 1);
+    }
+    return result == capped(std::round(scaled));
+}
+
+//  Whether `result` is right for `pixel`: alpha does not change, and each of R, G and B
+//  passes `is_right_channel()` with its scale.
+bool is_right_pixel(uint32_t result, uint32_t pixel, float scaleR, float scaleG, float scaleB){
+    return (result & 0xff000000) == (pixel & 0xff000000)
+        && is_right_channel((result >> 16) & 0xff, (pixel >> 16) & 0xff, scaleR)
+        && is_right_channel((result >> 8) & 0xff, (pixel >> 8) & 0xff, scaleG)
+        && is_right_channel(result & 0xff, pixel & 0xff, scaleB);
+}
+
+
+//  Check one scale_brightness() implementation on a real image, for each of `SCALES`:
+//  scale a copy of the image in place and check every pixel with `is_right_pixel()`.
+//  The copy is a guard-page image, so the test also crashes if the implementation
+//  reads or writes past the last pixel.
+class Test_ImageScaleBrightness : public ImageUnitTest{
+public:
+    Test_ImageScaleBrightness(
+        const ScaleBrightnessImplementation& implementation,
+        const std::string& image
+    )
+        : ImageUnitTest("Kernels::ImageScaleBrightness - " + implementation.name + " - " + image, {image})
+        , m_implementation(implementation)
+    {
+        //  Plus a full-size guard-page copy.
+        m_memory += MAX_TEST_IMAGE_RGB32_BYTES;
+    }
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        const ImageRGB32& image = images[0];
+
+        for (const auto& scale : SCALES){
+            GuardPageImageRGB32 scaled(image);
+            m_implementation.scale_brightness(
+                scaled.width(), scaled.height(), scaled.data(), scaled.bytes_per_row(),
+                scale[0], scale[1], scale[2]
+            );
+            for (size_t y = 0; y < image.height(); y++){
+                for (size_t x = 0; x < image.width(); x++){
+                    const uint32_t pixel = image.pixel(x, y);
+                    if (!is_right_pixel(scaled.pixel(x, y), pixel, scale[0], scale[1], scale[2])){
+                        return std::format(
+                            "Error: scales ({}, {}, {}), pixel ({}, {}) is {:08x}: got {:08x}, which is not rounded to nearest.",
+                            scale[0], scale[1], scale[2], x, y, pixel, scaled.pixel(x, y)
+                        );
+                    }
+                }
+            }
+        }
+        return true;
+    }
+
+private:
+    ScaleBrightnessImplementation m_implementation;
+};
+
+}
+
+
+
+//  Add a test for each image and each scale_brightness() implementation that this build
+//  has and this CPU supports, including Default.
+void add_tests_ImageScaleBrightness(UnitTestDatabase& database){
+    std::vector<ScaleBrightnessImplementation> implementations{
+        {"Default", scale_brightness_Default},
+    };
+#ifdef PA_AutoDispatch_x64_08_Nehalem
+    if (CPU_CAPABILITY_CURRENT.OK_08_Nehalem){
+        implementations.push_back({"x64_SSE41", scale_brightness_x64_SSE41});
+    }
+#endif
+#ifdef PA_AutoDispatch_x64_13_Haswell
+    if (CPU_CAPABILITY_CURRENT.OK_13_Haswell){
+        implementations.push_back({"x64_AVX2", scale_brightness_x64_AVX2});
+    }
+#endif
+#ifdef PA_AutoDispatch_x64_17_Skylake
+    if (CPU_CAPABILITY_CURRENT.OK_17_Skylake){
+        implementations.push_back({"x64_AVX512", scale_brightness_x64_AVX512});
+    }
+#endif
+#ifdef PA_AutoDispatch_arm64_20_M1
+    if (CPU_CAPABILITY_CURRENT.OK_M1){
+        implementations.push_back({"arm64_NEON", scale_brightness_arm64_NEON});
+    }
+#endif
+
+    //  Images in the CommandLineTests repo. Their widths cover every remainder mod 4, so
+    //  the leftover pixels after the 2- and 4-pixel loops are tested too.
+    const std::vector<std::string> images{
+        "NintendoSwitch/Switch2/ghostassassin/system_settings_display_dark.png",    //  1916 x 1078
+        "OCR/Lv.1-0.png",                                                           //  237 x 77
+        "PokemonSwSh/SelectionArrowFinder/mac_neon_error_1.png",                    //  106 x 410
+        "OCR/german-nature-sanft.png",                                              //  511 x 91
+    };
+
+    for (const ScaleBrightnessImplementation& implementation : implementations){
+        for (const std::string& image : images){
+            database.add<Test_ImageScaleBrightness>(implementation, image);
+        }
+    }
+}
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/Kernels/ImageScaleBrightness/Kernels_ImageScaleBrightness_Tests.h b/SerialPrograms/Source/Kernels/ImageScaleBrightness/Kernels_ImageScaleBrightness_Tests.h
new file mode 100644
index 0000000000..54bc229d1b
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/ImageScaleBrightness/Kernels_ImageScaleBrightness_Tests.h
@@ -0,0 +1,23 @@
+/*  Image Scale Brightness Tests
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Kernels_ImageScaleBrightness_Tests_H
+#define PokemonAutomation_Kernels_ImageScaleBrightness_Tests_H
+
+#include "Common/Cpp/TestRunners/UnitTest.h"
+
+namespace PokemonAutomation{
+namespace Kernels{
+
+
+
+void add_tests_ImageScaleBrightness(UnitTestDatabase& database);
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Kernels/ImageScaleBrightness/Kernels_ImageScaleBrightness_arm64_NEON.cpp b/SerialPrograms/Source/Kernels/ImageScaleBrightness/Kernels_ImageScaleBrightness_arm64_NEON.cpp
index 260064c459..82b314fee3 100644
--- a/SerialPrograms/Source/Kernels/ImageScaleBrightness/Kernels_ImageScaleBrightness_arm64_NEON.cpp
+++ b/SerialPrograms/Source/Kernels/ImageScaleBrightness/Kernels_ImageScaleBrightness_arm64_NEON.cpp
@@ -1,6 +1,6 @@
 /*  Scale Brightness (arm64 NEON)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -8,18 +8,19 @@
 
 #include <stddef.h>
 #include <stdint.h>
-#include <arm_neon.h>
 #include <algorithm>
+#include <iostream>
+#include <arm_neon.h>
 #include "Common/Compiler.h"
 
-#include <iostream>
-using std::cout, std::endl;
+using std::cout;
+using std::endl;
 
 namespace PokemonAutomation{
 namespace Kernels{
 
 // #define CHECK_ACCURACY
-namespace {
+namespace{
 
 PA_FORCE_INLINE void scale_brightness_arm64_NEON_four_pixels_per_channel_scale(
     size_t width, uint32_t* image,
@@ -60,10 +61,11 @@ PA_FORCE_INLINE void scale_brightness_arm64_NEON_four_pixels_per_channel_scale(
         g_f32x4 = vmulq_n_f32(g_f32x4, g_scale);
         r_f32x4 = vmulq_n_f32(r_f32x4, r_scale);
 
-        // Convert each float32 back to uint32
-        b_u32x4 = vcvtq_u32_f32(b_f32x4);
-        g_u32x4 = vcvtq_u32_f32(g_f32x4);
-        r_u32x4 = vcvtq_u32_f32(r_f32x4);
+        // Convert each float32 back to uint32, rounding to the nearest integer with ties
+        // to even, like _mm_cvtps_epi32() on x86
+        b_u32x4 = vcvtnq_u32_f32(b_f32x4);
+        g_u32x4 = vcvtnq_u32_f32(g_f32x4);
+        r_u32x4 = vcvtnq_u32_f32(r_f32x4);
 
         // Clamp against 255
         b_u32x4 = vminq_u32(b_u32x4, max_brightness_u32x4);
@@ -75,11 +77,11 @@ PA_FORCE_INLINE void scale_brightness_arm64_NEON_four_pixels_per_channel_scale(
         uint32x4_t gb_u32x4 = vsliq_n_u32(b_u32x4, g_u32x4, 8);
         // shift r channels left by 16, then combine with gb channels
         uint32x4_t rgb_u32x4 = vsliq_n_u32(gb_u32x4, r_u32x4, 16);
-        vec_u32x4 = vorrq_s32(a_u32x4, rgb_u32x4);
+        vec_u32x4 = vorrq_u32(a_u32x4, rgb_u32x4);
         vst1q_u32(&image[c], vec_u32x4);
     }
 
-    for(size_t c = width_aligned; c < width; c++){
+    for (size_t c = width_aligned; c < width; c++){
         uint32_t pixel = image[c];
         float r = (float)((pixel >> 16) & 0x000000ff);
         float g = (float)((pixel >> 8) & 0x000000ff);
@@ -87,9 +89,12 @@ PA_FORCE_INLINE void scale_brightness_arm64_NEON_four_pixels_per_channel_scale(
         r *= r_scale;
         g *= g_scale;
         b *= b_scale;
-        uint32_t r_u32 = std::min((uint32_t)r, (uint32_t)255);
-        uint32_t g_u32 = std::min((uint32_t)g, (uint32_t)255);
-        uint32_t b_u32 = std::min((uint32_t)b, (uint32_t)255);
+        //  Round to the nearest integer, like the vector loop above. Adding 0.5 rounds
+        //  an exact tie like 50.5 up, while the vector loop rounds it to even. That
+        //  1-unit difference at ties is fine.
+        uint32_t r_u32 = std::min((uint32_t)(r + 0.5f), (uint32_t)255);
+        uint32_t g_u32 = std::min((uint32_t)(g + 0.5f), (uint32_t)255);
+        uint32_t b_u32 = std::min((uint32_t)(b + 0.5f), (uint32_t)255);
 
         pixel &= 0xff000000;
         pixel |= r_u32 << 16;
diff --git a/SerialPrograms/Source/Kernels/ImageScaleBrightness/Kernels_ImageScaleBrightness_x64_AVX2.cpp b/SerialPrograms/Source/Kernels/ImageScaleBrightness/Kernels_ImageScaleBrightness_x64_AVX2.cpp
index f9a414d3e5..862db51ce3 100644
--- a/SerialPrograms/Source/Kernels/ImageScaleBrightness/Kernels_ImageScaleBrightness_x64_AVX2.cpp
+++ b/SerialPrograms/Source/Kernels/ImageScaleBrightness/Kernels_ImageScaleBrightness_x64_AVX2.cpp
@@ -1,6 +1,6 @@
 /*  Scale Brightness (x64 AVX2)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -10,9 +10,9 @@
 #include <immintrin.h>
 #include "Common/Compiler.h"
 
-#include <iostream>
-using std::cout;
-using std::endl;
+//#include <iostream>
+//using std::cout;
+//using std::endl;
 
 namespace PokemonAutomation{
 namespace Kernels{
diff --git a/SerialPrograms/Source/Kernels/ImageScaleBrightness/Kernels_ImageScaleBrightness_x64_AVX512.cpp b/SerialPrograms/Source/Kernels/ImageScaleBrightness/Kernels_ImageScaleBrightness_x64_AVX512.cpp
index 417fe340bc..17071f6d3b 100644
--- a/SerialPrograms/Source/Kernels/ImageScaleBrightness/Kernels_ImageScaleBrightness_x64_AVX512.cpp
+++ b/SerialPrograms/Source/Kernels/ImageScaleBrightness/Kernels_ImageScaleBrightness_x64_AVX512.cpp
@@ -1,6 +1,6 @@
 /*  Scale Brightness (x64 AVX512)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -10,9 +10,9 @@
 #include <immintrin.h>
 #include "Common/Compiler.h"
 
-#include <iostream>
-using std::cout;
-using std::endl;
+//#include <iostream>
+//using std::cout;
+//using std::endl;
 
 namespace PokemonAutomation{
 namespace Kernels{
@@ -51,7 +51,12 @@ PA_FORCE_INLINE void scale_brightness_x64_AVX512(
         pi = _mm512_cvtps_epi32(pf);
         pixel = _mm512_cvtepi32_epi8(pi);
 
+#ifdef _MSC_VER
+        //  COMPILER-BUG-MSVC: Miscompiled without mask.
+        _mm512_mask_storeu_epi32((__m512i*)image, mask, _mm512_castsi128_si512(pixel));
+#else
         _mm_mask_storeu_epi32((__m128i*)image, mask, pixel);
+#endif
     }
 }
 void scale_brightness_x64_AVX512(
diff --git a/SerialPrograms/Source/Kernels/ImageScaleBrightness/Kernels_ImageScaleBrightness_x64_SSE41.cpp b/SerialPrograms/Source/Kernels/ImageScaleBrightness/Kernels_ImageScaleBrightness_x64_SSE41.cpp
index f7d862e72b..74ae498958 100644
--- a/SerialPrograms/Source/Kernels/ImageScaleBrightness/Kernels_ImageScaleBrightness_x64_SSE41.cpp
+++ b/SerialPrograms/Source/Kernels/ImageScaleBrightness/Kernels_ImageScaleBrightness_x64_SSE41.cpp
@@ -1,6 +1,6 @@
 /*  Scale Brightness (x64 SSE4.1)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/Kernels/ImageStats/Kernels_ImagePixelSumSqr.cpp b/SerialPrograms/Source/Kernels/ImageStats/Kernels_ImagePixelSumSqr.cpp
index ab2bcef3dd..5373eae627 100644
--- a/SerialPrograms/Source/Kernels/ImageStats/Kernels_ImagePixelSumSqr.cpp
+++ b/SerialPrograms/Source/Kernels/ImageStats/Kernels_ImagePixelSumSqr.cpp
@@ -1,6 +1,6 @@
 /*  Pixel Sum + Sum of Squares
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -35,6 +35,12 @@ void pixel_sum_sqr_x64_AVX512(
     const uint32_t* image, size_t image_bytes_per_row,
     const uint32_t* alpha, size_t alpha_bytes_per_row
 );
+void pixel_sum_sqr_arm64_NEON(
+    PixelSums& sums,
+    size_t width, size_t height,
+    const uint32_t* image, size_t image_bytes_per_row,
+    const uint32_t* alpha, size_t alpha_bytes_per_row
+);
 
 
 
@@ -76,6 +82,17 @@ void pixel_sum_sqr(
         );
         return;
     }
+#endif
+#ifdef PA_AutoDispatch_arm64_20_M1
+    if (CPU_CAPABILITY_CURRENT.OK_M1){
+        pixel_sum_sqr_arm64_NEON(
+            sums,
+            width, height,
+            image, image_bytes_per_row,
+            alpha, alpha_bytes_per_row
+        );
+        return;
+    }
 #endif
     pixel_sum_sqr_Default(
         sums,
diff --git a/SerialPrograms/Source/Kernels/ImageStats/Kernels_ImagePixelSumSqr.h b/SerialPrograms/Source/Kernels/ImageStats/Kernels_ImagePixelSumSqr.h
index 31fa575814..8e0e46d40a 100644
--- a/SerialPrograms/Source/Kernels/ImageStats/Kernels_ImagePixelSumSqr.h
+++ b/SerialPrograms/Source/Kernels/ImageStats/Kernels_ImagePixelSumSqr.h
@@ -1,6 +1,6 @@
 /*  Pixel Sum + Sum of Squares
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/Kernels/ImageStats/Kernels_ImagePixelSumSqrDev.cpp b/SerialPrograms/Source/Kernels/ImageStats/Kernels_ImagePixelSumSqrDev.cpp
index a7b8b0fc35..c6c3ee461e 100644
--- a/SerialPrograms/Source/Kernels/ImageStats/Kernels_ImagePixelSumSqrDev.cpp
+++ b/SerialPrograms/Source/Kernels/ImageStats/Kernels_ImagePixelSumSqrDev.cpp
@@ -1,6 +1,6 @@
 /*  Sum of Squares of Deviation
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/Kernels/ImageStats/Kernels_ImagePixelSumSqrDev.h b/SerialPrograms/Source/Kernels/ImageStats/Kernels_ImagePixelSumSqrDev.h
index 0700f315fc..f4ce23a813 100644
--- a/SerialPrograms/Source/Kernels/ImageStats/Kernels_ImagePixelSumSqrDev.h
+++ b/SerialPrograms/Source/Kernels/ImageStats/Kernels_ImagePixelSumSqrDev.h
@@ -1,6 +1,6 @@
 /*  Sum of Squares of Deviation
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/Kernels/ImageStats/Kernels_ImagePixelSumSqrDev_Default.cpp b/SerialPrograms/Source/Kernels/ImageStats/Kernels_ImagePixelSumSqrDev_Default.cpp
index 48a96268b8..cd76ac1fd8 100644
--- a/SerialPrograms/Source/Kernels/ImageStats/Kernels_ImagePixelSumSqrDev_Default.cpp
+++ b/SerialPrograms/Source/Kernels/ImageStats/Kernels_ImagePixelSumSqrDev_Default.cpp
@@ -1,13 +1,15 @@
 /*  Sum of Squares of Deviation (Default)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include <stdint.h>
 #include "Common/Compiler.h"
 #include "Common/Cpp/Exceptions.h"
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
 #include "Kernels_ImagePixelSumSqrDev.h"
+#include "Kernels_ImagePixelSumSqrDev_TestInfra.h"
 
 namespace PokemonAutomation{
 namespace Kernels{
@@ -114,6 +116,44 @@ void sum_sqr_deviation_Default<SumSquareMode::ARBITRATE_ALPHAS>(
 );
 
 
+class Test_SumSqrDeviation_Default : public Test_SumSqrDeviation{
+public:
+    Test_SumSqrDeviation_Default(
+        SumSquareMode mode,
+        size_t width, size_t height,
+        SumSqrDeviationConvert convert
+    )
+        : Test_SumSqrDeviation(
+            "Default",
+            mode,
+            width, height,
+            convert
+        )
+    {}
+};
+void add_tests_sum_sqr_deviation_Default(UnitTestDatabase& database){
+    auto add_all_modes = [&](size_t width, size_t height){
+        database.add<Test_SumSqrDeviation_Default>(
+            SumSquareMode::REFERENCE_ALPHA, width, height,
+            (SumSqrDeviationConvert)sum_sqr_deviation_Default<SumSquareMode::REFERENCE_ALPHA>
+        );
+        database.add<Test_SumSqrDeviation_Default>(
+            SumSquareMode::USE_BACKGROUND, width, height,
+            (SumSqrDeviationConvert)sum_sqr_deviation_Default<SumSquareMode::USE_BACKGROUND>
+        );
+        database.add<Test_SumSqrDeviation_Default>(
+            SumSquareMode::ARBITRATE_ALPHAS, width, height,
+            (SumSqrDeviationConvert)sum_sqr_deviation_Default<SumSquareMode::ARBITRATE_ALPHAS>
+        );
+    };
+    for (size_t width : kTestWidths){
+        add_all_modes(width, (width % 5) + 1);
+    }
+    add_all_modes(0, 0);
+    add_all_modes(64, 0);
+}
+
+
 
 
 }
diff --git a/SerialPrograms/Source/Kernels/ImageStats/Kernels_ImagePixelSumSqrDev_TestInfra.cpp b/SerialPrograms/Source/Kernels/ImageStats/Kernels_ImagePixelSumSqrDev_TestInfra.cpp
new file mode 100644
index 0000000000..bcab09234e
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/ImageStats/Kernels_ImagePixelSumSqrDev_TestInfra.cpp
@@ -0,0 +1,122 @@
+/*  Sum of Squares of Deviation Test Infra
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <random>
+#include "Common/Cpp/Containers/GuardPageBuffer.h"
+#include "Kernels_ImagePixelSumSqrDev_TestInfra.h"
+
+namespace PokemonAutomation{
+namespace Kernels{
+
+
+
+static const char* mode_str(SumSquareMode mode){
+    switch (mode){
+    case SumSquareMode::REFERENCE_ALPHA:
+        return "REFERENCE_ALPHA";
+    case SumSquareMode::USE_BACKGROUND:
+        return "USE_BACKGROUND";
+    case SumSquareMode::ARBITRATE_ALPHAS:
+        return "ARBITRATE_ALPHAS";
+    }
+    return "UNKNOWN";
+}
+
+
+
+Test_SumSqrDeviation::Test_SumSqrDeviation(
+    const std::string& arch_str,
+    SumSquareMode mode,
+    size_t width, size_t height,
+    SumSqrDeviationConvert convert
+)
+    : UnitTest(
+        "Kernels::ImageStats::sum_sqr_deviation - " + arch_str + "/" + mode_str(mode) +
+        "(" + std::to_string(width) + "x" + std::to_string(height) + ")"
+    )
+    , m_mode(mode)
+    , m_width(width)
+    , m_height(height)
+    , m_convert(convert)
+{}
+
+UnitTestResult Test_SumSqrDeviation::run(Logger& logger, CancellableScope& scope) const{
+    //  Both images end right before a guard page, so a kernel that reads past
+    //  the last row faults on every run.
+    GuardPageBuffer<uint32_t> ref(m_width * m_height);
+    GuardPageBuffer<uint32_t> img(m_width * m_height);
+
+    std::mt19937 generator(42);
+    std::uniform_int_distribution<uint32_t> distribution;
+    for (size_t c = 0; c < m_width * m_height; c++){
+        ref[c] = distribution(generator);
+        img[c] = distribution(generator);
+    }
+    uint32_t background = distribution(generator);
+
+    //
+    //  Known output, computed with a plain scalar loop.
+    //  A pixel is active if the MSB of its value is set.
+    //  Everything is integer math, so this is exact.
+    //
+    uint64_t expected_count = 0;
+    uint64_t expected_sumsqrs = 0;
+    for (size_t c = 0; c < m_width * m_height; c++){
+        uint32_t r = ref[c];
+        uint32_t i = img[c];
+
+        int32_t alphaR = (int32_t)r >> 31;
+
+        if (m_mode == SumSquareMode::REFERENCE_ALPHA){
+            r &= (uint32_t)alphaR;
+            i &= (uint32_t)alphaR;
+        }
+        else if (m_mode == SumSquareMode::USE_BACKGROUND){
+            r = (alphaR != 0) ? r : background;
+        }
+        else{
+            uint32_t alphaI = (uint32_t)((int32_t)i >> 31);
+            r &= (uint32_t)alphaR;
+            i &= alphaI;
+            uint32_t disagree = alphaI ^ (uint32_t)alphaR;
+            r |= disagree;
+            i &= ~disagree;
+        }
+
+        expected_count += (alphaR != 0) ? 1 : 0;
+
+        int32_t d0 = (int32_t)(r & 0x000000ff) - (int32_t)(i & 0x000000ff);
+        int32_t d1 = (int32_t)((r >>  8) & 0x000000ff) - (int32_t)((i >>  8) & 0x000000ff);
+        int32_t d2 = (int32_t)((r >> 16) & 0x000000ff) - (int32_t)((i >> 16) & 0x000000ff);
+        expected_sumsqrs += (uint64_t)(d0 * d0) + (uint64_t)(d1 * d1) + (uint64_t)(d2 * d2);
+    }
+
+    uint64_t count = 0;
+    uint64_t sumsqrs = 0;
+    m_convert(
+        count, sumsqrs,
+        m_width, m_height,
+        ref.data(), m_width * sizeof(uint32_t),
+        img.data(), m_width * sizeof(uint32_t),
+        background
+    );
+
+    if (expected_count != count){
+        return "Mismatch on count: " +
+            std::to_string(expected_count) + " != " + std::to_string(count);
+    }
+    if (expected_sumsqrs != sumsqrs){
+        return "Mismatch on sumsqrs: " +
+            std::to_string(expected_sumsqrs) + " != " + std::to_string(sumsqrs);
+    }
+
+    return true;
+}
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/Kernels/ImageStats/Kernels_ImagePixelSumSqrDev_TestInfra.h b/SerialPrograms/Source/Kernels/ImageStats/Kernels_ImagePixelSumSqrDev_TestInfra.h
new file mode 100644
index 0000000000..1d78fd7079
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/ImageStats/Kernels_ImagePixelSumSqrDev_TestInfra.h
@@ -0,0 +1,90 @@
+/*  Sum of Squares of Deviation Test Infra
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Compiler.h"
+#include "Common/Cpp/TestRunners/UnitTest.h"
+#include "Kernels_ImagePixelSumSqrDev.h"
+
+#ifndef PokemonAutomation_Kernels_ImagePixelSumSqrDev_TestInfra_H
+#define PokemonAutomation_Kernels_ImagePixelSumSqrDev_TestInfra_H
+
+namespace PokemonAutomation{
+namespace Kernels{
+
+
+
+using SumSqrDeviationConvert = void (*)(
+    uint64_t& count, uint64_t& sumsqrs,
+    size_t width, size_t height,
+    const uint32_t* ref, size_t ref_bytes_per_line,
+    const uint32_t* img, size_t img_bytes_per_line,
+    uint32_t background
+);
+
+
+
+//
+//  Test widths from 0 to 1000, including widths that are and are not
+//  divisible by the SIMD vector widths (4, 8, 16 pixels) so that both the
+//  SIMD main loop and the partial-word tail are exercised.
+//
+constexpr size_t kTestWidths[] = {
+    0,
+    1, 2, 3,
+    4, 5, 6, 7,
+    8, 9, 10, 11, 12, 13,
+    15, 16, 17, 18,
+    23, 24, 31, 32, 33,
+    40, 47, 48, 49, 56,
+    63, 64, 65, 72, 80,
+    95, 96, 97, 99, 100,
+    112, 127, 128, 129, 131,
+    144, 160, 191, 192, 193,
+    200, 224, 255, 256, 257,
+    288, 320, 352,
+    383, 384, 385, 400,
+    448, 480,
+    511, 512, 513, 544,
+    576, 607, 608, 640,
+    672, 703, 704,
+    736, 767, 768, 769,
+    800, 832, 864,
+    895, 896, 897, 928,
+    959, 960, 991, 992,
+    999, 1000,
+};
+
+
+
+//
+//  Warning, this file is compiled in multiple ISA contexts.
+//  We cannot define the functions here since they will be compiled differently.
+//  If a higher (AVX512) version wins out in the linker, all versions will use
+//  it and crash on older CPUs.
+//
+class Test_SumSqrDeviation : public UnitTest{
+public:
+    Test_SumSqrDeviation(
+        const std::string& arch_str,
+        SumSquareMode mode,
+        size_t width, size_t height,
+        SumSqrDeviationConvert convert
+    );
+
+    virtual UnitTestResult run(Logger& logger, CancellableScope& scope) const override;
+
+private:
+    SumSquareMode m_mode;
+    size_t m_width;
+    size_t m_height;
+    SumSqrDeviationConvert m_convert;
+};
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Kernels/ImageStats/Kernels_ImagePixelSumSqrDev_x64_AVX2.cpp b/SerialPrograms/Source/Kernels/ImageStats/Kernels_ImagePixelSumSqrDev_x64_AVX2.cpp
index 7846a9b260..ea938c6b72 100644
--- a/SerialPrograms/Source/Kernels/ImageStats/Kernels_ImagePixelSumSqrDev_x64_AVX2.cpp
+++ b/SerialPrograms/Source/Kernels/ImageStats/Kernels_ImagePixelSumSqrDev_x64_AVX2.cpp
@@ -1,6 +1,6 @@
 /*  Sum of Squares of Deviation (x64 AVX2)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -8,9 +8,10 @@
 
 #include <immintrin.h>
 #include "Common/Cpp/Exceptions.h"
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
 #include "Kernels/Kernels_x64_AVX2.h"
-#include "Kernels/PartialWordAccess/Kernels_PartialWordAccess_x64_AVX2.h"
 #include "Kernels_ImagePixelSumSqrDev.h"
+#include "Kernels_ImagePixelSumSqrDev_TestInfra.h"
 
 namespace PokemonAutomation{
 namespace Kernels{
@@ -173,6 +174,44 @@ void sum_sqr_deviation_x64_AVX2<SumSquareMode::ARBITRATE_ALPHAS>(
 );
 
 
+class Test_SumSqrDeviation_x64_AVX2 : public Test_SumSqrDeviation{
+public:
+    Test_SumSqrDeviation_x64_AVX2(
+        SumSquareMode mode,
+        size_t width, size_t height,
+        SumSqrDeviationConvert convert
+    )
+        : Test_SumSqrDeviation(
+            "x64_AVX2",
+            mode,
+            width, height,
+            convert
+        )
+    {}
+};
+void add_tests_sum_sqr_deviation_x64_AVX2(UnitTestDatabase& database){
+    auto add_all_modes = [&](size_t width, size_t height){
+        database.add<Test_SumSqrDeviation_x64_AVX2>(
+            SumSquareMode::REFERENCE_ALPHA, width, height,
+            (SumSqrDeviationConvert)sum_sqr_deviation_x64_AVX2<SumSquareMode::REFERENCE_ALPHA>
+        );
+        database.add<Test_SumSqrDeviation_x64_AVX2>(
+            SumSquareMode::USE_BACKGROUND, width, height,
+            (SumSqrDeviationConvert)sum_sqr_deviation_x64_AVX2<SumSquareMode::USE_BACKGROUND>
+        );
+        database.add<Test_SumSqrDeviation_x64_AVX2>(
+            SumSquareMode::ARBITRATE_ALPHAS, width, height,
+            (SumSqrDeviationConvert)sum_sqr_deviation_x64_AVX2<SumSquareMode::ARBITRATE_ALPHAS>
+        );
+    };
+    for (size_t width : kTestWidths){
+        add_all_modes(width, (width % 5) + 1);
+    }
+    add_all_modes(0, 0);
+    add_all_modes(64, 0);
+}
+
+
 
 
 }
diff --git a/SerialPrograms/Source/Kernels/ImageStats/Kernels_ImagePixelSumSqrDev_x64_AVX512.cpp b/SerialPrograms/Source/Kernels/ImageStats/Kernels_ImagePixelSumSqrDev_x64_AVX512.cpp
index 91e02e7ab0..af9e6b6475 100644
--- a/SerialPrograms/Source/Kernels/ImageStats/Kernels_ImagePixelSumSqrDev_x64_AVX512.cpp
+++ b/SerialPrograms/Source/Kernels/ImageStats/Kernels_ImagePixelSumSqrDev_x64_AVX512.cpp
@@ -1,6 +1,6 @@
 /*  Sum of Squares of Deviation (x64 AVX512)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -8,12 +8,14 @@
 
 #include <immintrin.h>
 #include "Common/Cpp/Exceptions.h"
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
 #include "Kernels/Kernels_x64_AVX512.h"
 #include "Kernels_ImagePixelSumSqrDev.h"
+#include "Kernels_ImagePixelSumSqrDev_TestInfra.h"
 
-#include <iostream>
-using std::cout;
-using std::endl;
+//#include <iostream>
+//using std::cout;
+//using std::endl;
 
 namespace PokemonAutomation{
 namespace Kernels{
@@ -179,6 +181,44 @@ void sum_sqr_deviation_x64_AVX512<SumSquareMode::ARBITRATE_ALPHAS>(
 );
 
 
+class Test_SumSqrDeviation_x64_AVX512 : public Test_SumSqrDeviation{
+public:
+    Test_SumSqrDeviation_x64_AVX512(
+        SumSquareMode mode,
+        size_t width, size_t height,
+        SumSqrDeviationConvert convert
+    )
+        : Test_SumSqrDeviation(
+            "x64_AVX512",
+            mode,
+            width, height,
+            convert
+        )
+    {}
+};
+void add_tests_sum_sqr_deviation_x64_AVX512(UnitTestDatabase& database){
+    auto add_all_modes = [&](size_t width, size_t height){
+        database.add<Test_SumSqrDeviation_x64_AVX512>(
+            SumSquareMode::REFERENCE_ALPHA, width, height,
+            (SumSqrDeviationConvert)sum_sqr_deviation_x64_AVX512<SumSquareMode::REFERENCE_ALPHA>
+        );
+        database.add<Test_SumSqrDeviation_x64_AVX512>(
+            SumSquareMode::USE_BACKGROUND, width, height,
+            (SumSqrDeviationConvert)sum_sqr_deviation_x64_AVX512<SumSquareMode::USE_BACKGROUND>
+        );
+        database.add<Test_SumSqrDeviation_x64_AVX512>(
+            SumSquareMode::ARBITRATE_ALPHAS, width, height,
+            (SumSqrDeviationConvert)sum_sqr_deviation_x64_AVX512<SumSquareMode::ARBITRATE_ALPHAS>
+        );
+    };
+    for (size_t width : kTestWidths){
+        add_all_modes(width, (width % 5) + 1);
+    }
+    add_all_modes(0, 0);
+    add_all_modes(64, 0);
+}
+
+
 
 
 }
diff --git a/SerialPrograms/Source/Kernels/ImageStats/Kernels_ImagePixelSumSqrDev_x64_SSE41.cpp b/SerialPrograms/Source/Kernels/ImageStats/Kernels_ImagePixelSumSqrDev_x64_SSE41.cpp
index a1c3ea9ac1..a46b917323 100644
--- a/SerialPrograms/Source/Kernels/ImageStats/Kernels_ImagePixelSumSqrDev_x64_SSE41.cpp
+++ b/SerialPrograms/Source/Kernels/ImageStats/Kernels_ImagePixelSumSqrDev_x64_SSE41.cpp
@@ -1,6 +1,6 @@
 /*  Sum of Squares of Deviation (x64 SSE4.1)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -8,9 +8,10 @@
 
 #include <smmintrin.h>
 #include "Common/Cpp/Exceptions.h"
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
 #include "Kernels/Kernels_x64_SSE41.h"
-#include "Kernels/PartialWordAccess/Kernels_PartialWordAccess_x64_SSE41.h"
 #include "Kernels_ImagePixelSumSqrDev.h"
+#include "Kernels_ImagePixelSumSqrDev_TestInfra.h"
 
 namespace PokemonAutomation{
 namespace Kernels{
@@ -179,6 +180,44 @@ void sum_sqr_deviation_x64_SSE41<SumSquareMode::ARBITRATE_ALPHAS>(
 );
 
 
+class Test_SumSqrDeviation_x64_SSE41 : public Test_SumSqrDeviation{
+public:
+    Test_SumSqrDeviation_x64_SSE41(
+        SumSquareMode mode,
+        size_t width, size_t height,
+        SumSqrDeviationConvert convert
+    )
+        : Test_SumSqrDeviation(
+            "x64_SSE41",
+            mode,
+            width, height,
+            convert
+        )
+    {}
+};
+void add_tests_sum_sqr_deviation_x64_SSE41(UnitTestDatabase& database){
+    auto add_all_modes = [&](size_t width, size_t height){
+        database.add<Test_SumSqrDeviation_x64_SSE41>(
+            SumSquareMode::REFERENCE_ALPHA, width, height,
+            (SumSqrDeviationConvert)sum_sqr_deviation_x64_SSE41<SumSquareMode::REFERENCE_ALPHA>
+        );
+        database.add<Test_SumSqrDeviation_x64_SSE41>(
+            SumSquareMode::USE_BACKGROUND, width, height,
+            (SumSqrDeviationConvert)sum_sqr_deviation_x64_SSE41<SumSquareMode::USE_BACKGROUND>
+        );
+        database.add<Test_SumSqrDeviation_x64_SSE41>(
+            SumSquareMode::ARBITRATE_ALPHAS, width, height,
+            (SumSqrDeviationConvert)sum_sqr_deviation_x64_SSE41<SumSquareMode::ARBITRATE_ALPHAS>
+        );
+    };
+    for (size_t width : kTestWidths){
+        add_all_modes(width, (width % 5) + 1);
+    }
+    add_all_modes(0, 0);
+    add_all_modes(64, 0);
+}
+
+
 
 
 }
diff --git a/SerialPrograms/Source/Kernels/ImageStats/Kernels_ImagePixelSumSqr_Default.cpp b/SerialPrograms/Source/Kernels/ImageStats/Kernels_ImagePixelSumSqr_Default.cpp
index 082863e690..bae7806331 100644
--- a/SerialPrograms/Source/Kernels/ImageStats/Kernels_ImagePixelSumSqr_Default.cpp
+++ b/SerialPrograms/Source/Kernels/ImageStats/Kernels_ImagePixelSumSqr_Default.cpp
@@ -1,11 +1,13 @@
 /*  Pixel Sum + Sum of Squares (Default)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include "Common/Cpp/Exceptions.h"
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
 #include "Kernels_ImagePixelSumSqr.h"
+#include "Kernels_ImagePixelSumSqr_TestInfra.h"
 
 namespace PokemonAutomation{
 namespace Kernels{
@@ -78,5 +80,26 @@ void pixel_sum_sqr_Default(
 }
 
 
+class Test_PixelSumSqr_Default : public Test_PixelSumSqr{
+public:
+    Test_PixelSumSqr_Default(
+        size_t width, size_t height
+    )
+        : Test_PixelSumSqr(
+            "Default",
+            width, height,
+            pixel_sum_sqr_Default
+        )
+    {}
+};
+void add_tests_pixel_sum_sqr_Default(UnitTestDatabase& database){
+    for (size_t width : kTestWidths){
+        database.add<Test_PixelSumSqr_Default>(width, (width % 5) + 1);
+    }
+    database.add<Test_PixelSumSqr_Default>(0, 0);
+    database.add<Test_PixelSumSqr_Default>(64, 0);
+}
+
+
 }
 }
diff --git a/SerialPrograms/Source/Kernels/ImageStats/Kernels_ImagePixelSumSqr_TestInfra.cpp b/SerialPrograms/Source/Kernels/ImageStats/Kernels_ImagePixelSumSqr_TestInfra.cpp
new file mode 100644
index 0000000000..f2c7c63e77
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/ImageStats/Kernels_ImagePixelSumSqr_TestInfra.cpp
@@ -0,0 +1,101 @@
+/*  Pixel Sum + Sum of Squares Test Infra
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <random>
+#include "Common/Cpp/Containers/GuardPageBuffer.h"
+#include "Kernels_ImagePixelSumSqr_TestInfra.h"
+
+namespace PokemonAutomation{
+namespace Kernels{
+
+
+
+Test_PixelSumSqr::Test_PixelSumSqr(
+    const std::string& arch_str,
+    size_t width, size_t height,
+    PixelSumSqrConvert convert
+)
+    : UnitTest(
+        "Kernels::ImageStats::pixel_sum_sqr - " + arch_str +
+        "(" + std::to_string(width) + "x" + std::to_string(height) + ")"
+    )
+    , m_width(width)
+    , m_height(height)
+    , m_convert(convert)
+{}
+
+UnitTestResult Test_PixelSumSqr::run(Logger& logger, CancellableScope& scope) const{
+    //  Both images end right before a guard page, so a kernel that reads past
+    //  the last row faults on every run.
+    GuardPageBuffer<uint32_t> image(m_width * m_height);
+    GuardPageBuffer<uint32_t> alpha(m_width * m_height);
+
+    std::mt19937 generator(42);
+    std::uniform_int_distribution<uint32_t> distribution;
+    for (size_t c = 0; c < m_width * m_height; c++){
+        image[c] = distribution(generator);
+        alpha[c] = distribution(generator);
+    }
+
+    //
+    //  Known output, computed with a plain scalar loop.
+    //  A pixel is active if the MSB of its alpha value is set.
+    //  Everything is integer math, so this is exact.
+    //
+    PixelSums expected;
+    for (size_t c = 0; c < m_width * m_height; c++){
+        uint32_t p = image[c];
+        int32_t m = (int32_t)alpha[c] >> 31;
+        p &= (uint32_t)m;
+
+        uint32_t b = p & 0x000000ff;
+        uint32_t g = (p >>  8) & 0x000000ff;
+        uint32_t r = (p >> 16) & 0x000000ff;
+
+        expected.count += (m != 0) ? 1 : 0;
+        expected.sumR += r;
+        expected.sumG += g;
+        expected.sumB += b;
+        expected.sqrR += r * r;
+        expected.sqrG += g * g;
+        expected.sqrB += b * b;
+    }
+
+    PixelSums actual;
+    m_convert(
+        actual,
+        m_width, m_height,
+        image.data(), m_width * sizeof(uint32_t),
+        alpha.data(), m_width * sizeof(uint32_t)
+    );
+
+    struct{
+        const char* name;
+        uint64_t expected;
+        uint64_t actual;
+    } fields[] = {
+        { "count", expected.count, actual.count },
+        { "sumR",  expected.sumR,  actual.sumR  },
+        { "sumG",  expected.sumG,  actual.sumG  },
+        { "sumB",  expected.sumB,  actual.sumB  },
+        { "sqrR",  expected.sqrR,  actual.sqrR  },
+        { "sqrG",  expected.sqrG,  actual.sqrG  },
+        { "sqrB",  expected.sqrB,  actual.sqrB  },
+    };
+    for (auto& f : fields){
+        if (f.expected != f.actual){
+            return "Mismatch on " + std::string(f.name) + ": " +
+                std::to_string(f.expected) + " != " + std::to_string(f.actual);
+        }
+    }
+
+    return true;
+}
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/Kernels/ImageStats/Kernels_ImagePixelSumSqr_TestInfra.h b/SerialPrograms/Source/Kernels/ImageStats/Kernels_ImagePixelSumSqr_TestInfra.h
new file mode 100644
index 0000000000..ee588b2fa5
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/ImageStats/Kernels_ImagePixelSumSqr_TestInfra.h
@@ -0,0 +1,87 @@
+/*  Pixel Sum + Sum of Squares Test Infra
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Compiler.h"
+#include "Common/Cpp/TestRunners/UnitTest.h"
+#include "Kernels_ImagePixelSumSqr.h"
+
+#ifndef PokemonAutomation_Kernels_ImagePixelSumSqr_TestInfra_H
+#define PokemonAutomation_Kernels_ImagePixelSumSqr_TestInfra_H
+
+namespace PokemonAutomation{
+namespace Kernels{
+
+
+
+using PixelSumSqrConvert = void (*)(
+    PixelSums& sums,
+    size_t width, size_t height,
+    const uint32_t* image, size_t image_bytes_per_row,
+    const uint32_t* alpha, size_t alpha_bytes_per_row
+);
+
+
+
+//
+//  Test widths from 0 to 1000, including widths that are and are not
+//  divisible by the SIMD vector widths (4, 8, 16 pixels) so that both the
+//  SIMD main loop and the partial-word tail are exercised.
+//
+constexpr size_t kTestWidths[] = {
+    0,
+    1, 2, 3,
+    4, 5, 6, 7,
+    8, 9, 10, 11, 12, 13,
+    15, 16, 17, 18,
+    23, 24, 31, 32, 33,
+    40, 47, 48, 49, 56,
+    63, 64, 65, 72, 80,
+    95, 96, 97, 99, 100,
+    112, 127, 128, 129, 131,
+    144, 160, 191, 192, 193,
+    200, 224, 255, 256, 257,
+    288, 320, 352,
+    383, 384, 385, 400,
+    448, 480,
+    511, 512, 513, 544,
+    576, 607, 608, 640,
+    672, 703, 704,
+    736, 767, 768, 769,
+    800, 832, 864,
+    895, 896, 897, 928,
+    959, 960, 991, 992,
+    999, 1000,
+};
+
+
+
+//
+//  Warning, this file is compiled in multiple ISA contexts.
+//  We cannot define the functions here since they will be compiled differently.
+//  If a higher (AVX512) version wins out in the linker, all versions will use
+//  it and crash on older CPUs.
+//
+class Test_PixelSumSqr : public UnitTest{
+public:
+    Test_PixelSumSqr(
+        const std::string& arch_str,
+        size_t width, size_t height,
+        PixelSumSqrConvert convert
+    );
+
+    virtual UnitTestResult run(Logger& logger, CancellableScope& scope) const override;
+
+private:
+    size_t m_width;
+    size_t m_height;
+    PixelSumSqrConvert m_convert;
+};
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Kernels/ImageStats/Kernels_ImagePixelSumSqr_arm64_NEON.cpp b/SerialPrograms/Source/Kernels/ImageStats/Kernels_ImagePixelSumSqr_arm64_NEON.cpp
new file mode 100644
index 0000000000..22c69238ed
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/ImageStats/Kernels_ImagePixelSumSqr_arm64_NEON.cpp
@@ -0,0 +1,193 @@
+/*  Pixel Sum + Sum of Squares (arm64 NEON)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifdef PA_AutoDispatch_arm64_20_M1
+
+#include <arm_neon.h>
+#include "Common/Cpp/Exceptions.h"
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "Kernels/Kernels_arm64_NEON.h"
+#include "Kernels/PartialWordAccess/Kernels_PartialWordAccess_arm64_NEON.h"
+#include "Kernels_ImagePixelSumSqr.h"
+#include "Kernels_ImagePixelSumSqr_TestInfra.h"
+
+namespace PokemonAutomation{
+namespace Kernels{
+
+
+void pixel_sum_sqr_Default(
+    PixelSums& sums,
+    size_t width, size_t height,
+    const uint32_t* image, size_t image_bytes_per_row,
+    const uint32_t* alpha, size_t alpha_bytes_per_row
+);
+
+
+
+//  Accumulate 4 pixels stored as uint32 lanes (ARGB, B in the lowest byte) into the
+//  per-lane uint32 accumulators. This mirrors one iteration of the SSE4.1 kernel and is
+//  used for the pixels left over after the 16-pixel main loop in `pixel_sum_sqr_arm64_NEON()`.
+//  `m` is the raw alpha-buffer pixels: a pixel is active if its alpha byte is >= 128,
+//  i.e. the sign bit of the uint32 is set.
+PA_FORCE_INLINE void pixel_sum_sqr_arm64_NEON_4px(
+    uint32x4_t& sumB, uint32x4_t& sumG, uint32x4_t& sumR, uint32x4_t& sumA,
+    uint32x4_t& sqrB, uint32x4_t& sqrG, uint32x4_t& sqrR,
+    uint32x4_t p, uint32x4_t m
+){
+    //  Arithmetic shift turns the alpha sign bit into an all-ones/all-zeros lane mask.
+    m = vreinterpretq_u32_s32(vshrq_n_s32(vreinterpretq_s32_u32(m), 31));
+    p = vandq_u32(p, m);
+
+    const uint32x4_t byte_mask = vdupq_n_u32(0x000000ff);
+    uint32x4_t r0 = vandq_u32(p, byte_mask);
+    uint32x4_t r1 = vandq_u32(vshrq_n_u32(p, 8), byte_mask);
+    uint32x4_t r2 = vandq_u32(vshrq_n_u32(p, 16), byte_mask);
+
+    sumB = vaddq_u32(sumB, r0);
+    sumG = vaddq_u32(sumG, r1);
+    sumR = vaddq_u32(sumR, r2);
+    //  Active lanes of `m` are 0xffffffff == -1, so subtracting counts them.
+    sumA = vsubq_u32(sumA, m);
+
+    sqrB = vmlaq_u32(sqrB, r0, r0);
+    sqrG = vmlaq_u32(sqrG, r1, r1);
+    sqrR = vmlaq_u32(sqrR, r2, r2);
+}
+
+//  Compute pixel sums and sums of squares of one image row of `width` pixels.
+//  Requires `width >= 4` so the final partial load can safely read bytes before
+//  the end of the row instead of past it.
+//
+//  Main loop processes 16 pixels per iteration: `vld4q_u8()` de-interleaves 64 bytes of
+//  BGRA pixels into four uint8x16 vectors, one per channel. Byte sums are widened with
+//  pairwise adds (u8 -> u16 -> u32) and squares are computed with widening multiplies
+//  (u8 * u8 -> u16), then pairwise accumulated into uint32 lanes.
+//
+//  Overflow: width <= 65535, so each of the four uint32 lanes receives at most
+//  ~16384 pixels, and 16384 * 255^2 < 2^32.
+PA_FORCE_INLINE void pixel_sum_sqr_arm64_NEON(
+    PixelSums& sums,
+    uint16_t width,
+    const uint32_t* image,
+    const uint32_t* alpha
+){
+    uint32x4_t sumB = vdupq_n_u32(0);
+    uint32x4_t sumG = vdupq_n_u32(0);
+    uint32x4_t sumR = vdupq_n_u32(0);
+    uint32x4_t sumA = vdupq_n_u32(0);
+    uint32x4_t sqrB = vdupq_n_u32(0);
+    uint32x4_t sqrG = vdupq_n_u32(0);
+    uint32x4_t sqrR = vdupq_n_u32(0);
+
+    size_t lc = width / 16;
+    while (lc--){
+        //  val[0] = B, val[1] = G, val[2] = R, val[3] = A for 16 pixels.
+        uint8x16x4_t p = vld4q_u8((const uint8_t*)image);
+        uint8x16_t a = vld4q_u8((const uint8_t*)alpha).val[3];
+
+        //  0xff where alpha >= 128, else 0.
+        uint8x16_t m = vreinterpretq_u8_s8(vshrq_n_s8(vreinterpretq_s8_u8(a), 7));
+        uint8x16_t b = vandq_u8(p.val[0], m);
+        uint8x16_t g = vandq_u8(p.val[1], m);
+        uint8x16_t r = vandq_u8(p.val[2], m);
+
+        sumB = vpadalq_u16(sumB, vpaddlq_u8(b));
+        sumG = vpadalq_u16(sumG, vpaddlq_u8(g));
+        sumR = vpadalq_u16(sumR, vpaddlq_u8(r));
+        sumA = vpadalq_u16(sumA, vpaddlq_u8(vshrq_n_u8(a, 7)));
+
+        sqrB = vpadalq_u16(sqrB, vmull_u8(vget_low_u8(b), vget_low_u8(b)));
+        sqrB = vpadalq_u16(sqrB, vmull_high_u8(b, b));
+        sqrG = vpadalq_u16(sqrG, vmull_u8(vget_low_u8(g), vget_low_u8(g)));
+        sqrG = vpadalq_u16(sqrG, vmull_high_u8(g, g));
+        sqrR = vpadalq_u16(sqrR, vmull_u8(vget_low_u8(r), vget_low_u8(r)));
+        sqrR = vpadalq_u16(sqrR, vmull_high_u8(r, r));
+
+        image += 16;
+        alpha += 16;
+    }
+
+    //  Remaining 0-15 pixels: full groups of 4 first.
+    lc = (width % 16) / 4;
+    while (lc--){
+        pixel_sum_sqr_arm64_NEON_4px(
+            sumB, sumG, sumR, sumA, sqrB, sqrG, sqrR,
+            vld1q_u32(image), vld1q_u32(alpha)
+        );
+        image += 4;
+        alpha += 4;
+    }
+
+    //  Last 1-3 pixels. The partial loader zero-fills the unused lanes, and a zero alpha
+    //  lane is inactive, so those lanes contribute nothing.
+    if (width % 4){
+        PartialWordAccess_arm64_NEON loader(width * sizeof(uint32_t) % 16);
+        pixel_sum_sqr_arm64_NEON_4px(
+            sumB, sumG, sumR, sumA, sqrB, sqrG, sqrR,
+            vreinterpretq_u32_u8(loader.load_int_no_read_past_end(image)),
+            vreinterpretq_u32_u8(loader.load_int_no_read_past_end(alpha))
+        );
+    }
+
+    sums.count += reduce32_arm64_NEON(sumA);
+    sums.sumR += reduce32_arm64_NEON(sumR);
+    sums.sumG += reduce32_arm64_NEON(sumG);
+    sums.sumB += reduce32_arm64_NEON(sumB);
+    sums.sqrR += reduce32_arm64_NEON(sqrR);
+    sums.sqrG += reduce32_arm64_NEON(sqrG);
+    sums.sqrB += reduce32_arm64_NEON(sqrB);
+}
+void pixel_sum_sqr_arm64_NEON(
+    PixelSums& sums,
+    size_t width, size_t height,
+    const uint32_t* image, size_t image_bytes_per_row,
+    const uint32_t* alpha, size_t alpha_bytes_per_row
+){
+    if (width < 4){
+        pixel_sum_sqr_Default(
+            sums,
+            width, height,
+            image, image_bytes_per_row,
+            alpha, alpha_bytes_per_row
+        );
+        return;
+    }
+    if (width > 65535){
+        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Width limit exceeded: " + std::to_string(width));
+    }
+    for (size_t r = 0; r < height; r++){
+        pixel_sum_sqr_arm64_NEON(sums, (uint16_t)width, image, alpha);
+        image = (const uint32_t*)((const char*)image + image_bytes_per_row);
+        alpha = (const uint32_t*)((const char*)alpha + alpha_bytes_per_row);
+    }
+}
+
+
+class Test_PixelSumSqr_arm64_NEON : public Test_PixelSumSqr{
+public:
+    Test_PixelSumSqr_arm64_NEON(
+        size_t width, size_t height
+    )
+        : Test_PixelSumSqr(
+            "arm64_NEON",
+            width, height,
+            pixel_sum_sqr_arm64_NEON
+        )
+    {}
+};
+void add_tests_pixel_sum_sqr_arm64_NEON(UnitTestDatabase& database){
+    for (size_t width : kTestWidths){
+        database.add<Test_PixelSumSqr_arm64_NEON>(width, (width % 5) + 1);
+    }
+    database.add<Test_PixelSumSqr_arm64_NEON>(0, 0);
+    database.add<Test_PixelSumSqr_arm64_NEON>(64, 0);
+}
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Kernels/ImageStats/Kernels_ImagePixelSumSqr_x64_AVX2.cpp b/SerialPrograms/Source/Kernels/ImageStats/Kernels_ImagePixelSumSqr_x64_AVX2.cpp
index 23f57c95df..388d0dfa3c 100644
--- a/SerialPrograms/Source/Kernels/ImageStats/Kernels_ImagePixelSumSqr_x64_AVX2.cpp
+++ b/SerialPrograms/Source/Kernels/ImageStats/Kernels_ImagePixelSumSqr_x64_AVX2.cpp
@@ -1,6 +1,6 @@
 /*  Pixel Sum + Sum of Squares (x64 AVX2)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -8,13 +8,15 @@
 
 #include <smmintrin.h>
 #include "Common/Cpp/Exceptions.h"
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
 #include "Kernels/Kernels_x64_AVX2.h"
 #include "Kernels/PartialWordAccess/Kernels_PartialWordAccess_x64_AVX2.h"
 #include "Kernels_ImagePixelSumSqr.h"
+#include "Kernels_ImagePixelSumSqr_TestInfra.h"
 
-#include <iostream>
-using std::cout;
-using std::endl;
+//#include <iostream>
+//using std::cout;
+//using std::endl;
 
 namespace PokemonAutomation{
 namespace Kernels{
@@ -152,6 +154,27 @@ void pixel_sum_sqr_x64_AVX2(
 }
 
 
+class Test_PixelSumSqr_x64_AVX2 : public Test_PixelSumSqr{
+public:
+    Test_PixelSumSqr_x64_AVX2(
+        size_t width, size_t height
+    )
+        : Test_PixelSumSqr(
+            "x64_AVX2",
+            width, height,
+            pixel_sum_sqr_x64_AVX2
+        )
+    {}
+};
+void add_tests_pixel_sum_sqr_x64_AVX2(UnitTestDatabase& database){
+    for (size_t width : kTestWidths){
+        database.add<Test_PixelSumSqr_x64_AVX2>(width, (width % 5) + 1);
+    }
+    database.add<Test_PixelSumSqr_x64_AVX2>(0, 0);
+    database.add<Test_PixelSumSqr_x64_AVX2>(64, 0);
+}
+
+
 
 }
 }
diff --git a/SerialPrograms/Source/Kernels/ImageStats/Kernels_ImagePixelSumSqr_x64_AVX512.cpp b/SerialPrograms/Source/Kernels/ImageStats/Kernels_ImagePixelSumSqr_x64_AVX512.cpp
index e955a0b06d..bc5ded0d33 100644
--- a/SerialPrograms/Source/Kernels/ImageStats/Kernels_ImagePixelSumSqr_x64_AVX512.cpp
+++ b/SerialPrograms/Source/Kernels/ImageStats/Kernels_ImagePixelSumSqr_x64_AVX512.cpp
@@ -1,6 +1,6 @@
 /*  Pixel Sum + Sum of Squares (x64 AVX512)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -8,12 +8,14 @@
 
 #include <immintrin.h>
 #include "Common/Cpp/Exceptions.h"
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
 #include "Kernels/Kernels_x64_AVX512.h"
 #include "Kernels_ImagePixelSumSqr.h"
+#include "Kernels_ImagePixelSumSqr_TestInfra.h"
 
-#include <iostream>
-using std::cout;
-using std::endl;
+//#include <iostream>
+//using std::cout;
+//using std::endl;
 
 namespace PokemonAutomation{
 namespace Kernels{
@@ -158,6 +160,27 @@ void pixel_sum_sqr_x64_AVX512(
 }
 
 
+class Test_PixelSumSqr_x64_AVX512 : public Test_PixelSumSqr{
+public:
+    Test_PixelSumSqr_x64_AVX512(
+        size_t width, size_t height
+    )
+        : Test_PixelSumSqr(
+            "x64_AVX512",
+            width, height,
+            pixel_sum_sqr_x64_AVX512
+        )
+    {}
+};
+void add_tests_pixel_sum_sqr_x64_AVX512(UnitTestDatabase& database){
+    for (size_t width : kTestWidths){
+        database.add<Test_PixelSumSqr_x64_AVX512>(width, (width % 5) + 1);
+    }
+    database.add<Test_PixelSumSqr_x64_AVX512>(0, 0);
+    database.add<Test_PixelSumSqr_x64_AVX512>(64, 0);
+}
+
+
 
 }
 }
diff --git a/SerialPrograms/Source/Kernels/ImageStats/Kernels_ImagePixelSumSqr_x64_SSE41.cpp b/SerialPrograms/Source/Kernels/ImageStats/Kernels_ImagePixelSumSqr_x64_SSE41.cpp
index cb6acc6ea1..10312254a7 100644
--- a/SerialPrograms/Source/Kernels/ImageStats/Kernels_ImagePixelSumSqr_x64_SSE41.cpp
+++ b/SerialPrograms/Source/Kernels/ImageStats/Kernels_ImagePixelSumSqr_x64_SSE41.cpp
@@ -1,6 +1,6 @@
 /*  Pixel Sum + Sum of Squares (x64 SSE4.1)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -8,13 +8,15 @@
 
 #include <smmintrin.h>
 #include "Common/Cpp/Exceptions.h"
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
 #include "Kernels/Kernels_x64_SSE41.h"
 #include "Kernels/PartialWordAccess/Kernels_PartialWordAccess_x64_SSE41.h"
 #include "Kernels_ImagePixelSumSqr.h"
+#include "Kernels_ImagePixelSumSqr_TestInfra.h"
 
-#include <iostream>
-using std::cout;
-using std::endl;
+//#include <iostream>
+//using std::cout;
+//using std::endl;
 
 namespace PokemonAutomation{
 namespace Kernels{
@@ -140,6 +142,27 @@ void pixel_sum_sqr_x64_SSE41(
 }
 
 
+class Test_PixelSumSqr_x64_SSE41 : public Test_PixelSumSqr{
+public:
+    Test_PixelSumSqr_x64_SSE41(
+        size_t width, size_t height
+    )
+        : Test_PixelSumSqr(
+            "x64_SSE41",
+            width, height,
+            pixel_sum_sqr_x64_SSE41
+        )
+    {}
+};
+void add_tests_pixel_sum_sqr_x64_SSE41(UnitTestDatabase& database){
+    for (size_t width : kTestWidths){
+        database.add<Test_PixelSumSqr_x64_SSE41>(width, (width % 5) + 1);
+    }
+    database.add<Test_PixelSumSqr_x64_SSE41>(0, 0);
+    database.add<Test_PixelSumSqr_x64_SSE41>(64, 0);
+}
+
+
 
 }
 }
diff --git a/SerialPrograms/Source/Kernels/ImageStats/Kernels_ImageStats_Tests.cpp b/SerialPrograms/Source/Kernels/ImageStats/Kernels_ImageStats_Tests.cpp
new file mode 100644
index 0000000000..32e0cca278
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/ImageStats/Kernels_ImageStats_Tests.cpp
@@ -0,0 +1,70 @@
+/*  Image Stats Tests
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/CpuId/CpuId.h"
+#include "Kernels_ImageStats_Tests.h"
+
+namespace PokemonAutomation{
+namespace Kernels{
+
+
+void add_tests_pixel_sum_sqr_Default(UnitTestDatabase& database);
+void add_tests_sum_sqr_deviation_Default(UnitTestDatabase& database);
+
+#ifdef PA_AutoDispatch_x64_08_Nehalem
+void add_tests_pixel_sum_sqr_x64_SSE41(UnitTestDatabase& database);
+void add_tests_sum_sqr_deviation_x64_SSE41(UnitTestDatabase& database);
+#endif
+#ifdef PA_AutoDispatch_x64_13_Haswell
+void add_tests_pixel_sum_sqr_x64_AVX2(UnitTestDatabase& database);
+void add_tests_sum_sqr_deviation_x64_AVX2(UnitTestDatabase& database);
+#endif
+#ifdef PA_AutoDispatch_x64_17_Skylake
+void add_tests_pixel_sum_sqr_x64_AVX512(UnitTestDatabase& database);
+void add_tests_sum_sqr_deviation_x64_AVX512(UnitTestDatabase& database);
+#endif
+#ifdef PA_AutoDispatch_arm64_20_M1
+void add_tests_pixel_sum_sqr_arm64_NEON(UnitTestDatabase& database);
+#endif
+
+
+
+//
+//  Each ISA registers its own set of tests, and every set checks its results
+//  against a known (scalar) output, so all ISAs must give identical results.
+//
+void add_tests_ImageStats(UnitTestDatabase& database){
+    add_tests_pixel_sum_sqr_Default(database);
+    add_tests_sum_sqr_deviation_Default(database);
+#ifdef PA_AutoDispatch_x64_08_Nehalem
+    if (CPU_CAPABILITY_CURRENT.OK_08_Nehalem){
+        add_tests_pixel_sum_sqr_x64_SSE41(database);
+        add_tests_sum_sqr_deviation_x64_SSE41(database);
+    }
+#endif
+#ifdef PA_AutoDispatch_x64_13_Haswell
+    if (CPU_CAPABILITY_CURRENT.OK_13_Haswell){
+        add_tests_pixel_sum_sqr_x64_AVX2(database);
+        add_tests_sum_sqr_deviation_x64_AVX2(database);
+    }
+#endif
+#ifdef PA_AutoDispatch_x64_17_Skylake
+    if (CPU_CAPABILITY_CURRENT.OK_17_Skylake){
+        add_tests_pixel_sum_sqr_x64_AVX512(database);
+        add_tests_sum_sqr_deviation_x64_AVX512(database);
+    }
+#endif
+#ifdef PA_AutoDispatch_arm64_20_M1
+    if (CPU_CAPABILITY_CURRENT.OK_M1){
+        add_tests_pixel_sum_sqr_arm64_NEON(database);
+    }
+#endif
+}
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/Kernels/ImageStats/Kernels_ImageStats_Tests.h b/SerialPrograms/Source/Kernels/ImageStats/Kernels_ImageStats_Tests.h
new file mode 100644
index 0000000000..edfcf9e93f
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/ImageStats/Kernels_ImageStats_Tests.h
@@ -0,0 +1,23 @@
+/*  Image Stats Tests
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Kernels_ImageStats_Tests_H
+#define PokemonAutomation_Kernels_ImageStats_Tests_H
+
+#include "Common/Cpp/TestRunners/UnitTest.h"
+
+namespace PokemonAutomation{
+namespace Kernels{
+
+
+
+void add_tests_ImageStats(UnitTestDatabase& database);
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Kernels/KaiserWindow/Kernels_KaiserWindow.cpp b/SerialPrograms/Source/Kernels/KaiserWindow/Kernels_KaiserWindow.cpp
new file mode 100644
index 0000000000..bc81e26d3a
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/KaiserWindow/Kernels_KaiserWindow.cpp
@@ -0,0 +1,97 @@
+/*  Kaiser Window
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <atomic>
+//#include <numeric>
+#include <cmath>
+#include "Common/Cpp/Concurrency/Mutex.h"
+#include "Common/Cpp/Containers/AlignedVector.tpp"
+#include "Kernels_KaiserWindow.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace Kernels{
+namespace KaiserWindow{
+
+
+double bessel_i0(double x){
+    double sum = 1.0;
+    double term = 1.0;
+    double x_half = x / 2.0;
+    int k = 1;
+    while (term > sum * 1e-16){
+        double step = x_half / k;
+        term *= step * step;
+        sum += term;
+        k++;
+    }
+    return sum;
+}
+void make_kaiser_window(float* weights, size_t window, double beta){
+    double d = 1. / bessel_i0(beta);
+
+    size_t w = window - 1;
+    for (size_t c = 0; c < window; c++){
+        double t = (2. * c - w) / w;
+        t *= t;
+        t = 1 - t;
+        t = t < 0 ? 0 : std::sqrt(t);
+        t = bessel_i0(beta * t) * d;
+        weights[c] = (float)t;
+    }
+}
+
+
+
+constexpr int MAX_WINDOW_K = 30;
+
+Mutex lock;
+AlignedVector<float> kaiser_window_cache[MAX_WINDOW_K];
+std::atomic<float*> kaiser_window_cache_ptr[MAX_WINDOW_K];
+
+
+const float* get_kaiser_window_k(int window_k){
+    if (window_k >= MAX_WINDOW_K){
+        return nullptr;
+    }
+
+    //  Try to read cache.
+    float* ptr = kaiser_window_cache_ptr[window_k].load(std::memory_order_acquire);
+    if (ptr != nullptr){
+        return ptr;
+    }
+
+    //  Cache miss. Acquire lock to generate the cache.
+    std::lock_guard<Mutex> lg(lock);
+
+    //  Check again after acquiring lock.
+    ptr = kaiser_window_cache_ptr[window_k].load(std::memory_order_acquire);
+    if (ptr != nullptr){
+        return ptr;
+    }
+
+    //  Now we need to generate it for real.
+
+    size_t window = (size_t)1 << window_k;
+
+    AlignedVector<float>& slot = kaiser_window_cache[window_k];
+    slot = AlignedVector<float>(window);
+    make_kaiser_window(slot.data(), window);
+
+    kaiser_window_cache_ptr[window_k].store(slot.data(), std::memory_order_release);
+    return slot.data();
+}
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/Kernels/KaiserWindow/Kernels_KaiserWindow.h b/SerialPrograms/Source/Kernels/KaiserWindow/Kernels_KaiserWindow.h
new file mode 100644
index 0000000000..ed5acff278
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/KaiserWindow/Kernels_KaiserWindow.h
@@ -0,0 +1,29 @@
+/*  Kaiser Window
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Kernels_KaiserWindow_H
+#define PokemonAutomation_Kernels_KaiserWindow_H
+
+#include "Common/Cpp/Containers/AlignedVector.h"
+
+namespace PokemonAutomation{
+namespace Kernels{
+namespace KaiserWindow{
+
+
+double bessel_i0(double x);
+void make_kaiser_window(float* weights, size_t window, double beta = 9.0);
+
+
+//  Get the Kaiser window weights for a window of 2^window_k.
+const float* get_kaiser_window_k(int window_k);
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Kernels/Kernels_Alignment.h b/SerialPrograms/Source/Kernels/Kernels_Alignment.h
index ef9e1728f5..28d2bf1062 100644
--- a/SerialPrograms/Source/Kernels/Kernels_Alignment.h
+++ b/SerialPrograms/Source/Kernels/Kernels_Alignment.h
@@ -1,6 +1,6 @@
 /*  Alignment Tools
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/Kernels/Kernels_Arch (disabled).h b/SerialPrograms/Source/Kernels/Kernels_Arch (disabled).h
index 1fed01bfb1..08f5d52f99 100644
--- a/SerialPrograms/Source/Kernels/Kernels_Arch (disabled).h	
+++ b/SerialPrograms/Source/Kernels/Kernels_Arch (disabled).h	
@@ -1,6 +1,6 @@
 /*  Architecture
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/Kernels/Kernels_BitScan.h b/SerialPrograms/Source/Kernels/Kernels_BitScan.h
index 4f57e82a1f..0b1b96b73a 100644
--- a/SerialPrograms/Source/Kernels/Kernels_BitScan.h
+++ b/SerialPrograms/Source/Kernels/Kernels_BitScan.h
@@ -1,6 +1,6 @@
 /*  Bit Scanning
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/Kernels/Kernels_BitSet.h b/SerialPrograms/Source/Kernels/Kernels_BitSet.h
index bd8ec0e095..d5ccbec7da 100644
--- a/SerialPrograms/Source/Kernels/Kernels_BitSet.h
+++ b/SerialPrograms/Source/Kernels/Kernels_BitSet.h
@@ -1,6 +1,6 @@
 /*  Bit Scanning
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -20,7 +20,6 @@ namespace PokemonAutomation{
 namespace Kernels{
 
 
-
 class BitSet{
     static constexpr size_t WORD_BITS = 32;
     using vtype = uint32_t;
@@ -86,7 +85,7 @@ class BitSet{
 
 
 
-
+// Used in Waterfill/Kernels_Waterfill_Session.tpp to record the tile traversal during waterfill
 class BitSet2D{
     static constexpr size_t WORD_BITS = 32;
     using vtype = uint32_t;
diff --git a/SerialPrograms/Source/Kernels/Kernels_Tests.cpp b/SerialPrograms/Source/Kernels/Kernels_Tests.cpp
new file mode 100644
index 0000000000..5ffc505c80
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/Kernels_Tests.cpp
@@ -0,0 +1,48 @@
+/*  Kernels Tests
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "AbsFFT/Kernels_AbsFFT.h"
+#include "AudioChannelInterleave/Kernels_AudioChannelInterleave.h"
+#include "AudioChannelMixer/Kernels_AudioChannelMixer.h"
+#include "AudioPipeline/Kernels_AudioPipeline.h"
+#include "AudioResampler/Kernels_AudioResampler_Tests.h"
+#include "AudioStreamConverter/Kernels_AudioStreamConverter.h"
+#include "BinaryMatrix/Kernels_BinaryMatrix_Tests.h"
+#include "ImageFilters/Kernels_ImageFilter_Tests.h"
+#include "ImageFilters/RGB32_EuclideanDistance/Kernels_ImageFilter_RGB32_Euclidean_Tests.h"
+#include "ImageScaleBrightness/Kernels_ImageScaleBrightness_Tests.h"
+#include "ImageStats/Kernels_ImageStats_Tests.h"
+#include "ScaleInvariantMatrixMatch/Kernels_ScaleInvariantMatrixMatch.h"
+#include "SpikeConvolution/Kernels_SpikeConvolution.h"
+#include "Waterfill/Kernels_Waterfill_Tests.h"
+#include "Kernels_Tests.h"
+
+namespace PokemonAutomation{
+namespace Kernels{
+
+
+
+void add_tests(UnitTestDatabase& database){
+    AbsFFT::add_tests(database);
+    AudioChannelInterleave::add_tests(database);
+    AudioChannelMixer::add_tests(database);
+    AudioPipeline::add_tests(database);
+    AudioResampler::add_tests(database);
+    AudioStreamConverter::add_tests(database);
+    add_tests_BinaryMatrix(database);
+    add_tests_ImageFilters(database);
+    add_tests_ImageFilter_RGB32_Euclidean(database);
+    add_tests_ImageScaleBrightness(database);
+    add_tests_ImageStats(database);
+    ScaleInvariantMatrixMatch::add_tests(database);
+    SpikeConvolution::add_tests(database);
+    add_tests_Waterfill(database);
+}
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/Kernels/Kernels_Tests.h b/SerialPrograms/Source/Kernels/Kernels_Tests.h
new file mode 100644
index 0000000000..8fe4f0123f
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/Kernels_Tests.h
@@ -0,0 +1,23 @@
+/*  Kernels Tests
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Kernels_Tests_H
+#define PokemonAutomation_Kernels_Tests_H
+
+#include "Common/Cpp/TestRunners/UnitTest.h"
+
+namespace PokemonAutomation{
+namespace Kernels{
+
+
+
+void add_tests(UnitTestDatabase& database);
+
+
+
+}
+}
+#endif
\ No newline at end of file
diff --git a/SerialPrograms/Source/Kernels/Kernels_arm64_NEON.h b/SerialPrograms/Source/Kernels/Kernels_arm64_NEON.h
new file mode 100644
index 0000000000..e8d4b03d6a
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/Kernels_arm64_NEON.h
@@ -0,0 +1,106 @@
+/*  Kernels (arm64 NEON)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Kernels_arm64_NEON_H
+#define PokemonAutomation_Kernels_arm64_NEON_H
+
+#include <stdint.h>
+#include <iostream>
+#include <arm_neon.h>
+#include "Common/Compiler.h"
+
+namespace PokemonAutomation{
+namespace Kernels{
+
+// Cout the four floats in float32x4_t, separated by " "
+inline static void print(const float32x4_t& x){
+    union{
+        float32x4_t v;
+        float s[4];
+    };
+    v = x;
+    for (int i = 0; i < 4; i++){
+        std::cout << s[i] << " ";
+    }
+    std::cout << std::endl;
+}
+
+// Cout the 16 uint8 in uint8x16_t, separated by " "
+inline static void print_u8(uint8x16_t x){
+    for (int i = 0; i < 16; i++){
+        std::cout << (int)x[i] << " ";
+    }
+    std::cout << std::endl;
+}
+
+// Cout the 8 uint16 in uint16x8_t, separated by " "
+inline static void print_u16(const uint16x8_t& x){
+    union{
+        uint16x8_t v;
+        uint16_t s[8];
+    };
+    v = x;
+    for (int i = 0; i < 8; i++){
+        std::cout << s[i] << " ";
+    }
+    std::cout << std::endl;
+}
+
+// Cout the 4 uint32 in uint32x4_t, separated by " "
+inline static void print_u32(const uint32x4_t& x){
+    union{
+        uint32x4_t v;
+        uint32_t s[4];
+    };
+    v = x;
+    for (int i = 0; i < 4; i++){
+        std::cout << s[i] << " ";
+    }
+    std::cout << std::endl;
+}
+
+// Cout the 2 uint64 in uint64x2_t, separated by " "
+inline static void print_u64(const uint64x2_t& x){
+    union{
+        uint64x2_t v;
+        uint64_t s[2];
+    };
+    v = x;
+    for (int i = 0; i < 2; i++){
+        std::cout << s[i] << " ";
+    }
+    std::cout << std::endl;
+}
+
+
+// Add all four uint32 together
+PA_FORCE_INLINE uint64_t reduce32_arm64_NEON(uint32x4_t x){
+    uint64_t ret = vgetq_lane_u32(x, 0);
+    ret += vgetq_lane_u32(x, 1);
+    ret += vgetq_lane_u32(x, 2);
+    ret += vgetq_lane_u32(x, 3);
+    return ret;
+}
+
+// Create a new uint64x2_t vector from the lower half of r0 and r1 (r1 portion on higher resulting bits),
+// and one new uint64x2_t vector from the upper half of them.
+// Assign r0 to the former, r1 to the letter.
+PA_FORCE_INLINE void transpose_u64_2x2_NEON(uint64x2_t& r0, uint64x2_t& r1){
+    uint64x1_t r0_l = vget_low_u64(r0);
+    uint64x1_t r1_l = vget_low_u64(r1);
+    uint64x1_t r0_h = vget_high_u64(r0);
+    uint64x1_t r1_h = vget_high_u64(r1);
+
+    r0 = vcombine_u64(r0_l, r1_l);
+    r1 = vcombine_u64(r0_h, r1_h);
+}
+
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Kernels/Kernels_x64_AVX2.h b/SerialPrograms/Source/Kernels/Kernels_x64_AVX2.h
index 91d1b55a3b..294e33f919 100644
--- a/SerialPrograms/Source/Kernels/Kernels_x64_AVX2.h
+++ b/SerialPrograms/Source/Kernels/Kernels_x64_AVX2.h
@@ -1,6 +1,6 @@
 /*  Kernels (x64 AVX2)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -8,12 +8,11 @@
 #define PokemonAutomation_Kernels_x64_AVX2_H
 
 #include <stdint.h>
+#include <iostream>
 #include <immintrin.h>
 #include "Common/Compiler.h"
 #include "Kernels_x64_SSE41.h"
 
-#include <iostream>
-
 namespace PokemonAutomation{
 namespace Kernels{
 
@@ -46,6 +45,17 @@ inline static void print_u16(const __m256i& x){
     }
     std::cout << std::endl;
 }
+inline static void print_s16(const __m256i& x){
+    union{
+        __m256i v;
+        int16_t s[16];
+    };
+    v = x;
+    for (int i = 0; i < 16; i++){
+        std::cout << s[i] << " ";
+    }
+    std::cout << std::endl;
+}
 inline static void print_u32(const __m256i& x){
     union{
         __m256i v;
@@ -57,6 +67,17 @@ inline static void print_u32(const __m256i& x){
     }
     std::cout << std::endl;
 }
+inline static void print_s32(const __m256i& x){
+    union{
+        __m256i v;
+        int32_t s[8];
+    };
+    v = x;
+    for (int i = 0; i < 8; i++){
+        std::cout << s[i] << " ";
+    }
+    std::cout << std::endl;
+}
 inline static void print_u64(const __m256i& x){
     union{
         __m256i v;
diff --git a/SerialPrograms/Source/Kernels/Kernels_x64_AVX512.h b/SerialPrograms/Source/Kernels/Kernels_x64_AVX512.h
index f5a51ca572..8fe47dd666 100644
--- a/SerialPrograms/Source/Kernels/Kernels_x64_AVX512.h
+++ b/SerialPrograms/Source/Kernels/Kernels_x64_AVX512.h
@@ -1,6 +1,6 @@
 /*  Kernels (x64 AVX512)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -8,11 +8,10 @@
 #define PokemonAutomation_Kernels_x64_AVX512_H
 
 #include <stdint.h>
+#include <iostream>
 #include <immintrin.h>
 #include "Common/Compiler.h"
 
-#include <iostream>
-
 namespace PokemonAutomation{
 namespace Kernels{
 
@@ -56,9 +55,21 @@ inline void print_u64(const __m512i& x){
     }
     std::cout << std::endl;
 }
+inline void print(const __m512& x){
+    union{
+        __m512 v;
+        float s[16];
+    };
+    v = x;
+    for (int i = 0; i < 16; i++){
+        std::cout << s[i] << " ";
+    }
+    std::cout << std::endl;
+}
 
 
 
+#ifndef _mm512_setr_epi16
 #define _mm512_setr_epi16(  \
     e00, e01, e02, e03, e04, e05, e06, e07, \
     e08, e09, e10, e11, e12, e13, e14, e15, \
@@ -71,6 +82,8 @@ inline void print_u64(const __m512i& x){
         (uint16_t)(e16) | ((uint32_t)(e17) << 16), (uint16_t)(e18) | ((uint32_t)(e19) << 16), (uint16_t)(e20) | ((uint32_t)(e21) << 16), (uint16_t)(e22) | ((uint32_t)(e23) << 16),  \
         (uint16_t)(e24) | ((uint32_t)(e25) << 16), (uint16_t)(e26) | ((uint32_t)(e27) << 16), (uint16_t)(e28) | ((uint32_t)(e29) << 16), (uint16_t)(e30) | ((uint32_t)(e31) << 16)   \
     )
+#endif
+#ifndef _mm512_setr_epi8
 #define _mm512_setr_epi8(   \
     e00, e01, e02, e03, e04, e05, e06, e07, \
     e08, e09, e10, e11, e12, e13, e14, e15, \
@@ -91,6 +104,7 @@ inline void print_u64(const __m512i& x){
         (uint8_t)(e48) | ((uint8_t)(e49) << 8), (uint8_t)(e50) | ((uint8_t)(e51) << 8), (uint8_t)(e52) | ((uint8_t)(e53) << 8), (uint8_t)(e54) | ((uint8_t)(e55) << 8), \
         (uint8_t)(e56) | ((uint8_t)(e57) << 8), (uint8_t)(e58) | ((uint8_t)(e59) << 8), (uint8_t)(e60) | ((uint8_t)(e61) << 8), (uint8_t)(e62) | ((uint8_t)(e63) << 8)  \
     )
+#endif
 
 
 
diff --git a/SerialPrograms/Source/Kernels/Kernels_x64_SSE41.h b/SerialPrograms/Source/Kernels/Kernels_x64_SSE41.h
index fc9af35b21..a0f3f957cb 100644
--- a/SerialPrograms/Source/Kernels/Kernels_x64_SSE41.h
+++ b/SerialPrograms/Source/Kernels/Kernels_x64_SSE41.h
@@ -1,6 +1,6 @@
 /*  Kernels (x64 SSE4.1)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -8,11 +8,10 @@
 #define PokemonAutomation_Kernels_x64_SSE41_H
 
 #include <stdint.h>
+#include <iostream>
 #include <smmintrin.h>
 #include "Common/Compiler.h"
 
-#include <iostream>
-
 namespace PokemonAutomation{
 namespace Kernels{
 
diff --git a/SerialPrograms/Source/Kernels/PartialWordAccess/Kernels_PartialWordAccess_arm64_NEON.h b/SerialPrograms/Source/Kernels/PartialWordAccess/Kernels_PartialWordAccess_arm64_NEON.h
new file mode 100644
index 0000000000..c98d93885c
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/PartialWordAccess/Kernels_PartialWordAccess_arm64_NEON.h
@@ -0,0 +1,138 @@
+/*  Partial Word Access (arm64 NEON)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Kernels_PartialWordAccess_arm64_NEON_H
+#define PokemonAutomation_Kernels_PartialWordAccess_arm64_NEON_H
+
+#include <stdint.h>
+#include <cstddef>
+#include <arm_neon.h>
+#include "Common/Compiler.h"
+
+namespace PokemonAutomation{
+namespace Kernels{
+
+
+// Used to load bytes of data to partially fill a SIMD 128-bit vector
+// This is useful for handling leftover bytes of data at the end of a loop.
+// Example usage: Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters_arm64_NEON.h
+// 
+class PartialWordAccess_arm64_NEON{
+public:
+    // create a mask with first `bytes` low bytes are all 1s
+    // If `bytes` is 3, then the returned vector is from low bytes to high bytes: [0xFF, 0xFF, 0xFF, 0, 0, 0, ..., 0]
+    PA_FORCE_INLINE static uint8x16_t create_front_mask(size_t bytes){
+        PA_ALIGN_STRUCT(16) uint8_t bytes_values[16] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15};
+        const uint8x16_t seq_u8x16 = vld1q_u8(bytes_values);
+        return vcgtq_u8(vdupq_n_u8((uint8_t)bytes), seq_u8x16);
+    }
+
+    // How many bytes of data to load. Allow at most 16 bytes.
+    PA_FORCE_INLINE PartialWordAccess_arm64_NEON(size_t bytes)
+        : m_shift(16 - bytes)
+    {
+        PA_ALIGN_STRUCT(16) uint8_t bytes_values[16] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15};
+        const uint8x16_t seq_u8x16 = vld1q_u8(bytes_values);
+        // If `bytes` is 3, then `m_front_mask` is from low bytes to high bytes: [0xFF, 0xFF, 0xFF, 0, 0, 0, ..., 0]
+        m_front_mask = vcgtq_u8(vdupq_n_u8((uint8_t)bytes), seq_u8x16);
+        // If `bytes` is 3, then `m_back_mask` is from low bytes to high bytes: [0xFF, 0xFF, 0xFF, ... 0xFF, 0, 0, 0]
+        m_back_mask = vcgtq_u8(vdupq_n_u8((uint8_t)m_shift), seq_u8x16);
+
+        // If `bytes` is 3, then `m_shift_front` is from low bytes to high bytes: [13, 14, 15, 16, 17, ..., 28]
+        m_shift_front = vaddq_u8(vdupq_n_u8(uint8_t(m_shift)), seq_u8x16);
+
+        // IF `bytes` is 3, then `m_shift_back` is from low bytes to high bytes: [243, 244, 245,... 0, 1, 2]
+        m_shift_back = vsubq_u8(seq_u8x16, vdupq_n_u8((uint8_t)m_shift));
+    }
+
+    // load() function that does not read past end of buffer
+    // so it read some in front of `ptr`
+    // return the loaded partial word data and store at lower bytes of returned uint8x16_t
+    PA_FORCE_INLINE uint8x16_t load_int_no_read_past_end(const void* ptr) const{
+        // In `x` the actual data we want, `ptr` to `ptr + bytes`, is at the higher bits
+        uint8x16_t x = vld1q_u8((const uint8_t*)ptr - m_shift);
+        // Use a table lookup command:
+        // for each uint8 in the result, ret_u8[i], get the index from `m_shift_front`: m_shift_front[i]
+        // use the value of m_shift_front[i] as an index to get a value in x:
+        // ret_u8[i] = x[m_shift_front[i]]
+        // since `m_shift_front` stores [`16-bytes`, `16-bytes+1`, `16-bytes+2`, ...]
+        // the resulting operation is to shift the bytes in x to the lower bytes by `16-bytes` bytes.
+        // For the index values >= 16 in m_shift_front[i], `vqtbl1q_u8()` returns 0.
+        return vqtbl1q_u8(x, m_shift_front);
+    }
+    // load() function that reads past end of buffer
+    // return the loaded partial word data and store at lower bytes of returned uint8x16_t
+    PA_FORCE_INLINE uint8x16_t load_int_no_read_before_ptr(const void* ptr) const{
+        uint8x16_t x = vld1q_u8((const uint8_t*)ptr);
+        return vandq_u8(x, m_front_mask);
+    }
+    // load() function that does not read past end of buffer
+    // so it read some in front of `ptr`
+    // return the loaded partial word data and store at lower bytes of returned float32x4_t
+    PA_FORCE_INLINE float32x4_t load_f32_no_read_past_end(const void* ptr) const{
+        return vreinterpretq_f32_u8(load_int_no_read_past_end(ptr));
+    }
+    // load() function that reads past end of buffer
+    // return the loaded partial word data and store at lower bytes of returned float32x4_t
+    PA_FORCE_INLINE float32x4_t load_f32_no_read_before_ptr(const void* ptr) const{
+        return vreinterpretq_f32_u8(load_int_no_read_past_end(ptr));
+    }
+
+    // Load only `bytes` of bytes from `ptr` and place them at the lower end of of the
+    // returned uint8x16_t.
+    // `bytes` is defined at the constructor of `PartialWordAccess_arm64_NEON`.
+    //
+    // Note: to be efficient, we read an entire 16-byte memory on this partial word.
+    // This is a hack as it may read outside of the memory we allocate to the buffer of
+    // `ptr`, but we assume here the buffer is defined inside our pre-allocated
+    // 4K-bytes-aligned memory block. So as long as we don't read past a 4K byte page,
+    // we are fine.
+    // Note OS allocates memory by groups of 4K bytes, too. So it could still work fine
+    // when not run on our pre-allocated memory block.
+    PA_FORCE_INLINE uint8x16_t load(const void* ptr) const{
+        const void* end = (const char*)ptr + 16;
+        if (((size_t)end & 4095) < 16){ // if we are about to read past a page
+            // Call load function that does not read past page
+            return load_int_no_read_past_end(ptr);
+        }else{
+            // Call load function that reads past end of the data buffer where `ptr` is
+            // from.
+            return load_int_no_read_before_ptr(ptr);
+        }
+    }
+
+    // store() function that does not read past end of buffer
+    // so it read some in front of `ptr` and save them back into buffer
+    PA_FORCE_INLINE void store_int_no_past_end(void* ptr, uint8x16_t x) const{
+        uint8x16_t v = vld1q_u8((const uint8_t*)ptr - m_shift);
+        // use table lookup to shift bytes in x to higher bytes by `bytes`
+        x = vqtbl1q_u8(x, m_shift_back);
+        // bit select intrinsic: 
+        // vbslq_u8(a, b, c), for 1-bits in a, choose b; for 0-bits in a, choose c
+        // Returned `merged` contains the pre-ptr data in the buffer, and partial word in `x`.
+        uint8x16_t merged = vbslq_u8(m_back_mask, v, x);
+        vst1q_u8((uint8_t*)ptr - m_shift, merged);
+    }
+    // store() function that does not read past end of buffer
+    // so it read some in front of `ptr` and save them back into buffer
+    PA_FORCE_INLINE void store_f32_no_past_end(void* ptr, float32x4_t x) const{
+        store_int_no_past_end(ptr, vreinterpretq_u8_f32(x));
+    }
+
+private:
+    size_t m_shift;
+    // mask of which bytes are occupied by the loaded data
+    uint8x16_t m_front_mask;
+    uint8x16_t m_back_mask;
+    uint8x16_t m_shift_front;
+    uint8x16_t m_shift_back;
+};
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Kernels/PartialWordAccess/Kernels_PartialWordAccess_x64_AVX2.h b/SerialPrograms/Source/Kernels/PartialWordAccess/Kernels_PartialWordAccess_x64_AVX2.h
index 018f50b440..602896c001 100644
--- a/SerialPrograms/Source/Kernels/PartialWordAccess/Kernels_PartialWordAccess_x64_AVX2.h
+++ b/SerialPrograms/Source/Kernels/PartialWordAccess/Kernels_PartialWordAccess_x64_AVX2.h
@@ -1,6 +1,6 @@
 /*  Partial Word Access (x64 AVX2)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -25,13 +25,16 @@ class PartialWordAccess32_x64_AVX2{
         );
     }
 
-    PA_FORCE_INLINE __m256i load_i32(const void* ptr){
+    PA_FORCE_INLINE __m256i mask() const{
+        return m_mask;
+    }
+    PA_FORCE_INLINE __m256i load_i32(const void* ptr) const{
         return _mm256_maskload_epi32((const int*)ptr, m_mask);
     }
-    PA_FORCE_INLINE __m256 load_f32(const void* ptr){
+    PA_FORCE_INLINE __m256 load_f32(const void* ptr) const{
         return _mm256_maskload_ps((const float*)ptr, m_mask);
     }
-    PA_FORCE_INLINE void store(const void* ptr, __m256i x){
+    PA_FORCE_INLINE void store(const void* ptr, __m256i x) const{
         _mm256_maskstore_epi32((int*)ptr, m_mask, x);
     }
 
diff --git a/SerialPrograms/Source/Kernels/PartialWordAccess/Kernels_PartialWordAccess_x64_SSE41.h b/SerialPrograms/Source/Kernels/PartialWordAccess/Kernels_PartialWordAccess_x64_SSE41.h
index 97feb23d56..01689012fc 100644
--- a/SerialPrograms/Source/Kernels/PartialWordAccess/Kernels_PartialWordAccess_x64_SSE41.h
+++ b/SerialPrograms/Source/Kernels/PartialWordAccess/Kernels_PartialWordAccess_x64_SSE41.h
@@ -1,6 +1,6 @@
 /*  Partial Word Access (x64 SSE4.1)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/Kernels/ScaleInvariantMatrixMatch/Kernels_ScaleInvariantMatrixMatch.cpp b/SerialPrograms/Source/Kernels/ScaleInvariantMatrixMatch/Kernels_ScaleInvariantMatrixMatch.cpp
index 7b4f36d5aa..576b6ea5ff 100644
--- a/SerialPrograms/Source/Kernels/ScaleInvariantMatrixMatch/Kernels_ScaleInvariantMatrixMatch.cpp
+++ b/SerialPrograms/Source/Kernels/ScaleInvariantMatrixMatch/Kernels_ScaleInvariantMatrixMatch.cpp
@@ -1,11 +1,11 @@
 /*  Scale Invariant Matrix Match
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include "Common/Cpp/Exceptions.h"
 #include "Common/Cpp/CpuId/CpuId.h"
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
 
 namespace PokemonAutomation{
 namespace Kernels{
@@ -16,11 +16,13 @@ float compute_scale_Default         (size_t width, size_t height, float const* c
 float compute_scale_min4_x86_SSE    (size_t width, size_t height, float const* const* A, float const* const* T);
 float compute_scale_min8_x86_AVX2   (size_t width, size_t height, float const* const* A, float const* const* T);
 float compute_scale_min16_x86_AVX512(size_t width, size_t height, float const* const* A, float const* const* T);
+float compute_scale_min4_arm64_NEON(size_t width, size_t height, float const* const* A, float const* const* T);
 
 float compute_scale_Default         (size_t width, size_t height, float const* const* A, float const* const* TW, float const* const* W);
 float compute_scale_min4_x86_SSE    (size_t width, size_t height, float const* const* A, float const* const* TW, float const* const* W);
 float compute_scale_min8_x86_AVX2   (size_t width, size_t height, float const* const* A, float const* const* TW, float const* const* W);
 float compute_scale_min16_x86_AVX512(size_t width, size_t height, float const* const* A, float const* const* TW, float const* const* W);
+float compute_scale_min4_arm64_NEON(size_t width, size_t height, float const* const* A, float const* const* TW, float const* const* W);
 
 
 float compute_scale(
@@ -42,6 +44,11 @@ float compute_scale(
     if (width >= 4 && CPU_CAPABILITY_CURRENT.OK_08_Nehalem){
         return compute_scale_min4_x86_SSE(width, height, A, T);
     }
+#endif
+#ifdef PA_AutoDispatch_arm64_20_M1
+    if (width >= 4 && CPU_CAPABILITY_CURRENT.OK_M1){
+        return compute_scale_min4_arm64_NEON(width, height, A, T);
+    }
 #endif
     return compute_scale_Default(width, height, A, T);
 }
@@ -65,6 +72,11 @@ float compute_scale(
     if (width >= 4 && CPU_CAPABILITY_CURRENT.OK_08_Nehalem){
         return compute_scale_min4_x86_SSE(width, height, A, TW, W);
     }
+#endif
+#ifdef PA_AutoDispatch_arm64_20_M1
+    if (width >= 4 && CPU_CAPABILITY_CURRENT.OK_M1){
+        return compute_scale_min4_arm64_NEON(width, height, A, TW, W);
+    }
 #endif
     return compute_scale_Default(width, height, A, TW, W);
 }
@@ -75,11 +87,18 @@ float compute_error_Default         (size_t width, size_t height, float scale, f
 float compute_error_min4_x86_SSE    (size_t width, size_t height, float scale, float const* const* A, float const* const* T);
 float compute_error_min8_x86_AVX2   (size_t width, size_t height, float scale, float const* const* A, float const* const* T);
 float compute_error_min16_x86_AVX512(size_t width, size_t height, float scale, float const* const* A, float const* const* T);
+float compute_error_min4_arm64_NEON(size_t width, size_t height, float scale, float const* const* A, float const* const* T);
 
 float compute_error_Default         (size_t width, size_t height, float scale, float const* const* A, float const* const* TW, float const* const* W);
 float compute_error_min4_x86_SSE    (size_t width, size_t height, float scale, float const* const* A, float const* const* TW, float const* const* W);
 float compute_error_min8_x86_AVX2   (size_t width, size_t height, float scale, float const* const* A, float const* const* TW, float const* const* W);
 float compute_error_min16_x86_AVX512(size_t width, size_t height, float scale, float const* const* A, float const* const* TW, float const* const* W);
+float compute_error_min4_arm64_NEON(size_t width, size_t height, float scale, float const* const* A, float const* const* TW, float const* const* W);
+
+void add_tests_x86_SSE(UnitTestDatabase& database);
+void add_tests_x86_AVX2(UnitTestDatabase& database);
+void add_tests_x86_AVX512(UnitTestDatabase& database);
+void add_tests_arm64_NEON(UnitTestDatabase& database);
 
 float compute_error(
     size_t width, size_t height,
@@ -101,6 +120,11 @@ float compute_error(
     if (width >= 4 && CPU_CAPABILITY_CURRENT.OK_08_Nehalem){
         return compute_error_min4_x86_SSE(width, height, scale, A, T);
     }
+#endif
+#ifdef PA_AutoDispatch_arm64_20_M1
+    if (width >= 4 && CPU_CAPABILITY_CURRENT.OK_M1){
+        return compute_error_min4_arm64_NEON(width, height, scale, A, T);
+    }
 #endif
     return compute_error_Default(width, height, scale, A, T);
 }
@@ -125,11 +149,46 @@ float compute_error(
     if (width >= 4 && CPU_CAPABILITY_CURRENT.OK_08_Nehalem){
         return compute_error_min4_x86_SSE(width, height, scale, A, TW, W);
     }
+#endif
+#ifdef PA_AutoDispatch_arm64_20_M1
+    if (width >= 4 && CPU_CAPABILITY_CURRENT.OK_M1){
+        return compute_error_min4_arm64_NEON(width, height, scale, A, TW, W);
+    }
 #endif
     return compute_error_Default(width, height, scale, A, TW, W);
 }
 
 
+// 
+//  Register the tests for the ISAs this binary can run. Each ISA checks its
+//  results against the Default path, which is the source of truth, so the
+//  Default path itself gets no tests.
+// 
+void add_tests(UnitTestDatabase& database){
+#ifdef PA_AutoDispatch_x64_08_Nehalem
+    if (CPU_CAPABILITY_CURRENT.OK_08_Nehalem){
+        add_tests_x86_SSE(database);
+    }
+#endif
+#ifdef PA_AutoDispatch_x64_13_Haswell
+    if (CPU_CAPABILITY_CURRENT.OK_13_Haswell){
+        add_tests_x86_AVX2(database);
+    }
+#endif
+#ifdef PA_AutoDispatch_x64_17_Skylake
+    if (CPU_CAPABILITY_CURRENT.OK_17_Skylake){
+        add_tests_x86_AVX512(database);
+    }
+#endif
+
+#ifdef PA_AutoDispatch_arm64_20_M1
+    if (CPU_CAPABILITY_CURRENT.OK_M1){
+        add_tests_arm64_NEON(database);
+    }
+#endif
+}
+
+
 
 
 
diff --git a/SerialPrograms/Source/Kernels/ScaleInvariantMatrixMatch/Kernels_ScaleInvariantMatrixMatch.h b/SerialPrograms/Source/Kernels/ScaleInvariantMatrixMatch/Kernels_ScaleInvariantMatrixMatch.h
index 4c82cb460f..b68881b454 100644
--- a/SerialPrograms/Source/Kernels/ScaleInvariantMatrixMatch/Kernels_ScaleInvariantMatrixMatch.h
+++ b/SerialPrograms/Source/Kernels/ScaleInvariantMatrixMatch/Kernels_ScaleInvariantMatrixMatch.h
@@ -1,6 +1,6 @@
 /*  Scale Invariant Matrix Match
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -8,6 +8,9 @@
 #define PokemonAutomation_Kernels_ScaleInvariantMatrixMatch_H
 
 namespace PokemonAutomation{
+
+class UnitTestDatabase;
+
 namespace Kernels{
 namespace ScaleInvariantMatrixMatch{
 
@@ -54,6 +57,8 @@ float compute_error(
 
 
 
+void add_tests(UnitTestDatabase& database);
+
 
 
 }
diff --git a/SerialPrograms/Source/Kernels/ScaleInvariantMatrixMatch/Kernels_ScaleInvariantMatrixMatch_Core_Default.cpp b/SerialPrograms/Source/Kernels/ScaleInvariantMatrixMatch/Kernels_ScaleInvariantMatrixMatch_Core_Default.cpp
index 3ed86f2ba2..f75952a567 100644
--- a/SerialPrograms/Source/Kernels/ScaleInvariantMatrixMatch/Kernels_ScaleInvariantMatrixMatch_Core_Default.cpp
+++ b/SerialPrograms/Source/Kernels/ScaleInvariantMatrixMatch/Kernels_ScaleInvariantMatrixMatch_Core_Default.cpp
@@ -1,6 +1,6 @@
 /*  Scale Invariant Matrix Match (Default)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/Kernels/ScaleInvariantMatrixMatch/Kernels_ScaleInvariantMatrixMatch_Core_arm64_NEON.cpp b/SerialPrograms/Source/Kernels/ScaleInvariantMatrixMatch/Kernels_ScaleInvariantMatrixMatch_Core_arm64_NEON.cpp
new file mode 100644
index 0000000000..9609c1a9a2
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/ScaleInvariantMatrixMatch/Kernels_ScaleInvariantMatrixMatch_Core_arm64_NEON.cpp
@@ -0,0 +1,200 @@
+/*  Scale Invariant Matrix Match (arm64 NEON)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifdef PA_AutoDispatch_arm64_20_M1
+
+#include <arm_neon.h>
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "Kernels_ScaleInvariantMatrixMatch_Routines.h"
+#include "Kernels_ScaleInvariantMatrixMatch_TestInfra.h"
+
+namespace PokemonAutomation{
+namespace Kernels{
+namespace ScaleInvariantMatrixMatch{
+
+
+struct Context_arm64_NEON{
+    using vtype = float32x4_t;
+
+    static PA_FORCE_INLINE vtype vzero(){
+        return vdupq_n_f32(0.0f);
+    }
+    static PA_FORCE_INLINE vtype vset(float a){
+        return vdupq_n_f32(a);
+    }
+    static PA_FORCE_INLINE vtype vadd(vtype a, vtype b){
+        return vaddq_f32(a, b);
+    }
+    static PA_FORCE_INLINE vtype vmul(vtype a, vtype b){
+        return vmulq_f32(a, b);
+    }
+    static PA_FORCE_INLINE vtype vpma(vtype a, vtype b, vtype c){
+        return vfmaq_f32(c, a, b);
+    }
+    static PA_FORCE_INLINE vtype vpms(vtype a, vtype b, vtype c){
+        return vfmsq_f32(c, a, b);
+    }
+    static PA_FORCE_INLINE float vreduce(vtype a){
+        return vaddvq_f32(a);
+    }
+
+    //
+    //  "ptr" points `length` floats before the row start (the caller shifted
+    //  it back). Load the vector starting at the row start itself and zero
+    //  the last "length" lanes: those row elements are re-counted by the
+    //  next vector (the pointer advances past them), and loading at the row
+    //  start keeps every read in-bounds (the dispatcher only routes rows of
+    //  at least 4 floats to this path, so the 16-byte load stays inside the
+    //  row). No back-read, no read past the end.
+    //
+    static PA_FORCE_INLINE vtype load_back(const float* ptr, size_t length){
+        const float zero = 0.0f;
+        vtype out = vld1q_f32(ptr + length);
+        if (length > 0){
+            out = vld1q_lane_f32(&zero, out, 3);
+        }
+        if (length > 1){
+            out = vld1q_lane_f32(&zero, out, 2);
+        }
+        if (length > 2){
+            out = vld1q_lane_f32(&zero, out, 1);
+        }
+        return out;
+    }
+
+    //
+    //  "ptr" is valid for exactly "length" floats (1..3): insert them one
+    //  lane at a time into a zeroed vector, so there is no out-of-bounds
+    //  read in either direction.
+    //
+    static PA_FORCE_INLINE vtype load_front(const float* ptr, size_t length){
+        vtype out = vdupq_n_f32(0.0f);
+        out = vld1q_lane_f32(ptr, out, 0);
+        if (length > 1){
+            out = vld1q_lane_f32(ptr + 1, out, 1);
+        }
+        if (length > 2){
+            out = vld1q_lane_f32(ptr + 2, out, 2);
+        }
+        return out;
+    }
+
+    static PA_FORCE_INLINE void load2_partial_back(
+        size_t length,
+        vtype& A, const void* ptrA,
+        vtype& B, const void* ptrB
+    ){
+        A = load_back((const float*)ptrA, length);
+        B = load_back((const float*)ptrB, length);
+    }
+    static PA_FORCE_INLINE void load3_partial_back(
+        size_t length,
+        vtype& A, const void* ptrA,
+        vtype& B, const void* ptrB,
+        vtype& C, const void* ptrC
+    ){
+        A = load_back((const float*)ptrA, length);
+        B = load_back((const float*)ptrB, length);
+        C = load_back((const float*)ptrC, length);
+    }
+    static PA_FORCE_INLINE void load2_partial_front(
+        size_t length,
+        vtype& A, const void* ptrA,
+        vtype& B, const void* ptrB
+    ){
+        A = load_front((const float*)ptrA, length);
+        B = load_front((const float*)ptrB, length);
+    }
+    static PA_FORCE_INLINE void load3_partial_front(
+        size_t length,
+        vtype& A, const void* ptrA,
+        vtype& B, const void* ptrB,
+        vtype& C, const void* ptrC
+    ){
+        A = load_front((const float*)ptrA, length);
+        B = load_front((const float*)ptrB, length);
+        C = load_front((const float*)ptrC, length);
+    }
+};
+
+
+
+float compute_scale_min4_arm64_NEON(
+    size_t width, size_t height,
+    float const* const* A,
+    float const* const* T
+){
+    return compute_scale<SumATA2<Context_arm64_NEON>>(width, height, A, T);
+}
+float compute_scale_min4_arm64_NEON(
+    size_t width, size_t height,
+    float const* const* A,
+    float const* const* TW,
+    float const* const* W
+){
+    return compute_scale<SumATA2<Context_arm64_NEON>>(width, height, A, TW, W);
+}
+float compute_error_min4_arm64_NEON(
+    size_t width, size_t height,
+    float scale,
+    float const* const* A,
+    float const* const* T
+){
+    return compute_error<SumError<Context_arm64_NEON>>(width, height, scale, A, T);
+}
+float compute_error_min4_arm64_NEON(
+    size_t width, size_t height,
+    float scale,
+    float const* const* A,
+    float const* const* TW,
+    float const* const* W
+){
+    return compute_error<SumError<Context_arm64_NEON>>(width, height, scale, A, TW, W);
+}
+
+
+
+float compute_scale_Default(size_t width, size_t height, float const* const* A, float const* const* T);
+float compute_scale_Default(size_t width, size_t height, float const* const* A, float const* const* TW, float const* const* W);
+float compute_error_Default(size_t width, size_t height, float scale, float const* const* A, float const* const* T);
+float compute_error_Default(size_t width, size_t height, float scale, float const* const* A, float const* const* TW, float const* const* W);
+
+class Test_arm64_NEON : public Test{
+public:
+    Test_arm64_NEON(size_t width, size_t height, bool use_weights)
+        : Test(
+            "arm64_NEON",
+            width, height,
+            use_weights,
+            compute_scale_Default,
+            compute_scale_min4_arm64_NEON,
+            compute_scale_Default,
+            compute_scale_min4_arm64_NEON,
+            compute_error_Default,
+            compute_error_min4_arm64_NEON,
+            compute_error_Default,
+            compute_error_min4_arm64_NEON
+        )
+    {}
+};
+void add_tests_arm64_NEON(UnitTestDatabase& database){
+    //  The kernel requires a minimum row width (the partial-row loads span up to
+    //  a full vector); sizes below that are not registered for this ISA.
+    for (size_t i = 0; i < sizeof(kTestSizes) / sizeof(kTestSizes[0]); i++){
+        if (kTestSizes[i][0] < 4){
+            continue;
+        }
+        database.add<Test_arm64_NEON>(kTestSizes[i][0], kTestSizes[i][1], false);
+        database.add<Test_arm64_NEON>(kTestSizes[i][0], kTestSizes[i][1], true);
+    }
+}
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Kernels/ScaleInvariantMatrixMatch/Kernels_ScaleInvariantMatrixMatch_Core_x86_AVX2.cpp b/SerialPrograms/Source/Kernels/ScaleInvariantMatrixMatch/Kernels_ScaleInvariantMatrixMatch_Core_x86_AVX2.cpp
index 58eb8fd823..41b03b7aba 100644
--- a/SerialPrograms/Source/Kernels/ScaleInvariantMatrixMatch/Kernels_ScaleInvariantMatrixMatch_Core_x86_AVX2.cpp
+++ b/SerialPrograms/Source/Kernels/ScaleInvariantMatrixMatch/Kernels_ScaleInvariantMatrixMatch_Core_x86_AVX2.cpp
@@ -1,15 +1,17 @@
 /*  Scale Invariant Matrix Match (x86 FMA3)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifdef PA_AutoDispatch_x64_13_Haswell
 
 #include <immintrin.h>
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
 #include "Kernels/Kernels_x64_AVX2.h"
 #include "Kernels/PartialWordAccess/Kernels_PartialWordAccess_x64_AVX2.h"
 #include "Kernels_ScaleInvariantMatrixMatch_Routines.h"
+#include "Kernels_ScaleInvariantMatrixMatch_TestInfra.h"
 
 namespace PokemonAutomation{
 namespace Kernels{
@@ -126,6 +128,43 @@ float compute_error_min8_x86_AVX2(
 
 
 
+float compute_scale_Default(size_t width, size_t height, float const* const* A, float const* const* T);
+float compute_scale_Default(size_t width, size_t height, float const* const* A, float const* const* TW, float const* const* W);
+float compute_error_Default(size_t width, size_t height, float scale, float const* const* A, float const* const* T);
+float compute_error_Default(size_t width, size_t height, float scale, float const* const* A, float const* const* TW, float const* const* W);
+
+class Test_x86_AVX2 : public Test{
+public:
+    Test_x86_AVX2(size_t width, size_t height, bool use_weights)
+        : Test(
+            "x86_AVX2",
+            width, height,
+            use_weights,
+            compute_scale_Default,
+            compute_scale_min8_x86_AVX2,
+            compute_scale_Default,
+            compute_scale_min8_x86_AVX2,
+            compute_error_Default,
+            compute_error_min8_x86_AVX2,
+            compute_error_Default,
+            compute_error_min8_x86_AVX2
+        )
+    {}
+};
+void add_tests_x86_AVX2(UnitTestDatabase& database){
+    //  The kernel requires a minimum row width (the partial-row loads span up to
+    //  a full vector); sizes below that are not registered for this ISA.
+    for (size_t i = 0; i < sizeof(kTestSizes) / sizeof(kTestSizes[0]); i++){
+        if (kTestSizes[i][0] < 8){
+            continue;
+        }
+        database.add<Test_x86_AVX2>(kTestSizes[i][0], kTestSizes[i][1], false);
+        database.add<Test_x86_AVX2>(kTestSizes[i][0], kTestSizes[i][1], true);
+    }
+}
+
+
+
 }
 }
 }
diff --git a/SerialPrograms/Source/Kernels/ScaleInvariantMatrixMatch/Kernels_ScaleInvariantMatrixMatch_Core_x86_AVX512.cpp b/SerialPrograms/Source/Kernels/ScaleInvariantMatrixMatch/Kernels_ScaleInvariantMatrixMatch_Core_x86_AVX512.cpp
index c892226745..c2aa680c84 100644
--- a/SerialPrograms/Source/Kernels/ScaleInvariantMatrixMatch/Kernels_ScaleInvariantMatrixMatch_Core_x86_AVX512.cpp
+++ b/SerialPrograms/Source/Kernels/ScaleInvariantMatrixMatch/Kernels_ScaleInvariantMatrixMatch_Core_x86_AVX512.cpp
@@ -1,13 +1,15 @@
 /*  Scale Invariant Matrix Match (x86 AVX512)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifdef PA_AutoDispatch_x64_17_Skylake
 
 #include <immintrin.h>
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
 #include "Kernels_ScaleInvariantMatrixMatch_Routines.h"
+#include "Kernels_ScaleInvariantMatrixMatch_TestInfra.h"
 
 namespace PokemonAutomation{
 namespace Kernels{
@@ -118,6 +120,43 @@ float compute_error_min16_x86_AVX512(
 
 
 
+float compute_scale_Default(size_t width, size_t height, float const* const* A, float const* const* T);
+float compute_scale_Default(size_t width, size_t height, float const* const* A, float const* const* TW, float const* const* W);
+float compute_error_Default(size_t width, size_t height, float scale, float const* const* A, float const* const* T);
+float compute_error_Default(size_t width, size_t height, float scale, float const* const* A, float const* const* TW, float const* const* W);
+
+class Test_x86_AVX512 : public Test{
+public:
+    Test_x86_AVX512(size_t width, size_t height, bool use_weights)
+        : Test(
+            "x86_AVX512",
+            width, height,
+            use_weights,
+            compute_scale_Default,
+            compute_scale_min16_x86_AVX512,
+            compute_scale_Default,
+            compute_scale_min16_x86_AVX512,
+            compute_error_Default,
+            compute_error_min16_x86_AVX512,
+            compute_error_Default,
+            compute_error_min16_x86_AVX512
+        )
+    {}
+};
+void add_tests_x86_AVX512(UnitTestDatabase& database){
+    //  The kernel requires a minimum row width (the partial-row loads span up to
+    //  a full vector); sizes below that are not registered for this ISA.
+    for (size_t i = 0; i < sizeof(kTestSizes) / sizeof(kTestSizes[0]); i++){
+        if (kTestSizes[i][0] < 16){
+            continue;
+        }
+        database.add<Test_x86_AVX512>(kTestSizes[i][0], kTestSizes[i][1], false);
+        database.add<Test_x86_AVX512>(kTestSizes[i][0], kTestSizes[i][1], true);
+    }
+}
+
+
+
 }
 }
 }
diff --git a/SerialPrograms/Source/Kernels/ScaleInvariantMatrixMatch/Kernels_ScaleInvariantMatrixMatch_Core_x86_SSE.cpp b/SerialPrograms/Source/Kernels/ScaleInvariantMatrixMatch/Kernels_ScaleInvariantMatrixMatch_Core_x86_SSE.cpp
index 8031c1f5a8..18d0d2b2c7 100644
--- a/SerialPrograms/Source/Kernels/ScaleInvariantMatrixMatch/Kernels_ScaleInvariantMatrixMatch_Core_x86_SSE.cpp
+++ b/SerialPrograms/Source/Kernels/ScaleInvariantMatrixMatch/Kernels_ScaleInvariantMatrixMatch_Core_x86_SSE.cpp
@@ -1,15 +1,17 @@
 /*  Scale Invariant Matrix Match (x86 SSE)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifdef PA_AutoDispatch_x64_08_Nehalem
 
 #include <immintrin.h>
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
 #include "Kernels/Kernels_x64_SSE41.h"
 #include "Kernels/PartialWordAccess/Kernels_PartialWordAccess_x64_SSE41.h"
 #include "Kernels_ScaleInvariantMatrixMatch_Routines.h"
+#include "Kernels_ScaleInvariantMatrixMatch_TestInfra.h"
 
 namespace PokemonAutomation{
 namespace Kernels{
@@ -120,6 +122,43 @@ float compute_error_min4_x86_SSE(
 
 
 
+float compute_scale_Default(size_t width, size_t height, float const* const* A, float const* const* T);
+float compute_scale_Default(size_t width, size_t height, float const* const* A, float const* const* TW, float const* const* W);
+float compute_error_Default(size_t width, size_t height, float scale, float const* const* A, float const* const* T);
+float compute_error_Default(size_t width, size_t height, float scale, float const* const* A, float const* const* TW, float const* const* W);
+
+class Test_x86_SSE : public Test{
+public:
+    Test_x86_SSE(size_t width, size_t height, bool use_weights)
+        : Test(
+            "x86_SSE",
+            width, height,
+            use_weights,
+            compute_scale_Default,
+            compute_scale_min4_x86_SSE,
+            compute_scale_Default,
+            compute_scale_min4_x86_SSE,
+            compute_error_Default,
+            compute_error_min4_x86_SSE,
+            compute_error_Default,
+            compute_error_min4_x86_SSE
+        )
+    {}
+};
+void add_tests_x86_SSE(UnitTestDatabase& database){
+    //  The kernel requires a minimum row width (the partial-row loads span up to
+    //  a full vector); sizes below that are not registered for this ISA.
+    for (size_t i = 0; i < sizeof(kTestSizes) / sizeof(kTestSizes[0]); i++){
+        if (kTestSizes[i][0] < 4){
+            continue;
+        }
+        database.add<Test_x86_SSE>(kTestSizes[i][0], kTestSizes[i][1], false);
+        database.add<Test_x86_SSE>(kTestSizes[i][0], kTestSizes[i][1], true);
+    }
+}
+
+
+
 }
 }
 }
diff --git a/SerialPrograms/Source/Kernels/ScaleInvariantMatrixMatch/Kernels_ScaleInvariantMatrixMatch_Routines.h b/SerialPrograms/Source/Kernels/ScaleInvariantMatrixMatch/Kernels_ScaleInvariantMatrixMatch_Routines.h
index 5edf4cb30e..d02feab14c 100644
--- a/SerialPrograms/Source/Kernels/ScaleInvariantMatrixMatch/Kernels_ScaleInvariantMatrixMatch_Routines.h
+++ b/SerialPrograms/Source/Kernels/ScaleInvariantMatrixMatch/Kernels_ScaleInvariantMatrixMatch_Routines.h
@@ -1,6 +1,6 @@
 /*  Scale Invariant Matrix Match Routines
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -22,8 +22,18 @@ struct SumATA2{
     using vtype = typename Context::vtype;
     static constexpr size_t VECTOR_LENGTH = sizeof(vtype) / sizeof(float);
 
-    vtype sum_AT = Context::vzero();
-    vtype sum_A2 = Context::vzero();
+    vtype sum_AT;
+    vtype sum_A2;
+
+    // An explicit default constructor is required: with only non-static data
+    // member initializers, the implicit default constructor does not zero the
+    // accumulators at -O0 on x86, leaving stale stack contents in the lanes
+    // (observed with gcc and Apple clang; the user-defined constructor of
+    // SumError initializes correctly under the same conditions).
+    PA_FORCE_INLINE SumATA2()
+        : sum_AT(Context::vzero())
+        , sum_A2(Context::vzero())
+    {}
 
     PA_FORCE_INLINE float scale() const{
         return Context::vreduce(sum_AT) / Context::vreduce(sum_A2);
@@ -39,7 +49,7 @@ struct SumATA2{
         vtype sum_at2 = Context::vzero();
         vtype sum_at3 = Context::vzero();
 
-        if (VECTOR_LENGTH > 1){
+        if constexpr (VECTOR_LENGTH > 1){
             size_t align = (size_t)T % (VECTOR_LENGTH * sizeof(float));
             if (align){
                 align /= sizeof(float);
@@ -95,11 +105,13 @@ struct SumATA2{
             ptrT += 1;
             length -= VECTOR_LENGTH;
         }
-        if (VECTOR_LENGTH > 1 && length){
-            vtype a0, t0;
-            Context::load2_partial_front(length, a0, ptrT, t0, ptrA);
-            sum_at0 = Context::vpma(a0, t0, sum_at0);
-            sum_as0 = Context::vpma(a0, a0, sum_as0);
+        if constexpr (VECTOR_LENGTH > 1){
+            if (length){
+                vtype a0, t0;
+                Context::load2_partial_front(length, a0, ptrA, t0, ptrT);
+                sum_at0 = Context::vpma(a0, t0, sum_at0);
+                sum_as0 = Context::vpma(a0, a0, sum_as0);
+            }
         }
 
         sum_A2 = Context::vadd(sum_A2, sum_as0);
@@ -115,7 +127,7 @@ struct SumATA2{
         vtype sum_at2 = Context::vzero();
         vtype sum_at3 = Context::vzero();
 
-        if (VECTOR_LENGTH > 1){
+        if constexpr (VECTOR_LENGTH > 1){
             size_t align = (size_t)TW % (VECTOR_LENGTH * sizeof(float));
             if (align){
                 align /= sizeof(float);
@@ -184,7 +196,7 @@ struct SumATA2{
         }
         if (length){
             vtype a0, t0, w0;
-            Context::load3_partial_front(length, a0, A, t0, TW, w0, W);
+            Context::load3_partial_front(length, a0, ptrA, t0, ptrT, w0, ptrW);
             a0 = Context::vmul(a0, w0);
             sum_as0 = Context::vpma(a0, a0, sum_as0);
             sum_at0 = Context::vpma(a0, t0, sum_at0);
@@ -203,10 +215,11 @@ struct SumError{
     static constexpr size_t VECTOR_LENGTH = sizeof(vtype) / sizeof(float);
 
     vtype scale;
-    vtype sum = Context::vzero();
+    vtype sum;
 
     PA_FORCE_INLINE SumError(float p_scale)
         : scale(Context::vset(p_scale))
+        , sum(Context::vzero())
     {}
 
     PA_FORCE_INLINE float sum_sqr() const{
@@ -219,7 +232,7 @@ struct SumError{
         vtype sum2 = Context::vzero();
         vtype sum3 = Context::vzero();
 
-        if (VECTOR_LENGTH > 1){
+        if constexpr (VECTOR_LENGTH > 1){
             size_t align = (size_t)T % (VECTOR_LENGTH * sizeof(float));
             if (align){
                 align /= sizeof(float);
@@ -269,7 +282,7 @@ struct SumError{
         }
         if (length){
             vtype a0, t0;
-            Context::load2_partial_front(length, a0, ptrT, t0, ptrA);
+            Context::load2_partial_front(length, a0, ptrA, t0, ptrT);
             a0 = Context::vpms(scale, a0, t0);
             sum0 = Context::vpma(a0, a0, sum0);
         }
@@ -282,7 +295,7 @@ struct SumError{
         vtype sum2 = Context::vzero();
         vtype sum3 = Context::vzero();
 
-        if (VECTOR_LENGTH > 1){
+        if constexpr (VECTOR_LENGTH > 1){
             size_t align = (size_t)TW % (VECTOR_LENGTH * sizeof(float));
             if (align){
                 align /= sizeof(float);
@@ -343,7 +356,7 @@ struct SumError{
         }
         if (length){
             vtype a0, t0, w0;
-            Context::load3_partial_front(length, a0, A, t0, TW, w0, W);
+            Context::load3_partial_front(length, a0, ptrA, t0, ptrT, w0, ptrW);
             a0 = Context::vmul(scale, a0);
             a0 = Context::vpms(a0, w0, t0);
             sum0 = Context::vpma(a0, a0, sum0);
diff --git a/SerialPrograms/Source/Kernels/ScaleInvariantMatrixMatch/Kernels_ScaleInvariantMatrixMatch_TestInfra.cpp b/SerialPrograms/Source/Kernels/ScaleInvariantMatrixMatch/Kernels_ScaleInvariantMatrixMatch_TestInfra.cpp
new file mode 100644
index 0000000000..a9596e374e
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/ScaleInvariantMatrixMatch/Kernels_ScaleInvariantMatrixMatch_TestInfra.cpp
@@ -0,0 +1,208 @@
+/*  Scale Invariant Matrix Match Test Infra
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <bit>
+#include <cmath>
+#include <cstdio>
+#include <random>
+#include "Common/Cpp/CancellableScope.h"
+#include "Common/Cpp/Containers/AlignedVector.tpp"
+#include "Common/Cpp/Containers/GuardPageBuffer.h"
+#include "Kernels_ScaleInvariantMatrixMatch_TestInfra.h"
+
+namespace PokemonAutomation{
+namespace Kernels{
+namespace ScaleInvariantMatrixMatch{
+
+
+
+//
+//  Head padding (in floats) before the first row of the matrices. The
+//  current ISAs do not read before a row start, but the padding keeps the
+//  first row away from the very start of the allocation in case a future
+//  ISA does (e.g. an SSE4.1-style back-read of up to VL - 1 floats).
+//
+static constexpr size_t HEAD_PAD = 16;
+//
+//  There is no tail padding: the last row ends right before a guard page,
+//  so a read past the end of the matrix faults on every run.
+//
+
+//
+//  A result passes if it is within 4096 ULPs of the Default result, or
+//  within 1e-4 of the natural magnitude of the accumulated sum. The
+//  absolute part covers near-zero results, where ULPs are far smaller
+//  than the accumulated rounding of a multi-million-term sum.
+//
+static constexpr uint64_t MAX_ULP_DIFF = 4096;
+static constexpr double ABS_TOLERANCE = 1e-4;
+
+static uint64_t ulp_distance(float a, float b){
+    //  Monotonic mapping of the float bits to a signed order.
+    auto U = [](float f) -> uint64_t{
+        int32_t i = std::bit_cast<int32_t>(f);
+        if (i >= 0)
+            return (uint64_t)(uint32_t)i + 0x80000000ull;
+        return (uint64_t)(uint32_t)(-i);
+    };
+    uint64_t x = U(a);
+    uint64_t y = U(b);
+    return x > y ? x - y : y - x;
+}
+static bool within_tolerance(float x, float y, double magnitude){
+    if (x == y)
+        return true;
+    if (ulp_distance(x, y) <= MAX_ULP_DIFF)
+        return true;
+    return std::fabs((double)x - (double)y) <= ABS_TOLERANCE * std::fmax(1.0, magnitude);
+}
+
+
+
+Test::Test(
+    const std::string& arch_str,
+    size_t width, size_t height,
+    bool use_weights,
+    SimmFnScale scale0, SimmFnScale scale1,
+    SimmFnScaleW scaleW0, SimmFnScaleW scaleW1,
+    SimmFnError error0, SimmFnError error1,
+    SimmFnErrorW errorW0, SimmFnErrorW errorW1
+)
+    : UnitTest(
+        "Kernels::ScaleInvariantMatrixMatch - " + arch_str +
+        "(w=" + std::to_string(width) + ", h=" + std::to_string(height) +
+        (use_weights ? ", weights)" : ")")
+    )
+    , m_width(width)
+    , m_height(height)
+    , m_use_weights(use_weights)
+    , m_scale0(scale0)
+    , m_scale1(scale1)
+    , m_scaleW0(scaleW0)
+    , m_scaleW1(scaleW1)
+    , m_error0(error0)
+    , m_error1(error1)
+    , m_errorW0(errorW0)
+    , m_errorW1(errorW1)
+    {
+        //  The test allocates A and T, plus W and TW for the weighted variants:
+        //  2 or 4 matrices of width x height floats each (up to 16 MB).
+        m_memory = (uint64_t)width * (uint64_t)height * 4 * (use_weights ? 4 : 2);
+    }
+
+UnitTestResult Test::run(Logger& logger, CancellableScope& scope) const{
+    scope.throw_if_cancelled();
+    const size_t n = m_width * m_height;
+
+    //
+    //  Random data with a deterministic seed: A and T in [-1, 1], W in
+    //  [0, 1]. TW = T * W is precomputed with the same float rounding
+    //  that production uses.
+    //
+    //  Each matrix ends right before a guard page. The kernels align their
+    //  loads to T and step A and W by the same offset, so every matrix must
+    //  have the same alignment. Equal sizes give them that.
+    //
+    const size_t weighted_size = m_use_weights ? n + HEAD_PAD : 0;
+    GuardPageBuffer<float> A(n + HEAD_PAD);
+    GuardPageBuffer<float> T(n + HEAD_PAD);
+    AlignedVector<const float*> rowsA(m_height);
+    AlignedVector<const float*> rowsT(m_height);
+    GuardPageBuffer<float> W(weighted_size);
+    GuardPageBuffer<float> TW(weighted_size);
+    AlignedVector<const float*> rowsW;
+    AlignedVector<const float*> rowsTW;
+    if (m_use_weights){
+        rowsW = AlignedVector<const float*>(m_height);
+        rowsTW = AlignedVector<const float*>(m_height);
+    }
+
+    std::mt19937 generator((unsigned int)(m_width * 1000003u + m_height * 7919u + (m_use_weights ? 2654435761u : 0u)));
+    std::uniform_real_distribution<float> data_distribution(-1.0f, 1.0f);
+    std::uniform_real_distribution<float> weight_distribution(0.0f, 1.0f);
+    for (size_t c = HEAD_PAD; c < HEAD_PAD + n; c++){
+        A[c] = data_distribution(generator);
+        T[c] = data_distribution(generator);
+        if (m_use_weights){
+            W[c] = weight_distribution(generator);
+            TW[c] = T[c] * W[c];
+        }
+    }
+    for (size_t r = 0; r < m_height; r++){
+        rowsA[r] = A.data() + HEAD_PAD + r * m_width;
+        rowsT[r] = T.data() + HEAD_PAD + r * m_width;
+        if (m_use_weights){
+            rowsW[r] = W.data() + HEAD_PAD + r * m_width;
+            rowsTW[r] = TW.data() + HEAD_PAD + r * m_width;
+        }
+    }
+
+    char value0[32];
+    char value1[32];
+    auto mismatch = [&](const char* fn, float r0, float r1, double magnitude) -> UnitTestResult{
+        std::snprintf(value0, sizeof(value0), "%.9g", (double)r0);
+        std::snprintf(value1, sizeof(value1), "%.9g", (double)r1);
+        return std::string(fn) + ": default=" + value0 + " isa=" + value1 +
+            " (" + std::to_string(ulp_distance(r0, r1)) + " ulps, abs " +
+            std::to_string(std::fabs((double)r0 - (double)r1)) + " vs tolerance " +
+            std::to_string(ABS_TOLERANCE * std::fmax(1.0, magnitude)) + ")";
+    };
+
+    //
+    //  compute_scale: s = sum(A * T) / sum(A * A).
+    //
+    float s0 = m_scale0(m_width, m_height, rowsA.data(), rowsT.data());
+    float s1 = m_scale1(m_width, m_height, rowsA.data(), rowsT.data());
+    double mag = std::fmax(std::fabs((double)s0), std::fabs((double)s1));
+    if (!within_tolerance(s0, s1, mag))
+        return mismatch("compute_scale", s0, s1, mag);
+
+    //
+    //  compute_error at the Default scale: sum((s * A - T)^2).
+    //
+    double magE = 0.0;
+    for (size_t c = HEAD_PAD; c < HEAD_PAD + n; c++){
+        double m = std::fabs((double)s0 * (double)A[c]) + std::fabs((double)T[c]);
+        magE += m * m;
+    }
+    float e0 = m_error0(m_width, m_height, s0, rowsA.data(), rowsT.data());
+    float e1 = m_error1(m_width, m_height, s0, rowsA.data(), rowsT.data());
+    if (!within_tolerance(e0, e1, magE))
+        return mismatch("compute_error", e0, e1, magE);
+
+    if (m_use_weights){
+        //
+        //  Weighted compute_scale: s = sum((A * W) * (T * W)) / sum((A * W)^2).
+        //
+        float ws0 = m_scaleW0(m_width, m_height, rowsA.data(), rowsTW.data(), rowsW.data());
+        float ws1 = m_scaleW1(m_width, m_height, rowsA.data(), rowsTW.data(), rowsW.data());
+        double magW = std::fmax(std::fabs((double)ws0), std::fabs((double)ws1));
+        if (!within_tolerance(ws0, ws1, magW))
+            return mismatch("compute_scale (weighted)", ws0, ws1, magW);
+
+        //
+        //  Weighted compute_error at the Default weighted scale:
+        //  sum(((s * A) * W - T * W)^2).
+        //
+        double magWE = 0.0;
+        for (size_t c = HEAD_PAD; c < HEAD_PAD + n; c++){
+            double m = std::fabs((double)ws0 * (double)A[c]) + std::fabs((double)T[c]);
+            magWE += (double)W[c] * (double)W[c] * m * m;
+        }
+        float we0 = m_errorW0(m_width, m_height, ws0, rowsA.data(), rowsTW.data(), rowsW.data());
+        float we1 = m_errorW1(m_width, m_height, ws0, rowsA.data(), rowsTW.data(), rowsW.data());
+        if (!within_tolerance(we0, we1, magWE))
+            return mismatch("compute_error (weighted)", we0, we1, magWE);
+    }
+
+    return true;
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/Kernels/ScaleInvariantMatrixMatch/Kernels_ScaleInvariantMatrixMatch_TestInfra.h b/SerialPrograms/Source/Kernels/ScaleInvariantMatrixMatch/Kernels_ScaleInvariantMatrixMatch_TestInfra.h
new file mode 100644
index 0000000000..faa7ff1ec1
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/ScaleInvariantMatrixMatch/Kernels_ScaleInvariantMatrixMatch_TestInfra.h
@@ -0,0 +1,108 @@
+/*  Scale Invariant Matrix Match Test Infra
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Compiler.h"
+#include "Common/Cpp/TestRunners/UnitTest.h"
+
+#ifndef PokemonAutomation_Kernels_ScaleInvariantMatrixMatch_TestInfra_H
+#define PokemonAutomation_Kernels_ScaleInvariantMatrixMatch_TestInfra_H
+
+namespace PokemonAutomation{
+namespace Kernels{
+namespace ScaleInvariantMatrixMatch{
+
+
+
+//
+//  Signatures of compute_scale_Default(), compute_scale_min4_x86_SSE(), etc.
+//
+using SimmFnScale     = float (*)(size_t width, size_t height, float const* const* A, float const* const* T);
+using SimmFnScaleW    = float (*)(size_t width, size_t height, float const* const* A, float const* const* TW, float const* const* W);
+using SimmFnError     = float (*)(size_t width, size_t height, float scale, float const* const* A, float const* const* T);
+using SimmFnErrorW    = float (*)(size_t width, size_t height, float scale, float const* const* A, float const* const* TW, float const* const* W);
+
+
+
+//
+//  The width/height combinations the tests cover: 1x1 up to 1000x1000,
+//  divisible and undivisible by the vector lengths (4, 8, 16), including
+//  the short-row cases that exercise the unaligned prefix and the partial
+//  tail of the vector loops.
+//
+static constexpr size_t kTestSizes[][2] = {
+    {1, 1},   {2, 1},   {3, 1},   {4, 1},   {5, 1},   {7, 1},
+    {8, 1},   {15, 1},  {16, 1},  {17, 1},
+    {1, 2},   {2, 3},   {3, 5},   {5, 7},
+    {7, 16},  {8, 33},
+    {31, 32}, {32, 33},
+    {63, 64}, {64, 65},
+    {127, 128},{128, 129},
+    {255, 256},{256, 257},
+    {511, 512},{512, 513},
+    {999, 1000},{1000, 1000},
+    {1000, 1},{999, 1},
+    {1, 1000},{2, 1000},{3, 1000},
+    {16, 1000},{17, 1000},
+    {256, 1000},{257, 1000},
+    {512, 1000},{513, 1000},
+    {7, 1000},{8, 1000},
+};
+
+
+
+//
+//  Runs all four functions (compute_scale / compute_error, plain and
+//  weighted) twice on identical random data, once with the Default
+//  implementation and once with the ISA-specific implementation, and
+//  requires the two results to agree within rounding. The Default path
+//  is the source of truth.
+//
+//  The results are float sums over up to a million terms accumulated in
+//  different orders, so an exact comparison is not possible; a result
+//  passes if it is within 4096 ULPs of the Default result, or within
+//  1e-4 of the natural magnitude of the accumulated sum (the latter
+//  covers near-zero results, where ULPs are far smaller than the
+//  accumulated rounding).
+//
+//  Warning, this file is compiled in multiple ISA contexts.
+//  We cannot define the functions here since they will be compiled differently.
+//  If a higher (AVX512) version wins out in the linker, all versions will use
+//  it and crash on older CPUs.
+//
+class Test : public UnitTest{
+public:
+    Test(
+        const std::string& arch_str,
+        size_t width, size_t height,
+        bool use_weights,
+        SimmFnScale scale0, SimmFnScale scale1,
+        SimmFnScaleW scaleW0, SimmFnScaleW scaleW1,
+        SimmFnError error0, SimmFnError error1,
+        SimmFnErrorW errorW0, SimmFnErrorW errorW1
+    );
+
+    virtual UnitTestResult run(Logger& logger, CancellableScope& scope) const override;
+
+private:
+    size_t m_width;
+    size_t m_height;
+    bool m_use_weights;
+    SimmFnScale m_scale0;
+    SimmFnScale m_scale1;
+    SimmFnScaleW m_scaleW0;
+    SimmFnScaleW m_scaleW1;
+    SimmFnError m_error0;
+    SimmFnError m_error1;
+    SimmFnErrorW m_errorW0;
+    SimmFnErrorW m_errorW1;
+};
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Kernels/SpikeConvolution/Kernels_SpikeConvolution.cpp b/SerialPrograms/Source/Kernels/SpikeConvolution/Kernels_SpikeConvolution.cpp
index cb13c95419..e44910295d 100644
--- a/SerialPrograms/Source/Kernels/SpikeConvolution/Kernels_SpikeConvolution.cpp
+++ b/SerialPrograms/Source/Kernels/SpikeConvolution/Kernels_SpikeConvolution.cpp
@@ -1,10 +1,10 @@
 /*  Spike Convolution
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
-
 #include "Common/Cpp/CpuId/CpuId.h"
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
 #include "Kernels_SpikeConvolution.h"
 
 namespace PokemonAutomation{
@@ -16,6 +16,16 @@ void compute_spike_kernel_Default   (float* out, const float* in, size_t lengthI
 void compute_spike_kernel_x86_SSE41 (float* out, const float* in, size_t lengthI, const float* kernel, size_t lengthK);
 void compute_spike_kernel_x86_AVX2  (float* out, const float* in, size_t lengthI, const float* kernel, size_t lengthK);
 void compute_spike_kernel_x86_AVX512(float* out, const float* in, size_t lengthI, const float* kernel, size_t lengthK);
+void compute_spike_kernel_arm64_NEON(float* out, const float* in, size_t lengthI, const float* kernel, size_t lengthK);
+
+void add_tests_x86_SSE41(UnitTestDatabase& database);
+void add_tests_x86_AVX2 (UnitTestDatabase& database);
+void add_tests_x86_AVX512(UnitTestDatabase& database);
+void add_tests_arm64_NEON(UnitTestDatabase& database);
+
+void add_tests_x86_SSE41(UnitTestDatabase& database);
+void add_tests_x86_AVX2 (UnitTestDatabase& database);
+void add_tests_x86_AVX512(UnitTestDatabase& database);
 
 
 void compute_spike_kernel(
@@ -36,11 +46,40 @@ void compute_spike_kernel(
     if (CPU_CAPABILITY_CURRENT.OK_08_Nehalem){
         return compute_spike_kernel_x86_SSE41(out, in, lengthI, kernel, lengthK);
     }
+#endif
+#ifdef PA_AutoDispatch_arm64_20_M1
+    if (CPU_CAPABILITY_CURRENT.OK_M1){
+        return compute_spike_kernel_arm64_NEON(out, in, lengthI, kernel, lengthK);
+    }
 #endif
     return compute_spike_kernel_Default(out, in, lengthI, kernel, lengthK);
 }
 
 
+void add_tests(UnitTestDatabase& database){
+#ifdef PA_AutoDispatch_x64_08_Nehalem
+    if (CPU_CAPABILITY_CURRENT.OK_08_Nehalem){
+        add_tests_x86_SSE41(database);
+    }
+#endif
+#ifdef PA_AutoDispatch_x64_13_Haswell
+    if (CPU_CAPABILITY_CURRENT.OK_13_Haswell){
+        add_tests_x86_AVX2(database);
+    }
+#endif
+#ifdef PA_AutoDispatch_x64_17_Skylake
+    if (CPU_CAPABILITY_CURRENT.OK_17_Skylake){
+        add_tests_x86_AVX512(database);
+    }
+#endif
+#ifdef PA_AutoDispatch_arm64_20_M1
+    if (CPU_CAPABILITY_CURRENT.OK_M1){
+        add_tests_arm64_NEON(database);
+    }
+#endif
+}
+
+
 
 
 }
diff --git a/SerialPrograms/Source/Kernels/SpikeConvolution/Kernels_SpikeConvolution.h b/SerialPrograms/Source/Kernels/SpikeConvolution/Kernels_SpikeConvolution.h
index 1f17b2cfd6..90054b15e0 100644
--- a/SerialPrograms/Source/Kernels/SpikeConvolution/Kernels_SpikeConvolution.h
+++ b/SerialPrograms/Source/Kernels/SpikeConvolution/Kernels_SpikeConvolution.h
@@ -1,6 +1,6 @@
 /*  Spike Convolution
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -10,15 +10,36 @@
 #include <stddef.h>
 
 namespace PokemonAutomation{
+
+class UnitTestDatabase;
+
 namespace Kernels{
 namespace SpikeConvolution{
 
 
-//  Compute the Spike Kernel
-//      "out" is aligned to "PA_ALIGNMENT" bytes.
-//      lengthI >= lengthK
-//      "in"  is valid for lengthI
-//      "out" is valid for (lengthI - lengthK + 1) rounded up to PA_ALIGNMENT/sizeof(float)
+//
+//  Compute the "spike kernel": the valid cross-correlation of "in" with
+//  "kernel",
+//
+//      out[j] = sum over m of kernel[m] * in[j + m],
+//              j = 0 .. lengthI - lengthK
+//
+//  The kernel used in production (buildSpikeKernel in SpectrogramMatcher.cpp)
+//  is an antisymmetric triangular tent spanning about 199 Hz (at 48 kHz with
+//  2048 frequency bins, 18 taps: -4, -3, -2, -1, 0, 1, 2, 3, 4, 4, 3, 2, 1,
+//  0, -1, -2, -3, -4; it sums to zero), so out[j] measures the local slope
+//  of "in" along the frequency axis: zero where "in" is flat, large at sharp
+//  rises and falls. SpectrogramMatcher's SPIKE_CONV mode uses this to match
+//  audio templates (shiny cries, item pickups, ...) against a recording.
+//
+//      - "out" must be aligned to PA_ALIGNMENT bytes.
+//      - lengthI >= lengthK.
+//      - "in" is valid for lengthI floats.
+//      - "out" is written for lengthI - lengthK + 1 values, but the SIMD
+//        paths write in 4-lane vectors, so the last store may also write up
+//        to 3 padding values past that. "out" must be valid for
+//        lengthI - lengthK + 1 rounded up to 16 floats.
+//
 void compute_spike_kernel(
     float* out, const float* in, size_t lengthI,
     const float* kernel, size_t lengthK
@@ -26,6 +47,10 @@ void compute_spike_kernel(
 
 
 
+void add_tests(UnitTestDatabase& database);
+
+
+
 }
 }
 }
diff --git a/SerialPrograms/Source/Kernels/SpikeConvolution/Kernels_SpikeConvolution_Core_Default.cpp b/SerialPrograms/Source/Kernels/SpikeConvolution/Kernels_SpikeConvolution_Core_Default.cpp
index 3c330e1073..c074171170 100644
--- a/SerialPrograms/Source/Kernels/SpikeConvolution/Kernels_SpikeConvolution_Core_Default.cpp
+++ b/SerialPrograms/Source/Kernels/SpikeConvolution/Kernels_SpikeConvolution_Core_Default.cpp
@@ -1,6 +1,6 @@
 /*  Scale Invariant Matrix Match (Default)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/Kernels/SpikeConvolution/Kernels_SpikeConvolution_Core_arm64_NEON.cpp b/SerialPrograms/Source/Kernels/SpikeConvolution/Kernels_SpikeConvolution_Core_arm64_NEON.cpp
new file mode 100644
index 0000000000..49217ed2e2
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/SpikeConvolution/Kernels_SpikeConvolution_Core_arm64_NEON.cpp
@@ -0,0 +1,94 @@
+/*  Spike Convolution (arm64 NEON)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifdef PA_AutoDispatch_arm64_20_M1
+
+#include <arm_neon.h>
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "Kernels_SpikeConvolution_Routines.h"
+#include "Kernels_SpikeConvolution_TestInfra.h"
+
+namespace PokemonAutomation{
+namespace Kernels{
+namespace SpikeConvolution{
+
+
+struct Context_arm64_NEON{
+    using vtype = float32x4_t;
+
+    static PA_FORCE_INLINE vtype broadcast(float x){
+        return vdupq_n_f32(x);
+    }
+    static PA_FORCE_INLINE vtype load_partial(const float* ptr, size_t length){
+        //  Insert the "length" valid floats one lane at a time, zero-filled
+        //  otherwise: no out-of-bounds read in either direction ("ptr" is
+        //  valid for exactly "length" floats).
+        vtype out = vdupq_n_f32(0.0f);
+        out = vld1q_lane_f32(ptr, out, 0);
+        if (length > 1){
+            out = vld1q_lane_f32(ptr + 1, out, 1);
+        }
+        if (length > 2){
+            out = vld1q_lane_f32(ptr + 2, out, 2);
+        }
+        return out;
+    }
+
+    static PA_FORCE_INLINE vtype multiply(vtype k0, vtype in){
+        return vmulq_f32(k0, in);
+    }
+    static PA_FORCE_INLINE void accumulate(vtype& out0, vtype k0, vtype in){
+        out0 = vfmaq_f32(out0, k0, in);
+    }
+    static PA_FORCE_INLINE vtype multiply(vtype k0, const float* ptr){
+        return multiply(k0, vld1q_f32(ptr));
+    }
+    static PA_FORCE_INLINE void accumulate(vtype& out0, vtype k0, const float* ptr){
+        accumulate(out0, k0, vld1q_f32(ptr));
+    }
+
+    static PA_FORCE_INLINE vtype multiply_partial(vtype k0, const float* ptr, size_t length){
+        return multiply(k0, load_partial(ptr, length));
+    }
+    static PA_FORCE_INLINE void accumulate_partial(vtype& out0, vtype k0, const float* ptr, size_t length){
+        accumulate(out0, k0, load_partial(ptr, length));
+    }
+};
+
+
+void compute_spike_kernel_arm64_NEON(
+    float* out, const float* in, size_t lengthI,
+    const float* kernel, size_t lengthK
+){
+    compute_spike_kernel<Context_arm64_NEON>(out, in, lengthI, kernel, lengthK);
+}
+
+
+void compute_spike_kernel_Default(float* out, const float* in, size_t lengthI, const float* kernel, size_t lengthK);
+
+class Test_arm64_NEON : public Test{
+public:
+    Test_arm64_NEON(size_t lengthK)
+        : Test(
+            "arm64_NEON",
+            lengthK,
+            compute_spike_kernel_Default,
+            compute_spike_kernel_arm64_NEON
+        )
+    {}
+};
+void add_tests_arm64_NEON(UnitTestDatabase& database){
+    for (size_t lengthK = 1; lengthK <= 32; lengthK++){
+        database.add<Test_arm64_NEON>(lengthK);
+    }
+}
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Kernels/SpikeConvolution/Kernels_SpikeConvolution_Core_x86_AVX2.cpp b/SerialPrograms/Source/Kernels/SpikeConvolution/Kernels_SpikeConvolution_Core_x86_AVX2.cpp
index 0afdb40694..e369c3e84f 100644
--- a/SerialPrograms/Source/Kernels/SpikeConvolution/Kernels_SpikeConvolution_Core_x86_AVX2.cpp
+++ b/SerialPrograms/Source/Kernels/SpikeConvolution/Kernels_SpikeConvolution_Core_x86_AVX2.cpp
@@ -1,13 +1,15 @@
 /*  Scale Invariant Matrix Match (x86 AVX2)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifdef PA_AutoDispatch_x64_13_Haswell
 
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
 #include "Kernels/PartialWordAccess/Kernels_PartialWordAccess_x64_AVX2.h"
 #include "Kernels_SpikeConvolution_Routines.h"
+#include "Kernels_SpikeConvolution_TestInfra.h"
 
 namespace PokemonAutomation{
 namespace Kernels{
@@ -67,6 +69,27 @@ void compute_spike_kernel_x86_AVX2(
 
 
 
+void compute_spike_kernel_Default(float* out, const float* in, size_t lengthI, const float* kernel, size_t lengthK);
+
+class Test_x86_AVX2 : public Test{
+public:
+    Test_x86_AVX2(size_t lengthK)
+        : Test(
+            "x86_AVX2",
+            lengthK,
+            compute_spike_kernel_Default,
+            compute_spike_kernel_x86_AVX2
+        )
+    {}
+};
+void add_tests_x86_AVX2(UnitTestDatabase& database){
+    for (size_t lengthK = 1; lengthK <= 32; lengthK++){
+        database.add<Test_x86_AVX2>(lengthK);
+    }
+}
+
+
+
 }
 }
 }
diff --git a/SerialPrograms/Source/Kernels/SpikeConvolution/Kernels_SpikeConvolution_Core_x86_AVX512.cpp b/SerialPrograms/Source/Kernels/SpikeConvolution/Kernels_SpikeConvolution_Core_x86_AVX512.cpp
index c00440dfc8..c2fe0f2d49 100644
--- a/SerialPrograms/Source/Kernels/SpikeConvolution/Kernels_SpikeConvolution_Core_x86_AVX512.cpp
+++ b/SerialPrograms/Source/Kernels/SpikeConvolution/Kernels_SpikeConvolution_Core_x86_AVX512.cpp
@@ -1,13 +1,15 @@
 /*  Scale Invariant Matrix Match (x86 AVX512)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifdef PA_AutoDispatch_x64_17_Skylake
 
-#include "Kernels/PartialWordAccess/Kernels_PartialWordAccess_x64_AVX2.h"
+#include <immintrin.h>
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
 #include "Kernels_SpikeConvolution_Routines.h"
+#include "Kernels_SpikeConvolution_TestInfra.h"
 
 namespace PokemonAutomation{
 namespace Kernels{
@@ -22,7 +24,7 @@ struct Context_x86_AVX512{
     }
     static PA_FORCE_INLINE __m512 load_partial(const float* ptr, size_t length){
         __mmask16 mask = ((uint16_t)1 << length) - 1;
-        return _mm512_maskz_load_ps(mask, ptr);
+        return _mm512_maskz_loadu_ps(mask, ptr);
     }
     static PA_FORCE_INLINE void store_partial(float* ptr, __m512 x, size_t length){
         __mmask16 mask = ((uint16_t)1 << length) - 1;
@@ -61,6 +63,27 @@ void compute_spike_kernel_x86_AVX512(
 
 
 
+void compute_spike_kernel_Default(float* out, const float* in, size_t lengthI, const float* kernel, size_t lengthK);
+
+class Test_x86_AVX512 : public Test{
+public:
+    Test_x86_AVX512(size_t lengthK)
+        : Test(
+            "x86_AVX512",
+            lengthK,
+            compute_spike_kernel_Default,
+            compute_spike_kernel_x86_AVX512
+        )
+    {}
+};
+void add_tests_x86_AVX512(UnitTestDatabase& database){
+    for (size_t lengthK = 1; lengthK <= 32; lengthK++){
+        database.add<Test_x86_AVX512>(lengthK);
+    }
+}
+
+
+
 }
 }
 }
diff --git a/SerialPrograms/Source/Kernels/SpikeConvolution/Kernels_SpikeConvolution_Core_x86_SSE41.cpp b/SerialPrograms/Source/Kernels/SpikeConvolution/Kernels_SpikeConvolution_Core_x86_SSE41.cpp
index 61a969bcd7..bcee96738b 100644
--- a/SerialPrograms/Source/Kernels/SpikeConvolution/Kernels_SpikeConvolution_Core_x86_SSE41.cpp
+++ b/SerialPrograms/Source/Kernels/SpikeConvolution/Kernels_SpikeConvolution_Core_x86_SSE41.cpp
@@ -1,13 +1,15 @@
 /*  Scale Invariant Matrix Match (x86 SSE4.1)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifdef PA_AutoDispatch_x64_08_Nehalem
 
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
 #include "Kernels/PartialWordAccess/Kernels_PartialWordAccess_x64_SSE41.h"
 #include "Kernels_SpikeConvolution_Routines.h"
+#include "Kernels_SpikeConvolution_TestInfra.h"
 
 namespace PokemonAutomation{
 namespace Kernels{
@@ -21,8 +23,13 @@ struct Context_x86_SSE41{
         return _mm_set1_ps(x);
     }
     static PA_FORCE_INLINE __m128 load_partial(const float* ptr, size_t length){
+        //  Use the page-aware generic load: it picks the side of the
+        //  16-byte window that stays inside the page of "ptr", so the
+        //  out-of-bounds bytes (zero-filled lanes only) never cross into
+        //  an invalid page. "ptr" always points inside "in", whose page
+        //  is therefore mapped on both sides.
         PartialWordAccess_x64_SSE41 access(length * sizeof(float));
-        return access.load_f32_no_read_past_end(ptr);
+        return _mm_castsi128_ps(access.load(ptr));
     }
     static PA_FORCE_INLINE void store_partial(float* ptr, __m128 x, size_t length){
         PartialWordAccess_x64_SSE41 access(length * sizeof(float));
@@ -61,6 +68,27 @@ void compute_spike_kernel_x86_SSE41(
 
 
 
+void compute_spike_kernel_Default(float* out, const float* in, size_t lengthI, const float* kernel, size_t lengthK);
+
+class Test_x86_SSE41 : public Test{
+public:
+    Test_x86_SSE41(size_t lengthK)
+        : Test(
+            "x86_SSE41",
+            lengthK,
+            compute_spike_kernel_Default,
+            compute_spike_kernel_x86_SSE41
+        )
+    {}
+};
+void add_tests_x86_SSE41(UnitTestDatabase& database){
+    for (size_t lengthK = 1; lengthK <= 32; lengthK++){
+        database.add<Test_x86_SSE41>(lengthK);
+    }
+}
+
+
+
 }
 }
 }
diff --git a/SerialPrograms/Source/Kernels/SpikeConvolution/Kernels_SpikeConvolution_Routines.h b/SerialPrograms/Source/Kernels/SpikeConvolution/Kernels_SpikeConvolution_Routines.h
index 0fb161fbf3..f62037c24e 100644
--- a/SerialPrograms/Source/Kernels/SpikeConvolution/Kernels_SpikeConvolution_Routines.h
+++ b/SerialPrograms/Source/Kernels/SpikeConvolution/Kernels_SpikeConvolution_Routines.h
@@ -1,6 +1,6 @@
 /*  Spike Convolution
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/Kernels/SpikeConvolution/Kernels_SpikeConvolution_TestInfra.cpp b/SerialPrograms/Source/Kernels/SpikeConvolution/Kernels_SpikeConvolution_TestInfra.cpp
new file mode 100644
index 0000000000..562abe1c34
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/SpikeConvolution/Kernels_SpikeConvolution_TestInfra.cpp
@@ -0,0 +1,132 @@
+/*  Spike Convolution Test Infra
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <algorithm>
+#include <cstdio>
+#include <limits>
+#include <random>
+#include "Common/Compiler.h"
+#include "Common/Cpp/CancellableScope.h"
+#include "Common/Cpp/Containers/GuardPageBuffer.h"
+#include "Kernels_SpikeConvolution_TestInfra.h"
+
+namespace PokemonAutomation{
+namespace Kernels{
+namespace SpikeConvolution{
+
+
+
+//
+//  Bounds for the random data.
+//
+//  All values are small integers so that the kernel's math is exact in
+//  32-bit float: every product |weight|*|data| is at most 8*512 = 4096,
+//  and every output (a sum of at most 32 such products) is at most
+//  32*4096 = 131072, both far below 2^24. Every intermediate sum is
+//  exact as well, so the Default and ISA implementations must agree
+//  bit-exactly, regardless of operation order or FMA contraction.
+//
+static constexpr int MAX_DATA = 512;
+static constexpr int MAX_WEIGHT = 8;
+
+//
+//  Input lengths to cover: from the smallest allowed (K) up to 1000.
+//
+static constexpr size_t MAX_LENGTH_I = 1000;
+
+//
+//  The documented size of "out": the valid outputs rounded up to 16 floats.
+//
+static size_t output_capacity(size_t lengthO){
+    return (lengthO + 15) & ~(size_t)15;
+}
+
+
+
+Test::Test(
+    const std::string& arch_str,
+    size_t lengthK,
+    SpikeConvolutionFn conv0,
+    SpikeConvolutionFn conv1
+)
+    : UnitTest(
+        "Kernels::SpikeConvolution - " + arch_str +
+        "(K=" + std::to_string(lengthK) + ")"
+    )
+    , m_lengthK(lengthK)
+    , m_conv0(conv0)
+    , m_conv1(conv1)
+{}
+
+UnitTestResult Test::run(Logger& logger, CancellableScope& scope) const{
+    //
+    //  "in", "kernel" and both outputs each end right before a guard page.
+    //  A read past the end of "in" or "kernel", or a write past the
+    //  documented end of "out", faults on every run. The buffers are mapped
+    //  once for the longest input. Each input length puts its data at the
+    //  end of them.
+    //
+    const size_t max_capacityO = output_capacity(MAX_LENGTH_I - m_lengthK + 1);
+    GuardPageBuffer<float> in_buffer(MAX_LENGTH_I);
+    GuardPageBuffer<float> kernel(m_lengthK);
+    GuardPageBuffer<float> out0_buffer(max_capacityO, PA_ALIGNMENT);
+    GuardPageBuffer<float> out1_buffer(max_capacityO, PA_ALIGNMENT);
+
+    for (size_t lengthI = m_lengthK; lengthI <= MAX_LENGTH_I; lengthI++){
+        scope.throw_if_cancelled();
+        const size_t lengthO = lengthI - m_lengthK + 1;
+        const size_t capacityO = output_capacity(lengthO);
+
+        //
+        //  Fresh random data for each (K, N), with a deterministic seed.
+        //  "in" holds exactly lengthI floats. "out0" and "out1" each hold
+        //  exactly capacityO floats and start 64-byte aligned (both
+        //  capacities are multiples of 16 floats). They start as NaN, so an
+        //  output that an implementation never writes shows up as a mismatch.
+        //
+        float* in = in_buffer.data() + MAX_LENGTH_I - lengthI;
+        float* out0 = out0_buffer.data() + max_capacityO - capacityO;
+        float* out1 = out1_buffer.data() + max_capacityO - capacityO;
+        std::fill(out0, out0 + capacityO, std::numeric_limits<float>::quiet_NaN());
+        std::fill(out1, out1 + capacityO, std::numeric_limits<float>::quiet_NaN());
+
+        std::mt19937 generator((unsigned int)(lengthI * 1000003u + m_lengthK * 7919u));
+        std::uniform_int_distribution<int> data_distribution(-MAX_DATA, MAX_DATA);
+        std::uniform_int_distribution<int> weight_distribution(-MAX_WEIGHT, MAX_WEIGHT);
+        for (size_t c = 0; c < lengthI; c++){
+            in[c] = (float)data_distribution(generator);
+        }
+        for (size_t c = 0; c < m_lengthK; c++){
+            kernel[c] = (float)weight_distribution(generator);
+        }
+
+        m_conv0(out0, in, lengthI, kernel.data(), m_lengthK);
+        m_conv1(out1, in, lengthI, kernel.data(), m_lengthK);
+
+        //
+        //  Both implementations compute identical integer sums, so the
+        //  results must agree bit-exactly.
+        //
+        for (size_t c = 0; c < lengthO; c++){
+            if (out0[c] != out1[c]){
+                char value0[32];
+                char value1[32];
+                std::snprintf(value0, sizeof(value0), "%.9g", (double)out0[c]);
+                std::snprintf(value1, sizeof(value1), "%.9g", (double)out1[c]);
+                return "Mismatch at input length " + std::to_string(lengthI) + ", output " +
+                    std::to_string(c) + " of " + std::to_string(lengthO) +
+                    ": " + value0 + " != " + value1;
+            }
+        }
+    }
+    return true;
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/Kernels/SpikeConvolution/Kernels_SpikeConvolution_TestInfra.h b/SerialPrograms/Source/Kernels/SpikeConvolution/Kernels_SpikeConvolution_TestInfra.h
new file mode 100644
index 0000000000..a7444525de
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/SpikeConvolution/Kernels_SpikeConvolution_TestInfra.h
@@ -0,0 +1,67 @@
+/*  Spike Convolution Test Infra
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Compiler.h"
+#include "Common/Cpp/TestRunners/UnitTest.h"
+
+#ifndef PokemonAutomation_Kernels_SpikeConvolution_TestInfra_H
+#define PokemonAutomation_Kernels_SpikeConvolution_TestInfra_H
+
+namespace PokemonAutomation{
+namespace Kernels{
+namespace SpikeConvolution{
+
+
+
+//
+//  Signature of compute_spike_kernel_Default(), compute_spike_kernel_x86_SSE41(), etc.
+//
+using SpikeConvolutionFn = void (*)(float* out, const float* in, size_t lengthI, const float* kernel, size_t lengthK);
+
+
+
+//
+//  Runs the kernel twice on identical random input data, once with
+//  compute_spike_kernel_Default() and once with the ISA-specific
+//  implementation, and requires the two outputs to agree bit-exactly. The
+//  Default path is the source of truth.
+//
+//  The input data and kernel weights are small integers, so every product
+//  and every accumulated sum in the kernel is exactly representable in
+//  32-bit float. The two implementations therefore must agree exactly,
+//  regardless of operation order or FMA contraction.
+//
+//  For a given kernel length K, the test runs every input length
+//  N = K..1000, with fresh random data for each N.
+//
+//  Warning, this file is compiled in multiple ISA contexts.
+//  We cannot define the functions here since they will be compiled differently.
+//  If a higher (AVX512) version wins out in the linker, all versions will use
+//  it and crash on older CPUs.
+//
+class Test : public UnitTest{
+public:
+    Test(
+        const std::string& arch_str,
+        size_t lengthK,
+        SpikeConvolutionFn conv0,
+        SpikeConvolutionFn conv1
+    );
+
+    virtual UnitTestResult run(Logger& logger, CancellableScope& scope) const override;
+
+private:
+    size_t m_lengthK;
+    SpikeConvolutionFn m_conv0;
+    SpikeConvolutionFn m_conv1;
+};
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill.cpp b/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill.cpp
index 17037570f6..92185ebd8f 100644
--- a/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill.cpp
+++ b/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill.cpp
@@ -1,17 +1,16 @@
 /*  Waterfill Algorithm
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include "Common/Cpp/Exceptions.h"
 #include "Common/Cpp/CpuId/CpuId.h"
 #include "Kernels_Waterfill.h"
-#include "Kernels_Waterfill_Session.h"
 
-#include <iostream>
-using std::cout;
-using std::endl;
+//#include <iostream>
+//using std::cout;
+//using std::endl;
 
 namespace PokemonAutomation{
 namespace Kernels{
@@ -28,6 +27,7 @@ std::vector<WaterfillObject> find_objects_inplace_64x32_x64_AVX512  (PackedBinar
 std::vector<WaterfillObject> find_objects_inplace_64x64_x64_AVX512  (PackedBinaryMatrix_IB& matrix, size_t min_area);
 std::vector<WaterfillObject> find_objects_inplace_64x32_x64_AVX512GF(PackedBinaryMatrix_IB& matrix, size_t min_area);
 std::vector<WaterfillObject> find_objects_inplace_64x64_x64_AVX512GF(PackedBinaryMatrix_IB& matrix, size_t min_area);
+std::vector<WaterfillObject> find_objects_inplace_64x8_arm64_NEON   (PackedBinaryMatrix_IB& matrix, size_t min_area);
 
 std::vector<WaterfillObject> find_objects_inplace(PackedBinaryMatrix_IB& matrix, size_t min_area){
 //    cout << "find_objects_inplace" << endl;
@@ -57,6 +57,11 @@ std::vector<WaterfillObject> find_objects_inplace(PackedBinaryMatrix_IB& matrix,
     case BinaryMatrixType::i64x8_x64_SSE42:
         return find_objects_inplace_64x8_x64_SSE42(matrix, min_area);
 #endif
+#elif PA_ARCH_arm64
+#ifdef PA_AutoDispatch_arm64_20_M1
+    case BinaryMatrixType::arm64x8_x64_NEON:
+        return find_objects_inplace_64x8_arm64_NEON(matrix, min_area);
+#endif
 #endif
 
     case BinaryMatrixType::i64x8_Default:
diff --git a/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill.h b/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill.h
index f304270141..7b64e264bf 100644
--- a/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill.h
+++ b/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill.h
@@ -1,6 +1,6 @@
 /*  Waterfill Algorithm
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x16_x64_AVX2.cpp b/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x16_x64_AVX2.cpp
index 9650c3fa93..e410af2c49 100644
--- a/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x16_x64_AVX2.cpp
+++ b/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x16_x64_AVX2.cpp
@@ -1,6 +1,6 @@
 /*  Waterfill Core (AVX2)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x16_x64_AVX2.h b/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x16_x64_AVX2.h
index 98977b09c9..23d43ab97c 100644
--- a/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x16_x64_AVX2.h
+++ b/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x16_x64_AVX2.h
@@ -1,6 +1,6 @@
 /*  Waterfill Core (x64 AVX2)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -402,7 +402,11 @@ static PA_FORCE_INLINE void waterfill_expand(BinaryTile_64x16_x64_AVX2& m, Binar
 
 //  Touch the edge of "tile" with the specified border.
 //  Returns true if "tile" has changed and needs to be updated.
-static PA_FORCE_INLINE bool waterfill_touch_top(const BinaryTile_64x16_x64_AVX2& mask, BinaryTile_64x16_x64_AVX2& tile, const BinaryTile_64x16_x64_AVX2& border){
+static PA_FORCE_INLINE bool waterfill_touch_top(
+    const BinaryTile_64x16_x64_AVX2& mask,
+    BinaryTile_64x16_x64_AVX2& tile,
+    const BinaryTile_64x16_x64_AVX2& border
+){
     uint64_t available = mask.top() & ~tile.top();
     uint64_t new_bits = available & border.bottom();
     if (new_bits == 0){
@@ -411,7 +415,11 @@ static PA_FORCE_INLINE bool waterfill_touch_top(const BinaryTile_64x16_x64_AVX2&
     tile.top() |= new_bits;
     return true;
 }
-static PA_FORCE_INLINE bool waterfill_touch_bottom(const BinaryTile_64x16_x64_AVX2& mask, BinaryTile_64x16_x64_AVX2& tile, const BinaryTile_64x16_x64_AVX2& border){
+static PA_FORCE_INLINE bool waterfill_touch_bottom(
+    const BinaryTile_64x16_x64_AVX2& mask,
+    BinaryTile_64x16_x64_AVX2& tile,
+    const BinaryTile_64x16_x64_AVX2& border
+){
     uint64_t available = mask.bottom() & ~tile.bottom();
     uint64_t new_bits = available & border.top();
     if (new_bits == 0){
@@ -420,7 +428,11 @@ static PA_FORCE_INLINE bool waterfill_touch_bottom(const BinaryTile_64x16_x64_AV
     tile.bottom() |= new_bits;
     return true;
 }
-static PA_FORCE_INLINE bool waterfill_touch_left(const BinaryTile_64x16_x64_AVX2& mask, BinaryTile_64x16_x64_AVX2& tile, const BinaryTile_64x16_x64_AVX2& border){
+static PA_FORCE_INLINE bool waterfill_touch_left(
+    const BinaryTile_64x16_x64_AVX2& mask,
+    BinaryTile_64x16_x64_AVX2& tile,
+    const BinaryTile_64x16_x64_AVX2& border
+){
     __m256i changed = _mm256_setzero_si256();
     for (size_t c = 0; c < 4; c++){
         __m256i available = _mm256_andnot_si256(tile.vec[c], mask.vec[c]);
@@ -430,7 +442,11 @@ static PA_FORCE_INLINE bool waterfill_touch_left(const BinaryTile_64x16_x64_AVX2
     }
     return !_mm256_testz_si256(changed, changed);
 }
-static PA_FORCE_INLINE bool waterfill_touch_right(const BinaryTile_64x16_x64_AVX2& mask, BinaryTile_64x16_x64_AVX2& tile, const BinaryTile_64x16_x64_AVX2& border){
+static PA_FORCE_INLINE bool waterfill_touch_right(
+    const BinaryTile_64x16_x64_AVX2& mask,
+    BinaryTile_64x16_x64_AVX2& tile,
+    const BinaryTile_64x16_x64_AVX2& border
+){
     __m256i changed = _mm256_setzero_si256();
     for (size_t c = 0; c < 4; c++){
         __m256i available = _mm256_andnot_si256(tile.vec[c], mask.vec[c]);
diff --git a/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x32_x64_AVX512-GF.cpp b/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x32_x64_AVX512-GF.cpp
index 3ea1669297..6682ae1215 100644
--- a/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x32_x64_AVX512-GF.cpp
+++ b/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x32_x64_AVX512-GF.cpp
@@ -1,13 +1,12 @@
 /*  Waterfill Core (x64 AVX512-GF)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifdef PA_AutoDispatch_x64_19_IceLake
 
 #include "Kernels/Kernels_BitScan.h"
-#include "Kernels/Kernels_x64_AVX512.h"
 #include "Kernels_Waterfill_Routines.h"
 #include "Kernels_Waterfill_Core_64x32_x64_AVX512-GF.h"
 
diff --git a/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x32_x64_AVX512-GF.h b/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x32_x64_AVX512-GF.h
index 43e7c38acb..dbda7bccf4 100644
--- a/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x32_x64_AVX512-GF.h
+++ b/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x32_x64_AVX512-GF.h
@@ -1,6 +1,6 @@
 /*  Waterfill Core (x64 AVX512-GF)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -8,7 +8,6 @@
 #define PokemonAutomation_Kernels_Waterfill_Core_64x32_x64_AVX512GF_H
 
 #include "Kernels/Kernels_BitScan.h"
-#include "Kernels/Kernels_x64_AVX512.h"
 #include "Kernels/BinaryMatrix/Kernels_BinaryMatrix_Arch_64x32_x64_AVX512.h"
 #include "Kernels_Waterfill_Intrinsics_x64_AVX512.h"
 #include "Kernels_Waterfill_Intrinsics_x64_AVX512-GF.h"
@@ -214,7 +213,11 @@ PA_FORCE_INLINE static void waterfill_expand(BinaryTile_64x32_x64_AVX512& m, Bin
 
 //  Touch the edge of "tile" with the specified border.
 //  Returns true if "tile" has changed and needs to be updated.
-static PA_FORCE_INLINE bool waterfill_touch_top(const BinaryTile_64x32_x64_AVX512& mask, BinaryTile_64x32_x64_AVX512& tile, const BinaryTile_64x32_x64_AVX512& border){
+static PA_FORCE_INLINE bool waterfill_touch_top(
+    const BinaryTile_64x32_x64_AVX512& mask,
+    BinaryTile_64x32_x64_AVX512& tile,
+    const BinaryTile_64x32_x64_AVX512& border
+){
     uint64_t available = mask.top() & ~tile.top();
     uint64_t new_bits = available & border.bottom();
     if (new_bits == 0){
@@ -223,7 +226,11 @@ static PA_FORCE_INLINE bool waterfill_touch_top(const BinaryTile_64x32_x64_AVX51
     tile.top() |= new_bits;
     return true;
 }
-static PA_FORCE_INLINE bool waterfill_touch_bottom(const BinaryTile_64x32_x64_AVX512& mask, BinaryTile_64x32_x64_AVX512& tile, const BinaryTile_64x32_x64_AVX512& border){
+static PA_FORCE_INLINE bool waterfill_touch_bottom(
+    const BinaryTile_64x32_x64_AVX512& mask,
+    BinaryTile_64x32_x64_AVX512& tile,
+    const BinaryTile_64x32_x64_AVX512& border
+){
     uint64_t available = mask.bottom() & ~tile.bottom();
     uint64_t new_bits = available & border.top();
     if (new_bits == 0){
@@ -232,7 +239,11 @@ static PA_FORCE_INLINE bool waterfill_touch_bottom(const BinaryTile_64x32_x64_AV
     tile.bottom() |= new_bits;
     return true;
 }
-static PA_FORCE_INLINE bool waterfill_touch_left(const BinaryTile_64x32_x64_AVX512& mask, BinaryTile_64x32_x64_AVX512& tile, const BinaryTile_64x32_x64_AVX512& border){
+static PA_FORCE_INLINE bool waterfill_touch_left(
+    const BinaryTile_64x32_x64_AVX512& mask,
+    BinaryTile_64x32_x64_AVX512& tile,
+    const BinaryTile_64x32_x64_AVX512& border
+){
     __m512i changed = _mm512_setzero_si512();
     for (size_t c = 0; c < 4; c++){
         __m512i available = _mm512_andnot_si512(tile.vec[c], mask.vec[c]);
@@ -242,7 +253,11 @@ static PA_FORCE_INLINE bool waterfill_touch_left(const BinaryTile_64x32_x64_AVX5
     }
     return _mm512_test_epi64_mask(changed, changed);
 }
-static PA_FORCE_INLINE bool waterfill_touch_right(const BinaryTile_64x32_x64_AVX512& mask, BinaryTile_64x32_x64_AVX512& tile, const BinaryTile_64x32_x64_AVX512& border){
+static PA_FORCE_INLINE bool waterfill_touch_right(
+    const BinaryTile_64x32_x64_AVX512& mask,
+    BinaryTile_64x32_x64_AVX512& tile,
+    const BinaryTile_64x32_x64_AVX512& border
+){
     __m512i changed = _mm512_setzero_si512();
     for (size_t c = 0; c < 4; c++){
         __m512i available = _mm512_andnot_si512(tile.vec[c], mask.vec[c]);
diff --git a/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x32_x64_AVX512.cpp b/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x32_x64_AVX512.cpp
index f6c3abcd5e..3043876280 100644
--- a/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x32_x64_AVX512.cpp
+++ b/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x32_x64_AVX512.cpp
@@ -1,13 +1,12 @@
 /*  Waterfill Core (x64 AVX512)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifdef PA_AutoDispatch_x64_17_Skylake
 
 #include "Kernels/Kernels_BitScan.h"
-#include "Kernels/Kernels_x64_AVX512.h"
 #include "Kernels_Waterfill_Routines.h"
 #include "Kernels_Waterfill_Core_64x32_x64_AVX512.h"
 
diff --git a/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x32_x64_AVX512.h b/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x32_x64_AVX512.h
index d3a3c15206..e6eab0f803 100644
--- a/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x32_x64_AVX512.h
+++ b/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x32_x64_AVX512.h
@@ -1,6 +1,6 @@
 /*  Waterfill Core (x64 AVX512)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -8,7 +8,6 @@
 #define PokemonAutomation_Kernels_Waterfill_Core_64x32_x64_AVX512_H
 
 #include "Kernels/Kernels_BitScan.h"
-#include "Kernels/Kernels_x64_AVX512.h"
 #include "Kernels/BinaryMatrix/Kernels_BinaryMatrix_Arch_64x32_x64_AVX512.h"
 #include "Kernels_Waterfill_Intrinsics_x64_AVX512.h"
 #include "Kernels_Waterfill_Intrinsics_x64_AVX512-GF.h"
@@ -303,7 +302,11 @@ PA_FORCE_INLINE static void waterfill_expand(BinaryTile_64x32_x64_AVX512& m, Bin
 
 //  Touch the edge of "tile" with the specified border.
 //  Returns true if "tile" has changed and needs to be updated.
-static PA_FORCE_INLINE bool waterfill_touch_top(const BinaryTile_64x32_x64_AVX512& mask, BinaryTile_64x32_x64_AVX512& tile, const BinaryTile_64x32_x64_AVX512& border){
+static PA_FORCE_INLINE bool waterfill_touch_top(
+    const BinaryTile_64x32_x64_AVX512& mask,
+    BinaryTile_64x32_x64_AVX512& tile,
+    const BinaryTile_64x32_x64_AVX512& border
+){
     uint64_t available = mask.top() & ~tile.top();
     uint64_t new_bits = available & border.bottom();
     if (new_bits == 0){
@@ -312,7 +315,11 @@ static PA_FORCE_INLINE bool waterfill_touch_top(const BinaryTile_64x32_x64_AVX51
     tile.top() |= new_bits;
     return true;
 }
-static PA_FORCE_INLINE bool waterfill_touch_bottom(const BinaryTile_64x32_x64_AVX512& mask, BinaryTile_64x32_x64_AVX512& tile, const BinaryTile_64x32_x64_AVX512& border){
+static PA_FORCE_INLINE bool waterfill_touch_bottom(
+    const BinaryTile_64x32_x64_AVX512& mask,
+    BinaryTile_64x32_x64_AVX512& tile,
+    const BinaryTile_64x32_x64_AVX512& border
+){
     uint64_t available = mask.bottom() & ~tile.bottom();
     uint64_t new_bits = available & border.top();
     if (new_bits == 0){
@@ -321,7 +328,11 @@ static PA_FORCE_INLINE bool waterfill_touch_bottom(const BinaryTile_64x32_x64_AV
     tile.bottom() |= new_bits;
     return true;
 }
-static PA_FORCE_INLINE bool waterfill_touch_left(const BinaryTile_64x32_x64_AVX512& mask, BinaryTile_64x32_x64_AVX512& tile, const BinaryTile_64x32_x64_AVX512& border){
+static PA_FORCE_INLINE bool waterfill_touch_left(
+    const BinaryTile_64x32_x64_AVX512& mask,
+    BinaryTile_64x32_x64_AVX512& tile,
+    const BinaryTile_64x32_x64_AVX512& border
+){
     __m512i changed = _mm512_setzero_si512();
     for (size_t c = 0; c < 4; c++){
         __m512i available = _mm512_andnot_si512(tile.vec[c], mask.vec[c]);
@@ -331,7 +342,11 @@ static PA_FORCE_INLINE bool waterfill_touch_left(const BinaryTile_64x32_x64_AVX5
     }
     return _mm512_test_epi64_mask(changed, changed);
 }
-static PA_FORCE_INLINE bool waterfill_touch_right(const BinaryTile_64x32_x64_AVX512& mask, BinaryTile_64x32_x64_AVX512& tile, const BinaryTile_64x32_x64_AVX512& border){
+static PA_FORCE_INLINE bool waterfill_touch_right(
+    const BinaryTile_64x32_x64_AVX512& mask,
+    BinaryTile_64x32_x64_AVX512& tile,
+    const BinaryTile_64x32_x64_AVX512& border
+){
     __m512i changed = _mm512_setzero_si512();
     for (size_t c = 0; c < 4; c++){
         __m512i available = _mm512_andnot_si512(tile.vec[c], mask.vec[c]);
diff --git a/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x4_Default.h b/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x4_Default.h
index 759b397860..7b4eac3ed0 100644
--- a/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x4_Default.h
+++ b/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x4_Default.h
@@ -1,6 +1,6 @@
 /*  Waterfill Core (Default)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x64_x64_AVX512-GF.cpp b/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x64_x64_AVX512-GF.cpp
index b2b908d3d6..59d29c3f6b 100644
--- a/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x64_x64_AVX512-GF.cpp
+++ b/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x64_x64_AVX512-GF.cpp
@@ -1,13 +1,12 @@
 /*  Waterfill Core (x64 AVX512-GF)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifdef PA_AutoDispatch_x64_19_IceLake
 
 #include "Kernels/Kernels_BitScan.h"
-#include "Kernels/Kernels_x64_AVX512.h"
 #include "Kernels_Waterfill_Routines.h"
 #include "Kernels_Waterfill_Core_64x64_x64_AVX512-GF.h"
 
diff --git a/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x64_x64_AVX512-GF.h b/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x64_x64_AVX512-GF.h
index 64c26e6917..57e7a56e89 100644
--- a/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x64_x64_AVX512-GF.h
+++ b/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x64_x64_AVX512-GF.h
@@ -1,6 +1,6 @@
 /*  Waterfill Core (x64 AVX512-GF)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x64_x64_AVX512.cpp b/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x64_x64_AVX512.cpp
index 9ffb158fd1..e33e82b67a 100644
--- a/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x64_x64_AVX512.cpp
+++ b/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x64_x64_AVX512.cpp
@@ -1,6 +1,6 @@
 /*  Waterfill Core (x64 AVX512)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x64_x64_AVX512.h b/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x64_x64_AVX512.h
index 1f8b93cc02..bec944ca13 100644
--- a/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x64_x64_AVX512.h
+++ b/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x64_x64_AVX512.h
@@ -1,6 +1,6 @@
 /*  Waterfill Core (x64 AVX512)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -282,7 +282,11 @@ static PA_FORCE_INLINE void waterfill_expand(BinaryTile_64x64_x64_AVX512& m, Bin
 
 //  Touch the edge of "tile" with the specified border.
 //  Returns true if "tile" has changed and needs to be updated.
-static PA_FORCE_INLINE bool waterfill_touch_top(const BinaryTile_64x64_x64_AVX512& mask, BinaryTile_64x64_x64_AVX512& tile, const BinaryTile_64x64_x64_AVX512& border){
+static PA_FORCE_INLINE bool waterfill_touch_top(
+    const BinaryTile_64x64_x64_AVX512& mask,
+    BinaryTile_64x64_x64_AVX512& tile,
+    const BinaryTile_64x64_x64_AVX512& border
+){
     uint64_t available = mask.top() & ~tile.top();
     uint64_t new_bits = available & border.bottom();
     if (new_bits == 0){
@@ -291,7 +295,11 @@ static PA_FORCE_INLINE bool waterfill_touch_top(const BinaryTile_64x64_x64_AVX51
     tile.top() |= new_bits;
     return true;
 }
-static PA_FORCE_INLINE bool waterfill_touch_bottom(const BinaryTile_64x64_x64_AVX512& mask, BinaryTile_64x64_x64_AVX512& tile, const BinaryTile_64x64_x64_AVX512& border){
+static PA_FORCE_INLINE bool waterfill_touch_bottom(
+    const BinaryTile_64x64_x64_AVX512& mask,
+    BinaryTile_64x64_x64_AVX512& tile,
+    const BinaryTile_64x64_x64_AVX512& border
+){
     uint64_t available = mask.bottom() & ~tile.bottom();
     uint64_t new_bits = available & border.top();
     if (new_bits == 0){
@@ -300,7 +308,11 @@ static PA_FORCE_INLINE bool waterfill_touch_bottom(const BinaryTile_64x64_x64_AV
     tile.bottom() |= new_bits;
     return true;
 }
-static PA_FORCE_INLINE bool waterfill_touch_left(const BinaryTile_64x64_x64_AVX512& mask, BinaryTile_64x64_x64_AVX512& tile, const BinaryTile_64x64_x64_AVX512& border){
+static PA_FORCE_INLINE bool waterfill_touch_left(
+    const BinaryTile_64x64_x64_AVX512& mask,
+    BinaryTile_64x64_x64_AVX512& tile,
+    const BinaryTile_64x64_x64_AVX512& border
+){
     __m512i changed = _mm512_setzero_si512();
     for (size_t c = 0; c < 8; c++){
         __m512i available = _mm512_andnot_si512(tile.vec[c], mask.vec[c]);
@@ -310,7 +322,11 @@ static PA_FORCE_INLINE bool waterfill_touch_left(const BinaryTile_64x64_x64_AVX5
     }
     return _mm512_test_epi64_mask(changed, changed);
 }
-static PA_FORCE_INLINE bool waterfill_touch_right(const BinaryTile_64x64_x64_AVX512& mask, BinaryTile_64x64_x64_AVX512& tile, const BinaryTile_64x64_x64_AVX512& border){
+static PA_FORCE_INLINE bool waterfill_touch_right(
+    const BinaryTile_64x64_x64_AVX512& mask,
+    BinaryTile_64x64_x64_AVX512& tile,
+    const BinaryTile_64x64_x64_AVX512& border
+){
     __m512i changed = _mm512_setzero_si512();
     for (size_t c = 0; c < 8; c++){
         __m512i available = _mm512_andnot_si512(tile.vec[c], mask.vec[c]);
diff --git a/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x8_arm64_NEON.cpp b/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x8_arm64_NEON.cpp
new file mode 100644
index 0000000000..826c2a52a4
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x8_arm64_NEON.cpp
@@ -0,0 +1,62 @@
+/*  Waterfill Core (arm64 NEON)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifdef PA_AutoDispatch_arm64_20_M1
+
+// #define USE_CPP_TEMPLATE_IMPL
+
+#include "Kernels_Waterfill_Routines.h"
+#include "Kernels_Waterfill_Core_64x8_arm64_NEON.h"
+
+#ifdef USE_CPP_TEMPLATE_IMPL
+#include "Kernels_Waterfill_Core_64xH_Default.h"
+#endif
+
+namespace PokemonAutomation{
+namespace Kernels{
+namespace Waterfill{
+
+#ifdef USE_CPP_TEMPLATE_IMPL
+
+using Waterfill_64x8_Default = Waterfill_64xH_Default<BinaryTile_64x8_arm64_NEON>;
+
+std::vector<WaterfillObject> find_objects_inplace_64x8_arm64_NEON(PackedBinaryMatrix_IB& matrix, size_t min_area){
+    return find_objects_inplace<BinaryTile_64x8_arm64_NEON, Waterfill_64x8_Default>(
+        static_cast<PackedBinaryMatrix_64x8_arm64_NEON&>(matrix).get(),
+        min_area
+    );
+}
+std::unique_ptr<WaterfillSession> make_WaterfillSession_64x8_arm64_NEON(PackedBinaryMatrix_IB* matrix){
+    return matrix == nullptr
+        ? std::make_unique<WaterfillSession_t<BinaryTile_64x8_arm64_NEON, Waterfill_64x8_Default>>()
+        : std::make_unique<WaterfillSession_t<BinaryTile_64x8_arm64_NEON, Waterfill_64x8_Default>>(
+            static_cast<PackedBinaryMatrix_64x8_arm64_NEON*>(matrix)->get()
+        );
+}
+
+#else
+
+std::vector<WaterfillObject> find_objects_inplace_64x8_arm64_NEON(PackedBinaryMatrix_IB& matrix, size_t min_area){
+    return find_objects_inplace<BinaryTile_64x8_arm64_NEON, Waterfill_64x8_arm64_NEON>(
+        static_cast<PackedBinaryMatrix_64x8_arm64_NEON&>(matrix).get(),
+        min_area
+    );
+}
+std::unique_ptr<WaterfillSession> make_WaterfillSession_64x8_arm64_NEON(PackedBinaryMatrix_IB* matrix){
+    return matrix == nullptr
+        ? std::make_unique<WaterfillSession_t<BinaryTile_64x8_arm64_NEON, Waterfill_64x8_arm64_NEON>>()
+        : std::make_unique<WaterfillSession_t<BinaryTile_64x8_arm64_NEON, Waterfill_64x8_arm64_NEON>>(
+            static_cast<PackedBinaryMatrix_64x8_arm64_NEON*>(matrix)->get()
+        );
+}
+
+#endif
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x8_arm64_NEON.h b/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x8_arm64_NEON.h
new file mode 100644
index 0000000000..34c6b4d17d
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x8_arm64_NEON.h
@@ -0,0 +1,530 @@
+/*  Waterfill Core (arm64 NEON)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Kernels_Waterfill_Core_64x8_arm64_NEON_H
+#define PokemonAutomation_Kernels_Waterfill_Core_64x8_arm64_NEON_H
+
+#include "Kernels/Kernels_BitScan.h"
+#include "Kernels/Kernels_arm64_NEON.h"
+#include "Kernels/BinaryMatrix/Kernels_BinaryMatrix_Arch_64x8_arm64_NEON.h"
+
+namespace PokemonAutomation{
+namespace Kernels{
+namespace Waterfill{
+
+
+PA_FORCE_INLINE uint64x2_t bit_reverse(uint64x2_t x){
+    uint8x16_t r0, r1;
+
+    // Use byte table lookup to swap the endianness of the two uint64_t
+    uint8x16_t x_shuffled = vqtbl1q_u8(vreinterpretq_u8_u64(x), uint8x16_t{7, 6, 5, 4, 3, 2, 1, 0, 15, 14, 13, 12, 11, 10, 9, 8});
+
+    // If originaly one byte in `x` has the order (high to low) h, g, f, e, d, c, b, a:
+    // right shift each byte by 4, r0 has (high to low) 0, 0, 0, 0, h, g, f, e
+    r0 = vshrq_n_u8(x_shuffled, 4);
+    // left shift each byte by 4, r1 has (high to low) d, c, b, a, 0, 0, 0, 0
+    r1 = vshlq_n_u8(x_shuffled, 4);
+    // after this logical OR in `r1` it is now (high to low) d, c, b, a, h, g, f, e
+    r1 = vorrq_u8(r0, r1);
+
+    // after right shift, r0 now has 0, 0, d, c, b, a, h, g
+    r0 = vshrq_n_u8(r1, 2);
+    // after left shif,t r1 now has b, a, h, g, f, e, 0, 0
+    r1 = vshlq_n_u8(r1, 2);
+
+    // After logical AND with 0x00110011, r0 has 0, 0, d, c, 0, 0, h, g
+    r0 = vandq_u8(r0, vdupq_n_u8(0x33));
+    // After logical AND with 0x11001100, r0 has b, a, 0, 0, f, e, 0, 0
+    r1 = vandq_u8(r1, vdupq_n_u8(0xcc));
+    // after logical OR r1 has b, a, d, c, f, e, h, g
+    r1 = vorrq_u8(r0, r1);
+
+    r0 = vshrq_n_u8(r1, 1); // 0, b, a, d, c, f, e, h
+    r1 = vshlq_n_u8(r1, 1); // a, d, c, f, e, h, g, 0
+    // logical AND with 0x01010101, r0 has 0, b, 0, d, 0, f, 0, h
+    r0 = vandq_u8(r0, vdupq_n_u8(0x55));
+    // logical AND with 0x10101010, r1 has a, 0, c, 0, e, 0, g, 0
+    r1 = vandq_u8(r1, vdupq_n_u8(0xaa));
+    r1 = vorrq_u8(r0, r1); // a, b, c, d, e, f, g, h
+
+    return vreinterpretq_u64_u8(r1);
+}
+
+
+
+struct Waterfill_64x8_arm64_NEON_ProcessedMask{
+    uint64x2_t m0, m1, m2, m3; //  Copy of logical OR of the mask `m` and recorded tile `x` bits 
+    uint64x2_t b0, b1, b2, b3; //  Bit-reversed copy of m0, m1, m2, m3.
+    uint64x2_t t0, t1, t2, t3; //  Transposed masks.
+    uint64x2_t f1, f2, f3;     //  Forward-carry mask.
+    uint64x2_t r0, r1, r2;     //  Reverse-carry mask.
+
+    PA_FORCE_INLINE Waterfill_64x8_arm64_NEON_ProcessedMask(
+        const BinaryTile_64x8_arm64_NEON& m,
+        uint64x2_t x0, uint64x2_t x1, uint64x2_t x2, uint64x2_t x3
+    ){
+        m0 = vorrq_u64(x0, m.vec.val[0]);
+        m1 = vorrq_u64(x1, m.vec.val[1]);
+        m2 = vorrq_u64(x2, m.vec.val[2]);
+        m3 = vorrq_u64(x3, m.vec.val[3]);
+
+        b0 = bit_reverse(m0);
+        b1 = bit_reverse(m1);
+        b2 = bit_reverse(m2);
+        b3 = bit_reverse(m3);
+
+        t0 = m0;
+        t1 = m1;
+        t2 = m2;
+        t3 = m3;
+        transpose_u64_2x2_NEON(t0, t1);
+        transpose_u64_2x2_NEON(t2, t3);
+
+        //  Forward carry
+        uint64x2_t f0 = t0;
+        f1 = vandq_u64(f0, t1);
+        transpose_u64_2x2_NEON(f0, f1);
+        f2 = t2;
+        f3 = vandq_u64(f2, t3);
+        transpose_u64_2x2_NEON(f2, f3);
+
+        //  Reverse carry
+        uint64x2_t r3 = t3;
+        r2 = vandq_u64(r3, t2);
+        transpose_u64_2x2_NEON(r2, r3);
+        r1 = t1;
+        r0 = vandq_u64(r1, t0);
+        transpose_u64_2x2_NEON(r0, r1);
+    }
+};
+
+
+
+PA_FORCE_INLINE bool keep_going(
+    const Waterfill_64x8_arm64_NEON_ProcessedMask& mask,
+    uint64x2_t& m0, uint64x2_t& m1, uint64x2_t& m2, uint64x2_t& m3,
+    uint64x2_t& x0, uint64x2_t& x1, uint64x2_t& x2, uint64x2_t& x3
+){
+    m0 = vbicq_u64(mask.m0, x0);
+    m1 = vbicq_u64(mask.m1, x1);
+    m2 = vbicq_u64(mask.m2, x2);
+    m3 = vbicq_u64(mask.m3, x3);
+
+    uint64x2_t r0;
+
+    r0 = vshlq_n_u64(m0, 1);
+    r0 = vorrq_u64(r0, vcombine_u64(vget_high_u64(m0), vget_low_u64(m1)));
+    r0 = vorrq_u64(r0, vcombine_u64(vcreate_u64(0), vget_low_u64(m0)));
+    uint64x2_t changed = vandq_u64(r0, x0);
+
+    r0 = vshlq_n_u64(m1, 1);
+    r0 = vorrq_u64(r0, vcombine_u64(vget_high_u64(m1), vget_low_u64(m2)));
+    r0 = vorrq_u64(r0, vcombine_u64(vget_high_u64(m0), vget_low_u64(m1)));
+    r0 = vandq_u64(r0, x1);
+    changed = vorrq_u64(changed, r0);
+
+    r0 = vshlq_n_u64(m2, 1);
+    r0 = vorrq_u64(r0, vcombine_u64(vget_high_u64(m2), vget_low_u64(m3)));
+    r0 = vorrq_u64(r0, vcombine_u64(vget_high_u64(m1), vget_low_u64(m2)));
+    r0 = vandq_u64(r0, x2);
+    changed = vorrq_u64(changed, r0);
+
+    r0 = vshlq_n_u64(m3, 1);
+    r0 = vorrq_u64(r0, vcombine_u64(vget_high_u64(m3), vcreate_u64(0)));
+    r0 = vorrq_u64(r0, vcombine_u64(vget_high_u64(m2), vget_low_u64(m3)));
+    r0 = vandq_u64(r0, x3);
+    changed = vorrq_u64(changed, r0);
+
+    // Test if there is 1 bit in `changed`
+    return vgetq_lane_u64(changed, 0) | vgetq_lane_u64(changed, 1);
+}
+
+
+
+PA_FORCE_INLINE void expand_forward(
+    const Waterfill_64x8_arm64_NEON_ProcessedMask& mask,
+    uint64x2_t& x0, uint64x2_t& x1, uint64x2_t& x2, uint64x2_t& x3
+){
+    uint64x2_t s0 = vaddq_u64(x0, mask.m0);
+    uint64x2_t s1 = vaddq_u64(x1, mask.m1);
+    uint64x2_t s2 = vaddq_u64(x2, mask.m2);
+    uint64x2_t s3 = vaddq_u64(x3, mask.m3);
+
+    s0 = vbicq_u64(mask.m0, s0);
+    s1 = vbicq_u64(mask.m1, s1);
+    s2 = vbicq_u64(mask.m2, s2);
+    s3 = vbicq_u64(mask.m3, s3);
+
+    x0 = vorrq_u64(x0, s0);
+    x1 = vorrq_u64(x1, s1);
+    x2 = vorrq_u64(x2, s2);
+    x3 = vorrq_u64(x3, s3);
+}
+PA_FORCE_INLINE void expand_reverse(uint64x2_t m, uint64x2_t b, uint64x2_t& x){
+    uint64x2_t s = bit_reverse(vaddq_u64(bit_reverse(x), b));
+    s = veorq_u64(s, m);
+    s = vandq_u64(s, m);
+    x = vorrq_u64(x, s);
+}
+PA_FORCE_INLINE void expand_reverse(
+    const Waterfill_64x8_arm64_NEON_ProcessedMask& mask,
+    uint64x2_t& x0, uint64x2_t& x1, uint64x2_t& x2, uint64x2_t& x3
+){
+    expand_reverse(mask.m0, mask.b0, x0);
+    expand_reverse(mask.m1, mask.b1, x1);
+    expand_reverse(mask.m2, mask.b2, x2);
+    expand_reverse(mask.m3, mask.b3, x3);
+}
+PA_FORCE_INLINE void expand_vertical(
+    const Waterfill_64x8_arm64_NEON_ProcessedMask& mask,
+    uint64x2_t& x0, uint64x2_t& x1, uint64x2_t& x2, uint64x2_t& x3
+){
+    //  Carry across adjacent rows.
+    transpose_u64_2x2_NEON(x0, x1);
+    transpose_u64_2x2_NEON(x2, x3);
+    x0 = vorrq_u64(x0, vandq_u64(x1, mask.t0));
+    x1 = vorrq_u64(x1, vandq_u64(x0, mask.t1));
+    x2 = vorrq_u64(x2, vandq_u64(x3, mask.t2));
+    x3 = vorrq_u64(x3, vandq_u64(x2, mask.t3));
+    transpose_u64_2x2_NEON(x0, x1);
+    transpose_u64_2x2_NEON(x2, x3);
+
+    //  Carry across groups of 2 rows.
+    uint64x1_t x0h = vget_high_u64(x0);
+    x1 = vorrq_u64(x1, vandq_u64(vcombine_u64(x0h, x0h), mask.f1));
+    uint64x1_t x3l = vget_low_u64(x3);
+    x2 = vorrq_u64(x2, vandq_u64(vcombine_u64(x3l, x3l), mask.r2));
+    uint64x1_t x1h = vget_high_u64(x1);
+    x2 = vorrq_u64(x2, vandq_u64(vcombine_u64(x1h, x1h), mask.f2));
+    uint64x1_t x2l = vget_low_u64(x2);
+    x1 = vorrq_u64(x1, vandq_u64(vcombine_u64(x2l, x2l), mask.r1));
+    uint64x1_t x2h = vget_high_u64(x2);
+    x3 = vorrq_u64(x3, vandq_u64(vcombine_u64(x2h, x2h), mask.f3));
+    uint64x1_t x1l = vget_low_u64(x1);
+    x0 = vorrq_u64(x0, vandq_u64(vcombine_u64(x1l, x1l), mask.r0));
+}
+
+
+
+struct Waterfill_64x8_arm64_NEON{
+
+
+
+// Do vector-wise logical OR among each SIMD vector
+static PA_FORCE_INLINE uint64x2_t vec_or(const BinaryTile_64x8_arm64_NEON& tile){
+    uint64x2_t v0 = vorrq_u64(tile.vec.val[0], tile.vec.val[1]);
+    uint64x2_t v1 = vorrq_u64(tile.vec.val[2], tile.vec.val[3]);
+    return vorrq_u64(v0, v1);
+}
+// Do a in-tile row-wise logical OR among each row
+static PA_FORCE_INLINE uint64_t row_or(const BinaryTile_64x8_arm64_NEON& tile){
+    uint64x2_t v = vec_or(tile);
+    return vgetq_lane_u64(v, 0) | vgetq_lane_u64(v, 1);
+}
+
+
+//  Find a one bit in the specified tile.
+//  If found, (x, y) are set to its coordinates and returns true.
+//  If entire tile is zero, returns false.
+static PA_FORCE_INLINE bool find_bit(size_t& x, size_t& y, const BinaryTile_64x8_arm64_NEON& tile){
+    // Check whether thera are any 1-bits in the tile:
+    uint64x2_t anything = vec_or(tile);
+    if ((vgetq_lane_u64(anything, 0) | vgetq_lane_u64(anything, 1)) == 0){
+        return false;
+    }
+    // Check each tile row:
+    for (size_t r = 0; r < 8; r++){
+        size_t pos;
+        if (trailing_zeros(pos, tile.row(r))){
+            x = pos;
+            y = r;
+            return true;
+        }
+    }
+    return false;
+}
+
+
+
+//  Finds the boundaries of the one-bits inside the tile.
+//  Max values are one past the end.
+//  Behavior is undefined if tile is zero.
+static PA_FORCE_INLINE void boundaries(
+    const BinaryTile_64x8_arm64_NEON& tile,
+    size_t& min_x, size_t& max_x,
+    size_t& min_y, size_t& max_y
+){
+    uint64_t all_or = row_or(tile);
+    trailing_zeros(min_x, all_or);
+    max_x = bitlength(all_or);
+
+    min_y = 0;
+    for (size_t c = 0; c < 8; c++){
+        if (tile.row(c) != 0){
+            min_y = c;
+            break;
+        }
+    }
+    max_y = 0;
+    for (size_t c = 8; c > 0; c--){
+        if (tile.row(c - 1) != 0){
+            max_y = c;
+            break;
+        }
+    }
+}
+
+
+
+// Compute the sum of the indices of 1 bits in `x`  and store in `sum_index`, and compute
+// counts of 1 bits (aka popcount) of `x` and return it as the function return.
+// Note: `sum_index` is useful for computing center of gravity of bitmap objects.
+// Example of index sum of a bitmap:
+// 0b0001 is 0
+// 0b0100 is 2
+// 0b1010 is 1 + 3 = 4
+static PA_FORCE_INLINE uint64x2_t popcount_indexsum(uint64x2_t& sum_index, uint64x2_t x){
+    //  1 -> 2
+    // Get the bits in the original [0, 2, 4, 6, ...] bit positions by right shifting by one, then
+    // logical AND with 0b ... 0101 0101
+    uint8x16_t pop_high = vandq_u8(vshrq_n_u8(vreinterpretq_u8_u64(x), 1), vdupq_n_u8(0x55));
+    // Get the bits in the original [1, 3, 5, 7, ...] bit positions by logical AND with 0b ... 0101 0101
+    uint8x16_t pop_low = vandq_u8(vreinterpretq_u8_u64(x), vdupq_n_u8(0x55));
+    // Add them to get the bit-pair-wise addition
+    // Each nbring pair of bits is added in the pair and the result is stored in a 2-bit-wide space.
+    // The result can only be 0b00, 0b01 or 0b10 so it won't overflow the 2-bit storage.
+    // You can think `popcount` as storing the bit count of each 2-bit-wide space of the original bitmap
+    uint8x16_t popcount = vaddq_u8(pop_low, pop_high);
+
+    uint8x16_t sum_high, sum_low;
+    // think `sumaxis` as containing the index sum of the bits of the 2-bit-wide space in the original bitmap,
+    // For each 2-bit wide space in the original bitmap:
+    // if it's 0b00, then index sum is 0 
+    // if it's 0b01, then index sum is 0 (the 1 is at 0-th index, so the index sum is still 0)
+    // if it's 0b10, then index sum is 1
+    // if it's 0b11, then index sum is 1
+    uint8x16_t sumxaxis = pop_high;
+
+    //  2 -> 4
+    // Right shift `sumxaxis` by 2, then logical AND with 0b ... 0011 0011
+    // This means we get the 0b1100 part of `sumxaxis` into sum_high
+    sum_high = vandq_u8(vshrq_n_u8(sumxaxis, 2), vdupq_n_u8(0x33));
+    // Right shift `popcount` by 2, then logical AND with 0b ... 0011 0011
+    // This means we get the 0b1100 part of `popcount` into `pop_high`
+    pop_high = vandq_u8(vshrq_n_u8(popcount, 2), vdupq_n_u8(0x33));
+    // logical AND of `sumxaxis` and 0b ... 0011 0011
+    // This means we get the 0b0011 part of `sumxaxis` into `sum_low`
+    sum_low = vandq_u8(sumxaxis, vdupq_n_u8(0x33));
+    // Add sum_low and sum_high together for each 4-bit-wide space
+    // Then add the count from `pop_high` shifted.
+    // You can think index sum is made by "lower part" of a 4-bit-wide space and "higher part" of the space.
+    // According to the physics reasoning that computes the combined center of gravity of a collection of objects,
+    // 4-bit index sum = 2-bit index sum of the lower part + 2-bit index sum of the higher part
+    //                 + bit count of the higher part * 2
+    // `sumxaxis` value for each 4-bit-wide space ranges [0, 6]
+    sumxaxis = vaddq_u8(sum_low, sum_high);
+    sumxaxis = vaddq_u8(sumxaxis, vshlq_n_u8(pop_high, 1));
+
+    // Get the 0b0011 part of `popcount` into `pop_low`
+    pop_low = vandq_u8(popcount, vdupq_n_u8(0x33));
+    // Add `pop_low` and `pop_high` together to count the bits in 4-bit-wide nbrhood in the original bitmap
+    // The max value possible is 4 (aka 0b0100), so won't overflow 4-bit-wide space
+    // You can think `popcount` as storing the bit count of each 4-bit-wide space of the original bitmap
+    // You can think `pop_low` is the bit count of the "lower part" (in this block of compuattion, the lower
+    // part of the 4-bit-wide space), while `pop_high` is the bit count of the "higher part".
+    // `popcount` value for each 4-bit-wide space ranges [0, 4]
+    popcount = vaddq_u8(pop_low, pop_high);
+
+    //  4 -> 8
+    // `sum_high`: higher part of the 8-bit-wide space in `sumxaxis`
+    sum_high = vandq_u8(vshrq_n_u8(sumxaxis, 4), vdupq_n_u8(0x0f));
+    // `pip_high`: higher part of the 8-bit-wide space in `popcount`
+    pop_high = vandq_u8(vshrq_n_u8(popcount, 4), vdupq_n_u8(0x0f));
+    // `sum_low`: lower part of the 8-bit-wide space in `sumxaxis`
+    sum_low = vandq_u8(sumxaxis, vdupq_n_u8(0x0f));
+    // `sumxaxis`: index sum for each 8-bit-wide space, value range: [0, 28]
+    sumxaxis = vaddq_u8(sum_low, sum_high);
+    sumxaxis = vaddq_u8(sumxaxis, vshlq_n_u8(pop_high, 2));
+    // `pop_low`: lower part of the 8-bit-wide space in `popcount`
+    pop_low = vandq_u8(popcount, vdupq_n_u8(0x0f));
+    // `popcount` of the 8-bit-wide space, range [0, 8]
+    popcount = vaddq_u8(pop_low, pop_high);
+
+    //  8 -> 16
+    // Get higher part of 16-bit-wide space in `popcount`
+    uint16x8_t pop_high_u16x8 = vshrq_n_u16(vreinterpretq_u16_u8(popcount), 8);
+    // Get the index sum for each 16-bit-wise space
+    // vpadalq_u8(a, b): pair-wise add in `b`, then add to `a`
+    // index sum range: [0, 120]
+    uint16x8_t sumxaxis_u16x8 = vpadalq_u8(vshlq_n_u16(pop_high_u16x8, 3), sumxaxis);
+    // Get popcount of each 16-bit-wise space
+    // popcount value: [0, 16]
+    uint16x8_t popcount_u16x8 = vpaddlq_u8(popcount);
+
+    //  16 -> 32
+    uint32x4_t pop_high_u32x4 = vshrq_n_u32(vreinterpretq_u32_u16(popcount_u16x8), 16);
+    // Get the index sum for each 32-bit-wise space
+    // index sum range: [0, 496]
+    uint32x4_t sumxaxis_u32x4 = vpadalq_u16(vshlq_n_u32(pop_high_u32x4, 4), sumxaxis_u16x8);
+    // Get popcount of each 32-bit-wise space
+    // popcount value: [0, 32]
+    uint32x4_t popcount_u32x4 = vpaddlq_u16(popcount_u16x8);
+
+    //  32 -> 64
+    uint64x2_t pop_high_u64x2 = vshrq_n_u64(vreinterpretq_u64_u32(popcount_u32x4), 32);
+    // Get the index sum for each 64-bit-wise space
+    uint64x2_t sumxaxis_u64x2 = vpadalq_u32(vshlq_n_u64(pop_high_u64x2, 5), sumxaxis_u32x4);
+    // Get popcount of each 64-bit-wise space
+    uint64x2_t popcount_u64x2 = vpaddlq_u32(popcount_u32x4);
+
+    // TODO: The above vpadxlq_uxx() operations are horizontal, may be slow.
+    // Can try to compare with SSE42 impl.
+
+    sum_index = sumxaxis_u64x2;
+    return popcount_u64x2;
+}
+
+static PA_FORCE_INLINE uint64_t popcount_sumcoord(
+    uint64_t& sum_xcoord, uint64_t& sum_ycoord,
+    const BinaryTile_64x8_arm64_NEON& tile
+){
+    uint64x2_t sum_p, sum_x, sum_y;
+    {
+        uint64x2_t pop, sum;
+        pop = popcount_indexsum(sum, tile.vec.val[0]);
+        sum_p = pop;
+        sum_x = sum;
+        sum_y = vmull_u32(vmovn_u64(pop), uint32x2_t{0, 1});
+    }
+    {
+        uint64x2_t pop, sum;
+        pop = popcount_indexsum(sum, tile.vec.val[1]);
+        sum_p = vaddq_u64(sum_p, pop);
+        sum_x = vaddq_u64(sum_x, sum);
+        sum_y = vaddq_u64(sum_y, vmull_u32(vmovn_u64(pop), uint32x2_t{2, 3}));
+    }
+    {
+        uint64x2_t pop, sum;
+        pop = popcount_indexsum(sum, tile.vec.val[2]);
+        sum_p = vaddq_u64(sum_p, pop);
+        sum_x = vaddq_u64(sum_x, sum);
+        sum_y = vaddq_u64(sum_y, vmull_u32(vmovn_u64(pop), uint32x2_t{4, 5}));
+    }
+    {
+        uint64x2_t pop, sum;
+        pop = popcount_indexsum(sum, tile.vec.val[3]);
+        sum_p = vaddq_u64(sum_p, pop);
+        sum_x = vaddq_u64(sum_x, sum);
+        sum_y = vaddq_u64(sum_y, vmull_u32(vmovn_u64(pop), uint32x2_t{6, 7}));
+    }
+    sum_xcoord = vgetq_lane_u64(sum_x, 0) + vgetq_lane_u64(sum_x, 1);
+    sum_ycoord = vgetq_lane_u64(sum_y, 0) + vgetq_lane_u64(sum_y, 1);
+    return vgetq_lane_u64(sum_p, 0) + vgetq_lane_u64(sum_p, 1);
+}
+
+
+
+//  Run Waterfill algorithm on mask "m" with starting point "x".
+//  Save result back into "x". Clear bits of object from "m".
+static PA_FORCE_INLINE void waterfill_expand(BinaryTile_64x8_arm64_NEON& m, BinaryTile_64x8_arm64_NEON& x){
+    uint64x2_t x0 = x.vec.val[0];
+    uint64x2_t x1 = x.vec.val[1];
+    uint64x2_t x2 = x.vec.val[2];
+    uint64x2_t x3 = x.vec.val[3];
+
+    Waterfill_64x8_arm64_NEON_ProcessedMask mask(m, x0, x1, x2, x3);
+    expand_forward(mask, x0, x1, x2, x3);
+
+    uint64x2_t m0, m1, m2, m3;
+    do{
+        expand_vertical(mask, x0, x1, x2, x3);
+        expand_reverse(mask, x0, x1, x2, x3);
+        expand_forward(mask, x0, x1, x2, x3);
+    }while (keep_going(
+        mask,
+        m0, m1, m2, m3,
+        x0, x1, x2, x3
+    ));
+    x.vec.val[0] = x0;
+    x.vec.val[1] = x1;
+    x.vec.val[2] = x2;
+    x.vec.val[3] = x3;
+    m.vec.val[0] = m0;
+    m.vec.val[1] = m1;
+    m.vec.val[2] = m2;
+    m.vec.val[3] = m3;
+}
+
+
+
+//  Touch the edge of "tile" with the specified border.
+//  Returns true if "tile" has changed and needs to be updated.
+static PA_FORCE_INLINE bool waterfill_touch_top(
+    const BinaryTile_64x8_arm64_NEON& mask,
+    BinaryTile_64x8_arm64_NEON& tile,
+    const BinaryTile_64x8_arm64_NEON& border
+){
+    uint64_t available = mask.top() & ~tile.top();
+    uint64_t new_bits = available & border.bottom();
+    if (new_bits == 0){
+        return false;
+    }
+    tile.top() |= new_bits;
+    return true;
+}
+static PA_FORCE_INLINE bool waterfill_touch_bottom(
+    const BinaryTile_64x8_arm64_NEON& mask,
+    BinaryTile_64x8_arm64_NEON& tile,
+    const BinaryTile_64x8_arm64_NEON& border
+){
+    uint64_t available = mask.bottom() & ~tile.bottom();
+    uint64_t new_bits = available & border.top();
+    if (new_bits == 0){
+        return false;
+    }
+    tile.bottom() |= new_bits;
+    return true;
+}
+static PA_FORCE_INLINE bool waterfill_touch_left(
+    const BinaryTile_64x8_arm64_NEON& mask,
+    BinaryTile_64x8_arm64_NEON& tile,
+    const BinaryTile_64x8_arm64_NEON& border
+){
+    uint64x2_t changed = vreinterpretq_u64_u8(vdupq_n_u8(0));
+    for (size_t c = 0; c < 4; c++){
+        uint64x2_t available = vbicq_u64(mask.vec.val[c], tile.vec.val[c]);
+        uint64x2_t new_bits = vandq_u64(available, vshrq_n_u64(border.vec.val[c], 63));
+        changed = vorrq_u64(changed, new_bits);
+        tile.vec.val[c] = vorrq_u64(tile.vec.val[c], new_bits);
+    }
+    // Test if there is 1 bit in `changed`
+    return vgetq_lane_u64(changed, 0) | vgetq_lane_u64(changed, 1);
+}
+static PA_FORCE_INLINE bool waterfill_touch_right(
+    const BinaryTile_64x8_arm64_NEON& mask,
+    BinaryTile_64x8_arm64_NEON& tile,
+    const BinaryTile_64x8_arm64_NEON& border
+){
+    uint64x2_t changed = vreinterpretq_u64_u8(vdupq_n_u8(0));
+    for (size_t c = 0; c < 4; c++){
+        uint64x2_t available = vbicq_u64(mask.vec.val[c], tile.vec.val[c]);
+        uint64x2_t new_bits = vandq_u64(available, vshlq_n_u64(border.vec.val[c], 63));
+        changed = vorrq_u64(changed, new_bits);
+        tile.vec.val[c] = vorrq_u64(tile.vec.val[c], new_bits);
+    }
+    // Test if there is 1 bit in `changed`
+    return vgetq_lane_u64(changed, 0) | vgetq_lane_u64(changed, 1);
+}
+
+
+};
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x8_x64_SSE42.cpp b/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x8_x64_SSE42.cpp
index 54b4b8ed41..255093c9fb 100644
--- a/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x8_x64_SSE42.cpp
+++ b/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x8_x64_SSE42.cpp
@@ -1,6 +1,6 @@
 /*  Waterfill Core (x64 SSE4.2)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x8_x64_SSE42.h b/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x8_x64_SSE42.h
index ecfb8ac05e..a76f7f6f9f 100644
--- a/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x8_x64_SSE42.h
+++ b/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x8_x64_SSE42.h
@@ -1,6 +1,6 @@
 /*  Waterfill Core (x64 SSE4.1)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -381,7 +381,11 @@ static PA_FORCE_INLINE void waterfill_expand(BinaryTile_64x8_x64_SSE42& m, Binar
 
 //  Touch the edge of "tile" with the specified border.
 //  Returns true if "tile" has changed and needs to be updated.
-static PA_FORCE_INLINE bool waterfill_touch_top(const BinaryTile_64x8_x64_SSE42& mask, BinaryTile_64x8_x64_SSE42& tile, const BinaryTile_64x8_x64_SSE42& border){
+static PA_FORCE_INLINE bool waterfill_touch_top(
+    const BinaryTile_64x8_x64_SSE42& mask,
+    BinaryTile_64x8_x64_SSE42& tile,
+    const BinaryTile_64x8_x64_SSE42& border
+){
     uint64_t available = mask.top() & ~tile.top();
     uint64_t new_bits = available & border.bottom();
     if (new_bits == 0){
@@ -390,7 +394,11 @@ static PA_FORCE_INLINE bool waterfill_touch_top(const BinaryTile_64x8_x64_SSE42&
     tile.top() |= new_bits;
     return true;
 }
-static PA_FORCE_INLINE bool waterfill_touch_bottom(const BinaryTile_64x8_x64_SSE42& mask, BinaryTile_64x8_x64_SSE42& tile, const BinaryTile_64x8_x64_SSE42& border){
+static PA_FORCE_INLINE bool waterfill_touch_bottom(
+    const BinaryTile_64x8_x64_SSE42& mask,
+    BinaryTile_64x8_x64_SSE42& tile,
+    const BinaryTile_64x8_x64_SSE42& border
+){
     uint64_t available = mask.bottom() & ~tile.bottom();
     uint64_t new_bits = available & border.top();
     if (new_bits == 0){
@@ -399,7 +407,11 @@ static PA_FORCE_INLINE bool waterfill_touch_bottom(const BinaryTile_64x8_x64_SSE
     tile.bottom() |= new_bits;
     return true;
 }
-static PA_FORCE_INLINE bool waterfill_touch_left(const BinaryTile_64x8_x64_SSE42& mask, BinaryTile_64x8_x64_SSE42& tile, const BinaryTile_64x8_x64_SSE42& border){
+static PA_FORCE_INLINE bool waterfill_touch_left(
+    const BinaryTile_64x8_x64_SSE42& mask,
+    BinaryTile_64x8_x64_SSE42& tile,
+    const BinaryTile_64x8_x64_SSE42& border
+){
     __m128i changed = _mm_setzero_si128();
     for (size_t c = 0; c < 4; c++){
         __m128i available = _mm_andnot_si128(tile.vec[c], mask.vec[c]);
@@ -409,7 +421,11 @@ static PA_FORCE_INLINE bool waterfill_touch_left(const BinaryTile_64x8_x64_SSE42
     }
     return !_mm_test_all_zeros(changed, changed);
 }
-static PA_FORCE_INLINE bool waterfill_touch_right(const BinaryTile_64x8_x64_SSE42& mask, BinaryTile_64x8_x64_SSE42& tile, const BinaryTile_64x8_x64_SSE42& border){
+static PA_FORCE_INLINE bool waterfill_touch_right(
+    const BinaryTile_64x8_x64_SSE42& mask,
+    BinaryTile_64x8_x64_SSE42& tile,
+    const BinaryTile_64x8_x64_SSE42& border
+){
     __m128i changed = _mm_setzero_si128();
     for (size_t c = 0; c < 4; c++){
         __m128i available = _mm_andnot_si128(tile.vec[c], mask.vec[c]);
diff --git a/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Core_64xH_Default.cpp b/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Core_64xH_Default.cpp
index fd0d323074..5671b8bf79 100644
--- a/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Core_64xH_Default.cpp
+++ b/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Core_64xH_Default.cpp
@@ -1,6 +1,6 @@
 /*  Waterfill Core (64-bit integer)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Core_64xH_Default.h b/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Core_64xH_Default.h
index cee9838372..ef93bf7cb2 100644
--- a/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Core_64xH_Default.h
+++ b/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Core_64xH_Default.h
@@ -1,6 +1,6 @@
 /*  Waterfill Core (Default)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Intrinsics_x64_AVX512-GF.h b/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Intrinsics_x64_AVX512-GF.h
index 23f43d4552..bb1f3331b1 100644
--- a/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Intrinsics_x64_AVX512-GF.h
+++ b/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Intrinsics_x64_AVX512-GF.h
@@ -1,6 +1,6 @@
 /*  Waterfill Intrinsics (x64 AVX512-GF)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Intrinsics_x64_AVX512.h b/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Intrinsics_x64_AVX512.h
index a343679983..8a5f9e6013 100644
--- a/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Intrinsics_x64_AVX512.h
+++ b/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Intrinsics_x64_AVX512.h
@@ -1,6 +1,6 @@
 /*  Waterfill Intrinsics (x64 AVX512-GF)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Routines.h b/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Routines.h
index 5cd0002fc1..8e72c52e3b 100644
--- a/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Routines.h
+++ b/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Routines.h
@@ -1,6 +1,6 @@
 /*  Waterfill Routines
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -16,6 +16,10 @@
 #include "Kernels_Waterfill_Session.tpp"
 #include "Kernels_Waterfill.h"
 
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
 namespace PokemonAutomation{
 namespace Kernels{
 namespace Waterfill{
@@ -23,6 +27,7 @@ namespace Waterfill{
 
 
 
+//  Find all the objects in the matrix. This will destroy "matrix".
 template <typename Tile, typename TileRoutines>
 std::vector<WaterfillObject> find_objects_inplace(PackedBinaryMatrixCore<Tile>& matrix, size_t min_area){
     std::vector<WaterfillObject> ret;
diff --git a/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Session.cpp b/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Session.cpp
index e82d2252c3..b82c70f589 100644
--- a/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Session.cpp
+++ b/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Session.cpp
@@ -1,6 +1,6 @@
 /*  Waterfill Routines
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -26,6 +26,7 @@ std::unique_ptr<WaterfillSession> make_WaterfillSession_64x32_x64_AVX512    (Pac
 std::unique_ptr<WaterfillSession> make_WaterfillSession_64x32_x64_AVX512GF  (PackedBinaryMatrix_IB* matrix);
 std::unique_ptr<WaterfillSession> make_WaterfillSession_64x64_x64_AVX512    (PackedBinaryMatrix_IB* matrix);
 std::unique_ptr<WaterfillSession> make_WaterfillSession_64x64_x64_AVX512GF  (PackedBinaryMatrix_IB* matrix);
+std::unique_ptr<WaterfillSession> make_WaterfillSession_64x8_arm64_NEON      (PackedBinaryMatrix_IB* matrix);
 
 std::unique_ptr<WaterfillSession> make_WaterfillSession(){
 //    cout << "make_WaterfillSession()" << endl;
@@ -54,7 +55,10 @@ std::unique_ptr<WaterfillSession> make_WaterfillSession(){
     case BinaryMatrixType::i64x8_x64_SSE42:
         return make_WaterfillSession_64x8_x64_SSE42(nullptr);
 #endif
-
+#ifdef PA_AutoDispatch_arm64_20_M1
+    case BinaryMatrixType::arm64x8_x64_NEON:
+        return make_WaterfillSession_64x8_arm64_NEON(nullptr);
+#endif
     case BinaryMatrixType::i64x8_Default:
         return make_WaterfillSession_64x8_Default(nullptr);
     case BinaryMatrixType::i64x4_Default:
@@ -89,7 +93,10 @@ std::unique_ptr<WaterfillSession> make_WaterfillSession(PackedBinaryMatrix_IB& m
     case BinaryMatrixType::i64x8_x64_SSE42:
         return make_WaterfillSession_64x8_x64_SSE42(&matrix);
 #endif
-
+#ifdef PA_AutoDispatch_arm64_20_M1
+    case BinaryMatrixType::arm64x8_x64_NEON:
+        return make_WaterfillSession_64x8_arm64_NEON(&matrix);
+#endif
     case BinaryMatrixType::i64x8_Default:
         return make_WaterfillSession_64x8_Default(&matrix);
     case BinaryMatrixType::i64x4_Default:
diff --git a/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Session.h b/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Session.h
index f4a5bdec2c..bd0dc83523 100644
--- a/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Session.h
+++ b/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Session.h
@@ -1,6 +1,6 @@
 /*  Waterfill Session
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -17,7 +17,10 @@ namespace Waterfill{
 
 class WaterfillIterator;
 
-
+// Abstract base class for doing waterfill operations
+// Waterfill is finding connected components on in a binary matrix.
+// The implementation is in template derived class `WaterfillSession_t`.
+// It is templated to allow different implementations of SIMD code.
 class WaterfillSession{
 public:
     virtual ~WaterfillSession() = default;
@@ -44,7 +47,11 @@ class WaterfillIterator{
 public:
     virtual ~WaterfillIterator() = default;
 
-    //  Returns false is nothing is left.
+    //  Find next waterfill object from a waterfill session.
+    //  Keep_object: returned WaterfillObject has member var `object` assigned that stores
+    //    the binary matrix belonging to the pixels of this object. The binary matrix has
+    //    the same size as the input image the waterill session runs on.
+    //  Returns false when it reaches the end of iteration.
     virtual bool find_next(WaterfillObject& object, bool keep_object) = 0;
 };
 
diff --git a/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Session.tpp b/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Session.tpp
index be6f270cff..2c48779819 100644
--- a/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Session.tpp
+++ b/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Session.tpp
@@ -16,9 +16,9 @@
 #include "Kernels/BinaryMatrix/Kernels_SparseBinaryMatrixCore.h"
 #include "Kernels_Waterfill_Session.h"
 
-//#include <iostream>
-//using std::cout;
-//using std::endl;
+// #include <iostream>
+// using std::cout;
+// using std::endl;
 
 namespace PokemonAutomation{
 namespace Kernels{
@@ -26,7 +26,27 @@ namespace Waterfill{
 
 
 
-
+// Template that implements the waterfill algorithm.
+// See abstract base class WaterfillSession for more details.
+//
+// Tile: the implementation of a tile made by bits. Tile width is always 64 bits (or called a word64).
+// Tile is defined as struct `BinaryTile_<TILE_SHAPE>_<CPU_BRAND>_<CPU_ARCH>`, e.g. `BinaryTile_64x8_x64_SSE42`.
+// For each SIMD implementation, there is this tile struct defined in header file
+// BinaryMatrix/Kernels_BinaryMatrixTile_<TILE_SHAPE>_<CPU_BRAND>_<CPU_ARCH>.h
+//
+// TileRoutines: the implmentation of tile specific waterfill routines include:
+// - TileRoutines::find_bit(bit_x, bit_y, tile)
+// - TileRoutines::waterfill_expand(mask, tile)
+// - TileRoutines::waterfill_touch_bottom(mask, tile, border)
+// - TileRoutines::waterfill_touch_top(mask, tile, border)
+// - TileRoutines::waterfill_touch_left(mask, tile, border)
+// - TileRoutines::waterfill_touch_right(mask, tile, border)
+// - TileRoutines::row_or(tile)
+// - TileRoutines::popcount_sumcoord(sum_x, sum_y, tile)
+// - TileRoutines::boundaries(tile, min_x, max_x, min_y, max_y)
+// TileRoutines are defined as struct `Waterfill_<TILE_SHAPE>_<CPU_BRAND>_<CPU_ARCH>`, e.g. `Waterfill_64x8_x64_SSE42`.
+// For each SIMD implementation, there is this waterfill routine struct defined in header file
+// Waterfill/Kernels_Waterfill_Core_<TILE_SHAPE>_<CPU_BRAND>_<CPU_ARCH>.h
 template <typename Tile, typename TileRoutines>
 class WaterfillSession_t final : public WaterfillSession{
 public:
@@ -53,15 +73,25 @@ public:
         set_source(static_cast<PackedBinaryMatrix_t<Tile>&>(source).get());
     }
 
+    // In matrix, how many tiles in a row
     size_t tile_width() const{ return m_source->tile_width(); }
+    // In matrix, how many tiles in a column
     size_t tile_height() const{ return m_source->tile_height(); }
 
     virtual std::unique_ptr<WaterfillIterator> make_iterator(size_t min_area) override;
 
+    //  Get the object at the specific bit position.
+    //  The object will be removed from the input matrix.
+    //  Return true if there is an object at the bit (x, y); false otherwise.
+    //  If keep_object is true, object.object is constructed.
     virtual bool find_object_on_bit(
         WaterfillObject& object, bool keep_object,
         size_t x, size_t y
     ) override;
+    //  Get the object at the specific tile (tile_x, tile_y).
+    //  The object will be removed from the input matrix.
+    //  Return true if there is an object at the tile; false otherwise.
+    //  If keep_object is true, object.object is constructed.
     bool find_object_in_tile(
         WaterfillObject& object, bool keep_object,
         size_t tile_x, size_t tile_y
@@ -69,6 +99,8 @@ public:
 
 
 private:
+    // Called by both find_object_on_bit() and find_object_in_tile()
+    // Find the object at tile indexed as (tile_x, tile_y) and at in-tile location (bit_x, bit_y)
     bool find_object(
         WaterfillObject& object, bool keep_object,
         size_t tile_x, size_t tile_y,
@@ -131,6 +163,7 @@ bool WaterfillSession_t<Tile, TileRoutines>::find_object_on_bit(
     WaterfillObject& object, bool keep_object,
     size_t x, size_t y
 ){
+    // If (x,y) is 0, no object
     if (!m_source->get(x, y)){
         return false;
     }
@@ -145,6 +178,7 @@ bool WaterfillSession_t<Tile, TileRoutines>::find_object_on_bit(
 
     return find_object(object, keep_object, tile_x, tile_y, bit_x, bit_y);
 }
+
 template <typename Tile, typename TileRoutines>
 bool WaterfillSession_t<Tile, TileRoutines>::find_object_in_tile(
     WaterfillObject& object, bool keep_object,
@@ -169,7 +203,9 @@ bool WaterfillSession_t<Tile, TileRoutines>::find_object(
 ){
 //    clear_dirty_tiles();
 
+    // How many tiles in a row
     size_t tile_width = m_source->tile_width();
+    // How many tiles in a column
     size_t tile_height = m_source->tile_height();
 
     //  Set first tile.
@@ -180,18 +216,22 @@ bool WaterfillSession_t<Tile, TileRoutines>::find_object(
     m_object.tile(x, y).set_bit(bit_x, bit_y);
 
     //  Special case for isolated bit.
+    //  `first_expand` is set to true if there are 4-nbring 1-bits next to the starting bit, i.e the
+    //  starting bit is not isolated.
     bool first_expand = true;
 #if 1
     {
+        // top edge: whether the starting bit (bit_x, bit_y) is at the top edge of the tile
         bool top_edge = bit_y == 0;
         bool bottom_edge = bit_y == Tile::HEIGHT - 1;
 //        bool left_edge = bit_x == 0;
 //        bool right_edge = bit_x == Tile::WIDTH - 1;
 
         Tile& tile = m_source->tile(x, y);
-        uint64_t rowC = tile.row(bit_y);
-        uint64_t rowA = top_edge ? 0 : tile.row(bit_y - 1);
-        uint64_t rowB = bottom_edge ? 0 : tile.row(bit_y + 1);
+        uint64_t rowC = tile.row(bit_y); // row "C"urrent
+        uint64_t rowA = top_edge ? 0 : tile.row(bit_y - 1); // row "A"bove
+        uint64_t rowB = bottom_edge ? 0 : tile.row(bit_y + 1);  // row "B"elow
+        // Find that within this tile, whether thera are any 4-nbring bits that are also 1.
         uint64_t test = rowA | rowB | (rowC << 1) | (rowC >> 1);
         test &= (uint64_t)1 << bit_x;
 
@@ -201,48 +241,62 @@ bool WaterfillSession_t<Tile, TileRoutines>::find_object(
 
     //  Iterate Waterfill...
     while (m_busy_tiles.pop(x, y)){
-        Tile& mask = m_source->tile(x, y);
-        Tile& tile = m_object.tile(x, y);
+        // Get the next tile at index (x, y)
+        Tile& source_mask = m_source->tile(x, y);
+        Tile& recorded_tile = m_object.tile(x, y);
 
         //  Expand current tile.
         if (first_expand){
-            TileRoutines::waterfill_expand(mask, tile);
+            // expand found object `recorded_tile`'s bits according to source tile `source_mask`
+            TileRoutines::waterfill_expand(source_mask, recorded_tile);
         }else{
-            mask.andnot(tile);
+            // source_mask = (NOT tile) AND source_mask
+            // Delete the bits on source tile `source_mask` that are already found (and recorded in `recorded_tile`)
+            // In this way we won't enter an infinite loop of discovering old visited bits from `source_mask`.
+            source_mask.andnot(recorded_tile);
         }
         first_expand = true;
 
         size_t current_x, current_y;
-        if (y > 0 && tile.top() != 0){
+        // If we have a top nbr tile and the current found bits reach the top row of the current tile
+        // waterfill into the top nbr tile
+        if (y > 0 && recorded_tile.top() != 0){
             current_y = y - 1;
             const Tile& neighbor_mask = m_source->tile(x, current_y);
-            if (TileRoutines::waterfill_touch_bottom(neighbor_mask, m_object.tile(x, current_y), tile)){
+            if (TileRoutines::waterfill_touch_bottom(neighbor_mask, m_object.tile(x, current_y), recorded_tile)){
                 m_busy_tiles.set(x, current_y);
                 m_object_tiles.set(x, current_y);
             }
         }
+        // If we have a bottom nbr tile and the current found bits reach the bottom row of the current tile
+        // waterfill into the bottom nbr tile
         current_y = y + 1;
-        if (current_y < tile_height && tile.bottom() != 0){
+        if (current_y < tile_height && recorded_tile.bottom() != 0){
             const Tile& neighbor_mask = m_source->tile(x, current_y);
-            if (TileRoutines::waterfill_touch_top(neighbor_mask, m_object.tile(x, current_y), tile)){
+            if (TileRoutines::waterfill_touch_top(neighbor_mask, m_object.tile(x, current_y), recorded_tile)){
                 m_busy_tiles.set(x, current_y);
                 m_object_tiles.set(x, current_y);
             }
         }
-        uint64_t row_or = TileRoutines::row_or(tile);
+        // logical OR each row in `recorded_tile` together
+        uint64_t row_or = TileRoutines::row_or(recorded_tile);
+        // If we have a left nbr tile and the current found bits reach the left-most column of the current tile
+        // waterfill into the left nbr tile
         if (x > 0 && (row_or & 1)){
             current_x = x - 1;
             const Tile& neighbor_mask = m_source->tile(current_x, y);
-            if (TileRoutines::waterfill_touch_right(neighbor_mask, m_object.tile(current_x, y), tile)){
+            if (TileRoutines::waterfill_touch_right(neighbor_mask, m_object.tile(current_x, y), recorded_tile)){
                 m_busy_tiles.set(current_x, y);
                 m_object_tiles.set(current_x, y);
             }
         }
+        // If we have a right nbr tile and the current found bits reach the right-most column of the current tile
+        // waterfill into the right nbr tile
         current_x = x + 1;
         const uint64_t MASK = (uint64_t)1 << (Tile::WIDTH - 1);
         if (current_x < tile_width && (row_or & MASK)){
             const Tile& neighbor_mask = m_source->tile(current_x, y);
-            if (TileRoutines::waterfill_touch_left(neighbor_mask, m_object.tile(current_x, y), tile)){
+            if (TileRoutines::waterfill_touch_left(neighbor_mask, m_object.tile(current_x, y), recorded_tile)){
                 m_busy_tiles.set(current_x, y);
                 m_object_tiles.set(current_x, y);
             }
@@ -250,8 +304,8 @@ bool WaterfillSession_t<Tile, TileRoutines>::find_object(
     }
 
     //  Compute stats.
-    size_t tile_min_x = (size_t)0 - 1;
-    size_t tile_min_y = (size_t)0 - 1;
+    size_t tile_min_x = SIZE_MAX; // (size_t)0 - 1
+    size_t tile_min_y = SIZE_MAX;
     size_t tile_max_x = 0;
     size_t tile_max_y = 0;
 
@@ -266,14 +320,16 @@ bool WaterfillSession_t<Tile, TileRoutines>::find_object(
 
     while (m_object_tiles.pop(x, y)){
 //        m_dirty_tiles.emplace_back(x, y);
-        Tile& tile = m_object.tile(x, y);
+        Tile& recorded_tile = m_object.tile(x, y);
 
         if (sparse_set){
-            (*sparse_set)[TileIndex{x, y}] = tile;
+            (*sparse_set)[TileIndex{x, y}] = recorded_tile;
         }
 
+        // Get sum of (x,y) location of the 1-bits in the tile into (sum_x, sum_y)
+        // and get the count of 1-bits in the tile into `popcount`.
         uint64_t popcount, sum_x, sum_y;
-        popcount = TileRoutines::popcount_sumcoord(sum_x, sum_y, tile);
+        popcount = TileRoutines::popcount_sumcoord(sum_x, sum_y, recorded_tile);
 //        if (popcount == 7 && tile_x == 16 && tile_y == 73){
 //            cout << popcount << ", " << sum_x << ", " << sum_y << endl;
 //            cout << item.second.dump() << endl;
@@ -283,8 +339,9 @@ bool WaterfillSession_t<Tile, TileRoutines>::find_object(
             popcount, sum_x, sum_y
         );
         if (!(tile_min_x < x && x < tile_max_x && tile_min_y < y && y < tile_max_y)){
+            // Get the min max of the 1-bits locations in the tile
             size_t cmin_x, cmax_x, cmin_y, cmax_y;
-            TileRoutines::boundaries(tile, cmin_x, cmax_x, cmin_y, cmax_y);
+            TileRoutines::boundaries(recorded_tile, cmin_x, cmax_x, cmin_y, cmax_y);
             stats.accumulate_boundary(
                 x * Tile::WIDTH, y * Tile::HEIGHT,
                 cmin_x, cmax_x, cmin_y, cmax_y
@@ -295,7 +352,7 @@ bool WaterfillSession_t<Tile, TileRoutines>::find_object(
         tile_min_y = std::min(tile_min_y, y);
         tile_max_y = std::max(tile_max_y, y);
 
-        tile.set_zero();
+        recorded_tile.set_zero();
     }
 
 #if 0
diff --git a/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Tests.cpp b/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Tests.cpp
new file mode 100644
index 0000000000..359cd42318
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Tests.cpp
@@ -0,0 +1,195 @@
+/*  Waterfill Tests
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <algorithm>
+#include "Common/Cpp/Color.h"
+#include "Common/Cpp/CpuId/CpuId.h"
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "Kernels/BinaryMatrix/Kernels_BinaryMatrix.h"
+#include "Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters.h"
+#include "Kernels/Waterfill/Kernels_Waterfill_Types.h"
+#include "CommonFramework/ImageTypes/ImageRGB32.h"
+#include "Tests/GuardPageImage.h"
+#include "Tests/ImageUnitTest.h"
+#include "Tests/TestUtils.h"
+#include "Kernels_Waterfill_Tests.h"
+
+
+namespace PokemonAutomation{
+namespace Kernels{
+
+
+namespace Waterfill{
+//  The waterfill implementations, defined in Kernels_Waterfill_Core_*.cpp. `find_objects_inplace()`
+//  in Kernels_Waterfill.cpp declares the same functions and calls the one that fits the matrix type
+//  and the CPU. These tests call them directly, so that every implementation this CPU supports is
+//  tested, not only the one that `find_objects_inplace()` picks.
+std::vector<WaterfillObject> find_objects_inplace_64x4_Default      (PackedBinaryMatrix_IB& matrix, size_t min_area);
+std::vector<WaterfillObject> find_objects_inplace_64x8_x64_SSE42    (PackedBinaryMatrix_IB& matrix, size_t min_area);
+std::vector<WaterfillObject> find_objects_inplace_64x16_x64_AVX2    (PackedBinaryMatrix_IB& matrix, size_t min_area);
+std::vector<WaterfillObject> find_objects_inplace_64x32_x64_AVX512  (PackedBinaryMatrix_IB& matrix, size_t min_area);
+std::vector<WaterfillObject> find_objects_inplace_64x64_x64_AVX512  (PackedBinaryMatrix_IB& matrix, size_t min_area);
+std::vector<WaterfillObject> find_objects_inplace_64x32_x64_AVX512GF(PackedBinaryMatrix_IB& matrix, size_t min_area);
+std::vector<WaterfillObject> find_objects_inplace_64x64_x64_AVX512GF(PackedBinaryMatrix_IB& matrix, size_t min_area);
+std::vector<WaterfillObject> find_objects_inplace_64x8_arm64_NEON   (PackedBinaryMatrix_IB& matrix, size_t min_area);
+}
+
+
+//  One waterfill implementation to test: its name in the test name, the binary matrix
+//  type it works on, and the function that finds the objects.
+struct WaterfillImplementation{
+    using FindObjects = std::vector<Waterfill::WaterfillObject> (*)(PackedBinaryMatrix_IB& matrix, size_t min_area);
+
+    std::string name;
+    BinaryMatrixType matrix_type;
+    FindObjects find_objects_inplace;
+};
+
+
+//  Check one SIMD or NEON waterfill implementation against the Default (no SIMD) one on
+//  a real image:
+//  1. Turn the image into a binary matrix twice: in the Default 64x4 layout for the
+//     reference, and in the layout of the implementation under test. The foreground is
+//     the dark pixels, with each of R, G and B in [0, 63].
+//  2. Find the objects in each matrix, and sort each list by position. The objects come
+//     out in tile order, and the two layouts have different tile sizes.
+//  3. Compare the two lists, object by object.
+//  The test fails if the reference finds no objects, because then the image tests nothing.
+class Test_Waterfill : public ImageUnitTest{
+public:
+    Test_Waterfill(
+        const WaterfillImplementation& implementation,
+        const std::string& image
+    )
+        : ImageUnitTest("Kernels::Waterfill - " + implementation.name + " - " + image, {image})
+        , m_implementation(implementation)
+    {
+        //  Plus a guard-page copy of the image and the packed binary matrix
+        //  (width x height / 8).
+        m_memory += MAX_TEST_IMAGE_RGB32_BYTES + MAX_TEST_IMAGE_RGB32_BYTES / 32;
+    }
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        //  Copy the test image into guard-page memory with packed rows, so a
+        //  kernel that reads or writes past the last pixel faults.
+        const ImageRGB32& file_image = images[0];
+        GuardPageImageRGB32 image(file_image);
+
+        std::vector<Waterfill::WaterfillObject> expected = find_sorted_objects(
+            image, BinaryMatrixType::i64x4_Default, Waterfill::find_objects_inplace_64x4_Default
+        );
+        if (expected.empty()){
+            return "Error: the reference found no objects, so this image tests nothing.";
+        }
+        std::vector<Waterfill::WaterfillObject> objects = find_sorted_objects(
+            image, m_implementation.matrix_type, m_implementation.find_objects_inplace
+        );
+
+        TEST_RESULT_COMPONENT_EQUAL_STR(objects.size(), expected.size(), "number of objects");
+        for (size_t i = 0; i < objects.size(); i++){
+            const std::string object = "object " + std::to_string(i);
+            TEST_RESULT_COMPONENT_EQUAL_STR(objects[i].area, expected[i].area, object + " area");
+            TEST_RESULT_COMPONENT_EQUAL_STR(objects[i].min_x, expected[i].min_x, object + " min_x");
+            TEST_RESULT_COMPONENT_EQUAL_STR(objects[i].min_y, expected[i].min_y, object + " min_y");
+            TEST_RESULT_COMPONENT_EQUAL_STR(objects[i].max_x, expected[i].max_x, object + " max_x");
+            TEST_RESULT_COMPONENT_EQUAL_STR(objects[i].max_y, expected[i].max_y, object + " max_y");
+            TEST_RESULT_COMPONENT_EQUAL_STR(objects[i].sum_x, expected[i].sum_x, object + " sum_x");
+            TEST_RESULT_COMPONENT_EQUAL_STR(objects[i].sum_y, expected[i].sum_y, object + " sum_y");
+        }
+        return true;
+    }
+
+private:
+    //  Find the objects in the dark pixels of `image`, with a binary matrix of
+    //  `matrix_type` and the waterfill function `find_objects_inplace`. Return them
+    //  sorted by position, then by area.
+    static std::vector<Waterfill::WaterfillObject> find_sorted_objects(
+        const GuardPageImageRGB32& image,
+        BinaryMatrixType matrix_type,
+        WaterfillImplementation::FindObjects find_objects_inplace
+    ){
+        std::unique_ptr<PackedBinaryMatrix_IB> matrix = make_PackedBinaryMatrix(
+            matrix_type, image.width(), image.height()
+        );
+        compress_rgb32_to_binary_range(
+            image.data(), image.bytes_per_row(), *matrix,
+            combine_rgb(0, 0, 0), combine_rgb(63, 63, 63)
+        );
+        std::vector<Waterfill::WaterfillObject> objects = find_objects_inplace(*matrix, 10);
+        std::sort(
+            objects.begin(), objects.end(),
+            [](const Waterfill::WaterfillObject& a, const Waterfill::WaterfillObject& b){
+                return std::tie(a.min_y, a.min_x, a.max_y, a.max_x, a.area)
+                     < std::tie(b.min_y, b.min_x, b.max_y, b.max_x, b.area);
+            }
+        );
+        return objects;
+    }
+
+private:
+    WaterfillImplementation m_implementation;
+};
+
+
+
+
+//  Add a test for each image and each SIMD or NEON waterfill implementation that this
+//  build has and this CPU supports. The Default implementation is the reference, so it
+//  gets no test of its own.
+void add_tests_Waterfill(UnitTestDatabase& database){
+    using namespace Waterfill;
+
+    std::vector<WaterfillImplementation> implementations;
+#ifdef PA_AutoDispatch_x64_08_Nehalem
+    if (CPU_CAPABILITY_CURRENT.OK_08_Nehalem){
+        implementations.push_back({"64x8_x64_SSE42", BinaryMatrixType::i64x8_x64_SSE42, find_objects_inplace_64x8_x64_SSE42});
+    }
+#endif
+#ifdef PA_AutoDispatch_x64_13_Haswell
+    if (CPU_CAPABILITY_CURRENT.OK_13_Haswell){
+        implementations.push_back({"64x16_x64_AVX2", BinaryMatrixType::i64x16_x64_AVX2, find_objects_inplace_64x16_x64_AVX2});
+    }
+#endif
+#ifdef PA_AutoDispatch_x64_17_Skylake
+    if (CPU_CAPABILITY_CURRENT.OK_17_Skylake){
+        implementations.push_back({"64x32_x64_AVX512", BinaryMatrixType::i64x32_x64_AVX512, find_objects_inplace_64x32_x64_AVX512});
+        implementations.push_back({"64x64_x64_AVX512", BinaryMatrixType::i64x64_x64_AVX512, find_objects_inplace_64x64_x64_AVX512});
+    }
+#endif
+#ifdef PA_AutoDispatch_x64_19_IceLake
+    if (CPU_CAPABILITY_CURRENT.OK_19_IceLake){
+        implementations.push_back({"64x32_x64_AVX512GF", BinaryMatrixType::i64x32_x64_AVX512, find_objects_inplace_64x32_x64_AVX512GF});
+        implementations.push_back({"64x64_x64_AVX512GF", BinaryMatrixType::i64x64_x64_AVX512, find_objects_inplace_64x64_x64_AVX512GF});
+    }
+#endif
+#ifdef PA_AutoDispatch_arm64_20_M1
+    if (CPU_CAPABILITY_CURRENT.OK_M1){
+        implementations.push_back({"64x8_arm64_NEON", BinaryMatrixType::arm64x8_x64_NEON, find_objects_inplace_64x8_arm64_NEON});
+    }
+#endif
+
+    //  Images in the CommandLineTests repo. None has a width or height that is a multiple
+    //  of 64, so the tiles at the right and bottom edges are only partly used.
+    const std::vector<std::string> images{
+        "NintendoSwitch/Switch2/ghostassassin/system_settings_display_dark.png",    //  1916 x 1078
+        "OCR/sentence-1-1-tall.jpg",                                                //  564 x 500
+        "PokemonSwSh/SelectionArrowFinder/mac_neon_error_1.png",                    //  106 x 410
+    };
+
+    for (const WaterfillImplementation& implementation : implementations){
+        for (const std::string& image : images){
+            database.add<Test_Waterfill>(implementation, image);
+        }
+    }
+}
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Tests.h b/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Tests.h
new file mode 100644
index 0000000000..a399facb44
--- /dev/null
+++ b/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Tests.h
@@ -0,0 +1,23 @@
+/*  Waterfill Tests
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Kernels_Waterfill_Tests_H
+#define PokemonAutomation_Kernels_Waterfill_Tests_H
+
+#include "Common/Cpp/TestRunners/UnitTest.h"
+
+namespace PokemonAutomation{
+namespace Kernels{
+
+
+
+void add_tests_Waterfill(UnitTestDatabase& database);
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Types.h b/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Types.h
index 273b7998db..ce41f72635 100644
--- a/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Types.h
+++ b/SerialPrograms/Source/Kernels/Waterfill/Kernels_Waterfill_Types.h
@@ -1,6 +1,6 @@
 /*  Waterfill Types
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -9,8 +9,7 @@
 
 #include <stddef.h>
 #include <stdint.h>
-//#include <map>
-//#include <iostream>
+#include "Common/Cpp/Rectangle.h"
 #include "Kernels/BinaryMatrix/Kernels_BinaryMatrix.h"
 
 namespace PokemonAutomation{
@@ -49,6 +48,7 @@ class WaterfillObject{
 
     size_t width() const{ return max_x - min_x; }
     size_t height() const{ return max_y - min_y; }
+    size_t box_area() const{ return width() * height(); }
 
     double center_of_gravity_x() const{ return (double)sum_x / area; }
     double center_of_gravity_y() const{ return (double)sum_y / area; }
@@ -56,6 +56,10 @@ class WaterfillObject{
     double aspect_ratio() const{ return (double)width() / height(); }
     double area_ratio() const{ return (double)area / (width() * height()); }
 
+    Rectangle<size_t> rectangle() const{
+        return Rectangle<size_t>(min_x, min_y, max_x, max_y);
+    }
+
     // Note: `object` must be constructed before calling this function.
     std::unique_ptr<PackedBinaryMatrix_IB> packed_matrix() const{
         return object->submatrix(min_x, min_y, max_x - min_x, max_y - min_y);
diff --git a/SerialPrograms/Source/ML/DataLabeling/ML_AnnotationIO.cpp b/SerialPrograms/Source/ML/DataLabeling/ML_AnnotationIO.cpp
new file mode 100644
index 0000000000..d05a3edbd2
--- /dev/null
+++ b/SerialPrograms/Source/ML/DataLabeling/ML_AnnotationIO.cpp
@@ -0,0 +1,323 @@
+/*  ML Annotation IO
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  Functions for IO of annotation related files
+ */
+
+
+#include <fstream>
+#include <iostream>
+#include <map>
+#include <sstream>
+#include <algorithm>
+#include <QMessageBox>
+#include "Common/Cpp/Filesystem/Filesystem.h"
+#include "Common/Cpp/Filesystem/FileIO.h"
+#include "Common/Cpp/Json/JsonArray.h"
+#include "Common/Cpp/Json/JsonObject.h"
+#include "Common/Cpp/Json/JsonValue.h"
+
+#include "Common/Cpp/Strings/StringTools.h"
+#include "Common/Cpp/Filesystem/Filesystem.h"
+#include "Common/Cpp/PrettyPrint.h"
+#include "ML_AnnotationIO.h"
+#include "ML_SegmentAnythingModelConstants.h"
+#include "ML_ObjectAnnotation.h"
+
+
+using std::cout, std::endl;
+
+namespace PokemonAutomation{
+namespace ML{
+
+// save the image embedding as a file with path <image_filepath>.embedding
+void save_image_embedding_to_disk(const std::string& image_filepath, const std::vector<float>& embedding){
+    const std::string embedding_path = image_filepath + ".embedding";
+    std::ofstream fout(embedding_path, std::ios::binary);
+    // write embedding shape
+    fout.write(reinterpret_cast<const char*>(&SAM_EMBEDDER_OUTPUT_N_CHANNELS), sizeof(SAM_EMBEDDER_OUTPUT_N_CHANNELS));
+    fout.write(reinterpret_cast<const char*>(&SAM_EMBEDDER_OUTPUT_IMAGE_SIZE), sizeof(SAM_EMBEDDER_OUTPUT_IMAGE_SIZE));
+    fout.write(reinterpret_cast<const char*>(&SAM_EMBEDDER_OUTPUT_IMAGE_SIZE), sizeof(SAM_EMBEDDER_OUTPUT_IMAGE_SIZE));
+    fout.write(reinterpret_cast<const char*>(embedding.data()), sizeof(float) * embedding.size());
+    fout.close();
+    std::cout << "Saved image embedding as " << embedding_path << std::endl;
+}
+
+
+bool load_image_embedding(const std::string& image_filepath, std::vector<float>& image_embedding){
+    std::string emebdding_path = image_filepath + ".embedding";
+    std::ifstream fin(emebdding_path, std::ios::binary);
+    if (!fin.is_open()){
+        std::cout << "No embedding for image " << image_filepath << std::endl;
+        return false;
+    }
+
+    int embedding_n_channels = 0, embedding_height = 0, emebedding_width = 0;
+    fin.read(reinterpret_cast<char*>(&embedding_n_channels), sizeof(int));
+    fin.read(reinterpret_cast<char*>(&embedding_height), sizeof(int));
+    fin.read(reinterpret_cast<char*>(&emebedding_width), sizeof(int));
+
+    std::cout << "Image embedding shape [" << embedding_n_channels << ", " << embedding_height
+              << ", " << emebedding_width << "]" << std::endl;
+    if (embedding_n_channels <= 0 || embedding_height <= 0 || emebedding_width <= 0){
+        std::string err_msg = "Image embedding wrong dimension from " + emebdding_path;
+        std::cerr << err_msg << std::endl;
+        throw std::runtime_error(err_msg);
+    }
+
+    const int size = embedding_n_channels * embedding_height * emebedding_width;
+    image_embedding.resize(size);
+    fin.read(reinterpret_cast<char*>(image_embedding.data()), sizeof(float) * size);
+    std::cout << "Loaded image embedding from " << emebdding_path << std::endl;
+    return true;
+}
+
+
+std::vector<std::string> find_images_in_folder(const std::string& folder_path, bool recursive){
+    const Filesystem::Path folder = Filesystem::absolute(Filesystem::Path(folder_path));
+    if (!Filesystem::exists(folder)){
+        std::cerr << "Error: input image folder path " << folder_path << " does not exist." << std::endl;
+        return {};
+    }
+
+    std::vector<std::string> all_image_paths;
+    for (const Filesystem::Path& image_file : Filesystem::list_directory(folder, recursive)){
+        if (!Filesystem::is_regular_file(image_file)){
+            continue;
+        }
+        const std::string extension = image_file.extension().string();
+        if (StringTools::ends_with_ci(extension, ".png") ||
+            StringTools::ends_with_ci(extension, ".jpg") ||
+            StringTools::ends_with_ci(extension, ".jpeg")){
+            all_image_paths.emplace_back(image_file.string_slash_normalized());
+        }
+    }
+    std::cout << "Found " << all_image_paths.size() << " images " << (recursive ? "recursively " : "") << 
+        "in folder " << folder_path << std::endl;
+    std::sort(all_image_paths.begin(), all_image_paths.end());
+    return all_image_paths;
+}
+
+void export_image_annotations_to_yolo_dataset(
+    const std::string& image_folder_path,
+    const std::string& yolo_dataset_path
+){
+    const bool recursive = true;
+    const std::vector<std::string>& image_paths = find_images_in_folder(image_folder_path, recursive);
+    if (image_paths.size() == 0){
+        QMessageBox box;
+        box.critical(nullptr, "Empty Image Folder",
+            QString::fromStdString("No images found in " + image_folder_path + "."));
+        return;
+    }
+
+    // TODO for simplicity we will parse this YAML file. In future we should use a proper YAML library
+    std::ifstream fin(yolo_dataset_path.c_str());
+    if (!fin){
+        QMessageBox box;
+        box.critical(nullptr, "Cannot Open YOLO Dataset Config File",
+            QString::fromStdString("Cannot open " + yolo_dataset_path + "."));
+        return;
+    }
+
+    std::vector<std::string> label_names;
+    bool reading_labels = false;
+
+    std::string line;
+    int line_id = 0;
+    while(std::getline(fin, line)){
+        line_id++;
+        // remove "#" comments
+        size_t pound_idx = line.find_first_of("#");
+        if (pound_idx != std::string::npos){
+            line = line.substr(0, pound_idx);
+        }
+        line = StringTools::strip(line);
+        if (line.size() == 0){
+            continue;
+        }
+
+        // cout << "Line: " << line << endl;
+        if (line.starts_with("names:")){
+            reading_labels = true;
+            line.clear();
+            continue;
+        }
+
+        if (reading_labels){
+            // cout << "start reading labels" << endl;
+            size_t colon_idx = line.find_first_of(":");
+            if (colon_idx == std::string::npos){
+                QMessageBox box;
+                box.critical(nullptr, "Error Parsing Dataset YAML",
+                QString::fromStdString("YAML file " + yolo_dataset_path + " line " + std::to_string(line_id) + " contains no colon for labels."));
+                return;
+            }
+            std::string number = StringTools::strip(line.substr(0, colon_idx));
+            std::string label = StringTools::strip(line.substr(colon_idx+1));
+            
+            // cout << "found number " << number << " label " << label << endl;
+            size_t num = StringTools::to_size_t(number);
+            if (num != label_names.size()){
+                QMessageBox box;
+                box.critical(nullptr, "Error Parsing Dataset YAML",
+                QString::fromStdString("YAML file " + yolo_dataset_path + " line " + std::to_string(line_id) + " has no label index."));
+                return;
+            }
+            label_names.push_back(label);
+        }
+
+        line.clear();
+    }
+
+    std::map<std::string, size_t> label_counts; // label name -> how many such label in the dataseet
+    std::map<std::string, size_t> label_indices; // label name -> label ID
+    cout << "Load dataset labels: " << endl;
+    for (size_t i = 0; i < label_names.size(); i++){
+        cout << "- " << label_names[i] << endl;
+        label_indices[label_names[i]] = i;
+        label_counts[label_names[i]] = 0;
+    }
+    
+
+    // convert images and annotations into new subfolders in the folder of the dataset config
+    auto converted_folder_name = "exported-" + now_to_filestring();
+
+    const auto yolo_dataset_config_file = Filesystem::Path(yolo_dataset_path);
+    const Filesystem::Path yolo_dataset_folder = yolo_dataset_config_file.parent_path();
+    const auto target_folder = yolo_dataset_folder / converted_folder_name;
+    if (Filesystem::exists(target_folder)){
+        QMessageBox box;
+        box.critical(nullptr, "Export Destination Folder Already Exists",
+            QString::fromStdString("Folder " + target_folder.string() + " already exists."));
+        return;
+    }
+    const auto target_image_folder = target_folder / "images/train";
+    const auto target_label_folder = target_folder / "labels/train";
+    cout << "Export to image folder: " << target_image_folder << endl;
+    cout << "Export to label folder: " << target_label_folder << endl;
+
+    Filesystem::create_directories(target_image_folder);
+    Filesystem::create_directories(target_label_folder);
+
+    std::set<std::string> missing_labels;
+    bool copy_error = false;
+    for (size_t i = 0; i < image_paths.size(); i++){
+        const auto& image_path = image_paths[i];
+        const Filesystem::Path image_file(image_path);
+
+        Filesystem::Path anno_file = Filesystem::Path(image_file).replace_extension(".json");
+        if (!Filesystem::exists(anno_file)){
+            QMessageBox box;
+            box.critical(nullptr, "Cannot Find Annotation File",
+                QString::fromStdString("No annotation for " + image_path + "."));
+            return;
+        }
+
+        const auto target_image_file = target_image_folder / image_file.filename();
+        try{
+            Filesystem::copy_file(image_file, target_image_file);
+        }catch (std::filesystem::filesystem_error&){
+            std::string message = "Cannot copy from " + image_file.string() + " to " + target_image_file.string() + 
+                    ". Probably permission issue, source image is broken or target image path already exists due to image folder having same image filenames";
+            std::cerr << message << std::endl;
+            copy_error = true;
+            // QMessageBox box;
+            // box.critical(nullptr, "Cannot Copy File", QString::fromStdString(message));
+            // return;
+        }
+
+        std::string json_content;
+        const bool anno_loaded = file_to_string(anno_file.string(), json_content);
+        if (!anno_loaded){
+            QMessageBox box;
+            box.warning(nullptr, "Unable to Load Annotation",
+                QString::fromStdString("Cannot open annotation file " + anno_file.string() + ". Probably wrong permission?"));
+            return;
+        }
+
+        const JsonValue loaded_json = parse_json(json_content);
+        const JsonObject* json_obj = loaded_json.to_object();
+        if (!json_obj){
+            QMessageBox box;
+            box.warning(nullptr, "Wrong JSON content",
+                QString::fromStdString("Wong JSON content in annotation file " + anno_file.string() + 
+                ". Probably older annotataion? Try loading and saving this annotation file."));
+            return;
+        }
+
+        std::vector<std::string> label_file_lines;
+        try{
+            const int64_t image_width = json_obj->get_integer_throw("IMAGE_WIDTH");
+            const int64_t image_height = json_obj->get_integer_throw("IMAGE_HEIGHT");
+            const JsonArray& json_array = json_obj->get_array_throw("ANNOTATION");
+            for (size_t j = 0; j < json_array.size(); j++){
+                const ObjectAnnotation anno_obj = ObjectAnnotation::load_json((json_array)[j]);
+                const std::string& label = anno_obj.label;
+
+                auto it = label_indices.find(label);
+                if (it == label_indices.end()){
+                    if (label.ends_with("-male")){
+                        it = label_indices.find(label.substr(0, label.size()-5));
+                    }else if(label.ends_with("-female")){
+                        it = label_indices.find(label.substr(0, label.size()-7));
+                    }
+                }
+                if (it == label_indices.end()){
+                    missing_labels.insert(label);
+                    continue; // label not part of the YOLO dataset. Ignored.
+                }
+                label_counts[label]++;
+
+                const size_t label_id = it->second;
+
+                 // TODO: once we implement the user checkbox on mask reliability, we should change this line
+                const auto& box = anno_obj.mask_box;
+                const double center_x = (box.min_x + box.max_x) / (2.0 * image_width);
+                const double center_y = (box.min_y + box.max_y) / (2.0 * image_height);
+                const double width = box.width() / (double)image_width;
+                const double height = box.height() / (double)image_height;
+                
+                // each row in the YOLO dataclass label file is: class_index x_center y_center width height
+                // https://docs.ultralytics.com/yolov5/tutorials/train_custom_data/#12-leverage-models-for-automated-labeling
+                std::ostringstream os;
+                os << label_id << " " << center_x << " " << center_y << " " << width << " " << height;
+                label_file_lines.push_back(os.str());
+            }
+        }catch (JsonParseException& ){
+            QMessageBox box;
+            box.warning(nullptr, "Wrong JSON content",
+                QString::fromStdString("Wong JSON content in annotation file " + anno_file.string() + "."));
+            return;
+        }
+
+        const auto target_label_file = target_label_folder / image_file.filename().replace_extension(".txt");
+        std::ofstream fout(target_label_file.string());
+        for (const auto& file_line : label_file_lines){
+            fout << file_line << "\n";
+        }
+    }
+
+    if (copy_error){
+        QMessageBox box;
+        box.critical(nullptr, "Cannot Copy File", "There was an issue with copying at least one file. See the logs for more details.");
+        return;
+    }
+
+    cout << "Found labels -> count: " << endl;
+    for (const auto& p : label_counts){
+        cout << "- " << p.first << ": " << p.second << endl;
+    }
+    if (missing_labels.size() > 0){
+        cout << "Labels not exported: " << endl;
+        for (const auto& label : missing_labels){
+            cout << "- " << label << endl;
+        }
+    }
+    cout << "Done exporting " << image_paths.size() << " annotations to YOLOv5 dataset" << endl;
+}
+
+
+}
+}
diff --git a/SerialPrograms/Source/ML/DataLabeling/ML_AnnotationIO.h b/SerialPrograms/Source/ML/DataLabeling/ML_AnnotationIO.h
new file mode 100644
index 0000000000..ac93cc6185
--- /dev/null
+++ b/SerialPrograms/Source/ML/DataLabeling/ML_AnnotationIO.h
@@ -0,0 +1,37 @@
+/*  ML Annotation IO
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  Functions for IO of annotation related files
+ */
+
+#ifndef PokemonAutomation_ML_AnnotationIO_H
+#define PokemonAutomation_ML_AnnotationIO_H
+
+#include <vector>
+#include <string>
+
+namespace PokemonAutomation{
+namespace ML{
+
+// Load pre-computed image embedding from disk
+// Return true if there is the embedding file.
+// The embedding is stored in a file in the same folder as the image, having the same name but with a suffix ".embedding".
+bool load_image_embedding(const std::string& image_filepath, std::vector<float>& image_embedding);
+
+// Save the image embedding as a file with path <image_filepath>.embedding.
+void save_image_embedding_to_disk(const std::string& image_filepath, const std::vector<float>& embedding);
+
+// Find image paths stored in a folder. The search can be recursive into child folders or not.
+std::vector<std::string> find_images_in_folder(const std::string& folder_path, bool recursive);
+
+void export_image_annotations_to_yolo_dataset(
+    const std::string& image_folder_path,
+    const std::string& yolo_dataset_path
+);
+
+
+}
+}
+
+#endif
\ No newline at end of file
diff --git a/SerialPrograms/Source/ML/DataLabeling/ML_ObjectAnnotation.cpp b/SerialPrograms/Source/ML/DataLabeling/ML_ObjectAnnotation.cpp
new file mode 100644
index 0000000000..f721b1c444
--- /dev/null
+++ b/SerialPrograms/Source/ML/DataLabeling/ML_ObjectAnnotation.cpp
@@ -0,0 +1,120 @@
+/*  ML Object Annotation
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  Class to store the annotation manually done on an object in an image or video
+ */
+
+ #include "Common/Cpp/BitmapConversion.h"
+#include "Common/Cpp/Json/JsonArray.h"
+#include "Common/Cpp/Json/JsonObject.h"
+#include "Common/Cpp/Json/JsonValue.h"
+#include "ML_ObjectAnnotation.h"
+
+
+namespace PokemonAutomation{
+namespace ML{
+
+
+ObjectAnnotation::ObjectAnnotation()
+    : user_box(0,0,0,0)
+    , mask_box(0,0,0,0)
+{}
+
+// if failed to pass, will throw JsonParseException
+ObjectAnnotation ObjectAnnotation::load_json(const JsonValue& json){
+    ObjectAnnotation anno_obj;
+
+    const JsonObject& json_obj = json.to_object_throw();
+    const JsonArray& user_box_array = json_obj.get_array_throw("UserBox");
+    anno_obj.user_box = ImagePixelBox(
+        size_t(user_box_array[0].to_integer_throw()),
+        size_t(user_box_array[1].to_integer_throw()),
+        size_t(user_box_array[2].to_integer_throw()),
+        size_t(user_box_array[3].to_integer_throw())
+    );
+    const JsonArray& mask_box_array = json_obj.get_array_throw("MaskBox");
+    anno_obj.mask_box = ImagePixelBox(
+        size_t(mask_box_array[0].to_integer_throw()),
+        size_t(mask_box_array[1].to_integer_throw()),
+        size_t(mask_box_array[2].to_integer_throw()),
+        size_t(mask_box_array[3].to_integer_throw())
+    );
+    const size_t mask_width = anno_obj.mask_box.width(), mask_height = anno_obj.mask_box.height();
+    const size_t num_mask_ele = mask_width * mask_height;
+    
+    const std::string mask_base64 = json_obj.get_string_throw("Mask");
+    anno_obj.mask = unpack_bit_vector_from_base64(mask_base64, num_mask_ele);
+    if (anno_obj.mask.size() != num_mask_ele){
+        std::string err_msg = "wrong decoded object annotation mask size: decoded " + std::to_string(anno_obj.mask.size())
+            + " but should be " + std::to_string(num_mask_ele);
+        throw ParseException(err_msg);
+    }
+
+    anno_obj.label = json_obj.get_string_throw("Label");
+
+    const JsonArray* inc_pt_array = json_obj.get_array("InclusionPoints");
+    if (inc_pt_array){
+        const size_t num_points = inc_pt_array->size() / 2;
+        for (size_t i = 0; i < num_points; i++){
+            size_t x = (*inc_pt_array)[2*i].to_integer_throw();
+            size_t y = (*inc_pt_array)[2*i+1].to_integer_throw();
+            anno_obj.inclusion_points.emplace_back(x, y);
+        }
+    }
+    const JsonArray* exc_pt_array = json_obj.get_array("ExclusionPoints");
+    if (exc_pt_array){
+        const size_t num_points = exc_pt_array->size() / 2;
+        for (size_t i = 0; i < num_points; i++){
+            size_t x = (*exc_pt_array)[2*i].to_integer_throw();
+            size_t y = (*exc_pt_array)[2*i+1].to_integer_throw();
+            anno_obj.exclusion_points.emplace_back(x, y);
+        }
+    }
+    
+    return anno_obj;
+}
+
+JsonValue ObjectAnnotation::to_json() const{
+    JsonObject json_obj;
+    JsonArray user_box_arr;
+    user_box_arr.push_back(int64_t(user_box.min_x));
+    user_box_arr.push_back(int64_t(user_box.min_y));
+    user_box_arr.push_back(int64_t(user_box.max_x));
+    user_box_arr.push_back(int64_t(user_box.max_y));
+    json_obj["UserBox"] = std::move(user_box_arr);
+
+    JsonArray mask_box_arr;
+    mask_box_arr.push_back(int64_t(mask_box.min_x));
+    mask_box_arr.push_back(int64_t(mask_box.min_y));
+    mask_box_arr.push_back(int64_t(mask_box.max_x));
+    mask_box_arr.push_back(int64_t(mask_box.max_y));
+    json_obj["MaskBox"] = std::move(mask_box_arr);
+
+    json_obj["Mask"] = pack_bit_vector_to_base64(mask);
+
+    json_obj["Label"] = label;
+
+    if (inclusion_points.size() > 0){
+        JsonArray inc_pt_arr;
+        for (const auto& p : inclusion_points){
+            inc_pt_arr.push_back(int64_t(p.first));
+            inc_pt_arr.push_back(int64_t(p.second));
+        }
+        json_obj["InclusionPoints"] = std::move(inc_pt_arr);
+    }
+    if (exclusion_points.size() > 0){
+        JsonArray exc_pt_arr;
+        for (const auto& p : exclusion_points){
+            exc_pt_arr.push_back(int64_t(p.first));
+            exc_pt_arr.push_back(int64_t(p.second));
+        }
+        json_obj["ExclusionPoints"] = std::move(exc_pt_arr);
+    }
+
+    return json_obj;
+}
+
+
+}
+}
diff --git a/SerialPrograms/Source/ML/DataLabeling/ML_ObjectAnnotation.h b/SerialPrograms/Source/ML/DataLabeling/ML_ObjectAnnotation.h
new file mode 100644
index 0000000000..1ffae5c15c
--- /dev/null
+++ b/SerialPrograms/Source/ML/DataLabeling/ML_ObjectAnnotation.h
@@ -0,0 +1,51 @@
+/*  ML Object Annotation
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  Class to store the annotation manually done on an object in an image or video
+ */
+
+#ifndef PokemonAutomation_ML_ObjectAnnotation_H
+#define PokemonAutomation_ML_ObjectAnnotation_H
+
+#include <vector>
+#include <string>
+#include "Common/Cpp/Json/JsonValue.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+
+
+namespace PokemonAutomation{
+namespace ML{
+
+
+// Store annotation generated by user and ML model on one object
+struct ObjectAnnotation{
+    // user drawn loose bounding box
+    ImagePixelBox user_box;
+    // tight bounding box around a mask
+    ImagePixelBox mask_box;
+    // User added points to denote this point belongs to the object.
+    // This is to help the automatic annotation model to compute the correct
+    // per-pixel mask.
+    std::vector<std::pair<size_t, size_t>> inclusion_points;
+    // User added points to denote this point does not belong to the object.
+    // This is to help the automatic annotation model to compute the correct
+    // per-pixel mask.
+    std::vector<std::pair<size_t, size_t>> exclusion_points;
+    // per-pixel mask on whether this pixel belongs to the object
+    // size() equals the total pixels in mask_box
+    std::vector<bool> mask;
+    // label of the object
+    std::string label = "unknown";
+
+    ObjectAnnotation();
+
+    // if failed to pass, will throw JsonParseException
+    static ObjectAnnotation load_json(const JsonValue& json);
+    JsonValue to_json() const;
+};
+
+
+}
+}
+#endif
\ No newline at end of file
diff --git a/SerialPrograms/Source/ML/DataLabeling/ML_SegmentAnythingModel.cpp b/SerialPrograms/Source/ML/DataLabeling/ML_SegmentAnythingModel.cpp
new file mode 100644
index 0000000000..ab3d590d7c
--- /dev/null
+++ b/SerialPrograms/Source/ML/DataLabeling/ML_SegmentAnythingModel.cpp
@@ -0,0 +1,389 @@
+/*  ML Segment Anything Model
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  Run Segment Anything Model (SAM) to segment objects on images
+ */
+
+#include <atomic>
+#include <format>
+#include <fstream>
+#include <mutex>
+#include <iostream>
+#include <onnxruntime_cxx_api.h>
+#include <opencv2/imgcodecs.hpp>
+#include <opencv2/imgproc.hpp>
+#include <QMessageBox>
+#include "3rdParty/ONNX/OnnxToolsPA.h"
+#include "Common/Cpp/Hardware/FloatingPointMode.h"
+#include "Common/Cpp/Exceptions.h"
+#include "Common/Cpp/Filesystem/Filesystem.h"
+#include "Common/Cpp/Concurrency/Mutex.h"
+#include "Common/Cpp/Logging/AbstractLogger.h"
+#include "CommonFramework/GlobalAutoPaths.h"
+#include "CommonFramework/Tools/GlobalThreadPools.h"
+#include "ML/Models/ML_ONNXRuntimeHelpers.h"
+#include "ML_SegmentAnythingModelConstants.h"
+#include "ML_SegmentAnythingModel.h"
+#include "ML_AnnotationIO.h"
+
+namespace PokemonAutomation{
+namespace ML{
+
+
+SAMEmbedderSession::SAMEmbedderSession(const std::string& model_path, bool use_gpu)
+    : session{create_session(model_path, ML_MODEL_CACHE_PATH() + "SAMEmbedder/", use_gpu)}
+    , memory_info{Ort::MemoryInfo::CreateCpu(OrtDeviceAllocator, OrtMemTypeCPU)}
+    , input_names{session.GetInputNames()}
+    , output_names{session.GetOutputNames()}
+    , input_shape{1, SAM_EMBEDDER_INPUT_IMAGE_HEIGHT, SAM_EMBEDDER_INPUT_IMAGE_WIDTH, 3}
+    , output_shape{1, SAM_EMBEDDER_OUTPUT_N_CHANNELS, SAM_EMBEDDER_OUTPUT_IMAGE_SIZE, SAM_EMBEDDER_OUTPUT_IMAGE_SIZE}
+{
+    std::cout << "Built SAM embedder session" << std::endl;
+}
+
+void SAMEmbedderSession::run(const cv::Mat& input_image, std::vector<float>& model_output){
+    assert(input_image.rows == SAM_EMBEDDER_INPUT_IMAGE_HEIGHT);
+    assert(input_image.cols == SAM_EMBEDDER_INPUT_IMAGE_WIDTH);
+
+    // The input buffer is local (not a member) so that multiple threads can call `run()` on the same
+    // session concurrently. `Ort::Session::Run()` itself is thread-safe.
+    std::vector<uint8_t> model_input(SAM_EMBEDDER_INPUT_SIZE);
+    model_output.resize(SAM_EMBEDDER_OUTPUT_SIZE);
+    auto input_tensor = create_tensor<uint8_t>(memory_info, model_input, input_shape);
+    auto output_tensor = create_tensor<float>(memory_info, model_output, output_shape);
+
+    for (int row = 0, p_loc=0; row < SAM_EMBEDDER_INPUT_IMAGE_HEIGHT; row++){
+        for (int col = 0; col < SAM_EMBEDDER_INPUT_IMAGE_WIDTH; col++){
+            cv::Vec3b p = input_image.at<cv::Vec3b>(row, col);
+            model_input[p_loc++] = p[0];
+            model_input[p_loc++] = p[1];
+            model_input[p_loc++] = p[2];
+        }
+    }
+
+    const char* input_name_c = input_names[0].data();
+    const char* output_name_c = output_names[0].data();
+    auto start = std::chrono::steady_clock::now();
+    FlushDenormalsToZeroScope flush_denormals;  //  Denormals are slow on Intel CPUs (see FloatingPointMode.h).
+    session.Run(run_options, &input_name_c, &input_tensor, 1, &output_name_c, &output_tensor, 1);
+    auto end = std::chrono::steady_clock::now();
+    auto milliseconds = std::chrono::duration_cast<std::chrono::milliseconds>(end - start).count();
+    std::cout << "Embedder inference time: " << milliseconds << " ms" << std::endl;
+}
+
+
+SAMSession::SAMSession(const std::string& model_path, bool use_gpu)
+    : session{create_session(model_path, ML_MODEL_CACHE_PATH() + "SAM/", use_gpu)}
+    , memory_info{Ort::MemoryInfo::CreateCpu(OrtDeviceAllocator, OrtMemTypeCPU)}
+    , input_names{session.GetInputNames()}
+    , output_names{session.GetOutputNames()}
+    , input_image_embedding_shape{1, SAM_EMBEDDER_OUTPUT_N_CHANNELS,
+        SAM_EMBEDDER_OUTPUT_IMAGE_SIZE, SAM_EMBEDDER_OUTPUT_IMAGE_SIZE}
+    , input_mask_shape{1, 1, SAM_LOW_RES_MASK_SIZE, SAM_LOW_RES_MASK_SIZE}
+    , output_low_res_mask_shape{1, 1, SAM_LOW_RES_MASK_SIZE, SAM_LOW_RES_MASK_SIZE}
+    , input_mask_buffer(SAM_LOW_RES_MASK_SIZE * SAM_LOW_RES_MASK_SIZE, 0.0)
+    , output_low_res_mask_buffer(SAM_LOW_RES_MASK_SIZE * SAM_LOW_RES_MASK_SIZE, 0.0)
+{
+    std::cout << "Built SAM session" << std::endl;
+}
+
+void SAMSession::run(
+    std::vector<float>& image_embedding,
+    int original_image_height, int original_image_width,
+    const std::vector<int>& input_points,
+    const std::vector<int>& input_point_labels,
+    const std::vector<int>& input_box,
+    std::vector<bool>& output_boolean_mask
+){
+    assert(image_embedding.size() == SAM_EMBEDDER_OUTPUT_SIZE);
+    assert(input_points.size() % 2 == 0);
+    assert(input_point_labels.size() == input_points.size()/2);
+    assert(input_box.size() == 0 || input_box.size() == 4);  // 4 is x_min, y_min, x_max, y_max
+    assert(input_points.size() > 0 || input_box.size() > 0);
+
+    size_t num_points = input_points.size() / 2;
+    if(input_box.size() > 0){
+        num_points += 2; // add the bounding box two corners
+    }else{
+        num_points += 1; // add a padding point where there is no bounding box
+    }
+
+    input_point_coords_shape[1] = num_points;
+    input_point_coords_buffer.clear();
+    // padding point coords are 0.0
+    input_point_coords_buffer.resize(num_points * 2, 0.0);
+
+    input_point_labels_shape[1] = num_points;
+    input_point_labels_buffer.clear();
+    // `point_labels`: Labels for the sparse input prompts. 0 is a negative input point, 1 is a positive input point,
+    // 2 is a top-left box corner, 3 is a bottom-right box corner, and -1 is a padding point. 
+    // If there is no box input, a single padding point with label -1 and coordinates (0.0, 0.0) should be concatenated.
+    input_point_labels_buffer.resize(num_points, -1.0);
+    input_orig_im_size_buffer[0] = float(original_image_height);
+    input_orig_im_size_buffer[1] = float(original_image_width);
+
+    // assign input coordinates and boxes:
+    const float scale_x = SAM_EMBEDDER_INPUT_IMAGE_WIDTH / float(original_image_width);
+    const float scale_y = SAM_EMBEDDER_INPUT_IMAGE_HEIGHT / float(original_image_height);
+    for (size_t i = 0; i < input_point_labels.size(); i++){
+        input_point_coords_buffer[2*i] = input_points[2*i] * scale_x;
+        input_point_coords_buffer[2*i+1] = input_points[2*i+1] * scale_y;
+
+        input_point_labels_buffer[i] = float(input_point_labels[i]);
+    }
+    if (input_box.size() > 0){
+        // assign input box label
+        input_point_coords_buffer[2*input_point_labels.size()] = input_box[0] * scale_x;
+        input_point_coords_buffer[2*input_point_labels.size()+1] = input_box[1] * scale_y;
+        input_point_coords_buffer[2*input_point_labels.size()+2] = input_box[2] * scale_x;
+        input_point_coords_buffer[2*input_point_labels.size()+3] = input_box[3] * scale_y;
+
+        input_point_labels_buffer[input_point_labels.size()] = 2;
+        input_point_labels_buffer[input_point_labels.size()+1] = 3;
+    }
+
+    output_mask_shape[2] = original_image_height;
+    output_mask_shape[3] = original_image_width;
+    output_mask_buffer.clear();
+    output_mask_buffer.resize(original_image_height * original_image_width, 0.0);
+
+    std::array<Ort::Value, SAM_N_INPUT_TENSORS> input_tensors;
+    input_tensors[0] = create_tensor<float>(memory_info, image_embedding, input_image_embedding_shape);
+    input_tensors[1] = create_tensor<float>(memory_info, input_point_coords_buffer, input_point_coords_shape);
+    input_tensors[2] = create_tensor<float>(memory_info, input_point_labels_buffer, input_point_labels_shape);
+    input_tensors[3] = create_tensor<float>(memory_info, input_mask_buffer, input_mask_shape);
+    input_tensors[4] = create_tensor<float>(memory_info, input_has_mask_buffer, input_has_mask_shape);
+    input_tensors[5] = create_tensor<float>(memory_info, input_orig_im_size_buffer, input_orig_im_size_shape);
+    std::array<Ort::Value, SAM_N_OUTPUT_TENSORS> output_tensors;
+    output_tensors[0] = create_tensor<float>(memory_info, output_mask_buffer, output_mask_shape);
+    output_tensors[1] = create_tensor<float>(memory_info, output_iou_prediction_buffer, output_iou_prediction_shape);
+    output_tensors[2] = create_tensor<float>(memory_info, output_low_res_mask_buffer, output_low_res_mask_shape);
+
+    std::array<const char*, SAM_N_INPUT_TENSORS> input_names_c;
+    for (int i = 0; i < SAM_N_INPUT_TENSORS; i++){
+        input_names_c[i] = input_names[i].data();
+    }
+    std::array<const char*, SAM_N_OUTPUT_TENSORS> output_names_c;
+    for (int i = 0; i < SAM_N_OUTPUT_TENSORS; i++){
+        output_names_c[i] = output_names[i].data();
+    }
+
+    auto start = std::chrono::steady_clock::now();
+    FlushDenormalsToZeroScope flush_denormals;  //  Denormals are slow on Intel CPUs (see FloatingPointMode.h).
+    session.Run(run_options, input_names_c.data(), input_tensors.data(), SAM_N_INPUT_TENSORS,
+        output_names_c.data(), output_tensors.data(), SAM_N_OUTPUT_TENSORS);
+    auto end = std::chrono::steady_clock::now();
+    auto milliseconds = std::chrono::duration_cast<std::chrono::milliseconds>(end - start).count();
+    std::cout << "SAM inference time: " << milliseconds << " ms" << std::endl;
+
+    output_boolean_mask.resize(original_image_height * original_image_width, false);
+    for (size_t i = 0; i < output_mask_buffer.size(); i++){
+        output_boolean_mask[i] = output_mask_buffer[i] > SAM_OUTPUT_MASK_THRESHOLD;
+    }
+}
+
+
+namespace{
+
+// Result of trying to compute the embedding of one image in `embed_one_image()`.
+enum class EmbedImageResult{
+    SUCCESS,
+    FAILED_TO_LOAD,         // `cv::imread()` returned an empty image, e.g. the file is not an actual image.
+    UNSUPPORTED_CHANNELS,   // image is not 3-channel (BGR) or 4-channel (BGRA).
+};
+
+// Load the image at `image_path`, convert it to the RGB, SAM_EMBEDDER_INPUT_IMAGE_WIDTH x
+// SAM_EMBEDDER_INPUT_IMAGE_HEIGHT format that `SAMEmbedderSession::run()` expects, run the embedder
+// and save the result to "<image_path>.embedding" via `save_image_embedding_to_disk()`.
+// This is the per-image work item of `compute_embeddings_for_folder()` and runs on worker threads
+// of `GlobalThreadPools::computation_normal()`, so it must not touch any Qt UI (e.g. QMessageBox).
+// Image problems are reported through the return value. Inference failures propagate as exceptions
+// (usually `Ort::Exception`) so the caller can decide whether to fall back from GPU to CPU.
+EmbedImageResult embed_one_image(SAMEmbedderSession& embedding_session, const std::string& image_path){
+    cv::Mat image_bgr = cv::imread(image_path);
+    if (image_bgr.empty()){
+        return EmbedImageResult::FAILED_TO_LOAD;
+    }
+    cv::Mat image;
+    if (image_bgr.channels() == 4){
+        cv::cvtColor(image_bgr, image, cv::COLOR_BGRA2RGB);
+    }else if (image_bgr.channels() == 3){
+        cv::cvtColor(image_bgr, image, cv::COLOR_BGR2RGB);
+    }else{
+        return EmbedImageResult::UNSUPPORTED_CHANNELS;
+    }
+
+    cv::Mat resized_mat;  // resize to the shape for the ML model input
+    cv::resize(image, resized_mat, cv::Size(SAM_EMBEDDER_INPUT_IMAGE_WIDTH, SAM_EMBEDDER_INPUT_IMAGE_HEIGHT));
+
+    std::vector<float> output_image_embedding;
+    embedding_session.run(resized_mat, output_image_embedding);
+    save_image_embedding_to_disk(image_path, output_image_embedding);
+    return EmbedImageResult::SUCCESS;
+}
+
+void log_image_list(Logger& logger, const std::string& header, const std::vector<std::string>& image_paths){
+    if (image_paths.empty()){
+        return;
+    }
+    logger.log(header, COLOR_RED);
+    for (const std::string& image_path : image_paths){
+        logger.log("- " + image_path, COLOR_RED);
+    }
+}
+
+}
+
+
+void compute_embeddings_for_folder(
+    Logger& logger,
+    const std::string& embedding_model_path,
+    const std::string& image_folder_path,
+    bool use_gpu_for_embedder_session
+){
+    const bool recursive_search = true;
+    const std::vector<std::string> all_image_paths = find_images_in_folder(image_folder_path, recursive_search);
+    if (all_image_paths.size() == 0){
+        logger.log("No images found in " + image_folder_path + ".");
+        return;
+    }
+
+    // Only compute embeddings that do not exist on disk yet.
+    std::vector<std::string> image_paths;
+    for (const std::string& image_path : all_image_paths){
+        if (!Filesystem::exists(image_path + ".embedding")){
+            image_paths.emplace_back(image_path);
+        }
+    }
+    logger.log(std::format(
+        "Found {} images in {}. {} already have embeddings. Computing {} embeddings...",
+        all_image_paths.size(), image_folder_path,
+        all_image_paths.size() - image_paths.size(), image_paths.size()
+    ));
+    if (image_paths.empty()){
+        return;
+    }
+
+    if (!Filesystem::exists(embedding_model_path)){
+        logger.log("Error: no such embedding model path " + embedding_model_path + ".", COLOR_RED);
+        QMessageBox box;
+        box.critical(nullptr, "Embedding Model Does Not Exist",
+            QString::fromStdString("Embedding model path" + embedding_model_path + " does not exist."));
+        return;
+    }
+    // since the embedding model has too many weights, onnx created a .data file to contain weights.
+    const std::string embedding_model_data_path = embedding_model_path + ".data";
+    if (!Filesystem::exists(embedding_model_data_path)){
+        logger.log("Error: no such embedding model data path " + embedding_model_data_path + ".", COLOR_RED);
+        QMessageBox box;
+        box.critical(nullptr, "Embedding Model Data File Does Not Exist",
+            QString::fromStdString("Embedding model data file path" + embedding_model_data_path + " does not exist."));
+        return;
+    }
+
+    bool use_gpu = use_gpu_for_embedder_session;
+    std::unique_ptr<SAMEmbedderSession> embedding_session;
+    try{
+        embedding_session = make_unique<SAMEmbedderSession>(embedding_model_path, use_gpu);
+    }catch (MLModelSessionCreationError& e){
+        QMessageBox box;
+        box.warning(nullptr, "Unable To Create Model Session",
+            QString::fromStdString(e.message() + ". Try using CPU?"));
+        return;
+    }
+
+    // Per-image errors are collected here and reported after all images are processed, instead of
+    // popping up a QMessageBox per image (which is not allowed from worker threads and would stall
+    // the whole batch on one bad file).
+    Mutex error_lock;
+    std::vector<std::string> images_failed_to_load;
+    std::vector<std::string> images_with_unsupported_channels;
+    std::vector<std::string> images_failed_inference;
+    std::atomic<size_t> num_computed{0};
+
+    auto record_result = [&](const std::string& image_path, EmbedImageResult result){
+        switch (result){
+        case EmbedImageResult::SUCCESS:{
+            const size_t count = ++num_computed;
+            logger.log(std::format("{}/{}: computed embedding for {}", count, image_paths.size(), image_path));
+            return;
+        }
+        case EmbedImageResult::FAILED_TO_LOAD:{
+            std::lock_guard<Mutex> lg(error_lock);
+            images_failed_to_load.emplace_back(image_path);
+            return;
+        }
+        case EmbedImageResult::UNSUPPORTED_CHANNELS:{
+            std::lock_guard<Mutex> lg(error_lock);
+            images_with_unsupported_channels.emplace_back(image_path);
+            return;
+        }
+        }
+    };
+
+    // Phase 1: run serially until the first successful inference.
+    // This verifies the session actually works on this machine before fanning out. If inference
+    // fails on the GPU, we rebuild the session on the CPU here and retry the same image, so that
+    // all the parallel workers in phase 2 share one known-good session.
+    size_t next_idx = 0;
+    bool session_verified = false;
+    while (next_idx < image_paths.size() && !session_verified){
+        const std::string& image_path = image_paths[next_idx];
+        EmbedImageResult result;
+        try{
+            // throw Ort::Exception("Testing.", ORT_FAIL);  // to simulate GPU/CPU failure
+            result = embed_one_image(*embedding_session, image_path);
+        }catch (const std::exception& e){
+            if (!use_gpu){
+                logger.log(std::string("Error: Embedding session failed even when using the CPU.\n") + e.what(), COLOR_RED);
+                QMessageBox box;
+                box.warning(nullptr, "Error:",
+                    QString::fromStdString("Error: Embedding session failed."));
+                return;
+            }
+            logger.log(std::string("Warning: Embedding session failed using the GPU. Will reattempt with the CPU.\n") + e.what(), COLOR_RED);
+            use_gpu = false;
+            try{
+                embedding_session = make_unique<SAMEmbedderSession>(embedding_model_path, use_gpu);
+            }catch (MLModelSessionCreationError& e){
+                QMessageBox box;
+                box.warning(nullptr, "Unable To Create Model Session",
+                    QString::fromStdString(e.message()));
+                return;
+            }
+            continue;  // retry the same image with the CPU session
+        }
+        record_result(image_path, result);
+        session_verified = result == EmbedImageResult::SUCCESS;
+        next_idx++;
+    }
+
+    // Phase 2: compute the remaining embeddings in parallel.
+    // `SAMEmbedderSession::run()` is thread-safe, so all workers share the same session.
+    // An inference failure here only skips that image; it is reported at the end.
+    GlobalThreadPools::computation_normal().run_in_parallel(
+        [&](size_t image_idx){
+            const std::string& image_path = image_paths[image_idx];
+            try{
+                record_result(image_path, embed_one_image(*embedding_session, image_path));
+            }catch (const std::exception& e){
+                logger.log("Error: failed to compute embedding for " + image_path + ": " + e.what(), COLOR_RED);
+                std::lock_guard<Mutex> lg(error_lock);
+                images_failed_inference.emplace_back(image_path);
+            }
+        },
+        next_idx, image_paths.size(), 1
+    );
+
+    logger.log(std::format(
+        "Done computing embeddings for images in folder {}. Computed {}/{}.",
+        image_folder_path, num_computed.load(), image_paths.size()
+    ));
+    log_image_list(logger, "Following images failed to load. Probably not actual images?", images_failed_to_load);
+    log_image_list(logger, "Following images have unsupported color channels. Only work with RGB or RGBA images:", images_with_unsupported_channels);
+    log_image_list(logger, "Following images failed during embedding inference:", images_failed_inference);
+}
+
+}
+}
diff --git a/SerialPrograms/Source/ML/DataLabeling/ML_SegmentAnythingModel.h b/SerialPrograms/Source/ML/DataLabeling/ML_SegmentAnythingModel.h
new file mode 100644
index 0000000000..f3d50997ae
--- /dev/null
+++ b/SerialPrograms/Source/ML/DataLabeling/ML_SegmentAnythingModel.h
@@ -0,0 +1,120 @@
+/*  ML Segment Anything Model
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  Run Segment Anything Model (SAM) to segment objects on images
+ */
+
+#ifndef PokemonAutomation_ML_SegmentAnythingModel_H
+#define PokemonAutomation_ML_SegmentAnythingModel_H
+
+
+#include <string>
+#include <vector>
+#include <onnxruntime_cxx_api.h>
+
+namespace cv{
+    class Mat;
+}
+
+namespace PokemonAutomation{
+
+class Logger;
+
+namespace ML{
+
+
+// Compute embeddings for all images in a folder. Only support .png, .jpg and .jpeg filename extensions so far.
+// This can be very slow! It skips existing embedding files ("<image_path>.embedding").
+// Called by the Label Images program when the user presses the "Compute Embeddings" button.
+// How it works:
+// 1. Run the embedder serially until the first image succeeds. If inference fails on the GPU,
+//    rebuild the session on the CPU and retry. This makes sure the shared session works.
+// 2. Compute the rest of the images in parallel on `GlobalThreadPools::computation_normal()`,
+//    all sharing that one session.
+// Model-level errors (missing model files, session creation failure) are shown in a QMessageBox,
+// so this must be called from the UI thread. Per-image errors (not an image, unsupported color
+// channels, inference failure) are collected and logged to `logger` at the end.
+// This function blocks until all embeddings are computed.
+void compute_embeddings_for_folder(
+    Logger& logger,
+    const std::string& embedding_model_path,
+    const std::string& image_folder_path,
+    bool use_gpu_for_embedder_session
+);
+
+
+class SAMEmbedderSession{
+public:
+    // NOTE: it may throw `MLModelSessionCreationError` if failed to create session.
+    SAMEmbedderSession(const std::string& model_path, bool use_gpu);
+
+    // Given an image of shape SAM_EMBEDDER_INPUT_IMAGE_WIDTH x SAM_EMBEDDER_INPUT_IMAGE_HEIGHT, RGB channel order,
+    // compute its image embedding as a vector<float> of size [SAM_EMBEDDER_OUTPUT_SIZE]
+    // it has shape [1, SAM_EMBEDDER_OUTPUT_N_CHANNELS, SAM_EMBEDDER_OUTPUT_IMAGE_SIZE, SAM_EMBEDDER_OUTPUT_IMAGE_SIZE]
+    // Thread-safe: multiple threads can call `run()` on the same session concurrently.
+    // Throws `Ort::Exception` if inference fails.
+    void run(const cv::Mat& input_image, std::vector<float>& output_image_embedding);
+    
+private:
+    Ort::Session session;
+    Ort::MemoryInfo memory_info;
+    Ort::RunOptions run_options;
+    std::vector<std::string> input_names, output_names;
+
+    const std::array<int64_t, 4> input_shape;
+    const std::array<int64_t, 4> output_shape;
+};
+
+// Run Segment Anything Model in an ONNX session.
+class SAMSession{
+public:
+    SAMSession(const std::string& model_path, bool use_gpu);
+
+    // embedding: input embedding
+    // input_points: input point coordinates (x, y) in pixel units. [p0_x, p0_y, p1_x, p1_y, p2_x, ...].
+    //     Vector size: 2*num_points
+    // input_point_labels: if a point is part of the object to segment, its corresponding label value is 1.
+    //     if a point is outside of the object, value is 0. Vector size: num_points.
+    // input_box: if not empty, the two corner points (in pixel units) of a bounding box for the object to segment.
+    //     [p0_x, p0_y, p1_x, p1_y], where p0 is the top-left corner and p1 is the lower right corner.
+    // output_boolean_mask: output mask in the shape of [original_image_height x original_image_width].
+    //     Vector size: original_image_height * original_image_width.
+    void run(
+        std::vector<float>& embedding,
+        int original_image_height, int original_image_width,
+        const std::vector<int>& input_points,
+        const std::vector<int>& input_point_labels,
+        const std::vector<int>& input_box,
+        std::vector<bool>& output_boolean_mask);
+private:
+    Ort::Session session;
+    Ort::MemoryInfo memory_info;
+    Ort::RunOptions run_options;
+    std::vector<std::string> input_names, output_names;
+
+    const std::array<int64_t, 4> input_image_embedding_shape;
+    std::array<int64_t, 3> input_point_coords_shape{1, -1, 2};
+    std::array<int64_t, 2> input_point_labels_shape{1, -1};
+    const std::array<int64_t, 4> input_mask_shape;
+    const std::array<int64_t, 1> input_has_mask_shape{1};
+    const std::array<int64_t, 1> input_orig_im_size_shape{2};
+    std::array<int64_t, 4> output_mask_shape{1, 1, -1, -1};
+    const std::array<int64_t, 2> output_iou_prediction_shape{1, 1};
+    const std::array<int64_t, 4> output_low_res_mask_shape;
+
+    std::vector<float> input_point_coords_buffer;
+    std::vector<float> input_point_labels_buffer;
+    std::vector<float> input_mask_buffer;
+    std::array<float, 1> input_has_mask_buffer{0.0};
+    std::array<float, 2> input_orig_im_size_buffer;
+    std::vector<float> output_mask_buffer;
+    std::array<float, 1> output_iou_prediction_buffer{0.0};
+    std::vector<float> output_low_res_mask_buffer; 
+};
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/ML/DataLabeling/ML_SegmentAnythingModelConstants.h b/SerialPrograms/Source/ML/DataLabeling/ML_SegmentAnythingModelConstants.h
new file mode 100644
index 0000000000..eedf7e3164
--- /dev/null
+++ b/SerialPrograms/Source/ML/DataLabeling/ML_SegmentAnythingModelConstants.h
@@ -0,0 +1,27 @@
+/*  ML Segment Anything Model Constants
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  Constants for Segment Anything Model (SAM) to segment objects on images
+ */
+
+#ifndef PokemonAutomation_ML_SegmentAnythingModelConstants_H
+#define PokemonAutomation_ML_SegmentAnythingModelConstants_H
+
+
+const int SAM_EMBEDDER_INPUT_IMAGE_WIDTH = 1024;
+const int SAM_EMBEDDER_INPUT_IMAGE_HEIGHT = 576;
+const int SAM_EMBEDDER_OUTPUT_N_CHANNELS = 256;
+const int SAM_EMBEDDER_OUTPUT_IMAGE_SIZE = 64;
+
+const int SAM_EMBEDDER_INPUT_SIZE = SAM_EMBEDDER_INPUT_IMAGE_HEIGHT * SAM_EMBEDDER_INPUT_IMAGE_WIDTH * 3;
+const int SAM_EMBEDDER_OUTPUT_SIZE = SAM_EMBEDDER_OUTPUT_N_CHANNELS * SAM_EMBEDDER_OUTPUT_IMAGE_SIZE * SAM_EMBEDDER_OUTPUT_IMAGE_SIZE;
+
+const int SAM_N_INPUT_TENSORS = 6;
+const int SAM_N_OUTPUT_TENSORS = 3;
+const int SAM_LOW_RES_MASK_SIZE = 256;
+const float SAM_OUTPUT_MASK_THRESHOLD = 0.0;
+
+
+
+#endif
diff --git a/SerialPrograms/Source/ML/Inference/ML_PaddleOCRDetector.cpp b/SerialPrograms/Source/ML/Inference/ML_PaddleOCRDetector.cpp
new file mode 100644
index 0000000000..d7690d4f02
--- /dev/null
+++ b/SerialPrograms/Source/ML/Inference/ML_PaddleOCRDetector.cpp
@@ -0,0 +1,553 @@
+/*  ML Paddle OCR Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <algorithm>
+#include <cmath>
+#include <numeric>
+#include <optional>
+#include <opencv2/core.hpp>
+#include <opencv2/imgproc.hpp>
+#include "Common/Cpp/Exceptions.h"
+#include "Common/Cpp/Hardware/FloatingPointMode.h"
+#include "Common/Cpp/Rectangle.tpp"
+#include "CommonFramework/Logging/Logger.h"
+#include "CommonFramework/GlobalAutoPaths.h"
+#include "CommonFramework/StaticGlobals.h"
+#include "CommonFramework/Options/Environment/PerformanceOptions.h"
+#include "ML/Models/ML_ONNXRuntimeHelpers.h"
+#include "ML_PaddleOCRPipeline.h"
+#include "ML_PaddleOCRDetector.h"
+
+namespace PokemonAutomation{
+namespace ML{
+
+
+
+Rectangle<float> PaddleOCRTextBox::extent() const{
+    return Rectangle<float>(
+        std::min({corners[0].x, corners[1].x, corners[2].x, corners[3].x}),
+        std::min({corners[0].y, corners[1].y, corners[2].y, corners[3].y}),
+        std::max({corners[0].x, corners[1].x, corners[2].x, corners[3].x}),
+        std::max({corners[0].y, corners[1].y, corners[2].y, corners[3].y})
+    );
+}
+ImagePixelBox PaddleOCRTextBox::pixel_box(size_t image_width, size_t image_height) const{
+    const Rectangle<float> e = extent();
+    auto to_pixel = [](float v){
+        return (size_t)std::max(0.0f, v);
+    };
+    ImagePixelBox box(
+        to_pixel(std::floor(e.min_x)),
+        to_pixel(std::floor(e.min_y)),
+        to_pixel(std::ceil(e.max_x)),
+        to_pixel(std::ceil(e.max_y))
+    );
+    box.clip(image_width, image_height);
+    box.min_x = std::min(box.min_x, box.max_x);
+    box.min_y = std::min(box.min_y, box.max_y);
+    return box;
+}
+
+namespace{
+
+cv::Rect to_cv_rect(const ImagePixelBox& box){
+    return cv::Rect((int)box.min_x, (int)box.min_y, (int)box.width(), (int)box.height());
+}
+
+cv::Point2f to_cv_point(const PaddleOCRPoint& p){
+    return cv::Point2f(p.x, p.y);
+}
+
+}
+
+
+
+namespace{
+
+// Order the four corners of a rotated rectangle as top-left, top-right, bottom-right,
+// bottom-left. This is PaddleOCR's `get_mini_boxes()` ordering: sort by x, then the two
+// leftmost points are split into top/bottom by y, and likewise for the two rightmost.
+std::array<PaddleOCRPoint, 4> ordered_corners(const cv::RotatedRect& rect){
+    cv::Point2f pts[4];
+    rect.points(pts);
+    std::sort(pts, pts + 4, [](const cv::Point2f& a, const cv::Point2f& b){
+        return a.x < b.x;
+    });
+    cv::Point2f tl = pts[0], bl = pts[1];
+    if (tl.y > bl.y){
+        std::swap(tl, bl);
+    }
+    cv::Point2f tr = pts[2], br = pts[3];
+    if (tr.y > br.y){
+        std::swap(tr, br);
+    }
+    return {
+        PaddleOCRPoint{tl.x, tl.y},
+        PaddleOCRPoint{tr.x, tr.y},
+        PaddleOCRPoint{br.x, br.y},
+        PaddleOCRPoint{bl.x, bl.y},
+    };
+}
+
+// Mean of the probability map inside the polygon `corners`. This is PaddleOCR's
+// `box_score_fast()`: rasterize the polygon as a mask over its bounding rectangle and
+// average the probabilities under the mask.
+float box_score(const cv::Mat& prob, const std::array<PaddleOCRPoint, 4>& corners){
+    float min_x = corners[0].x, max_x = corners[0].x;
+    float min_y = corners[0].y, max_y = corners[0].y;
+    for (const PaddleOCRPoint& p : corners){
+        min_x = std::min(min_x, p.x);
+        max_x = std::max(max_x, p.x);
+        min_y = std::min(min_y, p.y);
+        max_y = std::max(max_y, p.y);
+    }
+    int x0 = std::clamp((int)std::floor(min_x), 0, prob.cols - 1);
+    int x1 = std::clamp((int)std::ceil(max_x), 0, prob.cols - 1);
+    int y0 = std::clamp((int)std::floor(min_y), 0, prob.rows - 1);
+    int y1 = std::clamp((int)std::ceil(max_y), 0, prob.rows - 1);
+
+    cv::Mat mask = cv::Mat::zeros(y1 - y0 + 1, x1 - x0 + 1, CV_8UC1);
+    std::vector<cv::Point> poly;
+    for (const PaddleOCRPoint& p : corners){
+        poly.emplace_back((int)std::round(p.x) - x0, (int)std::round(p.y) - y0);
+    }
+    cv::fillPoly(mask, std::vector<std::vector<cv::Point>>{poly}, cv::Scalar(1));
+
+    cv::Mat roi = prob(cv::Rect(x0, y0, x1 - x0 + 1, y1 - y0 + 1));
+    return (float)cv::mean(roi, mask)[0];
+}
+
+// Expand a rotated rectangle outward by `distance = area * unclip_ratio / perimeter`.
+// PaddleOCR does this with a polygon offset (pyclipper) followed by `minAreaRect()`.
+// For a rectangle input, offsetting every edge outward by `distance` and taking the
+// minimum bounding rectangle of the rounded result is exactly a rectangle with both
+// sides grown by `2 * distance`, so we can compute it directly.
+cv::RotatedRect unclip(const cv::RotatedRect& rect, float unclip_ratio){
+    float w = rect.size.width;
+    float h = rect.size.height;
+    float area = w * h;
+    float perimeter = 2 * (w + h);
+    if (perimeter <= 0){
+        return rect;
+    }
+    float distance = area * unclip_ratio / perimeter;
+    return cv::RotatedRect(rect.center, cv::Size2f(w + 2 * distance, h + 2 * distance), rect.angle);
+}
+
+// Angle of the top edge of the box in degrees. 0 for axis-aligned text.
+double box_angle_degrees(const PaddleOCRTextBox& box){
+    const PaddleOCRPoint& tl = box.corners[0];
+    const PaddleOCRPoint& tr = box.corners[1];
+    return std::atan2(tr.y - tl.y, tr.x - tl.x) * 180.0 / CV_PI;
+}
+
+// Boxes rotated by less than this are treated as axis-aligned.
+constexpr double AXIS_ALIGNED_MAX_ANGLE = 5.0;
+
+// Round `x` to the nearest multiple of 32 (DBNet downsamples by 32), at least 32.
+int round_to_32(double x){
+    return std::max(32, (int)std::round(x / 32.0) * 32);
+}
+
+} // anonymous namespace
+
+
+
+PaddleOCRDetector::PaddleOCRDetector(const std::string& model_path, PaddleOCRDetectorParams params)
+    : m_params(params)
+    , m_session(
+        create_session(
+            model_path,
+            ML_MODEL_CACHE_PATH() + "PaddleOCRDetector/",
+            PerformanceOptions::instance().ONNX_OPTIONS.USE_GPU
+        )
+    )
+    , m_input_name(m_session.GetInputNameAllocated(0, Ort::AllocatorWithDefaultOptions{}).get())
+    , m_output_name(m_session.GetOutputNameAllocated(0, Ort::AllocatorWithDefaultOptions{}).get())
+{}
+
+
+std::vector<PaddleOCRTextBox> PaddleOCRDetector::detect(const cv::Mat& image_bgr) const{
+    if (image_bgr.empty() || image_bgr.type() != CV_8UC3){
+        return {};
+    }
+
+    const int image_w = image_bgr.cols;
+    const int image_h = image_bgr.rows;
+
+    // 1. Pad the border with the background color so text touching the edge of a
+    //    pre-cropped box is still detected.
+    cv::Mat padded;
+    const int pad = std::max(0, m_params.border_padding);
+    if (pad > 0){
+        cv::copyMakeBorder(
+            image_bgr, padded, pad, pad, pad, pad,
+            cv::BORDER_CONSTANT, estimate_background_color(image_bgr)
+        );
+    }else{
+        padded = image_bgr;
+    }
+
+    // 2. Resize so that the shorter side >= min_side_len and the longer side <=
+    //    max_side_len, with both sides rounded to multiples of 32.
+    double ratio = 1.0;
+    const int short_side = std::min(padded.cols, padded.rows);
+    const int long_side = std::max(padded.cols, padded.rows);
+    if (short_side < m_params.min_side_len){
+        ratio = (double)m_params.min_side_len / short_side;
+    }
+    if (long_side * ratio > m_params.max_side_len){
+        ratio = (double)m_params.max_side_len / long_side;
+    }
+    const int input_w = round_to_32(padded.cols * ratio);
+    const int input_h = round_to_32(padded.rows * ratio);
+
+    cv::Mat resized;
+    cv::resize(padded, resized, cv::Size(input_w, input_h), 0, 0, cv::INTER_LINEAR);
+
+    // 3. Normalize exactly the way PaddleOCR prepared images when it trained this model:
+    //    BGR channel order, scaled to [0, 1], then the ImageNet mean/std per channel.
+    //
+    //    NOTE: The channel order mismatch below is INTENTIONAL. The mean/std are the
+    //    standard ImageNet values, which are defined in RGB order (R: 0.485/0.229,
+    //    G: 0.456/0.224, B: 0.406/0.225). But PaddleOCR decodes images with OpenCV,
+    //    which gives BGR, never converts them to RGB, and then applies these values to
+    //    the channels in the order listed. So during training the blue channel was
+    //    normalized with the red mean/std and vice versa. The model's weights were
+    //    learned from inputs prepared that way, so we must do the same: our input image
+    //    is already BGR, and we keep the mean/std in the listed order. "Fixing" it to
+    //    proper RGB normalization would feed the model inputs it never saw during training.
+    //    (The effect is small because the three means/stds are close to each other.)
+    //
+    //    Evidence (links pinned to the versions that were checked):
+    //    - PP-OCRv5 det training and eval config: `DecodeImage` with `img_mode: BGR`,
+    //      then `NormalizeImage` with mean [0.485, 0.456, 0.406], std
+    //      [0.229, 0.224, 0.225] and `order: hwc`:
+    //      https://github.com/PaddlePaddle/PaddleOCR/blob/dab3fe35379033fdcb2d0e9572fac0b36c9a9ebf/configs/det/PP-OCRv5/PP-OCRv5_server_det.yml#L78-L123
+    //    - `DecodeImage` decodes with `cv2.imdecode()` (BGR) and only reverses the
+    //      channels when `img_mode` is RGB. `NormalizeImage` computes
+    //      `(img * scale - mean) / std` with the mean/std laid out per channel (HWC):
+    //      https://github.com/PaddlePaddle/PaddleOCR/blob/dab3fe35379033fdcb2d0e9572fac0b36c9a9ebf/ppocr/data/imaug/operators.py#L31-L94
+    //    - The inference config shipped with the official model has the same
+    //      `img_mode: BGR` and mean/std:
+    //      https://huggingface.co/PaddlePaddle/PP-OCRv5_server_det/blob/ca867c897ecbca8873081573a802ad70d499cb94/inference.yml
+    //    - PaddleX, the runtime PaddleOCR 3.x uses, replaces its default RGB reader with
+    //      `ReadImage(format="BGR")` from that inference.yml, then normalizes channel c
+    //      with mean[c] and std[c]:
+    //      https://github.com/PaddlePaddle/PaddleX/blob/c50f5da858020db473a2285f089bb8c7bbd6afdc/paddlex/inference/models/text_detection/predictor.py#L107-L164
+    //      https://github.com/PaddlePaddle/PaddleX/blob/c50f5da858020db473a2285f089bb8c7bbd6afdc/paddlex/inference/models/text_detection/processors.py#L236-L274
+    //
+    //    The config.json next to the ONNX model we use (monkt/paddleocr-onnx) describes
+    //    the preprocessing as "RGB image, normalized to [0, 1]". That's inaccurate: the
+    //    ONNX conversion doesn't change what input the model expects, so PaddleOCR's own
+    //    configs above are the authority.
+    //
+    //    Normalization and the HWC -> NCHW conversion are done together, straight into
+    //    the input buffer: split the image into its B, G, R planes, then `convertTo()`
+    //    each plane into its slice of `input_values` as ((pixel / 255) - mean) / std.
+    //    `convertTo()` writes into a destination that already has the right size and
+    //    type instead of allocating a new one.
+    static constexpr double MEAN[3] = {0.485, 0.456, 0.406};
+    static constexpr double STD[3]  = {0.229, 0.224, 0.225};
+    const size_t plane_size = (size_t)input_h * input_w;
+    std::vector<float> input_values(3 * plane_size);
+    cv::Mat channels[3];
+    cv::split(resized, channels);
+    for (int c = 0; c < 3; c++){
+        float* plane_data = input_values.data() + c * plane_size;
+        cv::Mat plane(input_h, input_w, CV_32FC1, plane_data);
+        channels[c].convertTo(plane, CV_32F, 1.0 / (255.0 * STD[c]), -MEAN[c] / STD[c]);
+        if (plane.data != (uchar*)plane_data){
+            //  OpenCV allocated a new destination, so `input_values` was not written.
+            throw InternalProgramError(
+                nullptr, PA_CURRENT_FUNCTION,
+                "PaddleOCRDetector::detect(): convertTo() did not write into the input buffer."
+            );
+        }
+    }
+
+    // 4. Run the model.
+    std::vector<int64_t> input_shape = {1, 3, input_h, input_w};
+
+    Ort::MemoryInfo memory_info = Ort::MemoryInfo::CreateCpu(OrtArenaAllocator, OrtMemTypeDefault);
+    Ort::Value input_tensor = create_tensor<float>(memory_info, input_values, input_shape);
+
+    const char* input_names[] = {m_input_name.c_str()};
+    const char* output_names[] = {m_output_name.c_str()};
+
+    std::vector<Ort::Value> outputs;
+    try{
+        //  Denormal floats are very slow on Intel CPUs (see FloatingPointMode.h).
+        FlushDenormalsToZeroScope flush_denormals;
+        outputs = m_session.Run(
+            Ort::RunOptions{nullptr},
+            input_names, &input_tensor, 1,
+            output_names, 1
+        );
+    }catch (Ort::Exception& e){
+        throw InternalProgramError(
+            nullptr, PA_CURRENT_FUNCTION,
+            "PaddleOCRDetector::detect(): Failed. " + std::string(e.what())
+        );
+    }
+
+    // 5. The output is a text probability map of shape {1, 1, H, W}.
+    std::vector<int64_t> output_shape = outputs[0].GetTensorTypeAndShapeInfo().GetShape();
+    if (output_shape.size() != 4 || output_shape[2] != input_h || output_shape[3] != input_w){
+        throw InternalProgramError(
+            nullptr, PA_CURRENT_FUNCTION,
+            "PaddleOCRDetector::detect(): Unexpected output shape " + to_string(output_shape) +
+            " for input shape " + to_string(input_shape)
+        );
+    }
+    cv::Mat prob(input_h, input_w, CV_32FC1, outputs[0].GetTensorMutableData<float>());
+
+    // Map model input pixels -> padded image pixels -> original image pixels.
+    const float scale_x = (float)padded.cols / input_w;
+    const float scale_y = (float)padded.rows / input_h;
+    std::vector<PaddleOCRTextBox> boxes = postprocess(
+        prob, scale_x, scale_y,
+        (float)pad,
+        image_w, image_h
+    );
+
+    if (STATIC_GLOBALS.PADDLE_OCR_DEBUG){
+        global_logger_tagged().log(
+            "[OCR-DET-DEBUG] Input " + std::to_string(image_w) + "x" + std::to_string(image_h) +
+            " -> model " + std::to_string(input_w) + "x" + std::to_string(input_h) +
+            ", found " + std::to_string(boxes.size()) + " text boxes."
+        );
+    }
+    return boxes;
+}
+
+
+std::vector<PaddleOCRTextBox> PaddleOCRDetector::postprocess(
+    const cv::Mat& prob,
+    float scale_x, float scale_y,
+    float offset,
+    int image_width, int image_height
+) const{
+    // 1. Binarize the probability map.
+    cv::Mat bitmap;
+    cv::threshold(prob, bitmap, m_params.binary_threshold, 255, cv::THRESH_BINARY);
+    bitmap.convertTo(bitmap, CV_8UC1);
+
+    // 2. Each connected text blob becomes a candidate.
+    std::vector<std::vector<cv::Point>> contours;
+    cv::findContours(bitmap, contours, cv::RETR_LIST, cv::CHAIN_APPROX_SIMPLE);
+
+    std::vector<PaddleOCRTextBox> boxes;
+    const size_t num_candidates = std::min(contours.size(), m_params.max_candidates);
+    for (size_t i = 0; i < num_candidates; i++){
+        const std::vector<cv::Point>& contour = contours[i];
+        if (contour.size() < 3){
+            continue;
+        }
+
+        // 3. Fit a rotated rectangle and score it against the probability map.
+        cv::RotatedRect rect = cv::minAreaRect(contour);
+        if (std::min(rect.size.width, rect.size.height) < m_params.min_box_size){
+            continue;
+        }
+        float score = box_score(prob, ordered_corners(rect));
+        if (score < m_params.box_threshold){
+            continue;
+        }
+
+        // 4. Expand the shrunk text kernel to cover the full text.
+        cv::RotatedRect expanded = unclip(rect, m_params.unclip_ratio);
+        if (std::min(expanded.size.width, expanded.size.height) < m_params.min_box_size + 2){
+            continue;
+        }
+
+        // 5. Map back to the original image and clip.
+        PaddleOCRTextBox box;
+        box.score = score;
+        std::array<PaddleOCRPoint, 4> corners = ordered_corners(expanded);
+        for (size_t c = 0; c < 4; c++){
+            float x = corners[c].x * scale_x - offset;
+            float y = corners[c].y * scale_y - offset;
+            box.corners[c].x = std::clamp(x, 0.0f, (float)image_width);
+            box.corners[c].y = std::clamp(y, 0.0f, (float)image_height);
+        }
+
+        //  Skip boxes that ended up entirely inside the padding.
+        ImagePixelBox bounds = box.pixel_box(image_width, image_height);
+        if (bounds.width() < 2 || bounds.height() < 2){
+            continue;
+        }
+        boxes.emplace_back(box);
+    }
+    return boxes;
+}
+
+
+
+std::vector<std::vector<size_t>> group_text_boxes_into_lines(const std::vector<PaddleOCRTextBox>& boxes){
+    std::vector<size_t> order(boxes.size());
+    std::iota(order.begin(), order.end(), 0);
+    std::sort(order.begin(), order.end(), [&](size_t a, size_t b){
+        Rectangle<float> ea = boxes[a].extent();
+        Rectangle<float> eb = boxes[b].extent();
+        return ea.min_y + ea.max_y < eb.min_y + eb.max_y;
+    });
+
+    struct Line{
+        float min_y;
+        float max_y;
+        std::vector<size_t> members;
+    };
+    std::vector<Line> lines;
+    for (size_t index : order){
+        const PaddleOCRTextBox& box = boxes[index];
+        const Rectangle<float> extent = box.extent();
+        const float box_min = extent.min_y;
+        const float box_max = extent.max_y;
+        const float box_h = box_max - box_min;
+
+        // Find the line with the most vertical overlap.
+        Line* best = nullptr;
+        float best_overlap = 0;
+        for (Line& line : lines){
+            float overlap = std::min(box_max, line.max_y) - std::max(box_min, line.min_y);
+            float min_h = std::min(box_h, line.max_y - line.min_y);
+            if (min_h > 0 && overlap >= 0.5f * min_h && overlap > best_overlap){
+                best = &line;
+                best_overlap = overlap;
+            }
+        }
+        if (best == nullptr){
+            lines.push_back(Line{box_min, box_max, {index}});
+        }else{
+            best->members.push_back(index);
+            best->min_y = std::min(best->min_y, box_min);
+            best->max_y = std::max(best->max_y, box_max);
+        }
+    }
+
+    std::sort(lines.begin(), lines.end(), [](const Line& a, const Line& b){
+        return a.min_y + a.max_y < b.min_y + b.max_y;
+    });
+
+    std::vector<std::vector<size_t>> ret;
+    for (Line& line : lines){
+        std::sort(line.members.begin(), line.members.end(), [&](size_t a, size_t b){
+            return boxes[a].extent().min_x < boxes[b].extent().min_x;
+        });
+        ret.emplace_back(std::move(line.members));
+    }
+    return ret;
+}
+
+
+std::vector<PaddleOCRTextBox> merge_text_boxes_in_line(
+    const std::vector<PaddleOCRTextBox>& line_boxes,
+    float max_gap_ratio
+){
+    if (line_boxes.empty()){
+        return {};
+    }
+
+    Rectangle<float> line_extent = line_boxes[0].extent();
+    for (const PaddleOCRTextBox& box : line_boxes){
+        line_extent.merge_with(box.extent());
+    }
+    const float line_min_y = line_extent.min_y;
+    const float line_max_y = line_extent.max_y;
+    const float max_gap = max_gap_ratio * (line_max_y - line_min_y);
+
+    // A segment being built: its horizontal extent and the sum of the box scores.
+    struct Segment{
+        float min_x;
+        float max_x;
+        float score_sum;
+        size_t count;
+    };
+    std::vector<PaddleOCRTextBox> ret;
+    std::optional<Segment> current;
+    auto flush = [&](){
+        if (!current){
+            return;
+        }
+        PaddleOCRTextBox merged;
+        merged.corners = {
+            PaddleOCRPoint{current->min_x, line_min_y},
+            PaddleOCRPoint{current->max_x, line_min_y},
+            PaddleOCRPoint{current->max_x, line_max_y},
+            PaddleOCRPoint{current->min_x, line_max_y},
+        };
+        merged.score = current->score_sum / current->count;
+        ret.emplace_back(merged);
+        current.reset();
+    };
+
+    for (const PaddleOCRTextBox& box : line_boxes){
+        if (std::abs(box_angle_degrees(box)) >= AXIS_ALIGNED_MAX_ANGLE){
+            flush();
+            ret.emplace_back(box);
+            continue;
+        }
+        const Rectangle<float> extent = box.extent();
+        if (current && extent.min_x - current->max_x <= max_gap){
+            current->max_x = std::max(current->max_x, extent.max_x);
+            current->score_sum += box.score;
+            current->count++;
+            continue;
+        }
+        flush();
+        current = Segment{extent.min_x, extent.max_x, box.score, 1};
+    }
+    flush();
+    return ret;
+}
+
+
+cv::Mat crop_text_box(const cv::Mat& image_bgr, const PaddleOCRTextBox& box){
+    const cv::Point2f tl = to_cv_point(box.corners[0]);
+    const cv::Point2f tr = to_cv_point(box.corners[1]);
+    const cv::Point2f br = to_cv_point(box.corners[2]);
+    const cv::Point2f bl = to_cv_point(box.corners[3]);
+
+    // Game UI text is axis-aligned, but `minAreaRect()` on pixel text blobs often returns
+    // a box rotated by a degree or so. Warping by that tiny angle resamples the image
+    // and blurs sharp pixel fonts (e.g. FRLG), which noticeably hurts recognition.
+    // So if the box is nearly axis-aligned, crop its bounding rectangle directly.
+    if (std::abs(box_angle_degrees(box)) < AXIS_ALIGNED_MAX_ANGLE){
+        ImagePixelBox rect = box.pixel_box(image_bgr.cols, image_bgr.rows);
+        if (rect.width() < 1 || rect.height() < 1){
+            return {};
+        }
+        return image_bgr(to_cv_rect(rect)).clone();
+    }
+
+    int crop_w = (int)std::round(std::max(cv::norm(tl - tr), cv::norm(bl - br)));
+    int crop_h = (int)std::round(std::max(cv::norm(tl - bl), cv::norm(tr - br)));
+    if (crop_w < 1 || crop_h < 1){
+        return {};
+    }
+
+    const cv::Point2f src[4] = {tl, tr, br, bl};
+    const cv::Point2f dst[4] = {
+        {0, 0},
+        {(float)crop_w, 0},
+        {(float)crop_w, (float)crop_h},
+        {0, (float)crop_h},
+    };
+    cv::Mat transform = cv::getPerspectiveTransform(src, dst);
+
+    cv::Mat cropped;
+    cv::warpPerspective(
+        image_bgr, cropped, transform, cv::Size(crop_w, crop_h),
+        cv::INTER_CUBIC, cv::BORDER_REPLICATE
+    );
+    return cropped;
+}
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/ML/Inference/ML_PaddleOCRDetector.h b/SerialPrograms/Source/ML/Inference/ML_PaddleOCRDetector.h
new file mode 100644
index 0000000000..a72e81e31c
--- /dev/null
+++ b/SerialPrograms/Source/ML/Inference/ML_PaddleOCRDetector.h
@@ -0,0 +1,158 @@
+/*  ML Paddle OCR Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  Text detection half of the PaddleOCR pipeline. Given an arbitrary image, it finds
+ *  where the lines of text are. Each detected region can then be cropped out and fed
+ *  into the recognition model (see `PaddleOCRPipeline`).
+ *
+ *  The detection model is PP-OCRv5 det, a DBNet ("Differentiable Binarization") model.
+ *  Model source: https://huggingface.co/monkt/paddleocr-onnx/tree/main/detection/v5
+ *  The same detection model is shared by all languages.
+ */
+
+#ifndef PokemonAutomation_ML_PaddleOCRDetector_H
+#define PokemonAutomation_ML_PaddleOCRDetector_H
+
+#include <array>
+#include <string>
+#include <vector>
+#include <onnxruntime_cxx_api.h>
+#include "Common/Cpp/Rectangle.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+
+namespace cv{
+    class Mat;
+}
+
+namespace PokemonAutomation{
+namespace ML{
+
+
+// Tunable parameters of the DBNet detection pre/post-processing.
+// Defaults follow PaddleOCR's PP-OCRv5 `DetResizeForTest` and `DBPostProcess` configs,
+// except where noted.
+struct PaddleOCRDetectorParams{
+    // Preprocessing: if the shorter image side is smaller than this, upscale the image
+    // so that the shorter side matches it. Tiny images give the model too few pixels
+    // to find text in.
+    int min_side_len = 64;
+    // Preprocessing: if the longer image side is larger than this, downscale the image
+    // so that the longer side matches it. This bounds the inference cost for large
+    // images such as full 4K screenshots.
+    int max_side_len = 2048;
+    // Preprocessing: pad the image by this many pixels on each side (in the original
+    // image scale) using the estimated background color. DBNet tends to miss text that
+    // touches the image border, which is common for our pre-cropped OCR boxes.
+    // (Not part of PaddleOCR.)
+    int border_padding = 8;
+
+    // Postprocessing: pixels whose text probability is above this are considered text.
+    float binary_threshold = 0.3f;
+    // Postprocessing: drop candidate boxes whose mean probability is below this.
+    float box_threshold = 0.6f;
+    // Postprocessing: how much to expand the shrunk text kernel back out.
+    // DBNet is trained to predict a shrunk version of each text region, so the found
+    // boxes must be "unclipped" (expanded) to cover the whole text.
+    float unclip_ratio = 1.5f;
+    // Postprocessing: drop boxes whose shorter side is smaller than this (in pixels of
+    // the model input).
+    float min_box_size = 3.0f;
+    // Postprocessing: maximum number of contours to consider.
+    size_t max_candidates = 1000;
+};
+
+
+// A point in (sub-)pixel image coordinates: x from left to right, y from top to bottom.
+struct PaddleOCRPoint{
+    float x = 0;
+    float y = 0;
+};
+
+// One detected text region.
+struct PaddleOCRTextBox{
+    // Four corners of the (possibly slightly rotated) text rectangle in pixel
+    // coordinates of the original input image. Order: top-left, top-right,
+    // bottom-right, bottom-left.
+    std::array<PaddleOCRPoint, 4> corners;
+    // Mean text probability inside the box, in [0, 1].
+    float score = 0;
+
+    // Axis-aligned extent of `corners`, in sub-pixel image coordinates.
+    Rectangle<float> extent() const;
+
+    // Smallest pixel box enclosing `corners`, clipped to the image size.
+    ImagePixelBox pixel_box(size_t image_width, size_t image_height) const;
+};
+
+
+class PaddleOCRDetector{
+public:
+    // Load the detection model from `model_path`.
+    // Throws `MLModelSessionCreationError` if the ONNX session cannot be created.
+    PaddleOCRDetector(const std::string& model_path, PaddleOCRDetectorParams params = {});
+
+    // Detect text regions in a BGR image (CV_8UC3). Returns boxes in unspecified order.
+    // Returns an empty vector if the image is empty or contains no text.
+    // Thread-safe: ONNX Runtime sessions can be run concurrently.
+    // Throws InternalProgramError if ONNX Runtime fails.
+    std::vector<PaddleOCRTextBox> detect(const cv::Mat& image_bgr) const;
+
+    const PaddleOCRDetectorParams& params() const{ return m_params; }
+
+private:
+    // Run the DBNet postprocessing on the model's output probability map.
+    // `prob` is a CV_32F map of the model input size. `scale_x`, `scale_y` map model
+    // input pixel coordinates back to original image coordinates, after subtracting
+    // `offset` (the border padding, in original image pixels).
+    std::vector<PaddleOCRTextBox> postprocess(
+        const cv::Mat& prob,
+        float scale_x, float scale_y,
+        float offset,
+        int image_width, int image_height
+    ) const;
+
+private:
+    PaddleOCRDetectorParams m_params;
+    mutable Ort::Session m_session;
+    std::string m_input_name;
+    std::string m_output_name;
+};
+
+
+// Sort detected text boxes into reading order and group them into lines.
+// Boxes whose vertical extents overlap by at least half of the shorter box height are
+// put into the same line. Lines are ordered top to bottom, boxes within a line left to
+// right. Returns indices into `boxes`: result[line][k].
+std::vector<std::vector<size_t>> group_text_boxes_into_lines(const std::vector<PaddleOCRTextBox>& boxes);
+
+// Merge the boxes of one text line (`line_boxes`, sorted left to right) into
+// horizontal segments. Neighboring boxes are merged when the horizontal gap between
+// them is at most `max_gap_ratio` times the line height. Each merged segment is an
+// axis-aligned box spanning the full height of the line.
+//
+// Why: DBNet often splits a line into separate words, especially with widely spaced
+// pixel fonts like FRLG. Each word box then has its own height: "see" only covers the
+// lowercase x-height while "BULBASAUR" is taller. After scaling every crop to the
+// recognition model's fixed input height, short words get oversized glyphs and are
+// misread (e.g. "see" -> "SPP"). Recognizing the whole line at a consistent height
+// fixes this, and the recognition model outputs the spaces between words itself.
+// Distant boxes (e.g. separate table columns) are kept apart.
+//
+// Rotated boxes (more than a few degrees) are never merged, and are returned as is.
+std::vector<PaddleOCRTextBox> merge_text_boxes_in_line(
+    const std::vector<PaddleOCRTextBox>& line_boxes,
+    float max_gap_ratio = 1.0f
+);
+
+// Crop the text region `box` from `image_bgr` and warp it into an axis-aligned
+// rectangle, so slightly rotated text becomes horizontal. This is PaddleOCR's
+// `get_rotate_crop_image()`, minus the auto 90-degree rotation of tall crops (game UI
+// text is never vertical, while narrow single characters like "1" would be wrongly
+// rotated). Returns an empty Mat if the box is degenerate.
+cv::Mat crop_text_box(const cv::Mat& image_bgr, const PaddleOCRTextBox& box);
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/ML/Inference/ML_PaddleOCRPipeline.cpp b/SerialPrograms/Source/ML/Inference/ML_PaddleOCRPipeline.cpp
new file mode 100644
index 0000000000..ab9ab35fb7
--- /dev/null
+++ b/SerialPrograms/Source/ML/Inference/ML_PaddleOCRPipeline.cpp
@@ -0,0 +1,782 @@
+/*  ML Paddle OCR
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  
+ */
+
+#include <array>
+#include <fstream>
+#include <limits>
+#include <iostream>
+#include "Common/Cpp/Exceptions.h"
+#include "Common/Cpp/Filesystem/Filesystem.h"
+#include "Common/Cpp/Hardware/FloatingPointMode.h"
+#include "Common/Cpp/Logging/GlobalLogger.h"
+#include "CommonFramework/GlobalAutoPaths.h"
+#include "CommonFramework/GlobalSettingsPanel.h"
+#include "CommonFramework/StaticGlobals.h"
+#include "CommonFramework/Options/Environment/PerformanceOptions.h"
+#include "CommonFramework/ImageTypes/ImageRGB32_OpenCV.h"
+#include "ML/Models/ML_ONNXRuntimeHelpers.h"
+#include "ML_PaddleOCRPipeline.h"
+
+using std::cout;
+using std::endl;
+
+namespace PokemonAutomation{
+namespace ML{
+
+
+std::pair<std::string, std::string> PaddleOCRPipeline::get_paths(Language language){
+    std::string base = RESOURCE_PATH() + "PaddleOCR/";
+    switch(language){
+    case Language::None:
+        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Attempted to call OCR without a language.");
+    case Language::English:
+        return {base + "english/rec.onnx", base + "english/dict.txt"};
+    case Language::Japanese:
+        return {base + "chinese/rec.onnx", base + "chinese/dict.txt"};
+    case Language::Spanish:
+        return {base + "latin/rec.onnx", base + "latin/dict.txt"};
+    case Language::French:
+        return {base + "latin/rec.onnx", base + "latin/dict.txt"};
+    case Language::German:
+        return {base + "latin/rec.onnx", base + "latin/dict.txt"};   
+    case Language::Italian:
+        return {base + "latin/rec.onnx", base + "latin/dict.txt"};   
+    case Language::Korean:
+        return {base + "korean/rec.onnx", base + "korean/dict.txt"};  
+    case Language::ChineseSimplified:
+        return {base + "chinese/rec.onnx", base + "chinese/dict.txt"};
+    case Language::ChineseTraditional:
+        return {base + "chinese/rec.onnx", base + "chinese/dict.txt"}; 
+    default:
+        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Attempted to call OCR on an unknown language.");
+    }
+}
+
+PaddleOCRPipeline::PaddleOCRPipeline(Language language)
+    : PaddleOCRPipeline(
+        language,
+        // Shared by all languages. This is the downloadable resource "PaddleOCRDetection",
+        // see Packages/Resources/ResourceDownloadList.json.
+        DOWNLOADED_RESOURCE_PATH() + "PaddleOCRDetection/det.onnx",
+        get_paths(language).first,
+        get_paths(language).second
+    )
+{}
+
+PaddleOCRPipeline::PaddleOCRPipeline(
+    Language language,
+    std::string det_path,
+    std::string rec_path,
+    std::string dict_path
+)
+    : m_rec_session(
+        create_session(
+            rec_path,
+            ML_MODEL_CACHE_PATH() + "PaddleOCRPipeline/",
+            PerformanceOptions::instance().ONNX_OPTIONS.USE_GPU
+        )
+    )
+    , m_language(language)
+    , m_input_name(m_rec_session.GetInputNameAllocated(0, Ort::AllocatorWithDefaultOptions{}).get())
+    , m_output_name(m_rec_session.GetOutputNameAllocated(0, Ort::AllocatorWithDefaultOptions{}).get())
+    , m_logger(global_logger_raw(), "OCR")
+    , m_det_path(std::move(det_path))
+{
+    load_dictionary(Filesystem::Path(dict_path));
+}
+
+PaddleOCRDetector& PaddleOCRPipeline::detector(){
+    std::lock_guard<Mutex> lg(m_detector_lock);
+    if (!m_detector){
+        // The detection model is a downloadable resource, so it may be missing.
+        // Programs that use multi-line OCR should list "PaddleOCRDetection" in their
+        // descriptor's required resources so it's downloaded before they start.
+        if (!Filesystem::exists(Filesystem::Path(m_det_path))){
+            throw FileException(
+                &m_logger, PA_CURRENT_FUNCTION,
+                "PaddleOCR text detection model not found. "
+                "Please download the \"PaddleOCRDetection\" resource from the Settings panel.",
+                m_det_path
+            );
+        }
+        m_logger.log("Loading PaddleOCR text detection model: " + m_det_path);
+        m_detector = std::make_unique<PaddleOCRDetector>(m_det_path);
+    }
+    return *m_detector;
+}
+
+
+
+void PaddleOCRPipeline::load_dictionary(const Filesystem::Path& path){
+
+    const bool debugging = STATIC_GLOBALS.PADDLE_OCR_DEBUG;
+
+    if (debugging){
+        m_logger.log("[OCR-INFO] Loading dictionary from: " + path.string());
+        m_logger.log("[OCR-INFO] Current working directory: " +
+                    Filesystem::current_path().string());
+
+        std::error_code ec;
+        const auto absolute_path = Filesystem::absolute(path);
+
+        if (!ec){
+            m_logger.log("[OCR-INFO] Absolute dictionary path: " +
+                        absolute_path.string());
+
+            m_logger.log("[OCR-INFO] Dictionary exists: " +
+                        std::string(Filesystem::exists(absolute_path) ? "true" : "false"));
+
+            if (Filesystem::exists(absolute_path)){
+                const auto file_size = Filesystem::file_size(absolute_path, ec);
+
+                if (!ec){
+                    m_logger.log("[OCR-INFO] Dictionary file size: " +
+                                std::to_string(file_size) + " bytes");
+                }
+            }
+        }
+    }
+
+    std::ifstream fs_file(path.stdpath());
+
+    if (!fs_file.is_open()){
+        m_logger.log("[OCR-ERROR] Failed to open dictionary: " + path.string());
+        throw FileException(nullptr, PA_CURRENT_FUNCTION, "PaddleOCRPipeline::load_dictionary(): Failed to open dictionary.", path.string());
+    }
+
+    std::string line;
+    while (std::getline(fs_file, line)){
+        m_dictionary.push_back(line);
+    }
+
+    if (fs_file.bad()){
+        m_logger.log("[OCR-ERROR] I/O error while reading dictionary: " + path.string());
+    }
+
+    if (debugging){
+        m_logger.log("[OCR-INFO] Loaded " +
+                    std::to_string(m_dictionary.size()) +
+                    " dictionary entries");
+    }
+}
+
+
+std::string PaddleOCRPipeline::recognize(const ImageViewRGB32& image){
+    const int debug_image_index = m_debug_image_index.fetch_add(1, std::memory_order_relaxed) + 1;
+
+    if (image.width() == 0 || image.height() == 0){
+        m_logger.log("[OCR-DEBUG] Input was an empty image.");
+        return "";
+    }
+    cv::Mat image_bgr;
+    cv::cvtColor(to_OpenCV_ref(image), image_bgr, cv::COLOR_BGRA2BGR);
+
+    // 1. Crop tightly around the text, with small safety margin
+    cv::Mat cropped_image = crop_to_text_region_with_padding(image_bgr, debug_image_index);
+    if (cropped_image.empty()){
+        if(STATIC_GLOBALS.PADDLE_OCR_DEBUG){
+            m_logger.log("[OCR-DEBUG] Crop to text region returned empty image.");
+        }
+        return "";
+    }
+
+
+    return recognize_line(cropped_image);
+}
+
+
+std::vector<PaddleOCRTextResult> PaddleOCRPipeline::detect_and_recognize(const ImageViewRGB32& image){
+    const int debug_image_index = m_debug_image_index.fetch_add(1, std::memory_order_relaxed) + 1;
+
+    // Same as `recognize()`: drop alpha from our BGRA pixels into a BGR image.
+    if (image.width() == 0 || image.height() == 0){
+        return {};
+    }
+    cv::Mat image_bgr;
+    cv::cvtColor(to_OpenCV_ref(image), image_bgr, cv::COLOR_BGRA2BGR);
+
+    // 1. Find all text regions.
+    std::vector<PaddleOCRTextBox> boxes = detector().detect(image_bgr);
+
+    // 2. Put them in reading order.
+    std::vector<std::vector<size_t>> lines = group_text_boxes_into_lines(boxes);
+
+    // 3. Recognize each region. Words of the same line that are close together are
+    //    merged and recognized as one piece. See `merge_text_boxes_in_line()`.
+    std::vector<PaddleOCRTextResult> results;
+    for (size_t line_index = 0; line_index < lines.size(); line_index++){
+        std::vector<PaddleOCRTextBox> line_boxes;
+        for (size_t box_index : lines[line_index]){
+            line_boxes.emplace_back(boxes[box_index]);
+        }
+        for (const PaddleOCRTextBox& box : merge_text_boxes_in_line(line_boxes)){
+            cv::Mat crop = crop_text_box(image_bgr, box);
+            if (crop.empty()){
+                continue;
+            }
+            // Same as `recognize()`: pad narrow crops (e.g. a lone "1") so the
+            // recognition model does not stretch them.
+            add_horizontal_padding(crop, debug_image_index);
+
+            PaddleOCRTextResult result;
+            result.text = recognize_line(crop);
+            result.box = box;
+            result.line_index = line_index;
+            if (STATIC_GLOBALS.PADDLE_OCR_DEBUG){
+                ImagePixelBox r = box.pixel_box(image_bgr.cols, image_bgr.rows);
+                m_logger.log(
+                    "[OCR-DET-DEBUG] Line " + std::to_string(line_index) +
+                    ", box (" + std::to_string(r.min_x) + ", " + std::to_string(r.min_y) + ", " +
+                    std::to_string(r.width()) + ", " + std::to_string(r.height()) +
+                    "), score " + std::to_string(box.score) + ": '" + result.text + "'"
+                );
+            }
+            results.emplace_back(std::move(result));
+        }
+    }
+    return results;
+}
+
+
+std::string PaddleOCRPipeline::recognize_multiline(const ImageViewRGB32& image){
+    // Chinese and Japanese don't put spaces between words.
+    const char* word_separator = " ";
+    switch (m_language){
+    case Language::ChineseSimplified:
+    case Language::ChineseTraditional:
+    case Language::Japanese:
+        word_separator = "";
+        break;
+    default:;
+    }
+
+    std::string text;
+    size_t current_line = 0;
+    bool line_empty = true;
+    for (const PaddleOCRTextResult& result : detect_and_recognize(image)){
+        if (result.text.empty()){
+            continue;
+        }
+        if (!text.empty()){
+            if (result.line_index != current_line){
+                text += "\n";
+                line_empty = true;
+            }
+            if (!line_empty){
+                text += word_separator;
+            }
+        }
+        text += result.text;
+        current_line = result.line_index;
+        line_empty = false;
+    }
+    return text;
+}
+
+
+std::string PaddleOCRPipeline::recognize_line(const cv::Mat& cropped_image){
+
+    const bool debugging = STATIC_GLOBALS.PADDLE_OCR_DEBUG;
+
+    // 2. Calculate dynamic width (maintain aspect ratio)
+    // the model shape is {1, 3, 48, dynamic_width}. Note that the height is fixed at 48 pixels
+    // the input image must be scaled to match the height of 48, for the neural network
+    int target_h = 48;
+    float aspect_ratio = (float)cropped_image.cols / cropped_image.rows;
+
+    int target_w = std::max(
+        1,
+        (int)std::round(target_h * aspect_ratio)
+    );
+
+    if (target_w <= 0 || target_w > 8192){
+        m_logger.log("[OCR-ERROR] Abnormally scaled target width calculated: " + std::to_string(target_w));
+        return "";
+    }
+
+    cv::Mat resized_image;
+    cv::resize(
+        cropped_image,
+        resized_image,
+        cv::Size(target_w, target_h),
+        0,
+        0,
+        cv::INTER_LINEAR
+    );
+
+
+    // 3. Prepare the input exactly the way PaddleOCR prepared images when it trained the
+    //    PP-OCRv5 recognition models (all four we ship: en/latin/korean mobile and the
+    //    server model used for Chinese/Japanese):
+    //    a. BGR channel order. PaddleOCR decodes images with OpenCV and never converts
+    //       them to RGB. Our BGR image is already in this order.
+    //    b. Scale [0, 255] to [-1, 1]: pixel / 255, then - 0.5, then / 0.5.
+    //       (No ImageNet mean/std here, unlike the detection model.)
+    //    c. Pad on the right to a width of at least 320 with zeros, i.e. mid-gray in the
+    //       [-1, 1] range. Training pads every line to a fixed-width canvas
+    //       (`image_shape: [3, 48, 320]`), and inference pads to at least 320 wide.
+    //
+    //    Matching this preprocessing improves model confidence.
+    //
+    //    Sources (links pinned to the versions that were checked):
+    //    - Training and eval config (`DecodeImage: img_mode: BGR`, `RecResizeImg` with
+    //      `image_shape: [3, 48, 320]`). The latin, korean and server configs match:
+    //      https://github.com/PaddlePaddle/PaddleOCR/blob/dab3fe35379033fdcb2d0e9572fac0b36c9a9ebf/configs/rec/PP-OCRv5/multi_language/en_PP-OCRv5_mobile_rec.yaml#L86-L129
+    //    - Training resize and normalization (`MultiScaleDataSet.resize_norm_img()`):
+    //      https://github.com/PaddlePaddle/PaddleOCR/blob/dab3fe35379033fdcb2d0e9572fac0b36c9a9ebf/ppocr/data/simple_dataset.py#L467-L495
+    //    - Eval resize and normalization (`resize_norm_img()`):
+    //      https://github.com/PaddlePaddle/PaddleOCR/blob/dab3fe35379033fdcb2d0e9572fac0b36c9a9ebf/ppocr/data/imaug/rec_img_aug.py#L631-L656
+    //    - PaddleOCR inference (`TextRecognizer.resize_norm_img()`, default shape 3,48,320):
+    //      https://github.com/PaddlePaddle/PaddleOCR/blob/dab3fe35379033fdcb2d0e9572fac0b36c9a9ebf/tools/infer/predict_rec.py#L208-L261
+    //    - Inference configs shipped with the official models:
+    //      https://huggingface.co/PaddlePaddle/en_PP-OCRv5_mobile_rec/blob/267c36e24c331595590fe7bd72bde2436fd286f2/inference.yml
+    //      https://huggingface.co/PaddlePaddle/PP-OCRv5_server_rec/blob/b26c3587fda8da3c8ec0ce357214b4d661ff1558/inference.yml
+    //    - PaddleX, the runtime PaddleOCR 3.x uses: reads BGR per the inference.yml, then
+    //      `OCRReisizeNormImg` does the same resize, normalization and padding:
+    //      https://github.com/PaddlePaddle/PaddleX/blob/c50f5da858020db473a2285f089bb8c7bbd6afdc/paddlex/inference/models/text_recognition/predictor.py#L142-L209
+    //      https://github.com/PaddlePaddle/PaddleX/blob/c50f5da858020db473a2285f089bb8c7bbd6afdc/paddlex/inference/models/text_recognition/processors.py#L47-L98
+    constexpr int MIN_TARGET_W = 320;
+    const int tensor_w = std::max(target_w, MIN_TARGET_W);
+    const std::array<int64_t, 4> input_shape = {1, 3, target_h, tensor_w};
+
+    // Zero-filled, and zero is the padding value.
+    std::vector<float> input_buffer(3 * (size_t)target_h * tensor_w, 0.0f);
+    write_recognition_input_NCHW(resized_image, input_buffer.data(), tensor_w);
+
+    if (debugging){
+        m_logger.log("[OCR-DEBUG] Cropped image constraints - Width: " + std::to_string(cropped_image.cols) 
+            + ", Height: " + std::to_string(cropped_image.rows) 
+            + ", Channels: " + std::to_string(cropped_image.channels()) 
+            + ", Total Pixels: " + std::to_string(cropped_image.total()));
+
+        size_t nan_count = 0;
+        size_t subnormal_count = 0;
+        for (float val : input_buffer){
+            if (std::isnan(val)){
+                nan_count++;
+            }else if (val != 0.0f && std::fpclassify(val) == FP_SUBNORMAL){
+                subnormal_count++;
+            }
+        }
+        m_logger.log("[OCR-DEBUG] Tensor payload validation - Total Floats: " + std::to_string(input_buffer.size())
+                + ", NaNs detected: " + std::to_string(nan_count) 
+                + ", Subnormal (denormal) values: " + std::to_string(subnormal_count));
+        m_logger.log("[OCR-DEBUG] Shape Definition - NCHW: [" + std::to_string(input_shape[0]) + "," + std::to_string(input_shape[1]) 
+                + "," + std::to_string(input_shape[2]) + "," + std::to_string(input_shape[3]) + "]");
+    }
+
+    // 4. Wrap the buffer as the input tensor, without copying. `input_buffer` stays alive
+    //    and unchanged until `Run()` returns.
+    static const Ort::MemoryInfo memory_info = Ort::MemoryInfo::CreateCpu(OrtArenaAllocator, OrtMemTypeDefault);
+    Ort::Value input_tensor = Ort::Value::CreateTensor<float>(
+        memory_info,
+        input_buffer.data(), input_buffer.size(),
+        input_shape.data(), input_shape.size()
+    );
+
+    const char* input_names[] = {m_input_name.c_str()};
+    const char* output_names[] = {m_output_name.c_str()};  
+
+    try{
+        if (debugging){
+            m_logger.log("[OCR-DEBUG] Calling m_rec_session.Run() now...");
+        }
+
+        // 5. Run the recognition session. The large recognition models produce denormal
+        //    floats, which are very slow on Intel CPUs (see FloatingPointMode.h).
+        FlushDenormalsToZeroScope flush_denormals;
+        auto outputs = m_rec_session.Run(
+            Ort::RunOptions{nullptr}, 
+            input_names,   // char** 
+            &input_tensor, // Ort::Value* (array of 1)
+            1,             // input_count
+            output_names,  // char**
+            1              // output_count
+        );
+        return decode_CTC(
+            outputs[0].GetTensorMutableData<float>(),
+            outputs[0].GetTensorTypeAndShapeInfo().GetShape(),
+            m_dictionary
+        );
+    }catch (Ort::Exception& e){
+        throw InternalProgramError(
+            nullptr,
+            PA_CURRENT_FUNCTION,
+            "PaddleOCRPipeline::recognize(): Failed." + std::string(e.what())
+        );
+    }
+}
+
+
+cv::Mat crop_to_text_region_with_padding(const cv::Mat& image, int debug_image_index){
+    // get a binary image, for cropping purposes
+    cv::Mat binary = get_binary_image(image);
+
+    // Find coordinates of all non-zero pixels (the text)
+    std::vector<cv::Point> nonZeroCoords;
+    cv::findNonZero(binary, nonZeroCoords);
+    if (nonZeroCoords.empty()){
+        return {};
+    }
+
+    // create bounding box for crop
+    cv::Rect bbox = cv::boundingRect(nonZeroCoords);
+
+    // get the current gap between the text and the edge
+    int top_gap = bbox.y;
+    int bottom_gap = image.rows - (bbox.y + bbox.height);
+    int left_gap = bbox.x;
+    int right_gap = image.cols - (bbox.x + bbox.width);
+
+    // calculate the desired padding
+    // Horizontal padding is also at least half the text height. With a too-tight crop, the
+    // recognition model tends to drop a thin character at the edge, e.g. "Lv. 1" read
+    // as "Lv." (PokemonHome/SummaryScreen/squirtle_Shiny.png).
+    int pad_x = std::max({4, bbox.width / 15, bbox.height / 2});  // ~5-10%
+    int pad_y = std::max(2, bbox.height / 15);  // ~5-10%
+
+
+    cv::Mat cropped_image;
+    if (top_gap >= pad_y && bottom_gap >= pad_y && left_gap >= pad_x && right_gap >= pad_x){
+        // Original image has plenty of padding.
+        // We just expand the bounding box out by pad_x, pad_y and crop directly.
+
+        // we guarantee that bbox.x - pad_x >= 0
+        // and image.cols >= bbox.width + (pad_x * 2)
+        cv::Rect optimal_crop(
+            bbox.x - pad_x,
+            bbox.y - pad_y,
+            bbox.width + (pad_x * 2),
+            bbox.height + (pad_y * 2)
+        );
+        // crop the original image
+        // the crop should be within bounds.
+        cropped_image = image(optimal_crop).clone();
+    }else{
+
+        // add more padding to original image
+        cv::Scalar bg = estimate_background_color(image);
+        cv::Mat padded_image;
+        cv::copyMakeBorder(
+            image,
+            padded_image,
+            pad_y, pad_y,
+            pad_x, pad_x,
+            cv::BORDER_CONSTANT,
+            bg
+        );
+
+        if (STATIC_GLOBALS.PADDLE_OCR_DEBUG_IMAGE){
+            cv::imwrite(std::to_string(debug_image_index) + "-padded" + ".png", padded_image);
+        }
+
+        cv::Rect final_crop(
+            bbox.x, // (bbox.x + pad_x) - pad_x cancels out perfectly to just bbox.x
+            bbox.y, // (bbox.y + pad_y) - pad_y cancels out perfectly to just bbox.y
+            bbox.width + (pad_x * 2),
+            bbox.height + (pad_y * 2)
+        );
+
+        // crop the padded image
+        // the crop should be within bounds.
+        
+        cropped_image = padded_image(final_crop).clone();
+    }
+
+    if (STATIC_GLOBALS.PADDLE_OCR_DEBUG_IMAGE){
+        cv::imwrite(std::to_string(debug_image_index) + "-binary" + ".png", binary);
+        cv::imwrite(std::to_string(debug_image_index) + "-cropped_image" +".png", cropped_image);
+    }
+
+    // add horizontal padding to tall/narrow characters
+    add_horizontal_padding(cropped_image, debug_image_index);
+
+    cv::Mat binary_tight_crop = binary(bbox).clone();
+    add_vertical_padding(cropped_image, binary_tight_crop, debug_image_index);
+
+
+    return cropped_image;
+}
+
+cv::Mat get_binary_image(const cv::Mat& image){
+    // first convert to grayscale
+    cv::Mat gray;
+    cv::cvtColor(image, gray, cv::COLOR_BGR2GRAY);
+    cv::Mat binary;
+    cv::threshold(gray, binary, 0, 255,
+                cv::THRESH_BINARY_INV | cv::THRESH_OTSU);
+
+    double ratio = cv::countNonZero(binary) /
+                static_cast<double>(binary.total());
+
+    // we want text pixels to be white for the next step
+    // If most pixels are white, Otsu likely classified the background as foreground.
+    // Flip it so text becomes white again.
+    if (ratio > 0.5){
+        cv::bitwise_not(binary, binary);
+    }
+
+    return binary;
+}
+
+
+void add_vertical_padding(cv::Mat& image, const cv::Mat& binary_tight_crop, int debug_image_index){
+    if (image.empty()){
+        return;
+    }
+
+    int h = binary_tight_crop.rows;
+    int w = binary_tight_crop.cols;
+
+    if (is_horizontal_line(binary_tight_crop, debug_image_index)){
+        cout << "Input image is likely just a horizontal line." << endl;
+        cv::Scalar bg = estimate_background_color(image);
+
+        int target_h = static_cast<int>(std::ceil(w / 2));
+        int top = (target_h - h) / 2;
+        int bottom = target_h - h - top;
+        cv::Mat padded_image;
+        cv::copyMakeBorder(
+            image,
+            padded_image,
+            top, bottom,
+            0, 0,              // no horizontal padding
+            cv::BORDER_CONSTANT,
+            bg
+        );
+        image = padded_image;
+
+        if (STATIC_GLOBALS.PADDLE_OCR_DEBUG_IMAGE){
+            cv::imwrite(std::to_string(debug_image_index) + "-vertic-padded" + ".png", image);
+        }
+    }
+
+}
+
+bool is_horizontal_line(const cv::Mat& binary, int debug_image_index){
+
+    int h = binary.rows;
+    int w = binary.cols;
+    constexpr float min_ratio = 4.0f;
+    if (h <= 0 || (float)w / h < min_ratio){
+        return false;
+    }
+
+    // Find all contours
+    std::vector<std::vector<cv::Point>> contours;
+    std::vector<cv::Vec4i> hierarchy;
+    cv::findContours(binary, contours, hierarchy, cv::RETR_EXTERNAL, cv::CHAIN_APPROX_SIMPLE);
+
+    for (size_t i = 0; i < contours.size(); ++i){
+        if (STATIC_GLOBALS.PADDLE_OCR_DEBUG_IMAGE){
+            cv::Mat contour_image = binary(cv::boundingRect(contours[i])).clone();
+            cv::imwrite(std::to_string(debug_image_index) + "-contour_image-" + std::to_string(i) + ".png", contour_image);
+        }
+
+        if (!is_line_shape(binary, contours[i])){
+            // cout << "Input image is likely NOT a horizontal line." << endl;
+
+            return false;
+            // std::cout << "Contour #" << i << " matches the criteria!" << std::endl;
+        }
+    }
+
+
+    return true;
+}
+
+bool is_line_shape(const cv::Mat& binary, const std::vector<cv::Point>& contour){
+    
+    cv::Mat cropped_binary = binary(cv::boundingRect(contour)).clone();
+    double area = cv::countNonZero(cropped_binary);
+    
+    // Safety check to avoid division by zero on tiny noise artifacts
+    if (area <= 0){
+        return false;
+    }
+
+    // 2. Get the straight bounding box
+    cv::Rect rect = cv::boundingRect(contour);
+    double width = static_cast<double>(rect.width);
+    double height = static_cast<double>(rect.height);
+
+    // 3. Calculate Aspect Ratio (Width / Height)
+    double aspectRatio = width / height;
+
+    // 4. Calculate Bounding Box Density (Area / Bounding Box Area)
+    double bboxArea = width * height;
+    double density = area / bboxArea;
+
+    if (STATIC_GLOBALS.PADDLE_OCR_DEBUG_IMAGE){
+        cout << "area: " << std::to_string(area) << endl;
+        cout << "bboxArea: " << std::to_string(bboxArea) << endl;
+        cout << "Density: " << std::to_string(density) << endl;
+        cout << "aspectRatio: " << std::to_string(aspectRatio) << endl;
+    }
+
+
+    // 5. Evaluate both conditions
+    // - Density must be greater than 75%
+    // - Aspect ratio must be greater than 2 (at least twice as wide as it is tall)
+    return (density >= 0.75) && (aspectRatio > 2.0);
+}
+
+void add_horizontal_padding(cv::Mat& image, int debug_image_index){
+    if (image.empty()){
+        return;
+    }
+
+    int h = image.rows;
+    int w = image.cols;
+    constexpr float min_ratio = 0.8f;
+
+    // add horizontal padding to tall/narrow characters
+    if (h > 0 && (float)w / h < min_ratio){
+        int target_w = static_cast<int>(std::ceil(min_ratio * h));
+
+        int left = (target_w - w) / 2;
+        int right = target_w - w - left;
+
+        cv::Scalar bg = estimate_background_color(image);
+        cv::Mat padded_image;
+        cv::copyMakeBorder(
+            image,
+            padded_image,
+            0, 0,              // no vertical padding
+            left, right,
+            cv::BORDER_CONSTANT,
+            bg
+        );
+        image = padded_image;
+
+        if (STATIC_GLOBALS.PADDLE_OCR_DEBUG_IMAGE){
+            cv::imwrite(std::to_string(debug_image_index) + "-horiz-padded" + ".png", image);
+        }
+    }
+
+}
+
+
+
+cv::Scalar estimate_background_color(const cv::Mat& image){
+    if (image.empty() || image.type() != CV_8UC3){
+        return cv::Scalar(255, 255, 255);
+    }
+
+    // use the corner pixels to estimate the background color
+    const cv::Vec3b* top = image.ptr<cv::Vec3b>(0);
+    const cv::Vec3b* bottom = image.ptr<cv::Vec3b>(image.rows - 1);
+
+    cv::Scalar tl(top[0]);
+    cv::Scalar tr(top[image.cols - 1]);
+    cv::Scalar bl(bottom[0]);
+    cv::Scalar br(bottom[image.cols - 1]);
+
+    return (tl + tr + bl + br) * 0.25;
+}
+
+
+void write_recognition_input_NCHW(const cv::Mat& image_bgr, float* dst, int dst_width){
+    const int rows = image_bgr.rows;
+    const int cols = image_bgr.cols;
+    const size_t plane_size = (size_t)rows * dst_width;
+
+    // Split the interleaved B, G, R into separate 2D planes.
+    cv::Mat channels[3];
+    cv::split(image_bgr, channels);
+
+    // Scale each color channel from [0, 255] to [-1, 1] and write it into `dst`
+    for (int c = 0; c < 3; c++){
+        float* plane_data = dst + c * plane_size;
+        // Create a view of `dst` with row step == `dst_width * sizeof(float)`.
+        // This is to accommodate the right padded columns.
+        cv::Mat plane(rows, cols, CV_32FC1, plane_data, dst_width * sizeof(float));
+        channels[c].convertTo(plane, CV_32F, 2.0 / 255.0, -1.0);
+    }
+}
+
+
+std::string PaddleOCRPipeline::decode_CTC(float* data, const std::vector<int64_t>& shape, const std::vector<std::string>& dict){
+
+    const bool debugging = STATIC_GLOBALS.PADDLE_OCR_DEBUG;
+
+    std::string text = "";
+    size_t seq_len = static_cast<size_t>(shape[1]);
+    int64_t num_cls = shape[2];
+    size_t last_index = 0; 
+
+    // Initial boundary logging configuration
+    if (debugging){
+        m_logger.log("[OCR-CTC-DEBUG] Starting decode_CTC. Sequence Length: " + std::to_string(seq_len) + 
+                ", Total Classes: " + std::to_string(num_cls) + 
+                ", Dictionary Size: " + std::to_string(dict.size()));
+    }
+
+    if (dict.empty()){
+        m_logger.log("[OCR-CTC-ERROR] FATAL: Dictionary payload array is empty! Parsing loops will fail to resolve text indicators.");
+    }
+
+    for (size_t i = 0; i < seq_len; ++i){
+        float* row = data + i * num_cls;
+        // 1. Get the character index with highest probability (Argmax)
+        size_t argmax = std::distance(row, std::max_element(row, row + num_cls));
+
+        // 2. CTC Decoding Rules:
+        // Rule A: Index 0 is the CTC Blank. Skip it.
+        // Rule B: Skip consecutive duplicate characters (e.g., "aa" -> "a").
+        if (argmax > 0 && argmax != last_index){
+            // Index 1 from the model maps to the 1st line of your .txt file (Vector index 0)
+            size_t dict_idx = argmax - 1; 
+            if (dict_idx < dict.size()){
+                if (debugging){
+                    m_logger.log("[OCR-CTC-DEBUG] Step " + std::to_string(i) + 
+                               ": Predicted Argmax = " + std::to_string(argmax) + 
+                               " -> Target Dict Index = " + std::to_string(dict_idx) +
+                               " (Character resolved: '" + dict[dict_idx] + "')");
+                }
+                text += dict[dict_idx];
+            }else {
+                m_logger.log("[OCR-CTC-ERROR] Step " + std::to_string(i) + 
+                            ": Predicted Argmax = " + std::to_string(argmax) + 
+                            " -> Target Dict Index = " + std::to_string(dict_idx) + 
+                            " (ERROR: Calculated index is out of bounds for the dictionary memory layout!)");
+            }
+        }
+        last_index = argmax;
+    }
+
+    if (debugging){
+        m_logger.log("[OCR-CTC-DEBUG] Complete loop execution tracking finish. Resulting string extraction: '" + text + "'");
+    }
+
+    return text;
+}
+
+
+template <typename _Tp>
+_Tp safe_convert(size_t value){
+    if (value > static_cast<size_t>(std::numeric_limits<_Tp>::max())){
+        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "safe_convert: Value too large for template type _Tp.");
+    }
+    return static_cast<_Tp>(value);
+}
+
+cv::Rect ImageFloatBox_to_cv_Rect(size_t width, size_t height, const ImageFloatBox& box){
+    ImagePixelBox pixelbox = floatbox_to_pixelbox(width, height, box);
+    
+    return cv::Rect(
+        safe_convert<int>(pixelbox.min_x),
+        safe_convert<int>(pixelbox.min_y),
+        safe_convert<int>(pixelbox.width()),
+        safe_convert<int>(pixelbox.height())
+    );
+}
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/ML/Inference/ML_PaddleOCRPipeline.h b/SerialPrograms/Source/ML/Inference/ML_PaddleOCRPipeline.h
new file mode 100644
index 0000000000..8a68c401ed
--- /dev/null
+++ b/SerialPrograms/Source/ML/Inference/ML_PaddleOCRPipeline.h
@@ -0,0 +1,156 @@
+/*  ML Paddle OCR
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  
+ */
+
+#ifndef PokemonAutomation_ML_PaddleOCRPipeline_H
+#define PokemonAutomation_ML_PaddleOCRPipeline_H
+
+#include <atomic>
+#include <memory>
+#include <string>
+#include <vector>
+#include <onnxruntime_cxx_api.h>
+#include <opencv2/opencv.hpp>
+#include "Common/Cpp/Concurrency/Mutex.h"
+#include "Common/Cpp/Logging/TaggedLogger.h"
+#include "Common/Cpp/Filesystem/FilePath.h"
+#include "CommonFramework/Language.h"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "ML_PaddleOCRDetector.h"
+
+namespace PokemonAutomation{
+namespace ML{
+
+
+// One piece of text found by `PaddleOCRPipeline::detect_and_recognize()`.
+struct PaddleOCRTextResult{
+    // Recognized text of this box. May be empty if recognition found nothing.
+    std::string text;
+    // Where the text is, in pixel coordinates of the input image.
+    PaddleOCRTextBox box;
+    // Index of the text line this box belongs to, counting from the top (0-based).
+    // Several boxes can share one line, e.g. two words far apart on the same row.
+    size_t line_index = 0;
+};
+
+
+// Full PaddleOCR pipeline: text detection (PP-OCRv5 det, DBNet) + text recognition
+// (PP-OCRv5 rec, CTC).
+//
+// There are two ways to use it:
+// - `recognize()`: single-line OCR. Assumes the image is already cropped around one
+//   line of text. It skips the detection model and instead tightens and pads the crop
+//   using a simple Otsu threshold (`crop_to_text_region_with_padding()`). This is fast
+//   and is what the majority of our game readers use.
+// - `detect_and_recognize()` / `recognize_multiline()`: arbitrary images containing
+//   any number of lines. Runs the detection model to find each text region, then runs
+//   the recognition model on each region.
+//
+// The detection model file is the same for all languages. It is loaded lazily on first
+// use, so single-line only users never pay for it.
+// All public methods are thread-safe.
+class PaddleOCRPipeline{
+public:
+    PaddleOCRPipeline(Language language);
+    PaddleOCRPipeline(
+        Language language,
+        std::string det_path,
+        std::string rec_path,
+        std::string dict_path
+    );
+
+    // Single-line OCR on an image pre-cropped to one line of text.
+    std::string recognize(const ImageViewRGB32& image);
+
+    // Multi-line OCR: detect all text regions in `image` and recognize each of them.
+    // Results are in reading order: top to bottom, then left to right within a line.
+    // Throws FileException if the detection model has not been downloaded, or
+    // `MLModelSessionCreationError` if it cannot be loaded.
+    std::vector<PaddleOCRTextResult> detect_and_recognize(const ImageViewRGB32& image);
+
+    // Multi-line OCR returning plain text: each detected line is one line of the
+    // result, joined by '\n'. Boxes on the same line are joined by a space, except
+    // for Chinese and Japanese which do not use spaces between words.
+    // e.g. a two line dialog box gives "You hurry to the Pokemon Center, shielding your\neyes from the rain."
+    std::string recognize_multiline(const ImageViewRGB32& image);
+
+    // Get the text detector, loading the detection model if it's not loaded yet.
+    // The detection model is the downloadable resource "PaddleOCRDetection".
+    // Throws FileException if it has not been downloaded.
+    PaddleOCRDetector& detector();
+
+    // Return the (recognition model path, dictionary path) for a language.
+    static std::pair<std::string, std::string> get_paths(Language language);
+
+    std::string decode_CTC(float* data, const std::vector<int64_t>& shape, const std::vector<std::string>& dict);
+
+private:
+    void load_dictionary(const Filesystem::Path& path);
+
+    // Run the recognition model on a BGR image (CV_8UC3) that is already cropped
+    // tightly around a single line of text. Resizes it to the model height, prepares
+    // the input tensor, runs the model and CTC-decodes the output.
+    std::string recognize_line(const cv::Mat& line_bgr);
+
+    Ort::Session m_rec_session;
+    Language m_language;
+    std::string m_input_name;
+    std::string m_output_name;
+    std::vector<std::string> m_dictionary;
+    TaggedLogger m_logger;
+
+    // Counts `recognize()` calls, to give each call's debug images unique filenames
+    // (see PADDLE_OCR_DEBUG_IMAGE). Atomic because `recognize()` runs on many threads.
+    std::atomic<int> m_debug_image_index{0};
+
+    std::string m_det_path;
+    Mutex m_detector_lock;
+    std::unique_ptr<PaddleOCRDetector> m_detector;
+};
+
+// assumes the input image is BGR
+cv::Mat crop_to_text_region_with_padding(const cv::Mat& image, int image_index);
+
+// returns binary image of given image
+// text pixels are white.
+// uses Otsu thresholding
+cv::Mat get_binary_image(const cv::Mat& image);
+
+// if the image is narrow/tall, add horizontal padding
+// modifies the input image
+// assumes input image is BGR
+void add_horizontal_padding(cv::Mat& image, int image_index);
+
+// if the image is just a line, add vertical padding
+// modifies the input image
+// to avoid PaddleOCR hallucinating text
+void add_vertical_padding(cv::Mat& image, const cv::Mat& binary_tight_crop, int image_index);
+
+// from given binary image, returns true if it's a horizontal line
+bool is_horizontal_line(const cv::Mat& binary, int image_index);
+
+// from given binary image, and single contour within the binary image,
+// return true if the given contour is line shaped. 
+// density of the contour must be >75%. and at least twice as wide as it is tall
+bool is_line_shape(const cv::Mat& binary, const std::vector<cv::Point>& contour);
+
+// assumes input image is BGR
+cv::Scalar estimate_background_color(const cv::Mat& image);
+
+// Recognition model input: 8-bit BGR image (CV_8UC3) -> B, G, R planes (NCHW) scaled
+// to [-1, 1], written into `dst` (3 * rows * dst_width floats, dst_width >= cols).
+// Columns past `cols` are left as they are, so a zero-filled `dst` gives the zero right
+// padding the model was trained with.
+// Throws InternalProgramError if OpenCV did not write into `dst` (should not happen).
+void write_recognition_input_NCHW(const cv::Mat& image_bgr, float* dst, int dst_width);
+
+cv::Rect ImageFloatBox_to_cv_Rect(size_t width, size_t height, const ImageFloatBox& box);
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/ML/Inference/ML_YOLONavigation.cpp b/SerialPrograms/Source/ML/Inference/ML_YOLONavigation.cpp
new file mode 100644
index 0000000000..8772d02c9a
--- /dev/null
+++ b/SerialPrograms/Source/ML/Inference/ML_YOLONavigation.cpp
@@ -0,0 +1,198 @@
+/*  YOLO Navigation
+ *
+ *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *
+ */
+
+#include <cmath>
+#include "Common/Cpp/PrettyPrint.h"
+#include "Common/Cpp/Color.h"
+#include "Common/Cpp/Exceptions.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/Exceptions/UnexpectedBattleException.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "ML/Inference/ML_YOLOv5Detector.h"
+#include "ML/Models/ML_YOLOv5Model.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStoryTools.h"
+#include "ML_YOLONavigation.h"
+
+using namespace std::chrono_literals;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+ImageFloatBox get_highest_confident_yolo_box(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    VideoOverlaySet& overlays,
+    ML::YOLOv5Detector& yolo_detector,
+    const std::string& target_label
+){
+    context.wait_for_all_requests();
+    overlays.clear();
+    const std::vector<ML::YOLOv5Session::DetectionBox>& detected_boxes = yolo_detector.detected_boxes();
+    auto snapshot = env.console.video().snapshot();
+    yolo_detector.detect(snapshot);
+
+    ImageFloatBox target_box{-1, -1, -1, -1};
+    double best_score = 0;
+    for (const ML::YOLOv5Session::DetectionBox& detected_box : detected_boxes){
+        ImageFloatBox box = detected_box.box;
+        const std::string& label = yolo_detector.session()->label_name(detected_box.label_idx);
+        double score = detected_box.score;
+        const std::string label_score = label + ": " + tostr_fixed(score, 2);
+        if (target_label == label){
+            overlays.add(COLOR_RED, box, label_score);
+
+            if (score > best_score){
+                target_box = box;
+                best_score = score;
+            }
+        }else{
+            overlays.add(COLOR_BLUE, box, label);
+        }
+
+    }
+
+    env.console.log(std::string(target_label) + ": {" + std::to_string(target_box.x) + ", " + std::to_string(target_box.y) + ", " + std::to_string(target_box.width) + ", " + std::to_string(target_box.height) + "}");
+    env.console.log("center-y: " + std::to_string(target_box.y + target_box.height/2) + "   center-x: " + std::to_string(target_box.x + target_box.width/2));
+
+    return target_box;
+}
+
+
+
+void move_camera_yolo(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    CameraAxis axis,
+    ML::YOLOv5Detector& yolo_detector,
+    const std::string& target_label,
+    double target_line,
+    std::function<void()>&& recovery_action
+){
+    VideoOverlaySet overlays(env.console.overlay());
+    bool seen_object = false;
+    size_t max_attempts = 20;
+    size_t not_detected_count = 0;
+    size_t max_not_detected = 5;
+    bool reached_target_line = false;
+    bool exceed_max_not_detected = false;
+    for (size_t i = 0; i < max_attempts; i++){
+    try{
+        PokemonSV::do_action_and_monitor_for_battles_early(env.program_info(), env.console, context,
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            context.wait_for_all_requests();
+            ImageFloatBox target_box = get_highest_confident_yolo_box(env, context, overlays, yolo_detector, target_label);
+
+            bool not_found_target = target_box.x == -1;
+            if (not_found_target){
+                not_detected_count++;
+                if (not_detected_count > max_not_detected){
+                    exceed_max_not_detected = true;
+                    return;      // when too many failed attempts, just assume we're too close to the target to detect it.
+                }
+                context.wait_for(1000ms); // if we can't see the object, it might just be temporarily obscured. wait one second and reattempt.
+                return;
+            }else{
+                not_detected_count = 0;
+                seen_object = true;
+            }
+       
+            
+            double diff;
+            switch(axis){
+            case CameraAxis::X:{
+                double object_x_pos = target_box.x + target_box.width/2;
+                diff =  target_line - object_x_pos;
+                break;
+            }
+            case CameraAxis::Y:{
+                double object_y_pos = target_box.y + target_box.height/2;
+                diff =  object_y_pos - target_line;
+                break;
+            }
+            default:
+                throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "move_camera_yolo: Unknown CameraAxis enum.");  
+            }
+            env.console.log("target_line: " + std::to_string(target_line));
+            env.console.log("diff: " + std::to_string(diff));
+            if (std::abs(diff) < 0.01){
+                reached_target_line = true;
+                return;    // close enough to target_line. stop.
+            }
+
+            
+            double duration_scale_factor;
+            double push_magnitude_scale_factor;
+            switch(axis){
+            case CameraAxis::X:
+                duration_scale_factor = 2000 / std::sqrt(std::abs(diff));
+                if (std::abs(diff) < 0.05){
+                    duration_scale_factor /= 2;
+                }
+                push_magnitude_scale_factor = 0.46875 / std::sqrt(std::abs(diff));
+                break;
+            case CameraAxis::Y:
+                duration_scale_factor = 400 / std::sqrt(std::abs(diff));
+                if (std::abs(diff) < 0.1){
+                    duration_scale_factor *= 0.5;
+                }
+                push_magnitude_scale_factor = 0.46875 / std::sqrt(std::abs(diff));
+                break;
+            
+            default:
+                throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "move_camera_yolo: Unknown CameraAxis enum.");  
+            }
+
+            Milliseconds push_duration = std::max(
+                Milliseconds((int64_t)std::abs(diff * duration_scale_factor)),
+                64ms
+            );
+            int16_t push_direction = (diff > 0) ? -1 : 1;
+            double push_magnitude = std::max(std::abs(diff * push_magnitude_scale_factor), 0.117); 
+            double axis_push = std::max(std::min(push_direction * push_magnitude, +1.0), -1.0);
+
+            // env.console.log("object_x: {" + std::to_string(target_box.x) + ", " + std::to_string(target_box.y) + ", " + std::to_string(target_box.width) + ", " + std::to_string(target_box.height) + "}");
+            // env.console.log("object_x_pos: " + std::to_string(object_x_pos));
+            env.console.log("axis push: " + std::to_string(axis_push) + ", push duration: " +  std::to_string(push_duration.count()) + " ms");
+            switch(axis){
+            case CameraAxis::X:{
+                pbf_move_right_joystick(context, {axis_push, 0}, push_duration, 0ms);
+                break;
+            }
+            case CameraAxis::Y:{
+                pbf_move_right_joystick(context, {0, axis_push}, push_duration, 0ms);
+                break;
+            }
+            default:
+                throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "move_camera_yolo: Unknown CameraAxis enum.");  
+            }
+        });
+
+        if(reached_target_line || exceed_max_not_detected){
+            break;
+        }
+
+    }catch (UnexpectedBattleException&){
+        overlays.clear();
+        recovery_action();
+        // run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+    }
+    }
+
+    if (!seen_object){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "move_camera_yolo(): Never detected the yolo object.",
+            env.console
+        );
+    }
+}
+
+
+} // namespace NintendoSwitch
+} // namespace PokemonAutomation
diff --git a/SerialPrograms/Source/ML/Inference/ML_YOLONavigation.h b/SerialPrograms/Source/ML/Inference/ML_YOLONavigation.h
new file mode 100644
index 0000000000..32eb542e3a
--- /dev/null
+++ b/SerialPrograms/Source/ML/Inference/ML_YOLONavigation.h
@@ -0,0 +1,59 @@
+/*  YOLO Navigation
+ *
+ *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *
+ *  Reusable navigation functions using YOLO object detection for game world navigation.
+ *  These functions provide camera alignment, player movement, and approach behaviors
+ *  based on detected objects in the game environment.
+ */
+
+#ifndef PokemonAutomation_ML_YOLONavigation_H
+#define PokemonAutomation_ML_YOLONavigation_H
+
+#include <string>
+#include <functional>
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+
+namespace PokemonAutomation{
+    namespace ML{
+        class YOLOv5Detector;
+    }
+namespace NintendoSwitch{
+
+enum class CameraAxis{
+    X,
+    Y,
+};
+
+
+// Get the box of the target object with the highest confidence score.
+// If multiple objects have the same label, choose the one with the highest score.
+// Returns ImageFloatBox{-1, -1, -1, -1} if target object not found.
+ImageFloatBox get_highest_confident_yolo_box(
+    NintendoSwitch::SingleSwitchProgramEnvironment& env,
+    NintendoSwitch::ProControllerContext& context,
+    VideoOverlaySet& overlays,
+    ML::YOLOv5Detector& yolo_detector,
+    const std::string& target_label
+);
+
+
+// move the camera along `axis` until the target object is aligned with target_line
+// if caught in battle, run recovery_action
+// throw exception if never detected yolo object
+void move_camera_yolo(
+    NintendoSwitch::SingleSwitchProgramEnvironment& env,
+    NintendoSwitch::ProControllerContext& context,
+    CameraAxis axis,
+    ML::YOLOv5Detector& yolo_detector,
+    const std::string& target_label,
+    double target_line,
+    std::function<void()>&& recovery_action
+);
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/ML/Inference/ML_YOLOv5Detector.cpp b/SerialPrograms/Source/ML/Inference/ML_YOLOv5Detector.cpp
new file mode 100644
index 0000000000..715f6bbf36
--- /dev/null
+++ b/SerialPrograms/Source/ML/Inference/ML_YOLOv5Detector.cpp
@@ -0,0 +1,142 @@
+/*  YOLOv5 Detector
+ *
+ *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *
+ */
+
+#include <iostream>
+#include <opencv2/imgproc.hpp>
+#include "Common/Cpp/Exceptions.h"
+#include "Common/Cpp/PrettyPrint.h"
+#include "Common/Cpp/Filesystem/Filesystem.h"
+#include "Common/Cpp/Concurrency/SpinLock.h"
+#include "CommonFramework/GlobalAutoPaths.h"
+#include "CommonFramework/GlobalSettingsPanel.h"
+#include "CommonFramework/Options/Environment/PerformanceOptions.h"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/ImageTypes/ImageRGB32_OpenCV.h"
+#include "CommonFramework/VideoPipeline/VideoOverlay.h"
+#include "ML_YOLOv5Detector.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace ML{
+
+
+namespace {
+    // Add prefix RESOURCE_PATH() to path if needed so caller can simply
+    // provide a path relative to RESOURCE_PATH()
+    std::string to_resource_filepath(const std::string& path){
+        std::string resource_path = RESOURCE_PATH() + path;
+        std::cout << "Got resource path " << resource_path << std::endl;
+        if (Filesystem::exists(resource_path)){
+            return resource_path;
+        }
+        return path;
+    }
+}
+
+YOLOv5Detector::~YOLOv5Detector() = default;
+
+YOLOv5Detector::YOLOv5Detector(const std::string& model_path)
+    : m_model_path(to_resource_filepath(model_path))
+    , m_use_gpu(PerformanceOptions::instance().ONNX_OPTIONS.USE_GPU)
+{
+    if (!model_path.ends_with(".onnx")){
+        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, 
+            "Error: YOLOv5 model path must end with .onnx. But got " + model_path + ".");
+    }
+
+    std::string label_file_path = model_path.substr(0, model_path.size() - 5) + "_label.txt";
+    m_yolo_session = std::make_unique<YOLOv5Session>(m_model_path, m_use_gpu);
+}
+
+bool YOLOv5Detector::detect(const ImageViewRGB32& screen){
+    if (!m_yolo_session){
+        return false;
+    }
+
+    cv::Mat frame_mat_bgra = to_OpenCV_ref(screen);
+    cv::Mat frame_mat_rgb;
+    cv::cvtColor(frame_mat_bgra, frame_mat_rgb, cv::COLOR_BGRA2RGB);
+
+    m_output_boxes.clear();
+
+    // fall back to CPU if fails with GPU.
+    for (size_t i = 0; i < 2; i++){
+        try{
+            // if (m_use_gpu){ throw Ort::Exception("Testing.", ORT_FAIL); }  // to simulate GPU/CPU failure
+            // If fails with GPU, fall back to CPU.
+            m_yolo_session->run(frame_mat_rgb, m_output_boxes);
+            break;
+        }catch (Ort::Exception& e){
+            if (m_use_gpu){
+                std::cerr << "Warning: YOLO session failed using the GPU. Will reattempt with the CPU.\n" << e.what() << std::endl;
+                m_use_gpu = false;
+                std::vector<std::string> labels = m_yolo_session->get_label_names();
+                m_yolo_session = std::make_unique<YOLOv5Session>(m_model_path, m_use_gpu);
+            }else{
+                throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Error: YOLO session failed even when using the CPU." + std::string(e.what()));
+            }
+        }catch (...){
+            throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Unknown error: YOLO session failed.");
+
+        }
+
+        if (i > 0){
+            throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Internal Program Error: This section of code shouldn't be reachable.");
+        }
+    }
+
+    // Only lock when swapping results
+    return m_output_boxes.size() > 0;
+}
+
+const std::string& YOLOv5Detector::label_name(size_t label_idx) const{
+    return m_yolo_session->label_name(label_idx);
+}
+
+size_t YOLOv5Detector::label_index(const std::string& label_name) const{
+    return m_yolo_session->label_index(label_name);
+}
+
+YOLOv5Watcher::YOLOv5Watcher(VideoOverlay& overlay, const std::string& model_path)
+    : VisualInferenceCallback("YOLOv5")
+    , m_overlay_set(overlay)
+    , m_detector(model_path)
+{
+}
+
+bool YOLOv5Watcher::process_frame(const ImageViewRGB32& frame, WallClock timestamp){
+    if (!m_detector.model_loaded()){
+        return false;
+    }
+
+    m_detector.detect(frame);
+
+    m_overlay_set.clear();
+    for (const auto& box : m_detector.detected_boxes()){
+        std::string text = m_detector.session()->label_name(box.label_idx) + ": " + tostr_fixed(box.score, 2);
+        m_overlay_set.add(COLOR_RED, box.box, text);
+    }
+
+    {
+        WriteSpinLock lg(m_output_lock, "YOLOv5Watcher::process_frame()");
+        m_output_boxes = std::move(m_detector.detected_boxes());
+    }
+    return false;
+}
+
+
+std::vector<YOLOv5Watcher::DetectionBox> YOLOv5Watcher::detected_boxes(){
+    ReadSpinLock lg(m_output_lock, "YOLOv5Watcher::detected_boxes()");
+    return m_output_boxes;
+}
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/ML/Inference/ML_YOLOv5Detector.h b/SerialPrograms/Source/ML/Inference/ML_YOLOv5Detector.h
new file mode 100644
index 0000000000..84d44c5cb5
--- /dev/null
+++ b/SerialPrograms/Source/ML/Inference/ML_YOLOv5Detector.h
@@ -0,0 +1,86 @@
+/*  YOLOv5 Detector
+ *
+ *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *
+ */
+
+#ifndef PokemonAutomation_ML_YOLOv5Detector_H
+#define PokemonAutomation_ML_YOLOv5Detector_H
+
+#include <vector>
+#include "Common/Cpp/Color.h"
+#include "Common/Cpp/Concurrency/SpinLock.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+#include "CommonTools/VisualDetector.h"
+#include "ML/Models/ML_YOLOv5Model.h"
+
+namespace PokemonAutomation{
+
+class VideoOverlay;
+
+namespace ML{
+
+
+class YOLOv5Detector : public StaticScreenDetector{
+public:
+    using DetectionBox = YOLOv5Session::DetectionBox;
+    // - model_path: path to the onnx model file. Can be a relative path to `RESOURCE_PATH()`.
+    // If model loading fails, InternalProgramError exception is thrown
+    YOLOv5Detector(const std::string& model_path);
+    virtual ~YOLOv5Detector();
+
+    // If it loads the model successfully
+    bool model_loaded() const { return m_yolo_session != nullptr; }
+
+    virtual void make_overlays(VideoOverlaySet& items) const override {}
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+    const std::vector<DetectionBox>& detected_boxes() const { return m_output_boxes; }
+    std::vector<DetectionBox>& detected_boxes(){ return m_output_boxes; }
+
+    const std::unique_ptr<YOLOv5Session>& session() const { return m_yolo_session; }
+
+    const std::string& label_name(size_t label_idx) const;
+    size_t label_index(const std::string& label_name) const;
+
+protected:
+    std::string m_model_path;
+    bool m_use_gpu;
+    // std::vector<std::string> m_labels;
+    std::unique_ptr<YOLOv5Session> m_yolo_session;
+    std::vector<DetectionBox> m_output_boxes;
+};
+
+
+
+class YOLOv5Watcher : public VisualInferenceCallback{
+public:
+    using DetectionBox = YOLOv5Session::DetectionBox;
+    // - model_path: path to the onnx model file. Can be a relative path to `RESOURCE_PATH()`.
+    // If model loading fails, InternalProgramError exception is thrown
+    YOLOv5Watcher(VideoOverlay& overlay, const std::string& model_path);
+    virtual ~YOLOv5Watcher(){}
+
+    virtual void make_overlays(VideoOverlaySet& items) const override {}
+    virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override;
+
+    // Thread-safe: Any thread can read this detection result
+    std::vector<DetectionBox> detected_boxes();
+
+    const std::string& label_name(size_t label_idx) const {return m_detector.label_name(label_idx);}
+    size_t label_index(const std::string& label_name) const {return m_detector.label_index(label_name);}
+
+protected:
+    VideoOverlaySet m_overlay_set;
+    YOLOv5Detector m_detector;
+
+    std::vector<DetectionBox> m_output_boxes;
+    SpinLock m_output_lock;  // Protects m_output_boxes
+};
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/ML/ML_Panels.cpp b/SerialPrograms/Source/ML/ML_Panels.cpp
new file mode 100644
index 0000000000..41945ac10e
--- /dev/null
+++ b/SerialPrograms/Source/ML/ML_Panels.cpp
@@ -0,0 +1,42 @@
+/*  ML Panels
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/StaticGlobals.h"
+#include "CommonFramework/Panels/PanelTools.h"
+#include "GameConsole/ConsolePanel.h"
+#include "Programs/ML_LabelImages.h"
+#include "Programs/ML_RunYOLO.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "ML_Panels.h"
+
+
+namespace PokemonAutomation{
+namespace ML{
+
+
+
+PanelListFactory::PanelListFactory()
+    : PanelListDescriptor("ML")
+{}
+
+std::vector<PanelEntry> PanelListFactory::make_panels() const{
+    std::vector<PanelEntry> ret;
+    if (STATIC_GLOBALS.DEVELOPER_MODE){
+        ret.emplace_back("---- Developer Tools ----");
+        ret.emplace_back(GameConsole::make_ConsolePanel<LabelImages>());
+        // ret.emplace_back(make_panel<RunYOLO_Descriptor, RunYOLO>());
+        ret.emplace_back(NintendoSwitch::make_SingleSwitchProgram<RunYOLO>());
+        // ret.emplace_back(make_SingleSwitchProgram<ThreeSegmentDudunsparceFinder_Descriptor, ThreeSegmentDudunsparceFinder>());
+    }
+
+    return ret;
+}
+
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/ML/ML_Panels.h b/SerialPrograms/Source/ML/ML_Panels.h
new file mode 100644
index 0000000000..b30657025f
--- /dev/null
+++ b/SerialPrograms/Source/ML/ML_Panels.h
@@ -0,0 +1,28 @@
+/*  ML Panels
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_ML_Panels_H
+#define PokemonAutomation_ML_Panels_H
+
+#include "CommonFramework/Panels/PanelList.h"
+
+namespace PokemonAutomation{
+namespace ML{
+
+
+
+class PanelListFactory : public PanelListDescriptor{
+public:
+    PanelListFactory();
+private:
+    virtual std::vector<PanelEntry> make_panels() const override;
+};
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/ML/Models/ML_ONNXRuntimeHelpers.cpp b/SerialPrograms/Source/ML/Models/ML_ONNXRuntimeHelpers.cpp
new file mode 100644
index 0000000000..d0dac9d2a8
--- /dev/null
+++ b/SerialPrograms/Source/ML/Models/ML_ONNXRuntimeHelpers.cpp
@@ -0,0 +1,262 @@
+/*  ML ONNX Runtime Helpers
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  Helper functions to work with ONNX Runtime library
+ */
+
+#include <iostream>
+#include <string>
+#include <fstream>
+#include <onnxruntime_cxx_api.h>
+#include "3rdParty/ONNX/OnnxToolsPA.h"
+#include "Common/Cpp/Exceptions.h"
+#include "Common/Cpp/Filesystem/Filesystem.h"
+#include "CommonFramework/Logging/Logger.h"
+#include "CommonFramework/Tools/FileHash.h"
+#include "ML_OrtEnv.h"
+#include "ML_ONNXRuntimeHelpers.h"
+
+namespace PokemonAutomation{
+namespace ML{
+
+
+
+
+Ort::SessionOptions create_session_options(const std::string& model_cache_path, bool use_gpu){
+    Ort::SessionOptions so;
+    std::cout << "Set potential model cache path in session options: " << model_cache_path << std::endl;
+
+    if (use_gpu){
+#if __APPLE__
+        // create session using Apple ML acceleration library CoreML
+        std::unordered_map<std::string, std::string> provider_options;
+        // See for provider options: https://onnxruntime.ai/docs/execution-providers/CoreML-ExecutionProvider.html
+        // "NeuralNetwork" is a faster ModelFormat than "MLProgram".
+        provider_options["ModelFormat"] = std::string("NeuralNetwork");
+        provider_options["ModelCacheDirectory"] = model_cache_path;
+
+        // provider_options["MLComputeUnits"] = "ALL";
+        // provider_options["RequireStaticInputShapes"] = "0";
+        // provider_options["EnableOnSubgraphs"] = "0";
+        so.AppendExecutionProvider("CoreML", provider_options);
+        std::cout << "Using CoreML execution provider for GPU acceleration" << std::endl;
+#elif _WIN32
+        // Try CUDA first for NVIDIA GPUs (best performance)
+        // CUDA requires NVIDIA GPU and CUDA runtime installation
+        // See: https://onnxruntime.ai/docs/execution-providers/CUDA-ExecutionProvider.html
+        bool cuda_available = false;
+        try{
+            OrtCUDAProviderOptions cuda_options{};
+            cuda_options.device_id = 0;
+            so.AppendExecutionProvider_CUDA(cuda_options);
+            std::cout << "Using CUDA execution provider for GPU acceleration" << std::endl;
+            cuda_available = true;
+        }catch (const Ort::Exception& e){
+            std::cout << "CUDA execution provider not available: " << e.what() << std::endl;
+        }
+
+        bool rocm_available = false;
+        if (!cuda_available){
+            // Try ROCm next for AMD GPUs
+            // See: https://onnxruntime.ai/docs/execution-providers/ROCm-ExecutionProvider.html
+            try{
+                OrtROCMProviderOptions rocm_options{};
+                rocm_options.device_id = 0;
+                so.AppendExecutionProvider_ROCM(rocm_options);
+                std::cout << "Using ROCm execution provider for GPU acceleration" << std::endl;
+                rocm_available = true;
+            }catch (const Ort::Exception& e){
+                std::cout << "ROCm execution provider not available: " << e.what() << std::endl;
+            }
+        }
+
+        // Fallback to DirectML for all GPU vendors (NVIDIA, AMD, Intel)
+        // DirectML is built into Windows 10 1903+ and requires no additional runtime installation
+        // See: https://onnxruntime.ai/docs/execution-providers/DirectML-ExecutionProvider.html
+        if (!cuda_available and !rocm_available){
+            try{
+                so.AppendExecutionProvider("DML");
+                std::cout << "Using DirectML execution provider for GPU acceleration" << std::endl;
+            }catch (const Ort::Exception& e){
+                std::cout << "DirectML execution provider not available, falling back to CPU: " << e.what() << std::endl;
+            }
+        }
+#elif defined(__linux__)
+        // Try CUDA first for NVIDIA GPUs (best performance)
+        // See: https://onnxruntime.ai/docs/execution-providers/CUDA-ExecutionProvider.html
+        try{
+            OrtCUDAProviderOptions cuda_options{};
+            cuda_options.device_id = 0;
+            so.AppendExecutionProvider_CUDA(cuda_options);
+            std::cout << "Using CUDA execution provider for GPU acceleration" << std::endl;
+        }catch (const Ort::Exception& e){
+            std::cout << "CUDA execution provider not available, trying ROCm: " << e.what() << std::endl;
+
+            // Try ROCm next for AMD GPUs
+            // See: https://onnxruntime.ai/docs/execution-providers/ROCm-ExecutionProvider.html
+            try{
+                OrtROCMProviderOptions rocm_options{};
+                rocm_options.device_id = 0;
+                so.AppendExecutionProvider_ROCM(rocm_options);
+                std::cout << "Using ROCm execution provider for GPU acceleration" << std::endl;
+            }catch (const Ort::Exception& e){
+                std::cout << "ROCm execution provider not available, falling back to CPU: " << e.what() << std::endl;
+            }
+        }
+#endif
+    }
+
+    // CPU fallback is always available
+    return so;
+}
+
+// Check the model file cache integrity by checking the existence of a flag file and the model hash stored 
+// in the flag file. If the flag does not exist, we assume the file cache does not exist or is broken.
+// If the hash stored in the flag file does not match the model file, the model file is a new model, delete
+// the old cache.
+// Return
+// - bool: whether to write flag file after cache is created
+// - string: the model file hash to write into the flag file after Ort::Session is built and the cache is created.
+//
+// model_cache_path: Folder path to store model cache. This name is better to be unique for each model for
+//   easier file management.
+// model_path: the model path to load the ML model. This is needed to ensure we delete the old model cache
+//   when a new model
+std::pair<bool, std::string> clean_up_old_model_cache(const std::string& model_cache_path, const std::string& model_path){
+    std::string file_hash = hash_file(model_path);
+    if (file_hash.size() == 0){
+        // the model file cannot be loaded
+        return {true, ""};
+    }
+
+    if (!Filesystem::exists(model_cache_path)){
+        return {true, file_hash};
+    }
+
+    const std::string flag_file_path = model_cache_path + "/HASH.txt";
+    if (Filesystem::exists(flag_file_path)){
+        std::ifstream fin(flag_file_path);
+        if (fin){
+            std::string line;
+            fin >> line;
+            if (line == file_hash){
+                // hash match!
+                return {false, file_hash};
+            }
+        }
+    }
+    // remove everything from model_cache_path
+    Filesystem::remove_all(model_cache_path);
+    return {true, file_hash};
+}
+
+
+void write_cache_flag_file(const std::string& model_cache_path, const std::string& hash){
+    if (!Filesystem::exists(model_cache_path)){
+        return;
+    }
+    const std::string flag_file_path = model_cache_path + "/HASH.txt";
+    std::ofstream fout(Filesystem::Path(flag_file_path).stdpath());
+    fout << hash;
+}
+
+
+Ort::Session create_session(
+    const std::string& model_path, 
+    const std::string& model_cache_path,
+    bool try_gpu
+){
+    bool write_flag_file = true;
+    std::string file_hash;
+    std::tie(write_flag_file, file_hash) = clean_up_old_model_cache(model_cache_path, model_path);
+    
+    auto onnx_path = str_to_onnx_str(model_path);
+
+    auto& logger = global_logger_tagged();
+    logger.log("Creating Ort::session from model " + model_path);
+
+    // Attempt 1. using GPU.
+    if (try_gpu){
+        try{
+            logger.log("Attempting to create Ort::Session with GPU acceleration...");
+            Ort::SessionOptions gpu_options = create_session_options(model_cache_path, true);
+            gpu_options.DisablePerSessionThreads();
+            Ort::Session session{global_ort_env(), onnx_path.c_str(), gpu_options};
+            logger.log("Ort::Session created");
+            // when Ort::Ssssion is created, if possible, it will create a model cache
+            if (write_flag_file){
+                write_cache_flag_file(model_cache_path, file_hash);
+            }
+            return session;
+        }catch (const Ort::Exception& e){
+            logger.log("GPU Session creation failed: " + std::string(e.what()));
+            logger.log("Falling back cleanly to CPU execution...");
+            // Do not throw yet. Fall through to the CPU execution block below
+        } catch (...){
+            logger.log("Unknown GPU initialization failure. Falling back cleanly to CPU...");
+        }
+    }
+
+    // Attempt 2. CPU fallback
+    try {
+        logger.log("Creating dedicated CPU-only session...");
+        
+        Ort::SessionOptions cpu_options = create_session_options(model_cache_path, false);
+        cpu_options.DisablePerSessionThreads();
+        
+        Ort::Session session{global_ort_env(), onnx_path.c_str(), cpu_options};
+        logger.log("Ort::Session created");
+        return session;
+    }
+    catch (const Ort::Exception& e){
+        logger.log("CRITICAL: CPU fallback failed completely: " + std::string(e.what()));
+        throw MLModelSessionCreationError(&logger, model_path);
+    }
+    catch (...){
+        logger.log("CRITICAL: Unknown failure during CPU session fallback.");
+        throw MLModelSessionCreationError(&logger, model_path);
+    }
+}
+
+
+void print_model_input_output_info(const Ort::Session& session){
+    const auto input_names = session.GetInputNames();
+    const auto output_names = session.GetOutputNames();
+
+    for (size_t i = 0; i < input_names.size(); ++i){
+        Ort::TypeInfo type_info = session.GetInputTypeInfo(i);
+        auto tensor_info = type_info.GetTensorTypeAndShapeInfo();
+        std::vector<int64_t> input_dims = tensor_info.GetShape();
+
+        std::cout << "Input " << i << ": " << input_names[i] << " Type " << tensor_info.GetElementType() <<  " Shape: [";
+        for (size_t j = 0; j < input_dims.size(); ++j){
+            std::cout << input_dims[j];
+            if (j < input_dims.size() - 1){
+                std::cout << ", ";
+            }
+        }
+        std::cout << "]" << std::endl;
+    }
+
+    for (size_t i = 0; i < output_names.size(); ++i){
+        Ort::TypeInfo type_info = session.GetOutputTypeInfo(i);
+        auto tensor_info = type_info.GetTensorTypeAndShapeInfo();
+        std::vector<int64_t> output_dims = tensor_info.GetShape();
+
+        std::cout << "Output " << i << ": " << input_names[i] << " Type " << tensor_info.GetElementType() <<  " Shape: [";
+        for (size_t j = 0; j < output_dims.size(); ++j){
+            std::cout << output_dims[j];
+            if (j < output_dims.size() - 1){
+                std::cout << ", ";
+            }
+        }
+        std::cout << "]" << std::endl;
+    }
+}
+
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/ML/Models/ML_ONNXRuntimeHelpers.h b/SerialPrograms/Source/ML/Models/ML_ONNXRuntimeHelpers.h
new file mode 100644
index 0000000000..e847537f49
--- /dev/null
+++ b/SerialPrograms/Source/ML/Models/ML_ONNXRuntimeHelpers.h
@@ -0,0 +1,66 @@
+/*  ML ONNX Runtime Helpers
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  Helper functions to work with ONNX Runtime library
+ */
+
+#ifndef PokemonAutomation_ML_ONNXRuntimeHelpers_H
+#define PokemonAutomation_ML_ONNXRuntimeHelpers_H
+
+
+#include <vector>
+#include <sstream>
+#include <onnxruntime_cxx_api.h>
+
+namespace PokemonAutomation{
+namespace ML{
+
+
+// Create an ONNX SessionOptions
+// If on macOS, will use CoreML as the backend.
+// If on Windows, will try CUDA first (NVIDIA GPUs), then DirectML (all GPU vendors).
+// Otherwise, use CPU to run the model.
+//
+// model_cache_path: the path to store model caches. This path is better
+//   to be unique for each model for easier file management.
+Ort::SessionOptions create_session_options(const std::string& model_cache_path, bool use_gpu);
+
+
+// Create an ONNX Session. It will also update the model cache on macOS if necessary.
+// model_cache_path: the path to store model caches. This path must be the same path
+//   used in `create_session_options()` to construct the passed-in session options so.
+// NOTE: it may throw `MLModelSessionCreationError` if failed to create session.
+Ort::Session create_session(
+    const std::string& model_path, 
+    const std::string& model_cache_path,
+    bool try_gpu
+);
+
+// Handy function to create an ONNX Runtime tensor view class from a vector-like `buffer` object holding
+// the tensor data and an array-like `shape` object that represents the dimension of the tensor.
+template<typename T, class Buffer, class Shape>
+Ort::Value create_tensor(const OrtMemoryInfo* memory_info, Buffer& buffer, const Shape& shape){
+    return Ort::Value::CreateTensor<T>(memory_info, buffer.data(), buffer.size(),
+        shape.data(), shape.size());
+}
+
+
+//  Print vector as std::string. Useful for printing debugging info on tensor shapes
+template<typename T>
+std::string to_string(std::vector<T>& vec){
+    std::ostringstream os;
+    os << "[";
+    std::copy(vec.begin(), vec.end(), std::ostream_iterator<T>(os, ", "));
+    os << "]";
+    return os.str();
+}
+
+//  Print model input and output types and shapes to cout. Useful for debugging.
+void print_model_input_output_info(const Ort::Session& session);
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/ML/Models/ML_OrtEnv.cpp b/SerialPrograms/Source/ML/Models/ML_OrtEnv.cpp
new file mode 100644
index 0000000000..c69ace4a39
--- /dev/null
+++ b/SerialPrograms/Source/ML/Models/ML_OrtEnv.cpp
@@ -0,0 +1,53 @@
+/*  Global Ort::Env
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Exceptions.h"
+#include "Common/Cpp/PrettyPrint.h"
+#include "CommonFramework/Logging/Logger.h"
+#include "CommonFramework/Options/Environment/PerformanceOptions.h"
+#include "ML_OrtEnv.h"
+
+namespace PokemonAutomation{
+
+
+
+Ort::ThreadingOptions make_ort_threading_options(){
+    Ort::ThreadingOptions ret;
+    {
+        int threads = (int)PerformanceOptions::instance().ONNX_OPTIONS.MAX_INTRA_OP_THREADS;
+        global_logger_tagged().log("Setting ONNX Intra-Op Threads: " + tostr_u_commas(threads));
+        ret.SetGlobalIntraOpNumThreads(threads);
+    }
+    {
+        int threads = (int)PerformanceOptions::instance().ONNX_OPTIONS.MAX_INTER_OP_THREADS;
+        global_logger_tagged().log("Setting ONNX Inter-Op Threads: " + tostr_u_commas(threads));
+        ret.SetGlobalInterOpNumThreads(threads);
+    }
+    ret.SetGlobalSpinControl(0);
+    //  Flush denormal floats to zero on ONNX Runtime's own threads: the big models produce
+    //  them, and they are very slow on Intel CPUs. ONNX Runtime only supports this on x86;
+    //  see Common/Cpp/Hardware/FloatingPointMode.h.
+    ret.SetGlobalDenormalAsZero();
+    return ret;
+}
+
+Ort::Env& global_ort_env(){
+#if ORT_API_VERSION < 24 // Removed in ONNX Runtime 1.24.0
+    if (Ort::Global<void>::api_ == nullptr){
+        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Onnx API returned a null pointer.");
+    }
+#endif
+    static Ort::Env env(
+        make_ort_threading_options(),
+        ORT_LOGGING_LEVEL_WARNING,
+        "Global_ThreadPool_Env"
+    );
+    return env;
+}
+
+
+
+}
diff --git a/SerialPrograms/Source/ML/Models/ML_OrtEnv.h b/SerialPrograms/Source/ML/Models/ML_OrtEnv.h
new file mode 100644
index 0000000000..a6e847ee21
--- /dev/null
+++ b/SerialPrograms/Source/ML/Models/ML_OrtEnv.h
@@ -0,0 +1,21 @@
+/*  Global Ort::Env
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_ML_OrtEnv_H
+#define PokemonAutomation_ML_OrtEnv_H
+
+#include <onnxruntime_cxx_api.h>
+
+namespace PokemonAutomation{
+
+
+Ort::Env& global_ort_env();
+
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/ML/Models/ML_YOLOv5Model.cpp b/SerialPrograms/Source/ML/Models/ML_YOLOv5Model.cpp
new file mode 100644
index 0000000000..1e19aac6e5
--- /dev/null
+++ b/SerialPrograms/Source/ML/Models/ML_YOLOv5Model.cpp
@@ -0,0 +1,301 @@
+/*  ML YOLOv5 Model
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  Run YOLOv5 model for object detection
+ */
+
+
+#include <string>
+#include <map>
+//#include <iostream>
+#include <opencv2/imgproc.hpp>
+#include <opencv2/dnn.hpp>
+#include "3rdParty/ONNX/OnnxToolsPA.h"
+#include "Common/Cpp/Hardware/FloatingPointMode.h"
+#include "CommonFramework/GlobalAutoPaths.h"
+#include "CommonFramework/Logging/Logger.h"
+#include "ML/Models/ML_ONNXRuntimeHelpers.h"
+#include "ML_YOLOv5Model.h"
+
+namespace PokemonAutomation{
+namespace ML{
+
+
+// Parse YOLO metadata "names" field to extract label names
+// Expected format: "names: {0: 'label0', 1: 'label1', 2: 'label2', ...}"
+std::vector<std::string> parse_yolo_metadata_names(const std::string& metadata_value){
+    std::vector<std::string> label_names;
+    std::map<int, std::string> label_map;
+
+    // Find the opening brace
+    size_t brace_start = metadata_value.find('{');
+    size_t brace_end = metadata_value.rfind('}');
+
+    if (brace_start == std::string::npos || brace_end == std::string::npos){
+        return label_names;  // Return empty vector if format is invalid
+    }
+
+    std::string content = metadata_value.substr(brace_start + 1, brace_end - brace_start - 1);
+
+    // Parse entries like "0: 'label0', 1: 'label1', ..."
+    size_t pos = 0;
+    while (pos < content.size()){
+        // Find the index
+        size_t colon_pos = content.find(':', pos);
+        if (colon_pos == std::string::npos){
+            break;
+        }
+
+        // Extract index
+        std::string index_str = content.substr(pos, colon_pos - pos);
+        // Trim whitespace
+        index_str.erase(0, index_str.find_first_not_of(" \t\n\r"));
+        index_str.erase(index_str.find_last_not_of(" \t\n\r") + 1);
+
+        int index = std::stoi(index_str);
+
+        // Find the label name (between quotes)
+        size_t quote1 = content.find('\'', colon_pos);
+        if (quote1 == std::string::npos){
+            quote1 = content.find('"', colon_pos);  // Try double quotes
+        }
+        if (quote1 == std::string::npos){
+            break;
+        }
+
+        size_t quote2 = content.find(content[quote1], quote1 + 1);  // Find matching quote
+        if (quote2 == std::string::npos){
+            break;
+        }
+
+        std::string label = content.substr(quote1 + 1, quote2 - quote1 - 1);
+        label_map[index] = label;
+
+        // Move to next entry
+        pos = content.find(',', quote2);
+        if (pos == std::string::npos){
+            break;
+        }
+        pos++;  // Skip the comma
+    }
+
+    // Convert map to vector (in order)
+    for (const auto& pair : label_map){
+        if (pair.first != (int)label_names.size()){
+            throw std::runtime_error("YOLO metadata labels are not sequential. Expected index " +
+                std::to_string(label_names.size()) + " but found " + std::to_string(pair.first));
+        }
+        label_names.push_back(pair.second);
+    }
+
+    return label_names;
+}
+
+
+std::tuple<int, int, double, double> resize_image_with_border(
+    const cv::Mat& input_image,
+    cv::Mat& output_image,
+    int target_width, int target_height,
+    cv::Scalar border_color = cv::Scalar(0,0,0)
+){
+    int original_width = input_image.cols;
+    int original_height = input_image.rows;
+
+    double scale_x = static_cast<double>(target_width) / original_width;
+    double scale_y = static_cast<double>(target_height) / original_height;
+    double scale = std::min(scale_x, scale_y);
+
+    int new_width = static_cast<int>(original_width * scale);
+    int new_height = static_cast<int>(original_height * scale);
+    new_width = std::min(new_width, target_width);
+    new_height = std::min(new_height, target_height);
+
+    if (new_width == 0 || new_height == 0){
+        throw std::runtime_error("Input Image too small: " + std::to_string(original_width) + " x " + std::to_string(original_height));
+    }
+
+    cv::Mat resized_image;
+    cv::resize(input_image, resized_image, cv::Size(new_width, new_height), 0, 0, cv::INTER_LINEAR); // INTER_AREA for shrinking
+
+    int border_top = (target_height - new_height) / 2;
+    int border_bottom = target_height - new_height - border_top;
+    int border_left = (target_width - new_width) / 2;
+    int border_right = target_width - new_width - border_left;
+
+    cv::copyMakeBorder(resized_image, output_image, border_top, border_bottom, border_left, border_right, cv::BORDER_CONSTANT, border_color);
+
+    return std::make_tuple(
+        border_left, border_top,
+        1.0 / new_width, 1.0 / new_height
+    );
+}
+
+
+YOLOv5Session::YOLOv5Session(const std::string& model_path, bool use_gpu)
+    : m_session{create_session(model_path, ML_MODEL_CACHE_PATH() + "YOLOv5", use_gpu)}
+    , m_memory_info{Ort::MemoryInfo::CreateCpu(OrtDeviceAllocator, OrtMemTypeCPU)}
+    , m_input_names{m_session.GetInputNames()}
+    , m_output_names{m_session.GetOutputNames()}
+    , m_model_input(3*YOLO5_INPUT_IMAGE_SIZE*YOLO5_INPUT_IMAGE_SIZE)
+{
+    // Extract YOLO labels from model metadata
+    try{
+        Ort::ModelMetadata metadata = m_session.GetModelMetadata();
+        Ort::AllocatorWithDefaultOptions allocator;
+
+        // Look for "names" key in custom metadata
+        Ort::AllocatedStringPtr names_value = metadata.LookupCustomMetadataMapAllocated("names", allocator);
+
+        if (names_value){
+            std::string names_str(names_value.get());
+            global_logger_tagged().log("YOLOv5: Found label metadata: " + names_str, COLOR_PURPLE);
+
+            m_label_names = parse_yolo_metadata_names(names_str);
+
+            if (!m_label_names.empty()){
+                global_logger_tagged().log("YOLOv5: Extracted " + std::to_string(m_label_names.size()) +
+                                            " labels from model metadata", COLOR_GREEN);
+            }
+        }else{
+            throw std::runtime_error("YOLOv5 model does not have 'names' metadata to extract labels from");
+        }
+    }catch (const std::exception& e){
+        throw std::runtime_error("YOLOv5: Failed to extract labels from metadata: " + std::string(e.what()));
+    }
+
+    if (m_session.GetOutputCount() != 1){
+        throw std::runtime_error("YOLOv5 model does not have the correct output count, found count " + 
+            std::to_string(m_session.GetOutputCount()));
+    }
+
+    std::vector<int64_t> output_dims = m_session.GetOutputTypeInfo(0).GetTensorTypeAndShapeInfo().GetShape();
+    if (output_dims.size() != 3 || output_dims[2] <= 5){
+        throw std::runtime_error("YOLOv5 model does not have the correct output dimension, found shape " + to_string(output_dims));
+    }
+    m_output_shape[2] = output_dims[2];
+    if (output_dims[2] - 5 != static_cast<int>(m_label_names.size())){
+        throw std::runtime_error(
+            "YOLOv5 model has " + std::to_string(output_dims[2]-5) +
+            " output labels but YOLOv5Session was initialized with " + std::to_string(m_label_names.size()) + " labels"
+        );
+    }
+    m_model_output.resize(YOLO5_NUM_CANDIDATES * m_output_shape[2]);
+}
+
+// input: rgb color order
+void YOLOv5Session::run(const cv::Mat& input_image, std::vector<YOLOv5Session::DetectionBox>& output_boxes){
+    CV_Assert(input_image.depth() == CV_8U);
+    CV_Assert(input_image.channels() == 3);
+
+    cv::Mat image_resized;
+
+    int x_shift = 0, y_shift = 0;
+    double x_scale = 1.0, y_scale = 1.0;
+    std::tie(x_shift, y_shift, x_scale, y_scale) = resize_image_with_border(input_image, image_resized,
+        YOLO5_INPUT_IMAGE_SIZE, YOLO5_INPUT_IMAGE_SIZE, cv::Scalar(114, 114, 114));
+
+    // Declare a destination Mat for float32
+    cv::Mat image_float;
+
+    // Convert the uint8_image to image_float
+    // The third argument (alpha) is a scaling factor.
+    // For normalization to [0.0, 1.0], use 1.0 / 255.0.
+    // For retaining original values (0-255), use 1.0.
+    image_resized.convertTo(image_float, CV_32F, 1.0 / 255.0); 
+
+    for (int c = 0, i = 0; c < 3; c++){
+        for (int row = 0; row < image_float.rows; row++){
+            for (int col = 0; col < image_float.cols; col++){
+                float pixel_value = image_float.at<cv::Vec3f>(row, col)[c];
+                m_model_input[i++] = pixel_value;
+            }
+        }
+    }
+
+    auto input_tensor = create_tensor<float>(m_memory_info, m_model_input, m_input_shape);
+    auto output_tensor = create_tensor<float>(m_memory_info, m_model_output, m_output_shape);
+
+    const char* input_name_c = m_input_names[0].data();
+    const char* output_name_c = m_output_names[0].data();
+    // auto start = std::chrono::steady_clock::now();
+    FlushDenormalsToZeroScope flush_denormals;  //  Denormals are slow on Intel CPUs (see FloatingPointMode.h).
+    m_session.Run(m_run_options, &input_name_c, &input_tensor, 1, &output_name_c, &output_tensor, 1);
+    // auto end = std::chrono::steady_clock::now();
+    // auto milliseconds = std::chrono::duration_cast<std::chrono::milliseconds>(end - start).count();
+    // std::cout << "Yolov5 inference time: " << milliseconds << " ms" << std::endl;
+
+    const size_t cand_size = m_label_names.size() + 5;
+
+    std::vector<cv::Rect> pixel_boxes;
+    std::vector<int> indices;
+    std::vector<float> scores;
+    std::vector<size_t> labels;
+
+    for (int i = 0; i < YOLO5_NUM_CANDIDATES; i++){
+        float cx = m_model_output[cand_size*i];
+        float cy = m_model_output[cand_size*i+1];
+        float w = m_model_output[cand_size*i+2];
+        float h = m_model_output[cand_size*i+3];
+        float sc = m_model_output[cand_size*i+4];
+
+        float max_score = 0.0;
+        size_t pred_label = 0;  // predicted label
+        for (size_t j_label = 0; j_label < m_label_names.size(); j_label++){
+            float score = m_model_output[cand_size*i+5+j_label];
+            if (score > max_score){
+                max_score = score;
+                pred_label = j_label;
+            }
+        }
+        scores.push_back(max_score * sc); // sc is like a global confidence scale?
+        pixel_boxes.emplace_back((int)(cx - w / 2 + 0.5), (int)(cy - h / 2 + 0.5), int(w + 0.5), int(h + 0.5));
+        indices.push_back(i);
+        labels.push_back(pred_label);
+    }
+
+    cv::dnn::NMSBoxes(pixel_boxes, scores, 0.2f, 0.45f, indices);
+
+    // std::cout << "num found pixel_boxes " << indices.size() << std::endl;
+    // return;
+
+    for (int index : indices)
+    {
+        // Note the model predicts on (640x640) images, we need to convert the detected pixel_boxes back to
+        // the full frame dimension.
+        double x = (pixel_boxes[index].x - x_shift) * x_scale;
+        double y = (pixel_boxes[index].y - y_shift) * y_scale;
+        double w = pixel_boxes[index].width * x_scale;
+        double h = pixel_boxes[index].height * y_scale;
+        // std::cout << scores[index] << " " <<  x << " " << y << " " << w << " " << h << std::endl;
+
+        YOLOv5Session::DetectionBox b;
+        b.box = ImageFloatBox(x, y, w, h);
+        b.score = scores[index];
+        b.label_idx = labels[index];
+        output_boxes.push_back(b);
+    }
+}
+
+
+size_t YOLOv5Session::label_index(const std::string& label_name) const{
+    for (size_t i = 0; i < m_label_names.size(); i++){
+        if (label_name == m_label_names[i]){
+            return i;
+        }
+    }
+    return SIZE_MAX;
+}
+
+const YOLOv5Session::DetectionBox* find_detection(const std::vector<YOLOv5Session::DetectionBox>& detection, size_t label_idx){
+    for (const auto& box : detection){
+        if (box.label_idx == label_idx){
+            return &box;
+        }
+    }
+    return nullptr;
+}
+
+
+}
+}
diff --git a/SerialPrograms/Source/ML/Models/ML_YOLOv5Model.h b/SerialPrograms/Source/ML/Models/ML_YOLOv5Model.h
new file mode 100644
index 0000000000..cfa7a065c4
--- /dev/null
+++ b/SerialPrograms/Source/ML/Models/ML_YOLOv5Model.h
@@ -0,0 +1,65 @@
+/*  ML YOLOv5 Model
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  Run YOLOv5 model for object detection
+ */
+
+#ifndef PokemonAutomation_ML_YOLOv5Model_H
+#define PokemonAutomation_ML_YOLOv5Model_H
+
+
+#include <opencv2/core/mat.hpp>
+#include <onnxruntime_cxx_api.h>
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+
+namespace PokemonAutomation{
+namespace ML{
+
+
+class YOLOv5Session{
+public:
+    struct DetectionBox{
+        // Confidence value the model predicts on the detection. Range: [0.0, 1.0].
+        // The higher the value, the more confident the model thinks the prediction is.
+        double score;
+        // Bounding box of the detected object.
+        ImageFloatBox box;
+        // Object label ID.
+        size_t label_idx;
+    };
+
+    YOLOv5Session(const std::string& model_path, bool use_gpu);
+
+    void run(const cv::Mat& input_image, std::vector<DetectionBox>& detections);
+
+    const std::string& label_name(size_t idx) const { return m_label_names[idx]; }
+    const std::vector<std::string>& get_label_names() const { return m_label_names; }
+    // Return SIZE_MAX if no such label name exists.
+    size_t label_index(const std::string& label_name) const;
+    
+private:
+    const int YOLO5_INPUT_IMAGE_SIZE = 640;
+    const int YOLO5_NUM_CANDIDATES = 25200;
+
+    std::vector<std::string> m_label_names;
+
+    Ort::Session m_session;
+    Ort::MemoryInfo m_memory_info;
+    Ort::RunOptions m_run_options;
+    std::vector<std::string> m_input_names, m_output_names;
+
+    const std::array<int64_t, 4> m_input_shape{1, 3, YOLO5_INPUT_IMAGE_SIZE, YOLO5_INPUT_IMAGE_SIZE};
+    std::array<int64_t, 3> m_output_shape{1, YOLO5_NUM_CANDIDATES, 0};
+
+    std::vector<float> m_model_input;
+    std::vector<float> m_model_output;
+};
+
+// Find the first detection matching the given label ID from a YOLOv5Session detection output.
+const YOLOv5Session::DetectionBox* find_detection(const std::vector<YOLOv5Session::DetectionBox>& detection, size_t label_idx);
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/ML/Programs/ML_LabelImages.cpp b/SerialPrograms/Source/ML/Programs/ML_LabelImages.cpp
new file mode 100644
index 0000000000..0e4eb0cc73
--- /dev/null
+++ b/SerialPrograms/Source/ML/Programs/ML_LabelImages.cpp
@@ -0,0 +1,1274 @@
+/*  ML Label Images
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <cmath>
+//#include <iostream>
+#ifdef QT_CORE_LIB
+#include <QDesktopServices>
+#include <QUrl>
+#endif
+#include "Common/Cpp/ColoredText.h"
+#include "Common/Cpp/Logging/GlobalLogger.h"
+#include "Common/Cpp/Filesystem/Filesystem.h"
+#include "Common/Cpp/Filesystem/FileIO.h"
+#include "Common/Cpp/Json/JsonArray.h"
+#include "Common/Cpp/Json/JsonObject.h"
+#include "Common/Cpp/Json/JsonValue.h"
+#include "CommonFramework/GlobalAutoPaths.h"
+#include "CommonFramework/Logging/Logger.h"
+#include "CommonFramework/Options/Environment/PerformanceOptions.h"
+#include "CommonFramework/VideoPipeline/Sources/VideoSource_StillImage.h"
+#include "ML/DataLabeling/ML_AnnotationIO.h"
+#include "ML/DataLabeling/ML_SegmentAnythingModel.h"
+#include "ControllerInput/Keyboard/KeyboardInput_State.h"
+#include "GameConsole/Framework/ConsoleSystemSession.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "ML_LabelImages.h"
+#include "ML_LabelImagesOverlayManager.h"
+
+
+
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace ML{
+
+
+LabelImages_Descriptor::LabelImages_Descriptor()
+    : ConsolePanelDescriptor(
+        "ML:LabelImages",
+        "ML", "Label Images",
+        "Programs/ML/LabelImages.html",
+        "Label " + Pokemon::STRING_POKEMON + " on images",
+        PanelQualityStanding::DEVELOPER,
+        false
+    )
+{}
+
+
+
+#define ADD_OPTION(x)                   add_option(x, #x)
+#define ADD_GROUP_OPTION(group, x)      (group).add_option(x, #x)
+
+IntegerEnumDropdownDatabase create_label_type_database(){
+    IntegerEnumDropdownDatabase database;
+    database.add(0, "pokemon-form", Pokemon::STRING_POKEMON + " Forms");
+    database.add(1, "custom-set", "Custom Set");
+    database.add(2, "manual-input", "Manual Input");
+    return database;
+}
+
+//  The color dropdowns all offer the same choices. This is a shared database
+//  because EnumDropdownCell (unlike EnumDropdownOption) cannot own an inlined
+//  one: it holds a reference, so the database has to outlive the cells.
+const EnumDropdownDatabase<ColorChoice>& color_choice_database(){
+    static const EnumDropdownDatabase<ColorChoice> database{
+        {ColorChoice::BLACK,        "black",        "Black"},
+        {ColorChoice::RED,          "red",          "Red"},
+        {ColorChoice::BLUE,         "blue",         "Blue"},
+        {ColorChoice::YELLOW,       "yellow",       "Yellow"},
+        {ColorChoice::GREEN,        "green",        "Green"},
+        {ColorChoice::ORANGE,       "orange",       "Orange"},
+        {ColorChoice::MAGENTA,      "magenta",      "Magenta"},
+        {ColorChoice::PURPLE,       "purple",       "Purple"},
+        {ColorChoice::CYAN,         "cyan",         "Cyan"},
+    };
+    return database;
+}
+
+
+LabelImages::LabelImages(GameConsole::ConsoleSystemSession& system)
+    : m_system(system)
+    , m_use_gpu_for_sam_anno(PerformanceOptions::instance().ONNX_OPTIONS.USE_GPU)
+    , X("<b>X Coordinate:</b>", LockMode::UNLOCK_WHILE_RUNNING, 0.3, 0.0, 1.0)
+    , Y("<b>Y Coordinate:</b>", LockMode::UNLOCK_WHILE_RUNNING, 0.3, 0.0, 1.0)
+    , WIDTH("<b>Width:</b>", LockMode::UNLOCK_WHILE_RUNNING, 0.4, 0.0, 1.0)
+    , HEIGHT("<b>Height:</b>", LockMode::UNLOCK_WHILE_RUNNING, 0.4, 0.0, 1.0)
+    , IMAGE_INFO("")
+    , EMBEDDING_INFO("")
+    , IMAGE_BUTTONS(LockMode::UNLOCK_WHILE_RUNNING, true)
+    , PREV_IMAGE("Prev Image in Folder (z/Z)")
+    , NEXT_IMAGE("Next Image in Folder (x/X)")
+    , LABEL_GROUP("Label of the Selected Annotation", LockMode::UNLOCK_WHILE_RUNNING)
+    , LABEL_TYPE_DATABASE(create_label_type_database())
+    , LABEL_TYPE("<b>Select Label:</b>", LABEL_TYPE_DATABASE, LockMode::UNLOCK_WHILE_RUNNING, 0)
+    , FORM_LABEL("bulbasaur")
+    , CUSTOM_LABEL_DATABASE(create_string_select_database({"mc"})) // mc for "main character"
+    , CUSTOM_SET_LABEL(CUSTOM_LABEL_DATABASE, LockMode::UNLOCK_WHILE_RUNNING, 0)
+    , MANUAL_LABEL(false, LockMode::UNLOCK_WHILE_RUNNING, "", "Custom Label", true)
+    , CUSTOM_LABEL_SET(
+        "<b>Custom Label Set:</b>",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        "",
+        "*.json",
+        "JSON file holding the list of custom labels."
+    )
+    , ANNOTATION_GROUP("Annotations", LockMode::UNLOCK_WHILE_RUNNING)
+    , ANNOTATION_BUTTONS(LockMode::UNLOCK_WHILE_RUNNING, true)
+    , DELETE_ANNOTATION("Delete Selected Annotation (Delete)")
+    , PREV_ANNOTATION("Prev Annotation")
+    , NEXT_ANNOTATION("Next Annotation")
+    , TOGGLE_ANNOTATIONS("Hide Annotations")
+    , SAVE_ANNOTATIONS("Save Annotations")
+    , OPEN_ANNOTATION_FOLDER("Open Saved Annotation Folder")
+    , RENDERING_ROW(LockMode::UNLOCK_WHILE_RUNNING, true)
+    , RENDERING_LABEL("<b>Annotation Colors:</b>", false)
+    , SELECTED_ANNO_LABEL("Selected:", false)
+    , SELECTED_ANNO_COLOR(color_choice_database(), LockMode::LOCK_WHILE_RUNNING, ColorChoice::BLACK)
+    , UNSELECTED_ANNO_LABEL("Unselected:", false)
+    , UNSELECTED_ANNO_COLOR(color_choice_database(), LockMode::LOCK_WHILE_RUNNING, ColorChoice::BLUE)
+    , CURRENT_DRAWN_BOX_LABEL("Drawn Box:", false)
+    , CURRENT_DRAWN_BOX(color_choice_database(), LockMode::LOCK_WHILE_RUNNING, ColorChoice::RED)
+    , DATASET_ROW(LockMode::UNLOCK_WHILE_RUNNING, true)
+    , YOLO_CONFIG_LABEL("<b>Dataset Tools:</b> YOLOv5 Config:", false)
+    , YOLO_CONFIG(
+        LockMode::UNLOCK_WHILE_RUNNING,
+        "",
+        "*.yaml",
+        "YAML config file of the YOLOv5 dataset to export to."
+    )
+    , EXPORT_TO_YOLO("Export to YOLOv5")
+    , COMPUTE_EMBEDDINGS("Compute Embeddings (SLOW!)")
+    , m_cur_mouse_x(0.0)
+    , m_cur_mouse_y(0.0)
+    , m_shift_pressed(false)
+    , m_control_pressed(false)
+{
+    ADD_OPTION(IMAGE_INFO);
+    ADD_OPTION(EMBEDDING_INFO);
+    IMAGE_BUTTONS.PA_ADD_STATIC(PREV_IMAGE);
+    IMAGE_BUTTONS.PA_ADD_STATIC(NEXT_IMAGE);
+    PA_ADD_STATIC(IMAGE_BUTTONS);
+
+    ADD_GROUP_OPTION(LABEL_GROUP, LABEL_TYPE);
+    ADD_GROUP_OPTION(LABEL_GROUP, FORM_LABEL);
+    ADD_GROUP_OPTION(LABEL_GROUP, CUSTOM_SET_LABEL);
+    ADD_GROUP_OPTION(LABEL_GROUP, MANUAL_LABEL);
+    ADD_GROUP_OPTION(LABEL_GROUP, CUSTOM_LABEL_SET);
+    add_option(LABEL_GROUP, "LABEL");
+
+    ANNOTATION_BUTTONS.PA_ADD_STATIC(DELETE_ANNOTATION);
+    ANNOTATION_BUTTONS.PA_ADD_STATIC(PREV_ANNOTATION);
+    ANNOTATION_BUTTONS.PA_ADD_STATIC(NEXT_ANNOTATION);
+    ANNOTATION_BUTTONS.PA_ADD_STATIC(TOGGLE_ANNOTATIONS);
+    ANNOTATION_BUTTONS.PA_ADD_STATIC(SAVE_ANNOTATIONS);
+    ANNOTATION_BUTTONS.PA_ADD_STATIC(OPEN_ANNOTATION_FOLDER);
+    ANNOTATION_GROUP.PA_ADD_STATIC(ANNOTATION_BUTTONS);
+    add_option(ANNOTATION_GROUP, "ANNOTATIONS");
+
+    RENDERING_ROW.PA_ADD_STATIC(RENDERING_LABEL);
+    RENDERING_ROW.PA_ADD_STATIC(SELECTED_ANNO_LABEL);
+    RENDERING_ROW.PA_ADD_OPTION(SELECTED_ANNO_COLOR);
+    RENDERING_ROW.PA_ADD_STATIC(UNSELECTED_ANNO_LABEL);
+    RENDERING_ROW.PA_ADD_OPTION(UNSELECTED_ANNO_COLOR);
+    RENDERING_ROW.PA_ADD_STATIC(CURRENT_DRAWN_BOX_LABEL);
+    RENDERING_ROW.PA_ADD_OPTION(CURRENT_DRAWN_BOX);
+    add_option(RENDERING_ROW, "RENDERING");
+
+    DATASET_ROW.PA_ADD_STATIC(YOLO_CONFIG_LABEL);
+    DATASET_ROW.PA_ADD_OPTION(YOLO_CONFIG);
+    DATASET_ROW.PA_ADD_STATIC(EXPORT_TO_YOLO);
+    DATASET_ROW.PA_ADD_STATIC(COMPUTE_EMBEDDINGS);
+    add_option(DATASET_ROW, "DATASET");
+
+    X.add_listener(*this);
+    Y.add_listener(*this);
+    WIDTH.add_listener(*this);
+    HEIGHT.add_listener(*this);
+    LABEL_TYPE.add_listener(*this);
+    FORM_LABEL.add_listener(*this);
+    CUSTOM_SET_LABEL.add_listener(*this);
+    MANUAL_LABEL.add_listener(*this);
+    CUSTOM_LABEL_SET.add_listener(*this);
+
+    PREV_IMAGE.add_listener(static_cast<ButtonListener&>(*this));
+    NEXT_IMAGE.add_listener(static_cast<ButtonListener&>(*this));
+    DELETE_ANNOTATION.add_listener(static_cast<ButtonListener&>(*this));
+    PREV_ANNOTATION.add_listener(static_cast<ButtonListener&>(*this));
+    NEXT_ANNOTATION.add_listener(static_cast<ButtonListener&>(*this));
+    TOGGLE_ANNOTATIONS.add_listener(static_cast<ButtonListener&>(*this));
+    SAVE_ANNOTATIONS.add_listener(static_cast<ButtonListener&>(*this));
+    OPEN_ANNOTATION_FOLDER.add_listener(static_cast<ButtonListener&>(*this));
+    EXPORT_TO_YOLO.add_listener(static_cast<ButtonListener&>(*this));
+    COMPUTE_EMBEDDINGS.add_listener(static_cast<ButtonListener&>(*this));
+
+    init_sam_session(PerformanceOptions::instance().ONNX_OPTIONS.USE_GPU);
+
+    m_overlay_manager.reset(new LabelImages_OverlayManager(*this, m_system.overlay()));
+
+    //  The console's video display sends us the mouse and the focus changes.
+    m_system.overlay().add_hid_listener(*this);
+    //  The console's video session tells us when a different image is loaded.
+    m_system.video().add_state_listener(*this);
+
+    //  Apply the initial visibility of the three label sources.
+    on_config_value_changed(&LABEL_TYPE);
+
+    //  The video source may already be up and running (e.g. the image path was
+    //  restored from the settings file), in which case we will not get a
+    //  post_startup() for it.
+    load_current_image_source();
+}
+LabelImages::~LabelImages(){
+    m_system.video().remove_state_listener(*this);
+    m_system.overlay().remove_hid_listener(*this);
+    global_input_remove_listener(*this);
+
+    COMPUTE_EMBEDDINGS.remove_listener(static_cast<ButtonListener&>(*this));
+    EXPORT_TO_YOLO.remove_listener(static_cast<ButtonListener&>(*this));
+    OPEN_ANNOTATION_FOLDER.remove_listener(static_cast<ButtonListener&>(*this));
+    SAVE_ANNOTATIONS.remove_listener(static_cast<ButtonListener&>(*this));
+    TOGGLE_ANNOTATIONS.remove_listener(static_cast<ButtonListener&>(*this));
+    NEXT_ANNOTATION.remove_listener(static_cast<ButtonListener&>(*this));
+    PREV_ANNOTATION.remove_listener(static_cast<ButtonListener&>(*this));
+    DELETE_ANNOTATION.remove_listener(static_cast<ButtonListener&>(*this));
+    NEXT_IMAGE.remove_listener(static_cast<ButtonListener&>(*this));
+    PREV_IMAGE.remove_listener(static_cast<ButtonListener&>(*this));
+
+    CUSTOM_LABEL_SET.remove_listener(*this);
+    MANUAL_LABEL.remove_listener(*this);
+    CUSTOM_SET_LABEL.remove_listener(*this);
+    FORM_LABEL.remove_listener(*this);
+    LABEL_TYPE.remove_listener(*this);
+    HEIGHT.remove_listener(*this);
+    WIDTH.remove_listener(*this);
+    Y.remove_listener(*this);
+    X.remove_listener(*this);
+}
+
+JsonValue LabelImages::to_json() const{
+    std::lock_guard<RecursiveMutex> lg(m_lock);
+    save_annotation_to_file();
+    return ConsolePanelInstance::to_json();
+}
+
+void LabelImages::init_sam_session(bool use_gpu){
+    const std::string sam_model_path = RESOURCE_PATH() + "ML/sam_cpu.onnx";
+    if (Filesystem::exists(sam_model_path)){
+        m_sam_session = std::make_unique<SAMSession>(sam_model_path, use_gpu);
+    }else{
+        m_system.logger().log(
+            "SAM model path " + sam_model_path + " does not exist. Cannot annotate images.",
+            COLOR_RED
+        );
+    }
+}
+
+void LabelImages::save_annotation_to_file() const{
+    std::lock_guard<RecursiveMutex> lg(m_lock);
+    if (m_annotation_file_path.size() == 0 || m_fail_to_load_annotation_file){
+        return;
+    }
+    JsonObject json;
+    json["IMAGE_WIDTH"] = source_image_width;
+    json["IMAGE_HEIGHT"] = source_image_height;
+
+    JsonArray anno_json_arr;
+    for (const auto& anno_obj: m_annotations){
+        anno_json_arr.push_back(anno_obj.to_json());
+    }
+    json["ANNOTATION"] = std::move(anno_json_arr);
+
+    m_system.logger().log("Saving annotation to " + m_annotation_file_path);
+    json.dump(m_annotation_file_path);
+}
+
+//  Opening a folder in the system's file browser is the one thing this program
+//  cannot do without Qt, so it follows the same pattern as
+//  `GlobalSettings::on_press()`: the call is guarded and the button does nothing
+//  in a build without Qt.
+void LabelImages::open_annotation_folder(){
+    std::string folder_path;
+    {
+        std::lock_guard<RecursiveMutex> lg(m_lock);
+        save_annotation_to_file();
+        folder_path = m_image_folder_path;
+    }
+    if (folder_path.empty()){
+        m_system.logger().log("Cannot open the annotation folder: no image is loaded.", COLOR_RED);
+        return;
+    }
+#ifdef QT_CORE_LIB
+    QDesktopServices::openUrl(QUrl::fromLocalFile(QString::fromStdString(folder_path)));
+#endif
+}
+
+void LabelImages::clear_for_new_image(){
+    std::lock_guard<RecursiveMutex> lg(m_lock);
+    m_overlay_manager->clear();
+    source_image_width = source_image_height = 0;
+    m_image_embedding.clear();
+    m_output_boolean_mask.clear();
+    m_annotations.clear();
+    m_selected_obj_idx = 0;
+    m_annotation_file_path = "";
+    m_fail_to_load_annotation_file = false;
+}
+
+
+// assuming clear_for_new_image() is already called
+void LabelImages::load_image_related_data(const std::string& image_path, size_t source_image_width, size_t source_image_height){
+    std::lock_guard<RecursiveMutex> lg(m_lock);
+
+    m_system.logger().log(
+        "Image source: " + image_path + ", " +
+        std::to_string(source_image_width) + " x " + std::to_string(source_image_height)
+    );
+
+    this->source_image_height = source_image_height;
+    this->source_image_width = source_image_width;
+
+    m_overlay_manager->set_image_size();
+
+    // if no such embedding file, m_image_embedding will be empty
+    const bool embedding_loaded = load_image_embedding(image_path, m_image_embedding);
+    if (!embedding_loaded){
+        return; // no embedding, then no way for us to annotate
+    }
+
+    // see if we can load the previously created labels
+    const std::string anno_filename = Filesystem::Path(image_path).filename().replace_extension(".json").string();
+    const std::string image_folder_path = Filesystem::Path(image_path).parent_path().string() + "/";
+
+    m_annotation_file_path = image_folder_path + anno_filename;
+    if (!Filesystem::exists(m_annotation_file_path)){
+        m_system.logger().log("Annotataion output path, " + m_annotation_file_path + " does not exist yet");
+        return;
+    }
+    std::string json_content;
+    const bool anno_loaded = file_to_string(m_annotation_file_path, json_content);
+    if (!anno_loaded){
+        m_fail_to_load_annotation_file = true;
+        m_system.logger().log(
+            "Cannot open annotation file " + m_annotation_file_path + ". Probably wrong permission?",
+            COLOR_RED
+        );
+        return;
+    }
+
+    const JsonValue loaded_json = parse_json(json_content);
+    const JsonObject* json_obj = loaded_json.to_object();
+    const JsonArray* json_array = nullptr;
+    if (json_obj == nullptr){
+        // legacy format, load as an array
+        json_array = loaded_json.to_array();
+    }else{
+        json_array = json_obj->get_array("ANNOTATION");
+    }
+    if (json_array == nullptr){
+        m_fail_to_load_annotation_file = true;
+        m_system.logger().log(
+            "Cannot load annotation file " + m_annotation_file_path + ". Loaded json is not an array",
+            COLOR_RED
+        );
+        return;
+    }
+
+    for (size_t i = 0; i < json_array->size(); i++){
+        try{
+            ObjectAnnotation anno_obj = ObjectAnnotation::load_json((*json_array)[i]);
+            m_annotations.emplace_back(std::move(anno_obj));
+        }catch (JsonParseException&){
+            m_fail_to_load_annotation_file = true;
+            m_system.logger().log(
+                "Cannot load annotation file " + m_annotation_file_path +
+                ". Parsing object " + std::to_string(i) + " failed.",
+                COLOR_RED
+            );
+        }
+    }
+    m_selected_obj_idx = m_annotations.size();
+    update_rendered_objects();
+    m_system.logger().log("Loaded existing annotation file " + m_annotation_file_path);
+}
+
+void LabelImages::update_rendered_objects(){
+    std::lock_guard<RecursiveMutex> lg(m_lock);
+    m_overlay_manager->update_rendered_annotations();
+}
+
+void LabelImages::add_new_annotation_from_user_box(){
+    std::lock_guard<RecursiveMutex> lg(m_lock);
+
+    ImageFloatBox user_float_box(X, Y, WIDTH, HEIGHT);
+    ImagePixelBox user_box = floatbox_to_pixelbox(source_image_width, source_image_height, user_float_box);
+
+    ImagePixelBox mask_box;
+    std::vector<bool> mask;
+    const bool mask_computed = run_sam_to_create_annotation(user_box, {}, {}, mask_box, mask);
+
+    if (mask_computed){
+        ObjectAnnotation annotation;
+        annotation.user_box = user_box;
+        annotation.mask_box = mask_box;
+        annotation.mask = std::move(mask);
+        annotation.label = this->selected_label();;
+        m_selected_obj_idx = m_annotations.size();
+        m_annotations.emplace_back(std::move(annotation));
+        update_rendered_objects();
+    }
+}
+
+void LabelImages::update_mask_for_selected_annotation(){
+    std::lock_guard<RecursiveMutex> lg(m_lock);
+    if (m_selected_obj_idx >= m_annotations.size()){
+        return;
+    }
+
+    auto& anno = m_annotations[m_selected_obj_idx];
+    run_sam_to_create_annotation(anno.user_box, anno.inclusion_points, anno.exclusion_points, anno.mask_box, anno.mask);
+}
+
+bool LabelImages::run_sam_to_create_annotation(
+    const ImagePixelBox& user_box,
+    const std::vector<std::pair<size_t, size_t>>& inclusion_points,
+    const std::vector<std::pair<size_t, size_t>>& exclusion_points,
+    ImagePixelBox& mask_box,
+    std::vector<bool>& mask
+){
+    const size_t source_width = source_image_width;
+    const size_t source_height = source_image_height;
+    if (!m_sam_session || m_image_embedding.size() == 0){
+        // no embedding file loaded
+        return false;
+    }
+    if (user_box.width() == 0 || user_box.height() == 0){
+        return false;
+    }
+
+    // input_points: input point coordinates (x, y) in pixel units. [p0_x, p0_y, p1_x, p1_y, p2_x, ...].
+    //     Vector size: 2*num_points
+    // input_point_labels: if a point is part of the object to segment, its corresponding label value is 1.
+    //     if a point is outside of the object, value is 0. Vector size: num_points.
+
+    // input_box: if not empty, the two corner points (in pixel units) of a bounding box for the object to segment.
+    //     [p0_x, p0_y, p1_x, p1_y], where p0 is the top-left corner and p1 is the lower right corner.
+    const size_t num_points = inclusion_points.size() + exclusion_points.size();
+    std::vector<int> input_points(2*num_points), input_point_labels(num_points);
+    for (size_t i = 0; i < inclusion_points.size(); i++){
+        input_points[2*i] = static_cast<int>(inclusion_points[i].first);
+        input_points[2*i+1] = static_cast<int>(inclusion_points[i].second);
+        input_point_labels[i] = 1;
+    }
+    for (size_t i = 0; i < exclusion_points.size(); i++){
+        input_points[2*inclusion_points.size() + 2*i] = static_cast<int>(exclusion_points[i].first);
+        input_points[2*inclusion_points.size() + 2*i+1] = static_cast<int>(exclusion_points[i].second);
+        input_point_labels[inclusion_points.size() + i] = 0;
+    }
+
+    // fall back to CPU if fails with GPU.
+    for (size_t i = 0; i < 2; i++){
+        try{
+            // if (m_use_gpu_for_sam_anno){ throw Ort::Exception("Testing.", ORT_FAIL); }  // to simulate GPU/CPU failure
+            m_sam_session->run(
+                m_image_embedding,
+                (int)source_height, (int)source_width, input_points, input_point_labels,
+                {static_cast<int>(user_box.min_x), static_cast<int>(user_box.min_y), static_cast<int>(user_box.max_x)-1, static_cast<int>(user_box.max_y)-1},
+                m_output_boolean_mask
+            );
+            break;
+        }catch (Ort::Exception& e){
+            if (m_use_gpu_for_sam_anno){
+                m_system.logger().log(
+                    std::string("Warning: SAM session failed using the GPU. Will reattempt with the CPU.\n") + e.what(),
+                    COLOR_ORANGE
+                );
+                m_use_gpu_for_sam_anno = false;
+                init_sam_session(m_use_gpu_for_sam_anno);
+            }else{
+                m_system.logger().log(
+                    std::string("Error: SAM session failed even when using the CPU.\n") + e.what(),
+                    COLOR_RED
+                );
+                return false;
+            }
+        }catch (...){
+            m_system.logger().log("Error: Unknown error. SAM session failed.", COLOR_RED);
+            return false;
+
+        }
+
+        if (i > 0){
+            m_system.logger().log(
+                "Internal Program Error: This section of code shouldn't be reachable.",
+                COLOR_RED
+            );
+            return false;
+        }
+
+    }
+    size_t min_mask_x = INT_MAX, max_mask_x = 0;
+    size_t min_mask_y = INT_MAX, max_mask_y = 0;
+    for (size_t y = 0; y < source_height; y++){
+        for (size_t x = 0; x < source_width; x++){
+            if (m_output_boolean_mask[y*source_width + x]){
+                min_mask_x = std::min(x, min_mask_x);
+                max_mask_x = std::max(x, max_mask_x);
+                min_mask_y = std::min(y, min_mask_y);
+                max_mask_y = std::max(y, max_mask_y);
+            }
+        }
+    }
+    if (min_mask_x >= INT_MAX || max_mask_x < min_mask_x || min_mask_y >= INT_MAX || max_mask_y <= min_mask_y){
+        return false;
+    }
+
+    const size_t mask_width = max_mask_x - min_mask_x + 1;
+    const size_t mask_height = max_mask_y - min_mask_y + 1;
+
+    mask_box = ImagePixelBox(min_mask_x, min_mask_y, max_mask_x+1, max_mask_y+1);
+    mask.resize(mask_width * mask_height);
+    for (size_t row = 0; row < mask_height; row++){
+        auto it = m_output_boolean_mask.begin() + (min_mask_y + row) * source_width + min_mask_x;
+        auto it2 = mask.begin() + row * mask_width;
+        std::copy(it, it + mask_width, it2);
+    }
+    return true;
+}
+
+void LabelImages::add_segmentation_inclusion_point(double x, double y){
+    std::lock_guard<RecursiveMutex> lg(m_lock);
+    if (source_image_width == 0 || source_image_height == 0 || m_annotations.size() == 0
+        || m_selected_obj_idx >= m_annotations.size()){
+        return;
+    }
+    auto& cur_anno = m_annotations[m_selected_obj_idx];
+    if (cur_anno.mask.size() == 0){
+        return;
+    }
+    cur_anno.inclusion_points.push_back(float_to_pixel(x, y));
+    update_mask_for_selected_annotation();
+    update_rendered_objects();
+}
+
+void LabelImages::add_segmentation_exclusion_point(double x, double y){
+    std::lock_guard<RecursiveMutex> lg(m_lock);
+    if (source_image_width == 0 || source_image_height == 0 || m_annotations.size() == 0
+        || m_selected_obj_idx >= m_annotations.size()){
+        return;
+    }
+    auto& cur_anno = m_annotations[m_selected_obj_idx];
+    if (cur_anno.mask.size() == 0){
+        return;
+    }
+    cur_anno.exclusion_points.push_back(float_to_pixel(x, y));
+    update_mask_for_selected_annotation();
+    update_rendered_objects();
+}
+
+void LabelImages::remove_closest_point(std::vector<std::pair<size_t, size_t>>& points, double x, double y){
+    if (points.size() == 0){
+        return;
+    }
+
+    std::pair<size_t, size_t> tp = float_to_pixel(x, y);
+
+    size_t min_dist = SIZE_MAX;
+    size_t target_point = 0;
+    for (size_t i = 0; i < points.size(); i++){
+        const auto& ip = points[i];
+        size_t d_x = ip.first > tp.first ? ip.first - tp.first : tp.first - ip.first;
+        size_t d_y = ip.second > tp.second ? ip.second - tp.second : tp.second - ip.second;
+        size_t d2 = d_x * d_x + d_y * d_y;
+        if (d2 < min_dist){
+            min_dist = d2;
+            target_point = i;
+        }
+    }
+    points.erase(points.begin() + target_point);
+
+}
+
+void LabelImages::remove_segmentation_inclusion_point(double x, double y){
+    std::lock_guard<RecursiveMutex> lg(m_lock);
+    if (source_image_width == 0 || source_image_height == 0 || m_annotations.size() == 0
+        || m_selected_obj_idx >= m_annotations.size()){
+        return;
+    }
+    auto& points = m_annotations[m_selected_obj_idx].inclusion_points;
+    remove_closest_point(points, x, y);
+    update_mask_for_selected_annotation();
+    update_rendered_objects();
+}
+
+void LabelImages::remove_segmentation_exclusion_point(double x, double y){
+    std::lock_guard<RecursiveMutex> lg(m_lock);
+    if (source_image_width == 0 || source_image_height == 0 || m_annotations.size() == 0
+        || m_selected_obj_idx >= m_annotations.size()){
+        return;
+    }
+    auto& points = m_annotations[m_selected_obj_idx].exclusion_points;
+    remove_closest_point(points, x, y);
+    update_mask_for_selected_annotation();
+    update_rendered_objects();
+}
+
+void LabelImages::compute_embeddings_for_folder(const std::string& image_folder_path){
+    std::string embedding_model_path = RESOURCE_PATH() + "ML/sam_embedder_cpu.onnx";
+    m_system.logger().log("Use SAM Embedding model " + embedding_model_path);
+    ML::compute_embeddings_for_folder(
+        m_system.logger(),
+        embedding_model_path,
+        image_folder_path,
+        PerformanceOptions::instance().ONNX_OPTIONS.USE_GPU
+    );
+}
+
+void LabelImages::delete_selected_annotation(){
+    std::lock_guard<RecursiveMutex> lg(m_lock);
+    if (m_annotations.size() == 0 || m_selected_obj_idx >= m_annotations.size()){
+        return;
+    }
+
+    m_annotations.erase(m_annotations.begin() + m_selected_obj_idx);
+
+    if (m_annotations.size() == 0){ // no more annotations
+        m_selected_obj_idx = 0;
+        update_rendered_objects();
+        return;
+    }
+
+    m_selected_obj_idx = m_annotations.size();  // don't select anything after deleting an object, but keep the old selected label
+    std::string old_label = selected_label();
+    set_selected_label(old_label);
+    update_rendered_objects();
+}
+
+void LabelImages::change_annotation_selection_by_mouse(double x, double y){
+    std::lock_guard<RecursiveMutex> lg(m_lock);
+
+    // no image or no annotation
+    if (source_image_width == 0 || source_image_height == 0 || m_annotations.size() == 0){
+        return;
+    }
+    const size_t screen_normalize_factor = (source_image_height/1080);
+
+    std::pair<size_t, size_t> p = float_to_pixel(x, y);
+
+    const size_t old_selected_idx = m_selected_obj_idx;
+
+    m_selected_obj_idx = m_annotations.size();  // de-select annotations by default, when clicking the screen
+
+    size_t closest_distance = SIZE_MAX;
+    std::vector<size_t> zero_distance_annotations;
+    for (size_t i = 0; i < m_annotations.size(); i++){
+        const size_t dx = m_annotations[i].mask_box.distance_to_point_x(p.first);
+        const size_t dy = m_annotations[i].mask_box.distance_to_point_y(p.second);
+        const size_t d2 = dx*dx + dy*dy;
+        if (d2 == 0){
+            zero_distance_annotations.push_back(i);
+        }
+        if (d2 < closest_distance){
+            closest_distance = d2;
+            if (d2 < (500 * screen_normalize_factor * screen_normalize_factor)){
+                m_selected_obj_idx = i; // only select the object if the mouse click is very close to the object box, or within it.
+            }
+
+        }
+    }
+
+    if (zero_distance_annotations.size() > 1){
+        // this point is inside multiple boxes, we then use the closest to the box center to determine
+        closest_distance = SIZE_MAX;
+        for (size_t i : zero_distance_annotations){
+            const size_t dx = m_annotations[i].mask_box.center_distance_to_point_x(p.first);
+            const size_t dy = m_annotations[i].mask_box.center_distance_to_point_y(p.second);
+            const size_t d2 = dx*dx + dy*dy;
+            if (d2 < closest_distance){
+                closest_distance = d2;
+                m_selected_obj_idx = i;
+            }
+        }
+    }
+
+    if (m_selected_obj_idx == m_annotations.size()){ // no annotation selected
+        std::string old_label = selected_label();
+        set_selected_label(old_label);
+        update_rendered_objects();
+    }else if (old_selected_idx != m_selected_obj_idx){ // different object selected
+        std::string new_label = m_annotations[m_selected_obj_idx].label;
+        set_selected_label(new_label);
+        update_rendered_objects();
+    }
+}
+
+void LabelImages::select_prev_annotation(){
+    std::lock_guard<RecursiveMutex> lg(m_lock);
+
+    // no image or no annotation
+    if (source_image_width == 0 || source_image_height == 0 || m_annotations.size() == 0){
+        return;
+    }
+
+    if (m_selected_obj_idx >= m_annotations.size()){
+        m_selected_obj_idx = m_annotations.size() - 1;
+    }else if (m_selected_obj_idx == 0){
+        m_selected_obj_idx = m_annotations.size() - 1;
+    }else{
+        m_selected_obj_idx--;
+    }
+
+    std::string new_label = m_annotations[m_selected_obj_idx].label;
+    set_selected_label(new_label);
+    update_rendered_objects();
+}
+void LabelImages::select_next_annotation(){
+    std::lock_guard<RecursiveMutex> lg(m_lock);
+
+    // no image or no annotation
+    if (source_image_width == 0 || source_image_height == 0 || m_annotations.size() == 0){
+        return;
+    }
+
+    if (m_selected_obj_idx >= m_annotations.size()){
+        m_selected_obj_idx = 0;
+    }else if (m_selected_obj_idx + 1 == m_annotations.size()){
+        m_selected_obj_idx = 0;
+    }else{
+        m_selected_obj_idx++;
+    }
+
+    std::string new_label = m_annotations[m_selected_obj_idx].label;
+    set_selected_label(new_label);
+    update_rendered_objects();
+}
+
+void LabelImages::on_config_value_changed(void* object){
+    std::lock_guard<RecursiveMutex> lg(m_lock);
+
+    if (object == &CUSTOM_LABEL_SET){
+        const std::string path = CUSTOM_LABEL_SET;
+        if (!path.empty() && path != m_loaded_custom_label_set_path){
+            load_custom_label_set(path);
+        }
+        return;
+    }
+
+    if (object == &LABEL_TYPE){
+        const size_t value = LABEL_TYPE.current_value();
+        // label type changed
+        if (value == 0){
+            FORM_LABEL.set_visibility(ConfigOptionState::ENABLED);
+            CUSTOM_SET_LABEL.set_visibility(ConfigOptionState::HIDDEN);
+            MANUAL_LABEL.set_visibility(ConfigOptionState::HIDDEN);
+        }else if (value == 1){
+            FORM_LABEL.set_visibility(ConfigOptionState::HIDDEN);
+            CUSTOM_SET_LABEL.set_visibility(ConfigOptionState::ENABLED);
+            MANUAL_LABEL.set_visibility(ConfigOptionState::HIDDEN);
+        }else{ // value == 2
+            FORM_LABEL.set_visibility(ConfigOptionState::HIDDEN);
+            CUSTOM_SET_LABEL.set_visibility(ConfigOptionState::HIDDEN);
+            MANUAL_LABEL.set_visibility(ConfigOptionState::ENABLED);
+        }
+    }
+
+    if (object == &LABEL_TYPE || object == &FORM_LABEL || object == &CUSTOM_SET_LABEL || object == &MANUAL_LABEL){
+        // label changed by user: modify internal annotation data
+        if (m_annotations.size() > 0 && m_selected_obj_idx < m_annotations.size()){
+            std::string& cur_label = m_annotations[m_selected_obj_idx].label;
+            const std::string ui_slug = this->selected_label();
+            if (ui_slug != cur_label){
+                cur_label = ui_slug;
+            }
+        }
+        update_rendered_objects();
+    }
+}
+
+//  All the buttons of this panel land here. `button` is the ButtonCell base of
+//  the ButtonOption that was pressed, so the address comparisons below identify
+//  which one it was.
+void LabelImages::on_press(ButtonCell& button){
+    if (&button == &PREV_IMAGE){
+        go_to_image_by_index_offset(-1);
+        return;
+    }
+    if (&button == &NEXT_IMAGE){
+        go_to_image_by_index_offset(1);
+        return;
+    }
+    if (&button == &DELETE_ANNOTATION){
+        delete_selected_annotation();
+        return;
+    }
+    if (&button == &PREV_ANNOTATION){
+        select_prev_annotation();
+        return;
+    }
+    if (&button == &NEXT_ANNOTATION){
+        select_next_annotation();
+        return;
+    }
+    if (&button == &TOGGLE_ANNOTATIONS){
+        std::lock_guard<RecursiveMutex> lg(m_lock);
+        m_annotations_hidden = !m_annotations_hidden;
+        TOGGLE_ANNOTATIONS.set_text(m_annotations_hidden ? "Show Annotations" : "Hide Annotations");
+        update_rendered_objects();
+        return;
+    }
+    if (&button == &SAVE_ANNOTATIONS){
+        save_annotation_to_file();
+        return;
+    }
+    if (&button == &OPEN_ANNOTATION_FOLDER){
+        open_annotation_folder();
+        return;
+    }
+    if (&button == &EXPORT_TO_YOLO){
+        std::lock_guard<RecursiveMutex> lg(m_lock);
+        const std::string dataset_path = YOLO_CONFIG;
+        if (m_image_folder_path.empty()){
+            m_system.logger().log("Cannot export: no image is loaded.", COLOR_RED);
+            return;
+        }
+        if (dataset_path.empty()){
+            m_system.logger().log("Cannot export: no YOLOv5 dataset config file is set.", COLOR_RED);
+            return;
+        }
+        save_annotation_to_file();
+        export_to_yolov5_dataset(m_image_folder_path, dataset_path);
+        return;
+    }
+    if (&button == &COMPUTE_EMBEDDINGS){
+        std::string image_folder_path;
+        {
+            std::lock_guard<RecursiveMutex> lg(m_lock);
+            image_folder_path = m_image_folder_path;
+        }
+        if (image_folder_path.empty()){
+            m_system.logger().log("Cannot compute embeddings: no image is loaded.", COLOR_RED);
+            return;
+        }
+        compute_embeddings_for_folder(image_folder_path);
+        return;
+    }
+}
+
+std::string LabelImages::selected_label() const{
+    const size_t label_type = LABEL_TYPE.current_value();
+    if (label_type == 0){
+        return FORM_LABEL.slug();
+    }
+    if (label_type == 1){
+        return CUSTOM_SET_LABEL.slug();
+    }
+    return MANUAL_LABEL;
+}
+
+void LabelImages::set_selected_label(const std::string& slug){
+    size_t index = FORM_LABEL.database().search_index_by_slug(slug);
+    if (index != SIZE_MAX){
+        LABEL_TYPE.set_value(0);
+        FORM_LABEL.set_by_index(index);
+        return;
+    }
+    index = CUSTOM_SET_LABEL.database().search_index_by_slug(slug);
+    if (index != SIZE_MAX){
+        LABEL_TYPE.set_value(1);
+        CUSTOM_SET_LABEL.set_by_index(index);
+        return;
+    }
+    LABEL_TYPE.set_value(2);
+    MANUAL_LABEL.set(slug);
+}
+
+void LabelImages::load_custom_label_set(const std::string& json_path){
+    std::lock_guard<RecursiveMutex> lg(m_lock);
+
+    StringSelectDatabase new_database;
+    try{
+        JsonValue value = load_json_file(json_path);
+        const JsonArray& json_array = value.to_array_throw();
+        for (size_t i = 0; i < json_array.size(); i++){
+            const std::string& label_slug = json_array[i].to_string_throw();
+            new_database.add_entry(StringSelectEntry(label_slug, label_slug));
+        }
+    }catch (FileException& e){
+        m_system.logger().log(
+            "Cannot open JSON file " + json_path + " for the custom label set. Probably wrong permission? " + e.message(),
+            COLOR_RED
+        );
+        return;
+    }catch (JsonParseException& e){
+        m_system.logger().log(
+            "Cannot parse JSON file " + json_path + " for the custom label set. Probably wrong file content? " + e.message(),
+            COLOR_RED
+        );
+        return;
+    }
+
+    m_system.logger().log(
+        "Loaded " + std::to_string(new_database.size()) + " custom labels from " + json_path
+    );
+    CUSTOM_LABEL_DATABASE = new_database;
+    m_loaded_custom_label_set_path = json_path;
+
+    // if the current label is set by MANUAL_LABEL but its value appears in the newly loaded custom set,
+    // the label UI should switch the label to be shown as part of the custom set.
+    // so call the following line to achieve that
+    set_selected_label(selected_label());
+}
+
+
+std::pair<size_t, size_t> LabelImages::float_to_pixel(double x, double y) const{
+    const size_t px = (size_t)std::max<double>(source_image_width * x + 0.5, 0);
+    const size_t py = (size_t)std::max<double>(source_image_height * y + 0.5, 0);
+    return std::make_pair(px, py);
+}
+
+
+std::pair<double, double> LabelImages::pixel_to_float(size_t x, size_t y) const{
+    return std::make_pair(x / (double)source_image_width, y / (double)source_image_height);
+}
+
+
+void LabelImages::export_to_yolov5_dataset(const std::string& image_folder_path, const std::string& dataset_path){
+    m_system.logger().log("Exporting " + image_folder_path + " to YOLOv5 dataset " + dataset_path);
+    export_image_annotations_to_yolo_dataset(image_folder_path, dataset_path);
+}
+
+
+
+//
+//  Image source
+//
+
+void LabelImages::post_startup(VideoSource* source){
+    load_current_image_source();
+}
+
+//  Read the image path out of the console's video source and reload everything
+//  that depends on it. If the console is not displaying a still image (e.g. it
+//  is set to a camera or to nothing), we have no image to label.
+void LabelImages::load_current_image_source(){
+    std::lock_guard<RecursiveMutex> lg(m_lock);
+
+    save_annotation_to_file();  // save the annotation of the previously loaded image
+    clear_for_new_image();
+
+    std::string image_path;
+    std::shared_ptr<const VideoSourceDescriptor> descriptor = m_system.video().descriptor();
+    if (descriptor != nullptr && descriptor->type == VideoSourceType::StillImage){
+        image_path = static_cast<const VideoSourceDescriptor_StillImage&>(*descriptor).path();
+    }
+
+    refresh_image_folder_listing(image_path);
+
+    if (image_path.empty()){
+        IMAGE_INFO.set_text(
+            "<b>Image:</b> (none) Set the console's \"Video Input\" to \"Still Image\" to load one."
+        );
+        EMBEDDING_INFO.set_text("");
+        return;
+    }
+
+    std::string image_info = "<b>Image:</b> " + image_path;
+    if (m_cur_image_file_idx_in_folder == SIZE_MAX){
+        image_info += " (?\?/" + std::to_string(m_image_paths_in_folder.size()) + " in folder)";
+    }else{
+        image_info +=
+            " (" + std::to_string(m_cur_image_file_idx_in_folder + 1) +
+            "/" + std::to_string(m_image_paths_in_folder.size()) + " in folder)";
+    }
+    IMAGE_INFO.set_text(std::move(image_info));
+
+    const std::string embedding_path = image_path + ".embedding";
+    const std::string embedding_path_display = "<IMAGE_FOLDER>/" + Filesystem::Path(embedding_path).filename().string();
+    if (!Filesystem::exists(embedding_path)){
+        set_embedding_status(embedding_path_display + " Does Not Exist. Cannot Annotate The Image!", true);
+        return;
+    }
+    set_embedding_status(embedding_path_display, false);
+
+    const Resolution cur_res = m_system.video().current_resolution();
+    if (cur_res.width == 0 || cur_res.height == 0){
+        m_system.logger().log(
+            "Loaded image " + image_path + " has invalid dimension: " + cur_res.to_string(),
+            COLOR_RED
+        );
+        return;
+    }
+
+    load_image_related_data(image_path, cur_res.width, cur_res.height);
+}
+
+void LabelImages::set_embedding_status(std::string message, bool is_error){
+    if (is_error){
+        m_system.logger().log(message, COLOR_RED);
+    }
+    EMBEDDING_INFO.set_text(
+        "<b>Image Embedding File:</b> " +
+        html_color_text(message, is_error ? COLOR_RED : COLOR_DARKGREEN)
+    );
+}
+
+void LabelImages::refresh_image_folder_listing(const std::string& image_path){
+    m_image_folder_path.clear();
+    m_image_paths_in_folder.clear();
+    m_cur_image_file_idx_in_folder = SIZE_MAX;
+    if (image_path.empty()){
+        return;
+    }
+
+    const Filesystem::Path path(image_path);
+    const auto filename = path.filename();
+    const bool recursive_search = false;
+    m_image_folder_path = path.parent_path().string();
+    m_image_paths_in_folder = find_images_in_folder(m_image_folder_path, recursive_search);
+    for (size_t i = 0; i < m_image_paths_in_folder.size(); i++){
+        if (Filesystem::Path(m_image_paths_in_folder[i]).filename() == filename){
+            m_cur_image_file_idx_in_folder = i;
+        }
+    }
+    if (m_cur_image_file_idx_in_folder == SIZE_MAX){
+        m_system.logger().log(
+            "When searching the loaded image folder " + m_image_folder_path +
+            ", cannot find the loaded image filename " + filename.string() + ".",
+            COLOR_RED
+        );
+    }
+}
+
+void LabelImages::go_to_image_by_index_offset(int offset){
+    //  Don't hold the lock while setting the video source: the video session
+    //  runs the source change on the calling thread and some of its listeners
+    //  block on the UI thread, which may itself be waiting on this lock.
+    std::string path;
+    {
+        std::lock_guard<RecursiveMutex> lg(m_lock);
+        if (m_cur_image_file_idx_in_folder == SIZE_MAX || m_image_paths_in_folder.empty()){
+            return;
+        }
+
+        const int folder_size = static_cast<int>(m_image_paths_in_folder.size());
+
+        //  Calculate new index with wrap-around behavior.
+        //  For negative indices, we need to add multiples of folder_size until positive.
+        int new_idx = (static_cast<int>(m_cur_image_file_idx_in_folder) + offset) % folder_size;
+        if (new_idx < 0){
+            new_idx += folder_size;
+        }
+
+        //  Only reload if the index actually changed.
+        if (static_cast<size_t>(new_idx) == m_cur_image_file_idx_in_folder){
+            return;
+        }
+        path = m_image_paths_in_folder[new_idx];
+    }
+
+    //  Update the still image descriptor that the console is already holding so
+    //  that the console's video source selector stays in sync with us.
+    VideoSourceOption option;
+    m_system.video().save(option);
+    std::shared_ptr<VideoSourceDescriptor> descriptor = option.get_descriptor_from_cache(VideoSourceType::StillImage);
+    static_cast<VideoSourceDescriptor_StillImage&>(*descriptor).set_path(std::move(path));
+    m_system.video().set_source(descriptor);
+}
+
+
+
+//
+//  Mouse
+//
+
+void LabelImages::on_mouse_press(double x, double y){
+    std::lock_guard<RecursiveMutex> lg(m_lock);
+
+    m_cur_mouse_x.store(x, std::memory_order_relaxed);
+    m_cur_mouse_y.store(y, std::memory_order_relaxed);
+
+    WIDTH.set(0);
+    HEIGHT.set(0);
+    X.set(x);
+    Y.set(y);
+    m_mouse_start.emplace();
+    m_mouse_end.emplace();
+    m_mouse_start->first = m_mouse_end->first = x;
+    m_mouse_start->second = m_mouse_end->second = y;
+    m_mouse_start_time = current_time();
+}
+
+void LabelImages::on_mouse_release(double x, double y){
+    std::lock_guard<RecursiveMutex> lg(m_lock);
+
+    m_cur_mouse_x.store(x, std::memory_order_relaxed);
+    m_cur_mouse_y.store(y, std::memory_order_relaxed);
+
+    if (!m_mouse_start || !m_mouse_end){
+        return;
+    }
+
+    const auto duration = current_time() - m_mouse_start_time;
+    const double rel_x = std::fabs(m_mouse_start->first - m_mouse_end->first);
+    const double rel_y = std::fabs(m_mouse_start->second - m_mouse_end->second);
+
+    m_mouse_start.reset();
+    m_mouse_end.reset();
+
+    // user may have very small movement while doing quick clicking. To register this as a simple click, use relative
+    // screen distance threshold 0.0015 and click duration threshold 0.15 second:
+    if ((rel_x == 0 && rel_y == 0) || (rel_x < 0.0015 && rel_y < 0.0015 && duration < std::chrono::milliseconds(150))){
+        if (m_control_pressed.load(std::memory_order_relaxed)){
+            add_segmentation_inclusion_point(x, y);
+        }else if (m_shift_pressed.load(std::memory_order_relaxed)){
+            add_segmentation_exclusion_point(x, y);
+        }else{
+            // normal mouse clicking
+            // change currently selected annotation
+            // also change the option values in the UI
+            change_annotation_selection_by_mouse(x, y);
+        }
+        return;
+    }
+
+    // not mouse clicking. So user draw a box:
+    add_new_annotation_from_user_box();
+}
+
+void LabelImages::on_mouse_move(double x, double y){
+    std::lock_guard<RecursiveMutex> lg(m_lock);
+
+    m_cur_mouse_x.store(x, std::memory_order_relaxed);
+    m_cur_mouse_y.store(y, std::memory_order_relaxed);
+
+    if (!m_mouse_start){
+        return;
+    }
+
+    m_mouse_end->first = x;
+    m_mouse_end->second = y;
+
+    double xl = m_mouse_start->first;
+    double yl = m_mouse_start->second;
+    double xh = x;
+    double yh = y;
+
+    if (xl > xh){
+        std::swap(xl, xh);
+    }
+    if (yl > yh){
+        std::swap(yl, yh);
+    }
+
+    X.set(xl);
+    Y.set(yl);
+    WIDTH.set(xh - xl);
+    HEIGHT.set(yh - yl);
+
+    update_rendered_objects();
+}
+
+
+
+//
+//  Keyboard
+//
+//  The console UI forwards key events to the global input sources, which turn
+//  them into HID key codes and report the set of keys that are currently held
+//  down. Subscribing to that (instead of to the raw key events) is what lets
+//  this program handle the keyboard without any Qt of its own.
+//
+
+void LabelImages::on_focus_in(){
+    global_input_add_listener(*this);
+}
+void LabelImages::on_focus_out(){
+    global_input_remove_listener(*this);
+    {
+        std::lock_guard<Mutex> lg(m_keyboard_lock);
+        m_held_keys.clear();
+    }
+    m_shift_pressed.store(false, std::memory_order_relaxed);
+    m_control_pressed.store(false, std::memory_order_relaxed);
+}
+
+void LabelImages::run_controller_input(ControllerInputState& state){
+    //  Called on the keyboard tracker thread.
+    if (state.type() != ControllerInputType::HID_Keyboard){
+        return;
+    }
+    const std::set<KeyboardKey>& keys = static_cast<const KeyboardInputState&>(state).keys();
+
+    auto held = [&](KeyboardKey key){
+        return keys.find(key) != keys.end();
+    };
+
+    //  Qt maps the Mac "command" key to control, so accept either as the
+    //  inclusion point modifier on all platforms.
+    const bool shift = held(KeyboardKey::KEY_LEFT_SHIFT) || held(KeyboardKey::KEY_RIGHT_SHIFT);
+    const bool control =
+        held(KeyboardKey::KEY_LEFT_CTRL) || held(KeyboardKey::KEY_RIGHT_CTRL) ||
+        held(KeyboardKey::KEY_LEFT_META) || held(KeyboardKey::KEY_RIGHT_META);
+    m_shift_pressed.store(shift, std::memory_order_relaxed);
+    m_control_pressed.store(control, std::memory_order_relaxed);
+
+    bool delete_annotation, remove_point, prev_image, next_image;
+    {
+        std::lock_guard<Mutex> lg(m_keyboard_lock);
+
+        //  A key counts as pressed the first time we see it in the held set.
+        auto pressed = [&](KeyboardKey key){
+            return held(key) && m_held_keys.find(key) == m_held_keys.end();
+        };
+        delete_annotation = pressed(KeyboardKey::KEY_DELETE) || pressed(KeyboardKey::KEY_BACKSPACE);
+        remove_point = pressed(KeyboardKey::KEY_D);
+        prev_image = pressed(KeyboardKey::KEY_Z);
+        next_image = pressed(KeyboardKey::KEY_X);
+
+        m_held_keys = keys;
+    }
+
+    if (delete_annotation){
+        delete_selected_annotation();
+    }
+    if (remove_point){
+        const double x = m_cur_mouse_x.load(std::memory_order_relaxed);
+        const double y = m_cur_mouse_y.load(std::memory_order_relaxed);
+        if (control){
+            remove_segmentation_inclusion_point(x, y);
+        }else if (shift){
+            remove_segmentation_exclusion_point(x, y);
+        }
+    }
+    if (prev_image){
+        go_to_image_by_index_offset(shift ? -10 : -1);
+    }
+    if (next_image){
+        go_to_image_by_index_offset(shift ? 10 : 1);
+    }
+}
+
+
+
+Color enum_to_color(ColorChoice color_choice){
+    switch(color_choice){
+    case ColorChoice::BLACK:
+        return COLOR_BLACK;
+    case ColorChoice::RED:
+        return COLOR_RED;
+    case ColorChoice::BLUE:
+        return COLOR_BLUE;
+    case ColorChoice::YELLOW:
+        return COLOR_YELLOW;
+    case ColorChoice::GREEN:
+        return COLOR_GREEN;
+    case ColorChoice::ORANGE:
+        return COLOR_ORANGE;
+    case ColorChoice::MAGENTA:
+        return COLOR_MAGENTA;
+    case ColorChoice::PURPLE:
+        return COLOR_PURPLE;
+    case ColorChoice::CYAN:
+        return COLOR_CYAN;
+    default:
+        global_logger_tagged().log("Error: Unknown color selected.", COLOR_RED);
+        return COLOR_BLACK;
+    }
+}
+
+}
+}
diff --git a/SerialPrograms/Source/ML/Programs/ML_LabelImages.h b/SerialPrograms/Source/ML/Programs/ML_LabelImages.h
new file mode 100644
index 0000000000..c5a1235c7f
--- /dev/null
+++ b/SerialPrograms/Source/ML/Programs/ML_LabelImages.h
@@ -0,0 +1,377 @@
+/*  ML Label Images
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  Program to annotate images for training ML models.
+ *
+ *  This is a ConsolePanel (GameConsole/ConsolePanel.h). The panel infrastructure
+ *  provides the entire UI: the console's video display (used here to show the
+ *  image being labeled via the "Still Image" video source), plus the widgets for
+ *  all the options declared below. As a result this program builds no Qt UI of
+ *  its own:
+ *    - Buttons are `ButtonOption`s. Presses arrive in `on_press()`.
+ *    - Status text is `StaticTextOption`s that are updated with `set_text()`.
+ *    - File paths are `PathOption`s (the option's widget owns the file dialog).
+ *    - Mouse input arrives through `VideoDisplayHidListener` on the console's
+ *      video overlay.
+ *    - Keyboard input arrives through `ControllerInputListener` as HID key codes,
+ *      which is the Qt-free view of the keyboard that the console UI feeds.
+ *
+ *  The one exception is `open_annotation_folder()`, which needs Qt to hand a
+ *  folder to the system's file browser. It is written the same way as
+ *  `GlobalSettings::on_press()`: a single guarded call, no widgets.
+ */
+
+#ifndef PokemonAutomation_ML_LabelImages_H
+#define PokemonAutomation_ML_LabelImages_H
+
+#include <atomic>
+#include <memory>
+#include <optional>
+#include <set>
+#include <string>
+#include <vector>
+#include "Common/Cpp/Color.h"
+#include "Common/Cpp/Concurrency/Mutex.h"
+#include "Common/Cpp/Time.h"
+#include "Common/Cpp/Options/ButtonOption.h"
+#include "Common/Cpp/Options/EnumDropdownDatabase.h"
+#include "Common/Cpp/Options/EnumDropdownOption.h"
+#include "Common/Cpp/Options/FloatingPointOption.h"
+#include "Common/Cpp/Options/GroupOption.h"
+#include "Common/Cpp/Options/PathOption.h"
+#include "Common/Cpp/Options/StaticTextOption.h"
+#include "Common/Cpp/Options/StringOption.h"
+#include "CommonFramework/VideoPipeline/VideoOverlay.h"
+#include "CommonFramework/VideoPipeline/VideoSession.h"
+#include "ML/DataLabeling/ML_ObjectAnnotation.h"
+#include "ML/DataLabeling/ML_SegmentAnythingModel.h"
+#include "ControllerInput/ControllerInput.h"
+#include "ControllerInput/Keyboard/KeyboardHidButtons.h"
+#include "GameConsole/ConsolePanel.h"
+#include "Pokemon/Options/Pokemon_HomeSpriteSelectOption.h"
+
+namespace PokemonAutomation{
+namespace ML{
+
+
+class LabelImages_OverlayManager;
+
+
+enum class ColorChoice{
+    BLACK,
+    RED,
+    BLUE,
+    YELLOW,
+    GREEN,
+    ORANGE,
+    MAGENTA,
+    PURPLE,
+    CYAN,
+};
+
+Color enum_to_color(ColorChoice color_choice);
+
+
+class LabelImages_Descriptor : public GameConsole::ConsolePanelDescriptor{
+public:
+    LabelImages_Descriptor();
+};
+
+
+//  Program to annotate images for training ML models.
+//
+//  The image to label is the console's video source: pick "Still Image" in the
+//  console's "Video Input" dropdown and it will ask for the image file. The
+//  annotations are drawn on the console's video overlay.
+//
+//  Mouse/keyboard interaction on the image display:
+//    - Drag a box:            run SAM on the box to create a new annotation.
+//    - Click:                 select/deselect the annotation under the cursor.
+//    - Ctrl(Cmd)+click:       add a segmentation inclusion point.
+//    - Shift+click:           add a segmentation exclusion point.
+//    - Ctrl(Cmd)+D / Shift+D: remove the inclusion/exclusion point closest to
+//                             the cursor.
+//    - Delete/Backspace:      delete the selected annotation.
+//    - z/x, Shift+z/Shift+x:  move 1/10 images backwards/forwards in the folder.
+class LabelImages
+    : public GameConsole::ConsolePanelInstance
+    , public ConfigOption::Listener
+    , public ButtonListener
+    , public VideoSession::StateListener
+    , public VideoDisplayHidListener
+    , public ControllerInputListener
+{
+public:
+    //  Required by `make_ConsolePanel<>()` to find this program's descriptor.
+    using Descriptor = LabelImages_Descriptor;
+
+    ~LabelImages();
+    LabelImages(GameConsole::ConsoleSystemSession& system);
+
+public:
+    //  Serialization.
+    //  Saving the panel also flushes the current annotation to its .json file.
+    virtual JsonValue to_json() const override;
+
+    void init_sam_session(bool use_gpu);
+
+    void save_annotation_to_file() const;
+
+    //  Save the current annotation, then show the folder it was saved into in
+    //  the system's file browser. The annotation .json files are written next
+    //  to the images, so this is the folder of the currently loaded image.
+    void open_annotation_folder();
+
+    // called after loading a new image, clean up all internal data
+    void clear_for_new_image();
+
+    // Load image related data:
+    // - Image SAM embedding data file, which has the same file path but with a name suffix ".embedding"
+    // - Existing annotation file, which is stored in the same folder as the image and with the same filename as
+    //   the image but with name extension replaced to be ".json".
+    void load_image_related_data(const std::string& image_path, const size_t source_image_width, const size_t source_image_height);
+
+    // Update rendering data reflect the current annotation
+    void update_rendered_objects();
+
+    // Use user currently drawn box to compute per-pixel masks on the image using SAM model
+    void add_new_annotation_from_user_box();
+    // update mask after user add or remove an inclusion or exclusion point on the currently selected annotation
+    // rendered objects are not updated
+    void update_mask_for_selected_annotation();
+    // User adds an inclusion point to the current selected annotation. It will then re-compute
+    // the per-pixel mask using the added inclusion point.
+    void add_segmentation_inclusion_point(double x, double y);
+    // Remove the closest user added segmentation inclusion point on the current selected annotation
+    void remove_segmentation_inclusion_point(double x, double y);
+    // User adds an exclusion point to the current selected annotation. It will then re-compute
+    // the per-pixel mask using the added exclusion point.
+    void add_segmentation_exclusion_point(double x, double y);
+    // Remove the closest user added segmentation exclusion point on the current selected annotation
+    void remove_segmentation_exclusion_point(double x, double y);
+
+    // Compute embeddings for all images in a folder.
+    // This can be very slow!
+    void compute_embeddings_for_folder(const std::string& image_folder);
+
+    // Delete the currently selected object annotation.
+    void delete_selected_annotation();
+
+    void change_annotation_selection_by_mouse(double x, double y);
+    void select_prev_annotation();
+    void select_next_annotation();
+
+    // return the label selected on UI
+    std::string selected_label() const;
+    void set_selected_label(const std::string& label);
+
+    void load_custom_label_set(const std::string& json_path);
+
+    void export_to_yolov5_dataset(const std::string& image_folder_path, const std::string& dataset_path);
+
+
+private:
+    //  Overwrites ConfigOption::Listener::on_config_value_changed().
+    virtual void on_config_value_changed(void* object) override;
+
+    //  Overwrites ButtonListener::on_press().
+    //  All the buttons of this panel are dispatched from here.
+    virtual void on_press(ButtonCell& button) override;
+
+    //  Overwrites VideoSession::StateListener::post_startup().
+    //  Called whenever the console's video source is (re)started, which for this
+    //  panel means the user loaded a different image.
+    virtual void post_startup(VideoSource* source) override;
+
+    //  Overwrites VideoDisplayHidListener::on_focus_in()/on_focus_out().
+    //  Keyboard input is only routed to us while the console display has focus,
+    //  so we subscribe to the global input sources only while focused.
+    virtual void on_focus_in() override;
+    virtual void on_focus_out() override;
+
+    //  Overwrites VideoDisplayHidListener::on_mouse_*().
+    //  These are called on the UI thread with coordinates relative to the image
+    //  ([0.0, 1.0] on each axis).
+    virtual void on_mouse_press(double x, double y) override;
+    virtual void on_mouse_release(double x, double y) override;
+    virtual void on_mouse_move(double x, double y) override;
+
+    //  Overwrites ControllerInputListener::run_controller_input().
+    //  Called on the keyboard tracker thread with the set of keys currently held
+    //  down. We diff it against the previous state to get key presses.
+    virtual void run_controller_input(ControllerInputState& state) override;
+
+
+private:
+    //  Reload everything that depends on which image is loaded. Called on startup
+    //  and whenever the console's video source changes.
+    void load_current_image_source();
+
+    //  Refresh the list of images that live in the same folder as the currently
+    //  loaded image, and remember where in that list the current image is. This
+    //  is what the "Prev/Next Image in Folder" buttons walk through.
+    void refresh_image_folder_listing(const std::string& image_path);
+
+    //  Load the image that is `offset` positions away from the current image in
+    //  its folder. Wraps around on both ends. Negative offset moves backwards.
+    void go_to_image_by_index_offset(int offset);
+
+    //  Show `message` in the embedding status text, and log it if it is an error.
+    void set_embedding_status(std::string message, bool is_error);
+
+    std::pair<size_t, size_t> float_to_pixel(double x, double y) const;
+    // note! will have division by source_image_width/height!
+    std::pair<double, double> pixel_to_float(size_t x, size_t y) const;
+
+    void remove_closest_point(std::vector<std::pair<size_t, size_t>>& points, double x, double y);
+
+    // call SAM model to compute mask from the given user box and inclusiong and exclusion points.
+    // if SAM session failed or no SAM model loaded, return false
+    // if user box is empty or no mask is created, return false
+    // return true when the mask is created successfully and saved to `mask_box` and `mask`.
+    // no change to `mask_box` and `mask` if the function returns false.
+    bool run_sam_to_create_annotation(
+        const ImagePixelBox& user_box,
+        const std::vector<std::pair<size_t, size_t>>& inclusion_points,
+        const std::vector<std::pair<size_t, size_t>>& exclusion_points,
+        ImagePixelBox& mask_box,
+        std::vector<bool>& mask
+    );
+
+    friend class LabelImages_OverlayManager;
+
+
+private:
+    GameConsole::ConsoleSystemSession& m_system;
+
+    //  Annotation state is touched from the UI thread (mouse, buttons, options)
+    //  and from the keyboard tracker thread (`run_controller_input()`), so all
+    //  the entry points that touch it take this lock. It is recursive because
+    //  changing an option value re-enters us through `on_config_value_changed()`.
+    mutable RecursiveMutex m_lock;
+
+    // manages overlay rendering that shows annotations overlayed on the image
+    std::unique_ptr<LabelImages_OverlayManager> m_overlay_manager;
+
+    bool m_use_gpu_for_sam_anno;
+
+    //  The box the user is currently dragging on the image. Not serialized: it
+    //  only lives as long as the drag that produced it.
+    FloatingPointOption X;
+    FloatingPointOption Y;
+    FloatingPointOption WIDTH;
+    FloatingPointOption HEIGHT;
+
+    //  Which image is loaded and whether it has a SAM embedding file.
+    StaticTextOption IMAGE_INFO;
+    StaticTextOption EMBEDDING_INFO;
+    //  A horizontal BatchOption lays its children out in one row. The buttons
+    //  inside are ButtonCells rather than ButtonOptions because a ButtonOption
+    //  also renders a label column, which would split the row.
+    BatchOption IMAGE_BUTTONS;
+    ButtonCell PREV_IMAGE;
+    ButtonCell NEXT_IMAGE;
+
+    GroupOption LABEL_GROUP;
+    // the database to initialize LABEL_TYPE
+    IntegerEnumDropdownDatabase LABEL_TYPE_DATABASE;
+    // a dropdown menu to choose which source below to set label from
+    IntegerEnumDropdownOption LABEL_TYPE;
+    // source 1: a dropdown menu for all pokemon forms
+    Pokemon::HomeSpriteSelectCell FORM_LABEL;
+    // the database to initialize CUSTOM_SET_LABEL
+    StringSelectDatabase CUSTOM_LABEL_DATABASE;
+    // source 2: a dropdown menu for custom labels
+    StringSelectCell CUSTOM_SET_LABEL;
+    // source 3: editable text input
+    StringCell MANUAL_LABEL;
+    // the file path to load custom label set
+    PathOption CUSTOM_LABEL_SET;
+
+    GroupOption ANNOTATION_GROUP;
+    BatchOption ANNOTATION_BUTTONS;
+    ButtonCell DELETE_ANNOTATION;
+    ButtonCell PREV_ANNOTATION;
+    ButtonCell NEXT_ANNOTATION;
+    ButtonCell TOGGLE_ANNOTATIONS;
+    ButtonCell SAVE_ANNOTATIONS;
+    ButtonCell OPEN_ANNOTATION_FOLDER;
+
+    //  The three colors are one compact row rather than a titled group of
+    //  full-width dropdowns. Each dropdown is an EnumDropdownCell (no label
+    //  column) preceded by its own short StaticTextOption label.
+    BatchOption RENDERING_ROW;
+    StaticTextOption RENDERING_LABEL;
+    StaticTextOption SELECTED_ANNO_LABEL;
+    EnumDropdownCell<ColorChoice> SELECTED_ANNO_COLOR;
+    StaticTextOption UNSELECTED_ANNO_LABEL;
+    EnumDropdownCell<ColorChoice> UNSELECTED_ANNO_COLOR;
+    StaticTextOption CURRENT_DRAWN_BOX_LABEL;
+    EnumDropdownCell<ColorChoice> CURRENT_DRAWN_BOX;
+
+    //  Also one compact row: a PathCell and two ButtonCells, none of which
+    //  render a label column of their own.
+    BatchOption DATASET_ROW;
+    StaticTextOption YOLO_CONFIG_LABEL;
+    // the path to get the YOLOv5 YAML config file to export images and finished annotations to
+    // YOLO dataset.
+    PathCell YOLO_CONFIG;
+    ButtonCell EXPORT_TO_YOLO;
+    ButtonCell COMPUTE_EMBEDDINGS;
+
+    size_t source_image_height = 0;
+    size_t source_image_width = 0;
+    std::vector<float> m_image_embedding;
+    std::vector<bool> m_output_boolean_mask;
+
+    std::unique_ptr<SAMSession> m_sam_session;
+    std::vector<ObjectAnnotation> m_annotations;
+
+    // currently selected annotated object's index
+    // if this value == m_annotations.size(), it means the user is not selecting anything
+    size_t m_selected_obj_idx = 0;
+    std::string m_annotation_file_path;
+    // if we find an annotation file that is supposed to be created by user in a previous session, but
+    // we fail to load it, then we shouldn't overwrite this file to possibly erase the previous work.
+    // so this flag is used to denote if we fail to load an annotation file
+    bool m_fail_to_load_annotation_file = false;
+
+    // track whether annotations are currently hidden
+    bool m_annotations_hidden = false;
+
+    //  The custom label set that is currently loaded into CUSTOM_LABEL_DATABASE.
+    //  Used to ignore the change notifications that CUSTOM_LABEL_SET
+    //  sends while we are reacting to it.
+    std::string m_loaded_custom_label_set_path;
+
+    //  The folder of the currently loaded image and the images found in it, used
+    //  by the "Prev/Next Image in Folder" buttons and the z/x hotkeys.
+    std::string m_image_folder_path;
+    std::vector<std::string> m_image_paths_in_folder;
+    //  SIZE_MAX if the loaded image was not found in its own folder listing.
+    size_t m_cur_image_file_idx_in_folder = SIZE_MAX;
+
+    //  Mouse drag state. Only touched on the UI thread except for the cursor
+    //  position, which the keyboard thread reads for the "remove point" hotkeys.
+    std::optional<std::pair<double, double>> m_mouse_start;
+    std::optional<std::pair<double, double>> m_mouse_end;
+    WallClock m_mouse_start_time;
+    std::atomic<double> m_cur_mouse_x;
+    std::atomic<double> m_cur_mouse_y;
+
+    //  Keyboard state. `m_held_keys` is written by the keyboard tracker thread
+    //  and cleared by the UI thread when focus is lost, so it has its own lock.
+    //  It is never held while calling into anything else, so it cannot deadlock
+    //  against `m_lock`.
+    Mutex m_keyboard_lock;
+    std::set<KeyboardKey> m_held_keys;
+    std::atomic<bool> m_shift_pressed;
+    std::atomic<bool> m_control_pressed;
+};
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/ML/Programs/ML_LabelImagesOverlayManager.cpp b/SerialPrograms/Source/ML/Programs/ML_LabelImagesOverlayManager.cpp
new file mode 100644
index 0000000000..197e99b6d7
--- /dev/null
+++ b/SerialPrograms/Source/ML/Programs/ML_LabelImagesOverlayManager.cpp
@@ -0,0 +1,172 @@
+/*  ML Label Images Overlay Manager
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  Manages image overlay rendering for program LabelImages.
+ */
+
+#include "Pokemon/Resources/Pokemon_PokemonForms.h"
+#include "ML_LabelImagesOverlayManager.h"
+#include "ML_LabelImages.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace ML{
+
+inline size_t size_t_diff(size_t x, size_t y){
+    return x >= y ? x - y : y - x;
+}
+inline size_t size_t_subtract_clamp(size_t x, size_t y){
+    // max(x - y, 0)
+    return x >= y ? x - y : 0;
+}
+
+LabelImages_OverlayManager::LabelImages_OverlayManager(LabelImages& program, VideoOverlay& overlay)
+    : m_program(program)
+    , m_overlay_set(overlay)
+{
+    m_inclusion_point_icon_template = ImageRGB32(21, 21);
+    m_inclusion_point_icon_template.fill(0);
+    const size_t strip_size = 5, strip_start = (21 - 5) / 2;
+    for (size_t y = 0; y < strip_size; y++){
+        for (size_t x = 0; x < m_inclusion_point_icon_template.width(); x++){
+            m_inclusion_point_icon_template.pixel(x, y+strip_start) = uint32_t(enum_to_color(m_program.CURRENT_DRAWN_BOX));
+        }
+    }
+    for (size_t y = 0; y < m_inclusion_point_icon_template.height(); y++){
+        for (size_t x = 0; x < strip_size; x++){
+            m_inclusion_point_icon_template.pixel(x+strip_start, y) = uint32_t(enum_to_color(m_program.CURRENT_DRAWN_BOX));
+        }
+    }
+
+    m_exclusion_point_icon_template = ImageRGB32(21, 21);
+    m_exclusion_point_icon_template.fill(0);
+    const size_t center = m_exclusion_point_icon_template.height() / 2;
+    const size_t d2_min_th = (center-2)*(center-2);
+    const size_t d2_max_th = (center+2)*(center+2);
+    for (size_t y = 0; y < m_exclusion_point_icon_template.height(); y++){
+        for (size_t x = 0; x < m_exclusion_point_icon_template.width(); x++){
+            const size_t dx = size_t_diff(center, x);
+            const size_t dy = size_t_diff(center, y);
+            const size_t d2 = dx*dx + dy*dy;
+            if (d2 >= d2_min_th && d2 <= d2_max_th){
+                // double offset = std::fabs(std::sqrt(d2) - (double)center); // 0-3
+                // int color_magnitude = int(255.0 * (1.0 - std::max(0.0, offset-2)) + 0.5);
+                // color_magnitude = std::max(std::min(color_magnitude, 255), 0);
+                // uint32_t color = combine_argb(uint8_t(color_magnitude), 0, 0, uint8_t(color_magnitude));
+                // cout << x << " " << y << " " << offset << " " << color_magnitude << endl;
+                m_exclusion_point_icon_template.pixel(x, y) = combine_argb(255, 0, 0, 200); // dark blue
+            }
+        }
+    }
+
+    // m_inclusion_point_icon_template.save("./inclusion.png");
+    // m_exclusion_point_icon_template.save("./exclusion.png");
+}
+
+void LabelImages_OverlayManager::clear(){
+    m_overlay_set.clear();
+
+    m_inclusion_point_icon = ImageRGB32();
+    m_exclusion_point_icon = ImageRGB32();
+}
+
+void LabelImages_OverlayManager::set_image_size(){
+    const size_t point_icon_size = std::max(size_t(9), std::min(m_program.source_image_height, m_program.source_image_width) / 100);
+
+    m_inclusion_point_icon = m_inclusion_point_icon_template.scale_to(point_icon_size, point_icon_size);
+    m_exclusion_point_icon = m_exclusion_point_icon_template.scale_to(point_icon_size, point_icon_size);
+}
+
+
+void LabelImages_OverlayManager::update_rendered_annotations(){
+    m_overlay_set.clear();
+    const size_t image_width = m_program.source_image_width;
+    const size_t image_height = m_program.source_image_height;
+    if (image_width <= 1 || image_height <= 1){
+        return;
+    }
+    if (m_program.WIDTH > 0.0 && m_program.HEIGHT > 0.0){
+        m_overlay_set.add(enum_to_color(m_program.CURRENT_DRAWN_BOX), {m_program.X, m_program.Y, m_program.WIDTH, m_program.HEIGHT});
+    }
+
+    // If annotations are hidden, don't render them
+    if (m_program.m_annotations_hidden){
+        return;
+    }
+
+    const auto& annotations = m_program.m_annotations;
+    const size_t& m_selected = m_program.m_selected_obj_idx;
+
+    auto create_overlay_for_index = [&](size_t i_obj){
+        const auto& obj = annotations[i_obj];
+        // overlayset.add(COLOR_RED, pixelbox_to_floatbox(source_image_width, source_image_height, obj.user_box));
+        const auto mask_float_box = pixelbox_to_floatbox(image_width, image_height, obj.mask_box);
+        std::string label = obj.label;
+        const Pokemon::PokemonForm* form = Pokemon::get_pokemon_form(label);
+        if (form != nullptr){
+            label = form->display_name();
+        }
+        Color mask_box_color = (i_obj == m_selected) ? enum_to_color(m_program.SELECTED_ANNO_COLOR) : enum_to_color(m_program.UNSELECTED_ANNO_COLOR);
+        m_overlay_set.add(mask_box_color, mask_float_box, label);
+        size_t mask_width = obj.mask_box.width();
+        size_t mask_height = obj.mask_box.height();
+        ImageRGB32 mask_image(mask_width, mask_height);
+        // cout << "in render, mask_box " << obj.mask_box.min_x << " " << obj.mask_box.min_y << " " << obj.mask_box.max_x << " " << obj.mask_box.max_y << endl;
+
+        for (size_t y = 0; y < mask_height; y++){
+            for (size_t x = 0; x < mask_width; x++){
+                const bool mask = obj.mask[y*mask_width + x];
+                uint32_t& pixel = mask_image.pixel(x, y);
+                // if the pixel's mask value is true, set a semi-transparent 45-degree blue strip color
+                // otherwise: fully transparent (alpha = 0)
+                uint32_t color = 0;
+                if (mask){
+                    color = (std::abs(int(x) - int(y)) % 4 <= 1) ? combine_argb(150, 30, 144, 255) : combine_argb(150, 0, 0, 60);
+                }
+                pixel = color;
+            }
+        }
+        // cout << " count " << count << endl;
+        m_overlay_set.add(std::move(mask_image), mask_float_box);
+
+        if (i_obj == m_selected){
+            const size_t icon_size = m_inclusion_point_icon.height();
+            const size_t icon_min_offset = icon_size / 2;
+            const size_t icon_max_offset = icon_size - icon_min_offset;
+            auto create_box = [&](const std::pair<size_t, size_t>& p) -> ImageFloatBox{
+                size_t x_min = size_t_subtract_clamp(p.first, icon_min_offset);
+                size_t x_max = std::min(p.first + icon_max_offset, image_width-1);
+                size_t y_min = size_t_subtract_clamp(p.second, icon_min_offset);
+                size_t y_max = std::min(p.second + icon_max_offset, image_height-1);
+                ImagePixelBox box(x_min, y_min, x_max, y_max);
+                return pixelbox_to_floatbox(image_width, image_height, box);
+            };
+            // the inclusion and exclusion points are only rendered for the current selected object:
+            for (const auto& p : obj.inclusion_points){
+                m_overlay_set.add(m_inclusion_point_icon.copy(), create_box(p));
+            }
+            for (const auto& p : obj.exclusion_points){
+                m_overlay_set.add(m_exclusion_point_icon.copy(), create_box(p));
+            }
+        }
+    };
+    for (size_t i_obj = 0; i_obj < annotations.size(); i_obj++){
+        if (i_obj == m_selected){
+            // skip current selected annotation because we want to render it last so that
+            // it will not be occluded by other annotations
+            continue;
+        }
+        create_overlay_for_index(i_obj);
+    }
+    if (m_selected < annotations.size()){
+        create_overlay_for_index(m_selected);
+    }
+}
+
+
+}
+}
diff --git a/SerialPrograms/Source/ML/Programs/ML_LabelImagesOverlayManager.h b/SerialPrograms/Source/ML/Programs/ML_LabelImagesOverlayManager.h
new file mode 100644
index 0000000000..7be3d32f2a
--- /dev/null
+++ b/SerialPrograms/Source/ML/Programs/ML_LabelImagesOverlayManager.h
@@ -0,0 +1,62 @@
+/*  ML Label Images Overlay Manager
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  Manages image overlay rendering for program LabelImages.
+ *  Since ML_LabelImages.cpp is quite long, moved the overlay rendering code
+ *  to this separate file.
+ */
+
+#ifndef PokemonAutomation_ML_LabelImagesOverlayManager_H
+#define PokemonAutomation_ML_LabelImagesOverlayManager_H
+
+
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonFramework/ImageTypes/ImageRGB32.h"
+
+
+namespace PokemonAutomation{
+    class VideoOverlay;
+namespace ML{
+
+class LabelImages;
+
+
+class LabelImages_OverlayManager{
+public:
+    //  `overlay` is the video overlay the annotations are drawn on. For this
+    //  program that is the overlay of the console whose video display is showing
+    //  the image being labeled.
+    LabelImages_OverlayManager(LabelImages& program, VideoOverlay& overlay);
+
+    // clear all data to prepare for a new image to label
+    void clear();
+
+    // Initialize internal data related to source image size.
+    // This must be called after LabelImages::source_image_width and source_image_height has been
+    // set to the new size.
+    // This must be called after clear() and before update_rendered_annotations().
+    void set_image_size();
+
+    // called whenever a change in annotation data happens to update the corresponding
+    // rendering data
+    void update_rendered_annotations();
+
+private:
+    LabelImages& m_program;
+
+    VideoOverlaySet m_overlay_set;
+
+    ImageRGB32 m_inclusion_point_icon_template;
+    ImageRGB32 m_exclusion_point_icon_template;
+
+    ImageRGB32 m_inclusion_point_icon;
+    ImageRGB32 m_exclusion_point_icon;
+};
+
+
+}
+}
+
+
+#endif
\ No newline at end of file
diff --git a/SerialPrograms/Source/ML/Programs/ML_RunYOLO.cpp b/SerialPrograms/Source/ML/Programs/ML_RunYOLO.cpp
new file mode 100644
index 0000000000..734ea44557
--- /dev/null
+++ b/SerialPrograms/Source/ML/Programs/ML_RunYOLO.cpp
@@ -0,0 +1,59 @@
+/*  ML Run YOLO Program
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  Test YOLO detection model on Switch streams.
+ */
+
+//#include <iostream>
+//#include <filesystem>
+//#include "Common/Cpp/PrettyPrint.h"
+#include "CommonFramework/GlobalAutoPaths.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+//#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+//#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "ML/Inference/ML_YOLOv5Detector.h"
+#include "ML_RunYOLO.h"
+
+namespace PokemonAutomation{
+namespace ML{
+
+
+RunYOLO_Descriptor::RunYOLO_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "NintendoSwitch:RunYOLO",
+        "Nintendo Switch", "Run YOLO",
+        "Programs/NintendoSwitch/RunYOLO.html",
+        "Run YOLO object detection model.",
+        PanelQualityStanding::DEVELOPER,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::NONE,
+        AllowCommandsWhenRunning::ENABLE_COMMANDS
+    )
+{}
+
+
+
+RunYOLO::RunYOLO()
+    : MODEL_PATH(
+        "<b>YOLO Model Path:</b>",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        RESOURCE_PATH() + "ML/yolov5.onnx",
+        "*.onnx",
+        "Path to YOLO .onnx model file"
+    )
+{
+    PA_ADD_OPTION(MODEL_PATH);
+}
+
+void RunYOLO::program(NintendoSwitch::SingleSwitchProgramEnvironment& env, CancellableScope& scope){
+    std::string model_path = MODEL_PATH;
+    YOLOv5Watcher watcher(env.console.overlay(), model_path);
+
+    wait_until(env.console, scope, WallClock::max(), {watcher});
+}
+
+
+}
+}
+
diff --git a/SerialPrograms/Source/ML/Programs/ML_RunYOLO.h b/SerialPrograms/Source/ML/Programs/ML_RunYOLO.h
new file mode 100644
index 0000000000..7b25c9979e
--- /dev/null
+++ b/SerialPrograms/Source/ML/Programs/ML_RunYOLO.h
@@ -0,0 +1,41 @@
+/*  ML Run YOLO Program
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  Test YOLO detection model on Switch streams.
+ */
+
+#ifndef PokemonAutomation_ML_RunYOLO_H
+#define PokemonAutomation_ML_RunYOLO_H
+
+#include "Common/Cpp/Options/PathOption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+
+namespace PokemonAutomation{
+namespace ML{
+
+
+class RunYOLO_Descriptor : public NintendoSwitch::SingleSwitchProgramDescriptor{
+public:
+    RunYOLO_Descriptor();
+};
+
+
+class RunYOLO : public NintendoSwitch::SingleSwitchProgramInstance{
+public:
+    using Descriptor = RunYOLO_Descriptor;
+    RunYOLO();
+
+    virtual void program(NintendoSwitch::SingleSwitchProgramEnvironment& env, CancellableScope& scope) override;
+
+private:
+    PathOption MODEL_PATH;
+};
+
+
+}
+}
+#endif
+
+
+
diff --git a/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_Device.cpp b/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_Device.cpp
deleted file mode 100644
index f233bd7083..0000000000
--- a/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_Device.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-/*  Device Functions
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "NintendoSwitch_Commands_Device.h"
-#include "NintendoSwitch_Messages_Device.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-
-
-uint32_t system_clock(BotBaseContext& context){
-    pabb_MsgAckRequestI32 response;
-    context.issue_request_and_wait(
-        DeviceRequest_system_clock()
-    ).convert<PABB_MSG_ACK_REQUEST_I32>(context.botbase().logger(), response);
-    return response.data;
-}
-void set_leds(BotBaseContext& context, bool on){
-    context.issue_request(DeviceRequest_set_leds(on));
-}
-
-
-
-
-
-}
-}
diff --git a/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_Device.h b/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_Device.h
deleted file mode 100644
index 140e442abe..0000000000
--- a/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_Device.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*  Device Functions
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_NintendoSwitch_Commands_Device_H
-#define PokemonAutomation_NintendoSwitch_Commands_Device_H
-
-#include "ClientSource/Connection/BotBase.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-
-
-uint32_t system_clock   (BotBaseContext& context);
-void set_leds           (BotBaseContext& context, bool on);
-
-
-
-}
-}
-#endif
diff --git a/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_DigitEntry.cpp b/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_DigitEntry.cpp
deleted file mode 100644
index 5cca231783..0000000000
--- a/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_DigitEntry.cpp
+++ /dev/null
@@ -1,71 +0,0 @@
-/*  Digit Entry
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- */
-
-#include <cstring>
-#include <sstream>
-#include "ClientSource/Connection/BotBase.h"
-#include "ClientSource/Libraries/MessageConverter.h"
-#include "NintendoSwitch_Commands_DigitEntry.h"
-#include "NintendoSwitch_Messages_DigitEntry.h"
-
-
-#if 0
-void enter_digits_str(uint8_t count, const char* digits){
-    enter_digits(count, (const uint8_t*)digits);
-}
-void enter_digits(uint8_t count, const uint8_t* digits){
-    enter_digits(*PokemonAutomation::global_connection, count, digits);
-}
-#endif
-
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-
-
-
-void enter_digits_str(BotBaseContext& context, uint8_t count, const char* digits){
-    enter_digits(context, count, (const uint8_t*)digits);
-}
-uint8_t convert_digit(uint8_t digit){
-    if (digit >= '0'){
-        digit -= '0';
-    }
-    if (digit > 9){
-        digit = 0;
-    }
-    return digit;
-}
-void enter_digits(BotBaseContext& context, uint8_t count, const uint8_t* digits){
-    context.issue_request(DeviceRequest_enter_digits(count, digits));
-}
-
-
-
-int register_message_converters_switch_digit_entry(){
-    register_message_converter(
-        PABB_MSG_COMMAND_ENTER_DIGITS,
-        [](const std::string& body){
-            std::ostringstream ss;
-            ss << "enter_digits() - ";
-            if (body.size() != sizeof(pabb_enter_digits)){ ss << "(invalid size)" << std::endl; return ss.str(); }
-            const auto* params = (const pabb_enter_digits*)body.c_str();
-            ss << "seqnum = " << (uint64_t)params->seqnum;
-            ss << ", count = " << (unsigned)params->count;
-            ss << ", digits = ";
-            for (uint8_t c = 0; c < params->count; c++){
-                ss << ((params->digit_pairs[c / 2] >> 4 * (c & 1)) & 0x0f);
-            }
-            return ss.str();
-        }
-    );
-    return 0;
-}
-int init_SwitchDigitEntry = register_message_converters_switch_digit_entry();
-
-
-}
-}
diff --git a/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_DigitEntry.h b/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_DigitEntry.h
deleted file mode 100644
index 861ea48fd0..0000000000
--- a/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_DigitEntry.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*  Digit Entry
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_NintendoSwitch_Commands_DigitEntry_H
-#define PokemonAutomation_NintendoSwitch_Commands_DigitEntry_H
-
-#include "ClientSource/Connection/BotBase.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-
-
-void enter_digits_str   (BotBaseContext& context, uint8_t count, const char* digits);
-void enter_digits       (BotBaseContext& context, uint8_t count, const uint8_t* digits);
-
-
-
-
-}
-}
-#endif
diff --git a/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.cpp b/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.cpp
index db784b2fd4..4614183e44 100644
--- a/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.cpp
+++ b/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.cpp
@@ -1,234 +1,111 @@
 /*  Push Button Framework
  * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  * 
  */
 
-#include <sstream>
-#include "ClientSource/Libraries/MessageConverter.h"
-#include "NintendoSwitch_Commands_Device.h"
 #include "NintendoSwitch/NintendoSwitch_Settings.h"
 #include "NintendoSwitch_Commands_PushButtons.h"
-#include "NintendoSwitch_Messages_PushButtons.h"
+#include "NintendoSwitch_Commands_Superscalar.h"
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
 
 
-void pbf_wait(BotBaseContext& context, uint16_t ticks){
-    context.issue_request(
-        DeviceRequest_pbf_wait(ticks)
-    );
+void pbf_wait(ProControllerContext& context, Milliseconds duration){
+    ssf_do_nothing(context, duration);
 }
-void pbf_press_button(BotBaseContext& context, Button button, uint16_t hold_ticks, uint16_t release_ticks){
-    context.issue_request(
-        DeviceRequest_pbf_press_button(button, hold_ticks, release_ticks)
-    );
+void pbf_press_button(ProControllerContext& context, Button button, Milliseconds hold, Milliseconds release){
+    ssf_press_button(context, button, hold + release, hold, 0ms);
 }
-void pbf_press_dpad(BotBaseContext& context, DpadPosition position, uint16_t hold_ticks, uint16_t release_ticks){
-    context.issue_request(
-        DeviceRequest_pbf_press_dpad(position, hold_ticks, release_ticks)
-    );
+void pbf_press_dpad(ProControllerContext& context, DpadPosition position, Milliseconds hold, Milliseconds release){
+    ssf_press_dpad(context, position, hold + release, hold, 0ms);
 }
-void pbf_move_left_joystick(BotBaseContext& context, uint8_t x, uint8_t y, uint16_t hold_ticks, uint16_t release_ticks){
-    context.issue_request(
-        DeviceRequest_pbf_move_left_joystick(x, y, hold_ticks, release_ticks)
-    );
+void pbf_move_left_joystick(ProControllerContext& context, const JoystickPosition& position, Milliseconds hold, Milliseconds release){
+    ssf_press_left_joystick(context, position, hold + release, hold, 0ms);
 }
-void pbf_move_right_joystick(BotBaseContext& context, uint8_t x, uint8_t y, uint16_t hold_ticks, uint16_t release_ticks){
-    context.issue_request(
-        DeviceRequest_pbf_move_right_joystick(x, y, hold_ticks, release_ticks)
-    );
+void pbf_move_right_joystick(ProControllerContext& context, const JoystickPosition& position, Milliseconds hold, Milliseconds release){
+    ssf_press_right_joystick(context, position, hold + release, hold, 0ms);
 }
-void pbf_mash_button(BotBaseContext& context, Button button, uint16_t ticks){
-    context.issue_request(
-        DeviceRequest_pbf_mash_button(button, ticks)
-    );
+void pbf_mash_button(ProControllerContext& context, Button button, Milliseconds duration){
+    ssf_mash1_button(context, button, duration);
 }
 
-void start_program_flash(BotBaseContext& context, uint16_t ticks){
-    for (uint16_t c = 0; c < ticks; c += 50){
-        set_leds(context, true);
-        pbf_wait(context, 25);
-        set_leds(context, false);
-        pbf_wait(context, 25);
-    }
+void grip_menu_connect_go_home(ProControllerContext& context){
+    pbf_press_button(context, BUTTON_L | BUTTON_R, 80ms, 320ms);
+    pbf_press_button(context, BUTTON_A, 80ms, 1120ms);
+    pbf_press_button(context, BUTTON_HOME, 80ms, ConsoleSettings::instance().SETTINGS_TO_HOME_DELAY0);
 }
-void grip_menu_connect_go_home(BotBaseContext& context){
-    pbf_press_button(context, BUTTON_L | BUTTON_R, 10, 40);
-    pbf_press_button(context, BUTTON_A, 10, 140);
-    pbf_press_button(context, BUTTON_HOME, 10, ConsoleSettings::instance().SETTINGS_TO_HOME_DELAY);
-}
-
-// void pbf_controller_state(
-//     BotBaseContext& context,
-//     Button button,
-//     DpadPosition position,
-//     uint8_t left_x, uint8_t left_y,
-//     uint8_t right_x, uint8_t right_y,
-//     uint8_t ticks
-// ){
-//     context.issue_request(
-//         DeviceRequest_controller_state(button, position, left_x, left_y, right_x, right_y, ticks)
-//     );
-// }
 
 
 void pbf_controller_state(
-    BotBaseContext& context,
+    ProControllerContext& context,
     Button button,
     DpadPosition position,
-    uint8_t left_x, uint8_t left_y,
-    uint8_t right_x, uint8_t right_y,
-    uint16_t ticks
+    const JoystickPosition& left_joystick,
+    const JoystickPosition& right_joystick,
+    Milliseconds duration
 ){
-    // divide the controller state into smaller chunks of 255 ticks
-    while (ticks > 0){
-        uint16_t curr_ticks = std::min(ticks, (uint16_t)255);
-        context.issue_request(
-            DeviceRequest_controller_state(button, position, left_x, left_y, right_x, right_y, (uint8_t)curr_ticks)
-        );
-        ticks -= curr_ticks;
-    } // end while loop, and function 
+    context->issue_full_controller_state(
+        &context,
+        true,
+        duration,
+        button, position,
+        left_joystick,
+        right_joystick
+    );
 }
 
-std::string button_to_string(Button button){
-    std::string str;
-    if (button & BUTTON_Y) str += " BUTTON_Y ";
-    if (button & BUTTON_B) str += " BUTTON_B ";
-    if (button & BUTTON_A) str += " BUTTON_A ";
-    if (button & BUTTON_X) str += " BUTTON_X ";
-    if (button & BUTTON_L) str += " BUTTON_L ";
-    if (button & BUTTON_R) str += " BUTTON_R ";
-    if (button & BUTTON_ZL) str += " BUTTON_ZL ";
-    if (button & BUTTON_ZR) str += " BUTTON_ZR ";
-    if (button & BUTTON_MINUS) str += " BUTTON_MINUS ";
-    if (button & BUTTON_PLUS) str += " BUTTON_PLUS ";
-    if (button & BUTTON_LCLICK) str += " BUTTON_LCLICK ";
-    if (button & BUTTON_RCLICK) str += " BUTTON_RCLICK ";
-    if (button & BUTTON_HOME) str += " BUTTON_HOME ";
-    if (button & BUTTON_CAPTURE) str += " BUTTON_CAPTURE ";
-    return str;
-}
 
-std::string dpad_to_string(Button dpad){
-    switch (dpad){
-    case DPAD_UP            : return "DPAD_UP";
-    case DPAD_UP_RIGHT      : return "DPAD_UP_RIGHT";
-    case DPAD_RIGHT         : return "DPAD_RIGHT";
-    case DPAD_DOWN_RIGHT    : return "DPAD_DOWN_RIGHT";
-    case DPAD_DOWN          : return "DPAD_DOWN";
-    case DPAD_DOWN_LEFT     : return "DPAD_DOWN_LEFT";
-    case DPAD_LEFT          : return "DPAD_LEFT";
-    case DPAD_UP_LEFT       : return "DPAD_UP_LEFT";
-    case DPAD_NONE          : return "DPAD_NONE";
-    }
-    return "UNKNOWN_DPAD";
+
+
+void pbf_wait(JoyconContext& context, Milliseconds duration){
+    ssf_do_nothing(context, duration);
+}
+void pbf_press_button(JoyconContext& context, Button button, Milliseconds hold, Milliseconds release){
+    ssf_press_button(context, button, hold + release, hold, 0ms);
+}
+void pbf_move_joystick(JoyconContext& context, const JoystickPosition& position, Milliseconds hold, Milliseconds release){
+    ssf_press_joystick(context, position, hold + release, hold, 0ms);
+}
+void pbf_mash_button(JoyconContext& context, Button button, Milliseconds duration){
+    ssf_mash1_button(context, button, duration);
 }
 
-int register_message_converters_push_button_framework(){
-    register_message_converter(
-        PABB_MSG_COMMAND_PBF_WAIT,
-        [](const std::string& body){
-            std::ostringstream ss;
-            ss << "pbf_wait() - ";
-            if (body.size() != sizeof(pabb_pbf_wait)){ ss << "(invalid size)" << std::endl; return ss.str(); }
-            const auto* params = (const pabb_pbf_wait*)body.c_str();
-            ss << "seqnum = " << (uint64_t)params->seqnum;
-            ss << ", ticks = " << params->ticks;
-            return ss.str();
-        }
-    );
-    register_message_converter(
-        PABB_MSG_COMMAND_PBF_PRESS_BUTTON,
-        [](const std::string& body){
-            std::ostringstream ss;
-            ss << "pbf_press_button() - ";
-            if (body.size() != sizeof(pabb_pbf_press_button)){ ss << "(invalid size)" << std::endl; return ss.str(); }
-            const auto* params = (const pabb_pbf_press_button*)body.c_str();
-            ss << "seqnum = " << (uint64_t)params->seqnum;
-            ss << ", button = " << params->button << "(" << button_to_string(params->button) << ")";
-            ss << ", hold_ticks = " << params->hold_ticks;
-            ss << ", release_ticks = " << params->release_ticks;
-            return ss.str();
-        }
-    );
-    register_message_converter(
-        PABB_MSG_COMMAND_PBF_PRESS_DPAD,
-        [](const std::string& body){
-            std::ostringstream ss;
-            ss << "pbf_press_dpad() - ";
-            if (body.size() != sizeof(pabb_pbf_press_dpad)){ ss << "(invalid size)" << std::endl; return ss.str(); }
-            const auto* params = (const pabb_pbf_press_dpad*)body.c_str();
-            ss << "seqnum = " << (uint64_t)params->seqnum;
-            ss << ", dpad = " << (unsigned)params->dpad << "(" << dpad_to_string(params->dpad) << ")";
-            ss << ", hold_ticks = " << params->hold_ticks;
-            ss << ", release_ticks = " << params->release_ticks;
-            return ss.str();
-        }
-    );
-    register_message_converter(
-        PABB_MSG_COMMAND_PBF_MOVE_JOYSTICK_L,
-        [](const std::string& body){
-            std::ostringstream ss;
-            ss << "pbf_move_left_joystick() - ";
-            if (body.size() != sizeof(pabb_pbf_move_joystick)){ ss << "(invalid size)" << std::endl; return ss.str(); }
-            const auto* params = (const pabb_pbf_move_joystick*)body.c_str();
-            ss << "seqnum = " << (uint64_t)params->seqnum;
-            ss << ", x = " << (unsigned)params->x;
-            ss << ", y = " << (unsigned)params->y;
-            ss << ", hold_ticks = " << params->hold_ticks;
-            ss << ", release_ticks = " << params->release_ticks;
-            return ss.str();
-        }
-    );
-    register_message_converter(
-        PABB_MSG_COMMAND_PBF_MOVE_JOYSTICK_R,
-        [](const std::string& body){
-            std::ostringstream ss;
-            ss << "pbf_move_right_joystick() - ";
-            if (body.size() != sizeof(pabb_pbf_move_joystick)){ ss << "(invalid size)" << std::endl; return ss.str(); }
-            const auto* params = (const pabb_pbf_move_joystick*)body.c_str();
-            ss << "seqnum = " << (uint64_t)params->seqnum;
-            ss << ", x = " << (unsigned)params->x;
-            ss << ", y = " << (unsigned)params->y;
-            ss << ", hold_ticks = " << params->hold_ticks;
-            ss << ", release_ticks = " << params->release_ticks;
-            return ss.str();
-        }
-    );
-    register_message_converter(
-        PABB_MSG_COMMAND_MASH_BUTTON,
-        [](const std::string& body){
-            std::ostringstream ss;
-            ss << "pbf_mash_button() - ";
-            if (body.size() != sizeof(pabb_pbf_mash_button)){ ss << "(invalid size)" << std::endl; return ss.str(); }
-            const auto* params = (const pabb_pbf_mash_button*)body.c_str();
-            ss << "seqnum = " << (uint64_t)params->seqnum;
-            ss << ", button = " << params->button << "(" << button_to_string(params->button) << ")";
-            ss << ", ticks = " << params->ticks;
-            return ss.str();
-        }
-    );
-    register_message_converter(
-        PABB_MSG_CONTROLLER_STATE,
-        [](const std::string& body){
-            std::ostringstream ss;
-            ss << "controller_state() - ";
-            if (body.size() != sizeof(pabb_controller_state)){ ss << "(invalid size)" << std::endl; return ss.str(); }
-            const auto* params = (const pabb_controller_state*)body.c_str();
-            ss << "seqnum = " << (uint64_t)params->seqnum;
-            ss << ", button = " << params->button << "(" << button_to_string(params->button) << ")";
-            ss << ", dpad = " << (int)params->dpad;
-            ss << ", LJ = (" << (int)params->left_joystick_x << "," << (int)params->left_joystick_y << ")";
-            ss << ", RJ = (" << (int)params->right_joystick_x << "," << (int)params->right_joystick_y << ")";
-            ss << ", ticks = " << (int)params->ticks;
-            return ss.str();
-        }
+void pbf_controller_state(
+    JoyconContext& context,
+    Button button,
+    const JoystickPosition& joystick,
+    Milliseconds duration
+){
+    context->issue_full_controller_state(
+        &context,
+        true,
+        duration,
+        button,
+        joystick
     );
-    return 0;
 }
-int init_PushButtonFramework = register_message_converters_push_button_framework();
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
diff --git a/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h b/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h
index da02bb7a3e..c37ff14c9b 100644
--- a/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h
+++ b/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h
@@ -1,82 +1,117 @@
-/*  Push Button Framework
+/*  Push Button Framework (pbf_*)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  *  The functions to send Switch commands to the micro controller.
- *  The timing of the commnads are measured in ticks. One second is 125 ticks.
+ *  The timing of the commands are measured in milliseconds.
+ *
+ *  You should use these functions (instead of ssf_*) whenever possible since
+ *  these are cleaner and easier to use/understand.
+ *
  */
 
 #ifndef PokemonAutomation_NintendoSwitch_Commands_PushButtons_H
 #define PokemonAutomation_NintendoSwitch_Commands_PushButtons_H
 
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-#include "ClientSource/Connection/BotBase.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+#include "NintendoSwitch/Controllers/Joycon/NintendoSwitch_Joycon.h"
 
 namespace PokemonAutomation{
-//    class BotBaseContext;
 namespace NintendoSwitch{
 
-//  Block the current thread until all the Switch commands sent to the micro controller are executed.
-void pbf_wait                   (BotBaseContext& context, uint16_t ticks);
-//  Press a Switch controller button (excluding D-Pad). Hold the button for `hold_ticks`, then release it for `release_ticks`.
-//  The buttons are defined in Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h. Examples include BUTTON_A, BUTTON_ZL.
+
+using namespace std::chrono_literals;
+
+
+//  Wait for this duration on the Switch.
+void pbf_wait           (ProControllerContext& context, Milliseconds duration);
+
+//  Press a Switch controller button (excluding D-Pad). Hold the button for `hold`, then release it for `release`.
+//  The buttons are defined in NintendoSwitch/Controllers/NintendoSwitch_ControllerButtons.h. Examples include BUTTON_A, BUTTON_ZL.
 //  The buttons also include clicking joysticks: BUTTON_LCLICK, BUTTON_RCLICK.
 //  D-Pad buttons and directional movements of joysticks are controlled by separate functions.
-void pbf_press_button           (BotBaseContext& context, Button button, uint16_t hold_ticks, uint16_t release_ticks);
-//  Press a Switch controller D-Pad button. Hold the button for `hold_ticks`, then release it for `release_ticks`.
-//  The buttons are defined in Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h. Examples include DPAD_DOWN, DPAD_UP_RIGHT.
-void pbf_press_dpad             (BotBaseContext& context, DpadPosition position, uint16_t hold_ticks, uint16_t release_ticks);
-
-//  Move left joystick towards a 2D direction. Hold the direction for `hold_ticks`, then release it for `release_ticks`.
-//  The direction is specified by (x, y):
-//  x = 0 : left
-//  x = 128 : neutral
-//  x = 255 : right
-//  y = 0 : up
-//  y = 128 : neutral
-//  y = 255 : down
-//  Example: move the joystick fully left: (x, y) = (0, 128)
-//           move the joystick upper-right: (x, y) = (255, 0
-void pbf_move_left_joystick     (BotBaseContext& context, uint8_t x, uint8_t y, uint16_t hold_ticks, uint16_t release_ticks);
-//  Move right joystick towards a 2D direction. Hold the direction for `hold_ticks`, then release it for `release_ticks`.
-//  The direction is specified by (x, y):
-//  x = 0 : left
-//  x = 128 : neutral
-//  x = 255 : right
-//  y = 0 : up
-//  y = 128 : neutral
-//  y = 255 : down
-//  Example: move the joystick fully left: (x, y) = (0, 128)
-//           move the joystick upper-right: (x, y) = (255, 0
-void pbf_move_right_joystick    (BotBaseContext& context, uint8_t x, uint8_t y, uint16_t hold_ticks, uint16_t release_ticks);
-//  Mash a Switch controller button (excluding D-Pad) repeatedly for `ticks` ticks.
-//  The buttons are defined in Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h. Examples include BUTTON_A, BUTTON_ZL.
+void pbf_press_button       (ProControllerContext& context, Button button, Milliseconds hold, Milliseconds release);
+
+//  Press a Switch controller D-Pad button. Hold the button for `hold`, then release it for `release`.
+//  The buttons are defined in NintendoSwitch/Controllers/NintendoSwitch_ControllerButtons.h. Examples include DPAD_DOWN, DPAD_UP_RIGHT.
+void pbf_press_dpad     (ProControllerContext& context, DpadPosition position, Milliseconds hold, Milliseconds release);
+
+//  Move left joystick towards a 2D direction. Hold the direction for `hold`, then release it for `release`.
+//  The direction is specified by a JoystickPosition (x, y) with floating point values:
+//  x = -1 : left
+//  x = 0 : neutral
+//  x = +1 : right
+//  y = -1 : up
+//  y = 0 : neutral
+//  y = +1 : down
+//  Values outside of [-1, +1] are scaled back into the unit circle before being sent.
+//  Example: move the joystick fully left: (x, y) = (-1, 0)
+//           move the joystick upper-right: (x, y) = (+1, -1)
+void pbf_move_left_joystick     (ProControllerContext& context, const JoystickPosition& position, Milliseconds hold, Milliseconds release);
+
+//  Move right joystick towards a 2D direction. Hold the direction for `hold`, then release it for `release`.
+//  The direction is specified by a JoystickPosition (x, y) with floating point values:
+//  x = -1 : left
+//  x = 0 : neutral
+//  x = +1 : right
+//  y = -1 : up
+//  y = 0 : neutral
+//  y = +1 : down
+//  Values outside of [-1, +1] are scaled back into the unit circle before being sent.
+//  Example: move the joystick fully left: (x, y) = (-1, 0)
+//           move the joystick upper-right: (x, y) = (+1, -1)
+void pbf_move_right_joystick    (ProControllerContext& context, const JoystickPosition& position, Milliseconds hold, Milliseconds release);
+
+//  Mash a Switch controller button (excluding D-Pad) repeatedly for `duration`.
+//  The buttons are defined in NintendoSwitch/Controllers/NintendoSwitch_ControllerButtons.h. Examples include BUTTON_A, BUTTON_ZL.
 //  The buttons also include clicking joysticks: BUTTON_LCLICK, BUTTON_RCLICK.
-void pbf_mash_button            (BotBaseContext& context, Button button, uint16_t ticks);
+void pbf_mash_button            (ProControllerContext& context, Button button, Milliseconds duration);
+
+void grip_menu_connect_go_home  (ProControllerContext& context);
 
-void start_program_flash        (BotBaseContext& context, uint16_t ticks);
-void grip_menu_connect_go_home  (BotBaseContext& context);
 
-// void pbf_controller_state(
-//     BotBaseContext& context,
-//     Button button,
-//     DpadPosition position,
-//     uint8_t left_x, uint8_t left_y,
-//     uint8_t right_x, uint8_t right_y,
-//     uint8_t ticks
-// );
 
+//
+//  Press all the following buttons/joysticks simultaneously for the specified
+//  duration. No wait is added at the end. Thus you can issue these back-to-back
+//  to simulate buttons being pressed and released concurrently with other
+//  buttons being held down the whole time.
+//
+//  Note that this function does not play well with unfinished ssf_* functions.
+//  If there is a pending ssf_* function, a conflicting button press by this
+//  function (and possibly more) will be delayed - thus causing the buttons in
+//  this function call to not issue simultaneously. The exact behavior is
+//  undefined so you should never do this.
+//
+//  The sole purpose of this function is for keyboard commands. For in-program
+//  button overlapping, you should use ssf_* directly. (though lots of existing
+//  programs already use this for overlapping)
+//
 void pbf_controller_state(
-    BotBaseContext& context,
+    ProControllerContext& context,
     Button button,
     DpadPosition position,
-    uint8_t left_x, uint8_t left_y,
-    uint8_t right_x, uint8_t right_y,
-    uint16_t ticks
+    const JoystickPosition& left_joystick,
+    const JoystickPosition& right_joystick,
+    Milliseconds duration
 );
 
 
 
+
+void pbf_wait           (JoyconContext& context, Milliseconds duration);
+void pbf_press_button   (JoyconContext& context, Button button, Milliseconds hold, Milliseconds release);
+void pbf_move_joystick  (JoyconContext& context, const JoystickPosition& position, Milliseconds hold, Milliseconds release);
+void pbf_mash_button    (JoyconContext& context, Button button, Milliseconds duration);
+
+void pbf_controller_state(
+    JoyconContext& context,
+    Button button,
+    const JoystickPosition& joystick,
+    Milliseconds duration
+);
+
+
 }
 }
 #endif
diff --git a/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_Routines.cpp b/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_Routines.cpp
index 7f8c75f48e..f0d514dadf 100644
--- a/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_Routines.cpp
+++ b/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_Routines.cpp
@@ -1,43 +1,62 @@
 /*  General Routines
  * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  * 
  */
 
-#include <sstream>
-#include "ClientSource/Libraries/MessageConverter.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "NintendoSwitch/NintendoSwitch_Settings.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
 #include "NintendoSwitch_Commands_Routines.h"
-#include "NintendoSwitch_Messages_Routines.h"
+#include "NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch_Commands_Superscalar.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
 
 
-void close_game(BotBaseContext& context){
-    context.issue_request(
-        DeviceRequest_close_game()
-    );
+void close_game_from_home(ConsoleHandle& console, ProControllerContext& context){
+    ensure_at_home(console, context);
+
+    //  Use mashing to ensure that the X press succeeds. If it fails, the SR
+    //  will fail and can kill a den for the autohosts.
+
+    // this sequence will close the game from the home screen, 
+    // regardless of whether the game is initially open or closed.
+
+                                                    // if game initially open.  |  if game initially closed
+    pbf_mash_button(context, BUTTON_X, 100);        // - Close game.            |  - does nothing
+    ssf_press_dpad_ptv(context, DPAD_DOWN);         // - Does nothing.          |  - moves selector away from the closed game to avoid opening it.
+    ssf_press_dpad_ptv(context, DPAD_DOWN);         // - Does nothing.          |  - Press Down a second time in case we drop one.
+    pbf_mash_button(context, BUTTON_A, 50);         // - Confirm close game.    |  - opens an app on the home screen (e.g. Online)
+    go_home(console, context);                      // - Does nothing.          |  - goes back to home screen.
+
+    // fail-safe against button drops and unexpected error messages.
+    pbf_mash_button(context, BUTTON_X, 50);
+    pbf_mash_button(context, BUTTON_B, 350);
 }
 
+void close_game_from_home(ConsoleHandle& console, JoyconContext& context){
+    ensure_at_home(console, context);
+    //  Use mashing to ensure that the X press succeeds. If it fails, the SR
+    //  will fail and can kill a den for the autohosts.
+
+    // this sequence will close the game from the home screen, 
+    // regardless of whether the game is initially open or closed.
 
+                                                        // if game initially open.  |  if game initially closed
+    pbf_mash_button(context, BUTTON_X, 800ms);          // - Close game.            |  - does nothing
+    pbf_move_joystick(context, 128, 255, 100ms, 10ms);  // - Does nothing.          |  - moves selector away from the closed game to avoid opening it.
+    pbf_move_joystick(context, 128, 255, 100ms, 10ms);  // - Does nothing.          |  - Press Down a second time in case we drop one.
+    pbf_mash_button(context, BUTTON_A, 400ms);          // - Confirm close game.    |  - opens an app on the home screen (e.g. Online)
+    go_home(console, context);                          // - Does nothing.          |  - goes back to home screen.
 
-int register_message_converters_routines(){
-    register_message_converter(
-        PABB_MSG_COMMAND_CLOSE_GAME,
-        [](const std::string& body){
-            std::ostringstream ss;
-            ss << "close_game() - ";
-            if (body.size() != sizeof(pabb_close_game)){ ss << "(invalid size)" << std::endl; return ss.str(); }
-            const auto* params = (const pabb_close_game*)body.c_str();
-            ss << "seqnum = " << (uint64_t)params->seqnum;
-            return ss.str();
-        }
-    );
-    return 0;
+    // fail-safe against button drops and unexpected error messages.
+    pbf_mash_button(context, BUTTON_X, 400ms);
+    pbf_mash_button(context, BUTTON_B, 2000ms);
 }
-int init_NintendoSwitchRoutines = register_message_converters_routines();
 
 
 }
diff --git a/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_Routines.h b/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_Routines.h
index 0a6f7825b4..1beaedb553 100644
--- a/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_Routines.h
+++ b/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_Routines.h
@@ -1,19 +1,24 @@
 /*  General Routines
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifndef PokemonAutomation_NintendoSwitch_Commands_Routines_H
 #define PokemonAutomation_NintendoSwitch_Commands_Routines_H
 
-#include "ClientSource/Connection/BotBase.h"
+#include "CommonFramework/Tools/VideoStream.h"
+#include "NintendoSwitch/Controllers/NintendoSwitch_ProController.h"
+#include "NintendoSwitch/Controllers/NintendoSwitch_Joycon.h"
+#include "NintendoSwitch/NintendoSwitch_ConsoleHandle.h"
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
 
 
-void close_game(BotBaseContext& device);
+void close_game_from_home(ConsoleHandle& console, ProControllerContext& device);
+
+void close_game_from_home(ConsoleHandle& console, JoyconContext& device);
 
 
 
diff --git a/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_ScalarButtons.cpp b/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_ScalarButtons.cpp
deleted file mode 100644
index 5241fe49a0..0000000000
--- a/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_ScalarButtons.cpp
+++ /dev/null
@@ -1,245 +0,0 @@
-/*  Scalar Button Framework
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <sstream>
-#include "ClientSource/Libraries/MessageConverter.h"
-#include "NintendoSwitch_Commands_ScalarButtons.h"
-#include "NintendoSwitch_Messages_ScalarButtons.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-
-
-void ssf_flush_pipeline(BotBaseContext& context){
-    context.issue_request(
-        DeviceRequest_ssf_flush_pipeline()
-    );
-}
-void ssf_do_nothing(BotBaseContext& context, uint16_t ticks){
-    context.issue_request(
-        DeviceRequest_ssf_do_nothing(ticks)
-    );
-}
-
-
-
-void ssf_press_button(
-    BotBaseContext& context,
-    Button button,
-    uint16_t delay, uint16_t hold, uint8_t cool
-){
-    context.issue_request(
-        DeviceRequest_ssf_press_button(button, delay, hold, cool)
-    );
-}
-void ssf_press_dpad(
-    BotBaseContext& context,
-    DpadPosition position,
-    uint16_t delay, uint16_t hold, uint8_t cool
-){
-    context.issue_request(
-        DeviceRequest_ssf_press_dpad(position, delay, hold, cool)
-    );
-}
-void ssf_press_left_joystick(
-    BotBaseContext& context,
-    uint8_t x, uint8_t y,
-    uint16_t delay, uint16_t hold, uint8_t cool
-){
-    context.issue_request(
-        DeviceRequest_ssf_press_joystick(true, x, y, delay, hold, cool)
-    );
-}
-void ssf_press_right_joystick(
-    BotBaseContext& context,
-    uint8_t x, uint8_t y,
-    uint16_t delay, uint16_t hold, uint8_t cool
-){
-    context.issue_request(
-        DeviceRequest_ssf_press_joystick(false, x, y, delay, hold, cool)
-    );
-}
-
-
-
-void ssf_mash1_button(BotBaseContext& context, Button button, uint16_t ticks){
-    context.issue_request(
-        DeviceRequest_ssf_mash1_button(button, ticks)
-    );
-}
-void ssf_mash2_button(BotBaseContext& context, Button button0, Button button1, uint16_t ticks){
-    context.issue_request(
-        DeviceRequest_ssf_mash2_button(button0, button1, ticks)
-    );
-}
-void ssf_mash_AZs(BotBaseContext& context, uint16_t ticks){
-    context.issue_request(
-        DeviceRequest_ssf_mash_AZs(ticks)
-    );
-}
-void ssf_issue_scroll(
-    BotBaseContext& context,
-    ssf_ScrollDirection direction,
-    uint16_t delay, uint16_t hold, uint8_t cool
-){
-    context.issue_request(
-        DeviceRequest_ssf_issue_scroll(direction, delay, hold, cool)
-    );
-}
-
-
-
-
-
-
-int register_message_converters_ssf(){
-    register_message_converter(
-        PABB_MSG_COMMAND_SSF_FLUSH_PIPELINE,
-        [](const std::string& body){
-            std::ostringstream ss;
-            ss << "ssf_flush_pipeline() - ";
-            if (body.size() != sizeof(pabb_ssf_flush_pipeline)){ ss << "(invalid size)" << std::endl; return ss.str(); }
-            const auto* params = (const pabb_ssf_flush_pipeline*)body.c_str();
-            ss << "seqnum = " << (uint64_t)params->seqnum;
-            return ss.str();
-        }
-    );
-    register_message_converter(
-        PABB_MSG_COMMAND_SSF_DO_NOTHING,
-        [](const std::string& body){
-            std::ostringstream ss;
-            ss << "ssf_press_button() - ";
-            if (body.size() != sizeof(pabb_ssf_do_nothing)){ ss << "(invalid size)" << std::endl; return ss.str(); }
-            const auto* params = (const pabb_ssf_do_nothing*)body.c_str();
-            ss << "seqnum = " << (uint64_t)params->seqnum;
-            ss << ", ticks = " << params->ticks;
-            return ss.str();
-        }
-    );
-    register_message_converter(
-        PABB_MSG_COMMAND_SSF_PRESS_BUTTON,
-        [](const std::string& body){
-            std::ostringstream ss;
-            ss << "ssf_press_button() - ";
-            if (body.size() != sizeof(pabb_ssf_press_button)){ ss << "(invalid size)" << std::endl; return ss.str(); }
-            const auto* params = (const pabb_ssf_press_button*)body.c_str();
-            ss << "seqnum = " << (uint64_t)params->seqnum;
-            ss << ", button = " << params->button;
-            ss << ", delay = " << params->delay;
-            ss << ", hold = " << params->hold;
-            ss << ", cool = " << (int)params->cool;
-            return ss.str();
-        }
-    );
-    register_message_converter(
-        PABB_MSG_COMMAND_SSF_PRESS_DPAD,
-        [](const std::string& body){
-            std::ostringstream ss;
-            ss << "ssf_press_dpad() - ";
-            if (body.size() != sizeof(pabb_ssf_press_dpad)){ ss << "(invalid size)" << std::endl; return ss.str(); }
-            const auto* params = (const pabb_ssf_press_dpad*)body.c_str();
-            ss << "seqnum = " << (uint64_t)params->seqnum;
-            ss << ", position = " << (int)params->position;
-            ss << ", delay = " << params->delay;
-            ss << ", hold = " << params->hold;
-            ss << ", cool = " << (int)params->cool;
-            return ss.str();
-        }
-    );
-    register_message_converter(
-        PABB_MSG_COMMAND_SSF_PRESS_JOYSTICK_L,
-        [](const std::string& body){
-            std::ostringstream ss;
-            ss << "ssf_press_joystick(left) - ";
-            if (body.size() != sizeof(pabb_ssf_press_joystick)){ ss << "(invalid size)" << std::endl; return ss.str(); }
-            const auto* params = (const pabb_ssf_press_joystick*)body.c_str();
-            ss << "seqnum = " << (uint64_t)params->seqnum;
-            ss << ", x = " << (int)params->x;
-            ss << ", y = " << (int)params->y;
-            ss << ", delay = " << params->delay;
-            ss << ", hold = " << params->hold;
-            ss << ", cool = " << (int)params->cool;
-            return ss.str();
-        }
-    );
-    register_message_converter(
-        PABB_MSG_COMMAND_SSF_PRESS_JOYSTICK_R,
-        [](const std::string& body){
-            std::ostringstream ss;
-            ss << "ssf_press_joystick(right) - ";
-            if (body.size() != sizeof(pabb_ssf_press_joystick)){ ss << "(invalid size)" << std::endl; return ss.str(); }
-            const auto* params = (const pabb_ssf_press_joystick*)body.c_str();
-            ss << "seqnum = " << (uint64_t)params->seqnum;
-            ss << ", x = " << (int)params->x;
-            ss << ", y = " << (int)params->y;
-            ss << ", delay = " << params->delay;
-            ss << ", hold = " << params->hold;
-            ss << ", cool = " << (int)params->cool;
-            return ss.str();
-        }
-    );
-    register_message_converter(
-        PABB_MSG_COMMAND_SSF_MASH1_BUTTON,
-        [](const std::string& body){
-            std::ostringstream ss;
-            ss << "ssf_mash1_button() - ";
-            if (body.size() != sizeof(pabb_ssf_mash1_button)){ ss << "(invalid size)" << std::endl; return ss.str(); }
-            const auto* params = (const pabb_ssf_mash1_button*)body.c_str();
-            ss << "seqnum = " << (uint64_t)params->seqnum;
-            ss << ", button = " << (int)params->button;
-            ss << ", ticks = " << params->ticks;
-            return ss.str();
-        }
-    );
-    register_message_converter(
-        PABB_MSG_COMMAND_SSF_MASH2_BUTTON,
-        [](const std::string& body){
-            std::ostringstream ss;
-            ss << "ssf_mash2_button() - ";
-            if (body.size() != sizeof(pabb_ssf_mash2_button)){ ss << "(invalid size)" << std::endl; return ss.str(); }
-            const auto* params = (const pabb_ssf_mash2_button*)body.c_str();
-            ss << "seqnum = " << (uint64_t)params->seqnum;
-            ss << ", button0 = " << (int)params->button0;
-            ss << ", button1 = " << (int)params->button1;
-            ss << ", ticks = " << params->ticks;
-            return ss.str();
-        }
-    );
-    register_message_converter(
-        PABB_MSG_COMMAND_SSF_MASH_AZS,
-        [](const std::string& body){
-            std::ostringstream ss;
-            ss << "ssf_mash_AZs() - ";
-            if (body.size() != sizeof(pabb_ssf_mash_AZs)){ ss << "(invalid size)" << std::endl; return ss.str(); }
-            const auto* params = (const pabb_ssf_mash_AZs*)body.c_str();
-            ss << "seqnum = " << (uint64_t)params->seqnum;
-            ss << ", ticks = " << params->ticks;
-            return ss.str();
-        }
-    );
-    register_message_converter(
-        PABB_MSG_COMMAND_SSF_SCROLL,
-        [](const std::string& body){
-            std::ostringstream ss;
-            ss << "ssf_issue_scroll() - ";
-            if (body.size() != sizeof(pabb_ssf_issue_scroll)){ ss << "(invalid size)" << std::endl; return ss.str(); }
-            const auto* params = (const pabb_ssf_issue_scroll*)body.c_str();
-            ss << "seqnum = " << (uint64_t)params->seqnum;
-            ss << ", delay = " << params->delay;
-            ss << ", hold = " << params->hold;
-            ss << ", cool = " << (int)params->cool;
-            return ss.str();
-        }
-    );
-    return 0;
-}
-int init_ssf = register_message_converters_ssf();
-
-
-
-
-}
-}
diff --git a/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_ScalarButtons.h b/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_ScalarButtons.h
deleted file mode 100644
index b847dddd2d..0000000000
--- a/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_ScalarButtons.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*  Scalar Button Framework
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- *  Don't use these unless you know what you're doing and you really need to.
- *  These are hard to use and can cause unexpected behavior if used incorrectly.
- *
- */
-
-#ifndef PokemonAutomation_NintendoSwitch_Commands_ScalarButtons_H
-#define PokemonAutomation_NintendoSwitch_Commands_ScalarButtons_H
-
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-#include "ClientSource/Connection/BotBase.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-
-
-void ssf_flush_pipeline (BotBaseContext& context);
-void ssf_do_nothing     (BotBaseContext& context, uint16_t ticks);
-
-
-
-void ssf_press_button(
-    BotBaseContext& context,
-    Button button,
-    uint16_t delay, uint16_t hold = 5, uint8_t cool = 3
-);
-void ssf_press_dpad(
-    BotBaseContext& context,
-    DpadPosition position,
-    uint16_t delay, uint16_t hold = 5, uint8_t cool = 3
-);
-
-
-void ssf_press_left_joystick(
-    BotBaseContext& context,
-    uint8_t x, uint8_t y,
-    uint16_t delay, uint16_t hold, uint8_t cool = 0
-);
-void ssf_press_right_joystick(
-    BotBaseContext& context,
-    uint8_t x, uint8_t y,
-    uint16_t delay, uint16_t hold, uint8_t cool = 0
-);
-
-
-void ssf_mash1_button   (BotBaseContext& context, Button button, uint16_t ticks);
-void ssf_mash2_button   (BotBaseContext& context, Button button0, Button button1, uint16_t ticks);
-void ssf_mash_AZs       (BotBaseContext& context, uint16_t ticks);
-
-
-#define ssf_ScrollDirection     uint16_t
-#define SSF_SCROLL_UP           0   //  Diagonal scrolling seems to count as
-#define SSF_SCROLL_RIGHT        2   //  seperate events for each direction.
-#define SSF_SCROLL_DOWN         4
-#define SSF_SCROLL_LEFT         6
-void ssf_issue_scroll(
-    BotBaseContext& context,
-    ssf_ScrollDirection direction,
-    uint16_t delay, uint16_t hold = 5, uint8_t cool = 3
-);
-
-
-
-
-
-}
-}
-#endif
diff --git a/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.cpp b/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.cpp
new file mode 100644
index 0000000000..e0d5b3f2ba
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.cpp
@@ -0,0 +1,164 @@
+/*  Superscalar Framework
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+#include "NintendoSwitch_Commands_Superscalar.h"
+//#include "NintendoSwitch_Messages_Superscalar.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+
+void ssf_flush_pipeline(ProControllerContext& context){
+    context->issue_barrier(&context);
+}
+void ssf_do_nothing(ProControllerContext& context, Milliseconds duration){
+    context->issue_nop(&context, duration);
+}
+
+
+void ssf_press_button(
+    ProControllerContext& context,
+    Button button,
+    Milliseconds delay, Milliseconds hold, Milliseconds cool
+){
+    context->issue_buttons(&context, delay, hold, cool, button);
+}
+
+void ssf_press_dpad(
+    ProControllerContext& context,
+    DpadPosition position,
+    Milliseconds delay, Milliseconds hold, Milliseconds cool
+){
+    context->issue_dpad(&context, delay, hold, cool, position);
+}
+
+void ssf_press_left_joystick(
+    ProControllerContext& context,
+    const JoystickPosition& position,
+    Milliseconds delay, Milliseconds hold, Milliseconds cool
+){
+    context->issue_left_joystick(&context, delay, hold, cool, position);
+}
+
+void ssf_press_right_joystick(
+    ProControllerContext& context,
+    const JoystickPosition& position,
+    Milliseconds delay, Milliseconds hold, Milliseconds cool
+){
+    context->issue_right_joystick(&context, delay, hold, cool, position);
+}
+
+
+
+void ssf_mash1_button(ProControllerContext& context, Button button, Milliseconds duration){
+    context->issue_mash_button(&context, duration, button);
+}
+void ssf_mash2_button(ProControllerContext& context, Button button0, Button button1, Milliseconds duration){
+    context->issue_mash_button(&context, duration, button0, button1);
+}
+void ssf_mash_AZs(ProControllerContext& context, Milliseconds duration){
+    context->issue_mash_AZs(&context, duration);
+}
+void ssf_issue_scroll(
+    ProControllerContext& context,
+    DpadPosition direction,
+    uint16_t delay, uint16_t hold, uint8_t cool
+){
+    context->issue_system_scroll(
+        &context,
+        delay*8ms, hold*8ms, cool*8ms,
+        direction
+    );
+}
+void ssf_issue_scroll(
+    ProControllerContext& context,
+    DpadPosition direction,
+    Milliseconds delay
+){
+    context->issue_system_scroll(&context, delay, 2*delay, delay, direction);
+}
+void ssf_issue_scroll(
+    ProControllerContext& context,
+    DpadPosition direction,
+    Milliseconds delay, Milliseconds hold, Milliseconds cool
+){
+    context->issue_system_scroll(&context, delay, hold, cool, direction);
+}
+
+
+
+
+void ssf_flush_pipeline(JoyconContext& context){
+    context->issue_barrier(&context);
+}
+void ssf_do_nothing(JoyconContext& context, Milliseconds duration){
+    context->issue_nop(&context, duration);
+}
+void ssf_press_button(
+    JoyconContext& context,
+    Button button,
+    Milliseconds delay, Milliseconds hold, Milliseconds cool
+){
+    context->issue_buttons(&context, delay, hold, cool, button);
+}
+void ssf_press_joystick(
+    JoyconContext& context,
+    const JoystickPosition& position,
+    Milliseconds delay, Milliseconds hold, Milliseconds cool
+){
+    context->issue_joystick(&context, delay, hold, cool, position);
+}
+void ssf_mash1_button(JoyconContext& context, Button button, Milliseconds duration){
+    context->issue_mash_button(&context, button, duration);
+}
+void ssf_issue_scroll(
+    JoyconContext& context,
+    DpadPosition direction,
+    Milliseconds delay
+){
+    ssf_issue_scroll(context, direction, delay, 2*delay, delay);
+}
+void ssf_issue_scroll(
+    JoyconContext& context,
+    DpadPosition direction,
+    Milliseconds delay, Milliseconds hold, Milliseconds cool
+){
+    switch (direction){
+    case DpadPosition::DPAD_UP:
+        ssf_press_joystick(context, {0, +1}, delay, hold, cool);
+        break;
+    case DpadPosition::DPAD_UP_RIGHT:
+        ssf_press_joystick(context, {+1, +1}, delay, hold, cool);
+        break;
+    case DpadPosition::DPAD_RIGHT:
+        ssf_press_joystick(context, {+1, 0}, delay, hold, cool);
+        break;
+    case DpadPosition::DPAD_DOWN_RIGHT:
+        ssf_press_joystick(context, {+1, -1}, delay, hold, cool);
+        break;
+    case DpadPosition::DPAD_DOWN:
+        ssf_press_joystick(context, {0, -1}, delay, hold, cool);
+        break;
+    case DpadPosition::DPAD_DOWN_LEFT:
+        ssf_press_joystick(context, {-1, -1}, delay, hold, cool);
+        break;
+    case DpadPosition::DPAD_LEFT:
+        ssf_press_joystick(context, {-1, 0}, delay, hold, cool);
+        break;
+    case DpadPosition::DPAD_UP_LEFT:
+        ssf_press_joystick(context, {-1, +1}, delay, hold, cool);
+        break;
+    default:;
+    }
+}
+
+
+
+
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h b/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h
new file mode 100644
index 0000000000..f0fe641198
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h
@@ -0,0 +1,190 @@
+/*  Superscalar Framework (ssf_*)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  Don't use these unless you know what you're doing and you really need to.
+ *
+ *  If you don't understand how the state machine works, you will not be able
+ *  to properly use these functions.
+ *
+ *  Since the functionality here used to be internal-only, documentation remains
+ *  sparse for now and slated to be expanded in the future.
+ *
+ */
+
+#ifndef PokemonAutomation_NintendoSwitch_Commands_Superscalar_H
+#define PokemonAutomation_NintendoSwitch_Commands_Superscalar_H
+
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+#include "NintendoSwitch/Controllers/Joycon/NintendoSwitch_Joycon.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+using namespace std::chrono_literals;
+
+
+void ssf_flush_pipeline (ProControllerContext& context);
+void ssf_do_nothing     (ProControllerContext& context, Milliseconds duration);
+
+
+void ssf_press_button(
+    ProControllerContext& context,
+    Button button,
+    Milliseconds delay = 24ms, Milliseconds hold = 48ms, Milliseconds cool = 24ms
+);
+void ssf_press_dpad(
+    ProControllerContext& context,
+    DpadPosition position,
+    Milliseconds delay, Milliseconds hold = 48ms, Milliseconds cool = 24ms
+);
+
+
+void ssf_press_left_joystick(
+    ProControllerContext& context,
+    const JoystickPosition& position,
+    Milliseconds delay, Milliseconds hold, Milliseconds cool = 0ms
+);
+void ssf_press_right_joystick(
+    ProControllerContext& context,
+    const JoystickPosition& position,
+    Milliseconds delay, Milliseconds hold, Milliseconds cool = 0ms
+);
+
+
+void ssf_mash1_button   (ProControllerContext& context, Button button, Milliseconds duration);
+void ssf_mash2_button   (ProControllerContext& context, Button button0, Button button1, Milliseconds duration);
+void ssf_mash_AZs       (ProControllerContext& context, Milliseconds duration);
+
+
+//  Diagonal scrolling seems to count as seperate events for each direction.
+//  In other words, they don't work.
+#define SSF_SCROLL_UP           DPAD_UP
+#define SSF_SCROLL_RIGHT        DPAD_RIGHT
+#define SSF_SCROLL_DOWN         DPAD_DOWN
+#define SSF_SCROLL_LEFT         DPAD_LEFT
+void ssf_issue_scroll(
+    ProControllerContext& context,
+    DpadPosition direction,
+    Milliseconds delay
+);
+void ssf_issue_scroll(
+    ProControllerContext& context,
+    DpadPosition direction,
+    Milliseconds delay, Milliseconds hold, Milliseconds cool
+);
+
+
+
+
+
+//
+//  ptv = plus timing variation
+//
+//  These are simple wrappers that add "context->timing_variation()" to
+//  every timing. Mostly intended for Switch menu navigation where we usually
+//  attempt fast movements.
+//
+inline void ssf_press_button_ptv(
+    ProControllerContext& context,
+    Button button,
+    Milliseconds delay = 24ms
+){
+    Milliseconds tv = context->timing_variation();
+    if (delay > 0ms) delay += tv;
+    ssf_press_button(context, button, delay);
+}
+inline void ssf_press_button_ptv(
+    ProControllerContext& context,
+    Button button,
+    Milliseconds delay,
+    Milliseconds hold,
+    Milliseconds cool = 24ms
+){
+    Milliseconds tv = context->timing_variation();
+    if (delay > 0ms) delay += tv;
+    if (hold > 0ms) hold += tv;
+    if (cool > 0ms) cool += tv;
+    ssf_press_button(context, button, delay, hold, cool);
+}
+inline void ssf_press_dpad_ptv(
+    ProControllerContext& context,
+    DpadPosition position,
+    Milliseconds delay = 24ms
+){
+    Milliseconds tv = context->timing_variation();
+    if (delay > 0ms) delay += tv;
+    ssf_press_dpad(context, position, delay);
+}
+inline void ssf_press_dpad_ptv(
+    ProControllerContext& context,
+    DpadPosition position,
+    Milliseconds delay,
+    Milliseconds hold,
+    Milliseconds cool = 24ms
+){
+    Milliseconds tv = context->timing_variation();
+    if (delay > 0ms) delay += tv;
+    if (hold > 0ms) hold += tv;
+    if (cool > 0ms) cool += tv;
+    ssf_press_dpad(context, position, delay, hold, cool);
+}
+inline void ssf_issue_scroll_ptv(
+    ProControllerContext& context,
+    DpadPosition direction,
+    Milliseconds delay = 24ms
+){
+    Milliseconds tv = context->timing_variation();
+    if (delay > 0ms) delay += tv;
+    ssf_issue_scroll(context, direction, delay);
+}
+inline void ssf_issue_scroll_ptv(
+    ProControllerContext& context,
+    DpadPosition direction,
+    Milliseconds delay,
+    Milliseconds hold,
+    Milliseconds cool = 24ms
+){
+    Milliseconds tv = context->timing_variation();
+    if (delay > 0ms) delay += tv;
+    if (hold > 0ms) hold += tv;
+    ssf_issue_scroll(context, direction, delay, hold, cool);
+}
+
+
+
+
+
+
+void ssf_flush_pipeline (JoyconContext& context);
+void ssf_do_nothing     (JoyconContext& context, Milliseconds duration);
+void ssf_press_button(
+    JoyconContext& context,
+    Button button,
+    Milliseconds delay, Milliseconds hold = 48ms, Milliseconds cool = 24ms
+);
+void ssf_press_joystick(
+    JoyconContext& context,
+    const JoystickPosition& position,
+    Milliseconds delay, Milliseconds hold, Milliseconds cool = 0ms
+);
+void ssf_mash1_button   (JoyconContext& context, Button button, Milliseconds duration);
+void ssf_issue_scroll(
+    JoyconContext& context,
+    DpadPosition direction,
+    Milliseconds delay
+);
+void ssf_issue_scroll(
+    JoyconContext& context,
+    DpadPosition direction,
+    Milliseconds delay, Milliseconds hold, Milliseconds cool
+);
+
+
+
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Messages_Device.h b/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Messages_Device.h
deleted file mode 100644
index 7a7a85fc8c..0000000000
--- a/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Messages_Device.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*  Device Functions
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_NintendoSwitch_Messages_Device_H
-#define PokemonAutomation_NintendoSwitch_Messages_Device_H
-
-#include "Common/Microcontroller/MessageProtocol.h"
-#include "ClientSource/Connection/BotBaseMessage.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-
-
-class DeviceRequest_system_clock : public BotBaseRequest{
-public:
-    pabb_system_clock params;
-    DeviceRequest_system_clock()
-        : BotBaseRequest(false)
-    {
-        params.seqnum = 0;
-    }
-    virtual BotBaseMessage message() const override{
-        return BotBaseMessage(PABB_MSG_REQUEST_CLOCK, params);
-    }
-};
-class DeviceRequest_set_leds : public BotBaseRequest{
-public:
-    pabb_MsgCommandSetLeds params;
-    DeviceRequest_set_leds(bool on)
-        : BotBaseRequest(true)
-    {
-        params.seqnum = 0;
-        params.on = on;
-    }
-    virtual BotBaseMessage message() const override{
-        return BotBaseMessage(PABB_MSG_COMMAND_SET_LED_STATE, params);
-    }
-};
-class DeviceRequest_end_program_callback : public BotBaseRequest{
-public:
-    pabb_end_program_callback params;
-    DeviceRequest_end_program_callback()
-        : BotBaseRequest(true)
-    {
-        params.seqnum = 0;
-    }
-    virtual BotBaseMessage message() const override{
-        return BotBaseMessage(PABB_MSG_COMMAND_END_PROGRAM_CALLBACK, params);
-    }
-};
-
-
-
-}
-}
-#endif
diff --git a/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Messages_DigitEntry.h b/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Messages_DigitEntry.h
deleted file mode 100644
index 9b3c54a51b..0000000000
--- a/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Messages_DigitEntry.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*  Digit Entry
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_NintendoSwitch_Messages_DigitEntry_H
-#define PokemonAutomation_NintendoSwitch_Messages_DigitEntry_H
-
-#include <string.h>
-#include "Common/NintendoSwitch/NintendoSwitch_Protocol_DigitEntry.h"
-#include "ClientSource/Connection/BotBaseMessage.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-
-
-class DeviceRequest_enter_digits : public BotBaseRequest{
-public:
-    pabb_enter_digits params;
-    DeviceRequest_enter_digits(uint8_t count, const uint8_t* digits)
-        : BotBaseRequest(true)
-    {
-        params.count = count;
-        memset(params.digit_pairs, 0, sizeof(params.digit_pairs));
-        for (uint8_t c = 0; c < count; c++){
-            params.digit_pairs[c/2] |= convert_digit(digits[c]) << 4 * (c & 1);
-        }
-    }
-    virtual BotBaseMessage message() const override{
-        return BotBaseMessage(PABB_MSG_COMMAND_ENTER_DIGITS, params);
-    }
-private:
-    static uint8_t convert_digit(uint8_t digit){
-        if (digit >= '0'){
-            digit -= '0';
-        }
-        if (digit > 9){
-            digit = 0;
-        }
-        return digit;
-    }
-};
-
-
-
-}
-}
-#endif
diff --git a/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Messages_PushButtons.h b/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Messages_PushButtons.h
deleted file mode 100644
index e6ce6e438c..0000000000
--- a/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Messages_PushButtons.h
+++ /dev/null
@@ -1,140 +0,0 @@
-/*  Push Button Framework
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_NintendoSwitch_Messages_PushButtons_H
-#define PokemonAutomation_NintendoSwitch_Messages_PushButtons_H
-
-#include "Common/NintendoSwitch/NintendoSwitch_Protocol_PushButtons.h"
-#include "ClientSource/Connection/BotBaseMessage.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-
-
-class DeviceRequest_pbf_wait : public BotBaseRequest{
-public:
-    pabb_pbf_wait params;
-    DeviceRequest_pbf_wait(uint16_t ticks)
-        : BotBaseRequest(true)
-    {
-        params.seqnum = 0;
-        params.ticks = ticks;
-    }
-    virtual BotBaseMessage message() const override{
-        return BotBaseMessage(PABB_MSG_COMMAND_PBF_WAIT, params);
-    }
-};
-class DeviceRequest_pbf_press_button : public BotBaseRequest{
-public:
-    pabb_pbf_press_button params;
-    DeviceRequest_pbf_press_button(Button button, uint16_t hold_ticks, uint16_t release_ticks)
-        : BotBaseRequest(true)
-    {
-        params.seqnum = 0;
-        params.button = button;
-        params.hold_ticks = hold_ticks;
-        params.release_ticks = release_ticks;
-    }
-    virtual BotBaseMessage message() const override{
-        return BotBaseMessage(PABB_MSG_COMMAND_PBF_PRESS_BUTTON, params);
-    }
-};
-class DeviceRequest_pbf_press_dpad : public BotBaseRequest{
-public:
-    pabb_pbf_press_dpad params;
-    DeviceRequest_pbf_press_dpad(DpadPosition position, uint16_t hold_ticks, uint16_t release_ticks)
-        : BotBaseRequest(true)
-    {
-        params.seqnum = 0;
-        params.dpad = position;
-        params.hold_ticks = hold_ticks;
-        params.release_ticks = release_ticks;
-    }
-    virtual BotBaseMessage message() const override{
-        return BotBaseMessage(PABB_MSG_COMMAND_PBF_PRESS_DPAD, params);
-    }
-};
-class DeviceRequest_pbf_move_left_joystick : public BotBaseRequest{
-public:
-    pabb_pbf_move_joystick params;
-    DeviceRequest_pbf_move_left_joystick(uint8_t x, uint8_t y, uint16_t hold_ticks, uint16_t release_ticks)
-        : BotBaseRequest(true)
-    {
-        params.seqnum = 0;
-        params.x = x;
-        params.y = y;
-        params.hold_ticks = hold_ticks;
-        params.release_ticks = release_ticks;
-    }
-    virtual BotBaseMessage message() const override{
-        return BotBaseMessage(PABB_MSG_COMMAND_PBF_MOVE_JOYSTICK_L, params);
-    }
-};
-class DeviceRequest_pbf_move_right_joystick : public BotBaseRequest{
-public:
-    pabb_pbf_move_joystick params;
-    DeviceRequest_pbf_move_right_joystick(uint8_t x, uint8_t y, uint16_t hold_ticks, uint16_t release_ticks)
-        : BotBaseRequest(true)
-    {
-        params.seqnum = 0;
-        params.x = x;
-        params.y = y;
-        params.hold_ticks = hold_ticks;
-        params.release_ticks = release_ticks;
-    }
-    virtual BotBaseMessage message() const override{
-        return BotBaseMessage(PABB_MSG_COMMAND_PBF_MOVE_JOYSTICK_R, params);
-    }
-};
-class DeviceRequest_pbf_mash_button : public BotBaseRequest{
-public:
-    pabb_pbf_mash_button params;
-    DeviceRequest_pbf_mash_button(Button button, uint16_t ticks)
-        : BotBaseRequest(true)
-    {
-        params.seqnum = 0;
-        params.button = button;
-        params.ticks = ticks;
-    }
-    virtual BotBaseMessage message() const override{
-        return BotBaseMessage(PABB_MSG_COMMAND_MASH_BUTTON, params);
-    }
-};
-
-
-class DeviceRequest_controller_state : public BotBaseRequest{
-public:
-    pabb_controller_state params;
-    DeviceRequest_controller_state(
-        Button button,
-        DpadPosition dpad,
-        uint8_t left_joystick_x,
-        uint8_t left_joystick_y,
-        uint8_t right_joystick_x,
-        uint8_t right_joystick_y,
-        uint8_t ticks
-    )
-        : BotBaseRequest(true)
-    {
-        params.seqnum = 0;
-        params.button = button;
-        params.dpad = dpad;
-        params.left_joystick_x = left_joystick_x;
-        params.left_joystick_y = left_joystick_y;
-        params.right_joystick_x = right_joystick_x;
-        params.right_joystick_y = right_joystick_y;
-        params.ticks = ticks;
-    }
-    virtual BotBaseMessage message() const override{
-        return BotBaseMessage(PABB_MSG_CONTROLLER_STATE, params);
-    }
-};
-
-
-
-}
-}
-#endif
diff --git a/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Messages_Routines.h b/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Messages_Routines.h
deleted file mode 100644
index f6ac21d518..0000000000
--- a/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Messages_Routines.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*  General Routines
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_NintendoSwitch_Messages_Routines_H
-#define PokemonAutomation_NintendoSwitch_Messages_Routines_H
-
-#include "Common/NintendoSwitch/NintendoSwitch_Protocol_Routines.h"
-#include "ClientSource/Connection/BotBaseMessage.h"
-#include "NintendoSwitch_Commands_Routines.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-
-
-class DeviceRequest_close_game : public BotBaseRequest{
-public:
-    pabb_close_game params;
-    DeviceRequest_close_game()
-        : BotBaseRequest(true)
-    {
-        params.seqnum = 0;
-    }
-    virtual BotBaseMessage message() const override{
-        return BotBaseMessage(PABB_MSG_COMMAND_CLOSE_GAME, params);
-    }
-};
-
-
-}
-}
-#endif
diff --git a/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Messages_ScalarButtons.h b/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Messages_ScalarButtons.h
deleted file mode 100644
index ea9ce60ee7..0000000000
--- a/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Messages_ScalarButtons.h
+++ /dev/null
@@ -1,181 +0,0 @@
-/*  Scalar Button Framework
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_NintendoSwitch_Messages_ScalarButtons_H
-#define PokemonAutomation_NintendoSwitch_Messages_ScalarButtons_H
-
-#include "Common/NintendoSwitch/NintendoSwitch_Protocol_ScalarButtons.h"
-#include "ClientSource/Connection/BotBaseMessage.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-
-
-
-class DeviceRequest_ssf_flush_pipeline : public BotBaseRequest{
-public:
-    pabb_ssf_flush_pipeline params;
-    DeviceRequest_ssf_flush_pipeline()
-        : BotBaseRequest(true)
-    {
-        params.seqnum = 0;
-    }
-    virtual BotBaseMessage message() const override{
-        return BotBaseMessage(PABB_MSG_COMMAND_SSF_FLUSH_PIPELINE, params);
-    }
-};
-class DeviceRequest_ssf_do_nothing : public BotBaseRequest{
-public:
-    pabb_ssf_do_nothing params;
-    DeviceRequest_ssf_do_nothing(uint16_t ticks)
-        : BotBaseRequest(true)
-    {
-        params.seqnum = 0;
-        params.ticks = ticks;
-    }
-    virtual BotBaseMessage message() const override{
-        return BotBaseMessage(PABB_MSG_COMMAND_SSF_DO_NOTHING, params);
-    }
-};
-class DeviceRequest_ssf_press_button : public BotBaseRequest{
-public:
-    pabb_ssf_press_button params;
-    DeviceRequest_ssf_press_button(
-        Button button,
-        uint16_t delay,
-        uint16_t hold,
-        uint8_t cool
-    )
-        : BotBaseRequest(true)
-    {
-        params.seqnum = 0;
-        params.button = button;
-        params.delay = delay;
-        params.hold = hold;
-        params.cool = cool;
-    }
-    virtual BotBaseMessage message() const override{
-        return BotBaseMessage(PABB_MSG_COMMAND_SSF_PRESS_BUTTON, params);
-    }
-};
-class DeviceRequest_ssf_press_dpad : public BotBaseRequest{
-public:
-    pabb_ssf_press_dpad params;
-    DeviceRequest_ssf_press_dpad(
-        DpadPosition position,
-        uint16_t delay,
-        uint16_t hold,
-        uint8_t cool
-    )
-        : BotBaseRequest(true)
-    {
-        params.seqnum = 0;
-        params.position = position;
-        params.delay = delay;
-        params.hold = hold;
-        params.cool = cool;
-    }
-    virtual BotBaseMessage message() const override{
-        return BotBaseMessage(PABB_MSG_COMMAND_SSF_PRESS_DPAD, params);
-    }
-};
-class DeviceRequest_ssf_press_joystick : public BotBaseRequest{
-public:
-    pabb_ssf_press_joystick params;
-    bool left;
-    DeviceRequest_ssf_press_joystick(
-        bool p_left,
-        uint8_t x, uint8_t y,
-        uint16_t delay,
-        uint16_t hold,
-        uint8_t cool
-    )
-        : BotBaseRequest(true)
-        , left(p_left)
-    {
-        params.seqnum = 0;
-        params.x = x;
-        params.y = y;
-        params.delay = delay;
-        params.hold = hold;
-        params.cool = cool;
-    }
-    virtual BotBaseMessage message() const override{
-        return BotBaseMessage(
-            left ? PABB_MSG_COMMAND_SSF_PRESS_JOYSTICK_L : PABB_MSG_COMMAND_SSF_PRESS_JOYSTICK_R,
-            params
-        );
-    }
-};
-class DeviceRequest_ssf_mash1_button : public BotBaseRequest{
-public:
-    pabb_ssf_mash1_button params;
-    DeviceRequest_ssf_mash1_button(Button button, uint16_t ticks)
-        : BotBaseRequest(true)
-    {
-        params.seqnum = 0;
-        params.button = button;
-        params.ticks = ticks;
-    }
-    virtual BotBaseMessage message() const override{
-        return BotBaseMessage(PABB_MSG_COMMAND_SSF_MASH1_BUTTON, params);
-    }
-};
-class DeviceRequest_ssf_mash2_button : public BotBaseRequest{
-public:
-    pabb_ssf_mash2_button params;
-    DeviceRequest_ssf_mash2_button(Button button0, Button button1, uint16_t ticks)
-        : BotBaseRequest(true)
-    {
-        params.seqnum = 0;
-        params.button0 = button0;
-        params.button1 = button1;
-        params.ticks = ticks;
-    }
-    virtual BotBaseMessage message() const override{
-        return BotBaseMessage(PABB_MSG_COMMAND_SSF_MASH2_BUTTON, params);
-    }
-};
-class DeviceRequest_ssf_mash_AZs : public BotBaseRequest{
-public:
-    pabb_ssf_mash_AZs params;
-    DeviceRequest_ssf_mash_AZs(uint16_t ticks)
-        : BotBaseRequest(true)
-    {
-        params.seqnum = 0;
-        params.ticks = ticks;
-    }
-    virtual BotBaseMessage message() const override{
-        return BotBaseMessage(PABB_MSG_COMMAND_SSF_MASH_AZS, params);
-    }
-};
-class DeviceRequest_ssf_issue_scroll : public BotBaseRequest{
-public:
-    pabb_ssf_issue_scroll params;
-    DeviceRequest_ssf_issue_scroll(
-        ssf_ScrollDirection direction,
-        uint16_t delay,
-        uint16_t hold,
-        uint8_t cool
-    )
-        : BotBaseRequest(true)
-    {
-        params.seqnum = 0;
-        params.direction = direction;
-        params.delay = delay;
-        params.hold = hold;
-        params.cool = cool;
-    }
-    virtual BotBaseMessage message() const override{
-        return BotBaseMessage(PABB_MSG_COMMAND_SSF_SCROLL, params);
-    }
-};
-
-
-
-}
-}
-#endif
diff --git a/SerialPrograms/Source/NintendoSwitch/Controllers/Joycon/NintendoSwitch_Joycon.cpp b/SerialPrograms/Source/NintendoSwitch/Controllers/Joycon/NintendoSwitch_Joycon.cpp
new file mode 100644
index 0000000000..58c2f474f5
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Controllers/Joycon/NintendoSwitch_Joycon.cpp
@@ -0,0 +1,175 @@
+/*  Nintendo Switch Joycon
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Strings/StringTools.h"
+#include "Common/Cpp/Containers/Pimpl.tpp"
+#include "ControllerInput/ControllerInput.h"
+#include "ControllerInput/Keyboard/KeyboardInput_State.h"
+#include "Controllers/RumbleListener.h"
+#include "NintendoSwitch/NintendoSwitch_Settings.h"
+#include "NintendoSwitch/Controllers/NintendoSwitch_VirtualControllerState.h"
+#include "NintendoSwitch_JoyconState.h"
+#include "NintendoSwitch_Joycon.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+using namespace std::chrono_literals;
+
+
+const char JoyconController::NAME[] = "Nintendo Switch: Joycon";
+const char LeftJoycon::NAME[] = "Nintendo Switch: Left Joycon";
+const char RightJoycon::NAME[] = "Nintendo Switch: Right Joycon";
+
+
+
+struct JoyconController::Data{
+    ListenerSet<RumbleListener> m_rumble_listeners;
+    std::map<KeyboardKey, JoyconDeltas> m_keyboard_mapping;
+};
+
+
+
+void JoyconController::add_listener(RumbleListener& listener){
+    m_data->m_rumble_listeners.add(listener);
+}
+void JoyconController::remove_listener(RumbleListener& listener){
+    m_data->m_rumble_listeners.remove(listener);
+}
+
+
+
+
+JoyconController::JoyconController(Logger& logger, ControllerClass controller_class)
+    : m_data(CONSTRUCT_TOKEN)
+{
+    std::vector<std::shared_ptr<EditableTableRow>> mapping =
+        controller_class == ControllerClass::NintendoSwitch_LeftJoycon
+            ? ConsoleSettings::instance().KEYBOARD_MAPPINGS.LEFT_JOYCON2.current_refs()
+            : ConsoleSettings::instance().KEYBOARD_MAPPINGS.RIGHT_JOYCON2.current_refs();
+
+    for (const auto& deltas : mapping){
+        const JoyconFromKeyboardTableRow& row = static_cast<const JoyconFromKeyboardTableRow&>(*deltas);
+        m_data->m_keyboard_mapping[row.key] += row.snapshot();
+    }
+}
+JoyconController::~JoyconController(){
+}
+
+
+
+
+
+bool JoyconController::run_string_command(Milliseconds duration, const std::string& command){
+    //  stop
+    //  replace
+    //  wait
+    //  A,B
+    //  A,B|JS:+0.5:-0.5
+
+    std::vector<std::string> tokens = StringTools::split(command, "|");
+    if (tokens.empty()){
+        return false;
+    }
+
+    if (tokens[0] == "stop"){
+        cancel_all_commands();
+        return true;
+    }
+    if (tokens[0] == "replace"){
+        replace_on_next_command();
+        return true;
+    }
+    if (tokens[0] == "wait"){
+        issue_nop(nullptr, duration);
+        return true;
+    }
+
+    JoyconState state;
+
+    for (const std::string& token : tokens){
+        if (token.starts_with("JS")){
+            std::vector<std::string> args = StringTools::split(token, ":");
+            if (args.size() != 3){
+                return false;
+            }
+            state.joystick.x = std::atof(args[1].data());
+            state.joystick.y = std::atof(args[2].data());
+            continue;
+        }
+        state.buttons |= string_to_button(token, ",");
+    }
+
+    state.execute(nullptr, true, *this, duration);
+
+    return true;
+}
+
+
+void JoyconController::run_controller_input(const ControllerInputState& state){
+
+    if (state.type() != ControllerInputType::HID_Keyboard){
+        return;
+    }
+
+    JoyconDeltas deltas;
+
+    const KeyboardInputState& lstate = static_cast<const KeyboardInputState&>(state);
+    const std::map<KeyboardKey, JoyconDeltas>& map = m_data->m_keyboard_mapping;
+
+//    cout << "keys() = " << lstate.keys().size() << endl;
+
+    for (KeyboardKey key : lstate.keys()){
+        auto iter = map.find(key);
+        if (iter != map.end()){
+            deltas += iter->second;
+        }
+    }
+
+    JoyconState controller_state;
+    deltas.to_state(controller_state);
+
+    WallClock timestamp;
+    if (controller_state.is_neutral()){
+        timestamp = current_time();
+        cancel_all_commands();
+    }else{
+        replace_on_next_command();
+
+        timestamp = current_time();
+        controller_state.execute(nullptr, false, *this, 2000ms);
+    }
+
+    on_command_input(timestamp, controller_state);
+}
+
+
+void JoyconController::on_rumble(double magnitude){
+    m_data->m_rumble_listeners.run_method(&RumbleListener::on_rumble, magnitude);
+}
+
+
+
+
+
+
+ControllerClass LeftJoycon::controller_class() const noexcept{
+    return ControllerClass::NintendoSwitch_LeftJoycon;
+}
+ControllerClass RightJoycon::controller_class() const noexcept{
+    return ControllerClass::NintendoSwitch_RightJoycon;
+}
+
+
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/NintendoSwitch/Controllers/Joycon/NintendoSwitch_Joycon.h b/SerialPrograms/Source/NintendoSwitch/Controllers/Joycon/NintendoSwitch_Joycon.h
new file mode 100644
index 0000000000..64bcc48a85
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Controllers/Joycon/NintendoSwitch_Joycon.h
@@ -0,0 +1,236 @@
+/*  Nintendo Switch Joycon
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_NintendoSwitch_Joycon_H
+#define PokemonAutomation_NintendoSwitch_Joycon_H
+
+#include "Common/Cpp/Containers/Pimpl.h"
+#include "Controllers/Joystick.h"
+#include "Controllers/ControllerTypes.h"
+#include "Controllers/Controller.h"
+#include "NintendoSwitch/Controllers/NintendoSwitch_ControllerButtons.h"
+
+namespace PokemonAutomation{
+
+struct RumbleListener;
+
+namespace NintendoSwitch{
+
+
+class JoyconController;
+using JoyconContext = ControllerContext<JoyconController>;
+
+
+
+static constexpr Button VALID_LEFT_JOYCON_BUTTONS =
+    BUTTON_DOWN |
+    BUTTON_UP |
+    BUTTON_RIGHT |
+    BUTTON_LEFT |
+    BUTTON_LEFT_SR |
+    BUTTON_LEFT_SL |
+    BUTTON_L |
+    BUTTON_ZL |
+    BUTTON_MINUS |
+    BUTTON_LCLICK |
+    BUTTON_CAPTURE;
+
+static constexpr Button VALID_RIGHT_JOYCON_BUTTONS =
+    BUTTON_Y |
+    BUTTON_X |
+    BUTTON_B |
+    BUTTON_A |
+    BUTTON_RIGHT_SR |
+    BUTTON_RIGHT_SL |
+    BUTTON_R |
+    BUTTON_ZR |
+    BUTTON_PLUS |
+    BUTTON_RCLICK |
+    BUTTON_HOME |
+    BUTTON_C;
+
+
+
+
+
+class JoyconController : public AbstractController{
+public:
+    using ContextType = JoyconContext;
+
+    void add_listener(RumbleListener& listener);
+    void remove_listener(RumbleListener& listener);
+
+
+public:
+    JoyconController(Logger& logger, ControllerClass controller_class);
+    virtual ~JoyconController();
+
+
+public:
+    static const char NAME[];
+    virtual const char* name() override{
+        return NAME;
+    };
+
+    virtual ControllerPlayerNumber get_player_number(Cancellable& cancellable){
+        return ControllerPlayerNumber::UNKNOWN;
+    }
+
+
+public:
+    //  Press all the buttons set in the bitfield simultaneously.
+    //  This command will wait until all the selected buttons are ready to
+    //  ensure that they are all dispatched simultaneously.
+    virtual void issue_buttons(
+        Cancellable* cancellable,
+        Milliseconds delay, Milliseconds hold, Milliseconds cooldown,
+        Button button
+    ) = 0;
+
+    virtual void issue_joystick(
+        Cancellable* cancellable,
+        Milliseconds delay, Milliseconds hold, Milliseconds cooldown,
+        const JoystickPosition& position
+    ) = 0;
+
+    //  Gyro: Accelerometer (experimental - API subject to change)
+    virtual void issue_gyro_accel_x(
+        Cancellable* cancellable,
+        Milliseconds delay, Milliseconds hold, Milliseconds cooldown,
+        int16_t value
+    ) = 0;
+    virtual void issue_gyro_accel_y(
+        Cancellable* cancellable,
+        Milliseconds delay, Milliseconds hold, Milliseconds cooldown,
+        int16_t value
+    ) = 0;
+    virtual void issue_gyro_accel_z(
+        Cancellable* cancellable,
+        Milliseconds delay, Milliseconds hold, Milliseconds cooldown,
+        int16_t value
+    ) = 0;
+    virtual void issue_gyro_rotate_x(
+        Cancellable* cancellable,
+        Milliseconds delay, Milliseconds hold, Milliseconds cooldown,
+        int16_t value
+    ) = 0;
+    virtual void issue_gyro_rotate_y(
+        Cancellable* cancellable,
+        Milliseconds delay, Milliseconds hold, Milliseconds cooldown,
+        int16_t value
+    ) = 0;
+    virtual void issue_gyro_rotate_z(
+        Cancellable* cancellable,
+        Milliseconds delay, Milliseconds hold, Milliseconds cooldown,
+        int16_t value
+    ) = 0;
+
+    //
+    //  Press all the following buttons/joysticks simultaneously for the
+    //  specified duration. No wait is added at the end. Thus you can issue
+    //  these back-to-back to simulate buttons being pressed and released
+    //  concurrently with other buttons being held down the whole time.
+    //
+    //  This command will wait until the controller is fully idle (including
+    //  cooldowns) before it starts. This ensures that everything is issued
+    //  simultaneously. In other words, there is an implied call to
+    //  "issue_barrier()" before executing the state.
+    //
+    //  The sole purpose of this function is for keyboard commands.
+    //  For programs, it is easier to use the individual button/joystick
+    //  functions above.
+    //
+    //  If we need to support new Switch controller functionality
+    //  (such as Joycon gyro or new stuff in Switch 2), we can simply add
+    //  overloads to this and gate them behind features.
+    //
+    virtual void issue_full_controller_state(
+        Cancellable* cancellable,
+        bool enable_logging,
+        Milliseconds duration,
+        Button button,
+        const JoystickPosition& joystick
+    ) = 0;
+
+
+public:
+    //
+    //  High speed Macros
+    //
+    //  Be mindful when calling these mashing functions on a tick imprecise
+    //  controller. You can guarantee that some (most) of them will be dropped.
+    //
+    //  Even if you are on a tick-precise controller, it is not advised to call
+    //  these if you are micromanaging with tick-level granularity. The exact
+    //  timing characteristics and button selection is not specified and may be
+    //  context and implementation-dependent.
+    //
+
+    //  Mash a button as quickly as possible.
+    virtual void issue_mash_button(
+        Cancellable* cancellable,
+        Button button,
+        Milliseconds duration,
+        Milliseconds delay = Milliseconds(64),
+        Milliseconds hold = Milliseconds(40),
+        Milliseconds cooldown = Milliseconds(24)
+    ) = 0;
+
+
+public:
+    //  External Inputs
+
+    //  stop
+    //  replace
+    //  wait
+    //  A,B
+    //  JS:+0.5:-0.5
+    //  A,B|JL:+0.5:-0.5
+    virtual bool run_string_command(Milliseconds duration, const std::string& command) override;
+
+    virtual void run_controller_input(const ControllerInputState& state) override;
+
+
+protected:
+    //  Console -> Controller
+
+    void on_rumble(double magnitude);
+
+
+private:
+    struct Data;
+    Pimpl<Data> m_data;
+};
+
+
+
+class LeftJoycon : public JoyconController{
+public:
+    using JoyconController::JoyconController;
+
+    static const char NAME[];
+    virtual const char* name() override{
+        return NAME;
+    };
+    virtual ControllerClass controller_class() const noexcept override;
+};
+class RightJoycon : public JoyconController{
+public:
+    using JoyconController::JoyconController;
+
+    static const char NAME[];
+    virtual const char* name() override{
+        return NAME;
+    };
+    virtual ControllerClass controller_class() const noexcept override;
+};
+
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/NintendoSwitch/Controllers/Joycon/NintendoSwitch_JoyconState.cpp b/SerialPrograms/Source/NintendoSwitch/Controllers/Joycon/NintendoSwitch_JoyconState.cpp
new file mode 100644
index 0000000000..fdec1230d7
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Controllers/Joycon/NintendoSwitch_JoyconState.cpp
@@ -0,0 +1,178 @@
+/*  Nintendo Switch Joycon State
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/PrettyPrint.h"
+#include "Common/Cpp/Json/JsonObject.h"
+#include "Controllers/JoystickTools.h"
+#include "NintendoSwitch_Joycon.h"
+#include "NintendoSwitch_JoyconState.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+
+
+
+
+void JoyconState::clear(){
+    buttons = BUTTON_NONE;
+    joystick = JoystickPosition();
+}
+bool JoyconState::operator==(const ControllerState& x) const{
+    if (typeid(*this) != typeid(x)){
+        return false;
+    }
+
+    const JoyconState& r = static_cast<const JoyconState&>(x);
+
+    if (buttons != r.buttons){
+        return false;
+    }
+    if (joystick != r.joystick){
+        return false;
+    }
+    return true;
+}
+bool JoyconState::is_neutral() const{
+    return buttons == 0 && joystick.is_neutral();
+}
+
+void JoyconState::load_json(const JsonObject& json){
+    clear();
+
+    //  Backwards compatibility.
+    if (json.get_boolean_default("is_neutral", false)){
+        return;
+    }
+
+    {
+        std::string buttons_string;
+        json.read_string(buttons_string, "buttons");
+        buttons = string_to_button(buttons_string, " ");
+    }
+
+
+    //  Backwards compatibility.
+    {
+        uint8_t joystick_x = 128;
+        uint8_t joystick_y = 128;
+
+        json.read_integer(joystick_x, "joystick_x", 0, 255);
+        json.read_integer(joystick_y, "joystick_y", 0, 255);
+
+        json.read_integer(joystick_x, "jx", 0, 255);
+        json.read_integer(joystick_y, "jy", 0, 255);
+
+        joystick.x = JoystickTools::linear_u8_to_float(joystick_x);
+        joystick.y = -JoystickTools::linear_u8_to_float(joystick_y);
+    }
+
+    json.read_float(joystick.x, "jxf");
+    json.read_float(joystick.y, "jyf");
+}
+JsonObject JoyconState::to_json() const{
+    JsonObject obj;
+    if (buttons != BUTTON_NONE){
+        obj["buttons"] = button_to_string(buttons);
+    }
+    if (!joystick.is_neutral()){
+        obj["jxf"] = joystick.x;
+        obj["jyf"] = joystick.y;
+    }
+    return obj;
+}
+void JoyconState::execute(
+    Cancellable* scope,
+    bool enable_logging,
+    AbstractController& controller,
+    Milliseconds duration
+) const{
+    controller.cast_with_exception<JoyconController>().issue_full_controller_state(
+        scope,
+        enable_logging,
+        duration,
+        buttons,
+        joystick
+    );
+}
+std::string JoyconState::to_cpp(Milliseconds hold, Milliseconds release) const{
+    uint8_t non_neutral_field = 0;
+    size_t non_neutral_fields = 0;
+    do{
+        if (buttons != BUTTON_NONE){
+            non_neutral_field = 0;
+            non_neutral_fields++;
+        }
+        if (!joystick.is_neutral()){
+            non_neutral_field = 1;
+            non_neutral_fields++;
+        }
+    }while (false);
+
+    if (non_neutral_fields == 0){
+        return "pbf_wait(context, " + std::to_string((hold + release).count()) + ");\n";
+    }
+
+    std::string hold_str = std::to_string(hold.count()) + "ms";
+    std::string release_str = std::to_string(release.count()) + "ms";
+
+    if (non_neutral_fields > 1){
+        std::string ret;
+        ret += "pbf_controller_state(context, "
+            + button_to_code_string(buttons) + ", "
+            + tostr_fixed(joystick.x, 3) + ", " + tostr_fixed(joystick.y, 3) + ", "
+            + hold_str +");\n";
+        if (release != Milliseconds(0)){
+            ret += "pbf_wait(context, " + release_str + ");\n";
+        }
+        return ret;
+    }
+    switch (non_neutral_field){
+    case 0:
+        return "pbf_press_button(context, "
+            + button_to_code_string(buttons) + ", "
+            + hold_str + ", " + release_str + ");\n";
+    case 1:
+        return "pbf_move_joystick(context, "
+            + tostr_fixed(joystick.x, 3) + ", " + tostr_fixed(joystick.y, 3) + ", "
+            + hold_str + ", " + release_str + ");\n";
+    }
+    throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Impossible state.");
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/SerialPrograms/Source/NintendoSwitch/Controllers/Joycon/NintendoSwitch_JoyconState.h b/SerialPrograms/Source/NintendoSwitch/Controllers/Joycon/NintendoSwitch_JoyconState.h
new file mode 100644
index 0000000000..12b67434fd
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Controllers/Joycon/NintendoSwitch_JoyconState.h
@@ -0,0 +1,52 @@
+/*  Nintendo Switch Joycon State
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_NintendoSwitch_JoyconState_H
+#define PokemonAutomation_NintendoSwitch_JoyconState_H
+
+#include "Controllers/Joystick.h"
+#include "Controllers/ControllerState.h"
+#include "NintendoSwitch/Controllers/NintendoSwitch_ControllerButtons.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+
+class JoyconController;
+
+
+
+class JoyconState : public ControllerState{
+public:
+    using ControllerType = JoyconController;
+
+public:
+    virtual void clear() override;
+    virtual bool operator==(const ControllerState& x) const override;
+    virtual bool is_neutral() const override;
+
+    virtual void load_json(const JsonObject& json) override;
+    virtual JsonObject to_json() const override;
+
+    virtual void execute(
+        Cancellable* scope,
+        bool enable_logging,
+        AbstractController& controller,
+        Milliseconds duration
+    ) const override;
+    virtual std::string to_cpp(Milliseconds hold, Milliseconds release) const override;
+
+public:
+    Button buttons = BUTTON_NONE;
+    JoystickPosition joystick;
+};
+
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/NintendoSwitch/Controllers/Joycon/NintendoSwitch_JoyconTable.cpp b/SerialPrograms/Source/NintendoSwitch/Controllers/Joycon/NintendoSwitch_JoyconTable.cpp
new file mode 100644
index 0000000000..92d699bdec
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Controllers/Joycon/NintendoSwitch_JoyconTable.cpp
@@ -0,0 +1,213 @@
+/*  Nintendo Switch Joycon Table
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Json/JsonObject.h"
+#include "Common/Cpp/Options/CheckboxDropdownDatabase.h"
+#include "NintendoSwitch_JoyconTable.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+
+
+const CheckboxDropdownDatabase<Button>& LeftJoycon_Button_Database(){
+    static CheckboxDropdownDatabase<Button> database{
+        {Button::BUTTON_UP,         "Up",       "\u2191"},
+        {Button::BUTTON_RIGHT,      "Right",    "\u2192"},
+        {Button::BUTTON_DOWN,       "Down",     "\u2193"},
+        {Button::BUTTON_LEFT,       "Left",     "\u2190"},
+        {Button::BUTTON_L,          "L",        "L"},
+        {Button::BUTTON_ZL,         "ZL",       "ZL"},
+        {Button::BUTTON_MINUS,      "-",        "-"},
+        {Button::BUTTON_LCLICK,     "L-click",  "L-click"},
+        {Button::BUTTON_CAPTURE,    "Capture",  "Capture"},
+        {Button::BUTTON_LEFT_SR,    "SR",       "SR"},
+        {Button::BUTTON_LEFT_SL,    "SL",       "SL"},
+    };
+    return database;
+}
+const CheckboxDropdownDatabase<Button>& RightJoycon_Button_Database(){
+    static CheckboxDropdownDatabase<Button> database{
+        {Button::BUTTON_Y,          "Y",        "Y"},
+        {Button::BUTTON_B,          "B",        "B"},
+        {Button::BUTTON_A,          "A",        "A"},
+        {Button::BUTTON_X,          "X",        "X"},
+        {Button::BUTTON_R,          "R",        "R"},
+        {Button::BUTTON_R,          "RL",       "RL"},
+        {Button::BUTTON_PLUS,       "+",        "+"},
+        {Button::BUTTON_RCLICK,     "R-click",  "R-click"},
+        {Button::BUTTON_HOME,       "Home",     "Home"},
+        {Button::BUTTON_RIGHT_SR,   "SR",       "SR"},
+        {Button::BUTTON_RIGHT_SL,   "SL",       "SL"},
+        {Button::BUTTON_C,          "C",        "C (Switch 2)"},
+    };
+    return database;
+}
+
+void register_joycon_tables(){
+    ControllerCommandTable::register_controller_type(
+        ControllerClass::NintendoSwitch_LeftJoycon,
+        ControllerCommandTable::make_row<JoyconStateRow>,
+        {
+            "Milliseconds",
+            "Action",
+            "Buttons",
+            "Joystick (X)",
+            "Joystick (Y)",
+        }
+    );
+    ControllerCommandTable::register_controller_type(
+        ControllerClass::NintendoSwitch_RightJoycon,
+        ControllerCommandTable::make_row<JoyconStateRow>,
+        {
+            "Milliseconds",
+            "Action",
+            "Buttons",
+            "Joystick (X)",
+            "Joystick (Y)",
+        }
+    );
+}
+
+
+JoyconStateRow::~JoyconStateRow(){
+    DURATION.remove_listener(*this);
+    BUTTONS.remove_listener(*this);
+    JOYSTICK_X.remove_listener(*this);
+    JOYSTICK_Y.remove_listener(*this);
+}
+
+
+
+JoyconStateRow::JoyconStateRow(EditableTableOption& parent_table)
+    : ControllerStateRow(parent_table)
+    , DURATION(LockMode::LOCK_WHILE_RUNNING, "200 ms")
+    , ACTION(false, LockMode::UNLOCK_WHILE_RUNNING, "", "")
+    , BUTTONS(
+        "",
+        static_cast<ControllerCommandTable&>(parent_table).type() == ControllerClass::NintendoSwitch_LeftJoycon
+            ? LeftJoycon_Button_Database()
+            : RightJoycon_Button_Database(),
+        LockMode::UNLOCK_WHILE_RUNNING,
+        BUTTON_NONE
+    )
+    , JOYSTICK_X(LockMode::UNLOCK_WHILE_RUNNING, 0, -1, +1)
+    , JOYSTICK_Y(LockMode::UNLOCK_WHILE_RUNNING, 0, -1, +1)
+{
+    PA_ADD_OPTION(DURATION);
+    PA_ADD_OPTION(ACTION);
+    PA_ADD_OPTION(BUTTONS);
+    PA_ADD_OPTION(JOYSTICK_X);
+    PA_ADD_OPTION(JOYSTICK_Y);
+
+    JoyconStateRow::on_config_value_changed(this);
+    DURATION.add_listener(*this);
+    BUTTONS.add_listener(*this);
+    JOYSTICK_X.add_listener(*this);
+    JOYSTICK_Y.add_listener(*this);
+}
+
+std::unique_ptr<EditableTableRow> JoyconStateRow::clone() const{
+    std::unique_ptr<JoyconStateRow> ret(new JoyconStateRow(parent()));
+    ret->DURATION.set(DURATION.current_text());
+    ret->BUTTONS.set_flag(BUTTONS.current_value());
+    ret->JOYSTICK_X.set(JOYSTICK_X);
+    ret->JOYSTICK_Y.set(JOYSTICK_Y);
+    return ret;
+}
+
+JsonValue JoyconStateRow::to_json() const{
+    JoyconState state;
+    get_state(state);
+
+    JsonObject json = state.to_json();
+    json["ms"] = DURATION.to_json();
+    return json;
+}
+void JoyconStateRow::load_json(const JsonValue& json){
+    const JsonObject& obj = json.to_object_throw();
+
+    do{
+        const std::string* duration = obj.get_string("ms");
+        if (duration != nullptr){
+            DURATION.load_json(*duration);
+            break;
+        }
+        DURATION.set(std::to_string(obj.get_integer_throw("duration_in_ms")));
+    }while (false);
+
+    JoyconState state;
+    state.load_json(obj);
+
+    BUTTONS.replace_all(state.buttons);
+    JOYSTICK_X.set(state.joystick.x);
+    JOYSTICK_Y.set(state.joystick.y);
+}
+
+void JoyconStateRow::get_state(JoyconState& state) const{
+    state.buttons = BUTTONS;
+    state.joystick.x = JOYSTICK_X;
+    state.joystick.y = JOYSTICK_Y;
+}
+std::unique_ptr<ControllerState> JoyconStateRow::get_state(Milliseconds& duration) const{
+    std::unique_ptr<JoyconState> ret(new JoyconState());
+    get_state(*ret);
+    duration = DURATION;
+    return ret;
+}
+
+
+
+void JoyconStateRow::on_config_value_changed(void* object){
+    JoyconState state;
+    get_state(state);
+
+    ACTION.set(get_controller_action(state));
+}
+
+
+
+std::string get_controller_action(JoyconState& state){
+    std::string action = "";
+
+    if (state.buttons != BUTTON_NONE){
+        action += "Button";
+    }
+
+    if (!state.joystick.is_neutral()){
+        if (action != ""){
+            action += ", ";
+        }
+        action += "Joystick";
+        action += " " + get_joystick_direction(state.joystick);
+        
+    }
+
+    if (action == ""){
+        return "Wait";
+    }
+
+    return action;
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/NintendoSwitch/Controllers/Joycon/NintendoSwitch_JoyconTable.h b/SerialPrograms/Source/NintendoSwitch/Controllers/Joycon/NintendoSwitch_JoyconTable.h
new file mode 100644
index 0000000000..98f4e0eb03
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Controllers/Joycon/NintendoSwitch_JoyconTable.h
@@ -0,0 +1,57 @@
+/*  Nintendo Switch Joycon Table
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_NintendoSwitch_JoyconTable_H
+#define PokemonAutomation_NintendoSwitch_JoyconTable_H
+
+#include "Common/Cpp/Options/FloatingPointOption.h"
+#include "Common/Cpp/Options/TimeDurationOption.h"
+#include "Common/Cpp/Options/CheckboxDropdownOption.h"
+#include "Common/Cpp/Options/StringOption.h"
+#include "Controllers/ControllerStateTable.h"
+#include "NintendoSwitch_JoyconState.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+
+
+
+class JoyconStateRow : public ControllerStateRow, public ConfigOption::Listener{
+public:
+    ~JoyconStateRow();
+    JoyconStateRow(EditableTableOption& parent_table);
+
+    virtual std::unique_ptr<EditableTableRow> clone() const override;
+
+    virtual JsonValue to_json() const override;
+    virtual void load_json(const JsonValue& json) override;
+
+    void get_state(JoyconState& state) const;
+    virtual std::unique_ptr<ControllerState> get_state(Milliseconds& duration) const override;
+
+private:
+    virtual void on_config_value_changed(void* object) override;
+
+
+private:
+    MillisecondsCell DURATION;
+    StringCell ACTION;
+    CheckboxDropdownCell<Button> BUTTONS;
+    FloatingPointCell JOYSTICK_X;
+    FloatingPointCell JOYSTICK_Y;
+};
+
+
+void register_joycon_tables();
+
+std::string get_controller_action(JoyconState& state);
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/NintendoSwitch/Controllers/Joycon/NintendoSwitch_Joycon_from_Keyboard.cpp b/SerialPrograms/Source/NintendoSwitch/Controllers/Joycon/NintendoSwitch_Joycon_from_Keyboard.cpp
new file mode 100644
index 0000000000..96fc88a9f8
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Controllers/Joycon/NintendoSwitch_Joycon_from_Keyboard.cpp
@@ -0,0 +1,255 @@
+/*  Controller Mapping: Keyboard -> Procon
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "NintendoSwitch/Controllers/NintendoSwitch_VirtualControllerState.h"
+#include "NintendoSwitch_Joycon_from_Keyboard.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+
+
+
+std::vector<std::unique_ptr<EditableTableRow>> JoyconFromKeyboardTable::make_defaults(bool left){
+    std::vector<std::unique_ptr<EditableTableRow>> ret;
+
+    if (left){
+        ret.emplace_back(make_mapping("Vertical: JS Up",    KeyboardKey::KEY_W,         JoyconDeltas{.joystick_x =  0, .joystick_y = -1}));
+        ret.emplace_back(make_mapping("Vertical: JS Left",  KeyboardKey::KEY_A,         JoyconDeltas{.joystick_x = -1, .joystick_y =  0}));
+        ret.emplace_back(make_mapping("Vertical: JS Down",  KeyboardKey::KEY_S,         JoyconDeltas{.joystick_x =  0, .joystick_y = +1}));
+        ret.emplace_back(make_mapping("Vertical: JS Right", KeyboardKey::KEY_D,         JoyconDeltas{.joystick_x = +1, .joystick_y =  0}));
+
+        ret.emplace_back(make_mapping("Vertical: Up",       KeyboardKey::KEY_UP,        JoyconDeltas{.buttons = BUTTON_UP}));
+        ret.emplace_back(make_mapping("Vertical: Right",    KeyboardKey::KEY_RIGHT,     JoyconDeltas{.buttons = BUTTON_RIGHT}));
+        ret.emplace_back(make_mapping("Vertical: Down",     KeyboardKey::KEY_DOWN,      JoyconDeltas{.buttons = BUTTON_DOWN}));
+        ret.emplace_back(make_mapping("Vertical: Left",     KeyboardKey::KEY_LEFT,      JoyconDeltas{.buttons = BUTTON_LEFT}));
+
+        ret.emplace_back(make_mapping("Vertical: L",        KeyboardKey::KEY_Q,         JoyconDeltas{.buttons = BUTTON_L}));
+        ret.emplace_back(make_mapping("Vertical: ZL",       KeyboardKey::KEY_E,         JoyconDeltas{.buttons = BUTTON_ZL}));
+        ret.emplace_back(make_mapping("Vertical: JS-Click", KeyboardKey::KEY_C,         JoyconDeltas{.buttons = BUTTON_LCLICK}));
+
+        ret.emplace_back(make_mapping("Sideways: JS Up",    KeyboardKey::KEY_T,         JoyconDeltas{.joystick_x = +1, .joystick_y =  0}));
+        ret.emplace_back(make_mapping("Sideways: JS Left",  KeyboardKey::KEY_F,         JoyconDeltas{.joystick_x =  0, .joystick_y = -1}));
+        ret.emplace_back(make_mapping("Sideways: JS Down",  KeyboardKey::KEY_G,         JoyconDeltas{.joystick_x = -1, .joystick_y =  0}));
+        ret.emplace_back(make_mapping("Sideways: JS Right", KeyboardKey::KEY_H,         JoyconDeltas{.joystick_x =  0, .joystick_y = +1}));
+
+        ret.emplace_back(make_mapping("Sideways: Up",       KeyboardKey::KEY_APOSTROPHE,    JoyconDeltas{.buttons = BUTTON_RIGHT}));
+        ret.emplace_back(make_mapping("Sideways: Right",    KeyboardKey::KEY_ENTER,         JoyconDeltas{.buttons = BUTTON_DOWN}));
+        ret.emplace_back(make_mapping("Sideways: Down",     KeyboardKey::KEY_LEFT_SHIFT,    JoyconDeltas{.buttons = BUTTON_LEFT}));
+        ret.emplace_back(make_mapping("Sideways: Down",     KeyboardKey::KEY_RIGHT_SHIFT,   JoyconDeltas{.buttons = BUTTON_LEFT}));
+        ret.emplace_back(make_mapping("Sideways: Down",     KeyboardKey::KEY_LEFT_CTRL,     JoyconDeltas{.buttons = BUTTON_LEFT}));
+        ret.emplace_back(make_mapping("Sideways: Down",     KeyboardKey::KEY_RIGHT_CTRL,    JoyconDeltas{.buttons = BUTTON_LEFT}));
+        ret.emplace_back(make_mapping("Sideways: Left",     KeyboardKey::KEY_SLASH,         JoyconDeltas{.buttons = BUTTON_UP}));
+
+        ret.emplace_back(make_mapping("Sideways: L",        KeyboardKey::KEY_R,         JoyconDeltas{.buttons = BUTTON_L}));
+        ret.emplace_back(make_mapping("Sideways: ZL",       KeyboardKey::KEY_Y,         JoyconDeltas{.buttons = BUTTON_ZL}));
+        ret.emplace_back(make_mapping("Sideways: JS-Click", KeyboardKey::KEY_N,         JoyconDeltas{.buttons = BUTTON_LCLICK}));
+
+        //  Other
+        ret.emplace_back(make_mapping("-",                  KeyboardKey::KEY_MINUS,     JoyconDeltas{.buttons = BUTTON_MINUS}));
+        ret.emplace_back(make_mapping("-",                  KeyboardKey::KEY_KP_MINUS,  JoyconDeltas{.buttons = BUTTON_MINUS}));
+        ret.emplace_back(make_mapping("Capture",            KeyboardKey::KEY_INSERT,    JoyconDeltas{.buttons = BUTTON_CAPTURE}));
+
+        ret.emplace_back(make_mapping("SL",                 KeyboardKey::KEY_F1,        JoyconDeltas{.buttons = BUTTON_LEFT_SL}));
+        ret.emplace_back(make_mapping("SR",                 KeyboardKey::KEY_F3,        JoyconDeltas{.buttons = BUTTON_LEFT_SR}));
+    }else{
+        ret.emplace_back(make_mapping("Vertical: JS Up",    KeyboardKey::KEY_W,         JoyconDeltas{.joystick_x =  0, .joystick_y = -1}));
+        ret.emplace_back(make_mapping("Vertical: JS Left",  KeyboardKey::KEY_A,         JoyconDeltas{.joystick_x = -1, .joystick_y =  0}));
+        ret.emplace_back(make_mapping("Vertical: JS Down",  KeyboardKey::KEY_S,         JoyconDeltas{.joystick_x =  0, .joystick_y = +1}));
+        ret.emplace_back(make_mapping("Vertical: JS Right", KeyboardKey::KEY_D,         JoyconDeltas{.joystick_x = +1, .joystick_y =  0}));
+
+        ret.emplace_back(make_mapping("Vertical: X",        KeyboardKey::KEY_APOSTROPHE,    JoyconDeltas{.buttons = BUTTON_X}));
+        ret.emplace_back(make_mapping("Vertical: A",        KeyboardKey::KEY_ENTER,         JoyconDeltas{.buttons = BUTTON_A}));
+        ret.emplace_back(make_mapping("Vertical: B",        KeyboardKey::KEY_LEFT_SHIFT,    JoyconDeltas{.buttons = BUTTON_B}));
+        ret.emplace_back(make_mapping("Vertical: B",        KeyboardKey::KEY_RIGHT_SHIFT,   JoyconDeltas{.buttons = BUTTON_B}));
+        ret.emplace_back(make_mapping("Vertical: B",        KeyboardKey::KEY_LEFT_CTRL,     JoyconDeltas{.buttons = BUTTON_B}));
+        ret.emplace_back(make_mapping("Vertical: B",        KeyboardKey::KEY_RIGHT_CTRL,    JoyconDeltas{.buttons = BUTTON_B}));
+        ret.emplace_back(make_mapping("Vertical: Y",        KeyboardKey::KEY_SLASH,         JoyconDeltas{.buttons = BUTTON_Y}));
+
+        ret.emplace_back(make_mapping("Vertical: R",        KeyboardKey::KEY_Q,         JoyconDeltas{.buttons = BUTTON_R}));
+        ret.emplace_back(make_mapping("Vertical: ZR",       KeyboardKey::KEY_E,         JoyconDeltas{.buttons = BUTTON_ZR}));
+        ret.emplace_back(make_mapping("Vertical: JS-Click", KeyboardKey::KEY_C,         JoyconDeltas{.buttons = BUTTON_RCLICK}));
+
+        ret.emplace_back(make_mapping("Sideways: JS Up",    KeyboardKey::KEY_T,         JoyconDeltas{.joystick_x = -1, .joystick_y =  0}));
+        ret.emplace_back(make_mapping("Sideways: JS Left",  KeyboardKey::KEY_F,         JoyconDeltas{.joystick_x =  0, .joystick_y = +1}));
+        ret.emplace_back(make_mapping("Sideways: JS Down",  KeyboardKey::KEY_G,         JoyconDeltas{.joystick_x = +1, .joystick_y =  0}));
+        ret.emplace_back(make_mapping("Sideways: JS Right", KeyboardKey::KEY_H,         JoyconDeltas{.joystick_x =  0, .joystick_y = -1}));
+
+        ret.emplace_back(make_mapping("Sideways: X",        KeyboardKey::KEY_UP,        JoyconDeltas{.buttons = BUTTON_Y}));
+        ret.emplace_back(make_mapping("Sideways: A",        KeyboardKey::KEY_RIGHT,     JoyconDeltas{.buttons = BUTTON_X}));
+        ret.emplace_back(make_mapping("Sideways: B",        KeyboardKey::KEY_DOWN,      JoyconDeltas{.buttons = BUTTON_A}));
+        ret.emplace_back(make_mapping("Sideways: Y",        KeyboardKey::KEY_LEFT,      JoyconDeltas{.buttons = BUTTON_B}));
+
+        ret.emplace_back(make_mapping("Sideways: R",        KeyboardKey::KEY_R,         JoyconDeltas{.buttons = BUTTON_R}));
+        ret.emplace_back(make_mapping("Sideways: ZR",       KeyboardKey::KEY_Y,         JoyconDeltas{.buttons = BUTTON_ZR}));
+        ret.emplace_back(make_mapping("Sideways: JS-Click", KeyboardKey::KEY_N,         JoyconDeltas{.buttons = BUTTON_RCLICK}));
+
+        //  Other
+        ret.emplace_back(make_mapping("+",                  KeyboardKey::KEY_EQUAL,     JoyconDeltas{.buttons = BUTTON_PLUS}));
+        ret.emplace_back(make_mapping("+",                  KeyboardKey::KEY_KP_PLUS,   JoyconDeltas{.buttons = BUTTON_PLUS}));
+
+        ret.emplace_back(make_mapping("Home",               KeyboardKey::KEY_HOME,      JoyconDeltas{.buttons = BUTTON_HOME}));
+        ret.emplace_back(make_mapping("Home",               KeyboardKey::KEY_ESC,       JoyconDeltas{.buttons = BUTTON_HOME}));
+
+        ret.emplace_back(make_mapping("SL",                 KeyboardKey::KEY_F1,        JoyconDeltas{.buttons = BUTTON_RIGHT_SL}));
+        ret.emplace_back(make_mapping("SR",                 KeyboardKey::KEY_F3,        JoyconDeltas{.buttons = BUTTON_RIGHT_SR}));
+
+        ret.emplace_back(make_mapping("C (Switch 2)",       KeyboardKey::KEY_B,         JoyconDeltas{.buttons = BUTTON_C}));
+    }
+
+    return ret;
+};
+
+
+
+
+
+
+
+
+
+JoyconFromKeyboardTableRow::JoyconFromKeyboardTableRow(EditableTableOption& parent_table)
+    : EditableTableRow(parent_table)
+    , label(false, LockMode::UNLOCK_WHILE_RUNNING, "", "")
+    , key(LockMode::UNLOCK_WHILE_RUNNING)
+    , buttons(LockMode::UNLOCK_WHILE_RUNNING, 0, 0, ((uint32_t)1 << TOTAL_BUTTONS) - 1)
+    , joystick_x(LockMode::UNLOCK_WHILE_RUNNING, 0, -1, 1)
+    , joystick_y(LockMode::UNLOCK_WHILE_RUNNING, 0, -1, 1)
+{
+    add_option(label, "Description");
+    add_option(key, "HID ID");
+    add_option(buttons, "Button Bit-Field");
+    add_option(joystick_x, "Joystick x");
+    add_option(joystick_y, "Joystick y");
+    set_advanced_mode(static_cast<JoyconFromKeyboardTable&>(parent_table).advanced_mode());
+}
+JoyconFromKeyboardTableRow::JoyconFromKeyboardTableRow(
+    EditableTableOption& parent_table,
+    bool advanced_mode,
+    std::string description,
+    KeyboardKey key,
+    const JoyconDeltas& deltas
+)
+    : JoyconFromKeyboardTableRow(parent_table)
+{
+    label.set(std::move(description));
+    this->key.set(key);
+    buttons.set(deltas.buttons);
+    joystick_x.set((int8_t)deltas.joystick_x);
+    joystick_y.set((int8_t)deltas.joystick_y);
+    set_advanced_mode(advanced_mode);
+}
+std::unique_ptr<EditableTableRow> JoyconFromKeyboardTableRow::clone() const{
+    std::unique_ptr<JoyconFromKeyboardTableRow> ret(new JoyconFromKeyboardTableRow(parent()));
+    ret->label.set(label);
+    ret->key.set((KeyboardKey)key);
+    ret->buttons.set(buttons);
+    ret->joystick_x.set(joystick_x);
+    ret->joystick_y.set(joystick_y);
+    ret->set_advanced_mode(m_advanced_mode.load(std::memory_order_relaxed));
+    return ret;
+}
+JoyconDeltas JoyconFromKeyboardTableRow::snapshot() const{
+    return {
+        .buttons = (Button)buttons.current_value(),
+        .joystick_x = joystick_x,
+        .joystick_y = joystick_y,
+    };
+}
+void JoyconFromKeyboardTableRow::set_advanced_mode(bool enabled){
+    m_advanced_mode.store(enabled, std::memory_order_relaxed);
+    if (enabled){
+        label.set_locked(false);
+        buttons.set_visibility(ConfigOptionState::ENABLED);
+        joystick_x.set_visibility(ConfigOptionState::ENABLED);
+        joystick_y.set_visibility(ConfigOptionState::ENABLED);
+    }else{
+        label.set_locked(true);
+        buttons.set_visibility(ConfigOptionState::DISABLED);
+        joystick_x.set_visibility(ConfigOptionState::DISABLED);
+        joystick_y.set_visibility(ConfigOptionState::DISABLED);
+    }
+}
+
+
+
+
+
+
+
+
+JoyconFromKeyboardTable::JoyconFromKeyboardTable(bool left)
+    : EditableTableOption_t<JoyconFromKeyboardTableRow>(
+        left ? "<b>Left Joycon:</b>" : "<b>Right Joycon:</b>",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        make_defaults(left)
+    )
+    , m_advanced_mode(false)
+{}
+std::vector<std::string> JoyconFromKeyboardTable::make_header() const{
+    return std::vector<std::string>{
+        "Description",
+        "Keyboard HID ID",
+        "Button Bit-Field",
+        "Joystick x",
+        "Joystick y",
+    };
+}
+void JoyconFromKeyboardTable::set_advanced_mode(bool enabled){
+    m_advanced_mode.store(enabled, std::memory_order_relaxed);
+    run_on_all_rows([enabled](JoyconFromKeyboardTableRow& row){
+        row.set_advanced_mode(enabled);
+        return false;
+    });
+}
+
+
+std::unique_ptr<EditableTableRow> JoyconFromKeyboardTable::make_mapping(
+    std::string description,
+    KeyboardKey key,
+    const JoyconDeltas& deltas
+){
+    return std::make_unique<JoyconFromKeyboardTableRow>(
+        *this,
+        m_advanced_mode.load(std::memory_order_relaxed),
+        std::move(description),
+        key,
+        deltas
+    );
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/NintendoSwitch/Controllers/Joycon/NintendoSwitch_Joycon_from_Keyboard.h b/SerialPrograms/Source/NintendoSwitch/Controllers/Joycon/NintendoSwitch_Joycon_from_Keyboard.h
new file mode 100644
index 0000000000..1b3c6bd845
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Controllers/Joycon/NintendoSwitch_Joycon_from_Keyboard.h
@@ -0,0 +1,77 @@
+/*  Controller Mapping: Keyboard -> Joycon
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_NintendoSwitch_Joycon_from_Keyboard_H
+#define PokemonAutomation_NintendoSwitch_Joycon_from_Keyboard_H
+
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "Common/Cpp/Options/StringOption.h"
+#include "Common/Cpp/Options/EditableTableOption.h"
+#include "ControllerInput/Keyboard/KeyBindingOption.h"
+#include "NintendoSwitch/Controllers/NintendoSwitch_ControllerButtons.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+
+struct JoyconDeltas;
+
+
+
+
+class JoyconFromKeyboardTableRow : public EditableTableRow{
+public:
+    JoyconFromKeyboardTableRow(EditableTableOption& parent_table);
+    JoyconFromKeyboardTableRow(
+        EditableTableOption& parent_table,
+        bool advanced_mode,
+        std::string description,
+        KeyboardKey key,
+        const JoyconDeltas& deltas
+    );
+    virtual std::unique_ptr<EditableTableRow> clone() const override;
+    JoyconDeltas snapshot() const;
+
+    void set_advanced_mode(bool enabled);
+
+private:
+    std::atomic<bool> m_advanced_mode;
+
+public:
+    StringCell label;
+    KeyboardHidBindingCell key;
+    SimpleIntegerCell<ButtonFlagType> buttons;
+    SimpleIntegerCell<int8_t> joystick_x;
+    SimpleIntegerCell<int8_t> joystick_y;
+};
+
+
+
+class JoyconFromKeyboardTable : public EditableTableOption_t<JoyconFromKeyboardTableRow>{
+public:
+    JoyconFromKeyboardTable(bool left);
+    virtual std::vector<std::string> make_header() const override;
+
+    bool advanced_mode() const{ return m_advanced_mode.load(std::memory_order_relaxed); }
+    void set_advanced_mode(bool enabled);
+
+    std::unique_ptr<EditableTableRow> make_mapping(
+        std::string description,
+        KeyboardKey key,
+        const JoyconDeltas& deltas
+    );
+    std::vector<std::unique_ptr<EditableTableRow>> make_defaults(bool left);
+
+private:
+    std::atomic<bool> m_advanced_mode;
+};
+
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/NintendoSwitch/Controllers/NintendoSwitch_ControllerButtons.cpp b/SerialPrograms/Source/NintendoSwitch/Controllers/NintendoSwitch_ControllerButtons.cpp
new file mode 100644
index 0000000000..c442d61b57
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Controllers/NintendoSwitch_ControllerButtons.cpp
@@ -0,0 +1,193 @@
+/*  Nintendo Switch Controller Buttons
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/EnumStringMap.h"
+#include "Common/Cpp/Strings/StringTools.h"
+#include "NintendoSwitch_ControllerButtons.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+const EnumStringMap<Button> BUTTON_STRINGS{
+    {Button::BUTTON_NONE,              "none"},
+    {Button::BUTTON_Y,                 "Y"},
+    {Button::BUTTON_B,                 "B"},
+    {Button::BUTTON_A,                 "A"},
+    {Button::BUTTON_X,                 "X"},
+    {Button::BUTTON_L,                 "L"},
+    {Button::BUTTON_R,                 "R"},
+    {Button::BUTTON_ZL,                "ZL"},
+    {Button::BUTTON_ZR,                "ZR"},
+    {Button::BUTTON_MINUS,             "-"},
+    {Button::BUTTON_PLUS,              "+"},
+    {Button::BUTTON_LCLICK,            "LJ"},
+    {Button::BUTTON_RCLICK,            "RJ"},
+    {Button::BUTTON_HOME,              "HOME"},
+    {Button::BUTTON_HOME,              "Home"},
+    {Button::BUTTON_CAPTURE,           "CAPTURE"},
+    {Button::BUTTON_CAPTURE,           "Capture"},
+    {Button::BUTTON_GR,                "GR"},
+    {Button::BUTTON_GL,                "GL"},
+    {Button::BUTTON_UP,                "Up"},
+    {Button::BUTTON_RIGHT,             "Right"},
+    {Button::BUTTON_DOWN,              "Down"},
+    {Button::BUTTON_LEFT,              "Left"},
+    {Button::BUTTON_LEFT_SL,           "Left-SL"},
+    {Button::BUTTON_LEFT_SR,           "Left-SR"},
+    {Button::BUTTON_RIGHT_SL,          "Right-SL"},
+    {Button::BUTTON_RIGHT_SR,          "Right-SR"},
+    {Button::BUTTON_C,                 "C"},
+};    
+
+const EnumStringMap<Button> BUTTON_CODE_STRINGS{
+    {Button::BUTTON_NONE,              "BUTTON_NONE"},
+    {Button::BUTTON_Y,                 "BUTTON_Y"},
+    {Button::BUTTON_B,                 "BUTTON_B"},
+    {Button::BUTTON_A,                 "BUTTON_A"},
+    {Button::BUTTON_X,                 "BUTTON_X"},
+    {Button::BUTTON_L,                 "BUTTON_L"},
+    {Button::BUTTON_R,                 "BUTTON_R"},
+    {Button::BUTTON_ZL,                "BUTTON_ZL"},
+    {Button::BUTTON_ZR,                "BUTTON_ZR"},
+    {Button::BUTTON_MINUS,             "BUTTON_MINUS"},
+    {Button::BUTTON_PLUS,              "BUTTON_PLUS"},
+    {Button::BUTTON_LCLICK,            "BUTTON_LCLICK"},
+    {Button::BUTTON_RCLICK,            "BUTTON_RCLICK"},
+    {Button::BUTTON_HOME,              "BUTTON_HOME"},
+    {Button::BUTTON_CAPTURE,           "BUTTON_CAPTURE"},
+    {Button::BUTTON_GR,                "BUTTON_GR"},
+    {Button::BUTTON_GL,                "BUTTON_GL"},
+    {Button::BUTTON_UP,                "BUTTON_UP"},
+    {Button::BUTTON_RIGHT,             "BUTTON_RIGHT"},
+    {Button::BUTTON_DOWN,              "BUTTON_DOWN"},
+    {Button::BUTTON_LEFT,              "BUTTON_LEFT"},
+    {Button::BUTTON_LEFT_SL,           "BUTTON_LEFT_SL"},
+    {Button::BUTTON_LEFT_SR,           "BUTTON_LEFT_SR"},
+    {Button::BUTTON_RIGHT_SL,          "BUTTON_RIGHT_SL"},
+    {Button::BUTTON_RIGHT_SR,          "BUTTON_RIGHT_SR"},
+    {Button::BUTTON_C,                 "BUTTON_C"},
+};  
+
+
+std::string button_to_string(Button button){
+    std::string str;
+    for (auto iter = BUTTON_STRINGS.begin(); iter != BUTTON_STRINGS.end(); ++iter){
+        if (iter->first & button){
+            str += iter->second + " ";
+        }
+    }
+
+    if (str.empty()){
+        str = BUTTON_STRINGS.get_string(BUTTON_NONE);
+    }
+    if (str.back() == ' '){
+        str.pop_back();
+    }
+    return str;
+}
+
+Button string_to_button(std::string multi_button_string, const std::string& delim){
+    std::vector<std::string> string_vector = StringTools::split(multi_button_string, delim);
+    Button button_result = BUTTON_NONE;
+    for (const std::string& button_string : string_vector){
+        if (button_string.empty()){
+            continue;
+        }
+        Button one_button = BUTTON_STRINGS.get_enum(button_string);
+        button_result |= one_button;
+    }
+
+    return button_result;
+}
+
+std::string button_to_code_string(Button button){
+    std::string str;
+    std::string logical_or = " | ";
+    for (auto iter = BUTTON_CODE_STRINGS.begin(); iter != BUTTON_CODE_STRINGS.end(); ++iter){
+        if (iter->first & button){
+            str += iter->second + logical_or;
+        }
+    }
+    
+    if (str.empty()){
+        str = BUTTON_CODE_STRINGS.get_string(BUTTON_NONE);
+    }
+    if (str.substr(str.size() - logical_or.size()) == logical_or){ // remove trailing " | "
+        str = str.substr(0, str.size() - logical_or.size());
+    }
+    return str;
+}
+
+const EnumStringMap<DpadPosition> DPAD_STRINGS{
+    {DpadPosition::DPAD_UP,              "up"},
+    {DpadPosition::DPAD_UP_RIGHT,        "up-right"},
+    {DpadPosition::DPAD_RIGHT,           "right"},
+    {DpadPosition::DPAD_DOWN_RIGHT,      "down-right"},
+    {DpadPosition::DPAD_DOWN,            "down"},
+    {DpadPosition::DPAD_DOWN_LEFT,       "down-left"},
+    {DpadPosition::DPAD_LEFT,            "left"},
+    {DpadPosition::DPAD_UP_LEFT,         "up-left"},
+    {DpadPosition::DPAD_NONE,            "none"},
+}; 
+
+const EnumStringMap<DpadPosition> DPAD_CODE_STRINGS{
+    {DpadPosition::DPAD_UP,              "DPAD_UP"},
+    {DpadPosition::DPAD_UP_RIGHT,        "DPAD_UP_RIGHT"},
+    {DpadPosition::DPAD_RIGHT,           "DPAD_RIGHT"},
+    {DpadPosition::DPAD_DOWN_RIGHT,      "DPAD_DOWN_RIGHT"},
+    {DpadPosition::DPAD_DOWN,            "DPAD_DOWN"},
+    {DpadPosition::DPAD_DOWN_LEFT,       "DPAD_DOWN_LEFT"},
+    {DpadPosition::DPAD_LEFT,            "DPAD_LEFT"},
+    {DpadPosition::DPAD_UP_LEFT,         "DPAD_UP_LEFT"},
+    {DpadPosition::DPAD_NONE,            "DPAD_NONE"},
+}; 
+
+
+std::string dpad_to_string(DpadPosition dpad){
+    try{
+        return DPAD_STRINGS.get_string(dpad);
+    }catch (ParseException&){
+        return "unknown";
+    }
+}
+
+const std::string& dpad_to_code_string(DpadPosition dpad){
+    return DPAD_CODE_STRINGS.get_string(dpad);
+}
+
+DpadPosition string_to_dpad(std::string dpad_string){
+    return DPAD_STRINGS.get_enum(dpad_string);
+}
+
+
+const std::string& player_number_to_string(ControllerPlayerNumber number){
+    static const std::string STRINGS[] = {
+        "Unknown",
+        "Disconnected",
+        "Player 1",
+        "Player 2",
+        "Player 3",
+        "Player 4",
+        "Player 5",
+        "Player 6",
+        "Player 7",
+        "Player 8",
+    };
+    return STRINGS[(size_t)number];
+}
+
+
+
+
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/NintendoSwitch/Controllers/NintendoSwitch_ControllerButtons.h b/SerialPrograms/Source/NintendoSwitch/Controllers/NintendoSwitch_ControllerButtons.h
new file mode 100644
index 0000000000..2fcf29122f
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Controllers/NintendoSwitch_ControllerButtons.h
@@ -0,0 +1,125 @@
+/*  Nintendo Switch Controller Buttons
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_NintendoSwitch_ControllerButtons_H
+#define PokemonAutomation_NintendoSwitch_ControllerButtons_H
+
+#include <stdint.h>
+#include <string>
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+
+
+
+//  Buttons
+constexpr size_t TOTAL_BUTTONS = 25;
+using ButtonFlagType = uint32_t;
+enum Button : ButtonFlagType{
+    BUTTON_NONE     =   0,
+    BUTTON_Y        =   ((uint32_t)1 <<  0),
+    BUTTON_B        =   ((uint32_t)1 <<  1),
+    BUTTON_A        =   ((uint32_t)1 <<  2),
+    BUTTON_X        =   ((uint32_t)1 <<  3),
+    BUTTON_L        =   ((uint32_t)1 <<  4),
+    BUTTON_R        =   ((uint32_t)1 <<  5),
+    BUTTON_ZL       =   ((uint32_t)1 <<  6),
+    BUTTON_ZR       =   ((uint32_t)1 <<  7),
+    BUTTON_MINUS    =   ((uint32_t)1 <<  8),
+    BUTTON_PLUS     =   ((uint32_t)1 <<  9),
+    BUTTON_LCLICK   =   ((uint32_t)1 << 10),
+    BUTTON_RCLICK   =   ((uint32_t)1 << 11),
+    BUTTON_HOME     =   ((uint32_t)1 << 12),
+    BUTTON_CAPTURE  =   ((uint32_t)1 << 13),
+    BUTTON_GR       =   ((uint32_t)1 << 14),
+    BUTTON_GL       =   ((uint32_t)1 << 15),
+    BUTTON_UP       =   ((uint32_t)1 << 16),
+    BUTTON_RIGHT    =   ((uint32_t)1 << 17),
+    BUTTON_DOWN     =   ((uint32_t)1 << 18),
+    BUTTON_LEFT     =   ((uint32_t)1 << 19),
+    BUTTON_LEFT_SL  =   ((uint32_t)1 << 20),
+    BUTTON_LEFT_SR  =   ((uint32_t)1 << 21),
+    BUTTON_RIGHT_SL =   ((uint32_t)1 << 22),
+    BUTTON_RIGHT_SR =   ((uint32_t)1 << 23),
+    BUTTON_C        =   ((uint32_t)1 << 24),
+};
+
+inline constexpr Button empty_value(const Button*){
+    return BUTTON_NONE;
+}
+inline constexpr bool is_empty(Button x){
+    return x == BUTTON_NONE;
+}
+inline constexpr Button operator|(Button x, Button y){
+    return (Button)((ButtonFlagType)x | (ButtonFlagType)y);
+}
+inline constexpr void operator|=(Button& x, Button y){
+    x = (Button)((ButtonFlagType)x | (ButtonFlagType)y);
+}
+inline constexpr Button operator&(Button x, Button y){
+    return (Button)((ButtonFlagType)x & (ButtonFlagType)y);
+}
+inline constexpr void operator&=(Button& x, Button y){
+    x = (Button)((ButtonFlagType)x & (ButtonFlagType)y);
+}
+inline constexpr Button operator^(Button x, Button y){
+    return (Button)((ButtonFlagType)x ^ (ButtonFlagType)y);
+}
+inline constexpr void operator^=(Button& x, Button y){
+    x = (Button)((ButtonFlagType)x ^ (ButtonFlagType)y);
+}
+
+std::string button_to_string(Button button);
+std::string button_to_code_string(Button button);
+
+// ASSUME: multi_button_string was generated by button_to_string()
+Button string_to_button(std::string multi_button_string, const std::string& delim);
+
+
+
+
+//  Dpad
+enum DpadPosition : uint8_t{
+    DPAD_UP          =   0,
+    DPAD_UP_RIGHT    =   1,
+    DPAD_RIGHT       =   2,
+    DPAD_DOWN_RIGHT  =   3,
+    DPAD_DOWN        =   4,
+    DPAD_DOWN_LEFT   =   5,
+    DPAD_LEFT        =   6,
+    DPAD_UP_LEFT     =   7,
+    DPAD_NONE        =   8,
+};
+
+std::string dpad_to_string(DpadPosition dpad);
+const std::string& dpad_to_code_string(DpadPosition dpad);
+
+// ASSUME: dpad_string was generated by dpad_to_string()
+DpadPosition string_to_dpad(std::string dpad_string);
+
+
+
+enum class ControllerPlayerNumber{
+    UNKNOWN,
+    DISCONNECTED,
+    PLAYER1,
+    PLAYER2,
+    PLAYER3,
+    PLAYER4,
+    PLAYER5,
+    PLAYER6,
+    PLAYER7,
+    PLAYER8,
+};
+const std::string& player_number_to_string(ControllerPlayerNumber number);
+
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/NintendoSwitch/Controllers/NintendoSwitch_ControllerSettings.cpp b/SerialPrograms/Source/NintendoSwitch/Controllers/NintendoSwitch_ControllerSettings.cpp
new file mode 100644
index 0000000000..659f0b848c
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Controllers/NintendoSwitch_ControllerSettings.cpp
@@ -0,0 +1,607 @@
+/*  Nintendo Switch Controller Settings
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <chrono>
+#include <set>
+#include "Common/CRC32/pabb_CRC32.h"
+#include "CommonFramework/Logging/Logger.h"
+//#include "CommonFramework/PersistentSettings.h"
+#ifdef QT_CORE_LIB
+#include "CommonFramework/Panels/PanelTools.h"
+#include "NintendoSwitch/NintendoSwitch_SettingsPanel.h"
+#endif
+#include "NintendoSwitch_ControllerSettings.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+//#include "Common/Cpp/PrettyPrint.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+
+uint32_t average_colors(uint32_t x, uint32_t y){
+    //  Average the two button colors.
+    uint32_t red = ((x >> 16) & 0xff) + ((y >> 16) & 0xff);
+    uint32_t green = ((x >> 8) & 0xff) + ((y >> 8) & 0xff);
+    uint32_t blue = ((x >> 0) & 0xff) + ((y >> 0) & 0xff);
+    red /= 2;
+    green /= 2;
+    blue /= 2;
+    return (red << 16) | (green << 8) | (blue << 0);
+}
+
+
+
+struct ControllerColors{
+    std::string name;
+
+    ControllerColors(std::string p_name)
+        : name(std::move(p_name))
+    {}
+    virtual ~ControllerColors() = default;
+    virtual void write_to_profile(ControllerProfile& profile, ControllerType controller) const = 0;
+};
+
+struct JoyconColors : public ControllerColors{
+    uint32_t left_body;
+    uint32_t left_buttons;
+    uint32_t right_body;
+    uint32_t right_buttons;
+
+    JoyconColors(
+        std::string p_name,
+        uint32_t p_left_body,
+        uint32_t p_left_button,
+        uint32_t p_right_body,
+        uint32_t p_right_buttons
+    )
+        : ControllerColors(std::move(p_name))
+        , left_body(p_left_body)
+        , left_buttons(p_left_button)
+        , right_body(p_right_body)
+        , right_buttons(p_right_buttons)
+    {}
+
+    virtual void write_to_profile(ControllerProfile& profile, ControllerType controller) const override{
+        profile.official_name = name;
+        switch (controller){
+        case ControllerType::NintendoSwitch_WirelessProController:
+        case ControllerType::NintendoSwitch_WiredProController:{
+            //  Set the grips to the joycon colors.
+            profile.left_grip = left_body;
+            profile.right_grip = right_body;
+            profile.body_color = average_colors(left_buttons, right_buttons);
+            profile.button_color = average_colors(left_body, right_body);
+            break;
+        }
+        case ControllerType::NintendoSwitch_WiredLeftJoycon:
+        case ControllerType::NintendoSwitch_WirelessLeftJoycon:
+            profile.button_color = left_buttons;
+            profile.body_color = left_body;
+            break;
+        case ControllerType::NintendoSwitch_WiredRightJoycon:
+        case ControllerType::NintendoSwitch_WirelessRightJoycon:
+            profile.button_color = right_buttons;
+            profile.body_color = right_body;
+            break;
+        default:;
+        }
+    }
+};
+struct ProconColors : public ControllerColors{
+    uint32_t left_grip;
+    uint32_t right_grip;
+    uint32_t body;
+    uint32_t buttons;
+
+    ProconColors(
+        std::string p_name,
+        uint32_t p_left_grip,
+        uint32_t p_right_grip,
+        uint32_t p_body,
+        uint32_t p_buttons
+    )
+        : ControllerColors(std::move(p_name))
+        , left_grip(p_left_grip)
+        , right_grip(p_right_grip)
+        , body(p_body)
+        , buttons(p_buttons)
+    {}
+
+    virtual void write_to_profile(ControllerProfile& profile, ControllerType controller) const override{
+        profile.official_name = name;
+        switch (controller){
+        case ControllerType::NintendoSwitch_WirelessProController:
+        case ControllerType::NintendoSwitch_WiredProController:{
+            //  Set the grips to the joycon colors.
+            profile.left_grip = left_grip;
+            profile.right_grip = right_grip;
+            profile.body_color = body;
+            profile.button_color = buttons;
+            break;
+        }
+        case ControllerType::NintendoSwitch_WiredLeftJoycon:
+        case ControllerType::NintendoSwitch_WirelessLeftJoycon:
+            profile.button_color = buttons;
+            profile.body_color = left_grip;
+            break;
+        case ControllerType::NintendoSwitch_WiredRightJoycon:
+        case ControllerType::NintendoSwitch_WirelessRightJoycon:
+            profile.button_color = buttons;
+            profile.body_color = right_grip;
+            break;
+        default:;
+        }
+    }
+};
+
+const std::vector<JoyconColors>& OFFICIAL_JOYCON_COLORS0(){
+    //  From: https://switchbrew.org/wiki/Joy-Con#Colors
+    const static std::vector<JoyconColors> database{
+        {"Developer Black",                     0x313131, 0x0F0F0F, 0x313131, 0x0F0F0F},
+
+        {"Stock: Grey / Grey",                  0x828282, 0x0F0F0F, 0x828282, 0x0F0F0F},
+        {"Stock: Neon Blue / Neon Red",         0x0AB9E6, 0x001E1E, 0xFF3C28, 0x1E0A0A},
+        {"Stock: OLED White",                   0xE6E6E6, 0x323232, 0xE6E6E6, 0x323232},
+
+        {"Neon Red / Neon Blue",                0xFF3C28, 0x1E0A0A, 0x0AB9E6, 0x001E1E},
+        {"Blue / Neon Yellow",                  0x4655F5, 0x00000A, 0xE6FF00, 0x142800},
+        {"Neon Pink / Neon Green",              0xFF3278, 0x28001E, 0x1EDC00, 0x002800},
+        {"Neon Green / Neon Pink",              0x1EDC00, 0x002800, 0xFF3278, 0x28001E},
+        {"Neon Purple / Neon Orange",           0xB400E6, 0x140014, 0xFAA005, 0x0F0A00},
+        {"Pastel Pink / Pastel Pink",           0xFFAFAF, 0x372D2D, 0xFFAFAF, 0x372D2D},
+        {"Pastel Pink / Pastel Yellow",         0xFFAFAF, 0x372D2D, 0xF5FF82, 0x32332D},
+        {"Pastel Purple / Pastel Green",        0xF0CBEB, 0x373037, 0xBCFFC8, 0x2D322D},
+
+        {"Super Mario Odyssey Edition Red",                 0xE10F00, 0x280A0A, 0xE10F00, 0x280A0A},
+        {"Let's Go! Pikachu and Eevee",                     0xC88C32, 0x281900, 0xFFDC00, 0x322800},
+        {"Nintendo Labo Creators Contest Edition",          0xD7AA73, 0x1E1914, 0xD7AA73, 0x1E1914},
+        {"Dragon Quest XI S Lotto Edition",                 0x1473FA, 0x00000F, 0x1473FA, 0x00000F},
+        {"Disney Tsum Tsum Festival Edition",               0xB400E6, 0x140014, 0xFF3278, 0x28001E},
+        {"Animal Crossing: New Horizons Edition",           0x82FF96, 0x0A1E0A, 0x96F5F5, 0x0A1E28},
+        {"Fortnite Wildcat Edition",                        0xFFCC00, 0x1A1100, 0x0084FF, 0x000F1E},
+        {"Mario Red x Blue Edition",                        0xF04614, 0x1E1914, 0xF04614, 0x1E1914},
+        {"Fortnite Fleet Force Edition",                    0x0084FF, 0x000F1E, 0xFFCC00, 0x1A1100},
+        {"Legend of Zelda: Skyward Sword Edition",          0x2D50F0, 0x1E0F46, 0x500FC8, 0x00051E},
+        {"Splatoon 3 OLED Edition",                         0x6455F5, 0x28282D, 0xC3FA05, 0x1E1E28},
+        {"Pokémon: Scarlet x Violet OLED Edition",          0xF07341, 0x322D1E, 0x9650AA, 0x32322D},
+        {"Legend of Zelda: Tears of the Kingdom Edition",   0xD2BE69, 0x32322D, 0xD2BE69, 0x32322D},
+    };
+    return database;
+}
+const std::vector<ProconColors>& OFFICIAL_PROCON_COLORS0(){
+    //  From: https://gbatemp.net/threads/people-with-special-edition-pro-controllers-i-need-your-help-with-colors.627413/
+    const static std::vector<ProconColors> database{
+        {"Procon: Stock Black",                     0x323232, 0x323232, 0x323232, 0xFFFFFF},    //  This is just a guess.
+        {"Procon: Super Smash Bros. Ultimate",      0xFFFFFF, 0xFFFFFF, 0x2D2D2D, 0xE6E6E6},
+        {"Procon: Monster Hunter Rise",             0x474646, 0x474646, 0x2E2D2D, 0xE7E6E6},
+        {"Procon: Monster Hunter Sunbreak",         0x464646, 0x464646, 0x2D2E2D, 0xE7E6E6},
+        {"Procon: Zelda Tears of the Kingdom",      0x464646, 0xFFFFFF, 0x2D2D2D, 0xE6E6E6},
+//        {"Procon: Xenoblade Chronicles 2",          0xFFFFFF, 0xFFFFFF, 0x323132, 0xFFFFFF},    //  The actual values. Switch automatically replaces grips with pink.
+        {"Procon: Xenoblade Chronicles 2",          0xff3a66, 0xff3a66, 0x323132, 0xFFFFFF},    //  Grip color is a guess.
+        {"Procon: Splatoon 2",                      0x1EDC00, 0xFF3278, 0x2D2D2D, 0xE6E6E6},    //  This is just a guess.
+        {"Procon: Splatoon 3",                      0x6455F5, 0xC3FA05, 0x2D2D2D, 0xE6E6E6},
+        {"Procon: Splatoon Octopus (unofficial)",   0xFFFF00, 0xFFFF00, 0x5916AC, 0xE6E6E6},
+    };
+    return database;
+}
+std::vector<const ControllerColors*> make_OFFICIAL_CONTROLLER_COLORS(){
+    std::vector<const ControllerColors*> ret;
+    for (const JoyconColors& item : OFFICIAL_JOYCON_COLORS0()){
+        ret.emplace_back(&item);
+    }
+    for (const ProconColors& item : OFFICIAL_PROCON_COLORS0()){
+        ret.emplace_back(&item);
+    }
+    return ret;
+}
+const std::vector<const ControllerColors*> OFFICIAL_CONTROLLER_COLORS(){
+    static const std::vector<const ControllerColors*> database = make_OFFICIAL_CONTROLLER_COLORS();
+    return database;
+}
+
+StringSelectDatabase make_CONTROLLER_DATABASE(){
+    StringSelectDatabase database;
+    database.add_entry(StringSelectEntry("Custom", "Custom"));
+    for (const JoyconColors& item : OFFICIAL_JOYCON_COLORS0()){
+        database.add_entry(
+            StringSelectEntry(item.name, item.name)
+        );
+    }
+    for (const ProconColors& item : OFFICIAL_PROCON_COLORS0()){
+        database.add_entry(
+            StringSelectEntry(item.name, item.name)
+        );
+    }
+    return database;
+}
+const StringSelectDatabase& CONTROLLER_DATABASE(){
+    static const StringSelectDatabase database = make_CONTROLLER_DATABASE();
+    return database;
+}
+
+
+
+
+
+const EnumDropdownDatabase<ControllerType>& ControllerSettingsType_Database(){
+    static const EnumDropdownDatabase<ControllerType> database({
+        {ControllerType::NintendoSwitch_WirelessProController,  "pro-controller",   "NS1: Pro Controller"},
+        {ControllerType::NintendoSwitch_WirelessLeftJoycon,     "left-joycon",      "NS1: Left Joycon"},
+        {ControllerType::NintendoSwitch_WirelessRightJoycon,    "right-joycon",     "NS1: Right Joycon"},
+    });
+    return database;
+}
+
+
+
+ControllerSettingsRow::~ControllerSettingsRow(){
+    randomize.remove_listener(static_cast<ButtonListener&>(*this));
+    official_color.remove_listener(*this);
+#if 1
+    right_grip.remove_listener(*this);
+    left_grip.remove_listener(*this);
+//    body_color.remove_listener(*this);
+    button_color.remove_listener(*this);
+#endif
+    controller.remove_listener(*this);
+}
+ControllerSettingsRow::ControllerSettingsRow(EditableTableOption& parent_table, bool random_profile)
+    : EditableTableRow(parent_table)
+    , name(false, LockMode::UNLOCK_WHILE_RUNNING, "", "COM3")
+    , controller_mac_address(LockMode::UNLOCK_WHILE_RUNNING, 6, nullptr)
+    , controller(
+        ControllerSettingsType_Database(),
+        LockMode::UNLOCK_WHILE_RUNNING,
+        ControllerType::NintendoSwitch_WirelessProController
+    )
+    , button_color(
+        LockMode::UNLOCK_WHILE_RUNNING,
+        false,
+        0x0A1E19, 0x0A1E19
+    )
+    , body_color(
+        LockMode::UNLOCK_WHILE_RUNNING,
+        false,
+        0xd0d0d0, 0xd0d0d0
+    )
+    , left_grip(
+        LockMode::UNLOCK_WHILE_RUNNING,
+        false,
+        0x82FF96, 0x82FF96
+    )
+    , right_grip(
+        LockMode::UNLOCK_WHILE_RUNNING,
+        false,
+        0x96F5F5, 0x96F5F5
+    )
+    , official_color(
+        CONTROLLER_DATABASE(),
+        LockMode::UNLOCK_WHILE_RUNNING,
+        0
+    )
+    , randomize("Randomize")
+    , m_pending_official_load(0)
+{
+    add_option(name, "Name");
+    add_option(controller_mac_address, "Controller MAC Address");
+    add_option(controller, "Controller");
+    add_option(button_color, "Button");
+    add_option(body_color, "Body");
+    add_option(left_grip, "Left Grip");
+    add_option(right_grip, "Right Grip");
+    add_option(randomize, "Randomize");
+    add_option(official_color, "Official Color");
+
+    if (random_profile){
+        set_profile(ControllerSettingsTable::random_profile(controller, nullptr));
+    }
+
+    controller.add_listener(*this);
+#if 1
+    button_color.add_listener(*this);
+//    body_color.add_listener(*this);
+    left_grip.add_listener(*this);
+    right_grip.add_listener(*this);
+#endif
+    official_color.add_listener(*this);
+    randomize.add_listener(static_cast<ButtonListener&>(*this));
+}
+std::unique_ptr<EditableTableRow> ControllerSettingsRow::clone() const{
+    std::unique_ptr<ControllerSettingsRow> ret(new ControllerSettingsRow(parent()));
+    ret->name.set((std::string)name);
+    ret->controller_mac_address = controller_mac_address;
+    ret->controller.set(controller);
+    ret->button_color.set(button_color);
+    ret->body_color.set(body_color);
+    ret->left_grip.set(left_grip);
+    ret->right_grip.set(right_grip);
+    ret->official_color.set_by_index(official_color.index());
+    return ret;
+}
+void ControllerSettingsRow::on_config_value_changed(void* object){
+    if (object == &button_color ||
+//        object == &body_color ||
+        object == &left_grip ||
+        object == &right_grip
+    ){
+        if (m_pending_official_load.load(std::memory_order_relaxed) == 0){
+            official_color.set_by_index(0);
+        }
+        return;
+    }
+
+    if (object == &controller){
+        ConfigOptionState state;
+        switch (controller){
+        case ControllerType::NintendoSwitch_WirelessProController:
+        case ControllerType::NintendoSwitch_WiredProController:
+            state = ConfigOptionState::ENABLED;
+            break;
+        default:
+            state = ConfigOptionState::HIDDEN;
+        }
+        left_grip.set_visibility(state);
+        right_grip.set_visibility(state);
+
+        //  Force an update on the chosen theme.
+        object = &official_color;
+    }
+
+    if (object != &official_color){
+        return;
+    }
+
+    size_t index = official_color.index();
+    if (index == 0){
+        return;
+    }
+
+    try{
+        m_pending_official_load++;
+
+        ControllerProfile profile{};
+        OFFICIAL_CONTROLLER_COLORS()[index - 1]->write_to_profile(profile, controller);
+        this->set_profile(profile);
+
+        m_pending_official_load--;
+    }catch (...){
+        m_pending_official_load--;
+        throw;
+    }
+
+}
+void ControllerSettingsRow::on_press(ButtonCell& button){
+    set_profile(ControllerSettingsTable::random_profile(controller, nullptr));
+}
+
+
+
+
+ControllerSettingsTable::ControllerSettingsTable()
+    : EditableTableOption_t<ControllerSettingsRow>(
+        "<b>OEM Controller Settings:</b><br><br>"
+        "The OEM controllers (official Joycons and Pro Controller) support colors. "
+        "This table will let you customize those colors."
+        "<br>"
+        "The \"Name\" column is an arbitrary text field to help you identify which device it is. "
+        "By default it uses the name of the serial port. But this can be misleading if the port has changed. "
+        "<br>"
+        "Do not change the MAC address as it is used to identify which device the row belongs to. "
+        "Changing it will not actually change the MAC address of the device."
+        "<br><br>"
+        "Changes take effect after resetting the device.",
+        LockMode::UNLOCK_WHILE_RUNNING
+    )
+{}
+std::vector<std::string> ControllerSettingsTable::make_header() const{
+    return std::vector<std::string>{
+        "Name",
+        "MAC Address",
+        "Controller",
+        "Button",
+        "Body",
+        "Left Grip",
+        "Right Grip",
+        "",
+        "Quick Select",
+    };
+}
+
+
+uint32_t invert_RGB32(uint32_t x){
+    uint8_t r = (uint8_t)(x >> 16);
+    uint8_t g = (uint8_t)(x >>  8);
+    uint8_t b = (uint8_t)(x >>  0);
+    r = 255 - r;
+    g = 255 - g;
+    b = 255 - b;
+    return
+        ((uint32_t)r << 16) |
+        ((uint32_t)g <<  8) |
+        ((uint32_t)b <<  0);
+}
+bool is_white(uint32_t x){
+    uint8_t r = (uint8_t)(x >> 16);
+    uint8_t g = (uint8_t)(x >>  8);
+    uint8_t b = (uint8_t)(x >>  0);
+    return r >= 0xf0 && g >= 0xf0 && b >= 0xf0;
+}
+bool is_black(uint32_t x){
+    uint8_t r = (uint8_t)(x >> 16);
+    uint8_t g = (uint8_t)(x >>  8);
+    uint8_t b = (uint8_t)(x >>  0);
+    return r < 0x20 && g < 0x20 && b < 0x20;
+}
+
+
+ControllerProfile ControllerSettingsTable::random_profile(
+    ControllerType controller,
+    const uint8_t* mac_address
+){
+    const std::vector<const ControllerColors*>& DATABASE = OFFICIAL_CONTROLLER_COLORS();
+
+    //  Ban all colors are the similar to the stock colors.
+    static const std::set<std::string> BLACK_LIST{
+        "Developer Black",
+        "Stock: Grey / Grey",
+        "Procon: Stock Black",
+        "Procon: Monster Hunter Rise",
+        "Procon: Monster Hunter Sunbreak",
+    };
+
+    ControllerProfile profile;
+
+    uint32_t seed = 0;
+    for (size_t c = 0; c < 100; c++, seed++){
+        if (mac_address){
+            pabb_crc32c_buffer(&seed, mac_address, 6 * sizeof(uint8_t));
+        }else{
+            uint64_t seed64 = std::chrono::high_resolution_clock::now().time_since_epoch().count();
+            pabb_crc32c_buffer(&seed, &seed64, sizeof(seed64));
+        }
+
+        size_t index = seed % DATABASE.size();
+//        cout << "index = " << index << ", seed = " << seed << ", size = " << DATABASE.size() << endl;
+
+        DATABASE[index]->write_to_profile(profile, controller);
+        if (BLACK_LIST.contains(profile.official_name)){
+            continue;
+        }
+
+//        cout << "name: " << profile.official_name << endl;
+
+        //  Apply random shuffles.
+        if (seed & 0x80000000){
+            profile.official_name.clear();
+            std::swap(profile.body_color, profile.button_color);
+        }
+        if (seed & 0x40000000){
+            profile.official_name.clear();
+            profile.body_color = invert_RGB32(profile.body_color);
+        }
+        if (seed & 0x20000000){
+            profile.official_name.clear();
+            profile.left_grip = invert_RGB32(profile.left_grip);
+        }
+        if (seed & 0x10000000){
+            profile.official_name.clear();
+            profile.right_grip = invert_RGB32(profile.right_grip);
+        }
+
+        //  Run blacklists.
+        if (is_black(profile.left_grip)){
+            continue;
+        }
+        if (is_black(profile.right_grip)){
+            continue;
+        }
+
+        break;
+    }
+
+//    cout << tostr_hex(profile.body_color) << endl;
+//    cout << tostr_hex(profile.left_grip) << endl;
+//    cout << tostr_hex(profile.right_grip) << endl;
+
+    return profile;
+}
+ControllerProfile ControllerSettingsTable::get_or_make_profile(
+    const uint8_t mac_address[6],
+    const std::string& name,
+    ControllerType controller
+){
+//    cout << "ControllerSettingsTable::get_or_make_profile(): " << this << endl;
+
+    ControllerProfile profile{};
+
+    //  Only relevant to Switch controllers.
+    switch (controller){
+    case ControllerType::NintendoSwitch_WiredProController:
+    case ControllerType::NintendoSwitch_WirelessProController:
+        controller = ControllerType::NintendoSwitch_WirelessProController;
+        break;
+    case ControllerType::NintendoSwitch_WiredLeftJoycon:
+    case ControllerType::NintendoSwitch_WirelessLeftJoycon:
+        controller = ControllerType::NintendoSwitch_WirelessLeftJoycon;
+        break;
+    case ControllerType::NintendoSwitch_WiredRightJoycon:
+    case ControllerType::NintendoSwitch_WirelessRightJoycon:
+        controller = ControllerType::NintendoSwitch_WirelessRightJoycon;
+        break;
+//    case ControllerType::NintendoSwitch2_WiredProController:
+//    case ControllerType::NintendoSwitch2_WirelessProController:
+//        controller = ControllerType::NintendoSwitch2_WirelessProController;
+//        break;
+//    case ControllerType::NintendoSwitch2_WiredLeftJoycon:
+//    case ControllerType::NintendoSwitch2_WirelessLeftJoycon:
+//        controller = ControllerType::NintendoSwitch2_WirelessLeftJoycon;
+//        break;
+//    case ControllerType::NintendoSwitch2_WiredRightJoycon:
+//    case ControllerType::NintendoSwitch2_WirelessRightJoycon:
+//        controller = ControllerType::NintendoSwitch2_WirelessRightJoycon;
+//        break;
+        break;
+    default:
+        return profile;
+    }
+
+    bool found = false;
+    this->run_on_all_rows([&, controller](ControllerSettingsRow& row){
+        if (row.controller_mac_address != mac_address || row.controller != controller){
+            return false;
+        }
+
+        global_logger_tagged().log("ControllerSettingsTable: Found matching MAC address. Loading profile...");
+        row.controller.set(controller);
+        found = true;
+        profile = row;
+        return true;
+    });
+
+    if (found){
+        return profile;
+    }
+
+    global_logger_tagged().log("ControllerSettingsTable: Creating new profile...");
+
+    profile = random_profile(controller, mac_address);
+
+    std::unique_ptr<ControllerSettingsRow> row(new ControllerSettingsRow(*this, false));
+    row->name.set(name);
+    row->controller_mac_address.set(mac_address);
+    row->controller.set(controller);
+    row->set_profile(profile);
+
+    this->append_row(std::move(row));
+//    PERSISTENT_SETTINGS().write();
+
+#ifdef QT_CORE_LIB
+    //  This is brutal (tech-debt). The only way to force the settings to save
+    //  is to load the panel. TODO: Redesign panels to allow external editing.
+    //  This is also coming in from a different thread (not the main Qt thread).
+    OptionsPanelWrapper<ConsoleSettingsPanel>().make_panel()->save_settings();
+#endif
+
+    return profile;
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/NintendoSwitch/Controllers/NintendoSwitch_ControllerSettings.h b/SerialPrograms/Source/NintendoSwitch/Controllers/NintendoSwitch_ControllerSettings.h
new file mode 100644
index 0000000000..52be2c6443
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Controllers/NintendoSwitch_ControllerSettings.h
@@ -0,0 +1,100 @@
+/*  Nintendo Switch Controller Settings
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_NintendoSwitch_ControllerSettings_H
+#define PokemonAutomation_NintendoSwitch_ControllerSettings_H
+
+#include "Common/Cpp/Options/StringOption.h"
+#include "Common/Cpp/Options/ColorOption.h"
+#include "Common/Cpp/Options/EnumDropdownOption.h"
+#include "Common/Cpp/Options/MacAddressOption.h"
+#include "Common/Cpp/Options/ButtonOption.h"
+#include "Common/Cpp/Options/EditableTableOption.h"
+#include "CommonTools/Options/StringSelectOption.h"
+#include "Controllers/ControllerTypes.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+
+
+struct ControllerProfile{
+    uint32_t button_color;
+    uint32_t body_color;
+    uint32_t left_grip;
+    uint32_t right_grip;
+    std::string official_name;
+};
+
+class ControllerSettingsRow
+    : public EditableTableRow
+    , public ConfigOption::Listener
+    , private ButtonListener
+{
+public:
+    ~ControllerSettingsRow();
+    ControllerSettingsRow(EditableTableOption& parent_table, bool random_profile = true);
+    virtual std::unique_ptr<EditableTableRow> clone() const override;
+
+    operator ControllerProfile() const{
+        return {
+            button_color,
+            body_color,
+            left_grip,
+            right_grip,
+            official_color.slug(),
+        };
+    }
+    void set_profile(const ControllerProfile& profile){
+        button_color.set(profile.button_color);
+        body_color.set(profile.body_color);
+        left_grip.set(profile.left_grip);
+        right_grip.set(profile.right_grip);
+        official_color.set_by_slug(profile.official_name);
+    }
+
+private:
+    virtual void on_config_value_changed(void* object) override;
+    virtual void on_press(ButtonCell& button) override;
+
+public:
+    StringCell name;
+    MacAddressCell controller_mac_address;
+    EnumDropdownCell<ControllerType> controller;
+    ColorCell button_color;
+    ColorCell body_color;
+    ColorCell left_grip;
+    ColorCell right_grip;
+    StringSelectCell official_color;
+    ButtonCell randomize;
+
+private:
+    std::atomic<size_t> m_pending_official_load;
+};
+
+
+class ControllerSettingsTable : public EditableTableOption_t<ControllerSettingsRow>{
+public:
+    ControllerSettingsTable();
+    virtual std::vector<std::string> make_header() const override;
+
+    static ControllerProfile random_profile(
+        ControllerType controller,
+        const uint8_t* mac_address
+    );
+
+    ControllerProfile get_or_make_profile(
+        const uint8_t mac_address[6],
+        const std::string& name,
+        ControllerType controller
+    );
+
+};
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/NintendoSwitch/Controllers/NintendoSwitch_ControllerWithScheduler.cpp b/SerialPrograms/Source/NintendoSwitch/Controllers/NintendoSwitch_ControllerWithScheduler.cpp
new file mode 100644
index 0000000000..d1e3f316bb
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Controllers/NintendoSwitch_ControllerWithScheduler.cpp
@@ -0,0 +1,464 @@
+/*  Nintendo Switch Controller (With Scheduler)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  This implements most of the SwitchController API using only the controller
+ *  state function. It uses SuperscalarScheduler to do this.
+ *
+ */
+
+#include "Common/Cpp/PrettyPrint.h"
+#include "NintendoSwitch_ControllerWithScheduler.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+using namespace std::chrono_literals;
+
+
+
+void ControllerWithScheduler::issue_buttons(
+    Cancellable* cancellable,
+    Milliseconds delay, Milliseconds hold, Milliseconds cooldown,
+    Button button
+){
+    SuperscalarScheduler::Schedule schedule;
+    std::lock_guard<Mutex> lg0(m_issue_lock);
+    {
+        std::lock_guard<Mutex> lg1(m_state_lock);
+        if (cancellable){
+            cancellable->throw_if_cancelled();
+        }
+        for (size_t c = 0; c < TOTAL_BUTTONS; c++){
+            ButtonFlagType mask = (ButtonFlagType)1 << c;
+            if (button & mask){
+                m_scheduler.issue_wait_for_resource(schedule, c);
+            }
+        }
+        for (size_t c = 0; c < TOTAL_BUTTONS; c++){
+            ButtonFlagType mask = (ButtonFlagType)1 << c;
+            if (button & mask){
+                m_scheduler.issue_to_resource(
+                    schedule,
+                    std::make_unique<SwitchCommand_Button>((SwitchResource)c),
+                    WallDuration::zero(), hold, cooldown
+                );
+            }
+        }
+        m_scheduler.issue_nop(schedule, delay);
+    }
+    execute_schedule(cancellable, schedule);
+    if (m_logging_throttler){
+        m_logger.log(
+            "issue_buttons(): " + button_to_string(button) +
+            ", delay = " + std::to_string(delay.count()) + "ms" +
+            ", hold = " + std::to_string(hold.count()) + "ms" +
+            ", cooldown = " + std::to_string(cooldown.count()) + "ms",
+            COLOR_DARKGREEN
+        );
+    }
+}
+void ControllerWithScheduler::issue_dpad(
+    Cancellable* cancellable,
+    Milliseconds delay, Milliseconds hold, Milliseconds cooldown,
+    DpadPosition position
+){
+    SuperscalarScheduler::Schedule schedule;
+    std::lock_guard<Mutex> lg0(m_issue_lock);
+    {
+        std::lock_guard<Mutex> lg1(m_state_lock);
+        if (cancellable){
+            cancellable->throw_if_cancelled();
+        }
+        m_scheduler.issue_to_resource(
+            schedule,
+            std::make_unique<SwitchCommand_Dpad>(position),
+            delay, hold, cooldown
+        );
+    }
+    execute_schedule(cancellable, schedule);
+    if (m_logging_throttler){
+        m_logger.log(
+            "issue_dpad(): " + dpad_to_string(position) +
+            ", delay = " + std::to_string(delay.count()) + "ms" +
+            ", hold = " + std::to_string(hold.count()) + "ms" +
+            ", cooldown = " + std::to_string(cooldown.count()) + "ms",
+            COLOR_DARKGREEN
+        );
+    }
+}
+void ControllerWithScheduler::issue_left_joystick(
+    Cancellable* cancellable,
+    Milliseconds delay, Milliseconds hold, Milliseconds cooldown,
+    const JoystickPosition& position
+){
+    auto command = std::make_unique<SwitchCommand_LeftJoystick>(position);
+
+    SuperscalarScheduler::Schedule schedule;
+    std::lock_guard<Mutex> lg0(m_issue_lock);
+    {
+        std::lock_guard<Mutex> lg1(m_state_lock);
+        if (cancellable){
+            cancellable->throw_if_cancelled();
+        }
+        m_scheduler.issue_to_resource(
+            schedule,
+            std::move(command),
+            delay, hold, cooldown
+        );
+    }
+    execute_schedule(cancellable, schedule);
+    if (m_logging_throttler){
+        m_logger.log(
+            "issue_left_joystick(): (" + tostr_fixed(position.x, 3) + "," + tostr_fixed(position.y, 3) + ")" +
+            ", delay = " + std::to_string(delay.count()) + "ms" +
+            ", hold = " + std::to_string(hold.count()) + "ms" +
+            ", cooldown = " + std::to_string(cooldown.count()) + "ms",
+            COLOR_DARKGREEN
+        );
+    }
+}
+void ControllerWithScheduler::issue_right_joystick(
+    Cancellable* cancellable,
+    Milliseconds delay, Milliseconds hold, Milliseconds cooldown,
+    const JoystickPosition& position
+){
+    auto command = std::make_unique<SwitchCommand_RightJoystick>(position);
+
+    SuperscalarScheduler::Schedule schedule;
+    std::lock_guard<Mutex> lg0(m_issue_lock);
+    {
+        std::lock_guard<Mutex> lg1(m_state_lock);
+        if (cancellable){
+            cancellable->throw_if_cancelled();
+        }
+        m_scheduler.issue_to_resource(
+            schedule,
+            std::move(command),
+            delay, hold, cooldown
+        );
+    }
+    execute_schedule(cancellable, schedule);
+    if (m_logging_throttler){
+        m_logger.log(
+            "issue_right_joystick(): (" + tostr_fixed(position.x, 3) + "," + tostr_fixed(position.y, 3) + ")" +
+            ", delay = " + std::to_string(delay.count()) + "ms" +
+            ", hold = " + std::to_string(hold.count()) + "ms" +
+            ", cooldown = " + std::to_string(cooldown.count()) + "ms",
+            COLOR_DARKGREEN
+        );
+    }
+}
+
+
+
+void ControllerWithScheduler::issue_gyro(
+    Cancellable* cancellable,
+    SwitchResource id, const char* name,
+    Milliseconds delay, Milliseconds hold, Milliseconds cooldown,
+    int16_t value
+){
+    SuperscalarScheduler::Schedule schedule;
+    std::lock_guard<Mutex> lg0(m_issue_lock);
+    {
+        std::lock_guard<Mutex> lg1(m_state_lock);
+        if (cancellable){
+            cancellable->throw_if_cancelled();
+        }
+        m_scheduler.issue_to_resource(
+            schedule,
+            std::make_unique<SwitchCommand_Gyro>(id, value),
+            delay, hold, cooldown
+        );
+    }
+    execute_schedule(cancellable, schedule);
+    if (m_logging_throttler){
+        m_logger.log(
+            std::string(name) + "(): (" + std::to_string(value) + ")" +
+            ", delay = " + std::to_string(delay.count()) + "ms" +
+            ", hold = " + std::to_string(hold.count()) + "ms" +
+            ", cooldown = " + std::to_string(cooldown.count()) + "ms",
+            COLOR_DARKGREEN
+        );
+    }
+}
+
+
+
+void ControllerWithScheduler::issue_full_controller_state(
+    Cancellable* cancellable,
+    bool enable_logging,
+    Milliseconds hold,
+    Button button,
+    DpadPosition dpad,
+    const JoystickPosition& left_joystick,
+    const JoystickPosition& right_joystick
+){
+    SuperscalarScheduler::Schedule schedule;
+    std::lock_guard<Mutex> lg0(m_issue_lock);
+    {
+        std::lock_guard<Mutex> lg1(m_state_lock);
+        if (cancellable){
+            cancellable->throw_if_cancelled();
+        }
+
+#if 0
+        for (size_t c = 0; c < TOTAL_BUTTONS; c++){
+            ButtonFlagType mask = (ButtonFlagType)1 << c;
+            if (button & mask){
+                m_scheduler.issue_wait_for_resource(schedule, (size_t)c);
+            }
+        }
+        m_scheduler.issue_wait_for_resource(schedule, (size_t)SwitchResource::DPAD);
+        m_scheduler.issue_wait_for_resource(schedule, (size_t)SwitchResource::JOYSTICK_LEFT);
+        m_scheduler.issue_wait_for_resource(schedule, (size_t)SwitchResource::JOYSTICK_RIGHT);
+#else
+        m_scheduler.issue_wait_for_all(schedule);
+#endif
+
+        for (size_t c = 0; c < TOTAL_BUTTONS; c++){
+            ButtonFlagType mask = (ButtonFlagType)1 << c;
+            if (button & mask){
+                m_scheduler.issue_to_resource(
+                    schedule,
+                    std::make_unique<SwitchCommand_Button>((SwitchResource)c),
+                    WallDuration::zero(), hold, WallDuration::zero()
+                );
+            }
+        }
+        m_scheduler.issue_to_resource(
+            schedule,
+            std::make_unique<SwitchCommand_Dpad>(dpad),
+            WallDuration::zero(), hold, WallDuration::zero()
+        );
+        m_scheduler.issue_to_resource(
+            schedule,
+            std::make_unique<SwitchCommand_LeftJoystick>(left_joystick),
+            WallDuration::zero(), hold, WallDuration::zero()
+        );
+        m_scheduler.issue_to_resource(
+            schedule,
+            std::make_unique<SwitchCommand_RightJoystick>(right_joystick),
+            hold, hold, WallDuration::zero()
+        );
+    }
+    execute_schedule(cancellable, schedule);
+    if (m_logging_throttler){
+        //  Do not log the contents of the command due to privacy concerns.
+        //  (people entering passwords)
+        if (enable_logging){
+            m_logger.log(
+                "issue_controller_state(): (" + button_to_string(button) +
+                "), dpad(" + dpad_to_string(dpad) +
+                "), LJ(" + tostr_fixed(left_joystick.x, 3) + "," + tostr_fixed(left_joystick.y, 3) +
+                "), RJ(" + tostr_fixed(right_joystick.x, 3) + "," + tostr_fixed(right_joystick.y, 3) +
+                "), hold = " + std::to_string(hold.count()) + "ms",
+                COLOR_DARKGREEN
+            );
+        }else{
+            m_logger.log(
+                "issue_controller_state(): hold = " + std::to_string(hold.count()) + "ms",
+                COLOR_DARKGREEN
+            );
+        }
+    }
+}
+
+
+void ControllerWithScheduler::issue_mash_button(
+    Cancellable* cancellable,
+    Milliseconds duration,
+    Button button,
+    Milliseconds delay,
+    Milliseconds hold,
+    Milliseconds cooldown
+){
+    if (cancellable){
+        cancellable->throw_if_cancelled();
+    }
+    ThrottleScope scope(m_logging_throttler);
+    bool log = true;
+    while (duration > Milliseconds::zero()){
+        issue_buttons(cancellable, delay, hold, cooldown, button);
+
+        //  We never log before the first issue to avoid delaying the critical path.
+        //  But we do want to log before the mash spam. So we log after the first
+        //  issue, but before the second.
+        if (log && scope){
+            m_logger.log(
+                "issue_mash_button(): " + button_to_string(button) +
+                ", duration = " + std::to_string(duration.count()) + "ms",
+                COLOR_DARKGREEN
+            );
+        }
+        log = false;
+
+        Milliseconds elapsed = std::max(delay, hold + cooldown);
+        duration = duration >= elapsed
+            ? duration - elapsed
+            : Milliseconds::zero();
+    }
+}
+void ControllerWithScheduler::issue_mash_button(
+    Cancellable* cancellable,
+    Milliseconds duration,
+    Button button0, Button button1
+){
+    if (cancellable){
+        cancellable->throw_if_cancelled();
+    }
+    ThrottleScope scope(m_logging_throttler);
+    bool log = true;
+    while (duration > Milliseconds::zero()){
+        issue_buttons(cancellable, 4*8ms, 5*8ms, 3*8ms, button0);
+        issue_buttons(cancellable, 4*8ms, 5*8ms, 3*8ms, button1);
+
+        //  We never log before the first issue to avoid delaying the critical path.
+        //  But we do want to log before the mash spam. So we log after the first
+        //  issue, but before the second.
+        if (log && scope){
+            m_logger.log(
+                "issue_mash_button(): (" + button_to_string(button0) +
+                "), (" + button_to_string(button1) +
+                "), duration = " + std::to_string(duration.count()) + "ms",
+                COLOR_DARKGREEN
+            );
+        }
+        log = false;
+
+        duration -= std::min(8*8ms, duration);
+    }
+}
+void ControllerWithScheduler::issue_mash_AZs(
+    Cancellable* cancellable,
+    Milliseconds duration
+){
+    if (cancellable){
+        cancellable->throw_if_cancelled();
+    }
+    ThrottleScope scope(m_logging_throttler);
+    bool log = true;
+    while (true){
+        if (duration <= Milliseconds::zero()){
+            break;
+        }
+        issue_buttons(cancellable, 3*8ms, 6*8ms, 3*8ms, BUTTON_A);
+
+        //  We never log before the first issue to avoid delaying the critical path.
+        //  But we do want to log before the mash spam. So we log after the first
+        //  issue, but before the second.
+        if (log && scope){
+            m_logger.log(
+                "issue_mash_AZs(): duration = " + std::to_string(duration.count()) + "ms",
+                COLOR_DARKGREEN
+            );
+        }
+        log = false;
+
+        duration -= std::min(3*8ms, duration);
+        if (duration <= Milliseconds::zero()){
+            break;
+        }
+        issue_buttons(cancellable, 3*8ms, 6*8ms, 3*8ms, BUTTON_ZL);
+        duration -= std::min(3*8ms, duration);
+
+        if (duration <= Milliseconds::zero()){
+            break;
+        }
+        issue_buttons(cancellable, 3*8ms, 6*8ms, 3*8ms, BUTTON_ZR);
+        duration -= std::min(3*8ms, duration);
+    }
+}
+void ControllerWithScheduler::issue_system_scroll(
+    Cancellable* cancellable,
+    Milliseconds delay, Milliseconds hold, Milliseconds cooldown,
+    DpadPosition direction  //  Diagonals not allowed.
+){
+    if (cancellable){
+        cancellable->throw_if_cancelled();
+    }
+
+    ThrottleScope scope(m_logging_throttler);
+
+    WallClock dpad = m_scheduler.busy_until((size_t)SwitchResource::DPAD);
+    WallClock left_joystick = m_scheduler.busy_until((size_t)SwitchResource::JOYSTICK_LEFT);
+    WallClock right_joystick = m_scheduler.busy_until((size_t)SwitchResource::JOYSTICK_RIGHT);
+
+    do{
+        if (dpad <= left_joystick && dpad <= right_joystick){
+            issue_dpad(
+                cancellable,
+                delay, hold, cooldown,
+                direction
+            );
+            break;
+        }
+
+        double x = 0;
+        double y = 0;
+        switch (direction){
+        case DPAD_NONE:
+            x = 0;
+            y = 0;
+            break;
+        case DPAD_UP:
+            x = 0;
+            y = +1;
+            break;
+        case DPAD_RIGHT:
+            x = +1;
+            y = 0;
+            break;
+        case DPAD_DOWN:
+            x = 0;
+            y = -1;
+            break;
+        case DPAD_LEFT:
+            x = -1;
+            y = 0;
+            break;
+
+        //  These diagonal ones probably don't work.
+        case DPAD_UP_RIGHT:
+            x = +1;
+            y = +1;
+            break;
+        case DPAD_DOWN_RIGHT:
+            x = +1;
+            y = -1;
+            break;
+        case DPAD_DOWN_LEFT:
+            x = -1;
+            y = -1;
+            break;
+        case DPAD_UP_LEFT:
+            x = -1;
+            y = +1;
+            break;
+        }
+
+        if (left_joystick <= dpad && left_joystick <= right_joystick){
+            issue_left_joystick(cancellable, delay, hold, cooldown, JoystickPosition(x, y));
+        }else{
+            issue_right_joystick(cancellable, delay, hold, cooldown, JoystickPosition(x, y));
+        }
+    }while (false);
+
+    if (scope){
+        m_logger.log(
+            "issue_system_scroll(): " + dpad_to_string(direction) +
+            ", delay = " + std::to_string(delay.count()) + "ms" +
+            ", hold = " + std::to_string(hold.count()) + "ms" +
+            ", cooldown = " + std::to_string(cooldown.count()) + "ms",
+            COLOR_DARKGREEN
+        );
+    }
+
+}
+
+
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/NintendoSwitch/Controllers/NintendoSwitch_ControllerWithScheduler.h b/SerialPrograms/Source/NintendoSwitch/Controllers/NintendoSwitch_ControllerWithScheduler.h
new file mode 100644
index 0000000000..0103b0f1b2
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Controllers/NintendoSwitch_ControllerWithScheduler.h
@@ -0,0 +1,293 @@
+/*  Nintendo Switch Controller (With Scheduler)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  This implements most of the SwitchController API using only the controller
+ *  state function. It uses SuperscalarScheduler to do this.
+ *
+ */
+
+#ifndef PokemonAutomation_NintendoSwitch_ControllerWithScheduler_H
+#define PokemonAutomation_NintendoSwitch_ControllerWithScheduler_H
+
+#include "Common/Cpp/CancellableScope.h"
+#include "Controllers/Joystick.h"
+#include "Controllers/Schedulers/ControllerWithScheduler.h"
+#include "NintendoSwitch_ControllerButtons.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+
+struct SwitchControllerState{
+    Button buttons = BUTTON_NONE;
+    DpadPosition dpad = DpadPosition::DPAD_NONE;
+    JoystickPosition left_joystick;
+    JoystickPosition right_joystick;
+
+    uint16_t gyro[6] = {};
+};
+
+
+enum class SwitchResource{
+    BUTTON_NONE,
+    BUTTON_Y,
+    BUTTON_B,
+    BUTTON_A,
+    BUTTON_X,
+    BUTTON_L,
+    BUTTON_R,
+    BUTTON_ZL,
+    BUTTON_ZR,
+    BUTTON_MINUS,
+    BUTTON_PLUS,
+    BUTTON_LCLICK,
+    BUTTON_RCLICK,
+    BUTTON_HOME,
+    BUTTON_CAPTURE,
+    BUTTON_GR,
+    BUTTON_GL,
+    BUTTON_UP,
+    BUTTON_RIGHT,
+    BUTTON_DOWN,
+    BUTTON_LEFT,
+    BUTTON_LEFT_SL,
+    BUTTON_LEFT_SR,
+    BUTTON_RIGHT_SL,
+    BUTTON_RIGHT_SR,
+    BUTTON_C,
+
+    DPAD,
+    JOYSTICK_LEFT,
+    JOYSTICK_RIGHT,
+
+    GYRO_ACCEL_X,
+    GYRO_ACCEL_Y,
+    GYRO_ACCEL_Z,
+    GYRO_ROTATE_X,
+    GYRO_ROTATE_Y,
+    GYRO_ROTATE_Z,
+};
+
+class SwitchCommand : public SchedulerResource{
+public:
+    using SchedulerResource::SchedulerResource;
+    virtual void apply(SwitchControllerState& state) const = 0;
+};
+class SwitchCommand_Button : public SwitchCommand{
+public:
+    SwitchCommand_Button(SwitchResource id)
+        : SwitchCommand((size_t)id)
+    {}
+    virtual void apply(SwitchControllerState& state) const{
+        state.buttons |= (Button)((ButtonFlagType)1 << id);
+    }
+};
+struct SwitchCommand_Dpad : public SwitchCommand{
+    DpadPosition position;
+
+    SwitchCommand_Dpad(DpadPosition position)
+        : SwitchCommand((size_t)SwitchResource::DPAD)
+        , position(position)
+    {}
+    virtual void apply(SwitchControllerState& state) const override{
+        state.dpad = position;
+    }
+};
+struct SwitchCommand_LeftJoystick : public SwitchCommand{
+    JoystickPosition position;
+
+    SwitchCommand_LeftJoystick(const JoystickPosition& position)
+        : SwitchCommand((size_t)SwitchResource::JOYSTICK_LEFT)
+        , position(position)
+    {}
+    virtual void apply(SwitchControllerState& state) const override{
+        state.left_joystick = position;
+    }
+};
+struct SwitchCommand_RightJoystick : public SwitchCommand{
+    JoystickPosition position;
+
+    SwitchCommand_RightJoystick(const JoystickPosition& position)
+        : SwitchCommand((size_t)SwitchResource::JOYSTICK_RIGHT)
+        , position(position)
+    {}
+    virtual void apply(SwitchControllerState& state) const override{
+        state.right_joystick = position;
+    }
+};
+struct SwitchCommand_Gyro : public SwitchCommand{
+    int16_t value;
+
+    SwitchCommand_Gyro(SwitchResource id, int16_t value)
+        : SwitchCommand((size_t)id)
+        , value(value)
+    {}
+    virtual void apply(SwitchControllerState& state) const override{
+        size_t index = (ButtonFlagType)id - (ButtonFlagType)SwitchResource::GYRO_ACCEL_X;
+        state.gyro[index] = value;
+    }
+};
+
+
+
+
+struct SplitDpad{
+    bool up = false;
+    bool right = false;
+    bool down = false;
+    bool left = false;
+};
+inline SplitDpad convert_unified_to_split_dpad(DpadPosition dpad){
+    switch (dpad){
+    case DpadPosition::DPAD_UP:
+        return {true, false, false, false};
+    case DpadPosition::DPAD_UP_RIGHT:
+        return {true, true, false, false};
+    case DpadPosition::DPAD_RIGHT:
+        return {false, true, false, false};
+    case DpadPosition::DPAD_DOWN_RIGHT:
+        return {false, true, true, false};
+    case DpadPosition::DPAD_DOWN:
+        return {false, false, true, false};
+    case DpadPosition::DPAD_DOWN_LEFT:
+        return {false, false, true, true};
+    case DpadPosition::DPAD_LEFT:
+        return {false, false, false, true};
+    case DpadPosition::DPAD_UP_LEFT:
+        return {true, false, false, true};
+    default:
+        return {false, false, false, false};
+    }
+}
+
+
+
+
+
+class ControllerWithScheduler : public PokemonAutomation::ControllerWithScheduler{
+public:
+    using PokemonAutomation::ControllerWithScheduler::ControllerWithScheduler;
+
+
+public:
+    //  Superscalar Commands (the "ssf" framework)
+
+    void issue_buttons(
+        Cancellable* cancellable,
+        Milliseconds delay, Milliseconds hold, Milliseconds cooldown,
+        Button button
+    );
+    void issue_dpad(
+        Cancellable* cancellable,
+        Milliseconds delay, Milliseconds hold, Milliseconds cooldown,
+        DpadPosition position
+    );
+    void issue_left_joystick(
+        Cancellable* cancellable,
+        Milliseconds delay, Milliseconds hold, Milliseconds cooldown,
+        const JoystickPosition& position
+    );
+    void issue_right_joystick(
+        Cancellable* cancellable,
+        Milliseconds delay, Milliseconds hold, Milliseconds cooldown,
+        const JoystickPosition& position
+    );
+
+    void issue_gyro(
+        Cancellable* cancellable,
+        SwitchResource id, const char* name,
+        Milliseconds delay, Milliseconds hold, Milliseconds cooldown,
+        int16_t value
+    );
+    void issue_gyro_accel_x(
+        Cancellable* cancellable,
+        Milliseconds delay, Milliseconds hold, Milliseconds cooldown,
+        int16_t value
+    ){
+        issue_gyro(cancellable, SwitchResource::GYRO_ACCEL_X, "issue_gyro_accel_x", delay, hold, cooldown, value);
+    }
+    void issue_gyro_accel_y(
+        Cancellable* cancellable,
+        Milliseconds delay, Milliseconds hold, Milliseconds cooldown,
+        int16_t value
+    ){
+        issue_gyro(cancellable, SwitchResource::GYRO_ACCEL_Y, "issue_gyro_accel_y", delay, hold, cooldown, value);
+    }
+    void issue_gyro_accel_z(
+        Cancellable* cancellable,
+        Milliseconds delay, Milliseconds hold, Milliseconds cooldown,
+        int16_t value
+    ){
+        issue_gyro(cancellable, SwitchResource::GYRO_ACCEL_Z, "issue_gyro_accel_z", delay, hold, cooldown, value);
+    }
+    void issue_gyro_rotate_x(
+        Cancellable* cancellable,
+        Milliseconds delay, Milliseconds hold, Milliseconds cooldown,
+        int16_t value
+    ){
+        issue_gyro(cancellable, SwitchResource::GYRO_ROTATE_X, "issue_gyro_rotate_x", delay, hold, cooldown, value);
+    }
+    void issue_gyro_rotate_y(
+        Cancellable* cancellable,
+        Milliseconds delay, Milliseconds hold, Milliseconds cooldown,
+        int16_t value
+    ){
+        issue_gyro(cancellable, SwitchResource::GYRO_ROTATE_Y, "issue_gyro_rotate_y", delay, hold, cooldown, value);
+    }
+    void issue_gyro_rotate_z(
+        Cancellable* cancellable,
+        Milliseconds delay, Milliseconds hold, Milliseconds cooldown,
+        int16_t value
+    ){
+        issue_gyro(cancellable, SwitchResource::GYRO_ROTATE_Z, "issue_gyro_rotate_z", delay, hold, cooldown, value);
+    }
+
+    void issue_full_controller_state(
+        Cancellable* cancellable,
+        bool enable_logging,
+        Milliseconds hold,
+        Button button,
+        DpadPosition dpad,
+        const JoystickPosition& left_joystick,
+        const JoystickPosition& right_joystick
+    );
+
+
+public:
+    //  High speed RPCs.
+
+    void issue_mash_button(
+        Cancellable* cancellable,
+        Milliseconds duration,
+        Button button,
+        Milliseconds delay,
+        Milliseconds hold,
+        Milliseconds cooldown
+    );
+    void issue_mash_button(
+        Cancellable* cancellable,
+        Milliseconds duration,
+        Button button0, Button button1
+    );
+    void issue_mash_AZs(
+        Cancellable* cancellable,
+        Milliseconds duration
+    );
+    void issue_system_scroll(
+        Cancellable* cancellable,
+        Milliseconds delay, Milliseconds hold, Milliseconds cooldown,
+        DpadPosition direction  //  Diagonals not allowed.
+    );
+};
+
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/NintendoSwitch/Controllers/NintendoSwitch_KeyboardMapping.cpp b/SerialPrograms/Source/NintendoSwitch/Controllers/NintendoSwitch_KeyboardMapping.cpp
new file mode 100644
index 0000000000..ce8ed0cda3
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Controllers/NintendoSwitch_KeyboardMapping.cpp
@@ -0,0 +1,80 @@
+/*  Nintendo Keyboard Mapping
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "NintendoSwitch_KeyboardMapping.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+
+
+
+KeyboardMappingOption::~KeyboardMappingOption(){
+    ADVANCED_MODE.remove_listener(*this);
+}
+KeyboardMappingOption::KeyboardMappingOption()
+    : BatchOption(LockMode::UNLOCK_WHILE_RUNNING)
+    , DESCRIPTION(
+        "The following table is the mapping of keyboard keys to Switch controller presses. "
+        "If you wish to remap a key, click on the cell in the \"Key\" column and press the desired key. "
+        "You do not need to edit any of the other columns.<br><br>"
+        "<font color=\"orange\">Note for keys that change behavior when combined with "
+        "SHIFT or CTRL, you should include all of those combinations as well. "
+        "For example, the default mapping for the Y button is both '/' and '?' "
+        "because they are treated as different keys depending on whether SHIFT "
+        "is held down. Letters are exempt from this as both lower and upper case "
+        "letters are considered the same.</font>"
+        "<br><br>"
+        "Advanced users are free to edit the rest of the table. You can create "
+        "new mappings or mappings that result in multiple buttons. "
+        "For example, there is a special mapping for pressing A + R "
+        "simultaneously that is useful for CFW users who are remotely "
+        "controlling the program over Team Viewer."
+    )
+    , ADVANCED_MODE(
+        "Unlock entire table (Advanced Mode):",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        false
+    )
+    , LEFT_JOYCON2(true)
+    , RIGHT_JOYCON2(false)
+{
+    PA_ADD_STATIC(DESCRIPTION);
+    PA_ADD_OPTION(ADVANCED_MODE);
+    PA_ADD_OPTION(PRO_CONTROLLER2);
+    PA_ADD_OPTION(LEFT_JOYCON2);
+    PA_ADD_OPTION(RIGHT_JOYCON2);
+    ADVANCED_MODE.add_listener(*this);
+}
+
+
+void KeyboardMappingOption::load_json(const JsonValue& json){
+    BatchOption::load_json(json);
+    KeyboardMappingOption::on_config_value_changed(this);
+}
+void KeyboardMappingOption::on_config_value_changed(void* object){
+    PRO_CONTROLLER2.set_advanced_mode(ADVANCED_MODE);
+    LEFT_JOYCON2.set_advanced_mode(ADVANCED_MODE);
+    RIGHT_JOYCON2.set_advanced_mode(ADVANCED_MODE);
+}
+
+
+
+
+
+
+
+
+
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/NintendoSwitch/Controllers/NintendoSwitch_KeyboardMapping.h b/SerialPrograms/Source/NintendoSwitch/Controllers/NintendoSwitch_KeyboardMapping.h
new file mode 100644
index 0000000000..4c86f475f4
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Controllers/NintendoSwitch_KeyboardMapping.h
@@ -0,0 +1,43 @@
+/*  Nintendo Keyboard Mapping
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_NintendoSwitch_KeyboardMapping_H
+#define PokemonAutomation_NintendoSwitch_KeyboardMapping_H
+
+#include "Common/Cpp/Options/BatchOption.h"
+#include "Common/Cpp/Options/StaticTextOption.h"
+#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController_from_Keyboard.h"
+#include "NintendoSwitch/Controllers/Joycon/NintendoSwitch_Joycon_from_Keyboard.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+
+
+
+class KeyboardMappingOption : public BatchOption, private ConfigOption::Listener{
+public:
+    ~KeyboardMappingOption();
+    KeyboardMappingOption();
+
+private:
+    virtual void load_json(const JsonValue& json) override;
+    virtual void on_config_value_changed(void* object) override;
+
+public:
+    StaticTextOption DESCRIPTION;
+    BooleanCheckBoxOption ADVANCED_MODE;
+    ProControllerFromKeyboardTable PRO_CONTROLLER2;
+    JoyconFromKeyboardTable LEFT_JOYCON2;
+    JoyconFromKeyboardTable RIGHT_JOYCON2;
+};
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/NintendoSwitch/Controllers/NintendoSwitch_VirtualControllerState.cpp b/SerialPrograms/Source/NintendoSwitch/Controllers/NintendoSwitch_VirtualControllerState.cpp
new file mode 100644
index 0000000000..df84eaf49c
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Controllers/NintendoSwitch_VirtualControllerState.cpp
@@ -0,0 +1,140 @@
+/*  Virtual Controller State
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+//#include "Common/Cpp/Json/JsonObject.h"
+#include "Procon/NintendoSwitch_ProControllerState.h"
+#include "Joycon/NintendoSwitch_JoyconState.h"
+#include "NintendoSwitch_VirtualControllerState.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+using namespace std::chrono_literals;
+
+
+
+
+
+
+
+void ProControllerDeltas::operator+=(const ProControllerDeltas& x){
+    buttons |= x.buttons;
+    dpad_x += x.dpad_x;
+    dpad_y += x.dpad_y;
+    left_x += x.left_x;
+    left_y += x.left_y;
+    right_x += x.right_x;
+    right_y += x.right_y;
+}
+bool ProControllerDeltas::to_state(ProControllerState& state) const{
+    bool neutral;
+
+    state.buttons = buttons;
+    neutral = buttons == 0;
+
+    state.dpad = DPAD_NONE;
+    if (dpad_x != 0 || dpad_y != 0){
+        neutral = false;
+        do{
+            if (dpad_x == 0){
+                state.dpad = dpad_y > 0 ? DPAD_DOWN : DPAD_UP;
+                break;
+            }
+            if (dpad_y == 0){
+                state.dpad = dpad_x > 0 ? DPAD_RIGHT : DPAD_LEFT;
+                break;
+            }
+            if (dpad_x < 0 && dpad_y < 0){
+                state.dpad = DPAD_UP_LEFT;
+                break;
+            }
+            if (dpad_x < 0 && dpad_y > 0){
+                state.dpad = DPAD_DOWN_LEFT;
+                break;
+            }
+            if (dpad_x > 0 && dpad_y > 0){
+                state.dpad = DPAD_DOWN_RIGHT;
+                break;
+            }
+            if (dpad_x > 0 && dpad_y < 0){
+                state.dpad = DPAD_UP_RIGHT;
+                break;
+            }
+        }while (false);
+    }
+
+    state.left_joystick.x = 0;
+    state.left_joystick.y = 0;
+    if (left_x != 0 || left_y != 0){
+        neutral = false;
+        int mag = std::abs(left_x) > std::abs(left_y)
+            ? std::abs(left_x)
+            : std::abs(left_y);
+        state.left_joystick.x = (double)left_x / mag;
+        state.left_joystick.y = -(double)left_y / mag;
+    }
+
+    state.right_joystick.x = 0;
+    state.right_joystick.y = 0;
+    if (right_x != 0 || right_y != 0){
+        neutral = false;
+        int mag = std::abs(right_x) > std::abs(right_y)
+            ? std::abs(right_x)
+            : std::abs(right_y);
+        state.right_joystick.x = (double)right_x / mag;
+        state.right_joystick.y = -(double)right_y / mag;
+    }
+
+    return neutral;
+}
+
+
+
+
+
+
+
+void JoyconDeltas::operator+=(const JoyconDeltas& x){
+    buttons |= x.buttons;
+    joystick_x += x.joystick_x;
+    joystick_y += x.joystick_y;
+}
+bool JoyconDeltas::to_state(JoyconState& state) const{
+    bool neutral;
+
+    state.buttons = buttons;
+    neutral = buttons == 0;
+
+    state.joystick.x = 0;
+    state.joystick.y = 0;
+    if (joystick_x != 0 || joystick_y != 0){
+        neutral = false;
+        int mag = std::abs(joystick_x) > std::abs(joystick_y)
+            ? std::abs(joystick_x)
+            : std::abs(joystick_y);
+        state.joystick.x = (double)joystick_x / mag;
+        state.joystick.y = -(double)joystick_y / mag;
+    }
+
+    return neutral;
+}
+
+
+
+
+
+
+
+
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/NintendoSwitch/Controllers/NintendoSwitch_VirtualControllerState.h b/SerialPrograms/Source/NintendoSwitch/Controllers/NintendoSwitch_VirtualControllerState.h
new file mode 100644
index 0000000000..102bf5aba1
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Controllers/NintendoSwitch_VirtualControllerState.h
@@ -0,0 +1,57 @@
+/*  Virtual Controller State
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_NintendoSwitch_VirtualControllerState_H
+#define PokemonAutomation_NintendoSwitch_VirtualControllerState_H
+
+//#include "Controllers/KeyboardInput/KeyboardInput.h"
+#include "NintendoSwitch_ControllerButtons.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+
+class ProControllerState;
+class JoyconState;
+
+
+
+struct ProControllerDeltas{
+    Button buttons = BUTTON_NONE;
+    int dpad_x = 0;
+    int dpad_y = 0;
+    int left_x = 0;
+    int left_y = 0;
+    int right_x = 0;
+    int right_y = 0;
+
+    void operator+=(const ProControllerDeltas& x);
+
+    //  Returns true if neutral.
+    bool to_state(ProControllerState& state) const;
+};
+
+
+
+struct JoyconDeltas{
+    Button buttons = BUTTON_NONE;
+    int joystick_x = 0;
+    int joystick_y = 0;
+
+    void operator+=(const JoyconDeltas& x);
+
+    //  Returns true if neutral.
+    bool to_state(JoyconState& state) const;
+};
+
+
+
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/NintendoSwitch/Controllers/PABotBase2/NintendoSwitch_PABotBase2_Controller.cpp b/SerialPrograms/Source/NintendoSwitch/Controllers/PABotBase2/NintendoSwitch_PABotBase2_Controller.cpp
new file mode 100644
index 0000000000..8d40a5419d
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Controllers/PABotBase2/NintendoSwitch_PABotBase2_Controller.cpp
@@ -0,0 +1,79 @@
+/*  PABotBase2: Controller
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Exceptions.h"
+#include "NintendoSwitch_PABotBase2_Controller.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+
+void PABotBase2_Controller::stop_with_error(std::string error_message) noexcept{
+    try{
+        WriteSpinLock lg(m_error_lock);
+        m_error_string = error_message;
+    }catch (...){}
+    m_connection.cancel();
+    m_connection.set_status_line1(std::move(error_message), COLOR_RED);
+}
+
+
+std::string PABotBase2_Controller::error_string() const{
+    ReadSpinLock lg(m_error_lock);
+    return m_error_string;
+}
+
+
+void PABotBase2_Controller::cancel_all_commands(){
+    std::lock_guard<Mutex> lg(m_state_lock);
+    if (!is_ready()){
+        throw InvalidConnectionStateException(error_string());
+    }
+    m_connection.device().command_queue().send_cancel();
+    m_scheduler.clear_on_next();
+}
+void PABotBase2_Controller::replace_on_next_command(){
+    std::lock_guard<Mutex> lg(m_state_lock);
+    if (!is_ready()){
+        throw InvalidConnectionStateException(error_string());
+    }
+    m_connection.device().command_queue().send_replace_on_next();
+    m_scheduler.clear_on_next();
+}
+bool PABotBase2_Controller::cancel_all_and_wait(Milliseconds timeout){
+    cancel_all_commands();
+
+    //  Wait outside "m_state_lock" since this can take a while.
+    return m_connection.device().command_queue().wait_for_cancel(timeout);
+}
+
+
+void PABotBase2_Controller::wait_for_all(Cancellable* cancellable){
+    SuperscalarScheduler::Schedule schedule;
+    std::lock_guard<Mutex> lg0(m_issue_lock);
+    {
+        std::lock_guard<Mutex> lg1(m_state_lock);
+
+        ThrottleScope scope(m_logging_throttler);
+        if (scope){
+            m_logger.log("wait_for_all()", COLOR_DARKGREEN);
+        }
+
+        if (!is_ready()){
+            throw InvalidConnectionStateException(error_string());
+        }
+
+        m_scheduler.issue_wait_for_all(schedule);
+    }
+    execute_schedule(cancellable, schedule);
+    m_connection.device().command_queue().wait_for_all(cancellable);
+}
+
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/NintendoSwitch/Controllers/PABotBase2/NintendoSwitch_PABotBase2_Controller.h b/SerialPrograms/Source/NintendoSwitch/Controllers/PABotBase2/NintendoSwitch_PABotBase2_Controller.h
new file mode 100644
index 0000000000..0da3ba6304
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Controllers/PABotBase2/NintendoSwitch_PABotBase2_Controller.h
@@ -0,0 +1,58 @@
+/*  PABotBase2: Controller
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_NintendoSwitch_PABotBase2_Controller_H
+#define PokemonAutomation_NintendoSwitch_PABotBase2_Controller_H
+
+#include "Controllers/PABotBase2/PABotBase2_Connection.h"
+#include "NintendoSwitch/Controllers/NintendoSwitch_ControllerWithScheduler.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+
+
+class PABotBase2_Controller : public ControllerWithScheduler{
+public:
+    PABotBase2_Controller(
+        Logger& logger,
+        RecursiveThrottler& logging_throttler,
+        PABotBase2::Connection& connection
+    )
+        : ControllerWithScheduler(logger, logging_throttler)
+        , m_connection(connection)
+    {}
+
+    void stop_with_error(std::string error_message) noexcept;
+
+    bool is_ready() const{
+        return m_connection.is_ready();
+    }
+    std::string error_string() const;
+
+
+public:
+    void cancel_all_commands();
+    void replace_on_next_command();
+    bool cancel_all_and_wait(Milliseconds timeout);
+
+    void wait_for_all(Cancellable* cancellable);
+
+
+protected:
+    //  These are set on construction and never changed again. So it is safe to
+    //  access these asynchronously.
+    PABotBase2::Connection& m_connection;
+
+    mutable SpinLock m_error_lock;
+    std::string m_error_string;
+};
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/NintendoSwitch/Controllers/PABotBase2/NintendoSwitch_PABotBase2_Joycon.h b/SerialPrograms/Source/NintendoSwitch/Controllers/PABotBase2/NintendoSwitch_PABotBase2_Joycon.h
new file mode 100644
index 0000000000..f722b93909
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Controllers/PABotBase2/NintendoSwitch_PABotBase2_Joycon.h
@@ -0,0 +1,375 @@
+/*  PABotBase2: Joycon (Nintendo Switch 1)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_NintendoSwitch_PABotBase2_Joycon_H
+#define PokemonAutomation_NintendoSwitch_PABotBase2_Joycon_H
+
+#include "NintendoSwitch/Controllers/Joycon/NintendoSwitch_Joycon.h"
+#include "NintendoSwitch_PABotBase2_OemController.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+
+
+
+template <typename JoyconType>
+class PABotBase2_JoyCon :
+    public JoyconType,
+    public PABotBase2_OemController
+{
+    static constexpr uint16_t JOYSTICK_MIN_THRESHOLD = 1874;
+    static constexpr uint16_t JOYSTICK_MAX_THRESHOLD = 260;
+
+public:
+    PABotBase2_JoyCon(
+        Logger& logger,
+        PABotBase2::Connection& connection,
+        ControllerClass controller_class,
+        ControllerType controller_type,
+        std::function<void(double magnitude)> on_rumble
+    )
+        : JoyconType(logger, controller_class)
+        , PABotBase2_OemController(
+            logger, AbstractController::logging_throttler(),
+            connection, controller_type,
+            std::move(on_rumble)
+        )
+        , m_controller_type(controller_type)
+    {}
+    ~PABotBase2_JoyCon(){
+        PABotBase2_OemController::stop();
+    }
+
+    virtual Logger& logger() override{
+        return m_logger;
+    }
+    virtual bool is_ready() const override{
+        return PABotBase2_Controller::is_ready();
+    }
+    virtual ControllerPlayerNumber get_player_number(Cancellable& cancellable) override{
+        return PABotBase2_OemController::get_player_number(cancellable);
+    }
+
+
+public:
+    virtual ControllerPerformanceClass performance_class() const override{
+        return m_performance_class;
+    }
+    virtual Milliseconds ticksize() const override{
+        return m_ticksize;
+    }
+    virtual Milliseconds cooldown() const override{
+        return m_cooldown;
+    }
+    virtual Milliseconds timing_variation() const override{
+        return m_timing_variation;
+    }
+    virtual bool atomic_multibutton() const override{
+        return true;
+    }
+
+
+public:
+    virtual void cancel_all_commands() override{
+        return PABotBase2_Controller::cancel_all_commands();
+    }
+    virtual void replace_on_next_command() override{
+        PABotBase2_Controller::replace_on_next_command();
+    }
+    virtual bool cancel_all_and_wait(Milliseconds timeout) override{
+        return PABotBase2_Controller::cancel_all_and_wait(timeout);
+    }
+
+    virtual void wait_for_all(Cancellable* cancellable) override{
+        PABotBase2_Controller::wait_for_all(cancellable);
+    }
+
+
+public:
+    //  Superscalar Commands (the "ssf" framework)
+
+    virtual void issue_barrier(Cancellable* cancellable) override{
+        ControllerWithScheduler::issue_barrier(cancellable);
+    }
+    virtual void issue_nop(Cancellable* cancellable, Milliseconds duration) override{
+        ControllerWithScheduler::issue_nop(cancellable, duration);
+    }
+
+    virtual void issue_buttons(
+        Cancellable* cancellable,
+        Milliseconds delay, Milliseconds hold, Milliseconds cooldown,
+        Button button
+    ) override{
+        button &= m_valid_buttons;
+        ControllerWithScheduler::issue_buttons(cancellable, delay, hold, cooldown, button);
+    }
+    virtual void issue_joystick(
+        Cancellable* cancellable,
+        Milliseconds delay, Milliseconds hold, Milliseconds cooldown,
+        const JoystickPosition& position
+    ) override{
+        switch (this->controller_class()){
+        case ControllerClass::NintendoSwitch_LeftJoycon:
+            ControllerWithScheduler::issue_left_joystick(cancellable, delay, hold, cooldown, position);
+            break;
+        case ControllerClass::NintendoSwitch_RightJoycon:
+            ControllerWithScheduler::issue_right_joystick(cancellable, delay, hold, cooldown, position);
+            break;
+        default:
+            throw InternalProgramError(&m_logger, PA_CURRENT_FUNCTION, "Invalid joycon type.");
+        }
+    }
+
+    virtual void issue_gyro_accel_x(
+        Cancellable* cancellable,
+        Milliseconds delay, Milliseconds hold, Milliseconds cooldown,
+        int16_t value
+    ) override{
+        ControllerWithScheduler::issue_gyro_accel_x(cancellable, delay, hold, cooldown, value);
+    }
+    virtual void issue_gyro_accel_y(
+        Cancellable* cancellable,
+        Milliseconds delay, Milliseconds hold, Milliseconds cooldown,
+        int16_t value
+    ) override{
+        ControllerWithScheduler::issue_gyro_accel_y(cancellable, delay, hold, cooldown, value);
+    }
+    virtual void issue_gyro_accel_z(
+        Cancellable* cancellable,
+        Milliseconds delay, Milliseconds hold, Milliseconds cooldown,
+        int16_t value
+    ) override{
+        ControllerWithScheduler::issue_gyro_accel_z(cancellable, delay, hold, cooldown, value);
+    }
+    virtual void issue_gyro_rotate_x(
+        Cancellable* cancellable,
+        Milliseconds delay, Milliseconds hold, Milliseconds cooldown,
+        int16_t value
+    ) override{
+        ControllerWithScheduler::issue_gyro_rotate_x(cancellable, delay, hold, cooldown, value);
+    }
+    virtual void issue_gyro_rotate_y(
+        Cancellable* cancellable,
+        Milliseconds delay, Milliseconds hold, Milliseconds cooldown,
+        int16_t value
+    ) override{
+        ControllerWithScheduler::issue_gyro_rotate_y(cancellable, delay, hold, cooldown, value);
+    }
+    virtual void issue_gyro_rotate_z(
+        Cancellable* cancellable,
+        Milliseconds delay, Milliseconds hold, Milliseconds cooldown,
+        int16_t value
+    ) override{
+        ControllerWithScheduler::issue_gyro_rotate_z(cancellable, delay, hold, cooldown, value);
+    }
+
+    virtual void issue_full_controller_state(
+        Cancellable* cancellable,
+        bool enable_logging,
+        Milliseconds duration,
+        Button button,
+        const JoystickPosition& joystick
+    ) override{
+        button &= m_valid_buttons;
+        switch (this->controller_class()){
+        case ControllerClass::NintendoSwitch_LeftJoycon:
+            ControllerWithScheduler::issue_full_controller_state(
+                cancellable,
+                enable_logging,
+                duration,
+                button,
+                DPAD_NONE,
+                joystick,
+                {0, 0}
+            );
+            break;
+        case ControllerClass::NintendoSwitch_RightJoycon:
+            ControllerWithScheduler::issue_full_controller_state(
+                cancellable,
+                enable_logging,
+                duration,
+                button,
+                DPAD_NONE,
+                {0, 0},
+                joystick
+            );
+            break;
+        default:;
+        }
+    }
+
+
+public:
+    //  High speed RPCs.
+
+    virtual void issue_mash_button(
+        Cancellable* cancellable,
+        Button button, Milliseconds duration,
+        Milliseconds delay,
+        Milliseconds hold,
+        Milliseconds cooldown
+    ) override{
+        button &= m_valid_buttons;
+        ControllerWithScheduler::issue_mash_button(cancellable, duration, button, delay, hold, cooldown);
+    }
+
+
+protected:
+    void execute_state_left_joycon(
+        Cancellable* cancellable,
+        const SuperscalarScheduler::ScheduleEntry& entry
+    ){
+        SwitchControllerState controller_state;
+        for (auto& item : entry.state){
+            static_cast<const SwitchCommand&>(*item).apply(controller_state);
+        }
+
+        OemController_State0x30_Buttons buttons{
+            .button3 = 0,
+            .button4 = 0,
+            .button5 = 0,
+            .left_joystick = {0x00, 0x08, 0x80},
+            .right_joystick = {0x00, 0x08, 0x80},
+            .vibrator = 0x00,
+        };
+
+        populate_report_buttons(buttons, controller_state);
+
+        {
+            SplitDpad dpad = convert_unified_to_split_dpad(controller_state.dpad);
+            buttons.button5 |= (dpad.down  ? 1 : 0) << 0;
+            buttons.button5 |= (dpad.up    ? 1 : 0) << 1;
+            buttons.button5 |= (dpad.right ? 1 : 0) << 2;
+            buttons.button5 |= (dpad.left  ? 1 : 0) << 3;
+        }
+
+        //  Left Stick
+        encode_joystick<JOYSTICK_MIN_THRESHOLD, JOYSTICK_MAX_THRESHOLD>(
+            buttons.left_joystick,
+            controller_state.left_joystick
+        );
+
+        OemController_State0x30_Gyro gyro{};
+        bool gyro_active = populate_report_gyro(gyro, controller_state);
+
+        if (!gyro_active){
+            issue_report(cancellable, entry.duration, buttons);
+        }else{
+            issue_report(cancellable, entry.duration, buttons, gyro);
+        }
+    }
+    void execute_state_right_joycon(
+        Cancellable* cancellable,
+        const SuperscalarScheduler::ScheduleEntry& entry
+    ){
+        SwitchControllerState controller_state;
+        for (auto& item : entry.state){
+            static_cast<const SwitchCommand&>(*item).apply(controller_state);
+        }
+
+        OemController_State0x30_Buttons buttons{
+            .button3 = 0,
+            .button4 = 0,
+            .button5 = 0,
+            .left_joystick = {0x00, 0x08, 0x80},
+            .right_joystick = {0x00, 0x08, 0x80},
+            .vibrator = 0x00,
+        };
+
+        populate_report_buttons(buttons, controller_state);
+
+        //  Right Stick
+        encode_joystick<JOYSTICK_MIN_THRESHOLD, JOYSTICK_MAX_THRESHOLD>(
+            buttons.right_joystick,
+            controller_state.right_joystick
+        );
+
+#if 0
+        cout << (int)controller_state.right_stick_x << " - "
+             << (int)controller_state.right_stick_y << ": "
+             << std::chrono::duration_cast<Milliseconds>(entry.duration).count() << endl;
+#endif
+
+        OemController_State0x30_Gyro gyro{};
+        bool gyro_active = populate_report_gyro(gyro, controller_state);
+
+        if (!gyro_active){
+            issue_report(cancellable, entry.duration, buttons);
+        }else{
+            issue_report(cancellable, entry.duration, buttons, gyro);
+        }
+    }
+    virtual void execute_state(
+        Cancellable* cancellable,
+        const SuperscalarScheduler::ScheduleEntry& entry
+    ) override{
+        switch (this->controller_class()){
+        case ControllerClass::NintendoSwitch_LeftJoycon:
+            execute_state_left_joycon(cancellable, entry);
+            break;
+        case ControllerClass::NintendoSwitch_RightJoycon:
+            execute_state_right_joycon(cancellable, entry);
+            break;
+        default:
+            throw InternalProgramError(&m_logger, PA_CURRENT_FUNCTION, "Invalid joycon type.");
+        }
+    }
+
+    const ControllerType m_controller_type;
+    Button m_valid_buttons;
+};
+
+
+
+class PABotBase2_LeftJoycon final : public PABotBase2_JoyCon<LeftJoycon>{
+public:
+    PABotBase2_LeftJoycon(
+        Logger& logger,
+        PABotBase2::Connection& connection,
+        ControllerType controller_type
+    )
+        : PABotBase2_JoyCon<LeftJoycon>(
+            logger,
+            connection,
+            ControllerClass::NintendoSwitch_LeftJoycon,
+            controller_type,
+            [this](double magnitude){ on_rumble(magnitude); }
+        )
+    {
+        m_valid_buttons = VALID_LEFT_JOYCON_BUTTONS;
+    }
+    ~PABotBase2_LeftJoycon(){
+        PABotBase2_OemController::stop();
+    }
+};
+class PABotBase2_RightJoycon final : public PABotBase2_JoyCon<RightJoycon>{
+public:
+    PABotBase2_RightJoycon(
+        Logger& logger,
+        PABotBase2::Connection& connection,
+        ControllerType controller_type
+    )
+        : PABotBase2_JoyCon<RightJoycon>(
+            logger,
+            connection,
+            ControllerClass::NintendoSwitch_RightJoycon,
+            controller_type,
+            [this](double magnitude){ on_rumble(magnitude); }
+        )
+    {
+        m_valid_buttons = VALID_RIGHT_JOYCON_BUTTONS;
+    }
+    ~PABotBase2_RightJoycon(){
+        PABotBase2_OemController::stop();
+    }
+};
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/NintendoSwitch/Controllers/PABotBase2/NintendoSwitch_PABotBase2_OemController.cpp b/SerialPrograms/Source/NintendoSwitch/Controllers/PABotBase2/NintendoSwitch_PABotBase2_OemController.cpp
new file mode 100644
index 0000000000..082d60c759
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Controllers/PABotBase2/NintendoSwitch_PABotBase2_OemController.cpp
@@ -0,0 +1,787 @@
+/*  PABotBase2: OEM Controller (Nintendo Switch 1)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/ColoredText.h"
+#include "Common/PABotBase2/Controllers/PABotBase2_Controller_NS1_OemController.h"
+#include "Controllers/SerialPort/SerialPABotBase.h"
+#include "NintendoSwitch/NintendoSwitch_Settings.h"
+#include "NintendoSwitch_PABotBase2_OemController.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+using namespace std::chrono_literals;
+
+
+
+void PABotBase2_OemController::add_message_loggers(PABotBase2::MessageLogger& message_logger){
+    using namespace PABotBase2;
+
+    message_logger.add_message<Message_NS1_OemController_Spi>(
+        "PABB2_MESSAGE_REQ_NS1_OEM_CONTROLLER_READ_SPI",
+        PABB2_MESSAGE_REQ_NS1_OEM_CONTROLLER_READ_SPI,
+        true,
+        [](const Message_NS1_OemController_Spi* message){
+            std::string str;
+            str += "id = " + std::to_string(message->id);
+            str += ", controller_type = " + std::to_string(message->controller_type);
+            str += ", address = 0x" + tostr_hex(message->address);
+            str += ", bytes = " + std::to_string(message->bytes);
+            return str;
+        }
+    );
+    message_logger.add_message_min_length<Message_NS1_OemController_Spi>(
+        "PABB2_MESSAGE_REQ_NS1_OEM_CONTROLLER_WRITE_SPI",
+        PABB2_MESSAGE_REQ_NS1_OEM_CONTROLLER_WRITE_SPI,
+        true,
+        [](const Message_NS1_OemController_Spi* message){
+            std::string str;
+            str += "id = " + std::to_string(message->id);
+            str += ", controller_type = " + std::to_string(message->controller_type);
+            str += ", address = 0x" + tostr_hex(message->address);
+            str += ", bytes = " + std::to_string(message->bytes);
+            return str;
+        }
+    );
+    message_logger.add_message<MessageHeader>(
+        "PABB2_MESSAGE_REQ_NS1_OEM_CONTROLLER_PLAYER_LIGHTS",
+        PABB2_MESSAGE_REQ_NS1_OEM_CONTROLLER_PLAYER_LIGHTS,
+        true,
+        [](const MessageHeader* header){
+            std::string str;
+            str += "id = " + std::to_string(header->id);
+            return str;
+        }
+    );
+    message_logger.add_message<Message_u32>(
+        "PABB2_MESSAGE_INFO_NS1_OEM_CONTROLLER_PLAYER_LIGHTS",
+        PABB2_MESSAGE_INFO_NS1_OEM_CONTROLLER_PLAYER_LIGHTS,
+        true,
+        [](const Message_u32* message){
+            std::string str;
+            str += "id = " + std::to_string(message->id);
+            str += ", lights = 0x" + tostr_hex(message->data);
+            return str;
+        }
+    );
+    message_logger.add_message<MessageHeader>(
+        "PABB2_MESSAGE_INFO_NS1_OEM_CONTROLLER_USB_DISALLOWED",
+        PABB2_MESSAGE_INFO_NS1_OEM_CONTROLLER_USB_DISALLOWED,
+        true,
+        [](const MessageHeader* header){
+            std::string str;
+            str += "id = " + std::to_string(header->id);
+            return str;
+        }
+    );
+    message_logger.add_message<Message_Feedback_NS1_OemController_Rumble>(
+        "PABB2_MESSAGE_INFO_NS1_OEM_CONTROLLER_RUMBLE",
+        PABB2_MESSAGE_INFO_NS1_OEM_CONTROLLER_RUMBLE,
+        false,
+        [](const Message_Feedback_NS1_OemController_Rumble* message){
+            std::string str;
+            str += tostr_hexbytes(&message->data, sizeof(OemController_RumbleState));
+            return str;
+        }
+    );
+    message_logger.add_message<Message_Command_NS1_OemController_Buttons>(
+        "PABB2_MESSAGE_CMD_NS1_OEM_CONTROLLER_BUTTONS",
+        PABB2_MESSAGE_CMD_NS1_OEM_CONTROLLER_BUTTONS,
+        false,
+        [](const Message_Command_NS1_OemController_Buttons* message){
+            std::string str;
+            str += "id = " + std::to_string(message->id);
+            str += ", ms = " + std::to_string(message->milliseconds);
+            return str;
+        }
+    );
+    message_logger.add_message<Message_Command_NS1_OemController_FullState>(
+        "PABB2_MESSAGE_CMD_NS1_OEM_CONTROLLER_FULL_STATE",
+        PABB2_MESSAGE_CMD_NS1_OEM_CONTROLLER_FULL_STATE,
+        false,
+        [](const Message_Command_NS1_OemController_FullState* message){
+            std::string str;
+            str += "id = " + std::to_string(message->id);
+            str += ", ms = " + std::to_string(message->milliseconds);
+            return str;
+        }
+    );
+}
+
+
+
+PABotBase2_OemController::PABotBase2_OemController(
+    Logger& logger,
+    RecursiveThrottler& logging_throttler,
+    PABotBase2::Connection& connection,
+    ControllerType controller_type,
+    std::function<void(double magnitude)> on_rumble
+)
+    : PABotBase2_Controller(logger, logging_throttler, connection)
+    , m_controller_type(controller_type)
+    , m_on_rumble(std::move(on_rumble))
+    , m_player_number(ControllerPlayerNumber::UNKNOWN)
+{
+    using namespace PABotBase2;
+
+
+    switch (controller_type){
+    case ControllerType::NintendoSwitch_WiredProController:
+    case ControllerType::NintendoSwitch_WiredLeftJoycon:
+    case ControllerType::NintendoSwitch_WiredRightJoycon:
+        m_performance_class = ControllerPerformanceClass::SerialPABotBase_Wired;
+        m_ticksize = 0ms;
+        m_cooldown = 8ms;
+        m_timing_variation = ConsoleSettings::instance().TIMING_OPTIONS.WIRED;
+        break;
+    case ControllerType::NintendoSwitch_WirelessProController:
+    case ControllerType::NintendoSwitch_WirelessLeftJoycon:
+    case ControllerType::NintendoSwitch_WirelessRightJoycon:
+        m_performance_class = ControllerPerformanceClass::SerialPABotBase_Wireless;
+        m_ticksize = 0ms;
+        m_cooldown = 15ms;
+        m_timing_variation = ConsoleSettings::instance().TIMING_OPTIONS.WIRELESS;
+        break;
+
+    default:
+        throw InternalProgramError(&logger, PA_CURRENT_FUNCTION, "Unsupported controller.");
+    }
+
+
+    //  Add controller-specific messages.
+
+    add_message_loggers(connection.message_logger());
+
+    connection.device().add_message_handler(
+        PABB2_MESSAGE_OPCODE_CONSOLE_DISCONNECT,
+        [this](const MessageHeader* header){
+            if (header->message_bytes != sizeof(Message_u32)){
+                m_logger.log(
+                    "PABB2_MESSAGE_OPCODE_CONSOLE_DISCONNECT: **(invalid size = " + std::to_string(header->message_bytes) + ")**",
+                    COLOR_RED
+                );
+                return;
+            }
+            const auto* message = (const Message_u32*)header;
+            WriteSpinLock lg(m_error_lock);
+            switch ((DisconnectReason)message->data){
+            case DisconnectReason::HOST_SHUTDOWN:
+                m_error_string = "Console turned off.";
+                break;
+            case DisconnectReason::CONNECTION_REJECTED:
+                m_error_string = "Rejected by console. Please re-pair the controller.";
+                break;
+            default:
+                m_error_string = "Disconnected by console.";
+            }
+
+        }
+    );
+    connection.device().add_message_handler(
+        PABB2_MESSAGE_INFO_NS1_OEM_CONTROLLER_USB_DISALLOWED,
+        [this](const MessageHeader* header){
+            WriteSpinLock lg(m_error_lock);
+            m_error_string = "Please enable \"Pro Controller Wired Communication\" in the Switch settings.";
+        }
+    );
+    connection.device().add_message_handler(
+        PABB2_MESSAGE_INFO_NS1_OEM_CONTROLLER_RUMBLE,
+        [this](const MessageHeader* header){
+            if (header->message_bytes != sizeof(Message_Feedback_NS1_OemController_Rumble)){
+                m_logger.log(
+                    "PABB2_MESSAGE_INFO_NS1_OEM_CONTROLLER_RUMBLE: **(invalid size = " + std::to_string(header->message_bytes) + ")**",
+                    COLOR_RED
+                );
+                return;
+            }
+            const auto* message = (const Message_Feedback_NS1_OemController_Rumble*)header;
+
+            RumbleData left = parse_rumble(message->data.left);
+            RumbleData right = parse_rumble(message->data.right);
+
+            std::string str;
+            std::string str_left = rumble_to_str(left);
+            std::string str_right = rumble_to_str(right);
+            if (!str_left.empty()){
+                if (!str.empty()){
+                    str += ", ";
+                }
+                str += "Left = ";
+                str += str_left;
+            }
+            if (!str_right.empty()){
+                if (!str.empty()){
+                    str += " - ";
+                }
+                str += "Right = ";
+                str += str_right;
+            }
+
+            double energy =
+                left.lo_amp * left.lo_freq * left.lo_freq +
+                left.hi_amp * left.hi_freq * left.hi_freq +
+                right.lo_amp * right.lo_freq * right.lo_freq +
+                right.hi_amp * right.hi_freq * right.hi_freq;
+
+            double magnitude = std::log10(energy + 1);
+
+            if (m_on_rumble){
+                m_on_rumble(magnitude);
+            }
+
+            if (str.empty()){
+                return;
+            }
+
+            m_logger.log("Rumble: " + str + " - Magnitude = " + tostr_fixed(magnitude, 3), COLOR_ORANGE);
+        }
+    );
+
+
+
+    m_status_thread.reset(new ControllerStatusThread(
+        connection, *this
+    ));
+}
+PABotBase2_OemController::~PABotBase2_OemController(){
+    stop();
+}
+void PABotBase2_OemController::stop(){
+    m_status_thread.reset();
+}
+
+
+bool PABotBase2_OemController::run_preconnect_configure(
+    Logger& logger,
+    PABotBase2::Connection& connection,
+    ControllerType controller_type
+){
+    using namespace PABotBase2;
+
+    add_message_loggers(connection.message_logger());
+
+    WallClock deadline = current_time() + std::chrono::milliseconds(100);
+
+    uint8_t controller_mac_address[6] = {};
+    {
+        Message_u32 request;
+        request.message_bytes = sizeof(request);
+        request.opcode = PABB2_MESSAGE_OPCODE_CONTROLLER_MAC_ADDRESS;
+        request.data = SerialPABotBase::controller_type_to_id(controller_type);
+        std::optional<uint8_t> id = connection.device().try_send_request_with_response(
+            request,
+            deadline
+        );
+        if (!id.has_value()){
+            return false;
+        }
+        std::string response = connection.device().wait_for_request_response(
+            id.value(),
+            deadline
+        );
+        if (response.size() == sizeof(MessageHeader) + sizeof(controller_mac_address)){
+            memcpy(
+                controller_mac_address,
+                response.data() + sizeof(MessageHeader),
+                sizeof(controller_mac_address)
+            );
+            logger.log("Controller MAC Address: " + tostr_hexbytes(controller_mac_address, sizeof(controller_mac_address)));
+        }else if (response.empty()){
+            logger.log(
+                "Timed out waiting for response to PABB2_MESSAGE_OPCODE_PAIRED_MAC_ADDRESS.",
+                COLOR_RED
+            );
+            return false;
+        }else{
+            logger.log(
+                "Invalid response size to PABB2_MESSAGE_OPCODE_PAIRED_MAC_ADDRESS: body = " + std::to_string(response.size()),
+                COLOR_RED
+            );
+            return false;
+        }
+    }
+
+    NintendoSwitch::ControllerProfile profile =
+        PokemonAutomation::NintendoSwitch::ConsoleSettings::instance().CONTROLLER_SETTINGS.get_or_make_profile(
+            controller_mac_address,
+            "",
+            controller_type
+        );
+
+#if _WIN32
+#pragma pack(push, 1)
+#define PABB_PACK
+#elif __GNUC__
+#define PABB_PACK   __attribute__((packed))
+#else
+#define PABB_PACK
+#endif
+    struct Message{
+        Message_NS1_OemController_Spi request;
+        PABB_NintendoSwitch_ControllerColors colors;
+    };
+#if _WIN32
+#pragma pack(pop)
+#endif
+    Message message{};
+
+    {
+        Color color(profile.body_color);
+        message.colors.body[0] = color.red();
+        message.colors.body[1] = color.green();
+        message.colors.body[2] = color.blue();
+    }
+    {
+        Color color(profile.button_color);
+        message.colors.buttons[0] = color.red();
+        message.colors.buttons[1] = color.green();
+        message.colors.buttons[2] = color.blue();
+    }
+    {
+        Color color(profile.left_grip);
+        message.colors.left_grip[0] = color.red();
+        message.colors.left_grip[1] = color.green();
+        message.colors.left_grip[2] = color.blue();
+    }
+    {
+        Color color(profile.right_grip);
+        message.colors.right_grip[0] = color.red();
+        message.colors.right_grip[1] = color.green();
+        message.colors.right_grip[2] = color.blue();
+    }
+
+
+    message.request.message_bytes = sizeof(message);
+    message.request.opcode = PABB2_MESSAGE_REQ_NS1_OEM_CONTROLLER_WRITE_SPI;
+    message.request.controller_type = SerialPABotBase::controller_type_to_id(controller_type);
+    message.request.address = 0x00006050;
+    message.request.bytes = sizeof(PABB_NintendoSwitch_ControllerColors);
+
+    connection.message_logger().log_send(logger, true, &message.request);
+
+    return connection.device().connection().reliable_send_all_or_nothing(
+        nullptr,
+        &message,
+        sizeof(Message),
+        deadline
+    );
+}
+
+
+
+ControllerPlayerNumber PABotBase2_OemController::get_player_number(Cancellable& cancellable){
+    update_status(cancellable);
+    return m_player_number.load(std::memory_order_relaxed);
+}
+
+
+
+Button PABotBase2_OemController::populate_report_buttons(
+    OemController_State0x30_Buttons& buttons,
+    const SwitchControllerState& controller_state
+){
+    //  https://github.com/dekuNukem/Nintendo_Switch_Reverse_Engineering/blob/master/bluetooth_hid_notes.md
+
+    Button all_buttons = BUTTON_NONE;
+    for (size_t c = 0; c < TOTAL_BUTTONS; c++){
+        Button button = (Button)((ButtonFlagType)1 << c);
+        if (!(controller_state.buttons & button)){
+            continue;
+        }
+
+        all_buttons |= button;
+        switch (button){
+        //  Right
+        case BUTTON_Y:          buttons.button3 |= 1 << 0; break;
+        case BUTTON_X:          buttons.button3 |= 1 << 1; break;
+        case BUTTON_B:          buttons.button3 |= 1 << 2; break;
+        case BUTTON_A:          buttons.button3 |= 1 << 3; break;
+        case BUTTON_RIGHT_SR:   buttons.button3 |= 1 << 4; break;
+        case BUTTON_RIGHT_SL:   buttons.button3 |= 1 << 5; break;
+        case BUTTON_R:          buttons.button3 |= 1 << 6; break;
+        case BUTTON_ZR:         buttons.button3 |= 1 << 7; break;
+
+        //  Shared
+        case BUTTON_MINUS:      buttons.button4 |= 1 << 0; break;
+        case BUTTON_PLUS:       buttons.button4 |= 1 << 1; break;
+        case BUTTON_RCLICK:     buttons.button4 |= 1 << 2; break;
+        case BUTTON_LCLICK:     buttons.button4 |= 1 << 3; break;
+        case BUTTON_HOME:       buttons.button4 |= 1 << 4; break;
+        case BUTTON_CAPTURE:    buttons.button4 |= 1 << 5; break;
+
+        //  Left
+        case BUTTON_DOWN:       buttons.button5 |= 1 << 0; break;
+        case BUTTON_UP:         buttons.button5 |= 1 << 1; break;
+        case BUTTON_RIGHT:      buttons.button5 |= 1 << 2; break;
+        case BUTTON_LEFT:       buttons.button5 |= 1 << 3; break;
+        case BUTTON_LEFT_SR:    buttons.button5 |= 1 << 4; break;
+        case BUTTON_LEFT_SL:    buttons.button5 |= 1 << 5; break;
+        case BUTTON_L:          buttons.button5 |= 1 << 6; break;
+        case BUTTON_ZL:         buttons.button5 |= 1 << 7; break;
+
+        default:;
+        }
+    }
+    return all_buttons;
+}
+bool PABotBase2_OemController::populate_report_gyro(
+    OemController_State0x30_Gyro& gyro,
+    const SwitchControllerState& controller_state
+){
+    gyro.accel_x = controller_state.gyro[0];
+    gyro.accel_y = controller_state.gyro[1];
+    gyro.accel_z = controller_state.gyro[2];
+    gyro.rotation_x = controller_state.gyro[3];
+    gyro.rotation_y = controller_state.gyro[4];
+    gyro.rotation_z = controller_state.gyro[5];
+
+    bool gyro_active = false;
+    gyro_active |= gyro.accel_x != 0;
+    gyro_active |= gyro.accel_y != 0;
+    gyro_active |= gyro.accel_z != 0;
+    gyro_active |= gyro.rotation_x != 0;
+    gyro_active |= gyro.rotation_y != 0;
+    gyro_active |= gyro.rotation_z != 0;
+//    cout << "gyro_active = " << gyro_active << endl;
+    return gyro_active;
+}
+
+
+void PABotBase2_OemController::issue_report(
+    Cancellable* cancellable,
+    WallDuration duration,
+    const OemController_State0x30_Buttons& buttons
+){
+    //  We will not do any throttling or timing adjustments here. We'll defer
+    //  to the microcontroller to do that for us.
+
+    //  Divide the controller state into smaller chunks of 65535 milliseconds.
+    Milliseconds time_left = std::chrono::duration_cast<Milliseconds>(duration);
+
+    PABotBase2::Message_Command_NS1_OemController_Buttons request;
+    request.message_bytes = sizeof(request);
+    request.opcode = PABB2_MESSAGE_CMD_NS1_OEM_CONTROLLER_BUTTONS;
+    request.buttons = buttons;
+
+    while (time_left > Milliseconds::zero()){
+        Milliseconds current = std::min(time_left, 65535ms);
+        request.milliseconds = (uint16_t)current.count();
+        m_connection.device().command_queue().send_command(cancellable, request);
+        time_left -= current;
+    }
+}
+void PABotBase2_OemController::issue_report(
+    Cancellable* cancellable,
+    WallDuration duration,
+    const OemController_State0x30_Buttons& buttons,
+    const OemController_State0x30_Gyro& gyro
+){
+    //  TODO: For now we duplicate the gyro data to all 3 5ms segments.
+    OemController_State0x30_GyroX3 gyro3{
+        gyro, gyro, gyro
+    };
+
+#if 0
+    //  Purturb results to show the Switch that they are not stuck.
+    if (gyro3.time1.accel_x > 0){
+        gyro3.time0.accel_x--;
+        gyro3.time2.accel_x--;
+    }else if (gyro3.time1.accel_x < 0){
+        gyro3.time0.accel_x++;
+        gyro3.time2.accel_x++;
+    }else{
+        gyro3.time0.accel_x--;
+        gyro3.time2.accel_x++;
+    }
+    if (gyro3.time1.accel_y > 0){
+        gyro3.time0.accel_y--;
+        gyro3.time2.accel_y--;
+    }else if (gyro3.time1.accel_y < 0){
+        gyro3.time0.accel_y++;
+        gyro3.time2.accel_y++;
+    }else{
+        gyro3.time0.accel_y--;
+        gyro3.time2.accel_y++;
+    }
+    if (gyro3.time1.accel_z > 0){
+        gyro3.time0.accel_z--;
+        gyro3.time2.accel_z--;
+    }else if (gyro3.time1.accel_z < 0){
+        gyro3.time0.accel_z++;
+        gyro3.time2.accel_z++;
+    }else{
+        gyro3.time0.accel_z--;
+        gyro3.time2.accel_z++;
+    }
+#endif
+
+    //  We will not do any throttling or timing adjustments here. We'll defer
+    //  to the microcontroller to do that for us.
+
+    //  Divide the controller state into smaller chunks of 65535 milliseconds.
+    Milliseconds time_left = std::chrono::duration_cast<Milliseconds>(duration);
+
+    PABotBase2::Message_Command_NS1_OemController_FullState request;
+    request.message_bytes = sizeof(request);
+    request.opcode = PABB2_MESSAGE_CMD_NS1_OEM_CONTROLLER_FULL_STATE;
+    request.state.buttons = buttons;
+    request.state.gyro = gyro3;
+
+    while (time_left > Milliseconds::zero()){
+        Milliseconds current = std::min(time_left, 65535ms);
+        request.milliseconds = (uint16_t)current.count();
+        m_connection.device().command_queue().send_command(cancellable, request);
+        time_left -= current;
+    }
+}
+
+
+void PABotBase2_OemController::update_status(Cancellable& cancellable){
+    using namespace PABotBase2;
+
+//    cout << m_connection.device().dump_pending_requests() << endl;
+
+    if (m_color_html.empty()){
+        try{
+            m_logger.log("Reading Controller Colors...");
+
+            using ControllerColors = PABB_NintendoSwitch_ControllerColors;
+
+            Message_NS1_OemController_Spi message;
+            message.message_bytes = sizeof(Message_NS1_OemController_Spi);
+            message.opcode = PABB2_MESSAGE_REQ_NS1_OEM_CONTROLLER_READ_SPI;
+            message.controller_type = SerialPABotBase::controller_type_to_id(m_controller_type);
+            message.address = 0x00006050;
+            message.bytes = sizeof(ControllerColors);
+
+            uint8_t id = m_connection.device().send_request_with_response(message);
+            std::string response = m_connection.device().wait_for_request_response(id);
+
+            ControllerColors colors{};
+            if (response.size() == sizeof(MessageHeader) + sizeof(ControllerColors)){
+                memcpy(&colors, response.data() + sizeof(MessageHeader), sizeof(ControllerColors));
+            }else{
+                m_logger.log(
+                    "Invalid response size to PABB2_MESSAGE_REQ_NS1_OEM_CONTROLLER_READ_SPI: body = " + std::to_string(response.size()),
+                    COLOR_RED
+                );
+//                m_handle.set_status_line1("Error: See log for more information.", COLOR_RED);
+                return;
+            }
+            m_logger.log("Reading Controller Colors... Done");
+
+            switch (m_controller_type){
+            case ControllerType::NintendoSwitch_WiredProController:
+            case ControllerType::NintendoSwitch_WirelessProController:{
+                Color left(colors.left_grip[0], colors.left_grip[1], colors.left_grip[2]);
+                Color body(colors.body[0], colors.body[1], colors.body[2]);
+                Color right(colors.right_grip[0], colors.right_grip[1], colors.right_grip[2]);
+                m_color_html += html_color_text("&#x2b24;", left);
+                m_color_html += " " + html_color_text("&#x2b24;", body);
+                m_color_html += " " + html_color_text("&#x2b24;", right);
+                break;
+            }
+            case ControllerType::NintendoSwitch_WiredLeftJoycon:
+            case ControllerType::NintendoSwitch_WiredRightJoycon:
+            case ControllerType::NintendoSwitch_WirelessLeftJoycon:
+            case ControllerType::NintendoSwitch_WirelessRightJoycon:{
+                Color body(colors.body[0], colors.body[1], colors.body[2]);
+                m_color_html = html_color_text("&#x2b24;", body);
+                break;
+            }
+            default:;
+            }
+
+        }catch (Exception& e){
+            e.log(m_logger);
+            throw;
+        }
+    }
+
+    std::string str;
+    str += m_color_html + " - ";
+
+
+    PABotBase2::MessageHeader request;
+    request.message_bytes = sizeof(request);
+    request.opcode = PABB2_MESSAGE_OPCODE_REQUEST_STATUS;
+    uint8_t id = m_connection.device().send_request_with_response(request);
+    std::string response = m_connection.device().wait_for_request_response_min_size<
+        PABotBase2::Message_u32, PABB2_MESSAGE_OPCODE_RET_U32_DATA
+    >(id);
+
+    const PABotBase2::Message_u32* header = (const PABotBase2::Message_u32*)response.data();
+
+    switch (header->data){
+    case PABB_CID_NintendoSwitch_WiredProController:
+    case PABB_CID_NintendoSwitch_WiredLeftJoycon:
+    case PABB_CID_NintendoSwitch_WiredRightJoycon:
+    case PABB_CID_NintendoSwitch_WirelessProController:
+    case PABB_CID_NintendoSwitch_WirelessLeftJoycon:
+    case PABB_CID_NintendoSwitch_WirelessRightJoycon:
+        break;
+    default:
+        WriteSpinLock lg(m_error_lock);
+        if (m_error_string.empty()){
+            m_connection.set_status_line1("");
+        }else{
+            m_connection.set_status_line1(m_error_string, COLOR_RED);
+        }
+        return;
+    }
+
+    constexpr size_t EXPECTED_SIZE = sizeof(PABotBase2::Message_u32) + sizeof(OemController_Status);
+    if (response.size() != EXPECTED_SIZE){
+        throw SerialProtocolException(
+            m_logger, PA_CURRENT_FUNCTION,
+            "Received Incorrect Response Size: Expected = " + std::to_string(EXPECTED_SIZE) +
+            ", Actual = " + std::to_string(response.size())
+        );
+    }
+
+    const OemController_Status& status = *(const OemController_Status*)(header + 1);
+
+    str += "Paired: ";
+    if (status.status & 4){
+        str += html_color_text(
+            tostr_hex_padded(2, status.paired_mac_address[4]) + ":" +
+            tostr_hex_padded(2, status.paired_mac_address[5]),
+            theme_friendly_darkblue()
+        );
+    }else{
+        str += html_color_text("No", COLOR_RED);
+    }
+
+    bool status_ready = status.status & 2;
+    if (status_ready){
+        uint8_t byte = status.player_lights;
+        byte = (byte | (byte >> 4)) & 0x0f;
+        str += " - Connected: ";
+        for (int c = 0; c < 4; c++){
+            str += html_color_text("\u258d", byte & (1 << c) ? COLOR_GREEN : COLOR_BLACK);
+        }
+        ControllerPlayerNumber player = ControllerPlayerNumber::UNKNOWN;
+        switch (byte){
+        case 0b0000: player = ControllerPlayerNumber::DISCONNECTED; break;
+        case 0b0001: player = ControllerPlayerNumber::PLAYER1; break;
+        case 0b0011: player = ControllerPlayerNumber::PLAYER2; break;
+        case 0b0111: player = ControllerPlayerNumber::PLAYER3; break;
+        case 0b1111: player = ControllerPlayerNumber::PLAYER4; break;
+        case 0b1001: player = ControllerPlayerNumber::PLAYER5; break;
+        case 0b0101: player = ControllerPlayerNumber::PLAYER6; break;
+        case 0b1101: player = ControllerPlayerNumber::PLAYER7; break;
+        case 0b0110: player = ControllerPlayerNumber::PLAYER8; break;
+        }
+        m_player_number.store(player, std::memory_order_relaxed);
+    }else{
+        str += " - Connected: " + (status_ready
+            ? html_color_text("Yes", theme_friendly_darkblue())
+            : html_color_text("No", COLOR_RED)
+        );
+    }
+
+    WriteSpinLock lg(m_error_lock);
+    if (m_error_string.empty()){
+        m_connection.set_status_line1(str);
+    }else{
+        m_connection.set_status_line1(m_error_string, COLOR_RED);
+    }
+}
+void PABotBase2_OemController::stop_with_error(std::string message){
+    PABotBase2_Controller::stop_with_error(std::move(message));
+}
+
+
+
+
+double PABotBase2_OemController::rumble_index_to_amp(uint8_t index){
+    if (index < 16){
+        const double TABLE[] = {
+            0,
+            0.007843,
+            0.011823,
+            0.014061,
+            0.01672,
+            0.019885,
+            0.023648,
+            0.028123,
+            0.033442,
+            0.039771,
+            0.047296,
+            0.056246,
+            0.066886,
+            0.079542,
+            0.094592,
+            0.112491,
+        };
+        return TABLE[index];
+    }else if (16 <= index && index < 32){
+        return std::pow(2, index * (1. / 16)) / 17;
+    }else{
+        return std::pow(2, index * (1. / 32)) / 8.7;
+    }
+}
+double PABotBase2_OemController::rumble_index_to_freq(double index){
+    double x = index + 64;
+    x *= (1. / 32);
+    return 10 * std::pow(2, x);
+}
+PABotBase2_OemController::RumbleData PABotBase2_OemController::parse_rumble(const uint8_t data[4]){
+    uint8_t lo_freq_i = data[2] & 0x7f;
+    uint16_t hi_freq_i = data[0] | ((uint16_t)(data[1] & 1) << 8);
+    uint8_t hi_amp_i = (uint8_t)data[1] >> 1;
+    uint16_t lo_amp_i = ((uint16_t)data[3] << 1) | ((uint8_t)data[2] >> 7);
+    lo_amp_i = std::max<uint16_t>(lo_amp_i, 0x80);
+    lo_amp_i -= 0x80;
+
+    return RumbleData{
+        rumble_index_to_freq(lo_freq_i),
+        rumble_index_to_amp((uint8_t)lo_amp_i),
+        rumble_index_to_freq(hi_freq_i * 0.25 + 32),
+        rumble_index_to_amp(hi_amp_i)
+    };
+
+#if 0
+    std::cout
+              << ", lo_freq_i = " << (unsigned)lo_freq_i
+              << ", lo_amp_i = " << lo_amp_i
+              << ", hi_freq_i = " << hi_freq_i
+              << ", hi_amp_i = " << (unsigned)hi_amp_i
+              << ", lo_freq = " << lo_freq
+              << ", lo_amp = " << lo_amp
+              << ", hi_freq = " << hi_freq
+              << ", hi_amp = " << hi_amp
+              << std::endl;
+#endif
+}
+std::string PABotBase2_OemController::rumble_to_str(const RumbleData& data){
+    std::string ret;
+    if (data.lo_amp != 0){
+        ret += "[";
+        ret += tostr_fixed(data.lo_amp, 3) + " x ";
+        ret += tostr_fixed(data.lo_freq, 0) + "Hz";
+        ret += "]";
+    }
+    if (data.hi_amp != 0){
+        ret += "[";
+        ret += tostr_fixed(data.hi_amp, 3) + " x ";
+        ret += tostr_fixed(data.hi_freq, 0) + "Hz";
+        ret += "]";
+    }
+    return ret;
+}
+
+
+
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/NintendoSwitch/Controllers/PABotBase2/NintendoSwitch_PABotBase2_OemController.h b/SerialPrograms/Source/NintendoSwitch/Controllers/PABotBase2/NintendoSwitch_PABotBase2_OemController.h
new file mode 100644
index 0000000000..f586f83cc4
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Controllers/PABotBase2/NintendoSwitch_PABotBase2_OemController.h
@@ -0,0 +1,181 @@
+/*  PABotBase2: OEM Controller (Nintendo Switch 1)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_NintendoSwitch_PABotBase2_OemController_H
+#define PokemonAutomation_NintendoSwitch_PABotBase2_OemController_H
+
+#include "Common/ControllerStates/NintendoSwitch_OemController_State.h"
+#include "Controllers/ControllerStatusThread.h"
+#include "Controllers/JoystickTools.h"
+//#include "NintendoSwitch/NintendoSwitch_Settings.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+#include "NintendoSwitch_PABotBase2_Controller.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+
+
+
+class PABotBase2_OemController :
+    public PABotBase2_Controller,
+    private ControllerStatusThreadCallback
+{
+public:
+    using ContextType = ProControllerContext;
+
+    static void add_message_loggers(PABotBase2::MessageLogger& message_logger);
+
+
+public:
+    PABotBase2_OemController(
+        Logger& logger,
+        RecursiveThrottler& logging_throttler,
+        PABotBase2::Connection& connection,
+        ControllerType controller_type,
+        std::function<void(double magnitude)> on_rumble
+    );
+    ~PABotBase2_OemController();
+    void stop();
+
+    static bool run_preconnect_configure(
+        Logger& logger,
+        PABotBase2::Connection& connection,
+        ControllerType controller_type
+    );
+
+    ControllerPlayerNumber get_player_number(Cancellable& cancellable);
+
+
+protected:
+    static Button populate_report_buttons(
+        OemController_State0x30_Buttons& buttons,
+        const SwitchControllerState& controller_state
+    );
+    static bool populate_report_gyro(
+        OemController_State0x30_Gyro& gyro,
+        const SwitchControllerState& controller_state
+    );
+
+    void issue_report(
+        Cancellable* cancellable,
+        WallDuration duration,
+        const OemController_State0x30_Buttons& buttons
+    );
+    void issue_report(
+        Cancellable* cancellable,
+        WallDuration duration,
+        const OemController_State0x30_Buttons& buttons,
+        const OemController_State0x30_Gyro& gyro
+    );
+
+
+private:
+    virtual void update_status(Cancellable& cancellable) override;
+    virtual void stop_with_error(std::string message) override;
+
+#if 0
+    virtual void execute_state(
+        Cancellable* cancellable,
+        const SuperscalarScheduler::ScheduleEntry& entry
+    ) override;
+#endif
+
+
+protected:
+    //  Shared Utils
+
+    template <uint16_t min_threshold, uint16_t max_threshold>
+    static void encode_joystick(uint8_t data[3], const JoystickPosition& position){
+        //  2048 is the neutral position.
+        //
+        //  1897 is the point where the joystick calibrator will register it as
+        //  off-center.
+        //
+        //  ~320 is where it reaches the maximum value.
+        //
+        //  If we linearly interpolate between 1897 and 320, we seem to match
+        //  the wired controller's behavior.
+        //
+        //  I suspect the need to offset by 151 from 2048 -> 1897 is Nintendo's
+        //  way to alleviate the joycon drift problem.
+        //
+        //  The values 320 and 1897 are for the pro controller. Joycons are
+        //  slightly different.
+        //
+
+        double fx = position.x;
+        double fy = position.y;
+//        cout << "fx = " << fx << ", fy = " << fy << endl;
+        double mag_squared = fx*fx + fy*fy;
+
+        fx = std::min(fx, +1.0);
+        fx = std::max(fx, -1.0);
+        fy = std::min(fy, +1.0);
+        fy = std::max(fy, -1.0);
+
+        uint16_t wx, wy;
+        if (mag_squared == 0){
+            wx = 2048;
+            wy = 2048;
+        }else if (mag_squared >= 1){
+            JoystickTools::max_out_magnitude(fx, fy);
+            wx = JoystickTools::linear_float_to_u12(fx);
+            wy = JoystickTools::linear_float_to_u12(fy);
+        }else{
+            constexpr double lo = 1 - min_threshold / 2048.;
+            constexpr double hi = 1 - max_threshold / 2048.;
+
+            double true_mag = std::sqrt(mag_squared);
+            double report_mag = JoystickTools::project_to_range(true_mag, lo, hi);
+            double scale = report_mag / true_mag;
+            wx = JoystickTools::linear_float_to_u12(fx * scale);
+            wy = JoystickTools::linear_float_to_u12(fy * scale);
+        }
+
+//        cout << "wx = " << wx << ", wy = " << wy << endl;
+//        wy = 2048;
+//        wx = 1874;
+//        wx = 320;
+
+        data[0] = (uint8_t)wx;
+        data[1] = (uint8_t)(wx >> 8 | wy << 4);
+        data[2] = (uint8_t)(wy >> 4);
+    }
+
+    struct RumbleData{
+        double lo_freq;
+        double lo_amp;
+        double hi_freq;
+        double hi_amp;
+    };
+    static double rumble_index_to_amp(uint8_t index);
+    static double rumble_index_to_freq(double index);
+    static RumbleData parse_rumble(const uint8_t data[4]);
+    static std::string rumble_to_str(const RumbleData& data);
+
+
+protected:
+    //  Do not change after construction.
+    const ControllerType m_controller_type;
+    ControllerPerformanceClass m_performance_class;
+    Milliseconds m_ticksize;
+    Milliseconds m_cooldown;
+    Milliseconds m_timing_variation;
+
+    std::function<void(double magnitude)> m_on_rumble;
+
+    std::unique_ptr<ControllerStatusThread> m_status_thread;
+
+    std::string m_color_html;
+    std::atomic<ControllerPlayerNumber> m_player_number;
+};
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/NintendoSwitch/Controllers/PABotBase2/NintendoSwitch_PABotBase2_ProController.h b/SerialPrograms/Source/NintendoSwitch/Controllers/PABotBase2/NintendoSwitch_PABotBase2_ProController.h
new file mode 100644
index 0000000000..2ded16eaab
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Controllers/PABotBase2/NintendoSwitch_PABotBase2_ProController.h
@@ -0,0 +1,304 @@
+/*  PABotBase2: Pro Controller (Nintendo Switch 1)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_NintendoSwitch_PABotBase2_ProController_H
+#define PokemonAutomation_NintendoSwitch_PABotBase2_ProController_H
+
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+#include "NintendoSwitch_PABotBase2_OemController.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+
+
+
+class PABotBase2_ProController final :
+    public ProController,
+    public PABotBase2_OemController
+{
+    static constexpr uint16_t JOYSTICK_MIN_THRESHOLD = 1874;
+    static constexpr uint16_t JOYSTICK_MAX_THRESHOLD = 320;
+
+public:
+    PABotBase2_ProController(
+        Logger& logger,
+        PABotBase2::Connection& connection,
+        ControllerType controller_type
+    )
+        : ProController(logger)
+        , PABotBase2_OemController(
+            logger, logging_throttler(),
+            connection, controller_type,
+            [this](double magnitude){ on_rumble(magnitude); }
+        )
+    {}
+    ~PABotBase2_ProController(){
+        PABotBase2_OemController::stop();
+    }
+
+    virtual Logger& logger() override{
+        return m_logger;
+    }
+    virtual bool is_ready() const override{
+        return PABotBase2_Controller::is_ready();
+    }
+    virtual ControllerPlayerNumber get_player_number(Cancellable& cancellable) override{
+        return PABotBase2_OemController::get_player_number(cancellable);
+    }
+
+
+public:
+    virtual ControllerPerformanceClass performance_class() const override{
+        return m_performance_class;
+    }
+    virtual Milliseconds ticksize() const override{
+        return m_ticksize;
+    }
+    virtual Milliseconds cooldown() const override{
+        return m_cooldown;
+    }
+    virtual Milliseconds timing_variation() const override{
+        return m_timing_variation;
+    }
+    virtual bool atomic_multibutton() const override{
+        return true;
+    }
+
+
+public:
+    virtual void cancel_all_commands() override{
+        return PABotBase2_Controller::cancel_all_commands();
+    }
+    virtual void replace_on_next_command() override{
+        PABotBase2_Controller::replace_on_next_command();
+    }
+    virtual bool cancel_all_and_wait(Milliseconds timeout) override{
+        return PABotBase2_Controller::cancel_all_and_wait(timeout);
+    }
+
+    virtual void wait_for_all(Cancellable* cancellable) override{
+        PABotBase2_Controller::wait_for_all(cancellable);
+    }
+
+
+public:
+    //  Superscalar Commands (the "ssf" framework)
+
+    virtual void issue_barrier(Cancellable* cancellable) override{
+        ControllerWithScheduler::issue_barrier(cancellable);
+    }
+    virtual void issue_nop(Cancellable* cancellable, Milliseconds duration) override{
+        ControllerWithScheduler::issue_nop(cancellable, duration);
+    }
+
+    virtual void issue_buttons(
+        Cancellable* cancellable,
+        Milliseconds delay, Milliseconds hold, Milliseconds cooldown,
+        Button button
+    ) override{
+        ControllerWithScheduler::issue_buttons(cancellable, delay, hold, cooldown, button);
+    }
+    virtual void issue_dpad(
+        Cancellable* cancellable,
+        Milliseconds delay, Milliseconds hold, Milliseconds cooldown,
+        DpadPosition position
+    ) override{
+        ControllerWithScheduler::issue_dpad(cancellable, delay, hold, cooldown, position);
+    }
+    virtual void issue_left_joystick(
+        Cancellable* cancellable,
+        Milliseconds delay, Milliseconds hold, Milliseconds cooldown,
+        const JoystickPosition& position
+    ) override{
+        ControllerWithScheduler::issue_left_joystick(cancellable, delay, hold, cooldown, position);
+    }
+    virtual void issue_right_joystick(
+        Cancellable* cancellable,
+        Milliseconds delay, Milliseconds hold, Milliseconds cooldown,
+        const JoystickPosition& position
+    ) override{
+        ControllerWithScheduler::issue_right_joystick(cancellable, delay, hold, cooldown, position);
+    }
+
+    virtual void issue_gyro_accel_x(
+        Cancellable* cancellable,
+        Milliseconds delay, Milliseconds hold, Milliseconds cooldown,
+        int16_t value
+    ) override{
+        ControllerWithScheduler::issue_gyro_accel_x(cancellable, delay, hold, cooldown, value);
+    }
+    virtual void issue_gyro_accel_y(
+        Cancellable* cancellable,
+        Milliseconds delay, Milliseconds hold, Milliseconds cooldown,
+        int16_t value
+    ) override{
+        ControllerWithScheduler::issue_gyro_accel_y(cancellable, delay, hold, cooldown, value);
+    }
+    virtual void issue_gyro_accel_z(
+        Cancellable* cancellable,
+        Milliseconds delay, Milliseconds hold, Milliseconds cooldown,
+        int16_t value
+    ) override{
+        ControllerWithScheduler::issue_gyro_accel_z(cancellable, delay, hold, cooldown, value);
+    }
+    virtual void issue_gyro_rotate_x(
+        Cancellable* cancellable,
+        Milliseconds delay, Milliseconds hold, Milliseconds cooldown,
+        int16_t value
+    ) override{
+        ControllerWithScheduler::issue_gyro_rotate_x(cancellable, delay, hold, cooldown, value);
+    }
+    virtual void issue_gyro_rotate_y(
+        Cancellable* cancellable,
+        Milliseconds delay, Milliseconds hold, Milliseconds cooldown,
+        int16_t value
+    ) override{
+        ControllerWithScheduler::issue_gyro_rotate_y(cancellable, delay, hold, cooldown, value);
+    }
+    virtual void issue_gyro_rotate_z(
+        Cancellable* cancellable,
+        Milliseconds delay, Milliseconds hold, Milliseconds cooldown,
+        int16_t value
+    ) override{
+        ControllerWithScheduler::issue_gyro_rotate_z(cancellable, delay, hold, cooldown, value);
+    }
+
+    virtual void issue_full_controller_state(
+        Cancellable* cancellable,
+        bool enable_logging,
+        Milliseconds duration,
+        Button button,
+        DpadPosition dpad,
+        const JoystickPosition& left_joystick,
+        const JoystickPosition& right_joystick
+    ) override{
+        ControllerWithScheduler::issue_full_controller_state(
+            cancellable,
+            enable_logging,
+            duration,
+            button,
+            dpad,
+            left_joystick,
+            right_joystick
+        );
+    }
+
+
+public:
+    //  High speed RPCs.
+
+    virtual void issue_mash_button(
+        Cancellable* cancellable,
+        Milliseconds duration,
+        Button button,
+        Milliseconds delay, Milliseconds hold, Milliseconds cooldown
+    ) override{
+        ControllerWithScheduler::issue_mash_button(cancellable, duration, button, delay, hold, cooldown);
+    }
+    virtual void issue_mash_button(
+        Cancellable* cancellable,
+        Milliseconds duration,
+        Button button0, Button button1
+    ) override{
+        ControllerWithScheduler::issue_mash_button(cancellable, duration, button0, button1);
+    }
+    virtual void issue_mash_AZs(
+        Cancellable* cancellable,
+        Milliseconds duration
+    ) override{
+        ControllerWithScheduler::issue_mash_AZs(cancellable, duration);
+    }
+    virtual void issue_system_scroll(
+        Cancellable* cancellable,
+        Milliseconds delay, Milliseconds hold, Milliseconds cooldown,
+        DpadPosition direction  //  Diagonals not allowed.
+    ) override{
+        ControllerWithScheduler::issue_system_scroll(cancellable, delay, hold, cooldown, direction);
+    }
+
+
+private:
+    virtual void execute_state(
+        Cancellable* cancellable,
+        const SuperscalarScheduler::ScheduleEntry& entry
+    ) override{
+        SwitchControllerState controller_state;
+        for (auto& item : entry.state){
+            static_cast<const SwitchCommand&>(*item).apply(controller_state);
+        }
+
+        //  https://github.com/dekuNukem/Nintendo_Switch_Reverse_Engineering/blob/master/bluetooth_hid_notes.md
+        OemController_State0x30_Buttons buttons{
+            .button3 = 0,
+            .button4 = 0,
+            .button5 = 0,
+            .left_joystick = {0x00, 0x08, 0x80},
+            .right_joystick = {0x00, 0x08, 0x80},
+            .vibrator = 0x00,
+        };
+
+    //    Button all_buttons =
+        populate_report_buttons(buttons, controller_state);
+
+        {
+            SplitDpad dpad = convert_unified_to_split_dpad(controller_state.dpad);
+            buttons.button5 |= (dpad.down  ? 1 : 0) << 0;
+            buttons.button5 |= (dpad.up    ? 1 : 0) << 1;
+            buttons.button5 |= (dpad.right ? 1 : 0) << 2;
+            buttons.button5 |= (dpad.left  ? 1 : 0) << 3;
+        }
+
+        //  Left Stick
+        encode_joystick<JOYSTICK_MIN_THRESHOLD, JOYSTICK_MAX_THRESHOLD>(
+            buttons.left_joystick,
+            controller_state.left_joystick
+        );
+
+        //  Right Stick
+        encode_joystick<JOYSTICK_MIN_THRESHOLD, JOYSTICK_MAX_THRESHOLD>(
+            buttons.right_joystick,
+            controller_state.right_joystick
+        );
+
+        OemController_State0x30_Gyro gyro{
+            0x0000,
+            0x0000,
+            0x0000,
+            0x0000,
+            0x0000,
+            0x0000,
+        };
+        bool gyro_active = populate_report_gyro(gyro, controller_state);
+
+    //    gyro_active = true;
+    //    gyro.rotation_y = 0x00ff;
+    //    gyro.rotation_z = 0x000f;
+
+        if (!gyro_active){
+            issue_report(cancellable, entry.duration, buttons);
+        }else{
+            issue_report(cancellable, entry.duration, buttons, gyro);
+        }
+
+    #if 0
+        m_logger.log(
+            "push_state(): (" + button_to_string(all_buttons) +
+            "), dpad(" + dpad_to_string(m_dpad.position) +
+            "), LJ(" + std::to_string(m_left_joystick.x) + "," + std::to_string(m_left_joystick.y) +
+            "), RJ(" + std::to_string(m_right_joystick.x) + "," + std::to_string(m_right_joystick.y) +
+            "), hold = " + std::to_string(std::chrono::duration_cast<Milliseconds>(duration).count()) + "ms",
+            COLOR_DARKGREEN
+        );
+    #endif
+    }
+};
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/NintendoSwitch/Controllers/PABotBase2/NintendoSwitch_PABotBase2_WiredController.cpp b/SerialPrograms/Source/NintendoSwitch/Controllers/PABotBase2/NintendoSwitch_PABotBase2_WiredController.cpp
new file mode 100644
index 0000000000..981e1381ef
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Controllers/PABotBase2/NintendoSwitch_PABotBase2_WiredController.cpp
@@ -0,0 +1,225 @@
+/*  PABotBase2: Wired Controller (Nintendo Switch)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/ColoredText.h"
+#include "Common/PABotBase2/Controllers/PABotBase2_Controller_NS_WiredController.h"
+#include "Common/SerialPABotBase/SerialPABotBase_Protocol_IDs.h"
+#include "Controllers/JoystickTools.h"
+#include "NintendoSwitch_PABotBase2_WiredController.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+using namespace PABotBase2;
+using namespace std::chrono_literals;
+
+
+
+void PABotBase2_WiredController::add_message_loggers(PABotBase2::MessageLogger& message_logger){
+    using namespace PABotBase2;
+
+    message_logger.add_message<pabb2_Message_Command_NS_WiredController_State>(
+        "PABB2_MESSAGE_CMD_NS_WIRED_CONTROLLER_STATE",
+        PABB2_MESSAGE_CMD_NS_WIRED_CONTROLLER_STATE,
+        false,
+        [](const pabb2_Message_Command_NS_WiredController_State* message){
+            std::string str;
+            str += "id = " + std::to_string(message->id);
+            str += ", ms = " + std::to_string(message->milliseconds);
+            return str;
+        }
+    );
+}
+
+
+
+PABotBase2_WiredController::PABotBase2_WiredController(
+    Logger& logger,
+    PABotBase2::Connection& connection
+)
+    : ProController(logger)
+    , PABotBase2_Controller(logger, logging_throttler(), connection)
+{
+    //  Add controller-specific messages.
+    add_message_loggers(connection.message_logger());
+
+    m_status_thread.reset(new ControllerStatusThread(
+        connection, *this
+    ));
+}
+PABotBase2_WiredController::~PABotBase2_WiredController(){
+    stop();
+}
+void PABotBase2_WiredController::stop(){
+    m_status_thread.reset();
+}
+
+
+
+void PABotBase2_WiredController::update_status(Cancellable& cancellable){
+    PABotBase2::MessageHeader request;
+    request.message_bytes = sizeof(request);
+    request.opcode = PABB2_MESSAGE_OPCODE_REQUEST_STATUS;
+
+    uint8_t id = m_connection.device().send_request_with_response(request);
+    std::string response = m_connection.device().wait_for_request_response_min_size<
+        PABotBase2::Message_u32, PABB2_MESSAGE_OPCODE_RET_U32_DATA
+    >(id);
+
+    const PABotBase2::Message_u32* header = (const PABotBase2::Message_u32*)response.data();
+
+    if (header->data != PABB_CID_NintendoSwitch_WiredController &&
+        header->data != PABB_CID_NintendoSwitch2_WiredController
+    ){
+        m_connection.set_status_line1("");
+        return;
+    }
+
+    constexpr size_t EXPECTED_SIZE = sizeof(PABotBase2::Message_u32) + sizeof(pabb_NintendoSwitch_WiredController_Status);
+    if (response.size() != EXPECTED_SIZE){
+        throw SerialProtocolException(
+            m_logger, PA_CURRENT_FUNCTION,
+            "Received Incorrect Response Size: Expected = " + std::to_string(EXPECTED_SIZE) +
+            ", Actual = " + std::to_string(response.size())
+        );
+    }
+
+    uint8_t status = *(const uint8_t*)(header + 1);
+
+    std::string str;
+    str += "Connected: " + (status & 1
+        ? html_color_text("Yes", theme_friendly_darkblue())
+        : html_color_text("No", COLOR_RED)
+    );
+
+    m_connection.set_status_line1(str);
+}
+void PABotBase2_WiredController::stop_with_error(std::string message){
+    PABotBase2_Controller::stop_with_error(std::move(message));
+}
+
+
+
+
+void PABotBase2_WiredController::execute_state(
+    Cancellable* cancellable,
+    const SuperscalarScheduler::ScheduleEntry& entry
+){
+    if (!is_ready()){
+        throw InvalidConnectionStateException(error_string());
+    }
+
+    SwitchControllerState controller_state;
+    for (auto& item : entry.state){
+        static_cast<const SwitchCommand&>(*item).apply(controller_state);
+    }
+
+    int dpad_x = 0;
+    int dpad_y = 0;
+    uint16_t buttons = 0;
+    uint8_t dpad_byte = 0;
+
+    buttons = (uint16_t)controller_state.buttons;
+    if (controller_state.buttons & Button::BUTTON_UP)       dpad_y--;
+    if (controller_state.buttons & Button::BUTTON_RIGHT)    dpad_x++;
+    if (controller_state.buttons & Button::BUTTON_DOWN)     dpad_y++;
+    if (controller_state.buttons & Button::BUTTON_LEFT)     dpad_x--;
+    if (controller_state.buttons & Button::BUTTON_C)        dpad_byte |= 0x80;
+
+    //  Merge the dpad states.
+    DpadPosition dpad = controller_state.dpad;
+    {
+        switch (dpad){
+        case DpadPosition::DPAD_UP:
+            dpad_y--;
+            break;
+        case DpadPosition::DPAD_UP_RIGHT:
+            dpad_x++;
+            dpad_y--;
+            break;
+        case DpadPosition::DPAD_RIGHT:
+            dpad_x++;
+            break;
+        case DpadPosition::DPAD_DOWN_RIGHT:
+            dpad_x++;
+            dpad_y++;
+            break;
+        case DpadPosition::DPAD_DOWN:
+            dpad_y++;
+            break;
+        case DpadPosition::DPAD_DOWN_LEFT:
+            dpad_x--;
+            dpad_y++;
+            break;
+        case DpadPosition::DPAD_LEFT:
+            dpad_x--;
+            break;
+        case DpadPosition::DPAD_UP_LEFT:
+            dpad_x--;
+            dpad_y--;
+            break;
+        default:;
+        }
+
+        if (dpad_x < 0){
+            if (dpad_y < 0){
+                dpad = DpadPosition::DPAD_UP_LEFT;
+            }else if (dpad_y > 0){
+                dpad = DpadPosition::DPAD_DOWN_LEFT;
+            }else{
+                dpad = DpadPosition::DPAD_LEFT;
+            }
+        }else if (dpad_x > 0){
+            if (dpad_y < 0){
+                dpad = DpadPosition::DPAD_UP_RIGHT;
+            }else if (dpad_y > 0){
+                dpad = DpadPosition::DPAD_DOWN_RIGHT;
+            }else{
+                dpad = DpadPosition::DPAD_RIGHT;
+            }
+        }else{
+            if (dpad_y < 0){
+                dpad = DpadPosition::DPAD_UP;
+            }else if (dpad_y > 0){
+                dpad = DpadPosition::DPAD_DOWN;
+            }else{
+                dpad = DPAD_NONE;
+            }
+        }
+    }
+    dpad_byte |= dpad;
+
+    PABotBase2::pabb2_Message_Command_NS_WiredController_State request;
+    request.message_bytes = sizeof(request);
+    request.opcode = PABB2_MESSAGE_CMD_NS_WIRED_CONTROLLER_STATE;
+    request.report.buttons0 = (uint8_t)buttons;
+    request.report.buttons1 = (uint8_t)(buttons >> 8);
+    request.report.dpad_byte = dpad_byte;
+    request.report.left_joystick_x = JoystickTools::linear_float_to_u8(controller_state.left_joystick.x);
+    request.report.left_joystick_y = JoystickTools::linear_float_to_u8(-controller_state.left_joystick.y);
+    request.report.right_joystick_x = JoystickTools::linear_float_to_u8(controller_state.right_joystick.x);
+    request.report.right_joystick_y = JoystickTools::linear_float_to_u8(-controller_state.right_joystick.y);
+
+    //  Divide the controller state into smaller chunks that fit into the report
+    //  duration.
+    Milliseconds time_left = std::chrono::duration_cast<Milliseconds>(entry.duration);
+
+    while (time_left > Milliseconds::zero()){
+        Milliseconds current = std::min(time_left, 65535ms);
+        request.milliseconds = (uint16_t)current.count();
+        m_connection.device().command_queue().send_command(cancellable, request);
+        time_left -= current;
+    }
+}
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/NintendoSwitch/Controllers/PABotBase2/NintendoSwitch_PABotBase2_WiredController.h b/SerialPrograms/Source/NintendoSwitch/Controllers/PABotBase2/NintendoSwitch_PABotBase2_WiredController.h
new file mode 100644
index 0000000000..2df4cb03cd
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Controllers/PABotBase2/NintendoSwitch_PABotBase2_WiredController.h
@@ -0,0 +1,239 @@
+/*  PABotBase2: Wired Controller (Nintendo Switch)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_NintendoSwitch_PABotBase2_WiredController_H
+#define PokemonAutomation_NintendoSwitch_PABotBase2_WiredController_H
+
+#include "Controllers/ControllerStatusThread.h"
+#include "NintendoSwitch/NintendoSwitch_Settings.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+#include "NintendoSwitch_PABotBase2_Controller.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+
+
+
+class PABotBase2_WiredController final :
+    public ProController,
+    public PABotBase2_Controller,
+    private ControllerStatusThreadCallback
+{
+public:
+    using ContextType = ProControllerContext;
+
+    static void add_message_loggers(PABotBase2::MessageLogger& message_logger);
+
+
+public:
+    PABotBase2_WiredController(
+        Logger& logger,
+        PABotBase2::Connection& connection
+    );
+    ~PABotBase2_WiredController();
+    void stop();
+
+    virtual Logger& logger() override{
+        return m_logger;
+    }
+    virtual bool is_ready() const override{
+        return PABotBase2_Controller::is_ready();
+    }
+
+
+public:
+    virtual ControllerPerformanceClass performance_class() const override{
+        return ControllerPerformanceClass::SerialPABotBase_Wired;
+    }
+    virtual Milliseconds ticksize() const override{
+        return Milliseconds(0);
+    }
+    virtual Milliseconds cooldown() const override{
+        return Milliseconds(8);
+    }
+    virtual Milliseconds timing_variation() const override{
+        return ConsoleSettings::instance().TIMING_OPTIONS.WIRED;
+    }
+    virtual bool atomic_multibutton() const override{
+        return true;
+    }
+
+
+public:
+    virtual void cancel_all_commands() override{
+        return PABotBase2_Controller::cancel_all_commands();
+    }
+    virtual void replace_on_next_command() override{
+        PABotBase2_Controller::replace_on_next_command();
+    }
+    virtual bool cancel_all_and_wait(Milliseconds timeout) override{
+        return PABotBase2_Controller::cancel_all_and_wait(timeout);
+    }
+
+    virtual void wait_for_all(Cancellable* cancellable) override{
+        PABotBase2_Controller::wait_for_all(cancellable);
+    }
+
+
+public:
+    //  Superscalar Commands (the "ssf" framework)
+
+    virtual void issue_barrier(Cancellable* cancellable) override{
+        ControllerWithScheduler::issue_barrier(cancellable);
+    }
+    virtual void issue_nop(Cancellable* cancellable, Milliseconds duration) override{
+        ControllerWithScheduler::issue_nop(cancellable, duration);
+    }
+    virtual void issue_buttons(
+        Cancellable* cancellable,
+        Milliseconds delay, Milliseconds hold, Milliseconds cooldown,
+        Button button
+    ) override{
+        button &= VALID_PRO_CONTROLLER_BUTTONS;
+        ControllerWithScheduler::issue_buttons(cancellable, delay, hold, cooldown, button);
+    }
+    virtual void issue_dpad(
+        Cancellable* cancellable,
+        Milliseconds delay, Milliseconds hold, Milliseconds cooldown,
+        DpadPosition position
+    ) override{
+        ControllerWithScheduler::issue_dpad(cancellable, delay, hold, cooldown, position);
+    }
+    virtual void issue_left_joystick(
+        Cancellable* cancellable,
+        Milliseconds delay, Milliseconds hold, Milliseconds cooldown,
+        const JoystickPosition& position
+    ) override{
+        ControllerWithScheduler::issue_left_joystick(cancellable, delay, hold, cooldown, position);
+    }
+    virtual void issue_right_joystick(
+        Cancellable* cancellable,
+        Milliseconds delay, Milliseconds hold, Milliseconds cooldown,
+        const JoystickPosition& position
+    ) override{
+        ControllerWithScheduler::issue_right_joystick(cancellable, delay, hold, cooldown, position);
+    }
+
+    virtual void issue_gyro_accel_x(
+        Cancellable* cancellable,
+        Milliseconds delay, Milliseconds hold, Milliseconds cooldown,
+        int16_t value
+    ) override{
+        ControllerWithScheduler::issue_gyro_accel_x(cancellable, delay, hold, cooldown, value);
+    }
+    virtual void issue_gyro_accel_y(
+        Cancellable* cancellable,
+        Milliseconds delay, Milliseconds hold, Milliseconds cooldown,
+        int16_t value
+    ) override{
+        ControllerWithScheduler::issue_gyro_accel_y(cancellable, delay, hold, cooldown, value);
+    }
+    virtual void issue_gyro_accel_z(
+        Cancellable* cancellable,
+        Milliseconds delay, Milliseconds hold, Milliseconds cooldown,
+        int16_t value
+    ) override{
+        ControllerWithScheduler::issue_gyro_accel_z(cancellable, delay, hold, cooldown, value);
+    }
+    virtual void issue_gyro_rotate_x(
+        Cancellable* cancellable,
+        Milliseconds delay, Milliseconds hold, Milliseconds cooldown,
+        int16_t value
+    ) override{
+        ControllerWithScheduler::issue_gyro_rotate_x(cancellable, delay, hold, cooldown, value);
+    }
+    virtual void issue_gyro_rotate_y(
+        Cancellable* cancellable,
+        Milliseconds delay, Milliseconds hold, Milliseconds cooldown,
+        int16_t value
+    ) override{
+        ControllerWithScheduler::issue_gyro_rotate_y(cancellable, delay, hold, cooldown, value);
+    }
+    virtual void issue_gyro_rotate_z(
+        Cancellable* cancellable,
+        Milliseconds delay, Milliseconds hold, Milliseconds cooldown,
+        int16_t value
+    ) override{
+        ControllerWithScheduler::issue_gyro_rotate_z(cancellable, delay, hold, cooldown, value);
+    }
+
+    virtual void issue_full_controller_state(
+        Cancellable* cancellable,
+        bool enable_logging,
+        Milliseconds duration,
+        Button button,
+        DpadPosition dpad,
+        const JoystickPosition& left_joystick,
+        const JoystickPosition& right_joystick
+    ) override{
+        ControllerWithScheduler::issue_full_controller_state(
+            cancellable,
+            enable_logging,
+            duration,
+            button,
+            dpad,
+            left_joystick,
+            right_joystick
+        );
+    }
+
+
+public:
+    //  High speed RPCs.
+
+    virtual void issue_mash_button(
+        Cancellable* cancellable,
+        Milliseconds duration,
+        Button button,
+        Milliseconds delay, Milliseconds hold, Milliseconds cooldown
+    ) override{
+        button &= VALID_PRO_CONTROLLER_BUTTONS;
+        ControllerWithScheduler::issue_mash_button(cancellable, duration, button, delay, hold, cooldown);
+    }
+    virtual void issue_mash_button(
+        Cancellable* cancellable,
+        Milliseconds duration,
+        Button button0, Button button1
+    ) override{
+        button0 &= VALID_PRO_CONTROLLER_BUTTONS;
+        button1 &= VALID_PRO_CONTROLLER_BUTTONS;
+        ControllerWithScheduler::issue_mash_button(cancellable, duration, button0, button1);
+    }
+    virtual void issue_mash_AZs(
+        Cancellable* cancellable,
+        Milliseconds duration
+    ) override{
+        ControllerWithScheduler::issue_mash_AZs(cancellable, duration);
+    }
+    virtual void issue_system_scroll(
+        Cancellable* cancellable,
+        Milliseconds delay, Milliseconds hold, Milliseconds cooldown,
+        DpadPosition direction  //  Diagonals not allowed.
+    ) override{
+        ControllerWithScheduler::issue_system_scroll(cancellable, delay, hold, cooldown, direction);
+    }
+
+
+private:
+    virtual void update_status(Cancellable& cancellable) override;
+    virtual void stop_with_error(std::string message) override;
+
+    virtual void execute_state(
+        Cancellable* cancellable,
+        const SuperscalarScheduler::ScheduleEntry& entry
+    ) override;
+
+
+private:
+    std::unique_ptr<ControllerStatusThread> m_status_thread;
+};
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.cpp b/SerialPrograms/Source/NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.cpp
new file mode 100644
index 0000000000..f9a8389e5c
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.cpp
@@ -0,0 +1,177 @@
+/*  Nintendo Switch Controller
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Strings/StringTools.h"
+#include "Common/Cpp/Containers/Pimpl.tpp"
+#include "ControllerInput/ControllerInput.h"
+#include "ControllerInput/Keyboard/KeyboardInput_State.h"
+#include "Controllers/RumbleListener.h"
+#include "NintendoSwitch/NintendoSwitch_Settings.h"
+#include "NintendoSwitch/Controllers/NintendoSwitch_ControllerButtons.h"
+#include "NintendoSwitch/Controllers/NintendoSwitch_VirtualControllerState.h"
+#include "NintendoSwitch_ProControllerState.h"
+#include "NintendoSwitch_ProController.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+using namespace std::chrono_literals;
+
+
+const char ProController::NAME[] = "Nintendo Switch: Pro Controller";
+
+
+
+
+
+struct ProController::Data{
+    ListenerSet<RumbleListener> m_rumble_listeners;
+    std::map<KeyboardKey, ProControllerDeltas> m_keyboard_mapping;
+};
+
+
+
+void ProController::add_listener(RumbleListener& listener){
+    m_data->m_rumble_listeners.add(listener);
+}
+void ProController::remove_listener(RumbleListener& listener){
+    m_data->m_rumble_listeners.remove(listener);
+}
+
+
+
+
+ProController::ProController(Logger& logger)
+    : m_data(CONSTRUCT_TOKEN)
+{
+    std::vector<std::shared_ptr<EditableTableRow>> mapping =
+        ConsoleSettings::instance().KEYBOARD_MAPPINGS.PRO_CONTROLLER2.current_refs();
+
+    for (const auto& deltas : mapping){
+        const ProControllerFromKeyboardTableRow& row = static_cast<const ProControllerFromKeyboardTableRow&>(*deltas);
+        m_data->m_keyboard_mapping[row.key] += row.snapshot();
+    }
+}
+ProController::~ProController(){
+}
+
+ControllerClass ProController::controller_class() const noexcept{
+    return ControllerClass::NintendoSwitch_ProController;
+}
+
+
+
+
+
+bool ProController::run_string_command(Milliseconds duration, const std::string& command){
+    //  stop
+    //  replace
+    //  wait
+    //  A,B
+    //  A,B|JSL:+0.5:-0.5
+
+    std::vector<std::string> tokens = StringTools::split(command, "|");
+    if (tokens.empty()){
+        return false;
+    }
+
+    if (tokens[0] == "stop"){
+        cancel_all_commands();
+        return true;
+    }
+    if (tokens[0] == "replace"){
+        replace_on_next_command();
+        return true;
+    }
+    if (tokens[0] == "wait"){
+        issue_nop(nullptr, duration);
+        return true;
+    }
+
+    ProControllerState state;
+
+    for (const std::string& token : tokens){
+        if (token.starts_with("JSL")){
+            std::vector<std::string> args = StringTools::split(token, ":");
+            if (args.size() != 3){
+                return false;
+            }
+            state.left_joystick.x = std::atof(args[1].data());
+            state.left_joystick.y = std::atof(args[2].data());
+            continue;
+        }
+        if (token.starts_with("JSR")){
+            std::vector<std::string> args = StringTools::split(token, ":");
+            if (args.size() != 3){
+                return false;
+            }
+            state.right_joystick.x = std::atof(args[1].data());
+            state.right_joystick.y = std::atof(args[2].data());
+            continue;
+        }
+        state.buttons |= string_to_button(token, ",");
+    }
+
+    state.execute(nullptr, true, *this, duration);
+
+    return true;
+}
+
+
+
+void ProController::run_controller_input(const ControllerInputState& state){
+//    cout << "run_controller_input()" << endl;
+
+    if (state.type() != ControllerInputType::HID_Keyboard){
+        return;
+    }
+
+    ProControllerDeltas deltas;
+
+    const KeyboardInputState& lstate = static_cast<const KeyboardInputState&>(state);
+    const std::map<KeyboardKey, ProControllerDeltas>& map = m_data->m_keyboard_mapping;
+
+//    cout << "keys() = " << lstate.keys().size() << endl;
+
+    for (KeyboardKey key : lstate.keys()){
+        auto iter = map.find(key);
+        if (iter != map.end()){
+            deltas += iter->second;
+        }
+    }
+
+    ProControllerState controller_state;
+    deltas.to_state(controller_state);
+
+    WallClock timestamp;
+    if (controller_state.is_neutral()){
+        timestamp = current_time();
+        cancel_all_commands();
+    }else{
+        replace_on_next_command();
+
+        timestamp = current_time();
+        controller_state.execute(nullptr, false, *this, 2000ms);
+    }
+
+    on_command_input(timestamp, controller_state);
+}
+
+
+void ProController::on_rumble(double magnitude){
+    m_data->m_rumble_listeners.run_method(&RumbleListener::on_rumble, magnitude);
+}
+
+
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h b/SerialPrograms/Source/NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h
new file mode 100644
index 0000000000..5c1790c985
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h
@@ -0,0 +1,272 @@
+/*  Nintendo Switch Pro Controller
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  This is the raw (full) controller API that is exposed to programs.
+ *
+ */
+
+#ifndef PokemonAutomation_NintendoSwitch_ProController_H
+#define PokemonAutomation_NintendoSwitch_ProController_H
+
+#include "Common/Cpp/Containers/Pimpl.h"
+#include "Controllers/Joystick.h"
+#include "Controllers/Controller.h"
+#include "NintendoSwitch/Controllers/NintendoSwitch_ControllerButtons.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+
+struct RumbleListener;
+
+namespace NintendoSwitch{
+
+
+class ProController;
+using ProControllerContext = ControllerContext<ProController>;
+
+
+static constexpr Button VALID_PRO_CONTROLLER_BUTTONS =
+    BUTTON_Y |
+    BUTTON_B |
+    BUTTON_A |
+    BUTTON_X |
+    BUTTON_L |
+    BUTTON_R |
+    BUTTON_ZL |
+    BUTTON_ZR |
+    BUTTON_MINUS |
+    BUTTON_PLUS |
+    BUTTON_LCLICK |
+    BUTTON_RCLICK |
+    BUTTON_HOME |
+    BUTTON_CAPTURE |
+    BUTTON_UP |
+    BUTTON_RIGHT |
+    BUTTON_DOWN |
+    BUTTON_LEFT |
+    BUTTON_GR |
+    BUTTON_GL |
+    BUTTON_C;
+
+
+
+
+
+
+//
+//  This is the generic interface to a Switch pro controller.
+//
+class ProController : public AbstractController{
+public:
+    using ContextType = ProControllerContext;
+
+    void add_listener(RumbleListener& listener);
+    void remove_listener(RumbleListener& listener);
+
+
+public:
+    ProController(Logger& logger);
+    virtual ~ProController();
+
+
+public:
+    static const char NAME[];
+    virtual const char* name() override{
+        return NAME;
+    };
+    virtual ControllerClass controller_class() const noexcept override;
+
+    virtual ControllerPlayerNumber get_player_number(Cancellable& cancellable){
+        return ControllerPlayerNumber::UNKNOWN;
+    }
+
+
+public:
+    //  Standard Commands
+
+    //  Press all the buttons set in the bitfield simultaneously.
+    //  This command will wait until all the selected buttons are ready to
+    //  ensure that they are all dispatched simultaneously.
+    virtual void issue_buttons(
+        Cancellable* cancellable,
+        Milliseconds delay, Milliseconds hold, Milliseconds cooldown,
+        Button button
+    ) = 0;
+
+    //  Dpad
+    virtual void issue_dpad(
+        Cancellable* cancellable,
+        Milliseconds delay, Milliseconds hold, Milliseconds cooldown,
+        DpadPosition position
+    ) = 0;
+
+    //  Joysticks
+    virtual void issue_left_joystick(
+        Cancellable* cancellable,
+        Milliseconds delay, Milliseconds hold, Milliseconds cooldown,
+        const JoystickPosition& position
+    ) = 0;
+    virtual void issue_right_joystick(
+        Cancellable* cancellable,
+        Milliseconds delay, Milliseconds hold, Milliseconds cooldown,
+        const JoystickPosition& position
+    ) = 0;
+
+    //  Gyro: Accelerometer (experimental - API subject to change)
+    virtual void issue_gyro_accel_x(
+        Cancellable* cancellable,
+        Milliseconds delay, Milliseconds hold, Milliseconds cooldown,
+        int16_t value
+    ) = 0;
+    virtual void issue_gyro_accel_y(
+        Cancellable* cancellable,
+        Milliseconds delay, Milliseconds hold, Milliseconds cooldown,
+        int16_t value
+    ) = 0;
+    virtual void issue_gyro_accel_z(
+        Cancellable* cancellable,
+        Milliseconds delay, Milliseconds hold, Milliseconds cooldown,
+        int16_t value
+    ) = 0;
+    virtual void issue_gyro_rotate_x(
+        Cancellable* cancellable,
+        Milliseconds delay, Milliseconds hold, Milliseconds cooldown,
+        int16_t value
+    ) = 0;
+    virtual void issue_gyro_rotate_y(
+        Cancellable* cancellable,
+        Milliseconds delay, Milliseconds hold, Milliseconds cooldown,
+        int16_t value
+    ) = 0;
+    virtual void issue_gyro_rotate_z(
+        Cancellable* cancellable,
+        Milliseconds delay, Milliseconds hold, Milliseconds cooldown,
+        int16_t value
+    ) = 0;
+
+    //
+    //  Press all the following buttons/joysticks simultaneously for the
+    //  specified duration. No wait is added at the end. Thus you can issue
+    //  these back-to-back to simulate buttons being pressed and released
+    //  concurrently with other buttons being held down the whole time.
+    //
+    //  This command will wait until the controller is fully idle (including
+    //  cooldowns) before it starts. This ensures that everything is issued
+    //  simultaneously. In other words, there is an implied call to
+    //  "issue_barrier()" before executing the state.
+    //
+    //  The sole purpose of this function is for keyboard commands.
+    //  For programs, it is easier to use the individual button/joystick
+    //  functions above.
+    //
+    //  If we need to support new Switch controller functionality
+    //  (such as Joycon gyro or new stuff in Switch 2), we can simply add
+    //  overloads to this and gate them behind features.
+    //
+    virtual void issue_full_controller_state(
+        Cancellable* cancellable,
+        bool enable_logging,
+        Milliseconds duration,
+        Button button,
+        DpadPosition dpad,
+        const JoystickPosition& left_joystick,
+        const JoystickPosition& right_joystick
+    ) = 0;
+
+
+public:
+    //
+    //  High speed Macros
+    //
+    //  Be mindful when calling these mashing functions on a tick imprecise
+    //  controller. You can guarantee that some (most) of them will be dropped.
+    //
+    //  Even if you are on a tick-precise controller, it is not advised to call
+    //  these if you are micromanaging with tick-level granularity. The exact
+    //  timing characteristics and button selection is not specified and may be
+    //  context and implementation-dependent.
+    //
+
+    //  Mash a button as quickly as possible.
+    virtual void issue_mash_button(
+        Cancellable* cancellable,
+        Milliseconds duration,
+        Button button,
+        Milliseconds delay = Milliseconds(64),
+        Milliseconds hold = Milliseconds(40),
+        Milliseconds cooldown = Milliseconds(24)
+    ) = 0;
+
+    //  Alternate pressing "button0" and "button1" as quickly as possible.
+    //  "button0" will always be pressed first.
+    //  Both buttons will be pressed at least once.
+    virtual void issue_mash_button(
+        Cancellable* cancellable,
+        Milliseconds duration,
+        Button button0, Button button1
+    ) = 0;
+
+    //  In situations where A, ZL, and RL all do the same thing, use all 3 of
+    //  them to logically mash A much faster than is possible with just one
+    //  button.
+    virtual void issue_mash_AZs(
+        Cancellable* cancellable,
+        Milliseconds duration
+    ) = 0;
+
+    //
+    //  Send a scroll command in the specified direction.
+    //
+    //  This will use either the dpad or either joystick - whichever is
+    //  available first in the pipeline.
+    //
+    //  The intended use-case of this is for fast scrolling in the system menu
+    //  where all 3 buttons have the same effect and can be used at the same
+    //  time.
+    //
+    virtual void issue_system_scroll(
+        Cancellable* cancellable,
+        Milliseconds delay, Milliseconds hold, Milliseconds cooldown,
+        DpadPosition direction  //  Diagonals not allowed.
+    ) = 0;
+
+
+public:
+    //  External Inputs
+
+    //  stop
+    //  replace
+    //  wait
+    //  A,B
+    //  JSL:+0.5:-0.5
+    //  JSR:+0.5:-0.5
+    //  A,B|JSL:+0.5:-0.5|JSR:+0.5:-0.5
+    virtual bool run_string_command(Milliseconds duration, const std::string& command) override;
+
+    virtual void run_controller_input(const ControllerInputState& state) override;
+
+
+protected:
+    //  Console -> Controller
+
+    void on_rumble(double magnitude);
+
+
+private:
+    struct Data;
+    Pimpl<Data> m_data;
+};
+
+
+
+
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/NintendoSwitch/Controllers/Procon/NintendoSwitch_ProControllerState.cpp b/SerialPrograms/Source/NintendoSwitch/Controllers/Procon/NintendoSwitch_ProControllerState.cpp
new file mode 100644
index 0000000000..50d9835b8f
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Controllers/Procon/NintendoSwitch_ProControllerState.cpp
@@ -0,0 +1,208 @@
+/*  Nintendo Switch Pro Controller State
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/PrettyPrint.h"
+#include "Common/Cpp/Json/JsonObject.h"
+#include "Controllers/JoystickTools.h"
+#include "NintendoSwitch_ProController.h"
+#include "NintendoSwitch_ProControllerState.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+
+
+
+void ProControllerState::clear(){
+    buttons = BUTTON_NONE;
+    dpad = DPAD_NONE;
+    left_joystick = JoystickPosition();
+    right_joystick = JoystickPosition();
+}
+bool ProControllerState::operator==(const ControllerState& x) const{
+    if (typeid(*this) != typeid(x)){
+        return false;
+    }
+
+    const ProControllerState& r = static_cast<const ProControllerState&>(x);
+
+    if (buttons != r.buttons){
+        return false;
+    }
+    if (dpad != r.dpad){
+        return false;
+    }
+    if (left_joystick != r.left_joystick){
+        return false;
+    }
+    if (right_joystick != r.right_joystick){
+        return false;
+    }
+    return true;
+}
+bool ProControllerState::is_neutral() const{
+    return buttons == 0
+        && dpad == DPAD_NONE
+        && left_joystick.is_neutral()
+        && right_joystick.is_neutral();
+}
+
+
+void ProControllerState::load_json(const JsonObject& json){
+    clear();
+
+    //  Backwards compatibility.
+    if (json.get_boolean_default("is_neutral", false)){
+        return;
+    }
+
+    {
+        std::string buttons_string;
+        if (json.read_string(buttons_string, "buttons")){
+            buttons = string_to_button(buttons_string, " ");
+        }
+    }
+    {
+        std::string dpad_string;
+        if (json.read_string(dpad_string, "dpad")){
+            dpad = string_to_dpad(dpad_string);
+        }
+    }
+
+    //  Backwards compatibility.
+    {
+        uint8_t left_x = 128;
+        uint8_t left_y = 128;
+        uint8_t right_x = 128;
+        uint8_t right_y = 128;
+
+        json.read_integer(left_x, "left_x", 0, 255);
+        json.read_integer(left_y, "left_y", 0, 255);
+        json.read_integer(right_x, "right_x", 0, 255);
+        json.read_integer(right_y, "right_y", 0, 255);
+
+        json.read_integer(left_x, "lx", 0, 255);
+        json.read_integer(left_y, "ly", 0, 255);
+        json.read_integer(right_x, "rx", 0, 255);
+        json.read_integer(right_y, "ry", 0, 255);
+
+        left_joystick.x = JoystickTools::linear_u8_to_float(left_x);
+        left_joystick.y = -JoystickTools::linear_u8_to_float(left_y);
+        right_joystick.x = JoystickTools::linear_u8_to_float(right_x);
+        right_joystick.y = -JoystickTools::linear_u8_to_float(right_y);
+    }
+
+    json.read_float(left_joystick.x, "lxf");
+    json.read_float(left_joystick.y, "lyf");
+    json.read_float(right_joystick.x, "rxf");
+    json.read_float(right_joystick.y, "ryf");
+}
+JsonObject ProControllerState::to_json() const{
+    JsonObject obj;
+    if (buttons != BUTTON_NONE){
+        obj["buttons"] = button_to_string(buttons);
+    }
+    if (dpad != DPAD_NONE){
+        obj["dpad"] = dpad_to_string(dpad);
+    }
+    if (!left_joystick.is_neutral()){
+        obj["lxf"] = left_joystick.x;
+        obj["lyf"] = left_joystick.y;
+    }
+    if (!right_joystick.is_neutral()){
+        obj["rxf"] = right_joystick.x;
+        obj["ryf"] = right_joystick.y;
+    }
+    return obj;
+}
+void ProControllerState::execute(
+    Cancellable* scope,
+    bool enable_logging,
+    AbstractController& controller,
+    Milliseconds duration
+) const{
+    controller.cast_with_exception<ProController>().issue_full_controller_state(
+        scope,
+        enable_logging,
+        duration,
+        buttons,
+        dpad,
+        left_joystick,
+        right_joystick
+    );
+}
+std::string ProControllerState::to_cpp(Milliseconds hold, Milliseconds release) const{
+    uint8_t non_neutral_field = 0;
+    size_t non_neutral_fields = 0;
+    do{
+        if (buttons != BUTTON_NONE){
+            non_neutral_field = 0;
+            non_neutral_fields++;
+        }
+        if (dpad != DPAD_NONE){
+            non_neutral_field = 1;
+            non_neutral_fields++;
+        }
+        if (!left_joystick.is_neutral()){
+            non_neutral_field = 2;
+            non_neutral_fields++;
+        }
+        if (!right_joystick.is_neutral()){
+            non_neutral_field = 3;
+            non_neutral_fields++;
+        }
+    }while (false);
+
+    if (non_neutral_fields == 0){
+        return "pbf_wait(context, " + std::to_string((hold + release).count()) + "ms);\n";
+    }
+
+    std::string hold_str = std::to_string(hold.count()) + "ms";
+    std::string release_str = std::to_string(release.count()) + "ms";
+
+    if (non_neutral_fields > 1){
+        std::string ret;
+        ret += "pbf_controller_state(context, "
+            + button_to_code_string(buttons) + ", "
+            + dpad_to_code_string(dpad) + ", {"
+            + tostr_fixed(left_joystick.x, 3) + ", " + tostr_fixed(left_joystick.y, 3) + "}, {"
+            + tostr_fixed(right_joystick.x, 3) + ", " + tostr_fixed(right_joystick.y, 3) + "}, "
+            + hold_str +");\n";
+        if (release != Milliseconds(0)){
+            ret += "pbf_wait(context, " + release_str + ");\n";
+        }
+        return ret;
+    }
+    switch (non_neutral_field){
+    case 0:
+        return "pbf_press_button(context, "
+            + button_to_code_string(buttons) + ", "
+            + hold_str + ", " + release_str + ");\n";
+    case 1:
+        return "pbf_press_dpad(context, "
+            + dpad_to_code_string(dpad) + ", "
+            + hold_str + ", " + release_str + ");\n";
+    case 2:
+        return "pbf_move_left_joystick(context, {"
+            + std::to_string(left_joystick.x) + ", " + std::to_string(left_joystick.y) + "}, "
+            + hold_str + ", " + release_str + ");\n";
+    case 3:
+        return "pbf_move_right_joystick(context, {"
+            + std::to_string(right_joystick.x) + ", " + std::to_string(right_joystick.y) + "}, "
+            + hold_str + ", " + release_str + ");\n";
+    }
+    throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Impossible state.");
+}
+
+
+
+
+
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/NintendoSwitch/Controllers/Procon/NintendoSwitch_ProControllerState.h b/SerialPrograms/Source/NintendoSwitch/Controllers/Procon/NintendoSwitch_ProControllerState.h
new file mode 100644
index 0000000000..bbeca2dbe8
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Controllers/Procon/NintendoSwitch_ProControllerState.h
@@ -0,0 +1,55 @@
+/*  Nintendo Switch Pro Controller State
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_NintendoSwitch_ProControllerState_H
+#define PokemonAutomation_NintendoSwitch_ProControllerState_H
+
+#include "Controllers/Joystick.h"
+#include "Controllers/ControllerState.h"
+#include "NintendoSwitch/Controllers/NintendoSwitch_ControllerButtons.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+
+class ProController;
+
+
+
+
+class ProControllerState : public ControllerState{
+public:
+    using ControllerType = ProController;
+
+public:
+    virtual void clear() override;
+    virtual bool operator==(const ControllerState& x) const override;
+    virtual bool is_neutral() const override;
+
+    virtual void load_json(const JsonObject& json) override;
+    virtual JsonObject to_json() const override;
+
+    virtual void execute(
+        Cancellable* scope,
+        bool enable_logging,
+        AbstractController& controller,
+        Milliseconds duration
+    ) const override;
+    virtual std::string to_cpp(Milliseconds hold, Milliseconds release) const override;
+
+public:
+    Button buttons = BUTTON_NONE;
+    DpadPosition dpad = DPAD_NONE;
+    JoystickPosition left_joystick;
+    JoystickPosition right_joystick;
+};
+
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/NintendoSwitch/Controllers/Procon/NintendoSwitch_ProControllerTable.cpp b/SerialPrograms/Source/NintendoSwitch/Controllers/Procon/NintendoSwitch_ProControllerTable.cpp
new file mode 100644
index 0000000000..5d91f2fa57
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Controllers/Procon/NintendoSwitch_ProControllerTable.cpp
@@ -0,0 +1,246 @@
+/*  Nintendo Switch Pro Controller Table
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Json/JsonObject.h"
+#include "Common/Cpp/Options/CheckboxDropdownDatabase.h"
+#include "Common/Cpp/Options/CheckboxDropdownOption.tpp"
+#include "NintendoSwitch_ProControllerTable.h"
+
+namespace PokemonAutomation{
+
+template class CheckboxDropdownCell<NintendoSwitch::Button>;
+
+namespace NintendoSwitch{
+
+
+
+const CheckboxDropdownDatabase<Button>& ProController_Button_Database(){
+    static CheckboxDropdownDatabase<Button> database{
+        {Button::BUTTON_Y,          "Y",        "Y"},
+        {Button::BUTTON_B,          "B",        "B"},
+        {Button::BUTTON_A,          "A",        "A"},
+        {Button::BUTTON_X,          "X",        "X"},
+        {Button::BUTTON_L,          "L",        "L"},
+        {Button::BUTTON_R,          "R",        "R"},
+        {Button::BUTTON_ZL,         "ZL",       "ZL"},
+        {Button::BUTTON_ZR,         "ZR",       "ZR"},
+        {Button::BUTTON_MINUS,      "-",        "-"},
+        {Button::BUTTON_PLUS,       "+",        "+"},
+        {Button::BUTTON_LCLICK,     "L-click",  "L-click"},
+        {Button::BUTTON_RCLICK,     "R-click",  "R-click"},
+        {Button::BUTTON_HOME,       "Home",     "Home"},
+        {Button::BUTTON_CAPTURE,    "Capture",  "Capture"},
+        {Button::BUTTON_GR,         "GR",       "GR (Switch 2)"},
+        {Button::BUTTON_GL,         "GL",       "GL (Switch 2)"},
+        {Button::BUTTON_C,          "C",        "C (Switch 2)"},
+    };
+    return database;
+}
+const EnumDropdownDatabase<DpadPosition>& ProController_Dpad_Database(){
+    static EnumDropdownDatabase<DpadPosition> database{
+        {DpadPosition::DPAD_NONE,       "none",         "Dpad: none"},
+        {DpadPosition::DPAD_UP,         "up",           "Dpad: \u2191"},
+        {DpadPosition::DPAD_UP_RIGHT,   "up-right",     "Dpad: \u2197"},
+        {DpadPosition::DPAD_RIGHT,      "right",        "Dpad: \u2192"},
+        {DpadPosition::DPAD_DOWN_RIGHT, "down-right",   "Dpad: \u2198"},
+        {DpadPosition::DPAD_DOWN,       "down",         "Dpad: \u2193"},
+        {DpadPosition::DPAD_DOWN_LEFT,  "down-left",    "Dpad: \u2199"},
+        {DpadPosition::DPAD_LEFT,       "left",         "Dpad: \u2190"},
+        {DpadPosition::DPAD_UP_LEFT,    "up-left",      "Dpad: \u2196"},
+    };
+    return database;
+}
+
+void register_procon_tables(){
+    ControllerCommandTable::register_controller_type(
+        ControllerClass::NintendoSwitch_ProController,
+        ControllerCommandTable::make_row<ProControllerStateRow>,
+        {
+            "Milliseconds",
+            "Action",
+            "Buttons",
+            "Dpad",
+            "Left JS (X)",
+            "Left JS (Y)",
+            "Right JS (X)",
+            "Right JS (Y)",
+        }
+    );
+}
+
+ProControllerStateRow::~ProControllerStateRow(){
+    DURATION.remove_listener(*this);
+    BUTTONS.remove_listener(*this);
+    DPAD.remove_listener(*this);
+    LEFT_JOYSTICK_X.remove_listener(*this);
+    LEFT_JOYSTICK_Y.remove_listener(*this);
+    RIGHT_JOYSTICK_X.remove_listener(*this);
+    RIGHT_JOYSTICK_Y.remove_listener(*this);
+}
+
+ProControllerStateRow::ProControllerStateRow(EditableTableOption& parent_table)
+    : ControllerStateRow(parent_table)
+    , DURATION(LockMode::LOCK_WHILE_RUNNING, "200 ms")
+    , ACTION(false, LockMode::UNLOCK_WHILE_RUNNING, "", "")
+    , BUTTONS(
+        "",
+        ProController_Button_Database(),
+        LockMode::UNLOCK_WHILE_RUNNING,
+        BUTTON_NONE
+    )
+    , DPAD(
+        ProController_Dpad_Database(),
+        LockMode::UNLOCK_WHILE_RUNNING,
+        DpadPosition::DPAD_NONE
+    )
+    , LEFT_JOYSTICK_X(LockMode::UNLOCK_WHILE_RUNNING, 0, -1, +1)
+    , LEFT_JOYSTICK_Y(LockMode::UNLOCK_WHILE_RUNNING, 0, -1, +1)
+    , RIGHT_JOYSTICK_X(LockMode::UNLOCK_WHILE_RUNNING, 0, -1, +1)
+    , RIGHT_JOYSTICK_Y(LockMode::UNLOCK_WHILE_RUNNING, 0, -1, +1)
+{
+    PA_ADD_OPTION(DURATION);
+    PA_ADD_OPTION(ACTION);
+    PA_ADD_OPTION(BUTTONS);
+    PA_ADD_OPTION(DPAD);
+    PA_ADD_OPTION(LEFT_JOYSTICK_X);
+    PA_ADD_OPTION(LEFT_JOYSTICK_Y);
+    PA_ADD_OPTION(RIGHT_JOYSTICK_X);
+    PA_ADD_OPTION(RIGHT_JOYSTICK_Y);
+
+    ACTION.set_locked(true);
+
+    ProControllerStateRow::on_config_value_changed(this);
+    DURATION.add_listener(*this);
+    BUTTONS.add_listener(*this);
+    DPAD.add_listener(*this);
+    LEFT_JOYSTICK_X.add_listener(*this);
+    LEFT_JOYSTICK_Y.add_listener(*this);
+    RIGHT_JOYSTICK_X.add_listener(*this);
+    RIGHT_JOYSTICK_Y.add_listener(*this);
+
+    // ACTION.set_visibility(ConfigOptionState::DISABLED);
+}
+
+std::unique_ptr<EditableTableRow> ProControllerStateRow::clone() const{
+    std::unique_ptr<ProControllerStateRow> ret(new ProControllerStateRow(parent()));
+    ret->DURATION.set(DURATION.current_text());
+    ret->BUTTONS.set_flag(BUTTONS.current_value());
+    ret->DPAD.set(DPAD);
+    ret->LEFT_JOYSTICK_X.set(LEFT_JOYSTICK_X);
+    ret->LEFT_JOYSTICK_Y.set(LEFT_JOYSTICK_Y);
+    ret->RIGHT_JOYSTICK_X.set(RIGHT_JOYSTICK_X);
+    ret->RIGHT_JOYSTICK_Y.set(RIGHT_JOYSTICK_Y);
+    return ret;
+}
+
+void ProControllerStateRow::load_json(const JsonValue& json){
+    const JsonObject& obj = json.to_object_throw();
+
+    do{
+        uint64_t duration;
+        if (obj.read_integer(duration, "ms")){
+            DURATION.set(std::to_string(duration));
+            break;
+        }
+        const std::string* duration_str = obj.get_string("ms");
+        if (duration_str != nullptr){
+            DURATION.load_json(*duration_str);
+            break;
+        }
+        DURATION.set(std::to_string(obj.get_integer_throw("duration_in_ms")));
+    }while (false);
+
+    ProControllerState state;
+    state.load_json(obj);
+
+    BUTTONS.replace_all(state.buttons);
+    DPAD.set(state.dpad);
+    LEFT_JOYSTICK_X.set(state.left_joystick.x);
+    LEFT_JOYSTICK_Y.set(state.left_joystick.y);
+    RIGHT_JOYSTICK_X.set(state.right_joystick.x);
+    RIGHT_JOYSTICK_Y.set(state.right_joystick.y);
+}
+JsonValue ProControllerStateRow::to_json() const{
+    ProControllerState state;
+    get_state(state);
+
+    JsonObject json = state.to_json();
+    json["ms"] = DURATION.to_json();
+    return json;
+}
+
+void ProControllerStateRow::get_state(ProControllerState& state) const{
+    state.buttons = BUTTONS;
+    state.dpad = DPAD;
+    state.left_joystick.x = LEFT_JOYSTICK_X;
+    state.left_joystick.y = LEFT_JOYSTICK_Y;
+    state.right_joystick.x = RIGHT_JOYSTICK_X;
+    state.right_joystick.y = RIGHT_JOYSTICK_Y;
+}
+std::unique_ptr<ControllerState> ProControllerStateRow::get_state(Milliseconds& duration) const{
+    std::unique_ptr<ProControllerState> ret(new ProControllerState());
+    get_state(*ret);
+    duration = DURATION;
+    return ret;
+}
+
+void ProControllerStateRow::on_config_value_changed(void* object){
+    ProControllerState state;
+    get_state(state);
+
+    ACTION.set(get_controller_action(state));
+}
+
+
+std::string get_controller_action(ProControllerState& state){
+    std::string action = "";
+
+    if (state.buttons != BUTTON_NONE){
+        action += "Button";
+    }
+    if (state.dpad != DPAD_NONE){
+        if (action != ""){
+            action += ", ";
+        }
+        action += "Dpad";
+    }
+    if (!state.left_joystick.is_neutral()){
+        if (action != ""){
+            action += ", ";
+        }
+        action += "L-stick";
+        action += " " + get_joystick_direction(state.left_joystick);
+        
+    }
+    if (!state.right_joystick.is_neutral()){
+        if (action != ""){
+            action += ", ";
+        }
+        action += "R-stick";
+        action += " " + get_joystick_direction(state.right_joystick);
+    }
+
+    if (action == ""){
+        return "Wait";
+    }
+
+    return action;
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/NintendoSwitch/Controllers/Procon/NintendoSwitch_ProControllerTable.h b/SerialPrograms/Source/NintendoSwitch/Controllers/Procon/NintendoSwitch_ProControllerTable.h
new file mode 100644
index 0000000000..2b1e659cb3
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Controllers/Procon/NintendoSwitch_ProControllerTable.h
@@ -0,0 +1,59 @@
+/*  Nintendo Switch Pro Controller Table
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_NintendoSwitch_ProControllerTable_H
+#define PokemonAutomation_NintendoSwitch_ProControllerTable_H
+
+#include "Common/Cpp/Options/FloatingPointOption.h"
+#include "Common/Cpp/Options/EnumDropdownOption.h"
+#include "Common/Cpp/Options/TimeDurationOption.h"
+#include "Common/Cpp/Options/CheckboxDropdownOption.h"
+#include "Common/Cpp/Options/StringOption.h"
+#include "Controllers/ControllerStateTable.h"
+#include "NintendoSwitch_ProControllerState.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+
+
+class ProControllerStateRow : public ControllerStateRow, public ConfigOption::Listener{
+public:
+    ~ProControllerStateRow();
+    ProControllerStateRow(EditableTableOption& parent_table);
+
+    virtual std::unique_ptr<EditableTableRow> clone() const override;
+
+    virtual JsonValue to_json() const override;
+    virtual void load_json(const JsonValue& json) override;
+
+    void get_state(ProControllerState& state) const;
+    virtual std::unique_ptr<ControllerState> get_state(Milliseconds& duration) const override;
+
+private:
+    virtual void on_config_value_changed(void* object) override;
+
+
+private:
+    MillisecondsCell DURATION;
+    StringCell ACTION;
+    CheckboxDropdownCell<Button> BUTTONS;
+    EnumDropdownCell<DpadPosition> DPAD;
+    FloatingPointCell LEFT_JOYSTICK_X;
+    FloatingPointCell LEFT_JOYSTICK_Y;
+    FloatingPointCell RIGHT_JOYSTICK_X;
+    FloatingPointCell RIGHT_JOYSTICK_Y;
+};
+
+
+void register_procon_tables();
+
+std::string get_controller_action(ProControllerState& state);
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController_from_Keyboard.cpp b/SerialPrograms/Source/NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController_from_Keyboard.cpp
new file mode 100644
index 0000000000..5374cb3438
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController_from_Keyboard.cpp
@@ -0,0 +1,268 @@
+/*  Controller Mapping: Keyboard -> Procon
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "NintendoSwitch/Controllers/NintendoSwitch_VirtualControllerState.h"
+#include "NintendoSwitch_ProController_from_Keyboard.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+
+
+
+std::vector<std::unique_ptr<EditableTableRow>> ProControllerFromKeyboardTable::make_defaults(){
+    std::vector<std::unique_ptr<EditableTableRow>> ret;
+
+    ret.emplace_back(make_mapping("Dpad Up",            KeyboardKey::KEY_I,      ProControllerDeltas{.dpad_x =  0, .dpad_y = -1}));
+    ret.emplace_back(make_mapping("Dpad Up+Right",      KeyboardKey::KEY_O,      ProControllerDeltas{.dpad_x = +1, .dpad_y = -1}));
+    ret.emplace_back(make_mapping("Dpad Right",         KeyboardKey::KEY_L,      ProControllerDeltas{.dpad_x = +1, .dpad_y =  0}));
+    ret.emplace_back(make_mapping("Dpad Down+Right",    KeyboardKey::KEY_COMMA,  ProControllerDeltas{.dpad_x = +1, .dpad_y = +1}));
+    ret.emplace_back(make_mapping("Dpad Down",          KeyboardKey::KEY_K,      ProControllerDeltas{.dpad_x =  0, .dpad_y = +1}));
+    ret.emplace_back(make_mapping("Dpad Down+Left",     KeyboardKey::KEY_M,      ProControllerDeltas{.dpad_x = -1, .dpad_y = +1}));
+    ret.emplace_back(make_mapping("Dpad Left",          KeyboardKey::KEY_J,      ProControllerDeltas{.dpad_x = -1, .dpad_y =  0}));
+    ret.emplace_back(make_mapping("Dpad Up+Left",       KeyboardKey::KEY_U,      ProControllerDeltas{.dpad_x = -1, .dpad_y = -1}));
+
+    ret.emplace_back(make_mapping("Dpad Up",            KeyboardKey::KEY_KP_8,      ProControllerDeltas{.dpad_x =  0, .dpad_y = -1}));
+    ret.emplace_back(make_mapping("Dpad Up+Right",      KeyboardKey::KEY_KP_9,      ProControllerDeltas{.dpad_x = +1, .dpad_y = -1}));
+    ret.emplace_back(make_mapping("Dpad Right",         KeyboardKey::KEY_KP_6,      ProControllerDeltas{.dpad_x = +1, .dpad_y =  0}));
+    ret.emplace_back(make_mapping("Dpad Down+Right",    KeyboardKey::KEY_KP_3,      ProControllerDeltas{.dpad_x = +1, .dpad_y = +1}));
+    ret.emplace_back(make_mapping("Dpad Down",          KeyboardKey::KEY_KP_2,      ProControllerDeltas{.dpad_x =  0, .dpad_y = +1}));
+    ret.emplace_back(make_mapping("Dpad Down+Left",     KeyboardKey::KEY_KP_1,      ProControllerDeltas{.dpad_x = -1, .dpad_y = +1}));
+    ret.emplace_back(make_mapping("Dpad Left",          KeyboardKey::KEY_KP_4,      ProControllerDeltas{.dpad_x = -1, .dpad_y =  0}));
+    ret.emplace_back(make_mapping("Dpad Up+Left",       KeyboardKey::KEY_KP_7,      ProControllerDeltas{.dpad_x = -1, .dpad_y = -1}));
+
+    ret.emplace_back(make_mapping("Left-Stick Up",      KeyboardKey::KEY_W,         ProControllerDeltas{.left_x =  0, .left_y = -1}));
+    ret.emplace_back(make_mapping("Left-Stick Left",    KeyboardKey::KEY_A,         ProControllerDeltas{.left_x = -1, .left_y =  0}));
+    ret.emplace_back(make_mapping("Left-Stick Down",    KeyboardKey::KEY_S,         ProControllerDeltas{.left_x =  0, .left_y = +1}));
+    ret.emplace_back(make_mapping("Left-Stick Right",   KeyboardKey::KEY_D,         ProControllerDeltas{.left_x = +1, .left_y =  0}));
+    ret.emplace_back(make_mapping("Right-Stick Up",     KeyboardKey::KEY_UP,        ProControllerDeltas{.right_x =  0, .right_y = -1}));
+    ret.emplace_back(make_mapping("Right-Stick Right",  KeyboardKey::KEY_RIGHT,     ProControllerDeltas{.right_x = +1, .right_y =  0}));
+    ret.emplace_back(make_mapping("Right-Stick Down",   KeyboardKey::KEY_DOWN,      ProControllerDeltas{.right_x =  0, .right_y = +1}));
+    ret.emplace_back(make_mapping("Right-Stick Left",   KeyboardKey::KEY_LEFT,      ProControllerDeltas{.right_x = -1, .right_y =  0}));
+
+    ret.emplace_back(make_mapping("Y",              KeyboardKey::KEY_SLASH,         ProControllerDeltas{.buttons = BUTTON_Y}));
+
+    ret.emplace_back(make_mapping("B",              KeyboardKey::KEY_LEFT_SHIFT,    ProControllerDeltas{.buttons = BUTTON_B}));
+    ret.emplace_back(make_mapping("B",              KeyboardKey::KEY_RIGHT_SHIFT,   ProControllerDeltas{.buttons = BUTTON_B}));
+    ret.emplace_back(make_mapping("B",              KeyboardKey::KEY_LEFT_CTRL,     ProControllerDeltas{.buttons = BUTTON_B}));
+    ret.emplace_back(make_mapping("B",              KeyboardKey::KEY_RIGHT_CTRL,    ProControllerDeltas{.buttons = BUTTON_B}));
+
+    ret.emplace_back(make_mapping("A",              KeyboardKey::KEY_ENTER,         ProControllerDeltas{.buttons = BUTTON_A}));
+    ret.emplace_back(make_mapping("A",              KeyboardKey::KEY_KP_ENTER,      ProControllerDeltas{.buttons = BUTTON_A}));
+
+    ret.emplace_back(make_mapping("X",              KeyboardKey::KEY_APOSTROPHE,    ProControllerDeltas{.buttons = BUTTON_X}));
+
+    ret.emplace_back(make_mapping("L",              KeyboardKey::KEY_Q,             ProControllerDeltas{.buttons = BUTTON_L}));
+    ret.emplace_back(make_mapping("R",              KeyboardKey::KEY_E,             ProControllerDeltas{.buttons = BUTTON_R}));
+    ret.emplace_back(make_mapping("ZL",             KeyboardKey::KEY_R,             ProControllerDeltas{.buttons = BUTTON_ZL}));
+    ret.emplace_back(make_mapping("R",              KeyboardKey::KEY_RIGHT_BRACE,   ProControllerDeltas{.buttons = BUTTON_R}));
+    ret.emplace_back(make_mapping("ZR",             KeyboardKey::KEY_BACKSLASH,     ProControllerDeltas{.buttons = BUTTON_ZR}));
+
+    ret.emplace_back(make_mapping("-",              KeyboardKey::KEY_MINUS,         ProControllerDeltas{.buttons = BUTTON_MINUS}));
+    ret.emplace_back(make_mapping("-",              KeyboardKey::KEY_KP_MINUS,      ProControllerDeltas{.buttons = BUTTON_MINUS}));
+    ret.emplace_back(make_mapping("+",              KeyboardKey::KEY_EQUAL,         ProControllerDeltas{.buttons = BUTTON_PLUS}));
+    ret.emplace_back(make_mapping("+",              KeyboardKey::KEY_KP_PLUS,       ProControllerDeltas{.buttons = BUTTON_PLUS}));
+
+    ret.emplace_back(make_mapping("L-Click",        KeyboardKey::KEY_C,             ProControllerDeltas{.buttons = BUTTON_LCLICK}));
+    ret.emplace_back(make_mapping("R-Click",        KeyboardKey::KEY_KP_0,          ProControllerDeltas{.buttons = BUTTON_RCLICK}));
+
+    ret.emplace_back(make_mapping("Home",           KeyboardKey::KEY_HOME,          ProControllerDeltas{.buttons = BUTTON_HOME}));
+    ret.emplace_back(make_mapping("Home",           KeyboardKey::KEY_ESC,           ProControllerDeltas{.buttons = BUTTON_HOME}));
+    ret.emplace_back(make_mapping("Home",           KeyboardKey::KEY_H,             ProControllerDeltas{.buttons = BUTTON_HOME}));
+
+    ret.emplace_back(make_mapping("Capture",        KeyboardKey::KEY_INSERT,        ProControllerDeltas{.buttons = BUTTON_CAPTURE}));
+
+    ret.emplace_back(make_mapping("C (Switch 2)",   KeyboardKey::KEY_B,             ProControllerDeltas{.buttons = BUTTON_C}));
+    ret.emplace_back(make_mapping("GL (Switch 2)",  KeyboardKey::KEY_V,             ProControllerDeltas{.buttons = BUTTON_GL}));
+    ret.emplace_back(make_mapping("GR (Switch 2)",  KeyboardKey::KEY_DOT,           ProControllerDeltas{.buttons = BUTTON_GR}));
+
+    ret.emplace_back(make_mapping("A+R (for CFW)",  KeyboardKey::KEY_Y,             ProControllerDeltas{.buttons = BUTTON_A | BUTTON_R}));
+
+    return ret;
+}
+
+
+
+
+
+
+
+
+
+ProControllerFromKeyboardTableRow::ProControllerFromKeyboardTableRow(EditableTableOption& parent_table)
+    : EditableTableRow(parent_table)
+    , label(false, LockMode::UNLOCK_WHILE_RUNNING, "", "")
+    , key(LockMode::UNLOCK_WHILE_RUNNING)
+    , buttons(LockMode::UNLOCK_WHILE_RUNNING, 0, 0, ((uint32_t)1 << TOTAL_BUTTONS) - 1)
+    , dpad_x(LockMode::UNLOCK_WHILE_RUNNING, 0, -1, 1)
+    , dpad_y(LockMode::UNLOCK_WHILE_RUNNING, 0, -1, 1)
+    , left_stick_x(LockMode::UNLOCK_WHILE_RUNNING, 0, -1, 1)
+    , left_stick_y(LockMode::UNLOCK_WHILE_RUNNING, 0, -1, 1)
+    , right_stick_x(LockMode::UNLOCK_WHILE_RUNNING, 0, -1, 1)
+    , right_stick_y(LockMode::UNLOCK_WHILE_RUNNING, 0, -1, 1)
+{
+    add_option(label, "Description");
+    add_option(key, "HID ID");
+    add_option(buttons, "Button Bit-Field");
+    add_option(dpad_x, "Dpad x");
+    add_option(dpad_y, "Dpad y");
+    add_option(left_stick_x, "Left-Stick x");
+    add_option(left_stick_y, "Left-Stick y");
+    add_option(right_stick_x, "Right-Stick x");
+    add_option(right_stick_y, "Right-Stick y");
+    set_advanced_mode(static_cast<ProControllerFromKeyboardTable&>(parent_table).advanced_mode());
+}
+ProControllerFromKeyboardTableRow::ProControllerFromKeyboardTableRow(
+    EditableTableOption& parent_table,
+    bool advanced_mode,
+    std::string description,
+    KeyboardKey key,
+    const ProControllerDeltas& deltas
+)
+    : ProControllerFromKeyboardTableRow(parent_table)
+{
+    label.set(std::move(description));
+    this->key.set(key);
+    buttons.set(deltas.buttons);
+    dpad_x.set((int8_t)deltas.dpad_x);
+    dpad_y.set((int8_t)deltas.dpad_y);
+    left_stick_x.set((int8_t)deltas.left_x);
+    left_stick_y.set((int8_t)deltas.left_y);
+    right_stick_x.set((int8_t)deltas.right_x);
+    right_stick_y.set((int8_t)deltas.right_y);
+    set_advanced_mode(advanced_mode);
+}
+std::unique_ptr<EditableTableRow> ProControllerFromKeyboardTableRow::clone() const{
+    std::unique_ptr<ProControllerFromKeyboardTableRow> ret(new ProControllerFromKeyboardTableRow(parent()));
+    ret->label.set(label);
+    ret->key.set((KeyboardKey)key);
+    ret->buttons.set(buttons);
+    ret->dpad_x.set(dpad_x);
+    ret->dpad_y.set(dpad_y);
+    ret->left_stick_x.set(left_stick_x);
+    ret->left_stick_y.set(left_stick_y);
+    ret->right_stick_x.set(right_stick_x);
+    ret->right_stick_y.set(right_stick_y);
+    ret->set_advanced_mode(m_advanced_mode.load(std::memory_order_relaxed));
+    return ret;
+}
+ProControllerDeltas ProControllerFromKeyboardTableRow::snapshot() const{
+    return {
+        .buttons = (Button)buttons.current_value(),
+        .dpad_x = dpad_x,
+        .dpad_y = dpad_y,
+        .left_x = left_stick_x,
+        .left_y = left_stick_y,
+        .right_x = right_stick_x,
+        .right_y = right_stick_y,
+    };
+}
+void ProControllerFromKeyboardTableRow::set_advanced_mode(bool enabled){
+    m_advanced_mode.store(enabled, std::memory_order_relaxed);
+    if (enabled){
+        label.set_locked(false);
+        buttons.set_visibility(ConfigOptionState::ENABLED);
+        dpad_x.set_visibility(ConfigOptionState::ENABLED);
+        dpad_y.set_visibility(ConfigOptionState::ENABLED);
+        left_stick_x.set_visibility(ConfigOptionState::ENABLED);
+        left_stick_y.set_visibility(ConfigOptionState::ENABLED);
+        right_stick_x.set_visibility(ConfigOptionState::ENABLED);
+        right_stick_y.set_visibility(ConfigOptionState::ENABLED);
+    }else{
+        label.set_locked(true);
+        buttons.set_visibility(ConfigOptionState::DISABLED);
+        dpad_x.set_visibility(ConfigOptionState::DISABLED);
+        dpad_y.set_visibility(ConfigOptionState::DISABLED);
+        left_stick_x.set_visibility(ConfigOptionState::DISABLED);
+        left_stick_y.set_visibility(ConfigOptionState::DISABLED);
+        right_stick_x.set_visibility(ConfigOptionState::DISABLED);
+        right_stick_y.set_visibility(ConfigOptionState::DISABLED);
+    }
+}
+
+
+
+
+
+
+
+
+ProControllerFromKeyboardTable::ProControllerFromKeyboardTable()
+    : EditableTableOption_t<ProControllerFromKeyboardTableRow>(
+        "<b>Pro Controller:</b>",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        make_defaults()
+    )
+    , m_advanced_mode(false)
+{}
+std::vector<std::string> ProControllerFromKeyboardTable::make_header() const{
+    return std::vector<std::string>{
+        "Description",
+        "Keyboard HID ID",
+        "Button Bit-Field",
+        "Dpad x",
+        "Dpad y",
+        "Left-Stick x",
+        "Left-Stick y",
+        "Right-Stick x",
+        "Right-Stick y",
+    };
+}
+void ProControllerFromKeyboardTable::set_advanced_mode(bool enabled){
+    m_advanced_mode.store(enabled, std::memory_order_relaxed);
+    run_on_all_rows([enabled](ProControllerFromKeyboardTableRow& row){
+        row.set_advanced_mode(enabled);
+        return false;
+    });
+}
+
+
+std::unique_ptr<EditableTableRow> ProControllerFromKeyboardTable::make_mapping(
+    std::string description,
+    KeyboardKey key,
+    const ProControllerDeltas& deltas
+){
+    return std::make_unique<ProControllerFromKeyboardTableRow>(
+        *this,
+        m_advanced_mode.load(std::memory_order_relaxed),
+        std::move(description),
+        key,
+        deltas
+    );
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController_from_Keyboard.h b/SerialPrograms/Source/NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController_from_Keyboard.h
new file mode 100644
index 0000000000..2e13acbe73
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController_from_Keyboard.h
@@ -0,0 +1,81 @@
+/*  Controller Mapping: Keyboard -> Procon
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_NintendoSwitch_ProController_from_Keyboard_H
+#define PokemonAutomation_NintendoSwitch_ProController_from_Keyboard_H
+
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "Common/Cpp/Options/StringOption.h"
+#include "Common/Cpp/Options/EditableTableOption.h"
+#include "ControllerInput/Keyboard/KeyBindingOption.h"
+#include "NintendoSwitch/Controllers/NintendoSwitch_ControllerButtons.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+
+struct ProControllerDeltas;
+
+
+
+
+class ProControllerFromKeyboardTableRow : public EditableTableRow{
+public:
+    ProControllerFromKeyboardTableRow(EditableTableOption& parent_table);
+    ProControllerFromKeyboardTableRow(
+        EditableTableOption& parent_table,
+        bool advanced_mode,
+        std::string description,
+        KeyboardKey key,
+        const ProControllerDeltas& deltas
+    );
+    virtual std::unique_ptr<EditableTableRow> clone() const override;
+    ProControllerDeltas snapshot() const;
+
+    void set_advanced_mode(bool enabled);
+
+private:
+    std::atomic<bool> m_advanced_mode;
+
+public:
+    StringCell label;
+    KeyboardHidBindingCell key;
+    SimpleIntegerCell<ButtonFlagType> buttons;
+    SimpleIntegerCell<int8_t> dpad_x;
+    SimpleIntegerCell<int8_t> dpad_y;
+    SimpleIntegerCell<int8_t> left_stick_x;
+    SimpleIntegerCell<int8_t> left_stick_y;
+    SimpleIntegerCell<int8_t> right_stick_x;
+    SimpleIntegerCell<int8_t> right_stick_y;
+};
+
+
+
+class ProControllerFromKeyboardTable : public EditableTableOption_t<ProControllerFromKeyboardTableRow>{
+public:
+    ProControllerFromKeyboardTable();
+    virtual std::vector<std::string> make_header() const override;
+
+    bool advanced_mode() const{ return m_advanced_mode.load(std::memory_order_relaxed); }
+    void set_advanced_mode(bool enabled);
+
+    std::unique_ptr<EditableTableRow> make_mapping(
+        std::string description,
+        KeyboardKey key,
+        const ProControllerDeltas& deltas
+    );
+    std::vector<std::unique_ptr<EditableTableRow>> make_defaults();
+
+private:
+    std::atomic<bool> m_advanced_mode;
+};
+
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/NintendoSwitch/Controllers/SysbotBase/SysbotBase3_ControllerState.h b/SerialPrograms/Source/NintendoSwitch/Controllers/SysbotBase/SysbotBase3_ControllerState.h
new file mode 100644
index 0000000000..5ad91e8461
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Controllers/SysbotBase/SysbotBase3_ControllerState.h
@@ -0,0 +1,76 @@
+/*  Controller State
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Sysbotbase3_ControllerState_H
+#define PokemonAutomation_Sysbotbase3_ControllerState_H
+
+#include <stdint.h>
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+
+
+struct Sysbotbase3_ControllerState{
+    uint64_t buttons = 0;
+    int16_t left_joystick_x = 0;
+    int16_t left_joystick_y = 0;
+    int16_t right_joystick_x = 0;
+    int16_t right_joystick_y = 0;
+
+    bool is_neutral() const{
+        return buttons == 0
+            && left_joystick_x == 0
+            && left_joystick_y == 0
+            && right_joystick_x == 0
+            && right_joystick_y == 0;
+    }
+    void clear(){
+        buttons = 0;
+        left_joystick_x = 0;
+        left_joystick_y = 0;
+        right_joystick_x = 0;
+        right_joystick_y = 0;
+    }
+};
+
+
+
+struct Sysbotbase3_ControllerCommand{
+    uint64_t seqnum;
+    uint64_t milliseconds;
+    Sysbotbase3_ControllerState state;
+
+    void write_to_hex(char str[64]) const{
+        const char HEX_DIGITS[] = "0123456789abcdef";
+        const char* ptr = (const char*)this;
+        for (size_t c = 0; c < 64; c += 2){
+            uint8_t hi = (uint8_t)ptr[0] >> 4;
+            uint8_t lo = (uint8_t)ptr[0] & 0x0f;
+            str[c + 0] = HEX_DIGITS[hi];
+            str[c + 1] = HEX_DIGITS[lo];
+            ptr++;
+        }
+    }
+    void parse_from_hex(const char str[64]){
+        char* ptr = (char*)this;
+        for (size_t c = 0; c < 64; c += 2){
+            char hi = str[c + 0];
+            char lo = str[c + 1];
+            hi = hi < 'a' ? hi - '0' : hi - 'a' + 10;
+            lo = lo < 'a' ? lo - '0' : lo - 'a' + 10;
+            ptr[0] = hi << 4 | lo;
+            ptr++;
+        }
+    }
+};
+
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/NintendoSwitch/Controllers/SysbotBase/SysbotBase3_ProController.cpp b/SerialPrograms/Source/NintendoSwitch/Controllers/SysbotBase/SysbotBase3_ProController.cpp
new file mode 100644
index 0000000000..7516627f46
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Controllers/SysbotBase/SysbotBase3_ProController.cpp
@@ -0,0 +1,305 @@
+/*  Nintendo Switch Pro Controller (SysbotBase 3)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Exceptions.h"
+#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "CommonFramework/Logging/Logger.h"
+#include "Controllers/JoystickTools.h"
+#include "SysbotBase3_ControllerState.h"
+#include "SysbotBase3_ProController.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+
+
+ProController_SysbotBase3::ProController_SysbotBase3(
+    Logger& logger,
+    SysbotBase::TcpSysbotBase_Connection& connection
+)
+    : ProController(logger)
+    , ControllerWithScheduler(logger, logging_throttler())
+    , m_connection(connection)
+    , m_stopping(false)
+    , m_pending_replace(false)
+    , m_next_seqnum(1)
+    , m_next_expected_seqnum_ack(1)
+{
+    if (!connection.is_ready()){
+        return;
+    }
+    connection.add_listener(*this);
+}
+ProController_SysbotBase3::~ProController_SysbotBase3(){
+    m_connection.remove_listener(*this);
+}
+
+void ProController_SysbotBase3::cancel_all_commands(){
+    std::lock_guard<Mutex> lg(m_state_lock);
+    if (m_stopping){
+        throw InvalidConnectionStateException("");
+    }
+
+    uint64_t queued = m_next_seqnum - m_next_expected_seqnum_ack;
+    m_next_expected_seqnum_ack = m_next_seqnum;
+
+    m_connection.write_data("cqCancel\r\n");
+    if (LOG_EVERYTHING()){
+        m_logger.log("sys-botbase3: cqCancel");
+    }
+
+    m_scheduler.clear_on_next();
+    m_cv.notify_all();
+    m_logger.log("cancel_all_commands(): Command Queue Size = " + std::to_string(queued), COLOR_DARKGREEN);
+}
+void ProController_SysbotBase3::replace_on_next_command(){
+    std::lock_guard<Mutex> lg(m_state_lock);
+    if (m_stopping){
+        throw InvalidConnectionStateException("");
+    }
+
+    uint64_t queued = m_next_seqnum - m_next_expected_seqnum_ack;
+//    m_next_expected_seqnum_ack = m_next_seqnum;
+
+    m_pending_replace = true;
+
+#if 0
+    m_connection.write_data("cqReplaceOnNext\r\n");
+    if (LOG_EVERYTHING()){
+        m_logger.log("sys-botbase3: cqReplaceOnNext");
+    }
+#endif
+
+    m_scheduler.clear_on_next();
+    m_cv.notify_all();
+    m_logger.log("replace_on_next_command(): Command Queue Size = " + std::to_string(queued), COLOR_DARKGREEN);
+}
+void ProController_SysbotBase3::wait_for_all(Cancellable* cancellable){
+    SuperscalarScheduler::Schedule schedule;
+    std::lock_guard<Mutex> lg0(m_issue_lock);
+    {
+        std::lock_guard<Mutex> lg1(m_state_lock);
+
+    //    cout << "wait_for_all() - start" << endl;
+
+        if (m_stopping){
+            throw InvalidConnectionStateException("");
+        }
+        m_scheduler.issue_wait_for_all(schedule);
+    }
+    execute_schedule(cancellable, schedule);
+
+    std::unique_lock<Mutex> lg1(m_state_lock);
+    while (true){
+        if (m_stopping){
+            throw InvalidConnectionStateException("");
+        }
+        if (cancellable){
+            cancellable->throw_if_cancelled();
+        }
+        if (m_next_seqnum == m_next_expected_seqnum_ack){
+            break;
+        }
+        m_cv.wait(lg1);
+    }
+
+//    cout << "wait_for_all() - done" << endl;
+}
+
+
+void ProController_SysbotBase3::on_message(const std::string& message){
+    const std::string TOKEN = "cqCommandFinished";
+    auto pos = message.find(TOKEN);
+    if (pos == std::string::npos){
+        return;
+    }
+
+    const char* ptr = message.c_str();
+    ptr += pos;
+    ptr += TOKEN.size();
+    uint64_t parsed;
+    while (true){
+        char ch = *ptr;
+        switch (ch){
+        case '\0':
+            return;
+        case ' ':
+        case '\t':
+            ptr++;
+            continue;
+        }
+        parsed = std::atoll(ptr);
+        break;
+    }
+
+    std::lock_guard<Mutex> lg(m_state_lock);
+
+//    cout << "parsed = " << parsed << endl;
+//    cout << "m_next_seqnum = " << m_next_seqnum << endl;
+//    cout << "m_next_expected_seqnum_ack = " << m_next_expected_seqnum_ack << endl;
+
+    if (LOG_EVERYTHING()){
+        m_logger.log(
+            "Command Finished: " + std::to_string(parsed) +
+            " (queue size = " + std::to_string(m_next_seqnum - m_next_expected_seqnum_ack) + ")"
+        );
+    }
+
+    //  Old ack
+    if (parsed < m_next_expected_seqnum_ack){
+        m_logger.log(
+            "Received Old Ack: Expected = " + std::to_string(m_next_expected_seqnum_ack) +
+            ", Actual = " + std::to_string(parsed),
+            COLOR_DARKGREEN
+        );
+        return;
+    }
+
+    //  Ack is ahead of what has been dispatched.
+    if (parsed >= m_next_seqnum){
+        m_logger.log(
+            "Received Future Ack: Expected = " + std::to_string(m_next_expected_seqnum_ack) +
+            ", Actual = " + std::to_string(parsed),
+            COLOR_RED
+        );
+        return;
+    }
+
+    m_next_expected_seqnum_ack = parsed + 1;
+    m_cv.notify_all();
+}
+
+void ProController_SysbotBase3::execute_state(
+    Cancellable* cancellable,
+    const SuperscalarScheduler::ScheduleEntry& entry
+){
+    if (cancellable){
+        cancellable->throw_if_cancelled();
+    }
+    if (m_stopping){
+        throw InvalidConnectionStateException("");
+    }
+
+    SwitchControllerState controller_state;
+    for (auto& item : entry.state){
+        static_cast<const SwitchCommand&>(*item).apply(controller_state);
+    }
+
+
+    //  Flags map to: https://github.com/switchbrew/libnx/blob/master/nx/include/switch/services/hid.h#L584
+    uint64_t nx_button = 0;
+    if (controller_state.buttons & BUTTON_Y)        nx_button |= (uint64_t)1 <<  3;    //  Y
+    if (controller_state.buttons & BUTTON_B)        nx_button |= (uint64_t)1 <<  1;    //  B
+    if (controller_state.buttons & BUTTON_A)        nx_button |= (uint64_t)1 <<  0;    //  A
+    if (controller_state.buttons & BUTTON_X)        nx_button |= (uint64_t)1 <<  2;    //  X
+    if (controller_state.buttons & BUTTON_L)        nx_button |= (uint64_t)1 <<  6;    //  L
+    if (controller_state.buttons & BUTTON_R)        nx_button |= (uint64_t)1 <<  7;    //  R
+    if (controller_state.buttons & BUTTON_ZL)       nx_button |= (uint64_t)1 <<  8;    //  ZL
+    if (controller_state.buttons & BUTTON_ZR)       nx_button |= (uint64_t)1 <<  9;    //  ZR
+    if (controller_state.buttons & BUTTON_MINUS)    nx_button |= (uint64_t)1 << 11;    //  -
+    if (controller_state.buttons & BUTTON_PLUS)     nx_button |= (uint64_t)1 << 10;    //  +
+    if (controller_state.buttons & BUTTON_LCLICK)   nx_button |= (uint64_t)1 <<  4;    //  L-click
+    if (controller_state.buttons & BUTTON_RCLICK)   nx_button |= (uint64_t)1 <<  5;    //  R-click
+    if (controller_state.buttons & BUTTON_HOME)     nx_button |= (uint64_t)1 << 18;    //  Home
+    if (controller_state.buttons & BUTTON_CAPTURE)  nx_button |= (uint64_t)1 << 19;    //  Capture
+    if (controller_state.buttons & BUTTON_UP)       nx_button |= (uint64_t)1 << 13;    //  Up
+    if (controller_state.buttons & BUTTON_RIGHT)    nx_button |= (uint64_t)1 << 14;    //  Right
+    if (controller_state.buttons & BUTTON_DOWN)     nx_button |= (uint64_t)1 << 15;    //  Down
+    if (controller_state.buttons & BUTTON_LEFT)     nx_button |= (uint64_t)1 << 12;    //  Left
+#if 0   //  Don't exist on pro controller.
+    if (controller_state.buttons & BUTTON_LEFT_SL)  nx_button |= (uint64_t)1 << 24;    //  Left SL
+    if (controller_state.buttons & BUTTON_LEFT_SR)  nx_button |= (uint64_t)1 << 25;    //  Left SR
+    if (controller_state.buttons & BUTTON_RIGHT_SL) nx_button |= (uint64_t)1 << 26;    //  Right SL
+    if (controller_state.buttons & BUTTON_RIGHT_SR) nx_button |= (uint64_t)1 << 27;    //  Right SR
+#endif
+
+    {
+        DpadPosition dpad = controller_state.dpad;
+        SplitDpad split_dpad = convert_unified_to_split_dpad(dpad);
+        if (split_dpad.up)    nx_button |= (uint64_t)1 << 13;
+        if (split_dpad.right) nx_button |= (uint64_t)1 << 14;
+        if (split_dpad.down)  nx_button |= (uint64_t)1 << 15;
+        if (split_dpad.left)  nx_button |= (uint64_t)1 << 12;
+    }
+
+    int16_t left_x = 0;
+    int16_t left_y = 0;
+    int16_t right_x = 0;
+    int16_t right_y = 0;
+    {
+        double fx = controller_state.left_joystick.x;
+        double fy = controller_state.left_joystick.y;
+        JoystickTools::clip_magnitude(fx, fy);
+        left_x = JoystickTools::linear_float_to_s16(fx);
+        left_y = JoystickTools::linear_float_to_s16(fy);
+    }
+    {
+        double fx = controller_state.right_joystick.x;
+        double fy = controller_state.right_joystick.y;
+        JoystickTools::clip_magnitude(fx, fy);
+        right_x = JoystickTools::linear_float_to_s16(fx);
+        right_y = JoystickTools::linear_float_to_s16(fy);
+    }
+
+    std::string message;
+    if (m_pending_replace){
+        m_pending_replace = false;
+        m_next_expected_seqnum_ack = m_next_seqnum;
+        message += "cqReplaceOnNext\r\n";
+    }
+
+    //  Wait until there is space.
+    std::unique_lock<Mutex> lg(m_state_lock);
+    m_cv.wait(lg, [this, cancellable]{
+        if (cancellable && cancellable->cancelled()){
+            return true;
+        }
+        return m_stopping || m_next_seqnum - m_next_expected_seqnum_ack < QUEUE_SIZE;
+    });
+
+    if (cancellable){
+        cancellable->throw_if_cancelled();
+    }
+
+    Sysbotbase3_ControllerCommand command;
+    command.milliseconds = std::chrono::duration_cast<Milliseconds>(entry.duration).count();
+    command.seqnum = m_next_seqnum++;
+    command.state.buttons = nx_button;
+    command.state.left_joystick_x = left_x;
+    command.state.left_joystick_y = left_y;
+    command.state.right_joystick_x = right_x;
+    command.state.right_joystick_y = right_y;
+
+    {
+        std::string command_message;
+        command_message.resize(64);
+        command.write_to_hex(command_message.data());
+        message += "cqControllerState " + command_message + "\r\n";
+    }
+
+    m_connection.write_data(message);
+
+    //  Do not log the contents of the command due to privacy concerns.
+    //  (people entering passwords)
+#if 0
+    if (LOG_EVERYTHING()){
+        m_logger.log("sys-botbase3: " + message);
+    }
+#endif
+}
+
+
+
+
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/NintendoSwitch/Controllers/SysbotBase/SysbotBase3_ProController.h b/SerialPrograms/Source/NintendoSwitch/Controllers/SysbotBase/SysbotBase3_ProController.h
new file mode 100644
index 0000000000..9561e8479f
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Controllers/SysbotBase/SysbotBase3_ProController.h
@@ -0,0 +1,244 @@
+/*  Nintendo Switch Pro Controller (SysbotBase 3)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+
+#ifndef PokemonAutomation_NintendoSwitch_ProController_SysbotBase3_H
+#define PokemonAutomation_NintendoSwitch_ProController_SysbotBase3_H
+
+#include "Common/Cpp/Concurrency/ConditionVariable.h"
+#include "NintendoSwitch/NintendoSwitch_Settings.h"
+//#include "NintendoSwitch/Controllers/NintendoSwitch_VirtualControllerState.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+#include "NintendoSwitch/Controllers/NintendoSwitch_ControllerWithScheduler.h"
+#include "SysbotBase_Connection.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+
+
+class ProController_SysbotBase3 final :
+    public ProController,
+    public ControllerWithScheduler,
+    private SysbotBase::TcpSysbotBase_Connection::Listener
+{
+public:
+    using ContextType = ProControllerContext;
+
+    static constexpr size_t QUEUE_SIZE = 64;
+
+
+public:
+    ProController_SysbotBase3(
+        Logger& logger,
+        SysbotBase::TcpSysbotBase_Connection& connection
+    );
+    ~ProController_SysbotBase3();
+
+
+public:
+//    virtual ControllerType controller_type() const override{
+//        return ControllerType::NintendoSwitch_WiredController;
+//    }
+
+    virtual ControllerPerformanceClass performance_class() const override{
+        return ControllerPerformanceClass::SerialPABotBase_Wired;
+    }
+    virtual Milliseconds ticksize() const override{
+        return Milliseconds::zero();
+    }
+    virtual Milliseconds cooldown() const override{
+        return Milliseconds(8);
+    }
+    virtual Milliseconds timing_variation() const override{
+        return ConsoleSettings::instance().TIMING_OPTIONS.WIRED;
+    }
+    virtual bool atomic_multibutton() const override{
+        return true;
+    }
+
+
+public:
+    virtual void cancel_all_commands() override;
+    virtual void replace_on_next_command() override;
+    virtual bool cancel_all_and_wait(Milliseconds timeout) override{
+        //  sys-botbase does not ack cancels.
+        cancel_all_commands();
+        return false;
+    }
+
+    virtual void wait_for_all(Cancellable* cancellable) override;
+
+
+public:
+    //  Superscalar Commands (the "ssf" framework)
+
+    virtual void issue_barrier(Cancellable* cancellable) override{
+        ControllerWithScheduler::issue_barrier(cancellable);
+    }
+    virtual void issue_nop(Cancellable* cancellable, Milliseconds duration) override{
+        ControllerWithScheduler::issue_nop(cancellable, duration);
+    }
+
+    virtual void issue_buttons(
+        Cancellable* cancellable,
+        Milliseconds delay, Milliseconds hold, Milliseconds cooldown,
+        Button button
+    ) override{
+        ControllerWithScheduler::issue_buttons(cancellable, delay, hold, cooldown, button);
+    }
+    virtual void issue_dpad(
+        Cancellable* cancellable,
+        Milliseconds delay, Milliseconds hold, Milliseconds cooldown,
+        DpadPosition position
+    ) override{
+        ControllerWithScheduler::issue_dpad(cancellable, delay, hold, cooldown, position);
+    }
+    virtual void issue_left_joystick(
+        Cancellable* cancellable,
+        Milliseconds delay, Milliseconds hold, Milliseconds cooldown,
+        const JoystickPosition& position
+    ) override{
+        ControllerWithScheduler::issue_left_joystick(cancellable, delay, hold, cooldown, position);
+    }
+    virtual void issue_right_joystick(
+        Cancellable* cancellable,
+        Milliseconds delay, Milliseconds hold, Milliseconds cooldown,
+        const JoystickPosition& position
+    ) override{
+        ControllerWithScheduler::issue_right_joystick(cancellable, delay, hold, cooldown, position);
+    }
+
+    virtual void issue_gyro_accel_x(
+        Cancellable* cancellable,
+        Milliseconds delay, Milliseconds hold, Milliseconds cooldown,
+        int16_t value
+    ) override{
+        ControllerWithScheduler::issue_gyro_accel_x(cancellable, delay, hold, cooldown, value);
+    }
+    virtual void issue_gyro_accel_y(
+        Cancellable* cancellable,
+        Milliseconds delay, Milliseconds hold, Milliseconds cooldown,
+        int16_t value
+    ) override{
+        ControllerWithScheduler::issue_gyro_accel_y(cancellable, delay, hold, cooldown, value);
+    }
+    virtual void issue_gyro_accel_z(
+        Cancellable* cancellable,
+        Milliseconds delay, Milliseconds hold, Milliseconds cooldown,
+        int16_t value
+    ) override{
+        ControllerWithScheduler::issue_gyro_accel_z(cancellable, delay, hold, cooldown, value);
+    }
+    virtual void issue_gyro_rotate_x(
+        Cancellable* cancellable,
+        Milliseconds delay, Milliseconds hold, Milliseconds cooldown,
+        int16_t value
+    ) override{
+        ControllerWithScheduler::issue_gyro_rotate_x(cancellable, delay, hold, cooldown, value);
+    }
+    virtual void issue_gyro_rotate_y(
+        Cancellable* cancellable,
+        Milliseconds delay, Milliseconds hold, Milliseconds cooldown,
+        int16_t value
+    ) override{
+        ControllerWithScheduler::issue_gyro_rotate_y(cancellable, delay, hold, cooldown, value);
+    }
+    virtual void issue_gyro_rotate_z(
+        Cancellable* cancellable,
+        Milliseconds delay, Milliseconds hold, Milliseconds cooldown,
+        int16_t value
+    ) override{
+        ControllerWithScheduler::issue_gyro_rotate_z(cancellable, delay, hold, cooldown, value);
+    }
+
+    virtual void issue_full_controller_state(
+        Cancellable* cancellable,
+        bool enable_logging,
+        Milliseconds duration,
+        Button button,
+        DpadPosition dpad,
+        const JoystickPosition& left_joystick,
+        const JoystickPosition& right_joystick
+    ) override{
+        ControllerWithScheduler::issue_full_controller_state(
+            cancellable,
+            enable_logging,
+            duration,
+            button,
+            dpad,
+            left_joystick,
+            right_joystick
+        );
+    }
+
+
+public:
+    //  High speed RPCs.
+
+    virtual void issue_mash_button(
+        Cancellable* cancellable,
+        Milliseconds duration,
+        Button button,
+        Milliseconds delay, Milliseconds hold, Milliseconds cooldown
+    ) override{
+        ControllerWithScheduler::issue_mash_button(cancellable, duration, button, delay, hold, cooldown);
+    }
+    virtual void issue_mash_button(
+        Cancellable* cancellable,
+        Milliseconds duration,
+        Button button0, Button button1
+    ) override{
+        ControllerWithScheduler::issue_mash_button(cancellable, duration, button0, button1);
+    }
+    virtual void issue_mash_AZs(
+        Cancellable* cancellable,
+        Milliseconds duration
+    ) override{
+        ControllerWithScheduler::issue_mash_AZs(cancellable, duration);
+    }
+    virtual void issue_system_scroll(
+        Cancellable* cancellable,
+        Milliseconds delay, Milliseconds hold, Milliseconds cooldown,
+        DpadPosition direction  //  Diagonals not allowed.
+    ) override{
+        ControllerWithScheduler::issue_system_scroll(cancellable, delay, hold, cooldown, direction);
+    }
+
+
+public:
+    virtual Logger& logger() override{
+        return m_logger;
+    }
+    virtual bool is_ready() const override{
+        return m_connection.is_ready();
+    }
+
+
+private:
+    virtual void on_message(const std::string& message) override;
+    virtual void execute_state(
+        Cancellable* cancellable,
+        const SuperscalarScheduler::ScheduleEntry& entry
+    ) override;
+
+
+private:
+    SysbotBase::TcpSysbotBase_Connection& m_connection;
+
+    bool m_stopping;
+    bool m_pending_replace;
+    uint64_t m_next_seqnum;
+    uint64_t m_next_expected_seqnum_ack;
+
+    ConditionVariable m_cv;
+};
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/NintendoSwitch/Controllers/SysbotBase/SysbotBase_Connection.cpp b/SerialPrograms/Source/NintendoSwitch/Controllers/SysbotBase/SysbotBase_Connection.cpp
new file mode 100644
index 0000000000..3f069de33e
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Controllers/SysbotBase/SysbotBase_Connection.cpp
@@ -0,0 +1,378 @@
+/*  sys-botbase Connection
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Time.h"
+#include "Common/Cpp/ColoredText.h"
+#include "CommonFramework/Logging/Logger.h"
+#include "CommonFramework/Tools/GlobalThreadPools.h"
+#include "NintendoSwitch/NintendoSwitch_Settings.h"
+#include "SysbotBase_Connection.h"
+
+#include <charconv>
+#include <cstdint>
+
+#include "Common/Cpp/TestRunners/UnitTest.h"
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+
+namespace PokemonAutomation{
+namespace SysbotBase{
+
+using namespace std::chrono_literals;
+
+
+
+bool parse_ip_and_port(const std::string& str, QHostAddress& address, int& port){
+    //  IPv4
+    const size_t colon = str.find(':');
+    if (colon == std::string::npos || str.find(':', colon + 1) != std::string::npos){
+        return false;
+    }
+    address = QHostAddress(QString::fromStdString(str.substr(0, colon)));
+    bool ok;
+    port = QString::fromStdString(str.substr(colon + 1)).toUInt(&ok);
+    if (!ok){
+        return false;
+    }
+
+    //  TODO: IPv6
+
+    return true;
+}
+
+
+
+
+TcpSysbotBase_Connection::TcpSysbotBase_Connection(
+    Logger& logger,
+    const std::string& url
+)
+    : m_logger(logger)
+    , m_socket(GlobalThreadPools::unlimited_realtime())
+    , m_last_ping_send(WallClock::min())
+    , m_last_ping_receive(WallClock::min())
+{
+    m_controller_list.emplace_back(ControllerType::NintendoSwitch_WiredController);
+    m_current_controller = ControllerType::NintendoSwitch_WiredController;
+
+    QHostAddress address;
+    int port;
+    if (!parse_ip_and_port(url, address, port)){
+        set_status_line0(html_color_text("Invalid IP address + port.", COLOR_RED));
+        return;
+    }
+
+    set_status_line0(html_color_text("Connecting...", COLOR_DARKGREEN));
+
+    m_connecting_message =
+        "Connecting To: " + address.toString().toStdString() +
+        " - Port: " + std::to_string(port);
+    m_logger.log(m_connecting_message);
+
+    //  Attach ourselves as listener first since it might immediately return as
+    //  connected.
+    m_socket.add_listener(*this);
+
+    try{
+        m_socket.connect(address.toString().toStdString(), port);
+    }catch (...){
+        m_socket.remove_listener(*this);
+        throw;
+    }
+}
+
+TcpSysbotBase_Connection::~TcpSysbotBase_Connection(){
+    try{
+        write_data("detachController\r\n");
+    }catch (...){}
+    m_socket.remove_listener(*this);
+    m_socket.close();
+    {
+        std::lock_guard<Mutex> lg(m_lock);
+        m_cv.notify_all();
+    }
+    m_thread.wait_and_ignore_exceptions();
+}
+
+
+void TcpSysbotBase_Connection::write_data(const std::string& data){
+    WriteSpinLock lg(m_send_lock, "TcpSysbotBase_Connection::write_data()");
+//    cout << "Sending: " << data << endl;
+    m_socket.send(data.data(), data.size());
+}
+
+
+std::string pretty_print(uint64_t x){
+    auto ms = x / 1000;
+    auto us = x - ms * 1000;
+    std::string str_ms = std::to_string(ms);
+    std::string str_us = std::to_string(us);
+    return str_ms + "." + std::string(3 - str_us.size(), '0') + str_us;
+}
+
+
+void TcpSysbotBase_Connection::thread_loop(){
+    std::unique_lock<Mutex> lg(m_lock);
+    m_last_ping_send = current_time();
+    while (true){
+        ClientSocket::State state = m_socket.state();
+        if (state == ClientSocket::State::DESTRUCTING || state == ClientSocket::State::NOT_RUNNING){
+            break;
+        }
+
+        WallClock now = current_time();
+
+        std::chrono::milliseconds time_since = std::chrono::duration_cast<std::chrono::milliseconds>(now - m_last_ping_receive);
+        if (time_since > std::chrono::seconds(5)){
+            std::string str = "Last Ack: " + pretty_print(time_since.count()) + " seconds ago";
+            set_status_line1(str, COLOR_RED);
+        }
+
+        m_last_ping_send = current_time();
+        if (NintendoSwitch::ConsoleSettings::instance().ENABLE_SBB3_PINGS){
+            //  If we're more than 60 pings behind, just start clearing them.
+            while (m_active_pings.size() > 60){
+                m_active_pings.erase(m_active_pings.begin());
+            }
+
+            m_active_pings[m_ping_seqnum] = m_last_ping_send;
+            write_data("ping " + std::to_string(m_ping_seqnum) + "\r\n");
+            m_ping_seqnum++;
+        }else{
+            write_data("getVersion\r\n");
+        }
+        m_cv.wait_for(lg, std::chrono::seconds(1));
+    }
+}
+
+
+
+void TcpSysbotBase_Connection::on_connect_finished(const std::string& error_message){
+    try{
+        if (!error_message.empty()){
+            m_logger.log(m_connecting_message + " - " + error_message, COLOR_RED);
+            set_status_line0(m_connecting_message, COLOR_RED);
+            return;
+        }
+
+        m_logger.log(m_connecting_message + " (Success)", COLOR_BLUE);
+
+        write_data("configure echoCommands 0\r\n");
+        write_data("getVersion\r\n");
+    }catch (...){}
+}
+void TcpSysbotBase_Connection::on_disconnect(const std::string& error_message){
+    try{
+        m_logger.log("sys-botbase disconnected: " + error_message, COLOR_RED);
+        set_status_line1("Disconnected: " + error_message, COLOR_RED);
+    }catch (...){}
+}
+void TcpSysbotBase_Connection::on_receive_data(const void* data, size_t bytes){
+//    cout << "on_receive_data(): " << std::string((const char*)data, bytes - 2) << endl;
+
+    WallClock now = current_time();
+
+    try{
+        const char* ptr = (const char*)data;
+        for (size_t c = 0; c < bytes; c++){
+            char ch = ptr[c];
+            if (ch == '\r'){
+                continue;
+            }
+            if (ch != '\n'){
+                m_receive_buffer.emplace_back(ch);
+                continue;
+            }
+            process_message(
+                std::string(
+                    m_receive_buffer.begin(),
+                    m_receive_buffer.end()
+                ),
+                now
+            );
+            m_receive_buffer.clear();
+        }
+
+//        m_listeners.run_method(&Listener::on_receive_data, data, bytes);
+
+    }catch (...){}
+}
+void TcpSysbotBase_Connection::process_message(const std::string& message, WallClock timestamp){
+    if (LOG_EVERYTHING()){
+        m_logger.log("Received: " + message, COLOR_DARKGREEN);
+    }
+
+    m_listeners.run_method(&Listener::on_message, message);
+
+    //  Version #
+    std::string str = message;
+    if (str.find('.') != std::string::npos){
+        while (!str.empty() && str.back() <= 32){
+            str.pop_back();
+        }
+        set_status_line0("sys-botbase: Version " + str, COLOR_BLUE);
+
+        std::lock_guard<Mutex> lg(m_lock);
+        m_last_ping_receive = timestamp;
+
+        if (m_last_ping_send != WallClock::min()){
+            std::chrono::microseconds latency = std::chrono::duration_cast<std::chrono::microseconds>(timestamp - m_last_ping_send);
+            std::string text = "Response Time: " + pretty_print(latency.count()) + " ms";
+            if (latency < 10ms){
+                set_status_line1(text, COLOR_BLUE);
+            }else if (latency < 50ms){
+                set_status_line1(text, COLOR_DARKGREEN);
+            }else{
+                set_status_line1(text, COLOR_ORANGE);
+            }
+        }
+
+        if (!m_thread){
+            set_mode(str);
+        }
+    }
+
+    uint64_t ping_seqnum = 0;
+    if (parse_ping_response(str, ping_seqnum)){
+        std::lock_guard<Mutex> lg(m_lock);
+        m_last_ping_receive = timestamp;
+        auto iter = m_active_pings.find(ping_seqnum);
+        if (iter == m_active_pings.end()){
+            m_logger.log("Received Unexpected Ping: " + std::to_string(ping_seqnum));
+            return;
+        }
+
+        std::chrono::microseconds latency = std::chrono::duration_cast<std::chrono::microseconds>(timestamp - iter->second);
+        std::string text = "Response Time: " + pretty_print(latency.count()) + " ms";
+        if (latency < 10ms){
+            set_status_line1(text, COLOR_BLUE);
+        }else if (latency < 50ms){
+            set_status_line1(text, COLOR_DARKGREEN);
+        }else{
+            set_status_line1(text, COLOR_ORANGE);
+        }
+
+        m_active_pings.erase(iter);
+    }
+
+}
+
+
+bool TcpSysbotBase_Connection::parse_ping_response(const std::string& str, uint64_t& seqnum){
+    size_t pos = str.find("ping");
+    if (pos == std::string::npos){
+        return false;
+    }
+
+    //  The sequence number, if any, follows the "ping" token. A message may
+    //  end right after "ping", so the scan must stop at the string's end:
+    //  letting it run past the terminating NUL would read out of bounds, and
+    //  the number parse that follows would then read arbitrary memory.
+    size_t cursor = pos + 4;
+    while (cursor < str.size() && str[cursor] <= 32){
+        cursor++;
+    }
+    if (cursor >= str.size()){
+        //  Nothing after "ping" to parse.
+        return false;
+    }
+
+    //  Parse the bounded numeric token. Only a complete, in-range unsigned
+    //  integer counts; an overflow or a non-numeric token cannot be one of
+    //  our sequence numbers, so it is rejected.
+    auto parsed = std::from_chars(str.data() + cursor, str.data() + str.size(), seqnum);
+    return parsed.ec == std::errc();
+}
+void TcpSysbotBase_Connection::set_mode(const std::string& sbb_version){
+    if (sbb_version.rfind("2.", 0) == 0){
+        set_status_line1("sbb2 is no longer supported. Please upgrade to sbb3.", COLOR_RED);
+        return;
+    }else if (sbb_version.rfind("3.", 0) == 0){
+        m_logger.log("Detected sbb3. Using CC command queue.", COLOR_BLUE);
+        if (NintendoSwitch::ConsoleSettings::instance().ENABLE_SBB3_LOGGING){
+            write_data("configure enableLogs 1\r\n");
+        }
+        write_data("configure enablePA 1\r\n");
+    }else{
+        m_logger.log("Unrecognized sbb version: " + sbb_version, COLOR_RED);
+        return;
+    }
+
+    m_thread = GlobalThreadPools::unlimited_realtime().dispatch_now_blocking(
+        [this]{ thread_loop(); }
+    );
+    declare_ready();
+}
+
+
+namespace{
+class PingParseTest : public UnitTest{
+public:
+    PingParseTest(const std::string& name, const std::string& message, bool expected_found, uint64_t expected_seqnum);
+
+    virtual UnitTestResult run(Logger&, CancellableScope&) const override;
+
+private:
+    std::string m_message;
+    bool m_expected_found;
+    uint64_t m_expected_seqnum;
+};
+}
+
+
+PingParseTest::PingParseTest(
+    const std::string& name,
+    const std::string& message,
+    bool expected_found,
+    uint64_t expected_seqnum
+)
+    : UnitTest("NintendoSwitch::SysbotBase - " + name)
+    , m_message(message)
+    , m_expected_found(expected_found)
+    , m_expected_seqnum(expected_seqnum)
+{}
+
+UnitTestResult PingParseTest::run(Logger&, CancellableScope&) const{
+    uint64_t seqnum = 0;
+    bool found = TcpSysbotBase_Connection::parse_ping_response(m_message, seqnum);
+    if (found != m_expected_found){
+        return "parse_ping_response(\"" + m_message + "\") returned " + (found ? "true" : "false")
+            + ", expected " + (m_expected_found ? "true" : "false") + ".";
+    }
+    if (found && seqnum != m_expected_seqnum){
+        return "parse_ping_response(\"" + m_message + "\") returned seqnum " + std::to_string(seqnum)
+            + ", expected " + std::to_string(m_expected_seqnum) + ".";
+    }
+    return true;
+}
+
+
+
+void add_tests_SysbotBasePing(UnitTestDatabase& database){
+    database.add<PingParseTest>("PingParse(valid)", "ping 42", true, 42);
+    database.add<PingParseTest>("PingParse(zero)", "ping 0", true, 0);
+    database.add<PingParseTest>("PingParse(offset ping)", "prefix ping 7", true, 7);
+    database.add<PingParseTest>("PingParse(uint64 max)", "ping 18446744073709551615", true, UINT64_MAX);
+    database.add<PingParseTest>("PingParse(ends in ping)", std::string(128, 'A') + "ping", false, 0);
+    database.add<PingParseTest>("PingParse(bare ping)", "ping", false, 0);
+    database.add<PingParseTest>("PingParse(trailing whitespace)", "ping   ", false, 0);
+    database.add<PingParseTest>("PingParse(overflow)", "ping 18446744073709551616", false, 0);
+    database.add<PingParseTest>("PingParse(non-numeric)", "ping abc", false, 0);
+    database.add<PingParseTest>("PingParse(negative)", "ping -5", false, 0);
+}
+
+
+
+
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/NintendoSwitch/Controllers/SysbotBase/SysbotBase_Connection.h b/SerialPrograms/Source/NintendoSwitch/Controllers/SysbotBase/SysbotBase_Connection.h
new file mode 100644
index 0000000000..36bdff0750
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Controllers/SysbotBase/SysbotBase_Connection.h
@@ -0,0 +1,100 @@
+/*  sys-botbase Connection
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Controllers_SysbotBase_Connection_H
+#define PokemonAutomation_Controllers_SysbotBase_Connection_H
+
+#include <deque>
+#include <QUrl>
+#include <QHostAddress>
+#include <QTcpSocket>
+#include "Common/Cpp/Time.h"
+#include "Common/Cpp/Concurrency/Mutex.h"
+#include "Common/Cpp/Concurrency/ConditionVariable.h"
+#include "Common/Cpp/Concurrency/AsyncTask.h"
+#include "Common/Cpp/Sockets/ClientSocket.h"
+#include "Controllers/ControllerConnection.h"
+
+namespace PokemonAutomation{
+
+class UnitTestDatabase;
+
+namespace SysbotBase{
+
+
+class TcpSysbotBase_Connection : public ControllerConnection, private ClientSocket::Listener{
+public:
+    struct Listener{
+        virtual void on_message(const std::string& message) = 0;
+    };
+
+    void add_listener(Listener& listener){
+        m_listeners.add(listener);
+    }
+    void remove_listener(Listener& listener){
+        m_listeners.remove(listener);
+    }
+
+public:
+    TcpSysbotBase_Connection(
+        Logger& logger,
+        const std::string& url
+    );
+    ~TcpSysbotBase_Connection();
+
+    void write_data(const std::string& data);
+
+    //
+    //  Parses the sequence number that follows a "ping" token in "str",
+    //  setting "seqnum" and returning true only if a complete, in-range
+    //  unsigned integer is present. The scan is bounded to "str", so a
+    //  message that ends right after "ping" (or has no valid number after
+    //  it) returns false instead of reading out of bounds.
+    //
+    static bool parse_ping_response(const std::string& str, uint64_t& seqnum);
+
+private:
+    void thread_loop();
+
+    virtual void on_connect_finished(const std::string& error_message) override;
+    virtual void on_receive_data(const void* data, size_t bytes) override;
+    virtual void on_disconnect(const std::string& error_message) override;
+
+    void process_message(const std::string& message, WallClock timestamp);
+    void set_mode(const std::string& sbb_version);
+
+private:
+    Logger& m_logger;
+    ClientSocket m_socket;
+
+    std::string m_connecting_message;
+//    std::string m_version;
+    WallClock m_last_ping_send;
+    WallClock m_last_ping_receive;
+
+    uint64_t m_ping_seqnum = 0;
+    std::map<uint64_t, WallClock> m_active_pings;
+
+    std::deque<char> m_receive_buffer;
+
+    SpinLock m_send_lock;
+    Mutex m_lock;
+    ConditionVariable m_cv;
+    AsyncTask m_thread;
+
+    ListenerSet<Listener> m_listeners;
+};
+
+//
+//  Registers unit tests for parse_ping_response().
+//
+void add_tests_SysbotBasePing(UnitTestDatabase& database);
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/NintendoSwitch/Controllers/SysbotBase/SysbotBase_Descriptor.cpp b/SerialPrograms/Source/NintendoSwitch/Controllers/SysbotBase/SysbotBase_Descriptor.cpp
new file mode 100644
index 0000000000..f22f10fa1f
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Controllers/SysbotBase/SysbotBase_Descriptor.cpp
@@ -0,0 +1,70 @@
+/*  sys-botbase Descriptor
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Json/JsonValue.h"
+#include "SysbotBase_Descriptor.h"
+#include "SysbotBase_Connection.h"
+#include "SysbotBase3_ProController.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+
+template class InterfaceType_t<SysbotBase::TcpSysbotBase_Descriptor>;
+
+namespace SysbotBase{
+
+
+
+bool TcpSysbotBase_Descriptor::operator==(const ControllerDescriptor& x) const{
+    if (typeid(*this) != typeid(x)){
+        return false;
+    }
+    return m_url == static_cast<const TcpSysbotBase_Descriptor&>(x).m_url;
+}
+
+std::string TcpSysbotBase_Descriptor::display_name() const{
+    return m_url;
+}
+
+JsonValue TcpSysbotBase_Descriptor::to_json() const{
+    return m_url;
+}
+void TcpSysbotBase_Descriptor::load_json(const JsonValue& json){
+    const std::string* url = json.to_string();
+    if (url == nullptr || url->empty()){
+        return;
+    }
+    m_url = *url;
+}
+
+
+
+std::unique_ptr<ControllerConnection> TcpSysbotBase_Descriptor::open_connection(Logger& logger) const{
+    return std::unique_ptr<ControllerConnection>(
+        new TcpSysbotBase_Connection(logger, m_url)
+    );
+}
+std::unique_ptr<AbstractController> TcpSysbotBase_Descriptor::make_controller(
+    Logger& logger,
+    ControllerConnection& connection,
+    ControllerType controller_type
+) const{
+    TcpSysbotBase_Connection& sbb_connection = static_cast<TcpSysbotBase_Connection&>(connection);
+    return std::unique_ptr<AbstractController>(
+        new NintendoSwitch::ProController_SysbotBase3(logger, sbb_connection)
+    );
+}
+
+
+
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/NintendoSwitch/Controllers/SysbotBase/SysbotBase_Descriptor.h b/SerialPrograms/Source/NintendoSwitch/Controllers/SysbotBase/SysbotBase_Descriptor.h
new file mode 100644
index 0000000000..683eb38056
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Controllers/SysbotBase/SysbotBase_Descriptor.h
@@ -0,0 +1,61 @@
+/*  sys-botbase Descriptor
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Controllers_SysbotBase_Descriptor_H
+#define PokemonAutomation_Controllers_SysbotBase_Descriptor_H
+
+#include "Controllers/ControllerDescriptor.h"
+
+namespace PokemonAutomation{
+namespace SysbotBase{
+
+
+
+class TcpSysbotBase_Descriptor : public UiState<const TcpSysbotBase_Descriptor, ControllerDescriptor>{
+public:
+    static constexpr ControllerInterface INTERFACE_NAME = ControllerInterface::TcpSysbotBase;
+
+
+public:
+    TcpSysbotBase_Descriptor()
+        : UiState<const TcpSysbotBase_Descriptor, ControllerDescriptor>(INTERFACE_NAME)
+    {}
+    TcpSysbotBase_Descriptor(std::string url)
+        : UiState<const TcpSysbotBase_Descriptor, ControllerDescriptor>(INTERFACE_NAME)
+        , m_url(std::move(url))
+    {}
+
+    const std::string& url() const{
+        return m_url;
+    }
+
+    virtual bool operator==(const ControllerDescriptor& x) const override;
+    virtual std::string display_name() const override;
+
+    virtual JsonValue to_json() const override;
+    virtual void load_json(const JsonValue& json) override;
+
+    virtual std::unique_ptr<ControllerConnection> open_connection(Logger& logger) const override;
+    virtual std::unique_ptr<AbstractController> make_controller(
+        Logger& logger,
+        ControllerConnection& connection,
+        ControllerType controller_type
+    ) const override;
+
+
+private:
+    std::string m_url;
+};
+
+
+
+
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/NintendoSwitch/Controllers/SysbotBase/SysbotBase_SelectorWidget.cpp b/SerialPrograms/Source/NintendoSwitch/Controllers/SysbotBase/SysbotBase_SelectorWidget.cpp
new file mode 100644
index 0000000000..84ea1d0b86
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Controllers/SysbotBase/SysbotBase_SelectorWidget.cpp
@@ -0,0 +1,63 @@
+/*  sys-botbase Selector Widget
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "SysbotBase_SelectorWidget.h"
+
+namespace PokemonAutomation{
+
+template class RegisterUiStateQtWidget<SysbotBase::TcpSysbotBase_SelectorWidget>;
+
+namespace SysbotBase{
+
+
+
+TcpSysbotBase_SelectorWidget::TcpSysbotBase_SelectorWidget(
+    ControllerSelectorWidget& parent,
+    const ControllerDescriptor* current
+)
+    : QLineEdit(&parent)
+{
+//        cout << "TcpSysbotBase()" << endl;
+
+    QSizePolicy policy;
+    policy.setHorizontalStretch(3);
+    this->setSizePolicy(policy);
+
+    this->setPlaceholderText("192.168.0.100:6000");
+
+    if (current == nullptr || current->interface_type != ControllerInterface::TcpSysbotBase){
+        std::shared_ptr<ControllerDescriptor> descriptor =
+            parent.session().option().get_descriptor_from_cache(ControllerInterface::TcpSysbotBase);
+        if (!descriptor){
+            descriptor.reset(new TcpSysbotBase_Descriptor());
+        }
+        parent.session().set_device(descriptor);
+    }
+    this->setText(QString::fromStdString(parent.session().descriptor()->display_name()));
+
+    connect(
+        this, &QLineEdit::editingFinished,
+        &parent, [this, &parent](){
+            std::shared_ptr<ControllerDescriptor> selected(new TcpSysbotBase_Descriptor(
+                this->text().toStdString()
+            ));
+
+            std::shared_ptr<ControllerDescriptor> current = parent.session().descriptor();
+            if (*current == *selected){
+                return;
+            }
+
+            parent.session().set_device(std::move(selected));
+        }
+    );
+}
+
+
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/NintendoSwitch/Controllers/SysbotBase/SysbotBase_SelectorWidget.h b/SerialPrograms/Source/NintendoSwitch/Controllers/SysbotBase/SysbotBase_SelectorWidget.h
new file mode 100644
index 0000000000..1e4e36cf83
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Controllers/SysbotBase/SysbotBase_SelectorWidget.h
@@ -0,0 +1,52 @@
+/*  sys-botbase Selector Widget
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Controllers_SysbotBase_SelectorWidget_H
+#define PokemonAutomation_Controllers_SysbotBase_SelectorWidget_H
+
+#include <QLineEdit>
+#include "Common/Qt/UiStateQtWidget.h"
+#include "Controllers/ControllerDescriptor.h"
+#include "Controllers/ControllerSelectorWidget.h"
+#include "SysbotBase_Descriptor.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace SysbotBase{
+
+
+
+class TcpSysbotBase_SelectorWidget
+    : public QLineEdit
+    , public UiComponentQtWidget
+{
+public:
+    using ParentState = const TcpSysbotBase_Descriptor;
+
+    TcpSysbotBase_SelectorWidget(
+        QWidget& parent,
+        const ParentState& current
+    )
+        : TcpSysbotBase_SelectorWidget(static_cast<ControllerSelectorWidget&>(parent), &current)
+    {}
+    TcpSysbotBase_SelectorWidget(
+        ControllerSelectorWidget& parent,
+        const ControllerDescriptor* current
+    );
+
+    virtual QWidget& widget() override{
+        return *this;
+    }
+};
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/NintendoSwitch/DevPrograms/BoxDraw.cpp b/SerialPrograms/Source/NintendoSwitch/DevPrograms/BoxDraw.cpp
deleted file mode 100644
index a7ca56ebc6..0000000000
--- a/SerialPrograms/Source/NintendoSwitch/DevPrograms/BoxDraw.cpp
+++ /dev/null
@@ -1,89 +0,0 @@
-/*  Box Draw
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <mutex>
-#include "ClientSource/Connection/BotBase.h"
-#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
-#include "BoxDraw.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-
-
-
-BoxDraw_Descriptor::BoxDraw_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "NintendoSwitch:BoxDraw",
-        "Nintendo Switch", "Box Draw",
-        "",
-        "Test box coordinates for development.",
-        FeedbackType::NONE, AllowCommandsWhenRunning::ENABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-
-BoxDraw::BoxDraw()
-    : X("<b>X Coordinate:</b>", LockWhileRunning::UNLOCKED, 0.3, 0.0, 1.0)
-    , Y("<b>Y Coordinate:</b>", LockWhileRunning::UNLOCKED, 0.3, 0.0, 1.0)
-    , WIDTH("<b>Width:</b>", LockWhileRunning::UNLOCKED, 0.4, 0.0, 1.0)
-    , HEIGHT("<b>Height:</b>", LockWhileRunning::UNLOCKED, 0.4, 0.0, 1.0)
-{
-    PA_ADD_OPTION(X);
-    PA_ADD_OPTION(Y);
-    PA_ADD_OPTION(WIDTH);
-    PA_ADD_OPTION(HEIGHT);
-}
-
-class BoxDraw::Overlay : public ConfigOption::Listener{
-public:
-    ~Overlay(){
-        detach();
-    }
-    Overlay(BoxDraw& parent, VideoOverlay& overlay)
-        : m_parent(parent)
-        , m_overlay_set(overlay)
-    {
-        try{
-            m_parent.X.add_listener(*this);
-            m_parent.Y.add_listener(*this);
-            m_parent.WIDTH.add_listener(*this);
-            m_parent.HEIGHT.add_listener(*this);
-        }catch (...){
-            detach();
-            throw;
-        }
-    }
-    virtual void value_changed() override{
-        std::lock_guard<std::mutex> lg(m_lock);
-        m_overlay_set.clear();
-        m_overlay_set.add(COLOR_RED, {m_parent.X, m_parent.Y, m_parent.WIDTH, m_parent.HEIGHT});
-    }
-
-private:
-    void detach(){
-        m_parent.X.remove_listener(*this);
-        m_parent.Y.remove_listener(*this);
-        m_parent.WIDTH.remove_listener(*this);
-        m_parent.HEIGHT.remove_listener(*this);
-    }
-
-private:
-    BoxDraw& m_parent;
-    VideoOverlaySet m_overlay_set;
-    std::mutex m_lock;
-};
-
-void BoxDraw::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    Overlay overlay(*this, env.console.overlay());
-    overlay.value_changed();
-    context.wait_until_cancel();
-}
-
-
-
-
-}
-}
diff --git a/SerialPrograms/Source/NintendoSwitch/DevPrograms/BoxDraw.h b/SerialPrograms/Source/NintendoSwitch/DevPrograms/BoxDraw.h
deleted file mode 100644
index f5d1eb7400..0000000000
--- a/SerialPrograms/Source/NintendoSwitch/DevPrograms/BoxDraw.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*  Box Draw
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_NintendoSwitch_BoxDraw_H
-#define PokemonAutomation_NintendoSwitch_BoxDraw_H
-
-#include "Common/Cpp/Options/FloatingPointOption.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-
-
-
-class BoxDraw_Descriptor : public SingleSwitchProgramDescriptor{
-public:
-    BoxDraw_Descriptor();
-};
-
-
-class BoxDraw : public SingleSwitchProgramInstance{
-public:
-    BoxDraw();
-
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-    class Overlay;
-
-private:
-    FloatingPointOption X;
-    FloatingPointOption Y;
-    FloatingPointOption WIDTH;
-    FloatingPointOption HEIGHT;
-};
-
-
-
-
-
-}
-}
-#endif
diff --git a/SerialPrograms/Source/NintendoSwitch/DevPrograms/JoyconProgram.cpp b/SerialPrograms/Source/NintendoSwitch/DevPrograms/JoyconProgram.cpp
new file mode 100644
index 0000000000..6259e50044
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/DevPrograms/JoyconProgram.cpp
@@ -0,0 +1,68 @@
+/*  Joycon Test Program
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Controllers/Joycon/NintendoSwitch_Joycon.h"
+#include "JoyconProgram.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+
+JoyconProgram_Descriptor::JoyconProgram_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "NintendoSwitch:JoyconProgram",
+        "Nintendo Switch", "Joycon Program",
+        "",
+        "Template for a joycon program.",
+        PanelQualityStanding::DEVELOPER,
+        ProgramControllerClass::SpecializedController,
+        FeedbackType::NONE,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+
+JoyconProgram::JoyconProgram(){}
+void JoyconProgram::program(SingleSwitchProgramEnvironment& env, CancellableScope& scope){
+    JoyconContext context(scope, env.console.controller<JoyconController>());
+
+    //
+    //  Sample joycon program.
+    //
+    //  This will start from the grip menu and enter the system settings.
+    //  Note that the joycon is horizontal.
+    //
+    //  You can press any button, but if it doesn't exist, it won't do anything.
+    //
+    //  No support for gyro yet. That's coming later.
+    //
+
+    pbf_move_joystick(context, {-0.5, +0.5}, 10000ms, 0ms);
+
+#if 0
+    pbf_press_button(context, BUTTON_A, 200ms, 2000ms);
+    pbf_press_button(context, BUTTON_HOME, 200ms, 2000ms);
+    pbf_move_joystick(context, {0, +1}, 100ms, 100ms);
+    pbf_move_joystick(context, {0, +1}, 100ms, 100ms);
+    pbf_move_joystick(context, {+1, 0}, 100ms, 100ms);
+    pbf_move_joystick(context, {0, +1}, 100ms, 100ms);
+    pbf_press_button(context, BUTTON_X, 200ms, 2000ms);
+#endif
+
+}
+
+
+
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/NintendoSwitch/DevPrograms/JoyconProgram.h b/SerialPrograms/Source/NintendoSwitch/DevPrograms/JoyconProgram.h
new file mode 100644
index 0000000000..aa9a9a1c70
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/DevPrograms/JoyconProgram.h
@@ -0,0 +1,39 @@
+/*  Joycon Test Program
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_NintendoSwitch_JoyconProgram_H
+#define PokemonAutomation_NintendoSwitch_JoyconProgram_H
+
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+
+class JoyconProgram_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    JoyconProgram_Descriptor();
+};
+
+
+
+class JoyconProgram : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = JoyconProgram_Descriptor;
+    JoyconProgram();
+    virtual void program(SingleSwitchProgramEnvironment& env, CancellableScope& scope) override;
+
+};
+
+
+
+
+}
+}
+#endif
+
+
+
diff --git a/SerialPrograms/Source/NintendoSwitch/DevPrograms/TestDudunsparceFormDetector.cpp b/SerialPrograms/Source/NintendoSwitch/DevPrograms/TestDudunsparceFormDetector.cpp
new file mode 100644
index 0000000000..6dcc2d4543
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/DevPrograms/TestDudunsparceFormDetector.cpp
@@ -0,0 +1,185 @@
+/*  Test Dudunsparce Form Detector
+ *
+ *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *
+ */
+
+#include <atomic>
+#include <limits>
+#include <iostream>
+#include <opencv2/imgproc.hpp>
+#include <opencv2/imgcodecs.hpp>
+#include <onnxruntime_cxx_api.h>
+#include "3rdParty/ONNX/OnnxToolsPA.h"
+#include "Common/Cpp/Time.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/ImageTypes/ImageRGB32_OpenCV.h"
+#include "CommonFramework/VideoPipeline/VideoOverlay.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+#include "TestDudunsparceFormDetector.h"
+
+using std::cout;
+using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+class DudunsparceFormDetector : public VisualInferenceCallback{
+public:
+    DudunsparceFormDetector(VideoOverlay& overlay);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override final;
+
+    std::string get_label() const {
+        int detected_label_id = m_detected.load(std::memory_order_acquire);
+        return labels[detected_label_id];
+    }
+
+private:
+    VideoOverlaySet m_overlay_set;
+    std::string model_path;
+    ImagePixelBox m_pixel_box_1080p;
+    ImageFloatBox m_float_box;
+    std::atomic<int> m_detected;
+
+    Ort::Env env;
+    Ort::RunOptions runOptions;
+    Ort::Session session;
+
+    const char* labels[3]{"none", "three", "two"};
+};
+
+
+DudunsparceFormDetector::DudunsparceFormDetector(VideoOverlay& overlay)
+    : VisualInferenceCallback("DudunsparceFormDetector")
+    , m_overlay_set(overlay)
+    , model_path("../../PAMLExperiments/dudunsparce/dudunsparce_form_detector.onnx")
+    , m_detected(0)
+    , session(nullptr)
+{
+    // The input data for the ML model is created by cropping an 1080P frame from Switch
+    // The crop is at image[500:750, 1500:1750]. 
+    m_pixel_box_1080p = ImagePixelBox(1500, 500, 1750, 750);
+    m_float_box = pixelbox_to_floatbox(1920, 1080, m_pixel_box_1080p);
+
+    // learned from ONN Runtime example: https://github.com/cassiebreviu/cpp-onnxruntime-resnet-console-app/blob/main/OnnxRuntimeResNet/OnnxRuntimeResNet.cpp
+    session = Ort::Session(env, str_to_onnx_str(model_path).c_str(), Ort::SessionOptions{nullptr});
+}
+
+void DudunsparceFormDetector::make_overlays(VideoOverlaySet& items) const {}
+
+bool DudunsparceFormDetector::process_frame(const ImageViewRGB32& frame, WallClock timestamp){
+    m_overlay_set.clear();
+
+    ImageViewRGB32 cropped_frame = (frame.height() == 1080) ? extract_box_reference(frame, m_pixel_box_1080p)
+        : extract_box_reference(frame, m_float_box);
+    cv::Mat cropped_mat = to_OpenCV_ref(cropped_frame);
+    cv::Mat resized_mat;  // resize to the shape for the ML model input
+    cv::resize(cropped_mat, resized_mat, cv::Size(25, 25));
+    cv::Mat resized_mat_gray;
+    cv::cvtColor(resized_mat, resized_mat_gray, cv::COLOR_BGRA2GRAY);
+
+    // cv::imwrite("./model_input.png", resized_mat_gray);
+
+    cv::Mat float_mat;
+    resized_mat_gray.convertTo(float_mat, CV_32F, 1./255);
+
+    // ML stuff: prepare ML model input and output
+    const std::array<int64_t, 3> inputShape = {1, 25, 25};
+    const std::array<int64_t, 2> outputShape = {1, 3};
+
+    std::array<float, 25 * 25> modelInput;
+    std::array<float, 3> modelOutput;
+    auto memoryInfo = Ort::MemoryInfo::CreateCpu(OrtDeviceAllocator, OrtMemTypeCPU);
+    auto inputTensor = Ort::Value::CreateTensor<float>(memoryInfo, modelInput.data(), modelInput.size(), inputShape.data(), inputShape.size());
+    auto outputTensor = Ort::Value::CreateTensor<float>(memoryInfo, modelOutput.data(), modelOutput.size(), outputShape.data(), outputShape.size());
+
+    for (int row = 0, p_loc=0; row < 25; row++){
+        for (int col = 0; col < 25; col++){
+            float p = float_mat.at<float>(row, col);
+            modelInput[p_loc++] = p;
+        }
+    }
+
+    Ort::AllocatorWithDefaultOptions ort_alloc;
+    Ort::AllocatedStringPtr inputName = session.GetInputNameAllocated(0, ort_alloc);
+    Ort::AllocatedStringPtr outputName = session.GetOutputNameAllocated(0, ort_alloc);
+    const std::array<const char*, 1> inputNames = {inputName.get()};
+    const std::array<const char*, 1> outputNames = {outputName.get()};
+
+    session.Run(runOptions, inputNames.data(), &inputTensor, 1, outputNames.data(), &outputTensor, 1);
+
+    float max_value = -std::numeric_limits<float>::max();
+    int max_value_label = 0;
+    for (int i = 0; i < 3; i++){
+        // cout << labels[i] << ": " << modelOutput[i] << ", ";
+        if (modelOutput[i] > max_value){
+            max_value = modelOutput[i];
+            max_value_label = i;
+        }
+    }
+    cout << "Detector dudunsparce form: " << labels[max_value_label] << endl;
+    m_detected.store(max_value_label);
+
+    return false;
+}
+
+
+TestDudunsparceFormDetector_Descriptor::TestDudunsparceFormDetector_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "NintendoSwitch:DudunsparceFormDetector",
+        "Nintendo Switch", "Test Dudunsparce Form Detector",
+        "",
+        "Test ML model on Dudunsparce form in SV box system",
+        PanelQualityStanding::DEVELOPER,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::NONE,
+        AllowCommandsWhenRunning::ENABLE_COMMANDS
+    )
+{}
+
+TestDudunsparceFormDetector::TestDudunsparceFormDetector(){}
+
+
+void TestDudunsparceFormDetector::program(SingleSwitchProgramEnvironment& env, CancellableScope& scope){
+
+    DudunsparceFormDetector detector(env.console.overlay());
+
+    // ImageRGB32 test_image("../../datasets/Bidoof/images/test/im0005.png");
+    // detector.process_frame(test_image, current_time());
+
+    // return;
+    // InferenceSession session(
+    //     context, env.console,
+    //     {{detector, std::chrono::milliseconds(100)}}
+    // );
+    // context.wait_until_cancel();
+
+    std::string last_label = "";
+    run_until(
+        env.console, scope,
+        [&](CancellableScope& scope){
+            while (true){
+                std::string cur_label = detector.get_label();
+                if (cur_label != last_label){
+                    last_label = cur_label;
+                    env.console.overlay().add_log("Detected " + last_label);
+                }
+                scope.wait_for(std::chrono::milliseconds(100));
+            }
+        },
+        {detector},
+        std::chrono::milliseconds(100)
+    );
+
+
+    std::cout << "ML detection test program finished." << std::endl;
+}
+
+
+}
+}
diff --git a/SerialPrograms/Source/NintendoSwitch/DevPrograms/TestDudunsparceFormDetector.h b/SerialPrograms/Source/NintendoSwitch/DevPrograms/TestDudunsparceFormDetector.h
new file mode 100644
index 0000000000..ae24f0e04f
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/DevPrograms/TestDudunsparceFormDetector.h
@@ -0,0 +1,37 @@
+/*  Test Dudunsparce Form Detector
+ *
+ *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *
+ */
+
+#ifndef PokemonAutomation_NintendoSwitch_TestDudunsparceFormDetector_H
+#define PokemonAutomation_NintendoSwitch_TestDudunsparceFormDetector_H
+
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+
+class TestDudunsparceFormDetector_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    TestDudunsparceFormDetector_Descriptor();
+};
+
+
+class TestDudunsparceFormDetector : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = TestDudunsparceFormDetector_Descriptor;
+    TestDudunsparceFormDetector();
+
+    virtual void program(SingleSwitchProgramEnvironment& env, CancellableScope& scope) override;
+
+private:
+};
+
+ 
+ 
+ }
+ }
+ #endif // TESTPATHMAKER_H
+ 
diff --git a/SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramComputer.cpp b/SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramComputer.cpp
index 781222eb98..1bd377257d 100644
--- a/SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramComputer.cpp
+++ b/SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramComputer.cpp
@@ -1,6 +1,6 @@
 /*  Test Program (Computer)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -13,114 +13,74 @@
 #include <set>
 #include <mutex>
 #include <fstream>
-#include <condition_variable>
+#include <iostream>
 #include <QImage>
-#include <QJsonObject>
-#include <QDir>
-#include <QDateTime>
-#include <QGuiApplication>
-#include <QScreen>
-#include <QPixmap>
+#include "3rdParty-Core/nlohmann/json.hpp"
 #include "Common/Cpp/Exceptions.h"
-#include "Common/Cpp/Containers/AlignedVector.h"
 #include "Common/Cpp/CpuId/CpuId.h"
-#include "Common/Cpp/Concurrency/AsyncDispatcher.h"
-#include "CommonFramework/Globals.h"
-#include "CommonFramework/Exceptions/ProgramFinishedException.h"
-#include "CommonFramework/Exceptions/OperationFailedException.h"
-#include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "CommonFramework/ImageTools/ImageFilter.h"
-#include "CommonFramework/OCR/OCR_RawOCR.h"
-#include "CommonFramework/OCR/OCR_Routines.h"
-#include "PokemonSV/Inference/Tera/PokemonSV_TeraCodeReader.h"
-#include "PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_BattleMenu.h"
-#include "PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathSelect.h"
-#include "PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_State.h"
-#include "PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI.h"
-#include "CommonFramework/ImageMatch/ExactImageMatcher.h"
-#include "TestProgramComputer.h"
-#include "ClientSource/Libraries/Logging.h"
 #include "Common/Cpp/Containers/Pimpl.tpp"
-
-#include "Kernels/BinaryMatrix/Kernels_PackedBinaryMatrixCore.h"
-#include "Kernels/Waterfill/Kernels_Waterfill_Core_64x4_Default.h"
-#include "Kernels/BinaryMatrix/Kernels_BinaryMatrix.h"
-#include "Kernels/Waterfill/Kernels_Waterfill.h"
-#include "Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters.h"
-#include "PokemonSwSh/Inference/PokemonSwSh_MarkFinder.h"
-#include "CommonFramework/Inference/ImageMatchDetector.h"
-#include "CommonFramework/Notifications/ProgramNotifications.h"
-#include "Pokemon/Inference/Pokemon_NameReader.h"
-#include "PokemonSwSh/Inference/PokemonSwSh_SelectionArrowFinder.h"
 #include "Common/Cpp/Containers/AlignedVector.tpp"
-#include "CommonFramework/Tools/FileDownloader.h"
-#include "CommonFramework/Inference/BlackScreenDetector.h"
-#include "CommonFramework/ImageTools/BinaryImage_FilterRgb32.h"
-#include "Kernels/Waterfill/Kernels_Waterfill_Session.h"
-#include "PokemonLA/Inference/PokemonLA_MountDetector.h"
-#include "PokemonLA/Inference/Objects/PokemonLA_ArcPhoneDetector.h"
-#include "Common/Cpp/Concurrency/PeriodicScheduler.h"
-#include "Pokemon/Inference/Pokemon_IVCheckerReader.h"
-#include "Kernels/Kernels_Alignment.h"
-#include "Kernels/ScaleInvariantMatrixMatch/Kernels_ScaleInvariantMatrixMatch.h"
-#include "Kernels/SpikeConvolution/Kernels_SpikeConvolution.h"
-#include "PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI.h"
-#include "Kernels/AudioStreamConversion/AudioStreamConversion.h"
-#include "Common/Cpp/StreamConverters.h"
-#include "CommonFramework/AudioPipeline/AudioConstants.h"
-#include "CommonFramework/AudioPipeline/AudioStream.h"
-#include "3rdParty/nlohmann/json.hpp"
 #include "Common/Cpp/Json/JsonValue.h"
 #include "Common/Cpp/Json/JsonArray.h"
 #include "Common/Cpp/Json/JsonObject.h"
-#include "CommonFramework/ImageTypes/ImageRGB32.h"
-#include "CommonFramework/ImageTypes/ImageHSV32.h"
-#include "PokemonSwSh/Inference/PokemonSwSh_YCommDetector.h"
-#include "PokemonLA/Inference/Objects/PokemonLA_FlagTracker.h"
-#include "Common/Cpp/StringTools.h"
-#include "PokemonSwSh/Inference/Battles/PokemonSwSh_BattleMenuDetector.h"
-#include "PokemonSwSh/Inference/PokemonSwSh_SummaryShinySymbolDetector.h"
-#include "Common/Cpp/EnumDatabase.h"
-#include "PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterEnums.h"
-#include "PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_Lobby.h"
-
-#include "CommonFramework/ImageTools/ImageFilter.h"
-#include "CommonFramework/ImageTools/SolidColorTest.h"
-#include "PokemonSV/Inference/PokemonSV_WhiteButtonDetector.h"
-#include "PokemonSV/Inference/Dialogs/PokemonSV_DialogArrowDetector.h"
-#include "PokemonSV/Inference/Dialogs/PokemonSV_GradientArrowDetector.h"
-#include "PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h"
 #include "Common/Cpp/Containers/BoxSet.h"
+#include "Common/Cpp/Concurrency/Mutex.h"
 #include "Common/Cpp/Concurrency/ScheduledTaskRunner.h"
-#include "PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h"
-#include "Integrations/DiscordWebhook.h"
-#include "PokemonSV/Programs/TeraRaids/PokemonSV_JoinTracker.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
-#include "PokemonSV/Inference/Boxes/PokemonSV_BoxDetection.h"
-#include "CommonFramework/Environment/Environment.h"
-#include "Common/Cpp/PrettyPrint.h"
+#include "Common/Cpp/Concurrency/Watchdog.h"
+#include "Common/Cpp/Containers/CircularBuffer.h"
+#include "Common/Cpp/Sockets/ClientSocket.h"
+#include "Common/Cpp/Containers/SparseArray.h"
+#include "Common/Cpp/Options/MacAddressOption.h"
+#include "Common/PABotBase2/ReliableConnectionLayer/PABotBase2CC_ReliableStreamConnection.h"
+#include "Common/Cpp/StreamConnections/MockDevice.h"
+#include "Common/Cpp/TestRunners/ParallelUnitTestRunner.h"
 #include "Common/Qt/TimeQt.h"
-#include "PokemonSV/Inference/Picnics/PokemonSV_SandwichHandDetector.h"
-#include "CommonFramework/Inference/StatAccumulator.h"
+#include "Common/SerialPABotBase/SerialPABotBase_Protocol.h"
+#include "Kernels/Waterfill/Kernels_Waterfill.h"
+#include "Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters.h"
+#include "Kernels/ImageStats/Kernels_ImagePixelSumSqr.h"
+#include "Kernels/AudioResampler/Kernels_AudioResampler_WeightTable.h"
+#include "Kernels/AudioPipeline/Kernels_AudioPipeline.h"
+#include "CommonFramework/Exceptions/ProgramFinishedException.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/Tools/FileDownloader.h"
+#include "CommonFramework/ImageTypes/ImageRGB32.h"
+#include "CommonFramework/ImageTypes/ImageHSV32.h"
+#include "CommonFramework/Environment/Environment.h"
 #include "CommonFramework/Tools/ErrorDumper.h"
-#include "ClientSource/Connection/BotBase.h"
 #include "CommonFramework/Environment/Environment.h"
-#include "PokemonSV/Inference/Overworld/PokemonSV_LetsGoKillDetector.h"
-#include "PokemonSV/Inference/PokemonSV_SweatBubbleDetector.h"
+#include "CommonFramework/Tools/GlobalThreadPools.h"
+#include "CommonFramework/Tools/FileUnzip.h"
+#include "CommonTools/OCR/OCR_Routines.h"
+#include "CommonTools/OCR/OCR_NumberReader.h"
+#include "CommonTools/Images/ImageFilter.h"
+#include "Integrations/DiscordWebhook.h"
+#include "Integrations/PybindSwitchController.h"
+#include "Pokemon/Inference/Pokemon_NameReader.h"
 #include "Pokemon/Resources/Pokemon_PokemonSlugs.h"
-#include "PokemonSV/Inference/Battles/PokemonSV_NormalBattleMenus.h"
 #include "Pokemon/Resources/Pokemon_PokemonNames.h"
-#include "CommonFramework/OCR/OCR_NumberReader.h"
-#include "CommonFramework/ImageTools/ImageManip.h"
-#include "PokemonSV/Resources/PokemonSV_Ingredients.h"
-#include "Kernels/ImageStats/Kernels_ImagePixelSumSqr.h"
-#include "CommonFramework/ImageMatch/ImageDiff.h"
-#include "CommonFramework/Inference/BlackBorderDetector.h"
-#include "PokemonSV/Inference/Boxes/PokemonSV_BoxDetection.h"
-#include "Common/Cpp/Concurrency/Watchdog.h"
-#include "PokemonSV/Inference/Battles/PokemonSV_TeraBattleMenus.h"
+#include "Pokemon/Pokemon_StatsCalculation.h"
+#include "PokemonBDSP/Inference/ShinyDetection/PokemonBDSP_ShinySparkleSet.h"
+#include "VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_BattleMenu.h"
+#include "VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_State.h"
+#include "VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI.h"
+#include "VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI.h"
+#include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_YCommDetector.h"
 //#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
-#include "NintendoSwitch/Inference/NintendoSwitch_DetectHome.h"
+#include "VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleMenuDetector.h"
+#include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_SummaryShinySymbolDetector.h"
+#include "VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_BattleMenu.h"
+#include "VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonSelectMenu.h"
+#include "VideoGames/PokemonLA/Inference/PokemonLA_MountDetector.h"
+#include "VideoGames/PokemonSV/Inference/Tera/PokemonSV_TeraCodeReader.h"
+#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_GradientArrowDetector.h"
+#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h"
+#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h"
+#include "VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_JoinTracker.h"
+#include "VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxDetection.h"
+#include "VideoGames/PokemonSV/Inference/Map/PokemonSV_DestinationMarkerDetector.h"
 
 #ifdef PA_ARCH_x86
 //#include "Kernels/Kernels_x64_SSE41.h"
@@ -138,11 +98,29 @@
 //#include "Kernels/ImageScaling/Kernels_ImageScaling_Default.h"
 //#include "Kernels/ImageScaling/Kernels_ImageScaling_x64_SSE41.h"
 #endif
+#include "VideoGames/PokemonSV/Inference/Picnics/PokemonSV_SandwichHandDetector.h"
+//#include "Common/SerialPABotBase/LightweightWallClock_StdChrono.h"
+#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_LetsGoKillDetector.h"
+#include "VideoGames/PokemonSV/Inference/PokemonSV_SweatBubbleDetector.h"
+#include "VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxDetection.h"
+#include "VideoGames/PokemonSV/Inference/Battles/PokemonSV_TeraBattleMenus.h"
+#include "VideoGames/PokemonSV/Inference/Picnics/PokemonSV_SandwichRecipeDetector.h"
+#include "VideoGames/PokemonSV/Inference/PokemonSV_StatHexagonReader.h"
+#include "VideoGames/PokemonSV/Programs/ItemPrinter/PokemonSV_ItemPrinterSeedCalc.h"
+//#include "Kernels/AudioResampler/Kernels_AudioResampler_BlockKernel_Default.h"
+//#include "Kernels/AudioResampler/Kernels_AudioResampler_BlockKernel_x64_SSE2.h"
+//#include "Kernels/AudioResampler/Kernels_AudioResampler_BlockKernel_x64_FMA3.h"
+//#include "Kernels/AudioResampler/Kernels_AudioResampler_BlockKernel_x64_AVX512.h"
+#include "VideoGames/PokemonSV/Inference/Battles/PokemonSV_BattleBallReader.h"
+
 
 //#include <opencv2/core.hpp>
+//#include <onnxruntime_cxx_api.h>
+//#include <random>
 
 
-#include <iostream>
+#include "TestProgramComputer.h"
+
 using std::cout;
 using std::endl;
 
@@ -158,15 +136,22 @@ TestProgramComputer_Descriptor::TestProgramComputer_Descriptor()
         "Computer:TestProgram",
         "Computer", "Test Program (Computer)",
         "",
-        "Test Program"
+        "Test Program",
+        PanelQualityStanding::DEVELOPER
     )
 {}
 TestProgramComputer::TestProgramComputer()
     : STATIC_TEXT("test text")
+    , IMAGE_PATH(false, "Path to image for testing", LockMode::UNLOCK_WHILE_RUNNING, "default.png", "default.png")
+    , INPUT_TEXT(false, "Input text:", LockMode::UNLOCK_WHILE_RUNNING, "", "")
     , SCREEN_WATCHER("Capture Box", 0, 0, 1, 1)
+    , MAC_ADDRESS(LockMode::UNLOCK_WHILE_RUNNING, 6, nullptr)
 {
     PA_ADD_OPTION(STATIC_TEXT);
+    PA_ADD_OPTION(IMAGE_PATH);
+    PA_ADD_OPTION(INPUT_TEXT);
 //    PA_ADD_OPTION(SCREEN_WATCHER);
+    PA_ADD_OPTION(MAC_ADDRESS);
 }
 
 WallClock REFERENCE = current_time();
@@ -216,13 +201,951 @@ class WatchdogTest1 : public WatchdogCallback{
 
 
 
+template <typename Type>
+class CheckedObject{
+public:
+    template <class... Args>
+    CheckedObject(Args&&... args)
+        : m_object(std::forward<Args>(args)...)
+    {
+        m_instances++;
+    }
+    ~CheckedObject(){
+        m_instances--;
+    }
+
+    operator const Type&() const{
+        return m_object;
+    }
+    operator Type&(){
+        return m_object;
+    }
+
+    static size_t instances(){
+        return m_instances.load(std::memory_order_relaxed);
+    }
+
+    friend std::ostream& operator<<(std::ostream& stream, const CheckedObject& x){
+        return stream << (const Type&)x;
+    }
+
+private:
+    static std::atomic<size_t> m_instances;
+    Type m_object;
+    LifetimeSanitizer m_lifetime_santizer;
+};
+
+template <typename Type>
+std::atomic<size_t> CheckedObject<Type>::m_instances(0);
+
+
+
+#if 0
+struct RequestManagerConfig{
+    using ClockType = LightweightWallClock_StdChrono;
+    using ClockDuration = LightweightDuration_StdChrono;
+    using SeqnumType = seqnum_t;
+    using MessageSizeType = uint8_t;
+    static constexpr size_t MAX_MESSAGE_SIZE = 64;
+    static constexpr size_t QUEUE_SIZE = 64;
+};
+#endif
+
+
+
+
+
+
+
+
+
+
+
+std::string random_string(size_t max_length){
+    size_t length = rand() % max_length;
+
+    static const char TABLE[] = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
+
+    std::string ret;
+    for (size_t c = 0; c < length; c++){
+        ret += TABLE[rand() % 62];
+    }
+    return ret;
+}
+
+void stress_test(Logger& logger, CancellableScope& scope){
+    using namespace std::chrono_literals;
+
+    MockDevice device(GlobalThreadPools::unlimited_normal());
+
+    PABotBase2::ReliableStreamConnection connection(
+        &scope,
+        logger, true,
+        GlobalThreadPools::unlimited_realtime(),
+        device.host_side_connection(),
+        100ms,
+        &device.print_lock()
+    );
+
+    //  Connect
+    connection.reset();
+    connection.send_request(PABB2_CONNECTION_OPCODE_ASK_VERSION);
+    connection.wait_for_pending();
+    connection.send_request(PABB2_CONNECTION_OPCODE_ASK_PACKET_SIZE);
+    connection.wait_for_pending();
+    connection.send_request(PABB2_CONNECTION_OPCODE_ASK_BUFFER_SLOTS);
+    connection.wait_for_pending();
+
+    uint64_t bytes_sent = 0;
+    WallClock last_print = current_time();
+
+    try{
+        while (true){
+            scope.throw_if_cancelled();
+
+            std::string data = random_string(20);
+            const char* ptr = data.data();
+            size_t left = data.size();
+            while (left > 0){
+                if (current_time() - last_print > Seconds(1)){
+                    cout << "Bytes Sent = " << bytes_sent + data.size() - left << endl;
+                    last_print = current_time();
+                }
+    //            scope.wait_for(Milliseconds(rand() % 100));
+                connection.send_stream(ptr, left);
+                size_t sent = left;
+//                if (sent == 0){
+//                    device.verify_stream_data();
+//                }
+                ptr += sent;
+                left -= sent;
+            }
+            device.verify_stream_data();
+            bytes_sent += data.size();
+            device.push_expected_stream_data(data.data(), data.size());
+        }
+    }catch (Exception&){
+        connection.print();
+        device.print();
+        throw;
+    }
+
+}
+
+
+Mutex print_lock;
+
+
+class SampleTest : public UnitTest{
+public:
+    SampleTest(std::string name)
+        : UnitTest(std::move(name))
+    {}
+
+    virtual UnitTestResult run(Logger& logger, CancellableScope& scope) const override{
+        scope.wait_for(Milliseconds(1000));
+        return true;
+    }
+
+
+};
+
+
+using namespace AudioResampler;
+
+#if 0
+class ResampleTile{
+    static constexpr size_t TAPS = 4;
+
+public:
+    ResampleTile()
+        : m_period_index(0)
+    {}
+
+    void push_1(){
+
+    }
+
+
+private:
+    size_t m_taps;
+    size_t m_period_index;
+    float m_buffer[8];
+
+};
+#endif
+
+
+
+
+
+class AudioPipelineTree{
+public:
+
+
+private:
+
+};
+
+using namespace Kernels::AudioPipeline;
+
+
+
+
+
+
+
+
+
+
+
+
+
 void TestProgramComputer::program(ProgramEnvironment& env, CancellableScope& scope){
     using namespace Kernels;
+    using namespace NintendoSwitch;
 //    using namespace NintendoSwitch::PokemonSwSh;
     using namespace NintendoSwitch::PokemonSV;
     using namespace Pokemon;
-//    using namespace NintendoSwitch::PokemonSwSh::MaxLairInternal;
+    using namespace NintendoSwitch::PokemonSwSh::MaxLairInternal;
+
+    using namespace std::chrono_literals;
+
+    [[maybe_unused]] Logger& logger = env.logger();
+
+#if 0
+    int16_t in[] = {1, 2, 3, 4, 5, 6};
+    float out[6];
+
+    convert_from_s16_Default(2, 3, 3, out, in);
+
+    for (size_t c = 0; c < 6; c++){
+        cout << out[c] << ", ";
+    }
+#endif
+
+#if 0
+    float weights[] = {
+        1, 2, 3,
+        4, 5, 6
+    };
+
+    float out[20];
+    float in[30];
+
+    for (size_t c = 0; c < 30; c++){
+        in[c] = c;
+    }
+
+    convolve_channels_Default(
+        weights, 10,
+        2, 10, out,
+        3, 10, in
+    );
+
+    for (size_t r = 0; r < 2; r++){
+        for (size_t c = 0; c < 10; c++){
+            cout << out[c + 10*r] << ", ";
+        }
+        cout << endl;
+    }
+#endif
+
+
+#if 0
+    {
+        alignas(64) float s[8];
+        for (size_t c = 0; c < 8; c++){
+            s[c] = c;
+        }
+
+        __m128 r0, r1;
+
+        transposef32x4x2(
+            s + 0,
+            s + 2,
+            s + 4,
+            s + 6,
+            r0, r1
+        );
+
+
+        print(r0);
+        print(r1);
+        cout << "-------------" << endl;
+    }
+    {
+        alignas(64) float s[32];
+        for (size_t c = 0; c < 32; c++){
+            s[c] = c;
+        }
+
+        __m256 r0, r1, r2, r3;
+
+        transposef32x8x4(
+            s + 0,
+            s + 4,
+            s + 8,
+            s + 12,
+            s + 16,
+            s + 20,
+            s + 24,
+            s + 28,
+            r0, r1, r2, r3
+        );
+
+
+        print(r0);
+        print(r1);
+        print(r2);
+        print(r3);
+        cout << "-------------" << endl;
+    }
+    {
+        alignas(64) float s[128];
+        for (size_t c = 0; c < 128; c++){
+            s[c] = c;
+        }
+
+        __m512 r0, r1, r2, r3, r4, r5, r6, r7;
+
+        transposef32x16x8(
+            s + 8 *  0,
+            s + 8 *  1,
+            s + 8 *  2,
+            s + 8 *  3,
+            s + 8 *  4,
+            s + 8 *  5,
+            s + 8 *  6,
+            s + 8 *  7,
+            s + 8 *  8,
+            s + 8 *  9,
+            s + 8 * 10,
+            s + 8 * 11,
+            s + 8 * 12,
+            s + 8 * 13,
+            s + 8 * 14,
+            s + 8 * 15,
+            r0, r1, r2, r3, r4, r5, r6, r7
+        );
+
+
+        print(r0);
+        print(r1);
+        print(r2);
+        print(r3);
+        print(r4);
+        print(r5);
+        print(r6);
+        print(r7);
+        cout << "-------------" << endl;
+    }
+#endif
+
+#if 0
+
+    uint32_t taps = 16;
+
+    WeightTable table0(10, 16, taps, 9, 8, 1);
+    for (size_t c = 0; c < 8; c++){
+        cout << table0.in_sample_index()[c] << ", ";
+    }
+    cout << endl;
+    for (size_t tap_index = 0; tap_index < taps; tap_index++){
+        for (size_t c = 0; c < 8; c++){
+            cout << table0.tap_start(tap_index)[c] << ", ";
+        }
+        cout << endl;
+    }
+
+    WeightTable table1(16, 10, taps, 9, 8, 1);
+    for (size_t c = 0; c < 5; c++){
+        cout << table1.in_sample_index()[c] << ", ";
+    }
+    cout << endl;
+    for (size_t tap_index = 0; tap_index < taps; tap_index++){
+        for (size_t c = 0; c < 5; c++){
+            cout << table1.tap_start(tap_index)[c] << ", ";
+        }
+        cout << endl;
+    }
+
+
+    float in[128];
+    float out[128] = {};
+
+    for (size_t c = 0; c < 128; c++){
+        in[c] = c;
+    }
+
+#if 0
+    run_block8_Default(
+        table0,
+        0, in,
+        0, out
+    );
+    run_block8_Default(
+        table0,
+        0, in + 5,
+        0, out + 8
+    );
+    run_block8_Default(
+        table0,
+        0, in + 5*2,
+        0, out + 8*2
+    );
+    run_block8_Default(
+        table0,
+        0, in + 5*3,
+        0, out + 8*3
+    );
+#endif
+#if 0
+    run_block8_Default(
+        table1,
+        0, in,
+        0, out
+    );
+    run_block8_Default(
+        table1,
+        0, in + 8*1,
+        0, out + 5*1
+    );
+    run_block8_Default(
+        table1,
+        0, in + 8*2,
+        0, out + 5*2
+    );
+    run_block8_Default(
+        table1,
+        0, in + 8*3,
+        0, out + 5*3
+    );
+#endif
+#if 1
+    run_block8_tap2_x64_SSE2(
+        table0,
+        0, in,
+        0, out
+    );
+#endif
+#if 0
+    run_block16_tap4_x64_FMA3(
+        table0,
+        0, in,
+        0, out
+    );
+#endif
+#if 0
+    run_block128_x64_AVX512<1>(
+        table0,
+        0, in,
+        0, out
+    );
+#endif
+#if 0
+    run_block32_tap8_x64_AVX512(
+        table0,
+        0, in,
+        0, out
+    );
+#endif
+    for (size_t c = 0; c < 32; c++){
+        cout << out[c] << endl;
+    }
+    cout << "-----------" << endl;
+
+#if 0
+    run_block8_Default(
+        table1,
+        0, out,
+        0, in
+    );
+
+    for (size_t c = 0; c < 16; c++){
+        cout << in[c] << endl;
+    }
+#endif
+
+
+#endif
+
+
+
+
+#if 0
+    UnitTestRunner runner(scope, logger, GlobalThreadPools::computation_normal());
+
+    runner.add_test<SampleTest>("test0");
+    runner.add_test<SampleTest>("test1");
+    runner.add_test<SampleTest>("test2");
+    runner.add_test<SampleTest>("test3");
+    runner.add_test<SampleTest>("test4");
+
+    runner.run();
+#endif
+
+//    cout << random_u32(100, 115) << endl;
+
+
+//    cout << OCR::random_match_probability(10, 1, 0.5) << endl;
+
+#if 0
+    PybindSwitchProController controller("COM3");
+    controller.wait_for_ready(5000);
+    controller.push_button(1000, 200, 800, BUTTON_X);
+    controller.wait_for_all_requests();
+#endif
+
+#if 0
+    ImageRGB32 image(IMAGE_PATH);
+    ImageFloatBox num_sunflora_box = {0.27, 0.02, 0.04, 0.055};
+    // extract_box_reference(image, num_sunflora_box).save("crop.png");
+    int number = OCR::read_number_waterfill(logger, extract_box_reference(image, num_sunflora_box), 0xff000000, 0xff808080);
+
+    int expected_number = std::stoi(std::string(INPUT_TEXT));
+
+    std::string number_string = std::to_string(number);
+    std::string expected_number_string = std::to_string(expected_number);
+
+    // checks that expected_number is a prefix of number
+    // this is to handle the Asian languages that have extra characters after the number
+    if (number_string.compare(0, expected_number_string.size(), expected_number_string) == 0){
+        cout << "matches" << endl;
+    }else{
+        cout << "does not matche" << endl;
+    }
+#endif
 
+
+#if 0
+    ImageRGB32 image(IMAGE_PATH);
+    DestinationMarkerDetector detector(COLOR_CYAN, {0.717, 0.165, 0.03, 0.061}, false);
+    cout << detector.detect(image) << endl;
+#endif
+
+
+
+#if 0
+    std::string zip_path = SETTINGS_PATH() + "test2.zip";
+    std::string target_dir = SETTINGS_PATH() + "testB/";
+    unzip_file(zip_path.c_str(), target_dir.c_str());
+
+#endif
+
+#if 0
+    stress_test(logger, scope);
+#endif
+
+
+
+#if 0
+    {
+        MockDevice device(GlobalThreadPools::unlimited_normal());
+
+        ReliableStreamConnection connection(
+            &scope,
+            logger, true,
+            GlobalThreadPools::unlimited_realtime(),
+            device,
+            100ms,
+            &device.print_lock()
+        );
+
+        connection.reset();
+
+        connection.send_request(PABB2_CONNECTION_OPCODE_ASK_VERSION);
+        connection.wait_for_pending();
+
+        connection.send_request(PABB2_CONNECTION_OPCODE_ASK_PACKET_SIZE);
+        connection.wait_for_pending();
+
+        connection.send_request(PABB2_CONNECTION_OPCODE_ASK_BUFFER_SLOTS);
+        connection.wait_for_pending();
+
+
+        connection.send("asdf", 4); device.push_expected_stream_data("asdf", 4);
+        connection.send("qwer", 4); device.push_expected_stream_data("qwer", 4);
+        connection.send("zxcv", 4); device.push_expected_stream_data("zxcv", 4);
+        connection.wait_for_pending();
+
+        {
+            std::lock_guard<Mutex> lg(device.print_lock());
+            cout << "sent = " << connection.send("0123456789abcdef", 16) << endl;
+        }
+        device.push_expected_stream_data("0123456789abcdef", 16);
+//        connection.send("0123456789abcdef", 16);
+//        connection.send("0123456789abcdef", 16);
+//        connection.send("0123456789abcdef", 16);
+
+        while (connection.pending() != 0 || device.verify_stream_data()){
+        }
+
+        connection.wait_for_pending();
+
+        {
+            std::lock_guard<Mutex> lg(device.print_lock());
+            cout << "============> Done" << endl;
+        }
+        device.verify_stream_data();
+
+        connection.print();
+        device.print();
+
+        {
+            std::lock_guard<Mutex> lg(device.print_lock());
+            cout << "============> Finishing up" << endl;
+        }
+        scope.wait_for(5s);
+        device.verify_stream_data();
+
+        scope.wait_for(60s);
+    }
+#endif
+
+
+
+#if 0
+    {
+        CommandQueue queue;
+
+        queue.enqueue_command(ControllerCommand{
+            .seqnum = 10,
+            .milliseconds = 1000,
+            .state = ControllerState{
+                .buttons = 123,
+            }
+        });
+        queue.enqueue_command(ControllerCommand{
+            .seqnum = 11,
+            .milliseconds = 2000,
+            .state = ControllerState{
+                .buttons = 456,
+            }
+        });
+
+        scope.wait_for(60s);
+    }
+#endif
+
+#if 0
+    HeapCircularBuffer<std::string> buffer(10);
+
+    buffer.try_push_back("asdf");
+    buffer.try_push_back("qwer");
+    buffer.try_push_back("zxcv");
+
+    cout << buffer[0] << endl;
+    cout << buffer[1] << endl;
+    cout << buffer[2] << endl;
+    cout << "--------------------" << endl;
+    buffer.pop_front();
+    cout << buffer[0] << endl;
+    cout << buffer[1] << endl;
+#endif
+
+#if 0
+    Command command{
+        123,
+        100,
+        512,
+        2000, 3000,
+        4000, 5000
+    };
+
+    char str[65] = {};
+    command.write_to_hex(str);
+    cout << str << endl;
+    memset(&command, 0, sizeof(Command));
+
+    command.parse_from_hex(str);
+
+    cout << command.milliseconds << endl;
+    cout << command.buttons << endl;
+    cout << command.left_joystick_x << endl;
+    cout << command.left_joystick_y << endl;
+    cout << command.right_joystick_x << endl;
+    cout << command.right_joystick_y << endl;
+#endif
+
+#if 0
+    ImageRGB32 image("20250503-121259857603.png");
+
+    image = filter_rgb32_euclidean(image, (uint32_t)COLOR_PURPLE, 100, COLOR_RED, true);
+    image.save("temp.png");
+#endif
+
+
+
+
+#if 0
+    uint8_t address[] = {0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc};
+
+    std::string str = write_MAC_address(6, address);
+    cout << str << endl;
+
+    parse_MAC_address(6, address, str);
+    str = write_MAC_address(6, address);
+    cout << str << endl;
+#endif
+
+#if 0
+    SparseArray data{
+        {100, "0123456789"},
+        {120, {'a', 0x20, 'd'}},
+    };
+//    data.set_data(100, "0123456789", 10);
+//    data.set_data(120, "asdfzxcv", 8);
+
+    cout << data.dump() << endl;
+//    data.set_data(110, 12, "qwerqwerqwer");
+
+    std::string read(12, '?');
+    data.read(109, 12, read.data());
+
+    cout << "read = " << read << endl;
+
+//    data.print();
+
+
+#if 0
+    ClientSocket socket;
+    socket.connect("192.168.1.66", 6000);
+//    socket.connect("192.168.1.66", 6000);
+
+    scope.wait_for(std::chrono::seconds(60));
+#endif
+
+#endif
+
+
+#if 0
+    int* ptr = nullptr;
+    cout << ptr[0] << endl;
+#endif
+
+#if 0
+    {
+        CircularBuffer<CheckedObject<std::string>> buffer(4);
+
+        cout << "Dumping:" << endl;
+        for (size_t c = 0; c < buffer.size(); c++){
+            cout << "    " << buffer[c] << endl;
+        }
+
+        buffer.push_back("123");
+        buffer.push_back("456");
+        buffer.push_back("789");
+
+
+        cout << "Dumping:" << endl;
+        for (size_t c = 0; c < buffer.size(); c++){
+            cout << "    " << buffer[c] << endl;
+        }
+
+        buffer.pop_front();
+
+        cout << "Dumping:" << endl;
+        for (size_t c = 0; c < buffer.size(); c++){
+            cout << "    " << buffer[c] << endl;
+        }
+
+        buffer.push_back("asd");
+        buffer.push_back("sdf");
+
+        cout << "Dumping:" << endl;
+        for (size_t c = 0; c < buffer.size(); c++){
+            cout << "    " << buffer[c] << endl;
+        }
+
+        cout << "Instances = " << CheckedObject<std::string>::instances() << endl;
+    }
+    cout << "Instances = " << CheckedObject<std::string>::instances() << endl;
+#endif
+
+
+
+#if 0
+    send_program_notification_with_file(
+        env, NOTIFICATION_PROGRAM_FINISH, COLOR_BLUE,
+        "test notification",
+        {},
+        "",
+        "test.txt"
+    );
+#endif
+
+
+//    ImageRGB32 image("Screenshots/20241128-152424608121.png");
+#if 0
+    send_error_report(
+        env.logger(),
+        env.program_info(),
+        "testtest",
+        {{"title", "message"}},
+        image,
+//        ImageRGB32(),
+        {"test.txt", "test2.txt"}
+    );
+#endif
+
+
+#if 0
+    std::random_device rndsource;
+    std::minstd_rand rndgen(rndsource());
+    std::uniform_real_distribution<double> dist(0, 1.0);
+
+    cout << dist(rndgen) << endl;
+    cout << dist(rndgen) << endl;
+    cout << dist(rndgen) << endl;
+    cout << dist(rndgen) << endl;
+#endif
+
+#if 0
+    PokemonSV::DateSeed data = PokemonSV::ItemPrinter::calculate_seed_prizes(2346161588);
+
+    cout << "Regular:" << endl;
+    for (auto& item : data.regular){
+        cout << "    " << item << endl;
+    }
+
+    cout << "Item Bonus:" << endl;
+    for (auto& item : data.item_bonus){
+        cout << "    " << item << endl;
+    }
+
+    cout << "Ball Bonus:" << endl;
+    for (auto& item : data.ball_bonus){
+        cout << "    " << item << endl;
+    }
+#endif
+
+
+//    make_item_prize_table();
+//    make_ball_prize_table();
+
+#if 0
+    {
+        std::string path = "PokemonSV/ItemPrinterItems.json";
+        JsonValue json = load_json_file(RESOURCE_PATH() + path);
+        const JsonArray& array = json
+            .to_object_throw(path)
+            .get_array_throw("Table", path);
+        make_prize_table(array, path, 10001);
+    }
+#endif
+
+//    make_prize_table(, 10001);
+
+
+#if 0
+    JsonValue json = load_json_file("ItemPrinterOCR.json");
+    JsonObject& obj = json.get_object_throw();
+    JsonObject& jpn0 = obj.get_object_throw("jpn");
+    JsonObject& jpn1 = obj.get_object_throw("jpn-t");
+
+    for (auto& item : jpn0){
+        cout << "testing: " << item.first << endl;
+        auto iter = jpn1.find(item.first);
+        if (iter == jpn1.end()){
+            throw "missing name";
+        }
+        JsonArray& arr0 = item.second.get_array_throw();
+        JsonArray& arr1 = iter->second.get_array_throw();
+        if (arr0[0].get_string_throw() != arr1[0].get_string_throw()){
+            cout << "mismatch found: " << arr0[0].get_string_throw() << " : " << arr1[0].get_string_throw() << endl;
+        }
+    }
+    #endif
+
+
+
+#if 0
+    ImageRGB32 image("screenshot-20240605-000823122811.png");
+
+    PokemonSwSh::MaxLairInternal::PokemonSelectMenuDetector detector(false);
+    cout << detector.detect(image) << endl;
+
+//    BattleMenuDetector detector;
+//    cout << detector.detect(image) << endl;
+#endif
+
+
+#if 0
+    ImageRGB32 image("20231120-221849973351.png");
+
+
+    PokemonBDSP::ShinySparkleSetBDSP detector;
+
+    ImageViewRGB32 wild = extract_box_reference(image, ImageFloatBox{0.4, 0.02, 0.60, 0.93});
+    ImageViewRGB32 self = extract_box_reference(image, ImageFloatBox{0.0, 0.1, 0.8, 0.8});
+
+    wild.save("wild.png");
+    wild.save("self.png");
+
+    detector.read_from_image(wild);
+    cout << detector.to_str() << endl;
+
+    detector.read_from_image(self);
+    cout << detector.to_str() << endl;
+#endif
+
+
+//    ImageRGB32 image("screenshot-20231016-130205783594.png");
+//    PokemonSummaryDetector detector;
+//    cout << detector.detect(image) << endl;
+
+
+
+#if 0
+    ImageRGB32 image("screenshot-20231005-203932147068.png");
+    SummaryStatsReader reader;
+//    cout << detector.detect(image) << endl;
+    auto nature = reader.read_nature(env.logger(), image);
+
+    cout << (int)nature.attack << endl;
+    cout << (int)nature.defense << endl;
+    cout << (int)nature.spatk << endl;
+    cout << (int)nature.spdef << endl;
+    cout << (int)nature.speed << endl;
+#endif
+
+
+
+#if 0
+    uint8_t low_iv;
+    uint8_t high_iv;
+
+    bool ok = calc_iv_range(
+        low_iv, high_iv,
+        false, 55, 100, 0,
+        126, NatureAdjustment::NEGATIVE
+    );
+
+    cout << "ok   = " << ok << endl;
+    cout << "low  = " << (int)low_iv << endl;
+    cout << "high = " << (int)high_iv << endl;
+#endif
+
+
+
+
+//    ImageRGB32 image("screenshot-20230912-194941389243.png");
+//    NintendoSwitch::PokemonSV::PokemonSummaryDetector detector;
+//    cout << detector.detect(image) << endl;
+
+
+#if 0
+    ImageRGB32 image("20230726-213101330270-ProgramHang.png");
+    NintendoSwitch::PokemonSwSh::MaxLairInternal::BattleMenuDetector detector;
+    cout << detector.detect(image) << endl;
+#endif
+
+//    SandwichRecipeNumberDetector detector(env.logger());
+//    size_t recipe_IDs[6];
+//    detector.detect_recipes(image, recipe_IDs);
+
+#if 0
     {
         ImageRGB32 image("20230630-084354220241.jpg");
         TeraLobbyReader reader(env.logger(), env.inference_dispatcher());
@@ -232,12 +1155,12 @@ void TestProgramComputer::program(ProgramEnvironment& env, CancellableScope& sco
         ImageRGB32 image("name1.png");
         cout << OCR::ocr_read(Language::Japanese, image) << endl;
     }
-
+#endif
 
 
 //    ImageRGB32 image("20230427-200550386826-OperationFailedException.png");
 
-//    NintendoSwitch::HomeDetector detector;
+//    NintendoSwitch::HomeMenuDetector detector;
 //    cout << detector.detect(image) << endl;
 
 
@@ -340,8 +1263,8 @@ void TestProgramComputer::program(ProgramEnvironment& env, CancellableScope& sco
     OCR::read_number(env.logger(), filtered);
 #endif
 
-//    throw OperationFailedException(env.logger(), "asdf");
-//    throw OperationFailedException(env.logger(), "asdf", std::make_shared<ImageRGB32>("20221118-024539201323.jpg"));
+//    OperationFailedExceptionWithScreenshot::fire(env.logger(), "asdf");
+//    OperationFailedExceptionWithScreenshot::fire(env.logger(), "asdf", std::make_shared<ImageRGB32>("20221118-024539201323.jpg"));
 //    throw ProgramFinishedException();
 //    throw FatalProgramException(env.logger(), "test");
 
@@ -1017,82 +1940,8 @@ void TestProgramComputer::program(ProgramEnvironment& env, CancellableScope& sco
     select_move(env.logger(), state, 1);
 #endif
 
-#if 0
-    using namespace nlohmann;
-
-    json j2 = {
-      {"pi", 3.141},
-      {"happy", true},
-      {"name", "Niels"},
-      {"nothing", nullptr},
-      {"answer", {
-        {"everything", 42}
-      }},
-      {"list", {1, 0, 2}},
-      {"object", {
-        {"currency", "USD"},
-        {"value", 42.99}
-      }}
-    };
-
-//    cout << "str = " << 123 << endl;
-//    std::string str = j2.get<std::string>();
-//    cout << "str = " << str << endl;
-
-    cout << json((int8_t)1).dump() << endl;
-    cout << json((int16_t)1).dump() << endl;
-    cout << json((int32_t)1).dump() << endl;
-    cout << json((int64_t)1).dump() << endl;
-
-    {
-        cout << j2.dump() << endl;
-        JsonValue2 value = from_nlohmann(j2);
-        json j3 = to_nlohmann(value);
-        cout << j3.dump() << endl;
-    }
-    QJsonObject obj = QJsonDocument::fromJson(j2.dump().c_str()).object();
-    {
-        cout << j2.dump() << endl;
-        JsonValue2 value = from_QJson(obj);
-        QJsonValue obj2 = to_QJson(value);
-//        cout << QJson_to_nlohmann(obj2).dump() << endl;
-    }
-
-//    cout << QDir::current().relativeFilePath(RESOURCE_PATH()).toStdString() << endl;
-#endif
-
-#if 0
-    std::string str;
-
-
-    cout << j2.dump(4) << endl;
-
-    json j3 = "asdf";
-    cout << j3.dump(4) << endl;
-
-    QJsonDocument doc(QJsonDocument::fromJson("asdf"));
-    cout << doc.toJson().data() << endl;
-#endif
-
-#if 0
-    int16_t in[4] = {1, 1, 2, -2};
-    print_u8((uint8_t*)in, 8);
-
 
 
-    AudioSourceReader reader(AudioSampleFormat::SINT16, 1, false);
-    AudioListener listener(1);
-    reader += listener;
-
-
-//    reader.push_bytes(in, 8);
-    reader.push_bytes((char*)in + 0, 5);
-    reader.push_bytes((char*)in + 5, 3);
-#endif
-
-
-
-//    AudioStreamReader2 reader(2, AudioSampleFormat::SINT16);
 
 
 
@@ -1118,23 +1967,6 @@ void TestProgramComputer::program(ProgramEnvironment& env, CancellableScope& sco
 //    cout << reader.dump() << endl;
 #endif
 
-#if 0
-    float f[10];
-    uint8_t i[10] = {};
-    i[0] = 1;
-    i[1] = 255;
-    i[2] = 0;
-    i[3] = 123;
-    i[9] = 123;
-
-    Kernels::AudioStreamConversion::convert_audio_uint8_to_float(f, i, 10);
-    print(f, 10);
-    memset(i, 0, sizeof(i));
-    Kernels::AudioStreamConversion::convert_audio_float_to_uint8(i, f, 10);
-    print_u8(i, 10);
-#endif
-
-
 #if 0
     union{
         float f32;
diff --git a/SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramComputer.h b/SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramComputer.h
index c8dbca21fc..0e4c17cb6d 100644
--- a/SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramComputer.h
+++ b/SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramComputer.h
@@ -1,6 +1,6 @@
 /*  Test Program (Computer)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -8,7 +8,9 @@
 #define PokemonAutomation_Computer_TestProgram_H
 
 #include "Common/Cpp/Options/StaticTextOption.h"
-#include "CommonFramework/Options/ScreenWatchOption.h"
+#include "Common/Cpp/Options/StringOption.h"
+#include "Common/Cpp/Options/MacAddressOption.h"
+#include "CommonTools/Options/ScreenWatchOption.h"
 #include "ComputerPrograms/ComputerProgram.h"
 
 namespace PokemonAutomation{
@@ -23,13 +25,17 @@ class TestProgramComputer_Descriptor : public ComputerProgramDescriptor{
 
 class TestProgramComputer : public ComputerProgramInstance{
 public:
+    using Descriptor = TestProgramComputer_Descriptor;
     TestProgramComputer();
 
     virtual void program(ProgramEnvironment& env, CancellableScope& scope) override;
 
 private:
     StaticTextOption STATIC_TEXT;
+    StringOption IMAGE_PATH;
+    StringOption INPUT_TEXT;
     ScreenWatchOption SCREEN_WATCHER;
+    MacAddressCell MAC_ADDRESS;
 };
 
 
diff --git a/SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramSwitch.cpp b/SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramSwitch.cpp
index 06376e0b21..494cbd21b4 100644
--- a/SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramSwitch.cpp
+++ b/SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramSwitch.cpp
@@ -1,164 +1,185 @@
 /*  Test Program (Switch)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include "TestProgramSwitch.h"
+#include <iostream>
 
 //#include <immintrin.h>
-#include <QApplication>
-#include <QClipboard>
 #include "Common/Cpp/Exceptions.h"
-#include "Common/Cpp/PrettyPrint.h"
 #include "Common/Cpp/Containers/FixedLimitVector.tpp"
-#include "Common/Cpp/Concurrency/AsyncDispatcher.h"
-#include "Common/Cpp/Concurrency/PeriodicScheduler.h"
-#include "ClientSource/Connection/BotBase.h"
-#include "CommonFramework/Exceptions/OperationFailedException.h"
-#include "CommonFramework/InferenceInfra/InferenceSession.h"
-#include "CommonFramework/OCR/OCR_RawOCR.h"
-#include "PokemonLA/Inference/PokemonLA_MountDetector.h"
-#include "CommonFramework/InferenceInfra/VisualInferencePivot.h"
-#include "PokemonBDSP/Inference/BoxSystem/PokemonBDSP_IVCheckerReader.h"
-#include "PokemonBDSP/Inference/Battles/PokemonBDSP_BattleBallReader.h"
-#include "PokemonLA/Programs/PokemonLA_LeapPokemonActions.h"
-#include "PokemonLA/Inference/PokemonLA_OverworldDetector.h"
-#include "PokemonLA/Inference/Objects/PokemonLA_FlagTracker.h"
-#include "PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_BattleMenu.h"
-#include "PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxGenderDetector.h"
-#include "CommonFramework/ImageTools/SolidColorTest.h"
-#include "PokemonBDSP/Inference/Battles/PokemonBDSP_BattleMenuDetector.h"
-#include "PokemonLA/Inference/Map/PokemonLA_MapZoomLevelReader.h"
-#include "PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonSwapMenu.h"
-#include "CommonFramework/Inference/FrozenImageDetector.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
-#include "PokemonSwSh/Inference/Battles/PokemonSwSh_BattleMenuDetector.h"
-#include "PokemonLA/Inference/Objects/PokemonLA_ShinySymbolDetector.h"
-#include "PokemonLA/Inference/Battles/PokemonLA_BattleMenuDetector.h"
-#include "PokemonSwSh/Inference/PokemonSwSh_SummaryShinySymbolDetector.h"
-#include "CommonFramework/ImageTools/ImageFilter.h"
-#include "CommonFramework/ImageMatch/ImageDiff.h"
-#include "CommonFramework/OCR/OCR_NumberReader.h"
-#include "NintendoSwitch/Inference/NintendoSwitch_DetectHome.h"
-#include "PokemonLA/Inference/Objects/PokemonLA_FlagTracker.h"
-#include "CommonFramework/ImageTools/BinaryImage_FilterRgb32.h"
+#include "Common/Cpp/Concurrency/BusyPeriodicRunner.h"
+#include "Common/Cpp/Options/CheckboxDropdownDatabase.h"
+#include "Common/Cpp/Options/CheckboxDropdownOption.tpp"
+#include "Common/PABotBase2/ReliableConnectionLayer/PABotBase2_PacketSender.h"
+#include "Common/PABotBase2/ReliableConnectionLayer/PABotBase2CC_ReliableStreamConnection.h"
+#include "Common/Cpp/StreamConnections/MockDevice.h"
 #include "Kernels/Waterfill/Kernels_Waterfill.h"
 #include "Kernels/Waterfill/Kernels_Waterfill_Session.h"
-#include "PokemonSV/Inference/PokemonSV_WhiteButtonDetector.h"
-#include "PokemonSV/Inference/Dialogs/PokemonSV_DialogArrowDetector.h"
-#include "PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h"
-#include "PokemonSV/Inference/Dialogs/PokemonSV_GradientArrowDetector.h"
-#include "PokemonSwSh/Inference/PokemonSwSh_MarkFinder.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_ScalarButtons.h"
-#include "NintendoSwitch/NintendoSwitch_Settings.h"
-#include "NintendoSwitch/Inference/NintendoSwitch_DateReader.h"
-#include "NintendoSwitch/Programs/NintendoSwitch_FastCodeEntry.h"
-#include "PokemonSV/PokemonSV_Settings.h"
-#include "PokemonLA/Programs/PokemonLA_GameEntry.h"
-#include "PokemonSV/Programs/PokemonSV_GameEntry.h"
-#include "PokemonSV/Programs/PokemonSV_Navigation.h"
-#include "PokemonSV/Programs/PokemonSV_BasicCatcher.h"
-#include "PokemonSwSh/Inference/PokemonSwSh_YCommDetector.h"
-#include "PokemonSV/Inference/Tera/PokemonSV_TeraCardDetector.h"
-#include "PokemonSV/Inference/PokemonSV_PokemonSummaryReader.h"
-#include "PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.h"
-#include "PokemonSV/Inference/Battles/PokemonSV_PostCatchDetector.h"
-#include "PokemonSV/Inference/Battles/PokemonSV_BattleBallReader.h"
-#include "PokemonSV/Inference/PokemonSV_MainMenuDetector.h"
-#include "PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h"
-#include "PokemonSV/Inference/Boxes/PokemonSV_BoxDetection.h"
-#include "PokemonSV/Programs/Trading/PokemonSV_TradeRoutines.h"
-#include "CommonFramework/Notifications/ProgramNotifications.h"
-#include "CommonFramework/Tools/InterruptableCommands.h"
-#include "PokemonSV/Programs/Boxes/PokemonSV_BoxRoutines.h"
-#include "PokemonSV/Programs/Eggs/PokemonSV_EggRoutines.h"
+#include "CommonFramework/StaticGlobals.h"
+#include "CommonFramework/GlobalSettingsPanel.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
 #include "CommonFramework/Tools/ErrorDumper.h"
-#include "PokemonSV/Inference/PokemonSV_PokePortalDetector.h"
-#include "PokemonSV/Inference/Tera/PokemonSV_TeraRaidSearchDetector.h"
-#include "PokemonSV/Programs/TeraRaids/PokemonSV_TeraRoutines.h"
-#include "PokemonSV/Programs/FastCodeEntry/PokemonSV_CodeEntry.h"
-#include "PokemonSV/Inference/Overworld/PokemonSV_AreaZeroSkyDetector.h"
-#include "CommonFramework/Inference/AudioPerSpectrumDetectorBase.h"
-#include "CommonFramework/Inference/SpectrogramMatcher.h"
-#include "CommonFramework/Inference/AudioTemplateCache.h"
-#include "PokemonSV/Inference/Battles/PokemonSV_EncounterWatcher.h"
-#include "PokemonSV/Inference/Overworld/PokemonSV_LetsGoKillDetector.h"
 #include "CommonFramework/Exceptions/ProgramFinishedException.h"
-#include "CommonFramework/Inference/BlackScreenDetector.h"
-#include "PokemonSV/Inference/PokemonSV_ZeroGateWarpPromptDetector.h"
-#include "PokemonSV/Programs/ShinyHunting/PokemonSV_AreaZeroPlatform.h"
-#include "PokemonSV/Inference/PokemonSV_SweatBubbleDetector.h"
-#include "PokemonSV/Programs/PokemonSV_AreaZero.h"
-#include "PokemonSV/Programs/PokemonSV_Battles.h"
-#include "PokemonSV/Programs/PokemonSV_SaveGame.h"
-#include "PokemonSV/Inference/Battles/PokemonSV_NormalBattleMenus.h"
-#include "PokemonSV/Inference/Battles/PokemonSV_TeraBattleMenus.h"
-#include "PokemonSV/Inference/Picnics/PokemonSV_SandwichIngredientDetector.h"
-#include "PokemonSV/Programs/Sandwiches/PokemonSV_IngredientSession.h"
-#include "PokemonSV/Resources/PokemonSV_Ingredients.h"
-#include "PokemonSwSh/Inference/Battles/PokemonSwSh_BattleBallReader.h"
-#include "PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathSelect.h"
-#include "PokemonSV/Programs/PokemonSV_ConnectToInternet.h"
-
-
-
-#include <QPixmap>
-#include <QVideoFrame>
+#include "CommonFramework/ErrorReports/ErrorReports.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "CommonTools/OCR/OCR_NumberReader.h"
+#include "CommonTools/Images/ImageFilter.h"
+#include "CommonTools/Images/BinaryImage_FilterRgb32.h"
+#include "CommonTools/Async/InterruptableCommands.h"
+#include "CommonTools/OCR/OCR_Routines.h"
+#include "CommonTools/Images/ImageTools.h"
+#include "Controllers/RumbleListener.h"
+#include "NintendoSwitch/Inference/NintendoSwitch_CheckOnlineDetector.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManip.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "NintendoSwitch/Inference/NintendoSwitch_CloseGameDetector.h"
+#include "NintendoSwitch/Inference/NintendoSwitch_UpdatePopupDetector.h"
+#include "PokemonBDSP/Inference/BoxSystem/PokemonBDSP_IvJudgeReader.h"
+#include "PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxGenderDetector.h"
+#include "PokemonBDSP/Inference/Battles/PokemonBDSP_BattleMenuDetector.h"
+#include "PokemonBDSP/Inference/PokemonBDSP_SelectionArrow.h"
+#include "PokemonBDSP/Inference/Battles/PokemonBDSP_ExperienceGainDetector.h"
+#include "VideoGames/PokemonLGPE/Inference/Battles/PokemonLGPE_BattleArrowDetector.h"
+#include "VideoGames/PokemonLGPE/Inference/Battles/PokemonLGPE_BattleArrowDetector.h"
+#include "VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_BattleMenu.h"
+#include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_SummaryShinySymbolDetector.h"
+#include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_YCommDetector.h"
+#include "VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleBallReader.h"
+#include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_IvJudgeReader.h"
+#include "VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_BattleMenu.h"
+#include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_SelectionArrowFinder.h"
+#include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_MainMenuDetector.h"
+#include "VideoGames/PokemonLA/Inference/PokemonLA_MountDetector.h"
+//#include "CommonFramework/Environment/SystemSleep.h"
+#include "VideoGames/PokemonLA/Inference/Map/PokemonLA_MapZoomLevelReader.h"
+#include "VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattleMenuDetector.h"
+//#include "VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleMenuDetector.h"
+#include "VideoGames/PokemonLA/Programs/PokemonLA_GameEntry.h"
+#include "VideoGames/PokemonLA/Inference/PokemonLA_DialogDetector.h"
+#include "VideoGames/PokemonLA/Programs/PokemonLA_GameSave.h"
+#include "VideoGames/PokemonLA/Inference/Objects/PokemonLA_MMOQuestionMarkDetector.h"
+#include "VideoGames/PokemonLA/Inference/Map/PokemonLA_SelectedRegionDetector.h"
+#include "VideoGames/PokemonSV/Inference/PokemonSV_WhiteButtonDetector.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h"
+#include "VideoGames/PokemonSV/Inference/PokemonSV_PokemonSummaryReader.h"
+#include "VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxDetection.h"
+#include "VideoGames/PokemonSV/Programs/Eggs/PokemonSV_EggRoutines.h"
+#include "VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_TeraRoutines.h"
+#include "VideoGames/PokemonSV/Programs/FastCodeEntry/PokemonSV_CodeEntry.h"
+#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_AreaZeroSkyDetector.h"
+#include "VideoGames/PokemonSV/Inference/Battles/PokemonSV_EncounterWatcher.h"
+#include "VideoGames/PokemonSV/Inference/PokemonSV_StatHexagonReader.h"
+#include "VideoGames/PokemonSV/Inference/PokemonSV_PokemonSummaryReader.h"
+#include "VideoGames/PokemonSV/Inference/ItemPrinter/PokemonSV_ItemPrinterPrizeReader.h"
+//#include "Integrations/PybindSwitchController.h"
+#include "VideoGames/PokemonSV/Inference/ItemPrinter/PokemonSV_ItemPrinterJobsDetector.h"
+#include "VideoGames/PokemonSV/Inference/ItemPrinter/PokemonSV_ItemPrinterMaterialDetector.h"
+#include "VideoGames/PokemonSV/Programs/Farming/PokemonSV_MaterialFarmerTools.h"
+#include "VideoGames/PokemonSV/Inference/PokemonSV_PokemonMovesReader.h"
+#include "VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_MenuOption.h"
+#include "VideoGames/PokemonLZA/Inference/PokemonLZA_DialogDetector.h"
+#include "VideoGames/PokemonLZA/Programs/PokemonLZA_GameEntry.h"
+#include "VideoGames/PokemonLZA/Programs/PokemonLZA_BasicNavigation.h"
+#include "VideoGames/PokemonLZA/Inference/Battles/PokemonLZA_RunFromBattleDetector.h"
+#include "VideoGames/PokemonLZA/Inference/Map/PokemonLZA_MapIconDetector.h"
+#include "VideoGames/PokemonLZA/Inference/Map/PokemonLZA_MapDetector.h"
+#include "VideoGames/PokemonLZA/Inference/Boxes/PokemonLZA_BoxDetection.h"
+
+//#include "Kernels/Kernels_x64_AVX512.h"
+//#include "Kernels/AbsFFT/Kernels_AbsFFT_BaseTransform_x86_AVX512.h"
+
+
+#include "VideoGames/PokemonLZA/Inference/PokemonLZA_WeatherDetector.h"
+#include "VideoGames/PokemonFRLG/Inference/PokemonFRLG_BattleSelectionArrowDetector.h"
 
 //#include <Windows.h>
-#include <iostream>
+#include "TestProgramSwitch.h"
+
 using std::cout;
 using std::endl;
 
-
 using namespace PokemonAutomation::Kernels;
 using namespace PokemonAutomation::Kernels::Waterfill;
 
 
 
+
 namespace PokemonAutomation{
-namespace NintendoSwitch{
 
 
-StringSelectDatabase make_database(){
-    StringSelectDatabase ret;
-    for (size_t c = 0; c < 1000; c++){
-        ret.add_entry(StringSelectEntry("slug" + std::to_string(c), "Display " + std::to_string(c)));
-    }
-    return ret;
-}
-const StringSelectDatabase& test_database(){
-    static StringSelectDatabase database = make_database();
-    return database;
+
+
+
+
+
+
+
+
 }
 
 
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+
+const CheckboxDropdownDatabase<Button>& ProController_Button_Database();
+const EnumDropdownDatabase<DpadPosition>& ProController_Dpad_Database();
+
+
+
+
 TestProgram_Descriptor::TestProgram_Descriptor()
     : MultiSwitchProgramDescriptor(
         "NintendoSwitch:TestProgram",
         "Nintendo Switch", "Test Program (Switch)",
         "",
         "Test Program (Switch)",
+        PanelQualityStanding::DEVELOPER,
+        ProgramControllerClass::StandardController_NoRestrictions,
         FeedbackType::OPTIONAL_,
         AllowCommandsWhenRunning::ENABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB,
         1, 4, 1
     )
 {}
 
 
+TestProgram::~TestProgram(){
+    BUTTON1.remove_listener(*this);
+    BUTTON0.remove_listener(*this);
+}
 TestProgram::TestProgram()
-    : LANGUAGE(
+    : BUTTON0(
+        "Button Text 0", 0, 16
+    )
+    , BUTTON1(
+        "<b>Button Label:</b><br><font color=\"red\">asdfasdfasdf</font>",
+        "Button Text 1", 0, 16
+    )
+    , LANGUAGE(
         "<b>OCR Language:</b>",
-        { Language::English },
-        LockWhileRunning::LOCKED,
+        PokemonSwSh::IV_READER().languages(),
+        LockMode::LOCK_WHILE_RUNNING,
         false
     )
+    , IMAGE_PATH(false, "Path to image for testing", LockMode::UNLOCK_WHILE_RUNNING, "default.png", "default.png")
+    , FLOAT("Float option:", LockMode::UNLOCK_WHILE_RUNNING, 0) 
     , STATIC_TEXT("Test text...")
-    , SELECT("String Select", test_database(), LockWhileRunning::LOCKED, 0)
-    , PLAYER_LIST("Test Table", LockWhileRunning::UNLOCKED, "Notes")
+    , BOX("Box", LockMode::UNLOCK_WHILE_RUNNING, 0, 0, 1, 1)
+    , BUTTONS("Buttons", ProController_Button_Database(), LockMode::UNLOCK_WHILE_RUNNING, BUTTON_NONE)
+    , DPAD(ProController_Dpad_Database(), LockMode::UNLOCK_WHILE_RUNNING, DPAD_NONE)
+    , COMMANDS(
+        "Command Schedule:",
+        {
+            ControllerClass::NintendoSwitch_ProController,
+            ControllerClass::NintendoSwitch_LeftJoycon,
+            ControllerClass::NintendoSwitch_RightJoycon,
+        }
+    )
     , NOTIFICATION_TEST("Test", true, true, ImageAttachmentMode::JPG)
     , NOTIFICATIONS({
         &NOTIFICATION_TEST,
@@ -166,56 +187,52 @@ TestProgram::TestProgram()
         &NOTIFICATION_ERROR_FATAL,
     })
 {
+    PA_ADD_OPTION(BUTTON0);
+    PA_ADD_OPTION(BUTTON1);
     PA_ADD_OPTION(LANGUAGE);
+//    PA_ADD_OPTION(CONSOLE_MODEL);
+    PA_ADD_OPTION(IMAGE_PATH);
+    PA_ADD_OPTION(FLOAT);
     PA_ADD_OPTION(STATIC_TEXT);
-    PA_ADD_OPTION(SELECT);
-    PA_ADD_OPTION(PLAYER_LIST);
+    PA_ADD_OPTION(BOX);
+    PA_ADD_OPTION(BUTTONS);
+    PA_ADD_OPTION(DPAD);
+    PA_ADD_OPTION(COMMANDS);
+//    PA_ADD_OPTION(battle_AI);
     PA_ADD_OPTION(NOTIFICATIONS);
+    BUTTON0.add_listener(*this);
+    BUTTON1.add_listener(*this);
 }
 
 
 //using namespace Kernels;
 using namespace Kernels::Waterfill;
+using namespace PABotBase2;
 
-using namespace PokemonSV;
 
 
+void TestProgram::on_press(ButtonCell& button){
+    global_logger_tagged().log("Button Pressed");
+//    BUTTON.set_enabled(false);
+    BUTTON0.set_text("Button Pressed");
+    BUTTON1.set_text("Button Pressed");
+}
 
-class NewsDetector : public StaticScreenDetector{
-public:
-    NewsDetector(Color color = COLOR_RED);
 
-    virtual void make_overlays(VideoOverlaySet& items) const override;
-    virtual bool detect(const ImageViewRGB32& screen) const override;
 
-private:
-    Color m_color;
-    ImageFloatBox m_bottom_white;
-    ImageFloatBox m_bottom_buttons;
+
+
+class DialogArrowMatcher : public ImageMatch::WaterfillTemplateMatcher{
+public:
+    DialogArrowMatcher()
+        : WaterfillTemplateMatcher("test.png", Color(0xffc0c0c0), Color(0xffffffff), 100)
+    {}
+
 };
-NewsDetector::NewsDetector(Color color)
-    : m_color(color)
-    , m_bottom_white(0.15, 0.92, 0.20, 0.06)
-    , m_bottom_buttons(0.40, 0.92, 0.58, 0.06)
-{}
-void NewsDetector::make_overlays(VideoOverlaySet& items) const{
-    items.add(m_color, m_bottom_white);
-    items.add(m_color, m_bottom_buttons);
-}
-bool NewsDetector::detect(const ImageViewRGB32& screen) const{
-    ImageStats bottom_white = image_stats(extract_box_reference(screen, m_bottom_white));
-    if (!is_white(bottom_white)){
-        return false;
-    }
 
-    ImageStats bottom_buttons = image_stats(extract_box_reference(screen, m_bottom_buttons));
-//    cout << bottom_buttons.average << bottom_buttons.stddev << endl;
-    if (bottom_buttons.stddev.sum() < 100){
-        return false;
-    }
 
-    return true;
-}
+
+
 
 
 
@@ -229,1076 +246,854 @@ void TestProgram::program(MultiSwitchProgramEnvironment& env, CancellableScope&
 //    using namespace PokemonBDSP;
 //    using namespace PokemonLA;
     using namespace PokemonSV;
+//    using namespace PokemonLZA;
+//    using namespace PokemonFRLG;
 
     [[maybe_unused]] Logger& logger = env.logger();
-    [[maybe_unused]] ConsoleHandle& console = env.consoles[0];
-//    [[maybe_unused]] BotBase& botbase = env.consoles[0];
-    [[maybe_unused]] VideoFeed& feed = env.consoles[0];
-    [[maybe_unused]] VideoOverlay& overlay = env.consoles[0];
-    BotBaseContext context(scope, console.botbase());
+    [[maybe_unused]] ConsoleHandle& console = env.console(0);
+//    [[maybe_unused]] BotBase& botbase = env.console(0);
+    [[maybe_unused]] VideoFeed& feed = env.console(0);
+    [[maybe_unused]] VideoOverlay& overlay = env.console(0);
+//    ProControllerContext context(scope, console.controller<ProController>());
+    // JoyconContext context(scope, console.controller<JoyconController>());
     VideoOverlaySet overlays(overlay);
 
-    NewsDetector detector;
-    detector.make_overlays(overlays);
-
-
-
-//    VideoSnapshot image = feed.snapshot();
-
-//    BoxSelectionBoxModeWatcher watcher;
-//    watcher.process_frame(image, image.timestamp);
-
-//    connect_to_internet_from_overworld(env.program_info(), console, context);
-
-
-
-#if 0
-    MainMenuDetector detector;
-    detector.make_overlays(overlays);
-    detector.move_cursor(env.program_info(), console, context, MenuSide::RIGHT, 6, true);
-#endif
 
 #if 0
-    ImageRGB32 image("20230226-042613391191-PathPartyReader-ReadSprites.png");
-
-    PokemonSwSh::MaxLairInternal::GlobalState state;
-    PokemonSwSh::MaxLairInternal::PathReader reader(overlay, 0);
-    reader.read_sprites(logger, state, image);
-#endif
+    alignas(64) float r[256] = {
+        3, 6, 4, 7, 8, 6, 1, 3, 8, 0, 6, 1, 1, 3, 5, 3, 3, 7, 9, 4, 1, 5, 5, \
+7, 8, 6, 6, 6, 2, 1, 9, 5, 5, 3, 0, 5, 1, 8, 4, 5, 1, 8, 7, 8, 5, 7, \
+7, 5, 4, 9, 3, 3, 8, 7, 7, 9, 3, 1, 7, 9, 7, 3, 9, 8, 8, 7, 2, 3, 7, \
+6, 6, 2, 4, 5, 0, 0, 7, 8, 6, 2, 0, 9, 9, 8, 2, 9, 7, 0, 3, 7, 0, 2, \
+3, 5, 6, 0, 3, 3, 6, 6, 0, 5, 9, 3, 3, 2, 3, 8, 5, 1, 7, 2, 4, 6, 7, \
+1, 8, 1, 2, 4, 4, 9, 4, 5, 2, 0, 4, 7, 1, 7, 6, 4, 9, 3, 4, 9, 9, 2, \
+3, 2, 9, 2, 5, 6, 9, 4, 3, 8, 7, 5, 5, 1, 9, 1, 6, 9, 2, 4, 6, 7, 3, \
+0, 1, 4, 2, 5, 6, 0, 3, 4, 7, 8, 2, 7, 8, 2, 3, 0, 9, 5, 8, 4, 7, 7, \
+3, 2, 9, 7, 3, 5, 5, 8, 8, 3, 1, 1, 1, 1, 4, 8, 2, 2, 2, 4, 7, 3, 9, \
+1, 9, 5, 9, 0, 0, 4, 3, 6, 2, 7, 3, 8, 2, 9, 8, 6, 7, 3, 2, 0, 1, 9, \
+6, 3, 9, 3, 7, 9, 5, 5, 2, 4, 9, 5, 5, 6, 2, 7, 0, 0, 1, 4, 6, 3, 5, \
+0, 4, 6
+    };
+    alignas(64) float i[256] = {
+        1, 1, 3, 2, 4, 1, 6, 1, 4, 3, 0, 9, 6, 4, 8, 8, 8, 9, 9, 2, 8, 1, 2, \
+0, 7, 2, 4, 0, 6, 3, 4, 9, 5, 5, 0, 0, 7, 7, 3, 6, 0, 6, 2, 0, 8, 9, \
+1, 9, 7, 7, 5, 0, 5, 7, 5, 7, 8, 2, 1, 1, 0, 2, 9, 2, 7, 9, 3, 4, 9, \
+6, 6, 7, 1, 8, 4, 9, 9, 1, 6, 3, 7, 8, 6, 0, 5, 3, 0, 7, 1, 6, 7, 5, \
+0, 9, 0, 2, 0, 8, 4, 5, 5, 6, 8, 0, 5, 9, 6, 9, 1, 3, 5, 3, 4, 2, 1, \
+3, 2, 9, 2, 9, 3, 0, 5, 7, 5, 1, 0, 1, 0, 0, 7, 2, 2, 8, 6, 4, 4, 3, \
+2, 1, 7, 4, 0, 1, 9, 8, 6, 9, 5, 5, 7, 4, 2, 7, 0, 6, 5, 3, 0, 9, 5, \
+4, 7, 5, 9, 1, 5, 6, 8, 8, 7, 1, 0, 3, 5, 7, 1, 8, 9, 3, 3, 3, 3, 9, \
+6, 0, 5, 0, 9, 5, 2, 2, 4, 1, 6, 2, 3, 4, 5, 9, 2, 3, 5, 1, 2, 5, 2, \
+7, 4, 1, 0, 2, 5, 9, 9, 1, 3, 2, 5, 4, 1, 4, 6, 4, 4, 7, 7, 1, 1, 6, \
+5, 2, 3, 0, 2, 3, 6, 4, 9, 3, 9, 2, 6, 2, 5, 9, 5, 3, 5, 3, 1, 8, 9, \
+4, 0, 3
+    };
+
+    __m512 T[32];
+    for (size_t c = 0; c < 16; c++){
+        T[2*c + 0] = _mm512_load_ps(r + 16*c);
+        T[2*c + 1] = _mm512_load_ps(i + 16*c);
+    }
 
-//    NintendoSwitch::PokemonSwSh::BattleBallReader reader(console, Language::English);
-//    reader.read_ball(image);
 
+    using namespace Kernels::AbsFFT;
 
+    TwiddleTable<Context_x86_AVX512> table(14);
+    base_transform<>(table, T);
 
-//    basic_catcher(console, context, Language::English, "beast-ball", true);
+    for (size_t c = 0; c < 16; c++){
+        _mm512_store_ps(r + 16*c, T[2*c + 0]);
+        _mm512_store_ps(i + 16*c, T[2*c + 1]);
+    }
 
-#if 0
-    VideoSnapshot image = feed.snapshot();
-    IngredientSession session(env.inference_dispatcher(), console, context, Language::English);
-    session.read_current_page();
+    for (size_t c = 0; c < 256; c++){
+        cout << r[c] << " + " << i[c] << ", ";
+    }
+    cout << endl;
 #endif
 
 
+//    context->run_string_command("100|A");
+//    context->run_string_command("100|LJ:+1:0");
 
-#if 0
-    add_sandwich_ingredients(
-        env.inference_dispatcher(), console, context, Language::English,
-        {
-            {"pickle", 1},
-            {"cucumber", 1},
-            {"tomato", 3},
-        },
-        {
-            {"sour-herba-mystica", 1},
-            {"spicy-herba-mystica", 1},
-        }
-    );
-#endif
+//    console.controller().run_string_command(16ms, "asdf");
 
 
 #if 0
-    IngredientSession session(env.inference_dispatcher(), console, context, Language::English);
-//    basic_catcher(console, context, Language::English, "poke-ball", true);
+    PokemonBDSP::ExperienceGainDetector detector;
+    detector.make_overlays(overlays);
 
 
-#if 0
-    PageIngredients page = session.read_current_page();
-    for (size_t c = 0; c < 10; c++){
-        cout << set_to_str(page.item[c]) << endl;
-    }
-#endif
-
-//    cout << "Found: " << session.move_to_ingredient({"tomato"}) << endl;
-    session.add_ingredients(console, context, {
-        {"pickle", 1},
-        {"cucumber", 1},
-        {"tomato", 3},
-    });
-    pbf_press_button(context, BUTTON_PLUS, 20, 230);
-
-    pbf_press_dpad(context, DPAD_UP, 20, 105);
-    session.add_ingredients(console, context, {
-        {"sour-herba-mystica", 1},
-        {"spicy-herba-mystica", 1},
-    });
-    pbf_press_button(context, BUTTON_PLUS, 20, 230);
+    auto snapshot = feed.snapshot();
+    cout << detector.detect(snapshot) << endl;
 #endif
 
 
 #if 0
-    auto image = feed.snapshot();
+    YCommIconDetector detector(COLOR_RED, true);
+    detector.make_overlays(overlays);
 
-    NormalBattleMenuDetector detector(COLOR_RED);
-    detector.detect_slot(image);
-    detector.move_to_slot(console, context, 0);
+    auto snapshot = feed.snapshot();
+    cout << detector.detect(snapshot) << endl;
 #endif
+    auto snapshot = feed.snapshot();
+#if 1
 
+    using namespace PokemonLZA;
 
+    const bool old_image_template_matching = STATIC_GLOBALS.IMAGE_TEMPLATE_MATCHING;
+    STATIC_GLOBALS.IMAGE_TEMPLATE_MATCHING = true;
+    cout << "Weather detector waterfill debug enabled (dump + stats)." << endl;
 
-//    save_game_from_menu_or_overworld(env.program_info(), console, context, true);
+    const struct {
+        WeatherIconType type;
+        const char* name;
+    } weather[] = {
+        {WeatherIconType::Clear,   "Clear"},
+        {WeatherIconType::Sunny,   "Sunny"},
+        {WeatherIconType::Rain,    "Rain"},
+        {WeatherIconType::Cloudy,  "Cloudy"},
+        {WeatherIconType::Foggy,   "Foggy"},
+        {WeatherIconType::Rainbow, "Rainbow"},
+    };
+    bool weather_detected[sizeof(weather)/sizeof(weather[0])] = {};
 
+    for (size_t i = 0; i < sizeof(weather)/sizeof(weather[0]); i++){
+        const auto& entry = weather[i];
+        WeatherIconDetector detector(entry.type, &overlay);
 
+        detector.make_overlays(overlays);
 
-//    auto_heal_from_menu(env.program_info(), console, context, 0, true);
+        bool detected = detector.detect(snapshot);
+        weather_detected[i] = detected;
 
+        cout << entry.name
+            << ": "
+            << (detected ? "MATCH" : "NO MATCH")
+            << endl;
+    }
 
+    STATIC_GLOBALS.IMAGE_TEMPLATE_MATCHING = old_image_template_matching;
+    cout << "Weather detector waterfill debug restored." << endl;
 
-//    return_to_inside_zero_gate(env.program_info(), console, context);
-//    inside_zero_gate_to_secret_cave_entrance(env.program_info(), console, context);
+    cout << endl;
+    cout << "Weather Summary:" << endl;
+    for (size_t i = 0; i < sizeof(weather)/sizeof(weather[0]); i++){
+        cout << weather[i].name
+            << ": "
+            << (weather_detected[i] ? "MATCH" : "NO MATCH")
+            << endl;
+    }
 
+    scope.wait_for(std::chrono::seconds(30));
+#endif
 
-//    inside_zero_gate_to_station(env.program_info(), console, context, 1, false);
-//    ssf_press_left_joystick(context, 144, 0, 0, 5 * TICKS_PER_SECOND);
-//    pbf_mash_button(context, BUTTON_A, 5 * TICKS_PER_SECOND);
 
-//    pbf_move_left_joystick(context, 96, 255, 5 * TICKS_PER_SECOND, 0);
 
+//    context->issue_gyro_accel_x(&scope, 1000ms, 1000ms, 0ms, 123);
 
 #if 0
-    auto image = feed.snapshot();
+    size_t min_area = 100;
+    std::string path = "test.png";
 
-    NewsDetector detector;
-    cout << detector.detect(image) << endl;
-#endif
+    ImageRGB32 image(path);
 
+    PackedBinaryMatrix matrix = compress_rgb32_to_binary_range(
+        image,
+        0xffc0c0c0, 0xffffffff
+    );
 
+    cout << matrix.dump() << endl;
 
-//    pbf_mash_button(context, BUTTON_ZR, 3 * TICKS_PER_SECOND);
 
-#if 0
-    auto image = feed.snapshot();
-    SweatBubbleDetector detector(COLOR_RED, {0.11, 0.81, 0.06, 0.10});
-    cout << detector.detect(image) << endl;
-#endif
 
+    std::vector<WaterfillObject> objects = find_objects_inplace(matrix, min_area);
+    if (objects.empty()){
+        throw FileException(
+            nullptr, PA_CURRENT_FUNCTION,
+            "Failed to find any waterfill objects in resource template file.",
+            std::move(path)
+        );
+    }
+
+    const WaterfillObject* largest_object = &objects[0];
+    for (const WaterfillObject& object : objects){
+        if (largest_object->area < object.area){
+            largest_object = &object;
+        }
+    }
 
-#if 0
-    NavigatePlatformSettings settings;
 
-    return_to_inside_zero_gate(env.program_info(), console, context);
-    inside_zero_gate_to_platform(env.program_info(), console, context, settings);
+//    ImageRGB32 cropped = extract_box_reference(image, *largest_object).copy();
+    extract_box_reference(image, *largest_object).save("image-cropped.png");
+    filter_by_mask(matrix, image, Color(0), true);
+    extract_box_reference(image, *largest_object).save("image-filtered.png");
 #endif
 
+
 #if 0
-    auto image = feed.snapshot();
 
-    ImageRGB32 filtered = filter_rgb32_range(image, 0xff000040, 0xff8080ff, Color(0xffff0000), true);
-    filtered.save("test.png");
+    PokemonLGPE::BattleArrowDetector detector(COLOR_RED, {0.008121, 0.659091, 0.053364, 0.332645});
+    detector.make_overlays(overlays);
+    while (true){
+//        WallClock timestamp = current_time();
+        scope.wait_for(50ms);
 
-    using namespace Kernels::Waterfill;
+//        cout << detector.detect(feed.snapshot_recent_nonblocking(timestamp)) << endl;
+        cout << detector.detect(feed.snapshot_latest_blocking()) << endl;
+    }
+#endif
 
-    PackedBinaryMatrix matrix = compress_rgb32_to_binary_range(image, 0xff000040, 0xff8080ff);
 
-//    size_t min_width = screen.width() / 4;
-//    size_t min_height = screen.height() / 4;
 
-    WaterfillObject biggest;
-    WaterfillObject object;
+//    OperationFailedExceptionWithScreenshot::fire(ErrorReportMode::SEND_ERROR_REPORT, "asdf", console);
 
-    std::unique_ptr<WaterfillSession> session = make_WaterfillSession(matrix);
-    auto iter = session->make_iterator(10000);
-    while (iter->find_next(object, false)){
-//        if (object.min_y != 0){
-//            continue;
-//        }
-        if (biggest.area < object.area){
-            biggest = std::move(object);
-        }
-    }
 
-    cout << biggest.center_of_gravity_x() / image->width() << ", " << biggest.center_of_gravity_y() / image->height() << endl;
-#endif
+//    SinglesAIOption ai(false);
+//    run_singles_battle(console, context, ai, false);
 
 
-#if 0
-//    pbf_controller_state(context, 0, DPAD_NONE, 192, 255, 116, 128, 3 * TICKS_PER_SECOND);
-    pbf_move_left_joystick(context, 192, 0, 20, 105);
-    pbf_press_button(context, BUTTON_L | BUTTON_PLUS, 20, 105);
 
-    ssf_press_button(context, BUTTON_LCLICK, 0, 500);
-    ssf_press_joystick(context, true, 128, 0, 125, 1250);
+//    menus_to_boxsystem(console, context);
 
-    //  Jump
-    ssf_press_button(context, BUTTON_B, 125, 100);
 
-    //  Fly
-    ssf_press_button(context, BUTTON_B, 0, 50);
 
-    pbf_move_left_joystick(context, 144, 0, 750, 0);
-    pbf_move_left_joystick(context, 128, 0, 1000, 0);
-#endif
 
 #if 0
-    ZeroGateWarpPromptDetector detector;
-    auto image = feed.snapshot();
-    detector.detect(image);
-#endif
-
-
-//    zero_gate_to_platform(env.program_info(), console, context);
+    PokemonSwSh::BoxMenuDetector detector;
+    detector.make_overlays(overlays);
 
 
-#if 0
-    pbf_press_button(context, BUTTON_PLUS, 20, 105);
-    pbf_move_left_joystick(context, 128, 0, 625, 0);
-    ssf_press_button(context, BUTTON_B, 0, 50);
-    pbf_move_left_joystick(context, 128, 0, 250, 0);
-    pbf_move_left_joystick(context, 160, 0, 600, 0);
-    pbf_move_left_joystick(context, 128, 0, 1875, 0);
+    auto snapshot = feed.snapshot();
+    cout << detector.detect(snapshot) << endl;
 #endif
 
 
+
 #if 0
-    EncounterWatcher encounter(console, COLOR_RED);
+    YCommIconDetector detector(COLOR_RED, true);
+    detector.make_overlays(overlays);
 
-    throw ProgramFinishedException(
-        console,
-        "test",
-        encounter.shiny_screenshot()
-    );
+    auto snapshot = feed.snapshot();
+    cout << detector.detect(snapshot) << endl;
 #endif
 
 
-#if 0
-    LetsGoKillWatcher watcher(logger, COLOR_RED, false);
 
-    wait_until(
-        console, scope, std::chrono::seconds(600),
-        {
-            watcher,
-        }
-    );
-#endif
+//    context->issue_gyro_accel_x(&scope, 1000ms, 1000ms, 0ms, 123);
+
+//    OperationFailedExceptionWithScreenshot::fire(ErrorReportMode::SEND_ERROR_REPORT, "test", console);
 
 #if 0
-    LetsGoKillDetector detector(COLOR_RED, {0.71, 0.15, 0.04, 0.30});
+    auto snapshot = feed.snapshot();
+    YCommMenuDetector detector(true);
     detector.make_overlays(overlays);
-    while (true){
-        detector.detect(feed.snapshot());
-        scope.wait_for(std::chrono::milliseconds(100));
-    }
+    cout << detector.detect(snapshot) << endl;
 #endif
 
 #if 0
-//    ImageRGB32 image("Screenshots/screenshot-20230205-141319486902.png");
-    ImageRGB32 image("LetsGoKill.png");
+    SelectionArrowFinder arrow(overlay, {0.462377, 0.332039, 0.388222, 0.640777});
 
-//    LetsGoKillDetector detector(COLOR_RED, {0.5, 0, 0.5, 0.5});
-    LetsGoKillDetector detector(COLOR_RED, {0, 0, 1, 1});
-    detector.detect(image);
+    cout << arrow.detect(snapshot) << endl;
+
+    auto arrows = arrow.last_detection();
+    if (!arrows.empty()){
+        cout << arrows[0].y << endl;
+    }
 #endif
 
+//    WhiteDialogBoxDetector detector;
+//    detector.make_overlays(overlays);
+//    cout << detector.detect(snapshot) << endl;
+
 
 #if 0
-    EncounterWatcher encounter(console);
+    RumbleWatcher<ProController> rumble(context, 200);
     int ret = wait_until(
-        console, scope, std::chrono::seconds(600),
-        {
-            static_cast<VisualInferenceCallback&>(encounter),
-            static_cast<AudioInferenceCallback&>(encounter),
-        }
+        console, context,
+        WallClock::max(),
+        {rumble}
     );
-    encounter.throw_if_no_sound();
-
     if (ret == 0){
-        logger.log("Found battle menu!");
-    }
-
-    if (encounter.shiny_screenshot()){
-        encounter.shiny_screenshot()->save("test.png");
+        cout << "Detected rumble magnitude: " << rumble.max_magnitude() << endl;
+    }else{
+        cout << "Did not detect anything." << endl;
     }
 #endif
 
 
 #if 0
-    pbf_move_left_joystick(context, 128, 255, 300, 0);
-    pbf_move_left_joystick(context, 128, 0, 50, 0);
-    pbf_press_button(context, BUTTON_R, 20, 0);
-    pbf_move_left_joystick(context, 128, 0, 350, 0);
-#endif
-#if 0
-    size_t count = 0;
-    while (true){
-        NormalBattleMenuWatcher battle_menu(COLOR_RED);
-        AreaZeroSkyTracker sky_tracker(overlay);
-        context.wait_for_all_requests();
-        int ret = run_until(
-            console, context,
-            [&](BotBaseContext& context){
-                while (true){
-                    switch (count++ % 2){
-                    case 0:
-                        run_overworld(env, console, context, sky_tracker, 0.50);
-                        break;
-                    case 1:
-                        run_overworld(env, console, context, sky_tracker, 0.70);
-                        break;
-                    }
-                }
-            },
-            {battle_menu, sky_tracker}
-        );
-        context.wait_for(std::chrono::milliseconds(200));
-        if (ret == 0){
-            console.log("Detected battle encounter.");
-            pbf_press_dpad(context, DPAD_DOWN, 250, 0);
-            pbf_press_button(context, BUTTON_A, 20, 105);
-            pbf_mash_button(context, BUTTON_B, 1 * TICKS_PER_SECOND);
-        }
-    }
-#endif
+    auto snapshot = feed.snapshot();
 
+    BattleSelectionArrowDetector detector(COLOR_RED, &overlay, SafariBattleMenuOption::BALL);
+//    UpdatePopupDetector detector(console);
+    detector.make_overlays(overlays);
 
-
-
-
-
-#if 0
-    auto image = feed.snapshot();
-
-    ImageRGB32 filtered = filter_rgb32_range(image, 0xffe0e000, 0xffffffff, Color(0xff000000), false);
-    filtered.save("test.png");
+    cout << detector.detect(snapshot) << endl;
 #endif
 
-//    change_view_to_stats_or_judge(console, context);
-//    change_view_to_judge(console, context, Language::English);
-
-
-
 
 #if 0
-    auto image = feed.snapshot();
+    auto snapshot = feed.snapshot();
 
-    ImageRGB32 filtered = filter_rgb32_range(image, 0xff808000, 0xffffffff, Color(0xff000000), false);
-    filtered.save("test.png");
-#endif
+    ImageFloatBox box = find_contents_float_box(snapshot);
+    cout << box.x << ", " << box.y << ", " << box.width << ", " << box.height << endl;
 
-#if 0
-    TeraBattleMenuDetector battle_menu(COLOR_RED);
-    MoveSelectDetector move_select(COLOR_YELLOW);
-    CheerSelectDetector cheer_select(COLOR_GREEN);
-    battle_menu.make_overlays(overlays);
-    move_select.make_overlays(overlays);
-    cheer_select.make_overlays(overlays);
-
-    auto image = feed.snapshot();
-    cheer_select.detect_slot(image);
+    overlays.add(COLOR_RED, box);
 #endif
 
-
 #if 0
-    auto image = feed.snapshot();
-    CodeEntryDetector detector;
-    detector.make_overlays(overlays);
-    cout << detector.detect(image) << endl;
-#endif
-
-
-//    enter_tera_search(env.program_info(), console, context, false);
-//    open_hosting_lobby(env.program_info(), console, context, HostingMode::ONLINE_CODED);
+    PokemonLA::EventDialogDetector detector(logger, overlay, true);
 
-#if 0
-    auto image = feed.snapshot();
-    TeraLobbyReader detector(console.logger(), env.realtime_dispatcher());
-    detector.make_overlays(overlays);
-    cout << detector.detect(image) << endl;
+    auto snapshot = feed.snapshot();
+    detector.process_frame(snapshot, current_time());
 #endif
 
 #if 0
-    size_t host_index = 1;
-    ConsoleHandle& host = env.consoles[host_index];
-    BotBaseContext host_context(scope, host.botbase());
-
-    env.run_in_parallel(scope, [&](ConsoleHandle& console, BotBaseContext& context){
-        if (console.index() == host_index){
-            open_raid(console, context);
-        }else{
-            enter_tera_search(env.program_info(), console, context, true);
-        }
-    });
-    open_hosting_lobby(env.program_info(), host, host_context, HostingMode::ONLINE_CODED);
-
-    TeraLobbyReader lobby_reader;
-    std::string code = lobby_reader.raid_code(env.logger(), env.realtime_dispatcher(), host.video().snapshot());
-    std::string normalized_code;
-    const char* error = normalize_code(normalized_code, code);
-    if (error){
-//        pbf_press_button(host_context, BUTTON_B, 20, 230);
-//        pbf_press_button(host_context, BUTTON_A, 20, 230);
-        throw OperationFailedException(env.logger(), "Unable to read raid code.");
-    }
-
-    env.run_in_parallel(scope, [&](ConsoleHandle& console, BotBaseContext& context){
-        if (console.index() == host_index){
-            return;
-        }
-        enter_code(console, context, FastCodeEntrySettings(), normalized_code, false);
-    });
+    UpdateMenuWatcher update_menu(console, COLOR_PURPLE);
+    CheckOnlineWatcher check_online(COLOR_CYAN);
+    update_menu.make_overlays(overlays);
+    check_online.make_overlays(overlays);
 #endif
 
 
 
 #if 0
-    TeraRaidSearchDetector detector(COLOR_YELLOW);
+    {
+        MockDevice device;
 
-    auto image = feed.snapshot();
-    cout << detector.detect(image) << endl;
-    detector.move_cursor_to_search(env.program_info(), console, context);
-#endif
+        ReliableStreamConnection connection(
+            logger,
+            device,
+            1s
+        );
 
-#if 0
-    auto image = feed.snapshot();
-    PackedBinaryMatrix matrix = compress_rgb32_to_binary_range(image, 0xff000000, 0xff808080);
-    std::unique_ptr<WaterfillSession> session = make_WaterfillSession(matrix);
-    auto iter = session->make_iterator(100);
-    WaterfillObject object;
+        connection.send_request(PABB2_CONNECTION_OPCODE_ASK_VERSION);
+        connection.send_request(PABB2_CONNECTION_OPCODE_ASK_PACKET_SIZE);
+        connection.send_request(PABB2_CONNECTION_OPCODE_ASK_BUFFER_SLOTS);
+        connection.send_request(PABB2_CONNECTION_OPCODE_ASK_RESET);
 
-    size_t c = 0;
-    while (iter->find_next(object, false)){
-//        cout << "yellow = " << object.area << endl;
-        extract_box_reference(image, object).save("object-" + std::to_string(c++) + ".png");
-//        yellows.emplace_back(std::move(object));
+
+        context.wait_for(60s);
     }
 #endif
 
 
 
 
-
-
-
 #if 0
-    PokePortalDetector detector(COLOR_YELLOW);
+    CloseGameWatcher close_game(console);
+    close_game.make_overlays(overlays);
 
-    auto image = feed.snapshot();
-    cout << detector.detect_location(image) << endl;
-
-    detector.move_cursor(env.program_info(), console, context, 2);
+    auto snapshot = feed.snapshot();
+    cout << close_game.detect(snapshot) << endl;
 #endif
 
 
-//    size_t errors;
-//    release_box(env.program_info(), console, context, errors, 1);
+#if 0
+    MockConnection unreliable_connection;
+    {
+        ReliableStreamConnection connection(logger, unreliable_connection, 100s);
 
+        coalescer = &connection.m_stream_coalescer;
 
 
-#if 0
-//    TeraCatchWatcher catch_menu(COLOR_BLUE);
-#if 0
-    WhiteButtonWatcher next_button(
-        COLOR_CYAN,
-        WhiteButton::ButtonA,
-        {0.8, 0.93, 0.2, 0.07},
-        WhiteButtonWatcher::FinderType::PRESENT,
-        std::chrono::seconds(1)
-    );
-#endif
-//    AdvanceDialogWatcher advance(COLOR_YELLOW);
-    PromptDialogWatcher add_to_party(COLOR_PURPLE, {0.500, 0.395, 0.400, 0.100});
-    PromptDialogWatcher view_summary(COLOR_PURPLE, {0.500, 0.470, 0.400, 0.100});
-    PromptDialogWatcher nickname(COLOR_GREEN, {0.500, 0.545, 0.400, 0.100});
-//    PokemonSummaryWatcher summary(COLOR_MAGENTA);
-    MainMenuWatcher main_menu(COLOR_BLUE);
-//    OverworldWatcher overworld(COLOR_RED);
-
-//    catch_menu.make_overlays(overlays);
-//    next_button.make_overlays(overlays);
-//    advance.make_overlays(overlays);
-    add_to_party.make_overlays(overlays);
-    view_summary.make_overlays(overlays);
-    nickname.make_overlays(overlays);
-//    summary.make_overlays(overlays);
-    main_menu.make_overlays(overlays);
-//    overworld.make_overlays(overlays);
-#endif
+        cout << connection.send_request(0x20) << endl;
+//        cout << connection.send_request(0x21) << endl;
 
+        while (true){
+            scope.throw_if_cancelled();
+            cout << "Sent = " << connection.send("0123456789", 10) << endl;
+            pabb2_PacketSender_print(&connection.m_reliable_sender, true);
+            scope.wait_for(50ms);
+        }
 
-#if 0
-    OverworldWatcher overworld;
-    int ret = wait_until(
-        console, context, std::chrono::seconds(5),
-        {overworld}
-    );
-    cout << ret << endl;
-#endif
 
-#if 0
-    ImageRGB32 image("BadArrow.png");
-
-    TeraBattleMenuDetector battle_menu(COLOR_RED);
-    MoveSelectDetector move_select(COLOR_GREEN);
-    TargetSelectDetector target_select(COLOR_CYAN);
-    TeraCatchDetector tera_catch(COLOR_BLUE);
-//    battle_menu.make_overlays(overlays);
-//    move_select.make_overlays(overlays);
-//    target_select.make_overlays(overlays);
-//    tera_catch.make_overlays(overlays);
-    cout << (int)battle_menu.detect_slot(image) << endl;
-
-//    battle_menu.move_to_slot(console, context, 0);
-//    move_select.move_to_slot(console, context, 1);
-//    target_select.move_to_slot(console, context, 2);
+        scope.wait_for(10s);
+        cout << "================ End Test ================" << endl;
+    }
 #endif
 
+#if 0
+    DataPacket packet;
+    pabb2_StreamCoalescer coalescer;
+    pabb2_StreamCoalescer_init(&coalescer);
 
-//    change_stats_view_to_judge(env.program_info(), console, context);
+    coalescer.stream_head = 32;
+    coalescer.stream_tail = 32;
 
+    packet.set(3, 32, "asdf");
+    cout << pabb2_StreamCoalescer_push_stream(&coalescer, &packet) << endl;
 
-#if 0
-    auto image = feed.snapshot();
-    ImageFloatBox box(0.66, 0.08, 0.52, 0.04);
-    ImageStats stats = image_stats(extract_box_reference(image, box));
-    cout << stats.average << stats.stddev << endl;
-#endif
+    pabb2_StreamCoalescer_push_packet(&coalescer, 1);
+    pabb2_StreamCoalescer_push_packet(&coalescer, 2);
+    pabb2_StreamCoalescer_print(&coalescer, true);
 
+    pabb2_StreamCoalescer_push_packet(&coalescer, 0);
+    pabb2_StreamCoalescer_print(&coalescer, true);
 
+    packet.set(5, 60, "qwersdfg");
+    cout << pabb2_StreamCoalescer_push_stream(&coalescer, &packet) << endl;
+    pabb2_StreamCoalescer_print(&coalescer, true);
 
-#if 0
-    auto image = feed.snapshot();
+    packet.set(4, 36, "01234567890123456789abcd");
+    cout << pabb2_StreamCoalescer_push_stream(&coalescer, &packet) << endl;
 
-    TeraLobbyReader detector;
-//    cout << detector.seconds_left(env.logger(), image) << endl;
-    cout << detector.raid_code(env.logger(), image) << endl;
-#endif
+    pabb2_StreamCoalescer_print(&coalescer, true);
 
 
+    char buffer[100] = {};
 
-#if 0
-    QClipboard* clipboard = QApplication::clipboard();
-    cout << clipboard->supportsSelection() << endl;
+    cout << "read = " << pabb2_StreamCoalescer_read(&coalescer, buffer, 1) << endl;
+    cout << buffer << endl;
 
-    while (true){
-        std::string code = clipboard->text(QClipboard::Selection).toStdString();
-        cout << code << endl;
-        scope.wait_for(std::chrono::milliseconds(1000));
-    }
-#endif
+    pabb2_StreamCoalescer_print(&coalescer, true);
 
+    cout << "read = " << pabb2_StreamCoalescer_read(&coalescer, buffer, 10) << endl;
+    cout << buffer << endl;
 
-//    while (true){
+    pabb2_StreamCoalescer_print(&coalescer, true);
 
-//    }
+    cout << "read = " << pabb2_StreamCoalescer_read(&coalescer, buffer, 100) << endl;
+    cout << buffer << endl;
 
-#if 0
-    pbf_move_left_joystick(context, 0, 128, 40, 40);
-    // Move forward to pass table
-    pbf_move_left_joystick(context, 128, 0, 80, 40); // old value: 80
-    // Move right
-    pbf_move_left_joystick(context, 255, 128, 40, 40);
-    // Move back to face basket
-    pbf_move_left_joystick(context, 128, 255, 10, 40);
+    pabb2_StreamCoalescer_print(&coalescer, true);
 #endif
 
 
 #if 0
-//    ImageFloatBox box(0.02, );
-    auto image = feed.snapshot();
-    WhiteButtonDetector detector(COLOR_RED, WhiteButton::ButtonA, {0.020, 0.590, 0.035, 0.060});
-    cout << detector.detect(image) << endl;
-#endif
+    LogSender sender;
+    pabb2_PacketSender queue;
+    pabb2_PacketSender_init(&queue, fp_LogSender, &sender);
 
+    cout << pabb2_PacketSender_send_stream(&queue, "asdf", 4) << endl;
+    cout << pabb2_PacketSender_send_stream(&queue, "qwer", 4) << endl;
+    cout << pabb2_PacketSender_send_stream(&queue, "zxcv", 4) << endl;
+    pabb2_PacketSender_remove(&queue, 0);
 
-//    auto image = feed.snapshot();
-//    TeraCatchDetector detector(COLOR_RED);
-//    cout << detector.detect(image) << endl;
+    cout << pabb2_PacketSender_send_stream(&queue, "01234567890123456789", 20) << endl;
+//    cout << pabb2_PacketSender_send_stream(&queue, "sdfg", 4) << endl;
+//    cout << pabb2_PacketSender_send_stream(&queue, "xcvb", 4) << endl;
 
-//    size_t errors;
-//    release_one_pokemon(env.program_info(), console, context, errors);
+    pabb2_PacketSender_print(&queue, true);
 
+    pabb2_PacketSender_remove(&queue, 0);
+    cout << pabb2_PacketSender_send_stream(&queue, "sdfgh", 5) << endl;
+    cout << pabb2_PacketSender_send_stream(&queue, "xcvb", 4) << endl;
 
-#if 0
-    auto image = feed.snapshot();
-
-    TeraLobbyReader detector;
-    detector.make_overlays(overlays);
-    detector.ready_players(image);
-#endif
-
-#if 0
-    MainMenuDetector detector;
-    detector.move_cursor(env.program_info(), console, context, MenuSide::RIGHT, 1);
-    cout << "done" << endl;
+    pabb2_PacketSender_print(&queue, true);
 #endif
 
 
 #if 0
-    size_t eggs_collected = 0;
-    check_basket_to_collect_eggs(
-        env.program_info(), console, context,
-        1, eggs_collected
-    );
-#endif
+    LogSender sender;
+    pabb2_PacketSender queue;
+    pabb2_PacketSender_init(&queue);
 
+    PacketHeader* packet;
 
-#if 0
-    auto image = feed.snapshot();
-    DialogBoxDetector detector;
-    cout << detector.detect(image) << endl;
-#endif
-
-#if 0
-    BattleMenuDetector detector(COLOR_RED);
-    while (true){
-        scope.wait_for(std::chrono::milliseconds(50));
-        auto image = feed.snapshot();
-        cout << detector.detect(image) << endl;
+    packet = pabb2_PacketSender_reserve_packet(&queue, 16);
+    if (packet){
+        packet->opcode = 1;
+        pabb2_PacketSender_commit_packet(&queue, packet);
+        sender.send(packet, packet->packet_bytes);
+    }else{
+        cout << "Reserve Failed" << endl;
     }
-#endif
 
+    packet = pabb2_PacketSender_reserve_packet(&queue, 16);
+    if (packet){
+        packet->opcode = 2;
+        pabb2_PacketSender_commit_packet(&queue, packet);
+        sender.send(packet, packet->packet_bytes);
+    }else{
+        cout << "Reserve Failed" << endl;
+    }
 
-#if 0
-    auto image = feed.snapshot();
-    TeraCatchWatcher detector(COLOR_RED);
-    bool ok = detector.detect(image);
-    cout << ok << endl;
-    if (!ok){
-        image.frame->save("tmp.png");
+    packet = pabb2_PacketSender_reserve_packet(&queue, 16);
+    if (packet){
+        packet->opcode = 3;
+        pabb2_PacketSender_commit_packet(&queue, packet);
+        sender.send(packet, packet->packet_bytes);
+    }else{
+        cout << "Reserve Failed" << endl;
     }
 
-#if 0
-    int ret = wait_until(
-        console, context, std::chrono::seconds(60),
-        {detector}
-    );
-    cout << "ret = " << ret << endl;
-#endif
-#endif
+    packet = pabb2_PacketSender_reserve_packet(&queue, 15);
+    if (packet){
+        packet->opcode = 4;
+        pabb2_PacketSender_commit_packet(&queue, packet);
+        sender.send(packet, packet->packet_bytes);
+    }else{
+        cout << "Reserve Failed" << endl;
+    }
 
+    packet = pabb2_PacketSender_reserve_packet(&queue, 16);
+    if (packet){
+        packet->opcode = 5;
+        pabb2_PacketSender_commit_packet(&queue, packet);
+        sender.send(packet, packet->packet_bytes);
+    }else{
+        cout << "Reserve Failed" << endl;
+    }
 
-#if 0
-    auto image = feed.snapshot();
+    cout << dump(queue) << endl;
+
+#if 1
+    pabb2_PacketSender_remove(&queue, 0);
+    packet = pabb2_PacketSender_reserve_packet(&queue, 16);
+    if (packet){
+        packet->opcode = 6;
+        pabb2_PacketSender_commit_packet(&queue, packet);
+        sender.send(packet, packet->packet_bytes);
+    }else{
+        cout << "Reserve Failed" << endl;
+    }
 
-    BoxDetector detector;
-    cout << detector.detect(image) << endl;
+    cout << dump(queue) << endl;
+#endif
 
-    while (true){
-        scope.wait_for(std::chrono::milliseconds(50));
-        image = feed.snapshot();
-        std::pair<BoxCursorLocation, BoxCursorCoordinates> location = detector.detect_location(image);
-        cout << (int)location.first << ": " << (int)location.second.row << "," << (int)location.second.col << endl;
+    packet = pabb2_PacketSender_reserve_packet(&queue, 16);
+    if (packet){
+        packet->opcode = 7;
+        pabb2_PacketSender_commit_packet(&queue, packet);
+        sender.send(packet, packet->packet_bytes);
+    }else{
+        cout << "Reserve Failed" << endl;
     }
-#endif
 
 
-#if 0
-    GradientArrowDetector party_select_top(COLOR_GREEN, GradientArrowType::RIGHT, {0.30, 0.27, 0.10, 0.08});
-    auto image = feed.snapshot();
-    cout << party_select_top.detect(image) << endl;
 #endif
 
-#if 0
-    auto image = feed.snapshot();
-    SomethingInBoxSlotDetector detector(COLOR_RED, true);
-    detector.make_overlays(overlays);
-    cout << detector.detect(image) << endl;
-#endif
 
-#if 0
-    AsyncCommandSession session(scope, logger, env.realtime_dispatcher(), context.botbase());
-    session.dispatch([](BotBaseContext& context){
-//        pbf_controller_state(context, 0, DPAD_NONE, 128, 0, 128, 128, 255);
-        pbf_press_button(context, BUTTON_A, 255, 0);
-    });
-    context.wait_for(std::chrono::seconds(2));
-    session.dispatch([](BotBaseContext& context){
-//        pbf_controller_state(context, BUTTON_B, DPAD_NONE, 128, 0, 128, 128, 255);
-        pbf_press_button(context, BUTTON_B, 255, 0);
-    });
 
-#else
 #if 0
-    pbf_controller_state(context, 0, DPAD_NONE, 128, 0, 128, 128, 500);
-    context.wait_for_all_requests();
-    pbf_controller_state(context, BUTTON_B, DPAD_NONE, 128, 0, 128, 128, 500);
-#endif
-#endif
-
-//    pbf_press_button(context, BUTTON_B, 500, 10);
-//    pbf_controller_state(context, 0, DPAD_NONE, 128, 0, 128, 128, 500);
-//    context.wait_for_all_requests();
-//    pbf_wait(context, 1);
-//    pbf_controller_state(context, BUTTON_B, DPAD_NONE, 128, 0, 128, 128, 500);
+    LogSender sender;
+    PABotBase2::RequestQueue queue(logger, sender, 16, 64);
 
+    try{
+        cout << queue.send_str("asdfqwe") << endl;
+        cout << queue.send_str("wer") << endl;
+    }catch (...){
+        cout << "Caught Exception" << endl;
+    }
 
+    cout << "Dumping queue... 0" << endl;
+    cout << queue.dump_queue(true) << endl;
 
 #if 0
-    CodeboardPosition point0{1, 0};
-    CodeboardPosition point1{1, 10};
-//    uint16_t scroll_delay = 3;
-//    uint16_t A_delay = 3;
-
-    auto path0 = get_codeboard_digit_path(point0, point1);
-    auto path1 = get_codeboard_digit_path(point1, point0);
-
-    while (true){
-        move_codeboard(context, path0, true);
-        move_codeboard(context, path1, true);
+    {
+        queue.report_acked(0);
+        cout << "Dumping queue... 3" << endl;
+        cout << queue.dump_queue(true) << endl;
+    }
+    {
+        queue.report_acked(4);
+        cout << "Dumping queue... 2" << endl;
+        cout << queue.dump_queue(true) << endl;
     }
 #endif
-#if 0
-    while (true){
-        ssf_issue_scroll(context, DPAD_LEFT, 10, 6);
-        ssf_issue_scroll(context, DPAD_LEFT, 4, 6);
-        ssf_issue_scroll(context, DPAD_LEFT, 4, 6);
-        ssf_issue_scroll(context, DPAD_LEFT, 10, 6);
-        ssf_issue_scroll(context, DPAD_RIGHT, 10, 6);
-        ssf_issue_scroll(context, DPAD_RIGHT, 4, 6);
-        ssf_issue_scroll(context, DPAD_RIGHT, 4, 6);
-        ssf_issue_scroll(context, DPAD_RIGHT, 10, 6);
+    {
+        queue.report_acked(7);
+        cout << "Dumping queue... 1" << endl;
+        cout << queue.dump_queue(true) << endl;
     }
 #endif
 
-#if 0
-    ImageRGB32 image("20221206-225502975702-NoState.png");
 
-//    OverlayBoxScope ore_box(console, {0.930, 0.050, 0.065, 0.010});
-//    extract_box_reference(image, ore_box).save("test.png");
 
-    AdvanceDialogDetector detector;
-    cout << detector.detect(image) << endl;
-#endif
 
 #if 0
-    while (true){
-        pbf_press_button(context, BUTTON_HOME, 20, GameSettings::instance().GAME_TO_HOME_DELAY);
-        set_time_to_12am_from_home(console, context);
-        reset_game_from_home(env, console, context, 5 * TICKS_PER_SECOND);
+    {
+        PybindSwitchProController controller("COM12");
+        controller.push_button(1000, 200, 800, BUTTON_B);
+        controller.wait_for_all_requests();
     }
 #endif
 
 
 #if 0
-    ImageRGB32 image("screenshot-20221204-232949766645.png");
-
-    MainMenuDetector detector;
-    auto detection = detector.detect_location(image);
-    cout << (int)detection.first << " : " << detection.second << endl;
-
-//    GradientArrowDetector party_select_top(COLOR_GREEN, GradientArrowType::RIGHT, {0.30, 0.27, 0.10, 0.08});
-//    bool detected = party_select_top.detect(image);
-//    cout << detected << endl;
-#endif
 
+    // ImageRGB32 image1(IMAGE_PATH);
+    auto image1 = feed.snapshot();
+    ImageViewRGB32 cropped = extract_box_reference(image1, ImageFloatBox{BOX.x(), BOX.y(), BOX.width(), BOX.height()});
 
+    // auto snapshot = feed.snapshot();
+    std::string text = OCR::ocr_read(LANGUAGE, cropped);
+    cout << text << endl;
 
+    
 
-
-#if 0
-//    GradientArrowDetector party_select_top(COLOR_GREEN, GradientArrowType::RIGHT, {0.30, 0.27, 0.10, 0.08});
-    MainMenuDetector detector;
-    while (true){
-        VideoSnapshot snapshot = feed.snapshot();
-        auto detection = detector.detect_location(snapshot);
-//        bool detected = party_select_top.detect(snapshot);
-        cout << (int)detection.first << " : " << detection.second << endl;
-//        if (!detected){
-//            snapshot.frame->save("test.png");
-//        }
-        scope.wait_for(std::chrono::milliseconds(100));
-    }
 #endif
 
 #if 0
-    send_program_notification(
-        env.logger(), NOTIFICATION_TEST,
-        COLOR_GREEN, env.program_info(),
-        "Test Title",
-        {
-            {
-                "",
-                "[TestTest](https://discordtips.com/how-to-hyperlink-in-discord/)"
-            },
-        }
-    );
+    std::string move_results = "Move Effectiveness:";
+    move_results += "\n- Top: " + std::string("asdf");
+    move_results += "\n- Left: " + std::string("asdf");
+    move_results += "\n- Right: " + std::string("asdf");
+    move_results += "\n- Bottom: " + std::string("asdf");
+    console.log(move_results);
 #endif
 
-
-//    pbf_move_left_joystick(context, 129, 128, 10000, 0);
-//    pbf_move_left_joystick(context, 128, 0, 90, 0);
-
-
-//    ImageRGB32 image("screenshot-20221128-084818449677.png");
-//    PromptDialogDetector detector(COLOR_RED);
-//    cout << detector.detect(image) << endl;
-
-
-//    ssf_press_button(context, BUTTON_A, 8, 20);
-//    pbf_press_button(context, BUTTON_B, 20, 105);
-
-
+//    close_game_from_home(console, context);
 
 
 #if 0
-    ImageRGB32 image("20221206-035546876682.jpg");
-//    auto image = feed.snapshot();
+    auto snapshot = feed.snapshot();
 
-    TeraLobbyReader reader;
-    reader.make_overlays(overlays);
-#if 0
-    reader.check_ban_list(
-        {
-            {Language::English, "Halazea"},
-        },
-        image,
-        true
-    );
+    BoxWatcher box;
+    box.make_overlays(overlays);
+    cout << box.detect(snapshot) << endl;
 #endif
-    reader.raid_code(logger, env.program_info(), image);
-//    cout << (int)reader.total_players(image) << endl;
-#endif
-
-
-
-//    connect_to_internet_from_overworld(console, context);
-//    day_skip_from_overworld(console, context);
 
 
 
-//    save_game_from_overworld(console, context);
-
-
 #if 0
-    OverworldDetector overworld;
-    overworld.make_overlays(overlays);
+    auto snapshot = feed.snapshot();
+    cout << snapshot->width() << " x " << snapshot->height() << endl;
 
-    auto image = feed.snapshot();
-//    overworld.detect(image);
-    cout << overworld.detect_ball(image) << endl;
+    RunFromBattleDetector detector(COLOR_RED, &overlay);
+    cout << detector.detect(snapshot) << endl;
 #endif
 
-//    wait_until();
+#if 0
+close_game_from_home(console, context);
+// ssf_issue_scroll(context, DPAD_DOWN, 24ms);
+#endif  
 
-//    ImageRGB32 image("ball-1-new.png");
+#if 0
+    // auto snapshot = feed.snapshot();
+    // CloseGameDetector detector(console);
+    // cout << detector.detect(snapshot) << endl;
+    CloseGameWatcher watcher(console);
 
-//    filter_rgb32_range(image, 0xffc0c000, 0xffffff3f, Color(0), false).save("ball-template.png");
+    int ret = wait_until(console, context, Seconds(10), {watcher});
 
+    if (ret == 0){
+        console.log("CloseGameWatcher detected.");
+    }
+    
+#endif    
 
-//    ImageFloatBox ball(0.890, 0.790, 0.030, 0.070);
-//    ImageFloatBox radar(0.815, 0.680, 0.180, 0.310);
+#if 0
+    ImageRGB32 image1("itemprinter.png");
+    PokemonSV::ItemPrinterMaterialDetector detector(COLOR_RED, Language::ChineseTraditional);
+    // detector.detect_material_name(console, image1, context, 0);
+    
+    // detector.detect_material_name(console, image1, context, 2);
+    detector.detect_material_name(console, image1, context, 1);
 
 
 
-//    save_game_from_menu(console, context);
+#endif
 
-//    enter_alphanumeric_code(logger, context, "2VL4EP");
+#if 0
+    save_game_to_menu(console, context);
+#endif
 
-//    run_path(context, get_path({0, 0}, {2, 6}));
-//    run_path(context, get_path({2, 6}, {0, 9}));
-//    run_path(context, get_path({0, 9}, {3, 8}));
 
 
+//    MoveEffectivenessSymbolMatcher::NoEffect();
 
 #if 0
-    auto image = feed.snapshot();
-
-    DateReader reader;
-    reader.make_overlays(overlays);
-    cout << reader.detect(image) << endl;
-    cout << (int)reader.read_hours(logger, image) << endl;
-    reader.set_hours(console, context, 1);
+    auto snapshot = feed.snapshot();
+    ImageViewRGB32 cropped = extract_box_reference(snapshot, ImageFloatBox(0.309013, 0.719466, 0.418455, 0.015267));
+    ImageStats stats = image_stats(cropped);
+    cout << stats.average << stats.stddev << endl;
 #endif
 
 
-//    auto image = feed.snapshot();
-//    DateReader reader;
-//    reader.detect(image);
+#if 0
+    MapIconDetector detector0(COLOR_RED, MapIconType::PokemonCenter, {0, 0, 1, 1}, &overlay);
+    MapIconDetector detector1(COLOR_RED, MapIconType::Building, {0, 0, 1, 1}, &overlay);
+    MapIconDetector detector2(COLOR_RED, MapIconType::BuildingFlyable, {0, 0, 1, 1}, &overlay);
+    MapIconDetector detector3(COLOR_RED, MapIconType::CafeFlyable, {0, 0, 1, 1}, &overlay);
+    MapIconDetector detector4(COLOR_RED, MapIconType::WildZone, {0, 0, 1, 1}, &overlay);
+    MapIconDetector detector5(COLOR_RED, MapIconType::WildZoneFlyable, {0, 0, 1, 1}, &overlay);
+    MapIconDetector detector6(COLOR_RED, MapIconType::BattleZone, {0, 0, 1, 1}, &overlay);
 
 
+    auto snapshot = feed.snapshot();
+    detector0.detect(snapshot);
+//    detector1.detect(snapshot);
+//    detector2.detect(snapshot);
+//    detector3.detect(snapshot);
+//    detector4.detect(snapshot);
+//    detector5.detect(snapshot);
+//    detector6.detect(snapshot);
+#endif
 
-//    TradeStats stats;
-//    trade_current_box(env, scope, NOTIFICATION_TEST, stats);
 
 
-//    BoxDetector detector;
-//    detector.move_cursor(console, context, BoxCursorLocation::SLOTS, 3, 3);
+#if 0
 
-//    MainMenuDetector detector;
-//    detector.move_cursor(console, context, MenuSide::RIGHT, 4);
+    auto snapshot = feed.snapshot();
 
-#if 0
-    auto image = feed.snapshot();
-    BoxDetector detector;
-    auto ret = detector.detect_location(image);
-    cout << (int)ret.first << " | " << (int)ret.second.row << ", " << (int)ret.second.col << endl;
+    ItemReceiveDetector detector(COLOR_RED, &overlay);
+    cout << detector.detect(snapshot) << endl;
 #endif
 
+    
 #if 0
-    MultiConsoleErrorState state;
-    TradeStats stats;
-    env.run_in_parallel(
-        scope,
-        [&](ConsoleHandle& console, BotBaseContext& context){
-            trade_current_pokemon(console, context, state, stats);
-        }
-    );
-#endif
+    ImageRGB32 image1("swap-moves.png");
+    PokemonSV::PokemonMovesReader reader(Language::Korean);
+    std::string top_move = reader.read_move(env.logger(), image1, 2);
+    env.log("Current top move: " + top_move);
 
-
-#if 0
-    auto image = feed.snapshot();
-    TeraLobbyReader detector(COLOR_RED);
-    detector.make_overlays(overlays);
-    cout << detector.detect(image) << endl;
-    cout << detector.total_players(image) << endl;
+    ImageRGB32 image2(IMAGE_PATH);
+    ImageFloatBox box{0.396429, 0.506356, 0.069048, 0.059322};
+    PokemonSV::MenuOption session(console, context, Language::Korean);
+    session.read_option(extract_box_reference(image2, box));
 #endif
 
-
 #if 0
-//    ImageRGB32 image("NoCardDetection.png");
-    auto image = feed.snapshot();
-    TeraCardReader detector(COLOR_RED);
-    detector.make_overlays(overlays);
-    cout << detector.detect(image) << endl;
-    cout << detector.stars(image) << endl;
+    while (true){
+        sit_on_bench(console, context);
+    }
 #endif
 
 
 #if 0
-    ImageRGB32 image("ArrowFail.png");
-//    auto image = feed.snapshot();
-
-    AdvanceDialogDetector detector;
-    cout << detector.detect(image) << endl;
-//    image.frame->save("test.png");
+    while (true){
+        ssf_press_button(context, BUTTON_ZL, 160ms, 800ms, 200ms);
+        ssf_press_button(context, BUTTON_PLUS, 320ms, 840ms);
+        pbf_press_button(context, BUTTON_A, 80ms, 24ms);
+        pbf_press_button(context, BUTTON_Y, 80ms, 24ms);
+        pbf_press_button(context, BUTTON_X, 80ms, 24ms);
+        pbf_press_button(context, BUTTON_B, 80ms, 24ms);
+    }
 #endif
 
 
 #if 0
-    BattleBallReader reader(console, LANGUAGE);
+//    ImageRGB32 image("Screenshots/screenshot-20251025-153957561163.png");
+
+    auto screen = feed.snapshot();
 
-    pbf_press_button(context, BUTTON_A, 20, 105);
-    context.wait_for_all_requests();
+//    PokemonLZA::FlatWhiteDialogDetector detector(COLOR_RED, &overlay);
+    PokemonLZA::BlueDialogDetector detector(COLOR_RED, &overlay);
+//    PokemonLZA::ButtonDetector detector(COLOR_RED, ButtonType::ButtonA, {0.526718, 0.535922, 0.033806, 0.100971},  &overlay);
 
-    int quantity = move_to_ball(reader, console, context, "poke-ball");
-    cout << "quantity = " << quantity << endl;
+    cout << detector.detect(screen) << endl;
 #endif
 
 
 #if 0
-    BattleBallReader reader(console, Language::English);
-    auto image = feed.snapshot();
-    cout << reader.read_quantity(image) << endl;
-    cout << reader.read_ball(image) << endl;
-#endif
+    auto screen = feed.snapshot();
 
-#if 0
-//    ImageRGB32 image("screenshot-20221120-001408323077.png");
-    ImageRGB32 image("screenshot-20221118-160757832016.png");
-    PokemonSummaryDetector detector;
-    cout << detector.detect(image) << endl;
-#endif
+    ImageFloatBox box(0.473282, 0.572816, 0.058888, 0.100971);
 
-//    auto image = feed.snapshot();
-//    PokemonSummaryDetector detector;
-//    cout << detector.detect(image) << endl;
+    overlays.add(COLOR_RED, box);
 
+    ImageViewRGB32 cropped = extract_box_reference(screen, box);
 
-#if 0
-    auto image = feed.snapshot();
-    ImageStats stats = image_stats(extract_box_reference(image, ImageFloatBox{0.30, 0.33, 0.40, 0.02}));
-    cout << stats.average << stats.stddev << endl;
-#endif
-
-#if 0
-    ImageRGB32 image("cursor_basic_00q.png");
-    GradientArrowDetector detector({0, 0, 1, 1});
+    {
+        PackedBinaryMatrix matrix = compress_rgb32_to_binary_range(
+            cropped,
+            0xffc04030, 0xffff8f6f
+        );
 
-    auto hits = detector.detect_all(image);
-    cout << "hits = " << hits.size() << endl;
-    for (auto& item : hits){
-        extract_box_reference(image, item).save("test.png");
+        ImageRGB32 masked = cropped.copy();
+        filter_by_mask(matrix, masked, Color(0xff000000), true);
+        masked.save("MoveEffectivenessNormal.png");
     }
 #endif
 
-
 #if 0
-    ImageRGB32 image("screenshot-20221121-070043212515.png");
+    ImageRGB32 image("WildZoneFlyable.png");
 
-    WhiteButtonDetector next_button(WhiteButton::ButtonA, {0.8, 0.9, 0.2, 0.1}, COLOR_RED);
-    cout << next_button.detect(image) << endl;
-#endif
+    image = filter_rgb32_range(image, 0xffffffff, 0xffffffff, Color(0), true);
+    image = filter_rgb32_range(image, 0xff000000 | (237 << 16) | (28 << 8) | 36, 0xff000000 | (237 << 16) | (28 << 8) | 36, Color(0), true);
 
-#if 0
-    ImageRGB32 image("screenshot-20221118-211428612196.png");
-
-    TeraCardReader detector;
-    cout << detector.detect(image) << endl;
+    image.save("temp2.png");
 #endif
 
 #if 0
-    ImageRGB32 image("screenshot-20221122-022035906115.png");
+//    ImageRGB32 image("Screenshots/screenshot-20251012-174842583706.png");
 
-    MoveSelectDetector detector;
-    cout << detector.detect(image) << endl;
-#endif
+    auto screen = feed.snapshot();
 
+//    ImageFloatBox box(0.483097, 0.469903, 0.041439, 0.067961);
+    ImageFloatBox box(0.405671, 0.310680, 0.056707, 0.099029);
 
-#if 0
-    AddToPartyDetector detector;
-    cout << detector.detect(feed.snapshot()) << endl;
-#endif
+    overlays.add(COLOR_RED, box);
 
+    ImageViewRGB32 cropped = extract_box_reference(screen, box);
 
+    //  Remove background.
+    {
+        PackedBinaryMatrix matrix = compress_rgb32_to_binary_range(
+            cropped,
+            0xff000000, 0xff4f4f7f
+        );
+        matrix.invert();
 
-//    home_to_date_time(context, false, false);
+        cout << matrix.dump() << endl;
 
-//    save_game_from_overworld(console, context);
+        auto session = Waterfill::make_WaterfillSession(matrix);
+        auto iter = session->make_iterator(10);
+        WaterfillObject object;
+        iter->find_next(object, true);
+        ImageRGB32 masked = extract_box_reference(cropped, object).copy();
+        filter_by_mask(object.packed_matrix(), masked, Color(0x00000000), false);
+        masked.save("temp.png");
+    }
 
 
 #if 0
-    auto image = feed.snapshot();
+    PackedBinaryMatrix matrix = compress_rgb32_to_binary_range(
+        cropped,
+        0xffc0c0c0, 0xffffffff
+    );
 
-    PokemonSummaryDetector detector;
-    cout << detector.detect(image) << endl;
-    cout << detector.is_shiny(image) << endl;
-#endif
+    cout << matrix.dump() << endl;
 
-#if 0
-    RaidShinyStarDetector detector(overlay);
-    wait_until(
-        console, context,
-        WallClock::max(),
-        {detector}
-    );
-#endif
+    ImageRGB32 tmp = cropped.copy();
+//    filter_by_mask(matrix, tmp, Color(0x00000000), true);
+
+    {
+    }
 
+    auto session = Waterfill::make_WaterfillSession(matrix);
+    auto iter = session->make_iterator(10);
+    WaterfillObject object;
+    while (iter->find_next(object, false)){
+        break;
+    }
+    cout << "area = " << object.area << endl;
 
+    tmp.save("DialogBoxWhiteArrow-Template.png");
+//    extract_box_reference(tmp, object).save("SelectionArrow.png");
 
-#if 0
-    ImageRGB32 image("ShinyRaid.png");
 
-    ImageViewRGB32 cropped = extract_box_reference(image, ImageFloatBox{0.5, 0.1, 0.4, 0.7});
-    cropped.save("test-cropped.png");
 
 
-    ImageRGB32 filtered = filter_rgb32_range(cropped, 0xff804040, 0xffffffff, Color(0xffffff00), true);
-    filtered.save("test-filtered.png");
+#endif
 #endif
 
+
+//    reset_game_to_gamemenu(console, context);
+
 #if 0
-    uint8_t year = MAX_YEAR;
     while (true){
-        pbf_press_button(context, BUTTON_HOME, 10, GameSettings::instance().GAME_TO_HOME_DELAY);
-        home_roll_date_enter_game_autorollback(console, context, year);
-        pbf_mash_button(context, BUTTON_A, 250);
+        go_home(console, context);
+        PokemonLZA::reset_game_from_home(env, console, context, true);
     }
+
+
+    cout << "done" << endl;
 #endif
 
-#if 0
-    ImageRGB32 image("GradientArrowHorizontal-Template.png");
 
-    ImageRGB32 rotated(image.height(), image.width());
+#if 0
+    ImageRGB32 image("screenshot-20221121-070043212515.png");
 
-    for (size_t r = 0; r < image.height(); r++){
-        for (size_t c = 0; c < image.width(); c++){
-            rotated.pixel(r, c) = image.pixel(c, r);
-        }
-    }
-    rotated.save("GradientArrowVertical-Template.png");
+    WhiteButtonDetector next_button(WhiteButton::ButtonA, {0.8, 0.9, 0.2, 0.1}, COLOR_RED);
+    cout << next_button.detect(image) << endl;
 #endif
 
 
+
 #if 0
     auto image = feed.snapshot();
     ImageViewRGB32 cropped = extract_box_reference(image, ImageFloatBox{0.500, 0.555, 0.310, 0.070});
@@ -1339,169 +1134,8 @@ void TestProgram::program(MultiSwitchProgramEnvironment& env, CancellableScope&
     }
 #endif
 
-#if 0
-    ImageRGB32 image("WhiteButtonA.png");
-    ImageRGB32 filtered = filter_rgb32_range(image, 0xff000000, 0xff7f7f7f, Color(0x00000000), true);
-
-    for (size_t r = 0; r < image.height(); r++){
-        for (size_t c = 0; c < image.width(); c++){
-            if (8 < c && c < 30 && 8 < r && r < 30){
-                filtered.pixel(c, r) = image.pixel(c, r);
-            }
-        }
-    }
-    filtered.save("WhiteButtonA-processed.png");
-#endif
-
-#if 0
-    WhiteButtonFinder next_button(WhiteButton::ButtonA, console.overlay(), {0.9, 0.9, 0.1, 0.1});
-    wait_until(
-        console, context,
-        std::chrono::seconds(60),
-        {next_button}
-    );
-#endif
-
-
-#if 0
-    TeraCardReader reader;
-//    auto image = ImageRGB32("ErrorDumps/20221115-234552197119-ReadStarsFailed.png");
-    auto image = feed.snapshot();
-    cout << reader.detect(image) << endl;
-    cout << "stars = " << reader.stars(image) << endl;
 
-//    BattleMenuDetector battle_menu;
-//    cout << battle_menu.detect(image) << endl;
-#endif
 
-//    OverlayBoxScope box(overlay, COLOR_RED, {0.4, 0.4, 0.2, 0.2}, "asdf qwer sdfg");
-
-
-//    reset_game_to_gamemenu(console, context);
-
-
-#if 0
-    ImageRGB32 image("Arrow.png");
-
-    PackedBinaryMatrix matrix = compress_rgb32_to_binary_range(image, 0xff808080, 0xffffffff);
-
-    std::unique_ptr<WaterfillSession> session = make_WaterfillSession(matrix);
-    auto iter = session->make_iterator(20);
-    WaterfillObject object;
-    while (iter->find_next(object, false)){
-        extract_box_reference(image, object).save("Arrow-Template.png");
-    }
-#endif
-
-
-//    YCommMenuDetector detector(true);
-//    HomeDetector detector;
-//    cout << detector.detect(image) << endl;
-//    cout << detector.detect(feed.snapshot()) << endl;
-
-
-
-#if 0
-    while (true){
-        pbf_press_button(context, BUTTON_HOME, 20, GameSettings::instance().GAME_TO_HOME_DELAY);
-        reset_game_from_home(env, console, context);
-    }
-#endif
-
-
-
-#if 0
-    overlay.add_log("asdfasdf", COLOR_RED);
-
-    for (int c = 0; c < 20; c++){
-        overlay.add_log("qwerqwer", COLOR_GREEN);
-        scope.wait_for(std::chrono::milliseconds(1000));
-    }
-
-    scope.wait_for(std::chrono::milliseconds(5000));
-    cout << "clear" << endl;
-    overlay.clear_log();
-#endif
-
-#if 0
-    OverlayTextScope text(overlay, "hello world", 0.5, 0.5, 10, COLOR_WHITE);
-
-    overlay.add_log_text("asdfasdf", COLOR_RED);
-
-    OverlayStat stat0;
-    OverlayStat stat1;
-    OverlayStat stat2;
-    overlay.add_stat(stat0);
-    overlay.add_stat(stat1);
-    overlay.add_stat(stat2);
-
-    for (size_t c = 0;; c++){
-        stat2.set_text(std::to_string(c));
-        scope.wait_for(std::chrono::milliseconds(100));
-    }
-#endif
-
-
-#if 0
-    ImageFloatBox box(0.21, 0.80, 0.53, 0.17);
-
-    VideoSnapshot frame = feed.snapshot();
-    ImageViewRGB32 image = extract_box_reference(frame, box);
-
-    ImageRGB32 filtered = to_blackwhite_rgb32_range(image, 0xff007f7f, 0xffc0ffff, false);
-    filtered.save("test.png");
-
-    PokeballNameReader::instance().read_substring(
-        logger, Language::English,
-        image,
-        {{0xff007f7f, 0xff80ffff}}, 0
-    );
-#endif
-
-
-#if 0
-    ImageRGB32 image("screenshot-20221107-210754107968.png");
-//    auto image = feed.snapshot();
-    HomeDetector detector;
-//    UpdateMenuDetector detector;
-    VideoOverlaySet overlays(overlay);
-    detector.make_overlays(overlays);
-    cout << detector.detect(image) << endl;
-#endif
-
-//    ImageRGB32 image("ExclamationFalsePositive.png");
-//    find_exclamation_marks(image);
-
-//    HomeDetector detector;
-//    cout << detector.detect(image) << endl;
-
-
-#if 0
-    InferenceBoxScope left_mon_white(console, {0.708, 0.070, 0.005, 0.028});
-    InferenceBoxScope left_mon_hp(console, {0.500, 0.120, 0.18, 0.005});
-    InferenceBoxScope left_name(console, {0.467, 0.06, 0.16, 0.050});
-    InferenceBoxScope right_name(console, {0.740, 0.06, 0.16, 0.050});
-#endif
-
-//    ImageRGB32 image("Paralyzed.png");
-
-#if 0
-    BattleMenuDetector detector(BattleType::STANDARD);
-    VideoOverlaySet overlays(overlay);
-    detector.make_overlays(overlays);
-    cout << detector.detect(image) << endl;
-#endif
-
-#if 0
-    BattleMenuWatcher watcher(BattleType::STANDARD);
-    BotBaseContext context(scope, console.botbase());
-    wait_until(
-        console, context, std::chrono::seconds(60),
-        {
-            {watcher}
-        }
-    );
-#endif
 
 
 #if 0
@@ -1542,17 +1176,6 @@ void TestProgram::program(MultiSwitchProgramEnvironment& env, CancellableScope&
     }
 #endif
 
-#if 0
-    BotBaseContext context(scope, console.botbase());
-    wait_until(
-        console, context, std::chrono::seconds(60),
-        {
-            {detector}
-        },
-        std::chrono::seconds(50)
-    );
-#endif
-
 
 
 
diff --git a/SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramSwitch.h b/SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramSwitch.h
index 6f6442c415..0e59794478 100644
--- a/SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramSwitch.h
+++ b/SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramSwitch.h
@@ -1,6 +1,6 @@
 /*  Test Program (Switch)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -10,15 +10,25 @@
 #include "Common/Cpp/Options/BatchOption.h"
 #include "Common/Cpp/Options/StaticTextOption.h"
 #include "Common/Cpp/Options/BooleanCheckBoxOption.h"
-#include "CommonFramework/Options/StringSelectOption.h"
-#include "CommonFramework/Options/LanguageOCROption.h"
+#include "Common/Cpp/Options/ButtonOption.h"
+#include "Common/Cpp/Options/DateOption.h"
+#include "Common/Cpp/Options/TimeDurationOption.h"
+#include "Common/Cpp/Options/BoxFloatOption.h"
+#include "Common/Cpp/Options/FloatingPointOption.h"
+#include "Common/Cpp/Options/ColorOption.h"
+#include "Common/Cpp/Options/CheckboxDropdownOption.h"
 #include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonTools/Options/LanguageOCROption.h"
+#include "Controllers/ControllerStateTable.h"
 #include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
 #include "NintendoSwitch/NintendoSwitch_MultiSwitchProgram.h"
-#include "PokemonSwSh/Options/PokemonSwSh_BallSelectOption.h"
-#include "PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterOption.h"
-#include "PokemonSV/Options/PokemonSV_PlayerList.h"
-#include "CommonFramework/Tools/StatsTracking.h"
+#include "NintendoSwitch/Controllers/NintendoSwitch_ControllerSettings.h"
+#include "NintendoSwitch/Options/NintendoSwitch_ModelType.h"
+#include "VideoGames/PokemonSwSh/Options/PokemonSwSh_BallSelectOption.h"
+#include "VideoGames/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterOption.h"
+#include "VideoGames/PokemonSV/Options/PokemonSV_PlayerList.h"
+#include "VideoGames/PokemonSV/Options/PokemonSV_SinglesAIOption.h"
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
@@ -35,8 +45,10 @@ class TestProgram_Descriptor : public MultiSwitchProgramDescriptor{
 };
 
 
-class TestProgram : public MultiSwitchProgramInstance{
+class TestProgram : public MultiSwitchProgramInstance, public ButtonListener{
 public:
+    using Descriptor = TestProgram_Descriptor;
+    ~TestProgram();
     TestProgram();
 
 //    std::unique_ptr<StatsTracker> make_stats() const override{
@@ -44,6 +56,8 @@ class TestProgram : public MultiSwitchProgramInstance{
 //    }
     virtual void program(MultiSwitchProgramEnvironment& env, CancellableScope& scope) override;
 
+    virtual void on_press(ButtonCell& button) override;
+
 private:
     struct Stats : public StatsTracker{
         Stats()
@@ -54,14 +68,29 @@ class TestProgram : public MultiSwitchProgramInstance{
         std::atomic<uint64_t>& m_resets;
     };
 
+    virtual void start_program_border_check(
+        VideoStream& stream, size_t console_index,
+        FeedbackType feedback_type
+    ) override{}
+
 private:
+    ButtonCell BUTTON0;
+    ButtonOption BUTTON1;
+
     OCR::LanguageOCROption LANGUAGE;
 
+    StringOption IMAGE_PATH;
+    FloatingPointOption FLOAT;
+
     StaticTextOption STATIC_TEXT;
+    BoxFloatOption BOX;
+
+    CheckboxDropdownCell<Button> BUTTONS;
+    EnumDropdownCell<DpadPosition> DPAD;
+    ControllerCommandTables COMMANDS;
 
-    StringSelectOption SELECT;
 
-    PokemonSV::PlayerListTable PLAYER_LIST;
+//    PokemonSV::SinglesAIOption battle_AI;
 
     EventNotificationOption NOTIFICATION_TEST;
     EventNotificationsOption NOTIFICATIONS;
diff --git a/SerialPrograms/Source/NintendoSwitch/FixedInterval.h b/SerialPrograms/Source/NintendoSwitch/FixedInterval.h
deleted file mode 100644
index e2dcb444a3..0000000000
--- a/SerialPrograms/Source/NintendoSwitch/FixedInterval.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*  Fixed Interval Wrappers
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- *  Wrappers to reproduce an internal interface with different timing parameters.
- *
- */
-
-#ifndef PokemonAutomation_FixedIntervalWrappers_H
-#define PokemonAutomation_FixedIntervalWrappers_H
-
-#include "Commands/NintendoSwitch_Commands_PushButtons.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-
-// Hold button for `hold` ticks, then release `duration - hold` ticks.
-// If `duration` is smaller than `hold`, release 0 tick.
-inline void ssf_press_button2(BotBaseContext& context, Button button, uint16_t duration, uint16_t hold){
-    pbf_press_button(context, button, hold, duration < hold ? 0 : duration - hold);
-}
-// Hold button for 5 ticks, then release for `duration` ticks.
-inline void ssf_press_button1(BotBaseContext& context, Button button, uint16_t duration){
-    ssf_press_button2(context, button, duration, 5);
-}
-// Hold D-PAD button for `hold` ticks, then release `duration - hold` ticks.
-// If `duration` is smaller than `hold`, release 0 tick.
-inline void ssf_press_dpad2(BotBaseContext& context, DpadPosition dpad, uint16_t duration, uint16_t hold){
-    pbf_press_dpad(context, dpad, hold, duration < hold ? 0 : duration - hold);
-}
-inline void ssf_press_dpad1(BotBaseContext& context, DpadPosition dpad, uint16_t duration){
-    ssf_press_dpad2(context, dpad, duration, 5);
-}
-inline void ssf_press_joystick2(BotBaseContext& context, bool left, uint8_t x, uint8_t y, uint16_t duration, uint16_t hold){
-    if (left){
-        pbf_move_left_joystick(context, x, y, hold, duration < hold ? 0 : duration - hold);
-    }else{
-        pbf_move_right_joystick(context, x, y, hold, duration < hold ? 0 : duration - hold);
-    }
-}
-inline void ssf_hold_joystick1(BotBaseContext& context, bool left, uint8_t x, uint8_t y, uint16_t hold){
-    ssf_press_joystick2(context, left, x, y, hold, hold);
-}
-
-
-
-
-
-
-#if 0
-inline void ssf_press_button2(Button button, uint16_t duration, uint16_t hold){
-    ssf_press_button2(*global_connection, button, duration, hold);
-}
-inline void ssf_press_button1(Button button, uint16_t duration){
-    ssf_press_button1(*global_connection, button, duration);
-}
-
-inline void ssf_press_dpad2(DpadPosition dpad, uint16_t duration, uint16_t hold){
-    ssf_press_dpad2(*global_connection, dpad, duration, hold);
-}
-inline void ssf_press_dpad1(DpadPosition dpad, uint16_t duration){
-    ssf_press_dpad1(*global_connection, dpad, duration);
-}
-
-inline void ssf_press_joystick2(bool left, uint8_t x, uint8_t y, uint16_t duration, uint16_t hold){
-    ssf_press_joystick2(*global_connection, left, x, y, duration, hold);
-}
-inline void ssf_hold_joystick1(bool left, uint8_t x, uint8_t y, uint16_t hold){
-    ssf_hold_joystick1(*global_connection, left, x, y, hold);
-}
-#endif
-
-
-
-}
-}
-#endif
-
diff --git a/SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_MultiSwitchProgramOption.cpp b/SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_MultiSwitchProgramOption.cpp
deleted file mode 100644
index 956fb359f0..0000000000
--- a/SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_MultiSwitchProgramOption.cpp
+++ /dev/null
@@ -1,71 +0,0 @@
-/*  Multi-Switch Program Option
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Cpp/Json/JsonValue.h"
-#include "Common/Cpp/Json/JsonObject.h"
-#include "NintendoSwitch_MultiSwitchProgramOption.h"
-#include "UI/NintendoSwitch_MultiSwitchProgramWidget.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-
-
-
-MultiSwitchProgramOption::~MultiSwitchProgramOption() = default;
-MultiSwitchProgramOption::MultiSwitchProgramOption(const MultiSwitchProgramDescriptor& descriptor)
-    : PanelInstance(descriptor)
-    , m_descriptor(descriptor)
-    , m_system(
-        descriptor.min_pabotbase_level(),
-        descriptor.feedback(),
-        descriptor.allow_commands_while_running()
-            ? AllowCommandsWhenRunning::ENABLE_COMMANDS
-            : AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        descriptor.min_switches(),
-        descriptor.max_switches(),
-        descriptor.default_switches()
-    )
-    , m_instance(descriptor.make_instance())
-{}
-
-void MultiSwitchProgramOption::from_json(const JsonValue& json){
-    const JsonObject* obj = json.get_object();
-    if (obj == nullptr){
-        return;
-    }
-    const JsonValue* value = obj->get_value("SwitchSetup");
-    if (value){
-        m_system.load_json(*value);
-    }
-    m_instance->from_json(json);
-}
-JsonValue MultiSwitchProgramOption::to_json() const{
-    JsonObject obj = std::move(*m_instance->to_json().get_object());
-    obj["SwitchSetup"] = m_system.to_json();
-    return obj;
-}
-
-ConfigOption& MultiSwitchProgramOption::options(){
-    return m_instance->m_options;
-}
-
-std::string MultiSwitchProgramOption::check_validity() const{
-    return m_instance->check_validity();
-}
-void MultiSwitchProgramOption::restore_defaults(){
-    m_instance->restore_defaults();
-}
-
-
-QWidget* MultiSwitchProgramOption::make_widget(QWidget& parent, PanelHolder& holder){
-    return new MultiSwitchProgramWidget2(parent, *this, holder);
-}
-
-
-
-
-}
-}
diff --git a/SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_MultiSwitchProgramOption.h b/SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_MultiSwitchProgramOption.h
deleted file mode 100644
index 82a9a9e2e0..0000000000
--- a/SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_MultiSwitchProgramOption.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*  Multi-Switch Program Option
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- *  This class represents the serializable state of a Switch program.
- *  This class maintains no UI and is not thread-safe.
- *
- *  Note that this class does own the "MultiSwitchProgramInstance", object
- *  which is controlled by the individual program itself. There the running
- *  program can do whatever it wants - including keeping run-time state.
- *
- */
-
-#ifndef PokemonAutomation_NintendoSwitch_MultiSwitchProgramOption_H
-#define PokemonAutomation_NintendoSwitch_MultiSwitchProgramOption_H
-
-#include "CommonFramework/Panels/PanelInstance.h"
-#include "NintendoSwitch_MultiSwitchSystemOption.h"
-
-namespace PokemonAutomation{
-    class ConfigOption;
-namespace NintendoSwitch{
-
-class MultiSwitchProgramDescriptor;
-class MultiSwitchProgramInstance;
-
-
-class MultiSwitchProgramOption final : public PanelInstance{
-public:
-    ~MultiSwitchProgramOption();
-    MultiSwitchProgramOption(const MultiSwitchProgramDescriptor& descriptor);
-
-    virtual void from_json(const JsonValue& json) override;
-    virtual JsonValue to_json() const override;
-
-public:
-    const MultiSwitchProgramDescriptor& descriptor() const{ return m_descriptor; }
-    MultiSwitchSystemOption& system(){ return m_system; }
-    MultiSwitchProgramInstance& instance(){ return *m_instance; }
-    ConfigOption& options();
-
-    std::string check_validity() const;
-    void restore_defaults();
-
-private:
-    virtual QWidget* make_widget(QWidget& parent, PanelHolder& holder) override;
-
-private:
-    const MultiSwitchProgramDescriptor& m_descriptor;
-    MultiSwitchSystemOption m_system;
-    std::unique_ptr<MultiSwitchProgramInstance> m_instance;
-};
-
-
-
-
-
-}
-}
-#endif
diff --git a/SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_MultiSwitchProgramSession.cpp b/SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_MultiSwitchProgramSession.cpp
index 27430d5c3f..f68939620a 100644
--- a/SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_MultiSwitchProgramSession.cpp
+++ b/SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_MultiSwitchProgramSession.cpp
@@ -1,225 +1,77 @@
 /*  Multi-Switch Program Session
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include "Common/Cpp/Exceptions.h"
-#include "Common/Cpp/Concurrency/SpinPause.h"
-#include "Common/Cpp/Containers/FixedLimitVector.tpp"
-#include "CommonFramework/GlobalSettingsPanel.h"
-#include "CommonFramework/Exceptions/ProgramFinishedException.h"
-#include "CommonFramework/Exceptions/OperationFailedException.h"
-#include "CommonFramework/Notifications/ProgramInfo.h"
-#include "CommonFramework/Notifications/ProgramNotifications.h"
-#include "CommonFramework/Tools/BlackBorderCheck.h"
-#include "NintendoSwitch_MultiSwitchProgramOption.h"
+#include "Common/Cpp/EarlyShutdown.h"
+#include "NintendoSwitch/NintendoSwitch_Settings.h"
+#include "NintendoSwitch/Options/NintendoSwitch_ModelType.h"
 #include "NintendoSwitch_MultiSwitchProgramSession.h"
 
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
 namespace PokemonAutomation{
 namespace NintendoSwitch{
 
 
 
-void MultiSwitchProgramSession::add_listener(Listener& listener){
-    SpinLockGuard lg(m_lock);
-    m_listeners.insert(&listener);
-}
-void MultiSwitchProgramSession::remove_listener(Listener& listener){
-    SpinLockGuard lg(m_lock);
-    m_listeners.erase(&listener);
-}
-
-
-
-
-MultiSwitchProgramSession::MultiSwitchProgramSession(MultiSwitchProgramOption& option)
-    : ProgramSession(option.descriptor())
-    , m_option(option)
-    , m_system(option.system(), instance_id())
-    , m_scope(nullptr)
-{
-    SpinLockGuard lg(m_lock);
-    m_system.add_listener(*this);
-    m_option.instance().update_active_consoles(option.system().count());
-}
-
+MultiSwitchProgramSession::MultiSwitchProgramSession(const MultiSwitchProgramDescriptor& descriptor)
+    : GameConsole::MultiConsoleProgramSession(
+        descriptor,
+        std::make_unique<GameConsole::MultiConsoleSystemOption>(
+            descriptor.min_consoles(),
+            descriptor.max_consoles(),
+            descriptor.default_consoles(),
+            [](size_t console_index){
+                return std::make_unique<GameConsole::ConsoleSystemOption>(
+                    1, std::make_unique<ConsoleModelCell>()
+                );
+            }
+        )
+    )
+{}
 MultiSwitchProgramSession::~MultiSwitchProgramSession(){
-    MultiSwitchProgramSession::internal_stop_program();
-    m_system.remove_listener(*this);
-    join_program_thread();
-}
-
-
-
-void MultiSwitchProgramSession::restore_defaults(){
-    std::lock_guard<std::mutex> lg(program_lock());
-    if (current_state() != ProgramState::STOPPED){
-        logger().log("Cannot change settings while program is running.", COLOR_RED);
-        return;
-    }
-    logger().log("Restoring settings to defaults...");
-    m_option.restore_defaults();
-}
-std::string MultiSwitchProgramSession::check_validity() const{
-    return m_option.check_validity();
+    blocking_shutdown(
+        logger(),
+        "MultiSwitchProgramSession",
+        [this]{ return try_shutdown(); }
+    );
 }
 
 
 
-void MultiSwitchProgramSession::run_program_instance(MultiSwitchProgramEnvironment& env, CancellableScope& scope){
-    {
-        std::lock_guard<std::mutex> lg(program_lock());
-        std::string error = check_validity();
-        if (!error.empty()){
-            throw UserSetupError(logger(), std::move(error));
-        }
-    }
 
-    size_t consoles = m_system.count();
+std::unique_ptr<ProgramEnvironment> MultiSwitchProgramSession::make_env(const ProgramInfo& program_info){
+    size_t consoles = system().active_consoles();
+    std::vector<std::unique_ptr<GameConsole::ConsoleHandle>> handles;
     for (size_t c = 0; c < consoles; c++){
-        if (!m_system[c].serial_session().is_ready()){
-            throw UserSetupError(m_system[c].logger(), "Cannot Start: Serial connection not ready.");
-        }
-        start_program_video_check(env.consoles[c], m_option.descriptor().feedback());
-    }
-
-    m_scope.store(&scope, std::memory_order_release);
-
-    try{
-        m_option.instance().program(env, scope);
-        for (size_t c = 0; c < consoles; c++){
-            env.consoles[c].botbase().wait_for_all_requests();
+        GameConsole::ConsoleSystemSession& session = system()[c];
+        auto uptr = std::make_unique<ConsoleHandle>(session);
+        ConsoleHandle* handle = uptr.get();
+        handles.emplace_back(std::move(uptr));
+
+        ConsoleModelCell& console_type = static_cast<ConsoleModelCell&>(*session.extra_option());
+
+        ConsoleState& state = handle->state();
+        if (ConsoleSettings::instance().TRUST_USER_CONSOLE_SELECTION){
+            state.set_console_type(handle->logger(), console_type);
+        }else{
+            state.set_console_type_user(console_type);
         }
-    }catch (...){
-        m_scope.store(nullptr, std::memory_order_release);
-        throw;
-    }
-    m_scope.store(nullptr, std::memory_order_release);
-}
-void MultiSwitchProgramSession::internal_stop_program(){
-    SpinLockGuard lg(m_lock);
-    size_t consoles = m_system.count();
-    for (size_t c = 0; c < consoles; c++){
-        m_system[c].serial_session().stop();
     }
-    CancellableScope* scope = m_scope.load(std::memory_order_acquire);
-    if (scope != nullptr){
-        scope->cancel(std::make_exception_ptr(ProgramCancelledException()));
-    }
-
-    //  Wait for program thread to finish.
-    while (m_scope.load(std::memory_order_acquire) != nullptr){
-        pause();
-    }
-
-    for (size_t c = 0; c < consoles; c++){
-        m_system[c].serial_session().reset();
-    }
-}
-void MultiSwitchProgramSession::internal_run_program(){
-    GlobalSettings::instance().REALTIME_THREAD_PRIORITY0.set_on_this_thread();
-    m_option.options().reset_state();
-
-    //  Lock the system to prevent the # of Switches from changing.
-    std::lock_guard<MultiSwitchSystemSession> lg(m_system);
-
-    ProgramInfo program_info(
-        identifier(),
-        m_option.descriptor().category(),
-        m_option.descriptor().display_name(),
-        timestamp()
-    );
-
-    size_t consoles = m_system.count();
-    FixedLimitVector<ConsoleHandle> handles(consoles);
-    for (size_t c = 0; c < consoles; c++){
-        SwitchSystemSession& session = m_system[c];
-        handles.emplace_back(
-            c,
-            session.logger(),
-            session.sender().botbase(),
-            session.video(),
-            session.overlay(),
-            session.audio()
-        );
-    }
-
-
-    CancellableHolder<CancellableScope> scope;
-    MultiSwitchProgramEnvironment env(
+    return std::make_unique<MultiSwitchProgramEnvironment>(
         program_info,
-        scope,
+        *m_scope,
         *this,
         current_stats_tracker(), historical_stats_tracker(),
         std::move(handles)
     );
-
-    try{
-        logger().log("<b>Starting Program: " + identifier() + "</b>");
-        run_program_instance(env, scope);
-//        m_setup->wait_for_all_requests();
-        logger().log("Program finished normally!", COLOR_BLUE);
-    }catch (OperationCancelledException&){
-    }catch (ProgramCancelledException&){
-    }catch (ProgramFinishedException& e){
-        logger().log("Program finished early!", COLOR_BLUE);
-        e.send_notification(env, m_option.instance().NOTIFICATION_PROGRAM_FINISH);
-    }catch (InvalidConnectionStateException&){
-    }catch (OperationFailedException& e){
-        logger().log("Program stopped with an exception!", COLOR_RED);
-        std::string message = e.message();
-        if (message.empty()){
-            message = e.name();
-        }
-        report_error(message);
-        e.send_notification(env, m_option.instance().NOTIFICATION_ERROR_FATAL);
-    }catch (Exception& e){
-        logger().log("Program stopped with an exception!", COLOR_RED);
-        std::string message = e.message();
-        if (message.empty()){
-            message = e.name();
-        }
-        report_error(message);
-        send_program_fatal_error_notification(
-            env, m_option.instance().NOTIFICATION_ERROR_FATAL,
-            message
-        );
-    }catch (std::exception& e){
-        logger().log("Program stopped with an exception!", COLOR_RED);
-        std::string message = e.what();
-        if (message.empty()){
-            message = "Unknown std::exception.";
-        }
-        report_error(message);
-        send_program_fatal_error_notification(
-            env, m_option.instance().NOTIFICATION_ERROR_FATAL,
-            message
-        );
-    }catch (...){
-        logger().log("Program stopped with an exception!", COLOR_RED);
-        report_error("Unknown error.");
-        send_program_fatal_error_notification(
-            env, m_option.instance().NOTIFICATION_ERROR_FATAL,
-            "Unknown error."
-        );
-    }
 }
 
 
-void MultiSwitchProgramSession::shutdown(){
-    internal_stop_program();
-}
-void MultiSwitchProgramSession::startup(size_t switch_count){
-    SpinLockGuard lg(m_lock);
-    m_option.instance().update_active_consoles(switch_count);
-    for (Listener* listener : m_listeners){
-        listener->redraw_options();
-    }
-}
-
-
-
 
 
 
diff --git a/SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_MultiSwitchProgramSession.h b/SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_MultiSwitchProgramSession.h
index d8a98fcef8..afbc38be8a 100644
--- a/SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_MultiSwitchProgramSession.h
+++ b/SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_MultiSwitchProgramSession.h
@@ -1,6 +1,6 @@
 /*  Multi-Switch Program Session
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  *  This class holds the run-time state of a Switch program.
  *
@@ -15,9 +15,8 @@
 #ifndef PokemonAutomation_NintendoSwitch_MultiSwitchProgramSession_H
 #define PokemonAutomation_NintendoSwitch_MultiSwitchProgramSession_H
 
-#include "CommonFramework/ProgramSession.h"
+#include "GameConsole/Framework/MultiConsoleProgramSession.h"
 #include "NintendoSwitch/NintendoSwitch_MultiSwitchProgram.h"
-#include "NintendoSwitch_MultiSwitchSystemSession.h"
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
@@ -25,44 +24,13 @@ namespace NintendoSwitch{
 class MultiSwitchProgramOption;
 
 
-class MultiSwitchProgramSession final : public ProgramSession, private MultiSwitchSystemSession::Listener{
+class MultiSwitchProgramSession final : public GameConsole::MultiConsoleProgramSession{
 public:
-    //  This is temporary. Remove once configs have push notifications.
-    struct Listener{
-        virtual void redraw_options() = 0;
-    };
-    void add_listener(Listener& listener);
-    void remove_listener(Listener& listener);
-
-public:
-    virtual ~MultiSwitchProgramSession();
-    MultiSwitchProgramSession(MultiSwitchProgramOption& option);
-
-    void restore_defaults();
-
-public:
-    MultiSwitchSystemSession& system(){ return m_system; }
+    ~MultiSwitchProgramSession();
+    MultiSwitchProgramSession(const MultiSwitchProgramDescriptor& descriptor);
 
 private:
-    virtual std::string check_validity() const override;
-
-    virtual void internal_run_program() override;
-    virtual void internal_stop_program() override;
-
-    virtual void shutdown() override;
-    virtual void startup(size_t switch_count) override;
-
-private:
-    void run_program_instance(MultiSwitchProgramEnvironment& env, CancellableScope& scope);
-
-private:
-    MultiSwitchProgramOption& m_option;
-    MultiSwitchSystemSession m_system;
-
-    SpinLock m_lock;
-    std::atomic<CancellableScope*> m_scope;
-
-    std::set<Listener*> m_listeners;
+    virtual std::unique_ptr<ProgramEnvironment> make_env(const ProgramInfo& program_info) override;
 };
 
 
diff --git a/SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_MultiSwitchSystemOption.cpp b/SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_MultiSwitchSystemOption.cpp
deleted file mode 100644
index c8cc3715c8..0000000000
--- a/SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_MultiSwitchSystemOption.cpp
+++ /dev/null
@@ -1,106 +0,0 @@
-/*  Multi-Switch System Option
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Cpp/Json/JsonValue.h"
-#include "Common/Cpp/Json/JsonArray.h"
-#include "Common/Cpp/Json/JsonObject.h"
-#include "NintendoSwitch_MultiSwitchSystemOption.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-
-
-MultiSwitchSystemOption::MultiSwitchSystemOption(
-    PABotBaseLevel min_pabotbase,
-    FeedbackType feedback,
-    AllowCommandsWhenRunning allow_commands_while_running,
-    size_t min_switches,
-    size_t max_switches,
-    size_t switches
-)
-    : m_min_pabotbase(min_pabotbase)
-    , m_allow_commands_while_running(allow_commands_while_running == AllowCommandsWhenRunning::ENABLE_COMMANDS)
-    , m_min_switches(std::max(min_switches, (size_t)1))
-    , m_max_switches(std::min(max_switches, (size_t)MAX_SWITCHES))
-    , m_active_switches(0)
-{
-    switches = std::max(switches, m_min_switches);
-    switches = std::min(switches, m_max_switches);
-    resize(switches);
-}
-MultiSwitchSystemOption::MultiSwitchSystemOption(
-    PABotBaseLevel min_pabotbase,
-    FeedbackType feedback,
-    AllowCommandsWhenRunning allow_commands_while_running,
-    size_t min_switches,
-    size_t max_switches,
-    const JsonValue& json
-)
-    : m_min_pabotbase(min_pabotbase)
-    , m_allow_commands_while_running(allow_commands_while_running == AllowCommandsWhenRunning::ENABLE_COMMANDS)
-    , m_min_switches(std::max(min_switches, (size_t)1))
-    , m_max_switches(std::min(max_switches, (size_t)MAX_SWITCHES))
-    , m_active_switches(0)
-{
-    MultiSwitchSystemOption::load_json(json);
-    if (m_switches.size() < m_min_switches){
-        resize(m_min_switches);
-    }
-}
-void MultiSwitchSystemOption::load_json(const JsonValue& json){
-    const JsonObject* obj = json.get_object();
-    if (obj == nullptr){
-        return;
-    }
-    const JsonArray* array = obj->get_array("DeviceList");
-    if (array != nullptr && !array->empty() && array->size() <= MAX_SWITCHES){
-        m_switches.clear();
-        size_t items = array->size();
-        for (size_t c = 0; c < items; c++){
-            m_switches.emplace_back(
-                new SwitchSystemOption(
-                    m_min_pabotbase,
-                    m_allow_commands_while_running,
-                    (*array)[c]
-                )
-            );
-        }
-    }
-    obj->read_integer(m_active_switches, "ActiveDevices", m_min_switches, m_max_switches);
-}
-JsonValue MultiSwitchSystemOption::to_json() const{
-    JsonObject obj;
-    obj["ActiveDevices"] = m_active_switches;
-    JsonArray array;
-    for (const auto& item : m_switches){
-        array.push_back(item->to_json());
-    }
-    obj["DeviceList"] = std::move(array);
-    return obj;
-}
-void MultiSwitchSystemOption::resize(size_t count){
-    while (m_switches.size() < count){
-        m_switches.emplace_back(
-            new SwitchSystemOption(
-                m_min_pabotbase,
-                m_allow_commands_while_running
-            )
-        );
-    }
-    m_active_switches = count;
-}
-
-
-
-
-
-}
-}
-
-
-
-
-
diff --git a/SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_MultiSwitchSystemOption.h b/SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_MultiSwitchSystemOption.h
deleted file mode 100644
index 112dfc0c02..0000000000
--- a/SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_MultiSwitchSystemOption.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*  Multi-Switch System Option
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- *  This class represents the serializable state of a set of Switch.
- *  consoles. Specifically, it holds a SwitchSystemOption for each of the
- *  consoles it represents.
- *
- *  This class maintains no runtime state or UI and is not thread-safe.
- *
- */
-
-#ifndef PokemonAutomationn_NintendoSwitch_MultiSwitchSystemOption_H
-#define PokemonAutomationn_NintendoSwitch_MultiSwitchSystemOption_H
-
-#include <memory>
-#include <vector>
-#include "NintendoSwitch_SwitchSystemOption.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-
-
-class MultiSwitchSystemWidget;
-
-class MultiSwitchSystemOption{
-public:
-    static const size_t MAX_SWITCHES = 4;
-
-public:
-    MultiSwitchSystemOption(
-        PABotBaseLevel min_pabotbase,
-        FeedbackType feedback,
-        AllowCommandsWhenRunning allow_commands_while_running,
-        size_t min_switches,
-        size_t max_switches,
-        size_t switches
-    );
-    MultiSwitchSystemOption(
-        PABotBaseLevel min_pabotbase,
-        FeedbackType feedback,
-        AllowCommandsWhenRunning allow_commands_while_running,
-        size_t min_switches,
-        size_t max_switches,
-        const JsonValue& json
-    );
-    void load_json(const JsonValue& json);
-    JsonValue to_json() const;
-
-    void resize(size_t count);
-
-public:
-    size_t min_switches() const{ return m_min_switches; }
-    size_t max_switches() const{ return m_max_switches; }
-
-    size_t count() const{ return m_active_switches; }
-    SwitchSystemOption& operator[](size_t index){ return *m_switches[index]; }
-
-
-private:
-    friend class MultiSwitchSystemWidget;
-
-    const PABotBaseLevel m_min_pabotbase;
-    const bool m_allow_commands_while_running;
-
-    const size_t m_min_switches;
-    const size_t m_max_switches;
-    size_t m_active_switches;
-    std::vector<std::unique_ptr<SwitchSystemOption>> m_switches;
-};
-
-
-
-
-}
-}
-#endif
diff --git a/SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_MultiSwitchSystemSession.cpp b/SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_MultiSwitchSystemSession.cpp
deleted file mode 100644
index aefd6f2a11..0000000000
--- a/SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_MultiSwitchSystemSession.cpp
+++ /dev/null
@@ -1,75 +0,0 @@
-/*  Multi-Switch System Session
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Cpp/Containers/FixedLimitVector.tpp"
-#include "NintendoSwitch_MultiSwitchSystemSession.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-
-
-
-void MultiSwitchSystemSession::add_listener(Listener& listener){
-    std::lock_guard<std::mutex> lg(m_lock);
-    m_listeners.insert(&listener);
-}
-void MultiSwitchSystemSession::remove_listener(Listener& listener){
-    std::lock_guard<std::mutex> lg(m_lock);
-    m_listeners.erase(&listener);
-}
-
-
-MultiSwitchSystemSession::~MultiSwitchSystemSession() = default;
-MultiSwitchSystemSession::MultiSwitchSystemSession(
-    MultiSwitchSystemOption& option,
-    uint64_t program_id
-)
-    : m_option(option)
-    , m_program_id(program_id)
-    , m_switch_count_locked(false)
-    , m_consoles(option.count())
-{
-    size_t count = option.count();
-    for (size_t c = 0; c < count; c++){
-        m_consoles.emplace_back(option[c], program_id, c);
-    }
-}
-
-void MultiSwitchSystemSession::lock(){
-    std::lock_guard<std::mutex> lg(m_lock);
-    m_switch_count_locked = true;
-}
-void MultiSwitchSystemSession::unlock(){
-    std::lock_guard<std::mutex> lg(m_lock);
-    m_switch_count_locked = false;
-}
-bool MultiSwitchSystemSession::set_switch_count(size_t count){
-    std::lock_guard<std::mutex> lg(m_lock);
-    if (m_switch_count_locked){
-        return false;
-    }
-
-    for (Listener* listener : m_listeners){
-        listener->shutdown();
-    }
-    m_consoles.reset(count);
-    m_option.resize(count);
-    for (size_t c = 0; c < count; c++){
-        m_consoles.emplace_back(m_option[c], m_program_id, c);
-    }
-    for (Listener* listener : m_listeners){
-        listener->startup(count);
-    }
-
-    return true;
-}
-
-
-
-
-
-}
-}
diff --git a/SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_MultiSwitchSystemSession.h b/SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_MultiSwitchSystemSession.h
deleted file mode 100644
index f2d8d521ed..0000000000
--- a/SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_MultiSwitchSystemSession.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*  Multi-Switch System Session
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- *  This class holds the run-time state for multiple Switch systems.
- *
- *  This class is fully thread-safe. You can call any functions from anywhere at
- *  anytime.
- *
- *  Warning: Constructing this class requires an "option" parameter. It is not
- *  safe to modify this "option" parameter during the lifetime of this class.
- *
- */
-
-#ifndef PokemonAutomationn_NintendoSwitch_MultiSwitchSystemSession_H
-#define PokemonAutomationn_NintendoSwitch_MultiSwitchSystemSession_H
-
-#include "Common/Cpp/Containers/FixedLimitVector.h"
-#include "NintendoSwitch_SwitchSystemSession.h"
-#include "NintendoSwitch_MultiSwitchSystemOption.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-
-
-class MultiSwitchSystemSession{
-public:
-    struct Listener{
-        //  Sent before the Switch sessions are destroyed. Listeners should
-        //  their references to them before returning.
-        virtual void shutdown() = 0;
-
-        //  Sent after new Switches are started up.
-        virtual void startup(size_t switch_count) = 0;
-    };
-    void add_listener(Listener& listener);
-    void remove_listener(Listener& listener);
-
-
-public:
-    ~MultiSwitchSystemSession();
-    MultiSwitchSystemSession(
-        MultiSwitchSystemOption& option,
-        uint64_t program_id
-    );
-
-    //  Lock/unlock the Switch count.
-    void lock();
-    void unlock();
-
-    //  Returns true only on success.
-    bool set_switch_count(size_t count);
-
-    size_t min_switches() const{ return m_option.min_switches(); }
-    size_t max_switches() const{ return m_option.max_switches(); }
-
-public:
-    //  Note that these are not thread-safe with changing the # of switches.
-    size_t count() const{ return m_consoles.size(); }
-    SwitchSystemSession& operator[](size_t index){ return m_consoles[index]; }
-
-
-private:
-    MultiSwitchSystemOption& m_option;
-    const uint64_t m_program_id;
-
-    std::mutex m_lock;
-    bool m_switch_count_locked;
-    FixedLimitVector<SwitchSystemSession> m_consoles;
-    std::set<Listener*> m_listeners;
-};
-
-
-
-
-}
-}
-#endif
diff --git a/SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_SingleSwitchProgramOption.cpp b/SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_SingleSwitchProgramOption.cpp
deleted file mode 100644
index 4842d5e24a..0000000000
--- a/SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_SingleSwitchProgramOption.cpp
+++ /dev/null
@@ -1,62 +0,0 @@
-/*  Single Switch Program Option
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Cpp/Json/JsonValue.h"
-#include "Common/Cpp/Json/JsonObject.h"
-#include "NintendoSwitch_SingleSwitchProgramOption.h"
-#include "UI/NintendoSwitch_SingleSwitchProgramWidget.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-
-
-SingleSwitchProgramOption::~SingleSwitchProgramOption() = default;
-SingleSwitchProgramOption::SingleSwitchProgramOption(const SingleSwitchProgramDescriptor& descriptor)
-    : PanelInstance(descriptor)
-    , m_descriptor(descriptor)
-    , m_system(descriptor.min_pabotbase_level(), descriptor.allow_commands_while_running())
-    , m_instance(descriptor.make_instance())
-{}
-
-void SingleSwitchProgramOption::from_json(const JsonValue& json){
-    const JsonObject* obj = json.get_object();
-    if (obj == nullptr){
-        return;
-    }
-    const JsonValue* value = obj->get_value("SwitchSetup");
-    if (value){
-        m_system.load_json(*value);
-    }
-    m_instance->from_json(json);
-}
-JsonValue SingleSwitchProgramOption::to_json() const{
-    JsonObject obj = std::move(*m_instance->to_json().get_object());
-    obj["SwitchSetup"] = m_system.to_json();
-    return obj;
-}
-
-ConfigOption& SingleSwitchProgramOption::options(){
-    return m_instance->m_options;
-}
-
-std::string SingleSwitchProgramOption::check_validity() const{
-    return m_instance->check_validity();
-}
-void SingleSwitchProgramOption::restore_defaults(){
-    m_instance->restore_defaults();
-}
-
-
-QWidget* SingleSwitchProgramOption::make_widget(QWidget& parent, PanelHolder& holder){
-    return new SingleSwitchProgramWidget2(parent, *this, holder);
-}
-
-
-
-
-
-}
-}
diff --git a/SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_SingleSwitchProgramOption.h b/SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_SingleSwitchProgramOption.h
deleted file mode 100644
index 4ce7e9af90..0000000000
--- a/SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_SingleSwitchProgramOption.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*  Single Switch Program Option
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- *  This class represents the serializable state of a Switch program.
- *  This class maintains no UI and is not thread-safe.
- *
- *  Note that this class does own the "SingleSwitchProgramInstance", object
- *  which is controlled by the individual program itself. There the running
- *  program can do whatever it wants - including keeping run-time state.
- *
- */
-
-#ifndef PokemonAutomation_NintendoSwitch_SingleSwitchProgramOption_H
-#define PokemonAutomation_NintendoSwitch_SingleSwitchProgramOption_H
-
-#include "CommonFramework/Panels/PanelInstance.h"
-#include "NintendoSwitch_SwitchSystemOption.h"
-
-namespace PokemonAutomation{
-    class ConfigOption;
-namespace NintendoSwitch{
-
-class SingleSwitchProgramDescriptor;
-class SingleSwitchProgramInstance;
-
-
-class SingleSwitchProgramOption final : public PanelInstance{
-public:
-    ~SingleSwitchProgramOption();
-    SingleSwitchProgramOption(const SingleSwitchProgramDescriptor& descriptor);
-
-    virtual void from_json(const JsonValue& json) override;
-    virtual JsonValue to_json() const override;
-
-public:
-    const SingleSwitchProgramDescriptor& descriptor() const{ return m_descriptor; }
-    SwitchSystemOption& system(){ return m_system; }
-    SingleSwitchProgramInstance& instance(){ return *m_instance; }
-    ConfigOption& options();
-
-    std::string check_validity() const;
-    void restore_defaults();
-
-private:
-    virtual QWidget* make_widget(QWidget& parent, PanelHolder& holder) override;
-
-private:
-    const SingleSwitchProgramDescriptor& m_descriptor;
-    SwitchSystemOption m_system;
-    std::unique_ptr<SingleSwitchProgramInstance> m_instance;
-};
-
-
-
-
-
-
-
-
-}
-}
-#endif
diff --git a/SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_SingleSwitchProgramSession.cpp b/SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_SingleSwitchProgramSession.cpp
index 3c53b5a255..d3de0eee8d 100644
--- a/SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_SingleSwitchProgramSession.cpp
+++ b/SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_SingleSwitchProgramSession.cpp
@@ -1,168 +1,69 @@
 /*  Single Switch Program Session
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include "Common/Cpp/Exceptions.h"
-#include "Common/Cpp/Concurrency/SpinPause.h"
-#include "CommonFramework/GlobalSettingsPanel.h"
-#include "CommonFramework/Exceptions/ProgramFinishedException.h"
-#include "CommonFramework/Exceptions/OperationFailedException.h"
-#include "CommonFramework/Notifications/ProgramInfo.h"
-#include "CommonFramework/Notifications/ProgramNotifications.h"
-#include "CommonFramework/Tools/BlackBorderCheck.h"
-#include "NintendoSwitch_SingleSwitchProgramOption.h"
+#include "Common/Cpp/EarlyShutdown.h"
+#include "NintendoSwitch/NintendoSwitch_Settings.h"
+#include "NintendoSwitch/Options/NintendoSwitch_ModelType.h"
 #include "NintendoSwitch_SingleSwitchProgramSession.h"
 
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
 namespace PokemonAutomation{
 namespace NintendoSwitch{
 
 
 
-SingleSwitchProgramSession::SingleSwitchProgramSession(SingleSwitchProgramOption& option, size_t console_number)
-    : ProgramSession(option.descriptor())
-    , m_option(option)
-    , m_system(option.system(), instance_id(), console_number)
-    , m_scope(nullptr)
+SingleSwitchProgramSession::SingleSwitchProgramSession(const SingleSwitchProgramDescriptor& descriptor)
+    : GameConsole::ConsoleProgramSession(
+        descriptor,
+        std::make_unique<ConsoleModelCell>()
+    )
+    , m_descriptor(descriptor)
 {}
 
+
 SingleSwitchProgramSession::~SingleSwitchProgramSession(){
-    SingleSwitchProgramSession::internal_stop_program();
-    join_program_thread();
+    blocking_shutdown(
+        logger(),
+        "SingleSwitchProgramSession",
+        [this]{ return try_shutdown(); }
+    );
 }
 
 
-void SingleSwitchProgramSession::restore_defaults(){
-    std::lock_guard<std::mutex> lg(program_lock());
-    if (current_state() != ProgramState::STOPPED){
-        logger().log("Cannot change settings while program is running.", COLOR_RED);
-        return;
-    }
-    logger().log("Restoring settings to defaults...");
-    m_option.restore_defaults();
-}
-std::string SingleSwitchProgramSession::check_validity() const{
-    return m_option.check_validity();
-}
 
 
+std::unique_ptr<ProgramEnvironment> SingleSwitchProgramSession::make_env(const ProgramInfo& program_info){
+    auto env = std::make_unique<SingleSwitchProgramEnvironment>(
+        program_info,
+        *m_scope,
+        *this,
+        current_stats_tracker(),
+        historical_stats_tracker(),
+        system()
+    );
 
-void SingleSwitchProgramSession::run_program_instance(SingleSwitchProgramEnvironment& env, CancellableScope& scope){
-    {
-        std::lock_guard<std::mutex> lg(program_lock());
-        std::string error = check_validity();
-        if (!error.empty()){
-            throw UserSetupError(logger(), std::move(error));
-        }
-    }
+    ConsoleModelCell& console_type = static_cast<ConsoleModelCell&>(*system().extra_option());
 
-    if (!m_system.serial_session().is_ready()){
-        throw UserSetupError(m_system.logger(), "Cannot Start: Serial connection not ready.");
+    if (ConsoleSettings::instance().TRUST_USER_CONSOLE_SELECTION){
+        env->console.state().set_console_type(system().logger(), console_type);
+    }else{
+        env->console.state().set_console_type_user(console_type);
     }
+    return env;
+}
+
 
-    start_program_video_check(env.console, m_option.descriptor().feedback());
 
-    m_scope.store(&scope, std::memory_order_release);
 
-    try{
-        BotBaseContext context(scope, env.console.botbase());
-        m_option.instance().program(env, context);
-        context.wait_for_all_requests();
-    }catch (...){
-        m_scope.store(nullptr, std::memory_order_release);
-        throw;
-    }
-    m_scope.store(nullptr, std::memory_order_release);
-}
-void SingleSwitchProgramSession::internal_stop_program(){
-    SpinLockGuard lg(m_lock);
-    m_system.serial_session().stop();
-    CancellableScope* scope = m_scope.load(std::memory_order_acquire);
-    if (scope != nullptr){
-        scope->cancel(std::make_exception_ptr(ProgramCancelledException()));
-    }
 
-    //  Wait for program thread to finish.
-    while (m_scope.load(std::memory_order_acquire) != nullptr){
-        pause();
-    }
 
-    m_system.serial_session().reset();
-}
-void SingleSwitchProgramSession::internal_run_program(){
-    GlobalSettings::instance().REALTIME_THREAD_PRIORITY0.set_on_this_thread();
-    m_option.options().reset_state();
-
-    ProgramInfo program_info(
-        identifier(),
-        m_option.descriptor().category(),
-        m_option.descriptor().display_name(),
-        timestamp()
-    );
-    CancellableHolder<CancellableScope> scope;
-    SingleSwitchProgramEnvironment env(
-        program_info,
-        scope,
-        *this,
-        current_stats_tracker(), historical_stats_tracker(),
-        m_system.logger(),
-        m_system.sender().botbase(),
-        m_system.video(),
-        m_system.overlay(),
-        m_system.audio()
-    );
 
-    try{
-        logger().log("<b>Starting Program: " + identifier() + "</b>");
-        run_program_instance(env, scope);
-//        m_setup->wait_for_all_requests();
-        logger().log("Program finished normally!", COLOR_BLUE);
-    }catch (OperationCancelledException&){
-    }catch (ProgramCancelledException&){
-    }catch (ProgramFinishedException& e){
-        logger().log("Program finished early!", COLOR_BLUE);
-        e.send_notification(env, m_option.instance().NOTIFICATION_PROGRAM_FINISH);
-    }catch (InvalidConnectionStateException&){
-    }catch (OperationFailedException& e){
-        logger().log("Program stopped with an exception!", COLOR_RED);
-        std::string message = e.message();
-        if (message.empty()){
-            message = e.name();
-        }
-        report_error(message);
-        e.send_notification(env, m_option.instance().NOTIFICATION_ERROR_FATAL);
-    }catch (Exception& e){
-        logger().log("Program stopped with an exception!", COLOR_RED);
-        std::string message = e.message();
-        if (message.empty()){
-            message = e.name();
-        }
-        report_error(message);
-        send_program_fatal_error_notification(
-            env, m_option.instance().NOTIFICATION_ERROR_FATAL,
-            message
-        );
-    }catch (std::exception& e){
-        logger().log("Program stopped with an exception!", COLOR_RED);
-        std::string message = e.what();
-        if (message.empty()){
-            message = "Unknown std::exception.";
-        }
-        report_error(message);
-        send_program_fatal_error_notification(
-            env, m_option.instance().NOTIFICATION_ERROR_FATAL,
-            message
-        );
-    }catch (...){
-        logger().log("Program stopped with an exception!", COLOR_RED);
-        report_error("Unknown error.");
-        send_program_fatal_error_notification(
-            env, m_option.instance().NOTIFICATION_ERROR_FATAL,
-            "Unknown error."
-        );
-    }
-}
 
 
 
diff --git a/SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_SingleSwitchProgramSession.h b/SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_SingleSwitchProgramSession.h
index 1a03f9f29d..c63254f2f6 100644
--- a/SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_SingleSwitchProgramSession.h
+++ b/SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_SingleSwitchProgramSession.h
@@ -1,6 +1,6 @@
 /*  Single Switch Program Session
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  *  This class holds the run-time state of a Switch program.
  *
@@ -15,43 +15,26 @@
 #ifndef PokemonAutomation_NintendoSwitch_SingleSwitchProgramSession_H
 #define PokemonAutomation_NintendoSwitch_SingleSwitchProgramSession_H
 
-#include "Common/Cpp/Concurrency/SpinLock.h"
-#include "CommonFramework/ProgramSession.h"
-#include "NintendoSwitch_SwitchSystemSession.h"
+#include "GameConsole/Framework/ConsoleProgramSession.h"
 #include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
 
-class SingleSwitchProgramOption;
 
 
-class SingleSwitchProgramSession final : public ProgramSession{
+class SingleSwitchProgramSession final : public GameConsole::ConsoleProgramSession{
 public:
-    virtual ~SingleSwitchProgramSession();
-    SingleSwitchProgramSession(SingleSwitchProgramOption& option, size_t console_number);
+    ~SingleSwitchProgramSession();
+    SingleSwitchProgramSession(const SingleSwitchProgramDescriptor& descriptor);
 
-    void restore_defaults();
-
-public:
-    SwitchSystemSession& system(){ return m_system; }
+    const SingleSwitchProgramDescriptor& descriptor() const{ return m_descriptor; }
 
 private:
-    virtual std::string check_validity() const override;
-
-    virtual void internal_run_program() override;
-    virtual void internal_stop_program() override;
-
+    virtual std::unique_ptr<ProgramEnvironment> make_env(const ProgramInfo& program_info) override;
 
 private:
-    void run_program_instance(SingleSwitchProgramEnvironment& env, CancellableScope& scope);
-
-private:
-    SingleSwitchProgramOption& m_option;
-    SwitchSystemSession m_system;
-
-    SpinLock m_lock;
-    std::atomic<CancellableScope*> m_scope;
+    const SingleSwitchProgramDescriptor& m_descriptor;
 };
 
 
diff --git a/SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_SwitchSystemOption.cpp b/SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_SwitchSystemOption.cpp
deleted file mode 100644
index 2cfd0149aa..0000000000
--- a/SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_SwitchSystemOption.cpp
+++ /dev/null
@@ -1,100 +0,0 @@
-/*  Switch System
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Cpp/Json/JsonValue.h"
-#include "Common/Cpp/Json/JsonObject.h"
-#include "NintendoSwitch/NintendoSwitch_Settings.h"
-#include "NintendoSwitch_SwitchSystemOption.h"
-#include "UI/NintendoSwitch_SwitchSystemWidget.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-
-
-Color pick_color(FeedbackType feedback, PABotBaseLevel size){
-    switch (size){
-    case PABotBaseLevel::NOT_PABOTBASE:
-        return Color();
-    case PABotBaseLevel::PABOTBASE_12KB:
-        return feedback == FeedbackType::REQUIRED ? COLOR_DARKGREEN : COLOR_BLUE;
-    case PABotBaseLevel::PABOTBASE_31KB:
-        return feedback == FeedbackType::REQUIRED ? COLOR_PURPLE : COLOR_RED;
-    }
-    return Color();
-}
-
-
-
-const std::string SwitchSystemOption::JSON_SERIAL  = "Serial";
-const std::string SwitchSystemOption::JSON_CAMERA  = "Camera";
-const std::string SwitchSystemOption::JSON_AUDIO   = "Audio";
-const std::string SwitchSystemOption::JSON_OVERLAY = "Overlay";
-
-
-SwitchSystemOption::SwitchSystemOption(
-    PABotBaseLevel min_pabotbase,
-    bool allow_commands_while_running
-)
-    : m_allow_commands_while_running(allow_commands_while_running)
-    , m_serial(min_pabotbase)
-    , m_camera(DEFAULT_RESOLUTION)
-//    , m_audio()
-{}
-SwitchSystemOption::SwitchSystemOption(
-    PABotBaseLevel min_pabotbase,
-    bool allow_commands_while_running,
-    const JsonValue& json
-)
-    : SwitchSystemOption(
-          min_pabotbase,
-          allow_commands_while_running
-     )
-{
-    load_json(json);
-}
-void SwitchSystemOption::load_json(const JsonValue& json){
-    const JsonObject* obj = json.get_object();
-    if (obj == nullptr){
-        return;
-    }
-//    json_get_bool(m_settings_visible, obj, "SettingsVisible");
-    const JsonValue* value;
-    value = obj->get_value(JSON_SERIAL);
-    if (value){
-        m_serial.load_json(*value);
-    }
-    value = obj->get_value(JSON_CAMERA);
-    if (value){
-        m_camera.load_json(*value);
-    }
-    value = obj->get_value(JSON_AUDIO);
-    if (value){
-        m_audio.load_json(*value);
-    }
-    value = obj->get_value(JSON_OVERLAY);
-    if (value){
-        m_overlay.load_json(*value);
-    }
-}
-JsonValue SwitchSystemOption::to_json() const{
-    JsonObject root;
-//    root.insert("SettingsVisible", m_settings_visible);
-    root[JSON_SERIAL] = m_serial.to_json();
-    root[JSON_CAMERA] = m_camera.to_json();
-    root[JSON_AUDIO] = m_audio.to_json();
-    root[JSON_OVERLAY] = m_overlay.to_json();
-    return root;
-}
-
-
-
-
-
-
-
-}
-}
-
diff --git a/SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_SwitchSystemOption.h b/SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_SwitchSystemOption.h
deleted file mode 100644
index d8c065a1a0..0000000000
--- a/SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_SwitchSystemOption.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*  Switch System Option
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- *  This class represents the serializable state of a Switch console.
- *  Specifially, holds the settings of:
- *      -   Serial Port
- *      -   Camera
- *      -   Audio
- *
- *  This class maintains no runtime state or UI and is not thread-safe.
- *
- */
-
-#ifndef PokemonAutomation_NintendoSwitch_SwitchSystemOption_H
-#define PokemonAutomation_NintendoSwitch_SwitchSystemOption_H
-
-#include "Common/Cpp/Color.h"
-#include "CommonFramework/Globals.h"
-#include "CommonFramework/AudioPipeline/AudioOption.h"
-#include "CommonFramework/ControllerDevices/SerialPortOption.h"
-#include "CommonFramework/VideoPipeline/CameraOption.h"
-#include "CommonFramework/VideoPipeline/VideoOverlayOption.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-
-
-Color pick_color(FeedbackType feedback, PABotBaseLevel size);
-
-
-class SwitchSystemOption{
-    static const std::string JSON_SERIAL;
-    static const std::string JSON_CAMERA;
-    static const std::string JSON_AUDIO;
-    static const std::string JSON_OVERLAY;
-
-public:
-    SwitchSystemOption(
-        PABotBaseLevel min_pabotbase,
-        bool allow_commands_while_running
-    );
-    SwitchSystemOption(
-        PABotBaseLevel min_pabotbase,
-        bool allow_commands_while_running,
-        const JsonValue& json
-    );
-    void load_json(const JsonValue& json);
-    JsonValue to_json() const;
-
-
-public:
-    const bool m_allow_commands_while_running;
-
-    SerialPortOption m_serial;
-    CameraOption m_camera;
-    AudioOption m_audio;
-    VideoOverlayOption m_overlay;
-};
-
-
-
-
-
-}
-}
-#endif
diff --git a/SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_SwitchSystemSession.cpp b/SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_SwitchSystemSession.cpp
deleted file mode 100644
index b5287ab9cc..0000000000
--- a/SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_SwitchSystemSession.cpp
+++ /dev/null
@@ -1,79 +0,0 @@
-/*  Switch System Session
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/VideoPipeline/Stats/CpuUtilizationStats.h"
-#include "CommonFramework/VideoPipeline/Stats/ThreadUtilizationStats.h"
-#include "CommonFramework/VideoPipeline/Backends/CameraImplementations.h"
-#include "Integrations/ProgramTracker.h"
-#include "NintendoSwitch/NintendoSwitch_Settings.h"
-#include "NintendoSwitch_SwitchSystemOption.h"
-#include "NintendoSwitch_SwitchSystemSession.h"
-
-//#include <iostream>
-//using std::cout;
-//using std::endl;
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-
-
-
-SwitchSystemSession::~SwitchSystemSession(){
-    try{
-        m_logger.log("Shutting down session...");
-    }catch (...){}
-    ProgramTracker::instance().remove_console(m_console_id);
-    m_overlay.remove_stat(*m_main_thread_utilization);
-    m_overlay.remove_stat(*m_cpu_utilization);
-    m_option.m_camera.info = m_camera->current_device();
-    m_option.m_camera.current_resolution = m_camera->current_resolution();
-}
-SwitchSystemSession::SwitchSystemSession(
-    SwitchSystemOption& option,
-    uint64_t program_id,
-    size_t console_number
-)
-    : m_console_number(console_number)
-    , m_logger(global_logger_raw(), "Console " + std::to_string(console_number))
-    , m_option(option)
-    , m_serial(m_logger, option.m_serial)
-    , m_camera(get_camera_backend().make_camera(m_logger, DEFAULT_RESOLUTION))
-    , m_audio(m_logger, option.m_audio)
-    , m_overlay(option.m_overlay)
-    , m_cpu_utilization(new CpuUtilizationStat())
-    , m_main_thread_utilization(new ThreadUtilizationStat(current_thread_handle(), "Main Qt Thread:"))
-{
-    m_camera->set_resolution(option.m_camera.current_resolution);
-    m_camera->set_source(option.m_camera.info);
-    m_console_id = ProgramTracker::instance().add_console(program_id, *this);
-    m_overlay.add_stat(*m_cpu_utilization);
-    m_overlay.add_stat(*m_main_thread_utilization);
-}
-
-void SwitchSystemSession::get(SwitchSystemOption& option){
-    option.m_serial.set_port(m_serial.get());
-    m_camera->get(option.m_camera);
-    m_audio.get(option.m_audio);
-    m_overlay.get(option.m_overlay);
-}
-void SwitchSystemSession::set(const SwitchSystemOption& option){
-    m_serial.set(option.m_serial.port());
-//    m_serial.botbase().reset(option.m_serial.port());
-    m_camera->set(option.m_camera);
-    m_audio.set(option.m_audio);
-    m_overlay.set(option.m_overlay);
-}
-
-void SwitchSystemSession::set_allow_user_commands(bool allow){
-    m_serial.botbase().set_allow_user_commands(allow);
-}
-
-
-
-
-
-}
-}
diff --git a/SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_SwitchSystemSession.h b/SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_SwitchSystemSession.h
deleted file mode 100644
index 0231db53e0..0000000000
--- a/SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_SwitchSystemSession.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/*  Switch System Session
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- *  This class holds the run-time state of an entire Switch system.
- *
- *    - Serial Port
- *    - Camera
- *    - Audio
- *    - Video Overlay
- *
- *  This class is fully thread-safe. You can call any functions from anywhere at
- *  anytime.
- *
- *  Warning: Constructing this class requires an "option" parameter. It is not
- *  safe to modify this "option" parameter during the lifetime of this class.
- *
- */
-
-#ifndef PokemonAutomation_NintendoSwitch_SwitchSystemSession_H
-#define PokemonAutomation_NintendoSwitch_SwitchSystemSession_H
-
-#include "CommonFramework/Logging/Logger.h"
-#include "CommonFramework/ControllerDevices/SerialPortSession.h"
-#include "CommonFramework/AudioPipeline/AudioSession.h"
-#include "CommonFramework/VideoPipeline/CameraSession.h"
-#include "CommonFramework/VideoPipeline/VideoOverlaySession.h"
-#include "Integrations/ProgramTrackerInterfaces.h"
-#include "NintendoSwitch_SwitchSystemOption.h"
-
-namespace PokemonAutomation{
-    class CpuUtilizationStat;
-    class ThreadUtilizationStat;
-namespace NintendoSwitch{
-
-class SwitchSystemOption;
-
-
-
-
-class SwitchSystemSession final : public TrackableConsole{
-public:
-    ~SwitchSystemSession();
-    SwitchSystemSession(
-        SwitchSystemOption& option,
-        uint64_t program_id,
-        size_t console_number
-    );
-
-public:
-    PABotBaseLevel min_pabotbase() const{ return m_serial.min_pabotbase(); }
-    size_t console_number() const{ return m_console_number; }
-    bool allow_commands_while_running() const{ return m_option.m_allow_commands_while_running; }
-
-    Logger& logger(){ return m_logger; }
-    virtual BotBaseHandle& sender() override{ return m_serial.botbase(); }
-    virtual VideoFeed& video() override{ return *m_camera; }
-    virtual AudioFeed& audio() override{ return m_audio; }
-    VideoOverlay& overlay(){ return m_overlay; }
-
-public:
-    void get(SwitchSystemOption& option);
-    void set(const SwitchSystemOption& option);
-
-    SerialPortSession& serial_session(){ return m_serial; }
-    CameraSession& camera_session(){ return *m_camera; }
-    AudioSession& audio_session(){ return m_audio; }
-    VideoOverlaySession& overlay_session(){ return m_overlay; }
-
-public:
-    void set_allow_user_commands(bool allow);
-
-private:
-    //  The console # within a program.
-    const size_t m_console_number;
-
-    //  Globally unique ID.
-    uint64_t m_console_id = 0;
-
-    TaggedLogger m_logger;
-    SwitchSystemOption& m_option;
-
-    SerialPortSession m_serial;
-    std::unique_ptr<CameraSession> m_camera;
-    AudioSession m_audio;
-    VideoOverlaySession m_overlay;
-
-    std::unique_ptr<CpuUtilizationStat> m_cpu_utilization;
-    std::unique_ptr<ThreadUtilizationStat> m_main_thread_utilization;
-};
-
-
-
-}
-}
-#endif
diff --git a/SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_VirtualController.cpp b/SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_VirtualController.cpp
deleted file mode 100644
index f0f8bfbc69..0000000000
--- a/SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_VirtualController.cpp
+++ /dev/null
@@ -1,289 +0,0 @@
-/*  Virtual Controller
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <functional>
-#include <deque>
-#include "Common/Cpp/Exceptions.h"
-#include "Common/Cpp/PanicDump.h"
-#include "CommonFramework/GlobalSettingsPanel.h"
-#include "CommonFramework/Exceptions/ProgramFinishedException.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Messages_PushButtons.h"
-#include "NintendoSwitch_VirtualController.h"
-
-//#include <iostream>
-//using std::cout;
-//using std::endl;
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-
-
-void KeyboardDebouncer::clear(){
-    SpinLockGuard lg(m_lock);
-    m_last = VirtualControllerState();
-    m_history.clear();
-}
-
-void KeyboardDebouncer::add_event(bool press, VirtualControllerState state){
-    WallClock now = current_time();
-    SpinLockGuard lg(m_lock);
-    while (!m_history.empty()){
-        if (m_history.front().timestamp + std::chrono::seconds(1) < now){
-            m_history.pop_front();
-        }else{
-            break;
-        }
-    }
-    m_history.emplace_back(Entry{now, press, state});
-//    cout << "add event" << endl;
-}
-WallClock KeyboardDebouncer::get_current_state(VirtualControllerState& state){
-    WallClock now = current_time();
-
-    const std::chrono::milliseconds RELEASE_DELAY(10);
-
-    SpinLockGuard lg(m_lock);
-
-    if (m_history.empty()){
-//        cout << "empty" << endl;
-        state = m_last;
-        return WallClock::max();
-    }
-
-    auto iter = m_history.end();
-
-    //  Iterate the history backwards until we find an event that can be used.
-    //  Everything can be used except for key releases that are too new in
-    //  order to debounce them.
-    while (true){
-        if (iter == m_history.begin()){
-            break;
-        }
-        --iter;
-
-        const Entry& entry = *iter;
-
-        //  Key release that isn't old enough.
-        if (entry.press || entry.timestamp + RELEASE_DELAY <= now){
-            m_last = entry.state;
-            ++iter;
-            break;
-        }
-    }
-
-    //  Clear the history that we don't need anymore.
-    m_history.erase(m_history.begin(), iter);
-//    cout << "remove event: " << m_history.size() << endl;
-
-    state = m_last;
-    return m_history.empty()
-        ? WallClock::max()
-        : m_history.begin()->timestamp + RELEASE_DELAY;
-}
-
-
-
-
-
-VirtualController::VirtualController(
-    BotBaseHandle& botbase,
-    bool allow_commands_while_running
-)
-    // : m_logger(logger)
-    : m_botbase(botbase)
-    , m_allow_commands_while_running(allow_commands_while_running)
-    , m_last_known_state(ProgramState::STOPPED)
-    , m_stop(false)
-    , m_thread(run_with_catch, "VirtualController::thread_loop()", [this]{ thread_loop(); })
-{}
-VirtualController::~VirtualController(){
-    m_stop.store(true, std::memory_order_release);
-    {
-        std::lock_guard<std::mutex> lg(m_sleep_lock);
-        m_cv.notify_all();
-    }
-    m_thread.join();
-}
-void VirtualController::clear_state(){
-//    cout << "clear_state" << endl;
-    m_controller_state = VirtualControllerState();
-    m_pressed_buttons.clear();
-    m_history.clear();
-
-    std::lock_guard<std::mutex> lg(m_sleep_lock);
-    m_cv.notify_all();
-}
-
-bool VirtualController::on_key_press(Qt::Key key){
-//    cout << "press: " << key << endl;
-
-    const ControllerButton* button = button_lookup(key);
-    if (button == nullptr){
-        return false;
-    }
-
-    //  Suppress if key is already pressed.
-    auto iter = m_pressed_buttons.find(button);
-    if (iter != m_pressed_buttons.end()){
-        return true;
-    }
-    button->press(m_controller_state);
-
-    m_pressed_buttons.insert(button);
-    m_history.add_event(true, m_controller_state);
-
-    std::lock_guard<std::mutex> lg(m_sleep_lock);
-    m_cv.notify_all();
-    return true;
-}
-bool VirtualController::on_key_release(Qt::Key key){
-//    cout << "release" << endl;
-
-    const ControllerButton* button = button_lookup(key);
-    if (button == nullptr){
-        return false;
-    }
-
-    //  Suppress if key is not pressed.
-    auto iter = m_pressed_buttons.find(button);
-    if (iter == m_pressed_buttons.end()){
-        return true;
-    }
-    button->release(m_controller_state);
-
-    m_pressed_buttons.erase(button);
-    m_history.add_event(false, m_controller_state);
-
-    std::lock_guard<std::mutex> lg(m_sleep_lock);
-    m_cv.notify_all();
-    return true;
-}
-
-
-
-void VirtualController::thread_loop(){
-    GlobalSettings::instance().REALTIME_THREAD_PRIORITY0.set_on_this_thread();
-
-    VirtualControllerState last;
-    bool last_neutral = true;
-    WallClock last_press = current_time();
-    while (true){
-        if (m_stop.load(std::memory_order_acquire)){
-            return;
-        }
-
-        //  Not accepting commands.
-        if (!m_allow_commands_while_running &&
-            m_last_known_state.load(std::memory_order_acquire) != ProgramState::STOPPED
-        ){
-            last = VirtualControllerState();
-            std::unique_lock<std::mutex> lg(m_sleep_lock);
-            if (m_stop.load(std::memory_order_acquire)){
-                return;
-            }
-            m_cv.wait(lg);
-            continue;
-        }
-
-        VirtualControllerState current;
-        WallClock next_wake = m_history.get_current_state(current);
-//        current.print();
-
-        //  Send the command.
-        WallClock now;
-        do{
-            now = current_time();
-            try{
-//                current.print();
-                if (current == last && last_press + std::chrono::milliseconds(1000) > now){
-//                    cout << "No state change." << endl;
-                    break;
-                }
-
-                //  Convert the state.
-                ControllerState state;
-                bool neutral = current.to_state(state);
-//                cout << "neutral = " << neutral << endl;
-
-                //  If state is neutral, just issue a stop.
-                if (neutral){
-                    if (m_botbase.try_stop_commands() == nullptr){
-                        last = VirtualControllerState();
-                        last_neutral = true;
-                        last_press = now;
-                    }else{
-                        next_wake = now + std::chrono::milliseconds(PABB_RETRANSMIT_DELAY_MILLIS);
-                    }
-                    break;
-                }
-
-                //  If the new state is different, set next interrupt so the new
-                //  new command can replace the current one without gaps.
-                if (!last_neutral && current != last && m_botbase.try_next_interrupt() != nullptr){
-                    next_wake = now + std::chrono::milliseconds(PABB_RETRANSMIT_DELAY_MILLIS);
-                    break;
-                }
-
-                //  Send the command.
-                DeviceRequest_controller_state request(
-                    state.buttons,
-                    state.dpad,
-                    state.left_x,
-                    state.left_y,
-                    state.right_x,
-                    state.right_y,
-                    255
-                );
-                if (m_botbase.try_send_request(request) != nullptr){
-                    next_wake = now + std::chrono::milliseconds(PABB_RETRANSMIT_DELAY_MILLIS);
-                    break;
-                }
-
-                last = current;
-                last_neutral = false;
-                last_press = now;
-            }catch (ProgramCancelledException&){
-            }catch (ProgramFinishedException&){
-            }catch (InvalidConnectionStateException&){
-            }
-        }while (false);
-
-
-        //  Wait for next event.
-        std::unique_lock<std::mutex> lg(m_sleep_lock);
-        if (m_stop.load(std::memory_order_acquire)){
-            return;
-        }
-
-        //  Nothing held down.
-        if (last_neutral && next_wake == WallClock::max()){
-//            cout << "wait - long" << endl;
-            m_cv.wait(lg);
-        }else{
-//            cout << "wait - short" << endl;
-            m_cv.wait_until(lg, std::min(next_wake, now + std::chrono::milliseconds(1000)));
-        }
-    }
-}
-
-
-ProgramState VirtualController::last_known_state() const{
-    return m_last_known_state.load(std::memory_order_acquire);
-}
-void VirtualController::on_state_changed(ProgramState state){
-    m_last_known_state.store(state, std::memory_order_release);
-}
-
-
-
-
-}
-}
-
-
-
-
-
diff --git a/SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_VirtualController.h b/SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_VirtualController.h
deleted file mode 100644
index aaa2804198..0000000000
--- a/SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_VirtualController.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/*  Virtual Controller
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_NintendoSwitch_VirtualController_H
-#define PokemonAutomation_NintendoSwitch_VirtualController_H
-
-#include <deque>
-#include <set>
-#include <map>
-#include <thread>
-#include <Qt>
-#include "Common/Cpp/Concurrency/SpinLock.h"
-#include "CommonFramework/Globals.h"
-#include "CommonFramework/Tools/BotBaseHandle.h"
-#include "NintendoSwitch_VirtualControllerMapping.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-
-
-//  If you hold down a button, it doesn't actually stay down. You will get
-//  release/press pairs that come with very little time between.
-//  This class will debounce that.
-class KeyboardDebouncer{
-public:
-    void clear();
-
-    void add_event(bool press, VirtualControllerState state);
-
-    //  Returns when the consumer thread should wakt up again.
-    WallClock get_current_state(VirtualControllerState& state);
-
-
-private:
-    struct Entry{
-        WallClock timestamp;
-        bool press;
-        VirtualControllerState state;
-    };
-
-    SpinLock m_lock;
-    VirtualControllerState m_last;
-    std::deque<Entry> m_history;
-};
-
-
-
-
-class VirtualController{
-public:
-    VirtualController(
-        BotBaseHandle& botbase,
-        bool allow_commands_while_running
-    );
-    ~VirtualController();
-
-public:
-    //  These 3 must be called from UI thread.
-    void clear_state();
-
-    //  Returns false if key is not handled. (pass it up to next handler)
-    bool on_key_press(Qt::Key key);
-    bool on_key_release(Qt::Key key);
-
-public:
-    //  Call from any thread.
-    ProgramState last_known_state() const;
-    void on_state_changed(ProgramState state);
-
-private:
-    void thread_loop();
-
-private:
-    // Logger& m_logger;
-    BotBaseHandle& m_botbase;
-    const bool m_allow_commands_while_running;
-
-    //  Keyboard State
-    std::set<const ControllerButton*> m_pressed_buttons;
-
-    //  Controller State
-    VirtualControllerState m_controller_state;
-    KeyboardDebouncer m_history;
-
-    std::atomic<ProgramState> m_last_known_state;
-    std::atomic<bool> m_stop;
-
-    std::mutex m_sleep_lock;
-    std::condition_variable m_cv;
-    std::thread m_thread;
-};
-
-
-
-
-}
-}
-#endif
diff --git a/SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_VirtualControllerMapping.cpp b/SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_VirtualControllerMapping.cpp
deleted file mode 100644
index 3715e5da0d..0000000000
--- a/SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_VirtualControllerMapping.cpp
+++ /dev/null
@@ -1,307 +0,0 @@
-/*  Virtual Controller Mapping
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <vector>
-#include <map>
-#include "Common/Cpp/Exceptions.h"
-#include "Common/Cpp/Json/JsonValue.h"
-#include "Common/Cpp/Json/JsonArray.h"
-#include "Common/Cpp/Json/JsonObject.h"
-#include "NintendoSwitch_VirtualControllerMapping.h"
-
-#include <iostream>
-using std::cout;
-using std::endl;
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-
-
-struct ControllerButton_Dpad : public ControllerButton{
-    int delta_x;
-    int delta_y;
-    ControllerButton_Dpad(int x, int y) : delta_x(x), delta_y(y) {}
-    virtual void press(VirtualControllerState& state) const override{
-        state.dpad_x += delta_x;
-        state.dpad_y += delta_y;
-    }
-    virtual void release(VirtualControllerState& state) const override{
-        state.dpad_x -= delta_x;
-        state.dpad_y -= delta_y;
-    }
-};
-const ControllerButton_Dpad CONTROLLER_DPAD_UP          (0, -1);
-const ControllerButton_Dpad CONTROLLER_DPAD_UPRIGHT     (+1, -1);
-const ControllerButton_Dpad CONTROLLER_DPAD_RIGHT       (+1, 0);
-const ControllerButton_Dpad CONTROLLER_DPAD_DOWNRIGHT   (+1, +1);
-const ControllerButton_Dpad CONTROLLER_DPAD_DOWN        (0, +1);
-const ControllerButton_Dpad CONTROLLER_DPAD_DOWNLEFT    (-1, +1);
-const ControllerButton_Dpad CONTROLLER_DPAD_LEFT        (-1, 0);
-const ControllerButton_Dpad CONTROLLER_DPAD_UPLEFT      (-1, -1);
-
-struct ControllerButton_LeftJoystick : public ControllerButton{
-    int delta_x;
-    int delta_y;
-    ControllerButton_LeftJoystick(int x, int y) : delta_x(x), delta_y(y) {}
-    virtual void press(VirtualControllerState& state) const override{
-        state.left_joystick_x += delta_x;
-        state.left_joystick_y += delta_y;
-    }
-    virtual void release(VirtualControllerState& state) const override{
-        state.left_joystick_x -= delta_x;
-        state.left_joystick_y -= delta_y;
-    }
-};
-const ControllerButton_LeftJoystick CONTROLLER_LEFT_JOYSTICK_UP     (0, -1);
-const ControllerButton_LeftJoystick CONTROLLER_LEFT_JOYSTICK_RIGHT  (+1, 0);
-const ControllerButton_LeftJoystick CONTROLLER_LEFT_JOYSTICK_DOWN   (0, +1);
-const ControllerButton_LeftJoystick CONTROLLER_LEFT_JOYSTICK_LEFT   (-1, 0);
-
-struct ControllerButton_RightJoystick : public ControllerButton{
-    int delta_x;
-    int delta_y;
-    ControllerButton_RightJoystick(int x, int y) : delta_x(x), delta_y(y) {}
-    virtual void press(VirtualControllerState& state) const override{
-        state.right_joystick_x += delta_x;
-        state.right_joystick_y += delta_y;
-    }
-    virtual void release(VirtualControllerState& state) const override{
-        state.right_joystick_x -= delta_x;
-        state.right_joystick_y -= delta_y;
-    }
-};
-const ControllerButton_RightJoystick CONTROLLER_RIGHT_JOYSTICK_UP   (0, -1);
-const ControllerButton_RightJoystick CONTROLLER_RIGHT_JOYSTICK_RIGHT(+1, 0);
-const ControllerButton_RightJoystick CONTROLLER_RIGHT_JOYSTICK_DOWN (0, +1);
-const ControllerButton_RightJoystick CONTROLLER_RIGHT_JOYSTICK_LEFT (-1, 0);
-
-struct ControllerButton_Button : public ControllerButton{
-    Button button;
-    ControllerButton_Button(Button x) : button(x) {}
-    virtual void press(VirtualControllerState& state) const override{
-        state.buttons |= button;
-    }
-    virtual void release(VirtualControllerState& state) const override{
-        state.buttons &= ~button;
-    }
-};
-const ControllerButton_Button CONTROLLER_BUTTON_Y       (BUTTON_Y);
-const ControllerButton_Button CONTROLLER_BUTTON_B       (BUTTON_B);
-const ControllerButton_Button CONTROLLER_BUTTON_A       (BUTTON_A);
-const ControllerButton_Button CONTROLLER_BUTTON_X       (BUTTON_X);
-const ControllerButton_Button CONTROLLER_BUTTON_L       (BUTTON_L);
-const ControllerButton_Button CONTROLLER_BUTTON_R       (BUTTON_R);
-const ControllerButton_Button CONTROLLER_BUTTON_ZL      (BUTTON_ZL);
-const ControllerButton_Button CONTROLLER_BUTTON_ZR      (BUTTON_ZR);
-const ControllerButton_Button CONTROLLER_BUTTON_MINUS   (BUTTON_MINUS);
-const ControllerButton_Button CONTROLLER_BUTTON_PLUS    (BUTTON_PLUS);
-const ControllerButton_Button CONTROLLER_BUTTON_LCLICK  (BUTTON_LCLICK);
-const ControllerButton_Button CONTROLLER_BUTTON_RCLICK  (BUTTON_RCLICK);
-const ControllerButton_Button CONTROLLER_BUTTON_HOME    (BUTTON_HOME);
-const ControllerButton_Button CONTROLLER_BUTTON_CAPTURE (BUTTON_CAPTURE);
-const ControllerButton_Button CONTROLLER_BUTTON_AR      (BUTTON_A | BUTTON_R);
-
-const std::map<QString, const ControllerButton&>& STRING_TO_BUTTON_MAP(){
-    static const std::map<QString, const ControllerButton&> map{
-        {"CONTROLLER_DPAD_UP",              CONTROLLER_DPAD_UP},
-        {"CONTROLLER_DPAD_UPRIGHT",         CONTROLLER_DPAD_UPRIGHT},
-        {"CONTROLLER_DPAD_RIGHT",           CONTROLLER_DPAD_RIGHT},
-        {"CONTROLLER_DPAD_DOWNRIGHT",       CONTROLLER_DPAD_DOWNRIGHT},
-        {"CONTROLLER_DPAD_DOWN",            CONTROLLER_DPAD_DOWN},
-        {"CONTROLLER_DPAD_DOWNLEFT",        CONTROLLER_DPAD_DOWNLEFT},
-        {"CONTROLLER_DPAD_LEFT",            CONTROLLER_DPAD_LEFT},
-        {"CONTROLLER_DPAD_UPLEFT",          CONTROLLER_DPAD_UPLEFT},
-
-        {"CONTROLLER_LEFT_JOYSTICK_UP",     CONTROLLER_LEFT_JOYSTICK_UP},
-        {"CONTROLLER_LEFT_JOYSTICK_RIGHT",  CONTROLLER_LEFT_JOYSTICK_RIGHT},
-        {"CONTROLLER_LEFT_JOYSTICK_DOWN",   CONTROLLER_LEFT_JOYSTICK_DOWN},
-        {"CONTROLLER_LEFT_JOYSTICK_LEFT",   CONTROLLER_LEFT_JOYSTICK_LEFT},
-
-        {"CONTROLLER_RIGHT_JOYSTICK_UP",    CONTROLLER_RIGHT_JOYSTICK_UP},
-        {"CONTROLLER_RIGHT_JOYSTICK_RIGHT", CONTROLLER_RIGHT_JOYSTICK_RIGHT},
-        {"CONTROLLER_RIGHT_JOYSTICK_DOWN",  CONTROLLER_RIGHT_JOYSTICK_DOWN},
-        {"CONTROLLER_RIGHT_JOYSTICK_LEFT",  CONTROLLER_RIGHT_JOYSTICK_LEFT},
-
-        {"CONTROLLER_BUTTON_Y",             CONTROLLER_BUTTON_Y},
-        {"CONTROLLER_BUTTON_B",             CONTROLLER_BUTTON_B},
-        {"CONTROLLER_BUTTON_A",             CONTROLLER_BUTTON_A},
-        {"CONTROLLER_BUTTON_X",             CONTROLLER_BUTTON_X},
-
-        {"CONTROLLER_BUTTON_L",             CONTROLLER_BUTTON_L},
-        {"CONTROLLER_BUTTON_R",             CONTROLLER_BUTTON_R},
-        {"CONTROLLER_BUTTON_ZL",            CONTROLLER_BUTTON_ZL},
-        {"CONTROLLER_BUTTON_ZR",            CONTROLLER_BUTTON_ZR},
-
-        {"CONTROLLER_BUTTON_MINUS",         CONTROLLER_BUTTON_MINUS},
-        {"CONTROLLER_BUTTON_PLUS",          CONTROLLER_BUTTON_PLUS},
-        {"CONTROLLER_BUTTON_LCLICK",        CONTROLLER_BUTTON_LCLICK},
-        {"CONTROLLER_BUTTON_RCLICK",        CONTROLLER_BUTTON_RCLICK},
-
-        {"CONTROLLER_BUTTON_HOME",          CONTROLLER_BUTTON_HOME},
-        {"CONTROLLER_BUTTON_CAPTURE",       CONTROLLER_BUTTON_CAPTURE},
-
-        {"CONTROLLER_BUTTON_AR",            CONTROLLER_BUTTON_AR},
-    };
-    return map;
-}
-const ControllerButton* string_to_controller_button(const QString& name){
-    const std::map<QString, const ControllerButton&>& map = STRING_TO_BUTTON_MAP();
-    auto iter = map.find(name);
-    if (iter == map.end()){
-        return nullptr;
-    }
-    return &iter->second;
-}
-const QString& controller_button_to_string(const ControllerButton& button){
-    static std::map<const ControllerButton*, const QString&> map;
-    if (map.empty()){
-        for (const auto& item : STRING_TO_BUTTON_MAP()){
-            map.emplace(
-                std::piecewise_construct,
-                std::forward_as_tuple(&item.second),
-                std::forward_as_tuple(item.first)
-            );
-        }
-    }
-    return map.find(&button)->second;
-}
-
-
-
-std::vector<std::pair<Qt::Key, const ControllerButton&>> keyboard_mapping{
-    {Qt::Key::Key_8,            CONTROLLER_DPAD_UP},
-    {Qt::Key::Key_9,            CONTROLLER_DPAD_UPRIGHT},
-    {Qt::Key::Key_6,            CONTROLLER_DPAD_RIGHT},
-    {Qt::Key::Key_3,            CONTROLLER_DPAD_DOWNRIGHT},
-    {Qt::Key::Key_2,            CONTROLLER_DPAD_DOWN},
-    {Qt::Key::Key_1,            CONTROLLER_DPAD_DOWNLEFT},
-    {Qt::Key::Key_4,            CONTROLLER_DPAD_LEFT},
-    {Qt::Key::Key_7,            CONTROLLER_DPAD_UPLEFT},
-
-    {Qt::Key::Key_W,            CONTROLLER_LEFT_JOYSTICK_UP},
-    {Qt::Key::Key_D,            CONTROLLER_LEFT_JOYSTICK_RIGHT},
-    {Qt::Key::Key_S,            CONTROLLER_LEFT_JOYSTICK_DOWN},
-    {Qt::Key::Key_A,            CONTROLLER_LEFT_JOYSTICK_LEFT},
-
-    {Qt::Key::Key_Up,           CONTROLLER_RIGHT_JOYSTICK_UP},
-    {Qt::Key::Key_Right,        CONTROLLER_RIGHT_JOYSTICK_RIGHT},
-    {Qt::Key::Key_Down,         CONTROLLER_RIGHT_JOYSTICK_DOWN},
-    {Qt::Key::Key_Left,         CONTROLLER_RIGHT_JOYSTICK_LEFT},
-
-    {Qt::Key::Key_Slash,        CONTROLLER_BUTTON_Y},
-    {Qt::Key::Key_Question,     CONTROLLER_BUTTON_Y},
-    {Qt::Key::Key_Shift,        CONTROLLER_BUTTON_B},
-    {Qt::Key::Key_Control,      CONTROLLER_BUTTON_B},
-    {Qt::Key::Key_Enter,        CONTROLLER_BUTTON_A},
-    {Qt::Key::Key_Return,       CONTROLLER_BUTTON_A},
-    {Qt::Key::Key_Apostrophe,   CONTROLLER_BUTTON_X},
-    {Qt::Key::Key_QuoteDbl,     CONTROLLER_BUTTON_X},
-
-    {Qt::Key::Key_Q,            CONTROLLER_BUTTON_L},
-    {Qt::Key::Key_E,            CONTROLLER_BUTTON_R},
-    {Qt::Key::Key_R,            CONTROLLER_BUTTON_ZL},
-    {Qt::Key::Key_Backslash,    CONTROLLER_BUTTON_ZR},
-    {Qt::Key::Key_Bar,          CONTROLLER_BUTTON_ZR},
-
-    {Qt::Key::Key_Minus,        CONTROLLER_BUTTON_MINUS},
-    {Qt::Key::Key_Underscore,   CONTROLLER_BUTTON_MINUS},
-    {Qt::Key::Key_Plus,         CONTROLLER_BUTTON_PLUS},
-    {Qt::Key::Key_Equal,        CONTROLLER_BUTTON_PLUS},
-
-    {Qt::Key::Key_C,            CONTROLLER_BUTTON_LCLICK},
-    {Qt::Key::Key_0,            CONTROLLER_BUTTON_RCLICK},
-
-    {Qt::Key::Key_Home,         CONTROLLER_BUTTON_HOME},
-    {Qt::Key::Key_Escape,       CONTROLLER_BUTTON_HOME},
-    {Qt::Key::Key_H,            CONTROLLER_BUTTON_HOME},
-
-    {Qt::Key::Key_Insert,       CONTROLLER_BUTTON_CAPTURE},
-
-    {Qt::Key::Key_Y,            CONTROLLER_BUTTON_AR},
-};
-
-std::map<Qt::Key, const ControllerButton&> make_keyboard_map(
-    const std::vector<std::pair<Qt::Key, const ControllerButton&>> mapping
-){
-    std::map<Qt::Key, const ControllerButton&> map;
-    for (const auto& item : mapping){
-        auto iter = map.find(item.first);
-        if (iter != map.end()){
-            throw ParseException("Duplicate Key: " + std::to_string((uint32_t)item.first));
-        }
-        map.emplace(
-            std::piecewise_construct,
-            std::forward_as_tuple(item.first),
-            std::forward_as_tuple(item.second)
-        );
-    }
-    return map;
-}
-
-extern std::map<Qt::Key, const ControllerButton&> keyboard_mapping_lookup;
-void set_keyboard_mapping(std::vector<std::pair<Qt::Key, const ControllerButton&>> mapping){
-    std::map<Qt::Key, const ControllerButton&> map = make_keyboard_map(mapping);
-    keyboard_mapping = std::move(mapping);
-    keyboard_mapping_lookup = std::move(map);
-}
-std::map<Qt::Key, const ControllerButton&> keyboard_mapping_lookup = make_keyboard_map(keyboard_mapping);
-
-const ControllerButton* button_lookup(Qt::Key key){
-    auto iter = keyboard_mapping_lookup.find(key);
-    if (iter == keyboard_mapping_lookup.end()){
-        return nullptr;
-    }
-    return &iter->second;
-}
-
-
-
-JsonArray read_keyboard_mapping(){
-    JsonArray array;
-    for (const auto& item : keyboard_mapping){
-        JsonObject pair;
-        pair["Qt::Key"] = (int64_t)item.first;
-        pair["Button"] = controller_button_to_string(item.second).toStdString();
-        array.push_back(std::move(pair));
-    }
-    return array;
-}
-void set_keyboard_mapping(const JsonArray& json){
-    if (json.empty()){
-        return;
-    }
-
-    std::vector<std::pair<Qt::Key, const ControllerButton&>> mapping;
-
-    for (const auto& item : json){
-        const JsonObject* obj = item.get_object();
-        if (obj == nullptr){
-            continue;
-        }
-        int key;
-        if (!obj->read_integer(key, "Qt::Key")){
-            continue;
-        }
-        const std::string* button_name = obj->get_string("Button");
-        if (button_name == nullptr){
-            continue;
-        }
-        const ControllerButton* button = string_to_controller_button(QString::fromStdString(*button_name));
-        if (button == nullptr){
-            continue;
-        }
-        mapping.emplace_back((Qt::Key)key, *button);
-    }
-
-    set_keyboard_mapping(std::move(mapping));
-}
-
-
-
-
-
-}
-}
diff --git a/SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_VirtualControllerMapping.h b/SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_VirtualControllerMapping.h
deleted file mode 100644
index dd065af0e8..0000000000
--- a/SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_VirtualControllerMapping.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*  Virtual Controller Mapping
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_NintendoSwitch_VirtualControllerMapping_H
-#define PokemonAutomation_NintendoSwitch_VirtualControllerMapping_H
-
-#include <QKeyEvent>
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-#include "NintendoSwitch_VirtualControllerState.h"
-
-class QString;
-
-namespace PokemonAutomation{
-    class JsonArray;
-namespace NintendoSwitch{
-
-
-struct ControllerButton{
-    virtual void press(VirtualControllerState& state) const = 0;
-    virtual void release(VirtualControllerState& state) const = 0;
-};
-
-const ControllerButton* string_to_controller_button(const QString& name);
-const QString& controller_button_to_string(const ControllerButton& button);
-
-const ControllerButton* button_lookup(Qt::Key key);
-
-JsonArray read_keyboard_mapping();
-void set_keyboard_mapping(const JsonArray& json);
-
-
-
-}
-}
-#endif
diff --git a/SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_VirtualControllerState.cpp b/SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_VirtualControllerState.cpp
deleted file mode 100644
index dcaf888ab9..0000000000
--- a/SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_VirtualControllerState.cpp
+++ /dev/null
@@ -1,135 +0,0 @@
-/*  Virtual Controller State
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "NintendoSwitch_VirtualControllerState.h"
-
-#include <iostream>
-using std::cout;
-using std::endl;
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-
-
-void VirtualControllerState::print() const{
-    cout << "dpad = (" << dpad_x << "," << dpad_y
-         << "), left = (" << left_joystick_x << "," << left_joystick_y
-         << "), right = (" << right_joystick_x << "," << right_joystick_y
-         << "), buttons = (";
-    if (buttons & BUTTON_Y) cout << " Y";
-    if (buttons & BUTTON_B) cout << " B";
-    if (buttons & BUTTON_A) cout << " A";
-    if (buttons & BUTTON_X) cout << " X";
-    if (buttons & BUTTON_L) cout << " L";
-    if (buttons & BUTTON_R) cout << " R";
-    if (buttons & BUTTON_ZL) cout << " ZL";
-    if (buttons & BUTTON_ZR) cout << " ZR";
-    if (buttons & BUTTON_PLUS) cout << " +";
-    if (buttons & BUTTON_MINUS) cout << " -";
-    if (buttons & BUTTON_LCLICK) cout << " LC";
-    if (buttons & BUTTON_RCLICK) cout << " RC";
-    if (buttons & BUTTON_HOME) cout << " Home";
-    if (buttons & BUTTON_CAPTURE) cout << " Screen";
-    cout << ")" << endl;
-}
-
-bool VirtualControllerState::operator==(const VirtualControllerState& x) const{
-    if (buttons != x.buttons){
-        return false;
-    }
-    if (dpad_x != x.dpad_x){
-        return false;
-    }
-    if (dpad_y != x.dpad_y){
-        return false;
-    }
-    if (left_joystick_x != x.left_joystick_x){
-        return false;
-    }
-    if (left_joystick_y != x.left_joystick_y){
-        return false;
-    }
-    if (right_joystick_x != x.right_joystick_x){
-        return false;
-    }
-    if (right_joystick_y != x.right_joystick_y){
-        return false;
-    }
-    return true;
-}
-bool VirtualControllerState::operator!=(const VirtualControllerState& x) const{
-    return !(*this == x);
-}
-
-
-bool VirtualControllerState::to_state(ControllerState& state) const{
-    bool neutral;
-
-    state.buttons = buttons;
-    neutral = buttons == 0;
-
-    state.dpad = DPAD_NONE;
-    if (dpad_x != 0 || dpad_y != 0){
-        neutral = false;
-        do{
-            if (dpad_x == 0){
-                state.dpad = dpad_y > 0 ? DPAD_DOWN : DPAD_UP;
-                break;
-            }
-            if (dpad_y == 0){
-                state.dpad = dpad_x > 0 ? DPAD_RIGHT : DPAD_LEFT;
-                break;
-            }
-            if (dpad_x < 0 && dpad_y < 0){
-                state.dpad = DPAD_UP_LEFT;
-                break;
-            }
-            if (dpad_x < 0 && dpad_y > 0){
-                state.dpad = DPAD_DOWN_LEFT;
-                break;
-            }
-            if (dpad_x > 0 && dpad_y > 0){
-                state.dpad = DPAD_DOWN_RIGHT;
-                break;
-            }
-            if (dpad_x > 0 && dpad_y < 0){
-                state.dpad = DPAD_UP_RIGHT;
-                break;
-            }
-        }while (false);
-    }
-
-    state.left_x = 128;
-    state.left_y = 128;
-    if (left_joystick_x != 0 || left_joystick_y != 0){
-        neutral = false;
-        int mag = std::abs(left_joystick_x) > std::abs(left_joystick_y)
-            ? std::abs(left_joystick_x)
-            : std::abs(left_joystick_y);
-        state.left_x = (uint8_t)std::min(128 * left_joystick_x / mag + 128, 255);
-        state.left_y = (uint8_t)std::min(128 * left_joystick_y / mag + 128, 255);
-    }
-
-    state.right_x = 128;
-    state.right_y = 128;
-    if (right_joystick_x != 0 || right_joystick_y != 0){
-        neutral = false;
-        int mag = std::abs(right_joystick_x) > std::abs(right_joystick_y)
-            ? std::abs(right_joystick_x)
-            : std::abs(right_joystick_y);
-        state.right_x = (uint8_t)std::min(128 * right_joystick_x / mag + 128, 255);
-        state.right_y = (uint8_t)std::min(128 * right_joystick_y / mag + 128, 255);
-    }
-
-    return neutral;
-}
-
-
-
-
-
-}
-}
diff --git a/SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_VirtualControllerState.h b/SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_VirtualControllerState.h
deleted file mode 100644
index 5dbde3c982..0000000000
--- a/SerialPrograms/Source/NintendoSwitch/Framework/NintendoSwitch_VirtualControllerState.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*  Virtual Controller State
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_NintendoSwitch_VirtualControllerState_H
-#define PokemonAutomation_NintendoSwitch_VirtualControllerState_H
-
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-
-
-struct ControllerState{
-    Button buttons = 0;
-    DpadPosition dpad = DPAD_NONE;
-    uint8_t left_x = 128;
-    uint8_t left_y = 128;
-    uint8_t right_x = 128;
-    uint8_t right_y = 128;
-};
-
-
-struct VirtualControllerState{
-    Button buttons = 0;
-    int dpad_x = 0;
-    int dpad_y = 0;
-    int left_joystick_x = 0;
-    int left_joystick_y = 0;
-    int right_joystick_x = 0;
-    int right_joystick_y = 0;
-
-    void print() const;
-    bool operator==(const VirtualControllerState& x) const;
-    bool operator!=(const VirtualControllerState& x) const;
-    bool to_state(ControllerState& state) const;
-
-};
-
-
-
-}
-}
-#endif
diff --git a/SerialPrograms/Source/NintendoSwitch/Framework/UI/NintendoSwitch_CommandRow.cpp b/SerialPrograms/Source/NintendoSwitch/Framework/UI/NintendoSwitch_CommandRow.cpp
deleted file mode 100644
index 01f0ba2730..0000000000
--- a/SerialPrograms/Source/NintendoSwitch/Framework/UI/NintendoSwitch_CommandRow.cpp
+++ /dev/null
@@ -1,223 +0,0 @@
-/*  Command Row
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <QHBoxLayout>
-#include "CommonFramework/Options/Environment/ThemeSelectorOption.h"
-#include "CommonFramework/VideoPipeline/UI/VideoOverlayWidget.h"
-#include "NintendoSwitch_CommandRow.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-
-
-CommandRow::~CommandRow(){
-    m_session.remove_listener(*this);
-}
-CommandRow::CommandRow(
-    QWidget& parent,
-    BotBaseHandle& botbase,
-    VideoOverlaySession& session,
-    bool allow_commands_while_running
-)
-    : QWidget(&parent)
-    , VirtualController(botbase, allow_commands_while_running)
-    , m_botbase(botbase)
-    , m_session(session)
-    , m_allow_commands_while_running(allow_commands_while_running)
-    , m_last_known_focus(false)
-{
-    QHBoxLayout* command_row = new QHBoxLayout(this);
-    command_row->setContentsMargins(0, 0, 0, 0);
-
-    command_row->addWidget(new QLabel("<b>Keyboard Input:</b>", this), 2);
-    command_row->addSpacing(5);
-
-    m_status = new QLabel(this);
-    command_row->addWidget(m_status, 12);
-    command_row->addSpacing(5);
-
-    command_row->addWidget(new QLabel("<b>Overlays:<b>", this));
-
-    m_overlay_boxes = new QCheckBox("Boxes", this);
-    m_overlay_boxes->setChecked(session.enabled_boxes());
-    command_row->addWidget(m_overlay_boxes);
-
-    m_overlay_text = new QCheckBox("Text", this);
-    m_overlay_text->setHidden(true);    //  Nothing uses text overlay yet.
-    m_overlay_text->setChecked(session.enabled_text());
-    command_row->addWidget(m_overlay_text);
-
-    m_overlay_log = new QCheckBox("Log", this);
-    m_overlay_log->setChecked(session.enabled_log());
-    command_row->addWidget(m_overlay_log);
-
-    m_overlay_stats = new QCheckBox("Stats", this);
-    m_overlay_stats->setChecked(session.enabled_stats());
-    command_row->addWidget(m_overlay_stats);
-
-    command_row->addSpacing(5);
-
-    m_load_profile_button = new QPushButton("Load Profile", this);
-    command_row->addWidget(m_load_profile_button, 2);
-
-    m_save_profile_button = new QPushButton("Save Profile", this);
-    command_row->addWidget(m_save_profile_button, 2);
-
-    m_screenshot_button = new QPushButton("Screenshot", this);
-    command_row->addWidget(m_screenshot_button, 2);
-
-
-//    m_test_button = new QPushButton("Test Button", this);
-//    command_row->addWidget(m_test_button, 3);
-
-    update_ui();
-
-    connect(
-        m_overlay_boxes, &QCheckBox::clicked,
-        this, [this](bool checked){ m_session.set_enabled_boxes(checked); }
-    );
-    connect(
-        m_overlay_text, &QCheckBox::stateChanged,
-        this, [this](bool checked){ m_session.set_enabled_text(checked); }
-    );
-    connect(
-        m_overlay_log, &QCheckBox::stateChanged,
-        this, [this](bool checked){ m_session.set_enabled_log(checked); }
-    );
-    connect(
-        m_overlay_stats, &QCheckBox::stateChanged,
-        this, [this](bool checked){ m_session.set_enabled_stats(checked); }
-    );
-    connect(
-        m_load_profile_button, &QPushButton::clicked,
-        this, [this](bool) { emit load_profile(); }
-    );
-    connect(
-        m_save_profile_button, &QPushButton::clicked,
-        this, [this](bool) { emit save_profile(); }
-    );
-    connect(
-        m_screenshot_button, &QPushButton::clicked,
-        this, [this](bool){ emit screenshot_requested(); }
-    );
-
-    m_session.add_listener(*this);
-}
-
-bool CommandRow::on_key_press(Qt::Key key){
-    if (m_last_known_focus){
-        return VirtualController::on_key_press(key);
-    }
-    return false;
-}
-bool CommandRow::on_key_release(Qt::Key key){
-    if (m_last_known_focus){
-        return VirtualController::on_key_release(key);
-    }
-    return false;
-}
-
-void CommandRow::set_focus(bool focused){
-    if (!focused){
-        clear_state();
-    }
-    if (m_last_known_focus == focused){
-        return;
-    }
-    m_last_known_focus = focused;
-    update_ui();
-}
-
-void CommandRow::update_ui(){
-    bool stopped = last_known_state() == ProgramState::STOPPED;
-    m_load_profile_button->setEnabled(stopped);
-    if (!m_allow_commands_while_running){
-//        m_reset_button->setEnabled(stopped);
-        if (!stopped){
-            m_status->setText(
-                QString::fromStdString(
-                    html_color_text("Not Active. A program is running.", COLOR_PURPLE)
-                )
-            );
-            return;
-        }
-    }
-
-    BotBaseHandle::State state = m_botbase.state();
-    if (state == BotBaseHandle::State::READY){
-        if (!m_botbase.accepting_commands()){
-            m_status->setText(
-                QString::fromStdString(
-                    html_color_text("Device does not accept commands.", COLOR_RED)
-                )
-            );
-        }else if (!m_last_known_focus){
-            m_status->setText(
-                QString::fromStdString(
-                    html_color_text("Click on the video to enable.", COLOR_PURPLE)
-                )
-            );
-        }else{
-            m_status->setText(
-                QString::fromStdString(
-                    html_color_text("Keyboard Control Active!", COLOR_DARKGREEN)
-                )
-            );
-        }
-    }else{
-        m_status->setText(
-            QString::fromStdString(
-                html_color_text("The connection is not ready.", COLOR_RED)
-            )
-        );
-    }
-}
-
-void CommandRow::on_state_changed(ProgramState state){
-    VirtualController::on_state_changed(state);
-    update_ui();
-}
-
-
-void CommandRow::enabled_boxes(bool enabled){
-    QMetaObject::invokeMethod(this, [this, enabled]{
-        this->m_overlay_boxes->setChecked(enabled);
-    }, Qt::QueuedConnection);
-}
-void CommandRow::enabled_text(bool enabled){
-    QMetaObject::invokeMethod(this, [this, enabled]{
-        this->m_overlay_text->setChecked(enabled);
-    }, Qt::QueuedConnection);
-}
-void CommandRow::enabled_log(bool enabled){
-    QMetaObject::invokeMethod(this, [this, enabled]{
-        this->m_overlay_log->setChecked(enabled);
-    }, Qt::QueuedConnection);
-}
-void CommandRow::enabled_stats(bool enabled){
-    QMetaObject::invokeMethod(this, [this, enabled]{
-        this->m_overlay_stats->setChecked(enabled);
-    }, Qt::QueuedConnection);
-}
-
-
-
-
-
-}
-}
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/SerialPrograms/Source/NintendoSwitch/Framework/UI/NintendoSwitch_CommandRow.h b/SerialPrograms/Source/NintendoSwitch/Framework/UI/NintendoSwitch_CommandRow.h
deleted file mode 100644
index d1c13d76cf..0000000000
--- a/SerialPrograms/Source/NintendoSwitch/Framework/UI/NintendoSwitch_CommandRow.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*  Command Row
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_NintendoSwitch_CommandRow_H
-#define PokemonAutomation_NintendoSwitch_CommandRow_H
-
-#include <QComboBox>
-#include <QLabel>
-#include <QPushButton>
-#include <QCheckBox>
-#include "CommonFramework/Globals.h"
-#include "CommonFramework/VideoPipeline/VideoOverlaySession.h"
-#include "NintendoSwitch/Framework/NintendoSwitch_VirtualController.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-
-
-class CommandRow : public QWidget, public VirtualController, public VideoOverlaySession::Listener{
-    Q_OBJECT
-
-public:
-    ~CommandRow();
-    CommandRow(
-        QWidget& parent,
-        BotBaseHandle& botbase,
-        VideoOverlaySession& session,
-        bool allow_commands_while_running
-    );
-
-    //  Returns false if key is not handled. (pass it up to next handler)
-    bool on_key_press(Qt::Key key);
-    bool on_key_release(Qt::Key key);
-
-signals:
-    void load_profile();
-    void save_profile();
-    void screenshot_requested();
-
-public:
-    void set_focus(bool focused);
-    void update_ui();
-    void on_state_changed(ProgramState state);
-
-private:
-    virtual void enabled_boxes(bool enabled) override;
-    virtual void enabled_text (bool enabled) override;
-    virtual void enabled_log  (bool enabled) override;
-    virtual void enabled_stats(bool enabled) override;
-
-private:
-    BotBaseHandle& m_botbase;
-    VideoOverlaySession& m_session;
-    bool m_allow_commands_while_running;
-    QComboBox* m_command_box;
-    QLabel* m_status;
-
-    QCheckBox* m_overlay_log;
-    QCheckBox* m_overlay_text;
-    QCheckBox* m_overlay_boxes;
-    QCheckBox* m_overlay_stats;
-
-    QPushButton* m_load_profile_button;
-    QPushButton* m_save_profile_button;
-    QPushButton* m_screenshot_button;
-    bool m_last_known_focus;
-};
-
-
-}
-}
-#endif
diff --git a/SerialPrograms/Source/NintendoSwitch/Framework/UI/NintendoSwitch_MultiSwitchProgramWidget.cpp b/SerialPrograms/Source/NintendoSwitch/Framework/UI/NintendoSwitch_MultiSwitchProgramWidget.cpp
deleted file mode 100644
index dd2f0cda2a..0000000000
--- a/SerialPrograms/Source/NintendoSwitch/Framework/UI/NintendoSwitch_MultiSwitchProgramWidget.cpp
+++ /dev/null
@@ -1,170 +0,0 @@
-/*  Multi-Switch Program Widget
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <QVBoxLayout>
-#include <QLabel>
-#include <QMessageBox>
-#include <QScrollArea>
-#include "Common/Cpp/Containers/FixedLimitVector.tpp"
-#include "Common/Qt/CollapsibleGroupBox.h"
-#include "Common/Qt/Options/BatchWidget.h"
-#include "CommonFramework/NewVersionCheck.h"
-#include "CommonFramework/Panels/PanelTools.h"
-#include "CommonFramework/Panels/UI/PanelElements.h"
-#include "CommonFramework/Tools/StatsTracking.h"
-#include "NintendoSwitch/Framework/NintendoSwitch_MultiSwitchProgramOption.h"
-#include "NintendoSwitch/Framework/NintendoSwitch_MultiSwitchProgramSession.h"
-#include "NintendoSwitch_MultiSwitchProgramWidget.h"
-
-//#include <iostream>
-//using std::cout;
-//using std::endl;
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-
-
-
-MultiSwitchProgramWidget2::~MultiSwitchProgramWidget2(){
-    m_session.ProgramSession::remove_listener(*this);
-    m_session.remove_listener(*this);
-    delete m_actions_bar;
-    delete m_stats_bar;
-    delete m_options;
-    delete m_system;
-}
-
-
-MultiSwitchProgramWidget2::MultiSwitchProgramWidget2(
-    QWidget& parent,
-    MultiSwitchProgramOption& option,
-    PanelHolder& holder
-)
-    : QWidget(&parent)
-    , m_holder(holder)
-    , m_session(option)
-{
-    QVBoxLayout* layout = new QVBoxLayout(this);
-    layout->setContentsMargins(0, 0, 0, 0);
-
-    const MultiSwitchProgramDescriptor& descriptor = option.descriptor();
-
-    CollapsibleGroupBox* header = make_panel_header(
-        *this,
-        descriptor.display_name(),
-        descriptor.doc_link(),
-        descriptor.description(),
-        descriptor.feedback(),
-        descriptor.min_pabotbase_level()
-    );
-    layout->addWidget(header);
-
-
-    {
-        QScrollArea* scroll_outer = new QScrollArea(this);
-        layout->addWidget(scroll_outer);
-        scroll_outer->setWidgetResizable(true);
-
-        QWidget* scroll_inner = new QWidget(scroll_outer);
-        scroll_outer->setWidget(scroll_inner);
-        QVBoxLayout* scroll_layout = new QVBoxLayout(scroll_inner);
-        scroll_layout->setAlignment(Qt::AlignTop);
-
-        m_system = new MultiSwitchSystemWidget(*this, m_session.system(), m_session.instance_id());
-        scroll_layout->addWidget(m_system);
-
-        m_options = option.options().make_QtWidget(*this);
-        scroll_layout->addWidget(&m_options->widget());
-
-        scroll_layout->addStretch(1);
-    }
-
-    m_stats_bar = new StatsBar(*this);
-    m_stats_bar->set_stats("", m_session.historical_stats());
-    layout->addWidget(m_stats_bar);
-
-    m_actions_bar = new RunnablePanelActionBar(*this, m_session.current_state());
-    layout->addWidget(m_actions_bar);
-
-    connect(
-        m_actions_bar, &RunnablePanelActionBar::start_clicked,
-        this, [&](ProgramState state){
-            std::string error;
-            switch (state){
-            case ProgramState::STOPPED:
-                error = m_session.start_program();
-                break;
-            case ProgramState::RUNNING:
-                error = m_session.stop_program();
-                break;
-            default:;
-            }
-            if (!error.empty()){
-                this->error(error);
-            }
-        }
-    );
-    connect(
-        m_actions_bar, &RunnablePanelActionBar::defaults_clicked,
-        this, [&]{
-            std::lock_guard<std::mutex> lg(m_session.program_lock());
-            option.restore_defaults();
-            m_options->update_all(false);
-        }
-    );
-
-    m_session.add_listener(*this);
-    m_session.ProgramSession::add_listener(*this);
-}
-
-
-
-
-void MultiSwitchProgramWidget2::state_change(ProgramState state){
-    QMetaObject::invokeMethod(this, [this, state]{
-        m_system->update_ui(state);
-        m_options->option().report_program_state(state != ProgramState::STOPPED);
-//        cout << "state = " << (state != ProgramState::STOPPED) << endl;
-//        if (m_option.descriptor().lock_options_while_running()){
-//            m_options->widget().setEnabled(state == ProgramState::STOPPED);
-//        }
-        m_actions_bar->set_state(state);
-        if (state == ProgramState::STOPPED){
-            m_holder.on_idle();
-            check_new_version();
-        }else{
-            m_holder.on_busy();
-        }
-    });
-}
-void MultiSwitchProgramWidget2::stats_update(const StatsTracker* current_stats, const StatsTracker* historical_stats){
-    QMetaObject::invokeMethod(this, [this, current_stats, historical_stats]{
-        m_stats_bar->set_stats(
-            current_stats == nullptr ? "" : current_stats->to_str(),
-            historical_stats == nullptr ? "" : historical_stats->to_str()
-        );
-    });
-}
-void MultiSwitchProgramWidget2::error(const std::string& message){
-    QMetaObject::invokeMethod(this, [message]{
-        QMessageBox box;
-        box.critical(nullptr, "Error", QString::fromStdString(message));
-    });
-}
-
-void MultiSwitchProgramWidget2::redraw_options(){
-    QMetaObject::invokeMethod(this, [this]{
-        m_options->update_all(false);
-    });
-}
-
-
-
-
-
-
-}
-}
diff --git a/SerialPrograms/Source/NintendoSwitch/Framework/UI/NintendoSwitch_MultiSwitchProgramWidget.h b/SerialPrograms/Source/NintendoSwitch/Framework/UI/NintendoSwitch_MultiSwitchProgramWidget.h
deleted file mode 100644
index 84700665b3..0000000000
--- a/SerialPrograms/Source/NintendoSwitch/Framework/UI/NintendoSwitch_MultiSwitchProgramWidget.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*  Multi-Switch Program Widget
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- *  This is the Qt Widget implementation of the UI for MultiSwitchProgramSession.
- *
- *  On construction, this class attaches itself to the session it is constructed
- *  with and automatically detaches on destruction. Therefore, this class must
- *  not outlive the session it is constructed with. While not useful, it is also
- *  safe to construct multiple UI classes attached to the same session.
- *
- *  Modifications directly to the session object will automatically update this
- *  UI class. For example, if you use Discord to change the volume of the
- *  audio playback, it will move the slider as shown by this UI.
- *
- */
-
-#ifndef PokemonAutomation_NintendoSwitch_MultiSwitchProgramWidget_H
-#define PokemonAutomation_NintendoSwitch_MultiSwitchProgramWidget_H
-
-#include "CommonFramework/Panels/UI/PanelElements.h"
-#include "NintendoSwitch/NintendoSwitch_MultiSwitchProgram.h"
-#include "NintendoSwitch/Framework/NintendoSwitch_MultiSwitchProgramSession.h"
-#include "NintendoSwitch_MultiSwitchSystemWidget.h"
-
-namespace PokemonAutomation{
-    struct PanelHolder;
-namespace NintendoSwitch{
-
-
-
-class MultiSwitchProgramWidget2 : public QWidget, private ProgramSession::Listener, private MultiSwitchProgramSession::Listener{
-public:
-    ~MultiSwitchProgramWidget2();
-    MultiSwitchProgramWidget2(
-        QWidget& parent,
-        MultiSwitchProgramOption& option,
-        PanelHolder& holder
-    );
-
-private:
-    virtual void state_change(ProgramState state) override;
-    virtual void stats_update(const StatsTracker* current_stats, const StatsTracker* historical_stats) override;
-    virtual void error(const std::string& message) override;
-
-    virtual void redraw_options() override;
-
-private:
-    PanelHolder& m_holder;
-    MultiSwitchProgramSession m_session;
-    MultiSwitchSystemWidget* m_system;
-    ConfigWidget* m_options;
-    StatsBar* m_stats_bar;
-    RunnablePanelActionBar* m_actions_bar;
-};
-
-
-
-
-
-
-}
-}
-#endif
diff --git a/SerialPrograms/Source/NintendoSwitch/Framework/UI/NintendoSwitch_MultiSwitchSystemWidget.cpp b/SerialPrograms/Source/NintendoSwitch/Framework/UI/NintendoSwitch_MultiSwitchSystemWidget.cpp
deleted file mode 100644
index 6df3f4d3eb..0000000000
--- a/SerialPrograms/Source/NintendoSwitch/Framework/UI/NintendoSwitch_MultiSwitchSystemWidget.cpp
+++ /dev/null
@@ -1,158 +0,0 @@
-/*  Multi-Switch System Widget
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <QVBoxLayout>
-#include <QLabel>
-#include "Common/Qt/NoWheelComboBox.h"
-#include "NintendoSwitch_SwitchSystemWidget.h"
-#include "NintendoSwitch_MultiSwitchSystemWidget.h"
-
-#include <iostream>
-using std::cout;
-using std::endl;
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-
-
-MultiSwitchSystemWidget::~MultiSwitchSystemWidget(){
-    {
-        std::lock_guard<std::mutex> lg(m_lock);
-        for (SwitchSystemWidget* console : m_switches){
-            delete console;
-        }
-        m_switches.clear();
-        delete m_videos;
-        m_videos = nullptr;
-        m_shutting_down = true;
-    }
-    m_session.remove_listener(*this);
-}
-MultiSwitchSystemWidget::MultiSwitchSystemWidget(
-    QWidget& parent,
-    MultiSwitchSystemSession& session,
-    uint64_t program_id
-)
-    : QWidget(&parent)
-    , m_program_id(program_id)
-    , m_session(session)
-    , m_videos(nullptr)
-{
-    QVBoxLayout* vbox = new QVBoxLayout(this);
-    vbox->setContentsMargins(0, 0, 0, 0);
-
-    QHBoxLayout* row = new QHBoxLayout();
-    vbox->addLayout(row, 0);
-    row->setContentsMargins(0, 0, 0, 0);
-    row->addStretch(2);
-    row->addWidget(new QLabel("<b>Switch Count:</b>", this), 0);
-    m_console_count_box = new NoWheelComboBox(this);
-    row->addWidget(m_console_count_box, 1);
-    row->addStretch(2);
-
-    //  Acquire the lock now and attach listener. This will block the session
-    //  from changing the # of switches while we draw everything.
-    std::lock_guard<std::mutex> lg(m_lock);
-    m_session.add_listener(*this);
-
-    for (size_t c = session.min_switches(); c <= session.max_switches(); c++){
-        m_console_count_box->addItem(QString::number(c));
-    }
-    m_console_count_box->setCurrentIndex((int)(m_session.count() - m_session.min_switches()));
-
-    connect(
-        m_console_count_box, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
-        this, [this](int index){
-            if (index < 0 || index > (int)(m_session.max_switches() - m_session.min_switches())){
-                return;
-            }
-            m_session.set_switch_count(index + m_session.min_switches());
-        }
-    );
-
-    redraw_videos(m_session.count());
-}
-
-void MultiSwitchSystemWidget::shutdown(){
-//    cout << "MultiSwitchSystemWidget::shutdown()" << endl;
-    std::lock_guard<std::mutex> lg(m_lock);
-    for (SwitchSystemWidget* console : m_switches){
-        delete console;
-    }
-    m_switches.clear();
-    delete m_videos;
-    m_videos = nullptr;
-}
-void MultiSwitchSystemWidget::startup(size_t switch_count){
-//    cout << "MultiSwitchSystemWidget::startup()" << endl;
-    std::lock_guard<std::mutex> lg(m_lock);
-    redraw_videos(switch_count);
-}
-
-void MultiSwitchSystemWidget::redraw_videos(size_t count){
-//    cout << "MultiSwitchSystemWidget::redraw_videos()" << endl;
-//    std::lock_guard<std::mutex> lg(m_lock);
-//    if (count == m_switches.size()){
-//        return;
-//    }
-    if (m_shutting_down){
-        return;
-    }
-
-    QVBoxLayout* layout = static_cast<QVBoxLayout*>(this->layout());
-    m_switches.clear();
-    if (m_videos != nullptr){
-        layout->removeWidget(m_videos);
-        delete m_videos;
-        m_videos = nullptr;
-    }
-
-    m_videos = new QWidget(this);
-    this->layout()->addWidget(m_videos);
-    QVBoxLayout* vbox = new QVBoxLayout(m_videos);
-    vbox->setContentsMargins(0, 0, 0, 0);
-
-//    m_option.resize(count);
-    for (size_t c = 0; c < m_session.count(); c++){
-//        const auto& item = m_option.m_switches[c];
-//        m_switches.emplace_back(item->make_ui(*this, m_logger, m_program_id));
-        m_switches.emplace_back(new SwitchSystemWidget(*m_videos, m_session[c], m_program_id));
-    }
-
-    QHBoxLayout* vrow0 = new QHBoxLayout();
-    vbox->addLayout(vrow0, 1);
-    vrow0->setContentsMargins(0, 0, 0, 0);
-
-    vrow0->addWidget(m_switches[0], 1);
-    if (m_switches.size() >= 2){
-        vrow0->addWidget(m_switches[1], 1);
-    }
-    if (m_switches.size() >= 3){
-        QHBoxLayout* vrow1 = new QHBoxLayout();
-        vbox->addLayout(vrow1, 1);
-        vrow1->setContentsMargins(0, 0, 0, 0);
-        vrow1->addWidget(m_switches[2], 1);
-        if (m_switches.size() >= MultiSwitchSystemOption::MAX_SWITCHES){
-            vrow1->addWidget(m_switches[3], 1);
-        }else{
-            vrow1->addWidget(new QWidget(), 1);
-        }
-    }
-    static_assert(MultiSwitchSystemOption::MAX_SWITCHES <= 4, "Can't display more than 4 Switches.");
-}
-
-void MultiSwitchSystemWidget::update_ui(ProgramState state){
-    m_console_count_box->setEnabled(state == ProgramState::STOPPED);
-    for (const auto& item : m_switches){
-        item->update_ui(state);
-    }
-}
-
-
-
-
-}
-}
diff --git a/SerialPrograms/Source/NintendoSwitch/Framework/UI/NintendoSwitch_MultiSwitchSystemWidget.h b/SerialPrograms/Source/NintendoSwitch/Framework/UI/NintendoSwitch_MultiSwitchSystemWidget.h
deleted file mode 100644
index 310cbf93c4..0000000000
--- a/SerialPrograms/Source/NintendoSwitch/Framework/UI/NintendoSwitch_MultiSwitchSystemWidget.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*  Multi-Switch System Widget
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- *  This is the Qt Widget implementation of the UI for MultiSwitchSystemSession.
- *
- *  On construction, this class attaches itself to the session it is constructed
- *  with and automatically detaches on destruction. Therefore, this class must
- *  not outlive the session it is constructed with. While not useful, it is also
- *  safe to construct multiple UI classes attached to the same session.
- *
- *  Modifications directly to the session object will automatically update this
- *  UI class. For example, if you use Discord to change the volume of the
- *  audio playback, it will move the slider as shown by this UI.
- *
- */
-
-#ifndef PokemonAutomationn_NintendoSwitch_SwitchSystem4Widget_H
-#define PokemonAutomationn_NintendoSwitch_SwitchSystem4Widget_H
-
-#include <QWidget>
-#include "NintendoSwitch/Framework/NintendoSwitch_MultiSwitchSystemOption.h"
-#include "NintendoSwitch/Framework/NintendoSwitch_MultiSwitchSystemSession.h"
-
-class QComboBox;
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-
-class SwitchSystemWidget;
-
-
-class MultiSwitchSystemWidget final : public QWidget, private MultiSwitchSystemSession::Listener{
-    Q_OBJECT
-
-public:
-    ~MultiSwitchSystemWidget();
-    MultiSwitchSystemWidget(
-        QWidget& parent,
-        MultiSwitchSystemSession& session,
-        uint64_t program_id
-    );
-
-    size_t switch_count() const{ return m_switches.size(); }
-    SwitchSystemWidget& operator[](size_t index){ return *m_switches[index]; }
-
-public:
-    void update_ui(ProgramState state);
-
-private:
-    virtual void shutdown() override;
-    virtual void startup(size_t switch_count) override;
-
-    void redraw_videos(size_t count);
-
-private:
-    uint64_t m_program_id;
-    MultiSwitchSystemSession& m_session;
-
-    std::mutex m_lock;
-    bool m_shutting_down = false;
-
-    QComboBox* m_console_count_box;
-    std::vector<SwitchSystemWidget*> m_switches;
-    QWidget* m_videos;
-//    std::map<size_t, SwitchSystem*> m_active_ports;
-};
-
-
-}
-}
-#endif
diff --git a/SerialPrograms/Source/NintendoSwitch/Framework/UI/NintendoSwitch_SingleSwitchProgramWidget.cpp b/SerialPrograms/Source/NintendoSwitch/Framework/UI/NintendoSwitch_SingleSwitchProgramWidget.cpp
deleted file mode 100644
index 092e6c2178..0000000000
--- a/SerialPrograms/Source/NintendoSwitch/Framework/UI/NintendoSwitch_SingleSwitchProgramWidget.cpp
+++ /dev/null
@@ -1,157 +0,0 @@
-/*  Single Switch Program Widget
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <QVBoxLayout>
-#include <QLabel>
-#include <QMessageBox>
-#include <QScrollArea>
-#include "Common/Qt/CollapsibleGroupBox.h"
-#include "Common/Qt/Options/ConfigWidget.h"
-#include "CommonFramework/NewVersionCheck.h"
-#include "CommonFramework/Panels/PanelTools.h"
-#include "CommonFramework/Panels/UI/PanelElements.h"
-#include "CommonFramework/Tools/StatsTracking.h"
-#include "NintendoSwitch/Framework/NintendoSwitch_SingleSwitchProgramOption.h"
-#include "NintendoSwitch_SingleSwitchProgramWidget.h"
-
-//#include <iostream>
-//using std::cout;
-//using std::endl;
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-
-
-
-SingleSwitchProgramWidget2::~SingleSwitchProgramWidget2(){
-    m_session.remove_listener(*this);
-    delete m_actions_bar;
-    delete m_stats_bar;
-    delete m_options;
-    delete m_system;
-}
-SingleSwitchProgramWidget2::SingleSwitchProgramWidget2(
-    QWidget& parent,
-    SingleSwitchProgramOption& option,
-    PanelHolder& holder
-)
-    : QWidget(&parent)
-    , m_holder(holder)
-    , m_session(option, 0)
-{
-    QVBoxLayout* layout = new QVBoxLayout(this);
-    layout->setContentsMargins(0, 0, 0, 0);
-
-    const SingleSwitchProgramDescriptor& descriptor = option.descriptor();
-
-    CollapsibleGroupBox* header = make_panel_header(
-        *this,
-        descriptor.display_name(),
-        descriptor.doc_link(),
-        descriptor.description(),
-        descriptor.feedback(),
-        descriptor.min_pabotbase_level()
-    );
-    layout->addWidget(header);
-
-
-    {
-        QScrollArea* scroll_outer = new QScrollArea(this);
-        layout->addWidget(scroll_outer);
-        scroll_outer->setWidgetResizable(true);
-
-        QWidget* scroll_inner = new QWidget(scroll_outer);
-        scroll_outer->setWidget(scroll_inner);
-        QVBoxLayout* scroll_layout = new QVBoxLayout(scroll_inner);
-        scroll_layout->setAlignment(Qt::AlignTop);
-
-        m_system = new SwitchSystemWidget(*this, m_session.system(), m_session.instance_id());
-        scroll_layout->addWidget(m_system);
-
-        m_options = option.options().make_QtWidget(*this);
-        scroll_layout->addWidget(&m_options->widget());
-
-        scroll_layout->addStretch(1);
-    }
-
-    m_stats_bar = new StatsBar(*this);
-    m_stats_bar->set_stats("", m_session.historical_stats());
-    layout->addWidget(m_stats_bar);
-
-    m_actions_bar = new RunnablePanelActionBar(*this, m_session.current_state());
-    layout->addWidget(m_actions_bar);
-
-    connect(
-        m_actions_bar, &RunnablePanelActionBar::start_clicked,
-        this, [&](ProgramState state){
-            std::string error;
-            switch (state){
-            case ProgramState::STOPPED:
-                error = m_session.start_program();
-                break;
-            case ProgramState::RUNNING:
-                error = m_session.stop_program();
-                break;
-            default:;
-            }
-            if (!error.empty()){
-                this->error(error);
-            }
-        }
-    );
-    connect(
-        m_actions_bar, &RunnablePanelActionBar::defaults_clicked,
-        this, [&]{
-            std::lock_guard<std::mutex> lg(m_session.program_lock());
-            option.restore_defaults();
-            m_options->update_all(false);
-        }
-    );
-
-    m_session.add_listener(*this);
-}
-
-void SingleSwitchProgramWidget2::state_change(ProgramState state){
-    QMetaObject::invokeMethod(this, [this, state]{
-        m_system->update_ui(state);
-        m_options->option().report_program_state(state != ProgramState::STOPPED);
-//        cout << "state = " << (state != ProgramState::STOPPED) << endl;
-//        if (m_option.descriptor().lock_options_while_running()){
-//            m_options->widget().setEnabled(state == ProgramState::STOPPED);
-//        }
-        m_actions_bar->set_state(state);
-        if (state == ProgramState::STOPPED){
-            m_holder.on_idle();
-            check_new_version();
-        }else{
-            m_holder.on_busy();
-        }
-    });
-}
-void SingleSwitchProgramWidget2::stats_update(const StatsTracker* current_stats, const StatsTracker* historical_stats){
-    QMetaObject::invokeMethod(this, [this, current_stats, historical_stats]{
-        m_stats_bar->set_stats(
-            current_stats == nullptr ? "" : current_stats->to_str(),
-            historical_stats == nullptr ? "" : historical_stats->to_str()
-        );
-    });
-}
-void SingleSwitchProgramWidget2::error(const std::string& message){
-    QMetaObject::invokeMethod(this, [message]{
-        QMessageBox box;
-        box.critical(nullptr, "Error", QString::fromStdString(message));
-    });
-}
-
-
-
-
-
-
-
-
-}
-}
diff --git a/SerialPrograms/Source/NintendoSwitch/Framework/UI/NintendoSwitch_SingleSwitchProgramWidget.h b/SerialPrograms/Source/NintendoSwitch/Framework/UI/NintendoSwitch_SingleSwitchProgramWidget.h
deleted file mode 100644
index de4717b8cf..0000000000
--- a/SerialPrograms/Source/NintendoSwitch/Framework/UI/NintendoSwitch_SingleSwitchProgramWidget.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*  Single Switch Program Widget
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- *  This is the Qt Widget implementation of the UI for SwitchSystemSession.
- *
- *  On construction, this class attaches itself to the session it is constructed
- *  with and automatically detaches on destruction. Therefore, this class must
- *  not outlive the session it is constructed with. While not useful, it is also
- *  safe to construct multiple UI classes attached to the same session.
- *
- *  Modifications directly to the session object will automatically update this
- *  UI class. For example, if you use Discord to change the volume of the
- *  audio playback, it will move the slider as shown by this UI.
- *
- */
-
-#ifndef PokemonAutomation_NintendoSwitch_SingleSwitchProgramWidget_H
-#define PokemonAutomation_NintendoSwitch_SingleSwitchProgramWidget_H
-
-#include "CommonFramework/Panels/UI/PanelElements.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-#include "NintendoSwitch/Framework/NintendoSwitch_SingleSwitchProgramSession.h"
-#include "NintendoSwitch_SwitchSystemWidget.h"
-
-namespace PokemonAutomation{
-    struct PanelHolder;
-namespace NintendoSwitch{
-
-
-
-class SingleSwitchProgramWidget2 : public QWidget, private ProgramSession::Listener{
-public:
-    ~SingleSwitchProgramWidget2();
-    SingleSwitchProgramWidget2(
-        QWidget& parent,
-        SingleSwitchProgramOption& option,
-        PanelHolder& holder
-    );
-
-private:
-    virtual void state_change(ProgramState state) override;
-    virtual void stats_update(const StatsTracker* current_stats, const StatsTracker* historical_stats) override;
-    virtual void error(const std::string& message) override;
-
-private:
-    PanelHolder& m_holder;
-    SingleSwitchProgramSession m_session;
-    SwitchSystemWidget* m_system;
-    ConfigWidget* m_options;
-    StatsBar* m_stats_bar;
-    RunnablePanelActionBar* m_actions_bar;
-};
-
-
-
-
-
-
-
-}
-}
-#endif
diff --git a/SerialPrograms/Source/NintendoSwitch/Framework/UI/NintendoSwitch_SwitchSystemWidget.cpp b/SerialPrograms/Source/NintendoSwitch/Framework/UI/NintendoSwitch_SwitchSystemWidget.cpp
deleted file mode 100644
index fab8615575..0000000000
--- a/SerialPrograms/Source/NintendoSwitch/Framework/UI/NintendoSwitch_SwitchSystemWidget.cpp
+++ /dev/null
@@ -1,212 +0,0 @@
-/*  Switch System
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <QKeyEvent>
-#include <QVBoxLayout>
-#include <QGroupBox>
-#include <QFileDialog>
-#include "Common/Cpp/PrettyPrint.h"
-#include "Common/Cpp/Concurrency/FireForgetDispatcher.h"
-#include "Common/Cpp/Json/JsonValue.h"
-#include "Common/Qt/CollapsibleGroupBox.h"
-#include "CommonFramework/AudioPipeline/UI/AudioSelectorWidget.h"
-#include "CommonFramework/AudioPipeline/UI/AudioDisplayWidget.h"
-#include "CommonFramework/ControllerDevices/SerialPortWidget.h"
-#include "CommonFramework/VideoPipeline/UI/CameraSelectorWidget.h"
-#include "CommonFramework/VideoPipeline/UI/VideoDisplayWidget.h"
-#include "CommonFramework/Globals.h"
-#include "NintendoSwitch_CommandRow.h"
-#include "NintendoSwitch_SwitchSystemWidget.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-
-
-
-SwitchSystemWidget::~SwitchSystemWidget(){
-    m_serial_widget->stop();
-
-    //  Delete all the UI elements first since they reference the states.
-    delete m_audio_display;
-    delete m_audio_widget;
-    delete m_video_display;
-    delete m_camera_widget;
-    delete m_serial_widget;
-}
-
-SwitchSystemWidget::SwitchSystemWidget(
-    QWidget& parent,
-    SwitchSystemSession& session,
-    uint64_t program_id
-)
-    : QWidget(&parent)
-    , m_session(session)
-{
-    QVBoxLayout* layout = new QVBoxLayout(this);
-    layout->setContentsMargins(0, 0, 0, 0);
-    layout->setAlignment(Qt::AlignTop);
-
-    m_group_box = new CollapsibleGroupBox(*this, "Console " + QString::number(m_session.console_number()) + " Settings");
-    layout->addWidget(m_group_box);
-
-    QWidget* widget = new QWidget(m_group_box);
-    m_group_box->set_widget(widget);
-    {
-        QVBoxLayout* group_layout = new QVBoxLayout(widget);
-        group_layout->setAlignment(Qt::AlignTop);
-        group_layout->setContentsMargins(0, 0, 0, 0);
-
-        m_serial_widget = new SerialPortWidget(*this, m_session.serial_session(), m_session.logger());
-        group_layout->addWidget(m_serial_widget);
-
-        m_audio_display = new AudioDisplayWidget(*this, m_session.logger(), m_session.audio_session());
-        layout->addWidget(m_audio_display);
-
-        QVBoxLayout* video_holder = new QVBoxLayout();
-        layout->addLayout(video_holder);
-        video_holder->setContentsMargins(0, 0, 0, 0);
-        m_video_display = new VideoDisplayWidget(
-            *this, *video_holder,
-            m_session.console_number(),
-            *this,
-            m_session.camera_session(),
-            m_session.overlay_session()
-        );
-        video_holder->addWidget(m_video_display);
-
-        m_camera_widget = new CameraSelectorWidget(m_session.camera_session(), m_session.logger(), *m_video_display);
-        group_layout->addWidget(m_camera_widget);
-
-        m_audio_widget = new AudioSelectorWidget(*widget, m_session.logger(), m_session.audio_session());
-        group_layout->addWidget(m_audio_widget);
-
-        m_command = new CommandRow(
-            *widget,
-            m_serial_widget->botbase(),
-            m_session.overlay_session(),
-            m_session.allow_commands_while_running()
-        );
-        group_layout->addWidget(m_command);
-    }
-
-    setFocusPolicy(Qt::StrongFocus);
-
-
-    connect(
-        m_serial_widget, &SerialPortWidget::signal_on_ready,
-        m_command, [this](bool ready){
-            m_command->update_ui();
-        }
-    );
-    connect(
-        m_command, &CommandRow::load_profile,
-        m_command, [this](){
-            std::string path = QFileDialog::getOpenFileName(this, tr("Choose the name of your profile file"), "", tr("JSON files (*.json)")).toStdString();
-            if (path.empty()){
-                return;
-            }
-
-            SwitchSystemOption option(m_session.min_pabotbase(), m_session.allow_commands_while_running());
-
-            //  Deserialize into this local option instance.
-            option.load_json(load_json_file(path));
-
-            m_session.set(option);
-        }
-    );
-    connect(
-        m_command, &CommandRow::save_profile,
-        m_command, [this]() {
-            std::string path = QFileDialog::getSaveFileName(this, tr("Choose the name of your profile file"), "", tr("JSON files (*.json)")).toStdString();
-            if (path.empty()) {
-                return;
-            }
-
-            // Create a copy of option, to be able to serialize it later on
-            SwitchSystemOption option(m_session.min_pabotbase(), m_session.allow_commands_while_running());
-
-            m_session.get(option);
-
-            option.to_json().dump(path);
-        }
-    );
-    connect(
-        m_command, &CommandRow::screenshot_requested,
-        m_video_display, [this](){
-            global_dispatcher.dispatch([this]{
-                VideoSnapshot image = m_session.camera_session().snapshot();
-                if (!image){
-                    return;
-                }
-                std::string filename = SCREENSHOTS_PATH + "screenshot-" + now_to_filestring() + ".png";
-                m_session.logger().log("Saving screenshot to: " + filename, COLOR_PURPLE);
-                image->save(filename);
-            });
-        }
-    );
-}
-
-
-void SwitchSystemWidget::update_ui(ProgramState state){
-    if (!m_session.allow_commands_while_running()){
-        m_session.set_allow_user_commands(state == ProgramState::STOPPED);
-    }
-    switch (state){
-    case ProgramState::NOT_READY:
-        m_serial_widget->set_options_enabled(false);
-        break;
-    case ProgramState::STOPPED:
-        m_serial_widget->set_options_enabled(true);
-        break;
-    case ProgramState::RUNNING:
-    case ProgramState::STOPPING:
-        m_serial_widget->set_options_enabled(false);
-        break;
-    }
-    m_command->on_state_changed(state);
-}
-
-bool SwitchSystemWidget::key_press(QKeyEvent* event){
-    return m_command->on_key_press((Qt::Key)event->key());
-}
-
-bool SwitchSystemWidget::key_release(QKeyEvent* event){
-    return m_command->on_key_release((Qt::Key)event->key());
-}
-
-void SwitchSystemWidget::focus_in(QFocusEvent* event){
-    m_command->set_focus(true);
-}
-
-void SwitchSystemWidget::focus_out(QFocusEvent* event){
-    m_command->set_focus(false);
-}
-
-void SwitchSystemWidget::keyPressEvent(QKeyEvent* event){
-    if (!key_press(event)){
-        QWidget::keyPressEvent(event);
-    }
-}
-void SwitchSystemWidget::keyReleaseEvent(QKeyEvent* event){
-    if (!key_release(event)){
-        QWidget::keyReleaseEvent(event);
-    }
-}
-void SwitchSystemWidget::focusInEvent(QFocusEvent* event){
-//    cout << "focusInEvent" << endl;
-    focus_in(event);
-    QWidget::focusInEvent(event);
-}
-void SwitchSystemWidget::focusOutEvent(QFocusEvent* event){
-//    cout << "focusOutEvent" << endl;
-    focus_out(event);
-    QWidget::focusOutEvent(event);
-}
-
-
-
-}
-}
diff --git a/SerialPrograms/Source/NintendoSwitch/Framework/UI/NintendoSwitch_SwitchSystemWidget.h b/SerialPrograms/Source/NintendoSwitch/Framework/UI/NintendoSwitch_SwitchSystemWidget.h
deleted file mode 100644
index e91f439e97..0000000000
--- a/SerialPrograms/Source/NintendoSwitch/Framework/UI/NintendoSwitch_SwitchSystemWidget.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*  Switch System
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- *  This is the Qt Widget implementation of the UI for SwitchSystemSession.
- *
- *  On construction, this class attaches itself to the session it is constructed
- *  with and automatically detaches on destruction. Therefore, this class must
- *  not outlive the session it is constructed with. While not useful, it is also
- *  safe to construct multiple UI classes attached to the same session.
- *
- *  Modifications directly to the session object will automatically update this
- *  UI class. For example, if you use Discord to change the volume of the
- *  audio playback, it will move the slider as shown by this UI.
- *
- */
-
-#ifndef PokemonAutomation_NintendoSwitch_SwitchSystemWidget_H
-#define PokemonAutomation_NintendoSwitch_SwitchSystemWidget_H
-
-#include <QWidget>
-#include "CommonFramework/VideoPipeline/UI/VideoDisplayWidget.h"
-#include "NintendoSwitch/Framework/NintendoSwitch_SwitchSystemSession.h"
-
-namespace PokemonAutomation{
-    class CollapsibleGroupBox;
-    class AudioFeed;
-    class CameraSelectorWidget;
-    class VideoDisplayWidget;
-    class AudioDisplayWidget;
-    class VideoOverlay;
-
-namespace NintendoSwitch{
-
-class CommandRow;
-
-class SwitchSystemWidget final : public QWidget, public CommandReceiver{
-public:
-    virtual ~SwitchSystemWidget();
-    SwitchSystemWidget(
-        QWidget& parent,
-        SwitchSystemSession& session,
-        uint64_t program_id
-    );
-
-public:
-    void update_ui(ProgramState state);
-
-    //  The public versions of the private QWidget key and focus event handling functions.
-    //  They are needed to accept key and focus passed from CommonFramework/VideoPipeline/UI:VideoDisplayWindow.
-
-    //  Returns false if key is not handled. (pass it up to next handler)
-    virtual bool key_press(QKeyEvent* event) override;
-    virtual bool key_release(QKeyEvent* event) override;
-
-    virtual void focus_in(QFocusEvent* event) override;
-    virtual void focus_out(QFocusEvent* event) override;
-
-private:
-    virtual void keyPressEvent(QKeyEvent* event) override;
-    virtual void keyReleaseEvent(QKeyEvent* event) override;
-    virtual void focusInEvent(QFocusEvent* event) override;
-    virtual void focusOutEvent(QFocusEvent* event) override;
-
-private:
-    SwitchSystemSession& m_session;
-
-    CollapsibleGroupBox* m_group_box;
-
-    SerialPortWidget* m_serial_widget = nullptr;
-
-    VideoDisplayWidget* m_video_display = nullptr;
-    AudioDisplayWidget* m_audio_display;
-
-    CommandRow* m_command;
-
-    CameraSelectorWidget* m_camera_widget;
-    AudioSelectorWidget* m_audio_widget;
-};
-
-
-
-
-}
-}
-#endif
diff --git a/SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch2_BinarySliderDetector.cpp b/SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch2_BinarySliderDetector.cpp
new file mode 100644
index 0000000000..9da4c04d4e
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch2_BinarySliderDetector.cpp
@@ -0,0 +1,124 @@
+/*  Binary Slider Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Kernels/Waterfill/Kernels_Waterfill_Session.h"
+#include "CommonFramework/GlobalAutoPaths.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Images/BinaryImage_FilterRgb32.h"
+#include "CommonTools/ImageMatch/ExactImageMatcher.h"
+#include "NintendoSwitch2_BinarySliderDetector.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+
+
+BinarySliderDetector::BinarySliderDetector(Color color, const ImageFloatBox& box)
+    : m_color(color)
+    , m_box(box)
+{}
+void BinarySliderDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_box);
+}
+
+std::vector<std::pair<bool, ImagePixelBox>> BinarySliderDetector::detect(const ImageViewRGB32& screen) const{
+    using namespace Kernels::Waterfill;
+
+    static ImageMatch::ExactImageMatcher LIGHT_OFF_CURSOR   (RESOURCE_PATH() + "NintendoSwitch2/BinarySlider/BinarySlider-Light-Off-Cursor.png");
+    static ImageMatch::ExactImageMatcher LIGHT_OFF_NOCURSOR (RESOURCE_PATH() + "NintendoSwitch2/BinarySlider/BinarySlider-Light-Off-NoCursor.png");
+    static ImageMatch::ExactImageMatcher LIGHT_ON_CURSOR    (RESOURCE_PATH() + "NintendoSwitch2/BinarySlider/BinarySlider-Light-On-Cursor.png");
+    static ImageMatch::ExactImageMatcher LIGHT_ON_NOCURSOR  (RESOURCE_PATH() + "NintendoSwitch2/BinarySlider/BinarySlider-Light-On-NoCursor.png");
+    static ImageMatch::ExactImageMatcher DARK_OFF_CURSOR    (RESOURCE_PATH() + "NintendoSwitch2/BinarySlider/BinarySlider-Dark-Off-Cursor.png");
+    static ImageMatch::ExactImageMatcher DARK_OFF_NOCURSOR  (RESOURCE_PATH() + "NintendoSwitch2/BinarySlider/BinarySlider-Dark-Off-NoCursor.png");
+    static ImageMatch::ExactImageMatcher DARK_ON_CURSOR     (RESOURCE_PATH() + "NintendoSwitch2/BinarySlider/BinarySlider-Dark-On-Cursor.png");
+    static ImageMatch::ExactImageMatcher DARK_ON_NOCURSOR   (RESOURCE_PATH() + "NintendoSwitch2/BinarySlider/BinarySlider-Dark-On-NoCursor.png");
+
+    ImageViewRGB32 region = extract_box_reference(screen, m_box);
+
+    std::vector<PackedBinaryMatrix> matrices = compress_rgb32_to_binary_range(
+        region,
+        {
+            {0xffc0c0c0, 0xffffffff},
+            {0xffd0d0d0, 0xffffffff},
+            {0xffe0e0e0, 0xffffffff},
+            {0xfff0f0f0, 0xffffffff},
+        }
+    );
+
+    auto session = make_WaterfillSession();
+
+    std::vector<std::pair<bool, ImagePixelBox>> best;
+
+//    int c = 0;
+    for (PackedBinaryMatrix& matrix : matrices){
+//        cout << "-----------------" << endl;
+        session->set_source(matrix);
+        auto iter = session->make_iterator(200);
+        WaterfillObject object;
+
+        std::vector<std::pair<bool, ImagePixelBox>> sliders;
+
+        while (iter->find_next(object, false)){
+            double aspect_ratio = object.aspect_ratio();
+            if (aspect_ratio < 0.9 || aspect_ratio > 1.1){
+                continue;
+            }
+
+            double min_area = screen.total_pixels() * (3000. / (3840*2160));
+            if ((double)object.area < min_area){
+                continue;
+            }
+
+            ImageViewRGB32 cropped = extract_box_reference(region, object);
+
+            double best_off_rmsd = 9999;
+            best_off_rmsd = std::min(best_off_rmsd, LIGHT_OFF_CURSOR.rmsd(cropped));
+            best_off_rmsd = std::min(best_off_rmsd, LIGHT_OFF_NOCURSOR.rmsd(cropped));
+            best_off_rmsd = std::min(best_off_rmsd, DARK_OFF_CURSOR.rmsd(cropped));
+            best_off_rmsd = std::min(best_off_rmsd, DARK_OFF_NOCURSOR.rmsd(cropped));
+
+            double best_on_rmsd = 9999;
+            best_on_rmsd = std::min(best_on_rmsd, LIGHT_ON_CURSOR.rmsd(cropped));
+            best_on_rmsd = std::min(best_on_rmsd, LIGHT_ON_NOCURSOR.rmsd(cropped));
+            best_on_rmsd = std::min(best_on_rmsd, DARK_ON_CURSOR.rmsd(cropped));
+            best_on_rmsd = std::min(best_on_rmsd, DARK_ON_NOCURSOR.rmsd(cropped));
+
+    //        cout << "best_off_rmsd = " << best_off_rmsd << endl;
+    //        cout << "best_on_rmsd  = " << best_on_rmsd << endl;
+
+            bool on = best_on_rmsd < best_off_rmsd;
+            double best_rmsd = on ? best_on_rmsd : best_off_rmsd;
+
+            if (best_rmsd < 60){
+//                cout << "rmsd = " << best_rmsd << endl;
+//                cropped.save("slider-" + std::to_string(c) + "-" + std::to_string(sliders.size()) + ".png");
+                sliders.emplace_back(on, object);
+            }
+
+//            for (auto& item : sliders){
+//                cout << item.first << " : " << item.second.max_y << endl;
+//            }
+
+        }
+
+        if (best.size() < sliders.size()){
+            best = std::move(sliders);
+        }
+
+//        c++;
+    }
+
+    return best;
+}
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch2_BinarySliderDetector.h b/SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch2_BinarySliderDetector.h
new file mode 100644
index 0000000000..d9368ea7b6
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch2_BinarySliderDetector.h
@@ -0,0 +1,38 @@
+/*  Binary Slider Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_NintendoSwitch2_BinarySliderDetector_H
+#define PokemonAutomation_NintendoSwitch2_BinarySliderDetector_H
+
+#include <vector>
+#include "Common/Cpp/Color.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonTools/VisualDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+
+
+
+class BinarySliderDetector{
+public:
+    BinarySliderDetector(Color color, const ImageFloatBox& box);
+    void make_overlays(VideoOverlaySet& items) const;
+
+    std::vector<std::pair<bool, ImagePixelBox>> detect(const ImageViewRGB32& screen) const;
+
+private:
+    Color m_color;
+    ImageFloatBox m_box;
+};
+
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_CheckOnlineDetector.cpp b/SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_CheckOnlineDetector.cpp
new file mode 100644
index 0000000000..f0c3c3e54f
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_CheckOnlineDetector.cpp
@@ -0,0 +1,135 @@
+/*  Check Online Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Images/SolidColorTest.h"
+#include "Tests/ImageUnitTest.h"
+#include "NintendoSwitch_CheckOnlineDetector.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+
+
+CheckOnlineDetector::CheckOnlineDetector(Color color, bool invert)
+    : m_color(color)
+    , m_invert(invert)
+    , m_box_top(0.25, 0.32, 0.50, 0.02)
+    , m_box_mid(0.25, 0.57, 0.50, 0.02)
+    , m_top(0.10, 0.15, 0.80, 0.03)
+    , m_left(0.08, 0.25, 0.10, 0.38)
+    , m_bottom_solid(0.10, 0.84, 0.80, 0.04)
+    , m_bottom_buttons(0.70, 0.92, 0.28, 0.05)
+{}
+void CheckOnlineDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_box_top);
+    items.add(m_color, m_box_mid);
+    items.add(m_color, m_top);
+    items.add(m_color, m_left);
+    items.add(m_color, m_bottom_solid);
+    items.add(m_color, m_bottom_buttons);
+}
+bool CheckOnlineDetector::detect(const ImageViewRGB32& screen){
+    ImageStats stats_box_top = image_stats(extract_box_reference(screen, m_box_top));
+//    cout << stats_box_top.average << stats_box_top.stddev << endl;
+    bool white;
+    if (stats_box_top.average.sum() < 300){
+        white = false;
+    }else if (stats_box_top.average.sum() > 500){
+        white = true;
+    }else{
+        return m_invert;
+    }
+    if (stats_box_top.stddev.sum() > 10){
+        return m_invert;
+    }
+
+//    cout << "white: " << white << endl;
+
+    ImageStats stats_box_mid = image_stats(extract_box_reference(screen, m_box_mid));
+    if (stats_box_mid.stddev.sum() > 10){
+        return m_invert;
+    }
+    if (euclidean_distance(stats_box_top.average, stats_box_mid.average) > 10){
+        return m_invert;
+    }
+
+    ImageStats stats_left = image_stats(extract_box_reference(screen, m_left));
+//    cout << stats_left.stddev << endl;
+    if (stats_left.stddev.sum() < 30){
+//        cout << "zxcv" << endl;
+        return m_invert;
+    }
+
+    ImageStats stats_top = image_stats(extract_box_reference(screen, m_top));
+//    cout << stats_top.average << stats_top.stddev << endl;
+
+    ImageStats bottom_solid = image_stats(extract_box_reference(screen, m_bottom_solid));
+//    cout << bottom_solid.average << bottom_solid.stddev << endl;
+
+    if (euclidean_distance(stats_top.average, bottom_solid.average) > 10){
+//        cout << "qwer" << endl;
+        return m_invert;
+    }
+
+    if (white){
+        if (!is_grey(stats_top, 100, 300) || !is_grey(bottom_solid, 100, 300)){
+//            cout << "asdf" << endl;
+            return m_invert;
+        }
+    }else{
+        if (!is_grey(stats_top, 0, 100) || !is_grey(bottom_solid, 0, 100)){
+//            cout << "zxcv" << endl;
+            return m_invert;
+        }
+    }
+
+    ImageStats stats_bottom_buttons = image_stats(extract_box_reference(screen, m_bottom_buttons));
+//    cout << stats_bottom_buttons.average << stats_bottom_buttons.stddev << endl;
+    if (stats_bottom_buttons.stddev.sum() < 30){
+        return m_invert;
+    }
+
+    return !m_invert;
+}
+
+
+class Test_CheckOnlineDetector : public ImageUnitTest{
+public:
+    Test_CheckOnlineDetector(const std::string& image, bool expected)
+        : ImageUnitTest("NintendoSwitch::CheckOnlineDetector - " + image, {image})
+        , m_expected(expected)
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        CheckOnlineDetector detector{};
+        const ImageRGB32& image = images[0];
+        return detector.detect(image) == m_expected;
+    }
+
+private:
+    bool m_expected;
+};
+
+
+void add_tests_CheckOnlineDetector(UnitTestDatabase& database){
+    database.add<Test_CheckOnlineDetector>("NintendoSwitch/CheckOnlineDetector/French_blackBackground_False.png", false);
+    database.add<Test_CheckOnlineDetector>("NintendoSwitch/CheckOnlineDetector/French_blackBackground_True.png", true);
+    database.add<Test_CheckOnlineDetector>("NintendoSwitch/CheckOnlineDetector/French_whiteBackground_False.png", false);
+    database.add<Test_CheckOnlineDetector>("NintendoSwitch/CheckOnlineDetector/French_whiteBackground_True.png", true);
+}
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_CheckOnlineDetector.h b/SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_CheckOnlineDetector.h
new file mode 100644
index 0000000000..970d77519a
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_CheckOnlineDetector.h
@@ -0,0 +1,51 @@
+/*  Check Online Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_NintendoSwitch_CheckOnlineDetector_H
+#define PokemonAutomation_NintendoSwitch_CheckOnlineDetector_H
+
+#include "Common/Cpp/Color.h"
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonTools/VisualDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+
+
+//  Detect the "Checking if the software can be played..." menu.
+class CheckOnlineDetector : public StaticScreenDetector{
+public:
+    CheckOnlineDetector(Color color = COLOR_RED, bool invert = false);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    Color m_color;
+    bool m_invert;
+    ImageFloatBox m_box_top;
+    ImageFloatBox m_box_mid;
+    ImageFloatBox m_top;
+    ImageFloatBox m_left;
+    ImageFloatBox m_bottom_solid;
+    ImageFloatBox m_bottom_buttons;
+};
+class CheckOnlineWatcher : public DetectorToFinder<CheckOnlineDetector>{
+public:
+    CheckOnlineWatcher(Color color = COLOR_RED, bool invert = false)
+         : DetectorToFinder("CheckOnlineWatcher", std::chrono::milliseconds(250), color, invert)
+    {}
+};
+
+
+void add_tests_CheckOnlineDetector(UnitTestDatabase& database);
+
+}
+}
+#endif
+
diff --git a/SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_CloseGameDetector.cpp b/SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_CloseGameDetector.cpp
new file mode 100644
index 0000000000..814850b370
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_CloseGameDetector.cpp
@@ -0,0 +1,99 @@
+/*  Close Game Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Images/SolidColorTest.h"
+#include "NintendoSwitch/NintendoSwitch_ConsoleHandle.h"
+#include "NintendoSwitch_CloseGameDetector.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+
+
+CloseGameDetector::CloseGameDetector(ConsoleHandle& console, Color color)
+    : m_color(color)
+    , m_top_box(0.226358, 0.272648, 0.407445, 0.033989)
+    , m_left_box(0.225, 0.275, 0.015, 0.350)
+    , m_close_game_text_row(0.330986, 0.649052, 0.342052, 0.051878)
+{}
+void CloseGameDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_top_box);
+    items.add(m_color, m_left_box);
+    items.add(m_color, m_close_game_text_row);
+}
+
+
+bool CloseGameDetector::detect(const ImageViewRGB32& screen){
+    
+    ImageStats stats_top = image_stats(extract_box_reference(screen, m_top_box));  // the top portion of the Close game popup
+    ImageStats stats_left = image_stats(extract_box_reference(screen, m_left_box));  // the left portion of the Close game popup
+    ImageStats stats_close_game_text = image_stats(extract_box_reference(screen, m_close_game_text_row));  // the bottom portion of the Close game popup. overlapping with the close game text.
+    
+//    cout << "stats_close_game_text.stddev.sum()" << stats_close_game_text.stddev.sum() << endl;
+    bool white;
+//    cout << "stats_top.average.sum() = " << stats_top.average.sum() << endl;
+    if (stats_top.average.sum() < 300){
+        white = false;
+    }else if (stats_top.average.sum() > 500){
+        white = true;
+    }else{
+        return false;
+    }
+
+//    cout << "stats_top.stddev.sum() = " << stats_top.stddev.sum() << endl;
+
+    // ensure top is uniform in color
+    if (stats_top.stddev.sum() > 20){
+        return false;
+    }
+
+//    cout << "stats_left.stddev.sum() = " << stats_left.stddev.sum() << endl;
+    // ensure left is uniform in color
+    if (stats_left.stddev.sum() > 20){
+        return false;
+    }
+
+    // ensure bottom is NOT uniform in color
+    if (stats_close_game_text.stddev.sum() < 50){
+        return false;
+    }
+
+    if (white){ // if top is white, ensure left is also white
+        if (!is_white(stats_top) || !is_white(stats_left)){
+//            cout << "top = " << stats_top.stddev << " / " << stats_top.average << endl;
+//            cout << "left = " << stats_left.stddev << " / " << stats_left.average << endl;
+//            cout << "asdf" << endl;
+            return false;
+        }
+    }else{
+        if (!is_grey(stats_top, 0, 300) || !is_grey(stats_left, 0, 300)){
+//            cout << "qwer" << endl;
+            return false;
+        }
+    }
+
+    // ensure top and left are the same color.
+    if (euclidean_distance(stats_top.average, stats_left.average) > 20){
+//        cout << "qwer = " << euclidean_distance(stats_top.average, stats_left.average) << endl;
+        return false;
+    }
+
+
+    return true;
+}
+
+
+
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_CloseGameDetector.h b/SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_CloseGameDetector.h
new file mode 100644
index 0000000000..c02b643589
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_CloseGameDetector.h
@@ -0,0 +1,48 @@
+/*  Close Game Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_NintendoSwitch_CloseGameDetector_H
+#define PokemonAutomation_NintendoSwitch_CloseGameDetector_H
+
+#include "Common/Cpp/Color.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonTools/VisualDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+
+
+class CloseGameDetector : public StaticScreenDetector{
+public:
+    CloseGameDetector(ConsoleHandle& console, Color color = COLOR_RED);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    Color m_color;
+    ImageFloatBox m_top_box;
+    ImageFloatBox m_left_box;
+    ImageFloatBox m_close_game_text_row;
+    
+};
+class CloseGameWatcher : public DetectorToFinder<CloseGameDetector>{
+public:
+    CloseGameWatcher(
+        ConsoleHandle& console,
+        std::chrono::milliseconds hold_duration = std::chrono::milliseconds(250)
+    )
+         : DetectorToFinder("CloseGameWatcher", hold_duration, console)
+    {}
+};
+
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_ConsoleTypeDetector.cpp b/SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_ConsoleTypeDetector.cpp
new file mode 100644
index 0000000000..dbfa38bb75
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_ConsoleTypeDetector.cpp
@@ -0,0 +1,103 @@
+/*  Console Type Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonFramework/ImageTools/ImageStats.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+//#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch_ConsoleTypeDetector.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+
+ConsoleTypeDetector_Home::ConsoleTypeDetector_Home(ConsoleHandle& console, Color color)
+    : m_console(console)
+    , m_color(color)
+    , m_bottom_line(0.20, 0.88, 0.60, 0.03)
+    , m_last(ConsoleType::Unknown)
+{}
+void ConsoleTypeDetector_Home::make_overlays(VideoOverlaySet& items) const{
+    ConsoleType known_state = m_console.state().console_type();
+    if (known_state != ConsoleType::Unknown &&
+        m_console.state().console_type_confirmed()
+    ){
+        return;
+    }
+    items.add(m_color, m_bottom_line);
+}
+ConsoleType ConsoleTypeDetector_Home::detect_only(const ImageViewRGB32& screen){
+    if (m_console.state().console_type_confirmed()){
+        ConsoleType state = m_console.state().console_type();
+        m_last = state;
+        return state;
+    }
+
+    ImageStats stats = image_stats(extract_box_reference(screen, m_bottom_line));
+//    cout << "ConsoleTypeDetector: " << stats.stddev.sum() << endl;
+    ConsoleType state;
+    if (stats.stddev.sum() < 10){
+        state = ConsoleType::Switch2_Unknown;
+    }else{
+        state = ConsoleType::Switch1;
+    }
+    m_last = state;
+    return state;
+}
+void ConsoleTypeDetector_Home::commit_to_cache(){
+    if (m_last != ConsoleType::Unknown){
+        m_console.state().set_console_type(m_console, m_last);
+    }
+}
+
+
+
+ConsoleTypeDetector_StartGameUserSelect::ConsoleTypeDetector_StartGameUserSelect(ConsoleHandle& console, Color color)
+    : m_console(console)
+    , m_color(color)
+    , m_bottom_line(0.02, 0.53, 0.96, 0.03)
+{}
+void ConsoleTypeDetector_StartGameUserSelect::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_bottom_line);
+}
+ConsoleType ConsoleTypeDetector_StartGameUserSelect::detect_only(const ImageViewRGB32& screen){
+    if (m_console.state().console_type_confirmed()){
+        return m_console.state().console_type();
+    }
+
+    ImageStats stats = image_stats(extract_box_reference(screen, m_bottom_line));
+//    cout << "ConsoleTypeDetector: " << stats.stddev.sum() << endl;
+    ConsoleType state;
+    if (stats.stddev.sum() < 10){
+        state = ConsoleType::Switch2_Unknown;
+    }else{
+        state = ConsoleType::Switch1;
+    }
+    m_last = state;
+    return state;
+}
+void ConsoleTypeDetector_StartGameUserSelect::commit_to_cache(){
+    m_console.state().set_console_type(m_console, m_last);
+}
+
+ConsoleType detect_console_type_from_in_game(ConsoleHandle& console, ProControllerContext& context){
+    if (console.state().console_type_confirmed()){
+        return console.state().console_type();
+    }
+    console.log("Unknown Switch type. Try to detect.", COLOR_ORANGE);
+    go_home(console, context);  //  Automatically detects console type as well.
+    resume_game_from_home(console, context);
+    return console.state().console_type();
+}
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_ConsoleTypeDetector.h b/SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_ConsoleTypeDetector.h
new file mode 100644
index 0000000000..15bb3a803c
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_ConsoleTypeDetector.h
@@ -0,0 +1,59 @@
+/*  Console Type Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_NintendoSwitch_ConsoleTypeDetector_H
+#define PokemonAutomation_NintendoSwitch_ConsoleTypeDetector_H
+
+#include "Common/Cpp/Color.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+#include "CommonTools/VisualDetector.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+#include "NintendoSwitch/NintendoSwitch_ConsoleHandle.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+
+
+
+class ConsoleTypeDetector_Home{
+public:
+    ConsoleTypeDetector_Home(ConsoleHandle& console, Color color = COLOR_RED);
+
+    void make_overlays(VideoOverlaySet& items) const;
+    ConsoleType detect_only(const ImageViewRGB32& screen);
+    void commit_to_cache();
+
+private:
+    ConsoleHandle& m_console;
+    Color m_color;
+    ImageFloatBox m_bottom_line;
+    ConsoleType m_last;
+};
+
+class ConsoleTypeDetector_StartGameUserSelect{
+public:
+    ConsoleTypeDetector_StartGameUserSelect(ConsoleHandle& console, Color color = COLOR_RED);
+
+    void make_overlays(VideoOverlaySet& items) const;
+    ConsoleType detect_only(const ImageViewRGB32& screen);
+    void commit_to_cache();
+
+private:
+    ConsoleHandle& m_console;
+    Color m_color;
+    ImageFloatBox m_bottom_line;
+    ConsoleType m_last;
+};
+
+ConsoleType detect_console_type_from_in_game(ConsoleHandle& console, ProControllerContext& context);
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_DateChangeDetector.cpp b/SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_DateChangeDetector.cpp
new file mode 100644
index 0000000000..1fc833634b
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_DateChangeDetector.cpp
@@ -0,0 +1,179 @@
+/*  Date Change Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/ImageTools/ImageStats.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "NintendoSwitch_DateChangeDetector.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+
+
+
+DateChangeDetector_Switch1::DateChangeDetector_Switch1(Color color)
+    : m_color(color)
+    , m_background_top(0.50, 0.02, 0.45, 0.08)
+    , m_window_top(0.50, 0.36, 0.45, 0.07)
+    , m_window_text(0.05, 0.36, 0.10, 0.07)
+    , m_jp_year(0.136, 0.61, 0.11, 0.09)
+    , m_us_hour(0.473, 0.61, 0.06, 0.09)
+    , m_jp_month_arrow(0.30, 0.50, 0.05, 0.06)
+{}
+void DateChangeDetector_Switch1::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_background_top);
+    items.add(m_color, m_window_top);
+    items.add(m_color, m_window_text);
+    items.add(m_color, m_jp_year);
+    items.add(m_color, m_us_hour);
+    items.add(m_color, m_jp_month_arrow);
+}
+bool DateChangeDetector_Switch1::detect(const ImageViewRGB32& screen){
+    ImageStats stats_background_top = image_stats(extract_box_reference(screen, m_background_top));
+    if (stats_background_top.stddev.sum() > 10){
+//        cout << "asdf" << endl;
+        return false;
+    }
+    ImageStats stats_window_top = image_stats(extract_box_reference(screen, m_window_top));
+//    cout << stats_window_top.average << stats_window_top.stddev << endl;
+    if (stats_window_top.stddev.sum() > 10){
+//        cout << "qwer" << endl;
+        return false;
+    }
+    ImageStats stats_window_text = image_stats(extract_box_reference(screen, m_window_text));
+//    cout << stats_window_text.stddev << endl;
+    if (stats_window_text.stddev.sum() < 100){
+//        cout << "zxcv" << endl;
+        return false;
+    }
+//    cout << "stats_background_top: " << stats_background_top.average.sum() << endl;
+//    cout << "stats_window_top: " << stats_window_top.average.sum() << endl;
+    if (std::abs(stats_background_top.average.sum() - stats_window_top.average.sum()) < 50){
+//        cout << "xcvb" << endl;
+        return false;
+    }
+
+//    bool white_theme = stats_window_top.average.sum() > 600;
+
+    ImageViewRGB32 year_box = extract_box_reference(screen, m_jp_year);
+    ImageStats year_stats = image_stats(year_box);
+//    cout << year_stats.average << year_stats.stddev << endl;
+
+    double stddev = year_stats.stddev.sum();
+    if (stddev < 80){
+//        cout << "sdfg" << endl;
+        return false;
+    }
+
+    return true;
+}
+DateFormat DateChangeDetector_Switch1::detect_date_format(const ImageViewRGB32& screen) const{
+    ImageViewRGB32 us_hours = extract_box_reference(screen, m_us_hour);
+    ImageStats stats_us_hours = image_stats(us_hours);
+
+    if (stats_us_hours.stddev.sum() > 30){
+        return DateFormat::US;
+    }
+
+    ImageViewRGB32 jp_arrow = extract_box_reference(screen, m_jp_month_arrow);
+    ImageStats stats_arrow = image_stats(jp_arrow);
+    if (stats_arrow.stddev.sum() > 30){
+        return DateFormat::JP;
+    }
+
+    return DateFormat::EU;
+}
+
+
+
+DateChangeDetector_Switch2::DateChangeDetector_Switch2(Color color)
+    : m_color(color)
+    , m_background_top(0.50, 0.02, 0.45, 0.08)
+    , m_window_bottom(0.50, 0.80, 0.45, 0.07)
+    , m_window_text(0.05, 0.02, 0.10, 0.08)
+    , m_jp_year(0.139, 0.436, 0.088, 0.095)
+    , m_us_hour(0.466856, 0.567340, 0.049242, 0.063973)
+    , m_jp_month_arrow(0.291705, 0.331675, 0.054986, 0.069652)
+{}
+void DateChangeDetector_Switch2::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_background_top);
+    items.add(m_color, m_window_bottom);
+    items.add(m_color, m_window_text);
+    items.add(m_color, m_jp_year);
+    items.add(m_color, m_us_hour);
+    items.add(m_color, m_jp_month_arrow);
+}
+bool DateChangeDetector_Switch2::detect(const ImageViewRGB32& screen){
+    ImageStats stats_background_top = image_stats(extract_box_reference(screen, m_background_top));
+    if (stats_background_top.stddev.sum() > 10){
+//        cout << "asdf" << endl;
+        return false;
+    }
+    ImageStats stats_window_bottom = image_stats(extract_box_reference(screen, m_window_bottom));
+//    cout << stats_window_bottom.average << stats_window_top.stddev << endl;
+    if (stats_window_bottom.stddev.sum() > 10){
+//        cout << "qwer" << endl;
+        return false;
+    }
+    ImageStats stats_window_text = image_stats(extract_box_reference(screen, m_window_text));
+//    cout << stats_window_text.stddev << endl;
+    if (stats_window_text.stddev.sum() < 100){
+//        cout << "zxcv" << endl;
+        return false;
+    }
+//    cout << "stats_background_top: " << stats_background_top.average.sum() << endl;
+//    cout << "stats_window_top: " << stats_window_top.average.sum() << endl;
+
+    if (euclidean_distance(stats_background_top.average, stats_window_bottom.average) > 10){
+//        cout << "xcvb" << endl;
+        return false;
+    }
+
+//    bool white_theme = stats_window_top.average.sum() > 600;
+
+    ImageViewRGB32 year_box = extract_box_reference(screen, m_jp_year);
+    ImageStats year_stats = image_stats(year_box);
+//    cout << year_stats.average << year_stats.stddev << endl;
+
+    double stddev = year_stats.stddev.sum();
+    if (stddev < 80){
+//        cout << "sdfg" << endl;
+        return false;
+    }
+
+    return true;
+}
+DateFormat DateChangeDetector_Switch2::detect_date_format(const ImageViewRGB32& screen) const{
+    ImageViewRGB32 us_hours = extract_box_reference(screen, m_us_hour);
+    ImageStats stats_us_hours = image_stats(us_hours);
+
+//    cout << stats_us_hours.stddev.sum() << endl;
+
+    if (stats_us_hours.stddev.sum() > 30){
+        return DateFormat::US;
+    }
+
+    ImageViewRGB32 jp_arrow = extract_box_reference(screen, m_jp_month_arrow);
+    ImageStats stats_arrow = image_stats(jp_arrow);
+    if (stats_arrow.stddev.sum() > 30){
+        return DateFormat::JP;
+    }
+
+    return DateFormat::EU;
+}
+
+
+
+
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_DateChangeDetector.h b/SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_DateChangeDetector.h
new file mode 100644
index 0000000000..4336f25bb6
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_DateChangeDetector.h
@@ -0,0 +1,71 @@
+/*  Date Change Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_NintendoSwitch_DateChangeDetector_H
+#define PokemonAutomation_NintendoSwitch_DateChangeDetector_H
+
+#include "Common/Cpp/Color.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonTools/VisualDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+
+enum class DateFormat{
+    US,
+    EU,
+    JP,
+};
+
+
+
+
+class DateChangeDetector : public StaticScreenDetector{
+public:
+    virtual DateFormat detect_date_format(const ImageViewRGB32& screen) const = 0;
+};
+class DateChangeDetector_Switch1 : public DateChangeDetector{
+public:
+    DateChangeDetector_Switch1(Color color);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+    virtual DateFormat detect_date_format(const ImageViewRGB32& screen) const override;
+
+private:
+    Color m_color;
+    ImageFloatBox m_background_top;
+    ImageFloatBox m_window_top;
+    ImageFloatBox m_window_text;
+    ImageFloatBox m_jp_year;
+    ImageFloatBox m_us_hour;
+    ImageFloatBox m_jp_month_arrow;
+};
+class DateChangeDetector_Switch2 : public DateChangeDetector{
+public:
+    DateChangeDetector_Switch2(Color color);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+    virtual DateFormat detect_date_format(const ImageViewRGB32& screen) const override;
+
+private:
+    Color m_color;
+    ImageFloatBox m_background_top;
+    ImageFloatBox m_window_bottom;
+    ImageFloatBox m_window_text;
+    ImageFloatBox m_jp_year;
+    ImageFloatBox m_us_hour;
+    ImageFloatBox m_jp_month_arrow;
+};
+
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_DateReader.cpp b/SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_DateReader.cpp
deleted file mode 100644
index b630d8f2b5..0000000000
--- a/SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_DateReader.cpp
+++ /dev/null
@@ -1,235 +0,0 @@
-/*  Date Reader
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Cpp/Exceptions.h"
-#include "Common/Qt/StringToolsQt.h"
-#include "CommonFramework/Exceptions/FatalProgramException.h"
-#include "CommonFramework/ImageTypes/ImageRGB32.h"
-#include "CommonFramework/ImageTools/ImageStats.h"
-#include "CommonFramework/ImageTools/ImageFilter.h"
-#include "CommonFramework/Tools/ErrorDumper.h"
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
-#include "CommonFramework/Tools/ConsoleHandle.h"
-#include "CommonFramework/OCR/OCR_RawOCR.h"
-#include "CommonFramework/OCR/OCR_NumberReader.h"
-#include "CommonFramework/OCR/OCR_StringNormalization.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "NintendoSwitch_DateReader.h"
-
-#include <iostream>
-using std::cout;
-using std::endl;
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-
-
-DateReader::DateReader()
-    : m_background_top(0.50, 0.02, 0.45, 0.08)
-    , m_window_top(0.50, 0.36, 0.45, 0.07)
-    , m_window_text(0.05, 0.36, 0.10, 0.07)
-    , m_us_hours(0.470, 0.60, 0.06, 0.10)
-    , m_us_min(0.572, 0.60, 0.06, 0.10)
-    , m_us_ampm(0.665, 0.60, 0.06, 0.10)
-    , m_24_hours(0.525, 0.60, 0.06, 0.10)
-    , m_24_min(0.626, 0.60, 0.06, 0.10)
-{}
-void DateReader::make_overlays(VideoOverlaySet& items) const{
-    items.add(COLOR_RED, m_background_top);
-    items.add(COLOR_RED, m_window_top);
-    items.add(COLOR_RED, m_window_text);
-    items.add(COLOR_YELLOW, m_us_hours);
-    items.add(COLOR_YELLOW, m_us_min);
-    items.add(COLOR_YELLOW, m_us_ampm);
-    items.add(COLOR_CYAN, m_24_hours);
-    items.add(COLOR_CYAN, m_24_min);
-}
-bool DateReader::detect(const ImageViewRGB32& screen) const{
-    ImageStats stats_background_top = image_stats(extract_box_reference(screen, m_background_top));
-    if (stats_background_top.stddev.sum() > 10){
-//        cout << "asdf" << endl;
-        return false;
-    }
-    ImageStats stats_window_top = image_stats(extract_box_reference(screen, m_window_top));
-//    cout << stats_window_top.average << stats_window_top.stddev << endl;
-    if (stats_window_top.stddev.sum() > 10){
-//        cout << "qwer" << endl;
-        return false;
-    }
-    ImageStats stats_window_text = image_stats(extract_box_reference(screen, m_window_text));
-//    cout << stats_window_text.stddev << endl;
-    if (stats_window_text.stddev.sum() < 100){
-//        cout << "zxcv" << endl;
-        return false;
-    }
-    if (stats_background_top.average.sum() > stats_window_top.average.sum()){
-        return false;
-    }
-
-//    bool white_theme = stats_window_top.average.sum() > 600;
-
-    ImageViewRGB32 us_hours = extract_box_reference(screen, m_us_hours);
-    ImageStats stats_us_hours = image_stats(us_hours);
-//    cout << stats_us_hours.average << stats_us_hours.stddev << endl;
-
-    double stddev = stats_us_hours.stddev.sum();
-    if (10 < stddev && stddev < 80){
-        return false;
-    }
-
-    return true;
-}
-int8_t DateReader::read_hours(Logger& logger, const ImageViewRGB32& screen) const{
-    if (!detect(screen)){
-        return -1;
-    }
-
-    ImageStats stats_window_top = image_stats(extract_box_reference(screen, m_window_top));
-//    cout << stats_window_top.average << stats_window_top.stddev << endl;
-    if (stats_window_top.stddev.sum() > 10){
-        return false;
-    }
-
-    bool white_theme = stats_window_top.average.sum() > 600;
-
-    ImageViewRGB32 us_hours = extract_box_reference(screen, m_us_hours);
-    ImageStats stats_us_hours = image_stats(us_hours);
-
-    double stddev = stats_us_hours.stddev.sum();
-    bool format_us = stddev > 30;
-    if (format_us){
-        ImageRGB32 us_hours_filtered = to_blackwhite_rgb32_range(us_hours, 0xff000000, 0xff7f7f7f, white_theme);
-        int hours = OCR::read_number(logger, us_hours_filtered);
-        if (hours < 1 || hours > 12){
-            return -1;
-        }
-        if (hours == 12){
-            hours = 0;
-        }
-
-        ImageViewRGB32 us_ampm = extract_box_reference(screen, m_us_ampm);
-        ImageRGB32 us_ampm_filtered = to_blackwhite_rgb32_range(us_ampm, 0xff000000, 0xff7f7f7f, white_theme);
-
-        std::string ampm = to_utf8(OCR::normalize_utf32(OCR::ocr_read(Language::English, us_ampm_filtered)));
-        if (ampm == "am"){
-            //  Do nothing.
-        }else if (ampm == "pm"){
-            hours += 12;
-        }else{
-            return -1;
-        }
-        return (int8_t)hours;
-    }else{
-        ImageViewRGB32 h24_hours = extract_box_reference(screen, m_24_hours);
-        ImageRGB32 h24_hours_filtered = to_blackwhite_rgb32_range(h24_hours, 0xff000000, 0xff7f7f7f, white_theme);
-        int hours = OCR::read_number(logger, h24_hours_filtered);
-        if (hours < 0 || hours > 23){
-            return -1;
-        }
-        return (int8_t)hours;
-    }
-}
-
-
-void DateReader::set_hours(
-    const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context,
-    uint8_t hour
-){
-    context.wait_for_all_requests();
-    {
-        auto snapshot = console.video().snapshot();
-        if (!detect(snapshot)){
-            throw FatalProgramException(
-                ErrorReport::SEND_ERROR_REPORT, console,
-                "Expected date change menu.",
-                true
-            );
-        }
-    }
-
-    for (size_t attempts = 0; attempts < 10; attempts++){
-        //  Move cursor out of the way.
-        for (size_t c = 0; c < 7; c++){
-            pbf_press_dpad(context, DPAD_LEFT, 5, 3);
-        }
-        context.wait_for_all_requests();
-        context.wait_for(std::chrono::milliseconds(250));
-
-        //  Read the hour.
-        VideoSnapshot snapshot = console.video().snapshot();
-        int8_t current_hour = read_hours(console.logger(), snapshot);
-        if (current_hour < 0){
-            throw FatalProgramException(
-                ErrorReport::SEND_ERROR_REPORT, console,
-                "Unable to read the hour.",
-                true
-            );
-        }
-
-        //  We're done.
-        if (current_hour == hour){
-            for (size_t c = 0; c < 7; c++){
-                pbf_press_dpad(context, DPAD_RIGHT, 5, 3);
-            }
-            return;
-        }
-
-        //  Move the cursor to the hour.
-        pbf_press_dpad(context, DPAD_RIGHT, 5, 3);
-        pbf_press_dpad(context, DPAD_RIGHT, 5, 3);
-        pbf_press_dpad(context, DPAD_RIGHT, 5, 3);
-
-        ImageViewRGB32 us_hours = extract_box_reference(snapshot, m_us_hours);
-        ImageStats stats_us_hours = image_stats(us_hours);
-        double stddev = stats_us_hours.stddev.sum();
-        bool format_us = stddev > 30;
-        if (format_us){
-            uint8_t diff = (24 + (uint8_t)hour - (uint8_t)current_hour) % 12;
-            if (diff < 6){
-                for (size_t c = 0; c < diff; c++){
-                    pbf_press_dpad(context, DPAD_UP, 5, 3);
-                }
-            }else{
-                for (size_t c = diff; c < 12; c++){
-                    pbf_press_dpad(context, DPAD_DOWN, 5, 3);
-                }
-            }
-            if ((hour < 12) != (current_hour < 12)){
-                pbf_press_dpad(context, DPAD_RIGHT, 5, 3);
-                pbf_press_dpad(context, DPAD_RIGHT, 5, 3);
-                pbf_press_dpad(context, DPAD_DOWN, 5, 3);
-            }
-        }else{
-            uint8_t diff = (24 + (uint8_t)hour - (uint8_t)current_hour) % 24;
-            if (diff < 12){
-                for (size_t c = 0; c < diff; c++){
-                    pbf_press_dpad(context, DPAD_UP, 5, 3);
-                }
-            }else{
-                for (size_t c = diff; c < 24; c++){
-                    pbf_press_dpad(context, DPAD_DOWN, 5, 3);
-                }
-            }
-        }
-    }
-
-    auto snapshot = console.video().snapshot();
-    throw FatalProgramException(
-        ErrorReport::SEND_ERROR_REPORT, console,
-        "Failed to set the hour after 10 attempts.",
-        true
-    );
-}
-
-
-
-
-
-
-
-}
-}
diff --git a/SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_DateReader.h b/SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_DateReader.h
deleted file mode 100644
index b35e38e50b..0000000000
--- a/SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_DateReader.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*  Date Reader
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_NintendoSwitch_DateReader_H
-#define PokemonAutomation_NintendoSwitch_DateReader_H
-
-#include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "CommonFramework/InferenceInfra/VisualInferenceCallback.h"
-#include "CommonFramework/Inference/VisualDetector.h"
-
-namespace PokemonAutomation{
-    struct ProgramInfo;
-    class Logger;
-    class ConsoleHandle;
-    class BotBaseContext;
-namespace NintendoSwitch{
-
-
-class DateReader : public StaticScreenDetector{
-public:
-    DateReader();
-
-    virtual void make_overlays(VideoOverlaySet& items) const override;
-
-    //  Returns true if we are on the date change window.
-    virtual bool detect(const ImageViewRGB32& screen) const override;
-
-    //  Read the hours (0 - 23) while on the date change window.
-    //  Returns -1 if unable to read.
-    int8_t read_hours(Logger& logger, const ImageViewRGB32& screen) const;
-
-    void set_hours(
-        const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context,
-        uint8_t hour    //  0 - 23
-    );
-
-private:
-    ImageFloatBox m_background_top;
-    ImageFloatBox m_window_top;
-    ImageFloatBox m_window_text;
-    ImageFloatBox m_us_hours;
-    ImageFloatBox m_us_min;
-    ImageFloatBox m_us_ampm;
-    ImageFloatBox m_24_hours;
-    ImageFloatBox m_24_min;
-};
-
-
-
-}
-}
-#endif
diff --git a/SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_DetectHome.cpp b/SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_DetectHome.cpp
deleted file mode 100644
index d6a5b1a6eb..0000000000
--- a/SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_DetectHome.cpp
+++ /dev/null
@@ -1,295 +0,0 @@
-/*  Detect Home
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/ImageTools/SolidColorTest.h"
-#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
-#include "NintendoSwitch_DetectHome.h"
-
-//  REMOVE
-#include <iostream>
-using std::cout;
-using std::endl;
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-
-HomeDetector::HomeDetector()
-    : m_bottom_row(0.10, 0.92, 0.10, 0.05)
-    , m_bottom_icons(0.70, 0.92, 0.28, 0.05)
-    , m_bottom_left(0.02, 0.70, 0.15, 0.15)
-    , m_bottom_right(0.83, 0.70, 0.15, 0.15)
-    , m_user_icons(0.05, 0.05, 0.2, 0.08)
-    , m_game_slot(0.08, 0.25, 0.10, 0.38)
-{}
-void HomeDetector::make_overlays(VideoOverlaySet& items) const{
-    items.add(COLOR_RED, m_bottom_row);
-    items.add(COLOR_RED, m_bottom_icons);
-    items.add(COLOR_RED, m_bottom_left);
-    items.add(COLOR_RED, m_bottom_right);
-    items.add(COLOR_RED, m_user_icons);
-    items.add(COLOR_RED, m_game_slot);
-}
-bool HomeDetector::detect(const ImageViewRGB32& screen) const{
-    ImageStats stats_bottom_row = image_stats(extract_box_reference(screen, m_bottom_row));
-//    cout << stats_bottom_row.average << stats_bottom_row.stddev << endl;
-    bool white;
-//    cout << "stats_bottom_row.average.sum() = " << stats_bottom_row.average.sum() << endl;
-    if (stats_bottom_row.average.sum() < 200){
-        white = false;
-    }else if (stats_bottom_row.average.sum() > 500){
-        white = true;
-    }else{
-        return false;
-    }
-
-//    cout << "white: " << white << endl;
-
-    ImageStats stats_bottom_icons = image_stats(extract_box_reference(screen, m_bottom_icons));
-//    cout << stats_bottom_icons.average << stats_bottom_icons.stddev << endl;
-    if (stats_bottom_icons.stddev.sum() < 50){
-        return false;
-    }
-
-    ImageStats stats_bottom_left = image_stats(extract_box_reference(screen, m_bottom_left));
-    ImageStats stats_bottom_right = image_stats(extract_box_reference(screen, m_bottom_right));
-//    cout << stats_bottom_left.average << stats_bottom_left.stddev << endl;
-//    cout << stats_bottom_right.average << stats_bottom_right.stddev << endl;
-    if (white){
-        if (!is_white(stats_bottom_left) || !is_white(stats_bottom_right)){
-//            cout << "asdf" << endl;
-            return false;
-        }
-    }else{
-        if (!is_grey(stats_bottom_left, 0, 200) || !is_grey(stats_bottom_right, 0, 200)){
-//            cout << "qwer" << endl;
-            return false;
-        }
-    }
-
-//    cout << euclidean_distance(stats_bottom_row.average, stats_bottom_left.average) << endl;
-    if (euclidean_distance(stats_bottom_row.average, stats_bottom_left.average) > 20){
-//        cout << "qwer = " << euclidean_distance(stats_bottom_row.average, stats_bottom_left.average) << endl;
-        return false;
-    }
-//    cout << euclidean_distance(stats_bottom_row.average, stats_bottom_right.average) << endl;
-    if (euclidean_distance(stats_bottom_row.average, stats_bottom_right.average) > 20){
-//        cout << "asdf" << endl;
-        return false;
-    }
-//    cout << euclidean_distance(stats_bottom_left.average, stats_bottom_left.average) << endl;
-    if (euclidean_distance(stats_bottom_left.average, stats_bottom_right.average) > 20){
-//        cout << "zxcv" << endl;
-        return false;
-    }
-
-    ImageStats stats_user_icons = image_stats(extract_box_reference(screen, m_user_icons));
-//    cout << stats_user_icons.stddev << endl;
-    if (stats_user_icons.stddev.sum() < 40){
-        return false;
-    }
-    ImageStats stats_game_slot = image_stats(extract_box_reference(screen, m_game_slot));
-//    cout << stats_game_slot.stddev << endl;
-    if (stats_game_slot.stddev.sum() < 50){
-        return false;
-    }
-
-    return true;
-}
-
-
-
-
-
-
-
-StartGameUserSelectDetector::StartGameUserSelectDetector()
-    : m_bottom_row(0.10, 0.92, 0.10, 0.05)
-    , m_bottom_icons(0.70, 0.92, 0.28, 0.05)
-    , m_top_row(0.50, 0.47, 0.45, 0.05)
-    , m_mid_row(0.10, 0.55, 0.80, 0.02)
-    , m_user_slot(0.45, 0.55, 0.10, 0.35)
-{}
-void StartGameUserSelectDetector::make_overlays(VideoOverlaySet& items) const{
-    items.add(COLOR_RED, m_bottom_row);
-    items.add(COLOR_RED, m_bottom_icons);
-    items.add(COLOR_RED, m_top_row);
-    items.add(COLOR_RED, m_mid_row);
-    items.add(COLOR_RED, m_user_slot);
-}
-bool StartGameUserSelectDetector::detect(const ImageViewRGB32& screen) const{
-    ImageStats stats_bottom_row = image_stats(extract_box_reference(screen, m_bottom_row));
-//    cout << stats_bottom_row.average << stats_bottom_row.stddev << endl;
-    if (stats_bottom_row.stddev.sum() > 10){
-        return false;
-    }
-    bool white;
-    if (is_grey(stats_bottom_row, 50, 300)){
-        white = false;
-    }else if (stats_bottom_row.average.sum() > 500){
-        white = true;
-    }else{
-        return false;
-    }
-
-    ImageStats stats_bottom_icons = image_stats(extract_box_reference(screen, m_bottom_icons));
-//    cout << stats_bottom_icons.average << stats_bottom_icons.stddev << endl;
-    if (stats_bottom_icons.stddev.sum() < 50){
-        return false;
-    }
-
-    ImageStats stats_top_row = image_stats(extract_box_reference(screen, m_top_row));
-    ImageStats stats_mid_row = image_stats(extract_box_reference(screen, m_mid_row));
-//    cout << stats_top_row.average << stats_top_row.stddev << endl;
-    if (stats_top_row.stddev.sum() > 10 || stats_mid_row.stddev.sum() > 10){
-        return false;
-    }
-    if (white){
-        if (!is_white(stats_top_row) || !is_white(stats_mid_row)){
-            return false;
-        }
-    }else{
-        if (!is_grey(stats_top_row, 50, 300) || !is_grey(stats_mid_row, 50, 300)){
-            return false;
-        }
-    }
-
-    if (euclidean_distance(stats_bottom_row.average, stats_top_row.average) > 20){
-        return false;
-    }
-
-    ImageStats stats_user_slot = image_stats(extract_box_reference(screen, m_user_slot));
-//    cout << stats_user_slot.average << stats_user_slot.stddev << endl;
-    if (stats_user_slot.stddev.sum() < 50){
-        return false;
-    }
-
-    return true;
-}
-
-
-
-
-
-
-UpdateMenuDetector::UpdateMenuDetector(bool invert)
-    : m_invert(invert)
-    , m_box_top(0.25, 0.26, 0.50, 0.02)
-    , m_box_mid(0.25, 0.52, 0.50, 0.02)
-    , m_top(0.10, 0.15, 0.80, 0.03)
-    , m_left(0.08, 0.25, 0.10, 0.38)
-    , m_bottom_solid(0.10, 0.84, 0.80, 0.04)
-    , m_bottom_buttons(0.70, 0.92, 0.28, 0.05)
-{}
-void UpdateMenuDetector::make_overlays(VideoOverlaySet& items) const{
-    items.add(COLOR_RED, m_box_top);
-    items.add(COLOR_RED, m_box_mid);
-    items.add(COLOR_RED, m_top);
-    items.add(COLOR_RED, m_left);
-    items.add(COLOR_RED, m_bottom_solid);
-    items.add(COLOR_RED, m_bottom_buttons);
-}
-bool UpdateMenuDetector::detect(const ImageViewRGB32& screen) const{
-    ImageStats stats_box_top = image_stats(extract_box_reference(screen, m_box_top));
-//    cout << stats_box_top.average << stats_box_top.stddev << endl;
-    bool white;
-    if (stats_box_top.average.sum() < 300){
-        white = false;
-    }else if (stats_box_top.average.sum() > 500){
-        white = true;
-    }else{
-        return m_invert;
-    }
-    if (stats_box_top.stddev.sum() > 10){
-        return m_invert;
-    }
-
-//    cout << "white: " << white << endl;
-
-    ImageStats stats_box_mid = image_stats(extract_box_reference(screen, m_box_mid));
-    if (stats_box_mid.stddev.sum() > 10){
-        return m_invert;
-    }
-    if (euclidean_distance(stats_box_top.average, stats_box_mid.average) > 10){
-        return m_invert;
-    }
-
-    ImageStats stats_left = image_stats(extract_box_reference(screen, m_left));
-//    cout << stats_left.stddev << endl;
-    if (stats_left.stddev.sum() < 30){
-//        cout << "zxcv" << endl;
-        return m_invert;
-    }
-
-    ImageStats stats_top = image_stats(extract_box_reference(screen, m_top));
-//    cout << stats_top.average << stats_top.stddev << endl;
-
-    ImageStats bottom_solid = image_stats(extract_box_reference(screen, m_bottom_solid));
-//    cout << bottom_solid.average << bottom_solid.stddev << endl;
-
-    if (euclidean_distance(stats_top.average, bottom_solid.average) > 10){
-//        cout << "qwer" << endl;
-        return m_invert;
-    }
-
-    if (white){
-        if (!is_grey(stats_top, 100, 300) || !is_grey(bottom_solid, 100, 300)){
-//            cout << "asdf" << endl;
-            return m_invert;
-        }
-    }else{
-        if (!is_grey(stats_top, 0, 100) || !is_grey(bottom_solid, 0, 100)){
-//            cout << "zxcv" << endl;
-            return m_invert;
-        }
-    }
-
-    ImageStats stats_bottom_buttons = image_stats(extract_box_reference(screen, m_bottom_buttons));
-//    cout << stats_bottom_buttons.average << stats_bottom_buttons.stddev << endl;
-    if (stats_bottom_buttons.stddev.sum() < 30){
-        return m_invert;
-    }
-
-    return !m_invert;
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-}
-}
diff --git a/SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_DetectHome.h b/SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_DetectHome.h
deleted file mode 100644
index 0c28870d70..0000000000
--- a/SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_DetectHome.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/*  Detect Home
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_NintendoSwitch_DetectHome_H
-#define PokemonAutomation_NintendoSwitch_DetectHome_H
-
-#include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "CommonFramework/InferenceInfra/VisualInferenceCallback.h"
-#include "CommonFramework/Inference/VisualDetector.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-
-
-class HomeDetector : public StaticScreenDetector{
-public:
-    HomeDetector();
-
-    virtual void make_overlays(VideoOverlaySet& items) const override;
-    virtual bool detect(const ImageViewRGB32& screen) const override;
-
-private:
-    ImageFloatBox m_bottom_row;
-    ImageFloatBox m_bottom_icons;
-    ImageFloatBox m_bottom_left;
-    ImageFloatBox m_bottom_right;
-    ImageFloatBox m_user_icons;
-    ImageFloatBox m_game_slot;
-};
-class HomeWatcher : public DetectorToFinder<HomeDetector>{
-public:
-    HomeWatcher(std::chrono::milliseconds hold_duration = std::chrono::milliseconds(250))
-         : DetectorToFinder("HomeWatcher", hold_duration)
-    {}
-};
-
-
-
-class StartGameUserSelectDetector : public StaticScreenDetector{
-public:
-    StartGameUserSelectDetector();
-
-    virtual void make_overlays(VideoOverlaySet& items) const override;
-    virtual bool detect(const ImageViewRGB32& screen) const override;
-
-private:
-    ImageFloatBox m_bottom_row;
-    ImageFloatBox m_bottom_icons;
-    ImageFloatBox m_top_row;
-    ImageFloatBox m_mid_row;
-    ImageFloatBox m_user_slot;
-};
-class StartGameUserSelectWatcher : public DetectorToFinder<StartGameUserSelectDetector>{
-public:
-    StartGameUserSelectWatcher()
-         : DetectorToFinder("StartGameUserSelectWatcher", std::chrono::milliseconds(250))
-    {}
-};
-
-
-// Detect the Switch system update screen when you are about to enter a game from Switch Home screen
-class UpdateMenuDetector : public StaticScreenDetector{
-public:
-    UpdateMenuDetector(bool invert = false);
-
-    virtual void make_overlays(VideoOverlaySet& items) const override;
-    virtual bool detect(const ImageViewRGB32& screen) const override;
-
-private:
-    bool m_invert;
-    ImageFloatBox m_box_top;
-    ImageFloatBox m_box_mid;
-    ImageFloatBox m_top;
-    ImageFloatBox m_left;
-    ImageFloatBox m_bottom_solid;
-    ImageFloatBox m_bottom_buttons;
-};
-class UpdateMenuWatcher : public DetectorToFinder<UpdateMenuDetector>{
-public:
-    UpdateMenuWatcher(bool invert)
-         : DetectorToFinder("UpdateMenuWatcher", std::chrono::milliseconds(250), invert)
-    {}
-};
-
-
-
-
-
-
-
-
-
-}
-}
-#endif
-
diff --git a/SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_FailedToConnectDetector.cpp b/SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_FailedToConnectDetector.cpp
new file mode 100644
index 0000000000..d1facd6867
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_FailedToConnectDetector.cpp
@@ -0,0 +1,92 @@
+/*  Failed To Connect Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Images/SolidColorTest.h"
+#include "Tests/ImageUnitTest.h"
+#include "NintendoSwitch_FailedToConnectDetector.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+
+
+FailedToConnectDetector::FailedToConnectDetector(Color color)
+    : m_color(color)
+    , m_close_button(0.215, 0.679, 0.071, 0.031)
+    , m_top(0.10, 0.15, 0.80, 0.03)
+    , m_bottom(0.10, 0.84, 0.80, 0.04)
+{}
+void FailedToConnectDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_close_button);
+    items.add(m_color, m_top);
+    items.add(m_color, m_bottom);
+}
+bool FailedToConnectDetector::detect(const ImageViewRGB32& screen){
+    ImageStats stats_close_button = image_stats(extract_box_reference(screen, m_close_button));
+    if (!is_black(stats_close_button)){
+        return false;
+    }
+
+    ImageStats stats_top = image_stats(extract_box_reference(screen, m_top));
+    ImageStats bottom_solid = image_stats(extract_box_reference(screen, m_bottom));
+
+    if (euclidean_distance(stats_top.average, bottom_solid.average) > 10){
+        return false;
+    }
+
+    bool top_dark_grey = is_grey(stats_top, 0, 100);
+    bool bottom_dark_grey = is_grey(bottom_solid, 0, 100);
+    if (top_dark_grey != bottom_dark_grey){
+        return false;
+    }
+
+    bool top_light_grey = is_grey(stats_top, 100, 300);
+    bool bottom_light_grey = is_grey(bottom_solid, 100, 300);
+    if (top_light_grey != bottom_light_grey){
+        return false;
+    }
+
+    return true;
+}
+
+
+class Test_FailedToConnectDetector : public ImageUnitTest{
+public:
+    Test_FailedToConnectDetector(const std::string& image, bool expected)
+        : ImageUnitTest("NintendoSwitch::FailedToConnectDetector - " + image, {image})
+        , m_expected(expected)
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        FailedToConnectDetector detector{};
+        const ImageRGB32& image = images[0];
+        return detector.detect(image) == m_expected;
+    }
+
+private:
+    bool m_expected;
+};
+
+
+void add_tests_FailedToConnectDetector(UnitTestDatabase& database){
+    database.add<Test_FailedToConnectDetector>("NintendoSwitch/FailedToConnectDetector/French_blackBackground_False.png", false);
+    database.add<Test_FailedToConnectDetector>("NintendoSwitch/FailedToConnectDetector/French_blackBackground_True.png", true);
+    database.add<Test_FailedToConnectDetector>("NintendoSwitch/FailedToConnectDetector/French_whiteBackground_False.png", false);
+    database.add<Test_FailedToConnectDetector>("NintendoSwitch/FailedToConnectDetector/French_whiteBackground_True.png", true);
+}
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_FailedToConnectDetector.h b/SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_FailedToConnectDetector.h
new file mode 100644
index 0000000000..8ca7f352fa
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_FailedToConnectDetector.h
@@ -0,0 +1,48 @@
+/*  Failed To Connect Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_NintendoSwitch_FailedToConnectDetector_H
+#define PokemonAutomation_NintendoSwitch_FailedToConnectDetector_H
+
+#include "Common/Cpp/Color.h"
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonTools/VisualDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+
+
+//  Detect the "Failed to connect to internet" menu that appears after
+// "Checking if the software can be played..." failed
+class FailedToConnectDetector : public StaticScreenDetector{
+public:
+    FailedToConnectDetector(Color color = COLOR_RED);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    Color m_color;
+    ImageFloatBox m_close_button;
+    ImageFloatBox m_top;
+    ImageFloatBox m_bottom;
+};
+class FailedToConnectWatcher : public DetectorToFinder<FailedToConnectDetector>{
+public:
+    FailedToConnectWatcher(Color color = COLOR_RED)
+         : DetectorToFinder("FailedToConnectWatcher", std::chrono::milliseconds(250), color)
+    {}
+};
+
+
+void add_tests_FailedToConnectDetector(UnitTestDatabase& database);
+
+}
+}
+#endif
+
diff --git a/SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_HomeMenuDetector.cpp b/SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_HomeMenuDetector.cpp
new file mode 100644
index 0000000000..922a2565c1
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_HomeMenuDetector.cpp
@@ -0,0 +1,168 @@
+/*  Home Menu Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Images/SolidColorTest.h"
+#include "NintendoSwitch_HomeMenuDetector.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+
+
+
+HomeMenuDetector::HomeMenuDetector(ConsoleHandle& console, Color color)
+    : m_color(color)
+    , m_console_type(console, color)
+    , m_top(0.510223, 0.019835, 0.441450, 0.034711)
+//    , m_iconrow_left(0.02, 0.70, 0.13, 0.15)
+    , m_iconrow_right(0.85, 0.70, 0.13, 0.15)
+    , m_iconrow_icons(0.20, 0.70, 0.60, 0.15)
+    , m_bottom_row(0.10, 0.92, 0.10, 0.05)
+    , m_bottom_icons(0.70, 0.92, 0.28, 0.05)
+    , m_user_icons(0.05, 0.05, 0.2, 0.08)
+    , m_game_slot(0.08, 0.25, 0.10, 0.38)
+    , m_close_game_top(0.226358, 0.272648, 0.407445, 0.033989)
+{}
+void HomeMenuDetector::make_overlays(VideoOverlaySet& items) const{
+    m_console_type.make_overlays(items);
+    items.add(m_color, m_top);
+//    items.add(m_color, m_iconrow_left);
+    items.add(m_color, m_iconrow_right);
+    items.add(m_color, m_iconrow_icons);
+    items.add(m_color, m_bottom_row);
+    items.add(m_color, m_bottom_icons);
+    items.add(m_color, m_user_icons);
+    items.add(m_color, m_game_slot);
+    items.add(m_color, m_close_game_top);
+}
+
+//
+//  This miraculously works on both Switch 1 and Switch 2.
+//
+bool HomeMenuDetector::detect(const ImageViewRGB32& screen){
+   return detect_only(screen);
+
+#if 0
+    if (!detect_only(screen)){
+        return false;
+    }
+    try{
+        m_console_type.commit_to_cache();
+    }catch (UserSetupError&){
+        screen.save("HomeMenuDetector-Failure.png");
+        throw;
+    }
+    return true;
+#endif
+}
+void HomeMenuDetector::commit_state(){
+    m_console_type.commit_to_cache();
+}
+
+bool HomeMenuDetector::detect_only(const ImageViewRGB32& screen){
+    ImageStats stats_close_game_top = image_stats(extract_box_reference(screen, m_close_game_top));  // the top portion of the Close game popup
+    // ensure m_close_game_top is NOT uniform in color. If it is, then we likely are looking at the Close Game popup.
+    if (stats_close_game_top.stddev.sum() < 50){
+        return false;
+    }
+
+    ImageStats stats_bottom_row = image_stats(extract_box_reference(screen, m_bottom_row));
+//    cout << stats_bottom_row.average << stats_bottom_row.stddev << endl;
+    bool white;
+//    cout << "stats_bottom_row.average.sum() = " << stats_bottom_row.average.sum() << endl;
+    if (stats_bottom_row.average.sum() < 200){
+        white = false;
+    }else if (stats_bottom_row.average.sum() > 500){
+        white = true;
+    }else{
+        return false;
+    }
+
+//    cout << "white: " << white << endl;
+
+    ImageStats stats_top = image_stats(extract_box_reference(screen, m_top));
+//    cout << stats_top.average << stats_top.stddev << endl;
+    if (stats_top.stddev.sum() > 20){
+        return false;
+    }
+
+    ImageStats stats_bottom_icons = image_stats(extract_box_reference(screen, m_bottom_icons));
+//    cout << stats_bottom_icons.average << stats_bottom_icons.stddev << endl;
+    if (stats_bottom_icons.stddev.sum() < 10){
+        return false;
+    }
+
+//    ImageStats stats_bottom_left = image_stats(extract_box_reference(screen, m_bottom_row));
+    ImageStats stats_bottom_right = image_stats(extract_box_reference(screen, m_iconrow_right));
+//    cout << stats_bottom_left.average << stats_bottom_left.stddev << endl;
+//    cout << stats_bottom_right.average << stats_bottom_right.stddev << endl;
+    if (white){
+        if (!is_white(stats_bottom_row) || !is_white(stats_bottom_right)){
+//            cout << "asdf" << endl;
+            return false;
+        }
+    }else{
+        if (!is_grey(stats_bottom_row, 0, 200) || !is_grey(stats_bottom_right, 0, 200)){
+//            cout << "qwer" << endl;
+            return false;
+        }
+    }
+
+    ImageStats stats_bottom_middle = image_stats(extract_box_reference(screen, m_iconrow_icons));
+    if (stats_bottom_middle.stddev.sum() < 50){
+        return false;
+    }
+
+//    cout << euclidean_distance(stats_bottom_row.average, stats_bottom_row.average) << endl;
+    if (euclidean_distance(stats_bottom_row.average, stats_bottom_row.average) > 20){
+//        cout << "qwer = " << euclidean_distance(stats_bottom_row.average, stats_bottom_row.average) << endl;
+        return false;
+    }
+//    cout << euclidean_distance(stats_bottom_row.average, stats_bottom_right.average) << endl;
+    if (euclidean_distance(stats_bottom_row.average, stats_bottom_right.average) > 20){
+//        cout << "asdf" << endl;
+        return false;
+    }
+//    cout << euclidean_distance(stats_bottom_row.average, stats_bottom_row.average) << endl;
+    if (euclidean_distance(stats_bottom_row.average, stats_bottom_right.average) > 20){
+//        cout << "zxcv" << endl;
+        return false;
+    }
+//    cout << euclidean_distance(stats_top.average, stats_bottom_row.average) << endl;
+    if (euclidean_distance(stats_top.average, stats_bottom_row.average) > 20){
+//        cout << "xcvb" << endl;
+        return false;
+    }
+
+    ImageStats stats_user_icons = image_stats(extract_box_reference(screen, m_user_icons));
+//    cout << stats_user_icons.stddev << endl;
+    if (stats_user_icons.stddev.sum() < 40){
+        return false;
+    }
+    ImageStats stats_game_slot = image_stats(extract_box_reference(screen, m_game_slot));
+//    cout << stats_game_slot.stddev << endl;
+    if (stats_game_slot.stddev.sum() < 50){
+        return false;
+    }
+
+    //  Read the console type only when we have confirmed the home menu.
+    m_console_type.detect_only(screen);
+
+    return true;
+}
+
+
+
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_HomeMenuDetector.h b/SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_HomeMenuDetector.h
new file mode 100644
index 0000000000..3c21bcc530
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_HomeMenuDetector.h
@@ -0,0 +1,66 @@
+/*  Home Menu Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_NintendoSwitch_HomeMenuDetector_H
+#define PokemonAutomation_NintendoSwitch_HomeMenuDetector_H
+
+#include "Common/Cpp/Color.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+#include "CommonTools/VisualDetector.h"
+#include "NintendoSwitch_ConsoleTypeDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+
+
+class HomeMenuDetector : public StaticScreenDetector{
+public:
+    HomeMenuDetector(ConsoleHandle& console, Color color);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+    virtual void commit_state() override;
+    bool detect_only(const ImageViewRGB32& screen);
+
+private:
+    Color m_color;
+    ConsoleTypeDetector_Home m_console_type;
+    ImageFloatBox m_top;
+//    ImageFloatBox m_iconrow_left;
+    ImageFloatBox m_iconrow_right;
+    ImageFloatBox m_iconrow_icons;
+    ImageFloatBox m_bottom_row;
+    ImageFloatBox m_bottom_icons;
+    ImageFloatBox m_user_icons;
+    ImageFloatBox m_game_slot;
+    ImageFloatBox m_close_game_top;
+};
+class HomeMenuWatcher : public DetectorToFinder<HomeMenuDetector>{
+public:
+    HomeMenuWatcher(
+        ConsoleHandle& console,
+        bool invert = false,
+        Color color = COLOR_RED,
+        std::chrono::milliseconds hold_duration = std::chrono::milliseconds(250)
+    )
+         : DetectorToFinder(
+            "HomeMenuWatcher",
+            invert ? FinderType::GONE : FinderType::PRESENT,
+            hold_duration,
+            console,
+            color
+        )
+    {}
+};
+
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_SelectedSettingDetector.cpp b/SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_SelectedSettingDetector.cpp
new file mode 100644
index 0000000000..2d428dca1b
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_SelectedSettingDetector.cpp
@@ -0,0 +1,81 @@
+/*  Detect Home
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Images/SolidColorTest.h"
+#include "NintendoSwitch_SelectedSettingDetector.h"
+
+//
+// #include <iostream>
+// using std::cout;
+// using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+SelectedSettingWatcher::~SelectedSettingWatcher() = default;
+
+SelectedSettingWatcher::SelectedSettingWatcher(
+    ImageFloatBox selected_box,
+    ImageFloatBox not_selected_box1,
+    ImageFloatBox not_selected_box2,
+    ImageFloatBox representative_background
+)
+    : VisualInferenceCallback("SelectedSettingWatcher")
+    , m_selected_box(selected_box)
+    , m_not_selected_box1(not_selected_box1)
+    , m_not_selected_box2(not_selected_box2)
+    , m_representative_background(representative_background)
+{}
+
+void SelectedSettingWatcher::make_overlays(VideoOverlaySet& items) const{
+    items.add(COLOR_RED, m_selected_box);
+    items.add(COLOR_BLUE, m_not_selected_box1);
+    items.add(COLOR_BLUE, m_not_selected_box2);
+    items.add(COLOR_GREEN, m_representative_background);
+}
+
+bool SelectedSettingWatcher::is_white_theme(const ImageViewRGB32& screen){
+    ImageStats stats_window_background = image_stats(extract_box_reference(screen, m_representative_background));
+    bool white_theme = stats_window_background.average.sum() > 500;
+    return white_theme;
+}
+
+bool SelectedSettingWatcher::process_frame(const ImageViewRGB32& screen, WallClock timestamp){
+
+    ImageStats stats_unselected_box1 = image_stats(extract_box_reference(screen, m_not_selected_box1));
+    double unselected1_average_sum = stats_unselected_box1.average.sum();
+//    cout << "unselected_average_sum1: " << std::to_string(unselected1_average_sum) << endl;
+
+    ImageStats stats_unselected_box2 = image_stats(extract_box_reference(screen, m_not_selected_box2));
+    double unselected2_average_sum = stats_unselected_box2.average.sum();
+//    cout << "unselected_average_sum2: " << std::to_string(unselected2_average_sum) << endl;
+
+    double average_sum_unselected_diff = std::abs(unselected1_average_sum - unselected2_average_sum);
+
+    ImageStats stats_selected_box = image_stats(extract_box_reference(screen, m_selected_box));
+    double selected_average_sum = stats_selected_box.average.sum();
+//    cout << "selected_average_sum: " << std::to_string(selected_average_sum) << endl;
+
+    bool is_selected = false;
+    if (is_white_theme(screen)){  // light mode
+        // unselected should be brighter than selected
+        is_selected = selected_average_sum < std::min(unselected1_average_sum, unselected2_average_sum) - average_sum_unselected_diff - 20 ;
+    }else{  // dark mode
+        // selected should be brighter than unselected
+        is_selected = selected_average_sum  > std::max(unselected1_average_sum, unselected2_average_sum) + average_sum_unselected_diff + 20;
+    }
+
+    return is_selected;
+}
+
+
+
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_SelectedSettingDetector.h b/SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_SelectedSettingDetector.h
new file mode 100644
index 0000000000..ea07016a4c
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_SelectedSettingDetector.h
@@ -0,0 +1,52 @@
+/*  Selected Setting Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_NintendoSwitch_SelectedSettingDetector_H
+#define PokemonAutomation_NintendoSwitch_SelectedSettingDetector_H
+
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+#include "CommonTools/VisualDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+
+class SelectedSettingWatcher : public VisualInferenceCallback{
+public:
+    SelectedSettingWatcher(
+        ImageFloatBox selected_box,
+        ImageFloatBox not_selected_box1,
+        ImageFloatBox not_selected_box2,
+        ImageFloatBox representative_background = {0.60, 0.02, 0.35, 0.05}
+    );
+    virtual ~SelectedSettingWatcher();
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+
+    bool is_white_theme(const ImageViewRGB32& screen);
+
+    // return true if the area within the selected_box is highlighted, compared with the area within unselected_box
+    // This compares the brightness of the selected_box with the unselected_box.
+    // selected_box: the box where we expect the screen should be highlighted
+    // not_selected_box 1 and 2: the boxes where we expect the screen should NOT be highlighted. These acts as the control, for comparison.
+    // representative_background: box around an area that would represent the background. for determining whether this is white or dark mode.
+    // the average sum of selected_box should be greater than the absolute difference of average sum between unselected_box 1 and 2.
+    virtual bool process_frame(const ImageViewRGB32& screen, WallClock timestamp) override;
+
+
+protected:
+    ImageFloatBox m_selected_box;
+    ImageFloatBox m_not_selected_box1;
+    ImageFloatBox m_not_selected_box2;
+    ImageFloatBox m_representative_background;
+};
+
+
+}
+}
+#endif
+
diff --git a/SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_StartGameUserSelectDetector.cpp b/SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_StartGameUserSelectDetector.cpp
new file mode 100644
index 0000000000..c54db25f48
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_StartGameUserSelectDetector.cpp
@@ -0,0 +1,214 @@
+/*  Start Game User-Select Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Exceptions.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Images/SolidColorTest.h"
+#include "NintendoSwitch_StartGameUserSelectDetector.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+
+
+
+StartGameUserSelectDetector::StartGameUserSelectDetector(ConsoleHandle& console, Color color)
+    : m_console(console)
+    , m_type_detector(console, color)
+    , m_switch1(color)
+    , m_switch2(color)
+{}
+void StartGameUserSelectDetector::make_overlays(VideoOverlaySet& items) const{
+    m_type_detector.make_overlays(items);
+    m_switch1.make_overlays(items);
+    m_switch2.make_overlays(items);
+}
+bool StartGameUserSelectDetector::detect(const ImageViewRGB32& screen){
+    return detect_only(screen);
+#if 0
+    if (detect_only(screen)){
+        m_console.state().set_console_type(m_console, m_console_type);
+        return true;
+    }else{
+        return false;
+    }
+#endif
+}
+void StartGameUserSelectDetector::commit_state(){
+    m_console.state().set_console_type(m_console, m_console_type);
+}
+bool StartGameUserSelectDetector::detect_only(const ImageViewRGB32& screen){
+    ConsoleType type = m_type_detector.detect_only(screen);
+    m_console_type = type;
+
+    if (type == ConsoleType::Unknown){
+        return false;
+    }
+    if (is_switch1(type)){
+        return m_switch1.detect(screen);
+    }
+    if (is_switch2(type)){
+        return m_switch2.detect(screen);
+    }
+
+    throw InternalProgramError(
+        nullptr, PA_CURRENT_FUNCTION,
+        "Invalid ConsoleType: " + std::to_string((int)type)
+    );
+}
+
+
+
+
+
+
+
+
+StartGameUserSelectDetector_Switch1::StartGameUserSelectDetector_Switch1(Color color)
+    : m_color(color)
+    , m_bottom_row(0.10, 0.92, 0.10, 0.05)
+    , m_bottom_icons(0.70, 0.92, 0.28, 0.05)
+    , m_top_row(0.50, 0.47, 0.45, 0.05)
+    , m_mid_row(0.10, 0.55, 0.80, 0.02)
+    , m_user_slot(0.45, 0.55, 0.10, 0.35)
+{}
+void StartGameUserSelectDetector_Switch1::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_bottom_row);
+    items.add(m_color, m_bottom_icons);
+    items.add(m_color, m_top_row);
+    items.add(m_color, m_mid_row);
+    items.add(m_color, m_user_slot);
+}
+bool StartGameUserSelectDetector_Switch1::detect(const ImageViewRGB32& screen){
+    ImageStats stats_bottom_row = image_stats(extract_box_reference(screen, m_bottom_row));
+//    cout << stats_bottom_row.average << stats_bottom_row.stddev << endl;
+    if (stats_bottom_row.stddev.sum() > 10){
+        return false;
+    }
+    bool white;
+    if (is_grey(stats_bottom_row, 50, 300)){
+        white = false;
+    }else if (stats_bottom_row.average.sum() > 500){
+        white = true;
+    }else{
+        return false;
+    }
+
+    ImageStats stats_bottom_icons = image_stats(extract_box_reference(screen, m_bottom_icons));
+//    cout << stats_bottom_icons.average << stats_bottom_icons.stddev << endl;
+    if (stats_bottom_icons.stddev.sum() < 50){
+        return false;
+    }
+
+    ImageStats stats_top_row = image_stats(extract_box_reference(screen, m_top_row));
+    ImageStats stats_mid_row = image_stats(extract_box_reference(screen, m_mid_row));
+//    cout << stats_top_row.average << stats_top_row.stddev << endl;
+    if (stats_top_row.stddev.sum() > 10 || stats_mid_row.stddev.sum() > 10){
+        return false;
+    }
+    if (white){
+        if (!is_white(stats_top_row) || !is_white(stats_mid_row)){
+            return false;
+        }
+    }else{
+        if (!is_grey(stats_top_row, 50, 300) || !is_grey(stats_mid_row, 50, 300)){
+            return false;
+        }
+    }
+
+    if (euclidean_distance(stats_bottom_row.average, stats_top_row.average) > 20){
+        return false;
+    }
+
+    ImageStats stats_user_slot = image_stats(extract_box_reference(screen, m_user_slot));
+//    cout << stats_user_slot.average << stats_user_slot.stddev << endl;
+    if (stats_user_slot.stddev.sum() < 50){
+        return false;
+    }
+
+    return true;
+}
+
+
+StartGameUserSelectDetector_Switch2::StartGameUserSelectDetector_Switch2(Color color)
+    : m_color(color)
+    , m_bottom_row(0.10, 0.92, 0.10, 0.05)
+    , m_bottom_icons(0.70, 0.92, 0.28, 0.05)
+    , m_top_row(0.50, 0.45, 0.45, 0.05)
+    , m_mid_row(0.10, 0.53, 0.80, 0.02)
+    , m_user_slot(0.45, 0.55, 0.10, 0.30)
+{}
+void StartGameUserSelectDetector_Switch2::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_bottom_row);
+    items.add(m_color, m_bottom_icons);
+    items.add(m_color, m_top_row);
+    items.add(m_color, m_mid_row);
+    items.add(m_color, m_user_slot);
+}
+bool StartGameUserSelectDetector_Switch2::detect(const ImageViewRGB32& screen){
+    ImageStats stats_bottom_row = image_stats(extract_box_reference(screen, m_bottom_row));
+//    cout << stats_bottom_row.average << stats_bottom_row.stddev << endl;
+    if (stats_bottom_row.stddev.sum() > 10){
+        return false;
+    }
+    bool white;
+    if (is_grey(stats_bottom_row, 0, 300)){
+        white = false;
+    }else if (stats_bottom_row.average.sum() > 500){
+        white = true;
+    }else{
+        return false;
+    }
+
+    ImageStats stats_bottom_icons = image_stats(extract_box_reference(screen, m_bottom_icons));
+//    cout << stats_bottom_icons.average << stats_bottom_icons.stddev << endl;
+    if (stats_bottom_icons.stddev.sum() < 50){
+        return false;
+    }
+
+    ImageStats stats_top_row = image_stats(extract_box_reference(screen, m_top_row));
+    ImageStats stats_mid_row = image_stats(extract_box_reference(screen, m_mid_row));
+//    cout << stats_top_row.average << stats_top_row.stddev << endl;
+    if (stats_top_row.stddev.sum() > 10 || stats_mid_row.stddev.sum() > 10){
+        return false;
+    }
+    if (white){
+        if (!is_white(stats_top_row) || !is_white(stats_mid_row)){
+            return false;
+        }
+    }else{
+        if (!is_grey(stats_top_row, 0, 300) || !is_grey(stats_mid_row, 0, 300)){
+            return false;
+        }
+    }
+
+    if (euclidean_distance(stats_bottom_row.average, stats_top_row.average) > 20){
+        return false;
+    }
+
+    ImageStats stats_user_slot = image_stats(extract_box_reference(screen, m_user_slot));
+//    cout << stats_user_slot.average << stats_user_slot.stddev << endl;
+    if (stats_user_slot.stddev.sum() < 50){
+        return false;
+    }
+
+    return true;
+}
+
+
+
+
+
+
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_StartGameUserSelectDetector.h b/SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_StartGameUserSelectDetector.h
new file mode 100644
index 0000000000..71d02f0e96
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_StartGameUserSelectDetector.h
@@ -0,0 +1,88 @@
+/*  Start Game User-Select Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_NintendoSwitch_StartGameUserSelectDetector_H
+#define PokemonAutomation_NintendoSwitch_StartGameUserSelectDetector_H
+
+#include "Common/Cpp/Color.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+#include "CommonTools/VisualDetector.h"
+#include "NintendoSwitch_ConsoleTypeDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+
+
+
+class StartGameUserSelectDetector_Switch1 : public StaticScreenDetector{
+public:
+    StartGameUserSelectDetector_Switch1(Color color = COLOR_RED);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    Color m_color;
+    ImageFloatBox m_bottom_row;
+    ImageFloatBox m_bottom_icons;
+    ImageFloatBox m_top_row;
+    ImageFloatBox m_mid_row;
+    ImageFloatBox m_user_slot;
+};
+class StartGameUserSelectDetector_Switch2 : public StaticScreenDetector{
+public:
+    StartGameUserSelectDetector_Switch2(Color color = COLOR_RED);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    Color m_color;
+    ImageFloatBox m_bottom_row;
+    ImageFloatBox m_bottom_icons;
+    ImageFloatBox m_top_row;
+    ImageFloatBox m_mid_row;
+    ImageFloatBox m_user_slot;
+};
+
+
+
+
+
+class StartGameUserSelectDetector : public StaticScreenDetector{
+public:
+    StartGameUserSelectDetector(ConsoleHandle& console, Color color = COLOR_RED);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+    virtual void commit_state() override;
+    bool detect_only(const ImageViewRGB32& screen);
+
+private:
+    ConsoleHandle& m_console;
+    ConsoleTypeDetector_StartGameUserSelect m_type_detector;
+    StartGameUserSelectDetector_Switch1 m_switch1;
+    StartGameUserSelectDetector_Switch2 m_switch2;
+
+    ConsoleType m_console_type;
+};
+class StartGameUserSelectWatcher : public DetectorToFinder<StartGameUserSelectDetector>{
+public:
+    StartGameUserSelectWatcher(ConsoleHandle& console, Color color = COLOR_RED)
+         : DetectorToFinder("StartGameUserSelectWatcher", std::chrono::milliseconds(250), console, color)
+    {}
+};
+
+
+
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_UpdatePopupDetector.cpp b/SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_UpdatePopupDetector.cpp
new file mode 100644
index 0000000000..2d107709b9
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_UpdatePopupDetector.cpp
@@ -0,0 +1,309 @@
+/*  Update Popup Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Compiler.h"
+#include "Common/Cpp/Exceptions.h"
+#include "CommonFramework/ImageTypes/ImageRGB32.h"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Images/SolidColorTest.h"
+#include "Tests/ImageUnitTest.h"
+#include "GameConsole/Framework/ConsoleSystemSession.h"
+#include "NintendoSwitch_UpdatePopupDetector.h"
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+
+
+UpdatePopupDetector::UpdatePopupDetector(ConsoleHandle& console, Color color)
+    : m_type_detector(console, color)
+    , m_switch1(color)
+    , m_switch2(color)
+{}
+void UpdatePopupDetector::make_overlays(VideoOverlaySet& items) const{
+    m_type_detector.make_overlays(items);
+    m_switch1.make_overlays(items);
+    m_switch2.make_overlays(items);
+}
+bool UpdatePopupDetector::detect(const ImageViewRGB32& screen){
+    return detect_only(screen);
+
+#if 0
+    if (detect_only(screen)){
+        m_type_detector.commit_to_cache();
+        return true;
+    }else{
+        return false;
+    }
+#endif
+}
+void UpdatePopupDetector::commit_state(){
+    m_type_detector.commit_to_cache();
+}
+bool UpdatePopupDetector::detect_only(const ImageViewRGB32& screen){
+    ConsoleType type = m_type_detector.detect_only(screen);
+
+    if (type == ConsoleType::Unknown){
+        return false;
+    }
+    if (is_switch1(type)){
+        return m_switch1.detect(screen);
+    }
+    if (is_switch2(type)){
+        return m_switch2.detect(screen);
+    }
+
+    throw InternalProgramError(
+        nullptr, PA_CURRENT_FUNCTION,
+        "Invalid ConsoleType: " + std::to_string((int)type)
+    );
+}
+
+
+
+
+
+
+
+
+UpdatePopupDetector_Switch1::UpdatePopupDetector_Switch1(Color color)
+    : m_color(color)
+    , m_box_top(0.25, 0.26, 0.50, 0.02)
+    , m_box_mid(0.25, 0.52, 0.50, 0.02)
+    , m_top(0.10, 0.15, 0.80, 0.03)
+    , m_left(0.08, 0.25, 0.10, 0.38)
+    , m_bottom_solid(0.10, 0.84, 0.80, 0.04)
+    , m_bottom_buttons(0.70, 0.92, 0.28, 0.05)
+    , m_option_divider(0.49, 0.66, 0.02, 0.01)
+{}
+void UpdatePopupDetector_Switch1::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_box_top);
+    items.add(m_color, m_box_mid);
+    items.add(m_color, m_top);
+    items.add(m_color, m_left);
+    items.add(m_color, m_bottom_solid);
+    items.add(m_color, m_bottom_buttons);
+    items.add(m_color, m_option_divider);
+}
+bool UpdatePopupDetector_Switch1::detect(const ImageViewRGB32& screen){
+    ImageStats option_divider = image_stats(extract_box_reference(screen, m_option_divider));
+    if (option_divider.stddev.sum() < 10){
+        return false;
+    }
+
+    ImageStats stats_box_top = image_stats(extract_box_reference(screen, m_box_top));
+//    cout << stats_box_top.average << stats_box_top.stddev << endl;
+    bool white;
+    if (stats_box_top.average.sum() < 300){
+        white = false;
+    }else if (stats_box_top.average.sum() > 500){
+        white = true;
+    }else{
+        return false;
+    }
+    if (stats_box_top.stddev.sum() > 10){
+        return false;
+    }
+
+//    cout << "white: " << white << endl;
+
+    ImageStats stats_box_mid = image_stats(extract_box_reference(screen, m_box_mid));
+    if (stats_box_mid.stddev.sum() > 10){
+        return false;
+    }
+    if (euclidean_distance(stats_box_top.average, stats_box_mid.average) > 10){
+        return false;
+    }
+
+    ImageStats stats_left = image_stats(extract_box_reference(screen, m_left));
+//    cout << stats_left.stddev << endl;
+    if (stats_left.stddev.sum() < 30){
+//        cout << "zxcv" << endl;
+        return false;
+    }
+
+    ImageStats stats_top = image_stats(extract_box_reference(screen, m_top));
+//    cout << stats_top.average << stats_top.stddev << endl;
+
+    ImageStats bottom_solid = image_stats(extract_box_reference(screen, m_bottom_solid));
+//    cout << bottom_solid.average << bottom_solid.stddev << endl;
+
+    if (euclidean_distance(stats_top.average, bottom_solid.average) > 10){
+//        cout << "qwer" << endl;
+        return false;
+    }
+
+    if (white){
+        if (!is_grey(stats_top, 100, 300) || !is_grey(bottom_solid, 100, 300)){
+//            cout << "asdf" << endl;
+            return false;
+        }
+    }else{
+        if (!is_grey(stats_top, 0, 100) || !is_grey(bottom_solid, 0, 100)){
+//            cout << "zxcv" << endl;
+            return false;
+        }
+    }
+
+    ImageStats stats_bottom_buttons = image_stats(extract_box_reference(screen, m_bottom_buttons));
+//    cout << stats_bottom_buttons.average << stats_bottom_buttons.stddev << endl;
+    if (stats_bottom_buttons.stddev.sum() < 30){
+        return false;
+    }
+
+    return true;
+}
+
+
+
+
+UpdatePopupDetector_Switch2::UpdatePopupDetector_Switch2(Color color)
+    : m_color(color)
+    , m_box_top(0.25, 0.31, 0.50, 0.02)
+//    , m_box_mid(0.25, 0.482, 0.50, 0.02)
+    , m_top(0.10, 0.17, 0.80, 0.03)
+    , m_left(0.08, 0.25, 0.10, 0.38)
+    , m_bottom_solid(0.10, 0.86, 0.80, 0.04)
+    , m_bottom_buttons(0.70, 0.92, 0.28, 0.05)
+    , m_option_divider_check_for_internet(0.49, 0.675, 0.02, 0.01)
+{}
+
+void UpdatePopupDetector_Switch2::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_box_top);
+//    items.add(m_color, m_box_mid);
+    items.add(m_color, m_top);
+    items.add(m_color, m_left);
+    items.add(m_color, m_bottom_solid);
+    items.add(m_color, m_bottom_buttons);
+    items.add(m_color, m_option_divider_check_for_internet);
+}
+bool UpdatePopupDetector_Switch2::detect(const ImageViewRGB32& screen){
+    ImageStats option_divider = image_stats(extract_box_reference(screen, m_option_divider_check_for_internet));
+//    cout << "option_divider = " << option_divider.average << option_divider.stddev << endl;
+    if (option_divider.stddev.sum() < 10){
+        return false;
+    }
+
+    ImageStats stats_box_top = image_stats(extract_box_reference(screen, m_box_top));
+//    cout << "stats_box_top = " << stats_box_top.average << stats_box_top.stddev << endl;
+    bool white;
+    if (stats_box_top.average.sum() < 300){
+        white = false;
+    }else if (stats_box_top.average.sum() > 500){
+        white = true;
+    }else{
+        return false;
+    }
+    if (stats_box_top.stddev.sum() > 10){
+        return false;
+    }
+
+//    cout << "white: " << white << endl;
+
+#if 0
+    ImageStats stats_box_mid = image_stats(extract_box_reference(screen, m_box_mid));
+    if (stats_box_mid.stddev.sum() > 10){
+        return false;
+    }
+    if (euclidean_distance(stats_box_top.average, stats_box_mid.average) > 10){
+        return false;
+    }
+#endif
+
+    ImageStats stats_left = image_stats(extract_box_reference(screen, m_left));
+//    cout << stats_left.stddev << endl;
+    if (stats_left.stddev.sum() < 30){
+//        cout << "zxcv" << endl;
+        return false;
+    }
+
+    ImageStats stats_top = image_stats(extract_box_reference(screen, m_top));
+//    cout << stats_top.average << stats_top.stddev << endl;
+
+    ImageStats bottom_solid = image_stats(extract_box_reference(screen, m_bottom_solid));
+//    cout << bottom_solid.average << bottom_solid.stddev << endl;
+
+    if (euclidean_distance(stats_top.average, bottom_solid.average) > 10){
+//        cout << "qwer" << endl;
+        return false;
+    }
+
+    do{
+        if (white){
+            if (is_grey(stats_top, 200, 765) && is_grey(bottom_solid, 200, 765)){
+                break;
+            }
+        }else{
+            if (is_grey(stats_top, 0, 100) && is_grey(bottom_solid, 0, 100)){
+                break;
+            }
+            if (is_grey(stats_top, 200, 500) && is_grey(bottom_solid, 200, 500)){
+                break;
+            }
+        }
+
+        return false;
+    }while (false);
+
+    ImageStats stats_bottom_buttons = image_stats(extract_box_reference(screen, m_bottom_buttons));
+//    cout << stats_bottom_buttons.average << stats_bottom_buttons.stddev << endl;
+    if (stats_bottom_buttons.stddev.sum() < 30){
+        return false;
+    }
+
+    return true;
+}
+
+
+class Test_UpdatePopupDetector : public ImageUnitTest{
+public:
+    Test_UpdatePopupDetector(const std::string& image, bool expected)
+        : ImageUnitTest("NintendoSwitch::UpdatePopupDetector - " + image, {image})
+        , m_expected(expected)
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        GameConsole::ConsoleSystemOption option(1);
+        GameConsole::ConsoleSystemSession session(option, false, 0, {});
+        ConsoleHandle console(session);
+
+        UpdatePopupDetector detector(console);
+        const ImageRGB32& image = images[0];
+        return detector.detect(image) == m_expected;
+    }
+
+private:
+    bool m_expected;
+};
+
+
+void add_tests_UpdatePopupDetector(UnitTestDatabase& database){
+    database.add<Test_UpdatePopupDetector>("NintendoSwitch/UpdateMenuDetector/English_1_True.png", true);
+    database.add<Test_UpdatePopupDetector>("NintendoSwitch/UpdateMenuDetector/English_2_True.png", true);
+    database.add<Test_UpdatePopupDetector>("NintendoSwitch/UpdateMenuDetector/English_White_1_True.png", true);
+    database.add<Test_UpdatePopupDetector>("NintendoSwitch/UpdateMenuDetector/English_White_2_True.png", true);
+    database.add<Test_UpdatePopupDetector>("NintendoSwitch/UpdateMenuDetector/German_1_True.jpg", true);
+    database.add<Test_UpdatePopupDetector>("NintendoSwitch/UpdateMenuDetector/German_2_True.png", true);
+    database.add<Test_UpdatePopupDetector>("NintendoSwitch/UpdateMenuDetector/Home_False.png", false);
+}
+
+
+
+
+
+
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_UpdatePopupDetector.h b/SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_UpdatePopupDetector.h
new file mode 100644
index 0000000000..ca70122ec9
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Inference/NintendoSwitch_UpdatePopupDetector.h
@@ -0,0 +1,91 @@
+/*  Update Popup Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_NintendoSwitch_UpdatePopupDetector_H
+#define PokemonAutomation_NintendoSwitch_UpdatePopupDetector_H
+
+#include "Common/Cpp/Color.h"
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+#include "CommonTools/VisualDetector.h"
+#include "NintendoSwitch_ConsoleTypeDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+
+
+class UpdatePopupDetector_Switch1 : public StaticScreenDetector{
+public:
+    UpdatePopupDetector_Switch1(Color color = COLOR_RED);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    Color m_color;
+    ImageFloatBox m_box_top;
+    ImageFloatBox m_box_mid;
+    ImageFloatBox m_top;
+    ImageFloatBox m_left;
+    ImageFloatBox m_bottom_solid;
+    ImageFloatBox m_bottom_buttons;
+    ImageFloatBox m_option_divider;
+};
+class UpdatePopupDetector_Switch2 : public StaticScreenDetector{
+public:
+    UpdatePopupDetector_Switch2(Color color = COLOR_RED);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    Color m_color;
+    ImageFloatBox m_box_top;
+//    ImageFloatBox m_box_mid;
+    ImageFloatBox m_top;
+    ImageFloatBox m_left;
+    ImageFloatBox m_bottom_solid;
+    ImageFloatBox m_bottom_buttons;
+    ImageFloatBox m_option_divider_check_for_internet;
+};
+
+
+
+
+
+//  Detect the Switch system update screen when you are about to enter a game from Switch Home screen
+class UpdatePopupDetector : public StaticScreenDetector{
+public:
+    UpdatePopupDetector(ConsoleHandle& console, Color color = COLOR_RED);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+    virtual void commit_state() override;
+    bool detect_only(const ImageViewRGB32& screen);
+
+private:
+    ConsoleTypeDetector_Home m_type_detector;
+    UpdatePopupDetector_Switch1 m_switch1;
+    UpdatePopupDetector_Switch2 m_switch2;
+};
+class UpdateMenuWatcher : public DetectorToFinder<UpdatePopupDetector>{
+public:
+    UpdateMenuWatcher(ConsoleHandle& console, Color color = COLOR_RED)
+         : DetectorToFinder("UpdateMenuWatcher", std::chrono::milliseconds(250), console, color)
+    {}
+};
+
+
+void add_tests_UpdatePopupDetector(UnitTestDatabase& database);
+
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_ConsoleHandle.cpp b/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_ConsoleHandle.cpp
new file mode 100644
index 0000000000..29ae7ffb28
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_ConsoleHandle.cpp
@@ -0,0 +1,22 @@
+/*  Console Handle
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Exceptions.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+
+
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_ConsoleHandle.h b/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_ConsoleHandle.h
new file mode 100644
index 0000000000..d1c91a2c12
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_ConsoleHandle.h
@@ -0,0 +1,36 @@
+/*  Console Handle
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_NintendoSwitch_ConsoleHandle_H
+#define PokemonAutomation_NintendoSwitch_ConsoleHandle_H
+
+#include "GameConsole/ConsoleHandle.h"
+#include "NintendoSwitch_ConsoleState.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+
+class ConsoleHandle : public GameConsole::ConsoleHandle{
+public:
+    using GameConsole::ConsoleHandle::ConsoleHandle;
+
+    ConsoleState& state(){ return m_console_state; }
+    operator ConsoleState&(){ return m_console_state; }
+
+
+private:
+    ConsoleState m_console_state;
+};
+
+
+
+
+}
+}
+#endif
+
+
diff --git a/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_ConsoleState.cpp b/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_ConsoleState.cpp
new file mode 100644
index 0000000000..13ccc194d4
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_ConsoleState.cpp
@@ -0,0 +1,182 @@
+/*  Console State
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <atomic>
+#include "Common/Cpp/Exceptions.h"
+#include "Common/Cpp/Containers/Pimpl.tpp"
+#include "NintendoSwitch_ConsoleState.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+
+
+const std::string& ConsoleType_strings(ConsoleType type){
+    static std::string STRINGS[] = {
+        "Unknown",
+        "Switch 1 + OLED",
+        "Switch 2 (unknown model)",
+        "Switch 2 (FW19, international)",
+        "Switch 2 (FW19, Japan-locked)",
+        "Switch 2 (FW20, international)",
+        "Switch 2 (FW20, Japan-locked)",
+    };
+    size_t index = (size_t)type;
+    if (index < sizeof(STRINGS) / sizeof(std::string)){
+        return STRINGS[(size_t)type];
+    }
+    throw InternalProgramError(
+        nullptr, PA_CURRENT_FUNCTION,
+        "Invalid ConsoleType enum: " + std::to_string(index)
+    );
+}
+
+[[noreturn]] void throw_conflict(
+    Logger& logger,
+    ConsoleType user_type,
+    ConsoleType detected_type
+){
+    throw UserSetupError(
+        logger,
+        std::string("Conflicting Console Types:") +
+        "\n    User Selected: " + ConsoleType_strings(user_type) +
+        "\n    Detected Type: " + ConsoleType_strings(detected_type) +
+        "\n\nIf you think this is a bug, please report it to either our Github or our Discord server!"
+    );
+}
+
+
+
+void check_for_conflict(
+    Logger& logger,
+    ConsoleType user_type,
+    ConsoleType detected_type
+){
+    if (user_type == detected_type){
+        return;
+    }
+    if (user_type == ConsoleType::Unknown || detected_type == ConsoleType::Unknown){
+        return;
+    }
+
+    if (is_switch1(user_type) && is_switch1(detected_type)){
+        return;
+    }
+
+    if (is_switch2(user_type) && is_switch2(detected_type)){
+        if (user_type == ConsoleType::Switch2_Unknown || detected_type == ConsoleType::Switch2_Unknown){
+            return;
+        }
+        if (user_type != detected_type){
+            throw_conflict(logger, user_type, detected_type);
+        }
+        return;
+    }
+
+    throw_conflict(logger, user_type, detected_type);
+}
+
+
+
+
+
+
+struct ConsoleState::Data{
+    Data()
+        : m_console_type_confirmed(false)
+        , m_console_type(ConsoleType::Unknown)
+        , m_text_size_standard(false)
+    {}
+
+    std::atomic<bool> m_console_type_confirmed;
+    std::atomic<ConsoleType> m_console_type;
+
+    std::atomic<bool> m_text_size_standard;
+};
+
+
+
+ConsoleState::~ConsoleState() = default;
+ConsoleState::ConsoleState()
+    : m_data(CONSTRUCT_TOKEN)
+{}
+
+bool ConsoleState::console_type_confirmed() const{
+    return m_data->m_console_type_confirmed.load(std::memory_order_relaxed);
+}
+ConsoleType ConsoleState::console_type() const{
+    return m_data->m_console_type.load(std::memory_order_relaxed);
+}
+void ConsoleState::set_console_type_user(ConsoleType type){
+    m_data->m_console_type_confirmed.store(false, std::memory_order_relaxed);
+    m_data->m_console_type.store(type, std::memory_order_relaxed);
+}
+void ConsoleState::set_console_type(Logger& logger, ConsoleType type){
+    ConsoleType current = console_type();
+    bool confirmed = m_data->m_console_type_confirmed.load(std::memory_order_relaxed);
+    if (!confirmed){
+        check_for_conflict(logger, current, type);
+    }
+
+    do{
+        if (type == ConsoleType::Unknown){
+            return;
+        }
+        if (current == ConsoleType::Unknown){
+            break;
+        }
+
+        if (type == ConsoleType::Switch2_Unknown){
+            return;
+        }
+
+    }while (false);
+
+    if (!confirmed || current != type){
+        logger.log(
+            std::string("Setting console type to: ") + ConsoleType_strings(type),
+            COLOR_BLUE
+        );
+    }
+
+    m_data->m_console_type.store(type, std::memory_order_relaxed);
+    m_data->m_console_type_confirmed.store(true, std::memory_order_relaxed);
+}
+
+
+
+bool ConsoleState::text_size_ok() const{
+    return m_data->m_text_size_standard.load(std::memory_order_relaxed);
+}
+void ConsoleState::set_text_size_ok(bool ok){
+    m_data->m_text_size_standard.store(ok, std::memory_order_relaxed);
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_ConsoleState.h b/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_ConsoleState.h
new file mode 100644
index 0000000000..1d8c9761be
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_ConsoleState.h
@@ -0,0 +1,72 @@
+/*  Console State
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_NintendoSwitch_ConsoleState_H
+#define PokemonAutomation_NintendoSwitch_ConsoleState_H
+
+#include "Common/Cpp/Logging/AbstractLogger.h"
+#include "Common/Cpp/Containers/Pimpl.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+
+
+enum class ConsoleType{
+    Unknown,
+    Switch1,
+    Switch2_Unknown,
+    Switch2_FW19_International,
+    Switch2_FW19_JapanLocked,
+    Switch2_FW20_International,
+    Switch2_FW20_JapanLocked,
+};
+const std::string& ConsoleType_strings(ConsoleType type);
+
+inline bool is_switch1(ConsoleType type){
+    return type == ConsoleType::Switch1;
+}
+inline bool is_switch2(ConsoleType type){
+    return type == ConsoleType::Switch2_Unknown
+        || type == ConsoleType::Switch2_FW19_International
+        || type == ConsoleType::Switch2_FW19_JapanLocked
+        || type == ConsoleType::Switch2_FW20_International
+        || type == ConsoleType::Switch2_FW20_JapanLocked;
+}
+void check_for_conflict(
+    Logger& logger,
+    ConsoleType user_type,
+    ConsoleType detected_type
+);
+
+
+
+
+class ConsoleState{
+public:
+    ~ConsoleState();
+    ConsoleState();
+
+
+    bool console_type_confirmed() const;
+    ConsoleType console_type() const;
+    void set_console_type_user(ConsoleType type);
+    void set_console_type(Logger& logger, ConsoleType type);
+
+    bool text_size_ok() const;
+    void set_text_size_ok(bool ok);
+
+private:
+    struct Data;
+    Pimpl<Data> m_data;
+};
+
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_MultiSwitchProgram.cpp b/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_MultiSwitchProgram.cpp
index 032f2d5a22..9835daf347 100644
--- a/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_MultiSwitchProgram.cpp
+++ b/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_MultiSwitchProgram.cpp
@@ -1,22 +1,16 @@
 /*  Multi-Switch Program Template
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include "Common/Cpp/Json/JsonValue.h"
-#include "Common/Cpp/Containers/FixedLimitVector.tpp"
-#include "Common/Cpp/Concurrency/AsyncDispatcher.h"
-#include "ClientSource/Connection/BotBase.h"
-#include "CommonFramework/VideoPipeline/VideoOverlay.h"
-#include "CommonFramework/VideoPipeline/Stats/ThreadUtilizationStats.h"
+#include "CommonTools/StartupChecks/StartProgramChecks.h"
+#include "Framework/NintendoSwitch_MultiSwitchProgramSession.h"
 #include "NintendoSwitch_MultiSwitchProgram.h"
-#include "Framework/NintendoSwitch_MultiSwitchProgramOption.h"
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
 
-MultiSwitchProgramEnvironment::~MultiSwitchProgramEnvironment(){}
 
 MultiSwitchProgramEnvironment::MultiSwitchProgramEnvironment(
     const ProgramInfo& program_info,
@@ -24,44 +18,17 @@ MultiSwitchProgramEnvironment::MultiSwitchProgramEnvironment(
     ProgramSession& session,
     StatsTracker* current_stats,
     const StatsTracker* historical_stats,
-    FixedLimitVector<ConsoleHandle> p_switches
+    std::vector<std::unique_ptr<GameConsole::ConsoleHandle>> consoles
 )
-    : ProgramEnvironment(program_info, session, current_stats, historical_stats)
-    , consoles(std::move(p_switches))
-{
-    for (ConsoleHandle& console : consoles){
-        console.initialize_inference_threads(scope, inference_dispatcher());
-    }
-}
-
-void MultiSwitchProgramEnvironment::run_in_parallel(
-    CancellableScope& scope,
-    const std::function<void(ConsoleHandle& console, BotBaseContext& context)>& func
-){
-    run_in_parallel(scope, 0, consoles.size(), func);
-}
-void MultiSwitchProgramEnvironment::run_in_parallel(
-    CancellableScope& scope, size_t s, size_t e,
-    const std::function<void(ConsoleHandle& console, BotBaseContext& context)>& func
-){
-    realtime_dispatcher().run_in_parallel(
-        s, e,
-        [&](size_t index){
-            ConsoleHandle& console = consoles[index];
-            ThreadUtilizationStat stat(current_thread_handle(), "Program Thread " + std::to_string(index) + ":");
-            console.overlay().add_stat(stat);
-            try{
-                BotBaseContext context(scope, consoles[index].botbase());
-                func(console, context);
-                context.wait_for_all_requests();
-                console.overlay().remove_stat(stat);
-            }catch (...){
-                console.overlay().remove_stat(stat);
-                throw;
-            }
-        }
-    );
-}
+    : GameConsole::MultiConsoleProgramEnvironment(
+        program_info,
+        scope,
+        session,
+        current_stats,
+        historical_stats,
+        std::move(consoles)
+    )
+{}
 
 
 
@@ -70,72 +37,66 @@ MultiSwitchProgramDescriptor::MultiSwitchProgramDescriptor(
     std::string category, std::string display_name,
     std::string doc_link,
     std::string description,
+    PanelQualityStanding standing,
+    ProgramControllerClass controller_class,
     FeedbackType feedback,
     AllowCommandsWhenRunning allow_commands_while_running,
-    PABotBaseLevel min_pabotbase_level,
     size_t min_switches,
     size_t max_switches,
-    size_t default_switches
+    size_t default_switches,
+    std::vector<std::string> required_resources
 )
-    : ProgramDescriptor(
-        pick_color(feedback, min_pabotbase_level),
+    : GameConsole::MultiConsoleProgramDescriptor(
         std::move(identifier),
         std::move(category), std::move(display_name),
         std::move(doc_link),
-        std::move(description)
+        std::move(description),
+        standing,
+        controller_class,
+        feedback,
+        allow_commands_while_running,
+        min_switches,
+        max_switches,
+        default_switches,
+        std::move(required_resources)
     )
-    , m_feedback(feedback)
-    , m_min_pabotbase_level(min_pabotbase_level)
-    , m_allow_commands_while_running(allow_commands_while_running == AllowCommandsWhenRunning::ENABLE_COMMANDS)
-    , m_min_switches(min_switches)
-    , m_max_switches(max_switches)
-    , m_default_switches(default_switches)
 {}
-std::unique_ptr<PanelInstance> MultiSwitchProgramDescriptor::make_panel() const{
-    return std::unique_ptr<PanelInstance>(new MultiSwitchProgramOption(*this));
+std::unique_ptr<PanelSession> MultiSwitchProgramDescriptor::make_panel() const{
+    return std::unique_ptr<PanelSession>(new MultiSwitchProgramSession(*this));
 }
 
 
 
 
-MultiSwitchProgramInstance::~MultiSwitchProgramInstance() = default;
-MultiSwitchProgramInstance::MultiSwitchProgramInstance(
-    const std::vector<std::string>& error_notification_tags
-)
-    : m_options(LockWhileRunning::UNLOCKED)
-    , NOTIFICATION_PROGRAM_FINISH(
-        "Program Finished",
-        true, true,
-        ImageAttachmentMode::JPG,
-        {"Notifs"}
-    )
-    , NOTIFICATION_ERROR_RECOVERABLE(
-        "Program Error (Recoverable)",
-        true, false,
-        ImageAttachmentMode::PNG,
-        error_notification_tags
-    )
-    , NOTIFICATION_ERROR_FATAL(
-        "Program Error (Fatal)",
-        true, true,
-        ImageAttachmentMode::PNG,
-        error_notification_tags
-    )
-{}
-void MultiSwitchProgramInstance::add_option(ConfigOption& option, std::string serialization_string){
-    m_options.add_option(option, std::move(serialization_string));
-}
-void MultiSwitchProgramInstance::from_json(const JsonValue& json){
-    m_options.load_json(json);
-}
-JsonValue MultiSwitchProgramInstance::to_json() const{
-    return m_options.to_json();
+
+
+void MultiSwitchProgramInstance::program(GameConsole::MultiConsoleProgramEnvironment& env, CancellableScope& scope){
+    program(static_cast<MultiSwitchProgramEnvironment&>(env), scope);
 }
-std::string MultiSwitchProgramInstance::check_validity() const{
-    return m_options.check_validity();
+void MultiSwitchProgramInstance::run_start_program_checks(
+    const ProgramDescriptor& descriptor,
+    ProgramEnvironment& env
+){
+    const GameConsole::MultiConsoleProgramDescriptor& ldescriptor = dynamic_cast<const GameConsole::MultiConsoleProgramDescriptor&>(descriptor);
+    GameConsole::MultiConsoleProgramEnvironment& lenv = dynamic_cast<GameConsole::MultiConsoleProgramEnvironment&>(env);
+    size_t consoles = lenv.consoles();
+    for (size_t c = 0; c < consoles; c++){
+        start_program_feedback_check(ldescriptor, c, lenv.console(c));
+        start_program_border_check(lenv.console(c), c, ldescriptor.feedback());
+    }
 }
-void MultiSwitchProgramInstance::restore_defaults(){
-    return m_options.restore_defaults();
+void MultiSwitchProgramInstance::start_program_border_check(
+    VideoStream& stream, size_t console_index,
+    FeedbackType feedback_type
+){
+    switch (feedback_type){
+    case FeedbackType::NONE:
+        return;
+    case FeedbackType::OPTIONAL_:
+    case FeedbackType::REQUIRED:
+    case FeedbackType::VIDEO_AUDIO:
+        StartProgramChecks::check_border(stream);
+    }
 }
 
 
diff --git a/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_MultiSwitchProgram.h b/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_MultiSwitchProgram.h
index f4866105e6..02d9e33ad9 100644
--- a/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_MultiSwitchProgram.h
+++ b/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_MultiSwitchProgram.h
@@ -1,174 +1,148 @@
 /*  Multi-Switch Program
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifndef PokemonAutomation_NintendoSwitch_MultiSwitchProgram_H
 #define PokemonAutomation_NintendoSwitch_MultiSwitchProgram_H
 
-#include <functional>
-#include "Common/Compiler.h"
-#include "Common/Cpp/Containers/FixedLimitVector.h"
-#include "Common/Cpp/Options/BatchOption.h"
+//#include "Common/Compiler.h"
 #include "CommonFramework/Globals.h"
-#include "CommonFramework/Notifications/EventNotificationOption.h"
-#include "CommonFramework/ControllerDevices/SerialPortGlobals.h"
 #include "CommonFramework/Tools/ProgramEnvironment.h"
-#include "CommonFramework/Tools/ConsoleHandle.h"
 #include "CommonFramework/Panels/ProgramDescriptor.h"
+#include "GameConsole/MultiConsoleProgram.h"
+#include "NintendoSwitch/NintendoSwitch_ConsoleHandle.h"
 
 namespace PokemonAutomation{
-    class BotBaseContext;
+    class ControllerSession;
 namespace NintendoSwitch{
 
 
+class SwitchSystemSession;
 class MultiSwitchProgramInstance;
 
 
-class MultiSwitchProgramEnvironment : public ProgramEnvironment{
+class MultiSwitchProgramEnvironment : public GameConsole::MultiConsoleProgramEnvironment{
 public:
-    ~MultiSwitchProgramEnvironment();
     MultiSwitchProgramEnvironment(
         const ProgramInfo& program_info,
         CancellableScope& scope,
         ProgramSession& session,
         StatsTracker* current_stats,
         const StatsTracker* historical_stats,
-        FixedLimitVector<ConsoleHandle> p_switches
+        std::vector<std::unique_ptr<GameConsole::ConsoleHandle>> consoles
     );
 
-    FixedLimitVector<ConsoleHandle> consoles;
+    ConsoleHandle& console(size_t index){
+        return static_cast<ConsoleHandle&>(GameConsole::MultiConsoleProgramEnvironment::console(index));
+    }
+
 
-    //  Run the specified lambda for all switches in parallel.
+public:
     void run_in_parallel(
         CancellableScope& scope,
-        const std::function<void(ConsoleHandle& console, BotBaseContext& context)>& func
-    );
-
-    //  Run the specified lambda for switch indices [s, e) in parallel.
+        const std::function<void(CancellableScope& scope, ConsoleHandle& console)>& func
+    ){
+        GameConsole::MultiConsoleProgramEnvironment::run_in_parallel<ConsoleHandle>(
+            scope, func
+        );
+    }
     void run_in_parallel(
         CancellableScope& scope, size_t s, size_t e,
-        const std::function<void(ConsoleHandle& console, BotBaseContext& context)>& func
-    );
+        const std::function<void(CancellableScope& scope, ConsoleHandle& console)>& func
+    ){
+        GameConsole::MultiConsoleProgramEnvironment::run_in_parallel<ConsoleHandle>(
+            scope, s, e, func
+        );
+    }
 
+    template <typename ControllerType>
+    void run_in_parallel(
+        CancellableScope& scope,
+        const std::function<void(ConsoleHandle& console, ControllerContext<ControllerType>& context)>& func
+    ){
+        GameConsole::MultiConsoleProgramEnvironment::run_in_parallel<ConsoleHandle, ControllerType>(
+            scope, func
+        );
+    }
+    template <typename ControllerType>
+    void run_in_parallel(
+        CancellableScope& scope, size_t s, size_t e,
+        const std::function<void(ConsoleHandle& console, ControllerContext<ControllerType>& context)>& func
+    ){
+        GameConsole::MultiConsoleProgramEnvironment::run_in_parallel<ConsoleHandle, ControllerType>(
+            scope, s, e, func
+        );
+    }
 };
 
 
 
-class MultiSwitchProgramDescriptor : public ProgramDescriptor{
+class MultiSwitchProgramDescriptor : public GameConsole::MultiConsoleProgramDescriptor{
 public:
     MultiSwitchProgramDescriptor(
         std::string identifier,
         std::string category, std::string display_name,
         std::string doc_link,
         std::string description,
+        PanelQualityStanding standing,
+        ProgramControllerClass controller_class,
         FeedbackType feedback,
         AllowCommandsWhenRunning allow_commands_while_running,
-        PABotBaseLevel min_pabotbase_level,
         size_t min_switches,
         size_t max_switches,
-        size_t default_switches
+        size_t default_switches,
+        std::vector<std::string> required_resources = {}
     );
 
-    FeedbackType feedback() const{ return m_feedback; }
-    PABotBaseLevel min_pabotbase_level() const{ return m_min_pabotbase_level; }
-    bool allow_commands_while_running() const{ return m_allow_commands_while_running; }
-
-    size_t min_switches() const{ return m_min_switches; }
-    size_t max_switches() const{ return m_max_switches; }
-    size_t default_switches() const{ return m_default_switches; }
-
-    virtual std::unique_ptr<PanelInstance> make_panel() const override;
-    virtual std::unique_ptr<MultiSwitchProgramInstance> make_instance() const{ return nullptr; }
-
-private:
-    const FeedbackType m_feedback;
-    const PABotBaseLevel m_min_pabotbase_level;
-    const bool m_allow_commands_while_running;
-
-    const size_t m_min_switches;
-    const size_t m_max_switches;
-    const size_t m_default_switches;
+    virtual std::unique_ptr<PanelSession> make_panel() const override;
 };
 
 
 
-
-//
-//  As of this writing, this class will never be called in a manner where
-//  thread-safety is of concern with one exception: config options
-//
-//  Here is the curent status:
-//
-//  Called from UI thread:
-//    - Construction/destruction
-//    - from/to_json()
-//    - restore_defaults()
-//
-//  Called from program thread:
-//    - program()
-//
-//  Called from both UI and program threads:
-//    - check_validity()
-//    - All config options.
-//
-//  With the exception of the configs, nothing will be called concurrently from
-//  different threads.
-//
-class MultiSwitchProgramInstance{
+class MultiSwitchProgramInstance : public GameConsole::MultiConsoleProgramInstance{
 public:
-    virtual ~MultiSwitchProgramInstance();
-    MultiSwitchProgramInstance(const MultiSwitchProgramInstance&) = delete;
-    void operator=(const MultiSwitchProgramInstance&) = delete;
-
-    MultiSwitchProgramInstance(
-        const std::vector<std::string>& error_notification_tags = {"Notifs"}
-    );
+    using GameConsole::MultiConsoleProgramInstance::MultiConsoleProgramInstance;
 
     virtual void program(MultiSwitchProgramEnvironment& env, CancellableScope& scope) = 0;
 
 
 public:
-    //  Settings
-
-    virtual void from_json(const JsonValue& json);
-    virtual JsonValue to_json() const;
-
-    virtual std::string check_validity() const;
-    virtual void restore_defaults();
-
-    //  Called when the # of Switches changes.
-    virtual void update_active_consoles(size_t switch_count){}
-
-
-protected:
-    friend class MultiSwitchProgramOption;
-
-    BatchOption m_options;
-    void add_option(ConfigOption& option, std::string serialization_string);
-
+    //  Startup Checks: Feel free to override to change behavior.
+
+    virtual void run_start_program_checks(
+        const ProgramDescriptor& descriptor,
+        ProgramEnvironment& env
+    ) override;
+    virtual void start_program_border_check(
+        VideoStream& stream, size_t console_index,
+        FeedbackType feedback_type
+    );
 
-public:
-    EventNotificationOption NOTIFICATION_PROGRAM_FINISH;
-    EventNotificationOption NOTIFICATION_ERROR_RECOVERABLE;
-    EventNotificationOption NOTIFICATION_ERROR_FATAL;
+private:
+    virtual void program(GameConsole::MultiConsoleProgramEnvironment& env, CancellableScope& scope) override;
 };
 
 
 
-
-template <typename Descriptor, typename Instance>
-class MultiSwitchProgramWrapper : public Descriptor{
+#if 0
+template <typename Instance>
+class MultiSwitchProgramWrapper : public Instance::Descriptor{
 public:
     virtual std::unique_ptr<MultiSwitchProgramInstance> make_instance() const override{
         return std::unique_ptr<MultiSwitchProgramInstance>(new Instance());
     }
 };
+#endif
+
+
+template <typename Instance>
+using MultiSwitchProgramWrapper = GameConsole::MultiConsoleProgramWrapper<Instance>;
 
-template <typename Descriptor, typename Instance>
-std::unique_ptr<PanelDescriptor> make_multi_switch_program(){
-    return std::make_unique<MultiSwitchProgramWrapper<Descriptor, Instance>>();
+template <typename Instance>
+std::unique_ptr<PanelDescriptor> make_MultiSwitchProgram(){
+    return std::make_unique<MultiSwitchProgramWrapper<Instance>>();
 }
 
 
diff --git a/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_Panels.cpp b/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_Panels.cpp
index aef02dc320..2979a83f4b 100644
--- a/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_Panels.cpp
+++ b/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_Panels.cpp
@@ -1,16 +1,20 @@
 /*  Nintendo Switch Panels
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include "CommonFramework/GlobalSettingsPanel.h"
+#include "CommonFramework/StaticGlobals.h"
+#include "CommonFramework/GlobalAutoPaths.h"
 #include "NintendoSwitch_Panels.h"
 
-#include "NintendoSwitch_Settings.h"
+#include "NintendoSwitch_SettingsPanel.h"
 
-#include "Programs/NintendoSwitch_VirtualConsole.h"
-#include "Programs/NintendoSwitch_SwitchViewer.h"
+#include "GameConsole/Panels/GameConsole_VirtualConsole.h"
+#include "GameConsole/Panels/GameConsole_MultiConsoleViewer.h"
+#include "GameConsole/Panels/GameConsole_SnapshotDumper.h"
+#include "GameConsole/Panels/GameConsole_BoxDraw.h"
+#include "GameConsole/Panels/GameConsole_WaterfillTemplateMaker.h"
 
 #include "Programs/NintendoSwitch_TurboA.h"
 #include "Programs/NintendoSwitch_TurboButton.h"
@@ -19,14 +23,19 @@
 #include "Programs/NintendoSwitch_PreventSleep.h"
 #include "Programs/NintendoSwitch_FriendCodeAdder.h"
 #include "Programs/NintendoSwitch_FriendDelete.h"
+#include "Programs/NintendoSwitch_RecordKeyboardController.h"
+#include "Programs/Typewriter/NintendoSwitch_Typewriter.h"
 
-#include "DevPrograms/BoxDraw.h"
-#include "Programs/NintendoSwitch_SnapshotDumper.h"
+#include "Programs/NintendoSwitch_MenuStabilityTester.h"
 #include "DevPrograms/TestProgramComputer.h"
 #include "DevPrograms/TestProgramSwitch.h"
+#include "DevPrograms/JoyconProgram.h"
+#include "DevPrograms/TestDudunsparceFormDetector.h"
 #include "Pokemon/Inference/Pokemon_TrainIVCheckerOCR.h"
 #include "Pokemon/Inference/Pokemon_TrainPokemonOCR.h"
 
+#include "ComputerPrograms/ComputerPrograms_UnitTestRunner.h"
+
 #ifdef PA_OFFICIAL
 #include "../../Internal/SerialPrograms/NintendoSwitch_TestPrograms.h"
 #endif
@@ -37,40 +46,54 @@ namespace NintendoSwitch{
 
 
 PanelListFactory::PanelListFactory()
-    : PanelListDescriptor("Nintendo Switch")
+    : PanelListDescriptor(
+        "Nintendo Switch",
+        RESOURCE_PATH() + "CategoryIcons/NintendoSwitch.png"
+    )
 {}
 
 std::vector<PanelEntry> PanelListFactory::make_panels() const{
     std::vector<PanelEntry> ret;
 
     ret.emplace_back("---- Settings ----");
-    ret.emplace_back(make_settings<ConsoleSettings_Descriptor, ConsoleSettingsPanel>());
+    ret.emplace_back(make_OptionsPanel<ConsoleSettingsPanel>());
 
     ret.emplace_back("---- Virtual Consoles ----");
-    ret.emplace_back(make_panel<VirtualConsole_Descriptor, VirtualConsole>());
-    ret.emplace_back(make_panel<SwitchViewer_Descriptor, SwitchViewer>());
+    ret.emplace_back(GameConsole::make_ConsolePanel<GameConsole::VirtualConsole>());
+    ret.emplace_back(GameConsole::make_ConsolePanel<GameConsole::MultiControllerTester>());
+    ret.emplace_back(GameConsole::make_MultiConsolePanel<GameConsole::MultiConsoleViewer>());
+//    ret.emplace_back(make_panel<SwitchViewer_Descriptor, SwitchViewer>());
 
     ret.emplace_back("---- Programs ----");
-    ret.emplace_back(make_single_switch_program<TurboA_Descriptor, TurboA>());
-    ret.emplace_back(make_single_switch_program<TurboButton_Descriptor, TurboButton>());
-    ret.emplace_back(make_single_switch_program<TurboMacro_Descriptor, TurboMacro>());
-    ret.emplace_back(make_single_switch_program<PushJoySticks_Descriptor, PushJoySticks>());
-    ret.emplace_back(make_single_switch_program<PreventSleep_Descriptor, PreventSleep>());
-    ret.emplace_back(make_single_switch_program<FriendCodeAdder_Descriptor, FriendCodeAdder>());
-    ret.emplace_back(make_single_switch_program<FriendDelete_Descriptor, FriendDelete>());
-
-//    ret.emplace_back("---- " + STRING_POKEMON + " Home ----");
-
-    if (PreloadSettings::instance().DEVELOPER_MODE){
+    ret.emplace_back(make_SingleSwitchProgram<TurboA>());
+    ret.emplace_back(make_SingleSwitchProgram<TurboButton>());
+    ret.emplace_back(make_SingleSwitchProgram<TurboMacro>());
+    ret.emplace_back(make_SingleSwitchProgram<PushJoySticks>());
+    ret.emplace_back(make_SingleSwitchProgram<PreventSleep>());
+    ret.emplace_back(make_SingleSwitchProgram<FriendCodeAdder>());
+    ret.emplace_back(make_SingleSwitchProgram<FriendDelete>());
+    ret.emplace_back(make_SingleSwitchProgram<RecordKeyboardController>());
+    ret.emplace_back(make_SingleSwitchProgram<Typewriter::Typewriter>());
+
+    ret.emplace_back("---- Testing ----");
+    ret.emplace_back(GameConsole::make_ConsolePanel<GameConsole::BoxDraw>());
+    ret.emplace_back(GameConsole::make_ConsoleProgram<GameConsole::SnapshotDumper>());
+
+    if (STATIC_GLOBALS.DEVELOPER_MODE){
         ret.emplace_back("---- Developer Tools ----");
-        ret.emplace_back(make_single_switch_program<BoxDraw_Descriptor, BoxDraw>());
-        ret.emplace_back(make_single_switch_program<SnapshotDumper_Descriptor, SnapshotDumper>());
-        ret.emplace_back(make_computer_program<TestProgramComputer_Descriptor, TestProgramComputer>());
-        ret.emplace_back(make_multi_switch_program<TestProgram_Descriptor, TestProgram>());
-        ret.emplace_back(make_computer_program<Pokemon::TrainIVCheckerOCR_Descriptor, Pokemon::TrainIVCheckerOCR>());
-        ret.emplace_back(make_computer_program<Pokemon::TrainPokemonOCR_Descriptor, Pokemon::TrainPokemonOCR>());
+        ret.emplace_back(make_SingleSwitchProgram<MenuStabilityTester>());
+        ret.emplace_back(make_ComputerProgram<TestProgramComputer>());
+        ret.emplace_back(make_MultiSwitchProgram<TestProgram>());
+        ret.emplace_back(make_SingleSwitchProgram<JoyconProgram>());
+        ret.emplace_back(GameConsole::make_ConsoleProgram<GameConsole::WaterfillTemplateMaker>());
+        ret.emplace_back(make_ComputerProgram<Pokemon::TrainIVCheckerOCR>());
+        ret.emplace_back(make_ComputerProgram<Pokemon::TrainPokemonOCR>());
+        ret.emplace_back(make_SingleSwitchProgram<TestDudunsparceFormDetector>());
+        ret.emplace_back(make_ComputerProgram<ComputerPrograms::UnitTestRunner>());
 #ifdef PA_OFFICIAL
-        add_panels(ret);
+        if (STATIC_GLOBALS.INTERNAL_DEVELOPER_MODE){
+            add_panels(ret);
+        }
 #endif
     }
 
diff --git a/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_Panels.h b/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_Panels.h
index f1396019a8..d88acdd0d1 100644
--- a/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_Panels.h
+++ b/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_Panels.h
@@ -1,6 +1,6 @@
 /*  Nintendo Switch Panels
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -17,7 +17,8 @@ namespace NintendoSwitch{
 class PanelListFactory : public PanelListDescriptor{
 public:
     PanelListFactory();
-    virtual std::vector<PanelEntry> make_panels() const;
+private:
+    virtual std::vector<PanelEntry> make_panels() const override;
 };
 
 
diff --git a/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_Settings.cpp b/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_Settings.cpp
index 7e300e6fb8..3e60ada3f1 100644
--- a/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_Settings.cpp
+++ b/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_Settings.cpp
@@ -1,94 +1,199 @@
 /*  Nintendo Switch Settings Panel
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
+#include "CommonFramework/StaticGlobals.h"
 #include "NintendoSwitch_Settings.h"
 
-#include <iostream>
-using std::cout;
-using std::endl;
+//#include <iostream>
+//using std::cout;
+//using std::endl;
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
 
+using namespace std::chrono_literals;
+
 
 const Resolution DEFAULT_RESOLUTION(1920, 1080);
 
 
+
+TimingOptions::TimingOptions()
+    : GroupOption(
+        "Controller Timing Options",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        EnableMode::ALWAYS_ENABLED,
+        true,
+        false
+    )
+    , WIRED(
+        "<b>Wired Controller Timing Variation:</b><br>"
+        "Assume that wired microcontrollers have a timing variation of no greater than this. "
+        "This is used to adjust button delays to ensure they go through correctly.",
+        LockMode::LOCK_WHILE_RUNNING,
+        0ms, 200ms, "0 ms"
+    )
+    , WIRELESS(
+        "<b>Wireless Timing Variation:</b><br>"
+        "Assume that wireless controllers have a timing variation of no greater than this. "
+        "This is used to adjust button delays to ensure they go through correctly.",
+        LockMode::LOCK_WHILE_RUNNING,
+        0ms, 200ms, "10 ms"
+    )
+    , SYSBOTBASE(
+        "<b>sys-botbase 2 Timing Variation:</b><br>"
+        "Assume that sys-botbase 2 controllers have a timing variation of no greater than this. "
+        "This is used to adjust button delays to ensure they go through correctly.<br>"
+        "sys-botbase 3 does not use this option since it is as stable as a wired microcontroller "
+        "and is therefore categorized accordingly.",
+        LockMode::LOCK_WHILE_RUNNING,
+        0ms, 200ms, "150 ms"
+    )
+{
+    PA_ADD_OPTION(WIRED);
+    PA_ADD_OPTION(WIRELESS);
+    PA_ADD_OPTION(SYSBOTBASE);
+}
+
+
+
+
+
 ConsoleSettings& ConsoleSettings::instance(){
     static ConsoleSettings settings;
     return settings;
 }
 ConsoleSettings::ConsoleSettings()
-    : BatchOption(LockWhileRunning::LOCKED)
-    , CONNECT_CONTROLLER_DELAY(
-        "<b>Connection Controller Delay:</b><br>Wait this long before starting the program. The LEDs normally flash during this time.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "5 * TICKS_PER_SECOND"
-    )
-    , SETTINGS_TO_HOME_DELAY(
+    : BatchOption(LockMode::LOCK_WHILE_RUNNING)
+    , TRUST_USER_CONSOLE_SELECTION(
+        "<b>Trust User Console Selection:</b><br>"
+        "Trust that the user's selection for the console type (Switch 1 vs. Switch 2) is correct.<br>"
+        "Do not cross-check it. Do not stop the program if it disagrees with the user selection.<br>"
+        "Don't enable this option unless you are encountering issues.",
+        LockMode::LOCK_WHILE_RUNNING,
+        false
+    )
+    , BLIND_START_GAME_MASH(
+        "<b>Blind Start Game Mash:</b><br>Mash A for this long to start the game when video inference is unavailable.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "2000 ms"
+    )
+    , CLOSE_GAME_DELAY(
+        "<b>Close Game Delay:</b><br>Delay from closing a game to when it's actually closed.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "2000 ms"
+    )
+    , SETTINGS_TO_HOME_DELAY0(
         "<b>Settings to Home Delay:</b><br>Delay from pressing home anywhere in the settings to return to the home menu.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "120"
+        LockMode::LOCK_WHILE_RUNNING,
+        "960 ms"
     )
     , START_GAME_REQUIRES_INTERNET(
         "<b>Start Game Requires Internet:</b><br>"
         "Set this to true if starting the game requires checking the internet. "
         "Otherwise, programs that require soft-resetting may not work properly.",
-        LockWhileRunning::LOCKED,
+        LockMode::LOCK_WHILE_RUNNING,
         false
     )
-    , START_GAME_INTERNET_CHECK_DELAY(
+    , START_GAME_INTERNET_CHECK_DELAY0(
         "<b>Start Game Internet Check Delay:</b><br>"
         "If starting the game requires checking the internet, wait this long for it.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "3 * TICKS_PER_SECOND"
+        LockMode::LOCK_WHILE_RUNNING,
+        "3000 ms"
     )
     , TOLERATE_SYSTEM_UPDATE_MENU_FAST(
         "<b>Tolerate System Update Menu (fast):</b><br>"
         "Some programs can bypass the system update menu at little performance cost. Setting this to true enables this.",
-        LockWhileRunning::LOCKED,
+        LockMode::LOCK_WHILE_RUNNING,
         true
     )
     , TOLERATE_SYSTEM_UPDATE_MENU_SLOW(
-        "<b>Tolerate System Update Menu (slow):</b><br"
-        ">Some programs can bypass the system update menu, but will take a noticeable performance hit. "
+        "<b>Tolerate System Update Menu (slow):</b><br>"
+        "Some programs can bypass the system update menu, but will take a noticeable performance hit. "
         "Setting this to true enables this.",
-        LockWhileRunning::LOCKED,
+        LockMode::LOCK_WHILE_RUNNING,
+        false
+    )
+    , ENABLE_SBB3_PINGS(
+        "<b>Enable sys-botbase 3 Pings:</b><br>"
+        "Use sys-botbase's ping command for latency measurement instead of \"getVersion\".",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        true
+    )
+    , ENABLE_SBB3_LOGGING(
+        "<b>Enable sys-botbase 3 Logging:</b><br>"
+        "Tell sys-botbase 3 to log its activity to its own log.",
+        LockMode::UNLOCK_WHILE_RUNNING,
         false
     )
+    , DATE_MENU_OPEN_SWITCH2_0(
+        "<b>Open Date Menu (Switch 2):</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        "208 ms"
+    )
+    , DATE_MENU_CLOSE_SWITCH2_0(
+        "<b>Close Date Menu (Switch 2):</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        "264 ms"
+    )
+    , CODEBOARD_ENTRY_SWITCH1_WIRED(
+        "Fast Code Entry Timings (Switch 1 Wired Controller)",
+        false,
+        ControllerPerformanceClass::SerialPABotBase_Wired
+    )
+    , CODEBOARD_ENTRY_SWITCH1_WIRELESS(
+        "Fast Code Entry Timings (Switch 1 Wireless Controller)",
+        false,
+        ControllerPerformanceClass::SerialPABotBase_Wireless
+    )
+    , CODEBOARD_ENTRY_SWITCH2_WIRED(
+        "Fast Code Entry Timings (Switch 2 Wired Controller)",
+        true,
+        ControllerPerformanceClass::SerialPABotBase_Wired
+    )
+    , CODEBOARD_ENTRY_SWITCH2_WIRELESS(
+        "Fast Code Entry Timings (Switch 2 Wireless Controller)",
+        true,
+        ControllerPerformanceClass::SerialPABotBase_Wireless
+    )
+    , KEYBOARD_SECTION("<font size=4><b>Keyboard to Controller Mappings:</b></font>")
 {
-    PA_ADD_OPTION(CONNECT_CONTROLLER_DELAY);
-    PA_ADD_OPTION(SETTINGS_TO_HOME_DELAY);
+    PA_ADD_OPTION(CONTROLLER_SETTINGS);
+    PA_ADD_OPTION(TRUST_USER_CONSOLE_SELECTION);
+    PA_ADD_OPTION(BLIND_START_GAME_MASH);
+    PA_ADD_OPTION(CLOSE_GAME_DELAY);
+    PA_ADD_OPTION(SETTINGS_TO_HOME_DELAY0);
     PA_ADD_OPTION(START_GAME_REQUIRES_INTERNET);
-    PA_ADD_OPTION(START_GAME_INTERNET_CHECK_DELAY);
+    PA_ADD_OPTION(START_GAME_INTERNET_CHECK_DELAY0);
     PA_ADD_OPTION(TOLERATE_SYSTEM_UPDATE_MENU_FAST);
     PA_ADD_OPTION(TOLERATE_SYSTEM_UPDATE_MENU_SLOW);
+    PA_ADD_OPTION(ENABLE_SBB3_PINGS);
+    PA_ADD_OPTION(ENABLE_SBB3_LOGGING);
+    PA_ADD_OPTION(TIMING_OPTIONS);
+    PA_ADD_OPTION(DATE_MENU_OPEN_SWITCH2_0);
+    PA_ADD_OPTION(DATE_MENU_CLOSE_SWITCH2_0);
+    if (STATIC_GLOBALS.DEVELOPER_MODE){
+        PA_ADD_OPTION(CODEBOARD_ENTRY_SWITCH1_WIRED);
+        PA_ADD_OPTION(CODEBOARD_ENTRY_SWITCH1_WIRELESS);
+        PA_ADD_OPTION(CODEBOARD_ENTRY_SWITCH2_WIRED);
+        PA_ADD_OPTION(CODEBOARD_ENTRY_SWITCH2_WIRELESS);
+        PA_ADD_OPTION(KEYBOARD_CONTROLLER_TIMINGS);
+    }
+    PA_ADD_STATIC(KEYBOARD_SECTION);
+    PA_ADD_OPTION(KEYBOARD_MAPPINGS);
+}
+void ConsoleSettings::load_json(const JsonValue& json){
+    if (m_loaded){
+        return;
+    }
+    m_loaded = true;
+    BatchOption::load_json(json);
 }
 
 
-ConsoleSettings_Descriptor::ConsoleSettings_Descriptor()
-    : PanelDescriptor(
-        Color(),
-        "NintendoSwitch:GlobalSettings",
-        "Nintendo Switch", "Framework Settings",
-        "ComputerControl/blob/master/Wiki/Programs/NintendoSwitch/FrameworkSettings.md",
-        "Switch Framework Settings"
-    )
-{}
-
-ConsoleSettingsPanel::ConsoleSettingsPanel(const ConsoleSettings_Descriptor& descriptor)
-    : SettingsPanelInstance(descriptor)
-    , settings(ConsoleSettings::instance())
-{
-    PA_ADD_OPTION(settings);
-}
 
 
 
diff --git a/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_Settings.h b/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_Settings.h
index 2ca82ad312..3d40a11d46 100644
--- a/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_Settings.h
+++ b/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_Settings.h
@@ -1,6 +1,6 @@
 /*  Nintendo Switch Settings
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -8,10 +8,12 @@
 #define PokemonAutomation_NintendoSwitch_Settings_H
 
 #include "Common/Cpp/ImageResolution.h"
+#include "Common/Cpp/Options/StaticTextOption.h"
 #include "Common/Cpp/Options/BooleanCheckBoxOption.h"
-#include "Common/Cpp/Options/StringOption.h"
-#include "Common/Cpp/Options/TimeExpressionOption.h"
-#include "CommonFramework/Panels/SettingsPanel.h"
+#include "Common/Cpp/Options/TimeDurationOption.h"
+#include "Options/NintendoSwitch_CodeEntrySettingsOption.h"
+#include "Controllers/NintendoSwitch_ControllerSettings.h"
+#include "Controllers/NintendoSwitch_KeyboardMapping.h"
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
@@ -20,39 +22,62 @@ namespace NintendoSwitch{
 extern const Resolution DEFAULT_RESOLUTION;
 
 
+class TimingOptions : public GroupOption{
+public:
+    TimingOptions();
+
+public:
+    MillisecondsOption WIRED;
+    MillisecondsOption WIRELESS;
+    MillisecondsOption SYSBOTBASE;
+};
+
 
 class ConsoleSettings : public BatchOption{
     ConsoleSettings();
+    virtual void load_json(const JsonValue& json) override;
 public:
     static ConsoleSettings& instance();
 
-    TimeExpressionOption<uint16_t> CONNECT_CONTROLLER_DELAY;
-    TimeExpressionOption<uint16_t> SETTINGS_TO_HOME_DELAY;
+    ControllerSettingsTable CONTROLLER_SETTINGS;
+
+    BooleanCheckBoxOption TRUST_USER_CONSOLE_SELECTION;
+    MillisecondsOption BLIND_START_GAME_MASH;
+    MillisecondsOption CLOSE_GAME_DELAY;
+    MillisecondsOption SETTINGS_TO_HOME_DELAY0;
     BooleanCheckBoxOption START_GAME_REQUIRES_INTERNET;
-    TimeExpressionOption<uint16_t> START_GAME_INTERNET_CHECK_DELAY;
+    MillisecondsOption START_GAME_INTERNET_CHECK_DELAY0;
     BooleanCheckBoxOption TOLERATE_SYSTEM_UPDATE_MENU_FAST;
     BooleanCheckBoxOption TOLERATE_SYSTEM_UPDATE_MENU_SLOW;
-};
-
 
+    BooleanCheckBoxOption ENABLE_SBB3_PINGS;
+    BooleanCheckBoxOption ENABLE_SBB3_LOGGING;
 
+    TimingOptions TIMING_OPTIONS;
 
+    MillisecondsOption DATE_MENU_OPEN_SWITCH2_0;
+    MillisecondsOption DATE_MENU_CLOSE_SWITCH2_0;
 
-class ConsoleSettings_Descriptor : public PanelDescriptor{
-public:
-    ConsoleSettings_Descriptor();
-};
+    CodeboardTimingsOption CODEBOARD_ENTRY_SWITCH1_WIRED;
+    CodeboardTimingsOption CODEBOARD_ENTRY_SWITCH1_WIRELESS;
+    CodeboardTimingsOption CODEBOARD_ENTRY_SWITCH2_WIRED;
+    CodeboardTimingsOption CODEBOARD_ENTRY_SWITCH2_WIRELESS;
+    KeyboardControllerTimingsOption KEYBOARD_CONTROLLER_TIMINGS;
 
+    SectionDividerOption KEYBOARD_SECTION;
+    KeyboardMappingOption KEYBOARD_MAPPINGS;
 
-class ConsoleSettingsPanel : public SettingsPanelInstance{
-public:
-    ConsoleSettingsPanel(const ConsoleSettings_Descriptor& descriptor);
 private:
-    ConsoleSettings& settings;
+    bool m_loaded = false;
 };
 
 
 
+
+
+
+
+
 }
 }
 #endif
diff --git a/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_SettingsPanel.cpp b/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_SettingsPanel.cpp
new file mode 100644
index 0000000000..24953cc2f3
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_SettingsPanel.cpp
@@ -0,0 +1,43 @@
+/*  Nintendo Switch Settings Panel
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "NintendoSwitch_SettingsPanel.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+
+ConsoleSettings_Descriptor::ConsoleSettings_Descriptor()
+    : OptionsPanelDescriptor(
+        "NintendoSwitch:GlobalSettings",
+        "Nintendo Switch", "Nintendo Switch Settings",
+        "Programs/NintendoSwitch/FrameworkSettings.html",
+        "Switch Framework Settings",
+        PanelQualityStanding::OFFICIAL
+    )
+{}
+
+ConsoleSettingsPanel::ConsoleSettingsPanel()
+    : settings(ConsoleSettings::instance())
+{
+    PA_ADD_OPTION(settings);
+}
+
+
+
+
+}
+}
+
+
+
+
+
+
diff --git a/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_SettingsPanel.h b/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_SettingsPanel.h
new file mode 100644
index 0000000000..a1714fc803
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_SettingsPanel.h
@@ -0,0 +1,39 @@
+/*  Nintendo Switch Settings Panel
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_NintendoSwitch_SettingsPanel_H
+#define PokemonAutomation_NintendoSwitch_SettingsPanel_H
+
+
+#include "CommonFramework/Panels/OptionsPanel.h"
+#include "NintendoSwitch_Settings.h"
+
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+
+
+
+class ConsoleSettings_Descriptor : public OptionsPanelDescriptor{
+public:
+    ConsoleSettings_Descriptor();
+};
+
+
+class ConsoleSettingsPanel : public OptionsPanelInstance{
+public:
+    using Descriptor = ConsoleSettings_Descriptor;
+    ConsoleSettingsPanel();
+private:
+    ConsoleSettings& settings;
+};
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_SingleSwitchProgram.cpp b/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_SingleSwitchProgram.cpp
index d281c29219..8f4e94ab65 100644
--- a/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_SingleSwitchProgram.cpp
+++ b/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_SingleSwitchProgram.cpp
@@ -1,87 +1,131 @@
 /*  Single Switch Program Template
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include "Common/Cpp/Json/JsonValue.h"
+//#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonFramework/Exceptions/FatalProgramException.h"
+#include "CommonFramework/Exceptions/OperationFailedException.h"
+#include "CommonFramework/GlobalSettingsPanel.h"
+#include "CommonTools/StartupChecks/StartProgramChecks.h"
+#include "Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "Framework/NintendoSwitch_SingleSwitchProgramSession.h"
 #include "NintendoSwitch_SingleSwitchProgram.h"
-#include "Framework/NintendoSwitch_SingleSwitchProgramOption.h"
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
 
 
 
+SingleSwitchProgramEnvironment::SingleSwitchProgramEnvironment(
+    const ProgramInfo& program_info,
+    CancellableScope& scope,
+    ProgramSession& session,
+    StatsTracker* current_stats,
+    const StatsTracker* historical_stats,
+    GameConsole::ConsoleSystemSession& system
+)
+    : GameConsole::ConsoleProgramEnvironment(
+        program_info,
+        scope,
+        session,
+        current_stats,
+        historical_stats,
+        std::make_unique<ConsoleHandle>(system)
+    )
+    , console(static_cast<ConsoleHandle&>(ConsoleProgramEnvironment::console()))
+{}
+
 SingleSwitchProgramDescriptor::SingleSwitchProgramDescriptor(
     std::string identifier,
     std::string category, std::string display_name,
     std::string doc_link,
     std::string description,
+    PanelQualityStanding standing,
+    ProgramControllerClass controller_class,
     FeedbackType feedback,
     AllowCommandsWhenRunning allow_commands_while_running,
-    PABotBaseLevel min_pabotbase_level
+    std::vector<std::string> required_resources
 )
-    : ProgramDescriptor(
-        pick_color(feedback, min_pabotbase_level),
+    : GameConsole::ConsoleProgramDescriptor(
         std::move(identifier),
         std::move(category), std::move(display_name),
         std::move(doc_link),
-        std::move(description)
+        std::move(description),
+        standing,
+        controller_class,
+        feedback,
+        allow_commands_while_running,
+        std::move(required_resources)
     )
-    , m_feedback(feedback)
-    , m_min_pabotbase_level(min_pabotbase_level)
-    , m_allow_commands_while_running(allow_commands_while_running == AllowCommandsWhenRunning::ENABLE_COMMANDS)
 {}
-std::unique_ptr<PanelInstance> SingleSwitchProgramDescriptor::make_panel() const{
-    return std::unique_ptr<PanelInstance>(new SingleSwitchProgramOption(*this));
+std::unique_ptr<PanelSession> SingleSwitchProgramDescriptor::make_panel() const{
+    return std::make_unique<SingleSwitchProgramSession>(*this);
 }
 
 
 
-SingleSwitchProgramInstance::~SingleSwitchProgramInstance() = default;
-SingleSwitchProgramInstance::SingleSwitchProgramInstance(
-    const std::vector<std::string>& error_notification_tags
-)
-    : m_options(LockWhileRunning::UNLOCKED)
-    , NOTIFICATION_PROGRAM_FINISH(
-        "Program Finished",
-        true, true,
-        ImageAttachmentMode::JPG,
-        {"Notifs"}
-    )
-    , NOTIFICATION_ERROR_RECOVERABLE(
-        "Program Error (Recoverable)",
-        true, false,
-        ImageAttachmentMode::PNG,
-        error_notification_tags
-
-    )
-    , NOTIFICATION_ERROR_FATAL(
-        "Program Error (Fatal)",
-        true, true,
-        ImageAttachmentMode::PNG,
-        error_notification_tags
-    )
-{}
-void SingleSwitchProgramInstance::add_option(ConfigOption& option, std::string serialization_string){
-    m_options.add_option(option, std::move(serialization_string));
+void SingleSwitchProgramInstance::program(GameConsole::ConsoleProgramEnvironment& env, CancellableScope& scope){
+    program(static_cast<SingleSwitchProgramEnvironment&>(env), scope);
 }
-void SingleSwitchProgramInstance::from_json(const JsonValue& json){
-    m_options.load_json(json);
+void SingleSwitchProgramInstance::program(SingleSwitchProgramEnvironment& env, CancellableScope& scope){
+    ProControllerContext context(scope, env.console.controller<ProController>());
+    if (!context->is_ready()){
+        throw UserSetupError(context->logger(), "Controller is not ready.");
+    }
+
+    auto record_debug_video = [&](){
+        if (GlobalSettings::instance().SAVE_DEBUG_VIDEOS_ON_SWITCH){
+            context.controller().cancel_all_commands();
+            env.log("Saving debug video on Switch...");
+            env.console.overlay().add_log("Save Debug Video on Switch");
+            pbf_press_button(context, BUTTON_CAPTURE, 2000ms, 0ms);
+            context.wait_for_all_requests();
+        }
+    };
+
+    try{
+        program(env, context);
+    }catch (FatalProgramException&){
+        record_debug_video();
+        throw;
+    }catch (OperationFailedException&){
+        record_debug_video();
+        throw;
+    }
 }
-JsonValue SingleSwitchProgramInstance::to_json() const{
-    return m_options.to_json();
+void SingleSwitchProgramInstance::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    throw InternalProgramError(&env.logger(), PA_CURRENT_FUNCTION, "Not implemented.");
 }
-std::string SingleSwitchProgramInstance::check_validity() const{
-    return m_options.check_validity();
+
+
+void SingleSwitchProgramInstance::run_start_program_checks(
+    const ProgramDescriptor& descriptor,
+    ProgramEnvironment& env
+){
+    const GameConsole::ConsoleProgramDescriptor& ldescriptor = dynamic_cast<const GameConsole::ConsoleProgramDescriptor&>(descriptor);
+    GameConsole::ConsoleProgramEnvironment& lenv = dynamic_cast<GameConsole::ConsoleProgramEnvironment&>(env);
+    start_program_feedback_check(ldescriptor, lenv.console());
+    start_program_border_check(lenv.console(), ldescriptor.feedback());
 }
-void SingleSwitchProgramInstance::restore_defaults(){
-    return m_options.restore_defaults();
+void SingleSwitchProgramInstance::start_program_border_check(
+    VideoStream& stream,
+    FeedbackType feedback_type
+){
+    switch (feedback_type){
+    case FeedbackType::NONE:
+        return;
+    case FeedbackType::OPTIONAL_:
+    case FeedbackType::REQUIRED:
+    case FeedbackType::VIDEO_AUDIO:
+        StartProgramChecks::check_border(stream);
+    }
 }
 
 
 
 
+
 }
 }
diff --git a/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h b/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h
index 9e8f190614..9c464ca3a7 100644
--- a/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h
+++ b/SerialPrograms/Source/NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h
@@ -1,154 +1,122 @@
 /*  Single Switch Program
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifndef PokemonAutomation_NintendoSwitch_SingleSwitchProgram_H
 #define PokemonAutomation_NintendoSwitch_SingleSwitchProgram_H
 
-#include "Common/Compiler.h"
-#include "Common/Cpp/Options/BatchOption.h"
 #include "CommonFramework/Globals.h"
-#include "CommonFramework/Notifications/EventNotificationOption.h"
-#include "CommonFramework/ControllerDevices/SerialPortGlobals.h"
-#include "CommonFramework/Tools/ProgramEnvironment.h"
-#include "CommonFramework/Tools/ConsoleHandle.h"
 #include "CommonFramework/Panels/ProgramDescriptor.h"
+#include "CommonFramework/Tools/ProgramEnvironment.h"
+#include "GameConsole/ConsoleProgram.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+#include "NintendoSwitch/NintendoSwitch_ConsoleHandle.h"
 
 namespace PokemonAutomation{
-    class BotBaseContext;
+    class ControllerSession;
 namespace NintendoSwitch{
 
 
+class SwitchSystemSession;
 class SingleSwitchProgramInstance;
 
 
-class SingleSwitchProgramEnvironment : public ProgramEnvironment{
+class SingleSwitchProgramEnvironment : public GameConsole::ConsoleProgramEnvironment{
 public:
-    ConsoleHandle console;
+    ConsoleHandle& console;
 
-private:
+public:
     friend class SingleSwitchProgramSession;
     friend class SingleSwitchProgramWidget;
-    template <class... Args>
+
     SingleSwitchProgramEnvironment(
         const ProgramInfo& program_info,
         CancellableScope& scope,
         ProgramSession& session,
         StatsTracker* current_stats,
         const StatsTracker* historical_stats,
-        Args&&... args
-    )
-        : ProgramEnvironment(program_info, session, current_stats, historical_stats)
-        , console(0, std::forward<Args>(args)...)
-    {
-        console.initialize_inference_threads(scope, inference_dispatcher());
-    }
+        GameConsole::ConsoleSystemSession& system
+    );
 };
 
 
-class SingleSwitchProgramDescriptor : public ProgramDescriptor{
+
+class SingleSwitchProgramDescriptor : public GameConsole::ConsoleProgramDescriptor{
 public:
     SingleSwitchProgramDescriptor(
         std::string identifier,
         std::string category, std::string display_name,
         std::string doc_link,
         std::string description,
+        PanelQualityStanding standing,
+        ProgramControllerClass controller_class,
         FeedbackType feedback,
         AllowCommandsWhenRunning allow_commands_while_running,
-        PABotBaseLevel min_pabotbase_level
+        std::vector<std::string> required_resources = {}
     );
 
-    FeedbackType feedback() const{ return m_feedback; }
-    PABotBaseLevel min_pabotbase_level() const{ return m_min_pabotbase_level; }
-    bool allow_commands_while_running() const{ return m_allow_commands_while_running; }
-
-    virtual std::unique_ptr<PanelInstance> make_panel() const override;
-    virtual std::unique_ptr<SingleSwitchProgramInstance> make_instance() const = 0;
-
-private:
-    const FeedbackType m_feedback;
-    const PABotBaseLevel m_min_pabotbase_level;
-    const bool m_allow_commands_while_running;
+    virtual std::unique_ptr<PanelSession> make_panel() const override;
 };
 
 
 
-
-
-
-//
-//  As of this writing, this class will never be called in a manner where
-//  thread-safety is of concern with one exception: config options
-//
-//  Here is the curent status:
-//
-//  Called from UI thread:
-//    - Construction/destruction
-//    - from/to_json()
-//    - restore_defaults()
-//
-//  Called from program thread:
-//    - program()
-//
-//  Called from both UI and program threads:
-//    - check_validity()
-//    - All config options.
-//
-//  With the exception of the configs, nothing will be called concurrently from
-//  different threads.
-//
-class SingleSwitchProgramInstance{
+class SingleSwitchProgramInstance : public GameConsole::ConsoleProgramInstance{
 public:
-    virtual ~SingleSwitchProgramInstance();
-    SingleSwitchProgramInstance(const SingleSwitchProgramInstance&) = delete;
-    void operator=(const SingleSwitchProgramInstance&) = delete;
+    using GameConsole::ConsoleProgramInstance::ConsoleProgramInstance;
 
-    SingleSwitchProgramInstance(
-        const std::vector<std::string>& error_notification_tags = {"Notifs"}
-    );
-
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) = 0;
+    //  Called by SingleSwitchProgramSession::run_program_instance() to start an automation program.
+    //  Child classes should override one of the overloaded functions.
+    virtual void program(SingleSwitchProgramEnvironment& env, CancellableScope& scope);
+    //  Called by SingleSwitchProgramSession::run_program_instance() to start an automation program.
+    //  Child classes should override one of the overloaded functions.
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
 
 
 public:
-    //  Settings
-
-    virtual void from_json(const JsonValue& json);
-    virtual JsonValue to_json() const;
-
-    virtual std::string check_validity() const;
-    virtual void restore_defaults();
-
-
-protected:
-    friend class SingleSwitchProgramOption;
-
-    BatchOption m_options;
-    void add_option(ConfigOption& option, std::string serialization_string);
-
+    //  Startup Checks: Feel free to override to change behavior.
+
+    virtual void run_start_program_checks(
+        const ProgramDescriptor& descriptor,
+        ProgramEnvironment& env
+    ) override;
+    virtual void start_program_border_check(
+        VideoStream& stream,
+        FeedbackType feedback_type
+    );
 
-public:
-    EventNotificationOption NOTIFICATION_PROGRAM_FINISH;
-    EventNotificationOption NOTIFICATION_ERROR_RECOVERABLE;
-    EventNotificationOption NOTIFICATION_ERROR_FATAL;
+private:
+    virtual void program(GameConsole::ConsoleProgramEnvironment& env, CancellableScope& scope) override;
 };
 
 
 
 
-template <typename Descriptor, typename Instance>
-class SingleSwitchProgramWrapper : public Descriptor{
+#if 0
+template <typename Instance>
+class SingleSwitchProgramWrapper : public Instance::Descriptor{
 public:
-    virtual std::unique_ptr<SingleSwitchProgramInstance> make_instance() const override{
-        return std::unique_ptr<SingleSwitchProgramInstance>(new Instance());
+    virtual std::unique_ptr<SingleSwitchProgramInstance> make_instance(
+        GameConsole::ConsoleSystemSession& system
+    ) const override{
+        if constexpr (std::is_constructible_v<Instance, GameConsole::ConsoleSystemSession&>){
+            return std::make_unique<Instance>(system);
+        }else{
+            return std::make_unique<Instance>();
+        }
     }
 };
+#endif
+
+template <typename Instance>
+using SingleSwitchProgramWrapper = GameConsole::ConsoleProgramWrapper<Instance>;
+
 
-template <typename Descriptor, typename Instance>
-std::unique_ptr<PanelDescriptor> make_single_switch_program(){
-    return std::make_unique<SingleSwitchProgramWrapper<Descriptor, Instance>>();
+// Create a program PanelDescriptor
+template <typename Instance>
+std::unique_ptr<PanelDescriptor> make_SingleSwitchProgram(){
+    return std::make_unique<SingleSwitchProgramWrapper<Instance>>();
 }
 
 
diff --git a/SerialPrograms/Source/NintendoSwitch/Options/NintendoSwitch_CodeEntrySettingsOption.cpp b/SerialPrograms/Source/NintendoSwitch/Options/NintendoSwitch_CodeEntrySettingsOption.cpp
new file mode 100644
index 0000000000..f02f5dba0e
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Options/NintendoSwitch_CodeEntrySettingsOption.cpp
@@ -0,0 +1,176 @@
+/*  Code Entry Settings Option
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Exceptions.h"
+#include "CommonFramework/StaticGlobals.h"
+#include "NintendoSwitch_CodeEntrySettingsOption.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+using namespace std::chrono_literals;
+
+
+KeyboardLayoutOption::KeyboardLayoutOption()
+    : EnumDropdownOption<KeyboardLayout>(
+        "<b>Keyboard Layout:</b>",
+        {
+            {KeyboardLayout::QWERTY, "qwerty", "QWERTY"},
+            {KeyboardLayout::AZERTY, "azerty", "AZERTY"},
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        KeyboardLayout::QWERTY
+    )
+{}
+KeyboardLayoutOption::KeyboardLayoutOption(std::string label)
+    : EnumDropdownOption<KeyboardLayout>(
+        std::move(label),
+        {
+            {KeyboardLayout::QWERTY, "qwerty", "QWERTY"},
+            {KeyboardLayout::AZERTY, "azerty", "AZERTY"},
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        KeyboardLayout::QWERTY
+    )
+{}
+
+CodeEntrySkipPlusOption::CodeEntrySkipPlusOption()
+    : BooleanCheckBoxOption(
+        "<b>Skip the Plus:</b><br>Don't press + to finalize the code. Useful for testing.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        false
+    )
+{}
+
+
+
+CodeboardTimingsOption::CodeboardTimingsOption(
+    std::string label,
+    bool switch2,
+    ControllerPerformanceClass performance_class
+)
+    : GroupOption(
+        std::move(label),
+        LockMode::UNLOCK_WHILE_RUNNING,
+        GroupOption::EnableMode::ALWAYS_ENABLED,
+        true,
+        false
+    )
+    , unit(get_unit_timing(performance_class))
+    , REORDERING(
+        "<b>Digit Reordering:</b><br>Allow digits to be entered out of order.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        true
+    )
+    , HOLD0(
+        "<b>Hold:</b><br>Duration to hold each button press down.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        STATIC_GLOBALS.DEVELOPER_MODE && performance_class == ControllerPerformanceClass::SerialPABotBase_Wired
+            ? switch2 ? "48 ms" : "40 ms"
+            : std::to_string(unit.count() * 2) + " ms"
+    )
+    , COOLDOWN(
+        "<b>Cooldown:</b><br>Do not reuse a button until this long after it is released.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        std::to_string(unit.count() * 1) + " ms"
+    )
+    , PRESS_DELAY(
+        "<b>Press Delay:</b><br>Wait this long after entering a character.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        switch2
+            ? std::to_string(unit.count() * 2) + " ms"
+            : std::to_string(unit.count() * 1) + " ms"
+    )
+    , MOVE_DELAY(
+        "<b>Move Delay:</b><br>Wait this long after moving the cursor.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        switch2
+            ? std::to_string(unit.count() * 2) + " ms"
+            : std::to_string(unit.count() * 1) + " ms"
+    )
+    , SCROLL_DELAY(
+        "<b>Scroll Delay:</b><br>Wait this long after scrolling.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        switch2
+            ? std::to_string(unit.count() * 2) + " ms"
+            : std::to_string(unit.count() * 1) + " ms"
+    )
+    , WRAP_DELAY(
+        "<b>Wrap Delay:</b><br>Wait this long after a wrapping scroll.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        std::to_string(unit.count() * 2) + " ms"
+    )
+{
+    PA_ADD_OPTION(REORDERING);
+    PA_ADD_OPTION(HOLD0);
+    PA_ADD_OPTION(COOLDOWN);
+    PA_ADD_OPTION(PRESS_DELAY);
+    PA_ADD_OPTION(MOVE_DELAY);
+    PA_ADD_OPTION(SCROLL_DELAY);
+    PA_ADD_OPTION(WRAP_DELAY);
+}
+
+Milliseconds CodeboardTimingsOption::get_unit_timing(ControllerPerformanceClass performance_class){
+    switch (performance_class){
+    case ControllerPerformanceClass::SerialPABotBase_Wired:
+        return STATIC_GLOBALS.DEVELOPER_MODE ? 24ms : 40ms;
+    case ControllerPerformanceClass::SerialPABotBase_Wireless:
+        return STATIC_GLOBALS.DEVELOPER_MODE ? 34ms : 40ms;
+    case ControllerPerformanceClass::SysbotBase:
+        return 100ms;
+    default:
+        throw InternalProgramError(
+            nullptr,
+            PA_CURRENT_FUNCTION,
+            "Invalid performance class: " + std::to_string((int)performance_class)
+        );
+    }
+}
+
+
+KeyboardControllerTimingsOption::KeyboardControllerTimingsOption()
+    : GroupOption(
+        "Keyboard Controller Timings",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        GroupOption::EnableMode::ALWAYS_ENABLED,
+        true,
+        false
+    )
+    , PARLLELIZE(
+        "<b>Parallel Entry:</b><br>Allow characters to be entered in parallel if possible.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        STATIC_GLOBALS.DEVELOPER_MODE
+    )
+    , TIME_UNIT(
+        "<b>Time Unit:</b><br>Timesteps should increment in multiples of this unit.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        STATIC_GLOBALS.DEVELOPER_MODE ? "24 ms" : "40 ms"
+    )
+    , HOLD(
+        "<b>Hold:</b><br>Duration to hold each key press down.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        "40 ms"
+    )
+    , COOLDOWN(
+        "<b>Cooldown:</b><br>Do not reuse a key until this long after it is released.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        "24 ms"
+    )
+{
+    PA_ADD_OPTION(PARLLELIZE);
+    PA_ADD_OPTION(TIME_UNIT);
+    PA_ADD_OPTION(HOLD);
+    PA_ADD_OPTION(COOLDOWN);
+}
+
+
+
+
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/NintendoSwitch/Options/NintendoSwitch_CodeEntrySettingsOption.h b/SerialPrograms/Source/NintendoSwitch/Options/NintendoSwitch_CodeEntrySettingsOption.h
new file mode 100644
index 0000000000..f22e01ae93
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Options/NintendoSwitch_CodeEntrySettingsOption.h
@@ -0,0 +1,76 @@
+/*  Code Entry Settings Option
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_NintendoSwitch_CodeEntrySettingsOption_H
+#define PokemonAutomation_NintendoSwitch_CodeEntrySettingsOption_H
+
+#include "Common/Cpp/Options/GroupOption.h"
+//#include "Common/Cpp/Options/StaticTextOption.h"
+#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "Common/Cpp/Options/TimeDurationOption.h"
+#include "Common/Cpp/Options/EnumDropdownOption.h"
+#include "Controllers/ControllerTypes.h"
+#include "NintendoSwitch/Programs/FastCodeEntry/NintendoSwitch_KeyboardEntryMappings.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+
+
+class KeyboardLayoutOption : public EnumDropdownOption<KeyboardLayout>{
+public:
+    KeyboardLayoutOption();
+    KeyboardLayoutOption(std::string label);
+};
+
+class CodeEntrySkipPlusOption : public BooleanCheckBoxOption{
+public:
+    CodeEntrySkipPlusOption();
+};
+
+
+
+class CodeboardTimingsOption : public GroupOption{
+public:
+    CodeboardTimingsOption(
+        std::string label,
+        bool switch2,
+        ControllerPerformanceClass performance_class
+    );
+
+private:
+    static Milliseconds get_unit_timing(ControllerPerformanceClass performance_class);
+    Milliseconds unit;
+
+public:
+    BooleanCheckBoxOption REORDERING;
+    MillisecondsOption HOLD0;
+    MillisecondsOption COOLDOWN;
+    MillisecondsOption PRESS_DELAY;
+    MillisecondsOption MOVE_DELAY;
+    MillisecondsOption SCROLL_DELAY;
+    MillisecondsOption WRAP_DELAY;
+};
+
+class KeyboardControllerTimingsOption : public GroupOption{
+public:
+    KeyboardControllerTimingsOption();
+
+public:
+    BooleanCheckBoxOption PARLLELIZE;
+    MillisecondsOption TIME_UNIT;
+    MillisecondsOption HOLD;
+    MillisecondsOption COOLDOWN;
+};
+
+
+
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/NintendoSwitch/Options/NintendoSwitch_FriendCodeListOption.cpp b/SerialPrograms/Source/NintendoSwitch/Options/NintendoSwitch_FriendCodeListOption.cpp
index 5e18c636ec..132e3d4e6f 100644
--- a/SerialPrograms/Source/NintendoSwitch/Options/NintendoSwitch_FriendCodeListOption.cpp
+++ b/SerialPrograms/Source/NintendoSwitch/Options/NintendoSwitch_FriendCodeListOption.cpp
@@ -1,99 +1,71 @@
 /*  Friend Code List
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include "Common/Cpp/Json/JsonValue.h"
 #include "Common/Cpp/Json/JsonArray.h"
+#include "Common/Cpp/Json/JsonValue.h"
 #include "NintendoSwitch_FriendCodeListOption.h"
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
 
 
-
-FriendCodeListOption::FriendCodeListOption(std::string label, std::vector<std::string> default_lines)
-    : m_label(std::move(label))
-    , m_default(std::move(default_lines))
-    , m_lines(m_default)
-{}
-
-void FriendCodeListOption::load_json(const JsonValue& json){
-    const JsonArray* list = json.get_array();
-    if (list == nullptr){
-        return;
-    }
-    std::vector<std::string> lines;
-    for (const auto& line : *list){
-        const std::string* str = line.get_string();
-        if (str == nullptr || str->empty()){
-            continue;
+namespace{
+std::string join_lines(const std::vector<std::string>& lines){
+    std::string ret;
+    for (const std::string& line : lines){
+        if (!ret.empty()){
+            ret += '\n';
         }
-        lines.emplace_back(*str);
-    }
-    {
-        SpinLockGuard lg(m_lock);
-        m_lines = std::move(lines);
+        ret += line;
     }
-    report_value_changed();
-}
-JsonValue FriendCodeListOption::to_json() const{
-    JsonArray list;
-    SpinLockGuard lg(m_lock);
-    for (const std::string& line : m_lines){
-        list.push_back(line);
-    }
-    return list;
+    return ret;
 }
-void FriendCodeListOption::restore_defaults(){
-    {
-        SpinLockGuard lg(m_lock);
-        m_lines = m_default;
-    }
-    report_value_changed();
 }
 
 
+FriendCodeListOption::FriendCodeListOption(std::string label, std::vector<std::string> default_lines)
+    : TextEditOption(
+        std::move(label),
+        LockMode::LOCK_WHILE_RUNNING,
+        join_lines(default_lines),
+        ""
+    )
+{}
 
-std::vector<uint8_t> FriendCodeListOption::parse(const std::string& line){
-    std::vector<uint8_t> code;
+
+std::string FriendCodeListOption::parse(const std::string& line){
+    std::string code;
     for (char ch : line){
         if ('0' <= ch && ch <= '9'){
-            code.emplace_back(ch);
+            code.push_back(ch);
         }
     }
     return code;
 }
-void FriendCodeListOption::set(const std::string& text){
-    std::vector<std::string> lines;
+std::vector<std::string> FriendCodeListOption::lines() const{
+    const std::string text = *this;
+    std::vector<std::string> ret;
     std::string line;
     for (char ch : text){
         if (ch == '\n'){
-            lines.emplace_back(std::move(line));
+            ret.emplace_back(std::move(line));
             line.clear();
             continue;
         }
         line += ch;
     }
     if (line.size() > 0){
-        lines.emplace_back(std::move(line));
+        ret.emplace_back(std::move(line));
     }
-    {
-        SpinLockGuard lg(m_lock);
-        m_lines = std::move(lines);
-    }
-    report_value_changed();
-}
-std::vector<std::string> FriendCodeListOption::lines() const{
-    SpinLockGuard lg(m_lock);
-    return m_lines;
+    return ret;
 }
 std::vector<std::string> FriendCodeListOption::list() const{
-    SpinLockGuard lg(m_lock);
     std::vector<std::string> ret;
-    for (const auto& item : m_lines){
-        std::vector<uint8_t> line = parse(item);
+    for (const std::string& item : lines()){
+        std::string line = parse(item);
         if (line.size() != 12){
             continue;
         }
@@ -108,19 +80,31 @@ std::vector<std::string> FriendCodeListOption::list() const{
     }
     return ret;
 }
-
-
-
-
-
+JsonValue FriendCodeListOption::to_json() const{
+    JsonArray list;
+    for (const std::string& line : lines()){
+        list.push_back(line);
+    }
+    return list;
 }
+void FriendCodeListOption::load_json(const JsonValue& json){
+    //  The settings are stored as an array of lines, one entry per line.
+    const JsonArray* list = json.to_array();
+    if (list == nullptr){
+        return;
+    }
+    std::vector<std::string> lines;
+    for (const auto& line : *list){
+        const std::string* str = line.to_string();
+        if (str == nullptr || str->empty()){
+            continue;
+        }
+        lines.emplace_back(*str);
+    }
+    set(join_lines(lines));
 }
 
 
 
-
-
-
-
-
-
+}
+}
diff --git a/SerialPrograms/Source/NintendoSwitch/Options/NintendoSwitch_FriendCodeListOption.h b/SerialPrograms/Source/NintendoSwitch/Options/NintendoSwitch_FriendCodeListOption.h
index c8966327ed..08a6cfbed2 100644
--- a/SerialPrograms/Source/NintendoSwitch/Options/NintendoSwitch_FriendCodeListOption.h
+++ b/SerialPrograms/Source/NintendoSwitch/Options/NintendoSwitch_FriendCodeListOption.h
@@ -1,6 +1,6 @@
 /*  Friend Code List
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -8,43 +8,31 @@
 #define PokemonAutomation_NintendoSwitch_FriendCodeListOption_H
 
 #include <vector>
-#include "Common/Cpp/Concurrency/SpinLock.h"
-#include "Common/Cpp/Options/ConfigOption.h"
+#include "Common/Cpp/Options/TextEditOption.h"
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
 
 
-class FriendCodeListOption : public ConfigOption{
+//  A list of Switch friend codes, one per line.
+class FriendCodeListOption : public TextEditOption{
 public:
     FriendCodeListOption(std::string label, std::vector<std::string> default_lines);
 
-    static std::vector<uint8_t> parse(const std::string& line);
+    static std::string parse(const std::string& line);
 
-    void set(const std::string& text);
+    //  The current text split into lines.
     std::vector<std::string> lines() const;
+    //  The lines that parse to a valid 12-digit code, formatted as "SW-XXXX-XXXX-XXXX".
     std::vector<std::string> list() const;
 
-    virtual void load_json(const JsonValue& json) override;
+public:
     virtual JsonValue to_json() const override;
-
-    virtual void restore_defaults() override;
-
-    virtual ConfigWidget* make_QtWidget(QWidget& parent) override;
-
-private:
-    friend class FriendCodeListWidget;
-    const std::string m_label;
-    const std::vector<std::string> m_default;
-
-    mutable SpinLock m_lock;
-    std::vector<std::string> m_lines;
+    virtual void load_json(const JsonValue& json) override;
 };
 
 
 
-
 }
 }
 #endif
-
diff --git a/SerialPrograms/Source/NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.cpp b/SerialPrograms/Source/NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.cpp
index b92a69d90c..74ea2576b2 100644
--- a/SerialPrograms/Source/NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.cpp
+++ b/SerialPrograms/Source/NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.cpp
@@ -1,6 +1,6 @@
 /*  Go Home When Done
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -15,15 +15,15 @@ GoHomeWhenDoneOption::GoHomeWhenDoneOption(bool default_value)
     : BooleanCheckBoxOption(
         "<b>Go Home when Done:</b><br>"
         "When the program finishes, go to the Switch Home menu to idle. (turn this off for unattended streaming)",
-        LockWhileRunning::UNLOCKED,
+        LockMode::UNLOCK_WHILE_RUNNING,
         default_value
     )
 {}
 
-void GoHomeWhenDoneOption::run_end_of_program(BotBaseContext& context){
+void GoHomeWhenDoneOption::run_end_of_program(ProControllerContext& context){
     if (*this){
-        pbf_wait(context, 5 * TICKS_PER_SECOND);
-        pbf_press_button(context, BUTTON_HOME, 20, 125);
+        pbf_wait(context, 5000ms);
+        pbf_press_button(context, BUTTON_HOME, 160ms, 1000ms);
     }
 }
 
diff --git a/SerialPrograms/Source/NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h b/SerialPrograms/Source/NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h
index 890338bd12..14e6eb4f6f 100644
--- a/SerialPrograms/Source/NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h
+++ b/SerialPrograms/Source/NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h
@@ -1,6 +1,6 @@
 /*  Go Home When Done
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -8,7 +8,7 @@
 #define PokemonAutomation_NintendoSwitch_GoHomeWhenDone_H
 
 #include "Common/Cpp/Options/BooleanCheckBoxOption.h"
-#include "ClientSource/Connection/BotBase.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
@@ -18,7 +18,7 @@ class GoHomeWhenDoneOption : public BooleanCheckBoxOption{
 public:
     GoHomeWhenDoneOption(bool default_value);
 
-    void run_end_of_program(BotBaseContext& context);
+    void run_end_of_program(ProControllerContext& context);
 };
 
 
diff --git a/SerialPrograms/Source/NintendoSwitch/Options/NintendoSwitch_ModelType.h b/SerialPrograms/Source/NintendoSwitch/Options/NintendoSwitch_ModelType.h
new file mode 100644
index 0000000000..423fddd62e
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Options/NintendoSwitch_ModelType.h
@@ -0,0 +1,67 @@
+/*  Model Type
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_NintendoSwitch_ModelType_H
+#define PokemonAutomation_NintendoSwitch_ModelType_H
+
+#include "Common/Cpp/Options/EnumDropdownOption.h"
+#include "NintendoSwitch/NintendoSwitch_ConsoleState.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+
+inline const EnumDropdownDatabase<ConsoleType>& CONSOLE_MODEL_DATABASE(){
+    static const EnumDropdownDatabase<ConsoleType> database{
+       {ConsoleType::Unknown,                       "unknown",                      "Auto-detect if possible."},
+       {ConsoleType::Switch1,                       "switch1",                      ConsoleType_strings(ConsoleType::Switch1)},
+       {ConsoleType::Switch2_Unknown,               "switch2-unknown",              ConsoleType_strings(ConsoleType::Switch2_Unknown)},
+//       {ConsoleType::Switch2_FW19_International,    "switch2-FW19-international",   ConsoleType_strings(ConsoleType::Switch2_FW19_International)},
+//       {ConsoleType::Switch2_FW19_JapanLocked,      "switch2-FW19-japan",           ConsoleType_strings(ConsoleType::Switch2_FW19_JapanLocked)},
+       {ConsoleType::Switch2_FW20_International,    "switch2-FW20-international",   ConsoleType_strings(ConsoleType::Switch2_FW20_International)},
+       {ConsoleType::Switch2_FW20_JapanLocked,      "switch2-FW20-japan",           ConsoleType_strings(ConsoleType::Switch2_FW20_JapanLocked)},
+    };
+    return database;
+}
+
+
+
+class ConsoleModelCell : public EnumDropdownCell<ConsoleType>{
+public:
+    ConsoleModelCell()
+        : EnumDropdownCell<ConsoleType>(
+            CONSOLE_MODEL_DATABASE(),
+            LockMode::LOCK_WHILE_RUNNING,
+            ConsoleType::Unknown
+        )
+    {}
+
+private:
+};
+
+
+class ConsoleModelOption : public EnumDropdownOption<ConsoleType>{
+public:
+    ConsoleModelOption(std::string label = "<b>Console Type:</b>")
+        : EnumDropdownOption<ConsoleType>(
+            std::move(label),
+            CONSOLE_MODEL_DATABASE(),
+            LockMode::LOCK_WHILE_RUNNING,
+            ConsoleType::Unknown
+        )
+    {}
+
+private:
+};
+
+
+
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/NintendoSwitch/Options/NintendoSwitch_SlotDatabase.h b/SerialPrograms/Source/NintendoSwitch/Options/NintendoSwitch_SlotDatabase.h
new file mode 100644
index 0000000000..6ce8750e8e
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Options/NintendoSwitch_SlotDatabase.h
@@ -0,0 +1,40 @@
+/*  Slot Database
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_NintendoSwitch_SlotDatabase_H
+#define PokemonAutomation_NintendoSwitch_SlotDatabase_H
+
+#include "Common/Cpp/Options/EnumDropdownDatabase.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+
+inline const IntegerEnumDropdownDatabase& GameSlot_Database(){
+    static const IntegerEnumDropdownDatabase database({
+        {1, "game1", "Game 1"},
+        {2, "game2", "Game 2"},
+    });
+    return database;
+}
+inline const IntegerEnumDropdownDatabase& UserSlot_Database(){
+    static const IntegerEnumDropdownDatabase database({
+        {1, "user1", "User 1"},
+        {2, "user2", "User 2"},
+        {3, "user3", "User 3"},
+        {4, "user4", "User 4"},
+        {5, "user5", "User 5"},
+        {6, "user6", "User 6"},
+        {7, "user7", "User 7"},
+        {8, "user8", "User 8"},
+    });
+    return database;
+}
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h b/SerialPrograms/Source/NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h
index 3db038c6da..c54d94d4a3 100644
--- a/SerialPrograms/Source/NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h
+++ b/SerialPrograms/Source/NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h
@@ -1,6 +1,6 @@
 /*  Start in Grip Menu
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -23,7 +23,7 @@ class StartInGripOrGameOption : public IntegerEnumDropdownOption{
                 {0, "in-game", "Start in game."},
                 {1, "grip-menu", "Start in grip menu."},
             },
-            LockWhileRunning::LOCKED,
+            LockMode::LOCK_WHILE_RUNNING,
             grip_menu ? 1 : 0
         )
     {}
@@ -44,7 +44,7 @@ class StartInGripOrClosedOption : public IntegerEnumDropdownOption{
                 {0, "home", "Start in Switch Home with game closed."},
                 {1, "grip-menu", "Start in grip menu."},
             },
-            LockWhileRunning::LOCKED,
+            LockMode::LOCK_WHILE_RUNNING,
             grip_menu ? 1 : 0
         )
     {}
diff --git a/SerialPrograms/Source/NintendoSwitch/Options/TurboMacroTable.cpp b/SerialPrograms/Source/NintendoSwitch/Options/TurboMacroTable.cpp
index 0ab216c454..9421d8fba4 100644
--- a/SerialPrograms/Source/NintendoSwitch/Options/TurboMacroTable.cpp
+++ b/SerialPrograms/Source/NintendoSwitch/Options/TurboMacroTable.cpp
@@ -1,271 +1,304 @@
-/*  Turbo Macro Table
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <iostream>
-#include <fstream>
-#include <QHBoxLayout>
-#include <QVBoxLayout>
-#include <QLabel>
-#include <QPushButton>
-#include <QFileDialog>
-#include <QMessageBox>
-#include "Common/Cpp/Exceptions.h"
-#include "Common/Cpp/Json/JsonValue.h"
-#include "Common/Cpp/Json/JsonObject.h"
-#include "Common/Cpp/Json/JsonTools.h"
-#include "NintendoSwitch/Options/TurboMacroTable.h"
-
-#include <iostream>
-using std::cout;
-using std::endl;
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-
-
-
-const EnumDatabase<TurboMacroAction>& TurboMacroAction_Database(){
-    static const EnumDatabase<TurboMacroAction> database({
-        {TurboMacroAction::NO_ACTION,         "no-action",        "No Action"},
-        {TurboMacroAction::LEFT_JOYSTICK,     "left-joystick",    "Left Joystick"},
-        {TurboMacroAction::RIGHT_JOYSTICK,    "right-joystick",   "Right Joystick"},
-        {TurboMacroAction::LEFT_JOY_CLICK,    "left-joy-click",   "Press Left Joystick (L3)"},
-        {TurboMacroAction::RIGHT_JOY_CLICK,   "right-joy-click",  "Press Right Joystick (R3)"},
-        {TurboMacroAction::B,                 "button-B",         "Press B"},
-        {TurboMacroAction::A,                 "button-A",         "Press A"},
-        {TurboMacroAction::Y,                 "button-Y",         "Press Y"},
-        {TurboMacroAction::X,                 "button-X",         "Press X"},
-        {TurboMacroAction::R,                 "button-R",         "Press R"},
-        {TurboMacroAction::L,                 "button-L",         "Press L"},
-        {TurboMacroAction::ZR,                "button-ZR",        "Press ZR"},
-        {TurboMacroAction::ZL,                "button-ZL",        "Press ZL"},
-        {TurboMacroAction::PLUS,              "button-plus",      "Press PLUS"},
-        {TurboMacroAction::MINUS,             "button-minus",     "Press MINUS"},
-        {TurboMacroAction::DPADLEFT,          "dpad-left",        "Press DPad Left"},
-        {TurboMacroAction::DPADRIGHT,         "dpad-right",       "Press DPad Right"},
-        {TurboMacroAction::DPADUP,            "dpad-up",          "Press DPad Up"},
-        {TurboMacroAction::DPADDOWN,          "dpad-down",        "Press DPad Down"},
-        {TurboMacroAction::WAIT,              "wait",             "Wait"}
-    });
-    return database;
-}
-
-
-
-
-
-TurboMacroCell::~TurboMacroCell(){
-    m_action.remove_listener(*this);
-}
-void TurboMacroCell::operator=(const TurboMacroCell& x){
-    x_axis.set(x.x_axis);
-    y_axis.set(x.y_axis);
-    button_hold_ticks.set(x.button_hold_ticks);
-    button_release_ticks.set(x.button_release_ticks);
-    wait_ticks.set(x.wait_ticks);
-}
-TurboMacroCell::TurboMacroCell(EnumDropdownCell<TurboMacroAction>& action)
-    : BatchOption(LockWhileRunning::LOCKED, true)
-    , m_action(action)
-    , x_axis("X:", LockWhileRunning::LOCKED, 128)
-    , y_axis("Y:", LockWhileRunning::LOCKED, 128)
-    , button_hold_ticks("Ticks to Hold:", LockWhileRunning::LOCKED, 250)
-    , button_release_ticks("Ticks to Release:", LockWhileRunning::LOCKED, 250)
-    , wait_ticks("Ticks to Wait:", LockWhileRunning::LOCKED, 125)
-{
-    PA_ADD_OPTION(x_axis);
-    PA_ADD_OPTION(y_axis);
-    PA_ADD_OPTION(button_hold_ticks);
-    PA_ADD_OPTION(button_release_ticks);
-    PA_ADD_OPTION(wait_ticks);
-
-    TurboMacroCell::value_changed();
-    action.add_listener(*this);
-}
-void TurboMacroCell::value_changed(){
-    x_axis.set_visibility(ConfigOptionState::HIDDEN);
-    y_axis.set_visibility(ConfigOptionState::HIDDEN);
-    button_hold_ticks.set_visibility(ConfigOptionState::HIDDEN);
-    button_release_ticks.set_visibility(ConfigOptionState::HIDDEN);
-    wait_ticks.set_visibility(ConfigOptionState::HIDDEN);
-    switch (m_action){
-    case TurboMacroAction::LEFT_JOYSTICK:
-    case TurboMacroAction::RIGHT_JOYSTICK:
-        x_axis.set_visibility(ConfigOptionState::ENABLED);
-        y_axis.set_visibility(ConfigOptionState::ENABLED);
-    case TurboMacroAction::B:
-    case TurboMacroAction::LEFT_JOY_CLICK:
-    case TurboMacroAction::RIGHT_JOY_CLICK:
-    case TurboMacroAction::A:
-    case TurboMacroAction::Y:
-    case TurboMacroAction::X:
-    case TurboMacroAction::R:
-    case TurboMacroAction::L:
-    case TurboMacroAction::ZR:
-    case TurboMacroAction::ZL:
-    case TurboMacroAction::PLUS:
-    case TurboMacroAction::MINUS:
-    case TurboMacroAction::DPADLEFT:
-    case TurboMacroAction::DPADRIGHT:
-    case TurboMacroAction::DPADUP:
-    case TurboMacroAction::DPADDOWN:
-        button_hold_ticks.set_visibility(ConfigOptionState::ENABLED);
-        button_release_ticks.set_visibility(ConfigOptionState::ENABLED);
-        break;
-    case TurboMacroAction::WAIT:
-        wait_ticks.set_visibility(ConfigOptionState::ENABLED);
-        break;
-    default:
-        break;
-    }
-}
-
-
-
-
-TurboMacroRow::TurboMacroRow()
-    : action(TurboMacroAction_Database(), LockWhileRunning::LOCKED, TurboMacroAction::NO_ACTION)
-    , parameters(action)
-{
-    PA_ADD_OPTION(action);
-    PA_ADD_OPTION(parameters);
-}
-std::unique_ptr<EditableTableRow> TurboMacroRow::clone() const{
-    std::unique_ptr<TurboMacroRow> ret(new TurboMacroRow());
-    ret->action.set(action);
-    ret->parameters = parameters;
-    return ret;
-}
-
-void TurboMacroRow::load_json(const JsonValue& json){
-    const JsonObject* obj = json.get_object();
-    if (obj == nullptr){
-        return;
-    }
-
-    const JsonValue* value = obj->get_value("Action");
-    if (value == nullptr){
-        return;
-    }
-    action.load_json(*value);
-
-    switch (action){
-    case TurboMacroAction::LEFT_JOYSTICK:
-    case TurboMacroAction::RIGHT_JOYSTICK:
-        value = obj->get_value("MoveDirectionX");
-        if (value != nullptr){
-            parameters.x_axis.load_json(*value);
-        }
-        value = obj->get_value("MoveDirectionY");
-        if (value != nullptr){
-            parameters.y_axis.load_json(*value);
-        }
-        value = obj->get_value("Hold");
-        if (value != nullptr){
-            parameters.button_hold_ticks.load_json(*value);
-        }
-        value = obj->get_value("Release");
-        if (value != nullptr){
-            parameters.button_release_ticks.load_json(*value);
-        }
-        break;
-    case TurboMacroAction::B:
-    case TurboMacroAction::A:
-    case TurboMacroAction::Y:
-    case TurboMacroAction::X:
-    case TurboMacroAction::R:
-    case TurboMacroAction::L:
-    case TurboMacroAction::ZR:
-    case TurboMacroAction::ZL:
-    case TurboMacroAction::PLUS:
-    case TurboMacroAction::MINUS:
-    case TurboMacroAction::DPADLEFT:
-    case TurboMacroAction::DPADRIGHT:
-    case TurboMacroAction::DPADUP:
-    case TurboMacroAction::DPADDOWN:
-        value = obj->get_value("Hold");
-        if (value != nullptr){
-            parameters.button_hold_ticks.load_json(*value);
-        }
-        value = obj->get_value("Release");
-        if (value != nullptr){
-            parameters.button_release_ticks.load_json(*value);
-        }
-        break;
-    case TurboMacroAction::WAIT:
-        value = obj->get_value("Wait");
-        if (value != nullptr){
-            parameters.wait_ticks.load_json(*value);
-        }
-        break;
-    default:
-        break;
-    }
-}
-JsonValue TurboMacroRow::to_json() const{
-    JsonObject obj;
-    obj["Action"] = action.to_json();
-    switch (action){
-    case TurboMacroAction::B:
-    case TurboMacroAction::A:
-    case TurboMacroAction::Y:
-    case TurboMacroAction::X:
-    case TurboMacroAction::R:
-    case TurboMacroAction::L:
-    case TurboMacroAction::ZR:
-    case TurboMacroAction::ZL:
-    case TurboMacroAction::PLUS:
-    case TurboMacroAction::MINUS:
-    case TurboMacroAction::DPADLEFT:
-    case TurboMacroAction::DPADRIGHT:
-    case TurboMacroAction::DPADUP:
-    case TurboMacroAction::DPADDOWN:
-        obj["Hold"] = parameters.button_hold_ticks.to_json();
-        obj["Release"] = parameters.button_release_ticks.to_json();
-        break;
-    case TurboMacroAction::LEFT_JOYSTICK:
-    case TurboMacroAction::RIGHT_JOYSTICK:
-        obj["MoveDirectionX"] = parameters.x_axis.to_json();
-        obj["MoveDirectionY"] = parameters.y_axis.to_json();
-        obj["Hold"] = parameters.button_hold_ticks.to_json();
-        obj["Release"] = parameters.button_release_ticks.to_json();
-        break;
-    case TurboMacroAction::WAIT:
-        obj["Wait"] = parameters.wait_ticks.to_json();
-        break;
-    default:
-        break;
-    }
-    return obj;
-}
-
-
-TurboMacroTable::TurboMacroTable()
-    : EditableTableOption_t<TurboMacroRow>(
-        "<b>Custom Macro Table:</b><br>"
-        "Set a list of button press to create a macro. 125 ticks = 1 second. Joystick direction is specified by (x, y).<br>"
-        "x = 0 is left, x = 255 is right. y = 0 is up, y = 255 is down. 128 is neutral for both. Ex. Move joystick fully left would be (0, 128). Move joystick up-right would be (255, 0).",
-        LockWhileRunning::LOCKED
-    )
-{}
-std::vector<std::string> TurboMacroTable::make_header() const{
-    return std::vector<std::string>{
-        "Action",
-        "Parameters",
-    };
-}
-
-
-
-
-
-
-
-
-
-
-}
-}
+/*  Turbo Macro Table
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+#include <fstream>
+#include "Common/Cpp/Json/JsonValue.h"
+#include "Common/Cpp/Json/JsonObject.h"
+#include "NintendoSwitch/Options/TurboMacroTable.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+using namespace std::chrono_literals;
+
+
+
+const EnumDropdownDatabase<TurboMacroAction>& TurboMacroAction_Database(){
+    static const EnumDropdownDatabase<TurboMacroAction> database({
+        {TurboMacroAction::NO_ACTION,         "no-action",        "No Action"},
+        {TurboMacroAction::LEFT_JOYSTICK,     "left-joystick",    "Left Joystick"},
+        {TurboMacroAction::RIGHT_JOYSTICK,    "right-joystick",   "Right Joystick"},
+        {TurboMacroAction::LEFT_JOY_CLICK,    "left-joy-click",   "Press Left Joystick (L3)"},
+        {TurboMacroAction::RIGHT_JOY_CLICK,   "right-joy-click",  "Press Right Joystick (R3)"},
+        {TurboMacroAction::B,                 "button-B",         "Press B"},
+        {TurboMacroAction::A,                 "button-A",         "Press A"},
+        {TurboMacroAction::Y,                 "button-Y",         "Press Y"},
+        {TurboMacroAction::X,                 "button-X",         "Press X"},
+        {TurboMacroAction::R,                 "button-R",         "Press R"},
+        {TurboMacroAction::L,                 "button-L",         "Press L"},
+        {TurboMacroAction::ZR,                "button-ZR",        "Press ZR"},
+        {TurboMacroAction::ZL,                "button-ZL",        "Press ZL"},
+        {TurboMacroAction::PLUS,              "button-plus",      "Press PLUS"},
+        {TurboMacroAction::MINUS,             "button-minus",     "Press MINUS"},
+        {TurboMacroAction::DPADLEFT,          "dpad-left",        "Press DPad Left"},
+        {TurboMacroAction::DPADRIGHT,         "dpad-right",       "Press DPad Right"},
+        {TurboMacroAction::DPADUP,            "dpad-up",          "Press DPad Up"},
+        {TurboMacroAction::DPADDOWN,          "dpad-down",        "Press DPad Down"},
+        {TurboMacroAction::WAIT,              "wait",             "Wait"}
+    });
+    return database;
+}
+
+
+
+
+
+TurboMacroCell::~TurboMacroCell(){
+    m_action.remove_listener(*this);
+}
+void TurboMacroCell::operator=(const TurboMacroCell& x){
+    x_axis.set(x.x_axis);
+    y_axis.set(x.y_axis);
+    button_hold.set(x.button_hold.current_text());
+    button_release.set(x.button_release.current_text());
+    wait.set(x.wait.current_text());
+}
+TurboMacroCell::TurboMacroCell(EnumDropdownCell<TurboMacroAction>& action)
+    : BatchOption(LockMode::LOCK_WHILE_RUNNING, true)
+    , m_action(action)
+    , x_axis("X:", LockMode::LOCK_WHILE_RUNNING, 128)
+    , y_axis("Y:", LockMode::LOCK_WHILE_RUNNING, 128)
+    , button_hold(
+        "Hold (ms):", false,
+        LockMode::LOCK_WHILE_RUNNING,
+        0ms, Milliseconds::max(),
+        "2000 ms"
+    )
+    , button_release(
+        "Release (ms):", false,
+        LockMode::LOCK_WHILE_RUNNING,
+        0ms, Milliseconds::max(),
+        "2000 ms"
+    )
+    , wait(
+        "Wait (ms):", false,
+        LockMode::LOCK_WHILE_RUNNING,
+        0ms, Milliseconds::max(),
+        "1000 ms"
+    )
+{
+    PA_ADD_OPTION(x_axis);
+    PA_ADD_OPTION(y_axis);
+    PA_ADD_OPTION(button_hold);
+    PA_ADD_OPTION(button_release);
+    PA_ADD_OPTION(wait);
+
+    TurboMacroCell::on_config_value_changed(this);
+    action.add_listener(*this);
+}
+void TurboMacroCell::on_config_value_changed(void* object){
+    x_axis.set_visibility(ConfigOptionState::HIDDEN);
+    y_axis.set_visibility(ConfigOptionState::HIDDEN);
+    button_hold.set_visibility(ConfigOptionState::HIDDEN);
+    button_release.set_visibility(ConfigOptionState::HIDDEN);
+    wait.set_visibility(ConfigOptionState::HIDDEN);
+    switch (m_action){
+    case TurboMacroAction::LEFT_JOYSTICK:
+    case TurboMacroAction::RIGHT_JOYSTICK:
+        x_axis.set_visibility(ConfigOptionState::ENABLED);
+        y_axis.set_visibility(ConfigOptionState::ENABLED);
+    case TurboMacroAction::LEFT_JOY_CLICK:
+    case TurboMacroAction::RIGHT_JOY_CLICK:
+    case TurboMacroAction::B:
+    case TurboMacroAction::A:
+    case TurboMacroAction::Y:
+    case TurboMacroAction::X:
+    case TurboMacroAction::R:
+    case TurboMacroAction::L:
+    case TurboMacroAction::ZR:
+    case TurboMacroAction::ZL:
+    case TurboMacroAction::PLUS:
+    case TurboMacroAction::MINUS:
+    case TurboMacroAction::DPADLEFT:
+    case TurboMacroAction::DPADRIGHT:
+    case TurboMacroAction::DPADUP:
+    case TurboMacroAction::DPADDOWN:
+        button_hold.set_visibility(ConfigOptionState::ENABLED);
+        button_release.set_visibility(ConfigOptionState::ENABLED);
+        break;
+    case TurboMacroAction::WAIT:
+        wait.set_visibility(ConfigOptionState::ENABLED);
+        break;
+    default:
+        break;
+    }
+}
+
+
+
+
+TurboMacroRow::TurboMacroRow(EditableTableOption& parent_table)
+    : EditableTableRow(parent_table)
+    , action(TurboMacroAction_Database(), LockMode::LOCK_WHILE_RUNNING, TurboMacroAction::NO_ACTION)
+    , parameters(action)
+{
+    PA_ADD_OPTION(action);
+    PA_ADD_OPTION(parameters);
+}
+std::unique_ptr<EditableTableRow> TurboMacroRow::clone() const{
+    std::unique_ptr<TurboMacroRow> ret(new TurboMacroRow(parent()));
+    ret->action.set(action);
+    ret->parameters = parameters;
+    return ret;
+}
+
+JsonValue TurboMacroRow::to_json() const{
+    JsonObject obj;
+    obj["Action"] = action.to_json();
+    switch (action){
+    case TurboMacroAction::LEFT_JOY_CLICK:
+    case TurboMacroAction::RIGHT_JOY_CLICK:
+    case TurboMacroAction::B:
+    case TurboMacroAction::A:
+    case TurboMacroAction::Y:
+    case TurboMacroAction::X:
+    case TurboMacroAction::R:
+    case TurboMacroAction::L:
+    case TurboMacroAction::ZR:
+    case TurboMacroAction::ZL:
+    case TurboMacroAction::PLUS:
+    case TurboMacroAction::MINUS:
+    case TurboMacroAction::DPADLEFT:
+    case TurboMacroAction::DPADRIGHT:
+    case TurboMacroAction::DPADUP:
+    case TurboMacroAction::DPADDOWN:
+        obj["HoldMs"] = parameters.button_hold.to_json();
+        obj["ReleaseMs"] = parameters.button_release.to_json();
+        break;
+    case TurboMacroAction::LEFT_JOYSTICK:
+    case TurboMacroAction::RIGHT_JOYSTICK:
+        obj["MoveDirectionX"] = parameters.x_axis.to_json();
+        obj["MoveDirectionY"] = parameters.y_axis.to_json();
+        obj["HoldMs"] = parameters.button_hold.to_json();
+        obj["ReleaseMs"] = parameters.button_release.to_json();
+        break;
+    case TurboMacroAction::WAIT:
+        obj["WaitMs"] = parameters.wait.to_json();
+        break;
+    default:
+        break;
+    }
+    return obj;
+}
+void TurboMacroRow::load_json(const JsonValue& json){
+    const JsonObject* obj = json.to_object();
+    if (obj == nullptr){
+        return;
+    }
+
+    const JsonValue* value = obj->get_value("Action");
+    if (value == nullptr){
+        return;
+    }
+    action.load_json(*value);
+
+    switch (action){
+    case TurboMacroAction::LEFT_JOYSTICK:
+    case TurboMacroAction::RIGHT_JOYSTICK:
+        value = obj->get_value("MoveDirectionX");
+        if (value != nullptr){
+            parameters.x_axis.load_json(*value);
+        }
+        value = obj->get_value("MoveDirectionY");
+        if (value != nullptr){
+            parameters.y_axis.load_json(*value);
+        }
+        value = obj->get_value("Hold");
+        if (value != nullptr && value->is_integer()){
+            parameters.button_hold.set(std::to_string(value->to_integer_default() * 8));
+        }
+        value = obj->get_value("HoldMs");
+        if (value != nullptr){
+            parameters.button_hold.load_json(*value);
+        }
+        value = obj->get_value("Release");
+        if (value != nullptr && value->is_integer()){
+            parameters.button_release.set(std::to_string(value->to_integer_default() * 8));
+        }
+        value = obj->get_value("ReleaseMs");
+        if (value != nullptr){
+            parameters.button_release.load_json(*value);
+        }
+        break;
+    case TurboMacroAction::LEFT_JOY_CLICK:
+    case TurboMacroAction::RIGHT_JOY_CLICK:
+    case TurboMacroAction::B:
+    case TurboMacroAction::A:
+    case TurboMacroAction::Y:
+    case TurboMacroAction::X:
+    case TurboMacroAction::R:
+    case TurboMacroAction::L:
+    case TurboMacroAction::ZR:
+    case TurboMacroAction::ZL:
+    case TurboMacroAction::PLUS:
+    case TurboMacroAction::MINUS:
+    case TurboMacroAction::DPADLEFT:
+    case TurboMacroAction::DPADRIGHT:
+    case TurboMacroAction::DPADUP:
+    case TurboMacroAction::DPADDOWN:
+        value = obj->get_value("Hold");
+        if (value != nullptr && value->is_integer()){
+            parameters.button_hold.set(std::to_string(value->to_integer_default() * 8));
+        }
+        value = obj->get_value("HoldMs");
+        if (value != nullptr){
+            parameters.button_hold.load_json(*value);
+        }
+        value = obj->get_value("Release");
+        if (value != nullptr && value->is_integer()){
+            parameters.button_release.set(std::to_string(value->to_integer_default() * 8));
+        }
+        value = obj->get_value("ReleaseMs");
+        if (value != nullptr){
+            parameters.button_release.load_json(*value);
+        }
+        break;
+    case TurboMacroAction::WAIT:
+        value = obj->get_value("Wait");
+        if (value != nullptr && value->is_integer()){
+            parameters.wait.set(std::to_string(value->to_integer_default() * 8));
+        }
+        value = obj->get_value("WaitMs");
+        if (value != nullptr){
+            parameters.wait.load_json(*value);
+        }
+        break;
+    default:
+        break;
+    }
+}
+
+
+TurboMacroTable::TurboMacroTable()
+    : EditableTableOption_t<TurboMacroRow>(
+        "<b>Custom Macro Table:</b><br>"
+        "Set a list of button press to create a macro. Joystick direction is specified by (x, y).<br>"
+        "x = 0 is left, x = 255 is right. y = 0 is up, y = 255 is down. 128 is neutral for both. Ex.<br>"
+        "Move joystick fully left would be (0, 128). Move joystick up-right would be (255, 0).",
+        LockMode::LOCK_WHILE_RUNNING
+    )
+{}
+std::vector<std::string> TurboMacroTable::make_header() const{
+    return std::vector<std::string>{
+        "Action",
+        "Parameters",
+    };
+}
+
+
+
+
+
+
+
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/NintendoSwitch/Options/TurboMacroTable.h b/SerialPrograms/Source/NintendoSwitch/Options/TurboMacroTable.h
index 50a210f32d..e7a0d5e843 100644
--- a/SerialPrograms/Source/NintendoSwitch/Options/TurboMacroTable.h
+++ b/SerialPrograms/Source/NintendoSwitch/Options/TurboMacroTable.h
@@ -1,97 +1,101 @@
-/*  Turbo Macro Table
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_NintendoSwitch_TurboMacroTable_H
-#define PokemonAutomation_NintendoSwitch_TurboMacroTable_H
-
-#include "Common/Cpp/Options/BatchOption.h"
-#include "Common/Cpp/Options/SimpleIntegerOption.h"
-#include "Common/Cpp/Options/EnumDropdownOption.h"
-#include "Common/Cpp/Options/EditableTableOption.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-
-
-enum class TurboMacroAction{
-    NO_ACTION,
-    LEFT_JOYSTICK,
-    RIGHT_JOYSTICK,
-    LEFT_JOY_CLICK,
-    RIGHT_JOY_CLICK,
-    B,
-    A,
-    Y,
-    X,
-    R,
-    L,
-    ZR,
-    ZL,
-    PLUS,
-    MINUS,
-    DPADLEFT,
-    DPADRIGHT,
-    DPADUP,
-    DPADDOWN,
-    WAIT
-};
-const EnumDatabase<TurboMacroAction>& TurboMacroAction_Database();
-
-
-class TurboMacroCell : public BatchOption, private ConfigOption::Listener{
-public:
-    ~TurboMacroCell();
-    void operator=(const TurboMacroCell& x);
-    TurboMacroCell(EnumDropdownCell<TurboMacroAction>& action);
-
-    virtual void value_changed() override;
-
-private:
-    EnumDropdownCell<TurboMacroAction>& m_action;
-
-public:
-    SimpleIntegerOption<uint8_t> x_axis;
-    SimpleIntegerOption<uint8_t> y_axis;
-
-    SimpleIntegerOption<uint16_t> button_hold_ticks;
-    SimpleIntegerOption<uint16_t> button_release_ticks;
-    SimpleIntegerOption<uint16_t> wait_ticks;
-};
-
-
-class TurboMacroRow : public EditableTableRow{
-public:
-    TurboMacroRow();
-    virtual std::unique_ptr<EditableTableRow> clone() const override;
-
-    virtual void load_json(const JsonValue& json) override;
-    virtual JsonValue to_json() const override;
-
-public:
-    EnumDropdownCell<TurboMacroAction> action;
-    TurboMacroCell parameters;
-};
-
-
-class TurboMacroTable : public EditableTableOption_t<TurboMacroRow>{
-public:
-    TurboMacroTable();
-    virtual std::vector<std::string> make_header() const override;
-
-
-private:
-
-};
-
-
-
-
-
-
-
-}
-}
-#endif
+/*  Turbo Macro Table
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_NintendoSwitch_TurboMacroTable_H
+#define PokemonAutomation_NintendoSwitch_TurboMacroTable_H
+
+#include "Common/Cpp/Options/BatchOption.h"
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "Common/Cpp/Options/TimeDurationOption.h"
+#include "Common/Cpp/Options/EnumDropdownOption.h"
+#include "Common/Cpp/Options/EditableTableOption.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+
+enum class TurboMacroAction{
+    NO_ACTION,
+    LEFT_JOYSTICK,
+    RIGHT_JOYSTICK,
+    LEFT_JOY_CLICK,
+    RIGHT_JOY_CLICK,
+    B,
+    A,
+    Y,
+    X,
+    R,
+    L,
+    ZR,
+    ZL,
+    PLUS,
+    MINUS,
+    DPADLEFT,
+    DPADRIGHT,
+    DPADUP,
+    DPADDOWN,
+    WAIT
+};
+const EnumDropdownDatabase<TurboMacroAction>& TurboMacroAction_Database();
+
+
+class TurboMacroCell : public BatchOption, private ConfigOption::Listener{
+public:
+    ~TurboMacroCell();
+    void operator=(const TurboMacroCell& x);
+    TurboMacroCell(EnumDropdownCell<TurboMacroAction>& action);
+
+    virtual void on_config_value_changed(void* object) override;
+
+private:
+    EnumDropdownCell<TurboMacroAction>& m_action;
+
+public:
+    SimpleIntegerOption<uint8_t> x_axis;
+    SimpleIntegerOption<uint8_t> y_axis;
+
+    MillisecondsOption button_hold;
+    MillisecondsOption button_release;
+    MillisecondsOption wait;
+//    SimpleIntegerOption<uint16_t> button_hold_ticks;
+//    SimpleIntegerOption<uint16_t> button_release_ticks;
+//    SimpleIntegerOption<uint16_t> wait_ticks;
+};
+
+
+class TurboMacroRow : public EditableTableRow{
+public:
+    TurboMacroRow(EditableTableOption& parent_table);
+    virtual std::unique_ptr<EditableTableRow> clone() const override;
+
+    virtual JsonValue to_json() const override;
+    virtual void load_json(const JsonValue& json) override;
+
+public:
+    EnumDropdownCell<TurboMacroAction> action;
+    TurboMacroCell parameters;
+};
+
+
+class TurboMacroTable : public EditableTableOption_t<TurboMacroRow>{
+public:
+    TurboMacroTable();
+    virtual std::vector<std::string> make_header() const override;
+
+
+private:
+
+};
+
+
+
+
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/NintendoSwitch/Options/UI/NintendoSwitch_FriendCodeListWidget.cpp b/SerialPrograms/Source/NintendoSwitch/Options/UI/NintendoSwitch_FriendCodeListWidget.cpp
deleted file mode 100644
index 8eac44024c..0000000000
--- a/SerialPrograms/Source/NintendoSwitch/Options/UI/NintendoSwitch_FriendCodeListWidget.cpp
+++ /dev/null
@@ -1,91 +0,0 @@
-/*  Friend Code List
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <QVBoxLayout>
-#include <QLabel>
-#include <QTextEdit>
-#include "NintendoSwitch_FriendCodeListWidget.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-
-
-ConfigWidget* FriendCodeListOption::make_QtWidget(QWidget& parent){
-    return new FriendCodeListWidget(parent, *this);
-}
-
-
-
-class FriendCodeListWidget::Box : public QTextEdit{
-public:
-    Box(FriendCodeListWidget& parent)
-        : QTextEdit(&parent)
-        , m_parent(parent)
-    {
-        this->setAcceptRichText(false);
-        this->setFocusPolicy(Qt::StrongFocus);
-    }
-
-    void redraw(){
-        std::vector<std::string> lines = m_parent.m_value.lines();
-        this->clear();
-        for (const std::string& line : lines){
-            if (FriendCodeListOption::parse(line).size() == 12){
-                this->append(QString::fromStdString(line));
-            }else{
-//                this->append("<font color=\"red\">" + line + "</font>");
-            }
-        }
-    }
-
-    virtual void focusOutEvent(QFocusEvent* event) override{
-        QTextEdit::focusOutEvent(event);
-//        cout << "focusOutEvent()" << endl;
-        m_parent.m_value.set(this->toPlainText().toStdString());
-        redraw();
-    }
-
-private:
-    FriendCodeListWidget& m_parent;
-};
-
-
-
-FriendCodeListWidget::~FriendCodeListWidget(){
-    m_value.remove_listener(*this);
-}
-FriendCodeListWidget::FriendCodeListWidget(QWidget& parent, FriendCodeListOption& value)
-    : QWidget(&parent)
-    , ConfigWidget(value, *this)
-    , m_value(value)
-{
-    QVBoxLayout* layout = new QVBoxLayout(this);
-    QLabel* label = new QLabel(QString::fromStdString(value.m_label), this);
-    label->setWordWrap(true);
-    layout->addWidget(label);
-    m_box = new Box(*this);
-    layout->addWidget(m_box);
-
-    m_box->redraw();
-
-    m_value.add_listener(*this);
-}
-
-void FriendCodeListWidget::update_value(){
-    m_box->redraw();
-}
-void FriendCodeListWidget::value_changed(){
-    QMetaObject::invokeMethod(m_box, [this]{
-        update_value();
-    }, Qt::QueuedConnection);
-}
-
-
-
-
-
-}
-}
diff --git a/SerialPrograms/Source/NintendoSwitch/Options/UI/NintendoSwitch_FriendCodeListWidget.h b/SerialPrograms/Source/NintendoSwitch/Options/UI/NintendoSwitch_FriendCodeListWidget.h
deleted file mode 100644
index 8a0042a072..0000000000
--- a/SerialPrograms/Source/NintendoSwitch/Options/UI/NintendoSwitch_FriendCodeListWidget.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*  Friend Code List
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_NintendoSwitch_FriendCodeListWidget_H
-#define PokemonAutomation_NintendoSwitch_FriendCodeListWidget_H
-
-#include <QWidget>
-#include "Common/Qt/Options/ConfigWidget.h"
-#include "NintendoSwitch/Options/NintendoSwitch_FriendCodeListOption.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-
-
-
-class FriendCodeListWidget : public QWidget, public ConfigWidget{
-public:
-    ~FriendCodeListWidget();
-    FriendCodeListWidget(QWidget& parent, FriendCodeListOption& value);
-
-    virtual void update_value() override;
-    virtual void value_changed() override;
-
-private:
-    class Box;
-
-    FriendCodeListOption& m_value;
-    Box* m_box;
-};
-
-
-
-
-
-}
-}
-#endif
diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/DateManip/NintendoSwitch2_DateSkippers.cpp b/SerialPrograms/Source/NintendoSwitch/Programs/DateManip/NintendoSwitch2_DateSkippers.cpp
new file mode 100644
index 0000000000..1eeaa9aa32
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Programs/DateManip/NintendoSwitch2_DateSkippers.cpp
@@ -0,0 +1,105 @@
+/*  Date Skippers
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/RecursiveThrottler.h"
+//#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/NintendoSwitch_Settings.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+//#include "NintendoSwitch/Inference/NintendoSwitch_SelectedSettingDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace DateSkippers{
+namespace Switch2{
+
+
+void init_view(ProControllerContext& context){
+    Milliseconds tv = context->timing_variation();
+    Milliseconds unit = 24ms + tv;
+
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
+    ssf_issue_scroll(context, SSF_SCROLL_DOWN, unit);
+    ssf_issue_scroll(context, SSF_SCROLL_DOWN, unit);
+    ssf_issue_scroll(context, SSF_SCROLL_LEFT, unit);
+    ssf_press_button(context, BUTTON_A, 256ms + tv, 80ms);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
+    ssf_press_button(context, BUTTON_A, ConsoleSettings::instance().DATE_MENU_CLOSE_SWITCH2_0.get() + tv, 80ms);
+}
+
+
+void increment_day_us(ProControllerContext& context){
+    ThrottleScope scope(context->logging_throttler());
+    if (scope){
+        context->logger().log("DateSkippers::Switch2::increment_day_us()");
+    }
+
+    Milliseconds tv = context->timing_variation();
+    Milliseconds unit = 24ms + tv;
+
+    ssf_press_button(context, BUTTON_A, ConsoleSettings::instance().DATE_MENU_OPEN_SWITCH2_0.get() + tv, 80ms);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
+    ssf_issue_scroll(context, SSF_SCROLL_UP, unit);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
+    ssf_press_button(context, BUTTON_A, ConsoleSettings::instance().DATE_MENU_CLOSE_SWITCH2_0.get() + tv, 80ms);
+}
+void increment_day_eu(ProControllerContext& context){
+    ThrottleScope scope(context->logging_throttler());
+    if (scope){
+        context->logger().log("DateSkippers::Switch2::increment_day_us()");
+    }
+
+    Milliseconds tv = context->timing_variation();
+    Milliseconds unit = 24ms + tv;
+
+    ssf_press_button(context, BUTTON_A, ConsoleSettings::instance().DATE_MENU_OPEN_SWITCH2_0.get() + tv, 80ms);
+    ssf_issue_scroll(context, SSF_SCROLL_UP, unit);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
+    ssf_press_button(context, BUTTON_A, ConsoleSettings::instance().DATE_MENU_CLOSE_SWITCH2_0.get() + tv, 80ms);
+}
+void increment_day_jp(ProControllerContext& context){
+    ThrottleScope scope(context->logging_throttler());
+    if (scope){
+        context->logger().log("DateSkippers::Switch2::increment_day_us()");
+    }
+
+    Milliseconds tv = context->timing_variation();
+    Milliseconds unit = 24ms + tv;
+
+    ssf_press_button(context, BUTTON_A, ConsoleSettings::instance().DATE_MENU_OPEN_SWITCH2_0.get() + tv, 80ms);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
+    ssf_issue_scroll(context, SSF_SCROLL_UP, unit);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
+    ssf_press_button(context, BUTTON_A, ConsoleSettings::instance().DATE_MENU_CLOSE_SWITCH2_0.get() + tv, 80ms);
+}
+
+
+
+
+}
+}
+}
+}
diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManip.cpp b/SerialPrograms/Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManip.cpp
new file mode 100644
index 0000000000..e597e2d958
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManip.cpp
@@ -0,0 +1,286 @@
+/*  Date Manip
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/ImageTypes/ImageRGB32.h"
+#include "CommonFramework/ImageTools/ImageStats.h"
+#include "CommonFramework/Tools/ErrorDumper.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Images/ImageFilter.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "NintendoSwitch/NintendoSwitch_Settings.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Inference/NintendoSwitch_HomeMenuDetector.h"
+#include "NintendoSwitch/Programs/DateSpam/NintendoSwitch_HomeToDateTime.h"
+#include "NintendoSwitch_DateManip.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+
+//using namespace std::chrono_literals;
+
+
+
+
+
+
+
+
+DateReader::DateReader(ConsoleHandle& console)
+    : m_console(console)
+    , m_switch1(COLOR_RED)
+    , m_switch2(COLOR_MAGENTA)
+    , m_switch1_US(COLOR_YELLOW)
+    , m_switch1_EU(COLOR_CYAN)
+    , m_switch1_JP(COLOR_PURPLE)
+    , m_switch2_US(COLOR_YELLOW)
+    , m_switch2_EU(COLOR_CYAN)
+    , m_switch2_JP(COLOR_PURPLE)
+{}
+void DateReader::make_overlays(VideoOverlaySet& items) const{
+    m_switch1.make_overlays(items);
+    m_switch2.make_overlays(items);
+
+    m_switch1_US.make_overlays(items);
+    m_switch1_EU.make_overlays(items);
+    m_switch1_JP.make_overlays(items);
+    m_switch2_US.make_overlays(items);
+    m_switch2_EU.make_overlays(items);
+    m_switch2_JP.make_overlays(items);
+}
+bool DateReader::detect(const ImageViewRGB32& screen){
+    ConsoleType type = m_console.state().console_type();
+
+    if (is_switch1(type)){
+        return m_switch1.detect(screen);
+    }
+
+    if (is_switch2(type)){
+        return m_switch2.detect(screen);
+    }
+
+    return false;
+}
+
+
+std::pair<DateFormat, DateTime> DateReader::read_date(Logger& logger, std::shared_ptr<const ImageRGB32> screen){
+    if (!detect(*screen)){
+        throw_and_log<OperationFailedExceptionWithScreenshot>(
+            logger, ErrorReportMode::SEND_ERROR_REPORT,
+            "Not on date change screen.",
+            nullptr,
+            std::move(screen)
+        );
+    }
+
+    ConsoleType type = m_console.state().console_type();
+
+    if (is_switch1(type)){
+        switch (m_switch1.detect_date_format(*screen)){
+        case DateFormat::US:
+            return {DateFormat::US, m_switch1_US.read_date(logger, std::move(screen))};
+        case DateFormat::EU:
+            return {DateFormat::EU, m_switch1_EU.read_date(logger, std::move(screen))};
+        case DateFormat::JP:
+            return {DateFormat::JP, m_switch1_JP.read_date(logger, std::move(screen))};
+        }
+    }
+
+    if (is_switch2(type)){
+        switch (m_switch2.detect_date_format(*screen)){
+        case DateFormat::US:
+            return {DateFormat::US, m_switch2_US.read_date(logger, std::move(screen))};
+        case DateFormat::EU:
+            return {DateFormat::EU, m_switch2_EU.read_date(logger, std::move(screen))};
+        case DateFormat::JP:
+            return {DateFormat::JP, m_switch2_JP.read_date(logger, std::move(screen))};
+        }
+    }
+
+    throw InternalProgramError(
+        nullptr,
+        PA_CURRENT_FUNCTION,
+        "Unrecognized Console Type: " + std::to_string((int)type)
+    );
+}
+
+void DateReader::set_date(
+    const ProgramInfo& info, ConsoleHandle& console, ProControllerContext& context,
+    const DateTime& date
+){
+    context.wait_for_all_requests();
+    context.wait_for(std::chrono::milliseconds(250));
+
+#if 0
+    {
+        auto snapshot = console.video().snapshot();
+        if (!detect(snapshot)){
+            throw_and_log<OperationFailedExceptionWithScreenshot>(
+                console.logger(), ErrorReportMode::SEND_ERROR_REPORT,
+                "Expected date change menu.",
+                &console,
+                snapshot
+            );
+        }
+    }
+#endif
+
+    auto snapshot = console.video().snapshot();
+
+    if (!detect(snapshot)){
+        throw_and_log<OperationFailedExceptionWithScreenshot>(
+            console, ErrorReportMode::SEND_ERROR_REPORT,
+            "Not on date change screen.",
+            nullptr,
+            snapshot
+        );
+    }
+
+    ConsoleType type = m_console.state().console_type();
+
+    if (is_switch1(type)){
+        switch (m_switch1.detect_date_format(snapshot)){
+        case DateFormat::US:
+            m_switch1_US.set_date(info, console, context, date);
+            return;
+        case DateFormat::EU:
+            m_switch1_EU.set_date(info, console, context, date);
+            return;
+        case DateFormat::JP:
+            m_switch1_JP.set_date(info, console, context, date);
+            return;
+        }
+    }
+
+    if (is_switch2(type)){
+        switch (m_switch2.detect_date_format(snapshot)){
+        case DateFormat::US:
+            m_switch2_US.set_date(info, console, context, date);
+            return;
+        case DateFormat::EU:
+            m_switch2_EU.set_date(info, console, context, date);
+            return;
+        case DateFormat::JP:
+            m_switch2_JP.set_date(info, console, context, date);
+            return;
+        }
+    }
+
+    throw InternalProgramError(
+        nullptr,
+        PA_CURRENT_FUNCTION,
+        "Unrecognized Console Type: " + std::to_string((int)type)
+    );
+
+
+}
+
+void change_date(
+    SingleSwitchProgramEnvironment& env, ProControllerContext& context,
+    const DateTime& date
+){
+    Milliseconds timing_variation = context->timing_variation();
+    while (true){
+        context.wait_for_all_requests();
+
+        HomeMenuWatcher home(env.console);
+        DateChangeWatcher date_reader(env.console);
+        int ret = wait_until(
+            env.console, context, std::chrono::seconds(10),
+            {
+                home,
+                date_reader
+            }
+        );
+        switch (ret){
+        case 0:
+            home_to_date_time(env.console, context, true);
+            pbf_press_button(context, BUTTON_A, 80ms + timing_variation, 240ms + timing_variation);
+            context.wait_for_all_requests();
+            continue;
+        case 1:{
+            env.log("Detected date change.");
+
+            // Set the date
+            VideoOverlaySet overlays(env.console.overlay());
+            date_reader.make_overlays(overlays);
+            date_reader.set_date(env.program_info(), env.console, context, date);
+
+            //  Commit the date.
+            pbf_press_button(context, BUTTON_A, 160ms + timing_variation, 340ms + timing_variation);
+
+            //  Re-enter the game.
+            pbf_press_button(context, BUTTON_HOME, 160ms + timing_variation, ConsoleSettings::instance().SETTINGS_TO_HOME_DELAY0);
+
+            return;
+        }
+        default:
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "Failed to set date",
+                env.console
+            );
+        }
+    }
+}
+
+void ensure_time_unsynced(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    Milliseconds timing_variation = context->timing_variation();
+    ensure_at_home(env.console, context);
+    home_to_date_time(env.console, context, true);
+    pbf_press_button(context, BUTTON_A, 80ms + timing_variation, 240ms + timing_variation);
+
+    context.wait_for_all_requests();
+
+    DateChangeWatcher date_reader(env.console);
+    int ret = wait_until(
+        env.console, context, std::chrono::seconds(10),
+        {
+            date_reader
+        }
+    );
+
+    if (ret < 0){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "Failed to enter Date Change window. Ensure that System Time is not synced to the internet.",
+            env.console
+        );
+    }
+   
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManip.h b/SerialPrograms/Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManip.h
new file mode 100644
index 0000000000..675ad46940
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManip.h
@@ -0,0 +1,82 @@
+/*  Date Manip
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_NintendoSwitch_DateManip_H
+#define PokemonAutomation_NintendoSwitch_DateManip_H
+
+#include <memory>
+#include "Common/Cpp/DateTime.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+#include "CommonTools/VisualDetector.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "NintendoSwitch/Inference/NintendoSwitch_DateChangeDetector.h"
+#include "NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManip_US.h"
+#include "NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManip_24h.h"
+
+namespace PokemonAutomation{
+    struct ProgramInfo;
+    class Logger;
+namespace NintendoSwitch{
+
+
+
+
+class DateReader : public StaticScreenDetector{
+public:
+    DateReader(ConsoleHandle& console);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+
+    //  Returns true if we are on the date change window.
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+
+    std::pair<DateFormat, DateTime> read_date(Logger& logger, std::shared_ptr<const ImageRGB32> screen);
+    void set_date(
+        const ProgramInfo& info, ConsoleHandle& console, ProControllerContext& context,
+        const DateTime& date    //  Seconds is ignored.
+    );
+
+private:
+    ConsoleHandle& m_console;
+
+    DateChangeDetector_Switch1 m_switch1;
+    DateChangeDetector_Switch2 m_switch2;
+
+    DateReader_Switch1_US m_switch1_US;
+    DateReader_Switch1_EU m_switch1_EU;
+    DateReader_Switch1_JP m_switch1_JP;
+
+    DateReader_Switch2_US m_switch2_US;
+    DateReader_Switch2_EU m_switch2_EU;
+    DateReader_Switch2_JP m_switch2_JP;
+};
+
+class DateChangeWatcher : public DetectorToFinder<DateReader>{
+public:
+    DateChangeWatcher(ConsoleHandle& console, std::chrono::milliseconds duration = std::chrono::milliseconds(250))
+         : DetectorToFinder("DateChangeWatcher", duration, console)
+    {}
+};
+
+// starting from Home screen, change the date to the desired date
+// then go back to the home screen
+void change_date(
+    SingleSwitchProgramEnvironment& env, 
+    ProControllerContext& context,
+    const DateTime& date
+);
+
+// starting from home screen, ensure that the time is unsyced
+// i.e. confirm we can enter the Date change window
+void ensure_time_unsynced(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManipBase.h b/SerialPrograms/Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManipBase.h
new file mode 100644
index 0000000000..858d0631a5
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManipBase.h
@@ -0,0 +1,41 @@
+/*  Date Manipulation
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_NintendoSwitch_DateManipBase_H
+#define PokemonAutomation_NintendoSwitch_DateManipBase_H
+
+#include <memory>
+#include "Common/Cpp/DateTime.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+
+namespace PokemonAutomation{
+    struct ProgramInfo;
+    class Logger;
+    class ImageRGB32;
+    class VideoOverlaySet;
+    class VideoStream;
+namespace NintendoSwitch{
+
+
+class DateReaderBase{
+public:
+    virtual void make_overlays(VideoOverlaySet& items) const = 0;
+    virtual DateTime read_date(
+        Logger& logger,
+        std::shared_ptr<const ImageRGB32> screen
+    ) = 0;
+    virtual void set_date(
+        const ProgramInfo& info, VideoStream& stream, ProControllerContext& context,
+        const DateTime& date    //  Seconds is ignored.
+    ) = 0;
+};
+
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManipTools.cpp b/SerialPrograms/Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManipTools.cpp
new file mode 100644
index 0000000000..ce6be374a1
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManipTools.cpp
@@ -0,0 +1,200 @@
+/*  Date Manipulation Tools
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/ImageTypes/ImageRGB32.h"
+#include "CommonFramework/ImageTools/ImageStats.h"
+#include "CommonTools/Images/ImageFilter.h"
+#include "CommonTools/OCR/OCR_NumberReader.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "NintendoSwitch_DateManipTools.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace DateReaderTools{
+
+
+
+ImageRGB32 filter_image(const ImageViewRGB32& image){
+    double brightness = image_stats(image).average.sum();
+    bool white_theme = brightness > 500;
+
+    ImageRGB32 filtered = to_blackwhite_rgb32_range(
+        image,
+        white_theme,
+        0xff000000, white_theme ? 0xffff7fff : 0xff7f7f7f
+    );
+    return filtered;
+}
+int read_box(
+    Logger& logger,
+    int min, int max,
+    const ImageViewRGB32& screen, const ImageFloatBox& box
+){
+    ImageViewRGB32 cropped = extract_box_reference(screen, box);
+
+//    static int c = 0;
+//    cropped.save("image-" + std::to_string(c++) + ".png");
+
+    double brightness = image_stats(cropped).average.sum();
+    bool white_theme = brightness > 500;
+
+    int value;
+    if (white_theme){
+        value = OCR::read_number_waterfill(
+            logger, cropped,
+            0xff000000, 0xffff7fff, true
+        );
+    }else{
+        value = OCR::read_number_waterfill(
+            logger, cropped,
+            0xff000000, 0xff7f7f7f, false
+        );
+    }
+
+    if (value < min || value > max){
+        value = -1;
+    }
+    return value;
+}
+
+
+
+void move_horizontal(ProControllerContext& context, int current, int desired){
+    while (current < desired){
+        ssf_issue_scroll_ptv(context, SSF_SCROLL_RIGHT);
+        current++;
+    }
+    while (current > desired){
+        ssf_issue_scroll_ptv(context, SSF_SCROLL_LEFT);
+        current--;
+    }
+}
+
+void adjust_no_wrap_Switch1(ProControllerContext& context, int current, int desired){
+//    cout << "adjust_no_wrap_Switch1(): " << current << " -> " << desired << endl;
+
+    //  Invalid read. Change something and hope the next attempt fixes it.
+    if (current < 0){
+        ssf_issue_scroll_ptv(context, SSF_SCROLL_UP);
+        return;
+    }
+
+    while (current < desired){
+        ssf_issue_scroll_ptv(context, SSF_SCROLL_UP);
+        current++;
+    }
+    while (current > desired){
+        ssf_issue_scroll_ptv(context, SSF_SCROLL_DOWN);
+        current--;
+    }
+}
+void adjust_no_wrap_Switch2(ProControllerContext& context, int current, int desired){
+
+    //  Invalid read. Change something and hope the next attempt fixes it.
+    if (current < 0){
+        ssf_issue_scroll(context, SSF_SCROLL_UP, 112ms, 48ms, 24ms);
+        return;
+    }
+
+    while (current < desired){
+        ssf_issue_scroll(context, SSF_SCROLL_UP, 112ms, 48ms, 24ms);
+        current++;
+    }
+    while (current > desired){
+        ssf_issue_scroll(context, SSF_SCROLL_DOWN, 112ms, 48ms, 24ms);
+        current--;
+    }
+}
+
+void adjust_wrap_Switch1(ProControllerContext& context, int min, int max, int current, int desired){
+    //  Invalid read. Change something and hope the next attempt fixes it.
+    if (current < min || current > max){
+        ssf_issue_scroll_ptv(context, SSF_SCROLL_UP);
+        return;
+    }
+
+    int total = max - min + 1;
+    int half = total / 2;
+
+    int diff = desired - current;
+    if ((diff >= 0 && diff <= half) || (diff < 0 && diff < -half)){
+        while (current != desired){
+            ssf_issue_scroll_ptv(context, SSF_SCROLL_UP);
+            current++;
+            if (current > max){
+                current -= total;
+            }
+        }
+    }else{
+        while (current != desired){
+            ssf_issue_scroll_ptv(context, SSF_SCROLL_DOWN);
+            current--;
+            if (current < min){
+                current += total;
+            }
+        }
+    }
+}
+void adjust_wrap_Switch2(ProControllerContext& context, int min, int max, int current, int desired){
+    //  Invalid read. Change something and hope the next attempt fixes it.
+    if (current < min || current > max){
+        ssf_issue_scroll(context, SSF_SCROLL_UP, 112ms, 48ms, 24ms);
+        return;
+    }
+
+    int total = max - min + 1;
+    int half = total / 2;
+
+    int diff = desired - current;
+    if ((diff >= 0 && diff <= half) || (diff < 0 && diff < -half)){
+        while (current != desired){
+            ssf_issue_scroll(context, SSF_SCROLL_UP, 112ms, 48ms, 24ms);
+            current++;
+            if (current > max){
+                current -= total;
+            }
+        }
+    }else{
+        while (current != desired){
+            ssf_issue_scroll(context, SSF_SCROLL_DOWN, 112ms, 48ms, 24ms);
+            current--;
+            if (current < min){
+                current += total;
+            }
+        }
+    }
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManipTools.h b/SerialPrograms/Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManipTools.h
new file mode 100644
index 0000000000..48baa578cd
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManipTools.h
@@ -0,0 +1,39 @@
+/*  Date Manipulation Tools
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_NintendoSwitch_DateManipTools_H
+#define PokemonAutomation_NintendoSwitch_DateManipTools_H
+
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "NintendoSwitch_DateManipBase.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace DateReaderTools{
+
+
+
+ImageRGB32 filter_image(const ImageViewRGB32& image);
+int read_box(
+    Logger& logger,
+    int min, int max,
+    const ImageViewRGB32& screen, const ImageFloatBox& box
+);
+
+void move_horizontal(ProControllerContext& context, int current, int desired);
+
+void adjust_no_wrap_Switch1(ProControllerContext& context, int current, int desired);
+void adjust_no_wrap_Switch2(ProControllerContext& context, int current, int desired);
+
+void adjust_wrap_Switch1(ProControllerContext& context, int min, int max, int current, int desired);
+void adjust_wrap_Switch2(ProControllerContext& context, int min, int max, int current, int desired);
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManip_24h.cpp b/SerialPrograms/Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManip_24h.cpp
new file mode 100644
index 0000000000..51d74af237
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManip_24h.cpp
@@ -0,0 +1,232 @@
+/*  Date Manipulation (24h)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/ErrorReports/ErrorReports.h"
+#include "CommonFramework/ImageTypes/ImageRGB32.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonFramework/Tools/VideoStream.h"
+#include "NintendoSwitch_DateManipTools.h"
+#include "NintendoSwitch_DateManip_24h.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+
+
+DateReader_24h::DateReader_24h(Color color)
+    : m_color(color)
+{}
+void DateReader_24h::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_day);
+    items.add(m_color, m_month);
+    items.add(m_color, m_year);
+    items.add(m_color, m_hour);
+    items.add(m_color, m_minute);
+}
+DateTime DateReader_24h::read_date(Logger& logger, std::shared_ptr<const ImageRGB32> screen){
+    logger.log("Attempting to read EU date...");
+
+    DateTime date;
+
+    date.day = (int8_t)DateReaderTools::read_box(logger, 1, 31, *screen, m_day);
+    date.month = (int8_t)DateReaderTools::read_box(logger, 1, 12, *screen, m_month);
+    date.year = (int16_t)DateReaderTools::read_box(logger, 2000, 2060, *screen, m_year);
+    date.hour = (int8_t)DateReaderTools::read_box(logger, 0, 23, *screen, m_hour);
+    date.minute = (int8_t)DateReaderTools::read_box(logger, 0, 59, *screen, m_minute);
+
+    if (date.day < 0 ||
+        date.month < 0 ||
+        date.year < 0 ||
+        date.hour < 0 ||
+        date.minute < 0
+    ){
+        report_error_to_telemetry(
+            &logger, ProgramInfo(),
+            "Failed to read date.",
+            {},
+            *screen
+        );
+    }
+
+    return date;
+}
+
+
+
+DateReader_EU::DateReader_EU(Color color)
+    : DateReader_24h(color)
+{}
+void DateReader_EU::set_date(
+    const ProgramInfo& info, VideoStream& stream, ProControllerContext& context,
+    const DateTime& date
+){
+    stream.log("DateReader_EU::set_date()");
+
+    int cursor_position = 0;
+
+    for (size_t attempts = 0; attempts < 10; attempts++){
+        context.wait_for_all_requests();
+        context.wait_for(std::chrono::milliseconds(250));
+
+        auto snapshot = stream.video().snapshot();
+        DateTime current = read_date(stream.logger(), snapshot);
+        if (current.year == date.year &&
+            current.month == date.month &&
+            current.day == date.day &&
+            current.hour == date.hour &&
+            current.minute == date.minute
+        ){
+            move_horizontal(context, cursor_position, 5);
+            return;
+        }
+
+        move_horizontal(context, cursor_position, 0);
+        if (current.day < 0){
+            stream.log("Failed to read day. Will not adjust.", COLOR_RED);
+        }else{
+            adjust_no_wrap(context, current.day, date.day);
+        }
+
+        move_horizontal(context, cursor_position, 1);
+        if (current.month < 0){
+            stream.log("Failed to read month. Will not adjust.", COLOR_RED);
+        }else{
+            adjust_wrap(context, 1, 12, current.month, date.month);
+        }
+
+        move_horizontal(context, cursor_position, 2);
+        if (current.year < 0){
+            stream.log("Failed to read year. Will not adjust.", COLOR_RED);
+        }else{
+            adjust_no_wrap(context, current.year, date.year);
+        }
+
+        move_horizontal(context, cursor_position, 3);
+        if (current.hour < 0){
+            stream.log("Failed to read hour. Will not adjust.", COLOR_RED);
+        }else{
+            adjust_wrap(context, 0, 23, current.hour, date.hour);
+        }
+
+        move_horizontal(context, cursor_position, 4);
+        if (current.minute < 0){
+            stream.log("Failed to read minutes. Will not adjust.", COLOR_RED);
+        }else{
+            adjust_wrap(context, 0, 59, current.minute, date.minute);
+        }
+
+        move_horizontal(context, cursor_position, 5);
+    }
+
+    throw_and_log<OperationFailedExceptionWithScreenshot>(
+        stream.logger(), ErrorReportMode::SEND_ERROR_REPORT,
+        "Failed to set the hour after 10 attempts.",
+        stream
+    );
+}
+
+
+DateReader_Switch1_EU::DateReader_Switch1_EU(Color color)
+    : DateReader_EU(color)
+{
+    m_day       = ImageFloatBox(0.145, 0.61, 0.06, 0.09);
+    m_month     = ImageFloatBox(0.247, 0.61, 0.06, 0.09);
+    m_year      = ImageFloatBox(0.355, 0.61, 0.11, 0.09);
+    m_hour      = ImageFloatBox(0.528, 0.61, 0.06, 0.09);
+    m_minute    = ImageFloatBox(0.629, 0.61, 0.06, 0.09);
+}
+DateReader_Switch2_EU::DateReader_Switch2_EU(Color color)
+    : DateReader_EU(color)
+{
+    m_day       = ImageFloatBox(0.139, 0.436, 0.053, 0.095);
+    m_month     = ImageFloatBox(0.246, 0.436, 0.053, 0.095);
+    m_year      = ImageFloatBox(0.355, 0.436, 0.088, 0.095);
+    m_hour      = ImageFloatBox(0.532, 0.436, 0.053, 0.095);
+    m_minute    = ImageFloatBox(0.645, 0.436, 0.053, 0.095);
+}
+
+
+
+DateReader_JP::DateReader_JP(Color color)
+    : DateReader_24h(color)
+{}
+void DateReader_JP::set_date(
+    const ProgramInfo& info, VideoStream& stream, ProControllerContext& context,
+    const DateTime& date
+){
+    stream.log("DateReader_JP::set_date()");
+
+    int cursor_position = 0;
+
+    for (size_t attempts = 0; attempts < 10; attempts++){
+        context.wait_for_all_requests();
+        context.wait_for(std::chrono::milliseconds(250));
+
+        auto snapshot = stream.video().snapshot();
+        DateTime current = read_date(stream.logger(), snapshot);
+        if (current.year == date.year &&
+            current.month == date.month &&
+            current.day == date.day &&
+            current.hour == date.hour &&
+            current.minute == date.minute
+        ){
+            move_horizontal(context, cursor_position, 5);
+            return;
+        }
+
+        move_horizontal(context, cursor_position, 0);
+        adjust_no_wrap(context, current.year, date.year);
+
+        move_horizontal(context, cursor_position, 1);
+        adjust_wrap(context, 1, 12, current.month, date.month);
+
+        move_horizontal(context, cursor_position, 2);
+        adjust_no_wrap(context, current.day, date.day);
+
+        move_horizontal(context, cursor_position, 3);
+        adjust_wrap(context, 0, 23, current.hour, date.hour);
+
+        move_horizontal(context, cursor_position, 4);
+        adjust_wrap(context, 0, 59, current.minute, date.minute);
+
+        move_horizontal(context, cursor_position, 5);
+    }
+
+    throw_and_log<OperationFailedExceptionWithScreenshot>(
+        stream.logger(), ErrorReportMode::SEND_ERROR_REPORT,
+        "Failed to set the hour after 10 attempts.",
+        stream
+    );
+}
+
+
+DateReader_Switch1_JP::DateReader_Switch1_JP(Color color)
+    : DateReader_JP(color)
+{
+    m_year      = ImageFloatBox(0.136, 0.61, 0.11, 0.09);
+    m_month     = ImageFloatBox(0.295, 0.61, 0.06, 0.09);
+    m_day       = ImageFloatBox(0.395, 0.61, 0.06, 0.09);
+    m_hour      = ImageFloatBox(0.528, 0.61, 0.06, 0.09);
+    m_minute    = ImageFloatBox(0.629, 0.61, 0.06, 0.09);
+}
+DateReader_Switch2_JP::DateReader_Switch2_JP(Color color)
+    : DateReader_JP(color)
+{
+    m_year      = ImageFloatBox(0.139, 0.436, 0.088, 0.095);
+    m_month     = ImageFloatBox(0.292, 0.436, 0.053, 0.095);
+    m_day       = ImageFloatBox(0.410, 0.436, 0.053, 0.095);
+    m_hour      = ImageFloatBox(0.532, 0.436, 0.053, 0.095);
+    m_minute    = ImageFloatBox(0.645, 0.436, 0.053, 0.095);
+}
+
+
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManip_24h.h b/SerialPrograms/Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManip_24h.h
new file mode 100644
index 0000000000..c7b84413ac
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManip_24h.h
@@ -0,0 +1,132 @@
+/*  Date Manipulation (24h)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_NintendoSwitch_DateManip_24h_H
+#define PokemonAutomation_NintendoSwitch_DateManip_24h_H
+
+#include <memory>
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "NintendoSwitch_DateManipTools.h"
+#include "NintendoSwitch_DateManipBase.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+
+
+
+class DateReader_24h : public DateReaderBase{
+public:
+    DateReader_24h(Color color);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual DateTime read_date(
+        Logger& logger,
+        std::shared_ptr<const ImageRGB32> screen
+    ) override;
+
+protected:
+    virtual void move_horizontal(ProControllerContext& context, int& current, int desired) const = 0;
+    virtual void adjust_no_wrap(ProControllerContext& context, int current, int desired) const = 0;
+    virtual void adjust_wrap(ProControllerContext& context, int min, int max, int current, int desired) const = 0;
+
+
+protected:
+    Color m_color;
+    ImageFloatBox m_year;
+    ImageFloatBox m_month;
+    ImageFloatBox m_day;
+    ImageFloatBox m_hour;
+    ImageFloatBox m_minute;
+};
+
+
+
+
+class DateReader_EU : public DateReader_24h{
+public:
+    DateReader_EU(Color color);
+    virtual void set_date(
+        const ProgramInfo& info, VideoStream& stream, ProControllerContext& context,
+        const DateTime& date    //  Seconds is ignored.
+    ) override;
+};
+class DateReader_Switch1_EU : public DateReader_EU{
+public:
+    DateReader_Switch1_EU(Color color);
+    virtual void move_horizontal(ProControllerContext& context, int& current, int desired) const override{
+        DateReaderTools::move_horizontal(context, current, desired);
+        current = desired;
+    }
+    virtual void adjust_no_wrap(ProControllerContext& context, int current, int desired) const override{
+        DateReaderTools::adjust_no_wrap_Switch1(context, current, desired);
+    }
+    virtual void adjust_wrap(ProControllerContext& context, int min, int max, int current, int desired) const override{
+        DateReaderTools::adjust_wrap_Switch1(context, min, max, current, desired);
+    }
+};
+class DateReader_Switch2_EU : public DateReader_EU{
+public:
+    DateReader_Switch2_EU(Color color);
+    virtual void move_horizontal(ProControllerContext& context, int& current, int desired) const override{
+        DateReaderTools::move_horizontal(context, current, desired);
+        current = desired;
+    }
+    virtual void adjust_no_wrap(ProControllerContext& context, int current, int desired) const override{
+        DateReaderTools::adjust_no_wrap_Switch2(context, current, desired);
+    }
+    virtual void adjust_wrap(ProControllerContext& context, int min, int max, int current, int desired) const override{
+        DateReaderTools::adjust_wrap_Switch2(context, min, max, current, desired);
+    }
+};
+
+
+
+
+class DateReader_JP : public DateReader_24h{
+public:
+    DateReader_JP(Color color);
+    virtual void set_date(
+        const ProgramInfo& info, VideoStream& stream, ProControllerContext& context,
+        const DateTime& date    //  Seconds is ignored.
+    ) override;
+};
+class DateReader_Switch1_JP : public DateReader_JP{
+public:
+    DateReader_Switch1_JP(Color color);
+    virtual void move_horizontal(ProControllerContext& context, int& current, int desired) const override{
+        DateReaderTools::move_horizontal(context, current, desired);
+        current = desired;
+    }
+    virtual void adjust_no_wrap(ProControllerContext& context, int current, int desired) const override{
+        DateReaderTools::adjust_no_wrap_Switch1(context, current, desired);
+    }
+    virtual void adjust_wrap(ProControllerContext& context, int min, int max, int current, int desired) const override{
+        DateReaderTools::adjust_wrap_Switch1(context, min, max, current, desired);
+    }
+};
+class DateReader_Switch2_JP : public DateReader_JP{
+public:
+    DateReader_Switch2_JP(Color color);
+    virtual void move_horizontal(ProControllerContext& context, int& current, int desired) const override{
+        DateReaderTools::move_horizontal(context, current, desired);
+        current = desired;
+    }
+    virtual void adjust_no_wrap(ProControllerContext& context, int current, int desired) const override{
+        DateReaderTools::adjust_no_wrap_Switch2(context, current, desired);
+    }
+    virtual void adjust_wrap(ProControllerContext& context, int min, int max, int current, int desired) const override{
+        DateReaderTools::adjust_wrap_Switch2(context, min, max, current, desired);
+    }
+};
+
+
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManip_US.cpp b/SerialPrograms/Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManip_US.cpp
new file mode 100644
index 0000000000..02569fd907
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManip_US.cpp
@@ -0,0 +1,221 @@
+/*  Date Manipulation (US)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Strings/Unicode.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/ErrorReports/ErrorReports.h"
+#include "CommonFramework/ImageTypes/ImageRGB32.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonFramework/Tools/VideoStream.h"
+#include "CommonTools/OCR/OCR_Routines.h"
+#include "CommonTools/OCR/OCR_StringNormalization.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "NintendoSwitch_DateManipTools.h"
+#include "NintendoSwitch_DateManip_US.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+
+
+
+DateReader_US::DateReader_US(Color color)
+    : m_color(color)
+{}
+void DateReader_US::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_month);
+    items.add(m_color, m_day);
+    items.add(m_color, m_year);
+    items.add(m_color, m_hour);
+    items.add(m_color, m_minute);
+    items.add(m_color, m_ampm);
+}
+DateTime DateReader_US::read_date(Logger& logger, std::shared_ptr<const ImageRGB32> screen){
+    logger.log("Attempting to read US date...");
+
+    DateTime date;
+
+    date.month = (int8_t)DateReaderTools::read_box(logger, 1, 12, *screen, m_month);
+    date.day = (int8_t)DateReaderTools::read_box(logger, 1, 31, *screen, m_day);
+    date.year = (int16_t)DateReaderTools::read_box(logger, 2000, 2060, *screen, m_year);
+    date.minute = (int8_t)DateReaderTools::read_box(logger, 0, 59, *screen, m_minute);
+
+    //  Hour
+    {
+        int hour = DateReaderTools::read_box(logger, 1, 12, *screen, m_hour);
+        if (hour == 12){
+            hour = 0;
+        }
+
+        ImageRGB32 us_ampm_filtered = DateReaderTools::filter_image(
+            extract_box_reference(*screen, m_ampm)
+        );
+
+        std::string ampm_ocr = OCR::ocr_read(Language::English, us_ampm_filtered);
+        if (ampm_ocr.back() == '\n'){
+            ampm_ocr.pop_back();
+        }
+        std::string ampm = utf32_to_str(OCR::normalize_utf32(ampm_ocr));
+
+        auto has_a = ampm.find('a') != std::string::npos;
+        auto has_p = ampm.find('p') != std::string::npos;
+
+        if (has_a && !has_p){
+            //  Do nothing.
+            logger.log("OCR Text: \"" + ampm_ocr + "\" -> \"" + ampm + "\" -> AM");
+        }else if (!has_a && has_p){
+            logger.log("OCR Text: \"" + ampm_ocr + "\" -> \"" + ampm + "\" -> PM");
+            hour += 12;
+        }else{
+            logger.log("OCR Text: \"" + ampm_ocr + "\" -> \"" + ampm + "\" -> ??", COLOR_RED);
+            hour = -1;
+        }
+
+        date.hour = (int8_t)hour;
+    }
+
+    if (date.day < 0 ||
+        date.month < 0 ||
+        date.year < 0 ||
+        date.hour < 0 ||
+        date.minute < 0
+    ){
+        report_error_to_telemetry(
+            &logger, ProgramInfo(),
+            "Failed to read date.",
+            {},
+            *screen
+        );
+    }
+
+    return date;
+}
+void DateReader_US::set_date(
+    const ProgramInfo& info, VideoStream& stream, ProControllerContext& context,
+    const DateTime& date
+){
+    stream.log("DateReader_US::set_date()");
+
+    int cursor_position = 0;
+
+    for (size_t attempts = 0; attempts < 10; attempts++){
+        context.wait_for_all_requests();
+        context.wait_for(std::chrono::milliseconds(250));
+
+        auto snapshot = stream.video().snapshot();
+        DateTime current = read_date(stream.logger(), snapshot);
+        if (current.year == date.year &&
+            current.month == date.month &&
+            current.day == date.day &&
+            current.hour == date.hour &&
+            current.minute == date.minute
+        ){
+            move_horizontal(context, cursor_position, 6);
+            return;
+        }
+
+        move_horizontal(context, cursor_position, 0);
+        if (current.month < 0){
+            stream.log("Failed to read month. Will not adjust.", COLOR_RED);
+        }else{
+            adjust_wrap(context, 1, 12, current.month, date.month);
+        }
+
+        move_horizontal(context, cursor_position, 1);
+        if (current.day < 0){
+            stream.log("Failed to read day. Will not adjust.", COLOR_RED);
+        }else{
+            adjust_no_wrap(context, current.day, date.day);
+        }
+
+        move_horizontal(context, cursor_position, 2);
+        if (current.year < 0){
+            stream.log("Failed to read year. Will not adjust.", COLOR_RED);
+        }else{
+            adjust_no_wrap(context, current.year, date.year);
+        }
+
+        move_horizontal(context, cursor_position, 3);
+        if (current.hour < 0){
+            stream.log("Failed to read hour. Will not adjust.", COLOR_RED);
+        }else{
+            int8_t c = current.hour;
+            int8_t t = date.hour;
+            if (c >= 12) c -= 12;
+            if (t >= 12) t -= 12;
+            adjust_wrap(context, 0, 11, c, t);
+        }
+
+        move_horizontal(context, cursor_position, 4);
+        if (current.minute < 0){
+            stream.log("Failed to read minutes. Will not adjust.", COLOR_RED);
+        }else{
+            adjust_wrap(context, 0, 59, current.minute, date.minute);
+        }
+
+        move_horizontal(context, cursor_position, 5);
+        if ((date.hour < 12) != (current.hour < 12)){
+            ssf_issue_scroll_ptv(context, SSF_SCROLL_DOWN);
+        }
+
+        move_horizontal(context, cursor_position, 6);
+    }
+
+    throw_and_log<OperationFailedExceptionWithScreenshot>(
+        stream.logger(), ErrorReportMode::SEND_ERROR_REPORT,
+        "Failed to set the hour after 10 attempts.",
+        stream
+    );
+}
+
+
+
+
+DateReader_Switch1_US::DateReader_Switch1_US(Color color)
+    : DateReader_US(color)
+{
+    m_month     = ImageFloatBox(0.090, 0.61, 0.06, 0.09);
+    m_day       = ImageFloatBox(0.193, 0.61, 0.06, 0.09);
+    m_year      = ImageFloatBox(0.300, 0.61, 0.11, 0.09);
+    m_hour      = ImageFloatBox(0.473, 0.61, 0.06, 0.09);
+    m_minute    = ImageFloatBox(0.574, 0.61, 0.06, 0.09);
+    m_ampm      = ImageFloatBox(0.663, 0.61, 0.07, 0.09);
+}
+DateReader_Switch2_US::DateReader_Switch2_US(Color color)
+    : DateReader_US(color)
+{
+    m_month     = ImageFloatBox(0.080, 0.436, 0.053, 0.095);
+    m_day       = ImageFloatBox(0.188, 0.436, 0.053, 0.095);
+    m_year      = ImageFloatBox(0.298, 0.436, 0.088, 0.095);
+    m_hour      = ImageFloatBox(0.463, 0.436, 0.053, 0.095);
+    m_minute    = ImageFloatBox(0.575, 0.436, 0.053, 0.095);
+    m_ampm      = ImageFloatBox(0.671, 0.436, 0.080, 0.095);
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManip_US.h b/SerialPrograms/Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManip_US.h
new file mode 100644
index 0000000000..165dc1809b
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManip_US.h
@@ -0,0 +1,88 @@
+/*  Date Manipulation (US)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_NintendoSwitch_DateManip_US_H
+#define PokemonAutomation_NintendoSwitch_DateManip_US_H
+
+#include <memory>
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "NintendoSwitch_DateManipTools.h"
+#include "NintendoSwitch_DateManipBase.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+
+
+class DateReader_US : public DateReaderBase{
+public:
+    DateReader_US(Color color);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual DateTime read_date(
+        Logger& logger,
+        std::shared_ptr<const ImageRGB32> screen
+    ) override;
+    virtual void set_date(
+        const ProgramInfo& info, VideoStream& stream, ProControllerContext& context,
+        const DateTime& date    //  Seconds is ignored.
+    ) override;
+
+protected:
+    virtual void move_horizontal(ProControllerContext& context, int& current, int desired) const = 0;
+    virtual void adjust_no_wrap(ProControllerContext& context, int current, int desired) const = 0;
+    virtual void adjust_wrap(ProControllerContext& context, int min, int max, int current, int desired) const = 0;
+
+protected:
+    Color m_color;
+    ImageFloatBox m_month;
+    ImageFloatBox m_day;
+    ImageFloatBox m_year;
+    ImageFloatBox m_hour;
+    ImageFloatBox m_minute;
+    ImageFloatBox m_ampm;
+};
+
+
+
+class DateReader_Switch1_US : public DateReader_US{
+public:
+    DateReader_Switch1_US(Color color);
+    virtual void move_horizontal(ProControllerContext& context, int& current, int desired) const override{
+        DateReaderTools::move_horizontal(context, current, desired);
+        current = desired;
+    }
+    virtual void adjust_no_wrap(ProControllerContext& context, int current, int desired) const override{
+        DateReaderTools::adjust_no_wrap_Switch1(context, current, desired);
+    }
+    virtual void adjust_wrap(ProControllerContext& context, int min, int max, int current, int desired) const override{
+        DateReaderTools::adjust_wrap_Switch1(context, min, max, current, desired);
+    }
+};
+class DateReader_Switch2_US : public DateReader_US{
+public:
+    DateReader_Switch2_US(Color color);
+    virtual void move_horizontal(ProControllerContext& context, int& current, int desired) const override{
+        DateReaderTools::move_horizontal(context, current, desired);
+        current = desired;
+    }
+    virtual void adjust_no_wrap(ProControllerContext& context, int current, int desired) const override{
+        DateReaderTools::adjust_no_wrap_Switch2(context, current, desired);
+    }
+    virtual void adjust_wrap(ProControllerContext& context, int min, int max, int current, int desired) const override{
+        DateReaderTools::adjust_wrap_Switch2(context, min, max, current, desired);
+    }
+};
+
+
+
+
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateSkippers.cpp b/SerialPrograms/Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateSkippers.cpp
new file mode 100644
index 0000000000..a87182ec4b
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateSkippers.cpp
@@ -0,0 +1,406 @@
+/*  Date Skippers
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/RecursiveThrottler.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "NintendoSwitch/Inference/NintendoSwitch_SelectedSettingDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace DateSkippers{
+namespace Switch1{
+
+
+
+
+void init_view(ProControllerContext& context){
+    ThrottleScope scope(context->logging_throttler());
+    if (scope){
+        context->logger().log("DateSkippers::Switch1::init_view()");
+    }
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 24ms, 48ms, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 24ms, 48ms, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 24ms, 48ms, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 24ms, 48ms, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 24ms, 48ms, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 24ms, 48ms, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_DOWN, 24ms, 48ms, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_DOWN, 24ms, 48ms, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_LEFT, 0ms, 48ms, 24ms);
+    ssf_press_button(context, BUTTON_A, 160ms, 80ms);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 24ms, 48ms, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 24ms, 48ms, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 24ms, 48ms, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 24ms, 48ms, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 24ms, 48ms, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 0ms, 48ms, 24ms);
+    ssf_press_button(context, BUTTON_A, 160ms, 80ms);
+}
+void auto_recovery(ProControllerContext& context){
+    //  Reset the state of the Date/Time menu to unsynced with cursor
+    //  over the "Date and Time" option.
+
+    //  Merge 3 different states. The 1st column is the error-free state.
+    //  There are more states than this, but the normal skipping loop will
+    //  eventually force them all into one of these 3 states.
+
+    //  Cost: 161 cycles
+
+    ThrottleScope scope(context->logging_throttler());
+    if (scope){
+        context->logger().log("DateSkippers::auto_recovery()");
+    }
+
+    //  menu-ok-2   menu-ok-0   menu-sy-0
+    for (uint8_t c = 0; c < 13; c++){
+        ssf_issue_scroll(context, SSF_SCROLL_DOWN, 24ms, 48ms, 24ms);
+    }
+//    pbf_wait(500);
+    ssf_issue_scroll(context, SSF_SCROLL_DOWN, 0ms, 48ms, 24ms);
+
+    //  menu-ok-2   menu-ok-2   menu-sy-1
+    ssf_press_button(context, BUTTON_A, 320ms, 80ms);
+    //  date-ok     date-ok     zone-sy
+    ssf_issue_scroll(context, SSF_SCROLL_LEFT, 0ms, 48ms, 24ms);
+    //  date-mn     date-mn     zone-sy
+    ssf_press_button(context, BUTTON_A, 320ms, 80ms);
+    //  date-ok     date-ok     menu-sy-1
+    ssf_issue_scroll(context, SSF_SCROLL_UP, 0ms, 48ms, 24ms);
+    //  date-ok     date-ok     menu-sy-0
+    ssf_press_button(context, BUTTON_A, 24ms, 48ms, 24ms);
+    //  menu-ok-2   menu-ok-2   menu-ok-0
+    for (uint8_t c = 0; c < 13; c++){
+        ssf_issue_scroll(context, SSF_SCROLL_DOWN, 24ms, 48ms, 24ms);
+    }
+    ssf_issue_scroll(context, SSF_SCROLL_DOWN, 0ms, 48ms, 24ms);
+    //  menu-ok-2   menu-ok-2   menu-ok-2
+//    pbf_wait(500);
+}
+void increment_day_with_feedback(VideoStream& stream, ProControllerContext& context, bool date_us){
+    //  60 cycles (robust 2)
+
+    ThrottleScope scope(context->logging_throttler());
+    if (scope){
+        context->logger().log("DateSkippers::Switch1::increment_day_with_feedback()");
+    }
+
+    size_t max_attempts = 5;
+    for (size_t i = 0; i < max_attempts; i++){
+
+    // ImageFloatBox date_box(0.30, 0.705, 0.1, 0.02);
+    // ImageFloatBox other_box1(0.30, 0.4, 0.1, 0.02);
+    // ImageFloatBox other_box2(0.30, 0.48, 0.1, 0.02);
+
+    context.wait_for_all_requests();
+    // context.wait_for(Milliseconds(10000));
+    // we expect Date and Time to be highlighted
+    ImageFloatBox date_time_box(0.50, 0.58, 0.1, 0.02);
+    // ImageFloatBox date_time_box(0.166, 0.495, 0.01, 0.08);
+    ImageFloatBox other_box1(0.01, 0.7, 0.1, 0.02);
+    ImageFloatBox other_box2(0.01, 0.75, 0.1, 0.02);
+    SelectedSettingWatcher date_time_selected(date_time_box, other_box1, other_box2);
+    int ret = wait_until(
+        stream, context,
+        Milliseconds(1000),
+        {date_time_selected}
+    );
+    if (ret < 0){  // failed to detect "Date and Time" being highlighted. 
+        auto_recovery(context);
+        continue;
+    }
+
+    //  Press A twice. If the 1st one gets dropped due to the exit
+    //  animation taking too long, the 2nd press will recover to
+    //  avoid the trapping error at the cost of losing the skip.
+    // if (i > 0){   // intentionally create a failure, for testing
+    ssf_press_button(context, BUTTON_A, 120ms);
+    ssf_press_button(context, BUTTON_A, 40ms);
+    // }
+
+    if (date_us){
+        ssf_issue_scroll(context, SSF_SCROLL_LEFT, 24ms);
+    }
+    ssf_issue_scroll(context, SSF_SCROLL_LEFT, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_LEFT, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_LEFT, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_UP, 0ms, 48ms, 24ms);
+
+    ssf_press_button(context, BUTTON_A, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 0ms, 48ms, 24ms);
+
+    //  Press A twice here to make sure we exit the window. If the 1st one is
+    //  dropped, we'll be slow to exit, but the 2nd A press of the next
+    //  iteration will correct this as there will be more than 20 ticks.
+    ssf_press_button(context, BUTTON_A, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 24ms);  //  Extra right presses to make sure we land on OK.
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 24ms);
+    ssf_press_button(context, BUTTON_A, 96ms);
+    return;
+    }
+}
+
+void increment_day(ProControllerContext& context, bool date_us){
+    //  60 cycles (robust 2)
+
+    ThrottleScope scope(context->logging_throttler());
+    if (scope){
+        context->logger().log("DateSkippers::Switch1::increment_day()");
+    }
+
+    //  Press A twice. If the 1st one gets dropped due to the exit
+    //  animation taking too long, the 2nd press will recover to
+    //  avoid the trapping error at the cost of losing the skip.
+    ssf_press_button(context, BUTTON_A, 120ms);
+    ssf_press_button(context, BUTTON_A, 40ms);
+
+    if (date_us){
+        ssf_issue_scroll(context, SSF_SCROLL_LEFT, 24ms, 48ms, 24ms);
+    }
+    ssf_issue_scroll(context, SSF_SCROLL_LEFT, 24ms, 48ms, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_LEFT, 24ms, 48ms, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_LEFT, 24ms, 48ms, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_UP,    0ms, 48ms, 24ms);
+
+    ssf_press_button(context, BUTTON_A, 16ms, 40ms, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 24ms, 48ms, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 24ms, 48ms, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT,  0ms, 48ms, 24ms);
+
+    //  Press A twice here to make sure we exit the window. If the 1st one is
+    //  dropped, we'll be slow to exit, but the 2nd A press of the next
+    //  iteration will correct this as there will be more than 20 ticks.
+    ssf_press_button(context, BUTTON_A, 24ms, 40ms, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 24ms, 48ms, 24ms);  //  Extra right presses to make sure we land on OK.
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 16ms, 48ms, 24ms);
+    ssf_press_button(context, BUTTON_A, 96ms);
+}
+void rollback_year_full(ProControllerContext& context, bool date_us){
+    ThrottleScope scope(context->logging_throttler());
+    if (scope){
+        context->logger().log("DateSkippers::Switch1::rollback_year_full()");
+    }
+
+    ssf_press_button(context, BUTTON_A, 96ms);
+    ssf_press_button(context, BUTTON_A, 64ms);
+
+    ssf_issue_scroll(context, SSF_SCROLL_LEFT, 24ms, 48ms, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_LEFT, 24ms, 48ms, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_LEFT, 24ms, 48ms, 24ms);
+    if (date_us){
+        ssf_issue_scroll(context, SSF_SCROLL_LEFT, 24ms, 48ms, 24ms);
+    }
+
+    for (uint8_t c = 0; c < 60; c++){
+        ssf_issue_scroll(context, SSF_SCROLL_DOWN, 24ms, 48ms, 24ms);
+    }
+    ssf_issue_scroll(context, SSF_SCROLL_DOWN, 0ms, 48ms, 24ms);
+
+    ssf_press_button(context, BUTTON_A, 16ms, 40ms, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 24ms, 48ms, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 24ms, 48ms, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT,  0ms, 48ms, 24ms);
+
+    //  Press A twice here to make sure we exit the window. If the 1st one is
+    //  dropped, we'll be slow to exit, but the 2nd A press of the next
+    //  iteration will correct this as there will be a full 24 ticks.
+    ssf_press_button(context, BUTTON_A, 24ms, 40ms, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 24ms, 48ms, 24ms);  //  Extra right presses to make sure we land on OK.
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 16ms, 48ms, 24ms);
+    ssf_press_button(context, BUTTON_A, 96ms);
+}
+void rollback_year_sync(ProControllerContext& context){
+    ThrottleScope scope(context->logging_throttler());
+    if (scope){
+        context->logger().log("DateSkippers::Switch1::rollback_year_sync()");
+    }
+
+//    pbf_wait(500);
+
+    //  We cannot enable time-sync too soon or the date change will not
+    //  register. This mean that an artificial delay is needed which slows
+    //  down the overall speed.
+
+    //  While we're waiting, we might as well spam up.
+    for (uint8_t c = 0; c < 13; c++){
+        ssf_issue_scroll(context, SSF_SCROLL_UP, 24ms, 48ms, 24ms);
+    }
+    ssf_issue_scroll(context, SSF_SCROLL_UP, 0ms, 48ms, 24ms);
+
+//    pbf_wait(36);
+
+    ssf_press_button(context, BUTTON_A, 80ms);
+    ssf_press_button(context, BUTTON_A, 120ms);
+
+    //  This is one more iteration than is needed for safety.
+    for (uint8_t c = 0; c < 10; c++){
+        ssf_issue_scroll(context, SSF_SCROLL_DOWN, 24ms, 48ms, 24ms);
+    }
+    ssf_issue_scroll(context, SSF_SCROLL_DOWN, 0ms, 48ms, 24ms);
+
+//    pbf_wait(500);
+}
+void increment_monthday(ProControllerContext& context){
+    //  69 cycles
+
+    ThrottleScope scope(context->logging_throttler());
+    if (scope){
+        context->logger().log("DateSkippers::Switch1::increment_monthday()");
+    }
+
+    //  Press A twice. If the 1st one gets dropped due to the exit
+    //  animation taking too long, the 2nd press will recover to
+    //  avoid the trapping error at the cost of losing the skip.
+    ssf_press_button(context, BUTTON_A, 120ms);
+    ssf_press_button(context, BUTTON_A, 40ms);
+
+    ssf_issue_scroll(context, SSF_SCROLL_LEFT, 24ms, 48ms, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_LEFT, 24ms, 48ms, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_LEFT, 24ms, 48ms, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_LEFT, 24ms, 48ms, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_UP,    0ms, 48ms, 24ms);
+
+    ssf_press_button(context, BUTTON_A, 64ms);      //  Seems to work at 7.
+    ssf_issue_scroll(context, SSF_SCROLL_UP, 24ms, 48ms, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 24ms, 48ms, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 24ms, 48ms, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT,  0ms, 48ms, 24ms);
+
+    //  Press A twice here to make sure we exit the window. If the 1st one is
+    //  dropped, we'll be slow to exit, but the 2nd A press of the next
+    //  iteration will correct this as there will be more than 20 ticks.
+    ssf_press_button(context, BUTTON_A, 24ms, 40ms, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 24ms, 48ms, 24ms);  //  Extra right presses to make sure we land on OK.
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 16ms, 48ms, 24ms);
+    ssf_press_button(context, BUTTON_A, 96ms);
+}
+void increment_daymonth(ProControllerContext& context){
+    //  64 cycles
+
+    ThrottleScope scope(context->logging_throttler());
+    if (scope){
+        context->logger().log("DateSkippers::Switch1::increment_daymonth()");
+    }
+
+    //  Press A twice. If the 1st one gets dropped due to the exit
+    //  animation taking too long, the 2nd press will recover to
+    //  avoid the trapping error at the cost of losing the skip.
+    ssf_press_button(context, BUTTON_A, 96ms);
+    ssf_press_button(context, BUTTON_A, 64ms);
+
+    ssf_issue_scroll(context, SSF_SCROLL_LEFT, 24ms, 48ms, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_LEFT, 24ms, 48ms, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_LEFT, 24ms, 48ms, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_UP,   24ms, 48ms, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_LEFT, 24ms, 48ms, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_UP,   0ms, 48ms, 24ms);
+
+    ssf_press_button(context, BUTTON_A, 24ms, 48ms, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 24ms, 48ms, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 24ms, 48ms, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 0ms, 48ms, 24ms);
+
+    //  Press A twice here to make sure we exit the window. If the 1st one is
+    //  dropped, we'll be slow to exit, but the 2nd A press of the next
+    //  iteration will correct this as there will be more than 20 ticks.
+    ssf_press_button(context, BUTTON_A, 24ms, 40ms, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 24ms, 48ms, 24ms); //  Extra right presses to make sure we land on OK.
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 16ms, 48ms, 24ms);
+    ssf_press_button(context, BUTTON_A, 96ms);
+}
+void increment_month(ProControllerContext& context, uint8_t days){
+    if (days < 31){
+        increment_monthday(context);
+    }else{
+        increment_daymonth(context);
+    }
+}
+void increment_all(ProControllerContext& context){
+    //  72 cycles
+
+    ThrottleScope scope(context->logging_throttler());
+    if (scope){
+        context->logger().log("DateSkippers::Switch1::increment_all()");
+    }
+
+    //  Press A twice. If the 1st one gets dropped due to the exit
+    //  animation taking too long, the 2nd press will recover to
+    //  avoid the trapping error at the cost of losing the skip.
+    ssf_press_button(context, BUTTON_A, 96ms);
+    ssf_press_button(context, BUTTON_A, 64ms);
+
+    ssf_issue_scroll(context, SSF_SCROLL_LEFT, 24ms, 48ms, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_LEFT, 24ms, 48ms, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_LEFT, 24ms, 48ms, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_UP,   24ms, 48ms, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_LEFT, 24ms, 48ms, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_UP,   24ms, 48ms, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_LEFT, 24ms, 48ms, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_UP,    0ms, 48ms, 24ms);
+
+    ssf_press_button(context, BUTTON_A, 16ms, 48ms, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 24ms, 48ms, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 24ms, 48ms, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 24ms, 48ms, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT,  0ms, 48ms, 24ms);
+
+    //  Press A twice here to make sure we exit the window. If the 1st one is
+    //  dropped, we'll be slow to exit, but the 2nd A press of the next
+    //  iteration will correct this as there will be more than 20 ticks.
+    ssf_press_button(context, BUTTON_A, 24ms, 40ms, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 24ms, 48ms, 24ms); //  Extra right presses to make sure we land on OK.
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 16ms, 48ms, 24ms);
+    ssf_press_button(context, BUTTON_A, 96ms);
+}
+void increment_all_rollback(ProControllerContext& context){
+    //  249 cycles
+
+    ThrottleScope scope(context->logging_throttler());
+    if (scope){
+        context->logger().log("DateSkippers::Switch1::increment_all_rollback()");
+    }
+
+    //  Press A twice. If the 1st one gets dropped due to the exit
+    //  animation taking too long, the 2nd press will recover to
+    //  avoid the trapping error at the cost of losing the skip.
+    ssf_press_button(context, BUTTON_A, 96ms);
+    ssf_press_button(context, BUTTON_A, 64ms);
+
+    ssf_issue_scroll(context, SSF_SCROLL_LEFT, 24ms, 48ms, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_LEFT, 24ms, 48ms, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_LEFT, 24ms, 48ms, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_UP,   24ms, 48ms, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_LEFT, 24ms, 48ms, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_UP,   24ms, 48ms, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_LEFT, 24ms, 48ms, 24ms);
+    for (uint8_t c = 60; c > 1; c--){
+        ssf_issue_scroll(context, SSF_SCROLL_DOWN, 24ms, 48ms, 24ms);
+    }
+    ssf_issue_scroll(context, SSF_SCROLL_DOWN,   0ms, 48ms, 24ms);
+    ssf_press_button(context, BUTTON_A, 16ms, 48ms, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 24ms, 48ms, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 24ms, 48ms, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 24ms, 48ms, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 0ms, 48ms, 24ms);
+
+    //  Press A twice here to make sure we exit the window. If the 1st one is
+    //  dropped, we'll be slow to exit, but the 2nd A press of the next
+    //  iteration will correct this as there will be more than 20 ticks.
+    ssf_press_button(context, BUTTON_A, 24ms, 40ms, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 24ms, 48ms, 24ms);  //  Extra right presses to make sure we land on OK.
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 16ms, 48ms, 24ms);
+    ssf_press_button(context, BUTTON_A, 96ms);
+}
+
+
+
+
+}
+}
+}
+}
diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateSkippers.h b/SerialPrograms/Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateSkippers.h
new file mode 100644
index 0000000000..a302f97c57
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateSkippers.h
@@ -0,0 +1,43 @@
+/*  Date Skippers
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_NintendoSwitch_DateSkippers_H
+#define PokemonAutomation_NintendoSwitch_DateSkippers_H
+
+#include "CommonFramework/Tools/VideoStream.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace DateSkippers{
+
+
+namespace Switch1{
+    void init_view(ProControllerContext& context);
+    void auto_recovery(ProControllerContext& context);
+    void increment_day_with_feedback(VideoStream& stream, ProControllerContext& context, bool date_us);
+    void increment_day(ProControllerContext& context, bool date_us);
+    void rollback_year_full(ProControllerContext& context, bool date_us);
+    void rollback_year_sync(ProControllerContext& context);
+    void increment_monthday(ProControllerContext& context);
+    void increment_daymonth(ProControllerContext& context);
+    void increment_month(ProControllerContext& context, uint8_t days);
+    void increment_all(ProControllerContext& context);
+    void increment_all_rollback(ProControllerContext& context);
+}
+namespace Switch2{
+    void init_view(ProControllerContext& context);
+    void increment_day_us(ProControllerContext& context);
+    void increment_day_eu(ProControllerContext& context);
+    void increment_day_jp(ProControllerContext& context);
+}
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch1_HomeToDateTime.cpp b/SerialPrograms/Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch1_HomeToDateTime.cpp
new file mode 100644
index 0000000000..2f8dda3da1
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch1_HomeToDateTime.cpp
@@ -0,0 +1,572 @@
+/*  Nintendo Switch 2 Home To Date-Time
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/RecursiveThrottler.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+//#include "CommonFramework/VideoPipeline/VideoFeed.h"
+//#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+//#include "NintendoSwitch/NintendoSwitch_ConsoleHandle.h"
+#include "NintendoSwitch/Inference/NintendoSwitch_SelectedSettingDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+
+
+
+void home_to_date_time_Switch1_wired_blind(
+    Logger& logger, ProControllerContext& context, bool to_date_change
+){
+    ThrottleScope scope(context->logging_throttler());
+    if (scope){
+        context->logger().log("NintendoSwitch::home_to_date_time_Switch1_wired_blind()");
+    }
+
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 32ms);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 32ms);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 32ms);
+
+    //  Down twice in case we drop one.
+    ssf_issue_scroll(context, SSF_SCROLL_DOWN, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_DOWN, 32ms);
+
+    ssf_issue_scroll(context, SSF_SCROLL_LEFT, 0ms, 48ms, 24ms);
+
+    //  Two A presses in case we drop the 1st one.
+    ssf_press_button(context, BUTTON_A, 24ms, 40ms, 24ms);
+    ssf_press_button(context, BUTTON_A, 24ms, 48ms, 24ms);
+
+    //  Just button mash it. lol
+    {
+        auto iterations = Milliseconds(1200) / 24ms + 1;
+        do{
+            ssf_issue_scroll(context, SSF_SCROLL_DOWN, 24ms);
+        }while (--iterations);
+    }
+
+    //  Scroll left and press A to exit the sleep menu if we happened to
+    //  land there.
+    ssf_issue_scroll(context, SSF_SCROLL_LEFT, 24ms);
+    ssf_press_button(context, BUTTON_A, 24ms, 48ms, 24ms);
+
+    {
+        auto iterations = Milliseconds(312) / 24ms + 1;
+        do{
+            ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 24ms);
+        }while (--iterations);
+    }
+
+    ssf_issue_scroll(context, SSF_SCROLL_DOWN, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_DOWN, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_DOWN, 80ms, 40ms, 24ms);
+    ssf_press_dpad(context, DPAD_DOWN, 360ms, 320ms);
+    ssf_issue_scroll(context, SSF_SCROLL_DOWN, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_DOWN, 24ms);
+
+    if (!to_date_change){
+        //  Triple up this A press to make sure it gets through.
+        ssf_press_button(context, BUTTON_A, 24ms, 48ms, 24ms);
+        ssf_press_button(context, BUTTON_A, 24ms, 48ms, 24ms);
+        ssf_press_button(context, BUTTON_A, 360ms, 48ms, 24ms);
+        return;
+    }
+
+    //  Triple up this A press to make sure it gets through.
+    ssf_press_button(context, BUTTON_A, 24ms, 48ms, 24ms);
+    ssf_press_button(context, BUTTON_A, 24ms, 48ms, 24ms);
+    ssf_press_button(context, BUTTON_A, 24ms, 48ms, 24ms);
+    {
+        auto iterations = Milliseconds(250) / 24ms + 1;
+        do{
+            ssf_issue_scroll(context, SSF_SCROLL_DOWN, 24ms);
+        }while (--iterations);
+    }
+//        ssf_issue_scroll(context, SSF_SCROLL_DOWN, 0);
+
+    //  Left scroll in case we missed and landed in the language change or sleep
+    //  confirmation menus.
+    ssf_issue_scroll(context, SSF_SCROLL_LEFT, 0ms);
+}
+void home_to_date_time_Switch1_wireless_blind(
+    Logger& logger, ProControllerContext& context, bool to_date_change
+){
+    ThrottleScope scope(context->logging_throttler());
+    if (scope){
+        context->logger().log("NintendoSwitch::home_to_date_time_Switch1_wireless_blind()");
+    }
+
+    Milliseconds tv = context->timing_variation();
+    Milliseconds unit = 24ms + tv;
+
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
+
+    //  Down twice in case we drop one.
+    ssf_issue_scroll(context, SSF_SCROLL_DOWN, unit);
+    ssf_issue_scroll(context, SSF_SCROLL_DOWN, unit);
+
+    ssf_issue_scroll(context, SSF_SCROLL_LEFT, 0ms, 2*unit, unit);
+
+    //  Press A multiple times to make sure one goes through.
+    pbf_press_button(context, BUTTON_A, 2*unit, unit);
+    pbf_press_button(context, BUTTON_A, 2*unit, unit);
+    pbf_press_button(context, BUTTON_A, 2*unit, unit);
+
+    //  Just button mash it. lol
+    {
+        auto iterations = Milliseconds(1100) / unit + 1;
+        do{
+            ssf_issue_scroll(context, SSF_SCROLL_DOWN, unit);
+        }while (--iterations);
+    }
+
+    //  Scroll left and press A to exit the sleep menu if we happened to
+    //  land there.
+    ssf_issue_scroll(context, SSF_SCROLL_LEFT, unit);
+    ssf_press_button(context, BUTTON_A, unit, 2*unit, unit);
+
+    {
+        auto iterations = Milliseconds(312) / unit + 1;
+        do{
+            ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
+        }while (--iterations);
+    }
+
+    ssf_issue_scroll(context, SSF_SCROLL_DOWN, unit);
+    ssf_issue_scroll(context, SSF_SCROLL_DOWN, unit);
+    ssf_issue_scroll(context, SSF_SCROLL_DOWN, 400ms, 2*unit, unit);
+    ssf_press_dpad(context, DPAD_DOWN, 360ms, 304ms);
+    ssf_issue_scroll(context, SSF_SCROLL_DOWN, unit);
+    ssf_issue_scroll(context, SSF_SCROLL_DOWN, unit);
+
+    if (!to_date_change){
+        //  Triple up this A press to make sure it gets through.
+        ssf_press_button(context, BUTTON_A, unit);
+        ssf_press_button(context, BUTTON_A, unit);
+        ssf_press_button(context, BUTTON_A, 360ms, 2*unit, unit);
+        return;
+    }
+
+    //  Triple up this A press to make sure it gets through.
+    ssf_press_button(context, BUTTON_A, unit);
+    ssf_press_button(context, BUTTON_A, unit);
+    ssf_press_button(context, BUTTON_A, unit);
+    {
+        auto iterations = Milliseconds(250) / unit + 1;
+        do{
+            ssf_issue_scroll(context, SSF_SCROLL_DOWN, unit);
+        }while (--iterations);
+    }
+
+    //  Left scroll in case we missed landed in the language change or sleep
+    //  confirmation menus.
+    ssf_issue_scroll(context, SSF_SCROLL_LEFT, 0ms, 2*unit, unit);
+
+}
+void home_to_date_time_Switch1_sbb_blind(
+    Logger& logger, ProControllerContext& context, bool to_date_change
+){
+    ThrottleScope scope(context->logging_throttler());
+    if (scope){
+        context->logger().log("NintendoSwitch::home_to_date_time_Switch1_sbb_blind()");
+    }
+
+    Milliseconds tv = context->timing_variation();
+//        ssf_do_nothing(context, 1500ms);
+
+    ssf_issue_scroll_ptv(context, SSF_SCROLL_RIGHT);
+    ssf_issue_scroll_ptv(context, SSF_SCROLL_RIGHT);
+    ssf_issue_scroll_ptv(context, SSF_SCROLL_RIGHT);
+
+    //  Down twice in case we drop one.
+    ssf_issue_scroll_ptv(context, SSF_SCROLL_DOWN);
+//        ssf_issue_scroll_ptv(context, SSF_SCROLL_DOWN);
+
+    ssf_issue_scroll_ptv(context, SSF_SCROLL_LEFT);
+
+    //  Press A multiple times to make sure one goes through.
+    ssf_mash1_button(context, BUTTON_A, 200ms);
+    ssf_issue_scroll_ptv(context, SSF_SCROLL_DOWN, 2500ms, 2500ms);
+    ssf_issue_scroll_ptv(context, SSF_SCROLL_RIGHT, 500ms, 500ms);
+
+    ssf_issue_scroll_ptv(context, SSF_SCROLL_DOWN);
+    ssf_issue_scroll_ptv(context, SSF_SCROLL_DOWN);
+    ssf_issue_scroll(context, SSF_SCROLL_DOWN, 500ms, tv, tv);
+    ssf_press_right_joystick(context, {0, -0.75}, 1000ms, 300ms, tv);
+//        ssf_issue_scroll(context, SSF_SCROLL_DOWN, 1000ms, 250ms, tv);  //  Scroll down
+    ssf_issue_scroll_ptv(context, SSF_SCROLL_DOWN);
+    ssf_issue_scroll_ptv(context, SSF_SCROLL_DOWN);
+
+    if (!to_date_change){
+        ssf_press_button_ptv(context, BUTTON_A);
+        return;
+    }
+
+    ssf_press_button_ptv(context, BUTTON_A, 1000ms);
+    ssf_issue_scroll_ptv(context, SSF_SCROLL_DOWN);
+    ssf_issue_scroll_ptv(context, SSF_SCROLL_DOWN);
+}
+
+
+void home_to_date_time_Switch1_wired_feedback(
+    VideoStream& stream, ProControllerContext& context, bool to_date_change
+){
+    stream.log("home_to_date_time_Switch1_wired_with_feedback()");
+
+    size_t max_attempts = 5;
+    for (size_t i = 0; i < max_attempts; i++){
+        {
+            ThrottleScope scope(context->logging_throttler());
+            if (scope){
+                context->logger().log("NintendoSwitch::home_to_date_time_Switch1_wired_feedback() - Part 1/3");
+            }
+
+            ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 32ms);
+            ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 32ms);
+            ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 32ms);
+
+            //  Down twice in case we drop one.
+            ssf_issue_scroll(context, SSF_SCROLL_DOWN, 24ms);
+            ssf_issue_scroll(context, SSF_SCROLL_DOWN, 32ms);
+
+            // if (i > 0){  // intentionally create a failure, for testing
+            ssf_issue_scroll(context, SSF_SCROLL_LEFT, 0ms, 40ms, 24ms);
+            // }
+
+
+            // ImageFloatBox system_icon(0.685, 0.69, 0.05, 0.03);
+            // ImageFloatBox other_setting1(0.615, 0.69, 0.05, 0.03);
+            // ImageFloatBox other_setting2(0.545, 0.69, 0.05, 0.03);
+
+            //  Two A presses in case we drop the 1st one.
+            //  the program can self recover even if the second button press is registered.
+            ssf_press_button(context, BUTTON_A, 24ms, 40ms, 24ms);
+            ssf_press_button(context, BUTTON_A, 24ms, 48ms, 24ms);
+
+            //  Just button mash it. lol
+            {
+                auto iterations = Milliseconds(1200) / 24ms + 1;
+                do{
+                    ssf_issue_scroll(context, SSF_SCROLL_DOWN, 24ms);
+                }while (--iterations);
+            }
+        }
+
+        context.wait_for_all_requests();
+        // Should now be in System Settings, with System highlighted
+        ImageFloatBox system_setting_box(0.056, 0.74, 0.01, 0.1);
+        ImageFloatBox other_setting1(0.04, 0.74, 0.01, 0.1);
+        ImageFloatBox other_setting2(0.02, 0.74, 0.01, 0.1);
+        SelectedSettingWatcher system_setting_selected(system_setting_box, other_setting1, other_setting2);
+        int ret = run_until<ProControllerContext>(
+            stream, context,
+            [](ProControllerContext& context){
+                for (int i = 0; i < 10; i++){
+                    ssf_issue_scroll(context, SSF_SCROLL_DOWN, 24ms);
+                }
+            },
+            {system_setting_selected}
+        );
+        if (ret < 0){  // failed to detect "System" being highlighted. press home and re-try
+            stream.log(
+                "home_to_date_time_Switch1_wired_feedback: Failed to detect 'System' being highlighted. Re-try",
+                COLOR_YELLOW
+            );
+            pbf_press_button(context, BUTTON_HOME, 100ms, 2000ms);
+            continue;
+        }
+
+        {
+            ThrottleScope scope(context->logging_throttler());
+            if (scope){
+                context->logger().log("NintendoSwitch::home_to_date_time_Switch1_wired_feedback() - Part 2/3");
+            }
+
+            {
+                auto iterations = Milliseconds(312) / 24ms + 1;
+                do{
+                    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 24ms);
+                }while (--iterations);
+            }
+
+            ssf_issue_scroll(context, SSF_SCROLL_DOWN, 24ms);
+            ssf_issue_scroll(context, SSF_SCROLL_DOWN, 24ms);
+            ssf_issue_scroll(context, SSF_SCROLL_DOWN, 80ms, 40ms, 24ms);
+            ssf_press_dpad(context, DPAD_DOWN, 360ms, 320ms);
+            ssf_issue_scroll(context, SSF_SCROLL_DOWN, 24ms);
+            // if (i > 1){  // intentionally create a failure, for testing
+            ssf_issue_scroll(context, SSF_SCROLL_DOWN, 24ms);
+            // }
+
+            // only one ButtonA press since the program can self-recover if the button is dropped.
+            // furthermore, the program can't self-recover if a second button press is registered.
+            ssf_press_button(context, BUTTON_A, 24ms, 48ms, 24ms);
+        }
+
+
+        context.wait_for_all_requests();
+        context.wait_for(Milliseconds(300));
+        // we expect to be within "Date and Time", with "Synchronize Clock via Internet" being highlighted
+        ImageFloatBox sync_clock_box(0.168, 0.185, 0.01, 0.1);
+        ImageFloatBox other_setting3(0.1, 0.185, 0.01, 0.1);
+        ImageFloatBox other_setting4(0.05, 0.185, 0.01, 0.1);
+        SelectedSettingWatcher sync_clock_selected(sync_clock_box, other_setting3, other_setting4);
+        ret = wait_until(
+            stream, context,
+            Milliseconds(2000),
+            {sync_clock_selected}
+        );
+        if (ret < 0){  // failed to detect "Synchronize clock" being highlighted. press home and re-try
+            stream.log(
+                "home_to_date_time_Switch1_wired_feedback: Failed to detect 'Synchronize clock' being highlighted. Re-try",
+                COLOR_YELLOW
+            );
+            pbf_press_button(context, BUTTON_HOME, 100ms, 2000ms);
+            continue;
+        }
+
+
+        if (!to_date_change){
+            stream.log("Arrived at Date and Time.", COLOR_ORANGE);
+            return;
+        }
+
+        ThrottleScope scope(context->logging_throttler());
+        if (scope){
+            context->logger().log("NintendoSwitch::home_to_date_time_Switch1_wired_feedback() - Part 3/3");
+        }
+
+
+        {
+            auto iterations = Milliseconds(250) / 24ms + 1;
+            do{
+                ssf_issue_scroll(context, SSF_SCROLL_DOWN, 24ms);
+            }while (--iterations);
+        }
+
+        //  Left scroll in case we missed landed in the language change or sleep
+        //  confirmation menus.
+        ssf_issue_scroll(context, SSF_SCROLL_LEFT, 0ms);
+        stream.log("Arrived at Date and Time, date change.", COLOR_ORANGE);
+        return;
+    }
+
+    OperationFailedExceptionWithScreenshot::fire(
+        ErrorReportMode::SEND_ERROR_REPORT,
+        "home_to_date_time(): Failed to reach Date and Time after several attempts.",
+        stream
+    );
+
+}
+
+void home_to_date_time_Switch1_wireless_feedback(
+    VideoStream& stream, ProControllerContext& context, bool to_date_change
+){
+    stream.log("home_to_date_time_Switch1_wireless_feedback()");
+
+    size_t max_attempts = 5;
+    for (size_t i = 0; i < max_attempts; i++){
+        ThrottleScope scope(context->logging_throttler());
+        if (scope){
+            context->logger().log("NintendoSwitch::home_to_date_time_Switch1_wireless_feedback()");
+        }
+
+        Milliseconds tv = context->timing_variation();
+        Milliseconds unit = 24ms + tv;
+
+        ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
+        ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
+        ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
+
+        //  Down twice in case we drop one.
+        ssf_issue_scroll(context, SSF_SCROLL_DOWN, unit);
+        ssf_issue_scroll(context, SSF_SCROLL_DOWN, unit);
+
+        ssf_issue_scroll(context, SSF_SCROLL_LEFT, 0ms, 2*unit, unit);
+
+        //  Two A presses in case we drop the 1st one.
+        //  the program can self recover even if the second button press is registered.
+        pbf_press_button(context, BUTTON_A, 2*unit, unit);
+        pbf_press_button(context, BUTTON_A, 2*unit, unit);
+
+        //  Just button mash it. lol
+        {
+            auto iterations = Milliseconds(1100) / unit + 1;
+            do{
+                ssf_issue_scroll(context, SSF_SCROLL_DOWN, unit);
+            }while (--iterations);
+        }
+
+        context.wait_for_all_requests();
+        // Should now be in System Settings, with System highlighted
+        ImageFloatBox system_setting_box(0.056, 0.74, 0.01, 0.1);
+        ImageFloatBox other_setting1(0.04, 0.74, 0.01, 0.1);
+        ImageFloatBox other_setting2(0.02, 0.74, 0.01, 0.1);
+        SelectedSettingWatcher system_setting_selected(system_setting_box, other_setting1, other_setting2);
+        int ret = run_until<ProControllerContext>(
+            stream, context,
+            [&](ProControllerContext& context){
+                for (int i = 0; i < 10; i++){
+                    ssf_issue_scroll(context, SSF_SCROLL_DOWN, unit);
+                }
+            },
+            {system_setting_selected}
+        );
+        if (ret < 0){  // failed to detect "System" being highlighted. press home and re-try
+            stream.log(
+                "home_to_date_time_Switch1_wireless_feedback: Failed to detect 'System' being highlighted. Re-try",
+                COLOR_YELLOW
+            );
+            pbf_press_button(context, BUTTON_HOME, 100ms, 2000ms);
+            continue;
+        }        
+
+        {
+            auto iterations = Milliseconds(312) / unit + 1;
+            do{
+                ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
+            }while (--iterations);
+        }
+
+        ssf_issue_scroll(context, SSF_SCROLL_DOWN, unit);
+        ssf_issue_scroll(context, SSF_SCROLL_DOWN, unit);
+        ssf_issue_scroll(context, SSF_SCROLL_DOWN, 400ms, 2*unit, unit);
+        ssf_press_dpad(context, DPAD_DOWN, 360ms, 304ms);
+        ssf_issue_scroll(context, SSF_SCROLL_DOWN, unit);
+        // if (i > 1){  // intentionally create a failure, for testing
+        ssf_issue_scroll(context, SSF_SCROLL_DOWN, unit);
+        // }
+
+        // only one ButtonA press since the program can self-recover if the button is dropped.
+        // furthermore, the program can't self-recover if a second button press is registered.
+        ssf_press_button(context, BUTTON_A, 360ms, 2*unit, unit);
+
+        context.wait_for_all_requests();
+        context.wait_for(Milliseconds(300));
+        // we expect to be within "Date and Time", with "Synchronize Clock via Internet" being highlighted
+        ImageFloatBox sync_clock_box(0.168, 0.185, 0.01, 0.1);
+        ImageFloatBox other_setting3(0.1, 0.185, 0.01, 0.1);
+        ImageFloatBox other_setting4(0.05, 0.185, 0.01, 0.1);
+        SelectedSettingWatcher sync_clock_selected(sync_clock_box, other_setting3, other_setting4);
+        ret = wait_until(
+            stream, context,
+            Milliseconds(2000),
+            {sync_clock_selected}
+        );
+        if (ret < 0){  // failed to detect "Synchronize clock" being highlighted. press home and re-try
+            stream.log(
+                "home_to_date_time_Switch1_wireless_feedback: Failed to detect 'Synchronize clock' being highlighted. Re-try",
+                COLOR_YELLOW
+            );
+            pbf_press_button(context, BUTTON_HOME, 100ms, 2000ms);
+            continue;
+        }
+
+
+        if (!to_date_change){
+            stream.log("Arrived at Date and Time.", COLOR_ORANGE);
+            return;
+        }        
+
+
+        {
+            auto iterations = Milliseconds(250) / unit + 1;
+            do{
+                ssf_issue_scroll(context, SSF_SCROLL_DOWN, unit);
+            }while (--iterations);
+        }
+
+        //  Left scroll in case we missed landed in the language change or sleep
+        //  confirmation menus.
+        ssf_issue_scroll(context, SSF_SCROLL_LEFT, 0ms, 2*unit, unit);
+        stream.log("Arrived at Date and Time, date change.", COLOR_ORANGE);
+        return;
+    }
+
+    OperationFailedExceptionWithScreenshot::fire(
+        ErrorReportMode::SEND_ERROR_REPORT,
+        "home_to_date_time(): Failed to reach Date and Time after several attempts.",
+        stream
+    );    
+
+}
+
+
+
+
+void home_to_date_time_Switch1_joycon_blind(JoyconContext& context, bool to_date_change){
+    ThrottleScope scope(context->logging_throttler());
+    if (scope){
+        context->logger().log("NintendoSwitch::home_to_date_time_Switch1_joycon_blind()");
+    }
+
+    Milliseconds tv = context->timing_variation();
+    Milliseconds unit = 100ms + tv;
+
+    //From ControllerPerformanceClass::SerialPABotBase_Wireless
+    //as Joycon will only have that controller type
+
+    pbf_move_joystick(context, {+1, 0}, unit, unit);
+    pbf_move_joystick(context, {+1, 0}, unit, unit);
+    pbf_move_joystick(context, {+1, 0}, unit, unit);
+
+    //  Down twice in case we drop one.
+    pbf_move_joystick(context, {0, -1}, unit, unit);
+    pbf_move_joystick(context, {0, -1}, unit, unit);
+
+    pbf_move_joystick(context, {-1, 0}, unit, unit);
+
+    //  Press A multiple times to make sure one goes through.
+    pbf_press_button(context, BUTTON_A, unit, unit);
+    pbf_press_button(context, BUTTON_A, unit, unit);
+    pbf_press_button(context, BUTTON_A, unit, unit);
+
+    // Scroll to System, move right to top option (update)
+    pbf_move_joystick(context, {0, -1}, 2500ms, unit);
+    pbf_move_joystick(context, {+1, 0}, 500ms, unit);
+
+    // To date/time
+    pbf_move_joystick(context, {0, -1}, unit, unit);
+    pbf_move_joystick(context, {0, -1}, unit, unit);
+    context.wait_for_all_requests();
+    pbf_move_joystick(context, {0, -1}, 525ms, unit);
+    //pbf_move_joystick(context, {0, -1}, 365ms, 305ms);
+    pbf_move_joystick(context, {0, -1}, unit, unit);
+    //pbf_move_joystick(context, {0, -1}, 2*unit, unit);
+    context.wait_for_all_requests();
+
+    if (!to_date_change){
+        ssf_press_button(context, BUTTON_A, 360ms, unit, unit);
+        return;
+    }
+
+    //ssf_press_button(context, BUTTON_A, unit);
+    pbf_press_button(context, BUTTON_A, unit, unit);
+    context.wait_for_all_requests();
+    {
+        auto iterations = Milliseconds(216) / unit + 1;
+        do{
+            pbf_move_joystick(context, {0, -1}, unit, unit);
+        }while (--iterations);
+    }
+    pbf_move_joystick(context, {0, -1}, unit, 0ms);
+}
+
+
+
+
+
+
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch2_HomeToDateTime.cpp b/SerialPrograms/Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch2_HomeToDateTime.cpp
new file mode 100644
index 0000000000..decda674a3
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch2_HomeToDateTime.cpp
@@ -0,0 +1,295 @@
+/*  Nintendo Switch 2 Home To Date-Time
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/RecursiveThrottler.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "NintendoSwitch/Inference/NintendoSwitch2_BinarySliderDetector.h"
+#include "NintendoSwitch/NintendoSwitch_ConsoleHandle.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+
+
+template <typename ControllerContext>
+ConsoleType settings_detect_console_type(
+    ConsoleHandle& console, ControllerContext& context
+){
+    ConsoleType console_type = console.state().console_type();
+    console.log(std::string("Console Type: ") + ConsoleType_strings(console_type));
+
+    //  We already know for sure the Switch type.
+    if (console_type != ConsoleType::Switch2_Unknown &&
+        console.state().console_type_confirmed()
+    ){
+        return console_type;
+    }
+
+    console.log("Console type unknown or not confirmed. Attempting to detect...");
+
+    VideoOverlaySet overlays(console.overlay());
+    BinarySliderDetector detector(COLOR_BLUE, {0.836431, 0.097521, 0.069703, 0.796694});
+    detector.make_overlays(overlays);
+
+    ssf_do_nothing(context, 500ms);
+    for (size_t c = 0; c < 6; c++){
+        ssf_issue_scroll(context, SSF_SCROLL_DOWN, 200ms, 100ms, 100ms);
+    }
+    ssf_do_nothing(context, 500ms);
+    context.wait_for_all_requests();
+
+    auto snapshot = console.video().snapshot();
+//    snapshot->save("screenshot.png");
+    size_t sliders = detector.detect(snapshot).size();
+    switch (sliders){
+    case 1:
+    case 2:
+        console.state().set_console_type(console, ConsoleType::Switch2_FW20_International);
+        break;
+    case 3:
+        console.state().set_console_type(console, ConsoleType::Switch2_FW20_JapanLocked);
+        break;
+    default:
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::NO_ERROR_REPORT,
+            "Unable to detect if this Switch 2 model is international or Japan-locked.",
+            console, std::move(snapshot)
+        );
+    }
+    console_type = console.state().console_type();
+    console.log(std::string("Detected console type as: ") + ConsoleType_strings(console_type));
+
+    //  Scroll back up.
+    for (size_t c = 0; c < 7; c++){
+        ssf_issue_scroll(context, SSF_SCROLL_UP, 200ms, 100ms, 100ms);
+    }
+    ssf_do_nothing(context, 500ms);
+
+    return console_type;
+}
+
+
+
+
+
+
+void home_to_settings_Switch2_procon_blind(
+    ProControllerContext& context
+){
+    ThrottleScope scope(context->logging_throttler());
+    if (scope){
+        context->logger().log("NintendoSwitch::home_to_settings_Switch2_procon_blind()");
+    }
+
+    Milliseconds tv = context->timing_variation();
+    Milliseconds unit0 = 24ms + tv;
+    Milliseconds unit1 = 32ms + tv;
+
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit1);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit1);
+
+    //  Down twice in case we drop one.
+    ssf_issue_scroll(context, SSF_SCROLL_DOWN, unit1);
+    ssf_issue_scroll(context, SSF_SCROLL_DOWN, unit1);
+
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit1);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit1);
+
+    //  Two A presses in case we drop the 1st one.
+    ssf_press_button(context, BUTTON_A, unit0);
+    ssf_press_button(context, BUTTON_A, unit0);
+
+    for (size_t c = 0; c < 40; c++){
+        ssf_issue_scroll(context, SSF_SCROLL_DOWN, unit0);
+    }
+    ssf_issue_scroll(context, SSF_SCROLL_DOWN, 1000ms, 1000ms, unit0);
+
+    ssf_press_button(context, BUTTON_A, unit0);
+
+    for (size_t c = 0; c < 2; c++){
+        ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit0);
+    }
+}
+void home_to_settings_Switch2_joycon_blind(
+    JoyconContext& context
+){
+    ThrottleScope scope(context->logging_throttler());
+    if (scope){
+        context->logger().log("NintendoSwitch::home_to_settings_Switch2_joycon_blind()");
+    }
+
+    Milliseconds tv = context->timing_variation();
+    Milliseconds unit0 = 24ms + tv;
+    Milliseconds unit1 = 32ms + tv;
+
+    pbf_move_joystick(context, {+1, 0}, 2*unit1, unit1);
+    pbf_move_joystick(context, {+1, 0}, 2*unit1, unit1);
+
+    //  Down twice in case we drop one.
+    pbf_move_joystick(context, {0, -1}, 2*unit1, unit1);
+    pbf_move_joystick(context, {0, -1}, 2*unit1, unit1);
+
+    pbf_move_joystick(context, {+1, 0}, 2*unit1, unit1);
+    pbf_move_joystick(context, {+1, 0}, 2*unit1, unit1);
+
+    //  Press A multiple times to make sure one goes through.
+    pbf_press_button(context, BUTTON_A, 2*unit0, unit0);
+    pbf_press_button(context, BUTTON_A, 2*unit0, unit0);
+    pbf_press_button(context, BUTTON_A, 2*unit0, unit0);
+
+    pbf_move_joystick(context, {0, -1}, 2000ms, 0ms);
+
+    pbf_press_button(context, BUTTON_A, 2*unit0, unit0);
+
+    for (size_t c = 0; c < 2; c++){
+        pbf_move_joystick(context, {+1, 0}, 2*unit0, unit0);
+    }
+}
+
+
+template <typename ControllerContext>
+void settings_to_date_time_Switch2_all_blind(
+    Logger& logger, ControllerContext& context,
+    ConsoleType console_type, bool to_date_change
+){
+    ThrottleScope scope(context->logging_throttler());
+    if (scope){
+        context->logger().log("NintendoSwitch::settings_to_date_time_Switch2_all_blind()");
+    }
+
+    Milliseconds tv = context->timing_variation();
+    Milliseconds unit = 24ms + tv;
+
+    ssf_issue_scroll(context, SSF_SCROLL_DOWN, unit);
+    ssf_issue_scroll(context, SSF_SCROLL_DOWN, unit);
+    ssf_issue_scroll(context, SSF_SCROLL_DOWN, 192ms, 2*unit, unit);
+
+    switch (console_type){
+    case ConsoleType::Switch2_FW19_International:
+        ssf_issue_scroll(context, SSF_SCROLL_DOWN, 128ms, 2*unit, unit);
+        ssf_issue_scroll(context, SSF_SCROLL_DOWN, 128ms, 2*unit, unit);
+        ssf_issue_scroll(context, SSF_SCROLL_DOWN, 128ms, 2*unit, unit);
+        break;
+    case ConsoleType::Switch2_FW19_JapanLocked:
+        ssf_issue_scroll(context, SSF_SCROLL_DOWN, 128ms, 2*unit, unit);
+        break;
+    case ConsoleType::Switch2_FW20_International:
+        ssf_issue_scroll(context, SSF_SCROLL_DOWN, 128ms, 2*unit, unit);
+        ssf_issue_scroll(context, SSF_SCROLL_DOWN, 128ms, 2*unit, unit);
+        ssf_issue_scroll(context, SSF_SCROLL_DOWN, 128ms, 2*unit, unit);
+        ssf_issue_scroll(context, SSF_SCROLL_DOWN, 128ms, 2*unit, unit);
+        break;
+    case ConsoleType::Switch2_FW20_JapanLocked:
+        ssf_issue_scroll(context, SSF_SCROLL_DOWN, 128ms, 2*unit, unit);
+        ssf_issue_scroll(context, SSF_SCROLL_DOWN, 128ms, 2*unit, unit);
+        break;
+    default:
+        throw UserSetupError(
+            logger,
+            "You need to specify a specific Switch 2 model."
+        );
+    }
+
+    if (!to_date_change){
+        //  Triple up this A press to make sure it gets through.
+        ssf_press_button(context, BUTTON_A, unit);
+        ssf_press_button(context, BUTTON_A, unit);
+        ssf_press_button(context, BUTTON_A, 360ms, 2*unit, unit);
+        return;
+    }
+
+    //  Triple up this A press to make sure it gets through.
+    ssf_press_button(context, BUTTON_A, unit);
+    ssf_press_button(context, BUTTON_A, unit);
+    ssf_press_button(context, BUTTON_A, unit);
+
+    for (size_t c = 0; c < 5; c++){
+        ssf_issue_scroll(context, SSF_SCROLL_DOWN, unit);
+    }
+
+    //  Left scroll in case we missed and landed in the language change or sleep
+    //  confirmation menus.
+    ssf_issue_scroll(context, SSF_SCROLL_LEFT, unit);
+}
+
+
+
+
+
+
+
+
+void home_to_date_time_Switch2_procon_blind(
+    Logger& logger, ProControllerContext& context,
+    ConsoleType console_type, bool to_date_change
+){
+    logger.log("home_to_date_time_Switch2_procon_blind()");
+    home_to_settings_Switch2_procon_blind(context);
+    settings_to_date_time_Switch2_all_blind(logger, context, console_type, to_date_change);
+}
+void home_to_date_time_Switch2_procon_feedback(
+    ConsoleHandle& console, ProControllerContext& context,
+    bool to_date_change
+){
+    console.log("home_to_date_time_Switch2_procon_feedback()");
+    for (int c = 0; c < 5; c++){
+        try{
+            home_to_settings_Switch2_procon_blind(context);
+            ConsoleType console_type = settings_detect_console_type(console, context);
+            settings_to_date_time_Switch2_all_blind(console, context, console_type, to_date_change);
+            return;
+        }catch (OperationFailedException&){
+            go_home(console, context);
+        }
+    }
+    OperationFailedExceptionWithScreenshot::fire(
+        ErrorReportMode::SEND_ERROR_REPORT,
+        "Unable to navigate to date/time after 5 attempts.",
+        console, console.video().snapshot_latest_blocking()
+    );
+}
+
+
+
+
+
+void home_to_date_time_Switch2_joycon_feedback(
+    ConsoleHandle& console, JoyconContext& context,
+    bool to_date_change
+){
+    console.log("home_to_date_time_Switch2_procon_feedback()");
+    for (int c = 0; c < 5; c++){
+        try{
+            home_to_settings_Switch2_joycon_blind(context);
+            ConsoleType console_type = settings_detect_console_type(console, context);
+            settings_to_date_time_Switch2_all_blind(console, context, console_type, to_date_change);
+            return;
+        }catch (OperationFailedException&){
+            go_home(console, context);
+        }
+    }
+    OperationFailedExceptionWithScreenshot::fire(
+        ErrorReportMode::SEND_ERROR_REPORT,
+        "Unable to navigate to date/time after 5 attempts.",
+        console, console.video().snapshot_latest_blocking()
+    );
+}
+
+
+
+
+
+
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch_HomeToDateTime.cpp b/SerialPrograms/Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch_HomeToDateTime.cpp
new file mode 100644
index 0000000000..7bb698a91d
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch_HomeToDateTime.cpp
@@ -0,0 +1,176 @@
+/*  Nintendo Switch Home To Date-Time
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Exceptions.h"
+//#include "CommonFramework/Exceptions/OperationFailedException.h"
+//#include "CommonFramework/ImageTools/ImageStats.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+//#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+//#include "CommonTools/Async/InferenceRoutines.h"
+//#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+//#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "NintendoSwitch/Inference/NintendoSwitch_ConsoleTypeDetector.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+//#include "NintendoSwitch/Inference/NintendoSwitch_HomeMenuDetector.h"
+//#include "NintendoSwitch/Inference/NintendoSwitch_SelectedSettingDetector.h"
+#include "NintendoSwitch_HomeToDateTime.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+
+
+
+void home_to_date_time_Switch1_blind(Logger& logger, ProControllerContext& context, bool to_date_change){
+    switch (context->performance_class()){
+    case ControllerPerformanceClass::SerialPABotBase_Wired:
+        home_to_date_time_Switch1_wired_blind(logger, context, to_date_change);
+        return;
+    case ControllerPerformanceClass::SerialPABotBase_Wireless:
+        home_to_date_time_Switch1_wireless_blind(logger, context, to_date_change);
+        return;
+    default:
+        //  Slow version for tick-imprecise controllers.
+        home_to_date_time_Switch1_sbb_blind(logger, context, to_date_change);
+        return;
+    }
+}
+bool home_to_date_time_Switch1_feedback(ConsoleHandle& console, ProControllerContext& context, bool to_date_change){
+    switch (context->performance_class()){
+    case ControllerPerformanceClass::SerialPABotBase_Wired:
+        home_to_date_time_Switch1_wired_feedback(console, context, to_date_change);
+        return true;
+    case ControllerPerformanceClass::SerialPABotBase_Wireless:
+        home_to_date_time_Switch1_wireless_feedback(console, context, to_date_change);
+        return true;
+    default:
+        return false;
+    }
+}
+
+
+void home_to_date_time_Switch2_blind(
+    Logger& logger, ProControllerContext& context,
+    ConsoleType console_type, bool to_date_change
+){
+    switch (context->performance_class()){
+    case ControllerPerformanceClass::SerialPABotBase_Wired:
+    case ControllerPerformanceClass::SerialPABotBase_Wireless:
+        home_to_date_time_Switch2_procon_blind(logger, context, console_type, to_date_change);
+        return;
+    default:
+        throw InternalProgramError(
+            &logger, PA_CURRENT_FUNCTION,
+            "Unsupported ControllerPerformanceClass: " + std::to_string((int)context->performance_class())
+        );
+    }
+}
+bool home_to_date_time_Switch2_feedback(
+    ConsoleHandle& console, ProControllerContext& context,
+    ConsoleType console_type, bool to_date_change
+){
+    switch (context->performance_class()){
+    case ControllerPerformanceClass::SerialPABotBase_Wired:
+    case ControllerPerformanceClass::SerialPABotBase_Wireless:
+        home_to_date_time_Switch2_procon_feedback(console, context, to_date_change);
+        return true;
+    default:;
+        return false;
+    }
+}
+
+
+
+
+//  Returns true if success. False if not supported.
+bool home_to_date_time_with_feedback(ConsoleHandle& console, ProControllerContext& context, bool to_date_change){
+    ensure_at_home(console, context);
+
+    ConsoleTypeDetector_Home detector(console);
+    ConsoleType console_type = detector.detect_only(console.video().snapshot());
+    switch (console_type){
+    case ConsoleType::Switch1:
+        return home_to_date_time_Switch1_feedback(console, context, to_date_change);
+    case ConsoleType::Switch2_Unknown:
+    case ConsoleType::Switch2_FW19_International:
+    case ConsoleType::Switch2_FW19_JapanLocked:
+    case ConsoleType::Switch2_FW20_International:
+    case ConsoleType::Switch2_FW20_JapanLocked:
+        home_to_date_time_Switch2_feedback(console, context, console_type, to_date_change);
+        return true;
+    default:;
+    }
+
+    return false;
+}
+void home_to_date_time(ConsoleHandle& console, ProControllerContext& context, bool to_date_change){
+    if (console.video().snapshot() && home_to_date_time_with_feedback(console, context, to_date_change)){
+        return;
+    }
+
+    //  No feedback available.
+
+    ConsoleType console_type = console.state().console_type();
+
+    switch (console_type){
+    case ConsoleType::Unknown:
+        throw UserSetupError(console, "Switch type is not specified and feedback is not available.");
+    case ConsoleType::Switch1:
+        home_to_date_time_Switch1_blind(console, context, to_date_change);
+        return;
+    case ConsoleType::Switch2_Unknown:
+    case ConsoleType::Switch2_FW19_International:
+    case ConsoleType::Switch2_FW19_JapanLocked:
+    case ConsoleType::Switch2_FW20_International:
+    case ConsoleType::Switch2_FW20_JapanLocked:
+        home_to_date_time_Switch2_blind(console, context, console_type, to_date_change);
+        return;
+    }
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+void home_to_date_time(ConsoleHandle& console, JoyconContext& context, bool to_date_change){
+    ensure_at_home(console, context);
+
+    ConsoleTypeDetector_Home detector(console);
+    ConsoleType console_type = detector.detect_only(console.video().snapshot());
+    switch (console_type){
+    case ConsoleType::Switch1:
+        home_to_date_time_Switch1_joycon_blind(context, to_date_change);
+        return;
+    case ConsoleType::Switch2_Unknown:
+    case ConsoleType::Switch2_FW19_International:
+    case ConsoleType::Switch2_FW19_JapanLocked:
+    case ConsoleType::Switch2_FW20_International:
+    case ConsoleType::Switch2_FW20_JapanLocked:
+        home_to_date_time_Switch2_joycon_feedback(console, context, to_date_change);
+        return;
+    default:;
+    }
+    throw UserSetupError(
+        console.logger(),
+        "Unsupported console type: " + ConsoleType_strings(console_type)
+    );
+}
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch_HomeToDateTime.h b/SerialPrograms/Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch_HomeToDateTime.h
new file mode 100644
index 0000000000..266f2fdedc
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch_HomeToDateTime.h
@@ -0,0 +1,91 @@
+/*  Nintendo Switch Home To Date-Time
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_NintendoSwitch_HomeToDateTime_H
+#define PokemonAutomation_NintendoSwitch_HomeToDateTime_H
+
+//#include "CommonFramework/ImageTools/ImageBoxes.h"
+//#include "CommonFramework/Tools/VideoStream.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+#include "NintendoSwitch/Controllers/Joycon/NintendoSwitch_Joycon.h"
+#include "NintendoSwitch/NintendoSwitch_ConsoleHandle.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+
+
+void home_to_date_time(
+    ConsoleHandle& console, ProControllerContext& context,
+    bool to_date_change
+);
+
+void home_to_date_time(
+    ConsoleHandle& console, JoyconContext& context,
+    bool to_date_change
+);
+
+
+
+
+
+//
+//  Internal Headers
+//
+
+
+void home_to_date_time_Switch1_wired_blind(
+    Logger& logger, ProControllerContext& context, bool to_date_change
+);
+void home_to_date_time_Switch1_wireless_blind(
+    Logger& logger, ProControllerContext& context, bool to_date_change
+);
+void home_to_date_time_Switch1_sbb_blind(
+    Logger& logger, ProControllerContext& context, bool to_date_change
+);
+void home_to_date_time_Switch1_wired_feedback(
+    VideoStream& stream, ProControllerContext& context, bool to_date_change
+);
+void home_to_date_time_Switch1_wireless_feedback(
+    VideoStream& stream, ProControllerContext& context, bool to_date_change
+);
+
+
+
+void home_to_date_time_Switch2_procon_blind(
+    Logger& logger, ProControllerContext& context,
+    ConsoleType console_type, bool to_date_change
+);
+void home_to_date_time_Switch2_procon_feedback(
+    ConsoleHandle& console, ProControllerContext& context,
+    bool to_date_change
+);
+
+
+ConsoleType settings_detect_console_type(
+    ConsoleHandle& console, ProControllerContext& context
+);
+
+
+
+
+
+
+//  Joycon must not be sideways
+void home_to_date_time_Switch1_joycon_blind(
+    JoyconContext& context, bool to_date_change
+);
+void home_to_date_time_Switch2_joycon_feedback(
+    ConsoleHandle& console, JoyconContext& context,
+    bool to_date_change
+);
+
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch_NeutralDateSkip.cpp b/SerialPrograms/Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch_NeutralDateSkip.cpp
new file mode 100644
index 0000000000..2886308ee4
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch_NeutralDateSkip.cpp
@@ -0,0 +1,169 @@
+/*  Nintendo Switch Neutral Date Skip
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Exceptions.h"
+#include "NintendoSwitch/NintendoSwitch_Settings.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "NintendoSwitch/NintendoSwitch_ConsoleHandle.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+
+
+void neutral_date_skip_switch1_wired(ProControllerContext& context){
+    ssf_press_button(context, BUTTON_A, 160ms, 80ms);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_UP, 0ms, 40ms, 24ms);
+    ssf_press_button(context, BUTTON_A, 16ms);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 24ms, 48ms, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 24ms, 48ms, 24ms);
+//    ssf_press_button(context, BUTTON_A, 2);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 24ms, 48ms, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 0ms, 48ms, 24ms);
+    ssf_press_button(context, BUTTON_A, 160ms, 80ms);
+    ssf_press_button(context, BUTTON_A, 160ms, 80ms);
+    for (uint8_t c = 0; c < 6; c++){
+        ssf_issue_scroll(context, SSF_SCROLL_LEFT, 24ms, 48ms, 24ms);
+    }
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 24ms, 48ms, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_DOWN, 0ms, 48ms, 24ms);
+}
+void neutral_date_skip_switch1_wireless(ProControllerContext& context){
+    Milliseconds tv = context->timing_variation();
+    Milliseconds unit = 24ms + tv;
+
+    ssf_press_button(context, BUTTON_A, 160ms, 80ms);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
+    ssf_issue_scroll(context, SSF_SCROLL_UP, 0ms, 2*unit, unit);
+    ssf_press_button(context, BUTTON_A, unit);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
+//    ssf_press_button(context, BUTTON_A, unit);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
+    ssf_press_button(context, BUTTON_A, 160ms, 80ms);
+    ssf_press_button(context, BUTTON_A, 160ms, 80ms);
+    for (uint8_t c = 0; c < 6; c++){
+        ssf_issue_scroll(context, SSF_SCROLL_LEFT, unit);
+    }
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
+    ssf_issue_scroll(context, SSF_SCROLL_DOWN, 0ms, 2*unit, unit);
+}
+void neutral_date_skip_switch1_sbb(ProControllerContext& context){
+    ssf_press_button_ptv(context, BUTTON_A, 160ms, 80ms);
+    ssf_issue_scroll_ptv(context, SSF_SCROLL_RIGHT);
+    ssf_issue_scroll_ptv(context, SSF_SCROLL_UP);
+    ssf_press_button_ptv(context, BUTTON_A);
+    ssf_issue_scroll_ptv(context, SSF_SCROLL_RIGHT);
+    ssf_issue_scroll_ptv(context, SSF_SCROLL_RIGHT);
+    ssf_issue_scroll_ptv(context, SSF_SCROLL_RIGHT);
+    ssf_issue_scroll_ptv(context, SSF_SCROLL_RIGHT);
+    ssf_press_button_ptv(context, BUTTON_A, 160ms, 80ms);
+    ssf_press_button_ptv(context, BUTTON_A, 160ms, 80ms);
+    for (uint8_t c = 0; c < 6; c++){
+        ssf_issue_scroll_ptv(context, SSF_SCROLL_LEFT);
+    }
+    ssf_issue_scroll_ptv(context, SSF_SCROLL_RIGHT);
+    ssf_issue_scroll_ptv(context, SSF_SCROLL_DOWN);
+}
+void neutral_date_skip_switch2_wired(ProControllerContext& context){
+    ssf_press_button(context, BUTTON_A, ConsoleSettings::instance().DATE_MENU_OPEN_SWITCH2_0, 80ms);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 24ms, 48ms, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_UP, 24ms, 48ms, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 24ms, 48ms, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 24ms, 48ms, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 24ms, 48ms, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 24ms, 48ms, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 24ms, 48ms, 24ms);
+    ssf_press_button(context, BUTTON_A, ConsoleSettings::instance().DATE_MENU_CLOSE_SWITCH2_0, 80ms);
+    ssf_press_button(context, BUTTON_A, ConsoleSettings::instance().DATE_MENU_OPEN_SWITCH2_0, 80ms);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 24ms, 48ms, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_DOWN, 24ms, 48ms, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 24ms, 48ms, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 24ms, 48ms, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 24ms, 48ms, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 24ms, 48ms, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 24ms, 48ms, 24ms);
+    ssf_press_button(context, BUTTON_A, ConsoleSettings::instance().DATE_MENU_CLOSE_SWITCH2_0, 80ms);
+}
+void neutral_date_skip_switch2_wireless(ProControllerContext& context){
+    Milliseconds tv = context->timing_variation();
+    Milliseconds unit = 24ms + tv;
+
+    ssf_press_button(context, BUTTON_A, ConsoleSettings::instance().DATE_MENU_OPEN_SWITCH2_0, 80ms);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
+    ssf_issue_scroll(context, SSF_SCROLL_UP, unit);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
+    ssf_press_button(context, BUTTON_A, ConsoleSettings::instance().DATE_MENU_CLOSE_SWITCH2_0, 80ms);
+    ssf_press_button(context, BUTTON_A, ConsoleSettings::instance().DATE_MENU_OPEN_SWITCH2_0, 80ms);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
+    ssf_issue_scroll(context, SSF_SCROLL_DOWN, unit);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
+    ssf_press_button(context, BUTTON_A, ConsoleSettings::instance().DATE_MENU_CLOSE_SWITCH2_0, 80ms);
+}
+
+
+void neutral_date_skip(ConsoleHandle& console, ProControllerContext& context){
+    ConsoleType type = console.state().console_type();
+
+    if (is_switch1(type)){
+        switch (context->performance_class()){
+        case ControllerPerformanceClass::SerialPABotBase_Wired:
+            neutral_date_skip_switch1_wired(context);
+            return;
+        case ControllerPerformanceClass::SerialPABotBase_Wireless:
+            neutral_date_skip_switch1_wireless(context);
+            return;
+        case ControllerPerformanceClass::SysbotBase:
+            neutral_date_skip_switch1_sbb(context);
+            return;
+        default:
+            throw InternalProgramError(
+                &console.logger(), PA_CURRENT_FUNCTION,
+                "Unsupported ControllerPerformanceClass: " + std::to_string((int)context->performance_class())
+            );
+        }
+    }
+
+    if (is_switch2(type)){
+        switch (context->performance_class()){
+        case ControllerPerformanceClass::SerialPABotBase_Wired:
+            neutral_date_skip_switch2_wired(context);
+            return;
+        case ControllerPerformanceClass::SerialPABotBase_Wireless:
+            neutral_date_skip_switch2_wireless(context);
+            return;
+        default:
+            throw InternalProgramError(
+                &console.logger(), PA_CURRENT_FUNCTION,
+                "Unsupported ControllerPerformanceClass: " + std::to_string((int)context->performance_class())
+            );
+        }
+        return;
+    }
+
+    throw UserSetupError(
+        console.logger(),
+        "Please select a valid Switch console type."
+    );
+}
+
+
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch_NeutralDateSkip.h b/SerialPrograms/Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch_NeutralDateSkip.h
new file mode 100644
index 0000000000..88cbad6be1
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch_NeutralDateSkip.h
@@ -0,0 +1,26 @@
+/*  Nintendo Switch Neutral Date Skip
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_NintendoSwitch_NeutralDateSkip_H
+#define PokemonAutomation_NintendoSwitch_NeutralDateSkip_H
+
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+#include "NintendoSwitch/NintendoSwitch_ConsoleHandle.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+
+
+void neutral_date_skip(ConsoleHandle& console, ProControllerContext& context);
+
+
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch_RollDateBackwardN.cpp b/SerialPrograms/Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch_RollDateBackwardN.cpp
new file mode 100644
index 0000000000..8c276108aa
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch_RollDateBackwardN.cpp
@@ -0,0 +1,238 @@
+/*  Nintendo Switch Roll Date Backward N
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Exceptions.h"
+#include "NintendoSwitch/NintendoSwitch_Settings.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "NintendoSwitch_RollDateBackwardN.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+
+
+void roll_date_backward_N_Switch1_wired(ProControllerContext& context, uint8_t skips, bool fast){
+    Milliseconds delay = 24ms;
+    ssf_press_button(context, BUTTON_A, 160ms, 80ms);
+    for (uint8_t c = 0; c < skips - 1; c++){
+        ssf_issue_scroll(context, SSF_SCROLL_DOWN, delay);
+    }
+#if 0
+    ssf_issue_scroll(context, SSF_SCROLL_DOWN, 0);
+//        ssf_press_button(context, BUTTON_A, delay);
+#else
+    ssf_issue_scroll(context, SSF_SCROLL_DOWN, delay);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, delay);
+#endif
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, delay);
+    for (uint8_t c = 0; c < skips - 1; c++){
+        ssf_issue_scroll(context, SSF_SCROLL_DOWN, delay);
+    }
+#if 0
+    ssf_issue_scroll(context, SSF_SCROLL_DOWN, 0);
+    ssf_press_button(context, BUTTON_A, up_delay);
+#else
+    ssf_issue_scroll(context, SSF_SCROLL_DOWN, delay);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, delay);
+#endif
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, delay);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, delay);
+
+#if 0
+//        ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 0);
+#else
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, delay);
+    ssf_issue_scroll(context, SSF_SCROLL_LEFT, delay);
+    ssf_press_button(context, BUTTON_A);
+#endif
+
+    ssf_press_button(context, BUTTON_A, 160ms, 80ms);
+}
+void roll_date_backward_N_Switch1_wireless(ProControllerContext& context, uint8_t skips){
+    Milliseconds tv = context->timing_variation();
+    Milliseconds unit = 24ms + tv;
+
+    ssf_press_button(context, BUTTON_A, 160ms, 3*unit);
+
+    for (uint8_t c = 0; c < skips - 1; c++){
+        ssf_issue_scroll(context, SSF_SCROLL_DOWN, unit);
+    }
+
+#if 0
+    ssf_issue_scroll(context, SSF_SCROLL_DOWN, 0ms, 2*unit, unit);
+    ssf_press_button(context, BUTTON_A, unit);
+#else
+    ssf_issue_scroll(context, SSF_SCROLL_DOWN, unit);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
+#endif
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
+    for (uint8_t c = 0; c < skips - 1; c++){
+        ssf_issue_scroll(context, SSF_SCROLL_DOWN, unit);
+    }
+#if 0
+    ssf_issue_scroll(context, SSF_SCROLL_DOWN, 0ms, 2*unit, unit);
+    ssf_press_button(context, BUTTON_A, unit);
+#else
+    ssf_issue_scroll(context, SSF_SCROLL_DOWN, unit);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
+#endif
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 0ms, 2*unit, unit);
+    ssf_press_button(context, BUTTON_A, 160ms, 3*unit);
+}
+void roll_date_backward_N_Switch1_sbb(ProControllerContext& context, uint8_t skips){
+    ssf_press_button_ptv(context, BUTTON_A, 160ms, 80ms);
+    if (skips >= 60){
+        ssf_issue_scroll_ptv(context, SSF_SCROLL_DOWN, 6000ms, 6000ms);
+    }else{
+        for (uint8_t c = 0; c < skips; c++){
+            ssf_issue_scroll_ptv(context, SSF_SCROLL_DOWN);
+        }
+    }
+
+    //  Left scroll in case we missed the date menu and landed in the
+    //  language change.
+    ssf_issue_scroll_ptv(context, SSF_SCROLL_LEFT);
+
+    ssf_press_button_ptv(context, BUTTON_A);
+//    ssf_issue_scroll_ptv(context, SSF_SCROLL_RIGHT);
+    ssf_issue_scroll_ptv(context, SSF_SCROLL_RIGHT);
+    if (skips >= 60){
+        ssf_issue_scroll_ptv(context, SSF_SCROLL_DOWN, 6000ms, 6000ms);
+    }else{
+        for (uint8_t c = 0; c < skips; c++){
+            ssf_issue_scroll_ptv(context, SSF_SCROLL_DOWN);
+        }
+    }
+    ssf_press_button_ptv(context, BUTTON_A);
+    ssf_issue_scroll_ptv(context, SSF_SCROLL_RIGHT);
+    ssf_issue_scroll_ptv(context, SSF_SCROLL_RIGHT);
+    ssf_issue_scroll_ptv(context, SSF_SCROLL_RIGHT);
+    ssf_press_button_ptv(context, BUTTON_A, 160ms, 80ms);
+}
+void roll_date_backward_N_Switch2_wired(ProControllerContext& context, uint8_t skips){
+    ssf_press_button(context, BUTTON_A, ConsoleSettings::instance().DATE_MENU_OPEN_SWITCH2_0, 80ms);
+    if (skips >= 60){
+        ssf_issue_scroll(context, SSF_SCROLL_DOWN, 4160ms, 4160ms, 24ms);
+    }else{
+        for (uint8_t c = 0; c < skips; c++){
+            ssf_issue_scroll(context, SSF_SCROLL_DOWN, 112ms, 48ms, 24ms);
+        }
+    }
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 24ms, 48ms, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 24ms, 48ms, 24ms);
+    if (skips >= 60){
+        ssf_issue_scroll(context, SSF_SCROLL_DOWN, 4160ms, 4160ms, 24ms);
+    }else{
+        for (uint8_t c = 0; c < skips; c++){
+            ssf_issue_scroll(context, SSF_SCROLL_DOWN, 112ms, 48ms, 24ms);
+        }
+    }
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 24ms, 48ms, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 24ms, 48ms, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 24ms, 48ms, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 24ms, 48ms, 24ms);
+    ssf_press_button(context, BUTTON_A, ConsoleSettings::instance().DATE_MENU_CLOSE_SWITCH2_0, 80ms);
+}
+void roll_date_backward_N_Switch2_wireless(ProControllerContext& context, uint8_t skips){
+    Milliseconds tv = context->timing_variation();
+    Milliseconds unit = 24ms + tv;
+
+    ssf_press_button(context, BUTTON_A, ConsoleSettings::instance().DATE_MENU_OPEN_SWITCH2_0, 80ms);
+    if (skips >= 60){
+        ssf_issue_scroll(context, SSF_SCROLL_DOWN, 4160ms, 4160ms, unit);
+    }else{
+        for (uint8_t c = 0; c < skips; c++){
+            ssf_issue_scroll(context, SSF_SCROLL_DOWN, 112ms, 2*unit, unit);
+        }
+    }
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
+    if (skips >= 60){
+        ssf_issue_scroll(context, SSF_SCROLL_DOWN, 4160ms, 4160ms, unit);
+    }else{
+        for (uint8_t c = 0; c < skips; c++){
+            ssf_issue_scroll(context, SSF_SCROLL_DOWN, 112ms, 2*unit, unit);
+        }
+    }
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
+    ssf_press_button(context, BUTTON_A, ConsoleSettings::instance().DATE_MENU_CLOSE_SWITCH2_0, 80ms);
+}
+void roll_date_backward_N(
+    ConsoleHandle& console, ProControllerContext& context,
+    uint8_t skips, bool fast
+){
+    ConsoleType type = console.state().console_type();
+
+    if (is_switch1(type)){
+        switch (context->performance_class()){
+        case ControllerPerformanceClass::SerialPABotBase_Wired:
+            roll_date_backward_N_Switch1_wired(context, skips, fast);
+            return;
+        case ControllerPerformanceClass::SerialPABotBase_Wireless:
+            roll_date_backward_N_Switch1_wireless(context, skips);
+            return;
+        case ControllerPerformanceClass::SysbotBase:
+            roll_date_backward_N_Switch1_sbb(context, skips);
+            return;
+        default:
+            throw InternalProgramError(
+                &console.logger(), PA_CURRENT_FUNCTION,
+                "Unsupported ControllerPerformanceClass: " + std::to_string((int)context->performance_class())
+            );
+        }
+    }
+
+    if (is_switch2(type)){
+        switch (context->performance_class()){
+        case ControllerPerformanceClass::SerialPABotBase_Wired:
+            roll_date_backward_N_Switch2_wired(context, skips);
+            return;
+        case ControllerPerformanceClass::SerialPABotBase_Wireless:
+            roll_date_backward_N_Switch2_wireless(context, skips);
+            return;
+        default:
+            throw InternalProgramError(
+                &console.logger(), PA_CURRENT_FUNCTION,
+                "Unsupported ControllerPerformanceClass: " + std::to_string((int)context->performance_class())
+            );
+        }
+        return;
+    }
+
+    throw UserSetupError(
+        console.logger(),
+        "Please select a valid Switch console type."
+    );
+}
+
+
+
+
+
+
+
+
+
+
+
+
+}
+}
+
+
+
+
+
+
+
+
+
+
diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch_RollDateBackwardN.h b/SerialPrograms/Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch_RollDateBackwardN.h
new file mode 100644
index 0000000000..4c795c44f9
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch_RollDateBackwardN.h
@@ -0,0 +1,29 @@
+/*  Nintendo Switch Roll Date Backward N
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_NintendoSwitch_RollDateBackwardN_H
+#define PokemonAutomation_NintendoSwitch_RollDateBackwardN_H
+
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+#include "NintendoSwitch/NintendoSwitch_ConsoleHandle.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+
+
+void roll_date_backward_N(
+    ConsoleHandle& console, ProControllerContext& context,
+    uint8_t skips, bool fast
+);
+
+
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch_RollDateForward1.cpp b/SerialPrograms/Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch_RollDateForward1.cpp
new file mode 100644
index 0000000000..73033c973c
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch_RollDateForward1.cpp
@@ -0,0 +1,158 @@
+/*  Nintendo Switch Roll Date Forward 1
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Exceptions.h"
+#include "NintendoSwitch/NintendoSwitch_Settings.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "NintendoSwitch_RollDateForward1.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+
+void roll_date_forward_1_Switch1_wired(ProControllerContext& context, bool fast){
+    Milliseconds delay = 24ms;
+
+    ssf_press_button(context, BUTTON_A, 160ms, 80ms);
+    ssf_issue_scroll(context, SSF_SCROLL_UP, 0ms, 2*delay, delay);
+    ssf_press_button(context, BUTTON_A, delay);
+//    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, delay);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, delay);
+    ssf_issue_scroll(context, SSF_SCROLL_UP, delay);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, delay);
+    ssf_press_button(context, BUTTON_A, 0ms);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, delay);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, delay);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 0ms, 2*delay, delay);
+    ssf_press_button(context, BUTTON_A, 160ms, 80ms);
+}
+void roll_date_forward_1_Switch1_wireless(ProControllerContext& context){
+    Milliseconds tv = context->timing_variation();
+    Milliseconds unit = 24ms + tv;
+
+    ssf_press_button(context, BUTTON_A, 160ms, 3*unit);
+    ssf_issue_scroll(context, SSF_SCROLL_UP, unit);
+
+    //  Left scroll in case we missed the date menu and landed in the
+    //  language change.
+    ssf_issue_scroll(context, SSF_SCROLL_LEFT, 0ms, 2*unit, unit);
+
+    ssf_press_button(context, BUTTON_A, unit);
+//    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
+    ssf_issue_scroll(context, SSF_SCROLL_UP, unit);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
+    ssf_press_button(context, BUTTON_A, 0ms, 2*unit, unit);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 0ms, 2*unit, unit);
+    ssf_press_button(context, BUTTON_A, 160ms, 3*unit);
+}
+void roll_date_forward_1_Switch1_sbb(ProControllerContext& context){
+    ssf_press_button_ptv(context, BUTTON_A, 160ms, 80ms);
+    ssf_issue_scroll_ptv(context, SSF_SCROLL_UP);
+
+    //  Left scroll in case we missed the date menu and landed in the
+    //  language change.
+    ssf_issue_scroll_ptv(context, SSF_SCROLL_LEFT);
+
+    ssf_press_button_ptv(context, BUTTON_A);
+    ssf_issue_scroll_ptv(context, SSF_SCROLL_RIGHT);
+    ssf_issue_scroll_ptv(context, SSF_SCROLL_UP);
+    ssf_issue_scroll_ptv(context, SSF_SCROLL_RIGHT);
+    ssf_press_button_ptv(context, BUTTON_A);
+    ssf_issue_scroll_ptv(context, SSF_SCROLL_RIGHT);
+    ssf_issue_scroll_ptv(context, SSF_SCROLL_RIGHT);
+    ssf_issue_scroll_ptv(context, SSF_SCROLL_RIGHT);
+    ssf_press_button_ptv(context, BUTTON_A, 160ms, 80ms);
+}
+void roll_date_forward_1_Switch2_wired(ProControllerContext& context){
+    ssf_press_button(context, BUTTON_A, ConsoleSettings::instance().DATE_MENU_OPEN_SWITCH2_0, 80ms);
+    ssf_issue_scroll(context, SSF_SCROLL_UP, 24ms, 48ms, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 24ms, 48ms, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 24ms, 48ms, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_UP, 24ms, 48ms, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 24ms, 48ms, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 24ms, 48ms, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 24ms, 48ms, 24ms);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 24ms, 48ms, 24ms);
+    ssf_press_button(context, BUTTON_A, ConsoleSettings::instance().DATE_MENU_CLOSE_SWITCH2_0, 80ms);
+}
+void roll_date_forward_1_Switch2_wireless(ProControllerContext& context){
+    Milliseconds tv = context->timing_variation();
+    Milliseconds unit = 24ms + tv;
+
+    ssf_press_button(context, BUTTON_A, ConsoleSettings::instance().DATE_MENU_OPEN_SWITCH2_0, 80ms);
+    ssf_issue_scroll(context, SSF_SCROLL_UP, unit);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
+    ssf_issue_scroll(context, SSF_SCROLL_UP, unit);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, unit);
+    ssf_press_button(context, BUTTON_A, ConsoleSettings::instance().DATE_MENU_CLOSE_SWITCH2_0, 80ms);
+}
+void roll_date_forward_1(
+    ConsoleHandle& console, ProControllerContext& context,
+    bool fast
+){
+    ConsoleType type = console.state().console_type();
+
+    if (is_switch1(type)){
+        switch (context->performance_class()){
+        case ControllerPerformanceClass::SerialPABotBase_Wired:
+            roll_date_forward_1_Switch1_wired(context, fast);
+            return;
+        case ControllerPerformanceClass::SerialPABotBase_Wireless:
+            roll_date_forward_1_Switch1_wireless(context);
+            return;
+        case ControllerPerformanceClass::SysbotBase:
+            roll_date_forward_1_Switch1_sbb(context);
+            return;
+        default:
+            throw InternalProgramError(
+                &console.logger(), PA_CURRENT_FUNCTION,
+                "Unsupported ControllerPerformanceClass: " + std::to_string((int)context->performance_class())
+            );
+        }
+    }
+
+    if (is_switch2(type)){
+        switch (context->performance_class()){
+        case ControllerPerformanceClass::SerialPABotBase_Wired:
+            roll_date_forward_1_Switch2_wired(context);
+            return;
+        case ControllerPerformanceClass::SerialPABotBase_Wireless:
+            roll_date_forward_1_Switch2_wireless(context);
+            return;
+        default:
+            throw InternalProgramError(
+                &console.logger(), PA_CURRENT_FUNCTION,
+                "Unsupported ControllerPerformanceClass: " + std::to_string((int)context->performance_class())
+            );
+        }
+        return;
+    }
+
+    throw UserSetupError(
+        console.logger(),
+        "Please select a valid Switch console type."
+    );
+}
+
+
+
+
+
+
+
+
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch_RollDateForward1.h b/SerialPrograms/Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch_RollDateForward1.h
new file mode 100644
index 0000000000..46535bf30c
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch_RollDateForward1.h
@@ -0,0 +1,29 @@
+/*  Nintendo Switch Roll Date Forward 1
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_NintendoSwitch_RollDateForward1_H
+#define PokemonAutomation_NintendoSwitch_RollDateForward1_H
+
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+#include "NintendoSwitch/NintendoSwitch_ConsoleHandle.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+
+
+void roll_date_forward_1(
+    ConsoleHandle& console, ProControllerContext& context,
+    bool fast
+);
+
+
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/FastCodeEntry/NintendoSwitch_CodeEntryTools.cpp b/SerialPrograms/Source/NintendoSwitch/Programs/FastCodeEntry/NintendoSwitch_CodeEntryTools.cpp
new file mode 100644
index 0000000000..320c8c102b
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Programs/FastCodeEntry/NintendoSwitch_CodeEntryTools.cpp
@@ -0,0 +1,154 @@
+/*  Code Entry Tools
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "NintendoSwitch_CodeEntryTools.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace FastCodeEntry{
+
+
+
+Milliseconds calculate_path_time(
+    const CodeEntryDelays& delays,
+    const std::vector<CodeEntryActionWithDelay>& path
+){
+    Milliseconds full_cooldown = delays.hold + delays.cool;
+
+    Milliseconds ready_A = 0ms;
+    Milliseconds ready_move = 0ms;
+    Milliseconds ready_scroll = 0ms;
+
+    Milliseconds current = 0ms;
+
+    for (const CodeEntryActionWithDelay& action : path){
+        switch (action.action){
+        case CodeEntryAction::ENTER_CHAR:
+            current = std::max(current, ready_A);
+            ready_A = current + full_cooldown;
+            current += action.delay;
+            break;
+        case CodeEntryAction::SCROLL_LEFT:
+            current = std::max(current, ready_move);
+            ready_move = current + full_cooldown;
+            current += action.delay;
+            break;
+        default:
+            current = std::max(current, ready_scroll);
+            ready_scroll = current + full_cooldown;
+            current += action.delay;
+            break;
+        }
+    }
+
+    return current;
+}
+
+
+Milliseconds codeboard_populate_delays(
+    bool switch2,
+    std::vector<CodeEntryActionWithDelay>& path_with_delays,
+    const std::vector<CodeEntryAction>& path,
+    const CodeEntryDelays& delays,
+    bool optimize
+){
+    //  Populate and assign default delays first.
+    path_with_delays.resize(path.size());
+    for (size_t c = 0; c < path_with_delays.size(); c++){
+        CodeEntryAction action = path[c];
+        Milliseconds delay;
+        if (action == CodeEntryAction::ENTER_CHAR){
+            delay = delays.press_delay;
+        }else if (action == CodeEntryAction::SCROLL_LEFT){
+            delay = delays.scroll_delay;
+        }else{
+            delay = delays.move_delay;
+        }
+
+        //  If we are wrapping and the previous action is a move, then we can't
+        //  overlap.
+        if (is_wrap(action) && c != 0){
+            CodeEntryActionWithDelay& previous = path_with_delays[c - 1];
+            if (is_move(previous.action)){
+                previous.delay = delays.hold;
+            }
+        }
+
+        path_with_delays[c].action = action;
+        path_with_delays[c].delay = delay;
+
+//        cout << "    " << (int)action << " : " << delay.count() << endl;
+    }
+
+
+    //  Optimize
+
+    if (!optimize || path_with_delays.empty() || switch2){
+        return calculate_path_time(delays, path_with_delays);
+    }
+
+    //  These only work on the Switch 1.
+    for (size_t c = 1; c < path_with_delays.size(); c++){
+        //  Zero the delay for any L press.
+        CodeEntryActionWithDelay& current = path_with_delays[c];
+        if (current.action == CodeEntryAction::SCROLL_LEFT){
+            current.delay = 0ms;
+            continue;
+        }
+
+        //  Zero the delay for any scroll immediately preceding an A press.
+        CodeEntryActionWithDelay& previous = path_with_delays[c - 1];
+        if (current.action == CodeEntryAction::ENTER_CHAR &&
+            previous.action != CodeEntryAction::ENTER_CHAR &&
+            previous.action != CodeEntryAction::SCROLL_LEFT
+        ){
+            previous.delay = 0ms;
+        }
+    }
+
+    return calculate_path_time(delays, path_with_delays);
+}
+
+
+
+
+void codeboard_execute_path(
+    ProControllerContext& context,
+    const CodeEntryDelays& delays,
+    const std::vector<CodeEntryActionWithDelay>& path
+){
+    for (const CodeEntryActionWithDelay& action : path){
+        switch (action.action){
+        case CodeEntryAction::ENTER_CHAR:
+            ssf_press_button(context, BUTTON_A, action.delay, delays.hold, delays.cool);
+            break;
+        case CodeEntryAction::SCROLL_LEFT:
+            ssf_press_button(context, BUTTON_L, action.delay, delays.hold, delays.cool);
+            break;
+        default:
+            ssf_issue_scroll(
+                context,
+                (DpadPosition)((uint8_t)action.action & 0x7f),
+                action.delay, delays.hold, delays.cool
+            );
+            break;
+        }
+    }
+}
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/FastCodeEntry/NintendoSwitch_CodeEntryTools.h b/SerialPrograms/Source/NintendoSwitch/Programs/FastCodeEntry/NintendoSwitch_CodeEntryTools.h
new file mode 100644
index 0000000000..09ca38782f
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Programs/FastCodeEntry/NintendoSwitch_CodeEntryTools.h
@@ -0,0 +1,148 @@
+/*  Code Entry Tools
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_NintendoSwitch_CodeEntryTools_H
+#define PokemonAutomation_NintendoSwitch_CodeEntryTools_H
+
+#include <stdint.h>
+#include <vector>
+#include "Common/Cpp/Time.h"
+#include "NintendoSwitch/Options/NintendoSwitch_CodeEntrySettingsOption.h"
+#include "NintendoSwitch/Controllers/NintendoSwitch_ControllerButtons.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace FastCodeEntry{
+
+
+
+
+enum class CodeEntryAction : uint8_t{
+    ENTER_CHAR  = 0xf0,
+    SCROLL_LEFT = 0xf1,
+    NORM_MOVE_UP    =        (uint8_t)DpadPosition::DPAD_UP,
+    NORM_MOVE_RIGHT =        (uint8_t)DpadPosition::DPAD_RIGHT,
+    NORM_MOVE_DOWN  =        (uint8_t)DpadPosition::DPAD_DOWN,
+    NORM_MOVE_LEFT  =        (uint8_t)DpadPosition::DPAD_LEFT,
+    WRAP_MOVE_UP    = 0x80 | (uint8_t)DpadPosition::DPAD_UP,
+    WRAP_MOVE_RIGHT = 0x80 | (uint8_t)DpadPosition::DPAD_RIGHT,
+    WRAP_MOVE_DOWN  = 0x80 | (uint8_t)DpadPosition::DPAD_DOWN,
+    WRAP_MOVE_LEFT  = 0x80 | (uint8_t)DpadPosition::DPAD_LEFT,
+};
+inline bool is_button_press(CodeEntryAction action){
+    switch (action){
+    case CodeEntryAction::ENTER_CHAR:
+    case CodeEntryAction::SCROLL_LEFT:
+        return true;
+    default:
+        return false;
+    }
+}
+inline bool is_move(CodeEntryAction action){
+    switch (action){
+    case CodeEntryAction::NORM_MOVE_UP:
+    case CodeEntryAction::NORM_MOVE_RIGHT:
+    case CodeEntryAction::NORM_MOVE_DOWN:
+    case CodeEntryAction::NORM_MOVE_LEFT:
+    case CodeEntryAction::WRAP_MOVE_UP:
+    case CodeEntryAction::WRAP_MOVE_RIGHT:
+    case CodeEntryAction::WRAP_MOVE_DOWN:
+    case CodeEntryAction::WRAP_MOVE_LEFT:
+        return true;
+    default:
+        return false;
+    }
+}
+inline bool is_wrap(CodeEntryAction action){
+    switch (action){
+    case CodeEntryAction::WRAP_MOVE_UP:
+    case CodeEntryAction::WRAP_MOVE_RIGHT:
+    case CodeEntryAction::WRAP_MOVE_DOWN:
+    case CodeEntryAction::WRAP_MOVE_LEFT:
+        return true;
+    default:
+        return false;
+    }
+}
+
+
+struct CodeEntryDelays{
+    bool reordering;
+    Milliseconds hold;
+    Milliseconds cool;
+    Milliseconds press_delay;
+    Milliseconds move_delay;
+    Milliseconds scroll_delay;
+    Milliseconds wrap_delay;
+
+    CodeEntryDelays() = default;
+    CodeEntryDelays(const CodeboardTimingsOption& option)
+        : reordering(option.REORDERING)
+        , hold(option.HOLD0)
+        , cool(option.COOLDOWN)
+        , press_delay(option.PRESS_DELAY)
+        , move_delay(option.MOVE_DELAY)
+        , scroll_delay(option.SCROLL_DELAY)
+        , wrap_delay(option.WRAP_DELAY)
+    {}
+};
+
+
+struct CodeEntryActionWithDelay{
+    CodeEntryAction action;
+    Milliseconds delay;
+};
+
+
+
+
+//  Given a path, optimize it and fully populate the delays.
+//  Return the cost of the path.
+Milliseconds codeboard_populate_delays(
+    bool switch2,
+    std::vector<CodeEntryActionWithDelay>& path_with_delays,
+    const std::vector<CodeEntryAction>& path,
+    const CodeEntryDelays& delays,
+    bool optimize
+);
+
+
+
+
+
+//inline Milliseconds calculate_path_delay(const std::vector<CodeEntryActionWithDelay>& path){
+
+//}
+
+
+
+//  Actually execute a path and enter it into the Switch.
+void codeboard_execute_path(
+    ProControllerContext& context,
+    const CodeEntryDelays& delays,
+    const std::vector<CodeEntryActionWithDelay>& path
+);
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/FastCodeEntry/NintendoSwitch_KeyboardCodeEntry.cpp b/SerialPrograms/Source/NintendoSwitch/Programs/FastCodeEntry/NintendoSwitch_KeyboardCodeEntry.cpp
new file mode 100644
index 0000000000..dc584c48ca
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Programs/FastCodeEntry/NintendoSwitch_KeyboardCodeEntry.cpp
@@ -0,0 +1,344 @@
+/*  Fast Code Entry
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <vector>
+#include <map>
+#include "CommonFramework/Exceptions/OperationFailedException.h"
+#include "NintendoSwitch/NintendoSwitch_Settings.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "NintendoSwitch/Inference/NintendoSwitch_ConsoleTypeDetector.h"
+#include "NintendoSwitch_CodeEntryTools.h"
+#include "NintendoSwitch_KeyboardEntryMappings.h"
+#include "NintendoSwitch_KeyboardCodeEntry.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace FastCodeEntry{
+
+
+
+
+void keyboard_enter_code(
+    ConsoleHandle& console, AbstractControllerContext& context,
+    bool assume_console_type_is_ready,
+    KeyboardLayout keyboard_layout,
+    const std::string& code, bool include_plus
+){
+    auto* keyboard = context->cast<StandardHid::Keyboard>();
+    if (keyboard){
+        StandardHid::KeyboardContext subcontext(context);
+        keyboard_enter_code(console, subcontext, keyboard_layout, code, include_plus);
+        return;
+    }
+
+    auto* procon = context->cast<ProController>();
+    if (procon){
+        ProControllerContext subcontext(context);
+        keyboard_enter_code(
+            console, subcontext,
+            assume_console_type_is_ready,
+            keyboard_layout,
+            code, include_plus
+        );
+        return;
+    }
+
+    throw UserSetupError(
+        console, "Unsupported controller type."
+    );
+}
+
+
+
+
+
+void keyboard_enter_code(
+    ConsoleHandle& console, StandardHid::KeyboardContext& context,
+    KeyboardLayout keyboard_layout,
+    const std::string& code, bool include_plus
+){
+    using namespace StandardHid;
+
+    Milliseconds delay = ConsoleSettings::instance().KEYBOARD_CONTROLLER_TIMINGS.TIME_UNIT;
+    Milliseconds hold = ConsoleSettings::instance().KEYBOARD_CONTROLLER_TIMINGS.HOLD;
+    Milliseconds cool = ConsoleSettings::instance().KEYBOARD_CONTROLLER_TIMINGS.COOLDOWN;
+
+    Milliseconds parallel_delay = ConsoleSettings::instance().KEYBOARD_CONTROLLER_TIMINGS.PARLLELIZE
+        ? 0ms
+        : delay;
+
+    const std::map<char, KeyboardKey>& MAP = KEYBOARD_MAPPINGS(keyboard_layout);
+
+    std::vector<KeyboardKey> HID_ids;
+    for (char ch : code){
+        auto iter = MAP.find(ch);
+        if (iter == MAP.end()){
+            throw_and_log<OperationFailedException>(
+                console, ErrorReportMode::NO_ERROR_REPORT,
+                "Invalid code character."
+            );
+        }
+        HID_ids.emplace_back(iter->second);
+//        context->issue_key(&context, delay, hold, cool, iter->second);
+    }
+
+    for (size_t c = 1; c < HID_ids.size(); c++){
+        KeyboardKey curr = HID_ids[c - 1];
+        KeyboardKey next = HID_ids[c];
+        context->issue_key(&context, curr < next ? parallel_delay : delay, hold, cool, curr);
+    }
+    if (!HID_ids.empty()){
+        context->issue_key(&context, parallel_delay, hold, cool, HID_ids.back());
+    }
+
+    if (include_plus){
+        context->issue_key(&context, delay, hold, cool, KeyboardKey::KEY_ENTER);
+        context->issue_key(&context, delay, hold, cool, KeyboardKey::KEY_ENTER);
+        context->issue_key(&context, delay, hold, cool, KeyboardKey::KEY_ENTER);
+    }
+}
+
+
+
+
+
+
+
+
+
+
+
+
+//  Return the path from "source" to "destination".
+std::vector<CodeEntryAction> keyboard_get_path(
+    KeyboardEntryPosition source,
+    KeyboardEntryPosition destination
+){
+    std::vector<CodeEntryAction> path;
+
+    //  Vertical is easy since there's no wrapping and no hazards.
+    if (source.row < destination.row){
+        size_t diff = destination.row - source.row;
+        for (size_t c = 0; c < diff; c++){
+            path.emplace_back(CodeEntryAction::NORM_MOVE_DOWN);
+        }
+    }else{
+        size_t diff = source.row - destination.row;
+        for (size_t c = 0; c < diff; c++){
+            path.emplace_back(CodeEntryAction::NORM_MOVE_UP);
+        }
+    }
+
+    //  Horizontal is messy because we need extra delay on wrapping.
+    uint8_t col = source.col;
+    while (true){
+        if (col == destination.col){
+            break;
+        }
+
+        CodeEntryAction action;
+        if (destination.col > col){
+            if (destination.col - col <= 6){
+                action = CodeEntryAction::NORM_MOVE_RIGHT;
+                col++;
+            }else{
+                action = CodeEntryAction::NORM_MOVE_LEFT;
+                col--;
+            }
+        }else{
+            if (col - destination.col <= 6){
+                action = CodeEntryAction::NORM_MOVE_LEFT;
+                col--;
+            }else{
+                action = CodeEntryAction::NORM_MOVE_RIGHT;
+                col++;
+            }
+        }
+
+        //  Wrap around the sides.
+        if (col == (uint8_t)-1){
+            col = 11;
+            action = (CodeEntryAction)((uint8_t)action | 0x80);
+        }
+        if (col == 12){
+            col = 0;
+            action = (CodeEntryAction)((uint8_t)action | 0x80);
+        }
+
+        path.emplace_back(action);
+    }
+
+    path.emplace_back(CodeEntryAction::ENTER_CHAR);
+
+    return path;
+}
+
+
+//  Get all possible paths from "start" to cover everything [positions, positions + length).
+std::vector<std::vector<CodeEntryAction>> keyboard_get_all_paths(
+    KeyboardEntryPosition start,
+    const KeyboardEntryPosition* positions, size_t length,
+    bool reordering
+){
+    if (length == 1){
+        return {keyboard_get_path(start, positions[0])};
+    }
+
+    std::vector<std::vector<CodeEntryAction>> paths;
+    {
+        KeyboardEntryPosition position = positions[0];
+        std::vector<CodeEntryAction> current = keyboard_get_path(start, position);
+        std::vector<std::vector<CodeEntryAction>> subpaths = keyboard_get_all_paths(
+            position,
+            positions + 1, length - 1,
+            reordering
+        );
+        for (std::vector<CodeEntryAction>& path : subpaths){
+            path.insert(path.begin(), current.begin(), current.end());
+            paths.emplace_back(std::move(path));
+        }
+    }
+    if (reordering){
+        KeyboardEntryPosition position = positions[length - 1];
+        std::vector<CodeEntryAction> current = keyboard_get_path(start, position);
+        current.emplace_back(CodeEntryAction::SCROLL_LEFT);
+        std::vector<std::vector<CodeEntryAction>> subpaths = keyboard_get_all_paths(
+            position,
+            positions, length - 1,
+            reordering
+        );
+        for (std::vector<CodeEntryAction>& path : subpaths){
+            path.insert(path.begin(), current.begin(), current.end());
+            paths.emplace_back(std::move(path));
+        }
+    }
+
+    return paths;
+}
+
+
+
+
+//  Given a set of paths, find the best one and return it with fully populated
+//  delays.
+std::vector<CodeEntryActionWithDelay> keyboard_get_best_path(
+    bool switch2,
+    const std::vector<std::vector<CodeEntryAction>>& paths,
+    const CodeEntryDelays& delays,
+    bool optimize
+){
+    std::vector<CodeEntryActionWithDelay> best_path;
+    Milliseconds best_time = Milliseconds::max();
+    for (const std::vector<CodeEntryAction>& path : paths){
+        std::vector<CodeEntryActionWithDelay> current_path;
+        Milliseconds current_time = codeboard_populate_delays(
+            switch2,
+            current_path,
+            path, delays, optimize
+        );
+        if (best_time > current_time ||
+            (best_time == current_time && best_path.size() > current_path.size())
+        ){
+            best_time = current_time;
+            best_path = std::move(current_path);
+        }
+    }
+    return best_path;
+}
+
+
+
+
+void keyboard_enter_code(
+    ConsoleHandle& console, ProControllerContext& context,
+    bool assume_console_type_is_ready,
+    KeyboardLayout keyboard_layout,
+    const std::string& code, bool include_plus
+){
+    //  Calculate the coordinates.
+    const std::map<char, KeyboardEntryPosition>& POSITION_MAP = KEYBOARD_POSITIONS(keyboard_layout);
+    std::vector<KeyboardEntryPosition> positions;
+    for (char ch : code){
+        auto iter = POSITION_MAP.find(ch);
+        if (iter == POSITION_MAP.end()){
+            throw_and_log<OperationFailedException>(
+                console, ErrorReportMode::NO_ERROR_REPORT,
+                "Invalid code character."
+            );
+        }
+        positions.emplace_back(iter->second);
+    }
+
+    CodeEntryDelays delays;
+
+    ConsoleType console_type = assume_console_type_is_ready
+        ? console.state().console_type()
+        : detect_console_type_from_in_game(console, context);
+    bool switch2;
+    if (is_switch1(console_type)){
+        switch2 = false;
+        if (context->performance_class() == ControllerPerformanceClass::SerialPABotBase_Wired){
+            delays = ConsoleSettings::instance().CODEBOARD_ENTRY_SWITCH1_WIRED;
+        }else{
+            delays = ConsoleSettings::instance().CODEBOARD_ENTRY_SWITCH1_WIRELESS;
+        }
+    }else if (is_switch2(console_type)){
+        switch2 = true;
+        if (context->performance_class() == ControllerPerformanceClass::SerialPABotBase_Wired){
+            delays = ConsoleSettings::instance().CODEBOARD_ENTRY_SWITCH2_WIRED;
+        }else{
+            delays = ConsoleSettings::instance().CODEBOARD_ENTRY_SWITCH2_WIRELESS;
+        }
+    }else{
+        throw UserSetupError(
+            console,
+            "Please select a valid Switch console type."
+        );
+    }
+
+    //  Get all the possible paths.
+    std::vector<std::vector<CodeEntryAction>> all_paths = keyboard_get_all_paths(
+        {0, 0},
+        positions.data(), positions.size(),
+        delays.reordering
+    );
+
+    //  Pick the best path.
+    std::vector<CodeEntryActionWithDelay> best_path = keyboard_get_best_path(
+        switch2,
+        all_paths,
+        delays,
+        !switch2 && context->atomic_multibutton()
+    );
+
+    codeboard_execute_path(context, delays, best_path);
+
+    if (include_plus){
+        ssf_press_button_ptv(context, BUTTON_PLUS);
+        ssf_press_button_ptv(context, BUTTON_PLUS);
+    }
+
+    ssf_flush_pipeline(context);
+}
+
+
+
+
+
+
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/FastCodeEntry/NintendoSwitch_KeyboardCodeEntry.h b/SerialPrograms/Source/NintendoSwitch/Programs/FastCodeEntry/NintendoSwitch_KeyboardCodeEntry.h
new file mode 100644
index 0000000000..7048582ea0
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Programs/FastCodeEntry/NintendoSwitch_KeyboardCodeEntry.h
@@ -0,0 +1,48 @@
+/*  Keyboard Code Entry
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_NintendoSwitch_KeyboardCodeEntry_H
+#define PokemonAutomation_NintendoSwitch_KeyboardCodeEntry_H
+
+#include <string>
+#include "Controllers/StandardHid/StandardHid_Keyboard.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+#include "NintendoSwitch/NintendoSwitch_ConsoleHandle.h"
+#include "NintendoSwitch/Programs/FastCodeEntry/NintendoSwitch_KeyboardEntryMappings.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace FastCodeEntry{
+
+
+
+//  Automatically select between keyboard or pro controller depending on the
+//  controller type.
+void keyboard_enter_code(
+    ConsoleHandle& console, AbstractControllerContext& context,
+    bool assume_console_type_is_ready,
+    KeyboardLayout keyboard_layout,
+    const std::string& code, bool include_plus
+);
+
+void keyboard_enter_code(
+    ConsoleHandle& console, StandardHid::KeyboardContext& context,
+    KeyboardLayout keyboard_layout,
+    const std::string& code, bool include_plus
+);
+void keyboard_enter_code(
+    ConsoleHandle& console, ProControllerContext& context,
+    bool assume_console_type_is_ready,
+    KeyboardLayout keyboard_layout,
+    const std::string& code, bool include_plus
+);
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/FastCodeEntry/NintendoSwitch_KeyboardEntryMappings.cpp b/SerialPrograms/Source/NintendoSwitch/Programs/FastCodeEntry/NintendoSwitch_KeyboardEntryMappings.cpp
new file mode 100644
index 0000000000..87311e2521
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Programs/FastCodeEntry/NintendoSwitch_KeyboardEntryMappings.cpp
@@ -0,0 +1,255 @@
+/*  Keyboard Entry Mappings
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Exceptions.h"
+#include "NintendoSwitch_KeyboardEntryMappings.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+
+const std::map<char, KeyboardKey>& KEYBOARD_MAPPINGS(KeyboardLayout layout){
+    switch (layout){
+    case KeyboardLayout::QWERTY:
+        return KEYBOARD_MAPPINGS_QWERTY();
+    case KeyboardLayout::AZERTY:
+        return KEYBOARD_MAPPINGS_AZERTY();
+    default:
+        throw InternalProgramError(
+            nullptr, PA_CURRENT_FUNCTION,
+            "Invalid Keyboard Type: " + std::to_string((int)layout)
+        );
+    }
+}
+const std::map<char, KeyboardEntryPosition>& KEYBOARD_POSITIONS(KeyboardLayout layout){
+    switch (layout){
+    case KeyboardLayout::QWERTY:
+        return KEYBOARD_POSITIONS_QWERTY();
+    case KeyboardLayout::AZERTY:
+        return KEYBOARD_POSITIONS_AZERTY();
+    default:
+        throw InternalProgramError(
+            nullptr, PA_CURRENT_FUNCTION,
+            "Invalid Keyboard Type: " + std::to_string((int)layout)
+        );
+    }
+}
+
+
+
+
+
+const std::map<char, KeyboardKey>& KEYBOARD_MAPPINGS_QWERTY(){
+    static const std::map<char, KeyboardKey> map{
+        {'1', KeyboardKey::KEY_KP_1},
+        {'2', KeyboardKey::KEY_KP_2},
+        {'3', KeyboardKey::KEY_KP_3},
+        {'4', KeyboardKey::KEY_KP_4},
+        {'5', KeyboardKey::KEY_KP_5},
+        {'6', KeyboardKey::KEY_KP_6},
+        {'7', KeyboardKey::KEY_KP_7},
+        {'8', KeyboardKey::KEY_KP_8},
+        {'9', KeyboardKey::KEY_KP_9},
+        {'0', KeyboardKey::KEY_KP_0},
+
+        {'Q', KeyboardKey::KEY_Q},
+        {'W', KeyboardKey::KEY_W},
+        {'E', KeyboardKey::KEY_E},
+        {'R', KeyboardKey::KEY_R},
+        {'T', KeyboardKey::KEY_T},
+        {'Y', KeyboardKey::KEY_Y},
+        {'U', KeyboardKey::KEY_U},
+        {'I', KeyboardKey::KEY_I},
+        {'O', KeyboardKey::KEY_O},
+        {'P', KeyboardKey::KEY_P},
+
+        {'A', KeyboardKey::KEY_A},
+        {'S', KeyboardKey::KEY_S},
+        {'D', KeyboardKey::KEY_D},
+        {'F', KeyboardKey::KEY_F},
+        {'G', KeyboardKey::KEY_G},
+        {'H', KeyboardKey::KEY_H},
+        {'J', KeyboardKey::KEY_J},
+        {'K', KeyboardKey::KEY_K},
+        {'L', KeyboardKey::KEY_L},
+
+        {'Z', KeyboardKey::KEY_Z},
+        {'X', KeyboardKey::KEY_X},
+        {'C', KeyboardKey::KEY_C},
+        {'V', KeyboardKey::KEY_V},
+        {'B', KeyboardKey::KEY_B},
+        {'N', KeyboardKey::KEY_N},
+        {'M', KeyboardKey::KEY_M},
+    };
+    return map;
+}
+const std::map<char, KeyboardKey>& KEYBOARD_MAPPINGS_AZERTY(){
+    static const std::map<char, KeyboardKey> map{
+        {'1', KeyboardKey::KEY_KP_1},
+        {'2', KeyboardKey::KEY_KP_2},
+        {'3', KeyboardKey::KEY_KP_3},
+        {'4', KeyboardKey::KEY_KP_4},
+        {'5', KeyboardKey::KEY_KP_5},
+        {'6', KeyboardKey::KEY_KP_6},
+        {'7', KeyboardKey::KEY_KP_7},
+        {'8', KeyboardKey::KEY_KP_8},
+        {'9', KeyboardKey::KEY_KP_9},
+        {'0', KeyboardKey::KEY_KP_0},
+
+        {'A', KeyboardKey::KEY_Q},
+        {'Z', KeyboardKey::KEY_W},
+        {'E', KeyboardKey::KEY_E},
+        {'R', KeyboardKey::KEY_R},
+        {'T', KeyboardKey::KEY_T},
+        {'Y', KeyboardKey::KEY_Y},
+        {'U', KeyboardKey::KEY_U},
+        {'I', KeyboardKey::KEY_I},
+        {'O', KeyboardKey::KEY_O},
+        {'P', KeyboardKey::KEY_P},
+
+        {'Q', KeyboardKey::KEY_A},
+        {'S', KeyboardKey::KEY_S},
+        {'D', KeyboardKey::KEY_D},
+        {'F', KeyboardKey::KEY_F},
+        {'G', KeyboardKey::KEY_G},
+        {'H', KeyboardKey::KEY_H},
+        {'J', KeyboardKey::KEY_J},
+        {'K', KeyboardKey::KEY_K},
+        {'L', KeyboardKey::KEY_L},
+        {'M', KeyboardKey::KEY_SEMICOLON},
+
+        {'W', KeyboardKey::KEY_Z},
+        {'X', KeyboardKey::KEY_X},
+        {'C', KeyboardKey::KEY_C},
+        {'V', KeyboardKey::KEY_V},
+        {'B', KeyboardKey::KEY_B},
+        {'N', KeyboardKey::KEY_N},
+    };
+    return map;
+}
+
+
+
+
+const std::map<char, KeyboardEntryPosition>& KEYBOARD_POSITIONS_QWERTY(){
+    static const std::map<char, KeyboardEntryPosition> map{
+        {'1', {0,  0}},
+        {'2', {0,  1}},
+        {'3', {0,  2}},
+        {'4', {0,  3}},
+        {'5', {0,  4}},
+        {'6', {0,  5}},
+        {'7', {0,  6}},
+        {'8', {0,  7}},
+        {'9', {0,  8}},
+        {'0', {0,  9}},
+        {'-', {0, 10}},
+
+        {'Q', {1,  0}},
+        {'W', {1,  1}},
+        {'E', {1,  2}},
+        {'R', {1,  3}},
+        {'T', {1,  4}},
+        {'Y', {1,  5}},
+        {'U', {1,  6}},
+        {'I', {1,  7}},
+        {'O', {1,  8}},
+        {'P', {1,  9}},
+        {'/', {1, 10}},
+
+        {'A', {2,  0}},
+        {'S', {2,  1}},
+        {'D', {2,  2}},
+        {'F', {2,  3}},
+        {'G', {2,  4}},
+        {'H', {2,  5}},
+        {'J', {2,  6}},
+        {'K', {2,  7}},
+        {'L', {2,  8}},
+        {':', {2,  9}},
+        {'\'', {2, 10}},
+
+        {'Z', {3,  0}},
+        {'X', {3,  1}},
+        {'C', {3,  2}},
+        {'V', {3,  3}},
+        {'B', {3,  4}},
+        {'N', {3,  5}},
+        {'M', {3,  6}},
+        {',', {3,  7}},
+        {'.', {3,  8}},
+        {'?', {3,  9}},
+        {'!', {3, 10}},
+    };
+    return map;
+}
+const std::map<char, KeyboardEntryPosition>& KEYBOARD_POSITIONS_AZERTY(){
+    static const std::map<char, KeyboardEntryPosition> map{
+        {'1', {0,  0}},
+        {'2', {0,  1}},
+        {'3', {0,  2}},
+        {'4', {0,  3}},
+        {'5', {0,  4}},
+        {'6', {0,  5}},
+        {'7', {0,  6}},
+        {'8', {0,  7}},
+        {'9', {0,  8}},
+        {'0', {0,  9}},
+        {'-', {0, 10}},
+
+        {'A', {1,  0}},
+        {'Z', {1,  1}},
+        {'E', {1,  2}},
+        {'R', {1,  3}},
+        {'T', {1,  4}},
+        {'Y', {1,  5}},
+        {'U', {1,  6}},
+        {'I', {1,  7}},
+        {'O', {1,  8}},
+        {'P', {1,  9}},
+        {'\'', {1, 10}},
+
+        {'Q', {2, 0}},
+        {'S', {2, 1}},
+        {'D', {2, 2}},
+        {'F', {2, 3}},
+        {'G', {2, 4}},
+        {'H', {2, 5}},
+        {'J', {2, 6}},
+        {'K', {2, 7}},
+        {'L', {2, 8}},
+        {'M', {2, 9}},
+        {';', {2, 10}},
+
+        {'W', {3,  0}},
+        {'X', {3,  1}},
+        {'C', {3,  2}},
+        {'V', {3,  3}},
+        {'B', {3,  4}},
+        {'N', {3,  5}},
+        {',', {3,  6}},
+        {'.', {3,  7}},
+        {'!', {3,  8}},
+        {'?', {3,  9}},
+        {':', {3, 10}},
+    };
+    return map;
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/FastCodeEntry/NintendoSwitch_KeyboardEntryMappings.h b/SerialPrograms/Source/NintendoSwitch/Programs/FastCodeEntry/NintendoSwitch_KeyboardEntryMappings.h
new file mode 100644
index 0000000000..a4bc3e8d9c
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Programs/FastCodeEntry/NintendoSwitch_KeyboardEntryMappings.h
@@ -0,0 +1,47 @@
+/*  Keyboard Entry Mappings
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_NintendoSwitch_KeyboardEntryMappings_H
+#define PokemonAutomation_NintendoSwitch_KeyboardEntryMappings_H
+
+#include <map>
+#include "ControllerInput/Keyboard/KeyboardHidButtons.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+
+enum class KeyboardLayout{
+    QWERTY,
+    AZERTY
+};
+
+const std::map<char, KeyboardKey>& KEYBOARD_MAPPINGS(KeyboardLayout layout);
+
+const std::map<char, KeyboardKey>& KEYBOARD_MAPPINGS_QWERTY();
+const std::map<char, KeyboardKey>& KEYBOARD_MAPPINGS_AZERTY();
+
+
+
+
+struct KeyboardEntryPosition{
+    uint8_t row;
+    uint8_t col;
+};
+
+const std::map<char, KeyboardEntryPosition>& KEYBOARD_POSITIONS(KeyboardLayout layout);
+
+const std::map<char, KeyboardEntryPosition>& KEYBOARD_POSITIONS_QWERTY();
+const std::map<char, KeyboardEntryPosition>& KEYBOARD_POSITIONS_AZERTY();
+
+
+
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/FastCodeEntry/NintendoSwitch_NumberCodeEntry.cpp b/SerialPrograms/Source/NintendoSwitch/Programs/FastCodeEntry/NintendoSwitch_NumberCodeEntry.cpp
new file mode 100644
index 0000000000..b48ac74966
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Programs/FastCodeEntry/NintendoSwitch_NumberCodeEntry.cpp
@@ -0,0 +1,306 @@
+/*  Number Code Entry
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <map>
+#include "CommonFramework/Exceptions/OperationFailedException.h"
+#include "NintendoSwitch/NintendoSwitch_Settings.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "NintendoSwitch/Inference/NintendoSwitch_ConsoleTypeDetector.h"
+#include "NintendoSwitch_CodeEntryTools.h"
+#include "NintendoSwitch_NumberCodeEntry.h"
+#include "NintendoSwitch_KeyboardCodeEntry.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace FastCodeEntry{
+
+
+
+
+void numberpad_enter_code(
+    ConsoleHandle& console, AbstractControllerContext& context,
+    bool assume_console_type_is_ready,
+    const std::string& code, bool include_plus
+){
+    auto* keyboard = dynamic_cast<StandardHid::Keyboard*>(&context.controller());
+    if (keyboard){
+        StandardHid::KeyboardContext subcontext(context);
+        keyboard_enter_code(console, subcontext, KeyboardLayout::QWERTY, code, include_plus);
+        return;
+    }
+
+    auto* procon = dynamic_cast<ProController*>(&context.controller());
+    if (procon){
+        ProControllerContext subcontext(context);
+        numberpad_enter_code(
+            console, subcontext,
+            assume_console_type_is_ready,
+            code, include_plus
+        );
+        return;
+    }
+
+    throw UserSetupError(
+        console, "Unsupported controller type."
+    );
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+struct NumberEntryPosition{
+    uint8_t row;
+    uint8_t col;
+};
+
+static const std::map<char, NumberEntryPosition>& NUMBER_POSITIONS(){
+    static const std::map<char, NumberEntryPosition> map{
+        {1, {0, 0}},
+        {2, {0, 1}},
+        {3, {0, 2}},
+        {4, {1, 0}},
+        {5, {1, 1}},
+        {6, {1, 2}},
+        {7, {2, 0}},
+        {8, {2, 1}},
+        {9, {2, 2}},
+        {0, {3, 1}},
+
+        {'1', {0, 0}},
+        {'2', {0, 1}},
+        {'3', {0, 2}},
+        {'4', {1, 0}},
+        {'5', {1, 1}},
+        {'6', {1, 2}},
+        {'7', {2, 0}},
+        {'8', {2, 1}},
+        {'9', {2, 2}},
+        {'0', {3, 1}},
+    };
+    return map;
+}
+
+
+
+
+
+//  Return the path from "source" to "destination".
+std::vector<CodeEntryAction> numberpad_get_path(
+    NumberEntryPosition source,
+    NumberEntryPosition destination
+){
+    std::vector<CodeEntryAction> path;
+
+    uint8_t row = source.row;
+    uint8_t col = source.col;
+
+    //  Do vertical first since it may auto-center the horizontal position.
+    while (row < destination.row){
+        path.emplace_back(CodeEntryAction::NORM_MOVE_DOWN);
+        row++;
+    }
+    while (row > destination.row){
+        path.emplace_back(CodeEntryAction::NORM_MOVE_UP);
+        row--;
+    }
+
+    //  Moving to the zero automatically changes the column.
+    if (row == 3){
+        col = 1;
+    }
+
+    while (col < destination.col){
+        path.emplace_back(CodeEntryAction::NORM_MOVE_RIGHT);
+        col++;
+    }
+    while (col > destination.col){
+        path.emplace_back(CodeEntryAction::NORM_MOVE_LEFT);
+        col--;
+    }
+
+    path.emplace_back(CodeEntryAction::ENTER_CHAR);
+
+    return path;
+}
+
+
+//  Get all possible paths from "start" to cover everything [positions, positions + length).
+std::vector<std::vector<CodeEntryAction>> numberpad_get_all_paths(
+    NumberEntryPosition start,
+    const NumberEntryPosition* positions, size_t length,
+    bool reordering
+){
+    if (length == 1){
+        return {numberpad_get_path(start, positions[0])};
+    }
+
+    std::vector<std::vector<CodeEntryAction>> paths;
+    {
+        NumberEntryPosition position = positions[0];
+        std::vector<CodeEntryAction> current = numberpad_get_path(start, position);
+        std::vector<std::vector<CodeEntryAction>> subpaths = numberpad_get_all_paths(
+            position,
+            positions + 1, length - 1,
+            reordering
+        );
+        for (std::vector<CodeEntryAction>& path : subpaths){
+            path.insert(path.begin(), current.begin(), current.end());
+            paths.emplace_back(std::move(path));
+        }
+    }
+    if (reordering){
+        NumberEntryPosition position = positions[length - 1];
+        std::vector<CodeEntryAction> current = numberpad_get_path(start, position);
+        current.emplace_back(CodeEntryAction::SCROLL_LEFT);
+        std::vector<std::vector<CodeEntryAction>> subpaths = numberpad_get_all_paths(
+            position,
+            positions, length - 1,
+            reordering
+        );
+        for (std::vector<CodeEntryAction>& path : subpaths){
+            path.insert(path.begin(), current.begin(), current.end());
+            paths.emplace_back(std::move(path));
+        }
+    }
+
+    return paths;
+}
+
+
+
+//  Given a set of paths, find the best one and return it with fully populated
+//  delays.
+std::vector<CodeEntryActionWithDelay> numberpad_get_best_path(
+    bool switch2,
+    const std::vector<std::vector<CodeEntryAction>>& paths,
+    const CodeEntryDelays& delays,
+    bool optimize
+){
+    std::vector<CodeEntryActionWithDelay> best_path;
+    Milliseconds best_time = Milliseconds::max();
+    for (const std::vector<CodeEntryAction>& path : paths){
+        std::vector<CodeEntryActionWithDelay> current_path;
+        Milliseconds current_time = codeboard_populate_delays(
+            switch2,
+            current_path,
+            path, delays, optimize
+        );
+
+//        cout << "Size = " << current_path.size() << ", cost = " << current_time.count() << endl;
+
+        if (best_time > current_time ||
+            (best_time == current_time && best_path.size() > current_path.size())
+        ){
+            best_time = current_time;
+            best_path = std::move(current_path);
+        }
+    }
+    return best_path;
+}
+
+
+
+
+void numberpad_enter_code(
+    ConsoleHandle& console, ProControllerContext& context,
+    bool assume_console_type_is_ready,
+    const std::string& code, bool include_plus
+){
+    //  Calculate the coordinates.
+    const std::map<char, NumberEntryPosition>& POSITION_MAP = NUMBER_POSITIONS();
+    std::vector<NumberEntryPosition> positions;
+    for (char ch : code){
+        auto iter = POSITION_MAP.find(ch);
+        if (iter == POSITION_MAP.end()){
+            throw_and_log<OperationFailedException>(
+                console, ErrorReportMode::NO_ERROR_REPORT,
+                "Invalid code character."
+            );
+        }
+        positions.emplace_back(iter->second);
+    }
+
+    CodeEntryDelays delays;
+
+    ConsoleType console_type = assume_console_type_is_ready
+        ? console.state().console_type()
+        : detect_console_type_from_in_game(console, context);
+    bool switch2;
+    if (is_switch1(console_type)){
+        switch2 = false;
+        if (context->performance_class() == ControllerPerformanceClass::SerialPABotBase_Wired){
+            delays = ConsoleSettings::instance().CODEBOARD_ENTRY_SWITCH1_WIRED;
+        }else{
+            delays = ConsoleSettings::instance().CODEBOARD_ENTRY_SWITCH1_WIRELESS;
+        }
+    }else if (is_switch2(console_type)){
+        switch2 = true;
+        if (context->performance_class() == ControllerPerformanceClass::SerialPABotBase_Wired){
+            delays = ConsoleSettings::instance().CODEBOARD_ENTRY_SWITCH2_WIRED;
+        }else{
+            delays = ConsoleSettings::instance().CODEBOARD_ENTRY_SWITCH2_WIRELESS;
+        }
+    }else{
+        throw UserSetupError(
+            console,
+            "Please select a valid Switch console type."
+        );
+    }
+
+
+    //  Get all the possible paths.
+    std::vector<std::vector<CodeEntryAction>> all_paths = numberpad_get_all_paths(
+        {0, 0},
+        positions.data(), positions.size(),
+        delays.reordering
+    );
+
+    //  Pick the best path.
+    std::vector<CodeEntryActionWithDelay> best_path = numberpad_get_best_path(
+        switch2,
+        all_paths,
+        delays,
+        !switch2 && context->atomic_multibutton()
+    );
+
+    codeboard_execute_path(context, delays, best_path);
+
+    if (include_plus){
+        ssf_press_button_ptv(context, BUTTON_PLUS);
+        ssf_press_button_ptv(context, BUTTON_PLUS);
+    }
+
+    ssf_flush_pipeline(context);
+}
+
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/FastCodeEntry/NintendoSwitch_NumberCodeEntry.h b/SerialPrograms/Source/NintendoSwitch/Programs/FastCodeEntry/NintendoSwitch_NumberCodeEntry.h
new file mode 100644
index 0000000000..6b4ceb8985
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Programs/FastCodeEntry/NintendoSwitch_NumberCodeEntry.h
@@ -0,0 +1,43 @@
+/*  Number Code Entry
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_NintendoSwitch_NumberCodeEntry_H
+#define PokemonAutomation_NintendoSwitch_NumberCodeEntry_H
+
+#include <optional>
+#include <string>
+#include "Controllers/StandardHid/StandardHid_Keyboard.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+#include "NintendoSwitch/NintendoSwitch_ConsoleHandle.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace FastCodeEntry{
+
+
+//  Automatically select between keyboard or pro controller depending on the
+//  controller type.
+void numberpad_enter_code(
+    ConsoleHandle& console, AbstractControllerContext& context,
+    bool assume_console_type_is_ready,
+    const std::string& code, bool include_plus
+);
+
+void numberpad_enter_code(
+    ConsoleHandle& console, StandardHid::KeyboardContext& context,
+    const std::string& code, bool include_plus
+);
+void numberpad_enter_code(
+    ConsoleHandle& console, ProControllerContext& context,
+    bool assume_console_type_is_ready,
+    const std::string& code, bool include_plus
+);
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_FastCodeEntry.cpp b/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_FastCodeEntry.cpp
deleted file mode 100644
index 581128be82..0000000000
--- a/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_FastCodeEntry.cpp
+++ /dev/null
@@ -1,420 +0,0 @@
-/*  Fast Code Entry
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <vector>
-#include <map>
-#include "CommonFramework/GlobalSettingsPanel.h"
-#include "CommonFramework/Exceptions/OperationFailedException.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_ScalarButtons.h"
-#include "NintendoSwitch_FastCodeEntry.h"
-
-//#include <iostream>
-//using std::cout;
-//using std::endl;
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-
-
-
-
-
-FastCodeEntrySettingsOption::FastCodeEntrySettingsOption()
-    : BatchOption(LockWhileRunning::LOCKED)
-    , KEYBOARD_LAYOUT(
-        "<b>Keyboard Layout:</b>",
-        {
-            {KeyboardLayout::QWERTY, "qwerty", "QWERTY"},
-            {KeyboardLayout::AZERTY, "azerty", "AZERTY"},
-        },
-        LockWhileRunning::LOCKED,
-        KeyboardLayout::QWERTY
-    )
-    , SKIP_PLUS(
-        "<b>Skip the Plus:</b><br>Don't press + to finalize the code. Useful for testing.",
-        LockWhileRunning::UNLOCKED,
-        false
-    )
-    , m_advanced_options(
-        "<font size=4><b>Advanced Options: (developer only)</b></font>"
-    )
-    , DIGIT_REORDERING(
-        "<b>Digit Reordering:</b><br>Allow digits to be entered out of order.",
-        LockWhileRunning::LOCKED,
-        PreloadSettings::instance().DEVELOPER_MODE
-    )
-    , SCROLL_DELAY(
-        "<b>Scroll Delay:</b><br>Delay to scroll between adjacent keys.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        3, 15,
-        PreloadSettings::instance().DEVELOPER_MODE ? "5" : "6"
-    )
-    , WRAP_DELAY(
-        "<b>Wrap Delay:</b><br>Delay to wrap between left/right edges.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        3, 15,
-        "6"
-    )
-{
-    PA_ADD_OPTION(KEYBOARD_LAYOUT);
-    PA_ADD_OPTION(SKIP_PLUS);
-    if (PreloadSettings::instance().DEVELOPER_MODE){
-        PA_ADD_OPTION(m_advanced_options);
-        PA_ADD_OPTION(DIGIT_REORDERING);
-        PA_ADD_OPTION(SCROLL_DELAY);
-        PA_ADD_OPTION(WRAP_DELAY);
-    }
-}
-
-
-
-
-
-
-
-const std::map<char, CodeboardPosition>& CODEBOARD_POSITIONS_QWERTY(){
-    static const std::map<char, CodeboardPosition> map{
-        {'1', {0, 0}},
-        {'2', {0, 1}},
-        {'3', {0, 2}},
-        {'4', {0, 3}},
-        {'5', {0, 4}},
-        {'6', {0, 5}},
-        {'7', {0, 6}},
-        {'8', {0, 7}},
-        {'9', {0, 8}},
-        {'0', {0, 9}},
-
-        {'Q', {1, 0}},
-        {'W', {1, 1}},
-        {'E', {1, 2}},
-        {'R', {1, 3}},
-        {'T', {1, 4}},
-        {'Y', {1, 5}},
-        {'U', {1, 6}},
-        {'P', {1, 9}},
-
-        {'A', {2, 0}},
-        {'S', {2, 1}},
-        {'D', {2, 2}},
-        {'F', {2, 3}},
-        {'G', {2, 4}},
-        {'H', {2, 5}},
-        {'J', {2, 6}},
-        {'K', {2, 7}},
-        {'L', {2, 8}},
-
-        {'X', {3, 1}},
-        {'C', {3, 2}},
-        {'V', {3, 3}},
-        {'B', {3, 4}},
-        {'N', {3, 5}},
-        {'M', {3, 6}},
-    };
-    return map;
-}
-
-const std::map<char, CodeboardPosition>& CODEBOARD_POSITIONS_AZERTY(){
-    static const std::map<char, CodeboardPosition> map{
-        {'1', {0, 0}},
-        {'2', {0, 1}},
-        {'3', {0, 2}},
-        {'4', {0, 3}},
-        {'5', {0, 4}},
-        {'6', {0, 5}},
-        {'7', {0, 6}},
-        {'8', {0, 7}},
-        {'9', {0, 8}},
-        {'0', {0, 9}},
-
-        {'A', {1, 0}},
-        {'E', {1, 2}},
-        {'R', {1, 3}},
-        {'T', {1, 4}},
-        {'Y', {1, 5}},
-        {'U', {1, 6}},
-        {'P', {1, 9}},
-
-        {'Q', {2, 0}},
-        {'S', {2, 1}},
-        {'D', {2, 2}},
-        {'F', {2, 3}},
-        {'G', {2, 4}},
-        {'H', {2, 5}},
-        {'J', {2, 6}},
-        {'K', {2, 7}},
-        {'L', {2, 8}},
-        {'M', {2, 9}},
-
-        {'W', {3, 0}},
-        {'X', {3, 1}},
-        {'C', {3, 2}},
-        {'V', {3, 3}},
-        {'B', {3, 4}},
-        {'N', {3, 5}},
-    };
-    return map;
-}
-
-DigitPath get_codeboard_digit_path(
-    CodeboardPosition source, CodeboardPosition destination,
-    uint8_t scroll_delay, uint8_t wrap_delay
-){
-//    cout << (size_t)scroll_delay << ", " << (size_t)wrap_delay << endl;
-    DigitPath path;
-
-    //  Vertical is easy since there's no wrapping and no hazards.
-    if (source.row < destination.row){
-        size_t diff = destination.row - source.row;
-        for (size_t c = 0; c < diff; c++){
-            path.path[path.length++] = {DPAD_DOWN, scroll_delay};
-        }
-    }else{
-        size_t diff = source.row - destination.row;
-        for (size_t c = 0; c < diff; c++){
-            path.path[path.length++] = {DPAD_UP, scroll_delay};
-        }
-    }
-
-    //  Horizontal is messy because we need extra delay on wrapping.
-    uint8_t col = source.col;
-    while (true){
-        if (col == destination.col){
-//            if (path.length > 0){
-//                path.path[path.length - 1].delay = 0;
-//            }
-            break;
-        }
-
-        uint8_t direction;
-        if (destination.col > col){
-            if (destination.col - col <= 6){
-                direction = DPAD_RIGHT;
-                col++;
-            }else{
-                direction = DPAD_LEFT;
-                col--;
-            }
-        }else{
-            if (col - destination.col <= 6){
-                direction = DPAD_LEFT;
-                col--;
-            }else{
-                direction = DPAD_RIGHT;
-                col++;
-            }
-        }
-
-        uint8_t delay = scroll_delay;
-        if (col == (uint8_t)-1){
-            col = 11;
-            delay = wrap_delay;
-        }
-        if (col == 12){
-            col = 0;
-            delay = wrap_delay;
-        }
-
-//        if (direction == DPAD_RIGHT && col == 11){
-//            delay = wrap_delay;
-//        }
-
-//        cout << "col = " << (int)col << ", length = " << (int)path.length << endl;
-
-        path.path[path.length++] = {direction, delay};
-    }
-
-    return path;
-}
-size_t get_codeboard_path_cost(const DigitPath& path){
-    size_t total_cost = 0;
-    for (uint8_t c = 0; c < path.length; c++){
-        total_cost += path.path[c].delay;
-    }
-    return total_cost;
-}
-size_t get_codeboard_path_cost(const std::vector<DigitPath>& path){
-    size_t total_cost = 0;
-    for (const DigitPath& digit : path){
-        size_t cost = get_codeboard_path_cost(digit);
-        if (digit.left_cursor){
-            cost++;
-        }
-        cost = std::max<size_t>(cost, 8);
-        total_cost += cost;
-    }
-    return total_cost;
-}
-
-std::vector<DigitPath> get_codeboard_path(
-    KeyboardLayout keyboard_layout,
-    const std::vector<CodeboardPosition>& positions, size_t s, size_t e,
-    CodeboardPosition start,
-    uint8_t scroll_delay, uint8_t wrap_delay, bool reordering
-){
-    if (e - s == 1){
-        return {get_codeboard_digit_path(start, positions[s], scroll_delay, wrap_delay)};
-    }
-
-    std::vector<DigitPath> forward;
-    {
-        CodeboardPosition position = positions[s];
-        forward.emplace_back(get_codeboard_digit_path(start, position, scroll_delay, wrap_delay));
-        std::vector<DigitPath> remaining = get_codeboard_path(
-            keyboard_layout,
-            positions, s + 1, e,
-            position,
-            scroll_delay, wrap_delay, reordering
-        );
-        forward.insert(forward.end(), remaining.begin(), remaining.end());
-    }
-
-    std::vector<DigitPath> reverse;
-    {
-        CodeboardPosition position = positions[e - 1];
-        reverse.emplace_back(get_codeboard_digit_path(start, position, scroll_delay, wrap_delay));
-        reverse.back().left_cursor = true;
-        std::vector<DigitPath> remaining = get_codeboard_path(
-            keyboard_layout,
-            positions, s, e - 1, position,
-            scroll_delay, wrap_delay, reordering
-        );
-        reverse.insert(reverse.end(), remaining.begin(), remaining.end());
-    }
-
-    if (!reordering){
-        return forward;
-    }
-
-    if (get_codeboard_path_cost(forward) <= get_codeboard_path_cost(reverse)){
-        return forward;
-    }else{
-        return reverse;
-    }
-}
-std::vector<DigitPath> get_codeboard_path(
-    Logger& logger,
-    KeyboardLayout keyboard_layout, const std::string& code,
-    uint8_t scroll_delay, uint8_t wrap_delay, bool reordering,
-    CodeboardPosition start = {0, 0}
-){
-    auto get_keyboard_layout = [](KeyboardLayout keyboard_layout){
-        switch (keyboard_layout){
-        case KeyboardLayout::QWERTY:
-            return CODEBOARD_POSITIONS_QWERTY();
-        case KeyboardLayout::AZERTY:
-            return CODEBOARD_POSITIONS_AZERTY();
-        default:
-            return CODEBOARD_POSITIONS_QWERTY();
-        }
-    };
-    const std::map<char, CodeboardPosition>& POSITION_MAP = get_keyboard_layout(keyboard_layout);
-    std::vector<CodeboardPosition> positions;
-    for (char ch : code){
-        auto iter = POSITION_MAP.find(ch);
-        if (iter == POSITION_MAP.end()){
-            throw OperationFailedException(
-                ErrorReport::NO_ERROR_REPORT, logger,
-                "Invalid code character."
-            );
-        }
-        positions.emplace_back(iter->second);
-    }
-    return get_codeboard_path(
-        keyboard_layout,
-        positions, 0, positions.size(),
-        start,
-        scroll_delay, wrap_delay, reordering
-    );
-}
-
-
-void move_codeboard(BotBaseContext& context, const DigitPath& path){
-    uint16_t delay = 3;
-    if (path.length > 0){
-        size_t last = (size_t)path.length - 1;
-        for (size_t c = 0; c < last; c++){
-            ssf_issue_scroll(
-                context,
-                path.path[c].direction,
-                path.path[c].delay,
-                6
-            );
-        }
-        ssf_issue_scroll(
-            context,
-            path.path[last].direction,
-            0,
-            6
-        );
-        delay = path.path[last].delay;
-    }
-    ssf_press_button(context, BUTTON_A, delay);
-}
-
-void run_codeboard_path(BotBaseContext& context, const std::vector<DigitPath>& path){
-    for (const DigitPath& digit : path){
-        move_codeboard(context, digit);
-        if (digit.left_cursor){
-            ssf_press_button(context, BUTTON_L, 1);
-        }
-    }
-}
-
-
-
-FastCodeEntrySettings::FastCodeEntrySettings(FastCodeEntrySettingsOption& option)
-    : keyboard_layout(option.KEYBOARD_LAYOUT)
-    , include_plus(!option.SKIP_PLUS)
-    , scroll_delay(option.SCROLL_DELAY)
-    , wrap_delay(option.WRAP_DELAY)
-    , digit_reordering(option.DIGIT_REORDERING)
-{}
-
-
-void enter_alphanumeric_code(
-    Logger& logger,
-    BotBaseContext& context,
-    const FastCodeEntrySettings& settings,
-    const std::string& code
-){
-    run_codeboard_path(context, get_codeboard_path(
-        logger,
-        settings.keyboard_layout, code,
-        settings.scroll_delay, settings.wrap_delay, settings.digit_reordering
-    ));
-    if (settings.include_plus){
-        pbf_press_button(context, BUTTON_PLUS, 5, 3);
-        pbf_press_button(context, BUTTON_PLUS, 5, 3);
-    }
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-}
-}
diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_FastCodeEntry.h b/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_FastCodeEntry.h
deleted file mode 100644
index bfd31f0004..0000000000
--- a/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_FastCodeEntry.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/*  Fast Code Entry
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_NintendoSwitch_FastCodeEntry_H
-#define PokemonAutomation_NintendoSwitch_FastCodeEntry_H
-
-#include <stdint.h>
-#include <string>
-#include <vector>
-#include "Common/Cpp/Options/BatchOption.h"
-#include "Common/Cpp/Options/StaticTextOption.h"
-#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
-#include "Common/Cpp/Options/TimeExpressionOption.h"
-#include "Common/Cpp/Options/EnumDropdownOption.h"
-
-namespace PokemonAutomation{
-    class Logger;
-    class BotBaseContext;
-namespace NintendoSwitch{
-
-
-
-enum class KeyboardLayout{
-    QWERTY,
-    AZERTY
-};
-
-class FastCodeEntrySettingsOption : public BatchOption{
-public:
-    FastCodeEntrySettingsOption();
-
-public:
-    EnumDropdownOption<KeyboardLayout> KEYBOARD_LAYOUT;
-    BooleanCheckBoxOption SKIP_PLUS;
-
-    SectionDividerOption m_advanced_options;
-    BooleanCheckBoxOption DIGIT_REORDERING;
-    TimeExpressionOption<uint8_t> SCROLL_DELAY;
-    TimeExpressionOption<uint8_t> WRAP_DELAY;
-};
-
-
-
-
-//  Internals for testing only.
-
-struct CodeboardPosition{
-    uint8_t row;
-    uint8_t col;
-};
-struct CodeboardScroll{
-    uint8_t direction : 4;
-    uint8_t delay : 4;
-};
-static_assert(sizeof(CodeboardScroll) == sizeof(uint8_t));
-struct DigitPath{
-    uint8_t length = 0;
-    bool left_cursor = false;
-    CodeboardScroll path[14];
-};
-DigitPath get_codeboard_digit_path(
-    CodeboardPosition source, CodeboardPosition destination,
-    uint8_t scroll_delay, uint8_t wrap_delay, bool reordering
-);
-void move_codeboard(BotBaseContext& context, const DigitPath& path);
-
-
-
-//  This is the one you want to call.
-
-struct FastCodeEntrySettings{
-    KeyboardLayout keyboard_layout = KeyboardLayout::QWERTY;
-    bool include_plus = true;
-    uint8_t scroll_delay = 8;
-    uint8_t wrap_delay = 8;
-    bool digit_reordering = false;
-
-    FastCodeEntrySettings() = default;
-    FastCodeEntrySettings(FastCodeEntrySettingsOption& option);
-};
-void enter_alphanumeric_code(
-    Logger& logger,
-    BotBaseContext& context,
-    const FastCodeEntrySettings& settings,
-    const std::string& code
-);
-
-
-
-
-
-
-
-
-
-
-
-}
-}
-#endif
diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_FriendCodeAdder.cpp b/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_FriendCodeAdder.cpp
index 566036be93..2a14c1fc0f 100644
--- a/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_FriendCodeAdder.cpp
+++ b/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_FriendCodeAdder.cpp
@@ -1,15 +1,17 @@
 /*  Friend Code Adder
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Device.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_DigitEntry.h"
+#include "Common/Cpp/Exceptions.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
 #include "NintendoSwitch/NintendoSwitch_Settings.h"
-#include "NintendoSwitch/FixedInterval.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "NintendoSwitch/Programs/FastCodeEntry/NintendoSwitch_NumberCodeEntry.h"
+#include "VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_AutoHosts.h"
 #include "NintendoSwitch_FriendCodeAdder.h"
-#include "PokemonSwSh/Commands/PokemonSwSh_Commands_AutoHosts.h"
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
@@ -19,11 +21,12 @@ FriendCodeAdder_Descriptor::FriendCodeAdder_Descriptor()
     : SingleSwitchProgramDescriptor(
         "NintendoSwitch:FriendCodeAdder",
         "Nintendo Switch", "Friend Code Adder",
-        "ComputerControl/blob/master/Wiki/Programs/NintendoSwitch/FriendCodeAdder.md",
+        "Programs/NintendoSwitch/FriendCodeAdder.html",
         "Add a list of friend codes.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_PerformanceClassSensitive,
         FeedbackType::NONE,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
     )
 {}
 
@@ -31,7 +34,7 @@ FriendCodeAdder_Descriptor::FriendCodeAdder_Descriptor()
 FriendCodeAdder::FriendCodeAdder()
     : USER_SLOT(
         "<b>User Slot:</b><br>Send friend requests for this profile.",
-        LockWhileRunning::LOCKED,
+        LockMode::LOCK_WHILE_RUNNING,
         1, 1, 8
     )
     , FRIEND_CODES(
@@ -44,53 +47,65 @@ FriendCodeAdder::FriendCodeAdder()
     , m_advanced_options(
         "<font size=4><b>Advanced Options:</b> You should not need to touch anything below here.</font>"
     )
-    , OPEN_CODE_PAD_DELAY(
+    , OPEN_CODE_PAD_DELAY1(
         "<b>Open Code Pad Delay</b>",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "1 * TICKS_PER_SECOND"
+        LockMode::LOCK_WHILE_RUNNING,
+        "2000 ms"
     )
-    , SEARCH_TIME(
+    , SEARCH_TIME0(
         "<b>Search Time:</b><br>Wait this long after initiating search.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "3 * TICKS_PER_SECOND"
+        LockMode::LOCK_WHILE_RUNNING,
+        "3000 ms"
     )
-    , TOGGLE_BEST_STATUS_DELAY(
+    , TOGGLE_BEST_STATUS_DELAY0(
         "<b>Toggle Best Delay:</b><br>Time needed to toggle the best friend status.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "1 * TICKS_PER_SECOND"
+        LockMode::LOCK_WHILE_RUNNING,
+        "1000 ms"
     )
 {
     PA_ADD_OPTION(USER_SLOT);
     PA_ADD_OPTION(FRIEND_CODES);
     PA_ADD_STATIC(m_advanced_options);
-    PA_ADD_OPTION(OPEN_CODE_PAD_DELAY);
-    PA_ADD_OPTION(SEARCH_TIME);
-    PA_ADD_OPTION(TOGGLE_BEST_STATUS_DELAY);
+    PA_ADD_OPTION(OPEN_CODE_PAD_DELAY1);
+    PA_ADD_OPTION(SEARCH_TIME0);
+    PA_ADD_OPTION(TOGGLE_BEST_STATUS_DELAY0);
 }
 
-void FriendCodeAdder::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
+void FriendCodeAdder::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
     grip_menu_connect_go_home(context);
 
+    ensure_at_home(env.console, context);
+
+    ConsoleType type = env.console.state().console_type();
+    uint8_t scroll_down_slots = 0;
+    if (is_switch1(type)){
+        scroll_down_slots = 3;
+    }else if (is_switch2(type)){
+        scroll_down_slots = 1;
+    }else{
+        throw UserSetupError(
+            env.logger(),
+            "Please select a valid Switch console type."
+        );
+    }
+
     bool first = true;
     for (const std::string& line : FRIEND_CODES.lines()){
-        std::vector<uint8_t> code = FriendCodeListOption::parse(line);
+        std::string code = FriendCodeListOption::parse(line);
         if (code.size() != 12){
             continue;
         }
 
-        PokemonSwSh::home_to_add_friends(context, USER_SLOT - 1, 3, first);
+        PokemonSwSh::home_to_add_friends(context, USER_SLOT - 1, scroll_down_slots, first);
         first = false;
 
-        ssf_press_button1(context, BUTTON_A, OPEN_CODE_PAD_DELAY);
-        enter_digits(context, 12, &code[0]);
+        ssf_press_button_ptv(context, BUTTON_A, OPEN_CODE_PAD_DELAY1);
+        FastCodeEntry::numberpad_enter_code(env.console, context, false, code, true);
 
-        pbf_wait(context, SEARCH_TIME);
-        ssf_press_button1(context, BUTTON_A, TOGGLE_BEST_STATUS_DELAY);
-        ssf_press_button1(context, BUTTON_A, TOGGLE_BEST_STATUS_DELAY);
-        pbf_press_button(context, BUTTON_HOME, 10, ConsoleSettings::instance().SETTINGS_TO_HOME_DELAY);
+        pbf_wait(context, SEARCH_TIME0);
+        ssf_press_button(context, BUTTON_A, TOGGLE_BEST_STATUS_DELAY0);
+        ssf_press_button(context, BUTTON_A, TOGGLE_BEST_STATUS_DELAY0);
+        pbf_press_button(context, BUTTON_HOME, 80ms, ConsoleSettings::instance().SETTINGS_TO_HOME_DELAY0);
     }
 }
 
diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_FriendCodeAdder.h b/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_FriendCodeAdder.h
index 84447f0608..89a884b6a4 100644
--- a/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_FriendCodeAdder.h
+++ b/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_FriendCodeAdder.h
@@ -1,6 +1,6 @@
 /*  Friend Code Adder
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -9,7 +9,7 @@
 
 #include "Common/Cpp/Options/StaticTextOption.h"
 #include "Common/Cpp/Options/SimpleIntegerOption.h"
-#include "Common/Cpp/Options/TimeExpressionOption.h"
+#include "Common/Cpp/Options/TimeDurationOption.h"
 #include "NintendoSwitch/Options/NintendoSwitch_FriendCodeListOption.h"
 #include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
 
@@ -25,17 +25,18 @@ class FriendCodeAdder_Descriptor : public SingleSwitchProgramDescriptor{
 
 class FriendCodeAdder : public SingleSwitchProgramInstance{
 public:
+    using Descriptor = FriendCodeAdder_Descriptor;
     FriendCodeAdder();
 
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
 
 private:
     SimpleIntegerOption<uint8_t> USER_SLOT;
     FriendCodeListOption FRIEND_CODES;
     SectionDividerOption m_advanced_options;
-    TimeExpressionOption<uint16_t> OPEN_CODE_PAD_DELAY;
-    TimeExpressionOption<uint16_t> SEARCH_TIME;
-    TimeExpressionOption<uint16_t> TOGGLE_BEST_STATUS_DELAY;
+    MillisecondsOption OPEN_CODE_PAD_DELAY1;
+    MillisecondsOption SEARCH_TIME0;
+    MillisecondsOption TOGGLE_BEST_STATUS_DELAY0;
 };
 
 
diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_FriendDelete.cpp b/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_FriendDelete.cpp
index 4417d2852f..85bb5de1ea 100644
--- a/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_FriendDelete.cpp
+++ b/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_FriendDelete.cpp
@@ -1,10 +1,10 @@
 /*  Friend Delete
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Device.h"
+#include "Common/Cpp/Exceptions.h"
 #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
 #include "NintendoSwitch_FriendDelete.h"
 
@@ -16,11 +16,12 @@ FriendDelete_Descriptor::FriendDelete_Descriptor()
     : SingleSwitchProgramDescriptor(
         "NintendoSwitch:FriendDelete",
         "Nintendo Switch", "Friend Delete",
-        "ComputerControl/blob/master/Wiki/Programs/NintendoSwitch/FriendDelete.md",
+        "Programs/NintendoSwitch/FriendDelete.html",
         "Mass delete/block all those unwanted friends.",
+        PanelQualityStanding::OFFICIAL_BELOW_STANDARDS,
+        ProgramControllerClass::StandardController_NoRestrictions,
         FeedbackType::NONE,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
     )
 {}
 
@@ -28,55 +29,67 @@ FriendDelete_Descriptor::FriendDelete_Descriptor()
 FriendDelete::FriendDelete()
     : FRIENDS_TO_DELETE(
         "<b>Number of Friends to Delete:</b>",
-        LockWhileRunning::LOCKED,
+        LockMode::LOCK_WHILE_RUNNING,
         3, 0, 300
     )
     , BLOCK_FRIENDS(
         "<b>Block Friends:</b><br>Block instead of delete!",
-        LockWhileRunning::LOCKED,
+        LockMode::LOCK_WHILE_RUNNING,
         false
     )
-    , VIEW_FRIEND_DELAY(
+    , VIEW_FRIEND_DELAY0(
         "<b>View Friend Delay:</b><br>Delay from opening a friend to when you can press buttons.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "2 * TICKS_PER_SECOND"
+        LockMode::LOCK_WHILE_RUNNING,
+        "2000 ms"
     )
-    , DELETE_FRIEND_DELAY(
+    , DELETE_FRIEND_DELAY0(
         "<b>Delete Friend Delay:</b><br>Delay to delete the friend.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "8 * TICKS_PER_SECOND"
+        LockMode::LOCK_WHILE_RUNNING,
+        "8000 ms"
     )
-    , FINISH_DELETE_DELAY(
+    , FINISH_DELETE_DELAY0(
         "<b>Finish Delete Delay:</b><br>Delay after deleting a friend.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "2 * TICKS_PER_SECOND"
+        LockMode::LOCK_WHILE_RUNNING,
+        "2000 ms"
     )
 {
     PA_ADD_OPTION(FRIENDS_TO_DELETE);
     PA_ADD_OPTION(BLOCK_FRIENDS);
-    PA_ADD_OPTION(VIEW_FRIEND_DELAY);
-    PA_ADD_OPTION(DELETE_FRIEND_DELAY);
-    PA_ADD_OPTION(FINISH_DELETE_DELAY);
+    PA_ADD_OPTION(VIEW_FRIEND_DELAY0);
+    PA_ADD_OPTION(DELETE_FRIEND_DELAY0);
+    PA_ADD_OPTION(FINISH_DELETE_DELAY0);
 }
-void FriendDelete::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    pbf_press_button(context, BUTTON_A, 5, 5);
+void FriendDelete::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+
+    ConsoleType console_type = env.console.state().console_type();
+    bool scroll_down;
+    if (is_switch2(console_type)){
+        scroll_down = true;
+    }else if (is_switch1(console_type)){
+        scroll_down = false;
+    }else{
+        throw UserSetupError(env.logger(), "Please choose a console type: Switch 1 or Switch 2");
+    }
+
+    pbf_press_button(context, BUTTON_ZL, 80ms, 160ms);
 
     for (uint16_t c = 0; c < FRIENDS_TO_DELETE; c++){
-        pbf_press_button(context, BUTTON_A, 5, VIEW_FRIEND_DELAY);      //  View friend
-        pbf_press_dpad(context, DPAD_DOWN, 5, 5);
-        pbf_press_button(context, BUTTON_A, 10, 90);                    //  Click on Options
+        pbf_press_button(context, BUTTON_A, 40ms, VIEW_FRIEND_DELAY0);      //  View friend
+        pbf_press_dpad(context, DPAD_DOWN, 48ms, 48ms);
+        pbf_press_dpad(context, DPAD_DOWN, 48ms, 48ms);
+        pbf_press_button(context, BUTTON_A, 80ms, 720ms);                   //  Click on Options
+        if (scroll_down){
+            pbf_press_dpad(context, DPAD_DOWN, 80ms, 160ms);
+        }
         if (BLOCK_FRIENDS){
-            pbf_press_dpad(context, DPAD_DOWN, 5, 5);
+            pbf_press_dpad(context, DPAD_DOWN, 80ms, 160ms);
         }
-        pbf_press_button(context, BUTTON_A, 10, 90);                    //  Click on Remove/Block Friend
+        pbf_press_button(context, BUTTON_A, 80ms, 720ms);                   //  Click on Remove/Block Friend
         if (BLOCK_FRIENDS){
-            pbf_press_button(context, BUTTON_A, 5, VIEW_FRIEND_DELAY);  //  Confirm
+            pbf_press_button(context, BUTTON_A, 80ms, VIEW_FRIEND_DELAY0);  //  Confirm
         }
-        pbf_press_button(context, BUTTON_A, 5, DELETE_FRIEND_DELAY);    //  Confirm
-        pbf_press_button(context, BUTTON_A, 5, FINISH_DELETE_DELAY);    //  Finish delete friend.
+        pbf_press_button(context, BUTTON_A, 80ms, DELETE_FRIEND_DELAY0);    //  Confirm
+        pbf_press_button(context, BUTTON_A, 80ms, FINISH_DELETE_DELAY0);    //  Finish delete friend.
     }
 }
 
diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_FriendDelete.h b/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_FriendDelete.h
index c621f2d816..4ca7ffadcd 100644
--- a/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_FriendDelete.h
+++ b/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_FriendDelete.h
@@ -1,6 +1,6 @@
 /*  Friend Delete
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -9,7 +9,7 @@
 
 #include "Common/Cpp/Options/BooleanCheckBoxOption.h"
 #include "Common/Cpp/Options/SimpleIntegerOption.h"
-#include "Common/Cpp/Options/TimeExpressionOption.h"
+#include "Common/Cpp/Options/TimeDurationOption.h"
 #include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
 
 namespace PokemonAutomation{
@@ -25,15 +25,16 @@ class FriendDelete_Descriptor : public SingleSwitchProgramDescriptor{
 
 class FriendDelete : public SingleSwitchProgramInstance{
 public:
+    using Descriptor = FriendDelete_Descriptor;
     FriendDelete();
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
 
 private:
     SimpleIntegerOption<uint16_t> FRIENDS_TO_DELETE;
     BooleanCheckBoxOption BLOCK_FRIENDS;
-    TimeExpressionOption<uint16_t> VIEW_FRIEND_DELAY;
-    TimeExpressionOption<uint16_t> DELETE_FRIEND_DELAY;
-    TimeExpressionOption<uint16_t> FINISH_DELETE_DELAY;
+    MillisecondsOption VIEW_FRIEND_DELAY0;
+    MillisecondsOption DELETE_FRIEND_DELAY0;
+    MillisecondsOption FINISH_DELETE_DELAY0;
 };
 
 
diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_GameEntry.cpp b/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_GameEntry.cpp
index 28fb305c2d..5120debad5 100644
--- a/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_GameEntry.cpp
+++ b/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_GameEntry.cpp
@@ -1,21 +1,27 @@
 /*  Game Entry
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-#include "CommonFramework/Exceptions/OperationFailedException.h"
-#include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "CommonFramework/ImageTools/SolidColorTest.h"
+#include "Common/Cpp/Exceptions.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
 #include "CommonFramework/VideoPipeline/VideoFeed.h"
 #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
-#include "CommonFramework/InferenceInfra/VisualInferenceCallback.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
-#include "CommonFramework/Inference/BlackScreenDetector.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonTools/Images/SolidColorTest.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "CommonTools/VisualDetectors/BlackScreenDetector.h"
 #include "NintendoSwitch/NintendoSwitch_Settings.h"
 #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "NintendoSwitch/Inference/NintendoSwitch_DetectHome.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "NintendoSwitch/Inference/NintendoSwitch_CheckOnlineDetector.h"
+#include "NintendoSwitch/Inference/NintendoSwitch_FailedToConnectDetector.h"
+#include "NintendoSwitch/Inference/NintendoSwitch_HomeMenuDetector.h"
+#include "NintendoSwitch/Inference/NintendoSwitch_CloseGameDetector.h"
+#include "NintendoSwitch/Inference/NintendoSwitch_StartGameUserSelectDetector.h"
+#include "NintendoSwitch/Inference/NintendoSwitch_UpdatePopupDetector.h"
 #include "NintendoSwitch_GameEntry.h"
 
 //#include <iostream>
@@ -27,195 +33,462 @@ namespace NintendoSwitch{
 
 
 
-void resume_game_from_home(
-    ConsoleHandle& console,
-    BotBaseContext& context,
-    bool skip_home_press
+void require_player(
+    Logger& logger,
+    ProControllerContext& context,
+    Button connect_button,
+    ControllerPlayerNumber required
 ){
-    if (!skip_home_press){
-        pbf_press_button(context, BUTTON_HOME, 10, 10);
+    logger.log("Connecting controller...");
+
+    const std::string& required_str = player_number_to_string(required);
+
+    ControllerPlayerNumber current = context->get_player_number(context);
+    const std::string* current_str = &player_number_to_string(current);
+    logger.log("Current Player Number: " + *current_str);
+    if (current == ControllerPlayerNumber::UNKNOWN){
+        if (connect_button != Button::BUTTON_NONE){
+            pbf_press_button(context, connect_button, 40ms, 24ms);
+            context.wait_for_all_requests();
+        }
+        return;
     }
-    context.wait_for_all_requests();
 
-    while (true){
-        UpdateMenuWatcher detector(false);
-        int ret = wait_until(
-            console, context,
-            std::chrono::milliseconds(1000),
-            { detector }
-        );
-        if (ret < 0){
+    for (int retries = 0;; retries++){
+        if (current == required){
+            logger.log("Controller player matches required (" + *current_str + "). Continuing...", COLOR_BLUE);
             return;
         }
 
-        console.log("Detected update window.", COLOR_RED);
-
-        pbf_press_dpad(context, DPAD_UP, 5, 0);
-        pbf_press_button(context, BUTTON_A, 10, 500);
-        context.wait_for_all_requests();
-    }
-}
+        if (connect_button == Button::BUTTON_NONE){
+            throw UserSetupError(
+                logger,
+                "Please connect your controller to the console."
+            );
+        }
 
+        if (current != ControllerPlayerNumber::DISCONNECTED){
+            if (required == ControllerPlayerNumber::PLAYER1){
+                throw UserSetupError(
+                    logger,
+                    "Controller is connected as the wrong player. Please disconnect all other controllers."
+                );
+            }else{
+                throw UserSetupError(
+                    logger,
+                    "Controller is connected as the wrong player. Please reconnect to: " + required_str
+                );
+            }
+        }
 
+        if (retries >= 5){
+            if (required == ControllerPlayerNumber::PLAYER1){
+                throw UserSetupError(
+                    logger,
+                    "Failed to connect controller after 5 tries. Please disconnect all other controllers."
+                );
+            }else{
+                throw UserSetupError(
+                    logger,
+                    "Failed to connect controller after 5 tries."
+                );
+            }
+        }
 
+        logger.log("Attempt to connect controller...", COLOR_ORANGE);
+        pbf_press_button(context, connect_button, 40ms, 360ms);
+        context.wait_for_all_requests();
 
+        current = context->get_player_number(context);
+        current_str = &player_number_to_string(current);
 
+        logger.log("Current Player Number: " + *current_str);
+    }
 
+}
 
 
 
 
+//
+//  ensure_at_home()
+//
 
-void move_to_user(BotBaseContext& context, uint8_t user_slot){
-    if (user_slot != 0){
-        //  Move to correct user.
-        for (uint8_t c = 0; c < 8; c++){
-            pbf_press_dpad(context, DPAD_LEFT, 7, 7);
-        }
-        for (uint8_t c = 1; c < user_slot; c++){
-            pbf_press_dpad(context, DPAD_RIGHT, 7, 7);
-        }
+void go_home(ConsoleHandle& console, ProControllerContext& context){
+    console.log("Going Home...");
+    pbf_press_button(context, BUTTON_HOME, 160ms, 0ms);
+    if (!console.video().snapshot()){
+        pbf_wait(context, 640ms);
+        return;
+    }
+    ensure_at_home(console, context);
+}
+void go_home(ConsoleHandle& console, JoyconContext& context){
+    console.log("Going Home...");
+    pbf_press_button(context, BUTTON_HOME, 160ms, 0ms);
+    if (!console.video().snapshot()){
+        pbf_wait(context, 640ms);
+        return;
     }
+    ensure_at_home(console, context);
 }
 
+template <typename ControllerContext>
+void ensure_at_home(ConsoleHandle& console, ControllerContext& context, size_t retries){
+    //  Feedback not available. Just assume we're already on Home.
+    if (!console.video().snapshot()){
+        pbf_wait(context, 640ms);
+        return;
+    }
 
-void start_game_from_home_with_inference(
-    ConsoleHandle& console,
-    BotBaseContext& context,
-    uint8_t game_slot,
-    uint8_t user_slot,
-    uint16_t start_game_wait
-){
-    context.wait_for_all_requests();
-    {
-        HomeWatcher detector;
-        int ret = run_until(
-            console, context,
-            [](BotBaseContext& context){
-                pbf_mash_button(context, BUTTON_B, 10 * TICKS_PER_SECOND);
-            },
-            { detector }
+    for (size_t attempts = 0; attempts < retries; attempts++){
+        HomeMenuWatcher home_menu(console, false, COLOR_RED);
+        context.wait_for_all_requests();
+        int ret = wait_until(
+            console, context, 5000ms,
+            {home_menu}
         );
         if (ret == 0){
-            console.log("Detected Home screen.");
-        }else{
-            throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, console,
-                "start_game_from_home_with_inference(): Failed to detect Home screen after 10 seconds.",
-                true
-            );
+            console.log("Home detected.");
+            //  While we're on the Home screen, we might as well read the
+            //  console type as well.
+            if (console.state().console_type_confirmed()){
+                return;
+            }
+            ConsoleTypeDetector_Home detector(console);
+            detector.detect_only(console.video().snapshot());
+            detector.commit_to_cache();
+            return;
         }
-        context.wait_for(std::chrono::milliseconds(100));
+        console.log("Unable to detect Home. Pressing Home button...", COLOR_RED);
+        pbf_press_button(context, BUTTON_HOME, 160ms, 160ms);
     }
+    OperationFailedExceptionWithScreenshot::fire(
+        ErrorReportMode::SEND_ERROR_REPORT,
+        "Unable to find Switch Home",
+        console
+    );
+}
 
-    if (game_slot != 0){
-        pbf_press_button(context, BUTTON_HOME, 10, ConsoleSettings::instance().SETTINGS_TO_HOME_DELAY - 10);
-        for (uint8_t c = 1; c < game_slot; c++){
-            pbf_press_dpad(context, DPAD_RIGHT, 5, 5);
-        }
-        context.wait_for_all_requests();
+void ensure_at_home(ConsoleHandle& console, ProControllerContext& context, size_t retries){
+    ensure_at_home<ProControllerContext>(console, context, retries);
+}
+void ensure_at_home(ConsoleHandle& console, JoyconContext& context, size_t retries){
+    ensure_at_home<JoyconContext>(console, context, retries);
+}
+
+
+//
+//  close_game_from_home()
+//
+
+void close_game_from_home_blind(ConsoleHandle& console, ProControllerContext& context){
+    console.log("close_game_from_home_blind");
+    ensure_at_home(console, context);
+
+    //  Use mashing to ensure that the X press succeeds. If it fails, the SR
+    //  will fail and can kill a den for the autohosts.
+
+    // this sequence will close the game from the home screen,
+    // regardless of whether the game is initially open or closed.
+
+                                                    // if game initially open.  |  if game initially closed
+    pbf_mash_button(context, BUTTON_X, 800ms);      // - Close game.            |  - does nothing
+    ssf_press_dpad_ptv(context, DPAD_DOWN);         // - Does nothing.          |  - moves selector away from the closed game to avoid opening it.
+    ssf_press_dpad_ptv(context, DPAD_DOWN);         // - Does nothing.          |  - Press Down a second time in case we drop one.
+    pbf_mash_button(context, BUTTON_A, 400ms);      // - Confirm close game.    |  - opens an app on the home screen (e.g. Online)
+    go_home(console, context);                      // - Does nothing.          |  - goes back to home screen.
+
+    // fail-safe against button drops and unexpected error messages.
+    pbf_mash_button(context, BUTTON_X, 400ms);
+    pbf_mash_button(context, BUTTON_B, 2800ms);
+}
+
+void close_game_from_home_blind(ConsoleHandle& console, JoyconContext& context){
+    console.log("close_game_from_home_blind");
+    ensure_at_home(console, context);
+    //  Use mashing to ensure that the X press succeeds. If it fails, the SR
+    //  will fail and can kill a den for the autohosts.
+
+    // this sequence will close the game from the home screen,
+    // regardless of whether the game is initially open or closed.
+
+                                                        // if game initially open.  |  if game initially closed
+    pbf_mash_button(context, BUTTON_X, 800ms);          // - Close game.            |  - does nothing
+    pbf_move_joystick(context, {0, -1}, 100ms, 10ms);   // - Does nothing.          |  - moves selector away from the closed game to avoid opening it.
+    pbf_move_joystick(context, {0, -1}, 100ms, 10ms);   // - Does nothing.          |  - Press Down a second time in case we drop one.
+    pbf_mash_button(context, BUTTON_A, 400ms);          // - Confirm close game.    |  - opens an app on the home screen (e.g. Online)
+    go_home(console, context);                          // - Does nothing.          |  - goes back to home screen.
+
+    // fail-safe against button drops and unexpected error messages.
+    pbf_mash_button(context, BUTTON_X, 400ms);
+    pbf_mash_button(context, BUTTON_B, 2000ms);
+}
+
+template <typename ControllerContext>
+void close_game_from_home(ConsoleHandle& console, ControllerContext& context){
+    if (!console.video().snapshot()){  // no visual feedback available
+        close_game_from_home_blind(console, context);
+        return;
     }
 
-    pbf_press_button(context, BUTTON_A, 20, 105);
+    console.log("close_game_from_home");
+    ensure_at_home(console, context);
 
+    // this sequence will close the game from the home screen,
+    // regardless of whether the game is initially open or closed.
+    bool seen_close_game = false;
+    size_t times_seen_home_before = 0;
     while (true){
-        HomeWatcher home(std::chrono::milliseconds(2000));
-        StartGameUserSelectWatcher user_select;
-        UpdateMenuWatcher update_menu(false);
-        BlackScreenWatcher black_screen;
         context.wait_for_all_requests();
+
+        CloseGameWatcher close_game(console);
+        HomeMenuWatcher home(console);
+        StartGameUserSelectWatcher user_select(console, COLOR_GREEN);
         int ret = wait_until(
             console, context,
-            std::chrono::seconds(10),
-            { home, user_select, update_menu, black_screen }
+            Seconds(10), 
+            {
+                close_game,
+                home,
+                user_select,
+            }
         );
 
-        //  Wait for screen to stabilize.
-        context.wait_for(std::chrono::milliseconds(100));
+        switch(ret){
+        case 0: // close_game
+            console.log("Detected close game menu.");
+            //  Don't mash here since it might mash you back into the game.
+//            pbf_mash_button(context, BUTTON_A, ConsoleSettings::instance().CLOSE_GAME_DELAY);
+            pbf_press_button(context, BUTTON_A, 160ms, ConsoleSettings::instance().CLOSE_GAME_DELAY);
+            seen_close_game = true;
+            continue;
+        case 1: // home
+            if (seen_close_game){ // successfully closed the game
+                return;
+            }
+
+            if (times_seen_home_before == 0){  // Try closing the game
+                pbf_mash_button(context, BUTTON_X, 800ms);
+                times_seen_home_before++;
+                continue;
+            }
+
+            if (times_seen_home_before == 1){  // The game not being selected can happen in Switch 2, when you touch the touchscreen on empty space on the Home screen.
+                console.log("Failed to close game once. Either game is already closed, or the game is not selected.");
+                ssf_issue_scroll(context, DPAD_DOWN, 24ms);     // moving the DPAD/joystick will allow the selection to come back.
+                ssf_issue_scroll(context, DPAD_DOWN, 24ms);
+                ssf_issue_scroll(context, DPAD_DOWN, 24ms);
+                console.log("Click the Home button to ensure that current game is selected.");
+                pbf_press_button(context, BUTTON_HOME, 160ms, 500ms);  // clicking home ensures that the cursor is selected on the current game.
+                go_home(console, context);
+                console.log("Try again to close the game.");
+                pbf_mash_button(context, BUTTON_X, 800ms);   // try again to close the game.
+                times_seen_home_before++;
+                continue;
+            }
+
+            if (times_seen_home_before == 2){
+                console.log("Game was already closed.");
+                return;
+            }
+
+            throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "close_game_from_home: Unexpected state.");  
+
+        case 2:
+            console.log("Detected user select. (unexpected)", COLOR_RED);
+            pbf_mash_button(context, BUTTON_B, 500ms);
+            seen_close_game = true;
+            continue;
+
+        default:
+            pbf_press_button(context, BUTTON_HOME, 160ms, 500ms);
+            console.log(
+                "close_game_from_home(): Failed to detect either the Home screen or the Close game menu after 10 seconds.",
+                COLOR_RED
+            );
+        }
+    }
+
+}
+
+void close_game_from_home(ConsoleHandle& console, ProControllerContext& context){
+    close_game_from_home<ProControllerContext>(console, context);
+}
+
+void close_game_from_home(ConsoleHandle& console, JoyconContext& context){
+    close_game_from_home<JoyconContext>(console, context);
+}
+
+
+//
+//  resume_game_from_home()
+//
+
+void resume_game_from_home(
+    ConsoleHandle& console, ProControllerContext& context,
+    bool skip_home_press
+){
+    if (!skip_home_press){
+        pbf_press_button(context, BUTTON_HOME, 80ms, 80ms);
+    }
+    context.wait_for_all_requests();
 
+    while (true){
+        UpdateMenuWatcher update_detector(console);
+        HomeMenuWatcher home_menu(console, false, COLOR_RED, std::chrono::milliseconds(5000));
+        HomeMenuWatcher no_home_menu(console, true, COLOR_RED, std::chrono::milliseconds(1000));
+        int ret = wait_until(
+            console, context,
+            std::chrono::milliseconds(30000),
+            {
+                update_detector,
+                home_menu,
+                no_home_menu,
+            }
+        );
         switch (ret){
         case 0:
-            console.log("Detected home screen (again).", COLOR_RED);
-            pbf_press_button(context, BUTTON_A, 20, 105);
-            break;
+            console.log("Detected update window.", COLOR_RED);
+            pbf_press_dpad(context, DPAD_UP, 40ms, 40ms);
+            pbf_press_dpad(context, DPAD_UP, 40ms, 40ms);
+            pbf_press_button(context, BUTTON_A, 80ms, 4000ms);
+            context.wait_for_all_requests();
+            continue;
         case 1:
-            console.log("Detected user-select screen.");
-            move_to_user(context, user_slot);
-            pbf_press_button(context, BUTTON_A, 10, start_game_wait);
-            return;
+            console.log("Detected HOME menu. (unexpected)", COLOR_RED);
+            pbf_press_button(context, BUTTON_HOME, 160ms, 5000ms);
+            context.wait_for_all_requests();
+            continue;
         case 2:
-            console.log("Detected update menu.", COLOR_RED);
-            pbf_press_dpad(context, DPAD_UP, 5, 0);
-            pbf_press_button(context, BUTTON_A, 20, 105);
-            break;
-        case 3:
-            console.log("Detected black screen. Game started...");
+            console.log("No HOME detected. Assume entered game.", COLOR_BLUE);
             return;
         default:
-            throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, console,
-                "start_game_from_home_with_inference(): No recognizable state after 10 seconds.",
-                true
+            console.log("resume_game_from_home(): No recognized state after 30 seconds. Assume entered game.", COLOR_RED);
+            return;
+        }
+    }
+}
+void resume_game_from_home(
+    ConsoleHandle& console, JoyconContext& context,
+    bool skip_home_press
+){
+    if (!skip_home_press){
+        pbf_press_button(context, BUTTON_HOME, 20ms, 10ms);
+    }
+    context.wait_for_all_requests();
+
+    while (true){
+        {
+            UpdateMenuWatcher update_detector(console);
+            int ret = wait_until(
+                console, context,
+                std::chrono::milliseconds(1000),
+                { update_detector }
             );
+            if (ret == 0){
+                console.log("Detected update window.", COLOR_RED);
+
+                pbf_move_joystick(context, {0, +1}, 40ms, 40ms);
+                pbf_move_joystick(context, {0, +1}, 40ms, 40ms);
+                pbf_press_button(context, BUTTON_A, 10ms, 500ms);
+                context.wait_for_all_requests();
+                continue;
+            }
+        }
+
+        //  In case we failed to enter the game.
+        HomeMenuWatcher home_detector(console);
+        if (home_detector.detect(console.video().snapshot())){
+            console.log("Failed to re-enter game. Trying again...", COLOR_RED);
+            pbf_press_button(context, BUTTON_HOME, 20ms, 10ms);
+            continue;
+        }else{
+            break;
         }
     }
 }
 
 
-void start_game_from_home(
-    ConsoleHandle& console,
-    BotBaseContext& context,
+
+//
+//  move_to_user()
+//
+
+void move_to_user(ProControllerContext& context, uint8_t user_slot){
+    if (user_slot != 0){
+        //  Move to correct user.
+        for (uint8_t c = 0; c < 9; c++){    //  Extra iteration in case one gets dropped.
+            ssf_issue_scroll_ptv(context, DPAD_LEFT, 160ms, 160ms);
+        }
+        for (uint8_t c = 1; c < user_slot; c++){
+            ssf_issue_scroll_ptv(context, DPAD_RIGHT, 160ms, 160ms);
+        }
+    }
+}
+void move_to_user(JoyconContext& context, uint8_t user_slot){
+    if (user_slot != 0){
+        //  Move to correct user.
+        for (uint8_t c = 0; c < 9; c++){    //  Extra iteration in case one gets dropped.
+            pbf_move_joystick(context, {-1, 0}, 160ms, 160ms);
+        }
+        for (uint8_t c = 1; c < user_slot; c++){
+            pbf_move_joystick(context, {+1, 0}, 160ms, 160ms);
+        }
+    }
+}
+
+
+
+//
+//  start_game_from_home_blind()
+//
+
+void start_game_from_home_blind(
+    Logger& logger, ProControllerContext& context,
     bool tolerate_update_menu,
     uint8_t game_slot,
-    uint8_t user_slot,
-    uint16_t start_game_mash
+    uint8_t user_slot
 ){
-    context.wait_for_all_requests();
-    if (console.video().snapshot()){
-        console.log("start_game_from_home(): Video capture available. Using inference...");
-        start_game_from_home_with_inference(console, context, game_slot, user_slot, start_game_mash);
-        return;
-    }else{
-        console.log("start_game_from_home(): Video capture not available.", COLOR_RED);
-    }
-
     if (game_slot != 0){
-        pbf_press_button(context, BUTTON_HOME, 10, ConsoleSettings::instance().SETTINGS_TO_HOME_DELAY - 10);
+        ssf_press_button(context, BUTTON_HOME, ConsoleSettings::instance().SETTINGS_TO_HOME_DELAY0, 160ms);
         for (uint8_t c = 1; c < game_slot; c++){
-            pbf_press_dpad(context, DPAD_RIGHT, 5, 5);
+            ssf_press_dpad_ptv(context, DPAD_RIGHT, 80ms);
         }
     }
 
     if (tolerate_update_menu){
         if (ConsoleSettings::instance().START_GAME_REQUIRES_INTERNET){
             throw UserSetupError(
-                console.logger(),
+                logger,
                 "Cannot have both \"Tolerate Update Menu\" and \"Start Game Requires Internet\" enabled at the same time without video feedback."
             );
         }
 
         //  If the update menu isn't there, these will get swallowed by the opening
         //  animation for the select user menu.
-        pbf_press_button(context, BUTTON_A, 5, 175);    //  Choose game
-        pbf_press_dpad(context, DPAD_UP, 5, 0);         //  Skip the update window.
+        pbf_press_button(context, BUTTON_A, 80ms, 1400ms);   //  Choose game
+        pbf_press_dpad(context, DPAD_UP, 80ms, 0ms);    //  Skip the update window.
         move_to_user(context, user_slot);
     }
 
+    Milliseconds start_game_mash = ConsoleSettings::instance().BLIND_START_GAME_MASH;
+
 //    cout << "START_GAME_REQUIRES_INTERNET = " << ConsoleSettings::instance().START_GAME_REQUIRES_INTERNET << endl;
     if (!ConsoleSettings::instance().START_GAME_REQUIRES_INTERNET && user_slot == 0){
         //  Mash your way into the game.
         pbf_mash_button(context, BUTTON_A, start_game_mash);
     }else{
-        pbf_press_button(context, BUTTON_A, 5, 175);    //  Enter select user menu.
+        pbf_press_button(context, BUTTON_A, 80ms, 1400ms);   //  Enter select user menu.
         move_to_user(context, user_slot);
-        pbf_press_button(context, BUTTON_A, 5, 5);      //  Enter game
+        ssf_press_button_ptv(context, BUTTON_A, 160ms); //  Enter game
 
         //  Switch to mashing ZL instead of A to get into the game.
         //  Mash your way into the game.
-        uint16_t duration = start_game_mash;
+        Milliseconds duration = start_game_mash;
         if (ConsoleSettings::instance().START_GAME_REQUIRES_INTERNET){
             //  Need to wait a bit longer for the internet check.
-            duration += ConsoleSettings::instance().START_GAME_INTERNET_CHECK_DELAY;
+            duration += ConsoleSettings::instance().START_GAME_INTERNET_CHECK_DELAY0;
         }
 //        pbf_mash_button(context, BUTTON_ZL, duration);
         pbf_wait(context, duration);
@@ -225,6 +498,262 @@ void start_game_from_home(
 
 
 
+//
+//  start_game_from_home_with_inference()
+//
+
+template <
+    typename ControllerContext,
+    typename ScrollUp,
+    typename ScrollRight
+>
+void start_game_from_home_with_inference(
+    ConsoleHandle& console, ControllerContext& context,
+    ScrollUp&& scroll_up,
+    ScrollRight&& scroll_right,
+    uint8_t game_slot,
+    uint8_t user_slot
+){
+    context.wait_for_all_requests();
+    {
+        HomeMenuWatcher detector(console);
+        int ret = run_until<ControllerContext>(
+            console, context,
+            [](ControllerContext& context){
+                if (context.controller().performance_class() == ControllerPerformanceClass::SerialPABotBase_Wired){
+                    pbf_mash_button(context, BUTTON_B, 10000ms);
+                }else{
+                    for (int c = 0; c < 10; c++){
+                        pbf_press_button(context, BUTTON_B, 200ms, 800ms);
+                    }
+                }
+            },
+            { detector }
+        );
+        if (ret == 0){
+            console.log("Detected Home screen.");
+        }else{
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "start_game_from_home_with_inference(): Failed to detect Home screen after 10 seconds.",
+                console
+            );
+        }
+        context.wait_for(std::chrono::milliseconds(100));
+    }
+
+//    cout << "Game Slot = " << (int)game_slot << endl;
+    if (game_slot != 0){
+        ssf_press_button(context, BUTTON_HOME, ConsoleSettings::instance().SETTINGS_TO_HOME_DELAY0, 160ms);
+        for (uint8_t c = 1; c < game_slot; c++){
+            scroll_right(context, 160ms, 160ms);
+        }
+        context.wait_for_all_requests();
+    }
+
+    BlackScreenWatcher black_screen(COLOR_BLUE, {0.1, 0.15, 0.8, 0.7});
+    int ret = run_until<ControllerContext>(
+        console, context,
+        [&](ControllerContext& context){
+            pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+
+            WallClock last_online_check = current_time();
+            WallClock master_deadline = current_time() + std::chrono::minutes(60 * 5);
+            while (true){
+                WallClock online_check_deadline = last_online_check + std::chrono::minutes(2);
+                WallClock deadline = std::min(master_deadline, online_check_deadline);
+                if (current_time() > deadline){
+                    break;
+                }
+
+                HomeMenuWatcher home(console, false, COLOR_RED, std::chrono::milliseconds(2000));
+                StartGameUserSelectWatcher user_select(console, COLOR_GREEN);
+                UpdateMenuWatcher update_menu(console, COLOR_PURPLE);
+                CheckOnlineWatcher check_online(COLOR_CYAN);
+                FailedToConnectWatcher failed_to_connect(COLOR_YELLOW);
+                context.wait_for_all_requests();
+                int ret = wait_until(
+                    console, context,
+                    std::chrono::seconds(30),
+                    {
+                        home,
+                        user_select,
+                        update_menu,
+                        check_online,
+                        failed_to_connect,
+                    }
+                );
+
+                //  Wait for screen to stabilize.
+                context.wait_for(std::chrono::milliseconds(100));
+
+                switch (ret){
+                case 0:
+                    console.log("Detected home screen (again).", COLOR_BLUE);
+                    pbf_press_button(context, BUTTON_A, 160ms, 40ms);
+                    break;
+                case 1:
+                    console.log("Detected user-select screen.");
+                    move_to_user(context, user_slot);
+                    pbf_press_button(context, BUTTON_A, 160ms, 40ms);
+                    break;
+                case 2:
+                    console.log("Detected update menu.", COLOR_BLUE);
+                    scroll_up(context, 40ms, 40ms);
+                    scroll_up(context, 40ms, 40ms);
+                    pbf_press_button(context, BUTTON_A, 160ms, 40ms);
+                    break;
+                case 3:
+                    console.log("Detected check online.", COLOR_BLUE);
+                    context.wait_for(std::chrono::seconds(1));
+                    last_online_check = current_time();
+                    break;
+                case 4:
+                    console.log("Detected failed to connect.", COLOR_BLUE);
+                    pbf_press_button(context, BUTTON_A, 160ms, 40ms);
+                    break;
+                default:
+                    console.log("start_game_from_home_with_inference(): No recognizable state after 30 seconds.", COLOR_RED);
+                    go_home(console, context);
+                    break;
+                }
+            }
+        },
+        {black_screen}
+    );
+    switch (ret){
+    case 0:
+        console.log("Detected black screen. Game started...");
+        return;
+    }
+
+    if (ret < 0){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "start_game_from_home_with_inference(): Failed to start game after multiple attempts.",
+            console
+        );
+    }
+}
+
+
+void start_game_from_home_with_inference(
+    ConsoleHandle& console, ProControllerContext& context,
+    uint8_t game_slot,
+    uint8_t user_slot
+){
+    start_game_from_home_with_inference<ProControllerContext>(
+        console, context,
+        [](ProControllerContext& context, Milliseconds hold, Milliseconds release){
+            pbf_press_dpad(context, DPAD_UP, hold, release);
+        },
+        [](ProControllerContext& context, Milliseconds hold, Milliseconds release){
+            pbf_press_dpad(context, DPAD_RIGHT, hold, release);
+        },
+        game_slot,
+        user_slot
+    );
+}
+void start_game_from_home_with_inference(
+    ConsoleHandle& console, JoyconContext& context,
+    uint8_t game_slot,
+    uint8_t user_slot
+){
+    start_game_from_home_with_inference<JoyconContext>(
+        console, context,
+        [](JoyconContext& context, Milliseconds hold, Milliseconds release){
+            pbf_move_joystick(context, {0, +1}, hold, release);
+        },
+        [](JoyconContext& context, Milliseconds hold, Milliseconds release){
+            pbf_move_joystick(context, {+1, 0}, hold, release);
+        },
+        game_slot,
+        user_slot
+    );
+}
+
+
+
+//
+//  start_game_from_home()
+//
+
+void start_game_from_home(
+    ConsoleHandle& console, ProControllerContext& context,
+    bool tolerate_update_menu,
+    uint8_t game_slot,
+    uint8_t user_slot
+){
+    context.wait_for_all_requests();
+    if (console.video().snapshot()){
+        console.log("start_game_from_home(): Video capture available. Using inference...");
+        start_game_from_home_with_inference(
+            console, context,
+            game_slot, user_slot
+        );
+    }else{
+        console.log("start_game_from_home(): Video capture not available.", COLOR_RED);
+        start_game_from_home_blind(
+            console, context,
+            tolerate_update_menu,
+            game_slot, user_slot
+        );
+    }
+}
+void start_game_from_home(
+    ConsoleHandle& console, JoyconContext& context,
+    uint8_t game_slot,
+    uint8_t user_slot
+){
+    //  Inference is required.
+    start_game_from_home_with_inference(
+        console, context,
+        game_slot, user_slot
+    );
+}
+
+
+
+//
+//  from_home_close_and_reopen_game()
+//
+
+void from_home_close_and_reopen_game(
+    ConsoleHandle& console, ProControllerContext& context,
+    bool tolerate_update_menu
+){
+#if 1
+    bool video_available = (bool)console.video().snapshot();
+    if (video_available ||
+        ConsoleSettings::instance().START_GAME_REQUIRES_INTERNET ||
+        tolerate_update_menu
+    ){
+        close_game_from_home(console, context);
+        start_game_from_home(
+            console,
+            context,
+            tolerate_update_menu,
+            0, 0
+        );
+        return;
+    }
+#endif
+
+    //  Fastest setting. No internet needed and no update menu.
+    ssf_mash1_button(context, BUTTON_X, 400ms);
+
+    Milliseconds start_game_mash = ConsoleSettings::instance().BLIND_START_GAME_MASH;
+
+    //  Use mashing to ensure that the X press succeeds. If it fails, the SR
+    //  will fail and can kill a den for the autohosts.
+    ssf_mash2_button(context, BUTTON_X, BUTTON_A, 3000ms + start_game_mash);
+    ssf_mash1_button(context, BUTTON_X, start_game_mash);
+}
+
+
+
+
+
 class GameLoadingDetector : public VisualInferenceCallback{
 public:
     GameLoadingDetector(bool invert)
@@ -256,39 +785,75 @@ class GameLoadingDetector : public VisualInferenceCallback{
 };
 
 
+
+//
+//  openedgame_to_gamemenu()
+//
+
 bool openedgame_to_gamemenu(
-    ConsoleHandle& console, BotBaseContext& context,
-    uint16_t timeout
+    VideoStream& stream, ProControllerContext& context,
+    Milliseconds timeout
 ){
     {
-        console.log("Waiting to load game...");
+        stream.log("Waiting to load game...");
         GameLoadingDetector detector(false);
         int ret = wait_until(
-            console, context,
-            std::chrono::milliseconds(timeout * (1000 / TICKS_PER_SECOND)),
+            stream, context,
+            timeout,
             {{detector}}
         );
         if (ret < 0){
-            console.log("Timed out waiting to enter game.", COLOR_RED);
+            stream.log("Timed out waiting to enter game.", COLOR_RED);
             return false;
         }
     }
     {
-        console.log("Waiting for game menu...");
+        stream.log("Waiting for game menu...");
         GameLoadingDetector detector(true);
         int ret = wait_until(
-            console, context,
-            std::chrono::milliseconds(timeout * (1000 / TICKS_PER_SECOND)),
+            stream, context,
+            timeout,
             {{detector}}
         );
         if (ret < 0){
-            console.log("Timed out waiting for game menu.", COLOR_RED);
+            stream.log("Timed out waiting for game menu.", COLOR_RED);
+            return false;
+        }
+    }
+    return true;
+}
+bool openedgame_to_gamemenu(
+    VideoStream& stream, JoyconContext& context,
+    Milliseconds timeout
+){
+    {
+        stream.log("Waiting to load game...");
+        GameLoadingDetector detector(false);
+        int ret = wait_until(
+            stream, context,
+            timeout,
+            {{detector}}
+        );
+        if (ret < 0){
+            stream.log("Timed out waiting to enter game.", COLOR_RED);
+            return false;
+        }
+    }
+    {
+        stream.log("Waiting for game menu...");
+        GameLoadingDetector detector(true);
+        int ret = wait_until(
+            stream, context,
+            timeout,
+            {{detector}}
+        );
+        if (ret < 0){
+            stream.log("Timed out waiting for game menu.", COLOR_RED);
             return false;
         }
     }
     return true;
 }
-
 
 
 
diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_GameEntry.h b/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_GameEntry.h
index e20ac590f9..a15d36471b 100644
--- a/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_GameEntry.h
+++ b/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_GameEntry.h
@@ -1,41 +1,83 @@
 /*  Game Entry
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifndef PokemonAutomation_NintendoSwitch_GameEntry_H
 #define PokemonAutomation_NintendoSwitch_GameEntry_H
 
-#include "CommonFramework/Tools/ConsoleHandle.h"
+#include "CommonFramework/Tools/VideoStream.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+#include "NintendoSwitch/Controllers/Joycon/NintendoSwitch_Joycon.h"
+#include "NintendoSwitch/NintendoSwitch_ConsoleHandle.h"
 
 namespace PokemonAutomation{
-    class BotBaseContext;
 namespace NintendoSwitch{
 
 
+void require_player(
+    Logger& logger,
+    ProControllerContext& context,
+    Button connect_button,
+    ControllerPlayerNumber required = ControllerPlayerNumber::PLAYER1
+);
+
+
+// Press Home button to go from game to Switch Home screen
+void go_home(ConsoleHandle& console, ProControllerContext& context);
+// Press Home button to go from game to Switch Home screen
+void go_home(ConsoleHandle& console, JoyconContext& context);
+void ensure_at_home(ConsoleHandle& console, ProControllerContext& context, size_t retries = 10);
+void ensure_at_home(ConsoleHandle& console, JoyconContext& context, size_t retries = 10);
+
+void close_game_from_home(ConsoleHandle& console, ProControllerContext& device);
+void close_game_from_home(ConsoleHandle& console, JoyconContext& device);
+
 void resume_game_from_home(
-    ConsoleHandle& console,
-    BotBaseContext& context,
+    ConsoleHandle& console, ProControllerContext& context,
+    bool skip_home_press = false
+);
+void resume_game_from_home(
+    ConsoleHandle& console, JoyconContext& context,
     bool skip_home_press = false
 );
 
+void move_to_user(ProControllerContext& context, uint8_t user_slot);
+void move_to_user(JoyconContext& context, uint8_t user_slot);
 
 void start_game_from_home(
-    ConsoleHandle& console,
-    BotBaseContext& context,
+    ConsoleHandle& console, ProControllerContext& context,
     bool tolerate_update_menu,
     uint8_t game_slot,
-    uint8_t user_slot,
-    uint16_t start_game_mash
+    uint8_t user_slot
+);
+void start_game_from_home(
+    ConsoleHandle& console, JoyconContext& context,
+    uint8_t game_slot,
+    uint8_t user_slot
 );
 
-bool openedgame_to_gamemenu(
-    ConsoleHandle& console, BotBaseContext& context,
-    uint16_t timeout
+//  From the home menu:
+//      1.  Close the game.
+//      2.  Restart the game using the current user.
+//  This does not enter all the way into the game. It only starts the reopens
+//  the game.
+void from_home_close_and_reopen_game(
+    ConsoleHandle& console, ProControllerContext& context,
+    bool tolerate_update_menu
 );
 
 
+bool openedgame_to_gamemenu(
+    VideoStream& stream, ProControllerContext& context,
+    Milliseconds timeout
+);
+bool openedgame_to_gamemenu(
+    VideoStream& stream, JoyconContext& context,
+    Milliseconds timeout
+);
+
 
 }
 }
diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_MenuStabilityTester.cpp b/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_MenuStabilityTester.cpp
new file mode 100644
index 0000000000..ca7bd68ad8
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_MenuStabilityTester.cpp
@@ -0,0 +1,177 @@
+/*  Friend Delete
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "NintendoSwitch_MenuStabilityTester.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+
+
+MenuStabilityTester_Descriptor::MenuStabilityTester_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "NintendoSwitch:MenuStabilityTester",
+        "Nintendo Switch", "Menu Stability Tester",
+        "",
+        "Test the speed and stability of various fast menu movements.",
+        PanelQualityStanding::DEVELOPER,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::NONE,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+MenuStabilityTester::~MenuStabilityTester(){
+    TEST_TYPE.remove_listener(*this);
+}
+MenuStabilityTester::MenuStabilityTester()
+    : TEST_TYPE(
+        std::move("Console Type:"),
+        {
+           {TestType::Vertical,             "vertical",     "Vertical Up-Down"},
+           {TestType::Horizontal,           "horizontal",   "Horizontal Side-to-Side"},
+           {TestType::SimultaneousScrollA,  "scroll-A",     "Simultaneous Scroll + A"},
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        TestType::Horizontal
+    )
+    , VERTICAL_RANGE(
+        "<b>Vertical Scroll Range:</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        20
+    )
+    , HORIZONTAL_RANGE(
+        "<b>Horizontal Scroll Range:</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        3
+    )
+    , PAUSE_BEFORE_UTURN(
+        "<b>Pause Before Turning Around:</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        false
+    )
+    , DELAY_TO_NEXT(
+        "<b>Delay to Next Button:</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        "24 ms"
+    )
+    , HOLD_DURATION(
+        "<b>Hold Duration:</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        "48 ms"
+    )
+    , COOLDOWN(
+        "<b>Cooldown:</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        "24 ms"
+    )
+{
+    PA_ADD_OPTION(TEST_TYPE);
+
+    PA_ADD_OPTION(VERTICAL_RANGE);
+    PA_ADD_OPTION(HORIZONTAL_RANGE);
+    PA_ADD_OPTION(PAUSE_BEFORE_UTURN);
+
+    PA_ADD_OPTION(DELAY_TO_NEXT);
+    PA_ADD_OPTION(HOLD_DURATION);
+    PA_ADD_OPTION(COOLDOWN);
+
+    MenuStabilityTester::on_config_value_changed(this);
+
+    TEST_TYPE.add_listener(*this);
+}
+void MenuStabilityTester::on_config_value_changed(void* object){
+    switch (TEST_TYPE){
+    case TestType::Vertical:
+        VERTICAL_RANGE.set_visibility(ConfigOptionState::ENABLED);
+        HORIZONTAL_RANGE.set_visibility(ConfigOptionState::HIDDEN);
+        PAUSE_BEFORE_UTURN.set_visibility(ConfigOptionState::ENABLED);
+        break;
+    case TestType::Horizontal:
+        VERTICAL_RANGE.set_visibility(ConfigOptionState::HIDDEN);
+        HORIZONTAL_RANGE.set_visibility(ConfigOptionState::ENABLED);
+        PAUSE_BEFORE_UTURN.set_visibility(ConfigOptionState::ENABLED);
+        break;
+    case TestType::SimultaneousScrollA:
+        VERTICAL_RANGE.set_visibility(ConfigOptionState::HIDDEN);
+        HORIZONTAL_RANGE.set_visibility(ConfigOptionState::HIDDEN);
+        PAUSE_BEFORE_UTURN.set_visibility(ConfigOptionState::HIDDEN);
+        break;
+    }
+}
+
+
+
+
+void MenuStabilityTester::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    switch (TEST_TYPE){
+    case TestType::Vertical:
+        while (true){
+            for (size_t c = 0; c < VERTICAL_RANGE; c++){
+                ssf_issue_scroll(context, DPAD_DOWN, DELAY_TO_NEXT, HOLD_DURATION, COOLDOWN);
+            }
+            if (PAUSE_BEFORE_UTURN){
+                ssf_do_nothing(context, 1000ms);
+            }
+            for (size_t c = 0; c < VERTICAL_RANGE; c++){
+                ssf_issue_scroll(context, DPAD_UP, DELAY_TO_NEXT, HOLD_DURATION, COOLDOWN);
+            }
+            if (PAUSE_BEFORE_UTURN){
+                ssf_do_nothing(context, 1000ms);
+            }
+        }
+        break;
+
+    case TestType::Horizontal:
+        while (true){
+            for (size_t c = 0; c < HORIZONTAL_RANGE; c++){
+                ssf_issue_scroll(context, DPAD_RIGHT, DELAY_TO_NEXT, HOLD_DURATION, COOLDOWN);
+            }
+            if (PAUSE_BEFORE_UTURN){
+                ssf_do_nothing(context, 1000ms);
+            }
+            for (size_t c = 0; c < HORIZONTAL_RANGE; c++){
+                ssf_issue_scroll(context, DPAD_LEFT, DELAY_TO_NEXT, HOLD_DURATION, COOLDOWN);
+            }
+            if (PAUSE_BEFORE_UTURN){
+                ssf_do_nothing(context, 1000ms);
+            }
+        }
+        break;
+
+    case TestType::SimultaneousScrollA:
+        while (true){
+            ssf_press_button(context, BUTTON_A, 0ms, HOLD_DURATION, COOLDOWN);
+            ssf_issue_scroll(context, DPAD_UP, DELAY_TO_NEXT, HOLD_DURATION, COOLDOWN);
+            ssf_do_nothing(context, 1000ms);
+        }
+        break;
+
+    }
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_MenuStabilityTester.h b/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_MenuStabilityTester.h
new file mode 100644
index 0000000000..b8c1cdd94d
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_MenuStabilityTester.h
@@ -0,0 +1,66 @@
+/*  Menu Stability Tester
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_NintendoSwitch_MenuStabilityTester_H
+#define PokemonAutomation_NintendoSwitch_MenuStabilityTester_H
+
+#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "Common/Cpp/Options/EnumDropdownOption.h"
+#include "Common/Cpp/Options/TimeDurationOption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+
+
+
+class MenuStabilityTester_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    MenuStabilityTester_Descriptor();
+};
+
+
+
+class MenuStabilityTester : public SingleSwitchProgramInstance, private ConfigOption::Listener{
+public:
+    using Descriptor = MenuStabilityTester_Descriptor;
+    ~MenuStabilityTester();
+    MenuStabilityTester();
+
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    virtual void on_config_value_changed(void* object) override;
+
+private:
+    enum class TestType{
+        Vertical,
+        Horizontal,
+        SimultaneousScrollA,
+    };
+
+    EnumDropdownOption<TestType> TEST_TYPE;
+    SimpleIntegerOption<uint8_t> VERTICAL_RANGE;
+    SimpleIntegerOption<uint8_t> HORIZONTAL_RANGE;
+    BooleanCheckBoxOption PAUSE_BEFORE_UTURN;
+
+    MillisecondsOption DELAY_TO_NEXT;
+    MillisecondsOption HOLD_DURATION;
+    MillisecondsOption COOLDOWN;
+
+};
+
+
+
+
+}
+}
+#endif
+
+
+
diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_PreventSleep.cpp b/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_PreventSleep.cpp
index 76e7b0b2ed..29d71eb073 100644
--- a/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_PreventSleep.cpp
+++ b/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_PreventSleep.cpp
@@ -1,11 +1,10 @@
 /*  Prevent Sleep
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include "Common/NintendoSwitch/NintendoSwitch_Protocol_PushButtons.h"
-#include "NintendoSwitch/FixedInterval.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
 #include "NintendoSwitch_PreventSleep.h"
 
 namespace PokemonAutomation{
@@ -16,11 +15,12 @@ PreventSleep_Descriptor::PreventSleep_Descriptor()
     : SingleSwitchProgramDescriptor(
         "NintendoSwitch:PreventSleep",
         "Nintendo Switch", "Prevent Sleep",
-        "ComputerControl/blob/master/Wiki/Programs/NintendoSwitch/PreventSleep.md",
+        "Programs/NintendoSwitch/PreventSleep.html",
         "Press B every 15 seconds to keep the Switch from sleeping.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
         FeedbackType::NONE,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
     )
 {}
 
@@ -28,9 +28,9 @@ PreventSleep_Descriptor::PreventSleep_Descriptor()
 
 PreventSleep::PreventSleep(){}
 
-void PreventSleep::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
+void PreventSleep::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
     while (true){
-        ssf_press_button2(context, BUTTON_B, 15 * TICKS_PER_SECOND, 10);
+        ssf_press_button(context, BUTTON_B, 15000ms, 80ms);
     }
 }
 
diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_PreventSleep.h b/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_PreventSleep.h
index abd8b6f78b..e95635e1b1 100644
--- a/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_PreventSleep.h
+++ b/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_PreventSleep.h
@@ -1,6 +1,6 @@
 /*  Prevent Sleep
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -21,9 +21,10 @@ class PreventSleep_Descriptor : public SingleSwitchProgramDescriptor{
 
 class PreventSleep : public SingleSwitchProgramInstance{
 public:
+    using Descriptor = PreventSleep_Descriptor;
     PreventSleep();
 
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
 
 
 };
diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_PushJoySticks.cpp b/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_PushJoySticks.cpp
index b704f9f3f6..59205d9109 100644
--- a/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_PushJoySticks.cpp
+++ b/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_PushJoySticks.cpp
@@ -1,6 +1,6 @@
 /*  Turbo Button
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -16,11 +16,12 @@ PushJoySticks_Descriptor::PushJoySticks_Descriptor()
     : SingleSwitchProgramDescriptor(
         "NintendoSwitch:PushJoySticks",
         "Nintendo Switch", "Push Joy Sticks",
-        "ComputerControl/blob/master/Wiki/Programs/NintendoSwitch/PushJoySticks.md",
-        "Push Joy Sticks continously.",
+        "Programs/NintendoSwitch/PushJoySticks.html",
+        "Push Joy Sticks continuously.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
         FeedbackType::NONE,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
     )
 {}
 
@@ -33,37 +34,84 @@ PushJoySticks_Descriptor::PushJoySticks_Descriptor()
 //  y = 255 : down
 
 PushJoySticks::PushJoySticks()
-    : LEFT_X(
-        "<b>Left Joy Stick X direction:</b><br>Range: 0-255. 0: left, 128: neutral, 255: right.",
-        LockWhileRunning::LOCKED,
-        128, 0, 255
+    : JOYCON_CLICK(
+        "<b>Joycon Click:</b>",
+        {
+            {0, "no-click", "No Click"},
+            {1, "left-click", "Click Left Joycon"},
+            {2, "right-click", "Click Right Joycon"},
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        0
     )
-    , LEFT_Y(
-        "<b>Left Joy Stick Y direction:</b><br>Range: 0-255. 0: up, 128: neutral, 255: down.",
-        LockWhileRunning::LOCKED,
-        128, 0, 255
+    , LEFT_X0(
+        "<b>Left Joy Stick X direction:</b><br>Range: [-1.0, 1.0.] -1: left, 0: neutral, +1: right.",
+        LockMode::LOCK_WHILE_RUNNING,
+        0, -1, 1
     )
-    , RIGHT_X(
-        "<b>Right Joy Stick X direction:</b><br>Range: 0-255. 0: left, 128: neutral, 255: right.",
-        LockWhileRunning::LOCKED,
-        128, 0, 255
+    , LEFT_Y0(
+        "<b>Left Joy Stick Y direction:</b><br>Range:  [-1.0, 1.0.]. +1: up, 0: neutral, -1: down.",
+        LockMode::LOCK_WHILE_RUNNING,
+        0, -1, 1
     )
-    , RIGHT_Y(
-        "<b>Right Joy Stick Y direction:</b><br>Range: 0-255. 0: up, 128: neutral, 255: down.",
-        LockWhileRunning::LOCKED,
-        128, 0, 255
+    , RIGHT_X0(
+        "<b>Right Joy Stick X direction:</b><br>Range: [-1.0, 1.0.] -1: left, 0: neutral, +1: right.",
+        LockMode::LOCK_WHILE_RUNNING,
+        0, -1, 1
+    )
+    , RIGHT_Y0(
+        "<b>Right Joy Stick Y direction:</b><br>Range:  [-1.0, 1.0.]. +1: up, 0: neutral, -1: down.",
+        LockMode::LOCK_WHILE_RUNNING,
+        0, -1, 1
+    )
+    , PRESS_DURATION(
+        "<b>Press Duration:</b><br>Hold the joysticks down for this long.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "10000 ms"
+    )
+    , RELEASE_DURATION(
+        "<b>Release Duration:</b><br>After releasing the joysticks, wait this long before pressing them again.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "0 ms"
     )
 {
-    PA_ADD_OPTION(LEFT_X);
-    PA_ADD_OPTION(LEFT_Y);
-    PA_ADD_OPTION(RIGHT_X);
-    PA_ADD_OPTION(RIGHT_Y);
+    PA_ADD_OPTION(JOYCON_CLICK);
+    PA_ADD_OPTION(LEFT_X0);
+    PA_ADD_OPTION(LEFT_Y0);
+    PA_ADD_OPTION(RIGHT_X0);
+    PA_ADD_OPTION(RIGHT_Y0);
+    PA_ADD_OPTION(PRESS_DURATION);
+    PA_ADD_OPTION(RELEASE_DURATION);
 }
 
-void PushJoySticks::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
+void PushJoySticks::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    // Determine which button to click based on the option
+    Button button;
+    switch (JOYCON_CLICK.current_value()){
+        case 0:
+            button = BUTTON_NONE;
+            break;
+        case 1:
+            button = BUTTON_LCLICK;
+            break;
+        case 2:
+            button = BUTTON_RCLICK;
+            break;
+        default:
+            button = BUTTON_NONE;
+            break;
+    }
+
     while(true){
-        pbf_controller_state(context, BUTTON_LCLICK, DPAD_NONE,
-            LEFT_X, LEFT_Y, RIGHT_X, RIGHT_Y, TICKS_PER_SECOND);
+        pbf_controller_state(
+            context, button, DPAD_NONE,
+            {LEFT_X0, LEFT_Y0},
+            {RIGHT_X0, RIGHT_Y0},
+            PRESS_DURATION
+        );
+        if (RELEASE_DURATION.get() > std::chrono::milliseconds(0)){
+            pbf_wait(context, RELEASE_DURATION);
+        }
     }
 }
 
diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_PushJoySticks.h b/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_PushJoySticks.h
index ec88626132..59b26d29cd 100644
--- a/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_PushJoySticks.h
+++ b/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_PushJoySticks.h
@@ -1,13 +1,15 @@
 /*  Push Joy Sticks
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifndef PokemonAutomation_NintendoSwitch_PushJoySticks_H
 #define PokemonAutomation_NintendoSwitch_PushJoySticks_H
 
-#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "Common/Cpp/Options/FloatingPointOption.h"
+#include "Common/Cpp/Options/EnumDropdownOption.h"
+#include "Common/Cpp/Options/TimeDurationOption.h"
 #include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
 
 namespace PokemonAutomation{
@@ -22,15 +24,19 @@ class PushJoySticks_Descriptor : public SingleSwitchProgramDescriptor{
 
 class PushJoySticks : public SingleSwitchProgramInstance{
 public:
+    using Descriptor = PushJoySticks_Descriptor;
     PushJoySticks();
 
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
 
 private:
-    SimpleIntegerOption<uint8_t> LEFT_X;
-    SimpleIntegerOption<uint8_t> LEFT_Y;
-    SimpleIntegerOption<uint8_t> RIGHT_X;
-    SimpleIntegerOption<uint8_t> RIGHT_Y;
+    IntegerEnumDropdownOption JOYCON_CLICK;
+    FloatingPointOption LEFT_X0;
+    FloatingPointOption LEFT_Y0;
+    FloatingPointOption RIGHT_X0;
+    FloatingPointOption RIGHT_Y0;
+    MillisecondsOption PRESS_DURATION;
+    MillisecondsOption RELEASE_DURATION;
 };
 
 
diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_RecordKeyboardController.cpp b/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_RecordKeyboardController.cpp
new file mode 100644
index 0000000000..e0b638f712
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_RecordKeyboardController.cpp
@@ -0,0 +1,371 @@
+/*  Record Keyboard Controller
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <iostream>
+#include "Common/Cpp/Filesystem/FileIO.h"
+#include "Common/Cpp/Filesystem/Filesystem.h"
+#include "Common/Cpp/Json/JsonArray.h"
+#include "Common/Cpp/Json/JsonObject.h"
+#include "Controllers/ControllerTypeStrings.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProControllerState.h"
+#include "NintendoSwitch/Controllers/Joycon/NintendoSwitch_JoyconState.h"
+
+#include "NintendoSwitch_RecordKeyboardController.h"
+
+using std::cout;
+using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+
+RecordKeyboardController_Descriptor::RecordKeyboardController_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "NintendoSwitch:RecordKeyboardController",
+        "Nintendo Switch", "Record Keyboard Controller",
+        "Programs/NintendoSwitch/RecordKeyboardController.html",
+        "Record actions from the keyboard controller, then play it back.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::NONE,
+        AllowCommandsWhenRunning::ENABLE_COMMANDS
+    )
+{}
+
+
+
+RecordKeyboardController::~RecordKeyboardController(){
+    
+}
+
+RecordKeyboardController::RecordKeyboardController() 
+    : MODE(
+        "<b>Mode:</b>",
+        {
+            {Mode::RECORD,   "record", "Record "},
+            {Mode::REPLAY,  "replay", "Replay"},
+            {Mode::CONVERT_JSON_TO_CODE,       "convert-to-code", "[For Developers] Convert json to code."},
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        Mode::RECORD
+    )
+    , FILE_NAME(
+        false,
+        "<b>File name:</b><br>"
+        "Name of the JSON file to read/write.", 
+        LockMode::LOCK_WHILE_RUNNING, 
+        "UserSettings/recording",
+        "<name of JSON file>"
+    )
+    , LOOP(
+        "<b>Number of times to loop:</b>",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        100, 0
+    )
+    , WAIT(
+        "<b>Number of seconds between loops:</b>",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        5, 0
+    )
+    , GENERATE_CPP_CODE_AFTER_RECORDING(
+        "<b>[For Developers]</b><br>"
+        "<b>Automatically generate C++ code:</b><br>"
+        "After recording, a text file with the C++ code will automatically be generated.<br>"
+        "The name of the text file will be as per \"File name\" above.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        false
+    )
+    , USAGE_NOTE(
+        "NOTE: Each keypress has a small amount of error when recorded/played back (approximately 8-15 ms). "
+        "I recommend fewer long button presses instead of many short button presses. "        
+    )
+{
+    PA_ADD_OPTION(USAGE_NOTE);
+    PA_ADD_OPTION(MODE);
+    PA_ADD_OPTION(FILE_NAME);
+    PA_ADD_OPTION(LOOP);
+    PA_ADD_OPTION(WAIT);
+    PA_ADD_OPTION(GENERATE_CPP_CODE_AFTER_RECORDING);
+}
+
+
+
+void RecordKeyboardController::program(SingleSwitchProgramEnvironment& env, CancellableScope& scope){
+    AbstractControllerContext context(scope, env.console.controller());
+    ControllerClass controller_class = env.console.controller().controller_class();
+
+    if (MODE == Mode::RECORD){
+        // check if given file name already exists. If it does, throw an error so we don't overwrite it.
+        std::string output_json_filename = std::string(FILE_NAME) + ".json";
+        if (Filesystem::exists(Filesystem::Path(output_json_filename))){
+            throw FileException(
+                nullptr,
+                PA_CURRENT_FUNCTION,
+                "Given file name already exists. Choose a different file name.",
+                output_json_filename
+            );
+        }
+
+        context.controller().add_input_sniffer(*this);
+
+        try{
+            context.wait_until_cancel();
+        }catch (ProgramCancelledException&){
+
+            JsonValue json = controller_history_to_json(env.console.logger(), controller_class);
+            json.dump(output_json_filename);
+            m_controller_history.clear();
+
+            if (GENERATE_CPP_CODE_AFTER_RECORDING){
+                json_to_cpp_code(env.console.logger(), json, FILE_NAME);
+            }
+
+            context.controller().remove_input_sniffer(*this);
+            
+            throw;
+        }        
+        
+    }else if (MODE == Mode::REPLAY){
+        JsonValue json = load_json_file(std::string(FILE_NAME) + ".json");
+        json_to_pbf_actions(env, scope, json, controller_class, LOOP, WAIT);
+
+
+    }else if (MODE == Mode::CONVERT_JSON_TO_CODE){
+        JsonValue json = load_json_file(std::string(FILE_NAME) + ".json");
+        json_to_cpp_code(env.console.logger(), json, FILE_NAME);
+
+
+    }
+
+}
+
+
+
+template <typename ControllerState>
+std::string json_to_cpp(const JsonArray& history){
+    std::string ret;
+    ControllerState state;
+    for (const JsonValue& command : history){
+        const JsonObject& snapshot = command.to_object_throw();
+
+        uint64_t duration = 0;
+        bool ok = false;
+        ok |= snapshot.read_integer(duration, "duration_in_ms");
+        ok |= snapshot.read_integer(duration, "ms");
+        if (!ok){
+            throw JsonParseException("", "ms");
+        }
+
+        state.load_json(snapshot);
+        ret += state.to_cpp(Milliseconds(duration), Milliseconds(0));
+    }
+    return ret;
+}
+
+template <typename ControllerState>
+void execute_json_schedule(
+    AbstractControllerContext& context,
+    const JsonArray& history,
+    uint32_t num_loops,
+    uint32_t seconds_wait_between_loops
+){
+    ControllerState state;
+    for (uint32_t i = 0; i < num_loops; i++){
+        for (const JsonValue& command : history){
+            const JsonObject& snapshot = command.to_object_throw();
+
+            uint64_t duration = 0;
+            bool ok = false;
+            ok |= snapshot.read_integer(duration, "duration_in_ms");
+            ok |= snapshot.read_integer(duration, "ms");
+            if (!ok){
+                throw JsonParseException("", "ms");
+            }
+
+            state.load_json(snapshot);
+            state.execute(&context, true, context.controller(), Milliseconds(duration));
+        }
+        state.clear();
+        state.execute(&context, true, context.controller(), Seconds(seconds_wait_between_loops));
+    }
+}
+
+
+
+void json_to_cpp_code(Logger& logger, const JsonValue& json, const std::string& output_file_name){
+    try{
+        const JsonObject& obj = json.to_object_throw();
+
+        std::string controller_class_string = obj.get_string_throw("controller_class");
+        cout << controller_class_string << endl;
+        ControllerClass controller_class = CONTROLLER_CLASS_STRINGS().get_enum(controller_class_string);
+
+        const JsonArray& history_json = obj.get_array_throw("history");
+
+        std::string output_text;
+        switch (controller_class){
+        case ControllerClass::NintendoSwitch_ProController:
+            output_text = json_to_cpp<ProControllerState>(history_json);
+            break;
+        case ControllerClass::NintendoSwitch_LeftJoycon:
+        case ControllerClass::NintendoSwitch_RightJoycon:
+            output_text = json_to_cpp<JoyconState>(history_json);
+            break;
+        default:
+            // generate empty text if ControllerClass is not one of the above
+            break;
+        }
+
+        FileIO file(Filesystem::Path(output_file_name + ".txt"), FileMode::WRITE);
+        if (file.is_open()){
+            file.write(output_text);
+        }
+
+    }catch (ParseException& e){
+        logger.log(e.message() + "\nJSON parsing error. Given JSON file doesn't match the expected format.", COLOR_RED);
+        throw ParseException(e.message() + "\nJSON parsing error. Given JSON file doesn't match the expected format.");
+    }
+}
+void json_to_pbf_actions(
+    SingleSwitchProgramEnvironment& env,
+    CancellableScope& scope,
+    const JsonValue& json,
+    ControllerClass controller_class,
+    uint32_t num_loops,
+    uint32_t seconds_wait_between_loops
+){
+    try{
+        const JsonObject& obj = json.to_object_throw();
+
+        std::string controller_class_string = obj.get_string_throw("controller_class");
+        ControllerClass controller_class_json = CONTROLLER_CLASS_STRINGS().get_enum(controller_class_string);
+        if (controller_class_json != controller_class){
+            throw UserSetupError(env.logger(), "Controller class in the JSON file does not match your current selected controller.");
+        }
+
+        const JsonArray& history_json = obj.get_array_throw("history");
+
+        AbstractControllerContext acontext(scope, env.console.controller());
+
+        switch (controller_class){
+        case ControllerClass::NintendoSwitch_ProController:
+            execute_json_schedule<ProControllerState>(acontext, history_json, num_loops, seconds_wait_between_loops);
+            break;
+        case ControllerClass::NintendoSwitch_LeftJoycon:
+        case ControllerClass::NintendoSwitch_RightJoycon:
+            execute_json_schedule<JoyconState>(acontext, history_json, num_loops, seconds_wait_between_loops);
+            break;
+        default:
+            // do nothing if the ControllerClass is not one of the above.
+            break;
+        }
+
+    }catch (ParseException& e){
+        env.log(e.message() + "\nJSON parsing error. Given JSON file doesn't match the expected format.", COLOR_RED);
+        throw ParseException(e.message() + "\nJSON parsing error. Given JSON file doesn't match the expected format.");
+    }
+
+}
+
+
+
+
+JsonValue RecordKeyboardController::controller_history_to_json(Logger& logger, ControllerClass controller_class){
+    if (m_controller_history.size() < 2){
+        // throw InternalProgramError(&logger, PA_CURRENT_FUNCTION, "RecordKeyboardController:: m_controller_history should have at least two entries, start and stop.");
+        logger.log("RecordKeyboardController:: We expected m_controller_history to have at least two entries, start and stop. Aborting.", COLOR_RED);
+        return JsonValue();
+    }
+    
+    JsonArray json_array;
+    ControllerStateSnapshot* prev_snapshot = &m_controller_history[0]; // the previous non-duplicate snapshot
+    WallClock initial_time_stamp = m_controller_history[0].time_stamp;
+
+    for (size_t i = 1; i < m_controller_history.size(); i++){ // start at index i = 1, since prev_snapshot starts at i=0 and we continue when current == previous.
+        ControllerStateSnapshot& snapshot = m_controller_history[i];
+        WallClock time_stamp = snapshot.time_stamp;
+        JsonObject& controller_state = snapshot.controller_state.to_object_throw();
+        
+        WallClock prev_time_stamp = prev_snapshot->time_stamp;
+        JsonObject& prev_controller_state = prev_snapshot->controller_state.to_object_throw();
+
+        if (controller_state == prev_controller_state){
+            continue;
+        }
+        
+        // Normalize each time stamp relative to the initial time stamp, and round to milliseconds.
+        // When only considering the distance between adjacent timestamps, you end up with drift due to rounding from nanoseconds to milliseconds, 
+
+        // example:
+        // Timestamps           Diff only comparing adjacent                Total time since start
+        // 12:00 1us            1.4us -> 1ms                                0ms
+        // 12:00 1401us         1.4us -> 1ms                                1ms
+        // 12:00 2801us         1.4us -> 1ms                                2ms
+        // 12:00 4201us         1.4us -> 1ms                                3ms
+        // 12:00 5601us         1.4us -> 1ms                                4ms
+        // 12:00 7001us         1.4us -> 1ms                                5ms
+        // 12:00 8401us         1.4us -> 1ms                                6ms
+        // 12:00 9801us         1.4us -> 1ms                                7ms
+        // 12:00 11201us                                                    8ms
+        // total time elapsed: 11.2ms vs 8ms
+
+        // Normalized timestamps        Diff using normalized timestamps    Total time since start
+        // 0ms                          1ms                                 0ms
+        // 1.4ms -> 1ms                 2ms                                 1ms
+        // 2.8ms -> 3ms                 1ms                                 3ms
+        // 4.2ms -> 4ms                 2ms                                 4ms
+        // 5.6ms -> 6ms                 1ms                                 6ms
+        // 7.0ms -> 7ms                 1ms                                 7ms
+        // 8.4ms -> 8ms                 2ms                                 8ms
+        // 9.8ms -> 10ms                1ms                                 10ms
+        // 11.2ms -> 11ms                                                   11ms
+        // total time elapsed: 11.2ms vs 11ms
+
+
+        Milliseconds current_timestamp_time_since_start = 
+            std::chrono::round<Milliseconds>(std::chrono::duration_cast<std::chrono::nanoseconds>(time_stamp - initial_time_stamp)); // find the time difference as nanoseconds, then round to milliseconds
+        Milliseconds prev_timestamp_time_since_start = 
+            std::chrono::round<Milliseconds>(std::chrono::duration_cast<std::chrono::nanoseconds>(prev_time_stamp - initial_time_stamp)); 
+        Milliseconds elapsed_time = current_timestamp_time_since_start - prev_timestamp_time_since_start;
+        int64_t duration = elapsed_time.count();
+
+        // cout << std::to_string(duration) << endl;
+        // cout << prev_controller_state.dump() << endl;
+        JsonObject recording = prev_controller_state.clone();
+        recording["ms"] = duration;
+        json_array.push_back(std::move(recording));
+        prev_snapshot = &snapshot; // update the previous non-duplicate snapshot
+    }
+    
+    
+    JsonObject json_result;
+    json_result["controller_class"] = CONTROLLER_CLASS_STRINGS().get_string(controller_class);
+    json_result["history"] = JsonValue(std::move(json_array));
+
+    return json_result;
+
+}
+
+
+void RecordKeyboardController::on_command_input(WallClock timestamp, const ControllerState& state){
+    cout << "keyboard_command_sent" << endl;
+    JsonValue serialized_state = state.to_json();
+    cout << serialized_state.dump(0) << endl;
+
+    ControllerStateSnapshot state_snapshot = {
+        timestamp,
+        std::move(serialized_state)
+    };
+    m_controller_history.emplace_back(std::move(state_snapshot));
+}
+
+
+
+
+
+}
+}
+
diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_RecordKeyboardController.h b/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_RecordKeyboardController.h
new file mode 100644
index 0000000000..e80b788aeb
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_RecordKeyboardController.h
@@ -0,0 +1,122 @@
+/*  Record Keyboard Controller
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_NintendoSwitch_RecordKeyboardController_H
+#define PokemonAutomation_NintendoSwitch_RecordKeyboardController_H
+
+//#include <functional>
+#include "Common/Cpp/Json/JsonValue.h"
+//#include "Common/Cpp/Json/JsonObject.h"
+#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "Common/Cpp/Options/StringOption.h"
+#include "Common/Cpp/Options/StaticTextOption.h"
+//#include "Controllers/KeyboardInput/KeyboardInput.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+class ProControllerState;
+
+
+
+// given the json, with the controller history, output a text file which represents C++ code.
+void json_to_cpp_code(Logger& logger, const JsonValue& json, const std::string& output_file_name);
+
+// given the json, with the controller history, run the controller actions using the pbf functions.
+void json_to_pbf_actions(
+    SingleSwitchProgramEnvironment& env,
+    CancellableScope& scope,
+    const JsonValue& json,
+    ControllerClass controller_class,
+    uint32_t num_loops,
+    uint32_t seconds_wait_between_loops
+);
+
+class RecordKeyboardController_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    RecordKeyboardController_Descriptor();
+};
+
+
+
+class RecordKeyboardController
+    : public SingleSwitchProgramInstance
+    , public AbstractController::InputSniffer
+{
+public:
+    using Descriptor = RecordKeyboardController_Descriptor;
+    ~RecordKeyboardController();
+    RecordKeyboardController();
+    
+
+    virtual void program(SingleSwitchProgramEnvironment& env, CancellableScope& scope) override;
+
+private:
+    // whenever a keyboard command is sent/stopped: 
+    // add to m_controller_history the time_stamp and the ControllerState serialized to JSON.
+    virtual void on_command_input(WallClock timestamp, const ControllerState& state) override;
+
+    // convert m_controller_history to json
+    // remove adjacent duplicate controller states.
+    JsonValue controller_history_to_json(Logger& logger, ControllerClass controller_class);
+
+
+    // Examples for JsonObject controller_state:
+    // ProControllerState:
+        // {
+        //     "is_neutral": false
+        //     "buttons": "L R",
+        //     "dpad": "none",
+        //     "left_x": 100,
+        //     "left_y": 200,
+        //     "right_x": 128,
+        //     "right_y": 128,
+        // }
+    // JoyconState
+        // {
+        //     "is_neutral": false
+        //     "buttons": "L R",
+        //     "joystick_x": 100,
+        //     "joystick_x": 200,
+        // }
+    // Neutral controller: we know the controller is neutral, so no need for all the other button info
+        // {
+        //     "is_neutral": true
+        // }
+    struct ControllerStateSnapshot{
+        WallClock time_stamp;
+        JsonValue controller_state;
+    };
+
+private:
+    enum class Mode{
+        RECORD,
+        REPLAY,
+        CONVERT_JSON_TO_CODE,
+    };
+    EnumDropdownOption<Mode> MODE;
+    StringOption FILE_NAME;
+    SimpleIntegerOption<uint32_t> LOOP;
+    SimpleIntegerOption<uint32_t> WAIT;
+    BooleanCheckBoxOption GENERATE_CPP_CODE_AFTER_RECORDING;
+
+    StaticTextOption USAGE_NOTE;
+
+    std::vector<ControllerStateSnapshot> m_controller_history;
+    
+
+};
+
+
+
+}
+}
+#endif
+
+
+
diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_SnapshotDumper.cpp b/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_SnapshotDumper.cpp
deleted file mode 100644
index bbe13f3459..0000000000
--- a/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_SnapshotDumper.cpp
+++ /dev/null
@@ -1,75 +0,0 @@
-/*  Snapshot Dumper
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <QDir>
-#include "Common/Cpp/Time.h"
-#include "Common/Cpp/PrettyPrint.h"
-#include "ClientSource/Connection/BotBase.h"
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "NintendoSwitch_SnapshotDumper.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-
-
-SnapshotDumper_Descriptor::SnapshotDumper_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "NintendoSwitch:SnapshotDumper",
-        "Nintendo Switch", "Snapshot Dumper",
-        "ComputerControl/blob/master/Wiki/Programs/NintendoSwitch/SnapshotDumper.md",
-        "Periodically take screenshots.",
-        FeedbackType::NONE,
-        AllowCommandsWhenRunning::ENABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-
-
-
-SnapshotDumper::SnapshotDumper()
-    : PERIOD_MILLISECONDS(
-        "<b>Snapshot Period (milliseconds):</b><br>Take screenshot every this many milliseconds.",
-        LockWhileRunning::UNLOCKED,
-        1000
-    )
-    , FORMAT(
-        "<b>Image Format:</b>",
-        {
-            {Format::PNG, "png", ".png"},
-            {Format::JPG, "jpg", ".jpg"},
-        },
-        LockWhileRunning::UNLOCKED,
-        Format::JPG
-    )
-{
-    PA_ADD_OPTION(PERIOD_MILLISECONDS);
-    PA_ADD_OPTION(FORMAT);
-}
-
-void SnapshotDumper::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    QDir().mkpath("ScreenshotDumper/");
-    while (true){
-        VideoSnapshot last = env.console.video().snapshot();
-        std::string filename = "ScreenshotDumper/" + now_to_filestring();
-        switch (FORMAT){
-        case Format::PNG:
-            filename += ".png";
-            break;
-        case Format::JPG:
-            filename += ".jpg";
-            break;
-        }
-        last->save(filename);
-        context.wait_until(last.timestamp + std::chrono::milliseconds(PERIOD_MILLISECONDS));
-    }
-}
-
-
-
-
-}
-}
-
diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_SnapshotDumper.h b/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_SnapshotDumper.h
deleted file mode 100644
index 63d2256053..0000000000
--- a/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_SnapshotDumper.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*  Snapshot Dumper
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_NintendoSwitch_SnapshotDumper_H
-#define PokemonAutomation_NintendoSwitch_SnapshotDumper_H
-
-#include "Common/Cpp/Options/SimpleIntegerOption.h"
-#include "Common/Cpp/Options/EnumDropdownOption.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-
-
-class SnapshotDumper_Descriptor : public SingleSwitchProgramDescriptor{
-public:
-    SnapshotDumper_Descriptor();
-};
-
-
-class SnapshotDumper : public SingleSwitchProgramInstance{
-public:
-    SnapshotDumper();
-
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-    SimpleIntegerOption<uint32_t> PERIOD_MILLISECONDS;
-
-    enum class Format{
-        PNG,
-        JPG,
-    };
-    EnumDropdownOption<Format> FORMAT;
-};
-
-
-
-}
-}
-#endif
-
-
-
diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_SwitchViewer.cpp b/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_SwitchViewer.cpp
deleted file mode 100644
index df8cacce1d..0000000000
--- a/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_SwitchViewer.cpp
+++ /dev/null
@@ -1,98 +0,0 @@
-/*  Multi-Video Test
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <QVBoxLayout>
-#include <QScrollArea>
-#include "Common/Cpp/Json/JsonValue.h"
-#include "Common/Qt/CollapsibleGroupBox.h"
-#include "NintendoSwitch/Framework/UI/NintendoSwitch_MultiSwitchSystemWidget.h"
-#include "NintendoSwitch_SwitchViewer.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-
-
-SwitchViewer_Descriptor::SwitchViewer_Descriptor()
-    : PanelDescriptor(
-        Color(),
-        "NintendoSwitch:SwitchViewer",
-        "Nintendo Switch", "Switch Viewer",
-        "ComputerControl/blob/master/Wiki/Programs/NintendoSwitch/SwitchViewer.md",
-        "View status information from one or more running programs."
-    )
-{}
-
-
-
-SwitchViewer::SwitchViewer(const SwitchViewer_Descriptor& descriptor)
-    : PanelInstance(descriptor)
-    , m_switches(
-        PABotBaseLevel::NOT_PABOTBASE,
-        FeedbackType::NONE,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        1, 4, 1
-    )
-{}
-void SwitchViewer::from_json(const JsonValue& json){
-    m_switches.load_json(json);
-}
-JsonValue SwitchViewer::to_json() const{
-    return m_switches.to_json();
-}
-QWidget* SwitchViewer::make_widget(QWidget& parent, PanelHolder& holder){
-    return SwitchViewer_Widget::make(parent, *this, holder);
-}
-
-
-
-SwitchViewer_Widget* SwitchViewer_Widget::make(
-    QWidget& parent,
-    SwitchViewer& instance,
-    PanelHolder& holder
-){
-    SwitchViewer_Widget* widget = new SwitchViewer_Widget(parent, instance, holder);
-    widget->construct();
-    return widget;
-}
-SwitchViewer_Widget::~SwitchViewer_Widget(){
-    delete m_switches;
-}
-SwitchViewer_Widget::SwitchViewer_Widget(
-    QWidget& parent,
-    SwitchViewer& instance,
-    PanelHolder& holder
-)
-    : PanelWidget(parent, instance, holder)
-    , m_session(instance.m_switches, 0)
-{}
-void SwitchViewer_Widget::construct(){
-    QVBoxLayout* layout = new QVBoxLayout(this);
-    layout->setContentsMargins(0, 0, 0, 0);
-    layout->addWidget(make_header(*this));
-
-    QScrollArea* scroll_outer = new QScrollArea(this);
-    layout->addWidget(scroll_outer);
-    scroll_outer->setWidgetResizable(true);
-
-    QWidget* scroll_inner = new QWidget(scroll_outer);
-    scroll_outer->setWidget(scroll_inner);
-    QVBoxLayout* scroll_layout = new QVBoxLayout(scroll_inner);
-    scroll_layout->setAlignment(Qt::AlignTop);
-
-    m_switches = new MultiSwitchSystemWidget(*this, m_session, 0);
-    scroll_layout->addWidget(m_switches);
-    scroll_layout->addStretch(1);
-}
-
-
-
-
-
-
-
-
-}
-}
diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_SwitchViewer.h b/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_SwitchViewer.h
deleted file mode 100644
index bee6b47801..0000000000
--- a/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_SwitchViewer.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*  Multi-Video Test
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_NintendoSwitch_SwitchViewer_H
-#define PokemonAutomation_NintendoSwitch_SwitchViewer_H
-
-#include "CommonFramework/Panels/PanelInstance.h"
-#include "CommonFramework/Panels/UI/PanelWidget.h"
-#include "NintendoSwitch/Framework/NintendoSwitch_MultiSwitchSystemOption.h"
-#include "NintendoSwitch/Framework/NintendoSwitch_MultiSwitchSystemSession.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-
-
-class SwitchViewer_Descriptor : public PanelDescriptor{
-public:
-    SwitchViewer_Descriptor();
-};
-
-
-
-class SwitchViewer : public PanelInstance{
-public:
-    SwitchViewer(const SwitchViewer_Descriptor& descriptor);
-    virtual QWidget* make_widget(QWidget& parent, PanelHolder& holder) override;
-
-public:
-    //  Serialization
-    virtual void from_json(const JsonValue& json) override;
-    virtual JsonValue to_json() const override;
-
-private:
-    friend class SwitchViewer_Widget;
-
-    MultiSwitchSystemOption m_switches;
-};
-
-
-
-class SwitchViewer_Widget : public PanelWidget{
-public:
-    static SwitchViewer_Widget* make(
-        QWidget& parent,
-        SwitchViewer& instance,
-        PanelHolder& holder
-    );
-
-private:
-    ~SwitchViewer_Widget();
-    SwitchViewer_Widget(
-        QWidget& parent,
-        SwitchViewer& instance,
-        PanelHolder& holder
-    );
-    void construct();
-
-private:
-    MultiSwitchSystemSession m_session;
-    MultiSwitchSystemWidget* m_switches;
-};
-
-
-
-
-
-}
-}
-#endif
diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_TurboA.cpp b/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_TurboA.cpp
index 3304fd2592..049979b739 100644
--- a/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_TurboA.cpp
+++ b/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_TurboA.cpp
@@ -1,12 +1,14 @@
 /*  Turbo A
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
+#include "Common/Cpp/Time.h"
 #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
 #include "NintendoSwitch/NintendoSwitch_Settings.h"
-#include "PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
+#include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
 #include "NintendoSwitch_TurboA.h"
 
 namespace PokemonAutomation{
@@ -15,30 +17,92 @@ namespace NintendoSwitch{
 
 TurboA_Descriptor::TurboA_Descriptor()
     : SingleSwitchProgramDescriptor(
-        "PokemonSwSh:TurboA",
+        "NintendoSwitch:TurboA",
         "Nintendo Switch", "Turbo A",
-        "ComputerControl/blob/master/Wiki/Programs/NintendoSwitch/TurboA.md",
+        "Programs/NintendoSwitch/TurboA.html",
         "Endlessly mash A.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
         FeedbackType::NONE,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
     )
 {}
 
 
 
-TurboA::TurboA(){
+TurboA::TurboA()
+    : MASH_SPEED(
+        "<b>Mash Speed:</b><br>"
+        "Each A press is a separate command sent to the microcontroller over the serial port. "
+        "If your controller connection drops during long runs (e.g. the serial adapter shares "
+        "a USB hub with your capture card), a slower speed sends less serial traffic.",
+        {
+            {MashSpeed::Fast,       "fast",     "Fast (~16 presses/s)"},
+            {MashSpeed::Reduced,    "reduced",  "Reduced (5 presses/s)"},
+            {MashSpeed::Minimal,    "minimal",  "Minimal (2 presses/s)"},
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        MashSpeed::Fast
+    )
+    , TIME_LIMIT(
+        "<b>Time Limit:</b><br>Stop mashing A after this amount of time. Set to 0 for no time limit.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "0 s"
+    )
+    , GO_HOME_WHEN_DONE(false)
+{
     PA_ADD_OPTION(START_LOCATION);
+    PA_ADD_OPTION(MASH_SPEED);
+    PA_ADD_OPTION(TIME_LIMIT);
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+}
+
+void TurboA::mash_A(ProControllerContext& context, Milliseconds duration) const{
+    switch (MASH_SPEED){
+    case MashSpeed::Fast:
+        ssf_mash1_button(context, BUTTON_A, duration); // 40ms hold + 24ms release
+        return;
+    case MashSpeed::Reduced:
+        //  Arguments after BUTTON_A: delay until next press, hold, release.
+        context->issue_mash_button(&context, duration, BUTTON_A, 200ms, 80ms, 120ms);
+        return;
+    case MashSpeed::Minimal:
+        context->issue_mash_button(&context, duration, BUTTON_A, 500ms, 100ms, 400ms);
+        return;
+    }
 }
-void TurboA::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
+
+void TurboA::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
     if (START_LOCATION.start_in_grip_menu()){
         grip_menu_connect_go_home(context);
-        PokemonSwSh::resume_game_back_out(env.console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST, 200);
+        PokemonSwSh::resume_game_back_out(
+            env.console,
+            context,
+            ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST,
+            1600ms
+        );
+    }
+
+    const std::chrono::milliseconds time_limit = TIME_LIMIT;
+    const uint64_t total_ms = time_limit.count();
+    if (total_ms == 0){
+        while (true){
+            mash_A(context, 10000ms);
+        }
+        // will never return
     }
 
-    while (true){
-        pbf_press_button(context, BUTTON_A, 5, 5);
+    // Mash until time limit is reached
+    const uint64_t num_iters = total_ms / 1000;
+    const uint64_t remaining_ms = total_ms % 1000;
+    for (uint64_t i = 0; i < num_iters; i++){
+        mash_A(context, 1000ms);
+    }
+    if (remaining_ms > 0){
+        mash_A(context, Milliseconds(remaining_ms));
     }
+    context.wait_for_all_requests();
+    GO_HOME_WHEN_DONE.run_end_of_program(context);
 }
 
 
diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_TurboA.h b/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_TurboA.h
index 59ad874b80..3edf5debe7 100644
--- a/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_TurboA.h
+++ b/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_TurboA.h
@@ -1,13 +1,16 @@
 /*  Turbo A
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifndef PokemonAutomation_NintendoSwitch_TurboA_H
 #define PokemonAutomation_NintendoSwitch_TurboA_H
 
+#include "Common/Cpp/Options/EnumDropdownOption.h"
+#include "Common/Cpp/Options/TimeDurationOption.h"
 #include "NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h"
+#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
 #include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
 
 namespace PokemonAutomation{
@@ -23,12 +26,30 @@ class TurboA_Descriptor : public SingleSwitchProgramDescriptor{
 
 class TurboA : public SingleSwitchProgramInstance{
 public:
+    using Descriptor = TurboA_Descriptor;
     TurboA();
 
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    // How fast to mash A. Every press is one command sent to the microcontroller
+    // over the serial port, plus one "command finished" reply sent back, so the
+    // press rate directly sets how busy the serial link is.
+    // Slower speeds lower that traffic and could make serial connection more stable.
+    enum class MashSpeed{
+        Fast,       // ~16 presses/s. The standard mash timing.
+        Reduced,    // 5 presses/s.
+        Minimal,    // 2 presses/s.
+    };
+
+    // Mash A for `duration` at the speed chosen in `MASH_SPEED`.
+    void mash_A(ProControllerContext& context, Milliseconds duration) const;
 
 private:
     StartInGripOrGameOption START_LOCATION;
+    EnumDropdownOption<MashSpeed> MASH_SPEED;
+    MillisecondsOption TIME_LIMIT;
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
 };
 
 
diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_TurboButton.cpp b/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_TurboButton.cpp
index 970756d28b..03f8a9909a 100644
--- a/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_TurboButton.cpp
+++ b/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_TurboButton.cpp
@@ -1,6 +1,6 @@
 /*  Turbo Button
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -16,11 +16,12 @@ TurboButton_Descriptor::TurboButton_Descriptor()
     : SingleSwitchProgramDescriptor(
         "NintendoSwitch:TurboButton",
         "Nintendo Switch", "Turbo Button",
-        "ComputerControl/blob/master/Wiki/Programs/NintendoSwitch/TurboButton.md",
+        "Programs/NintendoSwitch/TurboButton.html",
         "Mash a controller button. (similar to turbo controller)",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
         FeedbackType::NONE,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
     )
 {}
 
@@ -44,41 +45,52 @@ TurboButton::TurboButton()
             {BUTTON_RCLICK,     "RCLICK", "R-Click (right joystick click)"},
             {BUTTON_HOME,       "HOME", "Home"},
             {BUTTON_CAPTURE,    "CAPTURE", "Capture"},
+            {BUTTON_GR,         "GR", "GR (Switch 2)"},
+            {BUTTON_GL,         "GL", "GL (Switch 2)"},
+            {BUTTON_C,          "C", "C (Switch 2)"},
         },
-        LockWhileRunning::LOCKED,
+        LockMode::LOCK_WHILE_RUNNING,
         BUTTON_A
     )
-    , PRESS_DURATION(
+    , PRESS_DURATION0(
         "<b>Press Duration:</b><br>Hold the button down for this long.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        5, "5"
+        LockMode::LOCK_WHILE_RUNNING,
+        "40 ms"
     )
-    , RELEASE_DURATION(
+    , RELEASE_DURATION0(
         "<b>Release Duration:</b><br>After releasing the button, wait this long before pressing it again.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        3, "3"
+        LockMode::LOCK_WHILE_RUNNING,
+        "24 ms"
     )
     , TOTAL_PRESSES(
         "<b>Total Presses:</b><br>Stop the program after this many presses. If zero, run forever.",
-        LockWhileRunning::LOCKED,
+        LockMode::LOCK_WHILE_RUNNING,
         0
     )
 {
     PA_ADD_OPTION(BUTTON);
-    PA_ADD_OPTION(PRESS_DURATION);
-    PA_ADD_OPTION(RELEASE_DURATION);
+    PA_ADD_OPTION(PRESS_DURATION0);
+    PA_ADD_OPTION(RELEASE_DURATION0);
     PA_ADD_OPTION(TOTAL_PRESSES);
 }
-void TurboButton::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
+void TurboButton::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
     if (TOTAL_PRESSES == 0){
         while (true){
-            pbf_press_button(context, (Button)BUTTON.current_value(), PRESS_DURATION, RELEASE_DURATION);
+            pbf_press_button(
+                context,
+                (Button)BUTTON.current_value(),
+                PRESS_DURATION0,
+                RELEASE_DURATION0
+            );
         }
     }else{
         for (uint64_t c = 0; c < TOTAL_PRESSES; c++){
-            pbf_press_button(context, (Button)BUTTON.current_value(), PRESS_DURATION, RELEASE_DURATION);
+            pbf_press_button(
+                context,
+                (Button)BUTTON.current_value(),
+                PRESS_DURATION0,
+                RELEASE_DURATION0
+            );
         }
     }
     context.wait_for_all_requests();
diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_TurboButton.h b/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_TurboButton.h
index 00aee27ad9..82b75003c0 100644
--- a/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_TurboButton.h
+++ b/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_TurboButton.h
@@ -1,6 +1,6 @@
 /*  Turbo Button
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -9,7 +9,7 @@
 
 #include "Common/Cpp/Options/SimpleIntegerOption.h"
 #include "Common/Cpp/Options/EnumDropdownOption.h"
-#include "Common/Cpp/Options/TimeExpressionOption.h"
+#include "Common/Cpp/Options/TimeDurationOption.h"
 #include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
 
 namespace PokemonAutomation{
@@ -24,14 +24,15 @@ class TurboButton_Descriptor : public SingleSwitchProgramDescriptor{
 
 class TurboButton : public SingleSwitchProgramInstance{
 public:
+    using Descriptor = TurboButton_Descriptor;
     TurboButton();
 
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
 
 private:
     IntegerEnumDropdownOption BUTTON;
-    TimeExpressionOption<uint16_t> PRESS_DURATION;
-    TimeExpressionOption<uint16_t> RELEASE_DURATION;
+    MillisecondsOption PRESS_DURATION0;
+    MillisecondsOption RELEASE_DURATION0;
     SimpleIntegerOption<uint64_t> TOTAL_PRESSES;
 };
 
diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_TurboMacro.cpp b/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_TurboMacro.cpp
index c63e354cbe..69fc03a58a 100644
--- a/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_TurboMacro.cpp
+++ b/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_TurboMacro.cpp
@@ -1,124 +1,62 @@
-/*  Turbo Macro
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "NintendoSwitch/Options/TurboMacroTable.h"
-#include "NintendoSwitch_TurboMacro.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-
-
-TurboMacro_Descriptor::TurboMacro_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "NintendoSwitch:TurboMacro",
-        "Nintendo Switch", "Turbo Macro",
-        "",
-        "Create macros",
-        FeedbackType::NONE,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-
-TurboMacro::TurboMacro()
-    : LOOP(
-        "<b>Number of times to loop:</b>",
-        LockWhileRunning::UNLOCKED,
-        100, 0
-        )
-{
-    PA_ADD_OPTION(LOOP);
-    PA_ADD_OPTION(MACRO);
-}
-
-void TurboMacro::run_macro(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    std::vector<std::unique_ptr<TurboMacroRow>> table = MACRO.copy_snapshot();
-    for (const std::unique_ptr<TurboMacroRow>& row : table){
-        execute_action(env.console, context, *row);
-        context.wait_for_all_requests();
-    }
-}
-
-void TurboMacro::execute_action(ConsoleHandle& console, BotBaseContext& context, const TurboMacroRow& row){
-    console.log("Execute action " + row.action.current_display());
-    const TurboMacroCell& cell = row.parameters;
-    switch(row.action){
-    case TurboMacroAction::LEFT_JOYSTICK:
-        pbf_move_left_joystick(context, cell.x_axis, cell.y_axis, cell.button_hold_ticks, cell.button_release_ticks);
-        break;
-    case TurboMacroAction::RIGHT_JOYSTICK:
-        pbf_move_right_joystick(context, cell.x_axis, cell.y_axis, cell.button_hold_ticks, cell.button_release_ticks);
-        break;
-    case TurboMacroAction::LEFT_JOY_CLICK:
-        pbf_press_button(context, BUTTON_LCLICK, cell.button_hold_ticks, cell.button_release_ticks);
-        break;
-    case TurboMacroAction::RIGHT_JOY_CLICK:
-        pbf_press_button(context, BUTTON_RCLICK, cell.button_hold_ticks, cell.button_release_ticks);
-        break;
-    case TurboMacroAction::B:
-        pbf_press_button(context, BUTTON_B, cell.button_hold_ticks, cell.button_release_ticks);
-        break;
-    case TurboMacroAction::A:
-        pbf_press_button(context, BUTTON_A, cell.button_hold_ticks, cell.button_release_ticks);
-        break;
-    case TurboMacroAction::Y:
-        pbf_press_button(context, BUTTON_Y, cell.button_hold_ticks, cell.button_release_ticks);
-        break;
-    case TurboMacroAction::X:
-        pbf_press_button(context, BUTTON_X, cell.button_hold_ticks, cell.button_release_ticks);
-        break;
-    case TurboMacroAction::R:
-        pbf_press_button(context, BUTTON_R, cell.button_hold_ticks, cell.button_release_ticks);
-        break;
-    case TurboMacroAction::L:
-        pbf_press_button(context, BUTTON_L, cell.button_hold_ticks, cell.button_release_ticks);
-        break;
-    case TurboMacroAction::ZR:
-        pbf_press_button(context, BUTTON_ZR,cell.button_hold_ticks, cell.button_release_ticks);
-        break;
-    case TurboMacroAction::ZL:
-        pbf_press_button(context, BUTTON_ZL, cell.button_hold_ticks, cell.button_release_ticks);
-        break;
-    case TurboMacroAction::PLUS:
-        pbf_press_button(context, BUTTON_PLUS, cell.button_hold_ticks, cell.button_release_ticks);
-        break;
-    case TurboMacroAction::MINUS:
-        pbf_press_button(context, BUTTON_MINUS, cell.button_hold_ticks, cell.button_release_ticks);
-        break;
-    case TurboMacroAction::DPADLEFT:
-        pbf_press_dpad(context, DPAD_LEFT, cell.button_hold_ticks, cell.button_release_ticks);
-        break;
-    case TurboMacroAction::DPADRIGHT:
-        pbf_press_dpad(context, DPAD_RIGHT, cell.button_hold_ticks, cell.button_release_ticks);
-        break;
-    case TurboMacroAction::DPADUP:
-        pbf_press_dpad(context, DPAD_UP, cell.button_hold_ticks, cell.button_release_ticks);
-        break;
-    case TurboMacroAction::DPADDOWN:
-        pbf_press_dpad(context, DPAD_DOWN, cell.button_hold_ticks, cell.button_release_ticks);
-        break;
-    case TurboMacroAction::WAIT:
-        pbf_wait(context, (cell.wait_ticks * TICKS_PER_SECOND));
-    default:
-        break;
-    }
-    context.wait_for_all_requests();
-}
-
-void TurboMacro::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-
-    //  Connect the controller.
-    //pbf_press_button(context, BUTTON_LCLICK, 5, 5);
-
-    for (uint32_t c = 0; c < LOOP; c++) {
-        run_macro(env, context);
-    }
-}
-
-
-}
-}
+/*  Turbo Macro
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "NintendoSwitch_TurboMacro.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+
+TurboMacro_Descriptor::TurboMacro_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "NintendoSwitch:TurboMacro",
+        "Nintendo Switch", "Turbo Macro",
+        "Programs/NintendoSwitch/TurboMacro.html",
+        "Create macros",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::NONE,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+TurboMacro::TurboMacro()
+    : LOOP(
+        "<b>Number of times to loop:</b><br>(Set to zero to loop forever.)",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        100, 0
+    )
+    , TABLE(
+        "Command Schedule:",
+        {
+            ControllerClass::NintendoSwitch_ProController,
+            ControllerClass::NintendoSwitch_LeftJoycon,
+            ControllerClass::NintendoSwitch_RightJoycon,
+        }
+    )
+{
+    PA_ADD_OPTION(LOOP);
+    PA_ADD_OPTION(TABLE);
+}
+
+
+void TurboMacro::program(SingleSwitchProgramEnvironment& env, CancellableScope& scope){
+
+    //  Connect the controller.
+    //pbf_press_button(context, BUTTON_LCLICK, 40ms, 40ms);
+
+    for (uint32_t c = 0; c < LOOP || LOOP == 0; c++){
+        TABLE.run(scope, env.console.controller());
+    }
+}
+
+
+}
+}
diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_TurboMacro.h b/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_TurboMacro.h
index 74c6364db6..c5f3237d3c 100644
--- a/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_TurboMacro.h
+++ b/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_TurboMacro.h
@@ -1,44 +1,41 @@
-/*  Turbo Macro
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_NintendoSwitch_TurboMacro_H
-#define PokemonAutomation_NintendoSwitch_TurboMacro_H
-
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-#include "Common/Cpp/Options/SimpleIntegerOption.h"
-#include "NintendoSwitch/Options/TurboMacroTable.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-
-
-class TurboMacro_Descriptor : public SingleSwitchProgramDescriptor{
-public:
-    TurboMacro_Descriptor();
-};
-
-
-class TurboMacro : public SingleSwitchProgramInstance{
-public:
-    TurboMacro();
-
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-    void run_macro(SingleSwitchProgramEnvironment& env, BotBaseContext& context);
-
-    void execute_action(ConsoleHandle& console, BotBaseContext& context, const TurboMacroRow& row);
-
-private:
-    SimpleIntegerOption<uint32_t> LOOP;
-    TurboMacroTable MACRO;
-};
-
-
-
-}
-}
-#endif // PokemonAutomation_NintendoSwitch_TurboMacro_H
+/*  Turbo Macro
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_NintendoSwitch_TurboMacro_H
+#define PokemonAutomation_NintendoSwitch_TurboMacro_H
+
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "Controllers/ControllerStateTable.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+
+class TurboMacro_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    TurboMacro_Descriptor();
+};
+
+
+class TurboMacro : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = TurboMacro_Descriptor;
+    TurboMacro();
+
+    virtual void program(SingleSwitchProgramEnvironment& env, CancellableScope& scope) override;
+
+
+private:
+    SimpleIntegerOption<uint32_t> LOOP;
+    ControllerCommandTables TABLE;
+};
+
+
+
+}
+}
+#endif // PokemonAutomation_NintendoSwitch_TurboMacro_H
diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_VirtualConsole.cpp b/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_VirtualConsole.cpp
deleted file mode 100644
index 136be0ff06..0000000000
--- a/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_VirtualConsole.cpp
+++ /dev/null
@@ -1,90 +0,0 @@
-/*  Virtual Game Console
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <QVBoxLayout>
-#include <QScrollArea>
-#include "Common/Cpp/Json/JsonValue.h"
-#include "Common/Qt/CollapsibleGroupBox.h"
-#include "NintendoSwitch/Framework/UI/NintendoSwitch_SwitchSystemWidget.h"
-#include "NintendoSwitch_VirtualConsole.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-
-VirtualConsole_Descriptor::VirtualConsole_Descriptor()
-    : PanelDescriptor(
-        Color(),
-        "NintendoSwitch:VirtualConsole",
-        "Nintendo Switch", "Virtual Console",
-        "ComputerControl/blob/master/Wiki/Programs/NintendoSwitch/VirtualConsole.md",
-        "Play your Switch from your computer. Device logging is logged to the output window."
-    )
-{}
-
-
-
-VirtualConsole::VirtualConsole(const VirtualConsole_Descriptor& descriptor)
-    : PanelInstance(descriptor)
-    , m_switch(PABotBaseLevel::NOT_PABOTBASE, false)
-{}
-void VirtualConsole::from_json(const JsonValue& json){
-    m_switch.load_json(json);
-}
-JsonValue VirtualConsole::to_json() const{
-    return m_switch.to_json();
-}
-QWidget* VirtualConsole::make_widget(QWidget& parent, PanelHolder& holder){
-    return VirtualConsole_Widget::make(parent, *this, holder);
-}
-
-
-
-VirtualConsole_Widget* VirtualConsole_Widget::make(
-    QWidget& parent,
-    VirtualConsole& instance,
-    PanelHolder& holder
-){
-    VirtualConsole_Widget* widget = new VirtualConsole_Widget(parent, instance, holder);
-    widget->construct();
-    return widget;
-}
-VirtualConsole_Widget::~VirtualConsole_Widget(){
-    delete m_switch;
-}
-VirtualConsole_Widget::VirtualConsole_Widget(
-    QWidget& parent,
-    VirtualConsole& instance,
-    PanelHolder& holder
-)
-    : PanelWidget(parent, instance, holder)
-    , m_session(instance.m_switch, 0, 0)
-{}
-void VirtualConsole_Widget::construct(){
-    QVBoxLayout* layout = new QVBoxLayout(this);
-    layout->setContentsMargins(0, 0, 0, 0);
-    layout->addWidget(make_header(*this));
-
-    QScrollArea* scroll_outer = new QScrollArea(this);
-    layout->addWidget(scroll_outer);
-    scroll_outer->setWidgetResizable(true);
-
-    QWidget* scroll_inner = new QWidget(scroll_outer);
-    scroll_outer->setWidget(scroll_inner);
-    QVBoxLayout* scroll_layout = new QVBoxLayout(scroll_inner);
-    scroll_layout->setAlignment(Qt::AlignTop);
-
-    m_switch = new SwitchSystemWidget(*this, m_session, 0);
-    scroll_layout->addWidget(m_switch);
-}
-
-
-
-
-
-
-}
-}
-
diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_VirtualConsole.h b/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_VirtualConsole.h
deleted file mode 100644
index 9de205accd..0000000000
--- a/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_VirtualConsole.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*  Virtual Game Console
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_NintendoSwitch_VirtualConsole_H
-#define PokemonAutomation_NintendoSwitch_VirtualConsole_H
-
-#include "CommonFramework/Panels/PanelInstance.h"
-#include "CommonFramework/Panels/UI/PanelWidget.h"
-#include "NintendoSwitch/Framework/NintendoSwitch_SwitchSystemOption.h"
-#include "NintendoSwitch/Framework/NintendoSwitch_SwitchSystemSession.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-
-class SwitchSystemWidget;
-
-
-
-class VirtualConsole_Descriptor : public PanelDescriptor{
-public:
-    VirtualConsole_Descriptor();
-};
-
-
-
-class VirtualConsole : public PanelInstance{
-public:
-    VirtualConsole(const VirtualConsole_Descriptor& descriptor);
-    virtual QWidget* make_widget(QWidget& parent, PanelHolder& holder) override;
-
-public:
-    //  Serialization
-    virtual void from_json(const JsonValue& json) override;
-    virtual JsonValue to_json() const override;
-
-private:
-    friend class VirtualConsole_Widget;
-
-    SwitchSystemOption m_switch;
-};
-
-
-
-class VirtualConsole_Widget : public PanelWidget{
-public:
-    static VirtualConsole_Widget* make(
-        QWidget& parent,
-        VirtualConsole& instance,
-        PanelHolder& holder
-    );
-
-private:
-    ~VirtualConsole_Widget();
-    VirtualConsole_Widget(
-        QWidget& parent,
-        VirtualConsole& instance,
-        PanelHolder& holder
-    );
-    void construct();
-
-private:
-    SwitchSystemSession m_session;
-    SwitchSystemWidget* m_switch;
-};
-
-
-
-
-
-}
-}
-#endif
-
diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/Typewriter/NintendoSwitch_Typewriter.cpp b/SerialPrograms/Source/NintendoSwitch/Programs/Typewriter/NintendoSwitch_Typewriter.cpp
new file mode 100644
index 0000000000..74b6ab3c9c
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Programs/Typewriter/NintendoSwitch_Typewriter.cpp
@@ -0,0 +1,116 @@
+/*  Typewriter
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <string>
+#include "Common/Cpp/Exceptions.h"
+#include "NintendoSwitch_Typewriter.h"
+#include "NintendoSwitch_TypewriterTextMapping.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace Typewriter{
+
+
+
+
+Typewriter_Descriptor::Typewriter_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "NintendoSwitch:Typewriter",
+        "Nintendo Switch", "Typewriter",
+        "Programs/NintendoSwitch/Typewriter.html",
+        "Enter text into the Switch using the HID keyboard controller.",
+        PanelQualityStanding::OFFICIAL_BETA,
+        ProgramControllerClass::SpecializedController,
+        FeedbackType::NONE,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+
+
+
+Typewriter::Typewriter()
+    : TEXT(
+        "<b>Text to Type:</b><br>"
+        "Plain ASCII text. Tab presses Tab and newlines press Enter. "
+        "Windows (CRLF) line endings are accepted.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "",
+        "Text to type into the Switch"
+    )
+    , KEYBOARD_LAYOUT(
+        "<b>Keyboard Layout:</b><br>"
+        "The layout the Switch's physical keyboard is configured for "
+        "(i.e. the Switch's language)."
+    )
+    , DELAY(
+        "<b>Delay:</b><br>Delay between key presses.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        "24 ms"
+    )
+    , HOLD(
+        "<b>Hold:</b><br>Duration to hold each key press down.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        "40 ms"
+    )
+    , COOLDOWN(
+        "<b>Cooldown:</b><br>Do not reuse a key until this long after it is released.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        "24 ms"
+    )
+{
+    PA_ADD_OPTION(TEXT);
+    PA_ADD_OPTION(KEYBOARD_LAYOUT);
+    PA_ADD_OPTION(DELAY);
+    PA_ADD_OPTION(HOLD);
+    PA_ADD_OPTION(COOLDOWN);
+}
+
+
+
+
+void Typewriter::program(SingleSwitchProgramEnvironment& env, CancellableScope& scope){
+    using namespace std::chrono_literals;
+
+    StandardHid::KeyboardContext context(scope, env.console.controller<StandardHid::Keyboard>());
+
+    std::string text = TEXT;
+    if (text.empty()){
+        throw UserSetupError(
+            context->logger(),
+            "No text to type. Please enter some text in the \"Text to Type\" option."
+        );
+    }
+
+    //  Converts the whole text up front, so we don't type half the text and
+    //  then fail on an unsupported character.
+    std::vector<std::vector<KeyboardKey>> chords =
+        text_to_key_chords(KEYBOARD_LAYOUT.get(), text);
+
+    Milliseconds delay = DELAY;
+    Milliseconds hold = HOLD;
+    Milliseconds cool = COOLDOWN;
+
+    for (const std::vector<KeyboardKey>& keys : chords){
+        if (keys.size() == 1){
+            context->issue_key(&context, delay, hold, cool, keys[0]);
+        }else{
+            context->issue_keys(&context, delay, hold, cool, keys);
+        }
+        if (keys.size() > 1){
+            context->issue_barrier(&context);
+        }
+    }
+
+    context.wait_for_all_requests();
+}
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/Typewriter/NintendoSwitch_Typewriter.h b/SerialPrograms/Source/NintendoSwitch/Programs/Typewriter/NintendoSwitch_Typewriter.h
new file mode 100644
index 0000000000..b51c01c676
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Programs/Typewriter/NintendoSwitch_Typewriter.h
@@ -0,0 +1,46 @@
+/*  Typewriter
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_NintendoSwitch_Typewriter_H
+#define PokemonAutomation_NintendoSwitch_Typewriter_H
+
+#include "Common/Cpp/Options/TextEditOption.h"
+#include "Controllers/StandardHid/StandardHid_Keyboard.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "NintendoSwitch/Options/NintendoSwitch_CodeEntrySettingsOption.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace Typewriter{
+
+
+class Typewriter_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    Typewriter_Descriptor();
+};
+
+
+class Typewriter : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = Typewriter_Descriptor;
+    Typewriter();
+
+    virtual void program(SingleSwitchProgramEnvironment& env, CancellableScope& scope) override;
+
+private:
+    TextEditOption TEXT;
+    KeyboardLayoutOption KEYBOARD_LAYOUT;
+    MillisecondsOption DELAY;
+    MillisecondsOption HOLD;
+    MillisecondsOption COOLDOWN;
+};
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/Typewriter/NintendoSwitch_TypewriterTextMapping.cpp b/SerialPrograms/Source/NintendoSwitch/Programs/Typewriter/NintendoSwitch_TypewriterTextMapping.cpp
new file mode 100644
index 0000000000..c844b7f073
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Programs/Typewriter/NintendoSwitch_TypewriterTextMapping.cpp
@@ -0,0 +1,393 @@
+/*  Typewriter Text Mappings
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  Maps printable ASCII characters to the raw HID key press(es) needed to
+ *  type that character on a physical keyboard with a given layout. The
+ *  layout is the one configured in the Switch's language settings.
+ *
+ *  Characters that cannot be typed with a single key press (with at most
+ *  Shift) on a given layout are simply absent from that layout's map.
+ */
+
+#include <cstdio>
+#include <string>
+#include "Common/Cpp/Exceptions.h"
+#include "CommonFramework/Exceptions/OperationFailedException.h"
+#include "NintendoSwitch_TypewriterTextMapping.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace Typewriter{
+
+
+
+
+const std::map<char, TextKeyMapping>& TEXT_TO_HID_KEY(KeyboardLayout layout){
+    switch (layout){
+    case KeyboardLayout::QWERTY:
+        return TEXT_TO_HID_KEY_QWERTY();
+    case KeyboardLayout::AZERTY:
+        return TEXT_TO_HID_KEY_AZERTY();
+    default:
+        throw InternalProgramError(
+            nullptr, PA_CURRENT_FUNCTION,
+            "Invalid Keyboard Type: " + std::to_string((int)layout)
+        );
+    }
+}
+
+
+
+void control_flags_to_keys(ControlFlag flags, std::vector<KeyboardKey>& keys){
+    //  In the order of the HID report modifier byte.
+    if ((flags & CONTROL_LEFT_CTRL) != CONTROL_NONE){
+        keys.push_back(KeyboardKey::KEY_LEFT_CTRL);
+    }
+    if ((flags & CONTROL_LEFT_SHIFT) != CONTROL_NONE){
+        keys.push_back(KeyboardKey::KEY_LEFT_SHIFT);
+    }
+    if ((flags & CONTROL_LEFT_ALT) != CONTROL_NONE){
+        keys.push_back(KeyboardKey::KEY_LEFT_ALT);
+    }
+    if ((flags & CONTROL_LEFT_META) != CONTROL_NONE){
+        keys.push_back(KeyboardKey::KEY_LEFT_META);
+    }
+    if ((flags & CONTROL_RIGHT_CTRL) != CONTROL_NONE){
+        keys.push_back(KeyboardKey::KEY_RIGHT_CTRL);
+    }
+    if ((flags & CONTROL_RIGHT_SHIFT) != CONTROL_NONE){
+        keys.push_back(KeyboardKey::KEY_RIGHT_SHIFT);
+    }
+    if ((flags & CONTROL_RIGHT_ALT) != CONTROL_NONE){
+        keys.push_back(KeyboardKey::KEY_RIGHT_ALT);
+    }
+    if ((flags & CONTROL_RIGHT_META) != CONTROL_NONE){
+        keys.push_back(KeyboardKey::KEY_RIGHT_META);
+    }
+}
+
+
+
+static std::string char_to_display(char ch){
+    if (ch == '\n'){
+        return "newline";
+    }
+    if (ch == '\t'){
+        return "tab";
+    }
+    if (ch == '\r'){
+        return "carriage return";
+    }
+    unsigned char uch = (unsigned char)ch;
+    if (uch >= 0x20 && uch <= 0x7e){
+        return std::string(1, ch);
+    }
+    char buffer[8];
+    std::snprintf(buffer, sizeof(buffer), "0x%02x", uch);
+    return std::string(buffer);
+}
+
+
+
+std::vector<std::vector<KeyboardKey>> text_to_key_chords(
+    KeyboardLayout layout,
+    const std::string& text
+){
+    const std::map<char, TextKeyMapping>& mapping = TEXT_TO_HID_KEY(layout);
+
+    std::vector<std::vector<KeyboardKey>> chords;
+    chords.reserve(text.size());
+
+    for (size_t i = 0; i < text.size(); i++){
+        char ch = text[i];
+        if (ch == '\r'){
+            //  A carriage return is only valid as the first half of a CRLF
+            //  pair (Windows line endings); the \n types the Enter.
+            if (i + 1 == text.size() || text[i + 1] != '\n'){
+                throw OperationFailedException(
+                    ErrorReportMode::NO_ERROR_REPORT,
+                    "Unsupported character: \"" + char_to_display(ch) +
+                    "\". A standalone carriage return is not supported; "
+                    "line endings must be CRLF."
+                );
+            }
+            continue;
+        }
+
+        auto iter = mapping.find(ch);
+        if (iter == mapping.end()){
+            throw OperationFailedException(
+                ErrorReportMode::NO_ERROR_REPORT,
+                std::string("Unsupported character for the ") +
+                (layout == KeyboardLayout::QWERTY ? "QWERTY" : "AZERTY") +
+                " keyboard layout: \"" + char_to_display(ch) + "\". "
+                "Only ASCII characters are supported, limited to "
+                "printable characters, tab, and newline. Please use "
+                "plain ASCII text."
+            );
+        }
+
+        std::vector<KeyboardKey> keys;
+        control_flags_to_keys(iter->second.control_flags, keys);
+        keys.push_back(iter->second.key);
+        chords.emplace_back(std::move(keys));
+    }
+
+    return chords;
+}
+
+
+
+//  US English (QWERTY) keyboard.
+//
+//  Every printable ASCII character can be typed with at most one Shift.
+const std::map<char, TextKeyMapping>& TEXT_TO_HID_KEY_QWERTY(){
+    static const std::map<char, TextKeyMapping> map{
+        //  Letters
+        {'a', {KeyboardKey::KEY_A}},
+        {'b', {KeyboardKey::KEY_B}},
+        {'c', {KeyboardKey::KEY_C}},
+        {'d', {KeyboardKey::KEY_D}},
+        {'e', {KeyboardKey::KEY_E}},
+        {'f', {KeyboardKey::KEY_F}},
+        {'g', {KeyboardKey::KEY_G}},
+        {'h', {KeyboardKey::KEY_H}},
+        {'i', {KeyboardKey::KEY_I}},
+        {'j', {KeyboardKey::KEY_J}},
+        {'k', {KeyboardKey::KEY_K}},
+        {'l', {KeyboardKey::KEY_L}},
+        {'m', {KeyboardKey::KEY_M}},
+        {'n', {KeyboardKey::KEY_N}},
+        {'o', {KeyboardKey::KEY_O}},
+        {'p', {KeyboardKey::KEY_P}},
+        {'q', {KeyboardKey::KEY_Q}},
+        {'r', {KeyboardKey::KEY_R}},
+        {'s', {KeyboardKey::KEY_S}},
+        {'t', {KeyboardKey::KEY_T}},
+        {'u', {KeyboardKey::KEY_U}},
+        {'v', {KeyboardKey::KEY_V}},
+        {'w', {KeyboardKey::KEY_W}},
+        {'x', {KeyboardKey::KEY_X}},
+        {'y', {KeyboardKey::KEY_Y}},
+        {'z', {KeyboardKey::KEY_Z}},
+
+        {'A', {KeyboardKey::KEY_A, CONTROL_LEFT_SHIFT}},
+        {'B', {KeyboardKey::KEY_B, CONTROL_LEFT_SHIFT}},
+        {'C', {KeyboardKey::KEY_C, CONTROL_LEFT_SHIFT}},
+        {'D', {KeyboardKey::KEY_D, CONTROL_LEFT_SHIFT}},
+        {'E', {KeyboardKey::KEY_E, CONTROL_LEFT_SHIFT}},
+        {'F', {KeyboardKey::KEY_F, CONTROL_LEFT_SHIFT}},
+        {'G', {KeyboardKey::KEY_G, CONTROL_LEFT_SHIFT}},
+        {'H', {KeyboardKey::KEY_H, CONTROL_LEFT_SHIFT}},
+        {'I', {KeyboardKey::KEY_I, CONTROL_LEFT_SHIFT}},
+        {'J', {KeyboardKey::KEY_J, CONTROL_LEFT_SHIFT}},
+        {'K', {KeyboardKey::KEY_K, CONTROL_LEFT_SHIFT}},
+        {'L', {KeyboardKey::KEY_L, CONTROL_LEFT_SHIFT}},
+        {'M', {KeyboardKey::KEY_M, CONTROL_LEFT_SHIFT}},
+        {'N', {KeyboardKey::KEY_N, CONTROL_LEFT_SHIFT}},
+        {'O', {KeyboardKey::KEY_O, CONTROL_LEFT_SHIFT}},
+        {'P', {KeyboardKey::KEY_P, CONTROL_LEFT_SHIFT}},
+        {'Q', {KeyboardKey::KEY_Q, CONTROL_LEFT_SHIFT}},
+        {'R', {KeyboardKey::KEY_R, CONTROL_LEFT_SHIFT}},
+        {'S', {KeyboardKey::KEY_S, CONTROL_LEFT_SHIFT}},
+        {'T', {KeyboardKey::KEY_T, CONTROL_LEFT_SHIFT}},
+        {'U', {KeyboardKey::KEY_U, CONTROL_LEFT_SHIFT}},
+        {'V', {KeyboardKey::KEY_V, CONTROL_LEFT_SHIFT}},
+        {'W', {KeyboardKey::KEY_W, CONTROL_LEFT_SHIFT}},
+        {'X', {KeyboardKey::KEY_X, CONTROL_LEFT_SHIFT}},
+        {'Y', {KeyboardKey::KEY_Y, CONTROL_LEFT_SHIFT}},
+        {'Z', {KeyboardKey::KEY_Z, CONTROL_LEFT_SHIFT}},
+
+        //  Numbers
+        {'0', {KeyboardKey::KEY_0}},
+        {'1', {KeyboardKey::KEY_1}},
+        {'2', {KeyboardKey::KEY_2}},
+        {'3', {KeyboardKey::KEY_3}},
+        {'4', {KeyboardKey::KEY_4}},
+        {'5', {KeyboardKey::KEY_5}},
+        {'6', {KeyboardKey::KEY_6}},
+        {'7', {KeyboardKey::KEY_7}},
+        {'8', {KeyboardKey::KEY_8}},
+        {'9', {KeyboardKey::KEY_9}},
+
+        //  Punctuation
+        {' ',  {KeyboardKey::KEY_SPACE}},
+        {'!',  {KeyboardKey::KEY_1, CONTROL_LEFT_SHIFT}},
+        {'@',  {KeyboardKey::KEY_2, CONTROL_LEFT_SHIFT}},
+        {'#',  {KeyboardKey::KEY_3, CONTROL_LEFT_SHIFT}},
+        {'$',  {KeyboardKey::KEY_4, CONTROL_LEFT_SHIFT}},
+        {'%',  {KeyboardKey::KEY_5, CONTROL_LEFT_SHIFT}},
+        {'^',  {KeyboardKey::KEY_6, CONTROL_LEFT_SHIFT}},
+        {'&',  {KeyboardKey::KEY_7, CONTROL_LEFT_SHIFT}},
+        {'*',  {KeyboardKey::KEY_8, CONTROL_LEFT_SHIFT}},
+        {'(',  {KeyboardKey::KEY_9, CONTROL_LEFT_SHIFT}},
+        {')',  {KeyboardKey::KEY_0, CONTROL_LEFT_SHIFT}},
+        {'-',  {KeyboardKey::KEY_MINUS}},
+        {'=',  {KeyboardKey::KEY_EQUAL}},
+        {'_',  {KeyboardKey::KEY_MINUS, CONTROL_LEFT_SHIFT}},
+        {'+',  {KeyboardKey::KEY_EQUAL, CONTROL_LEFT_SHIFT}},
+        {'[',  {KeyboardKey::KEY_LEFT_BRACE}},
+        {']',  {KeyboardKey::KEY_RIGHT_BRACE}},
+        {'{',  {KeyboardKey::KEY_LEFT_BRACE, CONTROL_LEFT_SHIFT}},
+        {'}',  {KeyboardKey::KEY_RIGHT_BRACE, CONTROL_LEFT_SHIFT}},
+        {'\\', {KeyboardKey::KEY_BACKSLASH}},
+        {'|',  {KeyboardKey::KEY_BACKSLASH, CONTROL_LEFT_SHIFT}},
+        {';',  {KeyboardKey::KEY_SEMICOLON}},
+        {':',  {KeyboardKey::KEY_SEMICOLON, CONTROL_LEFT_SHIFT}},
+        {'\'', {KeyboardKey::KEY_APOSTROPHE}},
+        {'"',  {KeyboardKey::KEY_APOSTROPHE, CONTROL_LEFT_SHIFT}},
+        {'`',  {KeyboardKey::KEY_GRAVE}},
+        {'~',  {KeyboardKey::KEY_GRAVE, CONTROL_LEFT_SHIFT}},
+        {',',  {KeyboardKey::KEY_COMMA}},
+        {'<',  {KeyboardKey::KEY_COMMA, CONTROL_LEFT_SHIFT}},
+        {'.',  {KeyboardKey::KEY_DOT}},
+        {'>',  {KeyboardKey::KEY_DOT, CONTROL_LEFT_SHIFT}},
+        {'/',  {KeyboardKey::KEY_SLASH}},
+        {'?',  {KeyboardKey::KEY_SLASH, CONTROL_LEFT_SHIFT}},
+
+        //  Control characters
+        {'\t', {KeyboardKey::KEY_TAB}},
+        {'\n', {KeyboardKey::KEY_ENTER}},
+    };
+    return map;
+}
+
+
+
+//  French (AZERTY) keyboard.
+//
+//  The HID key codes are assigned to physical key positions (per the US
+//  layout), so to type "a" on an AZERTY keyboard we press the physical key
+//  at the US "q" position, etc. This matches KEYBOARD_MAPPINGS_AZERTY in
+//  NintendoSwitch_KeyboardEntryMappings.cpp.
+//
+//  The character positions follow the standard modern French layout (the
+//  one Windows uses). The characters that require the AltGr key are typed
+//  with the right Alt, which is AltGr on a French keyboard, and the < > key
+//  is the ISO key to the left of Space (HID 102nd key).
+const std::map<char, TextKeyMapping>& TEXT_TO_HID_KEY_AZERTY(){
+    static const std::map<char, TextKeyMapping> map{
+        //  Letters
+        {'a', {KeyboardKey::KEY_Q}},
+        {'z', {KeyboardKey::KEY_W}},
+        {'e', {KeyboardKey::KEY_E}},
+        {'r', {KeyboardKey::KEY_R}},
+        {'t', {KeyboardKey::KEY_T}},
+        {'y', {KeyboardKey::KEY_Y}},
+        {'u', {KeyboardKey::KEY_U}},
+        {'i', {KeyboardKey::KEY_I}},
+        {'o', {KeyboardKey::KEY_O}},
+        {'p', {KeyboardKey::KEY_P}},
+
+        {'q', {KeyboardKey::KEY_A}},
+        {'s', {KeyboardKey::KEY_S}},
+        {'d', {KeyboardKey::KEY_D}},
+        {'f', {KeyboardKey::KEY_F}},
+        {'g', {KeyboardKey::KEY_G}},
+        {'h', {KeyboardKey::KEY_H}},
+        {'j', {KeyboardKey::KEY_J}},
+        {'k', {KeyboardKey::KEY_K}},
+        {'l', {KeyboardKey::KEY_L}},
+        {'m', {KeyboardKey::KEY_SEMICOLON}},
+
+        {'w', {KeyboardKey::KEY_Z}},
+        {'x', {KeyboardKey::KEY_X}},
+        {'c', {KeyboardKey::KEY_C}},
+        {'v', {KeyboardKey::KEY_V}},
+        {'b', {KeyboardKey::KEY_B}},
+        {'n', {KeyboardKey::KEY_N}},
+
+        {'A', {KeyboardKey::KEY_Q, CONTROL_LEFT_SHIFT}},
+        {'Z', {KeyboardKey::KEY_W, CONTROL_LEFT_SHIFT}},
+        {'E', {KeyboardKey::KEY_E, CONTROL_LEFT_SHIFT}},
+        {'R', {KeyboardKey::KEY_R, CONTROL_LEFT_SHIFT}},
+        {'T', {KeyboardKey::KEY_T, CONTROL_LEFT_SHIFT}},
+        {'Y', {KeyboardKey::KEY_Y, CONTROL_LEFT_SHIFT}},
+        {'U', {KeyboardKey::KEY_U, CONTROL_LEFT_SHIFT}},
+        {'I', {KeyboardKey::KEY_I, CONTROL_LEFT_SHIFT}},
+        {'O', {KeyboardKey::KEY_O, CONTROL_LEFT_SHIFT}},
+        {'P', {KeyboardKey::KEY_P, CONTROL_LEFT_SHIFT}},
+
+        {'Q', {KeyboardKey::KEY_A, CONTROL_LEFT_SHIFT}},
+        {'S', {KeyboardKey::KEY_S, CONTROL_LEFT_SHIFT}},
+        {'D', {KeyboardKey::KEY_D, CONTROL_LEFT_SHIFT}},
+        {'F', {KeyboardKey::KEY_F, CONTROL_LEFT_SHIFT}},
+        {'G', {KeyboardKey::KEY_G, CONTROL_LEFT_SHIFT}},
+        {'H', {KeyboardKey::KEY_H, CONTROL_LEFT_SHIFT}},
+        {'J', {KeyboardKey::KEY_J, CONTROL_LEFT_SHIFT}},
+        {'K', {KeyboardKey::KEY_K, CONTROL_LEFT_SHIFT}},
+        {'L', {KeyboardKey::KEY_L, CONTROL_LEFT_SHIFT}},
+        {'M', {KeyboardKey::KEY_SEMICOLON, CONTROL_LEFT_SHIFT}},
+
+        {'W', {KeyboardKey::KEY_Z, CONTROL_LEFT_SHIFT}},
+        {'X', {KeyboardKey::KEY_X, CONTROL_LEFT_SHIFT}},
+        {'C', {KeyboardKey::KEY_C, CONTROL_LEFT_SHIFT}},
+        {'V', {KeyboardKey::KEY_V, CONTROL_LEFT_SHIFT}},
+        {'B', {KeyboardKey::KEY_B, CONTROL_LEFT_SHIFT}},
+        {'N', {KeyboardKey::KEY_N, CONTROL_LEFT_SHIFT}},
+
+        //  Numbers (all require Shift on AZERTY)
+        {'0', {KeyboardKey::KEY_0, CONTROL_LEFT_SHIFT}},
+        {'1', {KeyboardKey::KEY_1, CONTROL_LEFT_SHIFT}},
+        {'2', {KeyboardKey::KEY_2, CONTROL_LEFT_SHIFT}},
+        {'3', {KeyboardKey::KEY_3, CONTROL_LEFT_SHIFT}},
+        {'4', {KeyboardKey::KEY_4, CONTROL_LEFT_SHIFT}},
+        {'5', {KeyboardKey::KEY_5, CONTROL_LEFT_SHIFT}},
+        {'6', {KeyboardKey::KEY_6, CONTROL_LEFT_SHIFT}},
+        {'7', {KeyboardKey::KEY_7, CONTROL_LEFT_SHIFT}},
+        {'8', {KeyboardKey::KEY_8, CONTROL_LEFT_SHIFT}},
+        {'9', {KeyboardKey::KEY_9, CONTROL_LEFT_SHIFT}},
+
+        //  Punctuation
+        {' ',  {KeyboardKey::KEY_SPACE}},
+        {'&',  {KeyboardKey::KEY_1}},
+        {'"',  {KeyboardKey::KEY_3}},
+        {'\'', {KeyboardKey::KEY_4}},
+        {'(',  {KeyboardKey::KEY_5}},
+        {'-',  {KeyboardKey::KEY_6}},
+        {'_',  {KeyboardKey::KEY_8}},
+        {')',  {KeyboardKey::KEY_MINUS}},
+        {'=',  {KeyboardKey::KEY_EQUAL}},
+        {'+',  {KeyboardKey::KEY_EQUAL, CONTROL_LEFT_SHIFT}},
+        {'$',  {KeyboardKey::KEY_RIGHT_BRACE}},
+        {'*',  {KeyboardKey::KEY_BACKSLASH}},
+        {'%',  {KeyboardKey::KEY_APOSTROPHE, CONTROL_LEFT_SHIFT}},
+        {'!',  {KeyboardKey::KEY_SLASH}},
+        {',',  {KeyboardKey::KEY_M}},
+        {'?',  {KeyboardKey::KEY_M, CONTROL_LEFT_SHIFT}},
+        {';',  {KeyboardKey::KEY_COMMA}},
+        {'.',  {KeyboardKey::KEY_COMMA, CONTROL_LEFT_SHIFT}},
+        {':',  {KeyboardKey::KEY_DOT}},
+        {'/',  {KeyboardKey::KEY_DOT, CONTROL_LEFT_SHIFT}},
+
+        //  AltGr (right Alt) characters, by physical key
+        {'~',  {KeyboardKey::KEY_2, CONTROL_RIGHT_ALT}},
+        {'#',  {KeyboardKey::KEY_3, CONTROL_RIGHT_ALT}},
+        {'{',  {KeyboardKey::KEY_4, CONTROL_RIGHT_ALT}},
+        {'[',  {KeyboardKey::KEY_5, CONTROL_RIGHT_ALT}},
+        {'|',  {KeyboardKey::KEY_6, CONTROL_RIGHT_ALT}},
+        {'`',  {KeyboardKey::KEY_7, CONTROL_RIGHT_ALT}},
+        {'\\', {KeyboardKey::KEY_8, CONTROL_RIGHT_ALT}},
+        {'^',  {KeyboardKey::KEY_9, CONTROL_RIGHT_ALT}},
+        {'@',  {KeyboardKey::KEY_0, CONTROL_RIGHT_ALT}},
+        {']',  {KeyboardKey::KEY_MINUS, CONTROL_RIGHT_ALT}},
+        {'}',  {KeyboardKey::KEY_EQUAL, CONTROL_RIGHT_ALT}},
+
+        //  The < > key, to the left of Space on an ISO keyboard
+        {'<',  {KeyboardKey::KEY_102ND}},
+        {'>',  {KeyboardKey::KEY_102ND, CONTROL_LEFT_SHIFT}},
+
+        //  Control characters
+        {'\t', {KeyboardKey::KEY_TAB}},
+        {'\n', {KeyboardKey::KEY_ENTER}},
+    };
+    return map;
+}
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/Typewriter/NintendoSwitch_TypewriterTextMapping.h b/SerialPrograms/Source/NintendoSwitch/Programs/Typewriter/NintendoSwitch_TypewriterTextMapping.h
new file mode 100644
index 0000000000..1cd77e532b
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Programs/Typewriter/NintendoSwitch_TypewriterTextMapping.h
@@ -0,0 +1,106 @@
+/*  Typewriter Text Mappings
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  Maps text characters (printable ASCII, tab, and newline) to the raw HID
+ *  key press(es) needed to type that character on a physical keyboard with a
+ *  given layout. The layout is the one configured in the Switch's language
+ *  settings.
+ *
+ *  Characters that cannot be typed on a given layout are simply absent
+ *  from that layout's map.
+ */
+
+#ifndef PokemonAutomation_NintendoSwitch_TypewriterTextMapping_H
+#define PokemonAutomation_NintendoSwitch_TypewriterTextMapping_H
+
+#include <map>
+#include <string>
+#include <vector>
+#include "ControllerInput/Keyboard/KeyboardHidButtons.h"
+#include "NintendoSwitch/Programs/FastCodeEntry/NintendoSwitch_KeyboardEntryMappings.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace Typewriter{
+
+
+//  The 8 modifier keys of the HID keyboard report's modifier byte.
+//  The values match the byte exactly, so a ControlFlag (or an OR-combination
+//  of them) can be stored directly as that byte.
+enum ControlFlag : uint8_t{
+    CONTROL_NONE          =   0x00,
+    CONTROL_LEFT_CTRL     =   0x01,
+    CONTROL_LEFT_SHIFT    =   0x02,
+    CONTROL_LEFT_ALT      =   0x04,
+    CONTROL_LEFT_META     =   0x08,
+    CONTROL_RIGHT_CTRL    =   0x10,
+    CONTROL_RIGHT_SHIFT   =   0x20,
+    CONTROL_RIGHT_ALT     =   0x40,
+    CONTROL_RIGHT_META    =   0x80,
+};
+
+inline constexpr ControlFlag empty_value(const ControlFlag*){
+    return CONTROL_NONE;
+}
+inline constexpr bool is_empty(ControlFlag x){
+    return x == CONTROL_NONE;
+}
+inline constexpr ControlFlag operator|(ControlFlag x, ControlFlag y){
+    return (ControlFlag)((uint8_t)x | (uint8_t)y);
+}
+inline constexpr void operator|=(ControlFlag& x, ControlFlag y){
+    x = (ControlFlag)((uint8_t)x | (uint8_t)y);
+}
+inline constexpr ControlFlag operator&(ControlFlag x, ControlFlag y){
+    return (ControlFlag)((uint8_t)x & (uint8_t)y);
+}
+inline constexpr void operator&=(ControlFlag& x, ControlFlag y){
+    x = (ControlFlag)((uint8_t)x & (uint8_t)y);
+}
+inline constexpr ControlFlag operator^(ControlFlag x, ControlFlag y){
+    return (ControlFlag)((uint8_t)x ^ (uint8_t)y);
+}
+inline constexpr void operator^=(ControlFlag& x, ControlFlag y){
+    x = (ControlFlag)((uint8_t)x ^ (uint8_t)y);
+}
+
+
+struct TextKeyMapping{
+    KeyboardKey key;
+    ControlFlag control_flags = ControlFlag::CONTROL_NONE;
+};
+
+
+//  Appends the modifier keys corresponding to "flags" to "keys", in the
+//  order of the HID report modifier byte.
+void control_flags_to_keys(ControlFlag flags, std::vector<KeyboardKey>& keys);
+
+
+const std::map<char, TextKeyMapping>& TEXT_TO_HID_KEY(KeyboardLayout layout);
+const std::map<char, TextKeyMapping>& TEXT_TO_HID_KEY_QWERTY();
+const std::map<char, TextKeyMapping>& TEXT_TO_HID_KEY_AZERTY();
+
+
+//  Converts "text" into the ordered list of key chords that types it on the
+//  given layout. Each chord is the set of keys pressed simultaneously: the
+//  modifier keys (in modifier-byte order) followed by the main key.
+//
+//  - Tab types Tab; a newline types Enter.
+//  - A carriage return is only valid as the first half of a CRLF pair
+//    (Windows line endings), in which case the \r is ignored and the \n types
+//    the Enter. A lone \r is an error.
+//
+//  Throws OperationFailedException (NO_ERROR_REPORT) if the text contains a
+//  character that cannot be typed on this layout.
+std::vector<std::vector<KeyboardKey>> text_to_key_chords(
+    KeyboardLayout layout,
+    const std::string& text
+);
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/Typewriter/NintendoSwitch_Typewriter_Tests.cpp b/SerialPrograms/Source/NintendoSwitch/Programs/Typewriter/NintendoSwitch_Typewriter_Tests.cpp
new file mode 100644
index 0000000000..a9f189502d
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Programs/Typewriter/NintendoSwitch_Typewriter_Tests.cpp
@@ -0,0 +1,278 @@
+/*  Typewriter Text Mappings - Tests
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  Pure data/logic tests for text_to_key_chords(): no hardware, no GUI.
+ */
+
+#include <cstdio>
+#include <string>
+#include <vector>
+#include "Common/Cpp/TestRunners/UnitTest.h"
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "CommonFramework/Exceptions/OperationFailedException.h"
+#include "NintendoSwitch_Typewriter_Tests.h"
+#include "NintendoSwitch_TypewriterTextMapping.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace Typewriter{
+
+namespace{
+
+
+
+std::string describe_text(const std::string& text){
+    std::string out;
+    for (unsigned char ch : text){
+        switch (ch){
+        case '\n':  out += "\\n";  break;
+        case '\r':  out += "\\r";  break;
+        case '\t':  out += "\\t";  break;
+        default:
+            if (ch < 0x20 || ch > 0x7e){
+                char buffer[8];
+                std::snprintf(buffer, sizeof(buffer), "\\x%02x", ch);
+                out += buffer;
+            }else{
+                out += (char)ch;
+            }
+        }
+    }
+    return out;
+}
+
+
+
+class Test_TextToKeyChords : public UnitTest{
+public:
+    Test_TextToKeyChords(
+        KeyboardLayout layout,
+        std::string text,
+        std::vector<std::vector<KeyboardKey>> expected,
+        bool expect_throw
+    )
+        : UnitTest(
+            std::string("NintendoSwitch::Typewriter::TextToKeyChords - ") +
+            (layout == KeyboardLayout::QWERTY ? "QWERTY" : "AZERTY") +
+            " \"" + describe_text(text) + "\"" +
+            (expect_throw ? " (expect error)" : "")
+          )
+        , m_layout(layout)
+        , m_text(std::move(text))
+        , m_expected(std::move(expected))
+        , m_expect_throw(expect_throw)
+    {}
+
+    virtual UnitTestResult run(Logger&, CancellableScope&) const override{
+        try{
+            std::vector<std::vector<KeyboardKey>> chords =
+                text_to_key_chords(m_layout, m_text);
+            if (m_expect_throw){
+                return UnitTestResult("Expected an error, but the text converted fine.");
+            }
+            if (chords != m_expected){
+                return UnitTestResult("Key chords do not match the expected sequence.");
+            }
+            return UnitTestResult(true);
+        }catch (OperationFailedException&){
+            if (m_expect_throw){
+                return UnitTestResult(true);
+            }
+            return UnitTestResult("Unexpected error.");
+        }
+    }
+
+private:
+    KeyboardLayout m_layout;
+    std::string m_text;
+    std::vector<std::vector<KeyboardKey>> m_expected;
+    bool m_expect_throw;
+};
+
+
+
+//  UnitTestDatabase::add() forwards its arguments as a variadic template,
+//  which cannot deduce a braced-init list; this helper takes the concrete
+//  types so the call sites can stay readable.
+void add_case(
+    UnitTestDatabase& database,
+    KeyboardLayout layout,
+    std::string text,
+    std::vector<std::vector<KeyboardKey>> expected,
+    bool expect_throw
+){
+    database.add<Test_TextToKeyChords>(
+        layout, std::move(text), std::move(expected), expect_throw
+    );
+}
+
+
+
+}
+
+
+
+void add_tests_TypewriterTextMapping(UnitTestDatabase& database){
+    using namespace PokemonAutomation;
+
+    //
+    //  QWERTY: sample of the mapping, with the expected key and modifiers.
+    //
+    add_case(database, KeyboardLayout::QWERTY, "a", {{KeyboardKey::KEY_A}}, false);
+    add_case(database, KeyboardLayout::QWERTY, "A", {{KeyboardKey::KEY_LEFT_SHIFT, KeyboardKey::KEY_A}}, false);
+    add_case(database, KeyboardLayout::QWERTY, "0", {{KeyboardKey::KEY_0}}, false);
+    add_case(database, KeyboardLayout::QWERTY, " ", {{KeyboardKey::KEY_SPACE}}, false);
+    add_case(database, KeyboardLayout::QWERTY, "!", {{KeyboardKey::KEY_LEFT_SHIFT, KeyboardKey::KEY_1}}, false);
+    add_case(database, KeyboardLayout::QWERTY, "#", {{KeyboardKey::KEY_LEFT_SHIFT, KeyboardKey::KEY_3}}, false);
+    add_case(database, KeyboardLayout::QWERTY, "_", {{KeyboardKey::KEY_LEFT_SHIFT, KeyboardKey::KEY_MINUS}}, false);
+    add_case(database, KeyboardLayout::QWERTY, "\"", {{KeyboardKey::KEY_LEFT_SHIFT, KeyboardKey::KEY_APOSTROPHE}}, false);
+    add_case(database, KeyboardLayout::QWERTY, "\t", {{KeyboardKey::KEY_TAB}}, false);
+    add_case(database, KeyboardLayout::QWERTY, "\n", {{KeyboardKey::KEY_ENTER}}, false);
+    add_case(
+        database, KeyboardLayout::QWERTY, "Hello, World!",
+        {
+            {KeyboardKey::KEY_LEFT_SHIFT, KeyboardKey::KEY_H},
+            {KeyboardKey::KEY_E},
+            {KeyboardKey::KEY_L},
+            {KeyboardKey::KEY_L},
+            {KeyboardKey::KEY_O},
+            {KeyboardKey::KEY_COMMA},
+            {KeyboardKey::KEY_SPACE},
+            {KeyboardKey::KEY_LEFT_SHIFT, KeyboardKey::KEY_W},
+            {KeyboardKey::KEY_O},
+            {KeyboardKey::KEY_R},
+            {KeyboardKey::KEY_L},
+            {KeyboardKey::KEY_D},
+            {KeyboardKey::KEY_LEFT_SHIFT, KeyboardKey::KEY_1},
+        },
+        false
+    );
+
+    //
+    //  Line endings: CRLF is a single Enter; a lone \r is an error.
+    //
+    add_case(database, KeyboardLayout::QWERTY, "\r\n", {{KeyboardKey::KEY_ENTER}}, false);
+    add_case(
+        database, KeyboardLayout::QWERTY, "abc\r\ndef",
+        {
+            {KeyboardKey::KEY_A},
+            {KeyboardKey::KEY_B},
+            {KeyboardKey::KEY_C},
+            {KeyboardKey::KEY_ENTER},
+            {KeyboardKey::KEY_D},
+            {KeyboardKey::KEY_E},
+            {KeyboardKey::KEY_F},
+        },
+        false
+    );
+    add_case(
+        database, KeyboardLayout::QWERTY, "a\r\nb\r\nc",
+        {
+            {KeyboardKey::KEY_A},
+            {KeyboardKey::KEY_ENTER},
+            {KeyboardKey::KEY_B},
+            {KeyboardKey::KEY_ENTER},
+            {KeyboardKey::KEY_C},
+        },
+        false
+    );
+    add_case(database, KeyboardLayout::QWERTY, "\r", {}, true);
+    add_case(database, KeyboardLayout::QWERTY, "abc\r", {}, true);
+    add_case(database, KeyboardLayout::QWERTY, "a\rb", {}, true);
+
+    //
+    //  Unsupported characters.
+    //
+    add_case(database, KeyboardLayout::QWERTY, std::string(1, (uint8_t)0xe9), {}, true);  //  é
+    add_case(database, KeyboardLayout::QWERTY, std::string(1, (uint8_t)0x01), {}, true);  //  control char
+    add_case(database, KeyboardLayout::QWERTY, std::string(1, (uint8_t)0x7f), {}, true);  //  DEL
+
+    //
+    //  AZERTY: letters use the physical US position, digits need Shift,
+    //  and the AltGr characters need the right Alt.
+    //
+    add_case(database, KeyboardLayout::AZERTY, "a", {{KeyboardKey::KEY_Q}}, false);
+    add_case(database, KeyboardLayout::AZERTY, "A", {{KeyboardKey::KEY_LEFT_SHIFT, KeyboardKey::KEY_Q}}, false);
+    add_case(database, KeyboardLayout::AZERTY, "m", {{KeyboardKey::KEY_SEMICOLON}}, false);
+    add_case(database, KeyboardLayout::AZERTY, "q", {{KeyboardKey::KEY_A}}, false);
+    add_case(database, KeyboardLayout::AZERTY, "1", {{KeyboardKey::KEY_LEFT_SHIFT, KeyboardKey::KEY_1}}, false);
+    add_case(database, KeyboardLayout::AZERTY, "&", {{KeyboardKey::KEY_1}}, false);
+    add_case(database, KeyboardLayout::AZERTY, "*", {{KeyboardKey::KEY_BACKSLASH}}, false);
+    add_case(database, KeyboardLayout::AZERTY, "\t", {{KeyboardKey::KEY_TAB}}, false);
+    add_case(database, KeyboardLayout::AZERTY, "\r\n", {{KeyboardKey::KEY_ENTER}}, false);
+    add_case(database, KeyboardLayout::AZERTY, "#", {{KeyboardKey::KEY_RIGHT_ALT, KeyboardKey::KEY_3}}, false);
+    add_case(database, KeyboardLayout::AZERTY, "@", {{KeyboardKey::KEY_RIGHT_ALT, KeyboardKey::KEY_0}}, false);
+    add_case(database, KeyboardLayout::AZERTY, "[", {{KeyboardKey::KEY_RIGHT_ALT, KeyboardKey::KEY_5}}, false);
+    add_case(database, KeyboardLayout::AZERTY, "]", {{KeyboardKey::KEY_RIGHT_ALT, KeyboardKey::KEY_MINUS}}, false);
+    add_case(database, KeyboardLayout::AZERTY, "^", {{KeyboardKey::KEY_RIGHT_ALT, KeyboardKey::KEY_9}}, false);
+    add_case(database, KeyboardLayout::AZERTY, "\\", {{KeyboardKey::KEY_RIGHT_ALT, KeyboardKey::KEY_8}}, false);
+    add_case(database, KeyboardLayout::AZERTY, "|", {{KeyboardKey::KEY_RIGHT_ALT, KeyboardKey::KEY_6}}, false);
+    add_case(database, KeyboardLayout::AZERTY, "~", {{KeyboardKey::KEY_RIGHT_ALT, KeyboardKey::KEY_2}}, false);
+    add_case(database, KeyboardLayout::AZERTY, "\u0060", {{KeyboardKey::KEY_RIGHT_ALT, KeyboardKey::KEY_7}}, false);
+    add_case(database, KeyboardLayout::AZERTY, "{", {{KeyboardKey::KEY_RIGHT_ALT, KeyboardKey::KEY_4}}, false);
+    add_case(database, KeyboardLayout::AZERTY, "}", {{KeyboardKey::KEY_RIGHT_ALT, KeyboardKey::KEY_EQUAL}}, false);
+    add_case(database, KeyboardLayout::AZERTY, "<", {{KeyboardKey::KEY_102ND}}, false);
+    add_case(database, KeyboardLayout::AZERTY, ">", {{KeyboardKey::KEY_LEFT_SHIFT, KeyboardKey::KEY_102ND}}, false);
+    add_case(
+        database, KeyboardLayout::AZERTY, "a <b> {c} d#e f@g h[i] j^k\\l|m ~n\u0060 o{p}q}r<s>t\n",
+        {
+            {KeyboardKey::KEY_Q},                                 //  a
+            {KeyboardKey::KEY_SPACE},                             //   
+            {KeyboardKey::KEY_102ND},                             //  <
+            {KeyboardKey::KEY_B},                                 //  b
+            {KeyboardKey::KEY_LEFT_SHIFT, KeyboardKey::KEY_102ND}, //  >
+            {KeyboardKey::KEY_SPACE},                             //   
+            {KeyboardKey::KEY_RIGHT_ALT, KeyboardKey::KEY_4},     //  {
+            {KeyboardKey::KEY_C},                                 //  c
+            {KeyboardKey::KEY_RIGHT_ALT, KeyboardKey::KEY_EQUAL}, //  }
+            {KeyboardKey::KEY_SPACE},                             //   
+            {KeyboardKey::KEY_D},                                 //  d
+            {KeyboardKey::KEY_RIGHT_ALT, KeyboardKey::KEY_3},     //  #
+            {KeyboardKey::KEY_E},                                 //  e
+            {KeyboardKey::KEY_SPACE},                             //   
+            {KeyboardKey::KEY_F},                                 //  f
+            {KeyboardKey::KEY_RIGHT_ALT, KeyboardKey::KEY_0},     //  @
+            {KeyboardKey::KEY_G},                                 //  g
+            {KeyboardKey::KEY_SPACE},                             //   
+            {KeyboardKey::KEY_H},                                 //  h
+            {KeyboardKey::KEY_RIGHT_ALT, KeyboardKey::KEY_5},     //  [
+            {KeyboardKey::KEY_I},                                 //  i
+            {KeyboardKey::KEY_RIGHT_ALT, KeyboardKey::KEY_MINUS}, //  ]
+            {KeyboardKey::KEY_SPACE},                             //   
+            {KeyboardKey::KEY_J},                                 //  j
+            {KeyboardKey::KEY_RIGHT_ALT, KeyboardKey::KEY_9},     //  ^
+            {KeyboardKey::KEY_K},                                 //  k
+            {KeyboardKey::KEY_RIGHT_ALT, KeyboardKey::KEY_8},     //  backslash
+            {KeyboardKey::KEY_L},                                 //  l
+            {KeyboardKey::KEY_RIGHT_ALT, KeyboardKey::KEY_6},     //  |
+            {KeyboardKey::KEY_SEMICOLON},                         //  m
+            {KeyboardKey::KEY_SPACE},                             //   
+            {KeyboardKey::KEY_RIGHT_ALT, KeyboardKey::KEY_2},     //  ~
+            {KeyboardKey::KEY_N},                                 //  n
+            {KeyboardKey::KEY_RIGHT_ALT, KeyboardKey::KEY_7},     //  `
+            {KeyboardKey::KEY_SPACE},                             //   
+            {KeyboardKey::KEY_O},                                 //  o
+            {KeyboardKey::KEY_RIGHT_ALT, KeyboardKey::KEY_4},     //  {
+            {KeyboardKey::KEY_P},                                 //  p
+            {KeyboardKey::KEY_RIGHT_ALT, KeyboardKey::KEY_EQUAL}, //  }
+            {KeyboardKey::KEY_A},                                 //  q
+            {KeyboardKey::KEY_RIGHT_ALT, KeyboardKey::KEY_EQUAL}, //  }
+            {KeyboardKey::KEY_R},                                 //  r
+            {KeyboardKey::KEY_102ND},                             //  <
+            {KeyboardKey::KEY_S},                                 //  s
+            {KeyboardKey::KEY_LEFT_SHIFT, KeyboardKey::KEY_102ND}, //  >
+            {KeyboardKey::KEY_T},                                 //  t
+            {KeyboardKey::KEY_ENTER},                             //  \n
+        },
+        false
+    );
+    add_case(database, KeyboardLayout::AZERTY, std::string(1, (uint8_t)0xe9), {}, true);  //  é
+}
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/Typewriter/NintendoSwitch_Typewriter_Tests.h b/SerialPrograms/Source/NintendoSwitch/Programs/Typewriter/NintendoSwitch_Typewriter_Tests.h
new file mode 100644
index 0000000000..fc663088dd
--- /dev/null
+++ b/SerialPrograms/Source/NintendoSwitch/Programs/Typewriter/NintendoSwitch_Typewriter_Tests.h
@@ -0,0 +1,24 @@
+/*  Typewriter Text Mappings - Tests
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_NintendoSwitch_Typewriter_Tests_H
+#define PokemonAutomation_NintendoSwitch_Typewriter_Tests_H
+
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace Typewriter{
+
+
+void add_tests_TypewriterTextMapping(UnitTestDatabase& database);
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/PanelLists.cpp b/SerialPrograms/Source/PanelLists.cpp
index ad73de5baf..c30038751a 100644
--- a/SerialPrograms/Source/PanelLists.cpp
+++ b/SerialPrograms/Source/PanelLists.cpp
@@ -1,54 +1,83 @@
 /*  Left-Side Panel
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include <array>
 #include <QStandardItemModel>
 #include <QVBoxLayout>
-#include <QLabel>
 #include "Common/Qt/NoWheelComboBox.h"
+#include "CommonFramework/StaticGlobals.h"
 #include "CommonFramework/PersistentSettings.h"
+#include "CommonFramework/ImageTypes/ImageRGB32_Qt.h"
 #include "CommonFramework/Windows/DpiScaler.h"
 #include "CommonFramework/Panels/UI/PanelListWidget.h"
+#include "ML/ML_Panels.h"
 #include "NintendoSwitch/NintendoSwitch_Panels.h"
-#include "PokemonSwSh/PokemonSwSh_Panels.h"
-#include "PokemonHome/PokemonHome_Panels.h"
+#include "VideoGames/PokemonSwSh/PokemonSwSh_Panels.h"
+#include "VideoGames/PokemonHome/PokemonHome_Panels.h"
 #include "PokemonBDSP/PokemonBDSP_Panels.h"
-#include "PokemonLA/PokemonLA_Panels.h"
-#include "PokemonSV/PokemonSV_Panels.h"
-#include "ZeldaTotK/ZeldaTotK_Panels.h"
+#include "VideoGames/PokemonFRLG/PokemonFRLG_Panels.h"
+#include "VideoGames/PokemonLA/PokemonLA_Panels.h"
+#include "VideoGames/PokemonLGPE/PokemonLGPE_Panels.h"
+#include "VideoGames/PokemonRSE/PokemonRSE_Panels.h"
+#include "VideoGames/PokemonSV/PokemonSV_Panels.h"
+#include "VideoGames/PokemonLZA/PokemonLZA_Panels.h"
+#include "VideoGames/PokemonPokopia/PokemonPokopia_Panels.h"
+#include "VideoGames/ZeldaTotK/ZeldaTotK_Panels.h"
 #include "PanelLists.h"
 
 //#include <iostream>
 //using std::cout;
 //using std::endl;
 
-
 namespace PokemonAutomation{
 
 
 
 ProgramSelect::ProgramSelect(QWidget& parent, PanelHolder& holder)
-    : QGroupBox("Program Select", &parent)
+    : QWidget(&parent)
     , m_holder(holder)
 {
     QVBoxLayout* layout = new QVBoxLayout(this);
+    layout->setContentsMargins(0, 0, 0, 0);
     layout->setAlignment(Qt::AlignTop);
-    m_dropdown = new NoWheelComboBox(this);
+    m_dropdown = new NoWheelCompactComboBox(this);
+    m_dropdown->setMaxVisibleItems(20);
+    this->setStyleSheet("QComboBox QAbstractItemView::item { min-height: 24px; }");
+    {
+        QListView* list_view = new QListView(this);
+        list_view->setWordWrap(true);
+        m_dropdown->setView(list_view);
+    }
+    {
+//        QSize size = m_dropdown->iconSize();
+//        cout << "size = " << size.width() << " x " << size.height() << endl;
+//        size.setWidth(size.width() * 2);
+        m_dropdown->setIconSize(QSize(48, 24));
+    }
     layout->addWidget(m_dropdown);
 
 
-
     add(std::make_unique<NintendoSwitch::PanelListFactory>());
     add(std::make_unique<NintendoSwitch::PokemonHome::PanelListFactory>());
+    add(std::make_unique<NintendoSwitch::PokemonLGPE::PanelListFactory>());
     add(std::make_unique<NintendoSwitch::PokemonSwSh::PanelListFactory>());
     add(std::make_unique<NintendoSwitch::PokemonBDSP::PanelListFactory>());
     add(std::make_unique<NintendoSwitch::PokemonLA::PanelListFactory>());
     add(std::make_unique<NintendoSwitch::PokemonSV::PanelListFactory>());
+    add(std::make_unique<NintendoSwitch::PokemonLZA::PanelListFactory>());
+    add(std::make_unique<NintendoSwitch::PokemonFRLG::PanelListFactory>());
+    add(std::make_unique<NintendoSwitch::PokemonPokopia::PanelListFactory>());
+    if (STATIC_GLOBALS.DEVELOPER_MODE){
+        add(std::make_unique<NintendoSwitch::PokemonRSE::PanelListFactory>());
+    }
+
     add(std::make_unique<NintendoSwitch::ZeldaTotK::PanelListFactory>());
 
+    if (STATIC_GLOBALS.DEVELOPER_MODE){
+        add(std::make_unique<ML::PanelListFactory>());
+    }
 
 
     //  Load the 1st list by default.
@@ -65,9 +94,27 @@ ProgramSelect::ProgramSelect(QWidget& parent, PanelHolder& holder)
     );
 }
 
+void ProgramSelect::lock(){
+    m_locked = true;
+    m_active_list->setEnabled(false);
+}
+void ProgramSelect::unlock(){
+    m_locked = false;
+    m_active_list->setEnabled(true);
+}
+
 void ProgramSelect::add(std::unique_ptr<PanelListDescriptor> list){
     int index = m_dropdown->count();
-    m_dropdown->addItem(QString::fromStdString(list->name()));
+    const ImageViewRGB32& icon = list->icon();
+    if (icon){
+        m_dropdown->addItem(
+            QIcon(QPixmap::fromImage(to_QImage_ref(icon))),
+            QString::fromStdString(list->name())
+        );
+    }else{
+        m_dropdown->addItem(QString::fromStdString(list->name()));
+    }
+
     m_lists.emplace_back(std::move(list));
     const PanelListDescriptor& back = *m_lists.back();
     if (!m_tab_map.emplace(back.name(), index).second){
@@ -113,11 +160,12 @@ void ProgramSelect::change_list(int index){
     PERSISTENT_SETTINGS().panels["ProgramCategory"] = m_lists[index]->name();
     delete m_active_list;
     m_active_list = m_lists[index]->make_QWidget(*this, m_holder);
+    m_active_list->setEnabled(!m_locked);
     layout()->addWidget(m_active_list);
 }
 
 QSize ProgramSelect::sizeHint() const{
-    QSize size = QGroupBox::sizeHint();
+    QSize size = QWidget::sizeHint();
 //    cout << size.width() << " x " << size.height() << endl;
 //    cout << this->size().width() << " x " << this->size().height() << endl;
     size.setWidth(scale_dpi_width(size.width() + 10));
diff --git a/SerialPrograms/Source/PanelLists.h b/SerialPrograms/Source/PanelLists.h
index d8b4763eea..eb4074028f 100644
--- a/SerialPrograms/Source/PanelLists.h
+++ b/SerialPrograms/Source/PanelLists.h
@@ -1,13 +1,13 @@
 /*  Program Tabs
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifndef PokemonAutomation_ProgramTabs_H
 #define PokemonAutomation_ProgramTabs_H
 
-#include <QGroupBox>
+#include <QWidget>
 #include "CommonFramework/Panels/PanelList.h"
 
 class QComboBox;
@@ -15,11 +15,18 @@ class QComboBox;
 namespace PokemonAutomation{
 
 
-
-class ProgramSelect : public QGroupBox{
+// The program selection UI on the left side of the program window.
+// It has a dropdown menu to select which Switch game's program list to show, and
+// a display list window to show the current active game's program list.
+// This class owns the a vector of PanelListDescriptor. A PanelListDescriptor is
+// like a generator for the programs and their UIs for a game.
+class ProgramSelect : public QWidget{
 public:
     ProgramSelect(QWidget& parent, PanelHolder& holder);
 
+    void lock();
+    void unlock();
+
     // Load the panel specified in the persistent setting.
     void load_persistent_panel();
 
@@ -37,6 +44,8 @@ class ProgramSelect : public QGroupBox{
 
     QComboBox* m_dropdown;
 
+    bool m_locked = false;
+
     int m_active_index = -1;
     PanelListWidget* m_active_list = nullptr;
 };
diff --git a/SerialPrograms/Source/Pokemon/Inference/Pokemon_AbilityReader.cpp b/SerialPrograms/Source/Pokemon/Inference/Pokemon_AbilityReader.cpp
new file mode 100644
index 0000000000..4f54c79206
--- /dev/null
+++ b/SerialPrograms/Source/Pokemon/Inference/Pokemon_AbilityReader.cpp
@@ -0,0 +1,32 @@
+/*  Ability Reader
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonTools/OCR/OCR_Routines.h"
+#include "Pokemon_AbilityReader.h"
+
+namespace PokemonAutomation{
+namespace Pokemon{
+
+AbilityReader::AbilityReader()
+    : SmallDictionaryMatcher("Pokemon/AbilityOCR.json")
+{}
+
+OCR::StringMatchResult AbilityReader::read_substring(
+    Logger& logger,
+    Language language,
+    const ImageViewRGB32& image,
+    const std::vector<OCR::TextColorRange>& text_color_ranges,
+    double min_text_ratio, double max_text_ratio
+) const{
+    return match_substring_from_image_multifiltered(
+        &logger, language, image, text_color_ranges,
+        MAX_LOG10P, MAX_LOG10P_SPREAD,
+        min_text_ratio, max_text_ratio
+    );
+}
+
+}
+}
diff --git a/SerialPrograms/Source/Pokemon/Inference/Pokemon_AbilityReader.h b/SerialPrograms/Source/Pokemon/Inference/Pokemon_AbilityReader.h
new file mode 100644
index 0000000000..76a1a88032
--- /dev/null
+++ b/SerialPrograms/Source/Pokemon/Inference/Pokemon_AbilityReader.h
@@ -0,0 +1,34 @@
+/*  Ability Reader
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Pokemon_AbilityReader_H
+#define PokemonAutomation_Pokemon_AbilityReader_H
+
+#include "CommonTools/OCR/OCR_SmallDictionaryMatcher.h"
+
+namespace PokemonAutomation{
+namespace Pokemon{
+
+class AbilityReader : public OCR::SmallDictionaryMatcher{
+public:
+    static constexpr double MAX_LOG10P = -1.40;
+    static constexpr double MAX_LOG10P_SPREAD = 0.50;
+
+public:
+    AbilityReader();
+
+    OCR::StringMatchResult read_substring(
+        Logger& logger,
+        Language language,
+        const ImageViewRGB32& image,
+        const std::vector<OCR::TextColorRange>& text_color_ranges,
+        double min_text_ratio = 0.01, double max_text_ratio = 0.50
+    ) const;
+};
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Pokemon/Inference/Pokemon_BerryNameReader.cpp b/SerialPrograms/Source/Pokemon/Inference/Pokemon_BerryNameReader.cpp
index bb89fa9b73..d537f6b9ff 100644
--- a/SerialPrograms/Source/Pokemon/Inference/Pokemon_BerryNameReader.cpp
+++ b/SerialPrograms/Source/Pokemon/Inference/Pokemon_BerryNameReader.cpp
@@ -1,10 +1,10 @@
 /*  Berry Name Reader
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include "CommonFramework/OCR/OCR_Routines.h"
+#include "CommonTools/OCR/OCR_Routines.h"
 #include "Pokemon_BerryNameReader.h"
 
 namespace PokemonAutomation{
diff --git a/SerialPrograms/Source/Pokemon/Inference/Pokemon_BerryNameReader.h b/SerialPrograms/Source/Pokemon/Inference/Pokemon_BerryNameReader.h
index 968e7c52d1..70841e193d 100644
--- a/SerialPrograms/Source/Pokemon/Inference/Pokemon_BerryNameReader.h
+++ b/SerialPrograms/Source/Pokemon/Inference/Pokemon_BerryNameReader.h
@@ -1,14 +1,13 @@
 /*  Berry Name Reader
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifndef PokemonAutomation_Pokemon_BerryNameReader_H
 #define PokemonAutomation_Pokemon_BerryNameReader_H
 
-#include "CommonFramework/Logging/Logger.h"
-#include "CommonFramework/OCR/OCR_SmallDictionaryMatcher.h"
+#include "CommonTools/OCR/OCR_SmallDictionaryMatcher.h"
 
 namespace PokemonAutomation{
 namespace Pokemon{
diff --git a/SerialPrograms/Source/Pokemon/Inference/Pokemon_BoxGenderDetector.cpp b/SerialPrograms/Source/Pokemon/Inference/Pokemon_BoxGenderDetector.cpp
index 1667bd4d9e..207cbf3f85 100644
--- a/SerialPrograms/Source/Pokemon/Inference/Pokemon_BoxGenderDetector.cpp
+++ b/SerialPrograms/Source/Pokemon/Inference/Pokemon_BoxGenderDetector.cpp
@@ -1,22 +1,22 @@
 /*  Box Gender Detector
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  *
  *
  */
 
+#include <iostream>
 #include "Common/Cpp/Color.h"
-#include "CommonFramework/GlobalSettingsPanel.h"
+#include "CommonFramework/StaticGlobals.h"
 #include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "CommonFramework/ImageTools/ImageFilter.h"
 #include "CommonFramework/ImageTypes/ImageRGB32.h"
 #include "CommonFramework/ImageTools/ImageStats.h"
 #include "CommonFramework/ImageTypes/ImageViewRGB32.h"
 #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Images/ImageFilter.h"
 #include "Pokemon_BoxGenderDetector.h"
 
-#include <iostream>
 using std::cout;
 using std::endl;
 
@@ -24,13 +24,16 @@ namespace PokemonAutomation{
 namespace Pokemon{
 
 BoxGenderDetector::BoxGenderDetector(const ImageFloatBox& box, double area_ratio_threshold, Color color)
-: m_box(box), m_area_ratio_threshold(area_ratio_threshold), m_color(color) {}
+    : m_box(box)
+    , m_area_ratio_threshold(area_ratio_threshold)
+    , m_color(color)
+{}
 
-void BoxGenderDetector::make_overlays(VideoOverlaySet& items) const {
+void BoxGenderDetector::make_overlays(VideoOverlaySet& items) const{
     items.add(m_color, m_box);
 }
 
-EggHatchGenderFilter BoxGenderDetector::detect(const ImageViewRGB32& screen) const{
+StatsHuntGenderFilter BoxGenderDetector::detect(const ImageViewRGB32& screen) const{
     const auto region = extract_box_reference(screen, m_box);
 
     // Retain only red pixels from region
@@ -50,7 +53,7 @@ EggHatchGenderFilter BoxGenderDetector::detect(const ImageViewRGB32& screen) con
 
     const double threshold = region.width() * region.height() * m_area_ratio_threshold;
 
-    if (PreloadSettings::debug().COLOR_CHECK){
+    if (STATIC_GLOBALS.COLOR_CHECK){
         cout << "num_red_pixels: " << num_red_pixels << ", num_blue_pixels: " << num_blue_pixels
              << ", region " << region.width() << " x " << region.height() << " threshold " << threshold << endl;
 
@@ -60,11 +63,11 @@ EggHatchGenderFilter BoxGenderDetector::detect(const ImageViewRGB32& screen) con
     }
 
     if (num_red_pixels > threshold){
-        return Pokemon::EggHatchGenderFilter::Female;
-    } else if (num_blue_pixels > threshold){
-        return Pokemon::EggHatchGenderFilter::Male;
+        return Pokemon::StatsHuntGenderFilter::Female;
+    }else if (num_blue_pixels > threshold){
+        return Pokemon::StatsHuntGenderFilter::Male;
     }
-    return Pokemon::EggHatchGenderFilter::Genderless;
+    return Pokemon::StatsHuntGenderFilter::Genderless;
 }
 
 }
diff --git a/SerialPrograms/Source/Pokemon/Inference/Pokemon_BoxGenderDetector.h b/SerialPrograms/Source/Pokemon/Inference/Pokemon_BoxGenderDetector.h
index 325918776f..225e795b65 100644
--- a/SerialPrograms/Source/Pokemon/Inference/Pokemon_BoxGenderDetector.h
+++ b/SerialPrograms/Source/Pokemon/Inference/Pokemon_BoxGenderDetector.h
@@ -1,6 +1,6 @@
 /*  Box Gender Detector
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -9,7 +9,7 @@
 
 #include "Common/Cpp/Color.h"
 #include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "Pokemon/Options/Pokemon_EggHatchFilter.h"
+#include "Pokemon/Options/Pokemon_StatsHuntFilter.h"
 
 namespace PokemonAutomation{
 
@@ -19,7 +19,7 @@ class VideoOverlaySet;
 namespace Pokemon{
 
 // Detect gender symbol inside the pokemon storage box
-class BoxGenderDetector {
+class BoxGenderDetector{
 public:
     // box: the area where the gender symbol will appear
     // area_ratio_threshold: if the number of red pixel count > box total area * area_ratio_threshold, female symbol is detected
@@ -27,7 +27,7 @@ class BoxGenderDetector {
     BoxGenderDetector(const ImageFloatBox& box, double area_ratio_threshold, Color color = COLOR_RED);
 
     void make_overlays(VideoOverlaySet& items) const;
-    EggHatchGenderFilter detect(const ImageViewRGB32& screen) const;
+    StatsHuntGenderFilter detect(const ImageViewRGB32& screen) const;
 
 private:
     ImageFloatBox m_box;
diff --git a/SerialPrograms/Source/Pokemon/Inference/Pokemon_IVCheckerReader.cpp b/SerialPrograms/Source/Pokemon/Inference/Pokemon_IVCheckerReader.cpp
deleted file mode 100644
index f95ab83b2d..0000000000
--- a/SerialPrograms/Source/Pokemon/Inference/Pokemon_IVCheckerReader.cpp
+++ /dev/null
@@ -1,62 +0,0 @@
-/*  IV Checker Reader
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Pokemon_IVCheckerReader.h"
-
-namespace PokemonAutomation{
-namespace Pokemon{
-
-namespace {
-
-std::string iv_checker_value_to_string(IVCheckerValue value){
-    const char* names[] = {
-        "UnableToDetect",
-        "NoGood",
-        "Decent",
-        "PrettyGood",
-        "VeryGood",
-        "Fantastic",
-        "Best",
-        "HyperTrained",
-    };
-
-    return names[int(value)];
-}
-
-}
-
-IVCheckerReader::IVCheckerReader(const std::string& json_path)
-    : SmallDictionaryMatcher(json_path)
-{}
-
-OCR::StringMatchResult IVCheckerReader::read_substring(
-    Logger& logger,
-    Language language,
-    const ImageViewRGB32& image,
-    const std::vector<OCR::TextColorRange>& text_color_ranges,
-    double min_text_ratio, double max_text_ratio
-) const{
-    return match_substring_from_image_multifiltered(
-        &logger, language, image, text_color_ranges,
-        MAX_LOG10P, MAX_LOG10P_SPREAD,
-        min_text_ratio, max_text_ratio
-    );
-}
-
-
-
-std::string IVCheckerReader::Results::to_string() const{
-    return  "HP: " + iv_checker_value_to_string(hp)
-         + ", Att: " + iv_checker_value_to_string(attack)
-         + ", Def: " + iv_checker_value_to_string(defense)
-         + ", S.Att: " + iv_checker_value_to_string(spatk)
-         + ", S.Def: " + iv_checker_value_to_string(spdef)
-         + ", Spd: " + iv_checker_value_to_string(speed);
-}
-
-
-}
-}
diff --git a/SerialPrograms/Source/Pokemon/Inference/Pokemon_IVCheckerReader.h b/SerialPrograms/Source/Pokemon/Inference/Pokemon_IVCheckerReader.h
deleted file mode 100644
index 44e972902e..0000000000
--- a/SerialPrograms/Source/Pokemon/Inference/Pokemon_IVCheckerReader.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*  IV Checker Reader
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_Pokemon_IVCheckerReader_H
-#define PokemonAutomation_Pokemon_IVCheckerReader_H
-
-#include "CommonFramework/OCR/OCR_SmallDictionaryMatcher.h"
-#include "Pokemon/Pokemon_IVChecker.h"
-
-namespace PokemonAutomation{
-namespace Pokemon{
-
-
-
-class IVCheckerReader : public OCR::SmallDictionaryMatcher{
-public:
-    static constexpr double MAX_LOG10P = -1.40;
-    static constexpr double MAX_LOG10P_SPREAD = 0.50;
-
-public:
-    struct Results{
-        IVCheckerValue hp       = IVCheckerValue::UnableToDetect;
-        IVCheckerValue attack   = IVCheckerValue::UnableToDetect;
-        IVCheckerValue defense  = IVCheckerValue::UnableToDetect;
-        IVCheckerValue spatk    = IVCheckerValue::UnableToDetect;
-        IVCheckerValue spdef    = IVCheckerValue::UnableToDetect;
-        IVCheckerValue speed    = IVCheckerValue::UnableToDetect;
-
-        std::string to_string() const;
-    };
-
-    IVCheckerReader(const std::string& json_path);
-
-    OCR::StringMatchResult read_substring(
-        Logger& logger,
-        Language language,
-        const ImageViewRGB32& image,
-        const std::vector<OCR::TextColorRange>& text_color_ranges,
-        double min_text_ratio = 0.01, double max_text_ratio = 0.50
-    ) const;
-
-};
-
-
-
-}
-}
-#endif
diff --git a/SerialPrograms/Source/Pokemon/Inference/Pokemon_IvJudgeReader.cpp b/SerialPrograms/Source/Pokemon/Inference/Pokemon_IvJudgeReader.cpp
new file mode 100644
index 0000000000..2ccee854a1
--- /dev/null
+++ b/SerialPrograms/Source/Pokemon/Inference/Pokemon_IvJudgeReader.cpp
@@ -0,0 +1,62 @@
+/*  IV Checker Reader
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Pokemon_IvJudgeReader.h"
+
+namespace PokemonAutomation{
+namespace Pokemon{
+
+namespace{
+
+std::string iv_checker_value_to_string(IvJudgeValue value){
+    const char* names[] = {
+        "UnableToDetect",
+        "NoGood",
+        "Decent",
+        "PrettyGood",
+        "VeryGood",
+        "Fantastic",
+        "Best",
+        "HyperTrained",
+    };
+
+    return names[int(value)];
+}
+
+}
+
+IvJudgeReader::IvJudgeReader(const std::string& json_path)
+    : SmallDictionaryMatcher(json_path)
+{}
+
+OCR::StringMatchResult IvJudgeReader::read_substring(
+    Logger& logger,
+    Language language,
+    const ImageViewRGB32& image,
+    const std::vector<OCR::TextColorRange>& text_color_ranges,
+    double min_text_ratio, double max_text_ratio
+) const{
+    return match_substring_from_image_multifiltered(
+        &logger, language, image, text_color_ranges,
+        MAX_LOG10P, MAX_LOG10P_SPREAD,
+        min_text_ratio, max_text_ratio
+    );
+}
+
+
+
+std::string IvJudgeReader::Results::to_string() const{
+    return  "HP: " + iv_checker_value_to_string(hp)
+         + ", Att: " + iv_checker_value_to_string(attack)
+         + ", Def: " + iv_checker_value_to_string(defense)
+         + ", S.Att: " + iv_checker_value_to_string(spatk)
+         + ", S.Def: " + iv_checker_value_to_string(spdef)
+         + ", Spd: " + iv_checker_value_to_string(speed);
+}
+
+
+}
+}
diff --git a/SerialPrograms/Source/Pokemon/Inference/Pokemon_IvJudgeReader.h b/SerialPrograms/Source/Pokemon/Inference/Pokemon_IvJudgeReader.h
new file mode 100644
index 0000000000..9af258ac2c
--- /dev/null
+++ b/SerialPrograms/Source/Pokemon/Inference/Pokemon_IvJudgeReader.h
@@ -0,0 +1,51 @@
+/*  IV Judge Reader
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Pokemon_IvJudgeReader_H
+#define PokemonAutomation_Pokemon_IvJudgeReader_H
+
+#include "CommonTools/OCR/OCR_SmallDictionaryMatcher.h"
+#include "Pokemon/Pokemon_IvJudge.h"
+
+namespace PokemonAutomation{
+namespace Pokemon{
+
+
+
+class IvJudgeReader : public OCR::SmallDictionaryMatcher{
+public:
+    static constexpr double MAX_LOG10P = -1.40;
+    static constexpr double MAX_LOG10P_SPREAD = 0.50;
+
+public:
+    struct Results{
+        IvJudgeValue hp       = IvJudgeValue::UnableToDetect;
+        IvJudgeValue attack   = IvJudgeValue::UnableToDetect;
+        IvJudgeValue defense  = IvJudgeValue::UnableToDetect;
+        IvJudgeValue spatk    = IvJudgeValue::UnableToDetect;
+        IvJudgeValue spdef    = IvJudgeValue::UnableToDetect;
+        IvJudgeValue speed    = IvJudgeValue::UnableToDetect;
+
+        std::string to_string() const;
+    };
+
+    IvJudgeReader(const std::string& json_path);
+
+    OCR::StringMatchResult read_substring(
+        Logger& logger,
+        Language language,
+        const ImageViewRGB32& image,
+        const std::vector<OCR::TextColorRange>& text_color_ranges,
+        double min_text_ratio = 0.01, double max_text_ratio = 0.50
+    ) const;
+
+};
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Pokemon/Inference/Pokemon_NameReader.cpp b/SerialPrograms/Source/Pokemon/Inference/Pokemon_NameReader.cpp
index dc644883d0..eebb909fcf 100644
--- a/SerialPrograms/Source/Pokemon/Inference/Pokemon_NameReader.cpp
+++ b/SerialPrograms/Source/Pokemon/Inference/Pokemon_NameReader.cpp
@@ -1,10 +1,11 @@
 /*  Pokemon Name Reader
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include "CommonFramework/OCR/OCR_RawOCR.h"
+#include "CommonFramework/ImageTypes/ImageRGB32.h"
+#include "Tests/ImageUnitTest.h"
 #include "Pokemon_NameReader.h"
 
 namespace PokemonAutomation{
@@ -29,12 +30,69 @@ OCR::StringMatchResult PokemonNameReader::read_substring(
     Language language,
     const ImageViewRGB32& image,
     const std::vector<OCR::TextColorRange>& text_color_ranges,
-    double min_text_ratio, double max_text_ratio
+    double min_text_ratio, double max_text_ratio,
+    double max_log10p
 ) const{
     return match_substring_from_image_multifiltered(
         &logger, language, image, text_color_ranges,
-        MAX_LOG10P, MAX_LOG10P_SPREAD, min_text_ratio, max_text_ratio
-    );
+        max_log10p, MAX_LOG10P_SPREAD, min_text_ratio, max_text_ratio
+    );  
+}
+
+class Test_PokemonNameReader : public ImageUnitTest{
+public:
+    Test_PokemonNameReader(
+        const std::string& image,
+        Language language,
+        const std::string& expected
+    )
+        : ImageUnitTest("OCR::RawOCR - " + image, {image})
+        , m_language(language)
+        , m_expected(expected)
+    {
+        //  Plus the PaddleOCR (ONNX) recognition session and its working set.
+        m_memory += PADDLE_OCR_SINGLE_LINE_MEMORY_ESTIMATE;
+    }
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        const ImageRGB32& image = images[0];
+
+        OCR::StringMatchResult ocr_result = Pokemon::PokemonNameReader::instance().read_substring(
+            logger, m_language, image, OCR::BLACK_OR_WHITE_TEXT_FILTERS()
+        );
+
+        std::multimap<double, OCR::StringMatchData> results;
+        if (!ocr_result.results.empty()){
+            for (const auto& result : ocr_result.results){
+                results.emplace(result.first, result.second);
+            }
+        }
+        std::string string_result = "";
+
+        if (results.empty()){
+            string_result = "";
+        }else if (results.size() > 1){
+            logger.log("Unable to read selected item. Ambiguous or multiple results.");
+            return false;
+        }else{
+            string_result = results.begin()->second.token;
+        }
+
+        return string_result == m_expected;
+    };
+
+private:
+    Language m_language;
+    std::string m_expected;
+};
+
+
+void add_tests_PokemonNameReader(UnitTestDatabase& database){
+    // database.add<Test_PokemonNameReader>("OCR/PokemonNameOCR/clefairy-20210618-211817.png", Language::Korean, "clefairy");
+    // database.add<Test_PokemonNameReader>("OCR/PokemonNameOCR/clefable-20210618-212311.png", Language::Korean, "clefable");
 }
 
 
diff --git a/SerialPrograms/Source/Pokemon/Inference/Pokemon_NameReader.h b/SerialPrograms/Source/Pokemon/Inference/Pokemon_NameReader.h
index 3355e18fe4..da9ba26856 100644
--- a/SerialPrograms/Source/Pokemon/Inference/Pokemon_NameReader.h
+++ b/SerialPrograms/Source/Pokemon/Inference/Pokemon_NameReader.h
@@ -1,13 +1,14 @@
 /*  Pokemon Name Reader
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifndef PokemonAutomation_Pokemon_PokemonNameReader_H
 #define PokemonAutomation_Pokemon_PokemonNameReader_H
 
-#include "CommonFramework/OCR/OCR_LargeDictionaryMatcher.h"
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "CommonTools/OCR/OCR_LargeDictionaryMatcher.h"
 
 namespace PokemonAutomation{
 namespace Pokemon{
@@ -31,11 +32,14 @@ class PokemonNameReader : public OCR::LargeDictionaryMatcher{
         Language language,
         const ImageViewRGB32& image,
         const std::vector<OCR::TextColorRange>& text_color_ranges,
-        double min_text_ratio = 0.01, double max_text_ratio = 0.50
+        double min_text_ratio = 0.01, double max_text_ratio = 0.50,
+        double max_log10p = MAX_LOG10P
     ) const;
 
 };
 
+void add_tests_PokemonNameReader(UnitTestDatabase& database);
+
 
 }
 }
diff --git a/SerialPrograms/Source/Pokemon/Inference/Pokemon_NatureReader.cpp b/SerialPrograms/Source/Pokemon/Inference/Pokemon_NatureReader.cpp
index 86ac92503a..aa63b2fb82 100644
--- a/SerialPrograms/Source/Pokemon/Inference/Pokemon_NatureReader.cpp
+++ b/SerialPrograms/Source/Pokemon/Inference/Pokemon_NatureReader.cpp
@@ -1,75 +1,37 @@
-/*  Nature Reader
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/OCR/OCR_Routines.h"
-#include "Pokemon_NatureReader.h"
-
-namespace PokemonAutomation{
-namespace Pokemon{
-
-namespace {
-
-std::string nature_checker_value_to_string(NatureCheckerValue value) {
-    const char* names[] = {
-        "UnableToDetect",
-        "Any",
-        "Adamant",
-        "Bashful",
-        "Bold",
-        "Brave",
-        "Calm",
-        "Careful",
-        "Docile",
-        "Gentle",
-        "Hardy",
-        "Hasty",
-        "Impish",
-        "Jolly",
-        "Lax",
-        "Lonely",
-        "Mild",
-        "Modest",
-        "Naive",
-        "Naughty",
-        "Quiet",
-        "Quirky",
-        "Rash",
-        "Relaxed",
-        "Sassy",
-        "Serious",
-        "Timid",
-        "Last"
-    };
-
-    return names[int(value)];
-}
-}
-
-NatureReader::NatureReader(const std::string& json_path)
-    : SmallDictionaryMatcher(json_path)
-{}
-
-OCR::StringMatchResult NatureReader::read_substring(
-    Logger& logger,
-    Language language,
-    const ImageViewRGB32& image,
-    const std::vector<OCR::TextColorRange>& text_color_ranges,
-    double min_text_ratio, double max_text_ratio
-) const{
-    return match_substring_from_image_multifiltered(
-        &logger, language, image, text_color_ranges,
-        MAX_LOG10P, MAX_LOG10P_SPREAD,
-        min_text_ratio, max_text_ratio
-    );
-}
-
-std::string NatureReader::Results::to_string() const {
-    return  "Nature: " + nature_checker_value_to_string(nature);
-}
-
-
-}
-}
+/*  Nature Reader
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonTools/OCR/OCR_Routines.h"
+#include "Pokemon_NatureReader.h"
+
+namespace PokemonAutomation{
+namespace Pokemon{
+
+NatureReader::NatureReader(const std::string& json_path)
+    : SmallDictionaryMatcher(json_path)
+{}
+
+OCR::StringMatchResult NatureReader::read_substring(
+    Logger& logger,
+    Language language,
+    const ImageViewRGB32& image,
+    const std::vector<OCR::TextColorRange>& text_color_ranges,
+    double min_text_ratio, double max_text_ratio
+) const{
+    return match_substring_from_image_multifiltered(
+        &logger, language, image, text_color_ranges,
+        MAX_LOG10P, MAX_LOG10P_SPREAD,
+        min_text_ratio, max_text_ratio
+    );
+}
+
+std::string NatureReader::Results::to_string() const{
+    return "Nature: " + NATURE_CHECKER_VALUE_STRINGS().get_string(nature);
+}
+
+
+}
+}
diff --git a/SerialPrograms/Source/Pokemon/Inference/Pokemon_NatureReader.h b/SerialPrograms/Source/Pokemon/Inference/Pokemon_NatureReader.h
index e3b8dbf627..4d5cbd4673 100644
--- a/SerialPrograms/Source/Pokemon/Inference/Pokemon_NatureReader.h
+++ b/SerialPrograms/Source/Pokemon/Inference/Pokemon_NatureReader.h
@@ -1,42 +1,41 @@
-/*  Nature Reader
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_Pokemon_NatureReader_H
-#define PokemonAutomation_Pokemon_NatureReader_H
-
-#include "CommonFramework/Logging/Logger.h"
-#include "CommonFramework/OCR/OCR_SmallDictionaryMatcher.h"
-#include "Pokemon/Pokemon_NatureChecker.h"
-
-namespace PokemonAutomation {
-namespace Pokemon {
-
-class NatureReader : public OCR::SmallDictionaryMatcher {
-public:
-    static constexpr double MAX_LOG10P = -1.40;
-    static constexpr double MAX_LOG10P_SPREAD = 0.50;
-
-public:
-    struct Results {
-        NatureCheckerValue nature = NatureCheckerValue::UnableToDetect;
-        std::string to_string() const;
-    };
-
-    NatureReader(const std::string& json_path);
-
-    OCR::StringMatchResult read_substring(
-        Logger& logger,
-        Language language,
-        const ImageViewRGB32& image,
-        const std::vector<OCR::TextColorRange>& text_color_ranges,
-        double min_text_ratio = 0.01, double max_text_ratio = 0.50
-    ) const;
-
-};
-
-}
-}
-#endif
+/*  Nature Reader
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Pokemon_NatureReader_H
+#define PokemonAutomation_Pokemon_NatureReader_H
+
+#include "CommonTools/OCR/OCR_SmallDictionaryMatcher.h"
+#include "Pokemon/Pokemon_NatureChecker.h"
+
+namespace PokemonAutomation{
+namespace Pokemon{
+
+class NatureReader : public OCR::SmallDictionaryMatcher{
+public:
+    static constexpr double MAX_LOG10P = -1.40;
+    static constexpr double MAX_LOG10P_SPREAD = 0.50;
+
+public:
+    struct Results{
+        NatureCheckerValue nature = NatureCheckerValue::UnableToDetect;
+        std::string to_string() const;
+    };
+
+    NatureReader(const std::string& json_path);
+
+    OCR::StringMatchResult read_substring(
+        Logger& logger,
+        Language language,
+        const ImageViewRGB32& image,
+        const std::vector<OCR::TextColorRange>& text_color_ranges,
+        double min_text_ratio = 0.01, double max_text_ratio = 0.50
+    ) const;
+
+};
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Pokemon/Inference/Pokemon_PokeballNameReader.cpp b/SerialPrograms/Source/Pokemon/Inference/Pokemon_PokeballNameReader.cpp
index 7dedaa88a1..9f0ef2ffa6 100644
--- a/SerialPrograms/Source/Pokemon/Inference/Pokemon_PokeballNameReader.cpp
+++ b/SerialPrograms/Source/Pokemon/Inference/Pokemon_PokeballNameReader.cpp
@@ -1,10 +1,9 @@
 /*  Pokeball Name Reader
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include "CommonFramework/OCR/OCR_RawOCR.h"
 #include "Pokemon_PokeballNameReader.h"
 
 namespace PokemonAutomation{
diff --git a/SerialPrograms/Source/Pokemon/Inference/Pokemon_PokeballNameReader.h b/SerialPrograms/Source/Pokemon/Inference/Pokemon_PokeballNameReader.h
index 4b6aa1f5b7..9b9593d99b 100644
--- a/SerialPrograms/Source/Pokemon/Inference/Pokemon_PokeballNameReader.h
+++ b/SerialPrograms/Source/Pokemon/Inference/Pokemon_PokeballNameReader.h
@@ -1,13 +1,13 @@
 /*  Pokeball Name Reader
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifndef PokemonAutomation_Pokemon_PokeballNameReader_H
 #define PokemonAutomation_Pokemon_PokeballNameReader_H
 
-#include "CommonFramework/OCR/OCR_SmallDictionaryMatcher.h"
+#include "CommonTools/OCR/OCR_SmallDictionaryMatcher.h"
 
 namespace PokemonAutomation{
 namespace Pokemon{
diff --git a/SerialPrograms/Source/Pokemon/Inference/Pokemon_ReadHpBar.cpp b/SerialPrograms/Source/Pokemon/Inference/Pokemon_ReadHpBar.cpp
index 8905ce67b1..810bd27f9e 100644
--- a/SerialPrograms/Source/Pokemon/Inference/Pokemon_ReadHpBar.cpp
+++ b/SerialPrograms/Source/Pokemon/Inference/Pokemon_ReadHpBar.cpp
@@ -1,14 +1,18 @@
 /*  Read HP Bar
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include "Common/Cpp/AbstractLogger.h"
+#include "Common/Cpp/Logging/AbstractLogger.h"
 #include "CommonFramework/ImageTools/ImageBoxes.h"
 #include "CommonFramework/ImageTools/ImageStats.h"
 #include "Pokemon_ReadHpBar.h"
 
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
 namespace PokemonAutomation{
 namespace Pokemon{
 
@@ -18,6 +22,10 @@ double read_hp_bar_internal(const ImageViewRGB32& image){
     size_t height = image.height();
     size_t area = width * height;
 
+//    static int i = 0;
+//    image.save("test-" + std::to_string(++i) + ".png");
+//    cout << "start: " << i << endl;
+
     ImageStats stats;
     double bar = 0.5;
     for (size_t c = 0;; c++){
@@ -26,7 +34,8 @@ double read_hp_bar_internal(const ImageViewRGB32& image){
         max_color = std::max(max_color, stats.average.r);
         max_color = std::max(max_color, stats.average.g);
         max_color = std::max(max_color, stats.average.b);
-        if (max_color > 128 && stats.stddev.sum() < 50){
+//        cout << "max_color: " << max_color << ", stddev: " << stats.stddev.sum() << endl;
+        if (max_color > 128 && stats.stddev.sum() < 120){
             break;
         }
         bar *= 0.5;
@@ -39,6 +48,7 @@ double read_hp_bar_internal(const ImageViewRGB32& image){
                 : -1;
         }
     }
+//    cout << "end: " << i << endl;
 
     Color color = stats.average.round();
     int bar_R = color.red();
@@ -73,8 +83,10 @@ double read_hp_bar(const ImageViewRGB32& image){
 
 double read_hp_bar(Logger& logger, const ImageViewRGB32& image){
     double hp = read_hp_bar(image);
+
 //    static int c = 0;
 //    image.save("test-" + std::to_string(c++) + ".png");
+
     if (hp <= 0){
         logger.log("HP Read: ?", COLOR_RED);
     }else{
diff --git a/SerialPrograms/Source/Pokemon/Inference/Pokemon_ReadHpBar.h b/SerialPrograms/Source/Pokemon/Inference/Pokemon_ReadHpBar.h
index d0a095348d..70cb9e9dc0 100644
--- a/SerialPrograms/Source/Pokemon/Inference/Pokemon_ReadHpBar.h
+++ b/SerialPrograms/Source/Pokemon/Inference/Pokemon_ReadHpBar.h
@@ -1,6 +1,6 @@
 /*  Read HP Bar
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/Pokemon/Inference/Pokemon_TrainIVCheckerOCR.cpp b/SerialPrograms/Source/Pokemon/Inference/Pokemon_TrainIVCheckerOCR.cpp
index 2d962ff9bb..012e9d2033 100644
--- a/SerialPrograms/Source/Pokemon/Inference/Pokemon_TrainIVCheckerOCR.cpp
+++ b/SerialPrograms/Source/Pokemon/Inference/Pokemon_TrainIVCheckerOCR.cpp
@@ -1,15 +1,14 @@
 /*  Train IV Checker OCR Data
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include "Common/Cpp/Concurrency/ParallelTaskRunner.h"
-#include "CommonFramework/Globals.h"
-#include "CommonFramework/OCR/OCR_TrainingTools.h"
+#include <thread>
 #include "CommonFramework/Tools/ProgramEnvironment.h"
+#include "CommonTools/OCR/OCR_TrainingTools.h"
 #include "Pokemon/Pokemon_Strings.h"
-#include "Pokemon_IVCheckerReader.h"
+#include "Pokemon_IvJudgeReader.h"
 #include "Pokemon_TrainIVCheckerOCR.h"
 
 namespace PokemonAutomation{
@@ -21,7 +20,8 @@ TrainIVCheckerOCR_Descriptor::TrainIVCheckerOCR_Descriptor()
         "PokemonSwSh:TrainIVCheckerOCR",
         STRING_POKEMON, "Train IV Checker OCR",
         "",
-        "Train IV Checker OCR"
+        "Train IV Checker OCR",
+        PanelQualityStanding::DEVELOPER
     )
 {}
 
@@ -31,13 +31,13 @@ TrainIVCheckerOCR::TrainIVCheckerOCR()
     : DIRECTORY(
         false,
         "<b>Training Data Directory:</b> (Relative to \"TrainingData/\")",
-        LockWhileRunning::LOCKED,
+        LockMode::LOCK_WHILE_RUNNING,
         "IVCheckerOCR/",
         "IVCheckerOCR/"
     )
     , THREADS(
         "<b>Worker Threads:</b>",
-        LockWhileRunning::LOCKED,
+        LockMode::LOCK_WHILE_RUNNING,
         std::thread::hardware_concurrency()
     )
 {
@@ -55,8 +55,8 @@ void TrainIVCheckerOCR::program(ProgramEnvironment& env, CancellableScope& scope
         "IVCheckerOCR.json",
         MODE == TrainOCRMode::INCREMENTAL, THREADS,
         OCR::BLACK_TEXT_FILTERS(),
-        IVCheckerReader::MAX_LOG10P,
-        IVCheckerReader::MAX_LOG10P_SPREAD
+        IvJudgeReader::MAX_LOG10P,
+        IvJudgeReader::MAX_LOG10P_SPREAD
     );
 }
 
diff --git a/SerialPrograms/Source/Pokemon/Inference/Pokemon_TrainIVCheckerOCR.h b/SerialPrograms/Source/Pokemon/Inference/Pokemon_TrainIVCheckerOCR.h
index a975e0f46f..d9adc9d4a5 100644
--- a/SerialPrograms/Source/Pokemon/Inference/Pokemon_TrainIVCheckerOCR.h
+++ b/SerialPrograms/Source/Pokemon/Inference/Pokemon_TrainIVCheckerOCR.h
@@ -1,6 +1,6 @@
 /*  Train IV Checker OCR Data
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -9,8 +9,7 @@
 
 #include "Common/Cpp/Options/SimpleIntegerOption.h"
 #include "Common/Cpp/Options/StringOption.h"
-#include "Common/Cpp/Options/EnumDropdownOption.h"
-#include "CommonFramework/Options/TrainOCRModeOption.h"
+#include "CommonTools/Options/TrainOCRModeOption.h"
 #include "ComputerPrograms/ComputerProgram.h"
 
 namespace PokemonAutomation{
@@ -26,6 +25,7 @@ class TrainIVCheckerOCR_Descriptor : public ComputerProgramDescriptor{
 
 class TrainIVCheckerOCR : public ComputerProgramInstance{
 public:
+    using Descriptor = TrainIVCheckerOCR_Descriptor;
     TrainIVCheckerOCR();
 
     virtual void program(ProgramEnvironment& env, CancellableScope& scope) override;
diff --git a/SerialPrograms/Source/Pokemon/Inference/Pokemon_TrainPokemonOCR.cpp b/SerialPrograms/Source/Pokemon/Inference/Pokemon_TrainPokemonOCR.cpp
index 139ccb955c..9e2854b761 100644
--- a/SerialPrograms/Source/Pokemon/Inference/Pokemon_TrainPokemonOCR.cpp
+++ b/SerialPrograms/Source/Pokemon/Inference/Pokemon_TrainPokemonOCR.cpp
@@ -1,15 +1,14 @@
 /*  Train Pokemon Name OCR
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
+#include <thread>
 #include "Common/Cpp/Json/JsonArray.h"
 #include "Common/Cpp/Json/JsonObject.h"
-#include "Common/Cpp/Concurrency/ParallelTaskRunner.h"
-#include "CommonFramework/Globals.h"
-#include "CommonFramework/OCR/OCR_TrainingTools.h"
 #include "CommonFramework/Tools/ProgramEnvironment.h"
+#include "CommonTools/OCR/OCR_TrainingTools.h"
 #include "Pokemon/Pokemon_Strings.h"
 #include "Pokemon/Resources/Pokemon_PokemonNames.h"
 #include "Pokemon/Resources/Pokemon_PokemonSlugs.h"
@@ -25,7 +24,8 @@ TrainPokemonOCR_Descriptor::TrainPokemonOCR_Descriptor()
         "PokemonSwSh:TrainPokemonNameOCR",
         STRING_POKEMON, "Train " + STRING_POKEMON + " Name OCR",
         "",
-        "Train " + STRING_POKEMON + " Name OCR"
+        "Train " + STRING_POKEMON + " Name OCR",
+        PanelQualityStanding::DEVELOPER
     )
 {}
 
@@ -35,13 +35,13 @@ TrainPokemonOCR::TrainPokemonOCR()
     : DIRECTORY(
         false,
         "<b>Training Data Directory:</b> (Relative to \"TrainingData/\")",
-        LockWhileRunning::LOCKED,
+        LockMode::LOCK_WHILE_RUNNING,
         "PokemonNameOCR/",
         "PokemonNameOCR/"
     )
     , THREADS(
         "<b>Worker Threads:</b>",
-        LockWhileRunning::LOCKED,
+        LockMode::LOCK_WHILE_RUNNING,
         std::thread::hardware_concurrency()
     )
 {
diff --git a/SerialPrograms/Source/Pokemon/Inference/Pokemon_TrainPokemonOCR.h b/SerialPrograms/Source/Pokemon/Inference/Pokemon_TrainPokemonOCR.h
index 92e0bf8d09..df0e408eb5 100644
--- a/SerialPrograms/Source/Pokemon/Inference/Pokemon_TrainPokemonOCR.h
+++ b/SerialPrograms/Source/Pokemon/Inference/Pokemon_TrainPokemonOCR.h
@@ -1,6 +1,6 @@
 /*  Train Pokemon Name OCR
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -9,8 +9,7 @@
 
 #include "Common/Cpp/Options/SimpleIntegerOption.h"
 #include "Common/Cpp/Options/StringOption.h"
-#include "Common/Cpp/Options/EnumDropdownOption.h"
-#include "CommonFramework/Options/TrainOCRModeOption.h"
+#include "CommonTools/Options/TrainOCRModeOption.h"
 #include "ComputerPrograms/ComputerProgram.h"
 
 namespace PokemonAutomation{
@@ -26,6 +25,7 @@ class TrainPokemonOCR_Descriptor : public ComputerProgramDescriptor{
 
 class TrainPokemonOCR : public ComputerProgramInstance{
 public:
+    using Descriptor = TrainPokemonOCR_Descriptor;
     TrainPokemonOCR();
 
     virtual void program(ProgramEnvironment& env, CancellableScope& scope) override;
diff --git a/SerialPrograms/Source/Pokemon/Inference/Pokemon_TypeReader.cpp b/SerialPrograms/Source/Pokemon/Inference/Pokemon_TypeReader.cpp
new file mode 100644
index 0000000000..30d49c095d
--- /dev/null
+++ b/SerialPrograms/Source/Pokemon/Inference/Pokemon_TypeReader.cpp
@@ -0,0 +1,423 @@
+/*  Type Reader
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <algorithm>
+#include "Kernels/Waterfill/Kernels_Waterfill.h"
+#include "CommonFramework/GlobalAutoPaths.h"
+#include "CommonFramework/ImageTools/ImageStats.h"
+#include "CommonTools/ImageMatch/ExactImageMatcher.h"
+#include "CommonTools/Images/ImageFilter.h"
+#include "CommonTools/Images/BinaryImage_FilterRgb32.h"
+
+#include "Pokemon_TypeReader.h"
+
+namespace PokemonAutomation {
+namespace Pokemon {
+
+using namespace Kernels;
+using namespace Kernels::Waterfill;
+
+class TypeSprite {
+public:
+    TypeSprite(const std::string& slug, const std::string& resource_location)
+        : m_slug(slug)
+    {
+        ImageRGB32 sprite(RESOURCE_PATH() + resource_location);
+
+        sprite = filter_rgb32_range(
+            sprite,
+            0xff000000, 0xffffffff,
+            Color(0), false
+        );
+
+        PackedBinaryMatrix matrix = compress_rgb32_to_binary_min(sprite, 224, 224, 224);
+        std::vector<WaterfillObject> objects = find_objects_inplace(matrix, 10);
+
+        WaterfillObject object;
+        for (const WaterfillObject& item : objects){
+            object.merge_assume_no_overlap(item);
+        }
+
+        m_aspect_ratio = object.aspect_ratio();
+        m_matcher = std::make_unique<ImageMatch::WeightedExactImageMatcher>(
+            sprite.sub_image(object.min_x, object.min_y, object.width(), object.height()).copy(),
+            ImageMatch::WeightedExactImageMatcher::InverseStddevWeight{ 1, 64 }
+        );
+    }
+
+    const std::string& slug() const { return m_slug; }
+    double aspect_ratio() const { return m_aspect_ratio; }
+    const ImageMatch::WeightedExactImageMatcher& matcher() const { return *m_matcher; }
+
+private:
+    std::string m_slug;
+    double m_aspect_ratio;
+    std::unique_ptr<ImageMatch::WeightedExactImageMatcher> m_matcher;
+};
+
+struct Gen8TypeSpriteDatabase {
+    std::map<PokemonType, TypeSprite> m_type_map;
+
+    static Gen8TypeSpriteDatabase& instance(){
+        static Gen8TypeSpriteDatabase data;
+        return data;
+    }
+
+    Gen8TypeSpriteDatabase(){
+        for (const auto& item : POKEMON_TYPE_SLUGS()){
+            if (item.first == PokemonType::NONE){
+                continue;
+            }
+            m_type_map.emplace(item.first, TypeSprite(item.second, "Pokemon/Types/Gen8/" + item.second + ".png"));
+        }
+    }
+};
+
+struct Gen9TypeSpriteDatabase {
+    std::map<PokemonType, TypeSprite> m_type_map;
+
+    static Gen9TypeSpriteDatabase& instance(){
+        static Gen9TypeSpriteDatabase data;
+        return data;
+    }
+
+    Gen9TypeSpriteDatabase(){
+        for (const auto& item : POKEMON_TYPE_SLUGS()){
+            if (item.first == PokemonType::NONE){
+                continue;
+            }
+            m_type_map.emplace(item.first, TypeSprite(item.second, "Pokemon/Types/Gen9/" + item.second + ".png"));
+        }
+    }
+};
+
+size_t distance_sqr(const ImagePixelBox& a, const ImagePixelBox& b){
+    bool overlap_x = a.min_x <= b.max_x && b.min_x <= a.max_x;
+    bool overlap_y = a.min_y <= b.max_y && b.min_y <= a.max_y;
+    if (overlap_x && overlap_y){
+        return 0;
+    }
+
+    size_t dist_x = 0;
+    if (!overlap_x){
+        dist_x = a.max_x < b.min_x
+            ? b.min_x - a.max_x
+            : a.min_x - b.max_x;
+    }
+
+    size_t dist_y = 0;
+    if (!overlap_y){
+        dist_y = a.max_y < b.min_y
+            ? b.min_y - a.max_y
+            : a.min_y - b.max_y;
+    }
+
+    return dist_x * dist_x + dist_y * dist_y;
+}
+
+bool image_validation(const ImageViewRGB32& image){
+    size_t width = image.width();
+    size_t height = image.height();
+    if (width * height < 100){
+        return false;
+    }
+    if (width > 2 * height){
+        return false;
+    }
+    if (height > 2 * width){
+        return false;
+    }
+    ImageStats stats = image_stats(image);
+    if (stats.stddev.sum() < 50){
+        //        if (print){
+        //            cout << "stats.stddev.sum() = " << stats.stddev.sum() << endl;
+        //        }
+        return false;
+    }
+
+    return true;
+}
+
+std::pair<double, PokemonType> match_type_symbol(const ImageViewRGB32& image, PokemonTypeGeneration generation){
+
+    if (!image_validation(image)){
+        return { 1.0, PokemonType::NONE };
+    }
+
+    size_t width = image.width();
+    size_t height = image.height();
+
+    double aspect_ratio = (double)width / height;
+
+    //    static int c = 0;
+    //    image.save("test-" + std::to_string(threshold) + "-" + std::to_string(c++) + ".png");
+
+    //    std::map<double, PokemonType> rank;
+
+    const std::map<PokemonType, TypeSprite>* type_sprite_map;
+
+    switch (generation){
+    case PokemonAutomation::Pokemon::PokemonTypeGeneration::GEN8:
+        type_sprite_map = &Gen8TypeSpriteDatabase::instance().m_type_map;
+        break;
+    case PokemonAutomation::Pokemon::PokemonTypeGeneration::GEN9:
+        type_sprite_map = &Gen9TypeSpriteDatabase::instance().m_type_map;
+        break;
+    default:
+        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Invalid enum.");
+    }
+
+    double best_score = 0.45;
+    PokemonType best_type = PokemonType::NONE;
+    for (const auto& item : *type_sprite_map){
+        //        if (threshold != 700 || id != 55){
+        //            continue;
+        //        }
+
+        double expected_aspect_ratio = item.second.aspect_ratio();
+        double ratio = aspect_ratio / expected_aspect_ratio;
+#if 0
+        if (print){
+            cout << item.second.slug()
+                << " : expected = " << expected_aspect_ratio
+                << ", actual = " << aspect_ratio
+                << ", ratio = " << ratio << endl;
+        }
+#endif
+        if (std::abs(ratio - 1) > 0.2){
+            continue;
+        }
+
+        double rmsd_alpha = item.second.matcher().diff(image);
+
+        //        item.second.matcher().m_image.save("sprite.png");
+        //        if (print){
+        //            cout << item.second.slug() << ": " << rmsd_alpha << endl;
+        //        }
+
+#if 0
+        //  Handicap fairy due to white and pink being too similar in color and
+        //  false positiving on the background.
+        if (item.first == PokemonType::FAIRY){
+            rmsd_ratio *= 1.5;
+        }
+
+        //  Bonus for dark because or large contrast.
+        if (item.first == PokemonType::DARK){
+            rmsd_ratio *= 0.8;
+        }
+#endif
+
+        if (best_score > rmsd_alpha){
+            best_score = rmsd_alpha;
+            best_type = item.first;
+            //            cout << item.second.slug() << ": " << stats.stddev << endl;
+        }
+    }
+
+    //    if (best_type != PokemonType::NONE){
+    //        cout << get_type_slug(best_type) << ": " << best_score << endl;
+    //    }
+    return { best_score, best_type };
+}
+
+void find_type_symbol_candidates(
+    std::multimap<double, std::pair<PokemonType, ImagePixelBox>>& candidates,
+    const ImageViewPlanar32& original_screen,
+    const ImageViewRGB32& image,
+    PackedBinaryMatrix& matrix, 
+    double max_area_ratio,
+    PokemonTypeGeneration generation
+){
+    size_t max_area = (size_t)(image.width() * image.height() * max_area_ratio);
+    std::vector<WaterfillObject> objects = find_objects_inplace(
+        matrix,
+        (size_t)(20. * original_screen.total_pixels() / (1920*1080))
+    );
+
+//    static int index = 0;
+
+    std::map<size_t, WaterfillObject> objmap;
+    for (size_t c = 0; c < objects.size(); c++){
+        if (objects[c].area > max_area){
+            continue;
+        }
+        objmap[c] = objects[c];
+
+#if 0
+        extract_box_reference(image, ImagePixelBox(objects[c])).save("test-" + std::to_string(index++) + ".png");
+#endif
+    }
+
+//    cout << "begin = " << objmap.size() << endl;
+
+    //  Merge nearby objects.
+    bool changed;
+    do{
+        changed = false;
+        for (auto iter0 = objmap.begin(); iter0 != objmap.end(); ++iter0){
+            for (auto iter1 = objmap.begin(); iter1 != objmap.end();){
+                if (iter0->first >= iter1->first){
+                    ++iter1;
+                    continue;
+                }
+                const WaterfillObject& obj0 = iter0->second;
+                const WaterfillObject& obj1 = iter1->second;
+                size_t distance = distance_sqr(
+                    ImagePixelBox(obj0.min_x, obj0.min_y, obj0.max_x, obj0.max_y),
+                    ImagePixelBox(obj1.min_x, obj1.min_y, obj1.max_x, obj1.max_y)
+                );
+                if (distance < 5*5){
+                    iter0->second.merge_assume_no_overlap(iter1->second);
+                    iter1 = objmap.erase(iter1);
+                    changed = true;
+                }else{
+                    ++iter1;
+                }
+            }
+        }
+    }while (changed);
+
+//    cout << "merged = " << objmap.size() << endl;
+
+    //  Identify objects.
+    for (const auto& item : objmap){
+        ImageViewRGB32 img = extract_box_reference(image, item.second);
+
+//        print = index == 137;
+//        img.save("test-" + std::to_string(index++) + ".png");
+
+        std::pair<double, PokemonType> result = match_type_symbol(img, generation);
+//        cout << "result = " << POKEMON_TYPE_SLUGS().get_string(result.second) << ": " << result.first << endl;
+        if (result.second != PokemonType::NONE){
+            const WaterfillObject& obj = item.second;
+            candidates.emplace(
+                result.first,
+                std::pair<PokemonType, ImagePixelBox>(
+                    result.second,
+                    ImagePixelBox(obj.min_x, obj.min_y, obj.max_x, obj.max_y)
+                )
+            );
+        }
+    }
+
+//    cout << "candidates = " << candidates.size() << endl;
+}
+
+std::multimap<double, std::pair<PokemonType, ImagePixelBox>> find_type_symbols(
+    const ImageViewPlanar32& original_screen,
+    const ImageViewRGB32& image, 
+    double max_area_ratio,
+    PokemonTypeGeneration generation
+){
+    std::multimap<double, std::pair<PokemonType, ImagePixelBox>> candidates;
+
+    {
+        std::vector<PackedBinaryMatrix> matrices = compress_rgb32_to_binary_range(
+            image,
+            {
+                {0xff808060, 0xffffffff},
+                {0xffa0a060, 0xffffffff},
+                {0xff606060, 0xffffffff},
+                {0xff707070, 0xffffffff},
+                {0xff808080, 0xffffffff},
+                {0xff909090, 0xffffffff},
+                {0xffa0a0a0, 0xffffffff},
+                {0xffb0b0b0, 0xffffffff},
+                {0xffc0c0c0, 0xffffffff},
+                {0xffd0d0d0, 0xffffffff},
+                {0xffe0e0e0, 0xffffffff},
+            }
+            );
+        for (PackedBinaryMatrix& matrix : matrices){
+            find_type_symbol_candidates(candidates, original_screen, image, matrix, max_area_ratio, generation);
+        }
+    }
+
+    //    cout << "-------------" << endl;
+
+    std::multimap<double, std::pair<PokemonType, ImagePixelBox>> filtered;
+    for (const auto& candidate : candidates){
+        //        cout << POKEMON_TYPE_SLUGS().get_string(candidate.second.first) << ": " << candidate.first << endl;
+        //        hits.emplace_back(overlay, translate_to_parent(screen, box, candidate.second.second.box), COLOR_GREEN);
+
+        bool is_dupe = false;
+        for (const auto& item : filtered){
+            if (distance_sqr(candidate.second.second, item.second.second) == 0){
+                is_dupe = true;
+                break;
+            }
+        }
+        if (!is_dupe){
+            filtered.emplace(candidate);
+        }
+    }
+
+#if 0
+    static int c = 0;
+    for (const auto& item : filtered){
+        //        cout << get_type_slug(item.second.first) << ": " << item.first << " - [" << item.second.second.center_x() << "," << item.second.second.center_y() << "]" << endl;
+        const ImagePixelBox& box = item.second.second;
+        ImageViewRGB32 img = image.sub_image(
+            box.min_x, box.min_y,
+            box.width(), box.height()
+        );
+        img.save("test-" + std::to_string(c++) + ".png");
+    }
+#endif
+
+    return filtered;
+}
+
+std::pair<PokemonType, PokemonType> read_pokemon_types(
+    const ImageViewRGB32& original_screen,
+    const ImageFloatBox& box,
+    PokemonTypeGeneration generation
+){
+
+    ImageViewRGB32 image = extract_box_reference(original_screen, box);
+
+    std::multimap<double, std::pair<PokemonType, ImagePixelBox>> filtered = find_type_symbols(
+        original_screen,
+        image,
+        0.20,
+        generation
+    );
+
+    //  Re-sort by screen position (left-to-right, top-to-bottom) so that primary/secondary
+    //  assignment is stable regardless of which type was detected with higher confidence.
+    std::vector<std::pair<PokemonType, ImagePixelBox>> sorted;
+    sorted.reserve(filtered.size());
+    for (const auto& item : filtered){
+        sorted.emplace_back(item.second);
+    }
+    std::sort(sorted.begin(), sorted.end(), [](const auto& a, const auto& b){
+        size_t height = a.second.max_y - a.second.min_y;
+        size_t diff_y = a.second.min_y > b.second.min_y
+            ? a.second.min_y - b.second.min_y
+            : b.second.min_y - a.second.min_y;
+        if (diff_y > height){
+            return a.second.min_y < b.second.min_y;
+        }
+        return a.second.min_x < b.second.min_x;
+        });
+
+    std::pair<PokemonType, PokemonType> result{ PokemonType::NONE, PokemonType::NONE };
+    for (const auto& item : sorted){
+        PokemonType type = item.first;
+        if (result.first == PokemonType::NONE){
+            result.first = type;
+        }
+        else if (type != result.first){
+            result.second = type;
+            break;
+        }
+    }
+    return result;
+}
+
+}
+}
diff --git a/SerialPrograms/Source/Pokemon/Inference/Pokemon_TypeReader.h b/SerialPrograms/Source/Pokemon/Inference/Pokemon_TypeReader.h
new file mode 100644
index 0000000000..bdc48e00e1
--- /dev/null
+++ b/SerialPrograms/Source/Pokemon/Inference/Pokemon_TypeReader.h
@@ -0,0 +1,43 @@
+/*  Type Reader
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Pokemon_TypeReader_H
+#define PokemonAutomation_Pokemon_TypeReader_H
+
+#include <map>
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "Pokemon/Pokemon_Types.h"
+
+namespace PokemonAutomation {
+namespace Pokemon {
+
+// The style of type symbols.
+// GEN8: SWSH, Needs testing: LGPE
+// GEN9: SV, LZA, HOME(Currently), Needs testing: Champions, LA, BDSP
+enum class PokemonTypeGeneration{
+    GEN8,
+    GEN9,
+};
+
+//  Find all type symbols inside the image.
+std::multimap<double, std::pair<PokemonType, ImagePixelBox>> find_type_symbols(
+    const ImageViewPlanar32& original_screen,
+    const ImageViewRGB32& image, 
+    double max_area_ratio,
+    PokemonTypeGeneration generation
+);
+
+// Reads the types of a Pokemon. Second type will be PokemonType::NONE if the Pokemon is single-type
+std::pair<PokemonType, PokemonType> read_pokemon_types(
+    const ImageViewRGB32& original_screen,
+    const ImageFloatBox& box, 
+    PokemonTypeGeneration generation
+);
+    
+}
+}
+#endif
\ No newline at end of file
diff --git a/SerialPrograms/Source/Pokemon/Options/Pokemon_BoxSortingTable.cpp b/SerialPrograms/Source/Pokemon/Options/Pokemon_BoxSortingTable.cpp
new file mode 100644
index 0000000000..0afeed4354
--- /dev/null
+++ b/SerialPrograms/Source/Pokemon/Options/Pokemon_BoxSortingTable.cpp
@@ -0,0 +1,129 @@
+/*  Box Sorter Table
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Pokemon_BoxSortingTable.h"
+
+namespace PokemonAutomation{
+namespace Pokemon{
+
+
+const EnumDropdownDatabase<SortingRuleType>& SortingRuleType_Database(){
+    static const EnumDropdownDatabase<SortingRuleType> database({
+        {SortingRuleType::DexNo,     "dex",     "Dex Number"},
+        {SortingRuleType::Level,     "level",   "Level"},
+        {SortingRuleType::Shiny,    "shiny",    "Shiny"},
+        {SortingRuleType::Gigantamax,    "gigantamax",    "Gigantamax"},
+        {SortingRuleType::Alpha, "alpha", "Alpha"},
+        {SortingRuleType::Ball_Slug,    "ball_slug",    "Ball Type"},
+        {SortingRuleType::Gender,    "gender",    "Gender (Male, Female, Genderless)"},
+        {SortingRuleType::Nature, "nature", "Nature"},
+        {SortingRuleType::Ability, "ability", "Ability"},
+        {SortingRuleType::Origin_Mark, "origin_mark", "Origin Mark"},
+        {SortingRuleType::Language_of_Origin, "language_of_origin", "Language of Origin"},
+        //{SortingRuleType::Type,    "type",    "Types"}, Mainly used for testing. The order of the PokemonType Enum is not the most intuitive for sorting.
+    });
+    return database;
+}
+
+
+
+BoxSortingRow::BoxSortingRow(EditableTableOption& parent_table)
+    : EditableTableRow(parent_table)
+    , sort_type(
+        static_cast<BoxSortingTable&>(parent_table).database(),
+        LockMode::LOCK_WHILE_RUNNING,
+        SortingRuleType::DexNo
+    )
+    , reverse(LockMode::LOCK_WHILE_RUNNING, false)
+{
+    PA_ADD_OPTION(sort_type);
+    PA_ADD_OPTION(reverse);
+}
+std::unique_ptr<EditableTableRow> BoxSortingRow::clone() const{
+    std::unique_ptr<BoxSortingRow> ret(new BoxSortingRow(parent()));
+    ret->sort_type.set_value(sort_type.current_value());
+    ret->reverse = reverse.current_value();
+    return ret;
+}
+
+
+BoxSortingTable::BoxSortingTable(std::string label)
+    : BoxSortingTableDatabaseHelper(nullptr)
+    , EditableTableOption_t<BoxSortingRow>(
+        std::move(label),
+        LockMode::LOCK_WHILE_RUNNING,
+        make_defaults()
+    )
+{}
+
+BoxSortingTable::BoxSortingTable(std::string label, const std::vector<SortingRuleType>& allowed_rules)
+    : BoxSortingTableDatabaseHelper([&allowed_rules](){
+        // Build custom database from allowed rules
+        const EnumDropdownDatabase<SortingRuleType>& full_db = SortingRuleType_Database();
+        auto custom_db = std::make_shared<EnumDropdownDatabase<SortingRuleType>>();
+
+        for (SortingRuleType rule : allowed_rules){
+            const EnumEntry* entry = full_db.find(rule);
+            if (entry != nullptr){
+                custom_db->add(rule, entry->slug, entry->display, entry->enabled);
+            }
+        }
+
+        return custom_db;
+    }())
+    , EditableTableOption_t<BoxSortingRow>(
+        std::move(label),
+        LockMode::LOCK_WHILE_RUNNING,
+        make_defaults()
+    )
+{}
+
+
+std::vector<SortingRule> BoxSortingTable::preferences() const{
+    std::vector<std::unique_ptr<BoxSortingRow>> table = copy_snapshot();
+    std::vector<SortingRule> selections;
+    for (const std::unique_ptr<BoxSortingRow>& row : table){
+        SortingRule selection;
+        selection.sort_type = SortingRuleType(row->sort_type.current_value());
+        selection.reverse = row->reverse.current_value();
+
+        selections.emplace_back(selection);
+    }
+    return selections;
+}
+
+
+
+
+std::vector<std::string> BoxSortingTable::make_header() const{
+    return std::vector<std::string>{
+        "Criteria", "Reverse",
+    };
+}
+
+std::vector<std::unique_ptr<EditableTableRow>> BoxSortingTable::make_defaults(){
+    std::vector<std::unique_ptr<EditableTableRow>> ret;
+    ret.emplace_back(std::make_unique<BoxSortingRow>(*this));
+    return ret;
+}
+
+const EnumDropdownDatabase<SortingRuleType>& BoxSortingTable::database() const{
+    if (m_database){
+        return *m_database;
+    }
+    return SortingRuleType_Database();
+}
+
+
+
+
+
+
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/Pokemon/Options/Pokemon_BoxSortingTable.h b/SerialPrograms/Source/Pokemon/Options/Pokemon_BoxSortingTable.h
new file mode 100644
index 0000000000..bcee817c7b
--- /dev/null
+++ b/SerialPrograms/Source/Pokemon/Options/Pokemon_BoxSortingTable.h
@@ -0,0 +1,83 @@
+/*  Box Sorting Table
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Pokemon_BoxSortingTable_H
+#define PokemonAutomation_Pokemon_BoxSortingTable_H
+
+#include "Common/Cpp/Options/EditableTableOption.h"
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "Common/Cpp/Options/EnumDropdownOption.h"
+
+namespace PokemonAutomation{
+namespace Pokemon{
+
+enum class SortingRuleType
+{
+    DexNo,
+    Shiny,
+    Gigantamax,
+    Alpha,
+    Ball_Slug,
+    Gender,
+    Type,
+    Tera_Type,
+    Origin_Mark,
+    Nature,
+    Language_of_Origin,
+    Ability,
+    Level,
+};
+
+struct SortingRule
+{
+    SortingRuleType sort_type = SortingRuleType::DexNo;
+    bool reverse = false;
+};
+
+class BoxSortingRow : public EditableTableRow{
+public:
+    BoxSortingRow(EditableTableOption& parent_table);
+    virtual std::unique_ptr<EditableTableRow> clone() const;
+
+public:
+    EnumDropdownCell<SortingRuleType> sort_type;
+    BooleanCheckBoxCell reverse;
+};
+
+
+// Helper base class to ensure database is initialized before table construction
+class BoxSortingTableDatabaseHelper{
+protected:
+    BoxSortingTableDatabaseHelper(std::shared_ptr<const EnumDropdownDatabase<SortingRuleType>> db = nullptr)
+        : m_database(std::move(db))
+    {}
+
+    std::shared_ptr<const EnumDropdownDatabase<SortingRuleType>> m_database;
+};
+
+
+class BoxSortingTable : private BoxSortingTableDatabaseHelper, public EditableTableOption_t<BoxSortingRow>{
+public:
+    BoxSortingTable(std::string label);
+    BoxSortingTable(std::string label, const std::vector<SortingRuleType>& allowed_rules);
+
+    std::vector<SortingRule> preferences() const;
+
+    virtual std::vector<std::string> make_header() const;
+
+    std::vector<std::unique_ptr<EditableTableRow>> make_defaults();
+
+    const EnumDropdownDatabase<SortingRuleType>& database() const;
+};
+
+
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Pokemon/Options/Pokemon_EggHatchFilter.cpp b/SerialPrograms/Source/Pokemon/Options/Pokemon_EggHatchFilter.cpp
deleted file mode 100644
index 1b824d673f..0000000000
--- a/SerialPrograms/Source/Pokemon/Options/Pokemon_EggHatchFilter.cpp
+++ /dev/null
@@ -1,193 +0,0 @@
-/*  Egg Hatch Filter
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Compiler.h"
-// #include "PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxGenderDetector.h"
-#include "Pokemon_EggHatchFilter.h"
-
-//#include <iostream>
-//using std::cout;
-//using std::endl;
-
-namespace PokemonAutomation{
-namespace Pokemon{
-
-std::string gender_to_string(EggHatchGenderFilter gender){
-    const char * names[] = {
-        "Any",
-        "Male",
-        "Female",
-        "Genderless",
-    };
-    return names[int(gender)];
-}
-
-
-const EnumDatabase<EggHatchAction>& EggHatchAction_Database(){
-    static const EnumDatabase<EggHatchAction> database({
-        {EggHatchAction::StopProgram,   "stop",     "Stop Program"},
-        {EggHatchAction::Keep,          "keep",     "Keep"},
-//        {EggHatchAction::Release,       "release",  "Release"},
-    });
-    return database;
-}
-const EnumDatabase<EggHatchShinyFilter>& EggHatchShinyFilter_Database(){
-    static const EnumDatabase<EggHatchShinyFilter> database({
-        {EggHatchShinyFilter::Anything, "anything",     "Anything"},
-        {EggHatchShinyFilter::NotShiny, "not-shiny",    "Not Shiny"},
-        {EggHatchShinyFilter::Shiny,    "shiny",        "Shiny"},
-    });
-    return database;
-}
-const EnumDatabase<EggHatchGenderFilter>& EggHatchGenderFilter_Database(){
-    static const EnumDatabase<EggHatchGenderFilter> database({
-        {EggHatchGenderFilter::Any,         "any",          "Any"},
-        {EggHatchGenderFilter::Male,        "male",         "Male"},
-        {EggHatchGenderFilter::Female,      "female",       "Female"},
-//        {EggHatchGenderFilter::Genderless,  "genderless",   "Genderless"},
-    });
-    return database;
-}
-
-EggHatchFilterRow::EggHatchFilterRow()
-    : action(EggHatchAction_Database(), LockWhileRunning::LOCKED, EggHatchAction::Keep)
-    , shiny(EggHatchShinyFilter_Database(), LockWhileRunning::LOCKED, EggHatchShinyFilter::Anything)
-    , gender(EggHatchGenderFilter_Database(), LockWhileRunning::LOCKED, EggHatchGenderFilter::Any)
-    , nature(NatureCheckerFilter_Database(), LockWhileRunning::LOCKED, NatureCheckerFilter::Any)
-    , iv_hp(IVCheckerFilter::Anything)
-    , iv_atk(IVCheckerFilter::Anything)
-    , iv_def(IVCheckerFilter::Anything)
-    , iv_spatk(IVCheckerFilter::Anything)
-    , iv_spdef(IVCheckerFilter::Anything)
-    , iv_speed(IVCheckerFilter::Anything)
-{
-    PA_ADD_OPTION(action);
-    PA_ADD_OPTION(shiny);
-    PA_ADD_OPTION(gender);
-    PA_ADD_OPTION(nature);
-    PA_ADD_OPTION(iv_hp);
-    PA_ADD_OPTION(iv_atk);
-    PA_ADD_OPTION(iv_def);
-    PA_ADD_OPTION(iv_spatk);
-    PA_ADD_OPTION(iv_spdef);
-    PA_ADD_OPTION(iv_speed);
-}
-EggHatchFilterRow::EggHatchFilterRow(EggHatchShinyFilter p_shiny)
-    : EggHatchFilterRow()
-{
-    shiny.set(p_shiny);
-}
-std::unique_ptr<EditableTableRow> EggHatchFilterRow::clone() const{
-    std::unique_ptr<EggHatchFilterRow> ret(new EggHatchFilterRow());
-    ret->action.set(action);
-    ret->shiny.set(shiny);
-    ret->gender.set(gender);
-    ret->nature.set(nature);
-    ret->iv_hp.set(iv_hp);
-    ret->iv_atk.set(iv_atk);
-    ret->iv_def.set(iv_def);
-    ret->iv_spatk.set(iv_spatk);
-    ret->iv_spdef.set(iv_spdef);
-    ret->iv_speed.set(iv_speed);
-    return ret;
-}
-
-
-
-
-
-EggHatchFilterTable::EggHatchFilterTable()
-    : EditableTableOption_t<EggHatchFilterRow>(
-        "<b>Actions Table:</b><br>"
-        "If a hatchling matches one of these filters, the specified action will be performed. "
-        "Otherwise, it will be released. "
-        "If multiple entries apply and have conflicting actions, the program will stop.<br>"
-        "IV checking requires that your right panel be set to the IV Judge and that you have selected the correct game language above.",
-        LockWhileRunning::LOCKED,
-        make_defaults()
-    )
-{}
-std::vector<std::string> EggHatchFilterTable::make_header() const{
-    return std::vector<std::string>{
-        "Action",
-        "Shininess",
-        "Gender",
-        "Nature",
-        "HP",
-        "Attack",
-        "Defense",
-        "Sp. Attack",
-        "Sp. Defense",
-        "Speed",
-    };
-}
-std::vector<std::unique_ptr<EditableTableRow>> EggHatchFilterTable::make_defaults(){
-    std::vector<std::unique_ptr<EditableTableRow>> ret;
-    ret.emplace_back(new EggHatchFilterRow(EggHatchShinyFilter::Shiny));
-    return ret;
-}
-
-EggHatchAction EggHatchFilterTable::get_action(bool shiny, const IVCheckerReader::Results& IVs, EggHatchGenderFilter gender, NatureReader::Results nature) const{
-    EggHatchAction action = EggHatchAction::Release;
-    std::vector<std::unique_ptr<EggHatchFilterRow>> list = copy_snapshot();
-    for (size_t c = 0; c < list.size(); c++){
-        const EggHatchFilterRow& filter = *list[c];
-
-        //  Check the shiny filter.
-        switch (filter.shiny){
-        case EggHatchShinyFilter::Anything:
-            break;
-        case EggHatchShinyFilter::NotShiny:
-            if (shiny){
-                continue;
-            }
-            break;
-        case EggHatchShinyFilter::Shiny:
-            if (!shiny){
-                continue;
-            }
-            break;
-        }
-
-        //  Check all the IV filters.
-        if (!IVChecker_filter_match(filter.iv_hp, IVs.hp)) continue;
-        if (!IVChecker_filter_match(filter.iv_atk, IVs.attack)) continue;
-        if (!IVChecker_filter_match(filter.iv_def, IVs.defense)) continue;
-        if (!IVChecker_filter_match(filter.iv_spatk, IVs.spatk)) continue;
-        if (!IVChecker_filter_match(filter.iv_spdef, IVs.spdef)) continue;
-        if (!IVChecker_filter_match(filter.iv_speed, IVs.speed)) continue;
-
-        EggHatchGenderFilter filter_gender = filter.gender;
-        if (filter_gender != gender && filter_gender != EggHatchGenderFilter::Any){
-            continue;
-        }
-
-        if (!NatureChecker_filter_match(filter.nature, nature.nature)){
-            continue;
-        }
-
-        EggHatchAction filter_action = filter.action;
-
-        //  No action matched so far. Take the current action and continue.
-        if (action == EggHatchAction::Release){
-            action = filter_action;
-            continue;
-        }
-
-        //  Conflicting actions.
-        if (action != filter_action){
-            global_logger_tagged().log("Multiple filters matched with conflicting actions. Stopping program...", COLOR_RED);
-            return EggHatchAction::StopProgram;
-        }
-    }
-    return action;
-}
-
-
-
-
-}
-}
diff --git a/SerialPrograms/Source/Pokemon/Options/Pokemon_EggHatchFilter.h b/SerialPrograms/Source/Pokemon/Options/Pokemon_EggHatchFilter.h
deleted file mode 100644
index 12eb30ae89..0000000000
--- a/SerialPrograms/Source/Pokemon/Options/Pokemon_EggHatchFilter.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/*  Egg Hatch Filter
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_Pokemon_EggHatchFilter_H
-#define PokemonAutomation_Pokemon_EggHatchFilter_H
-
-#include "Common/Cpp/Options/EnumDropdownOption.h"
-#include "Common/Cpp/Options/EditableTableOption.h"
-//#include "Pokemon/Pokemon_IVChecker.h"
-#include "Pokemon/Pokemon_NatureChecker.h"
-#include "Pokemon/Options/Pokemon_IVCheckerOption.h"
-#include "Pokemon/Inference/Pokemon_IVCheckerReader.h"
-#include "Pokemon/Inference/Pokemon_NatureReader.h"
-
-namespace PokemonAutomation{
-namespace Pokemon{
-
-
-enum class EggHatchAction{
-    StopProgram,
-    Keep,
-    Release,
-};
-
-enum class EggHatchShinyFilter{
-    Anything,
-    NotShiny,
-    Shiny,
-};
-
-enum class EggHatchGenderFilter{
-    Any,
-    Male,
-    Female,
-    Genderless
-};
-
-enum class EggHatchNatureFilter {
-    Any,
-    Adamant,
-    Bashful,
-    Bold,
-    Brave,
-    Calm,
-    Careful,
-    Docile,
-    Gentle,
-    Hardy,
-    Hasty,
-    Impish,
-    Jolly,
-    Lax,
-    Lonely,
-    Mild,
-    Modest,
-    Naive,
-    Naughty,
-    Quiet,
-    Quirky,
-    Rash,
-    Relaxed,
-    Sassy,
-    Serious,
-    Timid
-};
-
-std::string gender_to_string(EggHatchGenderFilter gender);
-
-
-class EggHatchFilterRow : public EditableTableRow{
-public:
-    EggHatchFilterRow();
-    EggHatchFilterRow(EggHatchShinyFilter p_shiny);
-    virtual std::unique_ptr<EditableTableRow> clone() const override;
-
-public:
-    EnumDropdownCell<EggHatchAction> action;
-    EnumDropdownCell<EggHatchShinyFilter> shiny;
-    EnumDropdownCell<EggHatchGenderFilter> gender;
-    EnumDropdownCell<NatureCheckerFilter> nature;
-    IVCheckerFilterCell iv_hp;
-    IVCheckerFilterCell iv_atk;
-    IVCheckerFilterCell iv_def;
-    IVCheckerFilterCell iv_spatk;
-    IVCheckerFilterCell iv_spdef;
-    IVCheckerFilterCell iv_speed;
-};
-
-class EggHatchFilterTable : public EditableTableOption_t<EggHatchFilterRow>{
-public:
-    EggHatchFilterTable();
-    virtual std::vector<std::string> make_header() const override;
-    static std::vector<std::unique_ptr<EditableTableRow>> make_defaults();
-
-    EggHatchAction get_action(bool shiny, const IVCheckerReader::Results& IVs, EggHatchGenderFilter gender, NatureReader::Results nature) const;
-};
-
-
-
-
-
-
-
-
-
-
-}
-}
-#endif
diff --git a/SerialPrograms/Source/Pokemon/Options/Pokemon_EncounterBotOptions.h b/SerialPrograms/Source/Pokemon/Options/Pokemon_EncounterBotOptions.h
index c964dc6b3d..bc1a33b824 100644
--- a/SerialPrograms/Source/Pokemon/Options/Pokemon_EncounterBotOptions.h
+++ b/SerialPrograms/Source/Pokemon/Options/Pokemon_EncounterBotOptions.h
@@ -1,13 +1,13 @@
 /*  Encounter Mon Options
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifndef PokemonAutomation_Pokemon_EncounterBotOptions_H
 #define PokemonAutomation_Pokemon_EncounterBotOptions_H
 
-#include "CommonFramework/Options/LanguageOCROption.h"
+#include "CommonTools/Options/LanguageOCROption.h"
 #include "Pokemon/Pokemon_Strings.h"
 #include "Pokemon/Inference/Pokemon_NameReader.h"
 
@@ -21,7 +21,7 @@ class EncounterBotLanguage : public OCR::LanguageOCROption{
         : LanguageOCROption(
             "<b>Game Language:</b><br>Attempt to read and log the encountered " + STRING_POKEMON + " in this language.<br>Set to \"None\" to disable this feature.",
             PokemonNameReader::instance().languages(),
-            LockWhileRunning::LOCKED,
+            LockMode::LOCK_WHILE_RUNNING,
             required
         )
     {}
diff --git a/SerialPrograms/Source/Pokemon/Options/Pokemon_HomeSpriteSelectOption.cpp b/SerialPrograms/Source/Pokemon/Options/Pokemon_HomeSpriteSelectOption.cpp
new file mode 100644
index 0000000000..67708ace49
--- /dev/null
+++ b/SerialPrograms/Source/Pokemon/Options/Pokemon_HomeSpriteSelectOption.cpp
@@ -0,0 +1,56 @@
+/*  HomeSprite Selector, UI component to select multiple berries
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Exceptions.h"
+#include "Pokemon/Resources/Pokemon_PokemonForms.h"
+#include "Pokemon/Resources/Pokemon_PokemonHomeSprites.h"
+#include "Pokemon_HomeSpriteSelectOption.h"
+
+namespace PokemonAutomation{
+namespace Pokemon{
+
+
+StringSelectDatabase make_all_home_sprites_database(){
+    StringSelectDatabase ret;
+    for (const auto& slug: ALL_POKEMON_FORMS()){
+    // for (const auto& p: ALL_POKEMON_HOME_SPRITES().get()){
+        const SpriteDatabase::Sprite* sprite = ALL_POKEMON_HOME_SPRITES().get_nothrow(slug);
+        const PokemonForm* form_ptr = get_pokemon_form(slug);
+        if (form_ptr == nullptr){
+            throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "A form slug is in ALL_POKEMON_FORMS but not available in get_pokemon_form() : " + slug);
+        }
+        if (sprite == nullptr){
+            // we don't have the sprite. Use a replacement sprite instead:
+            const auto& no_show_sprite = ALL_POKEMON_HOME_SPRITES().get_throw("floette-eternal-flower");
+            ret.add_entry(StringSelectEntry(slug, form_ptr->display_name(), no_show_sprite.icon));
+        }else{
+            ret.add_entry(StringSelectEntry(slug, form_ptr->display_name(), sprite->icon));
+        }
+    }
+    
+    return ret;
+}
+const StringSelectDatabase& ALL_HOME_SPRITES_SELECT_DATABASE(){
+    static StringSelectDatabase database = make_all_home_sprites_database();
+    return database;
+}
+
+
+
+
+HomeSpriteSelectCell::HomeSpriteSelectCell(
+    const std::string& default_slug
+)
+    : StringSelectCell(
+        ALL_HOME_SPRITES_SELECT_DATABASE(),
+        LockMode::LOCK_WHILE_RUNNING,
+        default_slug
+    )
+{}
+
+
+}
+}
diff --git a/SerialPrograms/Source/Pokemon/Options/Pokemon_HomeSpriteSelectOption.h b/SerialPrograms/Source/Pokemon/Options/Pokemon_HomeSpriteSelectOption.h
new file mode 100644
index 0000000000..9b17371974
--- /dev/null
+++ b/SerialPrograms/Source/Pokemon/Options/Pokemon_HomeSpriteSelectOption.h
@@ -0,0 +1,29 @@
+/*  HomeSprite Selector, UI component to select multiple berries
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonBDSP_HomeSpriteSelectOption_H
+#define PokemonAutomation_PokemonBDSP_HomeSpriteSelectOption_H
+
+#include "CommonTools/Options/StringSelectOption.h"
+
+namespace PokemonAutomation{
+namespace Pokemon{
+
+
+
+// Option to select a pokemon form with a Pokemon Home sprite shown.
+// The forms are all the unique forms including shiny and non-shiny.
+class HomeSpriteSelectCell : public StringSelectCell{
+public:
+    HomeSpriteSelectCell(const std::string& default_slug);
+};
+
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Pokemon/Options/Pokemon_IVCheckerOption.cpp b/SerialPrograms/Source/Pokemon/Options/Pokemon_IVCheckerOption.cpp
deleted file mode 100644
index 85a2110469..0000000000
--- a/SerialPrograms/Source/Pokemon/Options/Pokemon_IVCheckerOption.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-/*  IV Checker Option
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Pokemon/Pokemon_IVChecker.h"
-#include "Pokemon_IVCheckerOption.h"
-
-namespace PokemonAutomation{
-namespace Pokemon{
-
-
-
-
-IVCheckerFilterCell::IVCheckerFilterCell(IVCheckerFilter default_value)
-    : EnumDropdownCell<IVCheckerFilter>(
-        IVCheckerFilter_Database(),
-        LockWhileRunning::LOCKED,
-        default_value
-    )
-{}
-
-
-
-
-IVCheckerFilterOption::IVCheckerFilterOption(std::string label, IVCheckerFilter default_value)
-    : EnumDropdownOption<IVCheckerFilter>(
-        std::move(label),
-        IVCheckerFilter_Database(),
-        LockWhileRunning::LOCKED,
-        default_value
-    )
-{}
-
-bool IVCheckerFilterOption::matches(std::atomic<uint64_t>& errors, IVCheckerValue result) const{
-    if (result == IVCheckerValue::UnableToDetect){
-        errors++;
-    }
-    return IVChecker_filter_match(*this, result);
-}
-
-
-
-}
-}
diff --git a/SerialPrograms/Source/Pokemon/Options/Pokemon_IVCheckerOption.h b/SerialPrograms/Source/Pokemon/Options/Pokemon_IVCheckerOption.h
deleted file mode 100644
index 0ea84e8233..0000000000
--- a/SerialPrograms/Source/Pokemon/Options/Pokemon_IVCheckerOption.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*  IV Checker Option
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_Pokemon_IVCheckerOption_H
-#define PokemonAutomation_Pokemon_IVCheckerOption_H
-
-#include "Common/Cpp/Options/EnumDropdownOption.h"
-#include "Pokemon/Inference/Pokemon_IVCheckerReader.h"
-
-namespace PokemonAutomation{
-namespace Pokemon{
-
-
-
-
-class IVCheckerFilterCell : public EnumDropdownCell<IVCheckerFilter>{
-public:
-    IVCheckerFilterCell(IVCheckerFilter default_value);
-};
-
-
-class IVCheckerFilterOption : public EnumDropdownOption<IVCheckerFilter>{
-public:
-    IVCheckerFilterOption(std::string label, IVCheckerFilter default_value = IVCheckerFilter::Anything);
-
-    bool matches(std::atomic<uint64_t>& errors, IVCheckerValue result) const;
-};
-
-
-
-
-}
-}
-#endif
diff --git a/SerialPrograms/Source/Pokemon/Options/Pokemon_IvJudgeOption.cpp b/SerialPrograms/Source/Pokemon/Options/Pokemon_IvJudgeOption.cpp
new file mode 100644
index 0000000000..47aa0294ab
--- /dev/null
+++ b/SerialPrograms/Source/Pokemon/Options/Pokemon_IvJudgeOption.cpp
@@ -0,0 +1,46 @@
+/*  IV Judge Option
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Pokemon/Pokemon_IvJudge.h"
+#include "Pokemon_IvJudgeOption.h"
+
+namespace PokemonAutomation{
+namespace Pokemon{
+
+
+
+
+IVJudgeFilterCell::IVJudgeFilterCell(IvJudgeFilter default_value)
+    : EnumDropdownCell<IvJudgeFilter>(
+        IvJudgeFilter_Database(),
+        LockMode::LOCK_WHILE_RUNNING,
+        default_value
+    )
+{}
+
+
+
+
+IVJudgeFilterOption::IVJudgeFilterOption(std::string label, IvJudgeFilter default_value)
+    : EnumDropdownOption<IvJudgeFilter>(
+        std::move(label),
+        IvJudgeFilter_Database(),
+        LockMode::LOCK_WHILE_RUNNING,
+        default_value
+    )
+{}
+
+bool IVJudgeFilterOption::matches(std::atomic<uint64_t>& errors, IvJudgeValue result) const{
+    if (result == IvJudgeValue::UnableToDetect){
+        errors++;
+    }
+    return IvJudge_filter_match(*this, result);
+}
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/Pokemon/Options/Pokemon_IvJudgeOption.h b/SerialPrograms/Source/Pokemon/Options/Pokemon_IvJudgeOption.h
new file mode 100644
index 0000000000..c4e2d24eaf
--- /dev/null
+++ b/SerialPrograms/Source/Pokemon/Options/Pokemon_IvJudgeOption.h
@@ -0,0 +1,38 @@
+/*  IV Judge Option
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Pokemon_IvJudgeOption_H
+#define PokemonAutomation_Pokemon_IvJudgeOption_H
+
+#include <atomic>
+#include "Common/Cpp/Options/EnumDropdownOption.h"
+#include "Pokemon/Pokemon_IvJudge.h"
+
+namespace PokemonAutomation{
+namespace Pokemon{
+
+
+
+
+class IVJudgeFilterCell : public EnumDropdownCell<IvJudgeFilter>{
+public:
+    IVJudgeFilterCell(IvJudgeFilter default_value);
+};
+
+
+class IVJudgeFilterOption : public EnumDropdownOption<IvJudgeFilter>{
+public:
+    IVJudgeFilterOption(std::string label, IvJudgeFilter default_value = IvJudgeFilter::Anything);
+
+    bool matches(std::atomic<uint64_t>& errors, IvJudgeValue result) const;
+};
+
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Pokemon/Options/Pokemon_NameSelectOption.cpp b/SerialPrograms/Source/Pokemon/Options/Pokemon_NameSelectOption.cpp
index 55c0e9007e..268e661725 100644
--- a/SerialPrograms/Source/Pokemon/Options/Pokemon_NameSelectOption.cpp
+++ b/SerialPrograms/Source/Pokemon/Options/Pokemon_NameSelectOption.cpp
@@ -1,16 +1,16 @@
 /*  Pokemon Name Select
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include "Common/Cpp/Exceptions.h"
 #include "Common/Cpp/Json/JsonValue.h"
 #include "Common/Cpp/Json/JsonArray.h"
-#include "CommonFramework/Globals.h"
+#include "CommonFramework/GlobalAutoPaths.h"
 #include "CommonFramework/Logging/Logger.h"
 #include "Pokemon/Resources/Pokemon_PokemonNames.h"
-#include "PokemonSwSh/Resources/PokemonSwSh_PokemonSprites.h"
+#include "VideoGames/PokemonSwSh/Resources/PokemonSwSh_PokemonSprites.h"
 #include "Pokemon_NameSelectOption.h"
 
 namespace PokemonAutomation{
@@ -42,10 +42,10 @@ PokemonNameSelectData::PokemonNameSelectData(const std::vector<std::string>& slu
 PokemonNameSelectData::PokemonNameSelectData(const std::string& json_file_slugs){
     std::string path = RESOURCE_PATH() + json_file_slugs;
     JsonValue json_slugs = load_json_file(path);
-    JsonArray& slugs = json_slugs.get_array_throw(path);
+    JsonArray& slugs = json_slugs.to_array_throw(path);
 
     for (auto& item : slugs){
-        std::string& slug = item.get_string_throw(path);
+        std::string& slug = item.to_string_throw(path);
 
         using namespace NintendoSwitch::PokemonSwSh;
         const PokemonNames& data = get_pokemon_name(slug);
@@ -74,7 +74,7 @@ PokemonNameSelectCell::PokemonNameSelectCell(
     : PokemonNameSelectData(slugs)
     , StringSelectCell(
         PokemonNameSelectData::m_database,
-        LockWhileRunning::LOCKED,
+        LockMode::LOCK_WHILE_RUNNING,
         default_slug
     )
 {}
@@ -85,7 +85,7 @@ PokemonNameSelectCell::PokemonNameSelectCell(
     : PokemonNameSelectData(json_file_slugs)
     , StringSelectCell(
         PokemonNameSelectData::m_database,
-        LockWhileRunning::LOCKED,
+        LockMode::LOCK_WHILE_RUNNING,
         default_slug
     )
 {}
@@ -102,7 +102,7 @@ PokemonNameSelectOption::PokemonNameSelectOption(
     , StringSelectOption(
         std::move(label),
         PokemonNameSelectData::m_database,
-        LockWhileRunning::LOCKED,
+        LockMode::LOCK_WHILE_RUNNING,
         default_slug
     )
 {}
@@ -115,7 +115,7 @@ PokemonNameSelectOption::PokemonNameSelectOption(
     , StringSelectOption(
         std::move(label),
         PokemonNameSelectData::m_database,
-        LockWhileRunning::LOCKED,
+        LockMode::LOCK_WHILE_RUNNING,
         default_slug
     )
 {}
diff --git a/SerialPrograms/Source/Pokemon/Options/Pokemon_NameSelectOption.h b/SerialPrograms/Source/Pokemon/Options/Pokemon_NameSelectOption.h
index 014998e7cd..84d2940f53 100644
--- a/SerialPrograms/Source/Pokemon/Options/Pokemon_NameSelectOption.h
+++ b/SerialPrograms/Source/Pokemon/Options/Pokemon_NameSelectOption.h
@@ -1,13 +1,13 @@
 /*  Pokemon Name Select
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifndef PokemonAutomation_Pokemon_PokemonNameSelect_H
 #define PokemonAutomation_Pokemon_PokemonNameSelect_H
 
-#include "CommonFramework/Options/StringSelectOption.h"
+#include "CommonTools/Options/StringSelectOption.h"
 
 namespace PokemonAutomation{
 namespace Pokemon{
diff --git a/SerialPrograms/Source/Pokemon/Options/Pokemon_NameSelectWidget.cpp b/SerialPrograms/Source/Pokemon/Options/Pokemon_NameSelectWidget.cpp
index 057ea954dd..c63213aac0 100644
--- a/SerialPrograms/Source/Pokemon/Options/Pokemon_NameSelectWidget.cpp
+++ b/SerialPrograms/Source/Pokemon/Options/Pokemon_NameSelectWidget.cpp
@@ -1,12 +1,13 @@
 /*  Pokemon Name Select Widget
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include <QCompleter>
 #include "Common/Cpp/Exceptions.h"
 #include "CommonFramework/Logging/Logger.h"
+#include "CommonFramework/ImageTypes/ImageRGB32_Qt.h"
 #include "Pokemon/Resources/Pokemon_PokemonNames.h"
 #include "Pokemon_NameSelectWidget.h"
 
@@ -29,7 +30,7 @@ NameSelectWidget::NameSelectWidget(
     const std::vector<std::string>* extra_name_list,
     const std::map<std::string, std::string>* extra_display_name_to_slug
 )
-    : NoWheelComboBox(&parent)
+    : NoWheelCompactComboBox(&parent)
     , m_display_name_to_slug(display_name_to_slug)
     , m_extra_display_name_to_slug(extra_display_name_to_slug)
 {
@@ -47,7 +48,7 @@ NameSelectWidget::NameSelectWidget(
         for (const std::string& slug : slugs){
             list.append(QString::fromStdString(get_pokemon_name(slug).display_name()));
         }
-    } else{
+    }else{
         for (const std::string& slug : slugs){
             auto it = display_names->find(slug);
             if (it == display_names->end()){
@@ -57,7 +58,7 @@ NameSelectWidget::NameSelectWidget(
         }
     }
     if (extra_names && extra_name_list){
-        for(const std::string& slug : *extra_name_list){
+        for (const std::string& slug : *extra_name_list){
             const auto it = extra_names->find(slug);
             if (it == extra_names->end()){
                 throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Extra slug not found: " + slug);
@@ -67,7 +68,7 @@ NameSelectWidget::NameSelectWidget(
     }
     this->addItems(list);
 
-    // Inititalize the widget to at least select sth.
+    // Initialize the widget to at least select sth.
     if (slugs.size() > 0){
         this->setCurrentIndex(0);
     }
@@ -80,7 +81,7 @@ NameSelectWidget::NameSelectWidget(
         if (sprite == nullptr){
             global_logger_tagged().log("Missing sprite for: " + slug, COLOR_RED);
         }else{
-            QPixmap pixmap = QPixmap::fromImage(sprite->icon.to_QImage_ref());
+            QPixmap pixmap = QPixmap::fromImage(to_QImage_ref(sprite->icon));
             this->setItemIcon((int)index, pixmap);
         }
 
diff --git a/SerialPrograms/Source/Pokemon/Options/Pokemon_NameSelectWidget.h b/SerialPrograms/Source/Pokemon/Options/Pokemon_NameSelectWidget.h
index 3a781c2480..8a35ddd01f 100644
--- a/SerialPrograms/Source/Pokemon/Options/Pokemon_NameSelectWidget.h
+++ b/SerialPrograms/Source/Pokemon/Options/Pokemon_NameSelectWidget.h
@@ -1,6 +1,6 @@
 /*  Pokemon Name Select Widget
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -8,13 +8,13 @@
 #define PokemonAutomation_Pokemon_PokemonNameSelectWidget_H
 
 #include "Common/Qt/NoWheelComboBox.h"
-#include "CommonFramework/Resources/SpriteDatabase.h"
+#include "CommonTools/Resources/SpriteDatabase.h"
 
 namespace PokemonAutomation{
 namespace Pokemon{
 
 // A widget to select a pokemon
-class NameSelectWidget : public NoWheelComboBox{
+class NameSelectWidget : public NoWheelCompactComboBox{
 public:
     // icons: pokemon slug -> icon. This map can be larger than the list of pokemon displayed on the widget.
     // slugs: a list of pokemon slugs to choose from on the widget.
diff --git a/SerialPrograms/Source/Pokemon/Options/Pokemon_StatsHuntFilter.cpp b/SerialPrograms/Source/Pokemon/Options/Pokemon_StatsHuntFilter.cpp
new file mode 100644
index 0000000000..4abd1072be
--- /dev/null
+++ b/SerialPrograms/Source/Pokemon/Options/Pokemon_StatsHuntFilter.cpp
@@ -0,0 +1,426 @@
+/*  Egg Hatch Filter
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Logging/Logger.h"
+#include "Pokemon_StatsHuntFilter.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace Pokemon{
+
+std::string gender_to_string(StatsHuntGenderFilter gender){
+    const char * names[] = {
+        "Any",
+        "Male",
+        "Female",
+        "Genderless",
+    };
+    return names[int(gender)];
+}
+
+
+const EnumDropdownDatabase<StatsHuntAction>& StatsHuntAction_Database(){
+    static const EnumDropdownDatabase<StatsHuntAction> database({
+        {StatsHuntAction::StopProgram,   "stop",     "Stop Program"},
+        {StatsHuntAction::Keep,          "keep",     "Keep"},
+//        {EggHatchAction::Release,       "release",  "Release"},
+    });
+    return database;
+}
+const EnumDropdownDatabase<StatsHuntShinyFilter>& StatsHuntShinyFilter_Database(){
+    static const EnumDropdownDatabase<StatsHuntShinyFilter> database({
+        {StatsHuntShinyFilter::Anything, "anything",     "Anything"},
+        {StatsHuntShinyFilter::NotShiny, "not-shiny",    "Not Shiny"},
+        {StatsHuntShinyFilter::Shiny,    "shiny",        "Shiny"},
+    });
+    return database;
+}
+const EnumDropdownDatabase<StatsHuntGenderFilter>& StatsHuntGenderFilter_Database(){
+    static const EnumDropdownDatabase<StatsHuntGenderFilter> database({
+        {StatsHuntGenderFilter::Any,         "any",          "Any"},
+        {StatsHuntGenderFilter::Male,        "male",         "Male"},
+        {StatsHuntGenderFilter::Female,      "female",       "Female"},
+//        {EggHatchGenderFilter::Genderless,  "genderless",   "Genderless"},
+    });
+    return database;
+}
+
+
+
+
+const char* StatsHuntIvJudgeFilterTable_Label_Eggs =
+    "<b>Actions Table:</b><br>"
+    "If a hatchling matches one of these filters, the specified action will be performed. "
+    "Otherwise, it will be released. "
+    "If multiple entries apply and have conflicting actions, the program will stop.<br>"
+    "IV checking requires that your right panel be set to the IV Judge and that you have selected the correct game language above.";
+
+const char* StatsHuntIvJudgeFilterTable_Label_Regular =
+    "<b>Stop Conditions:</b><br>"
+    "If the Pok\u00e9mon matches one of these filters, the program will stop.<br>"
+    "IV checking requires that your right panel be set to the IV Judge and that you have selected the correct game language above.";
+
+
+
+
+
+
+StatsHuntRowMisc::StatsHuntRowMisc(const StatsHuntMiscFeatureFlags& p_feature_flags)
+    : feature_flags(p_feature_flags)
+    , action(
+          StatsHuntAction_Database(),
+        LockMode::UNLOCK_WHILE_RUNNING,
+        feature_flags.action
+            ? StatsHuntAction::Keep
+            : StatsHuntAction::StopProgram
+    )
+    , shiny(StatsHuntShinyFilter_Database(), LockMode::UNLOCK_WHILE_RUNNING, StatsHuntShinyFilter::Anything)
+    , gender(StatsHuntGenderFilter_Database(), LockMode::UNLOCK_WHILE_RUNNING, StatsHuntGenderFilter::Any)
+    , nature(NatureCheckerFilter_Database(), LockMode::UNLOCK_WHILE_RUNNING, NatureCheckerFilter::Any)
+{}
+void StatsHuntRowMisc::set(const StatsHuntRowMisc& x){
+    action.set(x.action);
+    shiny.set(x.shiny);
+    gender.set(x.gender);
+    nature.set(x.nature);
+}
+bool StatsHuntRowMisc::matches(
+    bool shiny,
+    StatsHuntGenderFilter gender,
+    NatureCheckerValue nature
+) const{
+    //  Check the shiny filter.
+    switch (this->shiny){
+    case StatsHuntShinyFilter::Anything:
+        break;
+    case StatsHuntShinyFilter::NotShiny:
+        if (shiny){
+            return false;
+        }
+        break;
+    case StatsHuntShinyFilter::Shiny:
+        if (!shiny){
+            return false;
+        }
+        break;
+    }
+
+    StatsHuntGenderFilter filter_gender = this->gender;
+    if (filter_gender != gender && filter_gender != StatsHuntGenderFilter::Any){
+        return false;
+    }
+
+    if (!NatureChecker_filter_match(this->nature, nature)){
+        return false;
+    }
+
+    return true;
+}
+
+
+StatsHuntIvJudgeFilterRow::StatsHuntIvJudgeFilterRow(EditableTableOption& parent_table)
+    : EditableTableRow(parent_table)
+    , misc(static_cast<const StatsHuntIvJudgeFilterTable&>(parent_table).feature_flags)
+    , iv_hp(IvJudgeFilter::Anything)
+    , iv_atk(IvJudgeFilter::Anything)
+    , iv_def(IvJudgeFilter::Anything)
+    , iv_spatk(IvJudgeFilter::Anything)
+    , iv_spdef(IvJudgeFilter::Anything)
+    , iv_speed(IvJudgeFilter::Anything)
+{
+    if (misc.feature_flags.action)  PA_ADD_OPTION(misc.action);
+    if (misc.feature_flags.shiny)   PA_ADD_OPTION(misc.shiny);
+    if (misc.feature_flags.gender)  PA_ADD_OPTION(misc.gender);
+    if (misc.feature_flags.nature)  PA_ADD_OPTION(misc.nature);
+    PA_ADD_OPTION(iv_hp);
+    PA_ADD_OPTION(iv_atk);
+    PA_ADD_OPTION(iv_def);
+    PA_ADD_OPTION(iv_spatk);
+    PA_ADD_OPTION(iv_spdef);
+    PA_ADD_OPTION(iv_speed);
+}
+StatsHuntIvJudgeFilterRow::StatsHuntIvJudgeFilterRow(EditableTableOption& parent_table, StatsHuntShinyFilter p_shiny)
+    : StatsHuntIvJudgeFilterRow(parent_table)
+{
+    misc.shiny.set(p_shiny);
+}
+std::unique_ptr<EditableTableRow> StatsHuntIvJudgeFilterRow::clone() const{
+    std::unique_ptr<StatsHuntIvJudgeFilterRow> ret(new StatsHuntIvJudgeFilterRow(parent()));
+    ret->misc.set(misc);
+    ret->iv_hp.set(iv_hp);
+    ret->iv_atk.set(iv_atk);
+    ret->iv_def.set(iv_def);
+    ret->iv_spatk.set(iv_spatk);
+    ret->iv_spdef.set(iv_spdef);
+    ret->iv_speed.set(iv_speed);
+    return ret;
+}
+bool StatsHuntIvJudgeFilterRow::matches(
+    bool shiny,
+    StatsHuntGenderFilter gender,
+    NatureCheckerValue nature,
+    const IvJudgeReader::Results& IVs
+) const{
+    if (!misc.matches(shiny, gender, nature)){
+        return false;
+    }
+
+    //  Check all the IV filters.
+    if (!IvJudge_filter_match(iv_hp, IVs.hp)) return false;
+    if (!IvJudge_filter_match(iv_atk, IVs.attack)) return false;
+    if (!IvJudge_filter_match(iv_def, IVs.defense)) return false;
+    if (!IvJudge_filter_match(iv_spatk, IVs.spatk)) return false;
+    if (!IvJudge_filter_match(iv_spdef, IVs.spdef)) return false;
+    if (!IvJudge_filter_match(iv_speed, IVs.speed)) return false;
+
+    return true;
+}
+
+StatsHuntIvJudgeFilterTable::StatsHuntIvJudgeFilterTable(
+    const std::string& label,
+    const StatsHuntMiscFeatureFlags& p_feature_flags
+)
+    : EditableTableOption_t<StatsHuntIvJudgeFilterRow>(label, LockMode::UNLOCK_WHILE_RUNNING)
+    , feature_flags(p_feature_flags)
+{
+    set_default(make_defaults());
+    restore_defaults();
+}
+std::vector<std::string> StatsHuntIvJudgeFilterTable::make_header() const{
+    std::vector<std::string> ret;
+    if (feature_flags.action){
+        ret.emplace_back("Action");
+    }
+    if (feature_flags.shiny){
+        ret.emplace_back("Shininess");
+    }
+    if (feature_flags.gender){
+        ret.emplace_back("Gender");
+    }
+    if (feature_flags.nature){
+        ret.emplace_back("Nature");
+    }
+
+    ret.emplace_back("HP");
+    ret.emplace_back("Attack");
+    ret.emplace_back("Defense");
+    ret.emplace_back("Sp. Attack");
+    ret.emplace_back("Sp. Defense");
+    ret.emplace_back("Speed");
+
+    return ret;
+}
+std::vector<std::unique_ptr<EditableTableRow>> StatsHuntIvJudgeFilterTable::make_defaults(){
+    std::vector<std::unique_ptr<EditableTableRow>> ret;
+    if (feature_flags.shiny){
+        ret.emplace_back(new StatsHuntIvJudgeFilterRow(*this, StatsHuntShinyFilter::Shiny));
+    }
+    return ret;
+}
+StatsHuntAction StatsHuntIvJudgeFilterTable::get_action(
+    bool shiny,
+    StatsHuntGenderFilter gender,
+    NatureCheckerValue nature,
+    const IvJudgeReader::Results& IVs
+) const{
+    StatsHuntAction action = StatsHuntAction::Discard;
+    std::vector<std::unique_ptr<StatsHuntIvJudgeFilterRow>> list = copy_snapshot();
+    for (size_t c = 0; c < list.size(); c++){
+        const StatsHuntIvJudgeFilterRow& filter = *list[c];
+
+        if (!filter.matches(shiny, gender, nature, IVs)){
+            continue;
+        }
+
+        StatsHuntAction filter_action = filter.misc.action;
+
+        //  No action matched so far. Take the current action and continue.
+        if (action == StatsHuntAction::Discard){
+            action = filter_action;
+            continue;
+        }
+
+        //  Conflicting actions.
+        if (action != filter_action){
+            global_logger_tagged().log("Multiple filters matched with conflicting actions. Stopping program...", COLOR_RED);
+            return StatsHuntAction::StopProgram;
+        }
+    }
+    return action;
+}
+bool StatsHuntIvJudgeFilterTable::require_iv_judge() const{
+    std::vector<std::unique_ptr<StatsHuntIvJudgeFilterRow>> list = copy_snapshot();
+    for (const std::unique_ptr<StatsHuntIvJudgeFilterRow>& filter : list){
+        const IvJudgeFilter ivs[] = {
+            filter->iv_hp, filter->iv_atk, filter->iv_def,
+            filter->iv_spatk, filter->iv_spdef, filter->iv_speed,
+        };
+        for (IvJudgeFilter iv : ivs){
+            if (iv != IvJudgeFilter::Anything){
+                return true;
+            }
+        }
+    }
+    return false;
+}
+
+
+
+
+
+const char* StatsHuntIvRangeFilterTable_Label_Regular =
+    "<b>Stop Conditions:</b><br>"
+    "If the Pok\u00e9mon matches one of these filters, the program will stop.<br>"
+    "Partially overlapping IV ranges will count as a match. So if a filter is for 0-1, but the IV calculation returns a range 1-2, it will count.";
+
+
+
+StatsHuntIvRangeFilterRow::StatsHuntIvRangeFilterRow(EditableTableOption& parent_table)
+    : EditableTableRow(parent_table)
+    , misc(static_cast<const StatsHuntIvJudgeFilterTable&>(parent_table).feature_flags)
+    , iv_hp(LockMode::UNLOCK_WHILE_RUNNING, 0, 31, 0, 0, 0, 31, 31, 31)
+    , iv_atk(LockMode::UNLOCK_WHILE_RUNNING, 0, 31, 0, 0, 0, 31, 31, 31)
+    , iv_def(LockMode::UNLOCK_WHILE_RUNNING, 0, 31, 0, 0, 0, 31, 31, 31)
+    , iv_spatk(LockMode::UNLOCK_WHILE_RUNNING, 0, 31, 0, 0, 0, 31, 31, 31)
+    , iv_spdef(LockMode::UNLOCK_WHILE_RUNNING, 0, 31, 0, 0, 0, 31, 31, 31)
+    , iv_speed(LockMode::UNLOCK_WHILE_RUNNING, 0, 31, 0, 0, 0, 31, 31, 31)
+{
+    if (misc.feature_flags.action)  PA_ADD_OPTION(misc.action);
+    if (misc.feature_flags.shiny)   PA_ADD_OPTION(misc.shiny);
+    if (misc.feature_flags.gender)  PA_ADD_OPTION(misc.gender);
+    if (misc.feature_flags.nature)  PA_ADD_OPTION(misc.nature);
+    PA_ADD_OPTION(iv_hp);
+    PA_ADD_OPTION(iv_atk);
+    PA_ADD_OPTION(iv_def);
+    PA_ADD_OPTION(iv_spatk);
+    PA_ADD_OPTION(iv_spdef);
+    PA_ADD_OPTION(iv_speed);
+}
+std::unique_ptr<EditableTableRow> StatsHuntIvRangeFilterRow::clone() const{
+    std::unique_ptr<StatsHuntIvRangeFilterRow> ret(new StatsHuntIvRangeFilterRow(parent()));
+    ret->misc.set(misc);
+    ret->iv_hp.set(iv_hp);
+    ret->iv_atk.set(iv_atk);
+    ret->iv_def.set(iv_def);
+    ret->iv_spatk.set(iv_spatk);
+    ret->iv_spdef.set(iv_spdef);
+    ret->iv_speed.set(iv_speed);
+    return ret;
+}
+bool StatsHuntIvRangeFilterRow::match_iv(const IvRange& desired, const IvRange& actual){
+    if (desired.low == 0 && desired.high == 31){
+        return true;
+    }
+    if (actual.high < desired.low){
+        return false;
+    }
+    if (desired.high < actual.low){
+        return false;
+    }
+    return true;
+}
+bool StatsHuntIvRangeFilterRow::match_iv(const IntegerRangeCell<uint8_t>& desired, const IvRange& actual){
+    uint8_t lo, hi;
+    desired.current_values(lo, hi);
+    return match_iv(IvRange{(int8_t)lo, (int8_t)hi}, actual);
+}
+bool StatsHuntIvRangeFilterRow::matches(
+    bool shiny,
+    StatsHuntGenderFilter gender,
+    NatureCheckerValue nature,
+    const IvRanges& IVs
+) const{
+    if (!misc.matches(shiny, gender, nature)){
+        return false;
+    }
+
+    if (!match_iv(iv_hp, IVs.hp)) return false;
+    if (!match_iv(iv_atk, IVs.attack)) return false;
+    if (!match_iv(iv_def, IVs.defense)) return false;
+    if (!match_iv(iv_spatk, IVs.spatk)) return false;
+    if (!match_iv(iv_spdef, IVs.spdef)) return false;
+    if (!match_iv(iv_speed, IVs.speed)) return false;
+
+    return true;
+}
+
+
+StatsHuntIvRangeFilterTable::StatsHuntIvRangeFilterTable(
+    const std::string& label,
+    const StatsHuntMiscFeatureFlags& p_feature_flags
+)
+    : EditableTableOption_t<StatsHuntIvRangeFilterRow>(label, LockMode::UNLOCK_WHILE_RUNNING)
+    , feature_flags(p_feature_flags)
+{
+//    set_default(make_defaults());
+//    restore_defaults();
+}
+std::vector<std::string> StatsHuntIvRangeFilterTable::make_header() const{
+    std::vector<std::string> ret;
+    if (feature_flags.action){
+        ret.emplace_back("Action");
+    }
+    if (feature_flags.shiny){
+        ret.emplace_back("Shininess");
+    }
+    if (feature_flags.gender){
+        ret.emplace_back("Gender");
+    }
+    if (feature_flags.nature){
+        ret.emplace_back("Nature");
+    }
+
+    ret.emplace_back("HP");
+    ret.emplace_back("Atk");
+    ret.emplace_back("Def");
+    ret.emplace_back("SpAtk");
+    ret.emplace_back("SpDef");
+    ret.emplace_back("Spd");
+
+    return ret;
+}
+StatsHuntAction StatsHuntIvRangeFilterTable::get_action(
+    bool shiny,
+    StatsHuntGenderFilter gender,
+    NatureCheckerValue nature,
+    const IvRanges& IVs
+) const{
+    StatsHuntAction action = StatsHuntAction::Discard;
+    std::vector<std::unique_ptr<StatsHuntIvRangeFilterRow>> list = copy_snapshot();
+    for (size_t c = 0; c < list.size(); c++){
+        const StatsHuntIvRangeFilterRow& filter = *list[c];
+
+        if (!filter.matches(shiny, gender, nature, IVs)){
+            continue;
+        }
+
+        StatsHuntAction filter_action = filter.misc.action;
+
+        //  No action matched so far. Take the current action and continue.
+        if (action == StatsHuntAction::Discard){
+            action = filter_action;
+            continue;
+        }
+
+        //  Conflicting actions.
+        if (action != filter_action){
+            global_logger_tagged().log("Multiple filters matched with conflicting actions. Stopping program...", COLOR_RED);
+            return StatsHuntAction::StopProgram;
+        }
+    }
+    return action;
+}
+
+
+
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/Pokemon/Options/Pokemon_StatsHuntFilter.h b/SerialPrograms/Source/Pokemon/Options/Pokemon_StatsHuntFilter.h
new file mode 100644
index 0000000000..eb1a3a6cd2
--- /dev/null
+++ b/SerialPrograms/Source/Pokemon/Options/Pokemon_StatsHuntFilter.h
@@ -0,0 +1,192 @@
+/*  Stats Filter
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Pokemon_StatsFilter_H
+#define PokemonAutomation_Pokemon_StatsFilter_H
+
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "Common/Cpp/Options/IntegerRangeOption.h"
+#include "Common/Cpp/Options/EnumDropdownOption.h"
+#include "Common/Cpp/Options/EditableTableOption.h"
+//#include "Pokemon/Pokemon_IVChecker.h"
+#include "Pokemon/Pokemon_NatureChecker.h"
+#include "Pokemon/Pokemon_StatsCalculation.h"
+#include "Pokemon/Options/Pokemon_IvJudgeOption.h"
+#include "Pokemon/Inference/Pokemon_IvJudgeReader.h"
+#include "Pokemon/Inference/Pokemon_NatureReader.h"
+
+namespace PokemonAutomation{
+namespace Pokemon{
+
+
+enum class StatsHuntAction{
+    StopProgram,
+    Keep,
+    Discard,
+};
+
+enum class StatsHuntShinyFilter{
+    Anything,
+    NotShiny,
+    Shiny,
+};
+
+enum class StatsHuntGenderFilter{
+    Any,
+    Male,
+    Female,
+    Genderless
+};
+std::string gender_to_string(StatsHuntGenderFilter gender);
+
+
+
+//  Preset labels.
+extern const char* StatsHuntIvJudgeFilterTable_Label_Eggs;
+extern const char* StatsHuntIvJudgeFilterTable_Label_Regular;
+
+
+
+
+struct StatsHuntMiscFeatureFlags{
+    bool action = false;
+    bool shiny = false;
+    bool gender = false;
+    bool nature = false;
+};
+struct StatsHuntRowMisc{
+    StatsHuntRowMisc(const StatsHuntMiscFeatureFlags& p_feature_flags);
+    void set(const StatsHuntRowMisc& x);
+
+    bool matches(
+        bool shiny,
+        StatsHuntGenderFilter gender,
+        NatureCheckerValue nature
+    ) const;
+
+    const StatsHuntMiscFeatureFlags& feature_flags;
+
+    EnumDropdownCell<StatsHuntAction> action;
+    EnumDropdownCell<StatsHuntShinyFilter> shiny;
+    EnumDropdownCell<StatsHuntGenderFilter> gender;
+    EnumDropdownCell<NatureCheckerFilter> nature;
+};
+
+
+
+
+class StatsHuntIvJudgeFilterTable;
+class StatsHuntIvJudgeFilterRow : public EditableTableRow{
+public:
+    StatsHuntIvJudgeFilterRow(EditableTableOption& parent_table);
+    StatsHuntIvJudgeFilterRow(EditableTableOption& parent_table, StatsHuntShinyFilter p_shiny);
+    virtual std::unique_ptr<EditableTableRow> clone() const override;
+
+    bool matches(
+        bool shiny,
+        StatsHuntGenderFilter gender,
+        NatureCheckerValue nature,
+        const IvJudgeReader::Results& IVs
+    ) const;
+
+public:
+    StatsHuntRowMisc misc;
+
+    IVJudgeFilterCell iv_hp;
+    IVJudgeFilterCell iv_atk;
+    IVJudgeFilterCell iv_def;
+    IVJudgeFilterCell iv_spatk;
+    IVJudgeFilterCell iv_spdef;
+    IVJudgeFilterCell iv_speed;
+};
+class StatsHuntIvJudgeFilterTable : public EditableTableOption_t<StatsHuntIvJudgeFilterRow>{
+public:
+    StatsHuntIvJudgeFilterTable(
+        const std::string& label,
+        const StatsHuntMiscFeatureFlags& p_feature_flags
+    );
+    virtual std::vector<std::string> make_header() const override;
+    std::vector<std::unique_ptr<EditableTableRow>> make_defaults();
+
+    StatsHuntAction get_action(
+        bool shiny,
+        StatsHuntGenderFilter gender,
+        NatureCheckerValue nature,
+        const IvJudgeReader::Results& IVs
+    ) const;
+
+    //  Return true if any filter row sets an IV column to something other than "Anything".
+    //  Programs use this to decide whether they need to read IVs from the in-game judge
+    //  screen, which players must unlock first.
+    bool require_iv_judge() const;
+
+public:
+    const StatsHuntMiscFeatureFlags feature_flags;
+};
+
+
+
+
+
+
+
+
+//  Preset labels.
+extern const char* StatsHuntIvRangeFilterTable_Label_Regular;
+
+
+class StatsHuntIvRangeFilterRow : public EditableTableRow{
+public:
+    StatsHuntIvRangeFilterRow(EditableTableOption& parent_table);
+    virtual std::unique_ptr<EditableTableRow> clone() const override;
+
+    bool matches(
+        bool shiny,
+        StatsHuntGenderFilter gender,
+        NatureCheckerValue nature,
+        const IvRanges& IVs
+    ) const;
+
+private:
+    static bool match_iv(const IvRange& desired, const IvRange& actual);
+    static bool match_iv(const IntegerRangeCell<uint8_t>& desired, const IvRange& actual);
+
+public:
+    StatsHuntRowMisc misc;
+
+    IntegerRangeCell<uint8_t> iv_hp;
+    IntegerRangeCell<uint8_t> iv_atk;
+    IntegerRangeCell<uint8_t> iv_def;
+    IntegerRangeCell<uint8_t> iv_spatk;
+    IntegerRangeCell<uint8_t> iv_spdef;
+    IntegerRangeCell<uint8_t> iv_speed;
+};
+class StatsHuntIvRangeFilterTable : public EditableTableOption_t<StatsHuntIvRangeFilterRow>{
+public:
+    StatsHuntIvRangeFilterTable(
+        const std::string& label,
+        const StatsHuntMiscFeatureFlags& p_feature_flags
+    );
+    virtual std::vector<std::string> make_header() const override;
+
+    StatsHuntAction get_action(
+        bool shiny,
+        StatsHuntGenderFilter gender,
+        NatureCheckerValue nature,
+        const IvRanges& IVs
+    ) const;
+
+public:
+    const StatsHuntMiscFeatureFlags feature_flags;
+};
+
+
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Pokemon/Options/Pokemon_StatsResetFilter (disabled).cpp b/SerialPrograms/Source/Pokemon/Options/Pokemon_StatsResetFilter (disabled).cpp
new file mode 100644
index 0000000000..ef5b1a82fa
--- /dev/null
+++ b/SerialPrograms/Source/Pokemon/Options/Pokemon_StatsResetFilter (disabled).cpp	
@@ -0,0 +1,105 @@
+/*  Stats Reset Filter
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+#include "Pokemon_StatsResetFilter.h"
+#include "Pokemon_StatsHuntFilter.h"
+
+namespace PokemonAutomation{
+namespace Pokemon{
+
+StatsResetFilterRow::StatsResetFilterRow()
+    : action(StatsHuntAction::StopProgram)
+    , nature(NatureCheckerFilter_Database(), LockMode::LOCK_WHILE_RUNNING, NatureCheckerFilter::Any)
+    , iv_hp(IvJudgeFilter::Anything)
+    , iv_atk(IvJudgeFilter::Anything)
+    , iv_def(IvJudgeFilter::Anything)
+    , iv_spatk(IvJudgeFilter::Anything)
+    , iv_spdef(IvJudgeFilter::Anything)
+    , iv_speed(IvJudgeFilter::Anything)
+{
+    PA_ADD_OPTION(nature);
+    PA_ADD_OPTION(iv_hp);
+    PA_ADD_OPTION(iv_atk);
+    PA_ADD_OPTION(iv_def);
+    PA_ADD_OPTION(iv_spatk);
+    PA_ADD_OPTION(iv_spdef);
+    PA_ADD_OPTION(iv_speed);
+}
+
+std::unique_ptr<EditableTableRow> StatsResetFilterRow::clone() const{
+    std::unique_ptr<StatsResetFilterRow> ret(new StatsResetFilterRow());
+    ret->nature.set(nature);
+    ret->iv_hp.set(iv_hp);
+    ret->iv_atk.set(iv_atk);
+    ret->iv_def.set(iv_def);
+    ret->iv_spatk.set(iv_spatk);
+    ret->iv_spdef.set(iv_spdef);
+    ret->iv_speed.set(iv_speed);
+    return ret;
+}
+
+StatsResetFilterTable::StatsResetFilterTable()
+    : EditableTableOption_t<StatsResetFilterRow>(
+        "<b>Actions Table:</b><br>"
+        "If the caught Pokemon matches one of these filters, the program will stop. "
+        "IV checking requires that your right panel be set to the IV Judge and that you have selected the correct game language above.",
+        LockMode::LOCK_WHILE_RUNNING,
+        make_defaults()
+    )
+{}
+std::vector<std::string> StatsResetFilterTable::make_header() const{
+    return std::vector<std::string>{
+        "Nature",
+        "HP",
+        "Attack",
+        "Defense",
+        "Sp. Attack",
+        "Sp. Defense",
+        "Speed",
+    };
+}
+std::vector<std::unique_ptr<EditableTableRow>> StatsResetFilterTable::make_defaults(){
+    std::vector<std::unique_ptr<EditableTableRow>> ret;
+    ret.emplace_back(new StatsResetFilterRow());
+    return ret;
+}
+
+StatsHuntAction StatsResetFilterTable::get_action(bool shiny, const IvJudgeReader::Results& IVs, NatureReader::Results nature) const{
+    StatsHuntAction action = StatsHuntAction::Discard;
+    std::vector<std::unique_ptr<StatsResetFilterRow>> list = copy_snapshot();
+    for (size_t c = 0; c < list.size(); c++){
+        const StatsResetFilterRow& filter = *list[c];
+
+        //  Check all the IV filters.
+        if (!IvJudge_filter_match(filter.iv_hp, IVs.hp)) continue;
+        if (!IvJudge_filter_match(filter.iv_atk, IVs.attack)) continue;
+        if (!IvJudge_filter_match(filter.iv_def, IVs.defense)) continue;
+        if (!IvJudge_filter_match(filter.iv_spatk, IVs.spatk)) continue;
+        if (!IvJudge_filter_match(filter.iv_spdef, IVs.spdef)) continue;
+        if (!IvJudge_filter_match(filter.iv_speed, IVs.speed)) continue;
+
+        if (!NatureChecker_filter_match(filter.nature, nature.nature)){
+            continue;
+        }
+
+        StatsHuntAction filter_action = filter.action;
+
+        //  No action matched so far. Take the current action and continue.
+        if (action == StatsHuntAction::Discard){
+            action = filter_action;
+            continue;
+        }
+
+        //  Conflicting actions.
+        if (action != filter_action){
+            global_logger_tagged().log("Multiple filters matched with conflicting actions. Stopping program...", COLOR_RED);
+            return StatsHuntAction::StopProgram;
+        }
+    }
+    return action;
+}
+
+}
+}
diff --git a/SerialPrograms/Source/Pokemon/Options/Pokemon_StatsResetFilter (disabled).h b/SerialPrograms/Source/Pokemon/Options/Pokemon_StatsResetFilter (disabled).h
new file mode 100644
index 0000000000..d632dcd0d2
--- /dev/null
+++ b/SerialPrograms/Source/Pokemon/Options/Pokemon_StatsResetFilter (disabled).h	
@@ -0,0 +1,48 @@
+/*  Stats Reset Filter
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Pokemon_StatsResetFilter_H
+#define PokemonAutomation_Pokemon_StatsResetFilter_H
+
+#include "Common/Cpp/Options/EnumDropdownOption.h"
+#include "Common/Cpp/Options/EditableTableOption.h"
+//#include "Pokemon/Pokemon_IvJudge.h"
+#include "Pokemon/Options/Pokemon_IvJudgeOption.h"
+#include "Pokemon/Inference/Pokemon_IvJudgeReader.h"
+#include "Pokemon/Inference/Pokemon_NatureReader.h"
+#include "Pokemon_StatsHuntFilter.h"
+
+namespace PokemonAutomation{
+namespace Pokemon{
+
+class StatsResetFilterRow : public EditableTableRow{
+public:
+    StatsResetFilterRow();
+    virtual std::unique_ptr<EditableTableRow> clone() const override;
+
+public:
+    StatsHuntAction action;
+    EnumDropdownCell<NatureCheckerFilter> nature;
+    IVJudgeFilterCell iv_hp;
+    IVJudgeFilterCell iv_atk;
+    IVJudgeFilterCell iv_def;
+    IVJudgeFilterCell iv_spatk;
+    IVJudgeFilterCell iv_spdef;
+    IVJudgeFilterCell iv_speed;
+};
+
+class StatsResetFilterTable : public EditableTableOption_t<StatsResetFilterRow>{
+public:
+    StatsResetFilterTable();
+    virtual std::vector<std::string> make_header() const override;
+    static std::vector<std::unique_ptr<EditableTableRow>> make_defaults();
+    
+    StatsHuntAction get_action(bool shiny, const IvJudgeReader::Results& IVs, NatureReader::Results nature) const;
+};
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Pokemon/Options/Pokemon_StatsResetFilter.cpp b/SerialPrograms/Source/Pokemon/Options/Pokemon_StatsResetFilter.cpp
deleted file mode 100644
index afbb1c9709..0000000000
--- a/SerialPrograms/Source/Pokemon/Options/Pokemon_StatsResetFilter.cpp
+++ /dev/null
@@ -1,107 +0,0 @@
-/*  Stats Reset Filter
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Compiler.h"
-#include "Pokemon_StatsResetFilter.h"
-#include "Pokemon_EggHatchFilter.h"
-
-namespace PokemonAutomation{
-namespace Pokemon{
-
-StatsResetFilterRow::StatsResetFilterRow()
-    : action(EggHatchAction::StopProgram)
-    , nature(NatureCheckerFilter_Database(), LockWhileRunning::LOCKED, NatureCheckerFilter::Any)
-    , iv_hp(IVCheckerFilter::Anything)
-    , iv_atk(IVCheckerFilter::Anything)
-    , iv_def(IVCheckerFilter::Anything)
-    , iv_spatk(IVCheckerFilter::Anything)
-    , iv_spdef(IVCheckerFilter::Anything)
-    , iv_speed(IVCheckerFilter::Anything)
-{
-    PA_ADD_OPTION(nature);
-    PA_ADD_OPTION(iv_hp);
-    PA_ADD_OPTION(iv_atk);
-    PA_ADD_OPTION(iv_def);
-    PA_ADD_OPTION(iv_spatk);
-    PA_ADD_OPTION(iv_spdef);
-    PA_ADD_OPTION(iv_speed);
-}
-
-std::unique_ptr<EditableTableRow> StatsResetFilterRow::clone() const{
-    std::unique_ptr<StatsResetFilterRow> ret(new StatsResetFilterRow());
-    ret->nature.set(nature);
-    ret->iv_hp.set(iv_hp);
-    ret->iv_atk.set(iv_atk);
-    ret->iv_def.set(iv_def);
-    ret->iv_spatk.set(iv_spatk);
-    ret->iv_spdef.set(iv_spdef);
-    ret->iv_speed.set(iv_speed);
-    return ret;
-}
-
-StatsResetFilterTable::StatsResetFilterTable()
-    : EditableTableOption_t<StatsResetFilterRow>(
-        "<b>Actions Table:</b><br>"
-        "If the caught Pokemon matches one of these filters, the program will stop. "
-        "IV checking requires that your right panel be set to the IV Judge and that you have selected the correct game language above.",
-        LockWhileRunning::LOCKED,
-        make_defaults()
-    )
-{}
-std::vector<std::string> StatsResetFilterTable::make_header() const{
-    return std::vector<std::string>{
-        "Nature",
-        "HP",
-        "Attack",
-        "Defense",
-        "Sp. Attack",
-        "Sp. Defense",
-        "Speed",
-    };
-}
-std::vector<std::unique_ptr<EditableTableRow>> StatsResetFilterTable::make_defaults(){
-    std::vector<std::unique_ptr<EditableTableRow>> ret;
-    ret.emplace_back(new StatsResetFilterRow());
-    return ret;
-}
-
-EggHatchAction StatsResetFilterTable::get_action(bool shiny, const IVCheckerReader::Results& IVs, NatureReader::Results nature) const{
-    EggHatchAction action = EggHatchAction::Release;
-    std::vector<std::unique_ptr<StatsResetFilterRow>> list = copy_snapshot();
-    for (size_t c = 0; c < list.size(); c++){
-        const StatsResetFilterRow& filter = *list[c];
-
-        //  Check all the IV filters.
-        if (!IVChecker_filter_match(filter.iv_hp, IVs.hp)) continue;
-        if (!IVChecker_filter_match(filter.iv_atk, IVs.attack)) continue;
-        if (!IVChecker_filter_match(filter.iv_def, IVs.defense)) continue;
-        if (!IVChecker_filter_match(filter.iv_spatk, IVs.spatk)) continue;
-        if (!IVChecker_filter_match(filter.iv_spdef, IVs.spdef)) continue;
-        if (!IVChecker_filter_match(filter.iv_speed, IVs.speed)) continue;
-
-        if (!NatureChecker_filter_match(filter.nature, nature.nature)) {
-            continue;
-        }
-
-        EggHatchAction filter_action = filter.action;
-
-        //  No action matched so far. Take the current action and continue.
-        if (action == EggHatchAction::Release){
-            action = filter_action;
-            continue;
-        }
-
-        //  Conflicting actions.
-        if (action != filter_action){
-            global_logger_tagged().log("Multiple filters matched with conflicting actions. Stopping program...", COLOR_RED);
-            return EggHatchAction::StopProgram;
-        }
-    }
-    return action;
-}
-
-}
-}
diff --git a/SerialPrograms/Source/Pokemon/Options/Pokemon_StatsResetFilter.h b/SerialPrograms/Source/Pokemon/Options/Pokemon_StatsResetFilter.h
deleted file mode 100644
index 9cb0868efa..0000000000
--- a/SerialPrograms/Source/Pokemon/Options/Pokemon_StatsResetFilter.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*  Stats Reset Filter
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_Pokemon_StatsResetFilter_H
-#define PokemonAutomation_Pokemon_StatsResetFilter_H
-
-#include "Common/Cpp/Options/EnumDropdownOption.h"
-#include "Common/Cpp/Options/EditableTableOption.h"
-#include "Pokemon/Pokemon_IVChecker.h"
-#include "Pokemon/Options/Pokemon_IVCheckerOption.h"
-#include "Pokemon/Inference/Pokemon_IVCheckerReader.h"
-#include "Pokemon_EggHatchFilter.h"
-#include "Pokemon/Inference/Pokemon_NatureReader.h"
-
-namespace PokemonAutomation{
-namespace Pokemon{
-
-class StatsResetFilterRow : public EditableTableRow{
-public:
-    StatsResetFilterRow();
-    virtual std::unique_ptr<EditableTableRow> clone() const override;
-
-public:
-    EggHatchAction action;
-    EnumDropdownCell<NatureCheckerFilter> nature;
-    IVCheckerFilterCell iv_hp;
-    IVCheckerFilterCell iv_atk;
-    IVCheckerFilterCell iv_def;
-    IVCheckerFilterCell iv_spatk;
-    IVCheckerFilterCell iv_spdef;
-    IVCheckerFilterCell iv_speed;
-};
-
-class StatsResetFilterTable : public EditableTableOption_t<StatsResetFilterRow>{
-public:
-    StatsResetFilterTable();
-    virtual std::vector<std::string> make_header() const override;
-    static std::vector<std::unique_ptr<EditableTableRow>> make_defaults();
-
-    EggHatchAction get_action(bool shiny, const IVCheckerReader::Results& IVs, NatureReader::Results nature) const;
-};
-
-}
-}
-#endif
diff --git a/SerialPrograms/Source/Pokemon/Pokemon_AdvRng.cpp b/SerialPrograms/Source/Pokemon/Pokemon_AdvRng.cpp
new file mode 100644
index 0000000000..aef20552e7
--- /dev/null
+++ b/SerialPrograms/Source/Pokemon/Pokemon_AdvRng.cpp
@@ -0,0 +1,1151 @@
+/*  Adv RNG
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <cstddef>
+#include <algorithm>
+#include "Pokemon_AdvRng.h"
+
+namespace PokemonAutomation{
+namespace Pokemon{
+
+void level_up_observed_pokemon(AdvObservedPokemon& pokemon, const StatReads& newstats, const EVs& evyield){
+    if (pokemon.level.empty() || pokemon.stats.empty() || pokemon.evs.empty()){
+        return;
+    }
+
+    uint8_t newlevel = pokemon.level.back() + 1;
+    pokemon.level.emplace_back(newlevel);
+
+    pokemon.stats.emplace_back(newstats);
+
+    EVs old_evs = pokemon.evs.back();
+    EVs new_evs;
+    new_evs.hp      = old_evs.hp      + evyield.hp;
+    new_evs.attack  = old_evs.attack  + evyield.attack;
+    new_evs.defense = old_evs.defense + evyield.defense;
+    new_evs.spatk   = old_evs.spatk   + evyield.spatk;
+    new_evs.spdef   = old_evs.spdef   + evyield.spdef;
+    new_evs.speed   = old_evs.speed   + evyield.speed;
+    pokemon.evs.emplace_back(new_evs);
+}
+
+uint32_t increment_internal_rng_state(uint32_t state){
+    return state * 0x41c64e6d + 0x6073;
+}
+
+AdvRngState rngstate_from_internal_state(uint16_t seed, uint64_t advances, uint32_t state, AdvRngMethod method){
+    uint32_t s0 = state;
+    uint32_t s1 = increment_internal_rng_state(s0);
+    uint32_t s2 = increment_internal_rng_state(s1);
+    uint32_t s3 = increment_internal_rng_state(s2);
+    uint32_t s4 = increment_internal_rng_state(s3);
+    uint32_t s5 = increment_internal_rng_state(s4);
+
+    return  {seed, advances, method, s0, s1, s2, s3, s4, s5};
+}
+
+AdvRngState rngstate_from_seed(uint16_t seed, uint64_t advances, AdvRngMethod method){
+    uint32_t state = seed;
+    state = increment_internal_rng_state(state);
+    for (uint64_t i=0; i<advances; i++){ 
+        state = increment_internal_rng_state(state);
+    }
+
+    return rngstate_from_internal_state(seed, advances, state, method);
+}
+
+void advance_rng_state(AdvRngState& state){
+    state.advance++;
+    state.s0 = state.s1;
+    state.s1 = state.s2;
+    state.s2 = state.s3;
+    state.s3 = state.s4;
+    state.s4 = state.s5;
+    state.s5 = increment_internal_rng_state(state.s5);
+}
+
+uint32_t pid_from_states(uint32_t s0, uint32_t s1){
+    return (s1 & 0xffff0000) + (s0 >> 16);
+}
+
+uint8_t gender_value_from_pid(uint32_t pid){
+    return pid & 0xff;
+}
+
+AdvGender gender_from_gender_value(uint8_t gender_value, int16_t threshold){
+    if (threshold < -1){ // genderless Pokemon
+        return AdvGender::Any;
+    }
+    return (gender_value <= threshold) ? AdvGender::Female : AdvGender::Male;
+}
+
+AdvNature nature_from_pid(uint32_t pid){
+    return AdvNature (pid % 25);
+}
+
+AdvAbility ability_from_pid(uint32_t pid){
+    return AdvAbility (pid % 2);
+}
+
+uint8_t unown_form_from_pid(uint32_t pid){
+    return (((pid & 0x3000000) >> 18) | ((pid & 0x30000) >> 12) | ((pid & 0x300) >> 6) | (pid & 0x3)) % 0x1c;
+    // return (
+    //     (((pid >> 24) & 0x03) << 6) | 
+    //     (((pid >> 16) & 0x03) << 4) | 
+    //     (((pid >> 8) & 0x03) << 2) | 
+    //     (pid & 0x03)
+    // ) % 28;
+}
+
+AdvIvGroup iv_group_from_state(uint32_t state, bool roaming = false){
+    AdvIvGroup ivgroup;
+    uint32_t remainingbits = state >> 16;
+    if (roaming){
+        remainingbits = remainingbits & 0xff;
+    }
+
+    ivgroup.iv0 = remainingbits & 0x1f;
+    remainingbits = remainingbits >> 5;
+    ivgroup.iv1 = remainingbits & 0x1f;
+    remainingbits = remainingbits >> 5;
+    ivgroup.iv2 = remainingbits & 0x1f;
+
+    return ivgroup;
+}
+
+AdvPokemonResult pokemon_from_state(const AdvRngState& state, uint32_t pid, AdvNature nature, bool roaming = false){
+    uint8_t gender = gender_value_from_pid(pid);
+    AdvAbility ability = ability_from_pid(pid);
+
+    AdvIvGroup ivgroup1;
+    AdvIvGroup ivgroup2;
+
+    if (roaming){
+        ivgroup1 = iv_group_from_state(state.s2, roaming);
+        ivgroup2 = { 0, 0, 0 };
+    }else{
+        switch(state.method){
+
+        case AdvRngMethod::Method2:
+            ivgroup1 = iv_group_from_state(state.s3);
+            ivgroup2 = iv_group_from_state(state.s4);
+            break;
+        case AdvRngMethod::Method4:
+            ivgroup1 = iv_group_from_state(state.s2);
+            ivgroup2 = iv_group_from_state(state.s4);
+            break;
+        case AdvRngMethod::Method1:
+        default:
+            ivgroup1 = iv_group_from_state(state.s2);
+            ivgroup2 = iv_group_from_state(state.s3);
+            break;
+        }
+    }
+
+    AdvIVs ivs;
+    ivs.hp = ivgroup1.iv0;
+    ivs.attack = ivgroup1.iv1;
+    ivs.defense = ivgroup1.iv2;
+    ivs.speed = ivgroup2.iv0;
+    ivs.spatk = ivgroup2.iv1;
+    ivs.spdef = ivgroup2.iv2;
+
+    return {pid, gender, nature, ability, ivs};
+}
+
+AdvPokemonResult pokemon_from_state(const AdvRngState& state, bool roaming = false){
+    uint32_t pid = pid_from_states(state.s0, state.s1);
+    AdvNature nature = nature_from_pid(pid);
+    return pokemon_from_state(state, pid, nature, roaming);
+}
+
+AdvPokemonResult reroll_wild_pokemon(uint8_t nature, uint16_t seed, uint64_t advances, uint32_t state, AdvRngMethod method){
+    uint32_t lowstate = state;
+    uint32_t highstate = increment_internal_rng_state(state);
+    while (true){
+        uint32_t pid = pid_from_states(lowstate, highstate);
+        if ((pid % 25) == nature){
+            AdvRngState rngstate = rngstate_from_internal_state(seed, advances, lowstate, method);
+            return pokemon_from_state(rngstate, pid, AdvNature(nature));
+        }
+        lowstate = increment_internal_rng_state(highstate);
+        highstate = increment_internal_rng_state(lowstate);
+    }
+}
+
+AdvPokemonResult reroll_unown(uint8_t unownform, uint16_t seed, uint64_t advances, uint32_t state, AdvRngMethod method){
+    uint32_t lowstate = state;
+    uint32_t highstate = increment_internal_rng_state(state);
+    while (true){
+        uint32_t pid = pid_from_states(highstate, lowstate);
+        if (unown_form_from_pid(pid) == unownform){
+            AdvRngState rngstate = rngstate_from_internal_state(seed, advances, lowstate, method);
+            return pokemon_from_state(rngstate, pid, nature_from_pid(pid));
+        }
+        lowstate = increment_internal_rng_state(highstate);
+        highstate = increment_internal_rng_state(lowstate);
+    }
+}
+
+uint8_t slot_number_from_roll(uint8_t roll, size_t size, bool super_rod){
+    switch(size){
+        case 12:    // grass
+        if (roll < 20){
+           return 0;
+        }else if(roll < 40){
+           return 1;
+        }else if(roll < 50){
+           return 2;
+        }else if(roll < 60){
+           return 3;
+        }else if(roll < 70){
+           return 4;
+        }else if(roll < 80){
+           return 5;
+        }else if(roll < 85){
+           return 6;
+        }else if(roll < 90){
+           return 7;
+        }else if(roll < 94){
+           return 8;
+        }else if(roll < 98){
+           return 9;
+        }else if(roll < 99){
+           return 10;
+        }else{
+           return 11;
+        }
+    case 5:     
+        if (super_rod){ // super rod
+            if (roll < 40){
+               return 0;
+            }else if(roll < 80){
+               return 1;
+            }else if(roll < 95){
+               return 2;
+            }else if(roll < 99){
+               return 3;
+            }else{
+               return 4;
+            }
+        }else{
+            if (roll < 60){ // surfing and rock smash
+               return 0;
+            }else if(roll < 90){
+               return 1;
+            }else if(roll < 95){
+               return 2;
+            }else if(roll < 99){
+               return 3;
+            }else{
+               return 4;
+            }
+        }
+    case 3: // good rod
+        if (roll < 60){
+           return 0;
+        }else if(roll < 80){
+           return 1;
+        }else{
+           return 2;
+        }
+    case 2: // old rod
+        if (roll < 70){
+           return 0;
+        }else{
+           return 1;
+        }
+    default:
+        return 0;
+    }
+}
+
+std::string base_species_slug(const std::string& species){
+    if (species.find("unown") != std::string::npos){
+        return "unown";
+    }
+    return species;
+}
+
+int slot_to_unownform(AdvEncounterSlot slot){
+    if (slot.species.find("unown") == std::string::npos){
+        return -1;
+    }else{
+        char form = slot.species.back();
+        switch (form){
+        case 'a':
+            return 0;
+        case 'b':
+            return 1;
+        case 'c':
+            return 2;
+        case 'd':
+            return 3;
+        case 'e':
+            return 4;
+        case 'f':
+            return 5;
+        case 'g':
+            return 6;
+        case 'h':
+            return 7;
+        case 'i':
+            return 8;
+        case 'j':
+            return 9;
+        case 'k':
+            return 10;
+        case 'l':
+            return 11;
+        case 'm':
+            return 12;
+        case 'n':
+            return 13;
+        case 'o':
+            return 14;
+        case 'p':
+            return 15;
+        case 'q':
+            return 16;
+        case 'r':
+            return 17;
+        case 's':
+            return 18;
+        case 't':
+            return 19;
+        case 'u':
+            return 20;
+        case 'v':
+            return 21;
+        case 'w':
+            return 22;
+        case 'x':
+            return 23;
+        case 'y':
+            return 24;
+        case 'z':
+            return 25;
+        case '!':
+            return 26;
+        case '?':
+            return 27;
+        default:
+            return -1;
+        }
+    }
+}
+
+AdvWildPokemonResult wild_pokemon_from_state(AdvRngState state, std::vector<AdvEncounterSlot> slots, bool super_rod){
+
+    uint8_t slot_roll = (state.s0 >> 16) % 100;
+    uint16_t level_roll = state.s1 >> 16;
+    uint8_t nature = (state.s2 >> 16) % 25;
+
+    uint8_t slot_num = slot_number_from_roll(slot_roll, slots.size(), super_rod);
+    AdvEncounterSlot slot = slots[slot_num];
+    int unownform = slot_to_unownform(slot);
+
+    uint8_t diff = slot.maxlevel - slot.minlevel;
+    if (slot.maxlevel < slot.minlevel){
+        diff = 0;
+    }
+    uint8_t level = slot.minlevel + (level_roll % (diff + 1));
+
+
+    AdvPokemonResult temp_poke;
+    if (unownform >= 0){
+        temp_poke = reroll_unown(static_cast<uint8_t>(unownform), state.seed, state.advance, state.s2, state.method);
+    }else{
+        temp_poke = reroll_wild_pokemon(nature, state.seed, state.advance, state.s3, state.method);
+    }
+
+    return {
+        slot.species,
+        temp_poke.pid,
+        temp_poke.gender,
+        temp_poke.nature,
+        temp_poke.ability,
+        temp_poke.ivs,
+        slot_num,
+        level,
+    };
+}
+
+bool egg_held_at_state(uint32_t state, AdvEggCompatibility compatibility){
+    uint8_t compat_threshold;
+    switch (compatibility){
+    case AdvEggCompatibility::high:
+        compat_threshold = 70;
+        break;
+    case AdvEggCompatibility::medium:
+        compat_threshold = 50;
+        break;
+    case AdvEggCompatibility::low:
+    default:
+        compat_threshold = 20;
+        break;
+    }
+    return (((state >> 16) * 100) / 0xffff) < compat_threshold;
+}
+
+AdvIVs get_inherited_ivs(AdvRngState state){
+    uint8_t inherited_index_0 = (state.s0 >> 16) % 6;
+    uint8_t inherited_index_1 = (state.s1 >> 16) % 5;
+    uint8_t inherited_index_2 = (state.s2 >> 16) % 4;
+
+    uint8_t parent_0 = (state.s3 >> 16) % 2;
+    uint8_t parent_1 = (state.s4 >> 16) % 2;
+    uint8_t parent_2 = (state.s5 >> 16) % 2;
+
+    std::vector<uint8_t> stats_left = { 0, 1, 2, 3, 4, 5 };
+
+    AdvIVs inherited_ivs; // 0 -> not inherited, 1 -> from parent A, 2 -> from parent B
+
+    uint8_t stat_index = stats_left[inherited_index_0];
+    inherited_ivs[stat_index] = parent_0 + 1;
+    stats_left.erase(stats_left.begin() + stat_index);
+
+    stat_index = stats_left[inherited_index_1];
+    inherited_ivs[stat_index] = parent_1 + 1;
+    if (stat_index < 5){
+        stats_left.erase(stats_left.begin() + stat_index);
+    }
+
+    stat_index = stats_left[inherited_index_2];
+    inherited_ivs[stat_index] = parent_2 + 1;
+
+    return inherited_ivs;
+}
+
+AdvIVs apply_inherited_ivs(
+    AdvIVs& ivs, 
+    AdvIVs& inherited_ivs, 
+    AdvIVs& parentA_ivs, 
+    AdvIVs& parentB_ivs
+){
+    AdvIVs final_ivs;
+    for (uint8_t i=0; i<6; i++){
+        if (inherited_ivs[i] == 1){
+            final_ivs[i] = parentA_ivs[i];
+        }else if (inherited_ivs[i] == 2){
+            final_ivs[i] = parentB_ivs[i];
+        }else{
+            final_ivs[i] = ivs[i];
+        }
+    }
+
+    return final_ivs;
+}
+
+AdvPokemonResult egg_to_pokemon(
+    AdvEggResult& egg_result,
+    AdvIVs& parentA_ivs, 
+    AdvIVs& parentB_ivs
+){
+    AdvIVs final_ivs = apply_inherited_ivs(
+        egg_result.ivs, egg_result.inherited_ivs, 
+        parentA_ivs, parentB_ivs
+    );
+
+    return {
+        egg_result.pid, egg_result.gender, egg_result.nature, egg_result.ability, final_ivs
+    };
+}
+
+AdvEggResult egg_from_pickup_state(AdvRngState state, uint16_t held_pid_half){
+    uint16_t pickup_pid_half = state.s0 >> 16;
+    
+    AdvIVs ivs;
+
+    uint8_t iv1_advances = (state.method == AdvRngMethod::Method2 || state.method == AdvRngMethod::Method4) ? 1 : 2;
+    for (uint8_t i=0; i<iv1_advances; i++){
+        advance_rng_state(state);
+    }
+    AdvIvGroup hpatkdef = iv_group_from_state(state.s0);
+    ivs.hp = hpatkdef.iv0;
+    ivs.attack = hpatkdef.iv1;
+    ivs.defense = hpatkdef.iv2;
+
+    uint8_t iv2_advances = (state.method == AdvRngMethod::Method2) ? 2 : 1;
+    for (uint8_t i=0; i<iv2_advances; i++){
+        advance_rng_state(state);
+    }
+    AdvIvGroup spespaspd = iv_group_from_state(state.s0);
+    ivs.speed = spespaspd.iv0;
+    ivs.spatk = spespaspd.iv1;
+    ivs.spdef = spespaspd.iv2;
+
+    uint8_t inheritance_advances = (state.method == AdvRngMethod::Method3 || state.method == AdvRngMethod::Method4) ? 3 : 2;
+    for (uint8_t i=0; i<inheritance_advances; i++){
+        advance_rng_state(state);
+    }
+    AdvIVs inherited_ivs = get_inherited_ivs(state);
+
+    uint32_t pid = (pickup_pid_half << 16) + held_pid_half;
+    uint8_t gender = gender_value_from_pid(pid);
+    AdvNature nature = nature_from_pid(pid);
+    AdvAbility ability = ability_from_pid(pid);
+
+    return { pid, gender, nature, ability, ivs, inherited_ivs };
+}
+
+AdvShinyType shiny_type_from_pid(uint32_t pid, uint16_t tid_xor_sid){
+    uint16_t pid0 = pid >> 16;
+    uint16_t pid1 = pid & 0xffff;
+    uint16_t pid_xor (pid0 ^ pid1);
+
+    if (pid_xor == tid_xor_sid){
+        return AdvShinyType::Square;
+    }else if ((pid_xor ^ tid_xor_sid) < 8){
+        return AdvShinyType::Star;
+    }else{
+        return AdvShinyType::Normal;
+    }
+}
+
+
+bool check_for_match(AdvPokemonResult res, AdvRngFilters target, int16_t gender_threshold, uint16_t tid_xor_sid){
+    return (target.nature == AdvNature::Any || (res.nature == target.nature))
+        && (target.ability == AdvAbility::Any || (res.ability == target.ability))
+        && (target.gender == AdvGender::Any || (gender_from_gender_value(res.gender, gender_threshold) == target.gender))
+        && (target.shiny == AdvShinyType::Any || (shiny_type_from_pid(res.pid, tid_xor_sid) == target.shiny))
+        && ((target.ivs.hp.low <= res.ivs.hp) && (target.ivs.hp.high >= res.ivs.hp))
+        && ((target.ivs.attack.low <= res.ivs.attack) && (target.ivs.attack.high >= res.ivs.attack))
+        && ((target.ivs.defense.low <= res.ivs.defense) && (target.ivs.defense.high >= res.ivs.defense))
+        && ((target.ivs.spatk.low <= res.ivs.spatk) && (target.ivs.spatk.high >= res.ivs.spatk))
+        && ((target.ivs.spdef.low <= res.ivs.spdef) && (target.ivs.spdef.high >= res.ivs.spdef))
+        && ((target.ivs.speed.low <= res.ivs.speed) && (target.ivs.speed.high >= res.ivs.speed));
+}
+
+bool check_for_match(AdvWildPokemonResult res, AdvRngFilters target, int16_t gender_threshold, uint16_t tid_xor_sid){
+    return (base_species_slug(target.species) == base_species_slug(res.species))
+        && (target.level == res.level)
+        && (target.nature == AdvNature::Any || (res.nature == target.nature))
+        && (target.ability == AdvAbility::Any || (res.ability == target.ability))
+        && (target.gender == AdvGender::Any || (gender_from_gender_value(res.gender, gender_threshold) == target.gender))
+        && (target.shiny == AdvShinyType::Any || (shiny_type_from_pid(res.pid, tid_xor_sid) == target.shiny))
+        && ((target.ivs.hp.low <= res.ivs.hp) && (target.ivs.hp.high >= res.ivs.hp))
+        && ((target.ivs.attack.low <= res.ivs.attack) && (target.ivs.attack.high >= res.ivs.attack))
+        && ((target.ivs.defense.low <= res.ivs.defense) && (target.ivs.defense.high >= res.ivs.defense))
+        && ((target.ivs.spatk.low <= res.ivs.spatk) && (target.ivs.spatk.high >= res.ivs.spatk))
+        && ((target.ivs.spdef.low <= res.ivs.spdef) && (target.ivs.spdef.high >= res.ivs.spdef))
+        && ((target.ivs.speed.low <= res.ivs.speed) && (target.ivs.speed.high >= res.ivs.speed));
+}
+
+Pokemon::NatureAdjustments nature_to_adjustment(AdvNature nature){
+    NatureAdjustments ret;
+    ret.attack = NatureAdjustment::NEUTRAL;
+    ret.defense = NatureAdjustment::NEUTRAL;
+    ret.spatk = NatureAdjustment::NEUTRAL;
+    ret.spdef = NatureAdjustment::NEUTRAL;
+    ret.speed = NatureAdjustment::NEUTRAL;
+
+    switch (nature){
+    case AdvNature::Bashful:
+    case AdvNature::Docile:
+    case AdvNature::Hardy:
+    case AdvNature::Quirky:
+    case AdvNature::Serious:
+        return ret;
+
+    case AdvNature::Bold:
+        ret.attack = NatureAdjustment::NEGATIVE;
+        ret.defense = NatureAdjustment::POSITIVE;
+        return ret;
+    case AdvNature::Modest:
+        ret.attack = NatureAdjustment::NEGATIVE;
+        ret.spatk = NatureAdjustment::POSITIVE;
+        return ret;
+    case AdvNature::Calm:
+        ret.attack = NatureAdjustment::NEGATIVE;
+        ret.spdef = NatureAdjustment::POSITIVE;
+        return ret;
+    case AdvNature::Timid:
+        ret.attack = NatureAdjustment::NEGATIVE;
+        ret.speed = NatureAdjustment::POSITIVE;
+        return ret;
+
+    case AdvNature::Lonely:
+        ret.defense = NatureAdjustment::NEGATIVE;
+        ret.attack = NatureAdjustment::POSITIVE;
+        return ret;
+    case AdvNature::Mild:
+        ret.defense = NatureAdjustment::NEGATIVE;
+        ret.spatk = NatureAdjustment::POSITIVE;
+        return ret;
+    case AdvNature::Gentle:
+        ret.defense = NatureAdjustment::NEGATIVE;
+        ret.spdef = NatureAdjustment::POSITIVE;
+        return ret;
+    case AdvNature::Hasty:
+        ret.defense = NatureAdjustment::NEGATIVE;
+        ret.speed = NatureAdjustment::POSITIVE;
+        return ret;
+
+    case AdvNature::Adamant:
+        ret.spatk = NatureAdjustment::NEGATIVE;
+        ret.attack = NatureAdjustment::POSITIVE;
+        return ret;
+    case AdvNature::Impish:
+        ret.spatk = NatureAdjustment::NEGATIVE;
+        ret.defense = NatureAdjustment::POSITIVE;
+        return ret;
+    case AdvNature::Careful:
+        ret.spatk = NatureAdjustment::NEGATIVE;
+        ret.spdef = NatureAdjustment::POSITIVE;
+        return ret;
+    case AdvNature::Jolly:
+        ret.spatk = NatureAdjustment::NEGATIVE;
+        ret.speed = NatureAdjustment::POSITIVE;
+        return ret;
+
+    case AdvNature::Naughty:
+        ret.spdef = NatureAdjustment::NEGATIVE;
+        ret.attack = NatureAdjustment::POSITIVE;
+        return ret;
+    case AdvNature::Lax:
+        ret.spdef = NatureAdjustment::NEGATIVE;
+        ret.defense = NatureAdjustment::POSITIVE;
+        return ret;
+    case AdvNature::Rash:
+        ret.spdef = NatureAdjustment::NEGATIVE;
+        ret.spatk = NatureAdjustment::POSITIVE;
+        return ret;
+    case AdvNature::Naive:
+        ret.spdef = NatureAdjustment::NEGATIVE;
+        ret.speed = NatureAdjustment::POSITIVE;
+        return ret;
+
+    case AdvNature::Brave:
+        ret.speed = NatureAdjustment::NEGATIVE;
+        ret.attack = NatureAdjustment::POSITIVE;
+        return ret;
+    case AdvNature::Relaxed:
+        ret.speed = NatureAdjustment::NEGATIVE;
+        ret.defense = NatureAdjustment::POSITIVE;
+        return ret;
+    case AdvNature::Quiet:
+        ret.speed = NatureAdjustment::NEGATIVE;
+        ret.spatk = NatureAdjustment::POSITIVE;
+        return ret;
+    case AdvNature::Sassy:
+        ret.speed = NatureAdjustment::NEGATIVE;
+        ret.spdef = NatureAdjustment::POSITIVE;
+        return ret;
+
+    default:
+        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Unknown Nature: " + std::to_string((int)nature));
+    }
+}
+
+AdvNature string_to_nature(const std::string& nature_string){
+    if (nature_string == "Hardy")   return AdvNature::Hardy;
+    if (nature_string == "Lonely")  return AdvNature::Lonely;    
+    if (nature_string == "Brave")   return AdvNature::Brave;  
+    if (nature_string == "Adamant") return AdvNature::Adamant;  
+    if (nature_string == "Naughty") return AdvNature::Naughty;  
+    if (nature_string == "Bold")    return AdvNature::Bold;  
+    if (nature_string == "Docile")  return AdvNature::Docile;  
+    if (nature_string == "Relaxed") return AdvNature::Relaxed;  
+    if (nature_string == "Impish")  return AdvNature::Impish;  
+    if (nature_string == "Lax")     return AdvNature::Lax;  
+    if (nature_string == "Timid")   return AdvNature::Timid;  
+    if (nature_string == "Hasty")   return AdvNature::Hasty;  
+    if (nature_string == "Serious") return AdvNature::Serious;  
+    if (nature_string == "Jolly")   return AdvNature::Jolly;  
+    if (nature_string == "Naive")   return AdvNature::Naive;  
+    if (nature_string == "Modest")  return AdvNature::Modest;  
+    if (nature_string == "Mild")    return AdvNature::Mild;  
+    if (nature_string == "Quiet")   return AdvNature::Quiet;  
+    if (nature_string == "Bashful") return AdvNature::Bashful;  
+    if (nature_string == "Rash")    return AdvNature::Rash;  
+    if (nature_string == "Calm")    return AdvNature::Calm;  
+    if (nature_string == "Gentle")  return AdvNature::Gentle;  
+    if (nature_string == "Sassy")   return AdvNature::Sassy;  
+    if (nature_string == "Careful") return AdvNature::Careful;  
+    if (nature_string == "Quirky")  return AdvNature::Quirky;  
+    return AdvNature::Any;
+}
+
+std::string nature_to_string(const AdvNature& nature){
+    switch (nature){
+    case AdvNature::Hardy:
+        return "Hardy";
+    case AdvNature::Lonely:
+        return "Lonely";
+    case AdvNature::Brave:
+        return "Brave";
+    case AdvNature::Adamant:
+        return "Adamant";
+    case AdvNature::Naughty:
+        return "Naughty";
+    case AdvNature::Bold:
+        return "Bold";
+    case AdvNature::Docile:
+        return "Docile";
+    case AdvNature::Relaxed:
+        return "Relaxed";
+    case AdvNature::Impish:
+        return "Impish";
+    case AdvNature::Lax:
+        return "Lax";
+    case AdvNature::Timid:
+        return "Timid";
+    case AdvNature::Hasty:
+        return "Hasty";
+    case AdvNature::Serious:
+        return "Serious";
+    case AdvNature::Jolly:
+        return "Jolly";
+    case AdvNature::Naive:
+        return "Naive";
+    case AdvNature::Modest:
+        return "Modest";
+    case AdvNature::Mild:
+        return "Mild";
+    case AdvNature::Quiet:
+        return "Quiet";
+    case AdvNature::Bashful:
+        return "Bashful";
+    case AdvNature::Rash:
+        return "Rash";
+    case AdvNature::Calm:
+        return "Calm";
+    case AdvNature::Gentle:
+        return "Gentle";
+    case AdvNature::Sassy:
+        return "Sassy";
+    case AdvNature::Careful:
+        return "Careful";
+    case AdvNature::Quirky:
+        return "Quirky";
+    default:
+        return "Any";
+    }
+}
+
+
+
+
+void shrink_iv_range(IvRange& mutated_range, const IvRange& fixed_range){
+    mutated_range.low  = std::max(mutated_range.low,  fixed_range.low);
+    mutated_range.high = std::min(mutated_range.high, fixed_range.high);
+}
+
+void shrink_iv_ranges(IvRanges& mutated_ranges, const IvRanges& fixed_ranges){
+    shrink_iv_range(mutated_ranges.hp,      fixed_ranges.hp);
+    shrink_iv_range(mutated_ranges.attack,  fixed_ranges.attack);
+    shrink_iv_range(mutated_ranges.defense, fixed_ranges.defense);
+    shrink_iv_range(mutated_ranges.spatk,   fixed_ranges.spatk);
+    shrink_iv_range(mutated_ranges.spdef,   fixed_ranges.spdef);
+    shrink_iv_range(mutated_ranges.speed,   fixed_ranges.speed);
+}
+
+AdvRngFilters observation_to_filters(const AdvObservedPokemon& observation, const BaseStats& basestats, AdvRngMethod method){
+    IvRanges filter_iv_ranges = {{0,31},{0,31},{0,31},{0,31},{0,31},{0,31}};
+    for (size_t i=0; i<observation.level.size(); i++){
+        uint8_t lv = observation.level[i];
+        StatReads sts = observation.stats[i];
+        EVs ev = observation.evs[i];
+        NatureAdjustments nat = nature_to_adjustment(observation.nature);
+
+        IvRanges iv_ranges_at_level = calc_iv_ranges(basestats, lv, ev, sts, nat);
+        shrink_iv_ranges(filter_iv_ranges, iv_ranges_at_level);
+    }
+
+    return AdvRngFilters { 
+        observation.species,
+        observation.level[0],
+        observation.gender,
+        observation.nature,
+        observation.ability,
+        filter_iv_ranges,
+        observation.shiny,
+        method
+    };
+}
+
+std::string gender_to_string(const AdvGender& gender){
+    switch (gender){
+    case AdvGender::Male:
+        return "\u2642";
+    case AdvGender::Female:
+        return "\u2640";
+    default:
+        return "-";
+    }
+}
+
+
+AdvRngSearcher::AdvRngSearcher(uint16_t seed, AdvRngState state, bool roaming)
+    : seed(seed)
+    , state(state)
+    , roaming(roaming)
+{}
+
+AdvRngSearcher::AdvRngSearcher(uint16_t seed, uint64_t min_advances, AdvRngMethod method, bool roaming)
+    : seed(seed)
+    , state(rngstate_from_seed(seed, min_advances, method))
+    , roaming(roaming)
+{}
+
+void AdvRngSearcher::advance_state(){
+    advance_rng_state(state);
+}
+
+void AdvRngSearcher::set_seed(uint16_t newseed){
+    seed = newseed;
+    state = rngstate_from_seed(seed, 0, state.method);
+}
+
+void AdvRngSearcher::set_state_advances(uint64_t advances){
+    state = rngstate_from_seed(seed, advances, state.method);
+}
+
+AdvPokemonResult AdvRngSearcher::generate_pokemon(){
+    return pokemon_from_state(state, roaming);
+}
+
+void AdvRngSearcher::search_advance_range(
+    std::vector<AdvRngState>& hits,
+    AdvRngFilters& target,
+    uint64_t min_advances,
+    uint64_t max_advances,
+    int16_t gender_threshold,
+    uint16_t tid_xor_sid
+){
+    for (uint8_t m=0; m<3; m++){
+        set_state_advances(min_advances);
+
+        AdvRngMethod method;
+        switch (m){
+        case 1:
+            method = AdvRngMethod::Method2;
+            break;
+        case 2:
+            method = AdvRngMethod::Method4;
+            break;
+        case 0:
+        default:
+            method = AdvRngMethod::Method1;
+            break;
+        }
+
+        if ((target.method != AdvRngMethod::Any) && (target.method != method)){
+            continue;
+        }else{
+            state.method = method;
+        }
+
+        for (uint64_t a=min_advances; a<=max_advances; a++){
+            AdvPokemonResult res = pokemon_from_state(state, roaming);
+            bool match = check_for_match(res, target, gender_threshold, tid_xor_sid);
+            if (match){
+               hits.emplace_back(state);
+            }
+            advance_state();
+        }
+    }
+}
+
+std::vector<AdvRngState> AdvRngSearcher::search(
+    AdvRngFilters& target,
+    const std::vector<uint16_t>& seeds,
+    uint64_t min_advances,
+    uint64_t max_advances,
+    int16_t gender_threshold,
+    uint16_t tid_xor_sid
+){
+    std::vector<AdvRngState> hits;
+    for (uint16_t seed : seeds){
+        set_seed(seed);
+        search_advance_range(hits, target, min_advances, max_advances, gender_threshold, tid_xor_sid);
+    }
+    return hits;
+}
+
+
+
+AdvRngWildSearcher::AdvRngWildSearcher(uint16_t seed, AdvRngState state, const std::vector<AdvEncounterSlot>& encounter_slots)
+    : seed(seed)
+    , state(state)
+    , encounter_slots(encounter_slots)
+{}
+
+AdvRngWildSearcher::AdvRngWildSearcher(uint16_t seed, uint64_t min_advances, const std::vector<AdvEncounterSlot>& encounter_slots, AdvRngMethod method)
+    : seed(seed)
+    , state(rngstate_from_seed(seed, min_advances, method))
+    , encounter_slots(encounter_slots)
+{}
+
+void AdvRngWildSearcher::advance_state(){
+    advance_rng_state(state);
+}
+
+void AdvRngWildSearcher::set_seed(uint16_t newseed){
+    seed = newseed;
+    state = rngstate_from_seed(seed, 0, state.method);
+}
+
+void AdvRngWildSearcher::set_state_advances(uint64_t advances){
+    state = rngstate_from_seed(seed, advances, state.method);
+}
+
+AdvWildPokemonResult AdvRngWildSearcher::generate_pokemon(bool super_rod){
+    return wild_pokemon_from_state(state, encounter_slots, super_rod);
+}
+
+void AdvRngWildSearcher::search_advance_range(
+    std::vector<AdvRngState>& hits,
+    AdvRngFilters& target,
+    uint64_t min_advances,
+    uint64_t max_advances,
+    int16_t gender_threshold,
+    bool super_rod,
+    uint16_t tid_xor_sid
+){
+    for (uint8_t m=0; m<3; m++){
+        set_state_advances(min_advances);
+
+        AdvRngMethod method;
+        switch (m){
+        case 1:
+            method = AdvRngMethod::Method2;
+            break;
+        case 2:
+            method = AdvRngMethod::Method4;
+            break;
+        case 0:
+        default:
+            method = AdvRngMethod::Method1;
+            break;
+        }
+
+        if ((target.method != AdvRngMethod::Any) && (target.method != method)){
+            continue;
+        }else{
+            state.method = method;
+        }
+
+        for (uint64_t a=min_advances; a<=max_advances; a++){
+            AdvWildPokemonResult res = wild_pokemon_from_state(state, encounter_slots, super_rod);
+            bool match = check_for_match(res, target, gender_threshold, tid_xor_sid);
+            if (match){
+                hits.emplace_back(state);
+            }
+            advance_state();
+        }
+    }
+}
+
+std::vector<AdvRngState> AdvRngWildSearcher::search(
+    AdvRngFilters& target,
+    const std::vector<uint16_t>& seeds,
+    uint64_t min_advances,
+    uint64_t max_advances,
+    int16_t gender_threshold,
+    bool super_rod,
+    uint16_t tid_xor_sid
+){
+    std::vector<AdvRngState> hits;
+    for (uint16_t seed : seeds){
+        set_seed(seed);
+        search_advance_range(hits, target, min_advances, max_advances, gender_threshold, super_rod, tid_xor_sid);
+    }
+    return hits;
+}
+
+
+
+AdvRngEggSearcher::AdvRngEggSearcher(uint16_t held_seed, AdvRngState held_state, uint16_t pickup_seed, AdvRngState pickup_state)
+    : held_seed(held_seed)
+    , held_state(held_state)
+    , pickup_seed(held_seed)
+    , pickup_state(held_state)
+{}
+
+AdvRngEggSearcher::AdvRngEggSearcher(
+    uint16_t held_seed, 
+    uint64_t min_held_advances, 
+    uint16_t pickup_seed,
+    uint64_t min_pickup_advances,
+    AdvRngMethod method
+)
+    : held_seed(held_seed)
+    , held_state(rngstate_from_seed(held_seed, min_held_advances, method))
+    , pickup_seed(pickup_seed)
+    , pickup_state(rngstate_from_seed(pickup_seed, min_pickup_advances, method))
+{}
+
+void AdvRngEggSearcher::advance_held_state(){
+    advance_rng_state(held_state);
+}
+
+void AdvRngEggSearcher::set_held_seed(uint16_t newseed){
+    held_seed = newseed;
+    held_state = rngstate_from_seed(held_seed, 0, held_state.method);
+}
+
+void AdvRngEggSearcher::set_held_state_advances(uint64_t advances){
+    held_state = rngstate_from_seed(held_seed, advances, held_state.method);
+}
+
+void AdvRngEggSearcher::advance_pickup_state(){
+    advance_rng_state(pickup_state);
+}
+
+void AdvRngEggSearcher::set_pickup_seed(uint16_t newseed){
+    pickup_seed = newseed;
+    pickup_state = rngstate_from_seed(pickup_seed, 0, pickup_state.method);
+}
+
+void AdvRngEggSearcher::set_pickup_state_advances(uint64_t advances){
+    pickup_state = rngstate_from_seed(pickup_seed, advances, pickup_state.method);
+}
+
+AdvEggResult AdvRngEggSearcher::generate_egg(){
+    uint16_t held_pid_half = (((held_state.s1) >> 16) % 0xfffe) + 1;
+    return egg_from_pickup_state(pickup_state, held_pid_half);
+}
+
+AdvPokemonResult AdvRngEggSearcher::generate_pokemon(AdvIVs& parentA_ivs, AdvIVs& parentB_ivs){
+    AdvEggResult egg_result = generate_egg();
+    return egg_to_pokemon(egg_result, parentA_ivs, parentB_ivs);
+}
+
+void AdvRngEggSearcher::search_pickup_advances_range(
+        std::vector<std::pair<AdvRngState, AdvRngState>>& hits,
+        AdvRngFilters& target,
+        uint16_t held_pid_half,
+        uint64_t min_pickup_advances,
+        uint64_t max_pickup_advances,
+        AdvIVs& parentA_ivs,
+        AdvIVs& parentB_ivs,
+        int16_t gender_threshold,
+        uint16_t tid_xor_sid
+    ){
+    for (uint8_t m=0; m<4; m++){
+        set_pickup_state_advances(min_pickup_advances);
+
+        AdvRngMethod method;
+        switch (m){
+        case 1:
+            method = AdvRngMethod::Method2;
+            break;
+        case 2:
+            method = AdvRngMethod::Method3;
+            break;
+        case 3:
+            method = AdvRngMethod::Method4;
+            break;
+        case 0:
+        default:
+            method = AdvRngMethod::Method1;
+            break;
+        }
+
+        if ((target.method != AdvRngMethod::Any) && (target.method != method)){
+            continue;
+        }else{
+            pickup_state.method = method;
+        }
+
+        for (uint64_t a=min_pickup_advances; a<=max_pickup_advances; a++){
+            AdvEggResult egg_res = egg_from_pickup_state(pickup_state, held_pid_half);
+            AdvPokemonResult poke_res = egg_to_pokemon(egg_res, parentA_ivs, parentB_ivs);
+            bool match = check_for_match(poke_res, target, gender_threshold, tid_xor_sid);
+            if (match){
+                std::pair<AdvRngState, AdvRngState> state_pair = { held_state, pickup_state };
+                hits.emplace_back(state_pair);
+            }
+            advance_pickup_state();
+        }
+    }
+}
+
+void AdvRngEggSearcher::search_pickups(
+    std::vector<std::pair<AdvRngState, AdvRngState>>& hits,
+    AdvRngFilters& target,
+    uint16_t held_pid_half,
+    const std::vector<uint16_t>& pickup_seeds,
+    uint64_t min_pickup_advances,
+    uint64_t max_pickup_advances,
+    AdvIVs& parentA_ivs,
+    AdvIVs& parentB_ivs,
+    int16_t gender_threshold,
+    uint16_t tid_xor_sid
+){
+    for (uint16_t pickup_seed : pickup_seeds){
+        set_pickup_seed(pickup_seed);
+        search_pickup_advances_range(hits, target, held_pid_half, min_pickup_advances, max_pickup_advances, parentA_ivs, parentB_ivs, gender_threshold, tid_xor_sid);
+    }
+}
+
+void AdvRngEggSearcher::search_held_advances_range(
+    std::vector<std::pair<AdvRngState, AdvRngState>>& hits,
+    AdvRngFilters& target,
+    uint64_t min_held_advances,
+    uint64_t max_held_advances,
+    const std::vector<uint16_t>& pickup_seeds,
+    uint64_t min_pickup_advances,
+    uint64_t max_pickup_advances,
+    AdvIVs& parentA_ivs,
+    AdvIVs& parentB_ivs,
+    AdvEggCompatibility compatibility,
+    int16_t gender_threshold,
+    uint16_t tid_xor_sid
+){
+    set_held_state_advances(min_held_advances);
+    for (uint64_t a=min_held_advances; a<=max_held_advances; a++){
+        if (egg_held_at_state(held_state.s0, compatibility)){
+            uint16_t held_pid_half = (((held_state.s1) >> 16) % 0xfffe) + 1;
+            search_pickups(
+                hits, target, 
+                held_pid_half, pickup_seeds, 
+                min_pickup_advances, max_pickup_advances,
+                parentA_ivs, parentB_ivs,
+                gender_threshold, tid_xor_sid
+            );
+        }
+        
+        advance_held_state();
+    }
+
+    
+}
+
+std::vector<std::pair<AdvRngState, AdvRngState>> AdvRngEggSearcher::search(
+    AdvRngFilters& target,
+    const std::vector<uint16_t>& held_seeds,
+    uint64_t min_held_advances,
+    uint64_t max_held_advances,
+    const std::vector<uint16_t>& pickup_seeds,
+    uint64_t min_pickup_advances,
+    uint64_t max_pickup_advances,
+    AdvIVs& parentA_ivs,
+    AdvIVs& parentB_ivs,
+    AdvEggCompatibility compatibility,
+    int16_t gender_threshold,
+    uint16_t tid_xor_sid
+){
+    std::vector<std::pair<AdvRngState, AdvRngState>> hits;
+    for (uint16_t h_seed : held_seeds){
+        set_held_seed(h_seed);
+        search_held_advances_range(
+            hits, target,
+            min_held_advances, max_held_advances, 
+            pickup_seeds, min_pickup_advances, max_pickup_advances,
+            parentA_ivs, parentB_ivs, compatibility, 
+            gender_threshold, tid_xor_sid
+        );
+    }
+
+    return hits;
+}
+
+
+}
+}
diff --git a/SerialPrograms/Source/Pokemon/Pokemon_AdvRng.h b/SerialPrograms/Source/Pokemon/Pokemon_AdvRng.h
new file mode 100644
index 0000000000..85a3ad8707
--- /dev/null
+++ b/SerialPrograms/Source/Pokemon/Pokemon_AdvRng.h
@@ -0,0 +1,383 @@
+/*  Adv RNG
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef Pokemon_AdvRng_H
+#define Pokemon_AdvRng_H
+
+#include <stdint.h>
+#include <utility>
+#include <vector>
+#include <stdexcept>
+#include "Pokemon_StatsCalculation.h"
+
+namespace PokemonAutomation{
+namespace Pokemon{
+
+struct AdvIvGroup{
+    uint8_t iv0;
+    uint8_t iv1;
+    uint8_t iv2;
+};
+
+struct AdvIVs{
+    uint8_t hp = 0;
+    uint8_t attack = 0;
+    uint8_t defense = 0;
+    uint8_t spatk = 0;
+    uint8_t spdef = 0;
+    uint8_t speed = 0;
+
+    uint8_t& operator[](int index){
+        switch (index){
+        case 0: 
+            return hp;
+        case 1:
+            return attack;
+        case 2:
+            return defense;
+        case 3:
+            return speed;
+        case 4:
+            return spatk;
+        case 5:
+            return spdef;
+        default:
+            throw std::runtime_error("Invalid IVs index. Please report this as a bug.");
+        }
+    }
+};
+
+enum class AdvNature{
+    Hardy,
+    Lonely,
+    Brave,
+    Adamant,
+    Naughty,
+    Bold,
+    Docile,
+    Relaxed,
+    Impish,
+    Lax,
+    Timid,
+    Hasty,
+    Serious,
+    Jolly,
+    Naive,
+    Modest,
+    Mild,
+    Quiet,
+    Bashful,
+    Rash,
+    Calm,
+    Gentle,
+    Sassy,
+    Careful,
+    Quirky,
+    Any
+};
+
+enum class AdvGender{
+    Male,
+    Female,
+    Any
+};
+
+enum class AdvAbility{
+    Zero,
+    One,
+    Any
+};
+
+enum class AdvShinyType{
+    Normal,
+    Star,
+    Square,
+    Any
+};
+
+enum class AdvRngMethod{
+    Method1, // egg normal
+    Method2, // egg split
+    Method3, // egg alternate
+    Method4, // egg mixed
+    Any
+};
+
+enum class AdvEggCompatibility{
+    low,
+    medium,
+    high
+};
+
+struct AdvRngState{
+    uint16_t seed;
+    uint64_t advance;
+    AdvRngMethod method;
+    uint32_t s0;
+    uint32_t s1;
+    uint32_t s2;
+    uint32_t s3;
+    uint32_t s4;
+    uint32_t s5;
+
+    bool operator<(const AdvRngState& rhs) const noexcept{
+        return this->advance < rhs.advance;
+    }
+
+    bool operator==(const AdvRngState& rhs) const noexcept{
+        return (
+            this->advance == rhs.advance
+            && this->seed == rhs.seed\
+        );
+    }
+};
+
+struct AdvEncounterSlot{
+    std::string species;
+    uint8_t minlevel;
+    uint8_t maxlevel;
+};
+
+struct AdvPokemonResult{
+    uint32_t pid;
+    uint8_t gender;
+    AdvNature nature;
+    AdvAbility ability;
+    AdvIVs ivs;
+};
+
+struct AdvWildPokemonResult{
+    std::string species;
+    uint32_t pid;
+    uint8_t gender;
+    AdvNature nature;
+    AdvAbility ability;
+    AdvIVs ivs;
+    uint8_t slot;
+    uint8_t level;
+};
+
+struct AdvEggResult{
+    uint32_t pid;
+    uint8_t gender;
+    AdvNature nature;
+    AdvAbility ability;
+    AdvIVs ivs;
+    AdvIVs inherited_ivs;
+};
+
+struct AdvObservedPokemon{
+    std::string species;
+    AdvGender gender;
+    AdvNature nature;
+    AdvAbility ability;
+    std::vector<uint8_t> level;
+    std::vector<StatReads> stats;
+    std::vector<EVs> evs;
+    AdvShinyType shiny;
+};
+
+struct AdvRngFilters{
+    std::string species;
+    uint8_t level;
+    AdvGender gender;
+    AdvNature nature;
+    AdvAbility ability;
+    IvRanges ivs;
+    AdvShinyType shiny;
+    AdvRngMethod method;
+};
+
+// updates the AdvObservedPokemon with info from leveling up
+// assumes levels are earned sequentially
+// input EVs are the ones earned since the last level up, not the total
+void level_up_observed_pokemon(AdvObservedPokemon& pokemon, const StatReads& newstats, const EVs& evyield);
+
+// returns the appropriate NatureAdjustments for an AdvNature
+Pokemon::NatureAdjustments nature_to_adjustment(AdvNature nature);
+
+Pokemon::AdvNature string_to_nature(const std::string& nature_string);
+std::string nature_to_string(const AdvNature& nature);
+
+// Forms that cannot be told apart from an observation (e.g. Unown letters) share a base slug.
+// Encounter slots carry the form-specific slug, while an observed species only ever carries
+// the base slug, so both sides must be folded before they are compared.
+std::string base_species_slug(const std::string& species);
+
+std::string gender_to_string(const AdvGender& gender);
+
+AdvGender gender_from_gender_value(uint8_t gender_value, int16_t threshold);
+
+// returns search filters that correspond with observed stats
+AdvRngFilters observation_to_filters(const AdvObservedPokemon& observation, const BaseStats& basestats, AdvRngMethod method = AdvRngMethod::Method1);
+
+AdvPokemonResult egg_to_pokemon(
+    AdvEggResult& egg_result,
+    AdvIVs& parentA_ivs, 
+    AdvIVs& parentB_ivs
+);
+
+class AdvRngSearcher{
+public:
+    uint16_t seed;
+    AdvRngState state;
+    bool roaming;
+
+    AdvRngSearcher(uint16_t seed, AdvRngState state, bool roaming = false);
+    AdvRngSearcher(uint16_t seed, uint64_t min_advances, AdvRngMethod method = AdvRngMethod::Method1, bool roaming = false);
+
+    void set_seed(uint16_t seed);
+    void set_state_advances(uint64_t advances);
+    void advance_state();
+
+    AdvPokemonResult generate_pokemon();
+
+    std::vector<AdvRngState> search(
+        AdvRngFilters& target,
+        const std::vector<uint16_t>& seeds,
+        uint64_t min_advances,
+        uint64_t max_advances,
+        int16_t gender_threshold = 126,
+        uint16_t tid_xor_sid = 0
+    );
+
+private:
+    void search_advance_range(
+        std::vector<AdvRngState>& hits,
+        AdvRngFilters& target,
+        uint64_t min_advances,
+        uint64_t max_advances,
+        int16_t gender_threshold,
+        uint16_t tid_xor_sid
+    );
+};
+
+class AdvRngWildSearcher{
+public:
+    uint16_t seed;
+    AdvRngState state;
+    const std::vector<AdvEncounterSlot>& encounter_slots;
+
+    AdvRngWildSearcher(uint16_t seed, AdvRngState state, const std::vector<AdvEncounterSlot>& encounter_slots);
+    AdvRngWildSearcher(uint16_t seed, uint64_t min_advances, const std::vector<AdvEncounterSlot>& encounter_slots, AdvRngMethod method = AdvRngMethod::Any);
+
+    void set_seed(uint16_t seed);
+    void set_state_advances(uint64_t advances);
+    void advance_state();
+
+    AdvWildPokemonResult generate_pokemon(bool super_rod = false);
+
+    std::vector<AdvRngState> search(
+        AdvRngFilters& target,
+        const std::vector<uint16_t>& seeds,
+        uint64_t min_advances,
+        uint64_t max_advances,
+        int16_t gender_threshold = 126,
+        bool super_rod = false,
+        uint16_t tid_xor_sid = 0
+    );
+
+private:
+    void search_advance_range(
+        std::vector<AdvRngState>& hits,
+        AdvRngFilters& target,
+        uint64_t min_advances,
+        uint64_t max_advances,
+        int16_t gender_threshold,
+        bool super_rod,
+        uint16_t tid_xor_sid
+    );
+};
+
+
+class AdvRngEggSearcher{
+public:
+    uint16_t held_seed;
+    AdvRngState held_state;
+
+    uint16_t pickup_seed;
+    AdvRngState pickup_state;
+
+    AdvRngEggSearcher(uint16_t held_seed, AdvRngState held_state, uint16_t pickup_seed, AdvRngState pickup_state);
+    AdvRngEggSearcher(
+        uint16_t held_seed, uint64_t min_seed_advances, 
+        uint16_t pickup_seed, uint64_t min_pickup_advances, 
+        AdvRngMethod method = AdvRngMethod::Any
+    );
+
+    void set_held_seed(uint16_t seed);
+    void set_held_state_advances(uint64_t advances);
+    void advance_held_state();
+
+    void set_pickup_seed(uint16_t seed);
+    void set_pickup_state_advances(uint64_t advances);
+    void advance_pickup_state();
+
+    AdvEggResult generate_egg();
+    AdvPokemonResult generate_pokemon(AdvIVs& parentA_ivs, AdvIVs& parentB_ivs);
+
+    std::vector<std::pair<AdvRngState, AdvRngState>> search(
+        AdvRngFilters& target,
+        const std::vector<uint16_t>& held_seeds,
+        uint64_t min_held_advances,
+        uint64_t max_held_advances,
+        const std::vector<uint16_t>& pickup_seeds,
+        uint64_t min_pickup_advances,
+        uint64_t max_pickup_advances,
+        AdvIVs& parentA_ivs,
+        AdvIVs& parentB_ivs,
+        AdvEggCompatibility compatibility,
+        int16_t gender_threshold = 126,
+        uint16_t tid_xor_sid = 0
+    );
+
+private:
+
+    void search_held_advances_range(
+        std::vector<std::pair<AdvRngState, AdvRngState>>& hits,
+        AdvRngFilters& target,
+        uint64_t min_held_advances,
+        uint64_t max_held_advances,
+        const std::vector<uint16_t>& pickup_seeds,
+        uint64_t min_pickup_advances,
+        uint64_t max_pickup_advances,
+        AdvIVs& parentA_ivs,
+        AdvIVs& parentB_ivs,
+        AdvEggCompatibility compatibility,
+        int16_t gender_threshold,
+        uint16_t tid_xor_sid
+    );
+
+    void search_pickups(
+        std::vector<std::pair<AdvRngState, AdvRngState>>& hits,
+        AdvRngFilters& target,
+        uint16_t held_pid_half,
+        const std::vector<uint16_t>& pickup_seeds,
+        uint64_t min_pickup_advances,
+        uint64_t max_pickup_advances,
+        AdvIVs& parentA_ivs,
+        AdvIVs& parentB_ivs,
+        int16_t gender_threshold,
+        uint16_t tid_xor_sid
+    );
+
+    void search_pickup_advances_range(
+        std::vector<std::pair<AdvRngState, AdvRngState>>& hits,
+        AdvRngFilters& target,
+        uint16_t held_pid_half,
+        uint64_t min_pickup_advances,
+        uint64_t max_pickup_advances,
+        AdvIVs& parentA_ivs,
+        AdvIVs& parentB_ivs,
+        int16_t gender_threshold,
+        uint16_t tid_xor_sid
+    );
+};
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Pokemon/Pokemon_BdspRng.cpp b/SerialPrograms/Source/Pokemon/Pokemon_BdspRng.cpp
new file mode 100644
index 0000000000..fafc53ab70
--- /dev/null
+++ b/SerialPrograms/Source/Pokemon/Pokemon_BdspRng.cpp
@@ -0,0 +1,424 @@
+/*  BDSP RNG
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <array>
+#include <utility>
+#include "Common/Cpp/CancellableScope.h"
+#include "Common/Cpp/Exceptions.h"
+#include "Pokemon_BdspRng.h"
+
+namespace PokemonAutomation{
+namespace Pokemon{
+
+
+
+const size_t STATIC_SEARCH_WINDOW = 64;
+
+const uint64_t CANCEL_CHECK_INTERVAL = 65536;
+
+
+uint64_t bdsp_splitmix64(uint64_t seed){
+    seed = 0xBF58476D1CE4E5B9 * (seed ^ (seed >> 30));
+    seed = 0x94D049BB133111EB * (seed ^ (seed >> 27));
+    return seed ^ (seed >> 31);
+}
+
+XoroshiroBDSP::XoroshiroBDSP(uint64_t seed)
+    : m_rng(
+        bdsp_splitmix64(seed + 0x9E3779B97F4A7C15),
+        bdsp_splitmix64(seed + 0x3C6EF372FE94F82A)
+    )
+{}
+
+
+const char* bdsp_shiny_name(BdspShiny shiny){
+    switch (shiny){
+    case BdspShiny::None:   return "Not Shiny";
+    case BdspShiny::Star:   return "Star Shiny";
+    case BdspShiny::Square: return "Square Shiny";
+    }
+    return "?";
+}
+const char* bdsp_gender_name(BdspGender gender){
+    switch (gender){
+    case BdspGender::Male:       return "Male";
+    case BdspGender::Female:     return "Female";
+    case BdspGender::Genderless: return "Genderless";
+    }
+    return "?";
+}
+
+uint8_t& BdspIVs::operator[](size_t index){
+    switch (index){
+    case 0: return hp;
+    case 1: return attack;
+    case 2: return defense;
+    case 3: return spatk;
+    case 4: return spdef;
+    case 5: return speed;
+    }
+    throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "BdspIVs: Index out of range.");
+}
+uint8_t BdspIVs::operator[](size_t index) const{
+    return const_cast<BdspIVs&>(*this)[index];
+}
+std::string BdspIVs::to_string() const{
+    return std::to_string(hp)
+        + "/" + std::to_string(attack)
+        + "/" + std::to_string(defense)
+        + "/" + std::to_string(spatk)
+        + "/" + std::to_string(spdef)
+        + "/" + std::to_string(speed);
+}
+
+std::string BdspPokemonResult::to_string() const{
+    std::string ret;
+    ret += std::string(bdsp_shiny_name(shiny));
+    ret += ", " + std::string(bdsp_gender_name(gender));
+    ret += ", Nature: " + std::string(bdsp_nature_name(nature));
+    // ret += ", Ability: " + std::to_string(ability);
+    ret += ", IVs: " + ivs.to_string();
+    // ret += ", PID: 0x" + tostr_hex_padded(8, pid);
+    // ret += ", EC: 0x" + tostr_hex_padded(8, ec);
+    return ret;
+}
+
+
+//  The game's own nature order. NatureCheckerValue uses a different one.
+static const std::array<const char*, 25> BDSP_NATURES{
+    "Hardy",   "Lonely",  "Brave",   "Adamant", "Naughty",
+    "Bold",    "Docile",  "Relaxed", "Impish",  "Lax",
+    "Timid",   "Hasty",   "Serious", "Jolly",   "Naive",
+    "Modest",  "Mild",    "Quiet",   "Bashful", "Rash",
+    "Calm",    "Gentle",  "Sassy",   "Careful", "Quirky",
+};
+static const std::array<NatureCheckerValue, 25> NATURE_CHECKER_VALUES{
+    NatureCheckerValue::Hardy,   NatureCheckerValue::Lonely,  NatureCheckerValue::Brave,
+    NatureCheckerValue::Adamant, NatureCheckerValue::Naughty, NatureCheckerValue::Bold,
+    NatureCheckerValue::Docile,  NatureCheckerValue::Relaxed, NatureCheckerValue::Impish,
+    NatureCheckerValue::Lax,     NatureCheckerValue::Timid,   NatureCheckerValue::Hasty,
+    NatureCheckerValue::Serious, NatureCheckerValue::Jolly,   NatureCheckerValue::Naive,
+    NatureCheckerValue::Modest,  NatureCheckerValue::Mild,    NatureCheckerValue::Quiet,
+    NatureCheckerValue::Bashful, NatureCheckerValue::Rash,    NatureCheckerValue::Calm,
+    NatureCheckerValue::Gentle,  NatureCheckerValue::Sassy,   NatureCheckerValue::Careful,
+    NatureCheckerValue::Quirky,
+};
+
+const char* bdsp_nature_name(uint8_t nature){
+    return nature < BDSP_NATURES.size() ? BDSP_NATURES[nature] : "?";
+}
+NatureCheckerValue bdsp_nature_to_checker_value(uint8_t nature){
+    return nature < NATURE_CHECKER_VALUES.size()
+        ? NATURE_CHECKER_VALUES[nature]
+        : NatureCheckerValue::UnableToDetect;
+}
+
+
+BdspShiny bdsp_get_shiny(uint32_t pid, uint16_t tsv){
+    uint16_t psv = (uint16_t)((pid >> 16) ^ (pid & 0xffff));
+    if (psv == tsv){
+        return BdspShiny::Square;
+    }
+    if ((tsv ^ psv) < 16){
+        return BdspShiny::Star;
+    }
+    return BdspShiny::None;
+}
+bool bdsp_is_shiny(uint32_t pid, uint16_t tsv){
+    uint16_t psv = (uint16_t)((pid >> 16) ^ (pid & 0xffff));
+    return (tsv ^ psv) < 16;
+}
+
+
+
+
+namespace{
+
+struct DirectSource{
+    Xorshift128& rng;
+    uint32_t next(){ return bdsp_gen_transform(rng.next()); }
+    uint32_t next(uint32_t modulo){ return next() % modulo; }
+};
+
+struct WindowSource{
+    Xorshift128List<STATIC_SEARCH_WINDOW>& list;
+    uint32_t next(){ return list.next_gen(); }
+    uint32_t next(uint32_t modulo){ return list.next_gen() % modulo; }
+};
+
+}
+
+
+static void force_not_shiny(uint32_t& pid, uint16_t tsv){
+    if (bdsp_is_shiny(pid, tsv)){
+        pid ^= 0x10000000;
+    }
+}
+
+static void force_shiny(uint32_t& pid, uint16_t tsv, BdspShiny shiny){
+    if (bdsp_get_shiny(pid, tsv) == shiny){
+        return;
+    }
+    uint16_t high = (uint16_t)((pid & 0xffff) ^ tsv ^ (2 - (uint8_t)shiny));
+    pid = ((uint32_t)high << 16) | (pid & 0xffff);
+}
+
+static BdspShiny resolve_shiny(uint32_t& pid, uint32_t sidtid, uint16_t tsv, bool shiny_locked){
+    if (shiny_locked){
+        force_not_shiny(pid, tsv);
+        return BdspShiny::None;
+    }
+
+    BdspShiny shiny = bdsp_get_shiny(pid, (uint16_t)((sidtid >> 16) ^ (sidtid & 0xffff)));
+    if (shiny != BdspShiny::None){
+        force_shiny(pid, tsv, shiny);
+    }else{
+        force_not_shiny(pid, tsv);
+    }
+    return shiny;
+}
+
+
+template <typename Source>
+static BdspPokemonResult generate_static_impl(
+    Source&& source, const BdspStaticTemplate& tmpl,
+    uint16_t tsv, uint8_t synchronize_nature
+){
+    BdspPokemonResult result;
+    result.level = tmpl.level;
+
+    result.ec = source.next();
+    uint32_t sidtid = source.next();
+    result.pid = source.next();
+
+    result.shiny = resolve_shiny(result.pid, sidtid, tsv, tmpl.shiny_locked);
+
+    const uint8_t UNSET = 255;
+    BdspIVs ivs;
+    for (size_t c = 0; c < 6; c++){
+        ivs[c] = UNSET;
+    }
+    for (uint8_t c = 0; c < tmpl.guaranteed_ivs;){
+        uint8_t index = (uint8_t)source.next(6);
+        if (ivs[index] == UNSET){
+            ivs[index] = 31;
+            c++;
+        }
+    }
+    for (size_t c = 0; c < 6; c++){
+        if (ivs[c] == UNSET){
+            ivs[c] = (uint8_t)source.next(32);
+        }
+    }
+    result.ivs = ivs;
+
+    switch (tmpl.ability_kind){
+    case 0:
+    case 1:
+        result.ability = tmpl.ability_kind;
+        break;
+    case 2:
+        //  Hidden ability. The roll still happens, its value is just ignored.
+        result.ability = 2;
+        source.next();
+        break;
+    default:
+        result.ability = (uint8_t)source.next(2);
+        break;
+    }
+
+    switch (tmpl.gender_ratio){
+    case 255:
+        result.gender = BdspGender::Genderless;
+        break;
+    case 254:
+        result.gender = BdspGender::Female;
+        break;
+    case 0:
+        result.gender = BdspGender::Male;
+        break;
+    default:
+        result.gender = source.next(253) + 1 < tmpl.gender_ratio
+            ? BdspGender::Female
+            : BdspGender::Male;
+        break;
+    }
+
+    //  A Synchronize lead skips the nature roll, so it shifts everything after it
+    result.nature = synchronize_nature != BDSP_NO_SYNCHRONIZE
+        ? synchronize_nature
+        : (uint8_t)source.next(25);
+
+    result.height = (uint8_t)source.next(129);
+    result.height += (uint8_t)source.next(128);
+    result.weight = (uint8_t)source.next(129);
+    result.weight += (uint8_t)source.next(128);
+
+    return result;
+}
+
+
+BdspPokemonResult bdsp_generate_static(
+    Xorshift128 rng, const BdspStaticTemplate& tmpl,
+    uint16_t tsv, uint8_t synchronize_nature
+){
+    return generate_static_impl(DirectSource{rng}, tmpl, tsv, synchronize_nature);
+}
+
+BdspPokemonResult bdsp_generate_roamer(
+    Xorshift128 rng, const BdspStaticTemplate& tmpl,
+    uint16_t tsv, uint8_t synchronize_nature
+){
+    BdspPokemonResult result;
+    result.level = tmpl.level;
+
+    //  roamers cost one advance regardless of how much they generate.
+    result.ec = bdsp_gen_transform(rng.next());
+    XoroshiroBDSP roamer(result.ec);
+
+    uint32_t sidtid = roamer.next_uint(0xffffffff);
+    result.pid = roamer.next_uint(0xffffffff);
+
+    result.shiny = resolve_shiny(result.pid, sidtid, tsv, false);
+
+    const uint8_t UNSET = 255;
+    BdspIVs ivs;
+    for (size_t c = 0; c < 6; c++){
+        ivs[c] = UNSET;
+    }
+    for (uint8_t c = 0; c < tmpl.guaranteed_ivs;){
+        uint8_t index = (uint8_t)roamer.next_uint(6);
+        if (ivs[index] == UNSET){
+            ivs[index] = 31;
+            c++;
+        }
+    }
+    for (size_t c = 0; c < 6; c++){
+        if (ivs[c] == UNSET){
+            ivs[c] = (uint8_t)roamer.next_uint(32);
+        }
+    }
+    result.ivs = ivs;
+
+    //  Neither roamer can have a hidden ability
+    result.ability = (uint8_t)roamer.next_uint(2);
+
+    result.nature = synchronize_nature != BDSP_NO_SYNCHRONIZE
+        ? synchronize_nature
+        : (uint8_t)roamer.next_uint(25);
+
+    result.height = (uint8_t)roamer.next_uint(129);
+    result.height += (uint8_t)roamer.next_uint(128);
+    result.weight = (uint8_t)roamer.next_uint(129);
+    result.weight += (uint8_t)roamer.next_uint(128);
+
+    //  Roamer gender is never rolled
+    result.gender = tmpl.gender_ratio == 254
+        ? BdspGender::Female
+        : BdspGender::Genderless;
+
+    return result;
+}
+
+BdspPokemonResult bdsp_generate(
+    Xorshift128 rng, const BdspStaticTemplate& tmpl,
+    uint16_t tsv, uint8_t synchronize_nature
+){
+    return tmpl.roamer
+        ? bdsp_generate_roamer(rng, tmpl, tsv, synchronize_nature)
+        : bdsp_generate_static(rng, tmpl, tsv, synchronize_nature);
+}
+
+
+static bool iv_in_range(const IvRange& range, uint8_t iv){
+    if (range.low >= 0 && iv < (uint8_t)range.low){
+        return false;
+    }
+    if (range.high >= 0 && iv > (uint8_t)range.high){
+        return false;
+    }
+    return true;
+}
+
+
+BdspStaticSearcher::BdspStaticSearcher(
+    const Xorshift128State& base_state,
+    BdspStaticTemplate tmpl,
+    uint16_t tsv,
+    uint8_t synchronize_nature
+)
+    : m_base_state(base_state)
+    , m_template(std::move(tmpl))
+    , m_tsv(tsv)
+    , m_synchronize_nature(synchronize_nature)
+{}
+
+BdspPokemonResult BdspStaticSearcher::generate(uint64_t advances) const{
+    Xorshift128 rng(m_base_state);
+    rng.advance(advances);
+    return bdsp_generate(rng, m_template, m_tsv, m_synchronize_nature);
+}
+
+std::vector<BdspRngHit> BdspStaticSearcher::scan(
+    uint64_t min_advances, uint64_t max_advances,
+    const std::function<bool(const BdspPokemonResult&)>& accept,
+    bool stop_at_first,
+    Cancellable* cancellable
+) const{
+    std::vector<BdspRngHit> hits;
+    if (min_advances > max_advances){
+        return hits;
+    }
+
+    //  Tracks the state at the start of each advance so that a hit can report it.
+    Xorshift128 rng(m_base_state);
+    rng.advance(min_advances);
+
+    //  A roamer reseeds a Xoroshiro on every advance
+    if (m_template.roamer){
+        for (uint64_t advances = min_advances; advances <= max_advances; advances++){
+            if (cancellable != nullptr && (advances % CANCEL_CHECK_INTERVAL) == 0){
+                cancellable->throw_if_cancelled();
+            }
+            BdspPokemonResult result = bdsp_generate_roamer(
+                rng, m_template, m_tsv, m_synchronize_nature
+            );
+            if (accept(result)){
+                hits.emplace_back(BdspRngHit{advances, rng.state(), result});
+                if (stop_at_first){
+                    return hits;
+                }
+            }
+            rng.next();
+        }
+        return hits;
+    }
+
+    Xorshift128List<STATIC_SEARCH_WINDOW> list(rng);
+    for (uint64_t advances = min_advances; advances <= max_advances; advances++, list.advance_state()){
+        if (cancellable != nullptr && (advances % CANCEL_CHECK_INTERVAL) == 0){
+            cancellable->throw_if_cancelled();
+        }
+        BdspPokemonResult result = generate_static_impl(
+            WindowSource{list}, m_template, m_tsv, m_synchronize_nature
+        );
+        if (accept(result)){
+            hits.emplace_back(BdspRngHit{advances, rng.state(), result});
+            if (stop_at_first){
+                return hits;
+            }
+        }
+        rng.next();
+    }
+    return hits;
+}
+
+
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/Pokemon/Pokemon_BdspRng.h b/SerialPrograms/Source/Pokemon/Pokemon_BdspRng.h
new file mode 100644
index 0000000000..b6b0d93c9a
--- /dev/null
+++ b/SerialPrograms/Source/Pokemon/Pokemon_BdspRng.h
@@ -0,0 +1,155 @@
+/*  BDSP RNG
+ *
+ *  From: https://github.com/PokemonAutomation/
+ * 
+ */
+
+#ifndef PokemonAutomation_Pokemon_BdspRng_H
+#define PokemonAutomation_Pokemon_BdspRng_H
+
+#include <stddef.h>
+#include <stdint.h>
+#include <functional>
+#include <string>
+#include <vector>
+#include "Pokemon_NatureChecker.h"
+#include "Pokemon_StatsCalculation.h"
+#include "Pokemon_Xoroshiro128Plus.h"
+#include "Pokemon_Xorshift128.h"
+
+namespace PokemonAutomation{
+    class Cancellable;
+namespace Pokemon{
+
+
+uint64_t bdsp_splitmix64(uint64_t seed);
+
+
+class XoroshiroBDSP{
+public:
+    explicit XoroshiroBDSP(uint64_t seed);
+
+    uint64_t next(){ return m_rng.next(); }
+    uint32_t next_uint(uint32_t maximum){ return (uint32_t)((m_rng.next() >> 32) % maximum); }
+
+private:
+    Xoroshiro128Plus m_rng;
+};
+
+
+enum class BdspShiny : uint8_t{
+    None = 0,
+    Star = 1,
+    Square = 2,
+};
+const char* bdsp_shiny_name(BdspShiny shiny);
+
+enum class BdspGender : uint8_t{
+    Male = 0,
+    Female = 1,
+    Genderless = 2,
+};
+const char* bdsp_gender_name(BdspGender gender);
+
+struct BdspIVs{
+    uint8_t hp = 0;
+    uint8_t attack = 0;
+    uint8_t defense = 0;
+    uint8_t spatk = 0;
+    uint8_t spdef = 0;
+    uint8_t speed = 0;
+
+    uint8_t& operator[](size_t index);
+    uint8_t operator[](size_t index) const;
+
+    std::string to_string() const;
+};
+
+struct BdspPokemonResult{
+    uint32_t ec = 0;
+    uint32_t pid = 0;
+    BdspShiny shiny = BdspShiny::None;
+    BdspIVs ivs;
+    uint8_t ability = 0;
+    BdspGender gender = BdspGender::Genderless;
+    uint8_t nature = 0;     //  Game index, 0-24. See bdsp_nature_name().
+    uint8_t level = 1;
+    uint8_t height = 0;
+    uint8_t weight = 0;
+
+    std::string to_string() const;
+};
+
+
+const char* bdsp_nature_name(uint8_t nature);
+NatureCheckerValue bdsp_nature_to_checker_value(uint8_t nature);
+
+//  psv == tsv is a square shiny; a difference under 16 is a star
+BdspShiny bdsp_get_shiny(uint32_t pid, uint16_t tsv);
+bool bdsp_is_shiny(uint32_t pid, uint16_t tsv);
+
+
+const uint8_t BDSP_NO_SYNCHRONIZE = 0xff;
+
+struct BdspStaticTemplate{
+    std::string species;
+    uint8_t level = 1;
+    uint8_t guaranteed_ivs = 0;
+    uint8_t ability_kind = 3;
+    uint8_t gender_ratio = 255;
+    bool shiny_locked = false;
+    bool roamer = false;
+};
+
+BdspPokemonResult bdsp_generate_static(
+    Xorshift128 rng, const BdspStaticTemplate& tmpl,
+    uint16_t tsv, uint8_t synchronize_nature = BDSP_NO_SYNCHRONIZE
+);
+BdspPokemonResult bdsp_generate_roamer(
+    Xorshift128 rng, const BdspStaticTemplate& tmpl,
+    uint16_t tsv, uint8_t synchronize_nature = BDSP_NO_SYNCHRONIZE
+);
+BdspPokemonResult bdsp_generate(
+    Xorshift128 rng, const BdspStaticTemplate& tmpl,
+    uint16_t tsv, uint8_t synchronize_nature = BDSP_NO_SYNCHRONIZE
+);
+
+
+struct BdspRngHit{
+    uint64_t advances = 0;
+    Xorshift128State state;
+    BdspPokemonResult result;
+};
+
+
+class BdspStaticSearcher{
+public:
+    BdspStaticSearcher(
+        const Xorshift128State& base_state,
+        BdspStaticTemplate tmpl,
+        uint16_t tsv,
+        uint8_t synchronize_nature = BDSP_NO_SYNCHRONIZE
+    );
+
+    const BdspStaticTemplate& pokemon_template() const{ return m_template; }
+
+    BdspPokemonResult generate(uint64_t advances) const;
+
+    std::vector<BdspRngHit> scan(
+        uint64_t min_advances, uint64_t max_advances,
+        const std::function<bool(const BdspPokemonResult&)>& accept,
+        bool stop_at_first = false,
+        Cancellable* cancellable = nullptr
+    ) const;
+
+private:
+    Xorshift128State m_base_state;
+    BdspStaticTemplate m_template;
+    uint16_t m_tsv;
+    uint8_t m_synchronize_nature;
+};
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Pokemon/Pokemon_BoxCursor.cpp b/SerialPrograms/Source/Pokemon/Pokemon_BoxCursor.cpp
new file mode 100644
index 0000000000..50d31b74e7
--- /dev/null
+++ b/SerialPrograms/Source/Pokemon/Pokemon_BoxCursor.cpp
@@ -0,0 +1,35 @@
+/*  Box Cursor
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Pokemon_BoxCursor.h"
+
+namespace PokemonAutomation{
+namespace Pokemon{
+
+
+const size_t BOX_ROWS = 5;
+const size_t BOX_COLS = 6;
+
+
+std::ostream& operator<<(std::ostream& os, const BoxCursor& cursor){
+    os << "(" << cursor.box << "/" << cursor.row << "/" << cursor.column << ")";
+    return os;
+}
+
+BoxCursor::BoxCursor(size_t index){
+    column = index % BOX_COLS;
+    index = index / BOX_COLS;
+    row = index % BOX_ROWS;
+    box = index / BOX_ROWS;
+}
+
+size_t to_global_index(size_t box, size_t row, size_t column){
+    return box * BOX_ROWS * BOX_COLS + row * BOX_COLS + column;
+}
+
+
+}
+}
diff --git a/SerialPrograms/Source/Pokemon/Pokemon_BoxCursor.h b/SerialPrograms/Source/Pokemon/Pokemon_BoxCursor.h
new file mode 100644
index 0000000000..c5090ece90
--- /dev/null
+++ b/SerialPrograms/Source/Pokemon/Pokemon_BoxCursor.h
@@ -0,0 +1,47 @@
+/*  Box Cursor
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Pokemon_BoxCursor_H
+#define PokemonAutomation_Pokemon_BoxCursor_H
+
+#include <cstddef>
+#include <ostream>
+
+namespace PokemonAutomation{
+namespace Pokemon{
+
+
+// Constants for box dimensions
+extern const size_t BOX_ROWS;
+extern const size_t BOX_COLS;
+
+
+// Represents a cursor position within Pokemon storage boxes
+struct BoxCursor{
+    // Convert a global index to a BoxCursor position
+    BoxCursor(size_t index);
+    BoxCursor(size_t box, size_t row, size_t column)
+        : box(box)
+        , row(row)
+        , column(column)
+    {}
+    BoxCursor(){}
+
+    size_t box = 0;
+    size_t row = 0;
+    size_t column = 0;
+};
+
+// Output operator for BoxCursor
+std::ostream& operator<<(std::ostream& os, const BoxCursor& cursor);
+
+// Convert a box cursor coordinate to a global index
+size_t to_global_index(size_t box, size_t row, size_t column);
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Pokemon/Pokemon_CollectedPokemonInfo.cpp b/SerialPrograms/Source/Pokemon/Pokemon_CollectedPokemonInfo.cpp
new file mode 100644
index 0000000000..7835a9b2fa
--- /dev/null
+++ b/SerialPrograms/Source/Pokemon/Pokemon_CollectedPokemonInfo.cpp
@@ -0,0 +1,219 @@
+/*  Collected Pokemon Info
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Exceptions.h"
+#include "Common/Cpp/Json/JsonValue.h"
+#include "Common/Cpp/Json/JsonArray.h"
+#include "Common/Cpp/Json/JsonObject.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "Pokemon/Pokemon_BoxCursor.h"
+#include "Pokemon/Resources/Pokemon_PokemonNames.h"
+#include "Pokemon_CollectedPokemonInfo.h"
+
+namespace PokemonAutomation{
+namespace Pokemon{
+
+
+bool operator==(const CollectedPokemonInfo& lhs, const CollectedPokemonInfo& rhs){
+    // NOTE edit when adding new struct members
+    return lhs.dex_number == rhs.dex_number &&
+           lhs.name_slug == rhs.name_slug &&
+           lhs.nature == rhs.nature &&
+           lhs.ability == rhs.ability &&
+           lhs.shiny == rhs.shiny &&
+           lhs.gmax == rhs.gmax &&
+           lhs.alpha == rhs.alpha &&
+           lhs.ball_slug == rhs.ball_slug &&
+           lhs.gender == rhs.gender &&
+           lhs.ot_id == rhs.ot_id &&
+           lhs.ot_name == rhs.ot_name &&
+           lhs.primary_type == rhs.primary_type &&
+           lhs.secondary_type == rhs.secondary_type &&
+           lhs.tera_type == rhs.tera_type &&
+           lhs.origin_mark == rhs.origin_mark &&
+           lhs.language_of_origin == rhs.language_of_origin &&
+           lhs.level == rhs.level;
+}
+
+
+bool operator<(const std::optional<CollectedPokemonInfo>& lhs, const std::optional<CollectedPokemonInfo>& rhs){
+    if (!lhs.has_value()){ // lhs is empty
+        return false;
+    }
+    if (!rhs.has_value()){ // lhs not empty but rhs is empty
+        return true;
+    }
+    // both sides are not empty:
+    for (const SortingRule& preference : *lhs->preferences){
+        switch(preference.sort_type){
+        // NOTE edit when adding new struct members
+        case SortingRuleType::DexNo:
+            if (lhs->dex_number != rhs->dex_number){
+                // we use (boolean != reverse) to apply the reverse effect
+                return (lhs->dex_number < rhs->dex_number) != preference.reverse;
+            }
+            break;
+        case SortingRuleType::Level:
+            if (lhs->level != rhs->level){
+                return (lhs->level < rhs->level) != preference.reverse;
+            }
+            break;
+        case SortingRuleType::Shiny:
+            if (lhs->shiny != rhs->shiny){
+                return lhs->shiny != preference.reverse;
+            }
+            break;
+        case SortingRuleType::Gigantamax:
+            if (lhs->gmax != rhs->gmax){
+                return lhs->gmax != preference.reverse;
+            }
+            break;
+        case SortingRuleType::Alpha:
+            if (lhs->alpha != rhs->alpha){
+                return lhs->alpha != preference.reverse;
+            }
+            break;
+        case SortingRuleType::Ball_Slug:
+            if (lhs->ball_slug != rhs->ball_slug){
+                return (lhs->ball_slug < rhs->ball_slug) != preference.reverse;
+            }
+            break;
+        case SortingRuleType::Gender:
+            if (lhs->gender != rhs->gender){
+                return (lhs->gender < rhs->gender) != preference.reverse;
+            }
+            break;
+        case SortingRuleType::Type:
+            if (lhs->primary_type != rhs->primary_type){
+                return (lhs->primary_type < rhs->primary_type) != preference.reverse;
+            }
+            if (lhs->secondary_type != rhs->secondary_type){
+                return (lhs->secondary_type < rhs->secondary_type) != preference.reverse;
+            }
+            break;
+        case SortingRuleType::Tera_Type:
+            if (lhs->tera_type != rhs->tera_type){
+                return (lhs->tera_type < rhs->tera_type) != preference.reverse;
+            }
+            break;
+        case SortingRuleType::Origin_Mark:
+            if (lhs->origin_mark != rhs->origin_mark){
+                return (lhs->origin_mark < rhs->origin_mark) != preference.reverse;
+            }
+            break;
+        case SortingRuleType::Nature:
+            if (lhs->nature != rhs->nature){
+                return (lhs->nature < rhs->nature) != preference.reverse;
+            }
+            break;
+        case SortingRuleType::Ability:
+            if (lhs->ability != rhs->ability){
+                return (lhs->ability < rhs->ability) != preference.reverse;
+            }
+            break;
+        case SortingRuleType::Language_of_Origin:
+            if (lhs->language_of_origin != rhs->language_of_origin){
+                return (lhs->language_of_origin < rhs->language_of_origin) != preference.reverse;
+            }
+            break;
+        default:
+            throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "unknown SortingRuleType");
+        } // end switch
+    } // end for preference
+
+    // Default to sort by dex number
+    return lhs->dex_number < rhs->dex_number;
+}
+
+std::ostream& operator<<(std::ostream& os, const std::optional<CollectedPokemonInfo>& pokemon)
+{
+    if (pokemon.has_value()){
+        // NOTE edit when adding new struct members
+        os << "(";
+        os << "dex: " << pokemon->dex_number << " " << pokemon->name_slug << " ";
+        os << "level:" << (unsigned)pokemon->level << " ";
+        os << "shiny:" << (pokemon->shiny ? "true" : "false") << " ";
+        os << "gmax:" << (pokemon->gmax ? "true" : "false") << " ";
+        os << "alpha:" << (pokemon->alpha ? "true" : "false") << " ";
+        os << "ball:" << pokemon->ball_slug << " ";
+        os << "gender:" << gender_to_string(pokemon->gender) << " ";
+        os << "ot_id:" << pokemon->ot_id << " ";
+        os << "ot_name:" << pokemon->ot_name << " ";
+        os << "nature:" << pokemon->nature << " ";
+        os << "ability:" << pokemon->ability << " ";
+        os << "primaryType:" << POKEMON_TYPE_SLUGS().get_string(pokemon->primary_type) << " ";
+        os << "secondaryType:" << POKEMON_TYPE_SLUGS().get_string(pokemon->secondary_type) << " ";
+        os << "teraType:" << POKEMON_TERA_TYPE_SLUGS().get_string(pokemon->tera_type) << " ";
+        os << "originMark:" << ORIGIN_MARK_SLUGS().get_string(pokemon->origin_mark) << " ";
+        os << "languageOfOrigin:" << pokemon->language_of_origin << " ";
+        os << ")";
+    }else{
+        os << "(empty)";
+    }
+    return os;
+}
+
+std::string create_overlay_info(const CollectedPokemonInfo& pokemon){
+    const std::string& display_name = get_pokemon_name(pokemon.name_slug).display_name();
+    char dex_str[7]; // leaving enough space to convert dex number uint16_t to string with "0" to fill up at least 4 characters, e.g. "0005"
+    snprintf(dex_str, sizeof(dex_str), "%04d", pokemon.dex_number);
+    std::string overlay_log = std::string(dex_str) + " " + display_name;
+    if(pokemon.gender == StatsHuntGenderFilter::Male){
+        overlay_log += " " + UNICODE_MALE;
+    }else if (pokemon.gender == StatsHuntGenderFilter::Female){
+        overlay_log += " " + UNICODE_FEMALE;
+    }
+    if (pokemon.shiny){
+        overlay_log += " *";
+    }
+    if (pokemon.gmax){
+        overlay_log += " G";
+    }
+    if (pokemon.alpha){
+        overlay_log += " " + UNICODE_ALPHA;
+    }
+    return overlay_log;
+}
+
+
+void save_boxes_data_to_json(const std::vector<std::optional<CollectedPokemonInfo>>& boxes_data, const std::string& json_path){
+    JsonArray pokemon_data;
+    for (size_t slot_idx = 0; slot_idx < boxes_data.size(); slot_idx++){
+        BoxCursor cursor(slot_idx);
+        JsonObject pokemon;
+        pokemon["index"] = slot_idx;
+        pokemon["box"] = cursor.box;
+        pokemon["row"] =  cursor.row;
+        pokemon["column"] =  cursor.column;
+        const auto& current_pokemon = boxes_data[slot_idx];
+        if (current_pokemon != std::nullopt){
+            // NOTE edit when adding new struct members
+            pokemon["name"] = current_pokemon->name_slug;
+            pokemon["dex"] = current_pokemon->dex_number;
+            pokemon["level"] = current_pokemon->level;
+            pokemon["shiny"] = current_pokemon->shiny;
+            pokemon["gmax"] = current_pokemon->gmax;
+            pokemon["alpha"] = current_pokemon->alpha;
+            pokemon["ball"] = current_pokemon->ball_slug;
+            pokemon["gender"] = gender_to_string(current_pokemon->gender);
+            pokemon["ot_id"] = current_pokemon->ot_id;
+            pokemon["ot_name"] = current_pokemon->ot_name;
+            pokemon["nature"] = current_pokemon->nature;
+            pokemon["ability"] = current_pokemon->ability;
+            pokemon["primary_type"] = POKEMON_TYPE_SLUGS().get_string(current_pokemon->primary_type);
+            pokemon["secondary_type"] = POKEMON_TYPE_SLUGS().get_string(current_pokemon->secondary_type);
+            pokemon["tera_type"] = POKEMON_TERA_TYPE_SLUGS().get_string(current_pokemon->tera_type);
+            pokemon["origin_mark"] = ORIGIN_MARK_SLUGS().get_string(current_pokemon->origin_mark);
+            pokemon["language_of_origin"] = current_pokemon->language_of_origin;
+        }
+        pokemon_data.push_back(std::move(pokemon));
+    }
+    pokemon_data.dump(json_path);
+}
+
+
+}
+}
diff --git a/SerialPrograms/Source/Pokemon/Pokemon_CollectedPokemonInfo.h b/SerialPrograms/Source/Pokemon/Pokemon_CollectedPokemonInfo.h
new file mode 100644
index 0000000000..d2eced3530
--- /dev/null
+++ b/SerialPrograms/Source/Pokemon/Pokemon_CollectedPokemonInfo.h
@@ -0,0 +1,78 @@
+/*  Collected Pokemon Info
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Pokemon_CollectedPokemonInfo_H
+#define PokemonAutomation_Pokemon_CollectedPokemonInfo_H
+
+#include <cstdint>
+#include <string>
+#include <optional>
+#include <vector>
+#include <ostream>
+#include "Pokemon/Options/Pokemon_StatsHuntFilter.h"
+#include "Pokemon/Options/Pokemon_BoxSortingTable.h"
+#include "Pokemon_OriginMarks.h"
+#include "Pokemon_Types.h"
+
+namespace PokemonAutomation{
+namespace Pokemon{
+
+
+struct CollectedPokemonInfo{
+    const std::vector<SortingRule>* preferences;
+
+    // When adding any new member here, do not forget to modify the functions below (ctrl-f "new struct members")
+    uint16_t dex_number = 0;
+    std::string name_slug = "";
+    std::string nature = "";
+    std::string ability = "";
+    bool shiny = false;
+    bool gmax = false;
+    bool alpha = false;
+    std::string ball_slug = "";
+    StatsHuntGenderFilter gender = StatsHuntGenderFilter::Genderless;
+    uint32_t ot_id = 0; // original trainer ID
+    std::string ot_name = ""; // original trainer name
+    PokemonType primary_type = PokemonType::NONE;
+    PokemonType secondary_type = PokemonType::NONE;
+    PokemonTeraType tera_type = PokemonTeraType::NONE;
+    OriginMark origin_mark = OriginMark::NONE;
+    std::string language_of_origin = "";
+    uint8_t level = 0; // 0 when not read by the program.
+};
+
+bool operator==(const CollectedPokemonInfo& lhs, const CollectedPokemonInfo& rhs);
+
+// Sort two pokemon slot. "Smaller" pokemon is placed closer to front.
+// If a slot is empty, it is always larger than non-empty slot so all the empty slots are at end after sorting.
+// For two pokemon, check each preference rule. If we cannot determine the order based on the first rule, go
+// to the second rule, and so on.
+// Available rules:
+// - Dex number: smaller ID should be at front.
+// - Level: lower level should be at front.
+// - Shiny: shiny pokemon should be at front.
+// - Gigantamax: Gigantamax pokemon should be at front.
+// - Alpha: Alpha pokemon should be at front.
+// - Ball slug: pokemon with a ball slug that's smaller in the alphabetical order should be at front.
+// - Gender: Male should be at front, then comes female, and genderless is last
+// Each rule type also has a "reverse" which if true, reverses above ordering for that rule type.
+// If user does not give a preference ruleset, sort by dex number.
+bool operator<(const std::optional<CollectedPokemonInfo>& lhs, const std::optional<CollectedPokemonInfo>& rhs);
+
+// Print pokemon info into ostream.
+// If empty, return "(empty)". Otherwise, "(dex: 1: bulbasaur shiny:...)"
+std::ostream& operator<<(std::ostream& os, const std::optional<CollectedPokemonInfo>& pokemon);
+
+// Create short info of a pokemon for overlay log display
+std::string create_overlay_info(const CollectedPokemonInfo& pokemon);
+
+// save boxes of pokemon info to a JSON file
+void save_boxes_data_to_json(const std::vector<std::optional<CollectedPokemonInfo>>& boxes_data, const std::string& json_path);
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Pokemon/Pokemon_DataTypes.h b/SerialPrograms/Source/Pokemon/Pokemon_DataTypes.h
index 42cf2fe3a7..adce61ce2f 100644
--- a/SerialPrograms/Source/Pokemon/Pokemon_DataTypes.h
+++ b/SerialPrograms/Source/Pokemon/Pokemon_DataTypes.h
@@ -1,6 +1,6 @@
 /*  Pokemon Types
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/Pokemon/Pokemon_EncounterStats.cpp b/SerialPrograms/Source/Pokemon/Pokemon_EncounterStats.cpp
index 20be57ff9f..e6c63eec8e 100644
--- a/SerialPrograms/Source/Pokemon/Pokemon_EncounterStats.cpp
+++ b/SerialPrograms/Source/Pokemon/Pokemon_EncounterStats.cpp
@@ -1,6 +1,6 @@
 /*  Pokemon Encounter Stats
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/Pokemon/Pokemon_EncounterStats.h b/SerialPrograms/Source/Pokemon/Pokemon_EncounterStats.h
index 66b268efd3..a91b460cf4 100644
--- a/SerialPrograms/Source/Pokemon/Pokemon_EncounterStats.h
+++ b/SerialPrograms/Source/Pokemon/Pokemon_EncounterStats.h
@@ -1,6 +1,6 @@
 /*  Pokemon Encounter Stats
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/Pokemon/Pokemon_Gf2Matrix.cpp b/SerialPrograms/Source/Pokemon/Pokemon_Gf2Matrix.cpp
new file mode 100644
index 0000000000..800b212c9b
--- /dev/null
+++ b/SerialPrograms/Source/Pokemon/Pokemon_Gf2Matrix.cpp
@@ -0,0 +1,183 @@
+/*  GF(2) Linear Algebra
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <bit>
+#include "Common/Cpp/Exceptions.h"
+#include "Pokemon_Gf2Matrix.h"
+
+namespace PokemonAutomation{
+namespace Pokemon{
+
+
+
+bool Gf2Vec128::get(size_t index) const{
+    return index < 64
+        ? ((high >> (63 - index)) & 1) != 0
+        : ((low >> (127 - index)) & 1) != 0;
+}
+void Gf2Vec128::set(size_t index, bool value){
+    uint64_t& word = index < 64 ? high : low;
+    uint64_t mask = (uint64_t)1 << (index < 64 ? 63 - index : 127 - index);
+    if (value){
+        word |= mask;
+    }else{
+        word &= ~mask;
+    }
+}
+bool Gf2Vec128::dot(const Gf2Vec128& x) const{
+    int bits = std::popcount(high & x.high) + std::popcount(low & x.low);
+    return (bits & 1) != 0;
+}
+
+
+
+Gf2Matrix128 Gf2Matrix128::identity(){
+    Gf2Matrix128 ret;
+    for (size_t c = 0; c < 128; c++){
+        ret.m_rows[c].set(c, true);
+    }
+    return ret;
+}
+
+//  row i of the product is the XOR of every row k in x that has x[k][i] == 1.
+Gf2Matrix128 Gf2Matrix128::operator*(const Gf2Matrix128& x) const{
+    Gf2Matrix128 ret;
+    for (size_t i = 0; i < 128; i++){
+        Gf2Vec128 accumulator;
+        uint64_t bits = m_rows[i].high;
+        while (bits != 0){
+            //  index = 63 - position.
+            accumulator ^= x.m_rows[63 - (size_t)std::countr_zero(bits)];
+            bits &= bits - 1;
+        }
+        bits = m_rows[i].low;
+        while (bits != 0){
+            //  index = 127 - position.
+            accumulator ^= x.m_rows[127 - (size_t)std::countr_zero(bits)];
+            bits &= bits - 1;
+        }
+        ret.m_rows[i] = accumulator;
+    }
+    return ret;
+}
+Gf2Vec128 Gf2Matrix128::operator*(const Gf2Vec128& column) const{
+    Gf2Vec128 ret;
+    for (size_t c = 0; c < 128; c++){
+        ret.set(c, m_rows[c].dot(column));
+    }
+    return ret;
+}
+
+Gf2Matrix128 Gf2Matrix128::pow(uint64_t exponent) const{
+    Gf2Matrix128 ret = identity();
+    Gf2Matrix128 base = *this;
+    while (exponent != 0){
+        if ((exponent & 1) != 0){
+            ret = ret * base;
+        }
+        exponent >>= 1;
+        if (exponent != 0){
+            base = base * base;
+        }
+    }
+    return ret;
+}
+
+Gf2SolveResult gf2_solve_128(
+    const std::vector<Gf2Vec128>& equations,
+    const std::vector<bool>& rhs
+){
+    if (equations.size() != rhs.size()){
+        throw InternalProgramError(
+            nullptr, PA_CURRENT_FUNCTION,
+            "gf2_solve_128(): Coefficient and constant counts do not match."
+        );
+    }
+
+    //  Augmented system. We reduce to row echelon form, then back-substitute.
+    std::vector<Gf2Vec128> rows = equations;
+    std::vector<bool> constants = rhs;
+    const size_t height = rows.size();
+
+    //  pivot_row[c] is the row that owns column "c" as its pivot, or NO_PIVOT.
+    const size_t NO_PIVOT = (size_t)0 - 1;
+    std::array<size_t, 128> pivot_row;
+    pivot_row.fill(NO_PIVOT);
+
+    size_t next_row = 0;
+    for (size_t column = 0; column < 128 && next_row < height; column++){
+        size_t pivot = NO_PIVOT;
+        for (size_t row = next_row; row < height; row++){
+            if (rows[row].get(column)){
+                pivot = row;
+                break;
+            }
+        }
+        if (pivot == NO_PIVOT){
+            continue;
+        }
+
+        std::swap(rows[next_row], rows[pivot]);
+        {
+            //  std::vector<bool> has no swappable references.
+            bool tmp = constants[next_row];
+            constants[next_row] = constants[pivot];
+            constants[pivot] = tmp;
+        }
+
+        for (size_t row = 0; row < height; row++){
+            if (row != next_row && rows[row].get(column)){
+                rows[row] ^= rows[next_row];
+                constants[row] = constants[row] != constants[next_row];
+            }
+        }
+
+        pivot_row[column] = next_row;
+        next_row++;
+    }
+
+    Gf2SolveResult result;
+
+    //  Any all-zero row with a nonzero constant makes the system unsolvable.
+    for (size_t row = 0; row < height; row++){
+        if (rows[row].is_zero() && constants[row]){
+            return result;
+        }
+    }
+    result.consistent = true;
+
+    //  Free variables are set to zero, so each pivot variable is just its constant.
+    for (size_t column = 0; column < 128; column++){
+        if (pivot_row[column] != NO_PIVOT){
+            result.solution.set(column, constants[pivot_row[column]]);
+        }
+    }
+
+    //  One null space basis vector per free column.
+    for (size_t column = 0; column < 128; column++){
+        if (pivot_row[column] != NO_PIVOT){
+            continue;
+        }
+        Gf2Vec128 basis;
+        basis.set(column, true);
+        for (size_t pivot_column = 0; pivot_column < 128; pivot_column++){
+            size_t row = pivot_row[pivot_column];
+            if (row != NO_PIVOT && rows[row].get(column)){
+                basis.set(pivot_column, true);
+            }
+        }
+        result.null_space_basis.emplace_back(basis);
+    }
+    result.null_space_dimension = result.null_space_basis.size();
+
+    return result;
+}
+
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/Pokemon/Pokemon_Gf2Matrix.h b/SerialPrograms/Source/Pokemon/Pokemon_Gf2Matrix.h
new file mode 100644
index 0000000000..10bedbdf8e
--- /dev/null
+++ b/SerialPrograms/Source/Pokemon/Pokemon_Gf2Matrix.h
@@ -0,0 +1,95 @@
+/*  GF(2) Linear Algebra
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Pokemon_Gf2Matrix_H
+#define PokemonAutomation_Pokemon_Gf2Matrix_H
+
+#include <stddef.h>
+#include <stdint.h>
+#include <array>
+#include <string>
+#include <vector>
+
+namespace PokemonAutomation{
+namespace Pokemon{
+
+
+//  A 128-bit vector over GF(2).
+//  Index 0 is the MSB of "high". Index 127 is the LSB of "low".
+struct Gf2Vec128{
+    uint64_t high = 0;
+    uint64_t low = 0;
+
+    Gf2Vec128() = default;
+    Gf2Vec128(uint64_t p_high, uint64_t p_low) : high(p_high), low(p_low) {}
+
+    bool operator==(const Gf2Vec128& x) const{ return high == x.high && low == x.low; }
+    bool operator!=(const Gf2Vec128& x) const{ return !(*this == x); }
+
+    bool get(size_t index) const;
+    void set(size_t index, bool value);
+
+    bool is_zero() const{ return (high | low) == 0; }
+
+    //  Parity of the bitwise AND. This is the GF(2) dot product.
+    bool dot(const Gf2Vec128& x) const;
+
+    Gf2Vec128 operator^(const Gf2Vec128& x) const{ return Gf2Vec128(high ^ x.high, low ^ x.low); }
+    Gf2Vec128& operator^=(const Gf2Vec128& x){ high ^= x.high; low ^= x.low; return *this; }
+};
+
+
+//  A 128x128 matrix over GF(2), stored as 128 row vectors.
+//  Vectors are treated as columns, so "matrix * vector" is the usual product.
+class Gf2Matrix128{
+public:
+    static Gf2Matrix128 identity();
+
+    const Gf2Vec128& operator[](size_t row) const{ return m_rows[row]; }
+    Gf2Vec128& operator[](size_t row){ return m_rows[row]; }
+
+    bool operator==(const Gf2Matrix128& x) const{ return m_rows == x.m_rows; }
+    bool operator!=(const Gf2Matrix128& x) const{ return !(*this == x); }
+
+    Gf2Matrix128 operator*(const Gf2Matrix128& x) const;
+    Gf2Vec128 operator*(const Gf2Vec128& column) const;
+
+    Gf2Matrix128 pow(uint64_t exponent) const;
+
+private:
+    std::array<Gf2Vec128, 128> m_rows;
+};
+
+
+struct Gf2SolveResult{
+    //  False means the system has no solution at all. This normally indicates
+    //  corrupt observations rather than a bug in the caller.
+    bool consistent = false;
+
+    //  One particular solution. Only meaningful if "consistent".
+    Gf2Vec128 solution;
+
+    //  Zero means the solution is unique. Anything larger means the
+    //  observations under-determine the state and more are needed.
+    size_t null_space_dimension = 0;
+
+    //  Basis of the null space. Adding any XOR-combination of these to
+    //  "solution" gives another valid solution.
+    std::vector<Gf2Vec128> null_space_basis;
+};
+
+//  Solve "equations * x = rhs" over GF(2), where each entry of "equations" is one
+//  row of coefficients and the matching entry of "rhs" is that row's constant.
+//  The system may have any number of rows; more than 128 is normal and desirable.
+Gf2SolveResult gf2_solve_128(
+    const std::vector<Gf2Vec128>& equations,
+    const std::vector<bool>& rhs
+);
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Pokemon/Pokemon_IVChecker.cpp b/SerialPrograms/Source/Pokemon/Pokemon_IVChecker.cpp
deleted file mode 100644
index d171e82cc4..0000000000
--- a/SerialPrograms/Source/Pokemon/Pokemon_IVChecker.cpp
+++ /dev/null
@@ -1,100 +0,0 @@
-/*  Pokemon IV Checker
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <map>
-#include "Common/Cpp/Exceptions.h"
-#include "Pokemon_IVChecker.h"
-
-namespace PokemonAutomation{
-namespace Pokemon{
-
-
-const std::map<std::string, IVCheckerValue> IVCheckerValue_TOKEN_TO_ENUM{
-    {"No Good",         IVCheckerValue::NoGood},
-    {"Decent",          IVCheckerValue::Decent},
-    {"Pretty Good",     IVCheckerValue::PrettyGood},
-    {"Very Good",       IVCheckerValue::VeryGood},
-    {"Fantastic",       IVCheckerValue::Fantastic},
-    {"Best",            IVCheckerValue::Best},
-    {"Hyper trained!",  IVCheckerValue::HyperTrained},
-};
-const std::map<IVCheckerValue, std::string> IVCheckerValue_ENUM_TO_TOKEN{
-    {IVCheckerValue::UnableToDetect,    "Unable to Detect"},
-    {IVCheckerValue::NoGood,            "No Good"},
-    {IVCheckerValue::Decent,            "Decent"},
-    {IVCheckerValue::PrettyGood,        "Pretty Good"},
-    {IVCheckerValue::VeryGood,          "Very Good"},
-    {IVCheckerValue::Fantastic,         "Fantastic"},
-    {IVCheckerValue::Best,              "Best"},
-    {IVCheckerValue::HyperTrained,      "Hyper trained!"},
-};
-IVCheckerValue IVCheckerValue_string_to_enum(const std::string& token){
-    auto iter = IVCheckerValue_TOKEN_TO_ENUM.find(token);
-    if (iter == IVCheckerValue_TOKEN_TO_ENUM.end()){
-        return IVCheckerValue::UnableToDetect;
-    }
-    return iter->second;
-}
-
-
-const EnumDatabase<IVCheckerValue>& IVCheckerValue_Database(){
-    static EnumDatabase<IVCheckerValue> database({
-        {IVCheckerValue::NoGood,       "no-good",       "No Good (0)"},
-        {IVCheckerValue::Decent,       "decent",        "Decent (1-15)"},
-        {IVCheckerValue::PrettyGood,   "pretty-good",   "Pretty Good (16-25)"},
-        {IVCheckerValue::VeryGood,     "very-good",     "Very Good (26-29)"},
-        {IVCheckerValue::Fantastic,    "fantastic",     "Fantastic (30)"},
-        {IVCheckerValue::Best,         "best",          "Best (31)"},
-        {IVCheckerValue::HyperTrained, "hyper-trained", "Hyper trained!"},
-    });
-    return database;
-}
-
-
-
-
-
-
-const EnumDatabase<IVCheckerFilter>& IVCheckerFilter_Database(){
-    static EnumDatabase<IVCheckerFilter> database({
-        {IVCheckerFilter::Anything,     "anything",     "Anything (0-31)"},
-        {IVCheckerFilter::NoGood,       "no-good",      "No Good (0)"},
-        {IVCheckerFilter::Decent,       "decent",       "Decent (1-15)"},
-        {IVCheckerFilter::PrettyGood,   "pretty-good",  "Pretty Good (16-25)"},
-        {IVCheckerFilter::VeryGood,     "very-good",    "Very Good (26-29)"},
-        {IVCheckerFilter::Fantastic,    "fantastic",    "Fantastic (30)"},
-        {IVCheckerFilter::Best,         "best",         "Best (31)"},
-    });
-    return database;
-}
-
-
-
-bool IVChecker_filter_match(IVCheckerFilter filter, IVCheckerValue value){
-    switch (filter){
-    case IVCheckerFilter::Anything:
-        return true;
-    case IVCheckerFilter::NoGood:
-        return value == IVCheckerValue::NoGood;
-    case IVCheckerFilter::Decent:
-        return value == IVCheckerValue::Decent;
-    case IVCheckerFilter::PrettyGood:
-        return value == IVCheckerValue::PrettyGood;
-    case IVCheckerFilter::VeryGood:
-        return value == IVCheckerValue::VeryGood;
-    case IVCheckerFilter::Fantastic:
-        return value == IVCheckerValue::Fantastic;
-    case IVCheckerFilter::Best:
-        return value == IVCheckerValue::Best;
-    }
-    return false;
-}
-
-
-
-
-}
-}
diff --git a/SerialPrograms/Source/Pokemon/Pokemon_IVChecker.h b/SerialPrograms/Source/Pokemon/Pokemon_IVChecker.h
deleted file mode 100644
index dbedd69ef1..0000000000
--- a/SerialPrograms/Source/Pokemon/Pokemon_IVChecker.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*  Pokemon IV Checker
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_Pokemon_IVChecker_H
-#define PokemonAutomation_Pokemon_IVChecker_H
-
-#include <string>
-#include <vector>
-#include "Common/Cpp/EnumDatabase.h"
-
-namespace PokemonAutomation{
-namespace Pokemon{
-
-
-enum class IVCheckerValue{
-    UnableToDetect,
-    NoGood,
-    Decent,
-    PrettyGood,
-    VeryGood,
-    Fantastic,
-    Best,
-    HyperTrained,
-};
-const EnumDatabase<IVCheckerValue>& IVCheckerValue_Database();
-IVCheckerValue IVCheckerValue_string_to_enum(const std::string& token);
-
-
-enum class IVCheckerFilter{
-    Anything,
-    NoGood,
-    Decent,
-    PrettyGood,
-    VeryGood,
-    Fantastic,
-    Best,
-};
-const EnumDatabase<IVCheckerFilter>& IVCheckerFilter_Database();
-bool IVChecker_filter_match(IVCheckerFilter filter, IVCheckerValue value);
-
-
-
-}
-}
-#endif
diff --git a/SerialPrograms/Source/Pokemon/Pokemon_IvJudge.cpp b/SerialPrograms/Source/Pokemon/Pokemon_IvJudge.cpp
new file mode 100644
index 0000000000..95bee7174c
--- /dev/null
+++ b/SerialPrograms/Source/Pokemon/Pokemon_IvJudge.cpp
@@ -0,0 +1,84 @@
+/*  Pokemon IV Checker
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Pokemon_IvJudge.h"
+
+namespace PokemonAutomation{
+namespace Pokemon{
+
+
+
+const EnumStringMap<IvJudgeValue>& IV_JUDGE_VALUE_STRINGS(){
+    static EnumStringMap<IvJudgeValue> database{
+        {IvJudgeValue::UnableToDetect,    "Unable to Detect"},
+        {IvJudgeValue::NoGood,            "No Good"},
+        {IvJudgeValue::Decent,            "Decent"},
+        {IvJudgeValue::PrettyGood,        "Pretty Good"},
+        {IvJudgeValue::VeryGood,          "Very Good"},
+        {IvJudgeValue::Fantastic,         "Fantastic"},
+        {IvJudgeValue::Best,              "Best"},
+        {IvJudgeValue::HyperTrained,      "Hyper trained!"},
+    };
+    return database;
+}
+const EnumDropdownDatabase<IvJudgeValue>& IvJudgeValue_Database(){
+    static EnumDropdownDatabase<IvJudgeValue> database({
+        {IvJudgeValue::NoGood,       "no-good",       "No Good (0)"},
+        {IvJudgeValue::Decent,       "decent",        "Decent (1-15)"},
+        {IvJudgeValue::PrettyGood,   "pretty-good",   "Pretty Good (16-25)"},
+        {IvJudgeValue::VeryGood,     "very-good",     "Very Good (26-29)"},
+        {IvJudgeValue::Fantastic,    "fantastic",     "Fantastic (30)"},
+        {IvJudgeValue::Best,         "best",          "Best (31)"},
+        {IvJudgeValue::HyperTrained, "hyper-trained", "Hyper trained!"},
+    });
+    return database;
+}
+
+
+
+
+
+
+const EnumDropdownDatabase<IvJudgeFilter>& IvJudgeFilter_Database(){
+    static EnumDropdownDatabase<IvJudgeFilter> database({
+        {IvJudgeFilter::Anything,     "anything",     "Anything (0-31)"},
+        {IvJudgeFilter::NoGood,       "no-good",      "No Good (0)"},
+        {IvJudgeFilter::Decent,       "decent",       "Decent (1-15)"},
+        {IvJudgeFilter::PrettyGood,   "pretty-good",  "Pretty Good (16-25)"},
+        {IvJudgeFilter::VeryGood,     "very-good",    "Very Good (26-29)"},
+        {IvJudgeFilter::Fantastic,    "fantastic",    "Fantastic (30)"},
+        {IvJudgeFilter::Best,         "best",         "Best (31)"},
+    });
+    return database;
+}
+
+
+
+bool IvJudge_filter_match(IvJudgeFilter filter, IvJudgeValue value){
+    switch (filter){
+    case IvJudgeFilter::Anything:
+        return true;
+    case IvJudgeFilter::NoGood:
+        return value == IvJudgeValue::NoGood;
+    case IvJudgeFilter::Decent:
+        return value == IvJudgeValue::Decent;
+    case IvJudgeFilter::PrettyGood:
+        return value == IvJudgeValue::PrettyGood;
+    case IvJudgeFilter::VeryGood:
+        return value == IvJudgeValue::VeryGood;
+    case IvJudgeFilter::Fantastic:
+        return value == IvJudgeValue::Fantastic;
+    case IvJudgeFilter::Best:
+        return value == IvJudgeValue::Best;
+    }
+    return false;
+}
+
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/Pokemon/Pokemon_IvJudge.h b/SerialPrograms/Source/Pokemon/Pokemon_IvJudge.h
new file mode 100644
index 0000000000..22e953a9e1
--- /dev/null
+++ b/SerialPrograms/Source/Pokemon/Pokemon_IvJudge.h
@@ -0,0 +1,47 @@
+/*  Pokemon Iv Judge
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Pokemon_IvJudge_H
+#define PokemonAutomation_Pokemon_IvJudge_H
+
+#include "Common/Cpp/EnumStringMap.h"
+#include "Common/Cpp/Options/EnumDropdownDatabase.h"
+
+namespace PokemonAutomation{
+namespace Pokemon{
+
+
+enum class IvJudgeValue{
+    UnableToDetect,
+    NoGood,
+    Decent,
+    PrettyGood,
+    VeryGood,
+    Fantastic,
+    Best,
+    HyperTrained,
+};
+const EnumStringMap<IvJudgeValue>& IV_JUDGE_VALUE_STRINGS();
+const EnumDropdownDatabase<IvJudgeValue>& IvJudgeValue_Database();
+
+
+enum class IvJudgeFilter{
+    Anything,
+    NoGood,
+    Decent,
+    PrettyGood,
+    VeryGood,
+    Fantastic,
+    Best,
+};
+const EnumDropdownDatabase<IvJudgeFilter>& IvJudgeFilter_Database();
+bool IvJudge_filter_match(IvJudgeFilter filter, IvJudgeValue value);
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Pokemon/Pokemon_NatureChecker.cpp b/SerialPrograms/Source/Pokemon/Pokemon_NatureChecker.cpp
index db2dcde414..7f0bbeb926 100644
--- a/SerialPrograms/Source/Pokemon/Pokemon_NatureChecker.cpp
+++ b/SerialPrograms/Source/Pokemon/Pokemon_NatureChecker.cpp
@@ -1,252 +1,230 @@
-/*  Pokemon Nature Checker
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <map>
-#include "Common/Cpp/Exceptions.h"
-#include "Pokemon_NatureChecker.h"
-
-namespace PokemonAutomation{
-namespace Pokemon{
-
-const std::map<std::string, NatureCheckerValue> NatureCheckerValue_TOKEN_TO_ENUM{
-    {"Adamant",     NatureCheckerValue::Adamant},
-    {"Bashful",     NatureCheckerValue::Bashful},
-    {"Bold",        NatureCheckerValue::Bold},
-    {"Brave",       NatureCheckerValue::Brave},
-    {"Calm",        NatureCheckerValue::Calm},
-    {"Careful",     NatureCheckerValue::Careful},
-    {"Docile",      NatureCheckerValue::Docile},
-    {"Gentle",      NatureCheckerValue::Gentle},
-    {"Hardy",       NatureCheckerValue::Hardy},
-    {"Hasty",       NatureCheckerValue::Hasty},
-    {"Impish",      NatureCheckerValue::Impish},
-    {"Jolly",       NatureCheckerValue::Jolly},
-    {"Lax",         NatureCheckerValue::Lax},
-    {"Lonely",      NatureCheckerValue::Lonely},
-    {"Mild",        NatureCheckerValue::Mild},
-    {"Modest",      NatureCheckerValue::Modest},
-    {"Naive",       NatureCheckerValue::Naive},
-    {"Naughty",     NatureCheckerValue::Naughty},
-    {"Quiet",       NatureCheckerValue::Quiet},
-    {"Quirky",      NatureCheckerValue::Quirky},
-    {"Rash",        NatureCheckerValue::Rash},
-    {"Relaxed",     NatureCheckerValue::Relaxed},
-    {"Sassy",       NatureCheckerValue::Sassy},
-    {"Serious",     NatureCheckerValue::Serious},
-    {"Timid",       NatureCheckerValue::Timid},
-};
-const std::map<NatureCheckerValue, std::string> NatureCheckerValue_ENUM_TO_TOKEN{
-    {NatureCheckerValue::UnableToDetect,    "Unable to Detect"},
-    {NatureCheckerValue::Neutral,           "Neutral"},
-    {NatureCheckerValue::Adamant,           "Adamant"},
-    {NatureCheckerValue::Bashful,           "Bashful"},
-    {NatureCheckerValue::Bold,              "Bold"},
-    {NatureCheckerValue::Brave,             "Brave"},
-    {NatureCheckerValue::Calm,              "Calm"},
-    {NatureCheckerValue::Careful,           "Careful"},
-    {NatureCheckerValue::Gentle,            "Gentle"},
-    {NatureCheckerValue::Hardy,             "Hardy"},
-    {NatureCheckerValue::Hasty,             "Hasty"},
-    {NatureCheckerValue::Impish,            "Impish"},
-    {NatureCheckerValue::Jolly,             "Jolly"},
-    {NatureCheckerValue::Lax,               "Lax"},
-    {NatureCheckerValue::Lonely,            "Lonely"},
-    {NatureCheckerValue::Mild,              "Mild"},
-    {NatureCheckerValue::Modest,            "Modest"},
-    {NatureCheckerValue::Naive,             "Naive"},
-    {NatureCheckerValue::Naughty,           "Naughty"},
-    {NatureCheckerValue::Quiet,             "Quiet"},
-    {NatureCheckerValue::Quirky,            "Quirky"},
-    {NatureCheckerValue::Rash,              "Rash"},
-    {NatureCheckerValue::Relaxed,           "Relaxed"},
-    {NatureCheckerValue::Sassy,             "Sassy"},
-    {NatureCheckerValue::Serious,           "Serious"},
-    {NatureCheckerValue::Timid,             "Timid"},
-};
-
-const std::map<std::pair<int, int>, NatureCheckerValue> NatureCheckerValue_HELPHINDER_TO_ENUM{
-    {{ 0, 2 },      NatureCheckerValue::Adamant},
-    {{ -1, -1 },    NatureCheckerValue::Neutral}, //Bashful, Docile, Hardy, Quirky, Serious
-    {{ 1, 0 },      NatureCheckerValue::Bold},
-    {{ 0, 4 },      NatureCheckerValue::Brave},
-    {{ 3, 0 },      NatureCheckerValue::Calm},
-    {{ 3, 2 },      NatureCheckerValue::Careful},
-    {{ 3, 1 },      NatureCheckerValue::Gentle},
-    {{ 4, 1 },      NatureCheckerValue::Hasty},
-    {{ 1, 2 },      NatureCheckerValue::Impish},
-    {{ 4, 2 },      NatureCheckerValue::Jolly},
-    {{ 1, 3 },      NatureCheckerValue::Lax},
-    {{ 0, 1 },      NatureCheckerValue::Lonely},
-    {{ 2, 1 },      NatureCheckerValue::Mild},
-    {{ 2, 0 },      NatureCheckerValue::Modest},
-    {{ 4, 3 },      NatureCheckerValue::Naive},
-    {{ 0, 3 },      NatureCheckerValue::Naughty},
-    {{ 2, 4 },      NatureCheckerValue::Quiet},
-    {{ 2, 3 },      NatureCheckerValue::Rash},
-    {{ 1, 4 },      NatureCheckerValue::Relaxed},
-    {{ 3, 4 },      NatureCheckerValue::Sassy},
-    {{ 4, 0 },      NatureCheckerValue::Timid},
-};
-
-NatureCheckerValue NatureCheckerValue_string_to_enum(const std::string& token){
-    auto iter = NatureCheckerValue_TOKEN_TO_ENUM.find(token);
-    if (iter == NatureCheckerValue_TOKEN_TO_ENUM.end()){
-        return NatureCheckerValue::UnableToDetect;
-    }
-    return iter->second;
-}
-
-NatureCheckerValue NatureCheckerValue_helphinder_to_enum(const std::pair<int,int>& token) {
-    auto iter = NatureCheckerValue_HELPHINDER_TO_ENUM.find(token);
-    if (iter == NatureCheckerValue_HELPHINDER_TO_ENUM.end()) {
-        return NatureCheckerValue::UnableToDetect;
-    }
-    return iter->second;
-}
-
-const EnumDatabase<NatureCheckerValue>& NatureCheckerValue_Database(){
-    static EnumDatabase<NatureCheckerValue> database({
-        {NatureCheckerValue::Adamant,     "adamant",      "Adamant"},
-        {NatureCheckerValue::Bashful,     "bashful",      "Bashful"},
-        {NatureCheckerValue::Bold,        "bold",         "Bold"},
-        {NatureCheckerValue::Brave,       "brave",        "Brave"},
-        {NatureCheckerValue::Calm,        "calm",         "Calm"},
-        {NatureCheckerValue::Careful,     "careful",      "Careful"},
-        {NatureCheckerValue::Docile,      "docile",       "Docile"},
-        {NatureCheckerValue::Gentle,      "gentle",       "Gentle"},
-        {NatureCheckerValue::Hardy,       "hardy",        "Hardy"},
-        {NatureCheckerValue::Hasty,       "hasty",        "Hasty"},
-        {NatureCheckerValue::Impish,      "impish",       "Impish"},
-        {NatureCheckerValue::Jolly,       "jolly",        "Jolly"},
-        {NatureCheckerValue::Lax,         "lax",          "Lax"},
-        {NatureCheckerValue::Lonely,      "lonely",       "Lonely"},
-        {NatureCheckerValue::Mild,        "mild",         "Mild"},
-        {NatureCheckerValue::Modest,      "modest",       "Modest"},
-        {NatureCheckerValue::Naive,       "naive",        "Naive"},
-        {NatureCheckerValue::Naughty,     "naughty",      "Naughty"},
-        {NatureCheckerValue::Quiet,       "quiet",        "Quiet"},
-        {NatureCheckerValue::Quirky,      "quirky",       "Quirky"},
-        {NatureCheckerValue::Rash,        "rash",         "Rash"},
-        {NatureCheckerValue::Relaxed,     "relaxed",      "Relaxed"},
-        {NatureCheckerValue::Sassy,       "sassy",        "Sassy"},
-        {NatureCheckerValue::Serious,     "serious",      "Serious"},
-        {NatureCheckerValue::Timid,       "timid",        "Timid"},
-    });
-    return database;
-}
-
-const EnumDatabase<NatureCheckerFilter>& NatureCheckerFilter_Database(){
-    static EnumDatabase<NatureCheckerFilter> database({
-        {NatureCheckerFilter::Any,         "any",          "Any"},
-        {NatureCheckerFilter::Adamant,     "adamant",      "Adamant"},
-        {NatureCheckerFilter::Bashful,     "bashful",      "Bashful"},
-        {NatureCheckerFilter::Bold,        "bold",         "Bold"},
-        {NatureCheckerFilter::Brave,       "brave",        "Brave"},
-        {NatureCheckerFilter::Calm,        "calm",         "Calm"},
-        {NatureCheckerFilter::Careful,     "careful",      "Careful"},
-        {NatureCheckerFilter::Docile,      "docile",       "Docile"},
-        {NatureCheckerFilter::Gentle,      "gentle",       "Gentle"},
-        {NatureCheckerFilter::Hardy,       "hardy",        "Hardy"},
-        {NatureCheckerFilter::Hasty,       "hasty",        "Hasty"},
-        {NatureCheckerFilter::Impish,      "impish",       "Impish"},
-        {NatureCheckerFilter::Jolly,       "jolly",        "Jolly"},
-        {NatureCheckerFilter::Lax,         "lax",          "Lax"},
-        {NatureCheckerFilter::Lonely,      "lonely",       "Lonely"},
-        {NatureCheckerFilter::Mild,        "mild",         "Mild"},
-        {NatureCheckerFilter::Modest,      "modest",       "Modest"},
-        {NatureCheckerFilter::Naive,       "naive",        "Naive"},
-        {NatureCheckerFilter::Naughty,     "naughty",      "Naughty"},
-        {NatureCheckerFilter::Quiet,       "quiet",        "Quiet"},
-        {NatureCheckerFilter::Quirky,      "quirky",       "Quirky"},
-        {NatureCheckerFilter::Rash,        "rash",         "Rash"},
-        {NatureCheckerFilter::Relaxed,     "relaxed",      "Relaxed"},
-        {NatureCheckerFilter::Sassy,       "sassy",        "Sassy"},
-        {NatureCheckerFilter::Serious,     "serious",      "Serious"},
-        {NatureCheckerFilter::Timid,       "timid",        "Timid"},
-    });
-    return database;
-}
-
-
-
-bool NatureChecker_filter_match(NatureCheckerFilter filter, NatureCheckerValue value){
-    switch (filter){
-    case NatureCheckerFilter::Any:
-        return true;
-    case NatureCheckerFilter::Adamant:
-        return value == NatureCheckerValue::Adamant;
-    case NatureCheckerFilter::Bashful:
-        if (value == NatureCheckerValue::Neutral) {
-            return true;
-        }
-        return value == NatureCheckerValue::Bashful;
-    case NatureCheckerFilter::Bold:
-        return value == NatureCheckerValue::Bold;
-    case NatureCheckerFilter::Brave:
-        return value == NatureCheckerValue::Brave;
-    case NatureCheckerFilter::Calm:
-        return value == NatureCheckerValue::Calm;
-    case NatureCheckerFilter::Careful:
-        return value == NatureCheckerValue::Careful;
-    case NatureCheckerFilter::Docile:
-        if (value == NatureCheckerValue::Neutral) {
-            return true;
-        }
-        return value == NatureCheckerValue::Docile;
-    case NatureCheckerFilter::Gentle:
-        return value == NatureCheckerValue::Gentle;
-    case NatureCheckerFilter::Hardy:
-        if (value == NatureCheckerValue::Neutral) {
-            return true;
-        }
-        return value == NatureCheckerValue::Hardy;
-    case NatureCheckerFilter::Hasty:
-        return value == NatureCheckerValue::Hasty;
-    case NatureCheckerFilter::Impish:
-        return value == NatureCheckerValue::Impish;
-    case NatureCheckerFilter::Jolly:
-        return value == NatureCheckerValue::Jolly;
-    case NatureCheckerFilter::Lax:
-        return value == NatureCheckerValue::Lax;
-    case NatureCheckerFilter::Lonely:
-        return value == NatureCheckerValue::Lonely;
-    case NatureCheckerFilter::Mild:
-        return value == NatureCheckerValue::Mild;
-    case NatureCheckerFilter::Modest:
-        return value == NatureCheckerValue::Modest;
-    case NatureCheckerFilter::Naive:
-        return value == NatureCheckerValue::Naive;
-    case NatureCheckerFilter::Naughty:
-        return value == NatureCheckerValue::Naughty;
-    case NatureCheckerFilter::Quiet:
-        return value == NatureCheckerValue::Quiet;
-    case NatureCheckerFilter::Quirky:
-        if (value == NatureCheckerValue::Neutral) {
-            return true;
-        }
-        return value == NatureCheckerValue::Quirky;
-    case NatureCheckerFilter::Rash:
-        return value == NatureCheckerValue::Rash;
-    case NatureCheckerFilter::Relaxed:
-        return value == NatureCheckerValue::Relaxed;
-    case NatureCheckerFilter::Sassy:
-        return value == NatureCheckerValue::Sassy;
-    case NatureCheckerFilter::Serious:
-        if (value == NatureCheckerValue::Neutral) {
-            return true;
-        }
-        return value == NatureCheckerValue::Serious;
-    case NatureCheckerFilter::Timid:
-        return value == NatureCheckerValue::Timid;
-    }
-    return false;
-}
-
-
-
-
-}
-}
+/*  Pokemon Nature Checker
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <map>
+#include "Pokemon_NatureChecker.h"
+
+namespace PokemonAutomation{
+namespace Pokemon{
+
+
+const EnumStringMap<NatureCheckerValue>& NATURE_CHECKER_VALUE_STRINGS(){
+    static EnumStringMap<NatureCheckerValue> database{
+        {NatureCheckerValue::UnableToDetect,    "Unable to Detect"},
+        {NatureCheckerValue::Neutral,           "Neutral"},
+        {NatureCheckerValue::Adamant,           "Adamant"},
+        {NatureCheckerValue::Bashful,           "Bashful"},
+        {NatureCheckerValue::Bold,              "Bold"},
+        {NatureCheckerValue::Brave,             "Brave"},
+        {NatureCheckerValue::Calm,              "Calm"},
+        {NatureCheckerValue::Careful,           "Careful"},
+        {NatureCheckerValue::Docile,            "Docile"},
+        {NatureCheckerValue::Gentle,            "Gentle"},
+        {NatureCheckerValue::Hardy,             "Hardy"},
+        {NatureCheckerValue::Hasty,             "Hasty"},
+        {NatureCheckerValue::Impish,            "Impish"},
+        {NatureCheckerValue::Jolly,             "Jolly"},
+        {NatureCheckerValue::Lax,               "Lax"},
+        {NatureCheckerValue::Lonely,            "Lonely"},
+        {NatureCheckerValue::Mild,              "Mild"},
+        {NatureCheckerValue::Modest,            "Modest"},
+        {NatureCheckerValue::Naive,             "Naive"},
+        {NatureCheckerValue::Naughty,           "Naughty"},
+        {NatureCheckerValue::Quiet,             "Quiet"},
+        {NatureCheckerValue::Quirky,            "Quirky"},
+        {NatureCheckerValue::Rash,              "Rash"},
+        {NatureCheckerValue::Relaxed,           "Relaxed"},
+        {NatureCheckerValue::Sassy,             "Sassy"},
+        {NatureCheckerValue::Serious,           "Serious"},
+        {NatureCheckerValue::Timid,             "Timid"},
+    };
+    return database;
+}
+
+
+const std::map<std::pair<int, int>, NatureCheckerValue>& NatureCheckerValue_HELPHINDER_TO_ENUM(){
+    static std::map<std::pair<int, int>, NatureCheckerValue> data{
+        {{ 0, 2 },      NatureCheckerValue::Adamant},
+        {{ -1, -1 },    NatureCheckerValue::Neutral}, //Bashful, Docile, Hardy, Quirky, Serious
+        {{ 1, 0 },      NatureCheckerValue::Bold},
+        {{ 0, 4 },      NatureCheckerValue::Brave},
+        {{ 3, 0 },      NatureCheckerValue::Calm},
+        {{ 3, 2 },      NatureCheckerValue::Careful},
+        {{ 3, 1 },      NatureCheckerValue::Gentle},
+        {{ 4, 1 },      NatureCheckerValue::Hasty},
+        {{ 1, 2 },      NatureCheckerValue::Impish},
+        {{ 4, 2 },      NatureCheckerValue::Jolly},
+        {{ 1, 3 },      NatureCheckerValue::Lax},
+        {{ 0, 1 },      NatureCheckerValue::Lonely},
+        {{ 2, 1 },      NatureCheckerValue::Mild},
+        {{ 2, 0 },      NatureCheckerValue::Modest},
+        {{ 4, 3 },      NatureCheckerValue::Naive},
+        {{ 0, 3 },      NatureCheckerValue::Naughty},
+        {{ 2, 4 },      NatureCheckerValue::Quiet},
+        {{ 2, 3 },      NatureCheckerValue::Rash},
+        {{ 1, 4 },      NatureCheckerValue::Relaxed},
+        {{ 3, 4 },      NatureCheckerValue::Sassy},
+        {{ 4, 0 },      NatureCheckerValue::Timid},
+    };
+    return data;
+}
+
+
+NatureCheckerValue NatureCheckerValue_helphinder_to_enum(const std::pair<int,int>& token){
+    auto iter = NatureCheckerValue_HELPHINDER_TO_ENUM().find(token);
+    if (iter == NatureCheckerValue_HELPHINDER_TO_ENUM().end()){
+        return NatureCheckerValue::UnableToDetect;
+    }
+    return iter->second;
+}
+
+
+
+
+
+const EnumDropdownDatabase<NatureCheckerValue>& NatureCheckerValue_Database(){
+    static EnumDropdownDatabase<NatureCheckerValue> database({
+        {NatureCheckerValue::Adamant,     "adamant",      "Adamant"},
+        {NatureCheckerValue::Bashful,     "bashful",      "Bashful"},
+        {NatureCheckerValue::Bold,        "bold",         "Bold"},
+        {NatureCheckerValue::Brave,       "brave",        "Brave"},
+        {NatureCheckerValue::Calm,        "calm",         "Calm"},
+        {NatureCheckerValue::Careful,     "careful",      "Careful"},
+        {NatureCheckerValue::Docile,      "docile",       "Docile"},
+        {NatureCheckerValue::Gentle,      "gentle",       "Gentle"},
+        {NatureCheckerValue::Hardy,       "hardy",        "Hardy"},
+        {NatureCheckerValue::Hasty,       "hasty",        "Hasty"},
+        {NatureCheckerValue::Impish,      "impish",       "Impish"},
+        {NatureCheckerValue::Jolly,       "jolly",        "Jolly"},
+        {NatureCheckerValue::Lax,         "lax",          "Lax"},
+        {NatureCheckerValue::Lonely,      "lonely",       "Lonely"},
+        {NatureCheckerValue::Mild,        "mild",         "Mild"},
+        {NatureCheckerValue::Modest,      "modest",       "Modest"},
+        {NatureCheckerValue::Naive,       "naive",        "Naive"},
+        {NatureCheckerValue::Naughty,     "naughty",      "Naughty"},
+        {NatureCheckerValue::Quiet,       "quiet",        "Quiet"},
+        {NatureCheckerValue::Quirky,      "quirky",       "Quirky"},
+        {NatureCheckerValue::Rash,        "rash",         "Rash"},
+        {NatureCheckerValue::Relaxed,     "relaxed",      "Relaxed"},
+        {NatureCheckerValue::Sassy,       "sassy",        "Sassy"},
+        {NatureCheckerValue::Serious,     "serious",      "Serious"},
+        {NatureCheckerValue::Timid,       "timid",        "Timid"},
+    });
+    return database;
+}
+
+const EnumDropdownDatabase<NatureCheckerFilter>& NatureCheckerFilter_Database(){
+    static EnumDropdownDatabase<NatureCheckerFilter> database({
+        {NatureCheckerFilter::Any,         "any",          "Any"},
+        {NatureCheckerFilter::Adamant,     "adamant",      "Adamant"},
+        {NatureCheckerFilter::Bashful,     "bashful",      "Bashful"},
+        {NatureCheckerFilter::Bold,        "bold",         "Bold"},
+        {NatureCheckerFilter::Brave,       "brave",        "Brave"},
+        {NatureCheckerFilter::Calm,        "calm",         "Calm"},
+        {NatureCheckerFilter::Careful,     "careful",      "Careful"},
+        {NatureCheckerFilter::Docile,      "docile",       "Docile"},
+        {NatureCheckerFilter::Gentle,      "gentle",       "Gentle"},
+        {NatureCheckerFilter::Hardy,       "hardy",        "Hardy"},
+        {NatureCheckerFilter::Hasty,       "hasty",        "Hasty"},
+        {NatureCheckerFilter::Impish,      "impish",       "Impish"},
+        {NatureCheckerFilter::Jolly,       "jolly",        "Jolly"},
+        {NatureCheckerFilter::Lax,         "lax",          "Lax"},
+        {NatureCheckerFilter::Lonely,      "lonely",       "Lonely"},
+        {NatureCheckerFilter::Mild,        "mild",         "Mild"},
+        {NatureCheckerFilter::Modest,      "modest",       "Modest"},
+        {NatureCheckerFilter::Naive,       "naive",        "Naive"},
+        {NatureCheckerFilter::Naughty,     "naughty",      "Naughty"},
+        {NatureCheckerFilter::Quiet,       "quiet",        "Quiet"},
+        {NatureCheckerFilter::Quirky,      "quirky",       "Quirky"},
+        {NatureCheckerFilter::Rash,        "rash",         "Rash"},
+        {NatureCheckerFilter::Relaxed,     "relaxed",      "Relaxed"},
+        {NatureCheckerFilter::Sassy,       "sassy",        "Sassy"},
+        {NatureCheckerFilter::Serious,     "serious",      "Serious"},
+        {NatureCheckerFilter::Timid,       "timid",        "Timid"},
+    });
+    return database;
+}
+
+
+
+bool NatureChecker_filter_match(NatureCheckerFilter filter, NatureCheckerValue value){
+    switch (filter){
+    case NatureCheckerFilter::Any:
+        return true;
+    case NatureCheckerFilter::Adamant:
+        return value == NatureCheckerValue::Adamant;
+    case NatureCheckerFilter::Bashful:
+        if (value == NatureCheckerValue::Neutral){
+            return true;
+        }
+        return value == NatureCheckerValue::Bashful;
+    case NatureCheckerFilter::Bold:
+        return value == NatureCheckerValue::Bold;
+    case NatureCheckerFilter::Brave:
+        return value == NatureCheckerValue::Brave;
+    case NatureCheckerFilter::Calm:
+        return value == NatureCheckerValue::Calm;
+    case NatureCheckerFilter::Careful:
+        return value == NatureCheckerValue::Careful;
+    case NatureCheckerFilter::Docile:
+        if (value == NatureCheckerValue::Neutral){
+            return true;
+        }
+        return value == NatureCheckerValue::Docile;
+    case NatureCheckerFilter::Gentle:
+        return value == NatureCheckerValue::Gentle;
+    case NatureCheckerFilter::Hardy:
+        if (value == NatureCheckerValue::Neutral){
+            return true;
+        }
+        return value == NatureCheckerValue::Hardy;
+    case NatureCheckerFilter::Hasty:
+        return value == NatureCheckerValue::Hasty;
+    case NatureCheckerFilter::Impish:
+        return value == NatureCheckerValue::Impish;
+    case NatureCheckerFilter::Jolly:
+        return value == NatureCheckerValue::Jolly;
+    case NatureCheckerFilter::Lax:
+        return value == NatureCheckerValue::Lax;
+    case NatureCheckerFilter::Lonely:
+        return value == NatureCheckerValue::Lonely;
+    case NatureCheckerFilter::Mild:
+        return value == NatureCheckerValue::Mild;
+    case NatureCheckerFilter::Modest:
+        return value == NatureCheckerValue::Modest;
+    case NatureCheckerFilter::Naive:
+        return value == NatureCheckerValue::Naive;
+    case NatureCheckerFilter::Naughty:
+        return value == NatureCheckerValue::Naughty;
+    case NatureCheckerFilter::Quiet:
+        return value == NatureCheckerValue::Quiet;
+    case NatureCheckerFilter::Quirky:
+        if (value == NatureCheckerValue::Neutral){
+            return true;
+        }
+        return value == NatureCheckerValue::Quirky;
+    case NatureCheckerFilter::Rash:
+        return value == NatureCheckerValue::Rash;
+    case NatureCheckerFilter::Relaxed:
+        return value == NatureCheckerValue::Relaxed;
+    case NatureCheckerFilter::Sassy:
+        return value == NatureCheckerValue::Sassy;
+    case NatureCheckerFilter::Serious:
+        if (value == NatureCheckerValue::Neutral){
+            return true;
+        }
+        return value == NatureCheckerValue::Serious;
+    case NatureCheckerFilter::Timid:
+        return value == NatureCheckerValue::Timid;
+    }
+    return false;
+}
+
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/Pokemon/Pokemon_NatureChecker.h b/SerialPrograms/Source/Pokemon/Pokemon_NatureChecker.h
index 954fb78737..8c653924a8 100644
--- a/SerialPrograms/Source/Pokemon/Pokemon_NatureChecker.h
+++ b/SerialPrograms/Source/Pokemon/Pokemon_NatureChecker.h
@@ -1,86 +1,99 @@
-/*  Pokemon Nature Checker
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_Pokemon_NatureChecker_H
-#define PokemonAutomation_Pokemon_NatureChecker_H
-
-#include <string>
-#include <vector>
-#include "Common/Cpp/EnumDatabase.h"
-
-namespace PokemonAutomation{
-namespace Pokemon{
-
-enum class NatureCheckerValue{
-    UnableToDetect,
-    Neutral,
-    Any,
-    Adamant,
-    Bashful,
-    Bold,
-    Brave,
-    Calm,
-    Careful,
-    Docile,
-    Gentle,
-    Hardy,
-    Hasty,
-    Impish,
-    Jolly,
-    Lax,
-    Lonely,
-    Mild,
-    Modest,
-    Naive,
-    Naughty,
-    Quiet,
-    Quirky,
-    Rash,
-    Relaxed,
-    Sassy,
-    Serious,
-    Timid
-};
-const EnumDatabase<NatureCheckerValue>& NatureCheckerValue_Database();
-NatureCheckerValue NatureCheckerValue_string_to_enum(const std::string& token);
-NatureCheckerValue NatureCheckerValue_helphinder_to_enum(const std::pair<int,int>& token);
-
-
-enum class NatureCheckerFilter {
-    Any,
-    Adamant,
-    Bashful,
-    Bold,
-    Brave,
-    Calm,
-    Careful,
-    Docile,
-    Gentle,
-    Hardy,
-    Hasty,
-    Impish,
-    Jolly,
-    Lax,
-    Lonely,
-    Mild,
-    Modest,
-    Naive,
-    Naughty,
-    Quiet,
-    Quirky,
-    Rash,
-    Relaxed,
-    Sassy,
-    Serious,
-    Timid
-};
-
-const EnumDatabase<NatureCheckerFilter>& NatureCheckerFilter_Database();
-bool NatureChecker_filter_match(NatureCheckerFilter filter, NatureCheckerValue value);
-
-}
-}
-#endif
+/*  Pokemon Nature Checker
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Pokemon_NatureChecker_H
+#define PokemonAutomation_Pokemon_NatureChecker_H
+
+#include <string>
+#include "Common/Cpp/EnumStringMap.h"
+#include "Common/Cpp/Options/EnumDropdownDatabase.h"
+
+namespace PokemonAutomation{
+namespace Pokemon{
+
+enum class NatureCheckerValue{
+    UnableToDetect,
+//    Any,
+
+    Neutral,
+
+    Bashful,
+    Docile,
+    Hardy,
+    Quirky,
+    Serious,
+
+    Bold,
+    Modest,
+    Calm,
+    Timid,
+
+    Lonely,
+    Mild,
+    Gentle,
+    Hasty,
+
+    Adamant,
+    Impish,
+    Careful,
+    Jolly,
+
+    Naughty,
+    Lax,
+    Rash,
+    Naive,
+
+    Brave,
+    Relaxed,
+    Quiet,
+    Sassy,
+};
+const EnumStringMap<NatureCheckerValue>& NATURE_CHECKER_VALUE_STRINGS();
+const EnumDropdownDatabase<NatureCheckerValue>& NatureCheckerValue_Database();
+NatureCheckerValue NatureCheckerValue_helphinder_to_enum(const std::pair<int,int>& token);
+
+
+enum class NatureCheckerFilter{
+    Any,
+
+    Bashful,
+    Docile,
+    Hardy,
+    Quirky,
+    Serious,
+
+    Bold,
+    Modest,
+    Calm,
+    Timid,
+
+    Lonely,
+    Mild,
+    Gentle,
+    Hasty,
+
+    Adamant,
+    Impish,
+    Careful,
+    Jolly,
+
+    Naughty,
+    Lax,
+    Rash,
+    Naive,
+
+    Brave,
+    Relaxed,
+    Quiet,
+    Sassy,
+};
+
+const EnumDropdownDatabase<NatureCheckerFilter>& NatureCheckerFilter_Database();
+bool NatureChecker_filter_match(NatureCheckerFilter filter, NatureCheckerValue value);
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Pokemon/Pokemon_Notification.cpp b/SerialPrograms/Source/Pokemon/Pokemon_Notification.cpp
index 49540029c8..31e8c7ccb8 100644
--- a/SerialPrograms/Source/Pokemon/Pokemon_Notification.cpp
+++ b/SerialPrograms/Source/Pokemon/Pokemon_Notification.cpp
@@ -1,6 +1,6 @@
 /*  Shiny Notification
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -37,7 +37,7 @@ std::string shiny_symbol(ShinyType shiny_type){
     case ShinyType::STAR_SHINY:
         return "\u2728";
     case ShinyType::SQUARE_SHINY:
-        return "\u2733";    //  Green square asterisk
+        return ":purple_square:";
     default:
         return "";
     }
@@ -223,6 +223,9 @@ void send_catch_notification(
     case CatchResult::OUT_OF_BALLS:
         embeds.emplace_back("Fail Reason:", "Unable to find the desired ball. Did you run out?");
         break;
+    case CatchResult::BALL_LIMIT_REACHED:
+        embeds.emplace_back("Fail Reason:", "Ball limit reached.");
+        break;
     case CatchResult::CANNOT_THROW_BALL:
         embeds.emplace_back("Fail Reason:", "Unable to throw ball. Is the " + STRING_POKEMON + " semi-invulnerable?");
         break;
diff --git a/SerialPrograms/Source/Pokemon/Pokemon_Notification.h b/SerialPrograms/Source/Pokemon/Pokemon_Notification.h
index 189c4e1753..20ec7383c8 100644
--- a/SerialPrograms/Source/Pokemon/Pokemon_Notification.h
+++ b/SerialPrograms/Source/Pokemon/Pokemon_Notification.h
@@ -1,6 +1,6 @@
 /*  Shiny Notification
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -9,12 +9,8 @@
 
 #include <string>
 #include <set>
-#include <chrono>
-//#include "CommonFramework/Logging/Logger.h"
-//#include "CommonFramework/Tools/StatsTracking.h"
 #include "CommonFramework/Notifications/EventNotificationOption.h"
 #include "CommonFramework/Notifications/ProgramNotifications.h"
-//#include "Pokemon/Options/Pokemon_EncounterBotOptions.h"
 #include "Pokemon_EncounterStats.h"
 #include "Pokemon_DataTypes.h"
 
@@ -50,6 +46,7 @@ enum class CatchResult{
     POKEMON_FAINTED,
     OWN_FAINTED,
     OUT_OF_BALLS,
+    BALL_LIMIT_REACHED,
     CANNOT_THROW_BALL,
     TIMED_OUT,
 };
diff --git a/SerialPrograms/Source/Pokemon/Pokemon_OriginMarks.cpp b/SerialPrograms/Source/Pokemon/Pokemon_OriginMarks.cpp
new file mode 100644
index 0000000000..b002b263ef
--- /dev/null
+++ b/SerialPrograms/Source/Pokemon/Pokemon_OriginMarks.cpp
@@ -0,0 +1,32 @@
+/*  Pokemon Origin Marks
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Pokemon_OriginMarks.h"
+
+namespace PokemonAutomation{
+namespace Pokemon{
+
+const EnumStringMap<OriginMark>& ORIGIN_MARK_SLUGS(){
+    static EnumStringMap<OriginMark> database{
+        {OriginMark::KALOS, "kalos"},
+        {OriginMark::ALOLA, "alola"},
+        {OriginMark::GAMEBOY, "gameboy"},
+        {OriginMark::GO, "go"},
+        {OriginMark::LGPE, "lgpe"},
+        {OriginMark::GALAR, "galar"},
+        {OriginMark::BDSP, "bdsp"},
+        {OriginMark::LA, "la"},
+        {OriginMark::SV, "sv"},
+        {OriginMark::LZA, "lza"},
+        {OriginMark::NONE, "none"},
+        {OriginMark::GAMEBOYADVANCE, "gameboyadvance"},
+    };
+    return database;
+}
+
+
+}
+}
diff --git a/SerialPrograms/Source/Pokemon/Pokemon_OriginMarks.h b/SerialPrograms/Source/Pokemon/Pokemon_OriginMarks.h
new file mode 100644
index 0000000000..5a084a9e9a
--- /dev/null
+++ b/SerialPrograms/Source/Pokemon/Pokemon_OriginMarks.h
@@ -0,0 +1,35 @@
+/*  Pokemon Origin Marks
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Pokemon_OriginMarks_H
+#define PokemonAutomation_Pokemon_OriginMarks_H
+
+#include "Common/Cpp/EnumStringMap.h"
+
+namespace PokemonAutomation{
+namespace Pokemon{
+
+
+enum class OriginMark{
+    KALOS,
+    ALOLA,
+    GAMEBOY,
+    GO,
+    LGPE,
+    GALAR,
+    BDSP,
+    LA,
+    SV,
+    LZA,
+    NONE,
+    GAMEBOYADVANCE,
+};
+const EnumStringMap<OriginMark>& ORIGIN_MARK_SLUGS();
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Pokemon/Pokemon_ShinySparkleSet.cpp b/SerialPrograms/Source/Pokemon/Pokemon_ShinySparkleSet.cpp
index 6151fb66d0..b4ff3d19ad 100644
--- a/SerialPrograms/Source/Pokemon/Pokemon_ShinySparkleSet.cpp
+++ b/SerialPrograms/Source/Pokemon/Pokemon_ShinySparkleSet.cpp
@@ -1,11 +1,11 @@
 /*  Shiny Sparkle Set
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
+#include "Common/Cpp/Logging/AbstractLogger.h"
 #include "CommonFramework/ImageTypes/ImageViewRGB32.h"
-#include "CommonFramework/Logging/Logger.h"
 #include "Pokemon_ShinySparkleSet.h"
 
 namespace PokemonAutomation{
@@ -31,7 +31,7 @@ void ShinySparkleTracker::make_overlays(VideoOverlaySet& items) const{
 }
 bool ShinySparkleTracker::process_frame(const ImageViewRGB32& frame, WallClock timestamp){
     ImageViewRGB32 image = extract_box_reference(frame, m_box);
-    m_current_sparkles.read_from_image(image);
+    m_current_sparkles.read_from_image(frame.total_pixels(), image);
     m_overlays.clear();
     m_current_sparkles.draw_boxes(m_overlays, frame, m_box);
     std::string log_str = m_current_sparkles.to_str();
diff --git a/SerialPrograms/Source/Pokemon/Pokemon_ShinySparkleSet.h b/SerialPrograms/Source/Pokemon/Pokemon_ShinySparkleSet.h
index ab4cfa4a1c..dc51423a7f 100644
--- a/SerialPrograms/Source/Pokemon/Pokemon_ShinySparkleSet.h
+++ b/SerialPrograms/Source/Pokemon/Pokemon_ShinySparkleSet.h
@@ -1,6 +1,6 @@
 /*  Shiny Sparkle Set
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -9,7 +9,7 @@
 
 #include <string>
 #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
-#include "CommonFramework/InferenceInfra/VisualInferenceCallback.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
 
 namespace PokemonAutomation{
     class Logger;
@@ -23,7 +23,7 @@ class ShinySparkleSet{
 
     virtual std::string to_str() const = 0;
 
-    virtual void read_from_image(const ImageViewRGB32& image) = 0;
+    virtual void read_from_image(size_t screen_area, const ImageViewRGB32& image) = 0;
     virtual void draw_boxes(
         VideoOverlaySet& overlays,
         const ImageViewRGB32& frame,
diff --git a/SerialPrograms/Source/Pokemon/Pokemon_StatsCalculation.cpp b/SerialPrograms/Source/Pokemon/Pokemon_StatsCalculation.cpp
new file mode 100644
index 0000000000..140c814cf0
--- /dev/null
+++ b/SerialPrograms/Source/Pokemon/Pokemon_StatsCalculation.cpp
@@ -0,0 +1,260 @@
+/*  Stats Calculation
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Exceptions.h"
+#include "Pokemon_StatsCalculation.h"
+
+namespace PokemonAutomation{
+namespace Pokemon{
+
+
+#if 0
+NatureAdjustments get_nature_adjustments(NatureCheckerValue nature){
+    NatureAdjustments ret;
+    ret.attack = NatureAdjustment::NEUTRAL;
+    ret.defense = NatureAdjustment::NEUTRAL;
+    ret.spatk = NatureAdjustment::NEUTRAL;
+    ret.spdef = NatureAdjustment::NEUTRAL;
+    ret.speed = NatureAdjustment::NEUTRAL;
+
+    switch (nature){
+    case NatureCheckerValue::UnableToDetect:
+        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Cannot query invalid nature.");
+
+    case NatureCheckerValue::Neutral:
+    case NatureCheckerValue::Bashful:
+    case NatureCheckerValue::Docile:
+    case NatureCheckerValue::Hardy:
+    case NatureCheckerValue::Quirky:
+    case NatureCheckerValue::Serious:
+        return ret;
+
+    case NatureCheckerValue::Bold:
+        ret.attack = NatureAdjustment::NEGATIVE;
+        ret.defense = NatureAdjustment::POSITIVE;
+        return ret;
+    case NatureCheckerValue::Modest:
+        ret.attack = NatureAdjustment::NEGATIVE;
+        ret.spatk = NatureAdjustment::POSITIVE;
+        return ret;
+    case NatureCheckerValue::Calm:
+        ret.attack = NatureAdjustment::NEGATIVE;
+        ret.spdef = NatureAdjustment::POSITIVE;
+        return ret;
+    case NatureCheckerValue::Timid:
+        ret.attack = NatureAdjustment::NEGATIVE;
+        ret.speed = NatureAdjustment::POSITIVE;
+        return ret;
+
+    case NatureCheckerValue::Lonely:
+        ret.defense = NatureAdjustment::NEGATIVE;
+        ret.attack = NatureAdjustment::POSITIVE;
+        return ret;
+    case NatureCheckerValue::Mild:
+        ret.defense = NatureAdjustment::NEGATIVE;
+        ret.spatk = NatureAdjustment::POSITIVE;
+        return ret;
+    case NatureCheckerValue::Gentle:
+        ret.defense = NatureAdjustment::NEGATIVE;
+        ret.spdef = NatureAdjustment::POSITIVE;
+        return ret;
+    case NatureCheckerValue::Hasty:
+        ret.defense = NatureAdjustment::NEGATIVE;
+        ret.speed = NatureAdjustment::POSITIVE;
+        return ret;
+
+    case NatureCheckerValue::Adamant:
+        ret.spatk = NatureAdjustment::NEGATIVE;
+        ret.attack = NatureAdjustment::POSITIVE;
+        return ret;
+    case NatureCheckerValue::Impish:
+        ret.spatk = NatureAdjustment::NEGATIVE;
+        ret.defense = NatureAdjustment::POSITIVE;
+        return ret;
+    case NatureCheckerValue::Careful:
+        ret.spatk = NatureAdjustment::NEGATIVE;
+        ret.spdef = NatureAdjustment::POSITIVE;
+        return ret;
+    case NatureCheckerValue::Jolly:
+        ret.spatk = NatureAdjustment::NEGATIVE;
+        ret.speed = NatureAdjustment::POSITIVE;
+        return ret;
+
+    case NatureCheckerValue::Naughty:
+        ret.spdef = NatureAdjustment::NEGATIVE;
+        ret.attack = NatureAdjustment::POSITIVE;
+        return ret;
+    case NatureCheckerValue::Lax:
+        ret.spdef = NatureAdjustment::NEGATIVE;
+        ret.defense = NatureAdjustment::POSITIVE;
+        return ret;
+    case NatureCheckerValue::Rash:
+        ret.spdef = NatureAdjustment::NEGATIVE;
+        ret.spatk = NatureAdjustment::POSITIVE;
+        return ret;
+    case NatureCheckerValue::Naive:
+        ret.spdef = NatureAdjustment::NEGATIVE;
+        ret.speed = NatureAdjustment::POSITIVE;
+        return ret;
+
+    case NatureCheckerValue::Brave:
+        ret.speed = NatureAdjustment::NEGATIVE;
+        ret.attack = NatureAdjustment::POSITIVE;
+        return ret;
+    case NatureCheckerValue::Relaxed:
+        ret.speed = NatureAdjustment::NEGATIVE;
+        ret.defense = NatureAdjustment::POSITIVE;
+        return ret;
+    case NatureCheckerValue::Quiet:
+        ret.speed = NatureAdjustment::NEGATIVE;
+        ret.spatk = NatureAdjustment::POSITIVE;
+        return ret;
+    case NatureCheckerValue::Sassy:
+        ret.speed = NatureAdjustment::NEGATIVE;
+        ret.spdef = NatureAdjustment::POSITIVE;
+        return ret;
+
+    default:
+        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Unknown Nature: " + std::to_string((int)nature));
+    }
+}
+#endif
+
+
+uint16_t calc_stats_hp(uint8_t base_stat, uint8_t level, uint8_t iv, uint8_t ev){
+    uint16_t stat = (uint16_t)2 * base_stat + iv + ev/4;
+    stat *= level;
+    stat /= 100;
+    stat += level;
+    stat += 10;
+    return stat;
+}
+uint16_t calc_stats_nonhp(uint8_t base_stat, uint8_t level, uint8_t iv, uint8_t ev, NatureAdjustment nature){
+    uint16_t stat = (uint16_t)2 * base_stat + iv + ev/4;
+    stat *= level;
+    stat /= 100;
+    stat += 5;
+    switch (nature){
+    case NatureAdjustment::NEUTRAL:
+        break;
+    case NatureAdjustment::POSITIVE:
+        stat *= 110;
+        stat /= 100;
+        break;
+    case NatureAdjustment::NEGATIVE:
+        stat *= 90;
+        stat /= 100;
+        break;
+    }
+    return stat;
+}
+
+
+#if 0
+bool calc_iv_range(
+    uint8_t& low_iv, uint8_t& high_iv,
+    bool is_hp, uint8_t base_stat, uint8_t level, uint8_t ev,
+    uint16_t stat, NatureAdjustment nature
+){
+    bool set = false;
+    for (uint8_t iv = 0; iv < 32; iv++){
+        uint16_t current_stat = is_hp
+            ? calc_stats_hp(base_stat, level, iv, ev)
+            : calc_stats_nonhp(base_stat, level, iv, ev, nature);
+
+        if (stat != current_stat){
+            continue;
+        }
+
+        if (!set){
+            set = true;
+            low_iv = iv;
+            high_iv = iv;
+            continue;
+        }
+
+        if (low_iv > iv){
+            low_iv = iv;
+        }
+        if (high_iv < iv){
+            high_iv = iv;
+        }
+    }
+
+    return set;
+}
+#endif
+IvRange calc_iv_range(
+    bool is_hp, uint8_t base_stat, uint8_t level, uint8_t ev,
+    uint16_t stat, NatureAdjustment nature
+){
+    IvRange ret;
+
+    bool set = false;
+    for (uint8_t iv = 0; iv < 32; iv++){
+        uint16_t current_stat = is_hp
+            ? calc_stats_hp(base_stat, level, iv, ev)
+            : calc_stats_nonhp(base_stat, level, iv, ev, nature);
+
+        if (stat != current_stat){
+            continue;
+        }
+
+        if (!set){
+            set = true;
+            ret.low = iv;
+            ret.high = iv;
+            continue;
+        }
+
+        if ((uint8_t)ret.low > iv){
+            ret.low = iv;
+        }
+        if ((uint8_t)ret.high < iv){
+            ret.high = iv;
+        }
+    }
+
+    return ret;
+}
+
+
+IvRanges calc_iv_ranges(
+    const BaseStats& base_stats, uint8_t level, const EVs& evs,
+    const StatReads& actual_stats, const NatureAdjustments& natures
+){
+    IvRanges ret;
+
+    if (actual_stats.hp >= 10){
+        ret.hp = calc_iv_range(true, base_stats.hp, level, evs.hp, actual_stats.hp, NatureAdjustment::NEUTRAL);
+    }
+    if (actual_stats.attack >= 5){
+        ret.attack = calc_iv_range(false, base_stats.attack, level, evs.attack, actual_stats.attack, natures.attack);
+    }
+    if (actual_stats.defense >= 5){
+        ret.defense = calc_iv_range(false, base_stats.defense, level, evs.defense, actual_stats.defense, natures.defense);
+    }
+    if (actual_stats.spatk >= 5){
+        ret.spatk = calc_iv_range(false, base_stats.spatk, level, evs.spatk, actual_stats.spatk, natures.spatk);
+    }
+    if (actual_stats.spdef >= 5){
+        ret.spdef = calc_iv_range(false, base_stats.spdef, level, evs.spdef, actual_stats.spdef, natures.spdef);
+    }
+    if (actual_stats.speed >= 5){
+        ret.speed = calc_iv_range(false, base_stats.speed, level, evs.speed, actual_stats.speed, natures.speed);
+    }
+
+    return ret;
+}
+
+
+
+
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/Pokemon/Pokemon_StatsCalculation.h b/SerialPrograms/Source/Pokemon/Pokemon_StatsCalculation.h
new file mode 100644
index 0000000000..615418f65a
--- /dev/null
+++ b/SerialPrograms/Source/Pokemon/Pokemon_StatsCalculation.h
@@ -0,0 +1,102 @@
+/*  Stats Calculation
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Pokemon_StatsCalculation_H
+#define PokemonAutomation_Pokemon_StatsCalculation_H
+
+#include <stdint.h>
+#include "Pokemon_NatureChecker.h"
+
+namespace PokemonAutomation{
+namespace Pokemon{
+
+
+
+struct BaseStats{
+    uint8_t hp;
+    uint8_t attack;
+    uint8_t defense;
+    uint8_t spatk;
+    uint8_t spdef;
+    uint8_t speed;
+};
+struct EVs{
+    uint8_t hp = 0;
+    uint8_t attack = 0;
+    uint8_t defense = 0;
+    uint8_t spatk = 0;
+    uint8_t spdef = 0;
+    uint8_t speed = 0;
+};
+
+
+struct StatReads{
+    int16_t hp = -1;
+    int16_t attack = -1;
+    int16_t defense = -1;
+    int16_t spatk = -1;
+    int16_t spdef = -1;
+    int16_t speed = -1;
+};
+
+struct IvRange{
+    int8_t low = -1;
+    int8_t high = -1;
+};
+struct IvRanges{
+    IvRange hp;
+    IvRange attack;
+    IvRange defense;
+    IvRange spatk;
+    IvRange spdef;
+    IvRange speed;
+};
+
+
+enum class NatureAdjustment{
+    NEUTRAL,
+    NEGATIVE,
+    POSITIVE,
+};
+struct NatureAdjustments{
+    NatureAdjustment attack;
+    NatureAdjustment defense;
+    NatureAdjustment spatk;
+    NatureAdjustment spdef;
+    NatureAdjustment speed;
+};
+//NatureAdjustments get_nature_adjustments(NatureCheckerValue nature);
+
+
+
+
+uint16_t calc_stats_hp(uint8_t base_stat, uint8_t level, uint8_t iv, uint8_t ev);
+uint16_t calc_stats_nonhp(uint8_t base_stat, uint8_t level, uint8_t iv, uint8_t ev, NatureAdjustment nature);
+
+
+#if 0
+bool calc_iv_range(
+    uint8_t& low_iv, uint8_t& high_iv,
+    bool is_hp, uint8_t base_stat, uint8_t level, uint8_t ev,
+    uint16_t stat, NatureAdjustment nature
+);
+#endif
+IvRange calc_iv_range(
+    bool is_hp, uint8_t base_stat, uint8_t level, uint8_t ev,
+    uint16_t stat, NatureAdjustment nature
+);
+
+
+IvRanges calc_iv_ranges(
+    const BaseStats& base_stats, uint8_t level, const EVs& evs,
+    const StatReads& actual_stats, const NatureAdjustments& natures
+);
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Pokemon/Pokemon_Strings.cpp b/SerialPrograms/Source/Pokemon/Pokemon_Strings.cpp
index c31115cfc4..b4520e20a6 100644
--- a/SerialPrograms/Source/Pokemon/Pokemon_Strings.cpp
+++ b/SerialPrograms/Source/Pokemon/Pokemon_Strings.cpp
@@ -1,6 +1,6 @@
 /*  Pokemon Strings
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -14,6 +14,12 @@ const std::string STRING_POKEBALL = "Pok\u00e9ball";
 const std::string STRING_POKEMON = "Pok\u00e9mon";
 const std::string STRING_POKEDEX = "Pok\u00e9dex";
 const std::string STRING_POKEJOB = "Pok\u00e9 Job";
+const std::string STRING_POKERUS = "Pok\u00e9rus";
+
+const std::string UNICODE_MALE = "\u2642";
+const std::string UNICODE_FEMALE = "\u2640";
+const std::string UNICODE_GENDERLESS = "\u26b2";
+const std::string UNICODE_ALPHA = "\u03B1";
 
 
 
diff --git a/SerialPrograms/Source/Pokemon/Pokemon_Strings.h b/SerialPrograms/Source/Pokemon/Pokemon_Strings.h
index d28715b104..9c6c2e1b3d 100644
--- a/SerialPrograms/Source/Pokemon/Pokemon_Strings.h
+++ b/SerialPrograms/Source/Pokemon/Pokemon_Strings.h
@@ -1,6 +1,6 @@
 /*  Pokemon Strings
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -17,6 +17,12 @@ extern const std::string STRING_POKEBALL;
 extern const std::string STRING_POKEMON;
 extern const std::string STRING_POKEDEX;
 extern const std::string STRING_POKEJOB;
+extern const std::string STRING_POKERUS;
+
+extern const std::string UNICODE_MALE;
+extern const std::string UNICODE_FEMALE;
+extern const std::string UNICODE_GENDERLESS;
+extern const std::string UNICODE_ALPHA;
 
 
 }
diff --git a/SerialPrograms/Source/Pokemon/Pokemon_Types.cpp b/SerialPrograms/Source/Pokemon/Pokemon_Types.cpp
index 1854e106c8..fbbcd12e52 100644
--- a/SerialPrograms/Source/Pokemon/Pokemon_Types.cpp
+++ b/SerialPrograms/Source/Pokemon/Pokemon_Types.cpp
@@ -1,47 +1,67 @@
 /*  Pokemon Types
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include "Common/Cpp/Exceptions.h"
 #include "Pokemon_Types.h"
 
 namespace PokemonAutomation{
 namespace Pokemon{
 
+const EnumStringMap<PokemonTeraType>& POKEMON_TERA_TYPE_SLUGS(){
+    static EnumStringMap<PokemonTeraType> database{
+        {PokemonTeraType::BUG,      "bug"},
+        {PokemonTeraType::DARK,     "dark"},
+        {PokemonTeraType::DRAGON,   "dragon"},
+        {PokemonTeraType::ELECTRIC, "electric"},
+        {PokemonTeraType::FAIRY,    "fairy"},
+        {PokemonTeraType::FIGHTING, "fighting"},
+        {PokemonTeraType::FIRE,     "fire"},
+        {PokemonTeraType::FLYING,   "flying"},
+        {PokemonTeraType::GHOST,    "ghost"},
+        {PokemonTeraType::GRASS,    "grass"},
+        {PokemonTeraType::GROUND,   "ground"},
+        {PokemonTeraType::ICE,      "ice"},
+        {PokemonTeraType::NONE,     "none"},
+        {PokemonTeraType::NORMAL,   "normal"},
+        {PokemonTeraType::POISON,   "poison"},
+        {PokemonTeraType::PSYCHIC,  "psychic"},
+        {PokemonTeraType::ROCK,     "rock"},
+        {PokemonTeraType::STEEL,    "steel"},
+        {PokemonTeraType::STELLAR,  "stellar"},
+        {PokemonTeraType::WATER,    "water"}
+    };
+    return database;
+}
 
-const std::map<PokemonType, std::string> TYPE_ENUM_TO_SLUG{
-    {PokemonType::NONE,     "none"},
-    {PokemonType::NORMAL,   "normal"},
-    {PokemonType::FIRE,     "fire"},
-    {PokemonType::FIGHTING, "fighting"},
-    {PokemonType::WATER,    "water"},
-    {PokemonType::FLYING,   "flying"},
-    {PokemonType::GRASS,    "grass"},
-    {PokemonType::POISON,   "poison"},
-    {PokemonType::ELECTRIC, "electric"},
-    {PokemonType::GROUND,   "ground"},
-    {PokemonType::PSYCHIC,  "psychic"},
-    {PokemonType::ROCK,     "rock"},
-    {PokemonType::ICE,      "ice"},
-    {PokemonType::BUG,      "bug"},
-    {PokemonType::DRAGON,   "dragon"},
-    {PokemonType::GHOST,    "ghost"},
-    {PokemonType::DARK,     "dark"},
-    {PokemonType::STEEL,    "steel"},
-    {PokemonType::FAIRY,    "fairy"},
-};
-
-const std::string& get_type_slug(PokemonType type){
-    auto it = TYPE_ENUM_TO_SLUG.find(type);
-    if (it == TYPE_ENUM_TO_SLUG.end()){
-        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Invalid type enum.");
-    }
-    return it->second;
+const EnumStringMap<PokemonType>& POKEMON_TYPE_SLUGS(){
+    static EnumStringMap<PokemonType> database{
+        {PokemonType::NONE,     "none"},
+        {PokemonType::NORMAL,   "normal"},
+        {PokemonType::FIRE,     "fire"},
+        {PokemonType::FIGHTING, "fighting"},
+        {PokemonType::WATER,    "water"},
+        {PokemonType::FLYING,   "flying"},
+        {PokemonType::GRASS,    "grass"},
+        {PokemonType::POISON,   "poison"},
+        {PokemonType::ELECTRIC, "electric"},
+        {PokemonType::GROUND,   "ground"},
+        {PokemonType::PSYCHIC,  "psychic"},
+        {PokemonType::ROCK,     "rock"},
+        {PokemonType::ICE,      "ice"},
+        {PokemonType::BUG,      "bug"},
+        {PokemonType::DRAGON,   "dragon"},
+        {PokemonType::GHOST,    "ghost"},
+        {PokemonType::DARK,     "dark"},
+        {PokemonType::STEEL,    "steel"},
+        {PokemonType::FAIRY,    "fairy"},
+    };
+    return database;
 }
 
 
 
+
 }
 }
diff --git a/SerialPrograms/Source/Pokemon/Pokemon_Types.h b/SerialPrograms/Source/Pokemon/Pokemon_Types.h
index a11941519c..04ae64c671 100644
--- a/SerialPrograms/Source/Pokemon/Pokemon_Types.h
+++ b/SerialPrograms/Source/Pokemon/Pokemon_Types.h
@@ -1,14 +1,14 @@
 /*  Pokemon Types
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifndef PokemonAutomation_Pokemon_Types_H
 #define PokemonAutomation_Pokemon_Types_H
 
-#include <string>
-#include <map>
+//#include <string>
+#include "Common/Cpp/EnumStringMap.h"
 
 namespace PokemonAutomation{
 namespace Pokemon{
@@ -21,6 +21,30 @@ enum class MoveCategory{
     UNKNOWN,
 };
 
+enum class PokemonTeraType{
+    BUG,
+    DARK,
+    DRAGON,
+    ELECTRIC,
+    FAIRY,
+    FIGHTING,
+    FIRE,
+    FLYING,
+    GHOST,
+    GRASS,
+    GROUND,
+    ICE,
+    NONE,
+    NORMAL,
+    POISON,
+    PSYCHIC,
+    ROCK,
+    STEEL,
+    STELLAR,
+    WATER
+};
+const EnumStringMap<PokemonTeraType>& POKEMON_TERA_TYPE_SLUGS();
+
 enum class PokemonType{
     NONE,
     NORMAL,
@@ -42,10 +66,7 @@ enum class PokemonType{
     STEEL,
     FAIRY,
 };
-
-extern const std::map<PokemonType, std::string> TYPE_ENUM_TO_SLUG;
-
-const std::string& get_type_slug(PokemonType type);
+const EnumStringMap<PokemonType>& POKEMON_TYPE_SLUGS();
 
 
 }
diff --git a/SerialPrograms/Source/Pokemon/Pokemon_Xoroshiro128Plus.cpp b/SerialPrograms/Source/Pokemon/Pokemon_Xoroshiro128Plus.cpp
new file mode 100644
index 0000000000..445f2606e6
--- /dev/null
+++ b/SerialPrograms/Source/Pokemon/Pokemon_Xoroshiro128Plus.cpp
@@ -0,0 +1,270 @@
+/*  Xoroshiro128+ and reverse
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <cstddef>
+#include "Pokemon_Xoroshiro128Plus.h"
+
+namespace PokemonAutomation{
+namespace Pokemon{
+
+Xoroshiro128PlusState::Xoroshiro128PlusState(uint64_t s0, uint64_t s1)
+    : s0(s0)
+    , s1(s1)
+{}
+
+
+Xoroshiro128Plus::Xoroshiro128Plus(Xoroshiro128PlusState state)
+    : state(state)
+{}
+
+Xoroshiro128Plus::Xoroshiro128Plus(uint64_t s0, uint64_t s1)
+    : state(Xoroshiro128PlusState(s0, s1))
+{}
+
+uint64_t Xoroshiro128Plus::rotl(const uint64_t x, const int k){
+    return (x << k) | (x >> (64 - k));
+}
+
+uint64_t Xoroshiro128Plus::next(){
+    const uint64_t s0 = state.s0;
+    uint64_t s1 = state.s1;
+    const uint64_t result = s0 + s1;
+
+    s1 ^= s0;
+    state.s0 = rotl(s0, 24) ^ s1 ^ (s1 << 16);
+    state.s1 = rotl(s1, 37);
+
+    return result;
+}
+
+Xoroshiro128PlusState Xoroshiro128Plus::get_state(){
+    return state;
+}
+
+uint64_t nextPowerOfTwo(uint64_t number){
+    uint64_t x = number;
+    x--;
+    x |= x >> 1;
+    x |= x >> 2;
+    x |= x >> 4;
+    x |= x >> 8;
+    x |= x >> 16;
+    x |= x >> 32;
+    x++;
+    return x;
+}
+
+uint64_t Xoroshiro128Plus::nextInt(uint64_t bound){
+    uint64_t power = nextPowerOfTwo(bound);
+    uint64_t result = next() & (power - 1);
+    while (result >= bound){
+        result = next() & (power - 1);
+    }
+    return result;
+}
+
+std::vector<bool> Xoroshiro128Plus::generate_last_bit_sequence(size_t max_advances){
+    std::vector<bool> sequence(max_advances);
+    Xoroshiro128Plus temp_rng(Xoroshiro128PlusState(state.s0, state.s1));
+
+    for (size_t i = 0; i < max_advances; i++){
+        sequence.at(i) = (temp_rng.next() & 1) == 1;
+    }
+
+    return sequence;
+}
+
+
+std::pair<bool, uint64_t> Xoroshiro128Plus::advances_to_state(Xoroshiro128PlusState other_state, uint64_t max_advances){
+    Xoroshiro128Plus temp_rng(get_state());
+    uint64_t advances = 0;
+
+    while (advances <= max_advances){
+        Xoroshiro128PlusState temp_state = temp_rng.get_state();
+        if (temp_state.s0 == other_state.s0 && temp_state.s1 == other_state.s1){
+            return { true, advances };
+        }
+        temp_rng.next();
+        advances++;
+    }
+    return { false, advances };
+}
+
+// The generic solution to the system of equations to calculate the initial state from the last bits of 128 consecutive Xoroshiro128+ results.
+uint64_t Xoroshiro128Plus::last_bits_reverse_matrix[128][2] = {
+    /*s0 bit 0*/ {0b0101001100100001111011111110111001010011111110101011100011001101, 0b0111010111110111000101010100001111101001111001011111001011010111} ,
+    {0b0101010001010011100010011010100000100100111101101001100001100000, 0b1000110000001001010011000111001111111111111101110011110001000000},
+    {0b0110010000111101101000100110010000011111010111011011100100011001, 0b0001001011110010110110010101101001011110101110010001100111010111},
+    {0b0001010111110001100111010110010001000000110101100100001111000111, 0b0000111010011000110111101101011111110010010111001110110100000001},
+    {0b0110101010001010010010010111001010100111110010110001110111010000, 0b1101010010101000010001000101100011010101101000011000010011111110},
+    {0b0101111110111111110111101011001011100111110010010100001101010000, 0b1100010100111110001001011000001101010100000101010000110111000000},
+    {0b1111100100110000110011011000111100000010110111001110111100110000, 0b1101011010100111000100100000001010000111011001100101001001110100},
+    {0b1111001001000110100100100111100110010101101110111010111011110010, 0b1000110011100101011101110110100100100110110000001111011111010101},
+    {0b1000101111010110110001111000100011001001011001111111010001011110, 0b1110010101111000110001000000001001111110111100101001111111110101},
+    {0b0011011111110111010101001010100101110101110011110001010000000110, 0b1001101100000101011110000110111010000000011110101011001110011000},
+    /*s0 bit 10*/{0b1100011000100101110010010000010101011101001101101101010111000011, 0b0010101110110011101000100011110010010010111000110111101010100100},
+    {0b0110000010110101110001110000100100111001111001000100101101001101, 0b0010011110100101001001100101011010101111101100100111000011001000},
+    {0b1110110100010111101100110100000010110110000011100110001000011110, 0b0111000000001101101000100001011000100010101110011110101011011111},
+    {0b1010100011101110101010100100100101001000101000111010101001011100, 0b1001011110110001011101001000101001010001011010000100011101010000},
+    {0b0010000111110000101111010001010001101111001100001011010011100001, 0b1010101000101111110011001100110001010110001001011101010111101011},
+    {0b0100010001011100011101011101110110101100101110001110111111100000, 0b0111101101010000011111111011110010101101100010010010111010001110},
+    {0b0111111111001100001101000111011100110100101010011100001010011010, 0b0110100110110000111011110010100000101101011100010000111111101111},
+    {0b0000100111110100110110011101110111111001110101001001010010010111, 0b1110000110010111000010101110100111001010110110011110110111011100},
+    {0b1001000011111110010011100000011010010001001011110010101100100010, 0b1011110101011010110010111010111110101110011111011010111111110000},
+    {0b0111100010101001011100110101100110111110100111110110110111010011, 0b1110111101010000001110110011000111111100100010111011100001100110},
+    /*s0 bit 20*/{0b1110100101000011101010001110100100111110011111001110000110100000, 0b0100100001111100111100101100000110011011010011110001001000110101},
+    {0b0011000101010101001110010101110000010011011100101100010100001000, 0b1101010100100011000001110111100010000010100011101101101010100010},
+    {0b0100011001010010001110110000011001011110011010111011111110100110, 0b1010100001010100001100101111101100101001010111101111100001111110},
+    {0b0101100011010100101011000110000110001011010100100111001011010010, 0b0101101111010000001110101101010001001101101001001010111111000001},
+    {0b0010111110010011001001110101001001001011110100101101001010000001, 0b0111100010111111111111100010010101001101010101110110000101101010},
+    {0b0001011001011000101011100111011010111011100111000000111010100000, 0b0101011010010110101110001110010001000100000000111001110000000111},
+    {0b0000111111111001100000000000111011000010010101001111100111111001, 0b1100111101001010010010100000101100011110011001101101101001010111},
+    {0b0011100110110100000010011101100000110000001110000010011001110000, 0b1100010010011001000100100111111100001000000010101010010111110010},
+    {0b1010011000110011100101100001110000000111011000110011001011110001, 0b0111000101010101011001100111010101100110110000000100101110010001},
+    {0b1000000111000001100010011001010101000010010010001011110101101100, 0b0110000111100001101111001010110000011011111000101000011011011110},
+    /*s0 bit 30*/{0b1000010011101001111010100010011101101001011010010010010111110101, 0b0111111100110100111110111110001110100000111001100010000011010011},
+    {0b1111011100001000010011011100010000000101011000011001001100100111, 0b1000110100100100010101000000111000101000000101011000010011001000},
+    {0b0100000111001101011011110101001011010001110101011001100001011000, 0b1110010100000101011010111100100111001111011011111110111101111010},
+    {0b0101000111111010111101001011101000011110011101010000010001100011, 0b0111110110010111100110001000100100011110100011100110000010101100},
+    {0b1100000011101010100010000111001001110011011101000111010010001110, 0b0001110001111001001111111010101110101011001101001000100010101111},
+    {0b0000100101111111110100100010111110001111000011001010000000000111, 0b0010101110100110110001001111000110010101111010010011010110111110},
+    {0b0010001110010011010010110110110110110111101110001001110101010001, 0b1001001100101001101011100101011100010110101110011000000101101101},
+    {0b1011011101111100011111010101000111010011001000100111010111010111, 0b0010001101010001100110100001001010111111110011100101110000110000},
+    {0b0111101101100000011000110010011011010010011111111110101111011111, 0b1000111000100111100001101000100010100111010100110111011000100000},
+    {0b0010101001101100100000010100111101100110000101000111100111110100, 0b1101010110010111110010001011010110100001101010110010111110011100},
+    /*s0 bit 40*/{0b0111100001010010101011110110000100100111000111101000001010001101, 0b1110001000110001011011101111111101011101011110010111001110111011},
+    {0b1011100000011000010000000110111010000100110111000111000010101000, 0b1001111111000111011010100010011110111101000100000110011110100101},
+    {0b0000100010001111110001011110101011111011101011001110100010101110, 0b0011011010000110001111100010001011011010000000011110010011110010},
+    {0b0110110011110000010000001010000100110101000111001000010101110101, 0b0111011110100101111011111011010010101001110101000111100111100001},
+    {0b0111000110101000111100011110111111110000001100100111100101001111, 0b0001111011110001111101100011110000001010000100111011111011001010},
+    {0b1001111100011001000010001100001110010110101100000001100010011001, 0b0010101111000000101001000110001100011010110110000101010110011111},
+    {0b1001100111000101100011001111101110110010100110111111111110000110, 0b0000011101001101011110010010010101110110100001001001001000010110},
+    {0b1000111010100011101100101101110010110100000110011101101010010001, 0b0010001100010110010100010100010011000001110000110101101010100101},
+    {0b0110110001011110000010110101110010111101000110101000110110011000, 0b1000110101110100110100100001000000001110100111011100111100111010},
+    {0b0110111010011100111011111011000001011011110110001111111011111011, 0b1111110110011000100001100000110001000000010011000010001010110101},
+    /*s0 bit 50*/{0b0100010010110110110111011011110010011111000100111001000000101100, 0b1001011111100111000011000010101110011100111000010111110001010110},
+    {0b0100010110011001111011001101111111011001011001111010110111110010, 0b0101010111111000100111011111110101010110100100001011111011101001},
+    {0b0111110001100101001000000101001011001001110111111000110101110110, 0b0101110111101000110000100100001011011001000000101100010011011101},
+    {0b0010010111110110111001111110010111101110001010001011000110101001, 0b1111011010110111100010111101010101101110101111110011110101010111},
+    {0b1011100111000100010001001111000100100001000100011001110100111111, 0b1110101110001011110110011001010010010101000110010001010001001001},
+    {0b0010010011001000000011110110010011000111001001100100110100110110, 0b0000100100100111000111101110101100000111011111110010111111010100},
+    {0b0101000101000011101011011110101110111010100111100101010101000101, 0b0100101110001011111010011111001010100111000101111111011110000000},
+    {0b1110011101110010110010110100001001000111011110100110100101010010, 0b0100000110001111100011100001000011110101101011010100000110011100},
+    {0b0111100001110000111100100011100011111001101101110011100111101001, 0b1110111101001000000101101011111000000111011001110111111011101010},
+    {0b0100000000010101110011101100101011111011001000011001100100011001, 0b1100010011111111001010001110010111101001101000000101000010001001},
+    /*s0 bit 60*/{0b0101101000111000001010101011111010000010011011111001100011011111, 0b1100110010111101001011101100100010001000110000001110011111000110},
+    {0b1000111011001110110011100010100110110010101001100111011101101011, 0b0000000010001010101110001011000110101000100111100000010010000100},
+    {0b1000110101011110011101010001001010111101101011001000100001001100, 0b1101001001010111001100111110110111100101100000111100001011001101},
+    {0b1011000110100011111010110001011111001011010001110101000010000101, 0b1110000000100101110011001011110001111001110010110111111110000011},
+
+    /*s1 bit 0*/{0b1101111011001010010100100111010111001001000000010111111000010001, 0b1111101110010001100010011011000000100010100111011110011011001111},
+    {0b1001101111110011000001000000111010001011101101011011101010011011, 0b1100001011011000000110000100101110110111100001000110110000100100},
+    {0b1110010101010001000000000110101110110011001011101111111100101000, 0b1011110111011110000010010100101111101100110100101000001001010011},
+    {0b0111000011001010101101011011100001010011001001100010001101100110, 0b1001000100110101011100111101101001110011010001110111111001001011},
+    {0b1110010000100100001010111100011101111001111000100000000000010100, 0b0000010101110100011010010000001100100010111000001000010100000001},
+    {0b1001100101110010010111001100001111000011000111010100000000010001, 0b1101000100011011101101000110001111011110011011011101011001010111},
+    {0b1111011001010100010100100001000000110010101011110100000001000101, 0b0111000011001011000011001001110101011101110110101000001110100110},
+    {0b0010110000001001101010111011001010011100110100011010110001010000, 0b1011110001100000000011001101001011111101100011000101010010011011},
+    {0b1100110000000010000010010011011111001101011000010110001101000010, 0b0000101101110000010110010010010100011111011100011111111111011111},
+    {0b0110101001010100101001110010111101101011101110100110001111000111, 0b0111111101111001101100100010111100101101111101000010010011001110},
+    /*s1 bit 10*/{0b0110101000101110100101100010111110011111011011101000011101110100, 0b0011101011011100101111111001011010001100010000101011010100001111},
+    {0b0111101111111001001101111001100111110010001101101101000000000100, 0b0001000000000000111000110000000000010001111110101101000011010001},
+    {0b0000000101110010010001101110001010110000010001101101011011110110, 0b1100101110010010011101101101000101000000101110010100010110000101},
+    {0b1100100011110111111111000110001011111000100111011000111010001011, 0b1001011100000101111100010100011001011011101001011010100100011111},
+    {0b1000010011110010011000101100110110101010101011110011101101101000, 0b0001101010110010110100010101000000001001111101000101111101111001},
+    {0b1010011001000000111101010000011101111000001000001111110001101011, 0b1110101001110110001111110111101001111110111100110011000101100010},
+    {0b0111010000100001000000001010001110100010100011000101000000110001, 0b1000111001010000110110111101010100101110111011011001001111110110},
+    {0b1111101000100101001111101101100111111111011100001111010011111100, 0b1011111111010100010000000000110000111001010100101011111110011111},
+    {0b1010110001110000111001001101111110011110010101111001001011110110, 0b1111111110000111111000011001001001011100011011010111001011001000},
+    {0b1010111011011011110001010000010111010011110011011101000001110001, 0b1001100011101010001101111010001011111101111101011110100001011110},
+    /*s1 bit 20*/{0b1111010010011011011110001111100110110100110100110100000001111101, 0b1000001010100001100110111100001101100000000111101001101000100100},
+    {0b0101100110000110110111011110000100000110000010101101101010001101, 0b1100001001111000001110001111010110111001000111100000000100001011},
+    {0b1011000101000111001010000111100110000110000111110100001010111110, 0b0001101001011111010111101000011000010000101101110010000001000101},
+    {0b1000100010110101110010001011100000100011011101011110111010111110, 0b0000101111000001011100100101111101011100110111001110001110101101},
+    {0b1110110001100100101111001001000110010100010000111111110101111010, 0b1010101011001100101101100100000010101101100000111011000111000000},
+    {0b0000000111111010000000110001111000000001011110111111011100000001, 0b1000001011111111010101100001101110110111001111100011001000110001},
+    {0b0000000000001010101100111101010011011101111000111011010100100001, 0b0101011110000101101110010001010011100010100000100010000000000001},
+    {0b0001101111011101110010001110001111101000000101000011100010011000, 0b0100101101001000100000001111001101110100011100100000100000110001},
+    {0b1001111101001011101010001001100110000011011001011111000011010111, 0b1100101000100111000100010110010001110010011001001000000011001001},
+    {0b0000001011010011111101111100101110000101000001010011100101000010, 0b0000100111011100000110010011011110000110010101010001011100001001},
+    /*s1 bit 30*/{0b1100101001110110010100011011100000100111111000001100000101000011, 0b0011111101011011010110100001101100000010001101110010011010010100},
+    {0b0001110101010110011101101011111101100001101100011000111010101000, 0b1111010000111101111000111010001100001100000000000010001111111111},
+    {0b1000110110010001101101110011011010010100010010111011001110100011, 0b0111111111001110100110101101010111110110011100111001011100101111},
+    {0b0001111011001001001111110011111001100000111001110101111011101011, 0b0100110011011000001111010011111110110101011110011010001110100100},
+    {0b1011110010010100110000000100001011001111001101111011000001100101, 0b0011011010001111010011100110001101010100000110110110011010011101},
+    {0b1000111110101001100111010111111000001000000011010010111000111001, 0b1101110000010001001110100100111011000011000001101100000001010100},
+    {0b1011101101000111111001110000110000111100111010101110111110000011, 0b1100100011111001100101001000001101011011000111010010111010101100},
+    {0b0101100000011100000011011000000101011001010100110001000001001111, 0b0111010101011011100000100100000011011111110000011011111101010111},
+    {0b0011011010011001111000010010000110010111101001010011011010010010, 0b0110111101001011100010101010110101111100100100010100000000110010},
+    {0b1101100011000001010110001001000011010001011100101101110011110000, 0b0010000010111010000100001001101000100110100000110111111010110101},
+    /*s1 bit 40*/{0b1100000000110010101011000101011101100000011111000100100110101110, 0b0000000101101001000010111001100000010101100110111101110010011110},
+    {0b0100101000001111000011000110011101010110110111001010101000110010, 0b0011011010111111100000100010110001011101001000010011010100100101},
+    {0b1100010000110011101100100110000101110100110100111001001000110110, 0b0111010111001001001110001001100101000100011101100001111111011001},
+    {0b0001011111011010011010011010100100101100010010110010010101010111, 0b1100111111000000011010011111101000000111001110010011100000110010},
+    {0b1110011110101001011111011101110011010000101010110111010111110111, 0b1110101100000011001011001101111100000101100101001000010010000111},
+    {0b0111100100011101010101011011001000011110111100010111001110101000, 0b1000010110111010010101000111101111100100001000011011101001110000},
+    {0b1010110011101111110111110110110000000111010001101100111001100101, 0b1011100011110001101000000011001011100000011111101000000001110001},
+    {0b0011101110110001101000000010000100010101010111110100001110111011, 0b1001010110111010110100100000010111110110101000110001000000100010},
+    {0b1101000110100111110010010111101000101010111100000011111100001010, 0b0010111010110110011111110001101001110111001000011011011101010010},
+    {0b1110111000100000100101010010101101101101000010100100111100010000, 0b0011001110010011011000011110111010010001010100011001000001110111},
+    /*s1 bit 50*/{0b1010000011001000011110100110011110001101101011001000110111111001, 0b1111011110100111001010000000001011000000011100101011100011011001},
+    {0b1000011111100101100001000101001101100010110000011110101011010110, 0b1111001101100011001010011101111100100011001010111000000101010101},
+    {0b0010111101000101010110101101000101110101110011111111001101000011, 0b1010100011010011110111011111111111100110011110110101110001101100},
+    {0b0001111111100110011001111011010000111111011011101001100110110001, 0b0011000110011111111001100011111111111001110010011111010010101100},
+    {0b0100010011010011100000100111011110110000010110000011110111010001, 0b0001111110100011001001010001100011111000111100010101101110000110},
+    {0b0111001011110000011111010000101100001000000011011000010001001101, 0b0111011011100100111011100010001000101001010010011001011010110000},
+    {0b0000011000101110010011110110100101010011011110001011110101111101, 0b1000011111111110111100100010001111011001111011010000001110101111},
+    {0b1001110100111111011101110011111010011101000100111100100101101100, 0b1000000011011111010000111111000101000101101000100000110010001110},
+    {0b1101010010110110110001010010001000010100010000111000111000111111, 0b1010010110110110110101100100111010101010101010010110111001101111},
+    {0b1001100010110011000000110001110001010110110111111110001011010110, 0b0110001000010010010110110010110010010000101110101101000010101011},
+    /*s1 bit 60*/{0b1001111001100111100101110000100011111101001001001011010100010000, 0b0110001010011111010010110110110101010111111011111000011000010000},
+    {0b1111100011111100100100000110000101111000100001111000100111010110, 0b0101010111101100111000111001000111111110010111111101110001100100},
+    {0b0000110110100110001011010111011111010011111000001010100101011100, 0b1011100011101010010001000110101001001111010111011100101111010101},
+    {0b0011000110100011111010110001011111001011010001110101000010000101, 0b1110000000100101110011001011110001111001110010110111111110000011}
+};
+
+
+Xoroshiro128Plus Xoroshiro128Plus::xoroshiro128plus_from_last_bits(std::pair<uint64_t, uint64_t> last_bits){
+    uint64_t s0 = 0;
+    uint64_t s1 = 0;
+
+    for (size_t i = 0; i < 64; i++){
+        uint64_t first_half = last_bits_reverse_matrix[i][0] & last_bits.first;
+        uint64_t second_half = last_bits_reverse_matrix[i][1] & last_bits.second;
+
+        uint64_t x = first_half ^ second_half;
+        x ^= x >> 32;
+        x ^= x >> 16;
+        x ^= x >> 8;
+        x ^= x >> 4;
+        x ^= x >> 2;
+        x ^= x >> 1;
+        x &= 1;
+
+        s0 += x << (63 - i);
+    }
+    for (size_t i = 0; i < 64; i++){
+        uint64_t first_half = last_bits_reverse_matrix[i + 64][0] & last_bits.first;
+        uint64_t second_half = last_bits_reverse_matrix[i + 64][1] & last_bits.second;
+
+        uint64_t x = first_half ^ second_half;
+        x ^= x >> 32;
+        x ^= x >> 16;
+        x ^= x >> 8;
+        x ^= x >> 4;
+        x ^= x >> 2;
+        x ^= x >> 1;
+        x &= 1;
+
+        s1 += x << (63 - i);
+    }
+    Xoroshiro128PlusState state(s0, s1);
+    return Xoroshiro128Plus(state);
+}
+
+
+}
+}
diff --git a/SerialPrograms/Source/Pokemon/Pokemon_Xoroshiro128Plus.h b/SerialPrograms/Source/Pokemon/Pokemon_Xoroshiro128Plus.h
new file mode 100644
index 0000000000..c7b1116d4d
--- /dev/null
+++ b/SerialPrograms/Source/Pokemon/Pokemon_Xoroshiro128Plus.h
@@ -0,0 +1,52 @@
+/*  Xoroshiro128+ and reverse
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_Xoroshiro128Plus_H
+#define PokemonAutomation_PokemonSwSh_Xoroshiro128Plus_H
+
+#include <stdint.h>
+#include <utility>
+#include <vector>
+
+namespace PokemonAutomation{
+namespace Pokemon{
+
+struct Xoroshiro128PlusState{
+    Xoroshiro128PlusState(uint64_t s0, uint64_t s1);
+    uint64_t s0;
+    uint64_t s1;
+};
+
+class Xoroshiro128Plus{
+public:
+    Xoroshiro128PlusState state;
+
+    Xoroshiro128Plus(Xoroshiro128PlusState state);
+    Xoroshiro128Plus(uint64_t s0, uint64_t s1);
+    uint64_t next();
+    uint64_t nextInt(uint64_t);
+    Xoroshiro128PlusState get_state();
+    std::vector<bool> generate_last_bit_sequence(size_t max_advances);
+
+    // Calculates how many advances are required to reach the given state.
+    // The given state must be reachable within max_advances advances.
+    // Returns a pair:
+    // first: true if the state is reachable within max_advances, false otherwise
+    // second: the number of advances required (if first is true)
+    std::pair<bool, uint64_t> advances_to_state(Xoroshiro128PlusState other_state, uint64_t max_advances = 100000);
+
+    static Xoroshiro128Plus xoroshiro128plus_from_last_bits(std::pair<uint64_t, uint64_t> last_bits);
+
+
+private:
+    static uint64_t last_bits_reverse_matrix[128][2];
+
+    uint64_t rotl(const uint64_t x, int k);
+};
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Pokemon/Pokemon_Xorshift128.cpp b/SerialPrograms/Source/Pokemon/Pokemon_Xorshift128.cpp
new file mode 100644
index 0000000000..846766d311
--- /dev/null
+++ b/SerialPrograms/Source/Pokemon/Pokemon_Xorshift128.cpp
@@ -0,0 +1,156 @@
+/*  Xorshift128
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/PrettyPrint.h"
+#include "Pokemon_Xorshift128.h"
+
+namespace PokemonAutomation{
+namespace Pokemon{
+
+
+const uint64_t JUMP_THRESHOLD = 512;
+
+
+std::string Xorshift128State::to_string() const{
+    return "[0x" + tostr_hex_padded(8, s0)
+        + ", 0x" + tostr_hex_padded(8, s1)
+        + ", 0x" + tostr_hex_padded(8, s2)
+        + ", 0x" + tostr_hex_padded(8, s3) + "]";
+}
+
+
+Xorshift128State xorshift128_state_from_seed_pair(uint64_t seed0, uint64_t seed1){
+    return Xorshift128State(
+        (uint32_t)(seed0 >> 32), (uint32_t)seed0,
+        (uint32_t)(seed1 >> 32), (uint32_t)seed1
+    );
+}
+void xorshift128_state_to_seed_pair(const Xorshift128State& state, uint64_t& seed0, uint64_t& seed1){
+    seed0 = ((uint64_t)state.s0 << 32) | state.s1;
+    seed1 = ((uint64_t)state.s2 << 32) | state.s3;
+}
+
+Gf2Vec128 xorshift128_state_to_vector(const Xorshift128State& state){
+    Gf2Vec128 ret;
+    xorshift128_state_to_seed_pair(state, ret.high, ret.low);
+    return ret;
+}
+Xorshift128State xorshift128_state_from_vector(const Gf2Vec128& vector){
+    return xorshift128_state_from_seed_pair(vector.high, vector.low);
+}
+
+
+
+uint32_t Xorshift128::next(){
+    uint32_t temp = m_state.s0 ^ (m_state.s0 << 11);
+    uint32_t old_s3 = m_state.s3;
+
+    m_state.s0 = m_state.s1;
+    m_state.s1 = m_state.s2;
+    m_state.s2 = m_state.s3;
+    m_state.s3 = temp ^ (temp >> 8) ^ old_s3 ^ (old_s3 >> 19);
+
+    return m_state.s3;
+}
+
+void Xorshift128::prev(){
+    uint32_t temp = (m_state.s2 >> 19) ^ m_state.s2 ^ m_state.s3;
+
+    temp ^= temp >> 8;
+    temp ^= temp >> 16;
+
+    temp ^= temp << 11;
+    temp ^= temp << 22;
+
+    m_state.s3 = m_state.s2;
+    m_state.s2 = m_state.s1;
+    m_state.s1 = m_state.s0;
+    m_state.s0 = temp;
+}
+
+void Xorshift128::advance(uint64_t count){
+    if (count < JUMP_THRESHOLD){
+        for (uint64_t c = 0; c < count; c++){
+            next();
+        }
+        return;
+    }
+    m_state = xorshift128_state_from_vector(
+        xorshift128_transition_power(count) * xorshift128_state_to_vector(m_state)
+    );
+}
+void Xorshift128::rewind(uint64_t count){
+    if (count < JUMP_THRESHOLD){
+        for (uint64_t c = 0; c < count; c++){
+            prev();
+        }
+        return;
+    }
+    m_state = xorshift128_state_from_vector(
+        xorshift128_inverse_transition_matrix().pow(count) * xorshift128_state_to_vector(m_state)
+    );
+}
+
+
+
+template <typename StepFunction>
+static Gf2Matrix128 build_step_matrix(StepFunction&& step){
+    Gf2Matrix128 matrix;
+    for (size_t column = 0; column < 128; column++){
+        Gf2Vec128 basis;
+        basis.set(column, true);
+
+        Xorshift128 rng(xorshift128_state_from_vector(basis));
+        step(rng);
+        Gf2Vec128 image = xorshift128_state_to_vector(rng.state());
+
+        for (size_t row = 0; row < 128; row++){
+            if (image.get(row)){
+                matrix[row].set(column, true);
+            }
+        }
+    }
+    return matrix;
+}
+
+const Gf2Matrix128& xorshift128_transition_matrix(){
+    static Gf2Matrix128 matrix = build_step_matrix([](Xorshift128& rng){ rng.next(); });
+    return matrix;
+}
+const Gf2Matrix128& xorshift128_inverse_transition_matrix(){
+    static Gf2Matrix128 matrix = build_step_matrix([](Xorshift128& rng){ rng.prev(); });
+    return matrix;
+}
+
+//  T^(2^k) for every k that fits in a 64-bit count.
+static const std::array<Gf2Matrix128, 64>& xorshift128_transition_powers_of_two(){
+    static std::array<Gf2Matrix128, 64> table = [](){
+        std::array<Gf2Matrix128, 64> ret;
+        ret[0] = xorshift128_transition_matrix();
+        for (size_t c = 1; c < ret.size(); c++){
+            ret[c] = ret[c - 1] * ret[c - 1];
+        }
+        return ret;
+    }();
+    return table;
+}
+
+Gf2Matrix128 xorshift128_transition_power(uint64_t count){
+    const std::array<Gf2Matrix128, 64>& powers = xorshift128_transition_powers_of_two();
+    Gf2Matrix128 ret = Gf2Matrix128::identity();
+    for (size_t bit = 0; count != 0; count >>= 1, bit++){
+        if ((count & 1) != 0){
+            ret = powers[bit] * ret;
+        }
+    }
+    return ret;
+}
+
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/Pokemon/Pokemon_Xorshift128.h b/SerialPrograms/Source/Pokemon/Pokemon_Xorshift128.h
new file mode 100644
index 0000000000..4c5a3ff0a7
--- /dev/null
+++ b/SerialPrograms/Source/Pokemon/Pokemon_Xorshift128.h
@@ -0,0 +1,123 @@
+/*  Xorshift128
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Pokemon_Xorshift128_H
+#define PokemonAutomation_Pokemon_Xorshift128_H
+
+#include <stddef.h>
+#include <stdint.h>
+#include <array>
+#include <string>
+#include "Pokemon_Gf2Matrix.h"
+
+namespace PokemonAutomation{
+namespace Pokemon{
+
+
+struct Xorshift128State{
+    uint32_t s0 = 0;
+    uint32_t s1 = 0;
+    uint32_t s2 = 0;
+    uint32_t s3 = 0;
+
+    Xorshift128State() = default;
+    Xorshift128State(uint32_t p_s0, uint32_t p_s1, uint32_t p_s2, uint32_t p_s3)
+        : s0(p_s0), s1(p_s1), s2(p_s2), s3(p_s3)
+    {}
+
+    bool operator==(const Xorshift128State& x) const{
+        return s0 == x.s0 && s1 == x.s1 && s2 == x.s2 && s3 == x.s3;
+    }
+    bool operator!=(const Xorshift128State& x) const{ return !(*this == x); }
+
+    //  "[0x........, 0x........, 0x........, 0x........]"
+    std::string to_string() const;
+};
+
+
+Xorshift128State xorshift128_state_from_seed_pair(uint64_t seed0, uint64_t seed1);
+void xorshift128_state_to_seed_pair(const Xorshift128State& state, uint64_t& seed0, uint64_t& seed1);
+
+
+Gf2Vec128 xorshift128_state_to_vector(const Xorshift128State& state);
+Xorshift128State xorshift128_state_from_vector(const Gf2Vec128& vector);
+
+
+class Xorshift128{
+public:
+    Xorshift128() = default;
+    explicit Xorshift128(const Xorshift128State& state) : m_state(state) {}
+    Xorshift128(uint32_t s0, uint32_t s1, uint32_t s2, uint32_t s3) : m_state(s0, s1, s2, s3) {}
+
+    const Xorshift128State& state() const{ return m_state; }
+    void set_state(const Xorshift128State& state){ m_state = state; }
+
+    uint32_t next();
+
+    //  Step backwards. Undoes exactly one next().
+    void prev();
+
+    void advance(uint64_t count);
+    void rewind(uint64_t count);
+
+private:
+    Xorshift128State m_state;
+};
+
+
+const Gf2Matrix128& xorshift128_transition_matrix();
+const Gf2Matrix128& xorshift128_inverse_transition_matrix();
+
+Gf2Matrix128 xorshift128_transition_power(uint64_t count);
+
+
+inline uint32_t bdsp_gen_transform(uint32_t raw){
+    return (uint32_t)(raw % 0xFFFFFFFF) + 0x80000000;
+}
+
+
+//  A sliding window of pre-generated outputs. Size must be a power of two.
+template <size_t Size>
+class Xorshift128List{
+    static_assert(Size != 0 && (Size & (Size - 1)) == 0, "Size must be a power of two.");
+
+public:
+    explicit Xorshift128List(const Xorshift128& rng)
+        : m_rng(rng)
+    {
+        for (uint32_t& value : m_buffer){
+            value = m_rng.next();
+        }
+    }
+
+    uint32_t next_raw(){ return m_buffer[m_index++ & (Size - 1)]; }
+    uint32_t next_gen(){ return bdsp_gen_transform(next_raw()); }
+
+    uint32_t next_raw_modulo(uint32_t modulo){ return next_raw() % modulo; }
+    uint32_t next_gen_modulo(uint32_t modulo){ return next_gen() % modulo; }
+
+    //  Skip values without reading them.
+    void advance(size_t count){ m_index += count; }
+
+    void advance_state(){
+        m_buffer[m_head++ & (Size - 1)] = m_rng.next();
+        m_index = m_head;
+    }
+
+    //  Rewind the read position to the start of the current window.
+    void reset_index(){ m_index = m_head; }
+
+private:
+    Xorshift128 m_rng;
+    std::array<uint32_t, Size> m_buffer;
+    size_t m_head = 0;
+    size_t m_index = 0;
+};
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Pokemon/Resources/Pokemon_BerryNames.cpp b/SerialPrograms/Source/Pokemon/Resources/Pokemon_BerryNames.cpp
index 5103e7885a..bc359469cf 100644
--- a/SerialPrograms/Source/Pokemon/Resources/Pokemon_BerryNames.cpp
+++ b/SerialPrograms/Source/Pokemon/Resources/Pokemon_BerryNames.cpp
@@ -1,6 +1,6 @@
 /*  Pokemon Pokeball Names
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -8,7 +8,7 @@
 #include "Common/Cpp/Json/JsonValue.h"
 #include "Common/Cpp/Json/JsonArray.h"
 #include "Common/Cpp/Json/JsonObject.h"
-#include "CommonFramework/Globals.h"
+#include "CommonFramework/GlobalAutoPaths.h"
 #include "Pokemon_BerryNames.h"
 
 namespace PokemonAutomation{
@@ -37,7 +37,7 @@ BerryNameDatabase::BerryNameDatabase()
     // ["cheri-berry", "chesto-berry", ... ]
     std::string path_slugs = RESOURCE_PATH() + "Pokemon/ItemListBerries.json";
     JsonValue json_slugs = load_json_file(path_slugs);
-    JsonArray& slugs = json_slugs.get_array_throw(path_slugs);
+    JsonArray& slugs = json_slugs.to_array_throw(path_slugs);
 
     // Load a map of berry slugs to berry names in all languages, e.g.:
     // {
@@ -50,10 +50,10 @@ BerryNameDatabase::BerryNameDatabase()
     // }
     std::string path_disp = RESOURCE_PATH() + "Pokemon/ItemNameDisplay.json";
     JsonValue json_disp = load_json_file(path_disp);
-    JsonObject& item_disp = json_disp.get_object_throw(path_disp);
+    JsonObject& item_disp = json_disp.to_object_throw(path_disp);
 
     for (auto& item : slugs){
-        std::string& slug = item.get_string_throw(path_slugs);
+        std::string& slug = item.to_string_throw(path_slugs);
 
         JsonObject& berry_name_dict = item_disp.get_object_throw(slug, path_disp);
         std::string& display_name = berry_name_dict.get_string_throw("eng", path_disp);
diff --git a/SerialPrograms/Source/Pokemon/Resources/Pokemon_BerryNames.h b/SerialPrograms/Source/Pokemon/Resources/Pokemon_BerryNames.h
index 738630074e..f909ed762d 100644
--- a/SerialPrograms/Source/Pokemon/Resources/Pokemon_BerryNames.h
+++ b/SerialPrograms/Source/Pokemon/Resources/Pokemon_BerryNames.h
@@ -1,6 +1,6 @@
 /*  Pokemon Berry Names
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/Pokemon/Resources/Pokemon_BerrySprites.cpp b/SerialPrograms/Source/Pokemon/Resources/Pokemon_BerrySprites.cpp
index b7f8a02ec9..2a78cc5fde 100644
--- a/SerialPrograms/Source/Pokemon/Resources/Pokemon_BerrySprites.cpp
+++ b/SerialPrograms/Source/Pokemon/Resources/Pokemon_BerrySprites.cpp
@@ -1,6 +1,6 @@
 /*  Pokemon Berry Sprites
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/Pokemon/Resources/Pokemon_BerrySprites.h b/SerialPrograms/Source/Pokemon/Resources/Pokemon_BerrySprites.h
index 6a06c76ea0..d900a5ccae 100644
--- a/SerialPrograms/Source/Pokemon/Resources/Pokemon_BerrySprites.h
+++ b/SerialPrograms/Source/Pokemon/Resources/Pokemon_BerrySprites.h
@@ -1,13 +1,13 @@
 /*  Pokemon Berry Sprites
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifndef PokemonAutomation_Pokemon_BerrySprites_H
 #define PokemonAutomation_Pokemon_BerrySprites_H
 
-#include "CommonFramework/Resources/SpriteDatabase.h"
+#include "CommonTools/Resources/SpriteDatabase.h"
 
 namespace PokemonAutomation{
 namespace Pokemon{
diff --git a/SerialPrograms/Source/Pokemon/Resources/Pokemon_EggSteps.cpp b/SerialPrograms/Source/Pokemon/Resources/Pokemon_EggSteps.cpp
new file mode 100644
index 0000000000..42d006dff3
--- /dev/null
+++ b/SerialPrograms/Source/Pokemon/Resources/Pokemon_EggSteps.cpp
@@ -0,0 +1,84 @@
+/*  Egg Steps
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Exceptions.h"
+#include "Common/Cpp/PrettyPrint.h"
+#include "Common/Cpp/Json/JsonObject.h"
+#include "CommonFramework/GlobalAutoPaths.h"
+#include "CommonFramework/Logging/Logger.h"
+#include "CommonTools/Resources/SpriteDatabase.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "Pokemon/Resources/Pokemon_PokemonSlugs.h"
+#include "Pokemon/Resources/Pokemon_PokemonNames.h"
+#include "Pokemon_EggSteps.h"
+
+namespace PokemonAutomation{
+namespace Pokemon{
+
+
+
+EggStepDatabase::EggStepDatabase(const char* resource_path, const SpriteDatabase* sprites){
+    std::string path_slugs = RESOURCE_PATH() + resource_path;
+    JsonValue json_slugs = load_json_file(path_slugs);
+    JsonObject& slugs = json_slugs.to_object_throw(path_slugs);
+
+    const std::map<std::string, size_t>& SLUGS_TO_NATIONAL_DEX = Pokemon::SLUGS_TO_NATIONAL_DEX();
+
+    std::map<size_t, std::pair<std::string, uint16_t>> nat_id_to_steps;
+    for (const auto& slug : slugs){
+        auto iter = SLUGS_TO_NATIONAL_DEX.find(slug.first);
+        if (iter == SLUGS_TO_NATIONAL_DEX.end()){
+            global_logger_tagged().log("Unknown " + Pokemon::STRING_POKEMON + "slug: " + slug.first);
+            continue;
+        }
+
+        auto ret = nat_id_to_steps.emplace(
+            std::piecewise_construct,
+            std::forward_as_tuple(iter->second),
+            std::forward_as_tuple(iter->first, (uint16_t)slug.second.to_integer_throw(path_slugs))
+        );
+        if (!ret.second){
+            global_logger_tagged().log("Duplicate " + Pokemon::STRING_POKEMON + " nat-dex ID: " + std::to_string(iter->second));
+        }
+
+        m_slug_to_steps[slug.first] = (uint16_t)slug.second.to_integer_throw(path_slugs);
+    }
+
+    for (const auto& item : nat_id_to_steps){
+        const std::string& slug = item.second.first;
+        std::string display_name = Pokemon::get_pokemon_name(slug).display_name();
+        display_name += " (" + tostr_u_commas(item.second.second) + " steps)";
+
+        const SpriteDatabase::Sprite* sprite = sprites == nullptr
+            ? nullptr
+            : sprites->get_nothrow(slug);
+
+        if (sprite == nullptr){
+            m_stringselect_database.add_entry(StringSelectEntry(slug, display_name));
+            global_logger_tagged().log("Missing sprite for: " + slug, COLOR_RED);
+        }else{
+            m_stringselect_database.add_entry(StringSelectEntry(slug, display_name, sprite->icon));
+        }
+    }
+}
+
+
+size_t EggStepDatabase::step_count(const std::string& slug) const{
+    auto iter = m_slug_to_steps.find(slug);
+    if (iter == m_slug_to_steps.end()){
+        throw InternalProgramError(
+            nullptr,
+            PA_CURRENT_FUNCTION,
+            std::string("Invalid ") + Pokemon::STRING_POKEMON + " slug: " + slug
+        );
+    }
+    return iter->second;
+}
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/Pokemon/Resources/Pokemon_EggSteps.h b/SerialPrograms/Source/Pokemon/Resources/Pokemon_EggSteps.h
new file mode 100644
index 0000000000..59aff44869
--- /dev/null
+++ b/SerialPrograms/Source/Pokemon/Resources/Pokemon_EggSteps.h
@@ -0,0 +1,39 @@
+/*  Egg Steps
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Pokemon_EggSteps_H
+#define PokemonAutomation_Pokemon_EggSteps_H
+
+#include <map>
+#include "CommonTools/Options/StringSelectOption.h"
+
+namespace PokemonAutomation{
+
+class SpriteDatabase;
+
+namespace Pokemon{
+
+
+class EggStepDatabase{
+public:
+    EggStepDatabase(const char* resource_path, const SpriteDatabase* sprites);
+
+    size_t step_count(const std::string& slug) const;
+    const StringSelectDatabase& database() const{
+        return m_stringselect_database;
+    }
+
+private:
+    std::map<std::string, uint16_t> m_slug_to_steps;
+    StringSelectDatabase m_stringselect_database;
+};
+
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Pokemon/Resources/Pokemon_PokeballNames.cpp b/SerialPrograms/Source/Pokemon/Resources/Pokemon_PokeballNames.cpp
index ff635c8b61..9aef314614 100644
--- a/SerialPrograms/Source/Pokemon/Resources/Pokemon_PokeballNames.cpp
+++ b/SerialPrograms/Source/Pokemon/Resources/Pokemon_PokeballNames.cpp
@@ -1,13 +1,13 @@
 /*  Pokemon Pokeball Names
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include "Common/Cpp/Json/JsonValue.h"
 #include "Common/Cpp/Json/JsonArray.h"
 #include "Common/Cpp/Json/JsonObject.h"
-#include "CommonFramework/Globals.h"
+#include "CommonFramework/GlobalAutoPaths.h"
 #include "Pokemon_PokeballNames.h"
 
 namespace PokemonAutomation{
@@ -32,21 +32,27 @@ const std::string PokeballNameDatabase::NULL_SLUG;
 PokeballNameDatabase::PokeballNameDatabase(){
     std::string path_slugs = RESOURCE_PATH() + "Pokemon/ItemListBalls.json";
     JsonValue json_slugs = load_json_file(path_slugs);
-    JsonArray& slugs = json_slugs.get_array_throw(path_slugs);
+    JsonArray& slugs = json_slugs.to_array_throw(path_slugs);
 
     std::string path_disp = RESOURCE_PATH() + "Pokemon/ItemNameDisplay.json";
     JsonValue json_disp = load_json_file(path_disp);
-    JsonObject& item_disp = json_disp.get_object_throw(path_disp);
+    JsonObject& item_disp = json_disp.to_object_throw(path_disp);
 
     for (auto& item : slugs){
-        std::string& slug = item.get_string_throw(path_slugs);
+        std::string& slug = item.to_string_throw(path_slugs);
         ordered_list.emplace_back(slug);
 
-        JsonObject& languages = item_disp.get_object_throw(slug, path_disp);
-        std::string& display_name = languages.get_string_throw("eng", path_disp);
-
-        database[slug].m_display_name = display_name;
-        reverse_lookup[std::move(display_name)] = std::move(slug);
+        JsonObject* languages = item_disp.get_object(slug);
+        std::string* display_name;
+        if (languages != nullptr){
+            //  TODO: REMOVE: Display names for PLA balls.
+            display_name = &languages->get_string_throw("eng", path_disp);
+        }else{
+            display_name = &slug;
+        }
+
+        database[slug].m_display_name = *display_name;
+        reverse_lookup[*display_name] = slug;
     }
 }
 
diff --git a/SerialPrograms/Source/Pokemon/Resources/Pokemon_PokeballNames.h b/SerialPrograms/Source/Pokemon/Resources/Pokemon_PokeballNames.h
index 84dce90efa..1e907feada 100644
--- a/SerialPrograms/Source/Pokemon/Resources/Pokemon_PokeballNames.h
+++ b/SerialPrograms/Source/Pokemon/Resources/Pokemon_PokeballNames.h
@@ -1,6 +1,6 @@
 /*  Pokemon Pokeball Names
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/Pokemon/Resources/Pokemon_PokemonForms.cpp b/SerialPrograms/Source/Pokemon/Resources/Pokemon_PokemonForms.cpp
new file mode 100644
index 0000000000..e096146726
--- /dev/null
+++ b/SerialPrograms/Source/Pokemon/Resources/Pokemon_PokemonForms.cpp
@@ -0,0 +1,137 @@
+/*  Pokemon Forms
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+
+#include <string>
+#include <vector>
+#include <map>
+#include <iostream>
+#include <set>
+#include <fstream>
+#include "Common/Cpp/Json/JsonValue.h"
+#include "Common/Cpp/Json/JsonObject.h"
+#include "Common/Cpp/Json/JsonArray.h"
+#include "CommonFramework/GlobalAutoPaths.h"
+#include "Pokemon_PokemonNames.h"
+#include "Pokemon_PokemonForms.h"
+#include "Pokemon_PokemonSlugs.h"
+
+namespace PokemonAutomation{
+namespace Pokemon{
+
+
+struct PokemonFormDatabase{
+    PokemonFormDatabase();
+    static const PokemonFormDatabase& instance(){
+        static PokemonFormDatabase database;
+        return database;
+    }
+
+    std::map<std::string, PokemonForm> m_slug_to_form;
+    std::vector<std::string> m_slugs;
+};
+
+bool is_form_shiny(const std::string& form_slug){
+    const std::string& suffix = "-shiny";
+    if (form_slug.length() < suffix.length()){
+           return false;
+       }
+    return form_slug.compare(form_slug.length() - suffix.length(), suffix.length(), suffix) == 0;
+}
+
+bool PokemonForm::is_shiny() const {
+    return is_form_shiny(m_slug);
+}
+
+PokemonFormDatabase::PokemonFormDatabase(){
+    // Load form map JSON
+    const std::string form_display_map_path = RESOURCE_PATH() + "Pokemon/AllFormDisplayMap.json";
+    JsonValue json = load_json_file(form_display_map_path);
+    // a map from form slug to list of tuples, where each tuple contains a form slug and a display name
+    JsonObject& form_displays = json.to_object_throw(form_display_map_path);
+
+    const std::string no_shiny_pokemon_path = RESOURCE_PATH() + "Pokemon/SpecialPokemonWithNoShinyForm.txt";
+    std::ifstream fin(no_shiny_pokemon_path);
+    if (!fin.is_open()){
+        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "canot open resource file: " + no_shiny_pokemon_path);
+    }
+    std::string line;
+    std::set<std::string> no_shiny_forms;
+    while (std::getline(fin, line)){
+        fin >> std::ws;
+        no_shiny_forms.emplace(std::move(line));
+    }
+
+    for (const auto& species_slug: NATIONAL_DEX_SLUGS()){
+        const std::string& species_display_name = get_pokemon_name(species_slug).display_name();
+        const JsonArray* form_array = form_displays.get_array(species_slug);
+        if (form_array == nullptr){
+            // there is a single form for this species
+            m_slug_to_form.emplace(species_slug, PokemonForm(species_slug, species_display_name, species_slug));
+            std::string shiny_slug = species_slug + "-shiny";
+            m_slug_to_form.emplace(shiny_slug, PokemonForm(shiny_slug, "Shiny " + species_display_name, species_slug));
+            m_slugs.push_back(species_slug);
+            m_slugs.emplace_back(std::move(shiny_slug));
+            continue;
+        }
+
+        bool has_shiny_form = false;
+        std::vector<std::map<std::string, PokemonForm>::const_iterator> forms;
+        for (const auto& form : *form_array){
+            // form is a list of two elements, first the form slug name, second the display name
+            const JsonArray* form_ptr = form.to_array();
+            if (form_ptr == nullptr){
+                throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "No [form_slug, display_name] format in form display map: " + species_slug);
+            }
+            const JsonArray& form_slug_and_display = *form_ptr;
+            if (form_slug_and_display.size() != 2){
+                throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Wrong [form_slug, display_name] length in form display map: " + species_slug);
+            }
+            const std::string& form_slug = form_slug_and_display[0].to_string_throw();
+            const std::string& display_name = form_slug_and_display[1].to_string_throw();
+            if (form_slug.empty() || display_name.empty()){
+                throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Empty string in [form_slug, display_name] in form display map: " + species_slug);
+            }
+            if (is_form_shiny(form_slug)){
+                has_shiny_form = true;
+            }
+            const auto it = m_slug_to_form.emplace(form_slug, PokemonForm(form_slug, display_name, species_slug)).first;
+            m_slugs.push_back(form_slug);
+            forms.push_back(it);
+        }
+        if (!has_shiny_form){ // if no explict shiny form loaded, we build it our own
+            for (const auto& it: forms){
+                const auto& form = it->second;   
+                if (no_shiny_forms.find(form.m_slug) != no_shiny_forms.end()){
+                    continue; // this form has no shiny
+                }
+                std::string shiny_slug = form.m_slug + "-shiny";
+                m_slug_to_form.emplace(shiny_slug, PokemonForm(
+                    shiny_slug, "Shiny " + form.m_display_name, form.m_species
+                ));
+                m_slugs.emplace_back(std::move(shiny_slug));
+            }
+        }
+    }
+    std::cout << "Loaded " << m_slug_to_form.size() << " form slugs" << std::endl;
+}
+
+const PokemonForm* get_pokemon_form(const std::string& slug){
+    const auto& slug_to_form = PokemonFormDatabase::instance().m_slug_to_form;
+    const auto it = slug_to_form.find(slug);
+    if (it == slug_to_form.end()){
+        return nullptr;
+    }
+    return &it->second;
+}
+
+const std::vector<std::string>& ALL_POKEMON_FORMS(){
+    return PokemonFormDatabase::instance().m_slugs;
+}
+
+
+}
+}
diff --git a/SerialPrograms/Source/Pokemon/Resources/Pokemon_PokemonForms.h b/SerialPrograms/Source/Pokemon/Resources/Pokemon_PokemonForms.h
new file mode 100644
index 0000000000..7447865294
--- /dev/null
+++ b/SerialPrograms/Source/Pokemon/Resources/Pokemon_PokemonForms.h
@@ -0,0 +1,54 @@
+/*  Pokemon Forms
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Pokemon_PokemonForms_H
+#define PokemonAutomation_Pokemon_PokemonForms_H
+
+#include <string>
+#include <vector>
+
+namespace PokemonAutomation{
+namespace Pokemon{
+
+
+// slug and display names related to a pokemon form
+class PokemonForm{
+public:
+    const std::string& slug() const{ return m_slug; }
+    const std::string& display_name() const{ return m_display_name; }
+    bool is_shiny() const;
+    // slug of the base species
+    const std::string& species() const { return m_species; }
+    // const PokemonForm& shiny_form() const;
+    // const PokemonForm& non_shiny_form() const;
+
+private:
+    PokemonForm(std::string slug, std::string display_name, std::string species)
+        : m_slug(std::move(slug))
+        , m_display_name(std::move(display_name))
+        , m_species(std::move(species))
+    {}
+    friend struct PokemonFormDatabase;
+
+    std::string m_slug;
+    std::string m_display_name;
+    std::string m_species;
+};
+
+
+// Given a slug, find the form related data
+// You can find all form slugs with unique appearance from the map keys of:
+// Pokemon_PokemonHomeSprites.h:ALL_POKEMON_HOME_SPRITES().get()
+// If no such slug is found, return nullptr
+const PokemonForm* get_pokemon_form(const std::string& form_slug);
+
+// Get a vector of form slugs. Each slug is a form with unique appearance
+// that has a unique sprite loaded in Pokemon_PokemonHomeSprites.h:ALL_POKEMON_HOME_SPRITES()
+const std::vector<std::string>& ALL_POKEMON_FORMS();
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Pokemon/Resources/Pokemon_PokemonHomeSprites.cpp b/SerialPrograms/Source/Pokemon/Resources/Pokemon_PokemonHomeSprites.cpp
new file mode 100644
index 0000000000..d07f7a2b3b
--- /dev/null
+++ b/SerialPrograms/Source/Pokemon/Resources/Pokemon_PokemonHomeSprites.cpp
@@ -0,0 +1,23 @@
+/*  Pokemon Home Sprites
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Pokemon_PokemonHomeSprites.h"
+
+namespace PokemonAutomation{
+namespace Pokemon{
+
+
+
+const SpriteDatabase& ALL_POKEMON_HOME_SPRITES(){
+    static const SpriteDatabase database("Pokemon/AllHomeSprites.png", "Pokemon/AllHomeSprites.json");
+    return database;
+}
+
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/Pokemon/Resources/Pokemon_PokemonHomeSprites.h b/SerialPrograms/Source/Pokemon/Resources/Pokemon_PokemonHomeSprites.h
new file mode 100644
index 0000000000..0dcb4871ba
--- /dev/null
+++ b/SerialPrograms/Source/Pokemon/Resources/Pokemon_PokemonHomeSprites.h
@@ -0,0 +1,24 @@
+/*  Pokemon Home Sprites
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Pokemon_PokemonHomeSprites_H
+#define PokemonAutomation_Pokemon_PokemonHomeSprites_H
+
+#include "CommonTools/Resources/SpriteDatabase.h"
+
+namespace PokemonAutomation{
+namespace Pokemon{
+
+
+// All pokemon form sprites (including shiny and non-shiny) from Pokemon Home
+const SpriteDatabase& ALL_POKEMON_HOME_SPRITES();
+
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/Pokemon/Resources/Pokemon_PokemonNames.cpp b/SerialPrograms/Source/Pokemon/Resources/Pokemon_PokemonNames.cpp
index a2c2642c55..1baa1d8733 100644
--- a/SerialPrograms/Source/Pokemon/Resources/Pokemon_PokemonNames.cpp
+++ b/SerialPrograms/Source/Pokemon/Resources/Pokemon_PokemonNames.cpp
@@ -1,13 +1,13 @@
 /*  Pokemon Names
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include "Common/Cpp/Json/JsonValue.h"
 #include "Common/Cpp/Json/JsonArray.h"
 #include "Common/Cpp/Json/JsonObject.h"
-#include "CommonFramework/Globals.h"
+#include "CommonFramework/GlobalAutoPaths.h"
 #include "Pokemon_PokemonNames.h"
 
 namespace PokemonAutomation{
@@ -17,6 +17,9 @@ namespace Pokemon{
 const std::string PokemonNames::NULL_SLUG;
 
 
+// A database of pokemon names. Each name corresponds to one national dex number.
+// This database does not differentiate any form differences. Its size equals the highest available national
+// dex number.
 struct PokemonNameDatabase{
     PokemonNameDatabase();
     static const PokemonNameDatabase& instance(){
@@ -32,15 +35,15 @@ struct PokemonNameDatabase{
 PokemonNameDatabase::PokemonNameDatabase(){
     std::string path = RESOURCE_PATH() + "Pokemon/PokemonNameDisplay.json";
     JsonValue json = load_json_file(path);
-    JsonObject& displays = json.get_object_throw(path);
+    JsonObject& displays = json.to_object_throw(path);
 
     for (auto& item0 : displays){
         const std::string& slug = item0.first;
 
-        JsonObject& names = item0.second.get_object_throw(path);
+        JsonObject& names = item0.second.to_object_throw(path);
         PokemonNames data;
         for (auto& item1 : names){
-            std::string& name = item1.second.get_string_throw(path);
+            std::string& name = item1.second.to_string_throw(path);
             data.m_display_names[language_code_to_enum(item1.first)] = std::move(name);
         }
 
@@ -70,7 +73,6 @@ const std::string& PokemonNames::display_name(Language language) const{
 }
 
 
-
 const PokemonNames& get_pokemon_name(const std::string& slug){
     const std::map<std::string, PokemonNames>& database = PokemonNameDatabase::instance().m_slug_to_data;
     auto iter = database.find(slug);
@@ -107,11 +109,11 @@ const std::string& parse_pokemon_name_nothrow(const std::string& display_name){
 std::vector<std::string> load_pokemon_slug_json_list(const char* json_path){
     std::string path = RESOURCE_PATH() + json_path;
     JsonValue json = load_json_file(path);
-    JsonArray& array = json.get_array_throw();
+    JsonArray& array = json.to_array_throw();
 
     std::vector<std::string> list;
     for (auto& item : array){
-        std::string& slug = item.get_string_throw();
+        std::string& slug = item.to_string_throw();
         if (slug.empty()){
             throw FileException(
                 nullptr, PA_CURRENT_FUNCTION,
diff --git a/SerialPrograms/Source/Pokemon/Resources/Pokemon_PokemonNames.h b/SerialPrograms/Source/Pokemon/Resources/Pokemon_PokemonNames.h
index 41b9f3600b..53237e8022 100644
--- a/SerialPrograms/Source/Pokemon/Resources/Pokemon_PokemonNames.h
+++ b/SerialPrograms/Source/Pokemon/Resources/Pokemon_PokemonNames.h
@@ -1,6 +1,6 @@
 /*  Pokemon Names
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -16,6 +16,9 @@ namespace PokemonAutomation{
 namespace Pokemon{
 
 
+// Store a pokemon's display name for a pokemon species.
+// It does not differentiate any form differences. The total different PokemonNames
+// equals the highest available national dex number.
 class PokemonNames{
 public:
     const std::string& display_name() const{ return m_display_name; }
@@ -31,13 +34,30 @@ class PokemonNames{
 };
 
 
+// From pokemon slug to its display name.
+// The slug is for pokemon species. Each slug corresponds to one national dex number.
+// Throw InternalProgramError if the given slug is not found in the database.
 const PokemonNames& get_pokemon_name(const std::string& slug);
+// From pokemon slug to its display name.
+// The slug is for pokemon species. Each slug corresponds to one national dex number.
+// Return nullptr if the given slug is not found in the database.
 const PokemonNames* get_pokemon_name_nothrow(const std::string& slug);
+// From a pokemon English display name to its slug.
+// The display name is for pokemon species. Each name corresponds to one national dex number.
+// Throw InternalProgramError if the given name is not found in the database.
 const std::string& parse_pokemon_name(const std::string& display_name);
+// From a pokemon English display name to its slug.
+// The display name is for pokemon species. Each name corresponds to one national dex number.
+// Return nullptr if the given name is not found in the database.
 const std::string& parse_pokemon_name_nothrow(const std::string& display_name);
 
+// Get max national dex number from the database.
+size_t max_national_dex_number();
+// Get pokemon slug from national dex number. Throw InternalProgramError if no such dex number.
+const std::string& get_pokemon_from_national_dex_number(size_t national_id);
 
-// Load a list of pokemon name slugs from a json file.
+
+// Load a list of pokemon name slugs from a json file. May throw file error.
 // json_path: the path relative to the resource root, accessed via 
 //   RESOURCE_PATH() declared in CommonFramework/Globals.h.
 std::vector<std::string> load_pokemon_slug_json_list(const char* json_path);
diff --git a/SerialPrograms/Source/Pokemon/Resources/Pokemon_PokemonSlugs.cpp b/SerialPrograms/Source/Pokemon/Resources/Pokemon_PokemonSlugs.cpp
index 487c95d621..99db375c75 100644
--- a/SerialPrograms/Source/Pokemon/Resources/Pokemon_PokemonSlugs.cpp
+++ b/SerialPrograms/Source/Pokemon/Resources/Pokemon_PokemonSlugs.cpp
@@ -1,12 +1,12 @@
 /*  Pokemon Pokemon Slugs
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include "Common/Cpp/Json/JsonValue.h"
 #include "Common/Cpp/Json/JsonArray.h"
-#include "CommonFramework/Globals.h"
+#include "CommonFramework/GlobalAutoPaths.h"
 #include "Pokemon_PokemonSlugs.h"
 
 namespace PokemonAutomation{
@@ -26,10 +26,10 @@ struct PokemonSlugDatabase{
     PokemonSlugDatabase(){
         std::string path = RESOURCE_PATH() + "Pokemon/Pokedex/Pokedex-National.json";
         JsonValue json = load_json_file(path);
-        JsonArray& slugs = json.get_array_throw(path);
+        JsonArray& slugs = json.to_array_throw(path);
 
         for (auto& item : slugs){
-            std::string& slug = item.get_string_throw(path);
+            std::string& slug = item.to_string_throw(path);
             all_slugs.insert(slug);
             national_dex.emplace_back(slug);
             slugs_to_dex[std::move(slug)] = national_dex.size();
diff --git a/SerialPrograms/Source/Pokemon/Resources/Pokemon_PokemonSlugs.h b/SerialPrograms/Source/Pokemon/Resources/Pokemon_PokemonSlugs.h
index 2483d41582..d0495aad64 100644
--- a/SerialPrograms/Source/Pokemon/Resources/Pokemon_PokemonSlugs.h
+++ b/SerialPrograms/Source/Pokemon/Resources/Pokemon_PokemonSlugs.h
@@ -1,6 +1,6 @@
 /*  Pokemon Pokemon Slugs
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -16,8 +16,13 @@ namespace PokemonAutomation{
 namespace Pokemon{
 
 
+// Get a set of all pokemon slugs.
+// Each slug corresponds to one national dex number.
 const std::set<std::string>& ALL_POKEMON_SLUGS();
+// Get a list of pokemon slugs in the order of national dex.
+// Each slug corresponds to one national dex number.
 const std::vector<std::string>& NATIONAL_DEX_SLUGS();
+// Get a one-to-one mapping from pokemon slugs to their national dex numbers.
 const std::map<std::string, size_t>& SLUGS_TO_NATIONAL_DEX();
 
 
diff --git a/SerialPrograms/Source/PokemonBDSP/Inference/Battles/PokemonBDSP_BattleBallReader.cpp b/SerialPrograms/Source/PokemonBDSP/Inference/Battles/PokemonBDSP_BattleBallReader.cpp
index 4e1b1ad94d..3e1229b7e3 100644
--- a/SerialPrograms/Source/PokemonBDSP/Inference/Battles/PokemonBDSP_BattleBallReader.cpp
+++ b/SerialPrograms/Source/PokemonBDSP/Inference/Battles/PokemonBDSP_BattleBallReader.cpp
@@ -1,14 +1,14 @@
 /*  In-Battle Ball Inventory Reader
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include "CommonFramework/ImageTypes/ImageViewRGB32.h"
-#include "CommonFramework/ImageTools/ImageFilter.h"
 #include "CommonFramework/Notifications/ProgramInfo.h"
-#include "CommonFramework/OCR/OCR_NumberReader.h"
 #include "CommonFramework/Tools/ErrorDumper.h"
+#include "CommonTools/Images/ImageFilter.h"
+#include "CommonTools/OCR/OCR_NumberReader.h"
 #include "PokemonBDSP/Inference/PokemonBDSP_PokeballSpriteMatcher.h"
 #include "PokemonBDSP_BattleBallReader.h"
 
@@ -28,14 +28,14 @@ const PokeballSpriteMatcher& BALL_SPRITE_MATCHER(){
 
 
 
-BattleBallReader::BattleBallReader(ConsoleHandle& console, Language language)
+BattleBallReader::BattleBallReader(VideoStream& stream, Language language)
     : m_matcher(BALL_SPRITE_MATCHER())
     , m_name_reader(PokeballNameReader::instance())
     , m_language(language)
-    , m_console(console)
-    , m_box_sprite(console, {0.617, 0.650, 0.0335, 0.060})
-    , m_box_name(console, {0.650, 0.650, 0.22, 0.060})
-    , m_box_quantity(console, {0.880, 0.650, 0.070, 0.060})
+    , m_stream(stream)
+    , m_box_sprite(stream.overlay(), {0.617, 0.650, 0.0335, 0.060})
+    , m_box_name(stream.overlay(), {0.650, 0.650, 0.22, 0.060})
+    , m_box_quantity(stream.overlay(), {0.880, 0.650, 0.070, 0.060})
 {}
 
 
@@ -49,34 +49,35 @@ std::string BattleBallReader::read_ball(const ImageViewRGB32& screen) const{
     {
         ImageViewRGB32 image = extract_box_reference(screen, m_box_sprite);
         sprite_result = m_matcher.match(image, ALPHA_SPREAD);
-        sprite_result.log(m_console, 0.50);
+        sprite_result.log(m_stream.logger(), 0.50);
         if (!sprite_result.results.empty() && sprite_result.results.begin()->first > MAX_ALPHA){
             sprite_result.results.clear();
         }
     }
-    if (sprite_result.results.empty()){
-        dump_image(m_console, ProgramInfo(), "BattleBallReader-Sprite", screen);
-    }
+//    if (sprite_result.results.empty()){
+//        dump_image(m_stream.logger(), ProgramInfo(), "BattleBallReader-Sprite", screen);
+//    }
 
     OCR::StringMatchResult name_result;
     {
         ImageViewRGB32 cropped = extract_box_reference(screen, m_box_name);
         name_result = m_name_reader.read_substring(
-            m_console, m_language, cropped,
+            m_stream.logger(), m_language, cropped,
             {
                 {0xff000000, 0xff404040},
                 {0xff000000, 0xff808080},
             }
         );
     }
-    if (name_result.results.size() != 1){
-        dump_image(m_console, ProgramInfo(), "BattleBallReader-Name", screen);
-    }
+//    if (name_result.results.size() != 1){
+//        dump_image(m_stream.logger(), ProgramInfo(), "BattleBallReader-Name", screen);
+//    }
 
     if (sprite_result.results.empty()){
         if (name_result.results.size() == 1){
             return name_result.results.begin()->second.token;
         }
+        dump_image(m_stream.logger(), ProgramInfo(), "BattleBallReader-FailedSprite-AmbiguousName", screen);
         return "";
     }
 
@@ -97,7 +98,7 @@ std::string BattleBallReader::read_ball(const ImageViewRGB32& screen) const{
         }
     }
     if (overlap.size() != 1){
-        dump_image(m_console, ProgramInfo(), "BattleBallReader-SpriteNameMismatch", screen);
+        dump_image(m_stream.logger(), ProgramInfo(), "BattleBallReader-SpriteNameMismatch", screen);
         return "";
     }
     return overlap[0];
@@ -106,9 +107,10 @@ std::string BattleBallReader::read_ball(const ImageViewRGB32& screen) const{
 uint16_t BattleBallReader::read_quantity(const ImageViewRGB32& screen) const{
     ImageRGB32 image = to_blackwhite_rgb32_range(
         extract_box_reference(screen, m_box_quantity),
-        0xff808080, 0xffffffff, true
+        true,
+        0xff808080, 0xffffffff
     );
-    int qty = OCR::read_number(m_console, image);
+    int qty = OCR::read_number(m_stream.logger(), image);
     return (uint16_t)std::max(qty, 0);
 }
 
diff --git a/SerialPrograms/Source/PokemonBDSP/Inference/Battles/PokemonBDSP_BattleBallReader.h b/SerialPrograms/Source/PokemonBDSP/Inference/Battles/PokemonBDSP_BattleBallReader.h
index d63535f097..f9a4362818 100644
--- a/SerialPrograms/Source/PokemonBDSP/Inference/Battles/PokemonBDSP_BattleBallReader.h
+++ b/SerialPrograms/Source/PokemonBDSP/Inference/Battles/PokemonBDSP_BattleBallReader.h
@@ -1,6 +1,6 @@
 /*  In-Battle Ball Inventory Reader
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -9,8 +9,8 @@
 
 #include <string>
 #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
-#include "CommonFramework/Tools/ConsoleHandle.h"
-#include "CommonFramework/ImageMatch/CroppedImageDictionaryMatcher.h"
+#include "CommonFramework/Tools/VideoStream.h"
+#include "CommonTools/ImageMatch/CroppedImageDictionaryMatcher.h"
 #include "Pokemon/Inference/Pokemon_PokeballNameReader.h"
 
 namespace PokemonAutomation{
@@ -24,7 +24,7 @@ class BattleBallReader{
     static const double ALPHA_SPREAD;
 
 public:
-    BattleBallReader(ConsoleHandle& console, Language language);
+    BattleBallReader(VideoStream& stream, Language language);
 
 public:
     std::string read_ball(const ImageViewRGB32& screen) const;
@@ -34,7 +34,7 @@ class BattleBallReader{
     const ImageMatch::CroppedImageDictionaryMatcher& m_matcher;
     const PokeballNameReader& m_name_reader;
     Language m_language;
-    ConsoleHandle& m_console;
+    VideoStream& m_stream;
     OverlayBoxScope m_box_sprite;
     OverlayBoxScope m_box_name;
     OverlayBoxScope m_box_quantity;
diff --git a/SerialPrograms/Source/PokemonBDSP/Inference/Battles/PokemonBDSP_BattleMenuDetector.cpp b/SerialPrograms/Source/PokemonBDSP/Inference/Battles/PokemonBDSP_BattleMenuDetector.cpp
index 9afbda85a3..536df70512 100644
--- a/SerialPrograms/Source/PokemonBDSP/Inference/Battles/PokemonBDSP_BattleMenuDetector.cpp
+++ b/SerialPrograms/Source/PokemonBDSP/Inference/Battles/PokemonBDSP_BattleMenuDetector.cpp
@@ -1,13 +1,11 @@
 /*  Battle Menu Detector
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include "Common/Compiler.h"
-#include "CommonFramework/ImageTools/SolidColorTest.h"
-#include "CommonFramework/ImageTools/ColorClustering.h"
 #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Images/SolidColorTest.h"
 #include "PokemonBDSP_BattleMenuDetector.h"
 
 //#include <iostream>
@@ -63,7 +61,7 @@ bool BattleMenuDetector::is_battle_button(const ImageViewRGB32& screen) const{
     }
     return true;
 }
-bool BattleMenuDetector::detect(const ImageViewRGB32& screen) const{
+bool BattleMenuDetector::detect(const ImageViewRGB32& screen){
     {
         bool left = is_white(extract_box_reference(screen, m_opponent_left));
         bool right = is_white(extract_box_reference(screen, m_opponent_right));
diff --git a/SerialPrograms/Source/PokemonBDSP/Inference/Battles/PokemonBDSP_BattleMenuDetector.h b/SerialPrograms/Source/PokemonBDSP/Inference/Battles/PokemonBDSP_BattleMenuDetector.h
index e1ba408261..30a7d2249b 100644
--- a/SerialPrograms/Source/PokemonBDSP/Inference/Battles/PokemonBDSP_BattleMenuDetector.h
+++ b/SerialPrograms/Source/PokemonBDSP/Inference/Battles/PokemonBDSP_BattleMenuDetector.h
@@ -1,17 +1,16 @@
 /*  Battle Menu Detector
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifndef PokemonAutomation_PokemonBDSP_BattleMenuDetector_H
 #define PokemonAutomation_PokemonBDSP_BattleMenuDetector_H
 
-#include <memory>
 #include "Common/Cpp/Color.h"
 #include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "CommonFramework/InferenceInfra/VisualInferenceCallback.h"
-#include "CommonFramework/Inference/VisualDetector.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+#include "CommonTools/VisualDetector.h"
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
@@ -31,7 +30,7 @@ class BattleMenuDetector : public StaticScreenDetector{
     BattleMenuDetector(BattleType battle_type, Color color = COLOR_RED);
 
     virtual void make_overlays(VideoOverlaySet& items) const override;
-    virtual bool detect(const ImageViewRGB32& screen) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
 
 private:
     bool is_battle_button(const ImageViewRGB32& screen) const;
diff --git a/SerialPrograms/Source/PokemonBDSP/Inference/Battles/PokemonBDSP_EndBattleDetector.cpp b/SerialPrograms/Source/PokemonBDSP/Inference/Battles/PokemonBDSP_EndBattleDetector.cpp
index 94bd89b603..eaa30e52ea 100644
--- a/SerialPrograms/Source/PokemonBDSP/Inference/Battles/PokemonBDSP_EndBattleDetector.cpp
+++ b/SerialPrograms/Source/PokemonBDSP/Inference/Battles/PokemonBDSP_EndBattleDetector.cpp
@@ -1,19 +1,16 @@
 /*  End Battle Detector
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
-
-#include "Common/Compiler.h"
 #include "CommonFramework/ImageTools/ImageStats.h"
-#include "CommonFramework/ImageTools/SolidColorTest.h"
 #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
-#include "CommonFramework/Inference/BlackScreenDetector.h"
+#include "CommonTools/Images/SolidColorTest.h"
 #include "PokemonBDSP_EndBattleDetector.h"
 
-#include <iostream>
-using std::cout;
-using std::endl;
+//#include <iostream>
+//using std::cout;
+//using std::endl;
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
@@ -21,7 +18,7 @@ namespace PokemonBDSP{
 
 
 
-
+#if 0
 EndBattleWatcher::EndBattleWatcher(const ImageFloatBox& box, Color color)
     : VisualInferenceCallback("EndBattleWatcher")
     , m_color(color)
@@ -50,6 +47,7 @@ bool EndBattleWatcher::battle_is_over(const ImageViewRGB32& frame){
     }
     return true;
 }
+#endif
 
 
 
diff --git a/SerialPrograms/Source/PokemonBDSP/Inference/Battles/PokemonBDSP_EndBattleDetector.h b/SerialPrograms/Source/PokemonBDSP/Inference/Battles/PokemonBDSP_EndBattleDetector.h
index c75ae00ad9..978c121d64 100644
--- a/SerialPrograms/Source/PokemonBDSP/Inference/Battles/PokemonBDSP_EndBattleDetector.h
+++ b/SerialPrograms/Source/PokemonBDSP/Inference/Battles/PokemonBDSP_EndBattleDetector.h
@@ -1,6 +1,6 @@
 /*  End Battle Detector
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -9,15 +9,14 @@
 
 #include "Common/Cpp/Color.h"
 #include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "CommonFramework/Inference/VisualDetector.h"
-#include "CommonFramework/InferenceInfra/VisualInferenceCallback.h"
+#include "CommonTools/VisualDetectors/BlackScreenDetector.h"
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
 namespace PokemonBDSP{
 
 
-
+#if 0
 class EndBattleWatcher : public VisualInferenceCallback{
 public:
     EndBattleWatcher(
@@ -36,6 +35,21 @@ class EndBattleWatcher : public VisualInferenceCallback{
     ImageFloatBox m_box;
     bool m_has_been_black = false;
 };
+#endif
+
+
+class EndBattleWatcher : public BlackScreenOverWatcher{
+public:
+    EndBattleWatcher(
+        const ImageFloatBox& box = {0.1, 0.1, 0.8, 0.8},
+        Color color = COLOR_RED
+    )
+        : BlackScreenOverWatcher(
+            color, box, 100, 10, std::chrono::milliseconds(500)
+        )
+    {}
+
+};
 
 
 
diff --git a/SerialPrograms/Source/PokemonBDSP/Inference/Battles/PokemonBDSP_ExperienceGainDetector.cpp b/SerialPrograms/Source/PokemonBDSP/Inference/Battles/PokemonBDSP_ExperienceGainDetector.cpp
index 54e5fe5262..325b1e8da9 100644
--- a/SerialPrograms/Source/PokemonBDSP/Inference/Battles/PokemonBDSP_ExperienceGainDetector.cpp
+++ b/SerialPrograms/Source/PokemonBDSP/Inference/Battles/PokemonBDSP_ExperienceGainDetector.cpp
@@ -1,19 +1,18 @@
 /*  Experience Gain Detector
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include "Common/Compiler.h"
 #include "Common/Cpp/Containers/FixedLimitVector.tpp"
 #include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "CommonFramework/ImageTools/SolidColorTest.h"
 #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Images/SolidColorTest.h"
 #include "PokemonBDSP_ExperienceGainDetector.h"
 
-#include <iostream>
-using std::cout;
-using std::endl;
+//#include <iostream>
+//using std::cout;
+//using std::endl;
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
@@ -35,7 +34,7 @@ void ExperienceGainDetector::make_overlays(VideoOverlaySet& items) const{
     items.add(m_color, m_left_column);
     items.add(m_color, m_lower_left_region);
 }
-bool ExperienceGainDetector::detect(const ImageViewRGB32& screen) const{
+bool ExperienceGainDetector::detect(const ImageViewRGB32& screen){
     if (!m_dialog.detect(screen)){
 //        cout << "ExperienceGainDetector: No dialogue detected, return" << endl;
         return false;
@@ -48,7 +47,7 @@ bool ExperienceGainDetector::detect(const ImageViewRGB32& screen) const{
     }
     const ImageStats stats1 = image_stats(extract_box_reference(screen, m_left_column));
 //    cout << "ExperienceGainDetector: No m_left_column detected, " << stats1.average.to_string() << ", " << stats1.stddev.to_string() << endl;
-    if (!is_solid(stats1, {0.3, 0.35, 0.35}, 0.1, 40)){
+    if (!is_solid(stats1, {0.3, 0.35, 0.35}, 0.1, 50)){
         return false;
     }
     const ImageStats stats2 = image_stats(extract_box_reference(screen, m_lower_left_region));
diff --git a/SerialPrograms/Source/PokemonBDSP/Inference/Battles/PokemonBDSP_ExperienceGainDetector.h b/SerialPrograms/Source/PokemonBDSP/Inference/Battles/PokemonBDSP_ExperienceGainDetector.h
index d881f48ffa..d30d7ec276 100644
--- a/SerialPrograms/Source/PokemonBDSP/Inference/Battles/PokemonBDSP_ExperienceGainDetector.h
+++ b/SerialPrograms/Source/PokemonBDSP/Inference/Battles/PokemonBDSP_ExperienceGainDetector.h
@@ -1,16 +1,14 @@
 /*  Battle Won Detector
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifndef PokemonAutomation_PokemonBDSP_BattleWonDetector_H
 #define PokemonAutomation_PokemonBDSP_BattleWonDetector_H
 
-#include "Common/Cpp/Containers/FixedLimitVector.h"
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "CommonFramework/InferenceInfra/VisualInferenceCallback.h"
-#include "CommonFramework/Inference/VisualDetector.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+#include "CommonTools/VisualDetector.h"
 #include "PokemonBDSP/Inference/PokemonBDSP_DialogDetector.h"
 
 namespace PokemonAutomation{
@@ -26,7 +24,7 @@ class ExperienceGainDetector : public StaticScreenDetector{
     ExperienceGainDetector(Color color = COLOR_RED);
 
     virtual void make_overlays(VideoOverlaySet& items) const override;
-    virtual bool detect(const ImageViewRGB32& screen) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
 
 private:
     Color m_color;
diff --git a/SerialPrograms/Source/PokemonBDSP/Inference/Battles/PokemonBDSP_StartBattleDetector.cpp b/SerialPrograms/Source/PokemonBDSP/Inference/Battles/PokemonBDSP_StartBattleDetector.cpp
index 4585e41d22..834e6c2299 100644
--- a/SerialPrograms/Source/PokemonBDSP/Inference/Battles/PokemonBDSP_StartBattleDetector.cpp
+++ b/SerialPrograms/Source/PokemonBDSP/Inference/Battles/PokemonBDSP_StartBattleDetector.cpp
@@ -1,19 +1,17 @@
 /*  Start Battle Detector
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include "Common/Compiler.h"
 #include "CommonFramework/ImageTypes/ImageViewRGB32.h"
 #include "CommonFramework/ImageTools/ImageStats.h"
 #include "CommonFramework/VideoPipeline/VideoOverlay.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
 #include "PokemonBDSP_StartBattleDetector.h"
 
-#include <iostream>
-using std::cout;
-using std::endl;
+//#include <iostream>
+//using std::cout;
+//using std::endl;
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
diff --git a/SerialPrograms/Source/PokemonBDSP/Inference/Battles/PokemonBDSP_StartBattleDetector.h b/SerialPrograms/Source/PokemonBDSP/Inference/Battles/PokemonBDSP_StartBattleDetector.h
index 48a01c2123..7e6cd64dcc 100644
--- a/SerialPrograms/Source/PokemonBDSP/Inference/Battles/PokemonBDSP_StartBattleDetector.h
+++ b/SerialPrograms/Source/PokemonBDSP/Inference/Battles/PokemonBDSP_StartBattleDetector.h
@@ -1,18 +1,14 @@
 /*  Start Battle Detector
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifndef PokemonAutomation_PokemonBDSP_StartBattleDetector_H
 #define PokemonAutomation_PokemonBDSP_StartBattleDetector_H
 
-#include <functional>
 #include <atomic>
-#include <chrono>
-#include <thread>
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "CommonFramework/InferenceInfra/VisualInferenceCallback.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
 #include "PokemonBDSP/Inference/PokemonBDSP_DialogDetector.h"
 
 namespace PokemonAutomation{
diff --git a/SerialPrograms/Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxDetector.cpp b/SerialPrograms/Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxDetector.cpp
index 539396a3b7..be76c12127 100644
--- a/SerialPrograms/Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxDetector.cpp
+++ b/SerialPrograms/Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxDetector.cpp
@@ -1,18 +1,18 @@
 /*  Box Detector
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include "Common/Compiler.h"
 #include "CommonFramework/ImageTools/ImageStats.h"
-#include "CommonFramework/ImageTools/SolidColorTest.h"
 #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Images/SolidColorTest.h"
+
 #include "PokemonBDSP_BoxDetector.h"
 
-#include <iostream>
-using std::cout;
-using std::endl;
+//#include <iostream>
+//using std::cout;
+//using std::endl;
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
@@ -32,7 +32,7 @@ void BoxDetector::make_overlays(VideoOverlaySet& items) const{
     items.add(m_color, m_bottom);
     items.add(m_color, m_row);
 }
-bool BoxDetector::detect(const ImageViewRGB32& screen) const{
+bool BoxDetector::detect(const ImageViewRGB32& screen){
     ImageStats left = image_stats(extract_box_reference(screen, m_left));
 //    cout << left.average << left.stddev << endl;
     if (!is_solid(left, {0.274119, 0.355324, 0.370557})){
diff --git a/SerialPrograms/Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxDetector.h b/SerialPrograms/Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxDetector.h
index e54ab8d52c..d73713edd5 100644
--- a/SerialPrograms/Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxDetector.h
+++ b/SerialPrograms/Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxDetector.h
@@ -1,6 +1,6 @@
 /*  Box Detector
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -9,8 +9,8 @@
 
 #include "Common/Cpp/Color.h"
 #include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "CommonFramework/Inference/VisualDetector.h"
-#include "CommonFramework/InferenceInfra/VisualInferenceCallback.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+#include "CommonTools/VisualDetector.h"
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
@@ -22,7 +22,7 @@ class BoxDetector : public StaticScreenDetector{
     BoxDetector(Color color = COLOR_RED);
 
     virtual void make_overlays(VideoOverlaySet& items) const override;
-    virtual bool detect(const ImageViewRGB32& screen) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
 
 private:
     Color m_color;
diff --git a/SerialPrograms/Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxGenderDetector.cpp b/SerialPrograms/Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxGenderDetector.cpp
index f64c6044cc..bafa0195b4 100644
--- a/SerialPrograms/Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxGenderDetector.cpp
+++ b/SerialPrograms/Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxGenderDetector.cpp
@@ -1,26 +1,23 @@
 /*  Box Gender Detector
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include "Common/Cpp/AbstractLogger.h"
+#include "Common/Cpp/Logging/AbstractLogger.h"
 #include "Common/Cpp/Exceptions.h"
 #include "Kernels/Waterfill/Kernels_Waterfill.h"
-#include "CommonFramework/Globals.h"
-#include "CommonFramework/ImageTools/ImageStats.h"
 #include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "CommonFramework/ImageTools/ImageFilter.h"
-#include "CommonFramework/ImageTools/BinaryImage_FilterRgb32.h"
-#include "CommonFramework/ImageMatch/ExactImageMatcher.h"
-#include "CommonFramework/ImageMatch/SubObjectTemplateMatcher.h"
 #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
-#include "Pokemon/Options/Pokemon_EggHatchFilter.h"
+#include "CommonTools/Images/ImageFilter.h"
+#include "CommonTools/Images/BinaryImage_FilterRgb32.h"
+#include "CommonTools/ImageMatch/SubObjectTemplateMatcher.h"
+#include "Pokemon/Options/Pokemon_StatsHuntFilter.h"
 #include "PokemonBDSP_BoxGenderDetector.h"
 
-#include <iostream>
-using std::cout;
-using std::endl;
+//#include <iostream>
+//using std::cout;
+//using std::endl;
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
@@ -98,7 +95,7 @@ bool is_female(const ImageViewRGB32& image, const WaterfillObject& object){
 }
 
 
-EggHatchGenderFilter read_gender_from_box(Logger& logger, VideoOverlay& overlay, const ImageViewRGB32& frame)
+StatsHuntGenderFilter read_gender_from_box(Logger& logger, VideoOverlay& overlay, const ImageViewRGB32& frame)
 {
     OverlayBoxScope gender_box(overlay, {0.733, 0.022, 0.204, 0.049}, COLOR_BLUE);
     ImageViewRGB32 name_and_gender = extract_box_reference(frame, gender_box);
@@ -108,16 +105,16 @@ EggHatchGenderFilter read_gender_from_box(Logger& logger, VideoOverlay& overlay,
     for (WaterfillObject& object : objects){
         if (is_male(name_and_gender, object)){
             logger.log("Detected male symbol.", COLOR_PURPLE);
-            return EggHatchGenderFilter::Male;
+            return StatsHuntGenderFilter::Male;
         }
         if (is_female(name_and_gender, object)){
             logger.log("Detected female symbol.", COLOR_PURPLE);
-            return EggHatchGenderFilter::Female;
+            return StatsHuntGenderFilter::Female;
         }
     }
 
     logger.log("No gender symbol detected.", COLOR_PURPLE);
-    return EggHatchGenderFilter::Genderless;
+    return StatsHuntGenderFilter::Genderless;
 }
 
 
diff --git a/SerialPrograms/Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxGenderDetector.h b/SerialPrograms/Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxGenderDetector.h
index 4c2852b639..720e42fcbf 100644
--- a/SerialPrograms/Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxGenderDetector.h
+++ b/SerialPrograms/Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxGenderDetector.h
@@ -1,13 +1,13 @@
 /*  Box Gender Detector
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifndef PokemonAutomation_PokemonBDSP_BoxGenderDetector_H
 #define PokemonAutomation_PokemonBDSP_BoxGenderDetector_H
 
-#include "Pokemon/Options/Pokemon_EggHatchFilter.h"
+#include "Pokemon/Options/Pokemon_StatsHuntFilter.h"
 
 namespace PokemonAutomation{
 class Logger;
@@ -17,7 +17,7 @@ namespace NintendoSwitch{
 namespace PokemonBDSP{
 
 
-Pokemon::EggHatchGenderFilter read_gender_from_box(
+Pokemon::StatsHuntGenderFilter read_gender_from_box(
     Logger& logger, VideoOverlay& overlay,
     const ImageViewRGB32& frame
 );
diff --git a/SerialPrograms/Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxNatureDetector.cpp b/SerialPrograms/Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxNatureDetector.cpp
index b003856729..27c51e82c1 100644
--- a/SerialPrograms/Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxNatureDetector.cpp
+++ b/SerialPrograms/Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxNatureDetector.cpp
@@ -1,47 +1,47 @@
-/*  Box Nature Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
-#include "PokemonBDSP_BoxNatureDetector.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonBDSP{
-
-const NatureReader& NATURE_READER() {
-    const static Pokemon::NatureReader reader("Pokemon/NatureCheckerOCR.json");
-    return reader;
-}
-
-BoxNatureDetector::BoxNatureDetector(VideoOverlay& overlay, Language language)
-    : m_language(language)
-    , m_nature(overlay, {0.785, 0.196 + 6 * 0.0529, 0.2, 0.0515})
-{}
-
-NatureCheckerValue BoxNatureDetector::read(Logger& logger, const ImageViewRGB32& frame, const OverlayBoxScope& box){
-    ImageViewRGB32 image = extract_box_reference(frame, box);
-    OCR::StringMatchResult result = NATURE_READER().read_substring(
-        logger, m_language, image,
-        OCR::BLACK_TEXT_FILTERS()
-    );
-    result.clear_beyond_log10p(NatureReader::MAX_LOG10P);
-    if (result.results.size() != 1){
-        return NatureCheckerValue::UnableToDetect;
-    }
-    return NatureCheckerValue_string_to_enum(result.results.begin()->second.token);
-}
-NatureReader::Results BoxNatureDetector::read(Logger& logger, const ImageViewRGB32& frame){
-    NatureReader::Results results;
-    if (m_language != Language::None){
-        results.nature      = read(logger, frame, m_nature);
-    }
-    return results;
-}
-
-}
-}
-}
-
+/*  Box Nature Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "PokemonBDSP_BoxNatureDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonBDSP{
+
+const NatureReader& NATURE_READER(){
+    const static Pokemon::NatureReader reader("Pokemon/NatureCheckerOCR.json");
+    return reader;
+}
+
+BoxNatureDetector::BoxNatureDetector(VideoOverlay& overlay, Language language)
+    : m_language(language)
+    , m_nature(overlay, {0.785, 0.196 + 6 * 0.0529, 0.2, 0.0515})
+{}
+
+NatureCheckerValue BoxNatureDetector::read(Logger& logger, const ImageViewRGB32& frame, const OverlayBoxScope& box){
+    ImageViewRGB32 image = extract_box_reference(frame, box);
+    OCR::StringMatchResult result = NATURE_READER().read_substring(
+        logger, m_language, image,
+        OCR::BLACK_TEXT_FILTERS()
+    );
+    result.clear_beyond_log10p(NatureReader::MAX_LOG10P);
+    if (result.results.size() != 1){
+        return NatureCheckerValue::UnableToDetect;
+    }
+    return NATURE_CHECKER_VALUE_STRINGS().get_enum(result.results.begin()->second.token);
+}
+NatureReader::Results BoxNatureDetector::read(Logger& logger, const ImageViewRGB32& frame){
+    NatureReader::Results results;
+    if (m_language != Language::None){
+        results.nature      = read(logger, frame, m_nature);
+    }
+    return results;
+}
+
+}
+}
+}
+
diff --git a/SerialPrograms/Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxNatureDetector.h b/SerialPrograms/Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxNatureDetector.h
index 6da29b767d..f5a2622220 100644
--- a/SerialPrograms/Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxNatureDetector.h
+++ b/SerialPrograms/Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxNatureDetector.h
@@ -1,39 +1,39 @@
-/*  Box Nature Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonBDSP_BoxNatureDetector_H
-#define PokemonAutomation_PokemonBDSP_BoxNatureDetector_H
-
-#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
-#include "Pokemon/Inference/Pokemon_NatureReader.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonBDSP{
-using namespace Pokemon;
-
-const NatureReader& NATURE_READER();
-
-class BoxNatureDetector {
-public:
-    BoxNatureDetector(VideoOverlay& overlay, Language language);
-
-    NatureReader::Results read(Logger& logger, const ImageViewRGB32& frame);
-
-private:
-    NatureCheckerValue read(Logger& logger, const ImageViewRGB32& frame, const OverlayBoxScope& box);
-
-private:
-    Language m_language;
-    OverlayBoxScope m_nature;
-};
-
-
-
-}
-}
-}
-#endif
+/*  Box Nature Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonBDSP_BoxNatureDetector_H
+#define PokemonAutomation_PokemonBDSP_BoxNatureDetector_H
+
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "Pokemon/Inference/Pokemon_NatureReader.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonBDSP{
+using namespace Pokemon;
+
+const NatureReader& NATURE_READER();
+
+class BoxNatureDetector{
+public:
+    BoxNatureDetector(VideoOverlay& overlay, Language language);
+
+    NatureReader::Results read(Logger& logger, const ImageViewRGB32& frame);
+
+private:
+    NatureCheckerValue read(Logger& logger, const ImageViewRGB32& frame, const OverlayBoxScope& box);
+
+private:
+    Language m_language;
+    OverlayBoxScope m_nature;
+};
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxShinyDetector.cpp b/SerialPrograms/Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxShinyDetector.cpp
index 8dcd4c0fd7..1cf3dbde2b 100644
--- a/SerialPrograms/Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxShinyDetector.cpp
+++ b/SerialPrograms/Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxShinyDetector.cpp
@@ -1,17 +1,17 @@
 /*  Box Detector
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include "CommonFramework/ImageTools/ImageStats.h"
-#include "CommonFramework/ImageTools/SolidColorTest.h"
 #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Images/SolidColorTest.h"
 #include "PokemonBDSP_BoxShinyDetector.h"
 
-#include <iostream>
-using std::cout;
-using std::endl;
+//#include <iostream>
+//using std::cout;
+//using std::endl;
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
@@ -36,7 +36,7 @@ bool BoxShinyDetector::is_panel(const ImageViewRGB32& screen) const{
     }
     return true;
 }
-bool BoxShinyDetector::detect(const ImageViewRGB32& screen) const{
+bool BoxShinyDetector::detect(const ImageViewRGB32& screen){
     if (!is_panel(screen)){
         return false;
     }
diff --git a/SerialPrograms/Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxShinyDetector.h b/SerialPrograms/Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxShinyDetector.h
index 74a7be7a72..58682d3b10 100644
--- a/SerialPrograms/Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxShinyDetector.h
+++ b/SerialPrograms/Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxShinyDetector.h
@@ -1,6 +1,6 @@
 /*  Box Detector
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -9,7 +9,7 @@
 
 #include "Common/Cpp/Color.h"
 #include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "CommonFramework/Inference/VisualDetector.h"
+#include "CommonTools/VisualDetector.h"
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
@@ -23,7 +23,7 @@ class BoxShinyDetector : public StaticScreenDetector{
     bool is_panel(const ImageViewRGB32& screen) const;
 
     virtual void make_overlays(VideoOverlaySet& items) const override;
-    virtual bool detect(const ImageViewRGB32& screen) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
 
 private:
     Color m_color;
diff --git a/SerialPrograms/Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_IVCheckerReader.cpp b/SerialPrograms/Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_IVCheckerReader.cpp
deleted file mode 100644
index 5ccb58ceb8..0000000000
--- a/SerialPrograms/Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_IVCheckerReader.cpp
+++ /dev/null
@@ -1,68 +0,0 @@
-/*  IV Checker Reader
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
-#include "PokemonSwSh/Inference/PokemonSwSh_IVCheckerReader.h"
-#include "PokemonBDSP_IVCheckerReader.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonBDSP{
-
-
-IVCheckerReaderScope::IVCheckerReaderScope(VideoOverlay& overlay, Language language)
-    : m_language(language)
-    , m_box0(overlay, {0.785, 0.196 + 0 * 0.0529, 0.2, 0.0515})
-    , m_box1(overlay, {0.785, 0.196 + 1 * 0.0529, 0.2, 0.0515})
-    , m_box2(overlay, {0.785, 0.196 + 2 * 0.0529, 0.2, 0.0515})
-    , m_box3(overlay, {0.785, 0.196 + 3 * 0.0529, 0.2, 0.0515})
-    , m_box4(overlay, {0.785, 0.196 + 4 * 0.0529, 0.2, 0.0515})
-    , m_box5(overlay, {0.785, 0.196 + 5 * 0.0529, 0.2, 0.0515})
-{}
-
-
-IVCheckerValue IVCheckerReaderScope::read(Logger& logger, const ImageViewRGB32& frame, const OverlayBoxScope& box){
-    ImageViewRGB32 image = extract_box_reference(frame, box);
-    OCR::StringMatchResult result = PokemonSwSh::IV_READER().read_substring(
-        logger, m_language, image,
-        OCR::BLACK_TEXT_FILTERS()
-    );
-    result.clear_beyond_log10p(IVCheckerReader::MAX_LOG10P);
-    if (result.results.size() != 1){
-        return IVCheckerValue::UnableToDetect;
-    }
-    return IVCheckerValue_string_to_enum(result.results.begin()->second.token);
-}
-IVCheckerReader::Results IVCheckerReaderScope::read(Logger& logger, const ImageViewRGB32& frame){
-    IVCheckerReader::Results results;
-    if (m_language != Language::None){
-        results.hp      = read(logger, frame, m_box0);
-        results.attack  = read(logger, frame, m_box1);
-        results.defense = read(logger, frame, m_box2);
-        results.spatk   = read(logger, frame, m_box3);
-        results.spdef   = read(logger, frame, m_box4);
-        results.speed   = read(logger, frame, m_box5);
-    }
-    return results;
-}
-
-std::vector<ImageViewRGB32> IVCheckerReaderScope::dump_images(const ImageViewRGB32& frame){
-    std::vector<ImageViewRGB32> images;
-    images.emplace_back(extract_box_reference(frame, m_box0));
-    images.emplace_back(extract_box_reference(frame, m_box1));
-    images.emplace_back(extract_box_reference(frame, m_box2));
-    images.emplace_back(extract_box_reference(frame, m_box3));
-    images.emplace_back(extract_box_reference(frame, m_box4));
-    images.emplace_back(extract_box_reference(frame, m_box5));
-    return images;
-}
-
-
-
-}
-}
-}
-
diff --git a/SerialPrograms/Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_IVCheckerReader.h b/SerialPrograms/Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_IVCheckerReader.h
deleted file mode 100644
index 8c90dfd2ba..0000000000
--- a/SerialPrograms/Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_IVCheckerReader.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*  IV Checker Reader
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonBDSP_IVCheckerReader_H
-#define PokemonAutomation_PokemonBDSP_IVCheckerReader_H
-
-#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
-#include "Pokemon/Inference/Pokemon_IVCheckerReader.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonBDSP{
-using namespace Pokemon;
-
-
-class IVCheckerReaderScope{
-public:
-    IVCheckerReaderScope(VideoOverlay& overlay, Language language);
-
-    IVCheckerReader::Results read(Logger& logger, const ImageViewRGB32& frame);
-
-    std::vector<ImageViewRGB32> dump_images(const ImageViewRGB32& frame);
-
-private:
-    IVCheckerValue read(Logger& logger, const ImageViewRGB32& frame, const OverlayBoxScope& box);
-
-private:
-    Language m_language;
-    OverlayBoxScope m_box0;
-    OverlayBoxScope m_box1;
-    OverlayBoxScope m_box2;
-    OverlayBoxScope m_box3;
-    OverlayBoxScope m_box4;
-    OverlayBoxScope m_box5;
-};
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_IvJudgeReader.cpp b/SerialPrograms/Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_IvJudgeReader.cpp
new file mode 100644
index 0000000000..c3a05264d4
--- /dev/null
+++ b/SerialPrograms/Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_IvJudgeReader.cpp
@@ -0,0 +1,68 @@
+/*  IV Judge Reader
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_IvJudgeReader.h"
+#include "PokemonBDSP_IvJudgeReader.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonBDSP{
+
+
+IvJudgeReaderScope::IvJudgeReaderScope(VideoOverlay& overlay, Language language)
+    : m_language(language)
+    , m_box0(overlay, {0.785, 0.196 + 0 * 0.0529, 0.2, 0.0515})
+    , m_box1(overlay, {0.785, 0.196 + 1 * 0.0529, 0.2, 0.0515})
+    , m_box2(overlay, {0.785, 0.196 + 2 * 0.0529, 0.2, 0.0515})
+    , m_box3(overlay, {0.785, 0.196 + 3 * 0.0529, 0.2, 0.0515})
+    , m_box4(overlay, {0.785, 0.196 + 4 * 0.0529, 0.2, 0.0515})
+    , m_box5(overlay, {0.785, 0.196 + 5 * 0.0529, 0.2, 0.0515})
+{}
+
+
+IvJudgeValue IvJudgeReaderScope::read(Logger& logger, const ImageViewRGB32& frame, const OverlayBoxScope& box){
+    ImageViewRGB32 image = extract_box_reference(frame, box);
+    OCR::StringMatchResult result = PokemonSwSh::IV_READER().read_substring(
+        logger, m_language, image,
+        OCR::BLACK_TEXT_FILTERS()
+    );
+    result.clear_beyond_log10p(IvJudgeReader::MAX_LOG10P);
+    if (result.results.size() != 1){
+        return IvJudgeValue::UnableToDetect;
+    }
+    return IV_JUDGE_VALUE_STRINGS().get_enum(result.results.begin()->second.token);
+}
+IvJudgeReader::Results IvJudgeReaderScope::read(Logger& logger, const ImageViewRGB32& frame){
+    IvJudgeReader::Results results;
+    if (m_language != Language::None){
+        results.hp      = read(logger, frame, m_box0);
+        results.attack  = read(logger, frame, m_box1);
+        results.defense = read(logger, frame, m_box2);
+        results.spatk   = read(logger, frame, m_box3);
+        results.spdef   = read(logger, frame, m_box4);
+        results.speed   = read(logger, frame, m_box5);
+    }
+    return results;
+}
+
+std::vector<ImageViewRGB32> IvJudgeReaderScope::dump_images(const ImageViewRGB32& frame){
+    std::vector<ImageViewRGB32> images;
+    images.emplace_back(extract_box_reference(frame, m_box0));
+    images.emplace_back(extract_box_reference(frame, m_box1));
+    images.emplace_back(extract_box_reference(frame, m_box2));
+    images.emplace_back(extract_box_reference(frame, m_box3));
+    images.emplace_back(extract_box_reference(frame, m_box4));
+    images.emplace_back(extract_box_reference(frame, m_box5));
+    return images;
+}
+
+
+
+}
+}
+}
+
diff --git a/SerialPrograms/Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_IvJudgeReader.h b/SerialPrograms/Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_IvJudgeReader.h
new file mode 100644
index 0000000000..cc09ad60d1
--- /dev/null
+++ b/SerialPrograms/Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_IvJudgeReader.h
@@ -0,0 +1,45 @@
+/*  IV Judge Reader
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonBDSP_IvJudgeReader_H
+#define PokemonAutomation_PokemonBDSP_IvJudgeReader_H
+
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "Pokemon/Inference/Pokemon_IvJudgeReader.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonBDSP{
+using namespace Pokemon;
+
+
+class IvJudgeReaderScope{
+public:
+    IvJudgeReaderScope(VideoOverlay& overlay, Language language);
+    
+    IvJudgeReader::Results read(Logger& logger, const ImageViewRGB32& frame);
+
+    std::vector<ImageViewRGB32> dump_images(const ImageViewRGB32& frame);
+
+private:
+    IvJudgeValue read(Logger& logger, const ImageViewRGB32& frame, const OverlayBoxScope& box);
+
+private:
+    Language m_language;
+    OverlayBoxScope m_box0;
+    OverlayBoxScope m_box1;
+    OverlayBoxScope m_box2;
+    OverlayBoxScope m_box3;
+    OverlayBoxScope m_box4;
+    OverlayBoxScope m_box5;
+};
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_DialogDetector.cpp b/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_DialogDetector.cpp
index 7121bb8a7c..c8636d99cb 100644
--- a/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_DialogDetector.cpp
+++ b/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_DialogDetector.cpp
@@ -1,16 +1,16 @@
 /*  Dialog Detector
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include "CommonFramework/ImageTools/SolidColorTest.h"
 #include "CommonFramework/VideoPipeline/VideoOverlay.h"
+#include "CommonTools/Images/SolidColorTest.h"
 #include "PokemonBDSP_DialogDetector.h"
 
-#include <iostream>
-using std::cout;
-using std::endl;
+//#include <iostream>
+//using std::cout;
+//using std::endl;
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
@@ -32,12 +32,14 @@ void ShortDialogDetector::make_overlays(VideoOverlaySet& items) const{
     items.add(m_color, m_right_white);
     items.add(m_color, m_right);
 }
-bool ShortDialogDetector::detect(const ImageViewRGB32& screen) const{
+bool ShortDialogDetector::detect(const ImageViewRGB32& screen){
     ImageStats left_white = image_stats(extract_box_reference(screen, m_left_white));
+//    cout << left_white.average << left_white.stddev << endl;
     if (!is_white(left_white)){
         return false;
     }
     ImageStats right_white = image_stats(extract_box_reference(screen, m_right_white));
+//    cout << right_white.average << right_white.stddev << endl;
     if (!is_white(right_white)){
         return false;
     }
@@ -59,17 +61,6 @@ bool ShortDialogDetector::detect(const ImageViewRGB32& screen) const{
 }
 
 
-ShortDialogWatcher::ShortDialogWatcher(Color color)
-    : ShortDialogDetector(color)
-    , VisualInferenceCallback("ShortDialogWatcher")
-{}
-void ShortDialogWatcher::make_overlays(VideoOverlaySet& items) const{
-    ShortDialogDetector::make_overlays(items);
-}
-bool ShortDialogWatcher::process_frame(const ImageViewRGB32& frame, WallClock){
-    return detect(frame);
-}
-
 
 
 
@@ -86,7 +77,7 @@ void BattleDialogDetector::make_overlays(VideoOverlaySet& items) const{
     items.add(m_color, m_left);
     items.add(m_color, m_right);
 }
-bool BattleDialogDetector::detect(const ImageViewRGB32& screen) const{
+bool BattleDialogDetector::detect(const ImageViewRGB32& screen){
     ImageStats left_white = image_stats(extract_box_reference(screen, m_left_white));
     if (!is_white(left_white)){
         return false;
diff --git a/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_DialogDetector.h b/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_DialogDetector.h
index d3826f6d22..fe7c90cbb0 100644
--- a/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_DialogDetector.h
+++ b/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_DialogDetector.h
@@ -1,14 +1,14 @@
 /*  Dialog Detector
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifndef PokemonAutomation_PokemonBDSP_BattleDialogDetector_H
 #define PokemonAutomation_PokemonBDSP_BattleDialogDetector_H
 
-#include "CommonFramework/Inference/VisualDetector.h"
-#include "CommonFramework/InferenceInfra/VisualInferenceCallback.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+#include "CommonTools/VisualDetector.h"
 #include "PokemonBDSP_SelectionArrow.h"
 
 namespace PokemonAutomation{
@@ -23,7 +23,7 @@ class ShortDialogDetector : public StaticScreenDetector{
     ShortDialogDetector(Color color = COLOR_RED);
 
     virtual void make_overlays(VideoOverlaySet& items) const override;
-    virtual bool detect(const ImageViewRGB32& screen) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
 
 private:
     Color m_color;
@@ -33,12 +33,11 @@ class ShortDialogDetector : public StaticScreenDetector{
     ImageFloatBox m_right_white;
     ImageFloatBox m_right;
 };
-class ShortDialogWatcher : public ShortDialogDetector, public VisualInferenceCallback{
+class ShortDialogWatcher : public DetectorToFinder<ShortDialogDetector>{
 public:
-    ShortDialogWatcher(Color color = COLOR_RED);
-
-    virtual void make_overlays(VideoOverlaySet& items) const override;
-    virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override;
+    ShortDialogWatcher(Color color = COLOR_RED)
+        : DetectorToFinder("ShortDialogWatcher", std::chrono::milliseconds(250), color)
+    {}
 };
 
 
@@ -50,7 +49,7 @@ class BattleDialogDetector : public StaticScreenDetector{
     BattleDialogDetector(Color color = COLOR_RED);
 
     virtual void make_overlays(VideoOverlaySet& items) const override;
-    virtual bool detect(const ImageViewRGB32& screen) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
 
 private:
     Color m_color;
diff --git a/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_MapDetector.cpp b/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_MapDetector.cpp
index a44abfbabd..495d2054bb 100644
--- a/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_MapDetector.cpp
+++ b/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_MapDetector.cpp
@@ -1,17 +1,16 @@
 /*  Map Detector
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include "Common/Compiler.h"
-#include "CommonFramework/ImageTools/SolidColorTest.h"
 #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Images/SolidColorTest.h"
 #include "PokemonBDSP_MapDetector.h"
 
-#include <iostream>
-using std::cout;
-using std::endl;
+//#include <iostream>
+//using std::cout;
+//using std::endl;
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
@@ -30,7 +29,7 @@ void MapDetector::make_overlays(VideoOverlaySet& items) const{
     items.add(m_color, m_box1);
     items.add(m_color, m_box2);
 }
-bool MapDetector::detect(const ImageViewRGB32& screen) const{
+bool MapDetector::detect(const ImageViewRGB32& screen){
     ImageStats stats0 = image_stats(extract_box_reference(screen, m_box0));
 //    cout << "m_box0: " << stats0.average << stats0.stddev << endl;
     if (!is_solid(stats0, {0.0668203, 0.4447, 0.488479})){
diff --git a/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_MapDetector.h b/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_MapDetector.h
index 1a47046b8e..19d0ae7a14 100644
--- a/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_MapDetector.h
+++ b/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_MapDetector.h
@@ -1,6 +1,6 @@
 /*  Map Detector
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -9,8 +9,8 @@
 
 #include "Common/Cpp/Color.h"
 #include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "CommonFramework/Inference/VisualDetector.h"
-#include "CommonFramework/InferenceInfra/VisualInferenceCallback.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+#include "CommonTools/VisualDetector.h"
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
@@ -22,7 +22,7 @@ class MapDetector : public StaticScreenDetector{
     MapDetector(Color color = COLOR_RED);
 
     virtual void make_overlays(VideoOverlaySet& items) const override;
-    virtual bool detect(const ImageViewRGB32& screen) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
 
 private:
     Color m_color;
diff --git a/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_MarkFinder.cpp b/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_MarkFinder.cpp
index 08f800f9ba..4f7f726487 100644
--- a/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_MarkFinder.cpp
+++ b/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_MarkFinder.cpp
@@ -1,20 +1,19 @@
 /*  Mark Finder
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include "Kernels/Waterfill/Kernels_Waterfill.h"
-#include "CommonFramework/Globals.h"
-#include "CommonFramework/ImageTools/BinaryImage_FilterRgb32.h"
+#include "CommonFramework/GlobalAutoPaths.h"
 #include "CommonFramework/VideoPipeline/VideoOverlay.h"
-//#include "CommonFramework/ImageMatch/ImageDiff.h"
-#include "CommonFramework/ImageMatch/ExactImageMatcher.h"
+#include "CommonTools/Images/BinaryImage_FilterRgb32.h"
+#include "CommonTools/ImageMatch/ExactImageMatcher.h"
 #include "PokemonBDSP_MarkFinder.h"
 
-#include <iostream>
-using std::cout;
-using std::endl;
+//#include <iostream>
+//using std::cout;
+//using std::endl;
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
diff --git a/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_MarkFinder.h b/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_MarkFinder.h
index bc3aecb4eb..f40d6dfa4a 100644
--- a/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_MarkFinder.h
+++ b/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_MarkFinder.h
@@ -1,6 +1,6 @@
 /*  Mark Finder
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -11,7 +11,7 @@
 #include <deque>
 #include "CommonFramework/ImageTools/ImageBoxes.h"
 #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
-#include "CommonFramework/InferenceInfra/VisualInferenceCallback.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
 
 namespace PokemonAutomation{
     class VideoOverlay;
diff --git a/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_MenuDetector.cpp b/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_MenuDetector.cpp
index 2478f9414f..12da43966e 100644
--- a/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_MenuDetector.cpp
+++ b/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_MenuDetector.cpp
@@ -1,13 +1,12 @@
 /*  Menu Detector
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include "Common/Compiler.h"
 #include "CommonFramework/ImageTools/ImageStats.h"
-#include "CommonFramework/ImageTools/SolidColorTest.h"
 #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Images/SolidColorTest.h"
 #include "PokemonBDSP_MenuDetector.h"
 
 namespace PokemonAutomation{
@@ -15,14 +14,22 @@ namespace NintendoSwitch{
 namespace PokemonBDSP{
 
 
+const double STRIPE_TOP = 0.110;
+const double STRIPE_TOP_BELOW_BANNER = 0.170;
+const double STRIPE_BOTTOM = 0.598;
 
-MenuDetector::MenuDetector(Color color)
+static ImageFloatBox menu_stripe(size_t index, bool skip_new_banner){
+    double top = skip_new_banner ? STRIPE_TOP_BELOW_BANNER : STRIPE_TOP;
+    return ImageFloatBox(0.160 + 0.166 * (double)index, top, 0.015, STRIPE_BOTTOM - top);
+}
+
+MenuDetector::MenuDetector(Color color, bool skip_new_banner)
     : m_color(color)
-    , m_line0(0.160 + 0.166 * 0, 0.110, 0.015, 0.488)
-    , m_line1(0.160 + 0.166 * 1, 0.110, 0.015, 0.488)
-    , m_line2(0.160 + 0.166 * 2, 0.110, 0.015, 0.488)
-    , m_line3(0.160 + 0.166 * 3, 0.110, 0.015, 0.488)
-    , m_line4(0.160 + 0.166 * 4, 0.110, 0.015, 0.488)
+    , m_line0(menu_stripe(0, skip_new_banner))
+    , m_line1(menu_stripe(1, skip_new_banner))
+    , m_line2(menu_stripe(2, skip_new_banner))
+    , m_line3(menu_stripe(3, skip_new_banner))
+    , m_line4(menu_stripe(4, skip_new_banner))
     , m_cross(0.20, 0.15, 0.60, 0.37)
 {}
 
@@ -34,7 +41,7 @@ void MenuDetector::make_overlays(VideoOverlaySet& items) const{
     items.add(m_color, m_line4);
     items.add(m_color, m_cross);
 }
-bool MenuDetector::detect(const ImageViewRGB32& screen) const{
+bool MenuDetector::detect(const ImageViewRGB32& screen){
     ImageStats stats0 = image_stats(extract_box_reference(screen, m_line0));
     if (!is_white(stats0)){
         return false;
@@ -64,8 +71,8 @@ bool MenuDetector::detect(const ImageViewRGB32& screen) const{
 }
 
 
-MenuWatcher::MenuWatcher(Color color)
-    : MenuDetector(color)
+MenuWatcher::MenuWatcher(Color color, bool skip_new_banner)
+    : MenuDetector(color, skip_new_banner)
     , VisualInferenceCallback("MenuWatcher")
 {}
 void MenuWatcher::make_overlays(VideoOverlaySet& items) const{
diff --git a/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_MenuDetector.h b/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_MenuDetector.h
index 2a5cefd07b..f7e5a0517f 100644
--- a/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_MenuDetector.h
+++ b/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_MenuDetector.h
@@ -1,6 +1,6 @@
 /*  Menu Detector
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -9,8 +9,8 @@
 
 #include "Common/Cpp/Color.h"
 #include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "CommonFramework/Inference/VisualDetector.h"
-#include "CommonFramework/InferenceInfra/VisualInferenceCallback.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+#include "CommonTools/VisualDetector.h"
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
@@ -19,10 +19,10 @@ namespace PokemonBDSP{
 
 class MenuDetector : public StaticScreenDetector{
 public:
-    MenuDetector(Color color = COLOR_RED);
+    MenuDetector(Color color = COLOR_RED, bool skip_new_banner = false);
 
     virtual void make_overlays(VideoOverlaySet& items) const override;
-    virtual bool detect(const ImageViewRGB32& screen) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
 
 private:
     Color m_color;
@@ -37,7 +37,7 @@ class MenuDetector : public StaticScreenDetector{
 
 class MenuWatcher : public MenuDetector, public VisualInferenceCallback{
 public:
-    MenuWatcher(Color color = COLOR_RED);
+    MenuWatcher(Color color = COLOR_RED, bool skip_new_banner = false);
 
     virtual void make_overlays(VideoOverlaySet& items) const override;
     virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override;
diff --git a/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_PokeballSpriteMatcher.cpp b/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_PokeballSpriteMatcher.cpp
index b3a79fa3de..6390a96cd7 100644
--- a/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_PokeballSpriteMatcher.cpp
+++ b/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_PokeballSpriteMatcher.cpp
@@ -1,12 +1,12 @@
 /*  Pokeball Sprite Reader
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include "CommonFramework/ImageTypes/ImageViewRGB32.h"
-#include "CommonFramework/ImageMatch/ImageCropper.h"
-#include "PokemonSwSh/Resources/PokemonSwSh_PokeballSprites.h"
+#include "CommonTools/ImageMatch/ImageCropper.h"
+#include "VideoGames/PokemonSwSh/Resources/PokemonSwSh_PokeballSprites.h"
 #include "PokemonBDSP_PokeballSpriteMatcher.h"
 
 namespace PokemonAutomation{
@@ -22,9 +22,7 @@ PokeballSpriteMatcher::PokeballSpriteMatcher(double min_euclidean_distance)
         add(item.first, item.second.sprite);
     }
 }
-
-
-ImageRGB32 PokeballSpriteMatcher::process_image(const ImageViewRGB32& image, Color& background) const{
+auto PokeballSpriteMatcher::get_crop_candidates(const ImageViewRGB32& image) const -> std::vector<ImageViewRGB32>{
     ImageStats border = image_border_stats(image);
     ImagePixelBox box = ImageMatch::enclosing_rectangle_with_pixel_filter(
         image,
@@ -36,8 +34,9 @@ ImageRGB32 PokeballSpriteMatcher::process_image(const ImageViewRGB32& image, Col
             return stop;
         }
     );
-    background = border.average.round();
-    return extract_box_reference(image, box).copy();
+    std::vector<ImageViewRGB32> ret;
+    ret.emplace_back(extract_box_reference(image, box));
+    return ret;
 }
 
 
diff --git a/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_PokeballSpriteMatcher.h b/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_PokeballSpriteMatcher.h
index 44c68c8a54..0c43852939 100644
--- a/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_PokeballSpriteMatcher.h
+++ b/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_PokeballSpriteMatcher.h
@@ -1,13 +1,13 @@
 /*  Pokeball Sprite Reader
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifndef PokemonAutomation_PokemonBDSP_PokeballSpriteReader_H
 #define PokemonAutomation_PokemonBDSP_PokeballSpriteReader_H
 
-#include "CommonFramework/ImageMatch/CroppedImageDictionaryMatcher.h"
+#include "CommonTools/ImageMatch/CroppedImageDictionaryMatcher.h"
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
@@ -19,7 +19,7 @@ class PokeballSpriteMatcher : public ImageMatch::CroppedImageDictionaryMatcher{
     PokeballSpriteMatcher(double min_euclidean_distance = 100);
 
 private:
-    virtual ImageRGB32 process_image(const ImageViewRGB32& image, Color& background) const override;
+    virtual std::vector<ImageViewRGB32> get_crop_candidates(const ImageViewRGB32& image) const override;
 
 private:
     double m_min_euclidean_distance_squared;
diff --git a/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_ReceivePokemonDetector.cpp b/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_ReceivePokemonDetector.cpp
index ba73840ddf..9fe7bf7a0b 100644
--- a/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_ReceivePokemonDetector.cpp
+++ b/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_ReceivePokemonDetector.cpp
@@ -1,12 +1,11 @@
 /*  Receive Pokemon (Blue Background) Detector
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include "Common/Compiler.h"
-#include "CommonFramework/ImageTools/SolidColorTest.h"
 #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Images/SolidColorTest.h"
 #include "PokemonBDSP_ReceivePokemonDetector.h"
 
 namespace PokemonAutomation{
diff --git a/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_ReceivePokemonDetector.h b/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_ReceivePokemonDetector.h
index e995eb56ee..f2f69631d4 100644
--- a/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_ReceivePokemonDetector.h
+++ b/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_ReceivePokemonDetector.h
@@ -1,6 +1,6 @@
 /*  Receive Pokemon (Blue Background) Detector
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  *
  *      Returns true after the background of receiving a pokemon
@@ -11,9 +11,8 @@
 #ifndef PokemonAutomation_PokemonBDSP_ReceivePokemonDetector_H
 #define PokemonAutomation_PokemonBDSP_ReceivePokemonDetector_H
 
-#include "CommonFramework/Logging/Logger.h"
 #include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "CommonFramework/InferenceInfra/VisualInferenceCallback.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
diff --git a/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_SelectionArrow.cpp b/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_SelectionArrow.cpp
index 9c359d9581..7857b0622c 100644
--- a/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_SelectionArrow.cpp
+++ b/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_SelectionArrow.cpp
@@ -1,21 +1,20 @@
 /*  Selection Arrow
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include "Common/Compiler.h"
 #include "Kernels/Waterfill/Kernels_Waterfill.h"
-#include "CommonFramework/Globals.h"
+#include "CommonFramework/GlobalAutoPaths.h"
 #include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "CommonFramework/ImageTools/BinaryImage_FilterRgb32.h"
-#include "CommonFramework/ImageMatch/ExactImageMatcher.h"
 #include "CommonFramework/VideoPipeline/VideoOverlay.h"
+#include "CommonTools/Images/BinaryImage_FilterRgb32.h"
+#include "CommonTools/ImageMatch/ExactImageMatcher.h"
 #include "PokemonBDSP_SelectionArrow.h"
 
-#include <iostream>
-using std::cout;
-using std::endl;
+//#include <iostream>
+//using std::cout;
+//using std::endl;
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
@@ -83,13 +82,15 @@ SelectionArrowFinder::SelectionArrowFinder(
     , m_box(box)
 {}
 
-void SelectionArrowFinder::detect(const ImageViewRGB32& screen){
+bool SelectionArrowFinder::detect(const ImageViewRGB32& screen){
     std::vector<ImagePixelBox> arrows = find_selection_arrows(extract_box_reference(screen, m_box));
 
     m_arrow_boxes.clear();
     for (const ImagePixelBox& mark : arrows){
         m_arrow_boxes.emplace_back(m_overlay, translate_to_parent(screen, m_box, mark), COLOR_MAGENTA);
     }
+
+    return !m_arrow_boxes.empty();
 }
 void SelectionArrowFinder::make_overlays(VideoOverlaySet& items) const{
     items.add(m_color, m_box);
diff --git a/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_SelectionArrow.h b/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_SelectionArrow.h
index 25b1f64f57..b8d7347339 100644
--- a/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_SelectionArrow.h
+++ b/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_SelectionArrow.h
@@ -1,6 +1,6 @@
 /*  Selection Arrow
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -9,7 +9,7 @@
 
 #include <deque>
 #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
-#include "CommonFramework/InferenceInfra/VisualInferenceCallback.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
@@ -24,7 +24,7 @@ class SelectionArrowFinder : public VisualInferenceCallback{
         Color color
     );
 
-    void detect(const ImageViewRGB32& screen);
+    bool detect(const ImageViewRGB32& screen);
 
     virtual void make_overlays(VideoOverlaySet& items) const override;
     virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override;
diff --git a/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_VSSeekerReaction.cpp b/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_VSSeekerReaction.cpp
index a32918c9d2..39880dbe44 100644
--- a/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_VSSeekerReaction.cpp
+++ b/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_VSSeekerReaction.cpp
@@ -1,20 +1,20 @@
 /*  VS Seeker Reaction Bubble
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include "Kernels/Waterfill/Kernels_Waterfill.h"
-#include "CommonFramework/Globals.h"
+#include "CommonFramework/GlobalAutoPaths.h"
 #include "CommonFramework/ImageTypes/ImageRGB32.h"
-#include "CommonFramework/ImageTools/BinaryImage_FilterRgb32.h"
-#include "CommonFramework/ImageMatch/ImageDiff.h"
+#include "CommonFramework/ImageTools/ImageDiff.h"
 #include "CommonFramework/VideoPipeline/VideoOverlay.h"
+#include "CommonTools/Images/BinaryImage_FilterRgb32.h"
 #include "PokemonBDSP_VSSeekerReaction.h"
 
-#include <iostream>
-using std::cout;
-using std::endl;
+//#include <iostream>
+//using std::cout;
+//using std::endl;
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
@@ -72,7 +72,7 @@ void VSSeekerReactionTracker::make_overlays(VideoOverlaySet& items) const{
 }
 bool VSSeekerReactionTracker::process_frame(const ImageViewRGB32& frame, WallClock){
     ImageViewRGB32 cropped = extract_box_reference(frame, m_box);
-    m_dimensions = QSize((int)cropped.width(), (int)cropped.height());
+    m_dimensions = Resolution(cropped.width(), cropped.height());
     m_bubbles = find_seeker_bubbles(cropped);
 //        cout << exclamation_marks.size() << endl;
 
diff --git a/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_VSSeekerReaction.h b/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_VSSeekerReaction.h
index 4f80e04f49..a9a580c4e7 100644
--- a/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_VSSeekerReaction.h
+++ b/SerialPrograms/Source/PokemonBDSP/Inference/PokemonBDSP_VSSeekerReaction.h
@@ -1,6 +1,6 @@
 /*  VS Seeker Reaction Bubble
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -9,10 +9,10 @@
 
 #include <vector>
 #include <deque>
-#include <QSize>
+#include "Common/Cpp/ImageResolution.h"
 #include "CommonFramework/ImageTools/ImageBoxes.h"
 #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
-#include "CommonFramework/InferenceInfra/VisualInferenceCallback.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
@@ -30,13 +30,13 @@ class VSSeekerReactionTracker : public VisualInferenceCallback{
     virtual void make_overlays(VideoOverlaySet& items) const override;
     virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override;
 
-    QSize dimensions() const{ return m_dimensions; }
+    Resolution dimensions() const{ return m_dimensions; }
     const std::vector<ImagePixelBox>& reactions() const{ return m_bubbles; }
 
 protected:
     VideoOverlay& m_overlay;
     ImageFloatBox m_box;
-    QSize m_dimensions;
+    Resolution m_dimensions;
     std::vector<ImagePixelBox> m_bubbles;
     std::deque<OverlayBoxScope> m_boxes;
 };
diff --git a/SerialPrograms/Source/PokemonBDSP/Inference/Rng/PokemonBDSP_BlinkExtraction.cpp b/SerialPrograms/Source/PokemonBDSP/Inference/Rng/PokemonBDSP_BlinkExtraction.cpp
new file mode 100644
index 0000000000..ff6fce9b3a
--- /dev/null
+++ b/SerialPrograms/Source/PokemonBDSP/Inference/Rng/PokemonBDSP_BlinkExtraction.cpp
@@ -0,0 +1,417 @@
+/*  BDSP Blink Extraction
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <algorithm>
+#include <cmath>
+#include "PokemonBDSP_BlinkExtraction.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonBDSP{
+
+
+const double THRESHOLD_LOWEST = 0.04;
+const double THRESHOLD_HIGHEST = 0.60;
+const size_t THRESHOLD_STEPS = 40;
+const size_t MINIMUM_PLATEAU_BLINKS = 20;
+const double MINIMUM_SECONDS_FOR_THRESHOLD = 180;
+
+
+static std::vector<double> blink_depths(const std::vector<BlinkMatchSample>& samples){
+    std::vector<double> matches;
+    matches.reserve(samples.size());
+    for (const BlinkMatchSample& sample : samples){
+        matches.emplace_back(sample.match);
+    }
+    std::vector<double> sorted = matches;
+    std::sort(sorted.begin(), sorted.end());
+    double resting = sorted.empty() ? 0.0 : sorted[sorted.size() / 2];
+    if (resting <= 0){
+        return std::vector<double>(samples.size(), 0.0);
+    }
+
+    std::vector<double> depths;
+    depths.reserve(matches.size());
+    for (double value : matches){
+        double depth = (resting - value) / resting;
+        depths.emplace_back(depth < 0 ? 0.0 : (depth > 1 ? 1.0 : depth));
+    }
+    return depths;
+}
+
+static size_t count_blinks(const std::vector<double>& depths, double threshold){
+    size_t count = 0;
+    bool shut = false;
+    for (double depth : depths){
+        if (depth > threshold){
+            if (!shut){
+                shut = true;
+                count++;
+            }
+        }else{
+            shut = false;
+        }
+    }
+    return count;
+}
+
+
+double auto_blink_threshold(const std::vector<BlinkMatchSample>& samples){
+    if (samples.empty()){
+        return -1;
+    }
+    double watched = std::chrono::duration_cast<std::chrono::duration<double>>(
+        samples.back().timestamp - samples.front().timestamp
+    ).count();
+    if (watched < MINIMUM_SECONDS_FOR_THRESHOLD){
+        return -1;
+    }
+    std::vector<double> depths = blink_depths(samples);
+
+    std::vector<double> thresholds(THRESHOLD_STEPS);
+    std::vector<size_t> counts(THRESHOLD_STEPS);
+    double low = std::log(THRESHOLD_LOWEST);
+    double high = std::log(THRESHOLD_HIGHEST);
+    for (size_t c = 0; c < THRESHOLD_STEPS; c++){
+        thresholds[c] = std::exp(low + (high - low) * (double)c / (double)(THRESHOLD_STEPS - 1));
+        counts[c] = count_blinks(depths, thresholds[c]);
+    }
+
+    //  Widest band over which the blink count barely moves.
+    size_t best_span = 0;
+    size_t best_start = 0;
+    size_t best_end = 0;
+    bool found = false;
+    size_t c = 0;
+    while (c < THRESHOLD_STEPS){
+        if (counts[c] < MINIMUM_PLATEAU_BLINKS){
+            c++;
+            continue;
+        }
+        size_t end = c;
+        while (end + 1 < THRESHOLD_STEPS
+            && counts[end + 1] >= MINIMUM_PLATEAU_BLINKS
+            && (counts[end + 1] > counts[c] ? counts[end + 1] - counts[c] : counts[c] - counts[end + 1]) <= 1
+        ){
+            end++;
+        }
+        //  Strictly wider, so that a tie keeps the lower-threshold plateau.
+        if (!found || end - c > best_span){
+            best_span = end - c;
+            best_start = c;
+            best_end = end;
+            found = true;
+        }
+        c = end + 1;
+    }
+
+    if (!found){
+        return -1;
+    }
+    return std::exp((std::log(thresholds[best_start]) + std::log(thresholds[best_end])) / 2);
+}
+
+
+std::vector<Blink> extract_blinks(
+    const std::vector<BlinkMatchSample>& samples, double threshold, WallClock origin_time
+){
+    std::vector<Blink> blinks;
+    if (samples.size() < 2 || threshold <= 0){
+        return blinks;
+    }
+    std::vector<double> depths = blink_depths(samples);
+    if (origin_time == WallClock::min()){
+        origin_time = samples[0].timestamp;
+    }
+    double origin = std::chrono::duration_cast<std::chrono::duration<double>>(
+        origin_time.time_since_epoch()
+    ).count();
+
+    size_t start = 0;
+    bool shut = false;
+    for (size_t c = 0; c <= depths.size(); c++){
+        bool now_shut = c < depths.size() && depths[c] > threshold;
+        if (now_shut && !shut){
+            shut = true;
+            start = c;
+            continue;
+        }
+        if (now_shut || !shut){
+            continue;
+        }
+        shut = false;
+
+
+        size_t from = start >= 2 ? start - 2 : 0;
+        size_t to = std::min(c + 2, depths.size());
+        double weight = 0;
+        double weighted_time = 0;
+        double peak = 0;
+        for (size_t i = from; i < to; i++){
+            double seconds = std::chrono::duration_cast<std::chrono::duration<double>>(
+                samples[i].timestamp.time_since_epoch()
+            ).count() - origin;
+            weight += depths[i];
+            weighted_time += depths[i] * seconds;
+            peak = std::max(peak, depths[i]);
+        }
+        if (weight <= 0){
+            continue;
+        }
+        Blink blink;
+        blink.seconds = weighted_time / weight;
+        blink.depth = peak;
+        blink.frames = c - start;
+        blinks.emplace_back(blink);
+    }
+    return blinks;
+}
+
+
+std::vector<BlinkEvent> group_blinks(
+    const std::vector<Blink>& blinks, double double_blink_seconds
+){
+    std::vector<BlinkEvent> events;
+    size_t c = 0;
+    while (c < blinks.size()){
+        BlinkEvent event;
+        event.seconds = blinks[c].seconds;
+        if (c + 1 < blinks.size()
+            && blinks[c + 1].seconds - blinks[c].seconds < double_blink_seconds
+        ){
+            event.type = BlinkType::Double;
+            c += 2;
+        }else{
+            event.type = BlinkType::Single;
+            c += 1;
+        }
+        events.emplace_back(event);
+    }
+    return events;
+}
+
+
+TickFit fit_tick_period(
+    const std::vector<BlinkEvent>& events, double lowest_seconds, double highest_seconds
+){
+    TickFit fit;
+    if (events.size() < 3){
+        return fit;
+    }
+    std::vector<double> gaps;
+    gaps.reserve(events.size() - 1);
+    for (size_t c = 1; c < events.size(); c++){
+        gaps.emplace_back(events[c].seconds - events[c - 1].seconds);
+    }
+
+    const size_t STEPS = 400;
+    for (size_t c = 0; c <= STEPS; c++){
+        double period = lowest_seconds + (highest_seconds - lowest_seconds) * (double)c / (double)STEPS;
+        double total = 0;
+        double worst = 0;
+        for (double gap : gaps){
+            double ticks = gap / period;
+            double error = std::abs(ticks - std::round(ticks));
+            total += error * error;
+            worst = std::max(worst, error);
+        }
+        double rms = std::sqrt(total / (double)gaps.size());
+        if (fit.period_seconds == 0 || rms < fit.rms_ticks){
+            fit.period_seconds = period;
+            fit.rms_ticks = rms;
+            fit.worst_ticks = worst;
+        }
+    }
+    return fit;
+}
+
+
+static std::vector<uint64_t> assign_tick_indices(
+    const std::vector<BlinkEvent>& events,
+    double period_seconds,
+    double origin_seconds,
+    double& phase_ticks
+){
+    phase_ticks = 0;
+    std::vector<uint64_t> ticks;
+    if (events.empty() || !(period_seconds > 0)){
+        return ticks;
+    }
+
+    std::vector<double> deviations;
+    deviations.reserve(events.size());
+    for (const BlinkEvent& event : events){
+        double position = (event.seconds - origin_seconds) / period_seconds;
+        deviations.emplace_back(position - std::round(position));
+    }
+    std::vector<double> sorted = deviations;
+    std::sort(sorted.begin(), sorted.end());
+    phase_ticks = sorted[sorted.size() / 2];
+
+    ticks.reserve(events.size());
+    for (const BlinkEvent& event : events){
+        double position = (event.seconds - origin_seconds) / period_seconds - phase_ticks;
+        long long index = (long long)std::llround(position);
+        ticks.emplace_back(index < 0 ? 0 : (uint64_t)index);
+    }
+    return ticks;
+}
+
+
+bool build_samples(
+    const std::vector<std::vector<BlinkEvent>>& streams,
+    const std::vector<uint8_t>& slots,
+    double period_seconds,
+    std::vector<BlinkSample>& samples,
+    std::string& failure_reason
+){
+    samples.clear();
+    if (streams.empty() || streams.size() != slots.size()){
+        failure_reason = "Each stream needs a slot.";
+        return false;
+    }
+    if (!(period_seconds > 0)){
+        failure_reason = "No tick period was fitted.";
+        return false;
+    }
+    uint8_t npcs = (uint8_t)streams.size();
+
+    //  Every stream is placed on one grid, anchored at whichever blinked first.
+    double earliest = streams[0].empty() ? 0 : streams[0][0].seconds;
+    for (const std::vector<BlinkEvent>& stream : streams){
+        if (stream.empty()){
+            failure_reason = "One of the watchers saw no blinks at all.";
+            return false;
+        }
+        earliest = std::min(earliest, stream[0].seconds);
+    }
+
+    struct Placed{
+        uint64_t tick;
+        BlinkType type;
+    };
+    std::vector<std::vector<Placed>> placed(streams.size());
+    uint64_t last_tick = 0;
+
+    for (size_t s = 0; s < streams.size(); s++){
+        //  Every stream is measured from the one shared origin, so each one's
+        //  offset from the grid is removed in the same step that places it.
+        double phase = 0;
+        std::vector<uint64_t> ticks = assign_tick_indices(streams[s], period_seconds, earliest, phase);
+        for (size_t c = 0; c < ticks.size(); c++){
+            uint64_t tick = ticks[c];
+            if (c != 0 && tick <= placed[s].back().tick){
+                failure_reason = "Two blinks from the same watcher landed on one tick, so the "
+                    "double-blink grouping is wrong.";
+                return false;
+            }
+            placed[s].emplace_back(Placed{tick, streams[s][c].type});
+            last_tick = std::max(last_tick, tick);
+        }
+    }
+
+    //  Every roll from the first tick to the last was watched by every stream.
+    for (uint64_t tick = 0; tick <= last_tick; tick++){
+        for (size_t s = 0; s < streams.size(); s++){
+            BlinkSample sample;
+            sample.advance = tick * npcs + slots[s];
+            //  Streams are short and in order, so a linear scan is cheap enough.
+            for (const Placed& item : placed[s]){
+                if (item.tick == tick){
+                    sample.blinked = true;
+                    sample.type = item.type;
+                    break;
+                }
+                if (item.tick > tick){
+                    break;
+                }
+            }
+            samples.emplace_back(sample);
+        }
+    }
+
+    std::sort(
+        samples.begin(), samples.end(),
+        [](const BlinkSample& a, const BlinkSample& b){ return a.advance < b.advance; }
+    );
+    uint64_t base = samples.front().advance; //  Always zero in practice
+    for (BlinkSample& sample : samples){
+        sample.advance -= base;
+    }
+    return true;
+}
+
+
+bool last_blink_anchor(
+    const std::vector<std::vector<BlinkEvent>>& streams,
+    const std::vector<uint8_t>& slots,
+    double period_seconds,
+    uint64_t& advance,
+    double& seconds,
+    size_t& stream_index
+){
+    stream_index = 0;
+    if (streams.empty() || streams.size() != slots.size() || !(period_seconds > 0)){
+        return false;
+    }
+    uint8_t npcs = (uint8_t)streams.size();
+
+    //  The same shared origin build_samples() uses. Placing events against a
+    //  different one would shift every tick index.
+    double earliest = streams[0].empty() ? 0 : streams[0][0].seconds;
+    for (const std::vector<BlinkEvent>& stream : streams){
+        if (stream.empty()){
+            return false;
+        }
+        earliest = std::min(earliest, stream[0].seconds);
+    }
+
+    bool found = false;
+    for (size_t s = 0; s < streams.size(); s++){
+        double phase = 0;
+        std::vector<uint64_t> ticks = assign_tick_indices(streams[s], period_seconds, earliest, phase);
+        if (ticks.empty()){
+            continue;
+        }
+        double when = streams[s].back().seconds;
+        if (found && when <= seconds){
+            continue;
+        }
+
+        seconds = when;
+        advance = ticks.back() * npcs + slots[s];
+        stream_index = s;
+        found = true;
+    }
+    return found;
+}
+
+
+bool step_blink_anchor(
+    double elapsed_seconds,
+    double period_seconds,
+    uint8_t npcs,
+    uint64_t previous_advance,
+    uint64_t& advance
+){
+    advance = previous_advance;
+    if (!(period_seconds > 0) || npcs == 0 || !(elapsed_seconds > 0)){
+        return false;
+    }
+    long long ticks = std::llround(elapsed_seconds / period_seconds);
+    if (ticks <= 0){
+        return false;
+    }
+    advance = previous_advance + (uint64_t)ticks * npcs;
+    return true;
+}
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/PokemonBDSP/Inference/Rng/PokemonBDSP_BlinkExtraction.h b/SerialPrograms/Source/PokemonBDSP/Inference/Rng/PokemonBDSP_BlinkExtraction.h
new file mode 100644
index 0000000000..fb7e55df71
--- /dev/null
+++ b/SerialPrograms/Source/PokemonBDSP/Inference/Rng/PokemonBDSP_BlinkExtraction.h
@@ -0,0 +1,93 @@
+/*  BDSP Blink Extraction
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonBDSP_BlinkExtraction_H
+#define PokemonAutomation_PokemonBDSP_BlinkExtraction_H
+
+#include <stddef.h>
+#include <string>
+#include <vector>
+#include "PokemonBDSP/Programs/RngManipulation/PokemonBDSP_BlinkModel.h"
+#include "PokemonBDSP/Programs/RngManipulation/PokemonBDSP_StateSolver.h"
+#include "PokemonBDSP_EyeBlinkDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonBDSP{
+
+
+struct Blink{
+    double seconds = 0;
+    double depth = 0;
+    size_t frames = 0;
+};
+
+struct BlinkEvent{
+    double seconds = 0;
+    BlinkType type = BlinkType::Single;
+};
+
+struct TickFit{
+    double period_seconds = 0;
+    double rms_ticks = 0;
+    double worst_ticks = 0;
+};
+
+
+//  How far the match has to fall below its resting level to count as a blink
+double auto_blink_threshold(const std::vector<BlinkMatchSample>& samples);
+
+
+std::vector<Blink> extract_blinks(
+    const std::vector<BlinkMatchSample>& samples, double threshold,
+    WallClock origin = WallClock::min()
+);
+
+//  A second blink arriving within "double_blink_seconds" is the same roll
+std::vector<BlinkEvent> group_blinks(
+    const std::vector<Blink>& blinks,
+    double double_blink_seconds = 0.55
+);
+
+//  The NPC tick is nominally 1.017 s but measures 1.0197 s on real hardware
+TickFit fit_tick_period(
+    const std::vector<BlinkEvent>& events,
+    double lowest_seconds = 1.000,
+    double highest_seconds = 1.040
+);
+
+bool build_samples(
+    const std::vector<std::vector<BlinkEvent>>& streams,
+    const std::vector<uint8_t>& slots,
+    double period_seconds,
+    std::vector<BlinkSample>& samples,
+    std::string& failure_reason
+);
+
+bool last_blink_anchor(
+    const std::vector<std::vector<BlinkEvent>>& streams,
+    const std::vector<uint8_t>& slots,
+    double period_seconds,
+    uint64_t& advance,
+    double& seconds,
+    size_t& stream_index
+);
+
+
+//  Move an anchor forward onto a later blink from the same stream.
+bool step_blink_anchor(
+    double elapsed_seconds,
+    double period_seconds,
+    uint8_t npcs,
+    uint64_t previous_advance,
+    uint64_t& advance
+);
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/PokemonBDSP/Inference/Rng/PokemonBDSP_BlinkScenes.cpp b/SerialPrograms/Source/PokemonBDSP/Inference/Rng/PokemonBDSP_BlinkScenes.cpp
new file mode 100644
index 0000000000..93c7807fb6
--- /dev/null
+++ b/SerialPrograms/Source/PokemonBDSP/Inference/Rng/PokemonBDSP_BlinkScenes.cpp
@@ -0,0 +1,58 @@
+/*  BDSP Blink Scenes
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <string>
+#include "Common/Cpp/Exceptions.h"
+#include "PokemonBDSP/Options/PokemonBDSP_PlayerModelOption.h"
+#include "PokemonBDSP_BlinkScenes.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonBDSP{
+
+
+std::vector<BdspEyeTemplate> lake_eye_templates(uint8_t player_model){
+    if (player_model < 1 || player_model > BDSP_PLAYER_MODEL_COUNT){
+        throw InternalProgramError(
+            nullptr, PA_CURRENT_FUNCTION,
+            "Unknown player model: " + std::to_string(player_model)
+        );
+    }
+    return {
+        BdspEyeTemplate{
+            "LakeTemplates/Model-" + std::to_string(player_model) + ".png",
+            {0.5026, 0.4472, 0.0240, 0.0426},
+            "Player"
+        },
+        BdspEyeTemplate{
+            "LakeTemplates/Barry.png",
+            {0.5521, 0.4528, 0.0214, 0.0380},
+            "Barry"
+        },
+    };
+}
+
+
+std::vector<BdspEyeTemplate> bedroom_eye_templates(uint8_t player_model){
+    if (player_model < 1 || player_model > BDSP_PLAYER_MODEL_COUNT){
+        throw InternalProgramError(
+            nullptr, PA_CURRENT_FUNCTION,
+            "Unknown player model: " + std::to_string(player_model)
+        );
+    }
+    return {
+        BdspEyeTemplate{
+            "BedroomTemplates/Model-" + std::to_string(player_model) + ".png",
+            {0.4708, 0.4500, 0.0214, 0.0491},
+            "Player"
+        },
+    };
+}
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/PokemonBDSP/Inference/Rng/PokemonBDSP_BlinkScenes.h b/SerialPrograms/Source/PokemonBDSP/Inference/Rng/PokemonBDSP_BlinkScenes.h
new file mode 100644
index 0000000000..b1c49bb7fd
--- /dev/null
+++ b/SerialPrograms/Source/PokemonBDSP/Inference/Rng/PokemonBDSP_BlinkScenes.h
@@ -0,0 +1,29 @@
+/*  BDSP Blink Scenes
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonBDSP_BlinkScenes_H
+#define PokemonAutomation_PokemonBDSP_BlinkScenes_H
+
+#include <stdint.h>
+#include <vector>
+#include "PokemonBDSP_EyeBlinkDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonBDSP{
+
+
+//  Which eyes to watch, and where they sit, in each scene the RNG programs use.
+
+std::vector<BdspEyeTemplate> lake_eye_templates(uint8_t player_model);
+
+std::vector<BdspEyeTemplate> bedroom_eye_templates(uint8_t player_model);
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/PokemonBDSP/Inference/Rng/PokemonBDSP_EyeBlinkDetector.cpp b/SerialPrograms/Source/PokemonBDSP/Inference/Rng/PokemonBDSP_EyeBlinkDetector.cpp
new file mode 100644
index 0000000000..28878066b4
--- /dev/null
+++ b/SerialPrograms/Source/PokemonBDSP/Inference/Rng/PokemonBDSP_EyeBlinkDetector.cpp
@@ -0,0 +1,149 @@
+/*  BDSP Eye Blink Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <algorithm>
+#include <opencv2/imgproc.hpp>
+#include "Common/Cpp/Exceptions.h"
+#include "CommonFramework/ImageTypes/ImageRGB32.h"
+#include "CommonFramework/ImageTypes/ImageRGB32_OpenCV.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "PokemonBDSP_EyeBlinkDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonBDSP{
+
+
+//  Returned when the frame cannot be matched at all. Callers read a high score
+//  as "eye open", so a frame we can't measure never gets counted as a blink.
+const double NO_MATCH = 1.0;
+
+
+EyeBlinkDetector::EyeBlinkDetector(const ImageViewRGB32& open_eye, ImageFloatBox search_box)
+    : m_search_box(search_box)
+{
+    if (!open_eye){
+        throw InternalProgramError(
+            nullptr, PA_CURRENT_FUNCTION,
+            "EyeBlinkDetector: No eye template was supplied."
+        );
+    }
+
+    cv::cvtColor(to_OpenCV_ref(open_eye), m_template, cv::COLOR_BGRA2GRAY);
+
+    cv::Scalar mean;
+    cv::Scalar stddev;
+    cv::meanStdDev(m_template, mean, stddev);
+    if (stddev[0] <= 0){
+        //  A flat template correlates with everything equally and can never see a blink
+        throw InternalProgramError(
+            nullptr, PA_CURRENT_FUNCTION,
+            "EyeBlinkDetector: The eye template is a single flat colour."
+        );
+    }
+}
+
+double EyeBlinkDetector::match(const ImageViewRGB32& frame) const{
+    if (!frame || frame.height() == 0){
+        return NO_MATCH;
+    }
+
+    ImageViewRGB32 region = extract_box_reference(frame, m_search_box);
+    if (!region){
+        return NO_MATCH;
+    }
+
+    //  Rescale the region to the resolution the template was cropped at
+    //  based on the capture height
+    ImageRGB32 rescaled;
+    if (frame.height() != BDSP_TEMPLATE_REFERENCE_HEIGHT){
+        double scale = (double)BDSP_TEMPLATE_REFERENCE_HEIGHT / (double)frame.height();
+        size_t width = (size_t)std::llround(region.width() * scale);
+        size_t height = (size_t)std::llround(region.height() * scale);
+        if (width == 0 || height == 0){
+            return NO_MATCH;
+        }
+        rescaled = region.scale_to(width, height);
+        region = rescaled;
+    }
+
+    if (region.width() < template_width() || region.height() < template_height()){
+        return NO_MATCH;
+    }
+
+    //  Match the greyscale image to the template by zero-normalized cross correlation
+    cv::Mat grey;
+    cv::cvtColor(to_OpenCV_ref(region), grey, cv::COLOR_BGRA2GRAY);
+
+    cv::Mat scores;
+    cv::matchTemplate(grey, m_template, scores, cv::TM_CCOEFF_NORMED);
+
+    double best = NO_MATCH;
+    cv::minMaxLoc(scores, nullptr, &best);
+    return best;
+}
+
+
+
+EyeBlinkWatcher::EyeBlinkWatcher(
+    std::string label,
+    const ImageViewRGB32& open_eye,
+    ImageFloatBox search_box,
+    Color color
+)
+    : VisualInferenceCallback(label)
+    , m_label(std::move(label))
+    , m_color(color)
+    , m_detector(open_eye, search_box)
+    , m_last_match(1.0)
+{}
+
+void EyeBlinkWatcher::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_detector.search_box(), m_label);
+}
+
+bool EyeBlinkWatcher::process_frame(const ImageViewRGB32& frame, WallClock timestamp){
+    double value = m_detector.match(frame);
+    WriteSpinLock lg(m_lock, PA_CURRENT_FUNCTION);
+    m_samples.emplace_back(BlinkMatchSample{timestamp, value});
+    m_last_match = value;
+    //  Never stops the session
+    return false;
+}
+
+std::vector<BlinkMatchSample> EyeBlinkWatcher::samples() const{
+    ReadSpinLock lg(m_lock, PA_CURRENT_FUNCTION);
+    return m_samples;
+}
+size_t EyeBlinkWatcher::sample_count() const{
+    ReadSpinLock lg(m_lock, PA_CURRENT_FUNCTION);
+    return m_samples.size();
+}
+double EyeBlinkWatcher::last_match() const{
+    ReadSpinLock lg(m_lock, PA_CURRENT_FUNCTION);
+    return m_last_match;
+}
+
+void EyeBlinkWatcher::discard_before(WallClock keep_from){
+    WriteSpinLock lg(m_lock, PA_CURRENT_FUNCTION);
+    auto keep = std::lower_bound(
+        m_samples.begin(), m_samples.end(), keep_from,
+        [](const BlinkMatchSample& sample, WallClock cutoff){
+            return sample.timestamp < cutoff;
+        }
+    );
+    if (keep == m_samples.begin()){
+        return;
+    }
+    m_samples.erase(m_samples.begin(), keep);
+}
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/PokemonBDSP/Inference/Rng/PokemonBDSP_EyeBlinkDetector.h b/SerialPrograms/Source/PokemonBDSP/Inference/Rng/PokemonBDSP_EyeBlinkDetector.h
new file mode 100644
index 0000000000..32c599e5ed
--- /dev/null
+++ b/SerialPrograms/Source/PokemonBDSP/Inference/Rng/PokemonBDSP_EyeBlinkDetector.h
@@ -0,0 +1,95 @@
+/*  BDSP Eye Blink Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonBDSP_EyeBlinkDetector_H
+#define PokemonAutomation_PokemonBDSP_EyeBlinkDetector_H
+
+#include <stddef.h>
+#include <string>
+#include <vector>
+#include <opencv2/core/mat.hpp>
+#include "Common/Cpp/Color.h"
+#include "Common/Cpp/Concurrency/SpinLock.h"
+#include "Common/Cpp/Time.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonBDSP{
+
+
+//  Rescale a search region to the equivalent from a 1080p capture
+const size_t BDSP_TEMPLATE_REFERENCE_HEIGHT = 1080;
+
+
+class EyeBlinkDetector{
+public:
+    EyeBlinkDetector(const ImageViewRGB32& open_eye, ImageFloatBox search_box);
+
+    //  Best normalized cross-correlation of the eye template
+    //  https://en.wikipedia.org/wiki/Cross-correlation#Terminology_in_image_processing
+    double match(const ImageViewRGB32& frame) const;
+
+    const ImageFloatBox& search_box() const{ return m_search_box; }
+    size_t template_width() const{ return (size_t)m_template.cols; }
+    size_t template_height() const{ return (size_t)m_template.rows; }
+
+private:
+    cv::Mat m_template;
+    ImageFloatBox m_search_box;
+};
+
+
+struct BlinkMatchSample{
+    WallClock timestamp;
+    double match;
+};
+
+struct BdspEyeTemplate{
+    //  Path under the PokemonBDSP/Rng resource folder, scene subfolder included.
+    std::string asset;
+    ImageFloatBox box;
+    std::string label;
+};
+
+
+class EyeBlinkWatcher : public VisualInferenceCallback{
+public:
+    EyeBlinkWatcher(
+        std::string label,
+        const ImageViewRGB32& open_eye,
+        ImageFloatBox search_box,
+        Color color = COLOR_RED
+    );
+
+    const std::string& label() const{ return m_label; }
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override;
+
+    std::vector<BlinkMatchSample> samples() const;
+    size_t sample_count() const;
+    double last_match() const;
+
+    void discard_before(WallClock keep_from);
+
+private:
+    std::string m_label;
+    Color m_color;
+    EyeBlinkDetector m_detector;
+
+    mutable SpinLock m_lock;
+    std::vector<BlinkMatchSample> m_samples;
+    double m_last_match;
+};
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/PokemonBDSP/Inference/Rng/PokemonBDSP_SummaryReader.cpp b/SerialPrograms/Source/PokemonBDSP/Inference/Rng/PokemonBDSP_SummaryReader.cpp
new file mode 100644
index 0000000000..48f0ac42f7
--- /dev/null
+++ b/SerialPrograms/Source/PokemonBDSP/Inference/Rng/PokemonBDSP_SummaryReader.cpp
@@ -0,0 +1,163 @@
+/*  BDSP Summary Reader
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <string>
+#include "Common/Cpp/Logging/AbstractLogger.h"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/OCR/OCR_NumberReader.h"
+#include "CommonTools/OCR/OCR_Routines.h"
+#include "Pokemon/Inference/Pokemon_NatureReader.h"
+#include "PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxNatureDetector.h"
+#include "PokemonBDSP_SummaryReader.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonBDSP{
+
+using namespace Pokemon;
+
+
+static const std::vector<OCR::TextColorRange>& MEMO_TEXT_FILTERS(){
+    static std::vector<OCR::TextColorRange> filters{
+        //  Red.
+        {0xff600000, 0xffff8080},
+        {0xff800000, 0xffff6060},
+        //  Black, as a fallback.
+        {0xff000000, 0xff606060},
+        {0xff000000, 0xff909090},
+    };
+    return filters;
+}
+
+
+const LanguageSet& summary_nature_languages(){
+    return NATURE_READER().languages();
+}
+
+
+SummaryReader::SummaryReader(Color color)
+    : m_color(color)
+    , m_box_nature (0.055, 0.190, 0.410, 0.062)
+    , m_box_gender (0.790, 0.094, 0.024, 0.040)
+    , m_box_hp     (0.228, 0.168, 0.080, 0.054)
+    , m_box_attack (0.376, 0.288, 0.048, 0.052)
+    , m_box_defense(0.376, 0.436, 0.048, 0.052)
+    , m_box_spatk  (0.112, 0.288, 0.048, 0.052)
+    , m_box_spdef  (0.112, 0.436, 0.048, 0.052)
+    , m_box_speed  (0.242, 0.543, 0.048, 0.052)
+{}
+
+void SummaryReader::make_memo_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_box_nature, "nature");
+    items.add(m_color, m_box_gender, "gender");
+}
+
+void SummaryReader::make_skills_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_box_gender, "gender");
+    items.add(m_color, m_box_hp, "hp");
+    items.add(m_color, m_box_attack, "atk");
+    items.add(m_color, m_box_defense, "def");
+    items.add(m_color, m_box_spatk, "spatk");
+    items.add(m_color, m_box_spdef, "spdef");
+    items.add(m_color, m_box_speed, "spe");
+}
+
+
+NatureCheckerValue SummaryReader::read_nature(
+    Logger& logger, Language language, const ImageViewRGB32& frame
+) const{
+    if (language == Language::None){
+        return NatureCheckerValue::UnableToDetect;
+    }
+    ImageViewRGB32 line = extract_box_reference(frame, m_box_nature);
+    OCR::StringMatchResult result = NATURE_READER().read_substring(
+        logger, language, line, MEMO_TEXT_FILTERS()
+    );
+    result.clear_beyond_log10p(NatureReader::MAX_LOG10P);
+    if (result.results.size() != 1){
+        return NatureCheckerValue::UnableToDetect;
+    }
+    return NATURE_CHECKER_VALUE_STRINGS().get_enum(result.results.begin()->second.token);
+}
+
+
+BdspGender SummaryReader::read_gender(Logger& logger, const ImageViewRGB32& frame) const{
+    ImageViewRGB32 box = extract_box_reference(frame, m_box_gender);
+
+    size_t blue_pixels = 0;
+    size_t pink_pixels = 0;
+    for (size_t y = 0; y < box.height(); y++){
+        for (size_t x = 0; x < box.width(); x++){
+            uint32_t pixel = box.pixel(x, y);
+            uint32_t red   = (pixel >> 16) & 0xff;
+            uint32_t green = (pixel >> 8) & 0xff;
+            uint32_t blue  = pixel & 0xff;
+            if (blue > red + 40 && blue > green + 20){
+                blue_pixels++;
+            }else if (red > green + 40 && blue > green + 40){
+                pink_pixels++;
+            }
+        }
+    }
+    logger.log("Gender symbol: " + std::to_string(blue_pixels) + " blue pixels, "
+        + std::to_string(pink_pixels) + " pink.");
+    if (blue_pixels == 0 && pink_pixels == 0){
+        return BdspGender::Genderless;
+    }
+    return blue_pixels > pink_pixels ? BdspGender::Male : BdspGender::Female;
+}
+
+
+int16_t SummaryReader::read_stat(
+    Logger& logger, const ImageViewRGB32& frame, const ImageFloatBox& box
+) const{
+    ImageViewRGB32 image = extract_box_reference(frame, box);
+    int value = OCR::read_number_waterfill(logger, image, 0xff000000, 0xff808080);
+    if (value < 5 || value > 40){
+        return -1;
+    }
+    return (int16_t)value;
+}
+
+
+int16_t SummaryReader::read_hp_total(Logger& logger, const ImageViewRGB32& frame) const{
+    ImageViewRGB32 image = extract_box_reference(frame, m_box_hp);
+    int value = OCR::read_number_waterfill(logger, image, 0xff000000, 0xff808080);
+    if (value < 0){
+        return -1;
+    }
+    std::string digits = std::to_string(value);
+    if (digits.size() < 2){
+        //  Only the current HP came through, or nothing did. Either way the total is
+        //  not in there.
+        return -1;
+    }
+    int total = std::stoi(digits.substr(digits.size() - 2));
+    logger.log("HP read as \"" + digits + "\", taking " + std::to_string(total)
+        + " as the total.");
+    if (total < 15 || total > 30){
+        return -1;
+    }
+    return (int16_t)total;
+}
+
+
+StatReads SummaryReader::read_stats(Logger& logger, const ImageViewRGB32& frame) const{
+    StatReads ret;
+    ret.hp      = read_hp_total(logger, frame);
+    ret.attack  = read_stat(logger, frame, m_box_attack);
+    ret.defense = read_stat(logger, frame, m_box_defense);
+    ret.spatk   = read_stat(logger, frame, m_box_spatk);
+    ret.spdef   = read_stat(logger, frame, m_box_spdef);
+    ret.speed   = read_stat(logger, frame, m_box_speed);
+    return ret;
+}
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/PokemonBDSP/Inference/Rng/PokemonBDSP_SummaryReader.h b/SerialPrograms/Source/PokemonBDSP/Inference/Rng/PokemonBDSP_SummaryReader.h
new file mode 100644
index 0000000000..154ff5b224
--- /dev/null
+++ b/SerialPrograms/Source/PokemonBDSP/Inference/Rng/PokemonBDSP_SummaryReader.h
@@ -0,0 +1,66 @@
+/*  BDSP Summary Reader
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonBDSP_SummaryReader_H
+#define PokemonAutomation_PokemonBDSP_SummaryReader_H
+
+#include <stdint.h>
+#include "Common/Cpp/Color.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/Language.h"
+#include "Pokemon/Pokemon_BdspRng.h"
+#include "Pokemon/Pokemon_NatureChecker.h"
+#include "Pokemon/Pokemon_StatsCalculation.h"
+
+namespace PokemonAutomation{
+    class Logger;
+    class ImageViewRGB32;
+    class VideoOverlaySet;
+namespace NintendoSwitch{
+namespace PokemonBDSP{
+
+
+const LanguageSet& summary_nature_languages();
+
+
+class SummaryReader{
+public:
+    SummaryReader(Color color = COLOR_RED);
+
+    void make_memo_overlays(VideoOverlaySet& items) const;
+    void make_skills_overlays(VideoOverlaySet& items) const;
+
+    Pokemon::NatureCheckerValue read_nature(
+        Logger& logger, Language language, const ImageViewRGB32& frame
+    ) const;
+
+    Pokemon::BdspGender read_gender(Logger& logger, const ImageViewRGB32& frame) const;
+
+    Pokemon::StatReads read_stats(Logger& logger, const ImageViewRGB32& frame) const;
+
+private:
+    int16_t read_stat(
+        Logger& logger, const ImageViewRGB32& frame, const ImageFloatBox& box
+    ) const;
+
+    int16_t read_hp_total(Logger& logger, const ImageViewRGB32& frame) const;
+
+    Color m_color;
+    ImageFloatBox m_box_nature;
+    ImageFloatBox m_box_gender;
+    ImageFloatBox m_box_hp;
+    ImageFloatBox m_box_attack;
+    ImageFloatBox m_box_defense;
+    ImageFloatBox m_box_spatk;
+    ImageFloatBox m_box_spdef;
+    ImageFloatBox m_box_speed;
+};
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/PokemonBDSP/Inference/ShinyDetection/PokemonBDSP_ShinyEncounterDetector.cpp b/SerialPrograms/Source/PokemonBDSP/Inference/ShinyDetection/PokemonBDSP_ShinyEncounterDetector.cpp
index 3d2fc722d0..fafde2af68 100644
--- a/SerialPrograms/Source/PokemonBDSP/Inference/ShinyDetection/PokemonBDSP_ShinyEncounterDetector.cpp
+++ b/SerialPrograms/Source/PokemonBDSP/Inference/ShinyDetection/PokemonBDSP_ShinyEncounterDetector.cpp
@@ -1,24 +1,25 @@
 /*  Shiny Encounter Detector
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include <sstream>
 #include "Common/Cpp/PrettyPrint.h"
 #include "CommonFramework/Globals.h"
 #include "CommonFramework/Exceptions/OperationFailedException.h"
-#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
-#include "CommonFramework/Notifications/ProgramInfo.h"
 #include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
 #include "CommonFramework/Tools/ErrorDumper.h"
 #include "CommonFramework/Tools/ProgramEnvironment.h"
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonTools/Async/InferenceRoutines.h"
 #include "PokemonBDSP/PokemonBDSP_Settings.h"
 #include "PokemonBDSP/Inference/Sounds/PokemonBDSP_ShinySoundDetector.h"
 #include "PokemonBDSP_ShinyEncounterDetector.h"
 
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
 namespace PokemonAutomation{
 namespace NintendoSwitch{
 namespace PokemonBDSP{
@@ -50,6 +51,8 @@ ShinyEncounterTracker::ShinyEncounterTracker(
 //    , m_overlay(overlay)
     , m_battle_menu(battle_type)
     , m_dialog_tracker(logger, m_dialog_detector)
+    , m_wild_animation_end_timestamp(WallClock::min())
+    , m_your_animation_start_timestamp(WallClock::min())
     , m_box_wild_left(0.40, 0.02, 0.20, 0.48)
     , m_box_wild_right(0.70, 0.02, 0.20, 0.48)
     , m_sparkle_tracker_wild(logger, overlay, m_sparkles_wild, {0.4, 0.02, 0.60, 0.93})
@@ -96,7 +99,7 @@ bool ShinyEncounterTracker::process_frame(const VideoSnapshot& frame){
     case EncounterState::BEFORE_ANYTHING:
         break;
     case EncounterState::WILD_ANIMATION:{
-        // Update the timestamp that records the end of wild animation
+        //  Update the timestamp that records the end of wild animation
         m_wild_animation_end_timestamp = frame.timestamp;
 
         m_sparkle_tracker_wild.process_frame(frame);
@@ -122,8 +125,10 @@ bool ShinyEncounterTracker::process_frame(const VideoSnapshot& frame){
         break;
     }
     case EncounterState::YOUR_ANIMATION:
-        // Update the timestamp that records the end of player pokemon animation
-        m_your_animation_end_timestamp = frame.timestamp;
+        //  Update the timestamp that records the start of player pokemon animation
+        if (m_your_animation_start_timestamp == WallClock::min()){
+            m_your_animation_start_timestamp = frame.timestamp;
+        }
 
         m_sparkle_tracker_wild.clear_boxes();
         m_sparkle_tracker_own.process_frame(frame);
@@ -169,31 +174,29 @@ void determine_shiny_status(
             alpha_wild_overall += DIALOG_ALPHA;
         }
     }
-    
+
+#if 0
+    cout << "Wild End: " << std::chrono::duration_cast<Milliseconds>(tracker.wild_animation_end_timestmap() - tracker.m_start_time) << endl;
+    cout << "Your Start: " << std::chrono::duration_cast<Milliseconds>(tracker.your_animation_start_timestamp() - tracker.m_start_time) << endl;
+    for (WallClock time : shiny_sound_timestamps){
+        cout << "Shiny Sound: " << std::chrono::duration_cast<Milliseconds>(time - tracker.m_start_time) << endl;
+    }
+#endif
+
     bool wild_shiny_sound_detected = false;
     bool own_shiny_sound_detected = false;
-    for(const WallClock& timestamp: shiny_sound_timestamps){
-        const WallClock& wild_end = tracker.wild_animtion_end_timestmap();
-        const WallClock& own_end = tracker.your_animation_end_timestamp();
-
-        auto get_timestamp_distance = [](const WallClock& t0, const WallClock& t1) -> std::chrono::milliseconds{
-            if (t0 > t1){
-                return std::chrono::duration_cast<std::chrono::milliseconds>(t0 - t1);
-            }
-            else{
-                return std::chrono::duration_cast<std::chrono::milliseconds>(t1 - t0);
-            }
-        };
-
-        const auto dist_to_wild = get_timestamp_distance(timestamp, wild_end);
-        const auto dist_to_own = get_timestamp_distance(timestamp, own_end);
-        if (dist_to_wild < dist_to_own){
-            wild_shiny_sound_detected = true;
-        }else if (dist_to_own < dist_to_wild){
-            own_shiny_sound_detected = true;
-        }else{
-            throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, env.logger(),
+    for (const WallClock& timestamp: shiny_sound_timestamps){
+        const WallClock& wild_end = tracker.wild_animation_end_timestmap();
+        const WallClock& own_start = tracker.your_animation_start_timestamp();
+
+        bool wild_shiny = timestamp < wild_end + Milliseconds(500);
+        bool own_shiny = timestamp >= own_start;
+
+        wild_shiny_sound_detected |= wild_shiny;
+        own_shiny_sound_detected |= own_shiny;
+        if (!wild_shiny && !own_shiny){
+            throw_and_log<OperationFailedException>(
+                env.logger(), ErrorReportMode::SEND_ERROR_REPORT,
                 "Wrong shiny sound timing found."
             );
         }
@@ -260,7 +263,7 @@ void determine_shiny_status(
 
 void detect_shiny_battle(
     ProgramEnvironment& env,
-    ConsoleHandle& console, CancellableScope& scope,
+    VideoStream& stream, CancellableScope& scope,
     DoublesShinyDetection& wild_result,
     ShinyDetectionResult& your_result,
     EventNotificationOption& settings,
@@ -269,34 +272,35 @@ void detect_shiny_battle(
     bool use_shiny_sound
 ){
     BattleType battle_type = type.full_battle_menu ? BattleType::STANDARD : BattleType::STARTER;
-    ShinyEncounterTracker tracker(console, console, battle_type);
+    ShinyEncounterTracker tracker(stream.logger(), stream.overlay(), battle_type);
 
     std::unique_ptr<ShinySoundDetector> shiny_sound_detector;
     std::vector<WallClock> shiny_sound_timestamps; // the times where shiny sound is detected
     
     if (use_shiny_sound){
-        shiny_sound_detector = std::make_unique<ShinySoundDetector>(console, [&shiny_sound_timestamps](float error_coefficient) -> bool{
-            //  Warning: This callback will be run from a different thread than this function.
-            //  When this lambda function is called, a shiny sound is detected.
-            //  Mark this by `shiny_sound_timestamps`.
-            shiny_sound_timestamps.emplace_back(current_time());
-            //  This lambda function always returns false. It tells the shiny sound detector to always return false
-            //  in ShinySoundDetector::process_spectrums() when a shiny sound is found, so that it won't stop
-            //  ShinyEncounterTracker tracker from finish running.
-            
-            return false;
-        });
+        shiny_sound_detector = std::make_unique<ShinySoundDetector>(
+            stream.logger(),
+            [&shiny_sound_timestamps](float error_coefficient) -> bool{
+                //  Warning: This callback will be run from a different thread than this function.
+                //  When this lambda function is called, a shiny sound is detected.
+                //  Mark this by `shiny_sound_timestamps`.
+                shiny_sound_timestamps.emplace_back(current_time());
+                //  This lambda function always returns false. It tells the shiny sound detector to always return false
+                //  in ShinySoundDetector::process_spectrums() when a shiny sound is found, so that it won't stop
+                //  ShinyEncounterTracker tracker from finish running.
+
+                return false;
+            }
+        );
     }
 
     std::vector<PeriodicInferenceCallback> callbacks = {{tracker}};
     if (use_shiny_sound){
         callbacks.emplace_back(*shiny_sound_detector);
     }
-    int result = wait_until(
-        console, scope, timeout, callbacks
-    );
+    int result = wait_until(stream, scope, timeout, callbacks);
     if (result < 0){
-        console.log("ShinyDetector: Battle menu not found after timeout.", COLOR_RED);
+        stream.log("ShinyDetector: Battle menu not found after timeout.", COLOR_RED);
         return;
     }
     wild_result.best_screenshot = tracker.sparkles_wild_overall().best_image();
diff --git a/SerialPrograms/Source/PokemonBDSP/Inference/ShinyDetection/PokemonBDSP_ShinyEncounterDetector.h b/SerialPrograms/Source/PokemonBDSP/Inference/ShinyDetection/PokemonBDSP_ShinyEncounterDetector.h
index 43749c8e77..a0f9fbe403 100644
--- a/SerialPrograms/Source/PokemonBDSP/Inference/ShinyDetection/PokemonBDSP_ShinyEncounterDetector.h
+++ b/SerialPrograms/Source/PokemonBDSP/Inference/ShinyDetection/PokemonBDSP_ShinyEncounterDetector.h
@@ -1,28 +1,26 @@
 /*  Shiny Encounter Detector
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifndef PokemonAutomation_PokemonBDSP_ShinyEncounterDetector_H
 #define PokemonAutomation_PokemonBDSP_ShinyEncounterDetector_H
 
-#include "CommonFramework/Notifications/ProgramInfo.h"
 #include "CommonFramework/Notifications/EventNotificationOption.h"
+#include "CommonFramework/Tools/VideoStream.h"
 #include "Pokemon/Pokemon_DataTypes.h"
-#include "Pokemon/Options/Pokemon_EncounterBotOptions.h"
 #include "PokemonBDSP/Inference/PokemonBDSP_DialogDetector.h"
-#include "PokemonSwSh/Inference/Battles/PokemonSwSh_BattleDialogTracker.h"
 #include "PokemonBDSP/Inference/Battles/PokemonBDSP_BattleMenuDetector.h"
+#include "VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleDialogTracker.h"
 #include "PokemonBDSP_ShinySparkleSet.h"
 
 namespace PokemonAutomation{
     class CancellableScope;
-    class BotBaseContext;
-    class ConsoleHandle;
     class ProgramEnvironment;
 namespace NintendoSwitch{
 namespace PokemonBDSP{
+
 using namespace Pokemon;
 
 
@@ -63,8 +61,8 @@ class ShinyEncounterTracker : public VisualInferenceCallback{
     const ShinySparkleAggregator& sparkles_wild_right() const{ return m_best_wild_right; }
     const ShinySparkleAggregator& sparkles_own() const{ return m_best_own; }
 
-    const WallClock& wild_animtion_end_timestmap() const { return m_wild_animation_end_timestamp; }
-    const WallClock& your_animation_end_timestamp() const { return m_your_animation_end_timestamp; }
+    const WallClock& wild_animation_end_timestmap() const { return m_wild_animation_end_timestamp; }
+    const WallClock& your_animation_start_timestamp() const { return m_your_animation_start_timestamp; }
 
     virtual void make_overlays(VideoOverlaySet& items) const override;
     virtual bool process_frame(const VideoSnapshot& frame) override;
@@ -81,7 +79,7 @@ class ShinyEncounterTracker : public VisualInferenceCallback{
     BattleDialogDetector m_dialog_detector;
     EncounterDialogTracker m_dialog_tracker;
     WallClock m_wild_animation_end_timestamp;
-    WallClock m_your_animation_end_timestamp;
+    WallClock m_your_animation_start_timestamp;
 
     ImageFloatBox m_box_wild_left;
     ImageFloatBox m_box_wild_right;
@@ -121,7 +119,7 @@ class ShinyEncounterTracker : public VisualInferenceCallback{
 // When a shiny sound is detected, it adds 5.0 to the heighest overall alpha value.
 void detect_shiny_battle(
     ProgramEnvironment& env,
-    ConsoleHandle& console, CancellableScope& scope,
+    VideoStream& stream, CancellableScope& scope,
     DoublesShinyDetection& wild_result,
     ShinyDetectionResult& your_result,
     EventNotificationOption& settings,
diff --git a/SerialPrograms/Source/PokemonBDSP/Inference/ShinyDetection/PokemonBDSP_ShinySparkleSet.cpp b/SerialPrograms/Source/PokemonBDSP/Inference/ShinyDetection/PokemonBDSP_ShinySparkleSet.cpp
index 05281ddf8a..3144bb0895 100644
--- a/SerialPrograms/Source/PokemonBDSP/Inference/ShinyDetection/PokemonBDSP_ShinySparkleSet.cpp
+++ b/SerialPrograms/Source/PokemonBDSP/Inference/ShinyDetection/PokemonBDSP_ShinySparkleSet.cpp
@@ -1,15 +1,15 @@
 /*  Shiny Sparkle Set
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include "Common/Cpp/PrettyPrint.h"
-#include "Kernels/Waterfill/Kernels_Waterfill.h"
+#include "Common/Cpp/Concurrency/SpinLock.h"
 #include "Kernels/Waterfill/Kernels_Waterfill_Session.h"
-#include "CommonFramework/ImageTools/BinaryImage_FilterRgb32.h"
-#include "CommonFramework/VideoPipeline/VideoOverlay.h"
-#include "PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_SparkleDetectorRadial.h"
+#include "CommonFramework/Tools/GlobalThreadPools.h"
+#include "CommonTools/Images/BinaryImage_FilterRgb32.h"
+#include "VideoGames/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_SparkleDetectorRadial.h"
 #include "PokemonBDSP_ShinySparkleSet.h"
 
 namespace PokemonAutomation{
@@ -86,12 +86,12 @@ void ShinySparkleSetBDSP::update_alphas(){
 
 
 
-ShinySparkleSetBDSP find_sparkles(WaterfillSession& session){
+ShinySparkleSetBDSP find_sparkles(size_t screen_area, WaterfillSession& session){
     ShinySparkleSetBDSP sparkles;
     auto finder = session.make_iterator(20);
     WaterfillObject object;
     while (finder->find_next(object, true)){
-        PokemonSwSh::RadialSparkleDetector radial_sparkle(object);
+        PokemonSwSh::RadialSparkleDetector radial_sparkle(screen_area, object);
         if (radial_sparkle.is_ball()){
             sparkles.balls.emplace_back(object.min_x, object.min_y, object.max_x, object.max_y);
             continue;
@@ -103,7 +103,7 @@ ShinySparkleSetBDSP find_sparkles(WaterfillSession& session){
     }
     return sparkles;
 }
-void ShinySparkleSetBDSP::read_from_image(const ImageViewRGB32& image){
+void ShinySparkleSetBDSP::read_from_image(size_t screen_area, const ImageViewRGB32& image){
     clear();
     if (!image){
         return;
@@ -118,19 +118,25 @@ void ShinySparkleSetBDSP::read_from_image(const ImageViewRGB32& image){
             {0xff909000, 0xffffffff},
         }
     );
-    auto session = make_WaterfillSession();
 
+    SpinLock lock;
     double best_alpha = 0;
-    for (PackedBinaryMatrix& matrix : matrices){
-        session->set_source(matrix);
-        ShinySparkleSetBDSP sparkles = find_sparkles(*session);
-        sparkles.update_alphas();
-        double alpha = sparkles.alpha_overall();
-        if (best_alpha < alpha){
-            best_alpha = alpha;
-            *this = std::move(sparkles);
-        }
-    }
+    GlobalThreadPools::computation_realtime().run_in_parallel(
+        [&](size_t index){
+            auto session = make_WaterfillSession();
+            session->set_source(matrices[index]);
+            ShinySparkleSetBDSP sparkles = find_sparkles(screen_area, *session);
+            sparkles.update_alphas();
+            double alpha = sparkles.alpha_overall();
+
+            WriteSpinLock lg(lock);
+            if (best_alpha < alpha){
+                best_alpha = alpha;
+                *this = std::move(sparkles);
+            }
+        },
+        0, matrices.size(), 1
+    );
 }
 
 
diff --git a/SerialPrograms/Source/PokemonBDSP/Inference/ShinyDetection/PokemonBDSP_ShinySparkleSet.h b/SerialPrograms/Source/PokemonBDSP/Inference/ShinyDetection/PokemonBDSP_ShinySparkleSet.h
index 4d282e257e..cd28f0a9a8 100644
--- a/SerialPrograms/Source/PokemonBDSP/Inference/ShinyDetection/PokemonBDSP_ShinySparkleSet.h
+++ b/SerialPrograms/Source/PokemonBDSP/Inference/ShinyDetection/PokemonBDSP_ShinySparkleSet.h
@@ -1,12 +1,13 @@
 /*  Shiny Sparkle Set
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifndef PokemonAutomation_PokemonBDSP_ShinySparkleSet_H
 #define PokemonAutomation_PokemonBDSP_ShinySparkleSet_H
 
+#include <memory>
 #include "CommonFramework/ImageTools/ImageBoxes.h"
 #include "Pokemon/Pokemon_ShinySparkleSet.h"
 
@@ -29,7 +30,7 @@ class ShinySparkleSetBDSP : public Pokemon::ShinySparkleSet{
     ShinySparkleSetBDSP extract_subbox(const ImagePixelBox& subbox) const;
 
     virtual std::string to_str() const override;
-    virtual void read_from_image(const ImageViewRGB32& image) override;
+    virtual void read_from_image(size_t screen_area, const ImageViewRGB32& image) override;
 
     virtual void draw_boxes(
         VideoOverlaySet& overlays,
diff --git a/SerialPrograms/Source/PokemonBDSP/Inference/Sounds/PokemonBDSP_ShinySoundDetector.cpp b/SerialPrograms/Source/PokemonBDSP/Inference/Sounds/PokemonBDSP_ShinySoundDetector.cpp
index 94dc598ea0..b11832b7c8 100644
--- a/SerialPrograms/Source/PokemonBDSP/Inference/Sounds/PokemonBDSP_ShinySoundDetector.cpp
+++ b/SerialPrograms/Source/PokemonBDSP/Inference/Sounds/PokemonBDSP_ShinySoundDetector.cpp
@@ -1,12 +1,11 @@
 /*  Shiny Sound Detector
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include "CommonFramework/Inference/SpectrogramMatcher.h"
-#include "CommonFramework/Inference/AudioTemplateCache.h"
-#include "CommonFramework/Tools/ConsoleHandle.h"
+#include "CommonTools/Audio/SpectrogramMatcher.h"
+#include "CommonTools/Audio/AudioTemplateCache.h"
 #include "PokemonBDSP/PokemonBDSP_Settings.h"
 #include "PokemonBDSP_ShinySoundDetector.h"
 
@@ -15,9 +14,15 @@ namespace NintendoSwitch{
 namespace PokemonBDSP{
 
 
-ShinySoundDetector::ShinySoundDetector(ConsoleHandle& console, DetectedCallback detected_callback)
+ShinySoundDetector::ShinySoundDetector(Logger& logger, DetectedCallback detected_callback)
     // Use a yellow as the detection color because the shiny animation is yellow.
-    : AudioPerSpectrumDetectorBase("ShinySoundDetector", "Shiny sound", COLOR_YELLOW, console, detected_callback)
+    : AudioPerSpectrumDetectorBase(
+        logger,
+        "ShinySoundDetector",
+        "Shiny sound",
+        COLOR_YELLOW,
+        detected_callback
+    )
 {}
 
 
diff --git a/SerialPrograms/Source/PokemonBDSP/Inference/Sounds/PokemonBDSP_ShinySoundDetector.h b/SerialPrograms/Source/PokemonBDSP/Inference/Sounds/PokemonBDSP_ShinySoundDetector.h
index 78341ffc41..5c3b19e6f7 100644
--- a/SerialPrograms/Source/PokemonBDSP/Inference/Sounds/PokemonBDSP_ShinySoundDetector.h
+++ b/SerialPrograms/Source/PokemonBDSP/Inference/Sounds/PokemonBDSP_ShinySoundDetector.h
@@ -1,13 +1,13 @@
 /*  Shiny Sound Detector
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifndef PokemonAutomation_PokemonBDSP_ShinySoundDetector_H
 #define PokemonAutomation_PokemonBDSP_ShinySoundDetector_H
 
-#include "CommonFramework/Inference/AudioPerSpectrumDetectorBase.h"
+#include "CommonTools/Audio/AudioPerSpectrumDetectorBase.h"
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
@@ -17,7 +17,7 @@ namespace PokemonBDSP{
 class ShinySoundDetector : public AudioPerSpectrumDetectorBase{
 public:
     //  Warning: The callback will be called from the audio inference thread.
-    ShinySoundDetector(ConsoleHandle& console, DetectedCallback detected_callback);
+    ShinySoundDetector(Logger& logger, DetectedCallback detected_callback);
 
     // Implement AudioPerSpectrumDetectorBase::get_score_threshold()
     virtual float get_score_threshold() const override;
diff --git a/SerialPrograms/Source/PokemonBDSP/Options/EncounterFilter/PokemonBDSP_EncounterFilterEnums.cpp b/SerialPrograms/Source/PokemonBDSP/Options/EncounterFilter/PokemonBDSP_EncounterFilterEnums.cpp
index 03378c314e..284c30f2e5 100644
--- a/SerialPrograms/Source/PokemonBDSP/Options/EncounterFilter/PokemonBDSP_EncounterFilterEnums.cpp
+++ b/SerialPrograms/Source/PokemonBDSP/Options/EncounterFilter/PokemonBDSP_EncounterFilterEnums.cpp
@@ -1,6 +1,6 @@
 /*  Encounter Filter
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -12,12 +12,12 @@ namespace PokemonBDSP{
 
 
 
-const EnumDatabase<ShinyFilter>& ShinyFilter_Database(){
-    static const EnumDatabase<ShinyFilter> database({
+const EnumDropdownDatabase<ShinyFilter>& ShinyFilter_Database(){
+    static const EnumDropdownDatabase<ShinyFilter> database({
         {ShinyFilter::ANYTHING,     "anything",     "Anything"},
         {ShinyFilter::NOT_SHINY,    "not-shiny",    "Not Shiny"},
         {ShinyFilter::SHINY,        "shiny",        "Shiny"},
-//        {ShinyFilter::NOTHING,      "nothing",      "Nothing"},
+        {ShinyFilter::NOTHING,      "nothing",      "Nothing"},
     });
     return database;
 }
diff --git a/SerialPrograms/Source/PokemonBDSP/Options/EncounterFilter/PokemonBDSP_EncounterFilterEnums.h b/SerialPrograms/Source/PokemonBDSP/Options/EncounterFilter/PokemonBDSP_EncounterFilterEnums.h
index a90fe43e54..5c27a01f1b 100644
--- a/SerialPrograms/Source/PokemonBDSP/Options/EncounterFilter/PokemonBDSP_EncounterFilterEnums.h
+++ b/SerialPrograms/Source/PokemonBDSP/Options/EncounterFilter/PokemonBDSP_EncounterFilterEnums.h
@@ -1,6 +1,6 @@
 /*  Encounter Filter
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -10,7 +10,7 @@
 #include <string>
 #include <vector>
 #include <map>
-#include "PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterEnums.h"
+#include "VideoGames/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterEnums.h"
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
@@ -33,14 +33,14 @@ enum class ShinyFilter{
     SHINY,
     NOTHING,
 };
-const EnumDatabase<ShinyFilter>& ShinyFilter_Database();
+const EnumDropdownDatabase<ShinyFilter>& ShinyFilter_Database();
 
 class ShinyFilterCell : public EnumDropdownCell<ShinyFilter>{
 public:
     ShinyFilterCell()
         : EnumDropdownCell<ShinyFilter>(
             ShinyFilter_Database(),
-            LockWhileRunning::LOCKED,
+            LockMode::LOCK_WHILE_RUNNING,
             ShinyFilter::ANYTHING
         )
     {}
diff --git a/SerialPrograms/Source/PokemonBDSP/Options/EncounterFilter/PokemonBDSP_EncounterFilterOption.cpp b/SerialPrograms/Source/PokemonBDSP/Options/EncounterFilter/PokemonBDSP_EncounterFilterOption.cpp
index 7578a5e2f2..a46b0bd623 100644
--- a/SerialPrograms/Source/PokemonBDSP/Options/EncounterFilter/PokemonBDSP_EncounterFilterOption.cpp
+++ b/SerialPrograms/Source/PokemonBDSP/Options/EncounterFilter/PokemonBDSP_EncounterFilterOption.cpp
@@ -1,69 +1,34 @@
 /*  Encounter Filter
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include "Common/Cpp/Json/JsonValue.h"
-#include "Common/Cpp/Json/JsonObject.h"
-#include "CommonFramework/Globals.h"
-#include "Pokemon/Pokemon_Strings.h"
 #include "PokemonBDSP_EncounterFilterEnums.h"
 #include "PokemonBDSP_EncounterFilterOption.h"
-#include "PokemonBDSP_EncounterFilterWidget.h"
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
 namespace PokemonBDSP{
-    using namespace Pokemon;
 
 
 
-EncounterFilterOption::EncounterFilterOption(bool enable_overrides)
-    : m_enable_overrides(enable_overrides)
-    , m_shiny_filter_default(ShinyFilter::SHINY)
-    , m_shiny_filter_current(m_shiny_filter_default)
-{}
-void EncounterFilterOption::load_json(const JsonValue& json){
-    using namespace Pokemon;
 
-    const JsonObject* obj = json.get_object();
-    if (obj == nullptr){
-        return;
-    }
-
-    const std::string* str = obj->get_string("ShinyFilter");
-    if (str != nullptr){
-        auto iter = ShinyFilter_MAP.find(*str);
-        if (iter != ShinyFilter_MAP.end()){
-            m_shiny_filter_current.store(iter->second, std::memory_order_release);
-        }
-    }
-
-    if (m_enable_overrides){
-        const JsonValue* array = obj->get_value("Overrides");
-        if (array != nullptr){
-            m_table.load_json(*array);
-        }
+EncounterFilterOption2::EncounterFilterOption2(bool enable_overrides)
+    : BatchOption(LockMode::UNLOCK_WHILE_RUNNING)
+    , SHINY_FILTER(
+        "<b>Stop on:</b>",
+        ShinyFilter_Database(),
+        LockMode::UNLOCK_WHILE_RUNNING,
+        ShinyFilter::SHINY
+    )
+{
+    PA_ADD_OPTION(SHINY_FILTER);
+    if (enable_overrides){
+        PA_ADD_OPTION(FILTER_TABLE);
     }
 }
-JsonValue EncounterFilterOption::to_json() const{
-    JsonObject obj;
-    obj["ShinyFilter"] = ShinyFilter_NAMES[(size_t)m_shiny_filter_current.load(std::memory_order_acquire)];
 
-    if (m_enable_overrides){
-        obj["Overrides"] = m_table.to_json();
-    }
-
-    return obj;
-}
-void EncounterFilterOption::restore_defaults(){
-    m_shiny_filter_current.store(m_shiny_filter_default, std::memory_order_release);
-    m_table.restore_defaults();
-}
-ConfigWidget* EncounterFilterOption::make_QtWidget(QWidget& parent){
-    return new EncounterFilterWidget(parent, *this);
-}
 
 
 
diff --git a/SerialPrograms/Source/PokemonBDSP/Options/EncounterFilter/PokemonBDSP_EncounterFilterOption.h b/SerialPrograms/Source/PokemonBDSP/Options/EncounterFilter/PokemonBDSP_EncounterFilterOption.h
index c361e24eb0..28d207c791 100644
--- a/SerialPrograms/Source/PokemonBDSP/Options/EncounterFilter/PokemonBDSP_EncounterFilterOption.h
+++ b/SerialPrograms/Source/PokemonBDSP/Options/EncounterFilter/PokemonBDSP_EncounterFilterOption.h
@@ -1,13 +1,14 @@
 /*  Encounter Filter
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifndef PokemonAutomation_PokemonBDSP_EncounterFilterOption_H
 #define PokemonAutomation_PokemonBDSP_EncounterFilterOption_H
 
-#include <atomic>
+//#include <atomic>
+#include "Common/Cpp/Options/BatchOption.h"
 #include "PokemonBDSP_EncounterFilterOverride.h"
 
 namespace PokemonAutomation{
@@ -15,35 +16,17 @@ namespace NintendoSwitch{
 namespace PokemonBDSP{
 
 
-class EncounterFilterOption : public ConfigOption{
-public:
-    EncounterFilterOption(bool enable_overrides);
-
-    ShinyFilter shiny_filter() const{ return m_shiny_filter_current.load(std::memory_order_acquire); }
-    std::vector<std::unique_ptr<EncounterFilterOverride>> copy_snapshot() const{
-        return m_table.copy_snapshot();
-    }
-
-    virtual void load_json(const JsonValue& json) override;
-    virtual JsonValue to_json() const override;
-
-    virtual void restore_defaults() override;
-
-    virtual ConfigWidget* make_QtWidget(QWidget& parent) override;
 
-private:
-    friend class EncounterFilterWidget;
-
-    const bool m_enable_overrides;
-
-    const ShinyFilter m_shiny_filter_default;
-    std::atomic<ShinyFilter> m_shiny_filter_current;
+class EncounterFilterOption2 : public BatchOption{
+public:
+    EncounterFilterOption2(bool enable_overrides);
 
-    EncounterFilterTable m_table;
+public:
+    EnumDropdownOption<ShinyFilter> SHINY_FILTER;
+    EncounterFilterTable FILTER_TABLE;
 };
 
 
-
 }
 }
 }
diff --git a/SerialPrograms/Source/PokemonBDSP/Options/EncounterFilter/PokemonBDSP_EncounterFilterOverride.cpp b/SerialPrograms/Source/PokemonBDSP/Options/EncounterFilter/PokemonBDSP_EncounterFilterOverride.cpp
index 749230cd8c..72002bc967 100644
--- a/SerialPrograms/Source/PokemonBDSP/Options/EncounterFilter/PokemonBDSP_EncounterFilterOverride.cpp
+++ b/SerialPrograms/Source/PokemonBDSP/Options/EncounterFilter/PokemonBDSP_EncounterFilterOverride.cpp
@@ -1,6 +1,6 @@
 /*  Encounter Filter
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -55,20 +55,24 @@ std::string EncounterActionFull::to_str() const{
 EncounterFilterOverride::~EncounterFilterOverride(){
     action.remove_listener(*this);
 }
-EncounterFilterOverride::EncounterFilterOverride()
-    : pokemon(ALL_POKEMON_NAMES(), LockWhileRunning::LOCKED, "starly")
+EncounterFilterOverride::EncounterFilterOverride(EditableTableOption& parent_table)
+    : EditableTableRow(parent_table)
+    , pokemon(ALL_POKEMON_NAMES(), LockMode::UNLOCK_WHILE_RUNNING, "starly")
+    , pokeball(LockMode::UNLOCK_WHILE_RUNNING)
+    , ball_limit(LockMode::UNLOCK_WHILE_RUNNING, 40, 1, 999)
 {
-    PA_ADD_OPTION(action);
-    PA_ADD_OPTION(pokeball);
     PA_ADD_OPTION(pokemon);
     PA_ADD_OPTION(shininess);
+    PA_ADD_OPTION(action);
+    PA_ADD_OPTION(pokeball);
+    PA_ADD_OPTION(ball_limit);
     action.add_listener(*this);
 }
 void EncounterFilterOverride::load_json(const JsonValue& json){
     EditableTableRow::load_json(json);
 
     //  Parse old format for backwards compatibility.
-    const JsonObject* obj = json.get_object();
+    const JsonObject* obj = json.to_object();
     if (obj == nullptr){
         return;
     }
@@ -92,14 +96,15 @@ void EncounterFilterOverride::load_json(const JsonValue& json){
     }
 }
 std::unique_ptr<EditableTableRow> EncounterFilterOverride::clone() const{
-    std::unique_ptr<EncounterFilterOverride> ret(new EncounterFilterOverride());
+    std::unique_ptr<EncounterFilterOverride> ret(new EncounterFilterOverride(parent()));
     ret->action.set(action);
     ret->pokeball.set_by_index(pokeball.index());
     ret->pokemon.set_by_index(pokemon.index());
     ret->shininess.set(shininess);
+    ret->ball_limit.set(ball_limit);
     return ret;
 }
-void EncounterFilterOverride::value_changed(){
+void EncounterFilterOverride::on_config_value_changed(void* object){
     switch ((EncounterAction)action){
     case EncounterAction::StopProgram:
     case EncounterAction::RunAway:
@@ -122,15 +127,16 @@ EncounterFilterTable::EncounterFilterTable()
         "The game language must be properly set to read " + STRING_POKEMON + " names. "
         "If multiple overrides apply and are conflicting, the program will stop." +
         "<br>Auto-catching only applies in single battles. The program will stop if asked to auto-catch in a double-battle.",
-        LockWhileRunning::LOCKED
+        LockMode::UNLOCK_WHILE_RUNNING
     )
 {}
 std::vector<std::string> EncounterFilterTable::make_header() const{
     return std::vector<std::string>{
-        "Action",
-        STRING_POKEBALL,
         STRING_POKEMON,
         "Shininess",
+        "Action",
+        STRING_POKEBALL,
+        "Ball Limit"
     };
 }
 
diff --git a/SerialPrograms/Source/PokemonBDSP/Options/EncounterFilter/PokemonBDSP_EncounterFilterOverride.h b/SerialPrograms/Source/PokemonBDSP/Options/EncounterFilter/PokemonBDSP_EncounterFilterOverride.h
index 0803c05e6d..6f1d6b82b2 100644
--- a/SerialPrograms/Source/PokemonBDSP/Options/EncounterFilter/PokemonBDSP_EncounterFilterOverride.h
+++ b/SerialPrograms/Source/PokemonBDSP/Options/EncounterFilter/PokemonBDSP_EncounterFilterOverride.h
@@ -1,14 +1,15 @@
 /*  Encounter Filter
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifndef PokemonAutomation_PokemonBDSP_EncounterFilterOverride_H
 #define PokemonAutomation_PokemonBDSP_EncounterFilterOverride_H
 
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
 #include "Common/Cpp/Options/EditableTableOption.h"
-#include "PokemonSwSh/Options/PokemonSwSh_BallSelectOption.h"
+#include "VideoGames/PokemonSwSh/Options/PokemonSwSh_BallSelectOption.h"
 #include "PokemonBDSP_EncounterFilterEnums.h"
 
 namespace PokemonAutomation{
@@ -19,6 +20,7 @@ namespace PokemonBDSP{
 struct EncounterActionFull{
     EncounterAction action;
     std::string pokeball_slug;
+    uint16_t ball_limit = 999;
 
     bool operator==(const EncounterActionFull& x) const;
     bool operator!=(const EncounterActionFull& x) const;
@@ -27,21 +29,21 @@ struct EncounterActionFull{
 
 
 
-
 class EncounterFilterOverride : public EditableTableRow, private ConfigOption::Listener{
 public:
     ~EncounterFilterOverride();
-    EncounterFilterOverride();
+    EncounterFilterOverride(EditableTableOption& parent_table);
     virtual void load_json(const JsonValue& json) override;
     virtual std::unique_ptr<EditableTableRow> clone() const override;
 
-    virtual void value_changed() override;
+    virtual void on_config_value_changed(void* object) override;
 
 public:
-    EncounterActionCell action;
-    PokemonSwSh::PokemonBallSelectCell pokeball;
     StringSelectCell pokemon;
     ShinyFilterCell shininess;
+    EncounterActionCell action;
+    PokemonSwSh::PokemonBallSelectCell pokeball;
+    SimpleIntegerCell<uint16_t> ball_limit;
 };
 
 class EncounterFilterTable : public EditableTableOption_t<EncounterFilterOverride>{
diff --git a/SerialPrograms/Source/PokemonBDSP/Options/EncounterFilter/PokemonBDSP_EncounterFilterWidget.cpp b/SerialPrograms/Source/PokemonBDSP/Options/EncounterFilter/PokemonBDSP_EncounterFilterWidget.cpp
index 208521c29d..0e501e22ba 100644
--- a/SerialPrograms/Source/PokemonBDSP/Options/EncounterFilter/PokemonBDSP_EncounterFilterWidget.cpp
+++ b/SerialPrograms/Source/PokemonBDSP/Options/EncounterFilter/PokemonBDSP_EncounterFilterWidget.cpp
@@ -1,6 +1,6 @@
 /*  Encounter Filter
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -8,7 +8,6 @@
 #include <QLabel>
 #include "Common/Cpp/Exceptions.h"
 #include "Common/Qt/NoWheelComboBox.h"
-#include "PokemonBDSP_EncounterFilterEnums.h"
 #include "PokemonBDSP_EncounterFilterWidget.h"
 
 namespace PokemonAutomation{
@@ -17,6 +16,7 @@ namespace PokemonBDSP{
 
 
 
+#if 0
 EncounterFilterWidget::EncounterFilterWidget(QWidget& parent, EncounterFilterOption& value)
     : QWidget(&parent)
     , ConfigWidget(value, *this)
@@ -34,7 +34,7 @@ EncounterFilterWidget::EncounterFilterWidget(QWidget& parent, EncounterFilterOpt
         layout->addLayout(hbox);
         hbox->addWidget(new QLabel("<b>Stop on:</b>"));
 
-        m_shininess = new NoWheelComboBox(this);
+        m_shininess = new NoWheelCompactComboBox(this);
         hbox->addWidget(m_shininess);
         for (const std::string& item : ShinyFilter_NAMES){
             m_shininess->addItem(QString::fromStdString(item));
@@ -84,7 +84,7 @@ void EncounterFilterWidget::update_visibility(){
         m_table->update_visibility();
     }
 }
-
+#endif
 
 
 }
diff --git a/SerialPrograms/Source/PokemonBDSP/Options/EncounterFilter/PokemonBDSP_EncounterFilterWidget.h b/SerialPrograms/Source/PokemonBDSP/Options/EncounterFilter/PokemonBDSP_EncounterFilterWidget.h
index e78440d4a1..4c8d996950 100644
--- a/SerialPrograms/Source/PokemonBDSP/Options/EncounterFilter/PokemonBDSP_EncounterFilterWidget.h
+++ b/SerialPrograms/Source/PokemonBDSP/Options/EncounterFilter/PokemonBDSP_EncounterFilterWidget.h
@@ -1,6 +1,6 @@
 /*  Encounter Filter
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -16,6 +16,7 @@ namespace NintendoSwitch{
 namespace PokemonBDSP{
 
 
+#if 0
 class EncounterFilterWidget : public QWidget, public ConfigWidget{
 public:
     EncounterFilterWidget(QWidget& parent, EncounterFilterOption& value);
@@ -29,7 +30,7 @@ class EncounterFilterWidget : public QWidget, public ConfigWidget{
     QComboBox* m_shininess = nullptr;
     ConfigWidget* m_table = nullptr;
 };
-
+#endif
 
 
 }
diff --git a/SerialPrograms/Source/PokemonBDSP/Options/PokemonBDSP_BerrySelectOption.cpp b/SerialPrograms/Source/PokemonBDSP/Options/PokemonBDSP_BerrySelectOption.cpp
index 55691b21f6..bf5e41572f 100644
--- a/SerialPrograms/Source/PokemonBDSP/Options/PokemonBDSP_BerrySelectOption.cpp
+++ b/SerialPrograms/Source/PokemonBDSP/Options/PokemonBDSP_BerrySelectOption.cpp
@@ -1,6 +1,6 @@
 /*  Berry Selector, UI component to select multiple berries
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -43,7 +43,7 @@ BerrySelectCell::BerrySelectCell(
 )
     : StringSelectCell(
         ALL_BERRYS_SELECT_DATABASE(),
-        LockWhileRunning::LOCKED,
+        LockMode::LOCK_WHILE_RUNNING,
         default_slug
     )
 {}
diff --git a/SerialPrograms/Source/PokemonBDSP/Options/PokemonBDSP_BerrySelectOption.h b/SerialPrograms/Source/PokemonBDSP/Options/PokemonBDSP_BerrySelectOption.h
index 24a9dbb9dc..b863b0ba69 100644
--- a/SerialPrograms/Source/PokemonBDSP/Options/PokemonBDSP_BerrySelectOption.h
+++ b/SerialPrograms/Source/PokemonBDSP/Options/PokemonBDSP_BerrySelectOption.h
@@ -1,13 +1,13 @@
 /*  Berry Selector, UI component to select multiple berries
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifndef PokemonAutomation_PokemonBDSP_BerrySelectOption_H
 #define PokemonAutomation_PokemonBDSP_BerrySelectOption_H
 
-#include "CommonFramework/Options/StringSelectOption.h"
+#include "CommonTools/Options/StringSelectOption.h"
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
diff --git a/SerialPrograms/Source/PokemonBDSP/Options/PokemonBDSP_BerryTable.cpp b/SerialPrograms/Source/PokemonBDSP/Options/PokemonBDSP_BerryTable.cpp
index d24b4f1459..56f75dac88 100644
--- a/SerialPrograms/Source/PokemonBDSP/Options/PokemonBDSP_BerryTable.cpp
+++ b/SerialPrograms/Source/PokemonBDSP/Options/PokemonBDSP_BerryTable.cpp
@@ -1,6 +1,6 @@
 /*  Berry Selector
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -15,13 +15,14 @@ using namespace Pokemon;
 
 
 
-BerrySelectorRow2::BerrySelectorRow2()
-    : berry("cheri-berry")
+BerrySelectorRow2::BerrySelectorRow2(EditableTableOption& parent_table)
+    : EditableTableRow(parent_table)
+    , berry("cheri-berry")
 {
     PA_ADD_OPTION(berry);
 }
 std::unique_ptr<EditableTableRow> BerrySelectorRow2::clone() const{
-    std::unique_ptr<BerrySelectorRow2> ret(new BerrySelectorRow2());
+    std::unique_ptr<BerrySelectorRow2> ret(new BerrySelectorRow2(parent()));
     ret->berry.set_by_index(berry.index());
     return ret;
 }
@@ -33,7 +34,7 @@ std::unique_ptr<EditableTableRow> BerrySelectorRow2::clone() const{
 BerryTable::BerryTable(std::string label)
     : EditableTableOption_t<BerrySelectorRow2>(
         std::move(label),
-        LockWhileRunning::LOCKED,
+        LockMode::LOCK_WHILE_RUNNING,
         make_defaults()
     )
 {}
@@ -43,7 +44,7 @@ BerryTable::BerryTable(std::string label)
 bool BerryTable::find_berry(const std::string& berry_slug) const{
     std::vector<std::unique_ptr<BerrySelectorRow2>> table = copy_snapshot();
     for (const std::unique_ptr<BerrySelectorRow2>& row : table){
-        if (row->berry.slug() == berry_slug) {
+        if (row->berry.slug() == berry_slug){
             return true;
         }
     }
@@ -70,7 +71,7 @@ std::vector<std::string> BerryTable::make_header() const{
 
 std::vector<std::unique_ptr<EditableTableRow>> BerryTable::make_defaults(){
     std::vector<std::unique_ptr<EditableTableRow>> ret;
-    ret.emplace_back(std::make_unique<BerrySelectorRow2>());
+    ret.emplace_back(std::make_unique<BerrySelectorRow2>(*this));
     return ret;
 }
 
diff --git a/SerialPrograms/Source/PokemonBDSP/Options/PokemonBDSP_BerryTable.h b/SerialPrograms/Source/PokemonBDSP/Options/PokemonBDSP_BerryTable.h
index 043840c245..33a13aae5b 100644
--- a/SerialPrograms/Source/PokemonBDSP/Options/PokemonBDSP_BerryTable.h
+++ b/SerialPrograms/Source/PokemonBDSP/Options/PokemonBDSP_BerryTable.h
@@ -1,6 +1,6 @@
 /*  Berry Selector, UI component to select multiple berries
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -18,7 +18,7 @@ namespace PokemonBDSP{
 
 class BerrySelectorRow2 : public EditableTableRow{
 public:
-    BerrySelectorRow2();
+    BerrySelectorRow2(EditableTableOption& parent_table);
     virtual std::unique_ptr<EditableTableRow> clone() const;
 
 public:
@@ -39,7 +39,7 @@ class BerryTable : public EditableTableOption_t<BerrySelectorRow2>{
 
     virtual std::vector<std::string> make_header() const;
 
-    static std::vector<std::unique_ptr<EditableTableRow>> make_defaults();
+    std::vector<std::unique_ptr<EditableTableRow>> make_defaults();
 };
 
 
diff --git a/SerialPrograms/Source/PokemonBDSP/Options/PokemonBDSP_EggHatchFilter.cpp b/SerialPrograms/Source/PokemonBDSP/Options/PokemonBDSP_EggHatchFilter.cpp
index 685ee0cea6..35d71649aa 100644
--- a/SerialPrograms/Source/PokemonBDSP/Options/PokemonBDSP_EggHatchFilter.cpp
+++ b/SerialPrograms/Source/PokemonBDSP/Options/PokemonBDSP_EggHatchFilter.cpp
@@ -1,10 +1,8 @@
 /*  Egg Hatch Filter
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
-
-#include "Common/Compiler.h"
 #include "PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxGenderDetector.h"
 #include "PokemonBDSP_EggHatchFilter.h"
 
diff --git a/SerialPrograms/Source/PokemonBDSP/Options/PokemonBDSP_EggHatchFilter.h b/SerialPrograms/Source/PokemonBDSP/Options/PokemonBDSP_EggHatchFilter.h
index a87bc03bfc..27d7d8f8c4 100644
--- a/SerialPrograms/Source/PokemonBDSP/Options/PokemonBDSP_EggHatchFilter.h
+++ b/SerialPrograms/Source/PokemonBDSP/Options/PokemonBDSP_EggHatchFilter.h
@@ -1,6 +1,6 @@
 /*  Egg Hatch Filter
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/PokemonBDSP/Options/PokemonBDSP_EggStepOption.cpp b/SerialPrograms/Source/PokemonBDSP/Options/PokemonBDSP_EggStepOption.cpp
new file mode 100644
index 0000000000..db0ed2a432
--- /dev/null
+++ b/SerialPrograms/Source/PokemonBDSP/Options/PokemonBDSP_EggStepOption.cpp
@@ -0,0 +1,43 @@
+/*  Egg Step Count Dropdown
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Pokemon/Resources/Pokemon_EggSteps.h"
+#include "VideoGames/PokemonSwSh/Resources/PokemonSwSh_PokemonSprites.h"
+#include "PokemonBDSP_EggStepOption.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonBDSP{
+
+
+
+
+
+const Pokemon::EggStepDatabase& EGGSTEP_DATABASE(){
+    static Pokemon::EggStepDatabase database("PokemonBDSP/EggSteps.json", &PokemonSwSh::ALL_POKEMON_SPRITES());
+    return database;
+}
+
+
+
+EggStepCountOption::EggStepCountOption()
+    : StringSelectOption(
+        "<b>Step Count:</b>",
+        EGGSTEP_DATABASE().database(),
+        LockMode::LOCK_WHILE_RUNNING,
+        "turtwig"
+    )
+{}
+
+EggStepCountOption::operator uint16_t() const{
+    return (uint16_t)EGGSTEP_DATABASE().step_count(this->slug());
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/PokemonBDSP/Options/PokemonBDSP_EggStepOption.h b/SerialPrograms/Source/PokemonBDSP/Options/PokemonBDSP_EggStepOption.h
new file mode 100644
index 0000000000..652e10a8ea
--- /dev/null
+++ b/SerialPrograms/Source/PokemonBDSP/Options/PokemonBDSP_EggStepOption.h
@@ -0,0 +1,33 @@
+/*  Egg Step Count Dropdown
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonBDSP_EggStepOption_H
+#define PokemonAutomation_PokemonBDSP_EggStepOption_H
+
+#include "CommonTools/Options/StringSelectOption.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonBDSP{
+
+
+
+
+
+class EggStepCountOption : public StringSelectOption{
+public:
+    EggStepCountOption();
+
+    operator uint16_t() const;
+};
+
+
+
+}
+}
+}
+#endif
+
diff --git a/SerialPrograms/Source/PokemonBDSP/Options/PokemonBDSP_EncounterBotCommon.h b/SerialPrograms/Source/PokemonBDSP/Options/PokemonBDSP_EncounterBotCommon.h
index 20a8d2ca73..7fa1418322 100644
--- a/SerialPrograms/Source/PokemonBDSP/Options/PokemonBDSP_EncounterBotCommon.h
+++ b/SerialPrograms/Source/PokemonBDSP/Options/PokemonBDSP_EncounterBotCommon.h
@@ -1,6 +1,6 @@
 /*  Encounter Bot Common
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -10,7 +10,7 @@
 #include "Common/Cpp/Options/BatchOption.h"
 #include "Common/Cpp/Options/BooleanCheckBoxOption.h"
 #include "CommonFramework/Notifications/EventNotificationOption.h"
-#include "Pokemon/Options/Pokemon_EncounterBotOptions.h"
+//#include "Pokemon/Options/Pokemon_EncounterBotOptions.h"
 #include "EncounterFilter/PokemonBDSP_EncounterFilterOption.h"
 
 namespace PokemonAutomation{
@@ -22,17 +22,17 @@ namespace PokemonBDSP{
 class EncounterBotCommonOptions : public BatchOption{
 public:
     EncounterBotCommonOptions(bool enable_overrides)
-        : BatchOption(LockWhileRunning::LOCKED)
+        : BatchOption(LockMode::UNLOCK_WHILE_RUNNING)
         , USE_SOUND_DETECTION(
             "<b>Use Sound Detection:</b><br>Use sound to improve shiny detection.<br>"
             "<b>Make sure you have correct audio input set.</b>",
-            LockWhileRunning::LOCKED,
+            LockMode::UNLOCK_WHILE_RUNNING,
             true
         )
         , FILTER(enable_overrides)
         , VIDEO_ON_SHINY(
             "<b>Video Capture:</b><br>Take a video of the encounter if it is shiny.",
-            LockWhileRunning::LOCKED,
+            LockMode::UNLOCK_WHILE_RUNNING,
             true
         )
         , NOTIFICATION_NONSHINY(
@@ -63,7 +63,7 @@ class EncounterBotCommonOptions : public BatchOption{
     }
 
     BooleanCheckBoxOption USE_SOUND_DETECTION;
-    EncounterFilterOption FILTER;
+    EncounterFilterOption2 FILTER;
     BooleanCheckBoxOption VIDEO_ON_SHINY;
 
     EventNotificationOption NOTIFICATION_NONSHINY;
diff --git a/SerialPrograms/Source/PokemonBDSP/Options/PokemonBDSP_LearnMove.h b/SerialPrograms/Source/PokemonBDSP/Options/PokemonBDSP_LearnMove.h
index 920490acf5..6acadcf67f 100644
--- a/SerialPrograms/Source/PokemonBDSP/Options/PokemonBDSP_LearnMove.h
+++ b/SerialPrograms/Source/PokemonBDSP/Options/PokemonBDSP_LearnMove.h
@@ -1,6 +1,6 @@
 /*  Learn Move
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -28,7 +28,7 @@ class OnLearnMoveOption : public EnumDropdownOption<OnLearnMove>{
                 {OnLearnMove::DONT_LEARN, "skip", "Don't learn moves."},
                 {OnLearnMove::STOP_PROGRAM, "stop-program", "Stop Program"},
             },
-            LockWhileRunning::LOCKED,
+            LockMode::LOCK_WHILE_RUNNING,
             OnLearnMove::DONT_LEARN
         )
     {}
diff --git a/SerialPrograms/Source/PokemonBDSP/Options/PokemonBDSP_PlayerModelOption.cpp b/SerialPrograms/Source/PokemonBDSP/Options/PokemonBDSP_PlayerModelOption.cpp
new file mode 100644
index 0000000000..4b81977e67
--- /dev/null
+++ b/SerialPrograms/Source/PokemonBDSP/Options/PokemonBDSP_PlayerModelOption.cpp
@@ -0,0 +1,57 @@
+/*  Player Model Select
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <string>
+#include <vector>
+#include "CommonFramework/GlobalAutoPaths.h"
+#include "CommonFramework/ImageTypes/ImageRGB32.h"
+#include "PokemonBDSP_PlayerModelOption.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonBDSP{
+
+
+namespace{
+
+struct PlayerModelIcons{
+    std::vector<ImageRGB32> icons;
+    StringSelectDatabase database;
+
+    PlayerModelIcons(){
+        icons.reserve(BDSP_PLAYER_MODEL_COUNT);
+        for (uint8_t model = 1; model <= BDSP_PLAYER_MODEL_COUNT; model++){
+            std::string number = std::to_string(model);
+            icons.emplace_back(
+                RESOURCE_PATH() + "PokemonBDSP/Rng/ModelIcons/Model-" + number + ".png"
+            );
+            database.add_entry(StringSelectEntry(
+                "model-" + number, "Model " + number, icons.back()
+            ));
+        }
+    }
+};
+const PlayerModelIcons& PLAYER_MODEL_ICONS(){
+    static PlayerModelIcons icons;
+    return icons;
+}
+}
+
+
+PlayerModelOption::PlayerModelOption()
+    : StringSelectOption(
+        "<b>Character model:</b><br>The appearance chosen for the player character. "
+        "Each one is watched through a different eye template.",
+        PLAYER_MODEL_ICONS().database,
+        LockMode::LOCK_WHILE_RUNNING,
+        "model-1"
+    )
+{}
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/PokemonBDSP/Options/PokemonBDSP_PlayerModelOption.h b/SerialPrograms/Source/PokemonBDSP/Options/PokemonBDSP_PlayerModelOption.h
new file mode 100644
index 0000000000..e54cd04850
--- /dev/null
+++ b/SerialPrograms/Source/PokemonBDSP/Options/PokemonBDSP_PlayerModelOption.h
@@ -0,0 +1,32 @@
+/*  Player Model Select
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonBDSP_PlayerModelOption_H
+#define PokemonAutomation_PokemonBDSP_PlayerModelOption_H
+
+#include <stdint.h>
+#include "CommonTools/Options/StringSelectOption.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonBDSP{
+
+
+//  The eight appearances the player character can be given at the start of the game.
+const uint8_t BDSP_PLAYER_MODEL_COUNT = 8;
+
+
+class PlayerModelOption : public StringSelectOption{
+public:
+    PlayerModelOption();
+    uint8_t model_number() const{ return (uint8_t)(index() + 1); }
+};
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/PokemonBDSP/Options/PokemonBDSP_ShortcutDirection.cpp b/SerialPrograms/Source/PokemonBDSP/Options/PokemonBDSP_ShortcutDirection.cpp
index 021bc7878a..be2926eecf 100644
--- a/SerialPrograms/Source/PokemonBDSP/Options/PokemonBDSP_ShortcutDirection.cpp
+++ b/SerialPrograms/Source/PokemonBDSP/Options/PokemonBDSP_ShortcutDirection.cpp
@@ -1,6 +1,6 @@
 /*  Shortcut Direction
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -13,8 +13,8 @@ namespace NintendoSwitch{
 namespace PokemonBDSP{
 
 
-const EnumDatabase<ShortcutDirection>& ShortcutDirection_Nullable(){
-    static EnumDatabase<ShortcutDirection> database({
+const EnumDropdownDatabase<ShortcutDirection>& ShortcutDirection_Nullable(){
+    static EnumDropdownDatabase<ShortcutDirection> database({
         {ShortcutDirection::NONE,   "none", "None"},
         {ShortcutDirection::UP,     "up", "Up"},
         {ShortcutDirection::RIGHT,  "right", "Right"},
@@ -23,8 +23,8 @@ const EnumDatabase<ShortcutDirection>& ShortcutDirection_Nullable(){
     });
     return database;
 }
-const EnumDatabase<ShortcutDirection>& ShortcutDirection_Required(){
-    static EnumDatabase<ShortcutDirection> database({
+const EnumDropdownDatabase<ShortcutDirection>& ShortcutDirection_Required(){
+    static EnumDropdownDatabase<ShortcutDirection> database({
         {ShortcutDirection::UP,     "up", "Up"},
         {ShortcutDirection::RIGHT,  "right", "Right"},
         {ShortcutDirection::DOWN,   "down", "Down"},
@@ -39,22 +39,22 @@ ShortcutDirectionOption::ShortcutDirectionOption(std::string label)
     : EnumDropdownOption<ShortcutDirection>(
         std::move(label),
         ShortcutDirection_Nullable(),
-        LockWhileRunning::LOCKED,
+        LockMode::LOCK_WHILE_RUNNING,
         ShortcutDirection::NONE
     )
 {}
 
-void ShortcutDirectionOption::run(BotBaseContext& context, uint16_t delay){
-    uint8_t shortcut_x = 128;
-    uint8_t shortcut_y = 128;
+void ShortcutDirectionOption::run(ProControllerContext& context, Milliseconds delay){
+    double shortcut_x = 0;
+    double shortcut_y = 0;
     switch (this->get()){
     case ShortcutDirection::NONE:
-        pbf_press_button(context, BUTTON_PLUS, 20, 105);
+        pbf_press_button(context, BUTTON_PLUS, 160ms, 840ms);
         return;
-    case ShortcutDirection::UP:     shortcut_y = 0; break;
-    case ShortcutDirection::RIGHT:  shortcut_x = 255; break;
-    case ShortcutDirection::DOWN:   shortcut_y = 255; break;
-    case ShortcutDirection::LEFT:   shortcut_x = 0; break;
+    case ShortcutDirection::UP:     shortcut_y = +1; break;
+    case ShortcutDirection::RIGHT:  shortcut_x = +1; break;
+    case ShortcutDirection::DOWN:   shortcut_y = -1; break;
+    case ShortcutDirection::LEFT:   shortcut_x = -1; break;
     default:
         throw InternalProgramError(
             nullptr, PA_CURRENT_FUNCTION,
@@ -62,8 +62,8 @@ void ShortcutDirectionOption::run(BotBaseContext& context, uint16_t delay){
         );
     }
 
-    pbf_mash_button(context, BUTTON_PLUS, 125);
-    pbf_move_right_joystick(context, shortcut_x, shortcut_y, 20, delay);
+    pbf_mash_button(context, BUTTON_PLUS, 1000ms);
+    pbf_move_right_joystick(context, {shortcut_x, shortcut_y}, 160ms, delay);
 }
 
 
diff --git a/SerialPrograms/Source/PokemonBDSP/Options/PokemonBDSP_ShortcutDirection.h b/SerialPrograms/Source/PokemonBDSP/Options/PokemonBDSP_ShortcutDirection.h
index 87b803fc2f..5cce8fcdf6 100644
--- a/SerialPrograms/Source/PokemonBDSP/Options/PokemonBDSP_ShortcutDirection.h
+++ b/SerialPrograms/Source/PokemonBDSP/Options/PokemonBDSP_ShortcutDirection.h
@@ -1,11 +1,11 @@
 /*  Shortcut Direction
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include "ClientSource/Connection/BotBase.h"
 #include "Common/Cpp/Options/EnumDropdownOption.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
 
 #ifndef PokemonAutomation_PokemonBDSP_ShortcutDirection_H
 #define PokemonAutomation_PokemonBDSP_ShortcutDirection_H
@@ -23,8 +23,8 @@ enum class ShortcutDirection{
     DOWN,
     LEFT,
 };
-const EnumDatabase<ShortcutDirection>& ShortcutDirection_Nullable();
-const EnumDatabase<ShortcutDirection>& ShortcutDirection_Required();
+const EnumDropdownDatabase<ShortcutDirection>& ShortcutDirection_Nullable();
+const EnumDropdownDatabase<ShortcutDirection>& ShortcutDirection_Required();
 
 
 
@@ -32,7 +32,7 @@ class ShortcutDirectionOption : public EnumDropdownOption<ShortcutDirection>{
 public:
     ShortcutDirectionOption(std::string label);
 
-    void run(BotBaseContext& context, uint16_t delay);
+    void run(ProControllerContext& context, Milliseconds delay);
 
 };
 
diff --git a/SerialPrograms/Source/PokemonBDSP/PokemonBDSP_Panels.cpp b/SerialPrograms/Source/PokemonBDSP/PokemonBDSP_Panels.cpp
index c88b60b55b..e2aa07801f 100644
--- a/SerialPrograms/Source/PokemonBDSP/PokemonBDSP_Panels.cpp
+++ b/SerialPrograms/Source/PokemonBDSP/PokemonBDSP_Panels.cpp
@@ -1,12 +1,13 @@
 /*  Pokemon BD/SP Panels
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include "CommonFramework/GlobalSettingsPanel.h"
-#include "PokemonBDSP_Panels.h"
+#include "CommonFramework/StaticGlobals.h"
+#include "CommonFramework/GlobalAutoPaths.h"
 
+#include "PokemonBDSP_Panels.h"
 #include "PokemonBDSP_Settings.h"
 
 #include "Programs/General/PokemonBDSP_MassRelease.h"
@@ -19,6 +20,7 @@
 #include "Programs/Farming/PokemonBDSP_MoneyFarmerRoute212.h"
 #include "Programs/Farming/PokemonBDSP_DoublesLeveling.h"
 #include "Programs/Farming/PokemonBDSP_AmitySquarePickUpFarmer.h"
+#include "Programs/Farming/PokemonBDSP_PoffinCooker.h"
 #include "Programs/Farming/PokemonBDSP_GiftBerryReset.h"
 
 #include "Programs/ShinyHunting/PokemonBDSP_StarterReset.h"
@@ -34,11 +36,13 @@
 #include "Programs/Glitches/PokemonBDSP_ActivateMenuGlitch-1.1.3.h"
 #include "Programs/Glitches/PokemonBDSP_ActivateMenuGlitch-1.1.2.h"
 #include "Programs/Glitches/PokemonBDSP_CloneItemsBoxCopy2.h"
-//#include "Programs/Glitches/PokemonBDSP_CloneItemsBoxCopy.h"
-//#include "Programs/Glitches/PokemonBDSP_CloneItemsMenuOverlap.h"
+
+#include "Programs/RngManipulation/PokemonBDSP_BedroomSeedFinder.h"
+#include "Programs/RngManipulation/PokemonBDSP_IntroSeedFinder.h"
 
 #include "Programs/TestPrograms/PokemonBDSP_ShinyEncounterTester.h"
 #include "Programs/TestPrograms/PokemonBDSP_SoundListener.h"
+#include "Programs/TestPrograms/PokemonBDSP_SummaryReaderTester.h"
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
@@ -47,53 +51,63 @@ namespace PokemonBDSP{
 
 
 PanelListFactory::PanelListFactory()
-    : PanelListDescriptor(Pokemon::STRING_POKEMON + " Brilliant Diamond and Shining Pearl")
+    : PanelListDescriptor(
+        Pokemon::STRING_POKEMON + " Brilliant Diamond and Shining Pearl",
+        RESOURCE_PATH() + "CategoryIcons/PokemonBDSP.png"
+    )
 {}
 
 std::vector<PanelEntry> PanelListFactory::make_panels() const{
     std::vector<PanelEntry> ret;
 
     ret.emplace_back("---- Settings ----");
-    ret.emplace_back(make_settings<GameSettings_Descriptor, GameSettingsPanel>());
+    ret.emplace_back(make_OptionsPanel<GameSettingsPanel>());
 
     ret.emplace_back("---- General ----");
-    ret.emplace_back(make_single_switch_program<MassRelease_Descriptor, MassRelease>());
-    ret.emplace_back(make_single_switch_program<AutonomousBallThrower_Descriptor, AutonomousBallThrower>());
+    ret.emplace_back(make_SingleSwitchProgram<MassRelease>());
+    ret.emplace_back(make_SingleSwitchProgram<AutonomousBallThrower>());
 
     ret.emplace_back("---- Trading ----");
-    ret.emplace_back(make_multi_switch_program<SelfBoxTrade_Descriptor, SelfBoxTrade>());
-    ret.emplace_back(make_multi_switch_program<SelfTouchTrade_Descriptor, SelfTouchTrade>());
+    ret.emplace_back(make_MultiSwitchProgram<SelfBoxTrade>());
+    ret.emplace_back(make_MultiSwitchProgram<SelfTouchTrade>());
 
     ret.emplace_back("---- Farming ----");
-    ret.emplace_back(make_single_switch_program<MoneyFarmerRoute212_Descriptor, MoneyFarmerRoute212>());
-    ret.emplace_back(make_single_switch_program<MoneyFarmerRoute210_Descriptor, MoneyFarmerRoute210>());
-    ret.emplace_back(make_single_switch_program<DoublesLeveling_Descriptor, DoublesLeveling>());
-    ret.emplace_back(make_single_switch_program<AmitySquarePickUpFarmer_Descriptor, AmitySquarePickUpFarmer>());
-    ret.emplace_back(make_single_switch_program<GiftBerryReset_Descriptor, GiftBerryReset>());
+    ret.emplace_back(make_SingleSwitchProgram<MoneyFarmerRoute212>());
+    ret.emplace_back(make_SingleSwitchProgram<MoneyFarmerRoute210>());
+    ret.emplace_back(make_SingleSwitchProgram<DoublesLeveling>());
+    ret.emplace_back(make_SingleSwitchProgram<AmitySquarePickUpFarmer>());
+    ret.emplace_back(make_SingleSwitchProgram<GiftBerryReset>());
+    ret.emplace_back(make_SingleSwitchProgram<PoffinCooker>());
 
     ret.emplace_back("---- Shiny Hunting ----");
-    ret.emplace_back(make_single_switch_program<StarterReset_Descriptor, StarterReset>());
-    ret.emplace_back(make_single_switch_program<LegendaryReset_Descriptor, LegendaryReset>());
-    ret.emplace_back(make_single_switch_program<ShinyHuntOverworld_Descriptor, ShinyHuntOverworld>());
-    ret.emplace_back(make_single_switch_program<ShinyHuntFishing_Descriptor, ShinyHuntFishing>());
-    ret.emplace_back(make_single_switch_program<ShinyHuntShaymin_Descriptor, ShinyHuntShaymin>());
+    ret.emplace_back(make_SingleSwitchProgram<StarterReset>());
+    ret.emplace_back(make_SingleSwitchProgram<LegendaryReset>());
+    ret.emplace_back(make_SingleSwitchProgram<ShinyHuntOverworld>());
+    ret.emplace_back(make_SingleSwitchProgram<ShinyHuntFishing>());
+    ret.emplace_back(make_SingleSwitchProgram<ShinyHuntShaymin>());
 
     ret.emplace_back("---- Eggs ----");
-    ret.emplace_back(make_single_switch_program<EggFetcher_Descriptor, EggFetcher>());
-    ret.emplace_back(make_single_switch_program<EggHatcher_Descriptor, EggHatcher>());
-    ret.emplace_back(make_single_switch_program<EggAutonomous_Descriptor, EggAutonomous>());
+    ret.emplace_back(make_SingleSwitchProgram<EggFetcher>());
+    ret.emplace_back(make_SingleSwitchProgram<EggHatcher>());
+    ret.emplace_back(make_SingleSwitchProgram<EggAutonomous>());
 
     ret.emplace_back("---- Glitches (v1.1.3) ----");
-    ret.emplace_back(make_single_switch_program<ActivateMenuGlitch113_Descriptor, ActivateMenuGlitch113>());
-    ret.emplace_back(make_single_switch_program<CloneItemsBoxCopy2_Descriptor, CloneItemsBoxCopy2>());
+    ret.emplace_back(make_SingleSwitchProgram<ActivateMenuGlitch113>());
+    ret.emplace_back(make_SingleSwitchProgram<CloneItemsBoxCopy2>());
 
     ret.emplace_back("---- Glitches (v1.1.2) ----");
-    ret.emplace_back(make_single_switch_program<ActivateMenuGlitch112_Descriptor, ActivateMenuGlitch112>());
+    ret.emplace_back(make_SingleSwitchProgram<ActivateMenuGlitch112>());
 
-    if (PreloadSettings::instance().DEVELOPER_MODE){
+    if (IS_BETA_VERSION || STATIC_GLOBALS.DEVELOPER_MODE){
+        ret.emplace_back("---- Untested/Beta/WIP ----");
+        ret.emplace_back(make_SingleSwitchProgram<IntroSeedFinder>());
+        ret.emplace_back(make_SingleSwitchProgram<BedroomSeedFinder>());
+    }
+    if (STATIC_GLOBALS.DEVELOPER_MODE){
         ret.emplace_back("---- Developer Tools ----");
-        ret.emplace_back(make_single_switch_program<ShinyEncounterTester_Descriptor, ShinyEncounterTester>());
-        ret.emplace_back(make_single_switch_program<SoundListener_Descriptor, SoundListener>());
+        ret.emplace_back(make_SingleSwitchProgram<ShinyEncounterTester>());
+        ret.emplace_back(make_SingleSwitchProgram<SoundListener>());
+        ret.emplace_back(make_SingleSwitchProgram<SummaryReaderTester>());
     }
 
     return ret;
diff --git a/SerialPrograms/Source/PokemonBDSP/PokemonBDSP_Panels.h b/SerialPrograms/Source/PokemonBDSP/PokemonBDSP_Panels.h
index fd2f50df07..9c1f6da8e7 100644
--- a/SerialPrograms/Source/PokemonBDSP/PokemonBDSP_Panels.h
+++ b/SerialPrograms/Source/PokemonBDSP/PokemonBDSP_Panels.h
@@ -1,6 +1,6 @@
 /*  Pokemon BD/SP Panels
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -18,7 +18,8 @@ namespace PokemonBDSP{
 class PanelListFactory : public PanelListDescriptor{
 public:
     PanelListFactory();
-    virtual std::vector<PanelEntry> make_panels() const;
+private:
+    virtual std::vector<PanelEntry> make_panels() const override;
 };
 
 
diff --git a/SerialPrograms/Source/PokemonBDSP/PokemonBDSP_Settings.cpp b/SerialPrograms/Source/PokemonBDSP/PokemonBDSP_Settings.cpp
index 6e5bb13aca..a6201a2159 100644
--- a/SerialPrograms/Source/PokemonBDSP/PokemonBDSP_Settings.cpp
+++ b/SerialPrograms/Source/PokemonBDSP/PokemonBDSP_Settings.cpp
@@ -1,18 +1,17 @@
 /*  Pokemon BDSP Settings
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-#include "CommonFramework/Globals.h"
 #include "Pokemon/Pokemon_Strings.h"
 #include "PokemonBDSP_Settings.h"
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
 namespace PokemonBDSP{
-    using namespace Pokemon;
+
+using namespace Pokemon;
 
 
 
@@ -21,158 +20,138 @@ GameSettings& GameSettings::instance(){
     return settings;
 }
 GameSettings::GameSettings()
-    : BatchOption(LockWhileRunning::LOCKED)
+    : BatchOption(LockMode::LOCK_WHILE_RUNNING)
     , m_menu_navigation("<font size=4><b>Menu Navigation Timings:</b></font>")
-    , OVERWORLD_TO_MENU_DELAY(
+    , OVERWORLD_TO_MENU_DELAY0(
         "<b>Overworld to Menu Delay:</b><br>Delay to bring up the menu when pressing X in the overworld.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "250"
+        LockMode::LOCK_WHILE_RUNNING,
+        "2000 ms"
     )
-    , MENU_TO_OVERWORLD_DELAY(
+    , MENU_TO_OVERWORLD_DELAY0(
         "<b>Menu to Overworld Delay:</b><br>Delay to go from menu back to overworld.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "250"
+        LockMode::LOCK_WHILE_RUNNING,
+        "2000 ms"
     )
-    , GAME_TO_HOME_DELAY(
+    , GAME_TO_HOME_DELAY0(
         "<b>Game to Home Delay:</b><br>Delay from pressing home to entering the the Switch home menu.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "125"
+        LockMode::LOCK_WHILE_RUNNING,
+        "1000 ms"
     )
     , m_start_game_timings("<font size=4><b>Start Game Timings:</b></font>")
-    , START_GAME_MASH(
-        "<b>1. Start Game Mash:</b><br>Mash A for this long to start the game.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "2 * TICKS_PER_SECOND"
-    )
-    , START_GAME_WAIT(
-        "<b>2. Start Game Wait:</b><br>Wait this long for the game to load.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "40 * TICKS_PER_SECOND"
-    )
-    , ENTER_GAME_MASH(
-        "<b>3. Enter Game Mash:</b><br>Mash A for this long to enter the game.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "5 * TICKS_PER_SECOND"
-    )
-    , ENTER_GAME_WAIT(
-        "<b>4. Enter Game Wait:</b><br>Wait this long for the game to enter the overworld.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "40 * TICKS_PER_SECOND"
+    , START_GAME_WAIT0(
+        "<b>Start Game Wait:</b><br>Wait this long for the game to load.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "300 s"
+    )
+    , ENTER_GAME_MASH0(
+        "<b>Enter Game Mash:</b><br>Mash A for this long to enter the game.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "5000 ms"
+    )
+    , ENTER_GAME_WAIT0(
+        "<b>Enter Game Wait:</b><br>Wait this long for the game to enter the overworld.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "300 s"
     )
     , m_box_timings("<font size=4><b>Box Timings:</b></font> (for egg programs)")
-    , BOX_SCROLL_DELAY_0(
+    , BOX_SCROLL_DELAY0(
         "<b>Box Scroll Delay:</b><br>Delay to move the cursor.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "30"
+        LockMode::LOCK_WHILE_RUNNING,
+        "240 ms"
     )
-    , BOX_CHANGE_DELAY_0(
+    , BOX_CHANGE_DELAY0(
         "<b>Box Change Delay:</b><br>Delay to change boxes.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "200"
+        LockMode::LOCK_WHILE_RUNNING,
+        "1600 ms"
     )
-    , BOX_PICKUP_DROP_DELAY(
+    , BOX_PICKUP_DROP_DELAY0(
         "<b>Box Pickup/Drop Delay:</b><br>Delay to pickup/drop " + STRING_POKEMON + ".",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "50"
+        LockMode::LOCK_WHILE_RUNNING,
+        "400 ms"
     )
-    , MENU_TO_POKEMON_DELAY(
+    , MENU_TO_POKEMON_DELAY0(
         "<b>Menu To " + STRING_POKEMON + " Delay:</b><br>Delay to enter " + STRING_POKEMON + " menu.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "300"
+        LockMode::LOCK_WHILE_RUNNING,
+        "2400 ms"
     )
-    , POKEMON_TO_BOX_DELAY0(
+    , POKEMON_TO_BOX_DELAY1(
         "<b>" + STRING_POKEMON + " to Box Delay:</b><br>Delay to enter box system.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "320"
+        LockMode::LOCK_WHILE_RUNNING,
+        "2560 ms"
     )
-    , BOX_TO_POKEMON_DELAY(
+    , BOX_TO_POKEMON_DELAY0(
         "<b>Box to " + STRING_POKEMON + " Delay:</b><br>Delay to exit box system.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "250"
+        LockMode::LOCK_WHILE_RUNNING,
+        "2000 ms"
     )
-    , POKEMON_TO_MENU_DELAY(
+    , POKEMON_TO_MENU_DELAY0(
         "<b>" + STRING_POKEMON + " to Menu Delay:</b><br>Delay to return to menu.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "250"
+        LockMode::LOCK_WHILE_RUNNING,
+        "2000 ms"
     )
     , m_advanced_options(
         "<font size=4><b>Advanced Options:</b> You should not need to touch anything below here.</font>"
     )
     , SHINY_ALPHA_OVERALL_THRESHOLD(
         "<b>Shiny Threshold (overall):</b><br>Threshold to detect a shiny encounter.",
-        LockWhileRunning::LOCKED,
+        LockMode::LOCK_WHILE_RUNNING,
         4.0, 0
     )
     , SHINY_ALPHA_SIDE_THRESHOLD(
         "<b>Shiny Threshold (left/right):</b><br>Threshold to detect a left/right shiny.",
-        LockWhileRunning::LOCKED,
+        LockMode::LOCK_WHILE_RUNNING,
         3.0, 0
     )
     , BALL_SPARKLE_ALPHA(
         "<b>Ball Sparkle Alpha:</b>",
-        LockWhileRunning::LOCKED,
+        LockMode::LOCK_WHILE_RUNNING,
         1.0, 0
     )
     , STAR_SPARKLE_ALPHA(
         "<b>Star Sparkle Alpha:</b>",
-        LockWhileRunning::LOCKED,
+        LockMode::LOCK_WHILE_RUNNING,
         1.0, 0
     )
     , SHINY_DIALOG_ALPHA(
         "<b>Shiny Dialog Alpha:</b>",
-        LockWhileRunning::LOCKED,
+        LockMode::LOCK_WHILE_RUNNING,
         3.5, 0
     )
     , SHINY_SOUND_THRESHOLD(
         "<b>Shiny Sound Threshold:</b><br>Maximum error coefficient to trigger a shiny detection.",
-        LockWhileRunning::LOCKED,
+        LockMode::LOCK_WHILE_RUNNING,
         0.87, 0, 1.0
     )
     , SHINY_SOUND_LOW_FREQUENCY(
         "<b>Shiny Sound Low Frequency (Hz):</b><br>High pass filter frequency for shiny sound.",
-        LockWhileRunning::LOCKED,
+        LockMode::LOCK_WHILE_RUNNING,
         5000, 0, 48000
     )
     , SHINY_SOUND_ALPHA(
         "<b>Shiny Sound Alpha:</b>",
-        LockWhileRunning::LOCKED,
+        LockMode::LOCK_WHILE_RUNNING,
         5.0, 0
     )
 //    , m_experimental("<font size=4><b>Experimental/Beta Features:</b></font>")
 {
     PA_ADD_STATIC(m_menu_navigation);
-    PA_ADD_OPTION(OVERWORLD_TO_MENU_DELAY);
-    PA_ADD_OPTION(MENU_TO_OVERWORLD_DELAY);
-    PA_ADD_OPTION(GAME_TO_HOME_DELAY);
+    PA_ADD_OPTION(OVERWORLD_TO_MENU_DELAY0);
+    PA_ADD_OPTION(MENU_TO_OVERWORLD_DELAY0);
+    PA_ADD_OPTION(GAME_TO_HOME_DELAY0);
 
     PA_ADD_STATIC(m_start_game_timings);
-    PA_ADD_OPTION(START_GAME_MASH);
-    PA_ADD_OPTION(START_GAME_WAIT);
-    PA_ADD_OPTION(ENTER_GAME_MASH);
-    PA_ADD_OPTION(ENTER_GAME_WAIT);
+    PA_ADD_OPTION(START_GAME_WAIT0);
+    PA_ADD_OPTION(ENTER_GAME_MASH0);
+    PA_ADD_OPTION(ENTER_GAME_WAIT0);
 
     PA_ADD_STATIC(m_box_timings);
-    PA_ADD_OPTION(BOX_SCROLL_DELAY_0);
-    PA_ADD_OPTION(BOX_CHANGE_DELAY_0);
-    PA_ADD_OPTION(BOX_PICKUP_DROP_DELAY);
-    PA_ADD_OPTION(MENU_TO_POKEMON_DELAY);
-    PA_ADD_OPTION(POKEMON_TO_BOX_DELAY0);
-    PA_ADD_OPTION(BOX_TO_POKEMON_DELAY);
-    PA_ADD_OPTION(POKEMON_TO_MENU_DELAY);
+    PA_ADD_OPTION(BOX_SCROLL_DELAY0);
+    PA_ADD_OPTION(BOX_CHANGE_DELAY0);
+    PA_ADD_OPTION(BOX_PICKUP_DROP_DELAY0);
+    PA_ADD_OPTION(MENU_TO_POKEMON_DELAY0);
+    PA_ADD_OPTION(POKEMON_TO_BOX_DELAY1);
+    PA_ADD_OPTION(BOX_TO_POKEMON_DELAY0);
+    PA_ADD_OPTION(POKEMON_TO_MENU_DELAY0);
 
     PA_ADD_STATIC(m_advanced_options);
     PA_ADD_OPTION(SHINY_ALPHA_OVERALL_THRESHOLD);
@@ -192,20 +171,19 @@ GameSettings::GameSettings()
 
 
 GameSettings_Descriptor::GameSettings_Descriptor()
-    : PanelDescriptor(
-        Color(),
+    : OptionsPanelDescriptor(
         "PokemonBDSP:GlobalSettings",
-        STRING_POKEMON + " BDSP", STRING_POKEMON + " Settings",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonBDSP/PokemonSettings.md",
-        "Global " + STRING_POKEMON + " Settings"
+        STRING_POKEMON + " BDSP", "Game Settings",
+        "Programs/PokemonBDSP/PokemonSettings.html",
+        "Global " + STRING_POKEMON + " Brilliant Diamond and Shing Pearl Settings",
+        PanelQualityStanding::OFFICIAL
     )
 {}
 
 
 
-GameSettingsPanel::GameSettingsPanel(const GameSettings_Descriptor& descriptor)
-    : SettingsPanelInstance(descriptor)
-    , settings(GameSettings::instance())
+GameSettingsPanel::GameSettingsPanel()
+    : settings(GameSettings::instance())
 {
     PA_ADD_OPTION(settings);
 }
diff --git a/SerialPrograms/Source/PokemonBDSP/PokemonBDSP_Settings.h b/SerialPrograms/Source/PokemonBDSP/PokemonBDSP_Settings.h
index 87b7bd16d2..fe3e5b53d8 100644
--- a/SerialPrograms/Source/PokemonBDSP/PokemonBDSP_Settings.h
+++ b/SerialPrograms/Source/PokemonBDSP/PokemonBDSP_Settings.h
@@ -1,6 +1,6 @@
 /*  Pokemon BDSP Settings
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -8,10 +8,9 @@
 #define PokemonAutomation_PokemonBDSP_Settings_H
 
 #include "Common/Cpp/Options/StaticTextOption.h"
-#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
 #include "Common/Cpp/Options/FloatingPointOption.h"
-#include "Common/Cpp/Options/TimeExpressionOption.h"
-#include "CommonFramework/Panels/SettingsPanel.h"
+#include "Common/Cpp/Options/TimeDurationOption.h"
+#include "CommonFramework/Panels/OptionsPanel.h"
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
@@ -24,24 +23,23 @@ class GameSettings : public BatchOption{
     static GameSettings& instance();
 
     SectionDividerOption m_menu_navigation;
-    TimeExpressionOption<uint16_t> OVERWORLD_TO_MENU_DELAY;
-    TimeExpressionOption<uint16_t> MENU_TO_OVERWORLD_DELAY;
-    TimeExpressionOption<uint16_t> GAME_TO_HOME_DELAY;
+    MillisecondsOption OVERWORLD_TO_MENU_DELAY0;
+    MillisecondsOption MENU_TO_OVERWORLD_DELAY0;
+    MillisecondsOption GAME_TO_HOME_DELAY0;
 
     SectionDividerOption m_start_game_timings;
-    TimeExpressionOption<uint16_t> START_GAME_MASH;
-    TimeExpressionOption<uint16_t> START_GAME_WAIT;
-    TimeExpressionOption<uint16_t> ENTER_GAME_MASH;
-    TimeExpressionOption<uint16_t> ENTER_GAME_WAIT;
+    MillisecondsOption START_GAME_WAIT0;
+    MillisecondsOption ENTER_GAME_MASH0;
+    MillisecondsOption ENTER_GAME_WAIT0;
 
     SectionDividerOption m_box_timings;
-    TimeExpressionOption<uint16_t> BOX_SCROLL_DELAY_0;      //  Renamed to force defaults on version upgrade.
-    TimeExpressionOption<uint16_t> BOX_CHANGE_DELAY_0;      //  Renamed to force defaults on version upgrade.
-    TimeExpressionOption<uint16_t> BOX_PICKUP_DROP_DELAY;
-    TimeExpressionOption<uint16_t> MENU_TO_POKEMON_DELAY;
-    TimeExpressionOption<uint16_t> POKEMON_TO_BOX_DELAY0;
-    TimeExpressionOption<uint16_t> BOX_TO_POKEMON_DELAY;
-    TimeExpressionOption<uint16_t> POKEMON_TO_MENU_DELAY;
+    MillisecondsOption BOX_SCROLL_DELAY0;
+    MillisecondsOption BOX_CHANGE_DELAY0;
+    MillisecondsOption BOX_PICKUP_DROP_DELAY0;
+    MillisecondsOption MENU_TO_POKEMON_DELAY0;
+    MillisecondsOption POKEMON_TO_BOX_DELAY1;
+    MillisecondsOption BOX_TO_POKEMON_DELAY0;
+    MillisecondsOption POKEMON_TO_MENU_DELAY0;
 
     SectionDividerOption m_advanced_options;
     FloatingPointOption SHINY_ALPHA_OVERALL_THRESHOLD;
@@ -60,15 +58,16 @@ class GameSettings : public BatchOption{
 
 
 
-class GameSettings_Descriptor : public PanelDescriptor{
+class GameSettings_Descriptor : public OptionsPanelDescriptor{
 public:
     GameSettings_Descriptor();
 };
 
 
-class GameSettingsPanel : public SettingsPanelInstance{
+class GameSettingsPanel : public OptionsPanelInstance{
 public:
-    GameSettingsPanel(const GameSettings_Descriptor& descriptor);
+    using Descriptor = GameSettings_Descriptor;
+    GameSettingsPanel();
 private:
     GameSettings& settings;
 };
diff --git a/SerialPrograms/Source/PokemonBDSP/PokemonBDSP_Tests.cpp b/SerialPrograms/Source/PokemonBDSP/PokemonBDSP_Tests.cpp
new file mode 100644
index 0000000000..b8ff5e26a5
--- /dev/null
+++ b/SerialPrograms/Source/PokemonBDSP/PokemonBDSP_Tests.cpp
@@ -0,0 +1,23 @@
+/*  Pokemon BDSP Tests
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "PokemonBDSP_Tests.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonBDSP{
+
+
+
+void add_tests(UnitTestDatabase& database){
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/PokemonBDSP/PokemonBDSP_Tests.h b/SerialPrograms/Source/PokemonBDSP/PokemonBDSP_Tests.h
new file mode 100644
index 0000000000..009a365035
--- /dev/null
+++ b/SerialPrograms/Source/PokemonBDSP/PokemonBDSP_Tests.h
@@ -0,0 +1,25 @@
+/*  Pokemon BDSP Tests
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonBDSP_Tests_H
+#define PokemonAutomation_PokemonBDSP_Tests_H
+
+#include "Common/Cpp/TestRunners/UnitTest.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonBDSP{
+
+
+
+void add_tests(UnitTestDatabase& database);
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggAutonomous.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggAutonomous.cpp
index c00acad2a0..0869611ca5 100644
--- a/SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggAutonomous.cpp
+++ b/SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggAutonomous.cpp
@@ -1,26 +1,27 @@
 /*  Egg Autonomous
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include "Common/Compiler.h"
-#include "CommonFramework/Exceptions/OperationFailedException.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
 #include "CommonFramework/Notifications/ProgramNotifications.h"
 #include "NintendoSwitch/NintendoSwitch_Settings.h"
 #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
 #include "Pokemon/Pokemon_Strings.h"
-#include "Pokemon/Inference/Pokemon_IVCheckerReader.h"
-#include "PokemonSwSh/Inference/PokemonSwSh_IVCheckerReader.h"
 #include "PokemonBDSP/PokemonBDSP_Settings.h"
 #include "PokemonBDSP/Programs/PokemonBDSP_GameEntry.h"
 #include "PokemonBDSP/Programs/PokemonBDSP_GameNavigation.h"
+#include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_IvJudgeReader.h"
 #include "PokemonBDSP_EggAutonomousState.h"
 #include "PokemonBDSP_EggAutonomous.h"
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
 namespace PokemonBDSP{
+
 using namespace Pokemon;
 
 
@@ -29,11 +30,12 @@ EggAutonomous_Descriptor::EggAutonomous_Descriptor()
     : SingleSwitchProgramDescriptor(
         "PokemonBDSP:EggAutonomous",
         STRING_POKEMON + " BDSP", "Egg Autonomous",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonBDSP/EggAutonomous.md",
+        "Programs/PokemonBDSP/EggAutonomous.html",
         "Automatically fetch+hatch eggs and keep all shinies.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
         FeedbackType::REQUIRED,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
     )
 {}
 std::unique_ptr<StatsTracker> EggAutonomous_Descriptor::make_stats() const{
@@ -46,7 +48,7 @@ EggAutonomous::EggAutonomous()
     , LANGUAGE(
         "<b>Game Language:</b><br>Required to read IVs.",
         PokemonSwSh::IV_READER().languages(),
-        LockWhileRunning::LOCKED,
+        LockMode::LOCK_WHILE_RUNNING,
         false
     )
     , SHORTCUT("<b>Bike Shortcut:</b>")
@@ -54,14 +56,13 @@ EggAutonomous::EggAutonomous()
         "<b>Max Keepers:</b><br>Stop the program after keeping this many " + STRING_POKEMON + ". "
         "This number plus the number of " + STRING_POKEMON + " in your last box must not exceed 30. "
         "Otherwise, the program will break when that box is full.",
-        LockWhileRunning::LOCKED,
+        LockMode::LOCK_WHILE_RUNNING,
         10, 1, 30
     )
-    , TRAVEL_TIME_PER_FETCH(
+    , TRAVEL_TIME_PER_FETCH0(
         "<b>Travel Time per Fetch:</b><br>Fetch an egg after traveling for this long.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "20 * TICKS_PER_SECOND"
+        LockMode::LOCK_WHILE_RUNNING,
+        "20 s"
     )
     , NUM_EGGS_IN_COLUMN(
         "<b>Num Eggs in Column:</b><br>How many eggs already deposited in the first column in Box 1.",
@@ -73,7 +74,7 @@ EggAutonomous::EggAutonomous()
             {4, "4", "4"},
             {5, "5", "5"},
         },
-        LockWhileRunning::LOCKED,
+        LockMode::LOCK_WHILE_RUNNING,
         0
     )
     , AUTO_SAVING(
@@ -87,9 +88,18 @@ EggAutonomous::EggAutonomous()
             {AutoSave::AfterStartAndKeep, "start-and-keep", "Save at beginning and after obtaining each baby that is kept. (Allows for error/crash recovery.)"},
             {AutoSave::EveryBatch, "every-batch", "Save before every batch. (Allows you to unhatch eggs.)"},
         },
-        LockWhileRunning::LOCKED,
+        LockMode::LOCK_WHILE_RUNNING,
         AutoSave::AfterStartAndKeep
     )
+    , FILTERS0(
+        StatsHuntIvJudgeFilterTable_Label_Eggs,
+        {
+            .action = true,
+            .shiny = true,
+            .gender = true,
+            .nature = true,
+        }
+    )
     , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
     , NOTIFICATION_NONSHINY_KEEP(
         "Non-Shiny Keep",
@@ -112,25 +122,24 @@ EggAutonomous::EggAutonomous()
     , m_advanced_options(
         "<font size=4><b>Advanced Options:</b> You should not need to touch anything below here.</font>"
     )
-    , SCROLL_TO_READ_DELAY(
+    , SCROLL_TO_READ_DELAY0(
         "<b>Scroll to Read Delay:</b><br>Wait this long after scrolling in the box to read the " + STRING_POKEMON + "'s stats. "
         "Increase this if your video has high latency.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "125"
+        LockMode::LOCK_WHILE_RUNNING,
+        "1000 ms"
     )
 {
     PA_ADD_OPTION(GO_HOME_WHEN_DONE);
     PA_ADD_OPTION(LANGUAGE);
     PA_ADD_OPTION(SHORTCUT);
     PA_ADD_OPTION(MAX_KEEPERS);
-    PA_ADD_OPTION(TRAVEL_TIME_PER_FETCH);
+    PA_ADD_OPTION(TRAVEL_TIME_PER_FETCH0);
     PA_ADD_OPTION(NUM_EGGS_IN_COLUMN);
     PA_ADD_OPTION(AUTO_SAVING);
-    PA_ADD_OPTION(FILTERS);
+    PA_ADD_OPTION(FILTERS0);
     PA_ADD_OPTION(NOTIFICATIONS);
     PA_ADD_STATIC(m_advanced_options);
-    PA_ADD_OPTION(SCROLL_TO_READ_DELAY);
+    PA_ADD_OPTION(SCROLL_TO_READ_DELAY0);
 }
 
 
@@ -138,7 +147,7 @@ EggAutonomous::EggAutonomous()
 
 
 bool EggAutonomous::run_batch(
-    SingleSwitchProgramEnvironment& env, BotBaseContext& context,
+    SingleSwitchProgramEnvironment& env, ProControllerContext& context,
     EggAutonomousState& saved_state,
     EggAutonomousState& current_state
 ){
@@ -168,26 +177,26 @@ bool EggAutonomous::run_batch(
     return current_state.process_batch();
 }
 
-void EggAutonomous::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
+void EggAutonomous::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
     EggAutonomousStats& stats = env.current_stats<EggAutonomousStats>();
     env.update_stats();
 
     //  Connect the controller.
-    pbf_move_right_joystick(context, 0, 255, 10, 0);
+    require_player(env.console, context, BUTTON_L);
 
     //  Move to corner.
-    pbf_move_left_joystick(context, 0, 255, 125, 0);
+    pbf_move_left_joystick(context, {-1, -1}, 1000ms, 0ms);
 
     EggAutonomousState current_state(
         env, env.console, context,
         stats,
         NOTIFICATION_NONSHINY_KEEP,
         NOTIFICATION_SHINY,
-        SCROLL_TO_READ_DELAY,
+        SCROLL_TO_READ_DELAY0,
         LANGUAGE,
         SHORTCUT,
-        TRAVEL_TIME_PER_FETCH,
-        FILTERS,
+        TRAVEL_TIME_PER_FETCH0,
+        FILTERS0,
         MAX_KEEPERS,
         static_cast<uint8_t>(NUM_EGGS_IN_COLUMN.current_value())
     );
@@ -209,22 +218,22 @@ void EggAutonomous::program(SingleSwitchProgramEnvironment& env, BotBaseContext&
                 break;
             }
             consecutive_failures = 0;
-        }catch (OperationFailedException& e){
+        }catch (OperationFailedExceptionWithScreenshot& e){
             // If there is no auto save, then we shouldn't reset to game to lose previous progress.
             if (AUTO_SAVING == AutoSave::NoAutoSave){
                 throw;
             }
-            e.send_notification(env, NOTIFICATION_ERROR_RECOVERABLE);
+            e.send_recoverable_error_notif_and_telemetry_report(env, NOTIFICATION_ERROR_RECOVERABLE);
 
             consecutive_failures++;
             if (consecutive_failures >= 3){
-                throw OperationFailedException(
-                    ErrorReport::SEND_ERROR_REPORT, env.console,
+                OperationFailedExceptionWithScreenshot::fire(
+                    ErrorReportMode::SEND_ERROR_REPORT,
                     "Failed 3 batches in the row.",
-                    true
+                    env.console
                 );
             }
-            pbf_press_button(context, BUTTON_HOME, 20, GameSettings::instance().GAME_TO_HOME_DELAY);
+            pbf_press_button(context, BUTTON_HOME, 160ms, GameSettings::instance().GAME_TO_HOME_DELAY0);
             reset_game_from_home(env, env.console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST);
             current_state.set(saved_state);
         }
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggAutonomous.h b/SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggAutonomous.h
index 0d4d42ad22..70fc69cc32 100644
--- a/SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggAutonomous.h
+++ b/SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggAutonomous.h
@@ -1,6 +1,6 @@
 /*  Egg Autonomous
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -9,13 +9,13 @@
 
 #include "Common/Cpp/Options/StaticTextOption.h"
 #include "Common/Cpp/Options/SimpleIntegerOption.h"
-#include "Common/Cpp/Options/TimeExpressionOption.h"
-#include "CommonFramework/Options/LanguageOCROption.h"
+#include "Common/Cpp/Options/TimeDurationOption.h"
 #include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "CommonTools/Options/LanguageOCROption.h"
 #include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
 #include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "Pokemon/Options/Pokemon_StatsHuntFilter.h"
 #include "PokemonBDSP/Options/PokemonBDSP_ShortcutDirection.h"
-#include "Pokemon/Options/Pokemon_EggHatchFilter.h"
 #include "PokemonBDSP_EggAutonomousState.h"
 
 namespace PokemonAutomation{
@@ -32,13 +32,14 @@ class EggAutonomous_Descriptor : public SingleSwitchProgramDescriptor{
 
 class EggAutonomous : public SingleSwitchProgramInstance{
 public:
+    using Descriptor = EggAutonomous_Descriptor;
     EggAutonomous();
 
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
 
 private:
     bool run_batch(
-        SingleSwitchProgramEnvironment& env, BotBaseContext& context,
+        SingleSwitchProgramEnvironment& env, ProControllerContext& context,
         EggAutonomousState& saved_state,
         EggAutonomousState& current_state
     );
@@ -50,7 +51,7 @@ class EggAutonomous : public SingleSwitchProgramInstance{
 
     ShortcutDirectionOption SHORTCUT;
     SimpleIntegerOption<uint8_t> MAX_KEEPERS;
-    TimeExpressionOption<uint16_t> TRAVEL_TIME_PER_FETCH;
+    MillisecondsOption TRAVEL_TIME_PER_FETCH0;
     IntegerEnumDropdownOption NUM_EGGS_IN_COLUMN;
 
     enum class AutoSave{
@@ -59,8 +60,8 @@ class EggAutonomous : public SingleSwitchProgramInstance{
         EveryBatch,
     };
     EnumDropdownOption<AutoSave> AUTO_SAVING;
-
-    Pokemon::EggHatchFilterTable FILTERS;
+    
+    Pokemon::StatsHuntIvJudgeFilterTable FILTERS0;
 
     EventNotificationOption NOTIFICATION_STATUS_UPDATE;
     EventNotificationOption NOTIFICATION_NONSHINY_KEEP;
@@ -68,7 +69,7 @@ class EggAutonomous : public SingleSwitchProgramInstance{
     EventNotificationsOption NOTIFICATIONS;
 
     SectionDividerOption m_advanced_options;
-    TimeExpressionOption<uint16_t> SCROLL_TO_READ_DELAY;
+    MillisecondsOption SCROLL_TO_READ_DELAY0;
 };
 
 
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggAutonomousState.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggAutonomousState.cpp
index ba50f4b566..b71cd64c7b 100644
--- a/SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggAutonomousState.cpp
+++ b/SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggAutonomousState.cpp
@@ -1,21 +1,19 @@
 /*  Egg Autonomous State
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include <cmath>
-#include "Common/Compiler.h"
-#include "Common/Cpp/Exceptions.h"
-#include "CommonFramework/Exceptions/OperationFailedException.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
 #include "CommonFramework/ImageTools/ImageStats.h"
-#include "CommonFramework/ImageTools/SolidColorTest.h"
 #include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
-#include "CommonFramework/Inference/FrozenImageDetector.h"
-#include "CommonFramework/Inference/ImageMatchDetector.h"
 #include "CommonFramework/Tools/ErrorDumper.h"
 #include "CommonFramework/Tools/ProgramEnvironment.h"
+#include "CommonTools/Images/SolidColorTest.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "CommonTools/VisualDetectors/FrozenImageDetector.h"
+#include "CommonTools/VisualDetectors/ImageMatchDetector.h"
 #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
 #include "Pokemon/Pokemon_Notification.h"
 #include "PokemonBDSP/PokemonBDSP_Settings.h"
@@ -23,7 +21,7 @@
 #include "PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxGenderDetector.h"
 #include "PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxNatureDetector.h"
 #include "PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxShinyDetector.h"
-#include "PokemonBDSP/Inference/BoxSystem/PokemonBDSP_IVCheckerReader.h"
+#include "PokemonBDSP/Inference/BoxSystem/PokemonBDSP_IvJudgeReader.h"
 #include "PokemonBDSP/Programs/PokemonBDSP_GameNavigation.h"
 #include "PokemonBDSP_EggRoutines.h"
 #include "PokemonBDSP_EggFeedback.h"
@@ -43,7 +41,7 @@ EggAutonomousStats::EggAutonomousStats()
     , m_shinies(m_stats["Shinies"])
 {
     m_display_order.emplace_back("Eggs Hatched");
-    m_display_order.emplace_back("Errors", true);
+    m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
     m_display_order.emplace_back("Fetch Attempts");
     m_display_order.emplace_back("Fetch Success");
     m_display_order.emplace_back("Shinies");
@@ -92,23 +90,22 @@ class EggReceivedDetector : public VisualInferenceCallback{
 
 
 
-EventNotificationOption EggAutonomousState::m_notification_noop("", false, false);
 
 
 EggAutonomousState::EggAutonomousState(
-    ProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context,
+    ProgramEnvironment& env, VideoStream& stream, ProControllerContext& context,
     EggAutonomousStats& stats,
     EventNotificationOption& notification_nonshiny_keep,
     EventNotificationOption& notification_shiny,
-    uint16_t scroll_to_read_delay,
+    Milliseconds scroll_to_read_delay,
     Language language,
     ShortcutDirectionOption& shortcut,
-    uint16_t travel_time_per_fetch,
-    const EggHatchFilterTable& filters,
+    Milliseconds travel_time_per_fetch,
+    const StatsHuntIvJudgeFilterTable& filters,
     uint8_t max_keepers,
     uint8_t existing_eggs_in_columns
 )
-    : m_env(env), m_console(console), m_context(context)
+    : m_env(env), m_stream(stream), m_context(context)
     , m_stats(stats)
     , m_notification_nonshiny_keep(notification_nonshiny_keep)
     , m_notification_shiny(notification_shiny)
@@ -128,7 +125,7 @@ void EggAutonomousState::dump() const{
     str += "\n    Box Column: " + std::to_string(m_eggs_in_column);
     str += "\n    Party Eggs: " + std::to_string(m_eggs_in_party);
     str += "\n    Babies Saved: " + std::to_string(m_babies_saved);
-    m_console.log(str);
+    m_stream.log(str);
 }
 void EggAutonomousState::set(const EggAutonomousState& state){
     m_on_bike = state.m_on_bike;
@@ -139,10 +136,10 @@ void EggAutonomousState::set(const EggAutonomousState& state){
 
 void EggAutonomousState::process_error(const std::string& name, const char* message){
     m_stats.m_errors++;
-    throw OperationFailedException(
-        ErrorReport::SEND_ERROR_REPORT, m_console,
+    OperationFailedExceptionWithScreenshot::fire(
+        ErrorReportMode::SEND_ERROR_REPORT,
         message,
-        true
+        m_stream
     );
 }
 
@@ -152,7 +149,7 @@ void EggAutonomousState::process_shiny(const ImageViewRGB32& screen){
     m_env.update_stats();
     send_encounter_notification(
         m_env,
-        m_notification_noop,
+        EventNotificationOption_NOOP(),
         m_notification_shiny,
         false, true, {{{}, ShinyType::UNKNOWN_SHINY}}, std::nan(""),
         screen
@@ -161,42 +158,41 @@ void EggAutonomousState::process_shiny(const ImageViewRGB32& screen){
 
 
 void EggAutonomousState::withdraw_egg_column(){
-    m_console.log("Withdrawing column from box to your party...");
+    m_stream.log("Withdrawing column from box to your party...");
 
-    const uint16_t BOX_SCROLL_DELAY = GameSettings::instance().BOX_SCROLL_DELAY_0;
-    const uint16_t BOX_PICKUP_DROP_DELAY = GameSettings::instance().BOX_PICKUP_DROP_DELAY;
+    const Milliseconds BOX_SCROLL_DELAY = GameSettings::instance().BOX_SCROLL_DELAY0;
+    const Milliseconds BOX_PICKUP_DROP_DELAY = GameSettings::instance().BOX_PICKUP_DROP_DELAY0;
 
-    pbf_press_button(m_context, BUTTON_Y, 20, 50);
-    pbf_press_button(m_context, BUTTON_Y, 20, 50);
+    pbf_press_button(m_context, BUTTON_Y, 160ms, 400ms);
+    pbf_press_button(m_context, BUTTON_Y, 160ms, 400ms);
     pickup_column(m_context);
-    pbf_move_right_joystick(m_context, 0, 128, 20, BOX_SCROLL_DELAY);
-    pbf_move_right_joystick(m_context, 128, 255, 20, BOX_SCROLL_DELAY);
-    pbf_press_button(m_context, BUTTON_ZL, 20, BOX_PICKUP_DROP_DELAY);
+    pbf_move_right_joystick(m_context, {-1, 0}, 160ms, BOX_SCROLL_DELAY);
+    pbf_move_right_joystick(m_context, {0, -1}, 160ms, BOX_SCROLL_DELAY);
+    pbf_press_button(m_context, BUTTON_ZL, 160ms, BOX_PICKUP_DROP_DELAY);
 
     m_eggs_in_column = 0;
     m_eggs_in_party = 5;
 }
 bool EggAutonomousState::process_party(){
-    m_console.log("Processing party...");
+    m_stream.log("Processing party...");
 
-    const uint16_t BOX_SCROLL_DELAY = GameSettings::instance().BOX_SCROLL_DELAY_0;
-//    std::chrono::milliseconds SCROLL_TO_READ_DELAY((uint64_t)m_scroll_to_read_delay * 1000 / TICKS_PER_SECOND);
+    const Milliseconds BOX_SCROLL_DELAY = GameSettings::instance().BOX_SCROLL_DELAY0;
 
-    pbf_move_right_joystick(m_context, 0, 128, 20, BOX_SCROLL_DELAY);
-    pbf_move_right_joystick(m_context, 128, 255, 20, BOX_SCROLL_DELAY);
+    pbf_move_right_joystick(m_context, {-1, 0}, 160ms, BOX_SCROLL_DELAY);
+    pbf_move_right_joystick(m_context, {0, -1}, 160ms, BOX_SCROLL_DELAY);
     pbf_wait(m_context, m_scroll_to_read_delay);
     m_context.wait_for_all_requests();
 //    m_env.wait_for(SCROLL_TO_READ_DELAY);
 
     BoxShinyDetector shiny_reader;
-    IVCheckerReaderScope iv_reader(m_console, m_language);
-    BoxNatureDetector nature_detector(m_console.overlay(), m_language);
+    IvJudgeReaderScope iv_reader(m_stream.overlay(), m_language);
+    BoxNatureDetector nature_detector(m_stream.overlay(), m_language);
 
-    VideoOverlaySet set(m_console);
+    VideoOverlaySet set(m_stream.overlay());
     shiny_reader.make_overlays(set);
 
     //  Make sure the stats menu is up.
-    VideoSnapshot screen = m_console.video().snapshot();
+    VideoSnapshot screen = m_stream.video().snapshot();
     if (!shiny_reader.is_panel(screen)){
         process_error("StatsPanel", "Stats panel not detected.");
     }
@@ -204,13 +200,13 @@ bool EggAutonomousState::process_party(){
     //  Run through the 5 hatchlings and release all the non-shinies.
     for (size_t c = 0; c < 5; c++){
         if (c != 0){
-            pbf_move_right_joystick(m_context, 128, 0, 20, BOX_SCROLL_DELAY);
-            pbf_move_right_joystick(m_context, 128, 255, 20, BOX_SCROLL_DELAY);
+            pbf_move_right_joystick(m_context, {0, +1}, 160ms, BOX_SCROLL_DELAY);
+            pbf_move_right_joystick(m_context, {0, -1}, 160ms, BOX_SCROLL_DELAY);
             pbf_wait(m_context, m_scroll_to_read_delay);
             m_context.wait_for_all_requests();
 //            m_env.wait_for(SCROLL_TO_READ_DELAY);
 
-            screen = m_console.video().snapshot();
+            screen = m_stream.video().snapshot();
             if (!shiny_reader.is_panel(screen)){
                 process_error("StatsPanel", "Stats panel not detected.");
             }
@@ -219,20 +215,20 @@ bool EggAutonomousState::process_party(){
 
         bool shiny = shiny_reader.detect(screen);
         if (shiny){
-            m_console.log("Pokemon " + std::to_string(c) + " is shiny!", COLOR_BLUE);
+            m_stream.log("Pokemon " + std::to_string(c) + " is shiny!", COLOR_BLUE);
             process_shiny(screen);
         }else{
-            m_console.log("Pokemon " + std::to_string(c) + " is not shiny.", COLOR_PURPLE);
+            m_stream.log("Pokemon " + std::to_string(c) + " is not shiny.", COLOR_PURPLE);
         }
-        IVCheckerReader::Results IVs = iv_reader.read(m_console, screen);
-        EggHatchGenderFilter gender = read_gender_from_box(m_console, m_console, screen);
-        NatureReader::Results nature = nature_detector.read(m_console.logger(), screen);
+        IvJudgeReader::Results IVs = iv_reader.read(m_stream.logger(), screen);
+        StatsHuntGenderFilter gender = read_gender_from_box(m_stream.logger(), m_stream.overlay(), screen);
+        NatureReader::Results nature = nature_detector.read(m_stream.logger(), screen);
 
-        EggHatchAction action = m_filters.get_action(shiny, IVs, gender, nature);
+        StatsHuntAction action = m_filters.get_action(shiny, gender, nature.nature, IVs);
 
         switch (action){
-        case EggHatchAction::StopProgram:
-            m_console.log("Program stop requested...");
+        case StatsHuntAction::StopProgram:
+            m_stream.log("Program stop requested...");
             if (!shiny){
                 send_encounter_notification(
                     m_env,
@@ -243,8 +239,8 @@ bool EggAutonomousState::process_party(){
                 );
             }
             return true;
-        case EggHatchAction::Keep:
-            m_console.log("Moving Pokemon to keep box...", COLOR_BLUE);
+        case StatsHuntAction::Keep:
+            m_stream.log("Moving Pokemon to keep box...", COLOR_BLUE);
             if (!shiny){
                 send_encounter_notification(
                     m_env,
@@ -254,46 +250,46 @@ bool EggAutonomousState::process_party(){
                     screen
                 );
             }
-            pbf_press_button(m_context, BUTTON_ZL, 20, 105);
-            pbf_press_button(m_context, BUTTON_ZL, 20, 105);
-            pbf_move_right_joystick(m_context, 128, 0, 20, 105);
-            pbf_move_right_joystick(m_context, 128, 0, 20, 105);
-            pbf_move_right_joystick(m_context, 128, 0, 20, 105);
-            pbf_move_right_joystick(m_context, 255, 128, 20, 105);
-            pbf_press_button(m_context, BUTTON_ZL, 20, 230);
-            pbf_move_right_joystick(m_context, 0, 128, 20, 105);
-            pbf_move_right_joystick(m_context, 128, 0, 20, 105);
-            pbf_move_right_joystick(m_context, 128, 0, 20, 105);
-            pbf_press_button(m_context, BUTTON_ZL, 20, 105);
-            pbf_press_button(m_context, BUTTON_B, 20, 230);
-            pbf_press_button(m_context, BUTTON_R, 20, GameSettings::instance().BOX_CHANGE_DELAY_0);
-            pbf_move_right_joystick(m_context, 0, 128, 20, 105);
-            pbf_move_right_joystick(m_context, 128, 255, 20, 105);
-            pbf_move_right_joystick(m_context, 128, 255, 20, 105);
-            pbf_move_right_joystick(m_context, 128, 255, 20, 105);
+            pbf_press_button(m_context, BUTTON_ZL, 160ms, 840ms);
+            pbf_press_button(m_context, BUTTON_ZL, 160ms, 840ms);
+            pbf_move_right_joystick(m_context, {0, +1}, 160ms, 840ms);
+            pbf_move_right_joystick(m_context, {0, +1}, 160ms, 840ms);
+            pbf_move_right_joystick(m_context, {0, +1}, 160ms, 840ms);
+            pbf_move_right_joystick(m_context, {+1, 0}, 160ms, 840ms);
+            pbf_press_button(m_context, BUTTON_ZL, 160ms, 1840ms);
+            pbf_move_right_joystick(m_context, {-1, 0}, 160ms, 840ms);
+            pbf_move_right_joystick(m_context, {0, +1}, 160ms, 840ms);
+            pbf_move_right_joystick(m_context, {0, +1}, 160ms, 840ms);
+            pbf_press_button(m_context, BUTTON_ZL, 160ms, 840ms);
+            pbf_press_button(m_context, BUTTON_B, 160ms, 1840ms);
+            pbf_press_button(m_context, BUTTON_R, 160ms, GameSettings::instance().BOX_CHANGE_DELAY0);
+            pbf_move_right_joystick(m_context, {-1, 0}, 160ms, 840ms);
+            pbf_move_right_joystick(m_context, {0, -1}, 160ms, 840ms);
+            pbf_move_right_joystick(m_context, {0, -1}, 160ms, 840ms);
+            pbf_move_right_joystick(m_context, {0, -1}, 160ms, 840ms);
             m_babies_saved++;
             if (m_babies_saved >= m_max_keepers){
-                m_console.log("Max keepers reached. Stopping program...");
+                m_stream.log("Max keepers reached. Stopping program...");
                 return true;
             }
             break;
-        case EggHatchAction::Release:
-            m_console.log("Releasing Pokemon...", COLOR_PURPLE);
-            release(m_console, m_context);
+        case StatsHuntAction::Discard:
+            m_stream.log("Releasing Pokemon...", COLOR_PURPLE);
+            release(m_stream, m_context);
         }
     }
 
-    pbf_move_right_joystick(m_context, 128, 0, 20, BOX_SCROLL_DELAY);
-    pbf_move_right_joystick(m_context, 255, 128, 20, BOX_SCROLL_DELAY);
+    pbf_move_right_joystick(m_context, {0, +1}, 160ms, BOX_SCROLL_DELAY);
+    pbf_move_right_joystick(m_context, {+1, 0}, 160ms, BOX_SCROLL_DELAY);
     return false;
 }
 bool EggAutonomousState::process_batch(){
-    overworld_to_box(m_console, m_context);
+    overworld_to_box(m_stream, m_context);
     if (process_party()){
         return true;
     }
     withdraw_egg_column();
-    box_to_overworld(m_console, m_context);
+    box_to_overworld(m_stream, m_context);
     return false;
 }
 
@@ -307,13 +303,13 @@ void EggAutonomousState::fetch_egg(){
 
     //  Move to corner.
     m_context.wait_for_all_requests();
-    m_console.log("Attempting to fetch an egg.");
+    m_stream.log("Attempting to fetch an egg.");
     {
         ShortDialogWatcher dialog;
-        int ret = run_until(
-            m_console, m_context,
-            [](BotBaseContext& context){
-                pbf_move_left_joystick(context, 0, 255, 125, 0);
+        int ret = run_until<ProControllerContext>(
+            m_stream, m_context,
+            [](ProControllerContext& context){
+                pbf_move_left_joystick(context, {-1, -1}, 1000ms, 0ms);
             },
             {{dialog}}
         );
@@ -323,22 +319,22 @@ void EggAutonomousState::fetch_egg(){
     }
     m_context.wait_for(std::chrono::milliseconds(200));
 
-    m_console.log("Getting off bike.");
+    m_stream.log("Getting off bike.");
     if (m_on_bike){
-        m_shortcut.run(m_context, 100);
+        m_shortcut.run(m_context, 800ms);
         m_context.wait_for_all_requests();
         m_on_bike = false;
     }
 
-    m_console.log("Going to daycare man.");
+    m_stream.log("Going to daycare man.");
     {
         ShortDialogWatcher dialog;
-        int ret = run_until(
-            m_console, m_context,
-            [](BotBaseContext& context){
-                pbf_move_left_joystick(context, 0, 255, 30, 0);
-                pbf_move_left_joystick(context, 128, 0, 35, 0);
-                pbf_move_left_joystick(context, 255, 128, 60, 125);
+        int ret = run_until<ProControllerContext>(
+            m_stream, m_context,
+            [](ProControllerContext& context){
+                pbf_move_left_joystick(context, {-1, -1}, 240ms, 0ms);
+                pbf_move_left_joystick(context, {0, +1}, 280ms, 0ms);
+                pbf_move_left_joystick(context, {+1, 0}, 480ms, 1000ms);
             },
             {{dialog}}
         );
@@ -350,26 +346,26 @@ void EggAutonomousState::fetch_egg(){
     //  Talk to daycare man.
     {
         ShortDialogWatcher dialog;
-        int ret = run_until(
-            m_console, m_context,
-            [](BotBaseContext& context){
-                pbf_press_button(context, BUTTON_ZL, 20, 230);
+        int ret = run_until<ProControllerContext>(
+            m_stream, m_context,
+            [](ProControllerContext& context){
+                pbf_press_button(context, BUTTON_ZL, 160ms, 9840ms);
             },
             {{dialog}}
         );
         if (ret < 0){
             process_error("DaycareMan", "Unable to find daycare man.");
         }
-        m_console.log("Found daycare man!");
+        m_stream.log("Found daycare man!");
     }
 
     {
         EggReceivedDetector received;
-        run_until(
-            m_console, m_context,
-            [](BotBaseContext& context){
-                pbf_mash_button(context, BUTTON_ZL, 500);
-                pbf_mash_button(context, BUTTON_B, 500);
+        run_until<ProControllerContext>(
+            m_stream, m_context,
+            [](ProControllerContext& context){
+                pbf_mash_button(context, BUTTON_ZL, 4000ms);
+                pbf_mash_button(context, BUTTON_B, 4000ms);
             },
             {{received}}
         );
@@ -377,17 +373,17 @@ void EggAutonomousState::fetch_egg(){
         if (received.fetched()){
             m_eggs_in_column++;
             m_stats.m_fetch_success++;
-            m_console.log("Fetched an egg!", COLOR_BLUE);
+            m_stream.log("Fetched an egg!", COLOR_BLUE);
         }else{
-            m_console.log("No egg fetched.", COLOR_ORANGE);
+            m_stream.log("No egg fetched.", COLOR_ORANGE);
         }
         m_env.update_stats();
     }
 
-    m_console.log("Getting back on bike.");
-    m_shortcut.run(m_context, 100);
+    m_stream.log("Getting back on bike.");
+    m_shortcut.run(m_context, 800ms);
     m_on_bike = true;
-    pbf_move_left_joystick(m_context, 0, 255, 125, 0);
+    pbf_move_left_joystick(m_context, {-1, -1}, 1000ms, 0ms);
 }
 void EggAutonomousState::hatch_egg(){
     if (m_eggs_in_party == 0){
@@ -395,25 +391,25 @@ void EggAutonomousState::hatch_egg(){
     }
 
     //  Hatch the egg.
-    VideoSnapshot overworld = m_console.video().snapshot();
+    VideoSnapshot overworld = m_stream.video().snapshot();
 //    overworld.save("test-0.png");
     {
-        pbf_mash_button(m_context, BUTTON_B, 10 * TICKS_PER_SECOND);
+        pbf_mash_button(m_context, BUTTON_B, 10000ms);
         m_context.wait_for_all_requests();
 
         ShortDialogWatcher dialog;
         int ret = wait_until(
-            m_console, m_context, std::chrono::seconds(30),
+            m_stream, m_context, std::chrono::seconds(30),
             {{dialog}}
         );
         if (ret < 0){
             process_error("NoHatchEnd", "End of hatch not detected after 30 seconds.");
-//            throw OperationFailedException(m_console, "End of hatch not detected after 30 seconds.");
+//            OperationFailedExceptionWithScreenshot::fire(m_console, "End of hatch not detected after 30 seconds.");
         }
-        m_console.log("Egg finished hatching.");
+        m_stream.log("Egg finished hatching.");
         m_stats.m_hatched++;
         m_env.update_stats();
-        pbf_mash_button(m_context, BUTTON_B, 1 * TICKS_PER_SECOND);
+        pbf_mash_button(m_context, BUTTON_B, 1000ms);
     }
 
     //  Return to overworld.
@@ -423,9 +419,9 @@ void EggAutonomousState::hatch_egg(){
         //  Wait for steady state and read it again.
         m_context.wait_for(std::chrono::milliseconds(200));
         ImageMatchWatcher matcher(overworld.frame, {0.10, 0.10, 0.80, 0.60}, 100);
-        ShortDialogPromptDetector prompt(m_console, {0.50, 0.60, 0.30, 0.20}, COLOR_GREEN);
+        ShortDialogPromptDetector prompt(m_stream.overlay(), {0.50, 0.60, 0.30, 0.20}, COLOR_GREEN);
         int ret = wait_until(
-            m_console, m_context, std::chrono::seconds(30),
+            m_stream, m_context, std::chrono::seconds(30),
             {
                 {matcher},
                 {prompt},
@@ -433,32 +429,31 @@ void EggAutonomousState::hatch_egg(){
         );
         switch (ret){
         case 0:
-            m_console.log("Returned to overworld.");
+            m_stream.log("Returned to overworld.");
             m_eggs_in_party--;
             return;
         case 1:
-            m_console.log("Detected prompt. Please turn off nicknaming.", COLOR_RED);
+            m_stream.log("Detected prompt. Please turn off nicknaming.", COLOR_RED);
             m_stats.m_errors++;
-            throw UserSetupError(m_console, "Please turn off nicknaming.");
+            throw UserSetupError(m_stream.logger(), "Please turn off nicknaming.");
         default:
-            m_console.log("Failed to detect overworld after 30 seconds. Did day/night change?", COLOR_RED);
-//            pbf_mash_button(context, BUTTON_ZL, 30 * TICKS_PER_SECOND);
+            m_stream.log("Failed to detect overworld after 30 seconds. Did day/night change?", COLOR_RED);
+//            pbf_mash_button(context, BUTTON_ZL, 30000ms);
             return;
         }
     }
 }
 
 void EggAutonomousState::hatch_rest_of_party(){
-    m_console.log("Hatching rest of party without fetching...");
+    m_stream.log("Hatching rest of party without fetching...");
     while (m_eggs_in_party > 0){
         dump();
         ShortDialogWatcher dialog;
         FrozenImageDetector frozen(COLOR_CYAN, {0, 0, 1, 0.5}, std::chrono::seconds(60), 20);
-        int ret = run_until(
-            m_console, m_context,
-            [&](BotBaseContext& context){
-                egg_spin(context, 480 * TICKS_PER_SECOND);
-//                egg_spin(context, 5 * TICKS_PER_SECOND);
+        int ret = run_until<ProControllerContext>(
+            m_stream, m_context,
+            [&](ProControllerContext& context){
+                egg_spin(context, false, 8min);
             },
             {
                 {dialog},
@@ -467,7 +462,7 @@ void EggAutonomousState::hatch_rest_of_party(){
         );
         switch (ret){
         case 0:
-            m_console.log("Egg is hatching!");
+            m_stream.log("Egg is hatching!");
             m_context.wait_for_all_requests();
             hatch_egg();
             break;
@@ -481,21 +476,21 @@ void EggAutonomousState::hatch_rest_of_party(){
 }
 void EggAutonomousState::spin_until_fetch_or_hatch(){
     m_context.wait_for_all_requests();
-    m_console.log("Looking for more eggs...");
+    m_stream.log("Looking for more eggs...");
     ShortDialogWatcher dialog;
-    int ret = run_until(
-        m_console, m_context,
-        [&](BotBaseContext& context){
-            egg_spin(context, m_travel_time_per_fetch);
+    int ret = run_until<ProControllerContext>(
+        m_stream, m_context,
+        [&](ProControllerContext& context){
+            egg_spin(context, false, m_travel_time_per_fetch);
         },
         {{dialog}}
     );
     m_context.wait_for(std::chrono::milliseconds(200));
     if (ret < 0){
-//        m_console.log("Attempting to fetch an egg.");
+//        m_stream.log("Attempting to fetch an egg.");
         fetch_egg();
     }else{
-//        m_console.log("Egg is hatching!");
+//        m_stream.log("Egg is hatching!");
 //        hatch_egg();
     }
 }
@@ -507,8 +502,8 @@ bool EggAutonomousState::overworld_detect_and_run_state(){
     dump();
 
     //  Egg is hatching. Handle that now.
-    if (dialog.detect(m_console.video().snapshot())){
-        m_console.log("Egg is hatching!");
+    if (dialog.detect(m_stream.video().snapshot())){
+        m_stream.log("Egg is hatching!");
         hatch_egg();
         return false;
     }
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggAutonomousState.h b/SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggAutonomousState.h
index 2d734c1227..8c6254ca64 100644
--- a/SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggAutonomousState.h
+++ b/SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggAutonomousState.h
@@ -1,18 +1,18 @@
 /*  Egg Autonomous State
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifndef PokemonAutomation_PokemonBDSP_EggAutonomousState_H
 #define PokemonAutomation_PokemonBDSP_EggAutonomousState_H
 
-#include "Common/Compiler.h"
+//#include "Common/Compiler.h"
 #include "CommonFramework/Language.h"
 #include "CommonFramework/Notifications/EventNotificationOption.h"
-#include "CommonFramework/Tools/StatsTracking.h"
-#include "CommonFramework/Tools/ConsoleHandle.h"
-#include "Pokemon/Options/Pokemon_EggHatchFilter.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/Tools/VideoStream.h"
+#include "Pokemon/Options/Pokemon_StatsHuntFilter.h"
 #include "PokemonBDSP/Options/PokemonBDSP_ShortcutDirection.h"
 
 namespace PokemonAutomation{
@@ -36,15 +36,15 @@ struct EggAutonomousStats : public StatsTracker{
 class EggAutonomousState{
 public:
     EggAutonomousState(
-        ProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context,
+        ProgramEnvironment& env, VideoStream& stream, ProControllerContext& context,
         EggAutonomousStats& stats,
         EventNotificationOption& notification_nonshiny_keep,
         EventNotificationOption& notification_shiny,
-        uint16_t scroll_to_read_delay,
+        Milliseconds scroll_to_read_delay,
         Language language,
         ShortcutDirectionOption& shortcut,
-        uint16_t travel_time_per_fetch,
-        const Pokemon::EggHatchFilterTable& filters,
+        Milliseconds travel_time_per_fetch,
+        const Pokemon::StatsHuntIvJudgeFilterTable& filters,
         uint8_t max_keepers,
         uint8_t existing_eggs_in_columns
     );
@@ -79,17 +79,16 @@ class EggAutonomousState{
 
 private:
     ProgramEnvironment& m_env;
-    ConsoleHandle& m_console;
-    BotBaseContext& m_context;
+    VideoStream& m_stream;
+    ProControllerContext& m_context;
     EggAutonomousStats& m_stats;
-    static EventNotificationOption m_notification_noop;
     EventNotificationOption& m_notification_nonshiny_keep;
     EventNotificationOption& m_notification_shiny;
-    uint16_t m_scroll_to_read_delay;
+    Milliseconds m_scroll_to_read_delay;
     Language m_language;
     ShortcutDirectionOption& m_shortcut;
-    uint16_t m_travel_time_per_fetch;
-    const Pokemon::EggHatchFilterTable& m_filters;
+    Milliseconds m_travel_time_per_fetch;
+    const Pokemon::StatsHuntIvJudgeFilterTable& m_filters;
     uint8_t m_max_keepers;
 
     bool m_on_bike = true;
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggFeedback.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggFeedback.cpp
index a69df14d1d..f9ef665430 100644
--- a/SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggFeedback.cpp
+++ b/SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggFeedback.cpp
@@ -1,15 +1,14 @@
 /*  Egg Feedback
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include "CommonFramework/Exceptions/OperationFailedException.h"
-#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
 #include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
-#include "CommonFramework/Inference/ImageMatchDetector.h"
-#include "CommonFramework/Inference/FrozenImageDetector.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "CommonTools/VisualDetectors/FrozenImageDetector.h"
+#include "CommonTools/VisualDetectors/ImageMatchDetector.h"
 #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
 #include "PokemonBDSP/PokemonBDSP_Settings.h"
 #include "PokemonBDSP/Inference/PokemonBDSP_DialogDetector.h"
@@ -24,19 +23,19 @@ namespace PokemonBDSP{
 
 
 
-void hatch_egg(ConsoleHandle& console, BotBaseContext& context){
+void hatch_egg(VideoStream& stream, ProControllerContext& context){
     //  Spin until egg starts hatching.
     do{
         ShortDialogWatcher dialog;
         FrozenImageDetector frozen(COLOR_CYAN, {0, 0, 1, 0.5}, std::chrono::seconds(10), 20);
-        if (dialog.detect(console.video().snapshot())){
+        if (dialog.detect(stream.video().snapshot())){
             break;
         }
 
-        int ret = run_until(
-            console, context,
-            [](BotBaseContext& context){
-                egg_spin(context, 480 * TICKS_PER_SECOND);
+        int ret = run_until<ProControllerContext>(
+            stream, context,
+            [](ProControllerContext& context){
+                egg_spin(context, false, 8min);
             },
             {
                 {dialog},
@@ -45,45 +44,45 @@ void hatch_egg(ConsoleHandle& console, BotBaseContext& context){
         );
         switch (ret){
         case 0:
-            console.log("Egg is hatching!");
+            stream.log("Egg is hatching!");
             break;
         case 1:
-            throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, console,
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
                 "Frozen screen detected!",
-                true
+                stream
             );
         default:
-            throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, console,
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
                 "No hatch detected after 8 minutes of spinning.",
-                true
+                stream
             );
         }
     }while (false);
 
 
     //  Hatch the egg.
-    VideoSnapshot overworld = console.video().snapshot();
+    VideoSnapshot overworld = stream.video().snapshot();
 //    overworld.save("test-0.png");
     {
-        pbf_mash_button(context, BUTTON_B, 10 * TICKS_PER_SECOND);
+        pbf_mash_button(context, BUTTON_B, 10000ms);
         context.wait_for_all_requests();
 
         ShortDialogWatcher dialog;
         int ret = wait_until(
-            console, context, std::chrono::seconds(30),
+            stream, context, std::chrono::seconds(30),
             {{dialog}}
         );
         if (ret < 0){
-            throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, console,
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
                 "End of hatch not detected after 30 seconds.",
-                true
+                stream
             );
         }
-        console.log("Egg finished hatching.");
-        pbf_mash_button(context, BUTTON_B, 1 * TICKS_PER_SECOND);
+        stream.log("Egg finished hatching.");
+        pbf_mash_button(context, BUTTON_B, 1000ms);
     }
 
     //  Return to overworld.
@@ -93,9 +92,9 @@ void hatch_egg(ConsoleHandle& console, BotBaseContext& context){
         //  Wait for steady state and read it again.
         context.wait_for(std::chrono::milliseconds(200));
         ImageMatchWatcher matcher(overworld.frame, {0.10, 0.10, 0.80, 0.60}, 100);
-        SelectionArrowFinder arrow(console, {0.50, 0.60, 0.30, 0.20}, COLOR_GREEN);
+        SelectionArrowFinder arrow(stream.overlay(), {0.50, 0.60, 0.30, 0.20}, COLOR_GREEN);
         int ret = wait_until(
-            console, context, std::chrono::seconds(30),
+            stream, context, std::chrono::seconds(30),
             {
                 {matcher},
                 {arrow},
@@ -103,57 +102,57 @@ void hatch_egg(ConsoleHandle& console, BotBaseContext& context){
         );
         switch (ret){
         case 0:
-            console.log("Returned to overworld.");
+            stream.log("Returned to overworld.");
             return;
         case 1:
-            throw UserSetupError(console, "Detected prompt. Please turn off nicknaming.");
+            throw UserSetupError(stream.logger(), "Detected prompt. Please turn off nicknaming.");
         default:
-            console.log("Failed to detect overworld after 30 seconds. Did day/night change?", COLOR_RED);
-//            pbf_mash_button(context, BUTTON_ZL, 30 * TICKS_PER_SECOND);
+            stream.log("Failed to detect overworld after 30 seconds. Did day/night change?", COLOR_RED);
+//            pbf_mash_button(context, BUTTON_ZL, 30000ms);
             return;
         }
     }
 }
-void hatch_party(ConsoleHandle& console, BotBaseContext& context, size_t eggs){
+void hatch_party(VideoStream& stream, ProControllerContext& context, size_t eggs){
     for (size_t c = 0; c < eggs; c++){
-        hatch_egg(console, context);
+        hatch_egg(stream, context);
     }
 }
 
-void withdraw_1st_column_from_overworld(ConsoleHandle& console, BotBaseContext& context){
-    const uint16_t BOX_SCROLL_DELAY = GameSettings::instance().BOX_SCROLL_DELAY_0;
-    const uint16_t BOX_PICKUP_DROP_DELAY = GameSettings::instance().BOX_PICKUP_DROP_DELAY;
-    overworld_to_box(console, context);
-    pbf_press_button(context, BUTTON_Y, 20, 50);
-    pbf_press_button(context, BUTTON_Y, 20, 50);
+void withdraw_1st_column_from_overworld(VideoStream& stream, ProControllerContext& context){
+    const Milliseconds BOX_SCROLL_DELAY = GameSettings::instance().BOX_SCROLL_DELAY0;
+    const Milliseconds BOX_PICKUP_DROP_DELAY = GameSettings::instance().BOX_PICKUP_DROP_DELAY0;
+    overworld_to_box(stream, context);
+    pbf_press_button(context, BUTTON_Y, 160ms, 400ms);
+    pbf_press_button(context, BUTTON_Y, 160ms, 400ms);
     pickup_column(context);
-    pbf_move_right_joystick(context, 0, 128, 20, BOX_SCROLL_DELAY);
-    pbf_move_right_joystick(context, 128, 255, 20, BOX_SCROLL_DELAY);
-    pbf_press_button(context, BUTTON_ZL, 20, BOX_PICKUP_DROP_DELAY);
-    box_to_overworld(console, context);
+    pbf_move_right_joystick(context, {-1, 0}, 160ms, BOX_SCROLL_DELAY);
+    pbf_move_right_joystick(context, {0, -1}, 160ms, BOX_SCROLL_DELAY);
+    pbf_press_button(context, BUTTON_ZL, 160ms, BOX_PICKUP_DROP_DELAY);
+    box_to_overworld(stream, context);
 }
 
 
 
-void release(ConsoleHandle& console, BotBaseContext& context){
-    pbf_press_button(context, BUTTON_ZL, 20, 50);
-    pbf_move_right_joystick(context, 128, 0, 20, 10);
-    pbf_move_right_joystick(context, 128, 0, 20, 10);
-    pbf_press_button(context, BUTTON_ZL, 20, 105);
-    pbf_move_right_joystick(context, 128, 255, 20, 10);
+void release(VideoStream& stream, ProControllerContext& context){
+    pbf_press_button(context, BUTTON_ZL, 160ms, 400ms);
+    pbf_move_right_joystick(context, {0, +1}, 160ms, 240ms);
+    pbf_move_right_joystick(context, {0, +1}, 160ms, 240ms);
+    pbf_press_button(context, BUTTON_ZL, 160ms, 840ms);
+    pbf_move_right_joystick(context, {0, -1}, 160ms, 240ms);
 
     ShortDialogDetector detector;
     for (size_t c = 0; c < 3; c++){
         context.wait_for_all_requests();
-        if (!detector.detect(console.video().snapshot())){
+        if (!detector.detect(stream.video().snapshot())){
             return;
         }
-        pbf_press_button(context, BUTTON_ZL, 20, 105);
+        pbf_press_button(context, BUTTON_ZL, 160ms, 840ms);
     }
-    throw OperationFailedException(
-        ErrorReport::SEND_ERROR_REPORT, console,
+    OperationFailedExceptionWithScreenshot::fire(
+        ErrorReportMode::SEND_ERROR_REPORT,
         "Unexpected dialogs when releasing.",
-        true
+        stream
     );
 }
 
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggFeedback.h b/SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggFeedback.h
index 1f64f38bc9..427768937e 100644
--- a/SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggFeedback.h
+++ b/SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggFeedback.h
@@ -1,27 +1,27 @@
 /*  Egg Feedback
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifndef PokemonAutomation_PokemonBDSP_EggFeedback_H
 #define PokemonAutomation_PokemonBDSP_EggFeedback_H
 
-#include "CommonFramework/Tools/ConsoleHandle.h"
+#include "CommonFramework/Tools/VideoStream.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
 
 namespace PokemonAutomation{
-    class BotBaseContext;
 namespace NintendoSwitch{
 namespace PokemonBDSP{
 
 
-void hatch_egg(ConsoleHandle& console, BotBaseContext& context);
-void hatch_party(ConsoleHandle& console, BotBaseContext& context, size_t eggs = 5);
+void hatch_egg(VideoStream& stream, ProControllerContext& context);
+void hatch_party(VideoStream& stream, ProControllerContext& context, size_t eggs = 5);
 
-void withdraw_1st_column_from_overworld(ConsoleHandle& console, BotBaseContext& context);
+void withdraw_1st_column_from_overworld(VideoStream& stream, ProControllerContext& context);
 
 
-void release(ConsoleHandle& console, BotBaseContext& context);
+void release(VideoStream& stream, ProControllerContext& context);
 
 
 
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggFetcher.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggFetcher.cpp
index 45d2ab624a..6e23102f6f 100644
--- a/SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggFetcher.cpp
+++ b/SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggFetcher.cpp
@@ -1,12 +1,13 @@
 /*  Egg Fetcher
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include "CommonFramework/Tools/StatsTracking.h"
 #include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
 #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
 #include "Pokemon/Pokemon_Strings.h"
 #include "PokemonBDSP_EggRoutines.h"
 #include "PokemonBDSP_EggFetcher.h"
@@ -22,11 +23,12 @@ EggFetcher_Descriptor::EggFetcher_Descriptor()
     : SingleSwitchProgramDescriptor(
         "PokemonBDSP:EggFetcher",
         STRING_POKEMON + " BDSP", "Egg Fetcher",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonBDSP/EggFetcher.md",
+        "Programs/PokemonBDSP/EggFetcher.html",
         "Automatically fetch eggs from the daycare man.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
         FeedbackType::NONE,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
     )
 {}
 struct EggFetcher_Descriptor::Stats : public StatsTracker{
@@ -48,14 +50,13 @@ EggFetcher::EggFetcher()
     , SHORTCUT("<b>Bike Shortcut:</b>")
     , MAX_FETCH_ATTEMPTS(
         "<b>Fetch this many times:</b><br>This puts a limit on how many eggs you can get so you don't make a mess of your boxes for fetching too many.",
-        LockWhileRunning::LOCKED,
+        LockMode::LOCK_WHILE_RUNNING,
         2000
     )
-    , TRAVEL_TIME_PER_FETCH(
+    , TRAVEL_TIME_PER_FETCH0(
         "<b>Travel Time per Fetch:</b><br>Fetch an egg after traveling for this long.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "15 * TICKS_PER_SECOND"
+        LockMode::LOCK_WHILE_RUNNING,
+        "15 s"
     )
     , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
     , NOTIFICATIONS({
@@ -67,38 +68,38 @@ EggFetcher::EggFetcher()
     PA_ADD_OPTION(GO_HOME_WHEN_DONE);
     PA_ADD_OPTION(SHORTCUT);
     PA_ADD_OPTION(MAX_FETCH_ATTEMPTS);
-    PA_ADD_OPTION(TRAVEL_TIME_PER_FETCH);
+    PA_ADD_OPTION(TRAVEL_TIME_PER_FETCH0);
     PA_ADD_OPTION(NOTIFICATIONS);
 }
 
 
-void EggFetcher::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
+void EggFetcher::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
     EggFetcher_Descriptor::Stats& stats = env.current_stats<EggFetcher_Descriptor::Stats>();
     env.update_stats();
 
     //  Connect the controller.
-    pbf_move_right_joystick(context, 0, 255, 10, 0);
+    require_player(env.console, context, BUTTON_L);
 
     //  Move to corner.
-    pbf_move_left_joystick(context, 0, 255, 125, 0);
+    pbf_move_left_joystick(context, {-1, -1}, 1000ms, 0ms);
 
     for (uint16_t c = 0; c < MAX_FETCH_ATTEMPTS; c++){
         env.update_stats();
         send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
 
-        egg_spin_with_A(context, TRAVEL_TIME_PER_FETCH);
-        SHORTCUT.run(context, 100);
+        egg_spin(context, true, TRAVEL_TIME_PER_FETCH0);
+        SHORTCUT.run(context, 800ms);
 
         //  Move to man.
-        pbf_move_left_joystick(context, 0, 255, 30, 0);
-        pbf_move_left_joystick(context, 128, 0, 35, 0);
-        pbf_move_left_joystick(context, 255, 128, 60, 0);
+        pbf_move_left_joystick(context, {-1, -1}, 240ms, 0ms);
+        pbf_move_left_joystick(context, {0, +1}, 280ms, 0ms);
+        pbf_move_left_joystick(context, {+1, 0}, 480ms, 0ms);
 
         //  Fetch egg.
-        pbf_mash_button(context, BUTTON_ZL, 500);
-        pbf_mash_button(context, BUTTON_B, 500);
-        pbf_move_left_joystick(context, 0, 255, 125, 0);
-        SHORTCUT.run(context, 100);
+        pbf_mash_button(context, BUTTON_ZL, 4800ms);
+        pbf_mash_button(context, BUTTON_B, 4160ms);
+        pbf_move_left_joystick(context, {-1, -1}, 1000ms, 0ms);
+        SHORTCUT.run(context, 800ms);
 
         stats.m_attempts++;
     }
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggFetcher.h b/SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggFetcher.h
index edb7733e6d..46f98d70d2 100644
--- a/SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggFetcher.h
+++ b/SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggFetcher.h
@@ -1,6 +1,6 @@
 /*  Egg Fetcher
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -8,7 +8,7 @@
 #define PokemonAutomation_PokemonBDSP_EggFetcher_H
 
 #include "Common/Cpp/Options/SimpleIntegerOption.h"
-#include "Common/Cpp/Options/TimeExpressionOption.h"
+#include "Common/Cpp/Options/TimeDurationOption.h"
 #include "CommonFramework/Notifications/EventNotificationsTable.h"
 #include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
 #include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
@@ -34,15 +34,16 @@ class EggFetcher_Descriptor : public SingleSwitchProgramDescriptor{
 
 class EggFetcher : public SingleSwitchProgramInstance{
 public:
+    using Descriptor = EggFetcher_Descriptor;
     EggFetcher();
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
 
 private:
     GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
 
     ShortcutDirectionOption SHORTCUT;
     SimpleIntegerOption<uint16_t> MAX_FETCH_ATTEMPTS;
-    TimeExpressionOption<uint16_t> TRAVEL_TIME_PER_FETCH;
+    MillisecondsOption TRAVEL_TIME_PER_FETCH0;
 
     EventNotificationOption NOTIFICATION_STATUS_UPDATE;
     EventNotificationsOption NOTIFICATIONS;
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggHatcher.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggHatcher.cpp
index 02d9289319..6c3c75258e 100644
--- a/SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggHatcher.cpp
+++ b/SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggHatcher.cpp
@@ -1,13 +1,14 @@
 /*  Egg Hatcher
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include "CommonFramework/Tools/StatsTracking.h"
 #include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
 #include "NintendoSwitch/NintendoSwitch_Settings.h"
 #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
 #include "Pokemon/Pokemon_Strings.h"
 #include "PokemonBDSP/PokemonBDSP_Settings.h"
 #include "PokemonBDSP/Programs/PokemonBDSP_GameEntry.h"
@@ -25,11 +26,12 @@ EggHatcher_Descriptor::EggHatcher_Descriptor()
     : SingleSwitchProgramDescriptor(
         "PokemonBDSP:EggHatcher",
         STRING_POKEMON + " BDSP", "Egg Hatcher",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonBDSP/EggHatcher.md",
+        "Programs/PokemonBDSP/EggHatcher.html",
         "Hatch eggs from boxes.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
         FeedbackType::OPTIONAL_,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
     )
 {}
 struct EggHatcher_Descriptor::Stats : public StatsTracker{
@@ -50,12 +52,12 @@ EggHatcher::EggHatcher()
 //    , SHORTCUT("<b>Bike Shortcut:</b>")
     , BOXES_TO_HATCH(
         "<b>Boxes to Hatch:</b>",
-        LockWhileRunning::LOCKED,
+        LockMode::LOCK_WHILE_RUNNING,
         3
     )
     , SAVE_AND_RESET(
         "<b>Save and Reset:</b><br>After hatching a box, save the game and reset. This will recover from game crashes.",
-        LockWhileRunning::LOCKED,
+        LockMode::LOCK_WHILE_RUNNING,
         true
     )
     , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
@@ -67,17 +69,15 @@ EggHatcher::EggHatcher()
     , m_advanced_options(
         "<font size=4><b>Advanced Options:</b> You should not need to touch anything below here.</font>"
     )
-    , SAFETY_TIME0(
+    , SAFETY_TIME1(
         "<b>Safety Time:</b><br>Additional time added to the spinning.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "10 * TICKS_PER_SECOND"
+        LockMode::LOCK_WHILE_RUNNING,
+        "10000 ms"
     )
-    , HATCH_DELAY(
+    , HATCH_DELAY0(
         "<b>Hatch Delay:</b><br>Total animation time for hatching 5 eggs when there are no shinies.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "105 * TICKS_PER_SECOND"
+        LockMode::LOCK_WHILE_RUNNING,
+        "105 s"
     )
 {
     PA_ADD_OPTION(GO_HOME_WHEN_DONE);
@@ -86,21 +86,21 @@ EggHatcher::EggHatcher()
     PA_ADD_OPTION(STEPS_TO_HATCH);
     PA_ADD_OPTION(SAVE_AND_RESET);
     PA_ADD_STATIC(m_advanced_options);
-    PA_ADD_OPTION(SAFETY_TIME0);
-    PA_ADD_OPTION(HATCH_DELAY);
+    PA_ADD_OPTION(SAFETY_TIME1);
+    PA_ADD_OPTION(HATCH_DELAY0);
 }
 
 
 
 
-void EggHatcher::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
+void EggHatcher::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
     EggHatcher_Descriptor::Stats& stats = env.current_stats<EggHatcher_Descriptor::Stats>();
 
-    uint16_t INCUBATION_TIME = (uint16_t)((1258.5 + 4.05 * STEPS_TO_HATCH) * 1.05);
-    uint16_t TOTAL_DELAY = INCUBATION_TIME + SAFETY_TIME0 + HATCH_DELAY;
+    Milliseconds INCUBATION_TIME = (uint16_t)((1258.5 + 4.05 * STEPS_TO_HATCH) * 1.05) * 8ms;
+    Milliseconds TOTAL_DELAY = INCUBATION_TIME + SAFETY_TIME1.get() + HATCH_DELAY0.get();
 
     //  Connect the controller.
-    pbf_move_right_joystick(context, 0, 255, 10, 0);
+    require_player(env.console, context, BUTTON_L);
 
     uint8_t batches = BOXES_TO_HATCH * 6;
     uint8_t column = 0;
@@ -118,17 +118,17 @@ void EggHatcher::program(SingleSwitchProgramEnvironment& env, BotBaseContext& co
             }
         }else{
             deposit_party_to_column(context, 5);
-            pbf_press_button(context, BUTTON_R, 20, GameSettings::instance().BOX_CHANGE_DELAY_0);
+            pbf_press_button(context, BUTTON_R, 160ms, GameSettings::instance().BOX_CHANGE_DELAY0);
             box_to_overworld(context);
             save_game(context);
-            pbf_press_button(context, BUTTON_HOME, 20, GameSettings::instance().GAME_TO_HOME_DELAY);
+            pbf_press_button(context, BUTTON_HOME, 160ms, GameSettings::instance().GAME_TO_HOME_DELAY0);
             reset_game_from_home(env, env.console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST);
             withdraw_1st_column_from_overworld(context);
             column = 0;
         }
 
-        pbf_move_left_joystick(context, 0, 255, 125, 0);
-        egg_spin_with_A(context, TOTAL_DELAY);
+        pbf_move_left_joystick(context, {-1, -1}, 1000ms, 0ms);
+        egg_spin(context, true, TOTAL_DELAY);
 
         stats.m_batches++;
     }
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggHatcher.h b/SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggHatcher.h
index 9f1d7e8ea1..d131d3e3d3 100644
--- a/SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggHatcher.h
+++ b/SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggHatcher.h
@@ -1,6 +1,6 @@
 /*  Egg Hatcher
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -10,11 +10,11 @@
 #include "Common/Cpp/Options/StaticTextOption.h"
 #include "Common/Cpp/Options/BooleanCheckBoxOption.h"
 #include "Common/Cpp/Options/SimpleIntegerOption.h"
-#include "Common/Cpp/Options/TimeExpressionOption.h"
+#include "Common/Cpp/Options/TimeDurationOption.h"
 #include "CommonFramework/Notifications/EventNotificationsTable.h"
 #include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
 #include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-#include "PokemonSwSh/Options/PokemonSwSh_EggStepCount.h"
+#include "PokemonBDSP/Options/PokemonBDSP_EggStepOption.h"
 //#include "PokemonBDSP/Options/PokemonBDSP_ShortcutDirection.h"
 
 namespace PokemonAutomation{
@@ -34,9 +34,10 @@ class EggHatcher_Descriptor : public SingleSwitchProgramDescriptor{
 
 class EggHatcher : public SingleSwitchProgramInstance{
 public:
+    using Descriptor = EggHatcher_Descriptor;
     EggHatcher();
 
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
 
 private:
     GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
@@ -51,8 +52,8 @@ class EggHatcher : public SingleSwitchProgramInstance{
     EventNotificationsOption NOTIFICATIONS;
 
     SectionDividerOption m_advanced_options;
-    TimeExpressionOption<uint16_t> SAFETY_TIME0;
-    TimeExpressionOption<uint16_t> HATCH_DELAY;
+    MillisecondsOption SAFETY_TIME1;
+    MillisecondsOption HATCH_DELAY0;
 };
 
 
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggRoutines.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggRoutines.cpp
index 279a402c02..e1c05d2a8e 100644
--- a/SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggRoutines.cpp
+++ b/SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggRoutines.cpp
@@ -1,10 +1,11 @@
 /*  Egg Routines
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
 #include "PokemonBDSP/PokemonBDSP_Settings.h"
 #include "PokemonBDSP/Programs/PokemonBDSP_GameNavigation.h"
 #include "PokemonBDSP_EggRoutines.h"
@@ -14,120 +15,100 @@ namespace NintendoSwitch{
 namespace PokemonBDSP{
 
 
-void egg_spin(BotBaseContext& context, uint16_t duration){
-    for (uint16_t c = 0; c < duration; c += 42){
-#if 1
-        pbf_move_left_joystick(context, 0, 0, 5, 0);
-        pbf_move_left_joystick(context, 128, 0, 5, 0);
-        pbf_move_left_joystick(context, 255, 0, 5, 0);
-        pbf_move_left_joystick(context, 255, 128, 5, 0);
-        pbf_move_left_joystick(context, 255, 255, 5, 0);
-        pbf_move_left_joystick(context, 128, 255, 5, 0);
-        pbf_move_left_joystick(context, 0, 255, 6, 0);
-        pbf_move_left_joystick(context, 0, 128, 6, 0);
-#else
-        pbf_controller_state(context, 0, DPAD_NONE, 0, 0, 128, 128, 5);
-        pbf_controller_state(context, 0, DPAD_NONE, 128, 0, 128, 128, 5);
-        pbf_controller_state(context, 0, DPAD_NONE, 255, 0, 128, 128, 5);
-        pbf_controller_state(context, 0, DPAD_NONE, 255, 128, 128, 128, 5);
-        pbf_controller_state(context, 0, DPAD_NONE, 255, 255, 128, 128, 5);
-        pbf_controller_state(context, 0, DPAD_NONE, 128, 255, 128, 128, 5);
-        pbf_controller_state(context, 0, DPAD_NONE, 0, 255, 128, 128, 6);
-        pbf_controller_state(context, 0, DPAD_NONE, 0, 128, 128, 128, 6);
-#endif
-    }
-}
-void egg_spin_with_A(BotBaseContext& context, uint16_t duration){
-    for (uint16_t c = 0; c < duration; c += 42){
-        pbf_controller_state(context, BUTTON_ZL, DPAD_NONE, 0, 0, 128, 128, 5);
-        pbf_controller_state(context, 0, DPAD_NONE, 128, 0, 128, 128, 5);
-        pbf_controller_state(context, 0, DPAD_NONE, 255, 0, 128, 128, 5);
-        pbf_controller_state(context, 0, DPAD_NONE, 255, 128, 128, 128, 5);
-        pbf_controller_state(context, 0, DPAD_NONE, 255, 255, 128, 128, 5);
-        pbf_controller_state(context, 0, DPAD_NONE, 128, 255, 128, 128, 5);
-        pbf_controller_state(context, 0, DPAD_NONE, 0, 255, 128, 128, 6);
-        pbf_controller_state(context, 0, DPAD_NONE, 0, 128, 128, 128, 6);
+void egg_spin(ProControllerContext& context, bool press_A, Milliseconds duration){
+    for (Milliseconds c = 0ms; c < duration; c += 40ms * 6 + 32ms + 48ms + 48ms){
+        if (press_A){
+            ssf_press_button(context, BUTTON_ZL, 0ms, 80ms);
+        }
+        pbf_move_left_joystick(context, {-1, +1}, 40ms, 0ms);
+        pbf_move_left_joystick(context, {0, +1}, 40ms, 0ms);
+        pbf_move_left_joystick(context, {+1, +1}, 40ms, 0ms);
+        pbf_move_left_joystick(context, {+1, 0}, 40ms, 0ms);
+        pbf_move_left_joystick(context, {+1, -1}, 40ms, 0ms);
+        pbf_move_left_joystick(context, {0, -1}, 40ms, 0ms);
+        pbf_move_left_joystick(context, {-1, -1}, 48ms, 0ms);
+        pbf_move_left_joystick(context, {-1, 0}, 48ms, 0ms);
     }
 }
 
-void pickup_column(BotBaseContext& context){
+void pickup_column(ProControllerContext& context){
 //    const uint16_t BOX_SCROLL_DELAY = GameSettings::instance().BOX_SCROLL_DELAY_0;
-    pbf_press_button(context, BUTTON_ZL, 20, 50);
-    for (size_t c = 0; c < 10; c++){
-        pbf_move_right_joystick(context, 128, 255, 5, 3);
+    pbf_press_button(context, BUTTON_ZL, 160ms, 400ms);
+    for (size_t c = 0; c < 30; c++){
+        ssf_issue_scroll(context, DPAD_DOWN, 24ms);
     }
-    pbf_press_button(context, BUTTON_ZL, 20, GameSettings::instance().BOX_PICKUP_DROP_DELAY);
+    pbf_press_button(context, BUTTON_ZL, 160ms, GameSettings::instance().BOX_PICKUP_DROP_DELAY0);
 }
-void party_to_column(BotBaseContext& context, uint8_t column){
-    const uint16_t BOX_SCROLL_DELAY = GameSettings::instance().BOX_SCROLL_DELAY_0;
-    pbf_move_right_joystick(context, 128, 0, 20, BOX_SCROLL_DELAY);
+void party_to_column(ProControllerContext& context, uint8_t column){
+    const Milliseconds BOX_SCROLL_DELAY = GameSettings::instance().BOX_SCROLL_DELAY0;
+    pbf_move_right_joystick(context, {0, +1}, 160ms, BOX_SCROLL_DELAY);
     if (column < 3){
         for (uint8_t c = 0; c <= column; c++){
-            pbf_move_right_joystick(context, 255, 128, 20, BOX_SCROLL_DELAY);
+            pbf_move_right_joystick(context, {+1, 0}, 160ms, BOX_SCROLL_DELAY);
         }
     }else{
         for (uint8_t c = 6; c != column; c--){
-            pbf_move_right_joystick(context, 0, 128, 20, BOX_SCROLL_DELAY);
+            pbf_move_right_joystick(context, {-1, 0}, 160ms, BOX_SCROLL_DELAY);
         }
     }
 }
-void column_to_party(BotBaseContext& context, uint8_t column){
-    const uint16_t BOX_SCROLL_DELAY = GameSettings::instance().BOX_SCROLL_DELAY_0;
+void column_to_party(ProControllerContext& context, uint8_t column){
+    const Milliseconds BOX_SCROLL_DELAY = GameSettings::instance().BOX_SCROLL_DELAY0;
     if (column < 3){
         for (uint8_t c = 0; c <= column; c++){
-            pbf_move_right_joystick(context, 0, 128, 20, BOX_SCROLL_DELAY);
+            pbf_move_right_joystick(context, {-1, 0}, 160ms, BOX_SCROLL_DELAY);
         }
     }else{
         for (uint8_t c = 6; c != column; c--){
-            pbf_move_right_joystick(context, 255, 128, 20, BOX_SCROLL_DELAY);
+            pbf_move_right_joystick(context, {+1, 0}, 160ms, BOX_SCROLL_DELAY);
         }
     }
-    pbf_move_right_joystick(context, 128, 255, 20, BOX_SCROLL_DELAY);
+    pbf_move_right_joystick(context, {0, -1}, 160ms, BOX_SCROLL_DELAY);
 }
 
-void withdraw_1st_column_from_overworld(BotBaseContext& context){
-    const uint16_t BOX_SCROLL_DELAY = GameSettings::instance().BOX_SCROLL_DELAY_0;
-    const uint16_t BOX_PICKUP_DROP_DELAY = GameSettings::instance().BOX_PICKUP_DROP_DELAY;
+void withdraw_1st_column_from_overworld(ProControllerContext& context){
+    const Milliseconds BOX_SCROLL_DELAY = GameSettings::instance().BOX_SCROLL_DELAY0;
+    const Milliseconds BOX_PICKUP_DROP_DELAY = GameSettings::instance().BOX_PICKUP_DROP_DELAY0;
     overworld_to_box(context);
-    pbf_press_button(context, BUTTON_Y, 20, 50);
-    pbf_press_button(context, BUTTON_Y, 20, 50);
+    pbf_press_button(context, BUTTON_Y, 160ms, 400ms);
+    pbf_press_button(context, BUTTON_Y, 160ms, 400ms);
     pickup_column(context);
-    pbf_move_right_joystick(context, 0, 128, 20, BOX_SCROLL_DELAY);
-    pbf_move_right_joystick(context, 128, 255, 20, BOX_SCROLL_DELAY);
-    pbf_press_button(context, BUTTON_ZL, 20, BOX_PICKUP_DROP_DELAY);
+    pbf_move_right_joystick(context, {-1, 0}, 160ms, BOX_SCROLL_DELAY);
+    pbf_move_right_joystick(context, {0, -1}, 160ms, BOX_SCROLL_DELAY);
+    pbf_press_button(context, BUTTON_ZL, 160ms, BOX_PICKUP_DROP_DELAY);
     box_to_overworld(context);
 }
-void deposit_party_to_column(BotBaseContext& context, uint8_t column){
-    const uint16_t BOX_SCROLL_DELAY = GameSettings::instance().BOX_SCROLL_DELAY_0;
-    const uint16_t BOX_PICKUP_DROP_DELAY = GameSettings::instance().BOX_PICKUP_DROP_DELAY;
+void deposit_party_to_column(ProControllerContext& context, uint8_t column){
+    const Milliseconds BOX_SCROLL_DELAY = GameSettings::instance().BOX_SCROLL_DELAY0;
+    const Milliseconds BOX_PICKUP_DROP_DELAY = GameSettings::instance().BOX_PICKUP_DROP_DELAY0;
     overworld_to_box(context);
-    pbf_press_button(context, BUTTON_Y, 20, 50);
-    pbf_press_button(context, BUTTON_Y, 20, 50);
-    pbf_move_right_joystick(context, 0, 128, 20, BOX_SCROLL_DELAY);
-    pbf_move_right_joystick(context, 128, 255, 20, BOX_SCROLL_DELAY);
+    pbf_press_button(context, BUTTON_Y, 160ms, 400ms);
+    pbf_press_button(context, BUTTON_Y, 160ms, 400ms);
+    pbf_move_right_joystick(context, {-1, 0}, 160ms, BOX_SCROLL_DELAY);
+    pbf_move_right_joystick(context, {0, -1}, 160ms, BOX_SCROLL_DELAY);
 
     //  Deposit current column.
     pickup_column(context);
     party_to_column(context, column);
-    pbf_press_button(context, BUTTON_ZL, 20, BOX_PICKUP_DROP_DELAY);
+    pbf_press_button(context, BUTTON_ZL, 160ms, BOX_PICKUP_DROP_DELAY);
 }
-void swap_party(BotBaseContext& context, uint8_t current_column){
+void swap_party(ProControllerContext& context, uint8_t current_column){
     deposit_party_to_column(context, current_column);
 
-    const uint16_t BOX_SCROLL_DELAY = GameSettings::instance().BOX_SCROLL_DELAY_0;
-    const uint16_t BOX_PICKUP_DROP_DELAY = GameSettings::instance().BOX_PICKUP_DROP_DELAY;
+    const Milliseconds BOX_SCROLL_DELAY = GameSettings::instance().BOX_SCROLL_DELAY0;
+    const Milliseconds BOX_PICKUP_DROP_DELAY = GameSettings::instance().BOX_PICKUP_DROP_DELAY0;
 
-    pbf_move_right_joystick(context, 255, 128, 20, BOX_SCROLL_DELAY);
+    pbf_move_right_joystick(context, {+1, 0}, 160ms, BOX_SCROLL_DELAY);
     if (current_column < 5){
         pickup_column(context);
         column_to_party(context, current_column + 1);
     }else{
-        pbf_press_button(context, BUTTON_R, 20, GameSettings::instance().BOX_CHANGE_DELAY_0);
-        pbf_move_right_joystick(context, 255, 128, 20, BOX_SCROLL_DELAY);
+        pbf_press_button(context, BUTTON_R, 160ms, GameSettings::instance().BOX_CHANGE_DELAY0);
+        pbf_move_right_joystick(context, {+1, 0}, 160ms, BOX_SCROLL_DELAY);
         pickup_column(context);
         column_to_party(context, 0);
     }
-    pbf_press_button(context, BUTTON_ZL, 20, BOX_PICKUP_DROP_DELAY);
+    pbf_press_button(context, BUTTON_ZL, 160ms, BOX_PICKUP_DROP_DELAY);
     box_to_overworld(context);
 }
 
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggRoutines.h b/SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggRoutines.h
index 7f202e04a4..53a0957ddd 100644
--- a/SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggRoutines.h
+++ b/SerialPrograms/Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggRoutines.h
@@ -1,29 +1,28 @@
 /*  Egg Routines
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifndef PokemonAutomation_PokemonBDSP_EggRoutines_H
 #define PokemonAutomation_PokemonBDSP_EggRoutines_H
 
-#include "ClientSource/Connection/BotBase.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
 namespace PokemonBDSP{
 
 
-void egg_spin(BotBaseContext& context, uint16_t duration);
-void egg_spin_with_A(BotBaseContext& context, uint16_t duration);
+void egg_spin(ProControllerContext& context, bool press_A, Milliseconds duration);
 
-void pickup_column(BotBaseContext& context);
-void party_to_column(BotBaseContext& context, uint8_t column);
-void column_to_party(BotBaseContext& context, uint8_t column);
+void pickup_column(ProControllerContext& context);
+void party_to_column(ProControllerContext& context, uint8_t column);
+void column_to_party(ProControllerContext& context, uint8_t column);
 
-void withdraw_1st_column_from_overworld(BotBaseContext& context);
-void deposit_party_to_column(BotBaseContext& context, uint8_t column);
-void swap_party(BotBaseContext& context, uint8_t current_column);
+void withdraw_1st_column_from_overworld(ProControllerContext& context);
+void deposit_party_to_column(ProControllerContext& context, uint8_t column);
+void swap_party(ProControllerContext& context, uint8_t current_column);
 
 
 }
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_AmitySquarePickUpFarmer.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_AmitySquarePickUpFarmer.cpp
index b99ef8ecf6..5176571232 100644
--- a/SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_AmitySquarePickUpFarmer.cpp
+++ b/SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_AmitySquarePickUpFarmer.cpp
@@ -1,14 +1,15 @@
 /*  Walking Pokemon Berry Farmer
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include "CommonFramework/Tools/StatsTracking.h"
 #include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
 #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
 #include "Pokemon/Pokemon_Strings.h"
-#include "PokemonBDSP/PokemonBDSP_Settings.h"
+//#include "PokemonBDSP/PokemonBDSP_Settings.h"
 #include "PokemonBDSP_AmitySquarePickUpFarmer.h"
 
 namespace PokemonAutomation{
@@ -21,11 +22,12 @@ AmitySquarePickUpFarmer_Descriptor::AmitySquarePickUpFarmer_Descriptor()
     : SingleSwitchProgramDescriptor(
         "PokemonBDSP:AmitySquarePickUpFarmer",
         STRING_POKEMON + " BDSP", "Amity Square Pick Up Farmer",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonBDSP/AmitySquarePickUpFarmer.md",
+        "Programs/PokemonBDSP/AmitySquarePickUpFarmer.html",
         "Automatically fetch berries and stickers from the walking pokemon in Amity Square.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
         FeedbackType::NONE,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
     )
 {}
 struct AmitySquarePickUpFarmer_Descriptor::Stats : public StatsTracker{
@@ -45,25 +47,23 @@ AmitySquarePickUpFarmer::AmitySquarePickUpFarmer()
     : GO_HOME_WHEN_DONE(false)
     , MAX_FETCH_ATTEMPTS(
         "<b>Fetch this many times:</b><br>This puts a limit on how many items you can get.",
-        LockWhileRunning::LOCKED,
+        LockMode::LOCK_WHILE_RUNNING,
         100
     )
-    , ONE_WAY_MOVING_TIME(
+    , ONE_WAY_MOVING_TIME0(
         "<b>One Way walking Time:</b><br>Walk this amount of time in one direction before going back to finish one round of walking.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "5 * TICKS_PER_SECOND"
+        LockMode::LOCK_WHILE_RUNNING,
+        "5000 ms"
     )
     , ROUNDS_PER_FETCH(
         "<b>Rounds per fetch:</b><br>How many rounds of walking before doing a berry fetch attempt.",
-        LockWhileRunning::LOCKED,
+        LockMode::LOCK_WHILE_RUNNING,
         3
     )
-    , WAIT_TIME_FOR_POKEMON(
+    , WAIT_TIME_FOR_POKEMON0(
         "<b>Wait Time for Pokemon:</b><br>Wait this time for pokemon to catch up to you before you ask for a berry.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "3 * TICKS_PER_SECOND"
+        LockMode::LOCK_WHILE_RUNNING,
+        "3000 ms"
     )
     , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
     , NOTIFICATIONS({
@@ -74,44 +74,44 @@ AmitySquarePickUpFarmer::AmitySquarePickUpFarmer()
 {
     PA_ADD_OPTION(GO_HOME_WHEN_DONE);
     PA_ADD_OPTION(MAX_FETCH_ATTEMPTS);
-    PA_ADD_OPTION(ONE_WAY_MOVING_TIME);
+    PA_ADD_OPTION(ONE_WAY_MOVING_TIME0);
     PA_ADD_OPTION(ROUNDS_PER_FETCH);
-    PA_ADD_OPTION(WAIT_TIME_FOR_POKEMON);
+    PA_ADD_OPTION(WAIT_TIME_FOR_POKEMON0);
     PA_ADD_OPTION(NOTIFICATIONS);
 }
 
 
 
 
-void AmitySquarePickUpFarmer::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
+void AmitySquarePickUpFarmer::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
     AmitySquarePickUpFarmer_Descriptor::Stats& stats = env.current_stats<AmitySquarePickUpFarmer_Descriptor::Stats>();
     env.update_stats();
 
     //  Connect the controller.
-    pbf_move_right_joystick(context, 0, 255, 10, 0);
+    require_player(env.console, context, BUTTON_L);
 
-    for (uint16_t c = 0; c < MAX_FETCH_ATTEMPTS; c++) {
+    for (uint16_t c = 0; c < MAX_FETCH_ATTEMPTS; c++){
         env.update_stats();
         send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
 
-        for (uint16_t i = 0; i < ROUNDS_PER_FETCH; i++) {
+        for (uint16_t i = 0; i < ROUNDS_PER_FETCH; i++){
             //  Move right
-            pbf_move_left_joystick(context, 255, 128, ONE_WAY_MOVING_TIME, 0);
+            pbf_move_left_joystick(context, {+1, 0}, ONE_WAY_MOVING_TIME0, 0ms);
             // Move left
-            pbf_move_left_joystick(context, 0, 128, ONE_WAY_MOVING_TIME, 0);
+            pbf_move_left_joystick(context, {-1, 0}, ONE_WAY_MOVING_TIME0, 0ms);
         }
 
         // Wait for your pokemon to catch up to you
-        pbf_wait(context, WAIT_TIME_FOR_POKEMON);
+        pbf_wait(context, WAIT_TIME_FOR_POKEMON0);
 
         // Face toward your pokemon.
-        pbf_press_dpad(context, DPAD_RIGHT, 1, 0);
+        pbf_press_dpad(context, DPAD_RIGHT, 8ms, 0ms);  //  This works? It's not too short?
 
         // Mash button to talk to pokemon
-        pbf_mash_button(context, BUTTON_ZL, 500);
+        pbf_mash_button(context, BUTTON_ZL, 4000ms);
 
         // Mash button to end talking to pokemon
-        pbf_mash_button(context, BUTTON_B, 500);
+        pbf_mash_button(context, BUTTON_B, 4000ms);
 
         stats.m_attempts++;
     }
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_AmitySquarePickUpFarmer.h b/SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_AmitySquarePickUpFarmer.h
index 150ddbc81e..6d03ec69cc 100644
--- a/SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_AmitySquarePickUpFarmer.h
+++ b/SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_AmitySquarePickUpFarmer.h
@@ -1,6 +1,6 @@
 /*  Walking Pokemon Berry Farmer
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -8,7 +8,7 @@
 #define PokemonAutomation_PokemonBDSP_AmitySquarePickUpFarmer_H
 
 #include "Common/Cpp/Options/SimpleIntegerOption.h"
-#include "Common/Cpp/Options/TimeExpressionOption.h"
+#include "Common/Cpp/Options/TimeDurationOption.h"
 #include "CommonFramework/Notifications/EventNotificationsTable.h"
 #include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
 #include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
@@ -29,16 +29,17 @@ class AmitySquarePickUpFarmer_Descriptor : public SingleSwitchProgramDescriptor{
 
 class AmitySquarePickUpFarmer : public SingleSwitchProgramInstance{
 public:
+    using Descriptor = AmitySquarePickUpFarmer_Descriptor;
     AmitySquarePickUpFarmer();
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
 
 private:
     GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
 
     SimpleIntegerOption<uint16_t> MAX_FETCH_ATTEMPTS;
-    TimeExpressionOption<uint16_t> ONE_WAY_MOVING_TIME;
+    MillisecondsOption ONE_WAY_MOVING_TIME0;
     SimpleIntegerOption<uint16_t> ROUNDS_PER_FETCH;
-    TimeExpressionOption<uint16_t> WAIT_TIME_FOR_POKEMON;
+    MillisecondsOption WAIT_TIME_FOR_POKEMON0;
 
     EventNotificationOption NOTIFICATION_STATUS_UPDATE;
     EventNotificationsOption NOTIFICATIONS;
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_DoublesLeveling.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_DoublesLeveling.cpp
index 22d3205c6b..954e2baa07 100644
--- a/SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_DoublesLeveling.cpp
+++ b/SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_DoublesLeveling.cpp
@@ -1,19 +1,21 @@
 /*  Double Battle Leveling
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include "CommonFramework/Exceptions/OperationFailedException.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
 #include "CommonFramework/Notifications/ProgramNotifications.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "CommonTools/VisualDetectors/FrozenImageDetector.h"
 #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "PokemonSwSh/ShinyHuntTracker.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
 #include "PokemonBDSP/Inference/PokemonBDSP_SelectionArrow.h"
 #include "PokemonBDSP/Inference/Battles/PokemonBDSP_BattleMenuDetector.h"
 #include "PokemonBDSP/Inference/Battles/PokemonBDSP_EndBattleDetector.h"
 #include "PokemonBDSP/Inference/ShinyDetection/PokemonBDSP_ShinyEncounterDetector.h"
 #include "PokemonBDSP/Programs/PokemonBDSP_EncounterHandler.h"
+#include "VideoGames/PokemonSwSh/ShinyHuntTracker.h"
 #include "PokemonBDSP_DoublesLeveling.h"
 
 namespace PokemonAutomation{
@@ -25,11 +27,12 @@ DoublesLeveling_Descriptor::DoublesLeveling_Descriptor()
     : SingleSwitchProgramDescriptor(
         "PokemonBDSP:DoublesLeveling",
         STRING_POKEMON + " BDSP", "Double Battle Leveling",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonBDSP/DoublesLeveling.md",
+        "Programs/PokemonBDSP/DoublesLeveling.html",
         "Level up your party by spamming spread moves in a double battle with a partner that heals you forever.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
         FeedbackType::REQUIRED,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
     )
 {}
 struct DoublesLeveling_Descriptor::Stats : public PokemonSwSh::ShinyHuntTracker{
@@ -62,11 +65,10 @@ DoublesLeveling::DoublesLeveling()
     , m_advanced_options(
         "<font size=4><b>Advanced Options:</b> You should not need to touch anything below here.</font>"
     )
-    , EXIT_BATTLE_TIMEOUT(
+    , EXIT_BATTLE_TIMEOUT0(
         "<b>Exit Battle Timeout:</b><br>After running, wait this long to return to overworld.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "10 * TICKS_PER_SECOND"
+        LockMode::LOCK_WHILE_RUNNING,
+        "10 s"
     )
 {
     PA_ADD_OPTION(GO_HOME_WHEN_DONE);
@@ -80,8 +82,8 @@ DoublesLeveling::DoublesLeveling()
     PA_ADD_OPTION(NOTIFICATIONS);
 
     PA_ADD_STATIC(m_advanced_options);
-//    PA_ADD_OPTION(WATCHDOG_TIMER);
-    PA_ADD_OPTION(EXIT_BATTLE_TIMEOUT);
+//    PA_ADD_OPTION(WATCHDOG_TIMER0);
+    PA_ADD_OPTION(EXIT_BATTLE_TIMEOUT0);
 }
 
 
@@ -90,7 +92,7 @@ DoublesLeveling::DoublesLeveling()
 
 
 
-bool DoublesLeveling::battle(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
+bool DoublesLeveling::battle(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
     DoublesLeveling_Descriptor::Stats& stats = env.current_stats<DoublesLeveling_Descriptor::Stats>();
 
     env.log("Starting battle!");
@@ -102,56 +104,58 @@ bool DoublesLeveling::battle(SingleSwitchProgramEnvironment& env, BotBaseContext
         BattleMenuWatcher battle_menu(BattleType::STANDARD);
         EndBattleWatcher end_battle;
         SelectionArrowFinder learn_move(env.console, {0.50, 0.62, 0.40, 0.18}, COLOR_YELLOW);
-        int ret = run_until(
+        FrozenImageDetector overworld(std::chrono::seconds(5), 10);
+        int ret = run_until<ProControllerContext>(
             env.console, context,
-            [](BotBaseContext& context){
-                pbf_mash_button(context, BUTTON_B, 120 * TICKS_PER_SECOND);
+            [](ProControllerContext& context){
+                pbf_mash_button(context, BUTTON_B, 120000ms);
             },
             {
-                {battle_menu},
-                {end_battle},
-                {learn_move},
+                battle_menu,
+                end_battle,
+                learn_move,
+                overworld,
             }
         );
         switch (ret){
         case 0:
             env.log("Battle menu detected!", COLOR_BLUE);
-            pbf_mash_button(context, BUTTON_ZL, 5 * TICKS_PER_SECOND);
+            pbf_mash_button(context, BUTTON_ZL, 5000ms);
             c++;
             break;
         case 1:
             env.log("Battle finished!", COLOR_BLUE);
-            pbf_mash_button(context, BUTTON_B, 250);
+            pbf_mash_button(context, BUTTON_B, 2000ms);
             return false;
         case 2:
             env.log("Detected move learn!", COLOR_BLUE);
             if (ON_LEARN_MOVE == OnLearnMove::DONT_LEARN){
-                pbf_move_right_joystick(context, 128, 255, 20, 105);
-                pbf_press_button(context, BUTTON_ZL, 20, 105);
+                pbf_move_right_joystick(context, {0, -1}, 160ms, 840ms);
+                pbf_press_button(context, BUTTON_ZL, 160ms, 840ms);
                 break;
             }
             return true;
+        case 3:
+            env.log("Detected possible overworld!", COLOR_BLUE);
+            pbf_mash_button(context, BUTTON_B, 2000ms);
+            return false;
         default:
-            env.log("Timed out.", COLOR_RED);
             stats.add_error();
-            throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, env.console,
-                "Timed out after 2 minutes.",
-                true
-            );
+            env.log("Timed out after 2 minutes. Assume battle ended.", COLOR_RED);
+            return false;
         }
     }
 
-    throw OperationFailedException(
-        ErrorReport::SEND_ERROR_REPORT, env.console,
+    OperationFailedExceptionWithScreenshot::fire(
+        ErrorReportMode::SEND_ERROR_REPORT,
         "No progress detected after 5 battle menus. Are you out of PP?",
-        true
+        env.console
     );
 }
 
 
 
-void DoublesLeveling::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
+void DoublesLeveling::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
     DoublesLeveling_Descriptor::Stats& stats = env.current_stats<DoublesLeveling_Descriptor::Stats>();
     env.update_stats();
 
@@ -163,7 +167,7 @@ void DoublesLeveling::program(SingleSwitchProgramEnvironment& env, BotBaseContex
     );
 
     //  Connect the controller.
-    pbf_press_button(context, BUTTON_B, 5, 5);
+    require_player(env.console, context, BUTTON_B);
 
     //  Encounter Loop
     while (true){
@@ -172,7 +176,7 @@ void DoublesLeveling::program(SingleSwitchProgramEnvironment& env, BotBaseContex
         if (!battle){
             // Unexpected battle: detect battle menu but not battle starting animation.
             stats.add_error();
-            handler.run_away_due_to_error(EXIT_BATTLE_TIMEOUT);
+            handler.run_away_due_to_error(EXIT_BATTLE_TIMEOUT0);
             continue;
         }
 
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_DoublesLeveling.h b/SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_DoublesLeveling.h
index 5197723231..851b79cee8 100644
--- a/SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_DoublesLeveling.h
+++ b/SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_DoublesLeveling.h
@@ -1,6 +1,6 @@
 /*  Double Battle Leveling
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -8,10 +8,11 @@
 #define PokemonAutomation_PokemonBDSP_DoublesLeveling_H
 
 #include "Common/Cpp/Options/StaticTextOption.h"
-#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "Common/Cpp/Options/TimeDurationOption.h"
 #include "CommonFramework/Notifications/EventNotificationsTable.h"
 #include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
 #include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "Pokemon/Options/Pokemon_EncounterBotOptions.h"
 #include "PokemonBDSP/Options/PokemonBDSP_LearnMove.h"
 #include "PokemonBDSP/Options/PokemonBDSP_EncounterBotCommon.h"
 #include "PokemonBDSP/Programs/PokemonBDSP_OverworldTrigger.h"
@@ -33,12 +34,13 @@ class DoublesLeveling_Descriptor : public SingleSwitchProgramDescriptor{
 
 class DoublesLeveling : public SingleSwitchProgramInstance{
 public:
+    using Descriptor = DoublesLeveling_Descriptor;
     DoublesLeveling();
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
 
 
 private:
-    bool battle(SingleSwitchProgramEnvironment& env, BotBaseContext& context);
+    bool battle(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
 
     GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
 
@@ -52,8 +54,8 @@ class DoublesLeveling : public SingleSwitchProgramInstance{
     EventNotificationsOption NOTIFICATIONS;
 
     SectionDividerOption m_advanced_options;
-//    TimeExpressionOption<uint16_t> WATCHDOG_TIMER;
-    TimeExpressionOption<uint16_t> EXIT_BATTLE_TIMEOUT;
+//    MillisecondsOption WATCHDOG_TIMER;
+    MillisecondsOption EXIT_BATTLE_TIMEOUT0;
 };
 
 
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_GiftBerryReset.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_GiftBerryReset.cpp
index a154326571..c77383ba55 100644
--- a/SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_GiftBerryReset.cpp
+++ b/SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_GiftBerryReset.cpp
@@ -1,24 +1,25 @@
 /*  Gift Berry Reset
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include <set>
 #include "CommonFramework/Language.h"
-#include "CommonFramework/Exceptions/OperationFailedException.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
 #include "CommonFramework/ImageTypes/ImageViewRGB32.h"
 #include "CommonFramework/Notifications/ProgramNotifications.h"
 #include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "CommonFramework/Tools/StatsTracking.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
 #include "NintendoSwitch/NintendoSwitch_Settings.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
 #include "Pokemon/Pokemon_Strings.h"
+#include "Pokemon/Inference/Pokemon_BerryNameReader.h"
 #include "PokemonBDSP/Inference/PokemonBDSP_DialogDetector.h"
 #include "PokemonBDSP/PokemonBDSP_Settings.h"
 #include "PokemonBDSP/Programs/PokemonBDSP_GameEntry.h"
 #include "PokemonBDSP_GiftBerryReset.h"
-#include "Pokemon/Inference/Pokemon_BerryNameReader.h"
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
@@ -54,11 +55,12 @@ GiftBerryReset_Descriptor::GiftBerryReset_Descriptor()
     : SingleSwitchProgramDescriptor(
         "PokemonBDSP:GiftBerryReset",
         STRING_POKEMON + " BDSP", "Gift Berry Reset",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonBDSP/GiftBerryReset.md",
+        "Programs/PokemonBDSP/GiftBerryReset.html",
         "Reset the game in front of the NPC that gives rare berries in Pastoria City until a desired berry is received.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
         FeedbackType::REQUIRED,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
     )
 {}
 struct GiftBerryReset_Descriptor::Stats : public StatsTracker{
@@ -79,7 +81,7 @@ GiftBerryReset::GiftBerryReset()
     , LANGUAGE(
         "<b>Game Language:</b><br>This is needed to read the berry name.",
         Pokemon::BerryNameReader::instance().languages(),
-        LockWhileRunning::LOCKED,
+        LockMode::LOCK_WHILE_RUNNING,
         true
     )
     , TARGET_BERRIES(
@@ -101,12 +103,12 @@ GiftBerryReset::GiftBerryReset()
 
 
 
-void GiftBerryReset::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
+void GiftBerryReset::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
     GiftBerryReset_Descriptor::Stats& stats = env.current_stats<GiftBerryReset_Descriptor::Stats>();
     env.update_stats();
 
     //  Connect the controller.
-    pbf_move_right_joystick(context, 0, 255, 10, 0);
+    require_player(env.console, context, BUTTON_L);
 
     const auto selected_berries = TARGET_BERRIES.selected_berries();
     for (const auto& berry_slug: selected_berries){
@@ -120,8 +122,8 @@ void GiftBerryReset::program(SingleSwitchProgramEnvironment& env, BotBaseContext
         env.console.log("Talking to berry npc.");
         // Press ZL three times to advance dialog with npc
         for (int i = 0; i < 3; i++){
-            pbf_mash_button(context, BUTTON_ZL, 30);
-            pbf_wait(context, 150);
+            pbf_mash_button(context, BUTTON_ZL, 240ms);
+            pbf_wait(context, 1200ms);
         }
         context.wait_for_all_requests();
 
@@ -131,10 +133,10 @@ void GiftBerryReset::program(SingleSwitchProgramEnvironment& env, BotBaseContext
         // dialog_detector.make_overlays(set);
         VideoSnapshot screen = env.console.video().snapshot();
         if (!dialog_detector.detect(screen)){
-            throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, env.console,
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
                 "No npc dialog box found when reading berry name",
-                true
+                env.console
             );
         }
 
@@ -145,17 +147,17 @@ void GiftBerryReset::program(SingleSwitchProgramEnvironment& env, BotBaseContext
             OCR::BLACK_TEXT_FILTERS()
         );
         if (result.results.empty()){
-            throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, env.console,
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
                 "No berry name found in dialog box",
-                true
+                env.console
             );
         }
         bool found_berry = false;
         for (const auto& r: result.results){
             env.console.log("Found potential berry name: " + r.second.token);
 
-            if (TARGET_BERRIES.find_berry(r.second.token)) {
+            if (TARGET_BERRIES.find_berry(r.second.token)){
                 found_berry = true;
                 break;
             }
@@ -170,18 +172,22 @@ void GiftBerryReset::program(SingleSwitchProgramEnvironment& env, BotBaseContext
         }
 
         // Reset game:
-        pbf_press_button(context, BUTTON_HOME, 10, GameSettings::instance().GAME_TO_HOME_DELAY);
+        pbf_press_button(context, BUTTON_HOME, 80ms, GameSettings::instance().GAME_TO_HOME_DELAY0);
         if (!reset_game_from_home(env, env.console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST)){
-            throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, env.console,
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
                 "Error resetting game",
-                true
+                env.console
             );
         }
     }
 
     env.update_stats();
-    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+    send_program_finished_notification(
+        env, NOTIFICATION_PROGRAM_FINISH,
+        "Match found!",
+        env.console.video().snapshot()
+    );
     GO_HOME_WHEN_DONE.run_end_of_program(context);
 }
 
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_GiftBerryReset.h b/SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_GiftBerryReset.h
index 09efbc25f3..63e1becf32 100644
--- a/SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_GiftBerryReset.h
+++ b/SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_GiftBerryReset.h
@@ -1,14 +1,14 @@
 /*  Gift Berry Reset
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifndef PokemonAutomation_PokemonBDSP_GiftBerryReset_H
 #define PokemonAutomation_PokemonBDSP_GiftBerryReset_H
 
-#include "CommonFramework/Options/LanguageOCROption.h"
 #include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "CommonTools/Options/LanguageOCROption.h"
 #include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
 #include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
 #include "PokemonBDSP/Options/PokemonBDSP_BerryTable.h"
@@ -29,8 +29,9 @@ class GiftBerryReset_Descriptor : public SingleSwitchProgramDescriptor{
 
 class GiftBerryReset : public SingleSwitchProgramInstance{
 public:
+    using Descriptor = GiftBerryReset_Descriptor;
     GiftBerryReset();
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
 
 private:
     GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_MoneyFarmerRoute210.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_MoneyFarmerRoute210.cpp
index c86fb1e9e7..accb0be32d 100644
--- a/SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_MoneyFarmerRoute210.cpp
+++ b/SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_MoneyFarmerRoute210.cpp
@@ -1,14 +1,16 @@
 /*  Money Farmer (Route 210)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include "CommonFramework/Exceptions/OperationFailedException.h"
-#include "CommonFramework/Tools/StatsTracking.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
 #include "CommonFramework/Notifications/ProgramNotifications.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "CommonTools/StartupChecks/StartProgramChecks.h"
 #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
 #include "Pokemon/Pokemon_Strings.h"
 #include "PokemonBDSP/PokemonBDSP_Settings.h"
 #include "PokemonBDSP/Programs/PokemonBDSP_GlobalRoomHeal.h"
@@ -21,18 +23,20 @@
 namespace PokemonAutomation{
 namespace NintendoSwitch{
 namespace PokemonBDSP{
-    using namespace Pokemon;
+
+using namespace Pokemon;
 
 
 MoneyFarmerRoute210_Descriptor::MoneyFarmerRoute210_Descriptor()
     : SingleSwitchProgramDescriptor(
         "PokemonBDSP:MoneyFarmerRoute210",
         STRING_POKEMON + " BDSP", "Money Farmer (Route 210)",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonBDSP/MoneyFarmerRoute210.md",
+        "Programs/PokemonBDSP/MoneyFarmerRoute210.html",
         "Farm money by using VS Seeker to rebattle the Ace Trainer couple on Route 210.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_RequiresPrecision,
         FeedbackType::REQUIRED,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
     )
 {}
 struct MoneyFarmerRoute210_Descriptor::Stats : public StatsTracker{
@@ -43,7 +47,7 @@ struct MoneyFarmerRoute210_Descriptor::Stats : public StatsTracker{
         , m_react(m_stats["React"])
     {
         m_display_order.emplace_back("Searches");
-        m_display_order.emplace_back("Errors", true);
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
         m_display_order.emplace_back("No React");
         m_display_order.emplace_back("React");
     }
@@ -66,7 +70,7 @@ MoneyFarmerRoute210::MoneyFarmerRoute210()
             {StartLocation::CelesticTown, "celestic", "In front of the Celestic Town " + STRING_POKEMON + " center."},
             {StartLocation::AceTrainerPair, "trainer-pair", "Lower-most row of the platform the Ace Trainer pair in Route 210 is on."},
         },
-        LockWhileRunning::LOCKED,
+        LockMode::LOCK_WHILE_RUNNING,
         StartLocation::CelesticTown
     )
     , HEALING_METHOD(
@@ -75,17 +79,31 @@ MoneyFarmerRoute210::MoneyFarmerRoute210()
             {HealMethod::CelesticTown, "celestic", "Celestic Town " + STRING_POKEMON + " center."},
             {HealMethod::GlobalRoom, "global-room", "Use Global Room. (will force update your game)"},
         },
-        LockWhileRunning::LOCKED,
+        LockMode::LOCK_WHILE_RUNNING,
         HealMethod::CelesticTown
     )
-    , MON0_MOVE1_PP("<b>Lead " + STRING_POKEMON + " Move 1 PP:</b><br>Set to zero to not use this move.", LockWhileRunning::LOCKED, 5, 0, 64)
-    , MON0_MOVE2_PP("<b>Lead " + STRING_POKEMON + " Move 2 PP:</b><br>Set to zero to not use this move.", LockWhileRunning::LOCKED, 5, 0, 64)
-    , MON0_MOVE3_PP("<b>Lead " + STRING_POKEMON + " Move 3 PP:</b><br>Set to zero to not use this move.", LockWhileRunning::LOCKED, 5, 0, 64)
-    , MON0_MOVE4_PP("<b>Lead " + STRING_POKEMON + " Move 4 PP:</b><br>Set to zero to not use this move.", LockWhileRunning::LOCKED, 5, 0, 64)
-    , MON1_MOVE1_PP("<b>2nd " + STRING_POKEMON + " Move 1 PP:</b><br>Set to zero to not use this move.", LockWhileRunning::LOCKED, 5, 0, 64)
-    , MON1_MOVE2_PP("<b>2nd " + STRING_POKEMON + " Move 2 PP:</b><br>Set to zero to not use this move.", LockWhileRunning::LOCKED, 5, 0, 64)
-    , MON1_MOVE3_PP("<b>2nd " + STRING_POKEMON + " Move 3 PP:</b><br>Set to zero to not use this move.", LockWhileRunning::LOCKED, 5, 0, 64)
-    , MON1_MOVE4_PP("<b>2nd " + STRING_POKEMON + " Move 4 PP:</b><br>Set to zero to not use this move.", LockWhileRunning::LOCKED, 5, 0, 64)
+    , MON0_MOVE1_PP("<b>Lead " + STRING_POKEMON + " Move 1 PP:</b><br>Set to zero to not use this move.", LockMode::LOCK_WHILE_RUNNING, 5, 0, 64)
+    , MON0_MOVE2_PP("<b>Lead " + STRING_POKEMON + " Move 2 PP:</b><br>Set to zero to not use this move.", LockMode::LOCK_WHILE_RUNNING, 5, 0, 64)
+    , MON0_MOVE3_PP("<b>Lead " + STRING_POKEMON + " Move 3 PP:</b><br>Set to zero to not use this move.", LockMode::LOCK_WHILE_RUNNING, 5, 0, 64)
+    , MON0_MOVE4_PP("<b>Lead " + STRING_POKEMON + " Move 4 PP:</b><br>Set to zero to not use this move.", LockMode::LOCK_WHILE_RUNNING, 5, 0, 64)
+    , MON1_MOVE1_PP("<b>2nd " + STRING_POKEMON + " Move 1 PP:</b><br>Set to zero to not use this move.", LockMode::LOCK_WHILE_RUNNING, 5, 0, 64)
+    , MON1_MOVE2_PP("<b>2nd " + STRING_POKEMON + " Move 2 PP:</b><br>Set to zero to not use this move.", LockMode::LOCK_WHILE_RUNNING, 5, 0, 64)
+    , MON1_MOVE3_PP("<b>2nd " + STRING_POKEMON + " Move 3 PP:</b><br>Set to zero to not use this move.", LockMode::LOCK_WHILE_RUNNING, 5, 0, 64)
+    , MON1_MOVE4_PP("<b>2nd " + STRING_POKEMON + " Move 4 PP:</b><br>Set to zero to not use this move.", LockMode::LOCK_WHILE_RUNNING, 5, 0, 64)
+    , PICKUP_SLOT1(
+        "<b>" + STRING_POKEMON + " in slot 1 has the Pickup ability</b>", LockMode::LOCK_WHILE_RUNNING, false)
+    , PICKUP_SLOT2(
+        "<b>" + STRING_POKEMON + " in slot 2 has the Pickup ability</b>", LockMode::LOCK_WHILE_RUNNING, false)
+    , PICKUP_SLOT3(
+        "<b>" + STRING_POKEMON + " in slot 3 has the Pickup ability</b>", LockMode::LOCK_WHILE_RUNNING, false)
+    , PICKUP_SLOT4(
+        "<b>" + STRING_POKEMON + " in slot 4 has the Pickup ability</b>", LockMode::LOCK_WHILE_RUNNING, false)
+    , PICKUP_SLOT5(
+        "<b>" + STRING_POKEMON + " in slot 5 has the Pickup ability</b>", LockMode::LOCK_WHILE_RUNNING, false)
+    , PICKUP_SLOT6(
+        "<b>" + STRING_POKEMON + " in slot 6 has the Pickup ability</b>", LockMode::LOCK_WHILE_RUNNING, false)
+    , CHECK_PICKUP_FREQ (
+        "<b>Check " + STRING_POKEMON + " with the Pickup ability every this many battles</b>", LockMode::LOCK_WHILE_RUNNING, 10, 1, 100)
     , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
     , NOTIFICATIONS({
         &NOTIFICATION_STATUS_UPDATE,
@@ -104,28 +122,35 @@ MoneyFarmerRoute210::MoneyFarmerRoute210()
     PA_ADD_OPTION(MON1_MOVE2_PP);
     PA_ADD_OPTION(MON1_MOVE3_PP);
     PA_ADD_OPTION(MON1_MOVE4_PP);
+    PA_ADD_OPTION(PICKUP_SLOT1);
+    PA_ADD_OPTION(PICKUP_SLOT2);
+    PA_ADD_OPTION(PICKUP_SLOT3);
+    PA_ADD_OPTION(PICKUP_SLOT4);
+    PA_ADD_OPTION(PICKUP_SLOT5);
+    PA_ADD_OPTION(PICKUP_SLOT6);
+    PA_ADD_OPTION(CHECK_PICKUP_FREQ);
     PA_ADD_OPTION(NOTIFICATIONS);
 }
 
 
 
 
-bool MoneyFarmerRoute210::battle(SingleSwitchProgramEnvironment& env, BotBaseContext& context, uint8_t pp0[4], uint8_t pp1[4]){
+bool MoneyFarmerRoute210::battle(SingleSwitchProgramEnvironment& env, ProControllerContext& context, uint8_t pp0[4], uint8_t pp1[4]){
     MoneyFarmerRoute210_Descriptor::Stats& stats = env.current_stats<MoneyFarmerRoute210_Descriptor::Stats>();
 
     env.log("Starting battle!");
 
     {
         StartBattleDetector detector(env.console);
-        int ret = run_until(
+        int ret = run_until<ProControllerContext>(
             env.console, context,
-            [](BotBaseContext& context){
-                pbf_press_button(context, BUTTON_ZL, 10, 10);
+            [](ProControllerContext& context){
+                pbf_press_button(context, BUTTON_ZL, 80ms, 80ms);
                 for (size_t c = 0; c < 17; c++){
-                    pbf_press_dpad(context, DPAD_UP, 5, 10);
-                    pbf_press_button(context, BUTTON_ZL, 10, 10);
-                    pbf_press_dpad(context, DPAD_RIGHT, 20, 10);
-                    pbf_press_button(context, BUTTON_ZL, 10, 10);
+                    pbf_press_dpad(context, DPAD_UP, 40ms, 80ms);
+                    pbf_press_button(context, BUTTON_ZL, 80ms, 80ms);
+                    pbf_press_dpad(context, DPAD_RIGHT, 160ms, 80ms);
+                    pbf_press_button(context, BUTTON_ZL, 80ms, 80ms);
                 }
             },
             {{detector}}
@@ -133,26 +158,27 @@ bool MoneyFarmerRoute210::battle(SingleSwitchProgramEnvironment& env, BotBaseCon
         if (ret < 0){
             stats.m_errors++;
             env.log("Failed to detect start of battle after 20 seconds.", COLOR_RED);
-            pbf_mash_button(context, BUTTON_B, TICKS_PER_SECOND);
+            pbf_mash_button(context, BUTTON_B, 1000ms);
             return false;
         }
     }
-    pbf_wait(context, 5 * TICKS_PER_SECOND);
+    pbf_wait(context, 5000ms);
 
     bool battle_menu_seen = false;
 
     //  State Machine
     //  We need lots of loops in case the party pokemon need to learn lots of moves.
+    
     while (true){
         context.wait_for_all_requests();
 
         BattleMenuWatcher battle_menu(BattleType::TRAINER);
         EndBattleWatcher end_battle;
         SelectionArrowFinder learn_move(env.console, {0.50, 0.62, 0.40, 0.18}, COLOR_YELLOW);
-        int ret = run_until(
+        int ret = run_until<ProControllerContext>(
             env.console, context,
-            [](BotBaseContext& context){
-                pbf_mash_button(context, BUTTON_B, 120 * TICKS_PER_SECOND);
+            [](ProControllerContext& context){
+                pbf_mash_button(context, BUTTON_B, 120000ms);
             },
             {
                 {battle_menu},
@@ -160,13 +186,15 @@ bool MoneyFarmerRoute210::battle(SingleSwitchProgramEnvironment& env, BotBaseCon
                 {learn_move},
             }
         );
+
+
         switch (ret){
-        case 0:        
+        case 0:
             env.log("Battle menu detected!", COLOR_BLUE);
             battle_menu_seen = true;
 
             {
-                pbf_press_button(context, BUTTON_ZL, 10, 125);
+                pbf_press_button(context, BUTTON_ZL, 80ms, 1000ms);
                 uint8_t slot = 0;
                 for (; slot < 4; slot++){
                     if (pp0[slot] != 0){
@@ -174,23 +202,23 @@ bool MoneyFarmerRoute210::battle(SingleSwitchProgramEnvironment& env, BotBaseCon
                     }
                 }
                 if (slot == 4){
-                    throw OperationFailedException(
-                        ErrorReport::SEND_ERROR_REPORT, env.console,
+                    OperationFailedExceptionWithScreenshot::fire(
+                        ErrorReportMode::SEND_ERROR_REPORT,
                         "Ran out of PP in a battle.",
-                        true
+                        env.console
                     );
                 }
 
                 for (uint8_t move_slot = 0; move_slot < slot; move_slot++){
-                    pbf_press_dpad(context, DPAD_DOWN, 10, 50);
+                    pbf_press_dpad(context, DPAD_DOWN, 80ms, 400ms);
                 }
-                pbf_press_button(context, BUTTON_ZL, 10, 125);
-                pbf_press_button(context, BUTTON_ZL, 10, 375);
+                pbf_press_button(context, BUTTON_ZL, 80ms, 1000ms);
+                pbf_press_button(context, BUTTON_ZL, 80ms, 3000ms);
                 pp0[slot]--;
             }
 
             {
-                pbf_press_button(context, BUTTON_ZL, 10, 125);
+                pbf_press_button(context, BUTTON_ZL, 80ms, 1000ms);
                 uint8_t slot = 0;
                 for (; slot < 4; slot++){
                     if (pp1[slot] != 0){
@@ -198,79 +226,124 @@ bool MoneyFarmerRoute210::battle(SingleSwitchProgramEnvironment& env, BotBaseCon
                     }
                 }
                 if (slot == 4){
-                    throw OperationFailedException(
-                        ErrorReport::SEND_ERROR_REPORT, env.console,
+                    OperationFailedExceptionWithScreenshot::fire(
+                        ErrorReportMode::SEND_ERROR_REPORT,
                         "Ran out of PP in a battle.",
-                        true
+                        env.console
                     );
                 }
 
                 for (uint8_t move_slot = 0; move_slot < slot; move_slot++){
-                    pbf_press_dpad(context, DPAD_DOWN, 10, 50);
+                    pbf_press_dpad(context, DPAD_DOWN, 80ms, 400ms);
                 }
-                pbf_press_button(context, BUTTON_ZL, 10, 125);
-                pbf_press_button(context, BUTTON_ZL, 10, 375);
+                pbf_press_button(context, BUTTON_ZL, 80ms, 1000ms);
+                pbf_press_button(context, BUTTON_ZL, 80ms, 3000ms);
                 pp1[slot]--;
             }
 
             break;
         case 1:
             env.log("Battle finished!", COLOR_BLUE);
-            pbf_mash_button(context, BUTTON_B, 250);
+            pbf_mash_button(context, BUTTON_B, 2000ms);
             return false;
         case 2:
             env.log("Detected move learn!", COLOR_BLUE);
             if (ON_LEARN_MOVE == OnLearnMove::DONT_LEARN){
-                pbf_move_right_joystick(context, 128, 255, 20, 105);
-                pbf_press_button(context, BUTTON_ZL, 20, 105);
+                pbf_move_right_joystick(context, {0, -1}, 160ms, 840ms);
+                pbf_press_button(context, BUTTON_ZL, 160ms, 840ms);
                 break;
             }
             return true;
         default:
             stats.m_errors++;
-            throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, env.console,
-                "Timed out after 2 minutes.",
-                true
-            );
+            env.log("Timed out after 2 minutes. Assume battle ended.", COLOR_RED);
+            return false;
         }
     }
 
-    throw OperationFailedException(
-        ErrorReport::SEND_ERROR_REPORT, env.console,
+    OperationFailedExceptionWithScreenshot::fire(
+        ErrorReportMode::SEND_ERROR_REPORT,
         "No progress detected after 5 battle menus. Are you out of PP?",
-        true
+        env.console
     );
 }
 
-void MoneyFarmerRoute210::heal_at_center_and_return(Logger& logger, BotBaseContext& context, uint8_t pp0[4], uint8_t pp1[4]){
+void MoneyFarmerRoute210::check_pickup_items(
+    ProControllerContext& context, const bool pickup_slots[6]
+){
+
+    // Open menu
+    pbf_press_button(context, BUTTON_X, 80ms, 1000ms);
+    
+    // Open Pokemon menu
+    pbf_press_button(context, BUTTON_A, 80ms, 1000ms);
+    
+    // Loop over each pokemon that has Pickup according to the settings
+    int current_slot = 0;
+    
+    for (int slot = 0; slot < 6; slot++){
+        if (pickup_slots[slot]){
+            int presses = slot - current_slot;
+            for (int i = 0; i < presses; i++){
+                pbf_wait(context, 50ms);
+                pbf_press_dpad(context, DPAD_DOWN, 80ms, 50ms);
+            }
+            
+            // Select mon, go to held items, go to put into bag (or back if the mon has no item), then exit with B
+            pbf_press_button(context, BUTTON_A, 160ms, 200ms);
+            
+            pbf_press_dpad(context, DPAD_UP, 160ms, 50ms);
+            pbf_press_dpad(context, DPAD_UP, 160ms, 50ms);
+            pbf_press_button(context, BUTTON_A, 160ms, 200ms);
+            
+            pbf_press_dpad(context, DPAD_UP, 160ms, 50ms);
+            pbf_press_dpad(context, DPAD_UP, 160ms, 50ms);
+            pbf_press_dpad(context, DPAD_UP, 160ms, 50ms);
+            pbf_press_button(context, BUTTON_A, 160ms, 200ms);
+            pbf_wait(context, 1000ms);
+            
+            pbf_press_button(context, BUTTON_B, 160ms, 100ms);
+            
+            current_slot = slot;
+            pbf_wait(context, 150ms);
+        }
+    };
+    
+    // Exit the screen
+    pbf_mash_button(context, BUTTON_B, 2000ms);
+}
+
+void MoneyFarmerRoute210::heal_at_center_and_return(
+    Logger& logger, ProControllerContext& context,
+    uint8_t pp0[4], uint8_t pp1[4]
+){
     logger.log("Healing " + STRING_POKEMON + " Celestic Town " + STRING_POKEMON + " Center.");
-    pbf_move_left_joystick(context, 125, 0, 6 * TICKS_PER_SECOND, 0);
-    pbf_mash_button(context, BUTTON_ZL, 3 * TICKS_PER_SECOND);
-    pbf_mash_button(context, BUTTON_B, 10 * TICKS_PER_SECOND);
+    pbf_move_left_joystick(context, {0, +1}, 6000ms, 0ms);
+    pbf_mash_button(context, BUTTON_ZL, 3000ms);
+    pbf_mash_button(context, BUTTON_B, 10000ms);
 
     logger.log("Returning to trainers...");
-    pbf_move_left_joystick(context, 128, 255, 6 * TICKS_PER_SECOND, 0);
-    pbf_move_left_joystick(context, 255, 128, 60, 0);
-    pbf_move_left_joystick(context, 128, 0, 200, 0);
-    pbf_move_left_joystick(context, 255, 128, 750, 0);
-
-    pbf_press_button(context, BUTTON_R, 10, 150);
-    pbf_mash_button(context, BUTTON_ZL, 6 * TICKS_PER_SECOND);
-
-    pbf_move_left_joystick(context, 128, 255, 30, 0);
-    pbf_move_left_joystick(context,   0, 128, 30, 0);
-    pbf_move_left_joystick(context, 128, 255, 80, 0);
-    pbf_move_left_joystick(context, 255, 128, 110, 0);
-    pbf_move_left_joystick(context, 128, 255, 125, 0);
-    pbf_move_left_joystick(context, 255, 128, 105, 0);
-    pbf_move_left_joystick(context, 128,   0, 375, 0);
-    pbf_move_left_joystick(context, 255, 128, 300, 0);
-    pbf_move_left_joystick(context, 128, 255, 375, 0);
-
-    pbf_press_dpad(context, DPAD_RIGHT, 375, 0);
-    pbf_press_dpad(context, DPAD_LEFT, 375, 0);
-    pbf_press_dpad(context, DPAD_DOWN, 125, 0);
+    pbf_move_left_joystick(context, {0, -1}, 6000ms, 0ms);
+    pbf_move_left_joystick(context, {+1, 0}, 480ms, 0ms);
+    pbf_move_left_joystick(context, {0, +1}, 1600ms, 0ms);
+    pbf_move_left_joystick(context, {+1, 0}, 6000ms, 0ms);
+
+    pbf_press_button(context, BUTTON_R, 80ms, 1200ms);
+    pbf_mash_button(context, BUTTON_ZL, 6000ms);
+
+    pbf_move_left_joystick(context, {0, -1}, 240ms, 0ms);
+    pbf_move_left_joystick(context, {-1, 0}, 240ms, 0ms);
+    pbf_move_left_joystick(context, {0, -1}, 640ms, 0ms);
+    pbf_move_left_joystick(context, {+1, 0}, 880ms, 0ms);
+    pbf_move_left_joystick(context, {0, -1}, 1000ms, 0ms);
+    pbf_move_left_joystick(context, {+1, 0}, 840ms, 0ms);
+    pbf_move_left_joystick(context, {0, +1}, 3000ms, 0ms);
+    pbf_move_left_joystick(context, {+1, 0}, 2400ms, 0ms);
+    pbf_move_left_joystick(context, {0, -1}, 3000ms, 0ms);
+
+    pbf_press_dpad(context, DPAD_RIGHT, 3000ms, 0ms);
+    pbf_press_dpad(context, DPAD_LEFT, 3000ms, 0ms);
+    pbf_press_dpad(context, DPAD_DOWN, 1000ms, 0ms);
 
     pp0[0] = MON0_MOVE1_PP;
     pp0[1] = MON0_MOVE2_PP;
@@ -281,27 +354,31 @@ void MoneyFarmerRoute210::heal_at_center_and_return(Logger& logger, BotBaseConte
     pp1[2] = MON1_MOVE3_PP;
     pp1[3] = MON1_MOVE4_PP;
 }
-void MoneyFarmerRoute210::fly_to_center_heal_and_return(Logger& logger, BotBaseContext& context, uint8_t pp0[4], uint8_t pp1[4]){
+void MoneyFarmerRoute210::fly_to_center_heal_and_return(
+    Logger& logger, ProControllerContext& context,
+    uint8_t pp0[4], uint8_t pp1[4]
+){
     logger.log("Flying back to Hearthome City to heal.");
-    pbf_press_button(context, BUTTON_X, 10, GameSettings::instance().OVERWORLD_TO_MENU_DELAY);
-    pbf_press_button(context, BUTTON_PLUS, 10, 240);
-    pbf_press_dpad(context, DPAD_LEFT, 10, 60);
-    pbf_press_dpad(context, DPAD_LEFT, 10, 60);
-    pbf_mash_button(context, BUTTON_ZL, 12 * TICKS_PER_SECOND);
+    pbf_press_button(context, BUTTON_X, 80ms, GameSettings::instance().OVERWORLD_TO_MENU_DELAY0);
+    pbf_press_button(context, BUTTON_PLUS, 80ms, 1920ms);
+    pbf_press_dpad(context, DPAD_LEFT, 80ms, 480ms);
+    pbf_press_dpad(context, DPAD_LEFT, 80ms, 480ms);
+    pbf_mash_button(context, BUTTON_ZL, 12000ms);
     heal_at_center_and_return(logger, context, pp0, pp1);
 }
 
 bool MoneyFarmerRoute210::heal_after_battle_and_return(
-    SingleSwitchProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context,
+    SingleSwitchProgramEnvironment& env,
+    VideoStream& stream, ProControllerContext& context,
     uint8_t pp0[4], uint8_t pp1[4])
 {
     if (HEALING_METHOD == HealMethod::CelesticTown){
         // Go to Celestic Town Pokecenter to heal the party.
-        fly_to_center_heal_and_return(console, context, pp0, pp1);
+        fly_to_center_heal_and_return(stream.logger(), context, pp0, pp1);
         return false;
     }else{
         // Use Global Room to heal the party.
-        heal_by_global_room(console, context);
+        heal_by_global_room(stream, context);
 
         pp0[0] = MON0_MOVE1_PP;
         pp0[1] = MON0_MOVE2_PP;
@@ -328,7 +405,9 @@ bool MoneyFarmerRoute210::has_pp(uint8_t pp0[4], uint8_t pp1[4]){
 
 
 
-void MoneyFarmerRoute210::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
+void MoneyFarmerRoute210::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    StartProgramChecks::check_performance_class_wired_or_wireless(context);
+
     MoneyFarmerRoute210_Descriptor::Stats& stats = env.current_stats<MoneyFarmerRoute210_Descriptor::Stats>();
 
     uint8_t pp0[4] = {
@@ -343,9 +422,24 @@ void MoneyFarmerRoute210::program(SingleSwitchProgramEnvironment& env, BotBaseCo
         MON1_MOVE3_PP,
         MON1_MOVE4_PP,
     };
+    
+    // Transform the slots selected as having mons with the Pickup ability into an array
+    bool pickup_slots_selected[6] = {
+        PICKUP_SLOT1,
+        PICKUP_SLOT2,
+        PICKUP_SLOT3,
+        PICKUP_SLOT4,
+        PICKUP_SLOT5,
+        PICKUP_SLOT6,
+    };
+    
+    bool has_pickup_mons = PICKUP_SLOT1 || PICKUP_SLOT2 || PICKUP_SLOT3 || PICKUP_SLOT4 || PICKUP_SLOT5 || PICKUP_SLOT6;
+    
+    uint32_t pickup_counter = 0;
+    uint32_t total_pickup_checks = 0;
 
     //  Connect the controller.
-    pbf_press_button(context, BUTTON_B, 5, 5);
+    require_player(env.console, context, BUTTON_B);
 
     bool need_to_charge = true;
     if (START_LOCATION == StartLocation::CelesticTown){
@@ -355,24 +449,29 @@ void MoneyFarmerRoute210::program(SingleSwitchProgramEnvironment& env, BotBaseCo
         if (HEALING_METHOD == HealMethod::GlobalRoom){
             heal_by_global_room(env.console, context);
         }
-        pbf_move_left_joystick(context, 255, 128, 140, 0);
+        pbf_move_left_joystick(context, {+1, 0}, 1120ms, 0ms);
     }
 
     while (true){
         env.update_stats();
 
         send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
+        
+        if (has_pickup_mons && pickup_counter % CHECK_PICKUP_FREQ.current_value() == 0 && pickup_counter != total_pickup_checks){
+            check_pickup_items(context, pickup_slots_selected);
+            total_pickup_checks = pickup_counter;
+        }
 
         if (need_to_charge){
-            pbf_move_left_joystick(context, 255, 128, 140, 0);
-            pbf_press_dpad(context, DPAD_UP, 85, 0);
+            pbf_move_left_joystick(context, {+1, 0}, 1120ms, 0ms);
+            pbf_press_dpad(context, DPAD_UP, 680ms, 0ms);
             for (size_t c = 0; c < 7; c++){
-                pbf_move_left_joystick(context, 0, 128, 140, 0);
-                pbf_move_left_joystick(context, 255, 128, 140, 0);
+                pbf_move_left_joystick(context, {-1, 0},  1120ms, 0ms);
+                pbf_move_left_joystick(context, {+1, 0}, 1120ms, 0ms);
             }
-            pbf_press_dpad(context, DPAD_DOWN, 75, 0);
+            pbf_press_dpad(context, DPAD_DOWN, 600ms, 0ms);
         }
-        pbf_press_dpad(context, DPAD_LEFT, 200, 0);
+        pbf_press_dpad(context, DPAD_LEFT, 1600ms, 0ms);
 
         context.wait_for_all_requests();
         stats.m_searches++;
@@ -380,15 +479,15 @@ void MoneyFarmerRoute210::program(SingleSwitchProgramEnvironment& env, BotBaseCo
         std::vector<ImagePixelBox> bubbles;
         {
             VSSeekerReactionTracker tracker(env.console, {0.20, 0.20, 0.60, 0.60});
-            run_until(
+            run_until<ProControllerContext>(
                 env.console, context,
-                [this](BotBaseContext& context){
-                    SHORTCUT.run(context, TICKS_PER_SECOND);
+                [this](ProControllerContext& context){
+                    SHORTCUT.run(context, 1000ms);
                 },
                 {{tracker}}
             );
             need_to_charge = true;
-            pbf_mash_button(context, BUTTON_B, 250);
+            pbf_mash_button(context, BUTTON_B, 2000ms);
 
             bubbles = tracker.reactions();
             if (bubbles.empty()){
@@ -405,6 +504,8 @@ void MoneyFarmerRoute210::program(SingleSwitchProgramEnvironment& env, BotBaseCo
         if (this->battle(env, context, pp0, pp1)){
             return;
         }
+        pickup_counter++;
+        
         if (!has_pp(pp0, pp1)){
             need_to_charge = heal_after_battle_and_return(env, env.console, context, pp0, pp1);
             continue;
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_MoneyFarmerRoute210.h b/SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_MoneyFarmerRoute210.h
index 2ef9c609d3..d61afc6c67 100644
--- a/SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_MoneyFarmerRoute210.h
+++ b/SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_MoneyFarmerRoute210.h
@@ -1,14 +1,14 @@
 /*  Money Farmer (Route 210)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifndef PokemonAutomation_PokemonBDSP_MoneyFarmerRoute210_H
 #define PokemonAutomation_PokemonBDSP_MoneyFarmerRoute210_H
 
-#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
 #include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
 #include "Common/Cpp/Options/EnumDropdownOption.h"
 #include "CommonFramework/Notifications/EventNotificationsTable.h"
 #include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
@@ -31,22 +31,35 @@ class MoneyFarmerRoute210_Descriptor : public SingleSwitchProgramDescriptor{
 
 class MoneyFarmerRoute210 : public SingleSwitchProgramInstance{
 public:
+    using Descriptor = MoneyFarmerRoute210_Descriptor;
     MoneyFarmerRoute210();
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
 
 private:
     // Run the battle loop. Return true if the program should stop.
-    bool battle(SingleSwitchProgramEnvironment& env, BotBaseContext& context, uint8_t pp0[4], uint8_t pp1[4]);
+    bool battle(SingleSwitchProgramEnvironment& env, ProControllerContext& context, uint8_t pp0[4], uint8_t pp1[4]);
+    // Check for items generated through the Pickup ability
+    void check_pickup_items(
+        ProControllerContext& context,
+        const bool pickup_slots_selected[6]
+                       );
     // From the bottom row of the Ace Trainer pair, heal Pokemon and return.
     // Return true if VS Seeker needs charging.
-    bool heal_after_battle_and_return(SingleSwitchProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context, uint8_t pp0[4], uint8_t pp1[4]);
+    bool heal_after_battle_and_return(
+        SingleSwitchProgramEnvironment& env,
+        VideoStream& stream, ProControllerContext& context,
+        uint8_t pp0[4], uint8_t pp1[4]
+    );
     // Starting in front of the Celestic Town Pokecenter, heal and return
     // to the Ace Trainer pair.
-    void heal_at_center_and_return(Logger& logger, BotBaseContext& context, uint8_t pp0[4], uint8_t pp1[4]);
+    void heal_at_center_and_return(Logger& logger, ProControllerContext& context, uint8_t pp0[4], uint8_t pp1[4]);
     // Fly from the Ace Trainer pair to Hearthome Pokecenter, heal and return.
-    void fly_to_center_heal_and_return(Logger& logger, BotBaseContext& context, uint8_t pp0[4], uint8_t pp1[4]);
+    void fly_to_center_heal_and_return(
+        Logger& logger, ProControllerContext& context,
+        uint8_t pp0[4],uint8_t pp1[4]
+    );
     // Move around to charge VS Seeker.
-    void charge_vs_seeker(ConsoleHandle& console);
+    void charge_vs_seeker(VideoStream& stream);
 
     static bool has_pp(uint8_t pp0[4], uint8_t pp1[4]);
 
@@ -75,6 +88,15 @@ class MoneyFarmerRoute210 : public SingleSwitchProgramInstance{
     SimpleIntegerOption<uint8_t> MON1_MOVE2_PP;
     SimpleIntegerOption<uint8_t> MON1_MOVE3_PP;
     SimpleIntegerOption<uint8_t> MON1_MOVE4_PP;
+    
+    BooleanCheckBoxOption PICKUP_SLOT1;
+    BooleanCheckBoxOption PICKUP_SLOT2;
+    BooleanCheckBoxOption PICKUP_SLOT3;
+    BooleanCheckBoxOption PICKUP_SLOT4;
+    BooleanCheckBoxOption PICKUP_SLOT5;
+    BooleanCheckBoxOption PICKUP_SLOT6;
+    
+    SimpleIntegerOption<uint8_t> CHECK_PICKUP_FREQ;
 
     EventNotificationOption NOTIFICATION_STATUS_UPDATE;
     EventNotificationsOption NOTIFICATIONS;
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_MoneyFarmerRoute212.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_MoneyFarmerRoute212.cpp
index 4e0d04c53e..32a1e0177c 100644
--- a/SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_MoneyFarmerRoute212.cpp
+++ b/SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_MoneyFarmerRoute212.cpp
@@ -1,14 +1,17 @@
 /*  Money Farmer
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include "CommonFramework/Exceptions/OperationFailedException.h"
-#include "CommonFramework/Tools/StatsTracking.h"
+#include "Common/Cpp/ImageResolution.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
 #include "CommonFramework/Notifications/ProgramNotifications.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "CommonTools/StartupChecks/StartProgramChecks.h"
 #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
 #include "Pokemon/Pokemon_Strings.h"
 #include "PokemonBDSP/PokemonBDSP_Settings.h"
 #include "PokemonBDSP/Programs/PokemonBDSP_GlobalRoomHeal.h"
@@ -21,18 +24,20 @@
 namespace PokemonAutomation{
 namespace NintendoSwitch{
 namespace PokemonBDSP{
-    using namespace Pokemon;
+
+using namespace Pokemon;
 
 
 MoneyFarmerRoute212_Descriptor::MoneyFarmerRoute212_Descriptor()
     : SingleSwitchProgramDescriptor(
         "PokemonBDSP:MoneyFarmerRoute212",
         STRING_POKEMON + " BDSP", "Money Farmer (Route 212)",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonBDSP/MoneyFarmerRoute212.md",
+        "Programs/PokemonBDSP/MoneyFarmerRoute212.html",
         "Farm money by using VS Seeker to rebattle the rich couple on Route 212.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_RequiresPrecision,
         FeedbackType::REQUIRED,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
     )
 {}
 struct MoneyFarmerRoute212_Descriptor::Stats : public StatsTracker{
@@ -45,7 +50,7 @@ struct MoneyFarmerRoute212_Descriptor::Stats : public StatsTracker{
         , m_both(m_stats["Both"])
     {
         m_display_order.emplace_back("Searches");
-        m_display_order.emplace_back("Errors", true);
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
         m_display_order.emplace_back("No React");
         m_display_order.emplace_back("Man Only");
         m_display_order.emplace_back("Woman Only");
@@ -71,7 +76,7 @@ MoneyFarmerRoute212::MoneyFarmerRoute212()
             {StartLocation::Hearthome, "hearthome", "In front of the Hearthome City " + STRING_POKEMON + " center."},
             {StartLocation::OldCouple, "old-couple", "In the row above the rich couple in Route 212."},
         },
-        LockWhileRunning::LOCKED,
+        LockMode::LOCK_WHILE_RUNNING,
         StartLocation::Hearthome
     )
     , HEALING_METHOD(
@@ -80,13 +85,13 @@ MoneyFarmerRoute212::MoneyFarmerRoute212()
             {HealMethod::Hearthome, "hearthome", "Hearthome City " + STRING_POKEMON + " center."},
             {HealMethod::GlobalRoom, "global-room", "Use Global Room. (will force update your game)"},
         },
-        LockWhileRunning::LOCKED,
+        LockMode::LOCK_WHILE_RUNNING,
         HealMethod::Hearthome
     )
-    , MOVE1_PP("<b>Move 1 PP:</b><br>Set to zero to not use this move.", LockWhileRunning::LOCKED, 5, 0, 64)
-    , MOVE2_PP("<b>Move 2 PP:</b><br>Set to zero to not use this move.", LockWhileRunning::LOCKED, 5, 0, 64)
-    , MOVE3_PP("<b>Move 3 PP:</b><br>Set to zero to not use this move.", LockWhileRunning::LOCKED, 5, 0, 64)
-    , MOVE4_PP("<b>Move 4 PP:</b><br>Set to zero to not use this move.", LockWhileRunning::LOCKED, 5, 0, 64)
+    , MOVE1_PP("<b>Move 1 PP:</b><br>Set to zero to not use this move.", LockMode::LOCK_WHILE_RUNNING, 5, 0, 64)
+    , MOVE2_PP("<b>Move 2 PP:</b><br>Set to zero to not use this move.", LockMode::LOCK_WHILE_RUNNING, 5, 0, 64)
+    , MOVE3_PP("<b>Move 3 PP:</b><br>Set to zero to not use this move.", LockMode::LOCK_WHILE_RUNNING, 5, 0, 64)
+    , MOVE4_PP("<b>Move 4 PP:</b><br>Set to zero to not use this move.", LockMode::LOCK_WHILE_RUNNING, 5, 0, 64)
     , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
     , NOTIFICATIONS({
         &NOTIFICATION_STATUS_UPDATE,
@@ -107,7 +112,7 @@ MoneyFarmerRoute212::MoneyFarmerRoute212()
 
 
 
-bool MoneyFarmerRoute212::battle(SingleSwitchProgramEnvironment& env, BotBaseContext& context, uint8_t pp[4], bool man){
+bool MoneyFarmerRoute212::battle(SingleSwitchProgramEnvironment& env, ProControllerContext& context, uint8_t pp[4], bool man){
     MoneyFarmerRoute212_Descriptor::Stats& stats = env.current_stats<MoneyFarmerRoute212_Descriptor::Stats>();
     context.wait_for_all_requests();
     if (man){
@@ -117,7 +122,7 @@ bool MoneyFarmerRoute212::battle(SingleSwitchProgramEnvironment& env, BotBaseCon
     }
     env.console.overlay().add_log("Starting battle", COLOR_WHITE);
 
-    pbf_mash_button(context, BUTTON_ZL, 5 * TICKS_PER_SECOND);
+    pbf_mash_button(context, BUTTON_ZL, 5000ms);
 
     bool battle_menu_seen = false;
 
@@ -129,10 +134,10 @@ bool MoneyFarmerRoute212::battle(SingleSwitchProgramEnvironment& env, BotBaseCon
         BattleMenuWatcher battle_menu(BattleType::TRAINER);
         EndBattleWatcher end_battle;
         SelectionArrowFinder learn_move(env.console, {0.50, 0.62, 0.40, 0.18}, COLOR_YELLOW);
-        int ret = run_until(
+        int ret = run_until<ProControllerContext>(
             env.console, context,
-            [](BotBaseContext& context){
-                pbf_mash_button(context, BUTTON_B, 30 * TICKS_PER_SECOND);
+            [](ProControllerContext& context){
+                pbf_mash_button(context, BUTTON_B, 30000ms);
             },
             {
                 {battle_menu},
@@ -146,7 +151,7 @@ bool MoneyFarmerRoute212::battle(SingleSwitchProgramEnvironment& env, BotBaseCon
             env.console.overlay().add_log("Choose move", COLOR_BLUE);
             battle_menu_seen = true;
 
-            pbf_press_button(context, BUTTON_ZL, 10, 125);
+            pbf_press_button(context, BUTTON_ZL, 80ms, 1000ms);
 
             uint8_t slot = 0;
             for (; slot < 4; slot++){
@@ -155,17 +160,17 @@ bool MoneyFarmerRoute212::battle(SingleSwitchProgramEnvironment& env, BotBaseCon
                 }
             }
             if (slot == 4){
-                throw OperationFailedException(
-                    ErrorReport::SEND_ERROR_REPORT, env.console,
+                OperationFailedExceptionWithScreenshot::fire(
+                    ErrorReportMode::SEND_ERROR_REPORT,
                     "Ran out of PP in a battle.",
-                    true
+                    env.console
                 );
             }
 
             for (uint8_t move_slot = 0; move_slot < slot; move_slot++){
-                pbf_press_dpad(context, DPAD_DOWN, 10, 50);
+                pbf_press_dpad(context, DPAD_DOWN, 80ms, 400ms);
             }
-            pbf_mash_button(context, BUTTON_ZL, 250);
+            pbf_mash_button(context, BUTTON_ZL, 2000ms);
             pp[slot]--;
             env.log("Used move at slot " + std::to_string(slot+1) + ". " + std::to_string(pp[slot]) + " PP left.", COLOR_BLUE);
 
@@ -174,7 +179,7 @@ bool MoneyFarmerRoute212::battle(SingleSwitchProgramEnvironment& env, BotBaseCon
         case 1:
             env.log("Battle finished!", COLOR_BLUE);
             env.console.overlay().add_log("Battle finished", COLOR_WHITE);
-            pbf_mash_button(context, BUTTON_B, 250);
+            pbf_mash_button(context, BUTTON_B, 2000ms);
             return false;
 //        case 1:
 //            env.log("Dialog detected! Battle finished?", COLOR_BLUE);
@@ -184,58 +189,56 @@ bool MoneyFarmerRoute212::battle(SingleSwitchProgramEnvironment& env, BotBaseCon
             env.log("Detected move to learn!", COLOR_BLUE);
             env.console.overlay().add_log("Detected move to learn", COLOR_WHITE);
             if (ON_LEARN_MOVE == OnLearnMove::DONT_LEARN){
-                pbf_move_right_joystick(context, 128, 255, 20, 105);
-                pbf_press_button(context, BUTTON_ZL, 20, 105);
+                pbf_move_right_joystick(context, {0, -1}, 160ms, 840ms);
+                pbf_press_button(context, BUTTON_ZL, 160ms, 840ms);
                 break;
             }
             return true;
 
         default:
             stats.m_errors++;
-            throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, env.console,
-                "Timed out after 30 seconds.",
-                true
-            );
+            env.log("Timed out after 30 seconds. Assume battle ended.", COLOR_RED);
+            return false;
         }
     }
 
-    throw OperationFailedException(
-        ErrorReport::SEND_ERROR_REPORT, env.console,
+    OperationFailedExceptionWithScreenshot::fire(
+        ErrorReportMode::SEND_ERROR_REPORT,
         "No progress detected after 5 battle menus. Are you out of PP?",
-        true
+        env.console
     );
 }
 
 
-void MoneyFarmerRoute212::heal_at_center_and_return(ConsoleHandle& console, BotBaseContext& context, uint8_t pp[4]){
-    console.overlay().add_log("Heal at " + STRING_POKEMON + " Center", COLOR_WHITE);
-    console.log("Healing " + STRING_POKEMON + " at Hearthome City " + STRING_POKEMON + " Center.");
-    pbf_move_left_joystick(context, 125, 0, 6 * TICKS_PER_SECOND, 0);
-    pbf_mash_button(context, BUTTON_ZL, 3 * TICKS_PER_SECOND);
-    pbf_mash_button(context, BUTTON_B, 10 * TICKS_PER_SECOND);
+void MoneyFarmerRoute212::heal_at_center_and_return(VideoStream& stream, ProControllerContext& context, uint8_t pp[4]){
+    stream.overlay().add_log("Heal at " + STRING_POKEMON + " Center", COLOR_WHITE);
+    stream.log("Healing " + STRING_POKEMON + " at Hearthome City " + STRING_POKEMON + " Center.");
+    pbf_move_left_joystick(context, {0, +1}, 6000ms, 0ms);
+    pbf_mash_button(context, BUTTON_ZL, 3000ms);
+//    ssf_mash_AZs(context, 3000ms);
+    pbf_mash_button(context, BUTTON_B, 10000ms);
     context.wait_for_all_requests();
-    console.overlay().add_log("Heal complete", COLOR_WHITE);
-    console.overlay().add_log("To rich couple", COLOR_WHITE);
-    console.log("Returning to rich couple location...");
-    pbf_move_left_joystick(context, 128, 255, 8 * TICKS_PER_SECOND, 0);
-    pbf_move_left_joystick(context, 255, 128, 380, 0);
-    pbf_move_left_joystick(context, 128, 255, 300, 0);
-    pbf_move_left_joystick(context,   0, 128, 600, 0);
-    pbf_move_left_joystick(context, 255, 128,  70, 0);
-    pbf_move_left_joystick(context, 128, 255, 1375, 0);
-    pbf_move_left_joystick(context, 255, 128, 125, 0);
-    pbf_move_left_joystick(context, 128, 255, 200, 0);
-    pbf_move_left_joystick(context,   0, 128, 200, 0);
-    pbf_move_left_joystick(context, 128, 255,  50, 0);
-    pbf_move_left_joystick(context,   0, 128, 125, 0);
-    pbf_move_left_joystick(context, 128, 255, 125, 0);
-    pbf_move_left_joystick(context, 255, 128, 250, 0);
-    pbf_move_left_joystick(context, 128, 255, 200, 0);
-    pbf_move_left_joystick(context,   0, 128,  90, 0);
-    pbf_move_left_joystick(context, 128, 255, 200, 0);
-    pbf_move_left_joystick(context, 255, 128, 125, 0);
-    pbf_move_left_joystick(context, 128, 255, 200, 0);
+    stream.overlay().add_log("Heal complete", COLOR_WHITE);
+    stream.overlay().add_log("To rich couple", COLOR_WHITE);
+    stream.log("Returning to rich couple location...");
+    pbf_move_left_joystick(context, {0, -1}, 8000ms, 0ms);
+    pbf_move_left_joystick(context, {+1, 0}, 3040ms, 0ms);
+    pbf_move_left_joystick(context, {0, -1}, 2400ms, 0ms);
+    pbf_move_left_joystick(context, {-1, 0}, 4800ms, 0ms);
+    pbf_move_left_joystick(context, {+1, 0}, 600ms, 0ms);
+    pbf_move_left_joystick(context, {0, -1}, 11000ms, 0ms);
+    pbf_move_left_joystick(context, {+1, 0}, 1000ms, 0ms);
+    pbf_move_left_joystick(context, {0, -1}, 1600ms, 0ms);
+    pbf_move_left_joystick(context, {-1, 0}, 1600ms, 0ms);
+    pbf_move_left_joystick(context, {0, -1}, 400ms, 0ms);
+    pbf_move_left_joystick(context, {-1, 0}, 1000ms, 0ms);
+    pbf_move_left_joystick(context, {0, -1}, 1000ms, 0ms);
+    pbf_move_left_joystick(context, {+1, 0}, 2000ms, 0ms);
+    pbf_move_left_joystick(context, {0, -1}, 1600ms, 0ms);
+    pbf_move_left_joystick(context, {-1, 0}, 720ms, 0ms);
+    pbf_move_left_joystick(context, {0, -1}, 1600ms, 0ms);
+    pbf_move_left_joystick(context, {+1, 0}, 1000ms, 0ms);
+    pbf_move_left_joystick(context, {0, -1}, 1600ms, 0ms);
 
     pp[0] = MOVE1_PP;
     pp[1] = MOVE2_PP;
@@ -245,28 +248,28 @@ void MoneyFarmerRoute212::heal_at_center_and_return(ConsoleHandle& console, BotB
 }
 
 
-void MoneyFarmerRoute212::fly_to_center_heal_and_return(ConsoleHandle& console, BotBaseContext& context, uint8_t pp[4]){
-    console.log("Flying back to Hearthome City to heal.");
-    console.overlay().add_log("Fly to Hearthome City", COLOR_WHITE);
-    pbf_press_button(context, BUTTON_X, 10, GameSettings::instance().OVERWORLD_TO_MENU_DELAY);
-    pbf_press_button(context, BUTTON_PLUS, 10, 240);
-    pbf_press_dpad(context, DPAD_UP, 10, 60);
-    pbf_press_dpad(context, DPAD_UP, 10, 60);
-    pbf_mash_button(context, BUTTON_ZL, 12 * TICKS_PER_SECOND);
-    heal_at_center_and_return(console, context, pp);
+void MoneyFarmerRoute212::fly_to_center_heal_and_return(VideoStream& stream, ProControllerContext& context, uint8_t pp[4]){
+    stream.log("Flying back to Hearthome City to heal.");
+    stream.overlay().add_log("Fly to Hearthome City", COLOR_WHITE);
+    pbf_press_button(context, BUTTON_X, 80ms, GameSettings::instance().OVERWORLD_TO_MENU_DELAY0);
+    pbf_press_button(context, BUTTON_PLUS, 80ms, 1920ms);
+    pbf_press_dpad(context, DPAD_UP, 80ms, 480ms);
+    pbf_press_dpad(context, DPAD_UP, 80ms, 480ms);
+    pbf_mash_button(context, BUTTON_ZL, 12000ms);
+    heal_at_center_and_return(stream, context, pp);
 }
 
 bool MoneyFarmerRoute212::heal_after_battle_and_return(
-    ConsoleHandle& console, BotBaseContext& context,
+    VideoStream& stream, ProControllerContext& context,
     uint8_t pp[4])
 {
     if (HEALING_METHOD == HealMethod::Hearthome){
         // Go to Hearhome City Pokecenter to heal the party.
-        fly_to_center_heal_and_return(console, context, pp);
+        fly_to_center_heal_and_return(stream, context, pp);
         return false;
     }else{
         // Use Global Room to heal the party.
-        heal_by_global_room(console, context);
+        heal_by_global_room(stream, context);
 
         pp[0] = MOVE1_PP;
         pp[1] = MOVE2_PP;
@@ -276,10 +279,10 @@ bool MoneyFarmerRoute212::heal_after_battle_and_return(
     }
 }
 
-void MoneyFarmerRoute212::charge_vs_seeker(BotBaseContext& context){
+void MoneyFarmerRoute212::charge_vs_seeker(ProControllerContext& context){
     for (size_t c = 0; c < 5; c++){
-        pbf_move_left_joystick(context, 0, 128, 180, 0);
-        pbf_move_left_joystick(context, 255, 128, 180, 0);
+        pbf_move_left_joystick(context, {-1, 0},  1440ms, 0ms);
+        pbf_move_left_joystick(context, {+1, 0}, 1440ms, 0ms);
     }
 }
 
@@ -294,7 +297,9 @@ size_t MoneyFarmerRoute212::total_pp(uint8_t pp[4]){
 }
 
 
-void MoneyFarmerRoute212::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
+void MoneyFarmerRoute212::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    StartProgramChecks::check_performance_class_wired_or_wireless(context);
+
     MoneyFarmerRoute212_Descriptor::Stats& stats = env.current_stats<MoneyFarmerRoute212_Descriptor::Stats>();
 
     uint8_t pp[4] = {
@@ -305,7 +310,7 @@ void MoneyFarmerRoute212::program(SingleSwitchProgramEnvironment& env, BotBaseCo
     };
 
     //  Connect the controller.
-    pbf_press_button(context, BUTTON_B, 5, 5);
+    require_player(env.console, context, BUTTON_B);
 
     bool need_to_charge = true;
     if (START_LOCATION == StartLocation::Hearthome){
@@ -316,7 +321,7 @@ void MoneyFarmerRoute212::program(SingleSwitchProgramEnvironment& env, BotBaseCo
             heal_by_global_room(env.console, context);
         }
         // Reset position to right most on the row above the rich couple
-        pbf_move_left_joystick(context, 255, 128, 180, 0);
+        pbf_move_left_joystick(context, {+1, 0}, 1440ms, 0ms);
     }
 
     while (true){
@@ -330,26 +335,26 @@ void MoneyFarmerRoute212::program(SingleSwitchProgramEnvironment& env, BotBaseCo
         }
 
         //  Move to woman.
-        pbf_move_left_joystick(context, 0, 128, 52, 0);
+        pbf_move_left_joystick(context, {-1, 0},  416ms, 0ms);
 
         context.wait_for_all_requests();
         stats.m_searches++;
 
-        QSize dimensions;
+        Resolution dimensions;
         std::vector<ImagePixelBox> bubbles;
         {
             env.console.overlay().add_log("Using Vs. Seeker", COLOR_WHITE);
             VSSeekerReactionTracker tracker(env.console, {0.23, 0.30, 0.35, 0.30});
-            run_until(
+            run_until<ProControllerContext>(
                 env.console, context,
-                [this](BotBaseContext& context){
-                    SHORTCUT.run(context, TICKS_PER_SECOND);
+                [this](ProControllerContext& context){
+                    SHORTCUT.run(context, 1000ms);
 
                 },
                 {{tracker}}
             );
             need_to_charge = true;
-            pbf_mash_button(context, BUTTON_B, 250);
+            pbf_mash_button(context, BUTTON_B, 2000ms);
 
             dimensions = tracker.dimensions();
             bubbles = tracker.reactions();
@@ -363,7 +368,7 @@ void MoneyFarmerRoute212::program(SingleSwitchProgramEnvironment& env, BotBaseCo
         bool man = false;
         bool woman = false;
         for (const ImagePixelBox& box : bubbles){
-            double x_coord = (double)box.min_x / dimensions.width();
+            double x_coord = (double)box.min_x / dimensions.width;
             env.log("Reaction at: " + std::to_string(x_coord), COLOR_BLUE);
             if (x_coord < 0.5){
                 man = true;
@@ -387,8 +392,8 @@ void MoneyFarmerRoute212::program(SingleSwitchProgramEnvironment& env, BotBaseCo
         env.update_stats();
 
         if (woman){
-//            pbf_move_left_joystick(context, 0, 128, 52, 0);
-            pbf_move_left_joystick(context, 128, 255, 10, 0);
+//            pbf_move_left_joystick(context, {-1, 0},  416ms, 0ms);
+            pbf_move_left_joystick(context, {0, -1}, 80ms, 0ms);
 
             //  Battle woman.
             if(battle(env, context, pp, false)){
@@ -411,11 +416,11 @@ void MoneyFarmerRoute212::program(SingleSwitchProgramEnvironment& env, BotBaseCo
 #endif
 
 //            if (woman){
-                pbf_move_left_joystick(context, 0, 128, 52, 0);
-                pbf_move_left_joystick(context, 128, 255, 10, 0);
+                pbf_move_left_joystick(context, {-1, 0},  416ms, 0ms);
+                pbf_move_left_joystick(context, {0, -1}, 80ms, 0ms);
 //            }else{
-//                pbf_move_left_joystick(context, 0, 128, 105, 0);
-//                pbf_move_left_joystick(context, 128, 255, 10, 0);
+//                pbf_move_left_joystick(context, {-1, 0},  840ms, 0ms);
+//                pbf_move_left_joystick(context, {0, -1}, 80ms, 0ms);
 //            }
 
             //  Battle man.
@@ -429,7 +434,7 @@ void MoneyFarmerRoute212::program(SingleSwitchProgramEnvironment& env, BotBaseCo
                 continue;
             }
         }
-        pbf_move_left_joystick(context, 255, 128, 180, 0);
+        pbf_move_left_joystick(context, {+1, 0}, 1440ms, 0ms);
 
     }
 }
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_MoneyFarmerRoute212.h b/SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_MoneyFarmerRoute212.h
index de2796e1e3..c8d6e24bf7 100644
--- a/SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_MoneyFarmerRoute212.h
+++ b/SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_MoneyFarmerRoute212.h
@@ -1,13 +1,12 @@
 /*  Money Farmer (Route 212)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifndef PokemonAutomation_PokemonBDSP_MoneyFarmerRoute212_H
 #define PokemonAutomation_PokemonBDSP_MoneyFarmerRoute212_H
 
-#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
 #include "Common/Cpp/Options/SimpleIntegerOption.h"
 #include "Common/Cpp/Options/EnumDropdownOption.h"
 #include "CommonFramework/Notifications/EventNotificationsTable.h"
@@ -31,22 +30,23 @@ class MoneyFarmerRoute212_Descriptor : public SingleSwitchProgramDescriptor{
 
 class MoneyFarmerRoute212 : public SingleSwitchProgramInstance{
 public:
+    using Descriptor = MoneyFarmerRoute212_Descriptor;
     MoneyFarmerRoute212();
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
 
 private:
     // Run the battle loop. Return true if the program should stop.
-    bool battle(SingleSwitchProgramEnvironment& env, BotBaseContext& context, uint8_t pp[4], bool man);
+    bool battle(SingleSwitchProgramEnvironment& env, ProControllerContext& context, uint8_t pp[4], bool man);
     // From the row above the old couple, heal Pokemon and return.
     // Return true if VS Seeker needs charging.
-    bool heal_after_battle_and_return(ConsoleHandle& console, BotBaseContext& context, uint8_t pp[4]);
+    bool heal_after_battle_and_return(VideoStream& stream, ProControllerContext& context, uint8_t pp[4]);
     // Starting in front of the Hearthome Pokecenter, heal and return
     // to the old couple.
-    void heal_at_center_and_return(ConsoleHandle& console, BotBaseContext& context, uint8_t pp[4]);
+    void heal_at_center_and_return(VideoStream& stream, ProControllerContext& context, uint8_t pp[4]);
     // Fly from the old couple to Hearthome Pokecenter, heal and return.
-    void fly_to_center_heal_and_return(ConsoleHandle& console, BotBaseContext& context, uint8_t pp[4]);
+    void fly_to_center_heal_and_return(VideoStream& stream, ProControllerContext& context, uint8_t pp[4]);
     // Move around to charge VS Seeker.
-    void charge_vs_seeker(BotBaseContext& context);
+    void charge_vs_seeker(ProControllerContext& context);
 
     static size_t total_pp(uint8_t pp[4]);
 
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_PoffinCooker.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_PoffinCooker.cpp
new file mode 100644
index 0000000000..59adb7cbe2
--- /dev/null
+++ b/SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_PoffinCooker.cpp
@@ -0,0 +1,212 @@
+/*  Poffin Cooker
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/ImageTools/ImageStats.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "PokemonBDSP_PoffinCooker.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonBDSP{
+    using namespace Pokemon;
+
+
+PoffinCooker_Descriptor::PoffinCooker_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonBDSP:PoffinCooker",
+        STRING_POKEMON + " BDSP", "Poffin Cooker",
+        "Programs/PokemonBDSP/PoffinCooker.html",
+        "Cook Poffins.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_PerformanceClassSensitive,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+struct PoffinCooker_Descriptor::Stats : public StatsTracker{
+    Stats()
+        : m_attempts(m_stats["Poffins cooked"])
+    {
+        m_display_order.emplace_back("Poffins cooked");
+    }
+    std::atomic<uint64_t>& m_attempts;
+};
+std::unique_ptr<StatsTracker> PoffinCooker_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+
+PoffinCooker::PoffinCooker()
+    : GO_HOME_WHEN_DONE(false)
+    , MAX_COOK_ATTEMPTS(
+        "<b>Cook this many times:</b><br>This puts a limit on how many poffins you get. Don't forget that each cooking session gets you 4 poffins, and your bag cannot have more than 100 poffins. Thus you should never input more than 25 here.",
+        LockMode::LOCK_WHILE_RUNNING,
+        1,
+        1,
+        25
+    )
+
+{
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+    PA_ADD_OPTION(MAX_COOK_ATTEMPTS);
+}
+
+bool turn = true; // True to turn clockwise, false to turn counter-clockwise
+
+ImageFloatBox box(0.56, 0.724, 0.012, 0.024); // Create a box that contains both green and blue arrows that need to be detected
+
+void TurnClockwiseSlow(ProControllerContext& context){ // One turn of stirring poffin at slow speed (clockwise)
+    pbf_move_right_joystick(context, {0, -1}, 40ms, 0ms);
+    pbf_move_right_joystick(context, {-0.586, -0.811}, 40ms, 0ms);
+    pbf_move_right_joystick(context, {-0.953, -0.307}, 40ms, 0ms);
+    pbf_move_right_joystick(context, {-0.953, +0.312}, 40ms, 0ms);
+    pbf_move_right_joystick(context, {-0.586, +0.812}, 40ms, 0ms);
+    pbf_move_right_joystick(context, {0, +1}, 40ms, 0ms);
+    pbf_move_right_joystick(context, {+0.583, +0.812}, 40ms, 0ms);
+    pbf_move_right_joystick(context, {+0.953, +0.312}, 40ms, 0ms);
+    pbf_move_right_joystick(context, {+0.953, -0.307}, 40ms, 0ms);
+    pbf_move_right_joystick(context, {+0.583, -0.811}, 40ms, 0ms);
+}
+
+void TurnClockwiseFast(ProControllerContext& context){ // Same as above, but faster for the end of the cooking session
+    pbf_move_right_joystick(context, {0, -1}, 40ms, 0ms);
+    pbf_move_right_joystick(context, {-0.703, -0.709}, 40ms, 0ms);
+    pbf_move_right_joystick(context, {-1, 0}, 40ms, 0ms);
+    pbf_move_right_joystick(context, {-0.703, +0.703}, 40ms, 0ms);
+    pbf_move_right_joystick(context, {0, +1}, 40ms, 0ms);
+    pbf_move_right_joystick(context, {+0.709, +0.703}, 40ms, 0ms);
+    pbf_move_right_joystick(context, {+1, 0}, 40ms, 0ms);
+    pbf_move_right_joystick(context, {+0.709, -0.709}, 40ms, 0ms);
+}
+
+
+void TurnCounterClockwiseSlow(ProControllerContext& context){ // One turn of stirring poffin (counter-clockwise)
+    pbf_move_right_joystick(context, {0, -1}, 40ms, 0ms);
+    pbf_move_right_joystick(context, {+0.583, -0.811}, 40ms, 0ms);
+    pbf_move_right_joystick(context, {+0.953, -0.307}, 40ms, 0ms);
+    pbf_move_right_joystick(context, {+0.953, +0.312}, 40ms, 0ms);
+    pbf_move_right_joystick(context, {+0.583, +0.812}, 40ms, 0ms);
+    pbf_move_right_joystick(context, {0, +1}, 40ms, 0ms);
+    pbf_move_right_joystick(context, {-0.586, +0.812}, 40ms, 0ms);
+    pbf_move_right_joystick(context, {-0.953, +0.312}, 40ms, 0ms);
+    pbf_move_right_joystick(context, {-0.953, -0.307}, 40ms, 0ms);
+    pbf_move_right_joystick(context, {-0.586, -0.811}, 40ms, 0ms);
+}
+
+void TurnCounterClockwiseFast(ProControllerContext& context){ // Same as above, but faster for the end of the cooking session
+    pbf_move_right_joystick(context, {0, -1}, 40ms, 0ms);
+    pbf_move_right_joystick(context, {+0.709, -0.709}, 40ms, 0ms);
+    pbf_move_right_joystick(context, {+1, 0}, 40ms, 0ms);
+    pbf_move_right_joystick(context, {+0.709, +0.703}, 40ms, 0ms);
+    pbf_move_right_joystick(context, {0, +1}, 40ms, 0ms);
+    pbf_move_right_joystick(context, {-0.703, +0.703}, 40ms, 0ms);
+    pbf_move_right_joystick(context, {-1, 0}, 40ms, 0ms);
+    pbf_move_right_joystick(context, {-0.703, -0.709}, 40ms, 0ms);
+}
+
+
+void PoffinCooker::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    PoffinCooker_Descriptor::Stats& stats = env.current_stats<PoffinCooker_Descriptor::Stats>();
+    env.update_stats();
+
+    //  Connect the controller.
+    require_player(env.console, context, BUTTON_L);
+
+    env.log("Select the cooking option");
+    //  Select the cooking option.
+    pbf_press_button(context, BUTTON_A, 40ms, 800ms);
+    pbf_press_button(context, BUTTON_A, 40ms, 1400ms);
+    pbf_press_button(context, BUTTON_A, 40ms, 600ms);
+    pbf_press_button(context, BUTTON_A, 40ms, 800ms);
+
+
+    for (uint16_t c = 0; c < MAX_COOK_ATTEMPTS; c++){
+
+        env.log("Select the 4 berries to use");
+        // Select the first four berries to cook and confirm the selection.
+        pbf_press_button(context, BUTTON_A, 40ms, 400ms);
+        pbf_press_dpad(context, DPAD_DOWN, 40ms, 400ms);
+        pbf_press_button(context, BUTTON_A, 40ms, 400ms);
+        pbf_press_dpad(context, DPAD_DOWN, 40ms, 400ms);
+        pbf_press_button(context, BUTTON_A, 40ms, 400ms);
+        pbf_press_dpad(context, DPAD_DOWN, 40ms, 400ms);
+        pbf_press_button(context, BUTTON_A, 40ms, 400ms);
+        pbf_press_button(context, BUTTON_A, 40ms, 400ms);
+        pbf_mash_button(context, BUTTON_A, 1200ms); // Mash here to make sure the final button press isn't dropped
+
+        // Wait a bit less than 10 seconds for the cinematic to happen then cook.
+        pbf_wait(context, 8400ms);
+        context.wait_for_all_requests();
+
+        env.log("Stir slowly for the first part");
+        for (uint16_t d = 0; d < 79; d++){
+            // Capture the image on the screen
+            VideoSnapshot screen = env.console.video().snapshot();
+
+            // Get the stats of the screen's image
+            ImageStats IMGstats = image_stats(extract_box_reference(screen, box));
+            if (IMGstats.average.g > 170 && IMGstats.average.r < 125){ // Looking for the green arrow
+                turn = true;
+            }
+            if (IMGstats.average.b > 170 && IMGstats.average.r < 125){ // Looking for the blue arrow
+                turn = false;
+            }
+            if (turn){
+                TurnClockwiseSlow(context);
+            }else{
+                TurnCounterClockwiseSlow(context);
+            }
+        }
+
+        env.log("Stir at full speed now");
+        for (uint16_t d = 0; d < 70; d++){
+            // Capture the image on the screen
+            VideoSnapshot screen = env.console.video().snapshot();
+
+            // Get the stats of the screen's image
+            ImageStats IMGstats = image_stats(extract_box_reference(screen, box));
+            if (IMGstats.average.g > 170 && IMGstats.average.r < 125){ // Looking for the green arrow
+                turn = true;
+            }
+            if (IMGstats.average.b > 170 && IMGstats.average.r < 125){ // Looking for the blue arrow
+                turn = false;
+            }
+            if (turn){
+                TurnClockwiseFast(context);
+            }else{
+                TurnCounterClockwiseFast(context);
+            }
+        }
+
+        // Final animation when the cooking session is over
+        pbf_wait(context, 6000ms);
+
+        if (c < MAX_COOK_ATTEMPTS - 1){
+            env.log("Prepare for the next iteration");
+            pbf_press_button(context, BUTTON_A, 40ms, 1000ms);
+            pbf_press_button(context, BUTTON_A, 40ms, 1000ms);
+            pbf_press_button(context, BUTTON_A, 40ms, 1000ms);
+        }
+        stats.m_attempts++;
+    }
+
+    env.update_stats();
+    GO_HOME_WHEN_DONE.run_end_of_program(context);
+}
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_PoffinCooker.h b/SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_PoffinCooker.h
new file mode 100644
index 0000000000..25989de1d9
--- /dev/null
+++ b/SerialPrograms/Source/PokemonBDSP/Programs/Farming/PokemonBDSP_PoffinCooker.h
@@ -0,0 +1,46 @@
+/*  Poffin Cooker
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonBDSP_PoffinCooker_H
+#define PokemonAutomation_PokemonBDSP_PoffinCooker_H
+
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonBDSP{
+
+
+class PoffinCooker_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    PoffinCooker_Descriptor();
+
+    struct Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+
+class PoffinCooker : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = PoffinCooker_Descriptor;
+    PoffinCooker();
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
+    SimpleIntegerOption<uint16_t> MAX_COOK_ATTEMPTS;
+
+};
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/General/PokemonBDSP_AutonomousBallThrower.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/General/PokemonBDSP_AutonomousBallThrower.cpp
index af2952f141..a1453c7218 100644
--- a/SerialPrograms/Source/PokemonBDSP/Programs/General/PokemonBDSP_AutonomousBallThrower.cpp
+++ b/SerialPrograms/Source/PokemonBDSP/Programs/General/PokemonBDSP_AutonomousBallThrower.cpp
@@ -1,16 +1,14 @@
 /*  Autonomous Ball Thrower
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include "CommonFramework/Tools/StatsTracking.h"
-#include "CommonFramework/Tools/InterruptableCommands.h"
 #include "CommonFramework/Notifications/ProgramNotifications.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Device.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonTools/Async/InferenceRoutines.h"
 #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "NintendoSwitch/NintendoSwitch_Settings.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
 #include "Pokemon/Pokemon_Strings.h"
 #include "PokemonBDSP/Inference/Battles/PokemonBDSP_BattleMenuDetector.h"
 #include "PokemonBDSP/Programs/PokemonBDSP_BasicCatcher.h"
@@ -27,11 +25,12 @@ AutonomousBallThrower_Descriptor::AutonomousBallThrower_Descriptor()
     : SingleSwitchProgramDescriptor(
         "PokemonBDSPh:AutonomousBallThrower",
         STRING_POKEMON + " BDSP", "Autonomous Ball Thrower",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonBDSP/AutonomousBallThrower.md",
+        "Programs/PokemonBDSP/AutonomousBallThrower.html",
         "Repeatedly throw a ball and reset until you catch the pokemon.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
         FeedbackType::REQUIRED,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
     )
 {}
 struct AutonomousBallThrower_Descriptor::Stats : public StatsTracker{
@@ -68,7 +67,7 @@ AutonomousBallThrower::AutonomousBallThrower()
     : GO_HOME_WHEN_DONE(false)
     , BALL_SELECT(
         "<b>Ball Select:</b>",
-        LockWhileRunning::LOCKED,
+        LockMode::LOCK_WHILE_RUNNING,
         "master-ball"
     )
     , LANGUAGE(
@@ -84,7 +83,7 @@ AutonomousBallThrower::AutonomousBallThrower()
             Language::ChineseSimplified,
             Language::ChineseTraditional,
         },
-        LockWhileRunning::LOCKED,
+        LockMode::LOCK_WHILE_RUNNING,
         true
     )
     , NOTIFICATION_CATCH_SUCCESS("Catch Success", true, false, std::chrono::seconds(3600))
@@ -105,12 +104,12 @@ AutonomousBallThrower::AutonomousBallThrower()
 
 
 
-void AutonomousBallThrower::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
+void AutonomousBallThrower::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
     AutonomousBallThrower_Descriptor::Stats& stats = env.current_stats<AutonomousBallThrower_Descriptor::Stats>();
     env.update_stats();
 
     //  Connect the controller.
-    pbf_press_button(context, BUTTON_LCLICK, 5, 5);
+    require_player(env.console, context, BUTTON_LCLICK);
 
     bool pokemon_caught = false;
     while (!pokemon_caught){
@@ -118,25 +117,25 @@ void AutonomousBallThrower::program(SingleSwitchProgramEnvironment& env, BotBase
         env.log("Wait for a pokemon to attack you.", COLOR_PURPLE);
         {
             BattleMenuWatcher fight_detector(BattleType::STANDARD);
-            int result = run_until(
+            int ret = run_until<ProControllerContext>(
                 env.console, context,
-                [](BotBaseContext& context){
+                [](ProControllerContext& context){
                     while (true){
                         //TODO edit here for what to do
-                        //pbf_wait(context, 1 * TICKS_PER_SECOND);
-                        pbf_press_button(context, BUTTON_A, 5, TICKS_PER_SECOND);
-                        pbf_press_dpad(context, DPAD_UP, 5, TICKS_PER_SECOND);
+                        //pbf_wait(context, 1000ms);
+                        pbf_press_button(context, BUTTON_A, 80ms, 1000ms);
+                        pbf_press_dpad(context, DPAD_UP, 80ms, 1000ms);
                     }
                 },
                 {{fight_detector}}
             );
-            if (result == 0){
+            if (ret == 0){
                 env.log("New fight detected.", COLOR_PURPLE);
-                pbf_mash_button(context, BUTTON_B, 1 * TICKS_PER_SECOND);
+                pbf_mash_button(context, BUTTON_B, 1000ms);
             }
         }
 
-        CatchResults result = basic_catcher(env.console, context, LANGUAGE, BALL_SELECT.slug());
+        CatchResults result = basic_catcher(env.console, context, LANGUAGE, BALL_SELECT.slug(), 999);
         switch (result.result){
         case CatchResult::POKEMON_CAUGHT:
             pokemon_caught = true;
@@ -151,6 +150,7 @@ void AutonomousBallThrower::program(SingleSwitchProgramEnvironment& env, BotBase
         case CatchResult::OUT_OF_BALLS:
             stats.out_of_balls++;
             break;
+        case CatchResult::BALL_LIMIT_REACHED:
         case CatchResult::CANNOT_THROW_BALL:
         case CatchResult::TIMED_OUT:
             stats.errors++;
@@ -172,7 +172,7 @@ void AutonomousBallThrower::program(SingleSwitchProgramEnvironment& env, BotBase
         }
 
         if (!pokemon_caught){
-            pbf_press_button(context, BUTTON_HOME, 20, GameSettings::instance().GAME_TO_HOME_DELAY);
+            pbf_press_button(context, BUTTON_HOME, 160ms, GameSettings::instance().GAME_TO_HOME_DELAY0);
             reset_game_from_home(env, env.console, context, true);
         }
     }
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/General/PokemonBDSP_AutonomousBallThrower.h b/SerialPrograms/Source/PokemonBDSP/Programs/General/PokemonBDSP_AutonomousBallThrower.h
index 832f0c51e9..a54caefc4d 100644
--- a/SerialPrograms/Source/PokemonBDSP/Programs/General/PokemonBDSP_AutonomousBallThrower.h
+++ b/SerialPrograms/Source/PokemonBDSP/Programs/General/PokemonBDSP_AutonomousBallThrower.h
@@ -1,18 +1,17 @@
 /*  Autonomous Ball Thrower
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifndef PokemonAutomation_PokemonBDSP_AutonomousBallThrower_H
 #define PokemonAutomation_PokemonBDSP_AutonomousBallThrower_H
 
-#include "CommonFramework/Options/LanguageOCROption.h"
 #include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "CommonTools/Options/LanguageOCROption.h"
 #include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
 #include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
-#include "NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h"
-#include "PokemonSwSh/Options/PokemonSwSh_BallSelectOption.h"
+#include "VideoGames/PokemonSwSh/Options/PokemonSwSh_BallSelectOption.h"
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
@@ -31,8 +30,9 @@ class AutonomousBallThrower_Descriptor : public SingleSwitchProgramDescriptor{
 
 class AutonomousBallThrower : public SingleSwitchProgramInstance{
 public:
+    using Descriptor = AutonomousBallThrower_Descriptor;
     AutonomousBallThrower();
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
 
 private:
 
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/General/PokemonBDSP_MassRelease.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/General/PokemonBDSP_MassRelease.cpp
index a70805d08b..8a4cd2c167 100644
--- a/SerialPrograms/Source/PokemonBDSP/Programs/General/PokemonBDSP_MassRelease.cpp
+++ b/SerialPrograms/Source/PokemonBDSP/Programs/General/PokemonBDSP_MassRelease.cpp
@@ -1,12 +1,13 @@
 /*  Mass Release
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include "CommonFramework/Tools/StatsTracking.h"
 #include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
 #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
 #include "Pokemon/Pokemon_Strings.h"
 #include "PokemonBDSP/PokemonBDSP_Settings.h"
 #include "PokemonBDSP/Programs/PokemonBDSP_BoxRelease.h"
@@ -22,11 +23,12 @@ MassRelease_Descriptor::MassRelease_Descriptor()
     : SingleSwitchProgramDescriptor(
         "PokemonBDSP:MassRelease",
         STRING_POKEMON + " BDSP", "Mass Release",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonBDSP/MassRelease.md",
+        "Programs/PokemonBDSP/MassRelease.html",
         "Mass release boxes of " + STRING_POKEMON + ".",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
         FeedbackType::NONE,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
     )
 {}
 struct MassRelease_Descriptor::Stats : public StatsTracker{
@@ -47,7 +49,7 @@ MassRelease::MassRelease()
     : GO_HOME_WHEN_DONE(false)
     , BOXES_TO_RELEASE(
         "<b>Number of Boxes to Release:</b>",
-        LockWhileRunning::LOCKED,
+        LockMode::LOCK_WHILE_RUNNING,
         2, 0, 40
     )
     , NOTIFICATIONS({
@@ -66,15 +68,15 @@ MassRelease::MassRelease()
 
 
 
-void MassRelease::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
+void MassRelease::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
     MassRelease_Descriptor::Stats& stats = env.current_stats<MassRelease_Descriptor::Stats>();
     env.update_stats();
 
     //  Connect the controller.
-    pbf_press_button(context, BUTTON_LCLICK, 5, 5);
+    require_player(env.console, context, BUTTON_LCLICK);
 
-    uint16_t box_scroll_delay = GameSettings::instance().BOX_SCROLL_DELAY_0;
-    uint16_t box_change_delay = GameSettings::instance().BOX_CHANGE_DELAY_0;
+    Milliseconds box_scroll_delay = GameSettings::instance().BOX_SCROLL_DELAY0;
+    Milliseconds box_change_delay = GameSettings::instance().BOX_CHANGE_DELAY0;
 
     if (BOXES_TO_RELEASE > 0){
         env.update_stats();
@@ -82,13 +84,13 @@ void MassRelease::program(SingleSwitchProgramEnvironment& env, BotBaseContext& c
         stats.m_boxes_released++;
         for (uint8_t box = 1; box < BOXES_TO_RELEASE; box++){
             env.update_stats();
-            pbf_press_dpad(context, DPAD_DOWN, 20, box_scroll_delay);
-            pbf_press_dpad(context, DPAD_DOWN, 20, box_scroll_delay);
-            pbf_press_dpad(context, DPAD_DOWN, 20, box_scroll_delay);
-            pbf_press_dpad(context, DPAD_RIGHT, 20, box_scroll_delay);
-            pbf_press_dpad(context, DPAD_RIGHT, 20, box_scroll_delay);
-            pbf_wait(context, 50);
-            pbf_press_button(context, BUTTON_R, 20, box_change_delay);
+            pbf_press_dpad(context, DPAD_DOWN, 160ms, box_scroll_delay);
+            pbf_press_dpad(context, DPAD_DOWN, 160ms, box_scroll_delay);
+            pbf_press_dpad(context, DPAD_DOWN, 160ms, box_scroll_delay);
+            pbf_press_dpad(context, DPAD_RIGHT, 160ms, box_scroll_delay);
+            pbf_press_dpad(context, DPAD_RIGHT, 160ms, box_scroll_delay);
+            pbf_wait(context, 400ms);
+            pbf_press_button(context, BUTTON_R, 160ms, box_change_delay);
             release_box(context, box_scroll_delay);
             stats.m_boxes_released++;
         }
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/General/PokemonBDSP_MassRelease.h b/SerialPrograms/Source/PokemonBDSP/Programs/General/PokemonBDSP_MassRelease.h
index 0875979cb3..6a9d4de3e2 100644
--- a/SerialPrograms/Source/PokemonBDSP/Programs/General/PokemonBDSP_MassRelease.h
+++ b/SerialPrograms/Source/PokemonBDSP/Programs/General/PokemonBDSP_MassRelease.h
@@ -1,6 +1,6 @@
 /*  Mass Release
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -28,8 +28,9 @@ class MassRelease_Descriptor : public SingleSwitchProgramDescriptor{
 
 class MassRelease : public SingleSwitchProgramInstance{
 public:
+    using Descriptor = MassRelease_Descriptor;
     MassRelease();
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
 
 private:
     GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/Glitches/PokemonBDSP_ActivateMenuGlitch-1.1.2.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/Glitches/PokemonBDSP_ActivateMenuGlitch-1.1.2.cpp
index e61c64be15..4cf218d12a 100644
--- a/SerialPrograms/Source/PokemonBDSP/Programs/Glitches/PokemonBDSP_ActivateMenuGlitch-1.1.2.cpp
+++ b/SerialPrograms/Source/PokemonBDSP/Programs/Glitches/PokemonBDSP_ActivateMenuGlitch-1.1.2.cpp
@@ -1,14 +1,14 @@
 /*  Activate Menu Glitch (1.1.2)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include "CommonFramework/Exceptions/OperationFailedException.h"
-#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
 #include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
-#include "CommonFramework/Inference/BlackScreenDetector.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "CommonTools/VisualDetectors/BlackScreenDetector.h"
+#include "CommonTools/StartupChecks/StartProgramChecks.h"
 #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
 #include "Pokemon/Pokemon_Strings.h"
 #include "PokemonBDSP/PokemonBDSP_Settings.h"
@@ -19,161 +19,164 @@
 namespace PokemonAutomation{
 namespace NintendoSwitch{
 namespace PokemonBDSP{
-    using namespace Pokemon;
+
+using namespace Pokemon;
 
 
 ActivateMenuGlitch112_Descriptor::ActivateMenuGlitch112_Descriptor()
     : SingleSwitchProgramDescriptor(
         "PokemonBDSP:ActivateMenuGlitch112",
         STRING_POKEMON + " BDSP", "Activate Menu Glitch (1.1.2)",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonBDSP/ActivateMenuGlitch-Poketch.md",
+        "Programs/PokemonBDSP/ActivateMenuGlitch-Poketch.html",
         "Activate the menu glitch using the Pok\u00e9tch. "
         "<font color=\"red\">(This requires game versions 1.1.0 - 1.1.2. The glitch it relies on was patched in v1.1.3.)</font>",
+        PanelQualityStanding::UNMAINTAINED,
+        ProgramControllerClass::StandardController_RequiresPrecision,
         FeedbackType::REQUIRED,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
     )
 {}
 
 ActivateMenuGlitch112::ActivateMenuGlitch112()
-    : FLY_A_TO_X_DELAY(
+    : FLY_A_TO_X_DELAY0(
         "<b>Fly Menu A-to-X Delay:</b><br>The delay between the A and X presses to overlap the menu with the fly option.<br>"
         "(German players may need to increase this to 90.)",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        20, "50"
+        LockMode::LOCK_WHILE_RUNNING,
+        160ms, "400 ms"
     )
 {
-    PA_ADD_OPTION(FLY_A_TO_X_DELAY);
+    PA_ADD_OPTION(FLY_A_TO_X_DELAY0);
 }
 
 
 
-void trigger_menu(ConsoleHandle& console, BotBaseContext& context){
+void trigger_menu(VideoStream& stream, ProControllerContext& context){
     context.wait_for_all_requests();
     MapWatcher detector;
-    int ret = run_until(
-        console, context,
-        [](BotBaseContext& context){
+    int ret = run_until<ProControllerContext>(
+        stream, context,
+        [](ProControllerContext& context){
             for (size_t i = 0; i < 12; i++){
                 for (size_t c = 0; c < 42; c++){
-                    pbf_controller_state(context, BUTTON_ZL, DPAD_NONE, 128, 128, 128, 128, 1);
-                    pbf_controller_state(context, BUTTON_R | BUTTON_ZL, DPAD_NONE, 128, 128, 128, 128, 5);
-                    pbf_wait(context, 3);
+                    pbf_controller_state(context, BUTTON_ZL, DPAD_NONE, {0, 0}, {0, 0}, 8ms);
+                    pbf_controller_state(context, BUTTON_R | BUTTON_ZL, DPAD_NONE, {0, 0}, {0, 0}, 40ms);
+                    pbf_wait(context, 24ms);
                 }
-                pbf_wait(context, 125);
-                pbf_press_button(context, BUTTON_R, 20, 105);
+                pbf_wait(context, 1000ms);
+                pbf_press_button(context, BUTTON_R, 160ms, 840ms);
             }
         },
         {{detector}}
     );
     if (ret < 0){
-        throw OperationFailedException(
-            ErrorReport::SEND_ERROR_REPORT, console,
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
             "Map not detected after 60 seconds.",
-            true
+            stream
         );
     }
-    console.log("Detected map!", COLOR_BLUE);
+    stream.log("Detected map!", COLOR_BLUE);
 
     context.wait_for(std::chrono::milliseconds(500));
     ShortDialogDetector dialog;
-    while (dialog.detect(console.video().snapshot())){
-        console.log("Overshot mashing. Backing out.", COLOR_ORANGE);
-        pbf_press_button(context, BUTTON_B, 20, 105);
+    while (dialog.detect(stream.video().snapshot())){
+        stream.log("Overshot mashing. Backing out.", COLOR_ORANGE);
+        pbf_press_button(context, BUTTON_B, 160ms, 840ms);
         context.wait_for_all_requests();
     }
 }
-void trigger_map_overlap(ConsoleHandle& console, BotBaseContext& context){
+void trigger_map_overlap(VideoStream& stream, ProControllerContext& context){
     for (size_t c = 0; c < 10; c++){
-        trigger_menu(console, context);
+        trigger_menu(stream, context);
 
-        pbf_press_dpad(context, DPAD_UP, 50, 0);
+        pbf_press_dpad(context, DPAD_UP, 400ms, 0ms);
         context.wait_for_all_requests();
         BlackScreenWatcher detector;
         int ret = wait_until(
-            console, context, std::chrono::seconds(4),
+            stream, context, std::chrono::seconds(4),
             {{detector}}
         );
         if (ret >= 0){
-            console.log("Overlap detected! Entered " + STRING_POKEMON + " center.", COLOR_BLUE);
+            stream.log("Overlap detected! Entered " + STRING_POKEMON + " center.", COLOR_BLUE);
             return;
         }
-        console.log("Failed to activate map overlap.", COLOR_ORANGE);
-        pbf_mash_button(context, BUTTON_B, 3 * TICKS_PER_SECOND);
-        pbf_press_button(context, BUTTON_R, 20, 230);
+        stream.log("Failed to activate map overlap.", COLOR_ORANGE);
+        pbf_mash_button(context, BUTTON_B, 3000ms);
+        pbf_press_button(context, BUTTON_R, 160ms, 1840ms);
     }
-    throw OperationFailedException(
-        ErrorReport::SEND_ERROR_REPORT, console,
+    OperationFailedExceptionWithScreenshot::fire(
+        ErrorReportMode::SEND_ERROR_REPORT,
         "Failed to trigger map overlap after 10 attempts.",
-        true
+        stream
     );
 }
 
 
 
-void ActivateMenuGlitch112::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    ConsoleHandle& console = env.console;
+void ActivateMenuGlitch112::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    StartProgramChecks::check_performance_class_wired_or_wireless(context);
+
+    VideoStream& stream = env.console;
 
-    trigger_map_overlap(console, context);
-    pbf_wait(context, 3 * TICKS_PER_SECOND);
+    trigger_map_overlap(stream, context);
+    pbf_wait(context, 3000ms);
 
     //  Move to escalator.
-    pbf_press_dpad(context, DPAD_UP, 20, 125);
-    pbf_press_dpad(context, DPAD_UP, 20, 125);
-    pbf_move_left_joystick(context, 255, 128, 250, 5 * TICKS_PER_SECOND);
+    pbf_press_dpad(context, DPAD_UP, 160ms, 1000ms);
+    pbf_press_dpad(context, DPAD_UP, 160ms, 1000ms);
+    pbf_move_left_joystick(context, {+1, 0}, 2000ms, 5000ms);
 
     //  Re-enter escalator.
-    pbf_press_dpad(context, DPAD_RIGHT, 125, 6 * TICKS_PER_SECOND);
+    pbf_press_dpad(context, DPAD_RIGHT, 1000ms, 6000ms);
 
     //  Leave Pokemon center.
-    pbf_press_dpad(context, DPAD_LEFT, 20, 105);
-    pbf_press_dpad(context, DPAD_LEFT, 20, 105);
-    pbf_press_dpad(context, DPAD_LEFT, 20, 105);
+    pbf_press_dpad(context, DPAD_LEFT, 160ms, 840ms);
+    pbf_press_dpad(context, DPAD_LEFT, 160ms, 840ms);
+    pbf_press_dpad(context, DPAD_LEFT, 160ms, 840ms);
     {
         context.wait_for_all_requests();
         BlackScreenWatcher detector;
-        int ret = run_until(
-            console, context,
-            [](BotBaseContext& context){
+        int ret = run_until<ProControllerContext>(
+            stream, context,
+            [](ProControllerContext& context){
                 for (size_t c = 0; c < 5; c++){
-                    pbf_press_dpad(context, DPAD_LEFT, 20, 105);
-                    pbf_press_dpad(context, DPAD_DOWN, 20, 105);
+                    pbf_press_dpad(context, DPAD_LEFT, 160ms, 840ms);
+                    pbf_press_dpad(context, DPAD_DOWN, 160ms, 840ms);
                 }
             },
             {{detector}}
         );
         if (ret < 0){
-            throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, console,
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
                 "Unable to leave " + STRING_POKEMON + " center.",
-                true
+                stream
             );
         }
-        console.log("Leaving " + STRING_POKEMON + " center detected!", COLOR_BLUE);
+        stream.log("Leaving " + STRING_POKEMON + " center detected!", COLOR_BLUE);
     }
-    pbf_move_left_joystick(context, 128, 255, 125, 4 * TICKS_PER_SECOND);
+    pbf_move_left_joystick(context, {0, -1}, 1000ms, 4000ms);
 
     //  Center cursor.
-    pbf_press_button(context, BUTTON_X, 20, GameSettings::instance().OVERWORLD_TO_MENU_DELAY);
-    pbf_press_button(context, BUTTON_X, 20, GameSettings::instance().MENU_TO_OVERWORLD_DELAY);
+    pbf_press_button(context, BUTTON_X, 160ms, GameSettings::instance().OVERWORLD_TO_MENU_DELAY0);
+    pbf_press_button(context, BUTTON_X, 160ms, GameSettings::instance().MENU_TO_OVERWORLD_DELAY0);
 
     //  Bring up menu
-    pbf_press_button(context, BUTTON_ZL, 20, FLY_A_TO_X_DELAY - 20);
-    pbf_press_button(context, BUTTON_X, 20, GameSettings::instance().OVERWORLD_TO_MENU_DELAY);
+    pbf_press_button(context, BUTTON_ZL, 160ms, FLY_A_TO_X_DELAY0.get() - 160ms);
+    pbf_press_button(context, BUTTON_X, 160ms, GameSettings::instance().OVERWORLD_TO_MENU_DELAY0);
 
     //  Fly
-    pbf_press_button(context, BUTTON_ZL, 20, 10 * TICKS_PER_SECOND);
+    pbf_press_button(context, BUTTON_ZL, 160ms, 10000ms);
 
     //  Enter Pokemon center.
-    pbf_press_dpad(context, DPAD_UP, 50, 5 * TICKS_PER_SECOND);
-    pbf_move_left_joystick(context, 255, 128, 125, 0);
-    pbf_move_left_joystick(context, 128, 255, 125, 125);
+    pbf_press_dpad(context, DPAD_UP, 400ms, 5000ms);
+    pbf_move_left_joystick(context, {+1, 0}, 1000ms, 0ms);
+    pbf_move_left_joystick(context, {0, -1}, 1000ms, 1000ms);
 
     //  Move cursor back to default location for "Pokemon".
-    pbf_move_right_joystick(context, 128, 0, 20, 20);
-    pbf_move_right_joystick(context, 0, 128, 20, 20);
-    pbf_move_right_joystick(context, 0, 128, 20, 20);
+    pbf_move_right_joystick(context, {0, +1}, 160ms, 160ms);
+    pbf_move_right_joystick(context, {-1, 0}, 160ms, 160ms);
+    pbf_move_right_joystick(context, {-1, 0}, 160ms, 160ms);
 }
 
 
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/Glitches/PokemonBDSP_ActivateMenuGlitch-1.1.2.h b/SerialPrograms/Source/PokemonBDSP/Programs/Glitches/PokemonBDSP_ActivateMenuGlitch-1.1.2.h
index b3467cdb2a..024d450340 100644
--- a/SerialPrograms/Source/PokemonBDSP/Programs/Glitches/PokemonBDSP_ActivateMenuGlitch-1.1.2.h
+++ b/SerialPrograms/Source/PokemonBDSP/Programs/Glitches/PokemonBDSP_ActivateMenuGlitch-1.1.2.h
@@ -1,13 +1,13 @@
 /*  Activate Menu Glitch (Poketch)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifndef PokemonAutomation_PokemonBDSP_ActivateMenuGlitchPoketch_H
 #define PokemonAutomation_PokemonBDSP_ActivateMenuGlitchPoketch_H
 
-#include "Common/Cpp/Options/TimeExpressionOption.h"
+#include "Common/Cpp/Options/TimeDurationOption.h"
 #include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
 
 namespace PokemonAutomation{
@@ -24,12 +24,13 @@ class ActivateMenuGlitch112_Descriptor : public SingleSwitchProgramDescriptor{
 
 class ActivateMenuGlitch112 : public SingleSwitchProgramInstance{
 public:
+    using Descriptor = ActivateMenuGlitch112_Descriptor;
     ActivateMenuGlitch112();
 
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
 
 private:
-    TimeExpressionOption<uint16_t> FLY_A_TO_X_DELAY;
+    MillisecondsOption FLY_A_TO_X_DELAY0;
 };
 
 
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/Glitches/PokemonBDSP_ActivateMenuGlitch-1.1.3.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/Glitches/PokemonBDSP_ActivateMenuGlitch-1.1.3.cpp
index e6c39f088b..16c528f3f3 100644
--- a/SerialPrograms/Source/PokemonBDSP/Programs/Glitches/PokemonBDSP_ActivateMenuGlitch-1.1.3.cpp
+++ b/SerialPrograms/Source/PokemonBDSP/Programs/Glitches/PokemonBDSP_ActivateMenuGlitch-1.1.3.cpp
@@ -1,13 +1,14 @@
 /*  Activate Menu Glitch (1.1.3)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include <QtGlobal>
-#include "CommonFramework/Exceptions/OperationFailedException.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "CommonTools/StartupChecks/StartProgramChecks.h"
 #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
 #include "Pokemon/Pokemon_Strings.h"
 #include "PokemonBDSP/PokemonBDSP_Settings.h"
 #include "PokemonBDSP/Inference/PokemonBDSP_MapDetector.h"
@@ -16,74 +17,81 @@
 namespace PokemonAutomation{
 namespace NintendoSwitch{
 namespace PokemonBDSP{
-    using namespace Pokemon;
+
+using namespace Pokemon;
+
 
 
 ActivateMenuGlitch113_Descriptor::ActivateMenuGlitch113_Descriptor()
     : SingleSwitchProgramDescriptor(
         "PokemonBDSP:ActivateMenuGlitch113",
         STRING_POKEMON + " BDSP", "Activate Menu Glitch (1.1.3)",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonBDSP/ActivateMenuGlitch-113.md",
+        "Programs/PokemonBDSP/ActivateMenuGlitch-113.html",
         "Activate the menu glitch using the strength/fly method. "
         "<font color=\"red\">(This works on game versions 1.1.1 - 1.1.3. It has been patched out in later versions.)</font>",
+        PanelQualityStanding::UNMAINTAINED,
+        ProgramControllerClass::StandardController_RequiresPrecision,
         FeedbackType::OPTIONAL_,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
     )
 {}
 
 ActivateMenuGlitch113::ActivateMenuGlitch113()
-    : FLY_A_TO_X_DELAY(
+    : FLY_A_TO_X_DELAY0(
         "<b>Fly Menu A-to-X Delay:</b><br>The delay between the A and X presses to overlap the menu with the fly option.<br>"
         "(German players may need to increase this to 90.)",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        20, "50"
+        LockMode::LOCK_WHILE_RUNNING,
+        160ms, "400 ms"
     )
 {
-    PA_ADD_OPTION(FLY_A_TO_X_DELAY);
+    PA_ADD_OPTION(FLY_A_TO_X_DELAY0);
 }
 
 
 
-void ActivateMenuGlitch113::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    ConsoleHandle& console = env.console;
+void ActivateMenuGlitch113::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    StartProgramChecks::check_performance_class_wired_or_wireless(context);
+
+    VideoStream& stream = env.console;
+
+    //  Connect the controller.
+    require_player(env.console, context, BUTTON_ZL);
 
     //  Enable Strength
-    pbf_mash_button(context, BUTTON_ZL, 2 * TICKS_PER_SECOND);
-    pbf_mash_button(context, BUTTON_B, 5 * TICKS_PER_SECOND);
+    pbf_mash_button(context, BUTTON_ZL, 2000ms);
+    pbf_mash_button(context, BUTTON_B, 5000ms);
 
 
-    pbf_press_button(context, BUTTON_R, 5, 0);
-    pbf_press_dpad(context, DPAD_RIGHT, 10, 115);
-    pbf_press_button(context, BUTTON_ZL, 10, 0);
+    pbf_press_button(context, BUTTON_R, 40ms, 0ms);
+    pbf_press_dpad(context, DPAD_RIGHT, 80ms, 920ms);
+    pbf_press_button(context, BUTTON_ZL, 80ms, 0ms);
     context.wait_for_all_requests();
     MapWatcher detector;
     int ret = wait_until(
-        console, context, std::chrono::seconds(2),
+        stream, context, std::chrono::seconds(2),
         {{detector}}
     );
     if (ret < 0){
-        throw OperationFailedException(
-            ErrorReport::SEND_ERROR_REPORT, console,
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
             "Map not detected after 2 seconds.",
-            true
+            stream
         );
     }else{
-        console.log("Detected map!", COLOR_BLUE);
+        stream.log("Detected map!", COLOR_BLUE);
     }
 
     context.wait_for(std::chrono::seconds(1));
 
     //  Move bolder and cursor to Celestial town.
-    pbf_press_dpad(context, DPAD_RIGHT, 30, 95);
+    pbf_press_dpad(context, DPAD_RIGHT, 240ms, 760ms);
 
     //  Bring up menu
-    pbf_press_button(context, BUTTON_ZL, 20, FLY_A_TO_X_DELAY - 20);
-    pbf_press_button(context, BUTTON_X, 20, GameSettings::instance().OVERWORLD_TO_MENU_DELAY);
+    pbf_press_button(context, BUTTON_ZL, 160ms, FLY_A_TO_X_DELAY0.get() - 160ms);
+    pbf_press_button(context, BUTTON_X, 160ms, GameSettings::instance().OVERWORLD_TO_MENU_DELAY0);
 
     //  Fly
-    pbf_press_button(context, BUTTON_ZL, 20, 10 * TICKS_PER_SECOND);
+    pbf_press_button(context, BUTTON_ZL, 160ms, 10000ms);
 }
 
 
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/Glitches/PokemonBDSP_ActivateMenuGlitch-1.1.3.h b/SerialPrograms/Source/PokemonBDSP/Programs/Glitches/PokemonBDSP_ActivateMenuGlitch-1.1.3.h
index 757de2d8db..bd9f452cc1 100644
--- a/SerialPrograms/Source/PokemonBDSP/Programs/Glitches/PokemonBDSP_ActivateMenuGlitch-1.1.3.h
+++ b/SerialPrograms/Source/PokemonBDSP/Programs/Glitches/PokemonBDSP_ActivateMenuGlitch-1.1.3.h
@@ -1,13 +1,13 @@
 /*  Activate Menu Glitch (1.1.3)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifndef PokemonAutomation_PokemonBDSP_ActivateMenuGlitch113_H
 #define PokemonAutomation_PokemonBDSP_ActivateMenuGlitch113_H
 
-#include "Common/Cpp/Options/TimeExpressionOption.h"
+#include "Common/Cpp/Options/TimeDurationOption.h"
 #include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
 
 namespace PokemonAutomation{
@@ -24,12 +24,13 @@ class ActivateMenuGlitch113_Descriptor : public SingleSwitchProgramDescriptor{
 
 class ActivateMenuGlitch113 : public SingleSwitchProgramInstance{
 public:
+    using Descriptor = ActivateMenuGlitch113_Descriptor;
     ActivateMenuGlitch113();
 
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
 
 private:
-    TimeExpressionOption<uint16_t> FLY_A_TO_X_DELAY;
+    MillisecondsOption FLY_A_TO_X_DELAY0;
 };
 
 
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/Glitches/PokemonBDSP_CloneItemsBoxCopy2.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/Glitches/PokemonBDSP_CloneItemsBoxCopy2.cpp
index 7ec2ee8c6c..8255fa645b 100644
--- a/SerialPrograms/Source/PokemonBDSP/Programs/Glitches/PokemonBDSP_CloneItemsBoxCopy2.cpp
+++ b/SerialPrograms/Source/PokemonBDSP/Programs/Glitches/PokemonBDSP_CloneItemsBoxCopy2.cpp
@@ -1,16 +1,17 @@
 /*  Clone Items (Box Swap Method 2)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include "CommonFramework/Exceptions/OperationFailedException.h"
-#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
 #include "CommonFramework/VideoPipeline/VideoFeed.h"
 #include "CommonFramework/Notifications/ProgramNotifications.h"
-#include "CommonFramework/Inference/ImageMatchDetector.h"
-#include "CommonFramework/Tools/StatsTracking.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonTools/VisualDetectors/ImageMatchDetector.h"
+#include "CommonTools/StartupChecks/StartProgramChecks.h"
 #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
 #include "Pokemon/Pokemon_Strings.h"
 #include "PokemonBDSP/PokemonBDSP_Settings.h"
 #include "PokemonBDSP/Programs/PokemonBDSP_BoxRelease.h"
@@ -27,12 +28,13 @@ CloneItemsBoxCopy2_Descriptor::CloneItemsBoxCopy2_Descriptor()
     : SingleSwitchProgramDescriptor(
         "PokemonBDSP:CloneItemsBoxCopy2",
         STRING_POKEMON + " BDSP", "Clone Items (Box Copy 2)",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonBDSP/CloneItemsBoxCopy2.md",
+        "Programs/PokemonBDSP/CloneItemsBoxCopy2.html",
         "With the menu glitch active, clone entire boxes of items at a time. "
         "<font color=\"red\">(The menu glitch can only be activated on version 1.1.0 - 1.1.3.)</font>",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_RequiresPrecision,
         FeedbackType::REQUIRED,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
     )
 {}
 struct CloneItemsBoxCopy2_Descriptor::Stats : public StatsTracker{
@@ -42,7 +44,7 @@ struct CloneItemsBoxCopy2_Descriptor::Stats : public StatsTracker{
 //        , m_resets(m_stats["Resets"])
     {
         m_display_order.emplace_back("Boxes Cloned");
-        m_display_order.emplace_back("Errors", true);
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
 //        m_display_order.emplace_back("Resets");
     }
     std::atomic<uint64_t>& m_boxes;
@@ -58,13 +60,13 @@ CloneItemsBoxCopy2::CloneItemsBoxCopy2()
     : GO_HOME_WHEN_DONE(false)
     , BOXES(
         "<b>Boxes to Clone:</b>",
-        LockWhileRunning::LOCKED,
+        LockMode::LOCK_WHILE_RUNNING,
         999, 0, 999
     )
     , RELEASE(
         "<b>Release the pokemon after cloning them:</b>"
         "Beware, if set to false, the pokemons will be stored in the subsequent boxes. Make sure you have enough empty boxes.",
-        LockWhileRunning::LOCKED,
+        LockMode::LOCK_WHILE_RUNNING,
         true
     )
     , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
@@ -82,21 +84,23 @@ CloneItemsBoxCopy2::CloneItemsBoxCopy2()
 
 
 
-void CloneItemsBoxCopy2::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
+void CloneItemsBoxCopy2::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    StartProgramChecks::check_performance_class_wired_or_wireless(context);
+
     CloneItemsBoxCopy2_Descriptor::Stats& stats = env.current_stats<CloneItemsBoxCopy2_Descriptor::Stats>();
 
 //    uint16_t MENU_TO_POKEMON_DELAY = GameSettings::instance().MENU_TO_POKEMON_DELAY;
 //    uint16_t POKEMON_TO_BOX_DELAY = GameSettings::instance().POKEMON_TO_BOX_DELAY0;
 //    uint16_t OVERWORLD_TO_MENU_DELAY = GameSettings::instance().OVERWORLD_TO_MENU_DELAY;
 //    uint16_t MENU_TO_OVERWORLD_DELAY = GameSettings::instance().MENU_TO_OVERWORLD_DELAY;
-    uint16_t BOX_PICKUP_DROP_DELAY = GameSettings::instance().BOX_PICKUP_DROP_DELAY;
-    uint16_t BOX_SCROLL_DELAY = GameSettings::instance().BOX_SCROLL_DELAY_0;
-    uint16_t BOX_CHANGE_DELAY = GameSettings::instance().BOX_CHANGE_DELAY_0;
+    Milliseconds BOX_PICKUP_DROP_DELAY = GameSettings::instance().BOX_PICKUP_DROP_DELAY0;
+    Milliseconds BOX_SCROLL_DELAY = GameSettings::instance().BOX_SCROLL_DELAY0;
+    Milliseconds BOX_CHANGE_DELAY = GameSettings::instance().BOX_CHANGE_DELAY0;
 //    uint16_t BOX_TO_POKEMON_DELAY = GameSettings::instance().BOX_TO_POKEMON_DELAY;
 //    uint16_t POKEMON_TO_MENU_DELAY = GameSettings::instance().POKEMON_TO_MENU_DELAY;
 
     //  Connect the controller.
-    pbf_mash_button(context, BUTTON_RCLICK, 50);
+    require_player(env.console, context, BUTTON_RCLICK);
 
     //  Enter box system.
     menu_to_box(context);
@@ -110,64 +114,64 @@ void CloneItemsBoxCopy2::program(SingleSwitchProgramEnvironment& env, BotBaseCon
         send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
 
         //  Select 1st mon.
-        pbf_press_button(context, BUTTON_ZL, 20, 50);
+        pbf_press_button(context, BUTTON_ZL, 160ms, 400ms);
 
         //  Enter box system again.
         overworld_to_box(context);
 
 #if 0
         //  Detach all items.
-        pbf_press_button(context, BUTTON_X, 20, 50);
+        pbf_press_button(context, BUTTON_X, 160ms, 400ms);
         detach_box(context, BOX_SCROLL_DELAY);
 
         //  Back to previous menu.
         box_to_overworld(context);
 
         //  View Summary
-        pbf_move_right_joystick(context, 128, 255, 20, 10);
-        pbf_press_button(context, BUTTON_ZL, 20, 250);
+        pbf_move_right_joystick(context, {0, -1}, 160ms, 80ms);
+        pbf_press_button(context, BUTTON_ZL, 160ms, 2000ms);
 
         //  Back out.
-        pbf_press_button(context, BUTTON_B, 20, 230);
+        pbf_press_button(context, BUTTON_B, 160ms, 1840ms);
 
 #else
         //  Move entire box to a new box.
-        pbf_press_button(context, BUTTON_Y, 20, 50);
-        pbf_press_button(context, BUTTON_Y, 20, 50);
-        pbf_press_button(context, BUTTON_ZL, 20, BOX_PICKUP_DROP_DELAY);
+        pbf_press_button(context, BUTTON_Y, 160ms, 400ms);
+        pbf_press_button(context, BUTTON_Y, 160ms, 400ms);
+        pbf_press_button(context, BUTTON_ZL, 160ms, BOX_PICKUP_DROP_DELAY);
         for (size_t c = 0; c < 10; c++){
-            pbf_move_right_joystick(context, 255, 128, 5, 3);
-            pbf_move_right_joystick(context, 128, 255, 5, 3);
+            pbf_move_right_joystick(context, {+1, 0}, 40ms, 24ms);
+            pbf_move_right_joystick(context, {0, -1}, 40ms, 24ms);
         }
-        pbf_press_button(context, BUTTON_ZL, 20, BOX_PICKUP_DROP_DELAY);
+        pbf_press_button(context, BUTTON_ZL, 160ms, BOX_PICKUP_DROP_DELAY);
         int box_offset = RELEASE ? 1 : 1 + box;
         for (int i = 0; i < box_offset; ++i){
-            pbf_press_button(context, BUTTON_R, 20, BOX_CHANGE_DELAY);
+            pbf_press_button(context, BUTTON_R, 160ms, BOX_CHANGE_DELAY);
         }
-        pbf_press_button(context, BUTTON_ZL, 20, BOX_PICKUP_DROP_DELAY);
+        pbf_press_button(context, BUTTON_ZL, 160ms, BOX_PICKUP_DROP_DELAY);
 
         //  Back to previous menu.
         box_to_overworld(context);
 
         //  View Summary
-        pbf_move_right_joystick(context, 128, 255, 20, 10);
-        pbf_press_button(context, BUTTON_ZL, 20, 250);
+        pbf_move_right_joystick(context, {0, -1}, 160ms, 80ms);
+        pbf_press_button(context, BUTTON_ZL, 160ms, 2000ms);
 
         //  Back out.
-        pbf_press_button(context, BUTTON_B, 20, 230);
+        pbf_press_button(context, BUTTON_B, 160ms, 1840ms);
 
         if (RELEASE){
             //  Release the cloned box.
-            pbf_press_button(context, BUTTON_R, 20, BOX_CHANGE_DELAY);
+            pbf_press_button(context, BUTTON_R, 160ms, BOX_CHANGE_DELAY);
             release_box(context, BOX_SCROLL_DELAY);
-            pbf_press_button(context, BUTTON_L, 20, BOX_CHANGE_DELAY);
+            pbf_press_button(context, BUTTON_L, 160ms, BOX_CHANGE_DELAY);
 
             //  Move cursor back to starting position.
-            pbf_move_right_joystick(context, 128, 255, 20, BOX_SCROLL_DELAY);
-            pbf_move_right_joystick(context, 128, 255, 20, BOX_SCROLL_DELAY);
-            pbf_move_right_joystick(context, 128, 255, 20, BOX_SCROLL_DELAY);
-            pbf_move_right_joystick(context, 255, 128, 20, BOX_SCROLL_DELAY);
-            pbf_move_right_joystick(context, 255, 128, 20, BOX_SCROLL_DELAY);
+            pbf_move_right_joystick(context, {0, -1}, 160ms, BOX_SCROLL_DELAY);
+            pbf_move_right_joystick(context, {0, -1}, 160ms, BOX_SCROLL_DELAY);
+            pbf_move_right_joystick(context, {0, -1}, 160ms, BOX_SCROLL_DELAY);
+            pbf_move_right_joystick(context, {+1, 0}, 160ms, BOX_SCROLL_DELAY);
+            pbf_move_right_joystick(context, {+1, 0}, 160ms, BOX_SCROLL_DELAY);
         }
 #endif
 
@@ -175,10 +179,10 @@ void CloneItemsBoxCopy2::program(SingleSwitchProgramEnvironment& env, BotBaseCon
         context.wait_for(std::chrono::milliseconds(500));
         if (!matcher.detect(env.console.video().snapshot())){
             stats.m_errors++;
-            throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, env.console,
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
                 "Failed to return to starting position. Something is wrong.",
-                true
+                env.console
             );
         }
 
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/Glitches/PokemonBDSP_CloneItemsBoxCopy2.h b/SerialPrograms/Source/PokemonBDSP/Programs/Glitches/PokemonBDSP_CloneItemsBoxCopy2.h
index c8f18ba0b0..9d4c123ced 100644
--- a/SerialPrograms/Source/PokemonBDSP/Programs/Glitches/PokemonBDSP_CloneItemsBoxCopy2.h
+++ b/SerialPrograms/Source/PokemonBDSP/Programs/Glitches/PokemonBDSP_CloneItemsBoxCopy2.h
@@ -1,17 +1,15 @@
 /*  Clone Items (Box Copy Method)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifndef PokemonAutomation_PokemonBDSP_CloneItemsBoxCopy2_H
 #define PokemonAutomation_PokemonBDSP_CloneItemsBoxCopy2_H
 
-#include "Common/Cpp/Options/StaticTextOption.h"
 #include "Common/Cpp/Options/SimpleIntegerOption.h"
 #include "CommonFramework/Notifications/EventNotificationsTable.h"
 #include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
-//#include "NintendoSwitch/Options/TimeExpressionOption.h"
 #include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
 
 namespace PokemonAutomation{
@@ -30,9 +28,10 @@ class CloneItemsBoxCopy2_Descriptor : public SingleSwitchProgramDescriptor{
 
 class CloneItemsBoxCopy2 : public SingleSwitchProgramInstance{
 public:
+    using Descriptor = CloneItemsBoxCopy2_Descriptor;
     CloneItemsBoxCopy2();
 
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
 
 private:
     GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_BasicCatcher.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_BasicCatcher.cpp
index 5a8f588e0c..b40f293975 100644
--- a/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_BasicCatcher.cpp
+++ b/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_BasicCatcher.cpp
@@ -1,11 +1,12 @@
 /*  Basic Pokemon Catcher
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include "CommonFramework/Exceptions/OperationFailedException.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonTools/Async/InferenceRoutines.h"
 #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
 #include "Pokemon/Pokemon_Strings.h"
 #include "PokemonBDSP/Inference/PokemonBDSP_ReceivePokemonDetector.h"
@@ -24,20 +25,20 @@ namespace PokemonBDSP{
 //  Returns the # of slots scrolled. Returns -1 if not found.
 int move_to_ball(
     const BattleBallReader& reader,
-    ConsoleHandle& console, BotBaseContext& context,
+    VideoStream& stream, ProControllerContext& context,
     const std::string& ball_slug,
-    bool forward, int attempts, uint16_t delay
+    bool forward, int attempts, Milliseconds delay
 ){
-    std::string first_ball = reader.read_ball(console.video().snapshot());
+    std::string first_ball = reader.read_ball(stream.video().snapshot());
     if (first_ball == ball_slug){
         return 0;
     }
 
     size_t repeat_counter = 0;
     for (int c = 1; c < attempts; c++){
-        pbf_press_dpad(context, forward ? DPAD_RIGHT : DPAD_LEFT, 10, delay);
+        pbf_press_dpad(context, forward ? DPAD_RIGHT : DPAD_LEFT, 80ms, delay);
         context.wait_for_all_requests();
-        std::string current_ball = reader.read_ball(console.video().snapshot());
+        std::string current_ball = reader.read_ball(stream.video().snapshot());
         if (current_ball == ball_slug){
             return c;
         }
@@ -56,71 +57,73 @@ int move_to_ball(
 //  Returns -1 if unable to read.
 int16_t move_to_ball(
     const BattleBallReader& reader,
-    ConsoleHandle& console, BotBaseContext& context,
+    VideoStream& stream, ProControllerContext& context,
     const std::string& ball_slug
 ){
     //  Search forward at high speed.
-    int ret = move_to_ball(reader, console, context, ball_slug, true, 50, 30);
+    int ret = move_to_ball(reader, stream, context, ball_slug, true, 50, 240ms);
     if (ret < 0){
         return 0;
     }
     if (ret == 0){
-        uint16_t quantity = reader.read_quantity(console.video().snapshot());
+        uint16_t quantity = reader.read_quantity(stream.video().snapshot());
         return quantity == 0 ? -1 : quantity;
     }
 
     //  Wait a second to let the video catch up.
-    pbf_wait(context, TICKS_PER_SECOND);
+    pbf_wait(context, 1000ms);
     context.wait_for_all_requests();
 
     //  Now try again in reverse at a lower speed in case we overshot.
     //  This will return immediately if we got it right the first time.
-    ret = move_to_ball(reader, console, context, ball_slug, false, 5, TICKS_PER_SECOND);
+    ret = move_to_ball(reader, stream, context, ball_slug, false, 5, 1000ms);
     if (ret < 0){
         return 0;
     }
     if (ret > 0){
-        console.log("BasicCatcher: Fast ball scrolling overshot by " +
+        stream.log("BasicCatcher: Fast ball scrolling overshot by " +
             std::to_string(ret) + " slot(s).", COLOR_RED);
     }
-    uint16_t quantity = reader.read_quantity(console.video().snapshot());
+    uint16_t quantity = reader.read_quantity(stream.video().snapshot());
     return quantity == 0 ? -1 : quantity;
 }
 
 
 CatchResults throw_balls(
-    ConsoleHandle& console, BotBaseContext& context,
+    VideoStream& stream, ProControllerContext& context,
     Language language,
-    const std::string& ball_slug
+    const std::string& ball_slug, uint16_t ball_limit
 ){
     uint16_t balls_used = 0;
     while (true){
         // Test code for checking catch outcome handling: if the wild pokemon fainted:
 // #define TEST_WILD_POKEMON_FAINTED
 #ifdef TEST_WILD_POKEMON_FAINTED
-        pbf_mash_button(context, BUTTON_ZL, TICKS_PER_SECOND);
+        pbf_mash_button(context, BUTTON_ZL, 1000ms);
         context.wait_for_all_requests();
         if (0)
 #endif
         {
-            BattleBallReader reader(console, language);
+            BattleBallReader reader(stream, language);
 
-            pbf_press_button(context, BUTTON_X, 20, 105);
+            pbf_press_button(context, BUTTON_X, 160ms, 840ms);
             context.wait_for_all_requests();
 
-            const int16_t num_balls = move_to_ball(reader, console, context, ball_slug);
+            const int16_t num_balls = move_to_ball(reader, stream, context, ball_slug);
             if (num_balls < 0){
-                console.log("BasicCatcher: Unable to read quantity of ball " + ball_slug + ".");
+                stream.log("BasicCatcher: Unable to read quantity of ball " + ball_slug + ".");
             }
             if (num_balls == 0){
-                console.log("BasicCatcher: No ball " + ball_slug +
+                stream.log("BasicCatcher: No ball " + ball_slug +
                     " found in bag or used them all during catching.");
                 return {CatchResult::OUT_OF_BALLS, balls_used};
             }
 
-            console.log("BasicCatcher: Found " + ball_slug + " with amount " + 
-                std::to_string(num_balls));
-            pbf_mash_button(context, BUTTON_ZL, 125);
+            stream.log(
+                "BasicCatcher: Found " + ball_slug + " with amount " +
+                std::to_string(num_balls)
+            );
+            pbf_mash_button(context, BUTTON_ZL, 1000ms);
             context.wait_for_all_requests();
         }
         balls_used++;
@@ -129,9 +132,9 @@ CatchResults throw_balls(
 
         BattleMenuWatcher menu_detector(BattleType::STANDARD);
         ExperienceGainWatcher experience_detector;
-        SelectionArrowFinder own_fainted_detector(console, {0.18, 0.64, 0.46, 0.3}, COLOR_YELLOW);
+        SelectionArrowFinder own_fainted_detector(stream.overlay(), {0.18, 0.64, 0.46, 0.3}, COLOR_YELLOW);
         int result = wait_until(
-            console, context,
+            stream, context,
             std::chrono::seconds(60),
             {
                 {menu_detector},
@@ -144,10 +147,14 @@ CatchResults throw_balls(
             if (current_time() < start + std::chrono::seconds(5)){
                 return {CatchResult::CANNOT_THROW_BALL, balls_used};
             }
-            console.log("BasicCatcher: Failed to catch.", COLOR_ORANGE);
+            stream.log("BasicCatcher: Failed to catch.", COLOR_ORANGE);
+            if (balls_used >= ball_limit){
+                stream.log("Reached the limit of " + std::to_string(ball_limit) + " balls.", COLOR_RED);
+                return {CatchResult::BALL_LIMIT_REACHED, balls_used};
+            }
             continue;
         case 1:
-            console.log("BasicCatcher: End of battle detected.", COLOR_PURPLE);
+            stream.log("BasicCatcher: End of battle detected.", COLOR_PURPLE);
             // It's actually fainted or caught. The logic to find out which one
             // is in basic_catcher().
             return {CatchResult::POKEMON_FAINTED, balls_used};
@@ -161,29 +168,32 @@ CatchResults throw_balls(
 
 
 CatchResults basic_catcher(
-    ConsoleHandle& console, BotBaseContext& context,
+    VideoStream& stream, ProControllerContext& context,
     Language language,
-    const std::string& ball_slug
+    const std::string& ball_slug, uint16_t ball_limit
 ){
     context.wait_for_all_requests();
-    console.log("Attempting to catch with: " + ball_slug);
+    stream.log("Attempting to catch with: " + ball_slug);
 
-    CatchResults results = throw_balls(console, context, language, ball_slug);
+    CatchResults results = throw_balls(stream, context, language, ball_slug, ball_limit);
     const std::string s = (results.balls_used <= 1 ? "" : "s");
     const std::string pokeball_str = std::to_string(results.balls_used) + " " + ball_slug + s;
 
     switch (results.result){
     case CatchResult::OUT_OF_BALLS:
-        console.log("BasicCatcher: Out of balls after throwing " + pokeball_str, COLOR_RED);
+        stream.log("BasicCatcher: Out of balls after throwing " + pokeball_str, COLOR_RED);
         return results;
     case CatchResult::CANNOT_THROW_BALL:
-        console.log("BasicCatcher: cannot throw ball for some reason.", COLOR_RED);
+        stream.log("BasicCatcher: Unable to throw a ball.", COLOR_RED);
+        return results;
+    case CatchResult::BALL_LIMIT_REACHED:
+        stream.log("BasicCatcher: Ball limit reached.", COLOR_RED);
         return results;
     case CatchResult::OWN_FAINTED:
-        console.log("BasicCatcher: own pokemon fainted after throwing " + pokeball_str, COLOR_RED);
+        stream.log("BasicCatcher: Own " + Pokemon::STRING_POKEMON + " fainted after throwing " + pokeball_str, COLOR_RED);
         return results;
     case CatchResult::TIMED_OUT:
-        console.log("BasicCatcher: time out.", COLOR_RED);
+        stream.log("BasicCatcher: Timed out.", COLOR_RED);
         return results;
     default:;
     }
@@ -206,60 +216,60 @@ CatchResults basic_catcher(
         // BlackScreenOverWatcher black_screen_detector;
         EndBattleWatcher end_battle;
         //  Look for a pokemon learning a new move.
-        SelectionArrowFinder learn_move(console, {0.50, 0.62, 0.40, 0.18}, COLOR_YELLOW);
+        SelectionArrowFinder learn_move(stream.overlay(), {0.50, 0.62, 0.40, 0.18}, COLOR_YELLOW);
         //  Look for the pokemon caught screen.
         ReceivePokemonDetector caught_detector;
-        int ret = run_until(
-            console, context,
-            [](BotBaseContext& context){
-                pbf_mash_button(context, BUTTON_B, 120 * TICKS_PER_SECOND);
+        int ret = run_until<ProControllerContext>(
+            stream, context,
+            [](ProControllerContext& context){
+                pbf_mash_button(context, BUTTON_B, 120000ms);
             },
             {
-                {end_battle},
-                {caught_detector},
-                {learn_move},
+                end_battle,
+                caught_detector,
+                learn_move,
             }
         );
         switch (ret){
         case 0:
             if (results.result == CatchResult::POKEMON_FAINTED){
-                console.log(
+                stream.log(
                     "BasicCatcher: The wild " + STRING_POKEMON + " fainted after " +
                     pokeball_str, COLOR_RED
                 );
             }
-            console.log("BasicCatcher: Battle finished!", COLOR_BLUE);
-            pbf_wait(context, TICKS_PER_SECOND);
+            stream.log("BasicCatcher: Battle finished!", COLOR_BLUE);
+            pbf_wait(context, 1000ms);
             context.wait_for_all_requests();
             return results;
         case 1:
             if (results.result == CatchResult::POKEMON_CAUGHT){
-                throw OperationFailedException(
-                    ErrorReport::SEND_ERROR_REPORT, console,
+                OperationFailedExceptionWithScreenshot::fire(
+                    ErrorReportMode::SEND_ERROR_REPORT,
                     "BasicCatcher: Found receive pokemon screen two times.",
-                    true
+                    stream
                 );
             }
-            console.log("BasicCatcher: The wild " + STRING_POKEMON + " was caught by " + pokeball_str, COLOR_BLUE);
-            pbf_wait(context, 50);
+            stream.log("BasicCatcher: The wild " + STRING_POKEMON + " was caught by " + pokeball_str, COLOR_BLUE);
+            pbf_wait(context, 400ms);
             results.result = CatchResult::POKEMON_CAUGHT;
             break; //  Continue the loop.
         case 2:
-            console.log("BasicCatcher: Detected move learn! Don't learn the new move.", COLOR_BLUE);
+            stream.log("BasicCatcher: Detected move learn! Don't learn the new move.", COLOR_BLUE);
             num_learned_moves++;
             if (num_learned_moves == 100){
-                throw OperationFailedException(
-                    ErrorReport::SEND_ERROR_REPORT, console,
+                OperationFailedExceptionWithScreenshot::fire(
+                    ErrorReportMode::SEND_ERROR_REPORT,
                     "BasicCatcher: Learn new move attempts reach 100.",
-                    true
+                    stream
                 );
             }
-            pbf_move_right_joystick(context, 128, 255, 20, 105);
-            pbf_press_button(context, BUTTON_ZL, 20, 105);
+            pbf_move_right_joystick(context, {0, -1}, 160ms, 840ms);
+            pbf_press_button(context, BUTTON_ZL, 160ms, 840ms);
             break; //  Continue the loop.
 
         default:
-            console.log("BasicCatcher: Timed out.", COLOR_RED);
+            stream.log("BasicCatcher: Timed out.", COLOR_RED);
             results.result = CatchResult::TIMED_OUT;
             return results;
         }
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_BasicCatcher.h b/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_BasicCatcher.h
index a65a5b1223..472a28b87c 100644
--- a/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_BasicCatcher.h
+++ b/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_BasicCatcher.h
@@ -1,6 +1,6 @@
 /*  Basic Pokemon Catcher
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -8,11 +8,11 @@
 #define PokemonAutomation_PokemonBDSP_BasicCatcher_H
 
 #include "CommonFramework/Language.h"
-#include "CommonFramework/Tools/ConsoleHandle.h"
+#include "CommonFramework/Tools/VideoStream.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
 #include "Pokemon/Pokemon_Notification.h"
 
 namespace PokemonAutomation{
-    class BotBaseContext;
 namespace NintendoSwitch{
 namespace PokemonBDSP{
 
@@ -34,9 +34,9 @@ struct CatchResults{
 //
 // Don't handle the case that own pokemon evolving or black out to Pokecenter.
 CatchResults basic_catcher(
-    ConsoleHandle& console, BotBaseContext& context,
+    VideoStream& stream, ProControllerContext& context,
     Language language,
-    const std::string& ball_slug
+    const std::string& ball_slug, uint16_t ball_limit
 );
 
 
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_BoxRelease.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_BoxRelease.cpp
index 2cab28dcf8..c25660bb23 100644
--- a/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_BoxRelease.cpp
+++ b/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_BoxRelease.cpp
@@ -1,6 +1,6 @@
 /*  Box Release Tools
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -11,25 +11,24 @@ namespace PokemonAutomation{
 namespace NintendoSwitch{
 namespace PokemonBDSP{
 
-void detach(BotBaseContext& context){
-    pbf_press_button(context, BUTTON_ZL, 20, 50);
-    pbf_move_right_joystick(context, 128, 255, 20, 10);
-    pbf_press_button(context, BUTTON_ZL, 20, 85);
-    pbf_press_button(context, BUTTON_ZL, 20, 85);
-//    pbf_move_right_joystick(context, 128, 255, 20, 0);
-    pbf_press_button(context, BUTTON_B, 20, 85);
+void detach(ProControllerContext& context){
+    pbf_press_button(context, BUTTON_ZL, 160ms, 400ms);
+    pbf_move_right_joystick(context, {0, -1}, 160ms, 80ms);
+    pbf_press_button(context, BUTTON_ZL, 160ms, 680ms);
+    pbf_press_button(context, BUTTON_ZL, 160ms, 680ms);
+    pbf_press_button(context, BUTTON_B, 160ms, 680ms);
 }
-void detach_box(BotBaseContext& context, uint16_t box_scroll_delay){
+void detach_box(ProControllerContext& context, Milliseconds box_scroll_delay){
     for (uint8_t row = 0; row < 5; row++){
         if (row != 0){
-            pbf_move_right_joystick(context, 128, 255, 20, box_scroll_delay);
-            pbf_move_right_joystick(context, 255, 128, 20, box_scroll_delay);
-            pbf_move_right_joystick(context, 255, 128, 20, box_scroll_delay);
+            pbf_move_right_joystick(context, {0, -1}, 160ms, box_scroll_delay);
+            pbf_move_right_joystick(context, {+1, 0}, 160ms, box_scroll_delay);
+            pbf_move_right_joystick(context, {+1, 0}, 160ms, box_scroll_delay);
         }
         for (uint8_t col = 0; col < 6; col++){
 //            context->wait_for_all_requests();
             if (col != 0){
-                pbf_move_right_joystick(context, 255, 128, 20, box_scroll_delay);
+                pbf_move_right_joystick(context, {+1, 0}, 160ms, box_scroll_delay);
             }
 //            context->wait_for_all_requests();
             detach(context);
@@ -41,26 +40,26 @@ void detach_box(BotBaseContext& context, uint16_t box_scroll_delay){
 
 
 
-void release(BotBaseContext& context){
-    pbf_press_button(context, BUTTON_ZL, 20, 50);
-    pbf_move_right_joystick(context, 128, 0, 20, 10);
-    pbf_move_right_joystick(context, 128, 0, 20, 10);
-    pbf_press_button(context, BUTTON_ZL, 20, 105);
-    pbf_move_right_joystick(context, 128, 255, 20, 10);
-    pbf_mash_button(context, BUTTON_ZL, 120);
-    pbf_wait(context, 30);
+void release(ProControllerContext& context){
+    pbf_press_button(context, BUTTON_ZL, 160ms, 400ms);
+    pbf_move_right_joystick(context, {0, +1}, 160ms, 80ms);
+    pbf_move_right_joystick(context, {0, +1}, 160ms, 80ms);
+    pbf_press_button(context, BUTTON_ZL, 160ms, 840ms);
+    pbf_move_right_joystick(context, {0, -1}, 160ms, 80ms);
+    pbf_mash_button(context, BUTTON_ZL, 960ms);
+    pbf_wait(context, 240ms);
 }
-void release_box(BotBaseContext& context, uint16_t box_scroll_delay){
+void release_box(ProControllerContext& context, Milliseconds box_scroll_delay){
     for (uint8_t row = 0; row < 5; row++){
         if (row != 0){
-            pbf_move_right_joystick(context, 128, 255, 20, box_scroll_delay);
-            pbf_move_right_joystick(context, 255, 128, 20, box_scroll_delay);
-            pbf_move_right_joystick(context, 255, 128, 20, box_scroll_delay);
+            pbf_move_right_joystick(context, {0, -1}, 160ms, box_scroll_delay);
+            pbf_move_right_joystick(context, {+1, 0}, 160ms, box_scroll_delay);
+            pbf_move_right_joystick(context, {+1, 0}, 160ms, box_scroll_delay);
         }
         for (uint8_t col = 0; col < 6; col++){
 //            context->wait_for_all_requests();
             if (col != 0){
-                pbf_move_right_joystick(context, 255, 128, 20, box_scroll_delay);
+                pbf_move_right_joystick(context, {+1, 0}, 160ms, box_scroll_delay);
             }
 //            context->wait_for_all_requests();
             release(context);
@@ -68,23 +67,23 @@ void release_box(BotBaseContext& context, uint16_t box_scroll_delay){
     }
 }
 void release_boxes(
-    BotBaseContext& context,
+    ProControllerContext& context,
     uint8_t boxes,
-    uint16_t box_scroll_delay,
-    uint16_t box_change_delay
+    Milliseconds box_scroll_delay,
+    Milliseconds box_change_delay
 ){
     if (boxes == 0){
         return;
     }
     release_box(context, box_scroll_delay);
     for (uint8_t box = 1; box < boxes; box++){
-        pbf_move_right_joystick(context, 128, 255, 20, box_scroll_delay);
-        pbf_move_right_joystick(context, 128, 255, 20, box_scroll_delay);
-        pbf_move_right_joystick(context, 128, 255, 20, box_scroll_delay);
-        pbf_move_right_joystick(context, 255, 128, 20, box_scroll_delay);
-        pbf_move_right_joystick(context, 255, 128, 20, box_scroll_delay);
-        pbf_wait(context, 50);
-        pbf_press_button(context, BUTTON_R, 20, box_change_delay);
+        pbf_move_right_joystick(context, {0, -1}, 160ms, box_scroll_delay);
+        pbf_move_right_joystick(context, {0, -1}, 160ms, box_scroll_delay);
+        pbf_move_right_joystick(context, {0, -1}, 160ms, box_scroll_delay);
+        pbf_move_right_joystick(context, {+1, 0}, 160ms, box_scroll_delay);
+        pbf_move_right_joystick(context, {+1, 0}, 160ms, box_scroll_delay);
+        pbf_wait(context, 400ms);
+        pbf_press_button(context, BUTTON_R, 160ms, box_change_delay);
         release_box(context, box_scroll_delay);
     }
 }
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_BoxRelease.h b/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_BoxRelease.h
index 1912b1f718..7e2b87d2c2 100644
--- a/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_BoxRelease.h
+++ b/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_BoxRelease.h
@@ -1,30 +1,30 @@
 /*  Box Release Tools
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifndef PokemonAutomation_PokemonBDSP_BoxReleaseTools_H
 #define PokemonAutomation_PokemonBDSP_BoxReleaseTools_H
 
-#include "ClientSource/Connection/BotBase.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
 namespace PokemonBDSP{
 
 //  Detach items.
-void detach(BotBaseContext& context);
-void detach_box(BotBaseContext& context, uint16_t box_scroll_delay);
+void detach(ProControllerContext& context);
+void detach_box(ProControllerContext& context, Milliseconds box_scroll_delay);
 
 //  Release Pokemon.
-void release(BotBaseContext& context);
-void release_box(BotBaseContext& context, uint16_t box_scroll_delay);
+void release(ProControllerContext& context);
+void release_box(ProControllerContext& context, Milliseconds box_scroll_delay);
 void release_boxes(
-    BotBaseContext& context,
+    ProControllerContext& context,
     uint8_t boxes,
-    uint16_t box_scroll_delay,
-    uint16_t box_change_delay
+    Milliseconds box_scroll_delay,
+    Milliseconds box_change_delay
 );
 
 
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_EncounterDetection.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_EncounterDetection.cpp
index 99d9f35b8d..76c77756cc 100644
--- a/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_EncounterDetection.cpp
+++ b/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_EncounterDetection.cpp
@@ -1,21 +1,23 @@
 /*  Encounter Detection
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include "Common/Cpp/Exceptions.h"
-#include "ClientSource/Connection/BotBase.h"
+//#include "Common/Cpp/Exceptions.h"
 #include "CommonFramework/Exceptions/FatalProgramException.h"
+#include "CommonFramework/Notifications/ProgramInfo.h"
 #include "CommonFramework/ImageTools/ImageStats.h"
-#include "CommonFramework/ImageTools/SolidColorTest.h"
 #include "CommonFramework/VideoPipeline/VideoFeed.h"
 #include "CommonFramework/Tools/ErrorDumper.h"
+#include "CommonTools/Images/SolidColorTest.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "Pokemon/Inference/Pokemon_NameReader.h"
 #include "PokemonBDSP_EncounterDetection.h"
 
-#include <iostream>
-using std::cout;
-using std::endl;
+//#include <iostream>
+//using std::cout;
+//using std::endl;
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
@@ -23,27 +25,27 @@ namespace PokemonBDSP{
 
 
 StandardEncounterDetection::StandardEncounterDetection(
-    ConsoleHandle& console, BotBaseContext& context,
+    VideoStream& stream, ProControllerContext& context,
     Language language,
-    const EncounterFilterOption& filter,
+    const EncounterFilterOption2& filter,
     const DoublesShinyDetection& shininess,
     std::chrono::milliseconds read_name_delay
 )
-    : m_console(console)
+    : m_stream(stream)
     , m_language(language)
     , m_filter(filter)
     , m_shininess(shininess)
     , m_double_battle(false)
 {
-//    InferenceBoxScope left_mon_white(console, {0.685, 0.065, 0.025, 0.040});
-    OverlayBoxScope left_mon_white(console, {0.708, 0.070, 0.005, 0.028});
-    OverlayBoxScope left_mon_hp(console, {0.500, 0.120, 0.18, 0.005});
-    OverlayBoxScope left_name(console, {0.467, 0.06, 0.16, 0.050});
-    OverlayBoxScope right_name(console, {0.740, 0.06, 0.16, 0.050});
+//    InferenceBoxScope left_mon_white(stream, {0.685, 0.065, 0.025, 0.040});
+    OverlayBoxScope left_mon_white(stream.overlay(), {0.708, 0.070, 0.005, 0.028});
+    OverlayBoxScope left_mon_hp(stream.overlay(), {0.500, 0.120, 0.18, 0.005});
+    OverlayBoxScope left_name(stream.overlay(), {0.467, 0.06, 0.16, 0.050});
+    OverlayBoxScope right_name(stream.overlay(), {0.740, 0.06, 0.16, 0.050});
 
     context.wait_for_all_requests();
     context.wait_for(std::chrono::milliseconds(100));
-    VideoSnapshot screen = console.video().snapshot();
+    VideoSnapshot screen = stream.video().snapshot();
 
     //  Check if it's a double battle.
     do{
@@ -123,14 +125,15 @@ std::set<std::string> StandardEncounterDetection::read_name(const ImageViewRGB32
     std::set<std::string> ret;
 
     OCR::StringMatchResult result = PokemonNameReader::instance().read_substring(
-        m_console, m_language, image,
+        m_stream.logger(), m_language, image,
         OCR::BLACK_TEXT_FILTERS()
     );
     if (result.results.empty()){
         dump_image(
-            m_console, ProgramInfo(),
+            m_stream.logger(), ProgramInfo(),
             "StandardEncounterDetection-NameOCR-" + language_data(m_language).code,
-            screen
+            screen,
+            &m_stream.history()
         );
     }else{
         for (const auto& item : result.results){
@@ -179,17 +182,17 @@ bool StandardEncounterDetection::run_overrides(
         ShinyType shiny = side_shiny;
         if (shiny == ShinyType::MAYBE_SHINY){
 //            actions.emplace_back(EncounterAction::StopProgram, "");
-            throw FatalProgramException(
-                ErrorReport::SEND_ERROR_REPORT, m_console,
+            throw_and_log<FatalProgramException>(
+                m_stream.logger(), ErrorReportMode::SEND_ERROR_REPORT,
                 "Cannot run encounter actions due to low confidence shiny detection.",
-                false
+                m_stream
             );
         }
 
         //  Matched the filter.
         if (filter_match(shiny, override->shininess)){
             triggered = true;
-            action = {override->action, override->pokeball.slug()};
+            action = {override->action, override->pokeball.slug(), override->ball_limit};
         }
     }
     return triggered;
@@ -198,35 +201,39 @@ bool StandardEncounterDetection::run_overrides(
 
 EncounterActionFull StandardEncounterDetection::get_action_singles(){
     if (m_shininess_right == ShinyType::UNKNOWN){
-        return {EncounterAction::RunAway, ""};
+        return {EncounterAction::RunAway, "", 999};
     }
 
+    ShinyFilter shiny_filter = m_filter.SHINY_FILTER;
+
     EncounterActionFull default_action;
-    default_action.action = filter_match(m_shininess_right, m_filter.shiny_filter())
+    default_action.action = filter_match(m_shininess_right, shiny_filter)
         ? EncounterAction::StopProgram
         : EncounterAction::RunAway;
 
-    const std::vector<std::unique_ptr<EncounterFilterOverride>>& overrides = m_filter.copy_snapshot();
+    const std::vector<std::unique_ptr<EncounterFilterOverride>>& overrides = m_filter.FILTER_TABLE.copy_snapshot();
     if (m_language != Language::None && !overrides.empty()){
         run_overrides(default_action, overrides, m_pokemon_right, m_shininess_right);
     }
 
-    m_console.log("Action: " + default_action.to_str());
+    m_stream.log("Action: " + default_action.to_str());
 
     return default_action;
 }
 EncounterActionFull StandardEncounterDetection::get_action_doubles(){
+    ShinyFilter shiny_filter = m_filter.SHINY_FILTER;
+
     EncounterActionFull action_left;
-    action_left.action = filter_match(m_shininess_left, m_filter.shiny_filter())
+    action_left.action = filter_match(m_shininess_left, shiny_filter)
         ? EncounterAction::StopProgram
         : EncounterAction::RunAway;
 
     EncounterActionFull action_right;
-    action_right.action = filter_match(m_shininess_right, m_filter.shiny_filter())
+    action_right.action = filter_match(m_shininess_right, shiny_filter)
         ? EncounterAction::StopProgram
         : EncounterAction::RunAway;
 
-    const std::vector<std::unique_ptr<EncounterFilterOverride>>& overrides = m_filter.copy_snapshot();
+    const std::vector<std::unique_ptr<EncounterFilterOverride>>& overrides = m_filter.FILTER_TABLE.copy_snapshot();
     if (m_language != Language::None && !overrides.empty()){
         run_overrides(action_left, overrides, m_pokemon_left, m_shininess_left);
         run_overrides(action_right, overrides, m_pokemon_right, m_shininess_right);
@@ -234,14 +241,22 @@ EncounterActionFull StandardEncounterDetection::get_action_doubles(){
 
     std::string str_left = "Left " + STRING_POKEMON + ": " + action_left.to_str();
     std::string str_right = "Right " + STRING_POKEMON + ": " + action_right.to_str();
-    m_console.log(str_left);
-    m_console.log(str_right);
+    m_stream.log(str_left);
+    m_stream.log(str_right);
+
+    //  If either action is stop program, we stop program.
+    if (action_left.action == EncounterAction::StopProgram){
+        return action_left;
+    }
+    if (action_right.action == EncounterAction::StopProgram){
+        return action_right;
+    }
 
     if (action_left != action_right){
-        throw FatalProgramException(
-            ErrorReport::NO_ERROR_REPORT, m_console,
+        throw_and_log<FatalProgramException>(
+            m_stream.logger(), ErrorReportMode::NO_ERROR_REPORT,
             "Conflicting actions requested.\n" + str_left + "\n" + str_right,
-            false
+            m_stream
         );
     }
 
@@ -253,10 +268,10 @@ EncounterActionFull StandardEncounterDetection::get_action_doubles(){
 
     //  Double battle and someone is set to auto-catch.
     if (auto_catch && m_double_battle){
-        throw FatalProgramException(
-            ErrorReport::NO_ERROR_REPORT, m_console,
+        throw_and_log<FatalProgramException>(
+            m_stream.logger(), ErrorReportMode::NO_ERROR_REPORT,
             "Cannot auto-catch in a double battle.",
-            false
+            m_stream
         );
     }
 
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_EncounterDetection.h b/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_EncounterDetection.h
index affd6930a6..dcbe633a31 100644
--- a/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_EncounterDetection.h
+++ b/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_EncounterDetection.h
@@ -1,6 +1,6 @@
 /*  Encounter Detection
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -8,9 +8,8 @@
 #define PokemonAutomation_PokemonBDSP_EncounterTracker_H
 
 #include "CommonFramework/Language.h"
-#include "CommonFramework/Tools/ConsoleHandle.h"
-#include "Pokemon/Pokemon_EncounterStats.h"
-#include "PokemonSwSh/ShinyHuntTracker.h"
+#include "CommonFramework/Tools/VideoStream.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
 #include "PokemonBDSP/Options/EncounterFilter/PokemonBDSP_EncounterFilterOption.h"
 #include "PokemonBDSP/Inference/ShinyDetection/PokemonBDSP_ShinyEncounterDetector.h"
 
@@ -29,9 +28,9 @@ struct PokemonDetection{
 class StandardEncounterDetection{
 public:
     StandardEncounterDetection(
-        ConsoleHandle& console, BotBaseContext& context,
+        VideoStream& stream, ProControllerContext& context,
         Language language,
-        const EncounterFilterOption& filter,
+        const EncounterFilterOption2& filter,
         const DoublesShinyDetection& shininess,
         std::chrono::milliseconds read_name_delay = std::chrono::milliseconds(500)
     );
@@ -58,11 +57,11 @@ class StandardEncounterDetection{
     EncounterActionFull get_action_doubles();
 
 private:
-    ConsoleHandle& m_console;
+    VideoStream& m_stream;
 
     const Language m_language;
 
-    const EncounterFilterOption& m_filter;
+    const EncounterFilterOption2& m_filter;
     const DoublesShinyDetection& m_shininess;
 
     bool m_double_battle = false;
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_EncounterHandler.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_EncounterHandler.cpp
index a00152f630..6c957496c2 100644
--- a/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_EncounterHandler.cpp
+++ b/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_EncounterHandler.cpp
@@ -1,11 +1,11 @@
 /*  Encounter Handler
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include <QtGlobal>
-#include "CommonFramework/Exceptions/OperationFailedException.h"
+#include <sstream>
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
 #include "CommonFramework/Exceptions/FatalProgramException.h"
 #include "CommonFramework/Tools/ProgramEnvironment.h"
 #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
@@ -14,10 +14,9 @@
 #include "PokemonBDSP_GameNavigation.h"
 #include "PokemonBDSP_RunFromBattle.h"
 
-#include <iostream>
-#include <sstream>
-using std::cout;
-using std::endl;
+//#include <iostream>
+//using std::cout;
+//using std::endl;
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
@@ -25,22 +24,22 @@ namespace PokemonBDSP{
 
 
 
-void take_video(BotBaseContext& context){
-    pbf_wait(context, 5 * TICKS_PER_SECOND);
-    pbf_press_button(context, BUTTON_CAPTURE, 2 * TICKS_PER_SECOND, 5 * TICKS_PER_SECOND);
+void take_video(ProControllerContext& context){
+    pbf_wait(context, 5000ms);
+    pbf_press_button(context, BUTTON_CAPTURE, 2000ms, 5000ms);
 //    context->wait_for_all_requests();
 }
 
 
 StandardEncounterHandler::StandardEncounterHandler(
-    ProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context,
+    ProgramEnvironment& env, VideoStream& stream, ProControllerContext& context,
     Language language,
     EncounterBotCommonOptions& settings,
     PokemonSwSh::ShinyHuntTracker& session_stats
 )
     : m_env(env)
     , m_context(context)
-    , m_console(console)
+    , m_stream(stream)
     , m_language(language)
     , m_settings(settings)
     , m_session_stats(session_stats)
@@ -61,12 +60,12 @@ std::vector<PokemonDetection> get_mon_list(StandardEncounterDetection& encounter
     return mon_list;
 }
 
-void StandardEncounterHandler::run_away_due_to_error(uint16_t exit_battle_time){
-    pbf_mash_button(m_context, BUTTON_B, 3 * TICKS_PER_SECOND);
-    pbf_press_dpad(m_context, DPAD_DOWN, 3 * TICKS_PER_SECOND, 0);
+void StandardEncounterHandler::run_away_due_to_error(Milliseconds exit_battle_time){
+    pbf_mash_button(m_context, BUTTON_B, 3000ms);
+    pbf_press_dpad(m_context, DPAD_DOWN, 3000ms, 0ms);
     m_context.wait_for_all_requests();
 
-    run_from_battle(m_console, m_context, exit_battle_time);
+    run_from_battle(m_stream, m_context, exit_battle_time);
 }
 
 std::vector<EncounterResult> StandardEncounterHandler::results(StandardEncounterDetection& encounter){
@@ -101,14 +100,14 @@ void StandardEncounterHandler::update_frequencies(StandardEncounterDetection& en
 
 bool StandardEncounterHandler::handle_standard_encounter(const DoublesShinyDetection& result){
     if (result.shiny_type == ShinyType::UNKNOWN){
-        m_console.log("Unable to determine result of battle.", COLOR_RED);
+        m_stream.log("Unable to determine result of battle.", COLOR_RED);
         m_session_stats.add_error();
         m_consecutive_failures++;
         if (m_consecutive_failures >= 3){
-            throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, m_console,
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
                 "3 consecutive failed encounter detections.",
-                true
+                m_stream
             );
         }
         return false;
@@ -116,7 +115,7 @@ bool StandardEncounterHandler::handle_standard_encounter(const DoublesShinyDetec
     m_consecutive_failures = 0;
 
     StandardEncounterDetection encounter(
-        m_console, m_context,
+        m_stream, m_context,
         m_language,
         m_settings.FILTER,
         result
@@ -135,7 +134,7 @@ bool StandardEncounterHandler::handle_standard_encounter(const DoublesShinyDetec
     m_env.update_stats();
 
     if (result.shiny_type == ShinyType::UNKNOWN){
-        pbf_mash_button(m_context, BUTTON_B, TICKS_PER_SECOND);
+        pbf_mash_button(m_context, BUTTON_B, 1000ms);
         return false;
     }
 
@@ -161,17 +160,17 @@ bool StandardEncounterHandler::handle_standard_encounter(const DoublesShinyDetec
 }
 bool StandardEncounterHandler::handle_standard_encounter_end_battle(
     const DoublesShinyDetection& result,
-    uint16_t exit_battle_time
+    Milliseconds exit_battle_time
 ){
     if (result.shiny_type == ShinyType::UNKNOWN){
-        m_console.log("Unable to determine result of battle.", COLOR_RED);
+        m_stream.log("Unable to determine result of battle.", COLOR_RED);
         m_session_stats.add_error();
         m_consecutive_failures++;
         if (m_consecutive_failures >= 3){
-            throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, m_console,
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
                 "3 consecutive failed encounter detections.",
-                true
+                m_stream
             );
         }
         return false;
@@ -179,7 +178,7 @@ bool StandardEncounterHandler::handle_standard_encounter_end_battle(
     m_consecutive_failures = 0;
 
     StandardEncounterDetection encounter(
-        m_console, m_context,
+        m_stream, m_context,
         m_language,
         m_settings.FILTER,
         result
@@ -207,7 +206,7 @@ bool StandardEncounterHandler::handle_standard_encounter_end_battle(
     if (encounter_results.size() > 0){
         os << "Pokemon: (";
         bool first_slug = true;
-        for(const auto& name: encounter_results[0].slug_candidates){
+        for (const auto& name: encounter_results[0].slug_candidates){
             if (first_slug == false){
                 os << ",";
             }
@@ -219,7 +218,7 @@ bool StandardEncounterHandler::handle_standard_encounter_end_battle(
     if (encounter_results.size() > 1){
         os << "(";
         bool first_slug = true;
-        for(const auto& name: encounter_results[1].slug_candidates){
+        for (const auto& name: encounter_results[1].slug_candidates){
             if (first_slug == false){
                 os << ",";
             }
@@ -228,7 +227,7 @@ bool StandardEncounterHandler::handle_standard_encounter_end_battle(
         }
         os << ")";
     }
-    m_console.overlay().add_log(os.str(), COLOR_WHITE);
+    m_stream.overlay().add_log(os.str(), COLOR_WHITE);
 
     update_frequencies(encounter);
     send_encounter_notification(
@@ -247,15 +246,20 @@ bool StandardEncounterHandler::handle_standard_encounter_end_battle(
         return true;
     case EncounterAction::RunAway:
         //  Fast run-away sequence to save time.
-        pbf_press_dpad(m_context, DPAD_UP, 20, 0);
+        pbf_press_dpad(m_context, DPAD_UP, 160ms, 0ms);
         m_context.wait_for_all_requests();
 
-        run_from_battle(m_console, m_context, exit_battle_time);
+        run_from_battle(m_stream, m_context, exit_battle_time);
         return false;
 
     case EncounterAction::ThrowBalls:
     case EncounterAction::ThrowBallsAndSave:{
-        CatchResults catch_result = basic_catcher(m_console, m_context, m_language, action.pokeball_slug);
+        CatchResults catch_result = basic_catcher(
+            m_stream, m_context,
+            m_language,
+            action.pokeball_slug,
+            action.ball_limit
+        );
         send_catch_notification(
             m_env,
             m_settings.NOTIFICATION_CATCH_SUCCESS,
@@ -271,17 +275,17 @@ bool StandardEncounterHandler::handle_standard_encounter_end_battle(
             m_env.update_stats();
             if (action.action == EncounterAction::ThrowBallsAndSave){
                 //  Save the game
-                save_game(m_console, m_context);
+                save_game(m_stream, m_context);
             }
             break;
         case CatchResult::POKEMON_FAINTED:
-            pbf_mash_button(m_context, BUTTON_B, 2 * TICKS_PER_SECOND);
+            pbf_mash_button(m_context, BUTTON_B, 2000ms);
             break;
         default:
-            throw FatalProgramException(
-                ErrorReport::NO_ERROR_REPORT, m_console,
+            throw_and_log<FatalProgramException>(
+                m_stream.logger(), ErrorReportMode::NO_ERROR_REPORT,
                 "Unable to recover from failed catch.",
-                true
+                m_stream
             );
         }
         return false;
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_EncounterHandler.h b/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_EncounterHandler.h
index 82c63b0ff0..58775dbdd6 100644
--- a/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_EncounterHandler.h
+++ b/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_EncounterHandler.h
@@ -1,19 +1,19 @@
 /*  Encounter Handler
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifndef PokemonAutomation_PokemonBDSP_EncounterHandler_H
 #define PokemonAutomation_PokemonBDSP_EncounterHandler_H
 
-#include "CommonFramework/Tools/ConsoleHandle.h"
+#include "CommonFramework/Tools/VideoStream.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
 #include "Pokemon/Pokemon_Notification.h"
-#include "Pokemon/Options/Pokemon_EncounterBotOptions.h"
-#include "PokemonSwSh/ShinyHuntTracker.h"
 #include "PokemonBDSP/Options/PokemonBDSP_EncounterBotCommon.h"
 #include "PokemonBDSP/Inference/ShinyDetection/PokemonBDSP_ShinyEncounterDetector.h"
 #include "PokemonBDSP/Programs/PokemonBDSP_EncounterDetection.h"
+#include "VideoGames/PokemonSwSh/ShinyHuntTracker.h"
 
 namespace PokemonAutomation{
     class ProgramEnvironment;
@@ -24,7 +24,7 @@ namespace PokemonBDSP{
 class StandardEncounterHandler{
 public:
     StandardEncounterHandler(
-        ProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context,
+        ProgramEnvironment& env, VideoStream& stream, ProControllerContext& context,
         Language language,
         EncounterBotCommonOptions& settings,
         PokemonSwSh::ShinyHuntTracker& session_stats
@@ -37,7 +37,7 @@ class StandardEncounterHandler{
     //
     //  exit_battle_time: number of ticks to wait for battle ends after pressing "Run" button.
     //    If end of battle not detected in time, log the error but don't throw exception.
-    void run_away_due_to_error(uint16_t exit_battle_time);
+    void run_away_due_to_error(Milliseconds exit_battle_time);
 
     //  Use shiny detection result and inference of pokemon species to determine whether
     //  to stop the program according to the user setting.
@@ -47,7 +47,7 @@ class StandardEncounterHandler{
     //  to stop the program, run away from battle or catch the pokemon according to the user
     //  setting.
     //  Return true if program should stop.
-    bool handle_standard_encounter_end_battle(const DoublesShinyDetection& result, uint16_t exit_battle_time);
+    bool handle_standard_encounter_end_battle(const DoublesShinyDetection& result, Milliseconds exit_battle_time);
 
 
 private:
@@ -58,8 +58,8 @@ class StandardEncounterHandler{
 
 private:
     ProgramEnvironment& m_env;
-    BotBaseContext& m_context;
-    ConsoleHandle& m_console;
+    ProControllerContext& m_context;
+    VideoStream& m_stream;
     const Language m_language;
     EncounterBotCommonOptions& m_settings;
 
@@ -69,11 +69,11 @@ class StandardEncounterHandler{
 };
 
 
-void take_video(BotBaseContext& context);
+void take_video(ProControllerContext& context);
 void run_away(
     ProgramEnvironment& env,
-    ConsoleHandle& console,
-    uint16_t exit_battle_time
+    VideoStream& stream,
+    Milliseconds exit_battle_time
 );
 
 
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_GameEntry.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_GameEntry.cpp
index c0277dc440..685c274c4f 100644
--- a/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_GameEntry.cpp
+++ b/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_GameEntry.cpp
@@ -1,25 +1,21 @@
 /*  Game Entry
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
-#include "CommonFramework/Inference/BlackScreenDetector.h"
 #include "CommonFramework/Tools/ErrorDumper.h"
 #include "CommonFramework/Tools/ProgramEnvironment.h"
-#include "NintendoSwitch/NintendoSwitch_Settings.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "CommonTools/VisualDetectors/BlackScreenDetector.h"
 #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Routines.h"
 #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
 #include "PokemonBDSP/PokemonBDSP_Settings.h"
 #include "PokemonBDSP_GameEntry.h"
 
-#include <iostream>
-using std::cout;
-using std::endl;
+//#include <iostream>
+//using std::cout;
+//using std::endl;
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
@@ -27,40 +23,40 @@ namespace PokemonBDSP{
 
 
 bool gamemenu_to_ingame(
-    ConsoleHandle& console, BotBaseContext& context,
-    uint16_t mash_duration, uint16_t enter_game_timeout
+    VideoStream& stream, ProControllerContext& context,
+    Milliseconds mash_duration, Milliseconds enter_game_timeout
 ){
-    console.log("Mashing A to enter game...");
+    stream.log("Mashing A to enter game...");
     BlackScreenOverWatcher detector(COLOR_RED, {0.2, 0.2, 0.6, 0.6});
     pbf_mash_button(context, BUTTON_ZL, mash_duration);
     context.wait_for_all_requests();
-    console.log("Waiting to enter game...");
+    stream.log("Waiting to enter game...");
     int ret = wait_until(
-        console, context,
-        std::chrono::milliseconds(enter_game_timeout * (1000 / TICKS_PER_SECOND)),
+        stream, context,
+        enter_game_timeout,
         {{detector}}
     );
     if (ret == 0){
-        console.log("Entered game!");
+        stream.log("Entered game!");
         return true;
     }else{
-        console.log("Timed out waiting to enter game.", COLOR_RED);
+        stream.log("Timed out waiting to enter game.", COLOR_RED);
         return false;
     }
 }
 bool openedgame_to_ingame(
-    ProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context,
-    uint16_t load_game_timeout,
-    uint16_t mash_duration, uint16_t enter_game_timeout,
-    uint16_t post_wait_time
+    ProgramEnvironment& env, VideoStream& stream, ProControllerContext& context,
+    Milliseconds load_game_timeout,
+    Milliseconds mash_duration, Milliseconds enter_game_timeout,
+    Milliseconds post_wait_time
 ){
     bool ok = true;
-    ok &= openedgame_to_gamemenu(console, context, load_game_timeout);
-    ok &= gamemenu_to_ingame(console, context, mash_duration, enter_game_timeout);
+    ok &= openedgame_to_gamemenu(stream, context, load_game_timeout);
+    ok &= gamemenu_to_ingame(stream, context, mash_duration, enter_game_timeout);
     if (!ok){
-        dump_image(console.logger(), env.program_info(), "StartGame", console.video().snapshot());
+        dump_image(stream.logger(), env.program_info(), stream.video(), "StartGame");
     }
-    console.log("Entered game! Waiting out grace period.");
+    stream.log("Entered game! Waiting out grace period.");
     pbf_wait(context, post_wait_time);
     context.wait_for_all_requests();
     return ok;
@@ -70,32 +66,18 @@ bool openedgame_to_ingame(
 
 
 bool reset_game_from_home(
-    ProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context,
+    ProgramEnvironment& env,
+    ConsoleHandle& console, ProControllerContext& context,
     bool tolerate_update_menu,
-    uint16_t post_wait_time
+    Milliseconds post_wait_time
 ){
-    bool video_available = (bool)console.video().snapshot();
-    if (video_available ||
-        ConsoleSettings::instance().START_GAME_REQUIRES_INTERNET ||
-        tolerate_update_menu
-    ){
-        close_game(context);
-        start_game_from_home(
-            console,
-            context,
-            tolerate_update_menu,
-            0, 0,
-            GameSettings::instance().START_GAME_MASH
-        );
-    }else{
-        pbf_press_button(context, BUTTON_X, 50, 0);
-        pbf_mash_button(context, BUTTON_A, GameSettings::instance().START_GAME_MASH);
-    }
+    from_home_close_and_reopen_game(console, context, true);
+
     bool ret = openedgame_to_ingame(
         env, console, context,
-        GameSettings::instance().START_GAME_WAIT,
-        GameSettings::instance().ENTER_GAME_MASH,
-        GameSettings::instance().ENTER_GAME_WAIT,
+        GameSettings::instance().START_GAME_WAIT0,
+        GameSettings::instance().ENTER_GAME_MASH0,
+        GameSettings::instance().ENTER_GAME_WAIT0,
         post_wait_time
     );
     context.wait_for_all_requests();
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_GameEntry.h b/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_GameEntry.h
index 35ba5fc8bd..be04f46e87 100644
--- a/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_GameEntry.h
+++ b/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_GameEntry.h
@@ -1,35 +1,28 @@
 /*  Game Entry
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifndef PokemonAutomation_PokemonBDSP_GameEntry_H
 #define PokemonAutomation_PokemonBDSP_GameEntry_H
 
-#include "CommonFramework/Tools/ConsoleHandle.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+#include "NintendoSwitch/NintendoSwitch_ConsoleHandle.h"
 
 namespace PokemonAutomation{
-    class BotBaseContext;
     class ProgramEnvironment;
 namespace NintendoSwitch{
 namespace PokemonBDSP{
 
+using namespace std::chrono_literals;
+
 
-bool gamemenu_to_ingame(
-    ConsoleHandle& console, BotBaseContext& context,
-    uint16_t mash_duration, uint16_t enter_game_timeout
-);
-bool openedgame_to_ingame(
-    ProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context,
-    uint16_t load_game_timeout,
-    uint16_t mash_duration, uint16_t enter_game_timeout,
-    uint16_t post_wait_time = 125
-);
 bool reset_game_from_home(
-    ProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context,
+    ProgramEnvironment& env,
+    ConsoleHandle& console, ProControllerContext& context,
     bool tolerate_update_menu,
-    uint16_t post_wait_time = 125
+    Milliseconds post_wait_time = 1000ms
 );
 
 
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_GameNavigation.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_GameNavigation.cpp
index 7293dcaa25..35d8083ce7 100644
--- a/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_GameNavigation.cpp
+++ b/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_GameNavigation.cpp
@@ -1,11 +1,11 @@
 /*  Game Entry
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include "CommonFramework/Exceptions/OperationFailedException.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonTools/Async/InferenceRoutines.h"
 #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
 #include "PokemonBDSP/PokemonBDSP_Settings.h"
 #include "PokemonBDSP/Inference/PokemonBDSP_MenuDetector.h"
@@ -17,29 +17,30 @@ namespace NintendoSwitch{
 namespace PokemonBDSP{
 
 
+
 //  Non-Feedback
 
-void save_game(BotBaseContext& context){
-    pbf_press_button(context, BUTTON_X, 10, GameSettings::instance().OVERWORLD_TO_MENU_DELAY);
-    pbf_press_button(context, BUTTON_R, 10, 2 * TICKS_PER_SECOND);
-    pbf_press_button(context, BUTTON_ZL, 10, 5 * TICKS_PER_SECOND);
+void save_game(ProControllerContext& context){
+    pbf_press_button(context, BUTTON_X, 80ms, GameSettings::instance().OVERWORLD_TO_MENU_DELAY0);
+    pbf_press_button(context, BUTTON_R, 80ms, 2000ms);
+    pbf_press_button(context, BUTTON_ZL, 80ms, 5000ms);
 }
-void menu_to_box(BotBaseContext& context){
-    uint16_t MENU_TO_POKEMON_DELAY = GameSettings::instance().MENU_TO_POKEMON_DELAY;
-    pbf_mash_button(context, BUTTON_ZL, 30);
-    if (MENU_TO_POKEMON_DELAY > 30){
-        pbf_wait(context, MENU_TO_POKEMON_DELAY - 30);
+void menu_to_box(ProControllerContext& context){
+    Milliseconds MENU_TO_POKEMON_DELAY = GameSettings::instance().MENU_TO_POKEMON_DELAY0;
+    pbf_mash_button(context, BUTTON_ZL, 240ms);
+    if (MENU_TO_POKEMON_DELAY > 240ms){
+        pbf_wait(context, MENU_TO_POKEMON_DELAY - 240ms);
     }
 
-    pbf_press_button(context, BUTTON_R, 20, GameSettings::instance().POKEMON_TO_BOX_DELAY0);
+    pbf_press_button(context, BUTTON_R, 160ms, GameSettings::instance().POKEMON_TO_BOX_DELAY1);
 }
-void overworld_to_box(BotBaseContext& context){
-    pbf_press_button(context, BUTTON_X, 20, GameSettings::instance().OVERWORLD_TO_MENU_DELAY);
-//    pbf_press_button(context, BUTTON_ZL, 20, GameSettings::instance().MENU_TO_POKEMON_DELAY);
+void overworld_to_box(ProControllerContext& context){
+    pbf_press_button(context, BUTTON_X, 160ms, GameSettings::instance().OVERWORLD_TO_MENU_DELAY0);
+//    pbf_press_button(context, BUTTON_ZL, 160ms, GameSettings::instance().MENU_TO_POKEMON_DELAY);
 
     menu_to_box(context);
 }
-void box_to_overworld(BotBaseContext& context){
+void box_to_overworld(ProControllerContext& context){
     //  There are two states here which need to be merged:
     //      1.  The depositing column was empty. The party has been swapped and
     //          it's sitting in the box with no held pokemon.
@@ -52,80 +53,73 @@ void box_to_overworld(BotBaseContext& context){
     //  In state (2):   The 1st B will drop the party pokemon. The 2nd B will
     //                  back out of the box.
 
-    pbf_press_button(context, BUTTON_B, 20, 30);
-    pbf_press_button(context, BUTTON_B, 20, GameSettings::instance().BOX_TO_POKEMON_DELAY);
+    pbf_press_button(context, BUTTON_B, 160ms, 240ms);
+    pbf_press_button(context, BUTTON_B, 160ms, GameSettings::instance().BOX_TO_POKEMON_DELAY0);
 
-    pbf_press_button(context, BUTTON_B, 20, GameSettings::instance().POKEMON_TO_MENU_DELAY);
-    pbf_press_button(context, BUTTON_X, 20, GameSettings::instance().MENU_TO_OVERWORLD_DELAY);
+    pbf_press_button(context, BUTTON_B, 160ms, GameSettings::instance().POKEMON_TO_MENU_DELAY0);
+    pbf_press_button(context, BUTTON_X, 160ms, GameSettings::instance().MENU_TO_OVERWORLD_DELAY0);
 }
 
 
 
 //  Feedback
 
-void overworld_to_menu(ConsoleHandle& console, BotBaseContext& context){
-    pbf_press_button(context, BUTTON_X, 20, 105);
+void overworld_to_menu(VideoStream& stream, ProControllerContext& context){
+    pbf_press_button(context, BUTTON_X, 160ms, 840ms);
     context.wait_for_all_requests();
     {
         MenuWatcher detector;
         int ret = wait_until(
-            console, context, std::chrono::seconds(10),
+            stream, context, std::chrono::seconds(10),
             {{detector}}
         );
         if (ret < 0){
-            throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, console,
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
                 "Menu not detected after 10 seconds.",
-                true
+                stream
             );
         }
-        console.log("Detected menu.");
+        stream.log("Detected menu.");
     }
     context.wait_for(std::chrono::milliseconds(100));
 }
 
-void save_game(ConsoleHandle& console, BotBaseContext& context){
-    overworld_to_menu(console, context);
-    pbf_press_button(context, BUTTON_R, 10, 2 * TICKS_PER_SECOND);
-    pbf_press_button(context, BUTTON_ZL, 10, 5 * TICKS_PER_SECOND);
+void save_game(VideoStream& stream, ProControllerContext& context){
+    overworld_to_menu(stream, context);
+    pbf_press_button(context, BUTTON_R, 80ms, 2000ms);
+    pbf_press_button(context, BUTTON_ZL, 80ms, 5000ms);
 }
 
-void overworld_to_box(ConsoleHandle& console, BotBaseContext& context){
+void overworld_to_box(VideoStream& stream, ProControllerContext& context){
     //  Open menu.
-    overworld_to_menu(console, context);
+    overworld_to_menu(stream, context);
 
     //  Enter Pokemon
-    uint16_t MENU_TO_POKEMON_DELAY = GameSettings::instance().MENU_TO_POKEMON_DELAY;
-#if 0
-//    pbf_mash_button(context, BUTTON_ZL, 30);
-    if (MENU_TO_POKEMON_DELAY > 30){
-        pbf_wait(context, MENU_TO_POKEMON_DELAY - 30);
-    }
-#else
-    pbf_press_button(context, BUTTON_ZL, 20, MENU_TO_POKEMON_DELAY);
-#endif
+    Milliseconds MENU_TO_POKEMON_DELAY = GameSettings::instance().MENU_TO_POKEMON_DELAY0;
+    pbf_press_button(context, BUTTON_ZL, 160ms, MENU_TO_POKEMON_DELAY);
 
     //  Enter box system.
-    pbf_press_button(context, BUTTON_R, 20, 105);
+    pbf_press_button(context, BUTTON_R, 160ms, 840ms);
     context.wait_for_all_requests();
     {
         BoxWatcher detector;
         int ret = wait_until(
-            console, context, std::chrono::seconds(10),
+            stream, context, std::chrono::seconds(10),
             {{detector}}
         );
         if (ret < 0){
-            throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, console,
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
                 "Box system not detected after 10 seconds.",
-                true
+                stream
             );
         }
-        console.log("Detected box system.");
+        stream.log("Detected box system.");
     }
     context.wait_for(std::chrono::milliseconds(500));
 }
-void box_to_overworld(ConsoleHandle& console, BotBaseContext& context){
+void box_to_overworld(VideoStream& stream, ProControllerContext& context){
     //  There are two states here which need to be merged:
     //      1.  The depositing column was empty. The party has been swapped and
     //          it's sitting in the box with no held pokemon.
@@ -137,30 +131,30 @@ void box_to_overworld(ConsoleHandle& console, BotBaseContext& context){
     //                  be swallowed by the animation.
     //  In state (2):   The 1st B will drop the party pokemon. The 2nd B will
     //                  back out of the box.
-    pbf_press_button(context, BUTTON_B, 20, 30);
-    pbf_press_button(context, BUTTON_B, 20, GameSettings::instance().BOX_TO_POKEMON_DELAY);
+    pbf_press_button(context, BUTTON_B, 160ms, 240ms);
+    pbf_press_button(context, BUTTON_B, 160ms, GameSettings::instance().BOX_TO_POKEMON_DELAY0);
 
     //  To menu.
-    pbf_press_button(context, BUTTON_B, 20, 105);
+    pbf_press_button(context, BUTTON_B, 160ms, 840ms);
     context.wait_for_all_requests();
     {
         MenuWatcher detector;
         int ret = wait_until(
-            console, context, std::chrono::seconds(10),
+            stream, context, std::chrono::seconds(10),
             {{detector}}
         );
         if (ret < 0){
-            throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, console,
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
                 "Menu not detected after 10 seconds.",
-                true
+                stream
             );
         }
-        console.log("Detected menu.");
+        stream.log("Detected menu.");
     }
 
     //  To overworld.
-    pbf_press_button(context, BUTTON_X, 20, GameSettings::instance().MENU_TO_OVERWORLD_DELAY);
+    pbf_press_button(context, BUTTON_X, 160ms, GameSettings::instance().MENU_TO_OVERWORLD_DELAY0);
 }
 
 
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_GameNavigation.h b/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_GameNavigation.h
index b254c95182..524a01684b 100644
--- a/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_GameNavigation.h
+++ b/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_GameNavigation.h
@@ -1,36 +1,36 @@
 /*  Game Navigation
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifndef PokemonAutomation_PokemonBDSP_GameNavigation_H
 #define PokemonAutomation_PokemonBDSP_GameNavigation_H
 
-#include "CommonFramework/Tools/ConsoleHandle.h"
+#include "CommonFramework/Tools/VideoStream.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
 
 namespace PokemonAutomation{
-    class BotBaseContext;
 namespace NintendoSwitch{
 namespace PokemonBDSP{
 
 
 //  Non-Feedback
 
-void save_game(BotBaseContext& context);
+void save_game(ProControllerContext& context);
 
-void menu_to_box(BotBaseContext& context);
-void overworld_to_box(BotBaseContext& context);
-void box_to_overworld(BotBaseContext& context);
+void menu_to_box(ProControllerContext& context);
+void overworld_to_box(ProControllerContext& context);
+void box_to_overworld(ProControllerContext& context);
 
 
 //  Feedback
 
-void overworld_to_menu(ConsoleHandle& console, BotBaseContext& context);
-void save_game(ConsoleHandle& console, BotBaseContext& context);
+void overworld_to_menu(VideoStream& stream, ProControllerContext& context);
+void save_game(VideoStream& stream, ProControllerContext& context);
 
-void overworld_to_box(ConsoleHandle& console, BotBaseContext& context);
-void box_to_overworld(ConsoleHandle& console, BotBaseContext& context);
+void overworld_to_box(VideoStream& stream, ProControllerContext& context);
+void box_to_overworld(VideoStream& stream, ProControllerContext& context);
 
 
 }
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_GlobalRoomHeal.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_GlobalRoomHeal.cpp
index a4ccc9b813..b94c77b358 100644
--- a/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_GlobalRoomHeal.cpp
+++ b/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_GlobalRoomHeal.cpp
@@ -1,11 +1,11 @@
 /*  Heal the party using Global Room
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include "CommonFramework/Exceptions/OperationFailedException.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonTools/Async/InferenceRoutines.h"
 #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
 #include "PokemonBDSP/Inference/PokemonBDSP_SelectionArrow.h"
 #include "PokemonBDSP_GlobalRoomHeal.h"
@@ -16,43 +16,43 @@ namespace PokemonBDSP{
 
 
 
-bool heal_by_global_room(ConsoleHandle& console, BotBaseContext& context){
-    console.overlay().add_log("Heal by Global Room", COLOR_WHITE);
+bool heal_by_global_room(VideoStream& stream, ProControllerContext& context){
+    stream.overlay().add_log("Heal by Global Room", COLOR_WHITE);
     // Go to union room menu.
-    const uint16_t overworld_to_room_delay = 125;
-    pbf_press_button(context, BUTTON_Y, 10, overworld_to_room_delay);
+    const Milliseconds overworld_to_room_delay = 1000ms;
+    pbf_press_button(context, BUTTON_Y, 80ms, overworld_to_room_delay);
 
     // Go to global room.
-    pbf_press_dpad(context, DPAD_RIGHT, 10, 100);
+    pbf_press_dpad(context, DPAD_RIGHT, 80ms, 800ms);
 
     // Press ZL until we are at:
     // - "Would you like to enter the Global Room?" To select: "Yes" and other options.
-    SelectionArrowFinder arrow(console, {0.50, 0.45, 0.20, 0.20}, COLOR_GREEN);
-    int ret = run_until(
-        console, context,
-        [](BotBaseContext& context){
+    SelectionArrowFinder arrow(stream.overlay(), {0.50, 0.45, 0.20, 0.20}, COLOR_GREEN);
+    int ret = run_until<ProControllerContext>(
+        stream, context,
+        [](ProControllerContext& context){
             for (int i = 0; i < 5; i++){
-                pbf_press_button(context, BUTTON_ZL, 10, 125);
+                pbf_press_button(context, BUTTON_ZL, 80ms, 1000ms);
             }
         },
         {{arrow}}
     );
     if (ret < 0){
-        throw OperationFailedException(
-            ErrorReport::SEND_ERROR_REPORT, console,
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
             "No selection arrow detected when using Global Room.",
-            true
+            stream
         );
     }
 
     // Select "Yes"
-    pbf_press_button(context, BUTTON_ZL, 10, 125);
+    pbf_press_button(context, BUTTON_ZL, 80ms, 1000ms);
     
     // Then mash B to leave Union Room
-    pbf_mash_button(context, BUTTON_B, 400);
+    pbf_mash_button(context, BUTTON_B, 3200ms);
 
     context.wait_for_all_requests();
-    console.overlay().add_log("Heal complete", COLOR_WHITE);
+    stream.overlay().add_log("Heal complete", COLOR_WHITE);
     return true;
 }
 
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_GlobalRoomHeal.h b/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_GlobalRoomHeal.h
index afee824d72..93f27ff5fd 100644
--- a/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_GlobalRoomHeal.h
+++ b/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_GlobalRoomHeal.h
@@ -1,23 +1,23 @@
 /*  Heal the party using Global Room
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifndef PokemonAutomation_PokemonBDSP_GlobalRoomHeal_H
 #define PokemonAutomation_PokemonBDSP_GlobalRoomHeal_H
 
-#include "CommonFramework/Tools/ConsoleHandle.h"
+#include "CommonFramework/Tools/VideoStream.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
 
 namespace PokemonAutomation{
-    class BotBaseContext;
 namespace NintendoSwitch{
 namespace PokemonBDSP{
 
 
 // Use Global Room to heal the party.
 // Must start at overworld and have Y-shotcut to Global Room unlocked.
-bool heal_by_global_room(ConsoleHandle& console, BotBaseContext& context);
+bool heal_by_global_room(VideoStream& stream, ProControllerContext& context);
 
 
 }
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_OverworldTrigger.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_OverworldTrigger.cpp
index 45f9f8455d..4ba3d4a357 100644
--- a/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_OverworldTrigger.cpp
+++ b/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_OverworldTrigger.cpp
@@ -1,19 +1,18 @@
 /*  Overworld Trigger
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include "CommonFramework/Exceptions/OperationFailedException.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
-#include "CommonFramework/VideoPipeline/VideoOverlay.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonTools/Async/InferenceRoutines.h"
 #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
 #include "PokemonBDSP/PokemonBDSP_Settings.h"
 #include "PokemonBDSP/Inference/Battles/PokemonBDSP_BattleMenuDetector.h"
 #include "PokemonBDSP/Inference/Battles/PokemonBDSP_StartBattleDetector.h"
 #include "PokemonBDSP_OverworldTrigger.h"
 #include "PokemonBDSP_GameNavigation.h"
-#include <iostream>
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
@@ -22,7 +21,7 @@ namespace PokemonBDSP{
 
 
 OverworldTrigger::OverworldTrigger()
-    : GroupOption("Trigger Method", LockWhileRunning::LOCKED)
+    : GroupOption("Trigger Method", LockMode::LOCK_WHILE_RUNNING)
     , TRIGGER_METHOD(
         "<b>Maneuver:</b><br>How to trigger an encounter",
         {
@@ -34,14 +33,13 @@ OverworldTrigger::OverworldTrigger()
             {TriggerMethod::VERTICAL_BIAS_DOWN,     "vertical-down",    "Move up/down. (bias down)"},
             {TriggerMethod::SWEET_SCENT,            "sweet-scent",      "Sweet scent"},
         },
-        LockWhileRunning::LOCKED,
+        LockMode::LOCK_WHILE_RUNNING,
         TriggerMethod::HORIZONTAL_NO_BIAS
     )
-    , MOVE_DURATION(
+    , MOVE_DURATION0(
         "<b>Move Duration:</b><br>Move in each direction for this long before turning around.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "1 * TICKS_PER_SECOND"
+        LockMode::LOCK_WHILE_RUNNING,
+        "1000 ms"
     )
     , SWEET_SCENT_POKEMON_LOCATION(
         "<b>Sweet Scent Pokemon Location:</b><br>Which Pokemon in the party knows Sweet Scent.",
@@ -53,63 +51,72 @@ OverworldTrigger::OverworldTrigger()
             {4, "slot5", "2nd last"},
             {5, "slot6", "Last"},
         },
-        LockWhileRunning::LOCKED,
+        LockMode::LOCK_WHILE_RUNNING,
         0
     )
 {
     PA_ADD_OPTION(TRIGGER_METHOD);
-    PA_ADD_OPTION(MOVE_DURATION);
+    PA_ADD_OPTION(MOVE_DURATION0);
     PA_ADD_OPTION(SWEET_SCENT_POKEMON_LOCATION);
 }
 
 
-void OverworldTrigger::run_trigger(BotBaseContext& context) const{
+void OverworldTrigger::run_trigger(ProControllerContext& context) const{
+    Milliseconds normal_duration = MOVE_DURATION0;
+    Milliseconds biased_duration = MOVE_DURATION0.get() + 200ms;
+    Milliseconds mash_duration = normal_duration - 64ms;
     switch (TRIGGER_METHOD){
     case TriggerMethod::HORIZONTAL_NO_BIAS:
-        pbf_controller_state(context, BUTTON_B, DPAD_NONE, 0, 128, 128, 128, MOVE_DURATION);
-//        pbf_move_left_joystick(context, 0, 128, MOVE_DURATION, 0);
-        pbf_move_left_joystick(context, 255, 128, MOVE_DURATION, 0);
+        ssf_press_left_joystick(context, {-1, 0}, 0ms, normal_duration);
+        ssf_mash1_button(context, BUTTON_B, mash_duration);
+        ssf_press_left_joystick(context, {+1, 0}, 0ms, normal_duration);
+        ssf_mash1_button(context, BUTTON_B, mash_duration);
         break;
     case TriggerMethod::HORIZONTAL_BIAS_LEFT:
-        pbf_controller_state(context, BUTTON_B, DPAD_NONE, 0, 128, 128, 128, MOVE_DURATION + 25);
-//        pbf_move_left_joystick(context, 0, 128, MOVE_DURATION + 25, 0);
-        pbf_move_left_joystick(context, 255, 128, MOVE_DURATION, 0);
+        ssf_press_left_joystick(context, {-1, 0}, 0ms, biased_duration);
+        ssf_mash1_button(context, BUTTON_B, mash_duration);
+        ssf_press_left_joystick(context, {+1, 0}, 0ms, normal_duration);
+        ssf_mash1_button(context, BUTTON_B, mash_duration);
         break;
     case TriggerMethod::HORIZONTAL_BIAS_RIGHT:
-        pbf_controller_state(context, BUTTON_B, DPAD_NONE, 255, 128, 128, 128, MOVE_DURATION + 25);
-//        pbf_move_left_joystick(context, 255, 128, MOVE_DURATION + 25, 0);
-        pbf_move_left_joystick(context, 0, 128, MOVE_DURATION, 0);
+        ssf_press_left_joystick(context, {+1, 0}, 0ms, biased_duration);
+        ssf_mash1_button(context, BUTTON_B, mash_duration);
+        ssf_press_left_joystick(context, {-1, 0}, 0ms, normal_duration);
+        ssf_mash1_button(context, BUTTON_B, mash_duration);
         break;
     case TriggerMethod::VERTICAL_NO_BIAS:
-        pbf_controller_state(context, BUTTON_B, DPAD_NONE, 128, 0, 128, 128, MOVE_DURATION);
-//        pbf_move_left_joystick(context, 128, 0, MOVE_DURATION, 0);
-        pbf_move_left_joystick(context, 128, 255, MOVE_DURATION, 0);
+        ssf_press_left_joystick(context, {0, +1}, 0ms, normal_duration);
+        ssf_mash1_button(context, BUTTON_B, mash_duration);
+        ssf_press_left_joystick(context, {0, -1}, 0ms, normal_duration);
+        ssf_mash1_button(context, BUTTON_B, mash_duration);
         break;
     case TriggerMethod::VERTICAL_BIAS_UP:
-        pbf_controller_state(context, BUTTON_B, DPAD_NONE, 128, 0, 128, 128, MOVE_DURATION + 25);
-//        pbf_move_left_joystick(context, 128, 0, MOVE_DURATION + 25, 0);
-        pbf_move_left_joystick(context, 128, 255, MOVE_DURATION, 0);
+        ssf_press_left_joystick(context, {0, +1}, 0ms, biased_duration);
+        ssf_mash1_button(context, BUTTON_B, mash_duration);
+        ssf_press_left_joystick(context, {0, -1}, 0ms, normal_duration);
+        ssf_mash1_button(context, BUTTON_B, mash_duration);
         break;
     case TriggerMethod::VERTICAL_BIAS_DOWN:
-        pbf_controller_state(context, BUTTON_B, DPAD_NONE, 128, 255, 128, 128, MOVE_DURATION + 25);
-//        pbf_move_left_joystick(context, 128, 255, MOVE_DURATION + 25, 0);
-        pbf_move_left_joystick(context, 128, 0, MOVE_DURATION, 0);
+        ssf_press_left_joystick(context, {0, -1}, 0ms, biased_duration);
+        ssf_mash1_button(context, BUTTON_B, mash_duration);
+        ssf_press_left_joystick(context, {0, +1}, 0ms, normal_duration);
+        ssf_mash1_button(context, BUTTON_B, mash_duration);
         break;
     default:;
     }
 }
 
-bool OverworldTrigger::find_encounter(ConsoleHandle& console, BotBaseContext& context) const{
+bool OverworldTrigger::find_encounter(VideoStream& stream, ProControllerContext& context) const{
     BattleMenuWatcher battle_menu_detector(BattleType::STANDARD);
-    StartBattleDetector start_battle_detector(console);
+    StartBattleDetector start_battle_detector(stream.overlay());
 
-    int result = 0;
+    int ret = 0;
     if (TRIGGER_METHOD != TriggerMethod::SWEET_SCENT){
         //  Move character back and forth to trigger encounter.
-        result = run_until(
-            console, context,
-            [&](BotBaseContext& context){
-                while (true) {
+        ret = run_until<ProControllerContext>(
+            stream, context,
+            [&](ProControllerContext& context){
+                while (true){
                     run_trigger(context);
                 }
             },
@@ -119,60 +126,60 @@ bool OverworldTrigger::find_encounter(ConsoleHandle& console, BotBaseContext& co
             }
         );
     }else{
-        console.overlay().add_log("Using Sweet Scent", COLOR_CYAN);
+        stream.overlay().add_log("Using Sweet Scent", COLOR_CYAN);
         //  Use Sweet Scent to trigger encounter.
-        overworld_to_menu(console, context);
+        overworld_to_menu(stream, context);
 
         //  Go to pokemon page
-        const uint16_t MENU_TO_POKEMON_DELAY = GameSettings::instance().MENU_TO_POKEMON_DELAY;
-        pbf_press_button(context, BUTTON_ZL, 20, MENU_TO_POKEMON_DELAY);
+        const Milliseconds MENU_TO_POKEMON_DELAY = GameSettings::instance().MENU_TO_POKEMON_DELAY0;
+        pbf_press_button(context, BUTTON_ZL, 160ms, MENU_TO_POKEMON_DELAY);
 
         //  Go to the pokemon that knows Sweet Scent
         const size_t location = SWEET_SCENT_POKEMON_LOCATION.current_value();
-        const uint16_t change_pokemon_delay = 20;
+        const Milliseconds change_pokemon_delay = 160ms;
         if (location >= 1 && location <= 3){
             const size_t move_down_times = location;
-            for(size_t i = 0; i < move_down_times; ++i){
-                pbf_press_dpad(context, DPAD_DOWN, 1, change_pokemon_delay);
+            for (size_t i = 0; i < move_down_times; ++i){
+                pbf_press_dpad(context, DPAD_DOWN, 160ms, change_pokemon_delay);
             }
         }else if (location >= 1){ // for location 4 and 5
             const size_t move_down_times = 6 - location;
             for (size_t i = 0; i < move_down_times; ++i){
-                pbf_press_dpad(context, DPAD_UP, 1, change_pokemon_delay);
+                pbf_press_dpad(context, DPAD_UP, 160ms, change_pokemon_delay);
             }
         }
 
         //  Open the pokemon menu of the selected pokemon
-        const uint16_t pokemon_to_pokemon_menu_delay = 30;
-        pbf_press_button(context, BUTTON_ZL, 20, pokemon_to_pokemon_menu_delay);
+        const Milliseconds pokemon_to_pokemon_menu_delay = 240ms;
+        pbf_press_button(context, BUTTON_ZL, 160ms, pokemon_to_pokemon_menu_delay);
         //  Move down one menuitem to select "Sweet Scent"
-        const uint16_t move_pokemon_menu_item_delay = 30;
-        pbf_press_dpad(context, DPAD_DOWN, 1, move_pokemon_menu_item_delay);
+        const Milliseconds move_pokemon_menu_item_delay = 240ms;
+        pbf_press_dpad(context, DPAD_DOWN, 160ms, move_pokemon_menu_item_delay);
         //  Use sweet scent
-        pbf_mash_button(context, BUTTON_ZL, 30);
+        pbf_mash_button(context, BUTTON_ZL, 240ms);
 
-        result = wait_until(
-            console, context, std::chrono::seconds(30),
+        ret = wait_until(
+            stream, context, std::chrono::seconds(30),
             {
                 {battle_menu_detector},
                 {start_battle_detector},
             }
         );
-        if (result < 0){
-            throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, console,
+        if (ret < 0){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
                 "Battle not detected after Sweet Scent for 30 seconds.",
-                true
+                stream
             );
         }
     }
 
-    switch (result){
+    switch (ret){
     case 0:
-        console.log("Unexpected Battle.", COLOR_RED);
+        stream.log("Unexpected Battle.", COLOR_RED);
         return false;
     case 1:
-        console.log("Battle started!");
+        stream.log("Battle started!");
         return true;
     }
     return false;
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_OverworldTrigger.h b/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_OverworldTrigger.h
index 3f18a32efe..d17f43063b 100644
--- a/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_OverworldTrigger.h
+++ b/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_OverworldTrigger.h
@@ -1,6 +1,6 @@
 /*  Overworld Trigger
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -9,9 +9,9 @@
 
 #include "Common/Cpp/Options/GroupOption.h"
 #include "Common/Cpp/Options/EnumDropdownOption.h"
-#include "Common/Cpp/Options/TimeExpressionOption.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-#include "CommonFramework/Tools/ConsoleHandle.h"
+#include "Common/Cpp/Options/TimeDurationOption.h"
+#include "CommonFramework/Tools/VideoStream.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
@@ -27,11 +27,11 @@ class OverworldTrigger : public GroupOption{
     //  Return false if an unexpected battle happens where the battle menu is detected but
     //  not the starting animation.
     //  Throw exception if inference times out after Sweet Scent is used.
-    bool find_encounter(ConsoleHandle& console, BotBaseContext& context) const;
+    bool find_encounter(VideoStream& stream, ProControllerContext& context) const;
 
 private:
     //  Move character up and down or left and right once.
-    void run_trigger(BotBaseContext& context) const;
+    void run_trigger(ProControllerContext& context) const;
 
 public:
     enum class TriggerMethod{
@@ -45,7 +45,7 @@ class OverworldTrigger : public GroupOption{
     };
 
     EnumDropdownOption<TriggerMethod> TRIGGER_METHOD;
-    TimeExpressionOption<uint16_t> MOVE_DURATION;
+    MillisecondsOption MOVE_DURATION0;
     IntegerEnumDropdownOption SWEET_SCENT_POKEMON_LOCATION;
 };
 
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_RunFromBattle.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_RunFromBattle.cpp
index f22c2e908b..34c703903d 100644
--- a/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_RunFromBattle.cpp
+++ b/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_RunFromBattle.cpp
@@ -1,11 +1,11 @@
 /*  Run from Battle
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
-#include "CommonFramework/Inference/BlackScreenDetector.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "CommonTools/VisualDetectors/BlackScreenDetector.h"
 #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
 #include "PokemonBDSP_RunFromBattle.h"
 
@@ -16,25 +16,25 @@ namespace PokemonBDSP{
 
 
 bool run_from_battle(
-    ConsoleHandle& console, BotBaseContext& context,
-    uint16_t exit_battle_time
+    VideoStream& stream, ProControllerContext& context,
+    Milliseconds exit_battle_time
 ){
     BlackScreenOverWatcher black_screen_detector;
-    int ret = run_until(
-        console, context,
-        [exit_battle_time](BotBaseContext& context){
-            pbf_mash_button(context, BUTTON_ZL, TICKS_PER_SECOND);
-            if (exit_battle_time > TICKS_PER_SECOND){
-                pbf_mash_button(context, BUTTON_B, exit_battle_time - TICKS_PER_SECOND);
+    int ret = run_until<ProControllerContext>(
+        stream, context,
+        [exit_battle_time](ProControllerContext& context){
+            pbf_mash_button(context, BUTTON_ZL, 1000ms);
+            if (exit_battle_time > 1000ms){
+                pbf_mash_button(context, BUTTON_B, exit_battle_time - 1000ms);
             }
         },
         {{black_screen_detector}}
     );
     if (ret < 0){
-        console.log("Timed out waiting for end of battle. Are you stuck in the battle?", COLOR_RED);
+        stream.log("Timed out waiting for end of battle. Are you stuck in the battle?", COLOR_RED);
         return false;
     }
-    pbf_wait(context, TICKS_PER_SECOND);
+    pbf_wait(context, 1000ms);
     context.wait_for_all_requests();
     return true;
 }
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_RunFromBattle.h b/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_RunFromBattle.h
index 62145ef5bd..829e318738 100644
--- a/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_RunFromBattle.h
+++ b/SerialPrograms/Source/PokemonBDSP/Programs/PokemonBDSP_RunFromBattle.h
@@ -1,16 +1,16 @@
 /*  Run from Battle
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifndef PokemonAutomation_PokemonBDSP_RunFromBattle_H
 #define PokemonAutomation_PokemonBDSP_RunFromBattle_H
 
-#include "CommonFramework/Tools/ConsoleHandle.h"
+#include "CommonFramework/Tools/VideoStream.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
 
 namespace PokemonAutomation{
-    class BotBaseContext;
 namespace NintendoSwitch{
 namespace PokemonBDSP{
 
@@ -20,8 +20,8 @@ namespace PokemonBDSP{
 // Return true if a black screen is detected, false if not detected after
 // `exit_battle_time` of ticks have passed. 
 bool run_from_battle(
-    ConsoleHandle& console, BotBaseContext& context,
-    uint16_t exit_battle_time
+    VideoStream& stream, ProControllerContext& context,
+    Milliseconds exit_battle_time
 );
 
 
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/RngManipulation/PokemonBDSP_AdvanceClock.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/RngManipulation/PokemonBDSP_AdvanceClock.cpp
new file mode 100644
index 0000000000..1742c4c476
--- /dev/null
+++ b/SerialPrograms/Source/PokemonBDSP/Programs/RngManipulation/PokemonBDSP_AdvanceClock.cpp
@@ -0,0 +1,44 @@
+/*  BDSP Advance Clock
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <chrono>
+#include "PokemonBDSP_AdvanceClock.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonBDSP{
+
+
+uint64_t AdvanceClock::advance_at(WallClock time) const{
+    double elapsed = std::chrono::duration_cast<std::chrono::duration<double>>(
+        time - anchor_time
+    ).count();
+    double advances = elapsed / tick_seconds * (double)npcs;
+    double position = (double)anchor_advance + advances;
+    return position <= 0 ? 0 : (uint64_t)position;
+}
+
+WallClock AdvanceClock::time_of_advance(uint64_t advance) const{
+    if (npcs == 0){
+        return anchor_time;
+    }
+
+    int64_t ticks = (int64_t)(advance / npcs) - (int64_t)(anchor_advance / npcs);
+    return anchor_time + std::chrono::duration_cast<WallDuration>(
+        std::chrono::duration<double>((double)ticks * tick_seconds)
+    );
+}
+
+WallClock AdvanceClock::middle_of_advance(uint64_t advance) const{
+    return time_of_advance(advance) - std::chrono::duration_cast<WallDuration>(
+        std::chrono::duration<double>(tick_seconds / 2)
+    );
+}
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/RngManipulation/PokemonBDSP_AdvanceClock.h b/SerialPrograms/Source/PokemonBDSP/Programs/RngManipulation/PokemonBDSP_AdvanceClock.h
new file mode 100644
index 0000000000..2f94dffa9a
--- /dev/null
+++ b/SerialPrograms/Source/PokemonBDSP/Programs/RngManipulation/PokemonBDSP_AdvanceClock.h
@@ -0,0 +1,39 @@
+/*  BDSP Advance Clock
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonBDSP_AdvanceClock_H
+#define PokemonAutomation_PokemonBDSP_AdvanceClock_H
+
+#include <stdint.h>
+#include "Common/Cpp/Time.h"
+#include "PokemonBDSP_BlinkModel.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonBDSP{
+
+
+struct AdvanceClock{
+    WallClock anchor_time{};
+    uint64_t anchor_advance = 0;
+    double tick_seconds = BDSP_NPC_TICK_SECONDS;
+    uint8_t npcs = 1;
+
+    uint64_t advance_at(WallClock time) const;
+
+
+    //  the tick's leading edge, not necessarily safe to aim at
+    WallClock time_of_advance(uint64_t advance) const;
+
+    //  half a tick earlier
+    WallClock middle_of_advance(uint64_t advance) const;
+};
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/RngManipulation/PokemonBDSP_BedroomSeedFinder.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/RngManipulation/PokemonBDSP_BedroomSeedFinder.cpp
new file mode 100644
index 0000000000..fbbaaa91eb
--- /dev/null
+++ b/SerialPrograms/Source/PokemonBDSP/Programs/RngManipulation/PokemonBDSP_BedroomSeedFinder.cpp
@@ -0,0 +1,101 @@
+/*  BDSP Bedroom Seed Finder
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <stdint.h>
+#include <memory>
+#include <string>
+#include <vector>
+#include "Common/Cpp/Exceptions.h"
+#include "Common/Cpp/PrettyPrint.h"
+#include "CommonFramework/ImageTypes/ImageRGB32.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "PokemonBDSP/Inference/Rng/PokemonBDSP_BlinkScenes.h"
+#include "PokemonBDSP/Inference/Rng/PokemonBDSP_EyeBlinkDetector.h"
+#include "PokemonBDSP_BedroomSeedFinder.h"
+#include "PokemonBDSP_BlinkRecovery.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonBDSP{
+    using namespace Pokemon;
+
+
+
+BedroomSeedFinder_Descriptor::BedroomSeedFinder_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonBDSP:BedroomSeedFinder",
+        STRING_POKEMON + " BDSP", "Bedroom Seed Finder",
+        "",
+        "Recover the RNG seed by watching the player character's blinks in their bedroom.",
+        PanelQualityStanding::OFFICIAL_BETA,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::ENABLE_COMMANDS
+    )
+{}
+
+
+BedroomSeedFinder::BedroomSeedFinder()
+    : GO_HOME_WHEN_DONE(false)
+{
+    PA_ADD_OPTION(PLAYER_MODEL);
+    PA_ADD_OPTION(COLLECTION_DISPLAY);
+    PA_ADD_OPTION(STATE_DISPLAY);
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+}
+
+
+void BedroomSeedFinder::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    STATE_DISPLAY.reset();
+    COLLECTION_DISPLAY.reset();
+
+    std::vector<BdspEyeTemplate> setups = bedroom_eye_templates(PLAYER_MODEL.model_number());
+    std::vector<ImageRGB32> eyes = load_eye_templates(setups);
+
+    std::vector<std::unique_ptr<EyeBlinkWatcher>> watchers;
+    std::vector<PeriodicInferenceCallback> callbacks;
+    make_blink_watchers(setups, eyes, watchers, callbacks);
+
+    env.log(
+        "Watching the player blink. The overlay box should be sitting on the player's eye."
+    );
+
+    BlinkRecoveryConfig config;
+    config.npcs = 1;
+
+    BlinkRecovery recovery = recover_state_from_blinks(
+        env, context, watchers, callbacks, COLLECTION_DISPLAY, config
+    );
+    if (!recovery.success){
+        throw UserSetupError(env.logger(),
+            "Gave up: " + recovery.failure_reason + ". Check the overlay box is on the "
+            "player's eye, that the character model above matches the one in game, and that "
+            "the log shows blinks arriving every few seconds."
+        );
+    }
+
+    uint64_t seed0 = 0;
+    uint64_t seed1 = 0;
+    xorshift128_state_to_seed_pair(recovery.state, seed0, seed1);
+
+    env.log("--------");
+    env.log("State confirmed over " + std::to_string(recovery.events) + " rolls.", COLOR_BLUE);
+    env.log("State: " + recovery.state.to_string(), COLOR_BLUE);
+    env.log("PokeFinder seeds: " + tostr_hex_padded(16, seed0)
+        + " " + tostr_hex_padded(16, seed1), COLOR_BLUE);
+
+    STATE_DISPLAY.set_state(recovery.state, recovery.events);
+    STATE_DISPLAY.set_confidence_unique();
+
+    GO_HOME_WHEN_DONE.run_end_of_program(context);
+}
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/RngManipulation/PokemonBDSP_BedroomSeedFinder.h b/SerialPrograms/Source/PokemonBDSP/Programs/RngManipulation/PokemonBDSP_BedroomSeedFinder.h
new file mode 100644
index 0000000000..7fba2930bf
--- /dev/null
+++ b/SerialPrograms/Source/PokemonBDSP/Programs/RngManipulation/PokemonBDSP_BedroomSeedFinder.h
@@ -0,0 +1,47 @@
+/*  BDSP Bedroom Seed Finder
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonBDSP_BedroomSeedFinder_H
+#define PokemonAutomation_PokemonBDSP_BedroomSeedFinder_H
+
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+#include "PokemonBDSP/Options/PokemonBDSP_PlayerModelOption.h"
+#include "PokemonBDSP_RngDisplays.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonBDSP{
+
+
+class BedroomSeedFinder_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    BedroomSeedFinder_Descriptor();
+};
+
+
+class BedroomSeedFinder : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = BedroomSeedFinder_Descriptor;
+    BedroomSeedFinder();
+
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+
+    PlayerModelOption PLAYER_MODEL;
+
+    BlinkCollectionDisplay COLLECTION_DISPLAY;
+    RngStateDisplay STATE_DISPLAY;
+
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
+};
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/RngManipulation/PokemonBDSP_BlinkModel.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/RngManipulation/PokemonBDSP_BlinkModel.cpp
new file mode 100644
index 0000000000..a5d562924a
--- /dev/null
+++ b/SerialPrograms/Source/PokemonBDSP/Programs/RngManipulation/PokemonBDSP_BlinkModel.cpp
@@ -0,0 +1,142 @@
+/*  BDSP Blink Model
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <algorithm>
+#include "Common/Cpp/Exceptions.h"
+#include "PokemonBDSP_BlinkModel.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonBDSP{
+
+
+//  The fraction is 23 bits over 2^23 - 1.
+static const double POKEMON_BLINK_FRACTION_SCALE = 8388607.0;
+static const uint32_t POKEMON_BLINK_FRACTION_MASK = 0x7fffff;
+
+//  Longest and shortest gap the game can produce, and the span between them.
+static const double POKEMON_BLINK_LONGEST_SECONDS =
+    BDSP_POKEMON_BLINK_MAX_SECONDS + BDSP_POKEMON_BLINK_OFFSET_SECONDS;
+static const double POKEMON_BLINK_SPAN_SECONDS =
+    BDSP_POKEMON_BLINK_MAX_SECONDS - BDSP_POKEMON_BLINK_MIN_SECONDS;
+
+
+const char* blink_type_name(BlinkType type){
+    switch (type){
+    case BlinkType::Single: return "Single";
+    case BlinkType::Double: return "Double";
+    }
+    return "?";
+}
+
+double bdsp_range_float(uint32_t roll, double minimum, double maximum){
+    //  23 bits of mantissa divided by 2^23 - 1, not 2^23.
+    double fraction = (double)(roll & POKEMON_BLINK_FRACTION_MASK) / POKEMON_BLINK_FRACTION_SCALE;
+    return fraction * minimum + (1.0 - fraction) * maximum;
+}
+
+double bdsp_pokemon_blink_interval(uint32_t roll){
+    return bdsp_range_float(roll, BDSP_POKEMON_BLINK_MIN_SECONDS, BDSP_POKEMON_BLINK_MAX_SECONDS)
+        + BDSP_POKEMON_BLINK_OFFSET_SECONDS;
+}
+
+
+bool bdsp_pokemon_blink_fraction(double interval_seconds, uint32_t& fraction){
+    //  bdsp_range_float runs backwards, so a longer gap means a smaller fraction.
+    double scaled = (POKEMON_BLINK_LONGEST_SECONDS - interval_seconds) / POKEMON_BLINK_SPAN_SECONDS;
+
+    //  The two extreme intervals are not exactly representable
+    const double SLACK = 1e-9;
+    if (!(scaled >= -SLACK) || scaled > 1.0 + SLACK){
+        //  NaN is rejected rather than sliding through.
+        return false;
+    }
+    scaled = scaled < 0.0 ? 0.0 : scaled;
+
+    double value = scaled * POKEMON_BLINK_FRACTION_SCALE;
+    fraction = value >= (double)POKEMON_BLINK_FRACTION_MASK
+        ? POKEMON_BLINK_FRACTION_MASK
+        : (uint32_t)value;
+    return true;
+}
+
+bool bdsp_pokemon_blink_bucket_with_margin(
+    double interval_seconds, uint32_t& bucket, double& margin_seconds
+){
+    uint32_t fraction = 0;
+    if (!bdsp_pokemon_blink_fraction(interval_seconds, fraction)){
+        return false;
+    }
+
+    const size_t SHIFT = 23 - BDSP_POKEMON_BLINK_KNOWN_BITS;
+    const uint32_t BUCKET_WIDTH = (uint32_t)1 << SHIFT;
+    bucket = fraction >> SHIFT;
+
+    //  Distance to whichever end of the bucket is nearer, converted from fraction
+    //  units back into seconds of timing error.
+    uint32_t into_bucket = fraction - (bucket << SHIFT);
+    uint32_t to_next = BUCKET_WIDTH - into_bucket;
+    uint32_t nearest = into_bucket < to_next ? into_bucket : to_next;
+
+    margin_seconds = (double)nearest
+        * (BDSP_POKEMON_BLINK_MAX_SECONDS - BDSP_POKEMON_BLINK_MIN_SECONDS)
+        / 8388607.0;
+
+    //  An interval near either end of the range has nowhere to be wrong towards,
+    //  so cap the margin by the distance to the range itself.
+    double to_longest = POKEMON_BLINK_LONGEST_SECONDS - interval_seconds;
+    double to_shortest = interval_seconds
+        - (BDSP_POKEMON_BLINK_MIN_SECONDS + BDSP_POKEMON_BLINK_OFFSET_SECONDS);
+    margin_seconds = std::min(margin_seconds, std::min(to_longest, to_shortest));
+    margin_seconds = std::max(margin_seconds, 0.0);
+
+    return true;
+}
+
+std::vector<BlinkTick> generate_blink_ticks(
+    Pokemon::Xorshift128 rng,
+    size_t ticks,
+    uint8_t npcs,
+    uint8_t slot
+){
+    if (npcs == 0){
+        throw InternalProgramError(
+            nullptr, PA_CURRENT_FUNCTION,
+            "generate_blink_ticks(): There must be at least one NPC."
+        );
+    }
+    if (slot >= npcs){
+        throw InternalProgramError(
+            nullptr, PA_CURRENT_FUNCTION,
+            "generate_blink_ticks(): Slot is outside the per-tick order."
+        );
+    }
+
+    std::vector<BlinkTick> ret;
+    ret.reserve(ticks);
+
+    //  Skip forward to the observed NPC's place
+    rng.advance(slot);
+
+    for (size_t c = 0; c < ticks; c++){
+        uint32_t roll = rng.next();
+        BlinkTick tick;
+        tick.blinked = npc_blinks(roll);
+        tick.type = NPC_blink_type(roll);
+        ret.emplace_back(tick);
+
+        rng.advance((uint64_t)npcs - 1);
+    }
+
+    return ret;
+}
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/RngManipulation/PokemonBDSP_BlinkModel.h b/SerialPrograms/Source/PokemonBDSP/Programs/RngManipulation/PokemonBDSP_BlinkModel.h
new file mode 100644
index 0000000000..a6c7b43c0e
--- /dev/null
+++ b/SerialPrograms/Source/PokemonBDSP/Programs/RngManipulation/PokemonBDSP_BlinkModel.h
@@ -0,0 +1,83 @@
+/*  BDSP Blink Model
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonBDSP_BlinkModel_H
+#define PokemonAutomation_PokemonBDSP_BlinkModel_H
+
+#include <stddef.h>
+#include <stdint.h>
+#include <vector>
+#include "Pokemon/Pokemon_Xorshift128.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonBDSP{
+
+
+const double BDSP_NPC_TICK_SECONDS = 1.017;
+const double BDSP_POKEMON_BLINK_MIN_SECONDS = 3.0;
+const double BDSP_POKEMON_BLINK_MAX_SECONDS = 12.0;
+const double BDSP_POKEMON_BLINK_OFFSET_SECONDS = 0.285;
+
+
+enum class BlinkType : uint8_t{
+    Single = 0,
+    Double = 1,
+};
+const char* blink_type_name(BlinkType type);
+
+
+//  An NPC blinks when bits 1-3 of its roll are all zero: about a 1 in 8 chance.
+inline bool npc_blinks(uint32_t roll){
+    return (roll & 0x0e) == 0;
+}
+//  Bit 0 decides whether it is a single or a double blink.
+inline BlinkType NPC_blink_type(uint32_t roll){
+    return (BlinkType)(roll & 1);
+}
+
+
+//  The game's float generator.
+//  Note that it runs backwards: a roll of zero gives the maximum,
+//  and a roll of all-ones gives the minimum
+double bdsp_range_float(uint32_t roll, double minimum, double maximum);
+
+//  Seconds until a Pokemon model's next blink.
+double bdsp_pokemon_blink_interval(uint32_t roll);
+
+
+const size_t BDSP_POKEMON_BLINK_KNOWN_BITS = 4;
+
+//  Recover the 23-bit fraction from a measured interval.
+//  Returns false if no roll could have produced this interval at all.
+bool bdsp_pokemon_blink_fraction(double interval_seconds, uint32_t& fraction);
+
+//  Recover just the top BDSP_POKEMON_BLINK_KNOWN_BITS of the fraction, along with
+//  how much timing error that reading could absorb before it would flip to the
+//  neighbouring value.
+//  Returns false only if no roll could have produced this interval.
+bool bdsp_pokemon_blink_bucket_with_margin(
+    double interval_seconds, uint32_t& bucket, double& margin_seconds
+);
+
+struct BlinkTick{
+    bool blinked = false;
+    BlinkType type = BlinkType::Single;   //  Only meaningful when "blinked".
+};
+
+// Predict what one NPC would do over the given number of ticks.
+std::vector<BlinkTick> generate_blink_ticks(
+    Pokemon::Xorshift128 rng,
+    size_t ticks,
+    uint8_t npcs = 1,
+    uint8_t slot = 0
+);
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/RngManipulation/PokemonBDSP_BlinkRecovery.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/RngManipulation/PokemonBDSP_BlinkRecovery.cpp
new file mode 100644
index 0000000000..4119e3ce07
--- /dev/null
+++ b/SerialPrograms/Source/PokemonBDSP/Programs/RngManipulation/PokemonBDSP_BlinkRecovery.cpp
@@ -0,0 +1,589 @@
+/*  BDSP Blink Recovery
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <algorithm>
+#include <chrono>
+#include <cmath>
+#include "Common/Cpp/PrettyPrint.h"
+#include "Common/Cpp/Logging/AbstractLogger.h"
+#include "CommonFramework/GlobalAutoPaths.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonTools/Async/InferenceSession.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "PokemonBDSP_BlinkRecovery.h"
+#include "PokemonBDSP_StateReidentifier.h"
+#include "PokemonBDSP_StateSolver.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonBDSP{
+
+using namespace Pokemon;
+using namespace std::chrono_literals;
+
+
+std::vector<ImageRGB32> load_eye_templates(
+    const std::vector<BdspEyeTemplate>& setups
+){
+    std::vector<ImageRGB32> eyes;
+    eyes.reserve(setups.size());
+    for (const BdspEyeTemplate& setup : setups){
+        eyes.emplace_back(RESOURCE_PATH() + "PokemonBDSP/Rng/" + setup.asset);
+    }
+    return eyes;
+}
+
+
+static bool blink_scene_ready(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    std::vector<EyeBlinkDetector>& detectors,
+    const BlinkSceneConfig& config
+){
+    WallClock deadline = current_time() + config.attempt_timeout;
+    size_t streak = 0;
+    double best_seen = -1;
+    while (current_time() < deadline){
+        pbf_wait(context, 250ms);
+        context.wait_for_all_requests();
+
+        VideoSnapshot frame = env.console.video().snapshot();
+        if (config.frame_filter && !config.frame_filter(frame)){
+            streak = 0;
+            continue;
+        }
+        double worst = 1.0;
+        for (const EyeBlinkDetector& detector : detectors){
+            worst = std::min(worst, detector.match(frame));
+        }
+        best_seen = std::max(best_seen, worst);
+        if (worst < config.minimum_match){
+            streak = 0;
+            continue;
+        }
+        if (++streak >= config.required_streak){
+            env.log("Characters in position, worst eye match "
+                + tostr_default(worst) + ".");
+            return true;
+        }
+    }
+    env.log("Not settled yet; best worst-eye match was " + tostr_default(best_seen) + ".");
+    return false;
+}
+
+bool wait_for_blink_scene(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    const std::vector<BdspEyeTemplate>& setups,
+    const std::vector<ImageRGB32>& eyes,
+    const BlinkSceneConfig& config,
+    const std::string& scene_name
+){
+    std::vector<EyeBlinkDetector> detectors;
+    for (size_t c = 0; c < setups.size(); c++){
+        detectors.emplace_back(eyes[c], setups[c].box);
+    }
+
+    //  Recover from possible dropped button presses
+    for (size_t attempt = 0; attempt < config.press_retries; attempt++){
+        if (blink_scene_ready(env, context, detectors, config)){
+            return true;
+        }
+        env.log(scene_name + " position not reached. A press was probably dropped. "
+            "Pressing again (" + std::to_string(attempt + 1) + " of "
+            + std::to_string(config.press_retries) + ").", COLOR_ORANGE);
+        pbf_press_button(context, config.retry_button, 100ms, 1200ms);
+        context.wait_for_all_requests();
+    }
+    env.log("Never reached the " + scene_name + " position. Giving up on this attempt.",
+        COLOR_RED);
+    return false;
+}
+
+void make_blink_watchers(
+    const std::vector<BdspEyeTemplate>& setups,
+    const std::vector<ImageRGB32>& eyes,
+    std::vector<std::unique_ptr<EyeBlinkWatcher>>& watchers,
+    std::vector<PeriodicInferenceCallback>& callbacks
+){
+    for (size_t c = 0; c < setups.size(); c++){
+        watchers.emplace_back(std::make_unique<EyeBlinkWatcher>(
+            setups[c].label, eyes[c], setups[c].box, c == 0 ? COLOR_CYAN : COLOR_YELLOW
+        ));
+    }
+    for (std::unique_ptr<EyeBlinkWatcher>& watcher : watchers){
+        callbacks.emplace_back(*watcher, 16ms);
+    }
+}
+
+
+bool collect_blink_matches(
+    std::vector<std::unique_ptr<EyeBlinkWatcher>>& watchers,
+    std::vector<std::vector<BlinkMatchSample>>& matches,
+    WallClock& origin
+){
+    matches.clear();
+    origin = WallClock::max();
+    for (std::unique_ptr<EyeBlinkWatcher>& watcher : watchers){
+        matches.emplace_back(watcher->samples());
+        if (matches.back().empty()){
+            return false;
+        }
+        origin = std::min(origin, matches.back()[0].timestamp);
+    }
+    return true;
+}
+
+std::vector<std::vector<BlinkEvent>> build_blink_streams(
+    const std::vector<std::vector<BlinkMatchSample>>& matches,
+    const std::vector<double>& thresholds,
+    WallClock origin
+){
+    std::vector<std::vector<BlinkEvent>> streams;
+    for (size_t c = 0; c < matches.size(); c++){
+        streams.emplace_back(group_blinks(extract_blinks(matches[c], thresholds[c], origin)));
+    }
+    return streams;
+}
+
+//  If enough samples have been collected, 
+//  drop old ones in case a misread is preventing a solution
+static void trim_to_window(
+    std::vector<std::unique_ptr<EyeBlinkWatcher>>& watchers,
+    const std::vector<std::vector<BlinkEvent>>& streams,
+    WallClock origin,
+    size_t keep
+){
+    for (size_t c = 0; c < streams.size(); c++){
+        if (streams[c].size() <= keep){
+            continue;
+        }
+        //  A second before the oldest blink being kept, so its whole dip survives.
+        double seconds = streams[c][streams[c].size() - keep].seconds - 1.0;
+        watchers[c]->discard_before(
+            origin + std::chrono::duration_cast<WallDuration>(
+                std::chrono::duration<double>(seconds)
+            )
+        );
+    }
+}
+
+//  prevent the screen from dimming with the right joystick
+void keep_awake_if_due(ProControllerContext& context, WallClock& next, Seconds interval){
+    if (current_time() < next){
+        return;
+    }
+    pbf_move_right_joystick(context, {1.0, 0.0}, 80ms, 0ms);
+    context.wait_for_all_requests();
+    next = current_time() + interval;
+}
+
+
+BlinkRecovery recover_state_from_blinks(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    std::vector<std::unique_ptr<EyeBlinkWatcher>>& watchers,
+    std::vector<PeriodicInferenceCallback>& callbacks,
+    BlinkCollectionDisplay& display,
+    const BlinkRecoveryConfig& config
+){
+    BlinkRecovery ret;
+
+    size_t give_up_after = config.max_failed_windows * config.window_events;
+    size_t failed_solves = 0;
+
+    std::vector<double> frozen_thresholds(watchers.size(), -1);
+
+    std::vector<double> estimated_thresholds(watchers.size(), -1);
+    std::vector<size_t> estimated_from(watchers.size(), 0);
+
+    bool have_candidate = false;
+    Xorshift128State candidate;
+    size_t candidate_events = 0;
+    std::vector<WallClock> newest_blink(watchers.size(), WallClock::min());
+
+    WallClock next_nudge = current_time() + config.keep_awake_interval;
+
+    //  Only trips if blinks stop arriving entirely, since no blink means no failed solve
+    WallClock deadline = current_time() + config.liveness_timeout;
+
+    //  Held across the whole loop
+    CancellableHolder<CancellableScope> subcontext(static_cast<CancellableScope&>(context));
+    InferenceSession session(subcontext, env.console, callbacks);
+
+    while (true){
+        if (failed_solves >= give_up_after){
+            ret.failure_reason = "no RNG state solved over "
+                + std::to_string(give_up_after) + " blinks";
+            return ret;
+        }
+        if (current_time() > deadline){
+            ret.failure_reason = "no RNG state solved in "
+                + std::to_string(config.liveness_timeout.count() / 60) + " minutes";
+            return ret;
+        }
+        subcontext.wait_until(current_time() + config.poll_interval);
+
+        keep_awake_if_due(context, next_nudge, config.keep_awake_interval);
+
+        std::vector<std::vector<BlinkMatchSample>> matches;
+        WallClock origin = WallClock::max();
+        if (!collect_blink_matches(watchers, matches, origin)){
+            continue;
+        }
+
+        std::vector<double> thresholds;
+        for (size_t w = 0; w < watchers.size(); w++){
+            double threshold = frozen_thresholds[w];
+            if (threshold <= 0){
+                size_t counted = estimated_from[w];
+                size_t held = matches[w].size();
+                if (estimated_thresholds[w] <= 0
+                    || held >= counted + counted / 4
+                    || counted >= held + held / 4
+                ){
+                    estimated_thresholds[w] = auto_blink_threshold(matches[w]);
+                    estimated_from[w] = matches[w].size();
+                }
+                threshold = estimated_thresholds[w];
+            }
+            if (!(threshold > 0)){
+                display.set_note("Determining blink threshold...");
+                break;
+            }
+            thresholds.emplace_back(threshold);
+        }
+        if (thresholds.size() != watchers.size()){
+            continue;
+        }
+        std::vector<std::vector<BlinkEvent>> streams =
+            build_blink_streams(matches, thresholds, origin);
+
+        size_t events = 0;
+        const std::vector<BlinkEvent>* longest = &streams[0];
+        for (const std::vector<BlinkEvent>& stream : streams){
+            events += stream.size();
+            if (stream.size() > longest->size()){
+                longest = &stream;
+            }
+        }
+        display.set_progress(events, config.min_rolls_to_try + config.confirmation_events);
+
+        //  don't trim if there is a candidate (the solution is pinned to the earliest blink)
+        if (!have_candidate){
+            trim_to_window(watchers, streams, origin, config.window_events / streams.size());
+        }
+
+        bool fresh = false; // count doesn't change once the window is full
+        for (size_t w = 0; w < streams.size(); w++){
+            if (streams[w].empty()){
+                continue;
+            }
+            WallClock newest = origin + std::chrono::duration_cast<WallDuration>(
+                std::chrono::duration<double>(streams[w].back().seconds)
+            );
+            if (newest > newest_blink[w] + std::chrono::seconds(1)){
+                fresh = true;
+            }
+            newest_blink[w] = std::max(newest_blink[w], newest);
+        }
+        if (!fresh){
+            continue;
+        }
+
+        if (longest->size() < 3){
+            continue;
+        }
+
+        TickFit fit = fit_tick_period(*longest);
+        if (!(fit.period_seconds > 0)){
+            continue;
+        }
+        if (have_candidate && events < candidate_events + config.confirmation_events){
+            continue;
+        }
+
+        if (events < config.min_rolls_to_try){
+            continue;
+        }
+
+        std::vector<uint8_t> slots(streams.size());
+        for (uint8_t c = 0; c < (uint8_t)streams.size(); c++){
+            slots[c] = c;
+        }
+        BlinkSolveResult solved;
+        std::vector<uint8_t> winning_slots;
+        for (size_t attempt = 0; attempt < streams.size(); attempt++){
+            std::vector<BlinkSample> samples;
+            std::string failure;
+            if (build_samples(streams, slots, fit.period_seconds, samples, failure)){
+                BlinkSolveResult attempt_result = solve_state_from_samples(samples, nullptr);
+                if (attempt_result.success){
+                    solved = attempt_result;
+                    winning_slots = slots;
+                    break;
+                }
+            }
+            std::rotate(slots.begin(), slots.begin() + 1, slots.end());
+        }
+        if (!solved.success){
+            failed_solves++;
+            env.log(std::to_string(events) + " rolls seen, no solution yet.");
+            continue;
+        }
+        failed_solves = 0;
+
+        if (frozen_thresholds[0] <= 0){
+            std::string report;
+            for (size_t w = 0; w < watchers.size(); w++){
+                frozen_thresholds[w] = thresholds[w];
+                report += (report.empty() ? "" : ", ")
+                    + watchers[w]->label() + " " + tostr_default(thresholds[w]);
+            }
+            env.log("Thresholds fixed so that blink numbering stops moving: " + report + ".");
+        }
+        if (!have_candidate){
+            env.log("Provisional state " + solved.state.to_string() + " from "
+                + std::to_string(events) + " rolls. Collecting "
+                + std::to_string(config.confirmation_events) + " more to confirm.");
+            have_candidate = true;
+            candidate = solved.state;
+            candidate_events = events;
+            continue;
+        }
+        if (solved.state != candidate){
+            env.log(
+                "The RNG state changed as more blinks arrived, so the earlier one was "
+                "wrong. Continuing.",
+                COLOR_ORANGE
+            );
+            candidate = solved.state;
+            candidate_events = events;
+            continue;
+        }
+
+        uint64_t anchor_advance = 0;
+        double anchor_seconds = 0;
+        size_t anchor_stream = 0;
+        if (!last_blink_anchor(
+            streams, winning_slots, fit.period_seconds,
+            anchor_advance, anchor_seconds, anchor_stream
+        )){
+            ret.failure_reason = "the RNG state was found but no blink could anchor the clock";
+            return ret;
+        }
+        ret.anchor_stream = anchor_stream;
+        ret.clock.anchor_advance = anchor_advance;
+        ret.clock.anchor_time = origin + std::chrono::duration_cast<WallDuration>(
+            std::chrono::duration<double>(anchor_seconds)
+        );
+        ret.clock.tick_seconds = fit.period_seconds;
+        ret.clock.npcs = config.npcs;
+        ret.state = solved.state;
+        ret.events = events;
+        ret.thresholds = frozen_thresholds;
+        ret.slots = winning_slots;
+        ret.success = true;
+        return ret;
+    }
+}
+
+
+bool reanchor_absolute(
+    const BlinkRecovery& recovery,
+    const std::vector<std::vector<BlinkEvent>>& streams,
+    WallClock origin,
+    const BlinkRecoveryConfig& config,
+    AdvanceClock& clock,
+    Logger& logger
+){
+    if (recovery.anchor_stream >= streams.size() || config.reanchor_blinks < 2){
+        return false;
+    }
+    const std::vector<BlinkEvent>& stream = streams[recovery.anchor_stream];
+    if (stream.size() < config.reanchor_blinks){
+        return false;
+    }
+    size_t first = stream.size() - config.reanchor_blinks;
+
+    auto time_of = [&](size_t index){
+        return origin + std::chrono::duration_cast<WallDuration>(
+            std::chrono::duration<double>(stream[index].seconds)
+        );
+    };
+
+    std::vector<uint32_t> intervals;
+    intervals.reserve(config.reanchor_blinks - 1);
+    for (size_t c = first + 1; c < stream.size(); c++){
+        double gap = (stream[c].seconds - stream[c - 1].seconds) / clock.tick_seconds;
+        long long ticks = std::llround(gap);
+        if (ticks < 1){
+            //  Two events on one tick means the grouping is wrong
+            return false;
+        }
+        intervals.emplace_back((uint32_t)ticks);
+    }
+
+    ReidentifyRequest request;
+    request.base_state = recovery.state;
+    request.npcs = clock.npcs;
+    request.method = ReidentifyMethod::Intervals;
+    request.intervals = intervals;
+
+    uint64_t estimate = clock.advance_at(time_of(first));
+    request.search_min = estimate > config.reanchor_search_radius
+        ? estimate - config.reanchor_search_radius
+        : 0;
+    request.search_max = estimate + config.reanchor_search_radius;
+
+    ReidentifyResult result = reidentify_advances(request);
+    if (!result.success){
+        logger.log(
+            "Absolute re-anchor found nothing usable, so the stepped clock stands. "
+            + result.failure_reason,
+            COLOR_ORANGE
+        );
+        return false;
+    }
+
+    //  How far the clock had drifted
+    WallClock last_time = time_of(stream.size() - 1);
+    double drift_seconds = std::chrono::duration_cast<std::chrono::duration<double>>(
+        last_time - clock.time_of_advance(result.advances_to_last_blink)
+    ).count();
+    double seconds_per_advance = clock.npcs == 0
+        ? clock.tick_seconds
+        : clock.tick_seconds / (double)clock.npcs;
+    double drift_advances = drift_seconds / seconds_per_advance;
+
+    clock.anchor_advance = result.advances_to_last_blink;
+    clock.anchor_time = last_time;
+
+    std::string note = "Re-anchored at advance " + std::to_string(clock.anchor_advance)
+        + ", " + tostr_fixed(drift_seconds, 3) + "s ("
+        + tostr_fixed(drift_advances, 2) + " advances) off what the clock predicted.";
+    //  Half an advance is where the aim would actually land somewhere else.
+    logger.log(note, std::abs(drift_advances) >= 0.5 ? COLOR_ORANGE : COLOR_BLUE);
+    return true;
+}
+
+
+void hold_and_reanchor(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    std::vector<std::unique_ptr<EyeBlinkWatcher>>& watchers,
+    std::vector<PeriodicInferenceCallback>& callbacks,
+    BlinkRecovery& recovery,
+    const BlinkRecoveryConfig& config,
+    uint64_t press_advance,
+    double lead_seconds,
+    RngStateDisplay& display
+){
+    AdvanceClock& clock = recovery.clock;
+    WallClock next_nudge = current_time() + config.keep_awake_interval;
+
+    const uint64_t entry_advance = clock.anchor_advance;
+    const WallClock entry_time = clock.anchor_time;
+    size_t reanchors = 0;
+    size_t consecutive_failures = 0;
+    WallClock next_reanchor = current_time();
+
+    CancellableHolder<CancellableScope> subcontext(static_cast<CancellableScope&>(context));
+    InferenceSession session(subcontext, env.console, callbacks);
+
+    while (true){
+        //  Recomputed every pass, because re-anchoring is exactly what changes it.
+        WallClock leave_at = clock.time_of_advance(press_advance)
+            - std::chrono::duration_cast<WallDuration>(
+                std::chrono::duration<double>(lead_seconds)
+            );
+        // the press is timed off this anchor, so this is the most valuable check
+        bool leaving = current_time() >= leave_at;
+        if (!leaving){
+            subcontext.wait_until(std::min({
+                leave_at, next_reanchor, current_time() + config.poll_interval
+            }));
+            keep_awake_if_due(context, next_nudge, config.keep_awake_interval);
+        }
+
+        display.set_advances(clock.advance_at(current_time()));
+        if (!leaving && current_time() < next_reanchor){
+            continue;
+        }
+        next_reanchor = current_time() + config.reanchor_interval;
+
+        bool reanchored = false;
+        std::vector<std::vector<BlinkMatchSample>> matches;
+        WallClock origin = WallClock::max();
+        if (collect_blink_matches(watchers, matches, origin)){
+            WallClock keep_from = current_time() - config.blink_retention;
+            for (std::unique_ptr<EyeBlinkWatcher>& watcher : watchers){
+                watcher->discard_before(keep_from);
+            }
+            std::vector<std::vector<BlinkEvent>> streams =
+                build_blink_streams(matches, recovery.thresholds, origin);
+            reanchored = reanchor_absolute(
+                recovery, streams, origin, config, clock, env.logger()
+            );
+        }
+
+        if (reanchored){
+            reanchors++;
+            consecutive_failures = 0;
+        }else{
+            consecutive_failures++;
+            if (consecutive_failures >= config.max_reanchor_failures){
+                OperationFailedExceptionWithScreenshot::fire(
+                    ErrorReportMode::NO_ERROR_REPORT,
+                    std::to_string(consecutive_failures)
+                    + " consecutive re-anchor failures: the blinks can no longer be read, "
+                    "so the clock cannot be trusted to time the press.",
+                    env.console
+                );
+            }
+        }
+
+        if (!leaving){
+            continue;
+        }
+        if (current_time() < clock.time_of_advance(press_advance)
+            - std::chrono::duration_cast<WallDuration>(
+                std::chrono::duration<double>(lead_seconds)
+            )
+        ){
+            continue;
+        }
+
+        if (reanchors == 0){
+            env.log("Held without re-anchoring: the clock is still the one the "
+                "recovery produced.", COLOR_BLUE);
+            return;
+        }
+        int64_t moved = (int64_t)clock.anchor_advance - (int64_t)entry_advance;
+        double seconds = std::chrono::duration_cast<std::chrono::duration<double>>(
+            clock.anchor_time - entry_time
+        ).count();
+        std::string note = "Re-anchored " + std::to_string(reanchors) + " time(s) over "
+            + tostr_fixed(seconds, 1) + "s, moving the anchor "
+            + std::to_string(moved) + " advance(s)";
+        if (moved > 0 && clock.npcs != 0){
+            double implied = seconds / ((double)moved / (double)clock.npcs);
+            note += ": implied tick " + tostr_fixed(implied, 5)
+                + "s against the fitted " + tostr_fixed(clock.tick_seconds, 5)
+                + "s (" + tostr_fixed(100 * (implied / clock.tick_seconds - 1), 3) + "%)";
+        }
+        env.log(note + ".", COLOR_BLUE);
+        return;
+    }
+}
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/RngManipulation/PokemonBDSP_BlinkRecovery.h b/SerialPrograms/Source/PokemonBDSP/Programs/RngManipulation/PokemonBDSP_BlinkRecovery.h
new file mode 100644
index 0000000000..402d44f201
--- /dev/null
+++ b/SerialPrograms/Source/PokemonBDSP/Programs/RngManipulation/PokemonBDSP_BlinkRecovery.h
@@ -0,0 +1,149 @@
+/*  BDSP Blink Recovery
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonBDSP_BlinkRecovery_H
+#define PokemonAutomation_PokemonBDSP_BlinkRecovery_H
+
+#include <stddef.h>
+#include <stdint.h>
+#include <functional>
+#include <memory>
+#include <string>
+#include <vector>
+#include "Common/Cpp/Time.h"
+#include "CommonFramework/ImageTypes/ImageRGB32.h"
+#include "CommonTools/InferenceCallbacks/InferenceCallback.h"
+#include "NintendoSwitch/Controllers/NintendoSwitch_ControllerButtons.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "Pokemon/Pokemon_Xorshift128.h"
+#include "PokemonBDSP/Inference/Rng/PokemonBDSP_BlinkExtraction.h"
+#include "PokemonBDSP/Inference/Rng/PokemonBDSP_EyeBlinkDetector.h"
+#include "PokemonBDSP_AdvanceClock.h"
+#include "PokemonBDSP_RngDisplays.h"
+
+namespace PokemonAutomation{
+    class Logger;
+namespace NintendoSwitch{
+namespace PokemonBDSP{
+
+
+
+struct BlinkRecoveryConfig{
+    uint8_t npcs = 2;
+    size_t min_rolls_to_try = 44;
+    size_t confirmation_events = 6;
+    size_t window_events = 52; // chosen for redundancy
+    size_t max_failed_windows = 3;
+    Seconds liveness_timeout = std::chrono::seconds(3600); // in case blinks are never arriving
+    Seconds poll_interval = std::chrono::seconds(1);
+    Seconds reanchor_interval = std::chrono::seconds(30);
+    Seconds keep_awake_interval = std::chrono::seconds(180);
+    Seconds blink_retention = std::chrono::seconds(180);
+    size_t reanchor_blinks = 6;
+    uint64_t reanchor_search_radius = 600;
+    size_t max_reanchor_failures = 4;
+};
+
+
+struct BlinkRecovery{
+    bool success = false;
+    Pokemon::Xorshift128State state;
+    AdvanceClock clock;
+    size_t events = 0;
+    std::string failure_reason;
+    std::vector<double> thresholds;
+    std::vector<uint8_t> slots;
+    size_t anchor_stream = 0;
+};
+
+
+
+struct BlinkSceneConfig{
+    std::function<bool(const ImageViewRGB32& frame)> frame_filter;
+    double minimum_match = 0.35;
+    size_t required_streak = 4;
+    Seconds attempt_timeout = std::chrono::seconds(10);
+    size_t press_retries = 10;
+    Button retry_button = BUTTON_A;
+};
+
+
+std::vector<ImageRGB32> load_eye_templates(
+    const std::vector<BdspEyeTemplate>& setups
+);
+
+bool wait_for_blink_scene(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    const std::vector<BdspEyeTemplate>& setups,
+    const std::vector<ImageRGB32>& eyes,
+    const BlinkSceneConfig& config,
+    const std::string& scene_name
+);
+
+void make_blink_watchers(
+    const std::vector<BdspEyeTemplate>& setups,
+    const std::vector<ImageRGB32>& eyes,
+    std::vector<std::unique_ptr<EyeBlinkWatcher>>& watchers,
+    std::vector<PeriodicInferenceCallback>& callbacks
+);
+
+
+bool collect_blink_matches(
+    std::vector<std::unique_ptr<EyeBlinkWatcher>>& watchers,
+    std::vector<std::vector<BlinkMatchSample>>& matches,
+    WallClock& origin
+);
+
+
+std::vector<std::vector<BlinkEvent>> build_blink_streams(
+    const std::vector<std::vector<BlinkMatchSample>>& matches,
+    const std::vector<double>& thresholds,
+    WallClock origin
+);
+
+
+void keep_awake_if_due(ProControllerContext& context, WallClock& next, Seconds interval);
+
+
+BlinkRecovery recover_state_from_blinks(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    std::vector<std::unique_ptr<EyeBlinkWatcher>>& watchers,
+    std::vector<PeriodicInferenceCallback>& callbacks,
+    BlinkCollectionDisplay& display,
+    const BlinkRecoveryConfig& config
+);
+
+
+// re-derive the newest blink's advance from the recovered state
+bool reanchor_absolute(
+    const BlinkRecovery& recovery,
+    const std::vector<std::vector<BlinkEvent>>& streams,
+    WallClock origin,
+    const BlinkRecoveryConfig& config,
+    AdvanceClock& clock,
+    Logger& logger
+);
+
+// hold position, re-anchoring periodically, until the press is close enough to walk to
+void hold_and_reanchor(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    std::vector<std::unique_ptr<EyeBlinkWatcher>>& watchers,
+    std::vector<PeriodicInferenceCallback>& callbacks,
+    BlinkRecovery& recovery,
+    const BlinkRecoveryConfig& config,
+    uint64_t press_advance,
+    double lead_seconds,
+    RngStateDisplay& display
+);
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/RngManipulation/PokemonBDSP_IntroSeedFinder.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/RngManipulation/PokemonBDSP_IntroSeedFinder.cpp
new file mode 100644
index 0000000000..77d0aeca58
--- /dev/null
+++ b/SerialPrograms/Source/PokemonBDSP/Programs/RngManipulation/PokemonBDSP_IntroSeedFinder.cpp
@@ -0,0 +1,261 @@
+/*  BDSP Intro Seed Finder
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <stdint.h>
+#include <algorithm>
+#include <chrono>
+#include "Common/Cpp/Exceptions.h"
+#include "Common/Cpp/PrettyPrint.h"
+#include "CommonFramework/GlobalAutoPaths.h"
+#include "CommonFramework/ImageTypes/ImageRGB32.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonTools/Async/InferenceSession.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "PokemonBDSP/Inference/Rng/PokemonBDSP_BlinkExtraction.h"
+#include "PokemonBDSP/Inference/Rng/PokemonBDSP_EyeBlinkDetector.h"
+#include "PokemonBDSP_IntroSeedFinder.h"
+#include "PokemonBDSP_StateSolver.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonBDSP{
+    using namespace Pokemon;
+
+
+const Seconds KEEP_AWAKE_INTERVAL = 180s;
+
+//  Each usable gap pins four bits, so 128 bits needs 32 of them.
+const size_t MIN_USABLE_TO_TRY = 32;
+
+const size_t CONFIRMATION_BLINKS = 6;
+
+const uint16_t GIVE_UP_SECONDS = 1500;
+
+const double TOLERANCE_SECONDS = 0.10;
+
+
+IntroSeedFinder_Descriptor::IntroSeedFinder_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonBDSP:IntroSeedFinder",
+        STRING_POKEMON + " BDSP", "Intro Seed Finder",
+        "",
+        "Recover the RNG seed from the intro cutscene by watching Munchlax blink, so that the "
+        "secret ID can be worked out from the trainer card afterwards.",
+        PanelQualityStanding::OFFICIAL_BETA,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::ENABLE_COMMANDS
+    )
+{}
+
+
+IntroSeedFinder::IntroSeedFinder()
+    : GO_HOME_WHEN_DONE(false)
+{
+    PA_ADD_OPTION(COLLECTION_DISPLAY);
+    PA_ADD_OPTION(STATE_DISPLAY);
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+}
+
+
+//  some gaps are too near a bucket boundary to be read (roughly a third at the default tolerance)
+static size_t count_usable(const std::vector<double>& intervals, double tolerance){
+    size_t usable = 0;
+    for (double gap : intervals){
+        uint32_t bucket = 0;
+        double margin = 0;
+        if (bdsp_pokemon_blink_bucket_with_margin(gap, bucket, margin) && margin >= tolerance){
+            usable++;
+        }
+    }
+    return usable;
+}
+
+static std::vector<double> intervals_of(const std::vector<Blink>& blinks){
+    std::vector<double> intervals;
+    if (blinks.size() < 2){
+        return intervals;
+    }
+    intervals.reserve(blinks.size() - 1);
+    for (size_t c = 1; c < blinks.size(); c++){
+        intervals.emplace_back(blinks[c].seconds - blinks[c - 1].seconds);
+    }
+    return intervals;
+}
+
+
+void IntroSeedFinder::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    STATE_DISPLAY.reset();
+    COLLECTION_DISPLAY.reset();
+
+    double fps = env.console.video().fps_source();
+    if (fps > 0){
+        env.log("Capture is running at " + tostr_default(fps) + " fps.");
+        if (fps < 25){
+            env.log(
+                "That is low for this. A gap has to be measured to about a tenth of a second, "
+                "and below roughly 30 fps the timing error alone approaches that.",
+                COLOR_ORANGE
+            );
+        }
+    }
+
+    ImageRGB32 eye(RESOURCE_PATH() + "PokemonBDSP/Rng/Munchlax.png");
+    EyeBlinkWatcher watcher("Munchlax", eye, {0.3828, 0.6306, 0.0208, 0.0481}, COLOR_CYAN);
+    std::vector<PeriodicInferenceCallback> callbacks;
+    callbacks.emplace_back(watcher, 16ms);
+
+    //  Held across the whole run
+    CancellableHolder<CancellableScope> subcontext(static_cast<CancellableScope&>(context));
+    InferenceSession session(subcontext, env.console, callbacks);
+
+    size_t expected = recommended_pokemon_blink_count(TOLERANCE_SECONDS);
+    env.log("Watching Munchlax. Around " + std::to_string(expected)
+        + " blinks are usually enough, but this stops when the answer is confirmed rather "
+        "than at a fixed count.");
+
+    //  how many blinks are needed comes down to luck
+    WallClock deadline = current_time() + std::chrono::seconds(GIVE_UP_SECONDS);
+    WallClock next_nudge = current_time() + KEEP_AWAKE_INTERVAL;
+
+    bool have_candidate = false;
+    Xorshift128State candidate;
+    size_t candidate_blinks = 0;
+    double frozen_threshold = -1;
+
+    double estimated_threshold = -1;
+    size_t estimated_from = 0;
+
+    PokemonBlinkSolveResult confirmed;
+    size_t confirmed_blinks = 0;
+    size_t blink_count = 0;
+    while (true){
+        if (current_time() >= deadline){
+            throw UserSetupError(env.logger(),
+                "Gave up after " + std::to_string((int)GIVE_UP_SECONDS) + " seconds without a "
+                "confirmed seed. Check the overlay box is on Munchlax's eye and that the log "
+                "shows blinks arriving every few seconds."
+            );
+        }
+
+        subcontext.wait_until(std::min(deadline, current_time() + 1s));
+
+        if (current_time() >= next_nudge){
+            pbf_move_right_joystick(context, {1.0, 0.0}, 80ms, 0ms);
+            context.wait_for_all_requests();
+            next_nudge = current_time() + KEEP_AWAKE_INTERVAL;
+        }
+
+        std::vector<BlinkMatchSample> samples = watcher.samples();
+        if (samples.empty()){
+            continue;
+        }
+        double threshold = frozen_threshold;
+        if (threshold <= 0){
+            if (estimated_threshold <= 0 || samples.size() >= estimated_from + estimated_from / 4){
+                estimated_threshold = auto_blink_threshold(samples);
+                estimated_from = samples.size();
+            }
+            threshold = estimated_threshold;
+        }
+        if (!(threshold > 0)){
+            COLLECTION_DISPLAY.set_note("Determining blink threshold...");
+            continue;
+        }
+        std::vector<Blink> blinks = extract_blinks(samples, threshold);
+        //  No need to go further until another blink is recorded
+        if (blinks.size() == blink_count){
+            continue;
+        }
+        blink_count = blinks.size();
+
+        std::vector<double> intervals = intervals_of(blinks);
+        size_t usable = count_usable(intervals, TOLERANCE_SECONDS);
+
+        COLLECTION_DISPLAY.set_progress(blinks.size(), expected);
+
+        if (usable < MIN_USABLE_TO_TRY){
+            env.log(std::to_string(blinks.size()) + " blinks, " + std::to_string(usable)
+                + " of " + std::to_string(MIN_USABLE_TO_TRY) + " confident gaps needed before "
+                "solving is worth trying.");
+            continue;
+        }
+        if (frozen_threshold <= 0){
+            frozen_threshold = threshold;
+            env.log("Threshold fixed at " + tostr_default(threshold)
+                + " for the rest of the run, so that blink numbering stops moving.");
+        }
+
+        if (have_candidate && blinks.size() < candidate_blinks + CONFIRMATION_BLINKS){
+            env.log(std::to_string(blinks.size()) + " blinks, " + std::to_string(usable)
+                + " usable. Waiting for "
+                + std::to_string(candidate_blinks + CONFIRMATION_BLINKS - blinks.size())
+                + " more to confirm.");
+            continue;
+        }
+
+        PokemonBlinkSolveRequest request;
+        request.intervals = intervals;
+        request.tolerance_seconds = TOLERANCE_SECONDS;
+        PokemonBlinkSolveResult result = solve_state_from_pokemon_blinks(request, nullptr);
+        if (!result.success){
+            env.log(std::to_string(blinks.size()) + " blinks, " + std::to_string(usable)
+                + " usable, no solution yet.");
+            continue;
+        }
+
+        if (have_candidate && result.state == candidate){
+            confirmed = result;
+            confirmed_blinks = blinks.size();
+            break;
+        }
+        if (have_candidate){
+            //  Two different answers means at least one came from a bad reading
+            env.log(
+                "The recovered state changed as more blinks arrived, so the earlier one was "
+                "wrong. Continuing.",
+                COLOR_ORANGE
+            );
+        }else{
+            env.log("Provisional state " + result.state.to_string()
+                + " from " + std::to_string(result.observations_used)
+                + " gaps. Collecting " + std::to_string(CONFIRMATION_BLINKS)
+                + " more blinks to confirm it.");
+        }
+        have_candidate = true;
+        candidate = result.state;
+        candidate_blinks = blinks.size();
+    }
+
+    uint64_t seed0 = 0;
+    uint64_t seed1 = 0;
+    xorshift128_state_to_seed_pair(confirmed.state, seed0, seed1);
+
+    env.log("--------");
+    env.log("Seed confirmed over " + std::to_string(confirmed_blinks) + " blinks.", COLOR_BLUE);
+    env.log("State: " + confirmed.state.to_string(), COLOR_BLUE);
+    env.log("PokeFinder seeds: " + tostr_hex_padded(16, seed0)
+        + " " + tostr_hex_padded(16, seed1), COLOR_BLUE);
+    env.log("Used " + std::to_string(confirmed.observations_used) + " gaps over "
+        + std::to_string(confirmed.attempts) + " attempt(s); worst residual "
+        + tostr_default(confirmed.worst_residual_seconds) + "s, weakest reading had "
+        + tostr_default(confirmed.weakest_margin_used) + "s of room, "
+        + std::to_string(confirmed.mistimed_intervals) + " gaps disagreed.", COLOR_BLUE);
+
+    STATE_DISPLAY.set_state(confirmed.state, confirmed_blinks);
+    STATE_DISPLAY.set_confidence_unique();
+    COLLECTION_DISPLAY.set_progress(confirmed_blinks, confirmed_blinks);
+
+    GO_HOME_WHEN_DONE.run_end_of_program(context);
+}
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/RngManipulation/PokemonBDSP_IntroSeedFinder.h b/SerialPrograms/Source/PokemonBDSP/Programs/RngManipulation/PokemonBDSP_IntroSeedFinder.h
new file mode 100644
index 0000000000..e662065cac
--- /dev/null
+++ b/SerialPrograms/Source/PokemonBDSP/Programs/RngManipulation/PokemonBDSP_IntroSeedFinder.h
@@ -0,0 +1,43 @@
+/*  BDSP Intro Seed Finder
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonBDSP_IntroSeedFinder_H
+#define PokemonAutomation_PokemonBDSP_IntroSeedFinder_H
+
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+#include "PokemonBDSP_RngDisplays.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonBDSP{
+
+
+class IntroSeedFinder_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    IntroSeedFinder_Descriptor();
+};
+
+
+class IntroSeedFinder : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = IntroSeedFinder_Descriptor;
+    IntroSeedFinder();
+
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    BlinkCollectionDisplay COLLECTION_DISPLAY;
+    RngStateDisplay STATE_DISPLAY;
+
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
+};
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/RngManipulation/PokemonBDSP_RngDisplays.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/RngManipulation/PokemonBDSP_RngDisplays.cpp
new file mode 100644
index 0000000000..f9158910d4
--- /dev/null
+++ b/SerialPrograms/Source/PokemonBDSP/Programs/RngManipulation/PokemonBDSP_RngDisplays.cpp
@@ -0,0 +1,147 @@
+/*  BDSP RNG Displays
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+#include "Common/Cpp/PrettyPrint.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "PokemonBDSP_RngDisplays.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonBDSP{
+
+using namespace Pokemon;
+
+
+const char* const NOT_SET = "-";
+
+
+static std::string duration_to_string(double seconds){
+    if (!(seconds >= 0.0)){
+        return NOT_SET;
+    }
+    uint64_t total = (uint64_t)(seconds + 0.5);
+    if (total < 60){
+        return std::to_string(total) + "s";
+    }
+    return std::to_string(total / 60) + "m " + std::to_string(total % 60) + "s";
+}
+
+static std::string milliseconds_to_string(double seconds){
+    return std::to_string((int64_t)(seconds * 1000.0 + (seconds < 0 ? -0.5 : 0.5))) + " ms";
+}
+
+
+RngStateDisplay::RngStateDisplay()
+    : GroupOption("RNG State", LockMode::READ_ONLY)
+    , state(false, "<b>State:</b>", LockMode::READ_ONLY, NOT_SET, "")
+    , pokefinder_seeds(false, "<b>PokeFinder Seeds:</b>", LockMode::READ_ONLY, NOT_SET, "")
+    , advances(false, "<b>Current Advance:</b>", LockMode::READ_ONLY, NOT_SET, "")
+    , confidence(false, "<b>Confidence:</b>", LockMode::READ_ONLY, NOT_SET, "")
+{
+    PA_ADD_STATIC(state);
+    PA_ADD_STATIC(pokefinder_seeds);
+    PA_ADD_STATIC(advances);
+    PA_ADD_STATIC(confidence);
+}
+
+void RngStateDisplay::set_state(const Xorshift128State& value, uint64_t advance_count){
+    state.set(value.to_string());
+
+    uint64_t seed0 = 0;
+    uint64_t seed1 = 0;
+    xorshift128_state_to_seed_pair(value, seed0, seed1);
+    pokefinder_seeds.set(tostr_hex_padded(16, seed0) + " / " + tostr_hex_padded(16, seed1));
+
+    set_advances(advance_count);
+}
+void RngStateDisplay::set_advances(uint64_t advance_count){
+    advances.set(tostr_u_commas((int64_t)advance_count));
+}
+
+void RngStateDisplay::set_confidence_unique(){
+    confidence.set("Unique");
+}
+
+void RngStateDisplay::reset(){
+    state.set(NOT_SET);
+    pokefinder_seeds.set(NOT_SET);
+    advances.set(NOT_SET);
+    confidence.set(NOT_SET);
+}
+
+
+
+BlinkCollectionDisplay::BlinkCollectionDisplay(bool blinks_only)
+    : GroupOption("Blink Collection", LockMode::READ_ONLY)
+    , progress(false, "<b>Blinks:</b>", LockMode::READ_ONLY, NOT_SET, "")
+{
+    PA_ADD_STATIC(progress);
+}
+
+void BlinkCollectionDisplay::set_progress(size_t collected, size_t wanted){
+    progress.set(std::to_string(collected) + " / " + std::to_string(wanted));
+}
+void BlinkCollectionDisplay::set_note(const std::string& text){
+    progress.set(text);
+}
+
+void BlinkCollectionDisplay::reset(){
+    progress.set(NOT_SET);
+}
+
+
+RngTargetDisplay::RngTargetDisplay()
+    : GroupOption("Target", LockMode::READ_ONLY)
+    , target_advance(false, "<b>Target Advance:</b>", LockMode::READ_ONLY, NOT_SET, "")
+    , details(false, "<b>Details:</b>", LockMode::READ_ONLY, NOT_SET, "")
+    , correction(false, "<b>Timing Correction:</b>", LockMode::READ_ONLY, NOT_SET, "")
+{
+    PA_ADD_STATIC(target_advance);
+    PA_ADD_STATIC(details);
+    PA_ADD_STATIC(correction);
+}
+
+
+static std::string poke_info_str(const BdspPokemonResult& pokemon){
+    std::string ret;
+    if (pokemon.shiny != BdspShiny::None){
+        ret += bdsp_shiny_name(pokemon.shiny);
+        ret += " ";
+    }
+    switch (pokemon.gender){
+    case BdspGender::Male:   ret += UNICODE_MALE + " "; break;
+    case BdspGender::Female: ret += UNICODE_FEMALE + " "; break;
+    default: break;
+    }
+    ret += bdsp_nature_name(pokemon.nature);
+    ret += " Ability" + std::to_string(pokemon.ability);
+    ret += " " + pokemon.ivs.to_string();
+    return ret;
+}
+
+void RngTargetDisplay::set_target(const BdspPokemonResult& pokemon, uint64_t advance_count){
+    target_advance.set(tostr_u_commas((int64_t)advance_count));
+    details.set(poke_info_str(pokemon));
+}
+
+void RngTargetDisplay::set_note(const std::string& reason){
+    target_advance.set("—");
+    details.set(reason);
+}
+void RngTargetDisplay::set_correction(int64_t advances){
+    correction.set(std::to_string(advances) + " advance(s)");
+}
+void RngTargetDisplay::reset(){
+    target_advance.set(NOT_SET);
+    details.set(NOT_SET);
+    correction.set(NOT_SET);
+}
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/RngManipulation/PokemonBDSP_RngDisplays.h b/SerialPrograms/Source/PokemonBDSP/Programs/RngManipulation/PokemonBDSP_RngDisplays.h
new file mode 100644
index 0000000000..1204347d38
--- /dev/null
+++ b/SerialPrograms/Source/PokemonBDSP/Programs/RngManipulation/PokemonBDSP_RngDisplays.h
@@ -0,0 +1,75 @@
+/*  BDSP RNG Displays
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonBDSP_RngDisplays_H
+#define PokemonAutomation_PokemonBDSP_RngDisplays_H
+
+#include <stdint.h>
+#include <string>
+#include "Common/Cpp/Options/GroupOption.h"
+#include "Common/Cpp/Options/StringOption.h"
+#include "Pokemon/Pokemon_BdspRng.h"
+#include "Pokemon/Pokemon_Xorshift128.h"
+#include "PokemonBDSP_BlinkModel.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonBDSP{
+
+
+class RngStateDisplay : public GroupOption{
+public:
+    RngStateDisplay();
+
+    void set_state(const Pokemon::Xorshift128State& state, uint64_t advances);
+    void set_advances(uint64_t advances);
+    void set_confidence_unique();
+
+    void reset();
+
+public:
+    StringOption state;
+    StringOption pokefinder_seeds;
+    StringOption advances;
+    StringOption confidence;
+};
+
+
+//  Progress through a blink capture.
+class BlinkCollectionDisplay : public GroupOption{
+public:
+    explicit BlinkCollectionDisplay(bool blinks_only = false);
+
+    void set_progress(size_t collected, size_t wanted);
+    void set_note(const std::string& text);
+
+    void reset();
+
+public:
+    StringOption progress;
+};
+
+
+class RngTargetDisplay : public GroupOption{
+public:
+    RngTargetDisplay();
+
+    void set_target(const Pokemon::BdspPokemonResult& pokemon, uint64_t advances);
+    void set_note(const std::string& reason);
+    void set_correction(int64_t advances);
+
+    void reset();
+
+public:
+    StringOption target_advance;
+    StringOption details;
+    StringOption correction;
+};
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/RngManipulation/PokemonBDSP_StateReidentifier.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/RngManipulation/PokemonBDSP_StateReidentifier.cpp
new file mode 100644
index 0000000000..098ec2dfe8
--- /dev/null
+++ b/SerialPrograms/Source/PokemonBDSP/Programs/RngManipulation/PokemonBDSP_StateReidentifier.cpp
@@ -0,0 +1,249 @@
+/*  BDSP RNG State Reidentifier
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/CancellableScope.h"
+#include "Common/Cpp/Logging/AbstractLogger.h"
+#include "PokemonBDSP_StateReidentifier.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonBDSP{
+
+using namespace Pokemon;
+
+const size_t MAX_MATCHES_TRACKED = 8;
+
+
+//  bits 1-3 say whether a blink happened, bit 0 says which kind.
+static std::vector<uint8_t> generate_nibbles(const Xorshift128State& base_state, uint64_t count){
+    std::vector<uint8_t> ret;
+    ret.reserve((size_t)count);
+    Xorshift128 rng(base_state);
+    for (uint64_t c = 0; c < count; c++){
+        ret.emplace_back((uint8_t)(rng.next() & 0x0f));
+    }
+    return ret;
+}
+static bool nibble_blinked(uint8_t nibble){
+    return (nibble & 0x0e) == 0;
+}
+static BlinkType nibble_type(uint8_t nibble){
+    return (BlinkType)(nibble & 1);
+}
+
+
+static ReidentifyResult reidentify_by_intervals(
+    const ReidentifyRequest& request,
+    Logger* logger
+){
+    ReidentifyResult result;
+
+    uint64_t stride = request.npcs;
+    uint64_t span_ticks = 0;
+    for (uint32_t interval : request.intervals){
+        if (interval == 0){
+            result.failure_reason = "An interval of zero was given. Two blinks cannot share a tick.";
+            return result;
+        }
+        span_ticks += interval;
+    }
+    uint64_t span = span_ticks * stride;
+
+    std::vector<uint8_t> nibbles = generate_nibbles(request.base_state, request.search_max + span + 1);
+
+    uint64_t first_match = 0;
+    for (uint64_t start = request.search_min; start <= request.search_max; start++){
+        if (!nibble_blinked(nibbles[(size_t)start])){
+            continue;
+        }
+
+        //  Every observed gap has to match exactly: a blink at each end, and none in any of the ticks between
+        bool matched = true;
+        uint64_t position = start;
+        for (uint32_t interval : request.intervals){
+            for (uint32_t tick = 1; tick < interval; tick++){
+                if (nibble_blinked(nibbles[(size_t)(position + (uint64_t)tick * stride)])){
+                    matched = false;
+                    break;
+                }
+            }
+            if (!matched){
+                break;
+            }
+            position += (uint64_t)interval * stride;
+            if (!nibble_blinked(nibbles[(size_t)position])){
+                matched = false;
+                break;
+            }
+        }
+        if (!matched){
+            continue;
+        }
+
+        if (result.match_count == 0){
+            first_match = start;
+        }
+        result.match_count++;
+        if (result.match_count >= MAX_MATCHES_TRACKED){
+            break;
+        }
+    }
+
+    if (result.match_count == 0){
+        result.failure_reason = "No position in the search range fits the observed blinks.";
+        return result;
+    }
+    if (result.match_count > 1){
+        result.ambiguous = true;
+        result.failure_reason = "The observed blinks fit " + std::to_string(result.match_count)
+            + " positions. Narrow the search range or collect more blinks.";
+        return result;
+    }
+
+    result.success = true;
+    result.advances_to_first_blink = first_match;
+    result.advances_to_last_blink = first_match + span;
+    if (logger != nullptr){
+        logger->log(
+            "Reidentified: " + std::to_string(result.advances_to_last_blink)
+            + " advances since the known state.",
+            COLOR_BLUE
+        );
+    }
+    return result;
+}
+
+
+static ReidentifyResult reidentify_by_types(
+    const ReidentifyRequest& request,
+    Logger* logger
+){
+    ReidentifyResult result;
+
+    size_t observed = request.types.size();
+    uint64_t range = request.search_max - request.search_min + 1;
+    //  One bit per blink
+    if (observed < 64 && ((uint64_t)1 << observed) < range){
+        result.failure_reason = "Only " + std::to_string(observed)
+            + " blink types for a range of " + std::to_string(range)
+            + " advances. This cannot identify a unique position.";
+        return result;
+    }
+
+    //  Blinks average one in eight ticks; allow enough time for uncommonly spaced out blinks
+    uint64_t stride = request.npcs;
+    uint64_t reach = (uint64_t)observed * 64 * stride;
+    std::vector<uint8_t> nibbles = generate_nibbles(request.base_state, request.search_max + reach + 1);
+
+    uint64_t first_match = 0;
+    uint64_t last_match_end = 0;
+
+    for (uint64_t phase = 0; phase < stride; phase++){
+        std::vector<uint64_t> positions;
+        std::vector<BlinkType> observed_types;
+        uint64_t scanned = 0;
+        for (uint64_t index = phase; index < nibbles.size(); index += stride, scanned++){
+            if (nibble_blinked(nibbles[(size_t)index])){
+                positions.emplace_back(index);
+                observed_types.emplace_back(nibble_type(nibbles[(size_t)index]));
+            }
+        }
+        if (positions.size() < observed){
+            continue;
+        }
+
+        for (size_t start = 0; start + observed <= positions.size(); start++){
+            if (positions[start] < request.search_min || positions[start] > request.search_max){
+                continue;
+            }
+            bool matched = true;
+            for (size_t c = 0; c < observed; c++){
+                if (observed_types[start + c] != request.types[c]){
+                    matched = false;
+                    break;
+                }
+            }
+            if (!matched){
+                continue;
+            }
+
+            if (result.match_count == 0){
+                first_match = positions[start];
+                last_match_end = positions[start + observed - 1];
+            }
+            result.match_count++;
+        }
+        if (result.match_count >= MAX_MATCHES_TRACKED){
+            break;
+        }
+    }
+
+    if (result.match_count == 0){
+        result.failure_reason = "No position in the search range fits the observed blink types.";
+        return result;
+    }
+    if (result.match_count > 1){
+        result.ambiguous = true;
+        result.failure_reason = "The observed blink types fit " + std::to_string(result.match_count)
+            + " positions. Narrow the search range or collect more blinks.";
+        return result;
+    }
+
+    result.success = true;
+    result.advances_to_first_blink = first_match;
+    result.advances_to_last_blink = last_match_end;
+    if (logger != nullptr){
+        logger->log(
+            "Reidentified: " + std::to_string(result.advances_to_last_blink)
+            + " advances since the known state.",
+            COLOR_BLUE
+        );
+    }
+    return result;
+}
+
+
+ReidentifyResult reidentify_advances(
+    const ReidentifyRequest& request,
+    Logger* logger
+){
+    ReidentifyResult result;
+
+    if (request.npcs == 0){
+        result.failure_reason = "There must be at least one NPC on screen.";
+        return result;
+    }
+    if (request.search_min > request.search_max){
+        result.failure_reason = "The search range is empty.";
+        return result;
+    }
+
+    switch (request.method){
+    case ReidentifyMethod::Intervals:
+        if (request.intervals.empty()){
+            result.failure_reason = "No intervals were given.";
+            return result;
+        }
+        return reidentify_by_intervals(request, logger);
+
+    case ReidentifyMethod::Types:
+        if (request.types.empty()){
+            result.failure_reason = "No blink types were given.";
+            return result;
+        }
+        return reidentify_by_types(request, logger);
+    }
+
+    result.failure_reason = "Unknown reidentification method.";
+    return result;
+}
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/RngManipulation/PokemonBDSP_StateReidentifier.h b/SerialPrograms/Source/PokemonBDSP/Programs/RngManipulation/PokemonBDSP_StateReidentifier.h
new file mode 100644
index 0000000000..89518ffe74
--- /dev/null
+++ b/SerialPrograms/Source/PokemonBDSP/Programs/RngManipulation/PokemonBDSP_StateReidentifier.h
@@ -0,0 +1,59 @@
+/*  BDSP RNG State Reidentifier
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonBDSP_StateReidentifier_H
+#define PokemonAutomation_PokemonBDSP_StateReidentifier_H
+
+#include <stddef.h>
+#include <stdint.h>
+#include <string>
+#include <vector>
+#include "Pokemon/Pokemon_Xorshift128.h"
+#include "PokemonBDSP_BlinkModel.h"
+
+namespace PokemonAutomation{
+    class Cancellable;
+    class Logger;
+namespace NintendoSwitch{
+namespace PokemonBDSP{
+
+
+enum class ReidentifyMethod{
+    Intervals,
+    Types,
+};
+
+
+struct ReidentifyRequest{
+    Pokemon::Xorshift128State base_state;
+    uint64_t search_min = 0;
+    uint64_t search_max = 1000000;
+    uint8_t npcs = 1;
+    ReidentifyMethod method = ReidentifyMethod::Intervals;
+    std::vector<uint32_t> intervals;
+    std::vector<BlinkType> types;
+};
+
+struct ReidentifyResult{
+    bool success = false;
+    bool ambiguous = false;
+    size_t match_count = 0;
+    uint64_t advances_to_first_blink = 0;
+    uint64_t advances_to_last_blink = 0;
+    std::string failure_reason;
+};
+
+
+ReidentifyResult reidentify_advances(
+    const ReidentifyRequest& request,
+    Logger* logger = nullptr
+);
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/RngManipulation/PokemonBDSP_StateSolver.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/RngManipulation/PokemonBDSP_StateSolver.cpp
new file mode 100644
index 0000000000..71dd8a5ac5
--- /dev/null
+++ b/SerialPrograms/Source/PokemonBDSP/Programs/RngManipulation/PokemonBDSP_StateSolver.cpp
@@ -0,0 +1,464 @@
+/*  BDSP RNG State Solver
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <algorithm>
+#include <cmath>
+#include "Common/Cpp/Exceptions.h"
+#include "Common/Cpp/Logging/AbstractLogger.h"
+#include "Pokemon/Pokemon_Gf2Matrix.h"
+#include "PokemonBDSP_StateSolver.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonBDSP{
+
+using namespace Pokemon;
+
+
+//  Bits 3, 2, 1 and 0, which is what an NPC blink reveals.
+const size_t BLINK_BIT_ROW_FIRST = 124;
+
+//  Bits 22, 21, 20 and 19: the top of the fraction a Pokemon blink interval encodes.
+const size_t POKEMON_BLINK_BIT_ROW_FIRST = 105;
+
+
+const size_t MAX_ENUMERATED_BITS = 12;
+
+
+template <typename Verifier>
+static size_t count_verified_candidates(
+    const Gf2SolveResult& solved, Verifier&& verifier, Xorshift128State& winner
+){
+    size_t combinations = (size_t)1 << solved.null_space_dimension;
+    size_t verified = 0;
+    for (size_t mask = 0; mask < combinations; mask++){
+        Gf2Vec128 vector = solved.solution;
+        for (size_t bit = 0; bit < solved.null_space_dimension; bit++){
+            if (((mask >> bit) & 1) != 0){
+                vector ^= solved.null_space_basis[bit];
+            }
+        }
+        Xorshift128State candidate = xorshift128_state_from_vector(vector);
+        if (verifier(candidate)){
+            winner = candidate;
+            verified++;
+            //  Two survivors already means the answer is not pinned down.
+            if (verified > 1){
+                break;
+            }
+        }
+    }
+    return verified;
+}
+
+
+//  Double check observations against a candidate state
+static bool verify_samples(
+    const Xorshift128State& state,
+    const std::vector<BlinkSample>& samples,
+    std::string& failure_reason
+){
+    Xorshift128 rng(state);
+    uint64_t at = 0;
+    for (const BlinkSample& sample : samples){
+        while (at < sample.advance){
+            rng.next();
+            at++;
+        }
+        uint32_t roll = rng.next();
+        at++;
+
+        bool blinked = npc_blinks(roll);
+        if (blinked != sample.blinked){
+            failure_reason = blinked
+                ? "Recovered state blinks at advance " + std::to_string(sample.advance)
+                    + ", where nothing was seen."
+                : "Recovered state does not blink at advance " + std::to_string(sample.advance) + ".";
+            return false;
+        }
+        if (blinked && sample.type.has_value() && NPC_blink_type(roll) != *sample.type){
+            failure_reason = "Recovered state disagrees with the blink type at advance "
+                + std::to_string(sample.advance) + ".";
+            return false;
+        }
+    }
+    return true;
+}
+
+
+BlinkSolveResult solve_state_from_samples(const std::vector<BlinkSample>& samples, Logger* logger){
+    BlinkSolveResult result;
+
+    if (samples.empty()){
+        result.failure_reason = "No rolls were watched.";
+        return result;
+    }
+    if (samples[0].advance != 0){
+        throw InternalProgramError(
+            nullptr, PA_CURRENT_FUNCTION,
+            "solve_state_from_samples(): Samples must start at advance zero."
+        );
+    }
+
+    //  Each blink constrains the four low bits of one roll.
+    std::vector<Gf2Vec128> equations;
+    std::vector<bool> constants;
+    Gf2Matrix128 transition = xorshift128_transition_matrix();
+    uint64_t at = 0;
+    size_t blinks = 0;
+
+    for (const BlinkSample& sample : samples){
+        if (sample.advance < at){
+            throw InternalProgramError(
+                nullptr, PA_CURRENT_FUNCTION,
+                "solve_state_from_samples(): Samples are not sorted by advance."
+            );
+        }
+        if (!sample.blinked){
+            continue;
+        }
+        if (sample.advance > at){
+            transition = xorshift128_transition_power(sample.advance - at) * transition;
+            at = sample.advance;
+        }
+        blinks++;
+
+        //  Bits 3, 2 and 1 are zero whenever a blink happens at all.
+        for (size_t bit = 0; bit < 3; bit++){
+            equations.emplace_back(transition[BLINK_BIT_ROW_FIRST + bit]);
+            constants.emplace_back(false);
+        }
+        //  Bit 0 is the single/double distinction, which the detector may not have.
+        if (sample.type.has_value()){
+            equations.emplace_back(transition[BLINK_BIT_ROW_FIRST + 3]);
+            constants.emplace_back(*sample.type == BlinkType::Double);
+        }
+    }
+    result.equations_used = equations.size();
+
+    if (equations.size() < 128){
+        result.failure_reason = "Only " + std::to_string(equations.size())
+            + " equations from " + std::to_string(blinks)
+            + " blinks. At least 128 are needed.";
+        return result;
+    }
+
+    Gf2SolveResult solved = gf2_solve_128(equations, constants);
+    result.null_space_dimension = solved.null_space_dimension;
+
+    if (!solved.consistent){
+        result.failure_reason =
+            "The observations contradict each other. A blink was probably missed or invented.";
+        return result;
+    }
+    if (solved.null_space_dimension > MAX_ENUMERATED_BITS){
+        result.failure_reason = "The observations leave "
+            + std::to_string(solved.null_space_dimension)
+            + " unknown bits, too many to resolve by checking. Collect more blinks.";
+        return result;
+    }
+
+    Xorshift128State winner;
+    std::string first_rejection;
+    size_t verified = count_verified_candidates(
+        solved,
+        [&](const Xorshift128State& candidate){
+            std::string reason;
+            bool ok = verify_samples(candidate, samples, reason);
+            if (!ok && first_rejection.empty()){
+                first_rejection = std::move(reason);
+            }
+            return ok;
+        },
+        winner
+    );
+
+    if (verified == 0){
+        result.failure_reason = first_rejection.empty()
+            ? "No candidate state reproduces the observed blinks."
+            : first_rejection;
+        return result;
+    }
+    if (verified > 1){
+        result.failure_reason =
+            "More than one state reproduces the observed blinks. Collect more blinks.";
+        return result;
+    }
+
+    result.state = winner;
+    for (const BlinkSample& sample : samples){
+        if (sample.blinked){
+            result.advances_to_last_blink = sample.advance;
+        }
+    }
+    result.success = true;
+    if (logger != nullptr){
+        logger->log(
+            "Recovered RNG state " + result.state.to_string()
+            + " from " + std::to_string(blinks)
+            + " blinks over " + std::to_string(samples.size())
+            + " watched rolls (" + std::to_string(result.equations_used) + " equations).",
+            COLOR_BLUE
+        );
+    }
+    return result;
+}
+
+
+
+size_t recommended_pokemon_blink_count(double tolerance_seconds){
+    double bucket_seconds =
+        (BDSP_POKEMON_BLINK_MAX_SECONDS - BDSP_POKEMON_BLINK_MIN_SECONDS)
+        / (double)((size_t)1 << BDSP_POKEMON_BLINK_KNOWN_BITS);
+
+    double usable_fraction = 1.0 - 2.0 * tolerance_seconds / bucket_seconds;
+    if (!(usable_fraction > 0.1)){
+        return 1000;
+    }
+
+    //  40 observations is 160 (not necessarily independent) equations for 128 unknowns,
+    //  which is usually enough
+    const size_t TARGET_USABLE = 40;
+    return (size_t)((double)TARGET_USABLE / usable_fraction * 1.1) + 1;
+}
+
+
+static bool verify_pokemon_solution(
+    const Xorshift128State& state,
+    const std::vector<double>& intervals,
+    double tolerance_seconds,
+    double& worst_residual_seconds,
+    size_t& mistimed,
+    std::string& failure_reason
+){
+    Xorshift128 rng(state);
+    worst_residual_seconds = 0;
+    mistimed = 0;
+
+    //  One in eight, and never fewer than two, so that a short capture is not held
+    //  to a stricter standard than a long one.
+    size_t allowed = intervals.size() / 8;
+    allowed = allowed < 2 ? 2 : allowed;
+
+    for (size_t c = 0; c < intervals.size(); c++){
+        double expected = bdsp_pokemon_blink_interval(rng.next());
+        double residual = std::abs(intervals[c] - expected);
+        if (residual > tolerance_seconds){
+            mistimed++;
+            continue;
+        }
+        //  Reported over the agreeing intervals only, so that it measures the
+        //  timing precision rather than the size of an outlier.
+        if (residual > worst_residual_seconds){
+            worst_residual_seconds = residual;
+        }
+    }
+
+    if (mistimed > allowed){
+        failure_reason = std::to_string(mistimed) + " of " + std::to_string(intervals.size())
+            + " intervals disagree with the recovered state, which is too many to blame on"
+            " mistimed blinks.";
+        return false;
+    }
+    return true;
+}
+
+
+PokemonBlinkSolveResult solve_state_from_pokemon_blinks(
+    const PokemonBlinkSolveRequest& request,
+    Logger* logger
+){
+    PokemonBlinkSolveResult result;
+
+    if (request.intervals.empty()){
+        result.failure_reason = "No intervals were given.";
+        return result;
+    }
+    if (!(request.tolerance_seconds > 0.0)){
+        result.failure_reason = "The tolerance must be positive.";
+        return result;
+    }
+
+    struct Reading{
+        size_t index;
+        uint32_t bucket;
+        double margin;
+    };
+    std::vector<Reading> readings;
+    readings.reserve(request.intervals.size());
+
+    for (size_t c = 0; c < request.intervals.size(); c++){
+        Reading reading{c, 0, 0.0};
+        if (!bdsp_pokemon_blink_bucket_with_margin(request.intervals[c], reading.bucket, reading.margin)){
+            //  Not a gap the game could ever have produced.
+            result.observations_discarded++;
+            continue;
+        }
+        readings.emplace_back(reading);
+    }
+
+    std::sort(
+        readings.begin(), readings.end(),
+        [](const Reading& a, const Reading& b){
+            //  Index breaks ties so the choice of subset is reproducible.
+            return a.margin != b.margin ? a.margin > b.margin : a.index < b.index;
+        }
+    );
+
+    const size_t MINIMUM = 128 / BDSP_POKEMON_BLINK_KNOWN_BITS;
+    size_t confident = 0;
+    while (confident < readings.size() && readings[confident].margin >= request.tolerance_seconds){
+        confident++;
+    }
+
+    if (readings.size() < MINIMUM){
+        result.observations_discarded = request.intervals.size() - readings.size();
+        result.failure_reason = "Only " + std::to_string(readings.size())
+            + " of " + std::to_string(request.intervals.size())
+            + " intervals were usable at all. At least " + std::to_string(MINIMUM)
+            + " are needed. Collect more blinks.";
+        return result;
+    }
+
+    size_t use = confident > MINIMUM ? confident : MINIMUM;
+
+    const Gf2Matrix128& step = xorshift128_transition_matrix();
+    std::vector<Gf2Matrix128> transitions;
+    transitions.reserve(request.intervals.size());
+    {
+        //  Every blink costs exactly one advance,
+        // so intervals[c] comes from the (c + 1)th roll
+        Gf2Matrix128 transition = step;
+        for (size_t c = 0; c < request.intervals.size(); c++){
+            if (c != 0){
+                transition = step * transition;
+            }
+            transitions.emplace_back(transition);
+        }
+    }
+
+    //  Try the whole confident set, and if that fails, try leaving out one
+    //  observation at a time.
+
+    std::string last_failure;
+    for (size_t trial = 0; trial < request.max_attempts; trial++){
+        bool leave_one_out = trial > 0;
+        if (leave_one_out && (use <= MINIMUM || trial > use)){
+            //  Nothing left to spare without going under the minimum.
+            break;
+        }
+        //  On trial n>0, skip the nth least confident reading in the used set.
+        size_t omitted = leave_one_out ? use - trial : use;
+        result.attempts = trial + 1;
+
+        std::vector<Gf2Vec128> equations;
+        std::vector<bool> constants;
+        equations.reserve(use * BDSP_POKEMON_BLINK_KNOWN_BITS);
+        constants.reserve(use * BDSP_POKEMON_BLINK_KNOWN_BITS);
+
+        double weakest = 0;
+        size_t count = 0;
+        for (size_t c = 0; c < use; c++){
+            if (c == omitted){
+                continue;
+            }
+            const Reading& reading = readings[c];
+            const Gf2Matrix128& transition = transitions[reading.index];
+            //  The bucket's bits, most significant first, matching the row order.
+            for (size_t bit = 0; bit < BDSP_POKEMON_BLINK_KNOWN_BITS; bit++){
+                equations.emplace_back(transition[POKEMON_BLINK_BIT_ROW_FIRST + bit]);
+                size_t shift = BDSP_POKEMON_BLINK_KNOWN_BITS - 1 - bit;
+                constants.emplace_back(((reading.bucket >> shift) & 1) != 0);
+            }
+            weakest = reading.margin;
+            count++;
+        }
+
+        Gf2SolveResult solved = gf2_solve_128(equations, constants);
+
+        if (!solved.consistent){
+            last_failure = "The intervals contradict each other.";
+            continue;
+        }
+        if (solved.null_space_dimension > MAX_ENUMERATED_BITS){
+            //  Leaving more out can only make this worse.
+            result.null_space_dimension = solved.null_space_dimension;
+            last_failure = "The intervals leave " + std::to_string(solved.null_space_dimension)
+                + " unknown bits, too many to resolve by checking.";
+            break;
+        }
+
+        Xorshift128State candidate;
+        double residual = 0;
+        size_t mistimed = 0;
+        size_t verified = count_verified_candidates(
+            solved,
+            [&](const Xorshift128State& trial_state){
+                double r = 0;
+                size_t m = 0;
+                std::string reason;
+                if (!verify_pokemon_solution(trial_state, request.intervals,
+                                             request.tolerance_seconds, r, m, reason)){
+                    if (last_failure.empty()){
+                        last_failure = std::move(reason);
+                    }
+                    return false;
+                }
+                residual = r;
+                mistimed = m;
+                return true;
+            },
+            candidate
+        );
+        if (verified != 1){
+            if (verified > 1){
+                last_failure = "More than one state fits these intervals.";
+            }
+            continue;
+        }
+
+        result.state = candidate;
+        result.advances_to_last_interval = request.intervals.size() - 1;
+        result.observations_used = count;
+        result.observations_discarded = request.intervals.size() - count;
+        result.equations_used = equations.size();
+        result.weakest_margin_used = weakest;
+        result.null_space_dimension = 0;
+        result.worst_residual_seconds = residual;
+        result.mistimed_intervals = mistimed;
+        result.success = true;
+        break;
+    }
+
+    if (!result.success){
+        result.failure_reason = last_failure.empty()
+            ? "Could not recover a state from these intervals."
+            : last_failure + " Tried " + std::to_string(result.attempts)
+                + " subsets of the most confident observations without success. "
+                "At least one interval was probably mistimed; collect more blinks.";
+        return result;
+    }
+
+    if (logger != nullptr){
+        logger->log(
+            "Recovered RNG state " + result.state.to_string()
+            + " from " + std::to_string(result.observations_used)
+            + " of " + std::to_string(request.intervals.size())
+            + " intervals (worst residual " + std::to_string(result.worst_residual_seconds)
+            + "s, weakest reading had " + std::to_string(result.weakest_margin_used)
+            + "s of room).",
+            COLOR_BLUE
+        );
+    }
+    return result;
+}
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/RngManipulation/PokemonBDSP_StateSolver.h b/SerialPrograms/Source/PokemonBDSP/Programs/RngManipulation/PokemonBDSP_StateSolver.h
new file mode 100644
index 0000000000..b283b4dfde
--- /dev/null
+++ b/SerialPrograms/Source/PokemonBDSP/Programs/RngManipulation/PokemonBDSP_StateSolver.h
@@ -0,0 +1,81 @@
+/*  BDSP RNG State Solver
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonBDSP_StateSolver_H
+#define PokemonAutomation_PokemonBDSP_StateSolver_H
+
+#include <stddef.h>
+#include <stdint.h>
+#include <optional>
+#include <string>
+#include <vector>
+#include "Pokemon/Pokemon_Xorshift128.h"
+#include "PokemonBDSP_BlinkModel.h"
+
+namespace PokemonAutomation{
+    class Logger;
+namespace NintendoSwitch{
+namespace PokemonBDSP{
+
+
+struct BlinkSolveResult{
+    bool success = false;
+    Pokemon::Xorshift128State state;
+    uint64_t advances_to_last_blink = 0;
+    size_t equations_used = 0;
+    size_t null_space_dimension = 0;
+    std::string failure_reason;
+};
+
+
+struct BlinkSample{
+    uint64_t advance = 0;
+    bool blinked = false;
+    std::optional<BlinkType> type;
+};
+
+
+BlinkSolveResult solve_state_from_samples(
+    const std::vector<BlinkSample>& samples, Logger* logger = nullptr
+);
+
+
+struct PokemonBlinkSolveRequest{
+    std::vector<double> intervals;
+    double tolerance_seconds = 0.1;
+    size_t max_attempts = 64;
+};
+
+
+struct PokemonBlinkSolveResult{
+    bool success = false;
+    Pokemon::Xorshift128State state;
+    uint64_t advances_to_last_interval = 0;
+    size_t observations_used = 0;
+    size_t observations_discarded = 0;
+    size_t equations_used = 0;
+    size_t null_space_dimension = 0;
+    size_t attempts = 0;
+    double weakest_margin_used = 0;
+    size_t mistimed_intervals = 0;
+    double worst_residual_seconds = 0;
+    std::string failure_reason;
+};
+
+
+size_t recommended_pokemon_blink_count(double tolerance_seconds = 0.1);
+
+
+PokemonBlinkSolveResult solve_state_from_pokemon_blinks(
+    const PokemonBlinkSolveRequest& request,
+    Logger* logger = nullptr
+);
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_LegendaryReset.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_LegendaryReset.cpp
index 41e030ce11..a7067492fc 100644
--- a/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_LegendaryReset.cpp
+++ b/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_LegendaryReset.cpp
@@ -1,21 +1,20 @@
 /*  Shiny Hunt - Legendary Reset
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include "Common/Cpp/Exceptions.h"
 #include "CommonFramework/Notifications/ProgramNotifications.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
+#include "CommonTools/Async/InferenceRoutines.h"
 #include "NintendoSwitch/NintendoSwitch_Settings.h"
 #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "PokemonSwSh/ShinyHuntTracker.h"
-#include "PokemonBDSP/PokemonBDSP_Settings.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
 #include "PokemonBDSP/Inference/Battles/PokemonBDSP_StartBattleDetector.h"
 #include "PokemonBDSP/Inference/Battles/PokemonBDSP_BattleMenuDetector.h"
 #include "PokemonBDSP/Inference/ShinyDetection/PokemonBDSP_ShinyEncounterDetector.h"
 #include "PokemonBDSP/Programs/PokemonBDSP_GameEntry.h"
 #include "PokemonBDSP/Programs/PokemonBDSP_EncounterHandler.h"
+#include "VideoGames/PokemonSwSh/ShinyHuntTracker.h"
 #include "PokemonBDSP_LegendaryReset.h"
 
 namespace PokemonAutomation{
@@ -27,11 +26,12 @@ LegendaryReset_Descriptor::LegendaryReset_Descriptor()
     : SingleSwitchProgramDescriptor(
         "PokemonBDSP:LegendaryReset",
         STRING_POKEMON + " BDSP", "Legendary Reset",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonBDSP/LegendaryReset.md",
+        "Programs/PokemonBDSP/LegendaryReset.html",
         "Shiny hunt a standing legendary " + STRING_POKEMON + ".",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
         FeedbackType::REQUIRED,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
     )
 {}
 std::unique_ptr<StatsTracker> LegendaryReset_Descriptor::make_stats() const{
@@ -43,7 +43,7 @@ LegendaryReset::LegendaryReset()
     : GO_HOME_WHEN_DONE(false)
     , WALK_UP(
         "<b>Walk Up:</b><br>Walk up while mashing A to trigger encounter.",
-        LockWhileRunning::LOCKED,
+        LockMode::LOCK_WHILE_RUNNING,
         false
     )
     , ENCOUNTER_BOT_OPTIONS(false)
@@ -68,7 +68,7 @@ LegendaryReset::LegendaryReset()
 
 
 
-void LegendaryReset::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
+void LegendaryReset::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
     PokemonSwSh::ShinyHuntTracker& stats = env.current_stats<PokemonSwSh::ShinyHuntTracker>();
 
     StandardEncounterHandler handler(
@@ -80,14 +80,14 @@ void LegendaryReset::program(SingleSwitchProgramEnvironment& env, BotBaseContext
     LeadingShinyTracker lead_tracker(env.console);
 
     //  Connect the controller.
-    pbf_press_button(context, BUTTON_B, 5, 5);
+    require_player(env.console, context, BUTTON_B);
 
     bool reset = false;
     while (true){
         env.update_stats();
 
         if (reset){
-            pbf_press_button(context, BUTTON_HOME, 10, GameSettings::instance().GAME_TO_HOME_DELAY);
+            go_home(env.console, context);
             if (!reset_game_from_home(env, env.console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST)){
                 stats.add_error();
                 continue;
@@ -98,15 +98,15 @@ void LegendaryReset::program(SingleSwitchProgramEnvironment& env, BotBaseContext
         StartBattleDetector start_battle(env.console);
         BattleMenuWatcher battle_menu(BattleType::STANDARD);
 
-        int ret = run_until(
+        int ret = run_until<ProControllerContext>(
             env.console, context,
-            [this](BotBaseContext& context){
+            [this](ProControllerContext& context){
                 size_t stop = WALK_UP ? 30 : 60;
                 for (size_t c = 0; c < stop; c++){
                     if (WALK_UP){
-                        pbf_move_left_joystick(context, 128, 0, 125, 0);
+                        pbf_move_left_joystick(context, {0, +1}, 1000ms, 0ms);
                     }
-                    pbf_mash_button(context, BUTTON_ZL, 125);
+                    pbf_mash_button(context, BUTTON_ZL, 1000ms);
                 }
             },
             {
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_LegendaryReset.h b/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_LegendaryReset.h
index 524a0fbcae..ac210bf068 100644
--- a/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_LegendaryReset.h
+++ b/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_LegendaryReset.h
@@ -1,6 +1,6 @@
 /*  Shiny Hunt - Legendary Reset
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -29,9 +29,10 @@ class LegendaryReset_Descriptor : public SingleSwitchProgramDescriptor{
 
 class LegendaryReset : public SingleSwitchProgramInstance{
 public:
+    using Descriptor = LegendaryReset_Descriptor;
     LegendaryReset();
 
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
 
 
 private:
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_ShinyHunt-Fishing.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_ShinyHunt-Fishing.cpp
index 714d3763a9..76897a64e3 100644
--- a/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_ShinyHunt-Fishing.cpp
+++ b/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_ShinyHunt-Fishing.cpp
@@ -1,20 +1,20 @@
 /*  Shiny Hunt - Fishing
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include "CommonFramework/Notifications/ProgramNotifications.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
+#include "CommonTools/Async/InferenceRoutines.h"
 #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "PokemonSwSh/ShinyHuntTracker.h"
-#include "PokemonBDSP/PokemonBDSP_Settings.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
 #include "PokemonBDSP/Inference/PokemonBDSP_DialogDetector.h"
 #include "PokemonBDSP/Inference/PokemonBDSP_MarkFinder.h"
 #include "PokemonBDSP/Inference/Battles/PokemonBDSP_StartBattleDetector.h"
 #include "PokemonBDSP/Inference/Battles/PokemonBDSP_BattleMenuDetector.h"
 #include "PokemonBDSP/Inference/ShinyDetection/PokemonBDSP_ShinyEncounterDetector.h"
 #include "PokemonBDSP/Programs/PokemonBDSP_EncounterHandler.h"
+#include "VideoGames/PokemonSwSh/ShinyHuntTracker.h"
 #include "PokemonBDSP_ShinyHunt-Fishing.h"
 
 namespace PokemonAutomation{
@@ -26,11 +26,12 @@ ShinyHuntFishing_Descriptor::ShinyHuntFishing_Descriptor()
     : SingleSwitchProgramDescriptor(
         "PokemonBDSP:ShinyHuntFishing",
         STRING_POKEMON + " BDSP", "Shiny Hunt - Fishing",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonBDSP/ShinyHunt-Fishing.md",
+        "Programs/PokemonBDSP/ShinyHunt-Fishing.html",
         "Shiny hunt fishing " + STRING_POKEMON + ".",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
         FeedbackType::REQUIRED,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
     )
 {}
 struct ShinyHuntFishing_Descriptor::Stats : public PokemonSwSh::ShinyHuntTracker{
@@ -66,11 +67,10 @@ ShinyHuntFishing::ShinyHuntFishing()
     , m_advanced_options(
         "<font size=4><b>Advanced Options:</b> You should not need to touch anything below here.</font>"
     )
-    , EXIT_BATTLE_TIMEOUT(
+    , EXIT_BATTLE_TIMEOUT0(
         "<b>Exit Battle Timeout:</b><br>After running, wait this long to return to overworld.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "10 * TICKS_PER_SECOND"
+        LockMode::LOCK_WHILE_RUNNING,
+        "10 s"
     )
 {
     PA_ADD_OPTION(GO_HOME_WHEN_DONE);
@@ -83,8 +83,7 @@ ShinyHuntFishing::ShinyHuntFishing()
     PA_ADD_OPTION(NOTIFICATIONS);
 
     PA_ADD_STATIC(m_advanced_options);
-//    PA_ADD_OPTION(WATCHDOG_TIMER);
-    PA_ADD_OPTION(EXIT_BATTLE_TIMEOUT);
+    PA_ADD_OPTION(EXIT_BATTLE_TIMEOUT0);
 }
 
 
@@ -92,7 +91,7 @@ ShinyHuntFishing::ShinyHuntFishing()
 
 
 
-void ShinyHuntFishing::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
+void ShinyHuntFishing::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
     ShinyHuntFishing_Descriptor::Stats& stats = env.current_stats<ShinyHuntFishing_Descriptor::Stats>();
 
     StandardEncounterHandler handler(
@@ -104,12 +103,12 @@ void ShinyHuntFishing::program(SingleSwitchProgramEnvironment& env, BotBaseConte
     LeadingShinyTracker lead_tracker(env.console);
 
     //  Connect the controller.
-    pbf_press_button(context, BUTTON_B, 5, 5);
+    require_player(env.console, context, BUTTON_B);
 
     //  Encounter Loop
     while (true){
         env.update_stats();
-        pbf_mash_button(context, BUTTON_B, TICKS_PER_SECOND);
+        pbf_mash_button(context, BUTTON_B, 1000ms);
         context.wait_for_all_requests();
 
         {
@@ -117,10 +116,10 @@ void ShinyHuntFishing::program(SingleSwitchProgramEnvironment& env, BotBaseConte
             MarkDetector mark_detector(env.console, {0.4, 0.2, 0.2, 0.5});
             StartBattleDetector battle(env.console);
             BattleMenuWatcher battle_menu(BattleType::STANDARD);
-            int ret = run_until(
+            int ret = run_until<ProControllerContext>(
                 env.console, context,
-                [this](BotBaseContext& context){
-                    SHORTCUT.run(context, 30 * TICKS_PER_SECOND);
+                [this](ProControllerContext& context){
+                    SHORTCUT.run(context, 30000ms);
                 },
                 {
                     {dialog_detector},
@@ -135,12 +134,12 @@ void ShinyHuntFishing::program(SingleSwitchProgramEnvironment& env, BotBaseConte
                 continue;
             case 1:
                 env.log("Hooked something!", COLOR_BLUE);
-                pbf_press_button(context, BUTTON_ZL, 10, TICKS_PER_SECOND);
+                pbf_press_button(context, BUTTON_ZL, 80ms, 1000ms);
                 break;
             case 2:
                 env.log("Unexpected battle menu.", COLOR_RED);
                 stats.add_error();
-                handler.run_away_due_to_error(EXIT_BATTLE_TIMEOUT);
+                handler.run_away_due_to_error(EXIT_BATTLE_TIMEOUT0);
                 continue;
             default:
                 env.log("Timed out.", COLOR_RED);
@@ -159,12 +158,12 @@ void ShinyHuntFishing::program(SingleSwitchProgramEnvironment& env, BotBaseConte
             );
             switch (ret){
             case 0:
-                pbf_mash_button(context, BUTTON_B, TICKS_PER_SECOND);
+                pbf_mash_button(context, BUTTON_B, 1000ms);
                 break;
             case 1:
                 env.log("Unexpected battle menu.", COLOR_RED);
                 stats.add_error();
-                handler.run_away_due_to_error(EXIT_BATTLE_TIMEOUT);
+                handler.run_away_due_to_error(EXIT_BATTLE_TIMEOUT0);
                 continue;
             default:
                 env.log("Timed out.", COLOR_RED);
@@ -188,7 +187,7 @@ void ShinyHuntFishing::program(SingleSwitchProgramEnvironment& env, BotBaseConte
             case 1:
                 env.log("Unexpected battle menu.", COLOR_RED);
                 stats.add_error();
-                handler.run_away_due_to_error(EXIT_BATTLE_TIMEOUT);
+                handler.run_away_due_to_error(EXIT_BATTLE_TIMEOUT0);
                 continue;
             default:
                 env.log("Missed the hook.", COLOR_ORANGE);
@@ -209,7 +208,9 @@ void ShinyHuntFishing::program(SingleSwitchProgramEnvironment& env, BotBaseConte
             ENCOUNTER_BOT_OPTIONS.USE_SOUND_DETECTION
         );
 
-        bool stop = handler.handle_standard_encounter_end_battle(result_wild, EXIT_BATTLE_TIMEOUT);
+        bool stop = handler.handle_standard_encounter_end_battle(
+            result_wild, EXIT_BATTLE_TIMEOUT0
+        );
         if (stop){
             break;
         }
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_ShinyHunt-Fishing.h b/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_ShinyHunt-Fishing.h
index d2c3c5dd39..61cbe8d0bc 100644
--- a/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_ShinyHunt-Fishing.h
+++ b/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_ShinyHunt-Fishing.h
@@ -1,6 +1,6 @@
 /*  Shiny Hunt - Fishing
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -8,7 +8,7 @@
 #define PokemonAutomation_PokemonBDSP_ShinyHuntFishing_H
 
 #include "Common/Cpp/Options/StaticTextOption.h"
-#include "Common/Cpp/Options/TimeExpressionOption.h"
+#include "Common/Cpp/Options/TimeDurationOption.h"
 #include "CommonFramework/Notifications/EventNotificationsTable.h"
 #include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
 #include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
@@ -32,12 +32,13 @@ class ShinyHuntFishing_Descriptor : public SingleSwitchProgramDescriptor{
 
 class ShinyHuntFishing : public SingleSwitchProgramInstance{
 public:
+    using Descriptor = ShinyHuntFishing_Descriptor;
     ShinyHuntFishing();
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
 
 
 private:
-    void run_trigger(BotBaseContext& context) const;
+    void run_trigger(ProControllerContext& context) const;
     bool find_encounter(SingleSwitchProgramEnvironment& env) const;
 
 private:
@@ -52,7 +53,7 @@ class ShinyHuntFishing : public SingleSwitchProgramInstance{
     EventNotificationsOption NOTIFICATIONS;
 
     SectionDividerOption m_advanced_options;
-    TimeExpressionOption<uint16_t> EXIT_BATTLE_TIMEOUT;
+    MillisecondsOption EXIT_BATTLE_TIMEOUT0;
 };
 
 
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_ShinyHunt-Overworld.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_ShinyHunt-Overworld.cpp
index 9f8b96310b..352e787c33 100644
--- a/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_ShinyHunt-Overworld.cpp
+++ b/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_ShinyHunt-Overworld.cpp
@@ -1,18 +1,17 @@
 /*  Shiny Hunt Autonomous - Overworld
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include "CommonFramework/Exceptions/OperationFailedException.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
 #include "CommonFramework/Notifications/ProgramNotifications.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
 #include "NintendoSwitch/NintendoSwitch_Settings.h"
-#include "PokemonSwSh/ShinyHuntTracker.h"
-#include "PokemonBDSP/PokemonBDSP_Settings.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
 #include "PokemonBDSP/Inference/ShinyDetection/PokemonBDSP_ShinyEncounterDetector.h"
 #include "PokemonBDSP/Programs/PokemonBDSP_EncounterHandler.h"
 #include "PokemonBDSP/Programs/PokemonBDSP_GameEntry.h"
+#include "VideoGames/PokemonSwSh/ShinyHuntTracker.h"
 #include "PokemonBDSP_ShinyHunt-Overworld.h"
 
 namespace PokemonAutomation{
@@ -24,11 +23,12 @@ ShinyHuntOverworld_Descriptor::ShinyHuntOverworld_Descriptor()
     : SingleSwitchProgramDescriptor(
         "PokemonBDSP:ShinyHuntOverworld",
         STRING_POKEMON + " BDSP", "Shiny Hunt - Overworld",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonBDSP/ShinyHunt-Overworld.md",
+        "Programs/PokemonBDSP/ShinyHunt-Overworld.html",
         "Shiny hunt overworld " + STRING_POKEMON + ".",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
         FeedbackType::REQUIRED,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
     )
 {}
 struct ShinyHuntOverworld_Descriptor::Stats : public PokemonSwSh::ShinyHuntTracker{
@@ -54,7 +54,7 @@ ShinyHuntOverworld::ShinyHuntOverworld()
         "<b>Reset Game in Case of Error:</b><br>"
         "When the program encounters an error, whether to reset the game to fix it.<br>"
         "<b>Make sure you have set \"Throw balls. Save if caught.\" in Option Overrides if you don't stop when finding a shiny.</b>",
-        LockWhileRunning::LOCKED,
+        LockMode::LOCK_WHILE_RUNNING,
         false
     )
     , NOTIFICATIONS({
@@ -69,11 +69,10 @@ ShinyHuntOverworld::ShinyHuntOverworld()
     , m_advanced_options(
         "<font size=4><b>Advanced Options:</b> You should not need to touch anything below here.</font>"
     )
-    , EXIT_BATTLE_TIMEOUT(
+    , EXIT_BATTLE_TIMEOUT0(
         "<b>Exit Battle Timeout:</b><br>After running, wait this long to return to overworld.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "10 * TICKS_PER_SECOND"
+        LockMode::LOCK_WHILE_RUNNING,
+        "10 s"
     )
 {
     PA_ADD_OPTION(GO_HOME_WHEN_DONE);
@@ -87,8 +86,8 @@ ShinyHuntOverworld::ShinyHuntOverworld()
     PA_ADD_OPTION(NOTIFICATIONS);
 
     PA_ADD_STATIC(m_advanced_options);
-//    PA_ADD_OPTION(WATCHDOG_TIMER);
-    PA_ADD_OPTION(EXIT_BATTLE_TIMEOUT);
+//    PA_ADD_OPTION(WATCHDOG_TIMER0);
+    PA_ADD_OPTION(EXIT_BATTLE_TIMEOUT0);
 }
 
 
@@ -96,7 +95,7 @@ ShinyHuntOverworld::ShinyHuntOverworld()
 
 
 
-void ShinyHuntOverworld::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
+void ShinyHuntOverworld::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
     OverlayLogTextScope overlay_log_text_scope(env.console.overlay());
     ShinyHuntOverworld_Descriptor::Stats& stats = env.current_stats<ShinyHuntOverworld_Descriptor::Stats>();
     env.update_stats();
@@ -110,7 +109,7 @@ void ShinyHuntOverworld::program(SingleSwitchProgramEnvironment& env, BotBaseCon
     LeadingShinyTracker lead_tracker(env.console);
 
     //  Connect the controller.
-    pbf_press_button(context, BUTTON_B, 5, 5);
+    require_player(env.console, context, BUTTON_B);
 
     //  Encounter Loop
     while (true){
@@ -119,7 +118,7 @@ void ShinyHuntOverworld::program(SingleSwitchProgramEnvironment& env, BotBaseCon
             bool battle = TRIGGER_METHOD.find_encounter(env.console, context);
             if (!battle){
                 stats.add_error();
-                handler.run_away_due_to_error(EXIT_BATTLE_TIMEOUT);
+                handler.run_away_due_to_error(EXIT_BATTLE_TIMEOUT0);
                 continue;
             }
             env.console.overlay().add_log("Battle started", COLOR_GREEN);
@@ -140,22 +139,27 @@ void ShinyHuntOverworld::program(SingleSwitchProgramEnvironment& env, BotBaseCon
     //        result_wild.left_is_shiny = false;
     //        result_wild.right_is_shiny = true;
 
-            bool stop = handler.handle_standard_encounter_end_battle(result_wild, EXIT_BATTLE_TIMEOUT);
+            bool stop = handler.handle_standard_encounter_end_battle(
+                result_wild, EXIT_BATTLE_TIMEOUT0
+            );
 
             if (stop){
                 break;
             }
             lead_tracker.report_result(result_own.shiny_type);
 
-        }catch (OperationFailedException& e){
+        }catch (OperationFailedExceptionWithScreenshot& e){
             if (!RESET_GAME_WHEN_ERROR){
                 throw;
             }
-            e.send_notification(env, NOTIFICATION_ERROR_RECOVERABLE);
+            e.send_recoverable_error_notif_and_telemetry_report(env, NOTIFICATION_ERROR_RECOVERABLE);
 
             stats.add_error();
-            pbf_press_button(context, BUTTON_HOME, 10, GameSettings::instance().GAME_TO_HOME_DELAY);
-            if (!reset_game_from_home(env, env.console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST)){
+            go_home(env.console, context);
+            if (!reset_game_from_home(
+                env, env.console, context,
+                ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST
+            )){
                 stats.add_error();
                 continue;
             }
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_ShinyHunt-Overworld.h b/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_ShinyHunt-Overworld.h
index d400b2b6ad..67a3a85916 100644
--- a/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_ShinyHunt-Overworld.h
+++ b/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_ShinyHunt-Overworld.h
@@ -1,6 +1,6 @@
 /*  Shiny Hunt - Overworld
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -8,7 +8,7 @@
 #define PokemonAutomation_PokemonBDSP_ShinyHuntOverworld_H
 
 #include "Common/Cpp/Options/StaticTextOption.h"
-#include "Common/Cpp/Options/TimeExpressionOption.h"
+#include "Common/Cpp/Options/TimeDurationOption.h"
 #include "CommonFramework/Notifications/EventNotificationsTable.h"
 #include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
 #include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
@@ -32,8 +32,9 @@ class ShinyHuntOverworld_Descriptor : public SingleSwitchProgramDescriptor{
 
 class ShinyHuntOverworld : public SingleSwitchProgramInstance{
 public:
+    using Descriptor = ShinyHuntOverworld_Descriptor;
     ShinyHuntOverworld();
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
 
 
 private:
@@ -50,8 +51,8 @@ class ShinyHuntOverworld : public SingleSwitchProgramInstance{
     EventNotificationsOption NOTIFICATIONS;
 
     SectionDividerOption m_advanced_options;
-//    TimeExpressionOption<uint16_t> WATCHDOG_TIMER;
-    TimeExpressionOption<uint16_t> EXIT_BATTLE_TIMEOUT;
+//    MillisecondsOption WATCHDOG_TIMER0;
+    MillisecondsOption EXIT_BATTLE_TIMEOUT0;
 };
 
 
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_ShinyHunt-Shaymin.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_ShinyHunt-Shaymin.cpp
index 3464e6e26d..094ef9379b 100644
--- a/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_ShinyHunt-Shaymin.cpp
+++ b/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_ShinyHunt-Shaymin.cpp
@@ -1,19 +1,20 @@
 /*  Shiny Hunt - Shaymin Runaway
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include "CommonFramework/Notifications/ProgramNotifications.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
-#include "NintendoSwitch/NintendoSwitch_Settings.h"
+#include "CommonTools/Async/InferenceRoutines.h"
 #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "PokemonSwSh/ShinyHuntTracker.h"
-#include "PokemonBDSP/PokemonBDSP_Settings.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
 #include "PokemonBDSP/Inference/Battles/PokemonBDSP_StartBattleDetector.h"
 #include "PokemonBDSP/Inference/Battles/PokemonBDSP_BattleMenuDetector.h"
 #include "PokemonBDSP/Inference/ShinyDetection/PokemonBDSP_ShinyEncounterDetector.h"
 #include "PokemonBDSP/Programs/PokemonBDSP_EncounterHandler.h"
+#include "VideoGames/PokemonSwSh/ShinyHuntTracker.h"
 #include "PokemonBDSP_ShinyHunt-Shaymin.h"
 
 namespace PokemonAutomation{
@@ -25,11 +26,12 @@ ShinyHuntShaymin_Descriptor::ShinyHuntShaymin_Descriptor()
     : SingleSwitchProgramDescriptor(
         "PokemonBDSP:ShinyHuntShaymin",
         STRING_POKEMON + " BDSP", "Shiny Hunt - Shaymin",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonBDSP/ShinyHunt-Shaymin.md",
+        "Programs/PokemonBDSP/ShinyHunt-Shaymin.html",
         "Shiny hunt Shaymin using the runaway method.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
         FeedbackType::REQUIRED,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
     )
 {}
 std::unique_ptr<StatsTracker> ShinyHuntShaymin_Descriptor::make_stats() const{
@@ -53,11 +55,10 @@ ShinyHuntShaymin::ShinyHuntShaymin()
     , m_advanced_options(
         "<font size=4><b>Advanced Options:</b> You should not need to touch anything below here.</font>"
     )
-    , EXIT_BATTLE_TIMEOUT(
+    , EXIT_BATTLE_TIMEOUT0(
         "<b>Exit Battle Timeout:</b><br>After running, wait this long to return to overworld.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "10 * TICKS_PER_SECOND"
+        LockMode::LOCK_WHILE_RUNNING,
+        "10 s"
     )
 {
     PA_ADD_OPTION(GO_HOME_WHEN_DONE);
@@ -68,24 +69,23 @@ ShinyHuntShaymin::ShinyHuntShaymin()
 
     PA_ADD_STATIC(m_advanced_options);
 //    PA_ADD_OPTION(WATCHDOG_TIMER);
-    PA_ADD_OPTION(EXIT_BATTLE_TIMEOUT);
+    PA_ADD_OPTION(EXIT_BATTLE_TIMEOUT0);
 }
 
 
 
-bool ShinyHuntShaymin::start_encounter(SingleSwitchProgramEnvironment& env, BotBaseContext& context) const{
+bool ShinyHuntShaymin::start_encounter(SingleSwitchProgramEnvironment& env, ProControllerContext& context) const{
     context.wait_for_all_requests();
     {
         BattleMenuWatcher battle_menu_detector(BattleType::STANDARD);
         ShortDialogWatcher dialog_detector;
-        int result = run_until(
+        int ret = run_until<ProControllerContext>(
             env.console, context,
-            [&](BotBaseContext& context){
-                while (true){
-                    for (size_t c = 0; c < 5; c++){
-                        pbf_press_button(context, BUTTON_ZL, 20, 105);
-                    }
-//                    pbf_mash_button(context, BUTTON_ZL, 5 * TICKS_PER_SECOND);
+            [&](ProControllerContext& context){
+                ssf_press_dpad(context, DPAD_UP, 0ms, 10s, 0ms);
+                for (size_t c = 0; c < 10; c++){
+                    pbf_press_button(context, BUTTON_ZL, 200ms, 300ms);
+                    pbf_mash_button(context, BUTTON_B, 400ms);
                 }
             },
             {
@@ -93,7 +93,7 @@ bool ShinyHuntShaymin::start_encounter(SingleSwitchProgramEnvironment& env, BotB
                 {dialog_detector},
             }
         );
-        switch (result){
+        switch (ret){
         case 0:
             env.console.log("Unexpected Battle.", COLOR_RED);
             return false;
@@ -105,14 +105,13 @@ bool ShinyHuntShaymin::start_encounter(SingleSwitchProgramEnvironment& env, BotB
     {
         BattleMenuWatcher battle_menu_detector(BattleType::STANDARD);
         StartBattleDetector start_battle_detector(env.console);
-        int result = run_until(
+        int ret = run_until<ProControllerContext>(
             env.console, context,
-            [&](BotBaseContext& context){
-                while (true){
-                    for (size_t c = 0; c < 5; c++){
-                        pbf_press_button(context, BUTTON_ZL, 20, 105);
-                    }
-//                    pbf_mash_button(context, BUTTON_ZL, 5 * TICKS_PER_SECOND);
+            [&](ProControllerContext& context){
+                ssf_press_dpad(context, DPAD_UP, 0ms, 10s, 0ms);
+                for (size_t c = 0; c < 10; c++){
+                    pbf_press_button(context, BUTTON_ZL, 200ms, 400ms);
+                    pbf_mash_button(context, BUTTON_B, 400ms);
                 }
             },
             {
@@ -120,7 +119,7 @@ bool ShinyHuntShaymin::start_encounter(SingleSwitchProgramEnvironment& env, BotB
                 {start_battle_detector},
             }
         );
-        switch (result){
+        switch (ret){
         case 0:
             env.console.log("Unexpected Battle.", COLOR_RED);
             return false;
@@ -132,7 +131,7 @@ bool ShinyHuntShaymin::start_encounter(SingleSwitchProgramEnvironment& env, BotB
     return true;
 }
 
-void ShinyHuntShaymin::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
+void ShinyHuntShaymin::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
     PokemonSwSh::ShinyHuntTracker& stats = env.current_stats<PokemonSwSh::ShinyHuntTracker>();
     env.update_stats();
 
@@ -145,7 +144,7 @@ void ShinyHuntShaymin::program(SingleSwitchProgramEnvironment& env, BotBaseConte
     LeadingShinyTracker lead_tracker(env.console);
 
     //  Connect the controller.
-    pbf_press_button(context, BUTTON_B, 5, 5);
+    require_player(env.console, context, BUTTON_B);
 
     //  Encounter Loop
     while (true){
@@ -153,7 +152,7 @@ void ShinyHuntShaymin::program(SingleSwitchProgramEnvironment& env, BotBaseConte
         bool battle = start_encounter(env, context);
         if (!battle){
             stats.add_error();
-            handler.run_away_due_to_error(EXIT_BATTLE_TIMEOUT);
+            handler.run_away_due_to_error(EXIT_BATTLE_TIMEOUT0);
             continue;
         }
 
@@ -169,19 +168,19 @@ void ShinyHuntShaymin::program(SingleSwitchProgramEnvironment& env, BotBaseConte
             ENCOUNTER_BOT_OPTIONS.USE_SOUND_DETECTION
         );
 
-        bool stop = handler.handle_standard_encounter_end_battle(result_wild, EXIT_BATTLE_TIMEOUT);
+        bool stop = handler.handle_standard_encounter_end_battle(result_wild, EXIT_BATTLE_TIMEOUT0);
         if (stop){
             break;
         }
         lead_tracker.report_result(result_own.shiny_type);
 
         //  Clear dialogs.
-        pbf_mash_button(context, BUTTON_B, 75);
+        pbf_mash_button(context, BUTTON_B, 600ms);
 
         //  Hop on bike, ride down to seabreak path
 //        SHORTCUT.run(env.console, 0);
-        pbf_move_left_joystick(context, 128, 255, 360, 0);
-        pbf_move_left_joystick(context, 128, 0, 370, 0);
+        pbf_move_left_joystick(context, {0, -1}, 2880ms, 0ms);
+        pbf_move_left_joystick(context, {0, +1}, 3200ms, 0ms);
     }
 
     send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_ShinyHunt-Shaymin.h b/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_ShinyHunt-Shaymin.h
index 2fae425ca3..4c322ac2f3 100644
--- a/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_ShinyHunt-Shaymin.h
+++ b/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_ShinyHunt-Shaymin.h
@@ -1,6 +1,6 @@
 /*  Shiny Hunt - Shaymin Runaway
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -8,11 +8,10 @@
 #define PokemonAutomation_PokemonBDSP_ShinyHuntShaymin_H
 
 #include "Common/Cpp/Options/StaticTextOption.h"
-#include "Common/Cpp/Options/TimeExpressionOption.h"
+#include "Common/Cpp/Options/TimeDurationOption.h"
 #include "CommonFramework/Notifications/EventNotificationsTable.h"
 #include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
 #include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-#include "Pokemon/Options/Pokemon_EncounterBotOptions.h"
 #include "PokemonBDSP/Options/PokemonBDSP_ShortcutDirection.h"
 #include "PokemonBDSP/Options/PokemonBDSP_EncounterBotCommon.h"
 
@@ -31,13 +30,14 @@ class ShinyHuntShaymin_Descriptor : public SingleSwitchProgramDescriptor{
 
 class ShinyHuntShaymin : public SingleSwitchProgramInstance{
 public:
+    using Descriptor = ShinyHuntShaymin_Descriptor;
     ShinyHuntShaymin();
 
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
 
 
 private:
-    bool start_encounter(SingleSwitchProgramEnvironment& env, BotBaseContext& context) const;
+    bool start_encounter(SingleSwitchProgramEnvironment& env, ProControllerContext& context) const;
 
 private:
     GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
@@ -49,7 +49,7 @@ class ShinyHuntShaymin : public SingleSwitchProgramInstance{
     EventNotificationsOption NOTIFICATIONS;
 
     SectionDividerOption m_advanced_options;
-    TimeExpressionOption<uint16_t> EXIT_BATTLE_TIMEOUT;
+    MillisecondsOption EXIT_BATTLE_TIMEOUT0;
 };
 
 
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_StarterReset.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_StarterReset.cpp
index 9e5b2d409b..8cef1b6d60 100644
--- a/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_StarterReset.cpp
+++ b/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_StarterReset.cpp
@@ -1,24 +1,25 @@
 /*  Starter Reset
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include "CommonFramework/Exceptions/OperationFailedException.h"
+#include "CommonFramework/GlobalAutoPaths.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
 #include "CommonFramework/ImageTypes/ImageViewRGB32.h"
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
-#include "CommonFramework/Inference/ImageMatchDetector.h"
 #include "CommonFramework/Tools/ErrorDumper.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "CommonTools/VisualDetectors/ImageMatchDetector.h"
 #include "NintendoSwitch/NintendoSwitch_Settings.h"
 #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
 #include "Pokemon/Pokemon_Notification.h"
-#include "PokemonSwSh/ShinyHuntTracker.h"
-#include "PokemonBDSP/PokemonBDSP_Settings.h"
 #include "PokemonBDSP/Resources/PokemonBDSP_NameDatabase.h"
 #include "PokemonBDSP/Programs/PokemonBDSP_GameEntry.h"
 #include "PokemonBDSP/Inference/PokemonBDSP_SelectionArrow.h"
 #include "PokemonBDSP/Inference/ShinyDetection/PokemonBDSP_ShinyEncounterDetector.h"
+#include "VideoGames/PokemonSwSh/ShinyHuntTracker.h"
 #include "PokemonBDSP_StarterReset.h"
 
 namespace PokemonAutomation{
@@ -30,11 +31,12 @@ StarterReset_Descriptor::StarterReset_Descriptor()
     : SingleSwitchProgramDescriptor(
         "PokemonBDSP:StarterReset",
         STRING_POKEMON + " BDSP", "Starter Reset",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonBDSP/StarterReset.md",
+        "Programs/PokemonBDSP/StarterReset.html",
         "Shiny hunt your starter " + STRING_POKEMON + ".",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
         FeedbackType::REQUIRED,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
     )
 {}
 struct StarterReset_Descriptor::Stats : public PokemonSwSh::ShinyHuntTracker{
@@ -42,7 +44,7 @@ struct StarterReset_Descriptor::Stats : public PokemonSwSh::ShinyHuntTracker{
         : ShinyHuntTracker(false)
         , m_shiny_starly(m_stats["Shiny Starly"])
     {
-        m_display_order.emplace_back("Shiny Starly", true);
+        m_display_order.emplace_back("Shiny Starly", HIDDEN_IF_ZERO);
     }
     std::atomic<uint64_t>& m_shiny_starly;
 };
@@ -57,18 +59,18 @@ StarterReset::StarterReset()
     , STARTER(
         "<b>Starter:</b>",
         STARTER_DATABASE,
-        LockWhileRunning::LOCKED,
+        LockMode::LOCK_WHILE_RUNNING,
         "turtwig"
     )
     , USE_SOUND_DETECTION(
         "<b>Use Sound Detection:</b><br>Use sound to improve shiny detection.<br>"
         "<b>Make sure you have correct audio input set.</b>",
-        LockWhileRunning::LOCKED,
+        LockMode::LOCK_WHILE_RUNNING,
         true
     )
     , VIDEO_ON_SHINY(
         "<b>Video Capture:</b><br>Take a video of the encounter if it is shiny.",
-        LockWhileRunning::LOCKED,
+        LockMode::LOCK_WHILE_RUNNING,
         true
     )
     , NOTIFICATION_NONSHINY(
@@ -101,13 +103,14 @@ StarterReset::StarterReset()
 
 
 
-void StarterReset::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
+void StarterReset::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
     StarterReset_Descriptor::Stats& stats = env.current_stats<StarterReset_Descriptor::Stats>();
 
-    std::shared_ptr<const ImageRGB32> briefcase = std::make_shared<const ImageRGB32>(RESOURCE_PATH() + "PokemonBDSP/StarterBriefcase.png");
+    std::shared_ptr<const ImageRGB32> briefcase =
+        std::make_shared<const ImageRGB32>(RESOURCE_PATH() + "PokemonBDSP/StarterBriefcase.png");
 
     //  Connect the controller.
-    pbf_press_button(context, BUTTON_B, 5, 5);
+    require_player(env.console, context, BUTTON_B);
 
     size_t consecutive_failures = 0;
 
@@ -116,15 +119,15 @@ void StarterReset::program(SingleSwitchProgramEnvironment& env, BotBaseContext&
         env.update_stats();
 
         if (consecutive_failures >= 3){
-            throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, env.console,
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
                 "Failed 3 times in the row.",
-                true
+                env.console
             );
         }
 
         if (reset){
-            pbf_press_button(context, BUTTON_HOME, 10, GameSettings::instance().GAME_TO_HOME_DELAY);
+            go_home(env.console, context);
             if (!reset_game_from_home(env, env.console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST)){
                 stats.add_error();
                 consecutive_failures++;
@@ -134,14 +137,14 @@ void StarterReset::program(SingleSwitchProgramEnvironment& env, BotBaseContext&
         reset = true;
 
         //  Enter the lake.
-        pbf_move_left_joystick(context, 128, 0, TICKS_PER_SECOND, 0);
+        pbf_move_left_joystick(context, {0, +1}, 1000ms, 0ms);
 
         //  Mash B until we see the briefcase.
         ImageMatchWatcher detector(briefcase, {0.5, 0.1, 0.5, 0.7}, 100, true);
-        int ret = run_until(
+        int ret = run_until<ProControllerContext>(
             env.console, context,
-            [](BotBaseContext& context){
-                pbf_mash_button(context, BUTTON_B, 120 * TICKS_PER_SECOND);
+            [](ProControllerContext& context){
+                pbf_mash_button(context, BUTTON_B, 120000ms);
             },
             {{detector}}
         );
@@ -151,13 +154,13 @@ void StarterReset::program(SingleSwitchProgramEnvironment& env, BotBaseContext&
             env.log("Timed out waiting for briefcase.", COLOR_RED);
             stats.add_error();
             consecutive_failures++;
-            dump_image(env.logger(), env.program_info(), "Briefcase", env.console.video().snapshot());
+            dump_image(env.console, env.program_info(), env.console, "Briefcase");
             continue;
         }
 
         //  Wait for briefcase to fully open.
         env.log("Mashing B for briefcase to fully open.");
-        pbf_mash_button(context, BUTTON_B, 2 * TICKS_PER_SECOND);
+        pbf_mash_button(context, BUTTON_B, 2000ms);
 
         //  Scroll to your starter.
         size_t scroll = 0;
@@ -171,11 +174,11 @@ void StarterReset::program(SingleSwitchProgramEnvironment& env, BotBaseContext&
             scroll = 2;
         }
         for (size_t c = 0; c < scroll; c++){
-            pbf_press_dpad(context, DPAD_RIGHT, 20, 105);
+            pbf_press_dpad(context, DPAD_RIGHT, 160ms, 840ms);
         }
 
         //  Select starter.
-        pbf_press_button(context, BUTTON_ZL, 20, 30);
+        pbf_press_button(context, BUTTON_ZL, 160ms, 240ms);
         context.wait_for_all_requests();
 
         {
@@ -190,9 +193,9 @@ void StarterReset::program(SingleSwitchProgramEnvironment& env, BotBaseContext&
                 env.log("Timed out waiting for selection prompt.", COLOR_RED);
                 consecutive_failures++;
             }
-            pbf_wait(context, 50);
-            pbf_press_dpad(context, DPAD_UP, 10, 50);
-            pbf_press_button(context, BUTTON_ZL, 10, 5 * TICKS_PER_SECOND);
+            pbf_wait(context, 400ms);
+            pbf_press_dpad(context, DPAD_UP, 80ms, 400ms);
+            pbf_press_button(context, BUTTON_ZL, 80ms, 5000ms);
             context.wait_for_all_requests();
         }
 
@@ -212,7 +215,7 @@ void StarterReset::program(SingleSwitchProgramEnvironment& env, BotBaseContext&
         if (result_own.shiny_type == ShinyType::UNKNOWN){
             stats.add_error();
             consecutive_failures++;
-            dump_image(env.logger(), env.program_info(), "UnknownShinyDetection", env.console.video().snapshot());
+            dump_image(env.console, env.program_info(), env.console, "UnknownShinyDetection");
         }else{
             consecutive_failures = 0;
         }
@@ -227,18 +230,8 @@ void StarterReset::program(SingleSwitchProgramEnvironment& env, BotBaseContext&
                 true, true, {{{"starly"}, ShinyType::UNKNOWN_SHINY}}, result_wild.alpha,
                 result_wild.get_best_screenshot()
             );
-        }else{
-#if 0
-            send_encounter_notification(
-                env.console,
-                NOTIFICATION_NONSHINY,
-                NOTIFICATION_SHINY,
-                env.program_info(),
-                true, false, {{{"starly"}, ShinyType::NOT_SHINY}}, result_wild.alpha,
-                result_wild.get_best_screenshot(),
-                &stats
-            );
-#endif
+            pbf_wait(context, 5000ms);
+            pbf_press_button(context, BUTTON_CAPTURE, 2000ms, 5000ms);
         }
 
         bool your_shiny = is_likely_shiny(result_own.shiny_type);
@@ -251,6 +244,8 @@ void StarterReset::program(SingleSwitchProgramEnvironment& env, BotBaseContext&
                 true, true, {{{starter}, ShinyType::UNKNOWN_SHINY}}, result_own.alpha,
                 result_own.get_best_screenshot()
             );
+            pbf_wait(context, 5000ms);
+            pbf_press_button(context, BUTTON_CAPTURE, 2000ms, 5000ms);
             break;
         }else{
             stats.add_non_shiny();
@@ -262,12 +257,6 @@ void StarterReset::program(SingleSwitchProgramEnvironment& env, BotBaseContext&
                 result_own.get_best_screenshot()
             );
         }
-
-        if ((wild_shiny || your_shiny) && VIDEO_ON_SHINY){
-            pbf_wait(context, 5 * TICKS_PER_SECOND);
-            pbf_press_button(context, BUTTON_CAPTURE, 2 * TICKS_PER_SECOND, 5 * TICKS_PER_SECOND);
-        }
-
     }
 
     env.update_stats();
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_StarterReset.h b/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_StarterReset.h
index 077415aa2e..59d2ec0413 100644
--- a/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_StarterReset.h
+++ b/SerialPrograms/Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_StarterReset.h
@@ -1,6 +1,6 @@
 /*  Starter Reset
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -8,7 +8,6 @@
 #define PokemonAutomation_PokemonBDSP_StarterReset_H
 
 #include "CommonFramework/Notifications/EventNotificationsTable.h"
-#include "NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h"
 #include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
 #include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
 #include "Pokemon/Options/Pokemon_NameSelectOption.h"
@@ -29,12 +28,13 @@ class StarterReset_Descriptor : public SingleSwitchProgramDescriptor{
 
 class StarterReset : public SingleSwitchProgramInstance{
 public:
+    using Descriptor = StarterReset_Descriptor;
     StarterReset();
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
 
 
 private:
-    void run_trigger(BotBaseContext& context) const;
+    void run_trigger(ProControllerContext& context) const;
     bool find_encounter(SingleSwitchProgramEnvironment& env) const;
 
 private:
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/TestPrograms/PokemonBDSP_ShinyEncounterTester.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/TestPrograms/PokemonBDSP_ShinyEncounterTester.cpp
index 8af3858dc8..876454be95 100644
--- a/SerialPrograms/Source/PokemonBDSP/Programs/TestPrograms/PokemonBDSP_ShinyEncounterTester.cpp
+++ b/SerialPrograms/Source/PokemonBDSP/Programs/TestPrograms/PokemonBDSP_ShinyEncounterTester.cpp
@@ -1,11 +1,11 @@
 /*  Shiny Encounter Detector
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include "Common/Cpp/PrettyPrint.h"
-#include "ClientSource/Connection/BotBase.h"
+#include "Pokemon/Pokemon_Strings.h"
 #include "PokemonBDSP/Inference/ShinyDetection/PokemonBDSP_ShinyEncounterDetector.h"
 #include "PokemonBDSP_ShinyEncounterTester.h"
 
@@ -20,8 +20,10 @@ ShinyEncounterTester_Descriptor::ShinyEncounterTester_Descriptor()
         STRING_POKEMON + " BDSP", "Shiny Encounter Tester",
         "",
         "Test the shiny encounter detector. Start this program just before an encounter.",
-        FeedbackType::REQUIRED, AllowCommandsWhenRunning::ENABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
+        PanelQualityStanding::DEVELOPER,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::ENABLE_COMMANDS
     )
 {}
 
@@ -34,13 +36,13 @@ ShinyEncounterTester::ShinyEncounterTester()
             {BattleType::STARTER, "starter", "Starter Battle"},
             {BattleType::STANDARD, "standard", "Wild Encounter"},
         },
-        LockWhileRunning::LOCKED,
+        LockMode::LOCK_WHILE_RUNNING,
         BattleType::STANDARD
     )
     , USE_SOUND_DETECTION(
         "<b>Use Sound Detection:</b><br>Use sound to improve shiny detection.<br>"
         "<b>Make sure you have correct audio input set.</b>",
-        LockWhileRunning::LOCKED,
+        LockMode::LOCK_WHILE_RUNNING,
         true
     )
     , NOTIFICATIONS({
@@ -53,11 +55,11 @@ ShinyEncounterTester::ShinyEncounterTester()
 }
 
 
-void ShinyEncounterTester::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
+void ShinyEncounterTester::program(SingleSwitchProgramEnvironment& env, CancellableScope& scope){
     DoublesShinyDetection result_wild;
     ShinyDetectionResult result_own;
     detect_shiny_battle(
-        env, env.console, context,
+        env, env.console, scope,
         result_wild, result_own,
         NOTIFICATION_ERROR_RECOVERABLE,
         ENCOUNTER_TYPE == BattleType::STARTER ? YOUR_POKEMON : WILD_POKEMON,
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/TestPrograms/PokemonBDSP_ShinyEncounterTester.h b/SerialPrograms/Source/PokemonBDSP/Programs/TestPrograms/PokemonBDSP_ShinyEncounterTester.h
index 882c0fe390..a75f057f5a 100644
--- a/SerialPrograms/Source/PokemonBDSP/Programs/TestPrograms/PokemonBDSP_ShinyEncounterTester.h
+++ b/SerialPrograms/Source/PokemonBDSP/Programs/TestPrograms/PokemonBDSP_ShinyEncounterTester.h
@@ -1,6 +1,6 @@
 /*  Shiny Encounter Detector
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -25,9 +25,10 @@ class ShinyEncounterTester_Descriptor : public SingleSwitchProgramDescriptor{
 
 class ShinyEncounterTester : public SingleSwitchProgramInstance{
 public:
+    using Descriptor = ShinyEncounterTester_Descriptor;
     ShinyEncounterTester();
 
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
+    virtual void program(SingleSwitchProgramEnvironment& env, CancellableScope& scope) override;
 
 private:
     EnumDropdownOption<BattleType> ENCOUNTER_TYPE;
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/TestPrograms/PokemonBDSP_SoundListener.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/TestPrograms/PokemonBDSP_SoundListener.cpp
index cd3ed2d56a..1d614e2704 100644
--- a/SerialPrograms/Source/PokemonBDSP/Programs/TestPrograms/PokemonBDSP_SoundListener.cpp
+++ b/SerialPrograms/Source/PokemonBDSP/Programs/TestPrograms/PokemonBDSP_SoundListener.cpp
@@ -1,6 +1,6 @@
 /*  Sound Listener
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -14,18 +14,13 @@
 #include "Common/Cpp/Containers/AlignedVector.tpp"
 #include "CommonFramework/AudioPipeline/AudioFeed.h"
 #include "CommonFramework/AudioPipeline/AudioTemplate.h"
-#include "CommonFramework/InferenceInfra/InferenceSession.h"
-#include "CommonFramework/Inference/AudioTemplateCache.h"
-#include "CommonFramework/Inference/SpectrogramMatcher.h"
-#include "CommonFramework/Tools/StatsTracking.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "NintendoSwitch/NintendoSwitch_Settings.h"
+#include "CommonTools/Audio/AudioTemplateCache.h"
+#include "CommonTools/Audio/SpectrogramMatcher.h"
+#include "CommonTools/Async/InferenceSession.h"
 #include "Pokemon/Pokemon_Strings.h"
-#include "PokemonBDSP/PokemonBDSP_Settings.h"
 #include "PokemonBDSP/Inference/Sounds/PokemonBDSP_ShinySoundDetector.h"
 #include "PokemonBDSP_SoundListener.h"
 
-#include <QMessageBox>
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
@@ -39,8 +34,10 @@ SoundListener_Descriptor::SoundListener_Descriptor()
         STRING_POKEMON + " LA", "Sound Listener",
         "",
         "Test sound detectors listening to audio stream.",
-        FeedbackType::REQUIRED, AllowCommandsWhenRunning::ENABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
+        PanelQualityStanding::DEVELOPER,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::ENABLE_COMMANDS
     )
 {}
 
@@ -50,12 +47,12 @@ SoundListener::SoundListener()
         {
             {SoundType::SHINY, "shiny", "Shiny Sound"},
         },
-        LockWhileRunning::LOCKED,
+        LockMode::LOCK_WHILE_RUNNING,
         SoundType::SHINY
     )
     , STOP_ON_DETECTED_SOUND(
         "<b>Stop on the detected sound</b><br>Stop program when the sound is detected.",
-        LockWhileRunning::LOCKED,
+        LockMode::LOCK_WHILE_RUNNING,
         false
     )
 {
@@ -66,7 +63,7 @@ SoundListener::SoundListener()
 
 // void search_alpha_roar_from_audio_dump();
 
-void SoundListener::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
+void SoundListener::program(SingleSwitchProgramEnvironment& env, CancellableScope& scope){
     // search_alpha_roar_from_audio_dump();
     // return;
 
@@ -93,10 +90,10 @@ void SoundListener::program(SingleSwitchProgramEnvironment& env, BotBaseContext&
     }
 
     InferenceSession session(
-        context, env.console,
+        scope, env.console,
         {{*detector, std::chrono::milliseconds(20)}}
     );
-    context.wait_until_cancel();
+    scope.wait_until_cancel();
 
     std::cout << "Audio test program Sound listener finished." << std::endl;
 }
@@ -132,15 +129,15 @@ void search_alpha_roar_from_audio_dump(){
 
     std::ofstream fout("file_check_output.txt");
 
-    for(size_t fileIdx = 0; fileIdx < file_list.size(); fileIdx++){
+    for (size_t fileIdx = 0; fileIdx < file_list.size(); fileIdx++){
         matcher.clear();
 
 
         const auto& path = file_list[fileIdx];
         std::ostringstream os;
         os << "File " << fileIdx << "/" << file_list.size() << " " << path << " ";
-        AudioTemplate audio = loadAudioTemplate(path);
-        if (audio.numWindows() == 0){
+        AudioTemplate audio = load_audio_template(path);
+        if (audio.num_windows() == 0){
             os << "Fail" << std::endl;
             fout << os.str();
             std::cout << os.str() << std::flush;
@@ -149,19 +146,19 @@ void search_alpha_roar_from_audio_dump(){
 
         // audio.scale(2.0);
 
-        os << "#W " << audio.numWindows() << " ";
+        os << "#W " << audio.num_windows() << " ";
 
         // match!
         float minScore = FLT_MAX;
         std::vector<AudioSpectrum> new_spectrums;
-        size_t numStreamWindows = std::max(matcher.numMatchedWindows(), audio.numWindows());
-        for(size_t audioIdx = 0; audioIdx < numStreamWindows; audioIdx++){
+        size_t numStreamWindows = std::max(matcher.num_matched_windows(), audio.num_windows());
+        for (size_t audioIdx = 0; audioIdx < numStreamWindows; audioIdx++){
             new_spectrums.clear();
-            AlignedVector<float> freqVector(audio.numFrequencies());
-            if (audioIdx < audio.numWindows()){
-                const float * freq = audio.getWindow(audioIdx);
-                memcpy(freqVector.data(), freq, sizeof(float) * audio.numFrequencies());
-            } else{
+            AlignedVector<float> freqVector(audio.num_frequencies());
+            if (audioIdx < audio.num_windows()){
+                const float * freq = audio.get_window(audioIdx);
+                memcpy(freqVector.data(), freq, sizeof(float) * audio.num_frequencies());
+            }else{
                 // add zero-freq window
             }
             new_spectrums.emplace_back(
@@ -184,7 +181,7 @@ void search_alpha_roar_from_audio_dump(){
     auto it = closest_files.begin();
     std::cout << "--------------" << std::endl;
     fout.open("file_check_output_sorted.txt");
-    for(int i = 0; it != closest_files.end(); i++, it++){
+    for (int i = 0; it != closest_files.end(); i++, it++){
         if (i < 40)
             std::cout << it->first << ", " << it->second << std::endl;
         fout << it->first << ", " << it->second << std::endl;
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/TestPrograms/PokemonBDSP_SoundListener.h b/SerialPrograms/Source/PokemonBDSP/Programs/TestPrograms/PokemonBDSP_SoundListener.h
index dac8dcd323..ae4f33653e 100644
--- a/SerialPrograms/Source/PokemonBDSP/Programs/TestPrograms/PokemonBDSP_SoundListener.h
+++ b/SerialPrograms/Source/PokemonBDSP/Programs/TestPrograms/PokemonBDSP_SoundListener.h
@@ -1,6 +1,6 @@
 /*  Sound Listener
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *  
  *  Debug program to test all kinds of sound detectors.
  */
@@ -11,7 +11,7 @@
 #include "Common/Cpp/Options/BooleanCheckBoxOption.h"
 #include "Common/Cpp/Options/EnumDropdownOption.h"
 #include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+//#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
 
 namespace PokemonAutomation{ 
 namespace NintendoSwitch{
@@ -26,9 +26,10 @@ class SoundListener_Descriptor : public SingleSwitchProgramDescriptor{
 
 class SoundListener : public SingleSwitchProgramInstance{
 public:
+    using Descriptor = SoundListener_Descriptor;
     SoundListener();
 
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
+    virtual void program(SingleSwitchProgramEnvironment& env, CancellableScope& scope) override;
 
 private:
     enum class SoundType{
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/TestPrograms/PokemonBDSP_SummaryReaderTester.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/TestPrograms/PokemonBDSP_SummaryReaderTester.cpp
new file mode 100644
index 0000000000..7d488e8f9c
--- /dev/null
+++ b/SerialPrograms/Source/PokemonBDSP/Programs/TestPrograms/PokemonBDSP_SummaryReaderTester.cpp
@@ -0,0 +1,140 @@
+/*  Summary Reader Tester
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <chrono>
+#include <string>
+#include "Common/Cpp/Color.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "Pokemon/Pokemon_NatureChecker.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "PokemonBDSP/Inference/Rng/PokemonBDSP_SummaryReader.h"
+#include "PokemonBDSP_SummaryReaderTester.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonBDSP{
+
+using namespace std::chrono_literals;
+using namespace Pokemon;
+
+
+SummaryReaderTester_Descriptor::SummaryReaderTester_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonBDSP:SummaryReaderTester",
+        STRING_POKEMON + " BDSP", "Summary Reader Tester",
+        "",
+        "Read a " + STRING_POKEMON + "'s nature, gender and stats off its summary pages. "
+        "Start on the Trainer Memo page.",
+        PanelQualityStanding::DEVELOPER,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+
+SummaryReaderTester::SummaryReaderTester()
+    : LANGUAGE(
+        "<b>Game Language:</b><br>Needed for the nature, which is read as text.",
+        summary_nature_languages(),
+        LockMode::LOCK_WHILE_RUNNING, true
+    )
+{
+    PA_ADD_OPTION(LANGUAGE);
+}
+
+
+static std::string or_unread(int16_t value){
+    return value < 0 ? "???" : std::to_string(value);
+}
+
+
+void SummaryReaderTester::program(
+    SingleSwitchProgramEnvironment& env, ProControllerContext& context
+){
+    env.log("Start on the Trainer Memo page — the one reading "
+        "\"This " + STRING_POKEMON + " is pretty [nature] by nature.\"");
+    env.log("If no boxes appear on the video, check that the overlay's box display "
+        "is switched on for this console.");
+
+    VideoOverlaySet overlays(env.console.overlay());
+    SummaryReader reader;
+
+    {
+        reader.make_memo_overlays(overlays);
+
+        VideoSnapshot screen = env.console.video().snapshot();
+        NatureCheckerValue nature = reader.read_nature(env.logger(), LANGUAGE, screen);
+        BdspGender gender = reader.read_gender(env.logger(), screen);
+
+        env.log("Nature: " + std::string(
+            nature == NatureCheckerValue::UnableToDetect
+                ? "??? (not read)"
+                : NATURE_CHECKER_VALUE_STRINGS().get_string(nature)
+        ), COLOR_BLUE);
+        env.log("Gender: " + std::string(bdsp_gender_name(gender)), COLOR_BLUE);
+        if (gender == BdspGender::Genderless){
+            env.log("Genderless means the symbol was not found. A starter always has one.",
+                COLOR_ORANGE);
+        }
+
+        pbf_wait(context, 5s);
+        context.wait_for_all_requests();
+    }
+
+    env.log("Moving to the " + STRING_POKEMON + " Skills page...");
+    pbf_press_dpad(context, DPAD_RIGHT, 100ms, 100ms);
+    context.wait_for_all_requests();
+    pbf_wait(context, 1500ms);
+    context.wait_for_all_requests();
+
+    {
+        overlays.clear();
+        reader.make_skills_overlays(overlays);
+
+        VideoSnapshot screen = env.console.video().snapshot();
+        StatReads stats = reader.read_stats(env.logger(), screen);
+        BdspGender gender = reader.read_gender(env.logger(), screen);
+
+        env.log("Gender (from this page): " + std::string(bdsp_gender_name(gender)), COLOR_BLUE);
+        env.log("HP (total): " + or_unread(stats.hp), COLOR_BLUE);
+        env.log("Attack:     " + or_unread(stats.attack), COLOR_BLUE);
+        env.log("Defense:    " + or_unread(stats.defense), COLOR_BLUE);
+        env.log("Sp. Atk:    " + or_unread(stats.spatk), COLOR_BLUE);
+        env.log("Sp. Def:    " + or_unread(stats.spdef), COLOR_BLUE);
+        env.log("Speed:      " + or_unread(stats.speed), COLOR_BLUE);
+
+
+        size_t unread = 0;
+        for (int16_t value : {stats.hp, stats.attack, stats.defense,
+                              stats.spatk, stats.spdef, stats.speed}){
+            if (value < 0){
+                unread++;
+            }
+        }
+        if (unread == 0){
+            env.log("All six read.", COLOR_BLUE);
+        }else{
+            env.log(std::to_string(unread) + " of 6 stats could not be read. One is survivable; "
+                "several means the boxes need moving, and the overlay will show where.",
+                COLOR_ORANGE);
+        }
+
+        env.log("Boxes are on the overlay. Compare them against the numbers on screen.",
+            COLOR_BLUE);
+        pbf_wait(context, 15s);
+        context.wait_for_all_requests();
+    }
+}
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/TestPrograms/PokemonBDSP_SummaryReaderTester.h b/SerialPrograms/Source/PokemonBDSP/Programs/TestPrograms/PokemonBDSP_SummaryReaderTester.h
new file mode 100644
index 0000000000..8598dfe713
--- /dev/null
+++ b/SerialPrograms/Source/PokemonBDSP/Programs/TestPrograms/PokemonBDSP_SummaryReaderTester.h
@@ -0,0 +1,39 @@
+/*  Summary Reader Tester
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonBDSP_SummaryReaderTester_H
+#define PokemonAutomation_PokemonBDSP_SummaryReaderTester_H
+
+#include "CommonTools/Options/LanguageOCROption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonBDSP{
+
+
+class SummaryReaderTester_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    SummaryReaderTester_Descriptor();
+};
+
+
+class SummaryReaderTester : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = SummaryReaderTester_Descriptor;
+    SummaryReaderTester();
+
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    OCR::LanguageOCROption LANGUAGE;
+};
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/Trading/PokemonBDSP_SelfBoxTrade.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/Trading/PokemonBDSP_SelfBoxTrade.cpp
index a5c7fa6425..020cecf23a 100644
--- a/SerialPrograms/Source/PokemonBDSP/Programs/Trading/PokemonBDSP_SelfBoxTrade.cpp
+++ b/SerialPrograms/Source/PokemonBDSP/Programs/Trading/PokemonBDSP_SelfBoxTrade.cpp
@@ -1,11 +1,12 @@
 /*  Self Box Trade
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include "CommonFramework/Notifications/ProgramNotifications.h"
 #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
 #include "Pokemon/Pokemon_Strings.h"
 #include "PokemonBDSP/PokemonBDSP_Settings.h"
 #include "PokemonBDSP_TradeRoutines.h"
@@ -14,18 +15,20 @@
 namespace PokemonAutomation{
 namespace NintendoSwitch{
 namespace PokemonBDSP{
-    using namespace Pokemon;
+
+using namespace Pokemon;
 
 
 SelfBoxTrade_Descriptor::SelfBoxTrade_Descriptor()
     : MultiSwitchProgramDescriptor(
         "PokemonBDSP:SelfBoxTrade",
         STRING_POKEMON + " BDSP", "Self Box Trade",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonBDSP/SelfBoxTrade.md",
+        "Programs/PokemonBDSP/SelfBoxTrade.html",
         "Trade boxes of " + STRING_POKEMON + " between two local Switches.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
         FeedbackType::REQUIRED,
         AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB,
         2, 2, 2
     )
 {}
@@ -38,7 +41,7 @@ std::unique_ptr<StatsTracker> SelfBoxTrade_Descriptor::make_stats() const{
 SelfBoxTrade::SelfBoxTrade()
     : BOXES_TO_TRADE(
         "<b>Number of Boxes to Trade:</b>",
-        LockWhileRunning::LOCKED,
+        LockMode::LOCK_WHILE_RUNNING,
         2, 0, 40
     )
     , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
@@ -58,10 +61,15 @@ void SelfBoxTrade::program(MultiSwitchProgramEnvironment& env, CancellableScope&
     TradeStats& stats = env.current_stats<TradeStats>();
     env.update_stats();
 
+    //  Connect the controller.
+    env.run_in_parallel<ProController>(scope, [](ConsoleHandle& console, ProControllerContext& context){
+        require_player(console, context, BUTTON_LCLICK);
+    });
+
     for (uint8_t box = 0; box < BOXES_TO_TRADE; box++){
         if (box != 0){
-            env.run_in_parallel(scope, [](ConsoleHandle& console, BotBaseContext& context){
-                pbf_press_button(context, BUTTON_R, 20, GameSettings::instance().BOX_CHANGE_DELAY_0);
+            env.run_in_parallel<ProController>(scope, [](ConsoleHandle& console, ProControllerContext& context){
+                pbf_press_button(context, BUTTON_R, 160ms, GameSettings::instance().BOX_CHANGE_DELAY0);
             });
         }
         trade_current_box(env, scope, NOTIFICATION_STATUS_UPDATE, stats);
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/Trading/PokemonBDSP_SelfBoxTrade.h b/SerialPrograms/Source/PokemonBDSP/Programs/Trading/PokemonBDSP_SelfBoxTrade.h
index d9bdb69ed1..07b1e6a2b2 100644
--- a/SerialPrograms/Source/PokemonBDSP/Programs/Trading/PokemonBDSP_SelfBoxTrade.h
+++ b/SerialPrograms/Source/PokemonBDSP/Programs/Trading/PokemonBDSP_SelfBoxTrade.h
@@ -1,6 +1,6 @@
 /*  Self Box Trade
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -26,6 +26,7 @@ class SelfBoxTrade_Descriptor : public MultiSwitchProgramDescriptor{
 
 class SelfBoxTrade : public MultiSwitchProgramInstance{
 public:
+    using Descriptor = SelfBoxTrade_Descriptor;
     SelfBoxTrade();
     virtual void program(MultiSwitchProgramEnvironment& env, CancellableScope& scope) override;
 
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/Trading/PokemonBDSP_SelfTouchTrade.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/Trading/PokemonBDSP_SelfTouchTrade.cpp
index 03a9df58db..63d89f9699 100644
--- a/SerialPrograms/Source/PokemonBDSP/Programs/Trading/PokemonBDSP_SelfTouchTrade.cpp
+++ b/SerialPrograms/Source/PokemonBDSP/Programs/Trading/PokemonBDSP_SelfTouchTrade.cpp
@@ -1,11 +1,12 @@
 /*  Self Touch Trade
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include "CommonFramework/Notifications/ProgramNotifications.h"
 #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
 #include "Pokemon/Pokemon_Strings.h"
 #include "PokemonBDSP/PokemonBDSP_Settings.h"
 #include "PokemonBDSP_TradeRoutines.h"
@@ -14,18 +15,20 @@
 namespace PokemonAutomation{
 namespace NintendoSwitch{
 namespace PokemonBDSP{
-    using namespace Pokemon;
+
+using namespace Pokemon;
 
 
 SelfTouchTrade_Descriptor::SelfTouchTrade_Descriptor()
     : MultiSwitchProgramDescriptor(
         "PokemonBDSP:SelfTouchTrade",
         STRING_POKEMON + " BDSP", "Self Touch Trade",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonBDSP/SelfTouchTrade.md",
+        "Programs/PokemonBDSP/SelfTouchTrade.html",
         "Touch trade boxes of " + STRING_POKEMON + " between two local Switches.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
         FeedbackType::REQUIRED,
         AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB,
         2, 2, 2
     )
 {}
@@ -41,12 +44,12 @@ SelfTouchTrade::SelfTouchTrade()
             {HostingSwitch::Switch0, "switch0", "Switch 0 (Left)"},
             {HostingSwitch::Switch1, "switch1", "Switch 1 (Right)"},
         },
-        LockWhileRunning::LOCKED,
+        LockMode::LOCK_WHILE_RUNNING,
         HostingSwitch::Switch0
     )
     , BOXES_TO_TRADE(
         "<b>Number of Boxes to Touch-Trade:</b>",
-        LockWhileRunning::LOCKED,
+        LockMode::LOCK_WHILE_RUNNING,
         2, 0, 40
     )
     , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
@@ -68,20 +71,25 @@ void SelfTouchTrade::program(MultiSwitchProgramEnvironment& env, CancellableScop
     TradeStats& stats = env.current_stats<TradeStats>();
     env.update_stats();
 
+    //  Connect the controller.
+    env.run_in_parallel<ProController>(scope, [](ConsoleHandle& console, ProControllerContext& context){
+        require_player(console, context, BUTTON_LCLICK);
+    });
+
     size_t host_index = HOSTING_SWITCH == HostingSwitch::Switch0 ? 0 : 1;
-    BotBaseContext host(scope, env.consoles[host_index].botbase());
+    ProControllerContext host(scope, env.console(host_index).controller<ProController>());
 
     //  Swap trade all the boxes.
     for (uint8_t box = 0; box < BOXES_TO_TRADE; box++){
         if (box != 0){
-            pbf_press_button(host, BUTTON_R, 20, GameSettings::instance().BOX_CHANGE_DELAY_0);
+            pbf_press_button(host, BUTTON_R, 160ms, GameSettings::instance().BOX_CHANGE_DELAY0);
         }
         trade_current_box(env, scope, NOTIFICATION_STATUS_UPDATE, stats);
     }
 
     //  Trade back the last box.
     for (uint8_t box = 1; box < BOXES_TO_TRADE; box++){
-        pbf_press_button(host, BUTTON_L, 20, GameSettings::instance().BOX_CHANGE_DELAY_0);
+        pbf_press_button(host, BUTTON_L, 160ms, GameSettings::instance().BOX_CHANGE_DELAY0);
     }
     trade_current_box(env, scope, NOTIFICATION_STATUS_UPDATE, stats);
 
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/Trading/PokemonBDSP_SelfTouchTrade.h b/SerialPrograms/Source/PokemonBDSP/Programs/Trading/PokemonBDSP_SelfTouchTrade.h
index 854d6b4ce2..e1c17fef2b 100644
--- a/SerialPrograms/Source/PokemonBDSP/Programs/Trading/PokemonBDSP_SelfTouchTrade.h
+++ b/SerialPrograms/Source/PokemonBDSP/Programs/Trading/PokemonBDSP_SelfTouchTrade.h
@@ -1,6 +1,6 @@
 /*  Self Touch Trade
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -27,6 +27,7 @@ class SelfTouchTrade_Descriptor : public MultiSwitchProgramDescriptor{
 
 class SelfTouchTrade : public MultiSwitchProgramInstance{
 public:
+    using Descriptor = SelfTouchTrade_Descriptor;
     SelfTouchTrade();
     virtual void program(MultiSwitchProgramEnvironment& env, CancellableScope& scope) override;
 
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/Trading/PokemonBDSP_TradeRoutines.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/Trading/PokemonBDSP_TradeRoutines.cpp
index 6611a09a40..27d1cc9294 100644
--- a/SerialPrograms/Source/PokemonBDSP/Programs/Trading/PokemonBDSP_TradeRoutines.cpp
+++ b/SerialPrograms/Source/PokemonBDSP/Programs/Trading/PokemonBDSP_TradeRoutines.cpp
@@ -1,17 +1,16 @@
 /*  Trade Routines
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include "CommonFramework/Notifications/ProgramNotifications.h"
 #include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
-#include "CommonFramework/Inference/BlackScreenDetector.h"
-#include "CommonFramework/Inference/ImageMatchDetector.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "CommonTools/VisualDetectors/BlackScreenDetector.h"
+#include "CommonTools/VisualDetectors/ImageMatchDetector.h"
 #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
 #include "PokemonBDSP/PokemonBDSP_Settings.h"
-#include "PokemonBDSP/Inference/PokemonBDSP_SelectionArrow.h"
 #include "PokemonBDSP_TradeRoutines.h"
 
 namespace PokemonAutomation{
@@ -26,104 +25,109 @@ TradeStats::TradeStats()
     , m_errors(m_stats["Errors"])
 {
     m_display_order.emplace_back("Trades");
-    m_display_order.emplace_back("Errors", true);
+    m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
 }
 
 
 void trade_current_pokemon(
-    ConsoleHandle& console, BotBaseContext& context,
+    VideoStream& stream, ProControllerContext& context,
     MultiConsoleErrorState& tracker,
     TradeStats& stats
 ){
-    tracker.check_unrecoverable_error(console);
+    tracker.check_unrecoverable_error(stream.logger());
 
     context.wait_for_all_requests();
-    VideoSnapshot box_image = console.video().snapshot();
+    VideoSnapshot box_image = stream.video().snapshot();
     ImageMatchWatcher box_detector(std::move(box_image.frame), {0.02, 0.10, 0.15, 0.80}, 50);
 
-    {
-        pbf_press_button(context, BUTTON_ZL, 20, 0);
-        context.wait_for_all_requests();
-        SelectionArrowFinder detector(console, {0.50, 0.58, 0.40, 0.10}, COLOR_RED);
-        int ret = wait_until(
-            console, context, std::chrono::seconds(120),
-            {{detector}}
-        );
-        if (ret < 0){
-            stats.m_errors++;
-            tracker.report_unrecoverable_error(console, "Failed to detect trade select prompt after 2 minutes.");
-        }
-        console.log("Detected trade prompt.");
-        context.wait_for(std::chrono::milliseconds(100));
-        tracker.check_unrecoverable_error(console);
-    }
-    {
-        pbf_press_button(context, BUTTON_ZL, 20, 0);
+//    pbf_press_button(context, BUTTON_ZL, 160ms, 0ms);
+
+#if 0
+    while (true){
         context.wait_for_all_requests();
-        SelectionArrowFinder detector(console, {0.50, 0.52, 0.40, 0.10}, COLOR_RED);
-        int ret = wait_until(
-            console, context, std::chrono::seconds(10),
-            {{detector}}
+        SelectionArrowFinder detector0(stream, {0.50, 0.58, 0.40, 0.10}, COLOR_RED);
+        SelectionArrowFinder detector1(stream, {0.50, 0.52, 0.40, 0.10}, COLOR_RED);
+        int ret = run_until<ProControllerContext>(
+            stream, context,
+            [](ProControllerContext& context){
+                pbf_mash_button(context, BUTTON_ZL, 20000ms);
+            },
+            {detector0, detector1}
         );
-        if (ret < 0){
+        switch (ret){
+        case 0:
+            stream.log("Detected trade prompt.");
+            context.wait_for(std::chrono::milliseconds(100));
+            tracker.check_unrecoverable_error(stream);
+            pbf_press_button(context, BUTTON_ZL, 160ms, 0ms);
+            continue;
+        case 1:
+            stream.log("Detected trade confirm prompt.");
+            context.wait_for(std::chrono::milliseconds(100));
+            tracker.check_unrecoverable_error(stream);
+            pbf_press_button(context, BUTTON_ZL, 160ms, 0ms);
+            break;
+        default:
             stats.m_errors++;
-            tracker.report_unrecoverable_error(console, "Failed to detect trade confirm prompt after 10 seconds.");
+            tracker.report_unrecoverable_error(stream, "Failed to detect a prompt after 20 seconds.");
         }
-        console.log("Detected trade confirm prompt.");
-        context.wait_for(std::chrono::milliseconds(100));
-        tracker.check_unrecoverable_error(console);
+        break;
     }
+#endif
 
     //  Start trade.
-    pbf_press_button(context, BUTTON_ZL, 20, 0);
+//    pbf_press_button(context, BUTTON_ZL, 160ms, 0ms);
 
     //  Wait for black screen.
     {
         BlackScreenOverWatcher black_screen;
-        int ret = wait_until(
-            console, context, std::chrono::minutes(2),
+        int ret = run_until<ProControllerContext>(
+            stream, context,
+            [](ProControllerContext& context){
+                pbf_mash_button(context, BUTTON_ZL, 120000ms);
+            },
             {{black_screen}}
         );
         if (ret < 0){
             stats.m_errors++;
-            tracker.report_unrecoverable_error(console, "Failed to detect start of trade after 2 minutes.");
+            tracker.report_unrecoverable_error(stream, "Failed to detect start of trade after 2 minutes.");
         }
-        console.log("Detected start of trade.");
+        stream.log("Detected start of trade.");
         context.wait_for(std::chrono::milliseconds(100));
-        tracker.check_unrecoverable_error(console);
+        tracker.check_unrecoverable_error(stream.logger());
     }
 
     //  Mash B until 2nd black screen.
     {
         BlackScreenWatcher black_screen;
-        int ret = run_until(
-            console, context,
-            [](BotBaseContext& context){
-                pbf_mash_button(context, BUTTON_B, 120 * TICKS_PER_SECOND);
+        int ret = run_until<ProControllerContext>(
+            stream, context,
+            [](ProControllerContext& context){
+                pbf_mash_button(context, BUTTON_B, 120000ms);
             },
             {{black_screen}}
         );
         if (ret < 0){
             stats.m_errors++;
-            tracker.report_unrecoverable_error(console, "Failed to detect end of trade after 2 minutes.");
+            tracker.report_unrecoverable_error(stream, "Failed to detect end of trade after 2 minutes.");
         }
-        console.log("Detected end of trade.");
+        stream.log("Detected end of trade.");
         context.wait_for(std::chrono::milliseconds(100));
-        tracker.check_unrecoverable_error(console);
+        tracker.check_unrecoverable_error(stream.logger());
     }
 
     //  Wait to return to box.
     {
         int ret = wait_until(
-            console, context, std::chrono::minutes(2),
+            stream, context, std::chrono::minutes(2),
             {{box_detector}}
         );
         if (ret < 0){
             stats.m_errors++;
-            tracker.report_unrecoverable_error(console, "Failed to return to box after 2 minutes after a trade.");
+            tracker.report_unrecoverable_error(stream, "Failed to return to box after 2 minutes after a trade.");
         }
-        console.log("Detected box. Trade completed.");
-        tracker.check_unrecoverable_error(console);
+        stream.log("Detected box. Trade completed.");
+        tracker.check_unrecoverable_error(stream.logger());
     }
 }
 
@@ -139,13 +143,13 @@ void trade_current_box(
             send_program_status_notification(env, notifications);
 
             MultiConsoleErrorState error_state;
-            env.run_in_parallel(scope, [&](ConsoleHandle& console, BotBaseContext& context){
-                uint16_t box_scroll_delay = GameSettings::instance().BOX_SCROLL_DELAY_0;
+            env.run_in_parallel<ProController>(scope, [&](ConsoleHandle& console, ProControllerContext& context){
+                Milliseconds box_scroll_delay = GameSettings::instance().BOX_SCROLL_DELAY0;
                 for (size_t r = 0; r < row; r++){
-                    pbf_move_right_joystick(context, 128, 255, 20, box_scroll_delay);
+                    pbf_move_right_joystick(context, {0, -1}, 160ms, box_scroll_delay);
                 }
                 for (size_t c = 0; c < col; c++){
-                    pbf_move_right_joystick(context, 255, 128, 20, box_scroll_delay);
+                    pbf_move_right_joystick(context, {+1, 0}, 160ms, box_scroll_delay);
                 }
                 trade_current_pokemon(console, context, error_state, stats);
             });
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/Trading/PokemonBDSP_TradeRoutines.h b/SerialPrograms/Source/PokemonBDSP/Programs/Trading/PokemonBDSP_TradeRoutines.h
index f725f563b1..c99ec0ee96 100644
--- a/SerialPrograms/Source/PokemonBDSP/Programs/Trading/PokemonBDSP_TradeRoutines.h
+++ b/SerialPrograms/Source/PokemonBDSP/Programs/Trading/PokemonBDSP_TradeRoutines.h
@@ -1,15 +1,16 @@
 /*  Trade Routines
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifndef PokemonAutomation_PokemonBDSP_TradeRoutines_H
 #define PokemonAutomation_PokemonBDSP_TradeRoutines_H
 
-#include "CommonFramework/Tools/StatsTracking.h"
-#include "CommonFramework/Tools/ConsoleHandle.h"
-#include "CommonFramework/Tools/MultiConsoleErrors.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/Tools/VideoStream.h"
+#include "CommonTools/MultiConsoleErrors.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
 #include "NintendoSwitch/NintendoSwitch_MultiSwitchProgram.h"
 
 namespace PokemonAutomation{
@@ -28,7 +29,7 @@ struct TradeStats : public StatsTracker{
 
 
 void trade_current_pokemon(
-    ConsoleHandle& console, BotBaseContext& context,
+    VideoStream& stream, ProControllerContext& context,
     MultiConsoleErrorState& tracker,
     TradeStats& stats
 );
diff --git a/SerialPrograms/Source/PokemonBDSP/Resources/PokemonBDSP_NameDatabase.cpp b/SerialPrograms/Source/PokemonBDSP/Resources/PokemonBDSP_NameDatabase.cpp
index d1ba311f02..e32f743fee 100644
--- a/SerialPrograms/Source/PokemonBDSP/Resources/PokemonBDSP_NameDatabase.cpp
+++ b/SerialPrograms/Source/PokemonBDSP/Resources/PokemonBDSP_NameDatabase.cpp
@@ -1,13 +1,13 @@
 /*  Name Database
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include "Common/Cpp/Exceptions.h"
 #include "CommonFramework/Logging/Logger.h"
 #include "Pokemon/Resources/Pokemon_PokemonNames.h"
-#include "PokemonSwSh/Resources/PokemonSwSh_PokemonSprites.h"
+#include "VideoGames/PokemonSwSh/Resources/PokemonSwSh_PokemonSprites.h"
 #include "PokemonBDSP_NameDatabase.h"
 
 namespace PokemonAutomation{
diff --git a/SerialPrograms/Source/PokemonBDSP/Resources/PokemonBDSP_NameDatabase.h b/SerialPrograms/Source/PokemonBDSP/Resources/PokemonBDSP_NameDatabase.h
index 113382f94c..d1746825d3 100644
--- a/SerialPrograms/Source/PokemonBDSP/Resources/PokemonBDSP_NameDatabase.h
+++ b/SerialPrograms/Source/PokemonBDSP/Resources/PokemonBDSP_NameDatabase.h
@@ -1,13 +1,13 @@
 /*  Name Database
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifndef PokemonAutomation_PokemonBDSP_NameDatabase_H
 #define PokemonAutomation_PokemonBDSP_NameDatabase_H
 
-#include "CommonFramework/Options/StringSelectOption.h"
+#include "CommonTools/Options/StringSelectOption.h"
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
diff --git a/SerialPrograms/Source/PokemonHome/Inference/PokemonHome_BallReader.cpp b/SerialPrograms/Source/PokemonHome/Inference/PokemonHome_BallReader.cpp
deleted file mode 100644
index 63517d9f0b..0000000000
--- a/SerialPrograms/Source/PokemonHome/Inference/PokemonHome_BallReader.cpp
+++ /dev/null
@@ -1,67 +0,0 @@
-/*  Ball Reader
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
-#include "CommonFramework/Notifications/ProgramInfo.h"
-#include "CommonFramework/Tools/ErrorDumper.h"
-#include "PokemonSwSh/Resources/PokemonSwSh_PokeballSprites.h"
-#include "PokemonBDSP/Inference/PokemonBDSP_PokeballSpriteMatcher.h"
-#include "PokemonHome_BallReader.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonHome {
-
-
-const double BallReader::MAX_ALPHA = 0.40;
-const double BallReader::ALPHA_SPREAD = 0.02;
-
-
-const PokemonBDSP::PokeballSpriteMatcher& BALL_SPRITE_MATCHER(){
-    static PokemonBDSP::PokeballSpriteMatcher matcher;
-    return matcher;
-}
-
-
-
-BallReader::BallReader(ConsoleHandle& console)
-    : m_matcher(BALL_SPRITE_MATCHER())
-    , m_console(console)
-    , m_box_sprite(console, {0.228, 0.095, 0.030, 0.049})
-{}
-
-
-
-std::string BallReader::read_ball(const ImageViewRGB32& screen) const{
-    if (!screen){
-        return "";
-    }
-
-    ImageMatch::ImageMatchResult sprite_result;
-    {
-        ImageViewRGB32 image = extract_box_reference(screen, m_box_sprite);
-        sprite_result = m_matcher.match(image, ALPHA_SPREAD);
-        sprite_result.log(m_console, 0.50);
-        if (!sprite_result.results.empty() && sprite_result.results.begin()->first > MAX_ALPHA){
-            sprite_result.results.clear();
-        }
-    }
-
-    if (sprite_result.results.size() != 1){
-        dump_image(m_console, ProgramInfo(), "BallReader", screen);
-    }
-    if (sprite_result.results.empty()){
-        return "";
-    }
-
-    return sprite_result.results.begin()->second;
-}
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonHome/Inference/PokemonHome_BallReader.h b/SerialPrograms/Source/PokemonHome/Inference/PokemonHome_BallReader.h
deleted file mode 100644
index c50b9a544d..0000000000
--- a/SerialPrograms/Source/PokemonHome/Inference/PokemonHome_BallReader.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*  Ball Reader
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonHome_BallReader_H
-#define PokemonAutomation_PokemonHome_BallReader_H
-
-#include <string>
-#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
-#include "CommonFramework/Tools/ConsoleHandle.h"
-#include "CommonFramework/ImageMatch/CroppedImageDictionaryMatcher.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonHome{
-
-
-class BallReader{
-    static const double MAX_ALPHA;
-    static const double ALPHA_SPREAD;
-
-public:
-    BallReader(ConsoleHandle& console);
-
-public:
-    std::string read_ball(const ImageViewRGB32& screen) const;
-
-private:
-    const ImageMatch::CroppedImageDictionaryMatcher& m_matcher;
-    ConsoleHandle& m_console;
-    OverlayBoxScope m_box_sprite;
-};
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonHome/Inference/PokemonHome_BoxGenderDetector.cpp b/SerialPrograms/Source/PokemonHome/Inference/PokemonHome_BoxGenderDetector.cpp
deleted file mode 100644
index e1a3003b36..0000000000
--- a/SerialPrograms/Source/PokemonHome/Inference/PokemonHome_BoxGenderDetector.cpp
+++ /dev/null
@@ -1,72 +0,0 @@
-/*  Box Gender Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Cpp/Color.h"
-#include "CommonFramework/GlobalSettingsPanel.h"
-#include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "CommonFramework/ImageTools/ImageFilter.h"
-#include "CommonFramework/ImageTypes/ImageRGB32.h"
-#include "CommonFramework/ImageTools/ImageStats.h"
-#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
-#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
-#include "PokemonHome_BoxGenderDetector.h"
-
-#include <iostream>
-using std::cout;
-using std::endl;
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonHome{
-
-namespace {
-    ImageFloatBox GENDER_BOX{0.417, 0.097, 0.031, 0.046};
-}
-
-void BoxGenderDetector::make_overlays(VideoOverlaySet& items){
-    items.add(COLOR_RED, GENDER_BOX);
-}
-
-Pokemon::EggHatchGenderFilter BoxGenderDetector::detect(const ImageViewRGB32& screen){
-    const auto region = extract_box_reference(screen, GENDER_BOX);
-
-    // Retain only red pixels from region
-    const bool replace_color_within_range = false;
-    const ImageRGB32 red_region = filter_rgb32_range(
-        region,
-        combine_rgb(150, 0, 0), combine_rgb(255, 100, 100), Color(0), replace_color_within_range
-    );
-    const size_t num_red_pixels = image_stats(red_region).count;
-
-    // Retain only blue pixels from region
-    const ImageRGB32 blue_region = filter_rgb32_range(
-        region,
-        combine_rgb(0, 0, 150), combine_rgb(100, 100, 255), Color(0), replace_color_within_range
-    );
-    const size_t num_blue_pixels = image_stats(blue_region).count;
-
-    if (PreloadSettings::debug().COLOR_CHECK){
-        cout << "num_red_pixels: " << num_red_pixels << ", num_blue_pixels: " << num_blue_pixels
-             << ", region " << region.width() << " x " << region.height() << endl;
-
-        cout << "Save images to ./red_only.png and ./blue_only.png" << endl;
-        red_region.save("./red_only.png");
-        blue_region.save("./blue_only.png");
-    }
-
-    const size_t threshold = region.width() * region.height() / 100;
-
-    if (num_red_pixels > threshold){
-        return Pokemon::EggHatchGenderFilter::Female;
-    } else if (num_blue_pixels > threshold){
-        return Pokemon::EggHatchGenderFilter::Male;
-    }
-    return Pokemon::EggHatchGenderFilter::Genderless;
-}
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonHome/Inference/PokemonHome_BoxGenderDetector.h b/SerialPrograms/Source/PokemonHome/Inference/PokemonHome_BoxGenderDetector.h
deleted file mode 100644
index 198b4a5490..0000000000
--- a/SerialPrograms/Source/PokemonHome/Inference/PokemonHome_BoxGenderDetector.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*  Box Gender Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonHome_BoxGenderDetector_H
-#define PokemonAutomation_PokemonHome_BoxGenderDetector_H
-
-#include "Pokemon/Options/Pokemon_EggHatchFilter.h"
-
-namespace PokemonAutomation{
-
-class ImageViewRGB32;
-class VideoOverlaySet;
-
-namespace NintendoSwitch{
-namespace PokemonHome{
-
-// Detect gender symbol inside the pokemon storage box
-class BoxGenderDetector{
-public:
-    static void make_overlays(VideoOverlaySet& items);
-
-    static Pokemon::EggHatchGenderFilter detect(const ImageViewRGB32& screen);
-};
-
-
-
-}
-}
-}
-
-#endif
diff --git a/SerialPrograms/Source/PokemonHome/Options/PokemonHome_BoxSortingTable.cpp b/SerialPrograms/Source/PokemonHome/Options/PokemonHome_BoxSortingTable.cpp
deleted file mode 100644
index 1f1f410c92..0000000000
--- a/SerialPrograms/Source/PokemonHome/Options/PokemonHome_BoxSortingTable.cpp
+++ /dev/null
@@ -1,97 +0,0 @@
-/*  Box Sorter Table
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "PokemonHome_BoxSortingTable.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonHome{
-
-
-const EnumDatabase<BoxSortingSortType>& BallType_Database() {
-    static const EnumDatabase<BoxSortingSortType> database({
-        {BoxSortingSortType::NationalDexNo,     "dex",     "National Dex Number"},
-        {BoxSortingSortType::Shiny,    "shiny",    "Shiny"},
-        {BoxSortingSortType::Gigantamax,    "gigantamax",    "Gigantamax"},
-        {BoxSortingSortType::Ball_Slug,    "ball_slug",    "Ball Type"},
-        {BoxSortingSortType::Gender,    "gender",    "Gender (Male, Female, Genderless)"},
-    });
-    return database;
-}
-
-
-
-BoxSortingRow::BoxSortingRow()
-    : sort_type(BallType_Database(), LockWhileRunning::LOCKED, BoxSortingSortType::NationalDexNo)
-    , reverse(LockWhileRunning::LOCKED, false)
-{
-    PA_ADD_OPTION(sort_type);
-    PA_ADD_OPTION(reverse);
-}
-std::unique_ptr<EditableTableRow> BoxSortingRow::clone() const{
-    std::unique_ptr<BoxSortingRow> ret(new BoxSortingRow());
-    ret->sort_type.set_value(sort_type.current_value());
-    ret->reverse = reverse.current_value();
-    return ret;
-}
-
-
-BoxSortingTable::BoxSortingTable(std::string label)
-    : EditableTableOption_t<BoxSortingRow>(
-        std::move(label),
-        LockWhileRunning::LOCKED,
-        make_defaults()
-    )
-{}
-
-
-std::vector<BoxSortingSelection> BoxSortingTable::preferences() const{
-    std::vector<std::unique_ptr<BoxSortingRow>> table = copy_snapshot();
-    std::vector<BoxSortingSelection> selections;
-    for (const std::unique_ptr<BoxSortingRow>& row : table){
-        BoxSortingSelection selection;
-        selection.sort_type = BoxSortingSortType(row->sort_type.current_value());
-        selection.reverse = row->reverse.current_value();
-
-        selections.emplace_back(selection);
-    }
-    return selections;
-}
-
-
-
-
-std::vector<std::string> BoxSortingTable::make_header() const{
-    return std::vector<std::string>{
-        "Criteria", "Reverse",
-    };
-}
-
-std::vector<std::unique_ptr<EditableTableRow>> BoxSortingTable::make_defaults(){
-    std::vector<std::unique_ptr<EditableTableRow>> ret;
-    ret.emplace_back(std::make_unique<BoxSortingRow>());
-    return ret;
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonHome/Options/PokemonHome_BoxSortingTable.h b/SerialPrograms/Source/PokemonHome/Options/PokemonHome_BoxSortingTable.h
deleted file mode 100644
index 3afc4d3079..0000000000
--- a/SerialPrograms/Source/PokemonHome/Options/PokemonHome_BoxSortingTable.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*  Cram-o-matic Table
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonHome_BoxSortingTable_H
-#define PokemonAutomation_PokemonHome_BoxSortingTable_H
-
-#include "Common/Cpp/Options/EditableTableOption.h"
-#include "Common/Cpp/Options/SimpleIntegerOption.h"
-#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
-#include "Common/Cpp/Options/EnumDropdownOption.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonHome{
-
-enum class BoxSortingSortType
-{
-    NationalDexNo,
-    Shiny,
-    Gigantamax,
-    Ball_Slug,
-    Gender,
-};
-
-struct BoxSortingSelection
-{
-    BoxSortingSortType sort_type;
-    bool reverse;
-};
-
-class BoxSortingRow : public EditableTableRow{
-public:
-    BoxSortingRow();
-    virtual std::unique_ptr<EditableTableRow> clone() const;
-
-public:
-    EnumDropdownCell<BoxSortingSortType> sort_type;
-    BooleanCheckBoxCell reverse;
-};
-
-
-
-class BoxSortingTable : public EditableTableOption_t<BoxSortingRow>{
-public:
-    BoxSortingTable(std::string label);
-
-    std::vector<BoxSortingSelection> preferences() const;
-
-    virtual std::vector<std::string> make_header() const;
-
-    static std::vector<std::unique_ptr<EditableTableRow>> make_defaults();
-};
-
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonHome/PokemonHome_Panels.cpp b/SerialPrograms/Source/PokemonHome/PokemonHome_Panels.cpp
deleted file mode 100644
index cbe23bba72..0000000000
--- a/SerialPrograms/Source/PokemonHome/PokemonHome_Panels.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
-/*  Pokemon Home Panels
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/GlobalSettingsPanel.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonHome_Panels.h"
-
-#include "Programs/PokemonHome_PageSwap.h"
-#include "Programs/PokemonHome_BoxSorting.h"
-
-#include "Programs/PokemonHome_GenerateNameOCR.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonHome{
-
-
-
-PanelListFactory::PanelListFactory()
-    : PanelListDescriptor(Pokemon::STRING_POKEMON + " Home")
-{}
-
-std::vector<PanelEntry> PanelListFactory::make_panels() const{
-    std::vector<PanelEntry> ret;
-
-//    ret.emplace_back("---- Settings ----");
-//    ret.emplace_back(make_settings<GameSettings_Descriptor, GameSettingsPanel>());
-    ret.emplace_back("---- General ----");
-    ret.emplace_back(make_single_switch_program<PokemonHome::PageSwap_Descriptor, PokemonHome::PageSwap>());
-    ret.emplace_back(make_single_switch_program<PokemonHome::BoxSorting_Descriptor, PokemonHome::BoxSorting>());
-
-//    ret.emplace_back("---- Trading ----");
-
-//    ret.emplace_back("---- Farming ----");
-
-//    ret.emplace_back("---- Shiny Hunting ----");
-
-    if (PreloadSettings::instance().DEVELOPER_MODE){
-        ret.emplace_back("---- Developer Tools ----");
-        ret.emplace_back(make_single_switch_program<PokemonHome::GenerateNameOCRData_Descriptor, PokemonHome::GenerateNameOCRData>());
-    }
-
-    return ret;
-}
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonHome/PokemonHome_Panels.h b/SerialPrograms/Source/PokemonHome/PokemonHome_Panels.h
deleted file mode 100644
index eae8411737..0000000000
--- a/SerialPrograms/Source/PokemonHome/PokemonHome_Panels.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*  Pokemon Scarlet/Violet Panels
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonHome_Panels_H
-#define PokemonAutomation_PokemonHome_Panels_H
-
-#include "CommonFramework/Panels/PanelList.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonHome{
-
-
-
-class PanelListFactory : public PanelListDescriptor{
-public:
-    PanelListFactory();
-    virtual std::vector<PanelEntry> make_panels() const;
-};
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonHome/PokemonHome_Settings.cpp b/SerialPrograms/Source/PokemonHome/PokemonHome_Settings.cpp
deleted file mode 100644
index 6250331729..0000000000
--- a/SerialPrograms/Source/PokemonHome/PokemonHome_Settings.cpp
+++ /dev/null
@@ -1,89 +0,0 @@
-/*  Pokemon SV Settings
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-#include "CommonFramework/Globals.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonHome_Settings.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonHome{
-    using namespace Pokemon;
-
-
-
-GameSettings& GameSettings::instance(){
-    static GameSettings settings;
-    return settings;
-}
-GameSettings::GameSettings()
-    : BatchOption(LockWhileRunning::LOCKED)
-    // : m_start_game_timings("<font size=4><b>Start Game Timings:</b></font>")
-    // // , START_GAME_MASH(
-    // //     "<b>1. Start Game Mash:</b><br>Mash A for this long to start the game.",
-    // //     TICKS_PER_SECOND,
-    // //     "2 * TICKS_PER_SECOND"
-    // // )
-    // // , START_GAME_WAIT(
-    // //     "<b>2. Start Game Wait:</b><br>Wait this long for the game to load.",
-    // //     TICKS_PER_SECOND,
-    // //     "40 * TICKS_PER_SECOND"
-    // // )
-    // // , ENTER_GAME_MASH(
-    // //     "<b>3. Enter Game Mash:</b><br>Mash A for this long to enter the game.",
-    // //     TICKS_PER_SECOND,
-    // //     "5 * TICKS_PER_SECOND"
-    // // )
-    // // , ENTER_GAME_WAIT(
-    // //     "<b>4. Enter Game Wait:</b><br>Wait this long for the game to enter the overworld.",
-    // //     TICKS_PER_SECOND,
-    // //     "40 * TICKS_PER_SECOND"
-    // // )
-{
-    // PA_ADD_STATIC(m_start_game_timings);
-    // PA_ADD_OPTION(START_GAME_MASH);
-    // PA_ADD_OPTION(START_GAME_WAIT);
-    // PA_ADD_OPTION(ENTER_GAME_MASH);
-    // PA_ADD_OPTION(ENTER_GAME_WAIT);
-}
-
-
-
-
-
-GameSettings_Descriptor::GameSettings_Descriptor()
-    : PanelDescriptor(
-        Color(),
-        "PokemonHome:GlobalSettings",
-        STRING_POKEMON + " Home", STRING_POKEMON + " Settings",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonHome/PokemonSettings.md",
-        "Global " + STRING_POKEMON + " Settings"
-    )
-{}
-
-
-
-GameSettingsPanel::GameSettingsPanel(const GameSettings_Descriptor& descriptor)
-    : SettingsPanelInstance(descriptor)
-    , settings(GameSettings::instance())
-{
-    PA_ADD_OPTION(settings);
-}
-
-
-
-
-
-}
-}
-}
-
-
-
-
-
-
diff --git a/SerialPrograms/Source/PokemonHome/PokemonHome_Settings.h b/SerialPrograms/Source/PokemonHome/PokemonHome_Settings.h
deleted file mode 100644
index 66b865bcec..0000000000
--- a/SerialPrograms/Source/PokemonHome/PokemonHome_Settings.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*  Pokemon Home Settings
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonHome_Settings_H
-#define PokemonAutomation_PokemonHome_Settings_H
-
-#include "Common/Cpp/Options/StaticTextOption.h"
-#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
-#include "Common/Cpp/Options/FloatingPointOption.h"
-#include "Common/Cpp/Options/TimeExpressionOption.h"
-#include "CommonFramework/Panels/SettingsPanel.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonHome{
-
-
-class GameSettings : public BatchOption{
-    GameSettings();
-public:
-    static GameSettings& instance();
-
-    // SectionDividerOption m_start_game_timings;
-    // TimeExpressionOption<uint16_t> START_GAME_MASH;
-    // TimeExpressionOption<uint16_t> START_GAME_WAIT;
-    // TimeExpressionOption<uint16_t> ENTER_GAME_MASH;
-    // TimeExpressionOption<uint16_t> ENTER_GAME_WAIT;
-};
-
-
-
-
-class GameSettings_Descriptor : public PanelDescriptor{
-public:
-    GameSettings_Descriptor();
-};
-
-
-class GameSettingsPanel : public SettingsPanelInstance{
-public:
-    GameSettingsPanel(const GameSettings_Descriptor& descriptor);
-private:
-    GameSettings& settings;
-};
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonHome/Programs/PokemonHome_BoxSorting.cpp b/SerialPrograms/Source/PokemonHome/Programs/PokemonHome_BoxSorting.cpp
deleted file mode 100644
index 9aa3574f86..0000000000
--- a/SerialPrograms/Source/PokemonHome/Programs/PokemonHome_BoxSorting.cpp
+++ /dev/null
@@ -1,725 +0,0 @@
-/*  Home Box Sorting
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-/* TODO ideas
-break into smaller functions
-read pokemon name and store the slug (easier to detect missread than reading a number)
-Optimise the swapping algo
-Add enum for ball ? Also, BDSP is reading from swsh data. Worth refactoring ?
-
-ideas for more checks :
-ability
-nature
-type
-original game
-OT
-moves
-stats
-level
-surname
-language
-"stamps"
-*/
-
-#include <map>
-#include <optional>
-#include <sstream>
-#include "Common/Cpp/Exceptions.h"
-#include "Common/Cpp/Json/JsonValue.h"
-#include "Common/Cpp/Json/JsonArray.h"
-#include "Common/Cpp/Json/JsonObject.h"
-#include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "CommonFramework/ImageTools/ImageFilter.h"
-#include "CommonFramework/ImageTools/ImageStats.h"
-#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
-#include "CommonFramework/Notifications/ProgramNotifications.h"
-#include "CommonFramework/OCR/OCR_NumberReader.h"
-#include "CommonFramework/OCR/OCR_TextMatcher.h"
-#include "CommonFramework/Tools/ErrorDumper.h"
-#include "CommonFramework/Tools/StatsTracking.h"
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "CommonFramework/VideoPipeline/VideoOverlay.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonHome/Inference/PokemonHome_BoxGenderDetector.h"
-#include "PokemonHome/Inference/PokemonHome_BallReader.h"
-#include "PokemonSwSh/Commands/PokemonSwSh_Commands_GameEntry.h"
-#include "PokemonSwSh/Programs/ReleaseHelpers.h"
-#include "PokemonHome_BoxSorting.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonHome{
-using namespace Pokemon;
-
-
-const size_t MAX_BOXES = 200;
-const size_t MAX_COLUMNS = 6;
-const size_t MAX_ROWS = 5;
-
-BoxSorting_Descriptor::BoxSorting_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonHome:BoxSorter",
-        STRING_POKEMON + " Home", "Box Sorter",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonHome/BoxSorter.md",
-        "Order boxes of " + STRING_POKEMON + ".",
-        FeedbackType::REQUIRED,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-struct BoxSorting_Descriptor::Stats : public StatsTracker{
-    Stats()
-        : pkmn(m_stats["Pokemon"])
-        , empty(m_stats["Empty Slots"])
-        , compare(m_stats["Compares"])
-        , swaps(m_stats["Swaps"])
-    {
-        m_display_order.emplace_back(Stat("Pokemon"));
-        m_display_order.emplace_back(Stat("Empty Slots"));
-        m_display_order.emplace_back(Stat("Compares"));
-        m_display_order.emplace_back(Stat("Swaps"));
-    }
-    std::atomic<uint64_t>& pkmn;
-    std::atomic<uint64_t>& empty;
-    std::atomic<uint64_t>& compare;
-    std::atomic<uint64_t>& swaps;
-};
-std::unique_ptr<StatsTracker> BoxSorting_Descriptor::make_stats() const{
-    return std::unique_ptr<StatsTracker>(new Stats());
-}
-
-BoxSorting::BoxSorting()
-    : BOX_NUMBER(
-        "<b>Number of boxes to order:</b>",
-        LockWhileRunning::LOCKED,
-        1, 1, MAX_BOXES
-    )
-    , VIDEO_DELAY(
-        "<b>Delay of your capture card (you probably have to increase this):</b>",
-        LockWhileRunning::LOCKED,
-        20
-    )
-    , GAME_DELAY(
-        "<b>Delay of your Pokemon Home app (default value should be fine):</b>",
-        LockWhileRunning::LOCKED,
-        10
-    )
-    , SORT_TABLE(
-        "<b>Sort Order Rules:</b><br>Sort order rules will be applied top to bottom."
-    )
-    , OUTPUT_FILE(
-          false,
-          "<b>Output File:</b><br>JSON file for output of storage boxes.",
-          LockWhileRunning::LOCKED,
-          "box_order",
-          "box_order"
-      )
-    , DRY_RUN(
-          "<b>Dry Run:</b><br>Catalogue and make sort plan without executing. (Will output to OUTPUT_FILE and OUTPUT_FILE.sortplan)",
-          LockWhileRunning::LOCKED,
-          false
-      )
-    , NOTIFICATIONS({
-        &NOTIFICATION_PROGRAM_FINISH
-    })
-{
-    PA_ADD_OPTION(BOX_NUMBER); //number of box to check and sort
-    PA_ADD_OPTION(VIDEO_DELAY); //delay for every input that need video feedback, user will be able to modify this to enhance capture card delay compatibility
-    PA_ADD_OPTION(GAME_DELAY);  //delay for non video feedback, this way I can go as fast as pokemon home can handle movement when needed
-    PA_ADD_OPTION(SORT_TABLE);
-    PA_ADD_OPTION(OUTPUT_FILE);
-    PA_ADD_OPTION(DRY_RUN);
-    PA_ADD_OPTION(NOTIFICATIONS);
-}
-
-
-
-struct Cursor{
-  size_t box;
-  size_t row;
-  size_t column;
-};
-
-std::ostream& operator<<(std::ostream& os, const Cursor& cursor){
-    os << "(" << cursor.box << "/" << cursor.row << "/" << cursor.column << ")";
-    return os;
-}
-
-Cursor get_cursor(size_t index){
-    Cursor ret;
-
-    ret.column = index % MAX_COLUMNS;
-    index = index / MAX_COLUMNS;
-
-    ret.row = index % MAX_ROWS;
-    index = index / MAX_ROWS;
-
-    ret.box = index;
-    return ret;
-}
-
-size_t get_index(size_t box, size_t row, size_t column){
-    return box * MAX_ROWS * MAX_COLUMNS + row * MAX_COLUMNS + column;
-}
-
-
-
-struct Pokemon{
-    const std::vector<BoxSortingSelection>* preferences;
-
-    // When adding any new member here, do not forget to modify the operators below (ctrl-f "new struct members")
-    uint16_t national_dex_number = 0;
-    bool shiny = false;
-    bool gmax = false;
-    std::string ball_slug = "";
-    EggHatchGenderFilter gender = EggHatchGenderFilter::Genderless;
-    uint16_t ot_id = 0;
-};
-
-bool operator==(const Pokemon& lhs, const Pokemon& rhs){
-    // NOTE edit when adding new struct members
-    return lhs.national_dex_number == rhs.national_dex_number &&
-        lhs.shiny == rhs.shiny &&
-        lhs.gmax == rhs.gmax &&
-        lhs.ball_slug == rhs.ball_slug &&
-        lhs.gender == rhs.gender;
-}
-
-bool operator<(const std::optional<Pokemon>& lhs, const std::optional<Pokemon>& rhs){
-    if (!lhs.has_value()){
-        return false;
-    }
-    if (!rhs.has_value()){
-        return true;
-    }
-
-    for (const BoxSortingSelection preference : *lhs->preferences){
-        switch(preference.sort_type) {
-            // NOTE edit when adding new struct members
-            // TODO TESTING and account for preference.reverse
-            case BoxSortingSortType::NationalDexNo:
-                if (lhs->national_dex_number != rhs->national_dex_number){
-                    return lhs->national_dex_number < rhs->national_dex_number;
-                }
-                break;
-            case BoxSortingSortType::Shiny:
-                if (lhs->shiny != rhs->shiny){
-                     return lhs->shiny;
-                 }
-                break;
-            case BoxSortingSortType::Gigantamax:
-                if (lhs->gmax != rhs->gmax){
-                    return lhs->gmax;
-                }
-                break;
-            case BoxSortingSortType::Ball_Slug:
-                if (lhs->ball_slug < rhs->ball_slug){
-                    return true;
-                }
-                if (lhs->ball_slug > rhs->ball_slug){
-                    return false;
-                }
-                break;
-            case BoxSortingSortType::Gender:
-                if (lhs->gender < rhs->gender){
-                    return true;
-                }
-                if (lhs->gender > rhs->gender){
-                    return false;
-                }
-                break;
-        }
-    }
-
-    return lhs->national_dex_number < rhs->national_dex_number;
-}
-
-std::ostream& operator<<(std::ostream& os, const std::optional<Pokemon>& pokemon)
-{
-    if (pokemon.has_value()){
-        // NOTE edit when adding new struct members
-        os << "(";
-        os << "national_dex_number:" << pokemon->national_dex_number << " ";
-        os << "shiny:" << (pokemon->shiny ? "true" : "false") << " ";
-        os << "gmax:" << (pokemon->gmax ? "true" : "false") << " ";
-        os << "ball_slug:" << pokemon->ball_slug << " ";
-        os << "gender:" << gender_to_string(pokemon->gender) << " ";
-        os << "ot_id:" << pokemon->ot_id << " ";
-        os << ")";
-    }
-    else{
-        os << "(empty)";
-    }
-    return os;
-}
-
-bool go_to_first_slot(SingleSwitchProgramEnvironment& env, BotBaseContext& context, uint16_t VIDEO_DELAY){
-
-    ImageFloatBox cursor_check(0.07, 0.15, 0.01, 0.01); //cursor position of the first slot of the box
-    VideoSnapshot screen = env.console.video().snapshot();
-    FloatPixel image_value = image_stats(extract_box_reference(screen, cursor_check)).average;
-    env.console.log("Cursor color detection: " + image_value.to_string());
-    VideoOverlaySet BoxRender(env.console);
-
-    BoxRender.add(COLOR_BLUE, cursor_check);
-    if(image_value.r <= image_value.g + image_value.b){
-
-        bool cursor_found = false;
-
-        for (uint8_t rows = 0; rows < 7; rows++){
-            for (uint8_t column = 0; column < 5; column++){
-                pbf_press_dpad(context, DPAD_LEFT, 10, VIDEO_DELAY);
-                context.wait_for_all_requests();
-                screen = env.console.video().snapshot();
-                image_value = image_stats(extract_box_reference(screen, cursor_check)).average;
-                env.console.log("Cursor color detection: " + image_value.to_string());
-
-                if(image_value.r > image_value.g + image_value.b){
-                    cursor_found = true;
-                    break;
-                }
-            }
-            if(!cursor_found){
-                pbf_press_dpad(context, DPAD_UP, 10, VIDEO_DELAY);
-                context.wait_for_all_requests();
-                screen = env.console.video().snapshot();
-                image_value = image_stats(extract_box_reference(screen, cursor_check)).average;
-                env.console.log("Cursor color detection: " + image_value.to_string());
-
-                if(image_value.r > image_value.g + image_value.b){
-                    cursor_found = true;
-                    break;
-                }
-            }else{
-                break;
-            }
-        }
-        if(!cursor_found){
-            return false;
-        }
-    }
-    BoxRender.clear();
-    return true;
-}
-
-//Move the cursor to the given coordinates, knowing current pos via the cursor struct
-[[nodiscard]] Cursor move_cursor_to(SingleSwitchProgramEnvironment& env, BotBaseContext& context, const Cursor& cur_cursor, const Cursor& dest_cursor, uint16_t GAME_DELAY){
-
-    std::ostringstream ss;
-    ss << "Moving cursor from " << cur_cursor << " to " << dest_cursor;
-    env.console.log(ss.str());
-
-    // TODO: shortest path movement though pages, boxes
-    for (size_t i = cur_cursor.box; i < dest_cursor.box; ++i){
-        pbf_press_button(context, BUTTON_R, 10, GAME_DELAY+30);
-    }
-    for (size_t i = dest_cursor.box; i < cur_cursor.box; ++i){
-        pbf_press_button(context, BUTTON_L, 10, GAME_DELAY+30);
-    }
-
-
-    // direct nav up or down through rows
-    if (!(cur_cursor.row == 0 && dest_cursor.row == 4) && !(dest_cursor.row == 0 && cur_cursor.row == 4)) {
-        for (size_t i = cur_cursor.row; i < dest_cursor.row; ++i){
-            pbf_press_dpad(context, DPAD_DOWN, 1, GAME_DELAY);
-        }
-        for (size_t i = dest_cursor.row; i < cur_cursor.row; ++i){
-            pbf_press_dpad(context, DPAD_UP, 1, GAME_DELAY);
-        }
-    } else { // wrap around is faster to move between first or last row
-        if (cur_cursor.row == 0 && dest_cursor.row == 4) {
-            for (size_t i = 0; i <= 2; ++i){
-                pbf_press_dpad(context, DPAD_UP, 1, GAME_DELAY);
-            }
-        } else {
-            for (size_t i = 0; i <= 2; ++i){
-                pbf_press_dpad(context, DPAD_DOWN, 1, GAME_DELAY);
-            }
-        }
-    }
-
-    // direct nav forward or backward through columns
-    if ((dest_cursor.column > cur_cursor.column && dest_cursor.column - cur_cursor.column <= 3) || (cur_cursor.column > dest_cursor.column && cur_cursor.column - dest_cursor.column <= 3)) {
-        for (size_t i = cur_cursor.column; i < dest_cursor.column; ++i){
-            pbf_press_dpad(context, DPAD_RIGHT, 1, GAME_DELAY);
-        }
-        for (size_t i = dest_cursor.column; i < cur_cursor.column; ++i){
-            pbf_press_dpad(context, DPAD_LEFT, 1, GAME_DELAY);
-        }
-    } else { // wrap around is faster if direct movement is more than 3 away
-        if (dest_cursor.column > cur_cursor.column) {
-            for (size_t i = 0; i < MAX_COLUMNS - (dest_cursor.column - cur_cursor.column); ++i){
-                pbf_press_dpad(context, DPAD_LEFT, 1, GAME_DELAY);
-            }
-        }
-        if (cur_cursor.column > dest_cursor.column) {
-            for (size_t i = 0; i < MAX_COLUMNS - (cur_cursor.column - dest_cursor.column); ++i){
-                pbf_press_dpad(context, DPAD_RIGHT, 1, GAME_DELAY);
-            }
-        }
-    }
-
-    context.wait_for_all_requests();
-    return dest_cursor;
-}
-
-void print_boxes_data(const std::vector<std::optional<Pokemon>>& boxes_data, SingleSwitchProgramEnvironment& env){
-    std::ostringstream ss;
-    for (const std::optional<Pokemon>& pokemon : boxes_data){
-        ss << pokemon << "\n";
-    }
-    env.console.log(ss.str());
-}
-
-void output_boxes_data_json(const std::vector<std::optional<Pokemon>>& boxes_data, const std::string& json_path){
-    JsonArray pokemon_data;
-    for (size_t poke_nb = 0; poke_nb < boxes_data.size(); poke_nb++){
-        Cursor cursor = get_cursor(poke_nb);
-        JsonObject pokemon;
-        pokemon["index"] = poke_nb;
-        pokemon["box"] = cursor.box;
-        pokemon["row"] =  cursor.row;
-        pokemon["column"] =  cursor.column;
-        if (boxes_data[poke_nb] != std::nullopt){
-            // NOTE edit when adding new struct members
-            pokemon["national_dex_number"] =  boxes_data[poke_nb]->national_dex_number;
-            pokemon["shiny"] =  boxes_data[poke_nb]->shiny;
-            pokemon["gmax"] =  boxes_data[poke_nb]->gmax;
-            pokemon["ball_slug"] =  boxes_data[poke_nb]->ball_slug;
-            pokemon["gender"] = gender_to_string(boxes_data[poke_nb]->gender);
-            pokemon["ot_id"] = boxes_data[poke_nb]->ot_id;
-        }
-        pokemon_data.push_back(std::move(pokemon));
-    }
-    pokemon_data.dump(json_path + ".json");
-}
-
-void do_sort(
-        SingleSwitchProgramEnvironment& env,
-        BotBaseContext& context,
-        std::vector<std::optional<Pokemon>> boxes_data,
-        std::vector<std::optional<Pokemon>> boxes_sorted,
-        BoxSorting_Descriptor::Stats& stats,
-        Cursor& cur_cursor,
-        uint16_t GAME_DELAY
-        ) {
-    std::ostringstream ss;
-    // this need to be separated into functions when I will redo the whole thing but I just wanted it to work
-
-    // going thru the sorted list one by one and for each one go through the current pokemon layout to find the closest possible match to fill the slot
-    for (size_t poke_nb_s = 0; poke_nb_s < boxes_sorted.size(); poke_nb_s++){
-        if (boxes_sorted[poke_nb_s] == std::nullopt){ // we've hit the end of the sorted list.
-            break;
-        }
-        for (size_t poke_nb = poke_nb_s; poke_nb < boxes_data.size(); poke_nb++){
-            Cursor cursor_s = get_cursor(poke_nb_s);
-            Cursor cursor = get_cursor(poke_nb);
-
-            // ss << "Comparing " << boxes_data[poke_nb] << " at " << cursor << " to " << boxes_sorted[poke_nb_s] << " at " << cursor_s;
-            // env.console.log(ss.str());
-            // ss.str("");
-
-            //check for a match and also check if the pokemon is not already in the slot
-            stats.compare++;
-            env.update_stats();
-            if(boxes_sorted[poke_nb_s] == boxes_data[poke_nb] && poke_nb_s == poke_nb){ // Same spot no need to move.
-                break;
-            }
-            if(boxes_sorted[poke_nb_s] == boxes_data[poke_nb]){
-                ss << "Swapping " << boxes_data[poke_nb] << " at " << cursor << " and " << boxes_sorted[poke_nb_s] << " at " << cursor_s;
-                env.console.log(ss.str());
-                ss.str("");
-
-                //moving cursor to the pokemon to pick it up
-                cur_cursor = move_cursor_to(env, context, cur_cursor, cursor, GAME_DELAY);
-                pbf_press_button(context, BUTTON_Y, 10, GAME_DELAY+30);
-
-                //moving to destination to place it or swap it
-                cur_cursor = move_cursor_to(env, context, cur_cursor, cursor_s, GAME_DELAY);
-                pbf_press_button(context, BUTTON_Y, 10, GAME_DELAY+30);
-
-                context.wait_for_all_requests();
-
-                std::swap(boxes_data[poke_nb_s], boxes_data[poke_nb]);
-                stats.swaps++;
-                env.update_stats();
-
-                break;
-            }
-        }
-    }
-}
-
-void BoxSorting::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-
-    std::vector<BoxSortingSelection> sort_preferences = SORT_TABLE.preferences();
-    if (sort_preferences.empty()) {
-        throw UserSetupError(env.console, "At least one sorting method selection needs to be made!");
-    }
-
-    BoxSorting_Descriptor::Stats& stats = env.current_stats< BoxSorting_Descriptor::Stats>();
-
-    ImageFloatBox select_check(0.495, 0.0045, 0.01, 0.005); // square color to check which mode is active
-    ImageFloatBox national_dex_number_box(0.445, 0.245, 0.05, 0.04); //pokemon national dex number pos
-    ImageFloatBox shiny_symbol_box(0.702, 0.09, 0.04, 0.06); // shiny symbol pos
-    ImageFloatBox gmax_symbol_box(0.463, 0.09, 0.04, 0.06); // gmax symbol pos
-    ImageFloatBox origin_symbol_box(0.623, 0.095, 0.033, 0.05); // origin symbol pos
-    ImageFloatBox pokemon_box(0.69, 0.18, 0.28, 0.46); // pokemon render pos
-    ImageFloatBox level_box(0.546, 0.099, 0.044, 0.041); // Level box
-    ImageFloatBox ot_id_box(0.782, 0.719, 0.193, 0.046); // OT ID box
-    ImageFloatBox ot_box(0.492, 0.719, 0.165, 0.049); // OT box
-    ImageFloatBox nature_box(0.157, 0.783, 0.212, 0.042); // Nature box
-    ImageFloatBox ability_box(0.158, 0.838, 0.213, 0.042); // Ability box
-
-
-    // vector that will store data for each slot
-    std::vector<std::optional<Pokemon>> boxes_data;
-
-    Cursor cur_cursor{static_cast<uint16_t>(BOX_NUMBER-1), 0, 0};
-
-    VideoSnapshot screen = env.console.video().snapshot();
-
-    VideoOverlaySet box_render(env.console);
-
-    std::ostringstream ss;
-
-    FloatPixel image_value = image_stats(extract_box_reference(screen, select_check)).average;
-
-    env.console.log("Color detected from the select square: " + image_value.to_string());
-
-    //if the correct color is not detected, getting out of every possible menu to make sure the program work no matter where you start it in your pokemon home
-    box_render.add(COLOR_BLUE, select_check);
-    if(image_value.r <= image_value.g + image_value.b){
-        for (int var = 0; var < 5; ++var){
-            pbf_press_button(context, BUTTON_B, 10, GAME_DELAY+10);
-        }
-        context.wait_for_all_requests();
-        context.wait_for(std::chrono::milliseconds(VIDEO_DELAY));
-        screen = env.console.video().snapshot();
-        image_value = image_stats(extract_box_reference(screen, select_check)).average;
-        env.console.log("Color detected from the select square: " + image_value.to_string());
-        if(image_value.r <= image_value.g + image_value.b){
-            for (int i = 0; i < 2; ++i){
-                pbf_press_button(context, BUTTON_ZR, 10, VIDEO_DELAY+20); //additional delay because this animation is slower than the rest
-                context.wait_for_all_requests();
-                screen = env.console.video().snapshot();
-                image_value = image_stats(extract_box_reference(screen, select_check)).average;
-                env.console.log("Color detected from the select square: " + image_value.to_string());
-                if(image_value.r > image_value.g + image_value.b){
-                    break;
-                }else if(i==1){
-                    dump_image(env.console, ProgramInfo(), "SelectSquare", screen);
-                    env.console.log("ERROR: Could not find correct color mode please check color logs and timings\n", COLOR_RED);
-                    return;
-                }
-            }
-        }
-    }
-
-    box_render.clear();
-
-    //cycle through each box
-    for (size_t box_nb = 0; box_nb < BOX_NUMBER; box_nb++){
-
-        if(box_nb != 0){
-            pbf_press_button(context, BUTTON_R, 10, VIDEO_DELAY+100);
-            context.wait_for_all_requests();
-        }
-
-        // Moving the cursor until it goes to the first slot
-        if(!go_to_first_slot(env, context, VIDEO_DELAY)){
-            env.console.log("ERROR: Could not move cursor to the first slot, please consider adjusting delay\n", COLOR_RED);
-            return;
-        }
-        context.wait_for_all_requests();
-        screen = env.console.video().snapshot();
-
-        // Box grid to find empty slots (red boxes) and fill boxes_data with value to check or not for pokemon dex number
-
-        ss << "\n";
-
-        for (size_t row = 0; row < MAX_ROWS; row++){
-
-            for (size_t column = 0; column < MAX_COLUMNS; column++){
-
-                ImageFloatBox slot_box(0.06 + (0.072 * column), 0.2 + (0.1035 * row), 0.03, 0.057);
-                int current_box_value = image_stddev(extract_box_reference(screen, slot_box)).sum();
-
-                ss << current_box_value;
-
-                //checking color to know if a pokemon is on the slot or not
-                if(current_box_value < 5){
-                    box_render.add(COLOR_RED, slot_box);
-                    stats.empty++;
-                    env.update_stats();
-                    boxes_data.push_back(std::nullopt); //empty optional to make sorting easier later
-                    ss << "\u274c " ;    //  "X"
-                }else{
-                    box_render.add(COLOR_GREEN, slot_box);
-                    stats.pkmn++;
-                    env.update_stats();
-                    boxes_data.push_back(
-                        Pokemon{
-                            .preferences = &sort_preferences
-                        }
-                    ); //default initialised pokemon to know there is a pokemon here that needs a value
-                    ss << "\u2705 " ;    //  checkbox
-                }
-            }
-            ss << "\n";
-        }
-
-        env.console.log(ss.str());
-        ss.str("");
-
-        bool find_first_poke = false;
-
-        //cycling though each slot of the box in order to find the first pokemon to enter the summary
-
-        for (size_t row = 0; row < MAX_ROWS; row++){
-            for (size_t column = 0; column < MAX_COLUMNS; column++){
-                if(boxes_data[get_index(box_nb, row, column)].has_value()){
-                    find_first_poke = true;
-                }
-                if(!find_first_poke){
-                    pbf_press_dpad(context, DPAD_RIGHT, 10, GAME_DELAY);
-                }
-            }
-            if(!find_first_poke){
-                pbf_press_dpad(context, DPAD_DOWN, 10, GAME_DELAY);
-            }
-        }
-
-        //enter the summary screen
-        pbf_press_button(context, BUTTON_A, 10, GAME_DELAY);
-        context.wait_for_all_requests();
-        box_render.clear();
-        pbf_press_dpad(context, DPAD_DOWN, 10, GAME_DELAY);
-        pbf_press_button(context, BUTTON_A, 10, VIDEO_DELAY+150);
-        context.wait_for_all_requests();
-
-        box_render.add(COLOR_RED, national_dex_number_box);
-        box_render.add(COLOR_BLUE, shiny_symbol_box);
-        box_render.add(COLOR_GREEN, gmax_symbol_box);
-        box_render.add(COLOR_DARKGREEN, origin_symbol_box);
-        box_render.add(COLOR_DARK_BLUE, pokemon_box);
-        box_render.add(COLOR_RED, level_box);
-        box_render.add(COLOR_RED, ot_id_box);
-        box_render.add(COLOR_RED, ot_box);
-        box_render.add(COLOR_RED, nature_box);
-        box_render.add(COLOR_RED, ability_box);
-
-        //cycle through each summary of the current box and fill pokemon information
-        for (size_t row = 0; row < MAX_ROWS; row++){
-            for (size_t column = 0; column < MAX_COLUMNS; column++){
-
-                if(boxes_data[get_index(box_nb, row, column)].has_value()){
-                    screen = env.console.video().snapshot();
-                    ImageRGB32 image = to_blackwhite_rgb32_range(
-                        extract_box_reference(screen, national_dex_number_box),
-                        0xff808080, 0xffffffff, true
-                    );
-
-                    int national_dex_number = OCR::read_number(env.console, image);
-                    if (national_dex_number == -1){
-                        dump_image(env.console, ProgramInfo(), "ReadSummary", screen);
-                    }
-                    boxes_data[get_index(box_nb, row, column)]->national_dex_number = national_dex_number;
-
-                    int shiny_stddev_value = image_stddev(extract_box_reference(screen, shiny_symbol_box)).sum();
-                    bool is_shiny = shiny_stddev_value > 30;
-                    boxes_data[get_index(box_nb, row, column)]->shiny = is_shiny;
-                    env.console.log("Shiny detection stddev:" + std::to_string(shiny_stddev_value) + " is shiny:" + std::to_string(is_shiny));
-
-                    int gmax_stddev_value = image_stddev(extract_box_reference(screen, gmax_symbol_box)).sum();
-                    bool is_gmax = gmax_stddev_value > 30;
-                    boxes_data[get_index(box_nb, row, column)]->gmax = is_gmax;
-                    env.console.log("Gmax detection stddev:" + std::to_string(gmax_stddev_value) + " is gmax:" + std::to_string(is_gmax));
-
-                    BallReader ball_reader(env.console);
-                    boxes_data[get_index(box_nb, row, column)]->ball_slug = ball_reader.read_ball(screen);
-
-                    BoxGenderDetector::make_overlays(box_render);
-                    EggHatchGenderFilter gender = BoxGenderDetector::detect(screen);
-                    env.console.log("Gender: " + gender_to_string(gender), COLOR_GREEN);
-                    boxes_data[get_index(box_nb, row, column)]->gender = gender;
-
-                    image = to_blackwhite_rgb32_range(
-                        extract_box_reference(screen, ot_id_box),
-                        0xff808080, 0xffffffff, true
-                    );
-
-                    int ot_id = OCR::read_number(env.console, image);
-                    if (ot_id == -1){
-                        dump_image(env.console, ProgramInfo(), "ReadSummary", screen);
-                    }
-                    boxes_data[get_index(box_nb, row, column)]->ot_id = ot_id;
-
-                    // NOTE edit when adding new struct members (detections go here likely)
-
-                    // level_box
-                    // ot_box
-                    // nature_box
-                    // ability_box
-
-                    pbf_press_button(context, BUTTON_R, 10, VIDEO_DELAY+15);
-                    context.wait_for_all_requests();
-                }
-            }
-        }
-
-        box_render.clear();
-
-        ss << std::endl;
-
-        // print box information
-        for (size_t row = 0; row < MAX_ROWS; row++){
-            for (size_t column = 0; column < MAX_COLUMNS; column++){
-                ss << boxes_data[get_index(box_nb, row, column)] << " ";
-            }
-            ss << std::endl;
-        }
-
-        env.console.log(ss.str());
-        ss.str("");
-
-        //get out of summary with a lot of delay because it's slow for some reasons
-        pbf_press_button(context, BUTTON_B, 10, VIDEO_DELAY+200);
-        box_render.clear();
-        context.wait_for_all_requests();
-
-        go_to_first_slot(env, context, VIDEO_DELAY);
-        context.wait_for_all_requests();
-    }
-
-    // copy boxes data to sort
-    std::vector<std::optional<Pokemon>> boxes_sorted = boxes_data;
-
-    // sorting copy of boxes_data
-    std::sort(boxes_sorted.begin(), boxes_sorted.end());
-
-    env.console.log("Current boxes data :");
-    print_boxes_data(boxes_data, env);
-    const std::string json_path = OUTPUT_FILE;
-    output_boxes_data_json(boxes_data, json_path);
-
-    env.console.log("Sorted boxes data :");
-    print_boxes_data(boxes_sorted, env);
-    const std::string sorted_path = json_path + "-sorted";
-    output_boxes_data_json(boxes_sorted, sorted_path);
-
-    if (!DRY_RUN) {
-        do_sort(env, context, boxes_data, boxes_sorted, stats, cur_cursor, GAME_DELAY);
-    }
-
-    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
-
-}
-
-}
-}
-}
-
diff --git a/SerialPrograms/Source/PokemonHome/Programs/PokemonHome_BoxSorting.h b/SerialPrograms/Source/PokemonHome/Programs/PokemonHome_BoxSorting.h
deleted file mode 100644
index b13143f9be..0000000000
--- a/SerialPrograms/Source/PokemonHome/Programs/PokemonHome_BoxSorting.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*  Box Reorder National Dex
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef BOXSORTING_H
-#define BOXSORTING_H
-
-#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
-#include "Common/Cpp/Options/SimpleIntegerOption.h"
-#include "Common/Cpp/Options/StringOption.h"
-#include "CommonFramework/Notifications/EventNotificationsTable.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-#include "NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h"
-#include "PokemonHome/Options/PokemonHome_BoxSortingTable.h"
-
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonHome{
-
-class BoxSorting_Descriptor : public SingleSwitchProgramDescriptor{
-public:
-    BoxSorting_Descriptor();
-
-    struct Stats;
-    virtual std::unique_ptr<StatsTracker> make_stats() const override;
-};
-
-class BoxSorting : public SingleSwitchProgramInstance{
-public:
-    BoxSorting();
-
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-    SimpleIntegerOption<uint16_t> BOX_NUMBER;
-    SimpleIntegerOption<uint16_t> VIDEO_DELAY;
-    SimpleIntegerOption<uint16_t> GAME_DELAY;
-    BoxSortingTable SORT_TABLE;
-    StringOption OUTPUT_FILE;
-    BooleanCheckBoxOption DRY_RUN;
-    EventNotificationsOption NOTIFICATIONS;
-
-};
-
-}
-}
-}
-#endif // BOXSORTING_H
-
diff --git a/SerialPrograms/Source/PokemonHome/Programs/PokemonHome_GenerateNameOCR.cpp b/SerialPrograms/Source/PokemonHome/Programs/PokemonHome_GenerateNameOCR.cpp
deleted file mode 100644
index 4b752c0ff7..0000000000
--- a/SerialPrograms/Source/PokemonHome/Programs/PokemonHome_GenerateNameOCR.cpp
+++ /dev/null
@@ -1,110 +0,0 @@
-/*  Pokemon Home Generate Name OCR
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <QDir>
-#include "Common/Cpp/PrettyPrint.h"
-#include "Common/Cpp/Json/JsonValue.h"
-#include "Common/Cpp/Json/JsonArray.h"
-#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "Pokemon/Inference/Pokemon_NameReader.h"
-#include "PokemonHome_GenerateNameOCR.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonHome{
-using namespace Pokemon;
-
-
-GenerateNameOCRData_Descriptor::GenerateNameOCRData_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonHome:GenerateNameOCR",
-        STRING_POKEMON + " Home", STRING_POKEMON + " Home: Generate Name OCR",
-        "",
-        "Generate " + STRING_POKEMON + " Name OCR data by iterating the National " + STRING_POKEDEX + ".",
-        FeedbackType::REQUIRED,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-
-
-
-GenerateNameOCRData::GenerateNameOCRData()
-    : LANGUAGE(
-        "<b>Game Language:</b>",
-        PokemonNameReader::instance().languages(),
-        LockWhileRunning::LOCKED
-    )
-    , DELAY(
-        "<b>Delay Between Each Iteration:</b>",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "30"
-    )
-{
-    PA_ADD_OPTION(LANGUAGE);
-    PA_ADD_OPTION(DELAY);
-
-}
-
-
-void GenerateNameOCRData::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    std::string resource_path = RESOURCE_PATH() + "Pokemon/Pokedex/Pokedex-National.json";
-    JsonValue json = load_json_file(resource_path);
-    JsonArray& array = json.get_array_throw(resource_path);
-
-    std::vector<std::string> slugs;
-    for (auto& item : array){
-        std::string& slug = item.get_string_throw(resource_path);
-        slugs.emplace_back(std::move(slug));
-    }
-
-
-    OverlayBoxScope box(env.console, {0.705, 0.815, 0.219, 0.055});
-    std::string language_code = language_data(LANGUAGE).code;
-
-    for (const std::string& slug : slugs){
-        context.wait_for_all_requests();
-
-        VideoSnapshot screen = env.console.video().snapshot();
-        ImageViewRGB32 image = extract_box_reference(screen, box);
-
-        std::string path = "PokemonNameOCR/";
-        path += language_code;
-        path += "/";
-
-        QDir dir(QString::fromStdString(path));
-        if (!dir.exists()){
-            dir.mkpath(".");
-        }
-
-        path += slug;
-        path += "-";
-        path += now_to_filestring();
-        path += ".png";
-        image.save(path);
-
-        pbf_press_dpad(context, DPAD_RIGHT, 10, DELAY);
-
-        OCR::StringMatchResult result = PokemonNameReader::instance().read_substring(
-            env.console, LANGUAGE, image,
-            OCR::BLACK_TEXT_FILTERS()
-        );
-    }
-
-
-}
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonHome/Programs/PokemonHome_GenerateNameOCR.h b/SerialPrograms/Source/PokemonHome/Programs/PokemonHome_GenerateNameOCR.h
deleted file mode 100644
index 5cc0eb4dab..0000000000
--- a/SerialPrograms/Source/PokemonHome/Programs/PokemonHome_GenerateNameOCR.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*  Pokemon Home Generate Name OCR
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonHome_GenerateNameOCR_H
-#define PokemonAutomation_PokemonHome_GenerateNameOCR_H
-
-#include "Common/Cpp/Options/TimeExpressionOption.h"
-#include "CommonFramework/Options/LanguageOCROption.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonHome{
-
-
-class GenerateNameOCRData_Descriptor : public SingleSwitchProgramDescriptor{
-public:
-    GenerateNameOCRData_Descriptor();
-};
-
-
-
-class GenerateNameOCRData : public SingleSwitchProgramInstance{
-
-public:
-    GenerateNameOCRData();
-
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-    OCR::LanguageOCROption LANGUAGE;
-    TimeExpressionOption<uint16_t> DELAY;
-};
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonHome/Programs/PokemonHome_PageSwap.cpp b/SerialPrograms/Source/PokemonHome/Programs/PokemonHome_PageSwap.cpp
deleted file mode 100644
index 833fbc6f8c..0000000000
--- a/SerialPrograms/Source/PokemonHome/Programs/PokemonHome_PageSwap.cpp
+++ /dev/null
@@ -1,110 +0,0 @@
-/*  Pokemon Home Page Swap
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
-#include "PokemonHome_PageSwap.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonHome{
-    using namespace Pokemon;
-
-
-
-PageSwap_Descriptor::PageSwap_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonHome:PageSwap",
-        STRING_POKEMON + " Home", STRING_POKEMON + " Home: Page Swap",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonHome/PageSwap.md",
-        "Swap 30 boxes (1 page) in " + STRING_POKEMON + " Home.",
-        FeedbackType::NONE,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-
-
-
-PageSwap::PageSwap()
-    : DODGE_SYSTEM_UPDATE_WINDOW(
-        "<b>Dodge System Update Window:</b>",
-        LockWhileRunning::LOCKED,
-        false
-    )
-{
-    PA_ADD_OPTION(START_LOCATION);
-    PA_ADD_OPTION(DODGE_SYSTEM_UPDATE_WINDOW);
-}
-
-void PageSwap::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    if (START_LOCATION.start_in_grip_menu()){
-        grip_menu_connect_go_home(context);
-        PokemonSwSh::resume_game_no_interact(env.console, context, DODGE_SYSTEM_UPDATE_WINDOW);
-    }else{
-        pbf_press_button(context, BUTTON_RCLICK, 5, 5);
-    }
-
-    const uint16_t PICKUP_DELAY = 125;
-    const uint16_t SCROLL_DELAY = 20;
-
-    for (uint8_t i = 0; i < 2; i++){
-        for (uint8_t j = 0; j < 3; j++){
-            pbf_press_button(context, BUTTON_Y, 10, PICKUP_DELAY);
-            for (uint8_t c = 0; c < 6; c++){
-                pbf_press_dpad(context, DPAD_RIGHT, 10, SCROLL_DELAY);
-            }
-            pbf_press_button(context, BUTTON_Y, 10, PICKUP_DELAY);
-            pbf_press_dpad(context, DPAD_RIGHT, 10, SCROLL_DELAY);
-            pbf_press_button(context, BUTTON_Y, 10, PICKUP_DELAY);
-            for (uint8_t c = 0; c < 6; c++){
-                pbf_press_dpad(context, DPAD_LEFT, 10, SCROLL_DELAY);
-            }
-            pbf_press_button(context, BUTTON_Y, 10, PICKUP_DELAY);
-            pbf_press_dpad(context, DPAD_RIGHT, 10, SCROLL_DELAY);
-        }
-        pbf_press_dpad(context, DPAD_DOWN, 10, SCROLL_DELAY);
-        for (uint8_t j = 0; j < 3; j++){
-            pbf_press_button(context, BUTTON_Y, 10, PICKUP_DELAY);
-            for (uint8_t c = 0; c < 6; c++){
-                pbf_press_dpad(context, DPAD_LEFT, 10, SCROLL_DELAY);
-            }
-            pbf_press_button(context, BUTTON_Y, 10, PICKUP_DELAY);
-            pbf_press_dpad(context, DPAD_RIGHT, 10, SCROLL_DELAY);
-            pbf_press_button(context, BUTTON_Y, 10, PICKUP_DELAY);
-            for (uint8_t c = 0; c < 6; c++){
-                pbf_press_dpad(context, DPAD_RIGHT, 10, SCROLL_DELAY);
-            }
-            pbf_press_button(context, BUTTON_Y, 10, PICKUP_DELAY);
-            pbf_press_dpad(context, DPAD_RIGHT, 10, SCROLL_DELAY);
-        }
-        pbf_press_dpad(context, DPAD_DOWN, 10, SCROLL_DELAY);
-    }
-    for (uint8_t j = 0; j < 3; j++){
-        pbf_press_button(context, BUTTON_Y, 10, PICKUP_DELAY);
-        for (uint8_t c = 0; c < 6; c++){
-            pbf_press_dpad(context, DPAD_RIGHT, 10, SCROLL_DELAY);
-        }
-        pbf_press_button(context, BUTTON_Y, 10, PICKUP_DELAY);
-        pbf_press_dpad(context, DPAD_RIGHT, 10, SCROLL_DELAY);
-        pbf_press_button(context, BUTTON_Y, 10, PICKUP_DELAY);
-        for (uint8_t c = 0; c < 6; c++){
-            pbf_press_dpad(context, DPAD_LEFT, 10, SCROLL_DELAY);
-        }
-        pbf_press_button(context, BUTTON_Y, 10, PICKUP_DELAY);
-        pbf_press_dpad(context, DPAD_RIGHT, 10, SCROLL_DELAY);
-    }
-}
-
-
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonLA/Inference/Battles/PokemonLA_BattleMenuDetector.cpp b/SerialPrograms/Source/PokemonLA/Inference/Battles/PokemonLA_BattleMenuDetector.cpp
deleted file mode 100644
index e10702b77e..0000000000
--- a/SerialPrograms/Source/PokemonLA/Inference/Battles/PokemonLA_BattleMenuDetector.cpp
+++ /dev/null
@@ -1,67 +0,0 @@
-/*  Battle Menu Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Cpp/AbstractLogger.h"
-#include "CommonFramework/ImageTools/ImageStats.h"
-#include "CommonFramework/ImageTools/SolidColorTest.h"
-#include "PokemonLA_BattleMenuDetector.h"
-
-#include <iostream>
-using std::cout;
-using std::endl;
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-
-BattleMenuDetector::BattleMenuDetector(Logger& logger, VideoOverlay& overlay, bool stop_on_detected)
-    : VisualInferenceCallback("BattleMenuDetector")
-    , m_stop_on_detected(stop_on_detected)
-    , m_detected(false)
-    , m_pokemon_stroke_bg_left  (0.056, 0.948, 0.013, 0.020)
-    , m_pokemon_stroke_bg_right (0.174, 0.948, 0.032, 0.046)
-    , m_button_A_detector(logger, overlay, ButtonType::ButtonA, ImageFloatBox{0.764, 0.752, 0.034, 0.054}, std::chrono::milliseconds(0), false)
-    // , m_button_B_detector(logger, overlay, ButtonType::ButtonB, ImageFloatBox{0.720, 0.828, 0.027, 0.048}, std::chrono::milliseconds(0), false)
-{}
-
-void BattleMenuDetector::make_overlays(VideoOverlaySet& items) const{
-    items.add(COLOR_RED, m_pokemon_stroke_bg_left);
-    items.add(COLOR_RED, m_pokemon_stroke_bg_right);
-}
-
-
-bool BattleMenuDetector::process_frame(const ImageViewRGB32& frame, WallClock timestamp){
-    const ImageStats stroke_left = image_stats(extract_box_reference(frame, m_pokemon_stroke_bg_left));
-//    cout << stroke_left.average << stroke_left.stddev << endl;
-    if (is_solid(stroke_left,{0.179,0.386,0.435}, 0.2, 15) == false){
-        m_detected.store(false, std::memory_order_release);
-        return false;
-    }
-    
-
-    const ImageStats stroke_right = image_stats(extract_box_reference(frame, m_pokemon_stroke_bg_right));
-    if (is_solid(stroke_right, {0.228,0.358,0.414}, 0.2, 15) == false){
-        m_detected.store(false, std::memory_order_release);
-        return false;
-    }
-
-    m_button_A_detector.process_frame(frame, timestamp);
-
-    // m_button_B_detector.process_frame(frame, timestamp);
-    // hits += m_button_B_detector.detected();
-
-    bool detected = m_button_A_detector.detected();
-    m_detected.store(detected, std::memory_order_release);
-
-    return detected && m_stop_on_detected;
-}
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonLA/Inference/Battles/PokemonLA_BattlePokemonSwitchDetector.cpp b/SerialPrograms/Source/PokemonLA/Inference/Battles/PokemonLA_BattlePokemonSwitchDetector.cpp
deleted file mode 100644
index 0726b2e5ed..0000000000
--- a/SerialPrograms/Source/PokemonLA/Inference/Battles/PokemonLA_BattlePokemonSwitchDetector.cpp
+++ /dev/null
@@ -1,100 +0,0 @@
-/*  Battle Move Selection Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/ImageTools/ImageStats.h"
-#include "CommonFramework/ImageTools/SolidColorTest.h"
-#include "PokemonLA/Inference/PokemonLA_CommonColorCheck.h"
-#include "PokemonLA_BattlePokemonSwitchDetector.h"
-
-#include <iostream>
-using std::cout;
-using std::endl;
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-
-BattlePokemonSwitchDetector::BattlePokemonSwitchDetector(Logger& logger, VideoOverlay& overlay, bool stop_on_detected)
-    : VisualInferenceCallback("BattlePokemonSwitchDetector")
-    , m_stop_on_detected(stop_on_detected)
-    , m_detected(false)
-    , m_white_bg_1(0.641, 0.178, 0.05, 0.023)
-    , m_white_bg_2(0.641, 0.248, 0.05, 0.023)
-    , m_white_bg_3(0.517, 0.195, 0.011, 0.061)
-    , m_white_bg_4(0.924, 0.185, 0.019, 0.076)
-    , m_ready_to_battle_bg_1(0.538, 0.216, 0.008, 0.018)
-    , m_ready_to_battle_bg_2(0.686, 0.216, 0.008, 0.018)
-    , m_button_plus_detector(logger, overlay, ButtonType::ButtonPlus, ImageFloatBox{0.044, 0.091, 0.043, 0.077}, std::chrono::milliseconds(0), false)
-{}
-
-void BattlePokemonSwitchDetector::make_overlays(VideoOverlaySet& items) const{
-    items.add(COLOR_YELLOW, m_white_bg_1);
-    items.add(COLOR_YELLOW, m_white_bg_2);
-    items.add(COLOR_YELLOW, m_white_bg_3);
-    items.add(COLOR_YELLOW, m_white_bg_4);
-    items.add(COLOR_YELLOW, m_ready_to_battle_bg_1);
-    items.add(COLOR_YELLOW, m_ready_to_battle_bg_2);
-}
-
-
-bool BattlePokemonSwitchDetector::process_frame(const ImageViewRGB32& frame, WallClock timestamp){
-    const ImageStats white_1 = image_stats(extract_box_reference(frame, m_white_bg_1));
-    if(is_white(white_1, 500, 10) == false){
-        // std::cout << "no white_1" << std::endl;
-        m_detected.store(false, std::memory_order_release);
-        return false;
-    }
-
-    const ImageStats white_2 = image_stats(extract_box_reference(frame, m_white_bg_2));
-    if(is_white(white_2, 500, 10) == false){
-        // std::cout << "no white_2" << std::endl;
-        m_detected.store(false, std::memory_order_release);
-        return false;
-    }
-
-    const ImageStats white_3 = image_stats(extract_box_reference(frame, m_white_bg_3));
-    if(is_white(white_3, 500, 10) == false){
-        // std::cout << "no white_3" << std::endl;
-        m_detected.store(false, std::memory_order_release);
-        return false;
-    }
-
-    const ImageStats white_4 = image_stats(extract_box_reference(frame, m_white_bg_4));
-    if(is_white(white_4, 500, 10) == false){
-        // std::cout << "no white_4" << std::endl;
-        m_detected.store(false, std::memory_order_release);
-        return false;
-    }
-
-    const ImageStats battle_1 = image_stats(extract_box_reference(frame, m_ready_to_battle_bg_1));
-    if (!is_LA_dark_blue(battle_1)){
-        // std::cout << "battle_1 not enough " << battle_1.average << " " << battle_1.stddev << std::endl;
-        m_detected.store(false, std::memory_order_release);
-        return false;
-    }
-
-    const ImageStats battle_2 = image_stats(extract_box_reference(frame, m_ready_to_battle_bg_2));
-    if (!is_LA_dark_blue(battle_2)){
-        // std::cout << "battle_2  not enough" << battle_2.average << " " << battle_2.stddev << std::endl;
-        m_detected.store(false, std::memory_order_release);
-        return false;
-    }
-    
-
-    m_button_plus_detector.process_frame(frame, timestamp);
-    bool detected = m_button_plus_detector.detected();
-    // std::cout << "button plus detected " << detected << std::endl;
-    m_detected.store(detected, std::memory_order_release);
-
-    return detected && m_stop_on_detected;
-}
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonLA/Inference/Battles/PokemonLA_BattleSpriteWatcher.cpp b/SerialPrograms/Source/PokemonLA/Inference/Battles/PokemonLA_BattleSpriteWatcher.cpp
deleted file mode 100644
index 74fa1d7cd9..0000000000
--- a/SerialPrograms/Source/PokemonLA/Inference/Battles/PokemonLA_BattleSpriteWatcher.cpp
+++ /dev/null
@@ -1,85 +0,0 @@
-/*  Battle Sprite Watcher
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Cpp/AbstractLogger.h"
-#include "CommonFramework/GlobalSettingsPanel.h"
-#include "CommonFramework/ImageTools/ImageStats.h"
-#include "CommonFramework/Tools/DebugDumper.h"
-#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
-#include "PokemonLA_BattleSpriteWatcher.h"
-
-#include <vector>
-#include <iostream>
-#include <algorithm>
-using std::cout;
-using std::endl;
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-const size_t MAX_WILD_POKEMON_IN_MULTI_BATTLE = 8;
-
-
-
-BattleSpriteWatcher::BattleSpriteWatcher(Logger& logger, VideoOverlay& overlay)
-    : VisualInferenceCallback("BattleSpriteWatcher")
-    , m_logger(logger)
-    , m_battle_start_detector(logger, overlay)
-{
-    for(size_t i = 0; i < MAX_WILD_POKEMON_IN_MULTI_BATTLE; i++){
-        m_sprite_boxes.emplace_back(0.957 - 0.035*i, 0.044, 0.021, 0.035);
-    }
-    m_sprite_appeared.resize(m_sprite_boxes.size(), false);
-}
-
-void BattleSpriteWatcher::make_overlays(VideoOverlaySet& items) const{
-    for(const auto& box : m_sprite_boxes){
-        items.add(COLOR_RED, box);
-    }
-}
-
-bool BattleSpriteWatcher::process_frame(const ImageViewRGB32& frame, WallClock timestamp){
-    bool in_battle = m_battle_start_detector.process_frame(frame, timestamp);
-    if (in_battle == false){
-        return false;
-    }
-
-    const bool found_new_sprites = set_detected_sprites(frame, m_sprite_appeared);
-    if (found_new_sprites && PreloadSettings::instance().DEVELOPER_MODE){
-        dump_debug_image(m_logger, "PokemonLA/BattleSpriteWatcher", "SpriteDetected", frame);
-    }
-
-    return false;
-}
-
-
-std::vector<bool> BattleSpriteWatcher::detect_sprites(const ImageViewRGB32& frame) const{
-    std::vector<bool> ret(m_sprite_boxes.size(), false);
-    set_detected_sprites(frame, ret);
-    return ret;
-}
-
-
-bool BattleSpriteWatcher::set_detected_sprites(const ImageViewRGB32& frame, std::vector<bool>& sprites) const{
-    bool ret = false;
-    for(size_t i = 0; i < m_sprite_boxes.size(); i++){
-        const auto& box = m_sprite_boxes[i];
-        const auto stats = image_stats(extract_box_reference(frame, box));
-        // cout << stats.average.to_string() << " " << stats.stddev.to_string() << endl;
-        if (sprites[i] == false && (stats.average.sum() > 150.0 || stats.stddev.sum() > 60.0)){
-            ret = true;
-            sprites[i] = true;
-        }
-    }
-
-    return ret;
-}
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonLA/Inference/Battles/PokemonLA_BattleStartDetector.cpp b/SerialPrograms/Source/PokemonLA/Inference/Battles/PokemonLA_BattleStartDetector.cpp
deleted file mode 100644
index d40c705c44..0000000000
--- a/SerialPrograms/Source/PokemonLA/Inference/Battles/PokemonLA_BattleStartDetector.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-/*  Battle Start Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/ImageTools/ImageGradient.h"
-#include "CommonFramework/ImageTools/ImageStats.h"
-#include "CommonFramework/ImageTools/SolidColorTest.h"
-#include "CommonFramework/Logging/Logger.h"
-#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
-#include "PokemonLA_BattleStartDetector.h"
-
-#include <vector>
-#include <iostream>
-#include <algorithm>
-using std::cout;
-using std::endl;
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-
-BattleStartDetector::BattleStartDetector(Logger& logger, VideoOverlay& overlay)
-    : VisualInferenceCallback("BattleStartDetector")
-    , m_logger(logger)
-    , m_upper_boundary  (0.0, 0.113, 1.0, 0.15)
-    , m_lower_boundary (0.2, 0.871, 0.63, 0.015)
-{}
-
-void BattleStartDetector::make_overlays(VideoOverlaySet& items) const{
-    items.add(COLOR_BLUE, m_upper_boundary);
-    items.add(COLOR_BLUE, m_lower_boundary);
-}
-
-bool BattleStartDetector::process_frame(const ImageViewRGB32& frame, WallClock timestamp){
-
-    Color threshold(50, 50, 50);
-    
-    const ImageViewRGB32 upper_boundary = extract_box_reference(frame, m_upper_boundary);
-    
-    const size_t upper_border_length = count_horizontal_translucent_border_pixels(upper_boundary, threshold, true);
-
-    bool detected = upper_border_length / (float)upper_boundary.width() > 0.9;
-
-    if (detected == false){
-        return false;
-    }
-
-    const ImageViewRGB32 lower_boundary = extract_box_reference(frame, m_lower_boundary);
-
-    const size_t lower_border_length = count_horizontal_translucent_border_pixels(lower_boundary, threshold, false);
-
-    detected = lower_border_length / (float)lower_boundary.width() > 0.9;
-
-    if (detected && m_started == false){
-        m_started = true;
-        m_logger.log("Detected battle start by black borders.");
-    }
-
-    return detected;
-}
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonLA/Inference/Battles/PokemonLA_TransparentDialogueDetector.cpp b/SerialPrograms/Source/PokemonLA/Inference/Battles/PokemonLA_TransparentDialogueDetector.cpp
deleted file mode 100644
index aeb00a83fb..0000000000
--- a/SerialPrograms/Source/PokemonLA/Inference/Battles/PokemonLA_TransparentDialogueDetector.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-/*  Transparent Dialogue Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "PokemonLA_TransparentDialogueDetector.h"
-
-#include <chrono>
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-
-TransparentDialogueDetector::TransparentDialogueDetector(
-    Logger& logger, VideoOverlay& overlay,
-    bool stop_on_detected
-)
-    : VisualInferenceCallback("TransparentDialogueDetector")
-    , m_arrow_detector(logger, overlay, stop_on_detected)
-    , m_ellipse_detector(logger, overlay, std::chrono::milliseconds(0), stop_on_detected)
-{}
-
-
-void TransparentDialogueDetector::make_overlays(VideoOverlaySet& items) const{
-    m_arrow_detector.make_overlays(items);
-    m_ellipse_detector.make_overlays(items);
-}
-
-
-bool TransparentDialogueDetector::process_frame(const ImageViewRGB32& frame, WallClock timestamp){
-    bool stop = m_arrow_detector.process_frame(frame, timestamp);
-    bool detected = m_arrow_detector.detected();
-    if (detected){
-        stop = stop && m_ellipse_detector.process_frame(frame, timestamp);
-        detected = m_ellipse_detector.detected();
-    }
-
-    m_detected.store(detected, std::memory_order_release);
-
-    return stop;
-}
-
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonLA/Inference/Battles/PokemonLA_TransparentDialogueDetector.h b/SerialPrograms/Source/PokemonLA/Inference/Battles/PokemonLA_TransparentDialogueDetector.h
deleted file mode 100644
index 9df37f1528..0000000000
--- a/SerialPrograms/Source/PokemonLA/Inference/Battles/PokemonLA_TransparentDialogueDetector.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*  Transparent Dialogue Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- *  Detect the transparent dialogue box from your opponent shown before and/or after the battle, like
- *  Ingo's battles or Fortune Sisters'.
- */
-
-#ifndef PokemonAutomation_PokemonLA_TransparentDialogueDetector_H
-#define PokemonAutomation_PokemonLA_TransparentDialogueDetector_H
-
-#include "Common/Cpp/Color.h"
-#include "Common/Cpp/Concurrency/SpinLock.h"
-#include "CommonFramework/Logging/Logger.h"
-#include "CommonFramework/ImageMatch/WaterfillTemplateMatcher.h"
-#include "CommonFramework/Inference/DetectionDebouncer.h"
-#include "CommonFramework/InferenceInfra/VisualInferenceCallback.h"
-#include "PokemonLA/Inference/Objects/PokemonLA_DialogueEllipseDetector.h"
-#include "PokemonLA/Inference/Objects/PokemonLA_DialogueYellowArrowDetector.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-
-class TransparentDialogueDetector : public VisualInferenceCallback{
-public:
-    TransparentDialogueDetector(
-        Logger& logger, VideoOverlay& overlay,
-        bool stop_on_detected
-    );
-
-    bool detected() const{
-        return m_detected;
-    }
-
-    virtual void make_overlays(VideoOverlaySet& items) const override;
-
-    virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override;
-
-private:
-    DialogueYellowArrowDetector m_arrow_detector;
-    DialogueEllipseDetector m_ellipse_detector;
-    std::atomic<bool> m_detected;
-};
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonLA/Inference/Map/PokemonLA_MapMissionTabReader.cpp b/SerialPrograms/Source/PokemonLA/Inference/Map/PokemonLA_MapMissionTabReader.cpp
deleted file mode 100644
index 0dd959dfd5..0000000000
--- a/SerialPrograms/Source/PokemonLA/Inference/Map/PokemonLA_MapMissionTabReader.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-/*  Map Zoom Level Reader
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <cmath>
-#include "CommonFramework/ImageTools/ImageStats.h"
-#include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "CommonFramework/ImageTools/SolidColorTest.h"
-#include "PokemonLA_MapMissionTabReader.h"
-
-#include <iostream>
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-bool is_map_mission_tab_raised(const ImageViewRGB32& screen){
-    // The white area around the "R" button when the tab is raise.
-    const ImageFloatBox box0{0.9235, 0.617, 0.003, 0.019};
-    const ImageFloatBox box1{0.937, 0.62, 0.0035, 0.012};
-
-    return is_white(image_stats(extract_box_reference(screen, box0))) || 
-        is_white(image_stats(extract_box_reference(screen, box1)));
-}
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonLA/Inference/Map/PokemonLA_MapMissionTabReader.h b/SerialPrograms/Source/PokemonLA/Inference/Map/PokemonLA_MapMissionTabReader.h
deleted file mode 100644
index 6f99a6d02d..0000000000
--- a/SerialPrograms/Source/PokemonLA/Inference/Map/PokemonLA_MapMissionTabReader.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*  Map Mission Tab Reader
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-
-#ifndef PokemonAutomation_PokemonLA_MapMissionTabReader_H
-#define PokemonAutomation_PokemonLA_MapMissionTabReader_H
-
-namespace PokemonAutomation{
-    class ImageViewRGB32;
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-
-// Whether the Missions & Requests tab is raised on map view.
-// The detection is most reliable when map is in zoom level 1: the full region map view.
-// Suggest using this detection only when zoom level is 1.
-bool is_map_mission_tab_raised(const ImageViewRGB32& screen);
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonLA/Inference/Map/PokemonLA_MapWeatherAndTimeReader.cpp b/SerialPrograms/Source/PokemonLA/Inference/Map/PokemonLA_MapWeatherAndTimeReader.cpp
deleted file mode 100644
index d558f5dab7..0000000000
--- a/SerialPrograms/Source/PokemonLA/Inference/Map/PokemonLA_MapWeatherAndTimeReader.cpp
+++ /dev/null
@@ -1,131 +0,0 @@
-/*  Selected Region Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Cpp/AbstractLogger.h"
-#include "CommonFramework/ImageMatch/ImageCropper.h"
-#include "CommonFramework/ImageMatch/SilhouetteDictionaryMatcher.h"
-#include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "CommonFramework/ImageTools/ImageFilter.h"
-#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
-#include "PokemonLA/Resources/PokemonLA_WeatherAndTimeIcons.h"
-#include "PokemonLA_MapWeatherAndTimeReader.h"
-
-#include <iostream>
-#include <sstream>
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-
-ImageMatch::SilhouetteDictionaryMatcher BUILD_WEATHER_ICON_MATCHER(){
-    ImageMatch::SilhouetteDictionaryMatcher matcher;
-    for (size_t i = 0; i < NUM_WEATHER; i++){
-        matcher.add(WEATHER_NAMES[i], ALL_WEATHER_ICONS()[i]);
-    }
-    return matcher;
-}
-
-const ImageMatch::SilhouetteDictionaryMatcher& WEATHER_ICON_MATCHER(){
-    const static auto matcher = BUILD_WEATHER_ICON_MATCHER();
-    return matcher;
-}
-
-
-ImageMatch::SilhouetteDictionaryMatcher BUILD_TIME_OF_DAY_ICON_MATCHER(){
-    ImageMatch::SilhouetteDictionaryMatcher matcher;
-    for (size_t i = 0; i < NUM_TIMES_OF_DAY; i++){
-        // +1 here to skip the name of TimeOfDay::NONE
-        matcher.add(TIME_OF_DAY_NAMES[i+1], ALL_TIME_OF_DAY_ICONS()[i]);
-    }
-    return matcher;
-}
-
-const ImageMatch::SilhouetteDictionaryMatcher& TIME_OF_DAY_ICON_MATCHER(){
-    const static auto matcher = BUILD_TIME_OF_DAY_ICON_MATCHER();
-    return matcher;
-}
-
-
-
-
-Weather detect_weather_on_map(Logger& logger, const ImageViewRGB32& screen){
-    const ImageFloatBox box{0.0285, 0.069, 0.025, 0.044};
-    
-    // Get a loose crop of the weather icon
-    ImageViewRGB32 cropped_image = extract_box_reference(screen, box);
-
-    // image.save("./weather_crop.png");
-    // Get a tight crop:
-    const ImagePixelBox tight_box = ImageMatch::enclosing_rectangle_with_pixel_filter(
-        cropped_image,
-        // The filter is a lambda function that returns true on white weather icon pixels.
-        [](Color pixel){
-            return (uint32_t)pixel.red() + pixel.green() + pixel.blue() > 600;
-        }
-    );
-    cropped_image = extract_box_reference(cropped_image, tight_box);
-
-    // Replace the background dark pixels (outside the range from 0xffa0a0a0 to 0xffffffff) with
-    // 0-alpha black pixels.
-    const bool replace_range = false;
-    ImageRGB32 icon_image = filter_rgb32_range(
-        cropped_image,
-        0xffa0a0a0, 0xffffffff, Color(0), replace_range
-    );
-
-    const auto match_result = WEATHER_ICON_MATCHER().match(icon_image, 100);
-    std::ostringstream os;
-    os << "Weather icon match result: ";
-    for(auto result : match_result.results){
-        os << result.second << "(" << result.first << ") ";
-    }
-    logger.log(os.str(), COLOR_BLUE);
-
-    return get_weather(match_result.results.begin()->second);
-}
-
-
-TimeOfDay detect_time_of_day_on_map(Logger& logger, const ImageViewRGB32& screen){
-    const ImageFloatBox box{0.910, 0.070, 0.034, 0.041};
-    
-    // Get a loose crop of the time of day icon
-    ImageViewRGB32 cropped_image = extract_box_reference(screen, box);
-
-    // Get a tight crop:
-    const ImagePixelBox tight_box = ImageMatch::enclosing_rectangle_with_pixel_filter(
-        cropped_image,
-        // The filter is a lambda function that returns true on white time of day icon pixels.
-        [](Color pixel){
-            return (uint32_t)pixel.red() + pixel.green() + pixel.blue() > 600;
-        }
-    );
-    cropped_image = extract_box_reference(cropped_image, tight_box);
-
-    // Replace the background dark pixels (outside the range from 0xffa0a0a0 to 0xffffffff) with
-    // 0-alpha black pixels.
-    const bool replace_range = false;
-    ImageRGB32 icon_image = filter_rgb32_range(
-        cropped_image,
-        0xffa0a0a0, 0xffffffff, Color(0), replace_range
-    );
-
-    const auto match_result = TIME_OF_DAY_ICON_MATCHER().match(icon_image, 100);
-
-    std::ostringstream os;
-    os << "Time of day icon match result: ";
-    for(auto result : match_result.results){
-        os << result.second << "(" << result.first << ") ";
-    }
-    logger.log(os.str(), COLOR_BLUE);
-
-    return get_time_of_day(match_result.results.begin()->second);
-}
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonLA/Inference/Map/PokemonLA_MapWeatherAndTimeReader.h b/SerialPrograms/Source/PokemonLA/Inference/Map/PokemonLA_MapWeatherAndTimeReader.h
deleted file mode 100644
index deb852cb79..0000000000
--- a/SerialPrograms/Source/PokemonLA/Inference/Map/PokemonLA_MapWeatherAndTimeReader.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*  Map weather & Time Reader
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *  
- *  Read the weather and time symbols on the map.
- */
-
-
-#ifndef PokemonAutomation_PokemonLA_MapWeatherAndTimeReader_H
-#define PokemonAutomation_PokemonLA_MapWeatherAndTimeReader_H
-
-#include "PokemonLA/PokemonLA_WeatherAndTime.h"
-
-namespace PokemonAutomation{
-    class Logger;
-    class ImageViewRGB32;
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-
-Weather detect_weather_on_map(Logger& logger, const ImageViewRGB32& screen);
-
-
-TimeOfDay detect_time_of_day_on_map(Logger& logger, const ImageViewRGB32& screen);
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonLA/Inference/Map/PokemonLA_MapZoomLevelReader.cpp b/SerialPrograms/Source/PokemonLA/Inference/Map/PokemonLA_MapZoomLevelReader.cpp
deleted file mode 100644
index f380d11a9e..0000000000
--- a/SerialPrograms/Source/PokemonLA/Inference/Map/PokemonLA_MapZoomLevelReader.cpp
+++ /dev/null
@@ -1,71 +0,0 @@
-/*  Map Zoom Level Reader
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <cmath>
-#include "CommonFramework/ImageTypes/ImageRGB32.h"
-#include "CommonFramework/ImageTools/ImageStats.h"
-#include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "CommonFramework/ImageTools/ImageFilter.h"
-#include "PokemonLA_MapZoomLevelReader.h"
-
-#include <iostream>
-using std::cout;
-using std::endl;
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-int read_map_zoom_level(const ImageViewRGB32& screen){
-    
-    // The three locations of the yellow disk on the zoom gauge, from left to right.
-    // Left most is Hisui map, zoom level 0. Right most is local view, zoom level 2.
-    const ImageFloatBox boxes[3] = {
-        {0.780, 0.085, 0.008, 0.014},
-        {0.795, 0.082, 0.010, 0.019},
-        {0.807, 0.081, 0.014, 0.022},
-    };
-
-    double max_yellow = 0;
-    int max_yellow_index = -1;
-
-    for (int i = 0; i < 3; i++){
-
-        // Replacing non-yellow color with zero-alpha color so that they won't be counted in
-        // the following image_stats()
-        const bool replace_background = true;
-        size_t pixels_filtered;
-        ImageRGB32 region = filter_rgb32_range(
-            pixels_filtered,
-            extract_box_reference(screen, boxes[i]),
-            combine_rgb(0, 0, 0), combine_rgb(200, 200, 255), Color(0), replace_background
-        );
-        if (pixels_filtered == (size_t)region.width() * (size_t)region.height()){
-            // All pixels are filtered out, so no yellow color. In this case, this is defenitiely not the location
-            // of the yellow disk:
-            // std::cout << "No yellow disk at " << i << std::endl;
-            continue;
-        }
-
-        const auto stats = image_stats(region);
-
-        if (std::isnan(stats.average.r) == false && std::isnan(stats.average.g) == false){
-            const double yellow = (stats.average.r + stats.average.g) / 2.0;
-            if (yellow > max_yellow){
-                max_yellow_index = i;
-                max_yellow = yellow;
-            }
-        }
-        // std::cout << "Compability color " << stats.average << " " << stats.stddev << std::endl;
-    }
-
-    return max_yellow_index;
-}
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonLA/Inference/Map/PokemonLA_MapZoomLevelReader.h b/SerialPrograms/Source/PokemonLA/Inference/Map/PokemonLA_MapZoomLevelReader.h
deleted file mode 100644
index b44157a973..0000000000
--- a/SerialPrograms/Source/PokemonLA/Inference/Map/PokemonLA_MapZoomLevelReader.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*  Map Zoom Level Reader
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-
-#ifndef PokemonAutomation_PokemonLA_MapZoomLevelReader_H
-#define PokemonAutomation_PokemonLA_MapZoomLevelReader_H
-
-namespace PokemonAutomation{
-    class ImageViewRGB32;
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-
-// Return the zoom level of the map by checking the location of the yellow disk in
-// the zoom gauge.
-// zoom level 0: full Hisui map view
-// zoom level 1: full region map view
-// zoom level 2: local view
-// Return -1 if the reading fails.
-int read_map_zoom_level(const ImageViewRGB32& screen);
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonLA/Inference/Map/PokemonLA_PokemonMapSpriteReader.cpp b/SerialPrograms/Source/PokemonLA/Inference/Map/PokemonLA_PokemonMapSpriteReader.cpp
deleted file mode 100644
index c95c8c0221..0000000000
--- a/SerialPrograms/Source/PokemonLA/Inference/Map/PokemonLA_PokemonMapSpriteReader.cpp
+++ /dev/null
@@ -1,1009 +0,0 @@
-/*  Selected Region Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <math.h>
-#ifndef M_PI
-#define M_PI 3.14159265358979323846
-#endif
-
-#include "Common/Compiler.h"
-#include "Common/Cpp/Exceptions.h"
-#include "CommonFramework/Globals.h"
-#include "CommonFramework/ImageMatch/ImageCropper.h"
-#include "CommonFramework/ImageMatch/ImageDiff.h"
-#include "CommonFramework/ImageTools/ImageStats.h"
-#include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "CommonFramework/ImageTools/ImageFilter.h"
-#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
-#include "CommonFramework/ImageTypes/ImageHSV32.h"
-#include "CommonFramework/Logging/Logger.h"
-#include "CommonFramework/Resources/SpriteDatabase.h"
-#include "CommonFramework/Tools/DebugDumper.h"
-#include "PokemonLA_PokemonMapSpriteReader.h"
-#include "PokemonLA/Resources/PokemonLA_AvailablePokemon.h"
-#include "PokemonLA/Resources/PokemonLA_PokemonSprites.h"
-
-#include <set>
-#include <map>
-#include <vector>
-#include <string>
-#include <iostream>
-#include <sstream>
-#include <cfloat>
-#include <cmath>
-#include <array>
-using std::cout;
-using std::endl;
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-namespace {
-
-using FeatureType = double;
-using FeatureVector = std::vector<FeatureType>;
-
-using ImageMatch::ExactImageDictionaryMatcher;
-
-// We set each sprite resolution to be 50 x 50 during image matching.
-const size_t IMAGE_TEMPLATE_SIZE = 50;
-// The amount of pixel offset allowed in color matching
-const size_t IMAGE_COLOR_MATCH_EXTRA_SIDE_EXT = 2;
-
-const size_t EXTENDED_IMAGE_SIZE = IMAGE_TEMPLATE_SIZE + IMAGE_COLOR_MATCH_EXTRA_SIDE_EXT * 2;
-
-// Defined locally stored data for matching MMO sprites:
-// Store data belonging to one sprite
-struct PerSpriteMatchingData {
-    
-    FeatureVector feature;
-
-    ImageStats rgb_stats;
-    
-    ImageHSV32 hsv_image;
-    
-    ImageRGB32 gradient_image;
-};
-
-using MMOSpriteMatchingMap = std::map<std::string, PerSpriteMatchingData>;
-
-inline bool is_transparent(uint32_t g){
-    return (g >> 24) < 128;
-}
-
-
-FeatureType feature_distance(const FeatureVector& a, const FeatureVector& b){
-    if (a.size() != b.size()){
-        cout << "Error, feature size mismatch " << a.size() << " " << b.size() << endl;
-        throw std::runtime_error("feature size mismatch");
-    }
-    FeatureType sum = 0.0f;
-    for(size_t i = 0; i < a.size(); i++){
-        FeatureType d = a[i] - b[i];
-        sum += d*d;
-    }
-
-    return sum;
-}
-
-std::string feature_to_str(const FeatureVector& a){
-    std::ostringstream os;
-    os << "[";
-    for(size_t i = 0; i < a.size(); i++){
-        if (i != 0){
-            os << ", ";
-        }
-        os << a[i];
-    }
-    os << "]";
-    return os.str();
-}
-
-void run_Sobel_gradient_filter(const ImageViewRGB32& image, std::function<void(size_t x, size_t y, int sum_x[3], int sum_y[3])> process_gradient){
-    const size_t width = image.width();
-    const size_t height = image.height();
-    // Kernel for computing gradient along x axis
-    const int kx[3][3] = {
-        {-1, 0, 1},
-        {-2, 0, 2},
-        {-1, 0, 1},
-    };
-    // kernel for gradient along y axis
-    const int ky[3][3] = {
-        { 1,  2,  1},
-        { 0,  0,  0},
-        {-1, -2, -1},
-    };
-    const int ksz = 3; // kernel size
-    if (width <= ksz || height <= ksz){
-        return;
-    }
-    const size_t x_end = width - ksz + 1;
-    const size_t y_end = height - ksz + 1;
-
-    for(size_t y = 0; y < y_end; y++){
-        for(size_t x = 0; x < x_end; x++){
-            int sum_x[3] = {0, 0, 0};
-            int sum_y[3] = {0, 0, 0};
-            bool has_alpha_pixel = false;
-            for(size_t sy = 0; sy < 3; sy++){
-                for(size_t sx = 0; sx < 3; sx++){
-                    uint32_t p = image.pixel(x + sx, y + sy);
-                    int alpha = p >> 24;
-                    if (alpha < 128){
-                        // We don't compute gradient when there is a pixel in the kernel
-                        // scope that is transparent
-                        has_alpha_pixel = true;
-                        break;
-                    }
-                    for(int ch = 0; ch < 3; ch++){ // rgb channel
-                        int shift = ch * 8;
-                        int c = (uint32_t(0xff) & p >> shift);
-
-                        sum_x[ch] += c * kx[sy][sx];
-                        sum_y[ch] += c * ky[sy][sx];
-                    }
-                }
-                if (has_alpha_pixel){
-                    break;
-                }
-            } // end of kernel operation
-            if (has_alpha_pixel){
-                continue;
-            }
-
-            process_gradient(x+1, y+1, sum_x, sum_y);
-        }
-    }
-}
-
-ImageRGB32 smooth_image(const ImageViewRGB32& image){
-    // static int count = 0;
-    // {
-    //     image.save("./test_smooth_before_" + std::to_string(count) + ".png");
-    // }
-
-    ImageRGB32 result(image.width(), image.height());
-    result.fill(0);
-
-    const float filter[5] = {0.062f, 0.244f, 0.388f, 0.244f, 0.062f};
-
-    size_t image_width = image.width();
-    size_t image_height = image.height();
-    for(size_t y = 0; y < image_height; y++){
-        for(size_t x = 0; x < image_width; x++){
-            float sum[3] = {0,0,0};
-            float weights = 0.0;
-            for(size_t i = 0; i < 5; i++){
-                if (x + i < 2 || x + i >= image_width + 2){
-                    continue;
-                }
-                size_t sx = x + i - 2;
-            
-                uint32_t p = image.pixel(sx, y);
-                if (is_transparent(p)){
-                    continue;
-                }
-
-                weights += filter[i];
-
-                for(int ch = 0; ch < 3; ch++){
-                    int shift = 16 - ch * 8;
-                    int c = (uint32_t(0xff) & p >> shift);
-                    sum[ch] += filter[i] * c;
-                }
-            }
-            if (weights == 0){
-                continue;
-            }
-
-            char c[3];
-            for(int ch = 0; ch < 3; ch++){
-                sum[ch] /= weights;
-                int v = std::min(std::max(int(sum[ch] + 0.5f), 0), 255);
-                c[ch] = (char)v;
-            }
-            result.pixel(x, y) = combine_rgb(c[0], c[1], c[2]);
-        }
-    }
-
-    ImageRGB32 result2(image.width(), image.height());
-    result2.fill(0);
-
-    for(size_t y = 0; y < image_height; y++){
-        for(size_t x = 0; x < image_width; x++){
-            float sum[3] = {0,0,0};
-            float weights = 0.0;
-            for(size_t i = 0; i < 5; i++){
-                if (y + i < 2 || y + i - 2 >= image_height){
-                    continue;
-                }
-                size_t sy = y + i - 2;
-
-                uint32_t p = result.pixel(x, sy);
-                if (is_transparent(p)){
-                    continue;
-                }
-
-                weights += filter[i];
-
-                for(int ch = 0; ch < 3; ch++){
-                    int shift = 16 - ch * 8;
-                    int c = (uint32_t(0xff) & (p >> shift));
-                    sum[ch] += filter[i] * c;
-                }
-            }
-            if (weights == 0){
-                continue;
-            }
-
-            char c[3];
-            for(int ch = 0; ch < 3; ch++){
-                sum[ch] /= weights;
-                int v = std::min(std::max(int(sum[ch] + 0.5f), 0), 255);
-                c[ch] = (char)v;
-            }
-            result2.pixel(x, y) = combine_rgb(c[0], c[1], c[2]);
-        }
-    }
-
-    // {
-    //     result_ref.save("./test_smooth_middle_" + std::to_string(count) + ".png");
-    //     result_ref2.save("./test_smooth_after_" + std::to_string(count) + ".png");
-    //     count++;
-    // }
-    // exit(0);
-
-    return result2;
-}
-
-
-ImageRGB32 compute_image_gradient(const ImageViewRGB32& image){
-    ImageRGB32 result(image.width(), image.height());
-    result.fill(0);
-
-    run_Sobel_gradient_filter(image, [&](size_t x, size_t y, int sum_x[3], int sum_y[3]){
-        int gx = (sum_x[0] + sum_x[1] + sum_x[2] + 1) / 3;
-        int gy = (sum_y[0] + sum_y[1] + sum_y[2] + 1) / 3;
-
-        uint8_t gxc = (uint8_t)std::min(std::abs(gx), 255);
-        uint8_t gyc = (uint8_t)std::min(std::abs(gy), 255);
-
-        result.pixel(x, y) = combine_rgb(gxc, gyc, 0);
-    });
-
-    return result;
-}
-
-FeatureVector compute_gradient_histogram(const ImageViewRGB32& image){
-    const int num_angle_divisions = 8;
-    double division_angle = 2. * M_PI / num_angle_divisions;
-    double inverse_division_angle = 1.0 / division_angle;
-
-    std::array<int, num_angle_divisions> bin = {0};
-
-    int num_grad = 0;
-
-    run_Sobel_gradient_filter(image, [&](size_t x, size_t y, int sum_x[3], int sum_y[3]){
-        int gx = sum_x[0] + sum_x[1] + sum_x[2];
-        int gy = sum_y[0] + sum_y[1] + sum_y[2];
-        if (gx*gx + gy*gy <= 2000){
-            return;
-        }
-        num_grad++;
-
-        // if (count == 0){
-        //     // cout << "gxy " << sum_x[0] << " " << sum_x[1] << " " << sum_x[2] << ", " <<
-        //     //  sum_y[0] << " " << sum_y[1] << " " << sum_y[2] << endl;
-        //     int gxc = std::min(std::abs(gx), 255);
-        //     int gyc = std::min(std::abs(gy), 255);
-
-        //     output_image->setPixelColor(x, y, QColor(gxc, gyc, 0));
-        // }
-
-        double angle = std::atan2(gy, gx); // range in -pi, pi
-        int bin_idx = int((angle + M_PI) * inverse_division_angle);
-        // clamp bin to [0, 11]
-        bin_idx = std::min(std::max(bin_idx, 0), num_angle_divisions-1);
-        bin[bin_idx]++;
-    });
-
-    FeatureVector result(num_angle_divisions);
-    for(size_t i = 0; i < num_angle_divisions; i++){
-        result[i] = bin[i] / (FeatureType)num_grad;
-    }
-
-    return result;
-}
-
-} // end anonymous namespace
-
-FeatureVector compute_feature(const ImageViewRGB32& input_image){
-    ImageRGB32 image = input_image.copy();
-    size_t width = image.width();
-    size_t height = image.height();
-
-    // Set pixel outside the sprite circle to transparent:
-    double r = (width + height) / 4.0;
-    double center_x  = (width-1) / 2.0f;
-    double center_y = (height-1) / 2.0f;
-    double r2 = r * r;
-    for (size_t y = 0; y < height; y++){
-        for (size_t x = 0; x < width; x++){
-            if ((x-center_x)*(x-center_x) + (y-center_y)*(y-center_y) >= r2){
-                image.pixel(x, y) = 0;
-            }
-        }
-    }    
-
-    // Divide the image into 4 areas, compute average color on each.
-    // Note: we skip the upper right area because that area may overlap with
-    // the berry or star (bonus wave) symbol.
-    const int num_divisions = 2;
-    const double portion = 1.0 / (double)num_divisions;
-    FeatureVector result;
-    for(int i = 0; i < num_divisions; i++){
-        for(int j = 0; j < num_divisions; j++){
-            if (i == 1 && j == 0){
-                continue; // skip the berry / bonus wave overlapping area
-            }
-            ImageFloatBox box{i*portion, j*portion, portion, portion};
-            auto sub_image = extract_box_reference(image, box);
-
-            ImageStats stats = image_stats(sub_image);
-
-            result.push_back(stats.average.r);
-            result.push_back(stats.average.g);
-            result.push_back(stats.average.b);
-        }
-    }
-
-    return result;
-}
-
-void load_and_visit_MMO_sprite(std::function<void(const std::string& slug, const ImageViewRGB32& sprite)> visit_sprit){
-    static const SpriteDatabase database("PokemonLA/MMOSprites.png", "PokemonLA/MMOSprites.json");
-    for (const auto& item : database){
-        // cout << "sprite " << count << endl;
-        const std::string& slug = item.first;
-        const auto& sprite = item.second.sprite;
-        if (sprite.width() != 128 || sprite.height() != 128){
-            throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Wrong size of Loaded MMO Sprite sprite: " + slug);
-        }
-        visit_sprit(slug, item.second.sprite.sub_image(12, 12, 104, 104).scale_to(50, 50));
-    }
-}
-
-MMOSpriteMatchingMap build_MMO_sprite_matching_data(){
-
-    MMOSpriteMatchingMap sprite_map;
-
-    load_and_visit_MMO_sprite([&](const std::string& slug, const ImageViewRGB32& sprite){
-
-        PerSpriteMatchingData per_sprite_data;
-
-        per_sprite_data.rgb_stats = image_stats(sprite);
-        per_sprite_data.hsv_image = ImageHSV32(sprite);
-
-        ImageRGB32 smoothed_sprite = smooth_image(sprite);
-        per_sprite_data.gradient_image = compute_image_gradient(smoothed_sprite);
-        per_sprite_data.feature = compute_feature(smoothed_sprite);
-
-        sprite_map.emplace(slug, std::move(per_sprite_data));
-    });
-
-    return sprite_map;
-}
-
-const MMOSpriteMatchingMap& MMO_SPRITE_MATCHING_DATA(){
-    const static auto& sprite_matching_data = build_MMO_sprite_matching_data();
-
-    return sprite_matching_data;
-}
-
-
-std::multimap<double, std::string> match_pokemon_map_sprite_feature(const ImageViewRGB32& image, MapRegion region){
-    const FeatureVector& image_feature = compute_feature(image);
-
-    const MMOSpriteMatchingMap& sprite_map = MMO_SPRITE_MATCHING_DATA();
-
-    const std::array<std::vector<std::string>, 5>& region_available_sprites = MMO_FIRST_WAVE_REGION_SPRITE_SLUGS();
-    int region_index = 0;
-    switch(region){
-    case MapRegion::FIELDLANDS:
-        region_index = 0;
-        break;
-    case MapRegion::MIRELANDS:
-        region_index = 1;
-        break;
-    case MapRegion::COASTLANDS:
-        region_index = 2;
-        break;
-    case MapRegion::HIGHLANDS:
-        region_index = 3;
-        break;
-    case MapRegion::ICELANDS:
-        region_index = 4;
-        break;
-    default:
-        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Invalid region.");
-//        return {};
-    }
-
-    // cout << "input image feature: " << feature_to_str(image_feature) << endl;
-
-    // FeatureType closest_dist = FLT_MAX;
-    // std::string closest_slug = "";
-
-    std::multimap<double, std::string> result;
-
-    for(const auto& slug : region_available_sprites[region_index]){
-        auto it = sprite_map.find(slug);
-        if (it == sprite_map.end()){
-            throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Inconsistent sprite slug definitions in resource: " + slug);
-        }
-
-        const FeatureVector& feature = it->second.feature;
-        const FeatureType dist = feature_distance(image_feature, feature);
-        result.emplace(dist, slug);
-    }
-
-    // cout << "Closest feature distance " << closest_dist << ", slug " << closest_slug << endl;
-    // cout << feature_to_str(features.find(closest_slug)->second) << endl;
-
-    return result;
-}
-
-
-ImageHSV32 compute_MMO_sprite_color_hsv(const ImageViewRGB32& image_rgb){
-    // Convert the image to HSV during ImageHSV32 class construction
-    ImageHSV32 result = [&](){
-        if (image_rgb.width() == EXTENDED_IMAGE_SIZE || image_rgb.height() == EXTENDED_IMAGE_SIZE){
-            return ImageHSV32(image_rgb);
-        }
-        // First scale the image
-        return ImageHSV32(image_rgb.scale_to(EXTENDED_IMAGE_SIZE, EXTENDED_IMAGE_SIZE));
-    }();
-    
-    const size_t width = result.width();
-    const size_t height = result.height();
-    
-    // Set all the pixels outside the sprite area transparent to avoid matching the template to background colors.
-    double r = (width + height) / 4.0;
-    double center_x  = (width-1) / 2.0f;
-    double center_y = (height-1) / 2.0f;
-    // -r/12 to remove some boundary areas
-    double dist2_th = (r - r/12) * (r - r/12);
-    for (size_t y = 0; y < height; y++){
-        for (size_t x = 0; x < width; x++){
-            if ((x-center_x)*(x-center_x) + (y-center_y)*(y-center_y) >= dist2_th){
-                // color outside of the sprite circle is set to zero transparency
-                result.pixel(x, y) = uint32_t(0);
-            }
-            // else if (x > center_x && y < center_y){
-            //     // Upper-right part of the sprite is set to zero transparency to avoid matching the 
-            //     // berry or star symbol
-            //     result.pixel(x, y) = uint32_t(0);
-            // }
-        }
-    }
-    return result;
-}
-
-
-// For a sprite on the screenshot, create gradient image of it
-ImageRGB32 compute_MMO_sprite_gradient(const ImageViewRGB32& image){
-
-    ImageRGB32 result = [&](){
-        if (image.width() == IMAGE_TEMPLATE_SIZE || image.height() == IMAGE_TEMPLATE_SIZE){
-            return smooth_image(image);
-        }
-        // First scale the image
-        return smooth_image(image.scale_to(IMAGE_TEMPLATE_SIZE, IMAGE_TEMPLATE_SIZE));
-    }();
-    result = compute_image_gradient(result);
-    
-    size_t width = image.width();
-    size_t height = image.height();
-    if (width == 0 || height == 0){
-        return result;
-    }
-
-    // Remove gradients outside of the image area
-    double r = (width + height) / 4.0;
-    double center_x  = (width-1) / 2.0f;
-    double center_y = (height-1) / 2.0f;
-    // -r/8 to remove some boundary areas
-    double dist2_th = (r - r/8) * (r - r/8);
-    for (size_t y = 0; y < height; y++){
-        for (size_t x = 0; x < width; x++){
-            if ((x-center_x)*(x-center_x) + (y-center_y)*(y-center_y) >= dist2_th){
-                // gradients outside of the sprite circle is set to zero
-                result.pixel(x, y) = combine_argb(0,0,0,0);
-            }
-            // else if (x > center_x && y < center_y){
-            //     // Upper-right part of the sprite is set to zero transparency to avoid matching the 
-            //     // berry or star symbol
-            //     result.pixel(x, y) = uint32_t(0);
-            // }
-        }
-    }
-    return result;
-}
-
-
-
-
-
-
-
-
-
-
-
-double compute_MMO_sprite_gradient_distance(const ImageViewRGB32& gradient_template, const ImageViewRGB32& gradient){
-    int tempt_width = (int)gradient_template.width();
-    int tempt_height = (int)gradient_template.height();
-
-    double score = 0.0f;
-    int max_offset = 2;
-
-    auto compute_pixel_dist = [](uint32_t t_g, uint32_t g){
-        int gx = uint32_t(0xff) & (g >> 16);
-        int gy = uint32_t(0xff) & (g >> 8);
-        int t_gx = uint32_t(0xff) & (t_g >> 16);
-        int t_gy = uint32_t(0xff) & (t_g >> 8);
-        double pixel_score = std::max(t_gx, gx) * (gx - t_gx) * (gx - t_gx) + std::max(t_gy, gy) * (gy - t_gy) * (gy - t_gy);
-        pixel_score /= 255;
-        return pixel_score;
-    };
-
-
-// #define USE_IMAGE_LEVEL_TRANSLATION
-// #define USE_PIXEL_LEVEL_TRANSLATION
-#define USE_BLOCK_LEVEL_TRANSLATION
-
-#ifdef USE_IMAGE_LEVEL_TRANSLATION
-    score = FLT_MAX;
-    for(int oy = -max_offset; oy <= max_offset; oy++){ // offset_y
-        for(int ox = -max_offset; ox <= max_offset; ox++){ // offset_x
-
-            float match_score = 0.0;
-            int num_gradients = 0;
-            for(size_t y = 0; y < gradient.height(); y++){
-                for(size_t x = 0; x < gradient.width(); x++){
-                    uint32_t g = gradient.pixel(x, y);
-                    if (is_transparent(g)){
-                        continue;
-                    }
-                    int my = (int)(y + oy); // moved y
-                    int mx = (int)(x + ox); // moved x
-                    if (mx < 0 || mx >= tempt_width || my < 0 || my >= tempt_height){
-                        continue;
-                    }
-
-                    uint32_t t_g = gradient_template.pixel(mx, my);
-                    if (is_transparent(t_g)){
-                        continue;
-                    }
-
-                    num_gradients++;
-
-                    float pixel_score = compute_pixel_dist(t_g, g);
-                    match_score += pixel_score;
-
-                    // output.setPixelColor(x, y, QColor(
-                    //     std::min((int)std::sqrt(gx*gx+gy*gy),255),
-                    //     std::min((int)std::sqrt(t_gx*t_gx+t_gy*t_gy), 255),
-                    //     0
-                    // ));
-                }
-            }
-
-            match_score = std::sqrt(match_score / num_gradients);
-            if (match_score < score){
-                score = match_score;
-            }
-        }
-    }
-    score = std::sqrt(score);
-#endif
-
-#ifdef USE_PIXEL_LEVEL_TRANSLATION
-    score = 0;
-    int num_gradients = 0;
-    for(size_t y = 0; y < gradient.height(); y++){
-        for(size_t x = 0; x < gradient.width(); x++){
-            uint32_t g = gradient.pixel(x, y);
-            uint32_t gx = uint32_t(0xff) & (g >> 16);
-            uint32_t gy = uint32_t(0xff) & (g >> 8);
-            uint32_t alpha = g >> 24;
-            if (alpha < 128){
-                continue;
-            }
-
-            float min_pixel_score = FLT_MAX;
-            for(int oy = -max_offset; oy <= max_offset; oy++){ // offset_y
-                for(int ox = -max_offset; ox <= max_offset; ox++){ // offset_x
-                    int my = (int)(y + oy); // moved y
-                    int mx = (int)(x + ox); // moved x
-                    if (mx < 0 || mx >= tempt_width || my < 0 || my >= tempt_height){
-                        continue;
-                    }
-                    // int dist_x = std::abs(ox);
-                    // int dist_y = std::abs(oy);
-                    // int dist2 = dist_x * dist_x + dist_y * dist_y;
-                    uint32_t t_g = scaled_template.pixel(mx, my);
-                    uint32_t t_a = t_g >> 24;
-                    if (t_a < 128){
-                        continue;
-                    }
-
-                    uint32_t t_gx = uint32_t(0xff) & (t_g >> 16);
-                    uint32_t t_gy = uint32_t(0xff) & (t_g >> 8);
-                    float pixel_score = std::max(t_gx, gx) * (gx - t_gx) * (gx - t_gx) + std::max(t_gy, gy) * (gy - t_gy) * (gy - t_gy);
-                    pixel_score /= 255;
-                    if (pixel_score < min_pixel_score){
-                        min_pixel_score = pixel_score;
-                    }
-
-                    if (ox == 0 && oy == 0){
-                        output.setPixelColor(x, y, QColor(
-                            std::min((int)std::sqrt(gx*gx+gy*gy),255),
-                            std::min((int)std::sqrt(t_gx*t_gx+t_gy*t_gy), 255),
-                            0
-                        ));
-                    }
-                }
-            } // end offset
-
-            if (min_pixel_score < FLT_MAX){
-                score += min_pixel_score;
-                num_gradients++;
-            }
-        }
-    }
-    score = std::sqrt(score / num_gradients);
-#endif
-
-#ifdef USE_BLOCK_LEVEL_TRANSLATION
-    int block_radius = 5;
-
-    score = 0;
-    int num_gradients = 0;
-
-    for(int y = 0; y < (int)gradient.height(); y++){
-        for(int x = 0; x < (int)gradient.width(); x++){
-            uint32_t g = gradient.pixel(x, y);
-            if (is_transparent(g)){
-                continue;
-            }
-
-            double min_block_score = FLT_MAX;
-            for(int oy = -max_offset; oy <= max_offset; oy++){ // offset_y
-                for(int ox = -max_offset; ox <= max_offset; ox++){ // offset_x
-
-                    double block_score = 0.0;
-                    int block_size = 0;
-                    for(int by = y - block_radius; by <= y + block_radius; by++){
-                        for(int bx = x - block_radius; bx <= x + block_radius; bx++){
-                            if (bx < 0 || bx >= (int)gradient.width() || by < 0 || by >= (int)gradient.height()){
-                                continue;
-                            }
-
-                            uint32_t bg = gradient.pixel(bx, by);
-                            if (is_transparent(bg)){
-                                continue;
-                            }
-
-                            int ty = by + oy; // template y
-                            int tx = bx + ox; // template x
-                            if (tx < 0 || tx >= tempt_width || ty < 0 || ty >= tempt_height){
-                                continue;
-                            }
-                            uint32_t t_bg = gradient_template.pixel(tx, ty);
-                            if (is_transparent(t_bg)){
-                                continue;
-                            }
-
-                            block_score += compute_pixel_dist(t_bg, bg);
-                            block_size++;
-                        }
-                    }
-                    block_score = block_score / block_size;
-                    min_block_score = std::min(min_block_score, block_score);
-                }
-            } // end offset
-
-            if (min_block_score < FLT_MAX){
-                score += min_block_score;
-                num_gradients++;
-            }
-        }
-    }
-    score = std::sqrt(score / num_gradients);
-#endif
-
-    // output.save("test_distance_alignment_" + QString::number(count) + ".png");
-    // count++;
-
-    return score;
-}
-
-double compute_hsv_dist2(uint32_t template_color, uint32_t color){
-    int t_h = (uint32_t(0xff) & (template_color >> 16));
-    int t_s = (uint32_t(0xff) & (template_color >> 8));
-    int t_v = (uint32_t(0xff) & template_color);
-
-    int h = (uint32_t(0xff) & (color >> 16));
-    int s = (uint32_t(0xff) & (color >> 8));
-    int v = (uint32_t(0xff) & color);
-
-    int h_dif = std::abs(t_h - h);
-    if (h_dif > 255 - h_dif){
-        h_dif = 256 - h_dif;
-    }
-
-    return h_dif * h_dif + (t_s - s) * (t_s - s) + 0.5 * (t_v - v) * (t_v - v);
-}
-
-double compute_MMO_sprite_hsv_distance(const ImageViewHSV32& image_template, const ImageViewHSV32& query_image){
-    size_t tempt_width = image_template.width();
-    size_t tempt_height = image_template.height();
-
-    // cout << tempt_width << " " << tempt_height << " " << query_image.width() << " " << query_image.height() << endl;
-    double score = 0.0;
-    int num_pixels = 0;
-    for (size_t y = 0; y < query_image.height(); y++){
-        for (size_t x = 0; x < query_image.width(); x++){
-            uint32_t p = query_image.pixel(x, y);
-            if (is_transparent(p)){
-                // cout << "Skip query pixel " << x << " " << y << endl;
-                continue;
-            }
-            if (x >= tempt_width || y >= tempt_height){
-                continue;
-            }
-
-            uint32_t t_p = image_template.pixel(x, y);
-            if (is_transparent(t_p)){
-                // cout << "Skip template pixel " << x << " " << y << endl;
-                continue;
-            }
-
-            num_pixels++;
-
-            double pixel_score = compute_hsv_dist2(t_p, p);
-            score += pixel_score;
-        }
-    }
-
-    score = std::sqrt(score / num_pixels);
-    // cout << "score " << score << " " << num_pixels << endl;
-    // exit(0);
-    return score;
-}
-
-
-MapSpriteMatchResult match_sprite_on_map(Logger& logger, const ImageViewRGB32& screen, const ImagePixelBox& box, MapRegion region, bool debug_mode){
-    const static auto& sprite_map = MMO_SPRITE_MATCHING_DATA();
-
-    auto save_debug_image_if_required = [&](const MapSpriteMatchResult& result){
-        if (debug_mode == false){
-            return;
-        }
-        const std::string debug_path = std::string("PokemonLA/PokemonMapSpriteReader/") + std::string(WILD_REGION_SHORT_NAMES[(int)region-2])
-             + "/" + result.slug;
-
-        dump_debug_image(logger, debug_path, result.slug, extract_box_reference(screen, box.expand_as(5)));
-    };
-
-    // configs for the algorithm:
-    const size_t num_feature_candidates = 10;
-    const double color_difference_threshold = 10.0;
-    const double gradient_confidence_threshold = 2.0;
-    const double color_to_gradient_confidence_scale = 2.0;
-
-    MapSpriteMatchResult result;
-    logger.log("Start map MMO sprite matching:");
-
-    // This map has the match score for all sprites.
-    // This map must be not empty for subsequent computation.
-    const auto& feature_map = match_pokemon_map_sprite_feature(extract_box_reference(screen, box), region);
-    
-    for (const auto& p : feature_map){
-        result.candidates.push_back(p.second);
-        if (result.candidates.size() >= num_feature_candidates){
-            break;
-        }
-    }
-
-    {
-        std::ostringstream os;
-        os << "  Candidates: ";
-        for(size_t i = 0; i < result.candidates.size(); i++){
-            if (i > 0){
-                os << ", ";
-            }
-            os << result.candidates[i];
-        }
-        logger.log(os.str());
-    }
-
-    // Should not happen if we correctly loads the sprite data.
-    if (result.candidates.size() == 0){
-        return result;
-    }
-
-    logger.log("Color matching...");
-    {
-        const ImagePixelBox expanded_box = box.expand_as(2);
-        const ImageHSV32 sprite_hsv = compute_MMO_sprite_color_hsv(extract_box_reference(screen, expanded_box));
-        
-        for(const auto& slug: result.candidates){
-            const ImageHSV32& candidate_template = sprite_map.find(slug)->second.hsv_image;
-            double score = FLT_MAX;
-            for(size_t ox = 0; ox <= 4; ox++){
-                for(size_t oy = 0; oy <= 4; oy++){
-                    ImagePixelBox shifted_box(ox, oy, box.width(), box.height());
-                    double match_score = compute_MMO_sprite_hsv_distance(
-                        candidate_template,
-                        extract_box_reference(sprite_hsv, shifted_box)
-                    );
-                    score = std::min(match_score, score);
-                }
-            }
-
-            result.color_match_results.emplace(score, slug);
-        }
-    }
-
-    // Build a map from sprite to their color score and output scores for debugging
-    std::map<std::string, double> color_match_sprite_scores;
-    int result_count = 0;
-    for(const auto& p : result.color_match_results){
-        const auto& slug = p.second;
-        color_match_sprite_scores.emplace(slug, p.first);
-        if (result_count < 5){
-            const auto& stats = sprite_map.find(slug)->second.rgb_stats;
-            std::ostringstream os;
-            os << p.first << " - " << slug << " " << stats.stddev.sum();
-            logger.log(os.str());
-        }
-        if (result_count == 5){
-            size_t num_rest_results = result.color_match_results.size() - 5;
-            std::ostringstream os;
-            os << "Skip " << num_rest_results << " more result" << (num_rest_results > 1 ? "s" : "");
-            logger.log(os.str());
-        }
-        
-        result_count++;
-    }
-
-    auto color_top = result.color_match_results.begin();
-    const std::string& color_top_slug = color_top->second;
-    auto color_second = color_top;
-    color_second++;
-
-    result.slug = color_top_slug;
-    result.color_score = color_top->first;
-
-    if (color_second == result.color_match_results.end()){
-        // we only have one color match result.
-        result.color_lead = DBL_MAX;
-        logger.log("Single color match result: " + color_top_slug);
-        save_debug_image_if_required(result);
-        return result;
-    }
-
-    // We have some sprites which have closer scores to the top color match:
-    // Find the difference between the top and second match score
-    result.color_lead = color_second->first - result.color_score;
-    {
-        std::ostringstream os;
-        os << "Top color score: " << result.color_score << " diff to second: " << result.color_lead;
-        logger.log(os.str());
-    }
-
-    if (result.color_lead >= color_difference_threshold){
-        logger.log("Color difference large enough. Good match: " + result.slug);
-        result.second_slug = color_second->second;
-        save_debug_image_if_required(result);
-        return result;
-    }
-
-    logger.log("Gradient matching...");
-    ImageRGB32 gradient_image = compute_MMO_sprite_gradient(extract_box_reference(screen, box));
-    
-    // std::ostringstream os;
-    // os << "test_sprite_gradient" << count << "_" << std::setfill('0') << std::setw(2) << i << ".png";
-    // std::string sprite_filename = os.str();
-    // gradient_image.save(sprite_filename);
-
-    for(const auto& p : result.color_match_results){
-        const auto& slug = p.second;
-        ImageViewRGB32 template_gradient = sprite_map.find(slug)->second.gradient_image;
-        double score = compute_MMO_sprite_gradient_distance(template_gradient, gradient_image);
-        result.gradient_match_results.emplace(score, slug);
-    }
-
-    result_count = 0;
-    for(const auto& p : result.gradient_match_results){
-        if (result_count == 5){
-            size_t num_rest_results = result.gradient_match_results.size() - 5;
-            std::ostringstream os;
-            os << "Skip " << num_rest_results << " more result" << (num_rest_results > 1 ? "s" : "");
-            logger.log(os.str());
-            break;
-        }
-        std::ostringstream os;
-        os << p.first << " - " << p.second;
-        logger.log(os.str());
-        result_count++;
-    }
-
-    // In case the gradient match is not confident, rely again on the color match:
-    auto gradient_top = result.gradient_match_results.begin();
-    const auto& gradient_top_slug = gradient_top->second;
-    auto gradient_second = gradient_top;
-    gradient_second++;
-    const auto& gradient_second_slug = gradient_second->second;
-
-    result.slug = gradient_top_slug;
-    result.gradient_score = gradient_top->first;
-    result.gradient_lead = gradient_second->first - gradient_top->first;
-    result.second_slug = gradient_second_slug;
-
-    {
-        std::ostringstream os;
-        os << "Top gradient score: " << result.gradient_score << " diff to second: " << result.gradient_lead;
-        logger.log(os.str());
-    }
-
-    if (result.gradient_lead >= gradient_confidence_threshold){
-        logger.log("Gradient difference large enough. Good match: " + result.slug);
-        save_debug_image_if_required(result);
-        return result;
-    }
-
-    // The diff between top and second gradient match is close
-    // Let's check their color score:
-    result.graident_top_color_score = color_match_sprite_scores[gradient_top_slug];
-    result.gradient_second_color_score = color_match_sprite_scores[gradient_second_slug];
-    double color_diff = result.gradient_second_color_score - result.graident_top_color_score;
-
-    {
-        std::ostringstream os;
-        os << "Gradient difference not large enough. Check color difference: " << 
-            result.graident_top_color_score << " vs " << result.gradient_second_color_score << ", diff: " <<
-            color_diff;
-        logger.log(os.str());
-    }
-    
-    // If color score is more confident in telling those two sprites apart
-    if (std::fabs(color_diff) > result.gradient_lead * color_to_gradient_confidence_scale){ 
-        if (color_diff < 0){ // second gradient sprite is better in color matching than the first graident sprite:
-            result.pick_gradient_second = true;
-            std::swap(result.slug, result.second_slug);
-            logger.log("Switch to more confident color result: " + result.slug);
-        }
-    }
-    else{
-        logger.log("Low confidence match: " + result.slug);
-    }
-
-    save_debug_image_if_required(result);
-    return result;
-}
-
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonLA/Inference/Map/PokemonLA_PokemonMapSpriteReader.h b/SerialPrograms/Source/PokemonLA/Inference/Map/PokemonLA_PokemonMapSpriteReader.h
deleted file mode 100644
index 5aacb91f44..0000000000
--- a/SerialPrograms/Source/PokemonLA/Inference/Map/PokemonLA_PokemonMapSpriteReader.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*  Pokemon Map Sprite Reader
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-
-#ifndef PokemonAutomation_PokemonLA_PokemonMapSpriteReader_H
-#define PokemonAutomation_PokemonLA_PokemonMapSpriteReader_H
-
-#include <map>
-#include <vector>
-#include "CommonFramework/ImageMatch/ExactImageDictionaryMatcher.h"
-#include "PokemonLA/PokemonLA_Locations.h"
-
-struct ImagePixelBox;
-
-namespace PokemonAutomation{
-
-
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-struct MapSpriteMatchResult{
-    std::string slug;
-
-    std::vector<std::string> candidates;
-
-    std::multimap<double, std::string> color_match_results;
-
-    std::multimap<double, std::string> gradient_match_results;
-
-    double color_score = 0.0;
-    
-    double color_lead = 0.0;
-
-    double gradient_score = 0.0;
-    
-    double gradient_lead = 0.0;
-
-    double graident_top_color_score = 0.0;
-    
-    double gradient_second_color_score = 0.0;
-    
-    bool pick_gradient_second = false;
-
-    std::string second_slug;
-};
-
-MapSpriteMatchResult match_sprite_on_map(
-    Logger& logger,
-    const ImageViewRGB32& screen,
-    const ImagePixelBox& box,
-    MapRegion region,
-    bool debug_mode = false
-);
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonLA/Inference/Map/PokemonLA_SelectedRegionDetector.cpp b/SerialPrograms/Source/PokemonLA/Inference/Map/PokemonLA_SelectedRegionDetector.cpp
deleted file mode 100644
index fcb0390138..0000000000
--- a/SerialPrograms/Source/PokemonLA/Inference/Map/PokemonLA_SelectedRegionDetector.cpp
+++ /dev/null
@@ -1,112 +0,0 @@
-/*  Selected Region Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
-#include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "CommonFramework/ImageMatch/ImageDiff.h"
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "CommonFramework/InferenceInfra/VisualInferenceCallback.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
-#include "PokemonLA_SelectedRegionDetector.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-
-class MapLocationDetector : public VisualInferenceCallback{
-public:
-    MapLocationDetector()
-        : VisualInferenceCallback("MapLocationDetector")
-        , m_current_region(MapRegion::NONE)
-    {}
-
-    MapRegion current_region() const{
-        return m_current_region;
-    }
-
-    virtual void make_overlays(VideoOverlaySet& items) const override{
-//        for (const RegionState& region : m_regions){
-//            items.add(COLOR_CYAN, region.box);
-//        }
-    }
-
-    virtual bool process_frame(const VideoSnapshot& frame) override{
-        if (!frame){
-            return false;
-        }
-        if (m_regions.empty()){
-            reload_reference(frame.frame);
-        }
-
-        for (RegionState& region : m_regions){
-            ImageViewRGB32 current = extract_box_reference(frame, region.box);
-
-            if (current.width() != (size_t)region.start.width() || current.height() != (size_t)region.start.height()){
-                reload_reference(frame.frame);
-                return false;
-            }
-
-            double rmsd = ImageMatch::pixel_RMSD(region.start, current);
-            if (rmsd > 20){
-                m_current_region = region.region;
-                return true;
-            }
-        }
-        return false;
-    }
-
-    void reload_reference(std::shared_ptr<const ImageRGB32> screen){
-        m_screen = std::move(screen);
-        m_regions.clear();
-        m_regions.emplace_back(MapRegion::JUBILIFE,     ImageFloatBox(0.252, 0.400, 0.025, 0.150), *m_screen);
-        m_regions.emplace_back(MapRegion::FIELDLANDS,   ImageFloatBox(0.415, 0.550, 0.025, 0.150), *m_screen);
-        m_regions.emplace_back(MapRegion::MIRELANDS,    ImageFloatBox(0.750, 0.570, 0.025, 0.150), *m_screen);
-        m_regions.emplace_back(MapRegion::COASTLANDS,   ImageFloatBox(0.865, 0.240, 0.025, 0.150), *m_screen);
-        m_regions.emplace_back(MapRegion::HIGHLANDS,    ImageFloatBox(0.508, 0.320, 0.025, 0.150), *m_screen);
-        m_regions.emplace_back(MapRegion::ICELANDS,     ImageFloatBox(0.457, 0.060, 0.025, 0.150), *m_screen);
-        m_regions.emplace_back(MapRegion::RETREAT,      ImageFloatBox(0.635, 0.285, 0.025, 0.150), *m_screen);
-    }
-
-private:
-    struct RegionState{
-        MapRegion region;
-        ImageFloatBox box;
-        ImageViewRGB32 start;
-        RegionState(MapRegion p_region, const ImageFloatBox& p_box, const ImageViewRGB32& screen)
-            : region(p_region)
-            , box(p_box)
-            , start(extract_box_reference(screen, box))
-        {}
-    };
-
-    std::shared_ptr<const ImageRGB32> m_screen;
-    std::vector<RegionState> m_regions;
-    MapRegion m_current_region;
-};
-
-
-MapRegion detect_selected_region(ConsoleHandle& console, CancellableScope& scope){
-    MapLocationDetector detector;
-    int ret = wait_until(
-        console, scope,
-        std::chrono::seconds(2),
-        {{detector}}
-    );
-    MapRegion region = detector.current_region();
-    if (ret < 0){
-        console.log("Unable to detect active region on map.", COLOR_RED);
-    }else{
-        console.log(std::string("Current Selection: ") + MAP_REGION_NAMES[(int)region]);
-    }
-    return region;
-}
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonLA/Inference/Map/PokemonLA_SelectedRegionDetector.h b/SerialPrograms/Source/PokemonLA/Inference/Map/PokemonLA_SelectedRegionDetector.h
deleted file mode 100644
index b42bb6d182..0000000000
--- a/SerialPrograms/Source/PokemonLA/Inference/Map/PokemonLA_SelectedRegionDetector.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*  Selected Region Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-
-#ifndef PokemonAutomation_PokemonLA_SelectedRegionDetector_H
-#define PokemonAutomation_PokemonLA_SelectedRegionDetector_H
-
-#include "PokemonLA/PokemonLA_Locations.h"
-
-namespace PokemonAutomation{
-    class CancellableScope;
-    class ConsoleHandle;
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-// On the map that you see when you leave village, detect which region the cursor is currently
-// floats on.
-// The function detects the region by checking which red region name sign is moving up and down.
-MapRegion detect_selected_region(ConsoleHandle& console, CancellableScope& scope);
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonLA/Inference/Objects/PokemonLA_ArcDetector.h b/SerialPrograms/Source/PokemonLA/Inference/Objects/PokemonLA_ArcDetector.h
deleted file mode 100644
index 6e64c81cc3..0000000000
--- a/SerialPrograms/Source/PokemonLA/Inference/Objects/PokemonLA_ArcDetector.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*  Arc Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonLA_ArcDetector_H
-#define PokemonAutomation_PokemonLA_ArcDetector_H
-
-#include <list>
-#include "PokemonLA_WhiteObjectDetector.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-
-class ArcDetector : public WhiteObjectDetector{
-public:
-    ArcDetector();
-    virtual void process_object(const ImageViewRGB32& image, const WaterfillObject& object) override;
-    virtual void finish(const ImageViewRGB32& image) override;
-
-private:
-    std::list<ImagePixelBox> m_left;
-    std::list<ImagePixelBox> m_right;
-};
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonLA/Inference/Objects/PokemonLA_ArcPhoneDetector.cpp b/SerialPrograms/Source/PokemonLA/Inference/Objects/PokemonLA_ArcPhoneDetector.cpp
deleted file mode 100644
index f9fe8018dc..0000000000
--- a/SerialPrograms/Source/PokemonLA/Inference/Objects/PokemonLA_ArcPhoneDetector.cpp
+++ /dev/null
@@ -1,135 +0,0 @@
-/*  Arc Phone Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Kernels/Waterfill/Kernels_Waterfill_Types.h"
-#include "PokemonLA_ArcPhoneDetector.h"
-
-#include <iostream>
-using std::cout;
-using std::endl;
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-
-ArcPhoneMatcher::ArcPhoneMatcher()
-    : WaterfillTemplateMatcher(
-        "PokemonLA/ArcPhone-Template.png",
-        Color(0xff808008), Color(0xffffffff), 100
-    )
-{}
-const ArcPhoneMatcher& ArcPhoneMatcher::instance(){
-    static ArcPhoneMatcher matcher;
-    return matcher;
-}
-
-
-ArcPhoneTracker::ArcPhoneTracker()
-    : WhiteObjectDetector(
-        COLOR_CYAN,
-        {
-            Color(0xff808080),
-            Color(0xff909090),
-            Color(0xffa0a0a0),
-            Color(0xffb0b0b0),
-        }
-    )
-{}
-
-void ArcPhoneTracker::process_object(const ImageViewRGB32& image, const WaterfillObject& object){
-//    cout << "asdf" << endl;
-//    static int c = 0;
-//    cout << "c = " << c << endl;
-//    extract_box_reference(image, object).save("test-" + std::to_string(c++) + ".png");
-//    image.save("test-" + std::to_string(c++) + "-A.png");
-//    extract_box(image, object).save("test-" + std::to_string(c++) + "-B.png");
-
-    double width = (double)object.width() / image.width();
-    if (width < 0.40 || width > 0.50){
-        return;
-    }
-
-//    cout << (double)object.width() / image.width() << endl;
-
-    double rmsd = ArcPhoneMatcher::instance().rmsd_original(image, object);
-//    cout << "rmsd = " << rmsd << endl;
-    if (rmsd < 80){
-//        cout << "rmsd = " << rmsd << endl;
-//         extract_box(image, object).save("test.png");
-        m_detections.emplace_back(object);
-    }
-}
-void ArcPhoneTracker::finish(const ImageViewRGB32& image){
-    merge_heavily_overlapping();
-}
-
-
-
-ArcPhoneDetector::ArcPhoneDetector(
-    Logger& logger, VideoOverlay& overlay,
-    std::chrono::milliseconds min_streak,
-    bool stop_on_detected
-)
-    : VisualInferenceCallback("CenterAButtonDetector")
-    , m_logger(logger)
-    , m_box(0.010, 0.700, 0.050, 0.100)
-    , m_stop_on_detected(stop_on_detected)
-    , m_tracker_button(ButtonType::ButtonMinus)
-    , m_watcher(
-        overlay, m_box, {
-            {m_tracker_phone, false},
-            {m_tracker_button, false},
-        }
-    )
-    , m_debouncer_phone(
-        false, min_streak,
-        [&](bool value){
-            if (value){
-                m_logger.log("Detected Arc Phone.", COLOR_PURPLE);
-            }else{
-                m_logger.log("Arc Phone has disappeared.", COLOR_PURPLE);
-            }
-        }
-    )
-    , m_debouncer_button(
-        false, min_streak,
-        [&](bool value){
-            if (value){
-                m_logger.log("Detected (-) Button.", COLOR_PURPLE);
-            }else{
-                m_logger.log("(-) button has disappeared.", COLOR_PURPLE);
-            }
-        }
-    )
-{}
-
-
-void ArcPhoneDetector::make_overlays(VideoOverlaySet& items) const{
-    items.add(COLOR_RED, m_box);
-}
-bool ArcPhoneDetector::process_frame(const ImageViewRGB32& frame, WallClock timestamp){
-    m_watcher.process_frame(frame, timestamp);
-    bool detected0 = m_debouncer_phone.push_value(!m_tracker_phone.detections().empty(), timestamp);
-    bool detected1 = m_debouncer_button.push_value(!m_tracker_phone.detections().empty(), timestamp);
-
-#if 0
-    if (detected){
-        static size_t c = 0;
-        frame.save("ArcPhoneTriggered-" + std::to_string(c++) + ".png");
-    }
-#endif
-
-    return detected0 && detected1 && m_stop_on_detected;
-}
-
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonLA/Inference/Objects/PokemonLA_ArcPhoneDetector.h b/SerialPrograms/Source/PokemonLA/Inference/Objects/PokemonLA_ArcPhoneDetector.h
deleted file mode 100644
index 1e1938f1c5..0000000000
--- a/SerialPrograms/Source/PokemonLA/Inference/Objects/PokemonLA_ArcPhoneDetector.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*  Arc Phone Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonLA_ArcPhoneDetector_H
-#define PokemonAutomation_PokemonLA_ArcPhoneDetector_H
-
-#include "Common/Cpp/Color.h"
-#include "Common/Cpp/Concurrency/SpinLock.h"
-#include "CommonFramework/Logging/Logger.h"
-#include "CommonFramework/ImageMatch/WaterfillTemplateMatcher.h"
-#include "CommonFramework/Inference/DetectionDebouncer.h"
-#include "CommonFramework/InferenceInfra/VisualInferenceCallback.h"
-#include "PokemonLA_WhiteObjectDetector.h"
-#include "PokemonLA_ButtonDetector.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-
-class ArcPhoneMatcher : public ImageMatch::WaterfillTemplateMatcher{
-public:
-    ArcPhoneMatcher();
-    static const ArcPhoneMatcher& instance();
-};
-
-
-
-class ArcPhoneTracker : public WhiteObjectDetector{
-public:
-    ArcPhoneTracker();
-
-    virtual void process_object(const ImageViewRGB32& image, const WaterfillObject& object) override;
-    virtual void finish(const ImageViewRGB32& image) override;
-};
-
-
-
-class ArcPhoneDetector : public VisualInferenceCallback{
-public:
-    ArcPhoneDetector(
-        Logger& logger, VideoOverlay& overlay,
-        std::chrono::milliseconds min_streak,
-        bool stop_on_detected
-    );
-
-    bool detected() const{
-        return m_debouncer_phone.get() && m_debouncer_button.get();
-    }
-
-    virtual void make_overlays(VideoOverlaySet& items) const override;
-
-    virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override;
-
-private:
-    Logger& m_logger;
-    ImageFloatBox m_box;
-    bool m_stop_on_detected;
-
-    SpinLock m_lock;
-    ArcPhoneTracker m_tracker_phone;
-    ButtonTracker m_tracker_button;
-    WhiteObjectWatcher m_watcher;
-
-    DetectionDebouncer<bool> m_debouncer_phone;
-    DetectionDebouncer<bool> m_debouncer_button;
-};
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonLA/Inference/Objects/PokemonLA_BattleSpriteArrowDetector.cpp b/SerialPrograms/Source/PokemonLA/Inference/Objects/PokemonLA_BattleSpriteArrowDetector.cpp
deleted file mode 100644
index 8d8e2a9a64..0000000000
--- a/SerialPrograms/Source/PokemonLA/Inference/Objects/PokemonLA_BattleSpriteArrowDetector.cpp
+++ /dev/null
@@ -1,96 +0,0 @@
-/*  Battle Sprite Arrow Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "PokemonLA_BattleSpriteArrowDetector.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-
-BattleSpriteArrowMatcher::BattleSpriteArrowMatcher()
-    : WaterfillTemplateMatcher(
-        "PokemonLA/BattleSpriteArrow-Template.png",
-        Color(0xff808008), Color(0xffffffff), 100
-    )
-{
-    m_aspect_ratio_lower = 0.95;
-    m_aspect_ratio_upper = 1.05;
-    m_area_ratio_lower = 0.95;
-    m_area_ratio_upper = 1.05;
-}
-
-const BattleSpriteArrowMatcher& BattleSpriteArrowMatcher::instance(){
-    static BattleSpriteArrowMatcher matcher;
-    return matcher;
-}
-
-
-BattleSpriteArrowTracker::BattleSpriteArrowTracker()
-    : WhiteObjectDetector(
-        COLOR_CYAN,
-        {
-            Color(0xff808080),
-            Color(0xff909090),
-            Color(0xffa0a0a0),
-            Color(0xffb0b0b0),
-        }
-    )
-{}
-
-void BattleSpriteArrowTracker::process_object(const ImageViewRGB32& image, const WaterfillObject& object){
-    double rmsd = BattleSpriteArrowMatcher::instance().rmsd_original(image, object);
-    if (rmsd < 80){
-        m_detections.emplace_back(object);
-    }
-}
-
-void BattleSpriteArrowTracker::finish(const ImageViewRGB32& image){
-    merge_heavily_overlapping();
-}
-
-
-
-BattleSpriteArrowDetector::BattleSpriteArrowDetector(
-    Logger& logger, VideoOverlay& overlay,
-    size_t sprite_index,
-    std::chrono::milliseconds min_streak,
-    bool stop_on_detected
-)
-    : VisualInferenceCallback("BattleSpriteArrowButtonDetector")
-    , m_logger(logger)
-    , m_box(0.936 - 0.035*sprite_index, 0.018, 0.015, 0.027)
-    , m_stop_on_detected(stop_on_detected)
-    , m_watcher(overlay, m_box, { {m_tracker, false} })
-    , m_debouncer(
-        false, min_streak,
-        [&](bool value){
-            if (value){
-                m_logger.log("Detected sprite arrow.", COLOR_PURPLE);
-            }else{
-                m_logger.log("Sprite arrow disappeared.", COLOR_PURPLE);
-            }
-        }
-    )
-{}
-
-
-void BattleSpriteArrowDetector::make_overlays(VideoOverlaySet& items) const{
-    items.add(COLOR_RED, m_box);
-}
-bool BattleSpriteArrowDetector::process_frame(const ImageViewRGB32& frame, WallClock timestamp){
-    m_watcher.process_frame(frame, timestamp);
-    bool detected = m_debouncer.push_value(!m_tracker.detections().empty(), timestamp);
-    return detected && m_stop_on_detected;
-}
-
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonLA/Inference/Objects/PokemonLA_BattleSpriteArrowDetector.h b/SerialPrograms/Source/PokemonLA/Inference/Objects/PokemonLA_BattleSpriteArrowDetector.h
deleted file mode 100644
index 6ccc5475f4..0000000000
--- a/SerialPrograms/Source/PokemonLA/Inference/Objects/PokemonLA_BattleSpriteArrowDetector.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*  Battle Sprite Arrow Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- *  Detect the white arrow pointing towards left on the selected sprite, in the upper right corner
- *  of the screen, during a multi-pokemon battle.
- */
-
-#ifndef PokemonAutomation_PokemonLA_BattleSpriteArrowDetector_H
-#define PokemonAutomation_PokemonLA_BattleSpriteArrowDetector_H
-
-#include "Common/Cpp/Color.h"
-#include "Common/Cpp/Concurrency/SpinLock.h"
-#include "CommonFramework/Logging/Logger.h"
-#include "CommonFramework/ImageMatch/WaterfillTemplateMatcher.h"
-#include "CommonFramework/Inference/DetectionDebouncer.h"
-#include "CommonFramework/InferenceInfra/VisualInferenceCallback.h"
-#include "PokemonLA/Inference/Objects/PokemonLA_WhiteObjectDetector.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-
-class BattleSpriteArrowMatcher : public ImageMatch::WaterfillTemplateMatcher{
-public:
-    BattleSpriteArrowMatcher();
-    static const BattleSpriteArrowMatcher& instance();
-};
-
-
-
-class BattleSpriteArrowTracker : public WhiteObjectDetector{
-public:
-    BattleSpriteArrowTracker();
-
-    virtual void process_object(const ImageViewRGB32& image, const WaterfillObject& object) override;
-    virtual void finish(const ImageViewRGB32& image) override;
-};
-
-
-
-class BattleSpriteArrowDetector : public VisualInferenceCallback{
-public:
-    // Sprite index: the index of the sprite the current selected arrow is on top of.
-    //   The index is ordered from right to left on the screen.
-    BattleSpriteArrowDetector(
-        Logger& logger, VideoOverlay& overlay,
-        size_t sprite_index,
-        std::chrono::milliseconds min_streak,
-        bool stop_on_detected
-    );
-
-    bool detected() const{
-        return m_debouncer.get();
-    }
-
-    virtual void make_overlays(VideoOverlaySet& items) const override;
-
-    virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override;
-
-private:
-    Logger& m_logger;
-    ImageFloatBox m_box;
-    bool m_stop_on_detected;
-
-    BattleSpriteArrowTracker m_tracker;
-    WhiteObjectWatcher m_watcher;
-
-    DetectionDebouncer<bool> m_debouncer;
-};
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonLA/Inference/Objects/PokemonLA_BubbleDetector.h b/SerialPrograms/Source/PokemonLA/Inference/Objects/PokemonLA_BubbleDetector.h
deleted file mode 100644
index d9f3e61867..0000000000
--- a/SerialPrograms/Source/PokemonLA/Inference/Objects/PokemonLA_BubbleDetector.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*  Bubble Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonLA_BubbleDetector_H
-#define PokemonAutomation_PokemonLA_BubbleDetector_H
-
-#include <list>
-#include "PokemonLA_WhiteObjectDetector.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-
-class BubbleDetector : public WhiteObjectDetector{
-public:
-    BubbleDetector();
-    virtual void process_object(const ImageViewRGB32& image, const WaterfillObject& object) override;
-    virtual void finish(const ImageViewRGB32& image) override;
-};
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonLA/Inference/Objects/PokemonLA_ButtonDetector.h b/SerialPrograms/Source/PokemonLA/Inference/Objects/PokemonLA_ButtonDetector.h
deleted file mode 100644
index 816714a957..0000000000
--- a/SerialPrograms/Source/PokemonLA/Inference/Objects/PokemonLA_ButtonDetector.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/*  Button Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonLA_ButtonDetector_H
-#define PokemonAutomation_PokemonLA_ButtonDetector_H
-
-#include "Common/Cpp/Color.h"
-#include "Common/Cpp/Concurrency/SpinLock.h"
-#include "CommonFramework/Logging/Logger.h"
-#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
-#include "CommonFramework/ImageMatch/WaterfillTemplateMatcher.h"
-#include "CommonFramework/Inference/DetectionDebouncer.h"
-#include "CommonFramework/InferenceInfra/VisualInferenceCallback.h"
-#include "PokemonLA/Inference/Objects/PokemonLA_WhiteObjectDetector.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-
-enum class ButtonType{
-    ButtonA,
-    ButtonB,
-    ButtonPlus,
-    ButtonMinus,
-    ArrowLeft,
-    ArrowRight,
-};
-
-
-class ButtonMatcher : public ImageMatch::WaterfillTemplateMatcher{
-public:
-    ButtonMatcher(ButtonType type, size_t min_width, size_t max_width, double max_rmsd);
-    static const ButtonMatcher& A();
-    static const ButtonMatcher& B();
-    static const ButtonMatcher& Plus();
-    static const ButtonMatcher& Minus();
-    static const ButtonMatcher& ArrowLeft();
-    static const ButtonMatcher& ArrowRight();
-
-    virtual bool check_image(const ImageViewRGB32& image) const override{
-        return image.width() >= m_min_width && image.height() >= m_min_height;
-    };
-
-    size_t m_min_width;
-    size_t m_min_height;
-    double m_max_rmsd;
-};
-
-
-
-
-class ButtonTracker : public WhiteObjectDetector{
-public:
-    ButtonTracker(ButtonType type);
-
-    virtual void process_object(const ImageViewRGB32& image, const WaterfillObject& object) override;
-    virtual void finish(const ImageViewRGB32& image) override;
-
-private:
-    const ButtonMatcher& m_matcher;
-};
-
-
-
-class ButtonDetector : public VisualInferenceCallback{
-public:
-    ButtonDetector(
-        Logger& logger, VideoOverlay& overlay,
-        ButtonType type,
-        const ImageFloatBox& box,
-        std::chrono::milliseconds min_streak,
-        bool stop_on_detected
-    );
-
-    bool detected() const{
-        return m_debouncer.get();
-    }
-
-    virtual void make_overlays(VideoOverlaySet& items) const override;
-
-    virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override;
-
-private:
-    Logger& m_logger;
-    ImageFloatBox m_box;
-    bool m_stop_on_detected;
-
-    ButtonTracker m_tracker;
-    WhiteObjectWatcher m_watcher;
-
-    DetectionDebouncer<bool> m_debouncer;
-};
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonLA/Inference/Objects/PokemonLA_DialogueEllipseDetector.cpp b/SerialPrograms/Source/PokemonLA/Inference/Objects/PokemonLA_DialogueEllipseDetector.cpp
deleted file mode 100644
index 94e4cac3a3..0000000000
--- a/SerialPrograms/Source/PokemonLA/Inference/Objects/PokemonLA_DialogueEllipseDetector.cpp
+++ /dev/null
@@ -1,101 +0,0 @@
-/*  Dialogue Ellipse Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "PokemonLA_DialogueEllipseDetector.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-
-DialogueEllipseMatcher::DialogueEllipseMatcher()
-    : WaterfillTemplateMatcher(
-        "PokemonLA/DialogueEllipse-Template.png",
-        Color(0xff808008), Color(0xffffffff), 300
-    )
-{
-    m_aspect_ratio_lower = 0.95;
-    m_aspect_ratio_upper = 1.05;
-    m_area_ratio_lower = 0.95;
-    m_area_ratio_upper = 1.05;
-}
-
-const DialogueEllipseMatcher& DialogueEllipseMatcher::instance(){
-    static DialogueEllipseMatcher matcher;
-    return matcher;
-}
-
-
-DialogueEllipseTracker::DialogueEllipseTracker()
-    : WhiteObjectDetector(
-        COLOR_CYAN,
-        {
-            Color(0xff808080),
-            Color(0xff909090),
-            Color(0xffa0a0a0),
-            Color(0xffb0b0b0),
-        }
-    )
-{}
-
-void DialogueEllipseTracker::process_object(const ImageViewRGB32& image, const WaterfillObject& object){
-    double rmsd = DialogueEllipseMatcher::instance().rmsd_original(image, object);
-    if (rmsd < 80){
-        m_detections.emplace_back(object);
-    }
-}
-
-void DialogueEllipseTracker::finish(const ImageViewRGB32& image){
-    merge_heavily_overlapping();
-}
-
-
-
-DialogueEllipseDetector::DialogueEllipseDetector(
-    Logger& logger, VideoOverlay& overlay,
-    std::chrono::milliseconds min_streak,
-    bool stop_on_detected
-)
-    : VisualInferenceCallback("DialogueEllipseButtonDetector")
-    , m_logger(logger)
-    , m_box(0.741, 0.811, 0.028, 0.023)
-    , m_stop_on_detected(stop_on_detected)
-    , m_watcher(overlay, m_box, { {m_tracker, false} })
-    , m_debouncer(
-        false, min_streak,
-        [&](bool value){
-            if (value){
-                m_logger.log("Detected transparent dialogue box ellipse button.", COLOR_PURPLE);
-            }else{
-                m_logger.log("Transparent dialogue box ellipse button disappeared.", COLOR_PURPLE);
-            }
-        }
-    )
-{}
-
-
-void DialogueEllipseDetector::make_overlays(VideoOverlaySet& items) const{
-    items.add(COLOR_RED, m_box);
-}
-bool DialogueEllipseDetector::process_frame(const ImageViewRGB32& frame, WallClock timestamp){
-    m_watcher.process_frame(frame, timestamp);
-    bool detected = m_debouncer.push_value(!m_tracker.detections().empty(), timestamp);
-
-    // static int count = 0;
-    // if (detected){
-    //     frame.save("./debug_transparentEllipse" + std::to_string(count) + ".png");
-    //     count++;
-    // }
-    return detected && m_stop_on_detected;
-}
-
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonLA/Inference/Objects/PokemonLA_DialogueEllipseDetector.h b/SerialPrograms/Source/PokemonLA/Inference/Objects/PokemonLA_DialogueEllipseDetector.h
deleted file mode 100644
index 1608f22e87..0000000000
--- a/SerialPrograms/Source/PokemonLA/Inference/Objects/PokemonLA_DialogueEllipseDetector.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*  Dialogue Ellipse Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- *  Detect the white wide ellipse at the end of the transparent dialogue box.
- *  The transparent dialogue box comes from your opponent shown before and/or after the battle, like
- *  Ingo's battles or Fortune Sisters'.
- */
-
-#ifndef PokemonAutomation_PokemonLA_DialogueEllipseDetector_H
-#define PokemonAutomation_PokemonLA_DialogueEllipseDetector_H
-
-#include "Common/Cpp/Color.h"
-#include "Common/Cpp/Concurrency/SpinLock.h"
-#include "CommonFramework/Logging/Logger.h"
-#include "CommonFramework/ImageMatch/WaterfillTemplateMatcher.h"
-#include "CommonFramework/Inference/DetectionDebouncer.h"
-#include "CommonFramework/InferenceInfra/VisualInferenceCallback.h"
-#include "PokemonLA/Inference/Objects/PokemonLA_WhiteObjectDetector.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-
-class DialogueEllipseMatcher : public ImageMatch::WaterfillTemplateMatcher{
-public:
-    DialogueEllipseMatcher();
-    static const DialogueEllipseMatcher& instance();
-};
-
-
-
-class DialogueEllipseTracker : public WhiteObjectDetector{
-public:
-    DialogueEllipseTracker();
-
-    virtual void process_object(const ImageViewRGB32& image, const WaterfillObject& object) override;
-    virtual void finish(const ImageViewRGB32& image) override;
-};
-
-
-
-class DialogueEllipseDetector : public VisualInferenceCallback{
-public:
-    DialogueEllipseDetector(
-        Logger& logger, VideoOverlay& overlay,
-        std::chrono::milliseconds min_streak,
-        bool stop_on_detected
-    );
-
-    bool detected() const{
-        return m_debouncer.get();
-    }
-
-    virtual void make_overlays(VideoOverlaySet& items) const override;
-
-    virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override;
-
-private:
-    Logger& m_logger;
-    ImageFloatBox m_box;
-    bool m_stop_on_detected;
-
-    DialogueEllipseTracker m_tracker;
-    WhiteObjectWatcher m_watcher;
-
-    DetectionDebouncer<bool> m_debouncer;
-};
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonLA/Inference/Objects/PokemonLA_DialogueYellowArrowDetector.cpp b/SerialPrograms/Source/PokemonLA/Inference/Objects/PokemonLA_DialogueYellowArrowDetector.cpp
deleted file mode 100644
index 9213a4b2f9..0000000000
--- a/SerialPrograms/Source/PokemonLA/Inference/Objects/PokemonLA_DialogueYellowArrowDetector.cpp
+++ /dev/null
@@ -1,110 +0,0 @@
-/*  Dialogue Yellow Arrow Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <stdint.h>
-#include <vector>
-#include "Common/Cpp/AbstractLogger.h"
-#include "CommonFramework/ImageMatch/WaterfillTemplateMatcher.h"
-#include "CommonFramework/ImageTools/WaterfillUtilities.h"
-#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
-#include "Kernels/Waterfill/Kernels_Waterfill_Types.h"
-#include "PokemonLA_DialogueYellowArrowDetector.h"
-
-#include <iostream>
-using std::cout;
-using std::endl;
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-namespace {
-    // This box covers all possible locations of the yellow arrow
-    ImageFloatBox YELLOW_ARROW_BOX{0.720, 0.759, 0.049, 0.128};
-}
-
-class DialogueYellowArrowMatcher : public ImageMatch::WaterfillTemplateMatcher{
-public:
-    DialogueYellowArrowMatcher();
-    static const DialogueYellowArrowMatcher& instance();
-};
-
-
-DialogueYellowArrowMatcher::DialogueYellowArrowMatcher()
-    : WaterfillTemplateMatcher(
-        "PokemonLA/YellowArrow-Template.png",
-        Color(0xff808008), Color(0xffffffff), 200
-    )
-{
-    m_aspect_ratio_lower = 0.9;
-    m_aspect_ratio_upper = 1.1;
-    m_area_ratio_lower = 0.9;
-    m_area_ratio_upper = 1.1;
-}
-
-const DialogueYellowArrowMatcher& DialogueYellowArrowMatcher::instance(){
-    static DialogueYellowArrowMatcher matcher;
-    return matcher;
-}
-
-
-
-DialogueYellowArrowDetector::DialogueYellowArrowDetector(
-    Logger& logger, VideoOverlay& overlay,
-    bool stop_on_detected
-)
-    : VisualInferenceCallback("DialogueYellowArrowDetector")
-    , m_logger(logger)
-    , m_stop_on_detected(stop_on_detected)
-{}
-
-
-void DialogueYellowArrowDetector::make_overlays(VideoOverlaySet& items) const{
-    items.add(COLOR_RED, YELLOW_ARROW_BOX);
-}
-bool DialogueYellowArrowDetector::process_frame(const ImageViewRGB32& frame, WallClock timestamp){
-    const std::vector<std::pair<uint32_t, uint32_t>> filters = {
-        {combine_rgb(160, 160, 0), combine_rgb(255, 255, 255)},
-        {combine_rgb(200, 200, 0), combine_rgb(255, 255, 255)},
-        {combine_rgb(200, 200, 0), combine_rgb(255, 255, 180)},
-    };
-
-    // We found 200 to be a good minimal yellow arrow pixel count on a 1920x1080 resolution screenshot.
-    const double screen_scale = frame.height() / 1080.0;
-    const size_t min_size = size_t(200 * screen_scale * screen_scale);
-    
-    const bool detected = match_template_by_waterfill(
-        extract_box_reference(frame, YELLOW_ARROW_BOX), 
-        DialogueYellowArrowMatcher::instance(),
-        filters,
-        {min_size, SIZE_MAX},
-        80,
-        [](Kernels::Waterfill::WaterfillObject& object) -> bool { return true; }
-    );
-
-    if (detected){
-        m_logger.log("Detected yellow arrow in transparent dialogue box.", COLOR_PURPLE);
-    }
-
-    m_detected.store(detected, std::memory_order_release);
-
-#if 0
-    if (detected){
-        static size_t c = 0;
-        frame.save("YellowArrowTriggered-" + std::to_string(c++) + ".png");
-    }
-#endif
-
-    return detected && m_stop_on_detected;
-}
-
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonLA/Inference/Objects/PokemonLA_DialogueYellowArrowDetector.h b/SerialPrograms/Source/PokemonLA/Inference/Objects/PokemonLA_DialogueYellowArrowDetector.h
deleted file mode 100644
index 1f10095e42..0000000000
--- a/SerialPrograms/Source/PokemonLA/Inference/Objects/PokemonLA_DialogueYellowArrowDetector.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*  Dialogue Yellow Arrow Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- *  The yellow marker pointing to the button to advance dialogue boxes.
- *  For different types of dialogue boxes, the locations of the yellow arrow is different.
- *  This detector covers all possible locations of the yellow arrow.
- */
-
-#ifndef PokemonAutomation_PokemonLA_DialogueYellowArrowDetector_H
-#define PokemonAutomation_PokemonLA_DialogueYellowArrowDetector_H
-
-#include <atomic>
-#include "CommonFramework/InferenceInfra/VisualInferenceCallback.h"
-
-namespace PokemonAutomation{
-    class Logger;
-    class VideoOverlay;
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-
-
-class DialogueYellowArrowDetector : public VisualInferenceCallback{
-public:
-    DialogueYellowArrowDetector(
-        Logger& logger, VideoOverlay& overlay,
-        bool stop_on_detected
-    );
-
-    bool detected() const{
-        return m_detected.load(std::memory_order_acquire);
-    }
-
-    virtual void make_overlays(VideoOverlaySet& items) const override;
-
-    virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override;
-
-private:
-    Logger& m_logger;
-    bool m_stop_on_detected;
-
-    std::atomic<bool> m_detected;
-};
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonLA/Inference/Objects/PokemonLA_FlagDetector.h b/SerialPrograms/Source/PokemonLA/Inference/Objects/PokemonLA_FlagDetector.h
deleted file mode 100644
index 594446a342..0000000000
--- a/SerialPrograms/Source/PokemonLA/Inference/Objects/PokemonLA_FlagDetector.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*  Flag Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonLA_FlagDetector_H
-#define PokemonAutomation_PokemonLA_FlagDetector_H
-
-#include <list>
-#include "PokemonLA_WhiteObjectDetector.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-
-class FlagDetector : public WhiteObjectDetector{
-public:
-    FlagDetector();
-    virtual void process_object(const ImageViewRGB32& image, const WaterfillObject& object) override;
-    virtual void finish(const ImageViewRGB32& image) override;
-
-private:
-    std::list<ImagePixelBox> m_left;
-    std::list<ImagePixelBox> m_right;
-};
-
-
-
-int read_flag_distance(const ImageViewRGB32& screen, double flag_x, double flag_y);
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonLA/Inference/Objects/PokemonLA_FlagTracker.cpp b/SerialPrograms/Source/PokemonLA/Inference/Objects/PokemonLA_FlagTracker.cpp
deleted file mode 100644
index c8df9b0a77..0000000000
--- a/SerialPrograms/Source/PokemonLA/Inference/Objects/PokemonLA_FlagTracker.cpp
+++ /dev/null
@@ -1,134 +0,0 @@
-/*  Flag Tracker
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <cmath>
-#include <map>
-#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
-#include "PokemonLA_FlagTracker.h"
-
-#include <iostream>
-using std::cout;
-using std::endl;
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-
-
-FlagTracker::FlagTracker(Logger& /*logger*/, VideoOverlay& overlay)
-    : VisualInferenceCallback("FlagTracker")
-    // , m_logger(logger)
-    , m_watcher(overlay, {0, 0, 1, 1}, {{m_flags, false}})
-{}
-
-void FlagTracker::make_overlays(VideoOverlaySet& items) const{
-    m_watcher.make_overlays(items);
-}
-
-bool FlagTracker::get(
-    double& distance, double& x, double& y,
-    WallClock timestamp
-){
-    SpinLockGuard lg(m_lock);
-
-    //  If history is empty or stale, return no detection.
-    if (m_history.empty() || m_history.back().timestamp + std::chrono::milliseconds(500) < timestamp){
-        return false;
-    }
-
-    {
-        const Sample& sample = m_history.back();
-        x = sample.x;
-        y = sample.y;
-    }
-
-    //  Distance reading is unreliable. So look at the last 2 seconds of history to infer it.
-    std::multimap<int, WallClock> distances;
-    for (const Sample& sample : m_history){
-        if (0 <= sample.distance && sample.distance <= 999){
-            distances.emplace(sample.distance, sample.timestamp);
-        }
-    }
-
-    if (distances.size() < 5){
-        distance = -1;
-        return true;
-    }
-
-    //  Find the median.
-    double median;
-    {
-        size_t mid = distances.size() / 2;
-        auto iter = distances.begin();
-        for (size_t c = 0; c < mid; c++){
-            ++iter;
-        }
-        median = iter->first;
-    }
-
-//    distance = median;
-//    cout << distance << endl;
-
-    //  Pick the latest value that isn't too far from the median.
-    for (auto iter = m_history.rbegin(); iter != m_history.rend(); ++iter){
-        if (std::abs(iter->distance - median) < 20){
-            distance = iter->distance;
-            return true;
-        }
-    }
-    distance = -1;
-    return true;
-}
-
-bool FlagTracker::process_frame(const ImageViewRGB32& frame, WallClock timestamp){
-    m_watcher.process_frame(frame, timestamp);
-
-    Sample sample;
-
-    const std::vector<ImagePixelBox>& flags = m_flags.detections();
-    bool ok = flags.size() == 1;
-    if (ok){
-        sample.timestamp = timestamp;
-        sample.x = (double)(flags[0].min_x + flags[0].max_x) / (frame.width() * 2);
-        sample.y = (double)(flags[0].min_y + flags[0].max_y) / (frame.height() * 2);
-        sample.distance = read_flag_distance(frame, sample.x, sample.y);
-
-#if 0
-//        cout << sample.distance << endl;
-        if (sample.distance > 0 && sample.distance < 10){
-            static int c = 0;
-            frame.save("test-" + std::to_string(c++) + ".png");
-        }
-#endif
-    }else{
-//        frame.save("test.png");
-//        cout << "no flag" << endl;
-    }
-
-
-    SpinLockGuard lg(m_lock);
-
-    //  Clear out old history.
-    WallClock threshold = timestamp - std::chrono::seconds(2);
-    while (!m_history.empty() && m_history.front().timestamp < threshold){
-        m_history.pop_front();
-    }
-
-    if (ok){
-        m_history.emplace_back(std::move(sample));
-    }
-
-    return false;
-}
-
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonLA/Inference/Objects/PokemonLA_MMOQuestionMarkDetector.cpp b/SerialPrograms/Source/PokemonLA/Inference/Objects/PokemonLA_MMOQuestionMarkDetector.cpp
deleted file mode 100644
index 7e35a3d618..0000000000
--- a/SerialPrograms/Source/PokemonLA/Inference/Objects/PokemonLA_MMOQuestionMarkDetector.cpp
+++ /dev/null
@@ -1,211 +0,0 @@
-/*  MMO Question Marks Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <functional>
-#include "Kernels/Waterfill/Kernels_Waterfill_Session.h"
-#include "Kernels/Waterfill/Kernels_Waterfill_Types.h"
-#include "CommonFramework/ImageTools/BinaryImage_FilterRgb32.h"
-#include "CommonFramework/ImageTools/WaterfillUtilities.h"
-#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
-#include "PokemonLA_MMOQuestionMarkDetector.h"
-#include "PokemonLA/PokemonLA_Locations.h"
-
-#include <sstream>
-#include <iostream>
-#include <iomanip>
-using std::cout;
-using std::endl;
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-using namespace Kernels::Waterfill;
-
-namespace {
-
-// Match the dark blue background of the question mark
-class MMOQuestionMarkBackgroundMatcher : public ImageMatch::WaterfillTemplateMatcher{
-public:
-    MMOQuestionMarkBackgroundMatcher();
-    static const MMOQuestionMarkBackgroundMatcher& instance();
-};
-
-MMOQuestionMarkBackgroundMatcher::MMOQuestionMarkBackgroundMatcher()
-    : WaterfillTemplateMatcher(
-        "PokemonLA/MMOQuestionMark-Template.png",
-        Color(0, 20, 40), Color(60, 90, 130), 200
-    )
-{
-    m_aspect_ratio_lower = 0.8;
-    m_aspect_ratio_upper = 1.2;
-    m_area_ratio_lower = 0.8;
-    m_area_ratio_upper = 1.2;
-}
-
-const MMOQuestionMarkBackgroundMatcher& MMOQuestionMarkBackgroundMatcher::instance(){
-    static MMOQuestionMarkBackgroundMatcher matcher;
-    return matcher;
-}
-
-
-// Match the main curve of the question mark
-class MMOQuestionMarkCurveMatcher : public ImageMatch::WaterfillTemplateMatcher{
-public:
-    MMOQuestionMarkCurveMatcher();
-    static const MMOQuestionMarkCurveMatcher& instance();
-};
-
-MMOQuestionMarkCurveMatcher::MMOQuestionMarkCurveMatcher()
-    : WaterfillTemplateMatcher(
-        "PokemonLA/MMOQuestionMark-Template.png",
-        Color(0xff808080), Color(0xffffffff), 200
-    )
-{
-    m_aspect_ratio_lower = 0.8;
-    m_aspect_ratio_upper = 1.2;
-    m_area_ratio_lower = 0.8;
-    m_area_ratio_upper = 1.2;
-}
-
-const MMOQuestionMarkCurveMatcher& MMOQuestionMarkCurveMatcher::instance(){
-    static MMOQuestionMarkCurveMatcher matcher;
-    return matcher;
-}
-
-
-
-// The boxes that cover the locations on the Hisui map that MMO question marks will appear.
-const std::array<ImageFloatBox, 5> hisui_map_boxes{{
-    {0.362, 0.670, 0.045, 0.075},
-    {0.683, 0.555, 0.039, 0.076},
-    {0.828, 0.372, 0.042, 0.082},
-    {0.485, 0.440, 0.044, 0.080},
-    {0.393, 0.144, 0.050, 0.084}
-}};
-
-
-bool detect_MMO_question_mark(const PokemonAutomation::ImageViewRGB32 &frame, const ImageFloatBox& box){
-    auto image = extract_box_reference(frame, box);
-
-    const double screen_rel_size = (frame.height() / 1080.0);
-    const double rel_scale = screen_rel_size * screen_rel_size;
-
-    const size_t min_bg_size = 1300;
-    const size_t max_bg_size = 1600;
-
-    auto scale = [&](size_t size) -> size_t{
-        return size_t(size * rel_scale);
-    };
-
-    bool detected = match_template_by_waterfill(
-        image, MMOQuestionMarkBackgroundMatcher::instance(),
-        {{combine_rgb(0, 10, 30), combine_rgb(60, 90, 130)}},
-        {scale(min_bg_size), scale(max_bg_size)}, 90,
-        [](WaterfillObject&) { return true; }
-    );
-
-    if (detected){
-        const size_t min_curve_size = 250;
-        const size_t max_curve_size = 450;
-        detected = match_template_by_waterfill(
-            image, MMOQuestionMarkCurveMatcher::instance(),
-            {{combine_rgb(180, 180, 180), combine_rgb(255, 255, 255)}},
-            {scale(min_curve_size), scale(max_curve_size)}, 100,
-            [](WaterfillObject&) { return true; }
-        );
-    }
-
-    return detected;
-}
-
-} // anonymous namespace
-
-
-MMOQuestionMarkDetector::MMOQuestionMarkDetector(Logger& logger)
-    : m_logger(logger)
-{}
-
-
-void MMOQuestionMarkDetector::make_overlays(VideoOverlaySet& items) const{
-    for(size_t i = 0; i < hisui_map_boxes.size(); i++){
-        items.add(COLOR_RED, hisui_map_boxes[i]);
-    }
-}
-
-std::array<bool, 5> MMOQuestionMarkDetector::detect_MMO_on_hisui_map(const ImageViewRGB32& frame){
-    std::array<bool, 5> detected{false};
-    for(size_t i = 0; i < hisui_map_boxes.size(); i++){
-        detected[i] = detect_MMO_question_mark(frame, hisui_map_boxes[i]);
-    }
-    
-    if (std::find(detected.begin(), detected.end(), true) != detected.end()){
-        std::ostringstream os;
-        os << "Detected MMO question mark on region ";
-        for(size_t i = 0; i < detected.size(); i++){
-            if (detected[i]){
-                os << WILD_REGION_SHORT_NAMES[i] << ", ";
-            }
-        }
-        m_logger.log(os.str(), COLOR_PURPLE);
-    }
-
-    return detected;
-}
-
-std::vector<ImagePixelBox> MMOQuestionMarkDetector::detect_MMOs_on_region_map(const ImageViewRGB32& frame){
-    ImageFloatBox map_view{0.261, 0.060, 0.481, 0.842};
-    size_t map_min_x = (size_t)(frame.width() * map_view.x + 0.5);
-    size_t map_min_y = (size_t)(frame.height() * map_view.y + 0.5);
-    size_t map_width = (size_t)(frame.width() * map_view.width + 0.5);
-    size_t map_height = (size_t)(frame.height() * map_view.height + 0.5);
-    ImageViewRGB32 map_image(frame.sub_image(map_min_x, map_min_y, map_width, map_height));
-
-    std::vector<ImagePixelBox> results;
-
-    const double screen_rel_size = (frame.height() / 1080.0);
-    const double rel_scale = screen_rel_size * screen_rel_size;
-
-    const size_t min_bg_size = 1300;
-    const size_t max_bg_size = 1800;
-
-    auto scale = [&](size_t size) -> size_t{
-        return size_t(size * rel_scale);
-    };
-
-    match_template_by_waterfill(
-        map_image, MMOQuestionMarkBackgroundMatcher::instance(),
-        {{combine_rgb(0, 5, 30), combine_rgb(100, 130, 130)}},
-        {scale(min_bg_size), scale(max_bg_size)}, 110,
-        [&](WaterfillObject& object){
-            size_t min_x = object.min_x + map_min_x;
-            size_t min_y = object.min_y + map_min_y;
-            size_t max_x = object.max_x + map_min_x;
-            size_t max_y = object.max_y + map_min_y;
-            results.emplace_back(min_x, min_y, max_x, max_y);
-            return false;
-        }
-    );
-
-    return results;
-}
-
-
-
-
-void add_hisui_MMO_detection_to_overlay(const std::array<bool, 5>& detection_result, VideoOverlaySet& items){
-    for(size_t i = 0; i < hisui_map_boxes.size(); i++){
-        if (detection_result[i]){
-            items.add(COLOR_CYAN, hisui_map_boxes[i]);
-        }
-    }
-}
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonLA/Inference/Objects/PokemonLA_QuestMarkDetector.h b/SerialPrograms/Source/PokemonLA/Inference/Objects/PokemonLA_QuestMarkDetector.h
deleted file mode 100644
index 9a971146d9..0000000000
--- a/SerialPrograms/Source/PokemonLA/Inference/Objects/PokemonLA_QuestMarkDetector.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*  Quest Mark Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonLA_QuestMarkDetector_H
-#define PokemonAutomation_PokemonLA_QuestMarkDetector_H
-
-#include <list>
-#include "PokemonLA_WhiteObjectDetector.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-
-class QuestMarkDetector : public WhiteObjectDetector{
-public:
-    QuestMarkDetector();
-    virtual void process_object(const ImageViewRGB32& image, const WaterfillObject& object) override;
-};
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonLA/Inference/Objects/PokemonLA_WhiteObjectDetector.cpp b/SerialPrograms/Source/PokemonLA/Inference/Objects/PokemonLA_WhiteObjectDetector.cpp
deleted file mode 100644
index d645e8cad3..0000000000
--- a/SerialPrograms/Source/PokemonLA/Inference/Objects/PokemonLA_WhiteObjectDetector.cpp
+++ /dev/null
@@ -1,156 +0,0 @@
-/*  White Object Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <map>
-#include "Common/Cpp/Containers/FixedLimitVector.tpp"
-#include "Kernels/Waterfill/Kernels_Waterfill.h"
-#include "Kernels/Waterfill/Kernels_Waterfill_Session.h"
-#include "CommonFramework/ImageTools/BinaryImage_FilterRgb32.h"
-#include "CommonFramework/ImageMatch/SubObjectTemplateMatcher.h"
-#include "PokemonLA_WhiteObjectDetector.h"
-
-#include <iostream>
-using std::cout;
-using std::endl;
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-using namespace Kernels::Waterfill;
-
-
-
-void find_overworld_white_objects(
-    const std::vector<std::pair<WhiteObjectDetector&, bool>>& detectors,
-    const ImageViewRGB32& image
-){
-    std::set<Color> threshold_set;
-    for (const auto& item : detectors){
-        const std::set<Color>& thresholds = item.first.thresholds();
-        threshold_set.insert(thresholds.begin(), thresholds.end());
-    }
-
-//    FixedLimitVector<CompressRgb32ToBinaryRangeFilter> filters(threshold_set.size());
-//    for (Color filter : threshold_set){
-//        filters.emplace_back(image.width(), image.height(), (uint32_t)filter, 0xffffffff);
-//    }
-//    compress_rgb32_to_binary_range(image, filters.data(), filters.size());
-
-    {
-        std::vector<std::pair<uint32_t, uint32_t>> filters;
-        for (Color filter : threshold_set){
-            filters.emplace_back((uint32_t)filter, 0xffffffff);
-        }
-        std::vector<PackedBinaryMatrix> matrix = compress_rgb32_to_binary_range(image, filters);
-
-#if 1
-        std::unique_ptr<WaterfillSession> session = make_WaterfillSession();
-        for (size_t c = 0; c < filters.size(); c++){
-//            cout << matrix[c].width() << " x " << matrix[c].height() << endl;
-//            cout << matrix[c].dump() << endl;
-            session->set_source(matrix[c]);
-            auto finder = session->make_iterator(50);
-            WaterfillObject object;
-            while (finder->find_next(object, false)){
-//                cout << object.area << endl;
-                for (const auto& detector : detectors){
-                    const std::set<Color>& thresholds = detector.first.thresholds();
-                    if (thresholds.find((Color)filters[c].first) != thresholds.end()){
-                        detector.first.process_object(image, object);
-                    }
-                }
-            }
-        }
-#endif
-    }
-
-    for (const auto& detector : detectors){
-        detector.first.finish(image);
-    }
-}
-
-
-void WhiteObjectDetector::merge_heavily_overlapping(double tolerance){
-    std::multimap<size_t, ImagePixelBox> boxes;
-    for (const ImagePixelBox& box : m_detections){
-        boxes.emplace(box.area(), box);
-    }
-    m_detections.clear();
-//    cout << "boxes.size() = " << boxes.size() << endl;
-
-    double ratio = 1.0 + tolerance;
-
-    while (!boxes.empty()){
-        auto current = boxes.begin();
-        size_t limit = (size_t)(current->first * ratio);
-        auto candidate = current;
-        ++candidate;
-        while (candidate != boxes.end()){
-            if (candidate->first > limit){
-                ++candidate;
-                continue;
-            }
-            size_t overlap = current->second.overlapping_area(candidate->second);
-            if ((double)overlap * ratio > current->first){
-                current->second.merge_with(candidate->second);
-                candidate = boxes.erase(candidate);
-            }else{
-                ++candidate;
-            }
-        }
-        m_detections.emplace_back(current->second);
-        current = boxes.erase(current);
-    }
-//    cout << "m_detections.size() = " << m_detections.size() << endl;
-}
-
-
-
-
-WhiteObjectWatcher::WhiteObjectWatcher(
-    VideoOverlay& overlay,
-    const ImageFloatBox& box,
-    std::vector<std::pair<WhiteObjectDetector&, bool>> detectors
-)
-    : VisualInferenceCallback("WhiteObjectWatcher")
-    , m_box(box)
-    , m_overlays(overlay)
-    , m_detectors(detectors)
-{}
-
-void WhiteObjectWatcher::make_overlays(VideoOverlaySet& items) const{
-    items.add(COLOR_RED, m_box);
-}
-bool WhiteObjectWatcher::process_frame(const ImageViewRGB32& frame, WallClock timestamp){
-    for (auto& detector : m_detectors){
-        detector.first.clear();
-    }
-
-    find_overworld_white_objects(m_detectors, extract_box_reference(frame, m_box));
-    m_overlays.clear();
-
-    for (auto& detector : m_detectors){
-        for (const ImagePixelBox& obj : detector.first.detections()){
-            ImageFloatBox box = translate_to_parent(frame, m_box, obj);
-            m_overlays.add(detector.first.color(), box);
-        }
-    }
-    for (auto& detector : m_detectors){
-        if (detector.second && !detector.first.detections().empty()){
-            return true;
-        }
-    }
-    return false;
-}
-
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonLA/Inference/Objects/PokemonLA_WhiteObjectDetector.h b/SerialPrograms/Source/PokemonLA/Inference/Objects/PokemonLA_WhiteObjectDetector.h
deleted file mode 100644
index 392b4e9d5e..0000000000
--- a/SerialPrograms/Source/PokemonLA/Inference/Objects/PokemonLA_WhiteObjectDetector.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/*  White Object Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonLA_WhiteObjectDetector_H
-#define PokemonAutomation_PokemonLA_WhiteObjectDetector_H
-
-#include <vector>
-#include <list>
-#include <set>
-#include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
-#include "CommonFramework/InferenceInfra/VisualInferenceCallback.h"
-
-namespace PokemonAutomation{
-namespace Kernels{
-namespace Waterfill{
-    class WaterfillObject;
-}
-}
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-
-
-class WhiteObjectDetector{
-protected:
-    using WaterfillObject = Kernels::Waterfill::WaterfillObject;
-
-public:
-    virtual ~WhiteObjectDetector() = default;
-    WhiteObjectDetector(const WhiteObjectDetector&) = delete;
-    void operator=(const WhiteObjectDetector&) = delete;
-
-    // thresholds: thresholds for various filters. Each filter has a different threshold
-    // to filter out candidate objects on an image. The thresholds specified here are the
-    // min color thresholds. The max color thresholds for all filters are always 0xffffffff.
-    WhiteObjectDetector(Color inference_box_color, std::set<Color> thresholds)
-        : m_box_color(inference_box_color)
-        , m_thresholds(std::move(thresholds))
-    {}
-
-    Color color() const{ return m_box_color; }
-    const std::set<Color>& thresholds() const{ return m_thresholds; }
-
-    const std::vector<ImagePixelBox>& detections() const{ return m_detections; }
-    void clear(){ m_detections.clear(); }
-
-    virtual void process_object(const ImageViewRGB32& image, const WaterfillObject& object) = 0;
-    virtual void finish(const ImageViewRGB32& image){}
-
-protected:
-    void merge_heavily_overlapping(double tolerance = 0.2);
-
-protected:
-    Color m_box_color;
-    std::set<Color> m_thresholds;
-    std::vector<ImagePixelBox> m_detections;
-};
-
-
-
-
-
-
-void find_overworld_white_objects(
-    const std::vector<std::pair<WhiteObjectDetector&, bool>>& detectors,
-    const ImageViewRGB32& screen
-);
-
-class WhiteObjectWatcher : public VisualInferenceCallback{
-public:
-    WhiteObjectWatcher(
-        VideoOverlay& overlay,
-        const ImageFloatBox& box,
-        std::vector<std::pair<WhiteObjectDetector&, bool>> detectors
-    );
-
-    virtual void make_overlays(VideoOverlaySet& items) const override;
-
-    //  Return true if the inference session should stop.
-    virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override;
-
-
-private:
-    ImageFloatBox m_box;
-    VideoOverlaySet m_overlays;
-
-    std::vector<std::pair<WhiteObjectDetector&, bool>> m_detectors;
-};
-
-
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonLA/Inference/PokemonLA_BerryTreeDetector.h b/SerialPrograms/Source/PokemonLA/Inference/PokemonLA_BerryTreeDetector.h
deleted file mode 100644
index 739d46365e..0000000000
--- a/SerialPrograms/Source/PokemonLA/Inference/PokemonLA_BerryTreeDetector.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*  Berry Tree Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonLA_BerryTreeDetector_H
-#define PokemonAutomation_PokemonLA_BerryTreeDetector_H
-
-#include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "CommonFramework/InferenceInfra/VisualInferenceCallback.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-
-class BerryTreeDetector : public VisualInferenceCallback{
-public:
-    BerryTreeDetector();
-
-    virtual void make_overlays(VideoOverlaySet& items) const override;
-
-    //  Return true if the inference session should stop.
-    virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override;
-
-private:
-};
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonLA/Inference/PokemonLA_BlackOutDetector.cpp b/SerialPrograms/Source/PokemonLA/Inference/PokemonLA_BlackOutDetector.cpp
deleted file mode 100644
index 9ccd414b2a..0000000000
--- a/SerialPrograms/Source/PokemonLA/Inference/PokemonLA_BlackOutDetector.cpp
+++ /dev/null
@@ -1,95 +0,0 @@
-/*  Black Out Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/ImageTools/SolidColorTest.h"
-#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
-#include "PokemonLA_BlackOutDetector.h"
-
-#include <array>
-#include <sstream>
-#include <iostream>
-using std::cout;
-using std::endl;
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-namespace {
-
-// const std::array<ImageSolidCheck, 18> dropped_item_bg_checks = {
-//     ImageSolidCheck(0.031, 0.900, 0.024, 0.017, 0.444, 0.440, 0.116, 0.15, 20.0),
-//     ImageSolidCheck(0.026, 0.743, 0.021, 0.038, 0.407, 0.397, 0.196, 0.15, 50.0),
-//     ImageSolidCheck(0.022, 0.581, 0.020, 0.018, 0.332, 0.433, 0.234, 0.15, 30.0),
-//     ImageSolidCheck(0.152, 0.482, 0.017, 0.040, 0.343, 0.451, 0.207, 0.15, 30.0),
-//     ImageSolidCheck(0.016, 0.218, 0.018, 0.021, 0.341, 0.350, 0.309, 0.15, 20.0),
-//     ImageSolidCheck(0.169, 0.103, 0.024, 0.036, 0.216, 0.385, 0.399, 0.15, 10.0),
-//     ImageSolidCheck(0.815, 0.244, 0.026, 0.026, 0.339, 0.350, 0.310, 0.15, 40.0),
-//     ImageSolidCheck(0.737, 0.126, 0.045, 0.056, 0.227, 0.384, 0.389, 0.15, 30.0),
-//     ImageSolidCheck(0.806, 0.431, 0.043, 0.026, 0.350, 0.371, 0.278, 0.15, 20.0),
-//     ImageSolidCheck(0.827, 0.507, 0.023, 0.028, 0.327, 0.386, 0.287, 0.15, 30.0),
-//     ImageSolidCheck(0.747, 0.603, 0.087, 0.086, 0.402, 0.439, 0.159, 0.15, 20.0),
-//     ImageSolidCheck(0.885, 0.653, 0.041, 0.093, 0.353, 0.404, 0.242, 0.15, 20.0),
-//     ImageSolidCheck(0.934, 0.556, 0.039, 0.038, 0.413, 0.446, 0.141, 0.15, 30.0),
-//     ImageSolidCheck(0.761, 0.913, 0.071, 0.051, 0.373, 0.424, 0.203, 0.15, 30.0),
-//     ImageSolidCheck(0.865, 0.098, 0.022, 0.030, 0.326, 0.353, 0.321, 0.15, 50.0),
-//     ImageSolidCheck(0.202, 0.631, 0.057, 0.075, 0.414, 0.468, 0.118, 0.15, 20.0),
-//     ImageSolidCheck(0.099, 0.265, 0.072, 0.070, 0.288, 0.376, 0.336, 0.15, 20.0),
-//     ImageSolidCheck(0.908, 0.313, 0.020, 0.017, 0.316, 0.387, 0.297, 0.15, 20.0),
-// };
-
-
-}
-
-
-BlackOutDetector::BlackOutDetector(Logger& logger, VideoOverlay& overlay)
-    : VisualInferenceCallback("BlackOutDetector")
-    , m_black_screen(0.068, 0.088, 0.864, 0.581)
-    , m_yellow_arrow_detector(logger, overlay, true)
-    // , m_button_Y_detector(logger, overlay, ButtonType::ButtonY, ImageFloatBox{0.439, 0.819, 0.029, 0.059}, std::chrono::milliseconds(0), false)
-{}
-
-void BlackOutDetector::make_overlays(VideoOverlaySet& items) const{
-    m_yellow_arrow_detector.make_overlays(items);
-    items.add(COLOR_BLUE, m_black_screen);
-}
-
-//  Return true if the inference session should stop.
-bool BlackOutDetector::process_frame(const ImageViewRGB32& frame, WallClock timestamp){
-
-    auto save_image = [&](){
-        static int count = 0;
-        frame.save("BlackOut-" + std::to_string(count) + ".png");
-        count++;
-    };
-
-    // check whether it is the black out screen
-    const bool is_screen_black = is_black(extract_box_reference(frame, m_black_screen), 100, 10);
-    if (is_screen_black && m_yellow_arrow_detector.process_frame(frame, timestamp)) {
-        // We have both a mostly black screen and a yellow arrow:
-        save_image();
-        return true;
-    }
-
-    return false;
-
-
-    // // Check each patch of background color of the dropped item screen
-    // for(const auto& check: dropped_item_bg_checks){
-    //     if (check.check(frame) == false){
-    //         // cout << "Check failed " << check.debug_string(frame) << endl;
-    //         return false;
-    //     }
-    // }
-    // save_image();
-    // return true;
-}
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonLA/Inference/PokemonLA_BlackOutDetector.h b/SerialPrograms/Source/PokemonLA/Inference/PokemonLA_BlackOutDetector.h
deleted file mode 100644
index 19cfcb8cb1..0000000000
--- a/SerialPrograms/Source/PokemonLA/Inference/PokemonLA_BlackOutDetector.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*  Black Out Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- *  Detect the black out screen when player character blacks out.
- */
-
-#ifndef PokemonAutomation_PokemonLA_BlackOutDetector_H
-#define PokemonAutomation_PokemonLA_BlackOutDetector_H
-
-#include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "CommonFramework/InferenceInfra/VisualInferenceCallback.h"
-// #include "PokemonLA/Inference/Objects/PokemonLA_ButtonDetector.h"
-#include "PokemonLA/Inference/Objects/PokemonLA_DialogueYellowArrowDetector.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-
-class BlackOutDetector : public VisualInferenceCallback{
-public:
-    BlackOutDetector(Logger& logger, VideoOverlay& overlay);
-
-    virtual void make_overlays(VideoOverlaySet& items) const override;
-
-    //  Return true if the inference session should stop.
-    virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override;
-
-private:
-    // The black screen when the dialog of "Everything went black!" appears
-    ImageFloatBox m_black_screen;
-    // The yellow arrow pointing to the white button on the "Everything went black!" dialog box.
-    DialogueYellowArrowDetector m_yellow_arrow_detector;
-    // The bottom white space of the "Return to Base Camp" button.
-    // ImageFloatBox m_return_camp_bottom;
-
-    // ButtonDetector m_button_Y_detector;
-};
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonLA/Inference/PokemonLA_CommonColorCheck.cpp b/SerialPrograms/Source/PokemonLA/Inference/PokemonLA_CommonColorCheck.cpp
deleted file mode 100644
index 4c7e416961..0000000000
--- a/SerialPrograms/Source/PokemonLA/Inference/PokemonLA_CommonColorCheck.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-/*  Common Color Check
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-// #include "CommonFramework/ImageTools/SolidColorTest.h"
-#include "CommonFramework/ImageTools/ImageStats.h"
-#include "PokemonLA_CommonColorCheck.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-
-bool is_LA_dark_blue(const ImageStats& stats){
-    return (stats.average.sum() <= 300 && stats.stddev.sum() <= 15 &&
-        stats.average.b > stats.average.r && stats.average.b > stats.average.g
-    );
-}
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonLA/Inference/PokemonLA_CommonColorCheck.h b/SerialPrograms/Source/PokemonLA/Inference/PokemonLA_CommonColorCheck.h
deleted file mode 100644
index a23abb7c31..0000000000
--- a/SerialPrograms/Source/PokemonLA/Inference/PokemonLA_CommonColorCheck.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*  Common Color Check
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- *  Several checks for commonly used color in LA. These checks are used by various inference detector classes.
- */
-
-#ifndef PokemonAutomation_PokemonLA_MapDetector_H
-#define PokemonAutomation_PokemonLA_MapDetector_H
-
-#include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "CommonFramework/InferenceInfra/VisualInferenceCallback.h"
-
-namespace PokemonAutomation{
-
-struct ImageStats;
-
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-// The dark blue used as the background of the title text on normal and surprise diallgue boxes.
-// The color is also used as the selected tab on the top of the screen in the main menu space
-// (entered by pressing DPAD_UP from overworld).
-bool is_LA_dark_blue(const ImageStats& stats);
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonLA/Inference/PokemonLA_StatusInfoScreenDetector.cpp b/SerialPrograms/Source/PokemonLA/Inference/PokemonLA_StatusInfoScreenDetector.cpp
deleted file mode 100644
index 08549a8b0f..0000000000
--- a/SerialPrograms/Source/PokemonLA/Inference/PokemonLA_StatusInfoScreenDetector.cpp
+++ /dev/null
@@ -1,98 +0,0 @@
-/*  Status Info Screen Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "CommonFramework/ImageTools/ImageStats.h"
-#include "CommonFramework/ImageTools/SolidColorTest.h"
-#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
-#include "Pokemon/Inference/Pokemon_NameReader.h"
-#include "PokemonLA_CommonColorCheck.h"
-#include "PokemonLA_StatusInfoScreenDetector.h"
-
-#include <iostream>
-using std::cout;
-using std::endl;
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-
-
-PokemonDetails read_status_info(
-    Logger& logger, VideoOverlay& overlay,
-    const ImageViewRGB32& frame,
-    Language language
-){
-    OverlayBoxScope shiny_box(overlay, {0.726, 0.133, 0.015, 0.023}, COLOR_BLUE);
-    OverlayBoxScope alpha_box(overlay, {0.750, 0.133, 0.015, 0.023}, COLOR_RED);
-    OverlayBoxScope gender_box(overlay, {0.777, 0.138, 0.001, 0.015}, COLOR_PURPLE);
-    OverlayBoxScope name_box(overlay, {0.525, 0.130, 0.100, 0.038}, COLOR_BLACK);
-
-    PokemonDetails ret;
-
-    {
-        const ImageStats shiny_box_stats = image_stats(extract_box_reference(frame, shiny_box));
-        // std::cout << "ImageStats " << shiny_box_stats.average << "  " << shiny_box_stats.stddev << std::endl;
-        const auto& stddev = shiny_box_stats.stddev;
-        const double max_stddev = std::max(std::max(stddev.r, stddev.g), stddev.b);
-        if(!is_solid(shiny_box_stats, {0.333333, 0.333333, 0.333333}, 0.2, 15) || max_stddev > 8.){
-            ret.is_shiny = true;
-            logger.log("Detected Shiny!", COLOR_BLUE);
-        }
-    }
-
-    const ImageStats alpha_stats = image_stats(extract_box_reference(frame, alpha_box));
-    if (alpha_stats.stddev.sum() > 80 &&
-        alpha_stats.average.r > alpha_stats.average.g + 30 &&
-        alpha_stats.average.r > alpha_stats.average.b + 30
-    ){
-        ret.is_alpha = true;
-        logger.log("Detected Alpha!", COLOR_BLUE);
-    }
-
-    const ImageStats gender_stats = image_stats(extract_box_reference(frame, gender_box));
-//    cout << gender_stats.average << gender_stats.stddev << endl;
-    if (is_solid(gender_stats, {0.333333, 0.333333, 0.333333}, 0.1, 10)){
-        ret.gender = Gender::Genderless;
-        logger.log("Gender: Genderless");
-    }else if (gender_stats.average.b > gender_stats.average.g + 30 && gender_stats.average.b > gender_stats.average.r + 30){
-        ret.gender = Gender::Male;
-        logger.log("Gender: Male");
-    }else if (gender_stats.average.r > gender_stats.average.g + 30 && gender_stats.average.r > gender_stats.average.b + 30){
-        ret.gender = Gender::Female;
-        logger.log("Gender: Female");
-    }else{
-        logger.log("Gender: Unable to detect", COLOR_RED);
-    }
-
-    if (language == Language::None){
-        return ret;
-    }
-
-    ImageViewRGB32 image = extract_box_reference(frame, name_box);
-
-    OCR::StringMatchResult result = Pokemon::PokemonNameReader::instance().read_substring(
-        logger, language, image,
-        OCR::BLACK_TEXT_FILTERS()
-    );
-
-    for (auto& item : result.results){
-        ret.name_candidates.insert(std::move(item.second.token));
-    }
-
-    return ret;
-}
-
-
-
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonLA/Inference/PokemonLA_StatusInfoScreenDetector.h b/SerialPrograms/Source/PokemonLA/Inference/PokemonLA_StatusInfoScreenDetector.h
deleted file mode 100644
index 04400775c5..0000000000
--- a/SerialPrograms/Source/PokemonLA/Inference/PokemonLA_StatusInfoScreenDetector.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*  Status Info Screen Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- *  Detect shiny and alpha on the Status Info Screen in a battle.
- */
-
-#ifndef PokemonAutomation_PokemonLA_StatusInfoScreenDetector_H
-#define PokemonAutomation_PokemonLA_StatusInfoScreenDetector_H
-
-#include "CommonFramework/Language.h"
-#include "CommonFramework/Logging/Logger.h"
-#include "CommonFramework/VideoPipeline/VideoOverlay.h"
-#include "PokemonLA/Resources/PokemonLA_PokemonInfo.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-
-PokemonDetails read_status_info(
-    Logger& logger, VideoOverlay& overlay,
-    const ImageViewRGB32& frame,
-    Language language
-);
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonLA/Inference/PokemonLA_WildPokemonFocusDetector.cpp b/SerialPrograms/Source/PokemonLA/Inference/PokemonLA_WildPokemonFocusDetector.cpp
deleted file mode 100644
index b851715303..0000000000
--- a/SerialPrograms/Source/PokemonLA/Inference/PokemonLA_WildPokemonFocusDetector.cpp
+++ /dev/null
@@ -1,166 +0,0 @@
-/*  Wild Pokemon Focus Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/ImageTools/ImageFilter.h"
-#include "CommonFramework/ImageTools/ImageGradient.h"
-#include "CommonFramework/ImageTools/ImageStats.h"
-#include "CommonFramework/ImageTools/SolidColorTest.h"
-#include "CommonFramework/ImageTypes/ImageRGB32.h"
-#include "CommonFramework/OCR/OCR_Routines.h"
-#include "CommonFramework/VideoPipeline/VideoOverlay.h"
-#include "Pokemon/Inference/Pokemon_NameReader.h"
-#include "PokemonLA/Inference/Objects/PokemonLA_ButtonDetector.h"
-#include "PokemonLA/Inference/Objects/PokemonLA_ShinySymbolDetector.h"
-#include "PokemonLA_WildPokemonFocusDetector.h"
-#include "CommonFramework/Tools/DebugDumper.h"
-
-#include <sstream>
-#include <iostream>
-using std::cout;
-using std::endl;
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-
-WildPokemonFocusDetector::WildPokemonFocusDetector(Logger& logger, VideoOverlay& overlay)
-    : VisualInferenceCallback("WildPokemonFocusDetector")
-    , m_pokemon_tab_upper_bound(0.109, 0.857, 0.24, 0.012)
-    , m_pokemon_tab_lower_bound(0.109, 0.949, 0.24, 0.012)
-    , m_pokemon_tab_left_bound(0.102, 0.875, 0.007, 0.073)
-    , m_pokemon_tab_right_bound(0.348, 0.873, 0.007, 0.073)
-{}
-
-void WildPokemonFocusDetector::make_overlays(VideoOverlaySet& items) const{
-    items.add(COLOR_BLUE, m_pokemon_tab_upper_bound);
-    items.add(COLOR_BLUE, m_pokemon_tab_lower_bound);
-    items.add(COLOR_BLUE, m_pokemon_tab_left_bound);
-    items.add(COLOR_BLUE, m_pokemon_tab_right_bound);
-}
-
-//  Return true if the inference session should stop.
-bool WildPokemonFocusDetector::process_frame(const ImageViewRGB32& frame, WallClock timestamp){
-
-    // dump_debug_image(m_logger, "PokemonLA/WildPokemonFocusDetector", "Received", frame);
-
-    // float threshold = 10.0;
-    const Color threshold(10, 10, 10);
-    const ImageViewRGB32& upper_border = extract_box_reference(frame, m_pokemon_tab_upper_bound);
-
-    const size_t upper_border_length = count_horizontal_translucent_border_pixels(
-        upper_border, threshold, false);
-    
-    if (upper_border_length / (float)upper_border.width() <= 0.9){
-        return false;
-    }
-
-    const ImageViewRGB32& lower_border = extract_box_reference(frame, m_pokemon_tab_lower_bound);
-    
-    const size_t lower_border_length = count_horizontal_translucent_border_pixels(
-        lower_border, threshold, true);
-    
-    if (lower_border_length / (float)lower_border.width() <= 0.9){
-        return false;
-    }
-
-    const ImageViewRGB32& left_border = extract_box_reference(frame, m_pokemon_tab_left_bound);
-    const size_t left_border_length = count_vertical_translucent_border_pixels(
-        left_border, threshold, false);
-    if (left_border_length / (float)left_border.height() <= 0.9){
-        return false;
-    }
-
-    const ImageViewRGB32& right_border = extract_box_reference(frame, m_pokemon_tab_right_bound);
-    const size_t right_border_length = count_vertical_translucent_border_pixels(
-        right_border, threshold, true);
-    if (right_border_length / (float)right_border.height() <= 0.9){
-        return false;
-    }
-
-    // dump_debug_image(m_logger, "PokemonLA/WildPokemonFocusDetector", "Detected", frame);
-    return true;
-}
-
-
-PokemonDetails read_focused_wild_pokemon_info(
-    Logger& logger, VideoOverlay& overlay,
-    const ImageViewRGB32& frame,
-    Language language
-){
-    PokemonDetails ret;
-
-    const OverlayBoxScope name_box(overlay, {0.108, 0.868, 0.135, 0.037}, COLOR_BLACK);
-    const OverlayBoxScope gender_box(overlay, {0.307, 0.873, 0.016, 0.030}, COLOR_PURPLE);
-    const OverlayBoxScope alpha_box(overlay, {0.307, 0.920, 0.016, 0.029}, COLOR_RED);
-
-    const ImageViewRGB32 name_image = extract_box_reference(frame, name_box);
-
-    const OCR::StringMatchResult name_result = Pokemon::PokemonNameReader::instance().read_substring(
-        logger, language, name_image,
-        OCR::WHITE_TEXT_FILTERS());
-    for (const auto& item : name_result.results){
-        ret.name_candidates.insert(std::move(item.second.token));
-    }
-
-    // Replacing white color of the gender symbol with zero-alpha color so that they won't be counted in
-    // the following image_stats().
-    // The white color is defined as the color between (160, 160, 160) and (255, 255, 255).
-    bool replace_color_range = true;
-    const ImageStats gender_stats = image_stats(filter_rgb32_range(
-        extract_box_reference(frame, gender_box),
-        combine_rgb(160, 160, 160), combine_rgb(255, 255, 255), Color(0), replace_color_range
-    ));
-    const FloatPixel gender_avg = gender_stats.average;
-    if (gender_stats.count > 0 && gender_avg.r > gender_avg.b + 50.0 && gender_avg.r > 150.0){
-        ret.gender = Gender::Female;
-        logger.log("Gender Female, color " + gender_avg.to_string());
-    } else if (gender_stats.count > 0 && gender_avg.b > gender_avg.r + 50.0 && gender_avg.b > 150.0){
-        ret.gender = Gender::Male;
-        logger.log("Gender Male, color " + gender_avg.to_string());
-    } else{
-        ret.gender = Gender::Genderless;
-        logger.log("Gender Genderless, color " + gender_avg.to_string());
-    }
-
-    // Replace non-red color with zero-alpha color so that they won't be counted in
-    // the following image_stats().
-    // The red color is defined as ranging from (200, 0, 0) to (255, 100, 100).
-    replace_color_range = false;
-    const ImageStats alpha_stats = image_stats(filter_rgb32_range(
-        extract_box_reference(frame, alpha_box),
-        combine_rgb(200, 0, 0), combine_rgb(255, 100, 100), Color(0), replace_color_range
-    ));
-    const FloatPixel alpha_avg = alpha_stats.average;
-    logger.log("Alpha color " + alpha_avg.to_string());
-    if (alpha_stats.count > 0 && alpha_avg.r > alpha_avg.g + 100.0 && alpha_avg.r > alpha_avg.b + 100.0 && alpha_avg.r > 200.0){
-        ret.is_alpha = true;
-        logger.log("Is alpha, color " + alpha_avg.to_string());
-    }
-    
-    const std::vector<ImagePixelBox> shiny_locations = find_shiny_symbols(frame);
-    if (shiny_locations.size() > 0){
-        ret.is_shiny = true;
-        logger.log("Found shiny symbol.");
-    }
-
-    return ret;
-}
-
-
-bool detect_change_focus(Logger& logger, VideoOverlay& overlay, const ImageViewRGB32& frame){
-    const bool stop_on_detect = true;
-    ButtonDetector button(logger, overlay, ButtonType::ButtonA, {0.244, 0.815, 0.026, 0.047},
-        std::chrono::milliseconds(0), stop_on_detect);
-    
-    return button.process_frame(frame, current_time());
-}
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonLA/Inference/Sounds/PokemonLA_AlphaMusicDetector.cpp b/SerialPrograms/Source/PokemonLA/Inference/Sounds/PokemonLA_AlphaMusicDetector.cpp
deleted file mode 100644
index 5e27c8f173..0000000000
--- a/SerialPrograms/Source/PokemonLA/Inference/Sounds/PokemonLA_AlphaMusicDetector.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-/*  Alpha Music Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/Inference/SpectrogramMatcher.h"
-#include "CommonFramework/Inference/AudioTemplateCache.h"
-#include "CommonFramework/Tools/ConsoleHandle.h"
-#include "PokemonLA/PokemonLA_Settings.h"
-#include "PokemonLA_AlphaMusicDetector.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-
-
-AlphaMusicDetector::AlphaMusicDetector(ConsoleHandle& console, DetectedCallback detected_callback)
-    // Use a red as the detection color because the alpha symbol is red.
-    : AudioPerSpectrumDetectorBase("AlphaMusicDetector", "Alpha music", COLOR_RED, console, detected_callback)
-{}
-
-float AlphaMusicDetector::get_score_threshold() const{
-    return (float)GameSettings::instance().ALPHA_MUSIC_THRESHOLD;
-}
-
-std::unique_ptr<SpectrogramMatcher> AlphaMusicDetector::build_spectrogram_matcher(size_t sample_rate){
-    const double low_frequency_filter = 50.0; // we don't match frequencies under 50.0 Hz
-    const size_t templateSubdivision = 12;
-    return std::make_unique<SpectrogramMatcher>(
-        "Alpha Music",
-        AudioTemplateCache::instance().get_throw("PokemonLA/AlphaMusic", sample_rate),
-        SpectrogramMatcher::Mode::RAW, sample_rate,
-        low_frequency_filter, templateSubdivision
-    );
-}
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonLA/Inference/Sounds/PokemonLA_AlphaMusicDetector.h b/SerialPrograms/Source/PokemonLA/Inference/Sounds/PokemonLA_AlphaMusicDetector.h
deleted file mode 100644
index 4fc3bf4b80..0000000000
--- a/SerialPrograms/Source/PokemonLA/Inference/Sounds/PokemonLA_AlphaMusicDetector.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*  Alpha Music Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonLA_AlphaMusicDetector_H
-#define PokemonAutomation_PokemonLA_AlphaMusicDetector_H
-
-#include "Common/Cpp/Concurrency/SpinLock.h"
-#include "CommonFramework/Logging/Logger.h"
-#include "CommonFramework/Inference/AudioPerSpectrumDetectorBase.h"
-
-#include <memory>
-
-namespace PokemonAutomation{
-
-class ConsoleHandle;
-class SpectrogramMatcher;
-
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-
-class AlphaMusicDetector : public AudioPerSpectrumDetectorBase{
-public:
-    AlphaMusicDetector(ConsoleHandle& console, DetectedCallback detected_callback);
-
-    // Implement AudioPerSpectrumDetectorBase::get_score_threshold()
-    virtual float get_score_threshold() const override;
-
-protected:
-    // Implement AudioPerSpectrumDetectorBase::build_spectrogram_matcher()
-    virtual std::unique_ptr<SpectrogramMatcher> build_spectrogram_matcher(size_t sample_rate) override;
-};
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonLA/Inference/Sounds/PokemonLA_AlphaRoarDetector.cpp b/SerialPrograms/Source/PokemonLA/Inference/Sounds/PokemonLA_AlphaRoarDetector.cpp
deleted file mode 100644
index 28cc93d4f9..0000000000
--- a/SerialPrograms/Source/PokemonLA/Inference/Sounds/PokemonLA_AlphaRoarDetector.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-/*  Alpha Roar Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/Inference/SpectrogramMatcher.h"
-#include "CommonFramework/Inference/AudioTemplateCache.h"
-#include "CommonFramework/Tools/ConsoleHandle.h"
-#include "PokemonLA/PokemonLA_Settings.h"
-#include "PokemonLA_AlphaRoarDetector.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-
-
-AlphaRoarDetector::AlphaRoarDetector(ConsoleHandle& console, DetectedCallback detected_callback)
-    // Use a purple as the detection color because the alpha symbol is red. To differentiate with the
-    // detection color of alpha music, the roar (which is loud -> heavy -> darker color) uses purple.
-    : AudioPerSpectrumDetectorBase("AlphaRoarDetector", "Alpha roar", COLOR_PURPLE, console, detected_callback)
-{}
-
-float AlphaRoarDetector::get_score_threshold() const{
-    return (float)GameSettings::instance().ALPHA_ROAR_THRESHOLD;
-}
-
-std::unique_ptr<SpectrogramMatcher> AlphaRoarDetector::build_spectrogram_matcher(size_t sample_rate){
-    const double low_frequency_filter = 100.0; // we don't match frequencies under 100.0 Hz
-    return std::make_unique<SpectrogramMatcher>(
-        "Alpha Roar",
-        AudioTemplateCache::instance().get_throw("PokemonLA/AlphaRoar", sample_rate),
-        SpectrogramMatcher::Mode::RAW, sample_rate,
-        low_frequency_filter
-    );
-}
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonLA/Inference/Sounds/PokemonLA_AlphaRoarDetector.h b/SerialPrograms/Source/PokemonLA/Inference/Sounds/PokemonLA_AlphaRoarDetector.h
deleted file mode 100644
index 3d9b3dbcf7..0000000000
--- a/SerialPrograms/Source/PokemonLA/Inference/Sounds/PokemonLA_AlphaRoarDetector.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*  Alpha Roar Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonLA_AlphaRoarDetector_H
-#define PokemonAutomation_PokemonLA_AlphaRoarDetector_H
-
-#include "CommonFramework/Inference/AudioPerSpectrumDetectorBase.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-
-class AlphaRoarDetector : public AudioPerSpectrumDetectorBase{
-public:
-    AlphaRoarDetector(ConsoleHandle& console, DetectedCallback detected_callback);
-
-    // Implement AudioPerSpectrumDetectorBase::get_score_threshold()
-    virtual float get_score_threshold() const override;
-
-protected:
-    // Implement AudioPerSpectrumDetectorBase::build_spectrogram_matcher()
-    virtual std::unique_ptr<SpectrogramMatcher> build_spectrogram_matcher(size_t sample_rate) override;
-};
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonLA/Inference/Sounds/PokemonLA_ItemDropSoundDetector.cpp b/SerialPrograms/Source/PokemonLA/Inference/Sounds/PokemonLA_ItemDropSoundDetector.cpp
deleted file mode 100644
index f0e0f18e3a..0000000000
--- a/SerialPrograms/Source/PokemonLA/Inference/Sounds/PokemonLA_ItemDropSoundDetector.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-/*  Item Drop Sound Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/Inference/SpectrogramMatcher.h"
-#include "CommonFramework/Inference/AudioTemplateCache.h"
-#include "CommonFramework/Tools/ConsoleHandle.h"
-#include "PokemonLA/PokemonLA_Settings.h"
-#include "PokemonLA_ItemDropSoundDetector.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-
-ItemDropSoundDetector::ItemDropSoundDetector(ConsoleHandle& console, DetectedCallback detected_callback)
-    // Use a green as the detection color because the shiny symbol in LA is green.
-    : AudioPerSpectrumDetectorBase("ItemDropSoundDetector", "Item drop sound", COLOR_DARKGREEN, console, detected_callback)
-{}
-
-
-float ItemDropSoundDetector::get_score_threshold() const{
-    return (float)GameSettings::instance().ITEM_DROP_SOUND_THRESHOLD;
-}
-
-std::unique_ptr<SpectrogramMatcher> ItemDropSoundDetector::build_spectrogram_matcher(size_t sample_rate){
-    return std::make_unique<SpectrogramMatcher>(
-        "Item Drop",
-        AudioTemplateCache::instance().get_throw("PokemonLA/ItemDropSound", sample_rate),
-        SpectrogramMatcher::Mode::SPIKE_CONV, sample_rate,
-        GameSettings::instance().ITEM_DROP_SOUND_LOW_FREQUENCY
-    );
-}
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonLA/Inference/Sounds/PokemonLA_ItemDropSoundDetector.h b/SerialPrograms/Source/PokemonLA/Inference/Sounds/PokemonLA_ItemDropSoundDetector.h
deleted file mode 100644
index 647cb69402..0000000000
--- a/SerialPrograms/Source/PokemonLA/Inference/Sounds/PokemonLA_ItemDropSoundDetector.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*  Item Drop Sound Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonLA_ItemDropSoundDetector_H
-#define PokemonAutomation_PokemonLA_ItemDropSoundDetector_H
-
-#include <functional>
-#include "CommonFramework/Inference/AudioPerSpectrumDetectorBase.h"
-
-#include <memory>
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-
-class ItemDropSoundDetector : public AudioPerSpectrumDetectorBase{
-public:
-    //  Warning: The callback will be called from the audio inference thread.
-    ItemDropSoundDetector(ConsoleHandle& console, DetectedCallback detected_callback);
-
-    // Implement AudioPerSpectrumDetectorBase::get_score_threshold()
-    virtual float get_score_threshold() const override;
-
-protected:
-    // Implement AudioPerSpectrumDetectorBase::build_spectrogram_matcher()
-    virtual std::unique_ptr<SpectrogramMatcher> build_spectrogram_matcher(size_t sample_rate) override;
-};
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonLA/Inference/Sounds/PokemonLA_ShinySoundDetector.cpp b/SerialPrograms/Source/PokemonLA/Inference/Sounds/PokemonLA_ShinySoundDetector.cpp
deleted file mode 100644
index 4720062b41..0000000000
--- a/SerialPrograms/Source/PokemonLA/Inference/Sounds/PokemonLA_ShinySoundDetector.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-/*  Shiny Sound Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/Inference/SpectrogramMatcher.h"
-#include "CommonFramework/Inference/AudioTemplateCache.h"
-#include "CommonFramework/Tools/ConsoleHandle.h"
-#include "PokemonLA/PokemonLA_Settings.h"
-#include "PokemonLA_ShinySoundDetector.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-
-ShinySoundDetector::ShinySoundDetector(ConsoleHandle& console, DetectedCallback detected_callback)
-    // Use a yellow as the detection color because the shiny animation is yellow.
-    : AudioPerSpectrumDetectorBase("ShinySoundDetector", "Shiny sound", COLOR_YELLOW, console, detected_callback)
-{}
-
-
-float ShinySoundDetector::get_score_threshold() const{
-    return (float)GameSettings::instance().SHINY_SOUND_THRESHOLD;
-}
-
-std::unique_ptr<SpectrogramMatcher> ShinySoundDetector::build_spectrogram_matcher(size_t sample_rate){
-    return std::make_unique<SpectrogramMatcher>(
-        "Shiny Sound",
-        AudioTemplateCache::instance().get_throw("PokemonLA/ShinySound", sample_rate),
-        SpectrogramMatcher::Mode::SPIKE_CONV, sample_rate,
-        GameSettings::instance().SHINY_SOUND_LOW_FREQUENCY
-    );
-}
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonLA/Inference/Sounds/PokemonLA_ShinySoundDetector.h b/SerialPrograms/Source/PokemonLA/Inference/Sounds/PokemonLA_ShinySoundDetector.h
deleted file mode 100644
index 818a2e8122..0000000000
--- a/SerialPrograms/Source/PokemonLA/Inference/Sounds/PokemonLA_ShinySoundDetector.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*  Shiny Sound Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonLA_ShinySoundDetector_H
-#define PokemonAutomation_PokemonLA_ShinySoundDetector_H
-
-#include "CommonFramework/Inference/AudioPerSpectrumDetectorBase.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-
-class ShinySoundDetector : public AudioPerSpectrumDetectorBase{
-public:
-    //  Warning: The callback will be called from the audio inference thread.
-    ShinySoundDetector(ConsoleHandle& console, DetectedCallback detected_callback);
-
-    // Implement AudioPerSpectrumDetectorBase::get_score_threshold()
-    virtual float get_score_threshold() const override;
-
-protected:
-    // Implement AudioPerSpectrumDetectorBase::build_spectrogram_matcher()
-    virtual std::unique_ptr<SpectrogramMatcher> build_spectrogram_matcher(size_t sample_rate) override;
-};
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonLA/Options/PokemonLA_CustomPathTable.cpp b/SerialPrograms/Source/PokemonLA/Options/PokemonLA_CustomPathTable.cpp
deleted file mode 100644
index 42f6678865..0000000000
--- a/SerialPrograms/Source/PokemonLA/Options/PokemonLA_CustomPathTable.cpp
+++ /dev/null
@@ -1,411 +0,0 @@
-/*  Battle Pokemon Action Table
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <QHBoxLayout>
-#include <QVBoxLayout>
-#include <QLabel>
-#include <QPushButton>
-#include <QFileDialog>
-#include <QMessageBox>
-
-#include "Common/Compiler.h"
-#include "Common/Cpp/Exceptions.h"
-#include "Common/Cpp/Json/JsonValue.h"
-#include "Common/Cpp/Json/JsonObject.h"
-#include "Common/Cpp/Json/JsonTools.h"
-#include "Common/Qt/Options/ConfigWidget.h"
-#include "CommonFramework/Globals.h"
-#include "PokemonLA_CustomPathTable.h"
-
-#include <iostream>
-using std::cout;
-using std::endl;
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-
-
-
-const EnumDatabase<PathAction>& PathAction_Database(){
-    static const EnumDatabase<PathAction> database({
-        {PathAction::NO_ACTION,             "no-action",            "NO Action"},
-        {PathAction::CHANGE_MOUNT,          "change-mount",         "Change Mount"},
-        {PathAction::MOVE_FORWARD,          "move-forward",         "Move Forward"},
-        {PathAction::MOVE_IN_DIRECTION,     "move-in-direction",    "Move in Direction"},
-        {PathAction::CENTER_CAMERA,         "center-camera",        "Center Camera"},
-        {PathAction::JUMP,                  "jump",                 "Jump"},
-        {PathAction::WAIT,                  "wait",                 "Wait"},
-        {PathAction::START_LISTEN,          "start-listen",         "Start Listen"},
-        {PathAction::END_LISTEN,            "end-listen",           "End Listen"}
-    });
-    return database;
-}
-const EnumDatabase<PathMount>& PathMount_Database(){
-    static const EnumDatabase<PathMount> database({
-        {PathMount::NO_MOUNT,       "none",         "No Mount"},
-        {PathMount::WYRDEER,        "wrydeer",      "Wrydeer"},
-        {PathMount::URSALUNA,       "ursaluna",     "Ursaluna"},
-        {PathMount::BASCULEGION,    "basculegion",  "Basculegion"},
-        {PathMount::SNEASLER,       "sneasler",     "Sneasler"},
-        {PathMount::BRAVIARY,       "braviary",     "Braviary"},
-    });
-    return database;
-}
-const EnumDatabase<PathSpeed>& PathSpeed_Database(){
-    static const EnumDatabase<PathSpeed> database({
-        {PathSpeed::NORMAL_SPEED,   "normal",   "Normal Speed"},
-        {PathSpeed::SLOW_SPEED,     "slow",     "Slow Speed"},
-        {PathSpeed::RUN,            "run",      "Run on Foot"},
-        {PathSpeed::DASH,           "dash",     "Dash on Ride"},
-        {PathSpeed::DASH_B_SPAM,    "mash-b",   "Dash on Braviary B Spam"},
-        {PathSpeed::DIVE,           "dive",     "Dive on Braviary"},
-    });
-    return database;
-}
-
-
-
-
-
-CustomPathCell::~CustomPathCell(){
-    m_action.remove_listener(*this);
-}
-void CustomPathCell::operator=(const CustomPathCell& x){
-    text.set_text(x.text.text());
-    mount.set(x.mount);
-    move_forward_ticks.set(x.move_forward_ticks);
-    move_speed.set(x.move_speed);
-    left_x.set(x.left_x);
-    left_y.set(x.left_y);
-    jump_wait_ticks.set(x.jump_wait_ticks);
-    wait_ticks.set(x.wait_ticks);
-}
-CustomPathCell::CustomPathCell(EnumDropdownCell<PathAction>& action)
-    : BatchOption(LockWhileRunning::LOCKED, true)
-    , m_action(action)
-    , text("", false)
-    , mount(PathMount_Database(), LockWhileRunning::LOCKED, PathMount::NO_MOUNT)
-    , move_forward_ticks("Ticks to Move:", LockWhileRunning::LOCKED, 0)
-    , move_speed(PathSpeed_Database(), LockWhileRunning::LOCKED,PathSpeed::NORMAL_SPEED)
-    , left_x("x: [left: -1.0, right: 1.0]", LockWhileRunning::LOCKED, 0, -1.0, 1.0)
-    , left_y("y: [backward: -1.0, forward: 1.0]", LockWhileRunning::LOCKED, 0, -1.0, 1.0)
-    , jump_wait_ticks("Ticks after jump:", LockWhileRunning::LOCKED, 0)
-    , wait_ticks("Ticks:", LockWhileRunning::LOCKED, 0)
-{
-    PA_ADD_STATIC(text);
-    PA_ADD_OPTION(mount);
-    PA_ADD_OPTION(move_forward_ticks);
-    PA_ADD_OPTION(move_speed);
-    PA_ADD_OPTION(left_x);
-    PA_ADD_OPTION(left_y);
-    PA_ADD_OPTION(jump_wait_ticks);
-    PA_ADD_OPTION(wait_ticks);
-
-    CustomPathCell::value_changed();
-    action.add_listener(*this);
-}
-void CustomPathCell::value_changed(){
-    text.set_visibility(ConfigOptionState::HIDDEN);
-    mount.set_visibility(ConfigOptionState::HIDDEN);
-    move_forward_ticks.set_visibility(ConfigOptionState::HIDDEN);
-    move_speed.set_visibility(ConfigOptionState::HIDDEN);
-    left_x.set_visibility(ConfigOptionState::HIDDEN);
-    left_y.set_visibility(ConfigOptionState::HIDDEN);
-    jump_wait_ticks.set_visibility(ConfigOptionState::HIDDEN);
-    wait_ticks.set_visibility(ConfigOptionState::HIDDEN);
-    switch (m_action){
-    case PathAction::NO_ACTION:
-        break;
-    case PathAction::CHANGE_MOUNT:
-        mount.set_visibility(ConfigOptionState::ENABLED);
-        break;
-    case PathAction::MOVE_FORWARD:
-        move_forward_ticks.set_visibility(ConfigOptionState::ENABLED);
-        move_speed.set_visibility(ConfigOptionState::ENABLED);
-        break;
-    case PathAction::MOVE_IN_DIRECTION:
-        move_forward_ticks.set_visibility(ConfigOptionState::ENABLED);
-        left_x.set_visibility(ConfigOptionState::ENABLED);
-        left_y.set_visibility(ConfigOptionState::ENABLED);
-        break;
-    case PathAction::CENTER_CAMERA:
-        text.set_text("Center the camera so that you can move straight forward.");
-        text.set_visibility(ConfigOptionState::ENABLED);
-        break;
-    case PathAction::JUMP:
-        jump_wait_ticks.set_visibility(ConfigOptionState::ENABLED);
-        break;
-    case PathAction::WAIT:
-        wait_ticks.set_visibility(ConfigOptionState::ENABLED);
-        break;
-    case PathAction::START_LISTEN:
-        text.set_text("If shiny detected, use \"Destination Shiny Action\".");
-        text.set_visibility(ConfigOptionState::ENABLED);
-        break;
-    case PathAction::END_LISTEN:
-        text.set_text("If shiny detected, use \"Enroute Shiny Action\".");
-        text.set_visibility(ConfigOptionState::ENABLED);
-        break;
-    default:
-        break;
-    }
-}
-
-
-
-
-CustomPathTableRow2::CustomPathTableRow2()
-    : action(PathAction_Database(), LockWhileRunning::LOCKED, PathAction::NO_ACTION)
-    , parameters(action)
-{
-    PA_ADD_OPTION(action);
-    PA_ADD_OPTION(parameters);
-}
-std::unique_ptr<EditableTableRow> CustomPathTableRow2::clone() const{
-    std::unique_ptr<CustomPathTableRow2> ret(new CustomPathTableRow2());
-    ret->action.set(action);
-    ret->parameters = parameters;
-    return ret;
-}
-void CustomPathTableRow2::load_json(const JsonValue& json){
-    const JsonObject* obj = json.get_object();
-    if (obj == nullptr){
-        return;
-    }
-
-    const JsonValue* value = obj->get_value("Action");
-    if (value == nullptr){
-        return;
-    }
-    action.load_json(*value);
-
-    switch(action){
-    case PathAction::CHANGE_MOUNT:
-        value = obj->get_value("Mount");
-        if (value != nullptr){
-            parameters.mount.load_json(*value);
-        }
-        break;
-    case PathAction::MOVE_FORWARD:
-        value = obj->get_value("MoveForwardTicks");
-        if (value != nullptr){
-            parameters.move_forward_ticks.load_json(*value);
-        }
-        value = obj->get_value("Speed");
-        if (value != nullptr){
-            parameters.move_speed.load_json(*value);
-        }
-        break;
-    case PathAction::MOVE_IN_DIRECTION:
-        value = obj->get_value("MoveForwardTicks");
-        if (value != nullptr){
-            parameters.move_forward_ticks.load_json(*value);
-        }
-//        value = obj->get_value("Speed");
-//        if (value != nullptr){
-//            parameters.move_speed.load_json(*value);
-//        }
-        value = obj->get_value("MoveDirectionX");
-        if (value != nullptr){
-            parameters.left_x.load_json(*value);
-        }
-        value = obj->get_value("MoveDirectionY");
-        if (value != nullptr){
-            parameters.left_y.load_json(*value);
-        }
-        break;
-    case PathAction::JUMP:
-        value = obj->get_value("JumpWaitTicks");
-        if (value != nullptr){
-            parameters.jump_wait_ticks.load_json(*value);
-        }
-        break;
-    case PathAction::WAIT:
-        value = obj->get_value("WaitTicks");
-        if (value != nullptr){
-            parameters.wait_ticks.load_json(*value);
-        }
-        break;
-    default:
-        break;
-    }
-}
-JsonValue CustomPathTableRow2::to_json() const{
-    JsonObject obj;
-    obj["Action"] = action.to_json();
-    switch (action){
-    case PathAction::CHANGE_MOUNT:
-        obj["Mount"] = parameters.mount.to_json();
-        break;
-    case PathAction::MOVE_FORWARD:
-        obj["MoveForwardTicks"] = parameters.move_forward_ticks.to_json();
-        obj["Speed"] = parameters.move_speed.to_json();
-        break;
-    case PathAction::MOVE_IN_DIRECTION:
-        obj["MoveForwardTicks"] = parameters.move_forward_ticks.to_json();
-//        obj["Speed"] = parameters.move_speed.to_json();
-        obj["MoveDirectionX"] = parameters.left_x.to_json();
-        obj["MoveDirectionY"] = parameters.left_y.to_json();
-        break;
-    case PathAction::JUMP:
-        obj["JumpWaitTicks"] = parameters.jump_wait_ticks.to_json();
-        break;
-    case PathAction::WAIT:
-        obj["WaitTicks"] = parameters.wait_ticks.to_json();
-        break;
-    default:
-        break;
-    }
-    return obj;
-}
-
-CustomPathTable2::CustomPathTable2()
-    : EditableTableOption_t<CustomPathTableRow2>(
-        "<b>Custom Path Table:</b><br>"
-        "Set a sequence of actions to navigate the map. By default, the shiny detected behavior is \"Enroute Shiny Action\".<br>"
-        "<font color=\"red\">If you wish to ignore enroute shinies, make sure you set \"Enroute Shiny Action\" to ignore shinies.</font>",
-        LockWhileRunning::LOCKED,
-        false,  //  Disable the save/load buttons since we have our own.
-        make_defaults()
-    )
-{}
-std::vector<std::string> CustomPathTable2::make_header() const{
-    return std::vector<std::string>{
-        "Action",
-        "Parameters",
-    };
-}
-std::vector<std::unique_ptr<EditableTableRow>> CustomPathTable2::make_defaults() const{
-    std::vector<std::unique_ptr<EditableTableRow>> ret;
-    auto row = std::make_unique<CustomPathTableRow2>();
-    row->action.set(PathAction::START_LISTEN);
-    ret.emplace_back(std::move(row));
-
-    row = std::make_unique<CustomPathTableRow2>();
-    row->action.set(PathAction::CHANGE_MOUNT);
-    row->parameters.mount.set(PathMount::WYRDEER);
-    ret.emplace_back(std::move(row));
-
-    row = std::make_unique<CustomPathTableRow2>();
-    row->action.set(PathAction::MOVE_IN_DIRECTION);
-    row->parameters.move_forward_ticks.set(400);
-    row->parameters.left_x.set(-1.0);
-    row->parameters.left_y.set(1.0);
-    ret.emplace_back(std::move(row));
-
-    row = std::make_unique<CustomPathTableRow2>();
-    row->action.set(PathAction::CENTER_CAMERA);
-    ret.emplace_back(std::move(row));
-
-    row = std::make_unique<CustomPathTableRow2>();
-    row->action.set(PathAction::MOVE_FORWARD);
-    row->parameters.move_speed.set(PathSpeed::DASH);
-    row->parameters.move_forward_ticks.set(400);
-    ret.emplace_back(std::move(row));
-
-    return ret;
-}
-
-
-
-
-
-
-
-
-
-CustomPathTable::CustomPathTable()
-    : BatchOption(LockWhileRunning::LOCKED)
-//    : PATH(
-//        "<b>Custom Path Table:</b><br>"
-//        "Set a sequence of actions to navigate the map. By default, the shiny detected behavior is \"Enroute Shiny Action\".<br>"
-//        "<font color=\"red\">If you wish to ignore enroute shinies, make sure you set \"Enroute Shiny Action\" to ignore shinies.</font>",
-//        m_factory, make_defaults()
-//    )
-{
-    PA_ADD_OPTION(TRAVEL_LOCATION);
-    PA_ADD_OPTION(PATH);
-}
-
-
-class CustomPathTableWidget : public QWidget, public ConfigWidget{
-public:
-    CustomPathTableWidget(QWidget& parent, CustomPathTable& value)
-        : QWidget(&parent)
-        , ConfigWidget(value, *this)
-    {
-        // m_table_widget is class EditableTableWidget : public EditableTableBaseWidget, public ConfigWidget
-        // EditableTableBaseWidget inherits QWidget.
-        // Since it's a QWidget, we don't need to care about its memory ownership after its parent is set (as `this`).
-
-        m_travel_location = value.TRAVEL_LOCATION.make_QtWidget(*this);
-        m_table_widget = value.PATH.make_QtWidget(*this);
-
-        QVBoxLayout* layout = new QVBoxLayout(this);
-        layout->setContentsMargins(0, 0, 0, 0);
-        layout->addWidget(&m_travel_location->widget());
-        layout->addWidget(&m_table_widget->widget());
-
-        QHBoxLayout* button_layout = new QHBoxLayout();
-        button_layout->setContentsMargins(0, 0, 0, 0);
-        layout->addLayout(button_layout);
-        auto load_button = new QPushButton("Load Path", this);
-        button_layout->addWidget(load_button, 1);
-        auto save_button = new QPushButton("Save Path", this);
-        button_layout->addWidget(save_button, 1);
-        button_layout->addStretch(2);
-
-        connect(load_button,  &QPushButton::clicked, this, [&value, this](bool){
-            std::string path = QFileDialog::getOpenFileName(this, tr("Open option file"), ".", "*.json").toStdString();
-            std::cout << "Load CustomPathTable from " << path << std::endl;
-            if (path.empty()){
-                return;
-            }
-            JsonValue json = load_json_file(path);
-            JsonObject& root = json.get_object_throw(path);
-            JsonValue& obj = root.get_value_throw("CUSTOM_PATH_TABLE", path);
-            value.load_json(obj);
-            if (m_table_widget == nullptr){
-                QMessageBox box;
-                box.critical(nullptr, "Error", "Internal code error, cannot convert to EditableTableBaseWidget.");
-                return;
-            }
-//            m_travel_location->update();
-//            m_table_widget->update();
-        });
-
-        connect(save_button,  &QPushButton::clicked, this, [&value, this](bool){
-            std::string path = QFileDialog::getSaveFileName(this, tr("Open option file"), ".", "*.json").toStdString();
-            std::cout << "Save CustomPathTable from " << path << std::endl;
-            if (path.size() > 0){
-                try{
-                    JsonObject root;
-                    root["CUSTOM_PATH_TABLE"] = value.to_json();
-                    root.dump(path);
-                }catch (FileException&){
-                    QMessageBox box;
-                    box.critical(nullptr, "Error", QString::fromStdString("Failed to save to file: " + path));
-                    return;
-                }
-            }
-        });
-    }
-
-private:
-    ConfigWidget* m_travel_location = nullptr;
-    ConfigWidget* m_table_widget = nullptr;
-};
-
-ConfigWidget* CustomPathTable::make_QtWidget(QWidget& parent){
-    return new CustomPathTableWidget(parent, *this);
-}
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonLA/Options/PokemonLA_CustomPathTable.h b/SerialPrograms/Source/PokemonLA/Options/PokemonLA_CustomPathTable.h
deleted file mode 100644
index 0a7bd0212b..0000000000
--- a/SerialPrograms/Source/PokemonLA/Options/PokemonLA_CustomPathTable.h
+++ /dev/null
@@ -1,132 +0,0 @@
-/*  Custom Path Table
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonLA_CustomPathTableTable_H
-#define PokemonAutomation_PokemonLA_CustomPathTableTable_H
-
-#include "Common/Cpp/Options/ConfigOption.h"
-#include "Common/Cpp/Options/BatchOption.h"
-#include "Common/Cpp/Options/StaticTextOption.h"
-#include "Common/Cpp/Options/SimpleIntegerOption.h"
-#include "Common/Cpp/Options/FloatingPointOption.h"
-#include "Common/Cpp/Options/EnumDropdownOption.h"
-#include "Common/Cpp/Options/EditableTableOption.h"
-#include "PokemonLA_TravelLocation.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-
-
-enum class PathAction{
-    NO_ACTION,
-    CHANGE_MOUNT,
-    MOVE_FORWARD,
-    MOVE_IN_DIRECTION,
-    CENTER_CAMERA,
-    JUMP,
-    WAIT,
-    START_LISTEN,
-    END_LISTEN,
-};
-const EnumDatabase<PathAction>& PathAction_Database();
-
-enum class PathMount{
-    NO_MOUNT,
-    WYRDEER,
-    URSALUNA,
-    BASCULEGION,
-    SNEASLER,
-    BRAVIARY,
-};
-const EnumDatabase<PathMount>& PathMount_Database();
-
-enum class PathSpeed{
-    NORMAL_SPEED,
-    SLOW_SPEED,
-    RUN,
-    DASH,
-    DASH_B_SPAM,
-    DIVE,
-};
-const EnumDatabase<PathSpeed>& PathSpeed_Database();
-
-
-
-
-class CustomPathCell : public BatchOption, private ConfigOption::Listener{
-public:
-    ~CustomPathCell();
-    void operator=(const CustomPathCell& x);
-    CustomPathCell(EnumDropdownCell<PathAction>& action);
-
-    virtual void value_changed() override;
-
-private:
-    EnumDropdownCell<PathAction>& m_action;
-
-public:
-    StaticTextOption text;
-    EnumDropdownCell<PathMount> mount;
-    SimpleIntegerOption<uint16_t> move_forward_ticks;
-    EnumDropdownCell<PathSpeed> move_speed;
-    FloatingPointOption left_x;
-    FloatingPointOption left_y;
-    SimpleIntegerOption<uint16_t> jump_wait_ticks;
-    SimpleIntegerOption<uint16_t> wait_ticks;
-};
-
-class CustomPathTableRow2 : public EditableTableRow{
-public:
-    CustomPathTableRow2();
-    virtual std::unique_ptr<EditableTableRow> clone() const override;
-
-    virtual void load_json(const JsonValue& json) override;
-    virtual JsonValue to_json() const override;
-
-public:
-    EnumDropdownCell<PathAction> action;
-    CustomPathCell parameters;
-};
-
-class CustomPathTable2 : public EditableTableOption_t<CustomPathTableRow2>{
-public:
-    CustomPathTable2();
-    virtual std::vector<std::string> make_header() const override;
-
-private:
-    std::vector<std::unique_ptr<EditableTableRow>> make_defaults() const;
-};
-
-
-
-
-
-// A program option to build a custom path to navigate the map
-class CustomPathTable : public BatchOption{
-public:
-    CustomPathTable();
-
-    const TravelLocationOption& travel_location() const{ return TRAVEL_LOCATION; }
-
-    virtual ConfigWidget* make_QtWidget(QWidget& parent) override;
-
-public:
-    friend class CustomPathTableWidget;
-
-    TravelLocationOption TRAVEL_LOCATION;
-    CustomPathTable2 PATH;
-};
-
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonLA/Options/PokemonLA_ShinyDetectedAction.cpp b/SerialPrograms/Source/PokemonLA/Options/PokemonLA_ShinyDetectedAction.cpp
deleted file mode 100644
index 21cc9093ee..0000000000
--- a/SerialPrograms/Source/PokemonLA/Options/PokemonLA_ShinyDetectedAction.cpp
+++ /dev/null
@@ -1,197 +0,0 @@
-/*  Shiny Detected Action
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <sstream>
-#include "CommonFramework/Exceptions/ProgramFinishedException.h"
-#include "CommonFramework/Options/Environment/ThemeSelectorOption.h"
-#include "CommonFramework/Notifications/ProgramNotifications.h"
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "CommonFramework/Tools/ProgramEnvironment.h"
-#include "CommonFramework/Tools/ConsoleHandle.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "Pokemon/Pokemon_Notification.h"
-#include "PokemonLA/PokemonLA_Settings.h"
-#include "PokemonLA_ShinyDetectedAction.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-
-
-ShinyRequiresAudioText::ShinyRequiresAudioText()
-    : StaticTextOption(
-        html_color_text(
-            "<font size=4><b>Shiny detection uses sound. Make sure you have the correct audio input set.</b></font>",
-            COLOR_BLUE
-        )
-    )
-{}
-
-
-
-ShinyDetectedActionOption::ShinyDetectedActionOption(
-    std::string label, std::string description,
-    std::string default_delay_ticks,
-    ShinyDetectedAction default_action
-)
-    : GroupOption(std::move(label), LockWhileRunning::LOCKED)
-    , DESCRIPTION(std::move(description))
-    , ACTION(
-        "<b>Shiny Detected Action:</b>",
-        {
-            {ShinyDetectedAction::IGNORE,                   "ignore",       "Ignore the shiny. Do not stop the program."},
-            {ShinyDetectedAction::STOP_PROGRAM,             "stop",         "Stop program. Align camera for a screenshot. Then go Home."},
-            {ShinyDetectedAction::TAKE_VIDEO_STOP_PROGRAM,  "video+stop",   "Stop program. Align camera for a screenshot + video. Then go Home."},
-        },
-        LockWhileRunning::LOCKED,
-        default_action
-    )
-//    , STOP_PROGRAM("<b>Stop Program:</b><br>Stop program and go Home if it hears a shiny.", true)
-//    , TAKE_VIDEO("<b>Take Video:</b><br>Take a video if a shiny is heard.", true)
-    , SCREENSHOT_DELAY(
-        "<b>Screenshot Delay:</b><br>"
-        "Align the camera, then wait this long before taking a screenshot + video of the shiny.<br>"
-        "Set to zero to skip this. Don't set this too large or the shiny may run away!",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        std::move(default_delay_ticks)
-    )
-    , NOTIFICATIONS(this->label(), true, true, ImageAttachmentMode::JPG, {"Notifs", "Showcase"})
-{
-    if (!DESCRIPTION.text().empty()){
-        PA_ADD_OPTION(DESCRIPTION);
-    }
-    PA_ADD_OPTION(ACTION);
-//    PA_ADD_OPTION(STOP_PROGRAM);
-//    PA_ADD_OPTION(TAKE_VIDEO);
-    PA_ADD_OPTION(SCREENSHOT_DELAY);
-}
-bool ShinyDetectedActionOption::stop_on_shiny() const{
-    return ACTION != ShinyDetectedAction::IGNORE;
-}
-
-
-
-
-
-
-bool on_shiny_callback(
-    ProgramEnvironment& env, ConsoleHandle& console,
-    ShinyDetectedActionOption& options,
-    float error_coefficient
-){
-    {
-        std::ostringstream ss;
-        ss << "Detected Shiny Sound! (error coefficient = " << error_coefficient << ")";
-        console.log(ss.str(), COLOR_BLUE);
-
-        //  If we're not ignoring the shiny, return now. Actions will be deferred
-        //  until after the session ends.
-        ShinyDetectedAction action = options.ACTION;
-        if (action != ShinyDetectedAction::IGNORE){
-            return true;
-        }
-    }
-
-    console.log("Ignoring shiny per user settings...", COLOR_RED);
-
-    std::vector<std::pair<std::string, std::string>> embeds;
-
-    std::ostringstream ss;
-    ss << "Error Coefficient: " << error_coefficient << "\n(Shiny may not be visible on the screen.)";
-    embeds.emplace_back("Detection Results:", ss.str());
-
-    send_program_notification(
-        env, options.NOTIFICATIONS,
-        Pokemon::COLOR_STAR_SHINY,
-        "Detected Shiny Sound",
-        embeds, "",
-        console.video().snapshot(), true
-    );
-    return false;
-}
-void on_shiny_sound(
-    ProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context,
-    ShinyDetectedActionOption& options,
-    float error_coefficient
-){
-    std::vector<std::pair<std::string, std::string>> embeds;
-
-    std::ostringstream ss;
-    ss << "Error Coefficient: ";
-    ss << error_coefficient;
-    ss << "\n(Shiny may not be visible on the screen.)";
-    embeds.emplace_back("Detection Results:", ss.str());
-
-//    pbf_press_button(context, BUTTON_ZL, 20, options.SCREENSHOT_DELAY);
-    pbf_mash_button(context, BUTTON_ZL, options.SCREENSHOT_DELAY);
-    context.wait_for_all_requests();
-
-    send_program_notification(
-        env, options.NOTIFICATIONS,
-        Pokemon::COLOR_STAR_SHINY,
-        "Detected Shiny Sound",
-        embeds, "",
-        console.video().snapshot(), true
-    );
-
-    ShinyDetectedAction action = options.ACTION;
-    if (action == ShinyDetectedAction::TAKE_VIDEO_STOP_PROGRAM){
-        pbf_press_button(context, BUTTON_CAPTURE, 2 * TICKS_PER_SECOND, 0);
-    }
-
-    pbf_press_button(context, BUTTON_HOME, 20, GameSettings::instance().GAME_TO_HOME_DELAY);
-    context.wait_for_all_requests();
-    throw ProgramFinishedException();
-}
-
-void on_match_found(
-    ProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context,
-    ShinyDetectedActionOption& options, bool stop_program
-){
-    std::vector<std::pair<std::string, std::string>> embeds;
-
-    pbf_mash_button(context, BUTTON_ZL, options.SCREENSHOT_DELAY);
-    context.wait_for_all_requests();
-
-    send_program_notification(
-        env, options.NOTIFICATIONS,
-        Pokemon::COLOR_STAR_SHINY,
-        "Match Found",
-        embeds, "",
-        console.video().snapshot(), true
-    );
-
-    ShinyDetectedAction action = options.ACTION;
-    if (action == ShinyDetectedAction::TAKE_VIDEO_STOP_PROGRAM){
-        pbf_press_button(context, BUTTON_CAPTURE, 2 * TICKS_PER_SECOND, 0);
-    }
-
-    if (stop_program){
-        console.log("Stopping...");
-//        pbf_press_button(context, BUTTON_HOME, 20, GameSettings::instance().GAME_TO_HOME_DELAY);
-        context.wait_for_all_requests();
-        throw ProgramFinishedException();
-    }
-
-    console.log("Continuing...");
-}
-
-
-
-
-
-
-
-
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonLA/Options/PokemonLA_ShinyDetectedAction.h b/SerialPrograms/Source/PokemonLA/Options/PokemonLA_ShinyDetectedAction.h
deleted file mode 100644
index 619911eebe..0000000000
--- a/SerialPrograms/Source/PokemonLA/Options/PokemonLA_ShinyDetectedAction.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/*  Shiny Detected Action
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonLA_ShinyDetectedAction_H
-#define PokemonAutomation_PokemonLA_ShinyDetectedAction_H
-
-#include "Common/Cpp/Exceptions.h"
-#include "Common/Cpp/Options/StaticTextOption.h"
-#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
-#include "Common/Cpp/Options/EnumDropdownOption.h"
-#include "Common/Cpp/Options/TimeExpressionOption.h"
-#include "Common/Cpp/Options/GroupOption.h"
-#include "CommonFramework/Notifications/EventNotificationOption.h"
-
-namespace PokemonAutomation{
-    class BotBaseContext;
-    class EventNotificationOption;
-    class StatsTracker;
-    class ProgramEnvironment;
-    class ConsoleHandle;
-    class AsyncCommandSession;
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-
-class ShinyRequiresAudioText : public StaticTextOption{
-public:
-    ShinyRequiresAudioText();
-};
-
-
-
-class ShinySoundDetector;
-
-
-class ShinyStatIncrementer{
-public:
-    virtual void add_shiny() = 0;
-};
-
-
-
-
-enum class ShinyDetectedAction{
-    IGNORE,
-    STOP_PROGRAM,
-    TAKE_VIDEO_STOP_PROGRAM,
-};
-
-
-class ShinyDetectedActionOption : public GroupOption{
-public:
-    ShinyDetectedActionOption(
-        std::string label, std::string description,
-        std::string default_delay_ticks,
-        ShinyDetectedAction default_action = ShinyDetectedAction::TAKE_VIDEO_STOP_PROGRAM
-    );
-
-    bool stop_on_shiny() const;
-
-    StaticTextOption DESCRIPTION;
-    EnumDropdownOption<ShinyDetectedAction> ACTION;
-//    BooleanCheckBoxOption STOP_PROGRAM;
-//    BooleanCheckBoxOption TAKE_VIDEO;
-    TimeExpressionOption<uint16_t> SCREENSHOT_DELAY;
-    EventNotificationOption NOTIFICATIONS;
-};
-
-
-
-//  Call this inside the ShinySoundDetector callback.
-//  Returns true if session should stop.
-bool on_shiny_callback(
-    ProgramEnvironment& env, ConsoleHandle& console,
-    ShinyDetectedActionOption& options,
-    float error_coefficient
-);
-
-//  Call this after the session ends. Only if the session stopped on the shiny.
-void on_shiny_sound(
-    ProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context,
-    ShinyDetectedActionOption& options,
-    float error_coefficient
-);
-
-// Alternative for matches (shiny/alphas) not found by sound.
-void on_match_found(
-    ProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context,
-    ShinyDetectedActionOption& options, bool is_match
-);
-
-
-
-
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonLA/Options/PokemonLA_TravelLocation.cpp b/SerialPrograms/Source/PokemonLA/Options/PokemonLA_TravelLocation.cpp
deleted file mode 100644
index bff49aa3f1..0000000000
--- a/SerialPrograms/Source/PokemonLA/Options/PokemonLA_TravelLocation.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-/*  Travel Location
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Cpp/Exceptions.h"
-#include "PokemonLA_TravelLocation.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-
-TravelLocationOption::TravelLocationOption()
-    : IntegerEnumDropdownOption(
-        "<b>Start Location:</b><br>Travel from this location.",
-        TravelLocations::instance().database(),
-        LockWhileRunning::LOCKED,
-        0
-    )
-{}
-
-TravelLocationOption::operator TravelLocation() const{
-    size_t index = this->current_value();
-    return TravelLocations::instance()[index];
-}
-
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonLA/Options/PokemonLA_TravelLocation.h b/SerialPrograms/Source/PokemonLA/Options/PokemonLA_TravelLocation.h
deleted file mode 100644
index 691ffe1d51..0000000000
--- a/SerialPrograms/Source/PokemonLA/Options/PokemonLA_TravelLocation.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*  Travel Location
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonLA_TravelLocation_H
-#define PokemonAutomation_PokemonLA_TravelLocation_H
-
-#include "Common/Cpp/Options/EnumDropdownOption.h"
-#include "PokemonLA/PokemonLA_TravelLocations.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-
-class TravelLocationOption : public IntegerEnumDropdownOption{
-public:
-    TravelLocationOption();
-    operator TravelLocation() const;
-};
-
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonLA/PokemonLA_Panels.cpp b/SerialPrograms/Source/PokemonLA/PokemonLA_Panels.cpp
deleted file mode 100644
index f0f76cad44..0000000000
--- a/SerialPrograms/Source/PokemonLA/PokemonLA_Panels.cpp
+++ /dev/null
@@ -1,116 +0,0 @@
-/*  Pokemon LA Panels
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/GlobalSettingsPanel.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonLA_Panels.h"
-
-#include "PokemonLA_Settings.h"
-
-#include "Programs/General/PokemonLA_BraviaryHeightGlitch.h"
-#include "Programs/General/PokemonLA_DistortionWaiter.h"
-#include "Programs/General/PokemonLA_OutbreakFinder.h"
-#include "Programs/General/PokemonLA_ClothingBuyer.h"
-#include "Programs/General/PokemonLA_SkipToFullMoon.h"
-#include "Programs/General/PokemonLA_PokedexTasksReader.h"
-#include "Programs/General/PokemonLA_RamanasIslandCombee.h"
-#include "Programs/General/PokemonLA_ApplyGrits.h"
-
-#include "Programs/Trading/PokemonLA_SelfBoxTrade.h"
-#include "Programs/Trading/PokemonLA_SelfTouchTrade.h"
-
-#include "Programs/Farming/PokemonLA_IngoBattleGrinder.h"
-#include "Programs/Farming/PokemonLA_IngoMoveGrinder.h"
-#include "Programs/Farming/PokemonLA_MagikarpMoveGrinder.h"
-#include "Programs/Farming/PokemonLA_NuggetFarmerHighlands.h"
-#include "Programs/Farming/PokemonLA_TenacityCandyFarmer.h"
-#include "Programs/Farming/PokemonLA_LeapGrinder.h"
-
-//#include "Programs/ShinyHunting/PokemonLA_ShinyHunt-LakeTrio.h"
-#include "Programs/ShinyHunting/PokemonLA_AutoMultiSpawn.h"
-#include "Programs/ShinyHunting/PokemonLA_GalladeFinder.h"
-#include "Programs/ShinyHunting/PokemonLA_CrobatFinder.h"
-#include "Programs/ShinyHunting/PokemonLA_FroslassFinder.h"
-#include "Programs/ShinyHunting/PokemonLA_BurmyFinder.h"
-#include "Programs/ShinyHunting/PokemonLA_UnownFinder.h"
-#include "Programs/ShinyHunting/PokemonLA_ShinyHunt-FlagPin.h"
-#include "Programs/ShinyHunting/PokemonLA_PostMMOSpawnReset.h"
-#include "Programs/ShinyHunting/PokemonLA_ShinyHunt-CustomPath.h"
-
-#include "Programs/TestPrograms/PokemonLA_MountDetectionTest.h"
-#include "Programs/TestPrograms/PokemonLA_OverworldWatcher.h"
-#include "Programs/TestPrograms/PokemonLA_FlagNavigationTest.h"
-#include "Programs/TestPrograms/PokemonLA_SoundListener.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-
-
-PanelListFactory::PanelListFactory()
-    : PanelListDescriptor(Pokemon::STRING_POKEMON + " Legends Arceus")
-{}
-
-std::vector<PanelEntry> PanelListFactory::make_panels() const{
-    std::vector<PanelEntry> ret;
-
-    ret.emplace_back("---- Settings ----");
-    ret.emplace_back(make_settings<GameSettings_Descriptor, GameSettingsPanel>());
-
-    ret.emplace_back("---- General ----");
-    ret.emplace_back(make_single_switch_program<BraviaryHeightGlitch_Descriptor, BraviaryHeightGlitch>());
-    ret.emplace_back(make_single_switch_program<DistortionWaiter_Descriptor, DistortionWaiter>());
-    ret.emplace_back(make_single_switch_program<OutbreakFinder_Descriptor, OutbreakFinder>());
-    ret.emplace_back(make_single_switch_program<ClothingBuyer_Descriptor, ClothingBuyer>());
-    ret.emplace_back(make_single_switch_program<SkipToFullMoon_Descriptor, SkipToFullMoon>());
-    ret.emplace_back(make_single_switch_program<ApplyGrits_Descriptor, ApplyGrits>());
-    ret.emplace_back(make_single_switch_program<PokedexTasksReader_Descriptor, PokedexTasksReader>());
-    ret.emplace_back(make_single_switch_program<RamanasCombeeFinder_Descriptor, RamanasCombeeFinder>());
-
-    ret.emplace_back("---- Trading ----");
-    ret.emplace_back(make_multi_switch_program<SelfBoxTrade_Descriptor, SelfBoxTrade>());
-    ret.emplace_back(make_multi_switch_program<SelfTouchTrade_Descriptor, SelfTouchTrade>());
-
-    ret.emplace_back("---- Farming ----");
-    ret.emplace_back(make_single_switch_program<NuggetFarmerHighlands_Descriptor, NuggetFarmerHighlands>());
-    ret.emplace_back(make_single_switch_program<IngoBattleGrinder_Descriptor, IngoBattleGrinder>());
-    ret.emplace_back(make_single_switch_program<IngoMoveGrinder_Descriptor, IngoMoveGrinder>());
-    ret.emplace_back(make_single_switch_program<MagikarpMoveGrinder_Descriptor, MagikarpMoveGrinder>());
-    ret.emplace_back(make_single_switch_program<TenacityCandyFarmer_Descriptor, TenacityCandyFarmer>());
-    ret.emplace_back(make_single_switch_program<LeapGrinder_Descriptor, LeapGrinder>());
-
-    ret.emplace_back("---- Shiny Hunting ----");
-//    ret.emplace_back(make_single_switch_program<ShinyHuntLakeTrio_Descriptor, ShinyHuntLakeTrio>());
-    ret.emplace_back(make_single_switch_program<CrobatFinder_Descriptor, CrobatFinder>());
-    ret.emplace_back(make_single_switch_program<GalladeFinder_Descriptor, GalladeFinder>());
-    ret.emplace_back(make_single_switch_program<FroslassFinder_Descriptor, FroslassFinder>());
-    ret.emplace_back(make_single_switch_program<BurmyFinder_Descriptor, BurmyFinder>());
-    ret.emplace_back(make_single_switch_program<UnownFinder_Descriptor, UnownFinder>());
-    ret.emplace_back(make_single_switch_program<ShinyHuntFlagPin_Descriptor, ShinyHuntFlagPin>());
-    ret.emplace_back(make_single_switch_program<PostMMOSpawnReset_Descriptor, PostMMOSpawnReset>());
-    ret.emplace_back(make_single_switch_program<ShinyHuntCustomPath_Descriptor, ShinyHuntCustomPath>());
-    if (PreloadSettings::instance().DEVELOPER_MODE){
-        ret.emplace_back(make_single_switch_program<AutoMultiSpawn_Descriptor, AutoMultiSpawn>());
-    }
-
-    if (PreloadSettings::instance().DEVELOPER_MODE){
-        ret.emplace_back("---- Developer Tools ----");
-        ret.emplace_back(make_single_switch_program<MountDetectionTest_Descriptor, MountDetectionTest>());
-        ret.emplace_back(make_single_switch_program<OverworldWatcher_Descriptor, OverworldWatcher>());
-        ret.emplace_back(make_single_switch_program<SoundListener_Descriptor, SoundListener>());
-        ret.emplace_back(make_single_switch_program<FlagNavigationTest_Descriptor, FlagNavigationTest>());
-    }
-
-    return ret;
-}
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonLA/PokemonLA_Panels.h b/SerialPrograms/Source/PokemonLA/PokemonLA_Panels.h
deleted file mode 100644
index ead537a52b..0000000000
--- a/SerialPrograms/Source/PokemonLA/PokemonLA_Panels.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*  Pokemon Legends Arceus Panels
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonLA_Panels_H
-#define PokemonAutomation_PokemonLA_Panels_H
-
-#include "CommonFramework/Panels/PanelList.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-
-
-class PanelListFactory : public PanelListDescriptor{
-public:
-    PanelListFactory();
-    virtual std::vector<PanelEntry> make_panels() const;
-};
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonLA/PokemonLA_Settings.cpp b/SerialPrograms/Source/PokemonLA/PokemonLA_Settings.cpp
deleted file mode 100644
index 261bfab673..0000000000
--- a/SerialPrograms/Source/PokemonLA/PokemonLA_Settings.cpp
+++ /dev/null
@@ -1,170 +0,0 @@
-/*  Pokemon Legends Arceus Settings
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-#include "CommonFramework/Globals.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonLA_Settings.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-    using namespace Pokemon;
-
-
-
-GameSettings& GameSettings::instance(){
-    static GameSettings settings;
-    return settings;
-}
-GameSettings::GameSettings()
-    : BatchOption(LockWhileRunning::LOCKED)
-    , m_general("<font size=4><b>General Settings:</b></font>")
-    , POST_WARP_DELAY(
-        "<b>Post-Warp Delay:</b><br>After warping, wait this many seconds before continuing.",
-        LockWhileRunning::LOCKED,
-        1.0, 0, 100
-    )
-    , m_menu_navigation("<font size=4><b>Menu Navigation Timings:</b></font>")
-//    , OVERWORLD_TO_MENU_DELAY(
-//        "<b>Overworld to Menu Delay:</b><br>Delay to bring up the menu when pressing X in the overworld.",
-//        "250"
-//    )
-//    , MENU_TO_OVERWORLD_DELAY(
-//        "<b>Menu to Overworld Delay:</b><br>Delay to go from menu back to overworld.",
-//        "250"
-//    )
-    , GAME_TO_HOME_DELAY(
-        "<b>Game to Home Delay:</b><br>Delay from pressing home to entering the the Switch home menu.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "125"
-    )
-    , LOAD_REGION_TIMEOUT(
-        "<b>Load Region Timeout:</b><br>Wait at most this long to enter a region before giving up.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "30 * TICKS_PER_SECOND"
-    )
-    , m_start_game_timings("<font size=4><b>Start Game Timings:</b></font>")
-    , START_GAME_MASH(
-        "<b>1. Start Game Mash:</b><br>Mash A for this long to start the game.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "2 * TICKS_PER_SECOND"
-    )
-    , START_GAME_WAIT0(
-        "<b>2. Start Game Wait:</b><br>Wait this long for the game to load.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "40 * TICKS_PER_SECOND"
-    )
-    , ENTER_GAME_MASH(
-        "<b>3. Enter Game Mash:</b><br>Mash A for this long to enter the game.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "5 * TICKS_PER_SECOND"
-    )
-    , ENTER_GAME_WAIT(
-        "<b>4. Enter Game Wait:</b><br>Wait this long for the game to enter the overworld.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "15 * TICKS_PER_SECOND"
-    )
-    , m_advanced_options(
-        "<font size=4><b>Advanced Options:</b> You should not need to touch anything below here.</font>"
-    )
-    , SHINY_SOUND_THRESHOLD(
-        "<b>Shiny Sound Threshold:</b><br>Maximum error coefficient to trigger a shiny detection.",
-        LockWhileRunning::LOCKED,
-        0.87, 0, 1.0
-    )
-    , SHINY_SOUND_LOW_FREQUENCY(
-        "<b>Shiny Sound Low Frequency (Hz):</b><br>High pass filter frequency for shiny sound.",
-        LockWhileRunning::LOCKED,
-        5000, 0, 48000
-    )
-    , ALPHA_ROAR_THRESHOLD(
-        "<b>Alpha Roar Threshold:</b><br>Maximum error coefficient to trigger an alpha roar detection.",
-        LockWhileRunning::LOCKED,
-        0.65, 0, 1.0
-    )
-    , ALPHA_MUSIC_THRESHOLD(
-        "<b>Alpha Music Threshold:</b><br>Maximum error coefficient to trigger an alpha music detection.",
-        LockWhileRunning::LOCKED,
-        0.81, 0, 1.0
-    )
-    , ITEM_DROP_SOUND_THRESHOLD(
-        "<b>Item Drop Sound Threshold:</b><br>Maximum error coefficient to trigger an item drop sound detection.",
-        LockWhileRunning::LOCKED,
-        0.9, 0, 1.0
-    )
-    , ITEM_DROP_SOUND_LOW_FREQUENCY(
-        "<b>Item Drop Sound Low Frequency (Hz):</b><br>High pass filter frequency for item drop sound.",
-        LockWhileRunning::LOCKED,
-        5000, 0, 48000
-    )
-{
-    PA_ADD_STATIC(m_general);
-    PA_ADD_OPTION(POST_WARP_DELAY);
-
-    PA_ADD_STATIC(m_menu_navigation);
-//    PA_ADD_OPTION(OVERWORLD_TO_MENU_DELAY);
-//    PA_ADD_OPTION(MENU_TO_OVERWORLD_DELAY);
-    PA_ADD_OPTION(GAME_TO_HOME_DELAY);
-    PA_ADD_OPTION(LOAD_REGION_TIMEOUT);
-
-    PA_ADD_STATIC(m_start_game_timings);
-    PA_ADD_OPTION(START_GAME_MASH);
-    PA_ADD_OPTION(START_GAME_WAIT0);
-    PA_ADD_OPTION(ENTER_GAME_MASH);
-    PA_ADD_OPTION(ENTER_GAME_WAIT);
-
-    PA_ADD_STATIC(m_advanced_options);
-    PA_ADD_OPTION(SHINY_SOUND_THRESHOLD);
-    PA_ADD_OPTION(SHINY_SOUND_LOW_FREQUENCY);
-    PA_ADD_OPTION(ALPHA_ROAR_THRESHOLD);
-    PA_ADD_OPTION(ALPHA_MUSIC_THRESHOLD);
-    PA_ADD_OPTION(ITEM_DROP_SOUND_THRESHOLD);
-    PA_ADD_OPTION(ITEM_DROP_SOUND_LOW_FREQUENCY);
-}
-
-
-
-
-
-GameSettings_Descriptor::GameSettings_Descriptor()
-    : PanelDescriptor(
-        Color(),
-        "PokemonLA:GlobalSettings",
-        STRING_POKEMON + " LA", STRING_POKEMON + " Settings",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonLA/PokemonSettings.md",
-        "Global " + STRING_POKEMON + " Settings"
-    )
-{}
-
-
-
-GameSettingsPanel::GameSettingsPanel(const GameSettings_Descriptor& descriptor)
-    : SettingsPanelInstance(descriptor)
-    , settings(GameSettings::instance())
-{
-    PA_ADD_OPTION(settings);
-}
-
-
-
-
-
-}
-}
-}
-
-
-
-
-
-
diff --git a/SerialPrograms/Source/PokemonLA/PokemonLA_Settings.h b/SerialPrograms/Source/PokemonLA/PokemonLA_Settings.h
deleted file mode 100644
index b451a8f802..0000000000
--- a/SerialPrograms/Source/PokemonLA/PokemonLA_Settings.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*  Pokemon Legends Arceus Settings
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonLA_Settings_H
-#define PokemonAutomation_PokemonLA_Settings_H
-
-#include "Common/Cpp/Options/StaticTextOption.h"
-#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
-#include "Common/Cpp/Options/FloatingPointOption.h"
-#include "Common/Cpp/Options/TimeExpressionOption.h"
-#include "CommonFramework/Panels/SettingsPanel.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-
-class GameSettings : public BatchOption{
-    GameSettings();
-public:
-    static GameSettings& instance();
-
-    SectionDividerOption m_general;
-    FloatingPointOption POST_WARP_DELAY;
-
-    SectionDividerOption m_menu_navigation;
-//    TimeExpressionOption<uint16_t> OVERWORLD_TO_MENU_DELAY;
-//    TimeExpressionOption<uint16_t> MENU_TO_OVERWORLD_DELAY;
-    TimeExpressionOption<uint16_t> GAME_TO_HOME_DELAY;
-    TimeExpressionOption<uint16_t> LOAD_REGION_TIMEOUT;
-
-    SectionDividerOption m_start_game_timings;
-    TimeExpressionOption<uint16_t> START_GAME_MASH;
-    TimeExpressionOption<uint16_t> START_GAME_WAIT0;
-    TimeExpressionOption<uint16_t> ENTER_GAME_MASH;
-    TimeExpressionOption<uint16_t> ENTER_GAME_WAIT;
-
-    SectionDividerOption m_advanced_options;
-    FloatingPointOption SHINY_SOUND_THRESHOLD;
-    FloatingPointOption SHINY_SOUND_LOW_FREQUENCY;
-    FloatingPointOption ALPHA_ROAR_THRESHOLD;
-    FloatingPointOption ALPHA_MUSIC_THRESHOLD;
-    FloatingPointOption ITEM_DROP_SOUND_THRESHOLD;
-    FloatingPointOption ITEM_DROP_SOUND_LOW_FREQUENCY;
-};
-
-
-
-
-class GameSettings_Descriptor : public PanelDescriptor{
-public:
-    GameSettings_Descriptor();
-};
-
-
-class GameSettingsPanel : public SettingsPanelInstance{
-public:
-    GameSettingsPanel(const GameSettings_Descriptor& descriptor);
-private:
-    GameSettings& settings;
-};
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonLA/PokemonLA_TravelLocations.cpp b/SerialPrograms/Source/PokemonLA/PokemonLA_TravelLocations.cpp
deleted file mode 100644
index 910d224c76..0000000000
--- a/SerialPrograms/Source/PokemonLA/PokemonLA_TravelLocations.cpp
+++ /dev/null
@@ -1,195 +0,0 @@
-/*  Travel Locations
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <map>
-#include "Common/Cpp/Exceptions.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "PokemonLA/Inference/PokemonLA_MountDetector.h"
-#include "PokemonLA/Programs/PokemonLA_MountChange.h"
-#include "PokemonLA_TravelLocations.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-
-TravelLocation::TravelLocation(
-    const char* p_slug, const char* p_display,
-    MapRegion p_region,
-    uint8_t p_warp_slot, uint8_t p_warp_sub_slot,
-    std::function<void(ConsoleHandle& console, BotBaseContext& context)>&& p_post_arrival_maneuver,
-    bool p_reverse_sub_menu_direction
-)
-    : slug(p_slug)
-    , display(p_display)
-    , region(p_region)
-    , warp_slot(p_warp_slot)
-    , warp_sub_slot(p_warp_sub_slot)
-    , reverse_sub_menu_direction(p_reverse_sub_menu_direction)
-    , post_arrival_maneuver(std::move(p_post_arrival_maneuver))
-{}
-
-
-const TravelLocations& TravelLocations::instance(){
-    static const TravelLocations locations;
-    return locations;
-}
-const IntegerEnumDatabase& TravelLocations::database() const{
-    return m_database;
-}
-
-
-void TravelLocations::add_location(const TravelLocation& location){
-    if (!m_map.emplace(location.display, &location).second){
-        throw InternalProgramError(
-            nullptr, PA_CURRENT_FUNCTION,
-            std::string("Duplicate TravelLocation name: ") + location.display
-        );
-    }
-    m_list.emplace_back(&location);
-    m_database.add(m_list.size() - 1, location.slug, location.display, true);
-}
-TravelLocations::TravelLocations()
-    : Fieldlands_Fieldlands(
-        "fieldlands-fieldlands",
-        "Obsidian Fieldlands - Fieldlands Camp",
-        MapRegion::FIELDLANDS, 0, 0, nullptr
-    )
-    , Fieldlands_Heights(
-        "fieldlands-heights",
-        "Obsidian Fieldlands - Heights Camp",
-        MapRegion::FIELDLANDS, 1, 0, nullptr
-    )
-    , Fieldlands_Arena(
-        "fieldlands-arena",
-        "Obsidian Fieldlands - Grandtree Arena",
-        MapRegion::FIELDLANDS, 0, 2, nullptr
-    )
-
-    , Mirelands_Mirelands(
-        "mirelands-mirelands",
-        "Crimson Mirelands - Mirelands Camp",
-        MapRegion::MIRELANDS, 0, 0, nullptr
-    )
-    , Mirelands_Bogbound(
-        "mirelands-bogboung",
-        "Crimson Mirelands - Bogbound Camp",
-        MapRegion::MIRELANDS, 1, 0, nullptr
-    )
-    , Mirelands_DiamondSettlement(
-        "mirelands-settlement",
-        "Crimson Mirelands - Diamond Settlement",
-        MapRegion::MIRELANDS, 0, 2, nullptr
-    )
-    , Mirelands_Arena(
-        "mirelands-arena",
-        "Crimson Mirelands - Brava Arena",
-        MapRegion::MIRELANDS, 0, 2, nullptr, true
-    )
-
-    , Coastlands_Beachside(
-        "coastlands-beachside",
-        "Cobalt Coastlands - Beachside Camp",
-        MapRegion::COASTLANDS, 0, 0, nullptr
-    )
-    , Coastlands_Coastlands(
-        "coastlands-coastlands",
-        "Cobalt Coastlands - Coastlands Camp",
-        MapRegion::COASTLANDS, 1, 0, nullptr
-    )
-    , Coastlands_Arena(
-        "coastlands-arena",
-        "Cobalt Coastlands - Molten Arena",
-        MapRegion::COASTLANDS, 0, 2, nullptr
-    )
-    , Coastlands_Arena_NW(
-        "coastlands-arena-nw",
-        "Cobalt Coastlands - Molten Arena (NW of Volcano)",
-        MapRegion::COASTLANDS, 0, 2, [](ConsoleHandle& console, BotBaseContext& context){
-            change_mount(console, context, MountState::BRAVIARY_ON);
-            pbf_move_left_joystick(context, 160, 0, 160, 0);
-            pbf_mash_button(context, BUTTON_B, 4 * TICKS_PER_SECOND);
-        }
-    )
-
-    , Highlands_Highlands(
-        "highlands-highlands",
-        "Coronet Highlands - Highlands Camp",
-        MapRegion::HIGHLANDS, 0, 0, nullptr
-    )
-    , Highlands_Mountain(
-        "highlands-mountain",
-        "Coronet Highlands - Mountain Camp",
-        MapRegion::HIGHLANDS, 1, 0, nullptr
-    )
-    , Highlands_Summit(
-        "highlands-summit",
-        "Coronet Highlands - Summit Camp",
-        MapRegion::HIGHLANDS, 2, 0, nullptr
-    )
-    , Highlands_Arena(
-        "highlands-arena",
-        "Coronet Highlands - Moonview Arena",
-        MapRegion::HIGHLANDS, 0, 2, nullptr, true
-    )
-
-    , Icelands_Snowfields(
-        "icelands-icelands",
-        "Alabaster Icelands - Snowfields Camp",
-        MapRegion::ICELANDS, 0, 0, nullptr
-    )
-    , Icelands_Icepeak(
-        "icelands-icepeak",
-        "Alabaster Icelands - Icepeak Camp",
-        MapRegion::ICELANDS, 1, 0, nullptr
-    )
-    , Icelands_PearlSettlement(
-        "icelands-settlement",
-        "Alabaster Icelands - Pearl Settlement",
-        MapRegion::ICELANDS, 0, 2, nullptr
-    )
-    , Icelands_Arena(
-        "icelands-arena",
-        "Alabaster Icelands - Icepeak Arena",
-        MapRegion::ICELANDS, 0, 2, nullptr, true
-    )
-{
-    add_location(Fieldlands_Fieldlands);
-    add_location(Fieldlands_Heights);
-    add_location(Fieldlands_Arena);
-
-    add_location(Mirelands_Mirelands);
-    add_location(Mirelands_Bogbound);
-    add_location(Mirelands_DiamondSettlement);
-    add_location(Mirelands_Arena);
-
-    add_location(Coastlands_Beachside);
-    add_location(Coastlands_Coastlands);
-    add_location(Coastlands_Arena);
-    add_location(Coastlands_Arena_NW);
-
-    add_location(Highlands_Highlands);
-    add_location(Highlands_Mountain);
-    add_location(Highlands_Summit);
-    add_location(Highlands_Arena);
-
-    add_location(Icelands_Snowfields);
-    add_location(Icelands_Icepeak);
-    add_location(Icelands_PearlSettlement);
-    add_location(Icelands_Arena);
-}
-
-
-
-
-
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonLA/PokemonLA_TravelLocations.h b/SerialPrograms/Source/PokemonLA/PokemonLA_TravelLocations.h
deleted file mode 100644
index 461dadada0..0000000000
--- a/SerialPrograms/Source/PokemonLA/PokemonLA_TravelLocations.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/*  Travel Locations
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonLA_TravelLocations_H
-#define PokemonAutomation_PokemonLA_TravelLocations_H
-
-#include <functional>
-#include <string>
-#include <vector>
-#include <map>
-#include "Common/Cpp/EnumDatabase.h"
-#include "ClientSource/Connection/BotBase.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "PokemonLA_Locations.h"
-
-namespace PokemonAutomation{
-    class ConsoleHandle;
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-
-
-struct TravelLocation{
-    const char* slug;
-    const char* display;
-
-    MapRegion region;
-    uint8_t warp_slot; // which menu slot to warp from the full-Hisui map when leaving the village.
-    uint8_t warp_sub_slot; // which menu slot to warp the region map, if the location is a settlement or arena that requires an in-region warp.
-    bool reverse_sub_menu_direction; // whether it is faster to go upwards in the in-region warp map to reach the destination slot.
-
-    std::function<void(ConsoleHandle& console, BotBaseContext& context)> post_arrival_maneuver;
-
-    TravelLocation(
-        const char* p_slug, const char* p_display,
-        MapRegion p_region,
-        uint8_t p_warp_slot, uint8_t p_warp_sub_slot,
-        std::function<void(ConsoleHandle& console, BotBaseContext& context)>&& p_post_arrival_maneuver,
-        bool reverse_sub_menu_direction = false
-    );
-};
-
-
-class TravelLocations{
-public:
-    static const TravelLocations& instance();
-
-    const TravelLocation& operator[](size_t index) const{
-        return *m_list[index];
-    }
-    const IntegerEnumDatabase& database() const;
-
-
-public:
-    const TravelLocation Fieldlands_Fieldlands;
-    const TravelLocation Fieldlands_Heights;
-    const TravelLocation Fieldlands_Arena;
-
-    const TravelLocation Mirelands_Mirelands;
-    const TravelLocation Mirelands_Bogbound;
-    const TravelLocation Mirelands_DiamondSettlement;
-    const TravelLocation Mirelands_Arena;
-
-    const TravelLocation Coastlands_Beachside;
-    const TravelLocation Coastlands_Coastlands;
-    const TravelLocation Coastlands_Arena;
-    const TravelLocation Coastlands_Arena_NW;
-
-    const TravelLocation Highlands_Highlands;
-    const TravelLocation Highlands_Mountain;
-    const TravelLocation Highlands_Summit;
-    const TravelLocation Highlands_Arena;
-
-    const TravelLocation Icelands_Snowfields;
-    const TravelLocation Icelands_Icepeak;
-    const TravelLocation Icelands_PearlSettlement;
-    const TravelLocation Icelands_Arena;
-
-
-private:
-    TravelLocations();
-    void add_location(const TravelLocation& location);
-
-    std::vector<const TravelLocation*> m_list;
-    std::map<std::string, const TravelLocation*> m_map;
-
-    IntegerEnumDatabase m_database;
-};
-
-
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonLA/Programs/Farming/PokemonLA_IngoBattleGrinder.cpp b/SerialPrograms/Source/PokemonLA/Programs/Farming/PokemonLA_IngoBattleGrinder.cpp
deleted file mode 100644
index 27888f77ec..0000000000
--- a/SerialPrograms/Source/PokemonLA/Programs/Farming/PokemonLA_IngoBattleGrinder.cpp
+++ /dev/null
@@ -1,400 +0,0 @@
-/*  Ingo Battle Grinder
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <chrono>
-#include <iostream>
-#include "CommonFramework/Exceptions/OperationFailedException.h"
-#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
-#include "CommonFramework/Notifications/ProgramNotifications.h"
-#include "CommonFramework/Tools/ErrorDumper.h"
-#include "CommonFramework/Tools/StatsTracking.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonLA/Inference/Battles/PokemonLA_BattleMenuDetector.h"
-#include "PokemonLA/Inference/Battles/PokemonLA_BattlePokemonSwitchDetector.h"
-#include "PokemonLA/Programs/PokemonLA_BattleRoutines.h"
-#include "PokemonLA_IngoBattleGrinder.h"
-#include "PokemonLA/Inference/Objects/PokemonLA_ArcPhoneDetector.h"
-#include "PokemonLA/Inference/Objects/PokemonLA_DialogueEllipseDetector.h"
-#include "PokemonLA/Inference/PokemonLA_DialogDetector.h"
-
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-using namespace Pokemon;
-
-
-// #define DEBUG_INGO_BATTLE
-
-
-
-IngoBattleGrinder_Descriptor::IngoBattleGrinder_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonLA:IngoBattleGrinder",
-        STRING_POKEMON + " LA", "Ingo Battle Grinder",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonLA/IngoBattleGrinder.md",
-        "Attend Ingo's battles to grind exp and move related " + STRING_POKEDEX + " research tasks. Less effective than Ingo Move Grinder for " + STRING_POKEDEX + " research tasks but more effective for everything else.",
-        FeedbackType::REQUIRED,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-class IngoBattleGrinder_Descriptor::Stats : public StatsTracker{
-public:
-    Stats()
-        : battles(m_stats["Battles"])
-        , turns(m_stats["Turns"])
-        , lead_move_attempts(m_stats["Lead Move Attempts"])
-        , faint_switches(m_stats["Faint Switches"])
-        , errors(m_stats["Errors"])
-    {
-        m_display_order.emplace_back("Battles");
-        m_display_order.emplace_back("Turns");
-        m_display_order.emplace_back("Lead Move Attempts");
-        m_display_order.emplace_back("Faint Switches", true);
-        m_display_order.emplace_back("Errors", true);
-    }
-
-    std::atomic<uint64_t>& battles;
-    std::atomic<uint64_t>& turns;
-    std::atomic<uint64_t>& lead_move_attempts;
-    std::atomic<uint64_t>& faint_switches;
-    std::atomic<uint64_t>& errors;
-};
-std::unique_ptr<StatsTracker> IngoBattleGrinder_Descriptor::make_stats() const{
-    return std::unique_ptr<StatsTracker>(new Stats());
-}
-
-
-IngoBattleGrinder::IngoBattleGrinder()
-    : NOTIFICATION_STATUS("Status Update", true, false, std::chrono::seconds(3600))
-    , NOTIFICATIONS({
-        &NOTIFICATION_STATUS,
-        &NOTIFICATION_PROGRAM_FINISH,
-        &NOTIFICATION_ERROR_FATAL,
-    })
-{
-    PA_ADD_OPTION(OPPONENT);
-    PA_ADD_OPTION(POKEMON_ACTIONS);
-
-    PA_ADD_OPTION(NOTIFICATIONS);
-}
-
-
-
-bool IngoBattleGrinder::start_dialog(ConsoleHandle& console, BotBaseContext& context){
-    // First press A to start talking with Ingo.
-    pbf_press_button(context, BUTTON_A, 20, 150);
-    context.wait_for_all_requests();
-
-    {
-        ButtonDetector button0(console, console, ButtonType::ButtonA, {0.50, 0.408, 0.40, 0.042}, std::chrono::milliseconds(100), true);
-        ButtonDetector button1(console, console, ButtonType::ButtonA, {0.50, 0.450, 0.40, 0.042}, std::chrono::milliseconds(100), true);
-        ButtonDetector button2(console, console, ButtonType::ButtonA, {0.50, 0.492, 0.40, 0.042}, std::chrono::milliseconds(100), true);
-        int ret = run_until(
-            console, context,
-            [&](BotBaseContext& context){
-                for (size_t c = 0; c < 10; c++){
-                    pbf_press_button(context, BUTTON_A, 20, 150);
-                }
-            },
-            {
-                {button0},
-                {button1},
-                {button2},
-            }
-        );
-        switch (ret){
-        case 0:
-            //  Version 1.1 without new options unlocked.
-            return false;
-        case 1:
-            //  Version 1.0
-            return true;
-        case 2:
-            //  Version 1.1 with new options unlocked.
-            break;
-        default:
-            throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, console,
-                "Unable to detect options after 10 A presses.",
-                true
-            );
-        }
-    }
-
-    pbf_press_button(context, BUTTON_A, 20, 150);
-    context.wait_for_all_requests();
-
-    ButtonDetector button2(console, console, ButtonType::ButtonA, {0.50, 0.350, 0.40, 0.400}, std::chrono::milliseconds(100), true);
-    int ret = run_until(
-        console, context,
-        [&](BotBaseContext& context){
-            for (size_t c = 0; c < 5; c++){
-                pbf_press_button(context, BUTTON_A, 20, 150);
-            }
-        },
-        {{button2}}
-    );
-    switch (ret){
-    case 0:
-        return false;
-    default:
-        throw OperationFailedException(
-            ErrorReport::SEND_ERROR_REPORT, console,
-            "Unable to find opponent list options after 5 A presses.",
-            true
-        );
-    }
-}
-
-
-bool IngoBattleGrinder::run_iteration(SingleSwitchProgramEnvironment& env, BotBaseContext& context, std::map<size_t, size_t>& pokemon_move_attempts){
-    IngoBattleGrinder_Descriptor::Stats& stats = env.current_stats<IngoBattleGrinder_Descriptor::Stats>();
-
-    env.console.log("Starting battle...");
-
-    // Talk to Ingo to start conversation and select regular battles:
-    // The dialogues are different between version 10 (the vanilla version) and later versions.
-    bool version_10 = start_dialog(env.console, context);
-    env.log(std::string("Detected current version: ") + (version_10 ? "1.0" : "1.2"));
-
-    IngoOpponentMenuLocation menu_location = version_10
-        ? INGO_OPPONENT_MENU_LOCATIONS_V10[OPPONENT.current_value()]
-        : INGO_OPPONENT_MENU_LOCATIONS_V12[OPPONENT.current_value()];
-
-    // Choose which opponent
-    if (menu_location.page < 0){
-        throw UserSetupError(env.console, "Opponent doesn't exist in this version of the game.");
-    }
-
-    //  Move to page.
-    for (int8_t c = 0; c < menu_location.page; c++){
-        pbf_press_dpad(context, DPAD_UP, 10, 60);
-        pbf_press_dpad(context, DPAD_UP, 10, 60);
-        pbf_press_button(context, BUTTON_A, 10, 100);
-    }
-
-    //  Move to slot.
-    for (int8_t c = 0; c < menu_location.index; c++){
-        pbf_press_dpad(context, DPAD_DOWN, 10, 60);
-    }
-
-    // Press the button to select the opponent
-    pbf_press_button(context, BUTTON_A, 10, 115);
-    pbf_wait(context, 1 * TICKS_PER_SECOND);
-    context.wait_for_all_requests();
-
-    env.log("Finish selecting the opponent. Battle should start now.");
-
-    // Which move (0, 1, 2 or 3) to use in next turn.
-    size_t cur_move = 0;
-    // The battle-order index of the current pokemon on the battle field.
-    // This index starts at 0. Whenever a new pokemon is sent to battle, the index adds by 1.
-    // It is equal to how many pokemon have left the battle.
-    // Note: battle order is different than party order, which is the order of the pokemon in the party.
-    // When the player selects a pokemon in the lower right corner of the screen in the overworld using "L"
-    // and "R" buttons, this pokemon will be sent to the battle first, with battle-order index of 0. But this
-    // pokemon can be in any place in the party list, therefore can have any party-order index.
-    size_t cur_pokemon = 0;
-    // How many turns have passed for the current pokemon in this battle.
-    // This turn count is reset to zero when a new pokemon is sent to battle.
-    size_t num_turns = 0;
-    // Used to skip fainted pokemon in the party when switching a pokemon
-    // This is the party-order index of the pokemon to switch to.
-    // The index is the index in the pokemon party list.
-    size_t next_pokemon_to_switch_to = 0;
-
-    // Whether this is the last battle. After the last battle ends, stops the program.
-    bool last_battle = false;
-
-    // Switch pokemon and update the battle states:
-    auto switch_cur_pokemon = [&](){
-        cur_move = 0;
-        num_turns = 0;
-        next_pokemon_to_switch_to = switch_pokemon(env.console, context, next_pokemon_to_switch_to);
-        next_pokemon_to_switch_to++;
-        cur_pokemon++;
-    };
-
-    while(true){
-        const bool stop_on_detected = true;
-        BattleMenuDetector battle_menu_detector(env.console, env.console, stop_on_detected);
-        // dialogue ellipse appears on a semi-transparent dialog box if you win the fight.
-        DialogueEllipseDetector dialogue_ellipse_detector(env.console, env.console, std::chrono::milliseconds(200), stop_on_detected);
-        BattlePokemonSwitchDetector pokemon_switch_detector(env.console, env.console, stop_on_detected);
-        // normal dialogue appears if you lose the fight.
-        NormalDialogDetector normal_dialogue_detector(env.console, env.console, stop_on_detected);
-        ArcPhoneDetector arc_phone_detector(env.console, env.console, std::chrono::milliseconds(200), stop_on_detected);
-        int ret = wait_until(
-            env.console, context, std::chrono::minutes(2),
-            {
-                {battle_menu_detector},
-                {dialogue_ellipse_detector},
-                {normal_dialogue_detector},
-                {pokemon_switch_detector},
-                {arc_phone_detector},
-            }
-        );
-        if (ret < 0){
-            env.console.log("Error: Failed to find battle menu after 2 minutes.");
-            dump_image(env.logger(), env.program_info(), "BattleMenuNotFound", env.console.video().snapshot());
-            throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, env.console,
-                "Failed to find battle menu after 2 minutes.",
-                true
-            );
-        }
-
-        if (ret == 0){
-            env.console.log("Our turn!", COLOR_BLUE);
-            stats.turns++;
-
-            // User may want to switch the pokemon after some turns, to get more exp, or prevent if from
-            // fainting.
-            if (POKEMON_ACTIONS.switch_pokemon(cur_pokemon, num_turns)){
-                env.console.log("Switch pokemon");
-
-                // Go to the switching pokemon screen:
-                pbf_press_dpad(context, DPAD_DOWN, 20, 100);
-
-                switch_cur_pokemon();
-            }
-            else{
-                // Choose move to use!
-                if (cur_pokemon == 0){
-                    // We collect the stat of move attempts of the first pokemon.
-                    stats.lead_move_attempts++;
-                }
-
-                // Press A to select moves
-                pbf_press_button(context, BUTTON_A, 10, 125);
-                context.wait_for_all_requests();
-
-                // Use move. 
-                // Use while loop to go to next move if the current move has no PP.
-                // No PP is detected by checking whether the pixels on the selected move menu item is still the same
-                // after about one second.
-                // Note: if the pokemon has no PP on any moves and results to Struggle, the fight animation should
-                // ensure we won't get the same pixels on the area that the move menu item would appear, so we won't
-                // get stuck in this while loop.
-                MoveStyle style = POKEMON_ACTIONS.get_style(cur_pokemon, cur_move);
-                const bool check_move_success = true;
-                while (use_move(env.console, context, cur_pokemon, cur_move, style, check_move_success) == false){
-                    // We are still on the move selection screen. No PP.
-                    if (cur_move == 3){
-                        // Pokemon has zero PP on all moves. This should not happen as it will just use
-                        // Struggle.
-                        env.console.log("No PP on all moves. Abort program.", COLOR_RED);
-                        throw OperationFailedException(
-                            ErrorReport::SEND_ERROR_REPORT, env.console,
-                            "No PP on all moves.",
-                            true
-                        );
-                    }
-                    
-                    // Go to the next move.
-                    pbf_press_dpad(context, DPAD_DOWN, 20, 100);
-                    // env.console.context().wait_for_all_requests();
-                    cur_move++;
-                    env.console.log("No PP. Use next move, " + std::to_string(cur_move), COLOR_RED);
-                    
-                    style = POKEMON_ACTIONS.get_style(cur_pokemon, cur_move);
-                }
-
-                num_turns++;
-                pokemon_move_attempts[cur_pokemon]++;
-                // Check whether to stop battle
-                if (last_battle == false){
-                    last_battle = POKEMON_ACTIONS.stop_battle(cur_pokemon, pokemon_move_attempts[cur_pokemon]);
-                    if (last_battle){
-                        env.log("Target move attempts reached: " + std::to_string(pokemon_move_attempts[cur_pokemon]) +
-                            ". Stop program after this battle finishes.");
-                    }
-                }
-            }
-
-            env.update_stats();
-        }
-        else if (ret == 1){
-            env.console.log("Transparent dialogue box.");
-            
-            pbf_press_button(context, BUTTON_B, 20, 100);
-            context.wait_for_all_requests();
-        } else if(ret == 2){
-            env.console.log("Normal dialogue box.");
-
-            pbf_press_button(context, BUTTON_B, 20, 100);
-            context.wait_for_all_requests();
-        }
-        else if (ret == 3){
-            env.console.log("Pokemon fainted.", COLOR_RED);
-            stats.faint_switches++;
-            env.update_stats();
-
-            switch_cur_pokemon();
-        }
-        else{ // ret is 4
-            env.console.log("Battle finished.");
-            break;
-        }
-    }
-
-    stats.battles++;
-    env.update_stats();
-
-    return last_battle;
-}
-
-
-
-void IngoBattleGrinder::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    IngoBattleGrinder_Descriptor::Stats& stats = env.current_stats<IngoBattleGrinder_Descriptor::Stats>();
-
-    //  Connect the controller.
-    pbf_press_button(context, BUTTON_LCLICK, 5, 5);
-
-    // {
-    //     // ImageRGB32 image("./scripts/LA_switch_pokemon_Kuro.png");
-    //     ImageRGB32 image("./PLA_test_data/ingoBattle/broken_dialogue_detector.png");
-    //     const bool stop_on_detected = true;
-    //     NormalDialogDetector detector(env.console, env.console, stop_on_detected);
-    //     bool detected = detector.process_frame(image, current_time());
-    //     std::cout << "detector " << detected << std::endl;
-    //     return;
-    // }
-
-    // pokemon index -> number of move attemps made so far
-    std::map<size_t, size_t> pokemon_move_attempts;
-
-    while (true){
-        env.update_stats();
-        send_program_status_notification(env, NOTIFICATION_STATUS);
-        try{
-            if (run_iteration(env, context, pokemon_move_attempts)){
-                break;
-            }
-        }catch (OperationFailedException&){
-            stats.errors++;
-            throw;
-        }
-    }
-
-    env.update_stats();
-    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
-}
-
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonLA/Programs/Farming/PokemonLA_IngoBattleGrinder.h b/SerialPrograms/Source/PokemonLA/Programs/Farming/PokemonLA_IngoBattleGrinder.h
deleted file mode 100644
index 6435ee7801..0000000000
--- a/SerialPrograms/Source/PokemonLA/Programs/Farming/PokemonLA_IngoBattleGrinder.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*  Ingo Battle Grinder
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonLA_IngoBattleGrinder_H
-#define PokemonAutomation_PokemonLA_IngoBattleGrinder_H
-
-#include "CommonFramework/Notifications/EventNotificationsTable.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-#include "PokemonLA/Options/PokemonLA_IngoOpponent.h"
-#include "PokemonLA/Options/PokemonLA_BattlePokemonActionTable.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-
-
-
-
-class IngoBattleGrinder_Descriptor : public SingleSwitchProgramDescriptor{
-public:
-    IngoBattleGrinder_Descriptor();
-
-    class Stats;
-    virtual std::unique_ptr<StatsTracker> make_stats() const override;
-};
-
-class IngoBattleGrinder : public SingleSwitchProgramInstance{
-public:
-    IngoBattleGrinder();
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-    bool run_iteration(SingleSwitchProgramEnvironment& env, BotBaseContext& context, std::map<size_t, size_t>& pokemon_move_attempts);
-
-    //  Returns true if version 1.0.
-    bool start_dialog(ConsoleHandle& console, BotBaseContext& context);
-
-private:
-    IngoOpponentOption OPPONENT;
-    BattlePokemonActionTable POKEMON_ACTIONS;
-
-    EventNotificationOption NOTIFICATION_STATUS;
-    EventNotificationsOption NOTIFICATIONS;
-};
-
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonLA/Programs/Farming/PokemonLA_IngoMoveGrinder.cpp b/SerialPrograms/Source/PokemonLA/Programs/Farming/PokemonLA_IngoMoveGrinder.cpp
deleted file mode 100644
index 2832b70d82..0000000000
--- a/SerialPrograms/Source/PokemonLA/Programs/Farming/PokemonLA_IngoMoveGrinder.cpp
+++ /dev/null
@@ -1,438 +0,0 @@
-/*  Ingo Move Grinder
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/Exceptions/OperationFailedException.h"
-#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
-#include "CommonFramework/Tools/ErrorDumper.h"
-#include "CommonFramework/Tools/StatsTracking.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
-#include "CommonFramework/Notifications/ProgramNotifications.h"
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonLA/Inference/Battles/PokemonLA_BattleMenuDetector.h"
-#include "PokemonLA/Inference/Battles/PokemonLA_BattlePokemonSwitchDetector.h"
-#include "PokemonLA/Inference/Objects/PokemonLA_ButtonDetector.h"
-#include "PokemonLA/Inference/Objects/PokemonLA_DialogueEllipseDetector.h"
-#include "PokemonLA/Inference/PokemonLA_DialogDetector.h"
-#include "PokemonLA/Programs/PokemonLA_BattleRoutines.h"
-#include "PokemonLA_IngoMoveGrinder.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-using namespace Pokemon;
-
-
-
-
-IngoMoveGrinder_Descriptor::IngoMoveGrinder_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonLA:IngoMoveGrinder",
-        STRING_POKEMON + " LA", "Ingo Move Grinder",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonLA/IngoMoveGrinder.md",
-        "Attend Ingo's battles to grind move related " + STRING_POKEDEX + " research tasks. More effective than Ingo Battle Grinder for " + STRING_POKEDEX + " research tasks but less effective for everything else.",
-        FeedbackType::REQUIRED,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-class IngoMoveGrinder_Descriptor::Stats : public StatsTracker{
-public:
-    Stats()
-        : battles(m_stats["Battles"])
-        , turns(m_stats["Turns"])
-        , move_attempts(m_stats["Move Attempts"])
-        , faint_switches(m_stats["Faint Switches"])
-        , errors(m_stats["Errors"])
-    {
-        m_display_order.emplace_back("Battles");
-        m_display_order.emplace_back("Turns");
-        m_display_order.emplace_back("Move Attempts");
-        m_display_order.emplace_back("Faint Switches", true);
-        m_display_order.emplace_back("Errors", true);
-    }
-
-    std::atomic<uint64_t>& battles;
-    std::atomic<uint64_t>& turns;
-    std::atomic<uint64_t>& move_attempts;
-    std::atomic<uint64_t>& faint_switches;
-    std::atomic<uint64_t>& errors;
-};
-std::unique_ptr<StatsTracker> IngoMoveGrinder_Descriptor::make_stats() const{
-    return std::unique_ptr<StatsTracker>(new Stats());
-}
-
-
-IngoMoveGrinder::IngoMoveGrinder()
-    : NOTIFICATION_STATUS("Status Update", true, false, std::chrono::seconds(3600))
-    , NOTIFICATIONS({
-        &NOTIFICATION_STATUS,
-        &NOTIFICATION_PROGRAM_FINISH,
-        &NOTIFICATION_ERROR_FATAL,
-    })
-{
-    PA_ADD_OPTION(OPPONENT);
-    PA_ADD_OPTION(POKEMON_ACTIONS);
-
-    PA_ADD_OPTION(NOTIFICATIONS);
-}
-
-
-bool IngoMoveGrinder::start_dialog(ConsoleHandle& console, BotBaseContext& context){
-    // First press A to start talking with Ingo.
-    pbf_press_button(context, BUTTON_A, 20, 150);
-    context.wait_for_all_requests();
-
-    {
-        ButtonDetector button0(console, console, ButtonType::ButtonA, {0.50, 0.408, 0.40, 0.042}, std::chrono::milliseconds(100), true);
-        ButtonDetector button1(console, console, ButtonType::ButtonA, {0.50, 0.450, 0.40, 0.042}, std::chrono::milliseconds(100), true);
-        ButtonDetector button2(console, console, ButtonType::ButtonA, {0.50, 0.492, 0.40, 0.042}, std::chrono::milliseconds(100), true);
-        int ret = run_until(
-            console, context,
-            [&](BotBaseContext& context){
-                for (size_t c = 0; c < 10; c++){
-                    pbf_press_button(context, BUTTON_A, 20, 150);
-                }
-            },
-            {
-                {button0},
-                {button1},
-                {button2},
-            }
-        );
-        switch (ret){
-        case 0:
-            //  Version 1.1 without new options unlocked.
-            return false;
-        case 1:
-            //  Version 1.0
-            return true;
-        case 2:
-            //  Version 1.1 with new options unlocked.
-            break;
-        default:
-            throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, console,
-                "Unable to detect options after 10 A presses.",
-                true
-            );
-        }
-    }
-
-    pbf_press_button(context, BUTTON_A, 20, 150);
-    context.wait_for_all_requests();
-
-    ButtonDetector button2(console, console, ButtonType::ButtonA, {0.50, 0.350, 0.40, 0.400}, std::chrono::milliseconds(100), true);
-    int ret = run_until(
-        console, context,
-        [&](BotBaseContext& context){
-            for (size_t c = 0; c < 5; c++){
-                pbf_press_button(context, BUTTON_A, 20, 150);
-            }
-        },
-        {{button2}}
-    );
-    switch (ret){
-    case 0:
-        return false;
-    default:
-        throw OperationFailedException(
-            ErrorReport::SEND_ERROR_REPORT, console,
-            "Unable to find opponent list options after 5 A presses.",
-            true
-        );
-    }
-}
-
-bool IngoMoveGrinder::run_iteration(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    IngoMoveGrinder_Descriptor::Stats& stats = env.current_stats<IngoMoveGrinder_Descriptor::Stats>();
-
-    env.console.log("Starting battle...");
-
-    cur_pokemon = 0;
-    cur_move = 0;
-
-    // Talk to Ingo to start conversation and select regular battles:
-    // The dialogues are different between version 10 (the vanilla version) and later versions.
-    bool version_10 = start_dialog(env.console, context);
-    env.log(std::string("Detected current version: ") + (version_10 ? "1.0" : "1.2"));
-
-    IngoOpponentMenuLocation menu_location = version_10
-        ? INGO_OPPONENT_MENU_LOCATIONS_V10[OPPONENT.current_value()]
-        : INGO_OPPONENT_MENU_LOCATIONS_V12[OPPONENT.current_value()];
-
-    // Choose which opponent
-    if (menu_location.page < 0){
-        throw UserSetupError(env.console, "Opponent doesn't exist in this version of the game.");
-    }
-
-    //  Move to page.
-    for (int8_t c = 0; c < menu_location.page; c++){
-        pbf_press_dpad(context, DPAD_UP, 10, 60);
-        pbf_press_dpad(context, DPAD_UP, 10, 60);
-        pbf_press_button(context, BUTTON_A, 10, 100);
-    }
-
-    //  Move to slot.
-    for (int8_t c = 0; c < menu_location.index; c++){
-        pbf_press_dpad(context, DPAD_DOWN, 10, 60);
-    }
-
-    // Press the button to select the opponent
-    pbf_press_button(context, BUTTON_A, 10, 115);
-    pbf_wait(context, 1 * TICKS_PER_SECOND);
-    context.wait_for_all_requests();
-
-    env.log("Finish selecting the opponent. Battle should start now.");
-
-    while(true){
-        const bool stop_on_detected = true;
-        BattleMenuDetector battle_menu_detector(env.console, env.console, stop_on_detected);
-        // dialogue ellipse appears on a semi-transparent dialog box if you win the fight.
-        DialogueEllipseDetector dialogue_ellipse_detector(env.console, env.console, std::chrono::milliseconds(200), stop_on_detected);
-        BattlePokemonSwitchDetector pokemon_switch_detector(env.console, env.console, stop_on_detected);
-        // normal dialogue appears if you lose the fight.
-        NormalDialogDetector normal_dialogue_detector(env.console, env.console, stop_on_detected);
-        ArcPhoneDetector arc_phone_detector(env.console, env.console, std::chrono::milliseconds(200), stop_on_detected);
-        int ret = wait_until(
-            env.console, context, std::chrono::minutes(2),
-            {
-                {battle_menu_detector},
-                {dialogue_ellipse_detector},
-                {normal_dialogue_detector},
-                {pokemon_switch_detector},
-                {arc_phone_detector},
-            }
-        );
-        if (ret < 0){
-            env.console.log("Error: Failed to find battle menu after 2 minutes.");
-            dump_image(env.logger(), env.program_info(), "BattleMenuNotFound", env.console.video().snapshot());
-            throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, env.console,
-                "Failed to find battle menu after 2 minutes.",
-                true
-            );
-        }
-
-        if (ret == 0){
-            env.console.log("Our turn!", COLOR_BLUE);
-
-            Move move = POKEMON_ACTIONS.get_move(cur_pokemon, cur_move);
-            if (move_issued[cur_pokemon][cur_move] < move.attempts)
-            {
-                // Press A to select moves
-                pbf_press_button(context, BUTTON_A, 10, 125);
-                context.wait_for_all_requests();
-                const bool check_move_success = true;
-                if (use_move(env.console, context, cur_pokemon, cur_move, move.style, check_move_success)) {
-                    stats.turns++;
-                    if (cur_pokemon < 4)
-                    {
-                        stats.move_attempts++;
-                        move_issued[cur_pokemon][cur_move]++;
-                        env.console.log("Successfully attempted a new move " + debug_current_info() + debug_move_attempts_info());
-                    }
-                    context.wait_for_all_requests();
-                }
-                else
-                {
-                    pbf_press_button(context, BUTTON_B, 20, 2 * TICKS_PER_SECOND);
-                    env.console.log("No PP left for pokemon " + std::to_string(cur_pokemon) + " and move " + std::to_string(cur_move));
-                    if (get_next_move_to_switch_to() == 4)
-                    {
-                        // Press down to select pokemons
-                        pbf_press_dpad(context, DPAD_DOWN, 20, 100);
-                        go_to_next_pokemon(env, context);
-
-                    }
-                    else
-                    {
-                        go_to_next_move(env, context);
-                    }
-                }
-            }
-            else
-            {
-                env.console.log("Done grinding for pokemon " + std::to_string(cur_pokemon) + " and move " + std::to_string(cur_move));
-                if (get_next_move_to_switch_to() == 4)
-                {
-                    // Press down to select pokemons
-                    pbf_press_dpad(context, DPAD_DOWN, 20, 100);
-                    go_to_next_pokemon(env, context);
-
-                }
-                else
-                {
-                    go_to_next_move(env, context);
-                }
-            }
-
-            env.update_stats();
-        }
-        else if (ret == 1){
-            env.console.log("Transparent dialogue box.");
-            
-            pbf_press_button(context, BUTTON_B, 20, 100);
-            context.wait_for_all_requests();
-        } else if(ret == 2){
-            env.console.log("Normal dialogue box.");
-
-            pbf_press_button(context, BUTTON_B, 20, 100);
-            context.wait_for_all_requests();
-        }
-        else if (ret == 3){
-            env.console.log("Pokemon fainted.", COLOR_RED);
-            stats.faint_switches++;
-            env.update_stats();
-
-            go_to_next_pokemon(env, context);
-        }
-        else{ // ret is 4
-            env.console.log("Battle finished.");
-            break;
-        }
-    }
-
-    stats.battles++;
-    env.update_stats();
-    for (size_t i = 0; i < 4; ++i)
-    {
-        for (size_t j = 0; j < 4; ++j)
-        {
-            if (move_issued[i][j] < POKEMON_ACTIONS.get_move(i, j).attempts)
-            {
-                env.console.log("Grinding will continue." + debug_move_attempts_info());
-                return false;
-            }
-        }
-    }
-    env.console.log("Grinding will stop." + debug_move_attempts_info());
-    return true;
-}
-
-
-
-void IngoMoveGrinder::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    IngoMoveGrinder_Descriptor::Stats& stats = env.current_stats<IngoMoveGrinder_Descriptor::Stats>();
-
-    //  Connect the controller.
-    pbf_press_button(context, BUTTON_LCLICK, 5, 5);
-    for (auto& row : move_issued)
-    {
-        for (auto& elem : row)
-        {
-            elem = 0;
-        }
-    }
-
-    while (true){
-        env.update_stats();
-        send_program_status_notification(env, NOTIFICATION_STATUS);
-        try{
-            if (run_iteration(env, context)) {
-                break;
-            }
-        }catch (OperationFailedException&){
-            stats.errors++;
-            throw;
-        }
-    }
-
-    env.update_stats();
-    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
-}
-
-void IngoMoveGrinder::go_to_next_move(SingleSwitchProgramEnvironment& env, BotBaseContext& context)
-{
-    env.console.log("Switch to next move " + debug_current_info() + debug_move_attempts_info());
-    pbf_press_button(context, BUTTON_A, 10, 125);
-    size_t next_move = get_next_move_to_switch_to();
-    for (size_t i = 0; i < next_move - cur_move; ++i)
-    {
-        pbf_press_dpad(context, DPAD_DOWN, 20, 100);
-    }
-    pbf_press_button(context, BUTTON_B, 10, 125);
-    cur_move = next_move;
-    env.console.log("Switched to next move " + debug_current_info() + debug_move_attempts_info());
-    context.wait_for_all_requests();
-}
-
-void IngoMoveGrinder::go_to_next_pokemon(SingleSwitchProgramEnvironment& env, BotBaseContext& context)
-{
-    if (cur_pokemon == 4)
-    {
-        throw OperationFailedException(
-            ErrorReport::SEND_ERROR_REPORT, env.console,
-            "Abort program. Your 4 first pokemons are done grinding moves, dead or without PP. "
-            "Your fifth pokemon (Arceus) died so no other choice than stopping the program.",
-            true
-        );
-    }
-    env.console.log("Switch to next pokemon " + debug_current_info() + debug_move_attempts_info());
-    cur_pokemon = get_next_pokemon_to_switch_to();
-    cur_move = 0;
-    switch_pokemon(env.console, context, cur_pokemon);
-    env.console.log("Switched to next pokemon " + debug_current_info() + debug_move_attempts_info());
-    context.wait_for_all_requests();
-}
-
-size_t IngoMoveGrinder::get_next_move_to_switch_to() const
-{
-    for (size_t i = cur_move + 1; i < 4; ++i)
-    {
-        if (move_issued[cur_pokemon][i] < POKEMON_ACTIONS.get_move(cur_pokemon, i).attempts)
-        {
-            return i;
-        }
-    }
-    // Means switch to next pokemon
-    return 4;
-}
-
-size_t IngoMoveGrinder::get_next_pokemon_to_switch_to() const
-{
-    for (size_t i = cur_pokemon + 1; i < 4; ++i)
-    {
-        for (size_t j = 0; j < 4; ++j)
-        {
-            if (move_issued[i][j] < POKEMON_ACTIONS.get_move(i, j).attempts)
-            {
-                return i;
-            }
-        }
-    }
-    // Means switch to arceus and spam moves to end the battle
-    return 4;
-}
-
-std::string IngoMoveGrinder::debug_current_info() const
-{
-    return "(cur_pokemon : " + std::to_string(cur_pokemon) + ", cur_move : " + std::to_string(cur_move) + ")";
-}
-
-std::string IngoMoveGrinder::debug_move_attempts_info() const
-{
-    std::string debug = "\n";
-    for (size_t i = 0; i < 4; ++i){
-        for (size_t j = 0; j < 4; ++j){
-            Move move = POKEMON_ACTIONS.get_move(i, j);
-            if (move.attempts != 0)
-            {
-                debug += "(pokemon : " + std::to_string(i) + ", move : " + std::to_string(j) + " did " + std::to_string(move_issued[i][j]) + " out of " + std::to_string(move.attempts) + ")\n";
-            }
-        }
-    }
-    return debug;
-}
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonLA/Programs/Farming/PokemonLA_IngoMoveGrinder.h b/SerialPrograms/Source/PokemonLA/Programs/Farming/PokemonLA_IngoMoveGrinder.h
deleted file mode 100644
index f68a29dcac..0000000000
--- a/SerialPrograms/Source/PokemonLA/Programs/Farming/PokemonLA_IngoMoveGrinder.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*  Ingo Move Grinder
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonLA_IngoMoveGrinder_H
-#define PokemonAutomation_PokemonLA_IngoMoveGrinder_H
-
-#include <array>
-#include "CommonFramework/Notifications/EventNotificationsTable.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-#include "PokemonLA/Options/PokemonLA_IngoOpponent.h"
-#include "PokemonLA/Options/PokemonLA_BattlePokemonActionTable.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-
-
-class IngoMoveGrinder_Descriptor : public SingleSwitchProgramDescriptor{
-public:
-    IngoMoveGrinder_Descriptor();
-
-    class Stats;
-    virtual std::unique_ptr<StatsTracker> make_stats() const override;
-};
-
-class IngoMoveGrinder : public SingleSwitchProgramInstance{
-public:
-    IngoMoveGrinder();
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-    bool run_iteration(SingleSwitchProgramEnvironment& env, BotBaseContext& context);
-
-    //  Returns true if version 1.0.
-    bool start_dialog(ConsoleHandle& console, BotBaseContext& context);
-
-private:
-    void go_to_next_move(SingleSwitchProgramEnvironment& env, BotBaseContext& context);
-    void go_to_next_pokemon(SingleSwitchProgramEnvironment& env, BotBaseContext& context);
-    size_t get_next_move_to_switch_to() const;
-    size_t get_next_pokemon_to_switch_to() const;
-    std::string debug_current_info() const;
-    std::string debug_move_attempts_info() const;
-
-    IngoOpponentOption OPPONENT;
-    MoveGrinderActionTable POKEMON_ACTIONS;
-
-    EventNotificationOption NOTIFICATION_STATUS;
-    EventNotificationsOption NOTIFICATIONS;
-
-    size_t cur_pokemon = 0;
-    size_t cur_move = 0;
-    std::array<std::array<uint16_t, 4>, 5> move_issued{};
-};
-
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonLA/Programs/Farming/PokemonLA_LeapGrinder.cpp b/SerialPrograms/Source/PokemonLA/Programs/Farming/PokemonLA_LeapGrinder.cpp
deleted file mode 100644
index fd5f4fad6f..0000000000
--- a/SerialPrograms/Source/PokemonLA/Programs/Farming/PokemonLA_LeapGrinder.cpp
+++ /dev/null
@@ -1,295 +0,0 @@
-/*  Leap Grinder
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "ClientSource/Connection/BotBase.h"
-#include "Common/Cpp/PrettyPrint.h"
-#include "CommonFramework/Exceptions/OperationFailedException.h"
-#include "CommonFramework/Notifications/ProgramNotifications.h"
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "CommonFramework/Tools/StatsTracking.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "NintendoSwitch/NintendoSwitch_Settings.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonLA/PokemonLA_Settings.h"
-#include "PokemonLA/Resources/PokemonLA_NameDatabase.h"
-#include "PokemonLA/Inference/Sounds/PokemonLA_ShinySoundDetector.h"
-#include "PokemonLA/Inference/PokemonLA_OverworldDetector.h"
-#include "PokemonLA/Programs/PokemonLA_GameEntry.h"
-#include "PokemonLA/Programs/Farming/PokemonLA_LeapGrinder.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-    using namespace Pokemon;
-
-
-LeapGrinder_Descriptor::LeapGrinder_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonLA:Leap Grinder",
-        STRING_POKEMON + " LA", "Leap Grinder",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonLA/LeapGrinder.md",
-        "Shake trees and ores to grind tasks",
-        FeedbackType::REQUIRED,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-class LeapGrinder_Descriptor::Stats : public StatsTracker{
-public:
-    Stats()
-        : attempts(m_stats["Attempts"])
-        , errors(m_stats["Errors"])
-        , leaps(m_stats["Leaps"])
-        , found(m_stats["Found"])
-        , enroute_shinies(m_stats["Enroute Shinies"])
-        , leap_alphas(m_stats["Leap Alphas"])
-        , leap_shinies(m_stats["Leap Shinies"])
-    {
-        m_display_order.emplace_back("Attempts");
-        m_display_order.emplace_back("Errors", true);
-        m_display_order.emplace_back("Leaps");
-        m_display_order.emplace_back("Found");
-        m_display_order.emplace_back("Enroute Shinies");
-        m_display_order.emplace_back("Leap Alphas");
-        m_display_order.emplace_back("Leap Shinies");
-        m_aliases["Shinies"] = "Enroute Shinies";
-        m_aliases["Alphas"] = "Leap Alphas";
-    }
-
-    std::atomic<uint64_t>& attempts;
-    std::atomic<uint64_t>& errors;
-    std::atomic<uint64_t>& leaps;
-    std::atomic<uint64_t>& found;
-    std::atomic<uint64_t>& enroute_shinies;
-    std::atomic<uint64_t>& leap_alphas;
-    std::atomic<uint64_t>& leap_shinies;
-};
-std::unique_ptr<StatsTracker> LeapGrinder_Descriptor::make_stats() const{
-    return std::unique_ptr<StatsTracker>(new Stats());
-}
-
-
-LeapGrinder::LeapGrinder()
-    : LANGUAGE(
-        "<b>Game Language</b>",
-        Pokemon::PokemonNameReader::instance().languages(),
-        LockWhileRunning::LOCKED,
-        true
-    )
-    , POKEMON_DATABASE(make_name_database({
-        "aipom",
-        "burmy",
-        "cherrim",
-        "cherubi",
-        "combee",
-        "heracross",
-        "pachirisu",
-        "vespiquen",
-        "wormadam",
-        "geodude",
-        "graveler",
-        "bonsly",
-        "bronzor",
-        "nosepass",
-        "bergmite",
-    }))
-    , POKEMON(
-        "<b>Pokemon Species</b>",
-        POKEMON_DATABASE,
-        LockWhileRunning::LOCKED,
-        "cherubi"
-    )
-    , LEAPS(
-        "<b>Leaps</b> <br>How many leaps before stopping the program</br>",
-        LockWhileRunning::LOCKED,
-        1, 1, 100
-    )
-    , SHINY_DETECTED_ENROUTE(
-        "Enroute Shiny Action",
-        "This applies if a shiny is detected while enroute to destination.",
-        "0 * TICKS_PER_SECOND"
-    )
-    , MATCH_DETECTED_OPTIONS(
-        "Match Action",
-        "What to do when the leaping Pokemon matches the *Stop On*.",
-        "0 * TICKS_PER_SECOND"
-    )
-    , NOTIFICATION_STATUS("Status Update", true, false, std::chrono::seconds(3600))
-    , NOTIFICATIONS({
-        &NOTIFICATION_STATUS,
-        &SHINY_DETECTED_ENROUTE.NOTIFICATIONS,
-        &MATCH_DETECTED_OPTIONS.NOTIFICATIONS,
-        &NOTIFICATION_PROGRAM_FINISH,
-        &NOTIFICATION_ERROR_RECOVERABLE,
-        &NOTIFICATION_ERROR_FATAL,
-    })
-{
-    PA_ADD_OPTION(LANGUAGE);
-    PA_ADD_OPTION(POKEMON);
-    PA_ADD_OPTION(LEAPS);
-    PA_ADD_OPTION(STOP_ON);
-    PA_ADD_OPTION(EXIT_METHOD);
-    PA_ADD_OPTION(SHINY_DETECTED_ENROUTE);
-    PA_ADD_OPTION(MATCH_DETECTED_OPTIONS);
-    PA_ADD_OPTION(NOTIFICATIONS);
-}
-
-
-bool LeapGrinder::run_iteration(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-
-    LeapGrinder_Descriptor::Stats& stats = env.current_stats<LeapGrinder_Descriptor::Stats>();
-    stats.attempts++;
-
-    env.console.log("Starting route and shiny detection...");
-
-    for (size_t c = 0; true; c++){
-        context.wait_for_all_requests();
-        if (is_pokemon_selection(env.console, env.console.video().snapshot())){
-            break;
-        }
-        if (c >= 5){
-            throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, env.console,
-                "Failed to switch to Pokemon selection after 5 attempts."
-            );
-        }
-        env.console.log("Not on Pokemon selection. Attempting to switch to it...", COLOR_ORANGE);
-        pbf_press_button(context, BUTTON_X, 20, 230);
-    }
-
-    float shiny_coefficient = 1.0;
-    ShinySoundDetector shiny_detector(env.console, [&](float error_coefficient) -> bool{
-        //  Warning: This callback will be run from a different thread than this function.
-        stats.enroute_shinies++;
-        shiny_coefficient = error_coefficient;
-        return on_shiny_callback(env, env.console, SHINY_DETECTED_ENROUTE, error_coefficient);
-    });
-
-    int ret = run_until(
-        env.console, context,
-        [&](BotBaseContext& context){
-            route(env, env.console, context, (LeapPokemon)POKEMON.index());
-        },
-        {{shiny_detector}}
-    );
-    shiny_detector.throw_if_no_sound();
-    if (ret == 0){
-        on_shiny_sound(env, env.console, context, SHINY_DETECTED_ENROUTE, shiny_coefficient);
-    }
-
-    env.console.log("End of route and shiny detection...");
-
-    bool battle_found = check_tree_or_ore_for_battle(env.console, context);
-
-    context.wait_for_all_requests();
-
-    if (battle_found){
-        env.console.log("Pokemon leaped!");
-        stats.leaps++;
-
-        PokemonDetails pokemon = get_pokemon_details(env.console, context, LANGUAGE);
-        pbf_press_button(context, BUTTON_B, 20, 225);
-        context.wait_for_all_requests();
-
-        env.console.log("Looking for: " + POKEMON.slug());
-        env.console.log("Found: " + set_to_str(pokemon.name_candidates));
-        env.console.log("Gender: " + std::string(get_gender_str(pokemon.gender)));
-        env.console.log("Alpha: " + std::string(pokemon.is_alpha ? "Yes" : "No"));
-        env.console.log("Shiny: " + std::string(pokemon.is_shiny ? "Yes" : "No"));
-
-        if (pokemon.name_candidates.find(POKEMON.slug()) != pokemon.name_candidates.end()){
-            env.console.log("Expected Pokemon leaped!");
-            stats.found++;
-        }else{
-            env.console.log("Not the expected pokemon.");
-        }
-
-        //  Match validation
-
-        if (pokemon.is_alpha && pokemon.is_shiny){
-            env.console.log("Found Shiny Alpha!");
-            stats.leap_shinies++;
-            stats.leap_alphas++;
-        }else if (pokemon.is_alpha){
-            env.console.log("Found Alpha!");
-            stats.leap_alphas++;
-        }else if (pokemon.is_shiny){
-            env.console.log("Found Shiny!");
-            stats.leap_shinies++;
-        }else{
-            env.console.log("Normie in the tree -_-");
-        }
-        env.update_stats();
-
-        bool is_match = false;
-        switch (STOP_ON){
-        case StopOn::Shiny:
-            is_match = pokemon.is_shiny;
-            break;
-        case StopOn::Alpha:
-            is_match = pokemon.is_alpha;
-            break;
-        case StopOn::ShinyOrAlpha:
-            is_match = pokemon.is_alpha || pokemon.is_shiny;
-            break;
-        case StopOn::ShinyAndAlpha:
-            is_match = pokemon.is_alpha && pokemon.is_shiny;
-            break;
-        }
-
-        if (pokemon.is_alpha || pokemon.is_shiny){
-            on_match_found(env, env.console, context, MATCH_DETECTED_OPTIONS, is_match);
-        }
-
-        exit_battle(env.console, context, EXIT_METHOD);
-    }
-
-    env.console.log("Remaining Leaps:" + std::to_string(LEAPS - stats.leaps));
-
-    return_to_jubilife(env, env.console, context, (LeapPokemon)POKEMON.index());
-
-    if (stats.leaps == LEAPS){
-        return true;
-    }
-
-    return false;
-}
-
-void LeapGrinder::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    LeapGrinder_Descriptor::Stats& stats = env.current_stats<LeapGrinder_Descriptor::Stats>();
-
-    //  Connect the controller.
-    pbf_press_button(context, BUTTON_LCLICK, 5, 5);
-
-    while (true){
-        env.update_stats();
-        send_program_status_notification(env, NOTIFICATION_STATUS);
-        try{
-            if(run_iteration(env, context)){
-                break;
-            }
-        }catch (OperationFailedException& e){
-            stats.errors++;
-            e.send_notification(env, NOTIFICATION_ERROR_RECOVERABLE);
-
-            pbf_press_button(context, BUTTON_HOME, 20, GameSettings::instance().GAME_TO_HOME_DELAY);
-            reset_game_from_home(env, env.console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST);
-            // Switch from items to pokemons
-            pbf_press_button(context, BUTTON_X, 20, 30);
-        }
-    }
-
-    env.update_stats();
-    pbf_press_button(context, BUTTON_HOME, 20, GameSettings::instance().GAME_TO_HOME_DELAY);
-    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
-}
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonLA/Programs/Farming/PokemonLA_LeapGrinder.h b/SerialPrograms/Source/PokemonLA/Programs/Farming/PokemonLA_LeapGrinder.h
deleted file mode 100644
index dcfd13fdd3..0000000000
--- a/SerialPrograms/Source/PokemonLA/Programs/Farming/PokemonLA_LeapGrinder.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*  Tree Leap Grinder
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonLA_LeapGrinder_H
-#define PokemonAutomation_PokemonLA_LeapGrinder_H
-
-#include "Common/Cpp/Options/SimpleIntegerOption.h"
-#include "CommonFramework/Options/LanguageOCROption.h"
-#include "CommonFramework/Notifications/EventNotificationsTable.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-#include "PokemonLA/Options/PokemonLA_MiscOptions.h"
-#include "PokemonLA/Options/PokemonLA_ShinyDetectedAction.h"
-#include "PokemonLA/Inference/PokemonLA_MountDetector.h"
-#include "PokemonLA/Inference/PokemonLA_UnderAttackDetector.h"
-#include "PokemonLA/Programs/PokemonLA_LeapPokemonActions.h"
-#include "Pokemon/Options/Pokemon_NameSelectOption.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-class LeapGrinder_Descriptor : public SingleSwitchProgramDescriptor{
-public:
-    LeapGrinder_Descriptor();
-
-    class Stats;
-    virtual std::unique_ptr<StatsTracker> make_stats() const override;
-};
-
-class LeapGrinder : public SingleSwitchProgramInstance{
-public:
-    LeapGrinder();
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-    bool run_iteration(SingleSwitchProgramEnvironment& env, BotBaseContext& context);
-    bool quick_check(SingleSwitchProgramEnvironment& env, BotBaseContext& context);
-
-private:
-    class RunRoute;
-
-    OCR::LanguageOCROption LANGUAGE;
-
-    StringSelectDatabase POKEMON_DATABASE;
-    StringSelectOption POKEMON;
-
-    SimpleIntegerOption<uint8_t> LEAPS;
-    StopOnOption STOP_ON;
-    ExitBattleMethodOption EXIT_METHOD;
-    ShinyDetectedActionOption SHINY_DETECTED_ENROUTE;
-    ShinyDetectedActionOption MATCH_DETECTED_OPTIONS;
-
-    EventNotificationOption NOTIFICATION_STATUS;
-    EventNotificationsOption NOTIFICATIONS;
-};
-
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonLA/Programs/Farming/PokemonLA_MagikarpMoveGrinder.h b/SerialPrograms/Source/PokemonLA/Programs/Farming/PokemonLA_MagikarpMoveGrinder.h
deleted file mode 100644
index 3bfdc05503..0000000000
--- a/SerialPrograms/Source/PokemonLA/Programs/Farming/PokemonLA_MagikarpMoveGrinder.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*  Magikarp Move Grinder
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- *  Battle a magikarp to grind move related research tasks.
- */
-
-#ifndef PokemonAutomation_PokemonLA_MagikarpMoveGrinder_H
-#define PokemonAutomation_PokemonLA_MagikarpMoveGrinder_H
-
-#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
-#include "CommonFramework/Notifications/EventNotificationsTable.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-#include "PokemonLA/Options/PokemonLA_BattlePokemonActionTable.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-
-class MagikarpMoveGrinder_Descriptor : public SingleSwitchProgramDescriptor{
-public:
-    MagikarpMoveGrinder_Descriptor();
-
-    class Stats;
-    virtual std::unique_ptr<StatsTracker> make_stats() const override;
-};
-
-class MagikarpMoveGrinder : public SingleSwitchProgramInstance{
-public:
-    MagikarpMoveGrinder();
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-    void battle_magikarp(SingleSwitchProgramEnvironment& env, BotBaseContext& context);
-
-    void grind_mimic(SingleSwitchProgramEnvironment& env, BotBaseContext& context);
-
-private:
-    OneMoveBattlePokemonActionTable POKEMON_ACTIONS;
-
-    BooleanCheckBoxOption SPECIAL_CASE_MIMIC;
-
-    EventNotificationOption NOTIFICATION_STATUS;
-    EventNotificationsOption NOTIFICATIONS;
-};
-
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonLA/Programs/Farming/PokemonLA_NuggetFarmerHighlands.cpp b/SerialPrograms/Source/PokemonLA/Programs/Farming/PokemonLA_NuggetFarmerHighlands.cpp
deleted file mode 100644
index 8377627b49..0000000000
--- a/SerialPrograms/Source/PokemonLA/Programs/Farming/PokemonLA_NuggetFarmerHighlands.cpp
+++ /dev/null
@@ -1,249 +0,0 @@
-/*  Money Farmer (Highlands)
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Cpp/Exceptions.h"
-#include "CommonFramework/Exceptions/OperationFailedException.h"
-#include "CommonFramework/Notifications/ProgramNotifications.h"
-#include "CommonFramework/Tools/StatsTracking.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
-#include "NintendoSwitch/NintendoSwitch_Settings.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonLA/PokemonLA_Settings.h"
-#include "PokemonLA/PokemonLA_TravelLocations.h"
-#include "PokemonLA/Inference/PokemonLA_DialogDetector.h"
-#include "PokemonLA/Inference/Sounds/PokemonLA_ShinySoundDetector.h"
-#include "PokemonLA/Programs/PokemonLA_BattleRoutines.h"
-#include "PokemonLA/Programs/PokemonLA_GameEntry.h"
-#include "PokemonLA/Programs/PokemonLA_GameSave.h"
-#include "PokemonLA/Programs/PokemonLA_MountChange.h"
-#include "PokemonLA/Programs/PokemonLA_RegionNavigation.h"
-#include "PokemonLA_NuggetFarmerHighlands.h"
-
-#include <iostream>
-using std::cout;
-using std::endl;
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-    using namespace Pokemon;
-
-
-NuggetFarmerHighlands_Descriptor::NuggetFarmerHighlands_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonLA:NuggetFarmerHighlands",
-        STRING_POKEMON + " LA", "Nugget Farmer (Highlands)",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonLA/NuggetFarmerHighlands.md",
-        "Farm nuggets off the Miss Fortune sisters in the Coronet Highlands.",
-        FeedbackType::REQUIRED,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-class NuggetFarmerHighlands_Descriptor::Stats : public StatsTracker, public ShinyStatIncrementer{
-public:
-    Stats()
-        : attempts(m_stats["Attempts"])
-        , errors(m_stats["Errors"])
-        , charm(m_stats["Charm"])
-        , coin(m_stats["Coin"])
-        , shinies(m_stats["Shinies"])
-    {
-        m_display_order.emplace_back("Attempts");
-        m_display_order.emplace_back("Errors", true);
-        m_display_order.emplace_back("Charm", true);
-        m_display_order.emplace_back("Coin", true);
-        m_display_order.emplace_back("Shinies", true);
-    }
-    virtual void add_shiny() override{
-        shinies++;
-    }
-
-    std::atomic<uint64_t>& attempts;
-    std::atomic<uint64_t>& errors;
-    std::atomic<uint64_t>& charm;
-    std::atomic<uint64_t>& coin;
-    std::atomic<uint64_t>& shinies;
-};
-std::unique_ptr<StatsTracker> NuggetFarmerHighlands_Descriptor::make_stats() const{
-    return std::unique_ptr<StatsTracker>(new Stats());
-}
-
-
-NuggetFarmerHighlands::NuggetFarmerHighlands()
-    : SHINY_DETECTED("Shiny Detected Action", "", "2 * TICKS_PER_SECOND")
-    , NOTIFICATION_STATUS("Status Update", true, false, std::chrono::seconds(3600))
-    , NOTIFICATIONS({
-        &NOTIFICATION_STATUS,
-        &SHINY_DETECTED.NOTIFICATIONS,
-        &NOTIFICATION_PROGRAM_FINISH,
-        &NOTIFICATION_ERROR_RECOVERABLE,
-        &NOTIFICATION_ERROR_FATAL,
-    })
-{
-    PA_ADD_STATIC(SHINY_REQUIRES_AUDIO);
-    PA_ADD_OPTION(SHINY_DETECTED);
-    PA_ADD_OPTION(NOTIFICATIONS);
-}
-
-
-
-bool NuggetFarmerHighlands::run_iteration(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    NuggetFarmerHighlands_Descriptor::Stats& stats = env.current_stats<NuggetFarmerHighlands_Descriptor::Stats>();
-
-    //  Go to Coronet Highlands Mountain camp.
-    goto_camp_from_jubilife(env, env.console, context, TravelLocations::instance().Highlands_Mountain);
-
-    stats.attempts++;
-
-    change_mount(env.console, context, MountState::WYRDEER_ON);
-
-
-    bool success = false;
-
-
-    env.console.log("Traveling to Charm's location...");
-    {
-        DialogSurpriseDetector dialog_detector(env.console, env.console, true);
-
-        float shiny_coefficient = 1.0;
-        ShinySoundDetector shiny_detector(env.console, [&](float error_coefficient) -> bool{
-            //  Warning: This callback will be run from a different thread than this function.
-            stats.shinies++;
-            shiny_coefficient = error_coefficient;
-            return on_shiny_callback(env, env.console, SHINY_DETECTED, error_coefficient);
-        });
-
-        int ret = run_until(
-            env.console, context,
-            [](BotBaseContext& context){
-                pbf_move_left_joystick(context, 0, 212, 50, 0);
-                pbf_press_button(context, BUTTON_B, 495, 80);
-
-                pbf_move_left_joystick(context, 224, 0, 50, 0);
-//                pbf_press_button(context, BUTTON_B, 350, 80);
-                pbf_press_button(context, BUTTON_B, 80, 0);
-                for (size_t c = 0; c < 7; c++){
-                    pbf_press_button(context, BUTTON_A | BUTTON_B, 5, 0);
-                    pbf_press_button(context, BUTTON_B, 5, 0);
-                }
-                pbf_press_button(context, BUTTON_B, 200, 80);
-                pbf_wait(context, 80);
-
-                pbf_move_left_joystick(context, 0, 64, 50, 0);
-                pbf_press_button(context, BUTTON_B, 250, 80);
-
-                pbf_move_left_joystick(context, 0, 48, 50, 0);
-                pbf_press_button(context, BUTTON_B, 250, 0);
-
-                pbf_move_left_joystick(context, 64, 255, 50, 0);
-                pbf_press_button(context, BUTTON_B, 150, 250);
-
-//                pbf_move_right_joystick(context, 0, 128, 200, 125);
-
-            },
-            {
-                {dialog_detector},
-                {shiny_detector},
-            }
-        );
-        switch (ret){
-        case 0:
-            env.console.log("Found Charm!", COLOR_BLUE);
-            stats.charm++;
-            mash_A_until_end_of_battle(env.console, context);
-            env.console.log("Battle succeeded!", COLOR_BLUE);
-            success = true;
-            break;
-        case 1:
-            on_shiny_sound(env, env.console, context, SHINY_DETECTED, shiny_coefficient);
-            break;
-        }
-    }
-
-
-#if 0
-    env.console.log("Traveling to Coin's location...");
-    {
-
-    }
-#endif
-
-
-    env.console.log("Returning to Jubilife...");
-
-
-    {
-        float shiny_coefficient = 1.0;
-        ShinySoundDetector shiny_detector(env.console, [&](float error_coefficient) -> bool{
-            //  Warning: This callback will be run from a different thread than this function.
-            stats.shinies++;
-            shiny_coefficient = error_coefficient;
-            return on_shiny_callback(env, env.console, SHINY_DETECTED, error_coefficient);
-        });
-
-        int ret = run_until(env.console, context,
-            [&env](BotBaseContext& context){
-                goto_camp_from_overworld(env, env.console, context);
-                goto_professor(env.console, context, Camp::HIGHLANDS_HIGHLANDS);
-            },
-            {{shiny_detector}}
-        );
-        shiny_detector.throw_if_no_sound();
-        if (ret == 0){
-            on_shiny_sound(env, env.console, context, SHINY_DETECTED, shiny_coefficient);
-        }
-    }
-
-
-    from_professor_return_to_jubilife(env, env.console, context);
-
-    if (success){
-        save_game_from_overworld(env, env.console, context);
-    }
-
-    return false;
-}
-
-
-
-void NuggetFarmerHighlands::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    NuggetFarmerHighlands_Descriptor::Stats& stats = env.current_stats<NuggetFarmerHighlands_Descriptor::Stats>();
-
-    //  Connect the controller.
-    pbf_press_button(context, BUTTON_LCLICK, 5, 5);
-
-    // Put a save here so that when the program reloads from error it won't break.
-    save_game_from_overworld(env, env.console, context);
-
-    while (true){
-        env.update_stats();
-        send_program_status_notification(env, NOTIFICATION_STATUS);
-        try{
-            if (run_iteration(env, context)){
-                break;
-            }
-        }catch (OperationFailedException& e){
-            stats.errors++;
-            e.send_notification(env, NOTIFICATION_ERROR_RECOVERABLE);
-
-            pbf_press_button(context, BUTTON_HOME, 20, GameSettings::instance().GAME_TO_HOME_DELAY);
-            reset_game_from_home(env, env.console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST);
-        }
-    }
-
-    env.update_stats();
-    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
-}
-
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonLA/Programs/Farming/PokemonLA_NuggetFarmerHighlands.h b/SerialPrograms/Source/PokemonLA/Programs/Farming/PokemonLA_NuggetFarmerHighlands.h
deleted file mode 100644
index ebeb538f97..0000000000
--- a/SerialPrograms/Source/PokemonLA/Programs/Farming/PokemonLA_NuggetFarmerHighlands.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*  Money Farmer (Highlands)
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonLA_MoneyFarmerHighlands_H
-#define PokemonAutomation_PokemonLA_MoneyFarmerHighlands_H
-
-#include "CommonFramework/Notifications/EventNotificationsTable.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-#include "PokemonLA/Options/PokemonLA_ShinyDetectedAction.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-
-class NuggetFarmerHighlands_Descriptor : public SingleSwitchProgramDescriptor{
-public:
-    NuggetFarmerHighlands_Descriptor();
-
-    class Stats;
-    virtual std::unique_ptr<StatsTracker> make_stats() const override;
-};
-
-
-class NuggetFarmerHighlands : public SingleSwitchProgramInstance{
-public:
-    NuggetFarmerHighlands();
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-    bool run_iteration(SingleSwitchProgramEnvironment& env, BotBaseContext& context);
-
-private:
-    class RunRoute;
-
-    ShinyRequiresAudioText SHINY_REQUIRES_AUDIO;
-
-    ShinyDetectedActionOption SHINY_DETECTED;
-
-    EventNotificationOption NOTIFICATION_STATUS;
-    EventNotificationsOption NOTIFICATIONS;
-};
-
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonLA/Programs/General/PokemonLA_ApplyGrits.cpp b/SerialPrograms/Source/PokemonLA/Programs/General/PokemonLA_ApplyGrits.cpp
deleted file mode 100644
index b5538271af..0000000000
--- a/SerialPrograms/Source/PokemonLA/Programs/General/PokemonLA_ApplyGrits.cpp
+++ /dev/null
@@ -1,132 +0,0 @@
-/*  Apply Grits
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Cpp/Exceptions.h"
-#include "CommonFramework/Notifications/ProgramNotifications.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonLA_ApplyGrits.h"
-
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-using namespace Pokemon;
-
-namespace {
-
-// For each grit item, how many levels it can increase:
-const size_t grit_level_increase[4] = {3, 3, 3, 1};
-
-}
-
-
-ApplyGrits_Descriptor::ApplyGrits_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonLA:ApplyGrits",
-        STRING_POKEMON + " LA", "Apply Grits",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonLA/ApplyGrits.md",
-        "Use Grits items on " + STRING_POKEMON,
-        FeedbackType::NONE,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-
-
-ApplyGrits::ApplyGrits()
-    : NUM_POKEMON(
-        "<b>Number of " + STRING_POKEMON + " to Apply Grits</b>:",
-        {
-            {1, "1", "1"},
-            {2, "2", "2"},
-            {3, "3", "3"},
-            {4, "4", "4"},
-            {5, "5", "5"},
-            {6, "6", "6"},
-        },
-        LockWhileRunning::LOCKED,
-        1
-    )
-    , NOTIFICATIONS({
-        &NOTIFICATION_PROGRAM_FINISH,
-        &NOTIFICATION_ERROR_FATAL,
-    })
-{
-    PA_ADD_OPTION(NUM_POKEMON);
-    PA_ADD_OPTION(NOTIFICATIONS);
-}
-
-void ApplyGrits::ApplyGritsOnOnePokemon(SingleSwitchProgramEnvironment& env, BotBaseContext& context, size_t pokemon_index){
-    // Start the function when the game is in the item menu, with cursor hovering over Grit Dust
-    // Grit Gravel, Grit Pebble and Grit Rock must be on the right side of Grit Dust, in the correct order.
-
-    for(size_t grit_index = 0; grit_index < 4; grit_index++){
-        
-        if (grit_index > 0){
-            // Move to the next Grit item
-            pbf_press_dpad(context, DPAD_RIGHT, 20, 50);
-        }
-
-        // Press A to open the item menu of Grit Dust
-        pbf_press_button(context, BUTTON_A, 20, 50);
-        // Press A again to use the item
-        pbf_press_button(context, BUTTON_A, 20, 50);
-
-        // Move down the pokemon list
-        for(size_t i = 0; i < pokemon_index; i++){
-            pbf_press_dpad(context, DPAD_DOWN, 20, 80);
-        }
-
-        // Select the pokemon
-        pbf_press_button(context, BUTTON_A, 20, 80);
-
-        // For each of the size pokemon attributes: HP, Attack, Defense, Sp. Atk, Sp. Def, Speed
-        for(size_t attr_index = 0; attr_index < 6; attr_index++){
-            if (attr_index > 0){
-                // Move to the next attribute
-                pbf_press_dpad(context, DPAD_DOWN, 20, 50);
-            }
-            for(size_t i = 0; i < grit_level_increase[grit_index]; i++){
-                // One press to apply the Grit item
-                pbf_press_button(context, BUTTON_A, 20, 100);
-                // Second press to clear the message box, whether it is applied successfully or not.
-                pbf_press_button(context, BUTTON_A, 20, 100);
-            }
-        }
-
-        // Press B twice to back to item selection
-        pbf_press_button(context, BUTTON_B, 20, 50);
-        pbf_press_button(context, BUTTON_B, 20, 50);
-    }
-
-    // Move back to hovering over Grit Dust
-    pbf_press_dpad(context, DPAD_LEFT, 20, 50);
-    pbf_press_dpad(context, DPAD_LEFT, 20, 50);
-    pbf_press_dpad(context, DPAD_LEFT, 20, 50);
-
-    context.wait_for_all_requests();
-}
-
-void ApplyGrits::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    //  Connect the controller.
-    pbf_press_button(context, BUTTON_LCLICK, 5, 5);
-
-    size_t num_pokemon = NUM_POKEMON.current_value();
-    for(size_t i = 0; i < num_pokemon; i++){
-        ApplyGritsOnOnePokemon(env, context, i);
-    }
-
-    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
-}
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonLA/Programs/General/PokemonLA_ApplyGrits.h b/SerialPrograms/Source/PokemonLA/Programs/General/PokemonLA_ApplyGrits.h
deleted file mode 100644
index c066121645..0000000000
--- a/SerialPrograms/Source/PokemonLA/Programs/General/PokemonLA_ApplyGrits.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*  Apply Grits
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonLA_ApplyGrits_H
-#define PokemonAutomation_PokemonLA_ApplyGrits_H
-
-#include "Common/Cpp/Options/EnumDropdownOption.h"
-#include "CommonFramework/Notifications/EventNotificationsTable.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-
-class ApplyGrits_Descriptor : public SingleSwitchProgramDescriptor{
-public:
-    ApplyGrits_Descriptor();
-};
-
-
-class ApplyGrits : public SingleSwitchProgramInstance{
-public:
-    ApplyGrits();
-
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-
-    void ApplyGritsOnOnePokemon(SingleSwitchProgramEnvironment& env, BotBaseContext& context, size_t pokemon_index);
-
-    IntegerEnumDropdownOption NUM_POKEMON;
-
-    EventNotificationsOption NOTIFICATIONS;
-};
-
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonLA/Programs/General/PokemonLA_BraviaryHeightGlitch.cpp b/SerialPrograms/Source/PokemonLA/Programs/General/PokemonLA_BraviaryHeightGlitch.cpp
deleted file mode 100644
index e5899e0b5c..0000000000
--- a/SerialPrograms/Source/PokemonLA/Programs/General/PokemonLA_BraviaryHeightGlitch.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-/*  Braviary Height Glitch
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonLA_BraviaryHeightGlitch.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-    using namespace Pokemon;
-
-
-BraviaryHeightGlitch_Descriptor::BraviaryHeightGlitch_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonLA:BraviaryHeightGlitch",
-        STRING_POKEMON + " LA", "Braviary Height Glitch",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonLA/BraviaryHeightGlitch.md",
-        "Increase your height in place using the height glitch.",
-        FeedbackType::NONE,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-
-
-BraviaryHeightGlitch::BraviaryHeightGlitch(){}
-
-
-void BraviaryHeightGlitch::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    while (true){
-        pbf_press_button(context, BUTTON_Y, 30, 0);
-        pbf_press_button(context, BUTTON_PLUS, 30, 10);
-        pbf_press_button(context, BUTTON_PLUS, 30, 30);
-    }
-}
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonLA/Programs/General/PokemonLA_BraviaryHeightGlitch.h b/SerialPrograms/Source/PokemonLA/Programs/General/PokemonLA_BraviaryHeightGlitch.h
deleted file mode 100644
index 15f35f4c6e..0000000000
--- a/SerialPrograms/Source/PokemonLA/Programs/General/PokemonLA_BraviaryHeightGlitch.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*  Braviary Height Glitch
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonLA_BraviaryHeightGlitch_H
-#define PokemonAutomation_PokemonLA_BraviaryHeightGlitch_H
-
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-
-class BraviaryHeightGlitch_Descriptor : public SingleSwitchProgramDescriptor{
-public:
-    BraviaryHeightGlitch_Descriptor();
-};
-
-
-class BraviaryHeightGlitch : public SingleSwitchProgramInstance{
-public:
-    BraviaryHeightGlitch();
-
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-};
-
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonLA/Programs/General/PokemonLA_ClothingBuyer.cpp b/SerialPrograms/Source/PokemonLA/Programs/General/PokemonLA_ClothingBuyer.cpp
deleted file mode 100644
index 87835f3f6c..0000000000
--- a/SerialPrograms/Source/PokemonLA/Programs/General/PokemonLA_ClothingBuyer.cpp
+++ /dev/null
@@ -1,78 +0,0 @@
-/*  Clothing Buyer
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonLA_ClothingBuyer.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-    using namespace Pokemon;
-
-
-ClothingBuyer_Descriptor::ClothingBuyer_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonLA:ClothingBuyer",
-        STRING_POKEMON + " LA", "Clothing Buyer",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonLA/ClothingBuyer.md",
-        "Buy out all the clothing in the store.",
-        FeedbackType::NONE,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-
-
-ClothingBuyer::ClothingBuyer()
-    : CATEGORY_ROTATION(
-        "<b>Rotate Categories:</b><br>This slows down the program, but ensures it will cover all categories.",
-        LockWhileRunning::LOCKED,
-        true
-    )
-{
-    PA_ADD_OPTION(CATEGORY_ROTATION);
-}
-
-
-void ClothingBuyer::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    //  Connect the controller.
-    pbf_press_button(context, BUTTON_LCLICK, 5, 5);
-
-    while (true){
-        // If this clothing is not bought:
-        // Press A to pop purchase dialogue
-        // Press A to confirm purchase
-        // Press B to not wear it
-        // Press B to clear dialogue
-
-        // If this clothing is already bought:
-        // Press A to do nothing
-        // Press A to do nothing
-        // Press B to be asked whether to leave menu
-        // Press B to not leave
-
-        pbf_press_button(context, BUTTON_A, 10, 120);
-        pbf_press_button(context, BUTTON_A, 10, 130);
-        pbf_press_button(context, BUTTON_B, 10, 120);
-        pbf_press_button(context, BUTTON_B, 10, 60);
-
-        // Move to the next clothing in the same category
-        pbf_press_dpad(context, DPAD_DOWN, 10, 40);
-
-        // Move to the next category
-        if (CATEGORY_ROTATION){
-            pbf_press_button(context, BUTTON_R, 10, 40);
-        }
-    }
-}
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonLA/Programs/General/PokemonLA_ClothingBuyer.h b/SerialPrograms/Source/PokemonLA/Programs/General/PokemonLA_ClothingBuyer.h
deleted file mode 100644
index 1fe2f80e40..0000000000
--- a/SerialPrograms/Source/PokemonLA/Programs/General/PokemonLA_ClothingBuyer.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*  Clothing Buyer
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonLA_ClothingBuyer_H
-#define PokemonAutomation_PokemonLA_ClothingBuyer_H
-
-#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-
-class ClothingBuyer_Descriptor : public SingleSwitchProgramDescriptor{
-public:
-    ClothingBuyer_Descriptor();
-};
-
-
-class ClothingBuyer : public SingleSwitchProgramInstance{
-public:
-    ClothingBuyer();
-
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-
-    BooleanCheckBoxOption CATEGORY_ROTATION;
-
-};
-
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonLA/Programs/General/PokemonLA_DistortionWaiter.cpp b/SerialPrograms/Source/PokemonLA/Programs/General/PokemonLA_DistortionWaiter.cpp
deleted file mode 100644
index 54c1e97ee2..0000000000
--- a/SerialPrograms/Source/PokemonLA/Programs/General/PokemonLA_DistortionWaiter.cpp
+++ /dev/null
@@ -1,157 +0,0 @@
-/*  Distortion Waiter
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/Exceptions/OperationFailedException.h"
-#include "CommonFramework/Notifications/ProgramNotifications.h"
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
-#include "CommonFramework/Tools/StatsTracking.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "Pokemon/Inference/Pokemon_NameReader.h"
-#include "PokemonLA/PokemonLA_Settings.h"
-#include "PokemonLA/Inference/PokemonLA_NotificationReader.h"
-#include "PokemonLA_DistortionWaiter.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-    using namespace Pokemon;
-
-
-DistortionWaiter_Descriptor::DistortionWaiter_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonLA:DistortionWaiter",
-        STRING_POKEMON + " LA", "Distortion Waiter",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonLA/DistortionWaiter.md",
-        "Wait for a distortion to appear.",
-        FeedbackType::REQUIRED,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-class DistortionWaiter_Descriptor::Stats : public StatsTracker{
-public:
-    Stats()
-        : minutes_waited(m_stats["Minutes Waited"])
-        , distortions(m_stats["Distortions"])
-        , other(m_stats["Other Notifications"])
-        , errors(m_stats["Errors"])
-    {
-        m_display_order.emplace_back("Minutes Waited");
-        m_display_order.emplace_back("Distortions");
-        m_display_order.emplace_back("Other Notifications", true);
-        m_display_order.emplace_back("Errors", true);
-    }
-
-    std::atomic<uint64_t>& minutes_waited;
-    std::atomic<uint64_t>& distortions;
-    std::atomic<uint64_t>& other;
-    std::atomic<uint64_t>& errors;
-};
-std::unique_ptr<StatsTracker> DistortionWaiter_Descriptor::make_stats() const{
-    return std::unique_ptr<StatsTracker>(new Stats());
-}
-
-
-DistortionWaiter::DistortionWaiter()
-    : LANGUAGE(
-        "<b>Game Language:</b>",
-        Pokemon::PokemonNameReader::instance().languages(),
-        LockWhileRunning::LOCKED,
-        true
-    )
-    , NOTIFICATION_DISTORTION(
-        "Distortion Appeared",
-        true, true, ImageAttachmentMode::JPG,
-        {"Notifs"}
-    )
-    , NOTIFICATIONS({
-        &NOTIFICATION_DISTORTION,
-        &NOTIFICATION_ERROR_RECOVERABLE,
-        &NOTIFICATION_ERROR_FATAL,
-    })
-{
-    PA_ADD_OPTION(LANGUAGE);
-    PA_ADD_OPTION(NOTIFICATIONS);
-}
-
-
-
-void DistortionWaiter::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    DistortionWaiter_Descriptor::Stats& stats = env.current_stats<DistortionWaiter_Descriptor::Stats>();
-
-
-    //  Connect the controller.
-    pbf_press_button(context, BUTTON_LCLICK, 5, 5);
-
-
-    NotificationDetector detector(env.console, LANGUAGE);
-
-    WallClock start = current_time();
-    while (true){
-        env.update_stats();
-
-        int ret = run_until(
-            env.console, context,
-            [&](BotBaseContext& context){
-                for (size_t c = 0; c < 60; c++){
-                    pbf_press_button(context, BUTTON_LCLICK, 20, 60 * TICKS_PER_SECOND - 20);
-                    context.wait_for_all_requests();
-                    auto elapsed = current_time() - start;
-                    uint64_t minutes = std::chrono::duration_cast<std::chrono::minutes>(elapsed).count();
-                    if (minutes != stats.minutes_waited.load(std::memory_order_relaxed)){
-                        stats.minutes_waited.store(minutes, std::memory_order_relaxed);
-                        env.update_stats();
-                    }
-                }
-            },
-            {{detector}}
-        );
-        if (ret < 0){
-            stats.errors++;
-            throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, env.console,
-                "No distortion found after one hour.",
-                true
-            );
-        }
-
-        auto elapsed = current_time() - start;
-        uint64_t minutes = std::chrono::duration_cast<std::chrono::minutes>(elapsed).count();
-        stats.minutes_waited.store(minutes, std::memory_order_relaxed);
-
-        if (detector.result() == Notification::DISTORTION_FORMING){
-            stats.distortions++;
-            break;
-        }
-        if (detector.result() == Notification::ERROR){
-            stats.errors++;
-        }else{
-            stats.other++;
-        }
-
-        context.wait_for(std::chrono::seconds(10));
-    }
-
-
-    env.update_stats();
-
-    send_program_notification(
-        env, NOTIFICATION_DISTORTION,
-        COLOR_GREEN,
-        "Found Distortion",
-        {}, "",
-        env.console.video().snapshot()
-    );
-    pbf_press_button(context, BUTTON_HOME, 20, GameSettings::instance().GAME_TO_HOME_DELAY);
-}
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonLA/Programs/General/PokemonLA_DistortionWaiter.h b/SerialPrograms/Source/PokemonLA/Programs/General/PokemonLA_DistortionWaiter.h
deleted file mode 100644
index 8394721d68..0000000000
--- a/SerialPrograms/Source/PokemonLA/Programs/General/PokemonLA_DistortionWaiter.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*  Distortion Waiter
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonLA_DistortionWaiter_H
-#define PokemonAutomation_PokemonLA_DistortionWaiter_H
-
-#include "CommonFramework/Options/LanguageOCROption.h"
-#include "CommonFramework/Notifications/EventNotificationsTable.h"
-//#include "NintendoSwitch/Options/GoHomeWhenDoneOption.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-
-class DistortionWaiter_Descriptor : public SingleSwitchProgramDescriptor{
-public:
-    DistortionWaiter_Descriptor();
-
-    class Stats;
-    virtual std::unique_ptr<StatsTracker> make_stats() const override;
-};
-
-
-class DistortionWaiter : public SingleSwitchProgramInstance{
-public:
-    DistortionWaiter();
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-
-private:
-    OCR::LanguageOCROption LANGUAGE;
-
-    EventNotificationOption NOTIFICATION_DISTORTION;
-    EventNotificationsOption NOTIFICATIONS;
-};
-
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonLA/Programs/General/PokemonLA_OutbreakFinder.cpp b/SerialPrograms/Source/PokemonLA/Programs/General/PokemonLA_OutbreakFinder.cpp
deleted file mode 100644
index e7d84b2a7f..0000000000
--- a/SerialPrograms/Source/PokemonLA/Programs/General/PokemonLA_OutbreakFinder.cpp
+++ /dev/null
@@ -1,816 +0,0 @@
-/*  Outbreak Finder
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Cpp/Exceptions.h"
-#include "CommonFramework/GlobalSettingsPanel.h"
-#include "CommonFramework/Exceptions/OperationFailedException.h"
-#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
-//#include "CommonFramework/ImageMatch/ImageCropper.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
-#include "CommonFramework/Notifications/ProgramNotifications.h"
-#include "CommonFramework/Tools/ErrorDumper.h"
-#include "CommonFramework/Tools/StatsTracking.h"
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "NintendoSwitch/NintendoSwitch_Settings.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "Pokemon/Resources/Pokemon_PokemonNames.h"
-#include "Pokemon/Inference/Pokemon_NameReader.h"
-#include "PokemonLA/Inference/PokemonLA_DialogDetector.h"
-#include "PokemonLA/Inference/Map/PokemonLA_MapDetector.h"
-#include "PokemonLA/Inference/Map/PokemonLA_SelectedRegionDetector.h"
-#include "PokemonLA/Inference/Map/PokemonLA_OutbreakReader.h"
-#include "PokemonLA/Inference/Map/PokemonLA_MapMissionTabReader.h"
-#include "PokemonLA/Inference/Map/PokemonLA_MapZoomLevelReader.h"
-#include "PokemonLA/Inference/Map/PokemonLA_MMOSpriteStarSymbolDetector.h"
-#include "PokemonLA/Inference/Map/PokemonLA_PokemonMapSpriteReader.h"
-#include "PokemonLA/Programs/PokemonLA_GameEntry.h"
-#include "PokemonLA/Programs/PokemonLA_GameSave.h"
-#include "PokemonLA/Resources/PokemonLA_AvailablePokemon.h"
-#include "PokemonLA/Resources/PokemonLA_PokemonSprites.h"
-#include "PokemonLA/Inference/Objects/PokemonLA_ButtonDetector.h"
-#include "PokemonLA/Inference/Objects/PokemonLA_MMOQuestionMarkDetector.h"
-#include "PokemonLA_OutbreakFinder.h"
-#include "PokemonLA/Programs/PokemonLA_RegionNavigation.h"
-#include "PokemonLA/PokemonLA_Settings.h"
-
-#include <sstream>
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-    using namespace Pokemon;
-
-
-
-StringSelectDatabase make_mo_database(){
-    const SpriteDatabase& sprites = ALL_POKEMON_SPRITES();
-    const std::vector<std::string>& slugs = HISUI_OUTBREAK_SLUGS();
-
-    static const ImageRGB32 mmo_sprite(RESOURCE_PATH() + "PokemonLA/MMOQuestionMark-Template.png");
-
-    StringSelectDatabase ret;
-    ret.add_entry(StringSelectEntry("fieldlands-mmo",   "Fieldlands MMO",   mmo_sprite));
-    ret.add_entry(StringSelectEntry("mirelands-mmo",    "Mirelands MMO",    mmo_sprite));
-    ret.add_entry(StringSelectEntry("coastlands-mmo",   "Coastlands MMO",   mmo_sprite));
-    ret.add_entry(StringSelectEntry("highlands-mmo",    "Highlands MMO",    mmo_sprite));
-    ret.add_entry(StringSelectEntry("icelands-mmo",     "Icelands MMO",     mmo_sprite));
-    for (const std::string& slug : slugs){
-        const PokemonNames& name = get_pokemon_name(slug);
-        const SpriteDatabase::Sprite& sprite = sprites.get_throw(slug);
-        ret.add_entry(StringSelectEntry(
-            slug, name.display_name(),
-            sprite.icon
-        ));
-    }
-    return ret;
-}
-const StringSelectDatabase& MO_DATABASE(){
-    static const StringSelectDatabase database = make_mo_database();
-    return database;
-}
-
-StringSelectDatabase make_mmo_database(){
-    const SpriteDatabase& sprites = ALL_MMO_SPRITES();
-    const std::vector<std::string>& slugs = MMO_FIRST_WAVE_SPRITE_SLUGS();
-    std::vector<std::string> displays = load_pokemon_slug_json_list("PokemonLA/MMOFirstWaveSpriteNameDisplay.json");
-
-    if (slugs.size() != displays.size()){
-        throw FileException(
-            nullptr, PA_CURRENT_FUNCTION,
-            "Name and slug lists are not the same size.",
-            "PokemonLA/MMOFirstWaveSpriteNameDisplay.json"
-        );
-    }
-
-    StringSelectDatabase ret;
-    for (size_t c = 0; c < displays.size(); c++){
-        ret.add_entry(StringSelectEntry(
-            slugs[c], std::move(displays[c]),
-            sprites.get_throw(slugs[c]).icon
-        ));
-    }
-    return ret;
-}
-const StringSelectDatabase& MMO_DATABASE(){
-    static const StringSelectDatabase database = make_mmo_database();
-    return database;
-}
-
-
-
-namespace {
-
-
-
-std::vector<std::string> load_mmo_names(){
-    return {
-        "fieldlands-mmo",
-        "mirelands-mmo",
-        "coastlands-mmo",
-        "highlands-mmo",
-        "icelands-mmo"
-    };
-}
-
-// The name of each MMO event happening at each region. Their slugs are:
-// - "fieldlands-mmo"
-// - "mirelands-mmo"
-// - "coastlands-mmo"
-// - "highlands-mmo"
-// - "icelands-mmo"
-const std::vector<std::string>& MMO_NAMES(){
-    const static std::vector<std::string> mmo_names = load_mmo_names();
-    return mmo_names;
-}
-
-
-} // anonymous namespace
-
-
-OutbreakFinder_Descriptor::OutbreakFinder_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonLA:OutbreakFinder",
-        STRING_POKEMON + " LA", "Outbreak Finder",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonLA/OutbreakFinder.md",
-        "Search for an outbreak for a specific " + STRING_POKEMON,
-        FeedbackType::REQUIRED,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-class OutbreakFinder_Descriptor::Stats : public StatsTracker{
-public:
-    Stats()
-        : checks(m_stats["Checks"])
-        , errors(m_stats["Errors"])
-        , outbreaks(m_stats["Outbreaks"])
-        , mmos(m_stats["MMOs"])
-        , mmo_pokemon(m_stats["MMO Pokemon"])
-        , stars(m_stats["Stars"])
-        , matches(m_stats["Matches"])
-    {
-        m_display_order.emplace_back("Checks");
-        m_display_order.emplace_back("Errors", true);
-        m_display_order.emplace_back("Outbreaks");
-        m_display_order.emplace_back("MMOs");
-        m_display_order.emplace_back("MMO Pokemon");
-        m_display_order.emplace_back("Stars");
-        m_display_order.emplace_back("Matches", true);
-    }
-
-    std::atomic<uint64_t>& checks;
-    std::atomic<uint64_t>& errors;
-    std::atomic<uint64_t>& outbreaks;
-    std::atomic<uint64_t>& mmos;
-    std::atomic<uint64_t>& mmo_pokemon;
-    std::atomic<uint64_t>& stars; // MMO star symbols
-    std::atomic<uint64_t>& matches;
-};
-std::unique_ptr<StatsTracker> OutbreakFinder_Descriptor::make_stats() const{
-    return std::unique_ptr<StatsTracker>(new Stats());
-}
-
-
-
-
-
-OutbreakFinder::OutbreakFinder()
-    : GO_HOME_WHEN_DONE(false)
-    , LANGUAGE(
-        "<b>Game Language:</b>",
-        Pokemon::PokemonNameReader::instance().languages(),
-        LockWhileRunning::LOCKED,
-        true
-    )
-    , DESIRED_MO_SLUGS(
-        "<b>Desired Outbreak " + STRING_POKEMON + ":</b><br>Stop when anything on this list is found.",
-        STRING_POKEMON, MO_DATABASE(), "cherubi"
-    )
-    , DESIRED_MMO_SLUGS(
-        "<b>Desired first MMO wave " + STRING_POKEMON + ":</b><br>Stop when anything on this list is found.",
-        STRING_POKEMON, MMO_DATABASE(), "rowlet"
-    )
-    , DESIRED_STAR_MMO_SLUGS(
-        "<b>Desired first MMO wave " + STRING_POKEMON + " with shiny symbols:</b><br>Stop when anything on this list is found.",
-        STRING_POKEMON, MMO_DATABASE(), "rowlet"
-    )
-    , DEBUG_MODE(
-        "<b>Debug Mode:</b><br>Save MMO Sprite to debug folder.",
-        LockWhileRunning::LOCKED,
-        false
-    )
-    , NOTIFICATION_STATUS("Status Update", true, false, std::chrono::seconds(3600))
-    , NOTIFICATION_MATCHED(
-        "Match Found",
-        true, true, ImageAttachmentMode::JPG,
-        {"Notifs"}
-    )
-    , NOTIFICATIONS({
-        &NOTIFICATION_STATUS,
-        &NOTIFICATION_MATCHED,
-        &NOTIFICATION_ERROR_RECOVERABLE,
-        &NOTIFICATION_ERROR_FATAL,
-    })
-{
-    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
-    PA_ADD_OPTION(LANGUAGE);
-    PA_ADD_OPTION(DESIRED_MO_SLUGS);
-    PA_ADD_OPTION(DESIRED_MMO_SLUGS);
-    PA_ADD_OPTION(DESIRED_STAR_MMO_SLUGS);
-    PA_ADD_OPTION(NOTIFICATIONS);
-
-    if (PreloadSettings::instance().DEVELOPER_MODE){
-        PA_ADD_OPTION(DEBUG_MODE);
-    }
-}
-
-
-std::set<std::string> OutbreakFinder::read_travel_map_outbreaks(
-    SingleSwitchProgramEnvironment& env, BotBaseContext& context,
-    const std::set<std::string>& desired_events
-){
-    OutbreakFinder_Descriptor::Stats& stats = env.current_stats<OutbreakFinder_Descriptor::Stats>();
-
-    MapRegion start_region = MapRegion::NONE;
-
-    MapRegion current_region = detect_selected_region(env.console, context);
-    if (current_region == MapRegion::NONE){
-        env.console.log("Unable to detect selected region.", COLOR_RED);
-        return std::set<std::string>();
-    }
-
-    MMOQuestionMarkDetector question_mark_detector(env.logger());
-    VideoOverlaySet mmo_overlay_set(env.console);
-    std::array<bool, 5> mmo_appears = question_mark_detector.detect_MMO_on_hisui_map(env.console.video().snapshot());
-    add_hisui_MMO_detection_to_overlay(mmo_appears, mmo_overlay_set);
-
-    // If the current region is a wild area, the yellow cursor may overlap with the MMO question marker, causing
-    // wrong detection. So we have to check it's location again by moving the cursor to the next location
-    if (current_region != MapRegion::JUBILIFE && current_region != MapRegion::RETREAT){
-        // MapRegion starts with None and JUBILIFE. Skip those two, so -2.
-        size_t current_wild_area_index = (int)current_region - 2;
-        pbf_press_dpad(context, DPAD_RIGHT, 20, 40);
-        context.wait_for_all_requests();
-        auto new_mmo_read = question_mark_detector.detect_MMO_on_hisui_map(env.console.video().snapshot());
-        mmo_appears[current_wild_area_index] = new_mmo_read[current_wild_area_index];
-        if (new_mmo_read[current_wild_area_index]){
-            add_hisui_MMO_detection_to_overlay(mmo_appears, mmo_overlay_set);
-        }
-        // now mmo_appears should contain correct detection of MMO question marks.
-    }
-
-    // reset current_region to start the looping of checking each wild area's outbreak pokemon name:
-    current_region = MapRegion::NONE;
-
-    std::set<std::string> found;
-
-    // First, check whether we match MMOs:
-    const auto& mmo_names = MMO_NAMES();
-    for (int i = 0; i < 5; i++){
-        if (mmo_appears[i]){
-            auto iter = desired_events.find(mmo_names[i]);
-            if (iter != desired_events.end()){
-                env.console.log("Found a match!", COLOR_BLUE);
-                found.insert(mmo_names[i]);
-            }
-            stats.mmos++;
-        }
-    }
-    env.update_stats();
-    
-    // Next, go to each region, read the outbreak names:
-    while (true){
-        current_region = detect_selected_region(env.console, context);
-        if (current_region == MapRegion::NONE){
-            env.console.log("Unable to detect selected region.", COLOR_RED);
-            return std::set<std::string>();
-        }
-        if (start_region == MapRegion::NONE){
-            start_region = current_region;
-        }else if (start_region == current_region){
-            // We've visited all the regions. Exit the loop.
-            break;
-        }
-
-        if (current_region != MapRegion::JUBILIFE && current_region != MapRegion::RETREAT){
-            // MapRegion starts with None and JUBILIFE. Skip those two, so -2.
-            const int wild_region_index = (int)current_region - 2;
-            if (mmo_appears[wild_region_index]){
-                env.log(std::string(MAP_REGION_NAMES[(int)current_region]) + " have MMO.", COLOR_ORANGE);
-            }
-            else{
-                OutbreakReader reader(env.console, LANGUAGE, env.console);
-                OCR::StringMatchResult result = reader.read(env.console.video().snapshot());
-                if (!result.results.empty()){
-                    stats.outbreaks++;
-                }
-                for (const auto& item : result.results){
-                    auto iter = desired_events.find(item.second.token);
-                    if (iter != desired_events.end()){
-                        env.console.log("Found a match!", COLOR_BLUE);
-                        found.insert(item.second.token);
-                    }
-                }
-            }
-        }
-
-        pbf_press_dpad(context, DPAD_RIGHT, 20, 40);
-        context.wait_for_all_requests();
-    }
-
-    stats.checks++;
-
-    return found;
-}
-
-
-void OutbreakFinder::goto_region_and_return(SingleSwitchProgramEnvironment& env, BotBaseContext& context, 
-    bool inside_travel_map
-){
-    OutbreakFinder_Descriptor::Stats& stats = env.current_stats<OutbreakFinder_Descriptor::Stats>();
-
-    if (inside_travel_map == false){
-        // Move to guard to open map
-        open_travel_map_from_jubilife(env, env.console, context);
-        context.wait_for(std::chrono::milliseconds(500));
-    }
-
-    MapRegion current_region = MapRegion::NONE;
-    for (size_t c = 0; c < 10; c++){
-        current_region = detect_selected_region(env.console, context);
-        if (is_wild_land(current_region)){
-            break;
-        }
-
-        if (current_region == MapRegion::JUBILIFE){
-            // Move to fieldlands
-            pbf_press_dpad(context, DPAD_RIGHT, 20, 40);
-        }
-        else if (current_region == MapRegion::RETREAT){
-            // Move to icelands
-            pbf_press_dpad(context, DPAD_LEFT, 20, 40);
-        }
-        else{
-            // Cannot read current region. Try move to another region
-            pbf_press_dpad(context, DPAD_RIGHT, 20, 40);
-        }
-        context.wait_for_all_requests();
-    }
-    if (is_wild_land(current_region) == false){
-        dump_image(env.console.logger(), env.program_info(), "FindRegion", env.console.video().snapshot());
-        throw OperationFailedException(
-            ErrorReport::SEND_ERROR_REPORT, env.console,
-            "Unable to find a wild land.",
-            true
-        );
-    }
-
-    mash_A_to_change_region(env, env.console, context);
-
-    Camp camp = Camp::FIELDLANDS_FIELDLANDS;
-    switch (current_region){
-    case MapRegion::FIELDLANDS:
-        camp = Camp::FIELDLANDS_FIELDLANDS;
-        break;
-    case MapRegion::MIRELANDS:
-        camp = Camp::MIRELANDS_MIRELANDS;
-        break;
-    case MapRegion::COASTLANDS:
-        camp = Camp::COASTLANDS_BEACHSIDE;
-        break;
-    case MapRegion::HIGHLANDS:
-        camp = Camp::HIGHLANDS_HIGHLANDS;
-        break;
-    case MapRegion::ICELANDS:
-        camp = Camp::ICELANDS_SNOWFIELDS;
-        break;
-    default:
-        throw InternalProgramError(&env.console.logger(), PA_CURRENT_FUNCTION, "Invalid region.");
-    }
-    goto_professor(env.console, context, camp);
-
-    while (true){
-        context.wait_for_all_requests();
-        ButtonDetector button_detector(
-            env.console, env.console,
-            ButtonType::ButtonA, ImageFloatBox(0.50, 0.50, 0.30, 0.30),
-            std::chrono::milliseconds(200), true
-        );
-        int ret = run_until(
-            env.console, context,
-            [](BotBaseContext& context){
-                for (size_t c = 0; c < 10; c++){
-                    pbf_press_button(context, BUTTON_A, 20, 125);
-                }
-            },
-            {{button_detector}}
-        );
-        if (ret >= 0){
-            context.wait_for(std::chrono::milliseconds(500));
-            pbf_press_dpad(context, DPAD_DOWN, 20, 105);
-            break;
-        }
-        env.console.log("Did not detect option to return to Jubilife.", COLOR_RED);
-        pbf_mash_button(context, BUTTON_B, 5 * TICKS_PER_SECOND);
-        stats.errors++;
-    }
-
-    mash_A_to_change_region(env, env.console, context);
-}
-
-std::set<std::string> OutbreakFinder::enter_region_and_read_MMO(
-    SingleSwitchProgramEnvironment& env, BotBaseContext& context,
-    const std::string& mmo_name,
-    const std::set<std::string>& desired_MMOs,
-    const std::set<std::string>& desired_star_MMOs
-){
-    OutbreakFinder_Descriptor::Stats& stats = env.current_stats<OutbreakFinder_Descriptor::Stats>();
-
-    MapRegion region = MapRegion::NONE;
-    TravelLocation location = TravelLocations::instance().Fieldlands_Fieldlands;
-    Camp camp = Camp::FIELDLANDS_FIELDLANDS;
-    for(size_t i = 0; i < 5; i++){
-        if (mmo_name == MMO_NAMES()[i]){
-            switch (i){
-            case 0:
-                region = MapRegion::FIELDLANDS;
-                location = TravelLocations::instance().Fieldlands_Fieldlands;
-                camp = Camp::FIELDLANDS_FIELDLANDS;
-                break;
-            case 1:
-                region = MapRegion::MIRELANDS;
-                location = TravelLocations::instance().Mirelands_Mirelands;
-                camp = Camp::MIRELANDS_MIRELANDS;
-                break;
-            case 2:
-                region = MapRegion::COASTLANDS;
-                location = TravelLocations::instance().Coastlands_Beachside;
-                camp = Camp::COASTLANDS_BEACHSIDE;
-                break;
-            case 3:
-                region = MapRegion::HIGHLANDS;
-                location = TravelLocations::instance().Highlands_Highlands;
-                camp = Camp::HIGHLANDS_HIGHLANDS;
-                break;
-            case 4:
-                region = MapRegion::ICELANDS;
-                location = TravelLocations::instance().Icelands_Snowfields;
-                camp = Camp::ICELANDS_SNOWFIELDS;
-                break;
-            }
-        }
-    }
-    if (region == MapRegion::NONE){
-        throw InternalProgramError(&env.console.logger(), PA_CURRENT_FUNCTION, "No MMO region name found.");
-    }
-
-    env.log("Go to " + std::string(MAP_REGION_NAMES[int(region)]) + " to check MMO.");
-    goto_camp_from_jubilife(env, env.console, context, location);
-
-    // Open map
-    pbf_press_button(context, BUTTON_MINUS, 50, 100);
-    context.wait_for_all_requests();
-
-    // Take a photo of the map before 
-    VideoSnapshot question_mark_image = env.console.video().snapshot();
-
-    // Fix zoom level:
-    const int zoom_level = read_map_zoom_level(question_mark_image);
-    if (zoom_level < 0){
-        throw OperationFailedException(
-            ErrorReport::SEND_ERROR_REPORT, env.console,
-            "Canot read map zoom level.",
-            true
-        );
-    }
-
-    if (zoom_level == 0){
-        pbf_press_button(context, BUTTON_ZR, 50, 50);
-        context.wait_for_all_requests();
-        question_mark_image = env.console.video().snapshot();
-    } else if (zoom_level == 2){
-        pbf_press_button(context, BUTTON_ZL, 50, 50);
-        context.wait_for_all_requests();
-        question_mark_image = env.console.video().snapshot();
-    }
-
-    // Move cursor away so that it does not show a text box that occludes MMO sprites.
-    pbf_move_left_joystick(context, 0, 0, 300, 30);
-    context.wait_for_all_requests();
-
-    // Fix Missions & Requests tab:
-    if (is_map_mission_tab_raised(question_mark_image)){
-        pbf_press_button(context, BUTTON_R, 50, 100);
-        context.wait_for_all_requests();
-        question_mark_image = env.console.video().snapshot();
-    }
-
-    // Now detect question marks:
-    MMOQuestionMarkDetector question_mark_detector(env.logger());
-
-    const auto quest_results = question_mark_detector.detect_MMOs_on_region_map(question_mark_image);
-    env.log("Detected MMO question marks:");
-    for(const auto& box : quest_results){
-        std::ostringstream os;
-        os << "- " << box.center_x() << ", " << box.center_y() << " " << box.width() << " x " << box.height();
-        env.log(os.str());
-    }
-
-    // Clean the detected boxes, make them square.
-    std::vector<ImagePixelBox> new_boxes;
-    for (size_t i = 0; i < quest_results.size(); i++){
-        const auto& box = quest_results[i];
-
-        pxint_t radius = (pxint_t)((box.width() + box.height()) / 4 + 0.5);
-        pxint_t center_x = (pxint_t)box.center_x();
-        pxint_t center_y = (pxint_t)box.center_y();
-        auto new_box = ImagePixelBox(center_x - radius, center_y - radius, center_x + radius, center_y + radius);
-        new_boxes.push_back(new_box);
-    }
-
-    // Leave map view, back to overworld
-    pbf_press_button(context, BUTTON_B, 20, 50);
-
-    // Now go to Mai to see the reviewed map
-    goto_Mai_from_camp(env.logger(), context, camp);
-
-    pbf_mash_button(context, BUTTON_A, 350);
-    context.wait_for_all_requests();
-    
-    // Wait for the last dialog box before the MMO pokemon sprites are revealed.
-    EventDialogDetector event_dialog_detector(env.logger(), env.console.overlay(), true);
-    int ret = wait_until(env.console, context, std::chrono::seconds(10), {{event_dialog_detector}});
-    if (ret < 0){
-        throw OperationFailedException(
-            ErrorReport::SEND_ERROR_REPORT, env.console,
-            "Dialog box not detected when waiting for MMO map.",
-            true
-        );
-    }
-
-    pbf_press_button(context, BUTTON_B, 50, 50);
-
-    MapDetector map_detector;
-    ret = wait_until(env.console, context, std::chrono::seconds(5), {{map_detector}});
-    if (ret < 0){
-        throw OperationFailedException(
-            ErrorReport::SEND_ERROR_REPORT, env.console,
-            "Map not detected after talking to Mai.",
-            true
-        );
-    }
-    env.console.log("Found revealed map thanks to Munchlax!");
-
-    VideoOverlaySet mmo_sprites_overlay(env.console);
-    for (size_t i = 0; i < new_boxes.size(); i++){
-        mmo_sprites_overlay.add(COLOR_BLUE, pixelbox_to_floatbox(question_mark_image, new_boxes[i]));
-    }
-
-    // Move cursor away so that it does not show a text box that occludes MMO sprites.
-    pbf_move_left_joystick(context, 0, 0, 300, 30);
-    context.wait_for_all_requests();
-
-    std::set<std::string> found;
-
-    // Check MMO results:
-    std::vector<std::string> sprites;
-    VideoSnapshot sprites_screen = env.console.video().snapshot();
-    for (size_t i = 0; i < new_boxes.size(); i++){
-        auto result = match_sprite_on_map(env.logger(), sprites_screen, new_boxes[i], region, DEBUG_MODE);
-        env.console.log("Found MMO sprite " + result.slug);
-        stats.mmo_pokemon++;
-
-        sprites.push_back(result.slug);
-        if (desired_MMOs.find(result.slug) != desired_MMOs.end()){
-            found.insert(result.slug);
-        }
-    }
-
-    // Check star MMO results:
-    std::vector<ImagePixelBox> star_boxes;
-    for (size_t i = 0; i < new_boxes.size(); i++){
-        const auto& sprite_box = new_boxes[i];
-        pxint_t radius = (pxint_t)sprite_box.width() / 2;
-        pxint_t center_x = (pxint_t)sprite_box.center_x();
-        pxint_t center_y = (pxint_t)sprite_box.center_y();
-        ImagePixelBox star_box(
-            center_x + radius/10,
-            center_y - radius*16/10,
-            center_x + radius * 5/4,
-            center_y
-        );
-        star_boxes.push_back(std::move(star_box));
-    }
-
-    MMOSpriteStarSymbolDetector star_detector(sprites_screen, star_boxes);
-
-    env.log("Detect star symbols...");
-    ret = wait_until(env.console, context, std::chrono::seconds(5), {{star_detector}});
-    for (size_t i = 0; i < new_boxes.size(); i++){
-        std::ostringstream os;
-        os << "- " << sprites[i] << " box [" << star_boxes[i].min_x << ", " << star_boxes[i].min_y
-           << star_boxes[i].max_x << ", " << star_boxes[i].max_y << "]"
-           <<  " motion: " << star_detector.animation_value(i)
-           << " color: " << star_detector.symbol_color(i);
-        if (star_detector.is_star(i)){
-            stats.stars++;
-            os << ", has star";
-            if (desired_star_MMOs.find(sprites[i]) != desired_star_MMOs.end()){
-                found.insert(sprites[i]);
-            }
-        }
-        env.log(os.str());
-    }
-
-    env.update_stats();
-
-    return found;
-}
-
-
-bool OutbreakFinder::run_iteration(
-    SingleSwitchProgramEnvironment& env, BotBaseContext& context,
-    const std::set<std::string>& desired_hisui_map_events,
-    const std::set<std::string>& desired_outbreaks,
-    const std::set<std::string>& desired_MMOs,
-    const std::set<std::string>& desired_star_MMOs
-){
-    OutbreakFinder_Descriptor::Stats& stats = env.current_stats<OutbreakFinder_Descriptor::Stats>();
-
-    //  Enter map.
-    try{
-        open_travel_map_from_jubilife(env, env.console, context);
-    }catch (OperationFailedException&){
-        stats.errors++;
-        throw;
-    }
-    context.wait_for(std::chrono::milliseconds(500));
-
-    // found_hisui_map_events: desired pokemon names or MMO names
-    std::set<std::string> found_hisui_map_events;
-    found_hisui_map_events = read_travel_map_outbreaks(env, context, desired_hisui_map_events);
-
-    bool inside_travel_map = true;
-    if (found_hisui_map_events.size() > 0){
-        // Check if we found any Massive Outbreak pokemon (including MMO symbol targets)
-        {
-            std::vector<std::string> desired_outbreaks_found;
-            for(const auto& found : found_hisui_map_events){
-                if (desired_outbreaks.find(found) != desired_outbreaks.end()){
-                    desired_outbreaks_found.push_back(found);
-                }
-            }
-            if (desired_outbreaks_found.size() > 0){
-                stats.matches += desired_outbreaks_found.size();
-                std::ostringstream os;
-                os << "Found following desired outbreak" << (desired_outbreaks_found.size() > 1 ? "s: " : ": ");
-                for(const auto& outbreak: desired_outbreaks_found){
-                    os << outbreak << ", ";
-                }
-                env.log(os.str());
-                return true;
-            }
-            else{
-                env.log("No desired outbreak.");
-            }
-        }
-
-        // What we found is MMO symbols for MMO pokemon.
-        // Go into those regions to check MMO details.
-
-        // Cancel map view
-        inside_travel_map = false;
-        pbf_press_button(context, BUTTON_B, 50, 50);
-        // Leave the guard.
-        pbf_move_left_joystick(context, 128, 0, 100, 50);
-        // Checking MMO costs Aguav berries.
-        // To not waste them, save here so that we can reset to get berries back.
-        save_game_from_overworld(env, env.console, context);
-
-        for(const auto& mmo_name: found_hisui_map_events){
-            std::set<std::string> found_pokemon = enter_region_and_read_MMO(env, context, mmo_name, desired_MMOs, desired_star_MMOs);
-            if (found_pokemon.size() > 0){
-                stats.matches += found_pokemon.size();
-                std::ostringstream os;
-                os << "Found desired MMO pokemon (including desired MMO pokemon with star symbols): ";
-                for (const auto& pokemon : found_pokemon){
-                    os << pokemon << ", ";
-                }
-                env.log(os.str());
-                return true;
-            }
-
-            env.log("No target MMO sprite found. Reset game...");
-            pbf_press_button(context, BUTTON_HOME, 20, GameSettings::instance().GAME_TO_HOME_DELAY);
-            reset_game_from_home(env, env.console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST);
-        }
-    }
-
-    env.update_stats();
-    send_program_status_notification(env, NOTIFICATION_STATUS);
-
-    //  Go to region and return.
-    env.log("Go to a random region and back to refresh outbreaks...");
-    goto_region_and_return(env, context, inside_travel_map);
-
-    return false;
-}
-
-
-std::set<std::string> OutbreakFinder::to_set(const StringSelectTableOption& option){
-    std::set<std::string> ret;
-    for (std::string& slug : option.all_slugs()){
-        ret.insert(std::move(slug));
-    }
-    return ret;
-}
-
-void OutbreakFinder::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-//    OutbreakFinder_Descriptor::Stats& stats = env.current_stats<OutbreakFinder_Descriptor::Stats>();
-
-    // goto_Mai_from_camp(env.logger(), context, Camp::HIGHLANDS_HIGHLANDS);
-    // return;
-
-    std::set<std::string> desired_outbreaks = to_set(DESIRED_MO_SLUGS);
-    std::set<std::string> desired_MMO_pokemon = to_set(DESIRED_MMO_SLUGS);
-    std::set<std::string> desired_star_MMO_pokemon = to_set(DESIRED_STAR_MMO_SLUGS);
-    {
-        std::ostringstream os;
-        os << "Desired outbreaks: ";
-        std::copy(desired_outbreaks.begin(), desired_outbreaks.end(), std::ostream_iterator<std::string>(os, ", "));
-        env.log(os.str());
-        os = std::ostringstream();
-        os << "Desired first-wave MMO pokemon: ";
-        std::copy(desired_MMO_pokemon.begin(), desired_MMO_pokemon.end(), std::ostream_iterator<std::string>(os, ", "));
-        env.log(os.str());
-        os = std::ostringstream();
-        os << "Desired MMO pokemon with star: ";
-        std::copy(desired_star_MMO_pokemon.begin(), desired_star_MMO_pokemon.end(), std::ostream_iterator<std::string>(os, ", "));
-        env.log(os.str());
-    }
-
-    // desired_hisui_map_events: the slugs of travel map event. This includes
-    // - Massive Outbreak pokemon
-    // - Question mark MMO event at any region
-    std::set<std::string> desired_hisui_map_events = desired_outbreaks;
-
-    // If the user sets MMO pokemon, then we should add the MMO map events that may spawn those MMO pokemon to
-    // `desired_hisui_map_events`.
-
-    // MMO_targets: MMO map event slug (e.g. "fieldlands-mmo") -> how many desired MMO pokemon can spawn on this map
-    std::map<std::string, int> MMO_targets;
-    // Check if each MMO map event may spawn desired MMO pokemon:
-    for(size_t i = 0; i < 5; i++){
-        for(const std::string& sprite_slug: MMO_FIRST_WAVE_REGION_SPRITE_SLUGS()[i]){
-            if (desired_MMO_pokemon.find(sprite_slug) != desired_MMO_pokemon.end()
-                || desired_star_MMO_pokemon.find(sprite_slug) != desired_star_MMO_pokemon.end()
-            ){
-                MMO_targets[MMO_NAMES()[i]]++;
-            }
-        }
-    }
-
-    std::ostringstream os;
-    os << "User requires MMO pokemon. Need to visit (\"map MMO name\", \"how many desired MMO pokemon on the map\"): ";
-    for(const auto& p : MMO_targets){
-        os << "(" << p.first << ", " << p.second << ") ";
-    }
-    env.log(os.str());
-
-    // Add MMO map event targets (e.g. "fieldlands-mmo") derived from user selected MMO pokemon to 
-    // `desired_hisui_map_events`.
-    for(const auto& p : MMO_targets){
-        desired_hisui_map_events.insert(p.first);
-    }
-
-    while (true){
-        if (run_iteration(env, context, desired_hisui_map_events, desired_outbreaks, desired_MMO_pokemon, 
-            desired_star_MMO_pokemon))
-        {
-            break;
-        }
-    }
-
-    env.update_stats();
-
-    send_program_notification(
-        env, NOTIFICATION_MATCHED,
-        COLOR_GREEN,
-        "Found Outbreak",
-        {}, "",
-        env.console.video().snapshot()
-    );
-
-    GO_HOME_WHEN_DONE.run_end_of_program(context);
-}
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonLA/Programs/General/PokemonLA_OutbreakFinder.h b/SerialPrograms/Source/PokemonLA/Programs/General/PokemonLA_OutbreakFinder.h
deleted file mode 100644
index 7c0dbd8bb6..0000000000
--- a/SerialPrograms/Source/PokemonLA/Programs/General/PokemonLA_OutbreakFinder.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/*  Outbreak Finder
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonLA_OutbreakFinder_H
-#define PokemonAutomation_PokemonLA_OutbreakFinder_H
-
-#include "CommonFramework/Options/StringSelectOption.h"
-#include "CommonFramework/Options/LanguageOCROption.h"
-#include "CommonFramework/Options/StringSelectTableOption.h"
-#include "CommonFramework/Notifications/EventNotificationsTable.h"
-#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-#include "PokemonLA/PokemonLA_TravelLocations.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-
-class OutbreakFinder_Descriptor : public SingleSwitchProgramDescriptor{
-public:
-    OutbreakFinder_Descriptor();
-
-    class Stats;
-    virtual std::unique_ptr<StatsTracker> make_stats() const override;
-};
-
-
-class OutbreakFinder : public SingleSwitchProgramInstance{
-public:
-    OutbreakFinder();
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-
-private:
-    // One iteration in the main program loop
-    // - desired_hisui_map_events: desired events happening on the travel map of Hisui when leaving Jubilife Village.
-    //   It contains desired pokemon outbreak names and MMO outbreak names (e.g. "fieldlands-mmo"). If there are
-    //   desired MMO pokemon (including those with star symbols), the MMO outbreaks that may spawn them are also
-    //   included in `desired_hisui_map_events`.
-    // - desired_outbreaks: desired events happening on the travel map of Hisui when leaving Jubilife Village.
-    //   This includes any user selected outbreak pokemon and user explicitly selected MMO events (e.g. "fieldlands-mmo")
-    //   in DESIRED_MO_SLUGS.
-    //   User selected MMO pokemon (including those with star symbols) do not affect `desired_outbreaks`.
-    // - desired_MMO_pokemon: user desired MMO pokemon selected by `DESIRED_MMO_SLUGS`.
-    //   User selected MMO pokemon with star symbols, `DESIRED_STAR_MMO_SLUGS` do not affect `desired_MMO_pokemon`. 
-    // - desired_star_MMO_pokemon: user desired MMO pokemon with star symbols.
-    bool run_iteration(SingleSwitchProgramEnvironment& env, BotBaseContext& context,
-        const std::set<std::string>& desired_hisui_map_events,
-        const std::set<std::string>& desired_outbreaks,
-        const std::set<std::string>& desired_MMO_pokemon,
-        const std::set<std::string>& desired_star_MMO_pokemon);
-    
-    //  Read the travel map from Jublilife village to find any desired pokemon or MMO events. 
-    //  Return true if program should stop (match found).
-    //  desired_events: the desired set of pokemon slugs and MMO events.
-    std::set<std::string> read_travel_map_outbreaks(
-        SingleSwitchProgramEnvironment& env, BotBaseContext& context,
-        const std::set<std::string>& desired_events
-    );
-
-    // Enter a map with MMO and read names of the pokemon appearing in the MMO.
-    // - mmo_name: MMO event slug, e.g. "fieldlands-mmo"
-    std::set<std::string> enter_region_and_read_MMO(
-        SingleSwitchProgramEnvironment& env, BotBaseContext& context,
-        const std::string& mmo_name,
-        const std::set<std::string>& desired_MMOs,
-        const std::set<std::string>& desired_star_MMOs
-    );
-
-    // Go to a random wild region and return to refresh outbreaks.
-    // If `inside_map` is true, the function is called when the game is inside the travel map.
-    // Otherwise, the function is called when the player character is standing at the program start location.
-    void goto_region_and_return(
-        SingleSwitchProgramEnvironment& env, BotBaseContext& context,
-        bool inside_map
-    );
-
-    static std::set<std::string> to_set(const StringSelectTableOption& option);
-
-
-private:
-    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
-
-    OCR::LanguageOCROption LANGUAGE;
-
-    StringSelectTableOption DESIRED_MO_SLUGS;
-    StringSelectTableOption DESIRED_MMO_SLUGS;
-    StringSelectTableOption DESIRED_STAR_MMO_SLUGS;
-
-    BooleanCheckBoxOption DEBUG_MODE;
-
-    EventNotificationOption NOTIFICATION_STATUS;
-    EventNotificationOption NOTIFICATION_MATCHED;
-    EventNotificationsOption NOTIFICATIONS;
-};
-
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonLA/Programs/General/PokemonLA_PokedexTasksReader.cpp b/SerialPrograms/Source/PokemonLA/Programs/General/PokemonLA_PokedexTasksReader.cpp
deleted file mode 100644
index 31302fa0ca..0000000000
--- a/SerialPrograms/Source/PokemonLA/Programs/General/PokemonLA_PokedexTasksReader.cpp
+++ /dev/null
@@ -1,104 +0,0 @@
-/*  Pokedex Tasks Reader
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/ImageTypes/ImageRGB32.h"
-#include "CommonFramework/ImageTools/ImageFilter.h"
-#include "CommonFramework/Notifications/ProgramNotifications.h"
-#include "CommonFramework/OCR/OCR_NumberReader.h"
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonLA_PokedexTasksReader.h"
-
-#include <array>
-#include <fstream>
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-    using namespace Pokemon;
-
-
-class PokemonTasksReader{
-public:
-    PokemonTasksReader(ConsoleHandle& console)
-        : m_console(console)
-        , m_tasks_box{
-            OverlayBoxScope(console, {0.400, 0.190, 0.040, 0.045}),
-            OverlayBoxScope(console, {0.400, 0.244, 0.040, 0.045}),
-            OverlayBoxScope(console, {0.400, 0.298, 0.040, 0.045}),
-            OverlayBoxScope(console, {0.400, 0.353, 0.040, 0.045}),
-            OverlayBoxScope(console, {0.400, 0.406, 0.040, 0.045}),
-            OverlayBoxScope(console, {0.400, 0.460, 0.040, 0.045}),
-            OverlayBoxScope(console, {0.400, 0.514, 0.040, 0.045}),
-            OverlayBoxScope(console, {0.400, 0.568, 0.040, 0.045}),
-            OverlayBoxScope(console, {0.400, 0.622, 0.040, 0.045})
-        }
-    {}
-
-    std::array<int, 9> read_tasks(const ImageViewRGB32& screen) const
-    {
-        std::array<int, 9> tasks{};
-        for (size_t i = 0; i < m_tasks_box.size(); ++i)
-        {
-            ImageRGB32 image = to_blackwhite_rgb32_range(extract_box_reference(screen, m_tasks_box[i]), 0xff808080, 0xffffffff, false);
-            tasks[i] = OCR::read_number(m_console, image);
-        }
-        return tasks;
-    }
-
-private:
-    ConsoleHandle& m_console;
-    std::array<OverlayBoxScope, 9> m_tasks_box;
-};
-
-PokedexTasksReader_Descriptor::PokedexTasksReader_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonLA:PokedexTasksReader",
-        STRING_POKEMON + " LA", STRING_POKEDEX + " Tasks Reader",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonLA/PokedexTasksReader.md",
-        "Read all the tasks in your " + STRING_POKEDEX + " and output a file with the tasks you did.",
-        FeedbackType::REQUIRED,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-
-
-PokedexTasksReader::PokedexTasksReader(){}
-
-
-void PokedexTasksReader::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    //  Connect the controller.
-    pbf_press_button(context, BUTTON_LCLICK, 5, 5);
-
-    std::ofstream output_file("output.txt");
-
-    for (int i = 0; i < 242; ++i)
-    {
-        PokemonTasksReader reader(env.console);
-        std::array<int, 9> tasks = reader.read_tasks(env.console.video().snapshot());
-        for (auto task : tasks)
-        {
-            if (task != -1)
-            {
-                output_file << task << "\n";
-            }
-        }
-        pbf_press_dpad(context, DPAD_DOWN, 10, TICKS_PER_SECOND);
-        context.wait_for_all_requests();
-    }
-
-    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
-}
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonLA/Programs/General/PokemonLA_PokedexTasksReader.h b/SerialPrograms/Source/PokemonLA/Programs/General/PokemonLA_PokedexTasksReader.h
deleted file mode 100644
index 9bd914858a..0000000000
--- a/SerialPrograms/Source/PokemonLA/Programs/General/PokemonLA_PokedexTasksReader.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*  Pokedex Tasks Reader
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonLA_PokedexTasksReader_H
-#define PokemonAutomation_PokemonLA_PokedexTasksReader_H
-
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-
-class PokedexTasksReader_Descriptor : public SingleSwitchProgramDescriptor{
-public:
-    PokedexTasksReader_Descriptor();
-};
-
-
-class PokedexTasksReader : public SingleSwitchProgramInstance{
-public:
-    PokedexTasksReader();
-
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-};
-
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonLA/Programs/General/PokemonLA_RamanasIslandCombee.cpp b/SerialPrograms/Source/PokemonLA/Programs/General/PokemonLA_RamanasIslandCombee.cpp
deleted file mode 100644
index 41391321f4..0000000000
--- a/SerialPrograms/Source/PokemonLA/Programs/General/PokemonLA_RamanasIslandCombee.cpp
+++ /dev/null
@@ -1,343 +0,0 @@
-/*  Ramanas Island Combee Finder
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <array>
-#include <sstream>
-#include "CommonFramework/Exceptions/OperationFailedException.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
-#include "CommonFramework/Notifications/ProgramNotifications.h"
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "CommonFramework/Tools/StatsTracking.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "NintendoSwitch/NintendoSwitch_Settings.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonLA/PokemonLA_Settings.h"
-#include "PokemonLA/PokemonLA_TravelLocations.h"
-#include "PokemonLA/Inference/Battles/PokemonLA_BattleMenuDetector.h"
-#include "PokemonLA/Inference/PokemonLA_BlackOutDetector.h"
-#include "PokemonLA/Inference/PokemonLA_OverworldDetector.h"
-#include "PokemonLA/Inference/Sounds/PokemonLA_ShinySoundDetector.h"
-#include "PokemonLA/Programs/PokemonLA_MountChange.h"
-#include "PokemonLA/Programs/PokemonLA_GameEntry.h"
-#include "PokemonLA/Programs/General/PokemonLA_RamanasIslandCombee.h"
-#include "PokemonLA/Programs/PokemonLA_LeapPokemonActions.h"
-#include "CommonFramework/GlobalSettingsPanel.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-    using namespace Pokemon;
-
-
-
-RamanasCombeeFinder_Descriptor::RamanasCombeeFinder_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonLA:Ramanas Island Combee Finder",
-        STRING_POKEMON + " LA", "Ramanas Combee Finder",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonLA/RamanasCombeeFinder.md",
-        "Check Ramanas Island Tree until a Combee is found",
-        FeedbackType::REQUIRED,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-class RamanasCombeeFinder_Descriptor::Stats : public StatsTracker{
-public:
-    Stats()
-        : attempts(m_stats["Attempts"])
-        , trees(m_stats["Trees"])
-        , errors(m_stats["Errors"])
-        , blackouts(m_stats["Blackouts"])
-        , found(m_stats["Found"])
-        , enroute_shinies(m_stats["Enroute Shinies"])
-    {
-        m_display_order.emplace_back("Attempts");
-        m_display_order.emplace_back("Trees");
-        m_display_order.emplace_back("Errors", true);
-        m_display_order.emplace_back("Blackouts", true);
-        m_display_order.emplace_back("Found");
-        m_display_order.emplace_back("Enroute Shinies");
-        m_aliases["Shinies"] = "Enroute Shinies";
-    }
-
-    std::atomic<uint64_t>& attempts;
-    std::atomic<uint64_t>& trees;
-    std::atomic<uint64_t>& errors;
-    std::atomic<uint64_t>& blackouts;
-    std::atomic<uint64_t>& found;
-    std::atomic<uint64_t>& enroute_shinies;
-};
-std::unique_ptr<StatsTracker> RamanasCombeeFinder_Descriptor::make_stats() const{
-    return std::unique_ptr<StatsTracker>(new Stats());
-}
-
-
-RamanasCombeeFinder:: RamanasCombeeFinder()
-    : LANGUAGE(
-        "<b>Game Language</b>",
-        Pokemon::PokemonNameReader::instance().languages(),
-        LockWhileRunning::LOCKED,
-        true
-    )
-    , SHINY_DETECTED_ENROUTE(
-        "Enroute Shiny Action",
-        "This applies if a shiny is detected while traveling in the overworld.",
-        "0 * TICKS_PER_SECOND"
-    )
-    , NOTIFICATION_STATUS("Status Update", true, false, std::chrono::seconds(3600))
-    , NOTIFICATIONS({
-        &NOTIFICATION_STATUS,
-        &SHINY_DETECTED_ENROUTE.NOTIFICATIONS,
-        &NOTIFICATION_PROGRAM_FINISH,
-        &NOTIFICATION_ERROR_RECOVERABLE,
-        &NOTIFICATION_ERROR_FATAL,
-    })
-    , SAVE_DEBUG_VIDEO(
-        "<b>Save debug videos to Switch:</b>",
-        LockWhileRunning::LOCKED,
-        false
-    )
-{
-    PA_ADD_OPTION(LANGUAGE);
-    PA_ADD_OPTION(SHINY_DETECTED_ENROUTE);
-    PA_ADD_OPTION(NOTIFICATIONS);
-    if (PreloadSettings::instance().DEVELOPER_MODE){
-        PA_ADD_OPTION(SAVE_DEBUG_VIDEO);
-    }
-}
-
-
-void RamanasCombeeFinder::check_tree_no_stop(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    context.wait_for_all_requests();
-    disable_shiny_sound(context);
-    // Throw pokemon
-    pbf_press_button(context, BUTTON_ZR, (0.5 * TICKS_PER_SECOND), 1.5 * TICKS_PER_SECOND);
-    context.wait_for_all_requests();
-    env.current_stats<RamanasCombeeFinder_Descriptor::Stats>().trees++;
-    env.update_stats();
-}
-
-bool RamanasCombeeFinder::check_tree(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    context.wait_for_all_requests();
-
-    disable_shiny_sound(context);
-    bool battle_found = check_tree_or_ore_for_battle(env.console, context);
-    env.current_stats<RamanasCombeeFinder_Descriptor::Stats>().trees++;
-    env.update_stats();
-
-    context.wait_for_all_requests();
-
-    bool ret = false;
-    if (battle_found){
-        ret = handle_battle(env, context);
-    }
-
-    enable_shiny_sound(context);
-
-    return ret;
-}
-
-
-void RamanasCombeeFinder::disable_shiny_sound(BotBaseContext& context){
-    context.wait_for_all_requests();
-    m_enable_shiny_sound.store(false, std::memory_order_release);
-}
-void RamanasCombeeFinder::enable_shiny_sound(BotBaseContext& context){
-    context.wait_for_all_requests();
-    m_enable_shiny_sound.store(true, std::memory_order_release);
-}
-
-bool RamanasCombeeFinder::handle_battle(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    RamanasCombeeFinder_Descriptor::Stats& stats = env.current_stats<RamanasCombeeFinder_Descriptor::Stats>();
-
-    PokemonDetails pokemon = get_pokemon_details(env.console, context, LANGUAGE);
-
-    pbf_press_button(context, BUTTON_B, 20, 225);
-
-    context.wait_for_all_requests();
-
-    if (pokemon.name_candidates.find("combee") == pokemon.name_candidates.end()){
-        env.console.log("Not a Combee, leaving battle.");
-        exit_battle(env.console, context, ExitBattleMethod::RunAway);
-        return false;
-    }
-
-    env.console.log("Combee found");
-    stats.found++;
-    on_match_found(env, env.console, context, SHINY_DETECTED_ENROUTE, true);
-    return true;
-}
-
-void RamanasCombeeFinder::grouped_path(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-
-    BattleMenuDetector battle_menu_detector(env.console, env.console, true);
-
-    int ret = run_until(
-        env.console, context,
-        [&](BotBaseContext& context){
-
-            env.console.log("Checking Tree 1");
-            change_mount(env.console,context,MountState::BRAVIARY_ON);
-            pbf_move_left_joystick(context, 241, 0, 100, 20);
-            pbf_press_button(context, BUTTON_B, 2390, 0);
-            pbf_press_button(context, BUTTON_Y, 380, 0);
-            pbf_move_right_joystick(context, 127, 255, 90, 20);
-            check_tree_no_stop(env, context);
-
-            env.console.log("Checking Tree 2");
-            pbf_press_button(context, BUTTON_PLUS, 20, 200);
-            pbf_move_left_joystick(context, 242, 0, 100, 20);
-            context.wait_for_all_requests();
-            enable_shiny_sound(context);
-            pbf_press_button(context, BUTTON_B, 420, 0);
-            pbf_press_button(context, BUTTON_Y, 380, 0);
-            pbf_move_right_joystick(context, 127, 255, 90, 20);
-            check_tree_no_stop(env, context);
-
-            env.console.log("Checking Tree 3");
-            pbf_press_button(context, BUTTON_PLUS, 20, 200);
-            pbf_move_left_joystick(context, 0, 60, 100, 20);
-            context.wait_for_all_requests();
-            enable_shiny_sound(context);
-            pbf_press_button(context, BUTTON_B, 350, 0);
-            pbf_press_button(context, BUTTON_Y, 380, 0);
-            pbf_move_right_joystick(context, 127, 255, 90, 20);
-            check_tree_no_stop(env, context);
-
-            env.console.log("Checking Tree 4");
-            pbf_press_button(context, BUTTON_PLUS, 20, 200);
-            pbf_move_left_joystick(context, 50, 255, 100, 20);
-            context.wait_for_all_requests();
-            enable_shiny_sound(context);
-            pbf_press_button(context, BUTTON_B, 375, 0);
-            pbf_press_button(context, BUTTON_Y, 380, 0);
-            pbf_move_right_joystick(context, 127, 255, 90, 20);
-            check_tree_no_stop(env, context);
-
-            env.console.log("Checking Tree 5");
-            pbf_press_button(context, BUTTON_PLUS, 20, 200);
-            pbf_move_left_joystick(context, 200, 0, 100, 20);
-            context.wait_for_all_requests();
-            enable_shiny_sound(context);
-            pbf_press_button(context, BUTTON_B, 85, 0);
-            pbf_press_button(context, BUTTON_Y, 380, 0);
-            pbf_move_right_joystick(context, 127, 255, 90, 20);
-        },
-        {
-            {battle_menu_detector},
-        }
-    );
-
-    if (ret == 0){
-        if (handle_battle(env, context)){
-            env.console.log("Battle found before last tree in the path.");
-        }
-
-    } else{
-        check_tree(env, context);
-        env.console.log("Checked all trees in the path.");
-    }
-
-}
-
-void RamanasCombeeFinder::run_iteration(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    RamanasCombeeFinder_Descriptor::Stats& stats = env.current_stats<RamanasCombeeFinder_Descriptor::Stats>();
-    stats.attempts++;
-    env.update_stats();
-    env.console.log("Starting route and shiny detection...");
-
-    for (size_t c = 0; true; c++){
-        context.wait_for_all_requests();
-        if (is_pokemon_selection(env.console, env.console.video().snapshot())){
-            break;
-        }
-        if (c >= 5){
-            throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, env.console,
-                "Failed to switch to Pokemon selection after 5 attempts.",
-                true
-            );
-        }
-        env.console.log("Not on Pokemon selection. Attempting to switch to it...", COLOR_ORANGE);
-        pbf_press_button(context, BUTTON_X, 20, 230);
-    }
-
-    float shiny_coefficient = 1.0;
-
-    ShinySoundDetector shiny_detector(env.console, [&](float error_coefficient) -> bool{
-        //  Warning: This callback will be run from a different thread than this function.
-        if (!m_enable_shiny_sound.load()){
-            return false;
-        }
-        stats.enroute_shinies++;
-        shiny_coefficient = error_coefficient;
-        return on_shiny_callback(env, env.console, SHINY_DETECTED_ENROUTE, error_coefficient);
-    });
-
-    BlackOutDetector black_out_detector(env.console, env.console);
-
-    goto_camp_from_jubilife(env, env.console, context, TravelLocations::instance().Fieldlands_Heights);
-
-    int ret = run_until(
-        env.console, context,
-        [&](BotBaseContext& context){
-            grouped_path(env, context);
-            context.wait_for_all_requests();
-            goto_camp_from_overworld(env, env.console, context);
-            goto_professor(env.console, context, Camp::FIELDLANDS_FIELDLANDS);
-        },
-        {{shiny_detector, black_out_detector}}
-    );
-    shiny_detector.throw_if_no_sound();
-    if (ret == 0){
-        on_shiny_sound(env, env.console, context, SHINY_DETECTED_ENROUTE, shiny_coefficient);
-    }else if (ret == 1){
-        env.log("Character blacks out");
-        // black out.
-        stats.blackouts++;
-        env.update_stats();
-        if (SAVE_DEBUG_VIDEO){
-            // Take a video to know why it blacks out
-            pbf_press_button(context, BUTTON_CAPTURE, 2 * TICKS_PER_SECOND, 2 * TICKS_PER_SECOND);
-            context.wait_for_all_requests();
-        }
-        throw OperationFailedException(
-            ErrorReport::SEND_ERROR_REPORT, env.console,
-            "Black out.",
-            true
-        );
-    }
-
-    from_professor_return_to_jubilife(env, env.console, context);
-}
-
-void RamanasCombeeFinder::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    RamanasCombeeFinder_Descriptor::Stats& stats = env.current_stats<RamanasCombeeFinder_Descriptor::Stats>();
-
-    //  Connect the controller.
-    pbf_press_button(context, BUTTON_LCLICK, 5, 5);
-
-    while (true){
-        env.update_stats();
-        send_program_status_notification(env, NOTIFICATION_STATUS);
-        try{
-            run_iteration(env, context);
-        }catch (OperationFailedException& e){
-            stats.errors++;
-            e.send_notification(env, NOTIFICATION_ERROR_RECOVERABLE);
-
-            pbf_press_button(context, BUTTON_HOME, 20, GameSettings::instance().GAME_TO_HOME_DELAY);
-            reset_game_from_home(env, env.console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST);
-        }
-    }
-
-    env.update_stats();
-    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
-}
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonLA/Programs/General/PokemonLA_RamanasIslandCombee.h b/SerialPrograms/Source/PokemonLA/Programs/General/PokemonLA_RamanasIslandCombee.h
deleted file mode 100644
index d1a6200604..0000000000
--- a/SerialPrograms/Source/PokemonLA/Programs/General/PokemonLA_RamanasIslandCombee.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*  Combee Finder
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonLA_RamanasIslandCombee_H
-#define PokemonAutomation_PokemonLA_RamanasIslandCombee_H
-
-#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
-#include "CommonFramework/Options/LanguageOCROption.h"
-#include "CommonFramework/Notifications/EventNotificationsTable.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-#include "PokemonLA/Options/PokemonLA_ShinyDetectedAction.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-
-class RamanasCombeeFinder_Descriptor : public SingleSwitchProgramDescriptor{
-public:
-    RamanasCombeeFinder_Descriptor();
-
-    class Stats;
-    virtual std::unique_ptr<StatsTracker> make_stats() const override;
-};
-
-
-class RamanasCombeeFinder: public SingleSwitchProgramInstance{
-public:
-    RamanasCombeeFinder();
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-    void run_iteration(SingleSwitchProgramEnvironment& env, BotBaseContext& context);
-    void grouped_path(SingleSwitchProgramEnvironment& env, BotBaseContext& context);
-    void check_tree_no_stop(SingleSwitchProgramEnvironment& env, BotBaseContext& context);
-    bool check_tree(SingleSwitchProgramEnvironment& env, BotBaseContext& context);
-    bool handle_battle(SingleSwitchProgramEnvironment& env, BotBaseContext& context);
-    void disable_shiny_sound(BotBaseContext& context);
-    void enable_shiny_sound(BotBaseContext& context);
-
-private:
-    class RunRoute;
-
-    std::atomic<bool> m_enable_shiny_sound{true};
-
-    OCR::LanguageOCROption LANGUAGE;
-    ShinyDetectedActionOption SHINY_DETECTED_ENROUTE;
-
-    EventNotificationOption NOTIFICATION_STATUS;
-    EventNotificationsOption NOTIFICATIONS;
-
-    BooleanCheckBoxOption SAVE_DEBUG_VIDEO;
-};
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonLA/Programs/General/PokemonLA_SkipToFullMoon.cpp b/SerialPrograms/Source/PokemonLA/Programs/General/PokemonLA_SkipToFullMoon.cpp
deleted file mode 100644
index 9e0a830d03..0000000000
--- a/SerialPrograms/Source/PokemonLA/Programs/General/PokemonLA_SkipToFullMoon.cpp
+++ /dev/null
@@ -1,128 +0,0 @@
-/*  Skip to Full Moon
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/Exceptions/OperationFailedException.h"
-#include "CommonFramework/Notifications/ProgramNotifications.h"
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonLA/Inference/Objects/PokemonLA_ArcPhoneDetector.h"
-#include "PokemonLA/Inference/PokemonLA_ItemCompatibilityDetector.h"
-#include "PokemonLA_SkipToFullMoon.h"
-
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-using namespace Pokemon;
-
-
-SkipToFullMoon_Descriptor::SkipToFullMoon_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonLA:SkipToFullMoon",
-        STRING_POKEMON + " LA", "Skip to Full Moon",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonLA/SkipToFullMoon.md",
-        "Skip nights until full moon.",
-        FeedbackType::REQUIRED,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-
-
-SkipToFullMoon::SkipToFullMoon()
-    : NOTIFICATIONS({
-        &NOTIFICATION_PROGRAM_FINISH,
-        &NOTIFICATION_ERROR_FATAL,
-    })
-{
-    PA_ADD_OPTION(NOTIFICATIONS);
-}
-
-
-void SkipToFullMoon::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    //  Connect the controller.
-    pbf_press_button(context, BUTTON_LCLICK, 5, 5);
-
-    while (true){
-        // Open menu
-        pbf_press_dpad(context, DPAD_UP, 20, 120);
-        context.wait_for_all_requests();
-
-        const auto compatibility = detect_item_compatibility(env.console.video().snapshot());
-
-        if (compatibility == ItemCompatibility::NONE){
-            throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, env.console,
-                "Unable to detect item compatibility.",
-                true
-            );
-        }
-
-        if (compatibility == ItemCompatibility::COMPATIBLE){
-            // Ursaring can evolve, it's full moon now.
-            break;
-        }
-
-        // Do another time skip:
-
-        // Close menu
-        pbf_press_button(context, BUTTON_B, 20, 100);
-        // Character turn around to face the tent
-        pbf_move_left_joystick(context, 128, 0, 20, 100);
-        // Press A to show the "how long do you rest" dialogue
-        pbf_press_button(context, BUTTON_A, 10, 100);
-        // Press A to show the time menu
-        pbf_press_button(context, BUTTON_A, 10, 30);
-        // Move the selection to "Until nightfall"
-        pbf_press_dpad(context, DPAD_UP, 10, 30);
-        pbf_press_dpad(context, DPAD_UP, 10, 50);
-
-        // Press A to sleep to next night
-        pbf_press_button(context, BUTTON_A, 20, 50);
-        // Sleeping
-        pbf_wait(context, 8 * TICKS_PER_SECOND);
-        context.wait_for_all_requests();
-
-        const bool stop_on_detected = true;
-
-        // DialogueEllipseDetector dialogue_ellipse_detector(env.console, env.console, std::chrono::milliseconds(200), 
-        //     DialogueEllipseDetector::EllipseLocation::TENT, stop_on_detected);
-        // int ret = wait_until(
-        //     env.console, context, std::chrono::seconds(8),
-        //     {{dialogue_ellipse_detector}}
-        // );
-        // if (ret != 0){
-        //     std::cout << "ERROR! Cannot detect the dialogue ellipse" << std::endl;
-        // }
-        // Press B to clear the "You Pokemon happy and healty" dialogue.
-        // pbf_press_button(context, BUTTON_B, 20, 100);
-
-
-        ArcPhoneDetector arc_phone_detector(env.console, env.console, std::chrono::milliseconds(100), stop_on_detected);
-        run_until(
-            env.console, context,
-            [](BotBaseContext& local_context){
-                // pbf_mash_button(local_context, BUTTON_B, 7 * TICKS_PER_SECOND);
-                for(size_t i = 0; i < 15; i++){
-                     pbf_press_button(local_context, BUTTON_B, 20, 80);
-                }
-            },
-            {{arc_phone_detector}}
-        );        
-    }
-
-    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
-}
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonLA/Programs/General/PokemonLA_SkipToFullMoon.h b/SerialPrograms/Source/PokemonLA/Programs/General/PokemonLA_SkipToFullMoon.h
deleted file mode 100644
index ee2b34d69e..0000000000
--- a/SerialPrograms/Source/PokemonLA/Programs/General/PokemonLA_SkipToFullMoon.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*  Skip to Full Moon
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonLA_SkipToFullMoon_H
-#define PokemonAutomation_PokemonLA_SkipToFullMoon_H
-
-#include "CommonFramework/Notifications/EventNotificationsTable.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-
-class SkipToFullMoon_Descriptor : public SingleSwitchProgramDescriptor{
-public:
-    SkipToFullMoon_Descriptor();
-};
-
-
-class SkipToFullMoon : public SingleSwitchProgramInstance{
-public:
-    SkipToFullMoon();
-
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-
-    EventNotificationsOption NOTIFICATIONS;
-};
-
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonLA/Programs/PokemonLA_BattleRoutines.cpp b/SerialPrograms/Source/PokemonLA/Programs/PokemonLA_BattleRoutines.cpp
deleted file mode 100644
index 845b43bfee..0000000000
--- a/SerialPrograms/Source/PokemonLA/Programs/PokemonLA_BattleRoutines.cpp
+++ /dev/null
@@ -1,183 +0,0 @@
-/*  Mount Change
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/Exceptions/OperationFailedException.h"
-#include "CommonFramework/Inference/ImageMatchDetector.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
-#include "CommonFramework/Tools/ConsoleHandle.h"
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "PokemonLA/Inference/PokemonLA_OverworldDetector.h"
-#include "PokemonLA/Inference/Battles/PokemonLA_BattlePokemonSwitchDetector.h"
-#include "PokemonLA_BattleRoutines.h"
-
-#include <iostream>
-using std::cout;
-using std::endl;
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-
-
-void mash_A_until_end_of_battle(ConsoleHandle& console, BotBaseContext& context){
-    OverworldDetector detector(console, console);
-    int ret = run_until(
-        console, context,
-        [](BotBaseContext& context){
-            pbf_mash_button(context, BUTTON_A, 120 * TICKS_PER_SECOND);
-        },
-        {{detector}}
-    );
-    if (ret < 0){
-        throw OperationFailedException(
-            ErrorReport::SEND_ERROR_REPORT, console,
-            "Failed to return to overworld after 2 minutes.",
-            true
-        );
-    }
-    console.log("Returned to overworld.");
-}
-
-
-
-size_t switch_pokemon(ConsoleHandle& console, BotBaseContext& context, size_t pokemon_to_switch_to, size_t max_num_pokemon){
-    if (pokemon_to_switch_to >= max_num_pokemon){
-        throw OperationFailedException(
-            ErrorReport::SEND_ERROR_REPORT, console,
-            "Cannot send any more Pokemon to battle, max: " + std::to_string(max_num_pokemon),
-            true
-        );
-    }
-    // Move past leading fainted pokemon
-    for(size_t i = 0; i < pokemon_to_switch_to; i++){
-        pbf_press_dpad(context, DPAD_DOWN, 20, 80);
-    }
-
-    while(true){
-        // Choose the next pokemon to battle.
-        pbf_press_button(context, BUTTON_A, 20, 100);
-        pbf_press_button(context, BUTTON_A, 20, 150);
-        context.wait_for_all_requests();
-
-        // Check whether we can send this pokemon to battle:
-        const bool stop_on_detected = true;
-        BattlePokemonSwitchDetector switch_detector(console, console, stop_on_detected);
-        VideoSnapshot screen = console.video().snapshot();
-        if (switch_detector.process_frame(screen, current_time()) == false){
-            // No longer at the switching pokemon screen
-            break;
-        }
-
-        // We are still in the switching pokemon screen. So the current selected pokemon is fainted
-        // and therefore cannot be used. Try the next pokemon:
-        pokemon_to_switch_to++;
-        if (pokemon_to_switch_to >= max_num_pokemon){
-            throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, console,
-                "Cannot send any more Pokemon to battle, max: " + std::to_string(max_num_pokemon),
-                true
-            );
-        }
-
-        // Fist hit B to clear the "cannot send pokemon" dialogue
-        pbf_press_button(context, BUTTON_B, 20, 100);
-        // Move to the next pokemon
-        pbf_press_dpad(context, DPAD_DOWN, 20, 80);
-    }
-
-    return pokemon_to_switch_to;
-}
-
-
-void use_move_blindly(ConsoleHandle& console, BotBaseContext& context, MoveStyle style, size_t cur_pokemon, size_t cur_move){
-    // Select move styles
-    if (style == MoveStyle::Agile){
-        // Agile style
-        pbf_press_button(context, BUTTON_L, 10, 125);
-    }else if (style == MoveStyle::Strong){
-        // Strong style
-        pbf_press_button(context, BUTTON_R, 10, 125);
-    }
-
-    // Use the move
-    pbf_press_button(context, BUTTON_A, 10, 125);
-
-    console.log(
-        "Using pokemon " + std::to_string(cur_pokemon) + " move " + std::to_string(cur_move) +
-        " style " + MoveStyle_Database().find(style)->display
-    );
-
-    pbf_wait(context, 1 * TICKS_PER_SECOND);
-    context.wait_for_all_requests();
-}
-
-
-bool use_move(ConsoleHandle& console, BotBaseContext& context, size_t cur_pokemon, size_t cur_move, MoveStyle style, bool check_success){
-    if (check_success == false){
-        use_move_blindly(console, context, style, cur_pokemon, cur_move);
-        return true;
-    }
-
-    // The location of the move slots when choosing which move to use during battle.
-    // These boxes will be used to check whether the content in those boxes are changed or not
-    // after selecting one move to use. In this way we can detect whether the move is out of PP.
-    const ImageFloatBox move_slot_boxes[4] = {
-        {0.6600, 0.6220, 0.2500, 0.0320},
-        {0.6395, 0.6875, 0.2500, 0.0320},
-        {0.6190, 0.7530, 0.2500, 0.0320},
-        {0.5985, 0.8185, 0.2500, 0.0320},
-    };
-
-    VideoSnapshot screen = console.video().snapshot();
-    ImageMatchDetector move_slot_detector(std::move(screen.frame), move_slot_boxes[cur_move], 10.0);
-
-    use_move_blindly(console, context, style, cur_pokemon, cur_move);
-
-    screen = console.video().snapshot();
-
-    const bool still_on_move_screen = move_slot_detector.detect(screen);
-
-#ifdef DEBUG_NO_PP
-    if (still_on_move_screen == false){
-        static int count = 0;
-        screen.save("./no_pp." + std::to_string(count++) + ".png");
-    }
-#endif
-
-    return still_on_move_screen == false;
-}
-
-void use_next_move_with_pp(ConsoleHandle& console, BotBaseContext& context, size_t cur_pokemon, size_t& cur_move){
-    const bool check_move_success = true;
-    while (use_move(console, context, cur_pokemon, cur_move, MoveStyle::NoStyle, check_move_success) == false){
-        // We are still on the move selection screen. No PP.
-        if (cur_move == 3){
-            // Pokemon has zero PP on all moves. This should not happen as it will just use
-            // Struggle.
-            console.log("No PP on all moves. Abort program.", COLOR_RED);
-            throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, console,
-                "No PP on all moves.",
-                true
-            );
-        }
-        
-        // Go to the next move.
-        pbf_press_dpad(context, DPAD_DOWN, 20, 100);
-        // env.console.context().wait_for_all_requests();
-        cur_move++;
-        console.log("No PP. Use next move, " + std::to_string(cur_move), COLOR_RED);
-    }
-}
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonLA/Programs/PokemonLA_BattleRoutines.h b/SerialPrograms/Source/PokemonLA/Programs/PokemonLA_BattleRoutines.h
deleted file mode 100644
index c0d6a2d7c7..0000000000
--- a/SerialPrograms/Source/PokemonLA/Programs/PokemonLA_BattleRoutines.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*  Battle Routines
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonLA_BattleRoutines_H
-#define PokemonAutomation_PokemonLA_BattleRoutines_H
-
-#include "PokemonLA/Inference/PokemonLA_MountDetector.h"
-#include "PokemonLA/Options/PokemonLA_BattlePokemonActionTable.h"
-
-#include <stdint.h>
-
-namespace PokemonAutomation{
-    class BotBaseContext;
-    class ConsoleHandle;
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-
-void mash_A_until_end_of_battle(ConsoleHandle& console, BotBaseContext& context);
-
-// Assuming the game is in the switching pokemon screen, select a pokemon to send to battle.
-// pokemon_to_switch_to: the index of the pokemon in the party to switch to.
-// If the pokemon cannot be sent either due to already on the battlefield or fainted, it will select the next
-// pokemon in the party list, until it is successfully sent.
-// Return the index of the party that is actually sent to battle.
-// max_num_pokemon: if the pokemon index to switch to is >= `max_num_pokemon`, throw an OperationFailedException.
-size_t switch_pokemon(ConsoleHandle& console, BotBaseContext& context, size_t pokemon_to_switch_to, size_t max_num_pokemon = SIZE_MAX);
-
-// Assuming the game is at the move selection menu, use the current selected move in desired style in battle.
-// `cur_pokemon` does not affect game control. It is passed in only for the logging purpose.
-// `cur_move` the index of the move (0, 1, 2 or 3). It is only used when `check_success` is true.
-// If `check_success` is true, return whether the move is successfully used, by checking whether the game is still in the move selection
-// menu after some ticks (need correct `cur_move` to do this). If `check_success` is false, always return true.
-// `wait_for_all_requests()` is called at the end of the function no matter `check_success` is true or false.
-bool use_move(ConsoleHandle& console, BotBaseContext& context, size_t cur_pokemon, size_t cur_move, MoveStyle style, bool check_success);
-
-// Assuming the game is at the move selection menu, use the current selected move with no style.
-// If the move has no PP, move to use the next move.
-// `cur_pokemon` does not affect game control. It is passed in only for the logging purpose.
-// In order for the move PP detection to be correct, must pass in the correct `cur_move`.
-// When the function moves to using the next move, it also updates `cur_move`.
-// This function assumes it starts with the move selection menu, so it does not consider the case the pokemon has no PP and has to use Struggle.
-void use_next_move_with_pp(ConsoleHandle& console, BotBaseContext& context, size_t cur_pokemon, size_t& cur_move);
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonLA/Programs/PokemonLA_EscapeFromAttack.cpp b/SerialPrograms/Source/PokemonLA/Programs/PokemonLA_EscapeFromAttack.cpp
deleted file mode 100644
index 770f3b461b..0000000000
--- a/SerialPrograms/Source/PokemonLA/Programs/PokemonLA_EscapeFromAttack.cpp
+++ /dev/null
@@ -1,184 +0,0 @@
-/*  Escape From Attack
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/Tools/ConsoleHandle.h"
-#include "CommonFramework/Tools/InterruptableCommands.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "PokemonLA_EscapeFromAttack.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-
-
-EscapeFromAttack::EscapeFromAttack(
-    ProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context,
-    std::chrono::seconds time_min,
-    std::chrono::seconds time_limit
-)
-    : SuperControlSession(env, console, context)
-    , m_min_stop(current_time() + time_min)
-    , m_deadline(current_time() + time_limit)
-    , m_attacked(console)
-    , m_mount(console)
-    , m_centerA(console, console, ButtonType::ButtonA, {0.40, 0.50, 0.40, 0.50}, std::chrono::milliseconds(200), false)
-    , m_leftB(console, console, ButtonType::ButtonB, {0.02, 0.40, 0.05, 0.20}, std::chrono::milliseconds(200), false)
-    , m_get_on_sneasler_time(WallClock::min())
-{
-    *this += m_attacked;
-    *this += m_mount;
-    *this += m_centerA;
-    *this += m_leftB;
-
-    const std::chrono::milliseconds GET_ON_BRAVIARY_TIME_MILLIS(GET_ON_BRAVIARY_TIME * 1000 / TICKS_PER_SECOND);
-
-    register_state_command(State::UNKNOWN, [this](){
-        m_console.log("Unknown state. Moving foward...");
-        m_active_command->dispatch([](BotBaseContext& context){
-            pbf_move_left_joystick(context, 128, 0, 300 * TICKS_PER_SECOND, 0);
-        });
-        return false;
-    });
-    register_state_command(State::WYRDEER_BASCULEGION_OFF, [this](){
-        m_console.log("Switching from Wyrdeer/Basculegion (off) to Braviary (on)...");
-        m_active_command->dispatch([](BotBaseContext& context){
-            pbf_press_dpad(context, DPAD_RIGHT, 20, 50);
-            pbf_press_button(context, BUTTON_PLUS, 20, GET_ON_BRAVIARY_TIME);
-        });
-        return false;
-    });
-    register_state_command(State::WYRDEER_BASCULEGION_ON, [this](){
-        m_console.log("Switching from Wyrdeer/Basculegion (on) to Braviary (on)...");
-        m_active_command->dispatch([](BotBaseContext& context){
-            pbf_press_dpad(context, DPAD_RIGHT, 20, GET_ON_BRAVIARY_TIME);
-        });
-        return false;
-    });
-    register_state_command(State::URSALUNA_OFF, [this](){
-        m_console.log("Switching from Ursaluna (off) to Braviary (on)...");
-        m_active_command->dispatch([](BotBaseContext& context){
-            pbf_press_dpad(context, DPAD_RIGHT, 20, 50);
-            pbf_press_dpad(context, DPAD_RIGHT, 20, 50);
-            pbf_press_button(context, BUTTON_PLUS, 20, GET_ON_BRAVIARY_TIME);
-        });
-        return false;
-    });
-    register_state_command(State::URSALUNA_ON, [this](){
-        m_console.log("Switching from Ursaluna (on) to Braviary (on)...");
-        m_active_command->dispatch([](BotBaseContext& context){
-            pbf_press_dpad(context, DPAD_RIGHT, 20, 50);
-            pbf_press_dpad(context, DPAD_RIGHT, 20, GET_ON_BRAVIARY_TIME);
-        });
-        return false;
-    });
-    register_state_command(State::SNEASLER_OFF, [this](){
-        m_console.log("Switching from Sneasler (off) to Braviary (on)...");
-        m_active_command->dispatch([](BotBaseContext& context){
-            pbf_press_dpad(context, DPAD_LEFT, 20, 50);
-            pbf_press_button(context, BUTTON_PLUS, 20, GET_ON_BRAVIARY_TIME);
-        });
-        return false;
-    });
-    register_state_command(State::SNEASLER_ON, [this](){
-        m_console.log("Switching from Sneasler (on) to Braviary (on)...");
-        m_active_command->dispatch([](BotBaseContext& context){
-            pbf_move_left_joystick(context, 128, 0, 125, 0);
-            pbf_press_dpad(context, DPAD_LEFT, 20, GET_ON_BRAVIARY_TIME);
-        });
-        return false;
-    });
-    register_state_command(State::BRAVIARY_OFF, [this](){
-        m_console.log("Switching from Braviary (off) to Braviary (on)...");
-        m_active_command->dispatch([](BotBaseContext& context){
-            pbf_press_button(context, BUTTON_PLUS, 20, GET_ON_BRAVIARY_TIME);
-        });
-        return false;
-    });
-    register_state_command(State::DASH_FORWARD, [this, GET_ON_BRAVIARY_TIME_MILLIS](){
-        bool delay_dash =
-            current_time() < m_get_on_sneasler_time + GET_ON_BRAVIARY_TIME_MILLIS;
-        if (delay_dash){
-            m_console.log("Dashing forward... (delayed due to being on Sneasler)");
-        }else{
-            m_console.log("Dashing forward...");
-        }
-        m_active_command->dispatch([delay_dash](BotBaseContext& context){
-            if (delay_dash){
-                pbf_move_left_joystick(context, 128, 0, 125, 0);
-            }
-            pbf_mash_button(context, BUTTON_B, 300 * TICKS_PER_SECOND);
-        });
-        return false;
-    });
-    register_state_command(State::GET_ON_SNEASLER, [this](){
-        m_console.log("Getting on Sneasler...");
-        m_active_command->dispatch([](BotBaseContext& context){
-            pbf_press_button(context, BUTTON_A, 20, 230);
-        });
-        m_get_on_sneasler_time = current_time();
-        return false;
-    });
-    register_state_command(State::CLIMBING, [this](){
-        m_console.log("Climbing wall...");
-        m_active_command->dispatch([](BotBaseContext& context){
-            pbf_move_left_joystick(context, 128, 0, 300 * TICKS_PER_SECOND, 0);
-        });
-        return false;
-    });
-}
-bool EscapeFromAttack::run_state(AsyncCommandSession& commands, WallClock timestamp){
-    if (timestamp > m_deadline){
-        return true;
-    }
-    if (m_attacked.state() == UnderAttackState::SAFE && timestamp >= m_min_stop){
-        return true;
-    }
-
-    switch (m_mount.state()){
-    case MountState::NOTHING:
-        return run_state_action(State::UNKNOWN);
-    case MountState::WYRDEER_OFF:
-    case MountState::BASCULEGION_OFF:
-        return run_state_action(State::WYRDEER_BASCULEGION_OFF);
-    case MountState::WYRDEER_ON:
-    case MountState::BASCULEGION_ON:
-        return run_state_action(State::WYRDEER_BASCULEGION_ON);
-    case MountState::URSALUNA_OFF:
-        return run_state_action(State::URSALUNA_OFF);
-    case MountState::URSALUNA_ON:
-        return run_state_action(State::URSALUNA_ON);
-    case MountState::SNEASLER_OFF:
-        return run_state_action(State::SNEASLER_OFF);
-    case MountState::SNEASLER_ON:
-        return run_climbing(commands, timestamp);
-    case MountState::BRAVIARY_OFF:
-        return run_state_action(State::BRAVIARY_OFF);
-    case MountState::BRAVIARY_ON:
-        return run_flying(commands, timestamp);
-    }
-
-    m_console.log("No state handler for current state.", COLOR_RED);
-    return false;
-}
-bool EscapeFromAttack::run_flying(AsyncCommandSession& commands, WallClock timestamp){
-    if (m_centerA.detected() && timestamp - last_state_change() > std::chrono::seconds(3)){
-        return run_state_action(State::GET_ON_SNEASLER);
-    }
-    return run_state_action(State::DASH_FORWARD);
-}
-bool EscapeFromAttack::run_climbing(AsyncCommandSession& commands, WallClock timestamp){
-    //  Can't jump off means you're able to stand. Switch back to Braviary.
-    if (!m_leftB.detected()){
-        return run_state_action(State::SNEASLER_OFF);
-    }
-    return run_state_action(State::CLIMBING);
-}
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonLA/Programs/PokemonLA_EscapeFromAttack.h b/SerialPrograms/Source/PokemonLA/Programs/PokemonLA_EscapeFromAttack.h
deleted file mode 100644
index f091b96900..0000000000
--- a/SerialPrograms/Source/PokemonLA/Programs/PokemonLA_EscapeFromAttack.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/*  Escape From Attack
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonLA_EscapeFromAttack_H
-#define PokemonAutomation_PokemonLA_EscapeFromAttack_H
-
-#include "CommonFramework/Tools/SuperControlSession.h"
-#include "PokemonLA/Inference/PokemonLA_UnderAttackDetector.h"
-#include "PokemonLA/Inference/PokemonLA_MountDetector.h"
-#include "PokemonLA/Inference/Objects/PokemonLA_ButtonDetector.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-
-class EscapeFromAttack : public SuperControlSession{
-public:
-    EscapeFromAttack(
-        ProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context,
-        std::chrono::seconds time_min,
-        std::chrono::seconds time_limit
-    );
-
-    UnderAttackState state() const{
-        return m_attacked.state();
-    }
-
-
-private:
-    enum class State{
-        UNKNOWN,
-        WYRDEER_BASCULEGION_OFF,
-        WYRDEER_BASCULEGION_ON,
-        URSALUNA_OFF,
-        URSALUNA_ON,
-        SNEASLER_OFF,
-        SNEASLER_ON,
-        BRAVIARY_OFF,
-        DASH_FORWARD,
-        GET_ON_SNEASLER,
-        CLIMBING,
-    };
-    void register_state_command(State state, std::function<bool()>&& action){
-        SuperControlSession::register_state_command((size_t)state, std::move(action));
-    }
-    bool run_state_action(State state){
-        return SuperControlSession::run_state_action((size_t)state);
-    }
-
-    virtual bool run_state(AsyncCommandSession& commands, WallClock timestamp) override;
-
-    bool run_flying(AsyncCommandSession& commands, WallClock timestamp);
-    bool run_climbing(AsyncCommandSession& commands, WallClock timestamp);
-
-private:
-    static const uint16_t GET_ON_MOUNT_TIME = 125;
-    static const uint16_t GET_ON_BRAVIARY_TIME = 280;
-
-
-    const WallClock m_min_stop;
-    const WallClock m_deadline;
-
-    UnderAttackWatcher m_attacked;
-    MountTracker m_mount;
-    ButtonDetector m_centerA;
-    ButtonDetector m_leftB;
-
-    WallClock m_get_on_sneasler_time;
-};
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonLA/Programs/PokemonLA_FlagNavigationAir.cpp b/SerialPrograms/Source/PokemonLA/Programs/PokemonLA_FlagNavigationAir.cpp
deleted file mode 100644
index 2415d644f7..0000000000
--- a/SerialPrograms/Source/PokemonLA/Programs/PokemonLA_FlagNavigationAir.cpp
+++ /dev/null
@@ -1,520 +0,0 @@
-/*  Flag Navigation (Air)
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <sstream>
-#include "CommonFramework/Exceptions/OperationFailedException.h"
-#include "CommonFramework/Tools/ErrorDumper.h"
-#include "CommonFramework/Tools/ConsoleHandle.h"
-#include "CommonFramework/Tools/InterruptableCommands.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "PokemonLA_FlagNavigationAir.h"
-
-#include <iostream>
-using std::cout;
-using std::endl;
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-
-FlagNavigationAir::FlagNavigationAir(
-    ProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context,
-    uint16_t stop_radius,
-    double flag_reached_delay,
-    std::chrono::seconds navigate_timeout
-)
-    : SuperControlSession(env, console, context)
-    , m_stop_radius(stop_radius)
-    , m_flag_reached_delay(std::chrono::milliseconds((uint64_t)(flag_reached_delay * 1000)))
-    , m_navigate_timeout(navigate_timeout)
-    , m_flag(console, console)
-    , m_mount(console)
-    , m_centerA(console, console, ButtonType::ButtonA, {0.40, 0.50, 0.40, 0.50}, std::chrono::milliseconds(200), false)
-    , m_leftB(console, console, ButtonType::ButtonB, {0.02, 0.40, 0.05, 0.20}, std::chrono::milliseconds(200), false)
-    , m_dialog_detector(console, console, false)
-    , m_looking_straight_ahead(false)
-    , m_looking_straight_ahead_timestamp(WallClock::min())
-//    , m_last_good_state(WallClock::min())
-    , m_last_known_mount(MountState::NOTHING)
-    , m_find_flag_failed(false)
-    , m_flag_reached_time(WallClock::max())
-    , m_last_flag_detection(WallClock::min())
-    , m_flag_distance(-1)
-    , m_flag_x(0.5)
-    , m_flag_y(0.0)
-    , m_last_flag_print(WallClock::min())
-{
-    *this += m_flag;
-    *this += m_mount;
-    *this += m_centerA;
-    *this += m_leftB;
-    *this += m_dialog_detector;
-
-    auto find_flag = [this](BotBaseContext& context){
-        uint8_t turn = m_flag_x <= 0.5 ? 0 : 255;
-        for (size_t c = 0; c < 2; c++){
-            pbf_mash_button(context, BUTTON_ZL, 2 * TICKS_PER_SECOND);
-            pbf_move_right_joystick(context, turn, 128, 400, 0);
-            pbf_move_right_joystick(context, 128, 255, 120, 0);
-            pbf_move_right_joystick(context, turn, 128, 400, 0);
-            pbf_move_right_joystick(context, 128, 0, 200, 0);
-            pbf_move_right_joystick(context, turn, 128, 400, 0);
-        }
-        context.wait_for_all_requests();
-        m_find_flag_failed.store(true, std::memory_order_release);
-    };
-
-    register_state_command(State::UNKNOWN, [this, find_flag](){
-        m_console.log("Unknown state. Moving camera around...");
-        m_active_command->dispatch(find_flag);
-        m_looking_straight_ahead.store(false, std::memory_order_release);
-        return false;
-    });
-    register_state_command(State::WYRDEER_BASCULEGION_OFF, [this](){
-        m_console.log("Switching from Wyrdeer/Basculegion (off) to Braviary (on)...");
-        m_active_command->dispatch([](BotBaseContext& context){
-            pbf_press_dpad(context, DPAD_RIGHT, 20, 50);
-            pbf_press_button(context, BUTTON_PLUS, 20, GET_ON_BRAVIARY_TIME);
-        });
-        return false;
-    });
-    register_state_command(State::WYRDEER_BASCULEGION_ON, [this](){
-        m_console.log("Switching from Wyrdeer/Basculegion (on) to Braviary (on)...");
-        m_active_command->dispatch([](BotBaseContext& context){
-            pbf_press_dpad(context, DPAD_RIGHT, 20, GET_ON_BRAVIARY_TIME);
-        });
-        return false;
-    });
-    register_state_command(State::URSALUNA_OFF, [this](){
-        m_console.log("Switching from Ursaluna (off) to Braviary (on)...");
-        m_active_command->dispatch([](BotBaseContext& context){
-            pbf_press_dpad(context, DPAD_RIGHT, 20, 50);
-//            pbf_press_dpad(context, DPAD_RIGHT, 20, 50);
-//            pbf_press_button(context, BUTTON_PLUS, 20, GET_ON_BRAVIARY_TIME);
-        });
-        return false;
-    });
-    register_state_command(State::URSALUNA_ON, [this](){
-        m_console.log("Switching from Ursaluna (on) to Braviary (on)...");
-        m_active_command->dispatch([](BotBaseContext& context){
-            pbf_press_dpad(context, DPAD_RIGHT, 20, 50);
-//            pbf_press_dpad(context, DPAD_RIGHT, 20, GET_ON_BRAVIARY_TIME);
-        });
-        return false;
-    });
-    register_state_command(State::SNEASLER_OFF, [this](){
-        m_console.log("Switching from Sneasler (off) to Braviary (on)...");
-        m_active_command->dispatch([](BotBaseContext& context){
-            pbf_press_dpad(context, DPAD_LEFT, 20, 50);
-            pbf_press_button(context, BUTTON_PLUS, 20, GET_ON_BRAVIARY_TIME);
-        });
-        return false;
-    });
-    register_state_command(State::SNEASLER_ON, [this](){
-        m_console.log("Switching from Sneasler (on) to Braviary (on)...");
-        m_looking_straight_ahead.store(false, std::memory_order_release);
-        m_active_command->dispatch([](BotBaseContext& context){
-            pbf_move_left_joystick(context, 128, 0, 125, 0);
-            pbf_press_dpad(context, DPAD_LEFT, 20, GET_ON_BRAVIARY_TIME);
-        });
-        return false;
-    });
-    register_state_command(State::BRAVIARY_OFF, [this](){
-        m_console.log("Switching from Braviary (off) to Braviary (on)...");
-        m_looking_straight_ahead.store(false, std::memory_order_release);
-        m_active_command->dispatch([](BotBaseContext& context){
-            pbf_press_button(context, BUTTON_PLUS, 20, GET_ON_BRAVIARY_TIME);
-        });
-        return false;
-    });
-    register_state_command(State::GET_ON_SNEASLER, [this](){
-        m_console.log("Getting on Sneasler...");
-        m_looking_straight_ahead.store(false, std::memory_order_release);
-        m_active_command->dispatch([](BotBaseContext& context){
-            pbf_press_button(context, BUTTON_A, 20, 230);
-        });
-        return false;
-    });
-    register_state_command(State::CLIMBING, [this](){
-        m_console.log("Climbing wall...");
-        m_looking_straight_ahead.store(false, std::memory_order_release);
-        m_active_command->dispatch([](BotBaseContext& context){
-            pbf_move_left_joystick(context, 128, 0, 300 * TICKS_PER_SECOND, 0);
-        });
-        return false;
-    });
-
-    register_state_command(State::DASH_FORWARD_MASH_B, [this](){
-        m_console.log("Dashing forward (mash B)...");
-        m_active_command->dispatch([this](BotBaseContext& context){
-            //  Move forward to straighten out direction.
-            if (!m_looking_straight_ahead.load(std::memory_order_acquire)){
-                pbf_move_left_joystick(context, 128, 0, 160, 0);
-                context.wait_for_all_requests();
-                m_looking_straight_ahead_timestamp.store(current_time());
-                m_looking_straight_ahead.store(true, std::memory_order_release);
-//                cout << "State::DASH_FORWARD: m_looking_straight_ahead = true" << endl;
-            }
-            pbf_mash_button(context, BUTTON_B, 300 * TICKS_PER_SECOND);
-        });
-        return false;
-    });
-    register_state_command(State::DASH_FORWARD_HOLD_B, [this](){
-        m_console.log("Dashing forward (hold B)...");
-        m_active_command->dispatch([this](BotBaseContext& context){
-            //  Move forward to straighten out direction.
-            if (!m_looking_straight_ahead.load(std::memory_order_acquire)){
-                pbf_move_left_joystick(context, 128, 0, 160, 0);
-                context.wait_for_all_requests();
-                m_looking_straight_ahead_timestamp.store(current_time());
-                m_looking_straight_ahead.store(true, std::memory_order_release);
-//                cout << "State::DASH_FORWARD: m_looking_straight_ahead = true" << endl;
-            }
-            pbf_press_button(context, BUTTON_B, 300 * TICKS_PER_SECOND, 0);
-        });
-        return false;
-    });
-
-    auto dash_turn = [this](){
-        m_console.log("Dashing Turn...");
-        m_active_command->dispatch([this](BotBaseContext& context){
-            //  Move forward to straighten out direction.
-            if (!m_looking_straight_ahead.load(std::memory_order_acquire)){
-                pbf_move_left_joystick(context, 128, 0, 160, 0);
-                context.wait_for_all_requests();
-                m_looking_straight_ahead_timestamp.store(current_time());
-                m_looking_straight_ahead.store(true, std::memory_order_release);
-//                cout << "State::DASH_LEFT: m_looking_straight_ahead = true" << endl;
-            }
-//            pbf_press_button(context, BUTTON_B, 10, 0);
-            double shift = 0;
-            double distance, flag_x, flag_y;
-            if (m_flag.get(distance, flag_x, flag_y)){
-                shift = (flag_x - 0.5) * 320;
-                shift = std::max(shift, -32.);
-                shift = std::min(shift, 32.);
-            }
-            pbf_controller_state(context, BUTTON_B, DPAD_NONE, (int8_t)(128 + shift), 128, 128, 128, 255);
-        });
-        return false;
-    };
-    register_state_command(State::DASH_LEFT, dash_turn);
-    register_state_command(State::DASH_RIGHT, dash_turn);
-
-    register_state_command(State::DIVE_STRAIGHT, [this](){
-        m_console.log("Diving Straight...");
-        m_active_command->dispatch([this](BotBaseContext& context){
-            //  Move forward to straighten out direction.
-            if (!m_looking_straight_ahead.load(std::memory_order_acquire)){
-                pbf_move_left_joystick(context, 128, 0, 160, 0);
-                context.wait_for_all_requests();
-                m_looking_straight_ahead_timestamp.store(current_time());
-                m_looking_straight_ahead.store(true, std::memory_order_release);
-//                cout << "State::DASH_FORWARD: m_looking_straight_ahead = true" << endl;
-            }
-            pbf_press_button(context, BUTTON_Y, 60 * TICKS_PER_SECOND, 0);
-        });
-        return false;
-    });
-
-    auto dive_turn = [this](){
-        m_console.log("Diving Turn...");
-        m_active_command->dispatch([this](BotBaseContext& context){
-            //  Move forward to straighten out direction.
-            if (!m_looking_straight_ahead.load(std::memory_order_acquire)){
-                pbf_move_left_joystick(context, 128, 0, 160, 0);
-                context.wait_for_all_requests();
-                m_looking_straight_ahead_timestamp.store(current_time());
-                m_looking_straight_ahead.store(true, std::memory_order_release);
-//                cout << "State::DASH_LEFT: m_looking_straight_ahead = true" << endl;
-            }
-//            pbf_press_button(context, BUTTON_Y, 10, 0);
-            double shift = 0;
-            double distance, flag_x, flag_y;
-            if (m_flag.get(distance, flag_x, flag_y)){
-                shift = (flag_x - 0.5) * 640;
-                shift = std::max(shift, -32.);
-                shift = std::min(shift, 32.);
-            }
-            pbf_controller_state(context, BUTTON_Y, DPAD_NONE, (int8_t)(128 + shift), 128, 128, 128, 125);
-        });
-        return false;
-    };
-    register_state_command(State::DIVE_LEFT, dive_turn);
-    register_state_command(State::DIVE_RIGHT, dive_turn);
-
-    register_state_command(State::TURN_LEFT, [this](){
-        m_console.log("Turning Left...");
-        m_active_command->dispatch([this](BotBaseContext& context){
-            pbf_wait(context, 150);
-            context.wait_for_all_requests();
-            double distance, flag_x, flag_y;
-            if (m_flag.get(distance, flag_x, flag_y)){
-                pbf_move_right_joystick(context, 0, 128, (uint16_t)(85 * (0.5 - flag_x)), 0);
-            }
-        });
-        m_looking_straight_ahead.store(false, std::memory_order_release);
-        return false;
-    });
-    register_state_command(State::TURN_RIGHT, [this](){
-        m_console.log("Turning Right...");
-        m_active_command->dispatch([this](BotBaseContext& context){
-            pbf_wait(context, 150);
-            context.wait_for_all_requests();
-            double distance, flag_x, flag_y;
-            if (m_flag.get(distance, flag_x, flag_y)){
-                pbf_move_right_joystick(context, 255, 128, (uint16_t)(85 * (flag_x - 0.5)), 0);
-            }
-        });
-        m_looking_straight_ahead.store(false, std::memory_order_release);
-        return false;
-    });
-
-    register_state_command(State::FIND_FLAG, [this, find_flag](){
-        m_console.log("Looking for flag...");
-        m_active_command->dispatch(find_flag);
-        m_looking_straight_ahead.store(false, std::memory_order_release);
-        return false;
-    });
-}
-void FlagNavigationAir::set_distance_callback(std::function<void(double distance)> flag_callback){
-    m_flag_callback = std::move(flag_callback);
-}
-
-bool FlagNavigationAir::run_state(AsyncCommandSession& commands, WallClock timestamp){
-    if (last_state_change() + std::chrono::seconds(60) < timestamp){
-        throw OperationFailedException(
-            ErrorReport::SEND_ERROR_REPORT, m_console,
-            "No state change detected after 60 seconds.",
-            true
-        );
-    }
-    if (start_time() + m_navigate_timeout < timestamp){
-        throw OperationFailedException(
-            ErrorReport::SEND_ERROR_REPORT, m_console,
-            "Unable to reach flag after timeout period.",
-            true
-        );
-    }
-    if (m_dialog_detector.detected()){
-        throw OperationFailedException(
-            ErrorReport::SEND_ERROR_REPORT, m_console,
-            "Potential ambush by Miss Fortune sister.",
-            true
-        );
-    }
-    if (m_find_flag_failed.load(std::memory_order_acquire)){
-        throw OperationFailedException(
-            ErrorReport::SEND_ERROR_REPORT, m_console,
-            "Unable to find flag.",
-            true
-        );
-    }
-
-    //  Read flag.
-    m_flag_detected = m_flag.get(m_flag_distance, m_flag_x, m_flag_y, timestamp);
-    if (m_flag_detected){
-        m_last_flag_detection = timestamp;
-        if (m_flag_callback){
-            m_flag_callback(m_flag_distance);
-        }
-    }else{
-//        m_console.log("Flag not detected.", COLOR_ORANGE);
-    }
-#if 1
-    if (true
-        && m_flag_detected
-        && m_flag_distance >= 0
-        && m_last_flag_print + std::chrono::seconds(1) <= timestamp
-    ){
-        std::ostringstream ss;
-        ss << "Flag: Distance = " << (m_flag_distance < 0 ? "?" : std::to_string(m_flag_distance))
-           << ", x = " << m_flag_x << ", y = " << m_flag_y << std::endl;
-        m_console.log(ss.str(), COLOR_PURPLE);
-        m_last_flag_print = timestamp;
-    }
-#endif
-
-
-    //  Check if we've reached the flag.
-    if (m_flag_distance >= 0){
-        if (m_flag_distance > m_stop_radius){
-            //  If we haven't reached the flag, reset the timer.
-            m_flag_reached_time = WallClock::max();
-        }else if (m_flag_distance <= m_stop_radius && m_flag_reached_time == WallClock::max()){
-            //  If we've reached the flag, start timer if we haven't already.
-            m_console.log("Target reached. Waiting out grace period...");
-            m_flag_reached_time = timestamp;
-        }
-    }
-    if (m_flag_reached_time <= timestamp - m_flag_reached_delay){
-        m_console.log("Grace period finished. Stopping flag navigation...");
-        return true;
-    }
-
-
-    MountState mount = m_mount.state();
-    if (mount != MountState::NOTHING){
-        m_last_known_mount = mount;
-    }else{
-        m_console.log(
-            std::string("Unable to detect mount. Assuming last known mount: ") +
-            MOUNT_STATE_STRINGS[(size_t)m_last_known_mount]
-        );
-        mount = m_last_known_mount;
-    }
-    if (mount == MountState::NOTHING){
-        return run_state_action(State::UNKNOWN);
-    }
-#if 0
-    if (mount == MountState::NOTHING){
-        if (m_last_good_state + std::chrono::seconds(2) < timestamp){
-            return run_state_action(State::UNKNOWN);
-        }
-        return false;
-    }else{
-        m_last_good_state = timestamp;
-    }
-#endif
-
-    switch (mount){
-    case MountState::NOTHING:
-        return false;
-    case MountState::WYRDEER_OFF:
-    case MountState::BASCULEGION_OFF:
-        return run_state_action(State::WYRDEER_BASCULEGION_OFF);
-    case MountState::WYRDEER_ON:
-    case MountState::BASCULEGION_ON:
-        return run_state_action(State::WYRDEER_BASCULEGION_ON);
-    case MountState::URSALUNA_OFF:
-        return run_state_action(State::URSALUNA_OFF);
-    case MountState::URSALUNA_ON:
-        return run_state_action(State::URSALUNA_ON);
-    case MountState::SNEASLER_OFF:
-        return run_state_action(State::SNEASLER_OFF);
-    case MountState::SNEASLER_ON:
-        return run_climbing(commands, timestamp);
-    case MountState::BRAVIARY_OFF:
-        return run_state_action(State::BRAVIARY_OFF);
-    case MountState::BRAVIARY_ON:
-        return run_flying(commands, timestamp);
-    }
-
-    m_console.log("No state handler for current state.", COLOR_RED);
-    return false;
-}
-bool FlagNavigationAir::run_flying(AsyncCommandSession& commands, WallClock timestamp){
-    //  Need to get on Sneasler.
-    if (m_centerA.detected() && last_state_change() + std::chrono::seconds(2) < timestamp){
-        return run_state_action(State::GET_ON_SNEASLER);
-    }
-
-//    cout << "m_last_known_flag_y = " << m_last_known_flag_y << endl;
-
-    State state = (State)this->last_state();
-#if 0
-    if (m_flag_y > 0.9 && last_state_change() + std::chrono::seconds(2) < timestamp){
-//        cout << "state = " << (size_t)state << endl;
-        switch (state){
-        case State::DASH_FORWARD_MASH_B:
-        case State::DASH_FORWARD_HOLD_B:
-        case State::DIVE:
-            m_console.log("Target passed under you. Target reached.");
-            return true;
-        default:;
-        }
-    }
-#endif
-
-//    if (m_last_flag_detection + std::chrono::seconds(20) < timestamp){
-//        throw OperationFailedException(m_console, "Flag not detected after 20 seconds.", true);
-//    }
-//    double flag_age = std::chrono::duration_cast<std::chrono::milliseconds>(timestamp - m_last_flag_detection).count() / 1000.;
-//    if (flag_age > 0){
-//        m_console.log("Flag Age = " + std::to_string(flag_age));
-//    }
-
-    //  Flag is stale.
-    if (m_last_flag_detection + std::chrono::seconds(1) < timestamp){
-        return run_state_action(State::FIND_FLAG);
-    }
-
-
-    //  Re-center the flag.
-    if (m_flag_x <= 0.30){
-        return run_state_action(State::TURN_LEFT);
-    }
-    if (m_flag_x >= 0.70){
-        return run_state_action(State::TURN_RIGHT);
-    }
-
-    //  Dive
-    double dive_threshold = 0.80;
-    switch (state){
-    case State::DIVE_STRAIGHT:
-    case State::DIVE_LEFT:
-    case State::DIVE_RIGHT:
-        dive_threshold = 0.10;
-        break;
-    case State::DASH_FORWARD_HOLD_B:
-    case State::DASH_FORWARD_MASH_B:
-    case State::DASH_LEFT:
-    case State::DASH_RIGHT:{
-        if (m_looking_straight_ahead.load(std::memory_order_acquire) &&
-            m_looking_straight_ahead_timestamp.load(std::memory_order_acquire) + std::chrono::seconds(1) < timestamp){
-            dive_threshold = 0.45;
-        }
-        break;
-    }
-    default:;
-    }
-//    cout << "m_flag_y = " << m_flag_y << endl;
-    if (m_flag_detected && m_flag_y > dive_threshold){
-        if (0.49 <= m_flag_x && m_flag_x <= 0.51){
-            return run_state_action(State::DIVE_STRAIGHT);
-        }else{
-            return run_state_action(m_flag_x < 0.5 ? State::DIVE_LEFT : State::DIVE_RIGHT);
-        }
-    }
-
-    //  Turning Cruise
-    if (0.48 > m_flag_x || m_flag_x > 0.52){
-        return run_state_action(m_flag_x < 0.5 ? State::DASH_LEFT : State::DASH_RIGHT);
-    }
-
-    //  B-mash Cruise
-    return run_state_action(State::DASH_FORWARD_MASH_B);
-
-#if 0
-    if (m_flag_y <= 0.40){
-        //  B-mash Cruise
-        return run_state_action(State::DASH_FORWARD_MASH_B);
-    }else{
-        //  Normal Cruise
-        return run_state_action(State::DASH_FORWARD_HOLD_B);
-    }
-
-    //  No known state left.
-    return run_state_action(State::DIVE_STRAIGHT);
-#endif
-}
-bool FlagNavigationAir::run_climbing(AsyncCommandSession& commands, WallClock timestamp){
-    //  Can't jump off means you're able to stand. Switch back to Braviary.
-    if (!m_leftB.detected()){
-        return run_state_action(State::SNEASLER_ON);
-    }
-    return run_state_action(State::CLIMBING);
-}
-
-
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonLA/Programs/PokemonLA_FlagNavigationAir.h b/SerialPrograms/Source/PokemonLA/Programs/PokemonLA_FlagNavigationAir.h
deleted file mode 100644
index fe1080cc4f..0000000000
--- a/SerialPrograms/Source/PokemonLA/Programs/PokemonLA_FlagNavigationAir.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/*  Flag Navigation (Air)
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonLA_FlagNavigation_H
-#define PokemonAutomation_PokemonLA_FlagNavigation_H
-
-#include "CommonFramework/Tools/SuperControlSession.h"
-#include "PokemonLA/Inference/Objects/PokemonLA_FlagTracker.h"
-#include "PokemonLA/Inference/Objects/PokemonLA_ButtonDetector.h"
-#include "PokemonLA/Inference/PokemonLA_DialogDetector.h"
-#include "PokemonLA/Inference/PokemonLA_MountDetector.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-
-class FlagNavigationAir : public SuperControlSession{
-public:
-    FlagNavigationAir(
-        ProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context,
-        uint16_t stop_radius,
-        double flag_reached_delay,
-        std::chrono::seconds navigate_timeout
-    );
-
-    void set_distance_callback(std::function<void(double distance)> flag_callback);
-
-
-private:
-    virtual bool run_state(AsyncCommandSession& commands, WallClock timestamp) override;
-
-    bool run_flying(AsyncCommandSession& commands, WallClock timestamp);
-    bool run_climbing(AsyncCommandSession& commands, WallClock timestamp);
-
-
-private:
-    static const uint16_t GET_ON_MOUNT_TIME = 125;
-    static const uint16_t GET_ON_BRAVIARY_TIME = 280;
-
-    enum class State{
-        UNKNOWN,
-        WYRDEER_BASCULEGION_OFF,
-        WYRDEER_BASCULEGION_ON,
-        URSALUNA_OFF,
-        URSALUNA_ON,
-        SNEASLER_OFF,
-        SNEASLER_ON,
-        BRAVIARY_OFF,
-        GET_ON_SNEASLER,
-        CLIMBING,
-        DASH_FORWARD_MASH_B,
-        DASH_FORWARD_HOLD_B,
-        DASH_LEFT,
-        DASH_RIGHT,
-        DIVE_STRAIGHT,
-        DIVE_LEFT,
-        DIVE_RIGHT,
-        TURN_LEFT,
-        TURN_RIGHT,
-        FIND_FLAG,
-    };
-    void register_state_command(State state, std::function<bool()>&& action){
-        SuperControlSession::register_state_command((size_t)state, std::move(action));
-    }
-    bool run_state_action(State state){
-        return SuperControlSession::run_state_action((size_t)state);
-    }
-
-    uint16_t m_stop_radius;
-    std::chrono::milliseconds m_flag_reached_delay;
-    std::chrono::seconds m_navigate_timeout;
-
-    std::function<void(double distance)> m_flag_callback;
-
-    FlagTracker m_flag;
-    MountTracker m_mount;
-    ButtonDetector m_centerA;
-    ButtonDetector m_leftB;
-    DialogSurpriseDetector m_dialog_detector;
-
-    std::atomic<bool> m_looking_straight_ahead;
-    std::atomic<WallClock> m_looking_straight_ahead_timestamp;
-//    WallClock m_last_good_state;
-    MountState m_last_known_mount;
-
-    std::atomic<bool> m_find_flag_failed;
-    WallClock m_flag_reached_time;
-
-    WallClock m_last_flag_detection;
-    bool m_flag_detected;
-
-    //  Last known values.
-    double m_flag_distance;
-    double m_flag_x;
-    double m_flag_y;
-
-    WallClock m_last_flag_print;
-};
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonLA/Programs/PokemonLA_GameEntry.cpp b/SerialPrograms/Source/PokemonLA/Programs/PokemonLA_GameEntry.cpp
deleted file mode 100644
index 5c39b6092a..0000000000
--- a/SerialPrograms/Source/PokemonLA/Programs/PokemonLA_GameEntry.cpp
+++ /dev/null
@@ -1,101 +0,0 @@
-/*  Game Entry
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
-#include "CommonFramework/Tools/ConsoleHandle.h"
-#include "CommonFramework/Tools/ErrorDumper.h"
-#include "CommonFramework/Tools/ProgramEnvironment.h"
-#include "CommonFramework/Inference/BlackScreenDetector.h"
-#include "NintendoSwitch/NintendoSwitch_Settings.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Routines.h"
-#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
-#include "PokemonLA/PokemonLA_Settings.h"
-#include "PokemonLA_GameEntry.h"
-
-//#include <iostream>
-//using std::cout;
-//using std::endl;
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-
-bool reset_game_to_gamemenu(
-    ConsoleHandle& console, BotBaseContext& context,
-    bool tolerate_update_menu
-){
-    bool video_available = (bool)console.video().snapshot();
-    if (video_available ||
-        ConsoleSettings::instance().START_GAME_REQUIRES_INTERNET ||
-        tolerate_update_menu
-    ){
-        close_game(context);
-        start_game_from_home(
-            console,
-            context,
-            tolerate_update_menu,
-            0, 0,
-            GameSettings::instance().START_GAME_MASH
-        );
-    }else{
-        pbf_press_button(context, BUTTON_X, 50, 0);
-        pbf_mash_button(context, BUTTON_A, GameSettings::instance().START_GAME_MASH);
-    }
-
-    // Now the game has opened:
-    return openedgame_to_gamemenu(console, context, GameSettings::instance().START_GAME_WAIT0);
-}
-
-bool gamemenu_to_ingame(
-    ConsoleHandle& console, BotBaseContext& context,
-    uint16_t mash_duration, uint16_t enter_game_timeout
-){
-    console.log("Mashing A to enter game...");
-    BlackScreenOverWatcher detector(COLOR_RED, {0.2, 0.2, 0.6, 0.6});
-    pbf_mash_button(context, BUTTON_A, mash_duration);
-    context.wait_for_all_requests();
-    console.log("Waiting to enter game...");
-    int ret = wait_until(
-        console, context,
-        std::chrono::milliseconds(enter_game_timeout * (1000 / TICKS_PER_SECOND)),
-        {{detector}}
-    );
-    if (ret == 0){
-        console.log("Entered game!");
-        return true;
-    }else{
-        console.log("Timed out waiting to enter game.", COLOR_RED);
-        return false;
-    }
-}
-
-bool reset_game_from_home(
-    ProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context,
-    bool tolerate_update_menu,
-    uint16_t post_wait_time
-){
-    bool ok = true;
-    ok &= reset_game_to_gamemenu(console, context, tolerate_update_menu);
-    ok &= gamemenu_to_ingame(console, context, GameSettings::instance().ENTER_GAME_MASH, GameSettings::instance().ENTER_GAME_WAIT);
-    if (!ok){
-        dump_image(console.logger(), env.program_info(), "StartGame", console.video().snapshot());
-    }
-    console.log("Entered game! Waiting out grace period.");
-    pbf_wait(context, post_wait_time);
-    context.wait_for_all_requests();
-    return ok;
-}
-
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonLA/Programs/PokemonLA_GameEntry.h b/SerialPrograms/Source/PokemonLA/Programs/PokemonLA_GameEntry.h
deleted file mode 100644
index 187de01c86..0000000000
--- a/SerialPrograms/Source/PokemonLA/Programs/PokemonLA_GameEntry.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*  Game Entry
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonLA_GameEntry_H
-#define PokemonAutomation_PokemonLA_GameEntry_H
-
-#include <stdint.h>
-
-namespace PokemonAutomation{
-    class ConsoleHandle;
-    class BotBaseContext;
-    class ProgramEnvironment;
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-
-
-// From Switch Home menu, reset game and wait until the game menu screen (where
-// "Press A" is displayed to enter the game) is shown.
-bool reset_game_to_gamemenu(
-    ConsoleHandle& console, BotBaseContext& context,
-    bool tolerate_update_menu
-);
-
-// From the game menu screen (where "Press A" is displayed to enter the game),
-// mash A to enter the game and wait until the black screen is gone.
-bool gamemenu_to_ingame(
-    ConsoleHandle& console, BotBaseContext& context,
-    uint16_t mash_duration, uint16_t enter_game_timeout
-);
-
-// From Switch Home menu, start game and wait until the player character appears in game.
-// post_wait_time: how many ticks to wait after the black screen (shown when loading the map) is over.
-bool reset_game_from_home(
-    ProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context,
-    bool tolerate_update_menu,
-    uint16_t post_wait_time = 125
-);
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonLA/Programs/PokemonLA_GameSave.cpp b/SerialPrograms/Source/PokemonLA/Programs/PokemonLA_GameSave.cpp
deleted file mode 100644
index 833ec6057d..0000000000
--- a/SerialPrograms/Source/PokemonLA/Programs/PokemonLA_GameSave.cpp
+++ /dev/null
@@ -1,101 +0,0 @@
-/*  Game Save
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/Exceptions/OperationFailedException.h"
-#include "CommonFramework/ImageTools/ImageFilter.h"
-#include "CommonFramework/ImageTools/ImageStats.h"
-#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
-#include "CommonFramework/ImageTypes/ImageRGB32.h"
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
-#include "CommonFramework/Tools/ProgramEnvironment.h"
-#include "CommonFramework/Tools/ConsoleHandle.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "PokemonLA_GameSave.h"
-
-#include <iostream>
-using std::cout;
-using std::endl;
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-namespace {
-
-const ImageFloatBox tab_box{0.450, 0.005, 0.040, 0.010};
-const ImageFloatBox save_icon_box{0.456, 0.015, 0.026, 0.041};
-
-}
-
-
-bool save_tab_selected(const ImageViewRGB32 &screen){
-
-    const ImageStats stats = image_stats(extract_box_reference(screen, tab_box));
-    return (stats.stddev.sum() < 15 &&
-        stats.average.b > stats.average.r && stats.average.b > stats.average.g
-    );
-}
-
-bool save_tab_disabled(const ImageViewRGB32 &screen){
-
-    // Replace white background with zero-alpha color so that they won't be counted in
-    // the following image_stats()
-    // The white background is defined as the color between 0xffa0a0a0 and 0xffffffff.
-    const bool replace_background = true;
-    ImageRGB32 region = filter_rgb32_range(
-        extract_box_reference(screen, save_icon_box),
-        0xffa0a0a0, 0xffffffff, Color(0), replace_background
-    );
-
-    ImageStats stats = image_stats(region);
-    // cout << "color " << stats.count << " " << stats.average.to_string() << endl;
-    return (stats.average.r > stats.average.b + 50.0);
-}
-
-
-bool save_game_from_overworld(ProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context){
-    OverlayBoxScope tab_box_scope(console, tab_box);
-    OverlayBoxScope icon_box_scope(console, save_icon_box);
-    console.log("Saving game...");
-    console.overlay().add_log("Saving game...", COLOR_WHITE);
-
-    // Press DPAD_UP to open menu
-    pbf_press_dpad(context, DPAD_UP, 20, 120);
-    context.wait_for_all_requests();
-    auto snapshot = console.video().snapshot();
-    if (save_tab_disabled(snapshot)){
-        return false;
-    }
-
-    for (size_t c = 0; c < 10; c++){
-        if (save_tab_selected(snapshot)){
-            pbf_press_button(context, BUTTON_A, 20, 200);
-            pbf_press_button(context, BUTTON_B, 20, 100);
-            pbf_press_button(context, BUTTON_B, 20, 100);
-            context.wait_for_all_requests();
-            return true;
-        }
-        pbf_press_button(context, BUTTON_ZR, 20, 80);
-        context.wait_for_all_requests();
-        snapshot = console.video().snapshot();
-    }
-
-    console.log("Unable to find save menu.", COLOR_RED);
-    throw OperationFailedException(
-        ErrorReport::SEND_ERROR_REPORT, console,
-        "Unable to find save menu.",
-        true
-    );
-}
-
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonLA/Programs/PokemonLA_GameSave.h b/SerialPrograms/Source/PokemonLA/Programs/PokemonLA_GameSave.h
deleted file mode 100644
index 1dc41196c9..0000000000
--- a/SerialPrograms/Source/PokemonLA/Programs/PokemonLA_GameSave.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*  Game Save
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonLA_GameSave_H
-#define PokemonAutomation_PokemonLA_GameSave_H
-
-namespace PokemonAutomation{
-    class ConsoleHandle;
-    class BotBaseContext;
-    class ProgramEnvironment;
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-// Whether the current tab is the save game tab
-bool save_tab_selected(const ImageViewRGB32 &screen);
-
-// Whether the save game tab is disabled: a red "forbidden" synbol appears on the location of the save game tab icon.
-bool save_tab_disabled(const ImageViewRGB32 &screen);
-
-// Open menu to save game. Return true if success.
-// Return false if in current state the game cannot be saved. This can happen if the player character is in the air
-// or is rolling or falling.
-bool save_game_from_overworld(ProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context);
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonLA/Programs/PokemonLA_LeapPokemonActions.cpp b/SerialPrograms/Source/PokemonLA/Programs/PokemonLA_LeapPokemonActions.cpp
deleted file mode 100644
index faa8346ab8..0000000000
--- a/SerialPrograms/Source/PokemonLA/Programs/PokemonLA_LeapPokemonActions.cpp
+++ /dev/null
@@ -1,288 +0,0 @@
-/*  Leap Pokemon Actions
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
-#include "Pokemon/Inference/Pokemon_NameReader.h"
-#include "PokemonLA/Resources/PokemonLA_PokemonInfo.h"
-#include "PokemonLA/Inference/PokemonLA_OverworldDetector.h"
-#include "PokemonLA/Inference/PokemonLA_StatusInfoScreenDetector.h"
-#include "PokemonLA/Inference/Battles/PokemonLA_BattleMenuDetector.h"
-#include "PokemonLA_MountChange.h"
-#include "PokemonLA/PokemonLA_TravelLocations.h"
-#include "PokemonLA_RegionNavigation.h"
-#include "PokemonLA_BattleRoutines.h"
-#include "PokemonLA_LeapPokemonActions.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-void route(ProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context, LeapPokemon pokemon){
-    switch (pokemon) {
-    case LeapPokemon::Aipom:
-        goto_camp_from_jubilife(env, console, context, TravelLocations::instance().Coastlands_Beachside);
-        pbf_move_left_joystick(context, 240, 255, 30, 30);
-        pbf_press_button(context, BUTTON_ZL, 20, (uint16_t)(0.5 * TICKS_PER_SECOND));
-        change_mount(console, context, MountState::BRAVIARY_ON);
-        pbf_press_button(context, BUTTON_B, (21 * TICKS_PER_SECOND), (1 * TICKS_PER_SECOND));
-        pbf_move_left_joystick(context, 255, 160, 30, (uint16_t)(0.5 * TICKS_PER_SECOND));
-        pbf_press_button(context, BUTTON_ZL, 20, (uint16_t)(0.5 * TICKS_PER_SECOND));
-        pbf_move_left_joystick(context, 127, 0, (3 * TICKS_PER_SECOND), (1 * TICKS_PER_SECOND));
-        break;
-    case LeapPokemon::Burmy:
-        goto_camp_from_jubilife(env, console, context, TravelLocations::instance().Fieldlands_Heights);
-        pbf_move_left_joystick(context, 170, 255, 30, 30);
-        change_mount(console, context, MountState::BRAVIARY_ON);
-        pbf_press_button(context, BUTTON_B, (uint16_t)(6.35 * TICKS_PER_SECOND), 20);
-        pbf_press_button(context, BUTTON_PLUS, 20, (1 * TICKS_PER_SECOND));
-        pbf_press_button(context, BUTTON_PLUS, 20, (uint16_t)(0.5 * TICKS_PER_SECOND));
-        pbf_press_button(context, BUTTON_PLUS, 20, (uint16_t)(1.5 * TICKS_PER_SECOND));
-        pbf_move_left_joystick(context, 255, 127, 30, (uint16_t)(0.5 * TICKS_PER_SECOND));
-        pbf_press_button(context, BUTTON_ZL, 20, (uint16_t)(0.5 * TICKS_PER_SECOND));
-        pbf_move_right_joystick(context, 127, 255, (uint16_t)(0.10 * TICKS_PER_SECOND), (uint16_t)(0.5 * TICKS_PER_SECOND));
-        break;
-    case LeapPokemon::Cherrim:
-        goto_camp_from_jubilife(env, console, context, TravelLocations::instance().Highlands_Mountain);
-        pbf_move_left_joystick(context, 255, 35, 30, 30);
-        pbf_press_button(context, BUTTON_ZL, 20, (uint16_t)(0.5 * TICKS_PER_SECOND));
-        change_mount(console, context, MountState::BRAVIARY_ON);
-        pbf_press_button(context, BUTTON_B, (uint16_t)(3.35 * TICKS_PER_SECOND), (1 * TICKS_PER_SECOND));
-        pbf_press_button(context, BUTTON_PLUS, 20, (1 * TICKS_PER_SECOND));
-        pbf_press_button(context, BUTTON_PLUS, 20, (uint16_t)(0.5 * TICKS_PER_SECOND));
-        pbf_press_button(context, BUTTON_PLUS, 20, (uint16_t)(1.5 * TICKS_PER_SECOND));
-        pbf_move_left_joystick(context, 0, 127, 20, 20);
-        pbf_press_button(context, BUTTON_ZL, 20, (uint16_t)(0.5 * TICKS_PER_SECOND));
-        pbf_move_right_joystick(context, 127, 255, (uint16_t)(0.20 * TICKS_PER_SECOND), (uint16_t)(0.5 * TICKS_PER_SECOND));
-        break;
-    case LeapPokemon::Cherubi:
-        goto_camp_from_jubilife(env, console, context, TravelLocations::instance().Fieldlands_Arena);
-        pbf_move_left_joystick(context, 255, 152, 30, 30);
-        change_mount(console, context, MountState::BRAVIARY_ON);
-        pbf_press_button(context, BUTTON_B, (uint16_t)(25.5 * TICKS_PER_SECOND), (1 * TICKS_PER_SECOND));
-        pbf_press_button(context, BUTTON_PLUS, 20, (uint16_t)(0.5 * TICKS_PER_SECOND));
-        break;
-    case LeapPokemon::Combee:
-        goto_camp_from_jubilife(env, console, context, TravelLocations::instance().Fieldlands_Arena);
-        pbf_move_left_joystick(context, 57, 255, 20, (uint16_t)(0.5 * TICKS_PER_SECOND));
-        pbf_press_button(context, BUTTON_ZL, 20, (uint16_t)(0.5 * TICKS_PER_SECOND));
-        change_mount(console, context, MountState::BRAVIARY_ON);
-        pbf_press_button(context, BUTTON_B, (uint16_t)(2.75 * TICKS_PER_SECOND), (1 * TICKS_PER_SECOND));
-        pbf_press_button(context, BUTTON_PLUS, 20, (1 * TICKS_PER_SECOND));
-        break;
-    case LeapPokemon::Heracross:
-        goto_camp_from_jubilife(env, console, context, TravelLocations::instance().Highlands_Mountain);
-        pbf_move_left_joystick(context, 0, 220, 30, 30);
-        pbf_press_button(context, BUTTON_ZL, 20, (uint16_t)(0.5 * TICKS_PER_SECOND));
-        pbf_move_left_joystick(context, 127, 0, (4 * TICKS_PER_SECOND), (uint16_t)(0.5 * TICKS_PER_SECOND));
-        pbf_move_right_joystick(context, 127, 255, (uint16_t)(0.17 * TICKS_PER_SECOND), (1 * TICKS_PER_SECOND));
-        break;
-    case LeapPokemon::Pachirisu:
-    case LeapPokemon::Vespiquen:
-        goto_camp_from_jubilife(env, console, context, TravelLocations::instance().Mirelands_Bogbound);
-        pbf_move_left_joystick(context, 0, 170, 30, 30);
-        pbf_press_button(context, BUTTON_ZL, 20, (uint16_t)(0.5 * TICKS_PER_SECOND));
-        change_mount(console, context, MountState::BRAVIARY_ON);
-        pbf_press_button(context, BUTTON_B, (uint16_t)(10.2 * TICKS_PER_SECOND), 20);
-        pbf_press_button(context, BUTTON_PLUS, 20, (1 * TICKS_PER_SECOND));
-        break;
-    case LeapPokemon::Wormadam:
-        goto_camp_from_jubilife(env, console, context, TravelLocations::instance().Fieldlands_Fieldlands);
-        pbf_move_left_joystick(context, 110, 255, 30, 30);
-        change_mount(console, context, MountState::BRAVIARY_ON);
-        pbf_press_button(context, BUTTON_B, (uint16_t)(6.25 * TICKS_PER_SECOND), 20);
-        pbf_press_button(context, BUTTON_PLUS, 20, (1 * TICKS_PER_SECOND));
-        pbf_move_left_joystick(context, 255, 100, 20, 20);
-        pbf_press_button(context, BUTTON_ZL, 20, (uint16_t)(0.5 * TICKS_PER_SECOND));
-        pbf_move_right_joystick(context, 127, 255, (uint16_t)(0.2 * TICKS_PER_SECOND), (uint16_t)(0.5 * TICKS_PER_SECOND));
-        break;
-    case LeapPokemon::Geodude:
-        goto_camp_from_jubilife(env, console, context, TravelLocations::instance().Fieldlands_Heights);
-        pbf_move_left_joystick(context, 200, 255, 20, 20);
-        pbf_press_button(context, BUTTON_ZL, 20, (uint16_t)(0.5 * TICKS_PER_SECOND));
-        change_mount(console, context, MountState::BRAVIARY_ON);
-        pbf_press_button(context, BUTTON_B, (uint16_t)(3.75 * TICKS_PER_SECOND), 20);
-        pbf_press_button(context, BUTTON_PLUS, 20, (1 * TICKS_PER_SECOND));
-        pbf_press_button(context, BUTTON_PLUS, 20, (uint16_t)(0.5 * TICKS_PER_SECOND));
-        pbf_press_button(context, BUTTON_PLUS, 20, (1 * TICKS_PER_SECOND));
-        pbf_move_left_joystick(context, 127, 255, 20, 20);
-        pbf_press_button(context, BUTTON_ZL, 20, (uint16_t)(0.5 * TICKS_PER_SECOND));
-        break;
-    case LeapPokemon::Graveler:
-        goto_camp_from_jubilife(env, console, context, TravelLocations::instance().Highlands_Highlands);
-        pbf_move_left_joystick(context, 255, 145, 20, 20);
-        pbf_press_button(context, BUTTON_ZL, 20, (uint16_t)(0.5 * TICKS_PER_SECOND));
-        pbf_move_left_joystick(context, 127, 0, (5 * TICKS_PER_SECOND), (uint16_t)(0.5 * TICKS_PER_SECOND));
-        break;
-    case LeapPokemon::Bonsly:
-        goto_camp_from_jubilife(env, console, context, TravelLocations::instance().Mirelands_DiamondSettlement);
-        pbf_move_left_joystick(context, 0, 150, 20, (uint16_t)(0.5 * TICKS_PER_SECOND));
-        pbf_press_button(context, BUTTON_ZL, 20, (uint16_t)(0.5 * TICKS_PER_SECOND));
-        change_mount(console, context, MountState::BRAVIARY_ON);
-        pbf_move_left_joystick(context, 127, 0, (10 * TICKS_PER_SECOND), (uint16_t)(0.5 * TICKS_PER_SECOND));
-        break;
-    case LeapPokemon::Bronzor:
-        goto_camp_from_jubilife(env, console, context, TravelLocations::instance().Highlands_Mountain);
-        pbf_move_left_joystick(context, 55, 255, 20, (uint16_t)(0.5 * TICKS_PER_SECOND));
-        pbf_press_button(context, BUTTON_ZL, 20, (uint16_t)(0.5 * TICKS_PER_SECOND));
-        change_mount(console, context, MountState::WYRDEER_ON);
-        pbf_press_button(context, BUTTON_B, (uint16_t)(6.5 * TICKS_PER_SECOND), (1 * TICKS_PER_SECOND));
-        pbf_press_button(context, BUTTON_PLUS, 20, (uint16_t)(0.5 * TICKS_PER_SECOND));
-        pbf_move_right_joystick(context, 127, 255, (uint16_t)(0.2 * TICKS_PER_SECOND), (uint16_t)(0.5 * TICKS_PER_SECOND));
-        break;
-    case LeapPokemon::Nosepass:
-        goto_camp_from_jubilife(env, console, context, TravelLocations::instance().Highlands_Summit);
-        pbf_move_left_joystick(context, 255, 175, 20, (uint16_t)(0.5 * TICKS_PER_SECOND));
-        pbf_press_button(context, BUTTON_ZL, 20, (uint16_t)(0.5 * TICKS_PER_SECOND));
-        change_mount(console, context, MountState::WYRDEER_ON);
-        pbf_press_button(context, BUTTON_B, (uint16_t)(2.5 * TICKS_PER_SECOND), (1 * TICKS_PER_SECOND));
-        pbf_press_button(context, BUTTON_PLUS, 20, (uint16_t)(0.5 * TICKS_PER_SECOND));
-        pbf_move_right_joystick(context, 127, 255, (uint16_t)(0.2 * TICKS_PER_SECOND), (uint16_t)(0.5 * TICKS_PER_SECOND));
-        break;
-    case LeapPokemon::Bergimite:
-        goto_camp_from_jubilife(env, console, context, TravelLocations::instance().Icelands_Snowfields);
-        pbf_move_left_joystick(context, 115, 255, 20, (uint16_t)(0.5 * TICKS_PER_SECOND));
-        pbf_press_button(context, BUTTON_ZL, 20, (uint16_t)(0.5 * TICKS_PER_SECOND));
-        change_mount(console, context, MountState::WYRDEER_ON);
-        pbf_press_button(context, BUTTON_B, (uint16_t)(3.2 * TICKS_PER_SECOND), (1 * TICKS_PER_SECOND));
-        pbf_press_button(context, BUTTON_PLUS, 20, (uint16_t)(0.5 * TICKS_PER_SECOND));
-        pbf_move_right_joystick(context, 127, 255, (uint16_t)(0.2 * TICKS_PER_SECOND), (uint16_t)(0.5 * TICKS_PER_SECOND));
-        break;
-    }
-    context.wait_for_all_requests();
-}
-
-void return_to_jubilife(ProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context, LeapPokemon pokemon){
-    goto_camp_from_overworld(env, console, context);
-    switch (pokemon) {
-    case LeapPokemon::Aipom:
-        goto_professor(console, context, Camp::COASTLANDS_BEACHSIDE);
-        break;
-    case LeapPokemon::Burmy:
-    case LeapPokemon::Cherubi:
-    case LeapPokemon::Combee:
-    case LeapPokemon::Wormadam:
-    case LeapPokemon::Geodude:
-        goto_professor(console, context, Camp::FIELDLANDS_FIELDLANDS);
-        break;
-    case LeapPokemon::Cherrim:
-    case LeapPokemon::Heracross:
-    case LeapPokemon::Graveler:
-    case LeapPokemon::Bronzor:
-    case LeapPokemon::Nosepass:
-        goto_professor(console, context, Camp::HIGHLANDS_HIGHLANDS);
-        break;
-    case LeapPokemon::Pachirisu:
-    case LeapPokemon::Vespiquen:
-    case LeapPokemon::Bonsly:
-        goto_professor(console, context, Camp::MIRELANDS_MIRELANDS);
-        break;
-    case LeapPokemon::Bergimite:
-        goto_professor(console, context, Camp::ICELANDS_SNOWFIELDS);
-        break;
-    }
-    from_professor_return_to_jubilife(env, console, context);
-    context.wait_for_all_requests();
-}
-
-bool check_tree_or_ore_for_battle(ConsoleHandle& console, BotBaseContext& context){
-    pbf_press_button(context, BUTTON_ZR, (uint16_t)(0.5 * TICKS_PER_SECOND), 20); //throw pokemon
-    pbf_wait(context, (uint16_t)(4.5 * TICKS_PER_SECOND));
-    context.wait_for_all_requests();
-
-    MountDetector mount_detector;
-
-    VideoSnapshot snapshot = console.video().snapshot();
-    MountState mount = mount_detector.detect(snapshot);
-    bool found = false;
-    for (int i = 0; i < 4; i++){
-        if (mount == MountState::NOTHING){
-            found = true;
-            break;
-        }else{
-            console.log("Attempt " + std::to_string(i) + ". Found: " + MOUNT_STATE_STRINGS[(int)mount]);
-            pbf_wait(context, (uint16_t)(0.5 * TICKS_PER_SECOND));
-            context.wait_for_all_requests();
-            snapshot = console.video().snapshot();
-        }
-        mount = mount_detector.detect(snapshot);
-    }
-
-    if (!found){
-        console.log("Battle not found. Tree or ore might be empty.");
-        return false;
-    }
-
-    console.log("Mount icon seems to be gone, waiting for battle menu...");
-
-    BattleMenuDetector battle_menu_detector(console, console, true);
-    wait_until(
-       console, context, std::chrono::seconds(10),
-       {{battle_menu_detector}}
-    );
-
-    if(battle_menu_detector.detected()){
-        console.log("Battle found!");
-        return true;
-    }
-
-    console.log("Battle menu not found. Tree or ore might be empty.");
-    return false;
-}
-
-void exit_battle(ConsoleHandle& console, BotBaseContext& context, ExitBattleMethod exit_method){
-//    pbf_press_button(context, BUTTON_B, 20, 225);
-
-    if (exit_method == ExitBattleMethod::RunAway){
-        console.log("Running from battle...");
-        pbf_press_button(context, BUTTON_B, 20, 225);
-        pbf_press_button(context, BUTTON_A, 20, 100 + (uint16_t)(3.5 * TICKS_PER_SECOND));
-        context.wait_for_all_requests();
-        return;
-    }
-
-    context.wait_for_all_requests();
-    console.log("Mashing A to battle!");
-    mash_A_until_end_of_battle(console, context);
-}
-
-PokemonDetails get_pokemon_details(ConsoleHandle& console, BotBaseContext& context, Language language){
-    //  Open Info Screen
-    pbf_wait(context, (1 * TICKS_PER_SECOND));
-    pbf_press_button(context, BUTTON_PLUS, 20, 20);
-    pbf_wait(context, (1 * TICKS_PER_SECOND));
-    pbf_press_button(context, BUTTON_R, 20, 20);
-    pbf_wait(context, (1 * TICKS_PER_SECOND));
-
-    context.wait_for_all_requests();
-    VideoSnapshot screen = console.video().snapshot();
-
-    return read_status_info(console, console, screen, language);
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonLA/Programs/PokemonLA_LeapPokemonActions.h b/SerialPrograms/Source/PokemonLA/Programs/PokemonLA_LeapPokemonActions.h
deleted file mode 100644
index 9b6fe5a721..0000000000
--- a/SerialPrograms/Source/PokemonLA/Programs/PokemonLA_LeapPokemonActions.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*  Leap Pokemon Actions
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonLA_LeapPokemonActions_H
-#define PokemonAutomation_PokemonLA_LeapPokemonActions_H
-
-#include "PokemonLA/Resources/PokemonLA_PokemonInfo.h"
-#include "CommonFramework/OCR/OCR_StringMatchResult.h"
-#include "Pokemon/Inference/Pokemon_NameReader.h"
-#include "PokemonLA/Options/PokemonLA_MiscOptions.h"
-#include "PokemonLA_RegionNavigation.h"
-
-namespace PokemonAutomation{
-    class ProgramEnvironment;
-    class ConsoleHandle;
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-enum class LeapPokemon
-{
-    Aipom,
-    Burmy,
-    Cherrim,
-    Cherubi,
-    Combee,
-    Heracross,
-    Pachirisu,
-    Vespiquen,
-    Wormadam,
-    Geodude,
-    Graveler,
-    Bonsly,
-    Bronzor,
-    Nosepass,
-    Bergimite
-};
-
-void setup(ProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context);
-void route(ProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context, LeapPokemon pokemon);
-bool check_tree_or_ore_for_battle(ConsoleHandle& console, BotBaseContext& context);
-void exit_battle(ConsoleHandle& console, BotBaseContext& context, ExitBattleMethod exit_method);
-void return_to_jubilife(ProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context, LeapPokemon pokemon);
-PokemonDetails get_pokemon_details(ConsoleHandle& console, BotBaseContext& context, Language language);
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonLA/Programs/PokemonLA_MountChange.cpp b/SerialPrograms/Source/PokemonLA/Programs/PokemonLA_MountChange.cpp
deleted file mode 100644
index 5f5b6c20af..0000000000
--- a/SerialPrograms/Source/PokemonLA/Programs/PokemonLA_MountChange.cpp
+++ /dev/null
@@ -1,148 +0,0 @@
-/*  Mount Change
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/Exceptions/OperationFailedException.h"
-#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "PokemonLA_MountChange.h"
-
-#include <iostream>
-using std::cout;
-using std::endl;
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-
-bool get_mount_coordinates(size_t& index, MountState mount){
-    switch (mount){
-    case MountState::WYRDEER_OFF:
-    case MountState::BASCULEGION_OFF:
-        index = 0;
-        return false;
-    case MountState::WYRDEER_ON:
-    case MountState::BASCULEGION_ON:
-        index = 0;
-        return true;
-    case MountState::URSALUNA_OFF:
-        index = 1;
-        return false;
-    case MountState::URSALUNA_ON:
-        index = 1;
-        return true;
-    case MountState::SNEASLER_OFF:
-        index = 2;
-        return false;
-    case MountState::SNEASLER_ON:
-        index = 2;
-        return true;
-    case MountState::BRAVIARY_OFF:
-        index = 3;
-        return false;
-    case MountState::BRAVIARY_ON:
-        index = 3;
-        return true;
-    default:
-        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Invalid MountState = " + std::to_string((size_t)mount));
-    }
-}
-
-void change_mount(ConsoleHandle& console, BotBaseContext& context, MountState mount){
-    size_t desired_index;
-    bool desired_on = get_mount_coordinates(desired_index, mount);
-
-    MountDetector mount_detector;
-    for (size_t c = 0; c < 20; c++){
-        context.wait_for_all_requests();
-
-        MountState current = mount_detector.detect(console.video().snapshot());
-        if (mount == current){
-            return;
-        }
-        if (current == MountState::NOTHING){
-            pbf_press_dpad(context, DPAD_RIGHT, 20, 50);
-            continue;
-        }
-
-        size_t current_index;
-        bool current_on = get_mount_coordinates(current_index, current);
-
-        if (!desired_on && current_on){
-            pbf_press_button(context, BUTTON_PLUS, 20, 105);
-        }
-
-        size_t index_diff = (4 + current_index - desired_index) % 4;
-        switch (index_diff){
-        case 0:
-            break;
-        case 1:
-            pbf_press_dpad(context, DPAD_RIGHT, 20, 50);
-            break;
-        case 2:
-            pbf_press_dpad(context, DPAD_RIGHT, 20, 50);
-            pbf_press_dpad(context, DPAD_RIGHT, 20, 50);
-            break;
-        case 3:
-            pbf_press_dpad(context, DPAD_LEFT, 20, 50);
-            break;
-        }
-
-        if (desired_on && !current_on){
-            if (desired_index == 3){
-                pbf_press_button(context, BUTTON_PLUS, 20, 230);
-            }else{
-                pbf_press_button(context, BUTTON_PLUS, 20, 105);
-            }
-        }
-    }
-
-    throw OperationFailedException(
-        ErrorReport::SEND_ERROR_REPORT, console,
-        std::string("Unable to find ") + MOUNT_STATE_STRINGS[(size_t)mount] + " after 10 attempts.",
-        true
-    );
-}
-
-void dismount(ConsoleHandle& console, BotBaseContext& context){
-    MountDetector mount_detector;
-    for (size_t c = 0; c < 10; c++){
-        context.wait_for_all_requests();
-
-        MountState current = mount_detector.detect(console.video().snapshot());
-        switch (current){
-        case MountState::WYRDEER_OFF:
-        case MountState::URSALUNA_OFF:
-        case MountState::BASCULEGION_OFF:
-        case MountState::SNEASLER_OFF:
-        case MountState::BRAVIARY_OFF:
-            // Already unmount
-            return;
-        default:
-            break;
-        }
-
-        if (current == MountState::NOTHING){
-            pbf_press_dpad(context, DPAD_RIGHT, 20, 50);
-            continue;
-        }
-
-        // We are mounted. Press + to unmount
-        pbf_press_button(context, BUTTON_PLUS, 20, 105);
-    }
-
-    throw OperationFailedException(
-        ErrorReport::SEND_ERROR_REPORT, console,
-        "Unable to dismount after 10 attempts.",
-        true
-    );
-}
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonLA/Programs/PokemonLA_MountChange.h b/SerialPrograms/Source/PokemonLA/Programs/PokemonLA_MountChange.h
deleted file mode 100644
index fe9b425037..0000000000
--- a/SerialPrograms/Source/PokemonLA/Programs/PokemonLA_MountChange.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*  Mount Change
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonLA_MountChange_H
-#define PokemonAutomation_PokemonLA_MountChange_H
-
-#include "ClientSource/Connection/BotBase.h"
-#include "CommonFramework/Tools/ConsoleHandle.h"
-#include "PokemonLA/Inference/PokemonLA_MountDetector.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-
-//  Be careful when changing away from Braviary (on) since you will fall down.
-void change_mount(ConsoleHandle& console, BotBaseContext& context, MountState mount);
-
-//  Dismount player character.
-//  Be careful when changing away from Braviary (on) since you will fall down.
-void dismount(ConsoleHandle& console, BotBaseContext& context);
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonLA/Programs/PokemonLA_RegionNavigation.cpp b/SerialPrograms/Source/PokemonLA/Programs/PokemonLA_RegionNavigation.cpp
deleted file mode 100644
index ff8e3c168a..0000000000
--- a/SerialPrograms/Source/PokemonLA/Programs/PokemonLA_RegionNavigation.cpp
+++ /dev/null
@@ -1,592 +0,0 @@
-/*  Region Navigation
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/Exceptions/OperationFailedException.h"
-#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
-#include "CommonFramework/Inference/BlackScreenDetector.h"
-#include "CommonFramework/Tools/ErrorDumper.h"
-#include "CommonFramework/Tools/ProgramEnvironment.h"
-#include "CommonFramework/Tools/ConsoleHandle.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "PokemonLA/Inference/Map/PokemonLA_MapDetector.h"
-#include "PokemonLA/Inference/Objects/PokemonLA_ButtonDetector.h"
-#include "PokemonLA/PokemonLA_Settings.h"
-#include "PokemonLA/PokemonLA_TravelLocations.h"
-#include "PokemonLA/Programs/PokemonLA_EscapeFromAttack.h"
-#include "PokemonLA_RegionNavigation.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-
-
-void goto_professor(Logger& logger, BotBaseContext& context, Camp camp){
-    switch (camp){
-    case Camp::FIELDLANDS_FIELDLANDS:
-        pbf_move_left_joystick(context, 255, 0, 125, 0);
-        return;
-    case Camp::FIELDLANDS_HEIGHTS:
-        pbf_move_left_joystick(context, 240, 0, 200, 0);
-        return;
-    case Camp::MIRELANDS_MIRELANDS:
-        pbf_move_left_joystick(context, 255, 64, 160, 0);
-        return;
-    case Camp::MIRELANDS_BOGBOUND:
-        pbf_move_left_joystick(context, 255, 64, 140, 0);
-        return;
-    case Camp::COASTLANDS_BEACHSIDE:
-        pbf_move_left_joystick(context, 255, 96, 125, 0);
-        return;
-    case Camp::COASTLANDS_COASTLANDS:
-        pbf_move_left_joystick(context, 255, 48, 105, 0);
-        return;
-    case Camp::HIGHLANDS_HIGHLANDS:
-        pbf_move_left_joystick(context, 255, 48, 176, 0);
-        return;
-    case Camp::HIGHLANDS_MOUNTAIN:
-        pbf_move_left_joystick(context, 255, 32, 125, 0);
-        return;
-    case Camp::HIGHLANDS_SUMMIT:
-        pbf_move_left_joystick(context, 255, 0, 125, 0);
-        return;
-    case Camp::ICELANDS_SNOWFIELDS:
-        pbf_move_left_joystick(context, 255, 56, 125, 0);
-        return;
-    case Camp::ICELANDS_ICEPEAK:
-        pbf_move_left_joystick(context, 255, 48, 75, 0);
-        return;
-    default:
-        throw InternalProgramError(
-            &logger, PA_CURRENT_FUNCTION,
-            "Unknown Camp: " + std::to_string((int)camp)
-        );
-    }
-}
-void from_professor_return_to_jubilife(
-    ProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context
-){
-    ButtonDetector button_detector0(
-        console, console,
-        ButtonType::ButtonA, ImageFloatBox(0.500, 0.578, 0.300, 0.043),
-        std::chrono::milliseconds(200), true
-    );
-    ButtonDetector button_detector1(
-        console, console,
-        ButtonType::ButtonA, ImageFloatBox(0.500, 0.621, 0.300, 0.043),
-        std::chrono::milliseconds(200), true
-    );
-    ButtonDetector bottom_B(
-        console, console,
-        ButtonType::ButtonB, ImageFloatBox(0.900, 0.955, 0.080, 0.045),
-        std::chrono::milliseconds(100), true
-    );
-    while (true){
-        context.wait_for_all_requests();
-        int ret = run_until(
-            console, context,
-            [](BotBaseContext& context){
-                for (size_t c = 0; c < 20; c++){
-                    pbf_press_button(context, BUTTON_A, 20, 125);
-                }
-            },
-            {
-                {button_detector0},
-                {button_detector1},
-                {bottom_B}
-            }
-        );
-        context.wait_for(std::chrono::milliseconds(500));
-        switch (ret){
-        case 0:
-            console.log("Detected return option...");
-            pbf_press_dpad(context, DPAD_DOWN, 20, 105);
-            mash_A_to_change_region(env, console, context);
-            return;
-        case 1:
-            console.log("Detected report research option...");
-            break;
-        case 2:
-            console.log("Backing out of Pokedex...");
-            pbf_mash_button(context, BUTTON_B, 20);
-            break;
-        default:
-            throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, console,
-                "Did not detect option to return to Jubilife.",
-                true
-            );
-        }
-    }
-}
-
-
-void mash_A_to_enter_sub_area(
-    ProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context
-){
-    BlackScreenOverWatcher black_screen0(COLOR_RED, {0.2, 0.2, 0.6, 0.6}, 100, 10);
-    int ret = run_until(
-        console, context,
-        [](BotBaseContext& context){
-            pbf_mash_button(context, BUTTON_A, 7 * TICKS_PER_SECOND);
-        },
-        {{black_screen0}}
-    );
-    if (ret < 0){
-//        dump_image(env.logger(), env.program_info(), "LoadSubArea", console.video().snapshot());
-        throw OperationFailedException(
-            ErrorReport::SEND_ERROR_REPORT, console,
-            "Failed to load into sub area after 7 seconds.",
-            true
-        );
-    }
-
-    console.log("Loaded into sub area...");
-    context.wait_for(std::chrono::milliseconds(200));
-}
-
-
-void mash_A_to_change_region(
-    ProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context
-){
-    BlackScreenOverWatcher black_screen0;
-    int ret = run_until(
-        console, context,
-        [](BotBaseContext& context){
-            pbf_mash_button(context, BUTTON_A, GameSettings::instance().LOAD_REGION_TIMEOUT);
-        },
-        {{black_screen0}}
-    );
-    if (ret < 0){
-        throw OperationFailedException(
-            ErrorReport::SEND_ERROR_REPORT, console,
-            "Failed to load into region after timeout.",
-            true
-        );
-    }
-    context.wait_for(std::chrono::milliseconds(1000));
-
-    BlackScreenOverWatcher black_screen1a(COLOR_RED, {0.20, 0.02, 0.60, 0.05}, 150);
-    BlackScreenOverWatcher black_screen1b(COLOR_RED, {0.20, 0.93, 0.60, 0.05}, 150);
-    ret = wait_until(
-        console, context,
-        std::chrono::milliseconds(1000 * GameSettings::instance().LOAD_REGION_TIMEOUT / TICKS_PER_SECOND),
-        {
-            {black_screen1a},
-            {black_screen1b},
-        }
-    );
-    if (ret < 0){
-//        dump_image(console.logger(), env.program_info(), "LoadRegion", console.video().snapshot());
-        throw OperationFailedException(
-            ErrorReport::SEND_ERROR_REPORT, console,
-            "Failed to load into region after timeout.",
-            true
-        );
-    }
-    console.log("Loaded into map...");
-    context.wait_for(std::chrono::milliseconds((uint64_t)(GameSettings::instance().POST_WARP_DELAY * 1000)));
-}
-
-
-void open_travel_map_from_jubilife(
-    ProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context
-){
-    pbf_move_left_joystick(context, 128, 255, 200, 0);
-    MapDetector detector;
-    int ret = run_until(
-        console, context,
-        [](BotBaseContext& context){
-            for (size_t c = 0; c < 10; c++){
-                pbf_press_button(context, BUTTON_A, 20, 105);
-            }
-        },
-        {{detector}}
-    );
-    if (ret < 0){
-//        dump_image(console.logger(), env.program_info(), "MapNotDetected", console.video().snapshot());
-        throw OperationFailedException(
-            ErrorReport::SEND_ERROR_REPORT, console,
-            "Map not detected after 10 x A presses.",
-            true
-        );
-    }
-    console.log("Found map!");
-}
-
-
-void goto_camp_from_jubilife(
-    ProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context,
-    const TravelLocation& location
-){
-    // Move backwards and talk to guard to open the map.
-    context.wait_for_all_requests();
-    open_travel_map_from_jubilife(env, console, context);
-    context.wait_for(std::chrono::milliseconds(500));
-
-    DpadPosition direction = location.region < MapRegion::HIGHLANDS ? DPAD_RIGHT : DPAD_LEFT;
-
-    //  Move to region.
-    MapRegion current_region = MapRegion::NONE;
-    for (size_t c = 0; c < 10; c++){
-        current_region = detect_selected_region(console, context);
-        if (current_region == location.region){
-            break;
-        }
-        pbf_press_dpad(context, direction, 20, 40);
-        context.wait_for_all_requests();
-    }
-    if (current_region != location.region){
-//        dump_image(console.logger(), env.program_info(), "FindRegion", console.video().snapshot());
-        throw OperationFailedException(
-            ErrorReport::SEND_ERROR_REPORT, console,
-            std::string("Unable to find: ") + location.display,
-            true
-        );
-    }
-
-    if (location.warp_slot != 0){
-        pbf_press_button(context, BUTTON_A, 20, 105);
-        for (size_t c = 0; c < location.warp_slot; c++){
-            pbf_press_dpad(context, DPAD_DOWN, 20, 30);
-        }
-    }
-
-    //  Enter the region.
-    mash_A_to_change_region(env, console, context);
-
-    if (location.warp_sub_slot == 0){
-        // The destination is a camp.
-        // No need to do a warp in the region.
-        return;
-    }
-
-    // The destination is not a camp.
-    // It's a settlement or arena that requires another warp:
-
-    //  Open the map.
-    pbf_press_button(context, BUTTON_MINUS, 20, 30);
-    {
-        MapDetector detector;
-        int ret = wait_until(
-            console, context,
-            std::chrono::seconds(5),
-            {{detector}}
-        );
-        if (ret < 0){
-            dump_image(env.logger(), env.program_info(), "MapNotFound", console.video().snapshot());
-            throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, console,
-                "Map not detected after 5 seconds.",
-                true
-            );
-        }
-        console.log("Found map!");
-        context.wait_for(std::chrono::milliseconds(500));
-    }
-
-    //  Warp to sub-camp.
-    pbf_press_button(context, BUTTON_X, 20, 30);
-    {
-        ButtonDetector detector(
-            console, console,
-            ButtonType::ButtonA,
-            {0.55, 0.40, 0.20, 0.40},
-            std::chrono::milliseconds(200), true
-        );
-        int ret = wait_until(
-            console, context,
-            std::chrono::seconds(2),
-            {{detector}}
-        );
-        if (ret < 0){
-            throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, console,
-                "Unable to fly. Are you under attack?",
-                true
-            );
-        }
-    }
-    pbf_wait(context, 50);
-    for (size_t c = 0; c < location.warp_sub_slot; c++){
-        const DpadPosition dir = (location.reverse_sub_menu_direction ? DPAD_UP : DPAD_DOWN);
-        pbf_press_dpad(context, dir, 20, 30);
-    }
-    pbf_mash_button(context, BUTTON_A, 125);
-
-    BlackScreenOverWatcher black_screen(COLOR_RED, {0.1, 0.1, 0.8, 0.6});
-    int ret = wait_until(
-        console, context,
-        std::chrono::seconds(20),
-        {{black_screen}}
-    );
-    if (ret < 0){
-//        dump_image(console.logger(), env.program_info(), "FlyToCamp", console.video().snapshot());
-        throw OperationFailedException(
-            ErrorReport::SEND_ERROR_REPORT, console,
-            "Failed to fly to camp after 20 seconds.",
-            true
-        );
-    }
-    console.log("Arrived at sub-camp...");
-    context.wait_for(std::chrono::milliseconds((uint64_t)(GameSettings::instance().POST_WARP_DELAY * 1000)));
-
-    if (location.post_arrival_maneuver == nullptr){
-        return;
-    }
-
-    location.post_arrival_maneuver(console, context);
-    context.wait_for_all_requests();
-}
-
-
-
-
-void goto_camp_from_overworld(
-    ProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context
-){
-    auto start = current_time();
-    std::chrono::seconds grace_period(0);
-    while (true){
-        {
-            EscapeFromAttack session(
-                env, console, context,
-                grace_period, std::chrono::seconds(10)
-            );
-            session.run_session();
-        }
-
-        if (current_time() - start > std::chrono::seconds(60)){
-//            dump_image(console.logger(), env.program_info(), "EscapeFromAttack", console.video().snapshot());
-            throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, console,
-                "Unable to escape from being attacked.",
-                true
-            );
-        }
-
-        //  Open the map.
-        pbf_press_button(context, BUTTON_MINUS, 20, 30);
-        {
-            MapDetector detector;
-            int ret = wait_until(
-                console, context,
-                std::chrono::seconds(5),
-                {{detector}}
-            );
-            if (ret < 0){
-//                dump_image(console.logger(), env.program_info(), "MapNotDetected", console.video().snapshot());
-                console.log("Map not detected after 5 seconds.", COLOR_RED);
-                pbf_mash_button(context, BUTTON_B, TICKS_PER_SECOND);
-                context.wait_for_all_requests();
-                continue;
-            }
-            console.log("Found map!");
-            context.wait_for(std::chrono::milliseconds(500));
-        }
-
-        //  Try to fly back to camp.
-        pbf_press_button(context, BUTTON_X, 20, 30);
-
-        {
-            ButtonDetector detector(
-                console, console,
-                ButtonType::ButtonA,
-                {0.55, 0.40, 0.20, 0.40},
-                std::chrono::milliseconds(200), true
-            );
-            int ret = wait_until(
-                console, context,
-                std::chrono::seconds(2),
-                {{detector}}
-            );
-            if (ret >= 0){
-                console.log("Flying back to camp...");
-                pbf_mash_button(context, BUTTON_A, 125);
-                break;
-            }
-            console.log("Unable to fly. Are you under attack?", COLOR_RED);
-        }
-
-        pbf_mash_button(context, BUTTON_B, 125);
-        grace_period = std::chrono::seconds(5);
-    }
-
-    BlackScreenOverWatcher black_screen(COLOR_RED, {0.1, 0.1, 0.8, 0.6});
-    int ret = wait_until(
-        console, context,
-        std::chrono::seconds(20),
-        {{black_screen}}
-    );
-    if (ret < 0){
-        dump_image(console.logger(), env.program_info(), "FlyToCamp", console.video().snapshot());
-        throw OperationFailedException(
-            ErrorReport::SEND_ERROR_REPORT, console,
-            "Failed to fly to camp after 20 seconds.",
-            true
-        );
-    }
-    console.log("Arrived at camp...");
-    context.wait_for(std::chrono::milliseconds((uint64_t)(GameSettings::instance().POST_WARP_DELAY * 1000)));
-}
-
-void goto_any_camp_from_overworld(
-    ProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context,
-    const TravelLocation& location
-){
-
-    auto start = current_time();
-    std::chrono::seconds grace_period(0);
-    while (true){
-        {
-            EscapeFromAttack session(
-                env, console, context,
-                grace_period, std::chrono::seconds(10)
-            );
-            session.run_session();
-        }
-
-        if (current_time() - start > std::chrono::seconds(60)){
-//            dump_image(console.logger(), env.program_info(), "EscapeFromAttack", console.video().snapshot());
-            throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, console,
-                "Unable to escape from being attacked.",
-                true
-            );
-        }
-
-        //  Open the map.
-        pbf_press_button(context, BUTTON_MINUS, 20, 30);
-        {
-            MapDetector detector;
-            int ret = wait_until(
-                console, context,
-                std::chrono::seconds(5),
-                {{detector}}
-            );
-            if (ret < 0){
-//                dump_image(env.logger(), env.program_info(), "MapNotFound", console.video().snapshot());
-                throw OperationFailedException(
-                    ErrorReport::SEND_ERROR_REPORT, console,
-                    "Map not detected after 5 seconds.",
-                    true
-                );
-            }
-            console.log("Found map!");
-            context.wait_for(std::chrono::milliseconds(500));
-        }
-
-        //  Warp to sub-camp.
-        pbf_press_button(context, BUTTON_X, 20, 30);
-        {
-            ButtonDetector detector(
-                console, console,
-                ButtonType::ButtonA,
-                {0.55, 0.40, 0.20, 0.40},
-                std::chrono::milliseconds(200), true
-            );
-            int ret = wait_until(
-                console, context,
-                std::chrono::seconds(2),
-                {{detector}}
-            );
-            if (ret >= 0){
-                console.log("Flying back to camp...");
-                pbf_wait(context, 50);
-                if (location.warp_slot != 0){
-                    for (size_t c = 0; c < location.warp_slot; c++){
-                        pbf_press_dpad(context, DPAD_DOWN, 20, 30);
-                    }
-                }
-                for (size_t c = 0; c < location.warp_sub_slot; c++){
-                    const DpadPosition dir = (location.reverse_sub_menu_direction ? DPAD_UP : DPAD_DOWN);
-                    pbf_press_dpad(context, dir, 20, 30);
-                }
-                pbf_mash_button(context, BUTTON_A, 125);
-                break;
-            }
-        }
-
-        pbf_mash_button(context, BUTTON_B, 125);
-        grace_period = std::chrono::seconds(5);
-    }
-    BlackScreenOverWatcher black_screen(COLOR_RED, {0.1, 0.1, 0.8, 0.6});
-    int ret = wait_until(
-        console, context,
-        std::chrono::seconds(20),
-        {{black_screen}}
-    );
-    if (ret < 0){
-//        dump_image(console.logger(), env.program_info(), "FlyToCamp", console.video().snapshot());
-        throw OperationFailedException(
-            ErrorReport::SEND_ERROR_REPORT, console,
-            "Failed to fly to camp after 20 seconds.",
-            true
-        );
-    }
-    console.log("Arrived at camp...");
-    context.wait_for(std::chrono::milliseconds((uint64_t)(GameSettings::instance().POST_WARP_DELAY * 1000)));
-    console.botbase().wait_for_all_requests();
-}
-
-
-void goto_Mai_from_camp(
-    Logger& logger, BotBaseContext& context, Camp camp
-){
-    switch (camp){
-    case Camp::FIELDLANDS_FIELDLANDS:
-        // 80 - 128, time - 400
-        pbf_move_left_joystick(context, 85, 255, 300, 0);
-        return;
-    case Camp::MIRELANDS_MIRELANDS:
-        pbf_move_left_joystick(context, 0, 120, 310, 0);
-        return;
-    case Camp::COASTLANDS_BEACHSIDE:
-        // 255, 150 -170, 600 too long
-        pbf_move_left_joystick(context, 255, 165, 550, 0);
-        return;
-    case Camp::HIGHLANDS_HIGHLANDS:
-        // 255, 150 - 170
-        pbf_move_left_joystick(context, 255, 165, 370, 0);
-        return;
-    case Camp::ICELANDS_SNOWFIELDS:
-        pbf_move_left_joystick(context, 255, 124, 250, 0);
-        return;
-    default:
-        throw InternalProgramError(
-            &logger, PA_CURRENT_FUNCTION,
-            "Unknown Camp when going to Mai: " + std::to_string((int)camp)
-        );
-    }
-}
-
-void goto_professor(Logger& logger, BotBaseContext& context, const TravelLocation& location){
-    Camp camp = map_region_default_camp(location.region);
-    goto_professor(logger, context, camp);
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonLA/Programs/PokemonLA_RegionNavigation.h b/SerialPrograms/Source/PokemonLA/Programs/PokemonLA_RegionNavigation.h
deleted file mode 100644
index 75f75f504f..0000000000
--- a/SerialPrograms/Source/PokemonLA/Programs/PokemonLA_RegionNavigation.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*  Region Navigation
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonLA_RegionNavigation_H
-#define PokemonAutomation_PokemonLA_RegionNavigation_H
-
-#include "PokemonLA/PokemonLA_Locations.h"
-#include "PokemonLA/Options/PokemonLA_ShinyDetectedAction.h"
-#include "PokemonLA/Inference/Map/PokemonLA_SelectedRegionDetector.h"
-
-namespace PokemonAutomation{
-    class ProgramEnvironment;
-    class ConsoleHandle;
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-struct TravelLocation;
-
-void goto_professor(Logger& logger, BotBaseContext& context, Camp camp);
-
-void goto_professor(Logger& logger, BotBaseContext& context, const TravelLocation& location);
-
-void from_professor_return_to_jubilife(
-    ProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context
-);
-
-
-void mash_A_to_enter_sub_area(
-    ProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context
-);
-void mash_A_to_change_region(
-    ProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context
-);
-void goto_camp_from_jubilife(
-    ProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context,
-    const TravelLocation& location
-);
-
-
-void goto_camp_from_overworld(
-    ProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context
-);
-
-void goto_any_camp_from_overworld(
-    ProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context,
-    const TravelLocation& location
-);
-
-// From a camp location, run to Mai in that camp.
-void goto_Mai_from_camp(
-    Logger& logger, BotBaseContext& context, Camp camp
-);
-
-// From the program starting position at Jubilife Village, move backwards and talk to guard to open the map.
-// Return after the map is detected.
-// Throw an error if map is not found.
-void open_travel_map_from_jubilife(
-    ProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context
-);
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonLA/Programs/PokemonLA_TimeOfDayChange.cpp b/SerialPrograms/Source/PokemonLA/Programs/PokemonLA_TimeOfDayChange.cpp
deleted file mode 100644
index d149426148..0000000000
--- a/SerialPrograms/Source/PokemonLA/Programs/PokemonLA_TimeOfDayChange.cpp
+++ /dev/null
@@ -1,137 +0,0 @@
-/*  Time of Day Change
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/Exceptions/OperationFailedException.h"
-#include "CommonFramework/Tools/ConsoleHandle.h"
-#include "CommonFramework/VideoPipeline/VideoOverlay.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "PokemonLA/Inference/Objects/PokemonLA_DialogueYellowArrowDetector.h"
-#include "PokemonLA_TimeOfDayChange.h"
-
-#include <iostream>
-using std::cout;
-using std::endl;
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-
-void change_time_of_day_at_tent(ConsoleHandle& console, BotBaseContext& context, TimeOfDay target_time, Camp camp){
-    console.overlay().add_log("Change time to " + std::string(TIME_OF_DAY_NAMES[int(target_time)]), COLOR_WHITE);
-    // Move to the tent
-    switch (camp)
-    {
-    case Camp::FIELDLANDS_FIELDLANDS:
-        pbf_move_left_joystick(context, 105, 0, 220, 20);
-        break;
-    
-    case Camp::FIELDLANDS_HEIGHTS:
-        pbf_move_left_joystick(context, 95, 0, 250, 20);
-        break;
-    
-    case Camp::MIRELANDS_MIRELANDS:
-        pbf_move_left_joystick(context, 70, 0, 180, 20);
-        break;
-    
-    case Camp::MIRELANDS_BOGBOUND:
-        pbf_move_left_joystick(context, 70, 0, 170, 20);
-        break;
-    
-    case Camp::COASTLANDS_BEACHSIDE:
-        pbf_move_left_joystick(context, 100, 0, 130, 20);
-        break;
-    
-    case Camp::COASTLANDS_COASTLANDS:
-        pbf_move_left_joystick(context, 75, 0, 160, 20);
-        break;
-    
-    case Camp::HIGHLANDS_HIGHLANDS:
-        pbf_move_left_joystick(context, 95, 0, 190, 20);
-        break;
-    
-    case Camp::HIGHLANDS_MOUNTAIN:
-        pbf_move_left_joystick(context, 60, 0, 190, 20);
-        break;
-    
-    case Camp::HIGHLANDS_SUMMIT:
-        pbf_move_left_joystick(context, 100, 0, 220, 20);
-        break;
-    
-    case Camp::ICELANDS_SNOWFIELDS:
-        pbf_move_left_joystick(context, 80, 0, 150, 20);
-        break;
-
-    case Camp::ICELANDS_ICEPEAK:
-        pbf_move_left_joystick(context, 110, 0, 220, 20);
-        break;
-    }
-
-    // Press A to interact with tent
-    pbf_press_button(context, BUTTON_A, 30, 30);
-    context.wait_for_all_requests();
-
-    const bool stop_on_detected = true;
-    DialogueYellowArrowDetector yellow_arrow_detector(console, console, stop_on_detected);
-
-    context.wait_for_all_requests();
-    // Wait for the dialog box to show up
-    int ret = wait_until(
-        console, context, std::chrono::seconds(5), {{yellow_arrow_detector}}
-    );
-    if (ret < 0){
-        throw OperationFailedException(
-            ErrorReport::SEND_ERROR_REPORT, console,
-            "Did not interact with a tent.",
-            true
-        );
-    }
-
-    // Press A to clear the dialog box, and show the time menu
-    // pbf_wait(context, 40);
-    pbf_press_button(context, BUTTON_A, 30, 80);
-    console.log("Change time of day to " + std::string(TIME_OF_DAY_NAMES[int(target_time)]));
-
-    // Move down the menu to find the target time
-
-    int num_movements = (int)target_time;
-    DpadPosition dpad_dir = DPAD_DOWN;
-    if (target_time == TimeOfDay::MIDNIGHT){
-        num_movements = 2;
-        dpad_dir = DPAD_UP;
-    }
-    for(int i = 0; i < num_movements; i++){
-        pbf_press_dpad(context, dpad_dir, 30, 70);
-    }
-
-    // Press A to start resting
-    pbf_press_button(context, BUTTON_A, 30, 100);
-    context.wait_for_all_requests();
-
-    // Wait for the dialog box to show up
-    ret = wait_until(
-        console, context, std::chrono::seconds(30), {{yellow_arrow_detector}}
-    );
-    if (ret < 0){
-        throw OperationFailedException(
-            ErrorReport::SEND_ERROR_REPORT, console,
-            "Failed to stand up after resting in a tent.",
-            true
-        );
-    }
-
-    // Press A again to clear the dialog box
-    pbf_press_button(context, BUTTON_A, 30, 100);
-
-    context.wait_for_all_requests();
-}
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonLA/Programs/PokemonLA_TimeOfDayChange.h b/SerialPrograms/Source/PokemonLA/Programs/PokemonLA_TimeOfDayChange.h
deleted file mode 100644
index 1ada1a91af..0000000000
--- a/SerialPrograms/Source/PokemonLA/Programs/PokemonLA_TimeOfDayChange.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*  Time of Day Change
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonLA_TimeOfDayChange_H
-#define PokemonAutomation_PokemonLA_TimeOfDayChange_H
-
-#include "PokemonLA/PokemonLA_WeatherAndTime.h"
-#include "PokemonLA/PokemonLA_Locations.h"
-
-
-#include <stdint.h>
-
-namespace PokemonAutomation{
-    class ConsoleHandle;
-    class BotBaseContext;
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-// From a camp teleport location, move to the tent and change time of day.
-// if `target_time` is TimeOfDay::NONE, it resets for only a while, healing the pokemon but no change of time.
-void change_time_of_day_at_tent(ConsoleHandle& console, BotBaseContext& context, TimeOfDay target_time, Camp camp);
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_AutoMultiSpawn.h b/SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_AutoMultiSpawn.h
deleted file mode 100644
index 2123270679..0000000000
--- a/SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_AutoMultiSpawn.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*  Auto Multi-Spawn
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *  
- *  Advance a path in Multi-Spawn shiny hunting method
- */
-
-#ifndef PokemonAutomation_PokemonLA_AutoMultiSpawn_H
-#define PokemonAutomation_PokemonLA_AutoMultiSpawn_H
-
-#include "Common/Cpp/Options/StringOption.h"
-#include "Common/Cpp/Options/EnumDropdownOption.h"
-#include "CommonFramework/Options/LanguageOCROption.h"
-#include "CommonFramework/Notifications/EventNotificationsTable.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-#include "PokemonLA/PokemonLA_WeatherAndTime.h"
-#include "PokemonLA/Resources/PokemonLA_PokemonInfo.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-
-class AutoMultiSpawn_Descriptor : public SingleSwitchProgramDescriptor{
-public:
-    AutoMultiSpawn_Descriptor();
-};
-
-
-enum class MultiSpawn{
-    MirelandsHippopotas,
-};
-
-
-class AutoMultiSpawn : public SingleSwitchProgramInstance{
-public:
-    AutoMultiSpawn();
-
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-    // Advance one step (e.g. A1 or A2) in the multi-spawn path
-    void advance_one_path_step(
-        SingleSwitchProgramEnvironment& env,
-        BotBaseContext& context,
-        size_t num_spawned_pokemon,
-        size_t num_to_despawn,
-        TimeOfDay cur_time,
-        TimeOfDay next_time
-    );
-
-    // From camp, go to the spawn point, start one battle to remove some pokemon
-    // Return how many pokemon removed in the battle.
-    // The function will use a loop to do multiple trips to the spawn point if it cannot find a target pokemon after a trip.
-    size_t try_one_battle_to_remove_pokemon(SingleSwitchProgramEnvironment& env, BotBaseContext& context, size_t num_pokemon_left, size_t num_to_despawn);
-
-    // From camp go to the spawn point, try focusing on one pokemon
-    // Return the pokemon details if found the target pokemon. Otherwise if cannot find one, return empty details
-    // The function will use a loop to do multiple focusing to try to get a target pokemon focused
-    PokemonDetails go_to_spawn_point_and_try_focusing_pokemon(SingleSwitchProgramEnvironment& env, BotBaseContext& context, size_t nun_pokemon_left);
-
-    OCR::LanguageOCROption LANGUAGE;
-
-    EnumDropdownOption<MultiSpawn> SPAWN;
-
-    StringOption PATH;
-
-    EventNotificationsOption NOTIFICATIONS;
-};
-
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_BurmyFinder.cpp b/SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_BurmyFinder.cpp
deleted file mode 100644
index 9dbdb8998a..0000000000
--- a/SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_BurmyFinder.cpp
+++ /dev/null
@@ -1,810 +0,0 @@
-/*  Burmy Hunter
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <array>
-#include <sstream>
-#include "Common/Cpp/PrettyPrint.h"
-#include "CommonFramework/Exceptions/OperationFailedException.h"
-#include "CommonFramework/Notifications/ProgramNotifications.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "CommonFramework/Tools/StatsTracking.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "NintendoSwitch/NintendoSwitch_Settings.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonLA/PokemonLA_Settings.h"
-#include "PokemonLA/PokemonLA_TravelLocations.h"
-#include "PokemonLA/Inference/Battles/PokemonLA_BattleMenuDetector.h"
-#include "PokemonLA/Inference/PokemonLA_BlackOutDetector.h"
-#include "PokemonLA/Inference/PokemonLA_OverworldDetector.h"
-#include "PokemonLA/Inference/Sounds/PokemonLA_ShinySoundDetector.h"
-#include "PokemonLA/Programs/PokemonLA_MountChange.h"
-#include "PokemonLA/Programs/PokemonLA_GameEntry.h"
-#include "PokemonLA/Programs/ShinyHunting/PokemonLA_BurmyFinder.h"
-#include "PokemonLA/Programs/PokemonLA_LeapPokemonActions.h"
-#include "CommonFramework/GlobalSettingsPanel.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-    using namespace Pokemon;
-
-
-
-BurmyFinder_Descriptor::BurmyFinder_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonLA:Burmy Hunter",
-        STRING_POKEMON + " LA", "Burmy Hunter",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonLA/BurmyHunter.md",
-        "Check nearby trees for a possible Shiny, Alpha or Alpha Shiny Burmy",
-        FeedbackType::REQUIRED,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-class BurmyFinder_Descriptor::Stats : public StatsTracker{
-public:
-    Stats()
-        : attempts(m_stats["Attempts"])
-        , trees(m_stats["Trees"])
-        , errors(m_stats["Errors"])
-        , blackouts(m_stats["Blackouts"])
-        , found(m_stats["Found"])
-        , enroute_shinies(m_stats["Enroute Shinies"])
-        , tree_alphas(m_stats["Tree Alphas"])
-        , tree_shinies(m_stats["Tree Shinies"])
-    {
-        m_display_order.emplace_back("Attempts");
-        m_display_order.emplace_back("Trees");
-        m_display_order.emplace_back("Errors", true);
-        m_display_order.emplace_back("Blackouts", true);
-        m_display_order.emplace_back("Found");
-        m_display_order.emplace_back("Enroute Shinies");
-        m_display_order.emplace_back("Tree Alphas");
-        m_display_order.emplace_back("Tree Shinies");
-        m_aliases["Shinies"] = "Enroute Shinies";
-        m_aliases["Alphas"] = "Tree Alphas";
-    }
-
-    std::atomic<uint64_t>& attempts;
-    std::atomic<uint64_t>& trees;
-    std::atomic<uint64_t>& errors;
-    std::atomic<uint64_t>& blackouts;
-    std::atomic<uint64_t>& found;
-    std::atomic<uint64_t>& enroute_shinies;
-    std::atomic<uint64_t>& tree_alphas;
-    std::atomic<uint64_t>& tree_shinies;
-
-};
-std::unique_ptr<StatsTracker> BurmyFinder_Descriptor::make_stats() const{
-    return std::unique_ptr<StatsTracker>(new Stats());
-}
-
-
-BurmyFinder::BurmyFinder()
-    : LANGUAGE(
-        "<b>Game Language</b>",
-        Pokemon::PokemonNameReader::instance().languages(),
-        LockWhileRunning::LOCKED,
-        true
-    )
-    , SHINY_DETECTED_ENROUTE(
-        "Enroute Shiny Action",
-        "This applies if a shiny is detected while traveling in the overworld.",
-        "0 * TICKS_PER_SECOND"
-    )
-    , MATCH_DETECTED_OPTIONS(
-      "Match Action",
-      "What to do when a Burmy is found that matches the \"Stop On\" parameter.",
-      "0 * TICKS_PER_SECOND")
-    , NOTIFICATION_STATUS("Status Update", true, false, std::chrono::seconds(3600))
-    , NOTIFICATIONS({
-        &NOTIFICATION_STATUS,
-        &SHINY_DETECTED_ENROUTE.NOTIFICATIONS,
-        &MATCH_DETECTED_OPTIONS.NOTIFICATIONS,
-        &NOTIFICATION_PROGRAM_FINISH,
-        &NOTIFICATION_ERROR_RECOVERABLE,
-        &NOTIFICATION_ERROR_FATAL,
-    })
-    , SAVE_DEBUG_VIDEO(
-        "<b>Save debug videos to Switch:</b>",
-        LockWhileRunning::LOCKED,
-        false
-    )
-{
-    PA_ADD_OPTION(LANGUAGE);
-    PA_ADD_OPTION(STOP_ON);
-    PA_ADD_OPTION(EXIT_METHOD);
-    PA_ADD_OPTION(SHINY_DETECTED_ENROUTE);
-    PA_ADD_OPTION(MATCH_DETECTED_OPTIONS);
-    PA_ADD_OPTION(NOTIFICATIONS);
-    if (PreloadSettings::instance().DEVELOPER_MODE){
-        PA_ADD_OPTION(SAVE_DEBUG_VIDEO);
-    }
-}
-
-
-
-struct BurmyFinder::TreeCounter{
-    std::array<uint64_t, 16> tree = {};
-    
-    void log(Logger& logger) const{
-        std::ostringstream oss;
-        for(size_t i = 0; i < size(tree); i++){
-            if (i != 0){
-                oss << " - ";
-            }
-            oss << "Tree " << i << ": " << tostr_u_commas(tree[i]);
-        }
-        logger.log(oss.str());
-    }
-};
-
-bool BurmyFinder::handle_battle(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    BurmyFinder_Descriptor::Stats& stats = env.current_stats<BurmyFinder_Descriptor::Stats>();
-
-    PokemonDetails pokemon = get_pokemon_details(env.console, context, LANGUAGE);
-
-    pbf_press_button(context, BUTTON_B, 20, 225);
-
-    context.wait_for_all_requests();
-
-    if (pokemon.name_candidates.find("burmy") == pokemon.name_candidates.end()){
-        env.console.log("Not a burmy. Leaving battle.");
-        exit_battle(env.console, context, EXIT_METHOD);
-        return false;
-    }
-
-    stats.found++;
-    //  Match validation
-
-    if (pokemon.is_alpha && pokemon.is_shiny){
-        env.console.log("Found Shiny Alpha!");
-        stats.tree_shinies++;
-        stats.tree_alphas++;
-    }else if (pokemon.is_alpha){
-        env.console.log("Found Alpha!");
-        stats.tree_alphas++;
-    }else if (pokemon.is_shiny){
-        env.console.log("Found Shiny!");
-        stats.tree_shinies++;
-    }else{
-        env.console.log("Normie in the tree -_-");
-    }
-    env.update_stats();
-
-    bool is_match = false;
-    switch (STOP_ON){
-    case StopOn::Shiny:
-        is_match = pokemon.is_shiny;
-        break;
-    case StopOn::Alpha:
-        is_match = pokemon.is_alpha;
-        break;
-    case StopOn::ShinyOrAlpha:
-        is_match = pokemon.is_alpha || pokemon.is_shiny;
-        break;
-    case StopOn::ShinyAndAlpha:
-        is_match = pokemon.is_alpha && pokemon.is_shiny;
-        break;
-    }
-
-    if (pokemon.is_alpha || pokemon.is_shiny){
-        on_match_found(env, env.console, context, MATCH_DETECTED_OPTIONS, is_match);
-    }
-
-    exit_battle(env.console, context, EXIT_METHOD);
-
-    return true;
-}
-
-
-bool BurmyFinder::check_tree(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    context.wait_for_all_requests();
-
-    disable_shiny_sound(context);
-    bool battle_found = check_tree_or_ore_for_battle(env.console, context);
-    env.current_stats<BurmyFinder_Descriptor::Stats>().trees++;
-    env.update_stats();
-
-    context.wait_for_all_requests();
-
-    bool ret = false;
-    if (battle_found){
-        ret = handle_battle(env, context);
-    }
-
-    enable_shiny_sound(context);
-
-    return ret;
-}
-
-void BurmyFinder::check_tree_no_stop(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    context.wait_for_all_requests();
-    disable_shiny_sound(context);
-    // Throw pokemon
-    pbf_press_button(context, BUTTON_ZR, (0.5 * TICKS_PER_SECOND), 1.5 * TICKS_PER_SECOND);
-    context.wait_for_all_requests();
-    env.current_stats<BurmyFinder_Descriptor::Stats>().trees++;
-    env.update_stats();
-//    enable_shiny_sound(context);
-}
-
-void BurmyFinder::disable_shiny_sound(BotBaseContext& context){
-    context.wait_for_all_requests();
-    m_enable_shiny_sound.store(false, std::memory_order_release);
-}
-void BurmyFinder::enable_shiny_sound(BotBaseContext& context){
-    context.wait_for_all_requests();
-    m_enable_shiny_sound.store(true, std::memory_order_release);
-}
-
-void BurmyFinder::go_to_height_camp(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    const bool stop_on_detected = true;
-    BattleMenuDetector battle_menu_detector(env.console, env.console, stop_on_detected);
-    int ret = run_until(
-        env.console, context,
-        [&](BotBaseContext& context){
-            goto_any_camp_from_overworld(env, env.console, context, TravelLocations::instance().Fieldlands_Heights);
-        },
-        {
-            {battle_menu_detector},
-        }
-    );
-    if (ret == 0){
-        env.log("Warning: found inside a battle when trying to return to camp.");
-        // Unexpected battle during movement to camp
-        if (SAVE_DEBUG_VIDEO){
-            // Take a video to know why it enters battle during return trip
-            pbf_press_button(context, BUTTON_CAPTURE, 2 * TICKS_PER_SECOND, 2 * TICKS_PER_SECOND);
-            context.wait_for_all_requests();
-        }
-        // Finish battle
-        handle_battle(env, context);
-        // Go back to camp
-        goto_any_camp_from_overworld(env, env.console, context, TravelLocations::instance().Fieldlands_Heights);
-    }
-}
-
-size_t BurmyFinder::grouped_path(SingleSwitchProgramEnvironment& env, BotBaseContext& context, size_t path, TreeCounter& tree_counter){
-
-    size_t last_checked_tree = 0;
-
-    if (path != 0){
-        go_to_height_camp(env, context);
-    }
-
-    env.console.log("Currently Checking Path:" + std::to_string(path));
-
-    BattleMenuDetector battle_menu_detector(env.console, env.console, true);
-
-    int ret = run_until(
-        env.console, context,
-        [&](BotBaseContext& context){
-            switch (path) {
-            case 0:
-                //============ Tree 0=============//
-                env.console.log("Checking tree: 0");
-                pbf_move_left_joystick(context, 255, 85, 20, (0.5 * TICKS_PER_SECOND));
-                pbf_press_button(context, BUTTON_ZL, 20, (0.6 * TICKS_PER_SECOND));
-                change_mount(env.console, context, MountState::BRAVIARY_ON);
-                pbf_wait(context, 0.7 * TICKS_PER_SECOND);
-                pbf_press_button(context, BUTTON_B, (5.1 * TICKS_PER_SECOND), 0);
-                pbf_press_button(context, BUTTON_Y, (4.2 * TICKS_PER_SECOND), 0);
-                pbf_press_button(context, BUTTON_PLUS, 20, (1 * TICKS_PER_SECOND));
-                pbf_move_right_joystick(context, 128, 255, (0.3 * TICKS_PER_SECOND), (0.2 * TICKS_PER_SECOND));
-                last_checked_tree = 0;
-                check_tree_no_stop(env, context);
-
-                //============ Tree 1=============//
-                env.console.log("Checking tree: 1");
-                pbf_press_button(context, BUTTON_PLUS, 20, (1 * TICKS_PER_SECOND));
-                pbf_move_left_joystick(context, 255, 10, 1 * TICKS_PER_SECOND, 0);
-                context.wait_for_all_requests();
-                enable_shiny_sound(context);
-                pbf_press_button(context, BUTTON_B, (0.6 * TICKS_PER_SECOND), 0);
-                pbf_press_button(context, BUTTON_Y, (2.7 * TICKS_PER_SECOND), 0);
-                pbf_press_button(context, BUTTON_PLUS, 20, (1 * TICKS_PER_SECOND));
-                pbf_move_right_joystick(context, 128, 255, (0.1 * TICKS_PER_SECOND), (0.3 * TICKS_PER_SECOND));
-                last_checked_tree = 1;
-                check_tree_no_stop(env, context);
-
-                //============ Tree 2=============//
-                env.console.log("Checking tree: 2");
-                pbf_press_button(context, BUTTON_PLUS, 20, 100);
-                pbf_move_left_joystick(context, 255, 130, 1 * TICKS_PER_SECOND, 0);
-                context.wait_for_all_requests();
-                enable_shiny_sound(context);
-                pbf_press_button(context, BUTTON_B, (0.6 * TICKS_PER_SECOND), 0);
-                pbf_press_button(context, BUTTON_Y, (2.4 * TICKS_PER_SECOND), 0);
-                pbf_press_button(context, BUTTON_PLUS, 20, (1 * TICKS_PER_SECOND));
-                pbf_move_right_joystick(context, 128, 255, (0.1 * TICKS_PER_SECOND), (0.3 * TICKS_PER_SECOND));
-                last_checked_tree = 2;
-                check_tree_no_stop(env, context);
-
-                //============ Tree 3=============//
-                env.console.log("Checking tree: 3");
-                pbf_press_button(context, BUTTON_PLUS, 20, 100);
-                pbf_move_left_joystick(context, 0, 95, 1 * TICKS_PER_SECOND, 0);
-                context.wait_for_all_requests();
-                enable_shiny_sound(context);
-                pbf_press_button(context, BUTTON_B, 110, 0);
-                pbf_press_button(context, BUTTON_Y, (2.3 * TICKS_PER_SECOND), 0);
-                pbf_press_button(context, BUTTON_PLUS, 20, (1 * TICKS_PER_SECOND));
-                pbf_move_right_joystick(context, 128, 255, (0.1 * TICKS_PER_SECOND), (0.3 * TICKS_PER_SECOND));
-                last_checked_tree = 3;
-                break;
-            case 1:
-                //============ Tree 4=============//
-                env.console.log("Checking tree: 4");
-                pbf_move_left_joystick(context, 255, 165, 20, (0.5 * TICKS_PER_SECOND));
-                pbf_press_button(context, BUTTON_ZL, 20, (0.5 * TICKS_PER_SECOND));
-                change_mount(env.console, context, MountState::BRAVIARY_ON);
-                pbf_wait(context, 0.6 * TICKS_PER_SECOND);
-                pbf_press_button(context, BUTTON_B, (4.8 * TICKS_PER_SECOND), (0.6 * TICKS_PER_SECOND));
-                pbf_press_button(context, BUTTON_Y, (1.7 * TICKS_PER_SECOND), (0.5 * TICKS_PER_SECOND));
-                pbf_press_button(context, BUTTON_PLUS, 20, (1 * TICKS_PER_SECOND));
-                pbf_move_right_joystick(context, 127, 255, (0.2 * TICKS_PER_SECOND), (0.5 * TICKS_PER_SECOND));
-                last_checked_tree = 4;
-                check_tree_no_stop(env, context);
-
-                //============ Tree 5=============//
-                env.console.log("Checking tree: 5");
-                pbf_press_button(context, BUTTON_PLUS, 20, (1 * TICKS_PER_SECOND));
-                pbf_move_left_joystick(context, 255, 190, 1 * TICKS_PER_SECOND, 0);
-                context.wait_for_all_requests();
-                enable_shiny_sound(context);
-                pbf_press_button(context, BUTTON_B, (0.5 * TICKS_PER_SECOND), 0);
-                pbf_press_button(context, BUTTON_Y, (2.6 * TICKS_PER_SECOND), 0);
-                pbf_press_button(context, BUTTON_PLUS, 20, (1 * TICKS_PER_SECOND));
-                pbf_move_right_joystick(context, 127, 255, (0.15 * TICKS_PER_SECOND), (0.5 * TICKS_PER_SECOND));
-                last_checked_tree = 5;
-                check_tree_no_stop(env, context);
-
-                //============ Tree 6=============//
-                env.console.log("Checking tree: 6");
-                pbf_press_button(context, BUTTON_PLUS, 20, (1 * TICKS_PER_SECOND));
-                pbf_move_left_joystick(context, 0, 130, 1 * TICKS_PER_SECOND, 0);
-                context.wait_for_all_requests();
-                enable_shiny_sound(context);
-                pbf_press_button(context, BUTTON_B, (1.3 * TICKS_PER_SECOND), 0);
-                pbf_press_button(context, BUTTON_Y, (3.2 * TICKS_PER_SECOND), 0);
-                pbf_press_button(context, BUTTON_PLUS, 20, (1 * TICKS_PER_SECOND));
-                pbf_move_right_joystick(context, 127, 255, (0.15 * TICKS_PER_SECOND), (0.5 * TICKS_PER_SECOND));
-                last_checked_tree = 6;
-                break;
-            case 2:
-                //============ Tree 7=============//
-                env.console.log("Checking tree: 7");
-                pbf_move_left_joystick(context, 180, 255, 20, (0.5 * TICKS_PER_SECOND));
-                change_mount(env.console, context, MountState::BRAVIARY_ON);
-                pbf_press_button(context, BUTTON_B, (7.2 * TICKS_PER_SECOND), 0);
-                pbf_press_button(context, BUTTON_Y, (4.2 * TICKS_PER_SECOND), 0);
-                pbf_press_button(context, BUTTON_PLUS, 20, (1 * TICKS_PER_SECOND));
-                pbf_move_left_joystick(context, 0, 127, (1.5 * TICKS_PER_SECOND), (0.5 * TICKS_PER_SECOND));
-                pbf_press_button(context, BUTTON_ZL, 20, 20);
-                pbf_move_right_joystick(context, 127, 255, (0.5 * TICKS_PER_SECOND), 20);
-                last_checked_tree = 7;
-                check_tree_no_stop(env, context);
-
-                //============ Tree 8=============//
-                env.console.log("Checking tree: 8");
-                pbf_press_button(context, BUTTON_PLUS, 20, (1 * TICKS_PER_SECOND));
-                pbf_move_left_joystick(context, 255, 230, (0.5 * TICKS_PER_SECOND), (0.5 * TICKS_PER_SECOND));
-                context.wait_for_all_requests();
-                enable_shiny_sound(context);
-                pbf_press_button(context, BUTTON_Y, (1.7 * TICKS_PER_SECOND), (0.5 * TICKS_PER_SECOND));
-                pbf_press_button(context, BUTTON_PLUS, 20, (1 * TICKS_PER_SECOND));
-                pbf_move_right_joystick(context, 127, 255, (0.5 * TICKS_PER_SECOND), (0.5 * TICKS_PER_SECOND));
-                last_checked_tree = 8;
-                check_tree_no_stop(env, context);
-
-                //============ Tree 9=============//
-                env.console.log("Checking tree: 8");
-                pbf_press_button(context, BUTTON_PLUS, 20, (1 * TICKS_PER_SECOND));
-                pbf_move_left_joystick(context, 90, 0, (0.5 * TICKS_PER_SECOND), (0.5 * TICKS_PER_SECOND));
-                context.wait_for_all_requests();
-                enable_shiny_sound(context);
-                pbf_press_button(context, BUTTON_B, (0.6 * TICKS_PER_SECOND), 0);
-                pbf_press_button(context, BUTTON_Y, (2 * TICKS_PER_SECOND), (0.5 * TICKS_PER_SECOND));
-                pbf_press_button(context, BUTTON_PLUS, 20, (1 * TICKS_PER_SECOND));
-                pbf_move_right_joystick(context, 127, 255, (0.2 * TICKS_PER_SECOND), (0.5 * TICKS_PER_SECOND));
-                last_checked_tree = 9;
-                check_tree_no_stop(env, context);
-
-                //============ Tree 10=============//
-                env.console.log("Checking tree: 10");
-                pbf_press_button(context, BUTTON_PLUS, 20, (1 * TICKS_PER_SECOND));
-                pbf_move_left_joystick(context, 0, 235, (0.5 * TICKS_PER_SECOND), (0.5 * TICKS_PER_SECOND));
-                context.wait_for_all_requests();
-                enable_shiny_sound(context);
-                pbf_press_button(context, BUTTON_B, (2.5 * TICKS_PER_SECOND), 0);
-                pbf_press_button(context, BUTTON_Y, (2.5 * TICKS_PER_SECOND), (0.5 * TICKS_PER_SECOND));
-                pbf_move_right_joystick(context, 127, 255, (0.2 * TICKS_PER_SECOND), (0.5 * TICKS_PER_SECOND));
-                last_checked_tree = 10;
-                check_tree_no_stop(env, context);
-
-                //============ Tree 11=============//
-                env.console.log("Checking tree: 11");
-                pbf_press_button(context, BUTTON_PLUS, 20, (1 * TICKS_PER_SECOND));
-                pbf_move_left_joystick(context, 145, 0, (0.5 * TICKS_PER_SECOND), (0.5 * TICKS_PER_SECOND));
-                context.wait_for_all_requests();
-                enable_shiny_sound(context);
-                pbf_press_button(context, BUTTON_B, (1.8 * TICKS_PER_SECOND), 0);
-                pbf_press_button(context, BUTTON_Y, (1.8 * TICKS_PER_SECOND), (0.5 * TICKS_PER_SECOND));
-                pbf_press_button(context, BUTTON_PLUS, 20, (1 * TICKS_PER_SECOND));
-                pbf_move_right_joystick(context, 127, 255, (0.3 * TICKS_PER_SECOND), (0.5 * TICKS_PER_SECOND));
-                last_checked_tree = 11;
-                break;
-            case 3:
-                //============ Tree 12=============//
-                env.console.log("Checking tree: 12");
-                pbf_move_left_joystick(context, 148, 255, 20, 20);
-                change_mount(env.console, context, MountState::BRAVIARY_ON);
-                pbf_press_button(context, BUTTON_B, (9.7 * TICKS_PER_SECOND), 20);
-                pbf_press_button(context, BUTTON_Y, (2.2 * TICKS_PER_SECOND), 20);
-                pbf_press_button(context, BUTTON_PLUS, 20, (1 * TICKS_PER_SECOND));
-                pbf_move_left_joystick(context, 255, 127, 30, (0.5 * TICKS_PER_SECOND));
-                pbf_press_button(context, BUTTON_ZL, 20, (0.5 * TICKS_PER_SECOND));
-                pbf_move_right_joystick(context, 127, 255, (0.2 * TICKS_PER_SECOND), (0.5 * TICKS_PER_SECOND));
-                last_checked_tree = 12;
-                check_tree_no_stop(env, context);
-
-                //============ Tree 13=============//
-                env.console.log("Checking tree: 13");
-                pbf_move_left_joystick(context, 148, 0, 20, 20);
-                change_mount(env.console, context, MountState::BRAVIARY_ON);
-                context.wait_for_all_requests();
-                enable_shiny_sound(context);
-                pbf_press_button(context, BUTTON_B, (2 * TICKS_PER_SECOND), 0);
-                pbf_press_button(context, BUTTON_Y, (3 * TICKS_PER_SECOND), 0);
-                pbf_move_right_joystick(context, 127, 255, (0.2 * TICKS_PER_SECOND), (0.5 * TICKS_PER_SECOND));
-                last_checked_tree = 13;
-                check_tree_no_stop(env, context);
-
-                //============ Tree 14=============//
-                env.console.log("Checking tree: 14");
-                pbf_move_left_joystick(context, 255, 155, 20, (0.5 * TICKS_PER_SECOND));
-                pbf_press_button(context, BUTTON_ZL, 20, (0.5 * TICKS_PER_SECOND));
-                change_mount(env.console, context, MountState::BRAVIARY_ON);
-                context.wait_for_all_requests();
-                enable_shiny_sound(context);
-                pbf_move_left_joystick(context, 127, 0, (6.6 * TICKS_PER_SECOND), 20);
-                pbf_move_right_joystick(context, 127, 255, (0.2 * TICKS_PER_SECOND), (0.5 * TICKS_PER_SECOND));
-                last_checked_tree = 14;
-                check_tree_no_stop(env, context);
-
-                //============ Tree 15=============//
-                env.console.log("Checking tree: 15");
-                pbf_move_left_joystick(context, 200, 0, 20, (0.5 * TICKS_PER_SECOND));
-                pbf_press_button(context, BUTTON_ZL, 20, (0.5 * TICKS_PER_SECOND));
-                change_mount(env.console, context, MountState::BRAVIARY_ON);
-                context.wait_for_all_requests();
-                enable_shiny_sound(context);
-                pbf_press_button(context, BUTTON_ZL, 20, (0.5 * TICKS_PER_SECOND));
-                pbf_press_button(context, BUTTON_B, (1.7 * TICKS_PER_SECOND), 0);
-                pbf_press_button(context, BUTTON_Y, (3 * TICKS_PER_SECOND), 0);
-                pbf_move_right_joystick(context, 127, 255, (0.1 * TICKS_PER_SECOND), (0.5 * TICKS_PER_SECOND));
-                last_checked_tree = 15;
-                break;
-            }
-        },
-        {
-            {battle_menu_detector},
-        }
-    );
-
-    if (ret == 0){
-        if (handle_battle(env, context)){
-            env.console.log("Battle found before last tree in the path.");
-            tree_counter.tree[last_checked_tree]++;
-        }
-    } else{
-        // Check last tree
-        if (check_tree(env, context)){
-            tree_counter.tree[last_checked_tree]++;
-        }
-        env.console.log("Checked all trees in the path.");
-    }
-
-    return last_checked_tree;
-}
-
-void BurmyFinder::single_path(SingleSwitchProgramEnvironment& env, BotBaseContext& context, size_t path, size_t last_tree, TreeCounter& tree_counter){
-    env.console.log("Last tree was: " + std::to_string(last_tree));
-
-    switch (path) {
-    case 0:
-        if (last_tree < 1){
-            env.console.log("Heading to tree 1");
-            go_to_height_camp(env, context);
-            pbf_move_left_joystick(context, 255, 110, 20, (0.5 * TICKS_PER_SECOND));
-            pbf_press_button(context, BUTTON_ZL, 20, (0.5 * TICKS_PER_SECOND));
-            change_mount(env.console, context, MountState::BRAVIARY_ON);
-            pbf_press_button(context, BUTTON_B, (7.2 * TICKS_PER_SECOND), 0);
-            pbf_press_button(context, BUTTON_Y, (4.5 * TICKS_PER_SECOND), 0);
-            pbf_move_left_joystick(context, 180, 0, 20, (0.5 * TICKS_PER_SECOND));
-            pbf_move_right_joystick(context, 127, 255, (0.2 * TICKS_PER_SECOND), (0.5 * TICKS_PER_SECOND));
-            if (check_tree(env, context)){
-                tree_counter.tree[1]++;
-            }
-        }
-
-        if (last_tree < 2){
-            env.console.log("Heading to tree 2");
-            go_to_height_camp(env, context);
-            pbf_move_left_joystick(context, 255, 147, 20, (0.5 * TICKS_PER_SECOND));
-            pbf_press_button(context, BUTTON_ZL, 20, (0.5 * TICKS_PER_SECOND));
-            change_mount(env.console, context, MountState::BRAVIARY_ON);
-            pbf_press_button(context, BUTTON_B, (6.6 * TICKS_PER_SECOND), 0);
-            pbf_press_button(context, BUTTON_Y, (4.4 * TICKS_PER_SECOND), 0);
-            pbf_press_button(context, BUTTON_PLUS, 20, (0.5 * TICKS_PER_SECOND));
-            if (check_tree(env, context)){
-                tree_counter.tree[2]++;
-            }
-        }
-
-        if (last_tree < 3){
-            env.console.log("Heading to tree 3");
-            go_to_height_camp(env, context);
-            pbf_move_left_joystick(context, 255, 158, 20, (0.5 * TICKS_PER_SECOND));
-            pbf_press_button(context, BUTTON_ZL, 20, (0.5 * TICKS_PER_SECOND));
-            change_mount(env.console, context, MountState::BRAVIARY_ON);
-            pbf_press_button(context, BUTTON_B, (9.5 * TICKS_PER_SECOND), 0);
-            pbf_press_button(context, BUTTON_Y, (4.5 * TICKS_PER_SECOND), (1 * TICKS_PER_SECOND));
-            if (check_tree(env, context)){
-                tree_counter.tree[3]++;
-            }
-        }
-        break;
-    case 1:
-        if (last_tree < 5){
-            env.console.log("Heading to Tree 5");
-            go_to_height_camp(env, context);
-            pbf_move_left_joystick(context, 240, 240, 20, (0.5 * TICKS_PER_SECOND));
-            pbf_press_button(context, BUTTON_ZL, 20, (0.5 * TICKS_PER_SECOND));
-            change_mount(env.console, context, MountState::BRAVIARY_ON);
-            pbf_press_button(context, BUTTON_B, (5.95 * TICKS_PER_SECOND), (1 * TICKS_PER_SECOND));
-            pbf_press_button(context, BUTTON_PLUS, 20, (1.2 * TICKS_PER_SECOND));
-            pbf_press_button(context, BUTTON_PLUS, 20, (0.5 * TICKS_PER_SECOND));
-            pbf_press_button(context, BUTTON_PLUS, 20, (1.5 * TICKS_PER_SECOND));
-            pbf_move_left_joystick(context, 0, 0, 20, (0.5 * TICKS_PER_SECOND));
-            pbf_press_button(context, BUTTON_ZL, 20, (0.5 * TICKS_PER_SECOND));
-            pbf_move_right_joystick(context, 127, 255, (0.2 * TICKS_PER_SECOND), (0.5 * TICKS_PER_SECOND));
-            if (check_tree(env, context)){
-                tree_counter.tree[5]++;
-            }
-        }
-
-        if (last_tree < 6){
-            env.console.log("Heading to Tree 6");
-            go_to_height_camp(env, context);
-            pbf_move_left_joystick(context, 255, 235, 20, (0.5 * TICKS_PER_SECOND));
-            pbf_press_button(context, BUTTON_ZL, 20, (0.5 * TICKS_PER_SECOND));
-            change_mount(env.console, context, MountState::BRAVIARY_ON);
-            pbf_press_button(context, BUTTON_B, (8 * TICKS_PER_SECOND), 0);
-            pbf_press_button(context, BUTTON_Y, (4 * TICKS_PER_SECOND), 0);
-            if (check_tree(env, context)){
-                tree_counter.tree[6]++;
-            }
-        }
-        break;
-
-    case 2:
-        if (last_tree < 8){
-            env.console.log("Heading to Tree 8");
-            go_to_height_camp(env, context);
-            pbf_move_left_joystick(context, 173, 255, 20, (0.5 * TICKS_PER_SECOND));
-            change_mount(env.console, context, MountState::BRAVIARY_ON);
-            pbf_press_button(context, BUTTON_B, (8.8 * TICKS_PER_SECOND), 0);
-            pbf_press_button(context, BUTTON_Y, (4 * TICKS_PER_SECOND), 0);
-            pbf_press_button(context, BUTTON_PLUS, 20, 20);
-            if (check_tree(env, context)){
-                tree_counter.tree[8]++;
-            }
-        }
-
-        if (last_tree < 9){
-            env.console.log("Heading to Tree 9");
-            go_to_height_camp(env, context);
-            pbf_move_left_joystick(context, 163, 255, 20, (0.5 * TICKS_PER_SECOND));
-            change_mount(env.console, context, MountState::BRAVIARY_ON);
-            pbf_press_button(context, BUTTON_B, (11.7 * TICKS_PER_SECOND), 0);
-            pbf_press_button(context, BUTTON_Y, (3.8 * TICKS_PER_SECOND), 0);
-            pbf_press_button(context, BUTTON_PLUS, 20, 20);
-            if (check_tree(env, context)){
-                tree_counter.tree[8]++;
-            }
-        }
-
-        if (last_tree < 10){
-            env.console.log("Heading to Tree 10");
-            go_to_height_camp(env, context);
-            pbf_move_left_joystick(context, 218, 255, 20, (0.5 * TICKS_PER_SECOND));
-            change_mount(env.console, context, MountState::BRAVIARY_ON);
-            pbf_press_button(context, BUTTON_B, (10.4 * TICKS_PER_SECOND), 0);
-            pbf_press_button(context, BUTTON_Y, (3.8 * TICKS_PER_SECOND), 0);
-            pbf_press_button(context, BUTTON_PLUS, 20, 20);
-            if (check_tree(env, context)){
-                tree_counter.tree[8]++;
-            }
-        }
-
-        if (last_tree < 11){
-            env.console.log("Heading to Tree 11");
-            go_to_height_camp(env, context);
-            pbf_move_left_joystick(context, 255, 230, 20, (0.5 * TICKS_PER_SECOND));
-            change_mount(env.console, context, MountState::BRAVIARY_ON);
-            pbf_press_button(context, BUTTON_B, (11.4 * TICKS_PER_SECOND), 0);
-            pbf_press_button(context, BUTTON_Y, (3.8 * TICKS_PER_SECOND), 0);
-            pbf_press_button(context, BUTTON_PLUS, 20, 20);
-            if (check_tree(env, context)){
-                tree_counter.tree[11]++;
-            }
-        }
-        break;
-    case 3:
-        if (last_tree < 13){
-            env.console.log("Heading to Tree 13");
-            go_to_height_camp(env, context);
-            pbf_move_left_joystick(context, 104, 255, 30, 30);
-            change_mount(env.console, context, MountState::BRAVIARY_ON);
-            pbf_press_button(context, BUTTON_B, (11 * TICKS_PER_SECOND), (1 * TICKS_PER_SECOND));
-            pbf_press_button(context, BUTTON_PLUS, 20, (1.3 * TICKS_PER_SECOND));
-            pbf_press_button(context, BUTTON_PLUS, 20, (0.5 * TICKS_PER_SECOND));
-            pbf_press_button(context, BUTTON_PLUS, 20, (1.5 * TICKS_PER_SECOND));
-            pbf_move_right_joystick(context, 127, 255, (0.2 * TICKS_PER_SECOND), (0.5 * TICKS_PER_SECOND));
-            if (check_tree(env, context)){
-                tree_counter.tree[13]++;
-            }
-        }
-
-        if (last_tree < 14){
-            env.console.log("Heading to Tree 14");
-            go_to_height_camp(env, context);
-            pbf_move_left_joystick(context, 108, 255, 20, 20);
-            change_mount(env.console, context, MountState::BRAVIARY_ON);
-            pbf_press_button(context, BUTTON_B, (8.7 * TICKS_PER_SECOND), (1 * TICKS_PER_SECOND));
-            pbf_press_button(context, BUTTON_PLUS, 20, (1 * TICKS_PER_SECOND));
-            pbf_move_left_joystick(context, 140, 255, 20, 20);
-            pbf_press_button(context, BUTTON_ZL, 20, (0.5 * TICKS_PER_SECOND));
-            pbf_move_right_joystick(context, 140, 255, (0.2 * TICKS_PER_SECOND), (0.5 * TICKS_PER_SECOND));
-            if (check_tree(env, context)){
-                tree_counter.tree[14]++;
-            }
-        }
-        if (last_tree < 15){
-            env.console.log("Heading to Tree 15");
-            go_to_height_camp(env, context);
-            pbf_move_left_joystick(context, 160, 255, 30, 30);
-            change_mount(env.console, context, MountState::BRAVIARY_ON);
-            pbf_press_button(context, BUTTON_B, (6.35 * TICKS_PER_SECOND), 20);
-            pbf_press_button(context, BUTTON_PLUS, 20, (1 * TICKS_PER_SECOND));
-            pbf_press_button(context, BUTTON_PLUS, 20, (0.5 * TICKS_PER_SECOND));
-            pbf_press_button(context, BUTTON_PLUS, 20, (1.5 * TICKS_PER_SECOND));
-            pbf_move_left_joystick(context, 255, 135, 30, (0.5 * TICKS_PER_SECOND));
-            pbf_press_button(context, BUTTON_ZL, 20, (0.5 * TICKS_PER_SECOND));
-            pbf_move_right_joystick(context, 127, 255, (0.2 * TICKS_PER_SECOND), (0.5 * TICKS_PER_SECOND));
-            if (check_tree(env, context)){
-                tree_counter.tree[15]++;
-            }
-        }
-
-        break;
-
-    }
-
-}
-
-void BurmyFinder::run_iteration(SingleSwitchProgramEnvironment& env, BotBaseContext& context, TreeCounter& tree_counter){
-    BurmyFinder_Descriptor::Stats& stats = env.current_stats<BurmyFinder_Descriptor::Stats>();
-    stats.attempts++;
-    env.update_stats();
-    env.console.log("Starting route and shiny detection...");
-
-    for (size_t c = 0; true; c++){
-        context.wait_for_all_requests();
-        if (is_pokemon_selection(env.console, env.console.video().snapshot())){
-            break;
-        }
-        if (c >= 5){
-            throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, env.console,
-                "Failed to switch to Pokemon selection after 5 attempts.",
-                true
-            );
-        }
-        env.console.log("Not on Pokemon selection. Attempting to switch to it...", COLOR_ORANGE);
-        pbf_press_button(context, BUTTON_X, 20, 230);
-    }
-
-    float shiny_coefficient = 1.0;
-
-    ShinySoundDetector shiny_detector(env.console, [&](float error_coefficient) -> bool{
-        //  Warning: This callback will be run from a different thread than this function.
-        if (!m_enable_shiny_sound.load()){
-            return false;
-        }
-        stats.enroute_shinies++;
-        shiny_coefficient = error_coefficient;
-        return on_shiny_callback(env, env.console, SHINY_DETECTED_ENROUTE, error_coefficient);
-    });
-
-    BlackOutDetector black_out_detector(env.console, env.console);
-
-    goto_camp_from_jubilife(env, env.console, context, TravelLocations::instance().Fieldlands_Heights);
-
-    int ret = run_until(
-        env.console, context,
-        [&](BotBaseContext& context){
-
-            for (int path = 0; path < 4; path++) {
-                size_t last_tree = grouped_path(env, context, path, tree_counter);
-                context.wait_for_all_requests();
-                single_path(env, context, path, last_tree, tree_counter);
-                context.wait_for_all_requests();
-            }
-            //  End
-            goto_camp_from_overworld(env, env.console, context);
-            goto_professor(env.console, context, Camp::FIELDLANDS_FIELDLANDS);
-        },
-        {{shiny_detector, black_out_detector}}
-    );
-    shiny_detector.throw_if_no_sound();
-    if (ret == 0){
-        on_shiny_sound(env, env.console, context, SHINY_DETECTED_ENROUTE, shiny_coefficient);
-    }else if (ret == 1){
-        env.log("Character blacks out");
-        // black out.
-        stats.blackouts++;
-        env.update_stats();
-        if (SAVE_DEBUG_VIDEO){
-            // Take a video to know why it blacks out
-            pbf_press_button(context, BUTTON_CAPTURE, 2 * TICKS_PER_SECOND, 2 * TICKS_PER_SECOND);
-            context.wait_for_all_requests();
-        }
-        throw OperationFailedException(
-            ErrorReport::SEND_ERROR_REPORT, env.console,
-            "Black out.",
-            true
-        );
-    }
-
-    from_professor_return_to_jubilife(env, env.console, context);
-}
-
-void BurmyFinder::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    BurmyFinder_Descriptor::Stats& stats = env.current_stats<BurmyFinder_Descriptor::Stats>();
-
-    //  Connect the controller.
-    pbf_press_button(context, BUTTON_LCLICK, 5, 5);
-
-    TreeCounter counters;
-
-    while (true){
-        env.update_stats();
-        counters.log(env.logger());
-        send_program_status_notification(env, NOTIFICATION_STATUS);
-        try{
-            run_iteration(env, context, counters);
-        }catch (OperationFailedException& e){
-            stats.errors++;
-            e.send_notification(env, NOTIFICATION_ERROR_RECOVERABLE);
-
-            pbf_press_button(context, BUTTON_HOME, 20, GameSettings::instance().GAME_TO_HOME_DELAY);
-            reset_game_from_home(env, env.console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST);
-        }
-    }
-
-    env.update_stats();
-    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
-}
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_BurmyFinder.h b/SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_BurmyFinder.h
deleted file mode 100644
index c0a5676b3f..0000000000
--- a/SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_BurmyFinder.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/*  Burmy Hunter
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonLA_BurmyFinder_H
-#define PokemonAutomation_PokemonLA_BurmyFinder_H
-
-#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
-#include "CommonFramework/Options/LanguageOCROption.h"
-#include "CommonFramework/Notifications/EventNotificationsTable.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-#include "PokemonLA/Options/PokemonLA_MiscOptions.h"
-#include "PokemonLA/Options/PokemonLA_ShinyDetectedAction.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-
-class BurmyFinder_Descriptor : public SingleSwitchProgramDescriptor{
-public:
-    BurmyFinder_Descriptor();
-
-    class Stats;
-    virtual std::unique_ptr<StatsTracker> make_stats() const override;
-};
-
-class BurmyFinder : public SingleSwitchProgramInstance{
-public:
-    BurmyFinder();
-
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-    struct TreeCounter;
-
-    void run_iteration(SingleSwitchProgramEnvironment& env, BotBaseContext& context, TreeCounter& tree_counter);
-    // Press X to throw pokemon, check whether there is pokemon in the tree. Wait for potential battle
-    // after pokemon is thrown.
-    // Return true if encountering a burmy in the tree. False otherwise.
-    // Also during pokemon throwing and battle, disable shiny sound detection. This is because a shiny burmy
-    // will play the shiny sound when it jumps out of the tree. To avoid this shiny sound be categorized as
-    // enroute shiny, we disable the sound detection when a burmy may jump out.
-    bool check_tree(SingleSwitchProgramEnvironment& env, BotBaseContext& context);
-    // Throw pokemon to check a tree.
-    // Does not wait for potential battle to start.
-    // Unlike `check_tree()`, shiny sound detection is not disabled. 
-    void check_tree_no_stop(SingleSwitchProgramEnvironment& env, BotBaseContext& context);
-
-    // While during battle, press + button to check pokemon details.
-    // May throw ProgramFinishedException if a Burmy match is found.
-    // Finish battle by mashing A or escape. 
-    // Return true if a burmy is in the battle. False otherwise.
-    bool handle_battle(SingleSwitchProgramEnvironment& env, BotBaseContext& context);
-
-    // Set `m_enable_shiny_sound` to false to disable sound detection.
-    // Also call `context.wait_for_all_requests()` to make sure controller commands are all executed.
-    // See `m_enable_shiny_sound` for more context.
-    void disable_shiny_sound(BotBaseContext& context);
-    // Re-enable shiny sound detection.
-    // Also call `context.wait_for_all_requests()` to make sure controller commands are all executed.
-    // See `m_enable_shiny_sound` for more context.
-    void enable_shiny_sound(BotBaseContext& context);
-
-    // From any place on the fieldlands, return to Height Camp.
-    // It will try to ride on Braviary to escape from attacking pokemon if it can not transport via map.
-    // For robustness, the function will detect pokemon battles if for some reason the player character
-    // is entering a pokemon battle when this function is called.
-    // In the case of an active battle, it calls `handle_battle()` to check potential Burmy and then finish
-    // battle. After that, try to go back to Height Camp again.
-    void go_to_height_camp(SingleSwitchProgramEnvironment& env, BotBaseContext& context);
-
-    // From camp it will go to trees in sequence instead of heading to camp.
-    // It returns the last tree checked so the remain can be checked on single_path
-    size_t grouped_path(SingleSwitchProgramEnvironment& env, BotBaseContext& context, size_t path, TreeCounter& tree_counter);
-
-    // Check trees individually going from camp based on the last tree checked for each path
-    void single_path(SingleSwitchProgramEnvironment& env, BotBaseContext& context, size_t path, size_t last_tree, TreeCounter& tree_counter);
-
-
-private:
-    class RunRoute;
-
-    // Atomic bool to control whether to skip shiny sound for shiny sound detector.
-    // Shiny pokemon will play the shiny sound when it jumps out of a tree. To prevent this shiny sound from being
-    // treated as enroute shiny (shiny tree pokemon should be regarded as tree shiny), we disable shiny sound
-    // detection when throwing pokemon to shake a tree.
-    std::atomic<bool> m_enable_shiny_sound{true};
-
-    OCR::LanguageOCROption LANGUAGE;
-    StopOnOption STOP_ON;
-    ExitBattleMethodOption EXIT_METHOD;
-    ShinyDetectedActionOption SHINY_DETECTED_ENROUTE;
-    ShinyDetectedActionOption MATCH_DETECTED_OPTIONS;
-
-    EventNotificationOption NOTIFICATION_STATUS;
-    EventNotificationsOption NOTIFICATIONS;
-
-    BooleanCheckBoxOption SAVE_DEBUG_VIDEO;
-};
-
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_CrobatFinder.cpp b/SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_CrobatFinder.cpp
deleted file mode 100644
index 9f0ecb2479..0000000000
--- a/SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_CrobatFinder.cpp
+++ /dev/null
@@ -1,214 +0,0 @@
-/*  Alpha Crobat Hunter
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/Exceptions/OperationFailedException.h"
-#include "CommonFramework/Notifications/ProgramNotifications.h"
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
-#include "CommonFramework/Tools/StatsTracking.h"
-#include "NintendoSwitch/NintendoSwitch_Settings.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonLA/PokemonLA_Settings.h"
-#include "PokemonLA/Inference/PokemonLA_MountDetector.h"
-#include "PokemonLA/Inference/Sounds/PokemonLA_ShinySoundDetector.h"
-#include "PokemonLA/Programs/PokemonLA_GameEntry.h"
-#include "PokemonLA/Programs/PokemonLA_RegionNavigation.h"
-#include "PokemonLA_CrobatFinder.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-    using namespace Pokemon;
-
-
-CrobatFinder_Descriptor::CrobatFinder_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonLA:CrobatFinder",
-        STRING_POKEMON + " LA", "Alpha Crobat Hunter",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonLA/AlphaCrobatHunter.md",
-        "Constantly reset the cave to find Shiny Alpha Crobat.",
-        FeedbackType::REQUIRED,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-class CrobatFinder_Descriptor::Stats : public StatsTracker, public ShinyStatIncrementer{
-public:
-    Stats()
-        : attempts(m_stats["Attempts"])
-        , errors(m_stats["Errors"])
-        , shinies(m_stats["Shinies"])
-    {
-        m_display_order.emplace_back("Attempts");
-        m_display_order.emplace_back("Errors", true);
-        m_display_order.emplace_back("Shinies", true);
-    }
-    virtual void add_shiny() override{
-        shinies++;
-    }
-
-    std::atomic<uint64_t>& attempts;
-    std::atomic<uint64_t>& errors;
-    std::atomic<uint64_t>& shinies;
-};
-std::unique_ptr<StatsTracker> CrobatFinder_Descriptor::make_stats() const{
-    return std::unique_ptr<StatsTracker>(new Stats());
-}
-
-
-CrobatFinder::CrobatFinder()
-    : SHINY_DETECTED_ENROUTE(
-        "Enroute Shiny Action",
-        "This applies if you are still traveling to the Crobat.",
-        "2 * TICKS_PER_SECOND"
-    )
-    , SHINY_DETECTED_DESTINATION(
-        "Destination Shiny Action",
-        "This applies if you are near the Crobat.",
-        "2 * TICKS_PER_SECOND"
-    )
-    , NOTIFICATION_STATUS("Status Update", true, false, std::chrono::seconds(3600))
-    , NOTIFICATIONS({
-        &NOTIFICATION_STATUS,
-        &SHINY_DETECTED_ENROUTE.NOTIFICATIONS,
-        &SHINY_DETECTED_DESTINATION.NOTIFICATIONS,
-        &NOTIFICATION_PROGRAM_FINISH,
-        &NOTIFICATION_ERROR_RECOVERABLE,
-        &NOTIFICATION_ERROR_FATAL,
-    })
-{
-    PA_ADD_STATIC(SHINY_REQUIRES_AUDIO);
-    PA_ADD_OPTION(SHINY_DETECTED_ENROUTE);
-    PA_ADD_OPTION(SHINY_DETECTED_DESTINATION);
-    PA_ADD_OPTION(NOTIFICATIONS);
-}
-
-
-
-void CrobatFinder::run_iteration(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    // NOTE: there's no "stunned by alpha" detection in case any of the close ones are alphas!
-    CrobatFinder_Descriptor::Stats& stats = env.current_stats<CrobatFinder_Descriptor::Stats>();
-
-    stats.attempts++;
-
-    // program should be started right in front of the entrance
-    // so enter the sub region
-    env.console.log("Entering Wayward Cave...");
-    mash_A_to_enter_sub_area(env, env.console, context);
-
-    env.console.log("Beginning navigation to the Alpha Crobat...");
-    //  Switch to Wrydeer.
-    bool error = true;
-    MountDetector mount_detector;
-    for (size_t c = 0; c < 10; c++){
-        MountState mount = mount_detector.detect(env.console.video().snapshot());
-        if (mount == MountState::WYRDEER_OFF){
-            pbf_press_button(context, BUTTON_PLUS, 20, 105);
-            error = false;
-            break;
-        }
-        if (mount == MountState::WYRDEER_ON){
-            pbf_wait(context, 5 * TICKS_PER_SECOND);
-            error = false;
-            break;
-        }
-        pbf_press_dpad(context, DPAD_LEFT, 20, 50);
-        context.wait_for_all_requests();
-    }
-    if (error){
-        throw OperationFailedException(
-            ErrorReport::SEND_ERROR_REPORT, env.console,
-            "Unable to find Wyrdeer after 10 attempts.",
-            true
-        );
-    }
-
-    env.console.log("Beginning Shiny Detection...");
-    // start the shiny detection, there's nothing initially
-    {
-        float shiny_coefficient = 1.0;
-        std::atomic<ShinyDetectedActionOption*> shiny_action(&SHINY_DETECTED_ENROUTE);
-
-        ShinySoundDetector shiny_detector(env.console, [&](float error_coefficient) -> bool{
-            //  Warning: This callback will be run from a different thread than this function.
-            stats.shinies++;
-            shiny_coefficient = error_coefficient;
-            ShinyDetectedActionOption* action = shiny_action.load(std::memory_order_acquire);
-            return on_shiny_callback(env, env.console, *action, error_coefficient);
-        });
-
-        int ret = run_until(
-            env.console, context,
-            [&](BotBaseContext& context){
-
-                // FORWARD PORTION OF CAVE UNTIL LEDGE
-                pbf_press_button(context, BUTTON_B, (uint16_t)(2.2 * TICKS_PER_SECOND), 80); // wyrdeer sprint
-                pbf_move_left_joystick(context, 0, 128, 10, 20); // turn left
-                pbf_press_button(context, BUTTON_ZL, 20, 50); // align camera
-
-                // ASCEND THE LEDGE WITH BRAVIARY
-                pbf_press_dpad(context, DPAD_RIGHT, 20, 50); // swap to braviary
-                pbf_wait(context, (uint16_t)(0.6 * TICKS_PER_SECOND)); // wait for the ascent
-                pbf_press_button(context, BUTTON_Y, (uint16_t)(2.4 * TICKS_PER_SECOND), 20); // descend to swap to Wyrdeer automatically
-
-                // TO CROBAT PORTION
-                pbf_press_button(context, BUTTON_B, (uint16_t)(1.05 * TICKS_PER_SECOND), 80); // sprint forward for a split second
-                pbf_move_left_joystick(context, 255, 150, 10, 20); // rotate slightly right
-                pbf_press_button(context, BUTTON_ZL, 20, 70); // align camera
-
-                context.wait_for_all_requests();
-                shiny_action.store(&SHINY_DETECTED_DESTINATION, std::memory_order_release);
-
-                pbf_move_left_joystick(context, 128, 0, (uint16_t)(3.8 * TICKS_PER_SECOND), 0); // forward to crobat check
-
-            },
-            {{shiny_detector}}
-        );
-        shiny_detector.throw_if_no_sound();
-        if (ret == 0){
-            ShinyDetectedActionOption* action = shiny_action.load(std::memory_order_acquire);
-            on_shiny_sound(env, env.console, context, *action, shiny_coefficient);
-        }
-    };
-
-    // then reset since no shiny was found
-    env.console.log("No shiny detected, restarting the game!");
-
-    pbf_press_button(context, BUTTON_HOME, 20, GameSettings::instance().GAME_TO_HOME_DELAY);
-    reset_game_from_home(env, env.console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST);
-}
-
-
-void CrobatFinder::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    CrobatFinder_Descriptor::Stats& stats = env.current_stats<CrobatFinder_Descriptor::Stats>();
-
-    //  Connect the controller.
-    pbf_press_button(context, BUTTON_LCLICK, 5, 5);
-
-    while (true){
-        env.update_stats();
-        send_program_status_notification(env, NOTIFICATION_STATUS);
-        try{
-            run_iteration(env, context);
-        }catch (OperationFailedException& e){
-            stats.errors++;
-            e.send_notification(env, NOTIFICATION_ERROR_RECOVERABLE);
-
-            pbf_press_button(context, BUTTON_HOME, 20, GameSettings::instance().GAME_TO_HOME_DELAY);
-            reset_game_from_home(env, env.console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST);
-        }
-    }
-
-    env.update_stats();
-    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
-}
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_CrobatFinder.h b/SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_CrobatFinder.h
deleted file mode 100644
index 94f628f581..0000000000
--- a/SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_CrobatFinder.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*  Alpha Crobat Hunter
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonLA_CrobatFinder_H
-#define PokemonAutomation_PokemonLA_CrobatFinder_H
-
-#include "CommonFramework/Notifications/EventNotificationsTable.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-#include "PokemonLA/Options/PokemonLA_ShinyDetectedAction.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-
-class CrobatFinder_Descriptor : public SingleSwitchProgramDescriptor{
-public:
-    CrobatFinder_Descriptor();
-
-    class Stats;
-    virtual std::unique_ptr<StatsTracker> make_stats() const override;
-};
-
-
-class CrobatFinder : public SingleSwitchProgramInstance{
-public:
-    CrobatFinder();
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-    void run_iteration(SingleSwitchProgramEnvironment& env, BotBaseContext& context);
-
-private:
-    ShinyRequiresAudioText SHINY_REQUIRES_AUDIO;
-
-    ShinyDetectedActionOption SHINY_DETECTED_ENROUTE;
-    ShinyDetectedActionOption SHINY_DETECTED_DESTINATION;
-
-    EventNotificationOption NOTIFICATION_STATUS;
-    EventNotificationsOption NOTIFICATIONS;
-};
-
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_FroslassFinder.cpp b/SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_FroslassFinder.cpp
deleted file mode 100644
index 060431b004..0000000000
--- a/SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_FroslassFinder.cpp
+++ /dev/null
@@ -1,194 +0,0 @@
-/*  Alpha Froslass Finder
-*
-*  From: https://github.com/PokemonAutomation/Arduino-Source
-*
-*/
-
-#include "CommonFramework/Exceptions/OperationFailedException.h"
-#include "CommonFramework/Notifications/ProgramNotifications.h"
-#include "CommonFramework/Tools/StatsTracking.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
-#include "NintendoSwitch/NintendoSwitch_Settings.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonLA/PokemonLA_Settings.h"
-#include "PokemonLA/PokemonLA_TravelLocations.h"
-#include "PokemonLA/Inference/Sounds/PokemonLA_ShinySoundDetector.h"
-#include "PokemonLA/Programs/PokemonLA_MountChange.h"
-#include "PokemonLA/Programs/PokemonLA_GameEntry.h"
-#include "PokemonLA/Programs/PokemonLA_RegionNavigation.h"
-#include "PokemonLA/Programs/ShinyHunting/PokemonLA_FroslassFinder.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-    using namespace Pokemon;
-
-
-
-FroslassFinder_Descriptor::FroslassFinder_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonLA:AlphaFroslassFinder",
-        STRING_POKEMON + " LA", "Alpha Froslass Hunter",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonLA/AlphaFroslassHunter.md",
-        "Constantly reset to find a Alpha Froslass or any Shiny in the path.",
-        FeedbackType::REQUIRED,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-class FroslassFinder_Descriptor::Stats : public StatsTracker, public ShinyStatIncrementer{
-public:
-    Stats()
-        : attempts(m_stats["Attempts"])
-        , errors(m_stats["Errors"])
-        , shinies(m_stats["Shinies"])
-    {
-        m_display_order.emplace_back("Attempts");
-        m_display_order.emplace_back("Errors", true);
-        m_display_order.emplace_back("Shinies", true);
-    }
-    virtual void add_shiny() override{
-        shinies++;
-    }
-
-    std::atomic<uint64_t>& attempts;
-    std::atomic<uint64_t>& errors;
-    std::atomic<uint64_t>& shinies;
-};
-std::unique_ptr<StatsTracker> FroslassFinder_Descriptor::make_stats() const{
-    return std::unique_ptr<StatsTracker>(new Stats());
-}
-
-
-
-FroslassFinder::FroslassFinder()
-    : DASH_DURATION(
-        "<b>Braviary dash duration:</b><br>"
-        "How many ticks for Braviary to dash to reach the hole.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "986"
-    )
-    , SHINY_DETECTED_ENROUTE(
-        "Enroute Shiny Action",
-        "This applies if a shiny is detected while enroute to the cave. (Does not ignore Misdreavus and Glalie)",
-        "0 * TICKS_PER_SECOND"
-    )
-    , SHINY_DETECTED_DESTINATION(
-        "Destination Shiny Action",
-        "This applies if a shiny is detected at or near Froslass.",
-        "0 * TICKS_PER_SECOND"
-    )
-    , NOTIFICATION_STATUS("Status Update", true, false, std::chrono::seconds(3600))
-    , NOTIFICATIONS({
-        &NOTIFICATION_STATUS,
-        &SHINY_DETECTED_ENROUTE.NOTIFICATIONS,
-        &SHINY_DETECTED_DESTINATION.NOTIFICATIONS,
-        &NOTIFICATION_PROGRAM_FINISH,
-        &NOTIFICATION_ERROR_RECOVERABLE,
-        &NOTIFICATION_ERROR_FATAL,
-    })
-{
-    PA_ADD_STATIC(SHINY_REQUIRES_AUDIO);
-    PA_ADD_OPTION(DASH_DURATION);
-    PA_ADD_OPTION(SHINY_DETECTED_ENROUTE);
-    PA_ADD_OPTION(SHINY_DETECTED_DESTINATION);
-    PA_ADD_OPTION(NOTIFICATIONS);
-}
-
-
-void FroslassFinder::run_iteration(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    FroslassFinder_Descriptor::Stats& stats = env.current_stats<FroslassFinder_Descriptor::Stats>();
-
-    stats.attempts++;
-
-    goto_camp_from_jubilife(env, env.console, context, TravelLocations::instance().Icelands_Arena);
-
-    //Start path
-    env.console.log("Beginning Shiny Detection...");
-
-    //Setup
-    pbf_move_left_joystick(context, 108, 255, 20, 20);
-    pbf_press_button(context, BUTTON_ZL, 10,10);
-    pbf_wait(context, (uint16_t)(0.5 * TICKS_PER_SECOND));
-    change_mount(env.console, context, MountState::BRAVIARY_ON);
-    pbf_wait(context, (uint16_t)(0.5 * TICKS_PER_SECOND));
-
-    {
-        float shiny_coefficient = 1.0;
-        std::atomic<ShinyDetectedActionOption*> shiny_action(&SHINY_DETECTED_ENROUTE);
-
-        ShinySoundDetector shiny_detector(env.console, [&](float error_coefficient) -> bool{
-            //  Warning: This callback will be run from a different thread than this function.
-            stats.shinies++;
-            shiny_coefficient = error_coefficient;
-            ShinyDetectedActionOption* action = shiny_action.load(std::memory_order_acquire);
-            return on_shiny_callback(env, env.console, *action, error_coefficient);
-        });
-
-        int ret = run_until(
-            env.console, context,
-            [&](BotBaseContext& context){
-                //  Route to cave entrance
-                pbf_press_button(context, BUTTON_B, (uint16_t)(2 * TICKS_PER_SECOND), 10);  //Get some distance from the moutain
-                pbf_press_button(context, BUTTON_Y, (uint16_t)(4 * TICKS_PER_SECOND), 10);  //Descend
-                pbf_press_button(context, BUTTON_B, DASH_DURATION, 10); //Reach to the cave entrance
-                pbf_wait(context, (uint16_t)(0.5 * TICKS_PER_SECOND));
-                pbf_press_button(context, BUTTON_PLUS, 10,10);
-                pbf_wait(context, (uint16_t)(1.1 * TICKS_PER_SECOND));
-                pbf_press_button(context, BUTTON_PLUS, 10,10);
-                pbf_press_button(context, BUTTON_B, (uint16_t)(2.8 * TICKS_PER_SECOND), 10); // Braviary Second Push
-
-                context.wait_for_all_requests();
-                shiny_action.store(&SHINY_DETECTED_DESTINATION, std::memory_order_release);
-
-                //  Move to Froslass
-                pbf_press_dpad(context, DPAD_LEFT, 20, 20);
-                pbf_press_button(context, BUTTON_B, (uint16_t)(4.5 * TICKS_PER_SECOND), 10);
-            },
-            {{shiny_detector}}
-        );
-        shiny_detector.throw_if_no_sound();
-        if (ret == 0){
-            ShinyDetectedActionOption* action = shiny_action.load(std::memory_order_acquire);
-            on_shiny_sound(env, env.console, context, *action, shiny_coefficient);
-        }
-    }
-
-    env.console.log("No shiny detected, Reset game!");
-    pbf_press_button(context, BUTTON_HOME, 20, GameSettings::instance().GAME_TO_HOME_DELAY);
-    reset_game_from_home(env, env.console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST);
-}
-
-
-void FroslassFinder::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    FroslassFinder_Descriptor::Stats& stats = env.current_stats<FroslassFinder_Descriptor::Stats>();
-
-    //  Connect the controller.
-    pbf_press_button(context, BUTTON_LCLICK, 5, 5);
-
-    while (true){
-        env.update_stats();
-        send_program_status_notification(env, NOTIFICATION_STATUS);
-        try{
-            run_iteration(env, context);
-        }catch (OperationFailedException& e){
-            stats.errors++;
-            e.send_notification(env, NOTIFICATION_ERROR_RECOVERABLE);
-
-            pbf_press_button(context, BUTTON_HOME, 20, GameSettings::instance().GAME_TO_HOME_DELAY);
-            reset_game_from_home(env, env.console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST);
-        }
-    }
-
-    env.update_stats();
-    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
-}
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_FroslassFinder.h b/SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_FroslassFinder.h
deleted file mode 100644
index 5dadf72001..0000000000
--- a/SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_FroslassFinder.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*  Alpha Froslass Hunter
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonLA_FroslassFinder_H
-#define PokemonAutomation_PokemonLA_FroslassFinder_H
-
-#include "Common/Cpp/Options/TimeExpressionOption.h"
-#include "CommonFramework/Notifications/EventNotificationsTable.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-#include "PokemonLA/Options/PokemonLA_ShinyDetectedAction.h"
-#include "PokemonLA/Inference/PokemonLA_MountDetector.h"
-#include "PokemonLA/Inference/PokemonLA_UnderAttackDetector.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-class FroslassFinder_Descriptor : public SingleSwitchProgramDescriptor{
-public:
-    FroslassFinder_Descriptor();
-
-    class Stats;
-    virtual std::unique_ptr<StatsTracker> make_stats() const override;
-};
-
-class FroslassFinder : public SingleSwitchProgramInstance{
-public:
-    FroslassFinder();
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-    void run_iteration(SingleSwitchProgramEnvironment& env, BotBaseContext& context);
-
-private:
-    class RunRoute;
-
-    ShinyRequiresAudioText SHINY_REQUIRES_AUDIO;
-
-    TimeExpressionOption<uint16_t> DASH_DURATION;
-
-    ShinyDetectedActionOption SHINY_DETECTED_ENROUTE;
-    ShinyDetectedActionOption SHINY_DETECTED_DESTINATION;
-
-    EventNotificationOption NOTIFICATION_STATUS;
-    EventNotificationsOption NOTIFICATIONS;
-};
-
-}
-}
-}
-#endif
-
diff --git a/SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_GalladeFinder.cpp b/SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_GalladeFinder.cpp
deleted file mode 100644
index 1e7de3d7a4..0000000000
--- a/SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_GalladeFinder.cpp
+++ /dev/null
@@ -1,199 +0,0 @@
-/*  Alpha Gallade Hunter
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/Exceptions/OperationFailedException.h"
-#include "CommonFramework/Notifications/ProgramNotifications.h"
-#include "CommonFramework/Tools/StatsTracking.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
-#include "NintendoSwitch/NintendoSwitch_Settings.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonLA/PokemonLA_Settings.h"
-#include "PokemonLA/Inference/Sounds/PokemonLA_ShinySoundDetector.h"
-#include "PokemonLA/Programs/PokemonLA_GameEntry.h"
-#include "PokemonLA/Programs/PokemonLA_RegionNavigation.h"
-#include "PokemonLA_GalladeFinder.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-    using namespace Pokemon;
-
-
-GalladeFinder_Descriptor::GalladeFinder_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonLA:GalladeFinder",
-        STRING_POKEMON + " LA", "Alpha Gallade Hunter",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonLA/AlphaGalladeHunter.md",
-        "Constantly reset the Snowpoint Temple to find Shiny Alpha Gallade.",
-        FeedbackType::REQUIRED,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-class GalladeFinder_Descriptor::Stats : public StatsTracker, public ShinyStatIncrementer{
-public:
-    Stats()
-        : attempts(m_stats["Attempts"])
-        , errors(m_stats["Errors"])
-        , shinies(m_stats["Shinies"])
-    {
-        m_display_order.emplace_back("Attempts");
-        m_display_order.emplace_back("Errors", true);
-        m_display_order.emplace_back("Shinies", true);
-    }
-    virtual void add_shiny() override{
-        shinies++;
-    }
-
-    std::atomic<uint64_t>& attempts;
-    std::atomic<uint64_t>& errors;
-    std::atomic<uint64_t>& shinies;
-};
-std::unique_ptr<StatsTracker> GalladeFinder_Descriptor::make_stats() const{
-    return std::unique_ptr<StatsTracker>(new Stats());
-}
-
-
-GalladeFinder::GalladeFinder()
-    : SHINY_DETECTED_ENROUTE(
-        "Enroute Shiny Action",
-        "This applies if you are still traveling to the Gallade.",
-        "0 * TICKS_PER_SECOND"
-    )
-    , SHINY_DETECTED_DESTINATION(
-        "Destination Shiny Action",
-        "This applies if you are near the Gallade.",
-        "0 * TICKS_PER_SECOND"
-    )
-    , NOTIFICATION_STATUS("Status Update", true, false, std::chrono::seconds(3600))
-    , NOTIFICATIONS({
-        &NOTIFICATION_STATUS,
-        &SHINY_DETECTED_ENROUTE.NOTIFICATIONS,
-        &SHINY_DETECTED_DESTINATION.NOTIFICATIONS,
-        &NOTIFICATION_PROGRAM_FINISH,
-        &NOTIFICATION_ERROR_RECOVERABLE,
-        &NOTIFICATION_ERROR_FATAL,
-    })
-{
-    PA_ADD_STATIC(SHINY_REQUIRES_AUDIO);
-    PA_ADD_OPTION(SHINY_DETECTED_ENROUTE);
-    PA_ADD_OPTION(SHINY_DETECTED_DESTINATION);
-    PA_ADD_OPTION(NOTIFICATIONS);
-}
-
-
-
-void GalladeFinder::run_iteration(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    // NOTE: there's no "stunned by alpha" detection in case the first spawn is an alpha!
-    // NOTE: there is also no mitigation for if you get attacked by a Kirlia if it hates you
-    GalladeFinder_Descriptor::Stats& stats = env.current_stats<GalladeFinder_Descriptor::Stats>();
-
-    stats.attempts++;
-
-    // program should be started right in front of the entrance
-    // so enter the sub region
-    env.console.log("Entering Snowpoint Temple...");
-    mash_A_to_enter_sub_area(env, env.console, context);
-
-    env.console.log("Beginning navigation to the Alpha Gallade...");
-    // start the shiny detection, there's nothing initially
-    env.console.log("Enabling Shiny Detection...");
-    {
-        float shiny_coefficient = 1.0;
-        std::atomic<ShinyDetectedActionOption*> shiny_action(&SHINY_DETECTED_ENROUTE);
-
-        ShinySoundDetector shiny_detector(env.console, [&](float error_coefficient) -> bool{
-            //  Warning: This callback will be run from a different thread than this function.
-            stats.shinies++;
-            shiny_coefficient = error_coefficient;
-            ShinyDetectedActionOption* action = shiny_action.load(std::memory_order_acquire);
-            return on_shiny_callback(env, env.console, *action, error_coefficient);
-        });
-
-        int ret = run_until(
-            env.console, context,
-            [&](BotBaseContext& context){
-                // forward portion
-                pbf_controller_state(context, BUTTON_LCLICK, DPAD_NONE, 128, 0, 128, 128, (uint16_t)(6.8 * TICKS_PER_SECOND)); // forward while running until stairs, mash y a few times down the stairs
-                pbf_mash_button(context, BUTTON_Y,(uint16_t)(2.8 * TICKS_PER_SECOND)); // roll down the stairs, recover stamina
-                pbf_controller_state(context, BUTTON_LCLICK, DPAD_NONE, 128, 0, 128, 128, (uint16_t)(4.0 * TICKS_PER_SECOND)); // forward while sprinting again
-                pbf_mash_button(context, BUTTON_Y,(uint16_t)(2.0 * TICKS_PER_SECOND)); // two mashes and then one y
-                pbf_controller_state(context, BUTTON_LCLICK, DPAD_NONE, 128, 0, 128, 128, (uint16_t)(3.8 * TICKS_PER_SECOND)); // forward while sprinting again
-                // basic map layout is walk forward for a while, move right, run back, then align camera, then walk left then forward to Gallade
-
-                // right portion
-                pbf_move_left_joystick(context, 255, 128, (uint16_t)(0.5 * TICKS_PER_SECOND), 0); // right alone
-                pbf_controller_state(context, BUTTON_LCLICK, DPAD_NONE, 255, 128, 128, 128, (uint16_t)(2.4 * TICKS_PER_SECOND)); // forward while running until stairs
-                pbf_mash_button(context, BUTTON_Y,(uint16_t)(1.8 * TICKS_PER_SECOND)); // roll down the stairs, recover stamina
-                pbf_move_left_joystick(context, 255, 128, (uint16_t)(1.8 * TICKS_PER_SECOND), 20); // right alone
-
-                // down portion
-                // pbf_move_left_joystick(context, 128, 255, (uint16_t)(1.9 * TICKS_PER_SECOND), 20); // OLD down
-                pbf_controller_state(context, BUTTON_LCLICK, DPAD_NONE, 128, 255, 128, 128, (uint16_t)(1.8 * TICKS_PER_SECOND));
-
-                // camera align
-                pbf_press_button(context, BUTTON_ZL, 20, 0); // camera align
-                pbf_wait(context, 70);
-
-                context.wait_for_all_requests();
-                shiny_action.store(&SHINY_DETECTED_DESTINATION, std::memory_order_release);
-
-                pbf_move_left_joystick(context, 0, 128, 2 * TICKS_PER_SECOND, 0); // left
-
-                // then forward left
-                pbf_move_left_joystick(context, 0, 0, (uint16_t)(1.1 * TICKS_PER_SECOND), 0);
-
-                //pbf_move_left_joystick(context, 128, 0, 3.9 * TICKS_PER_SECOND, 0); // OLD forward
-                pbf_controller_state(context, BUTTON_LCLICK, DPAD_NONE, 128, 0, 128, 128, (uint16_t)(3.5 * TICKS_PER_SECOND)); // forward while sprinting until stairs, mash y a few times down the stairs
-                // we should easily be in range of gallade at this point, so if there's no shiny we're done
-            },
-            {{shiny_detector}}
-        );
-        shiny_detector.throw_if_no_sound();
-        if (ret == 0){
-            ShinyDetectedActionOption* action = shiny_action.load(std::memory_order_acquire);
-            on_shiny_sound(env, env.console, context, *action, shiny_coefficient);
-        }
-    };
-
-    // then reset
-    env.console.log("No shiny detected, restarting the game!");
-
-    pbf_press_button(context, BUTTON_HOME, 20, GameSettings::instance().GAME_TO_HOME_DELAY);
-    reset_game_from_home(env, env.console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST);
-}
-
-
-void GalladeFinder::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    GalladeFinder_Descriptor::Stats& stats = env.current_stats<GalladeFinder_Descriptor::Stats>();
-
-    //  Connect the controller.
-    pbf_press_button(context, BUTTON_LCLICK, 5, 5);
-
-    while (true){
-        env.update_stats();
-        send_program_status_notification(env, NOTIFICATION_STATUS);
-        try{
-            run_iteration(env, context);
-        }catch (OperationFailedException& e){
-            stats.errors++;
-            e.send_notification(env, NOTIFICATION_ERROR_RECOVERABLE);
-
-            pbf_press_button(context, BUTTON_HOME, 20, GameSettings::instance().GAME_TO_HOME_DELAY);
-            reset_game_from_home(env, env.console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST);
-        }
-    }
-
-    env.update_stats();
-    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
-}
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_GalladeFinder.h b/SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_GalladeFinder.h
deleted file mode 100644
index 2311f1ef9b..0000000000
--- a/SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_GalladeFinder.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*  Alpha Gallade Hunter
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonLA_GalladeFinder_H
-#define PokemonAutomation_PokemonLA_GalladeFinder_H
-
-#include "CommonFramework/Notifications/EventNotificationsTable.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-#include "PokemonLA/Options/PokemonLA_ShinyDetectedAction.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-
-class GalladeFinder_Descriptor : public SingleSwitchProgramDescriptor{
-public:
-    GalladeFinder_Descriptor();
-
-    class Stats;
-    virtual std::unique_ptr<StatsTracker> make_stats() const override;
-};
-
-
-class GalladeFinder : public SingleSwitchProgramInstance{
-public:
-    GalladeFinder();
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-    void run_iteration(SingleSwitchProgramEnvironment& env, BotBaseContext& context);
-
-private:
-    ShinyRequiresAudioText SHINY_REQUIRES_AUDIO;
-
-    ShinyDetectedActionOption SHINY_DETECTED_ENROUTE;
-    ShinyDetectedActionOption SHINY_DETECTED_DESTINATION;
-
-    EventNotificationOption NOTIFICATION_STATUS;
-    EventNotificationsOption NOTIFICATIONS;
-};
-
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_PostMMOSpawnReset.cpp b/SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_PostMMOSpawnReset.cpp
deleted file mode 100644
index 3d221d60b6..0000000000
--- a/SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_PostMMOSpawnReset.cpp
+++ /dev/null
@@ -1,176 +0,0 @@
-/*  Post MMO Spawn Reset
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/Exceptions/OperationFailedException.h"
-#include "CommonFramework/Notifications/ProgramNotifications.h"
-#include "CommonFramework/Tools/StatsTracking.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
-#include "NintendoSwitch/NintendoSwitch_Settings.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonLA/PokemonLA_Settings.h"
-#include "PokemonLA/Inference/Sounds/PokemonLA_ShinySoundDetector.h"
-#include "PokemonLA/Programs/PokemonLA_GameEntry.h"
-#include "PokemonLA_PostMMOSpawnReset.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-    using namespace Pokemon;
-
-
-
-PostMMOSpawnReset_Descriptor::PostMMOSpawnReset_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonLA:PostMMOSpawnReset",
-        STRING_POKEMON + " LA", "Post-MMO Spawn Reset",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonLA/PostMMOSpawnReset.md",
-        "Constantly reset the spawn after MMO finishes.",
-        FeedbackType::REQUIRED,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-class PostMMOSpawnReset_Descriptor::Stats : public StatsTracker, public ShinyStatIncrementer{
-public:
-    Stats()
-        : attempts(m_stats["Attempts"])
-        , errors(m_stats["Errors"])
-        , shinies(m_stats["Shinies"])
-    {
-        m_display_order.emplace_back("Attempts");
-        m_display_order.emplace_back("Errors", true);
-        m_display_order.emplace_back("Shinies", true);
-    }
-    virtual void add_shiny() override{
-        shinies++;
-    }
-
-    std::atomic<uint64_t>& attempts;
-    std::atomic<uint64_t>& errors;
-    std::atomic<uint64_t>& shinies;
-};
-std::unique_ptr<StatsTracker> PostMMOSpawnReset_Descriptor::make_stats() const{
-    return std::unique_ptr<StatsTracker>(new Stats());
-}
-
-
-PostMMOSpawnReset::PostMMOSpawnReset()
-    : TURN_DURATION(
-        "<b>Camera Turn:</b><br>How many ticks to turn the camera. <br>Positive values for right turns. Negative values for left turns.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "0"
-    )
-    , FORWARD_DURATION(
-        "<b>Move Forward:</b><br>After turning the camera, how many ticks to move forward.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "0"
-    )
-    , WAIT_DURATION(
-        "<b>Wait Time:</b><br> Wait time after movement.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "5 * TICKS_PER_SECOND"
-    )
-    , SHINY_DETECTED("Shiny Detected Action", "", "0 * TICKS_PER_SECOND")
-    , NOTIFICATION_STATUS("Status Update", true, false, std::chrono::seconds(3600))
-    , NOTIFICATIONS({
-        &NOTIFICATION_STATUS,
-        &SHINY_DETECTED.NOTIFICATIONS,
-        &NOTIFICATION_PROGRAM_FINISH,
-        &NOTIFICATION_ERROR_RECOVERABLE,
-        &NOTIFICATION_ERROR_FATAL,
-    })
-{
-    PA_ADD_STATIC(SHINY_REQUIRES_AUDIO);
-    PA_ADD_OPTION(TURN_DURATION);
-    PA_ADD_OPTION(FORWARD_DURATION);
-    PA_ADD_OPTION(WAIT_DURATION);
-    PA_ADD_OPTION(SHINY_DETECTED);
-    PA_ADD_OPTION(NOTIFICATIONS);
-}
-
-
-
-void PostMMOSpawnReset::run_iteration(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    PostMMOSpawnReset_Descriptor::Stats& stats = env.current_stats<PostMMOSpawnReset_Descriptor::Stats>();
-
-    // From game to Switch Home
-    pbf_press_button(context, BUTTON_HOME, 20, GameSettings::instance().GAME_TO_HOME_DELAY);
-    {
-        float shiny_coefficient = 1.0;
-        ShinySoundDetector shiny_detector(env.console, [&](float error_coefficient) -> bool{
-            //  Warning: This callback will be run from a different thread than this function.
-            stats.shinies++;
-            shiny_coefficient = error_coefficient;
-            return on_shiny_callback(env, env.console, SHINY_DETECTED, error_coefficient);
-        });
-
-        int ret = run_until(
-            env.console, context,
-            [this, &env](BotBaseContext& context){
-                reset_game_from_home(env, env.console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST);
-                env.console.log("Entered game! Checking shiny sound...");
-
-                // forward portion
-                if (TURN_DURATION > 0){
-                    pbf_move_right_joystick(context, 255, 128, uint16_t(TURN_DURATION), 0);
-                } else if (TURN_DURATION < 0){
-                    pbf_move_right_joystick(context, 0, 128, uint16_t(-TURN_DURATION), 0);
-                }
-                
-                pbf_controller_state(context, BUTTON_LCLICK, DPAD_NONE, 128, 0, 128, 128, FORWARD_DURATION);
-
-                pbf_wait(context, WAIT_DURATION);
-
-                context.wait_for_all_requests();
-            },
-            {{shiny_detector}}
-        );
-        shiny_detector.throw_if_no_sound();
-        if (ret == 0){
-            on_shiny_sound(env, env.console, context, SHINY_DETECTED, shiny_coefficient);
-        }
-    }
-
-    stats.attempts++;
-    env.console.log("No shiny detected, restarting the game!");
-}
-
-
-void PostMMOSpawnReset::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    PostMMOSpawnReset_Descriptor::Stats& stats = env.current_stats<PostMMOSpawnReset_Descriptor::Stats>();
-
-    //  Connect the controller.
-    pbf_press_button(context, BUTTON_LCLICK, 5, 5);
-
-    while (true){
-        env.update_stats();
-        send_program_status_notification(env, NOTIFICATION_STATUS);
-        try{
-            run_iteration(env, context);
-        }catch (OperationFailedException& e){
-            stats.errors++;
-            e.send_notification(env, NOTIFICATION_ERROR_RECOVERABLE);
-
-            // run_iteration() restarts the game first then listens to shiny sound.
-            // If there is any error generated when the game is running and is caught here,
-            // we just do nothing to handle the error as in the next iteration of run_iteration()
-            // the game will be immediately restarted.
-        }
-    }
-
-    env.update_stats();
-    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
-}
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_PostMMOSpawnReset.h b/SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_PostMMOSpawnReset.h
deleted file mode 100644
index d116229812..0000000000
--- a/SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_PostMMOSpawnReset.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*  Post MMO Spawn Reset
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonLA_PostMMOSpawnReset_H
-#define PokemonAutomation_PokemonLA_PostMMOSpawnReset_H
-
-#include "Common/Cpp/Options/TimeExpressionOption.h"
-#include "CommonFramework/Notifications/EventNotificationsTable.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-#include "PokemonLA/Options/PokemonLA_ShinyDetectedAction.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-
-class PostMMOSpawnReset_Descriptor : public SingleSwitchProgramDescriptor{
-public:
-    PostMMOSpawnReset_Descriptor();
-
-    class Stats;
-    virtual std::unique_ptr<StatsTracker> make_stats() const override;
-};
-
-
-class PostMMOSpawnReset : public SingleSwitchProgramInstance{
-public:
-    PostMMOSpawnReset();
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-    void run_iteration(SingleSwitchProgramEnvironment& env, BotBaseContext& context);
-
-private:
-    ShinyRequiresAudioText SHINY_REQUIRES_AUDIO;
-
-    TimeExpressionOption<int16_t> TURN_DURATION;
-    TimeExpressionOption<uint16_t> FORWARD_DURATION;
-    TimeExpressionOption<uint16_t> WAIT_DURATION;
-
-    ShinyDetectedActionOption SHINY_DETECTED;
-
-    EventNotificationOption NOTIFICATION_STATUS;
-    EventNotificationsOption NOTIFICATIONS;
-};
-
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_ShinyHunt-CustomPath.cpp b/SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_ShinyHunt-CustomPath.cpp
deleted file mode 100644
index 59860295bf..0000000000
--- a/SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_ShinyHunt-CustomPath.cpp
+++ /dev/null
@@ -1,342 +0,0 @@
-/*  Shiny Hunt - Custom Path
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/Exceptions/OperationFailedException.h"
-#include "CommonFramework/Notifications/ProgramNotifications.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
-#include "CommonFramework/Tools/StatsTracking.h"
-#include "NintendoSwitch/NintendoSwitch_Settings.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonLA/PokemonLA_Settings.h"
-#include "PokemonLA/Inference/Sounds/PokemonLA_ShinySoundDetector.h"
-#include "PokemonLA/Programs/PokemonLA_GameEntry.h"
-#include "PokemonLA/Programs/PokemonLA_RegionNavigation.h"
-#include "PokemonLA/Programs/PokemonLA_MountChange.h"
-#include "PokemonLA/Programs/PokemonLA_TimeOfDayChange.h"
-#include "PokemonLA_ShinyHunt-CustomPath.h"
-
-//#include <iostream>
-//using std::cout;
-//using std::endl;
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-    using namespace Pokemon;
-
-
-ShinyHuntCustomPath_Descriptor::ShinyHuntCustomPath_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonLA:ShinyHunt-CustomPath",
-        STRING_POKEMON + " LA", "Shiny Hunt - Custom Path",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonLA/ShinyHunt-CustomPath.md",
-        "Repeatedly travel on a custom path to shiny hunt " + STRING_POKEMON + " around it.",
-        FeedbackType::REQUIRED,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-class ShinyHuntCustomPath_Descriptor::Stats : public StatsTracker, public ShinyStatIncrementer{
-public:
-    Stats()
-        : attempts(m_stats["Attempts"])
-        , errors(m_stats["Errors"])
-        , shinies(m_stats["Shinies"])
-    {
-        m_display_order.emplace_back("Attempts");
-        m_display_order.emplace_back("Errors", true);
-        m_display_order.emplace_back("Shinies", true);
-    }
-    virtual void add_shiny() override{
-        shinies++;
-    }
-
-    std::atomic<uint64_t>& attempts;
-    std::atomic<uint64_t>& errors;
-    std::atomic<uint64_t>& shinies;
-};
-std::unique_ptr<StatsTracker> ShinyHuntCustomPath_Descriptor::make_stats() const{
-    return std::unique_ptr<StatsTracker>(new Stats());
-}
-
-
-ShinyHuntCustomPath::ShinyHuntCustomPath()
-    : TIME_OF_DAY(
-        "<b>Time of Day:</b><br>Reset time of day if <b>Reset Method</b> is Soft Reset. Use this to only hunt " + STRING_POKEMON
-        + " at day or night, or to avoid visual inference errors on white snow at daytime."
-    )
-    , RUNS_PER_TIME_RESET(
-        "<b>How Many Runs Before Resetting Time of Day:</b><br>To avoid too much time spent on resetting time of day, reset only every several runs.",
-        LockWhileRunning::LOCKED,
-        5, 1
-    )
-    , TEST_PATH(
-        "<b>Test Path:</b><br>Run the path immediately on the map to test it.",
-        LockWhileRunning::LOCKED,
-        false
-    )
-    , SHINY_DETECTED_ENROUTE(
-        "Enroute Shiny Action",
-        "This applies if a shiny is detected while you are ignoring shinies.",
-        "0 * TICKS_PER_SECOND"
-    )
-    , SHINY_DETECTED_DESTINATION(
-        "Destination Shiny Action",
-        "This applies if a shiny is detected while you are listening for shinies.",
-        "0 * TICKS_PER_SECOND"
-    )
-    , NOTIFICATION_STATUS("Status Update", true, false, std::chrono::seconds(3600))
-    , NOTIFICATIONS({
-        &NOTIFICATION_STATUS,
-        &SHINY_DETECTED_DESTINATION.NOTIFICATIONS,
-        &NOTIFICATION_PROGRAM_FINISH,
-        &NOTIFICATION_ERROR_RECOVERABLE,
-        &NOTIFICATION_ERROR_FATAL,
-    })
-{
-
-    PA_ADD_STATIC(SHINY_REQUIRES_AUDIO);
-//    PA_ADD_OPTION(TRAVEL_LOCATION);
-    PA_ADD_OPTION(PATH);
-    PA_ADD_OPTION(RESET_METHOD);
-    PA_ADD_OPTION(TIME_OF_DAY);
-    PA_ADD_OPTION(RUNS_PER_TIME_RESET);
-    PA_ADD_OPTION(TEST_PATH);
-    PA_ADD_OPTION(SHINY_DETECTED_ENROUTE);
-    PA_ADD_OPTION(SHINY_DETECTED_DESTINATION);
-    PA_ADD_OPTION(NOTIFICATIONS);
-}
-
-
-void ShinyHuntCustomPath::do_non_listen_action(ConsoleHandle& console, BotBaseContext& context, const CustomPathTableRow2& row){
-    console.log("Execute action " + row.action.current_display());
-    switch(row.action){
-    case PathAction::CHANGE_MOUNT:
-    {
-        MountState mountState = MountState::NOTHING;
-        switch(row.parameters.mount){
-        case PathMount::WYRDEER:
-            mountState = MountState::WYRDEER_ON;
-            break;
-        case PathMount::URSALUNA:
-            mountState = MountState::URSALUNA_ON;
-            break;
-        case PathMount::BASCULEGION:
-            mountState = MountState::BASCULEGION_ON;
-            break;
-        case PathMount::SNEASLER:
-            mountState = MountState::SNEASLER_ON;
-            break;
-        case PathMount::BRAVIARY:
-            mountState = MountState::BRAVIARY_ON;
-            break;
-        default:
-            break;
-        }
-
-        if (mountState == MountState::NOTHING){
-            dismount(console, context);
-        } else{
-            change_mount(console, context, mountState);
-        }
-        break;
-    }
-#if 0
-    case PathAction::ROTATE_CAMERA:
-    {
-        if (row.camera_turn_ticks > 0){
-            pbf_move_right_joystick(context, 255, 128, uint16_t(row.camera_turn_ticks), 0);
-        } else if (row.camera_turn_ticks < 0){
-            pbf_move_right_joystick(context, 0, 128, uint16_t(-row.camera_turn_ticks), 0);
-        }
-        break;
-    }
-#endif
-    case PathAction::MOVE_FORWARD:
-    {
-        switch(row.parameters.move_speed){
-        case PathSpeed::NORMAL_SPEED:
-            pbf_move_left_joystick(context, 128, 0, row.parameters.move_forward_ticks, 0);
-            break;
-        case PathSpeed::SLOW_SPEED:
-            pbf_move_left_joystick(context, 128, 64, row.parameters.move_forward_ticks, 0);
-            break;
-        case PathSpeed::RUN:
-            pbf_controller_state(context, BUTTON_LCLICK, DPAD_NONE, 128, 0, 128, 128, row.parameters.move_forward_ticks);
-            break;
-        case PathSpeed::DASH:
-            pbf_press_button(context, BUTTON_B, row.parameters.move_forward_ticks, 0);
-            break;
-        case PathSpeed::DASH_B_SPAM:
-            pbf_mash_button(context, BUTTON_B, row.parameters.move_forward_ticks);
-            break;
-        case PathSpeed::DIVE:
-            pbf_press_button(context, BUTTON_Y, row.parameters.move_forward_ticks, 0);
-            break;
-        }
-        break;
-    }
-    case PathAction::MOVE_IN_DIRECTION:
-    {
-        uint8_t x = (uint8_t)((row.parameters.left_x + 1.0) * 127.5 + 0.5);
-        uint8_t y = (uint8_t)((-row.parameters.left_y + 1.0) * 127.5 + 0.5);
-        pbf_move_left_joystick(context, x, y, row.parameters.move_forward_ticks, 0);
-        break;
-    }
-    case PathAction::CENTER_CAMERA:
-    {
-        pbf_mash_button(context, BUTTON_ZL, 200);
-        break;
-    }
-    case PathAction::JUMP:
-    {
-        pbf_press_button(context, BUTTON_Y, 10, row.parameters.jump_wait_ticks);
-        break;
-    }
-    case PathAction::WAIT:
-    {
-        pbf_wait(context, row.parameters.wait_ticks);
-        break;
-    }
-    default:
-        break;
-    } // end switch action
-    context.wait_for_all_requests();
-}
-
-
-void ShinyHuntCustomPath::run_path(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-
-    std::vector<std::unique_ptr<CustomPathTableRow2>> table = PATH.PATH.copy_snapshot();
-
-    //  Check whether the user has set shiny sound listen action:
-    {
-        bool has_listen_action = false;
-        for (const std::unique_ptr<CustomPathTableRow2>& row : table){
-            if (row->action == PathAction::START_LISTEN){
-                has_listen_action = true;
-                break;
-            }
-        }
-        if (has_listen_action == false){
-            throw UserSetupError(env.console, "No START LISTEN action specified.");
-        }
-    }
-
-    ShinyHuntCustomPath_Descriptor::Stats& stats = env.current_stats<ShinyHuntCustomPath_Descriptor::Stats>();
-
-    std::atomic<bool> listen_for_shiny(false);
-    float shiny_coefficient = 1.0;
-    ShinyDetectedActionOption* shiny_action = nullptr;
-    ShinySoundDetector shiny_detector(env.console, [&](float error_coefficient) -> bool{
-        //  Warning: This callback will be run from a different thread than this function.
-        stats.shinies++;
-        shiny_coefficient = error_coefficient;
-        if (listen_for_shiny.load(std::memory_order_acquire)){
-            shiny_action = &SHINY_DETECTED_DESTINATION;
-        }else{
-            shiny_action = &SHINY_DETECTED_ENROUTE;
-        }
-        return on_shiny_callback(env, env.console, *shiny_action, error_coefficient);
-    });
-
-    int ret = run_until(
-        env.console, context,
-        [&](BotBaseContext& context){
-            for (const std::unique_ptr<CustomPathTableRow2>& row : table){
-                if (row->action == PathAction::START_LISTEN){
-                    listen_for_shiny.store(true, std::memory_order_release);
-                    continue;
-                }else if (row->action == PathAction::END_LISTEN){
-                    listen_for_shiny.store(false, std::memory_order_release);
-                    continue;
-                }
-
-                do_non_listen_action(env.console, context, *row);
-                context.wait_for_all_requests();
-            }
-        },
-        {{shiny_detector}}
-    );
-    shiny_detector.throw_if_no_sound();
-    if (ret == 0){
-        on_shiny_sound(env, env.console, context, *shiny_action, shiny_coefficient);
-    }
-}
-
-
-void ShinyHuntCustomPath::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    ShinyHuntCustomPath_Descriptor::Stats& stats = env.current_stats<ShinyHuntCustomPath_Descriptor::Stats>();
-
-    //  Connect the controller.
-    pbf_press_button(context, BUTTON_LCLICK, 5, 5);
-
-    if (TEST_PATH){
-        // Run the test path immediately
-        env.log("Testing path...");
-        run_path(env, context);
-        return;
-    }
-
-    // How many runs so far after last time reset
-    uint32_t time_reset_run_count = 0;
-
-    while (true){
-        env.update_stats();
-        send_program_status_notification(env, NOTIFICATION_STATUS);
-        try{
-            stats.attempts++;
-
-            const TravelLocation location = PATH.travel_location();
-            goto_camp_from_jubilife(env, env.console, context, location);
-            run_path(env, context);
-            ++time_reset_run_count;
-
-            if(RESET_METHOD == ResetMethod::SoftReset){
-                env.console.log("Resetting by closing the game.");
-                pbf_press_button(context, BUTTON_HOME, 20, GameSettings::instance().GAME_TO_HOME_DELAY);
-                reset_game_from_home(env, env.console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST);
-            }else{
-                env.console.log("Resetting by going to village.");
-                goto_camp_from_overworld(env, env.console, context);
-
-                // Now we are at this camp
-                const Camp camp = map_region_default_camp(location.region);
-                TimeOfDay target_time = TIME_OF_DAY;
-                if (target_time != TimeOfDay::NONE && time_reset_run_count >= RUNS_PER_TIME_RESET){
-                    env.log("Reset time to " + TIME_OF_DAY_NAMES[int(target_time)]);
-                    time_reset_run_count = 0;
-                    change_time_of_day_at_tent(env.console, context, target_time, camp);
-                    // Reset location again since we now are at the tent, not the camp warp spot
-                    goto_camp_from_overworld(env, env.console, context);
-                }
-                goto_professor(env.console.logger(), context, camp);
-                from_professor_return_to_jubilife(env, env.console, context);
-            }
-
-        }catch (OperationFailedException& e){
-            stats.errors++;
-            e.send_notification(env, NOTIFICATION_ERROR_RECOVERABLE);
-
-            time_reset_run_count = 0;
-            pbf_press_button(context, BUTTON_HOME, 20, GameSettings::instance().GAME_TO_HOME_DELAY);
-            reset_game_from_home(env, env.console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST);
-        }
-
-    }
-
-    env.update_stats();
-    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
-}
-
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_ShinyHunt-CustomPath.h b/SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_ShinyHunt-CustomPath.h
deleted file mode 100644
index e61733d07d..0000000000
--- a/SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_ShinyHunt-CustomPath.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*  Shiny Hunt - Custom Path
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonLA_ShinyHuntCustomPath_H
-#define PokemonAutomation_PokemonLA_ShinyHuntCustomPath_H
-
-#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
-#include "Common/Cpp/Options/SimpleIntegerOption.h"
-#include "Common/Cpp/Options/FloatingPointOption.h"
-#include "CommonFramework/Notifications/EventNotificationsTable.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-#include "PokemonLA/PokemonLA_Locations.h"
-#include "PokemonLA/PokemonLA_TravelLocations.h"
-#include "PokemonLA/Options/PokemonLA_MiscOptions.h"
-#include "PokemonLA/Options/PokemonLA_ShinyDetectedAction.h"
-#include "PokemonLA/Options/PokemonLA_TravelLocation.h"
-#include "PokemonLA/Options/PokemonLA_CustomPathTable.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-
-
-class ShinyHuntCustomPath_Descriptor : public SingleSwitchProgramDescriptor{
-public:
-    ShinyHuntCustomPath_Descriptor();
-
-    class Stats;
-    virtual std::unique_ptr<StatsTracker> make_stats() const override;
-};
-
-
-class ShinyHuntCustomPath : public SingleSwitchProgramInstance{
-public:
-    ShinyHuntCustomPath();
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-    // Run the custom path on overworld.
-    void run_path(SingleSwitchProgramEnvironment& env, BotBaseContext& context);
-
-    // Do one action (while ignoring listen-related actions)
-    void do_non_listen_action(ConsoleHandle& console, BotBaseContext& context, const CustomPathTableRow2& row);
-
-private:
-    ShinyRequiresAudioText SHINY_REQUIRES_AUDIO;
-
-//    TravelLocationOption TRAVEL_LOCATION;
-
-    CustomPathTable PATH;
-
-    ResetMethodOption RESET_METHOD;
-
-    TimeOfDayOption TIME_OF_DAY;
-    SimpleIntegerOption<uint32_t> RUNS_PER_TIME_RESET;
-
-    BooleanCheckBoxOption TEST_PATH;
-
-    ShinyDetectedActionOption SHINY_DETECTED_ENROUTE;
-    ShinyDetectedActionOption SHINY_DETECTED_DESTINATION;
-
-    EventNotificationOption NOTIFICATION_STATUS;
-    EventNotificationsOption NOTIFICATIONS;
-};
-
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_ShinyHunt-FlagPin.cpp b/SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_ShinyHunt-FlagPin.cpp
deleted file mode 100644
index 2c4bd9b942..0000000000
--- a/SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_ShinyHunt-FlagPin.cpp
+++ /dev/null
@@ -1,217 +0,0 @@
-/*  Shiny Hunt - Fixed Point
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/Exceptions/OperationFailedException.h"
-#include "CommonFramework/Notifications/ProgramNotifications.h"
-#include "CommonFramework/Tools/StatsTracking.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
-#include "NintendoSwitch/NintendoSwitch_Settings.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonLA/PokemonLA_Settings.h"
-#include "PokemonLA/Inference/Sounds/PokemonLA_ShinySoundDetector.h"
-#include "PokemonLA/Programs/PokemonLA_GameEntry.h"
-#include "PokemonLA/Programs/PokemonLA_RegionNavigation.h"
-#include "PokemonLA/Programs/PokemonLA_FlagNavigationAir.h"
-#include "PokemonLA_ShinyHunt-FlagPin.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-    using namespace Pokemon;
-
-
-
-ShinyHuntFlagPin_Descriptor::ShinyHuntFlagPin_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonLA:ShinyHunt-FlagPin",
-        STRING_POKEMON + " LA", "Shiny Hunt - Flag Pin",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonLA/ShinyHunt-FlagPin.md",
-        "Repeatedly travel to a flag pin to shiny hunt " + STRING_POKEMON + " around it.",
-        FeedbackType::REQUIRED,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-class ShinyHuntFlagPin_Descriptor::Stats : public StatsTracker, public ShinyStatIncrementer{
-public:
-    Stats()
-        : attempts(m_stats["Attempts"])
-        , errors(m_stats["Errors"])
-        , shinies(m_stats["Shinies"])
-    {
-        m_display_order.emplace_back("Attempts");
-        m_display_order.emplace_back("Errors", true);
-        m_display_order.emplace_back("Shinies", true);
-    }
-    virtual void add_shiny() override{
-        shinies++;
-    }
-
-    std::atomic<uint64_t>& attempts;
-    std::atomic<uint64_t>& errors;
-    std::atomic<uint64_t>& shinies;
-};
-std::unique_ptr<StatsTracker> ShinyHuntFlagPin_Descriptor::make_stats() const{
-    return std::unique_ptr<StatsTracker>(new Stats());
-}
-
-
-ShinyHuntFlagPin::ShinyHuntFlagPin()
-    : ENROUTE_DISTANCE(
-        "<b>Enroute Distance:</b><br>"
-        "You are considered \"enroute\" if you are further than this distance from the flag.<br><br>"
-        "<font color=\"red\">If you wish to ignore enroute shinies, scroll down to "
-        "\"Enroute Shiny Action\" and set it to ignore shinies. "
-        "Keep in mind that the shiny sound radius is 30 and you will need some headroom.</font>",
-        LockWhileRunning::LOCKED,
-        60
-    )
-    , SHINY_DETECTED_ENROUTE(
-        "Enroute Shiny Action",
-        "This applies if a shiny is detected while enroute to the flag. (defined as being more than the \"Enroute Distance\" specified above)",
-        "0 * TICKS_PER_SECOND"
-    )
-    , SHINY_DETECTED_DESTINATION(
-        "Destination Shiny Action",
-        "This applies if a shiny is detected at or near the flag. (defined as being less than the \"Enroute Distance\" specified above)",
-        "0 * TICKS_PER_SECOND"
-    )
-    , NOTIFICATION_STATUS("Status Update", true, false, std::chrono::seconds(3600))
-    , NOTIFICATIONS({
-        &NOTIFICATION_STATUS,
-        &SHINY_DETECTED_ENROUTE.NOTIFICATIONS,
-        &SHINY_DETECTED_DESTINATION.NOTIFICATIONS,
-        &NOTIFICATION_PROGRAM_FINISH,
-        &NOTIFICATION_ERROR_RECOVERABLE,
-        &NOTIFICATION_ERROR_FATAL,
-    })
-    , m_advanced_options(
-        "<font size=4><b>Advanced Options:</b> You should not need to touch anything below here.</font>"
-    )
-    , STOP_DISTANCE(
-        "<b>Stop Distance:</b><br>"
-        "Reset the game when you come within this distance of the flag. "
-        "Don't set this too small. The navigation is not precise enough to land directly on the flag.",
-        LockWhileRunning::LOCKED,
-        20
-    )
-    , FLAG_REACHED_DELAY(
-        "<b>Target Reached Delay:</b><br>"
-        "Once you have reached the flag, wait this many seconds to ensure everything loads and that any shinies are heard before resetting.",
-        LockWhileRunning::LOCKED,
-        1.0, 0, 60
-    )
-    , NAVIGATION_TIMEOUT(
-        "<b>Navigation Timeout:</b><br>Give up and reset if flag is not reached after this many seconds.",
-        LockWhileRunning::LOCKED,
-        180, 0
-    )
-{
-    PA_ADD_STATIC(SHINY_REQUIRES_AUDIO);
-    PA_ADD_OPTION(TRAVEL_LOCATION);
-    PA_ADD_OPTION(ENROUTE_DISTANCE);
-    PA_ADD_OPTION(RESET_METHOD);
-    PA_ADD_OPTION(SHINY_DETECTED_ENROUTE);
-    PA_ADD_OPTION(SHINY_DETECTED_DESTINATION);
-    PA_ADD_OPTION(NOTIFICATIONS);
-    PA_ADD_STATIC(m_advanced_options);
-    PA_ADD_OPTION(STOP_DISTANCE);
-    PA_ADD_OPTION(FLAG_REACHED_DELAY);
-    PA_ADD_OPTION(NAVIGATION_TIMEOUT);
-}
-
-
-
-void ShinyHuntFlagPin::run_iteration(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    ShinyHuntFlagPin_Descriptor::Stats& stats = env.current_stats<ShinyHuntFlagPin_Descriptor::Stats>();
-    stats.attempts++;
-
-    {
-        std::atomic<double> flag_distance(10000);
-
-        float shiny_coefficient = 1.0;
-        ShinyDetectedActionOption* shiny_action = nullptr;
-
-        ShinySoundDetector shiny_detector(env.console, [&](float error_coefficient) -> bool{
-            //  Warning: This callback will be run from a different thread than this function.
-            stats.shinies++;
-            shiny_coefficient = error_coefficient;
-            if (flag_distance.load(std::memory_order_acquire) <= ENROUTE_DISTANCE){
-                shiny_action = &SHINY_DETECTED_DESTINATION;
-            }else{
-                shiny_action = &SHINY_DETECTED_ENROUTE;
-            }
-            return on_shiny_callback(env, env.console, *shiny_action, error_coefficient);
-        });
-
-        int ret = run_until(
-            env.console, context,
-            [&](BotBaseContext& context){
-                goto_camp_from_jubilife(env, env.console, context, TRAVEL_LOCATION);
-                FlagNavigationAir session(
-                    env, env.console, context,
-                    STOP_DISTANCE,
-                    FLAG_REACHED_DELAY,
-                    std::chrono::seconds(NAVIGATION_TIMEOUT)
-                );
-                session.set_distance_callback([&](double distance){
-                    flag_distance.store(distance, std::memory_order_release);
-                });
-                session.run_session();
-            },
-            {{shiny_detector}}
-        );
-        shiny_detector.throw_if_no_sound();
-        if (ret == 0){
-            on_shiny_sound(env, env.console, context, *shiny_action, shiny_coefficient);
-        }
-
-        if(RESET_METHOD == ResetMethod::SoftReset){
-            env.console.log("Resetting by closing the game.");
-            pbf_press_button(context, BUTTON_HOME, 20, GameSettings::instance().GAME_TO_HOME_DELAY);
-            reset_game_from_home(env, env.console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST);
-        }else{
-            env.console.log("Resetting by going to village.");
-            goto_camp_from_overworld(env, env.console, context);
-            goto_professor(env.console.logger(), context, TRAVEL_LOCATION);
-            from_professor_return_to_jubilife(env, env.console, context);
-        }
-    }
-}
-
-
-void ShinyHuntFlagPin::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    ShinyHuntFlagPin_Descriptor::Stats& stats = env.current_stats<ShinyHuntFlagPin_Descriptor::Stats>();
-
-    //  Connect the controller.
-    pbf_press_button(context, BUTTON_LCLICK, 5, 5);
-
-    while (true){
-        env.update_stats();
-        send_program_status_notification(env, NOTIFICATION_STATUS);
-        try{
-            run_iteration(env, context);
-        }catch (OperationFailedException& e){
-            stats.errors++;
-            e.send_notification(env, NOTIFICATION_ERROR_RECOVERABLE);
-
-            pbf_press_button(context, BUTTON_HOME, 20, GameSettings::instance().GAME_TO_HOME_DELAY);
-            reset_game_from_home(env, env.console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST);
-        }
-    }
-
-    env.update_stats();
-    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
-}
-
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_ShinyHunt-FlagPin.h b/SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_ShinyHunt-FlagPin.h
deleted file mode 100644
index 3296408259..0000000000
--- a/SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_ShinyHunt-FlagPin.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*  Shiny Hunt - Fixed Point
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonLA_ShinyHuntFlagPin_H
-#define PokemonAutomation_PokemonLA_ShinyHuntFlagPin_H
-
-#include "Common/Cpp/Options/SimpleIntegerOption.h"
-#include "Common/Cpp/Options/FloatingPointOption.h"
-#include "CommonFramework/Notifications/EventNotificationsTable.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-#include "PokemonLA/PokemonLA_Locations.h"
-#include "PokemonLA/PokemonLA_TravelLocations.h"
-#include "PokemonLA/Options/PokemonLA_MiscOptions.h"
-#include "PokemonLA/Options/PokemonLA_ShinyDetectedAction.h"
-#include "PokemonLA/Options/PokemonLA_TravelLocation.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-
-class ShinyHuntFlagPin_Descriptor : public SingleSwitchProgramDescriptor{
-public:
-    ShinyHuntFlagPin_Descriptor();
-
-    class Stats;
-    virtual std::unique_ptr<StatsTracker> make_stats() const override;
-};
-
-
-class ShinyHuntFlagPin : public SingleSwitchProgramInstance{
-public:
-    ShinyHuntFlagPin();
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-    void run_iteration(SingleSwitchProgramEnvironment& env, BotBaseContext& context);
-
-private:
-    ShinyRequiresAudioText SHINY_REQUIRES_AUDIO;
-
-    TravelLocationOption TRAVEL_LOCATION;
-
-    SimpleIntegerOption<uint16_t> ENROUTE_DISTANCE;
-
-    ResetMethodOption RESET_METHOD;
-
-    ShinyDetectedActionOption SHINY_DETECTED_ENROUTE;
-    ShinyDetectedActionOption SHINY_DETECTED_DESTINATION;
-
-    EventNotificationOption NOTIFICATION_STATUS;
-    EventNotificationsOption NOTIFICATIONS;
-
-    SectionDividerOption m_advanced_options;
-    SimpleIntegerOption<uint16_t> STOP_DISTANCE;
-    FloatingPointOption FLAG_REACHED_DELAY;
-    SimpleIntegerOption<uint64_t> NAVIGATION_TIMEOUT;
-};
-
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_ShinyHunt-LakeTrio.cpp b/SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_ShinyHunt-LakeTrio.cpp
deleted file mode 100644
index ba175aee8a..0000000000
--- a/SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_ShinyHunt-LakeTrio.cpp
+++ /dev/null
@@ -1,249 +0,0 @@
-/*  Shiny Hunt - Legendary Reset
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <cmath>
-#include "CommonFramework/Exceptions/OperationFailedException.h"
-#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
-#include "CommonFramework/Notifications/ProgramNotifications.h"
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
-#include "CommonFramework/Tools/ErrorDumper.h"
-#include "NintendoSwitch/NintendoSwitch_Settings.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "Pokemon/Pokemon_Notification.h"
-#include "Pokemon/Inference/Pokemon_NameReader.h"
-#include "PokemonSwSh/ShinyHuntTracker.h"
-#include "PokemonLA/PokemonLA_Settings.h"
-#include "PokemonLA/Inference/Objects/PokemonLA_ArcDetector.h"
-#include "PokemonLA/Inference/Objects/PokemonLA_ShinySymbolDetector.h"
-#include "PokemonLA/Programs/PokemonLA_GameEntry.h"
-#include "PokemonLA_ShinyHunt-LakeTrio.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-    using namespace Pokemon;
-
-
-ShinyHuntLakeTrio_Descriptor::ShinyHuntLakeTrio_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonLA:ShinyHunt-LakeTrio",
-        STRING_POKEMON + " LA", "Shiny Hunt - Lake Trio",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonLA/ShinyHunt-LakeTrio.md",
-        "Shiny hunt the lake trio legendaries.",
-        FeedbackType::REQUIRED,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-std::unique_ptr<StatsTracker> ShinyHuntLakeTrio_Descriptor::make_stats() const{
-    return std::unique_ptr<StatsTracker>(new PokemonSwSh::ShinyHuntTracker(false));
-}
-
-
-ShinyHuntLakeTrio::ShinyHuntLakeTrio()
-    : VIDEO_ON_SHINY(
-        "<b>Video Capture:</b><br>Take a video of the encounter if it is shiny.",
-        LockWhileRunning::LOCKED,
-        true
-    )
-    , NOTIFICATION_NONSHINY(
-        "Non-Shiny Encounter",
-        true, false,
-        {"Notifs"},
-        std::chrono::seconds(3600)
-    )
-    , NOTIFICATION_SHINY(
-        "Shiny Encounter",
-        true, true, ImageAttachmentMode::JPG,
-        {"Notifs", "Showcase"}
-    )
-    , NOTIFICATIONS({
-        &NOTIFICATION_NONSHINY,
-        &NOTIFICATION_SHINY,
-        &NOTIFICATION_ERROR_RECOVERABLE,
-        &NOTIFICATION_ERROR_FATAL,
-    })
-{
-//    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
-
-    PA_ADD_OPTION(LANGUAGE);
-
-//    PA_ADD_OPTION(ENCOUNTER_BOT_OPTIONS);
-    PA_ADD_OPTION(NOTIFICATIONS);
-}
-
-
-
-std::set<std::string> read_name(
-    Logger& logger,
-    Language language,
-    const ImageViewRGB32& screen, const ImageFloatBox& box
-){
-    if (language == Language::None){
-        return {};
-    }
-
-
-    ImageViewRGB32 image = extract_box_reference(screen, box);
-    OCR::StringMatchResult result = Pokemon::PokemonNameReader::instance().read_substring(
-        logger, language, image,
-        OCR::WHITE_TEXT_FILTERS()
-    );
-    result.clear_beyond_log10p(Pokemon::PokemonNameReader::MAX_LOG10P);
-
-    std::set<std::string> ret;
-    if (result.results.empty()){
-        dump_image(
-            logger, ProgramInfo(),
-            "NameOCR-" + language_data(language).code,
-            screen
-        );
-    }else{
-        for (const auto& item : result.results){
-            ret.insert(item.second.token);
-        }
-    }
-    return ret;
-}
-
-
-
-void ShinyHuntLakeTrio::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    PokemonSwSh::ShinyHuntTracker& stats = env.current_stats<PokemonSwSh::ShinyHuntTracker>();
-
-
-    //  Connect the controller.
-    pbf_press_button(context, BUTTON_B, 5, 5);
-
-    size_t consecutive_errors = 0;
-
-    bool reset = false;
-    while (true){
-        env.update_stats();
-
-        if (reset){
-            pbf_press_button(context, BUTTON_HOME, 10, GameSettings::instance().GAME_TO_HOME_DELAY);
-            if (!reset_game_from_home(env, env.console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST)){
-                stats.add_error();
-                continue;
-            }
-        }
-        reset = true;
-
-        env.console.log("Entering cave...");
-        pbf_move_left_joystick(context, 160, 0, 50, 0);
-        pbf_move_left_joystick(context, 96, 0, 50, 0);
-        pbf_move_left_joystick(context, 160, 0, 50, 0);
-        pbf_move_left_joystick(context, 96, 0, 50, 0);
-        pbf_mash_button(context, BUTTON_A, 125);
-        context.wait_for_all_requests();
-
-
-        env.console.log("Waiting for a target to appear...");
-        {
-            ArcDetector arcs;
-            WhiteObjectWatcher watcher(
-                env.console,
-                {0, 0, 1, 1},
-                {{arcs, true}}
-            );
-            int ret = run_until(
-                env.console, context,
-                [](BotBaseContext& context){
-                    pbf_mash_button(context, BUTTON_B, 60 * TICKS_PER_SECOND);
-                },
-                {{watcher}}
-            );
-            if (ret < 0){
-                VideoSnapshot screen = env.console.video().snapshot();
-                env.log("No encounter detected after 60 seconds.", COLOR_RED);
-                stats.add_error();
-                dump_image(
-                    env.logger(), ProgramInfo(),
-                    "NoEncounter",
-                    screen
-                );
-                send_program_recoverable_error_notification(
-                    env, NOTIFICATION_ERROR_RECOVERABLE,
-                    "No encounter detected after 60 seconds."
-                );
-                consecutive_errors++;
-                if (consecutive_errors >= 3){
-                    throw OperationFailedException(
-                        ErrorReport::SEND_ERROR_REPORT, env.console,
-                        "Failed to detect an encounter 3 times in the row.",
-                        true
-                    );
-                }
-                continue;
-            }
-        }
-
-        env.console.log("Locking on and searching for shiny symbol...");
-        {
-            ArcDetector arcs;
-            WhiteObjectWatcher watcher(
-                env.console,
-                {0, 0, 1, 1},
-                {{arcs, false}}
-            );
-            ShinySymbolWaiter shiny_symbol(env.console, SHINY_SYMBOL_BOX_BOTTOM);
-            int ret = run_until(
-                env.console, context,
-                [](BotBaseContext& context){
-                    pbf_press_button(context, BUTTON_ZL, 3 * TICKS_PER_SECOND, 0);
-                },
-                {
-                    {watcher},
-                    {shiny_symbol},
-                }
-            );
-            VideoSnapshot screen = env.console.video().snapshot();
-            std::set<std::string> slugs = read_name(env.logger(), LANGUAGE, screen, {0.11, 0.868, 0.135, 0.043});
-
-            if (ret < 0){
-                stats.add_non_shiny();
-                env.log("Not shiny.", COLOR_PURPLE);
-                send_encounter_notification(
-                    env,
-                    NOTIFICATION_NONSHINY,
-                    NOTIFICATION_SHINY,
-                    true, false, {{std::move(slugs), ShinyType::NOT_SHINY}}, std::nan(""),
-                    screen
-                );
-            }else{
-                stats.add_unknown_shiny();
-                env.log("Detected Shiny!", COLOR_BLUE);
-                send_encounter_notification(
-                    env,
-                    NOTIFICATION_NONSHINY,
-                    NOTIFICATION_SHINY,
-                    true, true, {{std::move(slugs), ShinyType::UNKNOWN_SHINY}}, std::nan(""),
-                    screen
-                );
-                if (VIDEO_ON_SHINY){
-//                    pbf_wait(context, 5 * TICKS_PER_SECOND);
-                    pbf_press_button(context, BUTTON_CAPTURE, 2 * TICKS_PER_SECOND, 0);
-                }
-                break;
-            }
-        }
-
-    }
-
-    env.update_stats();
-    pbf_press_button(context, BUTTON_HOME, 10, GameSettings::instance().GAME_TO_HOME_DELAY);
-
-//    GO_HOME_WHEN_DONE.run_end_of_program(context);
-}
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_ShinyHunt-LakeTrio.h b/SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_ShinyHunt-LakeTrio.h
deleted file mode 100644
index c595d386b6..0000000000
--- a/SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_ShinyHunt-LakeTrio.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*  Shiny Hunt - Lake Trio
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonLA_ShinyHuntLakeTrio_H
-#define PokemonAutomation_PokemonLA_ShinyHuntLakeTrio_H
-
-#include "CommonFramework/Notifications/EventNotificationsTable.h"
-#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-#include "Pokemon/Options/Pokemon_EncounterBotOptions.h"
-//#include "PokemonBDSP/Options/PokemonBDSP_EncounterBotCommon.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-
-class ShinyHuntLakeTrio_Descriptor : public SingleSwitchProgramDescriptor{
-public:
-    ShinyHuntLakeTrio_Descriptor();
-
-    virtual std::unique_ptr<StatsTracker> make_stats() const override;
-};
-
-
-class ShinyHuntLakeTrio : public SingleSwitchProgramInstance{
-public:
-    ShinyHuntLakeTrio();
-
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-
-private:
-//    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
-
-    Pokemon::EncounterBotLanguage LANGUAGE;
-
-    BooleanCheckBoxOption VIDEO_ON_SHINY;
-
-//    EncounterBotCommonOptions ENCOUNTER_BOT_OPTIONS;
-    EventNotificationOption NOTIFICATION_NONSHINY;
-    EventNotificationOption NOTIFICATION_SHINY;
-
-    EventNotificationsOption NOTIFICATIONS;
-};
-
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_UnownFinder.cpp b/SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_UnownFinder.cpp
deleted file mode 100644
index 8f3559782b..0000000000
--- a/SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_UnownFinder.cpp
+++ /dev/null
@@ -1,200 +0,0 @@
-/*  Unown Finder
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/Exceptions/OperationFailedException.h"
-#include "CommonFramework/Notifications/ProgramNotifications.h"
-#include "CommonFramework/Tools/StatsTracking.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
-#include "CommonFramework/Inference/BlackScreenDetector.h"
-#include "NintendoSwitch/NintendoSwitch_Settings.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonLA/PokemonLA_Settings.h"
-#include "PokemonLA/PokemonLA_TravelLocations.h"
-#include "PokemonLA/Inference/Objects/PokemonLA_ButtonDetector.h"
-#include "PokemonLA/Inference/Map/PokemonLA_MapDetector.h"
-#include "PokemonLA/Inference/PokemonLA_DialogDetector.h"
-#include "PokemonLA/Inference/PokemonLA_OverworldDetector.h"
-#include "PokemonLA/Inference/PokemonLA_UnderAttackDetector.h"
-#include "PokemonLA/Inference/Sounds/PokemonLA_ShinySoundDetector.h"
-#include "PokemonLA/Programs/PokemonLA_MountChange.h"
-#include "PokemonLA/Programs/PokemonLA_GameEntry.h"
-#include "PokemonLA/Programs/PokemonLA_RegionNavigation.h"
-#include "PokemonLA/Programs/ShinyHunting/PokemonLA_UnownFinder.h"
-
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-    using namespace Pokemon;
-
-
-
-UnownFinder_Descriptor::UnownFinder_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonLA:UnownFinder",
-        STRING_POKEMON + " LA", "Unown Hunter",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonLA/UnownHunter.md",
-        "Constantly reset to find a Shiny Unown or any Shiny in the path.",
-        FeedbackType::REQUIRED,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-class UnownFinder_Descriptor::Stats : public StatsTracker, public ShinyStatIncrementer{
-public:
-    Stats()
-        : attempts(m_stats["Attempts"])
-        , errors(m_stats["Errors"])
-        , shinies(m_stats["Shinies"])
-    {
-        m_display_order.emplace_back("Attempts");
-        m_display_order.emplace_back("Errors", true);
-        m_display_order.emplace_back("Shinies", true);
-    }
-    virtual void add_shiny() override{
-        shinies++;
-    }
-
-    std::atomic<uint64_t>& attempts;
-    std::atomic<uint64_t>& errors;
-    std::atomic<uint64_t>& shinies;
-};
-std::unique_ptr<StatsTracker> UnownFinder_Descriptor::make_stats() const{
-    return std::unique_ptr<StatsTracker>(new Stats());
-}
-
-
-
-
-UnownFinder::UnownFinder()
-    : SHINY_DETECTED_ENROUTE(
-        "Enroute Shiny Action",
-        "This applies if a shiny is detected while enroute to the ruins.",
-        "0 * TICKS_PER_SECOND"
-    )
-    , SHINY_DETECTED_DESTINATION(
-        "Destination Shiny Action",
-        "This applies if a shiny is detected inside the ruins.",
-        "0 * TICKS_PER_SECOND"
-    )
-    , NOTIFICATION_STATUS("Status Update", true, false, std::chrono::seconds(3600))
-    , NOTIFICATIONS({
-        &NOTIFICATION_STATUS,
-        &SHINY_DETECTED_ENROUTE.NOTIFICATIONS,
-        &SHINY_DETECTED_DESTINATION.NOTIFICATIONS,
-        &NOTIFICATION_PROGRAM_FINISH,
-        &NOTIFICATION_ERROR_RECOVERABLE,
-        &NOTIFICATION_ERROR_FATAL,
-    })
-{
-    PA_ADD_STATIC(SHINY_REQUIRES_AUDIO);
-    PA_ADD_OPTION(SHINY_DETECTED_ENROUTE);
-    PA_ADD_OPTION(SHINY_DETECTED_DESTINATION);
-    PA_ADD_OPTION(NOTIFICATIONS);
-}
-
-
-void ruins_entrance_route(BotBaseContext& context){
-    pbf_wait(context, (uint16_t)(0.5 * TICKS_PER_SECOND));
-    pbf_move_left_joystick(context, 139, 120, 10, 10);
-    pbf_wait(context, (uint16_t)(1.3 * TICKS_PER_SECOND));
-
-    pbf_press_button(context, BUTTON_B, (uint16_t)(9.5 * TICKS_PER_SECOND), 10);
-    pbf_wait(context, (uint16_t)(0.8 * TICKS_PER_SECOND));
-    pbf_move_left_joystick(context, 110, 90, 20, 10);
-
-    pbf_press_dpad(context, DPAD_LEFT, 10, 10);
-    pbf_press_button(context, BUTTON_PLUS, 10, 10);
-}
-
-void enter_ruins(BotBaseContext& context){
-    pbf_press_button(context, BUTTON_B, (uint16_t)(4 * TICKS_PER_SECOND), 10);
-    pbf_wait(context, (uint16_t)(1.5 * TICKS_PER_SECOND));
-    pbf_move_left_joystick(context, 128, 255, 10, 0);
-    pbf_press_button(context, BUTTON_B, (uint16_t)(2 * TICKS_PER_SECOND), 10);
-}
-
-
-void UnownFinder::run_iteration(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    UnownFinder_Descriptor::Stats& stats = env.current_stats<UnownFinder_Descriptor::Stats>();
-
-    stats.attempts++;
-
-    goto_camp_from_jubilife(env, env.console, context, TravelLocations::instance().Mirelands_Mirelands);
-
-    change_mount(env.console, context, MountState::BRAVIARY_ON);
-
-    // Start path
-    env.console.log("Beginning Shiny Detection...");
-    {
-        float shiny_coefficient = 1.0;
-        std::atomic<ShinyDetectedActionOption*> shiny_action(&SHINY_DETECTED_ENROUTE);
-
-        ShinySoundDetector shiny_detector(env.console, [&](float error_coefficient) -> bool{
-            //  Warning: This callback will be run from a different thread than this function.
-            stats.shinies++;
-            shiny_coefficient = error_coefficient;
-            ShinyDetectedActionOption* action = shiny_action.load(std::memory_order_acquire);
-            return on_shiny_callback(env, env.console, *action, error_coefficient);
-        });
-
-        int ret = run_until(
-            env.console, context,
-            [&](BotBaseContext& context){
-                ruins_entrance_route(context);
-
-                context.wait_for_all_requests();
-                shiny_action.store(&SHINY_DETECTED_DESTINATION, std::memory_order_release);
-
-                enter_ruins(context);
-            },
-            {{shiny_detector}}
-        );
-        shiny_detector.throw_if_no_sound();
-        if (ret == 0){
-            ShinyDetectedActionOption* action = shiny_action.load(std::memory_order_acquire);
-            on_shiny_sound(env, env.console, context, *action, shiny_coefficient);
-        }
-    };
-
-    env.console.log("No shiny detected, returning to Jubilife!");
-    goto_camp_from_overworld(env, env.console, context);
-    pbf_press_dpad(context, DPAD_RIGHT, 10, 10);
-    goto_professor(env.console, context, Camp::MIRELANDS_MIRELANDS);
-    from_professor_return_to_jubilife(env, env.console, context);
-}
-
-
-void UnownFinder::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    UnownFinder_Descriptor::Stats& stats = env.current_stats<UnownFinder_Descriptor::Stats>();
-
-    //  Connect the controller.
-    pbf_press_button(context, BUTTON_LCLICK, 5, 5);
-
-    while (true){
-        env.update_stats();
-        send_program_status_notification(env, NOTIFICATION_STATUS);
-        try{
-            run_iteration(env, context);
-        }catch (OperationFailedException& e){
-            stats.errors++;
-            e.send_notification(env, NOTIFICATION_ERROR_RECOVERABLE);
-
-            pbf_press_button(context, BUTTON_HOME, 20, GameSettings::instance().GAME_TO_HOME_DELAY);
-            reset_game_from_home(env, env.console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST);
-        }
-    }
-
-    env.update_stats();
-    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
-}
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_UnownFinder.h b/SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_UnownFinder.h
deleted file mode 100644
index f2520664b0..0000000000
--- a/SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_UnownFinder.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*  Unown Hunter
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonLA_UnownFinder_H
-#define PokemonAutomation_PokemonLA_UnownFinder_H
-#include "CommonFramework/Notifications/EventNotificationsTable.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-#include "PokemonLA/Options/PokemonLA_ShinyDetectedAction.h"
-#include "PokemonLA/Inference/PokemonLA_MountDetector.h"
-#include "PokemonLA/Inference/PokemonLA_UnderAttackDetector.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-class UnownFinder_Descriptor : public SingleSwitchProgramDescriptor{
-public:
-    UnownFinder_Descriptor();
-
-    class Stats;
-    virtual std::unique_ptr<StatsTracker> make_stats() const override;
-};
-
-class UnownFinder : public SingleSwitchProgramInstance{
-public:
-    UnownFinder();
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-    void run_iteration(SingleSwitchProgramEnvironment& env, BotBaseContext& context);
-
-private:
-    class RunRoute;
-
-    ShinyRequiresAudioText SHINY_REQUIRES_AUDIO;
-
-    ShinyDetectedActionOption SHINY_DETECTED_ENROUTE;
-    ShinyDetectedActionOption SHINY_DETECTED_DESTINATION;
-
-    EventNotificationOption NOTIFICATION_STATUS;
-    EventNotificationsOption NOTIFICATIONS;
-};
-
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonLA/Programs/TestPrograms/PokemonLA_FlagNavigationTest.cpp b/SerialPrograms/Source/PokemonLA/Programs/TestPrograms/PokemonLA_FlagNavigationTest.cpp
deleted file mode 100644
index 6e8d1e242d..0000000000
--- a/SerialPrograms/Source/PokemonLA/Programs/TestPrograms/PokemonLA_FlagNavigationTest.cpp
+++ /dev/null
@@ -1,75 +0,0 @@
-/*  Flag Navigation Test
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/Globals.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonLA/Programs/PokemonLA_FlagNavigationAir.h"
-#include "PokemonLA_FlagNavigationTest.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-    using namespace Pokemon;
-
-
-FlagNavigationTest_Descriptor::FlagNavigationTest_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonLA:FlagNavigationTest",
-        STRING_POKEMON + " LA", "Flag Navigation Test",
-        "",
-        "Navigate to the flag pin.",
-        FeedbackType::REQUIRED,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-
-
-FlagNavigationTest::FlagNavigationTest()
-    : STOP_DISTANCE(
-        "<b>Stop Distance:</b><br>"
-        "You have reached the flag when you come within this distance of it. "
-        "Don't set this too small. The navigation is not precise enough to land directly on the flag.",
-        LockWhileRunning::LOCKED,
-        20
-    )
-    , FLAG_REACHED_DELAY(
-        "<b>Target Reached Delay:</b><br>"
-        "Once you have reached the flag, wait this many seconds to ensure everything loads and that any shinies are heard before resetting.",
-        LockWhileRunning::LOCKED,
-        1.0, 0, 60
-    )
-    , NAVIGATION_TIMEOUT(
-        "<b>Navigation Timeout:</b><br>Give up if flag is not reached after this many seconds.",
-        LockWhileRunning::LOCKED,
-        180, 0
-    )
-{
-    PA_ADD_OPTION(STOP_DISTANCE);
-    PA_ADD_OPTION(FLAG_REACHED_DELAY);
-    PA_ADD_OPTION(NAVIGATION_TIMEOUT);
-//    PA_ADD_OPTION(SHINY_DETECTED);
-}
-
-
-void FlagNavigationTest::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-
-    FlagNavigationAir session(
-        env, env.console, context,
-//        SHINY_DETECTED.stop_on_shiny(),
-        STOP_DISTANCE,
-        FLAG_REACHED_DELAY,
-        std::chrono::seconds(NAVIGATION_TIMEOUT)
-    );
-    session.run_session();
-
-}
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonLA/Programs/TestPrograms/PokemonLA_FlagNavigationTest.h b/SerialPrograms/Source/PokemonLA/Programs/TestPrograms/PokemonLA_FlagNavigationTest.h
deleted file mode 100644
index 5429a12672..0000000000
--- a/SerialPrograms/Source/PokemonLA/Programs/TestPrograms/PokemonLA_FlagNavigationTest.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*  Flag Navigation Test
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonLA_FlagNavigationTest_H
-#define PokemonAutomation_PokemonLA_FlagNavigationTest_H
-
-#include "Common/Cpp/Options/SimpleIntegerOption.h"
-#include "Common/Cpp/Options/FloatingPointOption.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-//#include "PokemonLA/Options/PokemonLA_ShinyDetectedAction.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-
-
-class FlagNavigationTest_Descriptor : public SingleSwitchProgramDescriptor{
-public:
-    FlagNavigationTest_Descriptor();
-};
-
-
-class FlagNavigationTest : public SingleSwitchProgramInstance{
-public:
-    FlagNavigationTest();
-
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-    SimpleIntegerOption<uint16_t> STOP_DISTANCE;
-    FloatingPointOption FLAG_REACHED_DELAY;
-
-    SimpleIntegerOption<uint64_t> NAVIGATION_TIMEOUT;
-//    ShinyDetectedActionOption SHINY_DETECTED;
-};
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonLA/Programs/TestPrograms/PokemonLA_MountDetectionTest.cpp b/SerialPrograms/Source/PokemonLA/Programs/TestPrograms/PokemonLA_MountDetectionTest.cpp
deleted file mode 100644
index 2a22e241e4..0000000000
--- a/SerialPrograms/Source/PokemonLA/Programs/TestPrograms/PokemonLA_MountDetectionTest.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-/*  Mount Detection Test
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "ClientSource/Connection/BotBase.h"
-#include "CommonFramework/InferenceInfra/InferenceSession.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonLA/Inference/PokemonLA_MountDetector.h"
-#include "PokemonLA_MountDetectionTest.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-    using namespace Pokemon;
-
-
-MountDetectionTest_Descriptor::MountDetectionTest_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonLA:MountDetectionTest",
-        STRING_POKEMON + " LA", "Mount Detection Test",
-        "",
-        "Test the mount detection in the bottom right corner.",
-        FeedbackType::REQUIRED, AllowCommandsWhenRunning::ENABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-
-
-MountDetectionTest::MountDetectionTest(){
-    PA_ADD_OPTION(FAILED_ACTION);
-}
-
-
-void MountDetectionTest::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    MountTracker tracker(env.console, FAILED_ACTION);
-    InferenceSession session(
-        context, env.console,
-        {{tracker, std::chrono::seconds(1)}}
-    );
-    context.wait_until_cancel();
-}
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonLA/Programs/TestPrograms/PokemonLA_MountDetectionTest.h b/SerialPrograms/Source/PokemonLA/Programs/TestPrograms/PokemonLA_MountDetectionTest.h
deleted file mode 100644
index 67aac19cc0..0000000000
--- a/SerialPrograms/Source/PokemonLA/Programs/TestPrograms/PokemonLA_MountDetectionTest.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*  Mount Detection Test
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonLA_MountDetectionTest_H
-#define PokemonAutomation_PokemonLA_MountDetectionTest_H
-
-#include "PokemonLA/Inference/PokemonLA_MountDetector.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-
-
-class MountDetectionTest_Descriptor : public SingleSwitchProgramDescriptor{
-public:
-    MountDetectionTest_Descriptor();
-};
-
-
-class MountDetectionTest : public SingleSwitchProgramInstance{
-public:
-    MountDetectionTest();
-
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-    MountDetectorLoggingOption FAILED_ACTION;
-};
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonLA/Programs/TestPrograms/PokemonLA_OverworldWatcher.cpp b/SerialPrograms/Source/PokemonLA/Programs/TestPrograms/PokemonLA_OverworldWatcher.cpp
deleted file mode 100644
index e39955e3b4..0000000000
--- a/SerialPrograms/Source/PokemonLA/Programs/TestPrograms/PokemonLA_OverworldWatcher.cpp
+++ /dev/null
@@ -1,68 +0,0 @@
-/*  Shiny Hunt - Legendary Reset
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "ClientSource/Connection/BotBase.h"
-//#include "CommonFramework/InferenceInfra/VisualInferenceRoutines.h"
-#include "CommonFramework/InferenceInfra/InferenceSession.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonLA/Inference/Objects/PokemonLA_BubbleDetector.h"
-#include "PokemonLA/Inference/Objects/PokemonLA_ArcDetector.h"
-#include "PokemonLA/Inference/Objects/PokemonLA_QuestMarkDetector.h"
-#include "PokemonLA/Inference/Objects/PokemonLA_FlagDetector.h"
-#include "PokemonLA_OverworldWatcher.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-    using namespace Pokemon;
-
-
-OverworldWatcher_Descriptor::OverworldWatcher_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonLA:OverworldWatcher",
-        STRING_POKEMON + " LA", "Overworld Watcher",
-        "",
-        "This is a test program that simply observes the game and labels things of interest. "
-        "This program doesn't really do anything.",
-        FeedbackType::REQUIRED, AllowCommandsWhenRunning::ENABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-
-
-OverworldWatcher::OverworldWatcher(){}
-
-
-void OverworldWatcher::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    BubbleDetector bubbles;
-    ArcDetector arcs;
-    QuestMarkDetector quest_marks;
-    FlagDetector flags;
-
-    WhiteObjectWatcher watcher(
-        env.console,
-        {0, 0, 1, 1},
-        {
-            {bubbles, false},
-            {arcs, false},
-            {quest_marks, false},
-            {flags, false},
-        }
-    );
-
-    InferenceSession session(
-        context, env.console,
-        {{watcher}}
-    );
-    context.wait_until_cancel();
-}
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonLA/Programs/TestPrograms/PokemonLA_OverworldWatcher.h b/SerialPrograms/Source/PokemonLA/Programs/TestPrograms/PokemonLA_OverworldWatcher.h
deleted file mode 100644
index e0fdde69c0..0000000000
--- a/SerialPrograms/Source/PokemonLA/Programs/TestPrograms/PokemonLA_OverworldWatcher.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*  Overworld Watcher
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonLA_OverworldWatcher_H
-#define PokemonAutomation_PokemonLA_OverworldWatcher_H
-
-#include "CommonFramework/Notifications/EventNotificationsTable.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-
-class OverworldWatcher_Descriptor : public SingleSwitchProgramDescriptor{
-public:
-    OverworldWatcher_Descriptor();
-};
-
-
-class OverworldWatcher : public SingleSwitchProgramInstance{
-public:
-    OverworldWatcher();
-
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-
-};
-
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonLA/Programs/TestPrograms/PokemonLA_SoundListener.cpp b/SerialPrograms/Source/PokemonLA/Programs/TestPrograms/PokemonLA_SoundListener.cpp
deleted file mode 100644
index 6e4c925f61..0000000000
--- a/SerialPrograms/Source/PokemonLA/Programs/TestPrograms/PokemonLA_SoundListener.cpp
+++ /dev/null
@@ -1,218 +0,0 @@
-/*  Sound Listener
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <float.h>
-#include <chrono>
-#include <cstring>
-#include <map>
-#include <iostream>
-#include <fstream>
-#include <sstream>
-#include "Common/Cpp/Exceptions.h"
-#include "Common/Cpp/Containers/AlignedVector.h"
-#include "Common/Cpp/Containers/AlignedVector.tpp"
-#include "ClientSource/Connection/BotBase.h"
-#include "CommonFramework/AudioPipeline/AudioFeed.h"
-#include "CommonFramework/AudioPipeline/AudioTemplate.h"
-#include "CommonFramework/InferenceInfra/InferenceSession.h"
-#include "CommonFramework/Inference/AudioTemplateCache.h"
-#include "CommonFramework/Inference/SpectrogramMatcher.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonLA/Inference/Sounds/PokemonLA_AlphaMusicDetector.h"
-#include "PokemonLA/Inference/Sounds/PokemonLA_AlphaRoarDetector.h"
-#include "PokemonLA/Inference/Sounds/PokemonLA_ItemDropSoundDetector.h"
-#include "PokemonLA/Inference/Sounds/PokemonLA_ShinySoundDetector.h"
-#include "PokemonLA_SoundListener.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-using namespace Pokemon;
-
-
-
-SoundListener_Descriptor::SoundListener_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonLA:SoundListener",
-        STRING_POKEMON + " LA", "Sound Listener",
-        "",
-        "Test sound detectors listening to audio stream.",
-        FeedbackType::REQUIRED, AllowCommandsWhenRunning::ENABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-
-
-SoundListener::SoundListener()
-    : SOUND_TYPE("<b>Which Sound to Detect</b>",
-        {
-            {SoundType::Shiny,      "shiny",        "Shiny Sound"},
-            {SoundType::AlphaRoar,  "alpha-roar",   "Alpha Roar"},
-            {SoundType::AlphaMusic, "alpha-music",  "Alpha Music"},
-            {SoundType::ItemDrop,   "item-drop",    "Item Drop Sound"},
-        },
-        LockWhileRunning::LOCKED,
-        SoundType::Shiny
-    )
-    , STOP_ON_DETECTED_SOUND(
-        "<b>Stop on the detected sound</b><br>Stop program when the sound is detected.",
-        LockWhileRunning::LOCKED,
-        false
-    )
-{
-    PA_ADD_OPTION(SOUND_TYPE);
-    PA_ADD_OPTION(STOP_ON_DETECTED_SOUND);
-}
-
-
-// void search_alpha_roar_from_audio_dump();
-
-void SoundListener::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    //  Connect the controller.
-    // pbf_move_right_joystick(context, 0, 255, 10, 0);
-
-    // search_alpha_roar_from_audio_dump();
-    // return;
-
-    std::cout << "Running audio test program." << std::endl;
-
-    std::unique_ptr<AudioInferenceCallback> detector;
-    auto action = [&](float error_coefficient) -> bool{
-        // This lambda function will be called when the sound is detected.
-        // Its return will determine whether to stop the program:
-        return STOP_ON_DETECTED_SOUND;
-    };
-
-    SoundType type = SOUND_TYPE;
-    switch (type){
-    case SoundType::Shiny:
-        detector = std::make_unique<ShinySoundDetector>(env.console, action);
-        break;
-    case SoundType::AlphaRoar:
-        detector = std::make_unique<AlphaRoarDetector>(env.console, action);
-        break;
-    case SoundType::AlphaMusic:
-        detector = std::make_unique<AlphaMusicDetector>(env.console, action);
-        break;
-    case SoundType::ItemDrop:
-        detector = std::make_unique<ItemDropSoundDetector>(env.console, action);
-        break;
-    default:
-        throw InternalProgramError(
-            &env.logger(), PA_CURRENT_FUNCTION,
-            "Not such sound detector as sound type " + std::to_string((size_t)type)
-        );
-    }
-
-    InferenceSession session(
-        context, env.console,
-        {{*detector, std::chrono::milliseconds(20)}}
-    );
-    context.wait_until_cancel();
-
-    std::cout << "Audio test program Sound listener finished." << std::endl;
-}
-
-
-// A function used to search for the alpha roar on LA audio dump.
-// But we didn't find the shound sound :P
-void search_alpha_roar_from_audio_dump(){
-
-    const size_t SAMPLE_RATE = 48000;
-
-    SpectrogramMatcher matcher(
-        "Alpha Roar",
-        AudioTemplateCache::instance().get_throw("PokemonLA/AlphaRoar", SAMPLE_RATE),
-        SpectrogramMatcher::Mode::RAW, SAMPLE_RATE,
-        100.0
-    );
-
-    // std::string file_listFile = "./scripts/short_audio_files.txt";
-    std::string file_listFile = "1.txt";
-    // std::string file_listFile = "./scripts/all_audio_files.txt";
-    std::ifstream fin(file_listFile.c_str());
-    std::vector<std::string> file_list;
-    while(!fin.eof()){
-        std::string line;
-        std::getline(fin, line);
-        file_list.push_back(line);
-        fin >> std::ws;
-    }
-    std::cout << "File num " << file_list.size() << std::endl;
-
-    std::map<float, std::string> closest_files;
-
-    std::ofstream fout("file_check_output.txt");
-
-    for(size_t fileIdx = 0; fileIdx < file_list.size(); fileIdx++){
-        matcher.clear();
-
-
-        const auto& path = file_list[fileIdx];
-        std::ostringstream os;
-        os << "File " << fileIdx << "/" << file_list.size() << " " << path << " ";
-        AudioTemplate audio = loadAudioTemplate(path);
-        if (audio.numWindows() == 0){
-            os << "Fail" << std::endl;
-            fout << os.str();
-            std::cout << os.str() << std::flush;
-            continue;
-        }
-
-        // audio.scale(2.0);
-
-        os << "#W " << audio.numWindows() << " ";
-
-        // match!
-        float minScore = FLT_MAX;
-        std::vector<AudioSpectrum> new_spectrums;
-        size_t numStreamWindows = std::max(matcher.numMatchedWindows(), audio.numWindows());
-        for(size_t audioIdx = 0; audioIdx < numStreamWindows; audioIdx++){
-            new_spectrums.clear();
-            AlignedVector<float> freqVector(audio.numFrequencies());
-            if (audioIdx < audio.numWindows()){
-                const float * freq = audio.getWindow(audioIdx);
-                memcpy(freqVector.data(), freq, sizeof(float) * audio.numFrequencies());
-            } else{
-                // add zero-freq window
-            }
-            new_spectrums.emplace_back(
-                audioIdx, SAMPLE_RATE,
-                std::make_unique<AlignedVector<float>>(std::move(freqVector))
-            );
-            float score = matcher.match(new_spectrums);
-            minScore = std::min(score, minScore);
-        } // end audio Idx
-
-        os << "dist " << minScore << std::endl;
-        fout << os.str();
-        std::cout << os.str() << std::flush;
-
-        closest_files.emplace(minScore, path);
-    }
-
-    fout.close();
-
-    auto it = closest_files.begin();
-    std::cout << "--------------" << std::endl;
-    fout.open("file_check_output_sorted.txt");
-    for(int i = 0; it != closest_files.end(); i++, it++){
-        if (i < 40)
-            std::cout << it->first << ", " << it->second << std::endl;
-        fout << it->first << ", " << it->second << std::endl;
-    }
-    fout.close();
-    return;
-}
-
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonLA/Programs/Trading/PokemonLA_SelfBoxTrade.cpp b/SerialPrograms/Source/PokemonLA/Programs/Trading/PokemonLA_SelfBoxTrade.cpp
deleted file mode 100644
index c4e94fabcf..0000000000
--- a/SerialPrograms/Source/PokemonLA/Programs/Trading/PokemonLA_SelfBoxTrade.cpp
+++ /dev/null
@@ -1,182 +0,0 @@
-/*  Self Box Trade
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/Notifications/ProgramNotifications.h"
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "CommonFramework/ImageTools/ImageStats.h"
-#include "CommonFramework/ImageTools/SolidColorTest.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "Pokemon/Inference/Pokemon_NameReader.h"
-#include "PokemonLA_TradeRoutines.h"
-#include "PokemonLA_SelfBoxTrade.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-    using namespace Pokemon;
-
-
-
-
-SelfBoxTrade_Descriptor::SelfBoxTrade_Descriptor()
-    : MultiSwitchProgramDescriptor(
-        "PokemonLA:SelfBoxTrade",
-        STRING_POKEMON + " LA", "Self Box Trade",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonLA/SelfBoxTrade.md",
-        "Trade boxes across two Switches.",
-        FeedbackType::REQUIRED,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB,
-        2, 2, 2
-    )
-{}
-std::unique_ptr<StatsTracker> SelfBoxTrade_Descriptor::make_stats() const{
-    return std::unique_ptr<StatsTracker>(new TradeStats());
-}
-
-
-
-SelfBoxTrade::SelfBoxTrade()
-    : LANGUAGE_LEFT(
-        "<b>Game Language of Left Switch:</b>",
-        Pokemon::PokemonNameReader::instance().languages(),
-        LockWhileRunning::LOCKED,
-        true
-    )
-    , LANGUAGE_RIGHT(
-        "<b>Game Language of Right Switch:</b>",
-        Pokemon::PokemonNameReader::instance().languages(),
-        LockWhileRunning::LOCKED,
-        true
-    )
-    , BOXES_TO_TRADE(
-        "<b>Number of Boxes to Trade:</b>",
-        LockWhileRunning::LOCKED,
-        2, 0, 32
-    )
-    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
-    , NOTIFICATIONS({
-        &NOTIFICATION_STATUS_UPDATE,
-        &NOTIFICATION_PROGRAM_FINISH,
-        &NOTIFICATION_ERROR_FATAL,
-    })
-{
-    PA_ADD_OPTION(LANGUAGE_LEFT);
-    PA_ADD_OPTION(LANGUAGE_RIGHT);
-    PA_ADD_OPTION(BOXES_TO_TRADE);
-    PA_ADD_OPTION(NOTIFICATIONS);
-}
-
-
-
-
-
-bool SelfBoxTrade::move_to_next(
-    MultiSwitchProgramEnvironment& env, CancellableScope& scope,
-    uint8_t& row, uint8_t& col
-){
-    //  Returns true if moved to next box.
-
-    env.log("Moving to next slot.");
-    if (col < 5){
-        env.run_in_parallel(scope, [](ConsoleHandle& console, BotBaseContext& context){
-            pbf_press_dpad(context, DPAD_RIGHT, 20, 140);
-        });
-        col++;
-        return false;
-    }
-    if (row < 4){
-        env.run_in_parallel(scope, [](ConsoleHandle& console, BotBaseContext& context){
-            pbf_press_dpad(context, DPAD_RIGHT, 20, 105);
-            pbf_press_dpad(context, DPAD_RIGHT, 20, 105);
-            pbf_press_dpad(context, DPAD_DOWN, 20, 140);
-        });
-        col = 0;
-        row++;
-        return false;
-    }
-    env.run_in_parallel(scope, [](ConsoleHandle& console, BotBaseContext& context){
-        pbf_press_button(context, BUTTON_R, 20, 230);
-        pbf_press_dpad(context, DPAD_RIGHT, 20, 105);
-        pbf_press_dpad(context, DPAD_RIGHT, 20, 105);
-        pbf_press_dpad(context, DPAD_DOWN, 20, 140);
-    });
-    col = 0;
-    row = 0;
-    return true;
-}
-
-
-void SelfBoxTrade::program(MultiSwitchProgramEnvironment& env, CancellableScope& scope){
-    TradeStats& stats = env.current_stats<TradeStats>();
-
-
-    //  Connect both controllers.
-    env.run_in_parallel(scope, [&](ConsoleHandle& console, BotBaseContext& context){
-        pbf_press_button(context, BUTTON_LCLICK, 10, 0);
-    });
-
-    uint8_t row = 0;
-    uint8_t col = 0;
-    for (uint8_t boxes = 0; boxes < BOXES_TO_TRADE;){
-        env.update_stats();
-        send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
-
-        //  Make sure both consoles have selected something.
-        std::atomic<bool> ok(true);
-        OverlayBoxScope box0(env.consoles[0], {0.925, 0.100, 0.014, 0.030});
-        OverlayBoxScope box1(env.consoles[1], {0.925, 0.100, 0.014, 0.030});
-        TradeNameReader name_reader0(env.consoles[0], env.consoles[0], LANGUAGE_LEFT);
-        TradeNameReader name_reader1(env.consoles[1], env.consoles[1], LANGUAGE_RIGHT);
-        env.run_in_parallel(scope, [&](ConsoleHandle& console, BotBaseContext& context){
-            ImageStats stats = image_stats(extract_box_reference(console.video().snapshot(), box0));
-            bool is_ok = is_white(stats);
-            if (!is_ok){
-                console.log("Skipping empty slot.", COLOR_ORANGE);
-                ok.store(false, std::memory_order_release);
-                return;
-            }
-
-            VideoSnapshot image1 = console.video().snapshot();
-            std::string slug = (console.index() == 0 ? name_reader0 : name_reader1).read(image1);
-            if (slug == "machoke" || slug == "haunter" || slug == "graveler" || slug == "kadabra"){
-                console.log("Skipping trade evolution: " + slug, COLOR_RED);
-                ok.store(false, std::memory_order_release);
-                return;
-            }
-        });
-
-        if (ok.load(std::memory_order_acquire)){
-            //  Perform trade.
-            MultiConsoleErrorState error_state;
-            env.run_in_parallel(scope, [&](ConsoleHandle& console, BotBaseContext& context){
-                trade_current_pokemon(console, context, error_state, stats);
-            });
-            stats.m_trades++;
-        }else{
-            stats.m_errors++;
-        }
-
-        //  Move to next slot.
-        if (move_to_next(env, scope, row, col)){
-            boxes++;
-        }
-    }
-
-    env.update_stats();
-    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
-}
-
-
-
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonLA/Programs/Trading/PokemonLA_SelfTouchTrade.cpp b/SerialPrograms/Source/PokemonLA/Programs/Trading/PokemonLA_SelfTouchTrade.cpp
deleted file mode 100644
index 443666bfdb..0000000000
--- a/SerialPrograms/Source/PokemonLA/Programs/Trading/PokemonLA_SelfTouchTrade.cpp
+++ /dev/null
@@ -1,222 +0,0 @@
-/*  Self Touch Trade
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Cpp/Exceptions.h"
-#include "CommonFramework/Notifications/ProgramNotifications.h"
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "CommonFramework/ImageTools/ImageStats.h"
-#include "CommonFramework/ImageTools/SolidColorTest.h"
-#include "CommonFramework/Tools/ErrorDumper.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "Pokemon/Inference/Pokemon_NameReader.h"
-#include "PokemonLA/Resources/PokemonLA_AvailablePokemon.h"
-#include "PokemonLA_TradeRoutines.h"
-#include "PokemonLA_SelfTouchTrade.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-    using namespace Pokemon;
-
-
-
-SelfTouchTrade_Descriptor::SelfTouchTrade_Descriptor()
-    : MultiSwitchProgramDescriptor(
-        "PokemonLA:SelfTouchTrade",
-        STRING_POKEMON + " LA", "Self Touch Trade",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonLA/SelfTouchTrade.md",
-        "Repeatedly trade " + STRING_POKEMON + " between two local Switches to fill up research.",
-        FeedbackType::REQUIRED,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB,
-        2, 2, 2
-    )
-{}
-std::unique_ptr<StatsTracker> SelfTouchTrade_Descriptor::make_stats() const{
-    return std::unique_ptr<StatsTracker>(new TradeStats());
-}
-
-
-
-SelfTouchTrade::SelfTouchTrade()
-    : LANGUAGE(
-        "<b>Game Language of the Hosting Switch:</b>",
-        Pokemon::PokemonNameReader::instance().languages(),
-        LockWhileRunning::LOCKED,
-        true
-    )
-    , HOSTING_SWITCH(
-        "<b>Host Switch:</b><br>This is the Switch hosting the " + STRING_POKEMON + " to be touch-traded to the other.",
-        {
-            {HostingSwitch::Switch0, "switch0", "Switch 0 (Left)"},
-            {HostingSwitch::Switch1, "switch1", "Switch 1 (Right)"},
-        },
-        LockWhileRunning::LOCKED,
-        HostingSwitch::Switch0
-    )
-    , BOXES_TO_TRADE(
-        "<b>Number of Boxes to Touch-Trade:</b>",
-        LockWhileRunning::LOCKED,
-        2, 0, 32
-    )
-    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
-    , NOTIFICATIONS({
-        &NOTIFICATION_STATUS_UPDATE,
-        &NOTIFICATION_PROGRAM_FINISH,
-        &NOTIFICATION_ERROR_FATAL,
-    })
-{
-    PA_ADD_OPTION(LANGUAGE);
-    PA_ADD_OPTION(HOSTING_SWITCH);
-    PA_ADD_OPTION(BOXES_TO_TRADE);
-    PA_ADD_OPTION(TRADE_COUNTS);
-    PA_ADD_OPTION(NOTIFICATIONS);
-}
-
-
-
-
-bool SelfTouchTrade::trade_one(
-    MultiSwitchProgramEnvironment& env, CancellableScope& scope,
-    std::map<std::string, uint8_t>& trades_left
-){
-    TradeStats& stats = env.current_stats<TradeStats>();
-
-    ConsoleHandle& host = HOSTING_SWITCH == HostingSwitch::Switch0 ? env.consoles[0] : env.consoles[1];
-
-    //  Read the name and see if the receiver still needs it.
-    TradeNameReader name_reader(host, host, LANGUAGE);
-    VideoSnapshot snapshot = host.video().snapshot();
-    std::string slug = name_reader.read(snapshot);
-    auto iter = trades_left.find(slug);
-    if (iter == trades_left.end()){
-        host.log("Unable to read name. Moving on...", COLOR_RED);
-        stats.m_errors++;
-        dump_image(host, env.program_info(), "ReadName", snapshot);
-        return false;
-    }
-    if (iter->second <= 0){
-        host.log(STRING_POKEMON + " not needed anymore. Moving on...");
-        return false;
-    }
-    if (slug == "machoke" || slug == "haunter" || slug == "graveler" || slug == "kadabra"){
-        host.log("Skipping trade evolution: " + slug, COLOR_RED);
-        return false;
-    }
-
-    //  Perform trade.
-    host.log("\"" + slug + "\" - Trades Remaining: " + std::to_string(iter->second));
-#if 1
-    MultiConsoleErrorState error_state;
-    env.run_in_parallel(scope, [&](ConsoleHandle& console, BotBaseContext& context){
-        trade_current_pokemon(console, context, error_state, stats);
-    });
-    stats.m_trades++;
-    iter->second--;
-#else
-    env.wait_for(std::chrono::milliseconds(5000));
-    return false;
-#endif
-    scope.wait_for(std::chrono::milliseconds(500));
-
-    return true;
-}
-bool SelfTouchTrade::move_to_next(Logger& logger, BotBaseContext& host, uint8_t& row, uint8_t& col){
-    //  Returns true if moved to next box.
-
-    logger.log("Moving to next slot.");
-    if (col < 5){
-        pbf_press_dpad(host, DPAD_RIGHT, 20, 140);
-        col++;
-        return false;
-    }
-    if (row < 4){
-        pbf_press_dpad(host, DPAD_RIGHT, 20, 105);
-        pbf_press_dpad(host, DPAD_RIGHT, 20, 105);
-        pbf_press_dpad(host, DPAD_DOWN, 20, 140);
-        col = 0;
-        row++;
-        return false;
-    }
-    pbf_press_button(host, BUTTON_R, 20, 230);
-    pbf_press_dpad(host, DPAD_RIGHT, 20, 105);
-    pbf_press_dpad(host, DPAD_RIGHT, 20, 105);
-    pbf_press_dpad(host, DPAD_DOWN, 20, 140);
-    col = 0;
-    row = 0;
-    return true;
-}
-
-
-void SelfTouchTrade::program(MultiSwitchProgramEnvironment& env, CancellableScope& scope){
-    //  Build list of what's needed.
-    std::map<std::string, uint8_t> trades_left;
-    for (const StaticTableRow* item : TRADE_COUNTS.table()){
-        trades_left[item->slug()] = static_cast<const TradeCountTableRow&>(*item).count;
-    }
-
-    //  Connect both controllers.
-    env.run_in_parallel(scope, [&](ConsoleHandle& console, BotBaseContext& context){
-        pbf_press_button(context, BUTTON_LCLICK, 10, 0);
-    });
-
-    uint8_t row = 0;
-    uint8_t col = 0;
-
-    bool host0 = HOSTING_SWITCH == HostingSwitch::Switch0;
-    BotBaseContext host_context(scope, (host0 ? env.consoles[0] : env.consoles[1]).botbase());
-    ConsoleHandle& host = host0 ? env.consoles[0] : env.consoles[1];
-    ConsoleHandle& recv = host0 ? env.consoles[1] : env.consoles[0];
-
-    for (uint8_t boxes = 0; boxes < BOXES_TO_TRADE;){
-        env.update_stats();
-        send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
-
-        //  Make sure both consoles have selected something.
-        bool host_ok, recv_ok;
-        OverlayBoxScope box0(host, {0.925, 0.100, 0.014, 0.030});
-        OverlayBoxScope box1(recv, {0.925, 0.100, 0.014, 0.030});
-        env.run_in_parallel(scope, [&](ConsoleHandle& console, BotBaseContext& context){
-            ImageStats stats = image_stats(extract_box_reference(console.video().snapshot(), box0));
-            bool ok = is_white(stats);
-            if (host.index() == console.index()){
-                host_ok = ok;
-            }else{
-                recv_ok = ok;
-            }
-        });
-
-        if (!recv_ok){
-            throw UserSetupError(recv, "Receiving Switch has not selected a " + STRING_POKEMON + ".");
-        }
-
-        //  Perform trade.
-        bool traded = false;
-        if (host_ok){
-            traded = trade_one(env, scope, trades_left);
-        }else{
-            recv.log("Skipping empty slot on host...", COLOR_PURPLE);
-        }
-
-        //  Move to next slot.
-        if (!traded){
-            if (move_to_next(host, host_context, row, col)){
-                boxes++;
-            }
-            host_context.wait_for_all_requests();
-        }
-    }
-
-    env.update_stats();
-    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
-}
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonLA/Programs/Trading/PokemonLA_SelfTouchTrade.h b/SerialPrograms/Source/PokemonLA/Programs/Trading/PokemonLA_SelfTouchTrade.h
deleted file mode 100644
index 1d1ae8a20c..0000000000
--- a/SerialPrograms/Source/PokemonLA/Programs/Trading/PokemonLA_SelfTouchTrade.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*  Self Touch Trade
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonLA_SelfTouchTrade_H
-#define PokemonAutomation_PokemonLA_SelfTouchTrade_H
-
-#include "Common/Cpp/Options/SimpleIntegerOption.h"
-#include "Common/Cpp/Options/EnumDropdownOption.h"
-#include "CommonFramework/Options/LanguageOCROption.h"
-#include "CommonFramework/Notifications/EventNotificationsTable.h"
-#include "PokemonLA/Options/PokemonLA_TradeCountTable.h"
-#include "NintendoSwitch/NintendoSwitch_MultiSwitchProgram.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-
-class SelfTouchTrade_Descriptor : public MultiSwitchProgramDescriptor{
-public:
-    SelfTouchTrade_Descriptor();
-
-    virtual std::unique_ptr<StatsTracker> make_stats() const override;
-};
-
-
-class SelfTouchTrade : public MultiSwitchProgramInstance{
-public:
-    SelfTouchTrade();
-    virtual void program(MultiSwitchProgramEnvironment& env, CancellableScope& scope) override;
-
-private:
-    bool trade_one(
-        MultiSwitchProgramEnvironment& env, CancellableScope& scope,
-        std::map<std::string, uint8_t>& trades_left
-    );
-    bool move_to_next(Logger& logger, BotBaseContext& host, uint8_t& row, uint8_t& col);
-
-private:
-    OCR::LanguageOCROption LANGUAGE;
-
-    enum class HostingSwitch{
-        Switch0,
-        Switch1
-    };
-    EnumDropdownOption<HostingSwitch> HOSTING_SWITCH;
-
-    SimpleIntegerOption<uint8_t> BOXES_TO_TRADE;
-    TradeCountTable TRADE_COUNTS;
-
-    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
-    EventNotificationsOption NOTIFICATIONS;
-};
-
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonLA/Programs/Trading/PokemonLA_TradeRoutines.cpp b/SerialPrograms/Source/PokemonLA/Programs/Trading/PokemonLA_TradeRoutines.cpp
deleted file mode 100644
index 6964977a2d..0000000000
--- a/SerialPrograms/Source/PokemonLA/Programs/Trading/PokemonLA_TradeRoutines.cpp
+++ /dev/null
@@ -1,214 +0,0 @@
-/*  Trade Routines
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Cpp/Json/JsonValue.h"
-#include "Common/Cpp/Json/JsonArray.h"
-#include "CommonFramework/Globals.h"
-#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
-#include "CommonFramework/Inference/BlackScreenDetector.h"
-#include "CommonFramework/Inference/ImageMatchDetector.h"
-#include "CommonFramework/Notifications/ProgramInfo.h"
-#include "CommonFramework/Tools/ErrorDumper.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "Pokemon/Inference/Pokemon_NameReader.h"
-#include "PokemonLA/Inference/Objects/PokemonLA_ButtonDetector.h"
-#include "PokemonLA_TradeRoutines.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-
-
-TradeStats::TradeStats()
-    : m_trades(m_stats["Trades"])
-    , m_errors(m_stats["Errors"])
-{
-    m_display_order.emplace_back("Trades");
-    m_display_order.emplace_back("Errors", true);
-}
-
-
-
-void trade_current_pokemon(
-    ConsoleHandle& console, BotBaseContext& context,
-    MultiConsoleErrorState& tracker,
-    TradeStats& stats
-){
-    tracker.check_unrecoverable_error(console);
-
-    context.wait_for_all_requests();
-    VideoSnapshot box_image = console.video().snapshot();
-    ImageMatchWatcher box_detector(std::move(box_image.frame), {0.02, 0.15, 0.15, 0.80}, 50);
-
-    {
-        pbf_press_button(context, BUTTON_A, 20, 0);
-        context.wait_for_all_requests();
-        ButtonDetector detector(
-            console, console,
-            ButtonType::ButtonA, ImageFloatBox(0.25, 0.15, 0.50, 0.75),
-            std::chrono::milliseconds(0), true
-        );
-        int ret = wait_until(
-            console, context, std::chrono::seconds(120),
-            {{detector}}
-        );
-        if (ret < 0){
-            stats.m_errors++;
-            tracker.report_unrecoverable_error(console, "Failed to detect trade select prompt after 2 minutes.");
-        }
-        console.log("Detected trade prompt.");
-        context.wait_for(std::chrono::milliseconds(100));
-        tracker.check_unrecoverable_error(console);
-    }
-    {
-        pbf_press_button(context, BUTTON_A, 20, 105);
-        context.wait_for_all_requests();
-        ButtonDetector detector(
-            console, console,
-            ButtonType::ButtonA, ImageFloatBox(0.50, 0.52, 0.40, 0.10),
-            std::chrono::milliseconds(0), true
-        );
-        int ret = wait_until(
-            console, context, std::chrono::seconds(10),
-            {{detector}}
-        );
-        if (ret < 0){
-            stats.m_errors++;
-            tracker.report_unrecoverable_error(console, "Failed to detect trade confirm prompt after 10 seconds.");
-        }
-        console.log("Detected trade confirm prompt.");
-        context.wait_for(std::chrono::milliseconds(100));
-        tracker.check_unrecoverable_error(console);
-    }
-
-    //  Start trade.
-    pbf_press_button(context, BUTTON_A, 20, 0);
-
-    //  Wait for black screen.
-    {
-        BlackScreenOverWatcher black_screen;
-        int ret = wait_until(
-            console, context, std::chrono::minutes(2),
-            {{black_screen}}
-        );
-        if (ret < 0){
-            stats.m_errors++;
-            tracker.report_unrecoverable_error(console, "Failed to detect start of trade after 2 minutes.");
-        }
-        console.log("Detected start of trade.");
-        context.wait_for(std::chrono::milliseconds(100));
-        tracker.check_unrecoverable_error(console);
-    }
-
-    //  Mash B until 2nd black screen.
-    {
-        BlackScreenWatcher black_screen;
-        int ret = run_until(
-            console, context,
-            [](BotBaseContext& context){
-                pbf_mash_button(context, BUTTON_B, 120 * TICKS_PER_SECOND);
-            },
-            {{black_screen}}
-        );
-        if (ret < 0){
-            stats.m_errors++;
-            tracker.report_unrecoverable_error(console, "Failed to detect end of trade after 2 minutes.");
-        }
-        console.log("Detected end of trade.");
-        context.wait_for(std::chrono::milliseconds(100));
-        tracker.check_unrecoverable_error(console);
-    }
-
-    //  Wait to return to box.
-    {
-        int ret = wait_until(
-            console, context, std::chrono::minutes(2),
-            {{box_detector}}
-        );
-        if (ret < 0){
-            stats.m_errors++;
-            tracker.report_unrecoverable_error(console, "Failed to return to box after 2 minutes after a trade.");
-        }
-        console.log("Detected box. Trade completed.");
-        tracker.check_unrecoverable_error(console);
-    }
-}
-
-
-
-
-
-TradeNameReader::TradeNameReader(Logger& logger, VideoOverlay& overlay, Language language)
-    : m_logger(logger)
-    , m_language(language)
-    , m_box(overlay, {0.80, 0.155, 0.18, 0.05})
-{
-    std::string path = RESOURCE_PATH() + "Pokemon/Pokedex/Pokedex-Hisui.json";
-    JsonValue json = load_json_file(path);
-    JsonArray& array = json.get_array_throw(path);
-    for (auto& item : array){
-        m_slugs.insert(std::move(item.get_string_throw(path)));
-    }
-}
-
-std::string TradeNameReader::read(const ImageViewRGB32& screen) const{
-    ImageViewRGB32 image = extract_box_reference(screen, m_box);
-    OCR::StringMatchResult result = Pokemon::PokemonNameReader::instance().read_substring(
-        m_logger, m_language, image,
-        OCR::WHITE_TEXT_FILTERS()
-    );
-    result.clear_beyond_log10p(Pokemon::PokemonNameReader::MAX_LOG10P);
-
-    for (auto iter = result.results.begin(); iter != result.results.end();){
-        //  Remove from candidates if it's not in PLA.
-        if (m_slugs.find(iter->second.token) == m_slugs.end()){
-            iter = result.results.erase(iter);
-        }else{
-            ++iter;
-        }
-    }
-
-    if (result.results.size() != 1){
-        dump_image(m_logger, ProgramInfo(), "TradeNameReader", screen);
-        return "";
-    }
-
-    return std::move(result.results.begin()->second.token);
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonLA/Programs/Trading/PokemonLA_TradeRoutines.h b/SerialPrograms/Source/PokemonLA/Programs/Trading/PokemonLA_TradeRoutines.h
deleted file mode 100644
index f5ce952f46..0000000000
--- a/SerialPrograms/Source/PokemonLA/Programs/Trading/PokemonLA_TradeRoutines.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*  Trade Routines
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonLA_TradeRoutines_H
-#define PokemonAutomation_PokemonLA_TradeRoutines_H
-
-#include "CommonFramework/Language.h"
-#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
-#include "CommonFramework/Tools/StatsTracking.h"
-#include "CommonFramework/Tools/ConsoleHandle.h"
-#include "CommonFramework/Tools/MultiConsoleErrors.h"
-
-namespace PokemonAutomation{
-    class BotBaseContext;
-    class ProgramEnvironment;
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-
-struct TradeStats : public StatsTracker{
-    TradeStats();
-    std::atomic<uint64_t>& m_trades;
-    std::atomic<uint64_t>& m_errors;
-};
-
-
-void trade_current_pokemon(
-    ConsoleHandle& console, BotBaseContext& context,
-    MultiConsoleErrorState& tracker,
-    TradeStats& stats
-);
-
-
-
-class TradeNameReader{
-public:
-    TradeNameReader(Logger& logger, VideoOverlay& overlay, Language language);
-
-    std::string read(const ImageViewRGB32& screen) const;
-
-private:
-    Logger& m_logger;
-    Language m_language;
-    OverlayBoxScope m_box;
-    std::set<std::string> m_slugs;
-};
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonLA/Resources/PokemonLA_NameDatabase.h b/SerialPrograms/Source/PokemonLA/Resources/PokemonLA_NameDatabase.h
deleted file mode 100644
index 0be040cff6..0000000000
--- a/SerialPrograms/Source/PokemonLA/Resources/PokemonLA_NameDatabase.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*  Name Database
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonLA_NameDatabase_H
-#define PokemonAutomation_PokemonLA_NameDatabase_H
-
-#include "CommonFramework/Options/StringSelectOption.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-
-StringSelectDatabase make_name_database(const std::vector<std::string>& slugs);
-StringSelectDatabase make_name_database(const char* json_file_slugs);
-
-const StringSelectDatabase& ALL_POKEMON_NAMES();
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonLA/Resources/PokemonLA_PokemonInfo.cpp b/SerialPrograms/Source/PokemonLA/Resources/PokemonLA_PokemonInfo.cpp
deleted file mode 100644
index 1abd443c05..0000000000
--- a/SerialPrograms/Source/PokemonLA/Resources/PokemonLA_PokemonInfo.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-/*  Pokemon LA Info
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Cpp/Exceptions.h"
-#include "CommonFramework/Globals.h"
-#include "CommonFramework/ImageMatch/ImageCropper.h"
-#include "PokemonLA_PokemonInfo.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonLA/Resources/PokemonLA_PokemonSprites.h b/SerialPrograms/Source/PokemonLA/Resources/PokemonLA_PokemonSprites.h
deleted file mode 100644
index 313d9a0fdf..0000000000
--- a/SerialPrograms/Source/PokemonLA/Resources/PokemonLA_PokemonSprites.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*  Pokemon LA Sprites
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonLA_PokemonSprites_H
-#define PokemonAutomation_PokemonLA_PokemonSprites_H
-
-#include "CommonFramework/Resources/SpriteDatabase.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonLA{
-
-// All pokemon sprites in LA
-const SpriteDatabase& ALL_POKEMON_SPRITES();
-
-// All icons of pokemon sprites in MMO
-const SpriteDatabase& ALL_MMO_SPRITES();
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSV/Inference/Battles/PokemonSV_BattleBallReader.cpp b/SerialPrograms/Source/PokemonSV/Inference/Battles/PokemonSV_BattleBallReader.cpp
deleted file mode 100644
index e1934f018f..0000000000
--- a/SerialPrograms/Source/PokemonSV/Inference/Battles/PokemonSV_BattleBallReader.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-/*  Battle Ball Reader
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/Notifications/ProgramInfo.h"
-#include "CommonFramework/ImageTypes/ImageRGB32.h"
-#include "CommonFramework/ImageTools/ImageFilter.h"
-#include "CommonFramework/OCR/OCR_NumberReader.h"
-#include "CommonFramework/Tools/ErrorDumper.h"
-#include "PokemonSV_BattleBallReader.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-
-BattleBallReader::BattleBallReader(ConsoleHandle& console, Language language, Color color)
-    : m_name_reader(PokeballNameReader::instance())
-    , m_language(language)
-    , m_console(console)
-    , m_name(console.overlay(), {0.380, 0.687, 0.240, 0.050}, color)
-    , m_sprite(console.overlay(), {0.480, 0.764, 0.040, 0.060}, color)
-    , m_quantity(console.overlay(), {0.480, 0.830, 0.040, 0.035}, color)
-{}
-
-
-std::string BattleBallReader::read_ball(const ImageViewRGB32& screen) const{
-    if (!screen){
-        return "";
-    }
-
-    //  TODO: Use the sprite as well.
-
-    OCR::StringMatchResult name_result;
-    {
-        ImageViewRGB32 cropped = extract_box_reference(screen, m_name);
-        name_result = m_name_reader.read_substring(
-            m_console, m_language, cropped,
-            {
-                {0xffe0e0e0, 0xffffffff},
-                {0xffc0c0c0, 0xffffffff},
-                {0xffa0a0a0, 0xffffffff},
-                {0xff808080, 0xffffffff},
-            }
-        );
-    }
-    if (name_result.results.size() != 1){
-        dump_image(m_console, ProgramInfo(), "BattleBallReader-Name", screen);
-        return "";
-    }
-
-    return name_result.results.begin()->second.token;
-}
-
-uint16_t BattleBallReader::read_quantity(const ImageViewRGB32& screen) const{
-    ImageRGB32 image = to_blackwhite_rgb32_range(
-        extract_box_reference(screen, m_quantity),
-        0xff000000, 0xff7f7f7f, true
-    );
-    int qty = OCR::read_number(m_console, image);
-    return (uint16_t)std::max(qty, 0);
-}
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSV/Inference/Battles/PokemonSV_BattleBallReader.h b/SerialPrograms/Source/PokemonSV/Inference/Battles/PokemonSV_BattleBallReader.h
deleted file mode 100644
index 45a06e95a2..0000000000
--- a/SerialPrograms/Source/PokemonSV/Inference/Battles/PokemonSV_BattleBallReader.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*  Battle Ball Reader
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSV_BattleBallReader_H
-#define PokemonAutomation_PokemonSV_BattleBallReader_H
-
-#include "Common/Cpp/Color.h"
-#include "CommonFramework/Language.h"
-#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
-//#include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "CommonFramework/Inference/VisualDetector.h"
-#include "CommonFramework/Tools/ConsoleHandle.h"
-#include "Pokemon/Inference/Pokemon_PokeballNameReader.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-using namespace Pokemon;
-
-
-
-//  Detect dialog that has the small arrow at bottom to show the next dialog.
-class BattleBallReader{
-public:
-    BattleBallReader(ConsoleHandle& console, Language language, Color color = COLOR_RED);
-
-    std::string read_ball(const ImageViewRGB32& screen) const;
-    uint16_t read_quantity(const ImageViewRGB32& screen) const;
-
-protected:
-    const PokeballNameReader& m_name_reader;
-    Language m_language;
-    ConsoleHandle& m_console;
-    OverlayBoxScope m_name;
-    OverlayBoxScope m_sprite;
-    OverlayBoxScope m_quantity;
-};
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSV/Inference/Battles/PokemonSV_NormalBattleMenus.cpp b/SerialPrograms/Source/PokemonSV/Inference/Battles/PokemonSV_NormalBattleMenus.cpp
deleted file mode 100644
index 0f27ff54f9..0000000000
--- a/SerialPrograms/Source/PokemonSV/Inference/Battles/PokemonSV_NormalBattleMenus.cpp
+++ /dev/null
@@ -1,332 +0,0 @@
-/*  Normal Battle Menus
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/Exceptions/OperationFailedException.h"
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
-#include "CommonFramework/Tools/ErrorDumper.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "Pokemon/Inference/Pokemon_NameReader.h"
-#include "PokemonSV_NormalBattleMenus.h"
-
-//#include <iostream>
-//using std::cout;
-//using std::endl;
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-
-
-NormalBattleMenuDetector::NormalBattleMenuDetector(Color color)
-    : m_status_button(color, WhiteButton::ButtonY, {0.35, 0.90, 0.30, 0.08})
-    , m_arrow(color, GradientArrowType::RIGHT, {0.75, 0.62, 0.05, 0.35})
-{}
-void NormalBattleMenuDetector::make_overlays(VideoOverlaySet& items) const{
-    m_status_button.make_overlays(items);
-    m_arrow.make_overlays(items);
-}
-bool NormalBattleMenuDetector::detect(const ImageViewRGB32& screen) const{
-    if (!m_status_button.detect(screen)){
-//        cout << "status button" << endl;
-        return false;
-    }
-    if (!m_arrow.detect(screen)){
-        return false;
-    }
-    return true;
-}
-int8_t NormalBattleMenuDetector::detect_slot(const ImageViewRGB32& screen) const{
-    if (!m_status_button.detect(screen)){
-//        cout << "status button" << endl;
-        return -1;
-    }
-
-    ImageFloatBox box;
-    if (!m_arrow.detect(box, screen)){
-        return -1;
-    }
-
-    double y = box.y + box.height * 0.5;
-    double slot = (y - 0.67963) / 0.0814815;
-//    cout << "slot = " << slot << endl;
-    return (int8_t)(slot + 0.5);
-}
-bool NormalBattleMenuDetector::move_to_slot(ConsoleHandle& console, BotBaseContext& context, uint8_t slot) const{
-    if (slot > 3){
-        return false;
-    }
-    for (size_t attempts = 0;; attempts++){
-        context.wait_for_all_requests();
-        VideoSnapshot screen = console.video().snapshot();
-        int8_t current_slot = detect_slot(screen);
-        if (current_slot < 0 || current_slot > 3){
-            console.log("NormalBattleMenuDetector::move_to_slot(): Unable to detect slot.", COLOR_RED);
-            return false;
-        }
-        if (attempts > 10){
-            console.log("NormalBattleMenuDetector::move_to_slot(): Failed to move slot after 10 attempts.", COLOR_RED);
-            return false;
-        }
-
-        uint8_t diff = (4 + slot - (uint8_t)current_slot) % 4;
-        switch (diff){
-        case 0:
-            return true;
-        case 1:
-            pbf_press_dpad(context, DPAD_DOWN, 20, 30);
-            continue;
-        case 2:
-            pbf_press_dpad(context, DPAD_DOWN, 20, 30);
-            continue;
-        case 3:
-            pbf_press_dpad(context, DPAD_UP, 20, 30);
-            continue;
-        }
-    }
-}
-
-
-
-std::set<std::string> read_singles_opponent(
-    const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context,
-    Language language
-){
-    VideoOverlaySet overlay(console);
-
-    ImageFloatBox name(0.422, 0.131, 0.120, 0.050);
-    overlay.add(COLOR_RED, name);
-
-    std::set<std::string> slugs;
-
-    bool status_opened = false;
-    bool battle_menu_seen = false;
-    for (size_t c = 0; c < 10; c++){
-        NormalBattleMenuWatcher battle_menu(COLOR_YELLOW);
-        GradientArrowWatcher arrow(COLOR_BLUE, GradientArrowType::DOWN, {0.4, 0.1, 0.2, 0.5});
-        context.wait_for_all_requests();
-        int ret = wait_until(
-            console, context, std::chrono::seconds(5),
-            {battle_menu, arrow}
-        );
-        context.wait_for(std::chrono::milliseconds(500));
-
-        switch (ret){
-        case 0:
-            if (status_opened){
-                console.log("Detected battle menu...");
-                return slugs;
-            }
-            console.log("Detected battle menu. Opening status...");
-            battle_menu_seen = true;
-            pbf_press_button(context, BUTTON_Y, 20, 105);
-            continue;
-
-        case 1:
-            if (!battle_menu_seen){
-                console.log("Detected status menu before pressing Y...", COLOR_RED);
-//                dump_image(console, info, "BattleMenuNotSeen", arrow.last_detected());
-                continue;
-            }
-            if (status_opened){
-                console.log("Detected status menu (again)...", COLOR_RED);
-            }else{
-                console.log("Detected status menu. Reading name...");
-                status_opened = true;
-                VideoSnapshot screen = console.video().snapshot();
-                OCR::StringMatchResult result = Pokemon::PokemonNameReader::instance().read_substring(
-                    console, language,
-                    extract_box_reference(screen, name),
-                    OCR::WHITE_TEXT_FILTERS()
-                );
-                for (auto& item : result.results){
-                    slugs.insert(std::move(item.second.token));
-                }
-                if (slugs.empty()){
-                    dump_image(console, info, "UnableToReadName", screen);
-                }
-            }
-
-            pbf_mash_button(context, BUTTON_B, 125);
-            continue;
-
-        default:
-            console.log("No recognized state. Mashing B...", COLOR_RED);
-            pbf_mash_button(context, BUTTON_B, 250);
-        }
-    }
-
-    throw OperationFailedException(
-        ErrorReport::SEND_ERROR_REPORT, console,
-        "Unable to open status menu to read opponent name.",
-        true
-    );
-}
-
-
-
-
-
-MoveSelectDetector::MoveSelectDetector(Color color)
-    : m_info_button(color, WhiteButton::ButtonY, {0.35, 0.90, 0.30, 0.08})
-    , m_arrow(color, GradientArrowType::RIGHT, {0.705, 0.550, 0.050, 0.410})
-{}
-void MoveSelectDetector::make_overlays(VideoOverlaySet& items) const{
-    m_info_button.make_overlays(items);
-    m_arrow.make_overlays(items);
-}
-bool MoveSelectDetector::detect(const ImageViewRGB32& screen) const{
-    if (!m_info_button.detect(screen)){
-//        cout << "status" << endl;
-        return false;
-    }
-    if (!m_arrow.detect(screen)){
-//        cout << "arrow" << endl;
-        return false;
-    }
-    return true;
-}
-int8_t MoveSelectDetector::detect_slot(const ImageViewRGB32& screen) const{
-    if (!m_info_button.detect(screen)){
-//        cout << "status" << endl;
-        return false;
-    }
-
-    ImageFloatBox box;
-    if (!m_arrow.detect(box, screen)){
-//        cout << "arrow" << endl;
-        return false;
-    }
-
-    double y = box.y + box.height * 0.5;
-    y = (y - 0.602778) / 0.103549;
-//    cout << "y = " << y << endl;
-
-    return (int8_t)(y + 0.5);
-}
-bool MoveSelectDetector::move_to_slot(ConsoleHandle& console, BotBaseContext& context, uint8_t slot) const{
-    if (slot > 3){
-        return false;
-    }
-    for (size_t attempts = 0;; attempts++){
-        context.wait_for_all_requests();
-        VideoSnapshot screen = console.video().snapshot();
-        int8_t current_slot = detect_slot(screen);
-        if (current_slot < 0 || current_slot > 3){
-            console.log("MoveSelectDetector::move_to_slot(): Unable to detect slot.", COLOR_RED);
-            return false;
-        }
-        if (attempts > 10){
-            console.log("MoveSelectDetector::move_to_slot(): Failed to move slot after 10 attempts.", COLOR_RED);
-            return false;
-        }
-
-        uint8_t diff = (4 + slot - (uint8_t)current_slot) % 4;
-        switch (diff){
-        case 0:
-            return true;
-        case 1:
-            pbf_press_dpad(context, DPAD_DOWN, 20, 30);
-            continue;
-        case 2:
-            pbf_press_dpad(context, DPAD_DOWN, 20, 30);
-            pbf_press_dpad(context, DPAD_DOWN, 20, 30);
-            continue;
-        case 3:
-            pbf_press_dpad(context, DPAD_UP, 20, 30);
-            continue;
-        }
-    }
-}
-
-
-
-
-TerastallizingDetector::TerastallizingDetector(Color color)
-    : m_color(color)
-    , m_box(0.6, 0.7, 0.06, 0.14)
-{}
-void TerastallizingDetector::make_overlays(VideoOverlaySet& items) const{
-    items.add(m_color, m_box);
-}
-bool TerastallizingDetector::detect(const ImageViewRGB32& screen) const{
-    ImageStats box = image_stats(extract_box_reference(screen, m_box));
-    return box.stddev.sum() > 240;
-}
-
-
-
-
-SwapMenuDetector::SwapMenuDetector(Color color)
-    : m_arrow(color, GradientArrowType::RIGHT, { 0.02, 0.10, 0.05, 0.90 })
-{}
-void SwapMenuDetector::make_overlays(VideoOverlaySet& items) const {
-    m_arrow.make_overlays(items);
-}
-bool SwapMenuDetector::detect(const ImageViewRGB32& screen) const {
-    if (!m_arrow.detect(screen)) {
-        return false;
-    }
-    return true;
-}
-int8_t SwapMenuDetector::detect_slot(const ImageViewRGB32& screen) const {
-    ImageFloatBox box;
-    if (!m_arrow.detect(box, screen)) {
-        return -1;
-    }
-
-    int slot = (int)((box.y - 0.172222) / 0.116482 + 0.5);
-    if (slot < 0) {
-        slot = 0;
-    }
-    //cout << "slot = " << slot << endl;
-    return (int8_t)slot;
-}
-bool SwapMenuDetector::move_to_slot(ConsoleHandle& console, BotBaseContext& context, uint8_t slot) const {
-    if (slot > 5) {
-        return false;
-    }
-    for (size_t attempts = 0;; attempts++) {
-        context.wait_for_all_requests();
-        VideoSnapshot screen = console.video().snapshot();
-        int8_t current_slot = detect_slot(screen);
-        if (current_slot < 0 || current_slot > 5) {
-            console.log("SwapMenuDetector::move_to_slot(): Unable to detect slot.", COLOR_RED);
-            return false;
-        }
-        if (attempts > 20) {
-            console.log("SwapMenuDetector::move_to_slot(): Failed to move slot after 20 attempts.", COLOR_RED);
-            return false;
-        }
-
-        uint8_t diff = (6 + slot - (uint8_t)current_slot) % 6;
-        switch (diff) {
-        case 0:
-            return true;
-        case 1:
-            pbf_press_dpad(context, DPAD_DOWN, 20, 30);
-            continue;
-        case 2:
-            pbf_press_dpad(context, DPAD_DOWN, 20, 30);
-            continue;
-        case 3:
-            pbf_press_dpad(context, DPAD_DOWN, 20, 30);
-            continue;
-        case 4:
-            pbf_press_dpad(context, DPAD_DOWN, 20, 30);
-            continue;
-        case 5:
-            pbf_press_dpad(context, DPAD_DOWN, 20, 30);
-            continue;
-        }
-    }
-}
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSV/Inference/Battles/PokemonSV_NormalBattleMenus.h b/SerialPrograms/Source/PokemonSV/Inference/Battles/PokemonSV_NormalBattleMenus.h
deleted file mode 100644
index 820042e2b3..0000000000
--- a/SerialPrograms/Source/PokemonSV/Inference/Battles/PokemonSV_NormalBattleMenus.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/*  Normal Battle Menus
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSV_NormalBattleMenus_H
-#define PokemonAutomation_PokemonSV_NormalBattleMenus_H
-
-#include "CommonFramework/Language.h"
-#include "CommonFramework/Inference/VisualDetector.h"
-#include "PokemonSV/Inference/PokemonSV_WhiteButtonDetector.h"
-#include "PokemonSV/Inference/Dialogs/PokemonSV_GradientArrowDetector.h"
-
-namespace PokemonAutomation{
-    class ConsoleHandle;
-    class BotBaseContext;
-    struct ProgramInfo;
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-
-
-class NormalBattleMenuDetector : public StaticScreenDetector{
-public:
-    NormalBattleMenuDetector(Color color);
-
-    virtual void make_overlays(VideoOverlaySet& items) const override;
-    virtual bool detect(const ImageViewRGB32& screen) const override;
-
-    //  Returns -1 if not found.
-    int8_t detect_slot(const ImageViewRGB32& screen) const;
-    bool move_to_slot(ConsoleHandle& console, BotBaseContext& context, uint8_t slot) const;
-
-private:
-    WhiteButtonDetector m_status_button;
-    GradientArrowDetector m_arrow;
-};
-class NormalBattleMenuWatcher : public DetectorToFinder<NormalBattleMenuDetector>{
-public:
-    NormalBattleMenuWatcher(Color color)
-        : DetectorToFinder("NormalBattleMenuWatcher", std::chrono::milliseconds(250), color)
-    {}
-};
-
-std::set<std::string> read_singles_opponent(
-    const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context,
-    Language language
-);
-
-
-
-class MoveSelectDetector : public StaticScreenDetector{
-public:
-    MoveSelectDetector(Color color);
-
-    virtual void make_overlays(VideoOverlaySet& items) const override;
-    virtual bool detect(const ImageViewRGB32& screen) const override;
-
-    //  Returns -1 if not found.
-    int8_t detect_slot(const ImageViewRGB32& screen) const;
-    bool move_to_slot(ConsoleHandle& console, BotBaseContext& context, uint8_t slot) const;
-
-private:
-    WhiteButtonDetector m_info_button;
-    GradientArrowDetector m_arrow;
-};
-class MoveSelectWatcher : public DetectorToFinder<MoveSelectDetector>{
-public:
-    MoveSelectWatcher(Color color)
-        : DetectorToFinder("MoveSelectWatcher", std::chrono::milliseconds(250), color)
-    {}
-};
-
-
-
-class TerastallizingDetector : public StaticScreenDetector{
-public:
-    TerastallizingDetector(Color color);
-
-    virtual void make_overlays(VideoOverlaySet& items) const override;
-    virtual bool detect(const ImageViewRGB32& screen) const override;
-
-private:
-    Color m_color;
-    ImageFloatBox m_box;
-};
-
-
-
-class SwapMenuDetector : public StaticScreenDetector {
-public:
-    SwapMenuDetector(Color color);
-
-    virtual void make_overlays(VideoOverlaySet& items) const override;
-    virtual bool detect(const ImageViewRGB32& screen) const override;
-
-    //  Returns -1 if not found.
-    int8_t detect_slot(const ImageViewRGB32& screen) const;
-    bool move_to_slot(ConsoleHandle& console, BotBaseContext& context, uint8_t slot) const;
-
-private:
-    GradientArrowDetector m_arrow;
-};
-class SwapMenuWatcher : public DetectorToFinder<SwapMenuDetector> {
-public:
-    SwapMenuWatcher(Color color)
-        : DetectorToFinder("SwapMenuWatcher", std::chrono::milliseconds(250), color)
-    {}
-};
-
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSV/Inference/Battles/PokemonSV_PostCatchDetector.h b/SerialPrograms/Source/PokemonSV/Inference/Battles/PokemonSV_PostCatchDetector.h
deleted file mode 100644
index ffe9e2136b..0000000000
--- a/SerialPrograms/Source/PokemonSV/Inference/Battles/PokemonSV_PostCatchDetector.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*  Post-Catch Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSV_PostCatchDetector_H
-#define PokemonAutomation_PokemonSV_PostCatchDetector_H
-
-#include "Common/Cpp/Color.h"
-#include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "CommonFramework/Inference/VisualDetector.h"
-#include "CommonFramework/InferenceInfra/VisualInferenceCallback.h"
-#include "PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-
-
-class AddToPartyDetector : public StaticScreenDetector{
-public:
-    AddToPartyDetector(Color color = COLOR_RED);
-
-    virtual void make_overlays(VideoOverlaySet& items) const override;
-    virtual bool detect(const ImageViewRGB32& screen) const override;
-
-protected:
-    Color m_color;
-    ImageFloatBox m_top_left;
-    ImageFloatBox m_top_right;
-    ImageFloatBox m_bottom_left;
-    ImageFloatBox m_bottom_right;
-    PromptDialogDetector m_dialog;
-};
-class AddToPartyWatcher : public DetectorToFinder<AddToPartyDetector>{
-public:
-    AddToPartyWatcher(Color color = COLOR_RED)
-         : DetectorToFinder("AddToPartyFinder", std::chrono::milliseconds(250), color)
-    {}
-};
-
-
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSV/Inference/Battles/PokemonSV_ShinySoundDetector.cpp b/SerialPrograms/Source/PokemonSV/Inference/Battles/PokemonSV_ShinySoundDetector.cpp
deleted file mode 100644
index aea5142660..0000000000
--- a/SerialPrograms/Source/PokemonSV/Inference/Battles/PokemonSV_ShinySoundDetector.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-/*  Shiny Sound Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/Inference/SpectrogramMatcher.h"
-#include "CommonFramework/Inference/AudioTemplateCache.h"
-#include "CommonFramework/Tools/ConsoleHandle.h"
-#include "PokemonSV/PokemonSV_Settings.h"
-#include "PokemonSV_ShinySoundDetector.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-
-ShinySoundDetector::ShinySoundDetector(ConsoleHandle& console, DetectedCallback detected_callback)
-    // Use a yellow as the detection color because the shiny animation is yellow.
-    : AudioPerSpectrumDetectorBase("ShinySoundDetector", "Shiny sound", COLOR_YELLOW, console, detected_callback)
-{}
-float ShinySoundDetector::get_score_threshold() const{
-    return (float)GameSettings::instance().SHINY_SOUND_THRESHOLD2;
-}
-std::unique_ptr<SpectrogramMatcher> ShinySoundDetector::build_spectrogram_matcher(size_t sample_rate){
-    return std::make_unique<SpectrogramMatcher>(
-        "Shiny Sound",
-        AudioTemplateCache::instance().get_throw("PokemonSV/ShinySound", sample_rate),
-        SpectrogramMatcher::Mode::SPIKE_CONV, sample_rate,
-        GameSettings::instance().SHINY_SOUND_LOW_FREQUENCY
-    );
-}
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSV/Inference/Battles/PokemonSV_ShinySoundDetector.h b/SerialPrograms/Source/PokemonSV/Inference/Battles/PokemonSV_ShinySoundDetector.h
deleted file mode 100644
index 0745c78c95..0000000000
--- a/SerialPrograms/Source/PokemonSV/Inference/Battles/PokemonSV_ShinySoundDetector.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*  Shiny Sound Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSV_ShinySoundDetector_H
-#define PokemonAutomation_PokemonSV_ShinySoundDetector_H
-
-#include "CommonFramework/Inference/AudioPerSpectrumDetectorBase.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-
-class ShinySoundDetector : public AudioPerSpectrumDetectorBase{
-public:
-    ShinySoundDetector(ConsoleHandle& console, DetectedCallback detected_callback);
-
-    virtual float get_score_threshold() const override;
-
-protected:
-    virtual std::unique_ptr<SpectrogramMatcher> build_spectrogram_matcher(size_t sample_rate) override;
-};
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSV/Inference/Battles/PokemonSV_TeraBattleMenus.cpp b/SerialPrograms/Source/PokemonSV/Inference/Battles/PokemonSV_TeraBattleMenus.cpp
deleted file mode 100644
index 58615f4f8e..0000000000
--- a/SerialPrograms/Source/PokemonSV/Inference/Battles/PokemonSV_TeraBattleMenus.cpp
+++ /dev/null
@@ -1,309 +0,0 @@
-/*  Tera Battle Menus
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/ImageTools/SolidColorTest.h"
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "CommonFramework/Tools/ConsoleHandle.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "PokemonSV_TeraBattleMenus.h"
-
-//#include <iostream>
-//using std::cout;
-//using std::endl;
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-
-TeraBattleMenuDetector::TeraBattleMenuDetector(Color color)
-    : m_callouts_button(color, WhiteButton::ButtonMinus, {0.35, 0.87, 0.30, 0.05})
-    , m_arrow(color, GradientArrowType::RIGHT, {0.75, 0.62, 0.05, 0.35})
-{}
-void TeraBattleMenuDetector::make_overlays(VideoOverlaySet& items) const{
-    m_callouts_button.make_overlays(items);
-    m_arrow.make_overlays(items);
-}
-bool TeraBattleMenuDetector::detect(const ImageViewRGB32& screen) const{
-    if (!m_callouts_button.detect(screen)){
-//        cout << "status button" << endl;
-        return false;
-    }
-    if (!m_arrow.detect(screen)){
-//        cout << "arrow" << endl;
-        return false;
-    }
-    return true;
-}
-int8_t TeraBattleMenuDetector::detect_slot(const ImageViewRGB32& screen) const{
-    if (!m_callouts_button.detect(screen)){
-//        cout << "status button" << endl;
-        return -1;
-    }
-
-    ImageFloatBox box;
-    if (!m_arrow.detect(box, screen)){
-//        cout << "arrow" << endl;
-//        screen.save("test.png");
-        return -1;
-    }
-
-    double y = box.y + box.height * 0.5;
-    double slot = (y - 0.761111) / 0.0814815;
-//    cout << "slot = " << slot << endl;
-    return (int8_t)(slot + 0.5);
-}
-bool TeraBattleMenuDetector::move_to_slot(ConsoleHandle& console, BotBaseContext& context, uint8_t slot) const{
-    if (slot > 2){
-        return false;
-    }
-    for (size_t attempts = 0;; attempts++){
-        context.wait_for_all_requests();
-        VideoSnapshot screen = console.video().snapshot();
-        int8_t current_slot = detect_slot(screen);
-        if (current_slot < 0 || current_slot > 2){
-            console.log("TeraBattleMenuDetector::move_to_slot(): Unable to detect slot.", COLOR_RED);
-            return false;
-        }
-        if (attempts > 10){
-            console.log("TeraBattleMenuDetector::move_to_slot(): Failed to move slot after 10 attempts.", COLOR_RED);
-            return false;
-        }
-
-        uint8_t diff = (3 + slot - (uint8_t)current_slot) % 3;
-        switch (diff){
-        case 0:
-            return true;
-        case 1:
-            pbf_press_dpad(context, DPAD_DOWN, 20, 30);
-            continue;
-        case 2:
-            pbf_press_dpad(context, DPAD_UP, 20, 30);
-            continue;
-        }
-    }
-}
-
-
-
-
-
-CheerSelectDetector::CheerSelectDetector(Color color)
-    : m_info_button(color, WhiteButton::ButtonY, {0.35, 0.90, 0.30, 0.08})
-    , m_arrow(color, GradientArrowType::RIGHT, {0.705, 0.710, 0.050, 0.260})
-{}
-void CheerSelectDetector::make_overlays(VideoOverlaySet& items) const{
-    m_info_button.make_overlays(items);
-    m_arrow.make_overlays(items);
-}
-bool CheerSelectDetector::detect(const ImageViewRGB32& screen) const{
-    if (m_info_button.detect(screen)){
-//        cout << "status" << endl;
-        return false;
-    }
-    if (!m_arrow.detect(screen)){
-//        cout << "arrow" << endl;
-        return false;
-    }
-    return true;
-}
-int8_t CheerSelectDetector::detect_slot(const ImageViewRGB32& screen) const{
-    if (m_info_button.detect(screen)){
-//        cout << "status" << endl;
-        return false;
-    }
-
-    ImageFloatBox box;
-    if (!m_arrow.detect(box, screen)){
-//        cout << "arrow" << endl;
-        return false;
-    }
-
-    double y = box.y + box.height * 0.5;
-    y = (y - 0.758333) / 0.082639;
-//    cout << "y = " << y << endl;
-
-    return (int8_t)(y + 0.5);
-}
-bool CheerSelectDetector::move_to_slot(ConsoleHandle& console, BotBaseContext& context, uint8_t slot) const{
-    if (slot > 2){
-        return false;
-    }
-    for (size_t attempts = 0;; attempts++){
-        context.wait_for_all_requests();
-        VideoSnapshot screen = console.video().snapshot();
-        int8_t current_slot = detect_slot(screen);
-        if (current_slot < 0 || current_slot > 2){
-            console.log("CheerSelectDetector::move_to_slot(): Unable to detect slot.", COLOR_RED);
-            return false;
-        }
-        if (attempts > 10){
-            console.log("CheerSelectDetector::move_to_slot(): Failed to move slot after 10 attempts.", COLOR_RED);
-            return false;
-        }
-
-        uint8_t diff = (3 + slot - (uint8_t)current_slot) % 3;
-        switch (diff){
-        case 0:
-            return true;
-        case 1:
-            pbf_press_dpad(context, DPAD_DOWN, 20, 30);
-            continue;
-        case 2:
-            pbf_press_dpad(context, DPAD_UP, 20, 30);
-            continue;
-        }
-    }
-}
-
-
-
-
-
-TeraTargetSelectDetector::TeraTargetSelectDetector(Color color)
-    : m_opponent(color, GradientArrowType::DOWN, {0.45, 0.07, 0.10, 0.10})
-    , m_player0(color, GradientArrowType::DOWN, {0.20, 0.46, 0.10, 0.10})
-    , m_player1(color, GradientArrowType::DOWN, {0.37, 0.46, 0.10, 0.10})
-    , m_player2(color, GradientArrowType::DOWN, {0.53, 0.46, 0.10, 0.10})
-    , m_player3(color, GradientArrowType::DOWN, {0.70, 0.46, 0.10, 0.10})
-{}
-void TeraTargetSelectDetector::make_overlays(VideoOverlaySet& items) const{
-    m_opponent.make_overlays(items);
-    m_player0.make_overlays(items);
-    m_player1.make_overlays(items);
-    m_player2.make_overlays(items);
-    m_player3.make_overlays(items);
-}
-bool TeraTargetSelectDetector::detect(const ImageViewRGB32& screen) const{
-    if (m_opponent.detect(screen)){
-        return true;
-    }
-    if (m_player0.detect(screen)){
-        return true;
-    }
-    if (m_player1.detect(screen)){
-        return true;
-    }
-    if (m_player2.detect(screen)){
-        return true;
-    }
-    if (m_player3.detect(screen)){
-        return true;
-    }
-    return false;
-}
-int8_t TeraTargetSelectDetector::detect_slot(const ImageViewRGB32& screen) const{
-    if (m_opponent.detect(screen)){
-        return 0;
-    }
-    if (m_player0.detect(screen)){
-        return 1;
-    }
-    if (m_player1.detect(screen)){
-        return 2;
-    }
-    if (m_player2.detect(screen)){
-        return 3;
-    }
-    if (m_player3.detect(screen)){
-        return 4;
-    }
-    return -1;
-}
-bool TeraTargetSelectDetector::move_to_slot(ConsoleHandle& console, BotBaseContext& context, uint8_t slot) const{
-    if (slot > 4){
-        return false;
-    }
-    for (size_t attempts = 0;; attempts++){
-        context.wait_for_all_requests();
-        VideoSnapshot screen = console.video().snapshot();
-        int8_t current_slot = detect_slot(screen);
-        if (current_slot < 0 || current_slot > 4){
-            console.log("TargetSelectDetector::move_to_slot(): Unable to detect slot.", COLOR_RED);
-            return false;
-        }
-        if (attempts > 10){
-            console.log("TargetSelectDetector::move_to_slot(): Failed to move slot after 10 attempts.", COLOR_RED);
-            return false;
-        }
-
-        if (current_slot == 0 && slot != 0){
-            pbf_press_dpad(context, DPAD_DOWN, 20, 30);
-            continue;
-        }
-        if (current_slot != 0 && slot == 0){
-            pbf_press_dpad(context, DPAD_UP, 20, 30);
-            continue;
-        }
-
-        uint8_t diff = (4 + slot - (uint8_t)current_slot) % 4;
-        switch (diff){
-        case 0:
-            return true;
-        case 1:
-            pbf_press_dpad(context, DPAD_RIGHT, 20, 30);
-            continue;
-        case 2:
-            pbf_press_dpad(context, DPAD_RIGHT, 20, 30);
-            pbf_press_dpad(context, DPAD_RIGHT, 20, 30);
-            continue;
-        case 3:
-            pbf_press_dpad(context, DPAD_LEFT, 20, 30);
-            continue;
-        }
-    }
-}
-
-
-
-
-
-TeraCatchDetector::TeraCatchDetector(Color color)
-    : m_color(color)
-    , m_callouts_button(color, WhiteButton::ButtonMinus, {0.35, 0.87, 0.30, 0.05})
-    , m_button(0.801, 0.818, 0.005, 0.047)
-    , m_box_right(0.95, 0.81, 0.02, 0.06)
-    , m_arrow(color, GradientArrowType::RIGHT, {0.75, 0.80, 0.08, 0.09})
-{}
-void TeraCatchDetector::make_overlays(VideoOverlaySet& items) const{
-    items.add(m_color, m_box_right);
-    m_arrow.make_overlays(items);
-}
-bool TeraCatchDetector::detect(const ImageViewRGB32& screen) const{
-    ImageStats button = image_stats(extract_box_reference(screen, m_button));
-//    cout << button.average << button.stddev << endl;
-//    extract_box_reference(screen, m_button).save("button.png");
-
-    ImageStats yellow = image_stats(extract_box_reference(screen, m_box_right));
-//    cout << yellow.average << yellow.stddev << endl;
-//    extract_box_reference(screen, m_box_right).save("yellow.png");
-
-    bool button_ok = is_solid(button, {0.117281, 0.311767, 0.570951}, 0.20, 20) || is_black(button, 100, 20);
-    bool yellow_ok = is_solid(yellow, {0.554348, 0.445652, 0.}, 0.15, 20);
-    if (!button_ok && !yellow_ok){
-//        cout << "button and yellow bad" << endl;
-        return false;
-    }
-
-    if (!m_arrow.detect(screen)){
-//        cout << "arrow bad" << endl;
-        return false;
-    }
-
-    if (m_callouts_button.detect(screen)){
-        return false;
-    }
-
-    return true;
-}
-
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSV/Inference/Battles/PokemonSV_TeraBattleMenus.h b/SerialPrograms/Source/PokemonSV/Inference/Battles/PokemonSV_TeraBattleMenus.h
deleted file mode 100644
index 7dfe056a89..0000000000
--- a/SerialPrograms/Source/PokemonSV/Inference/Battles/PokemonSV_TeraBattleMenus.h
+++ /dev/null
@@ -1,130 +0,0 @@
-/*  Tera Battle Menus
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSV_TeraBattleMenus_H
-#define PokemonAutomation_PokemonSV_TeraBattleMenus_H
-
-#include "CommonFramework/Inference/VisualDetector.h"
-#include "PokemonSV/Inference/PokemonSV_WhiteButtonDetector.h"
-#include "PokemonSV/Inference/Dialogs/PokemonSV_GradientArrowDetector.h"
-
-namespace PokemonAutomation{
-    class ConsoleHandle;
-    class BotBaseContext;
-    struct ProgramInfo;
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-
-
-class TeraBattleMenuDetector : public StaticScreenDetector{
-public:
-    TeraBattleMenuDetector(Color color);
-
-    virtual void make_overlays(VideoOverlaySet& items) const override;
-    virtual bool detect(const ImageViewRGB32& screen) const override;
-
-    //  Returns -1 if not found.
-    int8_t detect_slot(const ImageViewRGB32& screen) const;
-    bool move_to_slot(ConsoleHandle& console, BotBaseContext& context, uint8_t slot) const;
-
-private:
-    WhiteButtonDetector m_callouts_button;
-    GradientArrowDetector m_arrow;
-};
-class TeraBattleMenuWatcher : public DetectorToFinder<TeraBattleMenuDetector>{
-public:
-    TeraBattleMenuWatcher(Color color)
-        : DetectorToFinder("TeraBattleMenuWatcher", std::chrono::milliseconds(250), color)
-    {}
-};
-
-
-
-
-class CheerSelectDetector : public StaticScreenDetector{
-public:
-    CheerSelectDetector(Color color);
-
-    virtual void make_overlays(VideoOverlaySet& items) const override;
-    virtual bool detect(const ImageViewRGB32& screen) const override;
-
-    //  Returns -1 if not found.
-    int8_t detect_slot(const ImageViewRGB32& screen) const;
-    bool move_to_slot(ConsoleHandle& console, BotBaseContext& context, uint8_t slot) const;
-
-private:
-    WhiteButtonDetector m_info_button;
-    GradientArrowDetector m_arrow;
-};
-class CheerSelectWatcher : public DetectorToFinder<CheerSelectDetector>{
-public:
-    CheerSelectWatcher(Color color)
-        : DetectorToFinder("CheerSelectWatcher", std::chrono::milliseconds(250), color)
-    {}
-};
-
-
-
-class TeraTargetSelectDetector : public StaticScreenDetector{
-public:
-    TeraTargetSelectDetector(Color color);
-
-    virtual void make_overlays(VideoOverlaySet& items) const override;
-    virtual bool detect(const ImageViewRGB32& screen) const override;
-
-    //  Returns -1 if not found.
-    //  Returns 0 if opponent.
-    //  Returns 1 if left-most player.
-    //  Returns 4 if right-most player.
-    int8_t detect_slot(const ImageViewRGB32& screen) const;
-    bool move_to_slot(ConsoleHandle& console, BotBaseContext& context, uint8_t slot) const;
-
-private:
-    GradientArrowDetector m_opponent;
-    GradientArrowDetector m_player0;
-    GradientArrowDetector m_player1;
-    GradientArrowDetector m_player2;
-    GradientArrowDetector m_player3;
-};
-class TargetSelectWatcher : public DetectorToFinder<TeraTargetSelectDetector>{
-public:
-    TargetSelectWatcher(Color color)
-        : DetectorToFinder("TargetSelectWatcher", std::chrono::milliseconds(250), color)
-    {}
-};
-
-
-
-class TeraCatchDetector : public StaticScreenDetector{
-public:
-    TeraCatchDetector(Color color);
-
-    virtual void make_overlays(VideoOverlaySet& items) const override;
-    virtual bool detect(const ImageViewRGB32& screen) const override;
-
-private:
-    Color m_color;
-    WhiteButtonDetector m_callouts_button;
-    ImageFloatBox m_button;
-    ImageFloatBox m_box_right;
-    GradientArrowDetector m_arrow;
-};
-class TeraCatchWatcher : public DetectorToFinder<TeraCatchDetector>{
-public:
-    TeraCatchWatcher(Color color)
-        : DetectorToFinder("TeraCatchWatcher", std::chrono::milliseconds(1000), color)
-    {}
-};
-
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSV/Inference/Boxes/PokemonSV_BoxDetection.cpp b/SerialPrograms/Source/PokemonSV/Inference/Boxes/PokemonSV_BoxDetection.cpp
deleted file mode 100644
index 2d34298b13..0000000000
--- a/SerialPrograms/Source/PokemonSV/Inference/Boxes/PokemonSV_BoxDetection.cpp
+++ /dev/null
@@ -1,437 +0,0 @@
-/*  Box Detection
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Cpp/Containers/FixedLimitVector.tpp"
-#include "Common/Cpp/Exceptions.h"
-#include "CommonFramework/ImageTools/SolidColorTest.h"
-#include "CommonFramework/Tools/ConsoleHandle.h"
-#include "CommonFramework/Tools/ErrorDumper.h"
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "PokemonSV_BoxDetection.h"
-
-#include <iostream>
-using std::cout;
-using std::endl;;
-
-namespace PokemonAutomation{
-
-template class FixedLimitVector<NintendoSwitch::PokemonSV::BoxEmptySlotWatcher>;
-
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-std::string BOX_CURSOR_LOCATION_NAMES(BoxCursorLocation location){
-    switch(location){
-    case BoxCursorLocation::NONE:
-        return "NONE";
-    case BoxCursorLocation::PARTY:
-        return "PARTY";
-    case BoxCursorLocation::BOX_CHANGE:
-        return "BOX_CHANGE";
-    case BoxCursorLocation::ALL_BOXES:
-        return "ALL_BOXES";
-    case BoxCursorLocation::SEARCH:
-        return "SEARCH";
-    case BoxCursorLocation::SLOTS:
-        return "SLOTS";
-    default:
-        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Unknown BoxCursorLocation");
-    }
-}
-
-std::string BOX_LOCATION_STRING(BoxCursorLocation location, uint8_t row, uint8_t col){
-    return "(" + BOX_CURSOR_LOCATION_NAMES(location) + " row " + std::to_string(row) + " col " + std::to_string(col) + ")";
-}
-
-
-SomethingInBoxSlotDetector::SomethingInBoxSlotDetector(Color color, bool true_if_exists)
-    : m_true_if_exists(true_if_exists)
-    , m_color(color)
-    , m_right(0.985, 0.010, 0.010, 0.050)
-    , m_top(0.660, 0.005, 0.330, 0.006)
-    , m_bottom(0.660, 0.064, 0.330, 0.005)
-    , m_body(0.670, 0.010, 0.060, 0.050)
-{}
-void SomethingInBoxSlotDetector::make_overlays(VideoOverlaySet& items) const{
-    items.add(m_color, m_right);
-    items.add(m_color, m_top);
-    items.add(m_color, m_bottom);
-    items.add(m_color, m_body);
-}
-bool SomethingInBoxSlotDetector::detect(const ImageViewRGB32& screen) const{
-    ImageStats right = image_stats(extract_box_reference(screen, m_right));
-//    extract_box_reference(screen, m_right).save("test.png");
-//    cout << right.average << right.stddev << endl;
-    if (!is_solid(right, {0.533473, 0.466527, 0.0}, 0.15, 20)){
-//        cout << "asdf" << endl;
-        return !m_true_if_exists;
-    }
-    ImageStats top = image_stats(extract_box_reference(screen, m_top));
-//    cout << top.average << top.stddev << endl;
-    if (!is_solid(top, {0.533473, 0.466527, 0.0})){
-//        cout << "qwer" << endl;
-        return !m_true_if_exists;
-    }
-    ImageStats bottom = image_stats(extract_box_reference(screen, m_bottom));
-//     cout << bottom.average << bottom.stddev << endl;
-//    extract_box_reference(screen, m_bottom).save("./tmp_bottom.png");
-    if (!is_solid(bottom, {0.533473, 0.466527, 0.0}, 0.15, 15.0)){
-//        cout << "zxcv" << endl;
-        return !m_true_if_exists;
-    }
-    ImageStats body = image_stats(extract_box_reference(screen, m_body));
-//    cout << body.average << body.stddev << endl;
-    if (body.stddev.sum() < 100){
-        return !m_true_if_exists;
-    }
-
-    return m_true_if_exists;
-}
-
-
-
-
-BoxSelectDetector::BoxSelectDetector(Color color)
-    : m_color(color)
-    , m_exists(color, true)
-    , m_dialog(color)
-    , m_gradient(color, GradientArrowType::RIGHT, {0.20, 0.17, 0.50, 0.10})
-{}
-void BoxSelectDetector::make_overlays(VideoOverlaySet& items) const{
-    m_exists.make_overlays(items);
-    m_dialog.make_overlays(items);
-    m_gradient.make_overlays(items);
-}
-bool BoxSelectDetector::exists(const ImageViewRGB32& screen) const{
-    return m_exists.detect(screen);
-}
-bool BoxSelectDetector::detect(const ImageViewRGB32& screen) const{
-    if (!exists(screen)){
-        return false;
-    }
-    if (!m_dialog.detect(screen)){
-        return false;
-    }
-    if (!m_gradient.detect(screen)){
-        return false;
-    }
-    return true;
-}
-
-
-BoxDetector::BoxDetector(Color color)
-    : m_color(color)
-    , m_party(color, GradientArrowType::DOWN, {0.140, 0.150, 0.050, 0.700})
-    , m_box_change(color, GradientArrowType::DOWN, {0.405, 0.070, 0.050, 0.090})
-    , m_all_boxes(color, GradientArrowType::DOWN, {0.295, 0.780, 0.050, 0.090})
-    , m_search(color, GradientArrowType::DOWN, {0.510, 0.780, 0.050, 0.090})
-    , m_slots(color, GradientArrowType::DOWN, {0.240, 0.160, 0.380, 0.550})
-{}
-void BoxDetector::make_overlays(VideoOverlaySet& items) const{
-    m_party.make_overlays(items);
-    m_box_change.make_overlays(items);
-    m_all_boxes.make_overlays(items);
-    m_search.make_overlays(items);
-    m_slots.make_overlays(items);
-}
-bool BoxDetector::detect(const ImageViewRGB32& screen) const{
-    if (m_party.detect(screen)){
-        return true;
-    }
-    if (m_box_change.detect(screen)){
-        return true;
-    }
-    if (m_all_boxes.detect(screen)){
-        return true;
-    }
-    if (m_search.detect(screen)){
-        return true;
-    }
-    if (m_slots.detect(screen)){
-        return true;
-    }
-    return false;
-}
-std::pair<BoxCursorLocation, BoxCursorCoordinates> BoxDetector::detect_location(const ImageViewRGB32& screen) const{
-    if (m_box_change.detect(screen)){
-        return {BoxCursorLocation::BOX_CHANGE, {0, 0}};
-    }
-    if (m_all_boxes.detect(screen)){
-        return {BoxCursorLocation::ALL_BOXES, {0, 0}};
-    }
-    if (m_search.detect(screen)){
-        return {BoxCursorLocation::SEARCH, {0, 0}};
-    }
-
-    ImageFloatBox box;
-    if (m_party.detect(box, screen)){
-//        cout << box.y << endl;
-        int slot = (int)((box.y - 0.175926) / 0.116296 + 0.5);
-        if (slot < 0){
-            return {BoxCursorLocation::NONE, {0, 0}};
-        }
-        return {BoxCursorLocation::PARTY, {(uint8_t)slot, 0}};
-    }
-    if (m_slots.detect(box, screen)){
-//        cout << box.x << " " << box.y << endl;
-        int x = (int)((box.x - 0.247917) / 0.065625 + 0.5);
-        if (x < 0){
-            return {BoxCursorLocation::NONE, {0, 0}};
-        }
-        int y = (int)((box.y - 0.175926) / 0.11713 + 0.5);
-        if (x < 0){
-            return {BoxCursorLocation::NONE, {0, 0}};
-        }
-        return {BoxCursorLocation::SLOTS, {(uint8_t)y, (uint8_t)x}};
-    }
-
-    return {BoxCursorLocation::NONE, {0, 0}};
-}
-
-
-bool BoxDetector::to_coordinates(int& x, int& y, BoxCursorLocation side, uint8_t row, uint8_t col) const{
-    switch (side){
-    case BoxCursorLocation::NONE:
-        return false;
-    case BoxCursorLocation::PARTY:
-        x = -1;
-        y = row;
-        break;
-    case BoxCursorLocation::BOX_CHANGE:
-        x = 2;
-        y = -1;
-        break;
-    case BoxCursorLocation::ALL_BOXES:
-        x = 1;
-        y = 5;
-        break;
-    case BoxCursorLocation::SEARCH:
-        x = 4;
-        y = 5;
-        break;
-    case BoxCursorLocation::SLOTS:
-        x = col;
-        y = row;
-        break;
-    default:
-        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Unknown BoxCursorLocation");
-    }
-    return true;
-}
-void BoxDetector::move_vertical(BotBaseContext& context, int current, int desired) const{
-    int diff = (current - desired + 7) % 7;
-//    cout << "diff = " << diff << endl;
-    if (diff <= 3){
-        for (int c = 0; c < diff; c++){
-            pbf_press_dpad(context, DPAD_UP, 20, 30);
-        }
-    }else{
-        for (int c = diff; c < 7; c++){
-            pbf_press_dpad(context, DPAD_DOWN, 20, 30);
-        }
-    }
-}
-void BoxDetector::move_horizontal(BotBaseContext& context, int current, int desired) const{
-    int diff = (current - desired + 7) % 7;
-    if (diff <= 3){
-        for (int c = 0; c < diff; c++){
-            pbf_press_dpad(context, DPAD_LEFT, 20, 30);
-        }
-    }else{
-        for (int c = diff; c < 7; c++){
-            pbf_press_dpad(context, DPAD_RIGHT, 20, 30);
-        }
-    }
-}
-
-
-void BoxDetector::move_cursor(
-    const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context,
-    BoxCursorLocation side, uint8_t row, uint8_t col
-) const{
-    int desired_x = 0, desired_y = 0;
-    if (!to_coordinates(desired_x, desired_y, side, row, col)){
-        throw InternalProgramError(
-            &console.logger(), PA_CURRENT_FUNCTION,
-            "BoxDetector::move_cursor() called with BoxCursorLocation::NONE."
-        );
-    }
-//    cout << "desired_x = " << desired_x << ", desired_y = " << desired_y << endl;
-
-    size_t consecutive_fails = 0;
-    WallClock start = current_time();
-    while (true){
-        if (current_time() - start > std::chrono::seconds(60)){
-            dump_image_and_throw_recoverable_exception(
-                info, console, "BoxMoveCursor",
-                "Failed to move cursor to desired location after 1 minute."
-            );
-        }
-
-        context.wait_for_all_requests();
-        VideoSnapshot screen = console.video().snapshot();
-        std::pair<BoxCursorLocation, BoxCursorCoordinates> current = this->detect_location(screen);
-
-        int current_x = 0, current_y = 0;
-        if (!to_coordinates(current_x, current_y, current.first, current.second.row, current.second.col)){
-            consecutive_fails++;
-            if (consecutive_fails > 100){
-                dump_image_and_throw_recoverable_exception(info, console, "BoxSystemNotDetected", "move_cursor(): Unable to detect box system.");
-            }
-            context.wait_for(std::chrono::milliseconds(100));
-            continue;
-        }
-//        cout << "current_x = " << current_x << ", current_y = " << current_y << endl;
-
-        if (current_x == desired_x && current_y == desired_y){
-//            cout << "done!" << endl;
-            return;
-        }
-
-        //  If we're on the party, always move horizontally first.
-        if (current_x == -1){
-            if (desired_x == -1){
-                if (row < current.second.row){
-                    for (uint8_t r = row; r < current.second.row; r++){
-                        pbf_press_dpad(context, DPAD_UP, 20, 30);
-                    }
-                }else{ // row >= current.second.row
-                    for (uint8_t r = current.second.row; r < row; r++){
-                        pbf_press_dpad(context, DPAD_DOWN, 20, 30);
-                    }
-                }
-                continue;
-            }
-            else if (desired_x < 3){
-                pbf_press_dpad(context, DPAD_RIGHT, 20, 30);
-            }else{
-                pbf_press_dpad(context, DPAD_LEFT, 20, 30);
-            }
-            continue;
-        }
-
-        //  Otherwise, always move vertically first.
-        if (current_y != desired_y){
-            move_vertical(context, current_y, desired_y);
-            continue;
-        }
-
-        //  Special case for bottom row.
-        if (current_y == 5){
-            int diff = (current_x - desired_x + 7) % 7;
-            if (diff <= 3){
-                pbf_press_dpad(context, DPAD_LEFT, 20, 30);
-            }else{
-                pbf_press_dpad(context, DPAD_RIGHT, 20, 30);
-            }
-            continue;
-        }
-
-        //  Now handle horizontals.
-        move_horizontal(context, current_x, desired_x);
-    }
-}
-
-BoxEmptySlotDetector::BoxEmptySlotDetector(BoxCursorLocation side, uint8_t row, uint8_t col, Color color)
-: m_color(color) {
-    if (side == BoxCursorLocation::PARTY){
-        m_box = ImageFloatBox(0.142, 0.1165 * row + 0.201, 0.048, 0.082);
-    } else if (side == BoxCursorLocation::SLOTS){
-        m_box = ImageFloatBox(0.0656 * col + 0.242, 0.1165 * row + 0.201, 0.048, 0.082);
-    } else {
-        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "INVALID BoxCursorLocation for BoxEmptySlotDetector");
-    }
-}
-
-void BoxEmptySlotDetector::make_overlays(VideoOverlaySet& items) const{
-    items.add(m_color, m_box);
-}
-
-bool BoxEmptySlotDetector::detect(const ImageViewRGB32& frame) const{
-    const auto stats = image_stats(extract_box_reference(frame, m_box));
-    return stats.stddev.sum() < 20.0;
-}
-
-
-
-BoxEmptyPartyWatcher::BoxEmptyPartyWatcher(Color color) : VisualInferenceCallback("BoxEmptyPartyWatcher"), m_empty_watchers(5) {
-    for(uint8_t i = 0; i < 5; i++){
-        m_empty_watchers.emplace_back(
-            BoxCursorLocation::PARTY,
-            (uint8_t)(i + 1), (uint8_t)0,
-            BoxEmptySlotWatcher::FinderType::CONSISTENT,
-            color
-        );
-    }
-}
-
-void BoxEmptyPartyWatcher::make_overlays(VideoOverlaySet& items) const{
-    for(int i = 0; i < 5; i++){
-        m_empty_watchers[i].make_overlays(items);
-    }
-}
-
-bool BoxEmptyPartyWatcher::process_frame(const ImageViewRGB32& frame, WallClock timestamp){
-    bool all_certain = true;
-    for(int i = 0; i < 5; i++){
-        // Return true if it is sure that the slot is empty or not
-        const bool empty_certain = m_empty_watchers[i].process_frame(frame, timestamp);
-
-        if (!empty_certain){
-            all_certain = false;
-        }
-    }
-    return all_certain;
-}
-
-uint8_t BoxEmptyPartyWatcher::num_empty_slots_found() const{
-    uint8_t num_empty = 0;
-    for(int i = 0; i < 5; i++){
-        if (m_empty_watchers[i].consistent_result()){
-            num_empty++;
-        }
-    }
-    return num_empty;
-}
-
-namespace{
-    ImageFloatBox BOTTOM_BUTTON_Y_BOX{0.391, 0.939, 0.400, 0.047};
-} // anonymous namespace
-
-BoxBottomButtonYDetector::BoxBottomButtonYDetector(Color color)
-    : WhiteButtonDetector(color, WhiteButton::ButtonY, BOTTOM_BUTTON_Y_BOX)
-{}
-BoxBottomButtonBDetector::BoxBottomButtonBDetector(Color color)
-    : WhiteButtonDetector(color, WhiteButton::ButtonB, {0.842, 0.939, 0.139, 0.047})
-{}
-
-
-BoxSelectionBoxModeWatcher::BoxSelectionBoxModeWatcher(Color color)
-    : VisualInferenceCallback("BoxSelectionBoxModeWatcher")
-    , button_y_watcher(color, WhiteButton::ButtonY, BOTTOM_BUTTON_Y_BOX, WhiteButtonWatcher::FinderType::CONSISTENT)
-{}
-
-void BoxSelectionBoxModeWatcher::make_overlays(VideoOverlaySet& items) const{
-    button_y_watcher.make_overlays(items);
-}
-
-bool BoxSelectionBoxModeWatcher::process_frame(const ImageViewRGB32& frame, WallClock timestamp){
-    return button_y_watcher.process_frame(frame, timestamp);
-}
-
-bool BoxSelectionBoxModeWatcher::in_box_selection_mode() const{
-    // If we have button Y detected, then we are NOT in box selection mode
-    return !button_y_watcher.consistent_result();
-}
-
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSV/Inference/Boxes/PokemonSV_BoxEggDetector.cpp b/SerialPrograms/Source/PokemonSV/Inference/Boxes/PokemonSV_BoxEggDetector.cpp
deleted file mode 100644
index 7d88ac5a5b..0000000000
--- a/SerialPrograms/Source/PokemonSV/Inference/Boxes/PokemonSV_BoxEggDetector.cpp
+++ /dev/null
@@ -1,166 +0,0 @@
-/*  Box Eggs Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Cpp/Containers/FixedLimitVector.tpp"
-#include "Common/Cpp/Exceptions.h"
-#include "CommonFramework/Globals.h"
-#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
-#include "CommonFramework/ImageMatch/WaterfillTemplateMatcher.h"
-#include "CommonFramework/ImageTools/WaterfillUtilities.h"
-#include "CommonFramework/ImageTools/ImageStats.h"
-#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
-#include "Kernels/Waterfill/Kernels_Waterfill_Types.h"
-#include "PokemonSV/Inference/Boxes/PokemonSV_BoxDetection.h"
-#include "PokemonSV_BoxEggDetector.h"
-
-#include <iostream>
-using std::cout;
-using std::endl;
-
-namespace PokemonAutomation{
-
-template class FixedLimitVector<NintendoSwitch::PokemonSV::BoxEggWatcher>;
-
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-namespace {
-
-class EggMatcher : public ImageMatch::WaterfillTemplateMatcher{
-public:
-    EggMatcher() : WaterfillTemplateMatcher(
-        "PokemonSV/Egg-Template.png", Color(100,100,100), Color(255, 255, 255), 50
-    ) {
-        m_aspect_ratio_lower = 0.9;
-        m_aspect_ratio_upper = 1.2;
-        m_area_ratio_lower = 0.9;
-        m_area_ratio_upper = 1.2;
-    }
-
-    static const ImageMatch::WaterfillTemplateMatcher& instance() {
-        static EggMatcher matcher;
-        return matcher;
-    }
-};
-
-} // end anonymous namespace
-
-
-
-
-BoxCurrentEggDetector::BoxCurrentEggDetector(Color color)
-: m_color(color), m_box{0.659, 0.082, 0.329, 0.043} {}
-
-void BoxCurrentEggDetector::make_overlays(VideoOverlaySet& items) const{
-    items.add(m_color, m_box);
-}
-
-bool BoxCurrentEggDetector::detect(const ImageViewRGB32& frame) const{
-    const auto stats = image_stats(extract_box_reference(frame, m_box));
-    return stats.stddev.sum() < 20;
-}
-
-
-BoxEggDetector::BoxEggDetector(BoxCursorLocation side, uint8_t row, uint8_t col, Color color)
-: m_color(color) {
-    if (side == BoxCursorLocation::PARTY){
-        m_box = ImageFloatBox(0.149, 0.1165 * row + 0.235, 0.033, 0.066);
-    } else if (side == BoxCursorLocation::SLOTS){
-        m_box = ImageFloatBox(0.0656 * col + 0.249, 0.1165 * row + 0.235, 0.033, 0.066);
-    } else {
-        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "INVALID BoxCursorLocation for BoxEggDetector");
-    }
-}
-
-void BoxEggDetector::make_overlays(VideoOverlaySet& items) const{
-    items.add(m_color, m_box);
-}
-
-bool BoxEggDetector::detect(const ImageViewRGB32& frame) const{
-    const std::vector<std::pair<uint32_t, uint32_t>> filters = {
-        {combine_rgb(200, 200, 200), combine_rgb(255, 255, 255)}
-    };
-
-    const double screen_rel_size = (frame.height() / 1080.0);
-
-    const size_t min_size = size_t(screen_rel_size * screen_rel_size * 700);
-    
-    return match_template_by_waterfill(
-        extract_box_reference(frame, m_box), 
-        EggMatcher::instance(),
-        filters,
-        {min_size, SIZE_MAX},
-        75,
-        [&](Kernels::Waterfill::WaterfillObject& object) -> bool { return true; }
-    );
-}
-
-BoxEggPartyColumnWatcher::BoxEggPartyColumnWatcher(Color color)
-    : VisualInferenceCallback("BoxEggPartyColumnWatcher"),
-    m_egg_watchers(5), m_empty_watchers(5)
-{
-    for(uint8_t i = 0; i < 5; i++){
-        m_egg_watchers.emplace_back(
-            BoxCursorLocation::PARTY,
-            (uint8_t)(i + 1), (uint8_t)0,
-            BoxEggWatcher::FinderType::CONSISTENT,
-            color
-        );
-        m_empty_watchers.emplace_back(
-            BoxCursorLocation::PARTY,
-            (uint8_t)(i + 1), (uint8_t)0,
-            BoxEmptySlotWatcher::FinderType::CONSISTENT,
-            color
-        );
-    }
-}
-
-void BoxEggPartyColumnWatcher::make_overlays(VideoOverlaySet& items) const{
-    for(int i = 0; i < 5; i++){
-        m_egg_watchers[i].make_overlays(items);
-        m_empty_watchers[i].make_overlays(items);
-    }
-}
-
-bool BoxEggPartyColumnWatcher::process_frame(const ImageViewRGB32& frame, WallClock timestamp){
-    bool all_certain = true;
-    for(int i = 0; i < 5; i++){
-        // Return true if an egg is detected
-        const bool egg_certain =  m_egg_watchers[i].process_frame(frame, timestamp);
-        // Return true if it is sure that the slot is empty or not
-        const bool empty_certain = m_empty_watchers[i].process_frame(frame, timestamp);
-
-        if (!egg_certain || !empty_certain){
-            all_certain = false;
-        }
-    }
-    return all_certain;
-}
-
-uint8_t BoxEggPartyColumnWatcher::num_eggs_found() const{
-    uint8_t num_eggs = 0;
-    for(int i = 0; i < 5; i++){
-        if (m_egg_watchers[i].consistent_result()){
-            num_eggs++;
-        }
-    }
-    return num_eggs;
-}
-
-uint8_t BoxEggPartyColumnWatcher::num_non_egg_pokemon_found() const{
-    uint8_t num_pokemon = 0;
-    for(int i = 0; i < 5; i++){
-        if (m_empty_watchers[i].consistent_result() == false && m_egg_watchers[i].consistent_result() == false){
-            num_pokemon++;
-        }
-    }
-    return num_pokemon;
-}
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSV/Inference/Boxes/PokemonSV_BoxEggDetector.h b/SerialPrograms/Source/PokemonSV/Inference/Boxes/PokemonSV_BoxEggDetector.h
deleted file mode 100644
index 1b2f2c5cbe..0000000000
--- a/SerialPrograms/Source/PokemonSV/Inference/Boxes/PokemonSV_BoxEggDetector.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*  Box Egg Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSV_BoxEggDetector_H
-#define PokemonAutomation_PokemonSV_BoxEggDetector_H
-
-#include "Common/Cpp/Color.h"
-#include "Common/Cpp/Containers/FixedLimitVector.h"
-#include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "CommonFramework/InferenceInfra/VisualInferenceCallback.h"
-#include "CommonFramework/Inference/VisualDetector.h"
-#include "PokemonSV/Inference/Boxes/PokemonSV_BoxDetection.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-// Detect if the currently selected pokemon is an egg or not, assuming the current
-// selected slot is not empty and the box view is stats or judege mode.
-class BoxCurrentEggDetector : public StaticScreenDetector{
-public:
-    BoxCurrentEggDetector(Color color = COLOR_BLUE);
-
-    virtual void make_overlays(VideoOverlaySet& items) const override;
-    virtual bool detect(const ImageViewRGB32& screen) const override;
-
-private:
-    Color m_color;
-    ImageFloatBox m_box;
-};
-
-
-// Detect if a slot in the box system is an egg.
-class BoxEggDetector : public StaticScreenDetector{
-public:
-    BoxEggDetector(BoxCursorLocation side, uint8_t row, uint8_t col, Color color = COLOR_YELLOW);
-
-    virtual void make_overlays(VideoOverlaySet& items) const override;
-    virtual bool detect(const ImageViewRGB32& screen) const override;
-
-private:
-    Color m_color;
-    ImageFloatBox m_box;
-};
-
-class BoxEggWatcher : public DetectorToFinder<BoxEggDetector>{
-public:
-    BoxEggWatcher(BoxCursorLocation side, uint8_t row, uint8_t col, FinderType finder_type = FinderType::PRESENT, Color color = COLOR_YELLOW)
-         : DetectorToFinder("BoxEggWatcher", finder_type, std::chrono::milliseconds(100), side, row, col, color)
-    {}
-};
-
-// Detect eggs in a party column (five slots after the party lead). Used for egg hatching.
-// It also detects empty spaces and non-empty spaces, so that we know whether we have non-egg pokemon in the party.
-class BoxEggPartyColumnWatcher : public VisualInferenceCallback{
-public:
-    BoxEggPartyColumnWatcher(Color color = COLOR_YELLOW);
-
-    virtual void make_overlays(VideoOverlaySet& items) const override;
-    
-    // Return true when the watcher is sure that each of the five slots is either egg, non-egg pokemon or empty.
-    virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override;
-
-    uint8_t num_eggs_found() const;
-    
-    uint8_t num_non_egg_pokemon_found() const;
-
-private:
-    FixedLimitVector<BoxEggWatcher> m_egg_watchers;
-    FixedLimitVector<BoxEmptySlotWatcher> m_empty_watchers;
-};
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSV/Inference/Boxes/PokemonSV_BoxGenderDetector.cpp b/SerialPrograms/Source/PokemonSV/Inference/Boxes/PokemonSV_BoxGenderDetector.cpp
deleted file mode 100644
index caebedef80..0000000000
--- a/SerialPrograms/Source/PokemonSV/Inference/Boxes/PokemonSV_BoxGenderDetector.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-/*  IV Checker Reader
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "PokemonSV_BoxGenderDetector.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-BoxGenderDetector::BoxGenderDetector(Color color) : Pokemon::BoxGenderDetector({0.965, 0.019, 0.019, 0.034}, 0.2, color) {}
-
-
-}
-}
-}
-
diff --git a/SerialPrograms/Source/PokemonSV/Inference/Boxes/PokemonSV_BoxGenderDetector.h b/SerialPrograms/Source/PokemonSV/Inference/Boxes/PokemonSV_BoxGenderDetector.h
deleted file mode 100644
index dd6655bc91..0000000000
--- a/SerialPrograms/Source/PokemonSV/Inference/Boxes/PokemonSV_BoxGenderDetector.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*  Box Gender Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_BoxGenderDetector_H
-#define PokemonAutomation_PokemonSwSh_BoxGenderDetector_H
-
-#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
-#include "Pokemon/Inference/Pokemon_BoxGenderDetector.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-
-class BoxGenderDetector : public Pokemon::BoxGenderDetector{
-
-public:
-    BoxGenderDetector(Color color = COLOR_RED);
-
-};
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSV/Inference/Boxes/PokemonSV_BoxShinyDetector.cpp b/SerialPrograms/Source/PokemonSV/Inference/Boxes/PokemonSV_BoxShinyDetector.cpp
deleted file mode 100644
index bc035685e1..0000000000
--- a/SerialPrograms/Source/PokemonSV/Inference/Boxes/PokemonSV_BoxShinyDetector.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-/*  Box Shiny Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
-#include "CommonFramework/ImageTools/ImageStats.h"
-#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
-#include "PokemonSV_BoxShinyDetector.h"
-
-#include <iostream>
-using std::cout;
-using std::endl;
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-
-BoxShinyDetector::BoxShinyDetector(Color color)
-: m_color(color), m_box{0.878, 0.081, 0.028, 0.046} {}
-
-void BoxShinyDetector::make_overlays(VideoOverlaySet& items) const{
-    items.add(m_color, m_box);
-}
-
-bool BoxShinyDetector::detect(const ImageViewRGB32& frame) const{
-    const auto stats = image_stats(extract_box_reference(frame, m_box));
-    // cout << "stats.stddev.sum() " << stats.stddev.sum() << endl;
-    // On screenshots collected from macOS-Mirabox, non-shiny has stddev of at most 3.0, while
-    // shiny has stdddev of 160.
-    return stats.stddev.sum() > 100;
-}
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSV/Inference/Boxes/PokemonSV_BoxShinyDetector.h b/SerialPrograms/Source/PokemonSV/Inference/Boxes/PokemonSV_BoxShinyDetector.h
deleted file mode 100644
index 7191a659ad..0000000000
--- a/SerialPrograms/Source/PokemonSV/Inference/Boxes/PokemonSV_BoxShinyDetector.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*  Box Shiny Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSV_BoxShinyDetector_H
-#define PokemonAutomation_PokemonSV_BoxShinyDetector_H
-
-#include "Common/Cpp/Color.h"
-#include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "CommonFramework/InferenceInfra/VisualInferenceCallback.h"
-#include "CommonFramework/Inference/VisualDetector.h"
-#include "PokemonSV/Inference/Boxes/PokemonSV_BoxDetection.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-// Detect the shiny symbol on a pokemon in box system
-class BoxShinyDetector : public StaticScreenDetector{
-public:
-    BoxShinyDetector(Color color = COLOR_YELLOW);
-
-    virtual void make_overlays(VideoOverlaySet& items) const override;
-    virtual bool detect(const ImageViewRGB32& screen) const override;
-
-private:
-    Color m_color;
-    ImageFloatBox m_box;
-};
-
-class BoxShinyWatcher : public DetectorToFinder<BoxShinyDetector>{
-public:
-    BoxShinyWatcher(FinderType finder_type = FinderType::PRESENT, Color color = COLOR_YELLOW)
-         : DetectorToFinder("BoxShinyWatcher", finder_type, std::chrono::milliseconds(100), color)
-    {}
-};
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSV/Inference/Boxes/PokemonSV_IVCheckerReader.cpp b/SerialPrograms/Source/PokemonSV/Inference/Boxes/PokemonSV_IVCheckerReader.cpp
deleted file mode 100644
index 183a82473e..0000000000
--- a/SerialPrograms/Source/PokemonSV/Inference/Boxes/PokemonSV_IVCheckerReader.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-/*  IV Checker Reader
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
-#include "PokemonSV_IVCheckerReader.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-
-const IVCheckerReader& IV_READER(){
-    const static Pokemon::IVCheckerReader reader("PokemonSV/IVCheckerOCR.json");
-    return reader;
-}
-
-
-
-IVCheckerReaderScope::IVCheckerReaderScope(VideoOverlay& overlay, Language language)
-    : m_language(language)
-    , m_box_hp(overlay, {0.825, 0.192, 0.110, 0.052})
-    , m_box_attack(overlay, {0.886, 0.302, 0.110, 0.052})
-    , m_box_defense(overlay, {0.886, 0.406, 0.110, 0.052})
-    , m_box_spatk(overlay, {0.660, 0.302, 0.110, 0.052})
-    , m_box_spdef(overlay, {0.660, 0.406, 0.110, 0.052})
-    , m_box_speed(overlay, {0.825, 0.470, 0.110, 0.052})
-{}
-
-
-IVCheckerValue IVCheckerReaderScope::read(Logger& logger, const ImageViewRGB32& frame, const OverlayBoxScope& box){
-    ImageViewRGB32 image = extract_box_reference(frame, box);
-    OCR::StringMatchResult result = IV_READER().read_substring(
-        logger, m_language, image,
-        OCR::WHITE_TEXT_FILTERS()
-    );
-    result.clear_beyond_log10p(IVCheckerReader::MAX_LOG10P);
-    if (result.results.size() != 1){
-        return IVCheckerValue::UnableToDetect;
-    }
-    return IVCheckerValue_string_to_enum(result.results.begin()->second.token);
-}
-IVCheckerReader::Results IVCheckerReaderScope::read(Logger& logger, const ImageViewRGB32& frame){
-    IVCheckerReader::Results results;
-    if (m_language != Language::None){
-        results.hp      = read(logger, frame, m_box_hp);
-        results.attack  = read(logger, frame, m_box_attack);
-        results.defense = read(logger, frame, m_box_defense);
-        results.spatk   = read(logger, frame, m_box_spatk);
-        results.spdef   = read(logger, frame, m_box_spdef);
-        results.speed   = read(logger, frame, m_box_speed);
-    }
-    return results;
-}
-
-std::vector<ImageViewRGB32> IVCheckerReaderScope::dump_images(const ImageViewRGB32& frame){
-    std::vector<ImageViewRGB32> images;
-    images.emplace_back(extract_box_reference(frame, m_box_hp));
-    images.emplace_back(extract_box_reference(frame, m_box_attack));
-    images.emplace_back(extract_box_reference(frame, m_box_defense));
-    images.emplace_back(extract_box_reference(frame, m_box_spatk));
-    images.emplace_back(extract_box_reference(frame, m_box_spdef));
-    images.emplace_back(extract_box_reference(frame, m_box_speed));
-    return images;
-}
-
-
-
-}
-}
-}
-
diff --git a/SerialPrograms/Source/PokemonSV/Inference/Boxes/PokemonSV_IVCheckerReader.h b/SerialPrograms/Source/PokemonSV/Inference/Boxes/PokemonSV_IVCheckerReader.h
deleted file mode 100644
index 689c17b19e..0000000000
--- a/SerialPrograms/Source/PokemonSV/Inference/Boxes/PokemonSV_IVCheckerReader.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*  IV Checker Reader
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSV_IVCheckerReader_H
-#define PokemonAutomation_PokemonSV_IVCheckerReader_H
-
-#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
-#include "Pokemon/Inference/Pokemon_IVCheckerReader.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-using namespace Pokemon;
-
-
-const IVCheckerReader& IV_READER();
-
-
-class IVCheckerReaderScope{
-public:
-    IVCheckerReaderScope(VideoOverlay& overlay, Language language);
-
-    IVCheckerReader::Results read(Logger& logger, const ImageViewRGB32& frame);
-
-    std::vector<ImageViewRGB32> dump_images(const ImageViewRGB32& frame);
-
-private:
-    IVCheckerValue read(Logger& logger, const ImageViewRGB32& frame, const OverlayBoxScope& box);
-
-private:
-    Language m_language;
-    OverlayBoxScope m_box_hp;
-    OverlayBoxScope m_box_attack;
-    OverlayBoxScope m_box_defense;
-    OverlayBoxScope m_box_spatk;
-    OverlayBoxScope m_box_spdef;
-    OverlayBoxScope m_box_speed;
-};
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSV/Inference/Boxes/PokemonSV_StatsResetChecker.cpp b/SerialPrograms/Source/PokemonSV/Inference/Boxes/PokemonSV_StatsResetChecker.cpp
deleted file mode 100644
index e25a8b0b36..0000000000
--- a/SerialPrograms/Source/PokemonSV/Inference/Boxes/PokemonSV_StatsResetChecker.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-/*  Egg Routines
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "ClientSource/Connection/BotBase.h"
-#include "CommonFramework/Options/LanguageOCROption.h"
-#include "CommonFramework/Tools/ConsoleHandle.h"
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "Pokemon/Options/Pokemon_EggHatchFilter.h"
-#include "Pokemon/Options/Pokemon_StatsResetFilter.h"
-#include "PokemonSV/Inference/Boxes/PokemonSV_IVCheckerReader.h"
-#include "PokemonSV/Inference/Boxes/PokemonSV_BoxNatureDetector.h"
-#include "PokemonSV/Programs/Boxes/PokemonSV_BoxRoutines.h"
-#include "PokemonSV_StatsResetChecker.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-
-bool check_stats_reset_info(
-    ConsoleHandle& console, BotBaseContext& context,
-    OCR::LanguageOCROption& LANGUAGE, Pokemon::StatsResetFilterTable& FILTERS,
-    Pokemon::EggHatchAction& action
-){
-    context.wait_for_all_requests();
-
-    Language language = LANGUAGE;
-
-    change_view_to_judge(console, context, language);
-
-    VideoOverlaySet overlay_set(console.overlay());
-    IVCheckerReaderScope iv_reader_scope(console.overlay(), language);
-    VideoSnapshot screen = console.video().snapshot();
-    IVCheckerReader::Results IVs = iv_reader_scope.read(console.logger(), screen);
-    BoxNatureDetector nature_detector(console.overlay(), LANGUAGE);
-    NatureReader::Results nature = nature_detector.read(console.logger(), screen);
-    const bool shiny = 0;
-
-    console.log(IVs.to_string(), COLOR_GREEN);
-    action = FILTERS.get_action(shiny, IVs, nature);
-
-    return shiny;
-}
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSV/Inference/Boxes/PokemonSV_StatsResetChecker.h b/SerialPrograms/Source/PokemonSV/Inference/Boxes/PokemonSV_StatsResetChecker.h
deleted file mode 100644
index 53d3021fcb..0000000000
--- a/SerialPrograms/Source/PokemonSV/Inference/Boxes/PokemonSV_StatsResetChecker.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*  Stats Reset Checker
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSV_StatsResetChecker_H
-#define PokemonAutomation_PokemonSV_StatsResetChecker_H
-
-#include <functional>
-
-namespace PokemonAutomation{
-    struct ProgramInfo;
-    class ConsoleHandle;
-    class BotBaseContext;
-    class ImageViewRGB32;
-
-namespace OCR{
-    class LanguageOCROption;
-}
-namespace Pokemon{
-    enum class EggHatchAction;
-    class EggHatchFilterTable;
-    class StatsResetFilterTable;
-}
-
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-
-
-//This is a similar to check_baby_info, except for Stats Reset
-bool check_stats_reset_info(
-    ConsoleHandle& console, BotBaseContext& context,
-    OCR::LanguageOCROption& LANGUAGE, Pokemon::StatsResetFilterTable& FILTERS,
-    Pokemon::EggHatchAction& action
-);
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSV/Inference/Dialogs/PokemonSV_DialogArrowDetector.cpp b/SerialPrograms/Source/PokemonSV/Inference/Dialogs/PokemonSV_DialogArrowDetector.cpp
deleted file mode 100644
index 50ac839242..0000000000
--- a/SerialPrograms/Source/PokemonSV/Inference/Dialogs/PokemonSV_DialogArrowDetector.cpp
+++ /dev/null
@@ -1,138 +0,0 @@
-/*  Dialog Arrow Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Cpp/Containers/FixedLimitVector.tpp"
-#include "Kernels/Waterfill/Kernels_Waterfill_Session.h"
-#include "CommonFramework/Globals.h"
-#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
-#include "CommonFramework/ImageTypes/BinaryImage.h"
-#include "CommonFramework/ImageTools/BinaryImage_FilterRgb32.h"
-#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
-#include "CommonFramework/ImageMatch/ExactImageMatcher.h"
-#include "PokemonSV_DialogArrowDetector.h"
-
-//#include <iostream>
-//using std::cout;
-//using std::endl;
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-using namespace Kernels;
-using namespace Kernels::Waterfill;
-
-
-
-const ImageMatch::ExactImageMatcher& DIALOG_ARROW_BLACK(){
-    static ImageMatch::ExactImageMatcher matcher(RESOURCE_PATH() + "PokemonSV/DialogArrow-Black.png");
-    return matcher;
-}
-const ImageMatch::ExactImageMatcher& DIALOG_ARROW_WHITE(){
-    static ImageMatch::ExactImageMatcher matcher(RESOURCE_PATH() + "PokemonSV/DialogArrow-White.png");
-    return matcher;
-}
-
-bool is_dialog_arrow(const ImageViewRGB32& image, const WaterfillObject& object, bool black_arrow){
-    double aspect_ratio = object.aspect_ratio();
-//    cout << "aspect_ratio = " << aspect_ratio << endl;
-    if (aspect_ratio < 1.1 || aspect_ratio > 1.4){
-        return false;
-    }
-//    double area = (double)object.area_ratio();
-//    if (area < 0.4 || area > 0.5){
-//        return false;
-//    }
-
-    ImageViewRGB32 cropped = extract_box_reference(image, object);
-//    cropped.save("test.png");
-
-    double rmsd = black_arrow
-        ? DIALOG_ARROW_BLACK().rmsd(cropped)
-        : DIALOG_ARROW_WHITE().rmsd(cropped);
-//    cout << "rmsd = " << rmsd << endl;
-    return rmsd <= 120;
-}
-
-
-
-DialogArrowDetector::DialogArrowDetector(Color color, const ImageFloatBox& box)
-    : m_color(color)
-    , m_box(box)
-{}
-void DialogArrowDetector::make_overlays(VideoOverlaySet& items) const{
-    items.add(m_color, m_box);
-}
-bool DialogArrowDetector::detect(const ImageViewRGB32& screen) const{
-    std::vector<ImageFloatBox> hits = detect_all(screen);
-    return !hits.empty();
-}
-
-std::vector<ImageFloatBox> DialogArrowDetector::detect_all(const ImageViewRGB32& screen) const{
-    using namespace Kernels::Waterfill;
-
-    ImageViewRGB32 region = extract_box_reference(screen, m_box);
-
-    std::vector<ImageFloatBox> hits;
-
-    {
-        PackedBinaryMatrix matrix = compress_rgb32_to_binary_range(region, 0xff000000, 0xff7f7fbf);
-        std::unique_ptr<WaterfillSession> session = make_WaterfillSession(matrix);
-        auto iter = session->make_iterator(20);
-        WaterfillObject object;
-        while (iter->find_next(object, false)){
-            if (is_dialog_arrow(region, object, true)){
-                hits.emplace_back(translate_to_parent(screen, m_box, object));
-            }
-        }
-    }
-    {
-        PackedBinaryMatrix matrix = compress_rgb32_to_binary_range(region, 0xff808080, 0xffffffff);
-        std::unique_ptr<WaterfillSession> session = make_WaterfillSession(matrix);
-        auto iter = session->make_iterator(20);
-        WaterfillObject object;
-        while (iter->find_next(object, false)){
-            if (is_dialog_arrow(region, object, false)){
-                hits.emplace_back(translate_to_parent(screen, m_box, object));
-            }
-        }
-    }
-
-    return hits;
-}
-
-
-
-DialogArrowWatcher::~DialogArrowWatcher() = default;
-DialogArrowWatcher::DialogArrowWatcher(Color color, VideoOverlay& overlay, const ImageFloatBox& box)
-    : VisualInferenceCallback("GradientArrowFinder")
-    , m_overlay(overlay)
-    , m_detector(color, box)
-{}
-
-void DialogArrowWatcher::make_overlays(VideoOverlaySet& items) const{
-    m_detector.make_overlays(items);
-}
-bool DialogArrowWatcher::process_frame(const ImageViewRGB32& frame, WallClock timestamp){
-    std::vector<ImageFloatBox> arrows = m_detector.detect_all(frame);
-//    cout << "arrors = " << arrows.size() << endl;
-    m_arrows.reset(arrows.size());
-    for (const ImageFloatBox& arrow : arrows){
-        m_arrows.emplace_back(m_overlay, arrow, COLOR_MAGENTA);
-    }
-    return !arrows.empty();
-}
-
-
-
-
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSV/Inference/Dialogs/PokemonSV_DialogArrowDetector.h b/SerialPrograms/Source/PokemonSV/Inference/Dialogs/PokemonSV_DialogArrowDetector.h
deleted file mode 100644
index 1be9c86353..0000000000
--- a/SerialPrograms/Source/PokemonSV/Inference/Dialogs/PokemonSV_DialogArrowDetector.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*  Dialog Arrow Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSV_DialogArrowDetector_H
-#define PokemonAutomation_PokemonSV_DialogArrowDetector_H
-
-#include <vector>
-#include "Common/Cpp/Color.h"
-#include "Common/Cpp/Containers/FixedLimitVector.h"
-#include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
-#include "CommonFramework/InferenceInfra/VisualInferenceCallback.h"
-#include "CommonFramework/Inference/VisualDetector.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-
-class DialogArrowDetector : public StaticScreenDetector{
-public:
-    DialogArrowDetector(Color color, const ImageFloatBox& box);
-
-    virtual void make_overlays(VideoOverlaySet& items) const override;
-    virtual bool detect(const ImageViewRGB32& screen) const override;
-
-    std::vector<ImageFloatBox> detect_all(const ImageViewRGB32& screen) const;
-
-protected:
-    Color m_color;
-    ImageFloatBox m_box;
-};
-
-
-
-class DialogArrowWatcher : public VisualInferenceCallback{
-public:
-    ~DialogArrowWatcher();
-    DialogArrowWatcher(Color color, VideoOverlay& overlay, const ImageFloatBox& box);
-
-    virtual void make_overlays(VideoOverlaySet& items) const override;
-    virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override;
-
-
-protected:
-    VideoOverlay& m_overlay;
-    DialogArrowDetector m_detector;
-    FixedLimitVector<OverlayBoxScope> m_arrows;
-};
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.cpp b/SerialPrograms/Source/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.cpp
deleted file mode 100644
index 64b27def4e..0000000000
--- a/SerialPrograms/Source/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.cpp
+++ /dev/null
@@ -1,129 +0,0 @@
-/*  Dialog Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/ImageTools/SolidColorTest.h"
-#include "PokemonSV_DialogArrowDetector.h"
-#include "PokemonSV_GradientArrowDetector.h"
-#include "PokemonSV_DialogDetector.h"
-
-//#include <iostream>
-//using std::cout;
-//using std::endl;
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-
-DialogBoxDetector::DialogBoxDetector(Color color, bool true_if_detected)
-    : m_color(color)
-    , m_true_if_detected(true_if_detected)
-    , m_box_top(0.50, 0.74, 0.20, 0.01)
-    , m_box_bot(0.30, 0.88, 0.40, 0.01)
-    , m_border_top(0.24, 0.71, 0.52, 0.04)
-    , m_border_bot(0.24, 0.88, 0.52, 0.04)
-{}
-void DialogBoxDetector::make_overlays(VideoOverlaySet& items) const{
-    items.add(m_color, m_box_top);
-    items.add(m_color, m_box_bot);
-    items.add(m_color, m_border_top);
-    items.add(m_color, m_border_bot);
-}
-bool DialogBoxDetector::detect(const ImageViewRGB32& screen) const{
-    ImageStats stats_box_top = image_stats(extract_box_reference(screen, m_box_top));
-//    cout << stats_box_top.average << stats_box_top.stddev << endl;
-    bool white;
-    if (is_white(stats_box_top)){
-        white = true;
-    }else if (is_black(stats_box_top, 150)){
-        white = false;
-    }else{
-        return !m_true_if_detected;
-    }
-
-//    cout << "white = " << white << endl;
-
-    ImageStats stats_box_bot = image_stats(extract_box_reference(screen, m_box_bot));
-//    cout << stats_box_bot.average << stats_box_bot.stddev << endl;
-    if (white){
-        if (!is_white(stats_box_bot)){
-            return !m_true_if_detected;
-        }
-    }else{
-        if (!is_black(stats_box_bot, 150)){
-            return !m_true_if_detected;
-        }
-    }
-
-    ImageStats stats_border_top = image_stats(extract_box_reference(screen, m_border_top));
-//    cout << stats_border_top.average << stats_border_top.stddev << endl;
-    if (stats_border_top.stddev.sum() < 75){
-        return !m_true_if_detected;
-    }
-
-    ImageStats stats_border_bot = image_stats(extract_box_reference(screen, m_border_bot));
-//    cout << stats_border_bot.average << stats_border_bot.stddev << endl;
-    if (stats_border_bot.stddev.sum() < 100){
-        return !m_true_if_detected;
-    }
-
-    return m_true_if_detected;
-}
-
-
-
-
-AdvanceDialogDetector::AdvanceDialogDetector(Color color)
-    : m_box(color)
-    , m_arrow(0.710, 0.850, 0.030, 0.042)
-{}
-void AdvanceDialogDetector::make_overlays(VideoOverlaySet& items) const{
-    m_box.make_overlays(items);
-    items.add(m_box.color(), m_arrow);
-}
-bool AdvanceDialogDetector::detect(const ImageViewRGB32& screen) const{
-    if (!m_box.detect(screen)){
-        return false;
-    }
-
-    DialogArrowDetector arrow_detector(COLOR_RED, m_arrow);
-    return arrow_detector.detect(screen);
-}
-
-
-
-
-PromptDialogDetector::PromptDialogDetector(Color color)
-    : PromptDialogDetector(color, {0.50, 0.40, 0.40, 0.50})
-{}
-PromptDialogDetector::PromptDialogDetector(Color color, const ImageFloatBox& arrow_box)
-    : m_box(color)
-    , m_gradient(arrow_box)
-{}
-void PromptDialogDetector::make_overlays(VideoOverlaySet& items) const{
-    m_box.make_overlays(items);
-    items.add(m_box.color(), m_gradient);
-}
-bool PromptDialogDetector::detect(const ImageViewRGB32& screen) const{
-    if (!m_box.detect(screen)){
-        return false;
-    }
-
-    GradientArrowDetector gradiant_detector(COLOR_RED, GradientArrowType::RIGHT, m_gradient);
-    return gradiant_detector.detect(screen);
-}
-
-
-
-
-
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h b/SerialPrograms/Source/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h
deleted file mode 100644
index 26628c1aae..0000000000
--- a/SerialPrograms/Source/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/*  Dialog Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSV_DialogDetector_H
-#define PokemonAutomation_PokemonSV_DialogDetector_H
-
-#include "Common/Cpp/Color.h"
-#include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "CommonFramework/InferenceInfra/VisualInferenceCallback.h"
-#include "CommonFramework/Inference/VisualDetector.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-
-
-//  Detect any dialog box.
-class DialogBoxDetector : public StaticScreenDetector{
-public:
-    DialogBoxDetector(Color color = COLOR_RED, bool true_if_detected = true);
-
-    Color color() const{ return m_color; }
-
-    virtual void make_overlays(VideoOverlaySet& items) const override;
-    virtual bool detect(const ImageViewRGB32& screen) const override;
-
-private:
-    Color m_color;
-    bool m_true_if_detected;
-    ImageFloatBox m_box_top;
-    ImageFloatBox m_box_bot;
-    ImageFloatBox m_border_top;
-    ImageFloatBox m_border_bot;
-};
-class DialogBoxWatcher : public DetectorToFinder<DialogBoxDetector>{
-public:
-    DialogBoxWatcher(
-        Color color,
-        bool trigger_if_detected,
-        std::chrono::milliseconds duration = std::chrono::milliseconds(250)
-    )
-         : DetectorToFinder("DialogBoxWatcher", duration, color, trigger_if_detected)
-    {}
-};
-
-
-
-
-//  Detect dialog that has the small arrow at bottom to show the next dialog.
-//  It should be able to detect both the white background dialog and black background dialog.
-class AdvanceDialogDetector : public StaticScreenDetector{
-public:
-    AdvanceDialogDetector(Color color = COLOR_RED);
-
-    virtual void make_overlays(VideoOverlaySet& items) const override;
-    virtual bool detect(const ImageViewRGB32& screen) const override;
-
-private:
-    DialogBoxDetector m_box;
-    ImageFloatBox m_arrow;
-};
-class AdvanceDialogWatcher : public DetectorToFinder<AdvanceDialogDetector>{
-public:
-    AdvanceDialogWatcher(Color color, std::chrono::milliseconds duration = std::chrono::milliseconds(250))
-         : DetectorToFinder("AdvanceDialogWatcher", duration, color)
-    {}
-};
-
-
-
-//  Detect dialog that prompts the player to make a choice.
-class PromptDialogDetector : public StaticScreenDetector{
-public:
-    //  Will catch any prompt.
-    PromptDialogDetector(Color color);
-
-    //  Will only look for prompts with the cursor in this box.
-    PromptDialogDetector(Color color, const ImageFloatBox& arrow_box);
-
-    virtual void make_overlays(VideoOverlaySet& items) const override;
-    virtual bool detect(const ImageViewRGB32& screen) const override;
-
-private:
-    DialogBoxDetector m_box;
-    ImageFloatBox m_gradient;
-};
-class PromptDialogWatcher : public DetectorToFinder<PromptDialogDetector>{
-public:
-    PromptDialogWatcher(
-        Color color,
-        std::chrono::milliseconds duration = std::chrono::milliseconds(250)
-    )
-         : DetectorToFinder("PromptDialogWatcher", std::chrono::milliseconds(250), color)
-    {}
-    PromptDialogWatcher(
-        Color color,
-        const ImageFloatBox& arrow_box,
-        std::chrono::milliseconds duration = std::chrono::milliseconds(250)
-    )
-         : DetectorToFinder("PromptDialogWatcher", std::chrono::milliseconds(250), color, arrow_box)
-    {}
-};
-
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSV/Inference/Overworld/PokemonSV_AreaZeroSkyDetector.cpp b/SerialPrograms/Source/PokemonSV/Inference/Overworld/PokemonSV_AreaZeroSkyDetector.cpp
deleted file mode 100644
index b20e3de137..0000000000
--- a/SerialPrograms/Source/PokemonSV/Inference/Overworld/PokemonSV_AreaZeroSkyDetector.cpp
+++ /dev/null
@@ -1,195 +0,0 @@
-/*  Area Zero Sky Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Kernels/Waterfill/Kernels_Waterfill_Session.h"
-#include "CommonFramework/Exceptions/OperationFailedException.h"
-#include "CommonFramework/ImageTools/BinaryImage_FilterRgb32.h"
-#include "CommonFramework/InferenceInfra/InferenceSession.h"
-//#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
-#include "CommonFramework/Tools/InterruptableCommands.h"
-#include "CommonFramework/Tools/ProgramEnvironment.h"
-#include "CommonFramework/Tools/ConsoleHandle.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "PokemonSV_AreaZeroSkyDetector.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-
-
-bool AreaZeroSkyDetector::detect(Kernels::Waterfill::WaterfillObject& object, const ImageViewRGB32& screen) const{
-    using namespace Kernels::Waterfill;
-
-    PackedBinaryMatrix matrix = compress_rgb32_to_binary_range(screen, 0xffc0c0c0, 0xffffffff);
-
-    size_t min_width = screen.width() / 4;
-    size_t min_height = screen.height() / 4;
-
-    std::unique_ptr<WaterfillSession> session = make_WaterfillSession(matrix);
-    auto iter = session->make_iterator(10000);
-    while (iter->find_next(object, false)){
-//        if (object.min_y != 0){
-//            continue;
-//        }
-        if (object.width() < min_width || object.height() < min_height){
-            continue;
-        }
-        return true;
-    }
-    return false;
-}
-bool AreaZeroSkyDetector::detect(const ImageViewRGB32& screen) const{
-    using namespace Kernels::Waterfill;
-
-    WaterfillObject object;
-    return detect(object, screen);
-}
-
-
-
-
-AreaZeroSkyTracker::AreaZeroSkyTracker(VideoOverlay& overlay)
-    : VisualInferenceCallback("AreaZeroSkyTracker")
-    , m_overlay(overlay)
-{}
-
-bool AreaZeroSkyTracker::sky_location(double& x, double& y) const{
-    SpinLock m_lock;
-    if (!m_box){
-        return false;
-    }
-    x = m_center_x;
-    y = m_center_y;
-    return true;
-}
-
-void AreaZeroSkyTracker::make_overlays(VideoOverlaySet& items) const{}
-bool AreaZeroSkyTracker::process_frame(const ImageViewRGB32& frame, WallClock timestamp){
-    using namespace Kernels::Waterfill;
-
-    WaterfillObject object;
-    bool detected = this->detect(object, frame);
-    SpinLockGuard lg(m_lock);
-    if (detected){
-        m_box.reset(new OverlayBoxScope(
-            m_overlay,
-            COLOR_GREEN,
-            translate_to_parent(frame, {0, 0, 1, 1}, object),
-            "Area Zero Sky"
-        ));
-        m_center_x = object.center_of_gravity_x() / frame.width();
-        m_center_y = object.center_of_gravity_y() / frame.height();
-    }else{
-        m_box.reset();
-    }
-    return false;
-}
-
-
-
-
-
-enum class OverworldState{
-    None,
-    FindingSky,
-    TurningLeft,
-    TurningRight,
-};
-void find_and_center_on_sky(
-    ProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context
-){
-    context.wait_for_all_requests();
-    console.log("Looking for the sky...");
-
-    AreaZeroSkyTracker sky_tracker(console);
-    InferenceSession inference_session(
-        context, console,
-        {sky_tracker}
-    );
-
-    AsyncCommandSession session(context, console, env.realtime_dispatcher(), context.botbase());
-    OverworldState state = OverworldState::None;
-    WallClock start = current_time();
-    while (true){
-        if (current_time() - start > std::chrono::minutes(1)){
-            throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, console,
-                "Failed to find the sky after 1 minute. (state = " + std::to_string((int)state) + ")",
-                true
-            );
-        }
-
-        context.wait_for(std::chrono::milliseconds(200));
-
-        if (!session.command_is_running()){
-            state = OverworldState::None;
-        }
-
-        double sky_x, sky_y;
-        bool sky = sky_tracker.sky_location(sky_x, sky_y);
-
-        if (!sky){
-            if (state != OverworldState::FindingSky){
-                console.log("Sky not detected. Attempting to find the sky...", COLOR_ORANGE);
-                session.dispatch([](BotBaseContext& context){
-                    pbf_move_right_joystick(context, 128, 0, 250, 0);
-                    pbf_move_right_joystick(context, 0, 0, 10 * TICKS_PER_SECOND, 0);
-                });
-                state = OverworldState::FindingSky;
-            }
-            continue;
-        }
-
-//        cout << sky_x << " - " << sky_y << endl;
-
-        if (sky_x < 0.45){
-            if (state != OverworldState::TurningLeft){
-                console.log("Centering the sky... Moving left.");
-                uint8_t magnitude = (uint8_t)((0.5 - sky_x) * 96 + 31);
-                uint16_t duration = (uint16_t)((0.5 - sky_x) * 125 + 20);
-                session.dispatch([=](BotBaseContext& context){
-                    pbf_move_right_joystick(context, 128 - magnitude, 128, duration, 0);
-                });
-                state = OverworldState::TurningLeft;
-            }
-            continue;
-        }
-        if (sky_x > 0.55){
-            if (state != OverworldState::TurningRight){
-                console.log("Centering the sky... Moving Right.");
-                uint8_t magnitude = (uint8_t)((sky_x - 0.5) * 96 + 31);
-                uint16_t duration = (uint16_t)((sky_x - 0.5) * 125 + 20);
-                session.dispatch([=](BotBaseContext& context){
-                    pbf_move_right_joystick(context, 128 + magnitude, 128, duration, 0);
-                });
-                state = OverworldState::TurningRight;
-            }
-            continue;
-        }
-
-        console.log("Found the sky!", COLOR_ORANGE);
-        break;
-    }
-
-    session.stop_session_and_rethrow();
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSV/Inference/Overworld/PokemonSV_AreaZeroSkyDetector.h b/SerialPrograms/Source/PokemonSV/Inference/Overworld/PokemonSV_AreaZeroSkyDetector.h
deleted file mode 100644
index 42160c7ba4..0000000000
--- a/SerialPrograms/Source/PokemonSV/Inference/Overworld/PokemonSV_AreaZeroSkyDetector.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*  Area Zero Sky Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSV_AreaZeroSkyDetector_H
-#define PokemonAutomation_PokemonSV_AreaZeroSkyDetector_H
-
-#include "Common/Cpp/Concurrency/SpinLock.h"
-#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
-#include "CommonFramework/InferenceInfra/VisualInferenceCallback.h"
-#include "CommonFramework/Inference/VisualDetector.h"
-
-namespace PokemonAutomation{
-namespace Kernels{
-namespace Waterfill{
-    class WaterfillObject;
-}
-}
-class BotBaseContext;
-class ProgramEnvironment;
-class ConsoleHandle;
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-
-
-class AreaZeroSkyDetector : public StaticScreenDetector{
-public:
-    virtual void make_overlays(VideoOverlaySet& items) const override{}
-    virtual bool detect(const ImageViewRGB32& screen) const override;
-
-    bool detect(Kernels::Waterfill::WaterfillObject& object, const ImageViewRGB32& screen) const;
-};
-
-
-class AreaZeroSkyTracker : public AreaZeroSkyDetector, public VisualInferenceCallback{
-public:
-    AreaZeroSkyTracker(VideoOverlay& overlay);
-
-    bool sky_location(double& x, double& y) const;
-
-    virtual void make_overlays(VideoOverlaySet& items) const override;
-    virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override;
-
-private:
-    VideoOverlay& m_overlay;
-    SpinLock m_lock;
-    double m_center_x;
-    double m_center_y;
-    std::unique_ptr<OverlayBoxScope> m_box;
-};
-
-
-void find_and_center_on_sky(
-    ProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context
-);
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSV/Inference/Overworld/PokemonSV_LetsGoKillDetector.cpp b/SerialPrograms/Source/PokemonSV/Inference/Overworld/PokemonSV_LetsGoKillDetector.cpp
deleted file mode 100644
index 31e417d7ce..0000000000
--- a/SerialPrograms/Source/PokemonSV/Inference/Overworld/PokemonSV_LetsGoKillDetector.cpp
+++ /dev/null
@@ -1,227 +0,0 @@
-/*  Let's Go Kill Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Cpp/AbstractLogger.h"
-#include "Kernels/Waterfill/Kernels_Waterfill_Session.h"
-#include "CommonFramework/Globals.h"
-#include "CommonFramework/ImageTools/BinaryImage_FilterRgb32.h"
-#include "CommonFramework/ImageMatch/ExactImageMatcher.h"
-#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
-#include "CommonFramework/Inference/SpectrogramMatcher.h"
-#include "CommonFramework/Inference/AudioTemplateCache.h"
-#include "PokemonSV/PokemonSV_Settings.h"
-#include "PokemonSV_LetsGoKillDetector.h"
-
-//#include <iostream>
-//using std::cout;
-//using std::endl;
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-using namespace Kernels::Waterfill;
-
-
-const ImageMatch::ExactImageMatcher& LETS_GO_KILL_CROPPED(){
-    static ImageMatch::ExactImageMatcher matcher(RESOURCE_PATH() + "PokemonSV/LetsGoKill-Cropped.png");
-    return matcher;
-}
-
-
-bool is_kill_icon(
-    const ImageViewRGB32& image,
-    WaterfillObject& object,
-    const WaterfillObject& red, const WaterfillObject& white
-){
-//    cout << red.min_x << "-" << red.max_x << ", " << white.min_y << "-" << white.max_y << endl;
-
-//    cout << "is_kill_icon" << endl;
-    if (red.max_y >= white.min_y){
-//        cout << "bad y" << endl;
-        return false;
-    }
-    if (red.min_x < white.min_x){
-//        cout << "bad min_x" << endl;
-        return false;
-    }
-    if (red.max_x < white.max_x){
-//        cout << "bad max_x" << endl;
-        return false;
-    }
-
-    object = red;
-    object.merge_assume_no_overlap(white);
-
-//    extract_box_reference(image, object).save("test.png");
-
-    if (object.width() < 20 || object.height() < 20){
-//        cout << "too small: " << object.width() << endl;
-        return false;
-    }
-    double aspect_ratio = object.aspect_ratio();
-    if (aspect_ratio < 0.8 || aspect_ratio > 1.2){
-//        cout << aspect_ratio << endl;
-        return false;
-    }
-
-    ImageViewRGB32 cropped = extract_box_reference(image, object);
-//    cropped.save("test.png");
-    double rmsd = LETS_GO_KILL_CROPPED().rmsd(cropped);
-//    cout << rmsd << endl;
-    return rmsd < 120;
-}
-
-
-
-
-LetsGoKillDetector::LetsGoKillDetector(
-    Color color,
-    const ImageFloatBox& box
-)
-    : m_color(color)
-    , m_box(box)
-{}
-void LetsGoKillDetector::make_overlays(VideoOverlaySet& items) const{
-    items.add(m_color, m_box);
-}
-bool LetsGoKillDetector::detect(const ImageViewRGB32& screen) const{
-    using namespace Kernels::Waterfill;
-
-    ImageViewRGB32 region = extract_box_reference(screen, m_box);
-    std::vector<WaterfillObject> reds;
-    std::vector<WaterfillObject> whites;
-    std::unique_ptr<WaterfillSession> session = make_WaterfillSession();
-    {
-        std::vector<PackedBinaryMatrix> matrices = compress_rgb32_to_binary_range(
-            region,
-            {
-                {0xff802020, 0xffff7f7f},
-                {0xffc02020, 0xffff7f7f},
-            }
-        );
-//        size_t c = 0;
-        for (PackedBinaryMatrix& matrix : matrices){
-            session->set_source(matrix);
-            auto iter = session->make_iterator(10);
-            WaterfillObject object;
-            while (iter->find_next(object, false)){
-                double aspect_ratio = object.aspect_ratio();
-                if (aspect_ratio < 1.5 || aspect_ratio > 2.5){
-                    continue;
-                }
-//                cout << object.area << endl;
-//                extract_box_reference(region, object).save("red-" + std::to_string(c++) + ".png");
-                reds.emplace_back(std::move(object));
-            }
-        }
-    }
-    {
-        std::vector<PackedBinaryMatrix> matrices = compress_rgb32_to_binary_range(
-            region,
-            {
-                {0xffc0c0c0, 0xffffffff},
-            }
-        );
-//        size_t c = 0;
-        for (PackedBinaryMatrix& matrix : matrices){
-            session->set_source(matrix);
-            auto iter = session->make_iterator(10);
-            WaterfillObject object;
-            while (iter->find_next(object, false)){
-                double aspect_ratio = object.aspect_ratio();
-                if (aspect_ratio < 1.5 || aspect_ratio > 2.5){
-                    continue;
-                }
-//                cout << object.area << endl;
-//                extract_box_reference(region, object).save("white-" + std::to_string(c++) + ".png");
-                whites.emplace_back(std::move(object));
-            }
-        }
-    }
-    for (WaterfillObject& red : reds){
-        for (WaterfillObject& white : whites){
-            WaterfillObject object;
-            if (is_kill_icon(region, object, red, white)){
-                return true;
-            }
-        }
-    }
-
-    return false;
-}
-
-
-
-LetsGoKillWatcher::LetsGoKillWatcher(
-    Logger& logger,
-    Color color, bool trigger_if_detected,
-    std::function<void()> on_kill_callback,
-    std::chrono::milliseconds duration
-)
-     : DetectorToFinder("LetsGoKillWatcher", duration, color)
-     , m_logger(logger)
-     , m_trigger_if_detected(trigger_if_detected)
-     , m_on_kill_callback(on_kill_callback)
-     , m_last_detection(false)
-     , m_last_detected(WallClock::min())
-{}
-bool LetsGoKillWatcher::process_frame(const ImageViewRGB32& frame, WallClock timestamp){
-    bool result = DetectorToFinder::process_frame(frame, timestamp);
-    if (!result){
-        m_last_detection = false;
-        return false;
-    }
-
-    if (m_last_detected.load(std::memory_order_relaxed) == WallClock::min()){
-        m_logger.log("Detected Let's Go kill icon.");
-    }
-    m_last_detected.store(timestamp, std::memory_order_release);
-
-    if (!m_last_detection && m_on_kill_callback){
-        m_on_kill_callback();
-    }
-    m_last_detection = true;
-    return m_trigger_if_detected;
-}
-
-
-
-
-LetsGoKillSoundDetector::LetsGoKillSoundDetector(ConsoleHandle& console, DetectedCallback detected_callback)
-    : AudioPerSpectrumDetectorBase(
-        "LetsGoKillSoundDetector",
-        "Let's Go Kill Sound",
-        COLOR_RED, console,
-        [this, callback = std::move(detected_callback)](float error_coefficient){
-            m_last_detected = current_time();
-            return callback != nullptr ? callback(error_coefficient) : false;
-        }
-    )
-    , m_last_detected(WallClock::min())
-{}
-float LetsGoKillSoundDetector::get_score_threshold() const{
-    return (float)GameSettings::instance().LETS_GO_KILL_SOUND_THRESHOLD;
-}
-std::unique_ptr<SpectrogramMatcher> LetsGoKillSoundDetector::build_spectrogram_matcher(size_t sample_rate){
-    return std::make_unique<SpectrogramMatcher>(
-        "Let's Go Kill",
-        AudioTemplateCache::instance().get_throw("PokemonSV/LetsGoKill", sample_rate),
-        SpectrogramMatcher::Mode::SPIKE_CONV, sample_rate,
-        GameSettings::instance().LETS_GO_KILL_SOUND_LOW_FREQUENCY
-    );
-}
-
-
-
-
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSV/Inference/Overworld/PokemonSV_LetsGoKillDetector.h b/SerialPrograms/Source/PokemonSV/Inference/Overworld/PokemonSV_LetsGoKillDetector.h
deleted file mode 100644
index 7adc7d2e8c..0000000000
--- a/SerialPrograms/Source/PokemonSV/Inference/Overworld/PokemonSV_LetsGoKillDetector.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*  Let's Go Kill Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSV_LetsGoKillDetector_H
-#define PokemonAutomation_PokemonSV_LetsGoKillDetector_H
-
-#include <functional>
-#include <atomic>
-#include "Common/Cpp/Color.h"
-#include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "CommonFramework/Inference/VisualDetector.h"
-#include "CommonFramework/Inference/AudioPerSpectrumDetectorBase.h"
-
-namespace PokemonAutomation{
-    class Logger;
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-
-
-class LetsGoKillDetector : public StaticScreenDetector{
-public:
-    LetsGoKillDetector(Color color, const ImageFloatBox& box = {0.71, 0.15, 0.04, 0.08});
-
-    virtual void make_overlays(VideoOverlaySet& items) const override;
-    virtual bool detect(const ImageViewRGB32& screen) const override;
-
-private:
-    Color m_color;
-    ImageFloatBox m_box;
-};
-class LetsGoKillWatcher : public DetectorToFinder<LetsGoKillDetector>{
-public:
-    LetsGoKillWatcher(
-        Logger& logger,
-        Color color, bool trigger_if_detected,
-        std::function<void()> on_kill_callback = nullptr,
-        std::chrono::milliseconds duration = std::chrono::milliseconds(250)
-    );
-
-    WallClock last_kill() const{
-        return m_last_detected.load(std::memory_order_relaxed);
-    }
-
-    virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override;
-
-private:
-    Logger& m_logger;
-    bool m_trigger_if_detected;
-    std::function<void()> m_on_kill_callback;
-
-    bool m_last_detection;
-    std::atomic<WallClock> m_last_detected;
-};
-
-
-
-
-class LetsGoKillSoundDetector : public AudioPerSpectrumDetectorBase{
-public:
-    LetsGoKillSoundDetector(ConsoleHandle& console, DetectedCallback detected_callback);
-
-    virtual float get_score_threshold() const override;
-
-    WallClock last_kill() const{
-        return m_last_detected.load(std::memory_order_relaxed);
-    }
-
-private:
-    virtual std::unique_ptr<SpectrogramMatcher> build_spectrogram_matcher(size_t sample_rate) override;
-
-private:
-    std::atomic<WallClock> m_last_detected;
-};
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.cpp b/SerialPrograms/Source/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.cpp
deleted file mode 100644
index c702b384d8..0000000000
--- a/SerialPrograms/Source/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.cpp
+++ /dev/null
@@ -1,195 +0,0 @@
-/*  Overworld Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Kernels/Waterfill/Kernels_Waterfill_Session.h"
-#include "CommonFramework/Globals.h"
-#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
-#include "CommonFramework/ImageMatch/ImageDiff.h"
-#include "CommonFramework/ImageMatch/ExactImageMatcher.h"
-#include "CommonFramework/ImageTools/BinaryImage_FilterRgb32.h"
-#include "PokemonSV_OverworldDetector.h"
-
-//#include <iostream>
-//using std::cout;
-//using std::endl;
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-
-
-const ImageMatch::ExactImageMatcher& RADAR_BALL(){
-    static ImageMatch::ExactImageMatcher matcher(RESOURCE_PATH() + "PokemonSV/RadarBall.png");
-    return matcher;
-}
-
-
-
-
-OverworldDetector::OverworldDetector(Color color)
-    : m_color(color)
-    , m_ball(0.890, 0.800, 0.030, 0.060)
-    , m_radar(0.815, 0.680, 0.180, 0.310)
-    , m_radar_inside(0.865, 0.750, 0.080, 0.170)
-{}
-void OverworldDetector::make_overlays(VideoOverlaySet& items) const{
-    items.add(m_color, m_ball);
-    items.add(m_color, m_radar);
-    items.add(m_color, m_radar_inside);
-}
-bool OverworldDetector::detect(const ImageViewRGB32& screen) const{
-    if (!detect_ball(screen)){
-        return false;
-    }
-
-    //  TODO: Detect the directions.
-
-    return true;
-}
-
-bool OverworldDetector::detect_ball(const ImageViewRGB32& screen) const{
-    using namespace Kernels::Waterfill;
-
-    std::unique_ptr<WaterfillSession> session = make_WaterfillSession();
-    ImageViewRGB32 image = extract_box_reference(screen, m_ball);
-    std::vector<PackedBinaryMatrix> matrices = compress_rgb32_to_binary_range(
-        image,
-        {
-            {0xffc0a000, 0xffffff1f},
-            {0xffc0b000, 0xffffff1f},
-            {0xffc0c000, 0xffffff1f},
-            {0xffd0d000, 0xffffff1f},
-            {0xffe0e000, 0xffffff1f},
-            {0xfff0f000, 0xffffff1f},
-            {0xfff8f800, 0xffffff1f},
-
-            {0xffc0c000, 0xffffff3f},
-            {0xffd0d000, 0xffffff3f},
-            {0xffe0e000, 0xffffff3f},
-            {0xfff0f000, 0xffffff3f},
-            {0xfff8f800, 0xffffff3f},
-
-            {0xffc0c000, 0xffffff5f},
-            {0xffd0d000, 0xffffff5f},
-            {0xffe0e000, 0xffffff5f},
-            {0xfff0f000, 0xffffff5f},
-            {0xfff8f800, 0xffffff5f},
-
-            {0xffc0c000, 0xffffff7f},
-            {0xffd0d000, 0xffffff7f},
-            {0xffe0e000, 0xffffff7f},
-            {0xfff0f000, 0xffffff7f},
-            {0xfff8f800, 0xffffff7f},
-        }
-    );
-
-//    size_t c = 0;
-    for (PackedBinaryMatrix& matrix : matrices){
-        session->set_source(matrix);
-        auto iter = session->make_iterator(50);
-        WaterfillObject object;
-        while (iter->find_next(object, false)){
-//            c++;
-//            extract_box_reference(image, object).save("object-" + std::to_string(c) + ".png");
-
-            //  Exclude if it touches the borders.
-            if (object.min_x == 0 || object.min_y == 0 ||
-                object.max_x == image.width() || object.max_y == image.height()
-            ){
-                continue;
-            }
-            double aspect_ratio = object.aspect_ratio();
-//            cout << "object " << c << " ratio " << aspect_ratio << " area " << object.area_ratio() << endl;
-            if (!(0.8 < aspect_ratio && aspect_ratio < 1.2)){
-                continue;
-            }
-            double area_ratio = object.area_ratio();
-            if (area_ratio > 0.9){
-//                cout << c << " : bad area ratio = " << area_ratio << endl;
-                continue;
-            }
-
-//            extract_box_reference(image, object).save("ball-" + std::to_string(c) + ".png");
-            double rmsd = RADAR_BALL().rmsd(extract_box_reference(image, object));
-//            cout << "rmsd = " << rmsd << endl;
-            if (rmsd < 50){
-                return true;
-            }
-        }
-    }
-    return false;
-}
-
-
-
-OverworldWatcher::OverworldWatcher(Color color)
-     : OverworldDetector(color)
-     , VisualInferenceCallback("OverworldWatcher")
-     , m_ball_hold_duration(std::chrono::milliseconds(5000))
-     , m_map_hold_duration(std::chrono::milliseconds(1000))
-     , m_last_ball(WallClock::min())
-{}
-
-void OverworldWatcher::make_overlays(VideoOverlaySet& items) const{
-    OverworldDetector::make_overlays(items);
-}
-bool OverworldWatcher::process_frame(const VideoSnapshot& frame){
-    //  Return true if either of the following is true:
-    //    - Ball is held and radar map stays still for 1 second.
-    //    - Ball is held for 5 seconds.
-
-    //  The map is not static when there is an event raid in it as it will
-    //  sparkle. So instead, we revert to the ball being held for 5 seconds.
-
-    //  No detection.
-    if (!detect(frame)){
-        m_last_ball = WallClock::min();
-        m_start_of_detection.clear();
-        return false;
-    }
-
-    //  First detection.
-    if (m_last_ball == WallClock::min()){
-        m_last_ball = frame.timestamp;
-    }
-    if (!m_start_of_detection){
-        m_start_of_detection = frame;
-        return false;
-    }
-
-    //  Ball held for long enough.
-    if (frame.timestamp - m_last_ball >= m_ball_hold_duration){
-        return true;
-    }
-
-    //  Mismatching image sizes.
-    ImageViewRGB32 start = extract_box_reference(m_start_of_detection, m_radar_inside);
-    ImageViewRGB32 current = extract_box_reference(frame, m_radar_inside);
-    if (start.width() != current.width() || start.height() != current.height()){
-        m_start_of_detection = frame;
-        return false;
-    }
-
-    //  Image has changed too much.
-    double rmsd = ImageMatch::pixel_RMSD(start, current);
-//    cout << "rmsd = " << rmsd << endl;
-    if (rmsd > 2.0){
-        m_start_of_detection = frame;
-        return false;
-    }
-
-    //  Make sure it's held for long enough.
-    return frame.timestamp - m_start_of_detection.timestamp >= m_map_hold_duration;
-}
-
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h b/SerialPrograms/Source/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h
deleted file mode 100644
index 07c525ff1b..0000000000
--- a/SerialPrograms/Source/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*  Overworld Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSV_OverworldDetector_H
-#define PokemonAutomation_PokemonSV_OverworldDetector_H
-
-#include "Common/Cpp/Color.h"
-#include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "CommonFramework/InferenceInfra/VisualInferenceCallback.h"
-#include "CommonFramework/Inference/VisualDetector.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-// Detect the player character is on overworld.
-// It detects the center circle of the minimap.
-class OverworldDetector : public StaticScreenDetector{
-public:
-    OverworldDetector(Color color = COLOR_RED);
-
-    virtual void make_overlays(VideoOverlaySet& items) const override;
-    virtual bool detect(const ImageViewRGB32& screen) const override;
-
-    bool detect_ball(const ImageViewRGB32& screen) const;
-
-protected:
-    const Color m_color;
-    const ImageFloatBox m_ball;
-    const ImageFloatBox m_radar;
-    const ImageFloatBox m_radar_inside;
-};
-
-class OverworldWatcher : public OverworldDetector, public VisualInferenceCallback{
-public:
-    OverworldWatcher(Color color = COLOR_RED);
-
-    virtual void make_overlays(VideoOverlaySet& items) const override;
-    virtual bool process_frame(const VideoSnapshot& frame) override;
-
-
-private:
-    std::chrono::milliseconds m_ball_hold_duration;
-    std::chrono::milliseconds m_map_hold_duration;
-    WallClock m_last_ball;
-    VideoSnapshot m_start_of_detection;
-};
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSV/Inference/Picnics/PokemonSV_PicnicDetector.cpp b/SerialPrograms/Source/PokemonSV/Inference/Picnics/PokemonSV_PicnicDetector.cpp
deleted file mode 100644
index 2f61721ce2..0000000000
--- a/SerialPrograms/Source/PokemonSV/Inference/Picnics/PokemonSV_PicnicDetector.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-/*  Picnic Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/Globals.h"
-#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
-#include "PokemonSV_PicnicDetector.h"
-
-#include <iostream>
-using std::cout;
-using std::endl;
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-
-PicnicDetector::PicnicDetector(Color color)
-: m_color(color)
-, m_button_b(color, WhiteButton::ButtonB, {0.024, 0.702, 0.024, 0.045})
-, m_button_minus(color, WhiteButton::ButtonMinus, {0.024, 0.866, 0.024, 0.045})
-, m_button_y(color, WhiteButton::ButtonY, {0.024, 0.917, 0.024, 0.045}) {}
-
-void PicnicDetector::make_overlays(VideoOverlaySet& items) const{
-    m_button_b.make_overlays(items);
-    m_button_minus.make_overlays(items);
-    m_button_y.make_overlays(items);
-}
-
-bool PicnicDetector::detect(const ImageViewRGB32& frame) const{
-    return m_button_b.detect(frame)
-        && m_button_minus.detect(frame)
-        && m_button_y.detect(frame);
-}
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSV/Inference/Picnics/PokemonSV_PicnicDetector.h b/SerialPrograms/Source/PokemonSV/Inference/Picnics/PokemonSV_PicnicDetector.h
deleted file mode 100644
index 38ff258133..0000000000
--- a/SerialPrograms/Source/PokemonSV/Inference/Picnics/PokemonSV_PicnicDetector.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*  Picnic Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSV_PicnicDetector_H
-#define PokemonAutomation_PokemonSV_PicnicDetector_H
-
-#include "Common/Cpp/Color.h"
-#include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "CommonFramework/InferenceInfra/VisualInferenceCallback.h"
-#include "CommonFramework/Inference/VisualDetector.h"
-#include "PokemonSV/Inference/PokemonSV_WhiteButtonDetector.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-// Detect the player character is in a picnic
-class PicnicDetector : public StaticScreenDetector{
-public:
-    PicnicDetector(Color color = COLOR_YELLOW);
-
-    virtual void make_overlays(VideoOverlaySet& items) const override;
-    virtual bool detect(const ImageViewRGB32& screen) const override;
-
-private:
-    Color m_color;
-    WhiteButtonDetector m_button_b;
-    WhiteButtonDetector m_button_minus;
-    WhiteButtonDetector m_button_y;
-};
-
-class PicnicWatcher : public DetectorToFinder<PicnicDetector>{
-public:
-    PicnicWatcher(Color color = COLOR_YELLOW)
-         : DetectorToFinder("PicnicWatcher", std::chrono::milliseconds(1000), color)
-    {}
-};
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSV/Inference/Picnics/PokemonSV_SandwichHandDetector.cpp b/SerialPrograms/Source/PokemonSV/Inference/Picnics/PokemonSV_SandwichHandDetector.cpp
deleted file mode 100644
index 4a9387e7bd..0000000000
--- a/SerialPrograms/Source/PokemonSV/Inference/Picnics/PokemonSV_SandwichHandDetector.cpp
+++ /dev/null
@@ -1,134 +0,0 @@
-/*  Sandwich Hand Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Cpp/Exceptions.h"
-#include "CommonFramework/Globals.h"
-#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
-#include "CommonFramework/ImageMatch/WaterfillTemplateMatcher.h"
-#include "CommonFramework/ImageTools/WaterfillUtilities.h"
-#include "Kernels/Waterfill/Kernels_Waterfill_Types.h"
-#include "PokemonSV_SandwichHandDetector.h"
-
-#include <iostream>
-using std::cout;
-using std::endl;
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-
-namespace {
-
-class SandwichFreeHandMatcher : public ImageMatch::WaterfillTemplateMatcher{
-public:
-    SandwichFreeHandMatcher() : WaterfillTemplateMatcher(
-        "PokemonSV/Picnic/SandwichHand-Template.png", Color(100,100,100), Color(255, 255, 255), 50
-    ) {
-        m_aspect_ratio_lower = 0.9;
-        m_aspect_ratio_upper = 1.1;
-        m_area_ratio_lower = 0.9;
-        m_area_ratio_upper = 1.1;
-    }
-
-    static const ImageMatch::WaterfillTemplateMatcher& instance() {
-        static SandwichFreeHandMatcher matcher;
-        return matcher;
-    }
-};
-
-
-class SandwichGrabbingHandMatcher : public ImageMatch::WaterfillTemplateMatcher{
-public:
-    SandwichGrabbingHandMatcher() : WaterfillTemplateMatcher(
-        "PokemonSV/Picnic/SandwichGrab-Template.png", Color(100,100,100), Color(255, 255, 255), 50
-    ) {
-        m_aspect_ratio_lower = 0.9;
-        m_aspect_ratio_upper = 1.1;
-        m_area_ratio_lower = 0.9;
-        m_area_ratio_upper = 1.1;
-    }
-
-    static const ImageMatch::WaterfillTemplateMatcher& instance() {
-        static SandwichGrabbingHandMatcher matcher;
-        return matcher;
-    }
-};
-
-} // anonymous namespace
-
-std::string SANDWICH_HAND_TYPE_NAMES(SandwichHandType type){
-    switch (type)
-    {
-    case SandwichHandType::FREE:
-        return "FREE";
-    case SandwichHandType::GRABBING:
-        return "GRABBING";
-    default:
-        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Unknown SandwichHandType");
-    }
-}
-
-SandwichHandLocator::SandwichHandLocator(HandType hand_type, const ImageFloatBox& box, Color color)
-: m_type(hand_type), m_box(box), m_color(color) {}
-
-void SandwichHandLocator::make_overlays(VideoOverlaySet& items) const{
-    items.add(m_color, m_box);
-}
-
-std::pair<double, double> SandwichHandLocator::detect(const ImageViewRGB32& frame) const {
-
-    const std::vector<std::pair<uint32_t, uint32_t>> filters = {
-        {combine_rgb(150, 150, 150), combine_rgb(255, 255, 255)}
-    };
-
-    const double screen_rel_size = (frame.height() / 1080.0);
-
-    double min_hand_size = ((m_type == HandType::FREE) ? 5000.0 : 4500.0);
-    const size_t min_size = size_t(screen_rel_size * screen_rel_size * min_hand_size);
-
-    std::pair<double, double> hand_location(-1.0, -1.0);
-
-    ImagePixelBox pixel_box = floatbox_to_pixelbox(frame.width(), frame.height(), m_box);
-    match_template_by_waterfill(
-        extract_box_reference(frame, m_box), 
-        ((m_type == HandType::FREE) ? SandwichFreeHandMatcher::instance() : SandwichGrabbingHandMatcher::instance()),
-        filters,
-        {min_size, SIZE_MAX},
-        60,
-        [&](Kernels::Waterfill::WaterfillObject& object) -> bool {
-            hand_location = std::make_pair(
-                (object.center_of_gravity_x() + pixel_box.min_x) / (double)frame.width(),
-                (object.center_of_gravity_y() + pixel_box.min_y) / (double)frame.height()
-            );
-            return true;
-        }
-    );
-
-    return hand_location;
-}
-
-
-SandwichHandWatcher::SandwichHandWatcher(
-    HandType hand_type,
-    const ImageFloatBox& box,
-    Color color
-): VisualInferenceCallback("SandwichHandWatcher"), m_locator(hand_type, box, color), m_location(-1.0, -1.0) {}
-
-void SandwichHandWatcher::make_overlays(VideoOverlaySet& items) const{
-    m_locator.make_overlays(items);
-}
-
-bool SandwichHandWatcher::process_frame(const VideoSnapshot& frame){
-    m_last_snapshot = frame;
-    m_location = m_locator.detect(frame);
-    return m_location.first >= 0.0;
-}
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSV/Inference/Picnics/PokemonSV_SandwichHandDetector.h b/SerialPrograms/Source/PokemonSV/Inference/Picnics/PokemonSV_SandwichHandDetector.h
deleted file mode 100644
index 827b57131f..0000000000
--- a/SerialPrograms/Source/PokemonSV/Inference/Picnics/PokemonSV_SandwichHandDetector.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*  Sandwich Hand Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSV_SandwichHandLocator_H
-#define PokemonAutomation_PokemonSV_SandwichHandLocator_H
-
-#include "Common/Cpp/Color.h"
-#include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "CommonFramework/InferenceInfra/VisualInferenceCallback.h"
-#include "CommonFramework/Inference/VisualDetector.h"
-#include "PokemonSV/Inference/PokemonSV_WhiteButtonDetector.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-enum class SandwichHandType {
-    FREE,
-    GRABBING,
-};
-
-// Type enum to string
-std::string SANDWICH_HAND_TYPE_NAMES(SandwichHandType type);
-
-// Detect the hand used to make sandwich in the sandwich minigame.
-class SandwichHandLocator{
-public:
-    using HandType = SandwichHandType;
-
-    SandwichHandLocator(HandType hand_type, const ImageFloatBox& box, Color color = COLOR_RED);
-
-    void make_overlays(VideoOverlaySet& items) const;
-    
-    // return detected hand cetner location on screen, (x, y) where
-    // x: [0, 1), 0 left-most, 1 right-most, y: [0, 1), 0 top-most 1 bottom-most
-    // If hand not detected, return (-1, -1).
-    std::pair<double, double> detect(const ImageViewRGB32& screen) const;
-
-    void change_box(const ImageFloatBox& new_box) { m_box = new_box; }
-
-private:
-    HandType m_type;
-    ImageFloatBox m_box;
-    Color m_color;
-};
-
-class SandwichHandWatcher : public VisualInferenceCallback{
-public:
-    using HandType = SandwichHandType;
-
-    SandwichHandWatcher(HandType hand_type, const ImageFloatBox& box, Color color = COLOR_RED);
-
-    const VideoSnapshot& last_snapshot() const{ return m_last_snapshot; }
-
-    virtual void make_overlays(VideoOverlaySet& items) const override;
-    virtual bool process_frame(const VideoSnapshot& frame) override;
-
-    const std::pair<double, double>& location() const { return m_location; }
-
-    void change_box(const ImageFloatBox& new_box) { m_locator.change_box(new_box); }
-
-private:
-    SandwichHandLocator m_locator;
-    std::pair<double, double> m_location;
-    VideoSnapshot m_last_snapshot;
-};
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSV/Inference/Picnics/PokemonSV_SandwichIngredientDetector.cpp b/SerialPrograms/Source/PokemonSV/Inference/Picnics/PokemonSV_SandwichIngredientDetector.cpp
deleted file mode 100644
index 6b4381ad4a..0000000000
--- a/SerialPrograms/Source/PokemonSV/Inference/Picnics/PokemonSV_SandwichIngredientDetector.cpp
+++ /dev/null
@@ -1,318 +0,0 @@
-/*  Sandwich Ingredient Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/ImageMatch/ImageCropper.h"
-#include "CommonFramework/ImageMatch/WaterfillTemplateMatcher.h"
-#include "CommonFramework/ImageTools/ImageFilter.h"
-#include "CommonFramework/ImageTools/ImageStats.h"
-#include "CommonFramework/ImageTools/WaterfillUtilities.h"
-#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
-#include "CommonFramework/OCR/OCR_Routines.h"
-#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
-#include "PokemonSV/Resources/PokemonSV_Ingredients.h"
-#include "PokemonSV_SandwichIngredientDetector.h"
-
-#include <iostream>
-using std::cout;
-using std::endl;
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-
-namespace {
-
-class SandwichCondimentsPageMatcher : public ImageMatch::WaterfillTemplateMatcher{
-public:
-    SandwichCondimentsPageMatcher() : WaterfillTemplateMatcher(
-        "PokemonSV/Picnic/Condiments-Template.png", Color(100,100,100), Color(255, 255, 255), 50
-    ) {
-        m_aspect_ratio_lower = 0.9;
-        m_aspect_ratio_upper = 1.1;
-        m_area_ratio_lower = 0.9;
-        m_area_ratio_upper = 1.1;
-    }
-
-    static const ImageMatch::WaterfillTemplateMatcher& instance() {
-        static SandwichCondimentsPageMatcher matcher;
-        return matcher;
-    }
-};
-
-class SandwichPicksPageMatcher : public ImageMatch::WaterfillTemplateMatcher{
-public:
-    SandwichPicksPageMatcher() : WaterfillTemplateMatcher(
-        "PokemonSV/Picnic/Picks-Template.png", Color(100,100,100), Color(255, 255, 255), 50
-    ) {
-        m_aspect_ratio_lower = 0.8;
-        m_aspect_ratio_upper = 1.2;
-        m_area_ratio_lower = 0.8;
-        m_area_ratio_upper = 1.2;
-    }
-
-    static const ImageMatch::WaterfillTemplateMatcher& instance() {
-        static SandwichPicksPageMatcher matcher;
-        return matcher;
-    }
-};
-
-
-} // anonymous namespace
-
-
-SandwichIngredientArrowDetector::SandwichIngredientArrowDetector(size_t menu_index, Color color)
-    : m_arrow(color, GradientArrowType::RIGHT, {0.013, menu_index*0.074 + 0.167, 0.056, 0.084}) {}
-
-void SandwichIngredientArrowDetector::make_overlays(VideoOverlaySet& items) const{
-    m_arrow.make_overlays(items);
-}
-
-bool SandwichIngredientArrowDetector::detect(const ImageViewRGB32& screen) const{
-    return m_arrow.detect(screen);
-}
-
-
-DeterminedSandwichIngredientDetector::DeterminedSandwichIngredientDetector(
-    SandwichIngredientType ingredient_type, size_t index, Color color
-) : m_color(color){
-    float offset = (ingredient_type == SandwichIngredientType::FILLING ? 0.0f : 0.2885f) + index * 0.047f;
-    m_edges[0] = ImageFloatBox(offset + 0.509, 0.807, 0.033, 0.012);
-    m_edges[1] = ImageFloatBox(offset + 0.501, 0.821, 0.008, 0.057);
-    m_edges[2] = ImageFloatBox(offset + 0.509, 0.879, 0.033, 0.012);
-    m_edges[3] = ImageFloatBox(offset + 0.541, 0.821, 0.008, 0.057);
-}
-
-void DeterminedSandwichIngredientDetector::make_overlays(VideoOverlaySet& items) const{
-    for(int i = 0; i < 4; i++){
-        items.add(m_color, m_edges[i]);
-    }
-}
-
-bool DeterminedSandwichIngredientDetector::detect(const ImageViewRGB32& screen) const{
-    int yellow_count = 0;
-    for(int i = 0; i < 4; i++){
-        FloatPixel avg = image_stats(extract_box_reference(screen, m_edges[i])).average;
-        if (avg.r > avg.b * 1.25 && avg.g > avg.b * 1.15){
-            yellow_count++;
-        }
-    }
-    return yellow_count >= 3;
-}
-
-
-SandwichCondimentsPageDetector::SandwichCondimentsPageDetector(Color color)
-    : m_color(color), m_box(0.046, 0.100, 0.021, 0.052) {}
-
-void SandwichCondimentsPageDetector::make_overlays(VideoOverlaySet& items) const{
-    items.add(m_color, m_box);
-}
-
-bool SandwichCondimentsPageDetector::detect(const ImageViewRGB32& screen) const{
-    const std::vector<std::pair<uint32_t, uint32_t>> filters = {
-        {combine_rgb(150, 150, 150), combine_rgb(255, 255, 255)}
-    };
-
-    const double screen_rel_size = (screen.height() / 1080.0);
-
-    const size_t min_size = size_t(screen_rel_size * screen_rel_size * 700);
-    return match_template_by_waterfill(
-        extract_box_reference(screen, m_box), 
-        SandwichCondimentsPageMatcher::instance(),
-        filters,
-        {min_size, SIZE_MAX},
-        70,
-        [&](Kernels::Waterfill::WaterfillObject& object) -> bool { return true; }
-    );
-}
-
-
-
-SandwichPicksPageDetector::SandwichPicksPageDetector(Color color)
-    : m_color(color), m_box(0.046, 0.100, 0.021, 0.052) {}
-
-void SandwichPicksPageDetector::make_overlays(VideoOverlaySet& items) const{
-    items.add(m_color, m_box);
-}
-
-bool SandwichPicksPageDetector::detect(const ImageViewRGB32& screen) const{
-    const std::vector<std::pair<uint32_t, uint32_t>> filters = {
-        {combine_rgb(150, 150, 150), combine_rgb(255, 255, 255)}
-    };
-
-    const double screen_rel_size = (screen.height() / 1080.0);
-
-    const size_t min_size = size_t(screen_rel_size * screen_rel_size * 300);
-    return match_template_by_waterfill(
-        extract_box_reference(screen, m_box), 
-        SandwichPicksPageMatcher::instance(),
-        filters,
-        {min_size, SIZE_MAX},
-        70,
-        [&](Kernels::Waterfill::WaterfillObject& object) -> bool { return true; }
-    );
-}
-
-
-
-
-const SandwichFillingMatcher& SANDWICH_FILLING_MATCHER(){
-    static SandwichFillingMatcher matcher;
-    return matcher;
-}
-SandwichFillingMatcher::SandwichFillingMatcher(double min_euclidean_distance)
-    : CroppedImageDictionaryMatcher({0, 1})
-    , m_min_euclidean_distance_squared(min_euclidean_distance * min_euclidean_distance){
-    for (const auto& item : SANDWICH_FILLINGS_DATABASE()){
-        add(item.first, item.second.sprite);
-    }
-}
-ImageRGB32 SandwichFillingMatcher::process_image(const ImageViewRGB32& image, Color& background) const{
-    ImageStats border = image_border_stats(image);
-//    cout << "border = " << border.average << endl;
-//    image.save("image.png");
-    ImagePixelBox box = ImageMatch::enclosing_rectangle_with_pixel_filter(
-        image,
-        [&](Color pixel){
-            double r = (double)pixel.red() - border.average.r;
-            double g = (double)pixel.green() - border.average.g;
-            double b = (double)pixel.blue() - border.average.b;
-            bool stop = r * r + g * g + b * b >= m_min_euclidean_distance_squared;
-            return stop;
-        }
-    );
-    background = border.average.round();
-    return extract_box_reference(image, box).copy();
-}
-
-
-const SandwichCondimentMatcher& SANDWICH_CONDIMENT_MATCHER(){
-    static SandwichCondimentMatcher matcher;
-    return matcher;
-}
-SandwichCondimentMatcher::SandwichCondimentMatcher(double min_euclidean_distance)
-    : CroppedImageDictionaryMatcher({0, 1})
-    , m_min_euclidean_distance_squared(min_euclidean_distance * min_euclidean_distance){
-    for (const auto& item : SANDWICH_CONDIMENTS_DATABASE()){
-        add(item.first, item.second.sprite);
-    }
-}
-ImageRGB32 SandwichCondimentMatcher::process_image(const ImageViewRGB32& image, Color& background) const{
-    ImageStats border = image_border_stats(image);
-    ImagePixelBox box = ImageMatch::enclosing_rectangle_with_pixel_filter(
-        image,
-        [&](Color pixel){
-            double r = (double)pixel.red() - border.average.r;
-            double g = (double)pixel.green() - border.average.g;
-            double b = (double)pixel.blue() - border.average.b;
-            bool stop = r * r + g * g + b * b >= m_min_euclidean_distance_squared;
-            return stop;
-        }
-    );
-    background = border.average.round();
-    return extract_box_reference(image, box).copy();
-}
-
-const SandwichFillingOCR& SandwichFillingOCR::instance(){
-    static SandwichFillingOCR reader;
-    return reader;
-}
-SandwichFillingOCR::SandwichFillingOCR()
-    : SmallDictionaryMatcher("PokemonSV/Picnic/SandwichFillingOCR.json")
-{}
-OCR::StringMatchResult SandwichFillingOCR::read_substring(
-    Logger& logger,
-    Language language,
-    const ImageViewRGB32& image,
-    const std::vector<OCR::TextColorRange>& text_color_ranges,
-    double min_text_ratio, double max_text_ratio
-) const{
-    return match_substring_from_image_multifiltered(
-        &logger, language, image, text_color_ranges,
-        MAX_LOG10P, MAX_LOG10P_SPREAD,
-        min_text_ratio, max_text_ratio
-    );
-}
-
-const SandwichCondimentOCR& SandwichCondimentOCR::instance(){
-    static SandwichCondimentOCR reader;
-    return reader;
-}
-SandwichCondimentOCR::SandwichCondimentOCR()
-    : SmallDictionaryMatcher("PokemonSV/Picnic/SandwichCondimentOCR.json")
-{}
-OCR::StringMatchResult SandwichCondimentOCR::read_substring(
-    Logger& logger,
-    Language language,
-    const ImageViewRGB32& image,
-    const std::vector<OCR::TextColorRange>& text_color_ranges,
-    double min_text_ratio, double max_text_ratio
-) const{
-    return match_substring_from_image_multifiltered(
-        &logger, language, image, text_color_ranges,
-        MAX_LOG10P, MAX_LOG10P_SPREAD,
-        min_text_ratio, max_text_ratio
-    );
-}
-
-SandwichIngredientReader::SandwichIngredientReader(SandwichIngredientType ingredient_type, size_t index, Color color)
-    : m_color(color)
-    , m_icon_box(0.064, 0.179 + 0.074 * index, 0.032, 0.057)
-    , m_text_box(0.100, 0.179 + 0.074 * index, 0.273, 0.057)
-    , m_ingredient_type(ingredient_type)
-{}
-
-void SandwichIngredientReader::make_overlays(VideoOverlaySet& items) const{
-    items.add(m_color, m_icon_box);
-    items.add(m_color, m_text_box);
-}
-
-ImageMatch::ImageMatchResult SandwichIngredientReader::read_with_icon_matcher(const ImageViewRGB32& screen) const{
-    // Get a crop of the sandwich ingredient icon
-    ImageViewRGB32 image = extract_box_reference(screen, m_icon_box);
-//    image.save("image.png");
-
-//    // Remove the orange / yellow background when the ingredient is selected
-//    ImageRGB32 filtered_image = filter_rgb32_range(image, 0xffdfaf00, 0xffffef20, Color(0x00000000), true);
-//    filtered_image.save("filtered_image.png");
-
-    ImageMatch::ImageMatchResult results;
-    switch (m_ingredient_type){
-    case SandwichIngredientType::FILLING:
-//        cout << "Filling" << endl;
-        results = SANDWICH_FILLING_MATCHER().match(image, ALPHA_SPREAD);
-        break;
-    case SandwichIngredientType::CONDIMENT:
-//        cout << "Condiment" << endl;
-        results = SANDWICH_CONDIMENT_MATCHER().match(image, ALPHA_SPREAD);
-        break;
-    }
-//    results.clear_beyond_alpha(MAX_ALPHA);
-
-    return results;
-}
-
-OCR::StringMatchResult SandwichIngredientReader::read_with_ocr(const ImageViewRGB32& screen, Logger& logger, Language language) const{
-    // Get a crop of the sandwich ingredient text
-    ImageViewRGB32 image = extract_box_reference(screen, m_text_box);
-    //image.save("image.png");
-
-    OCR::StringMatchResult results;
-    switch (m_ingredient_type){
-    case SandwichIngredientType::FILLING:
-        results = SandwichFillingOCR::instance().read_substring(logger, language, image, OCR::BLACK_OR_WHITE_TEXT_FILTERS());
-        break;
-    case SandwichIngredientType::CONDIMENT:
-        results = SandwichCondimentOCR::instance().read_substring(logger, language, image, OCR::BLACK_OR_WHITE_TEXT_FILTERS());
-        break;
-    }
-
-    return results;
-}
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSV/Inference/Picnics/PokemonSV_SandwichIngredientDetector.h b/SerialPrograms/Source/PokemonSV/Inference/Picnics/PokemonSV_SandwichIngredientDetector.h
deleted file mode 100644
index a6cab4ad6f..0000000000
--- a/SerialPrograms/Source/PokemonSV/Inference/Picnics/PokemonSV_SandwichIngredientDetector.h
+++ /dev/null
@@ -1,204 +0,0 @@
-/*  Sandwich Ingredient Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSV_SandwichIngredientDetector_H
-#define PokemonAutomation_PokemonSV_SandwichIngredientDetector_H
-
-#include "Common/Cpp/Color.h"
-#include "CommonFramework/ImageMatch/CroppedImageDictionaryMatcher.h"
-#include "CommonFramework/ImageMatch/ImageMatchResult.h"
-#include "CommonFramework/ImageTools/ImageBoxes.h"
-//#include "CommonFramework/InferenceInfra/VisualInferenceCallback.h"
-#include "CommonFramework/Inference/VisualDetector.h"
-#include "CommonFramework/OCR/OCR_SmallDictionaryMatcher.h"
-#include "PokemonSV/Inference/Dialogs/PokemonSV_GradientArrowDetector.h"
-
-#include <array>
-
-namespace PokemonAutomation{
-    class ConsoleHandle;
-    class BotBaseContext;
-    struct ProgramInfo;
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-//  Detect the selection arrow in the sandwich ingredient list (the list of fillings, condiments and picks).
-class SandwichIngredientArrowDetector : public StaticScreenDetector{
-public:
-    // menu_index: which row of the selection arrow should be on. Range: [0, 9]:
-    // there are at most 10 rows on screen.
-    SandwichIngredientArrowDetector(size_t menu_index, Color color = COLOR_RED);
-
-    virtual void make_overlays(VideoOverlaySet& items) const override;
-    virtual bool detect(const ImageViewRGB32& screen) const override;
-
-private:
-    GradientArrowDetector m_arrow;
-};
-
-class SandwichIngredientArrowWatcher : public DetectorToFinder<SandwichIngredientArrowDetector>{
-public:
-    SandwichIngredientArrowWatcher(size_t menu_index, Color color = COLOR_RED)
-         : DetectorToFinder("SandwichIngredientArrowWatcher", std::chrono::milliseconds(250), menu_index, color)
-    {}
-};
-
-
-
-enum class SandwichIngredientType{
-    FILLING,
-    CONDIMENT,
-};
-
-//  Detect one determined sandwich ingredient, displayed in the lower right corner, inside a highlighted yellow box
-//  The detector detects this yellow box.
-class DeterminedSandwichIngredientDetector : public StaticScreenDetector{
-public:
-    // index: the `index`-th ingredient to detect.
-    // For single player, there are at most 6 fillings, so if `ingredient_type` == FILLING, `index` range is [0, 5].
-    // For single player, there are at most 4 condiments, so if `ingredient_type` == CONDIMENT, `index` range is [0, 3].
-    DeterminedSandwichIngredientDetector(SandwichIngredientType ingredient_type, size_t index, Color color = COLOR_RED);
-
-    virtual void make_overlays(VideoOverlaySet& items) const override;
-    virtual bool detect(const ImageViewRGB32& screen) const override;
-
-private:
-    Color m_color;
-    std::array<ImageFloatBox, 4> m_edges;
-};
-
-class DeterminedSandwichIngredientWatcher : public DetectorToFinder<DeterminedSandwichIngredientDetector>{
-public:
-    DeterminedSandwichIngredientWatcher(SandwichIngredientType ingredient_type, size_t index, Color color = COLOR_RED)
-         : DetectorToFinder("DeterminedSandwichIngredientWatcher", std::chrono::milliseconds(100), ingredient_type, index, color)
-    {}
-};
-
-// Detect the white condiments page at upper left corner of the screen, during custom sandwich mode.
-class SandwichCondimentsPageDetector : public StaticScreenDetector{
-public:
-    SandwichCondimentsPageDetector(Color color = COLOR_RED);
-
-    virtual void make_overlays(VideoOverlaySet& items) const override;
-    virtual bool detect(const ImageViewRGB32& screen) const override;
-
-private:
-    Color m_color;
-    ImageFloatBox m_box;
-};
-class SandwichCondimentsPageWatcher : public DetectorToFinder<SandwichCondimentsPageDetector>{
-public:
-    SandwichCondimentsPageWatcher(Color color = COLOR_RED)
-         : DetectorToFinder("SandwichCondimentsPageWatcher", std::chrono::milliseconds(250), color)
-    {}
-};
-
-// Detect the white picks page at upper left corner of the screen, during custom sandwich mode.
-class SandwichPicksPageDetector : public StaticScreenDetector{
-public:
-    SandwichPicksPageDetector(Color color = COLOR_RED);
-
-    virtual void make_overlays(VideoOverlaySet& items) const override;
-    virtual bool detect(const ImageViewRGB32& screen) const override;
-
-private:
-    Color m_color;
-    ImageFloatBox m_box;
-};
-class SandwichPicksPageWatcher : public DetectorToFinder<SandwichPicksPageDetector>{
-public:
-    SandwichPicksPageWatcher(Color color = COLOR_RED)
-         : DetectorToFinder("SandwichPicksPageWatcher", std::chrono::milliseconds(250), color)
-    {}
-};
-
-
-
-class SandwichFillingMatcher : public ImageMatch::CroppedImageDictionaryMatcher{
-public:
-    SandwichFillingMatcher(double min_euclidean_distance = 200);
-
-private:
-    virtual ImageRGB32 process_image(const ImageViewRGB32& image, Color& background) const override;
-    double m_min_euclidean_distance_squared;
-};
-
-class SandwichCondimentMatcher : public ImageMatch::CroppedImageDictionaryMatcher{
-public:
-    SandwichCondimentMatcher(double min_euclidean_distance = 200);
-
-private:
-    virtual ImageRGB32 process_image(const ImageViewRGB32& image, Color& background) const override;
-    double m_min_euclidean_distance_squared;
-};
-
-class SandwichFillingOCR : public OCR::SmallDictionaryMatcher{
-public:
-    static constexpr double MAX_LOG10P = -2.0;
-    static constexpr double MAX_LOG10P_SPREAD = 0.5;
-
-public:
-    static const SandwichFillingOCR& instance();
-
-    OCR::StringMatchResult read_substring(
-        Logger& logger,
-        Language language,
-        const ImageViewRGB32& image,
-        const std::vector<OCR::TextColorRange>& text_color_ranges,
-        double min_text_ratio = 0.01, double max_text_ratio = 0.50
-    ) const;
-
-private:
-    SandwichFillingOCR();
-};
-class SandwichCondimentOCR : public OCR::SmallDictionaryMatcher{
-public:
-    static constexpr double MAX_LOG10P = -2.0;
-    static constexpr double MAX_LOG10P_SPREAD = 0.5;
-
-public:
-    static const SandwichCondimentOCR& instance();
-
-    OCR::StringMatchResult read_substring(
-        Logger& logger,
-        Language language,
-        const ImageViewRGB32& image,
-        const std::vector<OCR::TextColorRange>& text_color_ranges,
-        double min_text_ratio = 0.01, double max_text_ratio = 0.50
-    ) const;
-
-private:
-    SandwichCondimentOCR();
-};
-
-class SandwichIngredientReader{
-public:
-    static constexpr double MAX_ALPHA = 180;
-    static constexpr double ALPHA_SPREAD = 10;
-
-
-public:
-    SandwichIngredientReader(SandwichIngredientType ingredient_type, size_t index, Color color = COLOR_RED);
-
-    void make_overlays(VideoOverlaySet& items) const;
-
-    // The icon matcher only works on the selected item, because we want to remove the yellow / orange background
-    ImageMatch::ImageMatchResult read_with_icon_matcher(const ImageViewRGB32& screen) const;
-
-    // The OCR works on any ingredient, selected or not
-    OCR::StringMatchResult read_with_ocr(const ImageViewRGB32& screen, Logger& logger, Language language) const;
-
-private:
-    Color m_color;
-    ImageFloatBox m_icon_box;
-    ImageFloatBox m_text_box;
-    SandwichIngredientType m_ingredient_type;
-};
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSV/Inference/Picnics/PokemonSV_SandwichRecipeDetector.cpp b/SerialPrograms/Source/PokemonSV/Inference/Picnics/PokemonSV_SandwichRecipeDetector.cpp
deleted file mode 100644
index d17bf88b76..0000000000
--- a/SerialPrograms/Source/PokemonSV/Inference/Picnics/PokemonSV_SandwichRecipeDetector.cpp
+++ /dev/null
@@ -1,132 +0,0 @@
-/*  Sandwich Recipe Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Cpp/Containers/FixedLimitVector.tpp"
-#include "CommonFramework/Globals.h"
-#include "CommonFramework/ImageTools/ImageFilter.h"
-#include "CommonFramework/ImageTypes/ImageRGB32.h"
-#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
-#include "CommonFramework/Logging/Logger.h"
-#include "CommonFramework/OCR/OCR_NumberReader.h"
-#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
-#include "PokemonSV_SandwichRecipeDetector.h"
-
-#include <opencv2/imgproc.hpp>
-
-#include <iostream>
-using std::cout;
-using std::endl;
-
-namespace PokemonAutomation{
-
-template class FixedLimitVector<NintendoSwitch::PokemonSV::GradientArrowWatcher>;
-
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-SandwichRecipeNumberDetector::SandwichRecipeNumberDetector(Logger& logger, Color color): m_logger(logger), m_color(color){
-    for(int y = 0; y < 3; y++){
-        for(int x = 0; x < 2; x++){
-            // m_arrow_boxes[y*2+x] = ImageFloatBox(x * 0.26 + 0.103, y * 0.275 + 0.074, 0.068, 0.085);
-            m_id_boxes[y*2+x] = ImageFloatBox(x * 0.26 + 0.015, y * 0.277 + 0.240, 0.042, 0.048);
-        }
-    }
-}
-
-void SandwichRecipeNumberDetector::make_overlays(VideoOverlaySet& items) const{
-    for(int i = 0; i < 6; i++){
-        // items.add(m_color, m_arrow_boxes[i]);
-        items.add(m_color, m_id_boxes[i]);
-    }   
-}
-
-void SandwichRecipeNumberDetector::detect_recipes(const ImageViewRGB32& screen, size_t recipe_IDs[6]) const{
-    for(int i = 0; i < 6; i++){
-        auto cropped_image = extract_box_reference(screen, m_id_boxes[i]);
-
-        const bool invert_blackwhite = true;
-        ImageRGB32 filterd_image = to_blackwhite_rgb32_range(cropped_image,
-            combine_rgb(200, 200, 200), combine_rgb(255, 255, 255), invert_blackwhite);
-
-        ImageRGB32 dilated_image(filterd_image.width(), filterd_image.height());
-
-        if (screen.width() >= 1280){
-            const int dilation_type = cv::MORPH_ELLIPSE;
-            const int dilation_size = 1;
-
-            cv::Mat element = cv::getStructuringElement(dilation_type,
-                cv::Size(2*dilation_size + 1, 2*dilation_size+1),
-                cv::Point(dilation_size, dilation_size));
-
-            // filterd_image.save("./tmp_" + std::to_string(i) + ".png");
-            
-            cv::Mat filtered_image_mat(static_cast<int>(filterd_image.height()), static_cast<int>(filterd_image.width()), CV_8UC4, (void*)filterd_image.data(), filterd_image.bytes_per_row());
-            
-            cv::Mat dilated_image_mat(static_cast<int>(dilated_image.height()), static_cast<int>(dilated_image.width()), CV_8UC4, (void*)dilated_image.data(), dilated_image.bytes_per_row());
-            cv::dilate(filtered_image_mat, dilated_image_mat, element);
-        } else{
-            dilated_image = filterd_image.copy();
-        }
-
-        // dilated_image.save("./tmp_dil_" + std::to_string(i) + ".png");
-        
-        const int number = OCR::read_number(m_logger, dilated_image);
-        if (number <= 0 || number > 151){
-            recipe_IDs[i] = 0;
-        } else{
-            recipe_IDs[i] = number;
-        }
-    }
-
-    // Fix any broken OCR reads:
-    for (int i = 1; i < 5; i++){
-        if (recipe_IDs[i+1] > 0 && recipe_IDs[i-1] > 0 && recipe_IDs[i-1] + 2 == recipe_IDs[i+1]){
-            if (recipe_IDs[i] != recipe_IDs[i-1] + 1) {
-                recipe_IDs[i] = recipe_IDs[i-1] + 1;
-                m_logger.log("Fix recipe number at cell " + std::to_string(i) + " to be " + std::to_string(recipe_IDs[i]));
-            }
-        }
-    }
-    if (recipe_IDs[1] == 2 && recipe_IDs[2] == 3){
-        if (recipe_IDs[0] != 1){
-            recipe_IDs[0] = 1;
-            m_logger.log("Fix recipe number at cell 0 to be 1");
-        }
-    }
-}
-
-
-SandwichRecipeSelectionWatcher::SandwichRecipeSelectionWatcher(Color color)
-: VisualInferenceCallback("SandwichRecipeSelectionWatcher"), m_arrow_watchers(6){
-    for(int y = 0; y < 3; y++){
-        for(int x = 0; x < 2; x++){
-            ImageFloatBox box(x * 0.26 + 0.103, y * 0.275 + 0.074, 0.068, 0.085);
-            m_arrow_watchers.emplace_back(color, GradientArrowType::DOWN, box);
-        }
-    }
-}
-
-void SandwichRecipeSelectionWatcher::make_overlays(VideoOverlaySet& items) const{
-    for(int i = 0; i < 6; i++){
-        m_arrow_watchers[i].make_overlays(items);
-    }
-}
-
-bool SandwichRecipeSelectionWatcher::process_frame(const VideoSnapshot& frame){
-    int num_arrows_found = 0;
-    for(int i = 0; i < 6; i++){
-        const bool found_arrow = m_arrow_watchers[i].process_frame(frame);
-        if (found_arrow){
-            m_selected_recipe = i;
-            num_arrows_found++;
-        }
-    }
-    return num_arrows_found == 1;
-}
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSV/Inference/Picnics/PokemonSV_SandwichRecipeDetector.h b/SerialPrograms/Source/PokemonSV/Inference/Picnics/PokemonSV_SandwichRecipeDetector.h
deleted file mode 100644
index 8ab52fb3a6..0000000000
--- a/SerialPrograms/Source/PokemonSV/Inference/Picnics/PokemonSV_SandwichRecipeDetector.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*  Sandwich Recipe Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSV_SandwichRecipeNumberDetector_H
-#define PokemonAutomation_PokemonSV_SandwichRecipeNumberDetector_H
-
-#include "Common/Cpp/Color.h"
-#include "Common/Cpp/Containers/FixedLimitVector.h"
-#include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "CommonFramework/InferenceInfra/VisualInferenceCallback.h"
-#include "CommonFramework/Inference/VisualDetector.h"
-#include "PokemonSV/Inference/Dialogs/PokemonSV_GradientArrowDetector.h"
-
-#include <vector>
-
-namespace PokemonAutomation{
-    class Logger;
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-// Detect the sandwich recipe IDs
-class SandwichRecipeNumberDetector{
-public:
-    SandwichRecipeNumberDetector(Logger& logger, Color color = COLOR_YELLOW);
-
-    void make_overlays(VideoOverlaySet& items) const;
-
-    // Detect the IDs of the displayed sandwich recipes.
-    // The order is from top to bottom, left to right:
-    // --------------------------------------
-    // recipe_IDs[0]  |   recipe_IDs[1]
-    // recipe_IDs[2]  |   recipe_IDs[3]
-    // recipe_IDs[4]  |   recipe_IDs[5]
-    // --------------------------------------
-    // recipe ID range: [1, 151]
-    // If there is no recipe at one cell, its value is 0.
-    // If a recipe has not enough ingredient to make (displayed as semi-transparent), it value is 0.
-    void detect_recipes(const ImageViewRGB32& screen, size_t recipe_IDs[6]) const;
-
-private:
-    Logger& m_logger;
-    Color m_color;
-    ImageFloatBox m_id_boxes[6];
-};
-
-// Find which recipe cell is selected by the gradient arrow when choosing a sandwich recipe.
-// Run `process_frame()` until it returns true, meaning arrow detected, then call `selected_recipe_cell()`
-// to get the detected cell.
-class SandwichRecipeSelectionWatcher : public VisualInferenceCallback{
-public: 
-    SandwichRecipeSelectionWatcher(Color color = COLOR_RED);
-
-    virtual void make_overlays(VideoOverlaySet& items) const override;
-    virtual bool process_frame(const VideoSnapshot& frame) override;
-
-    // Return which recipe cell is currented selected.
-    // For cell order, see `SandwichRecipeNumberDetector`.
-    // If no cell selection detected, return -1.
-    int selected_recipe_cell() const { return m_selected_recipe; }
-
-private:
-    FixedLimitVector<GradientArrowWatcher> m_arrow_watchers;
-    int m_selected_recipe = -1;
-};
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSV/Inference/PokemonSV_AuctionItemNameReader.cpp b/SerialPrograms/Source/PokemonSV/Inference/PokemonSV_AuctionItemNameReader.cpp
deleted file mode 100644
index 9ac20e1b8b..0000000000
--- a/SerialPrograms/Source/PokemonSV/Inference/PokemonSV_AuctionItemNameReader.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-/*  Auction Item Name Reader
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/OCR/OCR_RawOCR.h"
-#include "PokemonSV_AuctionItemNameReader.h"
-
-namespace PokemonAutomation {
-namespace NintendoSwitch {
-namespace PokemonSV {
-
-
-AuctionItemNameReader& AuctionItemNameReader::instance() {
-    static AuctionItemNameReader reader;
-    return reader;
-}
-
-
-AuctionItemNameReader::AuctionItemNameReader()
-    : SmallDictionaryMatcher("PokemonSV/Auction/AuctionItemNameOCR.json")
-{}
-
-OCR::StringMatchResult AuctionItemNameReader::read_substring(
-    Logger& logger,
-    Language language,
-    const ImageViewRGB32& image,
-    const std::vector<OCR::TextColorRange>& text_color_ranges,
-    double min_text_ratio, double max_text_ratio
-) const {
-    return match_substring_from_image_multifiltered(
-        &logger, language, image, text_color_ranges,
-        MAX_LOG10P, MAX_LOG10P_SPREAD, min_text_ratio, max_text_ratio
-    );
-}
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSV/Inference/PokemonSV_AuctionItemNameReader.h b/SerialPrograms/Source/PokemonSV/Inference/PokemonSV_AuctionItemNameReader.h
deleted file mode 100644
index 32f53311ff..0000000000
--- a/SerialPrograms/Source/PokemonSV/Inference/PokemonSV_AuctionItemNameReader.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*  Auction Item Name Reader
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSV_AuctionItemNameReader_H
-#define PokemonAutomation_PokemonSV_AuctionItemNameReader_H
-
-#include "CommonFramework/OCR/OCR_SmallDictionaryMatcher.h"
-
-namespace PokemonAutomation {
-namespace NintendoSwitch {
-namespace PokemonSV {
-
-
-class AuctionItemNameReader : public OCR::SmallDictionaryMatcher {
-public:
-    static constexpr double MAX_LOG10P = -1.40;
-    static constexpr double MAX_LOG10P_SPREAD = 0.50;
-
-public:
-    AuctionItemNameReader();
-
-    static AuctionItemNameReader& instance();
-
-    OCR::StringMatchResult read_substring(
-        Logger& logger,
-        Language language,
-        const ImageViewRGB32& image,
-        const std::vector<OCR::TextColorRange>& text_color_ranges,
-        double min_text_ratio = 0.01, double max_text_ratio = 0.50
-    ) const;
-
-};
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSV/Inference/PokemonSV_ESPEmotionDetector.cpp b/SerialPrograms/Source/PokemonSV/Inference/PokemonSV_ESPEmotionDetector.cpp
deleted file mode 100644
index a3f6094b88..0000000000
--- a/SerialPrograms/Source/PokemonSV/Inference/PokemonSV_ESPEmotionDetector.cpp
+++ /dev/null
@@ -1,102 +0,0 @@
-/*  ESP Emotion Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/ImageTools/SolidColorTest.h"
-#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
-#include "PokemonSV_ESPEmotionDetector.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-ESPEmotionReader::ESPEmotionReader()
-    : m_symbol_box(0.297, 0.137, 0.010, 0.016)
-{}
-
-void ESPEmotionReader::make_overlays(VideoOverlaySet& items) const {
-    items.add(COLOR_RED, m_symbol_box);
-}
-Detection ESPEmotionReader::detect(const ImageViewRGB32& screen) const {
-    ImageViewRGB32 symbol = extract_box_reference(screen, m_symbol_box);
-
-    //Color ratio: R/(R+G+B), G/(R+G+B), B/(R+G+B)
-    if (is_solid(symbol, { 0.567, 0.2, 0.232 }, 0.2, 40)) {
-        return Detection::RED;
-    }
-    if (is_solid(symbol, { 0.529, 0.447, 0.0258 }, 0.2, 40)) {
-        return Detection::YELLOW;
-    }
-    if (is_solid(symbol, { 0.132, 0.332, 0.536 }, 0.2, 40)) {
-        return Detection::BLUE; //Sometimes picks up the grey as well but that works
-    }
-    if (is_solid(symbol, { 0.323, 0.491, 0.184 }, 0.2, 40)) {
-        return Detection::GREEN;
-    }
-    if (is_solid(symbol, { 0.219, 0.355, 0.426 }, 0.2, 40)) {
-        return Detection::GREY;
-    }
-    return Detection::NO_DETECTION;
-}
-
-ESPEmotionDetector::ESPEmotionDetector()
-    : VisualInferenceCallback("ESPEmotionDetector")
-    , m_last(Detection::NO_DETECTION)
-{}
-
-void ESPEmotionDetector::make_overlays(VideoOverlaySet& items) const {
-    m_reader.make_overlays(items);
-}
-bool ESPEmotionDetector::process_frame(const ImageViewRGB32& frame, WallClock timestamp) {
-    Detection result = m_reader.detect(frame);
-    m_last.store(result, std::memory_order_release);
-    return result != Detection::NO_DETECTION;
-}
-
-ESPStartDetector::ESPStartDetector()
-    : VisualInferenceCallback("ESPStartDetector")
-    , m_left_box(0.337, 0.144, 0.007, 0.064)
-    , m_right_box(0.716, 0.140, 0.008, 0.069)
-{}
-void ESPStartDetector::make_overlays(VideoOverlaySet& items) const {
-    items.add(COLOR_RED, m_left_box);
-    items.add(COLOR_RED, m_right_box);
-}
-bool ESPStartDetector::detect(const ImageViewRGB32& frame) {
-    ImageViewRGB32 left_image = extract_box_reference(frame, m_left_box);
-    ImageViewRGB32 right_image = extract_box_reference(frame, m_right_box);
-    if (is_solid(left_image, { 0.332, 0.335, 0.332 }) && is_solid(right_image, { 0.332, 0.335, 0.332 })) {
-        return true;
-    }
-    return false;
-}
-bool ESPStartDetector::process_frame(const ImageViewRGB32& frame, WallClock timestamp) {
-    return detect(frame);
-}
-
-ESPShowNewEmotionDetector::ESPShowNewEmotionDetector()
-    : VisualInferenceCallback("ESPShowNewEmotionDetector")
-    , m_left_box(0.337, 0.144, 0.007, 0.064)
-    , m_right_box(0.716, 0.140, 0.008, 0.069)
-{}
-void ESPShowNewEmotionDetector::make_overlays(VideoOverlaySet& items) const {
-    items.add(COLOR_RED, m_left_box);
-    items.add(COLOR_RED, m_right_box);
-}
-bool ESPShowNewEmotionDetector::detect(const ImageViewRGB32& frame) {
-    ImageViewRGB32 left_image = extract_box_reference(frame, m_left_box);
-    ImageViewRGB32 right_image = extract_box_reference(frame, m_right_box);
-    if (is_solid(left_image, { 0.332, 0.335, 0.332 }) && is_solid(right_image, { 0.332, 0.335, 0.332 })) {
-        return false;
-    }
-    return true;
-}
-bool ESPShowNewEmotionDetector::process_frame(const ImageViewRGB32& frame, WallClock timestamp) {
-    return detect(frame);
-}
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSV/Inference/PokemonSV_ESPEmotionDetector.h b/SerialPrograms/Source/PokemonSV/Inference/PokemonSV_ESPEmotionDetector.h
deleted file mode 100644
index 92a2eaca08..0000000000
--- a/SerialPrograms/Source/PokemonSV/Inference/PokemonSV_ESPEmotionDetector.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/*  ESP Emotion Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSV_ESPEmotionDetector_H
-#define PokemonAutomation_PokemonSV_ESPEmotionDetector_H
-
-#include <chrono>
-#include <atomic>
-//#include "CommonFramework/Logging/Logger.h"
-#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
-//#include "Common/Cpp/Color.h"
-#include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "CommonFramework/InferenceInfra/VisualInferenceCallback.h"
-#include "CommonFramework/Inference/VisualDetector.h"
-
-namespace PokemonAutomation{
-    class CancellableScope;
-    class VideoFeed;
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-enum class Detection {
-    NO_DETECTION,
-    RED,
-    YELLOW,
-    BLUE,
-    GREEN,
-    GREY,
-};
-class ESPEmotionReader {
-public:
-    ESPEmotionReader();
-
-    void make_overlays(VideoOverlaySet& items) const;
-    Detection detect(const ImageViewRGB32& screen) const;
-
-private:
-    ImageFloatBox m_symbol_box;
-};
-
-class ESPEmotionDetector : public VisualInferenceCallback {
-public:
-    ESPEmotionDetector();
-
-    Detection result() const {
-        return m_last.load(std::memory_order_acquire);
-    }
-
-    virtual void make_overlays(VideoOverlaySet& items) const override;
-    virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override;
-
-private:
-    ESPEmotionReader m_reader;
-    std::atomic<Detection> m_last;
-};
-
-//This checks for the Dendra's dialog box
-class ESPStartDetector : public VisualInferenceCallback {
-public:
-    ESPStartDetector();
-
-    bool detect(const ImageViewRGB32& frame);
-
-    virtual void make_overlays(VideoOverlaySet& items) const override;
-    virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override;
-
-private:
-    ImageFloatBox m_left_box;
-    ImageFloatBox m_right_box;
-};
-
-// This checks that Dendra's box vanished to shout the next emotion
-class ESPShowNewEmotionDetector : public VisualInferenceCallback {
-public:
-    ESPShowNewEmotionDetector();
-
-    bool detect(const ImageViewRGB32& frame);
-
-    virtual void make_overlays(VideoOverlaySet& items) const override;
-    virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override;
-
-private:
-    ImageFloatBox m_left_box;
-    ImageFloatBox m_right_box;
-};
-
-}
-}
-}
-
-#endif
diff --git a/SerialPrograms/Source/PokemonSV/Inference/PokemonSV_MainMenuDetector.h b/SerialPrograms/Source/PokemonSV/Inference/PokemonSV_MainMenuDetector.h
deleted file mode 100644
index 4bac02ea85..0000000000
--- a/SerialPrograms/Source/PokemonSV/Inference/PokemonSV_MainMenuDetector.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*  Main Menu Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSV_MainMenuDetector_H
-#define PokemonAutomation_PokemonSV_MainMenuDetector_H
-
-#include "Common/Cpp/Color.h"
-#include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "CommonFramework/InferenceInfra/VisualInferenceCallback.h"
-#include "CommonFramework/Inference/VisualDetector.h"
-#include "PokemonSV/Inference/Dialogs/PokemonSV_GradientArrowDetector.h"
-
-namespace PokemonAutomation{
-    class ConsoleHandle;
-    class BotBaseContext;
-    struct ProgramInfo;
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-
-enum class MenuSide{
-    NONE,
-    LEFT,
-    RIGHT,
-};
-
-
-//  Detect the menu where your party is on the right while your main menu is on
-//  the right.
-class MainMenuDetector : public StaticScreenDetector{
-public:
-    MainMenuDetector(Color color = COLOR_RED);
-
-    virtual void make_overlays(VideoOverlaySet& items) const override;
-    virtual bool detect(const ImageViewRGB32& screen) const override;
-
-    //  Read where the cursor is.
-    //  The 2nd return value is the index. 0 is the top row. 6 is only valid on
-    //  the left side and is Koraidon/Miraidon.
-    std::pair<MenuSide, int> detect_location(const ImageViewRGB32& screen) const;
-
-    //  While sitting on the menu, move the cursor to the desired slot.
-    //  Returns true if success.
-    //  If (fast = true) it will be faster, but may be unreliable. It may not
-    //  actually land on the desired slot if the capture card is slow.
-    bool move_cursor(
-        const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context,
-        MenuSide side, int row, bool fast = false
-    ) const;
-
-
-protected:
-    Color m_color;
-    ImageFloatBox m_bottom;
-    GradientArrowDetector m_arrow_left;
-    GradientArrowDetector m_arrow_right;
-    GradientArrowDetector m_dlc_icon;
-};
-class MainMenuWatcher : public DetectorToFinder<MainMenuDetector>{
-public:
-    MainMenuWatcher(Color color = COLOR_RED)
-         : DetectorToFinder("MainMenuWatcher", std::chrono::milliseconds(250), color)
-    {}
-};
-
-
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSV/Inference/PokemonSV_MapDetector.cpp b/SerialPrograms/Source/PokemonSV/Inference/PokemonSV_MapDetector.cpp
deleted file mode 100644
index 4491ff23ee..0000000000
--- a/SerialPrograms/Source/PokemonSV/Inference/PokemonSV_MapDetector.cpp
+++ /dev/null
@@ -1,201 +0,0 @@
-/*  Map Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-
-#include "CommonFramework/Globals.h"
-#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
-#include "CommonFramework/ImageMatch/WaterfillTemplateMatcher.h"
-#include "CommonFramework/ImageTools/BinaryImage_FilterRgb32.h"
-#include "CommonFramework/ImageTools/WaterfillUtilities.h"
-#include "PokemonSV_MapDetector.h"
-
-#include <iostream>
-using std::cout;
-using std::endl;
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-
-namespace {
-
-class MapOrangleExitMatcher : public ImageMatch::WaterfillTemplateMatcher{
-public:
-    MapOrangleExitMatcher() : WaterfillTemplateMatcher(
-        "PokemonSV/Map/OrangeExit-Template.png", Color(50,50,0), Color(255, 255, 255), 50
-    ) {
-        m_aspect_ratio_lower = 0.9;
-        m_aspect_ratio_upper = 1.1;
-        m_area_ratio_lower = 0.9;
-        m_area_ratio_upper = 1.1;
-    }
-
-    static const MapOrangleExitMatcher& instance() {
-        static MapOrangleExitMatcher matcher;
-        return matcher;
-    }
-};
-
-
-class MapOrangleFixedViewArrowMatcher : public ImageMatch::WaterfillTemplateMatcher{
-public:
-    MapOrangleFixedViewArrowMatcher() : WaterfillTemplateMatcher(
-        "PokemonSV/Map/OrangleFixedView-Template.png", Color(50,50,0), Color(255, 255, 255), 50
-    ) {
-        m_aspect_ratio_lower = 0.8;
-        m_aspect_ratio_upper = 1.2;
-        m_area_ratio_lower = 0.8;
-        m_area_ratio_upper = 1.2;
-    }
-
-    static const MapOrangleFixedViewArrowMatcher& instance() {
-        static MapOrangleFixedViewArrowMatcher matcher;
-        return matcher;
-    }
-};
-
-
-class MapOrangleRotatedViewArrowMatcher : public ImageMatch::WaterfillTemplateMatcher{
-public:
-    MapOrangleRotatedViewArrowMatcher() : WaterfillTemplateMatcher(
-        "PokemonSV/Map/OrangleRotatedView-Template.png", Color(50,50,0), Color(255, 255, 255), 50
-    ) {
-        m_aspect_ratio_lower = 0.8;
-        m_aspect_ratio_upper = 1.2;
-        m_area_ratio_lower = 0.8;
-        m_area_ratio_upper = 1.2;
-    }
-
-    static const MapOrangleRotatedViewArrowMatcher& instance() {
-        static MapOrangleRotatedViewArrowMatcher matcher;
-        return matcher;
-    }
-};
-
-
-} // end anonymous namespace
-
-
-MapExitDetector::MapExitDetector(Color color)
-    : m_color(color)
-    , m_orange_exit_box(0.800, 0.118, 0.067, 0.062)
-{}
-void MapExitDetector::make_overlays(VideoOverlaySet& items) const{
-    items.add(m_color, m_orange_exit_box);
-}
-bool MapExitDetector::detect(const ImageViewRGB32& frame) const{
-    const std::vector<std::pair<uint32_t, uint32_t>> filters = {
-        {combine_rgb(100, 0, 0), combine_rgb(255, 200, 100)}
-    };
-
-    const double screen_rel_size = (frame.height() / 1080.0);
-    const size_t min_size = size_t(screen_rel_size * screen_rel_size * 400.0);
-    
-    const bool detected = match_template_by_waterfill(
-        extract_box_reference(frame, m_orange_exit_box), 
-        MapOrangleExitMatcher::instance(),
-        filters,
-        {min_size, SIZE_MAX},
-        60,
-        [](Kernels::Waterfill::WaterfillObject& object) -> bool { return true; }
-    );
-    
-    return detected;
-}
-
-
-
-MapFixedViewDetector::MapFixedViewDetector(Color color)
-    : m_color(color)
-    , m_arrow_box(0.165, 0.724, 0.014, 0.028)
-{}
-void MapFixedViewDetector::make_overlays(VideoOverlaySet& items) const{
-    items.add(m_color, m_arrow_box);
-}
-bool MapFixedViewDetector::detect(const ImageViewRGB32& frame) const{
-     const std::vector<std::pair<uint32_t, uint32_t>> filters = {
-        {combine_rgb(100, 100, 0), combine_rgb(255, 255, 200)}
-    };
-
-    const double screen_rel_size = (frame.height() / 1080.0);
-    const size_t min_size = size_t(screen_rel_size * screen_rel_size * 150.0);
-    
-    const bool detected = match_template_by_waterfill(
-        extract_box_reference(frame, m_arrow_box), 
-        MapOrangleFixedViewArrowMatcher::instance(),
-        filters,
-        {min_size, SIZE_MAX},
-        120,
-        [](Kernels::Waterfill::WaterfillObject& object) -> bool { return true; }
-    );
-    
-    return detected;
-}
-
-
-MapRotatedViewDetector::MapRotatedViewDetector(Color color)
-    : m_color(color)
-    , m_arrow_box(0.157, 0.732, 0.029, 0.027)
-{}
-void MapRotatedViewDetector::make_overlays(VideoOverlaySet& items) const{
-    items.add(m_color, m_arrow_box);
-}
-bool MapRotatedViewDetector::detect(const ImageViewRGB32& frame) const{
-     const std::vector<std::pair<uint32_t, uint32_t>> filters = {
-        {combine_rgb(100, 100, 0), combine_rgb(255, 255, 200)}
-    };
-
-    const double screen_rel_size = (frame.height() / 1080.0);
-    const size_t min_size = size_t(screen_rel_size * screen_rel_size * 450.0);
-    
-    const bool detected = match_template_by_waterfill(
-        extract_box_reference(frame, m_arrow_box), 
-        MapOrangleRotatedViewArrowMatcher::instance(),
-        filters,
-        {min_size, SIZE_MAX},
-        120,
-        [](Kernels::Waterfill::WaterfillObject& object) -> bool { return true; }
-    );
-    
-    return detected;
-}
-
-
-MapWatcher::MapWatcher(Color color)
-: VisualInferenceCallback("MapWatcher")
-, m_exit_watcher(color), m_fixed_view_watcher(color), m_rotated_view_watcher(color){}
-
-void MapWatcher::make_overlays(VideoOverlaySet& items) const{
-    m_exit_watcher.make_overlays(items);
-    m_fixed_view_watcher.make_overlays(items);
-    m_rotated_view_watcher.make_overlays(items);
-}
-
-bool MapWatcher::process_frame(const ImageViewRGB32& frame, WallClock timestamp){
-    const bool exit_found = m_exit_watcher.process_frame(frame, timestamp);
-    if (!exit_found) {
-        return false;
-    }
-
-    const bool fixed_found = m_fixed_view_watcher.process_frame(frame, timestamp);
-    const bool rotated_found = m_rotated_view_watcher.process_frame(frame, timestamp);
-
-    if (fixed_found && !rotated_found){
-        m_in_fixed_view = true;
-        return true;
-    } else if (!fixed_found && rotated_found){
-        m_in_fixed_view = false;
-        return true;
-    }
-
-    return false;
-}
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSV/Inference/PokemonSV_MapDetector.h b/SerialPrograms/Source/PokemonSV/Inference/PokemonSV_MapDetector.h
deleted file mode 100644
index f9e4e0e8d1..0000000000
--- a/SerialPrograms/Source/PokemonSV/Inference/PokemonSV_MapDetector.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/*  Map Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSV_MapDetector_H
-#define PokemonAutomation_PokemonSV_MapDetector_H
-
-#include "Common/Cpp/Color.h"
-#include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "CommonFramework/InferenceInfra/VisualInferenceCallback.h"
-#include "CommonFramework/Inference/VisualDetector.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-// Detect the player character is on map.
-
-
-// It detects the orange exit map button background on upper right corner of the map.
-// Note: if the map is during zooming or having a menu opened, thise area becomes gray and will not be detected.
-class MapExitDetector : public StaticScreenDetector{
-public:
-    MapExitDetector(Color color = COLOR_RED);
-
-    virtual void make_overlays(VideoOverlaySet& items) const override;
-    virtual bool detect(const ImageViewRGB32& screen) const override;
-
-private:
-    Color m_color;
-    ImageFloatBox m_orange_exit_box;
-};
-class MapExitWatcher : public DetectorToFinder<MapExitDetector>{
-public:
-    MapExitWatcher(Color color = COLOR_RED)
-         : DetectorToFinder("MapExitWatcher", std::chrono::milliseconds(1000), color)
-    {}
-};
-
-// Detect the orange arrow pointing up on the lower left corner of the map, when the map is in the fixed view mode.
-// This arrow is used to differentate the rotation view mode.
-class MapFixedViewDetector : public StaticScreenDetector{
-public:
-    MapFixedViewDetector(Color color = COLOR_RED);
-
-    virtual void make_overlays(VideoOverlaySet& items) const override;
-    virtual bool detect(const ImageViewRGB32& screen) const override;
-
-private:
-    Color m_color;
-    ImageFloatBox m_arrow_box;
-};
-class MapFixedViewWatcher : public DetectorToFinder<MapFixedViewDetector>{
-public:
-    MapFixedViewWatcher(Color color = COLOR_RED)
-         : DetectorToFinder("MapFixedViewWatcher", std::chrono::milliseconds(1000), color)
-    {}
-};
-
-
-// Detect the orange double-direction arrows pointing sideways on the lower left corner of the map, when the map is
-// in the rotated view mode.
-// This arrow is used to differentate the fixed view mode.
-class MapRotatedViewDetector : public StaticScreenDetector{
-public:
-    MapRotatedViewDetector(Color color = COLOR_RED);
-
-    virtual void make_overlays(VideoOverlaySet& items) const override;
-    virtual bool detect(const ImageViewRGB32& screen) const override;
-
-private:
-    Color m_color;
-    ImageFloatBox m_arrow_box;
-};
-class MapRotatedViewWatcher : public DetectorToFinder<MapRotatedViewDetector>{
-public:
-    MapRotatedViewWatcher(Color color = COLOR_RED)
-         : DetectorToFinder("MapRotatedViewWatcher", std::chrono::milliseconds(1000), color)
-    {}
-};
-
-// Detect whether map is opened and ready to be closed.
-// Can also detect whether the map is in the fixed view or rotated view mode.
-class MapWatcher : public VisualInferenceCallback{
-public:
-    MapWatcher(Color color = COLOR_RED);
-
-    virtual void make_overlays(VideoOverlaySet& items) const override;
-    virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override;
-
-    // Whether the map is in the fixed view instead of rotated view.
-    bool map_in_fixed_view() const { return m_in_fixed_view; }
-
-private:
-    MapExitWatcher m_exit_watcher;
-    MapFixedViewWatcher m_fixed_view_watcher;
-    MapRotatedViewWatcher m_rotated_view_watcher;
-
-    bool m_in_fixed_view = false;
-};
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSV/Inference/PokemonSV_PokePortalDetector.h b/SerialPrograms/Source/PokemonSV/Inference/PokemonSV_PokePortalDetector.h
deleted file mode 100644
index d43b750d2c..0000000000
--- a/SerialPrograms/Source/PokemonSV/Inference/PokemonSV_PokePortalDetector.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*  Poke Portal Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSV_PokePortalDetector_H
-#define PokemonAutomation_PokemonSV_PokePortalDetector_H
-
-#include "Common/Cpp/Color.h"
-#include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "CommonFramework/Inference/VisualDetector.h"
-#include "PokemonSV/Inference/Dialogs/PokemonSV_GradientArrowDetector.h"
-
-namespace PokemonAutomation{
-    class ConsoleHandle;
-    class BotBaseContext;
-    struct ProgramInfo;
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-
-
-class PokePortalDetector : public StaticScreenDetector{
-public:
-    PokePortalDetector(Color color = COLOR_RED);
-
-    virtual void make_overlays(VideoOverlaySet& items) const override;
-    virtual bool detect(const ImageViewRGB32& screen) const override;
-
-    //  Read where the cursor is. Returns -1 on failure.
-    int detect_location(const ImageViewRGB32& screen) const;
-
-    //  While sitting on the menu, move the cursor to the desired slot.
-    //  Returns true if success.
-    bool move_cursor(
-        const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context,
-        int row
-    ) const;
-
-
-private:
-    Color m_color;
-    ImageFloatBox m_bottom;
-    GradientArrowDetector m_arrow_union;
-    GradientArrowDetector m_arrow_tera;
-    GradientArrowDetector m_arrow_bottom;
-};
-class PokePortalWatcher : public DetectorToFinder<PokePortalDetector>{
-public:
-    PokePortalWatcher(Color color = COLOR_RED)
-         : DetectorToFinder("PokePortalWatcher", std::chrono::milliseconds(250), color)
-    {}
-};
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSV/Inference/PokemonSV_PokemonSummaryReader.cpp b/SerialPrograms/Source/PokemonSV/Inference/PokemonSV_PokemonSummaryReader.cpp
deleted file mode 100644
index d6639a8577..0000000000
--- a/SerialPrograms/Source/PokemonSV/Inference/PokemonSV_PokemonSummaryReader.cpp
+++ /dev/null
@@ -1,78 +0,0 @@
-/*  Pokemon Summary Reader
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/ImageTools/SolidColorTest.h"
-#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
-#include "PokemonSV_PokemonSummaryReader.h"
-
-#include <iostream>
-using std::cout;
-using std::endl;
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-
-
-PokemonSummaryDetector::PokemonSummaryDetector(Color color)
-    : m_color(color)
-    , m_top_blue_left(0.30, 0.09, 0.10, 0.05)
-    , m_top_blue_right(0.60, 0.09, 0.35, 0.05)
-    , m_bottom(0.03, 0.94, 0.40, 0.04)
-    , m_shiny_symbol(0.575, 0.865, 0.017, 0.030)
-{}
-void PokemonSummaryDetector::make_overlays(VideoOverlaySet& items) const{
-    items.add(m_color, m_top_blue_left);
-    items.add(m_color, m_top_blue_right);
-    items.add(m_color, m_bottom);
-    items.add(m_color, m_shiny_symbol);
-}
-bool PokemonSummaryDetector::detect(const ImageViewRGB32& screen) const{
-    ImageStats top_blue_left = image_stats(extract_box_reference(screen, m_top_blue_left));
-//    cout << top_blue_left.average << top_blue_left.stddev << endl;
-    if (!is_solid(top_blue_left, {0.0745162, 0.311321, 0.614163}, 0.30, 10)){
-        return false;
-    }
-
-    ImageStats top_blue_right = image_stats(extract_box_reference(screen, m_top_blue_right));
-//    cout << top_blue_right.average << top_blue_right.stddev << endl;
-    if (!is_solid(top_blue_right, {0.0745162, 0.311321, 0.614163}, 0.30, 10)){
-        return false;
-    }
-
-    ImageStats bottom = image_stats(extract_box_reference(screen, m_bottom));
-//    cout << bottom.average << bottom.stddev << endl;
-#if 0
-    if (bottom.stddev.sum() > 20){
-        return false;
-    }
-#else
-    if (!is_solid(bottom, {0.648549, 0.286158, 0.0652928}, 0.15, 20) && //  Scarlet
-        !is_solid(bottom, {0.367816, 0.0746615, 0.557523}, 0.15, 20)    //  Violet
-    ){
-        return false;
-    }
-#endif
-
-//    ImageStats shiny_symbol = image_stats(extract_box_reference(screen, m_shiny_symbol));
-//    cout << shiny_symbol.average << shiny_symbol.stddev << endl;
-
-    return true;
-}
-bool PokemonSummaryDetector::is_shiny(const ImageViewRGB32& screen) const{
-    ImageStats shiny = image_stats(extract_box_reference(screen, m_shiny_symbol));
-    return shiny.stddev.sum() > 100;
-}
-
-
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSV/Inference/PokemonSV_PokemonSummaryReader.h b/SerialPrograms/Source/PokemonSV/Inference/PokemonSV_PokemonSummaryReader.h
deleted file mode 100644
index 64f6bfd30c..0000000000
--- a/SerialPrograms/Source/PokemonSV/Inference/PokemonSV_PokemonSummaryReader.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*  Pokemon Summary Reader
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSV_PokemonSummaryReader_H
-#define PokemonAutomation_PokemonSV_PokemonSummaryReader_H
-
-#include "Common/Cpp/Color.h"
-#include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "CommonFramework/Inference/VisualDetector.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-
-
-class PokemonSummaryDetector : public StaticScreenDetector{
-public:
-    PokemonSummaryDetector(Color color = COLOR_RED);
-
-    virtual void make_overlays(VideoOverlaySet& items) const override;
-    virtual bool detect(const ImageViewRGB32& screen) const override;
-
-    bool is_shiny(const ImageViewRGB32& screen) const;
-
-
-protected:
-    Color m_color;
-    ImageFloatBox m_top_blue_left;
-    ImageFloatBox m_top_blue_right;
-    ImageFloatBox m_bottom;
-
-    ImageFloatBox m_shiny_symbol;
-};
-class PokemonSummaryWatcher : public DetectorToFinder<PokemonSummaryDetector>{
-public:
-    PokemonSummaryWatcher(Color color = COLOR_RED)
-         : DetectorToFinder("PokemonSummaryWatcher", std::chrono::milliseconds(250), color)
-    {}
-};
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSV/Inference/PokemonSV_SweatBubbleDetector.h b/SerialPrograms/Source/PokemonSV/Inference/PokemonSV_SweatBubbleDetector.h
deleted file mode 100644
index eabcf789a1..0000000000
--- a/SerialPrograms/Source/PokemonSV/Inference/PokemonSV_SweatBubbleDetector.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*  Sweat Bubble Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSV_SweatBubbleDetector_H
-#define PokemonAutomation_PokemonSV_SweatBubbleDetector_H
-
-#include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
-#include "CommonFramework/InferenceInfra/VisualInferenceCallback.h"
-#include "CommonFramework/Inference/VisualDetector.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-
-
-class SweatBubbleDetector : public StaticScreenDetector{
-public:
-    SweatBubbleDetector(Color color, const ImageFloatBox& box = {0.11, 0.81, 0.06, 0.10});
-
-    virtual void make_overlays(VideoOverlaySet& items) const override;
-    virtual bool detect(const ImageViewRGB32& screen) const override;
-
-protected:
-    Color m_color;
-    ImageFloatBox m_box;
-};
-class SweatBubbleWatcher : public DetectorToFinder<SweatBubbleDetector>{
-public:
-    SweatBubbleWatcher(Color color = COLOR_RED)
-         : DetectorToFinder("SweatBubbleWatcher", std::chrono::milliseconds(100), color)
-    {}
-};
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSV/Inference/PokemonSV_WhiteButtonDetector.cpp b/SerialPrograms/Source/PokemonSV/Inference/PokemonSV_WhiteButtonDetector.cpp
deleted file mode 100644
index de82150e58..0000000000
--- a/SerialPrograms/Source/PokemonSV/Inference/PokemonSV_WhiteButtonDetector.cpp
+++ /dev/null
@@ -1,181 +0,0 @@
-/*  White Button Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Cpp/Containers/FixedLimitVector.tpp"
-#include "Kernels/Waterfill/Kernels_Waterfill_Session.h"
-//#include "CommonFramework/Globals.h"
-#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
-#include "CommonFramework/ImageTypes/BinaryImage.h"
-#include "CommonFramework/ImageTools/BinaryImage_FilterRgb32.h"
-#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
-//#include "CommonFramework/ImageMatch/ExactImageMatcher.h"
-#include "PokemonSV_WhiteButtonDetector.h"
-
-//#include <iostream>
-//using std::cout;
-//using std::endl;
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-using namespace Kernels;
-using namespace Kernels::Waterfill;
-
-
-
-
-const char* white_button_template_path(WhiteButton type){
-    switch (type){
-    case WhiteButton::ButtonA:
-        return "PokemonSV/Buttons/WhiteButtonA.png";
-    case WhiteButton::ButtonB:
-        return "PokemonSV/Buttons/WhiteButtonB.png";
-    case WhiteButton::ButtonY:
-        return "PokemonSV/Buttons/WhiteButtonY.png";
-    case WhiteButton::ButtonMinus:
-        return "PokemonSV/Buttons/WhiteButtonMinus.png";
-    default:
-        return "";
-    }
-}
-
-const WhiteButtonMatcher& get_button_matcher(WhiteButton type){
-    switch (type){
-    case WhiteButton::ButtonA:
-        return WhiteButtonMatcher::A();
-    case WhiteButton::ButtonB:
-        return WhiteButtonMatcher::B();
-    case WhiteButton::ButtonY:
-        return WhiteButtonMatcher::Y();
-    case WhiteButton::ButtonMinus:
-        return WhiteButtonMatcher::Minus();
-    default:
-        throw std::runtime_error("No corresponding ButtonMatcher for WhiteButton");
-    }
-}
-
-
-
-
-WhiteButtonMatcher::WhiteButtonMatcher(WhiteButton type, size_t min_width, size_t max_width, double max_rmsd)
-    : WaterfillTemplateMatcher(
-        white_button_template_path(type), Color(0xff808008), Color(0xffffffff), 100
-    )
-    , m_min_width(min_width)
-    , m_min_height(max_width)
-    , m_max_rmsd(max_rmsd)
-{}
-const WhiteButtonMatcher& WhiteButtonMatcher::A(){
-    static WhiteButtonMatcher matcher(WhiteButton::ButtonA, 15, 15, 100);
-    return matcher;
-}
-const WhiteButtonMatcher& WhiteButtonMatcher::B(){
-    static WhiteButtonMatcher matcher(WhiteButton::ButtonB, 15, 15, 90);
-    return matcher;
-}
-const WhiteButtonMatcher& WhiteButtonMatcher::Y(){
-    static WhiteButtonMatcher matcher(WhiteButton::ButtonY, 15, 15, 90);
-    return matcher;
-}
-const WhiteButtonMatcher& WhiteButtonMatcher::Minus(){
-    static WhiteButtonMatcher matcher(WhiteButton::ButtonMinus, 15, 15, 90);
-    return matcher;
-}
-
-
-
-
-
-
-WhiteButtonDetector::WhiteButtonDetector(
-    Color color,
-    WhiteButton button,
-    const ImageFloatBox& box
-)
-    : m_matcher(get_button_matcher(button))
-    , m_color(color)
-    , m_box(box)
-{}
-void WhiteButtonDetector::make_overlays(VideoOverlaySet& items) const{
-    items.add(m_color, m_box);
-}
-bool WhiteButtonDetector::detect(const ImageViewRGB32& screen) const{
-    std::vector<ImageFloatBox> hits = detect_all(screen);
-    return !hits.empty();
-}
-
-std::vector<ImageFloatBox> WhiteButtonDetector::detect_all(const ImageViewRGB32& screen) const{
-    ImageViewRGB32 region = extract_box_reference(screen, m_box);
-    PackedBinaryMatrix matrix = compress_rgb32_to_binary_range(region, 0xff808080, 0xffffffff);
-
-    std::vector<ImageFloatBox> hits;
-
-    std::unique_ptr<WaterfillSession> session = make_WaterfillSession(matrix);
-    auto iter = session->make_iterator(50);
-    WaterfillObject object;
-    while (iter->find_next(object, false)){
-        if (object.min_x == 0 || object.min_y == 0 ||
-            object.max_x == region.width() || object.max_y == region.height()
-        ){
-            continue;
-        }
-        double rmsd = m_matcher.rmsd_original(region, object);
-//        cout << "rmsd = " << rmsd << endl;
-        if (rmsd < m_matcher.m_max_rmsd){
-            hits.emplace_back(translate_to_parent(screen, m_box, object));
-        }
-    }
-    return hits;
-}
-
-
-
-#if 0
-WhiteButtonWatcher::~WhiteButtonWatcher() = default;
-WhiteButtonWatcher::WhiteButtonWatcher(
-    Color color,
-    WhiteButton button, size_t consecutive_detections,
-    VideoOverlay& overlay,
-    const ImageFloatBox& box
-)
-    : VisualInferenceCallback("GradientArrowFinder")
-    , m_overlay(overlay)
-    , m_detector(color, button, box)
-    , m_consecutive_detections(consecutive_detections)
-{}
-
-void WhiteButtonWatcher::make_overlays(VideoOverlaySet& items) const{
-    m_detector.make_overlays(items);
-}
-bool WhiteButtonWatcher::process_frame(const ImageViewRGB32& frame, WallClock timestamp){
-    std::vector<ImageFloatBox> hits = m_detector.detect_all(frame);
-//    cout << "arrows = " << arrows.size() << endl;
-    m_arrows.reset(hits.size());
-    for (const ImageFloatBox& hit : hits){
-        m_arrows.emplace_back(m_overlay, hit, COLOR_MAGENTA);
-    }
-//    if (!hits.empty()){
-//        frame.save("test.png");
-//    }
-
-    if (hits.empty()){
-        m_trigger_count = 0;
-        return false;
-    }
-
-    m_trigger_count++;
-    return m_trigger_count >= m_consecutive_detections;
-}
-#endif
-
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSV/Inference/PokemonSV_WhiteButtonDetector.h b/SerialPrograms/Source/PokemonSV/Inference/PokemonSV_WhiteButtonDetector.h
deleted file mode 100644
index 5cf5b7d1d0..0000000000
--- a/SerialPrograms/Source/PokemonSV/Inference/PokemonSV_WhiteButtonDetector.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/*  White Button Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- *  Warning: This detector is currently very prone to false positives.
- *  It is much worse than the PLA buttons because these one have transparent
- *  text which must be stored as zero alpha.
- *
- */
-
-#ifndef PokemonAutomation_PokemonSV_WhiteButtonDetector_H
-#define PokemonAutomation_PokemonSV_WhiteButtonDetector_H
-
-#include <vector>
-#include "Common/Cpp/Color.h"
-#include "Common/Cpp/Containers/FixedLimitVector.h"
-#include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "CommonFramework/ImageMatch/WaterfillTemplateMatcher.h"
-#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
-#include "CommonFramework/InferenceInfra/VisualInferenceCallback.h"
-#include "CommonFramework/Inference/VisualDetector.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-
-enum class WhiteButton{
-    ButtonA,
-    ButtonB,
-    ButtonY,
-    ButtonMinus,
-};
-
-
-class WhiteButtonMatcher : public ImageMatch::WaterfillTemplateMatcher{
-public:
-    WhiteButtonMatcher(WhiteButton type, size_t min_width, size_t max_width, double max_rmsd);
-    static const WhiteButtonMatcher& A();
-    static const WhiteButtonMatcher& B();
-    static const WhiteButtonMatcher& Y();
-    static const WhiteButtonMatcher& Minus();
-
-    virtual bool check_image(const ImageViewRGB32& image) const override{
-        return image.width() >= m_min_width && image.height() >= m_min_height;
-    };
-
-    size_t m_min_width;
-    size_t m_min_height;
-    double m_max_rmsd;
-};
-
-
-class WhiteButtonDetector : public StaticScreenDetector{
-public:
-    WhiteButtonDetector(
-        Color color,
-        WhiteButton button,
-        const ImageFloatBox& box
-    );
-
-    virtual void make_overlays(VideoOverlaySet& items) const override;
-    virtual bool detect(const ImageViewRGB32& screen) const override;
-
-    std::vector<ImageFloatBox> detect_all(const ImageViewRGB32& screen) const;
-
-protected:
-    const WhiteButtonMatcher& m_matcher;
-    Color m_color;
-    ImageFloatBox m_box;
-};
-class WhiteButtonWatcher : public DetectorToFinder<WhiteButtonDetector>{
-public:
-    WhiteButtonWatcher(
-        Color color,
-        WhiteButton button,
-        const ImageFloatBox& box,
-        FinderType finder_type = FinderType::PRESENT,
-        std::chrono::milliseconds duration = std::chrono::milliseconds(250)
-    )
-         : DetectorToFinder("WhiteButtonWatcher", finder_type, duration, color, button, box)
-    {}
-};
-
-
-#if 0
-class WhiteButtonWatcher : public VisualInferenceCallback{
-public:
-    ~WhiteButtonWatcher();
-    WhiteButtonWatcher(
-        Color color,
-        WhiteButton button, size_t consecutive_detections,
-        VideoOverlay& overlay,
-        const ImageFloatBox& box
-    );
-
-    virtual void make_overlays(VideoOverlaySet& items) const override;
-    virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override;
-
-
-protected:
-    VideoOverlay& m_overlay;
-    WhiteButtonDetector m_detector;
-    FixedLimitVector<OverlayBoxScope> m_arrows;
-    size_t m_consecutive_detections;
-    size_t m_trigger_count = 0;
-};
-#endif
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSV/Inference/PokemonSV_ZeroGateWarpPromptDetector.cpp b/SerialPrograms/Source/PokemonSV/Inference/PokemonSV_ZeroGateWarpPromptDetector.cpp
deleted file mode 100644
index 3de13b83fc..0000000000
--- a/SerialPrograms/Source/PokemonSV/Inference/PokemonSV_ZeroGateWarpPromptDetector.cpp
+++ /dev/null
@@ -1,122 +0,0 @@
-/*  Zero Gate Warp Prompt Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/Exceptions/OperationFailedException.h"
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "CommonFramework/Tools/ConsoleHandle.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "PokemonSV_ZeroGateWarpPromptDetector.h"
-
-//#include <iostream>
-//using std::cout;
-//using std::endl;
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-
-
-ZeroGateWarpPromptDetector::ZeroGateWarpPromptDetector(Color color)
-    : m_arrow(color, GradientArrowType::RIGHT, {0.5, 0.32, 0.40, 0.39})
-{}
-
-void ZeroGateWarpPromptDetector::make_overlays(VideoOverlaySet& items) const{
-    m_arrow.make_overlays(items);
-}
-bool ZeroGateWarpPromptDetector::detect(const ImageViewRGB32& screen) const{
-    return detect_location(screen) >= 0;
-}
-int ZeroGateWarpPromptDetector::detect_location(const ImageViewRGB32& screen) const{
-    ImageFloatBox box;
-    if (!m_arrow.detect(box, screen)){
-        return -1;
-    }
-
-    int index = (int)((box.y - 0.337037) / 0.074074 + 0.5);
-
-//    cout << index << endl;
-
-    return index;
-}
-bool ZeroGateWarpPromptDetector::move_cursor(
-    const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context,
-    int row
-) const{
-    VideoOverlaySet overlays(console.overlay());
-    make_overlays(overlays);
-
-    size_t consecutive_detection_fails = 0;
-    size_t moves = 0;
-    bool target_reached = false;
-    while (true){
-        context.wait_for_all_requests();
-        VideoSnapshot screen = console.video().snapshot();
-        int current = this->detect_location(screen);
-
-        console.log("Current Location: " + std::to_string(current));
-
-        if (current < 0){
-            consecutive_detection_fails++;
-            if (consecutive_detection_fails > 10){
-                throw OperationFailedException(
-                    ErrorReport::SEND_ERROR_REPORT, console,
-                    "ZeroGateWarpPromptDetector::move_cursor(): Unable to detect cursor.",
-                    screen
-                );
-            }
-            context.wait_for(std::chrono::milliseconds(50));
-            continue;
-        }
-        consecutive_detection_fails = 0;
-
-        if (moves >= 10){
-            throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, console,
-                "Unable to move to target after 10 moves.",
-                screen
-            );
-        }
-
-        //  We're done!
-        if (current == row){
-            if (target_reached){
-                return true;
-            }else{
-                //  Don't return yet. Wait a second to make sure the video is
-                //  in steady state before we return.
-                target_reached = true;
-                context.wait_for(std::chrono::seconds(1));
-                continue;
-            }
-        }
-        target_reached = false;
-
-        moves++;
-
-        const int rows = 5;
-        int diff = (rows + current - row) % rows;
-        if (diff < 3){
-            for (int c = 0; c < diff - 1; c++){
-                pbf_press_dpad(context, DPAD_UP, 10, 10);
-            }
-            pbf_press_dpad(context, DPAD_UP, 20, 30);
-        }else{
-            diff = rows - diff;
-            for (int c = 0; c < diff - 1; c++){
-                pbf_press_dpad(context, DPAD_DOWN, 10, 10);
-            }
-            pbf_press_dpad(context, DPAD_DOWN, 20, 30);
-        }
-    }
-}
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSV/Inference/PokemonSV_ZeroGateWarpPromptDetector.h b/SerialPrograms/Source/PokemonSV/Inference/PokemonSV_ZeroGateWarpPromptDetector.h
deleted file mode 100644
index 25a828a229..0000000000
--- a/SerialPrograms/Source/PokemonSV/Inference/PokemonSV_ZeroGateWarpPromptDetector.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*  Zero Gate Warp Prompt Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSV_ZeroGateWarpPromptDetector_H
-#define PokemonAutomation_PokemonSV_ZeroGateWarpPromptDetector_H
-
-#include "Common/Cpp/Color.h"
-#include "PokemonSV/Inference/Dialogs/PokemonSV_GradientArrowDetector.h"
-
-namespace PokemonAutomation{
-    class ConsoleHandle;
-    class BotBaseContext;
-    struct ProgramInfo;
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-
-
-class ZeroGateWarpPromptDetector : public StaticScreenDetector{
-public:
-    ZeroGateWarpPromptDetector(Color color = COLOR_RED);
-    virtual void make_overlays(VideoOverlaySet& items) const override;
-    virtual bool detect(const ImageViewRGB32& screen) const override;
-
-    int detect_location(const ImageViewRGB32& screen) const;
-
-    bool move_cursor(
-        const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context,
-        int row
-    ) const;
-
-private:
-    GradientArrowDetector m_arrow;
-};
-class ZeroGateWarpPromptWatcher : public DetectorToFinder<ZeroGateWarpPromptDetector>{
-public:
-    ZeroGateWarpPromptWatcher(Color color = COLOR_RED)
-         : DetectorToFinder("ZeroGateWarpPromptWatcher", std::chrono::milliseconds(250), color)
-    {}
-};
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSV/Inference/Tera/PokemonSV_TeraCardDetector.cpp b/SerialPrograms/Source/PokemonSV/Inference/Tera/PokemonSV_TeraCardDetector.cpp
deleted file mode 100644
index 899eac1cc7..0000000000
--- a/SerialPrograms/Source/PokemonSV/Inference/Tera/PokemonSV_TeraCardDetector.cpp
+++ /dev/null
@@ -1,379 +0,0 @@
-/*  Tera Card Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <cmath>
-#include <array>
-#include <map>
-#include "Common/Cpp/PrettyPrint.h"
-#include "Common/Qt/StringToolsQt.h"
-//#include "Kernels/Waterfill/Kernels_Waterfill.h"
-#include "Kernels/Waterfill/Kernels_Waterfill_Session.h"
-#include "CommonFramework/ImageTypes/ImageRGB32.h"
-#include "CommonFramework/ImageTypes/BinaryImage.h"
-#include "CommonFramework/ImageTools/SolidColorTest.h"
-#include "CommonFramework/ImageTools/BinaryImage_FilterRgb32.h"
-#include "CommonFramework/ImageTools/ImageManip.h"
-#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
-#include "CommonFramework/ImageTools/ImageFilter.h"
-#include "CommonFramework/OCR/OCR_RawOCR.h"
-//#include "CommonFramework/OCR/OCR_NumberReader.h"
-#include "CommonFramework/Tools/ErrorDumper.h"
-//#include "CommonFramework/OCR/OCR_Routines.h"
-#include "PokemonSV/Inference/Dialogs/PokemonSV_GradientArrowDetector.h"
-#include "PokemonSV_TeraCodeReader.h"
-#include "PokemonSV_TeraCardDetector.h"
-
-//#include <iostream>
-//using std::cout;
-//using std::endl;
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-
-
-TeraCardReader::TeraCardReader(Color color)
-    : m_color(color)
-    , m_top(0.15, 0.13, 0.40, 0.03)
-    , m_bottom_left(0.15, 0.80, 0.10, 0.06)
-    , m_bottom_right(0.73, 0.85, 0.12, 0.02)
-    , m_label(0.75, 0.67, 0.10, 0.05)
-    , m_cursor(0.135, 0.25, 0.05, 0.25)
-    , m_stars(0.500, 0.555, 0.310, 0.070)
-{}
-void TeraCardReader::make_overlays(VideoOverlaySet& items) const{
-    items.add(m_color, m_top);
-    items.add(m_color, m_bottom_left);
-    items.add(m_color, m_bottom_right);
-    items.add(m_color, m_label);
-    items.add(m_color, m_cursor);
-    items.add(m_color, m_stars);
-}
-bool TeraCardReader::detect(const ImageViewRGB32& screen) const{
-    ImageStats top = image_stats(extract_box_reference(screen, m_top));
-//    cout << top.average << top.stddev << endl;
-    if (!is_solid(top, {0.354167, 0.345833, 0.3})){
-        return false;
-    }
-
-    ImageStats bottom_left = image_stats(extract_box_reference(screen, m_bottom_left));
-//    cout << bottom_left.average << bottom_left.stddev << endl;
-    if (!is_solid(bottom_left, {0.354167, 0.345833, 0.3})){
-        return false;
-    }
-    ImageStats bottom_right = image_stats(extract_box_reference(screen, m_bottom_right));
-//    cout << bottom_right.average << bottom_right.stddev << endl;
-    if (!is_solid(bottom_right, {0.354167, 0.345833, 0.3})){
-        return false;
-    }
-
-    if (euclidean_distance(top.average, bottom_left.average) > 20){
-        return false;
-    }
-    if (euclidean_distance(top.average, bottom_right.average) > 20){
-        return false;
-    }
-    if (euclidean_distance(bottom_left.average, bottom_right.average) > 20){
-        return false;
-    }
-
-    ImageStats label = image_stats(extract_box_reference(screen, m_label));
-//    cout << label.average << label.stddev << endl;
-    if (!is_solid(label, {0.370075, 0.369063, 0.260862})){
-        return false;
-    }
-
-    GradientArrowDetector arrow_detector(COLOR_RED, GradientArrowType::RIGHT, m_cursor);
-    if (!arrow_detector.detect(screen)){
-        return false;
-    }
-
-    return true;
-}
-size_t TeraCardReader::stars(const ImageViewRGB32& screen) const{
-    using namespace Kernels::Waterfill;
-
-    ImageViewRGB32 cropped = extract_box_reference(screen, m_stars);
-
-    {
-        ImageStats background = image_stats(extract_box_reference(screen, ImageFloatBox{0.55, 0.62, 0.20, 0.03}));
-        Color background_average = background.average.round();
-
-        PackedBinaryMatrix matrix = compress_rgb32_to_binary_euclidean(cropped, (uint32_t)background_average, 100);
-
-        matrix.invert();
-//        cout << matrix.dump() << endl;
-        std::unique_ptr<WaterfillSession> session = make_WaterfillSession(matrix);
-        auto iter = session->make_iterator(100);
-        WaterfillObject object;
-        size_t count = 0;
-        while (iter->find_next(object, false)){
-//            extract_box_reference(cropped, object).save("test-" + std::to_string(count) + ".png");
-            count++;
-        }
-        if (1 <= count && count <= 7){
-            return count;
-        }
-    }
-
-    return 0;
-}
-
-
-
-
-
-
-std::string TeraLobbyNameMatchResult::to_str() const{
-    std::string ret;
-    ret += "\"" + raw_ocr;
-    if (ret.back() == '\n'){
-        ret.pop_back();
-    }
-//    ret += "\" -> \"" + normalized_ocr + "\" == \"";
-    ret += "\" -> \"";
-    ret += entry.name;
-    ret += "\" (";
-    if (exact_match){
-        ret += "exact match, ";
-    }else{
-        ret += "partial match, ";
-    }
-    ret += "log10p = " + tostr_default(log10p) + ")";
-    return ret;
-}
-
-
-
-TeraLobbyReader::TeraLobbyReader(Logger& logger, AsyncDispatcher& dispatcher, Color color)
-    : m_logger(logger)
-    , m_dispatcher(dispatcher)
-    , m_color(color)
-    , m_bottom_right(0.73, 0.85, 0.12, 0.02)
-    , m_label(0.75, 0.67, 0.10, 0.05)
-    , m_cursor(0.135, 0.25, 0.05, 0.25)
-//    , m_stars(0.500, 0.555, 0.310, 0.070)
-    , m_timer(0.175, 0.180, 0.100, 0.080)
-    , m_code(0.310, 0.180, 0.200, 0.080)
-{
-    for (size_t c = 0; c < 4; c++){
-        m_player_spinner[c] = ImageFloatBox{0.157, 0.575 + 0.070*c, 0.037, 0.060};
-        m_player_name[c] = ImageFloatBox{0.200, 0.575 + 0.070*c, 0.095, 0.060};
-        m_player_mon[c] = ImageFloatBox{0.425, 0.575 + 0.070*c, 0.037, 0.060};
-        m_player_ready[c] = ImageFloatBox{0.465, 0.575 + 0.070*c, 0.037, 0.060};
-    }
-}
-void TeraLobbyReader::make_overlays(VideoOverlaySet& items) const{
-    items.add(m_color, m_bottom_right);
-    items.add(m_color, m_label);
-    items.add(m_color, m_cursor);
-    items.add(m_color, m_timer);
-    items.add(m_color, m_code);
-    for (size_t c = 0; c < 4; c++){
-        items.add(m_color, m_player_spinner[c]);
-        items.add(m_color, m_player_name[c]);
-        items.add(m_color, m_player_mon[c]);
-        items.add(m_color, m_player_ready[c]);
-    }
-}
-bool TeraLobbyReader::detect(const ImageViewRGB32& screen) const{
-    ImageStats bottom_right = image_stats(extract_box_reference(screen, m_bottom_right));
-//    cout << bottom_right.average << bottom_right.stddev << endl;
-    if (!is_solid(bottom_right, {0.354167, 0.345833, 0.3})){
-        return false;
-    }
-
-    ImageStats label = image_stats(extract_box_reference(screen, m_label));
-//    cout << label.average << label.stddev << endl;
-    if (!is_solid(label, {0.370075, 0.369063, 0.260862})){
-        return false;
-    }
-
-    GradientArrowDetector arrow_detector(COLOR_RED, GradientArrowType::RIGHT, m_cursor);
-    if (!arrow_detector.detect(screen)){
-        return false;
-    }
-
-    if (seconds_left(m_logger, m_dispatcher, screen) < 0){
-        return false;
-    }
-
-    return true;
-}
-
-uint8_t TeraLobbyReader::total_players(const ImageViewRGB32& screen) const{
-    uint8_t total = 0;
-    for (size_t c = 0; c < 4; c++){
-        ImageStats player = image_stats(extract_box_reference(screen, m_player_mon[c]));
-        if (player.stddev.sum() > 80){
-            total++;
-        }
-    }
-    return std::max(total, (uint8_t)1);
-}
-#if 0
-uint8_t TeraLobbyReader::ready_players(const ImageViewRGB32& screen) const{
-    uint8_t total = 0;
-    for (size_t c = 0; c < 4; c++){
-        ImageStats player = image_stats(extract_box_reference(screen, m_player_ready[c]));
-//        cout << "Player " << c << ": " << player.average << player.stddev << endl;
-        if (player.stddev.sum() > 80){
-            total++;
-        }
-    }
-    return total;
-}
-#endif
-uint8_t TeraLobbyReader::ready_joiners(const ImageViewRGB32& screen, uint8_t host_players){
-    uint8_t total = 0;
-    for (size_t c = host_players; c < 4; c++){
-        ImageStats player = image_stats(extract_box_reference(screen, m_player_ready[c]));
-//        cout << "Player " << c << ": " << player.average << player.stddev << endl;
-        if (player.stddev.sum() > 80){
-            total++;
-        }
-    }
-    return total;
-}
-
-int16_t TeraLobbyReader::seconds_left(Logger& logger, AsyncDispatcher& dispatcher, const ImageViewRGB32& screen) const{
-    ImageViewRGB32 image = extract_box_reference(screen, m_timer);
-    return read_raid_timer(logger, dispatcher, image);
-}
-std::string TeraLobbyReader::raid_code(Logger& logger, AsyncDispatcher& dispatcher, const ImageViewRGB32& screen) const{
-    ImageViewRGB32 image = extract_box_reference(screen, m_code);
-    return read_raid_code(logger, dispatcher, image);
-}
-
-ImageRGB32 filter_name_image(const ImageViewRGB32& image){
-    using namespace Kernels::Waterfill;
-
-    const uint32_t COLOR_THRESHOLD = 0xff8f8f8f;
-
-    //  Waterfill the image and throw out everything that touches the border.
-
-    ImageRGB32 filtered(image.width(), image.height());
-    filtered.fill(0xffffffff);
-//    cout << image.width() << " x " << image.height() << endl;
-
-    PackedBinaryMatrix matrix = compress_rgb32_to_binary_range(image, 0xff000000, COLOR_THRESHOLD);
-    {
-        std::unique_ptr<WaterfillSession> session = make_WaterfillSession(matrix);
-        auto iter = session->make_iterator(4);
-        WaterfillObject object;
-        while (iter->find_next(object, true)){
-            auto packed = object.packed_matrix();
-//            cout << packed->width() << " x " << packed->height() << " : " << object.min_x << " x " << object.min_y << endl;
-
-            //  Touches border.
-            if (object.min_x == 0 ||
-                object.min_y == 0 ||
-                object.max_x == filtered.width() ||
-                object.max_y == filtered.height()
-            ){
-                continue;
-            }
-            filter_by_mask(
-                std::move(packed),
-                filtered, object.min_x, object.min_y,
-                Color(0xff000000),
-                false
-            );
-        }
-    }
-
-//    static int c = 0;
-//    filtered.save("filtered" + std::to_string(c++) + ".png");
-
-    return filtered;
-
-//    size_t pixels;
-//    return to_blackwhite_rgb32_range(pixels, image, 0xff000000, COLOR_THRESHOLD, true);
-}
-
-
-std::array<std::map<Language, std::string>, 4> TeraLobbyReader::read_names(
-    Logger& logger,
-    const std::set<Language>& languages,
-    const ImageViewRGB32& screen
-) const{
-    std::array<std::map<Language, std::string>, 4> ret;
-    for (size_t c = 0; c < 4; c++){
-        ImageStats sprite = image_stats(extract_box_reference(screen, m_player_mon[c]));
-        if (sprite.stddev.sum() <= 80){
-            continue;
-        }
-//        logger.log("Reading player " + std::to_string(c) + "'s name...");
-        std::string str = "Player " + std::to_string(c) + ": ";
-        bool first = true;
-        for (Language language : languages){
-            ImageViewRGB32 box = extract_box_reference(screen, m_player_name[c]);
-            ImageRGB32 filtered = filter_name_image(box);
-//            filtered.save("name" + std::to_string(c) + ".png");
-
-            std::string raw;
-            for (char ch : OCR::ocr_read(language, filtered)){
-                if ((unsigned)ch < 32){
-                    continue;
-                }
-                raw += ch;
-            }
-            if (!first){
-                str += ", ";
-            }
-            first = false;
-            str += language_data(language).code + "=\"" + raw + "\"";
-            ret[c][language] = std::move(raw);
-        }
-        logger.log(str);
-    }
-    return ret;
-}
-
-
-
-
-
-#if 0
-TeraLobbyReadyWaiter::TeraLobbyReadyWaiter(
-    Logger& logger, AsyncDispatcher& dispatcher,
-    Color color, uint8_t desired_players
-)
-    : TeraLobbyReader(logger, dispatcher, color)
-    , VisualInferenceCallback("TeraLobbyReadyWaiter")
-    , m_desired_players(desired_players)
-    , m_last_known_total_players(-1)
-{}
-
-void TeraLobbyReadyWaiter::make_overlays(VideoOverlaySet& items) const{
-    TeraLobbyReader::make_overlays(items);
-}
-bool TeraLobbyReadyWaiter::process_frame(const ImageViewRGB32& frame, WallClock timestamp){
-    if (!detect(frame)){
-        return false;
-    }
-    uint8_t total_players = this->total_players(frame);
-    uint8_t ready_players = this->ready_players(frame);
-    m_last_known_total_players.store(total_players);
-    return ready_players + 1 >= m_desired_players;
-}
-#endif
-
-
-
-
-
-
-
-
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSV/Inference/Tera/PokemonSV_TeraCardDetector.h b/SerialPrograms/Source/PokemonSV/Inference/Tera/PokemonSV_TeraCardDetector.h
deleted file mode 100644
index 705be51e0d..0000000000
--- a/SerialPrograms/Source/PokemonSV/Inference/Tera/PokemonSV_TeraCardDetector.h
+++ /dev/null
@@ -1,155 +0,0 @@
-/*  Tera Card Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSV_TeraCardDetector_H
-#define PokemonAutomation_PokemonSV_TeraCardDetector_H
-
-#include <atomic>
-#include <mutex>
-#include "Common/Cpp/Color.h"
-#include "Common/Cpp/AbstractLogger.h"
-#include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "CommonFramework/Inference/VisualDetector.h"
-#include "CommonFramework/InferenceInfra/VisualInferenceCallback.h"
-#include "PokemonSV/Options/PokemonSV_PlayerList.h"
-
-namespace PokemonAutomation{
-    class AsyncDispatcher;
-    struct ProgramInfo;
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-
-ImageRGB32 filter_name_image(const ImageViewRGB32& image);
-
-
-
-class TeraCardReader : public StaticScreenDetector{
-public:
-    TeraCardReader(Color color = COLOR_RED);
-
-    virtual void make_overlays(VideoOverlaySet& items) const override;
-    virtual bool detect(const ImageViewRGB32& screen) const override;
-
-    size_t stars(const ImageViewRGB32& screen) const;
-
-private:
-    Color m_color;
-    ImageFloatBox m_top;
-    ImageFloatBox m_bottom_left;
-    ImageFloatBox m_bottom_right;
-    ImageFloatBox m_label;
-    ImageFloatBox m_cursor;
-    ImageFloatBox m_stars;
-};
-class TeraCardWatcher : public DetectorToFinder<TeraCardReader>{
-public:
-    TeraCardWatcher(Color color = COLOR_RED, std::chrono::milliseconds duration = std::chrono::milliseconds(250))
-         : DetectorToFinder("TeraCardFinder", duration, color)
-    {}
-};
-
-
-
-
-struct TeraLobbyNameMatchResult{
-    PlayerListRowSnapshot entry;
-    std::string banlist_source;
-
-    std::string raw_ocr;
-    std::string normalized_ocr;
-    double log10p;
-    bool exact_match;
-    std::string notes;
-
-    std::string to_str() const;
-};
-
-
-
-class TeraLobbyReader : public StaticScreenDetector{
-public:
-    TeraLobbyReader(Logger& logger, AsyncDispatcher& dispatcher, Color color = COLOR_RED);
-
-    virtual void make_overlays(VideoOverlaySet& items) const override;
-
-    //  Returns true if we are on an active lobby.
-    virtual bool detect(const ImageViewRGB32& screen) const override;
-
-    uint8_t total_players(const ImageViewRGB32& screen) const;
-//    uint8_t ready_players(const ImageViewRGB32& screen) const;
-    uint8_t ready_joiners(const ImageViewRGB32& screen, uint8_t host_players);
-
-    int16_t seconds_left(Logger& logger, AsyncDispatcher& dispatcher, const ImageViewRGB32& screen) const;
-    std::string raid_code(Logger& logger, AsyncDispatcher& dispatcher, const ImageViewRGB32& screen) const;
-
-    //  OCR the player names in all the specified languages.
-    //  The returned strings are raw OCR output and are unprocessed.
-    std::array<std::map<Language, std::string>, 4> read_names(
-        Logger& logger,
-        const std::set<Language>& languages,
-        const ImageViewRGB32& screen
-    ) const;
-
-
-private:
-    Logger& m_logger;
-    AsyncDispatcher& m_dispatcher;
-    Color m_color;
-    ImageFloatBox m_bottom_right;
-    ImageFloatBox m_label;
-    ImageFloatBox m_cursor;
-//    ImageFloatBox m_stars;
-
-    ImageFloatBox m_timer;
-    ImageFloatBox m_code;
-
-    ImageFloatBox m_player_spinner[4];
-    ImageFloatBox m_player_name[4];
-    ImageFloatBox m_player_mon[4];
-    ImageFloatBox m_player_ready[4];
-};
-class TeraLobbyWatcher : public DetectorToFinder<TeraLobbyReader>{
-public:
-    TeraLobbyWatcher(
-        Logger& logger, AsyncDispatcher& dispatcher,
-        Color color = COLOR_RED, std::chrono::milliseconds duration = std::chrono::milliseconds(250)
-    )
-         : DetectorToFinder("TeraLobbyFinder", duration, logger, dispatcher, color)
-    {}
-};
-
-#if 0
-class TeraLobbyReadyWaiter : public TeraLobbyReader, public VisualInferenceCallback{
-public:
-    TeraLobbyReadyWaiter(
-        Logger& logger, AsyncDispatcher& dispatcher,
-        Color color, uint8_t desired_players
-    );
-
-    int8_t last_known_total_players() const{
-        return m_last_known_total_players.load(std::memory_order_relaxed);
-    }
-    int8_t last_known_ready_players() const{
-        return m_last_known_ready_players.load(std::memory_order_relaxed);
-    }
-
-    virtual void make_overlays(VideoOverlaySet& items) const override;
-    virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override;
-
-private:
-    uint8_t m_desired_players;
-    std::atomic<int8_t> m_last_known_total_players;
-    std::atomic<int8_t> m_last_known_ready_players;
-};
-#endif
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSV/Inference/Tera/PokemonSV_TeraCodeReader.h b/SerialPrograms/Source/PokemonSV/Inference/Tera/PokemonSV_TeraCodeReader.h
deleted file mode 100644
index e07929790d..0000000000
--- a/SerialPrograms/Source/PokemonSV/Inference/Tera/PokemonSV_TeraCodeReader.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*  Tera Code Reader
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSV_TeraCodeReader_H
-#define PokemonAutomation_PokemonSV_TeraCodeReader_H
-
-#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
-
-namespace PokemonAutomation{
-    class Logger;
-    class AsyncDispatcher;
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-
-void preload_code_templates();
-
-
-//  Returns # of seconds left. Returns -1 if unable to read.
-int16_t read_raid_timer(Logger& logger, AsyncDispatcher& dispatcher, const ImageViewRGB32& image);
-
-//  Returns empty string if unable to read.
-std::string read_raid_code(Logger& logger, AsyncDispatcher& dispatcher, const ImageViewRGB32& image);
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSV/Inference/Tera/PokemonSV_TeraRaidSearchDetector.h b/SerialPrograms/Source/PokemonSV/Inference/Tera/PokemonSV_TeraRaidSearchDetector.h
deleted file mode 100644
index 0b12068b10..0000000000
--- a/SerialPrograms/Source/PokemonSV/Inference/Tera/PokemonSV_TeraRaidSearchDetector.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*  Tera Raid Search Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSV_TeraRaidSearchDetector_H
-#define PokemonAutomation_PokemonSV_TeraRaidSearchDetector_H
-
-#include "Common/Cpp/Color.h"
-#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
-#include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "CommonFramework/InferenceInfra/VisualInferenceCallback.h"
-#include "CommonFramework/Inference/VisualDetector.h"
-
-namespace PokemonAutomation{
-    class ConsoleHandle;
-    class BotBaseContext;
-    struct ProgramInfo;
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-
-
-class TeraRaidSearchDetector : public StaticScreenDetector{
-public:
-    TeraRaidSearchDetector(Color color = COLOR_RED);
-
-    virtual void make_overlays(VideoOverlaySet& items) const override;
-    virtual bool detect(const ImageViewRGB32& screen) const override;
-
-    bool detect_search_location(ImageFloatBox& box, const ImageViewRGB32& screen) const;
-    bool move_cursor_to_search(const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context) const;
-
-private:
-    Color m_color;
-};
-class TeraRaidSearchWatcher : public DetectorToFinder<TeraRaidSearchDetector>{
-public:
-    TeraRaidSearchWatcher(Color color = COLOR_RED)
-         : DetectorToFinder("TeraRaidSearchWatcher", std::chrono::milliseconds(250), color)
-    {}
-};
-
-
-
-class CodeEntryDetector : public StaticScreenDetector{
-public:
-    CodeEntryDetector(Color color = COLOR_RED);
-
-    virtual void make_overlays(VideoOverlaySet& items) const override;
-    virtual bool detect(const ImageViewRGB32& screen) const override;
-
-private:
-    Color m_color;
-    ImageFloatBox m_bottom;
-    ImageFloatBox m_left;
-    ImageFloatBox m_right;
-    ImageFloatBox m_center;
-};
-class CodeEntryWatcher : public DetectorToFinder<CodeEntryDetector>{
-public:
-    CodeEntryWatcher(Color color = COLOR_RED)
-         : DetectorToFinder("CodeEntryWatcher", std::chrono::milliseconds(250), color)
-    {}
-};
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSV/Inference/Tera/PokemonSV_TeraSilhouetteReader.cpp b/SerialPrograms/Source/PokemonSV/Inference/Tera/PokemonSV_TeraSilhouetteReader.cpp
deleted file mode 100644
index 0063f92910..0000000000
--- a/SerialPrograms/Source/PokemonSV/Inference/Tera/PokemonSV_TeraSilhouetteReader.cpp
+++ /dev/null
@@ -1,83 +0,0 @@
-/*  Tera Silhouette Reader
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <opencv2/imgproc.hpp>
-
-#include "CommonFramework/ImageMatch/ImageCropper.h"
-#include "CommonFramework/ImageTools/ImageFilter.h"
-#include "PokemonSV/Resources/PokemonSV_PokemonSprites.h"
-
-#include "PokemonSV_TeraSilhouetteReader.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-
-ImageMatch::SilhouetteDictionaryMatcher make_TERA_RAID_SILHOUETTE_MATCHER(){
-    ImageMatch::SilhouetteDictionaryMatcher matcher;
-    for (const auto& item : ALL_POKEMON_SILHOUETTES()){
-        if (item.first == "pm1084_00_00_00_big" ||
-            item.first == "pm1091_00_00_00_big" ||
-            item.first == "error") {
-            continue;
-        }
-        ImageRGB32 filtered_image = to_blackwhite_rgb32_range(item.second.icon, 0xff000000, 0xff5f5f5f, true);
-        matcher.add(item.first, filtered_image);
-    }
-    return matcher;
-}
-const ImageMatch::SilhouetteDictionaryMatcher& TERA_RAID_SILHOUETTE_MATCHER(){
-    static ImageMatch::SilhouetteDictionaryMatcher matcher = make_TERA_RAID_SILHOUETTE_MATCHER();
-    return matcher;
-}
-
-TeraSilhouetteReader::TeraSilhouetteReader(Color color)
-    : m_color(color)
-    , m_box(0.536, 0.122, 0.252, 0.430)
-{}
-
-void TeraSilhouetteReader::make_overlays(VideoOverlaySet& items) const{
-    items.add(m_color, m_box);
-}
-
-ImageMatch::ImageMatchResult TeraSilhouetteReader::read(const ImageViewRGB32& screen) const{
-    static constexpr double MAX_ALPHA = 110;
-    static constexpr double ALPHA_SPREAD = 20;
-
-    // Get a loose crop of the silhouette icon
-    ImageViewRGB32 cropped_image = extract_box_reference(screen, m_box);
-    //cropped_image.save("cropped_image.png");
-
-    ImageRGB32 preprocessed_image(cropped_image.width(), cropped_image.height());
-    cv::medianBlur(cropped_image.to_opencv_Mat(), preprocessed_image.to_opencv_Mat(), 5);
-    //preprocessed_image.save("preprocessed_image.png");
-
-    // Get a tight crop
-    const ImagePixelBox tight_box = ImageMatch::enclosing_rectangle_with_pixel_filter(
-        preprocessed_image,
-        // The filter is a lambda function that returns true on black silhouette pixels.
-        [](Color pixel){
-            return (uint32_t)pixel.red() + pixel.green() + pixel.blue() < 200;
-        }
-    );
-    ImageRGB32 processed_image = extract_box_reference(preprocessed_image, tight_box).copy();
-    // processed_image.save("processed_image.png");
-
-    ImageRGB32 filtered_image = to_blackwhite_rgb32_range(processed_image, 0xff000000, 0xff5f5f5f, true);
-    // filtered_image.save("filtered_image.png");
-
-    ImageMatch::ImageMatchResult slugs = TERA_RAID_SILHOUETTE_MATCHER().match(filtered_image, ALPHA_SPREAD);
-    slugs.clear_beyond_alpha(MAX_ALPHA);
-
-    return slugs;
-}
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSV/Inference/Tera/PokemonSV_TeraSilhouetteReader.h b/SerialPrograms/Source/PokemonSV/Inference/Tera/PokemonSV_TeraSilhouetteReader.h
deleted file mode 100644
index 53de379031..0000000000
--- a/SerialPrograms/Source/PokemonSV/Inference/Tera/PokemonSV_TeraSilhouetteReader.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*  Tera Silhouette Reader
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSV_TeraSilhouetteReader_H
-#define PokemonAutomation_PokemonSV_TeraSilhouetteReader_H
-
-#include "Common/Cpp/Color.h"
-#include "CommonFramework/ImageMatch/ImageMatchResult.h"
-#include "CommonFramework/ImageMatch/SilhouetteDictionaryMatcher.h"
-#include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
-
-namespace PokemonAutomation{
-    struct ProgramInfo;
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-
-
-class TeraSilhouetteReader{
-public:
-    TeraSilhouetteReader(Color color = COLOR_GREEN);
-
-    void make_overlays(VideoOverlaySet& items) const;
-    ImageMatch::ImageMatchResult read(const ImageViewRGB32& screen) const;
-
-private:
-    Color m_color;
-    ImageFloatBox m_box;
-};
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSV/Inference/Tera/PokemonSV_TeraTypeReader.cpp b/SerialPrograms/Source/PokemonSV/Inference/Tera/PokemonSV_TeraTypeReader.cpp
deleted file mode 100644
index 15595c3d1f..0000000000
--- a/SerialPrograms/Source/PokemonSV/Inference/Tera/PokemonSV_TeraTypeReader.cpp
+++ /dev/null
@@ -1,72 +0,0 @@
-/*  Tera Type Reader
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/ImageMatch/ImageCropper.h"
-#include "CommonFramework/ImageTools/ImageFilter.h"
-#include "PokemonSV/Resources/PokemonSV_PokemonSprites.h"
-
-#include "PokemonSV_TeraTypeReader.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-
-
-ImageMatch::SilhouetteDictionaryMatcher make_TERA_RAID_TYPE_MATCHER(){
-    ImageMatch::SilhouetteDictionaryMatcher matcher;
-    for (size_t i = 0; i < NUM_TERA_TYPE; i++){
-        matcher.add(TERA_TYPE_NAMES[i], ALL_TERA_TYPE_ICONS()[i]);
-    }
-    return matcher;
-}
-const ImageMatch::SilhouetteDictionaryMatcher& TERA_RAID_TYPE_MATCHER(){
-    static ImageMatch::SilhouetteDictionaryMatcher matcher = make_TERA_RAID_TYPE_MATCHER();
-    return matcher;
-}
-
-TeraTypeReader::TeraTypeReader(Color color)
-    : m_matcher(TERA_RAID_TYPE_MATCHER())
-    , m_color(color)
-    , m_box(0.787, 0.139, 0.073, 0.136)
-{}
-void TeraTypeReader::make_overlays(VideoOverlaySet& items) const{
-    items.add(m_color, m_box);
-}
-
-ImageMatch::ImageMatchResult TeraTypeReader::read(const ImageViewRGB32& screen) const{
-    static constexpr double MAX_ALPHA = 100;
-    static constexpr double ALPHA_SPREAD = 20;
-
-    // Get a loose crop of the tera type icon
-    ImageViewRGB32 cropped_image = extract_box_reference(screen, m_box);
-    //cropped_image.save("cropped_image.png");
-
-    // Get a tight crop
-    const ImagePixelBox tight_box = ImageMatch::enclosing_rectangle_with_pixel_filter(
-        cropped_image,
-        // The filter is a lambda function that returns true on black tera type pixels.
-        [](Color pixel){
-            return (uint32_t)pixel.red() + pixel.green() + pixel.blue() < 200;
-        }
-    );
-    ImageRGB32 processed_image = extract_box_reference(cropped_image, tight_box).copy();
-    //processed_image.save("processed_image.png");
-
-    ImageRGB32 filtered_image = to_blackwhite_rgb32_range(processed_image, 0xff000000, 0xff5f5f5f, true);
-    //filtered_image.save("filtered_image.png");
-
-    ImageMatch::ImageMatchResult types = m_matcher.match(filtered_image, ALPHA_SPREAD);
-    types.clear_beyond_alpha(MAX_ALPHA);
-
-    return types;
-}
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSV/Inference/Tera/PokemonSV_TeraTypeReader.h b/SerialPrograms/Source/PokemonSV/Inference/Tera/PokemonSV_TeraTypeReader.h
deleted file mode 100644
index efef553384..0000000000
--- a/SerialPrograms/Source/PokemonSV/Inference/Tera/PokemonSV_TeraTypeReader.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*  Tera Type Reader
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSV_TeraTypeReader_H
-#define PokemonAutomation_PokemonSV_TeraTypeReader_H
-
-#include "Common/Cpp/Color.h"
-#include "CommonFramework/ImageMatch/ImageMatchResult.h"
-#include "CommonFramework/ImageMatch/SilhouetteDictionaryMatcher.h"
-#include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
-
-namespace PokemonAutomation{
-    struct ProgramInfo;
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-
-
-class TeraTypeReader{
-public:
-    TeraTypeReader(Color color = COLOR_BLUE);
-
-    void make_overlays(VideoOverlaySet& items) const;
-    ImageMatch::ImageMatchResult read(const ImageViewRGB32& screen) const;
-
-private:
-    const ImageMatch::SilhouetteDictionaryMatcher& m_matcher;
-    Color m_color;
-    ImageFloatBox m_box;
-};
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSV/Options/PokemonSV_AuctionItemSelectOption.h b/SerialPrograms/Source/PokemonSV/Options/PokemonSV_AuctionItemSelectOption.h
deleted file mode 100644
index 07a27c80c9..0000000000
--- a/SerialPrograms/Source/PokemonSV/Options/PokemonSV_AuctionItemSelectOption.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*  Auction Item Selector, UI component to select multiple items from auctions
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSV_AuctionItemSelectOption_H
-#define PokemonAutomation_PokemonSV_AuctionItemSelectOption_H
-
-#include "CommonFramework/Options/StringSelectOption.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-
-
-class AuctionItemSelectCell : public StringSelectCell{
-public:
-    AuctionItemSelectCell(const std::string& default_slug);
-};
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSV/Options/PokemonSV_EncounterActionsTable.cpp b/SerialPrograms/Source/PokemonSV/Options/PokemonSV_EncounterActionsTable.cpp
deleted file mode 100644
index 87ca075ee3..0000000000
--- a/SerialPrograms/Source/PokemonSV/Options/PokemonSV_EncounterActionsTable.cpp
+++ /dev/null
@@ -1,138 +0,0 @@
-/*  Encounter Filter Table
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonSV/Resources/PokemonSV_NameDatabase.h"
-#include "PokemonSV_EncounterActionsTable.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-using namespace Pokemon;
-
-
-
-
-const EnumDatabase<EncounterActionsAction>& EncounterFilterAction_database(){
-    static EnumDatabase<EncounterActionsAction> database{
-        {EncounterActionsAction::RUN_AWAY,              "run-away",     "Run Away"},
-        {EncounterActionsAction::STOP_PROGRAM,          "stop-program", "Stop Program"},
-        {EncounterActionsAction::THROW_BALLS,           "throw-balls",  "Throw Balls"},
-        {EncounterActionsAction::THROW_BALLS_AND_SAVE,  "throw-balls-and-save",  "Throw Balls. Save if caught."},
-    };
-    return database;
-}
-const EnumDatabase<EncounterActionsShininess>& EncounterFilterShininess_database(){
-    static EnumDatabase<EncounterActionsShininess> database{
-        {EncounterActionsShininess::ANYTHING,   "anything",     "Anything"},
-        {EncounterActionsShininess::NOT_SHINY,  "not-shiny",    "Not Shiny"},
-        {EncounterActionsShininess::SHINY,      "shiny",        "Shiny"},
-    };
-    return database;
-}
-
-
-
-
-EncounterActionsRow::~EncounterActionsRow(){
-    action.remove_listener(*this);
-}
-EncounterActionsRow::EncounterActionsRow()
-    : action(
-        EncounterFilterAction_database(),
-        LockWhileRunning::UNLOCKED,
-        EncounterActionsAction::STOP_PROGRAM
-    )
-    , pokeball("poke-ball")
-    , pokemon(
-        ALL_POKEMON_NAMES(),
-        LockWhileRunning::UNLOCKED,
-        "glimmora"
-    )
-    , shininess(
-        EncounterFilterShininess_database(),
-        LockWhileRunning::UNLOCKED,
-        EncounterActionsShininess::SHINY
-    )
-{
-    PA_ADD_OPTION(action);
-    PA_ADD_OPTION(pokeball);
-    PA_ADD_OPTION(pokemon);
-    PA_ADD_OPTION(shininess);
-
-    EncounterActionsRow::value_changed();
-
-    action.add_listener(*this);
-}
-std::unique_ptr<EditableTableRow> EncounterActionsRow::clone() const{
-    std::unique_ptr<EncounterActionsRow> ret(new EncounterActionsRow());
-    ret->action.set(action);
-    ret->pokeball.set_by_index(pokeball.index());
-    ret->pokemon.set_by_index(pokemon.index());
-    ret->shininess.set(shininess);
-    return ret;
-}
-EncounterActionsEntry EncounterActionsRow::snapshot() const{
-    return {
-        action,
-        pokeball.slug(),
-        pokemon.slug(),
-        shininess,
-    };
-}
-void EncounterActionsRow::value_changed(){
-    switch (action){
-    case EncounterActionsAction::STOP_PROGRAM:
-    case EncounterActionsAction::RUN_AWAY:
-        pokeball.set_visibility(ConfigOptionState::DISABLED);
-        break;
-    case EncounterActionsAction::THROW_BALLS:
-    case EncounterActionsAction::THROW_BALLS_AND_SAVE:
-        pokeball.set_visibility(ConfigOptionState::ENABLED);
-        break;
-    }
-}
-
-
-
-EncounterActionsTable::EncounterActionsTable()
-    : EditableTableOption_t<EncounterActionsRow>(
-        "<b>Actions Table:</b><br>"
-        "By default, the program will run from non-shinies and stop on shinies. "
-        "This table lets you override this default behavior for specific " +
-        STRING_POKEMON + " and their shininess. "
-        "If multiple entries match, the last one will be chosen. Note that running from "
-        "shinies will not despawn them since they cannot be killed via Let's Go.",
-        LockWhileRunning::UNLOCKED,
-        make_defaults()
-    )
-{}
-
-std::vector<EncounterActionsEntry> EncounterActionsTable::snapshot(){
-    return EditableTableOption_t<EncounterActionsRow>::snapshot<EncounterActionsEntry>();
-}
-std::vector<std::string> EncounterActionsTable::make_header() const{
-    return {
-        "Action",
-        Pokemon::STRING_POKEBALL,
-        "Species",
-        "Shininess",
-    };
-}
-std::vector<std::unique_ptr<EditableTableRow>> EncounterActionsTable::make_defaults(){
-    std::vector<std::unique_ptr<EditableTableRow>> ret;
-    return ret;
-}
-
-
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSV/Options/PokemonSV_EncounterActionsTable.h b/SerialPrograms/Source/PokemonSV/Options/PokemonSV_EncounterActionsTable.h
deleted file mode 100644
index eeeebb8ebb..0000000000
--- a/SerialPrograms/Source/PokemonSV/Options/PokemonSV_EncounterActionsTable.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*  Encounter Filter Table
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSV_EncounterFilterTable_H
-#define PokemonAutomation_PokemonSV_EncounterFilterTable_H
-
-#include "Common/Cpp/Options/EnumDropdownOption.h"
-#include "Common/Cpp/Options/EditableTableOption.h"
-#include "CommonFramework/Options/StringSelectOption.h"
-#include "PokemonSwSh/Options/PokemonSwSh_BallSelectOption.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-
-enum class EncounterActionsAction{
-    STOP_PROGRAM,
-    RUN_AWAY,
-    THROW_BALLS,
-    THROW_BALLS_AND_SAVE,
-};
-
-enum class EncounterActionsShininess{
-    ANYTHING,
-    NOT_SHINY,
-    SHINY,
-};
-
-
-
-struct EncounterActionsEntry{
-    EncounterActionsAction action;
-    std::string ball;
-    std::string pokemon;
-    EncounterActionsShininess shininess;
-};
-
-
-class EncounterActionsRow : public EditableTableRow, private ConfigOption::Listener{
-public:
-    ~EncounterActionsRow();
-    EncounterActionsRow();
-
-    virtual std::unique_ptr<EditableTableRow> clone() const override;
-
-    EncounterActionsEntry snapshot() const;
-
-private:
-    virtual void value_changed() override;
-
-private:
-    EnumDropdownCell<EncounterActionsAction> action;
-    PokemonSwSh::PokemonBallSelectCell pokeball;
-    StringSelectCell pokemon;
-    EnumDropdownCell<EncounterActionsShininess> shininess;
-};
-
-
-class EncounterActionsTable : public EditableTableOption_t<EncounterActionsRow>{
-public:
-    EncounterActionsTable();
-
-    std::vector<EncounterActionsEntry> snapshot();
-
-    virtual std::vector<std::string> make_header() const;
-
-    static std::vector<std::unique_ptr<EditableTableRow>> make_defaults();
-
-};
-
-
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSV/Options/PokemonSV_SandwichIngredientsOption.h b/SerialPrograms/Source/PokemonSV/Options/PokemonSV_SandwichIngredientsOption.h
deleted file mode 100644
index e9f4f2cdc7..0000000000
--- a/SerialPrograms/Source/PokemonSV/Options/PokemonSV_SandwichIngredientsOption.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*  Sandwich Ingredients Option
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSV_SandwichIngredientsOption_H
-#define PokemonAutomation_PokemonSV_SandwichIngredientsOption_H
-
-#include "CommonFramework/Options/StringSelectOption.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-
-class SandwichIngredientsTableCell : public StringSelectCell {
-public:
-    SandwichIngredientsTableCell(const std::string& default_slug);
-};
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSV/Options/PokemonSV_SandwichIngredientsTable.cpp b/SerialPrograms/Source/PokemonSV/Options/PokemonSV_SandwichIngredientsTable.cpp
deleted file mode 100644
index aa9f6289fc..0000000000
--- a/SerialPrograms/Source/PokemonSV/Options/PokemonSV_SandwichIngredientsTable.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-/*  Sandwich Ingredients Table
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "PokemonSV/Resources/PokemonSV_Ingredients.h"
-#include "PokemonSV_SandwichIngredientsTable.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-
-
-SandwichIngredientsTableRow::SandwichIngredientsTableRow()
-    : item("lettuce")
-{
-    PA_ADD_OPTION(item);
-}
-std::unique_ptr<EditableTableRow> SandwichIngredientsTableRow::clone() const {
-    std::unique_ptr<SandwichIngredientsTableRow> ret(new SandwichIngredientsTableRow());
-    ret->item.set_by_index(item.index());
-    return ret;
-}
-
-SandwichIngredientsTable::SandwichIngredientsTable(std::string label)
-    : EditableTableOption_t<SandwichIngredientsTableRow>(
-        std::move(label),
-        LockWhileRunning::LOCKED,
-        make_defaults()
-        )
-{}
-
-
-std::vector<std::string> SandwichIngredientsTable::make_header() const {
-    return std::vector<std::string>{
-        "Ingredient/Condiment",
-    };
-}
-
-std::vector<std::unique_ptr<EditableTableRow>> SandwichIngredientsTable::make_defaults() {
-    std::vector<std::unique_ptr<EditableTableRow>> ret;
-    ret.emplace_back(std::make_unique<SandwichIngredientsTableRow>());
-    return ret;
-}
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSV/Options/PokemonSV_SandwichIngredientsTable.h b/SerialPrograms/Source/PokemonSV/Options/PokemonSV_SandwichIngredientsTable.h
deleted file mode 100644
index 8d2e084568..0000000000
--- a/SerialPrograms/Source/PokemonSV/Options/PokemonSV_SandwichIngredientsTable.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*  Sandwich Ingredients Table
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSV_SandwichIngredientsTable_H
-#define PokemonAutomation_PokemonSV_SandwichIngredientsTable_H
-
-#include "Common/Cpp/Options/EditableTableOption.h"
-#include "PokemonSV_SandwichIngredientsOption.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-class SandwichIngredientsTableRow : public EditableTableRow {
-public:
-    SandwichIngredientsTableRow();
-    virtual std::unique_ptr<EditableTableRow> clone() const override;
-
-public:
-    SandwichIngredientsTableCell item;
-};
-
-
-class SandwichIngredientsTable : public EditableTableOption_t<SandwichIngredientsTableRow> {
-public:
-    SandwichIngredientsTable(std::string label);
-
-    virtual std::vector<std::string> make_header() const override;
-
-    static std::vector<std::unique_ptr<EditableTableRow>> make_defaults();
-};
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSV/Options/PokemonSV_TeraAIOption.cpp b/SerialPrograms/Source/PokemonSV/Options/PokemonSV_TeraAIOption.cpp
deleted file mode 100644
index 0fde6c1228..0000000000
--- a/SerialPrograms/Source/PokemonSV/Options/PokemonSV_TeraAIOption.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-/*  Battle AI Option
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "PokemonSV_TeraAIOption.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-
-
-TeraAIOption::TeraAIOption()
-    : GroupOption(
-        "Battle AI",
-        LockWhileRunning::UNLOCKED,
-        false, true
-    )
-    , description(
-        "There is no battle AI yet. It will always select the 1st move unless it is blocked by taunt, disable, torment, etc..."
-    )
-    , TRY_TO_TERASTILLIZE(
-        "<b>Try to Terastillize:</b><br>Try to terastillize if available. Add 4s per try but greatly increase win rate.",
-        LockWhileRunning::UNLOCKED, true
-    )
-{
-//    PA_ADD_STATIC(description);
-    PA_ADD_OPTION(TRY_TO_TERASTILLIZE);
-    PA_ADD_OPTION(MOVE_TABLE);
-}
-
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSV/Options/PokemonSV_TeraMoveTable.cpp b/SerialPrograms/Source/PokemonSV/Options/PokemonSV_TeraMoveTable.cpp
deleted file mode 100644
index 553c3cddd0..0000000000
--- a/SerialPrograms/Source/PokemonSV/Options/PokemonSV_TeraMoveTable.cpp
+++ /dev/null
@@ -1,168 +0,0 @@
-/*  Tera Move Table
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "PokemonSV_TeraMoveTable.h"
-
-//#include <iostream>
-//using std::cout;
-//using std::endl;
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-
-const EnumDatabase<TeraMoveType>& tera_move_enum_database(){
-    static EnumDatabase<TeraMoveType> database{
-        {TeraMoveType::Wait,            "wait",             "Wait for X seconds."},
-        {TeraMoveType::Move1,           "move1",            "Move 1"},
-        {TeraMoveType::Move2,           "move2",            "Move 2"},
-        {TeraMoveType::Move3,           "move3",            "Move 3"},
-        {TeraMoveType::Move4,           "move4",            "Move 4"},
-        {TeraMoveType::Cheer_AllOut,    "cheer-allout",     "Cheer - All Out"},
-        {TeraMoveType::Cheer_HangTough, "cheer-hangtough",  "Cheer - Hang Tough"},
-        {TeraMoveType::Cheer_HealUp,    "cheer-healup",     "Cheer - Heal Up"},
-    };
-    return database;
-}
-const EnumDatabase<TeraTarget>& tera_target_enum_database(){
-    static EnumDatabase<TeraTarget> database{
-        {TeraTarget::Opponent,  "opponent", "Opponent"},
-        {TeraTarget::Player0,   "player0",  "Player 0 (yourself)"},
-        {TeraTarget::Player1,   "player1",  "Player 1 (right of yourself)"},
-        {TeraTarget::Player2,   "player2",  "Player 2 (2nd from the right)"},
-        {TeraTarget::Player3,   "player3",  "Player 3 (rightmost player)"},
-    };
-    return database;
-}
-
-
-std::string TeraMoveEntry::to_str() const{
-    switch (type){
-    case TeraMoveType::Wait:
-        return "Wait for " + std::to_string(seconds) + " second(s).";
-    case TeraMoveType::Move1:
-    case TeraMoveType::Move2:
-    case TeraMoveType::Move3:
-    case TeraMoveType::Move4:{
-        int slot = (int)type - (int)TeraMoveType::Move1;
-        std::string str = "Move " + std::to_string(slot + 1) + " on ";
-        if (target == TeraTarget::Opponent){
-            return str + "opponent.";
-        }else{
-            slot = (int)target - (int)TeraTarget::Player0;
-            return "player " + std::to_string(slot) + ".";
-        }
-    }
-    case TeraMoveType::Cheer_AllOut:
-        return "Cheer - All Out";
-    case TeraMoveType::Cheer_HangTough:
-        return "Cheer - Hang Tough";
-    case TeraMoveType::Cheer_HealUp:
-        return "Cheer - Heal Up";
-    }
-    return "(Invalid Move)";
-}
-
-
-
-
-TeraMoveTableRow::~TeraMoveTableRow(){
-    type.remove_listener(*this);
-}
-TeraMoveTableRow::TeraMoveTableRow()
-    : type(tera_move_enum_database(), LockWhileRunning::UNLOCKED, TeraMoveType::Move1)
-    , seconds(LockWhileRunning::UNLOCKED, 5)
-    , target(tera_target_enum_database(), LockWhileRunning::UNLOCKED, TeraTarget::Opponent)
-    , notes(false, LockWhileRunning::UNLOCKED, "", "(e.g. Screech, Belly Drum)")
-{
-    PA_ADD_OPTION(type);
-    PA_ADD_OPTION(seconds);
-    PA_ADD_OPTION(target);
-    PA_ADD_OPTION(notes);
-
-    TeraMoveTableRow::value_changed();
-    type.add_listener(*this);
-}
-std::unique_ptr<EditableTableRow> TeraMoveTableRow::clone() const{
-    std::unique_ptr<TeraMoveTableRow> ret(new TeraMoveTableRow());
-    ret->type.set(type);
-    ret->seconds.set(seconds);
-    ret->target.set(target);
-    ret->notes.set(notes);
-    return ret;
-}
-TeraMoveEntry TeraMoveTableRow::snapshot() const{
-    return TeraMoveEntry{type, seconds, target};
-}
-void TeraMoveTableRow::value_changed(){
-    TeraMoveType type = this->type;
-//    cout << "Enter: type = " << (int)type << endl;
-
-    seconds.set_visibility(
-        type == TeraMoveType::Wait
-        ? ConfigOptionState::ENABLED
-        : ConfigOptionState::HIDDEN
-    );
-
-    bool is_move =
-        type == TeraMoveType::Move1 ||
-        type == TeraMoveType::Move2 ||
-        type == TeraMoveType::Move3 ||
-        type == TeraMoveType::Move4;
-
-    target.set_visibility(
-        is_move
-        ? ConfigOptionState::ENABLED
-        : ConfigOptionState::HIDDEN
-    );
-
-//    cout << "Exit: type = " << (int)type << endl;
-
-}
-
-
-
-
-
-TeraMoveTable::TeraMoveTable()
-    : EditableTableOption_t<TeraMoveTableRow>(
-        "<b>Move Table:</b><br>"
-        "Run this sequence of moves. When the end of the table is reached, "
-        "the last entry will be repeated until the battle is won or lost. "
-        "Changes to this table take effect on the next battle.",
-        LockWhileRunning::UNLOCKED,
-        make_defaults()
-    )
-{}
-
-std::vector<TeraMoveEntry> TeraMoveTable::snapshot(){
-    return EditableTableOption_t<TeraMoveTableRow>::snapshot<TeraMoveEntry>();
-}
-std::vector<std::string> TeraMoveTable::make_header() const{
-    return {
-        "Move",
-        "Wait (seconds)",
-        "Target",
-        "Notes",
-    };
-}
-std::vector<std::unique_ptr<EditableTableRow>> TeraMoveTable::make_defaults(){
-    std::vector<std::unique_ptr<EditableTableRow>> ret;
-    ret.emplace_back(new TeraMoveTableRow());
-    return ret;
-}
-
-
-
-
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSV/Options/PokemonSV_TeraMoveTable.h b/SerialPrograms/Source/PokemonSV/Options/PokemonSV_TeraMoveTable.h
deleted file mode 100644
index 88d926a08c..0000000000
--- a/SerialPrograms/Source/PokemonSV/Options/PokemonSV_TeraMoveTable.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/*  Tera Move Table
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSV_TeraMoveTable_H
-#define PokemonAutomation_PokemonSV_TeraMoveTable_H
-
-//#include "Common/Cpp/Options/GroupOption.h"
-//#include "Common/Cpp/Options/StaticTextOption.h"
-//#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
-#include "Common/Cpp/Options/SimpleIntegerOption.h"
-#include "Common/Cpp/Options/StringOption.h"
-#include "Common/Cpp/Options/EnumDropdownOption.h"
-#include "Common/Cpp/Options/EditableTableOption.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-
-
-enum class TeraMoveType{
-    Wait,
-    Move1,
-    Move2,
-    Move3,
-    Move4,
-    Cheer_AllOut,
-    Cheer_HangTough,
-    Cheer_HealUp,
-};
-const EnumDatabase<TeraMoveType>& tera_move_enum_database();
-
-enum class TeraTarget{
-    Opponent,
-    Player0,    //  Yourself
-    Player1,
-    Player2,
-    Player3,
-};
-const EnumDatabase<TeraTarget>& tera_target_enum_database();
-
-
-
-
-struct TeraMoveEntry{
-    TeraMoveType type;
-    uint8_t seconds;
-    TeraTarget target;
-
-    std::string to_str() const;
-};
-
-
-class TeraMoveTableRow : public EditableTableRow, public ConfigOption::Listener{
-public:
-    ~TeraMoveTableRow();
-    TeraMoveTableRow();
-    virtual std::unique_ptr<EditableTableRow> clone() const override;
-
-    TeraMoveEntry snapshot() const;
-
-private:
-    virtual void value_changed() override;
-
-private:
-    EnumDropdownCell<TeraMoveType> type;
-    SimpleIntegerCell<uint8_t> seconds;
-    EnumDropdownCell<TeraTarget> target;
-    StringCell notes;
-};
-
-
-class TeraMoveTable : public EditableTableOption_t<TeraMoveTableRow>{
-public:
-    TeraMoveTable();
-
-    std::vector<TeraMoveEntry> snapshot();
-
-    virtual std::vector<std::string> make_header() const;
-
-    static std::vector<std::unique_ptr<EditableTableRow>> make_defaults();
-
-};
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSV/PokemonSV_Panels.cpp b/SerialPrograms/Source/PokemonSV/PokemonSV_Panels.cpp
deleted file mode 100644
index 1789bd18fe..0000000000
--- a/SerialPrograms/Source/PokemonSV/PokemonSV_Panels.cpp
+++ /dev/null
@@ -1,132 +0,0 @@
-/*  Pokemon SV Panels
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/GlobalSettingsPanel.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonSV_Panels.h"
-
-#include "PokemonSV_Settings.h"
-
-#include "Programs/General/PokemonSV_MassPurchase.h"
-#include "Programs/General/PokemonSV_MassRelease.h"
-#include "Programs/General/PokemonSV_AutonomousBallThrower.h"
-
-#include "Programs/General/PokemonSV_LPFarmer.h"
-#include "Programs/General/PokemonSV_GimmighoulChestFarmer.h"
-#include "Programs/General/PokemonSV_GimmighoulRoamingFarmer.h"
-#include "Programs/General/PokemonSV_AuctionFarmer.h"
-#include "Programs/General/PokemonSV_ESPTraining.h"
-#include "Programs/Trading/PokemonSV_SelfBoxTrade.h"
-#include "Programs/General/PokemonSV_StatsReset.h"
-#include "Programs/General/PokemonSV_TournamentFarmer.h"
-#include "Programs/Sandwiches/PokemonSV_SandwichMaker.h"
-#include "Programs/General/PokemonSV_SizeChecker.h"
-
-#include "Programs/Eggs/PokemonSV_EggFetcher.h"
-#include "Programs/Eggs/PokemonSV_EggHatcher.h"
-#include "Programs/Eggs/PokemonSV_EggAutonomous.h"
-
-#include "Programs/TeraRaids/PokemonSV_AutoHost.h"
-#include "Programs/TeraRaids/PokemonSV_TeraSelfFarmer.h"
-#include "Programs/TeraRaids/PokemonSV_TeraMultiFarmer.h"
-
-#include "Programs/FastCodeEntry/PokemonSV_FastCodeEntry.h"
-#include "Programs/FastCodeEntry/PokemonSV_ClipboardFastCodeEntry.h"
-#include "Programs/FastCodeEntry/PokemonSV_VideoFastCodeEntry.h"
-
-#include "Programs/ShinyHunting/PokemonSV_ShinyHunt-AreaZeroPlatform.h"
-
-#include "Programs/Glitches/PokemonSV_RideCloner-1.0.1.h"
-#include "Programs/Glitches/PokemonSV_CloneItems-1.0.1.h"
-
-#include "Programs/TestPrograms/PokemonSV_SoundListener.h"
-
-#ifdef PA_OFFICIAL
-#include "../../Internal/SerialPrograms/NintendoSwitch_TestPrograms.h"
-#endif
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-
-
-PanelListFactory::PanelListFactory()
-    : PanelListDescriptor(Pokemon::STRING_POKEMON + " Scarlet and Violet")
-{}
-
-std::vector<PanelEntry> PanelListFactory::make_panels() const{
-    std::vector<PanelEntry> ret;
-    
-    ret.emplace_back("---- Settings ----");
-    ret.emplace_back(make_settings<GameSettings_Descriptor, GameSettingsPanel>());
-
-    ret.emplace_back("---- General ----");
-    ret.emplace_back(make_single_switch_program<MassPurchase_Descriptor, MassPurchase>());
-    ret.emplace_back(make_single_switch_program<MassRelease_Descriptor, MassRelease>());
-    ret.emplace_back(make_single_switch_program<AutonomousBallThrower_Descriptor, AutonomousBallThrower>());
-    ret.emplace_back(make_single_switch_program<StatsReset_Descriptor, StatsReset>());
-    ret.emplace_back(make_single_switch_program<SizeChecker_Descriptor, SizeChecker>());
-
-//    ret.emplace_back("---- Trading ----");
-    ret.emplace_back(make_multi_switch_program<SelfBoxTrade_Descriptor, SelfBoxTrade>());
-
-//    if (PreloadSettings::instance().DEVELOPER_MODE) {
-//        ret.emplace_back("---- Sandwiches ----");
-        ret.emplace_back(make_single_switch_program<SandwichMaker_Descriptor, SandwichMaker>());
-//    }
-
-    ret.emplace_back("---- Farming ----");
-    ret.emplace_back(make_single_switch_program<LPFarmer_Descriptor, LPFarmer>());
-    ret.emplace_back(make_single_switch_program<GimmighoulRoamingFarmer_Descriptor, GimmighoulRoamingFarmer>());
-    ret.emplace_back(make_single_switch_program<GimmighoulChestFarmer_Descriptor, GimmighoulChestFarmer>());
-    ret.emplace_back(make_single_switch_program<AuctionFarmer_Descriptor, AuctionFarmer>());
-    ret.emplace_back(make_single_switch_program<ESPTraining_Descriptor, ESPTraining>());
-    ret.emplace_back(make_single_switch_program<TournamentFarmer_Descriptor, TournamentFarmer>());
-
-    ret.emplace_back("---- Eggs ----");
-    ret.emplace_back(make_single_switch_program<EggFetcher_Descriptor, EggFetcher>());
-    ret.emplace_back(make_single_switch_program<EggHatcher_Descriptor, EggHatcher>());
-    ret.emplace_back(make_single_switch_program<EggAutonomous_Descriptor, EggAutonomous>());
-
-    ret.emplace_back("---- Tera Raids ----");
-    ret.emplace_back(make_single_switch_program<AutoHost_Descriptor, AutoHost>());
-    ret.emplace_back(make_single_switch_program<TeraSelfFarmer_Descriptor, TeraSelfFarmer>());
-    ret.emplace_back(make_multi_switch_program<TeraMultiFarmer_Descriptor, TeraMultiFarmer>());
-
-    ret.emplace_back("---- Fast Code Entry ----");
-    ret.emplace_back(make_multi_switch_program<FastCodeEntry_Descriptor, FastCodeEntry>());
-    ret.emplace_back(make_multi_switch_program<ClipboardFastCodeEntry_Descriptor, ClipboardFastCodeEntry>());
-    ret.emplace_back(make_multi_switch_program<VideoFastCodeEntry_Descriptor, VideoFastCodeEntry>());
-
-    ret.emplace_back("---- Shiny Hunting ----");
-    ret.emplace_back(make_single_switch_program<ShinyHuntAreaZeroPlatform_Descriptor, ShinyHuntAreaZeroPlatform>());
-
-    ret.emplace_back("---- Glitches ----");
-    ret.emplace_back(make_single_switch_program<RideCloner101_Descriptor, RideCloner101>());
-    ret.emplace_back(make_single_switch_program<CloneItems101_Descriptor, CloneItems101>());
-
-    if (PreloadSettings::instance().DEVELOPER_MODE){
-        ret.emplace_back("---- Developer Tools ----");
-        ret.emplace_back(make_single_switch_program<SoundListener_Descriptor, SoundListener>());
-    }
-
-#ifdef PA_OFFICIAL
-    if (PreloadSettings::instance().DEVELOPER_MODE){
-        ret.emplace_back("---- Research ----");
-        add_panels(ret);
-    }
-#endif
-
-    return ret;
-}
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSV/PokemonSV_Panels.h b/SerialPrograms/Source/PokemonSV/PokemonSV_Panels.h
deleted file mode 100644
index 7c1b877fac..0000000000
--- a/SerialPrograms/Source/PokemonSV/PokemonSV_Panels.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*  Pokemon Scarlet/Violet Panels
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSV_Panels_H
-#define PokemonAutomation_PokemonSV_Panels_H
-
-#include "CommonFramework/Panels/PanelList.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-
-
-class PanelListFactory : public PanelListDescriptor{
-public:
-    PanelListFactory();
-    virtual std::vector<PanelEntry> make_panels() const;
-};
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSV/PokemonSV_Settings.cpp b/SerialPrograms/Source/PokemonSV/PokemonSV_Settings.cpp
deleted file mode 100644
index fee94fe2a3..0000000000
--- a/SerialPrograms/Source/PokemonSV/PokemonSV_Settings.cpp
+++ /dev/null
@@ -1,136 +0,0 @@
-/*  Pokemon SV Settings
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-//#include "CommonFramework/Globals.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonSV_Settings.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-using namespace Pokemon;
-
-
-
-GameSettings& GameSettings::instance(){
-    static GameSettings settings;
-    return settings;
-}
-GameSettings::GameSettings()
-    : BatchOption(LockWhileRunning::LOCKED)
-    , m_menu_navigation("<font size=4><b>Menu Navigation Timings:</b></font>")
-    , GAME_TO_HOME_DELAY(
-        "<b>Game to Home Delay:</b><br>Delay from pressing home to entering the the Switch home menu.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "125"
-    )
-    , m_start_game_timings("<font size=4><b>Start Game Timings:</b></font>")
-    , START_GAME_MASH(
-        "<b>1. Start Game Mash:</b><br>Mash A for this long to start the game.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "2 * TICKS_PER_SECOND"
-    )
-    , START_GAME_WAIT(
-        "<b>2. Start Game Wait:</b><br>Wait this long for the game to load.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "60 * TICKS_PER_SECOND"
-    )
-    , ENTER_GAME_MASH(
-        "<b>3. Enter Game Mash:</b><br>Mash A for this long to enter the game.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "5 * TICKS_PER_SECOND"
-    )
-    , ENTER_GAME_WAIT(
-        "<b>4. Enter Game Wait:</b><br>Wait this long for the game to enter the overworld.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "60 * TICKS_PER_SECOND"
-    )
-    , m_advanced_options(
-        "<font size=4><b>Advanced Options:</b> You should not need to touch anything below here.</font>"
-    )
-    , RAID_SPAWN_DELAY(
-        "<b>Raid Spawn Delay</b>",
-        LockWhileRunning::UNLOCKED,
-        TICKS_PER_SECOND,
-        "3 * TICKS_PER_SECOND"
-    )
-    , SHINY_SOUND_THRESHOLD2(
-        "<b>Shiny Sound Threshold:</b><br>Maximum error coefficient to trigger a shiny detection.",
-        LockWhileRunning::LOCKED,
-        0.96, 0, 1.0
-    )
-    , SHINY_SOUND_LOW_FREQUENCY(
-        "<b>Shiny Sound Low Frequency (Hz):</b><br>High pass filter frequency for shiny sound.",
-        LockWhileRunning::LOCKED,
-        1000, 0, 48000
-    )
-    , LETS_GO_KILL_SOUND_THRESHOLD(
-        "<b>Let's Go Kill Sound Threshold:</b><br>Maximum error coefficient to trigger a Let's Go Kill detection.",
-        LockWhileRunning::LOCKED,
-        0.93, 0, 1.0
-    )
-    , LETS_GO_KILL_SOUND_LOW_FREQUENCY(
-        "<b>Let's Go Kill Sound Low Frequency (Hz):</b><br>High pass filter frequency for Let's Go Kill sound.",
-        LockWhileRunning::LOCKED,
-        1000, 0, 48000
-    )
-{
-    PA_ADD_STATIC(m_start_game_timings);
-    PA_ADD_OPTION(START_GAME_MASH);
-    PA_ADD_OPTION(START_GAME_WAIT);
-    PA_ADD_OPTION(ENTER_GAME_MASH);
-    PA_ADD_OPTION(ENTER_GAME_WAIT);
-    PA_ADD_OPTION(m_advanced_options);
-    PA_ADD_OPTION(RAID_SPAWN_DELAY);
-    PA_ADD_OPTION(SHINY_SOUND_THRESHOLD2);
-    PA_ADD_OPTION(SHINY_SOUND_LOW_FREQUENCY);
-    PA_ADD_OPTION(LETS_GO_KILL_SOUND_THRESHOLD);
-    PA_ADD_OPTION(LETS_GO_KILL_SOUND_LOW_FREQUENCY);
-}
-
-
-
-
-
-GameSettings_Descriptor::GameSettings_Descriptor()
-    : PanelDescriptor(
-        Color(),
-        "PokemonSV:GlobalSettings",
-        STRING_POKEMON + " SV", STRING_POKEMON + " Settings",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonSV/PokemonSettings.md",
-        "Global " + STRING_POKEMON + " Settings"
-    )
-{}
-
-
-
-GameSettingsPanel::GameSettingsPanel(const GameSettings_Descriptor& descriptor)
-    : SettingsPanelInstance(descriptor)
-    , settings(GameSettings::instance())
-{
-    PA_ADD_OPTION(settings);
-}
-
-
-
-
-
-}
-}
-}
-
-
-
-
-
-
diff --git a/SerialPrograms/Source/PokemonSV/PokemonSV_Settings.h b/SerialPrograms/Source/PokemonSV/PokemonSV_Settings.h
deleted file mode 100644
index 1542358871..0000000000
--- a/SerialPrograms/Source/PokemonSV/PokemonSV_Settings.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*  Pokemon SV Settings
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSV_Settings_H
-#define PokemonAutomation_PokemonSV_Settings_H
-
-#include "Common/Cpp/Options/StaticTextOption.h"
-#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
-#include "Common/Cpp/Options/FloatingPointOption.h"
-#include "Common/Cpp/Options/TimeExpressionOption.h"
-#include "CommonFramework/Panels/SettingsPanel.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-
-class GameSettings : public BatchOption{
-    GameSettings();
-public:
-    static GameSettings& instance();
-
-    SectionDividerOption m_menu_navigation;
-    TimeExpressionOption<uint16_t> GAME_TO_HOME_DELAY;
-
-    SectionDividerOption m_start_game_timings;
-    TimeExpressionOption<uint16_t> START_GAME_MASH;
-    TimeExpressionOption<uint16_t> START_GAME_WAIT;
-    TimeExpressionOption<uint16_t> ENTER_GAME_MASH;
-    TimeExpressionOption<uint16_t> ENTER_GAME_WAIT;
-
-    SectionDividerOption m_advanced_options;
-    TimeExpressionOption<uint16_t> RAID_SPAWN_DELAY;
-    FloatingPointOption SHINY_SOUND_THRESHOLD2;
-    FloatingPointOption SHINY_SOUND_LOW_FREQUENCY;
-    FloatingPointOption LETS_GO_KILL_SOUND_THRESHOLD;
-    FloatingPointOption LETS_GO_KILL_SOUND_LOW_FREQUENCY;
-};
-
-
-
-
-class GameSettings_Descriptor : public PanelDescriptor{
-public:
-    GameSettings_Descriptor();
-};
-
-
-class GameSettingsPanel : public SettingsPanelInstance{
-public:
-    GameSettingsPanel(const GameSettings_Descriptor& descriptor);
-private:
-    GameSettings& settings;
-};
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSV/Programs/Boxes/PokemonSV_BoxRoutines.cpp b/SerialPrograms/Source/PokemonSV/Programs/Boxes/PokemonSV_BoxRoutines.cpp
deleted file mode 100644
index 7ddc2dca87..0000000000
--- a/SerialPrograms/Source/PokemonSV/Programs/Boxes/PokemonSV_BoxRoutines.cpp
+++ /dev/null
@@ -1,537 +0,0 @@
-/*  Sandwich Routines
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <cmath>
-#include <algorithm>
-#include <sstream>
-#include "CommonFramework/Exceptions/OperationFailedException.h"
-#include "CommonFramework/ImageTools/ImageStats.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "CommonFramework/VideoPipeline/VideoOverlay.h"
-#include "CommonFramework/Tools/ErrorDumper.h"
-#include "CommonFramework/Tools/ProgramEnvironment.h"
-#include "CommonFramework/Notifications/ProgramInfo.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonSV/Inference/Boxes/PokemonSV_BoxDetection.h"
-#include "PokemonSV/Inference/Boxes/PokemonSV_IVCheckerReader.h"
-#include "PokemonSV_BoxRoutines.h"
-
-//#include <iostream>
-//using std::cout;
-//using std::endl;
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-
-bool change_view_to_stats_or_judge(
-    ConsoleHandle& console, BotBaseContext& context,
-    bool throw_exception
-){
-    ImageFloatBox name_bar(0.66, 0.08, 0.52, 0.04);
-    OverlayBoxScope name_bar_overlay(console.overlay(), name_bar);
-    for (size_t attempts = 0;; attempts++){
-        if (throw_exception){
-            if (attempts == 10){
-                throw OperationFailedException(
-                    ErrorReport::SEND_ERROR_REPORT, console,
-                    "Unable to change Pokemon view after 10 tries.",
-                    true
-                );
-            }
-        }else{
-            if (attempts == 3){
-                return false;
-            }
-        }
-
-        context.wait_for_all_requests();
-        VideoSnapshot screen = console.video().snapshot();
-        ImageStats stats = image_stats(extract_box_reference(screen, name_bar));
-//        cout << stats.stddev << endl;
-        if (stats.stddev.sum() > 50){
-            break;
-        }
-
-        console.log("Unable to detect stats menu. Attempting to correct.", COLOR_RED);
-
-//        //  Alternate one and two + presses. If IV checker is enabled, we should
-//        //  land on the IV checker. Otherwise, it will land us back to nothing.
-//        //  Then the next press will be a single which will put us on the stats
-//        //  with no IV checker.
-        pbf_press_button(context, BUTTON_PLUS, 20, 105);
-//        if (attempts % 2 == 0){
-//            pbf_press_button(context, BUTTON_PLUS, 20, 230);
-//        }
-    }
-    return true;
-}
-
-
-void change_view_to_judge(
-    ConsoleHandle& console, BotBaseContext& context,
-    Language language
-){
-    if (language == Language::None){
-        throw InternalProgramError(
-            &console.logger(), PA_CURRENT_FUNCTION,
-            "change_view_to_judge() called with no language."
-        );
-    }
-
-    ImageFloatBox name_bar(0.66, 0.08, 0.52, 0.04);
-    IVCheckerReaderScope iv_checker(console, language);
-    OverlayBoxScope name_bar_overlay(console.overlay(), name_bar);
-    for (size_t attempts = 0;; attempts++){
-        if (attempts == 5){
-            throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, console,
-                "Unable to change Pokemon view to judge after 10 tries. Have you unlocked it?",
-                true
-            );
-        }
-
-        context.wait_for_all_requests();
-        VideoSnapshot screen = console.video().snapshot();
-        ImageStats stats = image_stats(extract_box_reference(screen, name_bar));
-//        cout << stats.stddev << endl;
-
-        //  Check if we're even on a stats screen.
-        if (stats.stddev.sum() < 50){
-            console.log("Unable to detect stats menu. Attempting to correct.", COLOR_RED);
-            pbf_press_button(context, BUTTON_PLUS, 20, 105);
-            continue;
-        }
-
-        //  See if we're on the judge screen.
-        IVCheckerReader::Results ivs = iv_checker.read(console, screen);
-
-        size_t detected = 0;
-        if (ivs.hp      != IVCheckerValue::UnableToDetect) detected++;
-        if (ivs.attack  != IVCheckerValue::UnableToDetect) detected++;
-        if (ivs.defense != IVCheckerValue::UnableToDetect) detected++;
-        if (ivs.spatk   != IVCheckerValue::UnableToDetect) detected++;
-        if (ivs.spdef   != IVCheckerValue::UnableToDetect) detected++;
-        if (ivs.speed   != IVCheckerValue::UnableToDetect) detected++;
-
-        //  If less than 4 of the IVs are read, assume we're not on the judge screen.
-        if (detected < 4){
-            pbf_press_button(context, BUTTON_PLUS, 20, 230);
-        }
-
-        break;
-    }
-}
-
-
-
-// Moving to left/right box is blind sequence. To prevent game dropping button inputs,
-// press the button longer.
-void move_to_left_box(BotBaseContext& context){
-    pbf_press_button(context, BUTTON_L, 60, 100);
-}
-void move_to_right_box(BotBaseContext& context){
-    pbf_press_button(context, BUTTON_R, 60, 100);
-}
-
-namespace {
-
-// In box system, when using button Minus or button Y, it will enter a mode for box selection and holding pokemon.
-// The function detects the existence of button symbol in the bottom row of the screen to make
-// sure the mode is entered or left.
-// If `enter_mode` is true, the program will assume it is not in the mode, and enter the mode by calling
-// `button_operation()` repeatedly until the mode is observed.
-// If `enter_mode` is false, the program will assume it is in the mode, and leave the mode by calling
-// `button_operation()` repeatedly until it confirms to have left the mode.
-void change_held_mode(const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context,
-    std::function<void()> button_operation, bool enter_mode,
-    const char* time_out_error_name, const char* time_out_error_message)
-{
-    // First attempt to change mode
-    button_operation();
-
-    WallClock start = current_time();
-    while (true){
-        if (current_time() - start > std::chrono::seconds(60)){
-            dump_image_and_throw_recoverable_exception(
-                info, console, time_out_error_name, time_out_error_message
-            );
-        }
-        BoxSelectionBoxModeWatcher watcher;
-        context.wait_for_all_requests();
-        if (wait_until(console, context, std::chrono::seconds(10), {watcher}) == 0){
-            if (watcher.in_box_selection_mode() == enter_mode){
-                break;
-            }
-            // else: not in the desired mode
-            button_operation();
-            continue;
-        }
-        // Cannot detect box selection mode after 10 secs
-        dump_image_and_throw_recoverable_exception(
-            info, console, "NoStateBoxSelectionMode", "Cannot determine box selection mode for 10 seconds."
-        );
-    }
-}
-
-} // anonymous namesapce
-
-// Use box selection mode to hold one column of pokemon.
-// Use visual feedback to ensure button Minus is pressed to turn on box selection mode/
-// But no feedback on the button A press to make sure the selection is complete.
-void hold_one_column(const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context){
-    context.wait_for_all_requests();
-    console.log("Holding one column.");
-    // Press Minus to draw selection box
-    const bool to_enter_selection = true;
-    change_held_mode(
-        info, console, context,
-        [&context](){ pbf_press_button(context, BUTTON_MINUS, 50, 40); },
-        to_enter_selection,
-        "TimeoutHoldingColumn", "Failed to enter box selection mode after 1 minute of Button Minus pressing."
-    );
-
-    // Select rest of the pary
-    // Press down multiple times to make sure we select full party in case the game drops some presses
-    for(int i = 0; i < 15; i++){
-        pbf_press_dpad(context, DPAD_DOWN, 5, 3);
-    }
-    // Hold rest of the party
-    pbf_wait(context, 60);
-    // We cannot detect whether this Button A will be dropped or not.
-    // So we have to go blind here.
-    pbf_press_button(context, BUTTON_A, 50, 40);
-    context.wait_for_all_requests();
-}
-
-// Assuming already holding one or more pokemon, press A to drop them.
-void drop_held_pokemon(const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context){
-    context.wait_for_all_requests();
-    console.log("Drop held pokemon.");
-    const bool to_enter_selection = false;
-    change_held_mode(
-        info, console, context,
-        [&context](){ pbf_press_button(context, BUTTON_A, 60, 60); },
-        to_enter_selection,
-        "TimeoutDroppingPokemon", "Failed to drop pokemon after 1 minute of Button A pressing."
-    );
-}
-
-// Assuming already holding one or more pokemon, press B to cancel the holding.
-void cancel_held_pokemon(const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context){
-    context.wait_for_all_requests();
-    console.log("Cancel pokemon holding.");
-    const bool to_enter_selection = false;
-    change_held_mode(
-        info, console, context,
-        [&context](){ pbf_press_button(context, BUTTON_B, 60, 60); },
-        to_enter_selection,
-        "TimeoutCancellingHolding", "Failed to cancel holding pokemon after 1 minute of Button B pressing."
-    );
-}
-
-// Assuming the current slot is not empy, press button Y to hold the current pokemon
-void press_y_to_hold_pokemon(const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context){
-    context.wait_for_all_requests();
-    console.log("Press button Y to hold pokemon for swapping.");
-    const bool to_enter_selection = true;
-    change_held_mode(
-        info, console, context,
-        [&context](){ pbf_press_button(context, BUTTON_Y, 60, 60); },
-        to_enter_selection,
-        "TimeoutHoldingPokemonByButtonY", "Failed to hold a pokemon by button Y after 1 minute of trying."
-    );
-}
-
-
-void release_one_pokemon(
-    const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context,
-    size_t& errors
-){
-    errors = 0;
-
-    bool release_attempted = false;
-    bool release_completed = false;
-    int expected = 0;
-    WallClock start = current_time();
-    while (true){
-        if (current_time() - start > std::chrono::seconds(60)){
-            dump_image_and_throw_recoverable_exception(
-                info, console, "ReleaseFailed",
-                "Failed to release " + Pokemon::STRING_POKEMON + " after 1 minute."
-            );
-        }
-
-        SomethingInBoxSlotDetector exists(COLOR_BLUE);
-        BoxWatcher box_detector(COLOR_RED);
-        BoxSelectWatcher selected(COLOR_YELLOW, std::chrono::milliseconds(100));
-        PromptDialogWatcher confirm(COLOR_CYAN, std::chrono::milliseconds(100));
-        AdvanceDialogWatcher advance_dialog(COLOR_GREEN, std::chrono::milliseconds(250));
-
-        context.wait_for_all_requests();
-        int ret = wait_until(
-            console, context,
-            std::chrono::seconds(10),
-            {
-                box_detector,
-                selected,
-                confirm,
-                advance_dialog,
-            }
-        );
-        context.wait_for(std::chrono::milliseconds(50));
-        if (ret == 3){
-            //  Make sure we're not mistakening this for the other dialogs.
-            auto screenshot = console.video().snapshot();
-            if (selected.detect(screenshot)){
-                ret = 1;
-            }else if (confirm.detect(screenshot)){
-                ret = 2;
-            }
-        }
-
-        switch (ret){
-        case 0:{
-            if (ret == expected){
-                console.log("Detected box neutral.");
-            }else{
-                console.log("Detected box neutral. (unexpected)", COLOR_RED);
-                errors++;
-            }
-            auto screenshot = console.video().snapshot();
-            if (exists.detect(screenshot)){
-                if (release_attempted && release_completed){
-                    return;
-                }
-                release_attempted = false;
-                release_completed = false;
-                pbf_press_button(context, BUTTON_A, 20, 20);
-                expected = 1;
-                continue;
-            }else{
-                console.log("Slot is empty.");
-                return;
-            }
-        }
-        case 1:
-            if (ret == expected){
-                console.log("Detected selection. Releasing...");
-            }else{
-                console.log("Detected selection. Releasing... (unexpected)", COLOR_RED);
-                errors++;
-            }
-            pbf_press_dpad(context, DPAD_UP, 10, 10);
-            pbf_press_dpad(context, DPAD_UP, 10, 10);
-
-            //  Double up this A press since dropping it currently isn't recoverable.
-            pbf_press_button(context, BUTTON_A, 5, 3);
-            pbf_press_button(context, BUTTON_A, 5, 27);
-
-            expected = 2;
-            continue;
-        case 2:
-            if (ret == expected){
-                console.log("Detected release confirmation.");
-            }else{
-                console.log("Detected release confirmation. (unexpected)", COLOR_RED);
-                errors++;
-            }
-            pbf_press_dpad(context, DPAD_UP, 10, 10);
-            pbf_press_button(context, BUTTON_A, 20, 20);
-            release_attempted = true;
-            expected = 3;
-            continue;
-        case 3:
-            if (ret == expected){
-                console.log("Detected advance dialog.");
-            }else{
-                console.log("Detected advance dialog. (unexpected)", COLOR_RED);
-                errors++;
-            }
-            pbf_press_button(context, BUTTON_A, 20, 20);
-            release_completed = true;
-            expected = 0;
-            continue;
-        default:
-            dump_image_and_throw_recoverable_exception(
-                info, console, "NoStateReleasingPokemon", "No recognized state while releasing a pokemon after 10 seconds."
-            );
-        }
-    }
-}
-
-void release_box(
-    const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context,
-    size_t& errors, uint8_t start_row
-){
-    context.wait_for_all_requests();
-    console.log("Release one box.");
-    console.overlay().add_log("Release box", COLOR_WHITE);
-    for (uint8_t row = start_row; row < 5; row++){
-        for (uint8_t j_col = 0; j_col < 6; j_col++){
-            // Go through slots in a Z-shape pattern
-            uint8_t col = (row % 2 == 0 ? j_col : 5 - j_col);
-            move_box_cursor(info, console, context, BoxCursorLocation::SLOTS, row, col);
-            release_one_pokemon(info, console, context, errors);
-        }
-    }
-}
-
-uint8_t check_empty_slots_in_party(const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context){
-    context.wait_for_all_requests();
-    BoxEmptyPartyWatcher watcher;
-    int ret = wait_until(
-        console, context,
-        std::chrono::seconds(10),
-        {watcher}
-    );
-    if (ret < 0){
-        dump_image_and_throw_recoverable_exception(
-            info, console, "ReadSlotEmptinessFailed", "check_empty_slots_in_party(): Cannot read party emptiness in box system."
-        );
-    }
-
-    return watcher.num_empty_slots_found();
-}
-
-void load_one_column_to_party(
-    ProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context,
-    EventNotificationOption& notification,
-    uint8_t column_index, bool has_clone_ride_pokemon
-){
-    context.wait_for_all_requests();
-    console.log("Load column " + std::to_string(column_index) + " to party.");
-    console.overlay().add_log("Load column " + std::to_string(column_index+1), COLOR_WHITE);
-
-    size_t fail_count = 0;
-    while (true){
-        // Move cursor to the target column
-        move_box_cursor(env.program_info(), console, context, BoxCursorLocation::SLOTS, has_clone_ride_pokemon ? 1 : 0, column_index);
-        hold_one_column(env.program_info(), console, context);
-        try{
-            // Move the held column to party
-            move_box_cursor(env.program_info(), console, context, BoxCursorLocation::PARTY, has_clone_ride_pokemon ? 2 : 1, 0);
-        }catch (OperationFailedException& e){
-            e.send_notification(env, notification);
-
-            if (++fail_count == 10){
-                dump_image_and_throw_recoverable_exception(
-                    env.program_info(), console, "ConsecutiveColumnMoveFailure",
-                    "load_one_column_to_party(): consecutive failure of moving column around."
-                );
-            }
-            console.log("Failed to move column around. Cancelling box selection and try again.");
-            // Cannot move column to party. It could be that the game dropped the button A press that is expected to finish
-            // the column selection.
-            // We can press B to back out and try again.
-            cancel_held_pokemon(env.program_info(), console, context);
-            continue;
-        }
-        break;
-    }
-
-    // Drop the column to party
-    drop_held_pokemon(env.program_info(), console, context);
-
-    context.wait_for_all_requests();
-    console.log("Loaded column " + std::to_string(column_index) + " to party.");
-}
-
-void unload_one_column_from_party(
-    ProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context,
-    EventNotificationOption& notification,
-    uint8_t column_index, bool has_clone_ride_pokemon
-){
-    context.wait_for_all_requests();
-    console.log("Unload party to column " + std::to_string(column_index) + ".");
-    console.overlay().add_log("Unload to column " + std::to_string(column_index+1), COLOR_WHITE);
-
-    size_t fail_count = 0;
-    while (true){
-        // Move cursor to party column
-        move_box_cursor(env.program_info(), console, context, BoxCursorLocation::PARTY, has_clone_ride_pokemon ? 2 : 1, 0);
-        hold_one_column(env.program_info(), console, context);
-
-        try{
-            // Move the held column to target
-            move_box_cursor(env.program_info(), console, context, BoxCursorLocation::SLOTS, has_clone_ride_pokemon ? 1 : 0, column_index);
-        }catch (OperationFailedException& e){
-            e.send_notification(env, notification);
-
-            if (++fail_count == 10){
-                dump_image_and_throw_recoverable_exception(
-                    env.program_info(), console, "ConsecutiveColumnMoveFailure",
-                    "unload_one_column_from_party(): consecutive failure of moving column around."
-                );
-            }
-            console.log("Failed to move column around. Cancelling box selection and try again.");
-            // Cannot move column to party. It could be that the game dropped the button A press that is expected to finish
-            // the column selection.
-            // We can press B to back out and try again.
-            cancel_held_pokemon(env.program_info(), console, context);
-            continue;
-        }
-        break;
-    }
-    // Drop the column
-    drop_held_pokemon(env.program_info(), console, context);
-
-    context.wait_for_all_requests();
-    console.log("Unloaded party to column " + std::to_string(column_index) + ".");
-}
-
-void move_box_cursor(const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context,
-    const BoxCursorLocation& side, uint8_t row, uint8_t col)
-{
-    context.wait_for_all_requests();
-    console.log("Move cursor to " + BOX_LOCATION_STRING(side, row, col) + ".");
-    BoxDetector detector;
-    VideoOverlaySet overlay_set(console.overlay());
-    detector.make_overlays(overlay_set);
-    detector.move_cursor(info, console, context, side, row, col);
-    console.log("Cursor moved.");
-}
-
-void swap_two_box_slots(
-    const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context,
-    const BoxCursorLocation& source_side, uint8_t source_row, uint8_t source_col,
-    const BoxCursorLocation& target_side, uint8_t target_row, uint8_t target_col
-)
-{
-    context.wait_for_all_requests();
-    console.log("Swap two slots " + BOX_LOCATION_STRING(source_side, source_row, source_col)
-        + " and " + BOX_LOCATION_STRING(target_side, target_row, target_col) + ".");
-    console.overlay().add_log("Swap slots", COLOR_WHITE);
-
-    BoxDetector detector;
-    VideoOverlaySet overlay_set(console.overlay());
-    detector.make_overlays(overlay_set);
-
-    detector.move_cursor(info, console, context, source_side, source_row, source_col);
-
-    {
-        const bool stop_on_exists = true;
-        SomethingInBoxSlotWatcher exists(COLOR_BLUE, stop_on_exists);
-        if (wait_until(console, context, std::chrono::seconds(3), {exists}) < 0){
-            dump_image_and_throw_recoverable_exception(info, console, "EmptySourceSwap", "Swapping an empty slot.");
-        }
-    }
-
-    press_y_to_hold_pokemon(info, console, context);
-
-    detector.move_cursor(info, console, context, target_side, target_row, target_col);
-
-    drop_held_pokemon(info, console, context);
-
-    console.log("Swapped slots.");
-}
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSV/Programs/Boxes/PokemonSV_BoxRoutines.h b/SerialPrograms/Source/PokemonSV/Programs/Boxes/PokemonSV_BoxRoutines.h
deleted file mode 100644
index a96507a8b0..0000000000
--- a/SerialPrograms/Source/PokemonSV/Programs/Boxes/PokemonSV_BoxRoutines.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*  Box Routines
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- *  Various functions to operate in box system, like release pokemon.
- */
-
-#ifndef PokemonAutomation_PokemonSV_BoxRoutines_H
-#define PokemonAutomation_PokemonSV_BoxRoutines_H
-
-#include <stdint.h>
-#include "CommonFramework/Language.h"
-
-namespace PokemonAutomation{
-    
-    struct ProgramInfo;
-    class ProgramEnvironment;
-    class EventNotificationOption;
-    class ConsoleHandle;
-    class BotBaseContext;
-
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-enum class BoxCursorLocation;
-
-//  Assuming the current slot in box system is a pokemon, not egg or empty space,
-//  try to change the view to the judge. However, it may land on the stats instead.
-//  If it can't land on either stats or judge and `throw_exception` is true, it will throw an exception.
-//  Return true if it successfully changed view to judge (or stats if judege is not found)
-bool change_view_to_stats_or_judge(
-    ConsoleHandle& console, BotBaseContext& context,
-    bool throw_exception = true
-);
-
-
-//  Assuming the current slot in box system is a pokemon, not egg or empty space,
-//  change the view to the judge. If it fails, it will throw OperationFailedException.
-void change_view_to_judge(
-    ConsoleHandle& console, BotBaseContext& context,
-    Language language
-);
-
-
-//  Press button L to move to the box on the left
-void move_to_left_box(BotBaseContext& context);
-
-//  Press button R to move to the box on the right
-void move_to_right_box(BotBaseContext& context);
-
-//  Assuming the current slot in box system is not an egg
-//  release current selected pokemon in the box system.
-//  It will do nothing if the current slot is empty. 
-//  Throws OperationFailedException, if it got stuck or timed out.
-//  The # of errors are stored into "errors". These are usually dropped button
-//  presses that the function recovered from.
-void release_one_pokemon(
-    const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context,
-    size_t& errors
-);
-
-//  Release a box of pokemon. Can have empty spots or eggs. Eggs are not released.
-//  Throws OperationFailedException, if it got stuck or timed out.
-//  The # of errors are stored into "errors". These are usually dropped button
-//  presses that the function recovered from.
-void release_box(
-    const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context,
-    size_t& errors,
-    uint8_t start_row = 0   //  Start from this row. (skip te first "start_row" rows)
-);
-
-//  In box system, check how many slots in the party are empty
-uint8_t check_empty_slots_in_party(const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context);
-
-//  In box system, assuming the party is empty, load one column in the current box onto party.
-//  if has_clone_ride_pokemon is true, skip loading the first row of the box.
-void load_one_column_to_party(
-    ProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context,
-    EventNotificationOption& notification,
-    uint8_t column_index, bool has_clone_ride_pokemon
-);
-
-//  In box system, assuming the target column is empty, unload party (after the lead) to the target column.
-//  if has_clone_ride_pokemon is true, skip unloading the second row of the party.
-void unload_one_column_from_party(
-    ProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context,
-    EventNotificationOption& notification,
-    uint8_t column_index, bool has_clone_ride_pokemon
-);
-
-//  In box system, move the cursor to the desired slot.
-void move_box_cursor(const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context,
-    const BoxCursorLocation& side, uint8_t row, uint8_t col);
-
-//  In box system, use button Y to swap two slots.
-//  The source slot must not be empty, while the target slot can be empty.
-void swap_two_box_slots(
-    const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context,
-    const BoxCursorLocation& source_side, uint8_t source_row, uint8_t source_col,
-    const BoxCursorLocation& target_side, uint8_t target_row, uint8_t target_col
-);
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSV/Programs/Eggs/PokemonSV_EggAutonomous.cpp b/SerialPrograms/Source/PokemonSV/Programs/Eggs/PokemonSV_EggAutonomous.cpp
deleted file mode 100644
index 96952008ee..0000000000
--- a/SerialPrograms/Source/PokemonSV/Programs/Eggs/PokemonSV_EggAutonomous.cpp
+++ /dev/null
@@ -1,734 +0,0 @@
-/*  Egg Autonomous
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <cmath>
-#include "CommonFramework/GlobalSettingsPanel.h"
-#include "CommonFramework/Exceptions/ProgramFinishedException.h"
-#include "CommonFramework/Exceptions/FatalProgramException.h"
-#include "CommonFramework/Exceptions/OperationFailedException.h"
-#include "CommonFramework/Notifications/ProgramNotifications.h"
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "CommonFramework/Tools/StatsTracking.h"
-#include "CommonFramework/Tools/VideoResolutionCheck.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "Pokemon/Pokemon_Notification.h"
-#include "PokemonSV/Inference/Boxes/PokemonSV_BoxEggDetector.h"
-#include "PokemonSV/Inference/Boxes/PokemonSV_IVCheckerReader.h"
-#include "PokemonSV/PokemonSV_Settings.h"
-#include "PokemonSV/Programs/Boxes/PokemonSV_BoxRoutines.h"
-#include "PokemonSV/Programs/PokemonSV_SaveGame.h"
-#include "PokemonSV/Programs/PokemonSV_GameEntry.h"
-#include "PokemonSV/Programs/PokemonSV_Navigation.h"
-#include "PokemonSV/Programs/Eggs/PokemonSV_EggRoutines.h"
-#include "PokemonSV/Programs/Sandwiches/PokemonSV_SandwichRoutines.h"
-#include "PokemonSV_EggAutonomous.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-using namespace Pokemon;
-
-
-EggAutonomous_Descriptor::EggAutonomous_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonSV:EggAutonomous",
-        STRING_POKEMON + " SV", "Egg Autonomous",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonSV/EggAutonomous.md",
-        "Automatically get meal power, fetch eggs from a picnic and hatch them.",
-        FeedbackType::REQUIRED,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-struct EggAutonomous_Descriptor::Stats : public StatsTracker{
-    Stats()
-        : m_sandwiches(m_stats["Sandwiches"])
-        , m_fetch_attempts(m_stats["Fetch Attempts"])
-        , m_eggs(m_stats["Eggs"])
-        , m_hatched(m_stats["Hatched"])
-        , m_shinies(m_stats["Shinies"])
-        , m_kept(m_stats["Kept"])
-        , m_errors(m_stats["Errors"])
-    {
-        m_display_order.emplace_back("Sandwiches");
-        m_display_order.emplace_back("Fetch Attempts");
-        m_display_order.emplace_back("Eggs");
-        m_display_order.emplace_back("Hatched");
-        m_display_order.emplace_back("Shinies");
-        m_display_order.emplace_back("Kept");
-        m_display_order.emplace_back("Errors", true);
-
-        m_aliases.emplace(STRING_POKEMON + " Kept", "Kept");
-    }
-
-    std::atomic<uint64_t>& m_sandwiches;
-    std::atomic<uint64_t>& m_fetch_attempts;
-    std::atomic<uint64_t>& m_eggs;
-    std::atomic<uint64_t>& m_hatched;
-    std::atomic<uint64_t>& m_shinies;
-    std::atomic<uint64_t>& m_kept;
-    std::atomic<uint64_t>& m_errors;
-};
-std::unique_ptr<StatsTracker> EggAutonomous_Descriptor::make_stats() const{
-    return std::unique_ptr<StatsTracker>(new Stats());
-}
-
-
-
-EggAutonomous::EggAutonomous()
-    : GO_HOME_WHEN_DONE(false)
-    , LANGUAGE(
-        "<b>Game Language:</b><br>Required to read IVs.",
-        IV_READER().languages(),
-        LockWhileRunning::LOCKED,
-        false
-    )
-    , MAX_KEEPERS(
-        "<b>Max Keepers:</b><br>Stop the program after keeping this many " + STRING_POKEMON + ". "
-        "The program will put them into a box neighboring the current box.",
-        LockWhileRunning::UNLOCKED,
-        10, 1, 30
-    )
-    , AUTO_SAVING(
-        "<b>Auto-Saving:</b><br>Automatically save the game to recover from crashes and allow eggs to be unhatched.<br>" +
-        make_text_url(
-            ONLINE_DOC_URL + "ComputerControl/blob/master/Wiki/Programs/PokemonSV/EggAutonomous.md#auto-saving-mode",
-            "See the wiki for the full explanations of each mode."
-        ),
-        {
-            {AutoSave::NoAutoSave, "none", "No auto-saving."},
-            {AutoSave::AfterStartAndKeep, "start-and-keep", "Save at beginning and after keeping a baby."},
-            {AutoSave::EveryBatch, "every-batch", "Save before every batch of 4 or 5 eggs."},
-        },
-        LockWhileRunning::LOCKED,
-        AutoSave::AfterStartAndKeep
-    )
-    , HAS_CLONE_RIDE_POKEMON(
-        "<b>Cloned Ride Legendary 2nd in Party:</b><br>"
-        "Ride legendary cannot be cloned after patch 1.0.1. To preserve the existing clone while hatching eggs, "
-        "place it as second in party before starting the program.</b>"
-        "The program will skip the first row of the current box when storing and hatching eggs, so you will need "
-        "to fill the first row with " + STRING_POKEMON + " before running this program.",
-        LockWhileRunning::LOCKED,
-        false)
-    , KEEP_BOX_LOCATION(
-        "<b>Location of the Keep Box:</b><br>Which box to keep the shiny " + STRING_POKEMON + " and others that match the filters.",
-        {
-            {0, "left", "Left Box"},
-            {1, "right", "Right Box"},
-        },
-        LockWhileRunning::UNLOCKED,
-        1
-    )
-    , SAVE_DEBUG_VIDEO(
-        "<b>Save debug videos to Switch:</b><br>"
-        "Set this on to save a Switch video everytime an error occurs. You can send the video to developers to help them debug later.",
-        LockWhileRunning::LOCKED,
-        false
-    )
-    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
-    , NOTIFICATION_NONSHINY_KEEP(
-        "Non-Shiny Keep",
-        true, true, ImageAttachmentMode::JPG,
-        {"Notifs"}
-    )
-    , NOTIFICATION_SHINY(
-        "Shiny Hatch",
-        true, true, ImageAttachmentMode::JPG,
-        {"Notifs", "Showcase"}
-    )
-    , m_notification_noop("", false, false)
-    , NOTIFICATIONS({
-        &NOTIFICATION_STATUS_UPDATE,
-        &NOTIFICATION_NONSHINY_KEEP,
-        &NOTIFICATION_SHINY,
-        &NOTIFICATION_PROGRAM_FINISH,
-        &NOTIFICATION_ERROR_RECOVERABLE,
-        &NOTIFICATION_ERROR_FATAL,
-    })
-{
-    if (PreloadSettings::instance().DEVELOPER_MODE){
-        PA_ADD_OPTION(SAVE_DEBUG_VIDEO);
-    }
-    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
-    PA_ADD_OPTION(LANGUAGE);
-    PA_ADD_OPTION(EGG_SANDWICH);
-    PA_ADD_OPTION(MAX_KEEPERS);
-    PA_ADD_OPTION(AUTO_SAVING);
-    PA_ADD_OPTION(KEEP_BOX_LOCATION);
-    PA_ADD_OPTION(FILTERS);
-    PA_ADD_OPTION(HAS_CLONE_RIDE_POKEMON);
-
-    PA_ADD_OPTION(NOTIFICATIONS);
-}
-
-
-void EggAutonomous::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    assert_16_9_720p_min(env.logger(), env.console);
-
-    //  Connect the controller.
-    pbf_press_button(context, BUTTON_LCLICK, 10, 0);
-
-    {
-        // reset_position_to_flying_spot(env, context);
-        // picnic_party_to_hatch_party(env, context);
-        // hatch_eggs_full_routine(env, context, -1);
-
-        // enter_box_system_from_overworld(env.program_info(), env.console, context);
-        // for(int i = 0; i < 5; i++){
-        //     process_one_baby(env, context, i, 5);
-        // }
-
-        // eat_egg_sandwich_at_picnic(env.program_info(), env.realtime_dispatcher(), env.console, context,
-        //     EGG_SANDWICH_TYPE, SWEET_HERB_INDEX_BACKWARDS.current_value());
-        // return;
-    }
-
-    if (AUTO_SAVING != AutoSave::NoAutoSave){
-        save_game(env, context, true);
-    }
-
-    const size_t max_num_sandwiches = EGG_SANDWICH.MAX_NUM_SANDWICHES;
-    m_num_sandwich_spent = 0;
-    m_num_kept = 0;
-    size_t consecutive_failures = 0;
-    while(true){
-        m_saved_after_fetched_eggs = false;
-        m_in_critical_to_save_stage = false;
-
-        // Do one iteration of the outmost loop of egg auto:
-        // - Start at Aera Zero flying spot
-        // - Go to front area of the observation station to start picnic
-        // - Make sandwich to gain egg power
-        // - Go to picnic basket to fetch eggs
-        // - Go on ride to hatch eggs
-
-        env.update_stats();
-        send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
-
-        // Recoverable loop to fetch eggs:
-        int num_party_eggs = -1;
-        while(true){
-            try{
-                num_party_eggs = fetch_eggs_full_routine(env, context);
-                break;
-            }catch (OperationFailedException& e){
-                handle_recoverable_error(env, context, NOTIFICATION_ERROR_RECOVERABLE, e, consecutive_failures);
-            } // end try catch
-        } // end recoverable loop to fetch eggs:
-
-        // Recoverable loop to hatch eggs
-        bool game_already_resetted = false;
-        while(true){
-            try{
-                hatch_eggs_full_routine(env, context, num_party_eggs);
-                consecutive_failures = 0;
-                break;
-            }catch (OperationFailedException& e){
-                handle_recoverable_error(env, context, NOTIFICATION_ERROR_RECOVERABLE, e, consecutive_failures);
-                // After resetting the game, we don't know how many eggs in party
-                num_party_eggs = -1;
-
-                // If there is no save during egg hatching, then the game is reset to before fetching eggs
-                // So we need to break out of the recoverable hatch egg routine loop
-                if (m_saved_after_fetched_eggs == false){
-                    env.log("No save during egg hatching routine. After this reset, we should start the egg fetching routine now.");
-                    game_already_resetted = true;
-                    break;
-                }
-            }catch (ProgramFinishedException&){
-                env.update_stats();
-                GO_HOME_WHEN_DONE.run_end_of_program(context);
-                send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
-                return;
-            } // end try catch
-        } // end recoverable loop to hatch eggs
-
-        // If the program can't save-reload, then we cannot reload spent sandwich ingredients
-        if (AUTO_SAVING == AutoSave::NoAutoSave){
-            m_num_sandwich_spent++;
-        } else if (m_saved_after_fetched_eggs){
-            env.log("Game already saved during egg hatching routine, so we cannot reset game to reset sandwich.");
-            // If we save after fetching eggs, then the save solidifies spent sandwich ingredients.
-            m_num_sandwich_spent++;
-
-            env.log("Saving game here so that we can reset sandwich later");
-            save_game(env, context, true);
-        } else if (game_already_resetted == false){
-            // Nothing found in this iteration
-            env.log("Resetting game since nothing found, saving sandwich ingredients.");
-            reset_game(env, context, "reset to start new meal");
-        } else { // game_already_resetted == true
-            env.log("Game resetted back to egg fetching routine.");
-        }
-
-        if (m_num_sandwich_spent >= max_num_sandwiches){
-            env.console.overlay().add_log("Max sandwich count: " + std::to_string(max_num_sandwiches), COLOR_PURPLE);
-            env.log("Max num sandwiches reached: " + std::to_string(max_num_sandwiches), COLOR_PURPLE);
-            break;
-        }
-        // end of one full picnic->hatch iteration
-    } // end the full egg autonomous loop
-
-    env.update_stats();
-    GO_HOME_WHEN_DONE.run_end_of_program(context);
-    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
-}
-
-// start at Area Zero flying spot, start picnic, make sandwich, then fetch eggs at basket.
-int EggAutonomous::fetch_eggs_full_routine(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    auto& stats = env.current_stats<EggAutonomous_Descriptor::Stats>();
-
-    picnic_at_zero_gate(env.program_info(), env.console, context);
-    // Now we are at picnic. We are at one end of picnic table while the egg basket is at the other end
-    bool can_make_sandwich = eat_egg_sandwich_at_picnic(env.program_info(), env.realtime_dispatcher(), env.console, context,
-        EGG_SANDWICH.EGG_SANDWICH_TYPE, LANGUAGE);
-    if (can_make_sandwich == false){
-        throw UserSetupError(env.console, "No sandwich recipe or ingredients. Cannot open and select the sandwich recipe.");
-    }
-    env.current_stats<EggAutonomous_Descriptor::Stats>().m_sandwiches++;
-    env.update_stats();
-
-    // move past the table and collect eggs
-    auto basket_check_callback = [&](size_t new_eggs){
-        stats.m_fetch_attempts++;
-        stats.m_eggs += new_eggs;
-        env.update_stats();
-    };
-
-    const size_t max_eggs = HAS_CLONE_RIDE_POKEMON ? 24 : 30;
-    size_t num_eggs_collected = 0;
-    const size_t basket_wait_seconds = (EGG_SANDWICH.EGG_SANDWICH_TYPE == EggSandwichType::GREAT_PEANUT_BUTTER ? 180 : 120);
-    collect_eggs_after_sandwich(env.program_info(), env.console, context, basket_wait_seconds, max_eggs,
-        num_eggs_collected, basket_check_callback);
-
-    leave_picnic(env.program_info(), env.console, context);
-
-    // Reset position to flying spot:
-    reset_position_to_flying_spot(env, context);
-
-    return picnic_party_to_hatch_party(env, context);
-}
-
-// The routine to hatch a box of eggs after fetching.
-// When there is an error during hatching, it will throw an OperationFailedException.
-// The outmost program loop should catch this exception and recall this function to achieve error recovery, if needed.
-// When immediately called after fetching routine finishes, assumes the party is already loaded with the first column of
-// eggs and the number of eggs is provided by `num_eggs_in_party`.
-// When called after an error recovery, assumes the party is loaded with some unknown number of eggs, and `num_eggs_in_party` is -1.
-void EggAutonomous::hatch_eggs_full_routine(SingleSwitchProgramEnvironment& env, BotBaseContext& context, int num_eggs_in_party){
-    auto& stats = env.current_stats<EggAutonomous_Descriptor::Stats>();
-
-    // index of the egg column in box to be loaded next, 0-indexed
-    // starting at 1 because when hatch_eggs_full_routine() is called, the first column is already loaded to the party
-    uint8_t next_egg_column = 1;
-
-    // Find the next egg column in the current box.
-    // Note: the box columns can be:
-    // - empty. This is due to the column loaded to party, or released in the case of AutoSaving != AfterStartAndKeep.
-    // - egg column.
-    // - hatched pokemon. This only happens in the case of AutoSaving == AfterStartAndKeep.
-    // To handle all AutoSaving cases, we cannot only use `SomethingInBoxSlotDetector` to find the column, but also need
-    // `BoxCurrentEggDetector`. 
-    // This function is called in two cases:
-    // 1. When we recover from error and don't know which column is the next egg column.
-    //    In this case, `change_stats_view_to_judge()` is called as part of the error recovery code before this function,
-    //    so that `BoxCurrentEggDetector` in this function can function correctly to find that the egg column.
-    // 2. When we finish processing one hatched party and want to load the next egg column.
-    //    In this case, `next_egg_column` already point to the next possible column, that cannot be hatched pokemon.
-    //    So we don't need to call egg detector and don't need to worry about setting box views.
-    auto go_to_next_egg_column = [&](bool check_eggs = false){
-        SomethingInBoxSlotDetector sth_in_box_detector(COLOR_RED);
-        BoxCurrentEggDetector egg_detector;
-        for (; next_egg_column < 6; next_egg_column++){
-            move_box_cursor(env.program_info(), env.console, context, BoxCursorLocation::SLOTS, HAS_CLONE_RIDE_POKEMON ? 1 : 0, next_egg_column);
-            context.wait_for_all_requests();
-            auto snapshot = env.console.video().snapshot();
-            // If there is an egg in slot row 0 (or 1 if using clone ride pokemon), col `col`,
-            if (sth_in_box_detector.detect(snapshot) && (!check_eggs || egg_detector.detect(snapshot))){
-                env.log("Found next column of eggs at col " + std::to_string(next_egg_column) + ".");
-                break;
-            }
-        }
-    };
-
-    if (num_eggs_in_party < 0){
-        // detect how many eggs in party
-        enter_box_system_from_overworld(env.program_info(), env.console, context);
-
-        context.wait_for(std::chrono::milliseconds(400)); // wait until box UI is loaded
-
-        // Move box cursor to party lead
-        move_box_cursor(env.program_info(), env.console, context, BoxCursorLocation::PARTY, 0, 0);
-
-        // Change box view to judge or stats
-        Language language = LANGUAGE;
-        if (language == Language::None){
-            change_view_to_stats_or_judge(env.console, context);
-        }else{
-            change_view_to_judge(env.console, context, language);
-        }
-
-        const uint8_t expected_non_eggs_count_in_party = HAS_CLONE_RIDE_POKEMON ? 1 : 0;
-        num_eggs_in_party = check_non_eggs_count_in_party(env.program_info(), env.console, context, expected_non_eggs_count_in_party);
-        env.log("Read " + std::to_string(num_eggs_in_party) + " eggs.");
-        env.console.overlay().add_log("Party eggs: " + std::to_string(num_eggs_in_party), COLOR_WHITE);
-
-        // Also detect what's the next egg column
-        context.wait_for(std::chrono::seconds(2)); // wait until box UI is definitely loaded
-        env.log("Checking next egg column.");
-        go_to_next_egg_column(true);
-
-        leave_box_system_to_overworld(env.program_info(), env.console, context);
-    }
-
-    auto save_game_if_needed = [&](){
-        if (AUTO_SAVING == AutoSave::EveryBatch || (AUTO_SAVING == AutoSave::AfterStartAndKeep && m_in_critical_to_save_stage)){
-            env.log("Saving game during egg hatching routine.");
-            save_game(env, context, true);
-            m_saved_after_fetched_eggs = true;
-            m_in_critical_to_save_stage = false;
-        }
-    };
-
-    // The loop to hatch batches of eggs.
-    // Each batch consists of at most five eggs.
-    // There are at most six batches of eggs in a box.
-    while(true){
-        save_game_if_needed();
-
-        auto hatched_callback = [&](uint8_t){
-            stats.m_hatched++;
-            env.update_stats();
-        };
-        hatch_eggs_at_zero_gate(env.program_info(), env.console, context, (uint8_t)num_eggs_in_party, hatched_callback);
-        reset_position_to_flying_spot(env, context);
-
-        enter_box_system_from_overworld(env.program_info(), env.console, context);
-        
-        // Check each hatched baby whether they will be kept.
-        // If yes, move them to the keep box.
-        // Otherwise, release them or move them into box in case we will reset game later.
-        for(int i = 0; i < num_eggs_in_party; i++){
-            process_one_baby(env, context, i, num_eggs_in_party);
-        }
-
-        // If the auto save mode is AfterStartAndKeep, which allows resetting the game in case no eggs in the box are kept,
-        // then we can save the time of releasing hatched pokemon in case we will reset the game later.
-        // So here we place the hatched pokemon back to the box
-        if (AUTO_SAVING == AutoSave::AfterStartAndKeep){
-            // move party back into the box
-            env.log("Unload party in case we will reset game later to save releasing time.");
-            unload_one_column_from_party(env, env.console, context, NOTIFICATION_ERROR_RECOVERABLE, next_egg_column-1, HAS_CLONE_RIDE_POKEMON);
-        }
-
-        // Get the next egg column
-        go_to_next_egg_column();
-
-        if (next_egg_column < 6){
-            load_one_column_to_party(env, env.console, context, NOTIFICATION_ERROR_RECOVERABLE, next_egg_column, HAS_CLONE_RIDE_POKEMON);
-            // Move cursor to party lead so that we can examine rest of party to detect eggs.
-            move_box_cursor(env.program_info(), env.console, context, BoxCursorLocation::PARTY, 0, 0);
-
-            uint8_t expected_non_eggs_count_in_party = HAS_CLONE_RIDE_POKEMON ? 1 : 0;
-            num_eggs_in_party = check_non_eggs_count_in_party(env.program_info(), env.console, context, expected_non_eggs_count_in_party);
-        } else {
-            // no more eggs to hatch in box
-
-            if (AUTO_SAVING == AutoSave::AfterStartAndKeep){
-                // Check if we will reset game:
-                // We reset game if the auto save mode is AfterStartAndKeep and we have no pokemon kept during hatching this box
-                // m_in_critical_to_save_stage: whether we need to save the game for the current batch of eggs
-                // m_saved_after_fetched_eggs: whether we have saved the game already for a past batch of eggs in this box
-                if (m_in_critical_to_save_stage == false && m_saved_after_fetched_eggs == false){
-                    // Yes, we will reset game
-                    // So exit this loop early here
-                    env.log("Early exit of egg hatching routine to reset game.");
-                    return;
-                }
-
-                // release the hatched pokemon in box
-                size_t local_errors = 0;
-                release_box(
-                    env.program_info(), env.console, context, local_errors,
-                    HAS_CLONE_RIDE_POKEMON ? 1 : 0
-                );
-            }
-
-            // change to fetching mode:
-            env.log("Replace party with picnic team");
-            env.console.overlay().add_log("Change to picnic pokemon", COLOR_WHITE);
-
-            // Move to left box
-            move_to_left_box(context);
-
-            // Swap the party lead, the flame body pokemon with the stored first fetching pokemon
-            swap_two_box_slots(env.program_info(), env.console, context,
-                BoxCursorLocation::PARTY, 0, 0,
-                BoxCursorLocation::SLOTS, 0, 0);
-
-            // Load rest of the fetching pokemon to party
-            load_one_column_to_party(env, env.console, context, NOTIFICATION_ERROR_RECOVERABLE, 1, HAS_CLONE_RIDE_POKEMON);
-
-            // Move back to middle box
-            move_to_right_box(context);
-        }
-
-        leave_box_system_to_overworld(env.program_info(), env.console, context);
-
-        if (next_egg_column == 6){ // no more eggs to hatch
-            break; // break egg batch loop. This is the only place to break out of the loop
-        }
-        next_egg_column++;
-    } // end egg batch loop
-
-    save_game_if_needed();
-}
-
-// While in box system and the current box is egg box, process one baby pokemon in party
-// Return true if the program finds a pokemon to keep
-void EggAutonomous::process_one_baby(SingleSwitchProgramEnvironment& env, BotBaseContext& context, int egg_index, int num_eggs_in_party){
-    auto& stats = env.current_stats<EggAutonomous_Descriptor::Stats>();
-
-    // Check each pokemon from bottom to top. In this way we can reliably detect end of releasing the pokemon.
-    const int party_row = num_eggs_in_party - egg_index + (HAS_CLONE_RIDE_POKEMON ? 1 : 0);
-    context.wait_for_all_requests();
-    move_box_cursor(env.program_info(), env.console, context, BoxCursorLocation::PARTY, party_row, 0);
-
-    env.log("Check hatched pokemon at party slot " + std::to_string(party_row));
-
-    bool found_shiny = false;
-    EggHatchAction action = EggHatchAction::Release;
-    if (check_baby_info(env.program_info(), env.console, context, LANGUAGE, FILTERS, action)){
-        found_shiny = true;
-        env.console.log("Shiny found!");
-        env.console.overlay().add_log("Shiny " + std::to_string(egg_index+1) + "/" + std::to_string(num_eggs_in_party), COLOR_GREEN);
-        stats.m_shinies++;
-        env.update_stats();
-        send_encounter_notification(
-            env,
-            m_notification_noop,
-            NOTIFICATION_SHINY,
-            false, true, {{{}, ShinyType::UNKNOWN_SHINY}}, std::nan(""),
-            env.console.video().snapshot()
-        );
-    }else{
-        env.console.overlay().add_log("Not shiny " + std::to_string(egg_index+1) + "/" + std::to_string(num_eggs_in_party), COLOR_WHITE);
-    }
-
-    auto send_keep_notification = [&](){
-        if (!found_shiny){
-            send_encounter_notification(
-                env,
-                NOTIFICATION_NONSHINY_KEEP,
-                NOTIFICATION_SHINY,
-                false, false, {}, std::nan(""),
-                env.console.video().snapshot()
-            );
-        }
-    };
-
-    switch (action){
-        case EggHatchAction::StopProgram:
-            env.log("Program stop requested...");
-            env.console.overlay().add_log("Request program stop", COLOR_WHITE);
-            send_keep_notification();
-            throw ProgramFinishedException();
-        case EggHatchAction::Keep:
-            m_in_critical_to_save_stage = true;
-            env.log("Moving Pokemon to keep box...", COLOR_BLUE);
-            stats.m_kept++;
-            env.update_stats();
-            m_num_kept++;
-            env.console.overlay().add_log("Keep pokemon " + std::to_string(m_num_kept) + "/" + std::to_string(MAX_KEEPERS), COLOR_YELLOW);
-            send_keep_notification();
-
-            if (move_pokemon_to_keep(env, context, party_row) == false) {
-                env.log("No empty slot availble to place new pokemon.");
-                env.console.overlay().add_log("No box space", COLOR_RED);
-                throw ProgramFinishedException();
-            }
-
-            if (m_num_kept >= MAX_KEEPERS){
-                env.log("Max keepers reached. Stopping program...");
-                env.console.overlay().add_log("Max Keepers reached", COLOR_WHITE);
-                throw ProgramFinishedException();
-            }
-            break;
-
-        case EggHatchAction::Release:
-        default:
-            // If the auto save mode is AfterStartAndKeep, which allows resetting the game in case no eggs in the box are kept,
-            // then we can save the time of releasing hatched pokemon in case we will reset the game later.
-            // Otherwise, release the pokemon now.
-            if (AUTO_SAVING != AutoSave::AfterStartAndKeep){
-                size_t local_errors = 0;
-                release_one_pokemon(env.program_info(), env.console, context, local_errors);
-            }
-            break;
-    } // end switch EggHatchAction
-}
-
-// From the egg box, move to the kept box, drop the pokemon to an empty spot in the box, move back to the egg box.
-// Return false if it does not find an empty spot.
-bool EggAutonomous::move_pokemon_to_keep(SingleSwitchProgramEnvironment& env, BotBaseContext& context, uint8_t pokemon_row_in_party){
-    SomethingInBoxSlotDetector sth_in_box_detector(COLOR_RED);
-    const size_t keep_box_location = KEEP_BOX_LOCATION.current_value();
-    if (keep_box_location == 0){
-        move_to_left_box(context);
-    } else {
-        move_to_right_box(context);
-    }
-    
-    context.wait_for_all_requests();
-
-    const uint8_t col_start = (keep_box_location == 0 ? 2 : 0);
-    for (uint8_t row = 0; row < 5; row++){
-        for (uint8_t col = col_start; col < 6; col++){
-            move_box_cursor(env.program_info(), env.console, context, BoxCursorLocation::SLOTS, row, col);
-            context.wait_for_all_requests();
-            // If no pokemon in the slot:
-            if (!sth_in_box_detector.detect(env.console.video().snapshot())){
-
-                // Move the to-keep pokemon in party to the empty slot.
-                swap_two_box_slots(env.program_info(), env.console, context,
-                    BoxCursorLocation::PARTY, pokemon_row_in_party, 0,
-                    BoxCursorLocation::SLOTS, row, col);
-
-                // Move back to middle box
-                if (keep_box_location == 0){
-                    move_to_right_box(context);
-                } else {
-                    move_to_left_box(context);
-                }
-                context.wait_for_all_requests();
-                return true;
-            }
-        }
-    }
-    return false;
-}
-
-void EggAutonomous::reset_position_to_flying_spot(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    // Use map to fly back to the flying spot
-    open_map_from_overworld(env.program_info(), env.console, context);
-    pbf_move_left_joystick(context, 128, 160, 20, 50);
-    fly_to_overworld_from_map(env.program_info(), env.console, context);
-}
-
-// From overworld, change pokemon party from the one used for getting eggs, to the one used for hatching
-// The new party will be one flame body pokemon as lead, and some eggs.
-// Function returns how many eggs are in the party
-int EggAutonomous::picnic_party_to_hatch_party(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    env.console.overlay().add_log("Change to hatching", COLOR_WHITE);
-    // change pokemon party from used for fetching eggs in picnic, to hatching on your ride.
-
-    enter_box_system_from_overworld(env.program_info(), env.console, context);
-
-    // Move to left box
-    move_to_left_box(context);
-
-    // Swap the stored the flame body pokemon with the stored first fetching pokemon
-    swap_two_box_slots(env.program_info(), env.console, context,
-        BoxCursorLocation::SLOTS, 0, 0,
-        BoxCursorLocation::PARTY, 0, 0);
-
-    // Unload rest of party to the 2nd column (col 1) in box
-    unload_one_column_from_party(env, env.console, context, NOTIFICATION_ERROR_RECOVERABLE, 1, HAS_CLONE_RIDE_POKEMON);
-
-    // Move to middle box
-    move_to_right_box(context);
-
-    // Load first egg column to party
-    load_one_column_to_party(env, env.console, context, NOTIFICATION_ERROR_RECOVERABLE, 0, HAS_CLONE_RIDE_POKEMON);
-    // Move cursor to party lead so that we can examine rest of party to detect eggs.
-    move_box_cursor(env.program_info(), env.console, context, BoxCursorLocation::PARTY, 0, 0);
-
-    uint8_t expected_non_eggs_count_in_party = HAS_CLONE_RIDE_POKEMON ? 1 : 0;
-    const uint8_t num_eggs_in_party = check_non_eggs_count_in_party(env.program_info(), env.console, context, expected_non_eggs_count_in_party);
-
-    leave_box_system_to_overworld(env.program_info(), env.console, context);
-
-    return num_eggs_in_party;
-}
-
-
-void EggAutonomous::save_game(SingleSwitchProgramEnvironment& env, BotBaseContext& context, bool from_overworld){
-    try{
-        if (from_overworld){
-            save_game_from_overworld(env.program_info(), env.console, context);
-        } else{
-            save_game_from_menu(env.program_info(), env.console, context);
-        }
-    }catch (OperationFailedException& e){
-        // To be safe: avoid interrupting or corrupting game saving,
-        // make game saving non error recoverable
-        throw FatalProgramException(std::move(e));
-    }
-}
-
-void EggAutonomous::reset_game(SingleSwitchProgramEnvironment& env, BotBaseContext& context, const std::string& error_msg){
-    try{
-        pbf_press_button(context, BUTTON_HOME, 20, GameSettings::instance().GAME_TO_HOME_DELAY);
-        context.wait_for_all_requests();
-        reset_game_from_home(env.program_info(), env.console, context, 5 * TICKS_PER_SECOND);
-    }catch (OperationFailedException& e){
-        // To be safe: avoid doing anything outside of game on Switch,
-        // make game resetting non error recoverable
-        throw FatalProgramException(std::move(e));
-    }
-}
-
-void EggAutonomous::handle_recoverable_error(
-    SingleSwitchProgramEnvironment& env, BotBaseContext& context,
-    EventNotificationOption& notification,
-    OperationFailedException& e,
-    size_t& consecutive_failures
-){
-    auto& stats = env.current_stats<EggAutonomous_Descriptor::Stats>();
-    stats.m_errors++;
-    env.update_stats();
-    e.send_notification(env, notification);
-
-    if (SAVE_DEBUG_VIDEO){
-        // Take a video to give more context for debugging
-        pbf_press_button(context, BUTTON_CAPTURE, 2 * TICKS_PER_SECOND, 2 * TICKS_PER_SECOND);
-        context.wait_for_all_requests();
-    }
-    // if there is no auto save, then we shouldn't reset game to lose previous progress.
-    if (AUTO_SAVING == AutoSave::NoAutoSave){
-        throw std::move(e);
-    }
-
-    if (AUTO_SAVING == AutoSave::AfterStartAndKeep && m_in_critical_to_save_stage){
-        // We have found a pokemon to keep, but before we can save the game to protect the pokemon, an error occurred.
-        // To not lose the pokemon, don't reset.
-        // Note: if AUTO_SAVING == AutoSave::EveryBatch, then we don't need to care about this critical stage, because
-        // in this auto saving mode, every batch of eggs have been saved beforehand.
-        env.log("Found an error before we can save the game to protect the newly kept pokemon.", COLOR_RED);
-        env.log("Don't reset game to protect it.", COLOR_RED);
-        throw std::move(e);
-    }
-
-    consecutive_failures++;
-    if (consecutive_failures >= 3){
-        throw OperationFailedException(
-            ErrorReport::SEND_ERROR_REPORT, env.console,
-            "Failed 3 times in the row.",
-            true
-        );
-    }
-
-    env.log("Reset game to handle recoverable error");
-    reset_game(env, context, "handling recoverable error");
-}
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSV/Programs/Eggs/PokemonSV_EggAutonomous.h b/SerialPrograms/Source/PokemonSV/Programs/Eggs/PokemonSV_EggAutonomous.h
deleted file mode 100644
index db02bc4802..0000000000
--- a/SerialPrograms/Source/PokemonSV/Programs/Eggs/PokemonSV_EggAutonomous.h
+++ /dev/null
@@ -1,128 +0,0 @@
-/*  Egg Autonomous
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSV_EggAutonomous_H
-#define PokemonAutomation_PokemonSV_EggAutonomous_H
-
-#include "Common/Cpp/Options/EnumDropdownOption.h"
-#include "Common/Cpp/Options/TimeExpressionOption.h"
-#include "CommonFramework/Notifications/EventNotificationsTable.h"
-#include "CommonFramework/Options/LanguageOCROption.h"
-#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-#include "Pokemon/Options/Pokemon_EggHatchFilter.h"
-#include "PokemonSV/Options/PokemonSV_EggPowerSandwichOption.h"
-
-// #include <functional>
-
-namespace PokemonAutomation{
-
-class OperationFailedException;
-
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-
-
-class EggAutonomous_Descriptor : public SingleSwitchProgramDescriptor{
-public:
-    EggAutonomous_Descriptor();
-
-    struct Stats;
-    virtual std::unique_ptr<StatsTracker> make_stats() const override;
-
-};
-
-
-
-// Automatically hatch eggs to farm shiny
-class EggAutonomous : public SingleSwitchProgramInstance{
-public:
-    EggAutonomous();
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-    int fetch_eggs_full_routine(SingleSwitchProgramEnvironment& env, BotBaseContext& context);
-
-    void hatch_eggs_full_routine(SingleSwitchProgramEnvironment& env, BotBaseContext& context, int num_eggs_in_party);
-
-    void reset_position_to_flying_spot(SingleSwitchProgramEnvironment& env, BotBaseContext& context);
-
-    int picnic_party_to_hatch_party(SingleSwitchProgramEnvironment& env, BotBaseContext& context);
-
-    void process_one_baby(SingleSwitchProgramEnvironment& env, BotBaseContext& context, int egg_index, int num_eggs_in_party);
-
-    bool move_pokemon_to_keep(SingleSwitchProgramEnvironment& env, BotBaseContext& context, uint8_t pokemon_row_in_party);
-
-    void save_game(SingleSwitchProgramEnvironment& env, BotBaseContext& context, bool from_overworld);
-
-    void reset_game(SingleSwitchProgramEnvironment& env, BotBaseContext& context, const std::string& error_msg);
-
-    void handle_recoverable_error(
-        SingleSwitchProgramEnvironment& env, BotBaseContext& context,
-        EventNotificationOption& notification,
-        OperationFailedException& e,
-        size_t& consecutive_failures
-    );
-
-    // void call_with_debug_dump(SingleSwitchProgramEnvironment& env, BotBaseContext& context, std::function<void())
-
-private:
-    // Will need this to preserve raid den
-    // TouchDateIntervalOption TOUCH_DATE_INTERVAL;
-
-    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
-
-    OCR::LanguageOCROption LANGUAGE;
-    SimpleIntegerOption<uint8_t> MAX_KEEPERS;
-
-    enum class AutoSave{
-        NoAutoSave,
-        AfterStartAndKeep,
-        EveryBatch,
-    };
-    EnumDropdownOption<AutoSave> AUTO_SAVING;
-
-    EggPowerSandwichOption EGG_SANDWICH;
-
-    BooleanCheckBoxOption HAS_CLONE_RIDE_POKEMON;
-
-    IntegerEnumDropdownOption KEEP_BOX_LOCATION;
-
-    Pokemon::EggHatchFilterTable FILTERS;
-
-    BooleanCheckBoxOption SAVE_DEBUG_VIDEO;
-
-    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
-    EventNotificationOption NOTIFICATION_NONSHINY_KEEP;
-    EventNotificationOption NOTIFICATION_SHINY;
-    EventNotificationOption m_notification_noop;
-    EventNotificationsOption NOTIFICATIONS;
-
-    // How many pokemon have been kept so far
-    uint8_t m_num_kept = 0;
-    // How many sandwich spent so far
-    size_t m_num_sandwich_spent = 0;
-    // The program first fetchs some eggs, then hatches them.
-    // If user selects AUTO_SAVING to be on, then during hatching, when a recoverable error happens, we reset game.
-    // If we have saved the game after fetching phase, then when reloading the game, we may still have eggs in boxes
-    // that need hatching.
-    // If we haven't saved after fetching, then when reloading the game, there is no eggs in boxes. We can directly
-    // go to the next egg fetching phase.
-    // To tell apart the two cases, we need this bool var:
-    bool m_saved_after_fetched_eggs = false;
-    // When we find a pokemon to keep, we don't want the game to be reset if we haven't placed a save to protect the
-    // kept the pokemon. This flag is used to signal when we are in this "don't reset" stage.
-    bool m_in_critical_to_save_stage = false;
-};
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSV/Programs/Eggs/PokemonSV_EggFetcher.cpp b/SerialPrograms/Source/PokemonSV/Programs/Eggs/PokemonSV_EggFetcher.cpp
deleted file mode 100644
index 91d0a44677..0000000000
--- a/SerialPrograms/Source/PokemonSV/Programs/Eggs/PokemonSV_EggFetcher.cpp
+++ /dev/null
@@ -1,151 +0,0 @@
-/*  Egg Fetcher
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/Exceptions/OperationFailedException.h"
-#include "CommonFramework/Notifications/ProgramNotifications.h"
-#include "CommonFramework/Tools/StatsTracking.h"
-#include "CommonFramework/Tools/VideoResolutionCheck.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonSV/Inference/Boxes/PokemonSV_IVCheckerReader.h"
-#include "PokemonSV/Programs/Eggs/PokemonSV_EggRoutines.h"
-#include "PokemonSV/Programs/PokemonSV_Navigation.h"
-#include "PokemonSV_EggFetcher.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-using namespace Pokemon;
-
-
-EggFetcher_Descriptor::EggFetcher_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonSV:EggFetcher",
-        STRING_POKEMON + " SV", "Egg Fetcher",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonSV/EggFetcher.md",
-        "Automatically fetch eggs from a picnic.",
-        FeedbackType::REQUIRED,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-struct EggFetcher_Descriptor::Stats : public StatsTracker{
-    Stats()
-        : m_sandwiches(m_stats["Sandwiches"])
-        , m_attempts(m_stats["Fetch Attempts"])
-        , m_eggs(m_stats["Eggs"])
-        , m_errors(m_stats["Errors"])
-    {
-        m_display_order.emplace_back("Sandwiches");
-        m_display_order.emplace_back("Fetch Attempts");
-        m_display_order.emplace_back("Eggs");
-        m_display_order.emplace_back("Errors", true);
-    }
-    std::atomic<uint64_t>& m_sandwiches;
-    std::atomic<uint64_t>& m_attempts;
-    std::atomic<uint64_t>& m_eggs;
-    std::atomic<uint64_t>& m_errors;
-};
-std::unique_ptr<StatsTracker> EggFetcher_Descriptor::make_stats() const{
-    return std::unique_ptr<StatsTracker>(new Stats());
-}
-
-
-
-EggFetcher::EggFetcher()
-    : GO_HOME_WHEN_DONE(false)
-    , LANGUAGE(
-        "<b>Game Language:</b><br>Required to read IVs.",
-        IV_READER().languages(),
-        LockWhileRunning::LOCKED,
-        false
-    )
-    , EGGS_TO_FETCH(
-        "<b>Fetch this many eggs:</b>",
-        LockWhileRunning::LOCKED,
-        900
-    )
-    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
-    , NOTIFICATIONS({
-        &NOTIFICATION_STATUS_UPDATE,
-        &NOTIFICATION_PROGRAM_FINISH,
-        &NOTIFICATION_ERROR_FATAL,
-    })
-{
-    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
-    PA_ADD_OPTION(LANGUAGE);
-    PA_ADD_OPTION(EGGS_TO_FETCH);
-    PA_ADD_OPTION(EGG_SANDWICH);
-    PA_ADD_OPTION(NOTIFICATIONS);
-}
-
-
-void EggFetcher::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    assert_16_9_720p_min(env.logger(), env.console);
-
-    EggFetcher_Descriptor::Stats& stats = env.current_stats<EggFetcher_Descriptor::Stats>();
-
-    //  Connect the controller.
-    pbf_press_button(context, BUTTON_LCLICK, 10, 0);
-
-    size_t num_eggs_collected = 0;
-
-    try{
-        for(uint16_t i = 0; i < EGG_SANDWICH.MAX_NUM_SANDWICHES; i++){
-            send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
-
-            picnic_at_zero_gate(env.program_info(), env.console, context);
-            // Now we are at picnic. We are at one end of picnic table while the egg basket is at the other end
-
-            bool can_make_sandwich = eat_egg_sandwich_at_picnic(env.program_info(), env.realtime_dispatcher(), env.console, context,
-                EGG_SANDWICH.EGG_SANDWICH_TYPE, LANGUAGE);
-            if (can_make_sandwich == false){
-                throw UserSetupError(env.console, "No sandwich recipe or ingredients. Cannot open and select the sandwich recipe.");
-            }
-
-            stats.m_sandwiches++;
-            env.update_stats();
-
-            // move past the table and collect eggs
-            auto basket_check_callback = [&](size_t new_eggs){
-                stats.m_attempts++;
-                stats.m_eggs += new_eggs;
-                env.update_stats();
-            };
-
-            const size_t basket_wait_seconds = (EGG_SANDWICH.EGG_SANDWICH_TYPE == EggSandwichType::GREAT_PEANUT_BUTTER ? 180 : 120);
-            collect_eggs_after_sandwich(env.program_info(), env.console, context, basket_wait_seconds,
-                EGGS_TO_FETCH, num_eggs_collected, basket_check_callback);
-
-            leave_picnic(env.program_info(), env.console, context);
-            
-            // Reset position to flying spot:
-            reset_position_at_zero_gate(env.program_info(), env.console, context);
-
-            if (num_eggs_collected >= EGGS_TO_FETCH){
-                break;
-            }
-        }
-    } catch(OperationFailedException&){
-        stats.m_errors++;
-        env.update_stats();
-        throw;
-    }
-
-    env.update_stats();
-    GO_HOME_WHEN_DONE.run_end_of_program(context);
-    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
-}
-
-
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSV/Programs/Eggs/PokemonSV_EggFetcher.h b/SerialPrograms/Source/PokemonSV/Programs/Eggs/PokemonSV_EggFetcher.h
deleted file mode 100644
index efb99888d8..0000000000
--- a/SerialPrograms/Source/PokemonSV/Programs/Eggs/PokemonSV_EggFetcher.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*  Egg Fetcher
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSV_EggFetcher_H
-#define PokemonAutomation_PokemonSV_EggFetcher_H
-
-#include "Common/Cpp/Options/SimpleIntegerOption.h"
-#include "Common/Cpp/Options/TimeExpressionOption.h"
-#include "CommonFramework/Notifications/EventNotificationsTable.h"
-#include "CommonFramework/Options/LanguageOCROption.h"
-#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-#include "PokemonSV/Options/PokemonSV_EggPowerSandwichOption.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-
-
-class EggFetcher_Descriptor : public SingleSwitchProgramDescriptor{
-public:
-    EggFetcher_Descriptor();
-
-    struct Stats;
-    virtual std::unique_ptr<StatsTracker> make_stats() const override;
-
-};
-
-
-
-
-class EggFetcher : public SingleSwitchProgramInstance{
-public:
-    EggFetcher();
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
-
-    OCR::LanguageOCROption LANGUAGE;
-
-    SimpleIntegerOption<uint16_t> EGGS_TO_FETCH;
-    EggPowerSandwichOption EGG_SANDWICH;
-
-    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
-    EventNotificationsOption NOTIFICATIONS;
-};
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSV/Programs/Eggs/PokemonSV_EggHatcher.cpp b/SerialPrograms/Source/PokemonSV/Programs/Eggs/PokemonSV_EggHatcher.cpp
deleted file mode 100644
index c36e23ac98..0000000000
--- a/SerialPrograms/Source/PokemonSV/Programs/Eggs/PokemonSV_EggHatcher.cpp
+++ /dev/null
@@ -1,224 +0,0 @@
-/*  Egg Hatcher
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/Exceptions/FatalProgramException.h"
-#include "CommonFramework/Exceptions/OperationFailedException.h"
-#include "CommonFramework/Notifications/ProgramNotifications.h"
-#include "CommonFramework/Tools/StatsTracking.h"
-#include "CommonFramework/Tools/VideoResolutionCheck.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonSV/Inference/Boxes/PokemonSV_BoxDetection.h"
-#include "PokemonSV/Programs/PokemonSV_Navigation.h"
-#include "PokemonSV/Programs/Eggs/PokemonSV_EggRoutines.h"
-#include "PokemonSV/Programs/Boxes/PokemonSV_BoxRoutines.h"
-#include "PokemonSV_EggHatcher.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-using namespace Pokemon;
-
-
-EggHatcher_Descriptor::EggHatcher_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonSV:EggHatcher",
-        STRING_POKEMON + " SV", "Egg Hatcher",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonSV/EggHatcher.md",
-        "Automatically hatch eggs from boxes.",
-        FeedbackType::REQUIRED,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-struct EggHatcher_Descriptor::Stats : public StatsTracker{
-    Stats()
-        : m_hatched(m_stats["Hatched"])
-        , m_errors(m_stats["Errors"])
-    {
-        m_display_order.emplace_back("Hatched");
-        m_display_order.emplace_back("Errors", true);
-    }
-    std::atomic<uint64_t>& m_hatched;
-    std::atomic<uint64_t>& m_errors;
-};
-std::unique_ptr<StatsTracker> EggHatcher_Descriptor::make_stats() const{
-    return std::unique_ptr<StatsTracker>(new Stats());
-}
-
-
-
-EggHatcher::EggHatcher()
-    : GO_HOME_WHEN_DONE(false)
-    , START_LOCATION(
-        "<b>Start location:</b><br>Where to start the hatcher program.<br>"
-        "Zero Gate Flying Spot: Stand at Zero Gate flying spot. The flying spot is already unlocked.<br>"
-        "Anywhere safe, on ride: You are in a safe location with no wild encounters or NPCs. You are on your ride lengendary.<br>"
-        "Anywhere safe, on foot: You are in a safe location with no wild encounters or NPCs. You stand on foot.<br>",
-        {
-            {StartLocation::ZeroGateFlyingSpot, "zero-gate", "Zero Gate Flying Spot"},
-            {StartLocation::AnywhereOnRide, "anywhere-on-ride", "Anywhere safe, on ride."},
-            {StartLocation::AnywhereOffRide, "anywhere-off-ride", "Anywhere safe, on foot."},
-        },
-        LockWhileRunning::LOCKED,
-        StartLocation::ZeroGateFlyingSpot
-    )
-    , BOXES(
-        "<b>How many boxes of eggs to hatch:</b>",
-        LockWhileRunning::UNLOCKED,
-        1, 1, 32
-    )
-    , HAS_CLONE_RIDE_POKEMON(
-        "<b>Cloned Ride Legendary 2nd in Party:</b><br>"
-        "Ride legendary cannot be cloned after patch 1.0.1. To preserve the existing clone while hatching eggs, "
-        "place it as second in party before starting the program.</b>"
-        "The program will skip the first row of eggs in the box as a result.",
-        LockWhileRunning::LOCKED,
-        false)
-    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
-    , NOTIFICATIONS({
-        &NOTIFICATION_STATUS_UPDATE,
-        &NOTIFICATION_PROGRAM_FINISH,
-        &NOTIFICATION_ERROR_RECOVERABLE,
-        &NOTIFICATION_ERROR_FATAL,
-    })
-{
-    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
-    PA_ADD_OPTION(START_LOCATION);
-    PA_ADD_OPTION(BOXES);
-    PA_ADD_OPTION(HAS_CLONE_RIDE_POKEMON);
-    PA_ADD_OPTION(NOTIFICATIONS);
-}
-
-void EggHatcher::hatch_one_box(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    EggHatcher_Descriptor::Stats& stats = env.current_stats<EggHatcher_Descriptor::Stats>();
-
-    for(uint8_t column_index = 0; column_index < 6; column_index++){
-        uint8_t num_eggs = 0, num_non_egg_pokemon = 0;
-        {
-            const uint8_t expected_empty_slots_in_party = HAS_CLONE_RIDE_POKEMON ? 4 : 5;
-            if (check_empty_slots_in_party(env.program_info(), env.console, context) != expected_empty_slots_in_party){
-                throw FatalProgramException(
-                    ErrorReport::SEND_ERROR_REPORT, env.console,
-                    "Party not empty when loading one column for hatching.",
-                    true
-                );
-            }
-        }
-
-        load_one_column_to_party(env, env.console, context, NOTIFICATION_ERROR_RECOVERABLE, column_index, HAS_CLONE_RIDE_POKEMON);
-        // Move cursor to party lead so that we can examine rest of party to detect eggs.
-        move_box_cursor(env.program_info(), env.console, context, BoxCursorLocation::PARTY, 0, 0);
-
-        std::tie(num_eggs, num_non_egg_pokemon) = check_egg_party_column(env.program_info(), env.console, context);
-        if (num_eggs == 0){
-            if (num_non_egg_pokemon == 0){
-                // nothing in this column
-                env.log("Nothing in column " + std::to_string(column_index+1) + ".");
-                env.console.overlay().add_log("Empty column", COLOR_WHITE);
-                continue;
-            }
-
-            // we have only non-egg pokemon in the column
-            // Move them back
-            env.log("Only non-egg pokemon in column, move them back.");
-            env.console.overlay().add_log("No egg in column", COLOR_WHITE);
-            unload_one_column_from_party(env, env.console, context, NOTIFICATION_ERROR_RECOVERABLE, column_index, HAS_CLONE_RIDE_POKEMON);
-            continue;
-        }
-        
-        env.log("Loaded " + std::to_string(num_eggs) + " eggs to party.");
-        env.console.overlay().add_log("Load " + std::to_string(num_eggs) + " eggs", COLOR_WHITE);
-        leave_box_system_to_overworld(env.program_info(), env.console, context);
-
-        auto hatched_callback = [&](uint8_t){  
-            stats.m_hatched++;
-            env.update_stats();
-        };
-
-        switch (START_LOCATION){
-        case StartLocation::ZeroGateFlyingSpot:
-            hatch_eggs_at_zero_gate(env.program_info(), env.console, context, num_eggs, hatched_callback);
-            reset_position_at_zero_gate(env.program_info(), env.console, context);
-            break;
-        case StartLocation::AnywhereOnRide:
-        case StartLocation::AnywhereOffRide: // the program already pressed + to get on ride at start
-        {
-            const bool on_ride = true;
-            hatch_eggs_anywhere(env.program_info(), env.console, context, on_ride, num_eggs, hatched_callback);
-            break;
-        }
-        default:
-            throw InternalProgramError(&env.logger(), PA_CURRENT_FUNCTION, "Unknown StartLocation");
-        }
-
-        enter_box_system_from_overworld(env.program_info(), env.console, context);
-
-        num_eggs = check_egg_party_column(env.program_info(), env.console, context).first;
-        if (num_eggs > 0){
-            throw FatalProgramException(
-                ErrorReport::SEND_ERROR_REPORT, env.console,
-                "Detected egg in party after hatching.",
-                true
-            );
-        }
-
-        unload_one_column_from_party(env, env.console, context, NOTIFICATION_ERROR_RECOVERABLE, column_index, HAS_CLONE_RIDE_POKEMON);
-    }
-
-    context.wait_for_all_requests();
-}
-
-void EggHatcher::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    assert_16_9_720p_min(env.logger(), env.console);
-
-    EggHatcher_Descriptor::Stats& stats = env.current_stats<EggHatcher_Descriptor::Stats>();
-    //  Connect the controller.
-    pbf_press_button(context, BUTTON_LCLICK, 10, 0);
-
-    if (START_LOCATION == StartLocation::AnywhereOffRide){
-        // Get on ride:
-        pbf_press_button(context, BUTTON_PLUS, 50, 100);
-        context.wait_for_all_requests();
-    }
-
-    try{
-        enter_box_system_from_overworld(env.program_info(), env.console, context);
-        // // Wait one second to let game load box UI
-        // context.wait_for(std::chrono::seconds(1));
-
-        for (uint8_t i = 0; i < BOXES; i++){
-            if (i > 0){
-                env.log("Go to next box.");
-                env.console.overlay().add_log("Next box", COLOR_WHITE);
-                move_to_right_box(context);
-            }
-            context.wait_for_all_requests();
-
-            send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
-
-            hatch_one_box(env, context);
-        }
-    } catch(OperationFailedException&){
-        stats.m_errors++;
-        env.update_stats();
-        throw;
-    }
-
-    env.update_stats();
-    GO_HOME_WHEN_DONE.run_end_of_program(context);
-    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
-}
-
-
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSV/Programs/Eggs/PokemonSV_EggHatcher.h b/SerialPrograms/Source/PokemonSV/Programs/Eggs/PokemonSV_EggHatcher.h
deleted file mode 100644
index b6d47ab8b8..0000000000
--- a/SerialPrograms/Source/PokemonSV/Programs/Eggs/PokemonSV_EggHatcher.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*  Egg Hatcher
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSV_EggHatcher_H
-#define PokemonAutomation_PokemonSV_EggHatcher_H
-
-#include "Common/Cpp/Options/SimpleIntegerOption.h"
-#include "Common/Cpp/Options/TimeExpressionOption.h"
-#include "CommonFramework/Notifications/EventNotificationsTable.h"
-#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-
-
-class EggHatcher_Descriptor : public SingleSwitchProgramDescriptor{
-public:
-    EggHatcher_Descriptor();
-
-    struct Stats;
-    virtual std::unique_ptr<StatsTracker> make_stats() const override;
-
-};
-
-
-
-
-class EggHatcher : public SingleSwitchProgramInstance{
-public:
-    EggHatcher();
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-    // Start at box system, where party is empty, the program will:
-    // - load one column to party
-    // - hatch
-    // - return to box system and offline paty
-    // Repeat for all six columns of a box
-    void hatch_one_box(SingleSwitchProgramEnvironment& env, BotBaseContext& context);
-
-private:
-    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
-
-    enum class StartLocation{
-        ZeroGateFlyingSpot,
-        AnywhereOnRide,
-        AnywhereOffRide,
-    };
-    EnumDropdownOption<StartLocation> START_LOCATION;
-
-    SimpleIntegerOption<uint8_t> BOXES;
-    BooleanCheckBoxOption HAS_CLONE_RIDE_POKEMON;
-
-    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
-    EventNotificationsOption NOTIFICATIONS;
-};
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSV/Programs/Eggs/PokemonSV_EggRoutines.cpp b/SerialPrograms/Source/PokemonSV/Programs/Eggs/PokemonSV_EggRoutines.cpp
deleted file mode 100644
index a30b56788e..0000000000
--- a/SerialPrograms/Source/PokemonSV/Programs/Eggs/PokemonSV_EggRoutines.cpp
+++ /dev/null
@@ -1,646 +0,0 @@
-/*  Egg Routines
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Cpp/Concurrency/AsyncDispatcher.h"
-#include "Common/Cpp/Exceptions.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
-#include "CommonFramework/Options/LanguageOCROption.h"
-#include "CommonFramework/Tools/ErrorDumper.h"
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "CommonFramework/VideoPipeline/VideoOverlay.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_ScalarButtons.h"
-#include "Pokemon/Options/Pokemon_EggHatchFilter.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonSV/Inference/PokemonSV_WhiteButtonDetector.h"
-#include "PokemonSV/Inference/Boxes/PokemonSV_BoxEggDetector.h"
-#include "PokemonSV/Inference/Boxes/PokemonSV_BoxGenderDetector.h"
-#include "PokemonSV/Inference/Boxes/PokemonSV_BoxShinyDetector.h"
-#include "PokemonSV/Inference/Boxes/PokemonSV_IVCheckerReader.h"
-#include "PokemonSV/Inference/Boxes/PokemonSV_BoxNatureDetector.h"
-#include "PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h"
-#include "PokemonSV/Inference/Dialogs/PokemonSV_GradientArrowDetector.h"
-#include "PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h"
-#include "PokemonSV/Programs/PokemonSV_Navigation.h"
-#include "PokemonSV/Programs/Boxes/PokemonSV_BoxRoutines.h"
-#include "PokemonSV/Programs/Sandwiches/PokemonSV_SandwichRoutines.h"
-#include "PokemonSV_EggRoutines.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-
-namespace {
-
-
-void clear_mons_in_front(
-    const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context
-){
-    console.log("Waiting for all " + STRING_POKEMON + " in front of you to get out of the way...");
-    WhiteButtonWatcher button(
-        COLOR_YELLOW, WhiteButton::ButtonA,
-        {0.020, 0.590, 0.035, 0.060},
-        WhiteButtonWatcher::FinderType::GONE
-    );
-    int ret = run_until(
-        console, context,
-        [&](BotBaseContext& context){
-            for (size_t c = 0; c < 40; c++){
-                context.wait_for_all_requests();
-                context.wait_for(std::chrono::seconds(30));
-                console.log("A " + Pokemon::STRING_POKEMON + " is standing in the way. Whistling and waiting 30 seconds...", COLOR_RED);
-                pbf_press_button(context, BUTTON_R, 20, 0);
-            }
-        },
-        {button}
-    );
-    if (ret < 0){
-        dump_image_and_throw_recoverable_exception(
-            info, console, "UnableToClearObstacle",
-            "Unable to clear " + STRING_POKEMON + " in front of you after 20 min."
-        );
-    }
-#if 0
-    WhiteButtonDetector detector(COLOR_RED, WhiteButton::ButtonA, {0.020, 0.590, 0.035, 0.060});
-    while (detector.detect(console.video().snapshot())){
-        pbf_press_button(context, BUTTON_R, 20, 30 * TICKS_PER_SECOND);
-        context.wait_for_all_requests();
-    }
-#endif
-}
-
-
-
-
-// Call this function when an egg hatching dialog is detected.
-// This function presses A to finish the egg hatching dialogs and updates logs and calls callback functions.
-// egg_idx: currently which egg in the party is hatching. 0-indexed.
-void handle_egg_hatching(const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context,
-    uint8_t num_eggs_in_party, uint8_t egg_idx, std::function<void(uint8_t)> egg_hatched_callback)
-{
-    console.log("Detect hatching dialog: " + std::to_string(egg_idx+1) + "/" + std::to_string(num_eggs_in_party));
-    console.overlay().add_log("Hatched " + std::to_string(egg_idx+1) + "/" + std::to_string(num_eggs_in_party), COLOR_GREEN);
-    OverworldWatcher overworld(COLOR_CYAN);
-    int ret = run_until(
-        console, context,
-        [](BotBaseContext& context){
-            ssf_press_right_joystick(context, 0, 128, 0, 95);
-            for(int i = 0; i < 60; i++){
-                pbf_mash_button(context, BUTTON_A, 125);
-            }
-        },
-        {overworld}
-    );
-    if (ret < 0){
-        dump_image_and_throw_recoverable_exception(info, console, "NoHatchingEnd",
-            "hatch_eggs_at_zero_gate(): No end of egg hatching detected after one minute.");
-    }
-    console.log("Finished hatching animation and dialog.");
-
-    if (egg_hatched_callback){
-        egg_hatched_callback(egg_idx);
-    }
-}
-
-// Assuming on your legendary ride and camera facing the same direction as the player character,
-// Turning right to do circullar motion to hatch eggs.
-// Function returns when a dialog is detected, meaning an egg is hatching.
-// Throw exception when no egg hatching detected after 10 minutes.
-void do_egg_cycle_motion(const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context)
-{
-    AdvanceDialogWatcher dialog(COLOR_RED);
-    int ret = run_until(
-        console, context,
-        [&](BotBaseContext& context){
-            // hatch circle:
-            // Left joystick forward, right joystick right
-            // click left joystick
-            pbf_controller_state(context, BUTTON_LCLICK, DPAD_NONE,
-                128, 0, 255, 128, 20);
-            pbf_controller_state(context, 0, DPAD_NONE, 128, 0, 255, 128, 20);
-            for(int j = 0; j < 600; j++){
-                pbf_controller_state(context, BUTTON_LCLICK, DPAD_NONE,
-                    128, 0, 255, 128, TICKS_PER_SECOND);
-            }
-        },
-        {dialog}
-    );
-    if (ret < 0){
-        dump_image_and_throw_recoverable_exception(info, console, "NoEggToHatch",
-            "hatch_eggs_at_zero_gate(): No more egg hatch after 10 minutes.");
-    }
-}
-
-} // annoymous namespace
-
-void order_compote_du_fils(const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context){
-    // We start this function when we enter the restaurant without pressing any button.
-
-    // Se we first press A to clear a dialog:
-    pbf_press_button(context, BUTTON_A, 30, 100);
-
-    bool paid = false;
-    bool eating = false;
-    while(eating == false){
-        context.wait_for_all_requests();
-
-        AdvanceDialogWatcher dialog_watcher(COLOR_RED, std::chrono::milliseconds(100));
-        GradientArrowWatcher menu_item_0_watcher(COLOR_BLUE, GradientArrowType::RIGHT, {0.037, 0.224, 0.074, 0.104});
-        GradientArrowWatcher menu_item_1_watcher(COLOR_BLUE, GradientArrowType::RIGHT, {0.037, 0.339, 0.074, 0.104});
-        PromptDialogWatcher prompt_watcher(COLOR_RED, {0.535, 0.450, 0.367, 0.124});
-        
-        int ret = wait_until(
-            console, context,
-            std::chrono::seconds(60),
-            {dialog_watcher, menu_item_0_watcher, menu_item_1_watcher, prompt_watcher}
-        );
-
-        switch (ret){
-        case 0:
-            console.log("Detected dialog advance.");
-            if (paid){
-                // This is a dialog box after we have paid the food.
-                // Mash A to clear any remaining dialog before a very long eating animation.
-                pbf_mash_button(context, BUTTON_A, 300);
-                context.wait_for_all_requests();
-                eating = true;
-            } else{
-                pbf_press_button(context, BUTTON_A, 30, 100);
-            }
-            break;
-        case 1:
-            console.log("Detected restaurant menu.");
-            console.overlay().add_log("Restaurant menu", COLOR_WHITE);
-            pbf_press_dpad(context, DPAD_DOWN, 30, 60);
-            break;
-        case 2:
-            console.log("Detected the dish we want.");
-            pbf_press_button(context, BUTTON_A, 30, 100);
-            break;
-        case 3:
-            console.log("Detected the payment prompt.");
-            console.overlay().add_log("Pay dish", COLOR_WHITE);
-            pbf_press_button(context, BUTTON_A, 30, 100);
-            paid = true;
-            break;
-        default:
-            dump_image_and_throw_recoverable_exception(info, console, "ErrorOrderFood",
-                "order_compote_du_fils(): No recognized state in restaurant menu after 60 seconds.");
-        }
-    } // end state machine for restaurant menu
-
-    { // Now wait for eating animation to finish.
-        AdvanceDialogWatcher dialog_watcher(COLOR_RED, std::chrono::milliseconds(100));
-        int ret = run_until(
-            console, context,
-            [](BotBaseContext& context){
-                for(int i = 0; i < 60; i++){
-                    pbf_press_button(context, BUTTON_A, 25, 100);
-                }
-            },
-            {{dialog_watcher}}
-        );
-        if (ret < 0){
-            dump_image_and_throw_recoverable_exception(info, console, "EndDiningNotDetected",
-                "order_compote_du_fils(): No end of eating after 60 seconds.");
-        }
-    }
-
-    // Now leaving the restaurant
-    pbf_mash_button(context, BUTTON_B, 90);
-    pbf_wait(context, 100);
-    while(true){
-        context.wait_for_all_requests();
-
-        AdvanceDialogWatcher dialog_watcher(COLOR_RED, std::chrono::milliseconds(100));
-        OverworldWatcher overworld(COLOR_CYAN);
-        int ret = wait_until(
-            console, context,
-            std::chrono::seconds(60),
-            {dialog_watcher, overworld}
-        );
-        if (ret == 0){
-            pbf_press_button(context, BUTTON_A, 30, 100);
-            continue;
-        }
-        else if (ret == 1){
-            return; // outside restaurant
-        }
-        else{
-            dump_image_and_throw_recoverable_exception(info, console, "EndLeavingRestaurantNotDetected",
-                "order_compote_du_fils(): No end of leaving restaurant after 60 seconds.");
-        }
-    }
-}
-
-void picnic_at_zero_gate(const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context){
-    // Orient camera to look at same direction as player character
-    // This is needed because when save-load the game, the camera is reset
-    // to this location.
-    pbf_press_button(context, BUTTON_L, 50, 40);
-
-    // Move right to make player character facing away from Aera Zero observation station
-    pbf_move_left_joystick(context, 255, 0, 50, 50);
-    // Press L to move camera to face the same direction as the player character
-    pbf_press_button(context, BUTTON_L, 50, 40);
-    // Move forward
-    pbf_move_left_joystick(context, 128, 0, 125, 0);
-
-    picnic_from_overworld(info, console, context);
-}
-
-bool eat_egg_sandwich_at_picnic(const ProgramInfo& info, AsyncDispatcher& dispatcher, ConsoleHandle& console, BotBaseContext& context,
-    EggSandwichType sandwich_type, Language language)
-{
-    // Move forward to table to make sandwich
-    pbf_move_left_joystick(context, 128, 0, 30, 40);
-    context.wait_for_all_requests();
-
-    clear_mons_in_front(info, console, context);
-    if (enter_sandwich_recipe_list(info, console, context) == false){
-        return false;
-    }
-    switch (sandwich_type){
-    case EggSandwichType::GREAT_PEANUT_BUTTER:
-    {
-        if (select_sandwich_recipe(info, console, context, 17) == false){
-            // cannot find the sandwich recipe, either user has not unlocked it or does not have enough ingredients:
-            return false;
-        }
-        build_great_peanut_butter_sandwich(info, dispatcher, console, context);
-        break;
-    }
-    case EggSandwichType::TWO_SWEET_HERBS:
-    case EggSandwichType::SALTY_SWEET_HERBS:
-    case EggSandwichType::BITTER_SWEET_HERBS:
-        enter_custom_sandwich_mode(info, console, context);
-        if (language == Language::None){
-            throw UserSetupError(console.logger(), "Must set game langauge option to read ingredient lists to make herb sandwich.");
-        }
-        make_two_herbs_sandwich(info, dispatcher, console, context, sandwich_type, language);
-        break;
-    default:
-        throw InternalProgramError(&console.logger(), PA_CURRENT_FUNCTION, "Unknown EggSandwichType");
-    }
-    
-    finish_sandwich_eating(info, console, context);
-
-    return true;
-}
-
-void collect_eggs_after_sandwich(const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context,
-    size_t basket_wait_seconds, size_t max_eggs, size_t& num_eggs_collected,
-    std::function<void(size_t new_eggs)> basket_check_callback
-){
-    context.wait_for_all_requests();
-    console.log("Move past picnic table");
-    console.overlay().add_log("Move past picnic table", COLOR_WHITE);
-
-    //  Recall your ride to reduce obstacles.
-    pbf_press_button(context, BUTTON_PLUS, 20, 105);
-
-    //  Move left
-    pbf_move_left_joystick(context, 0, 128, 40, 40);
-    //  Move forward to pass table
-    pbf_move_left_joystick(context, 128, 0, 80, 40); // old value: 80
-    //  Move right
-    pbf_move_left_joystick(context, 255, 128, 50, 40);
-    //  Move back to face basket
-    pbf_move_left_joystick(context, 128, 255, 10, 40);
-
-    //  Move closer to the basket.
-    pbf_press_button(context, BUTTON_L, 20, 105);
-    pbf_move_left_joystick(context, 128, 0, 10, 40);
-
-
-    context.wait_for_all_requests();
-    
-    const size_t default_collection_interval_seconds = basket_wait_seconds;
-    const auto max_egg_wait_time = std::chrono::minutes(30);
-
-    size_t num_checks = 0;
-    size_t eggs_collected_cur_session = 0;
-
-    WallClock start = current_time();
-    while(true){
-        const size_t last_num_eggs_collected = num_eggs_collected;
-
-        clear_mons_in_front(info, console, context);
-        check_basket_to_collect_eggs(info, console, context, max_eggs, num_eggs_collected);
-
-        const size_t new_eggs_added = num_eggs_collected - last_num_eggs_collected;
-        basket_check_callback(new_eggs_added);
-        eggs_collected_cur_session += new_eggs_added;
-        num_checks++;
-
-        if (num_eggs_collected == max_eggs){
-            console.log("Collected enough eggs: " + std::to_string(max_eggs));
-            break;
-        }
-
-        if (current_time() - start > max_egg_wait_time){
-            console.log("Picnic time up.");
-            console.overlay().add_log("Picnic time up", COLOR_YELLOW);
-            break;
-        }
-        context.wait_for_all_requests();
-
-        const size_t remaining_eggs = max_eggs - num_eggs_collected;
-        const float average_eggs_per_check = eggs_collected_cur_session / (float)num_checks;
-
-        size_t wait_seconds = basket_wait_seconds;
-        if (remaining_eggs < average_eggs_per_check){
-            // If we have few remaining eggs to hatch, adjust wait time accordingly.
-            wait_seconds = size_t(remaining_eggs * default_collection_interval_seconds / average_eggs_per_check);
-            console.log("Last remaining eggs: " + std::to_string(remaining_eggs) + ", avg eggs per check: " + 
-                std::to_string(average_eggs_per_check) + ", wait secs: " + std::to_string(wait_seconds) + ".");
-            if (wait_seconds < 30){
-                // Minimum wait period is 30 sec.
-                console.log("Clamp wait time to 30 secs.");
-                wait_seconds = 30;
-            }
-        }
-        
-        console.log("Collected " + std::to_string(num_eggs_collected) + " eggs, avg eggs per check: " + std::to_string(average_eggs_per_check)
-            + ", wait " + std::to_string(wait_seconds) + " seconds.");
-        console.overlay().add_log("Wait " + std::to_string(wait_seconds) + " secs", COLOR_WHITE);
-        
-        context.wait_for(std::chrono::seconds(wait_seconds));
-    }
-}
-
-void check_basket_to_collect_eggs(
-    const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context,
-    size_t max_eggs, size_t& num_eggs_collected
-){
-    bool checked = false;
-    size_t consecutive_nothing = 0;
-    Button last_prompt = 0;
-    bool pending_refuse = false;
-
-    WallClock start = current_time();
-    while (true){
-        if (current_time() - start > std::chrono::minutes(5)){
-            dump_image_and_throw_recoverable_exception(
-                info, console, "CheckEggsTimedOut",
-                "check_basket_to_collect_eggs(): Still picking up eggs after 5 minutes."
-            );
-        }
-
-        DialogBoxWatcher picnic(COLOR_RED, false, std::chrono::milliseconds(500));
-        AdvanceDialogWatcher advance(COLOR_RED);
-        PromptDialogWatcher prompt(COLOR_RED, {0.623, 0.530, 0.243, 0.119});
-
-        context.wait_for_all_requests();
-        int ret = wait_until(
-            console, context,
-            std::chrono::seconds(5),
-            {
-                picnic,
-                advance,
-                prompt,
-            }
-        );
-        context.wait_for(std::chrono::milliseconds(100));
-
-        if (ret != 0){
-            consecutive_nothing = 0;
-        }
-
-        switch (ret){
-        case 0:
-            console.log("Detected no dialog.");
-            consecutive_nothing++;
-            last_prompt = 0;
-            if (consecutive_nothing >= 10){
-                dump_image_and_throw_recoverable_exception(
-                    info, console, "BasketNotFound",
-                    "collect_eggs_from_basket(): Basket not found after 10 attempts."
-                );
-            }
-            if (checked){
-                console.log("Done talking to basket.");
-                return;
-            }
-            console.log("Attempting to talk to basket...");
-            pbf_press_button(context, BUTTON_A, 20, 30);
-            continue;
-
-        case 1:
-            console.log("Detected advanced dialog.");
-            last_prompt = 0;
-            pbf_press_button(context, BUTTON_B, 20, 30);
-            checked = true;
-            continue;
-
-        case 2:
-            if (last_prompt != 0){
-                console.log("Detected 2nd consecutive prompt. (unexpected)", COLOR_RED);
-                //  Repeat the previous button press.
-                pbf_press_button(context, last_prompt, 20, 80);
-                continue;
-            }
-
-            if (pending_refuse){
-                console.log("Confirming refused egg...");
-                pbf_press_button(context, BUTTON_A, 20, 80);
-                pending_refuse = false;
-                continue;
-            }
-
-            if (num_eggs_collected < max_eggs){
-                num_eggs_collected++;
-                
-                std::string msg = std::to_string(num_eggs_collected) + "/" + std::to_string(max_eggs);
-                console.log("Found an egg " + msg + ". Keeping...");
-                console.overlay().add_log("Egg " + msg, COLOR_GREEN);
-                pbf_press_button(context, BUTTON_A, 20, 80);
-                
-                last_prompt = BUTTON_A;
-            }else{
-                console.log("Found an egg! But we already have enough...");
-                console.overlay().add_log("Full. Skip egg.", COLOR_WHITE);
-                pbf_press_button(context, BUTTON_B, 20, 80);
-                last_prompt = BUTTON_B;
-                pending_refuse = true;
-            }
-            continue;
-
-        default:
-//            dump_image_and_throw_recoverable_exception(
-//                info, console, "CheckEggsNoState",
-//                "check_basket_to_collect_eggs(): No state detected after 5 seconds."
-//            );
-            console.log("Rotating view and trying again...", COLOR_RED);
-            pbf_move_right_joystick(context, 0, 128, 30, 0);
-        }
-
-    }
-}
-
-
-std::pair<uint8_t, uint8_t> check_egg_party_column(const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context){
-    context.wait_for_all_requests();
-    BoxEggPartyColumnWatcher egg_column_watcher;
-    int ret = wait_until(
-        console, context,
-        std::chrono::seconds(10),
-        {egg_column_watcher}
-    );
-    if (ret < 0){
-        dump_image_and_throw_recoverable_exception(info, console, "CannotReadPartyEggs",
-            "check_egg_party_column(): Cannot read party eggs in box system.");
-    }
-    return {egg_column_watcher.num_eggs_found(), egg_column_watcher.num_non_egg_pokemon_found()};
-}
-
-uint8_t check_non_eggs_count_in_party(const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context, uint8_t expected_non_eggs_count_in_party){
-    auto counts = check_egg_party_column(info, console, context);
-    if (counts.second != expected_non_eggs_count_in_party){
-        dump_image_and_throw_recoverable_exception(info, console, "NonEggPokemonInParty",
-            "check_non_eggs_count_in_party: Found non-egg pokemon in party");
-    }
-    return counts.first;
-}
-
-void hatch_eggs_at_zero_gate(const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context,
-    uint8_t num_eggs_in_party, std::function<void(uint8_t)> egg_hatched_callback)
-{
-    bool got_off_ramp = false;
-    for(uint8_t egg_idx = 0; egg_idx < num_eggs_in_party; egg_idx++){
-        console.log("Hatching egg " + std::to_string(egg_idx+1) + "/" + std::to_string(num_eggs_in_party) + ".");
-        console.overlay().add_log("Hatching egg " + std::to_string(egg_idx+1) + "/" + std::to_string(num_eggs_in_party), COLOR_BLUE);
-
-        // Orient camera to look at same direction as player character
-        // This is needed because when save-load the game, the camera is reset
-        // to this location.
-        pbf_press_button(context, BUTTON_L, 50, 40);
-
-        context.wait_for_all_requests();
-
-        if (got_off_ramp == false){
-            AdvanceDialogWatcher dialog(COLOR_RED);
-            // first, get off ramp to the empty field for circling motions
-            int ret = run_until(
-                console, context,
-                [&](BotBaseContext& context){
-                    if (egg_idx == 0){
-                        // At beginning, ride on Koraidon/Miradon and go off ramp:
-                        pbf_press_button(context, BUTTON_PLUS, 50, 100);
-                        // Move right to make player character facing away from Aera Zero observation station
-                        pbf_move_left_joystick(context, 255, 0, 50, 50);
-                        // Press L to move camera to face the same direction as the player character
-                        pbf_press_button(context, BUTTON_L, 50, 40);
-                        // Move forward
-                        pbf_move_left_joystick(context, 128, 0, 200, 0);
-                    }
-                },
-                {dialog}
-            );
-            if (ret == 0){
-                // egg hatching when going off ramp:
-                handle_egg_hatching(info, console, context, num_eggs_in_party, egg_idx, egg_hatched_callback);
-                reset_position_at_zero_gate(info, console, context);
-                continue;
-            }
-
-            got_off_ramp = true;
-            console.log("Got off ramp");
-        }
-
-        // Circular motions:
-        do_egg_cycle_motion(info, console, context);
-
-        handle_egg_hatching(info, console, context, num_eggs_in_party, egg_idx, egg_hatched_callback);
-    } // end hatching each egg
-}
-
-void hatch_eggs_anywhere(
-    const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context,
-    bool already_on_ride, uint8_t num_eggs_in_party, std::function<void(uint8_t)> egg_hatched_callback)
-{
-    if (!already_on_ride){
-        // At beginning, ride on Koraidon/Miradon and go off ramp:
-        pbf_press_button(context, BUTTON_PLUS, 50, 100);
-        context.wait_for_all_requests();
-    }
-
-    for(uint8_t egg_idx = 0; egg_idx < num_eggs_in_party; egg_idx++){
-        console.log("Hatching egg " + std::to_string(egg_idx+1) + "/" + std::to_string(num_eggs_in_party) + ".");
-        console.overlay().add_log("Hatching egg " + std::to_string(egg_idx+1) + "/" + std::to_string(num_eggs_in_party), COLOR_BLUE);
-
-        // Orient camera to look at same direction as player character
-        // This is needed because when save-load the game, the camera is reset
-        // to this location.
-        pbf_press_button(context, BUTTON_L, 50, 40);
-
-        context.wait_for_all_requests();
-
-        // Circular motions:
-        do_egg_cycle_motion(info, console, context);
-
-        handle_egg_hatching(info, console, context, num_eggs_in_party, egg_idx, egg_hatched_callback);
-    } // end hatching each egg
-}
-
-
-void reset_position_at_zero_gate(const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context){
-    console.log("Open map and reset location to Zero Gate.");
-    // Use map to fly back to the flying spot
-    open_map_from_overworld(info, console, context);
-
-    pbf_move_left_joystick(context, 128, 160, 20, 50);
-
-    fly_to_overworld_from_map(info, console, context);
-}
-
-
-bool check_baby_info(
-    const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context,
-    OCR::LanguageOCROption& LANGUAGE, Pokemon::EggHatchFilterTable& FILTERS,
-    Pokemon::EggHatchAction& action
-){
-    context.wait_for_all_requests();
-
-    Language language = LANGUAGE;
-    if (language == Language::None){
-        change_view_to_stats_or_judge(console, context);
-    }else{
-        change_view_to_judge(console, context, language);
-    }
-
-    VideoOverlaySet overlay_set(console.overlay());
-
-    BoxShinyWatcher shiny_detector;
-    // BoxShinyDetector shiny_detector;
-    shiny_detector.make_overlays(overlay_set);
-
-    IVCheckerReaderScope iv_reader_scope(console.overlay(), LANGUAGE);
-    BoxGenderDetector gender_detector;
-    gender_detector.make_overlays(overlay_set);
-    BoxNatureDetector nature_detector(console.overlay(), LANGUAGE);
-
-    const int shiny_ret = wait_until(console, context, std::chrono::milliseconds(200), {shiny_detector});
-    const bool shiny = (shiny_ret == 0);
-    VideoSnapshot screen = console.video().snapshot();
-
-    IVCheckerReader::Results IVs = iv_reader_scope.read(console.logger(), screen);
-    EggHatchGenderFilter gender = gender_detector.detect(screen);
-    NatureReader::Results nature = nature_detector.read(console.logger(), screen);
-
-    console.log(IVs.to_string(), COLOR_GREEN);
-    console.log("Gender: " + gender_to_string(gender), COLOR_GREEN);
-    console.log("Nature: " + nature.to_string(), COLOR_GREEN);
-
-    action = FILTERS.get_action(shiny, IVs, gender, nature);
-
-    return shiny;
-}
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSV/Programs/Eggs/PokemonSV_EggRoutines.h b/SerialPrograms/Source/PokemonSV/Programs/Eggs/PokemonSV_EggRoutines.h
deleted file mode 100644
index 36b2637710..0000000000
--- a/SerialPrograms/Source/PokemonSV/Programs/Eggs/PokemonSV_EggRoutines.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/*  Egg Routines
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- *  Various functions to do egg related automation.
- *  This file is used to prevent main function like EggAutonomous from becoming too long.
- */
-
-#ifndef PokemonAutomation_PokemonSV_EggRoutines_H
-#define PokemonAutomation_PokemonSV_EggRoutines_H
-
-#include "PokemonSV/Programs/Sandwiches/PokemonSV_SandwichRoutines.h"
-#include <functional>
-
-namespace PokemonAutomation{
-
-    struct ProgramInfo;
-    class AsyncDispatcher;
-    class ConsoleHandle;
-    class BotBaseContext;
-    class ImageViewRGB32;
-
-    namespace OCR{
-        class LanguageOCROption;
-    }
-    namespace Pokemon{
-        enum class EggHatchAction;
-        class EggHatchFilterTable;
-    }
-
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-// While entering Gastronome En Famille, order the dish Compote du Fils.
-// This gives Egg Power Lv. 2 at price of 2800.
-void order_compote_du_fils(const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context);
-
-// Start at Zero Gate flying spot, go off ramp to start a picnic.
-void picnic_at_zero_gate(const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context);
-
-// Starting at the initial position of a picnic, go to picnic table to make a sandwich that gives egg power.
-// Can choose:
-// - Great Peanut Butter Sandwich to gain egg power Lv 2, must have unlocked its recipe and have enough ingredients to make all
-//   the sandwiches for all the unlocked recipes.
-// - Two-sweet-herbs, bitter-sweet-herbs or salty-sweet-herbs custom sandwich to gain egg power Lv 3, must have enough ingredinets and
-//   provide game language for OCR ingredient lists.
-// Return false if no needed sandwich ingredients or recipe.
-bool eat_egg_sandwich_at_picnic(const ProgramInfo& info, AsyncDispatcher& dispatcher, ConsoleHandle& console,
-    BotBaseContext& context, EggSandwichType sandwich_type, Language language);
-
-// After eating a sandwich, go around picnic table to wait at basket and collect eggs.
-// `num_eggs_collected` will be updated to add newly collected eggs.
-void collect_eggs_after_sandwich(const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context,
-    size_t basket_wait_seconds, size_t max_eggs, size_t& num_eggs_collected,
-    std::function<void(size_t new_eggs)> basket_check_callback);
-
-// Start at Zero Gate flying spot, go in circles in front of the lab to hatch eggs.
-// `egg_hatched_callback` will be called after each egg hatched, with egg index (0-indexed) 
-void hatch_eggs_at_zero_gate(
-    const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context,
-    uint8_t num_eggs_in_party, std::function<void(uint8_t)> egg_hatched_callback = nullptr
-);
-
-// From overworld, go in circles to hatch eggs.
-// `egg_hatched_callback` will be called after each egg hatched, with egg index (0-indexed)
-// `already_on_ride`: whether the player character is on ride when starting the function.
-void hatch_eggs_anywhere(
-    const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context,
-    bool already_on_ride, uint8_t num_eggs_in_party, std::function<void(uint8_t)> egg_hatched_callback = nullptr
-);
-
-
-// Standing in front of basket during picnic, check basket and update egg count.
-void check_basket_to_collect_eggs(
-    const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context,
-    size_t max_eggs, size_t& num_eggs_collected
-);
-
-// In box view, check the five slots in the party column, after party lead.
-// return how many eggs in the five slots, and how many non-egg pokemon in the five slots.
-// Note: make sure the current cursor does not float above the five slots, otherwise it may affect detection.
-std::pair<uint8_t, uint8_t> check_egg_party_column(const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context);
-
-// In box view, check whether there is the right amount of non-egg pokemon in the five slots in the party column, after party lead.
-// return how many eggs in the five slots.
-// Throw OperationFailedException if found unxepcted non-egg pokemon count in the slots.
-// Note: make sure the current cursor does not float above the five slots, otherwise it may affect detection.
-uint8_t check_non_eggs_count_in_party(const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context, uint8_t expected_non_eggs_count_in_party);
-
-
-// When hatching at Zero Gate, use this function to reset player character position back to Zero Gate flying spot
-void reset_position_at_zero_gate(const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context);
-
-// Assuming the current selected slot in box system is a hatched pokemon, not empty space or egg,
-// check the hatched pokemon's info to determine what to do with it.
-// Return if the pokemon is shiny. The action to handle the pokemon is returned in `action`.
-// The function will try to switch to judge view if possible so that it can read IVs.
-// If judge view is not unlocked, it will settle onto stats view, and the pokemon's IVs will be regarded as unknown.
-bool check_baby_info(
-    const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context,
-    OCR::LanguageOCROption& LANGUAGE, Pokemon::EggHatchFilterTable& FILTERS,
-    Pokemon::EggHatchAction& action
-);
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSV/Programs/FastCodeEntry/PokemonSV_ClipboardFastCodeEntry.cpp b/SerialPrograms/Source/PokemonSV/Programs/FastCodeEntry/PokemonSV_ClipboardFastCodeEntry.cpp
deleted file mode 100644
index 029406d6f3..0000000000
--- a/SerialPrograms/Source/PokemonSV/Programs/FastCodeEntry/PokemonSV_ClipboardFastCodeEntry.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-/*  Fast Code Entry (Clipboard)
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <QApplication>
-#include <QClipboard>
-//#include "Common/Cpp/Exceptions.h"
-#include "Common/Cpp/CancellableScope.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-//#include "NintendoSwitch/Commands/NintendoSwitch_Commands_DigitEntry.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonSV_CodeEntry.h"
-#include "PokemonSV_ClipboardFastCodeEntry.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-using namespace Pokemon;
-
-
-ClipboardFastCodeEntry_Descriptor::ClipboardFastCodeEntry_Descriptor()
-    : MultiSwitchProgramDescriptor(
-        "PokemonSV:ClipboardFastCodeEntry",
-        STRING_POKEMON + " SV", "Clipboard Fast Code Entry (C-FCE)",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonSV/ClipboardFastCodeEntry.md",
-        "Automatically enter a 4, 6, or 8 digit link code from your clipboard.",
-        FeedbackType::NONE,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB,
-        1, 4, 1
-    )
-{}
-
-ClipboardFastCodeEntry::ClipboardFastCodeEntry(){
-    PA_ADD_OPTION(SETTINGS);
-}
-
-
-void ClipboardFastCodeEntry::program(MultiSwitchProgramEnvironment& env, CancellableScope& scope){
-    //  Connect the controller.
-    env.run_in_parallel(scope, [&](ConsoleHandle& console, BotBaseContext& context){
-        pbf_press_button(context, BUTTON_R | BUTTON_L, 5, 3);
-    });
-
-    FastCodeEntrySettings settings(SETTINGS);
-
-    QClipboard* clipboard = QApplication::clipboard();
-#if 0
-    std::atomic<bool> cleared(false);
-    QMetaObject::invokeMethod(clipboard, [clipboard, &cleared, &env]{
-        clipboard->clear();
-        cleared.store(true, std::memory_order_release);
-        env.log("Clipboard cleared.");
-    }, Qt::QueuedConnection);
-
-    env.log("Clearing clipboard...");
-    while (!cleared.load(std::memory_order_acquire)){
-        scope.throw_if_cancelled();
-    }
-#endif
-    std::string start_text = clipboard->text().toStdString();
-
-    while (true){
-        std::string code = clipboard->text().toStdString();
-        if (code != start_text && !code.empty()){
-            const char* error = enter_code(env, scope, settings, code, false);
-            if (error == nullptr){
-                return;
-            }
-        }
-        scope.wait_for(std::chrono::milliseconds(1));
-    }
-
-}
-
-
-
-
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSV/Programs/FastCodeEntry/PokemonSV_ClipboardFastCodeEntry.h b/SerialPrograms/Source/PokemonSV/Programs/FastCodeEntry/PokemonSV_ClipboardFastCodeEntry.h
deleted file mode 100644
index 3521dcc562..0000000000
--- a/SerialPrograms/Source/PokemonSV/Programs/FastCodeEntry/PokemonSV_ClipboardFastCodeEntry.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*  Fast Code Entry (Clipboard)
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSV_ClipboardFastCodeEntry_H
-#define PokemonAutomation_PokemonSV_ClipboardFastCodeEntry_H
-
-#include "NintendoSwitch/NintendoSwitch_MultiSwitchProgram.h"
-#include "NintendoSwitch/Programs/NintendoSwitch_FastCodeEntry.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-
-class ClipboardFastCodeEntry_Descriptor : public MultiSwitchProgramDescriptor{
-public:
-    ClipboardFastCodeEntry_Descriptor();
-};
-
-
-
-
-class ClipboardFastCodeEntry : public MultiSwitchProgramInstance{
-public:
-    ClipboardFastCodeEntry();
-    virtual void program(MultiSwitchProgramEnvironment& env, CancellableScope& scope) override;
-
-private:
-    FastCodeEntrySettingsOption SETTINGS;
-};
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSV/Programs/FastCodeEntry/PokemonSV_CodeEntry.cpp b/SerialPrograms/Source/PokemonSV/Programs/FastCodeEntry/PokemonSV_CodeEntry.cpp
deleted file mode 100644
index 97359dc15f..0000000000
--- a/SerialPrograms/Source/PokemonSV/Programs/FastCodeEntry/PokemonSV_CodeEntry.cpp
+++ /dev/null
@@ -1,161 +0,0 @@
-/*  Code Entry
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <map>
-#include "CommonFramework/Tools/ConsoleHandle.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_DigitEntry.h"
-#include "NintendoSwitch/NintendoSwitch_MultiSwitchProgram.h"
-#include "PokemonSV_CodeEntry.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-
-const char* normalize_code(std::string& normalized_code, const std::string& code){
-    static const std::map<char, char> MAP{
-        {'1', '1'}, {'I', '1'}, {'i', '1'},
-        {'2', '2'},
-        {'3', '3'},
-        {'4', '4'},
-        {'5', '5'},
-        {'6', '6'},
-        {'7', '7'},
-        {'8', '8'},
-        {'9', '9'},
-        {'0', '0'}, {'O', '0'}, {'o', '0'},
-
-        {'Q', 'Q'}, {'q', 'Q'},
-        {'W', 'W'}, {'w', 'W'},
-        {'E', 'E'}, {'e', 'E'},
-        {'R', 'R'}, {'r', 'R'},
-        {'T', 'T'}, {'t', 'T'},
-        {'Y', 'Y'}, {'y', 'Y'},
-        {'U', 'U'}, {'u', 'U'},
-        {'P', 'P'}, {'p', 'P'},
-
-        {'A', 'A'}, {'a', 'A'},
-        {'S', 'S'}, {'s', 'S'}, {'Z', 'S'}, {'z', 'S'},
-        {'D', 'D'}, {'d', 'D'},
-        {'F', 'F'}, {'f', 'F'},
-        {'G', 'G'}, {'g', 'G'},
-        {'H', 'H'}, {'h', 'H'},
-        {'J', 'J'}, {'j', 'J'},
-        {'K', 'K'}, {'k', 'K'},
-        {'L', 'L'}, {'l', 'L'},
-
-        {'X', 'X'}, {'x', 'X'},
-        {'C', 'C'}, {'c', 'C'},
-        {'V', 'V'}, {'v', 'V'},
-        {'B', 'B'}, {'b', 'B'},
-        {'N', 'N'}, {'n', 'N'},
-        {'M', 'M'}, {'m', 'M'},
-    };
-
-    normalized_code.clear();
-
-    //  Prune invalid characters.
-    bool digits_only = true;
-    for (char ch : code){
-        auto iter = MAP.find(ch);
-        if (iter == MAP.end()){
-            continue;
-        }
-        ch = iter->second;
-        digits_only &= '0' <= ch && ch <= '9';
-        normalized_code += ch;
-    }
-
-    switch (normalized_code.size()){
-    case 4:
-        if (!digits_only){
-            return "4-digit codes must be only digits.";
-        }
-        break;
-    case 6:
-        break;
-    case 8:
-        if (!digits_only){
-            return "8-digit codes must be only digits.";
-        }
-        break;
-    default:
-        return "Invalid code length. Must be 4, 6, or 8 characters long.";
-    }
-
-    return nullptr;
-}
-
-void enter_code(
-    ConsoleHandle& console, BotBaseContext& context,
-    const FastCodeEntrySettings& settings, const std::string& normalized_code,
-    bool connect_controller_press
-){
-    if (connect_controller_press){
-        //  Connect the controller.
-        pbf_press_button(context, BUTTON_R | BUTTON_L, 5, 3);
-    }
-
-    switch (normalized_code.size()){
-    case 4:
-        enter_digits_str(context, 4, normalized_code.c_str());
-        break;
-    case 6:
-        enter_alphanumeric_code(
-            console.logger(), context,
-            settings,
-            normalized_code
-        );
-        break;
-    case 8:
-        enter_digits_str(context, 8, normalized_code.c_str());
-        break;
-    }
-}
-const char* enter_code(
-    MultiSwitchProgramEnvironment& env, CancellableScope& scope,
-    const FastCodeEntrySettings& settings, const std::string& code,
-    bool connect_controller_press
-){
-    std::string normalized_code;
-    const char* error = normalize_code(normalized_code, code);
-    if (error){
-        return error;
-    }
-
-    env.run_in_parallel(scope, [&](ConsoleHandle& console, BotBaseContext& context){
-        if (connect_controller_press){
-            //  Connect the controller.
-            pbf_press_button(context, BUTTON_R | BUTTON_L, 5, 3);
-        }
-
-        switch (normalized_code.size()){
-        case 4:
-            enter_digits_str(context, 4, normalized_code.c_str());
-            break;
-        case 6:
-            enter_alphanumeric_code(
-                console.logger(), context,
-                settings,
-                normalized_code
-            );
-            break;
-        case 8:
-            enter_digits_str(context, 8, normalized_code.c_str());
-            break;
-        }
-
-    });
-
-    return nullptr;
-}
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSV/Programs/FastCodeEntry/PokemonSV_CodeEntry.h b/SerialPrograms/Source/PokemonSV/Programs/FastCodeEntry/PokemonSV_CodeEntry.h
deleted file mode 100644
index d68f32bf2c..0000000000
--- a/SerialPrograms/Source/PokemonSV/Programs/FastCodeEntry/PokemonSV_CodeEntry.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*  Code Entry
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSV_CodeEntry_H
-#define PokemonAutomation_PokemonSV_CodeEntry_H
-
-#include <stdint.h>
-#include "NintendoSwitch/Programs/NintendoSwitch_FastCodeEntry.h"
-
-namespace PokemonAutomation{
-    class CancellableScope;
-    class BotBaseContext;
-    class ConsoleHandle;
-    class ProgramEnvironment;
-namespace NintendoSwitch{
-    class MultiSwitchProgramEnvironment;
-namespace PokemonSV{
-
-
-const char* normalize_code(std::string& normalized_code, const std::string& code);
-
-void enter_code(
-    ConsoleHandle& console, BotBaseContext& context,
-    const FastCodeEntrySettings& settings, const std::string& normalized_code,
-    bool connect_controller_press
-);
-
-const char* enter_code(
-    MultiSwitchProgramEnvironment& env, CancellableScope& scope,
-    const FastCodeEntrySettings& settings, const std::string& code,
-    bool connect_controller_press
-);
-
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSV/Programs/FastCodeEntry/PokemonSV_FastCodeEntry.cpp b/SerialPrograms/Source/PokemonSV/Programs/FastCodeEntry/PokemonSV_FastCodeEntry.cpp
deleted file mode 100644
index b10969a705..0000000000
--- a/SerialPrograms/Source/PokemonSV/Programs/FastCodeEntry/PokemonSV_FastCodeEntry.cpp
+++ /dev/null
@@ -1,142 +0,0 @@
-/*  Fast Code Entry
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <map>
-#include <mutex>
-#include <condition_variable>
-#include "Common/Cpp/Exceptions.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonSV_CodeEntry.h"
-#include "PokemonSV_FastCodeEntry.h"
-
-//#include <iostream>
-//using std::cout;
-//using std::endl;
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-using namespace Pokemon;
-
-
-
-FastCodeEntry_Descriptor::FastCodeEntry_Descriptor()
-    : MultiSwitchProgramDescriptor(
-        "PokemonSV:FastCodeEntry",
-        STRING_POKEMON + " SV", "Fast Code Entry (FCE)",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonSV/FastCodeEntry.md",
-        "Quickly enter a 4, 6, or 8 digit link code.",
-        FeedbackType::NONE,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB,
-        1, 4, 1
-    )
-{}
-
-FastCodeEntry::FastCodeEntry()
-    : MODE(
-        "<b>Mode:</b>",
-        {
-            {Mode::NORMAL, "normal", "Enter Code when clicking Start Program."},
-            {Mode::ENTER_ON_PASTE, "on-paste", "Start the program first. Code is entered when you paste into the code box."},
-        },
-        LockWhileRunning::LOCKED,
-        Mode::NORMAL
-    )
-    , CODE(
-        "<b>Link Code:</b><br>Must be 4-digit numeric or 6-digit alphanumeric. (not case sensitive)<br>"
-        "(Box is big so it's easy to land your mouse on.)",
-        LockWhileRunning::UNLOCKED,
-        "0123", "0123",
-        true
-    )
-{
-    PA_ADD_OPTION(MODE);
-    PA_ADD_OPTION(CODE);
-    PA_ADD_OPTION(SETTINGS);
-}
-
-
-
-
-class FceCodeListener : public ConfigOption::Listener, public TextEditOption::FocusListener{
-public:
-    FceCodeListener(TextEditOption& code_box)
-        : m_code_box(code_box)
-    {
-        code_box.add_listener(*this);
-    }
-    ~FceCodeListener(){
-        m_code_box.remove_listener(*this);
-    }
-
-    virtual void value_changed() override{
-        std::lock_guard<std::mutex> lg(m_lock);
-        m_cv.notify_all();
-    }
-//    virtual void focus_in() override{
-//        std::lock_guard<std::mutex> lg(m_lock);
-//        m_cv.notify_all();
-//    }
-
-    void run(
-        MultiSwitchProgramEnvironment& env, CancellableScope& scope,
-        const FastCodeEntrySettings& settings
-    ){
-//        const QClipboard* clipboard = QApplication::clipboard();
-
-        std::unique_lock<std::mutex> lg(m_lock);
-        while (true){
-            std::string code = m_code_box;
-//            if (code.empty()){
-//                code = clipboard->text().toStdString();
-//            }
-            if (!code.empty()){
-                const char* error = enter_code(env, scope, settings, code, false);
-                if (error == nullptr){
-                    return;
-                }
-            }
-            scope.throw_if_cancelled();
-            m_cv.wait_for(lg, std::chrono::milliseconds(1));
-        }
-    }
-
-private:
-    TextEditOption& m_code_box;
-    std::mutex m_lock;
-    std::condition_variable m_cv;
-};
-
-
-void FastCodeEntry::program(MultiSwitchProgramEnvironment& env, CancellableScope& scope){
-    FastCodeEntrySettings settings(SETTINGS);
-
-    if (MODE == Mode::NORMAL){
-        const char* error = enter_code(env, scope, settings, CODE, true);
-        if (error){
-            throw UserSetupError(env.logger(), error);
-        }
-        return;
-    }
-
-    //  Connect the controller.
-    env.run_in_parallel(scope, [&](ConsoleHandle& console, BotBaseContext& context){
-        pbf_press_button(context, BUTTON_R | BUTTON_L, 5, 3);
-    });
-
-    FceCodeListener listener(CODE);
-    listener.run(env, scope, settings);
-
-}
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSV/Programs/FastCodeEntry/PokemonSV_FastCodeEntry.h b/SerialPrograms/Source/PokemonSV/Programs/FastCodeEntry/PokemonSV_FastCodeEntry.h
deleted file mode 100644
index fb633cc466..0000000000
--- a/SerialPrograms/Source/PokemonSV/Programs/FastCodeEntry/PokemonSV_FastCodeEntry.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*  Fast Code Entry
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSV_FastCodeEntry_H
-#define PokemonAutomation_PokemonSV_FastCodeEntry_H
-
-#include "Common/Cpp/Options/TextEditOption.h"
-#include "NintendoSwitch/NintendoSwitch_MultiSwitchProgram.h"
-#include "NintendoSwitch/Programs/NintendoSwitch_FastCodeEntry.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-
-
-class FastCodeEntry_Descriptor : public MultiSwitchProgramDescriptor{
-public:
-    FastCodeEntry_Descriptor();
-};
-
-
-
-
-class FastCodeEntry : public MultiSwitchProgramInstance{
-public:
-    FastCodeEntry();
-    virtual void program(MultiSwitchProgramEnvironment& env, CancellableScope& scope) override;
-
-private:
-    enum class Mode{
-        NORMAL,
-        ENTER_ON_PASTE,
-    };
-    EnumDropdownOption<Mode> MODE;
-
-    TextEditOption CODE;
-
-    FastCodeEntrySettingsOption SETTINGS;
-};
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSV/Programs/FastCodeEntry/PokemonSV_VideoFastCodeEntry.cpp b/SerialPrograms/Source/PokemonSV/Programs/FastCodeEntry/PokemonSV_VideoFastCodeEntry.cpp
deleted file mode 100644
index b369e5f465..0000000000
--- a/SerialPrograms/Source/PokemonSV/Programs/FastCodeEntry/PokemonSV_VideoFastCodeEntry.cpp
+++ /dev/null
@@ -1,166 +0,0 @@
-/*  Video Fast Code Entry
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Cpp/CancellableScope.h"
-#include "Common/Cpp/Concurrency/AsyncDispatcher.h"
-//#include "CommonFramework/GlobalSettingsPanel.h"
-#include "CommonFramework/Notifications/ProgramNotifications.h"
-#include "CommonFramework/ImageTools/ImageFilter.h"
-#include "CommonFramework/ImageMatch/ImageDiff.h"
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "CommonFramework/OCR/OCR_RawOCR.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonSV/Inference/Tera/PokemonSV_TeraCodeReader.h"
-#include "PokemonSV_CodeEntry.h"
-#include "PokemonSV_VideoFastCodeEntry.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-using namespace Pokemon;
-
-
-VideoFastCodeEntry_Descriptor::VideoFastCodeEntry_Descriptor()
-    : MultiSwitchProgramDescriptor(
-        "PokemonSV:VideoFastCodeEntry",
-        STRING_POKEMON + " SV", "Video Fast Code Entry (V-FCE)",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonSV/VideoFastCodeEntry.md",
-        "Read a 4, 6, or 8 digit link code from someone on your screen and enter it as quickly as possible.",
-        FeedbackType::NONE,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB,
-        1, 4, 1
-    )
-{}
-
-VideoFastCodeEntry::VideoFastCodeEntry()
-    : SCREEN_WATCHER("Capture Box:")
-    , MODE(
-        "<b>Mode:</b>",
-        {
-            {Mode::MANUAL,      "manual",   "Manual - Enter code when you start the program."},
-            {Mode::AUTOMATIC,   "auto",     "Automatic - Monitor the region. Automatically enter code when it appears."},
-        },
-        LockWhileRunning::LOCKED,
-        Mode::MANUAL
-    )
-    , SKIP_CONNECT_TO_CONTROLLER(
-        "<b>Skip Connect to Controller:</b><br>"
-        "If you know your controllers are already connected, you can skip this to save 64 milliseconds. (only applies to manual mode)",
-        LockWhileRunning::LOCKED,
-        false
-    )
-    , OCR_METHOD(
-        "<b>Text Recognition Method:</b><br>"
-        "Each text recognition method has its own strengths and weaknesses. This option lets you choose which method to use.",
-        {
-            {OcrMethod::RAW_OCR,     "raw-ocr",          "Raw OCR. No image pre-processing."},
-            {OcrMethod::BLACK_TEXT,  "black-on-white",   "Filter: Black Text on White Background"},
-            {OcrMethod::WHITE_TEXT,  "white-on-black",   "Filter: White Text on Black Background"},
-            {OcrMethod::TERA_CARD,   "tera-card",        "Tera Card"},
-        },
-        LockWhileRunning::LOCKED,
-        OcrMethod::TERA_CARD
-    )
-    , NOTIFICATIONS({
-        &NOTIFICATION_PROGRAM_FINISH,
-    })
-{
-    PA_ADD_OPTION(SCREEN_WATCHER);
-    PA_ADD_OPTION(MODE);
-    PA_ADD_OPTION(SKIP_CONNECT_TO_CONTROLLER);
-    PA_ADD_OPTION(OCR_METHOD);
-    PA_ADD_OPTION(SETTINGS);
-    PA_ADD_OPTION(NOTIFICATIONS);
-
-    //  Preload the OCR data.
-    OCR::ensure_instances(Language::English, 6);
-    preload_code_templates();
-}
-
-
-void VideoFastCodeEntry::program(MultiSwitchProgramEnvironment& env, CancellableScope& scope){
-    FastCodeEntrySettings settings(SETTINGS);
-
-    if (MODE == Mode::MANUAL){
-        std::string code = read_raid_code(env.logger(), env.realtime_dispatcher(), SCREEN_WATCHER.screenshot());
-        const char* error = enter_code(env, scope, settings, code, !SKIP_CONNECT_TO_CONTROLLER);
-        if (error){
-            env.log("No valid code found: " + std::string(error), COLOR_RED);
-        }
-        return;
-    }
-
-    //  Connect the controller.
-    env.run_in_parallel(scope, [&](ConsoleHandle& console, BotBaseContext& context){
-        pbf_press_button(context, BUTTON_PLUS, 5, 3);
-    });
-
-    //  Preload 6 threads to OCR the code.
-    env.realtime_dispatcher().ensure_threads(6);
-
-
-    VideoSnapshot snapshot;
-    while (true){
-        scope.throw_if_cancelled();
-        VideoSnapshot current = SCREEN_WATCHER.screenshot();
-
-//        env.log("start");
-
-        if (snapshot && current &&
-            snapshot->width() == current->width() &&
-            snapshot->height() == current->height()
-        ){
-            double rmsd = ImageMatch::pixel_RMSD(snapshot, current);
-            if (rmsd < 2){
-                scope.wait_for(std::chrono::milliseconds(1));
-                continue;
-            }
-        }
-        snapshot = std::move(current);
-//        env.log("done new frame check");
-
-        std::string code;
-        switch (OCR_METHOD){
-        case OcrMethod::RAW_OCR:
-            code = OCR::ocr_read(Language::English, snapshot);
-            env.log("OCR: " + code);
-            break;
-        case OcrMethod::BLACK_TEXT:{
-            ImageRGB32 filtered = to_blackwhite_rgb32_range(snapshot, 0xff000000, 0xff7f7f7f, true);
-            code = OCR::ocr_read(Language::English, filtered);
-            env.log("OCR: " + code);
-            break;
-        }
-        case OcrMethod::WHITE_TEXT:{
-            ImageRGB32 filtered = to_blackwhite_rgb32_range(snapshot, 0xffc0c0c0, 0xffffffff, true);
-            code = OCR::ocr_read(Language::English, filtered);
-            env.log("OCR: " + code);
-            break;
-        }
-        case OcrMethod::TERA_CARD:
-            code = read_raid_code(env.logger(), env.realtime_dispatcher(), snapshot);
-        }
-        const char* error = enter_code(env, scope, settings, code, false);
-        if (error == nullptr){
-            break;
-        }else{
-            env.log(std::string("Invalid Code: ") + error, COLOR_RED);
-        }
-    }
-
-    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
-}
-
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSV/Programs/FastCodeEntry/PokemonSV_VideoFastCodeEntry.h b/SerialPrograms/Source/PokemonSV/Programs/FastCodeEntry/PokemonSV_VideoFastCodeEntry.h
deleted file mode 100644
index 14e3527b6b..0000000000
--- a/SerialPrograms/Source/PokemonSV/Programs/FastCodeEntry/PokemonSV_VideoFastCodeEntry.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*  Video Fast Code Entry
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSV_VideoFastCodeEntry_H
-#define PokemonAutomation_PokemonSV_VideoFastCodeEntry_H
-
-#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
-#include "Common/Cpp/Options/EnumDropdownOption.h"
-#include "CommonFramework/Options/ScreenWatchOption.h"
-#include "CommonFramework/Notifications/EventNotificationsTable.h"
-#include "NintendoSwitch/NintendoSwitch_MultiSwitchProgram.h"
-#include "NintendoSwitch/Programs/NintendoSwitch_FastCodeEntry.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-
-
-class VideoFastCodeEntry_Descriptor : public MultiSwitchProgramDescriptor{
-public:
-    VideoFastCodeEntry_Descriptor();
-};
-
-
-
-
-class VideoFastCodeEntry : public MultiSwitchProgramInstance{
-public:
-    VideoFastCodeEntry();
-    virtual void program(MultiSwitchProgramEnvironment& env, CancellableScope& scope) override;
-
-private:
-    ScreenWatchOption SCREEN_WATCHER;
-
-    enum class Mode{
-        MANUAL,
-        AUTOMATIC,
-    };
-    EnumDropdownOption<Mode> MODE;
-
-    BooleanCheckBoxOption SKIP_CONNECT_TO_CONTROLLER;
-
-    enum OcrMethod{
-        RAW_OCR,
-        BLACK_TEXT,
-        WHITE_TEXT,
-        TERA_CARD,
-    };
-    EnumDropdownOption<OcrMethod> OCR_METHOD;
-
-    FastCodeEntrySettingsOption SETTINGS;
-    EventNotificationsOption NOTIFICATIONS;
-};
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_AuctionFarmer.cpp b/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_AuctionFarmer.cpp
deleted file mode 100644
index 581bb61555..0000000000
--- a/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_AuctionFarmer.cpp
+++ /dev/null
@@ -1,505 +0,0 @@
-/*  Auction Farmer
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/GlobalSettingsPanel.h"
-#include "CommonFramework/Exceptions/FatalProgramException.h"
-#include "CommonFramework/Exceptions/OperationFailedException.h"
-#include "CommonFramework/ImageTools/BinaryImage_FilterRgb32.h"
-#include "CommonFramework/ImageTypes/BinaryImage.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
-#include "CommonFramework/Notifications/ProgramNotifications.h"
-#include "CommonFramework/OCR/OCR_NumberReader.h"
-#include "CommonFramework/Tools/StatsTracking.h"
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "CommonFramework/VideoPipeline/VideoOverlay.h"
-#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
-#include "CommonFramework/Tools/VideoResolutionCheck.h"
-#include "Kernels/Waterfill/Kernels_Waterfill_Session.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonSV/PokemonSV_Settings.h"
-#include "PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h"
-#include "PokemonSV/Inference/PokemonSV_AuctionItemNameReader.h"
-#include "PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h"
-#include "PokemonSV/Programs/PokemonSV_GameEntry.h"
-#include "PokemonSV/Programs/PokemonSV_SaveGame.h"
-#include "PokemonSV/Resources/PokemonSV_AuctionItemNames.h"
-#include "PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-
-#include "PokemonSV_AuctionFarmer.h"
-
-#include <iostream>
-#include <unordered_map>
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-using namespace Pokemon;
-
-
-AuctionFarmer_Descriptor::AuctionFarmer_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonSV:AuctionFarmer",
-        STRING_POKEMON + " SV", "Auction Farmer",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonSV/AuctionFarmer.md",
-        "Check auctions and bid on items.",
-        FeedbackType::REQUIRED,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-
-struct AuctionFarmer_Descriptor::Stats : public StatsTracker {
-    Stats()
-        : m_resets(m_stats["Resets"])
-        , m_auctions(m_stats["Auctions"])
-        , m_money(m_stats["Spent Money"])
-        , m_errors(m_stats["Errors"])
-    {
-        m_display_order.emplace_back("Resets");
-        m_display_order.emplace_back("Auctions");
-        m_display_order.emplace_back("Spent Money");
-        m_display_order.emplace_back("Errors", true);
-    }
-    std::atomic<uint64_t>& m_resets;
-    std::atomic<uint64_t>& m_auctions;
-    std::atomic<uint64_t>& m_money;
-    std::atomic<uint64_t>& m_errors;
-};
-std::unique_ptr<StatsTracker> AuctionFarmer_Descriptor::make_stats() const{
-    return std::unique_ptr<StatsTracker>(new Stats());
-}
-
-
-AuctionFarmer::AuctionFarmer()
-    : LANGUAGE(
-        "<b>Game Language:</b><br>The language is needed to read which items are offered.",
-        AuctionItemNameReader::instance().languages(),
-        LockWhileRunning::LOCKED,
-        true
-    )
-    , TARGET_ITEMS("<b>Items:</b><br>Multiple Items can be selected. The program will bid on any selected item which is offered.")
-    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
-    , NOTIFICATION_AUCTION_WIN("Auction Win", true, false, ImageAttachmentMode::JPG, {"Notifs"})
-    , NOTIFICATIONS({
-        &NOTIFICATION_STATUS_UPDATE,
-        &NOTIFICATION_AUCTION_WIN,
-        &NOTIFICATION_PROGRAM_FINISH,
-        &NOTIFICATION_ERROR_RECOVERABLE,
-        &NOTIFICATION_ERROR_FATAL,
-    })
-    , m_advanced_options("<font size=4><b>Advanced Options: (developer only)</b></font>")
-    , ONE_NPC("<b>One NPC:</b><br>Check only the NPC you're standing in front of. (Multiple NPCs in development)", LockWhileRunning::LOCKED, true)
-{
-    PA_ADD_OPTION(LANGUAGE);
-    PA_ADD_OPTION(TARGET_ITEMS);
-    PA_ADD_OPTION(NOTIFICATIONS);
-    if (PreloadSettings::instance().DEVELOPER_MODE) {
-        PA_ADD_STATIC(m_advanced_options);
-        PA_ADD_OPTION(ONE_NPC);
-    }
-}
-
-
-std::vector<ImageFloatBox> AuctionFarmer::detect_dialog_boxes(const ImageViewRGB32& screen) {
-    using namespace Kernels::Waterfill;
-
-    uint32_t MIN_BORDER_THRESHOLD = 0xffc07000;
-    uint32_t MAX_BORDER_THRESHOLD = 0xffffc550;
-
-    uint32_t MIN_YELLOW_THRESHOLD = 0xffd0b000;
-    uint32_t MAX_YELLOW_THRESHOLD = 0xffffff30;
-
-    size_t width = screen.width();
-    size_t height = screen.height();
-
-
-    std::vector<ImageFloatBox> dialog_boxes;
-    {
-        PackedBinaryMatrix border_matrix = compress_rgb32_to_binary_range(screen, MIN_BORDER_THRESHOLD, MAX_BORDER_THRESHOLD);
-
-        std::unique_ptr<WaterfillSession> session = make_WaterfillSession(border_matrix);
-        auto iter = session->make_iterator(50);
-        WaterfillObject object;
-        while (iter->find_next(object, true)) {
-            //  Discard objects touching the edge of the screen or bottom right corner where the map is located or if the object is too small
-            if (object.min_x == 0 || object.min_y == 0 // touching left or top edge
-                || object.max_x + 1 >= width || object.max_y + 1 >= height // touching right or bottom edge
-                || (object.max_x > width * 0.82 && object.max_y > height * 0.68) // touches mini map area
-                || object.width() < width * 0.0926 || object.height() < height * 0.0926 // object is too small
-            ){
-                continue;
-            }
-
-            // check for yellow inside the orange border
-            ImagePixelBox border_pixel_box(object);
-            ImageFloatBox border_float_box = pixelbox_to_floatbox(screen, border_pixel_box);
-            ImageViewRGB32 dialog = extract_box_reference(screen, border_pixel_box);
-
-            PackedBinaryMatrix yellow_matrix = compress_rgb32_to_binary_range(dialog, MIN_YELLOW_THRESHOLD, MAX_YELLOW_THRESHOLD);
-
-            std::unique_ptr<WaterfillSession> yellow_session = make_WaterfillSession(yellow_matrix);
-            auto yellow_iter = yellow_session->make_iterator(300);
-            WaterfillObject yellow_object;
-            while (yellow_iter->find_next(yellow_object, true)) {
-                //  Discard small objects
-                if (object.width() < width * 0.0925 || object.height() < height * 0.0925) {
-                    continue;
-                }
-                ImagePixelBox dialog_pixel_box(yellow_object);
-                
-                ImageFloatBox translated_dialog_box = translate_to_parent(screen, border_float_box, dialog_pixel_box);
-                dialog_boxes.emplace_back(translated_dialog_box);
-            }
-        }
-    }
-    return dialog_boxes;
-}
-
-
-void AuctionFarmer::reset_auctions(SingleSwitchProgramEnvironment& env, BotBaseContext& context, bool do_full_reset, uint8_t& year){
-    try{
-        if (do_full_reset){
-            if (year == MAX_YEAR){
-                pbf_press_button(context, BUTTON_HOME, 10, GameSettings::instance().GAME_TO_HOME_DELAY);
-                home_roll_date_enter_game_autorollback(env.console, context, year);
-            }
-            save_game_from_overworld(env.program_info(), env.console, context);
-
-            pbf_press_button(context, BUTTON_HOME, 10, GameSettings::instance().GAME_TO_HOME_DELAY);
-            home_roll_date_enter_game_autorollback(env.console, context, year);
-        }
-        pbf_wait(context, 1 * TICKS_PER_SECOND);
-
-        pbf_press_button(context, BUTTON_HOME, 10, GameSettings::instance().GAME_TO_HOME_DELAY);
-        context.wait_for_all_requests();
-        reset_game_from_home(env.program_info(), env.console, context, TICKS_PER_SECOND);
-    }catch (OperationFailedException& e){
-        AuctionFarmer_Descriptor::Stats& stats = env.current_stats<AuctionFarmer_Descriptor::Stats>();
-        stats.m_errors++;
-        env.update_stats();
-        throw FatalProgramException(std::move(e));
-    }
-}
-
-std::vector<std::pair<AuctionOffer, ImageFloatBox>> AuctionFarmer::check_offers(SingleSwitchProgramEnvironment& env, BotBaseContext& context) {
-    AuctionFarmer_Descriptor::Stats& stats = env.current_stats<AuctionFarmer_Descriptor::Stats>();
-
-    pbf_wait(context, 2 * TICKS_PER_SECOND);
-    context.wait_for_all_requests();
-    
-    VideoSnapshot screen = env.console.video().snapshot();
-    std::vector<ImageFloatBox> dialog_boxes = detect_dialog_boxes(screen);
-    std::vector<std::pair<AuctionOffer, ImageFloatBox>> offers;
-
-    if (dialog_boxes.empty()) {
-        stats.m_errors++;
-        send_program_recoverable_error_notification(env, NOTIFICATION_ERROR_RECOVERABLE, "Could not detect any offer dialogs.", screen);
-    }
-
-    // read dialog bubble
-    for (ImageFloatBox dialog_box : dialog_boxes){
-        OverlayBoxScope dialog_overlay(env.console, dialog_box, COLOR_DARK_BLUE);
-
-        ImageFloatBox offer_box(0.05, 0.02, 0.90, 0.49);
-        ImageFloatBox translated_offer_box = translate_to_parent(screen, dialog_box, floatbox_to_pixelbox(dialog_box.width, dialog_box.height, offer_box));
-        OverlayBoxScope offer_overlay(env.console, translated_offer_box, COLOR_BLUE);
-        
-        ImageViewRGB32 dialog = extract_box_reference(screen, dialog_box);
-        ImageViewRGB32 offer_image = extract_box_reference(dialog, offer_box);
-
-
-        const double LOG10P_THRESHOLD = -1.5;
-        std::string best_item;
-        OCR::StringMatchResult result = AuctionItemNameReader::instance().read_substring(
-            env.console, LANGUAGE,
-            offer_image,
-            OCR::BLACK_TEXT_FILTERS()
-        );
-
-        result.clear_beyond_log10p(LOG10P_THRESHOLD);
-        if (best_item.empty() && !result.results.empty()) {
-            auto iter = result.results.begin();
-            if (iter->first < LOG10P_THRESHOLD) {
-                best_item = iter->second.token;
-
-                AuctionOffer offer{ best_item };
-                std::pair<AuctionOffer, ImageFloatBox> pair(offer, dialog_box);
-                offers.emplace_back(pair);
-            }
-        }
-    }
-    return offers;
-}
-
-bool AuctionFarmer::is_good_offer(AuctionOffer offer) {
-    // Special handling for Japanese bottle cap items
-    bool any_bottle_cap = false;
-    if (LANGUAGE == Language::Japanese) {
-        any_bottle_cap = (offer.item == "bottle-cap" || offer.item == "gold-bottle-cap") 
-            && (TARGET_ITEMS.find_item("bottle-cap") || TARGET_ITEMS.find_item("gold-bottle-cap"));
-    }
-
-    return TARGET_ITEMS.find_item(offer.item) || any_bottle_cap ;
-}
-
-// Move to auctioneer and interact
-void AuctionFarmer::move_to_auctioneer(SingleSwitchProgramEnvironment& env, BotBaseContext& context, AuctionOffer offer) {
-    AdvanceDialogWatcher advance_detector(COLOR_YELLOW);
-
-    size_t tries = 0;
-    while (tries < 10) {
-        if (!ONE_NPC) {
-            move_dialog_to_center(env, context, offer);
-            pbf_move_left_joystick(context, 128, 0, 60, 10);
-        }
-
-        pbf_press_button(context, BUTTON_A, 20, 100);
-        int ret = wait_until(env.console, context, Milliseconds(4000), { advance_detector });
-
-        if (ret == 0) {
-            return;
-        }
-        tries++;
-    }
-    throw OperationFailedException(
-        ErrorReport::SEND_ERROR_REPORT, env.console,
-        "Too many attempts to talk to the NPC.",
-        true
-    );
-}
-
-// Dialog is the only piece of orientation we have, so the goal is to put it into the center of the screen so we know in which direction the character walks.
-// This is only used for multiple NPCs.
-void AuctionFarmer::move_dialog_to_center(SingleSwitchProgramEnvironment& env, BotBaseContext& context, AuctionOffer wanted) {
-    float center_x = 0.0f;
-    float center_y = 0.0f;
-    bool offer_visible = false;
-
-    while (center_x < 0.43 || center_x > 0.57) {
-        context.wait_for_all_requests();
-        std::vector<std::pair<AuctionOffer, ImageFloatBox>> offers = check_offers(env, context);
-
-        for (std::pair<AuctionOffer, ImageFloatBox> offer : offers) {
-            if (offer.first.item != wanted.item) {
-                continue;
-            }
-            offer_visible = true;
-
-            center_x = offer.second.x + (0.5 * offer.second.width);
-            center_y = offer.second.y + (0.5 * offer.second.height);
-
-
-            // check whether the stop condition is fullfilled by now.
-            if (!(center_x < 0.43 || center_x > 0.57)) {
-                break;
-            }
-
-            uint8_t distance_x = (uint16_t)((center_x) * 255);
-            uint8_t distance_y = (uint16_t)((center_y * 255));
-            env.console.log(std::to_string(distance_x));
-            env.console.log(std::to_string(distance_y));
-
-            pbf_move_right_joystick(context, distance_x, distance_y, 20, 20);
-
-            break;
-        }
-
-        if (!offer_visible) {
-            throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, env.console,
-                "Lost offer dialog for wanted item.",
-                true
-            );
-        }
-    }
-}
-
-void AuctionFarmer::reset_position(SingleSwitchProgramEnvironment& env, BotBaseContext& context) {
-    if (ONE_NPC) {
-        // No movement, player character should always be directly in front of an auctioneer.
-        return;
-    }
-
-    // move backwards, TODO: check position(?) and orientation
-    pbf_move_left_joystick(context, 128, 255, 50, 20);
-    return;
-}
-
-
-uint64_t read_next_bid(ConsoleHandle& console, BotBaseContext& context, bool high) {
-    float box_y = high ? 0.42f : 0.493f;
-    OverlayBoxScope box(console, { 0.73, box_y, 0.17, 0.048 });
-    std::unordered_map<uint64_t, size_t> read_bids;
-    size_t highest_read = 0;
-    uint64_t read_value = 0;
-
-    // read next bid multiple times since the selection arrow sometimes blocks the first digit
-    for (size_t i = 0; i < 10; i++) {
-        VideoSnapshot screen = console.video().snapshot();
-        uint64_t read_bid = OCR::read_number(console.logger(), extract_box_reference(screen, box));
-
-        if (read_bids.find(read_bid) == read_bids.end()) {
-            read_bids[read_bid] = 0;
-        }
-        read_bids[read_bid] += 1;
-
-        if (read_bids[read_bid] > highest_read) {
-            highest_read = read_bids[read_bid];
-            read_value = read_bid;
-        }
-        context.wait_for(Milliseconds(20));
-    }
-
-    console.log("Next bid: " + std::to_string(read_value));
-    return read_value;
-}
-
-void AuctionFarmer::bid_on_item(SingleSwitchProgramEnvironment& env, BotBaseContext& context, AuctionOffer offer) {
-    AuctionFarmer_Descriptor::Stats& stats = env.current_stats<AuctionFarmer_Descriptor::Stats>();
-
-    VideoSnapshot offer_screen = env.console.video().snapshot();
-
-    AdvanceDialogWatcher advance_detector(COLOR_YELLOW);
-    PromptDialogWatcher high_detector(COLOR_RED, { 0.50, 0.40, 0.40, 0.082 });
-    PromptDialogWatcher mid_detector(COLOR_PURPLE, { 0.50, 0.475, 0.40, 0.082 });
-    PromptDialogWatcher low_detector(COLOR_PURPLE, { 0.50, 0.55, 0.40, 0.082 });
-    OverworldWatcher overworld_detector(COLOR_BLUE);
-    bool won_auction = true;
-    bool auction_ongoing = true;
-    int64_t current_bid = 0;
-
-    context.wait_for_all_requests();
-    while (auction_ongoing) {
-        int ret = wait_until(env.console, context, Milliseconds(5000), { advance_detector, high_detector, mid_detector, low_detector, overworld_detector });
-        context.wait_for(Milliseconds(100));
-
-        switch (ret) {
-        case 0:
-            pbf_press_button(context, BUTTON_A, 20, TICKS_PER_SECOND);
-            break;
-        case 1:
-            current_bid = read_next_bid(env.console, context, true);
-            pbf_press_button(context, BUTTON_A, 20, TICKS_PER_SECOND);
-            break;
-        case 2:
-            current_bid = read_next_bid(env.console, context, false);
-            pbf_press_button(context, BUTTON_A, 20, TICKS_PER_SECOND);
-            break;
-        case 3:
-            pbf_press_button(context, BUTTON_A, 20, TICKS_PER_SECOND);
-            break;
-        case 4:
-            auction_ongoing = false;
-            break;
-        default:
-            break;
-        }
-        context.wait_for_all_requests();
-    }
-
-    if (won_auction) {
-        stats.m_auctions++;
-        if (current_bid >= 0) {
-            stats.m_money += current_bid;
-        }
-        env.update_stats();
-        send_program_notification(
-            env, NOTIFICATION_AUCTION_WIN,
-            COLOR_GREEN, "Auction won!",
-            {
-                { "Item:", get_auction_item_name(offer.item).display_name() },
-                { "Final Bid:", std::to_string(current_bid) },
-            }
-            , "", offer_screen);
-    }
-
-    return;
-}
-
-void AuctionFarmer::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    assert_16_9_720p_min(env.logger(), env.console);
-
-    AuctionFarmer_Descriptor::Stats& stats = env.current_stats<AuctionFarmer_Descriptor::Stats>();
-
-    //  Connect the controller.
-    pbf_press_button(context, BUTTON_LCLICK, 10, 0);
-    pbf_wait(context, TICKS_PER_SECOND);
-    context.wait_for_all_requests();
-
-    uint8_t year = MAX_YEAR;
-
-
-    while (true) {
-        send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
-
-        reset_auctions(env, context, true, year);
-        stats.m_resets++;
-        env.update_stats();
-        
-        bool good_offer = false;
-        while (!good_offer) {
-            size_t npc_tries = 0;
-            if (!ONE_NPC) {
-                pbf_move_right_joystick(context, 128, 255, 2 * TICKS_PER_SECOND, 20);
-            }
-
-            std::vector<std::pair<AuctionOffer, ImageFloatBox>> offers = check_offers(env, context);
-            for (std::pair<AuctionOffer, ImageFloatBox>& offer_pair : offers){
-                AuctionOffer offer = offer_pair.first;
-                if (is_good_offer(offer)) {
-                    try {
-                        move_to_auctioneer(env, context, offer);
-                    }
-                    catch (OperationFailedException& e){
-                        stats.m_errors++;
-                        e.send_notification(env, NOTIFICATION_ERROR_RECOVERABLE);
-
-                        npc_tries++;
-                        // if ONE_NPC the program already tries multiple times without change to compensate for dropped inputs
-                        // at this point it is more likely to be non-recoverable
-                        size_t max_npc_tries = ONE_NPC ? 1 : 3;
-
-                        if (npc_tries < max_npc_tries) {
-                            VideoSnapshot screen = env.console.video().snapshot();
-                            send_program_recoverable_error_notification(env, NOTIFICATION_ERROR_RECOVERABLE, e.message(), screen);
-                        }
-                        else {
-                            throw OperationFailedException(
-                                ErrorReport::SEND_ERROR_REPORT, env.console,
-                                "Failed to talk to the NPC!",
-                                true
-                            );
-                        }
-                        break;
-                    }
-
-                    bid_on_item(env, context, offer);
-                    reset_position(env, context);
-
-                    good_offer = true;
-                }
-            }
-            if (!good_offer){
-                reset_auctions(env, context, false, year);
-                stats.m_resets++;
-            }
-
-            env.update_stats();
-            pbf_wait(context, 125);
-            context.wait_for_all_requests();
-        }
-    }
-        
-}
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_AuctionFarmer.h b/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_AuctionFarmer.h
deleted file mode 100644
index 0a212a1a7a..0000000000
--- a/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_AuctionFarmer.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*  Auction Farmer
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSV_AuctionFarmer_H
-#define PokemonAutomation_PokemonSV_AuctionFarmer_H
-
-#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
-#include "Common/Cpp/Options/StaticTextOption.h"
-#include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "CommonFramework/Notifications/EventNotificationsTable.h"
-#include "CommonFramework/Options/LanguageOCROption.h"
-#include "PokemonSV/Options/PokemonSV_AuctionItemTable.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-struct AuctionOffer {
-    std::string item;
-};
-
-class AuctionFarmer_Descriptor : public SingleSwitchProgramDescriptor{
-public:
-    AuctionFarmer_Descriptor();
-
-    struct Stats;
-    virtual std::unique_ptr<StatsTracker> make_stats() const override;
-
-};
-
-
-
-
-class AuctionFarmer : public SingleSwitchProgramInstance{
-public:
-    AuctionFarmer();
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-    OCR::LanguageOCROption LANGUAGE;
-    AuctionItemTable TARGET_ITEMS;
-    
-    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
-    EventNotificationOption NOTIFICATION_AUCTION_WIN;
-    EventNotificationsOption NOTIFICATIONS;
-
-    SectionDividerOption m_advanced_options;
-    BooleanCheckBoxOption ONE_NPC;
-
-    std::vector<ImageFloatBox> detect_dialog_boxes(const ImageViewRGB32& screen);
-    void reset_auctions(SingleSwitchProgramEnvironment& env, BotBaseContext& context, bool do_full_reset, uint8_t& year);
-    std::vector<std::pair<AuctionOffer, ImageFloatBox>> check_offers(SingleSwitchProgramEnvironment& env, BotBaseContext& context);
-    void move_to_auctioneer(SingleSwitchProgramEnvironment& env, BotBaseContext& context, AuctionOffer wanted);
-    void move_dialog_to_center(SingleSwitchProgramEnvironment& env, BotBaseContext& context, AuctionOffer offer);
-    void bid_on_item(SingleSwitchProgramEnvironment& env, BotBaseContext& context, AuctionOffer offer);
-    bool is_good_offer(AuctionOffer);
-    void reset_position(SingleSwitchProgramEnvironment& env, BotBaseContext& context);
-};
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_AutonomousBallThrower.cpp b/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_AutonomousBallThrower.cpp
deleted file mode 100644
index 461fcf67fe..0000000000
--- a/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_AutonomousBallThrower.cpp
+++ /dev/null
@@ -1,139 +0,0 @@
-/*  Autonomous Ball Thrower
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/Exceptions/FatalProgramException.h"
-#include "CommonFramework/Notifications/ProgramNotifications.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
-#include "CommonFramework/Tools/StatsTracking.h"
-#include "CommonFramework/Tools/VideoResolutionCheck.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "Pokemon/Inference/Pokemon_NameReader.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonSV/Inference/Battles/PokemonSV_BattleBallReader.h"
-#include "PokemonSV/Inference/Battles/PokemonSV_NormalBattleMenus.h"
-#include "PokemonSV/Programs/PokemonSV_BasicCatcher.h"
-#include "PokemonSV_AutonomousBallThrower.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-using namespace Pokemon;
-
-
-AutonomousBallThrower_Descriptor::AutonomousBallThrower_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonSV:AutonomousBallThrower",
-        STRING_POKEMON + " SV", "Autonomous Ball Thrower",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonSV/AutonomousBallThrower.md",
-        "Repeatedly throw a ball until you catch the pokemon.",
-        FeedbackType::REQUIRED,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-struct AutonomousBallThrower_Descriptor::Stats : public StatsTracker{
-    Stats()
-        : m_balls(m_stats["Balls Thrown"])
-    {
-        m_display_order.emplace_back("Balls Thrown");
-    }
-    std::atomic<uint64_t>& m_balls;
-};
-std::unique_ptr<StatsTracker> AutonomousBallThrower_Descriptor::make_stats() const{
-    return std::unique_ptr<StatsTracker>(new Stats());
-}
-
-
-
-AutonomousBallThrower::AutonomousBallThrower()
-    : LANGUAGE(
-        "<b>Game Language:</b>",
-        PokemonNameReader::instance().languages(),
-        LockWhileRunning::UNLOCKED
-    )
-    , BALL_SELECT(
-        "<b>Ball Select:</b>",
-        LockWhileRunning::UNLOCKED,
-        "poke-ball"
-    )
-    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
-    , NOTIFICATIONS({
-        &NOTIFICATION_STATUS_UPDATE,
-    })
-{
-    PA_ADD_OPTION(LANGUAGE);
-    PA_ADD_OPTION(BALL_SELECT);
-    PA_ADD_OPTION(NOTIFICATIONS);
-}
-
-
-
-void AutonomousBallThrower::throw_ball(ConsoleHandle& console, BotBaseContext& context){
-    pbf_press_button(context, BUTTON_X, 20, 100);
-    context.wait_for_all_requests();
-
-    BattleBallReader reader(console, LANGUAGE);
-    int quantity = move_to_ball(reader, console, context, BALL_SELECT.slug());
-    if (quantity == 0) {
-        throw FatalProgramException(
-            ErrorReport::NO_ERROR_REPORT, console,
-            "Unable to find appropriate ball. Did you run out?",
-            true
-        );
-    }
-    if (quantity < 0) {
-        console.log("Unable to read ball quantity.", COLOR_RED);
-    }
-    pbf_mash_button(context, BUTTON_A, 125);
-    context.wait_for_all_requests();
-}
-
-void AutonomousBallThrower::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    assert_16_9_720p_min(env.logger(), env.console);
-
-    AutonomousBallThrower_Descriptor::Stats& stats = env.current_stats<AutonomousBallThrower_Descriptor::Stats>();
-
-    //  Connect the controller.
-    pbf_press_button(context, BUTTON_LCLICK, 10, 0);
-
-    while (true)
-    {
-        NormalBattleMenuWatcher battle_menu(COLOR_RED);
-        int ret = wait_until(
-            env.console, context,
-            std::chrono::seconds(120),
-            {
-                battle_menu,
-            }
-        );
-
-        context.wait_for(std::chrono::milliseconds(100));
-        switch (ret){
-        case 0:
-            throw_ball(env.console, context);
-            stats.m_balls++;
-            env.update_stats();
-            break;
-        default:
-            throw FatalProgramException(
-                ErrorReport::SEND_ERROR_REPORT, env.console,
-                "Failed to detect battle menu after 60 seconds, did you catch or fail?",
-                true
-            );
-        }
-
-    }
-
-    env.update_stats();
-    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
-}
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_AutonomousBallThrower.h b/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_AutonomousBallThrower.h
deleted file mode 100644
index dc00b9d999..0000000000
--- a/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_AutonomousBallThrower.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*  Autonomous Ball Thrower
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSV_AutonomousBallThrower_H
-#define PokemonAutomation_PokemonSV_AutonomousBallThrower_H
-
-#include "CommonFramework/Notifications/EventNotificationsTable.h"
-#include "CommonFramework/Options/LanguageOCROption.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-#include "PokemonSwSh/Options/PokemonSwSh_BallSelectOption.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-
-
-class AutonomousBallThrower_Descriptor : public SingleSwitchProgramDescriptor{
-public:
-    AutonomousBallThrower_Descriptor();
-
-    struct Stats;
-    virtual std::unique_ptr<StatsTracker> make_stats() const override;
-};
-
-
-
-
-class AutonomousBallThrower : public SingleSwitchProgramInstance{
-public:
-    AutonomousBallThrower();
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-    void throw_ball(ConsoleHandle& console, BotBaseContext& context);
-
-    OCR::LanguageOCROption LANGUAGE;
-    PokemonSwSh::PokemonBallSelectOption BALL_SELECT;
-
-    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
-    EventNotificationsOption NOTIFICATIONS;
-};
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_ESPTraining.cpp b/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_ESPTraining.cpp
deleted file mode 100644
index 679d7f7983..0000000000
--- a/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_ESPTraining.cpp
+++ /dev/null
@@ -1,238 +0,0 @@
-/*  ESP Training
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Cpp/PrettyPrint.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
-#include "CommonFramework/Notifications/ProgramNotifications.h"
-#include "CommonFramework/Tools/StatsTracking.h"
-#include "CommonFramework/Tools/VideoResolutionCheck.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "PokemonSV/Programs/PokemonSV_SaveGame.h"
-//#include "PokemonSV/Programs/PokemonSV_Navigation.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h"
-#include "PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h"
-#include "PokemonSV/Inference/PokemonSV_ESPEmotionDetector.h"
-#include "PokemonSV_ESPTraining.h"
-
-namespace PokemonAutomation {
-namespace NintendoSwitch {
-namespace PokemonSV {
-
-using namespace Pokemon;
- 
-ESPTraining_Descriptor::ESPTraining_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonSV:ESPTraining",
-        STRING_POKEMON + " SV", "ESP Training",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonSV/ESPTraining.md",
-        "Clear the ESP Training to farm EV berries.",
-        FeedbackType::REQUIRED,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-struct ESPTraining_Descriptor::Stats : public StatsTracker {
-    Stats()
-        : m_emotions(m_stats["Emotions Shown"])
-        , m_joy(m_stats["Joy"])
-        , m_surprise(m_stats["Surprise"])
-        , m_excitement(m_stats["Excitement"])
-        , m_anger(m_stats["Anger"])
-        , m_clears(m_stats["Times Cleared"])
-        , errors(m_stats["Errors"])
-    {
-        m_display_order.emplace_back("Emotions Shown");
-        m_display_order.emplace_back("Joy");
-        m_display_order.emplace_back("Surprise");
-        m_display_order.emplace_back("Excitement");
-        m_display_order.emplace_back("Anger");
-        m_display_order.emplace_back("Times Cleared");
-        m_display_order.emplace_back("Errors", true);
-    }
-    std::atomic<uint64_t>& m_emotions;
-    std::atomic<uint64_t>& m_joy;
-    std::atomic<uint64_t>& m_surprise;
-    std::atomic<uint64_t>& m_excitement;
-    std::atomic<uint64_t>& m_anger;
-    std::atomic<uint64_t>& m_clears;
-    std::atomic<uint64_t>& errors;
-};
-std::unique_ptr<StatsTracker> ESPTraining_Descriptor::make_stats() const {
-    return std::unique_ptr<StatsTracker>(new Stats());
-}
-ESPTraining::ESPTraining()
-    : ROUNDS(
-        "<b>Number of times to run:</b>",
-        LockWhileRunning::UNLOCKED,
-        10
-    )
-    , SAVE(
-        "<b>Save game between rounds:</b><br>Save the game between ESP runs in case of crashes.",
-        LockWhileRunning::UNLOCKED, false
-    )
-    , GO_HOME_WHEN_DONE(false)
-    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
-    , NOTIFICATIONS({
-        &NOTIFICATION_STATUS_UPDATE,
-        & NOTIFICATION_PROGRAM_FINISH,
-        & NOTIFICATION_ERROR_FATAL,
-        })
-{
-    PA_ADD_OPTION(ROUNDS);
-    PA_ADD_OPTION(SAVE);
-    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
-    PA_ADD_OPTION(NOTIFICATIONS);
-}
-
-void ESPTraining::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) {
-    assert_16_9_720p_min(env.logger(), env.console);
-    ESPTraining_Descriptor::Stats& stats = env.current_stats<ESPTraining_Descriptor::Stats>();
-
-    for (uint32_t c = 0; c < ROUNDS; c++) {
-        env.log("Round: " + tostr_u_commas(c));
-
-        //Initiate dialog with Dendra
-        //Dendra needs time to turn and face the player
-        AdvanceDialogWatcher advance_detector(COLOR_YELLOW);
-        pbf_press_button(context, BUTTON_A, 10, 50);
-        int retD = wait_until(env.console, context, Milliseconds(4000), { advance_detector });
-        if (retD < 0) {
-            env.log("Dialog detected.");
-        }
-        pbf_press_button(context, BUTTON_A, 10, 50);
-
-        //Yes let's train
-        pbf_press_button(context, BUTTON_A, 10, 50);
-        pbf_wait(context, 100);
-        context.wait_for_all_requests();
-
-        //What mode? - Knockout
-        pbf_press_button(context, BUTTON_A, 10, 50);
-        pbf_press_dpad(context, DPAD_DOWN, 10, 50);
-        pbf_press_button(context, BUTTON_A, 10, 50);
-        context.wait_for_all_requests();
-
-        //mash past other dialog
-        pbf_mash_button(context, BUTTON_A, 360);
-            
-        //wait for start
-        context.wait_for(std::chrono::milliseconds(13000));
-        context.wait_for_all_requests();
-
-        //Detect emotion and press the right button
-        //151 emotions + pauses but the game is inconsistent and sometimes displays an emotion during the transitions
-        //Note: can hit the wrong emotion and then the right one right after, as long as its before the timer
-        bool endflag = true;
-        while (endflag) {
-            ESPStartDetector ESPstart;
-            ESPShowNewEmotionDetector ESPstop;
-            ESPEmotionDetector detector;
-            {
-                //Countdown -> Dialog w/emotion
-                int ret = wait_until(
-                    env.console, context,
-                    std::chrono::seconds(15),
-                    { { ESPstart } }
-                );
-                if (ret < 0) {
-                    env.log("Timeout waiting for dialog.");
-                    endflag = false;
-                    break;
-                }
-                int ret2 = wait_until(
-                    env.console, context,
-                    std::chrono::seconds(5),
-                    { { detector } }
-                );
-                if (ret2 < 0) {
-                    env.log("Timeout waiting for emotion.");
-                }
-                switch (detector.result()) {
-                case Detection::RED:
-                    env.log("ESPEmotionDetector: Angry - Red - Press X", COLOR_BLACK);
-                    pbf_press_button(context, BUTTON_X, 10, 50);
-                    stats.m_emotions++;
-                    stats.m_anger++;
-                    env.update_stats();
-                    break;
-                case Detection::YELLOW:
-                    env.log("ESPEmotionDetector: Joy - Yellow - Press A", COLOR_BLACK);
-                    pbf_press_button(context, BUTTON_A, 10, 50);
-                    stats.m_emotions++;
-                    stats.m_joy++;
-                    env.update_stats();
-                    break;
-                case Detection::BLUE:
-                    env.log("ESPEmotionDetector: Surprised - Blue - Press B", COLOR_BLACK);
-                    pbf_press_button(context, BUTTON_B, 10, 50);
-                    stats.m_emotions++;
-                    stats.m_surprise++;
-                    env.update_stats();
-                    break;
-                case Detection::GREEN:
-                    env.log("ESPEmotionDetector: Excited - Green - Press Y", COLOR_BLACK);
-                    pbf_press_button(context, BUTTON_Y, 10, 50);
-                    stats.m_emotions++;
-                    stats.m_excitement++;
-                    env.update_stats();
-                    break;
-                case Detection::GREY:
-                    //Press any button to start next round
-                    //Pressing A tends to make Dendra :D two extra times during the transistion so press B instead
-                    //Sometimes this is detected as blue, the B press there also works
-                    env.log("ESPEmotionDetector: Grey - Mash though dialog", COLOR_BLACK);
-                    pbf_press_button(context, BUTTON_B, 10, 50);
-                    break;
-                default:
-                    endflag = false;
-                    break;
-                }
-                //Look for the brief moment the dialog bubble vanishes
-                ret = wait_until(
-                    env.console, context,
-                    std::chrono::seconds(15),
-                    { { ESPstop } }
-                );
-                if (ret < 0) {
-                    env.log("Timeout waiting for dialog to vanish.");
-                }
-            }
-            context.wait_for_all_requests();
-        }
-
-        //Program done, mash B until overworld detected
-        OverworldWatcher overworld(COLOR_CYAN);
-        int ret = run_until(
-            env.console, context,
-            [](BotBaseContext& context) {
-                pbf_mash_button(context, BUTTON_B, 700);
-            },
-            {overworld}
-        );
-        if (ret != 0) {
-            env.console.log("Failed to detect overworld after ending.", COLOR_RED);
-        }
-        context.wait_for_all_requests();
-
-        //Save the game if option checked, then loop again
-        if(SAVE) {
-            save_game_from_overworld(env.program_info(), env.console, context);
-        }
-
-        stats.m_clears++;
-        env.update_stats();
-        send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
-    }
-
-    env.update_stats();
-    GO_HOME_WHEN_DONE.run_end_of_program(context);
-    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
-}
-    
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_ESPTraining.h b/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_ESPTraining.h
deleted file mode 100644
index c0237e91df..0000000000
--- a/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_ESPTraining.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*  ESP Training
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSV_ESPTraining_H
-#define PokemonAutomation_PokemonSV_ESPTraining_H
-
-#include "CommonFramework/Notifications/EventNotificationsTable.h"
-#include "CommonFramework/Options/LanguageOCROption.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-#include "Common/Cpp/Options/EnumDropdownOption.h"
-#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
-#include "Common/Cpp/Options/SimpleIntegerOption.h"
-#include "Common/Cpp/Options/TextEditOption.h"
-#include "PokemonSV/Inference/PokemonSV_ESPEmotionDetector.h"
-#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
-
-namespace PokemonAutomation {
-namespace NintendoSwitch {
-namespace PokemonSV {
-
-class ESPTraining_Descriptor : public SingleSwitchProgramDescriptor {
-public:
-    ESPTraining_Descriptor();
-
-    struct Stats;
-    virtual std::unique_ptr<StatsTracker> make_stats() const override;
-};
-
-class ESPTraining : public SingleSwitchProgramInstance {
-public:
-    ESPTraining();
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-    SimpleIntegerOption<uint32_t> ROUNDS;
-
-    BooleanCheckBoxOption SAVE;
-    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
-    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
-    EventNotificationsOption NOTIFICATIONS;
-};
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_GimmighoulChestFarmer.cpp b/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_GimmighoulChestFarmer.cpp
deleted file mode 100644
index 6c2b3cf464..0000000000
--- a/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_GimmighoulChestFarmer.cpp
+++ /dev/null
@@ -1,289 +0,0 @@
-/*  Gimmighoul Chest Farmer
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Cpp/PrettyPrint.h"
-#include "CommonFramework/Exceptions/OperationFailedException.h"
-#include "CommonFramework/Notifications/ProgramNotifications.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
-#include "CommonFramework/Tools/StatsTracking.h"
-#include "CommonFramework/Tools/VideoResolutionCheck.h"
-#include "NintendoSwitch/NintendoSwitch_Settings.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_ScalarButtons.h"
-#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.h"
-#include "PokemonSV/PokemonSV_Settings.h"
-#include "PokemonSV/Inference/Battles/PokemonSV_NormalBattleMenus.h"
-#include "PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h"
-#include "PokemonSV/Programs/PokemonSV_GameEntry.h"
-#include "PokemonSV/Programs/PokemonSV_SaveGame.h"
-#include "PokemonSV/Programs/PokemonSV_Navigation.h"
-#include "PokemonSV_GimmighoulChestFarmer.h"
-
-namespace PokemonAutomation {
-namespace NintendoSwitch {
-namespace PokemonSV {
-
-using namespace Pokemon;
-
-GimmighoulChestFarmer_Descriptor::GimmighoulChestFarmer_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonSV:GimmighoulChestFarmer",
-        STRING_POKEMON + " SV", "Gimmighoul Chest Farmer",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonSV/GimmighoulChestFarmer.md",
-        "Farm Chest Gimmighoul for coins.",
-        FeedbackType::REQUIRED,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-
-struct GimmighoulChestFarmer_Descriptor::Stats : public StatsTracker {
-    Stats()
-        : pokemon_fainted(m_stats["Chests farmed"])
-        , wild_interrupts(m_stats["Wild interrupts"])
-        , resets(m_stats["Resets"])
-        , errors(m_stats["Errors"])
-    {
-        m_display_order.emplace_back("Chests farmed");
-        m_display_order.emplace_back("Wild interrupts");
-        m_display_order.emplace_back("Resets");
-        m_display_order.emplace_back("Errors", true);
-    }
-    std::atomic<uint64_t>& pokemon_fainted;
-    std::atomic<uint64_t>& wild_interrupts;
-    std::atomic<uint64_t>& resets;
-    std::atomic<uint64_t>& errors;
-};
-std::unique_ptr<StatsTracker> GimmighoulChestFarmer_Descriptor::make_stats() const {
-    return std::unique_ptr<StatsTracker>(new Stats());
-}
-
-GimmighoulChestFarmer::GimmighoulChestFarmer()
-    : PP(
-        "<b>First Attack PP:</b><br>The amount of PP remaining on your lead's first attack.",
-        LockWhileRunning::LOCKED,
-        15
-    )
-    , START_LOCATION(
-        "<b>Start Location:</b><br>The start location of your character.",
-        {
-            {StartLocation::FlyPoint, "fly-point", "Fly Point - East Province (Area One) Watchtower"},
-            {StartLocation::InFrontOfChest, "in-front-of-chest", "In front of chest"},
-        },
-        LockWhileRunning::LOCKED,
-        StartLocation::FlyPoint
-    )
-    , GO_HOME_WHEN_DONE(false)
-    , FIX_TIME_WHEN_DONE(
-        "<b>Fix time when done:</b><br>Fix the time after the program finishes.",
-        LockWhileRunning::UNLOCKED, false
-    )
-    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
-    , NOTIFICATIONS({
-        &NOTIFICATION_STATUS_UPDATE,
-        &NOTIFICATION_PROGRAM_FINISH,
-        &NOTIFICATION_ERROR_FATAL,
-        })
-{
-    PA_ADD_OPTION(PP);
-    PA_ADD_OPTION(START_LOCATION);
-    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
-    PA_ADD_OPTION(FIX_TIME_WHEN_DONE);
-    PA_ADD_OPTION(NOTIFICATIONS);
-}
-
-void GimmighoulChestFarmer::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) {
-    assert_16_9_720p_min(env.logger(), env.console);
-
-    if (START_LOCATION == StartLocation::FlyPoint) {
-        //Set starting position by flying - must fly to East Province (Area One) Watchtower, do not move from fly point
-        open_map_from_overworld(env.program_info(), env.console, context);
-        fly_to_overworld_from_map(env.program_info(), env.console, context);
-        pbf_move_left_joystick(context, 0, 0, 158, 0);
-        pbf_press_button(context, BUTTON_L, 50, 40);
-        pbf_move_left_joystick(context, 128, 0, 100, 0);
-        //Climb ladder
-        pbf_press_button(context, BUTTON_L, 50, 40);
-        pbf_move_left_joystick(context, 128, 0, 2350, 0);
-        pbf_press_button(context, BUTTON_L, 50, 40);
-        pbf_wait(context, 100);
-        context.wait_for_all_requests();
-        //Walk into the wall
-        pbf_move_left_joystick(context, 128, 0, 200, 100);
-        context.wait_for_all_requests();
-        //Press A in case there's already a chest
-        //The remaining commands will run harmlessly during the battle intro if there is a chest
-        pbf_press_button(context, BUTTON_A, 50, 40);
-        //Turn back
-        pbf_move_left_joystick(context, 128, 255, 60, 100);
-        context.wait_for_all_requests();
-        //Position toward chest
-        pbf_move_left_joystick(context, 128, 0, 30, 0);
-        context.wait_for_all_requests();
-    }
-    //else assuming player is positioned correctly in front of the chest
-
-    GimmighoulChestFarmer_Descriptor::Stats& stats = env.current_stats<GimmighoulChestFarmer_Descriptor::Stats>();
-    uint32_t c = 0;
-    while(c < PP) {
-
-        //  Press A to enter battle, assuming there is a chest
-        env.log("Fetch Attempts: " + tostr_u_commas(c));
-        pbf_mash_button(context, BUTTON_A, 90);
-
-        //Wait for the battle to load then check for battle menu, if there isn't a battle menu then no chest
-        NormalBattleMenuWatcher battle_menu(COLOR_YELLOW);
-        int ret = wait_until(
-            env.console, context,
-            std::chrono::seconds(10),
-            { battle_menu }
-        );
-
-        if (ret == 0) {
-            //  Attack using your first move
-            pbf_mash_button(context, BUTTON_A, 90);
-            c++;
-            context.wait_for_all_requests();
-            OverworldWatcher overworld(COLOR_RED);
-            int ret2 = wait_until(
-                env.console, context,
-                std::chrono::seconds(120),
-                { overworld }
-            );
-            if (ret2 != 0) {
-                stats.errors++;
-                env.update_stats();
-                throw OperationFailedException(
-                    ErrorReport::SEND_ERROR_REPORT, env.console,
-                    "Failed to return to Overworld after two minutes. Did your attack miss or fail to defeat Gimmighoul in one hit?",
-                    true
-                );
-            }
-            stats.pokemon_fainted++;
-            env.update_stats();
-            send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
-
-            //Set starting position by flying - move map cursor
-            open_map_from_overworld(env.program_info(), env.console, context);
-            pbf_press_button(context, BUTTON_ZR, 50, 40);
-            pbf_move_left_joystick(context, 48, 192, 10, 0);
-            fly_to_overworld_from_map(env.program_info(), env.console, context);
-            pbf_move_left_joystick(context, 0, 0, 158, 0);
-            pbf_press_button(context, BUTTON_L, 50, 40);
-            pbf_move_left_joystick(context, 128, 0, 100, 0);
-            //Climb ladder
-            pbf_press_button(context, BUTTON_L, 50, 40);
-            pbf_move_left_joystick(context, 128, 0, 2350, 0);
-            pbf_press_button(context, BUTTON_L, 50, 40);
-            pbf_wait(context, 100);
-            context.wait_for_all_requests();
-            //Walk into the wall
-            pbf_move_left_joystick(context, 128, 0, 200, 100);
-            context.wait_for_all_requests();
-            //Turn back
-            pbf_move_left_joystick(context, 128, 255, 60, 100);
-            context.wait_for_all_requests();
-            //Position toward chest
-            pbf_move_left_joystick(context, 128, 0, 30, 0);
-            context.wait_for_all_requests();
-
-            //Check for tauros interrupt before pressing A - reset position if there was one
-            ret = wait_until(
-                env.console, context,
-                std::chrono::seconds(1),
-                { battle_menu }
-            );
-            if (ret == 0) {
-                pbf_mash_button(context, BUTTON_A, 90);
-                c++;
-                context.wait_for_all_requests();
-                ret2 = wait_until(
-                    env.console, context,
-                    std::chrono::seconds(120),
-                    { overworld }
-                );
-                if (ret2 != 0) {
-                    stats.errors++;
-                    env.update_stats();
-                    throw OperationFailedException(
-                        ErrorReport::SEND_ERROR_REPORT, env.console,
-                        "Failed to return to Overworld after two minutes.",
-                        true
-                    );
-                }
-                //Don't move map cursor this time
-                open_map_from_overworld(env.program_info(), env.console, context);
-                fly_to_overworld_from_map(env.program_info(), env.console, context);
-                pbf_move_left_joystick(context, 0, 0, 158, 0);
-                pbf_press_button(context, BUTTON_L, 50, 40);
-                pbf_move_left_joystick(context, 128, 0, 100, 0);
-                //Climb ladder
-                pbf_press_button(context, BUTTON_L, 50, 40);
-                pbf_move_left_joystick(context, 128, 0, 2350, 0);
-                pbf_press_button(context, BUTTON_L, 50, 40);
-                pbf_wait(context, 100);
-                context.wait_for_all_requests();
-                //Walk into the wall
-                pbf_move_left_joystick(context, 128, 0, 200, 100);
-                context.wait_for_all_requests();
-                //Turn back
-                pbf_move_left_joystick(context, 128, 255, 60, 100);
-                context.wait_for_all_requests();
-                //Position toward chest
-                pbf_move_left_joystick(context, 128, 0, 30, 0);
-                context.wait_for_all_requests();
-
-                stats.wild_interrupts++;
-                env.update_stats();
-                send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
-            }
-
-        }
-
-        //  Save the game
-        save_game_from_overworld(env.program_info(), env.console, context);
-        pbf_press_button(context, BUTTON_HOME, 20, GameSettings::instance().GAME_TO_HOME_DELAY);
-
-        //  Date skip - in-game day cycle is 72 mins, so 2 hours is fastest way
-        //  This isn't perfect because 12 hour format but it works
-        home_to_date_time(context, true, false);
-        ssf_press_button(context, BUTTON_A, 20, 10);
-        ssf_issue_scroll(context, DPAD_RIGHT, 0);
-        ssf_press_button(context, BUTTON_A, 2);
-        ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 3);
-        ssf_issue_scroll(context, SSF_SCROLL_UP, 3);
-        ssf_issue_scroll(context, SSF_SCROLL_UP, 3);
-        ssf_issue_scroll(context, DPAD_RIGHT, 0);
-        ssf_press_button(context, BUTTON_A, 2);
-        ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 3);
-        ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 3);
-        ssf_press_button(context, BUTTON_A, 20, 10);
-        pbf_press_button(context, BUTTON_HOME, 20, ConsoleSettings::instance().SETTINGS_TO_HOME_DELAY);
-
-        stats.resets++;
-        env.update_stats();
-        send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
-        reset_game_from_home(env.program_info(), env.console, context, 5 * TICKS_PER_SECOND);
-    }
-
-    if (FIX_TIME_WHEN_DONE) {
-        pbf_press_button(context, BUTTON_HOME, 10, GameSettings::instance().GAME_TO_HOME_DELAY);
-        home_to_date_time(context, false, false);
-        pbf_press_button(context, BUTTON_A, 20, 105);
-        pbf_press_button(context, BUTTON_A, 20, 105);
-        pbf_press_button(context, BUTTON_HOME, 20, ConsoleSettings::instance().SETTINGS_TO_HOME_DELAY);
-        resume_game_from_home(env.console, context);
-    }
-    GO_HOME_WHEN_DONE.run_end_of_program(context);
-    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
-}
-
-}
-}
-}
-
diff --git a/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_GimmighoulChestFarmer.h b/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_GimmighoulChestFarmer.h
deleted file mode 100644
index 6445e6c56c..0000000000
--- a/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_GimmighoulChestFarmer.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*  Gimmighoul Chest Farmer
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_GimmighoulChestFarm_H
-#define PokemonAutomation_PokemonSwSh_GimmighoulChestFarm_H
-
-#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
-#include "Common/Cpp/Options/SimpleIntegerOption.h"
-#include "Common/Cpp/Options/EnumDropdownOption.h"
-#include "CommonFramework/Notifications/EventNotificationsTable.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
-
-namespace PokemonAutomation {
-namespace NintendoSwitch {
-namespace PokemonSV {
-
-class GimmighoulChestFarmer_Descriptor : public SingleSwitchProgramDescriptor {
-public:
-    GimmighoulChestFarmer_Descriptor();
-    struct Stats;
-    virtual std::unique_ptr<StatsTracker> make_stats() const override;
-};
-
-class GimmighoulChestFarmer : public SingleSwitchProgramInstance {
-public:
-    GimmighoulChestFarmer();
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-    enum class StartLocation {
-        FlyPoint,
-        InFrontOfChest,
-    };
-
-    SimpleIntegerOption<uint32_t> PP;
-    EnumDropdownOption<StartLocation> START_LOCATION;
-    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
-    BooleanCheckBoxOption FIX_TIME_WHEN_DONE;
-    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
-    EventNotificationsOption NOTIFICATIONS;
-};
-
-}
-}
-}
-#endif
-
-
-
diff --git a/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_GimmighoulRoamingFarmer.cpp b/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_GimmighoulRoamingFarmer.cpp
deleted file mode 100644
index 9d25fb9875..0000000000
--- a/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_GimmighoulRoamingFarmer.cpp
+++ /dev/null
@@ -1,105 +0,0 @@
-/*  Gimmighoul Roaming Farmer
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Cpp/PrettyPrint.h"
-#include "CommonFramework/Notifications/ProgramNotifications.h"
-#include "CommonFramework/Tools/VideoResolutionCheck.h"
-#include "NintendoSwitch/NintendoSwitch_Settings.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonSV/PokemonSV_Settings.h"
-#include "PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.h"
-#include "PokemonSV/Programs/PokemonSV_GameEntry.h"
-#include "PokemonSV/Programs/PokemonSV_SaveGame.h"
-#include "PokemonSV_GimmighoulRoamingFarmer.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-using namespace Pokemon;
-
-GimmighoulRoamingFarmer_Descriptor::GimmighoulRoamingFarmer_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonSV:GimmighoulRoamingFarmer",
-        STRING_POKEMON + " SV", "Gimmighoul Roaming Farmer",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonSV/GimmighoulRoamingFarmer.md",
-        "Farm roaming Gimmighoul for coins.",
-        FeedbackType::REQUIRED,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-
-GimmighoulRoamingFarmer::GimmighoulRoamingFarmer()
-    : SKIPS(
-        "<b>Number of Attempts:</b>",
-        LockWhileRunning::UNLOCKED,
-        1500
-    )
-    , GO_HOME_WHEN_DONE(false)
-    , FIX_TIME_WHEN_DONE(
-        "<b>Fix time when done:</b><br>Fix the time after the program finishes.",
-        LockWhileRunning::UNLOCKED, false
-    )
-    , NOTIFICATIONS({
-        &NOTIFICATION_PROGRAM_FINISH,
-        &NOTIFICATION_ERROR_FATAL,
-        })
-{
-    PA_ADD_OPTION(SKIPS);
-    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
-    PA_ADD_OPTION(FIX_TIME_WHEN_DONE);
-    PA_ADD_OPTION(NOTIFICATIONS);
-}
-
-void GimmighoulRoamingFarmer::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) {
-    assert_16_9_720p_min(env.logger(), env.console);
-
-    //  Start in game facing a roaming Gimmighoul somewhere safe. (ex. Pokemon Center since wild Pokemon can't fight you there.)
-    uint8_t year = MAX_YEAR;
-    for (uint32_t c = 0; c < SKIPS; c++) {
-        //  Grab coin assuming there is one
-        env.log("Fetch Attempts: " + tostr_u_commas(c));
-        pbf_mash_button(context, BUTTON_A, 90);
-        pbf_wait(context, 2 * TICKS_PER_SECOND);
-
-        //  Save the game
-        save_game_from_overworld(env.program_info(), env.console, context);
-
-        //  Date skip
-        pbf_press_button(context, BUTTON_HOME, 20, GameSettings::instance().GAME_TO_HOME_DELAY);
-        home_to_date_time(context, true, true);
-        if (year >= MAX_YEAR){
-            roll_date_backward_N(context, MAX_YEAR, true);
-            year = 0;
-        }
-        roll_date_forward_1(context, true);
-        year++;
-        pbf_press_button(context, BUTTON_HOME, 20, ConsoleSettings::instance().SETTINGS_TO_HOME_DELAY);
-
-        //  Reset game
-        reset_game_from_home(env.program_info(), env.console, context, 5 * TICKS_PER_SECOND);
-    }
-
-    if (FIX_TIME_WHEN_DONE) {
-        pbf_press_button(context, BUTTON_HOME, 10, GameSettings::instance().GAME_TO_HOME_DELAY);
-        home_to_date_time(context, false, false);
-        pbf_press_button(context, BUTTON_A, 20, 105);
-        pbf_press_button(context, BUTTON_A, 20, 105);
-        pbf_press_button(context, BUTTON_HOME, 20, ConsoleSettings::instance().SETTINGS_TO_HOME_DELAY);
-        resume_game_from_home(env.console, context);
-    }
-    GO_HOME_WHEN_DONE.run_end_of_program(context);
-    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
-}
-
-
-}
-}
-}
-
diff --git a/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_GimmighoulRoamingFarmer.h b/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_GimmighoulRoamingFarmer.h
deleted file mode 100644
index aa11c416fd..0000000000
--- a/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_GimmighoulRoamingFarmer.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*  Gimmighoul Roaming Farmer
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_GimmighoulRoamingFarm_H
-#define PokemonAutomation_PokemonSwSh_GimmighoulRoamingFarm_H
-
-#include "Common/Cpp/Options/SimpleIntegerOption.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
-#include "CommonFramework/Notifications/EventNotificationsTable.h"
-#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
-
-namespace PokemonAutomation {
-namespace NintendoSwitch {
-namespace PokemonSV {
-
-
-class GimmighoulRoamingFarmer_Descriptor : public SingleSwitchProgramDescriptor {
-public:
-    GimmighoulRoamingFarmer_Descriptor();
-};
-
-class GimmighoulRoamingFarmer : public SingleSwitchProgramInstance {
-public:
-    GimmighoulRoamingFarmer();
-
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-    SimpleIntegerOption<uint32_t> SKIPS;
-    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
-    BooleanCheckBoxOption FIX_TIME_WHEN_DONE;
-    EventNotificationsOption NOTIFICATIONS;
-};
-
-
-}
-}
-}
-#endif
-
-
-
diff --git a/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_LPFarmer.cpp b/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_LPFarmer.cpp
deleted file mode 100644
index 46ef179e09..0000000000
--- a/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_LPFarmer.cpp
+++ /dev/null
@@ -1,124 +0,0 @@
-/*  Mass Release
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/Notifications/ProgramNotifications.h"
-#include "CommonFramework/Tools/StatsTracking.h"
-#include "CommonFramework/Tools/VideoResolutionCheck.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonSV/PokemonSV_Settings.h"
-#include "PokemonSV/Programs/PokemonSV_Navigation.h"
-#include "PokemonSV/Programs/TeraRaids/PokemonSV_TeraRoutines.h"
-#include "PokemonSV_LPFarmer.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-using namespace Pokemon;
-
-
-LPFarmer_Descriptor::LPFarmer_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonSV:LPFarmer",
-        STRING_POKEMON + " SV", "LP Farmer",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonSV/LPFarmer.md",
-        "Farm LP by day skipping Tera raids.",
-        FeedbackType::REQUIRED,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-struct LPFarmer_Descriptor::Stats : public StatsTracker{
-    Stats()
-        : m_skips(m_stats["Day Skips"])
-        , m_fetches(m_stats["Fetches"])
-        , m_errors(m_stats["Errors"])
-    {
-        m_display_order.emplace_back("Day Skips");
-        m_display_order.emplace_back("Fetches");
-        m_display_order.emplace_back("Errors", true);
-    }
-    std::atomic<uint64_t>& m_skips;
-    std::atomic<uint64_t>& m_fetches;
-    std::atomic<uint64_t>& m_errors;
-};
-std::unique_ptr<StatsTracker> LPFarmer_Descriptor::make_stats() const{
-    return std::unique_ptr<StatsTracker>(new Stats());
-}
-
-
-
-LPFarmer::LPFarmer()
-    : GO_HOME_WHEN_DONE(false)
-    , FETCHES(
-        "<b>Fetches:</b>",
-        LockWhileRunning::UNLOCKED,
-        10000, 1
-    )
-    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
-    , NOTIFICATIONS({
-        &NOTIFICATION_STATUS_UPDATE,
-        &NOTIFICATION_PROGRAM_FINISH,
-//        &NOTIFICATION_ERROR_RECOVERABLE,
-        &NOTIFICATION_ERROR_FATAL,
-    })
-{
-    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
-    PA_ADD_OPTION(FETCHES);
-    PA_ADD_OPTION(NOTIFICATIONS);
-}
-
-
-
-void LPFarmer::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    assert_16_9_720p_min(env.logger(), env.console);
-
-    LPFarmer_Descriptor::Stats& stats = env.current_stats<LPFarmer_Descriptor::Stats>();
-
-    //  Connect the controller.
-    pbf_press_button(context, BUTTON_LCLICK, 10, 10);
-
-    bool first = true;
-    for (size_t fetches = 0; fetches < FETCHES;){
-        env.update_stats();
-        send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
-
-        if (!first){
-            day_skip_from_overworld(env.console, context);
-            pbf_wait(context, GameSettings::instance().RAID_SPAWN_DELAY);
-            context.wait_for_all_requests();
-            stats.m_skips++;
-        }
-        first = false;
-
-        if (!open_raid(env.console, context)){
-            continue;
-        }
-
-        fetches++;
-        stats.m_fetches++;
-
-        close_raid(env.program_info(), env.console, context);
-    }
-
-    env.update_stats();
-    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
-    GO_HOME_WHEN_DONE.run_end_of_program(context);
-}
-
-
-
-
-
-
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_LPFarmer.h b/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_LPFarmer.h
deleted file mode 100644
index 0669016e3c..0000000000
--- a/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_LPFarmer.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*  LP Farmer
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_LPFarmer_H
-#define PokemonAutomation_PokemonSwSh_LPFarmer_H
-
-#include "Common/Cpp/Options/SimpleIntegerOption.h"
-#include "CommonFramework/Notifications/EventNotificationsTable.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-
-
-class LPFarmer_Descriptor : public SingleSwitchProgramDescriptor {
-public:
-    LPFarmer_Descriptor();
-    struct Stats;
-    virtual std::unique_ptr<StatsTracker> make_stats() const override;
-};
-
-class LPFarmer : public SingleSwitchProgramInstance {
-public:
-    LPFarmer();
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
-    SimpleIntegerOption<uint32_t> FETCHES;
-    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
-    EventNotificationsOption NOTIFICATIONS;
-};
-
-
-
-}
-}
-}
-#endif
-
-
-
diff --git a/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_MassPurchase.cpp b/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_MassPurchase.cpp
deleted file mode 100644
index 84e01e9d75..0000000000
--- a/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_MassPurchase.cpp
+++ /dev/null
@@ -1,245 +0,0 @@
-/*  SV Mass Purchase
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Cpp/Exceptions.h"
-#include "CommonFramework/Exceptions/FatalProgramException.h"
-#include "CommonFramework/Notifications/ProgramNotifications.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
-#include "CommonFramework/Tools/ProgramEnvironment.h"
-#include "CommonFramework/Tools/StatsTracking.h"
-#include "CommonFramework/Tools/VideoResolutionCheck.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h"
-#include "PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h"
-#include "PokemonSV_MassPurchase.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-    using namespace Pokemon;
-
-MassPurchase_Descriptor::MassPurchase_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonSV:MassPurchase",
-        STRING_POKEMON + " SV", "Mass Purchase",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonSV/MassPurchase.md",
-        "Purchase a specified amount of items from a shop.",
-        FeedbackType::REQUIRED,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-
-struct MassPurchase_Descriptor::Stats : public StatsTracker {
-    Stats()
-        : total_items(m_stats["Items Purchased"])
-        , skip(m_stats["Skipped"])
-        , errors(m_stats["Errors"])
-    {
-        m_display_order.emplace_back(Stat("Items Purchased"));
-        m_display_order.emplace_back(Stat("Skipped"));
-        m_display_order.emplace_back(Stat("Errors"));
-    }
-    std::atomic<uint64_t>& total_items;
-    std::atomic<uint64_t>& skip;
-    std::atomic<uint64_t>& errors;
-};
-std::unique_ptr<StatsTracker> MassPurchase_Descriptor::make_stats() const {
-    return std::unique_ptr<StatsTracker>(new Stats());
-}
-
-MassPurchase::MassPurchase()
-    : ITEMS(
-        "<b>Items to Buy:</b><br>The amount of Items to buy from the postion of the cursor.",
-        LockWhileRunning::LOCKED,
-        50
-    )
-    , QUANTITY(
-        "<b>Quantity to Buy:</b><br>The amount of each item to buy. If a clothing store, set to 1.",
-        LockWhileRunning::LOCKED,
-        1, 1, 999
-    )
-    , GO_HOME_WHEN_DONE(false)
-    , PAY_LP(
-        "<b>Pay with LP:</b>",
-        LockWhileRunning::UNLOCKED, false
-    )
-    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
-    , NOTIFICATIONS({
-        &NOTIFICATION_STATUS_UPDATE,
-        &NOTIFICATION_PROGRAM_FINISH,
-        &NOTIFICATION_ERROR_RECOVERABLE,
-        &NOTIFICATION_ERROR_FATAL,
-    })
-{
-    PA_ADD_OPTION(ITEMS);
-    PA_ADD_OPTION(QUANTITY);
-    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
-    PA_ADD_OPTION(PAY_LP);
-    PA_ADD_OPTION(NOTIFICATIONS);
-}
-
-bool MassPurchase::mass_purchase(ProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context){
-    MassPurchase_Descriptor::Stats& stats = env.current_stats<MassPurchase_Descriptor::Stats>();
-
-    OverworldWatcher overworld(COLOR_RED);
-    AdvanceDialogWatcher dialog(COLOR_CYAN);
-    context.wait_for_all_requests();
-    int ret = wait_until(
-        console, context,
-        std::chrono::seconds(2),
-        {
-            overworld,
-            dialog,
-        }
-    );
-    context.wait_for(std::chrono::milliseconds(50));
-
-    switch (ret){
-    case 0:
-        env.log("Error - Stuck in Overworld");
-        stats.errors++;
-        throw FatalProgramException(
-            ErrorReport::SEND_ERROR_REPORT, console,
-            "Stuck in Overworld.",
-            true
-        );
-
-    case 1:
-        env.log("Detected full bag. Skipped Item");
-        stats.skip++;
-        send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
-        return true;
-
-    default:
-        return false;
-    }
-};
-    
-bool MassPurchase::extra_items(ProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context){
-    MassPurchase_Descriptor::Stats& stats = env.current_stats<MassPurchase_Descriptor::Stats>();
-
-    OverworldWatcher overworld(COLOR_RED);
-    AdvanceDialogWatcher dialog(COLOR_CYAN);
-    context.wait_for_all_requests();
-    int ret = wait_until(
-        console, context,
-        std::chrono::seconds(2),
-        {
-            overworld,
-            dialog,
-        }
-    );
-    context.wait_for(std::chrono::milliseconds(50));
-
-    switch (ret){
-    case 0:
-        env.log("Error - Stuck in Overworld");
-        stats.errors++;
-        throw FatalProgramException(
-            ErrorReport::SEND_ERROR_REPORT, console,
-            "Stuck in Overworld.",
-            true
-        );
-
-    case 1:
-        env.log("Detected Extra Item/Reward");
-        return true;
-
-    default:
-        return false;
-    }
-};
-
-void PokemonSV::MassPurchase::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    assert_16_9_720p_min(env.logger(), env.console);
-    MassPurchase_Descriptor::Stats& stats = env.current_stats<MassPurchase_Descriptor::Stats>();
-
-    send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
-
-    uint16_t item_val = ITEMS;
-    bool skip_item = false;
-    bool extra = false;
-    while (item_val != 0){
-        uint16_t qt_val = QUANTITY;
-        pbf_press_button(context, BUTTON_A, 20, 105);
-
-        skip_item = mass_purchase(env, env.console, context);
-
-        if (skip_item){
-            pbf_press_button(context, BUTTON_B, 20, 105);
-        }
-
-        if (!skip_item){
-            if (qt_val <= 500){
-                uint16_t current = 1;
-                while (current + 10 <= qt_val){
-                    pbf_press_dpad(context, DPAD_RIGHT, 20, 10);
-                    current += 10;
-                }
-                while (current < qt_val){
-                    pbf_press_dpad(context, DPAD_UP, 20, 10);
-                    current++;
-                }
-            }else{
-                uint16_t current = 999;
-                pbf_press_dpad(context, DPAD_LEFT, 20, 10);
-                while (current >= qt_val + 10){
-                    pbf_press_dpad(context, DPAD_LEFT, 20, 10);
-                    current -= 10;
-                }
-                while (current > qt_val){
-                    pbf_press_dpad(context, DPAD_DOWN, 20, 10);
-                    current--;
-                }
-            }
-
-            pbf_press_button(context, BUTTON_A, 20, 125);
-
-            if (PAY_LP){
-                pbf_press_dpad(context, DPAD_DOWN, 5, 105);
-            }
-
-            pbf_press_button(context, BUTTON_A, 20, 230);
-            pbf_press_button(context, BUTTON_A, 20, 105);
-            extra = extra_items(env, env.console, context);
-            if (extra) {
-                pbf_press_button(context, BUTTON_A, 20, 105);
-            };
-
-            env.log("Item Purchased");
-            stats.total_items++;
-            env.update_stats();
-            send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
-        }
-        
-        pbf_press_dpad(context, DPAD_DOWN, 20, 105);
-        
-        item_val--;
-    }
-        
-    pbf_press_button(context, BUTTON_B, 20, 105);
-    pbf_press_button(context, BUTTON_B, 20, 105);
-    pbf_press_button(context, BUTTON_B, 20, 105);
-    pbf_press_button(context, BUTTON_B, 20, 105);
-    pbf_press_button(context, BUTTON_B, 20, 105);
-    pbf_press_button(context, BUTTON_A, 20, 105);
-    pbf_press_button(context, BUTTON_B, 20, 105);
-    pbf_press_button(context, BUTTON_A, 20, 105);
-
-    GO_HOME_WHEN_DONE.run_end_of_program(context);
-    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
-}
-
-
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_MassPurchase.h b/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_MassPurchase.h
deleted file mode 100644
index 9eb0413fea..0000000000
--- a/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_MassPurchase.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*  Mass Purchase
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSV_MassPurchase_H
-#define PokemonAutomation_PokemonSV_MassPurchase_H
-
-#include "Common/Cpp/Options/SimpleIntegerOption.h"
-#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
-#include "CommonFramework/Notifications/EventNotificationsTable.h"
-#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-
-class MassPurchase_Descriptor : public SingleSwitchProgramDescriptor{
-public:
-    MassPurchase_Descriptor();
-    struct Stats;
-    virtual std::unique_ptr<StatsTracker> make_stats() const override;
-};
-
-
-class MassPurchase : public SingleSwitchProgramInstance{
-public:
-    MassPurchase();
-
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-    bool mass_purchase(ProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context);
-    bool extra_items(ProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context);
-    
-private:
-    SimpleIntegerOption<uint16_t> ITEMS;
-    SimpleIntegerOption<uint16_t> QUANTITY;
-    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
-    BooleanCheckBoxOption PAY_LP;
-    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
-    EventNotificationsOption NOTIFICATIONS;
-};
-
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_SizeChecker.cpp b/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_SizeChecker.cpp
deleted file mode 100644
index 30b41f7b7a..0000000000
--- a/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_SizeChecker.cpp
+++ /dev/null
@@ -1,255 +0,0 @@
-/*  Size Checker
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/Exceptions/OperationFailedException.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
-#include "CommonFramework/Notifications/ProgramNotifications.h"
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "CommonFramework/Tools/StatsTracking.h"
-#include "CommonFramework/Tools/VideoResolutionCheck.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h"
-#include "PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h"
-#include "PokemonSV/Inference/Boxes/PokemonSV_BoxDetection.h"
-#include "PokemonSV/Inference/Boxes/PokemonSV_BoxEggDetector.h"
-#include "PokemonSV/Programs/Boxes/PokemonSV_BoxRoutines.h"
-#include "PokemonSV_SizeChecker.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-using namespace Pokemon;
-
-
-SizeChecker_Descriptor::SizeChecker_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonSV:SizeChecker",
-        STRING_POKEMON + " SV", "Size Checker",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonSV/SizeChecker.md",
-        "Check boxes of Pokémon for size marks.",
-        FeedbackType::REQUIRED,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-struct SizeChecker_Descriptor::Stats : public StatsTracker{
-    Stats()
-        : m_boxes(m_stats["Boxes Checked"])
-        , m_checked(m_stats["Checked"])
-        , m_empty(m_stats["Empty Slots"])
-        , m_eggs(m_stats["Eggs"])
-    {
-        m_display_order.emplace_back("Boxes Checked");
-        m_display_order.emplace_back("Checked");
-        m_display_order.emplace_back("Empty Slots");
-        m_display_order.emplace_back("Eggs");
-    }
-    std::atomic<uint64_t>& m_boxes;
-    std::atomic<uint64_t>& m_checked;
-    std::atomic<uint64_t>& m_empty;
-    std::atomic<uint64_t>& m_eggs;
-};
-std::unique_ptr<StatsTracker> SizeChecker_Descriptor::make_stats() const{
-    return std::unique_ptr<StatsTracker>(new Stats());
-}
-
-
-
-SizeChecker::SizeChecker()
-    : GO_HOME_WHEN_DONE(false)
-    , BOXES_TO_CHECK(
-        "<b>Number of Boxes to Check:</b>",
-        LockWhileRunning::LOCKED,
-        2, 1, 32
-    )
-    , NOTIFICATIONS({
-        &NOTIFICATION_PROGRAM_FINISH,
-        &NOTIFICATION_ERROR_FATAL,
-    })
-{
-    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
-    PA_ADD_OPTION(BOXES_TO_CHECK);
-    PA_ADD_OPTION(NOTIFICATIONS);
-}
-
-
-
-
-void SizeChecker::enter_check_mode(ConsoleHandle& console, BotBaseContext& context){
-    console.log("Enter box mode to check size...");
-    WallClock start = current_time();
-
-    while (true){
-        if (current_time() - start > std::chrono::minutes(2)){
-            throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, console,
-                "enter_check_mode(): Failed to enter box mode after 2 minutes.",
-                true
-            );
-        }
-        
-        AdvanceDialogWatcher dialog(COLOR_GREEN);
-        OverworldWatcher overworld(COLOR_CYAN);
-        GradientArrowWatcher prompt(COLOR_YELLOW, GradientArrowType::RIGHT, {0.72, 0.55, 0.05, 0.08});
-        BoxWatcher box(COLOR_BLUE);
-        
-        context.wait_for_all_requests();
-
-        int ret = wait_until(
-            console, context,
-            std::chrono::seconds(60),
-            {dialog, overworld, prompt, box}
-        );
-        context.wait_for(std::chrono::milliseconds(100));
-
-        switch (ret){
-
-        case 0: // dialog
-        case 1: // overworld
-        case 2: // prompt
-            pbf_press_button(context, BUTTON_A, 20, 5);
-            continue;
-        case 3: // box
-            return;
-
-        default:
-            throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, console,
-                "enter_check_mode(): No recognized state after 60 seconds.",
-                true
-            );
-        }
-    }
-
-}
-
-
-
-void SizeChecker::exit_check_mode(ConsoleHandle& console, BotBaseContext& context){
-    console.log("Check size and exit box mode...");
-    WallClock start = current_time();
-
-    while (true){
-        if (current_time() - start > std::chrono::minutes(2)){
-            throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, console,
-                "exit_check_mode(): Failed to exit box mode after 2 minutes.",
-                true
-            );
-        }
-
-        AdvanceDialogWatcher dialog(COLOR_GREEN);
-        OverworldWatcher overworld(COLOR_CYAN);
-        
-        context.wait_for_all_requests();
-
-        int ret = wait_until(
-            console, context,
-            std::chrono::seconds(60),
-            {dialog, overworld}
-        );
-        context.wait_for(std::chrono::milliseconds(100));
-
-        switch (ret){
-
-        case 0: // dialog
-            // TODO: Detect if mark was given and update stats.
-            pbf_press_button(context, BUTTON_A, 20, 5);
-            continue;
-        case 1: // overworld
-            return;
-
-        default:
-            throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, console,
-                "exit_check_mode(): No recognized state after 60 seconds.",
-                true
-            );
-        }
-
-    }
-
-}
-
-
-
-void SizeChecker::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    assert_16_9_720p_min(env.logger(), env.console);
-
-    SizeChecker_Descriptor::Stats& stats = env.current_stats<SizeChecker_Descriptor::Stats>();
-
-    //  Connect the controller.
-    pbf_press_button(context, BUTTON_LCLICK, 10, 0);
-
-    // Loop through boxes.
-    for (uint8_t box = 0; box < BOXES_TO_CHECK; box++){
-        enter_check_mode(env.console, context);
-        context.wait_for_all_requests();
-
-        if (box > 0){
-            move_to_right_box(context);
-        }
-        context.wait_for_all_requests();
-
-        // Loop through the rows and columns.
-        for (uint8_t row = 0; row < 5; row++){
-            for (uint8_t col = 0; col < 6; col++){
-                enter_check_mode(env.console, context);
-                context.wait_for_all_requests();
-                move_box_cursor(env.program_info(), env.console, context, BoxCursorLocation::SLOTS, row, col);
-
-                SomethingInBoxSlotDetector sth_in_box_detector(COLOR_RED);
-                BoxCurrentEggDetector egg_detector;
-                VideoOverlaySet overlays(env.console.overlay());
-                sth_in_box_detector.make_overlays(overlays);
-                egg_detector.make_overlays(overlays);
-                context.wait_for_all_requests();
-
-                VideoSnapshot screen = env.console.video().snapshot();
-
-                if (!sth_in_box_detector.detect(screen)){
-                    env.console.log("Detected empty cell.");
-                    stats.m_empty++;
-                    env.update_stats();
-                    continue;
-                }
-
-                if (egg_detector.detect(screen)){
-                    env.console.log("Detected egg in cell.");
-                    stats.m_eggs++;
-                    env.update_stats();
-                    continue;
-                }
-
-                // Initiate size checking prompt.
-                pbf_press_button(context, BUTTON_A, 20, 20);
-
-                exit_check_mode(env.console, context);
-                context.wait_for_all_requests();
-
-                stats.m_checked++;
-                env.update_stats();
-            }
-        }
-
-        stats.m_boxes++;
-        env.update_stats();
-    }
-
-    pbf_press_button(context, BUTTON_B, 20, 20);
-    exit_check_mode(env.console, context);
-
-    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
-    GO_HOME_WHEN_DONE.run_end_of_program(context);
-}
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_SizeChecker.h b/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_SizeChecker.h
deleted file mode 100644
index 8bf450da77..0000000000
--- a/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_SizeChecker.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*  Size Checker
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSV_SizeChecker_H
-#define PokemonAutomation_PokemonSV_SizeChecker_H
-
-#include "Common/Cpp/Options/SimpleIntegerOption.h"
-#include "CommonFramework/Notifications/EventNotificationsTable.h"
-#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-class BoxDetector;
-
-
-class SizeChecker_Descriptor : public SingleSwitchProgramDescriptor{
-public:
-    SizeChecker_Descriptor();
-
-    struct Stats;
-    virtual std::unique_ptr<StatsTracker> make_stats() const override;
-
-};
-
-
-
-
-class SizeChecker : public SingleSwitchProgramInstance{
-public:
-    SizeChecker();
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-    void enter_check_mode(ConsoleHandle& console, BotBaseContext& context);
-    void exit_check_mode(ConsoleHandle& console, BotBaseContext& context);
-
-private:
-    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
-    SimpleIntegerOption<uint8_t> BOXES_TO_CHECK;
-    EventNotificationsOption NOTIFICATIONS;
-};
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_StatsReset.cpp b/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_StatsReset.cpp
deleted file mode 100644
index 8b243e08d6..0000000000
--- a/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_StatsReset.cpp
+++ /dev/null
@@ -1,330 +0,0 @@
-/*  Stats Reset
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/Exceptions/OperationFailedException.h"
-#include "CommonFramework/Options/LanguageOCROption.h"
-#include "CommonFramework/Notifications/ProgramNotifications.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
-#include "CommonFramework/Tools/StatsTracking.h"
-#include "CommonFramework/Tools/VideoResolutionCheck.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonSV/PokemonSV_Settings.h"
-#include "PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h"
-#include "PokemonSV/Inference/Battles/PokemonSV_NormalBattleMenus.h"
-#include "PokemonSV/Inference/Boxes/PokemonSV_StatsResetChecker.h"
-#include "PokemonSV/Inference/Boxes/PokemonSV_BoxDetection.h"
-#include "PokemonSV/Inference/Boxes/PokemonSV_IVCheckerReader.h"
-#include "PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h"
-#include "PokemonSV/Programs/PokemonSV_GameEntry.h"
-#include "PokemonSV/Programs/PokemonSV_Navigation.h"
-#include "PokemonSV/Programs/PokemonSV_BasicCatcher.h"
-#include "PokemonSV/Programs/Boxes/PokemonSV_BoxRoutines.h"
-#include "PokemonSV_StatsReset.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-using namespace Pokemon;
- 
-StatsReset_Descriptor::StatsReset_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonSV:StatsReset",
-        STRING_POKEMON + " SV", "Stats Reset",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonSV/StatsReset.md",
-        "Repeatedly catch the Treasures of Ruin until you get the stats you want.",
-        FeedbackType::REQUIRED,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-struct StatsReset_Descriptor::Stats : public StatsTracker {
-    Stats()
-        : resets(m_stats["Resets"])
-        , balls(m_stats["Balls Thrown"])
-        , catches(m_stats["Catches"])
-        , matches(m_stats["Matches"])
-        , errors(m_stats["Errors"])
-    {
-        m_display_order.emplace_back("Resets");
-        m_display_order.emplace_back("Balls Thrown");
-        m_display_order.emplace_back("Catches");
-        m_display_order.emplace_back("Matches");
-        m_display_order.emplace_back("Errors", true);
-    }
-    std::atomic<uint64_t>& resets;
-    std::atomic<uint64_t>& balls;
-    std::atomic<uint64_t>& catches;
-    std::atomic<uint64_t>& matches;
-    std::atomic<uint64_t>& errors;
-};
-std::unique_ptr<StatsTracker> StatsReset_Descriptor::make_stats() const {
-    return std::unique_ptr<StatsTracker>(new Stats());
-}
-StatsReset::StatsReset()
-    : TARGET(
-        "<b>Target:</b><br>The Pokemon you are resetting for.<br>"
-        "Treasures of Ruin: Stand in front of the unsealed vaults of one of the Ruinous Quartet.<br>"
-        "Generic: You are standing in front of a Pokemon that requires an A press to initiate battle.<br>",
-        {
-            {Target::TreasuresOfRuin, "treasures-of-ruin", "Treasures of Ruin"},
-            {Target::Generic, "generic", "Generic"},
-        },
-        LockWhileRunning::LOCKED,
-        Target::TreasuresOfRuin
-    )
-    , LANGUAGE(
-        "<b>Game Language:</b><br>This field is required so we can read IVs.",
-        IV_READER().languages(),
-        LockWhileRunning::LOCKED,
-        true
-    )
-    , BALL_SELECT(
-        "<b>Ball Select:</b>",
-        LockWhileRunning::UNLOCKED,
-        "poke-ball"
-    )
-    , GO_HOME_WHEN_DONE(false)
-    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
-    , NOTIFICATIONS({
-        &NOTIFICATION_STATUS_UPDATE,
-        & NOTIFICATION_PROGRAM_FINISH,
-        & NOTIFICATION_ERROR_FATAL,
-    })
-{
-    PA_ADD_OPTION(TARGET);
-    PA_ADD_OPTION(LANGUAGE); //This is required
-    PA_ADD_OPTION(BALL_SELECT);
-    PA_ADD_OPTION(FILTERS); //Note: None of these can be shiny, and the quartet will have some perfect IVs.
-    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
-    PA_ADD_OPTION(NOTIFICATIONS);
-}
-
-void StatsReset::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) {
-    //This will only work for Pokemon that you press A to talk to.
-    //Regular static spawns will have the same stats, resetting won't work.
-    //Won't apply to the former titan pokemon or the box legend either, as their IVs are locked.
-    //So this really only applies to the ruinous quartet.
-    assert_16_9_720p_min(env.logger(), env.console);
-    StatsReset_Descriptor::Stats& stats = env.current_stats<StatsReset_Descriptor::Stats>();
-
-    //Autosave must be off, settings like Tera farmer.
-    bool stats_matched = false;
-    while (!stats_matched){
-        AdvanceDialogWatcher advance_detector(COLOR_YELLOW);
-        pbf_press_button(context, BUTTON_A, 10, 50);
-        int retD = wait_until(env.console, context, Milliseconds(4000), { advance_detector });
-        if (retD < 0){
-            env.log("Dialog detected.");
-        }
-        switch (TARGET){
-        case Target::TreasuresOfRuin:
-            //~30 seconds to start battle?
-            pbf_mash_button(context, BUTTON_A, 3250);
-            context.wait_for_all_requests();
-            break;
-        case Target::Generic:
-            //Mash A to initiate battle
-            pbf_mash_button(context, BUTTON_A, 90);
-            context.wait_for_all_requests();
-            break;
-        default:
-            throw InternalProgramError(&env.logger(), PA_CURRENT_FUNCTION, "Unknown Target");
-        }
-        NormalBattleMenuWatcher battle_menu(COLOR_YELLOW);
-        int ret = wait_until(
-            env.console, context,
-            std::chrono::seconds(15),
-            { battle_menu }
-        );
-        if(ret != 0) {
-            stats.errors++;
-            env.update_stats();
-            throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, env.console,
-                "Failed to enter battle. Are you facing the Pokemon or in a menu?",
-                true
-            );
-        }
-        bool battle_ended = false;
-        bool goldfish_loop = false;
-        while (!battle_ended){
-            //Navigate to correct ball and repeatedly throw it until caught
-            pbf_press_button(context, BUTTON_X, 20, 100);
-            context.wait_for_all_requests();
-
-            BattleBallReader reader(env.console, LANGUAGE);
-            int quantity = move_to_ball(reader, env.console, context, BALL_SELECT.slug());
-            if (quantity == 0) {
-                env.console.log("Unable to find appropriate ball, out of balls, or either Pokemon fainted.");
-                send_program_status_notification(
-                    env, NOTIFICATION_STATUS_UPDATE,
-                    "Unable to find appropriate ball, out of balls, or either Pokemon fainted."
-                );
-                break;
-            }
-            if (quantity < 0){
-                stats.errors++;
-                env.update_stats();
-                env.console.log("Unable to read ball quantity.", COLOR_RED);
-            }
-            //Throw ball
-            pbf_mash_button(context, BUTTON_A, 150);
-            context.wait_for_all_requests();
-
-            //Check for battle menu - if found after a second then assume caught in a goldfish bounce loop
-            ret = wait_until(
-                env.console, context,
-                std::chrono::seconds(4),
-                { battle_menu }
-            );
-            if (ret == 0) {
-                env.console.log("Battle menu detected, assuming caught in a loop. Resetting.", COLOR_RED);
-                battle_ended = true; //Leave the loop
-                goldfish_loop = true;
-            }
-            else {
-                //Wild pokemon's turn/wait for catch animation
-                //pbf_mash_button(context, BUTTON_A, 150);
-                stats.balls++;
-                env.update_stats();
-                //pbf_wait(context, 4000);
-                pbf_mash_button(context, BUTTON_B, 900);
-                context.wait_for_all_requests();
-
-                AdvanceDialogWatcher summary(COLOR_MAGENTA);
-                OverworldWatcher overworld(COLOR_BLUE);
-                SwapMenuWatcher swap_menu(COLOR_YELLOW);
-                int ret2 = wait_until(
-                    env.console, context,
-                    std::chrono::seconds(25),
-                    { summary, overworld, battle_menu, swap_menu }
-                );
-                switch (ret2) {
-                case 0:
-                    env.log("Dialog detected, assuming target Pokemon caught.");
-                    stats.catches++;
-                    env.update_stats();
-                    battle_ended = true;
-                    break;
-                case 1:
-                    env.log("Overworld detected, target Pokemon fainted.");
-                    send_program_status_notification(
-                        env, NOTIFICATION_STATUS_UPDATE,
-                        "Overworld detected, target Pokemon fainted."
-                    );
-                    battle_ended = true;
-                    goldfish_loop = true;
-                    break;
-                case 2:
-                    env.log("Battle menu detected, continuing.");
-                    break;
-                case 3:
-                    env.log("Swap menu detected, your Pokemon fainted.");
-                    send_program_status_notification(
-                        env, NOTIFICATION_STATUS_UPDATE,
-                        "Swap menu detected, your Pokemon fainted."
-                    );
-                    //Set to true and set goldfish loop to true to skip to the reset.
-                    battle_ended = true;
-                    goldfish_loop = true;
-                    break;
-                default:
-                    env.console.log("Invalid state ret2.");
-                    stats.errors++;
-                    env.update_stats();
-                    throw OperationFailedException(
-                        ErrorReport::SEND_ERROR_REPORT, env.console,
-                        "Invalid state ret2.",
-                        true
-                    );
-                }
-            }
-        }
-        if (goldfish_loop) {
-            battle_ended = false; //Set this back and use the reset below
-        }
-        if (battle_ended){
-            //Close all the dex entry and caught menus
-            pbf_mash_button(context, BUTTON_B, 170);
-            context.wait_for_all_requests();
-
-            //Open box
-            enter_box_system_from_overworld(env.program_info(), env.console, context);
-            context.wait_for(std::chrono::milliseconds(400));
-
-            //Check that the target pokemon was caught
-            if (check_empty_slots_in_party(env.program_info(), env.console, context) != 0) {
-                battle_ended = false;
-                env.console.log("One or more empty slots in party. Target was not caught or user setup error.");
-                send_program_status_notification(
-                    env, NOTIFICATION_STATUS_UPDATE,
-                    "One or more empty slots in party. Target was not caught."
-                );
-            }
-            else {
-                //Navigate to last party slot
-                move_box_cursor(env.program_info(), env.console, context, BoxCursorLocation::PARTY, 5, 0);
-
-                //Check the IVs of the newly caught Pokemon - *must be on IV panel*
-                EggHatchAction action = EggHatchAction::Keep;
-                //This is an edited version of check_baby_info
-                check_stats_reset_info(env.console, context, LANGUAGE, FILTERS, action);
-
-                switch (action) {
-                case EggHatchAction::StopProgram:
-                    //Correct stats found, end program
-                    stats_matched = true;
-                    env.console.log("Match found!");
-                    stats.matches++;
-                    env.update_stats();
-                    send_program_status_notification(
-                        env, NOTIFICATION_PROGRAM_FINISH,
-                        "Match found!"
-                    );
-                    break;
-                case EggHatchAction::Release:
-                    stats_matched = false;
-                    battle_ended = false; //Set this back and use the reset below
-                    env.console.log("Stats did not match table settings.");
-                    send_program_status_notification(
-                        env, NOTIFICATION_STATUS_UPDATE,
-                        "Stats did not match table settings."
-                    );
-                    break;
-                default:
-                    env.console.log("Invalid state.");
-                    stats.errors++;
-                    env.update_stats();
-                    throw OperationFailedException(
-                        ErrorReport::SEND_ERROR_REPORT, env.console,
-                        "Invalid state.",
-                        true
-                    );
-                }
-            }
-        }
-        if (!battle_ended){
-            send_program_status_notification(
-                env, NOTIFICATION_STATUS_UPDATE,
-                "Resetting game."
-            );
-            //Reset game
-            stats.resets++;
-            env.update_stats();
-            pbf_press_button(context, BUTTON_HOME, 20, GameSettings::instance().GAME_TO_HOME_DELAY);
-            reset_game_from_home(env.program_info(), env.console, context, 5 * TICKS_PER_SECOND);
-        }
-    }
-    env.update_stats();
-    GO_HOME_WHEN_DONE.run_end_of_program(context);
-    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
-}
-    
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_StatsReset.h b/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_StatsReset.h
deleted file mode 100644
index 7486aeafec..0000000000
--- a/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_StatsReset.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*  Stats Reset
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSV_StatsReset_H
-#define PokemonAutomation_PokemonSV_StatsReset_H
-
-#include "CommonFramework/Notifications/EventNotificationsTable.h"
-#include "CommonFramework/Options/LanguageOCROption.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
-#include "PokemonSwSh/Options/PokemonSwSh_BallSelectOption.h"
-#include "Pokemon/Options/Pokemon_StatsResetFilter.h"
-
-namespace PokemonAutomation {
-namespace NintendoSwitch {
-namespace PokemonSV {
-
-class StatsReset_Descriptor : public SingleSwitchProgramDescriptor {
-public:
-    StatsReset_Descriptor();
-
-    struct Stats;
-    virtual std::unique_ptr<StatsTracker> make_stats() const override;
-};
-
-class StatsReset : public SingleSwitchProgramInstance {
-public:
-    StatsReset();
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-    //Can expand targets assuming there's anything else not locked in the DLC
-    enum class Target {
-        TreasuresOfRuin,
-        Generic,
-    };
-    EnumDropdownOption<Target> TARGET;
-
-    OCR::LanguageOCROption LANGUAGE;
-    PokemonSwSh::PokemonBallSelectOption BALL_SELECT;
-    Pokemon::StatsResetFilterTable FILTERS;
-
-    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
-    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
-    EventNotificationsOption NOTIFICATIONS;
-};
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_TournamentFarmer.cpp b/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_TournamentFarmer.cpp
deleted file mode 100644
index c01f1ccb89..0000000000
--- a/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_TournamentFarmer.cpp
+++ /dev/null
@@ -1,694 +0,0 @@
-/*  Tournament Farmer
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/Exceptions/OperationFailedException.h"
-#include "CommonFramework/ImageTools/ImageFilter.h"
-#include "CommonFramework/Notifications/ProgramNotifications.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
-#include "CommonFramework/ImageTools/ImageFilter.h"
-#include "CommonFramework/Inference/BlackScreenDetector.h"
-//#include "CommonFramework/Tools/ErrorDumper.h"
-#include "CommonFramework/Tools/StatsTracking.h"
-#include "CommonFramework/Tools/VideoResolutionCheck.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "Pokemon/Pokemon_Strings.h"
-//#include "PokemonSV/PokemonSV_Settings.h"
-#include "PokemonSV/Inference/PokemonSV_MoneyReader.h"
-#include "PokemonSV/Inference/Battles/PokemonSV_NormalBattleMenus.h"
-#include "PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h"
-#include "PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h"
-#include "PokemonSV/Programs/PokemonSV_SaveGame.h"
-#include "PokemonSV/Programs/PokemonSV_Navigation.h"
-#include "PokemonSV/Inference/PokemonSV_TournamentPrizeNameReader.h"
-#include "PokemonSV/Resources/PokemonSV_TournamentPrizeNames.h"
-#include "PokemonSV_TournamentFarmer.h"
-
-namespace PokemonAutomation {
-namespace NintendoSwitch {
-namespace PokemonSV {
-
-using namespace Pokemon;
-
-TournamentFarmer_Descriptor::TournamentFarmer_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonSV:TournamentFarmer",
-        STRING_POKEMON + " SV", "Tournament Farmer",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonSV/TournamentFarmer.md",
-        "Farm the Academy Ace Tournament for money and prizes.",
-        FeedbackType::REQUIRED,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-
-struct TournamentFarmer_Descriptor::Stats : public StatsTracker {
-    Stats()
-        : tournaments(m_stats["Tournaments won"])
-        , battles(m_stats["Battles fought"])
-        , losses(m_stats["Losses"])
-        , money(m_stats["Money made"])
-        , matches(m_stats["Items matched"])
-        , errors(m_stats["Errors"])
-    {
-        m_display_order.emplace_back("Tournaments won");
-        m_display_order.emplace_back("Battles fought");
-        m_display_order.emplace_back("Losses");
-        m_display_order.emplace_back("Money made");
-        m_display_order.emplace_back("Items matched");
-        m_display_order.emplace_back("Errors", true);
-    }
-    std::atomic<uint64_t>& tournaments;
-    std::atomic<uint64_t>& battles;
-    std::atomic<uint64_t>& losses;
-    std::atomic<uint64_t>& money;
-    std::atomic<uint64_t>& matches;
-    std::atomic<uint64_t>& errors;
-};
-std::unique_ptr<StatsTracker> TournamentFarmer_Descriptor::make_stats() const {
-    return std::unique_ptr<StatsTracker>(new Stats());
-}
-
-TournamentFarmer::TournamentFarmer()
-    : NUM_ROUNDS(
-          "<b>Number of Tournaments to run:",
-          LockWhileRunning::UNLOCKED,
-          100, 0
-          )
-    , TRY_TO_TERASTILLIZE(
-          "<b>Use Terastillization:</b><br>Tera at the start of battle. Will take longer to complete each tournament but may be worth the attack boost.<br>This setting is not necessary if you are running a set specifically made to farm the tournament.",
-          LockWhileRunning::UNLOCKED,
-          false
-          )
-    , SAVE_NUM_ROUNDS(
-          "<b>Save every this many tournaments:</b><br>Zero disables saving. Will save win or lose.",
-          LockWhileRunning::UNLOCKED,
-          0, 0
-          )
-    , MONEY_LIMIT(
-        "<b>Stop after earning this amount of money:</b><br>Zero disables this check. Does not count losses. Max is 999,999,999.",
-        LockWhileRunning::UNLOCKED,
-        999999999, 0, 999999999
-    )
-    , HHH_ZOROARK(
-        "<b>Happy Hour H-Zoroark:</b><br>Check this if you have an event Hisuian Zoroark with Happy Hour and Memento as your lead.<br>Happy Hour must be in its first move slot and Memento must be in its second.<br>",
-        LockWhileRunning::LOCKED,
-        false
-    )
-    , GO_HOME_WHEN_DONE(false)
-    , LANGUAGE(
-          "<b>Game Language:</b><br>The language is needed to read the prizes.",
-          TournamentPrizeNameReader::instance().languages(),
-          LockWhileRunning::LOCKED,
-          true
-          )
-    , TARGET_ITEMS("<b>Items:</b>")
-    , NOTIFICATION_PRIZE_MATCH("Matching Prize", true, false, ImageAttachmentMode::JPG, { "Notifs" })
-    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
-    , NOTIFICATIONS({
-        &NOTIFICATION_PRIZE_MATCH,
-        &NOTIFICATION_STATUS_UPDATE,
-        &NOTIFICATION_PROGRAM_FINISH,
-        &NOTIFICATION_ERROR_FATAL,
-        })
-{
-    PA_ADD_OPTION(NUM_ROUNDS);
-    PA_ADD_OPTION(TRY_TO_TERASTILLIZE);
-    PA_ADD_OPTION(SAVE_NUM_ROUNDS);
-    PA_ADD_OPTION(MONEY_LIMIT);
-    PA_ADD_OPTION(HHH_ZOROARK);
-    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
-    PA_ADD_OPTION(LANGUAGE);
-    PA_ADD_OPTION(TARGET_ITEMS);
-    PA_ADD_OPTION(NOTIFICATIONS);
-}
-
-//Check and process the amount of money earned at the end of a battle
-void TournamentFarmer::check_money(SingleSwitchProgramEnvironment& env, BotBaseContext& context) {
-    TournamentFarmer_Descriptor::Stats& stats = env.current_stats<TournamentFarmer_Descriptor::Stats>();
-
-    int top_money = -1;
-    int bottom_money = -1;
-
-    //There must be a value for top money
-    //Bottom money only appear after 1st battle and should clear out
-    for (uint16_t c = 0; c < 3 && top_money == -1; c++) {
-        VideoSnapshot screen = env.console.video().snapshot();
-        ImageFloatBox top_notif(0.745, 0.152, 0.206, 0.083);
-        ImageFloatBox bottom_notif(0.745, 0.261, 0.220, 0.083);
-
-        ImageRGB32 image_top = to_blackwhite_rgb32_range(
-            extract_box_reference(screen, top_notif),
-            combine_rgb(215, 215, 215), combine_rgb(255, 255, 255), true
-        );
-        //image_top.save("./image_top.png");
-
-        //Different color range on the bottom notif ~B0B5B8
-        ImageRGB32 image_bottom = to_blackwhite_rgb32_range(
-            extract_box_reference(screen, bottom_notif),
-            combine_rgb(130, 130, 130), combine_rgb(240, 240, 240), true
-        );
-        //image_bottom.save("./image_bottom.png");
-        
-        top_money = OCR::read_money(env.console, image_top);
-        bottom_money = OCR::read_money(env.console, image_bottom);
-
-        //dump_image(
-        //    env.console, env.program_info(),
-        //    "battledone",
-        //    screen
-        //);
-
-        //Filter out low and high numbers in case of misreads
-        //From bulbapedia: Nemona is lowest at 8640,  Penny and Geeta are highest at 16800
-        //Max earnings? in one battle: happy hour * amulet coin * (base winnings + (8 * make it rain lv100))
-        if (top_money < 8000 || top_money > 80000 ) {
-            top_money = -1;
-        }
-        if (bottom_money < 8000 || bottom_money > 80000) {
-            bottom_money = -1;
-        }
-    }
-
-    if (top_money != -1) {
-        //If both notification boxes appear take the newer one.
-        if (bottom_money != -1) {
-            stats.money += bottom_money;
-            env.update_stats();
-        } else {
-            stats.money += top_money;
-            env.update_stats();
-        }
-    }
-    else {
-        env.log("Unable to read money.");
-    }
-
-}
-
-
-//Handle a single battle by mashing A until AdvanceDialog (end of battle) is detected
-void TournamentFarmer::run_battle(SingleSwitchProgramEnvironment& env, BotBaseContext& context) {
-    TournamentFarmer_Descriptor::Stats& stats = env.current_stats<TournamentFarmer_Descriptor::Stats>();
-
-    //Only applies if the player has The Hidden Treasure of Area Zero Hisuian Zoroark
-    if (HHH_ZOROARK) {
-        env.log("Zoroark option checked.");
-        
-        //Use happy hour
-        env.log("Using Happy Hour.");
-        pbf_mash_button(context, BUTTON_A, 300);
-        context.wait_for_all_requests();
-
-        //If not already dead, use memento and die
-        NormalBattleMenuWatcher memento(COLOR_RED);
-        MoveSelectDetector move_select(COLOR_BLUE);
-        SwapMenuWatcher fainted(COLOR_YELLOW);
-        int retZ = wait_until(
-            env.console, context,
-            std::chrono::seconds(60),
-            { memento, fainted }
-        );
-        if (retZ == 0) {
-            env.log("Using Memento to faint.");
-            pbf_press_button(context, BUTTON_A, 10, 50);
-            move_select.move_to_slot(env.console, context, 1);
-            pbf_press_button(context, BUTTON_A, 10, 50);
-            pbf_wait(context, 100);
-            context.wait_for_all_requests();
-
-            pbf_press_dpad(context, DPAD_DOWN, 10, 50);
-            pbf_press_button(context, BUTTON_A, 10, 50);
-            context.wait_for_all_requests();
-
-            //Try six times, in case of paralysis (only applies to Pachirisu's Nuzzle) preventing use of Memento.
-            int retF = run_until(
-                env.console, context,
-                [&](BotBaseContext& context) {
-                    for (size_t c = 0; c < 6; c++) {
-                        NormalBattleMenuWatcher battle_memento(COLOR_RED);
-                        int ret_memento = wait_until(
-                            env.console, context,
-                            std::chrono::seconds(60),
-                            { battle_memento }
-                        );
-                        if (ret_memento == 0) {
-                            env.log("Attempting to use Memento.");
-                            pbf_mash_button(context, BUTTON_A, 300);
-                            context.wait_for_all_requests();
-                        }
-                    }
-                },
-                { fainted }
-            );
-
-            if (retF == 0) {
-                env.log("Swap menu detected.");
-            } else {
-                env.log("Took more than 6 turns to use Memento. Was Zoroark able to faint?", COLOR_RED);
-                stats.errors++;
-                env.update_stats();
-                send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
-                throw OperationFailedException(
-                    ErrorReport::SEND_ERROR_REPORT, env.console,
-                    "Took more than 6 turns to use Memento. Was Zoroark able to faint?",
-                    true
-                );
-            }
-
-        }
-        else if (retZ == 1) {
-            env.log("Detected swap menu. Assuming Zoroark fainted turn one.");
-        } else {
-            env.log("Timed out after Happy Hour.", COLOR_RED);
-            stats.errors++;
-            env.update_stats();
-            send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
-            throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, env.console,
-                "Timed out after Happy Hour.",
-                true
-            );
-        }
-
-        //Select 2nd pokemon from swap menu and send it out
-        fainted.move_to_slot(env.console, context, 1);
-        pbf_mash_button(context, BUTTON_A, 300);
-        context.wait_for_all_requests();
-
-        //Check for battle menu to ensure it's sent out
-        NormalBattleMenuWatcher resume_battle(COLOR_RED);
-        int retRes = wait_until(
-            env.console, context,
-            std::chrono::seconds(60),
-            { resume_battle }
-        );
-        if (retRes == 0) {
-            env.log("Battle menu detected. Second Pokemon has been sent out. Resuming usual battle sequence.");
-        } else {
-            env.log("Could not find battle menu.", COLOR_RED);
-            stats.errors++;
-            env.update_stats();
-            send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
-            throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, env.console,
-                "Could not find battle menu.",
-                true
-            );
-        }
-
-    }
-
-    //Assuming the player has a charged orb
-    if (TRY_TO_TERASTILLIZE) {
-        env.log("Attempting to terastillize.");
-        //Open move menu
-        pbf_press_button(context, BUTTON_A, 10, 50);
-        pbf_wait(context, 100);
-        context.wait_for_all_requests();
-
-        pbf_press_button(context, BUTTON_R, 20, 50);
-        pbf_press_button(context, BUTTON_A, 10, 50);
-    }
-
-    //Mash A until battle finished
-    AdvanceDialogWatcher end_of_battle(COLOR_YELLOW);
-    WallClock start = current_time();
-    int ret_black = run_until(
-        env.console, context,
-        [&](BotBaseContext& context) {
-            for(size_t c = 0; c < 30; c++) { //Sylveon build has 16 PP at max, and Chi-Yu build has 24.
-                if (current_time() - start > std::chrono::minutes(5)) {
-                    env.log("Timed out during battle after 5 minutes.", COLOR_RED);
-                    stats.errors++;
-                    env.update_stats();
-                    send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
-                    throw OperationFailedException(
-                        ErrorReport::SEND_ERROR_REPORT, env.console,
-                        "Timed out during battle after 5 minutes.",
-                        true
-                    );
-                }
-
-                NormalBattleMenuWatcher battle_menu(COLOR_YELLOW);
-                int ret = wait_until(
-                    env.console, context,
-                    std::chrono::seconds(90), //Tera takes ~25 to 30 seconds each, slightly over 60 seconds if both player and opponent uses in the same turn
-                    { battle_menu } //End of battle from tera'd ace takes longer, 45 seconds was not enough
-                );
-                if (ret == 0) {
-                    env.log("Battle menu detected. Pressing A to attack.");
-                    pbf_mash_button(context, BUTTON_A, 300);
-                    context.wait_for_all_requests();
-                } else {
-                    env.log("Timed out during battle. Stuck, crashed, or took more than 90 seconds for a turn.", COLOR_RED);
-                    stats.errors++;
-                    env.update_stats();
-                    send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
-                    throw OperationFailedException(
-                        ErrorReport::SEND_ERROR_REPORT, env.console,
-                        "Timed out during battle. Stuck, crashed, or took more than 90 seconds for a turn.",
-                        true
-                    );
-                }
-            }
-        },
-        { end_of_battle }
-        );
-    if (ret_black == 0) {
-        env.log("Battle finished."); //Cannot tell if win or loss.
-        stats.battles++;
-        env.update_stats();
-        send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
-
-        //Close dialog and then check money
-        pbf_press_button(context, BUTTON_B, 10, 50);
-        pbf_wait(context, 100);
-        context.wait_for_all_requests();
-
-        check_money(env, context);
-
-        //Clear any remaining dialog
-        pbf_mash_button(context, BUTTON_B, 300);
-        context.wait_for_all_requests();
-    } else {
-        env.log("Timed out during battle. Stuck, crashed, or took over 30 turns.", COLOR_RED);
-        stats.errors++;
-        env.update_stats();
-        send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
-        throw OperationFailedException(
-            ErrorReport::SEND_ERROR_REPORT, env.console,
-            "Timed out during battle. Stuck, crashed, or took over 30 turns.",
-            true
-        );
-    }
-    context.wait_for_all_requests();
-}
-
-
-//Check prize and notify if it matches filters after a tournament win
-void TournamentFarmer::check_prize(SingleSwitchProgramEnvironment& env, BotBaseContext& context) {
-    TournamentFarmer_Descriptor::Stats& stats = env.current_stats<TournamentFarmer_Descriptor::Stats>();
-
-    VideoSnapshot screen = env.console.video().snapshot();
-    ImageFloatBox dialog_box(0.259, 0.734, 0.484, 0.158);
-    ImageViewRGB32 dialog_image = extract_box_reference(screen, dialog_box);
-
-    //bool replace_color_within_range = false;
-    //ImageRGB32 dialog_filtered = filter_rgb32_range(
-    //    extract_box_reference(screen, dialog_box),
-    //    combine_rgb(50, 135, 162), combine_rgb(167, 244, 255), Color(0), replace_color_within_range
-    //);
-    //dialog_filtered.save("./dialog_image.png");
-
-    const double LOG10P_THRESHOLD = -1.5;
-    OCR::StringMatchResult result = PokemonSV::TournamentPrizeNameReader::instance().read_substring(
-        env.console, LANGUAGE, dialog_image,
-        OCR::BLUE_TEXT_FILTERS()
-    );
-    result.clear_beyond_log10p(LOG10P_THRESHOLD);
-    if (result.results.empty()) {
-        env.log("No matching prize name found in dialog box.");
-        send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
-    }
-    for (const auto& r : result.results) {
-        env.console.log("Found prize: " + r.second.token);
-        if (TARGET_ITEMS.find_item(r.second.token)) {
-            env.log("Prize matched");
-
-            stats.matches++;
-            env.update_stats();
-
-            send_program_notification(
-                env, NOTIFICATION_PRIZE_MATCH,
-                COLOR_GREEN, "Prize matched",
-                {
-                    { "Item:", get_tournament_prize_name(r.second.token).display_name() },
-                }
-            , "", screen);
-            break;
-        }
-    }
-}
-
-
-//Tournament won and over
-void TournamentFarmer::handle_end_of_tournament(SingleSwitchProgramEnvironment& env, BotBaseContext& context) {
-    TournamentFarmer_Descriptor::Stats& stats = env.current_stats<TournamentFarmer_Descriptor::Stats>();
-
-    //Space out the black screen detection after the "champion" battle
-    //pbf_wait(context, 700);
-    //context.wait_for_all_requests();
-
-    //One more black screen when done to load the academy
-    BlackScreenOverWatcher black_screen(COLOR_RED, { 0.2, 0.2, 0.6, 0.6 });
-    int ret_black_won = run_until(
-        env.console, context,
-        [](BotBaseContext& context) {
-            pbf_mash_button(context, BUTTON_B, 10000);
-        },
-        { black_screen }
-        );
-    if (ret_black_won == 0) {
-        env.log("Tournament complete, waiting for academy.");
-    }
-    context.wait_for_all_requests();
-
-    //Wait for congrats dialog - wait an extra bit since the dialog appears while still loading in
-    AdvanceDialogWatcher advance_detector(COLOR_YELLOW);
-    int ret_dialog = wait_until(env.console, context, Milliseconds(1000), { advance_detector });
-    if (ret_dialog == 0) {
-        env.log("Dialog detected.");
-    }
-    pbf_wait(context, 300);
-    context.wait_for_all_requests();
-
-    //Next dialog is prize dialog - wait until all dialog has appeared then check prize
-    pbf_press_button(context, BUTTON_A, 10, 100);
-    pbf_wait(context, 100);
-    context.wait_for_all_requests();
-
-    check_prize(env, context);
-
-    //Clear remaining dialog
-    OverworldWatcher overworld(COLOR_CYAN);
-    int ret_over = run_until(
-        env.console, context,
-        [](BotBaseContext& context) {
-            pbf_mash_button(context, BUTTON_B, 700);
-        },
-        { overworld }
-        );
-    if (ret_over != 0) {
-        env.console.log("Failed to detect overworld.", COLOR_RED);
-    }
-    context.wait_for_all_requests();
-
-    stats.tournaments++;
-    env.update_stats();
-    send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
-}
-
-
-//Fly to academy from west pokemon center after losing.
-void TournamentFarmer::return_to_academy_after_loss(SingleSwitchProgramEnvironment& env, BotBaseContext& context) {
-    env.log("Tournament lost! Navigating back to academy.");
-    open_map_from_overworld(env.program_info(), env.console, context);
-    pbf_press_button(context, BUTTON_ZR, 50, 40);
-    pbf_move_left_joystick(context, 187, 0, 50, 0);
-    fly_to_overworld_from_map(env.program_info(), env.console, context);
-
-    pbf_wait(context, 100);
-    context.wait_for_all_requests();
-
-    env.log("At academy fly point. Heading back to doors.");
-    pbf_move_left_joystick(context, 0, 128, 8, 0);
-    pbf_press_button(context, BUTTON_L, 50, 40);
-    pbf_press_button(context, BUTTON_PLUS, 50, 40);
-    pbf_press_button(context, BUTTON_B, 50, 40); //Trying to jump/glide over npc spawns
-    pbf_press_button(context, BUTTON_B, 50, 40);
-    pbf_move_left_joystick(context, 128, 0, 500, 0);
-    pbf_press_button(context, BUTTON_B, 50, 40);
-    pbf_press_button(context, BUTTON_B, 50, 40);
-
-    BlackScreenOverWatcher black_screen(COLOR_RED, { 0.2, 0.2, 0.6, 0.6 });
-    int ret_black_lost = run_until(
-        env.console, context,
-        [](BotBaseContext& context) {
-            pbf_move_left_joystick(context, 128, 0, 5000, 0);
-        },
-        { black_screen }
-        );
-    context.wait_for_all_requests();
-    if (ret_black_lost == 0) {
-        env.log("Black screen detected.");
-    }
-
-    //Wait for academy to load.
-    OverworldWatcher overworld(COLOR_CYAN);
-    int ret_academy = wait_until(env.console, context, Milliseconds(4000), { overworld });
-    if (ret_academy == 0) {
-        env.log("Entered academy. Walking to tournament entry.");
-    }
-    context.wait_for_all_requests();
-
-    //Move to tournament entry
-    pbf_move_left_joystick(context, 128, 0, 500, 0);
-    pbf_move_left_joystick(context, 0, 128, 100, 0);
-    pbf_move_left_joystick(context, 255, 0, 100, 0);
-    context.wait_for_all_requests();
-}
-
-
-void TournamentFarmer::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) {
-    assert_16_9_720p_min(env.logger(), env.console);
-    TournamentFarmer_Descriptor::Stats& stats = env.current_stats<TournamentFarmer_Descriptor::Stats>();
-
-    /*
-    Preconditions:
-    Last Pokemon Center visited is Mesagzoa West
-    Sylveon only farming build - ideally with fairy tera
-    stand in front of tournament entry man
-    Ride legendary is not the solo pokemon (in case of loss)
-    Do not have other notifications on screen for money reading (ex. new outbreak)
-
-    Possible improvements to make:
-    find prize sprites - some code is there, just disabled
-    find translations for tera shards
-    other languages: make sure "bottle cap" isn't misread as "bottle of PP Up"
-    */
-
-    for(uint32_t c = 0; c < NUM_ROUNDS; c++) {
-        env.log("Tournament loop started.");
-        //Initiate dialog then mash until first battle starts
-        AdvanceDialogWatcher advance_detector(COLOR_YELLOW);
-        pbf_press_button(context, BUTTON_A, 10, 50);
-        pbf_press_button(context, BUTTON_A, 10, 50);
-        int ret = wait_until(env.console, context, Milliseconds(7000), { advance_detector });
-        if (ret == 0) {
-            env.log("Dialog detected.");
-        }
-        else {
-            env.log("Dialog not detected.");
-        }
-        pbf_mash_button(context, BUTTON_A, 400);
-        context.wait_for_all_requests();
-
-        NormalBattleMenuWatcher battle_menu(COLOR_YELLOW);
-        int ret_battle = run_until(
-            env.console, context,
-            [](BotBaseContext& context) {
-                pbf_mash_button(context, BUTTON_B, 10000); //it takes a while to load and start
-            },
-            { battle_menu }
-        );
-        if (ret_battle != 0) {
-            env.console.log("Failed to detect battle start!", COLOR_RED);
-        }
-        context.wait_for_all_requests();
-
-        bool battle_lost = false;
-        for (uint16_t battles = 0; battles < 4; battles++) {
-            NormalBattleMenuWatcher battle_menu2(COLOR_YELLOW); //Next battle started
-            OverworldWatcher overworld(COLOR_CYAN); //Previous battle was lost
-            
-            int ret_battle2 = run_until(
-                env.console, context,
-                [](BotBaseContext& context) {
-                    pbf_mash_button(context, BUTTON_B, 120 * TICKS_PER_SECOND);
-                },
-                { battle_menu2, overworld }
-            );
-            context.wait_for_all_requests();
-
-            switch (ret_battle2) {
-            case 0:
-                env.log("Detected battle menu.");
-                run_battle(env, context);
-                break;
-            case 1:
-                env.log("Detected overworld.");
-                battle_lost = true;
-                stats.losses++;
-                env.update_stats();
-                send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
-                break;
-            default:
-                env.log("Failed to detect battle menu or dialog prompt!");
-                stats.errors++;
-                env.update_stats();
-                send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
-                throw OperationFailedException(
-                    ErrorReport::SEND_ERROR_REPORT, env.console,
-                    "Failed to detect battle menu or dialog prompt!",
-                    true
-                );
-                break;
-            }
-
-            //If this is the last battle in the tournament check for overworld in case player lost
-            if (battles == 3) {
-                env.log("Final battle of the tournament complete, checking for overworld/loss.");
-
-                //Clear dialog, mash B
-                pbf_mash_button(context, BUTTON_B, 400);
-                context.wait_for_all_requests();
-
-                OverworldWatcher overworld2(COLOR_RED);
-                int ret_lost_final = wait_until(
-                    env.console, context,
-                    std::chrono::seconds(3),
-                    { overworld2 }
-                );
-                switch (ret_lost_final) {
-                case 0:
-                    env.log("Final battle of the tournament lost.");
-                    battle_lost = true;
-                    stats.losses++;
-                    env.update_stats();
-                    send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
-                    break;
-                default:
-                    env.log("Final battle of the tournament won.");
-                    break;
-                }
-            }
-
-            if (battle_lost) {
-                return_to_academy_after_loss(env, context);
-                break;
-            }
-        }
-
-        //Tournament won
-        if (!battle_lost) {
-            handle_end_of_tournament(env, context);
-        }
-
-        env.log("Tournament loop complete.");
-
-        //Save the game if option is set
-        uint16_t num_rounds_temp = SAVE_NUM_ROUNDS;
-        if (num_rounds_temp != 0 && ((c + 1) % num_rounds_temp) == 0) {
-            env.log("Saving game.");
-            save_game_from_overworld(env.program_info(), env.console, context);
-        }
-
-        //Break loop and finish program if money limit is hit
-        uint32_t earnings_temp = MONEY_LIMIT;
-        if (earnings_temp != 0 && stats.money >= earnings_temp) {
-            env.log("Money limit hit. Ending program.");
-            break;
-        }
-    }
-
-    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
-    GO_HOME_WHEN_DONE.run_end_of_program(context);
-}
-
-}
-}
-}
-
diff --git a/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_TournamentFarmer.h b/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_TournamentFarmer.h
deleted file mode 100644
index 833e6fbbe6..0000000000
--- a/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_TournamentFarmer.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*  Tournament Farmer
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_TournamentFarmer_H
-#define PokemonAutomation_PokemonSwSh_TournamentFarmer_H
-
-#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
-#include "Common/Cpp/Options/SimpleIntegerOption.h"
-#include "CommonFramework/Notifications/EventNotificationsTable.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
-#include "CommonFramework/Options/LanguageOCROption.h"
-#include "PokemonSV/Options/PokemonSV_TournamentPrizeTable.h"
-
-namespace PokemonAutomation {
-namespace NintendoSwitch {
-namespace PokemonSV {
-
-class TournamentFarmer_Descriptor : public SingleSwitchProgramDescriptor {
-public:
-    TournamentFarmer_Descriptor();
-    struct Stats;
-    virtual std::unique_ptr<StatsTracker> make_stats() const override;
-};
-
-class TournamentFarmer : public SingleSwitchProgramInstance {
-public:
-    TournamentFarmer();
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-    SimpleIntegerOption<uint32_t> NUM_ROUNDS;
-    BooleanCheckBoxOption TRY_TO_TERASTILLIZE;
-    SimpleIntegerOption<uint16_t> SAVE_NUM_ROUNDS;
-    SimpleIntegerOption<uint32_t> MONEY_LIMIT;
-    BooleanCheckBoxOption HHH_ZOROARK;
-    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
-    OCR::LanguageOCROption LANGUAGE;
-    TournamentPrizeTable TARGET_ITEMS;
-    EventNotificationOption NOTIFICATION_PRIZE_MATCH;
-    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
-    EventNotificationsOption NOTIFICATIONS;
-
-    void check_money(SingleSwitchProgramEnvironment& env, BotBaseContext& context);
-    void run_battle(SingleSwitchProgramEnvironment& env, BotBaseContext& context);
-    void check_prize(SingleSwitchProgramEnvironment& env, BotBaseContext& context);
-    void handle_end_of_tournament(SingleSwitchProgramEnvironment& env, BotBaseContext& context);
-    void return_to_academy_after_loss(SingleSwitchProgramEnvironment& env, BotBaseContext& context);
-};
-
-}
-}
-}
-#endif
-
-
-
diff --git a/SerialPrograms/Source/PokemonSV/Programs/Glitches/PokemonSV_CloneItems-1.0.1.cpp b/SerialPrograms/Source/PokemonSV/Programs/Glitches/PokemonSV_CloneItems-1.0.1.cpp
deleted file mode 100644
index f3d441e4cd..0000000000
--- a/SerialPrograms/Source/PokemonSV/Programs/Glitches/PokemonSV_CloneItems-1.0.1.cpp
+++ /dev/null
@@ -1,323 +0,0 @@
-/*  Clone Items
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/Exceptions/FatalProgramException.h"
-#include "CommonFramework/Exceptions/OperationFailedException.h"
-#include "CommonFramework/ImageTools/SolidColorTest.h"
-#include "CommonFramework/Notifications/ProgramNotifications.h"
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
-#include "CommonFramework/Tools/StatsTracking.h"
-#include "CommonFramework/Tools/ErrorDumper.h"
-#include "CommonFramework/Tools/VideoResolutionCheck.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonSV/Inference/Dialogs/PokemonSV_GradientArrowDetector.h"
-#include "PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h"
-#include "PokemonSV/Inference/PokemonSV_MainMenuDetector.h"
-#include "PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h"
-#include "PokemonSV_CloneItems-1.0.1.h"
-
-//#include <iostream>
-//using std::cout;
-//using std::endl;
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-using namespace Pokemon;
-
-
-CloneItems101_Descriptor::CloneItems101_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonSV:CloneItems1.0.1",
-        STRING_POKEMON + " SV", "Clone Items (1.0.1)",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonSV/CloneItems-101.md",
-        "Clone items using the add-to-party glitch.",
-        FeedbackType::REQUIRED,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-struct CloneItems101_Descriptor::Stats : public StatsTracker{
-    Stats()
-        : m_cloned(m_stats["Cloned"])
-        , m_errors(m_stats["Errors"])
-    {
-        m_display_order.emplace_back("Cloned");
-        m_display_order.emplace_back("Errors", true);
-    }
-    std::atomic<uint64_t>& m_cloned;
-    std::atomic<uint64_t>& m_errors;
-};
-std::unique_ptr<StatsTracker> CloneItems101_Descriptor::make_stats() const{
-    return std::unique_ptr<StatsTracker>(new Stats());
-}
-
-
-
-
-class BattleTeamDetector{
-public:
-    BattleTeamDetector()
-        : m_slot1(0.024, 0.187 + 0 * 0.1166, 0.005, 0.100)
-        , m_slot2(0.024, 0.187 + 1 * 0.1166, 0.005, 0.100)
-        , m_slot3(0.024, 0.187 + 2 * 0.1166, 0.005, 0.100)
-        , m_slot4(0.024, 0.187 + 3 * 0.1166, 0.005, 0.100)
-        , m_slot5(0.024, 0.187 + 4 * 0.1166, 0.005, 0.100)
-        , m_slot6(0.024, 0.187 + 5 * 0.1166, 0.005, 0.100)
-    {}
-
-    bool detect(const ImageViewRGB32& screen) const{
-        ImageStats stats1 = image_stats(extract_box_reference(screen, m_slot1));
-//        cout << stats0.average << stats0.stddev << endl;
-        if (!is_white(stats1, 500, 20)) return false;
-        ImageStats stats2 = image_stats(extract_box_reference(screen, m_slot2));
-        if (!is_white(stats2, 500, 20)) return false;
-        ImageStats stats3 = image_stats(extract_box_reference(screen, m_slot3));
-        if (!is_white(stats3, 500, 20)) return false;
-        ImageStats stats4 = image_stats(extract_box_reference(screen, m_slot4));
-        if (!is_white(stats4, 500, 20)) return false;
-        ImageStats stats5 = image_stats(extract_box_reference(screen, m_slot5));
-        if (!is_white(stats5, 500, 20)) return false;
-        ImageStats stats6 = image_stats(extract_box_reference(screen, m_slot6));
-        if (!is_white(stats6, 500, 20)) return false;
-        return true;
-    }
-
-private:
-    ImageFloatBox m_slot1;
-    ImageFloatBox m_slot2;
-    ImageFloatBox m_slot3;
-    ImageFloatBox m_slot4;
-    ImageFloatBox m_slot5;
-    ImageFloatBox m_slot6;
-};
-
-
-
-CloneItems101::CloneItems101()
-    : GO_HOME_WHEN_DONE(false)
-    , ITEMS_TO_CLONE(
-        "<b>Items to Clone:</b><br>Clone this many time.",
-        LockWhileRunning::UNLOCKED,
-        999, 1, 999
-    )
-    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
-    , NOTIFICATIONS({
-        &NOTIFICATION_STATUS_UPDATE,
-        &NOTIFICATION_PROGRAM_FINISH,
-        &NOTIFICATION_ERROR_RECOVERABLE,
-        &NOTIFICATION_ERROR_FATAL,
-    })
-{
-    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
-    PA_ADD_OPTION(ITEMS_TO_CLONE);
-    PA_ADD_OPTION(NOTIFICATIONS);
-}
-
-
-
-bool CloneItems101::clone_item(ProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context){
-    CloneItems101_Descriptor::Stats& stats = env.current_stats<CloneItems101_Descriptor::Stats>();
-
-    bool item_held = false;
-    WallClock start = current_time();
-    while (true){
-        if (current_time() - start > std::chrono::minutes(5)){
-            dump_image_and_throw_recoverable_exception(
-                env.program_info(), console, "CloneItemFailed",
-                "Failed to clone an item after 5 minutes."
-            );
-        }
-
-        OverworldWatcher overworld(COLOR_RED);
-        MainMenuWatcher main_menu(COLOR_YELLOW);
-        GradientArrowWatcher party_select_top(COLOR_GREEN, GradientArrowType::RIGHT, {0.30, 0.27, 0.10, 0.08});
-        GradientArrowWatcher party_select_return(COLOR_GREEN, GradientArrowType::RIGHT, {0.30, 0.57, 0.10, 0.08});
-        GradientArrowWatcher party_select_back(COLOR_GREEN, GradientArrowType::RIGHT, {0.30, 0.64, 0.10, 0.08});
-        AdvanceDialogWatcher dialog(COLOR_CYAN);
-        GradientArrowWatcher box_slot_one(COLOR_BLUE, GradientArrowType::DOWN, {0.24, 0.16, 0.05, 0.09});
-
-        PromptDialogDetector return_to_ride_prompt(COLOR_DARKGREEN, {0.500, 0.545, 0.400, 0.100});
-        BattleTeamDetector battle_team;
-
-        context.wait_for_all_requests();
-        int ret = wait_until(
-            console, context,
-            std::chrono::seconds(10),
-            {
-                overworld,
-                main_menu,
-                party_select_top,
-                party_select_return,
-                party_select_back,
-                dialog,
-                box_slot_one,
-            }
-        );
-        context.wait_for(std::chrono::milliseconds(50));
-
-        switch (ret){
-        case 0:
-            console.log("Detected overworld. (unexpected)", COLOR_RED);
-            stats.m_errors++;
-            pbf_press_button(context, BUTTON_X, 20, 105);
-            continue;
-        case 1:
-            console.log("Detected main menu.");
-            try{
-                if (item_held){
-                    main_menu.move_cursor(env.program_info(), console, context, MenuSide::RIGHT, 1, true);
-                    pbf_press_button(context, BUTTON_A, 20, 20);
-                }else{
-                    main_menu.move_cursor(env.program_info(), console, context, MenuSide::LEFT, 1, true);
-                    pbf_press_button(context, BUTTON_A, 20, 50);
-                    pbf_press_dpad(context, DPAD_UP, 10, 10);
-                    pbf_press_dpad(context, DPAD_UP, 20, 10);
-                    pbf_press_button(context, BUTTON_A, 20, 20);
-                }
-            }catch (OperationFailedException& e){
-                e.send_notification(env, NOTIFICATION_ERROR_RECOVERABLE);
-            }
-            continue;
-        case 2:
-            console.log("Detected 6th slot select top. (unexpected)", COLOR_RED);
-            stats.m_errors++;
-            pbf_press_dpad(context, DPAD_UP, 10, 10);
-            pbf_press_dpad(context, DPAD_UP, 10, 10);
-            continue;
-        case 3:
-            console.log("Detected 6th slot select return. (unexpected)", COLOR_RED);
-            stats.m_errors++;
-            pbf_press_button(context, BUTTON_A, 20, 20);
-            continue;
-        case 4:
-            console.log("Detected 6th slot select back. (unexpected)", COLOR_RED);
-            stats.m_errors++;
-            pbf_press_dpad(context, DPAD_UP, 20, 30);
-            continue;
-        case 5:{
-            console.log("Detected dialog.");
-
-            //  Resolve ambiguities.
-            VideoSnapshot snapshot = console.video().snapshot();
-
-            //  Confirmation prompt for returning your ride back to ride form.
-            if (return_to_ride_prompt.detect(snapshot)){
-                pbf_press_button(context, BUTTON_A, 20, 20);
-                item_held = true;
-                continue;
-            }
-
-            //  No other recognized ambiguities.
-            pbf_press_button(context, BUTTON_B, 20, 20);
-            continue;
-        }
-        case 6:{
-            console.log("Detected box slot 1.");
-
-            if (!item_held){
-                pbf_press_button(context, BUTTON_B, 20, 105);
-//                continue;
-                return true;
-            }
-
-            VideoSnapshot snapshot = console.video().snapshot();
-
-            //  Not on the battle teams.
-            if (!battle_team.detect(snapshot)){
-                pbf_press_button(context, BUTTON_X, 20, 10);
-                pbf_press_button(context, BUTTON_X, 20, 10);
-                continue;
-            }
-
-            pbf_press_button(context, BUTTON_L, 20, 40);
-            pbf_press_button(context, BUTTON_A, 20, 50);
-            pbf_press_dpad(context, DPAD_DOWN, 10, 10);
-            pbf_press_dpad(context, DPAD_DOWN, 10, 10);
-            pbf_press_dpad(context, DPAD_DOWN, 10, 10);
-            pbf_press_button(context, BUTTON_A, 20, 50);
-            item_held = false;
-
-            continue;
-        }
-        default:
-            stats.m_errors++;
-            console.log("No recognized state after 10 seconds.", COLOR_RED);
-            return false;
-//            dump_image_and_throw_recoverable_exception(
-//                env, console, NOTIFICATION_ERROR_RECOVERABLE,
-//                "CloneItemNoState", "No recognized state after 10 seconds."
-//            );
-        }
-
-    }
-}
-
-void CloneItems101::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    assert_16_9_720p_min(env.logger(), env.console);
-
-    CloneItems101_Descriptor::Stats& stats = env.current_stats<CloneItems101_Descriptor::Stats>();
-
-    for (uint16_t cloned = 0; cloned < ITEMS_TO_CLONE;){
-        env.update_stats();
-        send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
-
-        if (clone_item(env, env.console, context)){
-            cloned++;
-            stats.m_cloned++;
-            continue;
-        }
-#if 0
-        try{
-            clone_item(env, env.console, context);
-            cloned++;
-            stats.m_cloned++;
-            continue;
-        }catch (OperationFailedException& e){
-            e.send_notification(env, NOTIFICATION_ERROR_RECOVERABLE);
-        }
-#endif
-
-        env.console.log("Attempting to recover by backing out to a known state.", COLOR_RED);
-
-        OverworldWatcher overworld(COLOR_RED);
-        MainMenuWatcher main_menu(COLOR_YELLOW);
-        context.wait_for_all_requests();
-        int ret = run_until(
-            env.console, context,
-            [](BotBaseContext& context){
-                for (size_t c = 0; c < 10; c++){
-                    pbf_press_button(context, BUTTON_B, 20, 230);
-                }
-            },
-            {overworld, main_menu}
-        );
-        context.wait_for(std::chrono::milliseconds(50));
-        if (ret < 0){
-            throw FatalProgramException(
-                ErrorReport::SEND_ERROR_REPORT, env.console,
-                "Unable to recover from error state.",
-                true
-            );
-        }
-    }
-
-    env.update_stats();
-    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
-    GO_HOME_WHEN_DONE.run_end_of_program(context);
-}
-
-
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSV/Programs/Glitches/PokemonSV_CloneItems-1.0.1.h b/SerialPrograms/Source/PokemonSV/Programs/Glitches/PokemonSV_CloneItems-1.0.1.h
deleted file mode 100644
index 47bbd117e0..0000000000
--- a/SerialPrograms/Source/PokemonSV/Programs/Glitches/PokemonSV_CloneItems-1.0.1.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*  Clone Items
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSV_CloneItems_H
-#define PokemonAutomation_PokemonSV_CloneItems_H
-
-#include "Common/Cpp/Options/SimpleIntegerOption.h"
-#include "CommonFramework/Notifications/EventNotificationsTable.h"
-#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-
-
-class CloneItems101_Descriptor : public SingleSwitchProgramDescriptor{
-public:
-    CloneItems101_Descriptor();
-
-    struct Stats;
-    virtual std::unique_ptr<StatsTracker> make_stats() const override;
-
-};
-
-
-
-
-class CloneItems101 : public SingleSwitchProgramInstance{
-public:
-    CloneItems101();
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-
-private:
-    //  Returns true on success.
-    bool clone_item(ProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context);
-
-private:
-    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
-
-    SimpleIntegerOption<uint16_t> ITEMS_TO_CLONE;
-
-    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
-    EventNotificationsOption NOTIFICATIONS;
-};
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSV/Programs/Glitches/PokemonSV_RideCloner-1.0.1.cpp b/SerialPrograms/Source/PokemonSV/Programs/Glitches/PokemonSV_RideCloner-1.0.1.cpp
deleted file mode 100644
index 36b6be4d0b..0000000000
--- a/SerialPrograms/Source/PokemonSV/Programs/Glitches/PokemonSV_RideCloner-1.0.1.cpp
+++ /dev/null
@@ -1,531 +0,0 @@
-/*  Egg Fetcher
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/Exceptions/FatalProgramException.h"
-#include "CommonFramework/Exceptions/OperationFailedException.h"
-#include "CommonFramework/Notifications/ProgramNotifications.h"
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
-#include "CommonFramework/Tools/StatsTracking.h"
-#include "CommonFramework/Tools/ErrorDumper.h"
-#include "CommonFramework/Tools/VideoResolutionCheck.h"
-#include "NintendoSwitch/NintendoSwitch_Settings.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_ScalarButtons.h"
-#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "Pokemon/Inference/Pokemon_NameReader.h"
-#include "PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.h"
-#include "PokemonSV/PokemonSV_Settings.h"
-#include "PokemonSV/Inference/PokemonSV_MainMenuDetector.h"
-#include "PokemonSV/Inference/PokemonSV_PokemonSummaryReader.h"
-#include "PokemonSV/Inference/Battles/PokemonSV_TeraBattleMenus.h"
-#include "PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h"
-#include "PokemonSV/Inference/Tera/PokemonSV_TeraCardDetector.h"
-#include "PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h"
-#include "PokemonSV/Programs/PokemonSV_SaveGame.h"
-#include "PokemonSV/Programs/PokemonSV_Navigation.h"
-#include "PokemonSV/Programs/PokemonSV_BasicCatcher.h"
-#include "PokemonSV/Programs/TeraRaids/PokemonSV_TeraRoutines.h"
-#include "PokemonSV/Programs/TeraRaids/PokemonSV_TeraBattler.h"
-#include "PokemonSV_RideCloner-1.0.1.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-using namespace Pokemon;
-
-
-RideCloner101_Descriptor::RideCloner101_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonSV:RideCloner1.0.1",
-        STRING_POKEMON + " SV", "Ride Cloner (1.0.1)",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonSV/RideCloner-101.md",
-        "Clone your ride legendary (and its item) using the add-to-party glitch.",
-        FeedbackType::REQUIRED,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-struct RideCloner101_Descriptor::Stats : public StatsTracker{
-    Stats()
-        : m_skips(m_stats["Date Skips"])
-//        , m_raids(m_stats["Raids"])
-        , m_wins(m_stats["Wins"])
-        , m_losses(m_stats["Losses"])
-        , m_skipped(m_stats["Skipped"])
-        , m_errors(m_stats["Errors"])
-        , m_shinies(m_stats["Shinies"])
-        , m_cloned(m_stats["Cloned"])
-        , m_failed(m_stats["Failed"])
-    {
-        m_display_order.emplace_back("Date Skips");
-//        m_display_order.emplace_back("Raids");
-        m_display_order.emplace_back("Wins");
-        m_display_order.emplace_back("Losses");
-        m_display_order.emplace_back("Skipped");
-        m_display_order.emplace_back("Errors", true);
-        m_display_order.emplace_back("Shinies", true);
-        m_display_order.emplace_back("Cloned");
-        m_display_order.emplace_back("Failed", true);
-    }
-    std::atomic<uint64_t>& m_skips;
-//    std::atomic<uint64_t>& m_raids;
-    std::atomic<uint64_t>& m_wins;
-    std::atomic<uint64_t>& m_losses;
-    std::atomic<uint64_t>& m_skipped;
-    std::atomic<uint64_t>& m_errors;
-    std::atomic<uint64_t>& m_shinies;
-    std::atomic<uint64_t>& m_cloned;
-    std::atomic<uint64_t>& m_failed;
-};
-std::unique_ptr<StatsTracker> RideCloner101_Descriptor::make_stats() const{
-    return std::unique_ptr<StatsTracker>(new Stats());
-}
-
-
-
-RideCloner101::RideCloner101()
-    : GO_HOME_WHEN_DONE(false)
-    , LANGUAGE(
-        "<b>Game Language:</b>",
-        PokemonNameReader::instance().languages(),
-        LockWhileRunning::UNLOCKED
-    )
-    , MODE(
-        "<b>Mode:</b>",
-        {
-            {Mode::CLONE_ONLY,  "clone-only",   "Clone only. Don't stop on a shiny raid."},
-            {Mode::SHINY_HUNT,  "shiny-hunt",   "Shiny Hunt: Save before each raid and catch. Stop if shiny."},
-        },
-        LockWhileRunning::LOCKED,
-        Mode::SHINY_HUNT
-    )
-    , RIDES_TO_CLONE(
-        "<b>Rides to Clone:</b><br>Stop program after cloning this many times. Make sure you have enough box space for twice this amount.",
-        LockWhileRunning::UNLOCKED,
-        100, 1, 100
-    )
-    , MAX_STARS(
-        "<b>Max Stars:</b><br>Skip raids with more than this many stars to save time since you're likely to lose.",
-        LockWhileRunning::UNLOCKED,
-        4, 1, 7
-    )
-    , BALL_SELECT(
-        "<b>Ball Select:</b>",
-        LockWhileRunning::UNLOCKED,
-        "poke-ball"
-    )
-    , FIX_TIME_ON_CATCH(
-        "<b>Fix Clock on Catch:</b><br>Fix the time when catching so the caught date will be correct.",
-        LockWhileRunning::UNLOCKED, false
-    )
-    , A_TO_B_DELAY(
-        "<b>A-to-B Delay:</b><br>The delay between the critical A-to-B press that activates the glitch.",
-        LockWhileRunning::UNLOCKED,
-        TICKS_PER_SECOND,
-        "8"
-    )
-    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
-    , NOTIFICATION_NONSHINY(
-        "Non-Shiny Encounter",
-        true, false,
-        {"Notifs"},
-        std::chrono::seconds(3600)
-    )
-    , NOTIFICATION_SHINY(
-        "Shiny Encounter",
-        true, true, ImageAttachmentMode::JPG,
-        {"Notifs", "Showcase"}
-    )
-    , NOTIFICATIONS({
-        &NOTIFICATION_STATUS_UPDATE,
-        &NOTIFICATION_NONSHINY,
-        &NOTIFICATION_SHINY,
-        &NOTIFICATION_PROGRAM_FINISH,
-        &NOTIFICATION_ERROR_RECOVERABLE,
-        &NOTIFICATION_ERROR_FATAL,
-    })
-{
-    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
-    PA_ADD_OPTION(LANGUAGE);
-    PA_ADD_OPTION(MODE);
-    PA_ADD_OPTION(RIDES_TO_CLONE);
-    PA_ADD_OPTION(MAX_STARS);
-    PA_ADD_OPTION(BALL_SELECT);
-    PA_ADD_OPTION(FIX_TIME_ON_CATCH);
-    PA_ADD_OPTION(A_TO_B_DELAY);
-    PA_ADD_OPTION(BATTLE_AI);
-    PA_ADD_OPTION(NOTIFICATIONS);
-}
-
-
-
-//  Start from the overworld with 5 (non-ride legendary) Pokemon in your
-//  party. Move your ride legendary into the 6th slot in your party.
-void RideCloner101::setup(const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context){
-    console.log("Running setup...");
-
-    bool in_party = false;
-    WallClock start = current_time();
-    while (true){
-        if (current_time() - start > std::chrono::minutes(5)){
-            dump_image_and_throw_recoverable_exception(info, console, "RideCloneSetupFailed", "Failed to setup after 5 minutes.");
-        }
-
-        OverworldWatcher overworld(COLOR_RED);
-        MainMenuWatcher main_menu(COLOR_YELLOW);
-        AdvanceDialogWatcher advance(COLOR_PURPLE);
-        PromptDialogWatcher prompt(COLOR_GREEN, {0.500, 0.545, 0.400, 0.100});
-
-        context.wait_for_all_requests();
-        int ret = wait_until(
-            console, context,
-            std::chrono::seconds(60),
-            {
-                overworld,
-                main_menu,
-                advance,
-                prompt,
-            }
-        );
-        context.wait_for(std::chrono::milliseconds(100));
-        VideoSnapshot snapshot = console.video().snapshot();
-
-        switch (ret){
-        case 0:
-            console.log("Detected overworld.");
-            if (in_party){
-                return;
-            }
-//            pbf_press_button(context, BUTTON_PLUS, 20, 230);
-            pbf_press_button(context, BUTTON_X, 20, 105);
-            continue;
-        case 1:
-            console.log("Detected main menu.");
-            if (advance.detect(snapshot)){
-                //  If we detect both the dialog and the main menu, it means we
-                //  are selecting who in the party to replace with the ride legendary.
-                main_menu.move_cursor(info, console, context, MenuSide::LEFT, 5, false);
-                pbf_press_button(context, BUTTON_A, 20, 105);
-                in_party = true;
-            }else{
-                //  Otherwise we try to move the ride legendary to the party.
-                if (main_menu.move_cursor(info, console, context, MenuSide::LEFT, 6, false)){
-                    //  Success, continue.
-                    pbf_press_button(context, BUTTON_A, 20, 105);
-                }else{
-                    //  Failed. It's already in our party.
-                    pbf_press_button(context, BUTTON_B, 20, 105);
-                    in_party = true;
-                }
-            }
-            continue;
-        case 2:
-            console.log("Detected dialog.");
-            if (main_menu.detect(snapshot)){
-                //  If we detect both the dialog and the main menu, it means we
-                //  are selecting who in the party to replace with the ride legendary.
-                main_menu.move_cursor(info, console, context, MenuSide::LEFT, 5, false);
-                pbf_press_button(context, BUTTON_A, 20, 105);
-                in_party = true;
-            }else{
-                pbf_press_button(context, BUTTON_A, 20, 105);
-            }
-            continue;
-        case 3:
-            console.log("Detected prompt.");
-            pbf_press_button(context, BUTTON_A, 20, 105);
-            continue;
-        default:
-            dump_image_and_throw_recoverable_exception(info, console, "RideCloneSetupFailed",
-                "setup(): No recognized state after 60 seconds.");
-        }
-    }
-}
-bool RideCloner101::run_post_win(
-    ProgramEnvironment& env,
-    ConsoleHandle& console,
-    BotBaseContext& context
-){
-    console.log("Running post-win...");
-
-    RideCloner101_Descriptor::Stats& stats = env.current_stats<RideCloner101_Descriptor::Stats>();
-
-    if (FIX_TIME_ON_CATCH){
-        pbf_press_button(context, BUTTON_HOME, 10, GameSettings::instance().GAME_TO_HOME_DELAY);
-        home_to_date_time(context, false, false);
-        pbf_press_button(context, BUTTON_A, 20, 105);
-        pbf_press_button(context, BUTTON_A, 20, 105);
-        pbf_press_button(context, BUTTON_HOME, 20, ConsoleSettings::instance().SETTINGS_TO_HOME_DELAY);
-        resume_game_from_home(console, context);
-    }
-
-    TeraResult result = TeraResult::NO_DETECTION;
-    VideoSnapshot screenshot;
-    bool add_to_party_menu = false;
-    bool success = false;
-    WallClock start = current_time();
-    while (true){
-        context.wait_for_all_requests();
-        if (current_time() - start > std::chrono::minutes(5)){
-            dump_image_and_throw_recoverable_exception(env.program_info(), console, "RideCloneReturnToOverworldFailed",
-                "Failed to return to overworld after 5 minutes.");
-        }
-
-        TeraCatchWatcher catch_menu(COLOR_BLUE);
-        WhiteButtonWatcher next_button(
-            COLOR_CYAN,
-            WhiteButton::ButtonA,
-            {0.8, 0.93, 0.2, 0.07},
-            WhiteButtonWatcher::FinderType::PRESENT,
-            std::chrono::seconds(1)
-        );
-        AdvanceDialogWatcher advance(COLOR_YELLOW);
-        PromptDialogWatcher add_to_party(COLOR_PURPLE, {0.500, 0.395, 0.400, 0.100});
-        PromptDialogWatcher nickname(COLOR_GREEN, {0.500, 0.545, 0.400, 0.100});
-        PokemonSummaryWatcher summary(COLOR_MAGENTA);
-        MainMenuWatcher main_menu(COLOR_BLUE);
-        OverworldWatcher overworld(COLOR_RED);
-        context.wait_for_all_requests();
-        int ret = wait_until(
-            console, context,
-            std::chrono::seconds(60),
-            {
-                catch_menu,
-                next_button,
-                advance,
-                add_to_party,
-                nickname,
-                summary,
-                main_menu,
-                overworld,
-            }
-        );
-        context.wait_for(std::chrono::milliseconds(100));
-        switch (ret){
-        case 0:{
-            console.log("Detected catch prompt.");
-            screenshot = console.video().snapshot();
-
-            pbf_press_button(context, BUTTON_A, 20, 150);
-            context.wait_for_all_requests();
-
-            BattleBallReader reader(console, LANGUAGE);
-            int quantity = move_to_ball(reader, console, context, BALL_SELECT.slug());
-            if (quantity == 0){
-                throw FatalProgramException(
-                    ErrorReport::NO_ERROR_REPORT, console,
-                    "Unable to find appropriate ball. Did you run out?",
-                    true
-                );
-            }
-            if (quantity < 0){
-                console.log("Unable to read ball quantity.", COLOR_RED);
-            }
-            pbf_mash_button(context, BUTTON_A, 125);
-
-            continue;
-        }
-        case 2:
-            console.log("Detected dialog.");
-            pbf_press_button(context, BUTTON_B, 20, 105);
-            continue;
-        case 3:
-            console.log("Detected add-to-party prompt.");
-            add_to_party_menu = true;
-            if (result == TeraResult::NO_DETECTION){
-                pbf_press_dpad(context, DPAD_DOWN, 20, 60);
-            }
-            pbf_press_button(context, BUTTON_A, 20, 105);
-            continue;
-        case 4:
-            console.log("Detected prompt.");
-            pbf_press_button(context, BUTTON_B, 20, 105);
-            if (add_to_party_menu){
-                success = true;
-            }
-            continue;
-        case 1:
-            //  Next button detector is unreliable. Check if the summary is
-            //  open. If so, fall-through to that.
-            if (!summary.detect(console.video().snapshot())){
-                console.log("Detected possible (A) Next button.");
-                pbf_press_button(context, BUTTON_A, 20, 105);
-                pbf_press_button(context, BUTTON_B, 20, 105);
-                continue;
-            }
-            console.log("Detected false positive (A) Next button.", COLOR_RED);
-        case 5:
-            console.log("Detected summary.");
-            if (result == TeraResult::NO_DETECTION){
-                context.wait_for(std::chrono::milliseconds(500));
-                result = run_tera_summary(
-                    env, console, context,
-                    NOTIFICATION_NONSHINY,
-                    NOTIFICATION_SHINY,
-                    MODE == Mode::SHINY_HUNT, screenshot,
-                    &stats.m_shinies
-                );
-            }
-            pbf_press_button(context, BUTTON_B, 20, 105);
-            continue;
-        case 6:
-            console.log("Detected party swap.");
-//            context.wait_for(std::chrono::milliseconds(150));
-            try{
-                if (main_menu.move_cursor(env.program_info(), console, context, MenuSide::LEFT, 5, false)){
-                    ssf_press_button(context, BUTTON_A, A_TO_B_DELAY, 20);
-                    pbf_press_button(context, BUTTON_B, 20, 230);
-                }
-            }catch (OperationFailedException& e){
-                e.send_notification(env, NOTIFICATION_ERROR_RECOVERABLE);
-            }
-            continue;
-        case 7:
-            console.log("Detected overworld.");
-            break;
-        default:
-            dump_image_and_throw_recoverable_exception(
-                env.program_info(), console, "FailedPostRaidWin",
-                "run_post_win(): No recognized state after 60 seconds."
-            );
-        }
-        break;
-    }
-
-
-
-
-    return success;
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-void RideCloner101::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    assert_16_9_720p_min(env.logger(), env.console);
-
-    RideCloner101_Descriptor::Stats& stats = env.current_stats<RideCloner101_Descriptor::Stats>();
-
-
-    bool first = true;
-    size_t move_counter = 0;
-    for (uint16_t items = 0; items < RIDES_TO_CLONE;){
-        env.update_stats();
-        send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
-
-        setup(env.program_info(), env.console, context);
-
-        //  Find raid.
-        while (true){
-            env.update_stats();
-            if (!first){
-                day_skip_from_overworld(env.console, context);
-                pbf_wait(context, GameSettings::instance().RAID_SPAWN_DELAY);
-                context.wait_for_all_requests();
-                stats.m_skips++;
-            }
-            first = false;
-
-            if (!open_raid(env.console, context)){
-                continue;
-            }
-            context.wait_for(std::chrono::milliseconds(500));
-
-            VideoSnapshot screen = env.console.video().snapshot();
-            TeraCardReader reader(COLOR_RED);
-            size_t stars = reader.stars(screen);
-            if (stars == 0){
-                dump_image(env.logger(), env.program_info(), "ReadStarsFailed", *screen.frame);
-            }else{
-                env.log("Detected " + std::to_string(stars) + " star raid.", COLOR_PURPLE);
-            }
-
-            if (stars > MAX_STARS){
-                env.log("Skipping raid...", COLOR_ORANGE);
-                stats.m_skipped++;
-                close_raid(env.program_info(), env.console, context);
-                continue;
-            }
-
-            //  Reopen the raid if we need to do stuff.
-            bool fix_position = move_counter % 5 == 1;
-            Mode mode = MODE;
-            if (fix_position || mode == Mode::SHINY_HUNT){
-                close_raid(env.program_info(), env.console, context);
-
-                //  Save game because we're shiny-hunting.
-                if (mode == Mode::SHINY_HUNT){
-                    save_game_from_overworld(env.program_info(), env.console, context);
-                }
-
-                //  Fix our position.
-                if (fix_position){
-                    pbf_move_left_joystick(context, 128, 255, 150, 0);
-                    pbf_move_left_joystick(context, 128, 0, 200, 0);
-                }
-
-                context.wait_for_all_requests();
-                if (open_raid(env.console, context)){
-                    env.log("Tera raid found!", COLOR_BLUE);
-                }else{
-                    env.log("No Tera raid found.", COLOR_ORANGE);
-                    continue;
-                }
-            }
-
-            pbf_press_dpad(context, DPAD_DOWN, 10, 10);
-            pbf_mash_button(context, BUTTON_A, 250);
-
-            bool win = run_tera_battle(env, env.console, context, BATTLE_AI);
-
-            if (win){
-                stats.m_wins++;
-            }else{
-                stats.m_losses++;
-                context.wait_for(std::chrono::seconds(3));
-                continue;
-            }
-
-            break;
-        }
-
-        if (run_post_win(env, env.console, context)){
-            items++;
-            stats.m_cloned++;
-            pbf_press_button(context, BUTTON_PLUS, 20, 230);
-        }else{
-            stats.m_failed++;
-        }
-
-        move_counter++;
-    }
-
-
-    env.update_stats();
-    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
-    GO_HOME_WHEN_DONE.run_end_of_program(context);
-}
-
-
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSV/Programs/Glitches/PokemonSV_RideCloner-1.0.1.h b/SerialPrograms/Source/PokemonSV/Programs/Glitches/PokemonSV_RideCloner-1.0.1.h
deleted file mode 100644
index 471fac9a3b..0000000000
--- a/SerialPrograms/Source/PokemonSV/Programs/Glitches/PokemonSV_RideCloner-1.0.1.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*  Ride Cloner
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSV_RideCloner_H
-#define PokemonAutomation_PokemonSV_RideCloner_H
-
-#include "Common/Cpp/Options/SimpleIntegerOption.h"
-#include "Common/Cpp/Options/TimeExpressionOption.h"
-#include "CommonFramework/Notifications/EventNotificationsTable.h"
-#include "CommonFramework/Options/LanguageOCROption.h"
-#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-#include "PokemonSwSh/Options/PokemonSwSh_BallSelectOption.h"
-#include "PokemonSV/Options/PokemonSV_TeraAIOption.h"
-
-namespace PokemonAutomation{
-    struct ProgramInfo;
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-
-
-class RideCloner101_Descriptor : public SingleSwitchProgramDescriptor{
-public:
-    RideCloner101_Descriptor();
-
-    struct Stats;
-    virtual std::unique_ptr<StatsTracker> make_stats() const override;
-
-};
-
-
-
-
-class RideCloner101 : public SingleSwitchProgramInstance{
-public:
-    RideCloner101();
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-    void setup(const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context);
-    bool run_post_win(
-        ProgramEnvironment& env,
-        ConsoleHandle& console,
-        BotBaseContext& context
-    );
-
-private:
-    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
-
-    OCR::LanguageOCROption LANGUAGE;
-
-    enum class Mode{
-        CLONE_ONLY,
-        SHINY_HUNT,
-    };
-    EnumDropdownOption<Mode> MODE;
-
-    SimpleIntegerOption<uint16_t> RIDES_TO_CLONE;
-
-    SimpleIntegerOption<uint8_t> MAX_STARS;
-
-    PokemonSwSh::PokemonBallSelectOption BALL_SELECT;
-    BooleanCheckBoxOption FIX_TIME_ON_CATCH;
-
-    TimeExpressionOption<uint16_t> A_TO_B_DELAY;
-    TeraAIOption BATTLE_AI;
-
-    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
-    EventNotificationOption NOTIFICATION_NONSHINY;
-    EventNotificationOption NOTIFICATION_SHINY;
-    EventNotificationsOption NOTIFICATIONS;
-};
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSV/Programs/PokemonSV_AreaZero.cpp b/SerialPrograms/Source/PokemonSV/Programs/PokemonSV_AreaZero.cpp
deleted file mode 100644
index 0548f8bbcf..0000000000
--- a/SerialPrograms/Source/PokemonSV/Programs/PokemonSV_AreaZero.cpp
+++ /dev/null
@@ -1,323 +0,0 @@
-/*  Area Zero
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/Exceptions/OperationFailedException.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
-#include "CommonFramework/Inference/BlackScreenDetector.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_ScalarButtons.h"
-#include "PokemonSV/Inference/PokemonSV_ZeroGateWarpPromptDetector.h"
-#include "PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h"
-#include "PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h"
-#include "PokemonSV_Navigation.h"
-#include "PokemonSV_AreaZero.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-
-
-void inside_zero_gate_to_station(
-    const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context,
-    int station,    //  1 - 4
-    bool heal_at_station
-){
-    {
-        AdvanceDialogWatcher dialog(COLOR_GREEN);
-        int ret = run_until(
-            console, context,
-            [](BotBaseContext& context){
-                pbf_move_left_joystick(context, 128, 0, 10 * TICKS_PER_SECOND, 0);
-            },
-            {dialog}
-        );
-        if (ret < 0){
-            throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, console,
-                "Unable to find warp circle.",
-                true
-            );
-        }
-    }
-
-
-
-    WallClock start = current_time();
-    while (true){
-        if (current_time() - start > std::chrono::seconds(60)){
-            throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, console,
-                "Unable to warp to station after 60 seconds.",
-                true
-            );
-        }
-
-        AdvanceDialogWatcher dialog(COLOR_GREEN);
-        ZeroGateWarpPromptWatcher prompt(COLOR_GREEN);
-        BlackScreenOverWatcher black_screen(COLOR_RED);
-        context.wait_for_all_requests();
-        int ret = wait_until(
-            console, context, std::chrono::seconds(5),
-            {dialog, prompt, black_screen}
-        );
-        context.wait_for(std::chrono::milliseconds(100));
-
-        switch (ret){
-        case 0:
-            console.log("Detected dialog.");
-            pbf_press_button(context, BUTTON_A, 20, 30);
-            continue;
-        case 1:
-            console.log("Detected prompt.");
-            prompt.move_cursor(info, console, context, station - 1);
-            pbf_mash_button(context, BUTTON_A, 3 * TICKS_PER_SECOND);
-            continue;
-        case 2:
-            console.log("Black screen is over. Arrive at station.");
-            break;
-        default:
-            throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, console,
-                "Unable to find warp to station 2.",
-                true
-            );
-        }
-
-        break;
-    }
-    context.wait_for_all_requests();
-    context.wait_for(std::chrono::seconds(3));
-
-    if (heal_at_station){
-        console.log("Moving to bed to heal.");
-        pbf_move_left_joystick(context, 144, 0, 4 * TICKS_PER_SECOND, 0);
-        ssf_press_left_joystick(context, 255, 128, 0, 125);
-        bool healed = false;
-        while (true){
-            AdvanceDialogWatcher dialog(COLOR_GREEN);
-            PromptDialogWatcher confirm(COLOR_GREEN);
-            BlackScreenOverWatcher black_screen(COLOR_RED);
-            OverworldWatcher overworld(COLOR_BLUE);
-            context.wait_for_all_requests();
-            int ret = wait_until(
-                console, context, std::chrono::seconds(30),
-                {dialog, confirm, black_screen, overworld}
-            );
-            context.wait_for(std::chrono::milliseconds(100));
-            switch (ret){
-            case 0:
-                console.log("Detected dialog.");
-                pbf_press_button(context, BUTTON_B, 20, 105);
-                continue;
-            case 1:
-                console.log("Detected rest prompt.");
-                pbf_press_button(context, BUTTON_A, 20, 105);
-                continue;
-            case 2:
-                console.log("Done healing!");
-                healed = true;
-                continue;
-            case 3:
-                console.log("Detected overworld.");
-                if (healed){
-                    break;
-                }else{
-                    pbf_press_button(context, BUTTON_A, 20, 105);
-                    continue;
-                }
-            default:
-                throw OperationFailedException(
-                    ErrorReport::SEND_ERROR_REPORT, console,
-                    "Heal at station: No state detected after 30 seconds.",
-                    true
-                );
-            }
-            break;
-        }
-    }
-
-    console.log("Exiting station. Waiting for black screen...");
-    {
-        BlackScreenOverWatcher black_screen(COLOR_RED);
-        int ret = run_until(
-            console, context,
-            [=](BotBaseContext& context){
-                if (heal_at_station){
-                    pbf_move_left_joystick(context, 96, 255, 60 * TICKS_PER_SECOND, 0);
-                }else{
-                    pbf_move_left_joystick(context, 0, 255, 60 * TICKS_PER_SECOND, 0);
-                }
-            },
-            {black_screen}
-        );
-        if (ret < 0){
-            throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, console,
-                "Unable to exit station after 60 seconds.",
-                true
-            );
-        }
-    }
-
-    console.log("Exiting station. Waiting for overworld...");
-    {
-        OverworldWatcher overworld(COLOR_BLUE);
-        int ret = wait_until(
-            console, context, std::chrono::seconds(30),
-            {overworld}
-        );
-        if (ret < 0){
-            throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, console,
-                "Unable to load overworld after exiting station for 30 seconds.",
-                true
-            );
-        }
-    }
-}
-
-void return_to_outside_zero_gate(const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context){
-    open_map_from_overworld(info, console, context);
-    pbf_move_left_joystick(context, 0, 0, 5, 50);
-    fly_to_overworld_from_map(info, console, context);
-}
-void return_to_inside_zero_gate(const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context){
-    return_to_outside_zero_gate(info, console, context);
-
-    BlackScreenOverWatcher black_screen;
-    int ret = run_until(
-        console, context,
-        [](BotBaseContext& context){
-            pbf_move_left_joystick(context, 255, 32, 20, 105);
-            pbf_mash_button(context, BUTTON_L, 60);
-            pbf_move_left_joystick(context, 128, 0, 10 * TICKS_PER_SECOND, 0);
-        },
-        {black_screen}
-    );
-    if (ret < 0){
-        throw OperationFailedException(
-            ErrorReport::SEND_ERROR_REPORT, console,
-            "Unable to enter Zero Gate.",
-            true
-        );
-    }
-
-    OverworldWatcher overworld;
-    ret = wait_until(
-        console, context, std::chrono::seconds(10),
-        {overworld}
-    );
-    if (ret < 0){
-        throw OperationFailedException(
-            ErrorReport::SEND_ERROR_REPORT, console,
-            "Unable to detect overworld inside Zero Gate.",
-            true
-        );
-    }
-}
-void return_to_inside_zero_gate_from_picnic(const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context){
-    BlackScreenOverWatcher black_screen;
-    int ret = run_until(
-        console, context,
-        [](BotBaseContext& context){
-            pbf_move_left_joystick(context, 128, 255, 100, 40);
-            pbf_mash_button(context, BUTTON_L, 60);
-            pbf_move_left_joystick(context, 128, 0, 10 * TICKS_PER_SECOND, 0);
-        },
-        {black_screen}
-    );
-    if (ret < 0){
-        throw OperationFailedException(
-            ErrorReport::SEND_ERROR_REPORT, console,
-            "Unable to enter Zero Gate.",
-            true
-        );
-    }
-
-    OverworldWatcher overworld;
-    ret = wait_until(
-        console, context, std::chrono::seconds(10),
-        {overworld}
-    );
-    if (ret < 0){
-        throw OperationFailedException(
-            ErrorReport::SEND_ERROR_REPORT, console,
-            "Unable to detect overworld inside Zero Gate.",
-            true
-        );
-    }
-}
-
-
-
-
-void inside_zero_gate_to_secret_cave_entrance(
-    const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context,
-    bool heal_at_station
-){
-    inside_zero_gate_to_station(info, console, context, 1, heal_at_station);
-
-    context.wait_for(std::chrono::seconds(3));
-
-    pbf_move_left_joystick(context, 0, 208, 30, 50);
-    pbf_press_button(context, BUTTON_L | BUTTON_PLUS, 20, 105);
-
-
-    //  Leg 1
-    ssf_press_button(context, BUTTON_LCLICK, 0, 500);
-    ssf_press_left_joystick(context, 128, 0, 60, 1250);
-
-    //  Jump
-    ssf_press_button(context, BUTTON_B, 125, 100);
-
-    //  Fly
-    ssf_press_button(context, BUTTON_B, 0, 20, 10); //  Double up this press in
-    ssf_press_button(context, BUTTON_B, 0, 20);     //  case one is dropped.
-
-    pbf_move_left_joystick(context, 128, 0, 1125, 300);
-
-
-    //  Leg 2
-    ssf_press_button(context, BUTTON_LCLICK, 0, 500);
-    ssf_press_left_joystick(context, 128, 0, 60, 250);
-
-    //  Jump
-    ssf_press_button(context, BUTTON_B, 125, 100);
-
-    //  Fly
-    ssf_press_button(context, BUTTON_B, 0, 20, 10); //  Double up this press in
-    ssf_press_button(context, BUTTON_B, 0, 20);     //  case one is dropped.
-
-    pbf_move_left_joystick(context, 128, 0, 250, 0);
-    pbf_move_left_joystick(context, 112, 0, 250, 0);
-    pbf_move_left_joystick(context, 128, 0, 752, 0);
-    pbf_move_left_joystick(context, 96, 0, 300, 0);
-    pbf_move_left_joystick(context, 128, 0, 630, 250);
-
-//    context.wait_for_all_requests();
-
-
-    //  Leg 3
-    ssf_press_button(context, BUTTON_LCLICK, 0, 500);
-    ssf_press_left_joystick(context, 128, 0, 180, 550);
-
-    //  Fly
-    ssf_press_button(context, BUTTON_B, 0, 20, 10); //  Double up this press in
-    ssf_press_button(context, BUTTON_B, 0, 20);     //  case one is dropped.
-
-    pbf_move_left_joystick(context, 48, 0, 200, 0);
-    pbf_move_left_joystick(context, 128, 0, 250, 0);
-
-
-}
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSV/Programs/PokemonSV_AreaZero.h b/SerialPrograms/Source/PokemonSV/Programs/PokemonSV_AreaZero.h
deleted file mode 100644
index fbfe3b64d8..0000000000
--- a/SerialPrograms/Source/PokemonSV/Programs/PokemonSV_AreaZero.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*  Area Zero
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSV_AreaZero_H
-#define PokemonAutomation_PokemonSV_AreaZero_H
-
-
-namespace PokemonAutomation{
-    struct ProgramInfo;
-    class ConsoleHandle;
-    class BotBaseContext;
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-
-
-//  After just entering the Zero Gate, go to the specified station.
-void inside_zero_gate_to_station(
-    const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context,
-    int station,    //  1 - 4
-    bool heal_at_station
-);
-
-//  You are inside Area Zero having traveled there via the Zero Gate. Return to
-//  the zero gate fly spot.
-void return_to_outside_zero_gate(const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context);
-
-//  You are inside Area Zero having traveled there via the Zero Gate. Return to
-//  inside the zero gate to setup for a subsequent call to "inside_zero_gate_to_station()".
-void return_to_inside_zero_gate(const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context);
-void return_to_inside_zero_gate_from_picnic(const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context);
-
-
-
-void inside_zero_gate_to_secret_cave_entrance(
-    const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context,
-    bool heal_at_station
-);
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSV/Programs/PokemonSV_BasicCatcher.cpp b/SerialPrograms/Source/PokemonSV/Programs/PokemonSV_BasicCatcher.cpp
deleted file mode 100644
index acbfffeb70..0000000000
--- a/SerialPrograms/Source/PokemonSV/Programs/PokemonSV_BasicCatcher.cpp
+++ /dev/null
@@ -1,247 +0,0 @@
-/*  Basic Catcher
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/Exceptions/OperationFailedException.h"
-#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h"
-#include "PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h"
-#include "PokemonSV/Inference/Battles/PokemonSV_NormalBattleMenus.h"
-#include "PokemonSV_BasicCatcher.h"
-
-//#include <iostream>
-//using std::cout;
-//using std::endl;
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-
-//  Most of this is copy-pasted from Sword/Shield.
-
-
-//  Returns the # of slots scrolled. Returns -1 if not found.
-int move_to_ball(
-    const BattleBallReader& reader,
-    ConsoleHandle& console, BotBaseContext& context,
-    const std::string& ball_slug,
-    bool forward, int attempts, uint16_t delay
-){
-    VideoSnapshot frame = console.video().snapshot();
-    std::string first_ball = reader.read_ball(frame);
-    if (first_ball == ball_slug){
-        return 0;
-    }
-
-    size_t repeat_counter = 0;
-    for (int c = 1; c < attempts; c++){
-        pbf_press_dpad(context, forward ? DPAD_RIGHT : DPAD_LEFT, 10, delay);
-        context.wait_for_all_requests();
-        frame = console.video().snapshot();
-        std::string current_ball = reader.read_ball(frame);
-        if (current_ball == ball_slug){
-            return c;
-        }
-        if (current_ball == first_ball){
-            repeat_counter++;
-            if (repeat_counter == 3){
-                return -1;
-            }
-        }
-    }
-    return -1;
-}
-
-//  Returns the quantity of the ball.
-//  Returns -1 if unable to read.
-int16_t move_to_ball(
-    const BattleBallReader& reader, ConsoleHandle& console, BotBaseContext& context,
-    const std::string& ball_slug
-){
-    //  Search forward at high speed.
-    int ret = move_to_ball(reader, console, context, ball_slug, true, 100, 40);
-    if (ret < 0){
-        return 0;
-    }
-    if (ret == 0){
-        uint16_t quantity = reader.read_quantity(console.video().snapshot());
-        return quantity == 0 ? -1 : quantity;
-    }
-
-    //  Wait a second to let the video catch up.
-    pbf_wait(context, TICKS_PER_SECOND);
-    context.wait_for_all_requests();
-
-    //  Now try again in reverse at a lower speed in case we overshot.
-    //  This will return immediately if we got it right the first time.
-    ret = move_to_ball(reader, console, context, ball_slug, false, 5, TICKS_PER_SECOND);
-    if (ret < 0){
-        return 0;
-    }
-    if (ret > 0){
-        console.log("Fast ball scrolling overshot by " + std::to_string(ret) + " slot(s).", COLOR_RED);
-    }
-    uint16_t quantity = reader.read_quantity(console.video().snapshot());
-    return quantity == 0 ? -1 : quantity;
-}
-
-
-
-
-
-
-
-
-
-
-CatchResults basic_catcher(
-    ConsoleHandle& console, BotBaseContext& context,
-    Language language,
-    const std::string& ball_slug,
-    bool use_first_move_if_cant_throw
-){
-    uint16_t balls_used = 0;
-
-    bool caught = false;
-    bool overworld_seen = false;
-    bool last_move_attack = false;
-    int last_state = -1;
-    WallClock last_battle_menu = WallClock::min();
-    while (true){
-        NormalBattleMenuWatcher battle_menu(COLOR_RED);
-        OverworldWatcher overworld(COLOR_YELLOW);
-        GradientArrowWatcher next_pokemon(COLOR_GREEN, GradientArrowType::RIGHT, {0.50, 0.51, 0.30, 0.10});
-        GradientArrowWatcher add_to_party(COLOR_BLUE, GradientArrowType::RIGHT, {0.50, 0.39, 0.30, 0.10});
-        AdvanceDialogWatcher dialog(COLOR_PURPLE);
-        context.wait_for_all_requests();
-        int ret = wait_until(
-            console, context, std::chrono::seconds(120),
-            {
-                battle_menu,
-                overworld,
-                next_pokemon,
-                add_to_party,
-                dialog,
-            }
-        );
-        switch (ret){
-        case 0:{
-            console.log("Detected Battle Menu...");
-            if (caught){
-                console.log("Detected battle menu after catch. Did you get chain attacked?", COLOR_RED);
-                return CatchResults{CatchResult::POKEMON_CAUGHT, balls_used};
-            }
-            if (overworld_seen){
-                console.log("Detected battle after overworld. Did you get chain attacked?", COLOR_RED);
-                return CatchResults{CatchResult::POKEMON_FAINTED, balls_used};
-            }
-
-            WallClock now = current_time();
-            WallClock previous = last_battle_menu;
-            last_battle_menu = now;
-//            cout << "last_state = " << last_state << endl;
-//            cout << "last_move_attack = " << last_move_attack << endl;
-//            cout << "last_move_attack = " << std::chrono::duration_cast<std::chrono::milliseconds>(now - previous).count() << endl;
-            if (last_state == 0 && !last_move_attack && now < previous + std::chrono::seconds(8)){
-                if (!use_first_move_if_cant_throw){
-                    console.log("BasicCatcher: Unable to throw ball.", COLOR_RED);
-                    return {CatchResult::CANNOT_THROW_BALL, balls_used};
-                }
-
-                console.log("BasicCatcher: Unable to throw ball. Attempting to use first move instead...", COLOR_RED);
-                battle_menu.move_to_slot(console, context, 0);
-                pbf_mash_button(context, BUTTON_A, 3 * TICKS_PER_SECOND);
-                pbf_mash_button(context, BUTTON_B, 3 * TICKS_PER_SECOND);
-                last_move_attack = true;
-                break;
-            }
-
-            last_move_attack = false;
-            pbf_press_button(context, BUTTON_X, 20, 105);
-            context.wait_for_all_requests();
-            BattleBallReader reader(console, language, COLOR_RED);
-            int16_t qty = move_to_ball(reader, console, context, ball_slug);
-            if (qty <= 0){
-                return CatchResults{CatchResult::OUT_OF_BALLS, balls_used};
-            }
-            pbf_mash_button(context, BUTTON_A, 30);
-            pbf_mash_button(context, BUTTON_B, 500);
-            balls_used++;
-            break;
-        }
-        case 1:
-            if (!overworld_seen && !caught){
-                console.log("Detected Overworld... Waiting 5 seconds to confirm.");
-                context.wait_for(std::chrono::seconds(5));
-                overworld_seen = true;
-                break;
-            }
-            console.log("Detected Overworld...");
-            if (caught){
-                return CatchResults{CatchResult::POKEMON_CAUGHT, balls_used};
-            }else{
-                return CatchResults{CatchResult::POKEMON_FAINTED, balls_used};
-            }
-        case 2:
-            console.log("Detected own " + STRING_POKEMON + " fainted...");
-            return CatchResults{CatchResult::OWN_FAINTED, balls_used};
-        case 3:
-            console.log("Detected add to party...");
-            caught = true;
-            pbf_press_button(context, BUTTON_B, 20, 230);
-            break;
-        case 4:
-            console.log("Detected dialog...");
-            caught = true;
-            pbf_press_button(context, BUTTON_B, 20, 230);
-            break;
-        default:
-            throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, console,
-                "basic_catcher(): No state detected after 2 minutes."
-            );
-        }
-
-        last_state = ret;
-    }
-
-
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSV/Programs/PokemonSV_BasicCatcher.h b/SerialPrograms/Source/PokemonSV/Programs/PokemonSV_BasicCatcher.h
deleted file mode 100644
index 16e6a01998..0000000000
--- a/SerialPrograms/Source/PokemonSV/Programs/PokemonSV_BasicCatcher.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*  Basic Catcher
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSV_BasicCatcher_H
-#define PokemonAutomation_PokemonSV_BasicCatcher_H
-
-#include "ClientSource/Connection/BotBase.h"
-#include "Pokemon/Pokemon_Notification.h"
-#include "PokemonSV/Inference/Battles/PokemonSV_BattleBallReader.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-using namespace Pokemon;
-
-
-//  Returns the quantity of the ball.
-//  Returns -1 if unable to read.
-int16_t move_to_ball(
-    const BattleBallReader& reader, ConsoleHandle& console, BotBaseContext& context,
-    const std::string& ball_slug
-);
-
-
-
-struct CatchResults{
-    CatchResult result;
-    uint16_t balls_used;
-};
-CatchResults basic_catcher(
-    ConsoleHandle& console, BotBaseContext& context,
-    Language language,
-    const std::string& ball_slug,
-    bool use_first_move_if_cant_throw
-);
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSV/Programs/PokemonSV_Battles.cpp b/SerialPrograms/Source/PokemonSV/Programs/PokemonSV_Battles.cpp
deleted file mode 100644
index 90c5871a84..0000000000
--- a/SerialPrograms/Source/PokemonSV/Programs/PokemonSV_Battles.cpp
+++ /dev/null
@@ -1,144 +0,0 @@
-/*  Battles
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/Exceptions/OperationFailedException.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonSV/Inference/PokemonSV_MainMenuDetector.h"
-#include "PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h"
-#include "PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h"
-#include "PokemonSV/Inference/Battles/PokemonSV_NormalBattleMenus.h"
-#include "PokemonSV_Battles.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-using namespace Pokemon;
-
-
-void auto_heal_from_menu_or_overworld(
-    const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context,
-    uint8_t party_slot,
-    bool return_to_overworld
-){
-    console.log("Auto-healing...");
-    WallClock start = current_time();
-    bool healed = false;
-    while (true){
-        if (current_time() - start > std::chrono::minutes(5)){
-            throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, console,
-                "auto_heal_from_menu(): Failed auto-heal after 5 minutes.",
-                true
-            );
-        }
-
-        OverworldWatcher overworld(COLOR_RED);
-        MainMenuWatcher main_menu(COLOR_CYAN);
-        AdvanceDialogWatcher dialog(COLOR_YELLOW);
-        context.wait_for_all_requests();
-        int ret = wait_until(
-            console, context, std::chrono::seconds(60),
-            {overworld, main_menu, dialog}
-        );
-        switch (ret){
-        case 0:
-            console.log("Detected overworld.");
-            if (healed && return_to_overworld){
-                return;
-            }
-            pbf_press_button(context, BUTTON_X, 20, 230);
-            continue;
-        case 1:
-            console.log("Detected main menu.");
-            if (!healed){
-                main_menu.move_cursor(info, console, context, MenuSide::LEFT, party_slot, false);
-                pbf_press_button(context, BUTTON_MINUS, 20, 230);
-                healed = true;
-                continue;
-            }
-            if (!return_to_overworld){
-                return;
-            }
-            pbf_press_button(context, BUTTON_B, 20, 105);
-            continue;
-        case 2:
-            console.log("Detected dialog.");
-            healed = true;
-            pbf_press_button(context, BUTTON_B, 20, 105);
-            continue;
-        default:
-            throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, console,
-                "auto_heal_from_menu(): No state detected after 60 seconds.",
-                true
-            );
-        }
-    }
-}
-
-
-
-
-int run_from_battle(const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context){
-    console.log("Attempting to run away...");
-
-    int attempts = 0;
-    for (size_t c = 0; c < 10; c++){
-        OverworldWatcher overworld(COLOR_RED);
-        NormalBattleMenuWatcher battle_menu(COLOR_YELLOW);
-        GradientArrowWatcher next_pokemon(COLOR_GREEN, GradientArrowType::RIGHT, {0.50, 0.51, 0.30, 0.10});
-        context.wait_for_all_requests();
-        int ret = wait_until(
-            console, context, std::chrono::seconds(60),
-            {
-                overworld,
-                battle_menu,
-                next_pokemon,
-            }
-        );
-
-        switch (ret){
-        case 0:
-            console.log("Detected overworld...");
-            return attempts;
-        case 1:
-            console.log("Detected battle menu...");
-            battle_menu.move_to_slot(console, context, 3);
-//            pbf_press_dpad(context, DPAD_DOWN, 250, 0);
-            pbf_press_button(context, BUTTON_A, 20, 105);
-            pbf_press_button(context, BUTTON_B, 20, 1 * TICKS_PER_SECOND);
-            attempts++;
-            continue;
-        case 2:
-            console.log("Detected own " + STRING_POKEMON + " fainted...");
-            throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, console,
-                "Your " + STRING_POKEMON + " fainted while attempting to run away.",
-                true
-            );
-        default:
-            throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, console,
-                "run_from_battle(): No state detected after 60 seconds.",
-                true
-            );
-        }
-    }
-
-    throw OperationFailedException(
-        ErrorReport::SEND_ERROR_REPORT, console,
-        "Failed to run away after 10 attempts.",
-        true
-    );
-}
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSV/Programs/PokemonSV_Battles.h b/SerialPrograms/Source/PokemonSV/Programs/PokemonSV_Battles.h
deleted file mode 100644
index 685b31720c..0000000000
--- a/SerialPrograms/Source/PokemonSV/Programs/PokemonSV_Battles.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*  Battles
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSV_Battles_H
-#define PokemonAutomation_PokemonSV_Battles_H
-
-#include <stdint.h>
-
-namespace PokemonAutomation{
-    struct ProgramInfo;
-    class ConsoleHandle;
-    class BotBaseContext;
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-
-
-
-void auto_heal_from_menu_or_overworld(
-    const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context,
-    uint8_t party_slot, //  0 - 5
-    bool return_to_overworld
-);
-
-
-
-//  Returns the # of attempts it took to run.
-int run_from_battle(const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context);
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSV/Programs/PokemonSV_ConnectToInternet.cpp b/SerialPrograms/Source/PokemonSV/Programs/PokemonSV_ConnectToInternet.cpp
deleted file mode 100644
index 8c885b9a37..0000000000
--- a/SerialPrograms/Source/PokemonSV/Programs/PokemonSV_ConnectToInternet.cpp
+++ /dev/null
@@ -1,204 +0,0 @@
-/*  Connect to Integer
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/Exceptions/OperationFailedException.h"
-#include "CommonFramework/ImageTools/SolidColorTest.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
-#include "CommonFramework/Tools/ErrorDumper.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h"
-#include "PokemonSV/Inference/PokemonSV_MainMenuDetector.h"
-#include "PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h"
-#include "PokemonSV_ConnectToInternet.h"
-
-//#include <iostream>
-//using std::cout;
-//using std::endl;
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-
-
-class NewsDetector : public StaticScreenDetector{
-public:
-    NewsDetector(Color color = COLOR_RED);
-
-    virtual void make_overlays(VideoOverlaySet& items) const override;
-    virtual bool detect(const ImageViewRGB32& screen) const override;
-
-private:
-    Color m_color;
-    ImageFloatBox m_bottom_white;
-    ImageFloatBox m_bottom_buttons;
-};
-NewsDetector::NewsDetector(Color color)
-    : m_color(color)
-    , m_bottom_white(0.15, 0.92, 0.20, 0.06)
-    , m_bottom_buttons(0.40, 0.92, 0.58, 0.06)
-{}
-void NewsDetector::make_overlays(VideoOverlaySet& items) const{
-    items.add(m_color, m_bottom_white);
-    items.add(m_color, m_bottom_buttons);
-}
-bool NewsDetector::detect(const ImageViewRGB32& screen) const{
-    ImageStats bottom_white = image_stats(extract_box_reference(screen, m_bottom_white));
-    if (!is_white(bottom_white)){
-        return false;
-    }
-
-    ImageStats bottom_buttons = image_stats(extract_box_reference(screen, m_bottom_buttons));
-//    cout << bottom_buttons.average << bottom_buttons.stddev << endl;
-    if (bottom_buttons.stddev.sum() < 100){
-        return false;
-    }
-
-    return true;
-}
-class NewsWatcher : public DetectorToFinder<NewsDetector>{
-public:
-    NewsWatcher(Color color = COLOR_RED)
-         : DetectorToFinder("NewsWatcher", std::chrono::milliseconds(1000), color)
-    {}
-};
-
-
-
-
-void connect_to_internet_from_menu(const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context){
-    WallClock start = current_time();
-    bool connected = false;
-    while (true){
-        if (current_time() - start > std::chrono::minutes(5)){
-            throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, console,
-                "connect_to_internet_from_menu(): Failed to connect to internet after 5 minutes.",
-                true
-            );
-        }
-
-        OverworldWatcher overworld(COLOR_RED);
-        MainMenuWatcher main_menu(COLOR_YELLOW);
-        AdvanceDialogWatcher dialog(COLOR_GREEN);
-        PromptDialogWatcher prompt(COLOR_CYAN);
-        NewsWatcher news(COLOR_BLUE);
-        context.wait_for_all_requests();
-        int ret = wait_until(
-            console, context,
-            std::chrono::seconds(60),
-            {overworld, main_menu, dialog, prompt, news}
-        );
-        context.wait_for(std::chrono::milliseconds(100));
-        switch (ret){
-        case 0:
-            console.log("Detected overworld. (unexpected)", COLOR_RED);
-            pbf_press_button(context, BUTTON_X, 20, 105);
-            continue;
-        case 1:
-            console.log("Detected main menu.");
-            if (connected){
-                return;
-            }else{
-                pbf_press_button(context, BUTTON_L, 20, 105);
-            }
-            continue;
-        case 2:
-            console.log("Detected dialog.");
-            connected = true;
-            pbf_press_button(context, BUTTON_B, 20, 105);
-            continue;
-        case 3:
-            console.log("Already connected to internet.");
-            connected = true;
-            pbf_press_button(context, BUTTON_B, 20, 105);
-            continue;
-        case 4:
-            console.log("Detected news menu...");
-            connected = true;
-            pbf_press_button(context, BUTTON_B, 20, 105);
-            continue;
-        default:
-            throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, console,
-                "connect_to_internet_from_menu(): No recognized state after 60 seconds.",
-                true
-            );
-        }
-    }
-}
-void connect_to_internet_from_overworld(const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context){
-    WallClock start = current_time();
-    bool connected = false;
-    while (true){
-        if (current_time() - start > std::chrono::minutes(5)){
-            throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, console,
-                "connect_to_internet_from_overworld(): Failed to connect to internet after 5 minutes.",
-                true
-            );
-        }
-
-        OverworldWatcher overworld(COLOR_RED);
-        MainMenuWatcher main_menu(COLOR_YELLOW);
-        AdvanceDialogWatcher dialog(COLOR_GREEN);
-        PromptDialogWatcher prompt(COLOR_CYAN);
-        NewsWatcher news(COLOR_BLUE);
-        context.wait_for_all_requests();
-        int ret = wait_until(
-            console, context,
-            std::chrono::seconds(60),
-            {overworld, main_menu, dialog, prompt, news}
-        );
-        context.wait_for(std::chrono::milliseconds(100));
-        switch (ret){
-        case 0:
-            console.log("Detected overworld.");
-            if (connected){
-                return;
-            }else{
-                pbf_press_button(context, BUTTON_X, 20, 105);
-                continue;
-            }
-        case 1:
-            console.log("Detected main menu.");
-            if (connected){
-                pbf_press_button(context, BUTTON_B, 20, 105);
-            }else{
-                pbf_press_button(context, BUTTON_L, 20, 105);
-            }
-            continue;
-        case 2:
-            console.log("Detected dialog.");
-            connected = true;
-            pbf_press_button(context, BUTTON_B, 20, 105);
-            continue;
-        case 3:
-            console.log("Already connected to internet.");
-            connected = true;
-            pbf_press_button(context, BUTTON_B, 20, 105);
-            continue;
-        case 4:
-            console.log("Detected news menu...");
-            connected = true;
-            pbf_press_button(context, BUTTON_B, 20, 105);
-            continue;
-        default:
-            throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, console,
-                "connect_to_internet_from_overworld(): No recognized state after 60 seconds.",
-                true
-            );
-        }
-    }
-}
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSV/Programs/PokemonSV_ConnectToInternet.h b/SerialPrograms/Source/PokemonSV/Programs/PokemonSV_ConnectToInternet.h
deleted file mode 100644
index d8a53d8110..0000000000
--- a/SerialPrograms/Source/PokemonSV/Programs/PokemonSV_ConnectToInternet.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*  Connect to Integer
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSV_ConnectToInternet_H
-#define PokemonAutomation_PokemonSV_ConnectToInternet_H
-
-namespace PokemonAutomation{
-    class BotBaseContext;
-    class ConsoleHandle;
-    struct ProgramInfo;
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-
-//  Connect to internet from the main menu. Stay in the main menu.
-void connect_to_internet_from_menu(const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context);
-
-//  Connect to internet from the overworld. Return to the overworld.
-void connect_to_internet_from_overworld(const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context);
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSV/Programs/PokemonSV_GameEntry.cpp b/SerialPrograms/Source/PokemonSV/Programs/PokemonSV_GameEntry.cpp
deleted file mode 100644
index 0e75d20242..0000000000
--- a/SerialPrograms/Source/PokemonSV/Programs/PokemonSV_GameEntry.cpp
+++ /dev/null
@@ -1,154 +0,0 @@
-/*  Game Entry
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/ImageTools/SolidColorTest.h"
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
-#include "CommonFramework/Tools/ErrorDumper.h"
-#include "CommonFramework/Tools/ProgramEnvironment.h"
-#include "CommonFramework/InferenceInfra/VisualInferenceCallback.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
-#include "CommonFramework/Inference/BlackScreenDetector.h"
-//#include "NintendoSwitch/NintendoSwitch_Settings.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Routines.h"
-#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
-#include "PokemonSV/PokemonSV_Settings.h"
-#include "PokemonSV_GameEntry.h"
-
-#include <iostream>
-using std::cout;
-using std::endl;
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-
-
-class WaitforWhiteLoadScreen : public VisualInferenceCallback{
-public:
-    WaitforWhiteLoadScreen(bool invert)
-        : VisualInferenceCallback("LoadingDetector")
-        , m_box0(0.2, 0.2, 0.6, 0.1)
-        , m_box1(0.2, 0.7, 0.6, 0.1)
-        , m_invert(invert)
-    {}
-
-    virtual void make_overlays(VideoOverlaySet& items) const override{
-        items.add(COLOR_RED, m_box0);
-        items.add(COLOR_RED, m_box1);
-    }
-
-    virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override{
-        if (!is_white(extract_box_reference(frame, m_box0))){
-            return m_invert;
-        }
-        if (!is_white(extract_box_reference(frame, m_box1))){
-            return m_invert;
-        }
-        return !m_invert;
-   }
-
-private:
-    ImageFloatBox m_box0;
-    ImageFloatBox m_box1;
-    bool m_invert;
-};
-
-
-bool reset_game_to_gamemenu(ConsoleHandle& console, BotBaseContext& context){
-    close_game(context);
-    start_game_from_home(
-        console,
-        context,
-        true,
-        0, 0,
-        GameSettings::instance().START_GAME_MASH
-    );
-
-    uint16_t timeout = GameSettings::instance().START_GAME_WAIT;
-
-    {
-        console.log("Waiting to load game...");
-        WaitforWhiteLoadScreen detector(false);
-        int ret = wait_until(
-            console, context,
-            std::chrono::milliseconds(timeout * (1000 / TICKS_PER_SECOND)),
-            {{detector}}
-        );
-        if (ret < 0){
-            console.log("Timed out waiting to enter game.", COLOR_RED);
-            return false;
-        }
-    }
-    {
-        console.log("Waiting for game menu...");
-        WaitforWhiteLoadScreen detector(true);
-        int ret = wait_until(
-            console, context,
-            std::chrono::milliseconds(timeout * (1000 / TICKS_PER_SECOND)),
-            {{detector}}
-        );
-        if (ret < 0){
-            console.log("Timed out waiting for game menu.", COLOR_RED);
-            return false;
-        }
-    }
-
-//    // Now the game has opened:
-//    return openedgame_to_gamemenu(console, context, GameSettings::instance().START_GAME_WAIT);
-    return true;
-}
-
-bool gamemenu_to_ingame(ConsoleHandle& console, BotBaseContext& context){
-    console.log("Mashing A to enter game...");
-    BlackScreenOverWatcher detector(COLOR_RED, {0.2, 0.2, 0.6, 0.6});
-    pbf_mash_button(context, BUTTON_A, GameSettings::instance().ENTER_GAME_MASH);
-    context.wait_for_all_requests();
-    console.log("Waiting to enter game...");
-    int ret = wait_until(
-        console, context,
-        std::chrono::milliseconds(GameSettings::instance().ENTER_GAME_WAIT * (1000 / TICKS_PER_SECOND)),
-        {{detector}}
-    );
-    if (ret == 0){
-        console.log("Entered game!");
-        return true;
-    }else{
-        console.log("Timed out waiting to enter game.", COLOR_RED);
-        return false;
-    }
-}
-
-bool reset_game_from_home(
-    const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context,
-    uint16_t post_wait_time
-){
-    console.log("Resetting game from home...");
-    console.overlay().add_log("Reset game", COLOR_WHITE);
-    bool ok = true;
-    ok &= reset_game_to_gamemenu(console, context);
-    ok &= gamemenu_to_ingame(console, context);
-    if (!ok){
-        dump_image(console.logger(), info, "StartGame", console.video().snapshot());
-    }
-    console.log("Entered game! Waiting out grace period.");
-    pbf_wait(context, post_wait_time);
-    context.wait_for_all_requests();
-    return ok;
-}
-
-
-
-
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSV/Programs/PokemonSV_GameEntry.h b/SerialPrograms/Source/PokemonSV/Programs/PokemonSV_GameEntry.h
deleted file mode 100644
index 784f9efafd..0000000000
--- a/SerialPrograms/Source/PokemonSV/Programs/PokemonSV_GameEntry.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*  Game Entry
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSV_GameEntry_H
-#define PokemonAutomation_PokemonSV_GameEntry_H
-
-#include <stdint.h>
-
-namespace PokemonAutomation{
-    class ConsoleHandle;
-    class BotBaseContext;
-    struct ProgramInfo;
-    class ProgramEnvironment;
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-
-
-// From Switch Home menu, reset game and wait until the game menu screen (where
-// "Press A" is displayed to enter the game) is shown.
-bool reset_game_to_gamemenu(ConsoleHandle& console, BotBaseContext& context);
-
-// From the game menu screen (where "Press A" is displayed to enter the game),
-// mash A to enter the game and wait until the black screen is gone.
-bool gamemenu_to_ingame(ConsoleHandle& console, BotBaseContext& context);
-
-// From Switch Home menu, start game and wait until the player character appears in game.
-// post_wait_time: how many ticks to wait after the black screen (shown when loading the map) is over.
-// Return whether it successfully enters the game
-bool reset_game_from_home(
-    const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context,
-    uint16_t post_wait_time = 125
-);
-
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSV/Programs/PokemonSV_Navigation.cpp b/SerialPrograms/Source/PokemonSV/Programs/PokemonSV_Navigation.cpp
deleted file mode 100644
index cbeb1aceba..0000000000
--- a/SerialPrograms/Source/PokemonSV/Programs/PokemonSV_Navigation.cpp
+++ /dev/null
@@ -1,408 +0,0 @@
-/*  Navigation
- exit_tera_without_catching/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/Exceptions/OperationFailedException.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
-//#include "CommonFramework/Tools/ErrorDumper.h"
-#include "NintendoSwitch/NintendoSwitch_Settings.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_ScalarButtons.h"
-#include "NintendoSwitch/Inference/NintendoSwitch_DateReader.h"
-#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
-#include "PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.h"
-#include "PokemonSV/PokemonSV_Settings.h"
-#include "PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h"
-#include "PokemonSV/Inference/PokemonSV_MainMenuDetector.h"
-#include "PokemonSV/Inference/PokemonSV_MapDetector.h"
-#include "PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h"
-#include "PokemonSV/Inference/Picnics/PokemonSV_PicnicDetector.h"
-#include "PokemonSV/Inference/PokemonSV_ZeroGateWarpPromptDetector.h"
-#include "PokemonSV_ConnectToInternet.h"
-#include "PokemonSV_Navigation.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-
-
-
-void set_time_to_12am_from_home(const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context){
-    DateReader reader;
-    VideoOverlaySet overlays(console.overlay());
-    reader.make_overlays(overlays);
-
-//    pbf_press_button(context, BUTTON_HOME, 10, GameSettings::instance().GAME_TO_HOME_DELAY);
-    home_to_date_time(context, true, false);
-    pbf_press_button(context, BUTTON_A, 20, 50);
-    reader.set_hours(info, console, context, 0);
-    pbf_press_button(context, BUTTON_A, 20, 30);
-    pbf_press_button(context, BUTTON_HOME, 20, ConsoleSettings::instance().SETTINGS_TO_HOME_DELAY);
-//    resume_game_from_home(console, context);
-}
-
-void day_skip_from_overworld(ConsoleHandle& console, BotBaseContext& context){
-    pbf_press_button(context, BUTTON_HOME, 10, GameSettings::instance().GAME_TO_HOME_DELAY);
-    home_to_date_time(context, true, true);
-    ssf_press_button(context, BUTTON_A, 20, 10);
-    ssf_issue_scroll(context, DPAD_RIGHT, 0);
-    ssf_press_button(context, BUTTON_A, 2);
-    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 3);
-    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 3);
-    ssf_press_button(context, BUTTON_A, 0);
-    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 3);
-    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 3);
-    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 0);
-    ssf_press_button(context, BUTTON_A, 20, 10);
-    pbf_press_button(context, BUTTON_HOME, 20, ConsoleSettings::instance().SETTINGS_TO_HOME_DELAY);
-    resume_game_from_home(console, context);
-}
-
-void open_map_from_overworld(const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context){
-    {
-        OverworldWatcher overworld(COLOR_CYAN);
-        context.wait_for_all_requests();
-        int ret = wait_until(
-            console, context,
-            std::chrono::seconds(10),
-            {overworld}
-        );
-        context.wait_for(std::chrono::milliseconds(100));
-        if (ret == 0){
-            console.log("Detected overworld.");
-            pbf_press_button(context, BUTTON_Y, 20, 105); // open map
-        }
-        else{
-            throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, console,
-                "open_map_from_overworld(): No overworld state found after 10 seconds.",
-                true
-            );
-        }
-    }
-
-    WallClock start = current_time();
-    while (true){
-        if (current_time() - start > std::chrono::minutes(1)){
-            throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, console,
-                "open_map_from_overworld(): Failed to open map after 1 minute.",
-                true
-            );
-        }
-
-        OverworldWatcher overworld(COLOR_CYAN);
-        AdvanceDialogWatcher advance_dialog(COLOR_YELLOW);
-        PromptDialogWatcher prompt_dialog(COLOR_GREEN);
-        MapWatcher map(COLOR_RED);
-
-        context.wait_for_all_requests();
-        int ret = wait_until(
-            console, context,
-            std::chrono::seconds(30),
-            {overworld, advance_dialog, prompt_dialog, map}
-        );
-        context.wait_for(std::chrono::milliseconds(100));
-        switch (ret){
-        case 0:
-            console.log("Detected overworld.");
-            pbf_press_button(context, BUTTON_Y, 20, 105); // open map
-            continue;
-        case 1:
-            console.log("Detected dialog. Did you fall down?", COLOR_RED);
-            pbf_press_button(context, BUTTON_B, 20, 105);
-            continue;
-        case 2:
-            console.log("Detected dialog. Did you fall down?", COLOR_RED);
-            pbf_press_button(context, BUTTON_A, 20, 105);
-            continue;
-        case 3:
-            console.log("Detected map.");
-            console.overlay().add_log("Map opened", COLOR_WHITE);
-            if (map.map_in_fixed_view()){
-                return;
-            }
-            else{ // click R joystick to change to fixed view
-                console.log("Map in rotate view, fix it");
-                console.overlay().add_log("Change map to fixed view", COLOR_WHITE);
-                pbf_press_button(context, BUTTON_RCLICK, 20, 105);
-                continue;
-            }
-        default:
-            throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, console,
-                "open_map_from_overworld(): No recognized state after 30 seconds.",
-                true
-            );
-        }
-    }
-}
-
-void fly_to_overworld_from_map(const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context){
-    context.wait_for_all_requests();
-    // Press A to bring up the promp dialog on choosing "Fly here", "Set as destination", "Never mind".
-    pbf_press_button(context, BUTTON_A, 20, 130);
-
-    WallClock start = current_time();
-    while (true){
-        if (current_time() - start > std::chrono::minutes(2)){
-            throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, console,
-                "fly_to_overworld_from_map(): Failed to open map after 2 minutes.",
-                true
-            );
-        }
-
-        int ret = 0;
-        {
-            OverworldWatcher overworld(COLOR_CYAN);
-            MapExitWatcher map(COLOR_RED);
-            GradientArrowWatcher spot_dialog_watcher(COLOR_YELLOW, GradientArrowType::RIGHT, {0.469, 0.500, 0.215, 0.150});
-            PromptDialogWatcher confirm_watcher(COLOR_BLUE, {0.686, 0.494, 0.171, 0.163});
-
-            context.wait_for_all_requests();
-            ret = wait_until(
-                console, context,
-                std::chrono::minutes(2),
-                {overworld, map, spot_dialog_watcher, confirm_watcher}
-            );
-        }
-        context.wait_for(std::chrono::milliseconds(100));
-        switch (ret){
-        case 0:
-            console.log("Detected overworld.");
-            return;
-        case 1:
-            console.log("Detected map.");
-            // Press A to bring up the promp dialog on choosing "Fly here", "Set as destination", "Never mind".
-            pbf_press_button(context, BUTTON_A, 20, 130);
-            continue;
-        case 2:
-            console.log("Detected fly here prompt dialog.");
-            console.overlay().add_log("Fly", COLOR_WHITE);
-            pbf_press_button(context, BUTTON_A, 20, 130);
-            continue;
-        case 3:
-            console.log("Detected fly confirmation prompt.");
-            pbf_press_button(context, BUTTON_A, 20, 130);
-            continue;
-            
-        default:
-            throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, console,
-                "fly_to_overworld_from_map(): No recognized state after 2 minutes.",
-                true
-            );
-        }
-    }
-}
-
-
-void picnic_from_overworld(const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context){
-    context.wait_for_all_requests();
-    console.log("Start picnic from overworld...");
-    WallClock start = current_time();
-    bool success = false;
-    while (true){
-        if (current_time() - start > std::chrono::minutes(3)){
-            throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, console,
-                "picnic_from_overworld(): Failed to start picnic after 3 minutes.",
-                true
-            );
-        }
-
-        OverworldWatcher overworld(COLOR_CYAN);
-        MainMenuWatcher main_menu(COLOR_RED);
-        PicnicWatcher picnic;
-        context.wait_for_all_requests();
-        int ret = wait_until(
-            console, context,
-            std::chrono::seconds(30),
-            {overworld, main_menu, picnic}
-        );
-        context.wait_for(std::chrono::milliseconds(100));
-        const bool fast_mode = false;
-        switch (ret){
-        case 0:
-            console.log("Detected overworld.");
-            pbf_press_button(context, BUTTON_X, 20, 105); // open menu 
-            continue;
-        case 1:
-            console.log("Detected main menu.");
-            success = main_menu.move_cursor(info, console, context, MenuSide::RIGHT, 2, fast_mode);
-            if (success == false){
-                throw OperationFailedException(
-                    ErrorReport::SEND_ERROR_REPORT, console,
-                    "picnic_from_overworld(): Cannot move menu cursor to picnic.",
-                    true
-                );
-            }
-            pbf_mash_button(context, BUTTON_A, 125); // mash button A to enter picnic mode
-            continue;
-        case 2:
-            console.log("Detected picnic.");
-            console.overlay().add_log("Start picnic", COLOR_WHITE);
-            // extra wait to make sure by the end the player can move.
-            // the player throwing out pokeballs animation is long.
-            pbf_wait(context, 1000);
-            context.wait_for_all_requests();
-            return;
-        default:
-            throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, console,
-                "picnic_from_overworld(): No recognized state after 30 seconds.",
-                true
-            );
-        }
-    }
-}
-
-void leave_picnic(const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context){
-    context.wait_for_all_requests();
-    console.log("Leaving picnic...");
-    console.overlay().add_log("Leaving picnic", COLOR_WHITE);
-
-    pbf_press_button(context, BUTTON_Y, 30, 100);
-    for(int i = 0; i < 5; i++){
-        PromptDialogWatcher prompt(COLOR_RED, {0.595, 0.517, 0.273, 0.131});
-        context.wait_for_all_requests();
-        int ret = wait_until(
-            console, context,
-            std::chrono::seconds(5),
-            {prompt}
-        );
-
-        if (ret == 0){
-            console.log("Detected end picnic prompt");
-            break;
-        }
-
-        if (i == 4){
-            throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, console,
-                "leave_picnic(): Failed to leave picnic after 5 tries.",
-                true
-            );
-        }
-
-        // prompt not found, maybe button Y dropped?
-        pbf_press_button(context, BUTTON_Y, 30, 100);
-    }
-
-    // We have now the prompt to asking for confirmation of leaving picnic.
-    // Mash A to confirm
-    pbf_mash_button(context, BUTTON_A, 150);
-    context.wait_for_all_requests();
-    
-    // Wait for overworld:
-    OverworldWatcher overworld(COLOR_CYAN);
-    int ret = wait_until(
-        console, context,
-        std::chrono::seconds(20),
-        {overworld}
-    );
-    if (ret < 0){
-        throw OperationFailedException(
-            ErrorReport::SEND_ERROR_REPORT, console,
-            "leave_picnic(): Failed to detecxt overworld after 20 seconds.",
-            true
-        );
-    }
-    // Wait three more seconds to make sure the player character is free to operate:
-    context.wait_for(std::chrono::seconds(3));
-}
-
-
-void enter_box_system_from_overworld(const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context){
-    context.wait_for_all_requests();
-    console.log("Enter box system from overworld...");
-    WallClock start = current_time();
-    bool success = false;
-    while (true){
-        if (current_time() - start > std::chrono::minutes(3)){
-            throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, console,
-                "enter_box_system_from_overworld(): Failed to enter box system after 3 minutes.",
-                true
-            );
-        }
-
-        OverworldWatcher overworld(COLOR_CYAN);
-        MainMenuWatcher main_menu(COLOR_RED);
-        GradientArrowWatcher box_slot_one(COLOR_BLUE, GradientArrowType::DOWN, {0.24, 0.16, 0.05, 0.09});
-        context.wait_for_all_requests();
-        int ret = wait_until(
-            console, context,
-            std::chrono::seconds(30),
-            {overworld, main_menu, box_slot_one}
-        );
-        context.wait_for(std::chrono::milliseconds(100));
-        const bool fast_mode = false;
-        switch (ret){
-        case 0:
-            console.log("Detected overworld.");
-            pbf_press_button(context, BUTTON_X, 20, 105); // open menu 
-            continue;
-        case 1:
-            console.log("Detected main menu.");
-            console.overlay().add_log("Enter box", COLOR_WHITE);
-            success = main_menu.move_cursor(info, console, context, MenuSide::RIGHT, 1, fast_mode);
-            if (success == false){
-                throw OperationFailedException(
-                    ErrorReport::SEND_ERROR_REPORT, console,
-                    "enter_box_system_from_overworld(): Cannot move menu cursor to Boxes.",
-                    true
-                );
-            }
-            pbf_press_button(context, BUTTON_A, 20, 50);
-            continue;
-        case 2:
-            console.log("Detected box.");
-            context.wait_for(std::chrono::milliseconds(200));
-            return;
-        default:
-            throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, console,
-                "enter_box_system_from_overworld(): No recognized state after 30 seconds.",
-                true
-            );
-        }
-    }
-}
-
-
-void leave_box_system_to_overworld(const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context){
-    context.wait_for_all_requests();
-    console.log("Leave box system to overworld...");
-    OverworldWatcher overworld(COLOR_RED);
-    context.wait_for_all_requests();
-    int ret = run_until(
-        console, context,
-        [](BotBaseContext& context){
-            for (size_t c = 0; c < 10; c++){
-                pbf_press_button(context, BUTTON_B, 20, 230);
-            }
-        },
-        {overworld}
-    );
-    if (ret < 0){
-        throw OperationFailedException(
-            ErrorReport::SEND_ERROR_REPORT, console,
-            "leave_box_system_to_overworld(): Unknown state after 10 button B presses.",
-            true
-        );
-    }
-}
-
-
-
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSV/Programs/PokemonSV_Navigation.h b/SerialPrograms/Source/PokemonSV/Programs/PokemonSV_Navigation.h
deleted file mode 100644
index 3887e1abac..0000000000
--- a/SerialPrograms/Source/PokemonSV/Programs/PokemonSV_Navigation.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*  Navigation
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- *  Move between different game elements: overworld, save, internet, map, etc.
- *
- */
-
-#ifndef PokemonAutomation_PokemonSV_Navigation_H
-#define PokemonAutomation_PokemonSV_Navigation_H
-
-//#include <stdint.h>
-#include <string>
-
-namespace PokemonAutomation{
-    struct ProgramInfo;
-    class ConsoleHandle;
-    class BotBaseContext;
-//    class ProgramEnvironment;
-//    class EventNotificationOption;
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-
-void set_time_to_12am_from_home(const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context);
-
-//  Perform a No-op day skip that rolls over all the outbreaks and raids.
-void day_skip_from_overworld(ConsoleHandle& console, BotBaseContext& context);
-
-//  From overworld, open map. Will change map view from rotated to fixed if not already fixed.
-void open_map_from_overworld(const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context);
-
-//  From map, press A to fly to a travel spot.
-void fly_to_overworld_from_map(const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context);
-
-//  Assume the user can set up picnic at current location, start picnic from overworld.
-void picnic_from_overworld(const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context);
-
-//  While in picnic, stop picnic and back to overworld.
-void leave_picnic(const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context);
-
-//  Enter box system from overworld.
-void enter_box_system_from_overworld(const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context);
-
-//  From box system go to overworld.
-void leave_box_system_to_overworld(const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context);
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSV/Programs/PokemonSV_SaveGame.cpp b/SerialPrograms/Source/PokemonSV/Programs/PokemonSV_SaveGame.cpp
deleted file mode 100644
index d373b855bd..0000000000
--- a/SerialPrograms/Source/PokemonSV/Programs/PokemonSV_SaveGame.cpp
+++ /dev/null
@@ -1,116 +0,0 @@
-/*  Save Game
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/Exceptions/OperationFailedException.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
-#include "CommonFramework/Tools/ErrorDumper.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "PokemonSV/Inference/PokemonSV_MainMenuDetector.h"
-#include "PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h"
-#include "PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h"
-#include "PokemonSV_SaveGame.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-
-
-
-
-void save_game_from_menu(const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context){
-    save_game_from_menu_or_overworld(info, console, context, false);
-}
-
-void save_game_from_overworld(const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context){
-    save_game_from_menu_or_overworld(info, console, context, true);
-}
-
-
-
-void save_game_from_menu_or_overworld(
-    const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context,
-    bool return_to_overworld
-){
-    context.wait_for_all_requests();
-    console.log("Saving game...");
-    console.overlay().add_log("Save game", COLOR_YELLOW);
-    WallClock start = current_time();
-    bool saved = false;
-    while (true){
-        if (current_time() - start > std::chrono::minutes(5)){
-            throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, console,
-                "save_game_from_menu_or_overworld(): Failed to save game after 5 minutes.",
-                true
-            );
-        }
-
-        OverworldWatcher overworld(COLOR_CYAN);
-        MainMenuWatcher menu(COLOR_RED);
-        GradientArrowWatcher confirmation(COLOR_YELLOW, GradientArrowType::RIGHT, {0.72, 0.55, 0.05, 0.08});
-        AdvanceDialogWatcher finished(COLOR_GREEN);
-        context.wait_for_all_requests();
-
-        int ret = wait_until(
-            console, context,
-            std::chrono::seconds(60),
-            {overworld, menu, confirmation, finished}
-        );
-        context.wait_for(std::chrono::milliseconds(100));
-        switch (ret){
-        case 0:
-            console.log("Detected overworld.");
-            if (saved && return_to_overworld){
-                return;
-            }
-            pbf_press_button(context, BUTTON_X, 20, 105);
-            continue;
-        case 1:
-            if (!saved){
-                console.log("Detected main menu. Saving game...");
-                pbf_press_button(context, BUTTON_R, 20, 105);
-                continue;
-            }
-            if (return_to_overworld){
-                pbf_press_button(context, BUTTON_B, 20, 105);
-                continue;
-            }
-            return;
-        case 2:
-            console.log("Detected save confirmation prompt.");
-            pbf_press_button(context, BUTTON_A, 20, 105);
-            continue;
-        case 3:
-            console.log("Detected save finished dialog.");
-            pbf_press_button(context, BUTTON_B, 20, 105);
-            saved = true;
-            continue;
-        default:
-            throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, console,
-                "save_game_from_menu_or_overworld(): No recognized state after 60 seconds.",
-                true
-            );
-        }
-
-
-
-
-
-    }
-
-}
-
-
-
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSV/Programs/PokemonSV_SaveGame.h b/SerialPrograms/Source/PokemonSV/Programs/PokemonSV_SaveGame.h
deleted file mode 100644
index f50654208f..0000000000
--- a/SerialPrograms/Source/PokemonSV/Programs/PokemonSV_SaveGame.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*  Save Game
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSV_SaveGame_H
-#define PokemonAutomation_PokemonSV_SaveGame_H
-
-#include <stdint.h>
-
-namespace PokemonAutomation{
-    class BotBaseContext;
-    class ConsoleHandle;
-    struct ProgramInfo;
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-
-//  Save game from menu.
-void save_game_from_menu(const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context);
-
-//  Save game from overworld.
-void save_game_from_overworld(const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context);
-
-//  Save game from either menu or overworld.
-void save_game_from_menu_or_overworld(
-    const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context,
-    bool return_to_overworld
-);
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSV/Programs/Sandwiches/PokemonSV_IngredientSession.cpp b/SerialPrograms/Source/PokemonSV/Programs/Sandwiches/PokemonSV_IngredientSession.cpp
deleted file mode 100644
index 11a252fc08..0000000000
--- a/SerialPrograms/Source/PokemonSV/Programs/Sandwiches/PokemonSV_IngredientSession.cpp
+++ /dev/null
@@ -1,307 +0,0 @@
-/*  Ingredient Session
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Cpp/Containers/FixedLimitVector.tpp"
-#include "Common/Cpp/Concurrency/AsyncDispatcher.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "CommonFramework/Exceptions/OperationFailedException.h"
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "CommonFramework/Tools/ConsoleHandle.h"
-#include "PokemonSV/Resources/PokemonSV_Ingredients.h"
-#include "PokemonSV_IngredientSession.h"
-#include "Common/Cpp/PrettyPrint.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-IngredientSession::~IngredientSession() = default;
-
-IngredientSession::IngredientSession(
-    AsyncDispatcher& dispatcher,
-    ConsoleHandle& console, BotBaseContext& context,
-    Language language, SandwichIngredientType type
-)
-    : m_dispatcher(dispatcher)
-    , m_console(console)
-    , m_context(context)
-    , m_language(language)
-    , m_overlays(console.overlay())
-    , m_ingredients(10)
-    , m_arrow(COLOR_CYAN, GradientArrowType::RIGHT, {0.02, 0.15, 0.05, 0.80})
-{
-    for (size_t c = 0; c < INGREDIENT_PAGE_LINES; c++){
-        m_ingredients.emplace_back(type, c, COLOR_CYAN);
-        m_ingredients.back().make_overlays(m_overlays);
-    }
-}
-
-
-PageIngredients IngredientSession::read_current_page() const{
-    VideoSnapshot snapshot = m_console.video().snapshot();
-
-    PageIngredients ret;
-    ImageFloatBox box;
-    if (!m_arrow.detect(box, snapshot)){
-        throw OperationFailedException(
-            ErrorReport::SEND_ERROR_REPORT, m_console,
-            "IngredientSession::read_current_page(): Unable to find cursor.",
-            snapshot
-        );
-    }
-
-//    cout << box.y << endl;
-    double slot = (box.y - 0.177778) / 0.0738683;
-    ret.selected = (int8_t)(slot + 0.5);
-//    cout << "slot = " << (int)ret.selected << endl;
-    if (ret.selected < 0 || ret.selected >= 10){
-        throw OperationFailedException(
-            ErrorReport::SEND_ERROR_REPORT, m_console,
-            "IngredientSession::read_current_page(): Invalid cursor slot.",
-            snapshot
-        );
-    }
-
-    //  Read the names of every line and the sprite of the selected line.
-    ImageMatch::ImageMatchResult image_result;
-    m_dispatcher.run_in_parallel(0, INGREDIENT_PAGE_LINES + 1, [&](size_t index){
-        if (index < INGREDIENT_PAGE_LINES){
-            // Read text at line `index`
-            OCR::StringMatchResult result = m_ingredients[index].read_with_ocr(snapshot, m_console, m_language);
-            result.clear_beyond_log10p(SandwichFillingOCR::MAX_LOG10P);
-            result.clear_beyond_spread(SandwichFillingOCR::MAX_LOG10P_SPREAD);
-            for (auto& item : result.results){
-                ret.item[index].insert(item.second.token);
-            }
-        }else{
-            // Read current selected icon
-            image_result = m_ingredients[ret.selected].read_with_icon_matcher(snapshot);
-            image_result.clear_beyond_spread(SandwichIngredientReader::ALPHA_SPREAD);
-            image_result.log(m_console, SandwichIngredientReader::MAX_ALPHA);
-            image_result.clear_beyond_alpha(SandwichIngredientReader::MAX_ALPHA);
-        }
-    });
-
-#if 1
-    std::set<std::string>& ocr_result = ret.item[ret.selected];
-    //  Find the items in common between the two detection methods.
-    std::set<std::string> common;
-    for (auto& item : image_result.results){
-        auto iter = ocr_result.find(item.second);
-        if (iter != ocr_result.end()){
-            common.insert(item.second);
-        }
-    }
-
-    if (common.empty()){
-        std::set<std::string> sprite_result;
-        for(const auto& p : image_result.results){
-            sprite_result.insert(p.second);
-        }
-        throw OperationFailedException(
-            ErrorReport::SEND_ERROR_REPORT, m_console,
-            "IngredientSession::read_current_page(): Unable to read selected item. OCR and sprite do not agree on any match: "
-            + set_to_str(ocr_result) + ", " + set_to_str(sprite_result),
-            snapshot
-        );
-    }
-    if (common.size() > 1){
-        std::set<std::string> sprite_result;
-        for(const auto& p : image_result.results){
-            sprite_result.insert(p.second);
-        }
-        throw OperationFailedException(
-            ErrorReport::SEND_ERROR_REPORT, m_console,
-            "IngredientSession::read_current_page(): Unable to read selected item. Ambiguous result: "
-            + set_to_str(ocr_result) + ", " + set_to_str(sprite_result),
-            snapshot
-        );
-    }
-
-    ocr_result = std::move(common);
-#endif
-
-    return ret;
-}
-
-//  Returns true if a desired ingredient is found somewhere on the page.
-//  "slug" is set the desired ingredient if the cursor is already on it.
-bool IngredientSession::run_move_iteration(
-    std::string& slug, const std::set<std::string>& ingredients,
-    const PageIngredients& page
-) const{
-    size_t current_index = page.selected;
-    std::map<size_t, std::string> found_ingredients;
-    for (size_t c = 0; c < INGREDIENT_PAGE_LINES; c++){
-        for (const std::string& item : page.item[c]){
-            auto iter = ingredients.find(item);
-            if (iter != ingredients.end()){
-                found_ingredients[c] = item;
-            }
-        }
-    }
-
-    if (found_ingredients.size() == 0){
-        return false;
-    }
-
-    size_t target_line_index = 0;
-    if (std::all_of(found_ingredients.begin(), found_ingredients.end(), [&](const auto& p){return p.first <= current_index;})){
-        // If the current cursor is below all the found ingredients,
-        // we should move to the closest ingredient, which is also at the lowest line among found ingredients.
-        target_line_index = found_ingredients.rbegin()->first;
-    } else {
-        target_line_index = found_ingredients.begin()->first;
-    }
-
-    const std::string& item = found_ingredients[target_line_index];
-
-    //  Cursor is already on matching ingredient.
-    if (current_index == target_line_index){
-        m_console.log("Desired ingredient " + item + " is selected!", COLOR_BLUE);
-        slug = item;
-        return true;
-    }
-
-    m_console.log("Found desired ingredient " + item + " on current page. Moving towards it...", COLOR_BLUE);
-
-    //  Move to it.
-    while (current_index < target_line_index){
-        pbf_press_dpad(m_context, DPAD_DOWN, 10, 30);
-        current_index++;
-    }
-    while (current_index > target_line_index){
-        pbf_press_dpad(m_context, DPAD_UP, 10, 30);
-        current_index--;
-    }
-    m_context.wait_for_all_requests();
-    m_context.wait_for(std::chrono::seconds(1));
-
-    return true;
-}
-
-
-std::string IngredientSession::move_to_ingredient(const std::set<std::string>& ingredients) const{
-    if (ingredients.empty()){
-        m_console.log("No desired ingredients.", COLOR_RED);
-        return "";
-    }
-
-    size_t not_found_count = 0;
-    while (true){
-        m_context.wait_for_all_requests();
-        PageIngredients page = read_current_page();
-
-        std::string found_ingredient;
-        if (run_move_iteration(found_ingredient, ingredients, page)){
-            if (found_ingredient.empty()){
-                continue;
-            }else{
-                return found_ingredient;
-            }
-        }
-
-        size_t current = page.selected;
-        if (current == INGREDIENT_PAGE_LINES - 1){
-            not_found_count++;
-            if (not_found_count >= 2){
-                m_console.log("Ingredient not found anywhere.", COLOR_RED);
-                return "";
-            }else{
-                m_console.log("End of page reached without finding ingredient. Wrapping back to beginning.", COLOR_ORANGE);
-                pbf_press_dpad(m_context, DPAD_DOWN, 20, 105);
-            }
-        }
-
-        m_console.log("Ingredient not found on current page. Scrolling down.", COLOR_ORANGE);
-
-        //  Not found on page. Scroll to last item.
-        while (current < INGREDIENT_PAGE_LINES - 1){
-            pbf_press_dpad(m_context, DPAD_DOWN, 10, 30);
-            current++;
-        }
-
-        m_context.wait_for_all_requests();
-        m_context.wait_for(std::chrono::milliseconds(180));
-    }
-    return "";
-}
-
-
-void IngredientSession::add_ingredients(
-    ConsoleHandle& console, BotBaseContext& context,
-    std::map<std::string, uint8_t>&& ingredients
-) const{
-    //  "ingredients" will be what we still need.
-    //  Each time we add an ingredient, it will be removed from the map.
-    //  Loop until there's nothing left.
-    while (!ingredients.empty()){
-        std::set<std::string> remaining;
-        for (const auto& item : ingredients){
-            remaining.insert(item.first);
-        }
-
-        std::string found = this->move_to_ingredient(remaining);
-        if (found.empty()){
-            const SandwichIngredientNames& name = get_ingredient_name(*remaining.begin());
-            throw OperationFailedException(
-                ErrorReport::NO_ERROR_REPORT, console,
-                "Unable to find ingredient: \"" + name.display_name() + "\" - Did you run out?"
-            );
-        }
-
-        const SandwichIngredientNames& name = get_ingredient_name(found);
-        console.log("Found: " + name.display_name(), COLOR_BLUE);
-
-        //  Add the item. But don't loop the quantity. Instead, we add one and
-        //  loop again in case we run out.
-        pbf_press_button(context, BUTTON_A, 20, 105);
-        context.wait_for_all_requests();
-        // TODO add visual confirmation of ingredients added to avoid button drops
-
-        auto iter = ingredients.find(found);
-        if (--iter->second == 0){
-            ingredients.erase(iter);
-        }
-    }
-}
-
-
-
-void add_sandwich_ingredients(
-    AsyncDispatcher& dispatcher,
-    ConsoleHandle& console, BotBaseContext& context,
-    Language language,
-    std::map<std::string, uint8_t>&& fillings,
-    std::map<std::string, uint8_t>&& condiments
-){
-    {
-        IngredientSession session(dispatcher, console, context, language, SandwichIngredientType::FILLING);
-        session.add_ingredients(console, context, std::move(fillings));
-        pbf_press_button(context, BUTTON_PLUS, 20, 230);
-    }
-
-    {
-        IngredientSession session(dispatcher, console, context, language, SandwichIngredientType::CONDIMENT);
-        // If there are herbs, we search first from bottom
-        if (std::any_of(condiments.begin(), condiments.end(), [&](const auto& p){return p.first.find("herba") != std::string::npos;})){
-            pbf_press_dpad(context, DPAD_UP, 20, 105);
-        }
-        session.add_ingredients(console, context, std::move(condiments));
-        pbf_press_button(context, BUTTON_PLUS, 20, 230);
-    }
-
-    pbf_mash_button(context, BUTTON_A, 125);
-}
-
-
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSV/Programs/Sandwiches/PokemonSV_IngredientSession.h b/SerialPrograms/Source/PokemonSV/Programs/Sandwiches/PokemonSV_IngredientSession.h
deleted file mode 100644
index 397fbd128c..0000000000
--- a/SerialPrograms/Source/PokemonSV/Programs/Sandwiches/PokemonSV_IngredientSession.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/*  Ingredient Session
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSV_IngredientSession_H
-#define PokemonAutomation_PokemonSV_IngredientSession_H
-
-#include <map>
-#include "Common/Cpp/Containers/FixedLimitVector.h"
-#include "CommonFramework/Language.h"
-#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
-#include "PokemonSV/Inference/Dialogs/PokemonSV_GradientArrowDetector.h"
-#include "PokemonSV/Inference/Picnics/PokemonSV_SandwichIngredientDetector.h"
-
-namespace PokemonAutomation{
-    class AsyncDispatcher;
-    class ConsoleHandle;
-    class BotBaseContext;
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-class SandwichIngredientReader;
-
-
-static constexpr size_t INGREDIENT_PAGE_LINES = 10;
-
-struct PageIngredients{
-    // the line index of the current selected ingredient, < INGREDIENT_PAGE_LINES
-    int8_t selected = -1;
-    std::set<std::string> item[INGREDIENT_PAGE_LINES];
-};
-
-
-class IngredientSession{
-public:
-    ~IngredientSession();
-    IngredientSession(
-        AsyncDispatcher& dispatcher,
-        ConsoleHandle& console, BotBaseContext& context,
-        Language language, SandwichIngredientType type
-    );
-
-    //  Move to any ingredient in the set. Returns the ingredient it moved to.
-    //  Returns empty string if not found.
-    std::string move_to_ingredient(const std::set<std::string>& ingredients) const;
-
-    void add_ingredients(
-        ConsoleHandle& console, BotBaseContext& context,
-        std::map<std::string, uint8_t>&& ingredients
-    ) const;
-
-
-public:
-    PageIngredients read_current_page() const;
-    bool run_move_iteration(
-        std::string& slug, const std::set<std::string>& ingredients,
-        const PageIngredients& page
-    ) const;
-
-
-private:
-    AsyncDispatcher& m_dispatcher;
-    ConsoleHandle& m_console;
-    BotBaseContext& m_context;
-    Language m_language;
-    VideoOverlaySet m_overlays;
-    FixedLimitVector<SandwichIngredientReader> m_ingredients;
-    GradientArrowDetector m_arrow;
-};
-
-
-
-//  Starting from the top of the fillings menu, gather all the ingredients.
-//  When this function returns, the game will be entering the phase where the
-//  user must stack the fillings.
-//  If any ingredient is not found or insuffient, it will throw OperationFailedException.
-void add_sandwich_ingredients(
-    AsyncDispatcher& dispatcher,
-    ConsoleHandle& console, BotBaseContext& context,
-    Language language,
-    std::map<std::string, uint8_t>&& fillings,  //  {slug, quantity}
-    std::map<std::string, uint8_t>&& condiments
-);
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSV/Programs/Sandwiches/PokemonSV_SandwichMaker.cpp b/SerialPrograms/Source/PokemonSV/Programs/Sandwiches/PokemonSV_SandwichMaker.cpp
deleted file mode 100644
index 8486ef1d5c..0000000000
--- a/SerialPrograms/Source/PokemonSV/Programs/Sandwiches/PokemonSV_SandwichMaker.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-/*  Sandwich Maker
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/Notifications/ProgramNotifications.h"
-#include "CommonFramework/Exceptions/OperationFailedException.h"
-#include "CommonFramework/Tools/VideoResolutionCheck.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "Common/Cpp/Exceptions.h"
-#include "PokemonSV/Programs/Sandwiches/PokemonSV_SandwichRoutines.h"
-#include "PokemonSV_SandwichMaker.h"
-
-//#include <iostream>
-//using std::cout;
-//using std::endl;
-#include <unordered_map>
-#include <algorithm>
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-using namespace Pokemon;
-
-SandwichMaker_Descriptor::SandwichMaker_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonSV:SandwichMaker",
-        STRING_POKEMON + " SV", "Sandwich Maker",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonSV/SandwichMaker.md",
-        "Make a sandwich of your choice.",
-        FeedbackType::REQUIRED,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-
-SandwichMaker::SandwichMaker()
-    : GO_HOME_WHEN_DONE(false)
-    , NOTIFICATIONS({
-        &NOTIFICATION_PROGRAM_FINISH,
-        &NOTIFICATION_ERROR_FATAL,
-        })
-{
-    PA_ADD_OPTION(SANDWICH_OPTIONS);
-    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
-    PA_ADD_OPTION(NOTIFICATIONS);
-}
-
-void SandwichMaker::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) {
-    assert_16_9_720p_min(env.logger(), env.console);
-
-    run_sandwich_maker(env, context, SANDWICH_OPTIONS);
-
-    GO_HOME_WHEN_DONE.run_end_of_program(context);
-    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
-}
-
-
-}
-}
-}
-
diff --git a/SerialPrograms/Source/PokemonSV/Programs/Sandwiches/PokemonSV_SandwichMaker.h b/SerialPrograms/Source/PokemonSV/Programs/Sandwiches/PokemonSV_SandwichMaker.h
deleted file mode 100644
index 1806c63e48..0000000000
--- a/SerialPrograms/Source/PokemonSV/Programs/Sandwiches/PokemonSV_SandwichMaker.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*  Sandwich Maker
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_SandwichMaker_H
-#define PokemonAutomation_PokemonSwSh_SandwichMaker_H
-
-#include "Common/Cpp/Options/SimpleIntegerOption.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
-#include "CommonFramework/Notifications/EventNotificationsTable.h"
-#include "PokemonSV/Options/PokemonSV_SandwichMakerOption.h"
-
-namespace PokemonAutomation {
-namespace NintendoSwitch {
-namespace PokemonSV {
-
-
-class SandwichMaker_Descriptor : public SingleSwitchProgramDescriptor {
-public:
-    SandwichMaker_Descriptor();
-};
-
-class SandwichMaker : public SingleSwitchProgramInstance {
-public:
-    SandwichMaker();
-
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-    SandwichMakerOption SANDWICH_OPTIONS;
-    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
-    EventNotificationsOption NOTIFICATIONS;
-};
-
-
-}
-}
-}
-#endif
-
-
-
diff --git a/SerialPrograms/Source/PokemonSV/Programs/Sandwiches/PokemonSV_SandwichRoutines.cpp b/SerialPrograms/Source/PokemonSV/Programs/Sandwiches/PokemonSV_SandwichRoutines.cpp
deleted file mode 100644
index 0167aa97ed..0000000000
--- a/SerialPrograms/Source/PokemonSV/Programs/Sandwiches/PokemonSV_SandwichRoutines.cpp
+++ /dev/null
@@ -1,1127 +0,0 @@
-/*  Sandwich Routines
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Cpp/Exceptions.h"
-#include "Common/Cpp/Concurrency/AsyncDispatcher.h"
-#include "CommonFramework/Exceptions/OperationFailedException.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "CommonFramework/VideoPipeline/VideoOverlay.h"
-#include "CommonFramework/Tools/ErrorDumper.h"
-#include "CommonFramework/Tools/InterruptableCommands.h"
-#include "CommonFramework/Tools/ProgramEnvironment.h"
-#include "CommonFramework/ImageTools/ImageFilter.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_ScalarButtons.h"
-#include "PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h"
-#include "PokemonSV/Inference/Dialogs/PokemonSV_GradientArrowDetector.h"
-#include "PokemonSV/Inference/Picnics/PokemonSV_PicnicDetector.h"
-#include "PokemonSV/Inference/Picnics/PokemonSV_SandwichHandDetector.h"
-#include "PokemonSV/Inference/Picnics/PokemonSV_SandwichIngredientDetector.h"
-#include "PokemonSV/Inference/Picnics/PokemonSV_SandwichRecipeDetector.h"
-#include "PokemonSV/Resources/PokemonSV_FillingsCoordinates.h"
-#include "PokemonSV/Resources/PokemonSV_Ingredients.h"
-#include "PokemonSV_SandwichRoutines.h"
-#include "PokemonSV/Programs/Sandwiches/PokemonSV_IngredientSession.h"
-
-#include <cmath>
-#include <algorithm>
-#include <sstream>
-#include <unordered_map>
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-namespace {
-    const ImageFloatBox HAND_INITIAL_BOX{0.440, 0.455, 0.112, 0.179};
-    const ImageFloatBox INGREDIENT_BOX{0.455, 0.130, 0.090, 0.030};
-
-void wait_for_initial_hand(const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context){
-     SandwichHandWatcher free_hand(SandwichHandType::FREE, HAND_INITIAL_BOX);
-    int ret = wait_until(console, context, std::chrono::seconds(30), {free_hand});
-    if (ret < 0){
-        dump_image_and_throw_recoverable_exception(info, console, "FreeHandNotDetected",
-            "Cannot detect hand at start of making a sandwich.");
-    }
-}
-
-} // anonymous namespace
-
-bool enter_sandwich_recipe_list(const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context){
-    context.wait_for_all_requests();
-    console.log("Opening sandwich menu at picnic table.");
-
-    // Firt, try pressing button A to bring up the menu to make sandwich
-    pbf_press_button(context, BUTTON_A, 20, 80);
-
-    WallClock start = current_time();
-    bool opened_table_menu = false;
-    while(true){
-        context.wait_for_all_requests();
-        if (current_time() - start > std::chrono::minutes(1)){
-            dump_image_and_throw_recoverable_exception(
-                info, console, "FailToSandwich",
-                "enter_sandwich_recipe_list(): Failed to open sandwich menu after 1 minute."
-            );
-        }
-
-        PicnicWatcher picnic_watcher;
-        GradientArrowWatcher sandwich_arrow(COLOR_YELLOW, GradientArrowType::RIGHT, {0.551, 0.311, 0.310, 0.106});
-        GradientArrowWatcher recipe_arrow(COLOR_YELLOW, GradientArrowType::DOWN, {0.103, 0.074, 0.068, 0.085});
-        AdvanceDialogWatcher dialog_watcher(COLOR_RED);
-
-        const int ret = wait_until(
-            console, context,
-            std::chrono::seconds(30),
-            {picnic_watcher, sandwich_arrow, recipe_arrow, dialog_watcher}
-        );
-        switch (ret){
-        case 0:
-            console.log("Detected picnic. Maybe button A press dropped.");
-            pbf_press_button(context, BUTTON_A, 20, 80);
-            continue;
-        case 1:
-            console.log("Detected \"make a sandwich\" menu item selection arrrow.");
-            console.overlay().add_log("Open sandwich recipes", COLOR_WHITE);
-            opened_table_menu = true;
-            pbf_press_button(context, BUTTON_A, 20, 100);
-            continue;
-        case 2:
-            console.log("Detected recipe selection arrow.");
-            context.wait_for(std::chrono::seconds(1)); // wait one second to make sure the menu is fully loaded.
-            return true;
-        case 3:
-            console.log("Detected advance dialog.");
-            if (opened_table_menu){
-                console.log("Advance dialog after \"make a sandwich\" menu item. No ingredients.", COLOR_RED);
-                console.overlay().add_log("No ingredient!", COLOR_RED);
-                return false;
-            }
-            pbf_press_button(context, BUTTON_A, 20, 80);
-            continue;
-        default:
-            dump_image_and_throw_recoverable_exception(info, console, "NotEnterSandwichList",
-                "enter_sandwich_recipe_list(): No recognized state after 60 seconds.");
-        }
-    }
-}
-
-
-bool select_sandwich_recipe(const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context, size_t target_sandwich_ID){
-    context.wait_for_all_requests();
-    console.log("Choosing sandwich recipe: " + std::to_string(target_sandwich_ID));
-    console.overlay().add_log("Search recipe " + std::to_string(target_sandwich_ID), COLOR_WHITE);
-
-    SandwichRecipeNumberDetector recipe_detector(console.logger());
-    SandwichRecipeSelectionWatcher selection_watcher;
-
-    VideoOverlaySet overlay_set(console.overlay());
-    recipe_detector.make_overlays(overlay_set);
-    selection_watcher.make_overlays(overlay_set);
-
-    bool found_recipe = false;
-    int max_move_down_list_attempts = 100; // There are 151 total recipes, so 76 rows.
-    for(int move_down_list_attempt = 0; move_down_list_attempt < max_move_down_list_attempts; move_down_list_attempt++) {
-        context.wait_for_all_requests();
-
-        auto snapshot = console.video().snapshot();
-        size_t recipe_IDs[6] = {0, 0, 0, 0, 0, 0};
-        recipe_detector.detect_recipes(snapshot, recipe_IDs);
-        {
-            std::ostringstream os;
-            os << "Recipe IDs detected: ";
-            for(int i = 0; i < 6; i++){
-                os << recipe_IDs[i] << ", ";
-            }
-            console.log(os.str());
-        }
-
-        size_t min_ID = 300;
-        for(int i = 0; i < 6; i++){
-            if (recipe_IDs[i] > 0 && recipe_IDs[i] < min_ID){
-                min_ID = recipe_IDs[i];
-            }
-        }
-        if (min_ID == 300){
-            min_ID = 0; // set case of no recipe ID detected to be 0 min_ID
-        }
-        size_t max_ID = *std::max_element(recipe_IDs, recipe_IDs+6);
-        console.log("min, max IDs " + std::to_string(min_ID) + ", " + std::to_string(max_ID));
-
-        if (0 < min_ID && min_ID <= target_sandwich_ID && target_sandwich_ID <= max_ID){
-            // target is in this page!
-            
-            int target_cell = -1;
-            for(int i = 0; i < 6; i++){
-                if (recipe_IDs[i] == target_sandwich_ID){
-                    target_cell = i;
-                    break;
-                }
-            }
-            if (target_cell == -1){ // not targe recipe found in this page, probably not enough ingredients
-                console.log("Not enough ingredients for target recipe.", COLOR_RED);
-                console.overlay().add_log("Not enough ingredients", COLOR_RED);
-                return false;
-            }
-
-            console.log("found recipe in the current page, cell " + std::to_string(target_cell));
-            
-            int ret = wait_until(console, context, std::chrono::seconds(10), {selection_watcher});
-            int selected_cell = selection_watcher.selected_recipe_cell();
-            if (ret < 0 || selected_cell < 0){
-                dump_image_and_throw_recoverable_exception(info, console, "RecipeSelectionArrowNotDetected",
-                    "select_sandwich_recipe(): Cannot detect recipe selection arrow.");
-            }
-
-            console.log("Current selected cell " + std::to_string(selected_cell));
-
-            if (target_cell == selected_cell){
-                // Selected target recipe!
-                console.log("Found recipe at cell " + std::to_string(selected_cell));
-                console.overlay().add_log("Found recipe", COLOR_WHITE);
-                found_recipe = true;
-                break;
-            }
-            else if (target_cell == selected_cell + 1){
-                console.log("Move to the right column.");
-                // Target is in a different column
-                // Move cursor right.
-                pbf_press_dpad(context, DPAD_RIGHT, 10, 50);
-                continue;
-            }
-            // else, continue moving down the list
-        }
-
-        // target sandwich recipe is still below the current displayed recipes.
-        // Move down the list.
-        pbf_press_dpad(context, DPAD_DOWN, 10, 50);
-    } // end for moving down the recipe list
-
-    overlay_set.clear();
-
-    if (found_recipe){
-        // Press A to enter the pick selection 
-        pbf_press_button(context, BUTTON_A, 30, 100);
-        context.wait_for_all_requests();
-
-        SandwichIngredientArrowWatcher pick_selection(0, COLOR_YELLOW);
-        while(true){
-            int ret = wait_until(console, context, std::chrono::seconds(3),
-                {selection_watcher, pick_selection});
-            
-            if (ret == 0){
-                console.log("Detected recipe selection. Dropped Button A?");
-                pbf_press_button(context, BUTTON_A, 30, 100);
-                continue;
-            } else if (ret == 1){
-                console.log("Detected pick selection.");
-                pbf_press_button(context, BUTTON_A, 30, 100);
-                continue;
-            } else{
-                console.log("Entered sandwich minigame.");
-                break;
-            }
-        }
-        return true;
-    }
-
-    // we cannot find the receipt
-    console.log("Max list travese attempt reached. Target recipe not found", COLOR_RED);
-    console.overlay().add_log("Recipe not found", COLOR_RED);
-
-    return false;
-}
-
-namespace {
-
-// expand the hand bounding box so that the hand watcher can pick the hand in the next iteration
-ImageFloatBox expand_box(const ImageFloatBox& box){
-    const double x = std::max(0.0, box.x - box.width * 1.5);
-    const double y = std::max(0.0, box.y - box.height * 1.5);
-    const double width = std::min(box.width*4, 1.0 - x);
-    const double height = std::min(box.height*4, 1.0 - y);
-    return ImageFloatBox(x, y, width, height);
-}
-
-ImageFloatBox hand_location_to_box(const std::pair<double, double>& loc){
-    const double hand_width = 0.071, hand_height = 0.106;
-    return {loc.first - hand_width/2, loc.second - hand_height/2, hand_width, hand_height};
-}
-
-std::string box_to_string(const ImageFloatBox& box){
-    std::ostringstream os;
-    os << "(" << box.x << ", " << box.y << ", " << box.width << ", " << box.height << ")";
-    return os.str();
-}
-
-ImageFloatBox move_sandwich_hand(
-    const ProgramInfo& info,
-    AsyncDispatcher& dispatcher,
-    ConsoleHandle& console,
-    BotBaseContext& context,
-    SandwichHandType hand_type,
-    bool pressing_A,
-    const ImageFloatBox& start_box,
-    const ImageFloatBox& end_box
-){
-    context.wait_for_all_requests();
-    console.log("Start moving sandwich hand: " + SANDWICH_HAND_TYPE_NAMES(hand_type)
-        + " start box " + box_to_string(start_box) + " end box " + box_to_string(end_box));
-
-    uint8_t joystick_x = 128;
-    uint8_t joystick_y = 128;
-
-    SandwichHandWatcher hand_watcher(hand_type, start_box);
-
-    // A session that creates a new thread to send button commands to controller
-    AsyncCommandSession move_session(context, console.logger(), dispatcher, console.botbase());
-    
-    if (pressing_A){
-        move_session.dispatch([](BotBaseContext& context){
-            pbf_controller_state(context, BUTTON_A, DPAD_NONE, 128, 128, 128, 128, 3000);
-        });
-    }
-
-    const std::pair<double, double> target_loc(end_box.x + end_box.width/2, end_box.y + end_box.height/2);
-
-    std::pair<double, double> last_loc(-1, -1);
-    std::pair<double, double> speed(-1, -1);
-    WallClock cur_time, last_time;
-    VideoOverlaySet overlay_set(console.overlay());
-
-    while(true){
-        int ret = wait_until(console, context, std::chrono::seconds(5), {hand_watcher});
-        if (ret < 0){
-            dump_image_and_throw_recoverable_exception(
-                info, console,
-                SANDWICH_HAND_TYPE_NAMES(hand_type) + "SandwichHandNotDetected",
-                "move_sandwich_hand(): Cannot detect " + SANDWICH_HAND_TYPE_NAMES(hand_type) + " hand.",
-                hand_watcher.last_snapshot()
-            );
-        }
-
-        auto cur_loc = hand_watcher.location();
-        console.log("Hand location: " + std::to_string(cur_loc.first) + ", " + std::to_string(cur_loc.second));
-        cur_time = current_time();
-
-        const ImageFloatBox hand_bb = hand_location_to_box(cur_loc); 
-        const ImageFloatBox expanded_hand_bb = expand_box(hand_bb);
-        hand_watcher.change_box(expanded_hand_bb);
-
-        overlay_set.clear();
-        overlay_set.add(COLOR_RED, hand_bb);
-        overlay_set.add(COLOR_BLUE, expanded_hand_bb);
-
-        std::pair<double, double> dif(target_loc.first - cur_loc.first, target_loc.second - cur_loc.second);
-        // console.log("float diff to target: " + std::to_string(dif.first) + ", " + std::to_string(dif.second));
-        if (std::fabs(dif.first) < end_box.width/2 && std::fabs(dif.second) < end_box.height/2){
-            console.log(SANDWICH_HAND_TYPE_NAMES(hand_type) + " hand reached target.");
-            move_session.stop_session_and_rethrow(); // Stop the commands
-            if (hand_type == SandwichHandType::GRABBING){
-                // wait for some time to let hand release ingredient
-                context.wait_for(std::chrono::milliseconds(100));
-            }
-            return hand_bb;
-        }
-
-        // Assume screen width is 16.0, then the screen height is 9.0
-        std::pair<double, double> real_dif(dif.first * 16, dif.second * 9);
-        double distance = std::sqrt(real_dif.first * real_dif.first + real_dif.second * real_dif.second);
-        // console.log("scaled diff to target: " + std::to_string(real_dif.first) + ", " + std::to_string(real_dif.second)
-        //     + " distance " + std::to_string(distance));
-
-        // Build a P-D controller!
-
-        // We assume for a screen distance of 4 (1/4 of the width), we can use max joystick push, 128.
-        // So for distance of value 1.0, we multiply by 32 to get joystick push
-        double target_joystick_push = std::min(distance * 32, 128.0);
-
-        std::pair<double, double> push(real_dif.first * target_joystick_push / distance, real_dif.second * target_joystick_push / distance);
-        // console.log("push force " + std::to_string(push.first) + ", " + std::to_string(push.second));
-
-        if (last_loc.first < 0){
-            speed = std::make_pair(0.0, 0.0);
-        } else {
-            std::chrono::microseconds time = std::chrono::duration_cast<std::chrono::microseconds>(cur_time - last_time);
-            double time_s = time.count() / 1000000.0;
-            std::pair<double, double> moved((cur_loc.first - last_loc.first) * 16, (cur_loc.second - last_loc.second) * 9);
-
-            // Currently set to zero damping as it seems we don't need them for now
-            double damping_factor = 0.0;
-            double damping_multiplier = (-1.0) * damping_factor / time_s;
-            std::pair<double, double> damped_push_offset(moved.first * damping_multiplier, moved.second * damping_multiplier);
-
-            push.first += damped_push_offset.first;
-            push.second += damped_push_offset.second;
-        }
-
-        joystick_x = (uint8_t) std::max(std::min(int(push.first + 0.5) + 128, 255), 0);
-        joystick_y = (uint8_t) std::max(std::min(int(push.second + 0.5) + 128, 255), 0);
-        // console.log("joystick push " + std::to_string(joystick_x) + ", " + std::to_string(joystick_y));
-
-        // Dispatch a new series of commands that overwrites the last ones
-        move_session.dispatch([&](BotBaseContext& context){
-            if (pressing_A){
-                // Note: joystick_x and joystick_y must be defined to outlive `move_session`.
-//                pbf_controller_state(context, BUTTON_A, DPAD_NONE, joystick_x, joystick_y, 128, 128, 20);
-                ssf_press_button(context, BUTTON_A, 0, 1000, 0);
-            }
-            pbf_move_left_joystick(context, joystick_x, joystick_y, 20, 0);
-        });
-        
-        console.log("Moved joystick");
-
-        last_loc = cur_loc;
-        last_time = cur_time;
-        context.wait_for(std::chrono::milliseconds(80));
-    }
-}
-
-} // end anonymous namesapce
-
-void build_great_peanut_butter_sandwich(const ProgramInfo& info, AsyncDispatcher& dispatcher, ConsoleHandle& console, BotBaseContext& context){
-    const ImageFloatBox sandwich_target_box_left  {0.386, 0.507, 0.060, 0.055};
-    const ImageFloatBox sandwich_target_box_middle{0.470, 0.507, 0.060, 0.055};
-    const ImageFloatBox sandwich_target_box_right {0.554, 0.507, 0.060, 0.055};
-    const ImageFloatBox upper_bread_drop_box{0.482, 0.400, 0.036, 0.030};
-
-    wait_for_initial_hand(info, console, context);
-    console.overlay().add_log("Start making sandwich", COLOR_WHITE);
-
-    // console.overlay().add_log("Pick first banana", COLOR_WHITE);
-    auto end_box = move_sandwich_hand(info, dispatcher, console, context, SandwichHandType::FREE, false, HAND_INITIAL_BOX, INGREDIENT_BOX);
-
-    // console.overlay().add_log("Drop first banana", COLOR_WHITE);
-    // visual feedback grabbing is not reliable. Switch to blind grabbing:
-    end_box = move_sandwich_hand(info, dispatcher, console, context, SandwichHandType::GRABBING, true, expand_box(end_box), sandwich_target_box_left);
-    
-    // pbf_controller_state(context, BUTTON_A, DPAD_NONE, 100, 200, 128, 128, 120);
-    // context.wait_for(std::chrono::milliseconds(100));
-    // context.wait_for_all_requests();
-
-    // console.overlay().add_log("Pick second banana", COLOR_WHITE);
-    end_box = move_sandwich_hand(info, dispatcher, console, context, SandwichHandType::FREE, false, {0, 0, 1.0, 1.0}, INGREDIENT_BOX);
-
-    // console.overlay().add_log("Drop second banana", COLOR_WHITE);
-    end_box = move_sandwich_hand(info, dispatcher, console, context, SandwichHandType::GRABBING, true, expand_box(end_box), sandwich_target_box_middle);
-    // pbf_controller_state(context, BUTTON_A, DPAD_NONE, 128, 200, 128, 128, 120);
-    // context.wait_for(std::chrono::milliseconds(100));
-    // context.wait_for_all_requests();
-
-    // console.overlay().add_log("Pick third banana", COLOR_WHITE);
-    end_box = move_sandwich_hand(info, dispatcher, console, context, SandwichHandType::FREE, false, {0, 0, 1.0, 1.0}, INGREDIENT_BOX);
-    
-    // console.overlay().add_log("Drop third banana", COLOR_WHITE);
-    end_box = move_sandwich_hand(info, dispatcher, console, context, SandwichHandType::GRABBING, true, expand_box(end_box), sandwich_target_box_right);
-    // pbf_controller_state(context, BUTTON_A, DPAD_NONE, 156, 200, 128, 128, 120);
-    // context.wait_for(std::chrono::milliseconds(100));
-    // context.wait_for_all_requests();
-
-    // Drop upper bread and pick
-    // console.overlay().add_log("Drop upper bread and pick", COLOR_WHITE);
-    SandwichHandWatcher grabbing_hand(SandwichHandType::FREE, {0, 0, 1.0, 1.0});
-    int ret = wait_until(console, context, std::chrono::seconds(30), {grabbing_hand});
-    if (ret < 0){
-        throw OperationFailedException(
-            ErrorReport::SEND_ERROR_REPORT, console,
-            "make_great_peanut_butter_sandwich(): Cannot detect grabing hand when waiting for upper bread.",
-            grabbing_hand.last_snapshot()
-        );
-    }
-
-    auto hand_box = hand_location_to_box(grabbing_hand.location());
-
-    end_box = move_sandwich_hand(info, dispatcher, console, context, SandwichHandType::GRABBING, false, expand_box(hand_box), upper_bread_drop_box);
-    pbf_mash_button(context, BUTTON_A, 125 * 5);
-
-    console.log("Hand end box " + box_to_string(end_box));
-    console.overlay().add_log("Built sandwich", COLOR_WHITE);
-
-    context.wait_for_all_requests();
-}
-
-void finish_sandwich_eating(const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context){
-    console.overlay().add_log("Eating", COLOR_WHITE);
-    PicnicWatcher picnic_watcher;
-    int ret = run_until(
-        console, context,
-        [](BotBaseContext& context){
-            for(int i = 0; i < 20; i++){
-                pbf_press_button(context, BUTTON_A, 20, 3*TICKS_PER_SECOND - 20);
-            }
-        },
-        {picnic_watcher}
-    );
-    if (ret < 0){
-        dump_image_and_throw_recoverable_exception(info, console, "PicnicNotDetected",
-            "finish_sandwich_eating(): cannot detect picnic after 60 seconds.");
-    }
-    console.overlay().add_log("Finish eating", COLOR_WHITE);
-    context.wait_for(std::chrono::seconds(1));
-}
-
-namespace{
-
-void repeat_press_until(
-    const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context,
-    std::function<void()> button_press,
-    const std::vector<PeriodicInferenceCallback>& callbacks,
-    const std::string &error_name, const std::string &error_message,
-    std::chrono::milliseconds detection_timeout = std::chrono::seconds(5),
-    size_t max_presses = 10,
-    std::chrono::milliseconds default_video_period = std::chrono::milliseconds(50),
-    std::chrono::milliseconds default_audio_period = std::chrono::milliseconds(20)
-){
-    button_press();
-    for(size_t i_try = 0; i_try < max_presses; i_try++){
-        context.wait_for_all_requests();
-        const int ret = wait_until(console, context, detection_timeout, callbacks);
-        if (ret >= 0){
-            return;
-        }
-        button_press();
-    }
-
-    dump_image_and_throw_recoverable_exception(info, console, "IngredientListNotDetected",
-        "enter_custom_sandwich_mode(): cannot detect ingredient list after 50 seconds.");
-}
-
-void repeat_button_press_until(
-    const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context,
-    uint16_t button, uint16_t hold_ticks, uint16_t release_ticks,
-    const std::vector<PeriodicInferenceCallback>& callbacks,
-    const std::string &error_name, const std::string &error_message,
-    std::chrono::milliseconds iteration_length = std::chrono::seconds(5),
-    size_t max_presses = 10,
-    std::chrono::milliseconds default_video_period = std::chrono::milliseconds(50),
-    std::chrono::milliseconds default_audio_period = std::chrono::milliseconds(20)
-){
-    const std::chrono::milliseconds button_time = std::chrono::milliseconds((hold_ticks + release_ticks) * (1000 / TICKS_PER_SECOND));
-    repeat_press_until(info, console, context,
-        [&](){ pbf_press_button(context, button, hold_ticks, release_ticks); },
-        callbacks, error_name, error_message, iteration_length - button_time, max_presses,
-        default_video_period, default_audio_period
-    );
-}
-
-void repeat_dpad_press_until(
-    const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context,
-    uint8_t dpad_position, uint16_t hold_ticks, uint16_t release_ticks,
-    const std::vector<PeriodicInferenceCallback>& callbacks,
-    const std::string &error_name, const std::string &error_message,
-    std::chrono::milliseconds iteration_length = std::chrono::seconds(5),
-    size_t max_presses = 10,
-    std::chrono::milliseconds default_video_period = std::chrono::milliseconds(50),
-    std::chrono::milliseconds default_audio_period = std::chrono::milliseconds(20)
-){
-    const std::chrono::milliseconds button_time = std::chrono::milliseconds((hold_ticks + release_ticks) * (1000 / TICKS_PER_SECOND));
-    repeat_press_until(info, console, context,
-        [&](){ pbf_press_dpad(context, dpad_position, hold_ticks, release_ticks); },
-        callbacks, error_name, error_message, iteration_length - button_time, max_presses, 
-        default_video_period, default_audio_period
-    );
-}
-
-
-} // anonymous namespace
-
-
-void enter_custom_sandwich_mode(const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context){
-    context.wait_for_all_requests();
-    console.log("Entering custom sandwich mode.");
-    console.overlay().add_log("Custom sandwich", COLOR_WHITE);
-
-    SandwichIngredientArrowWatcher ingredient_selection_arrow(0, COLOR_YELLOW);
-    repeat_button_press_until(
-        info, console, context, BUTTON_X, 40, 80, {ingredient_selection_arrow},
-        "IngredientListNotDetected", "enter_custom_sandwich_mode(): cannot detect ingredient list after 50 seconds."
-    );
-}
-
-namespace {
-
-void finish_two_herbs_sandwich(
-    const ProgramInfo& info, AsyncDispatcher& dispatcher, ConsoleHandle& console, BotBaseContext& context
-){
-    console.log("Finish determining ingredients for two-sweet-herb sandwich.");
-    console.overlay().add_log("Finish picking ingredients", COLOR_WHITE);
-
-    wait_for_initial_hand(info, console, context);
-
-    console.overlay().add_log("Start making sandwich", COLOR_WHITE);
-    move_sandwich_hand(info, dispatcher, console, context, SandwichHandType::FREE, false, HAND_INITIAL_BOX, INGREDIENT_BOX);
-    // Mash button A to pick and drop ingredients, upper bread and pick.
-    // Egg Power 3 is applied with only two sweet herb condiments!
-    pbf_mash_button(context, BUTTON_A, 8 * TICKS_PER_SECOND);
-    context.wait_for_all_requests();
-    console.overlay().add_log("Built sandwich", COLOR_WHITE);
-}
-
-} // anonymous namesapce
-
-void make_two_herbs_sandwich(
-    const ProgramInfo& info, AsyncDispatcher& dispatcher, ConsoleHandle& console, BotBaseContext& context,
-    EggSandwichType sandwich_type, size_t sweet_herb_index_last, size_t salty_herb_index_last, size_t bitter_herb_index_last
-){
-    // The game has at most 5 herbs, in the order of sweet, salty, sour, bitter, spicy:
-    if (sweet_herb_index_last >= 5){ // sweet index can only be: 0, 1, 2, 3, 4
-        throw InternalProgramError(&console.logger(), PA_CURRENT_FUNCTION,
-            "Invalid sweet herb index: " + std::to_string(sweet_herb_index_last));
-    }
-    if (salty_herb_index_last >= 4){ // 0, 1, 2, 3
-        throw InternalProgramError(&console.logger(), PA_CURRENT_FUNCTION,
-            "Invalid salty herb index: " + std::to_string(salty_herb_index_last));
-    }
-    if (bitter_herb_index_last >= 2){ // 0, 1
-        throw InternalProgramError(&console.logger(), PA_CURRENT_FUNCTION,
-            "Invalid bitter herb index: " + std::to_string(bitter_herb_index_last));
-    }
-
-    if (sandwich_type == EggSandwichType::SALTY_SWEET_HERBS && salty_herb_index_last >= sweet_herb_index_last){
-        throw InternalProgramError(&console.logger(), PA_CURRENT_FUNCTION,
-            "Invalid salty and sweet herb indices: " + std::to_string(salty_herb_index_last) + ", " + std::to_string(sweet_herb_index_last));
-    }
-    if (sandwich_type == EggSandwichType::BITTER_SWEET_HERBS && bitter_herb_index_last >= sweet_herb_index_last){
-        throw InternalProgramError(&console.logger(), PA_CURRENT_FUNCTION,
-            "Invalid bitter and sweet herb indices: " + std::to_string(bitter_herb_index_last) + ", " + std::to_string(sweet_herb_index_last));
-    }
-
-    {
-        // Press button A to add first filling, assumed to be lettuce
-        DeterminedSandwichIngredientWatcher filling_watcher(SandwichIngredientType::FILLING, 0);
-        repeat_button_press_until(
-            info, console, context, BUTTON_A, 40, 50, {filling_watcher},
-            "DeterminedIngredientNotDetected", "make_two_herbs_sandwich(): cannot detect determined lettuce after 50 seconds."
-        );
-    }
-
-    {
-        // Press button + to go to condiments page
-        SandwichCondimentsPageWatcher condiments_page_watcher;
-        repeat_button_press_until(
-            info, console, context, BUTTON_PLUS, 40, 60, {condiments_page_watcher},
-            "CondimentsPageNotDetected", "make_two_herbs_sandwich(): cannot detect condiments page after 50 seconds."
-        );
-    }
-
-    size_t first_herb_index_last = 0;
-    switch(sandwich_type){
-    case EggSandwichType::TWO_SWEET_HERBS:
-        first_herb_index_last = sweet_herb_index_last;
-        break;
-    case EggSandwichType::SALTY_SWEET_HERBS:
-        first_herb_index_last = salty_herb_index_last;
-        break;
-    case EggSandwichType::BITTER_SWEET_HERBS:
-        first_herb_index_last = bitter_herb_index_last;
-        break;
-    default:
-        throw InternalProgramError(&console.logger(), PA_CURRENT_FUNCTION,
-            "Invalid EggSandwichType for make_two_herbs_sandwich()");
-    }
-
-    auto move_one_up_to_row = [&](size_t row){
-        console.log("Move arrow to row " + std::to_string(row));
-        SandwichIngredientArrowWatcher arrow(row);
-        repeat_dpad_press_until(info, console, context, DPAD_UP, 10, 30, {arrow}, "IngredientArrowNotDetected",
-            "make_two_herbs_sandwich(): cannot detect ingredient selection arrow at row " + std::to_string(row) + " after 50 seconds."
-        );
-    };
-
-    auto press_a_to_determine_herb = [&](size_t herb_index){
-        DeterminedSandwichIngredientWatcher herb_watcher(SandwichIngredientType::CONDIMENT, herb_index);
-        repeat_button_press_until(
-            info, console, context, BUTTON_A, 40, 60, {herb_watcher}, "CondimentsPageNotDetected",
-            "make_two_herbs_sandwich(): cannot detect detemined herb at cell " + std::to_string(herb_index) + " after 50 seconds."
-        );
-    };
-
-    // Press DPAD_UP multiple times to move to the first herb row
-    for(size_t i = 0; i < first_herb_index_last+1; i++){
-        move_one_up_to_row(9 - i);
-    }
-    press_a_to_determine_herb(0); // Press A to detemine one herb
-    // Press DPAD_UP againt to move to the second herb row
-    for(size_t i = first_herb_index_last+1; i < sweet_herb_index_last+1; i++){
-        move_one_up_to_row(9 - i);
-    }
-    press_a_to_determine_herb(1); // Press A to detemine the second herb
-
-    {
-        // Press button + to go to picks page
-        SandwichPicksPageWatcher picks_page_watcher;
-        repeat_button_press_until(
-            info, console, context, BUTTON_PLUS, 40, 60, {picks_page_watcher},
-            "CondimentsPageNotDetected", "make_two_herbs_sandwich(): cannot detect picks page after 50 seconds."
-        );
-    }
-
-    // Mesh button A to select the first pick
-    pbf_mash_button(context, BUTTON_A, 80);
-    context.wait_for_all_requests();
-
-    finish_two_herbs_sandwich(info, dispatcher, console, context);
-}
-
-void make_two_herbs_sandwich(
-    const ProgramInfo& info, AsyncDispatcher& dispatcher, ConsoleHandle& console, BotBaseContext& context,
-    EggSandwichType sandwich_type, Language language
-){
-    std::map<std::string, uint8_t> fillings = {{"lettuce", (uint8_t)1}};
-    std::map<std::string, uint8_t> condiments = {{"sweet-herba-mystica", (uint8_t)1}};
-    switch(sandwich_type){
-    case EggSandwichType::TWO_SWEET_HERBS:
-        condiments["sweet-herba-mystica"] = 2;
-        break;
-    case EggSandwichType::SALTY_SWEET_HERBS:
-        condiments["salty-herba-mystica"] = 1;
-        break;
-    case EggSandwichType::BITTER_SWEET_HERBS:
-        condiments["bitter-herba-mystica"] = 1;
-        break;
-    default:
-        throw InternalProgramError(&console.logger(), PA_CURRENT_FUNCTION,
-            "Invalid EggSandwichType for make_two_herbs_sandwich()");
-    }
-    add_sandwich_ingredients(dispatcher, console, context, language, std::move(fillings), std::move(condiments));
-
-    finish_two_herbs_sandwich(info, dispatcher, console, context);
-}
-
-void run_sandwich_maker(SingleSwitchProgramEnvironment& env, BotBaseContext& context, SandwichMakerOption& SANDWICH_OPTIONS) {
-    if (SANDWICH_OPTIONS.LANGUAGE == Language::None) {
-        throw UserSetupError(env.console.logger(), "Must set game langauge option to read ingredient lists.");
-    }
-
-    int num_fillings = 0;
-    int num_condiments = 0;
-    std::map<std::string, uint8_t> fillings;
-    std::map<std::string, uint8_t> condiments;
-
-    //Add the selected ingredients to the maps if set to custom
-    if (SANDWICH_OPTIONS.BASE_RECIPE == BaseRecipe::custom) {
-        env.log("Custom sandwich selected. Validating ingredients.", COLOR_BLACK);
-        env.console.overlay().add_log("Custom sandwich selected. Validating ingredients.", COLOR_WHITE);
-
-        std::vector<std::unique_ptr<SandwichIngredientsTableRow>> table = SANDWICH_OPTIONS.SANDWICH_INGREDIENTS.copy_snapshot();
-
-        for (const std::unique_ptr<SandwichIngredientsTableRow>& row : table) {
-            const std::string& table_item = row->item.slug();
-            if (!(table_item == "baguette")) { //ignore baguette
-                if (std::find(ALL_SANDWICH_FILLINGS_SLUGS().begin(), ALL_SANDWICH_FILLINGS_SLUGS().end(), table_item) != ALL_SANDWICH_FILLINGS_SLUGS().end()) {
-                    fillings[table_item]++;
-                    num_fillings++;
-                }
-                else {
-                    condiments[table_item]++;
-                    num_condiments++;
-                }
-            }
-            else {
-                env.log("Skipping baguette as it is unobtainable.");
-                env.console.overlay().add_log("Skipping baguette as it is unobtainable.", COLOR_WHITE);
-            }
-        }
-
-        if (num_fillings == 0 || num_condiments == 0) {
-            throw UserSetupError(env.console.logger(), "Must have at least one filling and at least one condiment.");
-        }
-
-        if (num_fillings > 6 || num_condiments > 4) {
-            throw UserSetupError(env.console.logger(), "Number of fillings exceed 6 and/or number of condiments exceed 4.");
-        }
-        env.log("Ingredients validated.", COLOR_BLACK);
-        env.console.overlay().add_log("Ingredients validated.", COLOR_WHITE);
-    }
-    //Otherwise get the preset ingredients
-    else {
-        env.log("Preset sandwich selected.", COLOR_BLACK);
-        env.console.overlay().add_log("Preset sandwich selected.", COLOR_WHITE);
-
-        std::vector<std::string> table = SANDWICH_OPTIONS.get_premade_ingredients(SANDWICH_OPTIONS.get_premade_sandwich_recipe(SANDWICH_OPTIONS.BASE_RECIPE, SANDWICH_OPTIONS.TYPE, SANDWICH_OPTIONS.PARADOX));
-
-        for (auto&& s : table) {
-            if (std::find(ALL_SANDWICH_FILLINGS_SLUGS().begin(), ALL_SANDWICH_FILLINGS_SLUGS().end(), s) != ALL_SANDWICH_FILLINGS_SLUGS().end()) {
-                fillings[s]++;
-                num_fillings++;
-            }
-            else {
-                condiments[s]++;
-                num_condiments++;
-            }
-        }
-        //Insert Herba Mystica if required
-        if (SandwichMakerOption::two_herba_required(SANDWICH_OPTIONS.BASE_RECIPE)) {
-            if (SANDWICH_OPTIONS.HERBA_ONE == SANDWICH_OPTIONS.HERBA_TWO) {
-                condiments.insert(std::make_pair(SANDWICH_OPTIONS.herba_to_string(SANDWICH_OPTIONS.HERBA_ONE), (uint8_t)2));
-            }
-            else {
-                condiments.insert(std::make_pair(SANDWICH_OPTIONS.herba_to_string(SANDWICH_OPTIONS.HERBA_ONE), (uint8_t)1));
-                condiments.insert(std::make_pair(SANDWICH_OPTIONS.herba_to_string(SANDWICH_OPTIONS.HERBA_TWO), (uint8_t)1));
-            }
-            num_condiments++;
-            num_condiments++;
-        }
-    }
-
-    /*
-    //Print ingredients
-    cout << "Fillings:" << endl;
-    for (const auto& [key, value] : fillings) {
-        std::cout << key << ": " << (int)value << endl;
-    }
-    cout << "Condiments:" << endl;
-    for (const auto& [key, value] : condiments) {
-        std::cout << key << ": " << (int)value << endl;
-    }
-    */
-
-    //Sort the fillings by priority for building (ex. large items on bottom, cherry tomatoes on top)
-    //std::vector<std::string> fillings_game_order = {"lettuce", "tomato", "cherry-tomatoes", "cucumber", "pickle", "onion", "red-onion", "green-bell-pepper", "red-bell-pepper",
-    //    "yellow-bell-pepper", "avocado", "bacon", "ham", "prosciutto", "chorizo", "herbed-sausage", "hamburger", "klawf-stick", "smoked-fillet", "fried-fillet", "egg", "potato-tortilla",
-    //    "tofu", "rice", "noodles", "potato-salad", "cheese", "banana", "strawberry", "apple", "kiwi", "pineapple", "jalapeno", "watercress", "basil"};
-    std::vector<std::string> fillings_game_order = { "hamburger", "rice", "noodles", "smoked-fillet", "fried-fillet", "cucumber", "pickle", "tofu",
-        "chorizo", "herbed-sausage", "potato-tortilla", "klawf-stick", "lettuce", "tomato", "onion", "red-onion", "green-bell-pepper", "red-bell-pepper", "yellow-bell-pepper", "avocado",
-        "bacon", "ham", "prosciutto", "cheese", "banana", "strawberry", "apple", "kiwi", "pineapple", "jalape\xc3\xb1o", "watercress", "potato-salad", "egg", "basil", "cherry-tomatoes" };
-
-    //Add keys to new vector and sort
-    std::vector<std::string> fillings_sorted;
-    for (auto i = fillings.begin(); i != fillings.end(); i++) {
-        fillings_sorted.push_back(i->first);
-    }
-    std::unordered_map<std::string, int> temp_map;
-    for (auto i = 0; i < (int)fillings_game_order.size(); i++) {
-        temp_map[fillings_game_order[i]] = i;
-    }
-    auto compare = [&temp_map](const std::string& s, const std::string& s1) {
-        return temp_map[s] < temp_map[s1];
-    };
-    std::sort(fillings_sorted.begin(), fillings_sorted.end(), compare);
-
-    /*
-    //Print sorted fillings
-    cout << "Sorted fillings:" << endl;
-    for (auto i : fillings_sorted) {
-        cout << i << endl;
-    }
-    */
-
-    //Calculate number of bowls there will be on the build screen
-    //Get each ingredient in list order, then get the number of times it appears from the map
-    //Also store how many of each ingredient is in each bowl (ex. 6 onion in first bowl and then 3 onion in the next)
-    int bowls = 0;
-    std::vector<int> bowl_amounts;
-
-    for (auto i : fillings_sorted) {
-
-        //Add "full" bowls
-        int bowl_calcs = (int)(fillings[i] / FillingsCoordinates::instance().get_filling_information(i).servingsPerBowl);
-        if (bowl_calcs != 0) {
-            bowls += bowl_calcs;
-            for (int j = 0; j < bowl_calcs; j++) {
-                bowl_amounts.push_back((int)(FillingsCoordinates::instance().get_filling_information(i).servingsPerBowl) * (int)(FillingsCoordinates::instance().get_filling_information(i).piecesPerServing));
-            }
-        }
-
-        //Add bowls for remaining servings
-        int bowl_remaining = ((int)(fillings[i] % FillingsCoordinates::instance().get_filling_information(i).servingsPerBowl));
-        if (bowl_remaining != 0) {
-            bowls++;
-            bowl_amounts.push_back(bowl_remaining * (int)(FillingsCoordinates::instance().get_filling_information(i).piecesPerServing));
-        }
-    }
-    //cout << "Number of bowls: " << bowls << endl;
-    env.log("Number of bowls: " + std::to_string(bowls), COLOR_BLACK);
-    env.console.overlay().add_log("Number of bowls: " + std::to_string(bowls), COLOR_WHITE);
-
-    //Player must be on default sandwich menu
-    std::map<std::string, uint8_t> fillings_copy(fillings); //Making a copy as we need the map for later
-    enter_custom_sandwich_mode(env.program_info(), env.console, context);
-    add_sandwich_ingredients(env.realtime_dispatcher(), env.console, context, SANDWICH_OPTIONS.LANGUAGE, std::move(fillings_copy), std::move(condiments));
-    wait_for_initial_hand(env.program_info(), env.console, context);
-
-    //Wait for labels to appear
-    env.log("Waiting for labels to appear.", COLOR_BLACK);
-    env.console.overlay().add_log("Waiting for labels to appear.", COLOR_WHITE);
-    pbf_wait(context, 300);
-    context.wait_for_all_requests();
-
-    //Now read in bowl labels and store which bowl has what
-    //TODO: Clean this up - this is a mess
-    env.log("Reading bowl labels.", COLOR_BLACK);
-    env.console.overlay().add_log("Reading bowl labels.", COLOR_WHITE);
-
-    VideoSnapshot screen = env.console.video().snapshot();
-    ImageFloatBox left_bowl_label(0.099, 0.270, 0.205, 0.041);
-    ImageFloatBox center_bowl_label(0.397, 0.268, 0.203, 0.044);
-    ImageFloatBox right_bowl_label(0.699, 0.269, 0.201, 0.044);
-
-    //VideoOverlaySet label_set(env.console);
-    //label_set.add(COLOR_BLUE, center_bowl_label);
-    std::vector<std::string> bowl_order;
-
-    //Get 3 default labels
-    ImageRGB32 image_center_label = to_blackwhite_rgb32_range(
-        extract_box_reference(screen, center_bowl_label),
-        combine_rgb(215, 215, 215), combine_rgb(255, 255, 255), true
-    );
-    ImageRGB32 image_left_label = to_blackwhite_rgb32_range(
-        extract_box_reference(screen, left_bowl_label),
-        combine_rgb(215, 215, 215), combine_rgb(255, 255, 255), true
-    );
-    ImageRGB32 image_right_label = to_blackwhite_rgb32_range(
-        extract_box_reference(screen, right_bowl_label),
-        combine_rgb(215, 215, 215), combine_rgb(255, 255, 255), true
-    );
-
-    OCR::StringMatchResult result = PokemonSV::SandwichFillingOCR::instance().read_substring(
-        env.console, SANDWICH_OPTIONS.LANGUAGE, image_center_label,
-        OCR::BLACK_TEXT_FILTERS()
-    );
-    result.clear_beyond_log10p(SandwichFillingOCR::MAX_LOG10P);
-    result.clear_beyond_spread(SandwichFillingOCR::MAX_LOG10P_SPREAD);
-    if (result.results.empty()) {
-        throw OperationFailedException(
-            ErrorReport::SEND_ERROR_REPORT, env.console,
-            "No ingredient found on center label.",
-            true
-        );
-    }
-    for (auto& r : result.results) {
-        env.console.log("Ingredient found on center label: " + r.second.token);
-        env.console.overlay().add_log("Ingredient found on center label : " + r.second.token, COLOR_WHITE);
-        bowl_order.push_back(r.second.token);
-    }
-    //Get left (2nd) ingredient
-    result = PokemonSV::SandwichFillingOCR::instance().read_substring(
-        env.console, SANDWICH_OPTIONS.LANGUAGE, image_left_label,
-        OCR::BLACK_TEXT_FILTERS()
-    );
-    result.clear_beyond_log10p(SandwichFillingOCR::MAX_LOG10P);
-    result.clear_beyond_spread(SandwichFillingOCR::MAX_LOG10P_SPREAD);
-    if (result.results.empty()) {
-        env.log("No ingredient found on left label.", COLOR_BLACK);
-        env.console.overlay().add_log("No ingredient found on left label.", COLOR_WHITE);
-    }
-    for (auto& r : result.results) {
-        env.console.log("Ingredient found on left label: " + r.second.token);
-        env.console.overlay().add_log("Ingredient found on left label: " + r.second.token, COLOR_WHITE);
-        bowl_order.push_back(r.second.token);
-    }
-    //Get right (3rd) ingredient
-    result = PokemonSV::SandwichFillingOCR::instance().read_substring(
-        env.console, SANDWICH_OPTIONS.LANGUAGE, image_right_label,
-        OCR::BLACK_TEXT_FILTERS()
-    );
-    result.clear_beyond_log10p(SandwichFillingOCR::MAX_LOG10P);
-    result.clear_beyond_spread(SandwichFillingOCR::MAX_LOG10P_SPREAD);
-    if (result.results.empty()) {
-        env.log("No ingredient found on right label.", COLOR_BLACK);
-        env.console.overlay().add_log("No ingredient found on right label.", COLOR_WHITE);
-    }
-    for (auto& r : result.results) {
-        env.console.log("Ingredient found on right label: " + r.second.token);
-        env.console.overlay().add_log("Ingredient found on right label: " + r.second.token, COLOR_WHITE);
-        bowl_order.push_back(r.second.token);
-    }
-    //Get remaining ingredients if any
-    //center 1, left 2, right 3, far left 4, far far left/right 5, right 6
-    //this differs from the game layout: far right is 5 and far far left/right is 6 in game
-    //however as long as we stay internally consistent with this numbering it will work
-    for (int i = 0; i < (bowls - 3); i++) {
-        pbf_press_button(context, BUTTON_R, 20, 80);
-        pbf_wait(context, 100);
-        context.wait_for_all_requests();
-
-        VideoSnapshot screen2 = env.console.video().snapshot();
-        ImageRGB32 image_side_label = to_blackwhite_rgb32_range(
-            extract_box_reference(screen2, left_bowl_label),
-            combine_rgb(215, 215, 215), combine_rgb(255, 255, 255), true
-        );
-        //image_side_label.save("./image_side_label.png");
-
-        result = PokemonSV::SandwichFillingOCR::instance().read_substring(
-            env.console, SANDWICH_OPTIONS.LANGUAGE, image_side_label,
-            OCR::BLACK_TEXT_FILTERS()
-        );
-        result.clear_beyond_log10p(SandwichFillingOCR::MAX_LOG10P);
-        result.clear_beyond_spread(SandwichFillingOCR::MAX_LOG10P_SPREAD);
-        if (result.results.empty()) {
-            env.log("No ingredient found on side label.", COLOR_BLACK);
-            env.console.overlay().add_log("No ingredient found on side label.", COLOR_WHITE);
-        }
-        for (auto& r : result.results) {
-            env.console.log("Ingredient found on side label: " + r.second.token);
-            env.console.overlay().add_log("Ingredient found on side label: " + r.second.token, COLOR_WHITE);
-            bowl_order.push_back(r.second.token);
-        }
-    }
-
-    //Now re-center bowls
-    env.log("Re-centering bowls if needed.", COLOR_BLACK);
-    env.console.overlay().add_log("Re-centering bowls if needed.", COLOR_WHITE);
-    for (int i = 0; i < (bowls - 3); i++) {
-        pbf_press_button(context, BUTTON_L, 20, 80);
-    }
-
-    /*
-    cout << "Labels:" << endl;
-    for (auto i : bowl_order) {
-        cout << i << endl;
-    }
-    */
-
-    //If a label fails to read it'll cause issues down the line
-    if ((int)bowl_order.size() != bowls) {
-        throw OperationFailedException(
-            ErrorReport::SEND_ERROR_REPORT, env.console,
-            "Number of bowl labels did not match number of bowls.",
-            true
-        );
-    }
-
-    //Finally.
-    env.log("Start making sandwich", COLOR_BLACK);
-    env.console.overlay().add_log("Start making sandwich.", COLOR_WHITE);
-
-    const ImageFloatBox center_bowl{ 0.455, 0.130, 0.090, 0.030 };
-    const ImageFloatBox left_bowl{ 0.190, 0.136, 0.096, 0.031 };
-    const ImageFloatBox right_bowl{ 0.715, 0.140, 0.108, 0.033 };
-
-    ImageFloatBox target_bowl = center_bowl;
-    //Initial position handling
-    auto end_box = move_sandwich_hand(env.program_info(), env.realtime_dispatcher(), env.console, context, SandwichHandType::FREE, false, HAND_INITIAL_BOX, HAND_INITIAL_BOX);
-    move_sandwich_hand(env.program_info(), env.realtime_dispatcher(), env.console, context, SandwichHandType::GRABBING, true, { 0, 0, 1.0, 1.0 }, HAND_INITIAL_BOX);
-    context.wait_for_all_requests();
-
-    //Find fillings and add them in order
-    for (auto i : fillings_sorted) {
-        //cout << "Placing " << i << endl;
-        env.console.overlay().add_log("Placing " + i, COLOR_WHITE);
-
-        int times_to_place = (int)(FillingsCoordinates::instance().get_filling_information(i).piecesPerServing) * (fillings.find(i)->second);
-        int placement_number = 0;
-
-        //cout << "Times to place: " << times_to_place << endl;
-        env.console.overlay().add_log("Times to place: " + std::to_string(times_to_place), COLOR_WHITE);
-
-        std::vector<int> bowl_index;
-        //Get the bowls we want to go to
-        for (int j = 0; j < (int)bowl_order.size(); j++) {
-            if (i == bowl_order.at(j)) {
-                bowl_index.push_back(j);
-            }
-        }
-
-        //Target the correct filling bowl and place until it is empty
-        for (int j = 0; j < (int)bowl_index.size(); j++) {
-            //Navigate to bowl and set target bowl
-            //cout << "Target bowl: " << bowl_index.at(j) << endl;
-            env.console.overlay().add_log("Target bowl: " + std::to_string(bowl_index.at(j)), COLOR_WHITE);
-            switch (bowl_index.at(j)) {
-            case 0:
-                target_bowl = center_bowl;
-                break;
-            case 1:
-                target_bowl = left_bowl;
-                break;
-            case 2:
-                target_bowl = right_bowl;
-                break;
-            case 3: case 4: case 5: case 6:
-                //Press R the appropriate number of times
-                for (int k = 2; k < bowl_index.at(j); k++) {
-                    pbf_press_button(context, BUTTON_R, 20, 80);
-                }
-                target_bowl = left_bowl;
-                break;
-            default:
-                break;
-            }
-
-            //Place the fillings until label does not light up yellow on grab/the piece count is not hit
-            while (true) {
-                //Break out after placing all pieces of the filling
-                if (placement_number == times_to_place) {
-                    break;
-                }
-
-                end_box = move_sandwich_hand(env.program_info(), env.realtime_dispatcher(), env.console, context, SandwichHandType::FREE, false, { 0, 0, 1.0, 1.0 }, target_bowl);
-                context.wait_for_all_requests();
-
-                //Get placement location
-                ImageFloatBox placement_target = FillingsCoordinates::instance().get_filling_information(i).placementCoordinates.at((int)fillings.find(i)->second).at(placement_number);
-
-                end_box = move_sandwich_hand(env.program_info(), env.realtime_dispatcher(), env.console, context, SandwichHandType::GRABBING, true, expand_box(end_box), placement_target);
-                context.wait_for_all_requests();
-
-                //If any of the labels are yellow continue. Otherwise assume bowl is empty move on to the next.
-                VideoSnapshot label_color_check = env.console.video().snapshot();
-                ImageRGB32 left_check = filter_rgb32_range(
-                    extract_box_reference(label_color_check, left_bowl_label),
-                    combine_rgb(180, 161, 0), combine_rgb(255, 255, 100), Color(0), false
-                );
-                ImageRGB32 right_check = filter_rgb32_range(
-                    extract_box_reference(label_color_check, right_bowl_label),
-                    combine_rgb(180, 161, 0), combine_rgb(255, 255, 100), Color(0), false
-                );
-                ImageRGB32 center_check = filter_rgb32_range(
-                    extract_box_reference(label_color_check, center_bowl_label),
-                    combine_rgb(180, 161, 0), combine_rgb(255, 255, 100), Color(0), false
-                );
-                ImageStats left_stats = image_stats(left_check);
-                ImageStats right_stats = image_stats(right_check);
-                ImageStats center_stats = image_stats(center_check);
-
-                //cout << "Left stats: " << left_stats.count << endl;
-                //cout << "Right stats: " << right_stats.count << endl;
-                //cout << "Center stats: " << center_stats.count << endl;
-
-                //The label check is needed for ingredients with multiple bowls as we don't know which bowl has what amount
-                if (left_stats.count < 100 && right_stats.count < 100 && center_stats.count < 100) {
-                    context.wait_for_all_requests();
-                    break;
-                }
-
-                //If the bowl is empty the increment is skipped using the above break
-                placement_number++;
-            }
-
-            //Reset bowl positions
-            for (int k = 2; k < bowl_index.at(j); k++) {
-                pbf_press_button(context, BUTTON_L, 20, 80);
-            }
-        }
-    }
-    // Handle top slice by tossing it away
-    SandwichHandWatcher grabbing_hand(SandwichHandType::FREE, { 0, 0, 1.0, 1.0 });
-    int ret = wait_until(env.console, context, std::chrono::seconds(30), { grabbing_hand });
-    if (ret < 0) {
-        throw OperationFailedException(
-            ErrorReport::SEND_ERROR_REPORT, env.console,
-            "SandwichMaker: Cannot detect grabing hand when waiting for upper bread.",
-            grabbing_hand.last_snapshot()
-        );
-    }
-
-    auto hand_box = hand_location_to_box(grabbing_hand.location());
-
-    end_box = move_sandwich_hand(env.program_info(), env.realtime_dispatcher(), env.console, context, SandwichHandType::GRABBING, false, expand_box(hand_box), center_bowl);
-    pbf_mash_button(context, BUTTON_A, 125 * 5);
-
-    env.log("Hand end box " + box_to_string(end_box));
-    env.log("Built sandwich", COLOR_BLACK);
-    env.console.overlay().add_log("Hand end box " + box_to_string(end_box), COLOR_WHITE);
-    env.console.overlay().add_log("Built sandwich.", COLOR_WHITE);
-    context.wait_for_all_requests();
-
-    finish_sandwich_eating(env.program_info(), env.console, context);
-}
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSV/Programs/Sandwiches/PokemonSV_SandwichRoutines.h b/SerialPrograms/Source/PokemonSV/Programs/Sandwiches/PokemonSV_SandwichRoutines.h
deleted file mode 100644
index 37f112e417..0000000000
--- a/SerialPrograms/Source/PokemonSV/Programs/Sandwiches/PokemonSV_SandwichRoutines.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/*  Sandwich Routines
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- *  Various functions to do sandwich making related automation.
- *  This file is used to share sandwich related code among different programs (egg auto, sandwich auto, etc.).
- */
-
-#ifndef PokemonAutomation_PokemonSV_SandwichRoutines_H
-#define PokemonAutomation_PokemonSV_SandwichRoutines_H
-
-#include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "CommonFramework/Language.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-#include "PokemonSV/Inference/Picnics/PokemonSV_SandwichHandDetector.h"
-#include "PokemonSV/Options/PokemonSV_SandwichMakerOption.h"
-#include <cstddef>
-
-namespace PokemonAutomation{
-    
-    struct ProgramInfo;
-    class AsyncDispatcher;
-    class ProgramEnvironment;
-    class ConsoleHandle;
-    class BotBaseContext;
-
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-// Assuming at picnic table, press A to start making sandwich.
-// The function returns when the game shows the sandwich recipe menu.
-// Return true if it enters the recipe menu. Return false if there is no ingredients on the plyaer character so
-// no sandwich can be made.
-bool enter_sandwich_recipe_list(const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context);
-
-// Starting at sandwich recipe selection menu, select the desired sandwich recipe and press A to enter
-// the making sandwich mini game. It will use the first sandwich pick in the sandwich pick selection list.
-// sandwich_index: [1, 151].
-// Return true if it successfully finds and starts the recipe.
-// Return false if the function fails to find the recipe. This could be that ingredients are not enough, and therefore
-// the recipe cell is semi-transparent, failed to be detected.
-bool select_sandwich_recipe(const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context, size_t sandwich_index);
-
-// Starting at the sandwich minigame of dropping ingredients, assume the selected recipe is Great Peanut Butter Sandwich,
-// make the sandwich.
-void build_great_peanut_butter_sandwich(const ProgramInfo& info, AsyncDispatcher& dispatcher, ConsoleHandle& console, BotBaseContext& context);
-
-// Assuming sandwich is made, press A repeatedly to finish eating animation until returning to picnic
-void finish_sandwich_eating(const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context);
-
-// Assuming at sanwich recipe list, press X to enter custom sandwich mode
-void enter_custom_sandwich_mode(const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context);
-
-enum class EggSandwichType{
-    GREAT_PEANUT_BUTTER,
-    TWO_SWEET_HERBS,
-    BITTER_SWEET_HERBS,
-    SALTY_SWEET_HERBS
-};
-
-// Assuming starting at the custom sandwich mode,
-// select lettuce (assuming the first entry in the filling list), then select two herbs (two sweets, bitter sweet or salty sweet) in the end
-// of the condiments list. The location of herbs are set by `xxx_herb_index_last`:
-// if a herb is the last entry, set `xxx_herb_index_last` to 0;
-// if a herb is second to last, set `xxx_herb_index_last` to 1; ...
-// It will use the first sandwich pick in the sandwich pick selection list.
-// After entering sandiwich mini game, it will drop the filling to quickly make a two-herb only sandwich to gain egg power lv 3.
-void make_two_herbs_sandwich(
-    const ProgramInfo& info, AsyncDispatcher& dispatcher, ConsoleHandle& console, BotBaseContext& context,
-    EggSandwichType sandwich_type, size_t sweet_herb_index_last, size_t salty_herb_index_last, size_t bitter_herb_index_last
-);
-// Assuming starting at the custom sandwich mode,
-// select lettuce and two herbs (two sweets, bitter sweet or salty sweet according to `sandwich_type`).
-// It will use the first sandwich pick in the sandwich pick selection list.
-// After entering sandiwich mini game, it will drop the filling to quickly make a two-herb only sandwich to gain egg power lv 3.
-void make_two_herbs_sandwich(
-    const ProgramInfo& info, AsyncDispatcher& dispatcher, ConsoleHandle& console, BotBaseContext& context,
-    EggSandwichType sandwich_type, Language language
-);
-
-// Assuming starting at the sandwich recipe list,
-// Make a custom sandwich as set in the sandwich maker options
-void run_sandwich_maker(SingleSwitchProgramEnvironment& env, BotBaseContext& context, SandwichMakerOption& SANDWICH_OPTIONS);
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSV/Programs/ShinyHunting/PokemonSV_AreaZeroPlatform.cpp b/SerialPrograms/Source/PokemonSV/Programs/ShinyHunting/PokemonSV_AreaZeroPlatform.cpp
deleted file mode 100644
index d028782461..0000000000
--- a/SerialPrograms/Source/PokemonSV/Programs/ShinyHunting/PokemonSV_AreaZeroPlatform.cpp
+++ /dev/null
@@ -1,533 +0,0 @@
-/*  Area Zero Platform
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <algorithm>
-#include <cmath>
-#include "Common/Cpp/PrettyPrint.h"
-#include "Kernels/Waterfill/Kernels_Waterfill_Session.h"
-//#include "CommonFramework/Exceptions/OperationFailedException.h"
-//#include "CommonFramework/ImageTools/ImageFilter.h"
-#include "CommonFramework/ImageTools/BinaryImage_FilterRgb32.h"
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "CommonFramework/Tools/ProgramEnvironment.h"
-#include "CommonFramework/Tools/ConsoleHandle.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_ScalarButtons.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonSV/Inference/Overworld/PokemonSV_AreaZeroSkyDetector.h"
-#include "PokemonSV/Programs/PokemonSV_AreaZero.h"
-#include "PokemonSV_LetsGoTools.h"
-#include "PokemonSV_AreaZeroPlatform.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-using namespace Pokemon;
-
-
-
-PlatformResetSettings::~PlatformResetSettings(){
-    ENCOUNTERS_IN_WINDOW.remove_listener(*this);
-    KILLS_IN_WINDOW0.remove_listener(*this);
-    WINDOW_IN_MINUTES.remove_listener(*this);
-}
-PlatformResetSettings::PlatformResetSettings()
-    : GroupOption("Platform Reset Conditions", LockWhileRunning::UNLOCKED, true, false)
-    , m_description(
-        "A \"Platform Reset\" is when you fly to Zero Gate, then return to the "
-        "platform. This is usually done to recover from falling off the "
-        "platform or to reset the spawns on the platform.<br><br>"
-        "The reason for resetting spawns is that over time, the " + STRING_POKEMON +
-        " can spawn in inaccessible places. When there are too few spawns, the "
-        "kill and encounter rates will drop to very inefficient levels. "
-        "Resetting the spawns will fix this, at the cost of also despawning any "
-        "shinies that have not yet been encountered."
-    )
-    , m_sliding_window("")
-    , WINDOW_IN_MINUTES(
-        "<b>Time Window (in minutes):</b><br>The sliding time window for which to watch for kills and encounters.",
-        LockWhileRunning::UNLOCKED,
-        10
-    )
-    , KILLS_IN_WINDOW0(
-        "<b>Kills in Window:</b><br>If the number of kills in the last X seconds has drops below this value, consider resetting.",
-        LockWhileRunning::UNLOCKED,
-        20
-    )
-    , ENCOUNTERS_IN_WINDOW(
-        "<b>Encounters in Window:</b><br>If the number of encounters in the last X seconds has drops below this value, consider resetting.",
-        LockWhileRunning::UNLOCKED,
-        5
-    )
-#if 0
-    , RESET_DURATION_MINUTES(
-        "<b>Reset Duration (minutes):</b><br>If you are resetting, reset the game every "
-        "this many minutes.",
-        LockWhileRunning::UNLOCKED,
-        180
-    )
-#endif
-{
-    PA_ADD_STATIC(m_description);
-
-    PA_ADD_STATIC(m_sliding_window);
-    PA_ADD_OPTION(WINDOW_IN_MINUTES);
-    PA_ADD_OPTION(KILLS_IN_WINDOW0);
-    PA_ADD_OPTION(ENCOUNTERS_IN_WINDOW);
-
-//    PA_ADD_OPTION(RESET_DURATION_MINUTES);
-
-    PlatformResetSettings::value_changed();
-
-    WINDOW_IN_MINUTES.add_listener(*this);
-    KILLS_IN_WINDOW0.add_listener(*this);
-    ENCOUNTERS_IN_WINDOW.add_listener(*this);
-}
-
-std::string int_to_text(size_t value, const std::string& unit){
-    std::string str = "<b><em>" + std::to_string(value) + "</em></b> ";
-    str += unit;
-    if (value != 1){
-        str += "s";
-    }
-    return str;
-}
-void PlatformResetSettings::value_changed(){
-    m_sliding_window.set_text(
-        "<font color=\"red\">Perform a platform reset if there are fewer than " + int_to_text(KILLS_IN_WINDOW0, "kill") +
-        " and " + int_to_text(ENCOUNTERS_IN_WINDOW, "encounter") +
-        " in the last " + int_to_text(WINDOW_IN_MINUTES, "minute") + ".</font>"
-    );
-}
-
-
-NavigatePlatformSettings::NavigatePlatformSettings()
-    : GroupOption("Navigate to Platform Settings", LockWhileRunning::UNLOCKED)
-    , m_description(
-        "These settings are used when traveling from Zero Gate to the platform. "
-        "This can happen either at program start or during a platform reset."
-    )
-    , HEAL_AT_STATION(
-        "<b>Heal at Station:</b><br>If you're passing through the station, take the opportunity to heal up.",
-        LockWhileRunning::UNLOCKED,
-        true
-    )
-    , STATION_ARRIVE_PAUSE_SECONDS(
-        "<b>Station Arrive Pause Time:</b><br>Pause for this many seconds after leaving the station. "
-        "This gives the game time to load and thus reduce the chance of lag affecting the flight path.",
-        LockWhileRunning::UNLOCKED,
-        1
-    )
-    , MIDAIR_PAUSE_TIME(
-        "<b>Mid-Air Pause Time:</b><br>Pause for this long before final approach to the platform. "
-        "Too small and you may crash into the wall above the platform or have reduced spawns. "
-        "Too large and you may undershoot the platform.",
-        LockWhileRunning::UNLOCKED,
-        TICKS_PER_SECOND,
-        "50"
-    )
-{
-    PA_ADD_STATIC(m_description);
-    PA_ADD_OPTION(HEAL_AT_STATION);
-    PA_ADD_OPTION(STATION_ARRIVE_PAUSE_SECONDS);
-    PA_ADD_OPTION(MIDAIR_PAUSE_TIME);
-}
-
-
-void inside_zero_gate_to_platform(
-    const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context,
-    NavigatePlatformSettings& settings
-){
-    inside_zero_gate_to_station(info, console, context, 2, settings.HEAL_AT_STATION);
-
-    context.wait_for(std::chrono::seconds(settings.STATION_ARRIVE_PAUSE_SECONDS));
-
-    //  Navigate to platform.
-#if 0
-    //  Don't jump to avoid spawn.
-    pbf_press_button(context, BUTTON_PLUS, 20, 105);
-    pbf_move_left_joystick(context, 128, 0, 625, 0);
-    ssf_press_button(context, BUTTON_B, 0, 50);
-    pbf_move_left_joystick(context, 128, 0, 250, 0);
-    pbf_move_left_joystick(context, 160, 0, 600, 0);
-    pbf_move_left_joystick(context, 128, 0, 1875, 0);
-#endif
-
-#if 0
-    //  Jump late.
-    pbf_press_button(context, BUTTON_PLUS, 20, 105);
-
-    ssf_press_joystick(context, true, 128, 0, 315, 500);
-
-    //  Jump
-    ssf_press_button(context, BUTTON_B, 125, 100);
-
-    //  Fly
-    ssf_press_button(context, BUTTON_B, 0, 50);
-
-    pbf_move_left_joystick(context, 144, 0, 1150, 0);
-    pbf_move_left_joystick(context, 128, 0, 125, NAVIGATE_TO_PLATFORM.MIDAIR_PAUSE_TIME);
-
-    pbf_move_left_joystick(context, 128, 0, 1375, 250);
-#endif
-
-#if 0
-    //  Jump earlier.
-    pbf_press_button(context, BUTTON_PLUS, 20, 105);
-
-    ssf_press_joystick(context, true, 128, 0, 280, 500);
-
-    //  Jump
-    ssf_press_button(context, BUTTON_B, 125, 100);
-
-    //  Fly
-    ssf_press_button(context, BUTTON_B, 0, 50);
-
-    pbf_move_left_joystick(context, 144, 0, 1150, 0);
-    pbf_move_left_joystick(context, 128, 0, 125, NAVIGATE_TO_PLATFORM.MIDAIR_PAUSE_TIME);
-
-    pbf_move_left_joystick(context, 128, 0, 1375, 250);
-#endif
-
-#if 1
-    //  Jump on the downhill to improve chance of clearing things.
-    pbf_move_left_joystick(context, 192, 0, 20, 105);
-    pbf_press_button(context, BUTTON_L | BUTTON_PLUS, 20, 105);
-
-    ssf_press_button(context, BUTTON_LCLICK, 0, 500);
-    ssf_press_left_joystick(context, 128, 0, 125, 1250);
-
-    //  Jump
-    ssf_press_button(context, BUTTON_B, 125, 100);
-
-    //  Fly
-    ssf_press_button(context, BUTTON_B, 0, 20, 10); //  Double up this press in
-    ssf_press_button(context, BUTTON_B, 0, 20);     //  case one is dropped.
-
-    pbf_move_left_joystick(context, 144, 0, 700, 0);
-    pbf_move_left_joystick(context, 128, 0, 125, settings.MIDAIR_PAUSE_TIME);
-    pbf_move_left_joystick(context, 128, 0, 875, 250);
-#endif
-
-//    context.wait_for_all_requests();
-    pbf_press_button(context, BUTTON_PLUS, 20, 105);
-    ssf_press_left_joystick(context, 128, 0, 1 * TICKS_PER_SECOND, 4 * TICKS_PER_SECOND);
-    pbf_press_button(context, BUTTON_R, 20, 355);
-    pbf_press_button(context, BUTTON_R, 20, 105);
-}
-
-
-bool read_platform_center(
-    double& x, double& y,
-    const ProgramInfo& info, ConsoleHandle& console
-){
-    using namespace Kernels::Waterfill;
-
-    VideoSnapshot screen = console.video().snapshot();
-    if (!screen){
-        return false;
-    }
-
-    PackedBinaryMatrix matrix = compress_rgb32_to_binary_range(screen, 0xff000040, 0xff8080ff);
-
-//    size_t min_width = screen.width() / 4;
-//    size_t min_height = screen.height() / 4;
-
-    WaterfillObject biggest;
-    WaterfillObject object;
-
-    std::unique_ptr<WaterfillSession> session = make_WaterfillSession(matrix);
-    size_t min_area = screen->width() * screen->height() / 10;
-    auto iter = session->make_iterator(min_area);
-    while (iter->find_next(object, false)){
-//        if (object.min_y != 0){
-//            continue;
-//        }
-        if (biggest.area < object.area){
-            biggest = std::move(object);
-        }
-    }
-
-    if (biggest.area == 0){
-        return false;
-    }
-
-    x = biggest.center_of_gravity_x() / screen->width();
-    y = biggest.center_of_gravity_y() / screen->height();
-
-    return true;
-}
-
-
-
-void area_zero_platform_run_path0(
-    ProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context,
-    LetsGoEncounterBotTracker& tracker,
-    uint64_t iteration_count
-){
-    //  Go back to the wall.
-    console.log("Go back to wall...");
-    clear_in_front(console, context, tracker, false, [&](BotBaseContext& context){
-        find_and_center_on_sky(env, console, context);
-        pbf_move_right_joystick(context, 128, 255, 80, 0);
-        pbf_move_left_joystick(context, 176, 255, 30, 0);
-        pbf_press_button(context, BUTTON_L, 20, 50);
-    });
-
-    clear_in_front(console, context, tracker, false, [&](BotBaseContext& context){
-        //  Move to wall.
-        pbf_move_left_joystick(context, 128, 0, 4 * TICKS_PER_SECOND, 0);
-
-        //  Turn around.
-        console.log("Turning towards sky...");
-        pbf_move_left_joystick(context, 128, 255, 30, 95);
-        pbf_press_button(context, BUTTON_L, 20, 50);
-    });
-
-    //  Move forward and kill everything in your path.
-    console.log("Moving towards sky and killing everything...");
-    uint16_t duration = 325;
-    clear_in_front(console, context, tracker, true, [&](BotBaseContext& context){
-        find_and_center_on_sky(env, console, context);
-        pbf_move_right_joystick(context, 128, 255, 70, 0);
-
-        uint8_t x = 128;
-        switch (iteration_count % 4){
-        case 0:
-            x = 96;
-            duration = 250;
-            break;
-        case 1:
-            x = 112;
-            break;
-        case 2:
-            x = 128;
-            break;
-        case 3:
-            x = 112;
-            break;
-        }
-
-        ssf_press_button(context, BUTTON_L, 0, 20);
-        pbf_move_left_joystick(context, x, 0, duration, 0);
-    });
-    clear_in_front(console, context, tracker, true, [&](BotBaseContext& context){
-        pbf_move_left_joystick(context, 128, 255, duration, 4 * TICKS_PER_SECOND);
-    });
-}
-void area_zero_platform_run_path1(
-    ProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context,
-    LetsGoEncounterBotTracker& tracker,
-    uint64_t iteration_count
-){
-    //  Go back to the wall.
-    console.log("Go back to wall...");
-    pbf_press_button(context, BUTTON_L, 20, 105);
-    clear_in_front(console, context, tracker, true, [&](BotBaseContext& context){
-        find_and_center_on_sky(env, console, context);
-        pbf_move_right_joystick(context, 128, 255, 80, 0);
-        pbf_move_left_joystick(context, 192, 255, 60, 0);
-    });
-
-    //  Clear path to the wall.
-    console.log("Clear path to the wall...");
-    pbf_press_button(context, BUTTON_L, 20, 50);
-    clear_in_front(console, context, tracker, false, [&](BotBaseContext& context){
-        pbf_move_left_joystick(context, 128, 0, 5 * TICKS_PER_SECOND, 0);
-
-        //  Turn right.
-        pbf_move_left_joystick(context, 255, 128, 30, 0);
-        pbf_press_button(context, BUTTON_L, 20, 50);
-    });
-
-    //  Clear the wall.
-    console.log("Clear the wall...");
-    uint16_t duration = 325;
-    clear_in_front(console, context, tracker, true, [&](BotBaseContext& context){
-        pbf_move_left_joystick(context, 255, 128, 125, 0);
-        pbf_press_button(context, BUTTON_L, 20, 50);
-        context.wait_for_all_requests();
-
-        find_and_center_on_sky(env, console, context);
-        pbf_move_left_joystick(context, 128, 0, 50, 0);
-        pbf_press_button(context, BUTTON_L, 20, 30);
-
-        //  Move forward.
-
-        uint8_t x = 128;
-        switch (iteration_count % 4){
-        case 0:
-            x = 96;
-            duration = 250;
-            break;
-        case 1:
-            x = 112;
-            break;
-        case 2:
-            x = 128;
-            break;
-        case 3:
-            x = 112;
-            break;
-        }
-
-        pbf_move_left_joystick(context, x, 0, duration, 0);
-    });
-
-    console.log("Run backwards and wait...");
-    clear_in_front(console, context, tracker, true, [&](BotBaseContext& context){
-//        pbf_move_left_joystick(context, 64, 0, 125, 0);
-//        pbf_press_button(context, BUTTON_L, 20, 105);
-        pbf_move_left_joystick(context, 128, 255, duration, 4 * TICKS_PER_SECOND);
-//        pbf_controller_state(context, 0, DPAD_NONE, 255, 255, 120, 128, 3 * TICKS_PER_SECOND);
-    });
-}
-
-
-void direction_to_stick(
-    uint8_t& joystick_x, uint8_t& joystick_y,
-    double direction_x, double direction_y
-){
-//    cout << "direction = " << direction_x << ", " << direction_y << endl;
-
-    double scale = std::max(std::abs(direction_x), std::abs(direction_y));
-    direction_x = 128 / scale * direction_x + 128;
-    direction_y = 128 / scale * direction_y + 128;
-
-//    cout << "joystick = " << direction_x << ", " << direction_y << endl;
-
-    direction_x = std::min(direction_x, 255.);
-    direction_x = std::max(direction_x, 0.);
-    direction_y = std::min(direction_y, 255.);
-    direction_y = std::max(direction_y, 0.);
-
-    joystick_x = (uint8_t)direction_x;
-    joystick_y = (uint8_t)direction_y;
-}
-void choose_path(
-    Logger& logger,
-    uint8_t& x, uint8_t& y, uint16_t& duration,
-    double platform_x, double platform_y
-){
-    double diff_x = platform_x - 0.62;
-    double diff_y = platform_y - 0.71;
-
-    logger.log("Move Direction: x = " + tostr_default(diff_x) + ", y = " + tostr_default(diff_y), COLOR_BLUE);
-
-    direction_to_stick(x, y, diff_x, diff_y);
-    duration = (uint16_t)std::min<double>(std::sqrt(diff_x*diff_x + diff_y*diff_y) * 125 * 12, 400);
-}
-void turn_angle(BotBaseContext& context, double angle_radians){
-    uint8_t turn_x, turn_y;
-    direction_to_stick(turn_x, turn_y, -std::sin(angle_radians), std::cos(angle_radians));
-    pbf_move_left_joystick(context, turn_x, turn_y, 40, 20);
-    pbf_mash_button(context, BUTTON_L, 60);
-}
-
-void area_zero_platform_run_path2(
-    ProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context,
-    LetsGoEncounterBotTracker& tracker,
-    uint64_t iteration_count
-){
-    console.log("Look forward and fire...");
-    pbf_mash_button(context, BUTTON_L, 60);
-
-    double platform_x, platform_y;
-    uint16_t duration;
-    uint8_t move_x, move_y;
-    clear_in_front(console, context, tracker, true, [&](BotBaseContext& context){
-
-        console.log("Find the sky, turn around and fire.");
-        pbf_move_right_joystick(context, 128, 0, 60, 0);
-        find_and_center_on_sky(env, console, context);
-        context.wait_for(std::chrono::seconds(1));
-        pbf_move_left_joystick(context, 128, 255, 40, 85);
-        pbf_mash_button(context, BUTTON_L, 60);
-
-        pbf_move_right_joystick(context, 128, 255, 250, 0);
-        context.wait_for_all_requests();
-
-        console.log("Finding center of platform...");
-        if (!read_platform_center(platform_x, platform_y, env.program_info(), console)){
-            console.log("Unable to find center of platform.", COLOR_RED);
-            return;
-        }
-        console.log("Platform center at: x = " + tostr_default(platform_x) + ", y = " + tostr_default(platform_y), COLOR_BLUE);
-
-        choose_path(console, move_x, move_y, duration, platform_x, platform_y);
-
-        pbf_move_left_joystick(context, move_x, move_y, 40, 20);
-        pbf_mash_button(context, BUTTON_L, 60);
-//        pbf_wait(context, 1250);
-    });
-    clear_in_front(console, context, tracker, duration > 100, [&](BotBaseContext& context){
-        console.log("Making location correction...");
-        pbf_move_left_joystick(context, 128, 0, duration, 0);
-
-        //  Optimization, calculate angle to aim you back at the sky.
-        //  This speeds up the "find_and_center_on_sky()" call.
-        double angle0 = std::atan2(move_x - 128., 128. - move_y);
-        double angle1 = angle0 >= 0 ? 6.2831853071795864769 - angle0 : -6.2831853071795864769 - angle0;
-        turn_angle(context, angle1);
-
-        find_and_center_on_sky(env, console, context);
-        pbf_move_left_joystick(context, 96, 0, 40, 0);
-        pbf_mash_button(context, BUTTON_L, 60);
-    });
-
-    //  One in every 4 iterations: Clear wall of spawns.
-    if (iteration_count % 4 == 0){
-        console.log("Turning along wall...");
-        pbf_move_left_joystick(context, 0, 255, 20, 20);
-        pbf_mash_button(context, BUTTON_L, 60);
-        clear_in_front(console, context, tracker, true, [&](BotBaseContext& context){
-            context.wait_for(std::chrono::milliseconds(1000));
-
-            console.log("Turning back to sky.");
-            pbf_move_left_joystick(context, 255, 255, 20, 20);
-            pbf_mash_button(context, BUTTON_L, 60);
-            find_and_center_on_sky(env, console, context);
-            pbf_move_left_joystick(context, 96, 0, 40, 0);
-            pbf_mash_button(context, BUTTON_L, 60);
-        });
-    }
-
-    if (platform_x < 0.5 || platform_y < 0.5){
-        console.log("Not close enough to desired spot. Skipping forward attack...", COLOR_ORANGE);
-        return;
-    }
-
-    clear_in_front(console, context, tracker, true, [&](BotBaseContext& context){
-        console.log("Move forward, fire, and retreat.");
-        switch (iteration_count % 3){
-        case 0:
-            pbf_move_left_joystick(context, 108, 0, 300, 0);
-            break;
-        case 1:
-            pbf_move_left_joystick(context, 128, 0, 300, 0);
-            break;
-        case 2:
-            pbf_move_left_joystick(context, 144, 0, 300, 0);
-            break;
-        }
-    });
-
-    clear_in_front(console, context, tracker, true, [&](BotBaseContext& context){
-        pbf_move_left_joystick(context, 128, 255, 4 * TICKS_PER_SECOND, 0);
-        pbf_move_left_joystick(context, 128, 0, 60, 4 * TICKS_PER_SECOND);
-    });
-}
-
-
-
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSV/Programs/ShinyHunting/PokemonSV_AreaZeroPlatform.h b/SerialPrograms/Source/PokemonSV/Programs/ShinyHunting/PokemonSV_AreaZeroPlatform.h
deleted file mode 100644
index 42a1b18839..0000000000
--- a/SerialPrograms/Source/PokemonSV/Programs/ShinyHunting/PokemonSV_AreaZeroPlatform.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/*  Area Zero Platform
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSV_AreaZeroPlatform_H
-#define PokemonAutomation_PokemonSV_AreaZeroPlatform_H
-
-#include "Common/Cpp/Options/GroupOption.h"
-#include "Common/Cpp/Options/StaticTextOption.h"
-#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
-#include "Common/Cpp/Options/SimpleIntegerOption.h"
-#include "Common/Cpp/Options/TimeExpressionOption.h"
-
-namespace PokemonAutomation{
-    struct ProgramInfo;
-    class BotBaseContext;
-    class ConsoleHandle;
-    class ProgramEnvironment;
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-class LetsGoEncounterBotTracker;
-
-
-class PlatformResetSettings : public GroupOption, private ConfigOption::Listener{
-public:
-    ~PlatformResetSettings();
-    PlatformResetSettings();
-
-private:
-    virtual void value_changed() override;
-
-public:
-    StaticTextOption m_description;
-    StaticTextOption m_sliding_window;
-    SimpleIntegerOption<uint16_t> WINDOW_IN_MINUTES;
-    SimpleIntegerOption<uint16_t> KILLS_IN_WINDOW0;
-    SimpleIntegerOption<uint16_t> ENCOUNTERS_IN_WINDOW;
-//    SimpleIntegerOption<uint16_t> RESET_DURATION_MINUTES;
-};
-
-
-
-
-class NavigatePlatformSettings : public GroupOption{
-public:
-    NavigatePlatformSettings();
-
-public:
-    StaticTextOption m_description;
-    BooleanCheckBoxOption HEAL_AT_STATION;
-    SimpleIntegerOption<uint16_t> STATION_ARRIVE_PAUSE_SECONDS;
-    TimeExpressionOption<uint16_t> MIDAIR_PAUSE_TIME;
-};
-
-void inside_zero_gate_to_platform(
-    const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context,
-    NavigatePlatformSettings& settings
-);
-
-
-
-
-bool read_platform_center(
-    double& x, double& y,
-    const ProgramInfo& info, ConsoleHandle& console
-);
-
-
-
-
-void area_zero_platform_run_path0(
-    ProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context,
-    LetsGoEncounterBotTracker& tracker,
-    uint64_t iteration_count
-);
-void area_zero_platform_run_path1(
-    ProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context,
-    LetsGoEncounterBotTracker& tracker,
-    uint64_t iteration_count
-);
-void area_zero_platform_run_path2(
-    ProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context,
-    LetsGoEncounterBotTracker& tracker,
-    uint64_t iteration_count
-);
-
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSV/Programs/ShinyHunting/PokemonSV_LetsGoTools.cpp b/SerialPrograms/Source/PokemonSV/Programs/ShinyHunting/PokemonSV_LetsGoTools.cpp
deleted file mode 100644
index e7e4ac2c05..0000000000
--- a/SerialPrograms/Source/PokemonSV/Programs/ShinyHunting/PokemonSV_LetsGoTools.cpp
+++ /dev/null
@@ -1,375 +0,0 @@
-/*  Let's Go Tools
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <algorithm>
-#include "CommonFramework/Logging/Logger.h"
-#include "CommonFramework/Exceptions/ProgramFinishedException.h"
-#include "CommonFramework/Exceptions/OperationFailedException.h"
-#include "CommonFramework/Exceptions/FatalProgramException.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
-#include "CommonFramework/Tools/ProgramEnvironment.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-//#include "Pokemon/Pokemon_Strings.h"
-#include "Pokemon/Pokemon_Notification.h"
-#include "PokemonSV/Options/PokemonSV_EncounterBotCommon.h"
-#include "PokemonSV/Inference/PokemonSV_SweatBubbleDetector.h"
-//#include "PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h"
-#include "PokemonSV/Programs/PokemonSV_Battles.h"
-#include "PokemonSV/Programs/PokemonSV_BasicCatcher.h"
-#include "PokemonSV_LetsGoTools.h"
-
-//#include <iostream>
-//using std::cout;
-//using std::endl;
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-using namespace Pokemon;
-
-
-
-EncounterRateTracker::EncounterRateTracker()
-    : m_start_time(current_time())
-{}
-bool EncounterRateTracker::get_encounters_in_window(
-    size_t& kills, size_t& encounters,
-    std::chrono::seconds time_window
-){
-    WallClock now = current_time();
-    WallClock threshold = now - time_window;
-
-    size_t index = std::lower_bound(m_kill_history.begin(), m_kill_history.end(), threshold) - m_kill_history.begin();
-//    cout << "kills index = " << index << endl;
-    kills = m_kill_history.size() - index;
-
-    index = std::lower_bound(m_encounter_history.begin(), m_encounter_history.end(), threshold) - m_encounter_history.begin();
-//    cout << "encounters index = " << index << endl;
-    encounters = m_encounter_history.size() - index;
-
-    return m_start_time <= threshold;
-}
-void EncounterRateTracker::report_start(WallClock now){
-    m_start_time = now;
-}
-void EncounterRateTracker::report_kill(){
-    WallClock now = current_time();
-    if (m_kill_history.empty() || m_kill_history.back() < now){
-        m_kill_history.push_back(now);
-        return;
-    }
-
-    global_logger_tagged().log(
-        "EncounterRateTracker: Detected that time has travelled backwards. Clearing history.",
-        COLOR_RED
-    );
-
-    m_kill_history.clear();
-    m_encounter_history.clear();
-    m_start_time = now;
-
-    m_kill_history.push_back(now);
-}
-void EncounterRateTracker::report_encounter(){
-    WallClock now = current_time();
-    if (m_encounter_history.empty() || m_encounter_history.back() < now){
-        m_encounter_history.push_back(now);
-        return;
-    }
-
-    global_logger_tagged().log(
-        "EncounterRateTracker: Detected that time has travelled backwards. Clearing history.",
-        COLOR_RED
-    );
-
-    m_kill_history.clear();
-    m_encounter_history.clear();
-    m_start_time = now;
-
-    m_encounter_history.push_back(now);
-}
-
-
-
-
-WallDuration DiscontiguousTimeTracker::last_window_in_realtime(
-    WallClock realtime_end,
-    WallDuration last_window_in_virtual_time
-){
-    if (m_blocks.empty()){
-        return WallDuration::zero();
-    }
-
-    WallDuration remaining(last_window_in_virtual_time);
-
-    auto iter = m_blocks.rbegin();
-    WallClock start;
-
-    do{
-        WallDuration block = iter->second - iter->first;
-        if (remaining > block){
-            remaining -= block;
-            start = iter->first;
-        }else{
-            start = iter->second - remaining;
-            return realtime_end - start;
-        }
-        ++iter;
-    }while (iter != m_blocks.rend());
-
-    return WallDuration::zero();
-}
-
-void DiscontiguousTimeTracker::add_block(WallClock start, WallClock end){
-    if (end <= start){
-        global_logger_tagged().log(
-            "DiscontiguousTimeTracker: Dropping invalid time block.",
-            COLOR_RED
-        );
-        return;
-    }
-    if (m_blocks.empty() || start >= m_blocks.back().second){
-        m_blocks.emplace_back(start, end);
-        return;
-    }
-    global_logger_tagged().log(
-        "DiscontiguousTimeTracker: Detected that time has travelled backwards. Clearing history.",
-        COLOR_RED
-    );
-    m_blocks.clear();
-    return;
-}
-
-
-
-
-
-
-LetsGoEncounterBotTracker::LetsGoEncounterBotTracker(
-    ProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context,
-    LetsGoEncounterBotStats& stats,
-    OCR::LanguageOCROption& language
-)
-    : m_env(env)
-    , m_console(console)
-    , m_context(context)
-    , m_stats(stats)
-    , m_language(language)
-    , m_kill_sound(console, [&](float){
-        console.log("Detected kill.");
-        m_encounter_rate.report_kill();
-        stats.m_kills++;
-        env.update_stats();
-        return false;
-    })
-    , m_session(context, console, {m_kill_sound})
-{}
-bool LetsGoEncounterBotTracker::process_battle(EncounterWatcher& watcher, EncounterBotCommonOptions& settings){
-    m_encounter_rate.report_encounter();
-    m_stats.m_encounters++;
-
-    Language language = m_language;
-
-    std::set<std::string> slugs;
-    if (language != Language::None){
-        slugs = read_singles_opponent(m_env.program_info(), m_console, m_context, language);
-        m_encounter_frequencies += slugs;
-        m_env.log(m_encounter_frequencies.dump_sorted_map("Encounter Stats:\n"));
-    }
-
-    bool is_shiny = (bool)watcher.shiny_screenshot();
-    if (is_shiny){
-        m_stats.m_shinies++;
-        if (settings.VIDEO_ON_SHINY){
-            m_context.wait_for(std::chrono::seconds(3));
-            pbf_press_button(m_context, BUTTON_CAPTURE, 2 * TICKS_PER_SECOND, 0);
-        }
-    }
-    m_env.update_stats();
-
-    send_encounter_notification(
-        m_env,
-        settings.NOTIFICATION_NONSHINY,
-        settings.NOTIFICATION_SHINY,
-        language != Language::None,
-        is_shiny,
-        {{slugs, is_shiny ? ShinyType::UNKNOWN_SHINY : ShinyType::NOT_SHINY}},
-        watcher.lowest_error_coefficient(),
-        watcher.shiny_screenshot(),
-        &m_encounter_frequencies
-    );
-
-    //  Set default action: stop program if shiny, otherwise run away.
-    EncounterActionsEntry action;
-    action.action = is_shiny
-        ? EncounterActionsAction::STOP_PROGRAM
-        : EncounterActionsAction::RUN_AWAY;
-
-    //  Iterate the actions table. If found an entry matches the pokemon species,
-    //  set the action to be what specified in the entry.
-    for (EncounterActionsEntry& entry : settings.ACTIONS_TABLE.snapshot()){
-        if (language == Language::None){
-            throw UserSetupError(m_console, "You must set the game language to use the actions table.");
-        }
-
-        //  See if Pokemon name matches.
-        auto iter = slugs.find(entry.pokemon);
-        if (iter == slugs.end()){
-            continue;
-        }
-
-        switch (entry.shininess){
-        case EncounterActionsShininess::ANYTHING:
-            break;
-        case EncounterActionsShininess::NOT_SHINY:
-            if (is_shiny){
-                continue;
-            }
-            break;
-        case EncounterActionsShininess::SHINY:
-            if (!is_shiny){
-                continue;
-            }
-            break;
-        }
-
-        action = std::move(entry);
-    }
-
-    //  Run the chosen action.
-    switch (action.action){
-    case EncounterActionsAction::RUN_AWAY:
-        try{
-            run_from_battle(m_env.program_info(), m_console, m_context);
-        }catch (OperationFailedException& e){
-            throw FatalProgramException(std::move(e));
-        }
-        return false;
-    case EncounterActionsAction::STOP_PROGRAM:
-        throw ProgramFinishedException();
-//        throw ProgramFinishedException(m_console, "", true);
-    case EncounterActionsAction::THROW_BALLS:
-    case EncounterActionsAction::THROW_BALLS_AND_SAVE:
-        if (language == Language::None){
-            throw InternalProgramError(&m_console.logger(), PA_CURRENT_FUNCTION, "Language is not set.");
-        }
-
-        CatchResults result = basic_catcher(
-            m_console, m_context,
-            language, action.ball,
-            settings.USE_FIRST_MOVE_IF_CANNOT_THROW_BALL
-        );
-        send_catch_notification(
-            m_env,
-            settings.NOTIFICATION_CATCH_SUCCESS,
-            settings.NOTIFICATION_CATCH_FAILED,
-            &slugs,
-            action.ball,
-            result.balls_used,
-            result.result
-        );
-
-        switch (result.result){
-        case CatchResult::POKEMON_CAUGHT:
-        case CatchResult::POKEMON_FAINTED:
-            break;
-        default:
-            throw FatalProgramException(
-                ErrorReport::NO_ERROR_REPORT, m_console,
-                "Unable to recover from failed catch.",
-                true
-            );
-        }
-
-        return result.result == CatchResult::POKEMON_CAUGHT && action.action == EncounterActionsAction::THROW_BALLS_AND_SAVE;
-    }
-
-    return false;
-}
-
-
-
-
-
-
-
-bool clear_in_front(
-    ConsoleHandle& console, BotBaseContext& context,
-    LetsGoEncounterBotTracker& tracker,
-    bool throw_ball_if_bubble,
-    std::function<void(BotBaseContext& context)>&& command
-){
-//    ShinyHuntAreaZeroPlatform_Descriptor::Stats& stats = env.current_stats<ShinyHuntAreaZeroPlatform_Descriptor::Stats>();
-
-//    static int calls = 0;
-    console.log("Clearing what's in front with Let's Go...");
-//    cout << calls++ << endl;
-
-    SweatBubbleWatcher bubble(COLOR_GREEN);
-    int ret = run_until(
-        console, context,
-        [](BotBaseContext& context){
-            pbf_press_button(context, BUTTON_R, 20, 200);
-        },
-        {bubble}
-    );
-//    cout << "asdf" << endl;
-    if (ret == 0){
-        if (throw_ball_if_bubble){
-            console.log("Detected sweat bubble. Throwing ball...");
-            pbf_mash_button(context, BUTTON_ZR, 5 * TICKS_PER_SECOND);
-        }else{
-            console.log("Detected sweat bubble. Will not throw ball.");
-        }
-    }else{
-        console.log("Did not detect sweat bubble.");
-    }
-
-    WallClock last_kill = tracker.last_kill();
-    context.wait_for_all_requests();
-    std::chrono::seconds timeout(6);
-    while (true){
-        if (command){
-//            cout << "running command..." << endl;
-            command(context);
-            context.wait_for_all_requests();
-            command = nullptr;
-        }else{
-//            cout << "Waiting out... " << timeout.count() << " seconds" << endl;
-            context.wait_until(last_kill + timeout);
-        }
-//        timeout = std::chrono::seconds(3);
-        if (last_kill == tracker.last_kill()){
-//            cout << "no kill" << endl;
-            break;
-        }
-//        cout << "found kill" << endl;
-        last_kill = tracker.last_kill();
-    }
-    console.log("Nothing left to clear...");
-    return tracker.last_kill() != WallClock::min();
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSV/Programs/ShinyHunting/PokemonSV_LetsGoTools.h b/SerialPrograms/Source/PokemonSV/Programs/ShinyHunting/PokemonSV_LetsGoTools.h
deleted file mode 100644
index c0192500be..0000000000
--- a/SerialPrograms/Source/PokemonSV/Programs/ShinyHunting/PokemonSV_LetsGoTools.h
+++ /dev/null
@@ -1,190 +0,0 @@
-/*  Let's Go Tools
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSV_LetsGoTools_H
-#define PokemonAutomation_PokemonSV_LetsGoTools_H
-
-#include <deque>
-#include <atomic>
-#include "Common/Cpp/Time.h"
-//#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
-#include "CommonFramework/Options/LanguageOCROption.h"
-//#include "CommonFramework/Notifications/EventNotificationOption.h"
-#include "CommonFramework/InferenceInfra/InferenceSession.h"
-#include "CommonFramework/Tools/StatsTracking.h"
-#include "Pokemon/Pokemon_EncounterStats.h"
-#include "PokemonSV/Inference/Overworld/PokemonSV_LetsGoKillDetector.h"
-#include "PokemonSV/Inference/Battles/PokemonSV_EncounterWatcher.h"
-
-namespace PokemonAutomation{
-    class CancellableScope;
-    class BotBaseContext;
-    class ProgramEnvironment;
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-using namespace Pokemon;
-
-class EncounterBotCommonOptions;
-
-
-
-class EncounterRateTracker{
-public:
-    EncounterRateTracker();
-
-    WallClock start_time() const{
-        return m_start_time;
-    }
-
-    //  Get the # of encounters in the last specified time window.
-    //  Returns false if the history is less than the window.
-    bool get_encounters_in_window(
-        size_t& kills, size_t& encounters,
-        std::chrono::seconds time_window
-    );
-
-    void report_start(WallClock now = current_time());
-    void report_kill();
-    void report_encounter();
-
-private:
-    WallClock m_start_time;
-
-    //  Note that this keeps the entire history. Nothing is dropped. This is
-    //  fine since it's unlikely we'll have enough encounters in one run to
-    //  cause memory issues.
-    std::deque<WallClock> m_kill_history;
-    std::deque<WallClock> m_encounter_history;
-};
-
-
-
-//
-//  Consider a virtual timeline that starts and stops relative to the wall clock.
-//  Now you want to get the last X seconds of the virtual timeline, but on the
-//  wall clock instead. Because of the starts and stops, the last X seconds
-//  of virtual time will be less than the last X seconds of real time.
-//
-//  The use case here is the platform reset conditions. Resets are performed if
-//  the # of encounters in the last X time drops below Y. But only the time
-//  spent hunting for encounters should count. Time spent in battles or resets
-//  does not.
-//
-class DiscontiguousTimeTracker{
-public:
-    //  Returns zero if there is insufficient virtual time.
-    WallDuration last_window_in_realtime(
-        WallClock realtime_end,
-        WallDuration last_window_in_virtual_time
-    );
-
-    void add_block(WallClock start, WallClock end);
-
-private:
-    std::deque<std::pair<WallClock, WallClock>> m_blocks;
-};
-
-
-
-
-
-class LetsGoEncounterBotStats : public StatsTracker{
-public:
-    LetsGoEncounterBotStats()
-        : m_kills(m_stats["Kills"])
-        , m_encounters(m_stats["Encounters"])
-        , m_shinies(m_stats["Shinies"])
-    {
-        m_display_order.emplace_back("Kills");
-        m_display_order.emplace_back("Encounters");
-        m_display_order.emplace_back("Shinies");
-    }
-
-public:
-    std::atomic<uint64_t>& m_kills;
-    std::atomic<uint64_t>& m_encounters;
-    std::atomic<uint64_t>& m_shinies;
-};
-
-
-
-
-
-//  Used to track Let's Go kill chain progress, stats.
-//  It can also run `process_battle()` to handle pokemon battle encounters (turn-based battles)
-//  according to user options.
-class LetsGoEncounterBotTracker{
-public:
-    LetsGoEncounterBotTracker(
-        ProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context,
-        LetsGoEncounterBotStats& stats,
-        OCR::LanguageOCROption& language
-    );
-
-    WallClock encounter_rate_tracker_start_time() const{
-        return m_encounter_rate.start_time();
-    }
-    WallClock last_kill() const{
-        return m_kill_sound.last_kill();
-    }
-    const EncounterFrequencies& encounter_frequencies() const{
-        return m_encounter_frequencies;
-    }
-
-    //  Get the # of encounters in the last specified time window.
-    //  Returns false if the history is less than the window.
-    bool get_encounters_in_window(
-        size_t& kills, size_t& encounters,
-        std::chrono::seconds time_window
-    ){
-        return m_encounter_rate.get_encounters_in_window(kills, encounters, time_window);
-    }
-    void reset_rate_tracker_start_time(){
-        m_encounter_rate.report_start();
-    }
-
-    //  Returns true if you should save the game.
-    bool process_battle(EncounterWatcher& watcher, EncounterBotCommonOptions& settings);
-
-
-private:
-    ProgramEnvironment& m_env;
-    ConsoleHandle& m_console;
-    BotBaseContext& m_context;
-    LetsGoEncounterBotStats& m_stats;
-
-    OCR::LanguageOCROption& m_language;
-
-    EncounterRateTracker m_encounter_rate;
-    EncounterFrequencies m_encounter_frequencies;
-
-    LetsGoKillSoundDetector m_kill_sound;
-    InferenceSession m_session;
-};
-
-
-
-
-//  Send your Pokemon out in front in Let's Go. Then run the specified command.
-//  Don't return until both the command has finished, and it appears the kill
-//  chain has ended.
-//  The function tracks kill chain by sound detection from `tracker`. The function
-//  does not handle any pokemon battle encounters (turn-based battles).
-bool clear_in_front(
-    ConsoleHandle& console, BotBaseContext& context,
-    LetsGoEncounterBotTracker& tracker,
-    bool throw_ball_if_bubble,
-    std::function<void(BotBaseContext& context)>&& command
-);
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSV/Programs/ShinyHunting/PokemonSV_ShinyHunt-AreaZeroPlatform.cpp b/SerialPrograms/Source/PokemonSV/Programs/ShinyHunting/PokemonSV_ShinyHunt-AreaZeroPlatform.cpp
deleted file mode 100644
index 4791a157d9..0000000000
--- a/SerialPrograms/Source/PokemonSV/Programs/ShinyHunting/PokemonSV_ShinyHunt-AreaZeroPlatform.cpp
+++ /dev/null
@@ -1,527 +0,0 @@
-/*  Shiny Hunt - Area Zero Platform
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <atomic>
-#include <sstream>
-#include "Common/Cpp/PrettyPrint.h"
-#include "CommonFramework/GlobalSettingsPanel.h"
-#include "CommonFramework/Exceptions/ProgramFinishedException.h"
-#include "CommonFramework/Exceptions/OperationFailedException.h"
-#include "CommonFramework/Exceptions/FatalProgramException.h"
-#include "CommonFramework/Notifications/ProgramNotifications.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
-#include "CommonFramework/Tools/StatsTracking.h"
-#include "CommonFramework/Tools/VideoResolutionCheck.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonSV/PokemonSV_Settings.h"
-#include "PokemonSV/Inference/Overworld/PokemonSV_LetsGoHpReader.h"
-#include "PokemonSV/Inference/Boxes/PokemonSV_IVCheckerReader.h"
-#include "PokemonSV/Inference/Battles/PokemonSV_EncounterWatcher.h"
-#include "PokemonSV/Programs/Eggs/PokemonSV_EggRoutines.h"
-#include "PokemonSV/Programs/PokemonSV_Navigation.h"
-#include "PokemonSV/Programs/PokemonSV_GameEntry.h"
-#include "PokemonSV/Programs/PokemonSV_SaveGame.h"
-#include "PokemonSV/Programs/PokemonSV_Battles.h"
-#include "PokemonSV/Programs/PokemonSV_AreaZero.h"
-#include "PokemonSV/Programs/Sandwiches/PokemonSV_SandwichRoutines.h"
-#include "PokemonSV_LetsGoTools.h"
-#include "PokemonSV_ShinyHunt-AreaZeroPlatform.h"
-
-//#include <iostream>
-//using std::cout;
-//using std::endl;
-#include <unordered_map>
-#include <algorithm>
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-using namespace Pokemon;
-
-ShinyHuntAreaZeroPlatform_Descriptor::ShinyHuntAreaZeroPlatform_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonSV:ShinyHuntAreaZeroPlatform",
-        STRING_POKEMON + " SV", "Shiny Hunt - Area Zero Platform",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonSV/ShinyHunt-AreaZeroPlatform.md",
-        "Shiny hunt the isolated platform at the bottom of Area Zero.",
-        FeedbackType::REQUIRED,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-struct ShinyHuntAreaZeroPlatform_Descriptor::Stats : public LetsGoEncounterBotStats{
-    Stats()
-        : m_sandwiches(m_stats["Sandwiches"])
-        , m_autoheals(m_stats["Auto Heals"])
-        , m_platform_resets(m_stats["Platform Resets"])
-        , m_game_resets(m_stats["Game Resets"])
-        , m_errors(m_stats["Errors"])
-    {
-        m_display_order.insert(m_display_order.begin() + 2, {"Sandwiches", true});
-        m_display_order.insert(m_display_order.begin() + 3, {"Auto Heals", true});
-        m_display_order.insert(m_display_order.begin() + 4, {"Platform Resets", true});
-        m_display_order.insert(m_display_order.begin() + 5, {"Game Resets", true});
-        m_display_order.insert(m_display_order.begin() + 6, {"Errors", true});
-    }
-    std::atomic<uint64_t>& m_sandwiches;
-    std::atomic<uint64_t>& m_autoheals;
-    std::atomic<uint64_t>& m_platform_resets;
-    std::atomic<uint64_t>& m_game_resets;
-    std::atomic<uint64_t>& m_errors;
-};
-std::unique_ptr<StatsTracker> ShinyHuntAreaZeroPlatform_Descriptor::make_stats() const{
-    return std::unique_ptr<StatsTracker>(new Stats());
-}
-
-
-
-
-ShinyHuntAreaZeroPlatform::~ShinyHuntAreaZeroPlatform(){
-    MODE.remove_listener(*this);
-}
-
-ShinyHuntAreaZeroPlatform::ShinyHuntAreaZeroPlatform()
-    : LANGUAGE(
-        "<b>Game Language:</b><br>Required to read " + STRING_POKEMON + " names.",
-        IV_READER().languages(),
-        LockWhileRunning::LOCKED,
-        false
-    )
-    , MODE(
-        "<b>Mode:</b><br>"
-        "If starting on the platform, you should stand near the center of the platform facing any direction.<br>"
-        "If starting in the Zero Gate, you should be just inside the building as if you just entered."
-        "<br>If making a sandwich, you should be at the Zero Gate fly spot as if you just flew there.",
-        {
-            {Mode::START_ON_PLATFORM,   "platform", "Start on platform."},
-            {Mode::START_IN_ZERO_GATE,  "zerogate", "Start inside Zero Gate."},
-            {Mode::MAKE_SANDWICH,       "sandwich", "Make a sandwich."},
-        },
-        LockWhileRunning::LOCKED,
-        Mode::START_ON_PLATFORM
-    )
-    , PATH0(
-        "<b>Path:</b><br>Traversal path on the platform to trigger encounters.",
-        {
-            {Path::PATH0, "path0", "Path 0"},
-            {Path::PATH1, "path1", "Path 1"},
-            {Path::PATH2, "path2", "Path 2"},
-        },
-        LockWhileRunning::UNLOCKED,
-        Path::PATH2
-    )
-    , SANDWICH_RESET_IN_MINUTES(
-        "<b>Sandwich Reset Time (in minutes):</b><br>The time to reset game to make a new sandwich.",
-        LockWhileRunning::UNLOCKED,
-        30
-    )
-    , SANDWICH_OPTIONS(LANGUAGE)
-    , GO_HOME_WHEN_DONE(true)
-    , AUTO_HEAL_PERCENT(
-        "<b>Auto-Heal %</b><br>Auto-heal if your HP drops below this percentage.",
-        LockWhileRunning::UNLOCKED,
-        75, 0, 100
-    )
-    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
-    , NOTIFICATIONS({
-        &NOTIFICATION_STATUS_UPDATE,
-        &ENCOUNTER_BOT_OPTIONS.NOTIFICATION_NONSHINY,
-        &ENCOUNTER_BOT_OPTIONS.NOTIFICATION_SHINY,
-        &ENCOUNTER_BOT_OPTIONS.NOTIFICATION_CATCH_SUCCESS,
-        &ENCOUNTER_BOT_OPTIONS.NOTIFICATION_CATCH_FAILED,
-        &NOTIFICATION_PROGRAM_FINISH,
-        &NOTIFICATION_ERROR_RECOVERABLE,
-        &NOTIFICATION_ERROR_FATAL,
-    })
-{
-    PA_ADD_OPTION(LANGUAGE);
-    PA_ADD_OPTION(MODE);
-    if (PreloadSettings::instance().DEVELOPER_MODE){
-        PA_ADD_OPTION(PATH0);
-    }
-    PA_ADD_OPTION(SANDWICH_RESET_IN_MINUTES);
-    PA_ADD_OPTION(SANDWICH_OPTIONS);
-    PA_ADD_OPTION(ENCOUNTER_BOT_OPTIONS);
-    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
-    PA_ADD_OPTION(AUTO_HEAL_PERCENT);
-    PA_ADD_OPTION(PLATFORM_RESET);
-    PA_ADD_OPTION(NAVIGATE_TO_PLATFORM);
-    PA_ADD_OPTION(NOTIFICATIONS);
-
-    ShinyHuntAreaZeroPlatform::value_changed();
-
-    MODE.add_listener(*this);
-}
-
-std::string ShinyHuntAreaZeroPlatform::check_validity() const{
-    std::string error = SingleSwitchProgramInstance::check_validity();
-    if (!error.empty()){
-        return error;
-    }
-    if (LANGUAGE == Language::None && MODE == Mode::MAKE_SANDWICH){
-        return "Sandwich mode requires selecting a language.";
-    }
-    return "";
-}
-void ShinyHuntAreaZeroPlatform::value_changed(){
-    ConfigOptionState state = MODE == Mode::MAKE_SANDWICH
-        ? ConfigOptionState::ENABLED
-        : ConfigOptionState::HIDDEN;
-    SANDWICH_RESET_IN_MINUTES.set_visibility(state);
-    SANDWICH_OPTIONS.set_visibility(state);
-}
-
-
-
-bool ShinyHuntAreaZeroPlatform::run_traversal(BotBaseContext& context){
-    ShinyHuntAreaZeroPlatform_Descriptor::Stats& stats = m_env->current_stats<ShinyHuntAreaZeroPlatform_Descriptor::Stats>();
-
-    const ProgramInfo& info = m_env->program_info();
-    ConsoleHandle& console = m_env->console;
-
-    if (m_pending_save){
-        save_game_from_overworld(info, console, context);
-        m_pending_save = false;
-        m_last_save = SavedLocation::AREA_ZERO;
-    }
-
-    double hp = m_hp_watcher->last_known_value() * 100;
-    if (0 < hp){
-        console.log("Last Known HP: " + tostr_default(hp) + "%", COLOR_BLUE);
-    }else{
-        console.log("Last Known HP: ?", COLOR_RED);
-    }
-    if (0 < hp && hp < AUTO_HEAL_PERCENT){
-        auto_heal_from_menu_or_overworld(info, console, context, 0, true);
-        stats.m_autoheals++;
-        m_env->update_stats();
-    }
-
-    WallClock start = current_time();
-
-    size_t kills, encounters;
-    std::chrono::minutes window_minutes(PLATFORM_RESET.WINDOW_IN_MINUTES);
-    WallDuration window = m_time_tracker->last_window_in_realtime(start, window_minutes);
-
-    std::chrono::seconds window_seconds;
-    bool enough_time;
-    if (window == WallDuration::zero()){
-        //  Not enough history.
-        enough_time = false;
-        window = start - m_encounter_tracker->encounter_rate_tracker_start_time();
-        window_seconds = std::chrono::duration_cast<Seconds>(window);
-        m_encounter_tracker->get_encounters_in_window(
-            kills, encounters, window_seconds
-        );
-    }else{
-        window_seconds = std::chrono::duration_cast<Seconds>(window);
-        enough_time = m_encounter_tracker->get_encounters_in_window(
-            kills, encounters, window_seconds
-        );
-    }
-    console.log(
-        "Starting Traversal Iteration: " + tostr_u_commas(m_iterations) +
-        "\n    Time Window (Seconds): " + std::to_string(window_seconds.count()) +
-        "\n    Kills: " + std::to_string(kills) +
-        "\n    Encounters: " + std::to_string(encounters)
-    );
-
-    do{
-        if (!PLATFORM_RESET.enabled()){
-            console.log("Platform Reset: Disabled", COLOR_ORANGE);
-            break;
-        }
-        if (!enough_time){
-            console.log("Platform Reset: Not enough time has elapsed.", COLOR_ORANGE);
-            break;
-        }
-        if (kills >= PLATFORM_RESET.KILLS_IN_WINDOW0){
-            console.log("Platform Reset: Enough kills in window.", COLOR_ORANGE);
-            break;
-        }
-        if (encounters >= PLATFORM_RESET.ENCOUNTERS_IN_WINDOW){
-            console.log("Platform Reset: Enough encounters in window.", COLOR_ORANGE);
-            break;
-        }
-
-        console.log("Conditions met for platform reset.");
-        m_state = State::LEAVE_AND_RETURN;
-        return false;
-    }while (false);
-
-    try{
-        switch (PATH0){
-        case Path::PATH0:
-            area_zero_platform_run_path0(*m_env, console, context, *m_encounter_tracker, m_iterations);
-            break;
-        case Path::PATH1:
-            area_zero_platform_run_path1(*m_env, console, context, *m_encounter_tracker, m_iterations);
-            break;
-        case Path::PATH2:
-            area_zero_platform_run_path2(*m_env, console, context, *m_encounter_tracker, m_iterations);
-            break;
-        }
-        m_iterations++;
-    }catch (...){
-        m_time_tracker->add_block(start, current_time());
-        throw;
-    }
-
-    m_time_tracker->add_block(start, current_time());
-
-    return true;
-}
-
-
-
-void ShinyHuntAreaZeroPlatform::run_state(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    ShinyHuntAreaZeroPlatform_Descriptor::Stats& stats = m_env->current_stats<ShinyHuntAreaZeroPlatform_Descriptor::Stats>();
-    const ProgramInfo& info = m_env->program_info();
-    ConsoleHandle& console = m_env->console;
-
-    send_program_notification(
-        *m_env, NOTIFICATION_STATUS_UPDATE,
-        Color(0),
-        "Program Status",
-        {}, m_encounter_tracker->encounter_frequencies().dump_sorted_map("")
-    );
-
-    WallClock now = current_time();
-    if (MODE == Mode::MAKE_SANDWICH && m_last_sandwich + std::chrono::minutes(SANDWICH_RESET_IN_MINUTES) < now){
-        m_state = State::RESET_SANDWICH;
-    }
-
-    State recovery_state = State::LEAVE_AND_RETURN;
-    try{
-        switch (m_state){
-        case State::TRAVERSAL:{
-            //  If we error out, recover using LEAVE_AND_RETURN.
-            recovery_state = State::LEAVE_AND_RETURN;
-
-            //  TODO: Wrap this with the sandwich timer cancel.
-            if (run_traversal(context)){
-                break;
-            }else{
-                return;
-            }
-        }
-        case State::INSIDE_GATE_AND_RETURN:
-            console.log("Going from inside gate to platform...");
-
-            //  If we error out, recover using LEAVE_AND_RETURN.
-            recovery_state = State::LEAVE_AND_RETURN;
-
-            inside_zero_gate_to_platform(info, console, context, NAVIGATE_TO_PLATFORM);
-            m_encounter_tracker->reset_rate_tracker_start_time();
-//            m_last_platform_reset = now;
-
-            break;
-
-        case State::LEAVE_AND_RETURN:
-            console.log("Leaving and returning to platform...");
-
-            //  If we error out, return to this state.
-            recovery_state = State::LEAVE_AND_RETURN;
-
-            return_to_inside_zero_gate(info, console, context);
-            inside_zero_gate_to_platform(info, console, context, NAVIGATE_TO_PLATFORM);
-
-            stats.m_platform_resets++;
-            m_encounter_tracker->reset_rate_tracker_start_time();
-//            m_last_platform_reset = now;
-            m_env->update_stats();
-
-            break;
-
-        case State::RESET_AND_RETURN:
-            console.log("Resetting game and returning to platform...");
-
-            //  If we error out, return to this state.
-            recovery_state = State::RESET_AND_RETURN;
-
-//            m_last_platform_reset = current_time();
-            pbf_press_button(context, BUTTON_HOME, 20, GameSettings::instance().GAME_TO_HOME_DELAY);
-            reset_game_from_home(info, console, context, 5 * TICKS_PER_SECOND);
-            pbf_press_button(context, BUTTON_RCLICK, 20, 105);
-
-            switch (m_last_save){
-            case SavedLocation::NONE:
-                throw InternalProgramError(&console.logger(), PA_CURRENT_FUNCTION, "Cannot reset with no previous save.");
-            case SavedLocation::ZERO_GATE_FLY_SPOT:
-                return_to_inside_zero_gate(info, console, context);
-                inside_zero_gate_to_platform(info, console, context, NAVIGATE_TO_PLATFORM);
-                break;
-            case SavedLocation::AREA_ZERO:
-                //  No further action needed as you're already on the platform.
-                break;
-            }
-
-            inside_zero_gate_to_platform(info, console, context, NAVIGATE_TO_PLATFORM);
-
-            stats.m_game_resets++;
-            m_encounter_tracker->reset_rate_tracker_start_time();
-//            m_last_platform_reset = now;
-            m_env->update_stats();
-
-            break;
-
-        case State::RESET_SANDWICH:
-            console.log("Resetting sandwich...");
-
-            switch (m_last_save){
-            case SavedLocation::NONE:
-            case SavedLocation::AREA_ZERO:
-                return_to_outside_zero_gate(info, console, context);
-                save_game_from_overworld(info, console, context);
-                console.log("Saving at Zero Gate...");
-                m_last_save = SavedLocation::ZERO_GATE_FLY_SPOT;
-                break;
-            case SavedLocation::ZERO_GATE_FLY_SPOT:
-                break;
-            }
-
-            recovery_state = State::LEAVE_AND_RETURN;
-
-            if (stats.m_sandwiches > 0) {
-                pbf_press_button(context, BUTTON_HOME, 20, GameSettings::instance().GAME_TO_HOME_DELAY);
-                reset_game_from_home(info, console, context, 5 * TICKS_PER_SECOND);
-                pbf_press_button(context, BUTTON_RCLICK, 20, 105);
-                stats.m_game_resets++;
-                m_env->update_stats();
-            };
-
-            // Open picnic and make sandwich
-            picnic_at_zero_gate(info, console, context);
-            picnic_from_overworld(info, console, context);
-            pbf_move_left_joystick(context, 128, 0, 30, 40);
-            enter_sandwich_recipe_list(info, console, context);
-
-            run_sandwich_maker(env, context, SANDWICH_OPTIONS);
-
-            leave_picnic(info, console, context);
-
-            // Return to platform
-            return_to_inside_zero_gate_from_picnic(info, console, context);
-            inside_zero_gate_to_platform(info, console, context, NAVIGATE_TO_PLATFORM);
-
-            console.log("Sandwich Reset: Starting new sandwich timer...");
-            m_last_sandwich = current_time();
-
-            stats.m_sandwiches++;
-            m_env->update_stats();
-
-            break;
-        }
-
-        //  No problems. Go back to traversals.
-        m_state = State::TRAVERSAL;
-        m_consecutive_failures = 0;
-
-    }catch (OperationFailedException& e){
-        stats.m_errors++;
-        m_env->update_stats();
-        m_consecutive_failures++;
-        m_state = recovery_state;
-        e.send_notification(*m_env, NOTIFICATION_ERROR_RECOVERABLE);
-        if (m_consecutive_failures >= 3){
-            throw FatalProgramException(
-                ErrorReport::SEND_ERROR_REPORT, console,
-                "Failed 3 times consecutively."
-            );
-        }
-    }
-}
-
-void ShinyHuntAreaZeroPlatform::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    m_env = &env;
-
-    ShinyHuntAreaZeroPlatform_Descriptor::Stats& stats = env.current_stats<ShinyHuntAreaZeroPlatform_Descriptor::Stats>();
-
-    assert_16_9_720p_min(env.logger(), env.console);
-
-//    pbf_press_button(context, BUTTON_RCLICK, 20, 105);
-
-    m_iterations = 0;
-
-    LetsGoHpWatcher hp_watcher(COLOR_RED);
-    m_hp_watcher = &hp_watcher;
-
-    DiscontiguousTimeTracker time_tracker;
-    m_time_tracker = &time_tracker;
-
-    LetsGoEncounterBotTracker encounter_tracker(
-        env, env.console, context,
-        stats,
-        LANGUAGE
-    );
-    m_encounter_tracker = &encounter_tracker;
-
-    switch (MODE){
-    case Mode::START_ON_PLATFORM:
-        m_state = State::TRAVERSAL;
-        break;
-    case Mode::START_IN_ZERO_GATE:
-        m_state = State::INSIDE_GATE_AND_RETURN;
-        break;
-    case Mode::MAKE_SANDWICH:
-        m_state = State::RESET_SANDWICH;
-        break;
-    }
-
-    m_pending_save = false;
-    m_last_save = SavedLocation::NONE;
-    m_last_sandwich = WallClock::min();
-
-    //  This is the outer-most program loop that wraps all logic with the
-    //  battle menu detector. If at any time you detect a battle menu, you break
-    //  all the way out here to handle the encounter. This is needed because you
-    //  can get attacked at almost any time while in Area Zero.
-    m_consecutive_failures = 0;
-    while (true){
-        env.console.log("Starting encounter loop...", COLOR_PURPLE);
-        EncounterWatcher encounter_watcher(env.console, COLOR_RED);
-        run_until(
-            env.console, context,
-            [&](BotBaseContext& context){
-                //  Inner program loop that runs the state machine.
-                while (true){
-                    run_state(env, context);
-                }
-            },
-            {
-                static_cast<VisualInferenceCallback&>(encounter_watcher),
-                static_cast<AudioInferenceCallback&>(encounter_watcher),
-                hp_watcher,
-            }
-        );
-        encounter_watcher.throw_if_no_sound();
-
-        env.console.log("Detected battle.", COLOR_PURPLE);
-        try{
-            bool should_save = encounter_tracker.process_battle(encounter_watcher, ENCOUNTER_BOT_OPTIONS);
-            if (should_save){
-                m_pending_save = should_save;
-            }
-        }catch (ProgramFinishedException&){
-            GO_HOME_WHEN_DONE.run_end_of_program(context);
-            throw;
-        }
-    }
-
-//    GO_HOME_WHEN_DONE.run_end_of_program(context);
-//    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
-}
-
-
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSV/Programs/ShinyHunting/PokemonSV_ShinyHunt-AreaZeroPlatform.h b/SerialPrograms/Source/PokemonSV/Programs/ShinyHunting/PokemonSV_ShinyHunt-AreaZeroPlatform.h
deleted file mode 100644
index 0101a18fa0..0000000000
--- a/SerialPrograms/Source/PokemonSV/Programs/ShinyHunting/PokemonSV_ShinyHunt-AreaZeroPlatform.h
+++ /dev/null
@@ -1,128 +0,0 @@
-/*  Shiny Hunt - Area Zero Platform
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSV_ShinyHuntAreaZeroPlatform_H
-#define PokemonAutomation_PokemonSV_ShinyHuntAreaZeroPlatform_H
-
-#include <functional>
-//#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
-//#include "Common/Cpp/Options/SimpleIntegerOption.h"
-#include "Common/Cpp/Options/FloatingPointOption.h"
-#include "Common/Cpp/Options/EnumDropdownOption.h"
-#include "CommonFramework/Options/LanguageOCROption.h"
-#include "CommonFramework/Notifications/EventNotificationsTable.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
-#include "PokemonSV/Options/PokemonSV_EncounterBotCommon.h"
-#include "PokemonSV/Options/PokemonSV_SandwichMakerOption.h"
-#include "PokemonSV_AreaZeroPlatform.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-class LetsGoHpWatcher;
-class DiscontiguousTimeTracker;
-class LetsGoEncounterBotTracker;
-
-
-
-class ShinyHuntAreaZeroPlatform_Descriptor : public SingleSwitchProgramDescriptor{
-public:
-    ShinyHuntAreaZeroPlatform_Descriptor();
-
-    struct Stats;
-    virtual std::unique_ptr<StatsTracker> make_stats() const override;
-};
-
-
-
-class ShinyHuntAreaZeroPlatform : public SingleSwitchProgramInstance, public ConfigOption::Listener{
-public:
-    ~ShinyHuntAreaZeroPlatform();
-    ShinyHuntAreaZeroPlatform();
-
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-    virtual std::string check_validity() const override;
-    virtual void value_changed() override;
-
-    enum class State{
-        TRAVERSAL,
-        INSIDE_GATE_AND_RETURN,
-        LEAVE_AND_RETURN,
-        RESET_AND_RETURN,
-        RESET_SANDWICH,
-    };
-
-    void run_state(SingleSwitchProgramEnvironment& env, BotBaseContext& context);
-
-    //  Returns true on success.
-    bool run_traversal(BotBaseContext& context);
-
-
-private:
-    OCR::LanguageOCROption LANGUAGE;
-
-    enum class Mode{
-        START_ON_PLATFORM,
-        START_IN_ZERO_GATE,
-        MAKE_SANDWICH,
-    };
-    EnumDropdownOption<Mode> MODE;
-
-    enum class Path{
-        PATH0,
-        PATH1,
-        PATH2,
-    };
-    EnumDropdownOption<Path> PATH0;
-
-    SimpleIntegerOption<uint16_t> SANDWICH_RESET_IN_MINUTES;
-    SandwichMakerOption SANDWICH_OPTIONS;
-
-    EncounterBotCommonOptions ENCOUNTER_BOT_OPTIONS;
-    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
-
-    PlatformResetSettings PLATFORM_RESET;
-    NavigatePlatformSettings NAVIGATE_TO_PLATFORM;
-    FloatingPointOption AUTO_HEAL_PERCENT;
-
-    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
-    EventNotificationsOption NOTIFICATIONS;
-
-    SingleSwitchProgramEnvironment* m_env;
-
-    LetsGoHpWatcher* m_hp_watcher;
-    DiscontiguousTimeTracker* m_time_tracker;
-    LetsGoEncounterBotTracker* m_encounter_tracker;
-
-    uint64_t m_iterations = 0;
-    State m_state;
-
-    //  Set to true if we should save on the first available opportunity.
-    bool m_pending_save;
-    enum class SavedLocation{
-        NONE,
-        ZERO_GATE_FLY_SPOT,
-        AREA_ZERO,
-    };
-    SavedLocation m_last_save;
-
-    WallClock m_last_sandwich;
-
-    size_t m_consecutive_failures;
-};
-
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSV/Programs/TeraRaids/PokemonSV_AutoHost.cpp b/SerialPrograms/Source/PokemonSV/Programs/TeraRaids/PokemonSV_AutoHost.cpp
deleted file mode 100644
index e896687846..0000000000
--- a/SerialPrograms/Source/PokemonSV/Programs/TeraRaids/PokemonSV_AutoHost.cpp
+++ /dev/null
@@ -1,400 +0,0 @@
-/*  Auto Host
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Cpp/PrettyPrint.h"
-#include "ClientSource/Connection/BotBase.h"
-#include "CommonFramework/Exceptions/OperationFailedException.h"
-//#include "CommonFramework/GlobalSettingsPanel.h"
-#include "CommonFramework/Notifications/ProgramNotifications.h"
-#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
-//#include "CommonFramework/InferenceInfra/InferenceSession.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
-#include "CommonFramework/Inference/BlackScreenDetector.h"
-//#include "CommonFramework/OCR/OCR_StringNormalization.h"
-#include "CommonFramework/Tools/StatsTracking.h"
-#include "CommonFramework/Tools/VideoResolutionCheck.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonSV/PokemonSV_Settings.h"
-#include "PokemonSV/Inference/Battles/PokemonSV_TeraBattleMenus.h"
-#include "PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h"
-#include "PokemonSV/Inference/Tera/PokemonSV_TeraCardDetector.h"
-#include "PokemonSV/Programs/PokemonSV_GameEntry.h"
-#include "PokemonSV/Programs/PokemonSV_ConnectToInternet.h"
-#include "PokemonSV/Programs/PokemonSV_Navigation.h"
-#include "PokemonSV/Programs/FastCodeEntry/PokemonSV_CodeEntry.h"
-#include "PokemonSV/Programs/TeraRaids/PokemonSV_TeraBattler.h"
-#include "PokemonSV/Programs/TeraRaids/PokemonSV_TeraRoutines.h"
-#include "PokemonSV_AutoHostTools.h"
-#include "PokemonSV_AutoHostLobbyWaiter.h"
-#include "PokemonSV_AutoHost.h"
-
-//#include <iostream>
-//using std::cout;
-//using std::endl;
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-using namespace Pokemon;
-
-
-AutoHost_Descriptor::AutoHost_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonSV:AutoHost",
-        STRING_POKEMON + " SV", "Auto-Host",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonSV/AutoHost.md",
-        "Auto-host a Tera raid.",
-        FeedbackType::REQUIRED,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-struct AutoHost_Descriptor::Stats : public StatsTracker{
-    Stats()
-        : m_raids(m_stats["Raids"])
-        , m_empty(m_stats["Empty Raids"])
-        , m_full(m_stats["Full Raids"])
-        , m_raiders(m_stats["Total Raiders"])
-        , m_wins(m_stats["Wins"])
-        , m_losses(m_stats["Losses"])
-        , m_banned(m_stats["Banned"])
-        , m_errors(m_stats["Errors"])
-    {
-        m_display_order.emplace_back("Raids");
-        m_display_order.emplace_back("Empty Raids");
-        m_display_order.emplace_back("Full Raids");
-        m_display_order.emplace_back("Total Raiders");
-        m_display_order.emplace_back("Wins");
-        m_display_order.emplace_back("Losses");
-        m_display_order.emplace_back("Banned", true);
-        m_display_order.emplace_back("Errors", true);
-    }
-    std::atomic<uint64_t>& m_raids;
-    std::atomic<uint64_t>& m_empty;
-    std::atomic<uint64_t>& m_full;
-    std::atomic<uint64_t>& m_raiders;
-    std::atomic<uint64_t>& m_wins;
-    std::atomic<uint64_t>& m_losses;
-    std::atomic<uint64_t>& m_banned;
-    std::atomic<uint64_t>& m_errors;
-};
-std::unique_ptr<StatsTracker> AutoHost_Descriptor::make_stats() const{
-    return std::unique_ptr<StatsTracker>(new Stats());
-}
-
-
-
-AutoHost::AutoHost()
-    : SingleSwitchProgramInstance({"Notifs", "LiveHost"})
-    , MODE(
-        "<b>Hosting Mode:</b>",
-        {
-            {HostingMode::LOCAL,            "local",            "Host Locally"},
-            {HostingMode::ONLINE_CODED,     "online-coded",     "Host Online (link code)"},
-            {HostingMode::ONLINE_EVERYONE,  "online-everyone",  "Host Online (everyone)"},
-        },
-        LockWhileRunning::UNLOCKED,
-        HostingMode::ONLINE_CODED
-    )
-    , NOTIFICATIONS0({
-        &NOTIFICATION_RAID_POST,
-        &NOTIFICATION_RAID_START,
-        &NOTIFICATION_JOIN_REPORT,
-        &NOTIFICATION_ERROR_RECOVERABLE,
-        &NOTIFICATION_ERROR_FATAL,
-    })
-{
-    PA_ADD_OPTION(MODE);
-
-    //  General Auto-Hosting Options
-    PA_ADD_OPTION(LOBBY_WAIT_DELAY);
-    PA_ADD_OPTION(START_RAID_PLAYERS);
-    PA_ADD_OPTION(SHOW_RAID_CODE);
-    PA_ADD_OPTION(DESCRIPTION);
-    PA_ADD_OPTION(REMOTE_KILL_SWITCH0);
-    PA_ADD_OPTION(CONSECUTIVE_FAILURE_PAUSE);
-    PA_ADD_OPTION(FAILURE_PAUSE_MINUTES);
-
-    PA_ADD_OPTION(ROLLOVER_PREVENTION);
-    PA_ADD_OPTION(BATTLE_AI);
-
-    //  Extended Auto-Hosting Options
-    PA_ADD_OPTION(BAN_LIST);
-    PA_ADD_OPTION(JOIN_REPORT);
-
-    PA_ADD_OPTION(NOTIFICATIONS0);
-}
-
-
-
-WallClock AutoHost::wait_for_lobby_open(
-    SingleSwitchProgramEnvironment& env, BotBaseContext& context,
-    std::string& lobby_code
-){
-    VideoOverlaySet overlays(env.console.overlay());
-
-    TeraLobbyWatcher lobby(env.logger(), env.realtime_dispatcher(), COLOR_RED);
-    lobby.make_overlays(overlays);
-
-    int ret = wait_until(
-        env.console, context,
-        std::chrono::seconds(60),
-        {{lobby, std::chrono::milliseconds(500)}}
-    );
-    if (ret < 0){
-        throw OperationFailedException(
-            ErrorReport::SEND_ERROR_REPORT, env.console,
-            "Unable to detect Tera lobby after 60 seconds.",
-            true
-        );
-    }
-    WallClock start_time = current_time();
-    context.wait_for(std::chrono::seconds(1));
-
-    VideoSnapshot snapshot = env.console.video().snapshot();
-    lobby_code = lobby.raid_code(env.logger(), env.inference_dispatcher(), snapshot);
-    std::string code = lobby.raid_code(env.logger(), env.inference_dispatcher(), snapshot);
-    normalize_code(lobby_code, code);
-
-    send_host_announcement(
-        env, env.console,
-        lobby_code,
-        SHOW_RAID_CODE,
-        DESCRIPTION,
-        NOTIFICATION_RAID_POST
-    );
-
-    return start_time;
-}
-void AutoHost::update_stats_on_raid_start(SingleSwitchProgramEnvironment& env, uint8_t player_count){
-    AutoHost_Descriptor::Stats& stats = env.current_stats<AutoHost_Descriptor::Stats>();
-
-    player_count = std::max<uint8_t>(player_count, 1);
-
-    if (player_count == 4){
-        stats.m_full++;
-    }
-    if (player_count == 1){
-        stats.m_empty++;
-    }
-    stats.m_raiders += player_count - 1;
-}
-bool AutoHost::start_raid(
-    SingleSwitchProgramEnvironment& env, BotBaseContext& context,
-    WallClock start_time,
-    uint8_t player_count
-){
-    AutoHost_Descriptor::Stats& stats = env.current_stats<AutoHost_Descriptor::Stats>();
-
-    //  This is the state machine to actually start the raid.
-
-    while (true){
-        AdvanceDialogWatcher dialog(COLOR_YELLOW);
-        WhiteScreenOverWatcher start_raid(COLOR_BLUE);
-        TeraBattleMenuWatcher battle_menu(COLOR_CYAN);
-        context.wait_for_all_requests();
-        int ret = run_until(
-            env.console, context,
-            [start_time](BotBaseContext& context){
-                while (true){
-                    pbf_press_button(context, BUTTON_A, 20, 105);
-                    context.wait_for_all_requests();
-                    if (current_time() > start_time + std::chrono::minutes(4)){
-                        return;
-                    }
-                }
-            },
-            {dialog, start_raid, battle_menu}
-        );
-        context.wait_for(std::chrono::milliseconds(100));
-        switch (ret){
-        case 0:
-            env.log("Raid timed out!", COLOR_ORANGE);
-            stats.m_empty++;
-            return false;
-        case 1:
-            env.log("Raid started! (white screen)", COLOR_BLUE);
-            update_stats_on_raid_start(env, player_count);
-            return true;
-        case 2:
-            env.log("Raid started! (battle menu)", COLOR_BLUE);
-            update_stats_on_raid_start(env, player_count);
-            return true;
-        default:
-            throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, env.console,
-                "Stuck in lobby for 4 minutes.",
-                true
-            );
-        }
-    }
-}
-
-
-bool AutoHost::run_lobby(
-    SingleSwitchProgramEnvironment& env, BotBaseContext& context,
-    std::string& lobby_code,
-    std::array<std::map<Language, std::string>, 4>& player_names
-){
-    AutoHost_Descriptor::Stats& stats = env.current_stats<AutoHost_Descriptor::Stats>();
-
-    WallClock start_time = wait_for_lobby_open(env, context, lobby_code);
-
-    TeraLobbyWaiter waiter(
-        env, env.console, context,
-        1,
-        lobby_code, start_time,
-        LOBBY_WAIT_DELAY,
-        START_RAID_PLAYERS,
-        NOTIFICATION_RAID_START,
-        BAN_LIST,
-        JOIN_REPORT
-    );
-
-    TeraLobbyWaiter::LobbyResult result = waiter.run_lobby();
-    player_names = waiter.names();
-
-    if (result == TeraLobbyWaiter::LobbyResult::BANNED_PLAYER){
-        stats.m_banned++;
-    }
-    if (result != TeraLobbyWaiter::LobbyResult::RAID_STARTED){
-        return false;
-    }
-
-    return start_raid(env, context, start_time, waiter.last_known_players());
-}
-
-void AutoHost::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    assert_16_9_720p_min(env.logger(), env.console);
-
-    AutoHost_Descriptor::Stats& stats = env.current_stats<AutoHost_Descriptor::Stats>();
-
-    //  Connect the controller.
-    pbf_press_button(context, BUTTON_LCLICK, 10, 10);
-
-    m_killswitch_time = WallClock::max();
-
-    std::string report_name = "PokemonSV-AutoHost-JoinReport-" + now_to_filestring() + ".txt";
-    MultiLanguageJoinTracker join_tracker(1);
-
-    TeraFailTracker fail_tracker(
-        env, context,
-        NOTIFICATION_ERROR_RECOVERABLE,
-        CONSECUTIVE_FAILURE_PAUSE,
-        FAILURE_PAUSE_MINUTES
-    );
-    KillSwitchTracker kill_switch(env);
-
-    bool skip_reset = true;
-    WallClock last_time_fix = WallClock::min();
-    while (true){
-        env.update_stats();
-
-        fail_tracker.on_raid_start();
-
-        if (!skip_reset){
-            pbf_press_button(context, BUTTON_HOME, 20, GameSettings::instance().GAME_TO_HOME_DELAY);
-            if (ROLLOVER_PREVENTION){
-                WallClock now = current_time();
-                if (last_time_fix == WallClock::min() || now - last_time_fix > std::chrono::hours(4)){
-                    set_time_to_12am_from_home(env.program_info(), env.console, context);
-                    last_time_fix = now;
-                }
-            }
-            reset_game_from_home(env.program_info(), env.console, context, 5 * TICKS_PER_SECOND);
-        }
-        skip_reset = false;
-
-        //  Check kill-switch now before we go online.
-        if (MODE != HostingMode::LOCAL){
-            kill_switch.check_kill_switch(REMOTE_KILL_SWITCH0);
-        }
-
-        //  Store the mode locally in case the user changes in the middle of
-        //  this iteration.
-        HostingMode mode = MODE;
-
-        if (mode != HostingMode::LOCAL){
-            //  Connect to internet.
-            try{
-                connect_to_internet_from_overworld(env.program_info(), env.console, context);
-            }catch (OperationFailedException& e){
-                stats.m_errors++;
-                e.send_notification(env, NOTIFICATION_ERROR_RECOVERABLE);
-                fail_tracker.report_raid_error();
-                continue;
-            }
-        }
-
-        if (!open_raid(env.console, context)){
-            env.log("No Tera raid found.", COLOR_RED);
-            fail_tracker.report_raid_error();
-            continue;
-        }
-        env.log("Tera raid found!", COLOR_BLUE);
-
-        context.wait_for(std::chrono::milliseconds(100));
-
-        BAN_LIST.refresh_online_table(env.logger());
-
-        try{
-            open_hosting_lobby(env, env.console, context, mode);
-        }catch (OperationFailedException& e){
-            stats.m_errors++;
-            e.send_notification(env, NOTIFICATION_ERROR_RECOVERABLE);
-            fail_tracker.report_raid_error();
-            continue;
-        }
-
-        try{
-            std::string lobby_code;
-            std::array<std::map<Language, std::string>, 4> player_names;
-
-            if (!run_lobby(env, context, lobby_code, player_names)){
-                continue;
-            }
-            env.update_stats();
-
-            stats.m_raids++;
-            bool win = run_tera_battle(env, env.console, context, BATTLE_AI);
-            env.update_stats();
-            if (win){
-                stats.m_wins++;
-            }else{
-                stats.m_losses++;
-            }
-            if (JOIN_REPORT.enabled() && (win || !JOIN_REPORT.wins_only)){
-                join_tracker.append(player_names, lobby_code);
-                join_tracker.dump(report_name);
-                send_program_notification_with_file(
-                    env,
-                    NOTIFICATION_JOIN_REPORT,
-                    Color(0),
-                    "Join Report",
-                    {}, "",
-                    report_name
-                );
-            }
-            if (win){
-                exit_tera_win_without_catching(env.program_info(), env.console, context, 0);
-            }
-            fail_tracker.report_successful_raid();
-        }catch (OperationFailedException& e){
-            stats.m_errors++;
-            e.send_notification(env, NOTIFICATION_ERROR_RECOVERABLE);
-            fail_tracker.report_raid_error();
-            continue;
-        }
-    }
-}
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSV/Programs/TeraRaids/PokemonSV_AutoHost.h b/SerialPrograms/Source/PokemonSV/Programs/TeraRaids/PokemonSV_AutoHost.h
deleted file mode 100644
index fb1d9e4d51..0000000000
--- a/SerialPrograms/Source/PokemonSV/Programs/TeraRaids/PokemonSV_AutoHost.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/*  Auto Host
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSV_AutoHost_H
-#define PokemonAutomation_PokemonSV_AutoHost_H
-
-#include "Common/Cpp/Options/EnumDropdownOption.h"
-#include "CommonFramework/Notifications/EventNotificationsTable.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-#include "PokemonSV/Options/PokemonSV_PlayerList.h"
-#include "PokemonSV/Options/PokemonSV_TeraAIOption.h"
-#include "PokemonSV/Options/PokemonSV_AutoHostOptions.h"
-#include "PokemonSV/Programs/TeraRaids/PokemonSV_TeraRoutines.h"
-#include "PokemonSV_JoinTracker.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-
-
-class AutoHost_Descriptor : public SingleSwitchProgramDescriptor{
-public:
-    AutoHost_Descriptor();
-
-    struct Stats;
-    virtual std::unique_ptr<StatsTracker> make_stats() const override;
-
-};
-
-
-
-
-class AutoHost : public SingleSwitchProgramInstance{
-public:
-    AutoHost();
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-    WallClock wait_for_lobby_open(
-        SingleSwitchProgramEnvironment& env, BotBaseContext& context,
-        std::string& lobby_code
-    );
-    void update_stats_on_raid_start(SingleSwitchProgramEnvironment& env, uint8_t player_count);
-    bool start_raid(
-        SingleSwitchProgramEnvironment& env, BotBaseContext& context,
-        WallClock start_time,
-        uint8_t player_count
-    );
-    bool run_lobby(
-        SingleSwitchProgramEnvironment& env, BotBaseContext& context,
-        std::string& lobby_code,
-        std::array<std::map<Language, std::string>, 4>& player_names
-    );
-    void check_kill_switch(ProgramEnvironment& env);
-
-private:
-//    OCR::LanguageOCR LANGUAGE;
-
-    EnumDropdownOption<HostingMode> MODE;
-
-    LobbyWaitDelay LOBBY_WAIT_DELAY;
-    StartRaidPlayers START_RAID_PLAYERS;
-    ShowRaidCode SHOW_RAID_CODE;
-    AutoHostDescription DESCRIPTION;
-    RemoteKillSwitch REMOTE_KILL_SWITCH0;
-    ConsecutiveFailurePause CONSECUTIVE_FAILURE_PAUSE;
-    FailurePauseMinutes FAILURE_PAUSE_MINUTES;
-
-    RolloverPrevention ROLLOVER_PREVENTION;
-    TeraAIOption BATTLE_AI;
-
-    RaidPlayerBanList BAN_LIST;
-    RaidJoinReportOption JOIN_REPORT;
-
-    RaidPostNotification NOTIFICATION_RAID_POST;
-    RaidStartNotification NOTIFICATION_RAID_START;
-    JoinReportNotification NOTIFICATION_JOIN_REPORT;
-    EventNotificationsOption NOTIFICATIONS0;
-
-    WallClock m_killswitch_time;
-    std::string m_killswitch_reason;
-};
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSV/Programs/TeraRaids/PokemonSV_TeraBattler.cpp b/SerialPrograms/Source/PokemonSV/Programs/TeraRaids/PokemonSV_TeraBattler.cpp
deleted file mode 100644
index 56bf439229..0000000000
--- a/SerialPrograms/Source/PokemonSV/Programs/TeraRaids/PokemonSV_TeraBattler.cpp
+++ /dev/null
@@ -1,347 +0,0 @@
-/*  Tera Battler
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <mutex>
-#include "CommonFramework/Exceptions/OperationFailedException.h"
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "PokemonSV/Inference/Battles/PokemonSV_NormalBattleMenus.h"
-#include "PokemonSV/Inference/Battles/PokemonSV_TeraBattleMenus.h"
-#include "PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h"
-#include "PokemonSV_TeraBattler.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-
-//  If two Switches send commands at exactly the same time, it may cause the
-//  Switches to desync and fork the battle state. So we use this lock prevent
-//  any two Switches from sending commands too close to each other.
-std::mutex tera_battle_throttle_lock;
-
-
-enum class BattleMenuResult{
-    RESUME_CURRENT_TURN,
-    RESUME_ADVANCE_TURN,
-    BATTLE_WON,
-    BATTLE_LOST,
-};
-BattleMenuResult run_battle_menu(
-    ConsoleHandle& console, BotBaseContext& context,
-    const std::vector<TeraMoveEntry>& move_table,
-    TeraBattleMenuDetector& battle_menu,
-    TeraCatchWatcher& catch_menu,
-    OverworldWatcher& overworld,
-    TeraMoveEntry& move
-){
-    console.log("Current Move Selection: " + move.to_str());
-    switch (move.type){
-    case TeraMoveType::Wait:{
-        int ret = run_until(
-            console, context,
-            [&](BotBaseContext& context){
-                pbf_mash_button(context, BUTTON_B, move.seconds * TICKS_PER_SECOND);
-            },
-            {catch_menu, overworld}
-        );
-        switch (ret){
-        case 0: return BattleMenuResult::BATTLE_WON;
-        case 1: return BattleMenuResult::BATTLE_LOST;
-        }
-        return BattleMenuResult::RESUME_ADVANCE_TURN;
-    }
-    case TeraMoveType::Move1:
-    case TeraMoveType::Move2:
-    case TeraMoveType::Move3:
-    case TeraMoveType::Move4:
-        if (battle_menu.move_to_slot(console, context, 0)){
-            pbf_press_button(context, BUTTON_A, 20, 10);
-        }
-        break;
-    case TeraMoveType::Cheer_AllOut:
-    case TeraMoveType::Cheer_HangTough:
-    case TeraMoveType::Cheer_HealUp:
-        if (battle_menu.move_to_slot(console, context, 1)){
-            pbf_press_button(context, BUTTON_A, 20, 10);
-        }
-        break;
-    }
-    return BattleMenuResult::RESUME_CURRENT_TURN;
-}
-bool run_cheer_select(
-    ConsoleHandle& console, BotBaseContext& context,
-    CheerSelectDetector& cheer_select_menu,
-    TeraMoveEntry& move
-){
-    uint8_t index = 0;
-    switch (move.type){
-    case TeraMoveType::Cheer_AllOut:
-        index = 0;
-        break;
-    case TeraMoveType::Cheer_HangTough:
-        index = 1;
-        break;
-    case TeraMoveType::Cheer_HealUp:
-        index = 2;
-        break;
-    default:
-        pbf_press_button(context, BUTTON_B, 20, 10);
-        return false;
-    }
-    if (cheer_select_menu.move_to_slot(console, context, index)){
-        std::lock_guard<std::mutex> lg(tera_battle_throttle_lock);
-        pbf_press_button(context, BUTTON_A, 20, 10);
-        context.wait_for_all_requests();
-    }
-    return true;
-}
-bool run_move_select(
-    ConsoleHandle& console, BotBaseContext& context,
-    TeraAIOption& battle_AI,
-    TerastallizingDetector& terastallizing,
-    MoveSelectWatcher& move_select_menu,
-    TeraMoveEntry& move, size_t consecutive_move_select
-){
-    uint8_t index = 0;
-    switch (move.type){
-    case TeraMoveType::Move1:
-        index = 0;
-        break;
-    case TeraMoveType::Move2:
-        index = 1;
-        break;
-    case TeraMoveType::Move3:
-        index = 2;
-        break;
-    case TeraMoveType::Move4:
-        index = 3;
-        break;
-    default:
-        pbf_press_button(context, BUTTON_B, 20, 10);
-        return false;
-    }
-
-    //  If we end up here consecutively too many times, the move is
-    //  probably disabled. Select a different move.
-    if (consecutive_move_select > 3){
-        console.log("Failed to select a move 3 times. Choosing a different move.", COLOR_RED);
-//                pbf_press_dpad(context, DPAD_DOWN, 20, 40);
-        index++;
-        if (index >= 4){
-            index = 0;
-        }
-        move.type = (TeraMoveType)((uint8_t)TeraMoveType::Move1 + index);
-    }
-
-    if (terastallizing.detect(console.video().snapshot())){
-        console.log("Terastallization: Available");
-        if (battle_AI.TRY_TO_TERASTILLIZE){
-            pbf_press_button(context, BUTTON_R, 20, 4 * TICKS_PER_SECOND);
-        }
-    }else{
-        console.log("Terastallization: Not Available");
-    }
-
-    if (move_select_menu.move_to_slot(console, context, index)){
-        pbf_press_button(context, BUTTON_A, 20, 10);
-    }
-    return true;
-}
-bool run_target_select(
-    ConsoleHandle& console, BotBaseContext& context,
-    TeraTargetSelectDetector& target_select_menu,
-    TeraMoveEntry& move
-){
-    switch (move.type){
-    case TeraMoveType::Move1:
-    case TeraMoveType::Move2:
-    case TeraMoveType::Move3:
-    case TeraMoveType::Move4:{
-        target_select_menu.move_to_slot(console, context, (uint8_t)move.target);
-        std::lock_guard<std::mutex> lg(tera_battle_throttle_lock);
-        pbf_press_button(context, BUTTON_A, 20, 10);
-        context.wait_for_all_requests();
-        return true;
-    }
-    default:
-        pbf_press_button(context, BUTTON_B, 20, 10);
-        return false;
-    }
-}
-
-
-
-
-bool run_tera_battle(
-    ProgramEnvironment& env,
-    ConsoleHandle& console, BotBaseContext& context,
-    TeraAIOption& battle_AI
-){
-    size_t turn = 0;
-    std::vector<TeraMoveEntry> move_table = battle_AI.MOVE_TABLE.snapshot();
-    TeraMoveEntry current_move{TeraMoveType::Move1, 0, TeraTarget::Opponent};
-    if (!move_table.empty()){
-        current_move = move_table[0];
-    }
-
-    size_t consecutive_timeouts = 0;
-    size_t consecutive_move_select = 0;
-    bool battle_menu_seen = false;
-    bool next_turn_on_battle_menu = false;
-    while (true){
-        // Warning, this terastallizing detector isn't used in the wait_until() below.
-        TerastallizingDetector terastallizing(COLOR_ORANGE);
-        VideoOverlaySet overlay_set(console);
-        terastallizing.make_overlays(overlay_set);
-
-        TeraBattleMenuWatcher battle_menu(COLOR_RED);
-        CheerSelectWatcher cheer_select_menu(COLOR_YELLOW);
-        MoveSelectWatcher move_select_menu(COLOR_YELLOW);
-        TargetSelectWatcher target_select_menu(COLOR_CYAN);
-        WhiteButtonWatcher next_button(
-            COLOR_CYAN,
-            WhiteButton::ButtonA,
-            {0.8, 0.93, 0.2, 0.07},
-            WhiteButtonWatcher::FinderType::PRESENT,
-            //  This can false positive against the back (B) button while in the
-            //  lobby. So don't trigger this unless we see the battle menu first.
-            //  At the same time, there's a possibility that we miss the battle
-            //  menu if the raid is won before it even loads. And this can only
-            //  happen if the raid was uncatchable to begin with.
-            std::chrono::seconds(battle_menu_seen ? 5 : 60)
-        );
-        TeraCatchWatcher catch_menu(COLOR_BLUE);
-        OverworldWatcher overworld(COLOR_GREEN);
-        context.wait_for_all_requests();
-        int ret = run_until(
-            console, context,
-            [](BotBaseContext& context){
-                for (size_t c = 0; c < 4; c++){
-                    pbf_wait(context, 30 * TICKS_PER_SECOND);
-                    pbf_press_button(context, BUTTON_B, 20, 0);
-                }
-            },
-            {
-                battle_menu,
-                cheer_select_menu,
-                move_select_menu,
-                target_select_menu,
-                next_button,
-                catch_menu,
-                overworld,
-            }
-        );
-        context.wait_for(std::chrono::milliseconds(100));
-        switch (ret){
-        case 0:{
-            console.log("Detected battle menu.");
-            battle_menu_seen = true;
-
-            //  If we enter here, we advance to the next turn.
-            if (next_turn_on_battle_menu){
-                console.log("Detected battle menu. Turn: " + std::to_string(turn));
-                turn++;
-                //  Reset the move to the table entry in case we were forced to
-                //  change moves due to move being unselectable.
-                if (move_table.empty()){
-                    current_move = TeraMoveEntry{TeraMoveType::Move1, 0, TeraTarget::Opponent};
-                }else if (turn < move_table.size()){
-                    current_move = move_table[turn];
-                }else{
-                    current_move = move_table.back();
-                }
-                next_turn_on_battle_menu = false;
-            }
-
-            console.log("Current Move Selection: " + current_move.to_str());
-            BattleMenuResult battle_menu_result = run_battle_menu(
-                console, context,
-                move_table,
-                battle_menu,
-                catch_menu,
-                overworld,
-                current_move
-            );
-            switch (battle_menu_result){
-            case BattleMenuResult::RESUME_CURRENT_TURN:
-                continue;
-            case BattleMenuResult::RESUME_ADVANCE_TURN:
-                next_turn_on_battle_menu = true;
-                continue;
-            case BattleMenuResult::BATTLE_WON:
-                console.log("Detected a win!", COLOR_BLUE);
-                pbf_mash_button(context, BUTTON_B, 30);
-                return true;
-            case BattleMenuResult::BATTLE_LOST:
-                console.log("Detected a loss!", COLOR_ORANGE);
-                return false;
-            }
-        }
-        case 1:{
-            console.log("Detected cheer select. Turn: " + std::to_string(turn));
-            if (run_cheer_select(console, context, cheer_select_menu, current_move)){
-                next_turn_on_battle_menu = true;
-            }
-            continue;
-        }
-        case 2:{
-            console.log("Detected move select. Turn: " + std::to_string(turn));
-            consecutive_move_select++;
-            run_move_select(
-                console, context,
-                battle_AI,
-                terastallizing,
-                move_select_menu,
-                current_move,
-                consecutive_move_select
-            );
-            continue;
-        }
-        case 3:
-            console.log("Detected target select. Turn: " + std::to_string(turn));
-            consecutive_move_select = 0;
-            if (run_target_select(console, context, target_select_menu, current_move)){
-                next_turn_on_battle_menu = true;
-            }
-            continue;
-        case 4:
-        case 5:
-            console.log("Detected a win!", COLOR_BLUE);
-            pbf_mash_button(context, BUTTON_B, 30);
-            return true;
-        case 6:
-            console.log("Detected a loss!", COLOR_ORANGE);
-            return false;
-        default:
-            consecutive_timeouts++;
-            if (consecutive_timeouts == 3){
-                throw OperationFailedException(
-                    ErrorReport::SEND_ERROR_REPORT, console,
-                    "No state detected after 6 minutes.",
-                    true
-                );
-            }
-            console.log("Unable to detect any state for 2 minutes. Mashing B...", COLOR_RED);
-            pbf_mash_button(context, BUTTON_B, 250);
-        }
-    }
-
-    return false;
-}
-
-
-
-
-
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSV/Programs/TeraRaids/PokemonSV_TeraBattler.h b/SerialPrograms/Source/PokemonSV/Programs/TeraRaids/PokemonSV_TeraBattler.h
deleted file mode 100644
index 8c9fa3b5bc..0000000000
--- a/SerialPrograms/Source/PokemonSV/Programs/TeraRaids/PokemonSV_TeraBattler.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*  Tera Battler
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSV_TeraBattler_H
-#define PokemonAutomation_PokemonSV_TeraBattler_H
-
-#include "ClientSource/Connection/BotBase.h"
-#include "CommonFramework/Notifications/EventNotificationOption.h"
-#include "CommonFramework/Tools/ConsoleHandle.h"
-#include "CommonFramework/Tools/ProgramEnvironment.h"
-#include "PokemonSV/Options/PokemonSV_TeraAIOption.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-
-//  Run a tera battle until you either win or lose.
-bool run_tera_battle(
-    ProgramEnvironment& env,
-    ConsoleHandle& console, BotBaseContext& context,
-    TeraAIOption& battle_AI
-);
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSV/Programs/TeraRaids/PokemonSV_TeraMultiFarmer.cpp b/SerialPrograms/Source/PokemonSV/Programs/TeraRaids/PokemonSV_TeraMultiFarmer.cpp
deleted file mode 100644
index cbc743905e..0000000000
--- a/SerialPrograms/Source/PokemonSV/Programs/TeraRaids/PokemonSV_TeraMultiFarmer.cpp
+++ /dev/null
@@ -1,641 +0,0 @@
-/*  Tera Multi-Farmer
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Cpp/PrettyPrint.h"
-//#include "CommonFramework/GlobalSettingsPanel.h"
-#include "CommonFramework/Exceptions/OperationFailedException.h"
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
-#include "CommonFramework/Tools/ErrorDumper.h"
-#include "CommonFramework/Tools/StatsTracking.h"
-#include "CommonFramework/Tools/VideoResolutionCheck.h"
-#include "CommonFramework/Notifications/ProgramNotifications.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "Pokemon/Inference/Pokemon_NameReader.h"
-#include "PokemonSV/PokemonSV_Settings.h"
-#include "PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h"
-#include "PokemonSV/Inference/Tera/PokemonSV_TeraCardDetector.h"
-#include "PokemonSV/Inference/Tera/PokemonSV_TeraRaidSearchDetector.h"
-#include "PokemonSV/Programs/PokemonSV_GameEntry.h"
-#include "PokemonSV/Programs/PokemonSV_SaveGame.h"
-#include "PokemonSV/Programs/PokemonSV_ConnectToInternet.h"
-#include "PokemonSV/Programs/PokemonSV_Navigation.h"
-#include "PokemonSV/Programs/FastCodeEntry/PokemonSV_CodeEntry.h"
-#include "PokemonSV_TeraRoutines.h"
-#include "PokemonSV_TeraBattler.h"
-#include "PokemonSV_AutoHostTools.h"
-#include "PokemonSV_AutoHostLobbyWaiter.h"
-#include "PokemonSV_TeraMultiFarmer.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-using namespace Pokemon;
-
-
-
-GeneralHostingOptions::GeneralHostingOptions()
-    : GroupOption("Hosting Options", LockWhileRunning::UNLOCKED)
-{
-    PA_ADD_OPTION(LOBBY_WAIT_DELAY);
-    PA_ADD_OPTION(START_RAID_PLAYERS);
-    PA_ADD_OPTION(SHOW_RAID_CODE);
-    PA_ADD_OPTION(DESCRIPTION);
-    PA_ADD_OPTION(REMOTE_KILL_SWITCH);
-    PA_ADD_OPTION(CONSECUTIVE_FAILURE_PAUSE);
-    PA_ADD_OPTION(FAILURE_PAUSE_MINUTES);
-}
-
-
-
-
-PerConsoleTeraFarmerOptions::~PerConsoleTeraFarmerOptions(){
-    catch_on_win.remove_listener(*this);
-}
-PerConsoleTeraFarmerOptions::PerConsoleTeraFarmerOptions(std::string label, const LanguageSet& languages, bool host)
-    : GroupOption(std::move(label), LockWhileRunning::UNLOCKED)
-    , is_host_label("<font color=\"blue\" size=4><b>This is the host Switch.</b></font>")
-    , language("<b>Game Language:</b>", languages, LockWhileRunning::LOCKED, true)
-    , catch_on_win(
-        "<b>Catch the " + STRING_POKEMON + ":</b>",
-        LockWhileRunning::UNLOCKED,
-        false
-    )
-    , ball_select(
-        "<b>Ball Select:</b>",
-        LockWhileRunning::UNLOCKED,
-        "poke-ball"
-    )
-{
-    PA_ADD_STATIC(is_host_label);
-    PA_ADD_OPTION(language);
-    PA_ADD_OPTION(catch_on_win);
-    PA_ADD_OPTION(ball_select);
-    PA_ADD_OPTION(battle_ai);
-
-    set_host(host);
-
-    catch_on_win.add_listener(*this);
-}
-void PerConsoleTeraFarmerOptions::set_host(bool is_host){
-    this->is_host = is_host;
-    PerConsoleTeraFarmerOptions::value_changed();
-}
-void PerConsoleTeraFarmerOptions::value_changed(){
-    if (this->is_host){
-        is_host_label.set_visibility(ConfigOptionState::ENABLED);
-        catch_on_win.set_visibility(ConfigOptionState::DISABLED);
-        ball_select.set_visibility(ConfigOptionState::DISABLED);
-    }else{
-        is_host_label.set_visibility(ConfigOptionState::HIDDEN);
-        catch_on_win.set_visibility(ConfigOptionState::ENABLED);
-        ball_select.set_visibility(catch_on_win ? ConfigOptionState::ENABLED : ConfigOptionState::DISABLED);
-    }
-}
-
-
-
-TeraMultiFarmer_Descriptor::TeraMultiFarmer_Descriptor()
-    : MultiSwitchProgramDescriptor(
-        "PokemonSV:TeraMultiFarmer",
-        STRING_POKEMON + " SV", "Tera Multi-Farmer",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonSV/TeraMultiFarmer.md",
-        "Farm items and " + STRING_POKEMON + " from a Tera raid using multiple Switches.",
-        FeedbackType::REQUIRED,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB,
-        2, 4, 2
-    )
-{}
-struct TeraMultiFarmer_Descriptor::Stats : public StatsTracker{
-    Stats()
-        : m_raids(m_stats["Raids"])
-        , m_empty(m_stats["Empty Raids"])
-        , m_full(m_stats["Full Raids"])
-        , m_joiners(m_stats["Total Joiners"])
-        , m_wins(m_stats["Wins"])
-        , m_losses(m_stats["Losses"])
-        , m_banned(m_stats["Banned"])
-        , m_errors(m_stats["Errors"])
-    {
-        m_display_order.emplace_back("Raids");
-        m_display_order.emplace_back("Empty Raids", true);
-        m_display_order.emplace_back("Full Raids", true);
-        m_display_order.emplace_back("Total Joiners", true);
-        m_display_order.emplace_back("Wins");
-        m_display_order.emplace_back("Losses");
-        m_display_order.emplace_back("Banned", true);
-        m_display_order.emplace_back("Errors", true);
-    }
-    std::atomic<uint64_t>& m_raids;
-    std::atomic<uint64_t>& m_empty;
-    std::atomic<uint64_t>& m_full;
-    std::atomic<uint64_t>& m_joiners;
-    std::atomic<uint64_t>& m_wins;
-    std::atomic<uint64_t>& m_losses;
-    std::atomic<uint64_t>& m_banned;
-    std::atomic<uint64_t>& m_errors;
-};
-std::unique_ptr<StatsTracker> TeraMultiFarmer_Descriptor::make_stats() const{
-    return std::unique_ptr<StatsTracker>(new Stats());
-}
-
-
-TeraMultiFarmer::~TeraMultiFarmer(){
-    HOSTING_MODE.remove_listener(*this);
-    HOSTING_SWITCH.remove_listener(*this);
-}
-TeraMultiFarmer::TeraMultiFarmer()
-    : HOSTING_SWITCH(
-        "<b>Host Switch:</b><br>This is the Switch that hosts the raid.",
-        {
-            {0, "switch0", "Switch 0 (Top Left)"},
-            {1, "switch1", "Switch 1 (Top Right)"},
-            {2, "switch2", "Switch 2 (Bottom Left)"},
-            {3, "switch3", "Switch 3 (Bottom Right)"},
-        },
-        LockWhileRunning::LOCKED,
-        0
-    )
-    , MAX_WINS(
-        "<b>Max Wins:</b><br>Stop program after winning this many times.",
-        LockWhileRunning::UNLOCKED,
-        999, 1, 999
-    )
-    , HOSTING_MODE(
-        "<b>Mode:</b>",
-        {
-            {Mode::FARM_ALONE,      "farm-alone",   "Farm by yourself."},
-            {Mode::HOST_LOCALLY,    "host-locally", "Host remaining slots locally."},
-            {Mode::HOST_ONLINE,     "host-online",  "Host remaining slots online."},
-        },
-        LockWhileRunning::LOCKED,
-        Mode::FARM_ALONE
-    )
-    , RECOVERY_MODE(
-        "<b>Recovery Mode:</b>",
-        {
-            {RecoveryMode::STOP_ON_ERROR,   "stop-on-error",    "Stop on any error."},
-            {RecoveryMode::SAVE_AND_RESET,  "save-and-reset",   "Save before each raid. Reset on errors."},
-        },
-        LockWhileRunning::LOCKED,
-        RecoveryMode::SAVE_AND_RESET
-    )
-    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
-    , NOTIFICATIONS({
-        &NOTIFICATION_STATUS_UPDATE,
-        &NOTIFICATION_RAID_POST,
-        &NOTIFICATION_RAID_START,
-        &NOTIFICATION_JOIN_REPORT,
-        &NOTIFICATION_PROGRAM_FINISH,
-        &NOTIFICATION_ERROR_RECOVERABLE,
-        &NOTIFICATION_ERROR_FATAL,
-    })
-{
-    const LanguageSet& languages = PokemonNameReader::instance().languages();
-    size_t host = HOSTING_SWITCH.current_value();
-    PLAYERS[0].reset(new PerConsoleTeraFarmerOptions("Switch 0 (Top Left)", languages, host == 0));
-    PLAYERS[1].reset(new PerConsoleTeraFarmerOptions("Switch 1 (Top Right)", languages, host == 1));
-    PLAYERS[2].reset(new PerConsoleTeraFarmerOptions("Switch 2 (Bottom Left)", languages, host == 2));
-    PLAYERS[3].reset(new PerConsoleTeraFarmerOptions("Switch 3 (Bottom Right)", languages, host == 3));
-
-    PA_ADD_OPTION(HOSTING_SWITCH);
-    PA_ADD_OPTION(MAX_WINS);
-
-    //  General Auto-Hosting Options
-    PA_ADD_OPTION(HOSTING_MODE);
-    PA_ADD_OPTION(HOSTING_OPTIONS);
-
-    PA_ADD_OPTION(*PLAYERS[0]);
-    PA_ADD_OPTION(*PLAYERS[1]);
-    PA_ADD_OPTION(*PLAYERS[2]);
-    PA_ADD_OPTION(*PLAYERS[3]);
-
-    PA_ADD_OPTION(ROLLOVER_PREVENTION);
-//    PA_ADD_OPTION(RECOVERY_MODE);
-
-    //  Extended Auto-Hosting Options
-    PA_ADD_OPTION(BAN_LIST);
-    PA_ADD_OPTION(JOIN_REPORT);
-
-    PA_ADD_OPTION(NOTIFICATIONS);
-
-    TeraMultiFarmer::value_changed();
-
-    HOSTING_SWITCH.add_listener(*this);
-    HOSTING_MODE.add_listener(*this);
-}
-void TeraMultiFarmer::update_active_consoles(size_t switch_count){
-    for (size_t c = 0; c < 4; c ++){
-        PLAYERS[c]->set_visibility(c < switch_count ? ConfigOptionState::ENABLED : ConfigOptionState::HIDDEN);
-    }
-}
-void TeraMultiFarmer::value_changed(){
-    size_t host = HOSTING_SWITCH.current_value();
-    for (size_t c = 0; c < 4; c++){
-        PLAYERS[c]->set_host(host == c);
-    }
-
-    ConfigOptionState hosting = HOSTING_MODE == Mode::FARM_ALONE
-        ? ConfigOptionState::HIDDEN
-        : ConfigOptionState::ENABLED;
-    HOSTING_OPTIONS.set_visibility(hosting);
-    BAN_LIST.set_visibility(hosting);
-    JOIN_REPORT.set_visibility(hosting);
-}
-
-
-void TeraMultiFarmer::reset_host(const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context){
-    pbf_press_button(context, BUTTON_HOME, 20, GameSettings::instance().GAME_TO_HOME_DELAY);
-    if (ROLLOVER_PREVENTION){
-        WallClock now = current_time();
-        if (m_last_time_fix == WallClock::min() || now - m_last_time_fix > std::chrono::hours(4)){
-            set_time_to_12am_from_home(info, console, context);
-            m_last_time_fix = now;
-        }
-    }
-    reset_game_from_home(info, console, context, 5 * TICKS_PER_SECOND);
-}
-void TeraMultiFarmer::reset_joiner(const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context){
-    pbf_press_button(context, BUTTON_HOME, 20, GameSettings::instance().GAME_TO_HOME_DELAY);
-    reset_game_from_home(info, console, context, 5 * TICKS_PER_SECOND);
-}
-bool TeraMultiFarmer::run_raid_host(ProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context){
-    TeraMultiFarmer_Descriptor::Stats& stats = env.current_stats<TeraMultiFarmer_Descriptor::Stats>();
-    PerConsoleTeraFarmerOptions& option = *PLAYERS[console.index()];
-
-    stats.m_raids++;
-    env.update_stats();
-    bool win = run_tera_battle(env, console, context, option.battle_ai);
-
-    if (win){
-        stats.m_wins++;
-        env.update_stats();
-        if (HOSTING_MODE == Mode::HOST_ONLINE){
-            exit_tera_win_without_catching(env.program_info(), console, context, 0);
-        }
-        reset_host(env.program_info(), console, context);
-        if (HOSTING_MODE == Mode::HOST_ONLINE){
-            connect_to_internet_from_overworld(env.program_info(), console, context);
-        }
-    }else{
-        stats.m_losses++;
-        env.update_stats();
-    }
-
-    open_raid(console, context);
-
-    return win;
-}
-void TeraMultiFarmer::run_raid_joiner(ProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context){
-    PerConsoleTeraFarmerOptions& option = *PLAYERS[console.index()];
-
-    bool win = run_tera_battle(env, console, context, option.battle_ai);
-
-    if (win){
-        if (option.catch_on_win){
-            exit_tera_win_by_catching(env, console, context, option.language, option.ball_select.slug(), 0);
-        }else{
-            exit_tera_win_without_catching(env.program_info(), console, context, 0);
-        }
-    }
-
-    if (RECOVERY_MODE == RecoveryMode::SAVE_AND_RESET){
-        pbf_press_button(context, BUTTON_X, 20, 105);
-        save_game_from_menu(env.program_info(), console, context);
-    }
-
-    enter_tera_search(env.program_info(), console, context, HOSTING_MODE == Mode::HOST_ONLINE);
-}
-void TeraMultiFarmer::join_lobby(
-    ProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context,
-    size_t host_index, const std::string& normalized_code
-){
-    if (console.index() == host_index){
-        return;
-    }
-
-    TeraMultiFarmer_Descriptor::Stats& stats = env.current_stats<TeraMultiFarmer_Descriptor::Stats>();
-
-    for (size_t attempts = 0;; attempts++){
-        if (attempts >= 3){
-            throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, console,
-                "Failed to join lobby 3 times.",
-                true
-            );
-        }
-
-        enter_code(console, context, FastCodeEntrySettings(), normalized_code, false);
-
-        TeraLobbyWatcher lobby(console.logger(), env.realtime_dispatcher(), COLOR_RED);
-        AdvanceDialogWatcher wrong_code(COLOR_YELLOW);
-        CodeEntryWatcher incomplete_code(COLOR_GREEN);
-        context.wait_for_all_requests();
-        context.wait_for(std::chrono::seconds(3));
-        int ret = wait_until(
-            console, context, std::chrono::seconds(60),
-            {
-                {lobby, std::chrono::milliseconds(500)},
-                wrong_code,
-                incomplete_code,
-            }
-        );
-        switch (ret){
-        case 0:
-            console.log("Entered raid lobby!");
-            pbf_mash_button(context, BUTTON_A, 125);
-            break;
-        case 1:
-            console.log("Wrong code! Backing out and trying again...", COLOR_RED);
-            stats.m_errors++;
-            pbf_press_button(context, BUTTON_B, 20, 230);
-            enter_tera_search(env.program_info(), console, context, HOSTING_MODE == Mode::HOST_ONLINE);
-            continue;
-        case 2:
-            console.log("Failed to enter code! Backing out and trying again...", COLOR_RED);
-            stats.m_errors++;
-            pbf_press_button(context, BUTTON_X, 20, 230);
-            enter_tera_search(env.program_info(), console, context, HOSTING_MODE == Mode::HOST_ONLINE);
-            continue;
-        default:
-            throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, console,
-                "Unable to join lobby.",
-                true
-            );
-        }
-        break;
-    }
-}
-bool TeraMultiFarmer::run_raid(
-    MultiSwitchProgramEnvironment& env, CancellableScope& scope,
-    std::string& lobby_code,
-    std::array<std::map<Language, std::string>, 4>& player_names
-){
-    TeraMultiFarmer_Descriptor::Stats& stats = env.current_stats<TeraMultiFarmer_Descriptor::Stats>();
-    size_t host_index = HOSTING_SWITCH.current_value();
-    ConsoleHandle& host_console = env.consoles[host_index];
-    BotBaseContext host_context(scope, host_console.botbase());
-
-    //  Get everyone ready.
-    env.run_in_parallel(scope, [&](ConsoleHandle& console, BotBaseContext& context){
-        try{
-            if (console.index() == host_index){
-                TeraCardReader card_detector(COLOR_RED);
-                if (!card_detector.detect(console.video().snapshot())){
-                    if (HOSTING_MODE == Mode::HOST_ONLINE){
-                        connect_to_internet_from_overworld(env.program_info(), console, context);
-                    }
-                    open_raid(console, context);
-                }
-            }else{
-                enter_tera_search(env.program_info(), console, context, HOSTING_MODE == Mode::HOST_ONLINE);
-            }
-        }catch (OperationFailedException&){
-            stats.m_errors++;
-            m_reset_required[console.index()] = true;
-            throw;
-        }
-    });
-
-    if (HOSTING_MODE != Mode::FARM_ALONE){
-        BAN_LIST.refresh_online_table(env.logger());
-    }
-
-    //  Open lobby and read code.
-    WallClock lobby_start_time;
-    try{
-        TeraLobbyReader lobby_reader(host_console.logger(), env.realtime_dispatcher());
-        open_hosting_lobby(
-            env, host_console, host_context,
-            HOSTING_MODE == Mode::HOST_ONLINE
-                ? HostingMode::ONLINE_CODED
-                : HostingMode::LOCAL
-        );
-        lobby_start_time = current_time();
-        std::string code = lobby_reader.raid_code(env.logger(), env.realtime_dispatcher(), host_console.video().snapshot());
-        const char* error = normalize_code(lobby_code, code);
-        if (error){
-            throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, host_console,
-                "Unable to read raid code.",
-                true
-            );
-        }
-    }catch (OperationFailedException&){
-        stats.m_errors++;
-        m_reset_required[host_index] = true;
-        throw;
-    }
-
-//    normalized_code[0] = '0';
-
-    //  Join the lobby with local joiners. If anything throws, we need to reset everyone.
-    try{
-        env.run_in_parallel(scope, [&](ConsoleHandle& console, BotBaseContext& context){
-            join_lobby(env, console, context, host_index, lobby_code);
-        });
-    }catch (OperationFailedException&){
-        stats.m_errors++;
-        m_reset_required[0] = true;
-        m_reset_required[1] = true;
-        m_reset_required[2] = true;
-        m_reset_required[3] = true;
-        throw;
-    }
-
-#if 1
-    //  Put it up on auto-host.
-    if (HOSTING_MODE != Mode::FARM_ALONE){
-        send_host_announcement(
-            env, host_console,
-            lobby_code,
-            HOSTING_OPTIONS.SHOW_RAID_CODE,
-            HOSTING_OPTIONS.DESCRIPTION,
-            NOTIFICATION_RAID_POST
-        );
-
-        TeraLobbyWaiter waiter(
-            env, host_console, host_context,
-            (uint8_t)env.consoles.size(),
-            lobby_code, lobby_start_time,
-            HOSTING_OPTIONS.LOBBY_WAIT_DELAY,
-            HOSTING_OPTIONS.START_RAID_PLAYERS,
-            NOTIFICATION_RAID_START,
-            BAN_LIST,
-            JOIN_REPORT
-        );
-
-        TeraLobbyWaiter::LobbyResult result = waiter.run_lobby();
-        player_names = waiter.names();
-
-        if (result == TeraLobbyWaiter::LobbyResult::BANNED_PLAYER){
-            stats.m_banned++;
-            m_reset_required[0] = true;
-            m_reset_required[1] = true;
-            m_reset_required[2] = true;
-            m_reset_required[3] = true;
-        }
-        if (result != TeraLobbyWaiter::LobbyResult::RAID_STARTED){
-            return false;
-        }
-
-        uint8_t hosts = (uint8_t)env.consoles.size();
-        uint8_t players = waiter.last_known_players();
-        stats.m_joiners += players - hosts;
-        if (players == 4){
-            stats.m_full++;
-        }else if (players == hosts){
-            stats.m_empty++;
-        }
-    }
-#endif
-
-    bool win = false;
-
-    //  Start the raid.
-    pbf_mash_button(host_context, BUTTON_A, 10 * TICKS_PER_SECOND);
-
-    //  Run the raid.
-    env.run_in_parallel(scope, [&](ConsoleHandle& console, BotBaseContext& context){
-        try{
-            if (console.index() == host_index){
-                win = run_raid_host(env, console, context);
-            }else{
-                run_raid_joiner(env, console, context);
-            }
-        }catch (OperationFailedException&){
-            //  Host throws. Reset the host and keep going.
-            stats.m_errors++;
-            env.update_stats();
-            m_reset_required[console.index()] = true;
-            throw;
-        }
-    });
-
-    return win;
-}
-void TeraMultiFarmer::program(MultiSwitchProgramEnvironment& env, CancellableScope& scope){
-    size_t host_index = HOSTING_SWITCH.current_value();
-    if (host_index >= env.consoles.size()){
-        throw UserSetupError(env.logger(), "The host Switch doesn't exist.");
-    }
-    env.run_in_parallel(scope, [&](ConsoleHandle& console, BotBaseContext& context){
-        assert_16_9_720p_min(console.logger(), console);
-    });
-
-//    Mode mode = MODE;
-//    ConsoleHandle& host_console = env.consoles[host_index];
-//    BotBaseContext host_context(scope, host_console.botbase());
-
-    std::string report_name = "PokemonSV-AutoHost-JoinReport-" + now_to_filestring() + ".txt";
-    MultiLanguageJoinTracker join_tracker((uint8_t)env.consoles.size());
-
-    m_reset_required[0] = false;
-    m_reset_required[1] = false;
-    m_reset_required[2] = false;
-    m_reset_required[3] = false;
-
-#if 1
-    if (RECOVERY_MODE == RecoveryMode::SAVE_AND_RESET){
-        env.run_in_parallel(scope, [&](ConsoleHandle& console, BotBaseContext& context){
-            if (console.index() != host_index){
-                //  Do 2 presses in quick succession in case one drops or is
-                //  needed to connect the controller.
-                pbf_press_button(context, BUTTON_X, 5, 5);
-                pbf_press_button(context, BUTTON_X, 20, 105);
-                save_game_from_menu(env.program_info(), console, context);
-            }else{
-                pbf_press_button(context, BUTTON_L, 5, 5);
-            }
-        });
-    }
-#endif
-
-    TeraFailTracker fail_tracker(
-        env, scope,
-        NOTIFICATION_ERROR_RECOVERABLE,
-        HOSTING_OPTIONS.CONSECUTIVE_FAILURE_PAUSE,
-        HOSTING_OPTIONS.FAILURE_PAUSE_MINUTES
-    );
-    KillSwitchTracker kill_switch(env);
-
-    m_last_time_fix = WallClock::min();
-    for (uint16_t wins = 0; wins < MAX_WINS;){
-        send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
-
-        //  We don't care about fail tracking if we're alone. No chance of ban.
-        if (HOSTING_MODE != Mode::FARM_ALONE){
-            fail_tracker.on_raid_start();
-        }
-
-        //  Reset all errored Switches.
-        env.run_in_parallel(scope, [&](ConsoleHandle& console, BotBaseContext& context){
-            size_t index = console.index();
-            if (!m_reset_required[index]){
-                return;
-            }
-            if (index == host_index){
-                reset_host(env.program_info(), console, context);
-            }else{
-                reset_joiner(env.program_info(), console, context);
-            }
-            m_reset_required[index] = false;
-        });
-
-        //  Check kill-switch now before we go online.
-        if (HOSTING_MODE == Mode::HOST_ONLINE){
-            kill_switch.check_kill_switch(HOSTING_OPTIONS.REMOTE_KILL_SWITCH);
-        }
-
-        try{
-            std::string lobby_code;
-            std::array<std::map<Language, std::string>, 4> player_names;
-            bool win = run_raid(env, scope, lobby_code, player_names);
-            if (win){
-                wins++;
-            }
-            if (HOSTING_MODE != Mode::FARM_ALONE && JOIN_REPORT.enabled() && (win || !JOIN_REPORT.wins_only)){
-                join_tracker.append(player_names, lobby_code);
-                join_tracker.dump(report_name);
-                send_program_notification_with_file(
-                    env,
-                    NOTIFICATION_JOIN_REPORT,
-                    Color(0),
-                    "Join Report",
-                    {}, "",
-                    report_name
-                );
-            }
-            fail_tracker.report_successful_raid();
-        }catch (OperationFailedException& e){
-            e.send_notification(env, NOTIFICATION_ERROR_RECOVERABLE);
-            if (RECOVERY_MODE != RecoveryMode::SAVE_AND_RESET){
-                //  Iterate the errored Switches. If a non-host has errored,
-                //  rethrow the exception to stop the program.
-                for (size_t c = 0; c < 4; c++){
-                    if (m_reset_required[c] && c != host_index){
-                        throw;
-                    }
-                }
-            }
-            fail_tracker.report_raid_error();
-        }
-    }
-
-    env.update_stats();
-    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
-}
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSV/Programs/TeraRaids/PokemonSV_TeraMultiFarmer.h b/SerialPrograms/Source/PokemonSV/Programs/TeraRaids/PokemonSV_TeraMultiFarmer.h
deleted file mode 100644
index aec615680f..0000000000
--- a/SerialPrograms/Source/PokemonSV/Programs/TeraRaids/PokemonSV_TeraMultiFarmer.h
+++ /dev/null
@@ -1,147 +0,0 @@
-/*  Tera Multi-Farmer
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSV_TeraMultiFarmer_H
-#define PokemonAutomation_PokemonSV_TeraMultiFarmer_H
-
-#include "Common/Cpp/Time.h"
-#include "Common/Cpp/Options/GroupOption.h"
-#include "Common/Cpp/Options/StaticTextOption.h"
-#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
-#include "Common/Cpp/Options/SimpleIntegerOption.h"
-#include "Common/Cpp/Options/EnumDropdownOption.h"
-#include "CommonFramework/Notifications/EventNotificationsTable.h"
-#include "CommonFramework/Options/LanguageOCROption.h"
-#include "NintendoSwitch/NintendoSwitch_MultiSwitchProgram.h"
-#include "PokemonSwSh/Options/PokemonSwSh_BallSelectOption.h"
-#include "PokemonSV/Options/PokemonSV_TeraAIOption.h"
-#include "PokemonSV/Options/PokemonSV_AutoHostOptions.h"
-#include "PokemonSV/Options/PokemonSV_PlayerList.h"
-#include "PokemonSV_AutoHostTools.h"
-#include "PokemonSV_JoinTracker.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-
-
-class GeneralHostingOptions : public GroupOption{
-public:
-    GeneralHostingOptions();
-
-    LobbyWaitDelay LOBBY_WAIT_DELAY;
-    StartRaidPlayers START_RAID_PLAYERS;
-    ShowRaidCode SHOW_RAID_CODE;
-    AutoHostDescription DESCRIPTION;
-    RemoteKillSwitch REMOTE_KILL_SWITCH;
-    ConsecutiveFailurePause CONSECUTIVE_FAILURE_PAUSE;
-    FailurePauseMinutes FAILURE_PAUSE_MINUTES;
-};
-
-
-
-class PerConsoleTeraFarmerOptions : public GroupOption, public ConfigOption::Listener{
-public:
-    ~PerConsoleTeraFarmerOptions();
-    PerConsoleTeraFarmerOptions(std::string label, const LanguageSet& languages, bool host);
-
-    void set_host(bool is_host);
-    virtual void value_changed() override;
-
-public:
-    bool is_host;
-    StaticTextOption is_host_label;
-    OCR::LanguageOCROption language;
-
-    BooleanCheckBoxOption catch_on_win;
-    PokemonSwSh::PokemonBallSelectOption ball_select;
-
-    TeraAIOption battle_ai;
-};
-
-
-
-class TeraMultiFarmer_Descriptor : public MultiSwitchProgramDescriptor{
-public:
-    TeraMultiFarmer_Descriptor();
-
-    struct Stats;
-    virtual std::unique_ptr<StatsTracker> make_stats() const override;
-};
-
-
-class TeraMultiFarmer : public MultiSwitchProgramInstance, private ConfigOption::Listener{
-public:
-    ~TeraMultiFarmer();
-    TeraMultiFarmer();
-    virtual void update_active_consoles(size_t switch_count) override;
-    virtual void program(MultiSwitchProgramEnvironment& env, CancellableScope& scope) override;
-
-    virtual void value_changed() override;
-
-private:
-    void reset_host(const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context);
-    void reset_joiner(const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context);
-
-    bool run_raid_host(ProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context);
-    void run_raid_joiner(ProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context);
-    void join_lobby(
-        ProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context,
-        size_t host_index, const std::string& normalized_code
-    );
-
-    bool run_raid(
-        MultiSwitchProgramEnvironment& env, CancellableScope& scope,
-        std::string& lobby_code,
-        std::array<std::map<Language, std::string>, 4>& player_names
-    );
-
-private:
-    IntegerEnumDropdownOption HOSTING_SWITCH;
-    SimpleIntegerOption<uint16_t> MAX_WINS;
-
-    enum class Mode{
-        FARM_ALONE,
-        HOST_LOCALLY,
-        HOST_ONLINE,
-    };
-    EnumDropdownOption<Mode> HOSTING_MODE;
-
-    GeneralHostingOptions HOSTING_OPTIONS;
-
-    //  Per-console Options
-    std::unique_ptr<PerConsoleTeraFarmerOptions> PLAYERS[4];
-
-    enum class RecoveryMode{
-        STOP_ON_ERROR,
-        SAVE_AND_RESET,
-    };
-    EnumDropdownOption<RecoveryMode> RECOVERY_MODE;
-    RolloverPrevention ROLLOVER_PREVENTION;
-
-    //  Extended Auto-host Options
-    RaidPlayerBanList BAN_LIST;
-    RaidJoinReportOption JOIN_REPORT;
-
-    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
-    RaidPostNotification NOTIFICATION_RAID_POST;
-    RaidStartNotification NOTIFICATION_RAID_START;
-    JoinReportNotification NOTIFICATION_JOIN_REPORT;
-    EventNotificationsOption NOTIFICATIONS;
-
-    WallClock m_last_time_fix;
-//    std::atomic<bool> m_raid_error;
-    bool m_reset_required[4];
-};
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSV/Programs/TeraRaids/PokemonSV_TeraRoutines.cpp b/SerialPrograms/Source/PokemonSV/Programs/TeraRaids/PokemonSV_TeraRoutines.cpp
deleted file mode 100644
index 1e3d51e9da..0000000000
--- a/SerialPrograms/Source/PokemonSV/Programs/TeraRaids/PokemonSV_TeraRoutines.cpp
+++ /dev/null
@@ -1,668 +0,0 @@
-/*  Tera Exit Routines
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <cmath>
-#include "Common/Cpp/Exceptions.h"
-#include "CommonFramework/Exceptions/ProgramFinishedException.h"
-#include "CommonFramework/Exceptions/FatalProgramException.h"
-#include "CommonFramework/Exceptions/OperationFailedException.h"
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
-#include "CommonFramework/Tools/ProgramEnvironment.h"
-#include "CommonFramework/Tools/ErrorDumper.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "Pokemon/Pokemon_Notification.h"
-#include "PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h"
-//#include "PokemonSV/Inference/PokemonSV_GradientArrowDetector.h"
-#include "PokemonSV/Inference/Battles/PokemonSV_TeraBattleMenus.h"
-#include "PokemonSV/Inference/PokemonSV_PokemonSummaryReader.h"
-#include "PokemonSV/Inference/PokemonSV_MainMenuDetector.h"
-#include "PokemonSV/Inference/PokemonSV_PokePortalDetector.h"
-#include "PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h"
-#include "PokemonSV/Inference/Tera/PokemonSV_TeraCardDetector.h"
-#include "PokemonSV/Inference/Tera/PokemonSV_TeraRaidSearchDetector.h"
-#include "PokemonSV/Inference/Tera/PokemonSV_TeraRewardsReader.h"
-#include "PokemonSV/Programs/PokemonSV_ConnectToInternet.h"
-#include "PokemonSV/Programs/PokemonSV_BasicCatcher.h"
-#include "PokemonSV_TeraRoutines.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-using namespace Pokemon;
-
-
-
-bool open_raid(ConsoleHandle& console, BotBaseContext& context){
-    console.log("Opening raid...");
-    while (true){
-        TeraCardWatcher card_detector(COLOR_RED);
-        AdvanceDialogWatcher dialog(COLOR_YELLOW);
-        int ret = run_until(
-            console, context,
-            [](BotBaseContext& context){
-                //  Do 2 presses in quick succession in case one drops or is
-                //  needed to connect the controller.
-                pbf_press_button(context, BUTTON_A, 5, 5);
-                pbf_press_button(context, BUTTON_A, 20, 355);
-            },
-            {
-                card_detector,
-                dialog,
-            }
-        );
-        switch (ret){
-        case 0:
-            console.log("Tera raid found!", COLOR_BLUE);
-            return true;
-        case 1:
-            console.log("Detect possible uncatchable dialog...", COLOR_ORANGE);
-            pbf_press_button(context, BUTTON_B, 20, 105);
-            continue;
-        default:
-            console.log("No Tera raid found.", COLOR_ORANGE);
-            return false;
-        }
-    }
-}
-void close_raid(const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context){
-    console.log("Closing raid...");
-
-    WallClock start = current_time();
-    while (true){
-        context.wait_for_all_requests();
-        if (current_time() - start > std::chrono::minutes(5)){
-            dump_image_and_throw_recoverable_exception(
-                info, console, "CloseRaidFailed",
-                "Failed to return to overworld after 5 minutes."
-            );
-        }
-
-        TeraCardWatcher card_detector(COLOR_RED);
-        OverworldWatcher overworld(COLOR_CYAN);
-        int ret = wait_until(
-            console, context,
-            std::chrono::seconds(60),
-            {card_detector, overworld}
-        );
-        context.wait_for(std::chrono::milliseconds(100));
-        switch (ret){
-        case 0:
-            pbf_press_button(context, BUTTON_B, 20, 105);
-            continue;
-        case 1:
-            console.log("Detected overworld.");
-            return;
-        default:
-            dump_image_and_throw_recoverable_exception(info, console, "CloseRaidFailed",
-                "close_raid(): No recognized state after 60 seconds.");
-        }
-    }
-}
-
-
-
-void open_hosting_lobby(
-    ProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context,
-    HostingMode mode
-){
-    bool recovery_mode = false;
-    WallClock start = current_time();
-    while (true){
-        context.wait_for_all_requests();
-        if (current_time() - start > std::chrono::minutes(2)){
-            dump_image_and_throw_recoverable_exception(
-                env.program_info(), console, "OpenLobbyFailed",
-                "Unable to open Tera lobby after 2 minutes."
-            );
-        }
-
-        OverworldWatcher overworld(COLOR_RED);
-        if (recovery_mode){
-            context.wait_for_all_requests();
-            int ret = run_until(
-                console, context,
-                [](BotBaseContext& context){
-                    pbf_press_button(context, BUTTON_B, 20, 980);
-                },
-                {overworld}
-            );
-            if (ret < 0){
-                continue;
-            }
-            console.log("Detected overworld. Recovery finished.");
-            recovery_mode = true;
-        }
-
-        TeraCardWatcher card_detector(COLOR_YELLOW);
-        TeraLobbyWatcher lobby(console.logger(), env.realtime_dispatcher(), COLOR_BLUE);
-        context.wait_for_all_requests();
-        int ret = wait_until(
-            console, context,
-            std::chrono::seconds(30),
-            {
-                overworld,
-                card_detector,
-                {lobby, std::chrono::milliseconds(500)}
-            }
-        );
-        context.wait_for(std::chrono::milliseconds(100));
-        switch (ret){
-        case 0:
-            console.log("Detected overworld.");
-            recovery_mode = false;
-            if (!open_raid(console, context)){
-                throw OperationFailedException(
-                    ErrorReport::SEND_ERROR_REPORT, console,
-                    "No Tera raid found.",
-                    true
-                );
-            }
-            continue;
-        case 1:
-            console.log("Detected Tera card.");
-            if (mode != HostingMode::LOCAL){
-                pbf_press_button(context, BUTTON_A, 20, 230);
-                if (mode == HostingMode::ONLINE_EVERYONE){
-                    pbf_press_dpad(context, DPAD_DOWN, 20, 105);
-                }
-            }
-            pbf_press_button(context, BUTTON_A, 20, 230);
-            continue;
-        case 2:
-            console.log("Detected Tera lobby.");
-            return;
-        default:
-            console.log("No state detected after 30 seconds. Backing out...", COLOR_RED);
-            pbf_press_button(context, BUTTON_B, 20, 230);
-            recovery_mode = true;
-        }
-    }
-}
-
-
-
-
-
-void enter_tera_search(
-    const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context,
-    bool connect_to_internet
-){
-    WallClock start = current_time();
-    bool connected = false;
-    while (true){
-        if (current_time() - start > std::chrono::minutes(5)){
-            dump_image_and_throw_recoverable_exception(
-                info, console, "EnterTeraSearchFailed",
-                "enter_tera_search(): Failed to enter Tera search."
-            );
-        }
-
-        OverworldWatcher overworld(COLOR_RED);
-        MainMenuWatcher main_menu(COLOR_YELLOW);
-        PokePortalWatcher poke_portal(COLOR_GREEN);
-        TeraRaidSearchWatcher raid_search(COLOR_CYAN);
-        CodeEntryWatcher code_entry(COLOR_PURPLE);
-        AdvanceDialogWatcher dialog(COLOR_BLUE);
-        context.wait_for_all_requests();
-        int ret = wait_until(
-            console, context,
-            std::chrono::seconds(60),
-            {
-                overworld,
-                main_menu,
-                poke_portal,
-                raid_search,
-                code_entry,
-                dialog,
-            }
-        );
-        context.wait_for(std::chrono::milliseconds(100));
-        switch (ret){
-        case 0:
-            console.log("Detected overworld.");
-            pbf_press_button(context, BUTTON_X, 20, 105);
-            continue;
-        case 1:
-            console.log("Detected main menu.");
-            if (connect_to_internet && !connected){
-                connect_to_internet_from_menu(info, console, context);
-                connected = true;
-                continue;
-            }
-            if (main_menu.move_cursor(info, console, context, MenuSide::RIGHT, 3)){
-                pbf_press_button(context, BUTTON_A, 20, 230);
-            }
-            continue;
-        case 2:
-            console.log("Detected Poke Portal.");
-            if (poke_portal.move_cursor(info, console, context, 1)){
-                pbf_press_button(context, BUTTON_A, 20, 230);
-            }
-            continue;
-        case 3:
-            console.log("Detected Tera Raid Search.");
-            if (raid_search.move_cursor_to_search(info, console, context)){
-                pbf_press_button(context, BUTTON_A, 20, 105);
-            }
-            continue;
-        case 4:
-            console.log("Detected Code Entry.");
-            return;
-        case 5:
-            console.log("Detected Dialog.");
-            pbf_press_button(context, BUTTON_B, 20, 105);
-            continue;
-        default:
-            dump_image_and_throw_recoverable_exception(
-                info, console, "EnterTeraSearchFailed",
-                "enter_tera_search(): No recognized state after 60 seconds."
-            );
-        }
-    }
-}
-
-
-
-
-
-void stop_if_enough_rare_items(
-    ConsoleHandle& console, BotBaseContext& context,
-    size_t stop_on_sparkly_items
-){
-    if (stop_on_sparkly_items == 0){
-        return;
-    }
-    size_t sparkly_items = SparklyItemDetector::count_sparkly_items(console, context);
-    console.log("Sparkly Items Detected: " + std::to_string(sparkly_items), COLOR_BLUE);
-    if (sparkly_items >= stop_on_sparkly_items){
-        throw ProgramFinishedException(console, "Found a raid with " + std::to_string(sparkly_items) + " rare items!", true);
-    }
-}
-
-
-void exit_tera_win_without_catching(
-    const ProgramInfo& info,
-    ConsoleHandle& console, BotBaseContext& context,
-    size_t stop_on_sparkly_items
-){
-    console.log("Exiting raid without catching...");
-
-    WallClock start = current_time();
-    while (true){
-        context.wait_for_all_requests();
-        if (current_time() - start > std::chrono::minutes(5)){
-            dump_image_and_throw_recoverable_exception(
-                info, console, "ExitTeraWinFailed",
-                "Failed to return to overworld after 5 minutes."
-            );
-        }
-
-        TeraCatchWatcher catch_menu(COLOR_BLUE);
-        WhiteButtonWatcher next_button(
-            COLOR_CYAN,
-            WhiteButton::ButtonA,
-            {0.8, 0.93, 0.2, 0.07},
-            WhiteButtonWatcher::FinderType::PRESENT,
-            std::chrono::seconds(1)
-        );
-        AdvanceDialogWatcher dialog(COLOR_YELLOW);
-        OverworldWatcher overworld(COLOR_RED);
-        int ret = wait_until(
-            console, context,
-            std::chrono::seconds(60),
-            {catch_menu, next_button, dialog, overworld}
-        );
-        context.wait_for(std::chrono::milliseconds(100));
-        switch (ret){
-        case 0:
-            console.log("Detected catch prompt.");
-            pbf_press_dpad(context, DPAD_DOWN, 20, 30);
-            pbf_mash_button(context, BUTTON_A, 30);
-            pbf_mash_button(context, BUTTON_B, 125);
-            continue;
-        case 1:
-            console.log("Detected possible (A) Next button.");
-            stop_if_enough_rare_items(console, context, stop_on_sparkly_items);
-            pbf_press_button(context, BUTTON_A, 20, 105);
-            continue;
-        case 2:
-            console.log("Detected dialog.");
-            pbf_press_button(context, BUTTON_B, 20, 105);
-            break;
-        case 3:
-            console.log("Detected overworld.");
-            return;
-        default:
-            dump_image_and_throw_recoverable_exception(
-                info, console, "ExitTeraWinFailed",
-                "exit_tera_win_without_catching(): No recognized state after 60 seconds."
-            );
-        }
-    }
-}
-
-
-void exit_tera_win_by_catching(
-    ProgramEnvironment& env,
-    ConsoleHandle& console, BotBaseContext& context,
-    Language language,
-    const std::string& ball_slug,
-    size_t stop_on_sparkly_items
-){
-    console.log("Exiting raid with catching...");
-
-    VideoSnapshot screenshot;
-    WallClock start = current_time();
-    while (true){
-        context.wait_for_all_requests();
-        if (current_time() - start > std::chrono::minutes(5)){
-            dump_image_and_throw_recoverable_exception(
-                env.program_info(), console, "ExitTeraWinFailed",
-                "Failed to return to overworld after 5 minutes."
-            );
-        }
-
-        TeraCatchWatcher catch_menu(COLOR_BLUE);
-        WhiteButtonWatcher next_button(
-            COLOR_CYAN,
-            WhiteButton::ButtonA,
-            {0.8, 0.93, 0.2, 0.07},
-            WhiteButtonWatcher::FinderType::PRESENT,
-            std::chrono::seconds(1)
-        );
-        AdvanceDialogWatcher advance(COLOR_YELLOW);
-        PromptDialogWatcher add_to_party(COLOR_PURPLE, {0.500, 0.395, 0.400, 0.100});
-        PromptDialogWatcher nickname(COLOR_GREEN, {0.500, 0.545, 0.400, 0.100});
-        MainMenuWatcher main_menu(COLOR_BLUE);
-        OverworldWatcher overworld(COLOR_RED);
-        context.wait_for_all_requests();
-        int ret = wait_until(
-            console, context,
-            std::chrono::seconds(60),
-            {
-                catch_menu,
-                next_button,
-                advance,
-                add_to_party,
-                nickname,
-                main_menu,
-                overworld,
-            }
-        );
-        context.wait_for(std::chrono::milliseconds(100));
-        switch (ret){
-        case 0:{
-            console.log("Detected catch prompt.");
-            screenshot = console.video().snapshot();
-
-            pbf_press_button(context, BUTTON_A, 20, 150);
-            context.wait_for_all_requests();
-
-            BattleBallReader reader(console, language);
-            int quantity = move_to_ball(reader, console, context, ball_slug);
-            if (quantity == 0){
-                throw FatalProgramException(
-                    ErrorReport::NO_ERROR_REPORT, console,
-                    "Unable to find appropriate ball. Did you run out?",
-                    true
-                );
-            }
-            if (quantity < 0){
-                console.log("Unable to read ball quantity.", COLOR_RED);
-            }
-            pbf_mash_button(context, BUTTON_A, 125);
-
-            continue;
-        }
-        case 1:
-            console.log("Detected (A) Next button.");
-            stop_if_enough_rare_items(console, context, stop_on_sparkly_items);
-            pbf_press_button(context, BUTTON_A, 20, 105);
-            pbf_press_button(context, BUTTON_B, 20, 105);
-            continue;
-        case 2:
-            console.log("Detected dialog.");
-            pbf_press_button(context, BUTTON_B, 20, 105);
-            continue;
-        case 3:
-            console.log("Detected add-to-party prompt.");
-            pbf_press_button(context, BUTTON_B, 20, 105);
-            continue;
-        case 4:
-            console.log("Detected nickname prompt.");
-            pbf_press_button(context, BUTTON_B, 20, 105);
-            continue;
-        case 5:
-            console.log("Detected unexpected main menu.", COLOR_RED);
-            pbf_press_button(context, BUTTON_B, 20, 105);
-            continue;
-        case 6:
-            console.log("Detected overworld.");
-            return;
-        default:
-            dump_image_and_throw_recoverable_exception(
-                env.program_info(), console, "ExitTeraWinFailed",
-                "exit_tera_win_by_catching(): No recognized state after 60 seconds."
-            );
-        }
-    }
-}
-
-
-TeraResult exit_tera_win_by_catching(
-    ProgramEnvironment& env,
-    ConsoleHandle& console, BotBaseContext& context,
-    Language language,
-    const std::string& ball_slug,
-    EventNotificationOption& notification_nonshiny,
-    EventNotificationOption& notification_shiny,
-    bool stop_on_shiny, size_t stop_on_sparkly_items,
-    std::atomic<uint64_t>* stat_shinies
-){
-    console.log("Exiting raid with catching...");
-
-    TeraResult result = TeraResult::NO_DETECTION;
-    VideoSnapshot screenshot;
-    WallClock start = current_time();
-    while (true){
-        context.wait_for_all_requests();
-        if (current_time() - start > std::chrono::minutes(5)){
-            dump_image_and_throw_recoverable_exception(
-                env.program_info(), console, "ExitTeraWinFailed",
-                "Failed to return to overworld after 5 minutes."
-            );
-        }
-
-        TeraCatchWatcher catch_menu(COLOR_BLUE);
-        WhiteButtonWatcher next_button(
-            COLOR_CYAN,
-            WhiteButton::ButtonA,
-            {0.8, 0.93, 0.2, 0.07},
-            WhiteButtonWatcher::FinderType::PRESENT,
-            std::chrono::seconds(1)
-        );
-        AdvanceDialogWatcher advance(COLOR_YELLOW);
-        PromptDialogWatcher add_to_party(COLOR_PURPLE, {0.500, 0.395, 0.400, 0.100});
-        PromptDialogWatcher view_summary(COLOR_PURPLE, {0.500, 0.470, 0.400, 0.100});
-        PromptDialogWatcher nickname(COLOR_GREEN, {0.500, 0.545, 0.400, 0.100});
-        PokemonSummaryWatcher summary(COLOR_MAGENTA);
-        MainMenuWatcher main_menu(COLOR_BLUE);
-        OverworldWatcher overworld(COLOR_RED);
-        context.wait_for_all_requests();
-        int ret = wait_until(
-            console, context,
-            std::chrono::seconds(60),
-            {
-                catch_menu,
-                next_button,
-                advance,
-                add_to_party,
-                view_summary,
-                nickname,
-                summary,
-                main_menu,
-                overworld,
-            }
-        );
-        context.wait_for(std::chrono::milliseconds(100));
-        switch (ret){
-        case 0:{
-            console.log("Detected catch prompt.");
-            screenshot = console.video().snapshot();
-
-            pbf_press_button(context, BUTTON_A, 20, 150);
-            context.wait_for_all_requests();
-
-            BattleBallReader reader(console, language);
-            int quantity = move_to_ball(reader, console, context, ball_slug);
-            if (quantity == 0){
-                throw FatalProgramException(
-                    ErrorReport::NO_ERROR_REPORT, console,
-                    "Unable to find appropriate ball. Did you run out?",
-                    true
-                );
-            }
-            if (quantity < 0){
-                console.log("Unable to read ball quantity.", COLOR_RED);
-            }
-            pbf_mash_button(context, BUTTON_A, 125);
-
-            continue;
-        }
-        case 2:
-            console.log("Detected dialog.");
-            pbf_press_button(context, BUTTON_B, 20, 105);
-            continue;
-        case 3:
-            console.log("Detected add-to-party prompt.");
-            if (result == TeraResult::NO_DETECTION){
-                pbf_press_dpad(context, DPAD_DOWN, 20, 60);
-//                pbf_press_button(context, BUTTON_A, 20, 105);
-            }else{
-                pbf_press_button(context, BUTTON_B, 20, 105);
-            }
-            continue;
-        case 4:
-            console.log("Detected cursor over view summary.");
-            pbf_press_button(context, BUTTON_A, 20, 105);
-            continue;
-        case 5:
-            console.log("Detected nickname prompt.");
-            pbf_press_button(context, BUTTON_B, 20, 105);
-            continue;
-        case 1:
-            //  Next button detector is unreliable. Check if the summary is
-            //  open. If so, fall-through to that.
-            if (!summary.detect(console.video().snapshot())){
-                console.log("Detected possible (A) Next button.");
-                stop_if_enough_rare_items(console, context, stop_on_sparkly_items);
-                pbf_press_button(context, BUTTON_A, 20, 105);
-                pbf_press_button(context, BUTTON_B, 20, 105);
-                break;
-            }
-            console.log("Detected false positive (A) Next button.", COLOR_RED);
-        case 6:
-            console.log("Detected summary.");
-            if (result == TeraResult::NO_DETECTION){
-                context.wait_for(std::chrono::milliseconds(500));
-                result = run_tera_summary(
-                    env, console, context,
-                    notification_nonshiny,
-                    notification_shiny,
-                    stop_on_shiny, screenshot,
-                    stat_shinies
-                );
-            }
-            pbf_press_button(context, BUTTON_B, 20, 105);
-            continue;
-        case 7:
-            console.log("Detected unexpected main menu.", COLOR_RED);
-            pbf_press_button(context, BUTTON_B, 20, 105);
-            continue;
-        case 8:
-            console.log("Detected overworld.");
-            if (stop_on_shiny && result == TeraResult::NO_DETECTION){
-                throw UserSetupError(
-                    console,
-                    "Unable to find " + STRING_POKEMON + " summary to check for shininess. "
-                    "Make sure your party is full and \"Send to Boxes\" is set to \"Manual\"."
-                );
-            }
-            return result;
-        default:
-            dump_image_and_throw_recoverable_exception(
-                env.program_info(), console, "ExitTeraWinFailed",
-                "exit_tera_win_by_catching(): No recognized state after 60 seconds."
-            );
-        }
-    }
-}
-
-
-
-
-TeraResult run_tera_summary(
-    ProgramEnvironment& env,
-    ConsoleHandle& console,
-    BotBaseContext& context,
-    EventNotificationOption& notification_nonshiny,
-    EventNotificationOption& notification_shiny,
-    bool stop_on_shiny, const ImageViewRGB32& battle_screenshot,
-    std::atomic<uint64_t>* stat_shinies
-){
-    console.log("Reading summary...");
-
-    VideoSnapshot screen = console.video().snapshot();
-    PokemonSummaryDetector reader;
-    if (reader.is_shiny(screen)){
-        if (stat_shinies != nullptr){
-            (*stat_shinies)++;
-        }
-        send_encounter_notification(
-            env,
-            notification_nonshiny,
-            notification_shiny,
-            false, true,
-            {{{}, ShinyType::UNKNOWN_SHINY}},
-            std::nan(""),
-            battle_screenshot
-        );
-        if (stop_on_shiny){
-            throw ProgramFinishedException();
-        }
-        return TeraResult::SHINY;
-    }else{
-        send_encounter_notification(
-            env,
-            notification_nonshiny,
-            notification_shiny,
-            false, false,
-            {{{}, ShinyType::NOT_SHINY}},
-            std::nan("")
-        );
-        return TeraResult::NOT_SHINY;
-    }
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSV/Programs/TeraRaids/PokemonSV_TeraRoutines.h b/SerialPrograms/Source/PokemonSV/Programs/TeraRaids/PokemonSV_TeraRoutines.h
deleted file mode 100644
index 83d83c35a2..0000000000
--- a/SerialPrograms/Source/PokemonSV/Programs/TeraRaids/PokemonSV_TeraRoutines.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/*  Tera Exit Routines
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSV_TeraExitRoutines_H
-#define PokemonAutomation_PokemonSV_TeraExitRoutines_H
-
-//#include <stdint.h>
-#include <string>
-#include <atomic>
-#include "CommonFramework/Language.h"
-//#include "CommonFramework/Tools/StatsTracking.h"
-
-namespace PokemonAutomation{
-    class ConsoleHandle;
-    class BotBaseContext;
-    class ProgramEnvironment;
-    class EventNotificationOption;
-    class ImageViewRGB32;
-    struct ProgramInfo;
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-
-
-
-
-
-//  While in the overworld, attempt to enter a raid in front of you.
-bool open_raid(ConsoleHandle& console, BotBaseContext& context);
-
-//  While viewing a raid card, close and return to the overworld.
-void close_raid(const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context);
-
-
-enum class HostingMode{
-    LOCAL,
-    ONLINE_CODED,
-    ONLINE_EVERYONE,
-};
-void open_hosting_lobby(
-    ProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context,
-    HostingMode mode
-);
-
-
-//  From overworld or main menu => Code entry for tera raid.
-void enter_tera_search(
-    const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context,
-    bool connect_to_internet
-);
-
-
-
-
-
-//  Exit a Tera raid after winning without catching.
-//  The entry point is with the catch/no-catch option up.
-//  Upon returning, you will be in the overworld.
-void exit_tera_win_without_catching(
-    const ProgramInfo& info,
-    ConsoleHandle& console, BotBaseContext& context,
-    size_t stop_on_sparkly_items
-);
-
-
-//  Exit a Tera raid after winning by catching.
-//  The entry point is with the catch/no-catch option up.
-//  Does not check for shininess.
-void exit_tera_win_by_catching(
-    ProgramEnvironment& env,
-    ConsoleHandle& console, BotBaseContext& context,
-    Language language,
-    const std::string& ball_slug,
-    size_t stop_on_sparkly_items
-);
-
-
-
-enum class TeraResult{
-    NO_DETECTION,
-    NOT_SHINY,
-    SHINY,
-};
-
-//  Exit a Tera raid after winning by catching.
-//  The entry point is with the catch/no-catch option up.
-//  Returns the result of the caught Pokemon.
-//  Upon returning, you will be in the overworld except if it is shiny and
-//  "stop_on_shiny == true', then you will be in the summary of the shiny.
-TeraResult exit_tera_win_by_catching(
-    ProgramEnvironment& env,
-    ConsoleHandle& console, BotBaseContext& context,
-    Language language,
-    const std::string& ball_slug,
-    EventNotificationOption& notification_nonshiny,
-    EventNotificationOption& notification_shiny,
-    bool stop_on_shiny, size_t stop_on_sparkly_items,
-    std::atomic<uint64_t>* stat_shinies
-);
-
-
-
-TeraResult run_tera_summary(
-    ProgramEnvironment& env,
-    ConsoleHandle& console,
-    BotBaseContext& context,
-    EventNotificationOption& notification_nonshiny,
-    EventNotificationOption& notification_shiny,
-    bool stop_on_shiny, const ImageViewRGB32& battle_screenshot,
-    std::atomic<uint64_t>* stat_shinies
-);
-
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSV/Programs/TeraRaids/PokemonSV_TeraSelfFarmer.cpp b/SerialPrograms/Source/PokemonSV/Programs/TeraRaids/PokemonSV_TeraSelfFarmer.cpp
deleted file mode 100644
index 2383766940..0000000000
--- a/SerialPrograms/Source/PokemonSV/Programs/TeraRaids/PokemonSV_TeraSelfFarmer.cpp
+++ /dev/null
@@ -1,415 +0,0 @@
-/*  Tera Farmer
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <set>
-#include <sstream>
-#include "Common/Compiler.h"
-#include "Common/Cpp/Exceptions.h"
-#include "CommonFramework/GlobalSettingsPanel.h"
-#include "CommonFramework/Notifications/ProgramNotifications.h"
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "CommonFramework/VideoPipeline/VideoOverlay.h"
-#include "CommonFramework/Tools/DebugDumper.h"
-#include "CommonFramework/Tools/ErrorDumper.h"
-#include "CommonFramework/Tools/StatsTracking.h"
-#include "CommonFramework/Tools/VideoResolutionCheck.h"
-#include "NintendoSwitch/NintendoSwitch_Settings.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
-#include "Pokemon/Pokemon_Strings.h"
-//#include "Pokemon/Pokemon_Notification.h"
-#include "Pokemon/Inference/Pokemon_NameReader.h"
-#include "PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.h"
-#include "PokemonSV/PokemonSV_Settings.h"
-#include "PokemonSV/Inference/Tera/PokemonSV_TeraCardDetector.h"
-#include "PokemonSV/Inference/Tera/PokemonSV_TeraSilhouetteReader.h"
-#include "PokemonSV/Inference/Tera/PokemonSV_TeraTypeReader.h"
-//#include "PokemonSV/Inference/PokemonSV_MainMenuDetector.h"
-#include "PokemonSV/Programs/PokemonSV_SaveGame.h"
-#include "PokemonSV/Programs/PokemonSV_Navigation.h"
-#include "PokemonSV/Programs/TeraRaids/PokemonSV_TeraRoutines.h"
-#include "PokemonSV/Programs/TeraRaids/PokemonSV_TeraBattler.h"
-#include "PokemonSV_TeraSelfFarmer.h"
-
-//#include <iostream>
-//using std::cout;
-//using std::endl;
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-using namespace Pokemon;
-
-
-TeraSelfFarmer_Descriptor::TeraSelfFarmer_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonSV:TeraSelfFarmer",
-        STRING_POKEMON + " SV", "Tera Self Farmer",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonSV/TeraSelfFarmer.md",
-        "Farm items and " + STRING_POKEMON + " from Tera raids. Can also hunt for shiny and high reward raids.",
-        FeedbackType::REQUIRED,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-struct TeraSelfFarmer_Descriptor::Stats : public StatsTracker{
-    Stats()
-        : m_skips(m_stats["Date Skips"])
-        , m_raids(m_stats["Raids"])
-        , m_wins(m_stats["Wins"])
-        , m_losses(m_stats["Losses"])
-        , m_skipped(m_stats["Skipped"])
-        , m_errors(m_stats["Errors"])
-        , m_caught(m_stats["Caught"])
-        , m_shinies(m_stats["Shinies"])
-    {
-        m_display_order.emplace_back("Date Skips");
-        m_display_order.emplace_back("Raids");
-        m_display_order.emplace_back("Wins");
-        m_display_order.emplace_back("Losses");
-        m_display_order.emplace_back("Skipped");
-        m_display_order.emplace_back("Errors", true);
-        m_display_order.emplace_back("Caught", true);
-        m_display_order.emplace_back("Shinies", true);
-    }
-    std::atomic<uint64_t>& m_skips;
-    std::atomic<uint64_t>& m_raids;
-    std::atomic<uint64_t>& m_wins;
-    std::atomic<uint64_t>& m_losses;
-    std::atomic<uint64_t>& m_skipped;
-    std::atomic<uint64_t>& m_errors;
-    std::atomic<uint64_t>& m_caught;
-    std::atomic<uint64_t>& m_shinies;
-};
-std::unique_ptr<StatsTracker> TeraSelfFarmer_Descriptor::make_stats() const{
-    return std::unique_ptr<StatsTracker>(new Stats());
-}
-
-
-
-TeraFarmerOpponentFilter::TeraFarmerOpponentFilter()
-    : GroupOption("Opponent Filter", LockWhileRunning::UNLOCKED)
-    , SKIP_HERBA(
-        "<b>Skip Non-Herba Raids:</b><br>"
-        "Skip raids that don't have the possibility to reward all types of Herba Mystica. This won't stop the program when Herba Mystica is found, it will only increase your chances to find it.",
-        LockWhileRunning::UNLOCKED,
-        false
-    )
-    , MIN_STARS(
-        "<b>Min Stars:</b><br>Skip raids with less than this many stars.",
-        LockWhileRunning::UNLOCKED,
-        1, 1, 7
-    )
-    , MAX_STARS(
-        "<b>Max Stars:</b><br>Skip raids with more than this many stars to save time since you're likely to lose.",
-        LockWhileRunning::UNLOCKED,
-        4, 1, 7
-    )
-{
-    PA_ADD_OPTION(SKIP_HERBA);
-    PA_ADD_OPTION(MIN_STARS);
-    PA_ADD_OPTION(MAX_STARS);
-}
-
-bool TeraFarmerOpponentFilter::should_battle(size_t stars, const std::string& pokemon) const{
-    if (stars < MIN_STARS || stars > MAX_STARS){
-        return false;
-    }
-
-    static const std::set<std::string> fivestar{
-        "gengar", "glalie", "amoonguss", "dondozo", "palafin", "finizen", "blissey", "eelektross", "driftblim", "cetitan"
-    };
-    static const std::set<std::string> sixstar{
-        "blissey", "vaporeon", "amoonguss", "farigiraf", "cetitan", "dondozo"
-    };
-
-    if (SKIP_HERBA){
-        if (fivestar.find(pokemon) != fivestar.end()){
-            return true;
-        }
-        if (sixstar.find(pokemon) != sixstar.end()){
-            return true;
-        }
-        return false;
-    }
-
-    return true;
-}
-
-TeraFarmerCatchOnWin::TeraFarmerCatchOnWin(TeraSelfFarmer& program)
-    : GroupOption("Catch on Win - Required for shiny checking.", LockWhileRunning::UNLOCKED, true)
-    , m_program(program)
-    , BALL_SELECT(
-        "<b>Ball Select:</b>",
-        LockWhileRunning::UNLOCKED,
-        "poke-ball"
-    )
-    , FIX_TIME_ON_CATCH(
-        "<b>Fix Clock:</b><br>Fix the time when catching so the caught date will be correct.",
-        LockWhileRunning::UNLOCKED, false
-    )
-{
-    PA_ADD_OPTION(BALL_SELECT);
-    PA_ADD_OPTION(FIX_TIME_ON_CATCH);
-}
-void TeraFarmerCatchOnWin::on_set_enabled(bool enabled){
-    m_program.STOP_CONDITIONS.STOP_ON_SHINY.set_visibility(
-        enabled ? ConfigOptionState::ENABLED : ConfigOptionState::DISABLED
-    );
-}
-
-TeraFarmerStopConditions::TeraFarmerStopConditions()
-    : GroupOption("Stop Conditions", LockWhileRunning::UNLOCKED)
-    , MAX_CATCHES(
-        "<b>Max Catches:</b><br>Stop program after catching this many " + STRING_POKEMON + ".",
-        LockWhileRunning::UNLOCKED,
-        50, 1, 999
-    )
-    , STOP_ON_SHINY(
-        "<b>Stop on Shiny:</b> (requires catching the " + STRING_POKEMON + ")<br>"
-        "Stop the program if a shiny is found. Resetting the game will return you to the front of this (shiny) raid so it can be hosted again.",
-        LockWhileRunning::UNLOCKED,
-        true
-    )
-    , STOP_ON_RARE_ITEMS(
-        "<b>Stop on Rare Items:</b><br>"
-        "Stop the program if the rewards contain at least this many rare (sparkly) items. Set to zero to disable this feature and never stop for item rewards.<br>"
-        "Note that the program can only see the first 8 item rewards. It will not scroll down.",
-        LockWhileRunning::UNLOCKED,
-        0, 0, 8
-    )
-{
-    PA_ADD_OPTION(MAX_CATCHES);
-    PA_ADD_OPTION(STOP_ON_SHINY);
-    PA_ADD_OPTION(STOP_ON_RARE_ITEMS);
-}
-
-
-TeraSelfFarmer::TeraSelfFarmer()
-    : LANGUAGE(
-        "<b>Game Language:</b>",
-        PokemonNameReader::instance().languages(),
-        LockWhileRunning::UNLOCKED
-    )
-    , CATCH_ON_WIN(*this)
-    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
-    , NOTIFICATION_NONSHINY(
-        "Non-Shiny Encounter",
-        true, false,
-        {"Notifs"},
-        std::chrono::seconds(3600)
-    )
-    , NOTIFICATION_SHINY(
-        "Shiny Encounter",
-        true, true, ImageAttachmentMode::JPG,
-        {"Notifs", "Showcase"}
-    )
-    , NOTIFICATIONS({
-        &NOTIFICATION_STATUS_UPDATE,
-        &NOTIFICATION_NONSHINY,
-        &NOTIFICATION_SHINY,
-        &NOTIFICATION_PROGRAM_FINISH,
-        &NOTIFICATION_ERROR_RECOVERABLE,
-        &NOTIFICATION_ERROR_FATAL,
-    })
-{
-    PA_ADD_OPTION(LANGUAGE);
-    PA_ADD_OPTION(FILTER);
-    PA_ADD_OPTION(BATTLE_AI);
-    PA_ADD_OPTION(CATCH_ON_WIN);
-    PA_ADD_OPTION(STOP_CONDITIONS);
-    PA_ADD_OPTION(NOTIFICATIONS);
-}
-
-
-
-bool TeraSelfFarmer::run_raid(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    env.console.log("Running raid...");
-
-    TeraSelfFarmer_Descriptor::Stats& stats = env.current_stats<TeraSelfFarmer_Descriptor::Stats>();
-
-    bool win = run_tera_battle(env, env.console, context, BATTLE_AI);
-
-    if (win){
-        stats.m_wins++;
-    }else{
-        stats.m_losses++;
-        context.wait_for(std::chrono::seconds(3));
-        return false;
-    }
-
-    if (!CATCH_ON_WIN.enabled()){
-        exit_tera_win_without_catching(env.program_info(), env.console, context, STOP_CONDITIONS.STOP_ON_RARE_ITEMS);
-        return true;
-    }
-
-    VideoSnapshot battle_snapshot = env.console.video().snapshot();
-
-
-    if (CATCH_ON_WIN.FIX_TIME_ON_CATCH){
-        pbf_press_button(context, BUTTON_HOME, 10, GameSettings::instance().GAME_TO_HOME_DELAY);
-        home_to_date_time(context, false, false);
-        pbf_press_button(context, BUTTON_A, 20, 105);
-        pbf_press_button(context, BUTTON_A, 20, 105);
-        pbf_press_button(context, BUTTON_HOME, 20, ConsoleSettings::instance().SETTINGS_TO_HOME_DELAY);
-        resume_game_from_home(env.console, context);
-    }
-
-    m_number_caught++;
-    stats.m_caught++;
-
-    exit_tera_win_by_catching(
-        env, env.console, context,
-        LANGUAGE,
-        CATCH_ON_WIN.BALL_SELECT.slug(),
-        NOTIFICATION_NONSHINY,
-        NOTIFICATION_SHINY,
-        STOP_CONDITIONS.STOP_ON_SHINY,
-        STOP_CONDITIONS.STOP_ON_RARE_ITEMS,
-        &stats.m_shinies
-    );
-    return true;
-}
-
-
-void TeraSelfFarmer::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    assert_16_9_720p_min(env.logger(), env.console);
-
-    TeraSelfFarmer_Descriptor::Stats& stats = env.current_stats<TeraSelfFarmer_Descriptor::Stats>();
-
-    if (FILTER.MIN_STARS > FILTER.MAX_STARS){
-        throw UserSetupError(env.console, "Error in the settings, \"Min Stars\" is bigger than \"Max Stars\".");
-    }
-    
-    if (FILTER.SKIP_HERBA && FILTER.MAX_STARS < 5){
-        throw UserSetupError(env.console, "Error in the settings, Skip Non-Herba Raids is checked but Max Stars is less than 5.");
-    }
-
-    m_number_caught = 0;
-
-    //  Connect the controller.
-    pbf_press_button(context, BUTTON_LCLICK, 10, 10);
-
-    bool first = true;
-
-    while (true){
-        if (m_number_caught >= STOP_CONDITIONS.MAX_CATCHES){
-            break;
-        }
-
-        env.update_stats();
-        send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
-
-        if (!first){
-            day_skip_from_overworld(env.console, context);
-            pbf_wait(context, GameSettings::instance().RAID_SPAWN_DELAY);
-            context.wait_for_all_requests();
-            stats.m_skips++;
-        }
-        first = false;
-
-        if (open_raid(env.console, context)){
-            stats.m_raids++;
-        }else{
-            continue;
-        }
-        context.wait_for(std::chrono::milliseconds(500));
-
-        VideoSnapshot screen = env.console.video().snapshot();
-        TeraCardReader reader(COLOR_RED);
-        size_t stars = reader.stars(screen);
-        if (stars == 0){
-            dump_image(env.logger(), env.program_info(), "ReadStarsFailed", *screen.frame);
-        }
-
-        VideoOverlaySet overlay_set(env.console);
-
-        TeraSilhouetteReader silhouette_reader;
-        silhouette_reader.make_overlays(overlay_set);
-        ImageMatch::ImageMatchResult silhouette = silhouette_reader.read(screen);
-        silhouette.log(env.logger(), 100);
-        std::string best_silhouette = silhouette.results.empty() ? "UnknownSilhouette" : silhouette.results.begin()->second;
-        if (silhouette.results.empty()){
-            dump_image(env.logger(), env.program_info(), "ReadSilhouetteFailed", *screen.frame);
-        }
-        else if (PreloadSettings::debug().IMAGE_TEMPLATE_MATCHING){
-            dump_debug_image(env.logger(), "PokemonSV/TeraSelfFarmer/" + best_silhouette, "", screen);
-        }
-
-        TeraTypeReader type_reader;
-        type_reader.make_overlays(overlay_set);
-        ImageMatch::ImageMatchResult type = type_reader.read(screen);
-        type.log(env.logger(), 100);
-        std::string best_type = type.results.empty() ? "UnknownType" : type.results.begin()->second;
-        if (type.results.empty()){
-            dump_image(env.logger(), env.program_info(), "ReadTypeFailed", *screen.frame);
-        }
-        else if (PreloadSettings::debug().IMAGE_TEMPLATE_MATCHING){
-            dump_debug_image(env.logger(), "PokemonSV/TeraSelfFarmer/" + best_type, "", screen);
-        }
-
-        {
-            std::string log = "Detected a " + std::to_string(stars) + "* " + best_type + " " + best_silhouette;
-            env.console.overlay().add_log(log, COLOR_GREEN);
-            env.log(log);
-        }
-
-        if (!FILTER.should_battle(stars, best_silhouette)) {
-            env.log("Skipping raid...", COLOR_ORANGE);
-            stats.m_skipped++;
-            close_raid(env.program_info(), env.console, context);
-            continue;
-        }
-        
-        
-        
-
-        close_raid(env.program_info(), env.console, context);
-        save_game_from_overworld(env.program_info(), env.console, context);
-        context.wait_for_all_requests();
-        if (open_raid(env.console, context)){
-            env.log("Tera raid found!", COLOR_BLUE);
-        }else{
-            env.log("No Tera raid found.", COLOR_ORANGE);
-            continue;
-        }
-
-        pbf_press_dpad(context, DPAD_DOWN, 10, 10);
-        pbf_mash_button(context, BUTTON_A, 250);
-        bool raid_won = run_raid(env, context);
-        {
-            std::stringstream ss;
-            ss << "You ";
-            if (raid_won){
-                ss << "won";
-            }
-            else{
-                ss << "lost";
-            }
-            ss << " a " << stars << "* " << best_type << " " << best_silhouette << " raid";
-            env.log(ss.str());
-            env.console.overlay().add_log(ss.str(), COLOR_GREEN);
-        }
-    }
-
-    env.update_stats();
-    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
-}
-
-
-
-
-
-
-
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSV/Programs/TeraRaids/PokemonSV_TeraSelfFarmer.h b/SerialPrograms/Source/PokemonSV/Programs/TeraRaids/PokemonSV_TeraSelfFarmer.h
deleted file mode 100644
index 64afb183d0..0000000000
--- a/SerialPrograms/Source/PokemonSV/Programs/TeraRaids/PokemonSV_TeraSelfFarmer.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/*  Tera Farmer
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSV_TeraSelfFarmer_H
-#define PokemonAutomation_PokemonSV_TeraSelfFarmer_H
-
-#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
-#include "Common/Cpp/Options/SimpleIntegerOption.h"
-//#include "Common/Cpp/Options/EnumDropdownOption.h"
-#include "CommonFramework/Notifications/EventNotificationsTable.h"
-#include "CommonFramework/Options/LanguageOCROption.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-#include "PokemonSwSh/Options/PokemonSwSh_BallSelectOption.h"
-#include "PokemonSV/Options/PokemonSV_TeraAIOption.h"
-
-namespace PokemonAutomation{
-    struct VideoSnapshot;
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-class TeraSelfFarmer;
-
-
-class TeraSelfFarmer_Descriptor : public SingleSwitchProgramDescriptor{
-public:
-    TeraSelfFarmer_Descriptor();
-
-    struct Stats;
-    virtual std::unique_ptr<StatsTracker> make_stats() const override;
-
-};
-
-
-
-
-class TeraFarmerOpponentFilter : public GroupOption{
-public:
-    TeraFarmerOpponentFilter();
-
-    bool should_battle(size_t stars, const std::string& pokemon) const;
-
-    BooleanCheckBoxOption SKIP_HERBA;
-    SimpleIntegerOption<uint8_t> MIN_STARS;
-    SimpleIntegerOption<uint8_t> MAX_STARS;
-
-};
-class TeraFarmerCatchOnWin : public GroupOption{
-public:
-    TeraFarmerCatchOnWin(TeraSelfFarmer& program);
-    virtual void on_set_enabled(bool enabled) override;
-
-private:
-    TeraSelfFarmer& m_program;
-
-public:
-    PokemonSwSh::PokemonBallSelectOption BALL_SELECT;
-    BooleanCheckBoxOption FIX_TIME_ON_CATCH;
-};
-class TeraFarmerStopConditions : public GroupOption{
-public:
-    TeraFarmerStopConditions();
-
-    SimpleIntegerOption<uint16_t> MAX_CATCHES;
-    BooleanCheckBoxOption STOP_ON_SHINY;
-    SimpleIntegerOption<uint8_t> STOP_ON_RARE_ITEMS;
-};
-
-
-
-class TeraSelfFarmer : public SingleSwitchProgramInstance{
-public:
-    TeraSelfFarmer();
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-    bool run_raid(SingleSwitchProgramEnvironment& env, BotBaseContext& context);
-
-private:
-    friend class TeraFarmerCatchOnWin;
-
-    OCR::LanguageOCROption LANGUAGE;
-
-    TeraFarmerOpponentFilter FILTER;
-    TeraAIOption BATTLE_AI;
-    TeraFarmerCatchOnWin CATCH_ON_WIN;
-    TeraFarmerStopConditions STOP_CONDITIONS;
-
-    //  Notifications
-    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
-    EventNotificationOption NOTIFICATION_NONSHINY;
-    EventNotificationOption NOTIFICATION_SHINY;
-    EventNotificationsOption NOTIFICATIONS;
-
-    uint16_t m_number_caught;
-
-    //  Per iteration flags.
-//    bool m_battle_finished;
-//    bool m_caught;
-//    bool m_summary_read;
-};
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSV/Programs/TestPrograms/PokemonSV_SoundListener.cpp b/SerialPrograms/Source/PokemonSV/Programs/TestPrograms/PokemonSV_SoundListener.cpp
deleted file mode 100644
index 03ee28afed..0000000000
--- a/SerialPrograms/Source/PokemonSV/Programs/TestPrograms/PokemonSV_SoundListener.cpp
+++ /dev/null
@@ -1,117 +0,0 @@
-/*  Sound Listener
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <float.h>
-#include <chrono>
-#include <map>
-#include <iostream>
-#include <fstream>
-#include <sstream>
-#include "Common/Cpp/Exceptions.h"
-#include "ClientSource/Connection/BotBase.h"
-#include "CommonFramework/InferenceInfra/InferenceSession.h"
-#include "Pokemon/Pokemon_Strings.h"
-//#include "PokemonLA/PokemonLA_Settings.h"
-#include "PokemonSV/Inference/Battles/PokemonSV_ShinySoundDetector.h"
-#include "PokemonSV/Inference/Overworld/PokemonSV_LetsGoKillDetector.h"
-#include "PokemonSV_SoundListener.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-using namespace Pokemon;
-
-
-
-SoundListener_Descriptor::SoundListener_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonLA:SoundListener",
-        STRING_POKEMON + " LA", "Sound Listener",
-        "",
-        "Test sound detectors listening to audio stream.",
-        FeedbackType::REQUIRED, AllowCommandsWhenRunning::ENABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-
-
-SoundListener::SoundListener()
-    : SOUND_TYPE("<b>Which Sound to Detect</b>",
-        {
-            {SoundType::Shiny,          "shiny",        "Shiny Sound"},
-            {SoundType::LetsGoKill,     "lets-go-kill", "Let's Go Kill"},
-        },
-        LockWhileRunning::LOCKED,
-        SoundType::Shiny
-    )
-    , STOP_ON_DETECTED_SOUND(
-        "<b>Stop on the detected sound</b><br>Stop program when the sound is detected.",
-        LockWhileRunning::LOCKED,
-        false
-    )
-{
-    PA_ADD_OPTION(SOUND_TYPE);
-    PA_ADD_OPTION(STOP_ON_DETECTED_SOUND);
-}
-
-
-// void search_alpha_roar_from_audio_dump();
-
-void SoundListener::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    //  Connect the controller.
-    // pbf_move_right_joystick(context, 0, 255, 10, 0);
-
-    // search_alpha_roar_from_audio_dump();
-    // return;
-
-    std::cout << "Running audio test program." << std::endl;
-
-    std::unique_ptr<AudioInferenceCallback> detector;
-    auto action = [&](float error_coefficient) -> bool{
-        // This lambda function will be called when the sound is detected.
-        // Its return will determine whether to stop the program:
-        return STOP_ON_DETECTED_SOUND;
-    };
-
-    SoundType type = SOUND_TYPE;
-    switch (type){
-    case SoundType::Shiny:
-        detector = std::make_unique<ShinySoundDetector>(env.console, action);
-        break;
-    case SoundType::LetsGoKill:
-        detector = std::make_unique<LetsGoKillSoundDetector>(env.console, action);
-        break;
-    default:
-        throw InternalProgramError(
-            &env.logger(), PA_CURRENT_FUNCTION,
-            "Not such sound detector as sound type " + std::to_string((size_t)type)
-        );
-    }
-
-#if 0
-    ShinySoundDetector detector0(env.console, action);
-    LetsGoKillSoundDetector detector1(env.console, action);
-    InferenceSession session(
-        context, env.console,
-        {detector0, detector1}
-    );
-#else
-    InferenceSession session(
-        context, env.console,
-        {*detector}
-    );
-#endif
-    context.wait_until_cancel();
-
-    std::cout << "Audio test program Sound listener finished." << std::endl;
-}
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSV/Programs/Trading/PokemonSV_SelfBoxTrade.cpp b/SerialPrograms/Source/PokemonSV/Programs/Trading/PokemonSV_SelfBoxTrade.cpp
deleted file mode 100644
index 1392091cde..0000000000
--- a/SerialPrograms/Source/PokemonSV/Programs/Trading/PokemonSV_SelfBoxTrade.cpp
+++ /dev/null
@@ -1,101 +0,0 @@
-/*  Self Box Trade
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/Notifications/ProgramNotifications.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "Pokemon/Pokemon_Strings.h"
-//#include "PokemonSV/PokemonSV_Settings.h"
-#include "PokemonSV_TradeRoutines.h"
-#include "PokemonSV_SelfBoxTrade.h"
-#include "PokemonSV/Programs/Boxes/PokemonSV_BoxRoutines.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-    using namespace Pokemon;
-
-
-SelfBoxTrade_Descriptor::SelfBoxTrade_Descriptor()
-    : MultiSwitchProgramDescriptor(
-        "PokemonSV:SelfBoxTrade",
-        STRING_POKEMON + " SV", "Self Box Trade",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonSV/SelfBoxTrade.md",
-        "Trade boxes of " + STRING_POKEMON + " between two local Switches.",
-        FeedbackType::REQUIRED,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB,
-        2, 2, 2
-    )
-{}
-std::unique_ptr<StatsTracker> SelfBoxTrade_Descriptor::make_stats() const{
-    return std::unique_ptr<StatsTracker>(new TradeStats());
-}
-
-
-
-SelfBoxTrade::SelfBoxTrade()
-    : BOXES_TO_TRADE(
-        "<b>Number of Boxes to Trade:</b>",
-        LockWhileRunning::LOCKED,
-        2, 0, 32
-    )
-    , START_ROW(
-        "<b>Starting Row of 1st Box:</b>",
-        LockWhileRunning::LOCKED,
-        1, 1, 5
-    )
-    , START_COL(
-        "<b>Starting Column of 1st Box:</b>",
-        LockWhileRunning::LOCKED,
-        1, 1, 6
-    )
-    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
-    , NOTIFICATIONS({
-        &NOTIFICATION_STATUS_UPDATE,
-        &NOTIFICATION_PROGRAM_FINISH,
-        &NOTIFICATION_ERROR_FATAL,
-    })
-{
-    PA_ADD_OPTION(BOXES_TO_TRADE);
-    PA_ADD_OPTION(START_ROW);
-    PA_ADD_OPTION(START_COL);
-    PA_ADD_OPTION(NOTIFICATIONS);
-}
-
-
-
-void SelfBoxTrade::program(MultiSwitchProgramEnvironment& env, CancellableScope& scope){
-    TradeStats& stats = env.current_stats<TradeStats>();
-    env.update_stats();
-
-    uint8_t start_row = START_ROW - 1;
-    uint8_t start_col = START_COL - 1;
-
-    for (uint8_t box = 0; box < BOXES_TO_TRADE; box++){
-        if (box != 0){
-            env.run_in_parallel(scope, [](ConsoleHandle& console, BotBaseContext& context){
-                move_to_right_box(context);
-//                pbf_press_dpad(context, DPAD_RIGHT, 20, 30);
-//                pbf_press_dpad(context, DPAD_DOWN, 20, 30);
-//                pbf_press_dpad(context, DPAD_DOWN, 20, 30);
-//                pbf_press_dpad(context, DPAD_DOWN, 20, 30);
-            });
-        }
-        trade_current_box(env, scope, NOTIFICATION_STATUS_UPDATE, stats, start_row, start_col);
-        start_row = 0;
-        start_col = 0;
-    }
-
-    env.update_stats();
-    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
-}
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSV/Programs/Trading/PokemonSV_TradeRoutines.cpp b/SerialPrograms/Source/PokemonSV/Programs/Trading/PokemonSV_TradeRoutines.cpp
deleted file mode 100644
index c06425d91c..0000000000
--- a/SerialPrograms/Source/PokemonSV/Programs/Trading/PokemonSV_TradeRoutines.cpp
+++ /dev/null
@@ -1,207 +0,0 @@
-/*  Trade Routines
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/Notifications/ProgramNotifications.h"
-#include "CommonFramework/ImageTools/SolidColorTest.h"
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
-#include "CommonFramework/Inference/BlackScreenDetector.h"
-//#include "CommonFramework/Inference/ImageMatchDetector.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-//#include "PokemonSV/PokemonSV_Settings.h"
-#include "PokemonSV/Inference/Dialogs/PokemonSV_GradientArrowDetector.h"
-#include "PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h"
-#include "PokemonSV/Inference/Boxes/PokemonSV_BoxDetection.h"
-#include "PokemonSV/Programs/Boxes/PokemonSV_BoxRoutines.h"
-#include "PokemonSV_TradeRoutines.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-
-
-
-TradeStats::TradeStats()
-    : m_trades(m_stats["Trades"])
-    , m_errors(m_stats["Errors"])
-{
-    m_display_order.emplace_back("Trades");
-    m_display_order.emplace_back("Errors", true);
-}
-
-
-class TradeWarningDetector : public StaticScreenDetector{
-public:
-    TradeWarningDetector(Color color)
-        : m_color(color)
-//        , m_box_top(0.30, 0.33, 0.40, 0.02)
-//        , m_box_bot(0.30, 0.65, 0.40, 0.02)
-        , m_box_left(0.25, 0.33, 0.02, 0.34)
-        , m_box_right(0.73, 0.33, 0.02, 0.34)
-    {}
-    virtual void make_overlays(VideoOverlaySet& items) const override{
-//        items.add(m_color, m_box_top);
-//        items.add(m_color, m_box_bot);
-        items.add(m_color, m_box_left);
-        items.add(m_color, m_box_right);
-    }
-    virtual bool detect(const ImageViewRGB32& screen) const override{
-        ImageStats box_top = image_stats(extract_box_reference(screen, m_box_left));
-        if (!is_solid(box_top, {0.11424, 0.310539, 0.575221}, 0.30)){
-            return false;
-        }
-        ImageStats box_bot = image_stats(extract_box_reference(screen, m_box_right));
-        if (!is_solid(box_bot, {0.11424, 0.310539, 0.575221}, 0.30)){
-            return false;
-        }
-        return true;
-    }
-
-protected:
-    Color m_color;
-//    ImageFloatBox m_box_top;
-//    ImageFloatBox m_box_bot;
-    ImageFloatBox m_box_left;
-    ImageFloatBox m_box_right;
-};
-class TradeWarningFinder : public DetectorToFinder<TradeWarningDetector>{
-public:
-    TradeWarningFinder(Color color)
-         : DetectorToFinder("TradeWarningFinder", std::chrono::milliseconds(250), color)
-    {}
-};
-
-
-
-class TradeDoneDetector : public StaticScreenDetector{
-public:
-    TradeDoneDetector(VideoOverlay& overlay)
-        : m_cursor(COLOR_RED, GradientArrowType::DOWN, {0.24, 0.17, 0.38, 0.55})
-        , m_slot(COLOR_RED, true)
-    {}
-    virtual void make_overlays(VideoOverlaySet& items) const override{
-        m_cursor.make_overlays(items);
-        m_slot.make_overlays(items);
-    }
-    virtual bool detect(const ImageViewRGB32& screen) const override{
-        return m_cursor.detect(screen) && m_slot.detect(screen);
-    }
-
-private:
-    GradientArrowDetector m_cursor;
-    SomethingInBoxSlotDetector m_slot;
-};
-class TradeDoneHold : public DetectorToFinder<TradeDoneDetector>{
-public:
-    TradeDoneHold(VideoOverlay& overlay)
-         : DetectorToFinder("AdvanceDialogHold", std::chrono::milliseconds(500), overlay)
-    {}
-};
-
-
-
-void trade_current_pokemon(
-    ConsoleHandle& console, BotBaseContext& context,
-    MultiConsoleErrorState& tracker,
-    TradeStats& stats
-){
-    tracker.check_unrecoverable_error(console);
-    context.wait_for_all_requests();
-
-    //  Make sure there is something to trade.
-    {
-        SomethingInBoxSlotDetector detector(COLOR_CYAN, true);
-        if (!detector.detect(console.video().snapshot())){
-            stats.m_errors++;
-            tracker.report_unrecoverable_error(console, "Box slot is empty.");
-        }
-    }
-
-
-    //  Wait for black screen.
-    {
-        BlackScreenOverWatcher black_screen(COLOR_CYAN);
-        int ret = run_until(
-            console, context,
-            [](BotBaseContext& context){
-                pbf_mash_button(context, BUTTON_A, 120 * TICKS_PER_SECOND);
-            },
-            {{black_screen}}
-        );
-        if (ret < 0){
-            stats.m_errors++;
-            tracker.report_unrecoverable_error(console, "Failed to detect start of trade after 2 minutes.");
-        }
-        console.log("Detected start of trade.");
-        context.wait_for(std::chrono::milliseconds(100));
-        tracker.check_unrecoverable_error(console);
-    }
-
-
-    TradeDoneHold trade_done(console);
-
-    while (true){
-        AdvanceDialogWatcher dialog(COLOR_YELLOW, std::chrono::seconds(2));
-        PromptDialogWatcher learn_move(COLOR_BLUE);
-
-        int ret = wait_until(
-            console, context, std::chrono::minutes(2),
-            {dialog, trade_done, learn_move}
-        );
-        switch (ret){
-        case 0:
-            console.log("Detected dialog.");
-            pbf_press_button(context, BUTTON_B, 20, 105);
-            break;
-        case 1:
-            console.log("Detected box. Trade completed.");
-            tracker.check_unrecoverable_error(console);
-            context.wait_for(std::chrono::milliseconds(500));
-            return;
-        case 2:
-            console.log("Detected move learn.");
-            pbf_press_button(context, BUTTON_B, 20, 105);
-            break;
-        default:
-            stats.m_errors++;
-            tracker.report_unrecoverable_error(console, "Failed to return to box after 2 minutes after a trade.");
-        }
-    }
-}
-
-
-void trade_current_box(
-    MultiSwitchProgramEnvironment& env, CancellableScope& scope,
-    EventNotificationOption& notifications,
-    TradeStats& stats,
-    uint8_t start_row, uint8_t start_col
-){
-    for (uint8_t row = start_row; row < 5; row++){
-        for (uint8_t col = start_col; col < 6; col++){
-            env.update_stats();
-            send_program_status_notification(env, notifications);
-
-            MultiConsoleErrorState error_state;
-            env.run_in_parallel(scope, [&](ConsoleHandle& console, BotBaseContext& context){
-                VideoOverlaySet overlays(console.overlay());
-
-                move_box_cursor(env.program_info(), console, context, BoxCursorLocation::SLOTS, row, col);
-
-                trade_current_pokemon(console, context, error_state, stats);
-            });
-            stats.m_trades++;
-        }
-        start_col = 0;
-    }
-}
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSV/Programs/Trading/PokemonSV_TradeRoutines.h b/SerialPrograms/Source/PokemonSV/Programs/Trading/PokemonSV_TradeRoutines.h
deleted file mode 100644
index 676b92d436..0000000000
--- a/SerialPrograms/Source/PokemonSV/Programs/Trading/PokemonSV_TradeRoutines.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*  Trade Routines
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSV_TradeRoutines_H
-#define PokemonAutomation_PokemonSV_TradeRoutines_H
-
-#include "CommonFramework/Tools/StatsTracking.h"
-#include "CommonFramework/Tools/ConsoleHandle.h"
-#include "CommonFramework/Tools/MultiConsoleErrors.h"
-#include "NintendoSwitch/NintendoSwitch_MultiSwitchProgram.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-
-
-struct TradeStats : public StatsTracker{
-    TradeStats();
-    std::atomic<uint64_t>& m_trades;
-    std::atomic<uint64_t>& m_errors;
-};
-
-
-
-
-void trade_current_pokemon(
-    ConsoleHandle& console, BotBaseContext& context,
-    MultiConsoleErrorState& tracker,
-    TradeStats& stats
-);
-void trade_current_box(
-    MultiSwitchProgramEnvironment& env, CancellableScope& scope,
-    EventNotificationOption& notifications,
-    TradeStats& stats,
-    uint8_t start_row, uint8_t start_col
-);
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSV/Resources/PokemonSV_ItemSprites.h b/SerialPrograms/Source/PokemonSV/Resources/PokemonSV_ItemSprites.h
deleted file mode 100644
index f1af38be39..0000000000
--- a/SerialPrograms/Source/PokemonSV/Resources/PokemonSV_ItemSprites.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*  Pokemon Scarlet/Violet Item Sprites
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSV_ItemSprites_H
-#define PokemonAutomation_PokemonSV_ItemSprites_H
-
-#include "CommonFramework/Resources/SpriteDatabase.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-
-const SpriteDatabase& AUCTION_ITEM_SPRITES();
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSV/Resources/PokemonSV_NameDatabase.h b/SerialPrograms/Source/PokemonSV/Resources/PokemonSV_NameDatabase.h
deleted file mode 100644
index d37283c71d..0000000000
--- a/SerialPrograms/Source/PokemonSV/Resources/PokemonSV_NameDatabase.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*  Name Database
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/Options/StringSelectOption.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-
-StringSelectDatabase make_name_database(const std::vector<std::string>& slugs);
-
-const StringSelectDatabase& ALL_POKEMON_NAMES();
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSV/Resources/PokemonSV_PokemonSprites.cpp b/SerialPrograms/Source/PokemonSV/Resources/PokemonSV_PokemonSprites.cpp
deleted file mode 100644
index 030357a7f3..0000000000
--- a/SerialPrograms/Source/PokemonSV/Resources/PokemonSV_PokemonSprites.cpp
+++ /dev/null
@@ -1,78 +0,0 @@
-/*  Pokemon Scarlet/Violet Pokemon Sprites
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <QImageReader>
-#include "Common/Cpp/Exceptions.h"
-#include "Common/Cpp/Json/JsonValue.h"
-#include "Common/Cpp/Json/JsonArray.h"
-#include "Common/Cpp/Json/JsonObject.h"
-#include "CommonFramework/Globals.h"
-#include "CommonFramework/ImageMatch/ImageCropper.h"
-#include "PokemonSV_PokemonSprites.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-const SpriteDatabase& ALL_POKEMON_SPRITES(){
-#if QT_VERSION_MAJOR == 6
-    QImageReader::setAllocationLimit(0);
-#endif
-    static const SpriteDatabase database("PokemonSV/PokemonSprites.png", "PokemonSV/PokemonSprites.json");
-    return database;
-}
-
-const SpriteDatabase& ALL_POKEMON_SILHOUETTES(){
-#if QT_VERSION_MAJOR == 6
-    QImageReader::setAllocationLimit(0);
-#endif
-    static const SpriteDatabase database("PokemonSV/PokemonSilhouettes.png", "PokemonSV/PokemonSprites.json");
-    return database;
-}
-
-const std::array<std::string, NUM_TERA_TYPE> TERA_TYPE_NAMES = {
-    "Bug",
-    "Dark",
-    "Dragon",
-    "Electric",
-    "Fairy",
-    "Fighting",
-    "Fire",
-    "Flying",
-    "Ghost",
-    "Grass",
-    "Ground",
-    "Ice",
-    "Normal",
-    "Poison",
-    "Psychic",
-    "Rock",
-    "Steel",
-    "Water",
-};
-std::array<ImageRGB32, NUM_TERA_TYPE> BUILD_TERA_TYPE_ICONS(){
-    const std::string image_folder_path = RESOURCE_PATH() + "PokemonSV/TeraTypes/";
-
-    std::array<ImageRGB32, NUM_TERA_TYPE> ret;
-    for (size_t i = 0; i < NUM_TERA_TYPE; i++){
-        const auto& type_name = TERA_TYPE_NAMES[i];
-        const std::string image_path = image_folder_path + type_name + ".png";
-
-        // Trim the image to remove 0-alpha boundaries.
-        ImageRGB32 image(ImageMatch::trim_image_alpha(ImageRGB32(image_path)).copy());
-        ret[i] = std::move(image);
-    }
-
-    return ret;
-}
-const std::array<ImageRGB32, NUM_TERA_TYPE>& ALL_TERA_TYPE_ICONS(){
-    const static auto icons = BUILD_TERA_TYPE_ICONS();
-    return icons;
-}
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSwSh/Commands/PokemonSwSh_Commands_AutoHosts.cpp b/SerialPrograms/Source/PokemonSwSh/Commands/PokemonSwSh_Commands_AutoHosts.cpp
deleted file mode 100644
index d71cd5c531..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Commands/PokemonSwSh_Commands_AutoHosts.cpp
+++ /dev/null
@@ -1,115 +0,0 @@
-/*  Auto Host Routines
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- */
-
-#include <sstream>
-#include "ClientSource/Libraries/MessageConverter.h"
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "CommonFramework/Tools/ConsoleHandle.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
-#include "PokemonSwSh/PokemonSwSh_Settings.h"
-#include "PokemonSwSh/Commands/PokemonSwSh_Commands_GameEntry.h"
-#include "PokemonSwSh_Commands_AutoHosts.h"
-#include "PokemonSwSh_Messages_AutoHosts.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-void connect_to_internet(
-    BotBaseContext& context,
-    uint16_t open_ycomm_delay,
-    uint16_t connect_to_internet_delay
-){
-    context.issue_request(
-        DeviceRequest_connect_to_internet(open_ycomm_delay, connect_to_internet_delay)
-    );
-}
-void home_to_add_friends(
-    BotBaseContext& context,
-    uint8_t user_slot,
-    uint8_t scroll_down,
-    bool fix_cursor
-){
-    context.issue_request(
-        DeviceRequest_home_to_add_friends(user_slot, scroll_down, fix_cursor)
-    );
-}
-void accept_FRs(
-    ConsoleHandle& console, BotBaseContext& context,
-    uint8_t slot, bool fix_cursor,
-    uint16_t game_to_home_delay_safe,
-    uint16_t auto_fr_duration,
-    bool tolerate_system_update_window_slow
-){
-    if (slot > 7){
-        slot = 7;
-    }
-
-    //  Go to Switch Home menu.
-    pbf_press_button(context, BUTTON_HOME, 10, game_to_home_delay_safe);
-
-    home_to_add_friends(context, slot, 0, fix_cursor);
-
-    //  Mash A.
-    pbf_mash_button(context, BUTTON_A, auto_fr_duration);
-
-    //  Return to Switch Home menu. (or game)
-    if (console.video().snapshot()){
-        console.log("Entering game using inference...");
-        pbf_press_button(context, BUTTON_HOME, 10, 190);
-        NintendoSwitch::resume_game_from_home(console, context);
-    }else{
-        console.log("Entering game without inference...", COLOR_RED);
-        settings_to_enter_game_den_lobby(
-            context,
-            tolerate_system_update_window_slow, false,
-            GameSettings::instance().ENTER_SWITCH_POKEMON, GameSettings::instance().EXIT_SWITCH_POKEMON
-        );
-    }
-    pbf_wait(context, 300);
-}
-
-
-
-int register_message_converters_pokemon_autohosting(){
-    register_message_converter(
-        PABB_MSG_COMMAND_CONNECT_TO_INTERNET,
-        [](const std::string& body){
-            std::ostringstream ss;
-            ss << "connect_to_internet() - ";
-            if (body.size() != sizeof(pabb_connect_to_internet)){ ss << "(invalid size)" << std::endl; return ss.str(); }
-            const auto* params = (const pabb_connect_to_internet*)body.c_str();
-            ss << "seqnum = " << (uint64_t)params->seqnum;
-            ss << ", open_ycomm_delay = " << params->open_ycomm_delay;
-            ss << ", connect_to_internet_delay = " << params->connect_to_internet_delay;
-            return ss.str();
-        }
-    );
-    register_message_converter(
-        PABB_MSG_COMMAND_HOME_TO_ADD_FRIENDS,
-        [](const std::string& body){
-            std::ostringstream ss;
-            ss << "home_to_add_friends() - ";
-            if (body.size() != sizeof(pabb_home_to_add_friends)){ ss << "(invalid size)" << std::endl; return ss.str(); }
-            const auto* params = (const pabb_home_to_add_friends*)body.c_str();
-            ss << "seqnum = " << (uint64_t)params->seqnum;
-            ss << ", user_slot = " << (unsigned)params->user_slot;
-            ss << ", fix_cursor = " << params->fix_cursor;
-            return ss.str();
-        }
-    );
-    return 0;
-}
-int init_PokemonSwShAutoHosts = register_message_converters_pokemon_autohosting();
-
-
-}
-}
-}
-
-
diff --git a/SerialPrograms/Source/PokemonSwSh/Commands/PokemonSwSh_Commands_AutoHosts.h b/SerialPrograms/Source/PokemonSwSh/Commands/PokemonSwSh_Commands_AutoHosts.h
deleted file mode 100644
index 1738a210f4..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Commands/PokemonSwSh_Commands_AutoHosts.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*  Auto Host Routines
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_Commands_AutoHosts_H
-#define PokemonAutomation_PokemonSwSh_Commands_AutoHosts_H
-
-#include "ClientSource/Connection/BotBase.h"
-
-namespace PokemonAutomation{
-    class ConsoleHandle;
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-void connect_to_internet(
-    BotBaseContext& context,
-    uint16_t open_ycomm_delay,
-    uint16_t connect_to_internet_delay
-);
-void home_to_add_friends(
-    BotBaseContext& context,
-    uint8_t user_slot,
-    uint8_t scroll_down,
-    bool fix_cursor
-);
-void accept_FRs(
-    ConsoleHandle& console, BotBaseContext& context,
-    uint8_t slot, bool fix_cursor,
-    uint16_t game_to_home_delay_safe,
-    uint16_t auto_fr_duration,
-    bool tolerate_system_update_window_slow
-);
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.cpp b/SerialPrograms/Source/PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.cpp
deleted file mode 100644
index 1d13ed0d28..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.cpp
+++ /dev/null
@@ -1,163 +0,0 @@
-/*  Auto Host Routines
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- */
-
-#include <sstream>
-#include "ClientSource/Libraries/MessageConverter.h"
-#include "CommonFramework/Tools/ConsoleHandle.h"
-#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
-#include "PokemonSwSh_Commands_DateSpam.h"
-#include "PokemonSwSh_Messages_DateSpam.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-
-
-void home_to_date_time(BotBaseContext& context, bool to_date_change, bool fast){
-    context.issue_request(
-        DeviceRequest_home_to_date_time(to_date_change, fast)
-    );
-}
-void neutral_date_skip(BotBaseContext& context){
-    context.issue_request(
-        DeviceRequest_neutral_date_skip()
-    );
-}
-void roll_date_forward_1(BotBaseContext& context, bool fast){
-    context.issue_request(
-        DeviceRequest_roll_date_forward_1(fast)
-    );
-}
-void roll_date_backward_N(BotBaseContext& context, uint8_t skips, bool fast){
-    context.issue_request(
-        DeviceRequest_roll_date_backward_N(skips, fast)
-    );
-}
-void home_roll_date_enter_game_autorollback(ConsoleHandle& console, BotBaseContext& context, uint8_t& year){
-    //  This version automatically handles the 2060 roll-back.
-    if (year >= MAX_YEAR){
-        home_roll_date_enter_game(console, context, true);
-        year = 0;
-    }else{
-        home_roll_date_enter_game(console, context, false);
-    }
-    year++;
-}
-void home_roll_date_enter_game(ConsoleHandle& console, BotBaseContext& context, bool rollback_year){
-    context.issue_request(
-        DeviceRequest_home_roll_date_enter_game(rollback_year)
-    );
-    resume_game_from_home(console, context, true);
-}
-void touch_date_from_home(BotBaseContext& context, uint16_t settings_to_home_delay){
-    context.issue_request(
-        DeviceRequest_touch_date_from_home(settings_to_home_delay)
-    );
-}
-void rollback_hours_from_home(BotBaseContext& context, uint8_t hours, uint16_t settings_to_home_delay){
-    context.issue_request(
-        DeviceRequest_rollback_hours_from_home(hours, settings_to_home_delay)
-    );
-}
-
-
-
-
-
-int register_message_converters_pokemon_date_spam(){
-    register_message_converter(
-        PABB_MSG_COMMAND_HOME_TO_DATE_TIME,
-        [](const std::string& body){
-            std::ostringstream ss;
-            ss << "home_to_date_time() - ";
-            if (body.size() != sizeof(pabb_home_to_date_time)){ ss << "(invalid size)" << std::endl; return ss.str(); }
-            const auto* params = (const pabb_home_to_date_time*)body.c_str();
-            ss << "seqnum = " << (uint64_t)params->seqnum;
-            ss << ", to_date_change = " << params->to_date_change;
-            ss << ", fast = " << params->fast;
-            return ss.str();
-        }
-    );
-    register_message_converter(
-        PABB_MSG_COMMAND_NEUTRAL_DATE_SKIP,
-        [](const std::string& body){
-            std::ostringstream ss;
-            ss << "neutral_date_skip() - ";
-            if (body.size() != sizeof(pabb_neutral_date_skip)){ ss << "(invalid size)" << std::endl; return ss.str(); }
-            const auto* params = (const pabb_neutral_date_skip*)body.c_str();
-            ss << "seqnum = " << (uint64_t)params->seqnum;
-            return ss.str();
-        }
-    );
-    register_message_converter(
-        PABB_MSG_COMMAND_ROLL_DATE_FORWARD_1,
-        [](const std::string& body){
-            std::ostringstream ss;
-            ss << "roll_date_forward_1() - ";
-            if (body.size() != sizeof(pabb_roll_date_forward_1)){ ss << "(invalid size)" << std::endl; return ss.str(); }
-            const auto* params = (const pabb_roll_date_forward_1*)body.c_str();
-            ss << "seqnum = " << (uint64_t)params->seqnum;
-            ss << ", fast = " << params->fast;
-            return ss.str();
-        }
-    );
-    register_message_converter(
-        PABB_MSG_COMMAND_ROLL_DATE_BACKWARD_N,
-        [](const std::string& body){
-            std::ostringstream ss;
-            ss << "roll_date_backward_N() - ";
-            if (body.size() != sizeof(pabb_roll_date_backward_N)){ ss << "(invalid size)" << std::endl; return ss.str(); }
-            const auto* params = (const pabb_roll_date_backward_N*)body.c_str();
-            ss << "seqnum = " << (uint64_t)params->seqnum;
-            ss << ", skips = " << (unsigned)params->skips;
-            ss << ", fast = " << params->fast;
-            return ss.str();
-        }
-    );
-    register_message_converter(
-        PABB_MSG_COMMAND_HOME_ROLL_DATE_ENTER_GAME,
-        [](const std::string& body){
-            std::ostringstream ss;
-            ss << "home_roll_date_enter_game() - ";
-            if (body.size() != sizeof(pabb_home_roll_date_enter_game)){ ss << "(invalid size)" << std::endl; return ss.str(); }
-            const auto* params = (const pabb_home_roll_date_enter_game*)body.c_str();
-            ss << "seqnum = " << (uint64_t)params->seqnum;
-            ss << ", rollback_year = " << params->rollback_year;
-            return ss.str();
-        }
-    );
-    register_message_converter(
-        PABB_MSG_COMMAND_TOUCH_DATE_FROM_HOME,
-        [](const std::string& body){
-            std::ostringstream ss;
-            ss << "touch_date_from_home() - ";
-            if (body.size() != sizeof(pabb_touch_date_from_home)){ ss << "(invalid size)" << std::endl; return ss.str(); }
-            const auto* params = (const pabb_touch_date_from_home*)body.c_str();
-            ss << "seqnum = " << (uint64_t)params->seqnum;
-            return ss.str();
-        }
-    );
-    register_message_converter(
-        PABB_MSG_COMMAND_ROLLBACK_HOURS_FROM_HOME,
-        [](const std::string& body){
-            std::ostringstream ss;
-            ss << "rollback_hours_from_home() - ";
-            if (body.size() != sizeof(pabb_rollback_hours_from_home)){ ss << "(invalid size)" << std::endl; return ss.str(); }
-            const auto* params = (const pabb_rollback_hours_from_home*)body.c_str();
-            ss << "seqnum = " << (uint64_t)params->seqnum;
-            ss << ", hours = " << (int)params->hours;
-            ss << ", settings_to_home_delay = " << params->settings_to_home_delay;
-            return ss.str();
-        }
-    );
-    return 0;
-}
-
-int init_PokemonSwShDateSpam = register_message_converters_pokemon_date_spam();
-
-
-}
-}
-
diff --git a/SerialPrograms/Source/PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.h b/SerialPrograms/Source/PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.h
deleted file mode 100644
index 093a6edcae..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*  Date Spamming Routines
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_Commands_DateSpam_H
-#define PokemonAutomation_PokemonSwSh_Commands_DateSpam_H
-
-#include "ClientSource/Connection/BotBase.h"
-
-namespace PokemonAutomation{
-    class ConsoleHandle;
-namespace NintendoSwitch{
-
-
-constexpr uint8_t MAX_YEAR = 60;
-
-
-void home_to_date_time                      (BotBaseContext& context, bool to_date_change, bool fast);
-void neutral_date_skip                      (BotBaseContext& context);
-void roll_date_forward_1                    (BotBaseContext& context, bool fast);
-void roll_date_backward_N                   (BotBaseContext& context, uint8_t skips, bool fast);
-void home_roll_date_enter_game              (ConsoleHandle& console, BotBaseContext& context, bool rollback_year);
-void home_roll_date_enter_game_autorollback (ConsoleHandle& console, BotBaseContext& context, uint8_t& year);
-void touch_date_from_home                   (BotBaseContext& context, uint16_t settings_to_home_delay);
-void rollback_hours_from_home               (BotBaseContext& context, uint8_t hours, uint16_t settings_to_home_delay);
-
-
-
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Commands/PokemonSwSh_Commands_DaySkippers.cpp b/SerialPrograms/Source/PokemonSwSh/Commands/PokemonSwSh_Commands_DaySkippers.cpp
deleted file mode 100644
index db41eae382..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Commands/PokemonSwSh_Commands_DaySkippers.cpp
+++ /dev/null
@@ -1,160 +0,0 @@
-/*  Day Skippers
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- */
-
-#include <sstream>
-#include "Common/NintendoSwitch/NintendoSwitch_Protocol_PushButtons.h"
-#include "ClientSource/Libraries/MessageConverter.h"
-#include "PokemonSwSh_Commands_DaySkippers.h"
-#include "PokemonSwSh_Messages_DaySkippers.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-
-
-void skipper_init_view(BotBaseContext& context){
-    context.issue_request(
-        DeviceRequest_skipper_init_view()
-    );
-}
-void skipper_auto_recovery(BotBaseContext& context){
-    context.issue_request(
-        DeviceRequest_skipper_auto_recovery()
-    );
-}
-void skipper_rollback_year_full(BotBaseContext& context, bool date_us){
-    context.issue_request(
-        DeviceRequest_skipper_rollback_year_full(date_us)
-    );
-}
-void skipper_rollback_year_sync(BotBaseContext& context){
-    context.issue_request(
-        DeviceRequest_skipper_rollback_year_sync()
-    );
-}
-void skipper_increment_day(BotBaseContext& context, bool date_us){
-    context.issue_request(
-        DeviceRequest_skipper_increment_day(date_us)
-    );
-}
-void skipper_increment_month(BotBaseContext& context, uint8_t days){
-    context.issue_request(
-        DeviceRequest_skipper_increment_month(days)
-    );
-}
-void skipper_increment_all(BotBaseContext& context){
-    context.issue_request(
-        DeviceRequest_skipper_increment_all()
-    );
-}
-void skipper_increment_all_rollback(BotBaseContext& context){
-    context.issue_request(
-        DeviceRequest_skipper_increment_all_rollback()
-    );
-}
-
-
-
-int register_message_converters_pokemon_skippers(){
-    register_message_converter(
-        PABB_MSG_COMMAND_SKIPPER_INIT_VIEW,
-        [](const std::string& body){
-            std::ostringstream ss;
-            ss << "skipper_init_view() - ";
-            if (body.size() != sizeof(pabb_skipper_init_view)){ ss << "(invalid size)" << std::endl; return ss.str(); }
-            const auto* params = (const pabb_skipper_init_view*)body.c_str();
-            ss << "seqnum = " << (uint64_t)params->seqnum;
-            return ss.str();
-        }
-    );
-    register_message_converter(
-        PABB_MSG_COMMAND_SKIPPER_AUTO_RECOVERY,
-        [](const std::string& body){
-            std::ostringstream ss;
-            ss << "skipper_auto_recovery() - ";
-            if (body.size() != sizeof(pabb_skipper_auto_recovery)){ ss << "(invalid size)" << std::endl; return ss.str(); }
-            const auto* params = (const pabb_skipper_auto_recovery*)body.c_str();
-            ss << "seqnum = " << (uint64_t)params->seqnum;
-            return ss.str();
-        }
-    );
-    register_message_converter(
-        PABB_MSG_COMMAND_SKIPPER_ROLLBACK_YEAR_FULL,
-        [](const std::string& body){
-            std::ostringstream ss;
-            ss << "skipper_rollback_year_full() - ";
-            if (body.size() != sizeof(pabb_skipper_rollback_year_full)){ ss << "(invalid size)" << std::endl; return ss.str(); }
-            const auto* params = (const pabb_skipper_rollback_year_full*)body.c_str();
-            ss << "seqnum = " << (uint64_t)params->seqnum;
-            ss << ", date_us = " << params->date_us;
-            return ss.str();
-        }
-    );
-    register_message_converter(
-        PABB_MSG_COMMAND_SKIPPER_ROLLBACK_YEAR_SYNC,
-        [](const std::string& body){
-            std::ostringstream ss;
-            ss << "skipper_rollback_year_sync() - ";
-            if (body.size() != sizeof(pabb_skipper_rollback_year_sync)){ ss << "(invalid size)" << std::endl; return ss.str(); }
-            const auto* params = (const pabb_skipper_rollback_year_sync*)body.c_str();
-            ss << "seqnum = " << (uint64_t)params->seqnum;
-            return ss.str();
-        }
-    );
-    register_message_converter(
-        PABB_MSG_COMMAND_SKIPPER_INCREMENT_DAY,
-        [](const std::string& body){
-            std::ostringstream ss;
-            ss << "skipper_increment_day() - ";
-            if (body.size() != sizeof(pabb_skipper_increment_day)){ ss << "(invalid size)" << std::endl; return ss.str(); }
-            const auto* params = (const pabb_skipper_increment_day*)body.c_str();
-            ss << "seqnum = " << (uint64_t)params->seqnum;
-            ss << ", date_us = " << params->date_us;
-            return ss.str();
-        }
-    );
-    register_message_converter(
-        PABB_MSG_COMMAND_SKIPPER_INCREMENT_MONTH,
-        [](const std::string& body){
-            std::ostringstream ss;
-            ss << "skipper_increment_month() - ";
-            if (body.size() != sizeof(pabb_skipper_increment_month)){ ss << "(invalid size)" << std::endl; return ss.str(); }
-            const auto* params = (const pabb_skipper_increment_month*)body.c_str();
-            ss << "seqnum = " << (uint64_t)params->seqnum;
-            ss << ", days = " << (unsigned)params->days;
-            return ss.str();
-        }
-    );
-    register_message_converter(
-        PABB_MSG_COMMAND_SKIPPER_INCREMENT_ALL,
-        [](const std::string& body){
-            std::ostringstream ss;
-            ss << "skipper_increment_all() - ";
-            if (body.size() != sizeof(pabb_skipper_increment_all)){ ss << "(invalid size)" << std::endl; return ss.str(); }
-            const auto* params = (const pabb_skipper_increment_all*)body.c_str();
-            ss << "seqnum = " << (uint64_t)params->seqnum;
-            return ss.str();
-        }
-    );
-    register_message_converter(
-        PABB_MSG_COMMAND_SKIPPER_INCREMENT_ALL_ROLLBACK,
-        [](const std::string& body){
-            std::ostringstream ss;
-            ss << "skipper_increment_all_rollback() - ";
-            if (body.size() != sizeof(pabb_skipper_increment_all_rollback)){ ss << "(invalid size)" << std::endl; return ss.str(); }
-            const auto* params = (const pabb_skipper_increment_all_rollback*)body.c_str();
-            ss << "seqnum = " << (uint64_t)params->seqnum;
-            return ss.str();
-        }
-    );
-    return 0;
-}
-int init_PokemonSwShDaySkippers = register_message_converters_pokemon_skippers();
-
-
-
-}
-}
-
diff --git a/SerialPrograms/Source/PokemonSwSh/Commands/PokemonSwSh_Commands_DaySkippers.h b/SerialPrograms/Source/PokemonSwSh/Commands/PokemonSwSh_Commands_DaySkippers.h
deleted file mode 100644
index 08c0871ed9..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Commands/PokemonSwSh_Commands_DaySkippers.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*  Day Skippers
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- *      This file requires (PABB_PABOTBASE_LEVEL >= 31).
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_Commands_DaySkippers_H
-#define PokemonAutomation_PokemonSwSh_Commands_DaySkippers_H
-
-#include "ClientSource/Connection/BotBase.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-
-
-void skipper_init_view              (BotBaseContext& context);
-void skipper_auto_recovery          (BotBaseContext& context);
-void skipper_rollback_year_full     (BotBaseContext& context, bool date_us);
-void skipper_rollback_year_sync     (BotBaseContext& context);
-void skipper_increment_day          (BotBaseContext& context, bool date_us);
-void skipper_increment_month        (BotBaseContext& context, uint8_t days);
-void skipper_increment_all          (BotBaseContext& context);
-void skipper_increment_all_rollback (BotBaseContext& context);
-
-
-
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Commands/PokemonSwSh_Commands_EggRoutines.cpp b/SerialPrograms/Source/PokemonSwSh/Commands/PokemonSwSh_Commands_EggRoutines.cpp
deleted file mode 100644
index 0b4d0122d5..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Commands/PokemonSwSh_Commands_EggRoutines.cpp
+++ /dev/null
@@ -1,109 +0,0 @@
-/*  Egg Routines
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- */
-
-#include <sstream>
-#include "ClientSource/Libraries/MessageConverter.h"
-#include "PokemonSwSh_Commands_EggRoutines.h"
-#include "PokemonSwSh_Messages_EggRoutines.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-
-
-void eggfetcher_loop(BotBaseContext& context){
-    context.issue_request(
-        DeviceRequest_eggfetcher_loop()
-    );
-}
-void move_while_mashing_B(BotBaseContext& context, uint16_t duration){
-    context.issue_request(
-        DeviceRequest_move_while_mashing_B(duration)
-    );
-}
-void spin_and_mash_A(BotBaseContext& context, uint16_t duration){
-    context.issue_request(
-        DeviceRequest_spin_and_mash_A(duration)
-    );
-}
-void travel_to_spin_location(BotBaseContext& context){
-    context.issue_request(
-        DeviceRequest_travel_to_spin_location()
-    );
-}
-void travel_back_to_lady(BotBaseContext& context){
-    context.issue_request(
-        DeviceRequest_travel_back_to_lady()
-    );
-}
-
-
-
-int register_message_converters_eggs(){
-    register_message_converter(
-        PABB_MSG_COMMAND_EGG_FETCHER_LOOP,
-        [](const std::string& body){
-            std::ostringstream ss;
-            ss << "eggfetcher_loop() - ";
-            if (body.size() != sizeof(pabb_eggfetcher_loop)){ ss << "(invalid size)" << std::endl; return ss.str(); }
-            const auto* params = (const pabb_eggfetcher_loop*)body.c_str();
-            ss << "seqnum = " << (uint64_t)params->seqnum;
-            return ss.str();
-        }
-    );
-    register_message_converter(
-        PABB_MSG_COMMAND_MOVE_WHILE_MASHING_B,
-        [](const std::string& body){
-            std::ostringstream ss;
-            ss << "move_while_mashing_B() - ";
-            if (body.size() != sizeof(pabb_move_while_mashing_B)){ ss << "(invalid size)" << std::endl; return ss.str(); }
-            const auto* params = (const pabb_move_while_mashing_B*)body.c_str();
-            ss << "seqnum = " << (uint64_t)params->seqnum;
-            ss << ", duration = " << params->duration;
-            return ss.str();
-        }
-    );
-    register_message_converter(
-        PABB_MSG_COMMAND_SPIN_AND_MASH_A,
-        [](const std::string& body){
-            std::ostringstream ss;
-            ss << "spin_and_mash_A() - ";
-            if (body.size() != sizeof(pabb_spin_and_mash_A)){ ss << "(invalid size)" << std::endl; return ss.str(); }
-            const auto* params = (const pabb_spin_and_mash_A*)body.c_str();
-            ss << "seqnum = " << (uint64_t)params->seqnum;
-            ss << ", duration = " << params->duration;
-            return ss.str();
-        }
-    );
-    register_message_converter(
-        PABB_MSG_COMMAND_TRAVEL_TO_SPIN_LOCATION,
-        [](const std::string& body){
-            std::ostringstream ss;
-            ss << "travel_to_spin_location() - ";
-            if (body.size() != sizeof(pabb_travel_to_spin_location)){ ss << "(invalid size)" << std::endl; return ss.str(); }
-            const auto* params = (const pabb_travel_to_spin_location*)body.c_str();
-            ss << "seqnum = " << (uint64_t)params->seqnum;
-            return ss.str();
-        }
-    );
-    register_message_converter(
-        PABB_MSG_COMMAND_TRAVEL_BACK_TO_LADY,
-        [](const std::string& body){
-            std::ostringstream ss;
-            ss << "travel_back_to_lady() - ";
-            if (body.size() != sizeof(pabb_travel_back_to_lady)){ ss << "(invalid size)" << std::endl; return ss.str(); }
-            const auto* params = (const pabb_travel_back_to_lady*)body.c_str();
-            ss << "seqnum = " << (uint64_t)params->seqnum;
-            return ss.str();
-        }
-    );
-    return 0;
-}
-int init_PokemonSwShEggRoutines = register_message_converters_eggs();
-
-
-}
-}
-
diff --git a/SerialPrograms/Source/PokemonSwSh/Commands/PokemonSwSh_Commands_EggRoutines.h b/SerialPrograms/Source/PokemonSwSh/Commands/PokemonSwSh_Commands_EggRoutines.h
deleted file mode 100644
index 37b5fe06c1..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Commands/PokemonSwSh_Commands_EggRoutines.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*  Egg Routines
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- *      This file requires (PABB_PABOTBASE_LEVEL >= 31).
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_Commands_EggRoutines_H
-#define PokemonAutomation_PokemonSwSh_Commands_EggRoutines_H
-
-#include "ClientSource/Connection/BotBase.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-
-
-void eggfetcher_loop        (BotBaseContext& context);
-void move_while_mashing_B   (BotBaseContext& context, uint16_t duration);
-void spin_and_mash_A        (BotBaseContext& context, uint16_t duration);
-void travel_to_spin_location(BotBaseContext& context);
-void travel_back_to_lady    (BotBaseContext& context);
-
-
-
-
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Commands/PokemonSwSh_Commands_GameEntry.cpp b/SerialPrograms/Source/PokemonSwSh/Commands/PokemonSwSh_Commands_GameEntry.cpp
deleted file mode 100644
index 4178166810..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Commands/PokemonSwSh_Commands_GameEntry.cpp
+++ /dev/null
@@ -1,214 +0,0 @@
-/*  Game Entry Routines
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- */
-
-#include <sstream>
-#include "ClientSource/Libraries/MessageConverter.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Routines.h"
-#include "NintendoSwitch/NintendoSwitch_Settings.h"
-#include "PokemonSwSh/PokemonSwSh_Settings.h"
-#include "PokemonSwSh_Commands_GameEntry.h"
-#include "PokemonSwSh_Messages_GameEntry.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-void resume_game_no_interact_old(BotBaseContext& context, bool tolerate_update_menu){
-    uint16_t HOME_TO_GAME_DELAY = GameSettings::instance().HOME_TO_GAME_DELAY;
-    if (tolerate_update_menu){
-        pbf_press_button(context, BUTTON_HOME, 10, HOME_TO_GAME_DELAY);
-        pbf_press_dpad(context, DPAD_DOWN, 10, 10);
-        pbf_press_dpad(context, DPAD_UP, 10, 10);
-        pbf_press_button(context, BUTTON_A, 10, HOME_TO_GAME_DELAY);
-    }else{
-        pbf_press_button(context, BUTTON_HOME, 10, HOME_TO_GAME_DELAY);
-    }
-}
-void resume_game_back_out_old(BotBaseContext& context, bool tolerate_update_menu, uint16_t mash_B_time){
-    uint16_t HOME_TO_GAME_DELAY = GameSettings::instance().HOME_TO_GAME_DELAY;
-    if (tolerate_update_menu){
-        pbf_press_button(context, BUTTON_HOME, 10, HOME_TO_GAME_DELAY);
-        pbf_press_dpad(context, DPAD_DOWN, 10, 10);
-        pbf_press_dpad(context, DPAD_UP, 10, 10);
-        pbf_press_button(context, BUTTON_A, 10, HOME_TO_GAME_DELAY);
-        pbf_mash_button(context, BUTTON_B, mash_B_time);
-    }else{
-        pbf_press_button(context, BUTTON_HOME, 10, HOME_TO_GAME_DELAY);
-    }
-}
-void resume_game_front_of_den_nowatts(BotBaseContext& context, bool tolerate_update_menu){
-    resume_game_back_out_old(context, tolerate_update_menu, 400);
-}
-
-void fast_reset_game(
-    BotBaseContext& context,
-    uint16_t start_game_mash, uint16_t start_game_wait,
-    uint16_t enter_game_mash, uint16_t enter_game_wait
-){
-    context.issue_request(
-        DeviceRequest_fast_reset_game(
-            start_game_mash, start_game_wait,
-            enter_game_mash, enter_game_wait
-        )
-    );
-}
-
-void reset_game_from_home(BotBaseContext& context, bool tolerate_update_menu){
-    if (!ConsoleSettings::instance().START_GAME_REQUIRES_INTERNET && !tolerate_update_menu){
-        fast_reset_game(
-            context,
-            GameSettings::instance().START_GAME_MASH, GameSettings::instance().START_GAME_WAIT,
-            GameSettings::instance().ENTER_GAME_MASH, GameSettings::instance().ENTER_GAME_WAIT
-        );
-        return;
-    }
-
-    close_game(context);
-    start_game_from_home(context, tolerate_update_menu, 0, 0, false);
-}
-void settings_to_enter_game(BotBaseContext& context, bool fast){
-    if (fast){
-        //  100 ticks for the first press isn't enough to finish the animation.
-        //  But since the HOME button has delayed effect, we start pressing the 2nd
-        //  press before the animation finishes.
-        pbf_press_button(context, BUTTON_HOME, 10, 90);
-        pbf_press_button(context, BUTTON_HOME, 10, 0);
-    }else{
-        pbf_press_button(context, BUTTON_HOME, 10, 190);
-        pbf_press_button(context, BUTTON_HOME, 10, 0);
-    }
-}
-void settings_to_enter_game_den_lobby(
-    BotBaseContext& context,
-    bool tolerate_update_menu, bool fast,
-    uint16_t enter_switch_pokemon_delay,
-    uint16_t exit_switch_pokemon_delay
-){
-    context.issue_request(
-        DeviceRequest_settings_to_enter_game_den_lobby(
-            tolerate_update_menu, fast,
-            enter_switch_pokemon_delay,
-            exit_switch_pokemon_delay
-        )
-    );
-}
-void start_game_from_home(BotBaseContext& context, bool tolerate_update_menu, uint8_t game_slot, uint8_t user_slot, bool backup_save){
-    //  Start the game with the specified "game_slot" and "user_slot".
-    //  If "game_slot" is zero, it uses whatever the cursor is on.
-    //  If "user_slot" is zero, it uses whatever the cursor is on.
-
-    if (game_slot != 0){
-        pbf_press_button(context, BUTTON_HOME, 10, ConsoleSettings::instance().SETTINGS_TO_HOME_DELAY - 10);
-        for (uint8_t c = 1; c < game_slot; c++){
-            pbf_press_dpad(context, DPAD_RIGHT, 5, 5);
-        }
-    }
-
-    if (tolerate_update_menu){
-        //  If the update menu isn't there, these will get swallowed by the opening
-        //  animation for the select user menu.
-        pbf_press_button(context, BUTTON_A, 5, 35);      //  Choose game
-        pbf_press_dpad(context, DPAD_UP, 5, 0);          //  Skip the update window.
-    }
-
-    bool START_GAME_REQUIRES_INTERNET = ConsoleSettings::instance().START_GAME_REQUIRES_INTERNET;
-    uint16_t START_GAME_MASH = GameSettings::instance().START_GAME_MASH;
-
-    if (!START_GAME_REQUIRES_INTERNET && user_slot == 0){
-        //  Mash your way into the game.
-        pbf_mash_button(context, BUTTON_A, START_GAME_MASH);
-    }else{
-        pbf_press_button(context, BUTTON_A, 5, 175);     //  Enter select user menu.
-        if (user_slot != 0){
-            //  Move to correct user.
-            for (uint8_t c = 0; c < 8; c++){
-                pbf_press_dpad(context, DPAD_LEFT, 7, 7);
-            }
-//            pbf_wait(50);
-            for (uint8_t c = 1; c < user_slot; c++){
-                pbf_press_dpad(context, DPAD_RIGHT, 7, 7);
-            }
-        }
-        pbf_press_button(context, BUTTON_A, 5, 5);       //  Enter game
-
-        //  Switch to mashing ZR instead of A to get into the game.
-        //  Mash your way into the game.
-        uint16_t duration = START_GAME_MASH;
-        if (START_GAME_REQUIRES_INTERNET){
-            //  Need to wait a bit longer for the internet check.
-            duration += ConsoleSettings::instance().START_GAME_INTERNET_CHECK_DELAY;
-        }
-        pbf_mash_button(context, BUTTON_ZR, duration);
-    }
-
-    pbf_wait(context, GameSettings::instance().START_GAME_WAIT);
-    enter_game(context, backup_save, GameSettings::instance().ENTER_GAME_MASH, GameSettings::instance().ENTER_GAME_WAIT);
-}
-
-void enter_game(BotBaseContext& context, bool backup_save, uint16_t enter_game_mash, uint16_t enter_game_wait){
-    context.issue_request(
-        DeviceRequest_enter_game(backup_save, enter_game_mash, enter_game_wait)
-    );
-}
-
-
-
-int register_message_converters_pokemon_game_entry(){
-    register_message_converter(
-        PABB_MSG_COMMAND_FAST_RESET_GAME,
-        [](const std::string& body){
-            std::ostringstream ss;
-            ss << "fast_reset_game() - ";
-            if (body.size() != sizeof(pabb_fast_reset_game)){ ss << "(invalid size)" << std::endl; return ss.str(); }
-            const auto* params = (const pabb_fast_reset_game*)body.c_str();
-            ss << "seqnum = " << (uint64_t)params->seqnum;
-            ss << ", start_game_mash = " << params->start_game_mash;
-            ss << ", start_game_wait = " << params->start_game_wait;
-            ss << ", enter_game_mash = " << params->enter_game_mash;
-            ss << ", enter_game_wait = " << params->enter_game_wait;
-            return ss.str();
-        }
-    );
-    register_message_converter(
-        PABB_MSG_COMMAND_SETTINGS_TO_ENTER_GAME_DEN_LOBBY,
-        [](const std::string& body){
-            std::ostringstream ss;
-            ss << "settings_to_enter_game_den_lobby() - ";
-            if (body.size() != sizeof(pabb_settings_to_enter_game_den_lobby)){ ss << "(invalid size)" << std::endl; return ss.str(); }
-            const auto* params = (const pabb_settings_to_enter_game_den_lobby*)body.c_str();
-            ss << "seqnum = " << (uint64_t)params->seqnum;
-            ss << ", tolerate_update_menu = " << params->tolerate_update_menu;
-            ss << ", fast = " << params->fast;
-            ss << ", enter_switch_pokemon_delay = " << params->enter_switch_pokemon_delay;
-            ss << ", exit_switch_pokemon_delay = " << params->exit_switch_pokemon_delay;
-            return ss.str();
-        }
-    );
-    register_message_converter(
-        PABB_MSG_COMMAND_ENTER_GAME,
-        [](const std::string& body){
-            std::ostringstream ss;
-            ss << "start_game_from_home() - ";
-            if (body.size() != sizeof(pabb_enter_game)){ ss << "(invalid size)" << std::endl; return ss.str(); }
-            const auto* params = (const pabb_enter_game*)body.c_str();
-            ss << "seqnum = " << (uint64_t)params->seqnum;
-            ss << ", backup_save = " << params->backup_save;
-            ss << ", enter_game_mash = " << params->enter_game_mash;
-            ss << ", enter_game_wait = " << params->enter_game_wait;
-            return ss.str();
-        }
-    );
-    return 0;
-}
-int init_PokemonSwShGameEntry = register_message_converters_pokemon_game_entry();
-
-
-}
-}
-}
-
diff --git a/SerialPrograms/Source/PokemonSwSh/Commands/PokemonSwSh_Commands_GameEntry.h b/SerialPrograms/Source/PokemonSwSh/Commands/PokemonSwSh_Commands_GameEntry.h
deleted file mode 100644
index 907c4d4f5a..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Commands/PokemonSwSh_Commands_GameEntry.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*  Game Entry Routines
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_Commands_GameEntry_H
-#define PokemonAutomation_PokemonSwSh_Commands_GameEntry_H
-
-#include "ClientSource/Connection/BotBase.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-void resume_game_no_interact_old        (BotBaseContext& device, bool tolerate_update_menu);
-void resume_game_back_out_old           (BotBaseContext& device, bool tolerate_update_menu, uint16_t mash_B_time);
-void resume_game_front_of_den_nowatts   (BotBaseContext& device, bool tolerate_update_menu);
-void settings_to_enter_game             (BotBaseContext& device, bool fast);
-void settings_to_enter_game_den_lobby   (
-    BotBaseContext& device,
-    bool tolerate_update_menu, bool fast,
-    uint16_t enter_switch_pokemon_delay,
-    uint16_t exit_switch_pokemon_delay
-);
-void enter_game                         (BotBaseContext& device, bool backup_save, uint16_t enter_game_mash, uint16_t enter_game_wait);
-void start_game_from_home               (BotBaseContext& device, bool tolerate_update_menu, uint8_t game_slot, uint8_t user_slot, bool backup_save);
-void fast_reset_game(
-    BotBaseContext& device,
-    uint16_t start_game_mash, uint16_t start_game_wait,
-    uint16_t enter_game_mash, uint16_t enter_game_wait
-);
-void reset_game_from_home               (BotBaseContext& device, bool tolerate_update_menu);
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Commands/PokemonSwSh_Commands_Misc.cpp b/SerialPrograms/Source/PokemonSwSh/Commands/PokemonSwSh_Commands_Misc.cpp
deleted file mode 100644
index 5e983204b8..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Commands/PokemonSwSh_Commands_Misc.cpp
+++ /dev/null
@@ -1,61 +0,0 @@
-/*  Misc. Routines
- * 
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- * 
- */
-
-#include <sstream>
-#include "ClientSource/Libraries/MessageConverter.h"
-#include "PokemonSwSh_Commands_Misc.h"
-#include "PokemonSwSh_Messages_Misc.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-
-
-void mash_A(BotBaseContext& context, uint16_t ticks){
-    context.issue_request(
-        DeviceRequest_mash_A(ticks)
-    );
-}
-void IoA_backout(BotBaseContext& context, uint16_t pokemon_to_menu_delay){
-    context.issue_request(
-        DeviceRequest_IoA_backout(pokemon_to_menu_delay)
-    );
-}
-
-int register_message_converters_pokemon_misc(){
-    register_message_converter(
-        PABB_MSG_COMMAND_MASH_A,
-        [](const std::string& body){
-            std::ostringstream ss;
-            ss << "mash_A() - ";
-            if (body.size() != sizeof(pabb_mashA)){ ss << "(invalid size)" << std::endl; return ss.str(); }
-            const auto* params = (const pabb_mashA*)body.c_str();
-            ss << "seqnum = " << (uint64_t)params->seqnum;
-            ss << ", ticks = " << params->ticks;
-            return ss.str();
-        }
-    );
-    register_message_converter(
-        PABB_MSG_COMMAND_IOA_BACKOUT,
-        [](const std::string& body){
-            std::ostringstream ss;
-            ss << "IoA_backout() - ";
-            if (body.size() != sizeof(pabb_IoA_backout)){ ss << "(invalid size)" << std::endl; return ss.str(); }
-            const auto* params = (const pabb_IoA_backout*)body.c_str();
-            ss << "seqnum = " << (uint64_t)params->seqnum;
-            ss << ", pokemon_to_menu_delay = " << params->pokemon_to_menu_delay;
-            return ss.str();
-        }
-    );
-    return 0;
-}
-int init_PokemonSwShMisc = register_message_converters_pokemon_misc();
-
-
-
-}
-}
-
-
diff --git a/SerialPrograms/Source/PokemonSwSh/Commands/PokemonSwSh_Commands_Misc.h b/SerialPrograms/Source/PokemonSwSh/Commands/PokemonSwSh_Commands_Misc.h
deleted file mode 100644
index 800e9de0b3..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Commands/PokemonSwSh_Commands_Misc.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*  Misc. Routines
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_Commands_Misc_H
-#define PokemonAutomation_PokemonSwSh_Commands_Misc_H
-
-#include "ClientSource/Connection/BotBase.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-
-
-void mash_A         (BotBaseContext& context, uint16_t ticks);
-void IoA_backout    (BotBaseContext& context, uint16_t pokemon_to_menu_delay);
-
-
-
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Commands/PokemonSwSh_Messages_AutoHosts.h b/SerialPrograms/Source/PokemonSwSh/Commands/PokemonSwSh_Messages_AutoHosts.h
deleted file mode 100644
index ddeff4d1cd..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Commands/PokemonSwSh_Messages_AutoHosts.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*  Auto Host Routines
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_Messages_AutoHosts_H
-#define PokemonAutomation_PokemonSwSh_Messages_AutoHosts_H
-
-#include "Common/PokemonSwSh/PokemonSwSh_Protocol_AutoHosts.h"
-#include "ClientSource/Connection/BotBaseMessage.h"
-#include "PokemonSwSh_Commands_AutoHosts.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-
-class DeviceRequest_connect_to_internet : public BotBaseRequest{
-public:
-    pabb_connect_to_internet params;
-    DeviceRequest_connect_to_internet(
-        uint16_t open_ycomm_delay,
-        uint16_t connect_to_internet_delay
-    )
-        : BotBaseRequest(true)
-    {
-        params.seqnum = 0;
-        params.open_ycomm_delay = open_ycomm_delay;
-        params.connect_to_internet_delay = connect_to_internet_delay;
-    }
-    virtual BotBaseMessage message() const override{
-        return BotBaseMessage(PABB_MSG_COMMAND_CONNECT_TO_INTERNET, params);
-    }
-#if 0
-    virtual std::string to_str() const override{
-        std::ostringstream ss;
-        ss << "connect_to_internet() - ";
-        ss << "seqnum = " << (uint64_t)params.seqnum;
-        ss << ", open_ycomm_delay = " << params.open_ycomm_delay;
-        ss << ", connect_to_internet_delay = " << params.connect_to_internet_delay;
-        return ss.str();
-    }
-#endif
-};
-class DeviceRequest_home_to_add_friends : public BotBaseRequest{
-public:
-    pabb_home_to_add_friends params;
-    DeviceRequest_home_to_add_friends(
-        uint8_t user_slot,
-        uint8_t scroll_down,
-        bool fix_cursor
-    )
-        : BotBaseRequest(true)
-    {
-        params.seqnum = 0;
-        params.user_slot = user_slot;
-        params.scroll_down = scroll_down;
-        params.fix_cursor = fix_cursor;
-    }
-    virtual BotBaseMessage message() const override{
-        return BotBaseMessage(PABB_MSG_COMMAND_HOME_TO_ADD_FRIENDS, params);
-    }
-};
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Commands/PokemonSwSh_Messages_DateSpam.h b/SerialPrograms/Source/PokemonSwSh/Commands/PokemonSwSh_Messages_DateSpam.h
deleted file mode 100644
index 3d36ac0593..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Commands/PokemonSwSh_Messages_DateSpam.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/*  Date Spamming Routines
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_Messages_DateSpam_H
-#define PokemonAutomation_PokemonSwSh_Messages_DateSpam_H
-
-#include "Common/PokemonSwSh/PokemonSwSh_Protocol_DateSpam.h"
-#include "ClientSource/Connection/BotBaseMessage.h"
-#include "PokemonSwSh_Commands_DateSpam.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-
-
-class DeviceRequest_home_to_date_time : public BotBaseRequest{
-public:
-    pabb_home_to_date_time params;
-    DeviceRequest_home_to_date_time(bool to_date_change, bool fast)
-        : BotBaseRequest(true)
-    {
-        params.seqnum = 0;
-        params.to_date_change = to_date_change;
-        params.fast = fast;
-    }
-    virtual BotBaseMessage message() const override{
-        return BotBaseMessage(PABB_MSG_COMMAND_HOME_TO_DATE_TIME, params);
-    }
-};
-class DeviceRequest_neutral_date_skip : public BotBaseRequest{
-public:
-    pabb_neutral_date_skip params;
-    DeviceRequest_neutral_date_skip()
-        : BotBaseRequest(true)
-    {
-        params.seqnum = 0;
-    }
-    virtual BotBaseMessage message() const override{
-        return BotBaseMessage(PABB_MSG_COMMAND_NEUTRAL_DATE_SKIP, params);
-    }
-};
-class DeviceRequest_roll_date_forward_1 : public BotBaseRequest{
-public:
-    pabb_roll_date_forward_1 params;
-    DeviceRequest_roll_date_forward_1(bool fast)
-        : BotBaseRequest(true)
-    {
-        params.seqnum = 0;
-        params.fast = fast;
-    }
-    virtual BotBaseMessage message() const override{
-        return BotBaseMessage(PABB_MSG_COMMAND_ROLL_DATE_FORWARD_1, params);
-    }
-};
-class DeviceRequest_roll_date_backward_N : public BotBaseRequest{
-public:
-    pabb_roll_date_backward_N params;
-    DeviceRequest_roll_date_backward_N(uint8_t skips, bool fast)
-        : BotBaseRequest(true)
-    {
-        params.seqnum = 0;
-        params.skips = skips;
-        params.fast = fast;
-    }
-    virtual BotBaseMessage message() const override{
-        return BotBaseMessage(PABB_MSG_COMMAND_ROLL_DATE_BACKWARD_N, params);
-    }
-};
-class DeviceRequest_home_roll_date_enter_game : public BotBaseRequest{
-public:
-    pabb_home_roll_date_enter_game params;
-    DeviceRequest_home_roll_date_enter_game(bool rollback_year)
-        : BotBaseRequest(true)
-    {
-        params.seqnum = 0;
-        params.rollback_year = rollback_year;
-    }
-    virtual BotBaseMessage message() const override{
-        return BotBaseMessage(PABB_MSG_COMMAND_HOME_ROLL_DATE_ENTER_GAME, params);
-    }
-};
-class DeviceRequest_touch_date_from_home : public BotBaseRequest{
-public:
-    pabb_touch_date_from_home params;
-    DeviceRequest_touch_date_from_home(uint16_t settings_to_home_delay)
-        : BotBaseRequest(true)
-    {
-        params.seqnum = 0;
-        params.settings_to_home_delay = settings_to_home_delay;
-    }
-    virtual BotBaseMessage message() const override{
-        return BotBaseMessage(PABB_MSG_COMMAND_TOUCH_DATE_FROM_HOME, params);
-    }
-};
-class DeviceRequest_rollback_hours_from_home : public BotBaseRequest{
-public:
-    pabb_rollback_hours_from_home params;
-    DeviceRequest_rollback_hours_from_home(uint8_t hours, uint16_t settings_to_home_delay)
-        : BotBaseRequest(true)
-    {
-        params.seqnum = 0;
-        params.hours = hours;
-        params.settings_to_home_delay = settings_to_home_delay;
-    }
-    virtual BotBaseMessage message() const override{
-        return BotBaseMessage(PABB_MSG_COMMAND_ROLLBACK_HOURS_FROM_HOME, params);
-    }
-};
-
-
-
-
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Commands/PokemonSwSh_Messages_DaySkippers.h b/SerialPrograms/Source/PokemonSwSh/Commands/PokemonSwSh_Messages_DaySkippers.h
deleted file mode 100644
index ed315e86e4..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Commands/PokemonSwSh_Messages_DaySkippers.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/*  Day Skippers
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- *      This file requires (PABB_PABOTBASE_LEVEL >= 31).
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_Messages_DaySkippers_H
-#define PokemonAutomation_PokemonSwSh_Messages_DaySkippers_H
-
-#include "Common/PokemonSwSh/PokemonSwSh_Protocol_DaySkippers.h"
-#include "ClientSource/Connection/BotBaseMessage.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-
-
-class DeviceRequest_skipper_init_view : public BotBaseRequest{
-public:
-    pabb_skipper_init_view params;
-    DeviceRequest_skipper_init_view()
-        : BotBaseRequest(true)
-    {
-        params.seqnum = 0;
-    }
-    virtual BotBaseMessage message() const override{
-        return BotBaseMessage(PABB_MSG_COMMAND_SKIPPER_INIT_VIEW, params);
-    }
-};
-class DeviceRequest_skipper_auto_recovery : public BotBaseRequest{
-public:
-    pabb_skipper_auto_recovery params;
-    DeviceRequest_skipper_auto_recovery()
-        : BotBaseRequest(true)
-    {
-        params.seqnum = 0;
-    }
-    virtual BotBaseMessage message() const override{
-        return BotBaseMessage(PABB_MSG_COMMAND_SKIPPER_AUTO_RECOVERY, params);
-    }
-};
-class DeviceRequest_skipper_rollback_year_full : public BotBaseRequest{
-public:
-    pabb_skipper_rollback_year_full params;
-    DeviceRequest_skipper_rollback_year_full(bool date_us)
-        : BotBaseRequest(true)
-    {
-        params.seqnum = 0;
-        params.date_us = date_us;
-    }
-    virtual BotBaseMessage message() const override{
-        return BotBaseMessage(PABB_MSG_COMMAND_SKIPPER_ROLLBACK_YEAR_FULL, params);
-    }
-};
-class DeviceRequest_skipper_rollback_year_sync : public BotBaseRequest{
-public:
-    pabb_skipper_rollback_year_sync params;
-    DeviceRequest_skipper_rollback_year_sync()
-        : BotBaseRequest(true)
-    {
-        params.seqnum = 0;
-    }
-    virtual BotBaseMessage message() const override{
-        return BotBaseMessage(PABB_MSG_COMMAND_SKIPPER_ROLLBACK_YEAR_SYNC, params);
-    }
-};
-class DeviceRequest_skipper_increment_day : public BotBaseRequest{
-public:
-    pabb_skipper_increment_day params;
-    DeviceRequest_skipper_increment_day(bool date_us)
-        : BotBaseRequest(true)
-    {
-        params.seqnum = 0;
-        params.date_us = date_us;
-    }
-    virtual BotBaseMessage message() const override{
-        return BotBaseMessage(PABB_MSG_COMMAND_SKIPPER_INCREMENT_DAY, params);
-    }
-};
-class DeviceRequest_skipper_increment_month : public BotBaseRequest{
-public:
-    pabb_skipper_increment_month params;
-    DeviceRequest_skipper_increment_month(uint8_t days)
-        : BotBaseRequest(true)
-    {
-        params.seqnum = 0;
-        params.days = days;
-    }
-    virtual BotBaseMessage message() const override{
-        return BotBaseMessage(PABB_MSG_COMMAND_SKIPPER_INCREMENT_MONTH, params);
-    }
-};
-class DeviceRequest_skipper_increment_all : public BotBaseRequest{
-public:
-    pabb_skipper_increment_all params;
-    DeviceRequest_skipper_increment_all()
-        : BotBaseRequest(true)
-    {
-        params.seqnum = 0;
-    }
-    virtual BotBaseMessage message() const override{
-        return BotBaseMessage(PABB_MSG_COMMAND_SKIPPER_INCREMENT_ALL, params);
-    }
-};
-class DeviceRequest_skipper_increment_all_rollback : public BotBaseRequest{
-public:
-    pabb_skipper_increment_all_rollback params;
-    DeviceRequest_skipper_increment_all_rollback()
-        : BotBaseRequest(true)
-    {
-        params.seqnum = 0;
-    }
-    virtual BotBaseMessage message() const override{
-        return BotBaseMessage(PABB_MSG_COMMAND_SKIPPER_INCREMENT_ALL_ROLLBACK, params);
-    }
-};
-
-
-
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Commands/PokemonSwSh_Messages_EggRoutines.h b/SerialPrograms/Source/PokemonSwSh/Commands/PokemonSwSh_Messages_EggRoutines.h
deleted file mode 100644
index ada8c0a9ea..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Commands/PokemonSwSh_Messages_EggRoutines.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/*  Egg Routines
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- *      This file requires (PABB_PABOTBASE_LEVEL >= 31).
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_Messages_EggRoutines_H
-#define PokemonAutomation_PokemonSwSh_Messages_EggRoutines_H
-
-#include "Common/PokemonSwSh/PokemonSwSh_Protocol_EggRoutines.h"
-#include "ClientSource/Connection/BotBaseMessage.h"
-#include "PokemonSwSh_Commands_EggRoutines.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-
-
-class DeviceRequest_eggfetcher_loop : public BotBaseRequest{
-public:
-    pabb_eggfetcher_loop params;
-    DeviceRequest_eggfetcher_loop()
-        : BotBaseRequest(true)
-    {
-        params.seqnum = 0;
-    }
-    virtual BotBaseMessage message() const override{
-        return BotBaseMessage(PABB_MSG_COMMAND_EGG_FETCHER_LOOP, params);
-    }
-};
-class DeviceRequest_move_while_mashing_B : public BotBaseRequest{
-public:
-    pabb_move_while_mashing_B params;
-    DeviceRequest_move_while_mashing_B(uint16_t duration)
-        : BotBaseRequest(true)
-    {
-        params.seqnum = 0;
-        params.duration = duration;
-    }
-    virtual BotBaseMessage message() const override{
-        return BotBaseMessage(PABB_MSG_COMMAND_MOVE_WHILE_MASHING_B, params);
-    }
-};
-class DeviceRequest_spin_and_mash_A : public BotBaseRequest{
-public:
-    pabb_spin_and_mash_A params;
-    DeviceRequest_spin_and_mash_A(uint16_t duration)
-        : BotBaseRequest(true)
-    {
-        params.seqnum = 0;
-        params.duration = duration;
-    }
-    virtual BotBaseMessage message() const override{
-        return BotBaseMessage(PABB_MSG_COMMAND_SPIN_AND_MASH_A, params);
-    }
-};
-class DeviceRequest_travel_to_spin_location : public BotBaseRequest{
-public:
-    pabb_travel_to_spin_location params;
-    DeviceRequest_travel_to_spin_location()
-        : BotBaseRequest(true)
-    {
-        params.seqnum = 0;
-    }
-    virtual BotBaseMessage message() const override{
-        return BotBaseMessage(PABB_MSG_COMMAND_TRAVEL_TO_SPIN_LOCATION, params);
-    }
-};
-class DeviceRequest_travel_back_to_lady : public BotBaseRequest{
-public:
-    pabb_travel_back_to_lady params;
-    DeviceRequest_travel_back_to_lady()
-        : BotBaseRequest(true)
-    {
-        params.seqnum = 0;
-    }
-    virtual BotBaseMessage message() const override{
-        return BotBaseMessage(PABB_MSG_COMMAND_TRAVEL_BACK_TO_LADY, params);
-    }
-};
-
-
-
-
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Commands/PokemonSwSh_Messages_GameEntry.h b/SerialPrograms/Source/PokemonSwSh/Commands/PokemonSwSh_Messages_GameEntry.h
deleted file mode 100644
index 0148fac5e5..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Commands/PokemonSwSh_Messages_GameEntry.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*  Game Entry Routines
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_Messages_GameEntry_H
-#define PokemonAutomation_PokemonSwSh_Messages_GameEntry_H
-
-#include "Common/PokemonSwSh/PokemonSwSh_Protocol_GameEntry.h"
-#include "ClientSource/Connection/BotBaseMessage.h"
-#include "PokemonSwSh_Commands_GameEntry.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-class DeviceRequest_fast_reset_game : public BotBaseRequest{
-public:
-    pabb_fast_reset_game params;
-    DeviceRequest_fast_reset_game(
-        uint16_t start_game_mash, uint16_t start_game_wait,
-        uint16_t enter_game_mash, uint16_t enter_game_wait
-    )
-        : BotBaseRequest(true)
-    {
-        params.seqnum = 0;
-        params.start_game_mash = start_game_mash;
-        params.start_game_wait = start_game_wait;
-        params.enter_game_mash = enter_game_mash;
-        params.enter_game_wait = enter_game_wait;
-    }
-    virtual BotBaseMessage message() const override{
-        return BotBaseMessage(PABB_MSG_COMMAND_FAST_RESET_GAME, params);
-    }
-};
-class DeviceRequest_settings_to_enter_game_den_lobby : public BotBaseRequest{
-public:
-    pabb_settings_to_enter_game_den_lobby params;
-    DeviceRequest_settings_to_enter_game_den_lobby(
-        bool tolerate_update_menu, bool fast,
-        uint16_t enter_switch_pokemon_delay,
-        uint16_t exit_switch_pokemon_delay
-    )
-        : BotBaseRequest(true)
-    {
-        params.seqnum = 0;
-        params.tolerate_update_menu = tolerate_update_menu;
-        params.fast = fast;
-        params.enter_switch_pokemon_delay = enter_switch_pokemon_delay;
-        params.exit_switch_pokemon_delay = exit_switch_pokemon_delay;
-    }
-    virtual BotBaseMessage message() const override{
-        return BotBaseMessage(PABB_MSG_COMMAND_SETTINGS_TO_ENTER_GAME_DEN_LOBBY, params);
-    }
-};
-class DeviceRequest_enter_game : public BotBaseRequest{
-public:
-    pabb_enter_game params;
-    DeviceRequest_enter_game(
-        bool backup_save, uint16_t enter_game_mash, uint16_t enter_game_wait
-    )
-        : BotBaseRequest(true)
-    {
-        params.seqnum = 0;
-        params.backup_save = backup_save;
-        params.enter_game_mash = enter_game_mash;
-        params.enter_game_wait = enter_game_wait;
-    }
-    virtual BotBaseMessage message() const override{
-        return BotBaseMessage(PABB_MSG_COMMAND_ENTER_GAME, params);
-    }
-};
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Commands/PokemonSwSh_Messages_Misc.h b/SerialPrograms/Source/PokemonSwSh/Commands/PokemonSwSh_Messages_Misc.h
deleted file mode 100644
index d28b6e4d32..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Commands/PokemonSwSh_Messages_Misc.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*  Misc. Routines
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_Messages_Misc_H
-#define PokemonAutomation_PokemonSwSh_Messages_Misc_H
-
-#include "Common/PokemonSwSh/PokemonSwSh_Protocol_Misc.h"
-#include "ClientSource/Connection/BotBaseMessage.h"
-#include "PokemonSwSh_Commands_Misc.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-
-
-class DeviceRequest_mash_A : public BotBaseRequest{
-public:
-    pabb_mashA params;
-    DeviceRequest_mash_A(uint16_t ticks)
-        : BotBaseRequest(true)
-    {
-        params.seqnum = 0;
-        params.ticks = ticks;
-    }
-    virtual BotBaseMessage message() const override{
-        return BotBaseMessage(PABB_MSG_COMMAND_MASH_A, params);
-    }
-};
-class DeviceRequest_IoA_backout : public BotBaseRequest{
-public:
-    pabb_IoA_backout params;
-    DeviceRequest_IoA_backout(uint16_t pokemon_to_menu_delay)
-        : BotBaseRequest(true)
-    {
-        params.seqnum = 0;
-        params.pokemon_to_menu_delay = pokemon_to_menu_delay;
-    }
-    virtual BotBaseMessage message() const override{
-        return BotBaseMessage(PABB_MSG_COMMAND_IOA_BACKOUT, params);
-    }
-};
-
-
-
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleBallReader.cpp b/SerialPrograms/Source/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleBallReader.cpp
deleted file mode 100644
index d3b3f48329..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleBallReader.cpp
+++ /dev/null
@@ -1,126 +0,0 @@
-/*  Ball Sprite Reader
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
-#include "CommonFramework/ImageTools/ImageFilter.h"
-#include "CommonFramework/Notifications/ProgramInfo.h"
-#include "CommonFramework/OCR/OCR_NumberReader.h"
-//#include "CommonFramework/OCR/OCR_StringNormalization.h"
-#include "CommonFramework/Tools/ErrorDumper.h"
-#include "PokemonSwSh/Resources/PokemonSwSh_PokeballSprites.h"
-#include "PokemonSwSh_BattleBallReader.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-const double BattleBallReader::MAX_ALPHA = 0.28;
-const double BattleBallReader::ALPHA_SPREAD = 0.02;
-
-
-ImageMatch::ExactImageDictionaryMatcher make_BALL_SPRITE_MATCHER(){
-    ImageMatch::ExactImageDictionaryMatcher matcher({1, 128});
-    for (const auto& item : ALL_POKEBALL_SPRITES()){
-        matcher.add(item.first, item.second.sprite.copy());
-    }
-    return matcher;
-}
-const ImageMatch::ExactImageDictionaryMatcher& BALL_SPRITE_MATCHER(){
-    static ImageMatch::ExactImageDictionaryMatcher matcher = make_BALL_SPRITE_MATCHER();
-    return matcher;
-}
-
-
-
-BattleBallReader::BattleBallReader(
-    ConsoleHandle& console,
-    Language language
-)
-    : m_matcher(BALL_SPRITE_MATCHER())
-    , m_name_reader(PokeballNameReader::instance())
-    , m_language(language)
-    , m_console(console)
-    , m_box_sprite(console, {0.649, 0.624, 0.0335, 0.060})
-    , m_box_name(console, {0.710, 0.624, 0.18, 0.060})
-    , m_box_quantity(console, {0.895, 0.624, 0.059, 0.060})
-{}
-
-std::string BattleBallReader::read_ball(const ImageViewRGB32& screen) const{
-    if (!screen){
-        return "";
-    }
-
-    ImageMatch::ImageMatchResult sprite_result;
-    {
-        sprite_result = m_matcher.match(screen, m_box_sprite, 2, ALPHA_SPREAD);
-        sprite_result.log(m_console, 0.50);
-        if (!sprite_result.results.empty() && sprite_result.results.begin()->first > MAX_ALPHA){
-            sprite_result.results.clear();
-        }
-    }
-    if (sprite_result.results.empty()){
-        dump_image(m_console, ProgramInfo(), "BattleBallReader-Sprite", screen);
-    }
-
-    OCR::StringMatchResult name_result;
-    {
-        ImageViewRGB32 cropped = extract_box_reference(screen, m_box_name);
-        name_result = m_name_reader.read_substring(
-            m_console, m_language, cropped,
-            OCR::WHITE_TEXT_FILTERS()
-        );
-    }
-    if (name_result.results.size() != 1){
-        dump_image(m_console, ProgramInfo(), "BattleBallReader-Name", screen);
-    }
-
-    if (sprite_result.results.empty()){
-        if (name_result.results.size() == 1){
-            return name_result.results.begin()->second.token;
-        }
-        return "";
-    }
-
-    if (sprite_result.results.size() == 1){
-        return sprite_result.results.begin()->second;
-    }
-
-    std::set<std::string> ocr_slugs;
-    for (const auto& item : name_result.results){
-        ocr_slugs.insert(item.second.token);
-    }
-
-    std::vector<std::string> overlap;
-    for (const auto& item : sprite_result.results){
-        auto iter = ocr_slugs.find(item.second);
-        if (iter != ocr_slugs.end()){
-            overlap.emplace_back(item.second);
-        }
-    }
-    if (overlap.size() != 1){
-        dump_image(m_console, ProgramInfo(), "BattleBallReader-SpriteNameMismatch", screen);
-        return "";
-    }
-    return overlap[0];
-}
-uint16_t BattleBallReader::read_quantity(const ImageViewRGB32& screen) const{
-    ImageRGB32 image = to_blackwhite_rgb32_range(
-        extract_box_reference(screen, m_box_quantity),
-        0xff808080, 0xffffffff, true
-    );
-    int qty = OCR::read_number(m_console, image);
-    return (uint16_t)std::max(qty, 0);
-}
-
-
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleBallReader.h b/SerialPrograms/Source/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleBallReader.h
deleted file mode 100644
index 65eda628bb..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleBallReader.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*  In-Battle Ball Inventory Reader
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_BattleBallInventoryReader_H
-#define PokemonAutomation_PokemonSwSh_BattleBallInventoryReader_H
-
-#include <string>
-#include "CommonFramework/Options/StringSelectOption.h"
-#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
-#include "CommonFramework/Tools/ConsoleHandle.h"
-#include "CommonFramework/ImageMatch/ExactImageDictionaryMatcher.h"
-#include "Pokemon/Inference/Pokemon_PokeballNameReader.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-using namespace Pokemon;
-
-
-class BattleBallReader{
-    static const double MAX_ALPHA;
-    static const double ALPHA_SPREAD;
-
-public:
-    BattleBallReader(
-        ConsoleHandle& console,
-        Language language
-    );
-
-public:
-    std::string read_ball(const ImageViewRGB32& screen) const;
-    uint16_t read_quantity(const ImageViewRGB32& screen) const;
-
-private:
-    const ImageMatch::ExactImageDictionaryMatcher& m_matcher;
-    const PokeballNameReader& m_name_reader;
-    Language m_language;
-    ConsoleHandle& m_console;
-    OverlayBoxScope m_box_sprite;
-    OverlayBoxScope m_box_name;
-    OverlayBoxScope m_box_quantity;
-};
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleDialogDetector.cpp b/SerialPrograms/Source/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleDialogDetector.cpp
deleted file mode 100644
index fe55d7f861..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleDialogDetector.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-/*  Battle Dialog Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "CommonFramework/ImageTools/SolidColorTest.h"
-#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
-#include "PokemonSwSh_BattleDialogDetector.h"
-
-//#include <iostream>
-//using std::cout;
-//using std::endl;
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-
-BattleDialogDetector::BattleDialogDetector(Color color)
-    : m_color(color)
-    , m_bottom(0.50, 0.89, 0.40, 0.07)
-    , m_left(0.01, 0.82, 0.03, 0.07)
-    , m_right(0.97, 0.87, 0.02, 0.09)
-{}
-void BattleDialogDetector::make_overlays(VideoOverlaySet& items) const{
-    items.add(m_color, m_bottom);
-    items.add(m_color, m_left);
-    items.add(m_color, m_right);
-}
-bool BattleDialogDetector::detect(const ImageViewRGB32& screen) const{
-    ImageStats bottom = image_stats(extract_box_reference(screen, m_bottom));
-//    cout << "bottom: " << bottom.stddev << endl;
-    if (!is_grey(bottom, 0, 200, 10)){
-        return false;
-    }
-    ImageStats left = image_stats(extract_box_reference(screen, m_left));
-//    cout << "left:   " << left.stddev << endl;
-    if (!is_grey(left, 0, 200, 5)){
-        return false;
-    }
-    ImageStats right = image_stats(extract_box_reference(screen, m_right));
-//    cout << "right:  " << right.stddev << endl;
-    if (!is_grey(right, 0, 200, 5)){
-        return false;
-    }
-
-    if (euclidean_distance(left.average, right.average) > 10){
-        return false;
-    }
-    if (left.average.sum() > bottom.average.sum()){
-        return false;
-    }
-    if (right.average.sum() > bottom.average.sum()){
-        return false;
-    }
-
-    return true;
-}
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleDialogDetector.h b/SerialPrograms/Source/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleDialogDetector.h
deleted file mode 100644
index 74f056dce2..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleDialogDetector.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*  Battle Dialog Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_BattleDialogDetector_H
-#define PokemonAutomation_PokemonSwSh_BattleDialogDetector_H
-
-#include "Common/Cpp/Color.h"
-#include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "CommonFramework/Inference/VisualDetector.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-
-class BattleDialogDetector : public StaticScreenDetector{
-public:
-    BattleDialogDetector(Color color = COLOR_RED);
-
-    virtual void make_overlays(VideoOverlaySet& items) const override;
-    virtual bool detect(const ImageViewRGB32& screen) const override;
-
-private:
-    Color m_color;
-    ImageFloatBox m_bottom;
-    ImageFloatBox m_left;
-    ImageFloatBox m_right;
-};
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Inference/Battles/PokemonSwSh_ExperienceGainDetector.h b/SerialPrograms/Source/PokemonSwSh/Inference/Battles/PokemonSwSh_ExperienceGainDetector.h
deleted file mode 100644
index 3d408708f7..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Inference/Battles/PokemonSwSh_ExperienceGainDetector.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*  Battle Won Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_BattleWonDetector_H
-#define PokemonAutomation_PokemonSwSh_BattleWonDetector_H
-
-#include "Common/Cpp/Containers/FixedLimitVector.h"
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "CommonFramework/InferenceInfra/VisualInferenceCallback.h"
-#include "CommonFramework/Inference/VisualDetector.h"
-#include "PokemonSwSh_BattleDialogDetector.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-class ExperienceGainDetector : public StaticScreenDetector{
-public:
-    ~ExperienceGainDetector();
-    ExperienceGainDetector(Color color = COLOR_RED);
-
-    virtual void make_overlays(VideoOverlaySet& items) const override;
-    virtual bool detect(const ImageViewRGB32& screen) const override;
-
-private:
-    Color m_color;
-    BattleDialogDetector m_dialog;
-    FixedLimitVector<std::pair<ImageFloatBox, ImageFloatBox>> m_rows;
-};
-
-
-class ExperienceGainWatcher : public ExperienceGainDetector, public VisualInferenceCallback{
-public:
-    ExperienceGainWatcher(Color color = COLOR_RED);
-
-    virtual void make_overlays(VideoOverlaySet& items) const override;
-    virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override final;
-};
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Inference/Battles/PokemonSwSh_StartBattleDetector.h b/SerialPrograms/Source/PokemonSwSh/Inference/Battles/PokemonSwSh_StartBattleDetector.h
deleted file mode 100644
index 5e134f0105..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Inference/Battles/PokemonSwSh_StartBattleDetector.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*  Start Battle Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_StartBattleDetector_H
-#define PokemonAutomation_PokemonSwSh_StartBattleDetector_H
-
-#include "CommonFramework/InferenceInfra/VisualInferenceCallback.h"
-#include "PokemonSwSh/Inference/Battles/PokemonSwSh_BattleDialogDetector.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-
-class StartBattleWatcher : public VisualInferenceCallback{
-public:
-    StartBattleWatcher(Color color = COLOR_RED);
-
-    virtual void make_overlays(VideoOverlaySet& items) const override;
-    virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override final;
-
-private:
-    Color m_color;
-    ImageFloatBox m_screen_box;
-    BattleDialogDetector m_dialog;
-};
-
-
-
-
-
-
-
-}
-}
-}
-#endif
-
diff --git a/SerialPrograms/Source/PokemonSwSh/Inference/Dens/PokemonSwSh_BeamSetter.h b/SerialPrograms/Source/PokemonSwSh/Inference/Dens/PokemonSwSh_BeamSetter.h
deleted file mode 100644
index 873828e909..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Inference/Dens/PokemonSwSh_BeamSetter.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*  Beam Setter
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- *
- *      Drop a wishing piece and determine if it is red or purple.
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_BeamSetter_H
-#define PokemonAutomation_PokemonSwSh_BeamSetter_H
-
-#include <vector>
-#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
-#include "CommonFramework/Tools/ConsoleHandle.h"
-
-namespace PokemonAutomation{
-    class BotBaseContext;
-    class ProgramEnvironment;
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-class BeamSetter{
-public:
-    enum Detection{
-        NO_DETECTION,
-        RED_DETECTED,
-        RED_ASSUMED,
-        PURPLE,
-    };
-
-public:
-    BeamSetter(ProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context);
-
-    Detection run(
-        bool save_screenshot,
-        uint16_t timeout_ticks,
-        double min_brightness,
-        double min_euclidean,
-        double min_delta_ratio,
-        double min_sigma_ratio
-    );
-
-
-private:
-    // ProgramEnvironment& m_env;
-    ConsoleHandle& m_console;
-    BotBaseContext& m_context;
-    OverlayBoxScope m_text_box0;
-    OverlayBoxScope m_text_box1;
-    OverlayBoxScope m_box;
-    std::vector<ImageFloatBox> m_boxes;
-};
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Inference/Dens/PokemonSwSh_RaidCatchDetector.h b/SerialPrograms/Source/PokemonSwSh/Inference/Dens/PokemonSwSh_RaidCatchDetector.h
deleted file mode 100644
index 745c77c7d7..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Inference/Dens/PokemonSwSh_RaidCatchDetector.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*  Raid Catch Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_RaidCatchDetector_H
-#define PokemonAutomation_PokemonSwSh_RaidCatchDetector_H
-
-#include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "CommonFramework/InferenceInfra/VisualInferenceCallback.h"
-#include "PokemonSwSh/Inference/PokemonSwSh_SelectionArrowFinder.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-class RaidCatchDetector : public VisualInferenceCallback{
-public:
-    RaidCatchDetector(VideoOverlay& overlay);
-
-    bool detect(const ImageViewRGB32& screen);
-
-    virtual void make_overlays(VideoOverlaySet& items) const override;
-    virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override final;
-
-
-private:
-    ImageFloatBox m_left0;
-    ImageFloatBox m_right0;
-//    ImageFloatBox m_left1;
-//    ImageFloatBox m_right1;
-    ImageFloatBox m_text0;
-    ImageFloatBox m_text1;
-    SelectionArrowFinder m_arrow;
-
-    size_t m_trigger_count = 0;
-};
-
-
-}
-}
-}
-#endif
-
diff --git a/SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_BoxGenderDetector.cpp b/SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_BoxGenderDetector.cpp
deleted file mode 100644
index 342b7b72bf..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_BoxGenderDetector.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-/*  IV Checker Reader
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "PokemonSwSh_BoxGenderDetector.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-BoxGenderDetector::BoxGenderDetector(Color color) : Pokemon::BoxGenderDetector({0.720, 0.028, 0.229, 0.056}, 0.01f, color) {}
-
-
-}
-}
-}
-
diff --git a/SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_BoxGenderDetector.h b/SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_BoxGenderDetector.h
deleted file mode 100644
index 23932fa001..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_BoxGenderDetector.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*  Box Gender Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_BoxGenderDetector_H
-#define PokemonAutomation_PokemonSwSh_BoxGenderDetector_H
-
-#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
-#include "Pokemon/Inference/Pokemon_BoxGenderDetector.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-class BoxGenderDetector : public Pokemon::BoxGenderDetector{
-
-public:
-    BoxGenderDetector(Color color = COLOR_RED);
-
-};
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_BoxShinySymbolDetector.cpp b/SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_BoxShinySymbolDetector.cpp
deleted file mode 100644
index 68e6630e49..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_BoxShinySymbolDetector.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-/*  Box Shiny Symbol Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- *
- *
- */
-
-#include "CommonFramework/GlobalSettingsPanel.h"
-#include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "CommonFramework/ImageTools/ImageStats.h"
-#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
-#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
-#include "PokemonSwSh_BoxShinySymbolDetector.h"
-
-#include <iostream>
-using std::cout;
-using std::endl;
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-namespace {
-    ImageFloatBox SHINY_BOX{0.969, 0.145, 0.024, 0.040};
-}
-
-void BoxShinySymbolDetector::make_overlays(VideoOverlaySet& items){
-    items.add(COLOR_RED, SHINY_BOX);
-}
-
-bool BoxShinySymbolDetector::detect(const ImageViewRGB32& screen){
-    const ImageStats symbol = image_stats(extract_box_reference(screen, SHINY_BOX));
-    if (PreloadSettings::debug().COLOR_CHECK){
-        cout << "Symbol region stddev " << symbol.stddev.to_string() << " (sum " << symbol.stddev.sum() << "), threshold: 50" << endl;
-    }
-    return symbol.stddev.sum() > 50;
-}
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_BoxShinySymbolDetector.h b/SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_BoxShinySymbolDetector.h
deleted file mode 100644
index e401d5957f..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_BoxShinySymbolDetector.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*  Box Shiny Symbol Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- *
- *  Check shiny symbol when viewing pokemon in a storage box.
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_BoxShinySymbolDetector_H
-#define PokemonAutomation_PokemonSwSh_BoxShinySymbolDetector_H
-
-
-namespace PokemonAutomation{
-
-class ImageViewRGB32;
-class VideoOverlaySet;
-
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-class BoxShinySymbolDetector{
-public:
-    static void make_overlays(VideoOverlaySet& items);
-
-    static bool detect(const ImageViewRGB32& screen);
-};
-
-
-
-}
-}
-}
-
-#endif
-
diff --git a/SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_DialogBoxDetector.cpp b/SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_DialogBoxDetector.cpp
deleted file mode 100644
index 221f7c00da..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_DialogBoxDetector.cpp
+++ /dev/null
@@ -1,72 +0,0 @@
-/*  Dialog Triangle Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <stdint.h>
-#include <array>
-
-#include "Common/Cpp/Color.h"
-#include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "CommonFramework/ImageTools/SolidColorTest.h"
-#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
-#include "PokemonSwSh_DialogBoxDetector.h"
-
-#include <iostream>
-using std::cout;
-using std::endl;
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-namespace {
-    // This box covers all possible locations of the black triangle arrow
-    std::array<ImageFloatBox, 4> BLACK_BOXES{{
-        {0.254, 0.806, 0.012, 0.052},
-        {0.730, 0.806, 0.016, 0.068},
-        {0.741, 0.880, 0.005, 0.055},
-        {0.710, 0.880, 0.007, 0.055},
-    }};
-}
-
-
-BlackDialogBoxDetector::BlackDialogBoxDetector(
-    bool stop_on_detected
-)
-    : VisualInferenceCallback("BlackDialogBoxDetector")
-    , m_stop_on_detected(stop_on_detected)
-{}
-
-
-void BlackDialogBoxDetector::make_overlays(VideoOverlaySet& items) const{
-    for(const auto& box : BLACK_BOXES){
-        items.add(COLOR_RED, box);
-    }
-}
-
-
-bool BlackDialogBoxDetector::process_frame(const ImageViewRGB32& frame, WallClock timestamp){
-    bool detected = true;
-    for(const auto& box : BLACK_BOXES){
-        if (is_black(extract_box_reference(frame, box), 180, 30) == false){
-            detected = false;
-            break;
-        }
-    }
-
-    m_detected.store(detected, std::memory_order_release);
-
-    return detected && m_stop_on_detected;
-}
-
-
-
-
-
-}
-}
-}
-
diff --git a/SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_DialogBoxDetector.h b/SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_DialogBoxDetector.h
deleted file mode 100644
index f45c811770..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_DialogBoxDetector.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*  Dialog Box Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_DialogBoxDetector_H
-#define PokemonAutomation_PokemonSwSh_DialogBoxDetector_H
-
-#include <atomic>
-#include "CommonFramework/InferenceInfra/VisualInferenceCallback.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-// Detect the black dialog box. It is used in places like releasing pokemon in box storage.
-class BlackDialogBoxDetector : public VisualInferenceCallback{
-public:
-    BlackDialogBoxDetector(bool stop_on_detected);
-
-    bool detected() const{
-        return m_detected.load(std::memory_order_acquire);
-    }
-
-    virtual void make_overlays(VideoOverlaySet& items) const override;
-
-    virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override;
-
-private:
-    bool m_stop_on_detected;
-
-    std::atomic<bool> m_detected;
-};
-
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_DialogTriangleDetector.cpp b/SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_DialogTriangleDetector.cpp
deleted file mode 100644
index fc94eafa8e..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_DialogTriangleDetector.cpp
+++ /dev/null
@@ -1,112 +0,0 @@
-/*  Dialog Triangle Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <stdint.h>
-
-#include "Common/Cpp/Color.h"
-#include "Common/Cpp/AbstractLogger.h"
-#include "CommonFramework/ImageMatch/WaterfillTemplateMatcher.h"
-#include "CommonFramework/ImageTools/WaterfillUtilities.h"
-#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
-#include "Kernels/Waterfill/Kernels_Waterfill_Types.h"
-#include "PokemonSwSh_DialogTriangleDetector.h"
-
-#include <utility>
-#include <vector>
-#include <iostream>
-using std::cout;
-using std::endl;
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-namespace {
-    // This box covers all possible locations of the black triangle arrow
-    ImageFloatBox BLACK_TRIANGLE_BOX{0.771, 0.901, 0.031, 0.069};
-}
-
-class DialogTriangleMatcher : public ImageMatch::WaterfillTemplateMatcher{
-public:
-    DialogTriangleMatcher();
-    static const DialogTriangleMatcher& instance();
-};
-
-
-DialogTriangleMatcher::DialogTriangleMatcher()
-    : WaterfillTemplateMatcher(
-        "PokemonSwSh/DialogBlackTriangle.png",
-        Color(0,0,0), Color(30, 30, 30), 50
-    )
-{
-    m_aspect_ratio_lower = 0.9;
-    m_aspect_ratio_upper = 1.1;
-    m_area_ratio_lower = 0.9;
-    m_area_ratio_upper = 1.1;
-}
-
-const DialogTriangleMatcher& DialogTriangleMatcher::instance(){
-    static DialogTriangleMatcher matcher;
-    return matcher;
-}
-
-
-
-DialogTriangleDetector::DialogTriangleDetector(
-    Logger& logger, VideoOverlay& overlay,
-    bool stop_on_detected
-)
-    : VisualInferenceCallback("DialogTriangleDetector")
-    , m_logger(logger)
-    , m_stop_on_detected(stop_on_detected)
-{}
-
-
-void DialogTriangleDetector::make_overlays(VideoOverlaySet& items) const{
-    items.add(COLOR_RED, BLACK_TRIANGLE_BOX);
-}
-bool DialogTriangleDetector::process_frame(const ImageViewRGB32& frame, WallClock timestamp){
-    const std::vector<std::pair<uint32_t, uint32_t>> filters = {
-        {combine_rgb(0, 0, 0), combine_rgb(50, 50, 50)}
-    };
-    
-    const double screen_rel_size = (frame.height() / 1080.0);
-    const size_t min_size = size_t(screen_rel_size * screen_rel_size * 500.0);
-
-    const bool detected = match_template_by_waterfill(
-        extract_box_reference(frame, BLACK_TRIANGLE_BOX), 
-        DialogTriangleMatcher::instance(),
-        filters,
-        {min_size, SIZE_MAX},
-        80,
-        [](Kernels::Waterfill::WaterfillObject& object) -> bool { return true; }
-    );
-
-    if (detected){
-        m_logger.log("Detected dialog black traingle.", COLOR_PURPLE);
-    }
-
-    m_detected.store(detected, std::memory_order_release);
-
-#if 0
-    if (detected){
-        static size_t c = 0;
-        frame.save("DialogTriangleDetectorTriggered-" + std::to_string(c++) + ".png");
-    }
-#endif
-
-    return detected && m_stop_on_detected;
-}
-
-
-
-
-
-}
-}
-}
-
diff --git a/SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_DialogTriangleDetector.h b/SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_DialogTriangleDetector.h
deleted file mode 100644
index 743e424fc2..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_DialogTriangleDetector.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*  Dialog Triangle Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_DialogTriangleDetector_H
-#define PokemonAutomation_PokemonSwSh_DialogTriangleDetector_H
-
-#include <atomic>
-#include "CommonFramework/InferenceInfra/VisualInferenceCallback.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-// Detect the black triangle arrow in the lower right portion of the white dialog box.
-// The dialog box shows up when talking to npcs.
-class DialogTriangleDetector : public VisualInferenceCallback{
-public:
-    DialogTriangleDetector(
-        Logger& logger, VideoOverlay& overlay,
-        bool stop_on_detected
-    );
-
-    bool detected() const{
-        return m_detected.load(std::memory_order_acquire);
-    }
-
-    virtual void make_overlays(VideoOverlaySet& items) const override;
-
-    virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override;
-
-private:
-    Logger& m_logger;
-    bool m_stop_on_detected;
-
-    std::atomic<bool> m_detected;
-};
-
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_IVCheckerReader.cpp b/SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_IVCheckerReader.cpp
deleted file mode 100644
index eae48732d0..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_IVCheckerReader.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-/*  IV Checker Reader
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
-#include "PokemonSwSh_IVCheckerReader.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-const IVCheckerReader& IV_READER(){
-    const static Pokemon::IVCheckerReader reader("PokemonSwSh/IVCheckerOCR.json");
-    return reader;
-}
-
-
-
-
-IVCheckerReaderScope::IVCheckerReaderScope(VideoOverlay& overlay, Language language)
-    : m_language(language)
-    , m_box0(overlay, {0.777, 0.198 + 0 * 0.0515, 0.2, 0.0515})
-    , m_box1(overlay, {0.777, 0.198 + 1 * 0.0515, 0.2, 0.0515})
-    , m_box2(overlay, {0.777, 0.198 + 2 * 0.0515, 0.2, 0.0515})
-    , m_box3(overlay, {0.777, 0.198 + 3 * 0.0515, 0.2, 0.0515})
-    , m_box4(overlay, {0.777, 0.198 + 4 * 0.0515, 0.2, 0.0515})
-    , m_box5(overlay, {0.777, 0.198 + 5 * 0.0515, 0.2, 0.0515})
-{}
-
-
-
-
-IVCheckerValue IVCheckerReaderScope::read(Logger& logger, const ImageViewRGB32& frame, const OverlayBoxScope& box){
-    ImageViewRGB32 image = extract_box_reference(frame, box);
-    OCR::StringMatchResult result = IV_READER().read_substring(
-        logger, m_language, image,
-        OCR::BLACK_TEXT_FILTERS()
-    );
-    result.clear_beyond_log10p(IVCheckerReader::MAX_LOG10P);
-    if (result.results.size() != 1){
-        return IVCheckerValue::UnableToDetect;
-    }
-    return IVCheckerValue_string_to_enum(result.results.begin()->second.token);
-}
-IVCheckerReader::Results IVCheckerReaderScope::read(Logger& logger, const ImageViewRGB32& frame){
-    IVCheckerReader::Results results;
-    if (m_language != Language::None){
-        results.hp      = read(logger, frame, m_box0);
-        results.attack  = read(logger, frame, m_box1);
-        results.defense = read(logger, frame, m_box2);
-        results.spatk   = read(logger, frame, m_box3);
-        results.spdef   = read(logger, frame, m_box4);
-        results.speed   = read(logger, frame, m_box5);
-    }
-    return results;
-}
-
-std::vector<ImageViewRGB32> IVCheckerReaderScope::dump_images(const ImageViewRGB32& frame){
-    std::vector<ImageViewRGB32> images;
-    images.emplace_back(extract_box_reference(frame, m_box0));
-    images.emplace_back(extract_box_reference(frame, m_box1));
-    images.emplace_back(extract_box_reference(frame, m_box2));
-    images.emplace_back(extract_box_reference(frame, m_box3));
-    images.emplace_back(extract_box_reference(frame, m_box4));
-    images.emplace_back(extract_box_reference(frame, m_box5));
-    return images;
-}
-
-
-
-}
-}
-}
-
diff --git a/SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_IVCheckerReader.h b/SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_IVCheckerReader.h
deleted file mode 100644
index 4b8dd761ec..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_IVCheckerReader.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*  IV Checker Reader
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_IVCheckerReader_H
-#define PokemonAutomation_PokemonSwSh_IVCheckerReader_H
-
-#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
-#include "Pokemon/Inference/Pokemon_IVCheckerReader.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-using namespace Pokemon;
-
-
-const IVCheckerReader& IV_READER();
-
-
-class IVCheckerReaderScope{
-public:
-    IVCheckerReaderScope(VideoOverlay& overlay, Language language);
-
-    IVCheckerReader::Results read(Logger& logger, const ImageViewRGB32& frame);
-
-    std::vector<ImageViewRGB32> dump_images(const ImageViewRGB32& frame);
-
-private:
-    IVCheckerValue read(Logger& logger, const ImageViewRGB32& frame, const OverlayBoxScope& box);
-
-private:
-    Language m_language;
-    OverlayBoxScope m_box0;
-    OverlayBoxScope m_box1;
-    OverlayBoxScope m_box2;
-    OverlayBoxScope m_box3;
-    OverlayBoxScope m_box4;
-    OverlayBoxScope m_box5;
-};
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_PokemonSpriteReader.h b/SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_PokemonSpriteReader.h
deleted file mode 100644
index 1a61e43a65..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_PokemonSpriteReader.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*  Pokemon Sprite Reader
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_PokemonSpriteReader_H
-#define PokemonAutomation_PokemonSwSh_PokemonSpriteReader_H
-
-#include <set>
-#include "CommonFramework/Logging/Logger.h"
-#include "CommonFramework/ImageMatch/ImageMatchResult.h"
-#include "CommonFramework/ImageMatch/ExactImageDictionaryMatcher.h"
-#include "CommonFramework/ImageMatch/CroppedImageDictionaryMatcher.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-class PokemonSpriteMatcherExact : public ImageMatch::ExactImageDictionaryMatcher{
-public:
-    PokemonSpriteMatcherExact(const std::set<std::string>* subset);
-};
-
-//  Used by Max Lair when there's an item blocking the right side.
-class PokemonLeftSpriteMatcherExact : public ImageMatch::ExactImageDictionaryMatcher{
-public:
-    PokemonLeftSpriteMatcherExact(const std::set<std::string>* subset);
-};
-
-
-
-class PokemonSpriteMatcherCropped : public ImageMatch::CroppedImageDictionaryMatcher{
-public:
-    PokemonSpriteMatcherCropped(const std::set<std::string>* subset, double min_euclidean_distance = 100);
-
-private:
-    virtual ImageRGB32 process_image(const ImageViewRGB32& image, Color& background) const override;
-
-private:
-    double m_min_euclidean_distance_squared;
-};
-
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_ReceivePokemonDetector.cpp b/SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_ReceivePokemonDetector.cpp
deleted file mode 100644
index 3c22ffec18..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_ReceivePokemonDetector.cpp
+++ /dev/null
@@ -1,89 +0,0 @@
-/*  Receive Pokemon (Orange Background) Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Compiler.h"
-#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
-#include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "CommonFramework/ImageTools/ImageStats.h"
-#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
-#include "PokemonSwSh_ReceivePokemonDetector.h"
-
-#include <iostream>
-using std::cout;
-using std::endl;
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-ReceivePokemonDetector::ReceivePokemonDetector(bool stop_on_detected)
-    : VisualInferenceCallback("ReceivePokemonDetector")
-    , m_stop_on_detected(stop_on_detected)
-    , m_box_top(0.2, 0.02, 0.78, 0.02)
-    , m_box_top_right(0.93, 0.02, 0.05, 0.1)
-    , m_box_bot_left(0.02, 0.85, 0.1, 0.1)
-    , m_has_been_orange(false)
-    , m_triggered(false)
-{}
-void ReceivePokemonDetector::make_overlays(VideoOverlaySet& items) const{
-    items.add(COLOR_RED, m_box_top);
-    items.add(COLOR_RED, m_box_top_right);
-    items.add(COLOR_RED, m_box_bot_left);
-}
-
-bool ReceivePokemonDetector::process_frame(const ImageViewRGB32& frame, WallClock timestamp){
-    bool ret = receive_is_over(frame);
-    bool triggered = m_triggered.load(std::memory_order_acquire);
-    m_triggered.store(triggered | ret, std::memory_order_release);
-    return ret && m_stop_on_detected;
-}
-bool ReceivePokemonDetector::receive_is_over(const ImageViewRGB32& frame){
-    ImageStats stats0 = image_stats(extract_box_reference(frame, m_box_top));
-    ImageStats stats1 = image_stats(extract_box_reference(frame, m_box_top_right));
-    ImageStats stats2 = image_stats(extract_box_reference(frame, m_box_bot_left));
-
-    FloatPixel expected(193, 78, 56);
-    FloatPixel actual0 = stats0.average;
-    FloatPixel actual1 = stats1.average;
-    FloatPixel actual2 = stats2.average;
-
-    expected /= expected.sum();
-    actual0 /= actual0.sum();
-    actual1 /= actual1.sum();
-    actual2 /= actual2.sum();
-
-    double distance0 = euclidean_distance(expected, actual0);
-    double distance1 = euclidean_distance(expected, actual1);
-    double distance2 = euclidean_distance(expected, actual2);
-
-    if (euclidean_distance(actual0, actual1) > 10){
-        return m_has_been_orange;
-    }
-    if (euclidean_distance(actual0, actual2) > 10){
-        return m_has_been_orange;
-    }
-    if (euclidean_distance(actual1, actual2) > 10){
-        return m_has_been_orange;
-    }
-    if (stats0.stddev.sum() > 10 || distance0 > 0.2){
-        return m_has_been_orange;
-    }
-    if (stats1.stddev.sum() > 10 || distance1 > 0.2){
-        return m_has_been_orange;
-    }
-    if (stats2.stddev.sum() > 10 || distance2 > 0.2){
-        return m_has_been_orange;
-    }
-
-    m_has_been_orange = true;
-    return false;
-}
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_ReceivePokemonDetector.h b/SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_ReceivePokemonDetector.h
deleted file mode 100644
index 8fbfe24805..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_ReceivePokemonDetector.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*  Receive Pokemon (Orange Background) Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- *
- *      Returns true after a orange background has been detected
- * and has ended.
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_ReceivePokemonDetector_H
-#define PokemonAutomation_PokemonSwSh_ReceivePokemonDetector_H
-
-#include <atomic>
-#include "CommonFramework/Logging/Logger.h"
-#include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "CommonFramework/InferenceInfra/VisualInferenceCallback.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-class ReceivePokemonDetector : public VisualInferenceCallback{
-public:
-    ReceivePokemonDetector(bool stop_on_detected);
-
-    bool triggered() const{ return m_triggered.load(std::memory_order_acquire); }
-    bool receive_is_over(const ImageViewRGB32& frame);
-
-    virtual void make_overlays(VideoOverlaySet& items) const override;
-    virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override;
-
-private:
-    bool m_stop_on_detected;
-    ImageFloatBox m_box_top;
-    ImageFloatBox m_box_top_right;
-    ImageFloatBox m_box_bot_left;
-    bool m_has_been_orange;
-
-    std::atomic<bool> m_triggered;
-};
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_SelectionArrowFinder.cpp b/SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_SelectionArrowFinder.cpp
deleted file mode 100644
index 46477a1f40..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_SelectionArrowFinder.cpp
+++ /dev/null
@@ -1,189 +0,0 @@
-/*  In-Battle Arrow Finder
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <iostream>
-#include "Kernels/Waterfill/Kernels_Waterfill_Session.h"
-#include "CommonFramework/Globals.h"
-#include "CommonFramework/GlobalSettingsPanel.h"
-#include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "CommonFramework/ImageTools/BinaryImage_FilterRgb32.h"
-#include "CommonFramework/ImageMatch/ExactImageMatcher.h"
-#include "CommonFramework/Tools/DebugDumper.h"
-#include "CommonFramework/VideoPipeline/VideoOverlay.h"
-#include "PokemonSwSh_SelectionArrowFinder.h"
-
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-using namespace Kernels;
-using namespace Kernels::Waterfill;
-
-
-const ImageMatch::ExactImageMatcher& SELECTION_ARROW(){
-    static ImageMatch::ExactImageMatcher matcher(RESOURCE_PATH() + "PokemonSwSh/BattleArrow.png");
-    return matcher;
-}
-
-bool is_selection_arrow(const ImageViewRGB32& image, const WaterfillObject& object){
-    double area_ratio = (double)object.area_ratio();
-    if (PreloadSettings::debug().IMAGE_TEMPLATE_MATCHING){
-        std::cout << "Object area: " << object.area << ", area ratio: " << area_ratio
-                  << " bound [0.4, 0.5]" << std::endl;
-        dump_debug_image(global_logger_command_line(), "PokemonSwSh/SelectionArrowFinder", "is_selection_arrow", extract_box_reference(image, object));
-    }
-    if (area_ratio < 0.4 || area_ratio > 0.5){
-        return false;
-    }
-
-    ImageRGB32 cropped = extract_box_reference(image, object).copy();
-
-    filter_by_mask(
-        object.packed_matrix(),
-        cropped,
-        COLOR_WHITE,
-        true
-    );
-
-    double rmsd = SELECTION_ARROW().rmsd(cropped);
-    
-    if (PreloadSettings::debug().IMAGE_TEMPLATE_MATCHING){
-        std::cout << "rmsd: " << rmsd << ", threshold 130" << std::endl;
-    }
-    return rmsd <= 130;
-}
-std::vector<ImagePixelBox> find_selection_arrows(const ImageViewRGB32& image, size_t min_area){
-    if (PreloadSettings::debug().IMAGE_TEMPLATE_MATCHING){
-        std::cout << "Match SwSh selection arrow by waterfill, size range (" << min_area << ", SIZE_MAX)" << std::endl;
-    }
-    PackedBinaryMatrix matrix = compress_rgb32_to_binary_max(image, 63, 63, 63);
-    auto session = make_WaterfillSession(matrix);
-    auto finder = session->make_iterator(min_area);
-    std::vector<ImagePixelBox> ret;
-    WaterfillObject object;
-    while (finder->find_next(object, true)){
-        if (is_selection_arrow(image, object)){
-            ret.emplace_back(object);
-        }
-    }
-    return ret;
-}
-
-
-
-SelectionArrowFinder::SelectionArrowFinder(VideoOverlay& overlay, const ImageFloatBox& box)
-    : VisualInferenceCallback("SelectionArrowFinder")
-    , m_overlay(overlay)
-    , m_box(box)
-{}
-void SelectionArrowFinder::make_overlays(VideoOverlaySet& items) const{
-    items.add(COLOR_YELLOW, m_box);
-}
-bool SelectionArrowFinder::detect(const ImageViewRGB32& screen){
-    const float screen_scale = screen.height() / 1080.0;
-    // Smallest arrow takes at least 600 pixels on 1920x1080 screen.
-    const size_t min_arrow_area = size_t(600.0 * screen_scale * screen_scale);
-    std::vector<ImagePixelBox> arrows = find_selection_arrows(
-        extract_box_reference(screen, m_box), min_arrow_area);
-
-    m_arrow_boxes.clear();
-    for (const ImagePixelBox& mark : arrows){
-        m_arrow_boxes.emplace_back(m_overlay, translate_to_parent(screen, m_box, mark), COLOR_MAGENTA);
-    }
-    return !m_arrow_boxes.empty();
-}
-bool SelectionArrowFinder::process_frame(const ImageViewRGB32& frame, WallClock timestamp){
-    detect(frame);
-//    cout << m_arrow_boxes.size() << endl;
-    return !m_arrow_boxes.empty();
-}
-
-
-
-BattleMoveArrowFinder::BattleMoveArrowFinder(VideoOverlay& overlay)
-    : SelectionArrowFinder(overlay, ImageFloatBox(0.640, 0.600, 0.055, 0.380))
-    , m_arrow_slot(-1)
-{}
-
-int8_t BattleMoveArrowFinder::get_slot(){
-    return m_arrow_slot.load(std::memory_order_acquire);
-}
-int8_t BattleMoveArrowFinder::detect(const ImageViewRGB32& screen){
-    SelectionArrowFinder::detect(screen);
-
-    if (m_arrow_boxes.empty()){
-        return -1;
-    }
-
-    const ImageFloatBox& arrow = m_arrow_boxes[0];
-    double arrow_y_center = arrow.y + arrow.height * 0.5;
-
-    int8_t slot = arrow_slot(arrow_y_center);
-    m_arrow_slot.store(slot, std::memory_order_release);
-    return slot;
-}
-bool BattleMoveArrowFinder::process_frame(const ImageViewRGB32& frame, WallClock timestamp){
-    detect(frame);
-    return false;
-}
-
-int8_t BattleMoveArrowFinder::arrow_slot(double y_center){
-    if (y_center < 0){
-        return -1;
-    }
-    y_center -= 0.647222;
-    y_center /= 0.0962963;
-    return (int8_t)(y_center + 0.5);
-}
-
-
-
-RetrieveEggArrowFinder::RetrieveEggArrowFinder(VideoOverlay& overlay)
-    : SelectionArrowFinder(overlay, ImageFloatBox(0.597, 0.640, 0.166, 0.071))
-{}
-
-
-CheckNurseryArrowFinder::CheckNurseryArrowFinder(VideoOverlay& overlay)
-    : SelectionArrowFinder(overlay, ImageFloatBox(0.419, 0.570, 0.290, 0.084))
-{}
-
-
-StoragePokemonMenuArrowFinder::StoragePokemonMenuArrowFinder(VideoOverlay& overlay)
-    : SelectionArrowFinder(overlay, ImageFloatBox(0.555, 0.413, 0.177, 0.078))
-{}
-
-
-RotomPhoneMenuArrowFinder::RotomPhoneMenuArrowFinder(VideoOverlay& overlay)
-    : m_overlay_set(overlay)
-{
-    for(size_t i_row = 0; i_row < 2; i_row++){
-        for(size_t j_col = 0; j_col < 5; j_col++){
-            ImageFloatBox box(0.047 + j_col*0.183, 0.175 + 0.333*i_row, 0.059, 0.104);
-            m_overlay_set.add(COLOR_YELLOW, box);
-        }
-    }
-}
-
-int RotomPhoneMenuArrowFinder::detect(const ImageViewRGB32& screen){
-    const float screen_scale = screen.height() / 1080.0;
-    const size_t min_arrow_area = size_t(1400 * screen_scale * screen_scale);
-    for (size_t i_row = 0; i_row < 2; i_row++){
-        for (size_t j_col = 0; j_col < 5; j_col++){
-            ImageFloatBox box(0.047 + j_col*0.183, 0.175 + 0.333*i_row, 0.059, 0.104);
-            std::vector<ImagePixelBox> arrows = find_selection_arrows(
-                extract_box_reference(screen, box), min_arrow_area);
-            if (arrows.size() > 0){
-                return (int)(i_row * 5 + j_col);
-            }
-        }
-    }
-    return -1;
-}
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_SelectionArrowFinder.h b/SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_SelectionArrowFinder.h
deleted file mode 100644
index 932aee3260..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_SelectionArrowFinder.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/*  Selection Arrow Finder
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_SelectionArrowFinder_H
-#define PokemonAutomation_PokemonSwSh_SelectionArrowFinder_H
-
-#include <atomic>
-#include <deque>
-#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
-#include "CommonFramework/InferenceInfra/VisualInferenceCallback.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-class SelectionArrowFinder : public VisualInferenceCallback{
-public:
-    SelectionArrowFinder(VideoOverlay& overlay, const ImageFloatBox& box);
-
-    bool detect(const ImageViewRGB32& screen);
-
-    virtual void make_overlays(VideoOverlaySet& items) const override;
-    virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override;
-
-protected:
-    VideoOverlay& m_overlay;
-    ImageFloatBox m_box;
-    std::deque<OverlayBoxScope> m_arrow_boxes;
-};
-
-
-
-class BattleMoveArrowFinder : public SelectionArrowFinder{
-public:
-    BattleMoveArrowFinder(VideoOverlay& overlay);
-
-    int8_t get_slot();
-
-    //  These are not thread safe.
-    int8_t detect(const ImageViewRGB32& screen);
-    virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override;
-
-
-private:
-    int8_t arrow_slot(double y_center);
-
-
-private:
-    std::atomic<int8_t> m_arrow_slot;
-};
-
-
-// Selection arrow for the dialog of the egg lady when you would like to retrieve an egg.
-class RetrieveEggArrowFinder : public SelectionArrowFinder{
-public:
-    RetrieveEggArrowFinder(VideoOverlay& overlay);
-};
-
-
-// Selection arrow for the dialog of the egg lady when you check the condition of the pokemon
-// in the Pokemon Nursery, where there is no egg.
-class CheckNurseryArrowFinder : public SelectionArrowFinder{
-public:
-    CheckNurseryArrowFinder(VideoOverlay& overlay);
-};
-
-
-// Selection arrow for the menu of the pokemon in a pokemon storage box
-class StoragePokemonMenuArrowFinder : public SelectionArrowFinder{
-public:
-    StoragePokemonMenuArrowFinder(VideoOverlay& overlay);
-};
-
-// The arrow that points to one of the ten apps on Rotom Phone menu
-class RotomPhoneMenuArrowFinder {
-public:
-    RotomPhoneMenuArrowFinder(VideoOverlay& overlay);
-
-    // Detect which app is selected by the arrow. Return the index of the app
-    // The order is: from top to bottom, from left to right.
-    // If no arrow found, return -1.
-    int detect(const ImageViewRGB32& screen);
-
-private:
-    VideoOverlaySet m_overlay_set;
-};
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_TypeSymbolFinder.cpp b/SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_TypeSymbolFinder.cpp
deleted file mode 100644
index c43d1fb445..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_TypeSymbolFinder.cpp
+++ /dev/null
@@ -1,272 +0,0 @@
-/*  Type Symbol Finder
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Compiler.h"
-#include "Common/Cpp/CancellableScope.h"
-#include "Kernels/Waterfill/Kernels_Waterfill.h"
-#include "CommonFramework/ImageTools/ImageStats.h"
-#include "CommonFramework/ImageTools/SolidColorTest.h"
-#include "CommonFramework/ImageTools/BinaryImage_FilterRgb32.h"
-#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
-#include "PokemonSwSh_TypeSymbolFinder.h"
-
-#include <iostream>
-using std::cout;
-using std::endl;
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-using namespace Kernels;
-using namespace Kernels::Waterfill;
-
-
-
-size_t distance_sqr(const ImagePixelBox& a, const ImagePixelBox& b){
-    bool overlap_x = a.min_x <= b.max_x && b.min_x <= a.max_x;
-    bool overlap_y = a.min_y <= b.max_y && b.min_y <= a.max_y;
-    if (overlap_x && overlap_y){
-        return 0;
-    }
-
-    size_t dist_x = 0;
-    if (!overlap_x){
-        dist_x = a.max_x < b.min_x
-            ? b.min_x - a.max_x
-            : a.min_x - b.max_x;
-    }
-
-    size_t dist_y = 0;
-    if (!overlap_y){
-        dist_y = a.max_y < b.min_y
-            ? b.min_y - a.max_y
-            : a.min_y - b.max_y;
-    }
-
-    return dist_x*dist_x + dist_y*dist_y;
-}
-
-
-std::pair<double, PokemonType> match_type_symbol(const ImageViewRGB32& image){
-    size_t width = image.width();
-    size_t height = image.height();
-    if (width * height < 100){
-        return {1.0, PokemonType::NONE};
-    }
-    if (width > 2 * height){
-        return {1.0, PokemonType::NONE};
-    }
-    if (height > 2 * width){
-        return {1.0, PokemonType::NONE};
-    }
-    ImageStats stats = image_stats(image);
-    if (stats.stddev.sum() < 50){
-        return {1.0, PokemonType::NONE};
-    }
-
-//    static int c = 0;
-//    image.save("test-" + std::to_string(threshold) + "-" + std::to_string(c++) + ".png");
-
-//    std::map<double, PokemonType> rank;
-    double best_score = 0.4;
-    PokemonType best_type = PokemonType::NONE;
-    for (const auto& item : all_type_sprites()){
-//        if (threshold != 700 || id != 55){
-//            continue;
-//        }
-        double rmsd_alpha = item.second.matcher().diff(image);
-
-//        item.second.matcher().m_image.save("sprite.png");
-//        cout << item.second.slug() << ": " << rmsd_alpha << endl;
-
-#if 0
-        //  Handicap fairy due to white and pink being too similar in color and
-        //  false positiving on the background.
-        if (item.first == PokemonType::FAIRY){
-            rmsd_ratio *= 1.5;
-        }
-
-        //  Bonus for dark because or large contrast.
-        if (item.first == PokemonType::DARK){
-            rmsd_ratio *= 0.8;
-        }
-#endif
-
-        if (best_score > rmsd_alpha){
-            best_score = rmsd_alpha;
-            best_type = item.first;
-//            cout << item.second.slug() << ": " << stats.stddev << endl;
-        }
-    }
-
-//    if (best_type != PokemonType::NONE){
-//        cout << get_type_slug(best_type) << ": " << best_score << endl;
-//    }
-    return {best_score, best_type};
-}
-
-void find_symbol_candidates(
-    std::multimap<double, std::pair<PokemonType, ImagePixelBox>>& candidates,
-    const ImageViewRGB32& image,
-    PackedBinaryMatrix& matrix, double max_area_ratio
-){
-    size_t max_area = (size_t)(image.width() * image.height() * max_area_ratio);
-    std::vector<WaterfillObject> objects = find_objects_inplace(matrix, 20);
-
-//    static int index = 0;
-
-    std::map<size_t, WaterfillObject> objmap;
-    for (size_t c = 0; c < objects.size(); c++){
-        if (objects[c].area > max_area){
-            continue;
-        }
-        objmap[c] = objects[c];
-
-//        image.copy(
-//            objects[c].min_x, objects[c].min_y, objects[c].width(), objects[c].height()
-//        ).save("test-" + std::to_string(index++) + ".png");
-    }
-
-//    cout << "begin = " << objmap.size() << endl;
-
-    //  Merge nearby objects.
-    bool changed;
-    do{
-        changed = false;
-        for (auto iter0 = objmap.begin(); iter0 != objmap.end(); ++iter0){
-            for (auto iter1 = objmap.begin(); iter1 != objmap.end();){
-                if (iter0->first >= iter1->first){
-                    ++iter1;
-                    continue;
-                }
-                const WaterfillObject& obj0 = iter0->second;
-                const WaterfillObject& obj1 = iter1->second;
-                size_t distance = distance_sqr(
-                    ImagePixelBox(obj0.min_x, obj0.min_y, obj0.max_x, obj0.max_y),
-                    ImagePixelBox(obj1.min_x, obj1.min_y, obj1.max_x, obj1.max_y)
-                );
-                if (distance < 5*5){
-                    iter0->second.merge_assume_no_overlap(iter1->second);
-                    iter1 = objmap.erase(iter1);
-                    changed = true;
-                }else{
-                    ++iter1;
-                }
-            }
-        }
-    }while (changed);
-
-//    cout << "merged = " << objmap.size() << endl;
-
-    //  Identify objects.
-    for (const auto& item : objmap){
-        ImageViewRGB32 img = extract_box_reference(image, item.second);
-        std::pair<double, PokemonType> result = match_type_symbol(img);
-        if (result.second != PokemonType::NONE){
-            const WaterfillObject& obj = item.second;
-            candidates.emplace(
-                result.first,
-                std::pair<PokemonType, ImagePixelBox>(
-                    result.second,
-                    ImagePixelBox(obj.min_x, obj.min_y, obj.max_x, obj.max_y)
-                )
-            );
-        }
-    }
-
-//    cout << "candidates = " << candidates.size() << endl;
-}
-
-
-
-std::multimap<double, std::pair<PokemonType, ImagePixelBox>> find_symbols(
-    const ImageViewRGB32& image, double max_area_ratio
-){
-    std::multimap<double, std::pair<PokemonType, ImagePixelBox>> candidates;
-
-    {
-        std::vector<PackedBinaryMatrix> matrices = compress_rgb32_to_binary_range(
-            image,
-            {
-                {0xff909090, 0xffffffff},
-                {0xffa0a0a0, 0xffffffff},
-                {0xffb0b0b0, 0xffffffff},
-                {0xffc0c0c0, 0xffffffff},
-                {0xffd0d0d0, 0xffffffff},
-                {0xffe0e0e0, 0xffffffff},
-            }
-        );
-        for (PackedBinaryMatrix& matrix : matrices){
-            find_symbol_candidates(candidates, image, matrix, max_area_ratio);
-        }
-    }
-
-    std::multimap<double, std::pair<PokemonType, ImagePixelBox>> filtered;
-    for (const auto& candidate : candidates){
-//        cout << get_type_slug(candidate.second.first) << ": " << candidate.first << endl;
-//        hits.emplace_back(overlay, translate_to_parent(screen, box, candidate.second.second.box), COLOR_GREEN);
-
-        bool is_dupe = false;
-        for (const auto& item : filtered){
-            if (distance_sqr(candidate.second.second, item.second.second) == 0){
-                is_dupe = true;
-                break;
-            }
-        }
-        if (!is_dupe){
-            filtered.emplace(candidate);
-        }
-    }
-
-#if 0
-    for (const auto& item : filtered){
-//        cout << get_type_slug(item.second.first) << ": " << item.first << " - [" << item.second.second.center_x() << "," << item.second.second.center_y() << "]" << endl;
-        const ImagePixelBox& box = item.second.second;
-        ImageViewRGB32 img = image.sub_image(
-            box.min_x, box.min_y,
-            box.width(), box.height()
-        );
-//        img.save("test-" + std::to_string(c++) + ".png");
-    }
-#endif
-
-    return filtered;
-}
-
-
-
-
-
-void test_find_symbols(
-    CancellableScope& scope,
-    VideoOverlay& overlay,
-    const ImageFloatBox& box,
-    const ImageViewRGB32& screen, double max_area_ratio
-){
-    ImageViewRGB32 image = extract_box_reference(screen, box);
-
-    std::multimap<double, std::pair<PokemonType, ImagePixelBox>> candidates = find_symbols(image, max_area_ratio);
-
-
-    std::deque<OverlayBoxScope> hits;
-//    hits.clear();
-    cout << "---------------" << endl;
-    for (const auto& item : candidates){
-        cout << get_type_slug(item.second.first) << ": " << item.first << endl;
-        hits.emplace_back(overlay, translate_to_parent(screen, box, item.second.second), COLOR_GREEN);
-    }
-
-    scope.wait_for(std::chrono::seconds(10));
-}
-
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_TypeSymbolFinder.h b/SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_TypeSymbolFinder.h
deleted file mode 100644
index 1b2092d9c6..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_TypeSymbolFinder.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*  Type Symbol Finder
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_TypeSymbolFinder_H
-#define PokemonAutomation_PokemonSwSh_TypeSymbolFinder_H
-
-#include <map>
-#include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "PokemonSwSh/Resources/PokemonSwSh_TypeSprites.h"
-
-namespace PokemonAutomation{
-    class ProgramEnvironment;
-    class VideoOverlay;
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-//  Find all type symbols inside the image.
-std::multimap<double, std::pair<PokemonType, ImagePixelBox>> find_symbols(
-    const ImageViewRGB32& image, double max_area_ratio
-);
-
-
-
-void test_find_symbols(
-    ProgramEnvironment& env,
-    VideoOverlay& overlay,
-    const ImageFloatBox& box,
-    const ImageViewRGB32& screen, double max_area_ratio = 0.20
-);
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_YCommDetector.cpp b/SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_YCommDetector.cpp
deleted file mode 100644
index c5367868b2..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_YCommDetector.cpp
+++ /dev/null
@@ -1,126 +0,0 @@
-/*  Y-Comm Menu Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Compiler.h"
-#include "CommonFramework/ImageMatch/WaterfillTemplateMatcher.h"
-#include "CommonFramework/ImageTools/ImageStats.h"
-#include "CommonFramework/ImageTools/SolidColorTest.h"
-#include "CommonFramework/ImageTools/WaterfillUtilities.h"
-#include "CommonFramework/Logging/Logger.h"
-#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
-#include "Kernels/Waterfill/Kernels_Waterfill_Types.h"
-#include "PokemonSwSh_YCommDetector.h"
-
-#include <utility>
-#include <vector>
-#include <iostream>
-using std::cout;
-using std::endl;
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-
-YCommMenuDetector::YCommMenuDetector(bool is_on)
-    : VisualInferenceCallback("YCommMenuDetector")
-    , m_is_on(is_on)
-    , m_top(0.600, 0.020, 0.100, 0.040)
-    , m_bottom(0.100, 0.970, 0.400, 0.020)
-{}
-void YCommMenuDetector::make_overlays(VideoOverlaySet& items) const{
-    items.add(COLOR_RED, m_top);
-    items.add(COLOR_RED, m_bottom);
-}
-
-bool YCommMenuDetector::detect(const ImageViewRGB32& screen){
-    ImageStats bottom = image_stats(extract_box_reference(screen, m_bottom));
-//    cout << bottom.average << bottom.stddev << endl;
-    if (!is_black(bottom)){
-        return false;
-    }
-
-    ImageStats top = image_stats(extract_box_reference(screen, m_top));
-//    cout << top.average << top.stddev << endl;
-    if (!is_solid(top, {0.0819777, 0.124031, 0.793991}, 0.25)){
-        return false;
-    }
-
-    return true;
-}
-
-bool YCommMenuDetector::process_frame(const ImageViewRGB32& frame, WallClock timestamp){
-    return m_is_on ? detect(frame) : !detect(frame);
-}
-
-
-namespace {
-
-ImageFloatBox YCOMM_ICON_BOX{0.007, 0.944, 0.032, 0.054};
-
-}
-
-class YCommIconMatcher : public ImageMatch::WaterfillTemplateMatcher{
-public:
-    YCommIconMatcher();
-    static const YCommIconMatcher& instance();
-};
-
-
-YCommIconMatcher::YCommIconMatcher()
-    : WaterfillTemplateMatcher(
-        "PokemonSwSh/YComm.png",
-        Color(0,0,255), Color(100, 100, 255), 50
-    )
-{
-    m_aspect_ratio_lower = 0.9;
-    m_aspect_ratio_upper = 1.1;
-    m_area_ratio_lower = 0.9;
-    m_area_ratio_upper = 1.2;
-}
-
-const YCommIconMatcher& YCommIconMatcher::instance(){
-    static YCommIconMatcher matcher;
-    return matcher;
-}
-
-
-YCommIconDetector::YCommIconDetector(bool is_on)
-    : VisualInferenceCallback("YCommIconDetector")
-    , m_is_on(is_on)
-{}
-
-void YCommIconDetector::make_overlays(VideoOverlaySet& items) const{
-    items.add(COLOR_RED, YCOMM_ICON_BOX);
-}
-
-bool YCommIconDetector::process_frame(const ImageViewRGB32& frame, WallClock timestamp){
-
-    const std::vector<std::pair<uint32_t, uint32_t>> filters = {
-        {combine_rgb(0, 0, 150), combine_rgb(100, 100, 255)}
-    };
-
-    const double screen_rel_size = (frame.height() / 1080.0);
-    const size_t min_size = size_t(screen_rel_size * screen_rel_size * 350.0);
-    
-    const bool detected = match_template_by_waterfill(
-        extract_box_reference(frame, YCOMM_ICON_BOX), 
-        YCommIconMatcher::instance(),
-        filters,
-        {min_size, SIZE_MAX},
-        120,
-        [](Kernels::Waterfill::WaterfillObject& object) -> bool { return true; }
-    );
-
-    return m_is_on ? detected : !detected;
-}
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_YCommDetector.h b/SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_YCommDetector.h
deleted file mode 100644
index a72150b125..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_YCommDetector.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*  Y-Comm Menu Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_YCommDetector_H
-#define PokemonAutomation_PokemonSwSh_YCommDetector_H
-
-#include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "CommonFramework/InferenceInfra/VisualInferenceCallback.h"
-
-namespace PokemonAutomation{
-
-class Logger;
-
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-class YCommMenuDetector : public VisualInferenceCallback{
-public:
-    YCommMenuDetector(bool is_on);
-
-    bool detect(const ImageViewRGB32& screen);
-
-    virtual void make_overlays(VideoOverlaySet& items) const override;
-    virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override final;
-
-private:
-    bool m_is_on;
-    ImageFloatBox m_top;
-    ImageFloatBox m_bottom;
-};
-
-// Detect the blue Y letter as the Y Comm symbol in the lower left corner of the screen on the
-// overworld, when Y Comm is active.
-class YCommIconDetector : public VisualInferenceCallback{
-public:
-    // If `is_on` is true, `process_frame()` returns true if it finds the Y letter.
-    // Otherwise, `process_frame()` returns true if the Y letter is not found.
-    YCommIconDetector(bool is_on);
-
-    virtual void make_overlays(VideoOverlaySet& items) const override;
-
-    virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override final;
-
-private:
-    bool m_is_on;
-};
-
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Inference/RNG/PokemonSwSh_OrbeetleAttackAnimationDetector.cpp b/SerialPrograms/Source/PokemonSwSh/Inference/RNG/PokemonSwSh_OrbeetleAttackAnimationDetector.cpp
deleted file mode 100644
index 40b041f2a5..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Inference/RNG/PokemonSwSh_OrbeetleAttackAnimationDetector.cpp
+++ /dev/null
@@ -1,103 +0,0 @@
-/*  Orbeetle Attack Animation Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- *
- *      Detects whether Orbeetle's animation is special or physical.
- *
- */
-
-#include "Common/Cpp/PrettyPrint.h"
-#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
-#include "CommonFramework/ImageTools/ImageStats.h"
-#include "CommonFramework/Tools/DebugDumper.h"
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "PokemonSwSh_OrbeetleAttackAnimationDetector.h"
-
-
-namespace PokemonAutomation {
-namespace NintendoSwitch {
-namespace PokemonSwSh {
-
-OrbeetleAttackAnimationDetector::OrbeetleAttackAnimationDetector(ConsoleHandle& console, BotBaseContext& context)
-    : m_console(console)
-    , m_context(context)
-    , m_box(console, {0.86, 0.2, 0.1, 0.15})
-{}
-
-
-OrbeetleAttackAnimationDetector::Detection OrbeetleAttackAnimationDetector::run(bool save_screenshot, bool log_values)
-{
-    //  Grab baseline image.
-    VideoSnapshot baseline_image = m_console.video().snapshot();
-    if (!baseline_image) {
-        m_console.log("Orbeetle Attack Animation: Screenshot failed.", COLOR_PURPLE);
-        return Detection::NO_DETECTION;
-    }
-
-    if (save_screenshot) {
-        //baseline_image->save("orbeetle-baseline-" + now_to_filestring() + ".png");
-        dump_debug_image(m_console.logger(), "rng", "orbeetle-baseline", baseline_image);
-    }
-
-    FloatPixel baseline_values = image_average(extract_box_reference(baseline_image, m_box));
-    FloatPixel baseline_ratios = baseline_values / baseline_values.sum();
-
-
-    //  Play the attack animation.
-    pbf_press_button(m_context, BUTTON_RCLICK, 10, 155);
-    m_context.wait_for_all_requests();
-
-
-    //  Grab the animation image.
-    VideoSnapshot animation_image = m_console.video().snapshot();
-    if (!animation_image) {
-        m_console.log("Orbeetle Attack Animation: Screenshot failed.", COLOR_PURPLE);
-        return Detection::NO_DETECTION;
-    }
-
-    FloatPixel animation_values = image_average(extract_box_reference(animation_image, m_box));
-    FloatPixel animation_ratios = animation_values / animation_values.sum();
-
-    if (log_values) {
-        m_console.log("Orbeetle baseline value red: " + std::to_string(baseline_values.r));
-        m_console.log("Orbeetle attack value red: " + std::to_string(animation_values.r));
-        m_console.log("Orbeetle baseline value green: " + std::to_string(baseline_values.g));
-        m_console.log("Orbeetle attack value green: " + std::to_string(animation_values.g));
-        m_console.log("Orbeetle baseline value blue: " + std::to_string(baseline_values.b));
-        m_console.log("Orbeetle attack value blue: " + std::to_string(animation_values.b));
-
-        m_console.log("Orbeetle baseline ratio red: " + std::to_string(baseline_ratios.r));
-        m_console.log("Orbeetle attack ratio red: " + std::to_string(animation_ratios.r));
-        m_console.log("Orbeetle baseline ratio green: " + std::to_string(baseline_ratios.g));
-        m_console.log("Orbeetle attack ratio green: " + std::to_string(animation_ratios.g));
-        m_console.log("Orbeetle baseline ratio blue: " + std::to_string(baseline_ratios.b));
-        m_console.log("Orbeetle attack ratio blue: " + std::to_string(animation_ratios.b));
-    }
-
-    if ((animation_ratios.r >= 1.4 * baseline_ratios.r)
-//        && (animation_ratios.g <= 0.85 * baseline_ratios.g)
-//        && (animation_ratios.b <= 0.85 * baseline_ratios.b)
-        )
-    {
-        if (save_screenshot) {
-            //animation_image->save("orbeetle-attack-special-" + now_to_filestring() + ".png");
-            dump_debug_image(m_console.logger(), "rng", "orbeetle-special", animation_image);
-        }
-        m_console.log("Orbeetle Attack Animation: Special animation detected.");
-        return Detection::SPECIAL;
-    }
-    if (save_screenshot) {
-        animation_image->save("orbeetle-attack-physical-" + now_to_filestring() + ".png");
-        dump_debug_image(m_console.logger(), "rng", "orbeetle-physical", animation_image);
-    }
-    m_console.log("Orbeetle Attack Animation: Physical animation detected.");
-    return Detection::PHYSICAL;
-}
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSwSh/Inference/RNG/PokemonSwSh_OrbeetleAttackAnimationDetector.h b/SerialPrograms/Source/PokemonSwSh/Inference/RNG/PokemonSwSh_OrbeetleAttackAnimationDetector.h
deleted file mode 100644
index a77b65fce3..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Inference/RNG/PokemonSwSh_OrbeetleAttackAnimationDetector.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*  Orbeetle Attack Animation Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- *
- *      Detects whether Orbeetle's animation is special or physical.
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_OrbeetleAttackAnimationDetector_H
-#define PokemonAutomation_PokemonSwSh_OrbeetleAttackAnimationDetector_H
-
-#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
-#include "CommonFramework/Tools/ConsoleHandle.h"
-
-namespace PokemonAutomation {
-class BotBaseContext;
-class ProgramEnvironment;
-namespace NintendoSwitch {
-namespace PokemonSwSh {
-
-
-class OrbeetleAttackAnimationDetector {
-public:
-    enum Detection {
-        NO_DETECTION,
-        SPECIAL,
-        PHYSICAL,
-    };
-
-public:
-    OrbeetleAttackAnimationDetector(ConsoleHandle& console, BotBaseContext& context);
-
-    Detection run(bool save_screenshot, bool log_values);
-
-
-private:
-    ConsoleHandle& m_console;
-    BotBaseContext& m_context;
-    OverlayBoxScope m_box;
-};
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_ShinySparkleSet.cpp b/SerialPrograms/Source/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_ShinySparkleSet.cpp
deleted file mode 100644
index 722f3ab032..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_ShinySparkleSet.cpp
+++ /dev/null
@@ -1,171 +0,0 @@
-/*  Shiny Sparkle Set
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <sstream>
-#include "Kernels/Waterfill/Kernels_Waterfill.h"
-#include "Kernels/Waterfill/Kernels_Waterfill_Session.h"
-#include "CommonFramework/ImageTools/BinaryImage_FilterRgb32.h"
-#include "PokemonSwSh/PokemonSwSh_Settings.h"
-#include "PokemonSwSh_SparkleDetectorRadial.h"
-#include "PokemonSwSh_SparkleDetectorSquare.h"
-#include "PokemonSwSh_ShinySparkleSet.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-using namespace Kernels;
-using namespace Kernels::Waterfill;
-
-
-ShinySparkleSetSwSh::~ShinySparkleSetSwSh(){}
-void ShinySparkleSetSwSh::clear(){
-    balls.clear();
-    stars.clear();
-    squares.clear();
-    lines.clear();
-    m_alpha_overall = 0;
-    m_alpha_star = 0;
-    m_alpha_square = 0;
-}
-
-std::string ShinySparkleSetSwSh::to_str() const{
-    std::ostringstream ss;
-    if (m_alpha_overall < 1.0){
-        return "";
-    }
-    ss << "SparkleDetector";
-    if (!balls.empty()){
-        ss << " - Balls: " << balls.size();
-    }
-    if (!stars.empty()){
-        ss << " - Stars: " << stars.size();
-    }
-    if (!squares.empty()){
-        ss << " - Squares: " << squares.size();
-    }
-    if (!lines.empty()){
-        ss << " - Lines: " << lines.size();
-    }
-    ss << " - (alpha = " << m_alpha_overall << ")";
-    return ss.str();
-}
-void ShinySparkleSetSwSh::draw_boxes(
-    VideoOverlaySet& overlays,
-    const ImageViewRGB32& frame,
-    const ImageFloatBox& inference_box
-) const{
-    for (const ImagePixelBox& box : balls){
-        overlays.add(COLOR_GREEN, translate_to_parent(frame, inference_box, box));
-    }
-    for (const ImagePixelBox& box : stars){
-        overlays.add(COLOR_BLUE, translate_to_parent(frame, inference_box, box));
-    }
-    for (const ImagePixelBox& box : squares){
-        overlays.add(COLOR_MAGENTA, translate_to_parent(frame, inference_box, box));
-    }
-    for (const ImagePixelBox& box : lines){
-        overlays.add(COLOR_YELLOW, translate_to_parent(frame, inference_box, box));
-    }
-}
-void ShinySparkleSetSwSh::update_alphas(){
-    const GameSettings& settings = GameSettings::instance();
-    double ball_alpha   = settings.BALL_SPARKLE_ALPHA * balls.size();
-    double star_alpha   = settings.STAR_SPARKLE_ALPHA * stars.size();
-    double square_alpha = settings.SQUARE_SPARKLE_ALPHA * squares.size();
-    double line_alpha   = std::min(settings.LINE_SPARKLE_ALPHA * lines.size(), square_alpha);
-    m_alpha_overall = ball_alpha + star_alpha + square_alpha + line_alpha;
-    m_alpha_star = star_alpha;
-    m_alpha_square = square_alpha + line_alpha;
-}
-
-
-
-
-ShinySparkleSetSwSh find_sparkles(WaterfillSession& session){
-    ShinySparkleSetSwSh sparkles;
-    auto finder = session.make_iterator(20);
-    WaterfillObject object;
-    while (finder->find_next(object, true)){
-        RadialSparkleDetector radial_sparkle(object);
-        if (radial_sparkle.is_ball()){
-            sparkles.balls.emplace_back(object.min_x, object.min_y, object.max_x, object.max_y);
-            continue;
-        }
-        if (radial_sparkle.is_star()){
-            sparkles.stars.emplace_back(object.min_x, object.min_y, object.max_x, object.max_y);
-            continue;
-        }
-        if (is_line_sparkle(object)){
-            sparkles.lines.emplace_back(object.min_x, object.min_y, object.max_x, object.max_y);
-            continue;
-        }
-        if (is_square_sparkle(object)){
-            sparkles.squares.emplace_back(object.min_x, object.min_y, object.max_x, object.max_y);
-            continue;
-        }
-    }
-    return sparkles;
-}
-void ShinySparkleSetSwSh::read_from_image(const ImageViewRGB32& image){
-    clear();
-    if (!image){
-        return;
-    }
-
-    std::vector<PackedBinaryMatrix> matrices = compress_rgb32_to_binary_range(
-        image,
-        {
-            {0xffa0a000, 0xffffffff},
-            {0xffb0b000, 0xffffffff},
-            {0xffc0c000, 0xffffffff},
-            {0xffd0d000, 0xffffffff},
-        }
-    );
-    auto session = make_WaterfillSession();
-
-    double best_alpha = 0;
-    for (PackedBinaryMatrix& matrix : matrices){
-        session->set_source(matrix);
-        ShinySparkleSetSwSh sparkles = find_sparkles(*session);
-        sparkles.update_alphas();
-        double alpha = sparkles.alpha_overall();
-        if (best_alpha < alpha){
-            best_alpha = alpha;
-            *this = std::move(sparkles);
-        }
-    }
-}
-
-
-
-
-void ShinySparkleAggregator::add_frame(const std::shared_ptr<const ImageRGB32>& image, const ShinySparkleSetSwSh& sparkles){
-    m_best_overall = std::max(m_best_overall, sparkles.alpha_overall());
-
-    double current_star = sparkles.alpha_star();
-    double current_square = sparkles.alpha_square();
-
-    m_best_star = std::max(m_best_star, current_star);
-    m_best_square = std::max(m_best_square, current_square);
-
-    double type_alpha = std::max(current_star, current_square);
-    if (m_best_type < type_alpha){
-        m_best_type = type_alpha;
-        m_best_image = image;
-    }
-}
-
-
-
-
-
-
-}
-}
-}
-
-
diff --git a/SerialPrograms/Source/PokemonSwSh/Inference/Sounds/PokemonSwSh_BerryTreeRustlingSoundDetector.cpp b/SerialPrograms/Source/PokemonSwSh/Inference/Sounds/PokemonSwSh_BerryTreeRustlingSoundDetector.cpp
deleted file mode 100644
index 4d619457e6..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Inference/Sounds/PokemonSwSh_BerryTreeRustlingSoundDetector.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-/*  Berry Tree Rustling Sound Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-
-#include "CommonFramework/Inference/SpectrogramMatcher.h"
-#include "CommonFramework/Inference/AudioTemplateCache.h"
-#include "PokemonSwSh_BerryTreeRustlingSoundDetector.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-BerryTreeRustlingSoundDetector::BerryTreeRustlingSoundDetector(
-    ConsoleHandle& console,
-    DetectedCallback detected_callback,
-    float threshold
-)
-    // Use a red as the detection color because the Levelball is made using red apricorns.
-    : AudioPerSpectrumDetectorBase("BerryTreeRustlingSoundDetector", "Berry tree rustling sound", COLOR_RED, console, detected_callback)
-    , m_threshold(threshold)
-{}
-
-
-float BerryTreeRustlingSoundDetector::get_score_threshold() const{
-    return m_threshold;
-}
-
-std::unique_ptr<SpectrogramMatcher> BerryTreeRustlingSoundDetector::build_spectrogram_matcher(size_t sample_rate){
-    return std::make_unique<SpectrogramMatcher>(
-        "Berry Rustle",
-        AudioTemplateCache::instance().get_throw("PokemonSwSh/BerryTreeRustlingSound", sample_rate),
-        SpectrogramMatcher::Mode::RAW, sample_rate,
-        2000,
-        1
-    );
-}
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSwSh/InferenceTraining/PokemonSwSh_GenerateIVCheckerOCR.cpp b/SerialPrograms/Source/PokemonSwSh/InferenceTraining/PokemonSwSh_GenerateIVCheckerOCR.cpp
deleted file mode 100644
index 6dab346eb1..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/InferenceTraining/PokemonSwSh_GenerateIVCheckerOCR.cpp
+++ /dev/null
@@ -1,99 +0,0 @@
-/*  Generate IV Checker OCR Data
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <QDir>
-#include "Common/Cpp/PrettyPrint.h"
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonSwSh_GenerateIVCheckerOCR.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-const std::string IVCheckerOptionOCR::TOKENS[]{
-    "No Good",
-    "Decent",
-    "Pretty Good",
-    "Very Good",
-    "Fantastic",
-    "Best",
-    "Hyper trained!",
-};
-
-
-
-GenerateIVCheckerOCR_Descriptor::GenerateIVCheckerOCR_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonSwSh:GenerateIVCheckerOCR",
-        STRING_POKEMON + " SwSh", "Generate IV Checker OCR Data",
-        "",
-        "Generate IV Checker OCR Data",
-        FeedbackType::REQUIRED,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-
-
-
-GenerateIVCheckerOCR::GenerateIVCheckerOCR()
-    : LANGUAGE(
-        "<b>Game Language:</b>",
-        IV_READER().languages(),
-        LockWhileRunning::LOCKED
-    )
-    , HP("<b>HP:</b>", IVCheckerValue::Best)
-    , ATTACK("<b>Attack:</b>", IVCheckerValue::Best)
-    , DEFENSE("<b>Defense:</b>", IVCheckerValue::Best)
-    , SPATK("<b>Sp. Atk:</b>", IVCheckerValue::Best)
-    , SPDEF("<b>Sp. Def:</b>", IVCheckerValue::Best)
-    , SPEED("<b>Speed:</b>", IVCheckerValue::Best)
-{
-    PA_ADD_OPTION(LANGUAGE);
-    PA_ADD_OPTION(HP);
-    PA_ADD_OPTION(ATTACK);
-    PA_ADD_OPTION(DEFENSE);
-    PA_ADD_OPTION(SPATK);
-    PA_ADD_OPTION(SPDEF);
-    PA_ADD_OPTION(SPEED);
-}
-
-
-void GenerateIVCheckerOCR::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    IVCheckerReaderScope reader(env.console, LANGUAGE);
-
-    std::string path = "IVCheckerOCR/";
-    path += language_data(LANGUAGE).code;
-
-    QDir dir(QString::fromStdString(path));
-    if (!dir.exists()){
-        dir.mkpath(".");
-    }
-    path += "/";
-
-    VideoSnapshot screen = env.console.video().snapshot();
-    std::vector<ImageViewRGB32> images = reader.dump_images(screen);
-
-    std::string now = now_to_filestring();
-
-    const EnumDatabase<IVCheckerValue>& database = IVCheckerValue_Database();
-    images[0].save(path + database.find(HP)->display + "-" + now + "a.png");
-    images[1].save(path + database.find(ATTACK)->display + "-" + now + "b.png");
-    images[2].save(path + database.find(DEFENSE)->display + "-" + now + "c.png");
-    images[3].save(path + database.find(SPATK)->display + "-" + now + "d.png");
-    images[4].save(path + database.find(SPDEF)->display + "-" + now + "e.png");
-    images[5].save(path + database.find(SPEED)->display + "-" + now + "f.png");
-
-}
-
-
-
-}
-}
-}
-
diff --git a/SerialPrograms/Source/PokemonSwSh/InferenceTraining/PokemonSwSh_GenerateIVCheckerOCR.h b/SerialPrograms/Source/PokemonSwSh/InferenceTraining/PokemonSwSh_GenerateIVCheckerOCR.h
deleted file mode 100644
index 9e8cab62df..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/InferenceTraining/PokemonSwSh_GenerateIVCheckerOCR.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*  Generate IV Checker OCR Data
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_GenerateIVCheckerOCR_H
-#define PokemonAutomation_PokemonSwSh_GenerateIVCheckerOCR_H
-
-#include "Common/Cpp/Options/EnumDropdownOption.h"
-#include "CommonFramework/Options/LanguageOCROption.h"
-#include "PokemonSwSh/Inference/PokemonSwSh_IVCheckerReader.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-class IVCheckerOptionOCR : public EnumDropdownOption<IVCheckerValue>{
-public:
-    static const std::string TOKENS[];
-
-public:
-    IVCheckerOptionOCR(std::string label, IVCheckerValue default_value)
-        : EnumDropdownOption<IVCheckerValue>(
-            std::move(label),
-            IVCheckerValue_Database(),
-            LockWhileRunning::LOCKED,
-            default_value
-        )
-    {}
-};
-
-
-
-class GenerateIVCheckerOCR_Descriptor : public SingleSwitchProgramDescriptor{
-public:
-    GenerateIVCheckerOCR_Descriptor();
-};
-
-
-
-class GenerateIVCheckerOCR : public SingleSwitchProgramInstance{
-public:
-    enum Mode{
-        READ_AND_SAVE,
-        GENERATE_TRAINING_DATA,
-    };
-
-public:
-    GenerateIVCheckerOCR();
-
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-    OCR::LanguageOCROption LANGUAGE;
-    IVCheckerOptionOCR HP;
-    IVCheckerOptionOCR ATTACK;
-    IVCheckerOptionOCR DEFENSE;
-    IVCheckerOptionOCR SPATK;
-    IVCheckerOptionOCR SPDEF;
-    IVCheckerOptionOCR SPEED;
-};
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI.cpp b/SerialPrograms/Source/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI.cpp
deleted file mode 100644
index 115f4677cb..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-/*  Max Lair AI
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/CRC32.h"
-#include "CommonFramework/Environment/Environment.h"
-#include "PokemonSwSh_MaxLair_AI.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-namespace MaxLairInternal{
-
-
-int random(int min, int max){
-//    uint64_t seed = x86_rdtsc();
-    uint64_t seed = std::chrono::high_resolution_clock::now().time_since_epoch().count();
-    seed = pabb_crc32(0, &seed, sizeof(seed));
-    seed %= (max - min + 1);
-    return (int)seed + min;
-}
-
-
-}
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_CatchScreenTracker.cpp b/SerialPrograms/Source/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_CatchScreenTracker.cpp
deleted file mode 100644
index b40cbd2c86..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_CatchScreenTracker.cpp
+++ /dev/null
@@ -1,160 +0,0 @@
-/*  Catch Screen Tracker
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/Exceptions/OperationFailedException.h"
-#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
-#include "CommonFramework/Tools/ErrorDumper.h"
-#include "CommonFramework/Tools/ProgramEnvironment.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_EndBattle.h"
-#include "PokemonSwSh_MaxLair_CatchScreenTracker.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-namespace MaxLairInternal{
-
-
-CaughtPokemonScreen::CaughtPokemonScreen(ProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context)
-    : m_env(env)
-    , m_console(console)
-    , m_context(context)
-    , m_total(count_catches(console, console.video().snapshot()))
-{
-    if (m_total == 0 || m_total > 4){
-        console.log("Detected " + std::to_string(m_total) + " catches. Something is wrong.", COLOR_RED);
-    }
-}
-
-size_t CaughtPokemonScreen::total() const{
-    return m_total;
-}
-const CaughtPokemon& CaughtPokemonScreen::operator[](size_t position) const{
-    return m_mons[position];
-}
-bool CaughtPokemonScreen::current_position() const{
-    return m_current_position;
-}
-bool CaughtPokemonScreen::is_summary() const{
-    return m_in_summary;
-}
-
-void CaughtPokemonScreen::enter_summary(){
-    SummaryShinySymbolDetector detector(m_console, m_console);
-    if (m_in_summary){
-        //  Make sure we're actually in the summary screen.
-        process_detection(detector.wait_for_detection(m_context, m_console));
-        return;
-    }
-
-    pbf_press_button(m_context, BUTTON_A, 10, 100);
-    pbf_press_dpad(m_context, DPAD_DOWN, 10, 50);
-    pbf_press_button(m_context, BUTTON_A, 10, 0);
-    m_context.wait_for_all_requests();
-
-    Detection detection = detector.wait_for_detection(m_context, m_console);
-    m_in_summary = true;
-    process_detection(detection);
-}
-void CaughtPokemonScreen::leave_summary(){
-    if (!m_in_summary){
-        return;
-    }
-
-    //  Make sure we're actually in the summary screen.
-    SummaryShinySymbolDetector detector(m_console, m_console);
-    process_detection(detector.wait_for_detection(m_context, m_console));
-
-    pbf_press_button(m_context, BUTTON_B, 10, TICKS_PER_SECOND);
-
-    PokemonCaughtMenuDetector caught_menu;
-
-    int result = wait_until(
-        m_console, m_context,
-        std::chrono::seconds(10),
-        {{caught_menu}}
-    );
-
-    switch (result){
-    case 0:
-        pbf_wait(m_context, 125);
-        m_context.wait_for_all_requests();
-        break;
-    default:
-        dump_image(m_console, m_env.program_info(), "CaughtMenu", m_console.video().snapshot());
-        throw OperationFailedException(
-            ErrorReport::SEND_ERROR_REPORT, m_console,
-            "Failed to detect caught menu.",
-            true
-        );
-    }
-
-    m_in_summary = false;
-}
-void CaughtPokemonScreen::scroll_down(){
-    pbf_press_dpad(m_context, DPAD_DOWN, 10, TICKS_PER_SECOND);
-    m_context.wait_for_all_requests();
-    m_current_position++;
-    if (m_current_position >= m_total){
-        m_current_position = 0;
-    }
-    if (m_in_summary){
-        SummaryShinySymbolDetector detector(m_console, m_console);
-        Detection detection = detector.wait_for_detection(m_context, m_console);
-        process_detection(detection);
-    }
-}
-void CaughtPokemonScreen::scroll_to(size_t position){
-    while (m_current_position != position){
-        scroll_down();
-    }
-}
-void CaughtPokemonScreen::process_detection(Detection detection){
-    CaughtPokemon& mon = m_mons[m_current_position];
-    switch (detection){
-    case SummaryShinySymbolDetector::Detection::NO_DETECTION:
-        throw OperationFailedException(
-            ErrorReport::SEND_ERROR_REPORT, m_console,
-            "Failed to detect summary screen.",
-            true
-        );
-    case SummaryShinySymbolDetector::Detection::NOT_SHINY:
-        if (!mon.read){
-            m_console.log("Not shiny.", COLOR_BLUE);
-            mon.shiny = false;
-            mon.read = true;
-        }else if (mon.shiny){
-            throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, m_console,
-                "Fatal Inconsistency: Expected to see a non-shiny.",
-                true
-            );
-        }
-        break;
-    case SummaryShinySymbolDetector::Detection::SHINY:
-        if (!mon.read){
-            m_console.log("Found shiny!", COLOR_BLUE);
-            mon.shiny = true;
-            mon.read = true;
-        }else if (!mon.shiny){
-            throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, m_console,
-                "Fatal Inconsistency: Expected to see a shiny.",
-                true
-            );
-        }
-        break;
-    }
-}
-
-
-
-}
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_CatchScreenTracker.h b/SerialPrograms/Source/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_CatchScreenTracker.h
deleted file mode 100644
index a30a33a41b..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_CatchScreenTracker.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*  Catch Screen Tracker
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_MaxLair_CatchScreenTracker_H
-#define PokemonAutomation_PokemonSwSh_MaxLair_CatchScreenTracker_H
-
-#include "CommonFramework/Tools/ConsoleHandle.h"
-#include "PokemonSwSh/Inference/PokemonSwSh_SummaryShinySymbolDetector.h"
-
-namespace PokemonAutomation{
-    class BotBaseContext;
-    class ProgramEnvironment;
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-namespace MaxLairInternal{
-
-
-struct CaughtPokemon{
-    bool read = false;
-    bool shiny = false;
-};
-
-class CaughtPokemonScreen{
-    using Detection = SummaryShinySymbolDetector::Detection;
-
-public:
-    CaughtPokemonScreen(ProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context);
-
-    size_t total() const;
-    const CaughtPokemon& operator[](size_t position) const;
-
-    bool current_position() const;
-    bool is_summary() const;
-
-    void enter_summary();
-    void leave_summary();
-    void scroll_down();
-    void scroll_to(size_t position);
-
-private:
-    void process_detection(Detection detection);
-
-private:
-    ProgramEnvironment& m_env;
-    ConsoleHandle& m_console;
-    BotBaseContext& m_context;
-    size_t m_total;
-    size_t m_current_position = 0;
-    bool m_in_summary = false;
-    CaughtPokemon m_mons[4];
-};
-
-
-
-}
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_State.cpp b/SerialPrograms/Source/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_State.cpp
deleted file mode 100644
index 7ef8c58355..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_State.cpp
+++ /dev/null
@@ -1,188 +0,0 @@
-/*  Max Lair State
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <map>
-#include "Common/Cpp/PrettyPrint.h"
-#include "Pokemon/Pokemon_Types.h"
-#include "PokemonSwSh_MaxLair_State.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-namespace MaxLairInternal{
-
-
-std::string PlayerState::dump() const{
-    std::string str;
-    str += console_id < 0 ? "NPC" : "Switch " + std::to_string(console_id);
-    str += " - mon:";
-    str += pokemon.empty() ? "?" : pokemon;
-    str += " - item:";
-    str += item.empty() ? "?" : item;
-    str += " - dmax-turns-left:";
-    str += std::to_string((int)dmax_turns_left);
-    str += " - can-dmax:";
-    str += can_dmax ? "yes" : "no";
-    str += " - HP:";
-    str += health.value.hp < 0 ? "?" : std::to_string(100*health.value.hp);
-    str += "% - dead:";
-    str += health.value.dead < 0 ? "?" : (health.value.dead ? "yes" : "no");
-    str += " - PP:{";
-    for (size_t c = 0; c < 4; c++){
-        str += std::to_string(pp[c]);
-        if (c + 1 < 4){
-            str += ", ";
-        }
-    }
-    str += "} - blocked:{";
-    for (size_t c = 0; c < 4; c++){
-        str += move_blocked[c] ? "1" : "0";
-        if (c + 1 < 4){
-            str += ", ";
-        }
-    }
-    str += "}";
-    return str;
-}
-void PlayerState::clear_battle_state(){
-    dmax_turns_left = -1;
-    for (size_t c = 0; c < 4 ; c++){
-        move_blocked[c] = false;
-    }
-}
-
-std::string PathMap::dump() const{
-    std::string str;
-    str += "    Path Type: " + std::to_string((int)path_type);
-    str += "\n";
-    {
-        str += "        Row 3: ";
-        bool first = true;
-        for (size_t c = 0; c < 4; c++){
-            if (!first){
-                str += ", ";
-            }
-            first = false;
-            str += get_type_slug(mon3[c]);
-        }
-        str += "\n";
-    }
-    {
-        str += "        Row 2: ";
-        bool first = true;
-        for (size_t c = 0; c < 4; c++){
-            if (!first){
-                str += ", ";
-            }
-            first = false;
-            str += get_type_slug(mon2[c]);
-        }
-        str += "\n";
-    }
-    {
-        str += "        Row 1: ";
-        bool first = true;
-        for (size_t c = 0; c < 2; c++){
-            if (!first){
-                str += ", ";
-            }
-            first = false;
-            str += get_type_slug(mon1[c]);
-        }
-        str += "\n";
-    }
-    return str;
-}
-
-std::string dump_path(const std::vector<PathNode>& path){
-    std::string str;
-    for (const auto& item : path){
-        str += "[";
-        str += std::to_string(item.path_slot);
-        str += ":";
-        str += get_type_slug(item.type);
-        str += "] ";
-    }
-    return str;
-}
-
-
-
-std::string GlobalState::dump() const{
-    std::string str;
-    str += "    boss:";
-    if (boss.empty()){
-        str += "? (" + get_type_slug(path.boss) + ")";
-    }else{
-        str += boss;
-    }
-    str += " - wins:" + std::to_string(wins);
-    str += " - lives:";
-    str += lives_left < 0 ? "?" : std::to_string(lives_left);
-    str += " - opponent:";
-    if (opponent.empty()){
-        str += "?";
-    }else if (opponent.size() == 1){
-        str += *opponent.begin();
-    }else{
-        str += set_to_str(opponent);
-    }
-    str += " - HP:";
-    str += opponent_hp < 0 ? "?" : std::to_string(100 * opponent_hp);
-    str += "% - slot:";
-    str += std::to_string(move_slot);
-    str += "\n";
-    str += "    Player 0: " + players[0].dump() + "\n";
-    str += "    Player 1: " + players[1].dump() + "\n";
-    str += "    Player 2: " + players[2].dump() + "\n";
-    str += "    Player 3: " + players[3].dump() + "\n";
-    str += path.dump();
-    switch (path_side){
-    case 0: str += "        current-side: left"; break;
-    case 1: str += "        current-side: right"; break;
-    default: str += "        current-side: ?"; break;
-    }
-    str += "\n";
-    str += "    Best Remaining Path: " + dump_path(last_best_path) + "\n";
-    str += "    Seen: " + set_to_str(seen) + "\n";
-    return str;
-}
-void GlobalState::clear_battle_state(){
-    opponent.clear();
-    opponent_hp = -1;
-    move_slot = 0;
-    players[0].clear_battle_state();
-    players[1].clear_battle_state();
-    players[2].clear_battle_state();
-    players[3].clear_battle_state();
-}
-void GlobalState::add_seen(const std::string& mon){
-    if (!mon.empty()){
-        seen.insert(mon);
-    }
-}
-size_t GlobalState::find_player_index(size_t console_id) const{
-    for (size_t c = 0; c < 4; c++){
-        if (players[c].console_id == (int8_t)console_id){
-            return c;
-        }
-    }
-    return console_id;
-}
-
-
-
-
-
-
-
-
-
-
-}
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_State.h b/SerialPrograms/Source/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_State.h
deleted file mode 100644
index 5d4e223e50..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_State.h
+++ /dev/null
@@ -1,184 +0,0 @@
-/*  Max Lair State
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_MaxLair_State_H
-#define PokemonAutomation_PokemonSwSh_MaxLair_State_H
-
-#include <string>
-#include <vector>
-#include <set>
-#include "Common/Cpp/Time.h"
-#include "Pokemon/Pokemon_Types.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-namespace MaxLairInternal{
-using namespace Pokemon;
-
-
-template <typename Type>
-struct TimestampedValue{
-    TimestampedValue(const TimestampedValue& x)
-        : timestamp(x.timestamp)
-        , value(x.value)
-    {}
-    void operator=(const TimestampedValue& x){
-        timestamp = x.timestamp;
-        value = x.value;
-    }
-
-    TimestampedValue()
-        : timestamp(WallClock::min())
-        , value()
-    {}
-    TimestampedValue(Type p_value)
-        : timestamp(current_time())
-        , value(std::move(p_value))
-    {}
-    TimestampedValue(Type p_value, WallClock timestamp)
-        : timestamp(timestamp)
-        , value(std::move(p_value))
-    {}
-    void operator=(Type x){
-        timestamp = current_time();
-        value = std::move(x);
-    }
-
-    operator Type() const{
-        return value;
-    }
-
-    WallClock timestamp;
-    Type value;
-};
-
-
-struct Health{
-    double hp = -1;     //  [0.0 - 1.0], -1 means unknown.
-    int8_t dead = -1;   //  1 = dead, 0 = alive, -1 = unknown.
-};
-
-
-struct PlayerState{
-    int8_t console_id = -1;             //  -1 means NPC
-    std::string pokemon;
-    std::string item;
-    int8_t dmax_turns_left = -1;        //  -1 means unknown
-    bool can_dmax = false;
-    TimestampedValue<Health> health;
-    int8_t pp[4] = {-1, -1, -1, -1};    //  -1 means unknown
-
-    //  Battle State
-    bool move_blocked[4] = {false, false, false, false};
-
-    void clear_battle_state();
-
-    std::string dump() const;
-};
-
-
-
-/*
-  Path 0
-     X
-   // \\
-  X X X X
-  \/ \\ /
-   O   O
-  /\\   \
-  X X X X
-   \//\/
-    X  X
-     \/
-     X
-
-  Path 1
-     X
-   // \\
-  X X X X
-  \ //\/
-   O   O
-  / \ / \
-  X X X X
-   \/\\/
-    X  X
-     \/
-     X
-
-  Path 2
-     X
-   // \\
-  X X X X
-  \/ \\ /
-   O   O
-  /  // \
-  X X X X
-   \/ \/
-    X  X
-     \/
-     X
-*/
-
-struct PathMap{
-    int8_t path_type = -1;
-    PokemonType boss = PokemonType::NONE;
-    PokemonType mon3[4] = {PokemonType::NONE, PokemonType::NONE, PokemonType::NONE, PokemonType::NONE};
-    PokemonType mon2[4] = {PokemonType::NONE, PokemonType::NONE, PokemonType::NONE, PokemonType::NONE};
-    PokemonType mon1[2] = {PokemonType::NONE, PokemonType::NONE};
-
-    std::string dump() const;
-};
-
-struct PathNode{
-    uint8_t path_slot;
-    PokemonType type;
-};
-std::string dump_path(const std::vector<PathNode>& path);
-
-
-struct GlobalState{
-    //  Timestamp when this state was issued.
-    WallClock timestamp = WallClock::min();
-
-    bool adventure_started = false;
-
-    std::string boss;
-
-    PathMap path;
-    int8_t path_side = -1;  //  -1 = unknown, 0 = left, 1 = right
-    std::vector<PathNode> last_best_path;
-
-    uint8_t wins = 0;
-    int8_t lives_left = -1; //  -1 means unknown
-
-    PlayerState players[4];
-
-    std::set<std::string> seen;
-    void add_seen(const std::string& mon);
-
-    //  Battle State
-    std::set<std::string> opponent;
-    TimestampedValue<double> opponent_hp = -1;
-    uint8_t move_slot = 0;
-
-    size_t find_player_index(size_t console_id) const;
-    void clear_battle_state();
-
-    std::string dump() const;
-};
-
-
-
-
-
-
-
-}
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_StateMachine.cpp b/SerialPrograms/Source/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_StateMachine.cpp
deleted file mode 100644
index 11b9453e61..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_StateMachine.cpp
+++ /dev/null
@@ -1,164 +0,0 @@
-/*  Max Lair State Machine
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/NintendoSwitch/NintendoSwitch_Protocol_PushButtons.h"
-#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
-#include "CommonFramework/Tools/ErrorDumper.h"
-#include "CommonFramework/Tools/InterruptableCommands.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
-#include "CommonFramework/Inference/FrozenImageDetector.h"
-#include "CommonFramework/Notifications/ProgramInfo.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonSwSh/Inference/Dens/PokemonSwSh_RaidCatchDetector.h"
-#include "PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
-#include "PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonSelectMenu.h"
-#include "PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathSelect.h"
-#include "PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_ItemSelectMenu.h"
-#include "PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_ProfessorSwap.h"
-#include "PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_BattleMenu.h"
-#include "PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonSwapMenu.h"
-#include "PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_EndBattle.h"
-#include "PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_Entrance.h"
-#include "PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_PokemonSelect.h"
-#include "PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_PathSelect.h"
-#include "PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_ItemSelect.h"
-#include "PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_ProfessorSwap.h"
-#include "PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_Battle.h"
-#include "PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_PokemonSwap.h"
-#include "PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_CaughtScreen.h"
-#include "PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_Entrance.h"
-#include "PokemonSwSh_MaxLair_StateMachine.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-namespace MaxLairInternal{
-
-
-StateMachineAction run_state_iteration(
-    AdventureRuntime& runtime, size_t console_index,
-    ProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context,
-    bool save_path,
-    GlobalStateTracker& global_state,
-    const EndBattleDecider& decider,
-    const ImageViewRGB32& entrance
-){
-    GlobalState state = global_state.infer_actual_state(console.index());
-//    uint8_t wins = state.wins;
-    bool starting = true;
-    for (size_t c = 0; c < 4; c++){
-        if (state.players[c].console_id == (int8_t)console_index){
-            starting = false;
-            break;
-        }
-    }
-
-    PokemonSelectMenuDetector pokemon_select(false);
-    PokemonSwapMenuDetector pokemon_swap(false);
-    PathSelectDetector path_select;
-    ItemSelectDetector item_menu(false);
-    ProfessorSwapDetector professor_swap(console, !starting);
-    BattleMenuDetector battle_menu;
-    RaidCatchDetector catch_select(console);
-    PokemonCaughtMenuDetector caught_menu;
-    EntranceDetector entrance_detector(entrance);
-    FrozenImageDetector frozen_screen(COLOR_CYAN, {0, 0, 1, 0.5}, std::chrono::seconds(30), 10);
-
-    int result = wait_until(
-        console, context,
-        std::chrono::seconds(300),
-        {
-            {starting
-                ? (VisualInferenceCallback&)pokemon_select
-                : (VisualInferenceCallback&)pokemon_swap
-            },
-            {path_select},
-            {item_menu},
-            {professor_swap},
-            {battle_menu},
-            {catch_select},
-            {caught_menu},
-            {entrance_detector},
-            {frozen_screen},
-        },
-        std::chrono::milliseconds(200)
-    );
-
-    switch (result){
-    case 0:
-        if (starting){
-            console.log("Current State: " + STRING_POKEMON + " Select");
-            run_select_pokemon(console, context, global_state, runtime.console_settings[console_index]);
-            return StateMachineAction::KEEP_GOING;
-        }else{
-            console.log("Current State: " + STRING_POKEMON + " Swap");
-            run_swap_pokemon(runtime, console, context, global_state, runtime.console_settings[console_index]);
-            return StateMachineAction::KEEP_GOING;
-        }
-    case 1:
-        console.log("Current State: Path Select");
-        run_path_select(env, console, context, global_state);
-        return StateMachineAction::KEEP_GOING;
-    case 2:
-        console.log("Current State: Item Select");
-        run_item_select(console, context, global_state);
-        return StateMachineAction::KEEP_GOING;
-    case 3:
-        console.log("Current State: Professor Swap");
-        run_professor_swap(runtime, console, context, global_state);
-        return StateMachineAction::KEEP_GOING;
-    case 4:
-        console.log("Current State: Move Select");
-        return run_move_select(
-            env, console, context, global_state,
-            runtime.console_settings[console_index],
-            battle_menu.dmaxed(),
-            battle_menu.cheer()
-        );
-    case 5:
-        console.log("Current State: Catch Select");
-        return throw_balls(
-            runtime,
-            env, console, context,
-            runtime.console_settings[console_index].language,
-            global_state,
-            decider
-        );
-    case 6:
-        console.log("Current State: Caught Menu");
-        return run_caught_screen(
-            runtime,
-            env, console, context,
-            global_state, decider,
-            entrance
-        );
-    case 7:
-        console.log("Current State: Entrance");
-        run_entrance(runtime, env, console, context, save_path, global_state);
-        return StateMachineAction::DONE_WITH_ADVENTURE;
-    case 8:
-        console.log("Current State: Frozen Screen", COLOR_RED);
-//        pbf_mash_button(context, BUTTON_B, TICKS_PER_SECOND);
-//        context.wait_for_all_requests();
-//        return StateMachineAction::KEEP_GOING;
-        return StateMachineAction::RESET_RECOVER;
-    default:
-        console.log("Program hang. No state detected after 5 minutes.", COLOR_RED);
-        dump_image(console, MODULE_NAME, "ProgramHang", console.video().snapshot());
-        global_state.mark_as_dead(console_index);
-        return StateMachineAction::RESET_RECOVER;
-    }
-
-
-}
-
-
-
-
-}
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_StateMachine.h b/SerialPrograms/Source/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_StateMachine.h
deleted file mode 100644
index 0193053d1b..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_StateMachine.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/*  Max Lair State Machine
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_MaxLair_StateMachine_H
-#define PokemonAutomation_PokemonSwSh_MaxLair_StateMachine_H
-
-#include "Common/Cpp/Concurrency/SpinLock.h"
-#include "CommonFramework/ImageTypes/ImageRGB32.h"
-#include "NintendoSwitch/NintendoSwitch_MultiSwitchProgram.h"
-#include "PokemonSwSh/Inference/PokemonSwSh_QuantityReader.h"
-#include "PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options.h"
-#include "PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options_Consoles.h"
-#include "PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options_Hosting.h"
-#include "PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_Stats.h"
-#include "PokemonSwSh_MaxLair_StateTracker.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-namespace MaxLairInternal{
-
-
-enum class ConsoleState{
-    CONSOLE_DEAD,
-    POKEMON_SELECT,
-    PATH_SELECT,
-    ITEM_SELECT,
-    MOVE_SELECT,
-    CATCH_SELECT,
-    POKEMON_SWAP,
-    CAUGHT_MENU,
-};
-
-
-
-enum class StateMachineAction{
-    KEEP_GOING,
-    DONE_WITH_ADVENTURE,
-    STOP_PROGRAM,
-    RESET_RECOVER,
-};
-
-
-struct ConsoleRuntime{
-    ReadableQuantity999 ore;
-    ReadableQuantity999 normal_balls;
-    ReadableQuantity999 boss_balls;
-};
-
-struct AdventureRuntime{
-    AdventureRuntime(
-        const size_t p_host_index,
-        const Consoles& p_console_settings,
-        const EndBattleDecider& p_actions,
-        const bool p_go_home_when_done,
-        HostingSettings& p_hosting_settings,
-        EventNotificationOption& p_notification_status,
-        EventNotificationOption& p_notification_shiny,
-        Stats& p_session_stats
-    )
-        : host_index(p_host_index)
-        , console_settings(p_console_settings)
-        , actions(p_actions)
-        , go_home_when_done(p_go_home_when_done)
-        , hosting_settings(p_hosting_settings)
-        , notification_status(p_notification_status)
-        , notification_shiny(p_notification_shiny)
-        , session_stats(p_session_stats)
-    {}
-
-    const size_t host_index;
-    const Consoles& console_settings;
-    const EndBattleDecider& actions;
-    const bool go_home_when_done;
-    HostingSettings& hosting_settings;
-    EventNotificationOption& notification_status;
-    EventNotificationOption& notification_shiny;
-    Stats& session_stats;
-
-    PathStats path_stats;
-    std::string last_boss;
-    ConsoleRuntime consoles[4];
-
-    //  State lock to protect fields of this class.
-    SpinLock m_lock;
-
-    //  A lock to allow timed-serialization of Switches.
-    //  For example: Don't let multiple Switches simultaneously choose to swap with Pokemon.
-    std::mutex m_delay_lock;
-};
-
-
-//  Return true if done.
-StateMachineAction run_state_iteration(
-    AdventureRuntime& runtime, size_t console_index,
-    ProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context,
-    bool save_path,
-    GlobalStateTracker& state_tracker,
-    const EndBattleDecider& boss_action,
-    const ImageViewRGB32& entrance
-);
-
-
-
-}
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_BattleMenu.cpp b/SerialPrograms/Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_BattleMenu.cpp
deleted file mode 100644
index 1beea0a354..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_BattleMenu.cpp
+++ /dev/null
@@ -1,495 +0,0 @@
-/*  Max Lair Detect Battle Menu
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <cmath>
-#include "Common/Cpp/PrettyPrint.h"
-#include "Common/Cpp/CancellableScope.h"
-#include "CommonFramework/ImageTools/SolidColorTest.h"
-#include "CommonFramework/ImageTools/ColorClustering.h"
-#include "CommonFramework/Notifications/ProgramInfo.h"
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "CommonFramework/Tools/ErrorDumper.h"
-#include "Pokemon/Inference/Pokemon_ReadHpBar.h"
-#include "PokemonSwSh/Resources/PokemonSwSh_MaxLairDatabase.h"
-#include "PokemonSwSh/Inference/PokemonSwSh_TypeSymbolFinder.h"
-#include "PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options.h"
-#include "PokemonSwSh_MaxLair_Detect_PokemonReader.h"
-#include "PokemonSwSh_MaxLair_Detect_HPPP.h"
-#include "PokemonSwSh_MaxLair_Detect_BattleMenu.h"
-
-#include <iostream>
-using std::cout;
-using std::endl;
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-namespace MaxLairInternal{
-
-
-BattleMenuDetector::BattleMenuDetector()
-    : VisualInferenceCallback("BattleMenuDetector")
-    , m_icon_fight  (0.923, 0.576 + 1 * 0.1075, 0.05, 0.080)
-    , m_icon_pokemon(0.923, 0.576 + 2 * 0.1075, 0.05, 0.080)
-    , m_icon_run    (0.923, 0.576 + 3 * 0.1075, 0.05, 0.080)
-    , m_text_fight  (0.830, 0.576 + 1 * 0.1075, 0.08, 0.080)
-    , m_text_pokemon(0.830, 0.576 + 2 * 0.1075, 0.08, 0.080)
-    , m_text_run    (0.830, 0.576 + 3 * 0.1075, 0.08, 0.080)
-    , m_icon_cheer  (0.923, 0.636 + 1 * 0.1075, 0.05, 0.020)
-//    , m_info_left   (0.907, 0.500, 0.02, 0.03)
-//    , m_info_right  (0.970, 0.500, 0.02, 0.03)
-    , m_status0     (0.280, 0.870, 0.015, 0.030)
-    , m_status1     (0.165, 0.945, 0.100, 0.015)
-{}
-void BattleMenuDetector::make_overlays(VideoOverlaySet& items) const{
-    items.add(COLOR_YELLOW, m_icon_fight);
-    items.add(COLOR_YELLOW, m_icon_pokemon);
-    items.add(COLOR_YELLOW, m_icon_run);
-    items.add(COLOR_YELLOW, m_text_fight);
-    items.add(COLOR_YELLOW, m_text_pokemon);
-    items.add(COLOR_YELLOW, m_text_run);
-    items.add(COLOR_YELLOW, m_icon_cheer);
-    items.add(COLOR_YELLOW, m_status0);
-    items.add(COLOR_YELLOW, m_status1);
-}
-bool BattleMenuDetector::process_frame(const ImageViewRGB32& frame, WallClock timestamp){
-    //  Need 5 consecutive successful detections.
-    if (!detect(frame)){
-        m_trigger_count = 0;
-        return false;
-    }
-    m_trigger_count++;
-    return m_trigger_count >= 5;
-}
-
-
-bool BattleMenuDetector::detect(const ImageViewRGB32& screen){
-    bool fight;
-
-    fight = false;
-    fight |= !fight && cluster_fit_2(
-        extract_box_reference(screen, m_text_fight),
-        Color(0, 0, 0), 0.9,
-        Color(255, 255, 255), 0.1
-    );
-    fight |= !fight && cluster_fit_2(
-        extract_box_reference(screen, m_text_fight),
-        Color(0, 0, 0), 0.1,
-        Color(255, 255, 255), 0.9
-    );
-    if (!fight){
-//        cout << "Fight out" << endl;
-        return false;
-    }
-
-    fight = false;
-    fight |= !fight && cluster_fit_2(
-        extract_box_reference(screen, m_text_pokemon),
-        Color(0, 0, 0), 0.1,
-        Color(255, 255, 255), 0.9
-    );
-    fight |= !fight && cluster_fit_2(
-        extract_box_reference(screen, m_text_pokemon),
-        Color(0, 0, 0), 0.9,
-        Color(255, 255, 255), 0.1
-    );
-    if (!fight){
-//        cout << "Pokemon out" << endl;
-        return false;
-    }
-
-    fight = false;
-    fight |= !fight && cluster_fit_2(
-        extract_box_reference(screen, m_text_run),
-        Color(0, 0, 0), 0.1,
-        Color(255, 255, 255), 0.9
-    );
-    fight |= !fight && cluster_fit_2(
-        extract_box_reference(screen, m_text_run),
-        Color(0, 0, 0), 0.9,
-        Color(255, 255, 255), 0.1
-    );
-    if (!fight){
-//        cout << "Run out" << endl;
-        return false;
-    }
-
-
-    fight = false;
-    fight |= !fight && cluster_fit_2(
-        extract_box_reference(screen, m_icon_fight),
-        Color(255, 255, 255), 1.7,
-        Color(153, 75, 112), 1.0
-    );
-    fight |= !fight && cluster_fit_2(
-        extract_box_reference(screen, m_icon_fight),
-        Color(0, 0, 0), 1.4,
-        Color(185, 6, 40), 1.0
-    );
-    fight |= !fight && cluster_fit_2(   //  Max raid Fight button is a bit different.
-        extract_box_reference(screen, m_icon_fight),
-        Color(0, 0, 0), 1.7,
-        Color(182, 33, 82), 1.0
-    );
-//    cout << "===============" << endl;
-    if (!fight){
-        fight = cluster_fit_2(   //  Cheer
-            extract_box_reference(screen, m_icon_cheer),
-            Color(0, 0, 0), 1.0,
-            Color(9, 162, 218), 1.0
-        );
-//        cout << "fight = " << fight << endl;
-        m_cheer = fight;
-    }
-    if (!fight){
-//        cout << "Failed: m_icon_fight" << endl;
-        return false;
-    }
-
-    bool pokemon = false;
-    pokemon |= !pokemon && cluster_fit_2(
-        extract_box_reference(screen, m_icon_pokemon),
-        Color(255, 255, 255), 3.1,
-        Color(126, 224, 142), 1.0
-    );
-    pokemon |= !pokemon && cluster_fit_2(
-        extract_box_reference(screen, m_icon_pokemon),
-        Color(0, 0, 0), 2.7,
-        Color(8, 158, 18), 1.0
-    );
-    if (!pokemon){
-//        cout << "Failed: m_icon_pokemon" << endl;
-        return false;
-    }
-
-    bool run = false;
-    run |= !run && cluster_fit_2(
-        extract_box_reference(screen, m_icon_run),
-        Color(255, 255, 255), 2.3,
-        Color(216, 150, 230), 1.0
-    );
-    run |= !run && cluster_fit_2(
-        extract_box_reference(screen, m_icon_run),
-        Color(0, 0, 0), 1.9,
-        Color(179, 15, 195), 1.0
-    );
-    if (!run){
-//        cout << "Failed: m_icon_run" << endl;
-        return false;
-    }
-
-
-    //  Check for white status bar in bottom left corner.
-    ImageStats status = image_stats(extract_box_reference(screen, m_status0));
-    ImageStats health = image_stats(extract_box_reference(screen, m_status1));
-//    extract_box_reference(screen, m_status1).save("test.png");
-//    cout << status.average << ", " << status.stddev << endl;
-//    cout << health.average << ", " << health.stddev << endl;
-    if (is_white(status, 500, 20) && is_white(health)){
-        m_dmaxed = false;
-        return true;
-    }
-
-    //  Check the semi-transparent red status bar if you're dmaxed.
-    if (is_solid(status, {0.618001, 0.145809, 0.23619}, 0.15, 40) &&
-        is_solid(health, {0.615249, 0.102789, 0.281963}, 0.15, 40)
-    ){
-        m_dmaxed = true;
-        return true;
-    }
-
-
-//    image.save("battle-menu.png");
-    return false;
-}
-
-
-
-
-BattleMenuReader::BattleMenuReader(VideoOverlay& overlay, Language language)
-    : m_language(language)
-    , m_opponent_name(overlay, {0.3, 0.010, 0.4, 0.10}, COLOR_BLUE)
-    , m_summary_opponent_name(overlay, {0.200, 0.100, 0.300, 0.065}, COLOR_BLUE)
-    , m_summary_opponent_types(overlay, {0.200, 0.170, 0.300, 0.050}, COLOR_BLUE)
-    , m_own_name(overlay, {0.060, 0.860, 0.160, 0.045}, COLOR_BLUE)
-    , m_own_sprite(overlay, {0.002, 0.860, 0.060, 0.100}, COLOR_BLUE)
-    , m_opponent_hp(overlay, {0.360, 0.120, 0.280, 0.005}, COLOR_BLUE)
-    , m_own_hp(overlay, {0.069, 0.914, 0.204, 0.006}, COLOR_BLUE)
-    , m_hp0(overlay, {0.073, 0.096 + 0*0.096, 0.052, 0.005}, COLOR_BLUE)
-    , m_hp1(overlay, {0.073, 0.096 + 1*0.096, 0.052, 0.005}, COLOR_BLUE)
-    , m_hp2(overlay, {0.073, 0.096 + 2*0.096, 0.052, 0.005}, COLOR_BLUE)
-    , m_sprite0(overlay, {0.010, 0.040 + 0*0.096, 0.052, 0.061}, COLOR_BLUE)
-    , m_sprite1(overlay, {0.010, 0.040 + 1*0.096, 0.052, 0.061}, COLOR_BLUE)
-    , m_sprite2(overlay, {0.010, 0.040 + 2*0.096, 0.052, 0.061}, COLOR_BLUE)
-    , m_pp0(overlay, {0.902, 0.710 - 1*0.097, 0.070, 0.063}, COLOR_BLUE)
-    , m_pp1(overlay, {0.902, 0.710 + 0*0.097, 0.070, 0.063}, COLOR_BLUE)
-    , m_pp2(overlay, {0.902, 0.710 + 1*0.097, 0.070, 0.063}, COLOR_BLUE)
-    , m_pp3(overlay, {0.902, 0.710 + 2*0.097, 0.070, 0.063}, COLOR_BLUE)
-    , m_dmax(overlay, {0.541, 0.779, 0.105, 0.186}, COLOR_BLUE)
-{}
-
-std::set<std::string> BattleMenuReader::read_opponent(
-    Logger& logger, CancellableScope& scope,
-    VideoFeed& feed
-) const{
-    std::set<std::string> result;
-    VideoSnapshot screen;
-    for (size_t c = 0; c < 3; c++){
-        screen = feed.snapshot();
-        ImageViewRGB32 image = extract_box_reference(screen, m_opponent_name);
-        result = read_pokemon_name(logger, m_language, image);
-        if (!result.empty()){
-            return result;
-        }
-        logger.log("Failed to read opponent name. Retrying in 1 second...", COLOR_ORANGE);
-        scope.wait_for(std::chrono::seconds(1));
-    }
-    dump_image(logger, MODULE_NAME, "MaxLair-read_opponent", screen);
-    return result;
-}
-std::set<std::string> BattleMenuReader::read_opponent_in_summary(Logger& logger, const ImageViewRGB32& screen) const{
-    ImageViewRGB32 name = extract_box_reference(screen, m_summary_opponent_name);
-    std::set<std::string> slugs = read_pokemon_name(logger, m_language, name);
-
-    ImageViewRGB32 types = extract_box_reference(screen, m_summary_opponent_types);
-    std::multimap<double, std::pair<PokemonType, ImagePixelBox>> candidates = find_symbols(types, 0.2);
-//    for (const auto& item : candidates){
-//        cout << get_type_slug(item.second.first) << ": " << item.first << endl;
-//    }
-
-    PokemonType type0 = PokemonType::NONE;
-    PokemonType type1 = PokemonType::NONE;
-    {
-        auto iter = candidates.begin();
-        if (iter != candidates.end()){
-            type0 = iter->second.first;
-            iter++;
-        }
-        if (iter != candidates.end()){
-            type1 = iter->second.first;
-            iter++;
-        }
-    }
-
-    for (auto iter = slugs.begin(); iter != slugs.end();){
-        const MaxLairMon& mon = get_maxlair_mon(*iter);
-        if ((type0 == mon.type[0] && type1 == mon.type[1]) || (type0 == mon.type[1] && type1 == mon.type[0])){
-            ++iter;
-        }else{
-            iter = slugs.erase(iter);
-        }
-    }
-
-    if (slugs.size() == 1){
-        logger.log("Disambiguation succeeded: " + *slugs.begin(), COLOR_BLUE);
-        return slugs;
-    }
-
-    if (slugs.empty()){
-        logger.log("Disambiguation failed. No results.", COLOR_RED);
-    }else{
-        logger.log("Disambiguation failed. Still have multiple results: " + set_to_str(slugs), COLOR_RED);
-    }
-
-    static std::set<std::string> KNOWN_BAD_SLUGS{
-        "basculin-blue-striped",
-        "basculin-red-striped",
-        "lycanroc-midday",
-        "lycanroc-midnight",
-    };
-    bool error = true;
-    for (const std::string& slug : slugs){
-        auto iter = KNOWN_BAD_SLUGS.find(slug);
-        if (iter != KNOWN_BAD_SLUGS.end()){
-            error = false;
-            logger.log("Known case that cannot be disambiguated. Skipping error report.", COLOR_RED);
-            break;
-        }
-    }
-    if (error){
-        dump_image(logger, MODULE_NAME, "DisambiguateBoss", screen);
-    }
-
-    return slugs;
-}
-std::string BattleMenuReader::read_own_mon(Logger& logger, const ImageViewRGB32& screen) const{
-    return read_pokemon_name_sprite(
-        logger,
-        screen,
-        m_own_sprite,
-        m_own_name, m_language,
-        false
-    );
-}
-
-double BattleMenuReader::read_opponent_hp(Logger& logger, const ImageViewRGB32& screen) const{
-    ImageViewRGB32 image = extract_box_reference(screen, m_opponent_hp);
-//    image.save("test.png");
-
-//    ImageStats stats = image_stats(image);
-//    cout << stats.average << " - " << stats.stddev << endl;
-
-#if 0
-    double hp = read_hp_bar(image);
-    logger.log("Opponent HP: " + (hp < 0 ? "?" : std::to_string(100 * hp)) + "%");
-    if (hp < 0){
-        dump_image(logger, screen, "BattleMenuReader-read_opponent_hp");
-    }
-    return hp;
-#endif
-    return read_hp_bar(logger, image);
-}
-double BattleMenuReader::read_own_hp(Logger& logger, const ImageViewRGB32& screen) const{
-    ImageViewRGB32 image = extract_box_reference(screen, m_own_hp);
-//    image.save("test.png");
-#if 0
-    double hp = read_hp_bar(image);
-    logger.log("Your HP: " + (hp < 0 ? "?" : std::to_string(100 * hp)) + "%");
-    if (hp == 0){
-        hp = 0.001;
-    }
-    if (hp < 0){
-        dump_image(logger, screen, "BattleMenuReader-read_own_hp");
-    }
-#endif
-    return read_hp_bar(logger, image);
-}
-void BattleMenuReader::read_hp(Logger& logger, const ImageViewRGB32& screen, Health health[4], size_t player_index){
-    Health tmp_hp[4];
-    tmp_hp[0] = {read_own_hp(logger, screen), false};
-    tmp_hp[1] = read_in_battle_hp_box(logger, extract_box_reference(screen, m_sprite0), extract_box_reference(screen, m_hp0));
-    tmp_hp[2] = read_in_battle_hp_box(logger, extract_box_reference(screen, m_sprite1), extract_box_reference(screen, m_hp1));
-    tmp_hp[3] = read_in_battle_hp_box(logger, extract_box_reference(screen, m_sprite2), extract_box_reference(screen, m_hp2));
-    bool bad = false;
-    for (size_t c = 0; c < 4; c++){
-        bad |= tmp_hp[c].hp < 0;
-        health[(c + player_index) % 4] = tmp_hp[c];
-    }
-
-    if (bad){
-        dump_image(logger, MODULE_NAME, "BattlePartyReader-ReadHP", screen);
-    }
-}
-void BattleMenuReader::read_own_pp(Logger& logger, const ImageViewRGB32& screen, int8_t pp[4]) const{
-    pp[0] = read_pp_text(logger, extract_box_reference(screen, m_pp0));
-    pp[1] = read_pp_text(logger, extract_box_reference(screen, m_pp1));
-    pp[2] = read_pp_text(logger, extract_box_reference(screen, m_pp2));
-    pp[3] = read_pp_text(logger, extract_box_reference(screen, m_pp3));
-    if (pp[0] < 0 && pp[1] < 0 && pp[2] < 0 && pp[3] < 0){
-        dump_image(logger, MODULE_NAME, "BattleMenuReader-read_own_pp", screen);
-        return;
-    }
-#if 0
-    bool ok = pp[0] > 0 || pp[1] > 0 || pp[2] > 0 || pp[3] > 0;
-    if (ok){
-        for (size_t c = 0; c < 4; c++){
-            pp[c] = std::max(pp[c], (int8_t)0);
-        }
-    }
-#endif
-}
-
-
-bool dmax_circle_ready(const ImageViewRGB32& image){
-    size_t w = image.width();
-    size_t h = image.height();
-    if (w * h <= 1){
-        return false;
-    }
-
-    w = 200;
-    h = 200;
-    ImageRGB32 processed = image.scale_to(w, h);
-    if (image_stats(processed).stddev.sum() < 75){
-        return false;
-    }
-//    cout << image_stats(processed).stddev.sum() << endl;
-
-
-    size_t total = 0;
-    FloatPixel sum;
-    FloatPixel sqr_sum;
-    for (size_t r = 0; r < h; r++){
-        for (size_t c = 0; c < w; c++){
-            int dy = (int)r - 100;
-            int dx = (int)c - 100;
-            if (dy < -60){
-//                processed.setPixelColor(c, r, COLOR_BLUE);
-                continue;
-            }
-            if (-25 < dy && dy < 55){
-//                processed.setPixelColor(c, r, COLOR_BLUE);
-                continue;
-            }
-            if (dx*dx + dy*dy < 72*72){
-//                processed.setPixelColor(c, r, COLOR_BLUE);
-                continue;
-            }
-            if (dx*dx + dy*dy > 80*80){
-//                processed.setPixelColor(c, r, COLOR_BLUE);
-                continue;
-            }
-            FloatPixel p(processed.pixel(c, r));
-            total++;
-            sum += p;
-            sqr_sum += p * p;
-        }
-    }
-//    processed.save("test.png");
-
-//    size_t total = (size_t)w * (size_t)h;
-    double totalf = (double)total;
-    FloatPixel variance = (sqr_sum - sum*sum / totalf) / (totalf - 1);
-    ImageStats stats{
-        sum / totalf,
-        FloatPixel(
-            std::sqrt(variance.r),
-            std::sqrt(variance.g),
-            std::sqrt(variance.b)
-        ),
-        total
-    };
-//    cout << stats.average << stats.stddev << endl;
-
-    if (stats.average.r < 128){
-        return false;
-    }
-    return is_solid(stats, {0.684591, 0.000481775, 0.314928}, 0.15, 50);
-
-//    ImageStats stats = image_stats(processed);
-}
-bool BattleMenuReader::can_dmax(const ImageViewRGB32& screen) const{
-    return dmax_circle_ready(extract_box_reference(screen, m_dmax));
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-}
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_EndBattle.h b/SerialPrograms/Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_EndBattle.h
deleted file mode 100644
index bd90d24fe9..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_EndBattle.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*  Max Lair Detect End Battle
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_MaxLair_Detect_EndBattle_H
-#define PokemonAutomation_PokemonSwSh_MaxLair_Detect_EndBattle_H
-
-#include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "CommonFramework/InferenceInfra/VisualInferenceCallback.h"
-
-namespace PokemonAutomation{
-    class VideoOverlay;
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-namespace MaxLairInternal{
-
-
-class PokemonCaughtMenuDetector : public VisualInferenceCallback{
-public:
-    PokemonCaughtMenuDetector();
-
-    bool detect(const ImageViewRGB32& screen);
-
-    virtual void make_overlays(VideoOverlaySet& items) const override;
-    virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override final;
-
-
-private:
-    ImageFloatBox m_top_white;
-    ImageFloatBox m_caught_left;
-    ImageFloatBox m_caught_right;
-    ImageFloatBox m_middle_pink;
-    ImageFloatBox m_bottom_white;
-    ImageFloatBox m_bottom_black;
-    ImageFloatBox m_bottom_options;
-
-};
-
-
-
-
-size_t count_catches(VideoOverlay& overlay, const ImageViewRGB32& screen);
-
-
-
-
-}
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_HPPP.h b/SerialPrograms/Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_HPPP.h
deleted file mode 100644
index 0c877c40ec..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_HPPP.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*  Max Lair Detect HP and PP
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_MaxLair_Detect_HPPP_H
-#define PokemonAutomation_PokemonSwSh_MaxLair_Detect_HPPP_H
-
-#include <stdint.h>
-#include "Common/Cpp/AbstractLogger.h"
-#include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_State.h"
-
-namespace PokemonAutomation{
-    class Logger;
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-namespace MaxLairInternal{
-
-
-//double read_hp_bar(Logger& logger, const ImageViewRGB32& image);
-Health read_in_battle_hp_box(Logger& logger, const ImageViewRGB32& sprite, const ImageViewRGB32& hp_bar);
-int8_t read_pp_text(Logger& logger, const ImageViewRGB32& image);
-
-
-}
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathMap.cpp b/SerialPrograms/Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathMap.cpp
deleted file mode 100644
index 41ea4011a0..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathMap.cpp
+++ /dev/null
@@ -1,173 +0,0 @@
-/*  Max Lair Detect Path Map
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "CommonFramework/Tools/ErrorDumper.h"
-#include "CommonFramework/Tools/ProgramEnvironment.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "PokemonSwSh/Inference/PokemonSwSh_TypeSymbolFinder.h"
-#include "PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options.h"
-#include "PokemonSwSh_MaxLair_Detect_PathMap.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-namespace MaxLairInternal{
-
-
-bool read_type_array(
-    ConsoleHandle& console,
-    const ImageViewRGB32& screen,
-    const ImageFloatBox& box,
-    std::deque<OverlayBoxScope>& hits,
-    size_t count,
-    PokemonType* type, ImagePixelBox* boxes
-){
-    ImageViewRGB32 image = extract_box_reference(screen, box);
-    for (size_t c = 0; c < count; c++){
-        type[c] = PokemonType::NONE;
-    }
-
-    std::multimap<double, std::pair<PokemonType, ImagePixelBox>> candidates = find_symbols(image, 0.20);
-    if (candidates.size() < count){
-//        dump_image(console, screen, "ReadPath");
-        return false;
-    }
-
-    std::multimap<size_t, const std::pair<PokemonType, ImagePixelBox>*> sorted;
-//    std::deque<InferenceBoxScope> hits;
-    hits.clear();
-    size_t c = 0;
-    for (const auto& item : candidates){
-        hits.emplace_back(console.overlay(), translate_to_parent(screen, box, item.second.second), COLOR_GREEN);
-        sorted.emplace(item.second.second.min_x, &item.second);
-        c++;
-        if (c >= count){
-            break;
-        }
-    }
-
-    c = 0;
-    for (const auto& item : sorted){
-        type[c] = item.second->first;
-        if (boxes != nullptr){
-            boxes[c] = item.second->second;
-        }
-        c++;
-    }
-
-    return true;
-}
-
-std::shared_ptr<const ImageRGB32> read_type_array_retry(
-    ConsoleHandle& console, CancellableScope& scope,
-    const ImageFloatBox& box,
-    std::deque<OverlayBoxScope>& hits,
-    size_t count,
-    PokemonType* type, ImagePixelBox* boxes,
-    size_t max_attempts = 3
-){
-    VideoSnapshot screen;
-    for (size_t c = 0; c < max_attempts; c++){
-        screen = console.video().snapshot();
-        if (read_type_array(console, screen, box, hits, count, type, boxes)){
-            return nullptr;
-        }
-        scope.wait_for(std::chrono::milliseconds(200));
-    }
-    return std::move(screen.frame);
-}
-
-
-bool read_path(
-    ProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context,
-    PathMap& path,
-    const ImageFloatBox& box
-){
-    context.wait_for_all_requests();
-
-    std::deque<OverlayBoxScope> hits;
-
-    std::shared_ptr<const ImageRGB32> error_image;
-    error_image = read_type_array_retry(console, context, box, hits, 2, path.mon1, nullptr);
-    if (error_image){
-        dump_image(console, env.program_info(), "ReadPath", *error_image);
-        return false;
-    }
-
-    pbf_move_right_joystick(context, 128, 0, 70, 50);
-    context.wait_for_all_requests();
-    ImagePixelBox boxes[4];
-    error_image = read_type_array_retry(console, context, box, hits, 4, path.mon2, boxes);
-    if (error_image){
-        dump_image(console, env.program_info(), "ReadPath", *error_image);
-        return false;
-    }
-
-    while (true){
-        pbf_move_right_joystick(context, 128, 0, 80, 50);
-        context.wait_for_all_requests();
-
-        error_image = read_type_array_retry(console, context, box, hits, 4, path.mon3, nullptr);
-        if (!error_image){
-            break;
-        }
-        pbf_move_right_joystick(context, 128, 0, 20, 50);
-        context.wait_for_all_requests();
-        error_image = read_type_array_retry(console, context, box, hits, 4, path.mon3, nullptr);
-        if (!error_image){
-            break;
-        }
-
-        dump_image(console, env.program_info(), "ReadPath", *error_image);
-        return false;
-    }
-
-    pbf_move_right_joystick(context, 128, 0, 125, 50);
-    context.wait_for_all_requests();
-
-    error_image = read_type_array_retry(console, context, box, hits, 1, &path.boss, nullptr);
-    if (error_image){
-        dump_image(console, env.program_info(), "ReadPath", *error_image);
-        return false;
-    }
-
-
-
-    if (boxes[0].min_y < boxes[2].min_y &&
-        boxes[2].min_y < boxes[1].min_y &&
-        boxes[1].min_y < boxes[3].min_y
-    ){
-        path.path_type = 2;
-        return true;
-    }
-    if (
-        boxes[3].min_y > boxes[0].min_y &&
-        boxes[0].min_y > boxes[1].min_y &&
-        boxes[0].min_y > boxes[2].min_y
-    ){
-        path.path_type = 1;
-        return true;
-    }
-    if (
-        boxes[2].min_y < boxes[0].min_y &&
-        boxes[0].min_y < boxes[1].min_y &&
-        boxes[1].min_y < boxes[3].min_y
-    ){
-        path.path_type = 0;
-        return true;
-    }
-
-    return false;
-}
-
-
-
-}
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathMap.h b/SerialPrograms/Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathMap.h
deleted file mode 100644
index 6db5a3209e..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathMap.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*  Max Lair Detect Path Map
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_MaxLair_Detect_PathMap_H
-#define PokemonAutomation_PokemonSwSh_MaxLair_Detect_PathMap_H
-
-#include <deque>
-#include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
-#include "CommonFramework/Tools/ConsoleHandle.h"
-#include "Pokemon/Pokemon_Types.h"
-#include "PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_State.h"
-
-namespace PokemonAutomation{
-    class BotBaseContext;
-    class ProgramEnvironment;
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-namespace MaxLairInternal{
-using namespace Pokemon;
-
-
-bool read_type_array(
-    ConsoleHandle& console,
-    const ImageViewRGB32& screen,
-    const ImageFloatBox& box,
-    std::deque<OverlayBoxScope>& hits,
-    size_t count,
-    PokemonType* type, ImagePixelBox* boxes
-);
-
-
-bool read_path(
-    ProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context,
-    PathMap& path,
-    const ImageFloatBox& box
-);
-
-
-}
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonReader.h b/SerialPrograms/Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonReader.h
deleted file mode 100644
index beb32bda9e..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonReader.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*  Max Lair Pokemon Reader
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_MaxLair_Detect_PokemonReader_H
-#define PokemonAutomation_PokemonSwSh_MaxLair_Detect_PokemonReader_H
-
-#include "CommonFramework/Language.h"
-#include "CommonFramework/Logging/Logger.h"
-#include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "CommonFramework/Tools/ConsoleHandle.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-namespace MaxLairInternal{
-
-
-std::string read_boss_sprite(ConsoleHandle& console);
-
-
-//  OCR the Pokemon name and return all possible candidates.
-std::set<std::string> read_pokemon_name(
-    Logger& logger, Language language,
-    const ImageViewRGB32& image
-);
-
-
-//  Read a Pokemon sprite. The sprite may be partially obstructed
-//  on the right side by an item.
-std::string read_pokemon_sprite_with_item(
-    Logger& logger,
-    const ImageViewRGB32& screen, const ImageFloatBox& box
-);
-
-
-
-//  Use both OCR and sprite to read the Pokemon. It will try to
-//  arbitrate conflicts.
-std::string read_pokemon_name_sprite(
-    Logger& logger,
-    const ImageViewRGB32& screen,
-    const ImageFloatBox& sprite_box,
-    const ImageFloatBox& name_box, Language language,
-    bool allow_exact_match_fallback
-);
-
-
-
-}
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options.cpp b/SerialPrograms/Source/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options.cpp
deleted file mode 100644
index 97ed5180df..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options.cpp
+++ /dev/null
@@ -1,63 +0,0 @@
-/*  Max Lair Options
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "PokemonSwSh_MaxLair_Options.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-namespace MaxLairInternal{
-
-
-
-const std::string MODULE_NAME = "Max Lair";
-const std::chrono::milliseconds INFERENCE_RATE = std::chrono::milliseconds(200);
-
-
-
-
-HostingSwitch::HostingSwitch()
-    : IntegerEnumDropdownOption(
-        "<b>Host Switch:</b><br>This is the Switch that hosts the raid.",
-        {
-            {0, "switch0", "Switch 0 (Top Left)"},
-            {1, "switch1", "Switch 1 (Top Right)"},
-            {2, "switch2", "Switch 2 (Bottom Left)"},
-            {3, "switch3", "Switch 3 (Bottom Right)"},
-        },
-        LockWhileRunning::LOCKED,
-        0
-    )
-{}
-std::string HostingSwitch::check_validity(size_t consoles) const{
-    if (current_value() >= consoles){
-        return "Host Switch cannot be larger than " + std::to_string(consoles - 1) +
-        " since you only have " + std::to_string(consoles) + " Switch(es) enabled.";
-    }
-    return std::string();
-}
-
-BossSlotOption::BossSlotOption()
-    : IntegerEnumDropdownOption(
-        "<b>Boss Slot:</b>",
-        {
-            {0, "anything", "Anything is fine"},
-            {1, "slot1", "Slot 1"},
-            {2, "slot2", "Slot 2"},
-            {3, "slot3", "Slot 3"},
-        },
-        LockWhileRunning::LOCKED,
-        0
-    )
-{}
-
-
-
-
-}
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options.h b/SerialPrograms/Source/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options.h
deleted file mode 100644
index 3c912f7ebd..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/*  Max Lair Options
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_MaxLair_Options_H
-#define PokemonAutomation_PokemonSwSh_MaxLair_Options_H
-
-#include <chrono>
-#include "Common/Compiler.h"
-#include "Common/Cpp/Options/EnumDropdownOption.h"
-#include "PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_Stats.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-namespace MaxLairInternal{
-
-
-extern const std::string MODULE_NAME;
-extern const std::chrono::milliseconds INFERENCE_RATE;
-
-
-
-
-class HostingSwitch : public IntegerEnumDropdownOption{
-public:
-    HostingSwitch();
-    std::string check_validity(size_t consoles) const;
-};
-
-
-
-class BossSlotOption : public IntegerEnumDropdownOption{
-public:
-    BossSlotOption();
-};
-
-
-
-
-enum class CaughtScreenAction{
-    STOP_PROGRAM,
-    TAKE_NON_BOSS_SHINY_AND_CONTINUE,
-    RESET,
-};
-class EndBattleDecider{
-public:
-    virtual const std::string& normal_ball(
-        size_t console_index
-    ) const = 0;
-    virtual const std::string& boss_ball(
-        size_t console_index, const std::string& boss_slug
-    ) const = 0;
-    virtual CaughtScreenAction end_adventure_action(
-        size_t console_index, const std::string& boss_slug,
-        const PathStats& path_stats,
-        bool any_shiny, bool boss_is_shiny
-    ) const = 0;
-};
-
-
-
-
-
-
-
-
-}
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options_BossAction.cpp b/SerialPrograms/Source/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options_BossAction.cpp
deleted file mode 100644
index 04e684e510..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options_BossAction.cpp
+++ /dev/null
@@ -1,80 +0,0 @@
-/*  Max Lair Boss Action
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Compiler.h"
-#include "Common/Cpp/Json/JsonValue.h"
-#include "Common/Cpp/Json/JsonArray.h"
-#include "Common/Cpp/Json/JsonObject.h"
-#include "CommonFramework/Globals.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "Pokemon/Resources/Pokemon_PokemonNames.h"
-#include "Pokemon/Resources/Pokemon_PokeballNames.h"
-#include "PokemonSwSh/Resources/PokemonSwSh_PokemonSprites.h"
-#include "PokemonSwSh/Resources/PokemonSwSh_MaxLairDatabase.h"
-#include "PokemonSwSh_MaxLair_Options_BossAction.h"
-
-//#include <iostream>
-//using std::cout;
-//using std::endl;
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-namespace MaxLairInternal{
-
-
-
-
-const EnumDatabase<BossAction>& BossAction_Database(){
-    static const EnumDatabase<BossAction> database({
-        {BossAction::CATCH_AND_STOP_PROGRAM, "always-stop", "Always stop program."},
-        {BossAction::CATCH_AND_STOP_IF_SHINY, "stop-if-shiny", "Stop if shiny."},
-    });
-    return database;
-}
-
-BossActionRow::BossActionRow(std::string slug, const std::string& name_slug, const std::string& sprite_slug)
-    : StaticTableRow(std::move(slug))
-    , pokemon(LockWhileRunning::LOCKED, get_pokemon_name(name_slug).display_name(), ALL_POKEMON_SPRITES().get_throw(sprite_slug).icon)
-    , action(BossAction_Database(), LockWhileRunning::LOCKED, BossAction::CATCH_AND_STOP_IF_SHINY)
-    , ball("poke-ball")
-{
-    PA_ADD_STATIC(pokemon);
-    add_option(action, "Action");
-    add_option(ball, "Ball");
-}
-
-
-BossActionTable::BossActionTable()
-    : StaticTableOption("<b>Boss Actions:</b>", LockWhileRunning::LOCKED)
-{
-    for (const auto& item : all_bosses_by_dex()){
-//        cout << item.second << endl;
-        const MaxLairSlugs& slugs = get_maxlair_slugs(item.second);
-        const std::string& sprite_slug = *slugs.sprite_slugs.begin();
-        const std::string& name_slug = slugs.name_slug;
-        add_row(std::make_unique<BossActionRow>(item.second, name_slug, sprite_slug));
-    }
-    finish_construction();
-}
-std::vector<std::string> BossActionTable::make_header() const{
-    std::vector<std::string> ret{
-        STRING_POKEMON,
-        "Action",
-        STRING_POKEBALL
-    };
-    return ret;
-}
-
-
-
-
-
-
-}
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options_BossAction.h b/SerialPrograms/Source/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options_BossAction.h
deleted file mode 100644
index 80240d9775..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options_BossAction.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*  Max Lair Boss Action
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_MaxLair_Options_BossAction_H
-#define PokemonAutomation_PokemonSwSh_MaxLair_Options_BossAction_H
-
-#include "Common/Cpp/Options/EnumDropdownOption.h"
-#include "Common/Cpp/Options/StaticTableOption.h"
-#include "CommonFramework/Options/LabelCellOption.h"
-#include "PokemonSwSh/Options/PokemonSwSh_BallSelectOption.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-namespace MaxLairInternal{
-
-
-enum class BossAction{
-    CATCH_AND_STOP_PROGRAM,
-    CATCH_AND_STOP_IF_SHINY,
-};
-
-
-class BossActionRow : public StaticTableRow{
-public:
-    BossActionRow(std::string slug, const std::string& name_slug, const std::string& sprite_slug);
-
-    LabelCellOption pokemon;
-    EnumDropdownCell<BossAction> action;
-    PokemonBallSelectCell ball;
-};
-
-class BossActionTable : public StaticTableOption{
-public:
-    BossActionTable();
-    virtual std::vector<std::string> make_header() const;
-};
-
-
-
-
-
-}
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options_Hosting.cpp b/SerialPrograms/Source/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options_Hosting.cpp
deleted file mode 100644
index da80a70f49..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options_Hosting.cpp
+++ /dev/null
@@ -1,97 +0,0 @@
-/*  Max Lair Hosting
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-#include "PokemonSwSh_MaxLair_Options_Hosting.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-namespace MaxLairInternal{
-
-
-
-HostingSettings::~HostingSettings(){
-    MODE.remove_listener(*this);
-}
-HostingSettings::HostingSettings()
-    : GroupOption("Hosting Options", LockWhileRunning::LOCKED)
-    , MODE(
-        "<b>Mode:</b>",
-        {
-            {HostingMode::NOT_HOSTING, "none", "Not Hosting: Run by yourself using only Switches controlled by this program."},
-            {HostingMode::HOST_LOCALLY, "local", "Host Locally: Allow other local Switches to join."},
-            {HostingMode::HOST_ONLINE, "online", "Host Online: Allow other people online to join."},
-        },
-        LockWhileRunning::LOCKED,
-        HostingMode::NOT_HOSTING
-    )
-    , RAID_CODE(
-        "<b>Raid Code:</b><br>Required if using multiple Switches. "
-        "Random code is strongly recommended when hosting to ensure your own Switches get in.",
-        8, 4, ""
-    )
-    , CONNECT_TO_INTERNET_DELAY(
-        "<b>Connect to Internet Delay:</b><br>Time from \"Connect to Internet\" to when you're ready to start adventure.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "20 * TICKS_PER_SECOND"
-    )
-    , START_DELAY(
-        "<b>Start Delay:</b><br>Wait this long before entering the lobby.<br><br>"
-        "If two Switches open a lobby at the same time, they might not see each other and "
-        "thus fail to join each other. If you are joining someone else's auto-host, you "
-        "will want to set this to 3 seconds or more to make sure that the host opens the "
-        "lobby before everyone else tries to join.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "0 * TICKS_PER_SECOND"
-    )
-    , LOBBY_WAIT_DELAY(
-        "<b>Lobby Wait Delay:</b><br>Wait this long before starting raid. Start time is 3 minutes minus this number.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "60 * TICKS_PER_SECOND"
-    )
-    , NOTIFICATIONS("Live-Hosting Announcements", true)
-{
-    PA_ADD_OPTION(MODE);
-    PA_ADD_OPTION(RAID_CODE);
-    PA_ADD_OPTION(CONNECT_TO_INTERNET_DELAY);
-    PA_ADD_OPTION(START_DELAY);
-    PA_ADD_OPTION(LOBBY_WAIT_DELAY);
-    PA_ADD_OPTION(NOTIFICATIONS);
-
-    MODE.add_listener(*this);
-}
-std::string HostingSettings::check_validity(size_t consoles) const{
-    if (consoles != 1 && !RAID_CODE.code_enabled()){
-        return "You must use a code when running with multiple Switches.";
-    }
-    return std::string();
-}
-void HostingSettings::value_changed(){
-    HostingMode mode = MODE;
-    if (mode == HostingMode::HOST_ONLINE){
-        CONNECT_TO_INTERNET_DELAY.set_visibility(ConfigOptionState::ENABLED);
-    }else{
-        CONNECT_TO_INTERNET_DELAY.set_visibility(ConfigOptionState::DISABLED);
-    }
-    if (mode != HostingMode::NOT_HOSTING){
-        START_DELAY.set_visibility(ConfigOptionState::ENABLED);
-        NOTIFICATIONS.set_visibility(ConfigOptionState::ENABLED);
-    }else{
-        START_DELAY.set_visibility(ConfigOptionState::DISABLED);
-        NOTIFICATIONS.set_visibility(ConfigOptionState::DISABLED);
-    }
-}
-
-
-
-}
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options_Hosting.h b/SerialPrograms/Source/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options_Hosting.h
deleted file mode 100644
index 45cfb6cd1a..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options_Hosting.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*  Max Lair Hosting
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_MaxLair_Options_Hosting_H
-#define PokemonAutomation_PokemonSwSh_MaxLair_Options_Hosting_H
-
-#include "Common/Cpp/Options/GroupOption.h"
-#include "Common/Cpp/Options/RandomCodeOption.h"
-#include "Common/Cpp/Options/EnumDropdownOption.h"
-#include "Common/Cpp/Options/TimeExpressionOption.h"
-#include "PokemonSwSh/Options/PokemonSwSh_AutoHostNotification.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-namespace MaxLairInternal{
-
-
-
-enum class HostingMode{
-    NOT_HOSTING,
-    HOST_LOCALLY,
-    HOST_ONLINE,
-};
-
-class HostingSettings : public GroupOption, private ConfigOption::Listener{
-public:
-    ~HostingSettings();
-    HostingSettings();
-    using GroupOption::check_validity;
-    std::string check_validity(size_t consoles) const;
-
-    virtual void value_changed() override;
-
-    EnumDropdownOption<HostingMode> MODE;
-    RandomCodeOption RAID_CODE;
-    TimeExpressionOption<uint16_t> CONNECT_TO_INTERNET_DELAY;
-    TimeExpressionOption<uint16_t> START_DELAY;
-    TimeExpressionOption<uint16_t> LOBBY_WAIT_DELAY;
-
-    AutoHostNotificationOption NOTIFICATIONS;
-};
-
-
-
-}
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_Adventure.cpp b/SerialPrograms/Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_Adventure.cpp
deleted file mode 100644
index 2d756e6ed0..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_Adventure.cpp
+++ /dev/null
@@ -1,210 +0,0 @@
-/*  Max Lair Run Adventure
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/Exceptions/OperationFailedException.h"
-#include "CommonFramework/Notifications/ProgramNotifications.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "NintendoSwitch/NintendoSwitch_Settings.h"
-#include "PokemonSwSh/PokemonSwSh_Settings.h"
-#include "PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.h"
-#include "PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
-#include "PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_Notifications.h"
-#include "PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_Start.h"
-#include "PokemonSwSh_MaxLair_Run_Adventure.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-namespace MaxLairInternal{
-
-
-AdventureResult run_adventure(
-    MultiSwitchProgramEnvironment& env, CancellableScope& scope,
-    size_t boss_slot,
-    AdventureRuntime& runtime
-){
-    env.log("Starting new adventure...");
-    env.update_stats();
-
-    send_status_notification(env, runtime);
-
-    std::shared_ptr<const ImageRGB32> entrance[4];
-    GlobalStateTracker state_tracker(scope, env.consoles.size());
-
-    if (!start_adventure(
-        env, scope,
-        state_tracker,
-        entrance,
-        env.consoles[runtime.host_index], boss_slot,
-        runtime.hosting_settings,
-        runtime.path_stats,
-        runtime.session_stats,
-        runtime.consoles
-    )){
-        runtime.session_stats.add_error();
-        return AdventureResult::START_ERROR;
-    }
-
-    uint64_t epoch = 0;
-    SpinLock lock;
-
-    std::atomic<bool> stop(false);
-    std::atomic<bool> error(false);
-
-    env.run_in_parallel(scope, [&](ConsoleHandle& console, BotBaseContext& context){
-        StateMachineAction action;
-        while (true){
-            //  Dump current state, but don't spam if nothing has changed.
-            {
-                SpinLockGuard lg(lock);
-                std::pair<uint64_t, std::string> status = state_tracker.dump();
-                if (status.first > epoch){
-                    console.log("State Tracker\n" + status.second);
-                    epoch = status.first;
-                }
-            }
-
-            size_t index = console.index();
-            action = run_state_iteration(
-                runtime, index,
-                env, console, context, boss_slot != 0 && console.index() == runtime.host_index,
-                state_tracker, runtime.actions,
-                *entrance[index]
-            );
-            switch (action){
-            case StateMachineAction::KEEP_GOING:
-                continue;
-            case StateMachineAction::DONE_WITH_ADVENTURE:
-                env.log("End of adventure.", COLOR_PURPLE);
-                return;
-            case StateMachineAction::STOP_PROGRAM:
-                env.log("End of adventure. Stop program requested...", COLOR_PURPLE);
-                if (runtime.go_home_when_done){
-                    pbf_press_button(context, BUTTON_HOME, 10, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE);
-                }
-                stop.store(true, std::memory_order_release);
-                return;
-            case StateMachineAction::RESET_RECOVER:
-                env.log("Error detected. Attempting to correct by resetting...", COLOR_RED);
-                runtime.session_stats.add_error();
-                error.store(true, std::memory_order_release);
-                pbf_press_button(context, BUTTON_HOME, 10, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE);
-                reset_game_from_home_with_inference(console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST);
-                return;
-            }
-        }
-    });
-
-    std::string boss = state_tracker.infer_actual_state(0).boss;
-    if (!boss.empty()){
-        runtime.last_boss = std::move(boss);
-    }
-
-    if (stop.load(std::memory_order_acquire)){
-        return AdventureResult::STOP_PROGRAM;
-    }
-//    if (error.load(std::memory_order_acquire)){
-//        return AdventureResult::START_ERROR;
-//    }
-    return AdventureResult::FINISHED;
-}
-
-
-
-
-
-void loop_adventures(
-    MultiSwitchProgramEnvironment& env, CancellableScope& scope,
-    const Consoles& consoles,
-    size_t host_index, size_t boss_slot,
-    const EndBattleDecider& decider,
-    bool go_home_when_done,
-    HostingSettings& HOSTING,
-    TouchDateIntervalOption& TOUCH_DATE_INTERVAL,
-    EventNotificationOption& notification_status,
-    EventNotificationOption& notification_shiny
-){
-    Stats& stats = env.current_stats<Stats>();
-
-    AdventureRuntime runtime(
-        host_index,
-        consoles,
-        decider,
-        go_home_when_done,
-        HOSTING,
-        notification_status,
-        notification_shiny,
-        stats
-    );
-
-    size_t restart_count = 0;
-    while (true){
-        //  Touch the date.
-        if (TOUCH_DATE_INTERVAL.ok_to_touch_now()){
-            env.run_in_parallel(scope, [&](ConsoleHandle& console, BotBaseContext& context){
-                env.log("Touching date to prevent rollover.");
-                pbf_press_button(context, BUTTON_HOME, 10, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE);
-                touch_date_from_home(context, ConsoleSettings::instance().SETTINGS_TO_HOME_DELAY);
-                resume_game_back_out(console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST, 5 * TICKS_PER_SECOND);
-            });
-        }
-
-        AdventureResult result = run_adventure(env, scope, boss_slot, runtime);
-        switch (result){
-        case AdventureResult::FINISHED:
-            restart_count = 0;
-            continue;
-        case AdventureResult::STOP_PROGRAM:
-            return;
-        case AdventureResult::START_ERROR:
-            restart_count++;
-            if (restart_count == 3){
-                send_program_telemetry(
-                    env.logger(), true, COLOR_RED, env.program_info(),
-                    "Error",
-                    {{"Message:", "Failed to start adventure 3 times in the row."}},
-                    ""
-                );
-                throw OperationFailedException(
-                    ErrorReport::SEND_ERROR_REPORT, env.logger(),
-                    "Failed to start adventure 3 times in the row."
-                );
-            }
-            env.log("Failed to start adventure. Resetting all Switches...", COLOR_RED);
-            env.run_in_parallel(scope, [&](ConsoleHandle& console, BotBaseContext& context){
-                pbf_press_button(context, BUTTON_HOME, 10, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE);
-                reset_game_from_home_with_inference(console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST);
-            });
-            continue;
-        }
-    }
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-}
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_Adventure.h b/SerialPrograms/Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_Adventure.h
deleted file mode 100644
index 9d6aa231cf..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_Adventure.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*  Max Lair Run Adventure
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_MaxLair_Run_Adventure_H
-#define PokemonAutomation_PokemonSwSh_MaxLair_Run_Adventure_H
-
-#include "NintendoSwitch/NintendoSwitch_MultiSwitchProgram.h"
-#include "PokemonSwSh/Options/PokemonSwSh_DateToucher.h"
-#include "PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options.h"
-#include "PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_StateTracker.h"
-#include "PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_StateMachine.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-namespace MaxLairInternal{
-
-
-enum class AdventureResult{
-    FINISHED,
-    STOP_PROGRAM,
-    START_ERROR,
-};
-
-
-void loop_adventures(
-    MultiSwitchProgramEnvironment& env, CancellableScope& scope,
-    const Consoles& consoles,
-    size_t host_index, size_t boss_slot,
-    const EndBattleDecider& decider,
-    bool go_home_when_done,
-    HostingSettings& HOSTING,
-    TouchDateIntervalOption& TOUCH_DATE_INTERVAL,
-    EventNotificationOption& notification_status,
-    EventNotificationOption& notification_shiny
-);
-
-
-}
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_Battle.cpp b/SerialPrograms/Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_Battle.cpp
deleted file mode 100644
index b69bb7c597..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_Battle.cpp
+++ /dev/null
@@ -1,371 +0,0 @@
-/*  Max Lair Battle
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Cpp/PrettyPrint.h"
-#include "CommonFramework/Exceptions/OperationFailedException.h"
-#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
-#include "CommonFramework/Notifications/ProgramInfo.h"
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "CommonFramework/VideoPipeline/VideoOverlay.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
-#include "CommonFramework/Tools/ErrorDumper.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "PokemonSwSh/Resources/PokemonSwSh_MaxLairDatabase.h"
-#include "PokemonSwSh/Inference/PokemonSwSh_SelectionArrowFinder.h"
-#include "PokemonSwSh/Programs/PokemonSwSh_BasicCatcher.h"
-#include "PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_BattleMenu.h"
-#include "PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI.h"
-//#include "PokemonSwSh_MaxLair_Run_CaughtScreen.h"
-#include "PokemonSwSh_MaxLair_Run_Battle.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-namespace MaxLairInternal{
-
-
-bool read_battle_menu(
-    ProgramEnvironment& env,
-    ConsoleHandle& console, BotBaseContext& context, size_t player_index,
-    GlobalState& state,
-    const ConsoleSpecificOptions& settings,
-    bool currently_dmaxed, bool cheer_only
-){
-    PlayerState& player = state.players[player_index];
-
-    VideoOverlaySet boxes(console);
-    BattleMenuReader reader(console, settings.language);
-    BattleMoveArrowFinder arrow_finder(console);
-    arrow_finder.make_overlays(boxes);
-
-
-    //  Read raid mon.
-    do{
-        std::set<std::string> mon = reader.read_opponent(console, context, console);
-        if (mon.size() == 1){
-            state.opponent = std::move(mon);
-            break;
-        }
-        if (mon.size() > 1){
-            console.log("Ambiguous Read Result: " + set_to_str(mon), COLOR_PURPLE);
-            if (state.opponent.size() == 1 && mon.find(*state.opponent.begin()) != mon.end()){
-                console.log("Using previous known value to disambiguate: " + set_to_str(mon), COLOR_PURPLE);
-                break;
-            }
-        }
-        console.log("Attempting to read from summary.", COLOR_PURPLE);
-        pbf_press_button(context, BUTTON_Y, 10, TICKS_PER_SECOND);
-        pbf_press_dpad(context, DPAD_UP, 10, 50);
-        pbf_press_button(context, BUTTON_A, 10, 2 * TICKS_PER_SECOND);
-        context.wait_for_all_requests();
-        mon = reader.read_opponent_in_summary(console, console.video().snapshot());
-        pbf_mash_button(context, BUTTON_B, 3 * TICKS_PER_SECOND);
-        state.opponent = std::move(mon);
-
-        if (state.wins == 3 && !state.boss.empty()){
-            if (!state.opponent.empty() && *state.opponent.begin() != state.boss){
-                console.log("Inconsistent Boss: Expected " + state.boss + ", Read: " + *state.opponent.begin(), COLOR_RED);
-            }
-            state.opponent = {state.boss};
-            break;
-        }
-    }while (false);
-    context.wait_for_all_requests();
-
-    const std::string& opponent = state.opponent.empty()
-        ? ""
-        : *state.opponent.begin();
-
-    if (state.wins != 3 && is_boss(opponent)){
-        console.log("Boss found before 3 wins. Something is seriously out-of-sync.", COLOR_RED);
-        dump_image(console, MODULE_NAME, "BossBeforeEnd", console.video().snapshot());
-//        send_program_telemetry(
-//            env.logger(), true, COLOR_RED, MODULE_NAME,
-//            "Error",
-//            {{"Message:", "Boss found before 3 wins."}},
-//            ""
-//        );
-        return false;
-    }
-
-    //  Infer the boss if we don't know it.
-    if (state.boss.empty() && state.wins == 3){
-        state.boss = opponent;
-    }
-
-    //  Read misc.
-    VideoSnapshot screen = console.video().snapshot();
-    state.opponent_hp = reader.read_opponent_hp(console, screen);
-    if (cheer_only){
-        player.dmax_turns_left = 0;
-        player.health = Health{0, 1};
-        player.can_dmax = false;
-        pbf_press_button(context, BUTTON_A, 10, TICKS_PER_SECOND);
-        context.wait_for_all_requests();
-        return true;
-    }
-
-    if (currently_dmaxed){
-        player.dmax_turns_left--;
-        if (player.dmax_turns_left <= 0){
-            console.log("State Inconsistency: dmax_turns_left <= 0 && currently_dmaxed == true", COLOR_RED);
-            player.dmax_turns_left = 1;
-        }
-    }else{
-        std::string name = reader.read_own_mon(console, screen);
-        if (!name.empty()){
-            state.players[player_index].pokemon = std::move(name);
-        }
-        if (player.dmax_turns_left > 1){
-            console.log("State Inconsistency: dmax_turns_left > 0 && currently_dmaxed == false", COLOR_RED);
-            state.move_slot = 0;
-        }
-        if (player.dmax_turns_left == 1){
-            console.log("End of Dmax.");
-            state.move_slot = 0;
-        }
-        player.dmax_turns_left = 0;
-    }
-
-    Health health[4];
-    reader.read_hp(console, screen, health, player_index);
-    if (health[0].hp >= 0) state.players[0].health = health[0];
-    if (health[1].hp >= 0) state.players[1].health = health[1];
-    if (health[2].hp >= 0) state.players[2].health = health[2];
-    if (health[3].hp >= 0) state.players[3].health = health[3];
-
-
-    //  Enter move selection to read PP.
-    pbf_press_button(context, BUTTON_A, 10, TICKS_PER_SECOND);
-    context.wait_for_all_requests();
-
-
-    //  Clear move blocked status.
-    player.move_blocked[0] = false;
-    player.move_blocked[1] = false;
-    player.move_blocked[2] = false;
-    player.move_blocked[3] = false;
-
-
-    screen = console.video().snapshot();
-
-    int8_t pp[4] = {-1, -1, -1, -1};
-    reader.read_own_pp(console, screen, pp);
-    player.pp[0] = pp[0];
-    player.pp[1] = pp[1];
-    player.pp[2] = pp[2];
-    player.pp[3] = pp[3];
-
-    player.can_dmax = reader.can_dmax(screen);
-
-    //  Read move slot.
-//    int8_t move_slot = arrow_finder.get_slot();
-    int8_t move_slot = arrow_finder.detect(screen);
-    if (move_slot < 0){
-        console.log("Unable to detect move slot.", COLOR_RED);
-        dump_image(console, MODULE_NAME, "MoveSlot", screen);
-        pbf_press_button(context, BUTTON_A, 10, TICKS_PER_SECOND);
-        pbf_press_dpad(context, DPAD_RIGHT, 2 * TICKS_PER_SECOND, 0);
-        pbf_press_dpad(context, DPAD_UP, 2 * TICKS_PER_SECOND, 0);
-        move_slot = 0;
-    }else{
-        console.log("Current Move Slot: " + std::to_string(move_slot), COLOR_BLUE);
-    }
-    if (move_slot != state.move_slot){
-        console.log(
-            "Move Slot Mismatch: Expected = " + std::to_string(state.move_slot) + ", Actual = " + std::to_string(move_slot),
-            COLOR_RED
-        );
-    }
-    state.move_slot = move_slot;
-
-//    inference.stop();
-    return true;
-}
-
-
-StateMachineAction run_move_select(
-    ProgramEnvironment& env,
-    ConsoleHandle& console, BotBaseContext& context,
-    GlobalStateTracker& state_tracker,
-    const ConsoleSpecificOptions& settings,
-    bool currently_dmaxed, bool cheer_only
-){
-    size_t console_index = console.index();
-    GlobalState& state = state_tracker[console_index];
-    size_t player_index = state.find_player_index(console_index);
-    PlayerState& player = state.players[player_index];
-
-
-    if (!read_battle_menu(
-        env, console, context, player_index,
-        state, settings,
-        currently_dmaxed, cheer_only
-    )){
-        return StateMachineAction::RESET_RECOVER;
-    }
-
-
-    GlobalState inferred = state_tracker.synchronize(console, console_index);
-
-    bool all_moves_blocked = false;
-
-    while (true){
-        console.log("Selecting move...");
-
-        if (cheer_only){
-            console.log("Choosing move Cheer. (you are dead)", COLOR_PURPLE);
-//            pbf_mash_button(context, BUTTON_A, 2 * TICKS_PER_SECOND);
-//            context.wait_for_all_requests();
-            break;
-        }
-
-        std::pair<uint8_t, bool> move = select_move(
-            console,
-            inferred,
-            player_index
-        );
-        console.log("Choosing move " + std::to_string((int)move.first) + (move.second ? " (dmax)." : "."), COLOR_PURPLE);
-
-        if (player.can_dmax && move.second){
-            pbf_press_dpad(context, DPAD_LEFT, 10, 50);
-            pbf_press_button(context, BUTTON_A, 10, TICKS_PER_SECOND);
-            player.dmax_turns_left = 3;
-        }
-        while (state.move_slot != move.first){
-            pbf_press_dpad(context, DPAD_DOWN, 10, 50);
-            state.move_slot++;
-            state.move_slot %= 4;
-        }
-
-        //  Enter the move.
-        if (all_moves_blocked){
-            //  If we had trouble selecting a move, then we're probably stuck in a self-target loop.
-            //  Force target the opponent.
-            console.log("Force targeting opponent due to inability to select a move after multiple attempts...", COLOR_RED);
-            pbf_press_button(context, BUTTON_A, 20, 2 * TICKS_PER_SECOND);
-            pbf_press_dpad(context, DPAD_UP, 2 * TICKS_PER_SECOND, 0);
-        }
-        pbf_mash_button(context, BUTTON_A, 2 * TICKS_PER_SECOND);
-        context.wait_for_all_requests();
-
-//        inference.stop();
-
-        //  Back out and look for battle menu. This indicates that the move wasn't selectable.
-        BattleMenuDetector detector;
-        int result = run_until(
-            console, context,
-            [](BotBaseContext& context){
-                pbf_mash_button(context, BUTTON_B, 5 * TICKS_PER_SECOND);
-            },
-            {{detector}},
-            INFERENCE_RATE
-        );
-
-        //  No battle menu detected, we're good.
-        if (result < 0){
-            player.move_blocked[state.move_slot] = false;
-            break;
-        }
-
-        //  Battle menu detected. It means the move wasn't selectable.
-
-        console.log("Move not selectable.", COLOR_RED);
-        player.move_blocked[state.move_slot] = true;
-
-        bool no_moves = true;
-        for (size_t c = 0; c < 4; c++){
-            no_moves &= player.move_blocked[c];
-        }
-        if (no_moves){
-            console.log("All moves reported as blocked. This is impossible. Clearing state.", COLOR_RED);
-            for (size_t c = 0; c < 4; c++){
-                player.move_blocked[c] = false;
-            }
-            all_moves_blocked = true;
-        }
-
-        state_tracker.push_update(console_index);
-
-        //  Reset position.
-        pbf_press_button(context, BUTTON_A, 10, TICKS_PER_SECOND);
-        pbf_press_dpad(context, DPAD_RIGHT, 2 * TICKS_PER_SECOND, 0);
-        pbf_press_dpad(context, DPAD_UP, 2 * TICKS_PER_SECOND, 0);
-        state.move_slot = 0;
-
-        inferred = state_tracker.infer_actual_state(console_index);
-//        inferred.players[player_index].move_blocked[state.move_slot] = true;
-
-    }
-
-//    inference.stop();
-    return StateMachineAction::KEEP_GOING;
-}
-
-
-
-StateMachineAction throw_balls(
-    AdventureRuntime& runtime,
-    ProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context,
-    Language language,
-    GlobalStateTracker& state_tracker,
-    const EndBattleDecider& decider
-){
-    size_t console_index = console.index();
-    GlobalState& state = state_tracker[console_index];
-    state.clear_battle_state();
-
-    state.wins++;
-    state.players[0].health.value.dead = 0;
-    state.players[1].health.value.dead = 0;
-    state.players[2].health.value.dead = 0;
-    state.players[3].health.value.dead = 0;
-
-
-    GlobalState inferred = state_tracker.synchronize(console, console_index);
-
-
-    std::string ball;
-
-    bool boss = inferred.wins == 4;
-    if (boss){
-        ball = decider.boss_ball(console_index, inferred.boss);
-    }else{
-        ball = decider.normal_ball(console_index);
-    }
-
-    BattleBallReader reader(console, language);
-    pbf_press_button(context, BUTTON_A, 10, 125);
-    context.wait_for_all_requests();
-
-    int16_t balls = move_to_ball(reader, console, context, ball);
-    if (balls != 0){
-        pbf_press_button(context, BUTTON_A, 10, 125);
-    }else{
-        throw OperationFailedException(
-            ErrorReport::NO_ERROR_REPORT, console,
-            "Unable to find appropriate ball. Did you run out?",
-            true
-        );
-    }
-
-    ReadableQuantity999& stat = boss
-        ? runtime.consoles[console_index].boss_balls
-        : runtime.consoles[console_index].normal_balls;
-
-    stat.update_with_ocr(balls, boss ? -1 : 1);
-    stat.quantity = (uint16_t)std::max((int)stat.quantity - 1, 0);
-
-    return StateMachineAction::KEEP_GOING;
-}
-
-
-
-
-}
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_Battle.h b/SerialPrograms/Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_Battle.h
deleted file mode 100644
index 639655d2cc..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_Battle.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*  Max Lair Run Battle
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_MaxLair_Run_Battle_H
-#define PokemonAutomation_PokemonSwSh_MaxLair_Run_Battle_H
-
-#include "CommonFramework/Language.h"
-#include "PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options.h"
-#include "PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_StateMachine.h"
-#include "PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_StateTracker.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-namespace MaxLairInternal{
-
-
-StateMachineAction run_move_select(
-    ProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context,
-    GlobalStateTracker& state_tracker,
-    const ConsoleSpecificOptions& settings,
-    bool currently_dmaxed, bool cheer_only
-);
-
-StateMachineAction throw_balls(
-    AdventureRuntime& runtime,
-    ProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context,
-    Language language,
-    GlobalStateTracker& state_tracker,
-    const EndBattleDecider& decider
-);
-
-
-
-}
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_CaughtScreen.cpp b/SerialPrograms/Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_CaughtScreen.cpp
deleted file mode 100644
index 1d72d81eb1..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_CaughtScreen.cpp
+++ /dev/null
@@ -1,197 +0,0 @@
-/*  Max Lair Run Caught Screen
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Cpp/Exceptions.h"
-#include "CommonFramework/Exceptions/FatalProgramException.h"
-#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
-#include "CommonFramework/Tools/ErrorDumper.h"
-//#include "CommonFramework/Tools/InterruptableCommands.h"
-#include "NintendoSwitch/NintendoSwitch_Settings.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonSwSh/PokemonSwSh_Settings.h"
-//#include "PokemonSwSh/Inference/PokemonSwSh_SummaryShinySymbolDetector.h"
-#include "PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
-//#include "PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_EndBattle.h"
-#include "PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_Entrance.h"
-#include "PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_Notifications.h"
-#include "PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_CatchScreenTracker.h"
-#include "PokemonSwSh_MaxLair_Run_CaughtScreen.h"
-
-#include <iostream>
-using std::cout;
-using std::endl;
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-namespace MaxLairInternal{
-
-
-StateMachineAction mash_A_to_entrance(
-    AdventureRuntime& runtime,
-    ConsoleHandle& console, BotBaseContext& context,
-    const ImageViewRGB32& entrance
-){
-    EntranceDetector entrance_detector(entrance);
-
-    int result = run_until(
-        console, context,
-        [&](BotBaseContext& context){
-            pbf_mash_button(context, BUTTON_A, 60 * TICKS_PER_SECOND);
-        },
-        {{entrance_detector}},
-        INFERENCE_RATE
-    );
-
-    if (result < 0){
-        console.log("Failed to detect entrance.", COLOR_RED);
-        runtime.session_stats.add_error();
-        dump_image(console, MODULE_NAME, "FailedToDetectEntrance", console.video().snapshot());
-        return StateMachineAction::RESET_RECOVER;
-    }
-    return StateMachineAction::KEEP_GOING;
-}
-
-
-void synchronize_caught_screen(
-    ConsoleHandle& console, BotBaseContext& context,
-    GlobalStateTracker& state_tracker
-){
-    context.wait_for_all_requests();
-    state_tracker.synchronize(console, console.index(), std::chrono::seconds(60));
-}
-
-
-StateMachineAction run_caught_screen(
-    AdventureRuntime& runtime,
-    ProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context,
-    GlobalStateTracker& state_tracker,
-    const EndBattleDecider& decider,
-    const ImageViewRGB32& entrance
-){
-    size_t console_index = console.index();
-    bool is_host = console_index == runtime.host_index;
-
-    pbf_wait(context, TICKS_PER_SECOND);
-    context.wait_for_all_requests();
-
-    CaughtPokemonScreen tracker(env, console, context);
-    runtime.session_stats.add_run(tracker.total());
-    if (is_host){
-        runtime.path_stats.add_run(tracker.total() >= 4);
-//        cout << runtime.path_stats.to_str() << endl;
-    }
-
-    //  Scroll over everything. This checks them for shinies.
-    tracker.enter_summary();
-    for (size_t c = 0; c < tracker.total(); c++){
-        tracker.scroll_to(c);
-    }
-
-    //  Get all the shinies.
-    bool boss_is_shiny = false;
-    std::vector<size_t> shinies;
-    for (size_t c = 0; c < tracker.total(); c++){
-        if (!tracker[c].shiny){
-            continue;
-        }
-        shinies.emplace_back(c);
-        runtime.session_stats.add_shiny();
-        if (c == 3){
-            boss_is_shiny = true;
-            runtime.session_stats.add_shiny_legendary();
-        }
-    }
-
-    //  If anything is shiny, take a video.
-    if (!shinies.empty()){
-        tracker.scroll_to(shinies.back());
-        tracker.leave_summary();
-        context.wait_for(std::chrono::seconds(1));
-        pbf_press_button(context, BUTTON_CAPTURE, 2 * TICKS_PER_SECOND, 5 * TICKS_PER_SECOND);
-        context.wait_for_all_requests();
-    }
-
-    //  Screencap all the shinies and send notifications.
-    for (size_t index : shinies){
-        tracker.scroll_to(index);
-        tracker.leave_summary();
-        VideoSnapshot screen = console.video().snapshot();
-
-        SpinLockGuard lg(runtime.m_lock);
-        send_shiny_notification(
-            env, console,
-            runtime.notification_shiny,
-            console_index, shinies.size(),
-            nullptr,
-            runtime.path_stats,
-            runtime.session_stats,
-            screen
-        );
-    }
-
-
-    const std::string& boss = state_tracker[console_index].boss;
-    CaughtScreenAction action =
-        decider.end_adventure_action(
-            console_index, boss,
-            runtime.path_stats,
-            !shinies.empty(), boss_is_shiny
-        );
-
-    switch (action){
-    case CaughtScreenAction::STOP_PROGRAM:
-        console.log("Stopping program...", COLOR_PURPLE);
-        synchronize_caught_screen(console, context, state_tracker);
-        return StateMachineAction::STOP_PROGRAM;
-
-    case CaughtScreenAction::TAKE_NON_BOSS_SHINY_AND_CONTINUE:
-        if (is_host){
-            runtime.path_stats.clear();
-        }
-        if (shinies.empty() || shinies[0] == 3){
-            console.log("Quitting back to entrance.", COLOR_PURPLE);
-            tracker.leave_summary();
-            synchronize_caught_screen(console, context, state_tracker);
-            pbf_press_dpad(context, DPAD_DOWN, 10, 50);
-            pbf_press_button(context, BUTTON_B, 10, TICKS_PER_SECOND);
-            return mash_A_to_entrance(runtime, console, context, entrance);
-        }else{
-            console.log("Taking non-shiny boss and returning to entrance...", COLOR_BLUE);
-            tracker.scroll_to(shinies[0]);
-            tracker.enter_summary();    //  Enter summary to verify you're on the right mon.
-            tracker.leave_summary();
-            synchronize_caught_screen(console, context, state_tracker);
-            StateMachineAction state = mash_A_to_entrance(runtime, console, context, entrance);
-            if (state == StateMachineAction::RESET_RECOVER){
-                throw FatalProgramException(
-                    ErrorReport::SEND_ERROR_REPORT,
-                    console,
-                    "Unable to take " + Pokemon::STRING_POKEMON + ". Did you forget to disable nicknames?"
-               );
-            }
-            return state;
-        }
-
-    case CaughtScreenAction::RESET:
-        console.log("Resetting game...", COLOR_BLUE);
-        synchronize_caught_screen(console, context, state_tracker);
-        pbf_press_button(context, BUTTON_HOME, 10, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE);
-        reset_game_from_home_with_inference(console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST);
-        return StateMachineAction::DONE_WITH_ADVENTURE;
-    }
-
-    throw InternalProgramError(&console.logger(), PA_CURRENT_FUNCTION, "Invalid enum.");
-}
-
-
-}
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_CaughtScreen.h b/SerialPrograms/Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_CaughtScreen.h
deleted file mode 100644
index 8fe3855d50..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_CaughtScreen.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*  Max Lair Run Caught Screen
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_MaxLair_Run_CaughtScreen_H
-#define PokemonAutomation_PokemonSwSh_MaxLair_Run_CaughtScreen_H
-
-#include "CommonFramework/ImageTypes/ImageRGB32.h"
-#include "CommonFramework/Tools/ConsoleHandle.h"
-#include "PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_StateMachine.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-namespace MaxLairInternal{
-
-
-StateMachineAction run_caught_screen(
-    AdventureRuntime& runtime,
-    ProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context,
-    GlobalStateTracker& state_tracker,
-    const EndBattleDecider& decider,
-    const ImageViewRGB32& entrance
-);
-
-
-
-}
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_EnterLobby.cpp b/SerialPrograms/Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_EnterLobby.cpp
deleted file mode 100644
index 2aa8b1ff3f..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_EnterLobby.cpp
+++ /dev/null
@@ -1,174 +0,0 @@
-/*  Max Lair Enter Lobby
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-//#include "Common/Compiler.h"
-#include "CommonFramework/Exceptions/OperationFailedException.h"
-#include "CommonFramework/ImageTypes/ImageRGB32.h"
-#include "CommonFramework/ImageTools/ImageStats.h"
-#include "CommonFramework/ImageTools/SolidColorTest.h"
-#include "CommonFramework/ImageTools/ImageFilter.h"
-#include "CommonFramework/ImageTools/ImageManip.h"
-//#include "CommonFramework/OCR/OCR_RawOCR.h"
-//#include "CommonFramework/OCR/OCR_NumberReader.h"
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "CommonFramework/VideoPipeline/VideoOverlay.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "PokemonSwSh/Inference/PokemonSwSh_SelectionArrowFinder.h"
-#include "PokemonSwSh/Programs/PokemonSwSh_Internet.h"
-//#include "PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_StateMachine.h"
-#include "PokemonSwSh_MaxLair_Run_EnterLobby.h"
-
-#include <iostream>
-using std::cout;
-using std::endl;
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-namespace MaxLairInternal{
-
-
-
-class GreyDialogDetector : public VisualInferenceCallback{
-public:
-    GreyDialogDetector()
-        : VisualInferenceCallback("GreyDialogDetector")
-        , m_box0(0.180, 0.815, 0.015, 0.030)
-        , m_box1(0.785, 0.840, 0.030, 0.050)
-    {}
-
-    bool detect(const ImageViewRGB32& screen){
-        ImageStats stats0 = image_stats(extract_box_reference(screen, m_box0));
-        if (!is_grey(stats0, 0, 200, 10)){
-            return false;
-        }
-        ImageStats stats1 = image_stats(extract_box_reference(screen, m_box1));
-        if (!is_grey(stats1, 0, 200, 10)){
-            return false;
-        }
-        return true;
-    }
-    virtual void make_overlays(VideoOverlaySet& items) const override{
-        items.add(COLOR_RED, m_box0);
-        items.add(COLOR_RED, m_box1);
-    }
-    virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override{
-        return detect(frame);
-    }
-
-private:
-    ImageFloatBox m_box0;
-    ImageFloatBox m_box1;
-};
-
-
-
-
-std::shared_ptr<const ImageRGB32> enter_lobby(
-    ConsoleHandle& console, BotBaseContext& context,
-    size_t boss_slot, bool connect_to_internet,
-    ReadableQuantity999& ore
-){
-    pbf_mash_button(context, BUTTON_B, 2 * TICKS_PER_SECOND);
-
-    if (connect_to_internet){
-        connect_to_internet_with_inference(console, context);
-    }
-
-    VideoOverlaySet boxes(console);
-    SelectionArrowFinder arrow_detector(console, ImageFloatBox(0.350, 0.450, 0.500, 0.400));
-    GreyDialogDetector dialog_detector;
-    arrow_detector.make_overlays(boxes);
-    dialog_detector.make_overlays(boxes);
-
-//    OverlayBoxScope ore_box(console, {0.900, 0.015, 0.020, 0.040});
-    OverlayBoxScope ore_box(console, {0.930, 0.050, 0.065, 0.010});
-    OverlayBoxScope ore_quantity(console, {0.945, 0.010, 0.0525, 0.050});
-
-    size_t presses = 0;
-    size_t arrow_count = 0;
-    size_t ore_dialog_count = 0;
-    while (presses < 50){
-        presses++;
-        pbf_press_button(context, BUTTON_A, 10, TICKS_PER_SECOND);
-        context.wait_for_all_requests();
-
-        VideoSnapshot screen = console.video().snapshot();
-        if (!arrow_detector.detect(screen)){
-            continue;
-        }
-
-        arrow_count++;
-
-        console.log("Detected dialog prompt.");
-//        screen.save("test.png");
-
-        //  We need to pay ore.
-        ImageStats ore_stats = image_stats(extract_box_reference(screen, ore_box));
-        if (is_solid(ore_stats, {0.594724, 0.405276, 0.})){
-            console.log("Need to pay ore.", COLOR_PURPLE);
-
-            arrow_count = 0;
-            ImageRGB32 image = to_blackwhite_rgb32_range(
-                extract_box_reference(screen, ore_quantity),
-                0xff808080, 0xffffffff, true
-            );
-            ImageRGB32 filtered = pad_image(image, 10, 0xffffffff);
-            ore.update_with_ocr(console.logger(), filtered);
-
-            if (ore.quantity < 20){
-                throw OperationFailedException(
-                    ErrorReport::NO_ERROR_REPORT, console,
-                    "You have less than 20 ore. Program stopped. (Quantity: " + ore.to_str() + ")",
-                    true
-                );
-            }
-
-            ore_dialog_count++;
-            if (ore_dialog_count >= 2){
-                throw OperationFailedException(
-                    ErrorReport::NO_ERROR_REPORT, console,
-                    "Unable to start adventure. Are you out of ore? (Quantity: " + ore.to_str() + ")",
-                    true
-                );
-            }
-
-            continue;
-        }
-
-        //  Detected save dialog.
-        if (dialog_detector.detect(screen)){
-            console.log("Detected save dialog.");
-            context.wait_for_all_requests();
-            VideoSnapshot entrance = console.video().snapshot();
-            pbf_press_button(context, BUTTON_A, 10, 5 * TICKS_PER_SECOND);
-            context.wait_for_all_requests();
-            return std::move(entrance.frame);
-        }
-
-        //  Select a boss.
-        if (arrow_count == 2){
-            console.log("Detected boss selection.");
-            if (boss_slot > 0){
-                for (size_t c = 1; c < boss_slot; c++){
-                    pbf_press_dpad(context, DPAD_DOWN, 10, 50);
-                }
-                pbf_press_button(context, BUTTON_A, 10, TICKS_PER_SECOND);
-            }else{
-                pbf_press_button(context, BUTTON_B, 10, TICKS_PER_SECOND);
-            }
-        }
-    }
-
-    return std::make_shared<ImageRGB32>();
-}
-
-
-
-}
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_EnterLobby.h b/SerialPrograms/Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_EnterLobby.h
deleted file mode 100644
index 79083d6357..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_EnterLobby.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*  Max Lair Enter Lobby
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_MaxLair_Run_EnterLobby_H
-#define PokemonAutomation_PokemonSwSh_MaxLair_Run_EnterLobby_H
-
-#include "CommonFramework/ImageTypes/ImageRGB32.h"
-#include "CommonFramework/Tools/ConsoleHandle.h"
-#include "PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_StateMachine.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-namespace MaxLairInternal{
-
-
-std::shared_ptr<const ImageRGB32> enter_lobby(
-    ConsoleHandle& console, BotBaseContext& context,
-    size_t boss_slot, bool connect_to_internet,
-    ReadableQuantity999& ore
-);
-
-
-
-}
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_Entrance.cpp b/SerialPrograms/Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_Entrance.cpp
deleted file mode 100644
index ff227b4a3d..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_Entrance.cpp
+++ /dev/null
@@ -1,65 +0,0 @@
-/*  Max Lair Run Entrance
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Compiler.h"
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
-#include "CommonFramework/ImageTools/SolidColorTest.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "PokemonSwSh_MaxLair_Run_Entrance.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-namespace MaxLairInternal{
-
-
-void run_entrance(
-    AdventureRuntime& runtime,
-    ProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context,
-    bool save_path,
-    GlobalStateTracker& state_tracker
-){
-    size_t console_index = console.index();
-    GlobalState& state = state_tracker[console_index];
-
-    if (!state.adventure_started){
-        console.log("Failed to start raid.", COLOR_RED);
-        runtime.session_stats.add_error();
-    }else if (state.wins == 0){
-        console.log("Lost on first raid.", COLOR_PURPLE);
-        runtime.session_stats.add_run(0);
-        if (console_index == runtime.host_index){
-            runtime.path_stats.clear();
-        }
-    }
-
-
-    OverlayBoxScope box(console, {0.782, 0.850, 0.030, 0.050});
-
-    pbf_wait(context, 2 * TICKS_PER_SECOND);
-    while (true){
-        if (save_path){
-            pbf_press_button(context, BUTTON_A, 10, TICKS_PER_SECOND);
-        }else{
-            pbf_press_button(context, BUTTON_B, 10, TICKS_PER_SECOND);
-        }
-        context.wait_for_all_requests();
-
-        VideoSnapshot screen = console.video().snapshot();
-        ImageStats stats = image_stats(extract_box_reference(screen, box));
-        if (!is_grey(stats, 400, 1000)){
-            break;
-        }
-    }
-}
-
-
-
-}
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_Entrance.h b/SerialPrograms/Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_Entrance.h
deleted file mode 100644
index 1550870cef..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_Entrance.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*  Max Lair Run Entrance
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_MaxLair_Run_Entrance_H
-#define PokemonAutomation_PokemonSwSh_MaxLair_Run_Entrance_H
-
-#include "CommonFramework/Tools/ConsoleHandle.h"
-#include "PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_StateTracker.h"
-#include "PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_StateMachine.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-namespace MaxLairInternal{
-
-
-void run_entrance(
-    AdventureRuntime& runtime,
-    ProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context,
-    bool save_path,
-    GlobalStateTracker& state_tracker
-);
-
-
-
-}
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_ItemSelect.cpp b/SerialPrograms/Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_ItemSelect.cpp
deleted file mode 100644
index d6ef4d1f2d..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_ItemSelect.cpp
+++ /dev/null
@@ -1,71 +0,0 @@
-/*  Max Lair Item
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/Tools/InterruptableCommands.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options.h"
-#include "PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathSelect.h"
-#include "PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_ItemSelectMenu.h"
-#include "PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI.h"
-#include "PokemonSwSh_MaxLair_Run_ItemSelect.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-namespace MaxLairInternal{
-
-
-void run_item_select(
-    ConsoleHandle& console, BotBaseContext& context,
-    GlobalStateTracker& state_tracker
-){
-    size_t console_index = console.index();
-    GlobalState& state = state_tracker[console_index];
-    size_t player_index = state.find_player_index(console_index);
-
-    PathReader reader(console, player_index);
-    {
-        VideoSnapshot screen = console.video().snapshot();
-        reader.read_sprites(console, state, screen);
-        reader.read_hp(console, state, screen);
-    }
-
-
-    GlobalState inferred = state_tracker.synchronize(console, console_index);
-
-
-    int8_t item_index = select_item(console, inferred, player_index);
-    console.log("Choosing item " + std::to_string((int)item_index) + ".", COLOR_PURPLE);
-
-    if (item_index < 0){
-        pbf_press_button(context, BUTTON_B, 10, 50);
-        return;
-    }
-    for (int8_t c = 0; c < item_index; c++){
-        pbf_press_dpad(context, DPAD_DOWN, 10, 50);
-    }
-    pbf_press_button(context, BUTTON_A, 10, 5 * TICKS_PER_SECOND);
-    context.wait_for_all_requests();
-
-    //  Wait until we exit the window.
-    ItemSelectDetector item_menu(true);
-    wait_until(
-        console, context,
-        std::chrono::seconds(480),
-        {{item_menu}},
-        INFERENCE_RATE
-    );
-
-    pbf_wait(context, 1 * TICKS_PER_SECOND);
-}
-
-
-
-}
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_ItemSelect.h b/SerialPrograms/Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_ItemSelect.h
deleted file mode 100644
index 4f8a761cbe..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_ItemSelect.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*  Max Lair Run Item Select
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_MaxLair_Run_ItemSelect_H
-#define PokemonAutomation_PokemonSwSh_MaxLair_Run_ItemSelect_H
-
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "CommonFramework/InferenceInfra/VisualInferenceCallback.h"
-#include "CommonFramework/Tools/ConsoleHandle.h"
-#include "NintendoSwitch/NintendoSwitch_MultiSwitchProgram.h"
-#include "PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_StateTracker.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-namespace MaxLairInternal{
-
-
-void run_item_select(
-    ConsoleHandle& console, BotBaseContext& context,
-    GlobalStateTracker& state_tracker
-);
-
-
-
-}
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_PathSelect.cpp b/SerialPrograms/Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_PathSelect.cpp
deleted file mode 100644
index 0310a4cdd1..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_PathSelect.cpp
+++ /dev/null
@@ -1,78 +0,0 @@
-/*  Max Lair Run Path Select
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/Tools/ErrorDumper.h"
-#include "CommonFramework/Tools/InterruptableCommands.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_ItemSelectMenu.h"
-#include "PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_BattleMenu.h"
-#include "PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathSelect.h"
-#include "PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_EndBattle.h"
-#include "PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI.h"
-#include "PokemonSwSh_MaxLair_Run_ItemSelect.h"
-#include "PokemonSwSh_MaxLair_Run_PathSelect.h"
-
-#include <iostream>
-using std::cout;
-using std::endl;
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-namespace MaxLairInternal{
-
-
-void run_path_select(
-    ProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context,
-    GlobalStateTracker& state_tracker
-){
-    size_t console_index = console.index();
-    GlobalState& state = state_tracker[console_index];
-    size_t player_index = state.find_player_index(console_index);
-
-    PathReader reader(console, player_index);
-    context.wait_for(std::chrono::milliseconds(500));
-
-    VideoSnapshot screen = console.video().snapshot();
-    reader.read_sprites(console, state, screen);
-    reader.read_hp(console, state, screen);
-
-    if (state.wins == 0){
-        reader.read_path(env, console, context, state);
-    }else{
-        reader.read_side(console, state, screen);
-    }
-
-
-    GlobalState inferred = state_tracker.synchronize(console, console_index);
-
-
-    //  Select the path.
-    std::vector<PathNode> path = select_path(console, inferred, player_index);
-    uint8_t slot;
-    if (path.empty()){
-        console.log("No available paths due to read errors. Picking left-most path.", COLOR_RED);
-        slot = 0;
-    }else{
-        slot = path[0].path_slot;
-    }
-    state.last_best_path = std::move(path);
-
-    console.log("Choosing path " + std::to_string((int)slot) + ".", COLOR_PURPLE);
-
-    for (uint8_t c = 0; c < slot; c++){
-        pbf_press_dpad(context, DPAD_RIGHT, 10, 50);
-    }
-    pbf_press_button(context, BUTTON_A, 10, TICKS_PER_SECOND);
-    context.wait_for_all_requests();
-}
-
-
-
-}
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_PathSelect.h b/SerialPrograms/Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_PathSelect.h
deleted file mode 100644
index 05b9276b59..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_PathSelect.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*  Max Lair Run Path Select
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_MaxLair_Run_PathSelect_H
-#define PokemonAutomation_PokemonSwSh_MaxLair_Run_PathSelect_H
-
-#include "CommonFramework/Tools/ConsoleHandle.h"
-#include "PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_StateTracker.h"
-
-namespace PokemonAutomation{
-    class BotBaseContext;
-    class ProgramEnvironment;
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-namespace MaxLairInternal{
-
-
-void run_path_select(
-    ProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context,
-    GlobalStateTracker& state_tracker
-);
-
-
-}
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_PokemonSelect.cpp b/SerialPrograms/Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_PokemonSelect.cpp
deleted file mode 100644
index c8eb0be0bf..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_PokemonSelect.cpp
+++ /dev/null
@@ -1,111 +0,0 @@
-/*  Max Lair Run Pokemon Select
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
-#include "CommonFramework/Tools/InterruptableCommands.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI.h"
-#include "PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonSelectMenu.h"
-#include "PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathSelect.h"
-#include "PokemonSwSh_MaxLair_Run_PokemonSelect.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-namespace MaxLairInternal{
-
-
-void run_select_pokemon(
-    ConsoleHandle& console, BotBaseContext& context,
-    GlobalStateTracker& state_tracker,
-    const ConsoleSpecificOptions& settings
-){
-    size_t console_index = console.index();
-    GlobalState& state = state_tracker[console_index];
-
-    state.adventure_started = true;
-
-    console.log("Switch " + std::to_string(console.index()) + "'s turn to select.");
-
-    //  Wait for the screen to finish loading.
-    context.wait_for(std::chrono::milliseconds(500));
-
-
-    PokemonSelectMenuReader reader(
-        console,
-        console.overlay(),
-        settings.language
-    );
-
-
-    std::string options[3];
-
-//    //  Wait for bottom row to reload.
-//    pbf_wait(context, 50);
-//    context.wait_for_all_requests();
-
-    //  Read the bottom two options first.
-    VideoSnapshot screen = console.video().snapshot();
-    options[1] = reader.read_option(screen, 1);
-    options[2] = reader.read_option(screen, 2);
-
-//    reader.read_options(screen, options);
-    int8_t player_index = reader.who_is_selecting(screen);
-    if (player_index >= 0){
-        state.players[player_index].console_id = (int8_t)console_index;
-    }else{
-        player_index = 0;
-    }
-
-    //  Scroll down one to move the arrow off the top row. Then we can read it.
-    pbf_press_dpad(context, DPAD_DOWN, 10, 80);
-    context.wait_for_all_requests();
-    screen = console.video().snapshot();
-    options[0] = reader.read_option(screen, 0);
-
-    state.add_seen(options[0]);
-    state.add_seen(options[1]);
-    state.add_seen(options[2]);
-
-
-//    GlobalState inferred = state_tracker.synchronize(env, console, console_index);
-    state_tracker.push_update(console_index);
-    GlobalState inferred = state_tracker.infer_actual_state(console_index);
-
-
-    //  Make your selection.
-    int8_t selection = select_starter(console, inferred, player_index, options);
-    console.log("Choosing option " + std::to_string((int)selection) + ".", COLOR_PURPLE);
-    switch (selection){
-    case 0:
-        pbf_press_dpad(context, DPAD_UP, 10, 50);
-        break;
-    case 1:
-        break;
-    case 2:
-        pbf_press_dpad(context, DPAD_DOWN, 10, 50);
-        break;
-    }
-    pbf_press_button(context, BUTTON_A, 10, 50);
-    context.wait_for_all_requests();
-
-    //  Update state.
-    if (player_index >= 0){
-        state.players[console_index].pokemon = std::move(options[selection]);
-    }
-
-
-}
-
-
-
-
-
-}
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_PokemonSelect.h b/SerialPrograms/Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_PokemonSelect.h
deleted file mode 100644
index 277ac9b2c1..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_PokemonSelect.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*  Max Lair Run Pokemon Select
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_MaxLair_Run_PokemonSelect_H
-#define PokemonAutomation_PokemonSwSh_MaxLair_Run_PokemonSelect_H
-
-#include "CommonFramework/Tools/ConsoleHandle.h"
-#include "PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options.h"
-#include "PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options_Consoles.h"
-#include "PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_StateTracker.h"
-
-namespace PokemonAutomation{
-    class BotBaseContext;
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-namespace MaxLairInternal{
-
-
-void run_select_pokemon(
-    ConsoleHandle& console, BotBaseContext& context,
-    GlobalStateTracker& state_tracker,
-    const ConsoleSpecificOptions& settings
-);
-
-
-
-}
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_PokemonSwap.cpp b/SerialPrograms/Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_PokemonSwap.cpp
deleted file mode 100644
index 58ca781298..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_PokemonSwap.cpp
+++ /dev/null
@@ -1,125 +0,0 @@
-/*  Max Lair Run Pokemon Swap
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/Tools/InterruptableCommands.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
-#include "CommonFramework/Inference/BlackScreenDetector.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathSelect.h"
-#include "PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonSwapMenu.h"
-#include "PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI.h"
-#include "PokemonSwSh_MaxLair_Run_PokemonSwap.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-namespace MaxLairInternal{
-
-
-void run_swap_pokemon(
-    AdventureRuntime& runtime,
-    ConsoleHandle& console, BotBaseContext& context,
-    GlobalStateTracker& state_tracker,
-    const ConsoleSpecificOptions& settings
-){
-    size_t console_index = console.index();
-    GlobalState& state = state_tracker[console_index];
-    size_t player_index = state.find_player_index(console_index);
-    PlayerState& player = state.players[player_index];
-
-
-    //  Wait for bottom row to reload.
-    context.wait_for(std::chrono::milliseconds(100));
-
-
-    PokemonSwapMenuReader reader(
-        console,
-        console.overlay(),
-        settings.language
-    );
-    PokemonSwapMenuDetector menu(false);
-
-    //  Now read the options.
-    std::string options[2];
-    VideoSnapshot screen = console.video().snapshot();
-    reader.read_options(screen, options);
-    reader.read_pp(screen, player.pp);
-
-    //  Read HP of party.
-    double hp[4];
-    reader.read_hp(screen,hp);
-    if (hp[0] >= 0) state.players[0].health = Health{hp[0], 0};
-    if (hp[1] >= 0) state.players[1].health = Health{hp[1], 0};
-    if (hp[2] >= 0) state.players[2].health = Health{hp[2], 0};
-    if (hp[3] >= 0) state.players[3].health = Health{hp[3], 0};
-
-    state.add_seen(options[0]);
-    state.add_seen(options[1]);
-
-
-    GlobalState inferred = state_tracker.synchronize(console, console_index);
-
-
-    //  Make your selection.
-    bool swap = should_swap_with_newly_caught(console, inferred, player_index, options);
-    if (swap){
-        console.log("Choosing to swap for: " + options[1], COLOR_PURPLE);
-        std::lock_guard<std::mutex> lg(runtime.m_delay_lock);
-        pbf_mash_button(context, BUTTON_A, TICKS_PER_SECOND);
-        context.wait_for_all_requests();
-    }else{
-        console.log("Choosing not to swap.", COLOR_PURPLE);
-        pbf_mash_button(context, BUTTON_B, TICKS_PER_SECOND);
-        context.wait_for_all_requests();
-    }
-
-#if 1
-    //  Wait until we exit the window.
-    {
-        BlackScreenWatcher detector;
-        int result = run_until(
-            console, context,
-            [&](BotBaseContext& context){
-                pbf_mash_button(context, swap ? BUTTON_A : BUTTON_B, 30 * TICKS_PER_SECOND);
-            },
-            {{detector}}
-        );
-        if (result < 0){
-            console.log("Timed out waiting for black screen.", COLOR_RED);
-        }else{
-            console.log("Found path screen. Reading party...");
-        }
-    }
-#endif
-    {
-        PathScreenDetector detector;
-        int result = wait_until(
-            console, context,
-            std::chrono::seconds(30),
-            {{detector}},
-            INFERENCE_RATE
-        );
-        if (result < 0){
-            console.log("Timed out waiting for path screen.", COLOR_RED);
-        }else{
-            console.log("Found path screen. Reading party...");
-        }
-    }
-
-    context.wait_for(std::chrono::milliseconds(100));
-
-    PathReader path_reader(console, player_index);
-    path_reader.read_sprites(console, state, console.video().snapshot());
-    path_reader.read_hp(console, state, console.video().snapshot());
-}
-
-
-
-
-}
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_PokemonSwap.h b/SerialPrograms/Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_PokemonSwap.h
deleted file mode 100644
index 113acf8328..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_PokemonSwap.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*  Max Lair Run Pokemon Swap
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_MaxLair_Run_PokemonSwap_H
-#define PokemonAutomation_PokemonSwSh_MaxLair_Run_PokemonSwap_H
-
-#include "CommonFramework/Tools/ConsoleHandle.h"
-#include "PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options.h"
-#include "PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options_Consoles.h"
-#include "PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_StateTracker.h"
-#include "PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_StateMachine.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-namespace MaxLairInternal{
-
-
-void run_swap_pokemon(
-    AdventureRuntime& runtime,
-    ConsoleHandle& console, BotBaseContext& context,
-    GlobalStateTracker& state_tracker,
-    const ConsoleSpecificOptions& settings
-);
-
-
-
-}
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_ProfessorSwap.cpp b/SerialPrograms/Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_ProfessorSwap.cpp
deleted file mode 100644
index 8cf5941532..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_ProfessorSwap.cpp
+++ /dev/null
@@ -1,103 +0,0 @@
-/*  Max Lair Run Professor Swap
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <mutex>
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
-#include "CommonFramework/Inference/BlackScreenDetector.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options.h"
-#include "PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathSelect.h"
-#include "PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI.h"
-#include "PokemonSwSh_MaxLair_Run_ProfessorSwap.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-namespace MaxLairInternal{
-
-
-void run_professor_swap(
-    AdventureRuntime& runtime,
-    ConsoleHandle& console, BotBaseContext& context,
-    GlobalStateTracker& state_tracker
-){
-    size_t console_index = console.index();
-    GlobalState& state = state_tracker[console_index];
-    size_t player_index = state.find_player_index(console_index);
-
-    PathReader reader(console, player_index);
-    {
-        VideoSnapshot screen = console.video().snapshot();
-        reader.read_sprites(console, state, screen);
-        reader.read_hp(console, state, screen);
-    }
-
-
-    GlobalState inferred = state_tracker.synchronize(console, console_index);
-
-
-    bool swap = should_swap_with_professor(console, inferred, player_index);
-    if (swap){
-        console.log("Choosing to swap.", COLOR_PURPLE);
-        std::lock_guard<std::mutex> lg(runtime.m_delay_lock);
-        pbf_press_button(context, BUTTON_A, 10, TICKS_PER_SECOND);
-        context.wait_for_all_requests();
-    }else{
-        console.log("Choosing not to swap.", COLOR_PURPLE);
-        pbf_press_button(context, BUTTON_B, 10, TICKS_PER_SECOND);
-    }
-    context.wait_for_all_requests();
-
-#if 1
-    //  Wait until we exit the window.
-    {
-        BlackScreenWatcher detector;
-        int result = run_until(
-            console, context,
-            [&](BotBaseContext& context){
-                pbf_mash_button(context, swap ? BUTTON_A : BUTTON_B, 30 * TICKS_PER_SECOND);
-            },
-            {{detector}}
-        );
-        if (result < 0){
-            console.log("Timed out waiting for black screen.", COLOR_RED);
-        }else{
-            console.log("Found path screen. Reading party...");
-        }
-    }
-#endif
-    {
-        PathScreenDetector detector;
-        int result = wait_until(
-            console, context,
-            std::chrono::seconds(30),
-            {{detector}},
-            INFERENCE_RATE
-        );
-        if (result < 0){
-            console.log("Timed out waiting for path screen.", COLOR_RED);
-        }else{
-            console.log("Found path screen. Reading party...");
-        }
-    }
-
-    context.wait_for(std::chrono::milliseconds(100));
-
-    {
-        VideoSnapshot screen = console.video().snapshot();
-        reader.read_sprites(console, state, screen);
-        reader.read_hp(console, state, screen);
-    }
-}
-
-
-
-
-}
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_ProfessorSwap.h b/SerialPrograms/Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_ProfessorSwap.h
deleted file mode 100644
index 9cbd6d4dc3..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_ProfessorSwap.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*  Max Lair Run Professor Swap
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_MaxLair_Run_ProfessorSwap_H
-#define PokemonAutomation_PokemonSwSh_MaxLair_Run_ProfessorSwap_H
-
-#include "CommonFramework/Tools/ConsoleHandle.h"
-#include "PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_StateTracker.h"
-#include "PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_StateMachine.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-namespace MaxLairInternal{
-
-
-void run_professor_swap(
-    AdventureRuntime& runtime,
-    ConsoleHandle& console, BotBaseContext& context,
-    GlobalStateTracker& state_tracker
-);
-
-
-
-}
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_Start.cpp b/SerialPrograms/Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_Start.cpp
deleted file mode 100644
index 5ab3d41063..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_Start.cpp
+++ /dev/null
@@ -1,483 +0,0 @@
-/*  Max Lair Run Start
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Cpp/Exceptions.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_DigitEntry.h"
-#include "PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonReader.h"
-#include "PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_Lobby.h"
-#include "PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_Entrance.h"
-#include "PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_Notifications.h"
-#include "PokemonSwSh_MaxLair_Run_EnterLobby.h"
-#include "PokemonSwSh_MaxLair_Run_Start.h"
-#include "PokemonSwSh_MaxLair_Run_StartSolo.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-namespace MaxLairInternal{
-
-
-bool abort_if_error(MultiSwitchProgramEnvironment& env, CancellableScope& scope, const std::atomic<size_t>& errors){
-    if (errors.load(std::memory_order_acquire)){
-        env.run_in_parallel(scope, [&](ConsoleHandle& console, BotBaseContext& context){
-            pbf_press_button(context, BUTTON_B, 10, TICKS_PER_SECOND);
-            pbf_press_button(context, BUTTON_A, 10, TICKS_PER_SECOND);
-            pbf_mash_button(context, BUTTON_B, 8 * TICKS_PER_SECOND);
-        });
-        return true;
-    }
-    return false;
-}
-
-bool wait_for_all_join(
-    ConsoleHandle& console, BotBaseContext& context,
-    const ImageViewRGB32& entrance,
-    size_t start_players
-){
-    LobbyJoinedDetector joined_detector(start_players, false);
-    EntranceDetector entrance_detector(entrance);
-    int result = wait_until(
-        console, context,
-        std::chrono::seconds(10),
-        {
-            {joined_detector},
-            {entrance_detector},
-        },
-        INFERENCE_RATE
-    );
-    switch (result){
-    case 0:
-        console.log("Detected " + std::to_string(start_players) + " players in lobby!");
-        return true;
-    case 1:
-        console.log("Detected entrance... Did you get disconnected?", COLOR_RED);
-//        dump_image(console, MODULE_NAME, "wait_for_all_join", console.video().snapshot());
-        return false;
-    default:
-        console.log("Timed out waiting for everyone to join.", COLOR_RED);
-//        dump_image(console, MODULE_NAME, "wait_for_all_join", console.video().snapshot());
-        return false;
-    }
-}
-
-class AllJoinedTracker final : public Cancellable{
-public:
-    AllJoinedTracker(
-        CancellableScope& scope, size_t consoles,
-        WallClock time_limit
-    )
-        : m_time_limit(time_limit)
-        , m_consoles(consoles)
-        , m_counter(0)
-    {
-        attach(scope);
-    }
-    virtual ~AllJoinedTracker(){}
-
-    bool report_joined(){
-        std::unique_lock<std::mutex> lg(m_lock);
-        m_counter++;
-        if (m_counter >= m_consoles){
-            m_cv.notify_all();
-            return true;
-        }
-        while (true){
-            m_cv.wait_until(lg, m_time_limit);
-            throw_if_cancelled();
-            if (m_counter >= m_consoles){
-                return true;
-            }
-            if (current_time() > m_time_limit){
-                return false;
-            }
-        }
-    }
-
-    virtual bool cancel(std::exception_ptr exception) noexcept override{
-        if (Cancellable::cancel(std::move(exception))){
-            return true;
-        }
-        std::lock_guard<std::mutex> lg(m_lock);
-        m_cv.notify_all();
-        return false;
-    }
-
-private:
-    std::mutex m_lock;
-    std::condition_variable m_cv;
-
-    WallClock m_time_limit;
-    size_t m_consoles;
-    size_t m_counter;
-};
-
-
-
-
-
-
-bool start_raid_local(
-    MultiSwitchProgramEnvironment& env, CancellableScope& scope,
-    GlobalStateTracker& state_tracker,
-    std::shared_ptr<const ImageRGB32> entrance[4],
-    ConsoleHandle& host, size_t boss_slot,
-    const HostingSettings& settings,
-    ConsoleRuntime console_stats[4]
-){
-    if (env.consoles.size() == 1){
-        BotBaseContext context(scope, host.botbase());
-        return start_raid_self_solo(
-            host, context,
-            state_tracker, entrance[0], boss_slot, console_stats[0].ore
-        );
-    }
-
-    env.log("Entering lobby...");
-
-    uint8_t code[8];
-    bool raid_code = settings.RAID_CODE.get_code(code);
-
-    std::atomic<size_t> errors(0);
-    env.run_in_parallel(scope, [&](ConsoleHandle& console, BotBaseContext& context){
-        size_t index = console.index();
-        bool is_host = index == host.index();
-
-        entrance[index] = enter_lobby(
-            console, context,
-            is_host ? boss_slot : 0,
-            settings.MODE == HostingMode::HOST_ONLINE,
-            console_stats[index].ore
-        );
-        if (!*entrance[index]){
-            errors.fetch_add(1);
-            return;
-        }
-    });
-    if (errors.load(std::memory_order_acquire) != 0){
-        env.run_in_parallel(scope, [&](ConsoleHandle& console, BotBaseContext& context){
-            pbf_mash_button(context, BUTTON_B, 8 * TICKS_PER_SECOND);
-        });
-        return false;
-    }
-
-    env.run_in_parallel(scope, [&](ConsoleHandle& console, BotBaseContext& context){
-        size_t index = console.index();
-        GlobalState& state = state_tracker[index];
-        bool is_host = index == host.index();
-
-        //  Read boss.
-        if (is_host){
-            state.boss = read_boss_sprite(console);
-        }
-
-        //  Enter code.
-        if (raid_code && env.consoles.size() > 1){
-            pbf_press_button(context, BUTTON_PLUS, 10, TICKS_PER_SECOND);
-            enter_digits(context, 8, code);
-            pbf_wait(context, 2 * TICKS_PER_SECOND);
-            pbf_press_button(context, BUTTON_A, 10, TICKS_PER_SECOND);
-        }
-    });
-
-    //  Open lobby.
-    env.run_in_parallel(scope, [&](ConsoleHandle& console, BotBaseContext& context){
-        //  Delay to prevent the Switches from forming separate lobbies.
-        if (env.consoles.size() > 1 && console.index() != host.index()){
-            pbf_wait(context, 3 * TICKS_PER_SECOND);
-        }
-        pbf_press_button(context, BUTTON_A, 10, TICKS_PER_SECOND);
-    });
-
-    auto time_limit = current_time() +
-        std::chrono::milliseconds(settings.LOBBY_WAIT_DELAY * 1000 / TICKS_PER_SECOND);
-
-    AllJoinedTracker joined_tracker(scope, env.consoles.size(), time_limit);
-
-    //  Wait for all Switches to join.
-    env.run_in_parallel(scope, [&](ConsoleHandle& console, BotBaseContext& context){
-        size_t index = console.index();
-
-        //  Wait for a player to show up. This lets you ready up.
-        if (!wait_for_a_player(console, context, *entrance[index], time_limit)){
-            errors.fetch_add(1);
-            return;
-        }
-    });
-    if (abort_if_error(env, scope, errors)){
-        return false;
-    }
-
-    env.run_in_parallel(scope, [&](ConsoleHandle& console, BotBaseContext& context){
-        //  Wait for all consoles to join.
-        if (!joined_tracker.report_joined()){
-            console.log("Not everyone was able to join.", COLOR_RED);
-            errors.fetch_add(1);
-            return;
-        }
-    });
-    if (abort_if_error(env, scope, errors)){
-        return false;
-    }
-
-    env.run_in_parallel(scope, [&](ConsoleHandle& console, BotBaseContext& context){
-        size_t index = console.index();
-        if (!wait_for_all_join(console, context, *entrance[index], env.consoles.size())){
-            console.log("Switches joined into different raids.", COLOR_RED);
-            errors.fetch_add(1);
-            return;
-        }
-    });
-    if (abort_if_error(env, scope, errors)){
-        return false;
-    }
-
-    //  Ready up and wait for lobby to be ready.
-    env.run_in_parallel(scope, [&](ConsoleHandle& console, BotBaseContext& context){
-        //  Ready up.
-        context.wait_for(std::chrono::seconds(1));
-        pbf_press_button(context, BUTTON_A, 10, TICKS_PER_SECOND);
-        context.wait_for_all_requests();
-
-        //  Wait
-        size_t index = console.index();
-        if (!wait_for_lobby_ready(console, context, *entrance[index], env.consoles.size(), env.consoles.size(), time_limit)){
-            errors.fetch_add(1);
-            pbf_mash_button(context, BUTTON_B, 10 * TICKS_PER_SECOND);
-            return;
-        }
-    });
-    if (abort_if_error(env, scope, errors)){
-        return false;
-    }
-
-    env.run_in_parallel(scope, [&](ConsoleHandle& console, BotBaseContext& context){
-        //  Start
-        if (!start_adventure(console, context, env.consoles.size())){
-            errors.fetch_add(1);
-            pbf_mash_button(context, BUTTON_B, 10 * TICKS_PER_SECOND);
-            return;
-        }
-    });
-    if (abort_if_error(env, scope, errors)){
-        return false;
-    }
-
-    return true;
-}
-
-bool start_raid_host(
-    MultiSwitchProgramEnvironment& env, CancellableScope& scope,
-    GlobalStateTracker& state_tracker,
-    std::shared_ptr<const ImageRGB32> entrance[4],
-    ConsoleHandle& host, size_t boss_slot,
-    HostingSettings& settings,
-    const PathStats& path_stats,
-    const StatsTracker& session_stats,
-    ConsoleRuntime console_stats[4]
-){
-    if (env.consoles.size() == 1){
-        BotBaseContext context(scope, host.botbase());
-        return start_raid_host_solo(
-            env, host, context,
-            state_tracker,
-            entrance[0], boss_slot,
-            settings,
-            path_stats, session_stats,
-            console_stats[0].ore
-        );
-    }
-
-    env.log("Entering lobby...");
-
-    uint8_t code[8];
-    bool has_code = settings.RAID_CODE.get_code(code);
-    std::string boss;
-
-    std::atomic<size_t> errors(0);
-    env.run_in_parallel(scope, [&](ConsoleHandle& console, BotBaseContext& context){
-        size_t index = console.index();
-        bool is_host = index == host.index();
-
-        entrance[index] = enter_lobby(
-            console, context,
-            is_host ? boss_slot : 0,
-            settings.MODE == HostingMode::HOST_ONLINE,
-            console_stats[index].ore
-        );
-        if (!*entrance[index]){
-            errors.fetch_add(1);
-            return;
-        }
-    });
-    if (errors.load(std::memory_order_acquire) != 0){
-        env.run_in_parallel(scope, [&](ConsoleHandle& console, BotBaseContext& context){
-            pbf_mash_button(context, BUTTON_B, 8 * TICKS_PER_SECOND);
-        });
-        return false;
-    }
-
-    env.run_in_parallel(scope, [&](ConsoleHandle& console, BotBaseContext& context){
-        size_t index = console.index();
-        GlobalState& state = state_tracker[index];
-        bool is_host = index == host.index();
-
-        //  Read boss.
-        if (is_host){
-            boss = read_boss_sprite(console);
-            state.boss = boss;
-        }
-
-        //  Enter Code
-        if (has_code){
-            pbf_press_button(context, BUTTON_PLUS, 10, TICKS_PER_SECOND);
-            enter_digits(context, 8, code);
-            pbf_wait(context, 2 * TICKS_PER_SECOND);
-            pbf_press_button(context, BUTTON_A, 10, TICKS_PER_SECOND);
-        }
-    });
-
-    //  Start delay.
-    scope.wait_for(std::chrono::milliseconds(settings.START_DELAY * 1000 / TICKS_PER_SECOND));
-
-    //  Open lobby.
-    env.run_in_parallel(scope, [&](ConsoleHandle& console, BotBaseContext& context){
-        //  If you start the raids at the same time, they won't find each other.
-        if (console.index() != host.index()){
-            pbf_wait(context, 3 * TICKS_PER_SECOND);
-        }
-        pbf_press_button(context, BUTTON_A, 10, TICKS_PER_SECOND);
-    });
-
-    auto time_limit = current_time() +
-        std::chrono::milliseconds(settings.LOBBY_WAIT_DELAY * 1000 / TICKS_PER_SECOND);
-
-    AllJoinedTracker joined_tracker(scope, env.consoles.size(), time_limit);
-
-    //  Wait for all Switches to join.
-    env.run_in_parallel(scope, [&](ConsoleHandle& console, BotBaseContext& context){
-        //  Wait for a player to show up. This lets you ready up.
-        size_t index = console.index();
-        if (!wait_for_a_player(console, context, *entrance[index], time_limit)){
-            errors.fetch_add(1);
-            return;
-        }
-    });
-    if (abort_if_error(env, scope, errors)){
-        return false;
-    }
-
-    env.run_in_parallel(scope, [&](ConsoleHandle& console, BotBaseContext& context){
-        //  Wait for all consoles to join.
-        if (!joined_tracker.report_joined()){
-            console.log("Not everyone was able to join.", COLOR_RED);
-            errors.fetch_add(1);
-            return;
-        }
-    });
-    if (abort_if_error(env, scope, errors)){
-        return false;
-    }
-
-    env.run_in_parallel(scope, [&](ConsoleHandle& console, BotBaseContext& context){
-        size_t index = console.index();
-        if (!wait_for_all_join(console, context, *entrance[index], env.consoles.size())){
-            console.log("Switches joined into different raids.", COLOR_RED);
-            errors.fetch_add(1);
-            return;
-        }
-    });
-    if (abort_if_error(env, scope, errors)){
-        return false;
-    }
-
-    send_raid_notification(
-        env,
-        host,
-        settings.NOTIFICATIONS,
-        has_code, code,
-        boss,
-        path_stats, session_stats
-    );
-
-    //  Ready up and wait for lobby to be ready.
-    env.run_in_parallel(scope, [&](ConsoleHandle& console, BotBaseContext& context){
-        //  Ready up.
-        context.wait_for(std::chrono::seconds(1));
-        pbf_press_button(context, BUTTON_A, 10, TICKS_PER_SECOND);
-        context.wait_for_all_requests();
-
-        //  Wait
-        size_t index = console.index();
-        if (!wait_for_lobby_ready(console, context, *entrance[index], env.consoles.size(), 4, time_limit)){
-            errors.fetch_add(1);
-            pbf_mash_button(context, BUTTON_B, 10 * TICKS_PER_SECOND);
-            return;
-        }
-    });
-    if (abort_if_error(env, scope, errors)){
-        return false;
-    }
-
-    env.run_in_parallel(scope, [&](ConsoleHandle& console, BotBaseContext& context){
-        //  Start
-        if (!start_adventure(console, context, env.consoles.size())){
-            errors.fetch_add(1);
-            pbf_mash_button(context, BUTTON_B, 10 * TICKS_PER_SECOND);
-            return;
-        }
-    });
-    if (abort_if_error(env, scope, errors)){
-        return false;
-    }
-
-    return true;
-}
-
-
-
-bool start_adventure(
-    MultiSwitchProgramEnvironment& env, CancellableScope& scope,
-    GlobalStateTracker& state_tracker,
-    std::shared_ptr<const ImageRGB32> entrance[4],
-    ConsoleHandle& host, size_t boss_slot,
-    HostingSettings& settings,
-    const PathStats& path_stats,
-    const StatsTracker& session_stats,
-    ConsoleRuntime console_stats[4]
-){
-    switch (settings.MODE){
-    case HostingMode::NOT_HOSTING:
-        return start_raid_local(env, scope, state_tracker, entrance, host, boss_slot, settings, console_stats);
-    case HostingMode::HOST_LOCALLY:
-    case HostingMode::HOST_ONLINE:
-        return start_raid_host(
-            env, scope,
-            state_tracker,
-            entrance,
-            host, boss_slot,
-            settings,
-            path_stats, session_stats,
-            console_stats
-        );
-    }
-    throw InternalProgramError(&env.logger(), PA_CURRENT_FUNCTION, "Invalid mode enum.");
-}
-
-
-
-
-
-
-
-
-
-
-}
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_Start.h b/SerialPrograms/Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_Start.h
deleted file mode 100644
index 66d99cc2bd..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_Start.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*  Max Lair Run Start
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_MaxLair_Run_Start_H
-#define PokemonAutomation_PokemonSwSh_MaxLair_Run_Start_H
-
-#include "CommonFramework/ImageTypes/ImageRGB32.h"
-#include "NintendoSwitch/NintendoSwitch_MultiSwitchProgram.h"
-#include "PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options.h"
-#include "PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options_Hosting.h"
-#include "PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_StateTracker.h"
-#include "PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_StateMachine.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-namespace MaxLairInternal{
-
-
-//  Returns true if adventure started. False if you errored and are back at the entrance.
-bool start_adventure(
-    MultiSwitchProgramEnvironment& env, CancellableScope& scope,
-    GlobalStateTracker& state_tracker,
-    std::shared_ptr<const ImageRGB32> entrance[4],
-    ConsoleHandle& host, size_t boss_slot,
-    HostingSettings& settings,
-    const PathStats& path_stats,
-    const StatsTracker& session_stats,
-    ConsoleRuntime console_stats[4]
-);
-
-
-
-}
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_StartSolo.cpp b/SerialPrograms/Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_StartSolo.cpp
deleted file mode 100644
index 1799a5d8f4..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_StartSolo.cpp
+++ /dev/null
@@ -1,243 +0,0 @@
-/*  Max Lair Run Start (Solo)
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_DigitEntry.h"
-#include "PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonReader.h"
-#include "PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_Lobby.h"
-#include "PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_Entrance.h"
-#include "PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonSelectMenu.h"
-#include "PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_Notifications.h"
-#include "PokemonSwSh_MaxLair_Run_EnterLobby.h"
-#include "PokemonSwSh_MaxLair_Run_StartSolo.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-namespace MaxLairInternal{
-
-
-
-
-bool wait_for_a_player(
-    ConsoleHandle& console, BotBaseContext& context,
-    const ImageViewRGB32& entrance,
-    WallClock time_limit
-){
-    LobbyDoneConnecting done_connecting_detector;
-    EntranceDetector entrance_detector(entrance);
-    PokemonSelectMenuDetector false_start_detector(false);
-
-    int result = wait_until(
-        console, context,
-        time_limit,
-        {
-            {done_connecting_detector},
-            {entrance_detector},
-            {false_start_detector},
-        },
-        INFERENCE_RATE
-    );
-    switch (result){
-    case 0:
-        console.log("Connected to lobby.");
-        break;
-    case 1:
-        console.log("Detected entrance... Did you get disconnected?", COLOR_RED);
-        return false;
-    case 2:
-        console.log("Detected false start. Did you join the wrong lobby?", COLOR_RED);
-        return false;
-    default:
-        console.log("Timed out connecting to lobby.", COLOR_RED);
-        return false;
-    }
-    return true;
-}
-
-bool wait_for_lobby_ready(
-    ConsoleHandle& console, BotBaseContext& context,
-    const ImageViewRGB32& entrance,
-    size_t min_players,
-    size_t start_players,
-    WallClock time_limit
-){
-    LobbyAllReadyDetector ready_detector(start_players);
-    EntranceDetector entrance_detector(entrance);
-    PokemonSelectMenuDetector false_start_detector(false);
-
-    int result = wait_until(
-        console, context,
-        time_limit,
-        {
-            {ready_detector},
-            {entrance_detector},
-        },
-        INFERENCE_RATE
-    );
-    switch (result){
-    case 0:
-        console.log("Detected lobby ready...");
-        return true;
-    case 1:
-        console.log("Detected entrance... Did you get disconnected?", COLOR_RED);
-        return false;
-    case 2:
-        console.log("Detected false start. Did you join the wrong lobby?", COLOR_RED);
-        return false;
-    }
-    return true;
-}
-bool start_adventure(
-    ConsoleHandle& console, BotBaseContext& context,
-    size_t consoles
-){
-    LobbyMinReadyDetector ready_detector(consoles, true);
-    if (ready_detector.ready_players(console.video().snapshot()) < consoles){
-        console.log("Number of players less than expected. Did someone join the wrong lobby?", COLOR_RED);
-        return false;
-    }
-
-    //  Press A until you're not in the lobby anymore.
-    LobbyDetector lobby_detector(true);
-    int result = run_until(
-        console, context,
-        [](BotBaseContext& context){
-            for (size_t c = 0; c < 180; c++){
-                pbf_press_button(context, BUTTON_A, 10, 115);
-                context.wait_for_all_requests();
-            }
-        },
-        {{lobby_detector}},
-        INFERENCE_RATE
-    );
-    switch (result){
-    case 0:
-        return true;
-    default:
-        console.log("Timed out starting raid.", COLOR_RED);
-        return false;
-    }
-}
-
-
-
-
-bool start_raid_self_solo(
-    ConsoleHandle& console, BotBaseContext& context,
-    GlobalStateTracker& state_tracker,
-    std::shared_ptr<const ImageRGB32>& entrance, size_t boss_slot,
-    ReadableQuantity999& ore
-){
-    console.log("Entering lobby...");
-
-    GlobalState& state = state_tracker[0];
-
-    //  Enter lobby.
-    entrance = enter_lobby(console, context, boss_slot, false, ore);
-    if (!*entrance){
-        return false;
-    }
-
-    //  Read boss.
-    state.boss = read_boss_sprite(console);
-
-    //  Start raid.
-    pbf_press_dpad(context, DPAD_DOWN, 10, 50);
-    pbf_press_button(context, BUTTON_A, 10, TICKS_PER_SECOND);
-    context.wait_for_all_requests();
-
-    return true;
-}
-
-bool start_raid_host_solo(
-    ProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context,
-    GlobalStateTracker& state_tracker,
-    std::shared_ptr<const ImageRGB32>& entrance, size_t boss_slot,
-    HostingSettings& settings,
-    const PathStats& path_stats,
-    const StatsTracker& session_stats,
-    ReadableQuantity999& ore
-){
-    console.log("Entering lobby...");
-
-    GlobalState& state = state_tracker[0];
-
-    //  Start delay.
-    context.wait_for(std::chrono::milliseconds(settings.START_DELAY * 1000 / TICKS_PER_SECOND));
-
-    //  Enter lobby.
-    entrance = enter_lobby(
-        console, context, boss_slot,
-        settings.MODE == HostingMode::HOST_ONLINE,
-        ore
-    );
-    if (!*entrance){
-        return false;
-    }
-
-    //  Read boss.
-    state.boss = read_boss_sprite(console);
-
-    //  Enter code.
-    uint8_t code[8];
-    bool has_code = settings.RAID_CODE.get_code(code);
-    if (has_code){
-        pbf_press_button(context, BUTTON_PLUS, 10, TICKS_PER_SECOND);
-        enter_digits(context, 8, code);
-        pbf_wait(context, 2 * TICKS_PER_SECOND);
-        pbf_press_button(context, BUTTON_A, 10, TICKS_PER_SECOND);
-    }
-
-    send_raid_notification(
-        env,
-        console,
-        settings.NOTIFICATIONS,
-        has_code, code,
-        state.boss,
-        path_stats, session_stats
-    );
-
-    //  Open lobby.
-    pbf_press_button(context, BUTTON_A, 10, TICKS_PER_SECOND);
-    context.wait_for_all_requests();
-
-    auto time_limit = current_time() +
-        std::chrono::milliseconds(settings.LOBBY_WAIT_DELAY * 1000 / TICKS_PER_SECOND);
-
-    if (!wait_for_a_player(console, context, *entrance, time_limit)){
-        pbf_mash_button(context, BUTTON_B, 10 * TICKS_PER_SECOND);
-        return start_raid_self_solo(console, context, state_tracker, entrance, boss_slot, ore);
-    }
-
-    //  Ready up.
-    context.wait_for(std::chrono::seconds(1));
-    pbf_press_button(context, BUTTON_A, 10, TICKS_PER_SECOND);
-    context.wait_for_all_requests();
-
-    //  Wait
-    if (!wait_for_lobby_ready(console, context, *entrance, 1, 4, time_limit)){
-        pbf_mash_button(context, BUTTON_B, 10 * TICKS_PER_SECOND);
-        return false;
-    }
-
-    //  Start
-    context.wait_for_all_requests();
-    if (!start_adventure(console, context, 1)){
-        pbf_mash_button(context, BUTTON_B, 10 * TICKS_PER_SECOND);
-        return false;
-    }
-
-    return true;
-}
-
-
-
-}
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_StartSolo.h b/SerialPrograms/Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_StartSolo.h
deleted file mode 100644
index 4cc2020c17..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_StartSolo.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*  Max Lair Run Start (Solo)
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_MaxLair_Run_StartSolo_H
-#define PokemonAutomation_PokemonSwSh_MaxLair_Run_StartSolo_H
-
-#include "CommonFramework/ImageTypes/ImageRGB32.h"
-#include "CommonFramework/Tools/ConsoleHandle.h"
-#include "PokemonSwSh/Inference/PokemonSwSh_QuantityReader.h"
-#include "PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options_Hosting.h"
-#include "PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_Stats.h"
-#include "PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_StateTracker.h"
-
-namespace PokemonAutomation{
-    class BotBaseContext;
-    class ProgramEnvironment;
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-namespace MaxLairInternal{
-
-
-bool wait_for_a_player(
-    ConsoleHandle& console, BotBaseContext& context,
-    const ImageViewRGB32& entrance,
-    WallClock time_limit
-);
-bool wait_for_lobby_ready(
-    ConsoleHandle& console, BotBaseContext& context,
-    const ImageViewRGB32& entrance,
-    size_t min_players,
-    size_t start_players,
-    WallClock time_limit
-);
-bool start_adventure(
-    ConsoleHandle& console, BotBaseContext& context,
-    size_t consoles
-);
-
-
-bool start_raid_self_solo(
-    ConsoleHandle& console, BotBaseContext& context,
-    GlobalStateTracker& state_tracker,
-    std::shared_ptr<const ImageRGB32>& entrance, size_t boss_slot,
-    ReadableQuantity999& ore
-);
-
-bool start_raid_host_solo(
-    ProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context,
-    GlobalStateTracker& state_tracker,
-    std::shared_ptr<const ImageRGB32>& entrance, size_t boss_slot,
-    HostingSettings& settings,
-    const PathStats& path_stats,
-    const StatsTracker& session_stats,
-    ReadableQuantity999& ore
-);
-
-
-}
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterEnums.cpp b/SerialPrograms/Source/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterEnums.cpp
deleted file mode 100644
index 5c68981ad4..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterEnums.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-/*  Encounter Filter
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "PokemonSwSh_EncounterFilterEnums.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-
-const EnumDatabase<EncounterAction>& EncounterAction_Database(){
-    static const EnumDatabase<EncounterAction> database({
-        {EncounterAction::StopProgram,          "stop",                 "Stop Program"},
-        {EncounterAction::RunAway,              "run",                  "Run Away"},
-        {EncounterAction::ThrowBalls,           "throw-balls",          "Throw balls."},
-        {EncounterAction::ThrowBallsAndSave,    "throw-balls-and-save", "Throw balls. Save if caught."},
-    });
-    return database;
-}
-
-
-
-const EnumDatabase<ShinyFilter>& ShinyFilter_Normal_Database(){
-    static const EnumDatabase<ShinyFilter> database({
-        {ShinyFilter::ANYTHING,     "anything",     "Anything"},
-        {ShinyFilter::NOT_SHINY,    "not-shiny",    "Not Shiny"},
-        {ShinyFilter::ANY_SHINY,    "any-shiny",    "Any Shiny"},
-        {ShinyFilter::STAR_ONLY,    "star-shiny",   "Star Shiny"},
-        {ShinyFilter::SQUARE_ONLY,  "square-shiny", "Square Shiny"},
-//        {ShinyFilter::NOTHING,      "nothing",      "Nothing"},
-    });
-    return database;
-}
-const EnumDatabase<ShinyFilter>& ShinyFilter_RareStars_Database(){
-    static const EnumDatabase<ShinyFilter> database({
-        {ShinyFilter::NOT_SHINY,    "not-shiny",    "Not Shiny"},
-        {ShinyFilter::SQUARE_ONLY,  "square-shiny", "Square Shiny"},
-    });
-    return database;
-}
-
-
-
-const std::vector<std::string> ShinyFilter_NAMES{
-    "Anything",
-    "Not Shiny",
-    "Any Shiny",
-    "Star Shiny",
-    "Square Shiny",
-    "Nothing",
-};
-const std::map<std::string, ShinyFilter> ShinyFilter_MAP{
-    {ShinyFilter_NAMES[0], ShinyFilter::ANYTHING},
-    {ShinyFilter_NAMES[1], ShinyFilter::NOT_SHINY},
-    {ShinyFilter_NAMES[2], ShinyFilter::ANY_SHINY},
-    {ShinyFilter_NAMES[3], ShinyFilter::STAR_ONLY},
-    {ShinyFilter_NAMES[4], ShinyFilter::SQUARE_ONLY},
-    {ShinyFilter_NAMES[5], ShinyFilter::NOTHING},
-};
-
-
-
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterEnums.h b/SerialPrograms/Source/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterEnums.h
deleted file mode 100644
index 8fcfffbb78..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterEnums.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*  Encounter Filter
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_EncounterFilterEnums_H
-#define PokemonAutomation_PokemonSwSh_EncounterFilterEnums_H
-
-#include <string>
-#include <vector>
-#include <map>
-#include "Common/Cpp/Options/EnumDropdownOption.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-
-enum class EncounterAction{
-    StopProgram,
-    RunAway,
-    ThrowBalls,
-    ThrowBallsAndSave,
-};
-const EnumDatabase<EncounterAction>& EncounterAction_Database();
-
-
-class EncounterActionCell : public EnumDropdownCell<EncounterAction>{
-public:
-    EncounterActionCell()
-        : EnumDropdownCell<EncounterAction>(
-            EncounterAction_Database(),
-            LockWhileRunning::LOCKED,
-            EncounterAction::StopProgram
-        )
-    {}
-};
-
-
-
-enum class ShinyFilter{
-    ANYTHING,
-    NOT_SHINY,
-    ANY_SHINY,
-    STAR_ONLY,
-    SQUARE_ONLY,
-    NOTHING,
-};
-const EnumDatabase<ShinyFilter>& ShinyFilter_Normal_Database();
-const EnumDatabase<ShinyFilter>& ShinyFilter_RareStars_Database();
-
-class ShinyFilterCell : public EnumDropdownCell<ShinyFilter>{
-public:
-    ShinyFilterCell(bool rare_stars)
-        : EnumDropdownCell<ShinyFilter>(
-            rare_stars ? ShinyFilter_RareStars_Database() : ShinyFilter_Normal_Database(),
-            LockWhileRunning::LOCKED,
-            ShinyFilter::NOT_SHINY
-        )
-    {}
-};
-
-
-extern const std::vector<std::string> ShinyFilter_NAMES;
-extern const std::map<std::string, ShinyFilter> ShinyFilter_MAP;
-
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterOption.cpp b/SerialPrograms/Source/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterOption.cpp
deleted file mode 100644
index 4cf42c998b..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterOption.cpp
+++ /dev/null
@@ -1,93 +0,0 @@
-/*  Encounter Filter
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Cpp/Json/JsonValue.h"
-#include "Common/Cpp/Json/JsonObject.h"
-#include "CommonFramework/Globals.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonSwSh_EncounterFilterEnums.h"
-#include "PokemonSwSh_EncounterFilterOption.h"
-#include "PokemonSwSh_EncounterFilterWidget.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-
-
-EncounterFilterOption::EncounterFilterOption(bool rare_stars, bool enable_overrides)
-    : m_rare_stars(rare_stars)
-    , m_enable_overrides(enable_overrides)
-    , m_shiny_filter_default(ShinyFilter::ANY_SHINY)
-    , m_shiny_filter_current(m_shiny_filter_default)
-    , m_table(rare_stars)
-{}
-void EncounterFilterOption::load_json(const JsonValue& json){
-    using namespace Pokemon;
-
-    const JsonObject* obj = json.get_object();
-
-    const std::string* str = obj->get_string("ShinyFilter");
-    if (str != nullptr){
-        auto iter = ShinyFilter_MAP.find(*str);
-        if (iter != ShinyFilter_MAP.end()){
-            m_shiny_filter_current = iter->second;
-        }
-    }
-
-    if (m_enable_overrides){
-        const JsonValue* value = obj->get_value("Overrides");
-        if (value != nullptr){
-            m_table.load_json(*value);
-        }
-    }
-}
-JsonValue EncounterFilterOption::to_json() const{
-    JsonObject obj;
-    obj["ShinyFilter"] = ShinyFilter_NAMES[(size_t)m_shiny_filter_current.load(std::memory_order_relaxed)];
-    if (m_enable_overrides){
-        obj["Overrides"] = m_table.to_json();
-    }
-    return obj;
-}
-void EncounterFilterOption::restore_defaults(){
-    m_shiny_filter_current = m_shiny_filter_default;
-    m_table.restore_defaults();
-}
-ConfigWidget* EncounterFilterOption::make_QtWidget(QWidget& parent){
-    return new EncounterFilterWidget(parent, *this);
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterOption.h b/SerialPrograms/Source/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterOption.h
deleted file mode 100644
index 0144f3be6f..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterOption.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*  Encounter Filter
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_EncounterFilterOption_H
-#define PokemonAutomation_PokemonSwSh_EncounterFilterOption_H
-
-#include "PokemonSwSh_EncounterFilterOverride.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-
-class EncounterFilterOption : public ConfigOption{
-public:
-    EncounterFilterOption(bool rare_stars, bool enable_overrides);
-
-    ShinyFilter shiny_filter() const{ return m_shiny_filter_current.load(std::memory_order_relaxed); }
-    std::vector<std::unique_ptr<EncounterFilterOverride>> copy_snapshot() const{
-        return m_table.copy_snapshot();
-    }
-
-    virtual void load_json(const JsonValue& json) override;
-    virtual JsonValue to_json() const override;
-
-    virtual void restore_defaults() override;
-
-    virtual ConfigWidget* make_QtWidget(QWidget& parent) override;
-
-private:
-    friend class EncounterFilterWidget;
-
-    const bool m_rare_stars;
-    const bool m_enable_overrides;
-
-    const ShinyFilter m_shiny_filter_default;
-    std::atomic<ShinyFilter> m_shiny_filter_current;
-
-    EncounterFilterTable m_table;
-};
-
-
-
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterOverride.h b/SerialPrograms/Source/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterOverride.h
deleted file mode 100644
index 8134a753fc..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterOverride.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*  Encounter Filter
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_EncounterFilterOverride_H
-#define PokemonAutomation_PokemonSwSh_EncounterFilterOverride_H
-
-#include "Common/Cpp/Options/EditableTableOption.h"
-#include "PokemonSwSh/Options/PokemonSwSh_BallSelectOption.h"
-#include "PokemonSwSh_EncounterFilterEnums.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-
-class EncounterFilterOverride : public EditableTableRow, private ConfigOption::Listener{
-public:
-    ~EncounterFilterOverride();
-    EncounterFilterOverride(bool rare_stars);
-    virtual void load_json(const JsonValue& json) override;
-    virtual std::unique_ptr<EditableTableRow> clone() const override;
-
-    virtual void value_changed() override;
-
-private:
-    const bool m_rare_stars;
-public:
-    EncounterActionCell action;
-    PokemonBallSelectCell pokeball;
-    StringSelectCell pokemon;
-    ShinyFilterCell shininess;
-};
-
-
-//  Cannot use "EditableTableOption_t<>" since the row class takes an extra
-//  parameter.
-class EncounterFilterTable : public EditableTableOption{
-public:
-    EncounterFilterTable(bool rare_stars);
-    std::vector<std::unique_ptr<EncounterFilterOverride>> copy_snapshot() const;
-    virtual std::vector<std::string> make_header() const override;
-    virtual std::unique_ptr<EditableTableRow> make_row() const override;
-
-private:
-    bool m_rare_stars;
-};
-
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Options/PokemonSwSh_AutoHostNotification.cpp b/SerialPrograms/Source/PokemonSwSh/Options/PokemonSwSh_AutoHostNotification.cpp
deleted file mode 100644
index 948b81c85d..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Options/PokemonSwSh_AutoHostNotification.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-/*  Auto-Host Notification
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "PokemonSwSh_AutoHostNotification.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-AutoHostNotificationOption::AutoHostNotificationOption(std::string label, bool max_lair)
-    : GroupOption(std::move(label), LockWhileRunning::LOCKED, true, false)
-    , DESCRIPTION(
-        "<b>Description:</b>",
-        LockWhileRunning::LOCKED,
-        "",
-        max_lair
-            ? "Auto-Hosting Lugia\nCode: Random"
-            : "Den 123: Square Shiny\nIGN: Kimberly\nCode: 1234-5678\nFC: SW-1234-5678-9012"
-    )
-    , SHOW_STATS(
-        "<b>Show Stats:</b> Show program stats for this session.",
-        LockWhileRunning::LOCKED,
-        true
-    )
-//    , SCREENSHOT("<b>Notification Screenshot:</b><br>Attach screenshot of the den to notifications.")
-    , NOTIFICATION("Hosting Announcements", true, false, ImageAttachmentMode::JPG, {"LiveHost"})
-{
-    PA_ADD_OPTION(DESCRIPTION);
-    PA_ADD_OPTION(SHOW_STATS);
-//    PA_ADD_OPTION(SCREENSHOT);
-}
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSwSh/Options/PokemonSwSh_BallSelectOption.cpp b/SerialPrograms/Source/PokemonSwSh/Options/PokemonSwSh_BallSelectOption.cpp
deleted file mode 100644
index 56fb11efc9..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Options/PokemonSwSh_BallSelectOption.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-/*  Pokemon Ball Select
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/Logging/Logger.h"
-#include "Pokemon/Resources/Pokemon_PokeballNames.h"
-#include "PokemonSwSh/Resources/PokemonSwSh_PokeballSprites.h"
-#include "PokemonSwSh_BallSelectOption.h"
-
-//#include <iostream>
-//using std::cout;
-//using std::endl;
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-using namespace Pokemon;
-
-
-StringSelectDatabase make_all_balls_database(){
-    StringSelectDatabase ret;
-    for (const auto& slug : POKEBALL_SLUGS()){
-//        cout << "slug = " << slug << endl;
-        const PokeballNames& data = get_pokeball_name(slug);
-        const SpriteDatabase::Sprite* sprite = ALL_POKEBALL_SPRITES().get_nothrow(slug);
-        if (sprite == nullptr){
-            ret.add_entry(StringSelectEntry(slug, data.display_name()));
-            global_logger_tagged().log("Missing sprite for: " + slug, COLOR_RED);
-        }else{
-            ret.add_entry(StringSelectEntry(slug, data.display_name(), sprite->icon));
-        }
-    }
-    return ret;
-}
-const StringSelectDatabase& ALL_BALLS_SELECT_DATABASE(){
-    static StringSelectDatabase database = make_all_balls_database();
-    return database;
-}
-
-
-
-
-PokemonBallSelectCell::PokemonBallSelectCell(
-    const std::string& default_slug
-)
-    : StringSelectCell(
-        ALL_BALLS_SELECT_DATABASE(),
-        LockWhileRunning::LOCKED,
-        default_slug
-    )
-{}
-
-
-
-PokemonBallSelectOption::PokemonBallSelectOption(
-    std::string label,
-    LockWhileRunning lock_while_running,
-    const std::string& default_slug
-)
-    : StringSelectOption(
-        std::move(label),
-        ALL_BALLS_SELECT_DATABASE(),
-        lock_while_running,
-        default_slug
-    )
-{}
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSwSh/Options/PokemonSwSh_BallSelectOption.h b/SerialPrograms/Source/PokemonSwSh/Options/PokemonSwSh_BallSelectOption.h
deleted file mode 100644
index e7bf7d7b95..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Options/PokemonSwSh_BallSelectOption.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*  Pokemon Ball Select
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_PokemonBallSelect_H
-#define PokemonAutomation_PokemonSwSh_PokemonBallSelect_H
-
-#include "CommonFramework/Options/StringSelectOption.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-
-class PokemonBallSelectCell : public StringSelectCell{
-public:
-    PokemonBallSelectCell(const std::string& default_slug = "");
-};
-
-
-class PokemonBallSelectOption : public StringSelectOption{
-public:
-    PokemonBallSelectOption(
-        std::string label,
-        LockWhileRunning lock_while_running,
-        const std::string& default_slug = ""
-    );
-};
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Options/PokemonSwSh_CramomaticTable.cpp b/SerialPrograms/Source/PokemonSwSh/Options/PokemonSwSh_CramomaticTable.cpp
deleted file mode 100644
index b0014d0c8d..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Options/PokemonSwSh_CramomaticTable.cpp
+++ /dev/null
@@ -1,103 +0,0 @@
-/*  Cram-o-matic Table
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "PokemonSwSh_CramomaticTable.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-const EnumDatabase<CramomaticBallType>& BallType_Database() {
-    static const EnumDatabase<CramomaticBallType> database({
-        {CramomaticBallType::Poke,     "poke",     "Poké Ball"},
-        {CramomaticBallType::Great,    "great",    "Great Ball"},
-        {CramomaticBallType::Shop1,    "shop1",    "Shop 1 (Ultra Ball, Net Ball, Dusk Ball, Premier Ball)"},
-        {CramomaticBallType::Shop2,    "shop2",    "Shop 2 (Repeat Ball, Dive Ball, Quick Ball, Nest Ball, Heal Ball, Timer Ball, Luxury Ball)"},
-        {CramomaticBallType::Apricorn, "apricorn", "Apricorn (Level Ball, Lure Ball, Moon Ball, Friend Ball, Love Ball, Fast Ball, Heavy Ball)"},
-        {CramomaticBallType::Safari,   "safari",   "Safari Ball"},
-        {CramomaticBallType::Sport,    "sport",    "Sport Ball (uses two different Apricorn colors)"},
-    });
-    return database;
-}
-
-
-
-CramomaticRow::CramomaticRow()
-    : ball_type(BallType_Database(), LockWhileRunning::LOCKED, CramomaticBallType::Apricorn)
-    , is_bonus(LockWhileRunning::LOCKED, false)
-    , priority(LockWhileRunning::LOCKED, 0)
-{
-    PA_ADD_OPTION(ball_type);
-    PA_ADD_OPTION(is_bonus);
-    PA_ADD_OPTION(priority);
-}
-std::unique_ptr<EditableTableRow> CramomaticRow::clone() const{
-    std::unique_ptr<CramomaticRow> ret(new CramomaticRow());
-    ret->ball_type.set_value(ball_type.current_value());
-    ret->is_bonus = is_bonus.current_value();
-    ret->priority.set(priority.current_value());
-    return ret;
-}
-
-
-CramomaticTable::CramomaticTable(std::string label)
-    : EditableTableOption_t<CramomaticRow>(
-        std::move(label),
-        LockWhileRunning::LOCKED,
-        make_defaults()
-    )
-{}
-
-
-std::vector<CramomaticSelection> CramomaticTable::selected_balls() const{
-    std::vector<std::unique_ptr<CramomaticRow>> table = copy_snapshot();
-    std::vector<CramomaticSelection> selections;
-    for (const std::unique_ptr<CramomaticRow>& row : table){
-        CramomaticSelection selection;
-        selection.ball_type = CramomaticBallType(row->ball_type.current_value());
-        selection.is_bonus = row->is_bonus.current_value();
-        selection.priority = row->priority.current_value();
-
-        selections.emplace_back(selection);
-    }
-    return selections;
-}
-
-
-
-
-std::vector<std::string> CramomaticTable::make_header() const{
-    return std::vector<std::string>{
-        "Ball", "Only Bonus", "Priority",
-    };
-}
-
-std::vector<std::unique_ptr<EditableTableRow>> CramomaticTable::make_defaults(){
-    std::vector<std::unique_ptr<EditableTableRow>> ret;
-    ret.emplace_back(std::make_unique<CramomaticRow>());
-    return ret;
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSwSh/Options/PokemonSwSh_DateToucher.cpp b/SerialPrograms/Source/PokemonSwSh/Options/PokemonSwSh_DateToucher.cpp
deleted file mode 100644
index 066f6f243f..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Options/PokemonSwSh_DateToucher.cpp
+++ /dev/null
@@ -1,86 +0,0 @@
-/*  Date Toucher
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Cpp/Json/JsonValue.h"
-#include "NintendoSwitch/NintendoSwitch_Settings.h"
-#include "PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.h"
-#include "PokemonSwSh_DateToucher.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-TimeRollbackHoursOption::TimeRollbackHoursOption()
-    : SimpleIntegerOption<uint8_t>(
-        "<b>Time Rollback (in hours):</b><br>Periodically roll back the time to keep the weather the same. If set to zero, this feature is disabled.",
-        LockWhileRunning::LOCKED,
-        1, 0, 11
-    )
-{}
-
-
-
-
-
-TouchDateIntervalOption::TouchDateIntervalOption()
-    : m_hours(
-        "<b>Rollover Prevention:</b><br>Prevent a date-skip by touching the date every this many hours. If set to zero, this feature is disabled.",
-        LockWhileRunning::LOCKED,
-        4, 0, 11
-    )
-{
-    reset_state();
-}
-
-
-void TouchDateIntervalOption::load_json(const JsonValue& json){
-    m_hours.load_json(json);
-}
-JsonValue TouchDateIntervalOption::to_json() const{
-    return m_hours.to_json();
-}
-std::string TouchDateIntervalOption::check_validity() const{
-    return m_hours.check_validity();
-}
-void TouchDateIntervalOption::restore_defaults(){
-    m_hours.restore_defaults();
-}
-void TouchDateIntervalOption::reset_state(){
-    SpinLockGuard lg(m_lock);
-    m_last_touch = WallClock::min();
-}
-ConfigWidget* TouchDateIntervalOption::make_QtWidget(QWidget& parent){
-    return m_hours.make_QtWidget(parent);
-}
-
-
-bool TouchDateIntervalOption::ok_to_touch_now(){
-    uint8_t hours = m_hours;
-    if (hours == 0){
-        return false;
-    }
-    auto now = current_time();
-    SpinLockGuard lg(m_lock);
-    if (now < m_last_touch + std::chrono::hours(hours)){
-        return false;
-    }
-    m_last_touch = now;
-    return true;
-}
-void TouchDateIntervalOption::touch_now_from_home_if_needed(BotBaseContext& context){
-    if (!ok_to_touch_now()){
-        return;
-    }
-    touch_date_from_home(context, ConsoleSettings::instance().SETTINGS_TO_HOME_DELAY);
-}
-
-
-
-}
-}
-}
-
diff --git a/SerialPrograms/Source/PokemonSwSh/Options/PokemonSwSh_DateToucher.h b/SerialPrograms/Source/PokemonSwSh/Options/PokemonSwSh_DateToucher.h
deleted file mode 100644
index 406307189f..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Options/PokemonSwSh_DateToucher.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*  Date Toucher
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_DateToucher_H
-#define PokemonAutomation_DateToucher_H
-
-#include <chrono>
-#include "Common/Cpp/Concurrency/SpinLock.h"
-#include "Common/Cpp/Options/SimpleIntegerOption.h"
-#include "Common/Cpp/Options/TimeExpressionOption.h"
-#include "ClientSource/Connection/BotBase.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-class TimeRollbackHoursOption : public SimpleIntegerOption<uint8_t>{
-public:
-    TimeRollbackHoursOption();
-};
-
-#if 0
-class TouchDateIntervalOptionTicks : public TimeExpressionOption<uint32_t>{
-public:
-    TouchDateIntervalOptionTicks()
-        : TimeExpressionOption<uint32_t>(
-            "<b>Rollover Prevention:</b><br>Prevent a den from rolling over by periodically touching the date. If set to zero, this feature is disabled.",
-            "4 * 3600 * TICKS_PER_SECOND"
-        )
-    {}
-};
-#endif
-
-class TouchDateIntervalOption : public ConfigOption{
-public:
-    TouchDateIntervalOption();
-
-    virtual void load_json(const JsonValue& json) override;
-    virtual JsonValue to_json() const override;
-
-    //  Returns error message if invalid. Otherwise returns empty string.
-    virtual std::string check_validity() const override;
-
-    virtual void restore_defaults() override;
-    virtual void reset_state() override final;
-
-    virtual ConfigWidget* make_QtWidget(QWidget& parent) override;
-
-    bool ok_to_touch_now();
-    void touch_now_from_home_if_needed(BotBaseContext& context);
-
-private:
-    SimpleIntegerOption<uint8_t> m_hours;
-
-    SpinLock m_lock;
-    WallClock m_last_touch;
-};
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Options/PokemonSwSh_EggStepCount.h b/SerialPrograms/Source/PokemonSwSh/Options/PokemonSwSh_EggStepCount.h
deleted file mode 100644
index 778ad9bbb2..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Options/PokemonSwSh_EggStepCount.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*  Egg Step Count Dropdown
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_EggStepCount_H
-#define PokemonAutomation_PokemonSwSh_EggStepCount_H
-
-#include "Common/Cpp/Options/EnumDropdownOption.h"
-
-namespace PokemonAutomation{
-
-
-
-class EggStepCountOption : public IntegerEnumDropdownOption{
-public:
-    EggStepCountOption()
-        : IntegerEnumDropdownOption(
-            "<b>Step Count:</b><br>Lookup the # of steps on Serebii.",
-            {
-                {1280,  "1280",     "1,280"},
-                {2560,  "2560",     "2,560"},
-                {3840,  "3840",     "3,840"},
-                {5120,  "5120",     "5,120"},
-                {6400,  "6400",     "6,400"},
-                {7680,  "7680",     "7,680"},
-                {8960,  "8960",     "8,960"},
-                {10240, "10240",    "10,240"},
-            },
-            LockWhileRunning::LOCKED,
-            5120
-        )
-    {}
-
-    operator uint16_t() const{
-        return (uint16_t)current_value();
-    }
-};
-
-
-
-}
-#endif
-
diff --git a/SerialPrograms/Source/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Field.h b/SerialPrograms/Source/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Field.h
deleted file mode 100644
index 8705dc44a5..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Field.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/*  PkmnLib Field
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef _PokemonAutomation_PokemonSwSh_PkmnLib_Field_H
-#define _PokemonAutomation_PokemonSwSh_PkmnLib_Field_H
-
-#include <string>
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-namespace papkmnlib{
-
-
-enum class Weather{
-    CLEAR,
-    RAIN,
-    SUN,
-    SANDSTORM,
-    HAIL
-};
-
-enum class Terrain{
-    NONE,
-    ELECTRIC,
-    GRASSY,
-    MISTY,
-    PSYCHIC
-};
-
-
-class Field{
-    Weather m_default_weather = Weather::CLEAR;
-    Weather m_current_weather = m_default_weather;
-
-    Terrain m_default_terrain = Terrain::NONE;
-    Terrain m_current_terrain = m_default_terrain;
-
-public:
-    Field() = default;
-    Field(Weather w, Terrain t)
-        : m_default_weather(w)
-        , m_current_weather(w)
-        , m_default_terrain(t)
-        , m_current_terrain(t)
-    {}
-
-    // weather related-queries
-    Weather weather() const{ return m_current_weather; }
-    bool is_clear() const{ return m_current_weather == Weather::CLEAR; }
-    bool is_rain() const{ return m_current_weather == Weather::RAIN; }
-    bool is_sun() const{ return m_current_weather == Weather::SUN; }
-    bool is_sandstorm() const{ return m_current_weather == Weather::SANDSTORM; }
-    bool is_hail() const{ return m_current_weather == Weather::HAIL; }
-
-    // set the weather
-    void set_rain() { m_current_weather = Weather::RAIN; }
-    void set_sun() { m_current_weather = Weather::SUN; }
-    void set_sandstorm() { m_current_weather = Weather::SANDSTORM; }
-    void set_hail() { m_current_weather = Weather::HAIL; }
-    void set_clear() { m_current_weather = Weather::CLEAR; }
-
-    // terrain-related queries
-    Terrain terrain() const{ return m_current_terrain; }
-    bool is_electric() const{ return m_current_terrain == Terrain::ELECTRIC; }
-    bool is_grassy() const{ return m_current_terrain == Terrain::GRASSY; }
-    bool is_misty() const{ return m_current_terrain == Terrain::MISTY; }
-    bool is_psychic() const{ return m_current_terrain == Terrain::PSYCHIC; }
-    bool is_none_terrain() const{ return m_current_terrain == Terrain::NONE; }
-
-    // set the terrain
-    void set_electric() { m_current_terrain = Terrain::ELECTRIC; }
-    void set_grassy() { m_current_terrain = Terrain::GRASSY; }
-    void set_misty() { m_current_terrain = Terrain::MISTY; }
-    void set_psychic() { m_current_terrain = Terrain::PSYCHIC; }
-    void set_none_terrain() { m_current_terrain = Terrain::NONE; }
-
-    // reset field
-    void reset(){
-        m_current_terrain = m_default_terrain;
-        m_current_weather = m_default_weather;
-    }
-
-    void set_default_field(const std::string& boss);
-};
-
-
-
-
-
-}
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/PokemonSwSh_Panels.cpp b/SerialPrograms/Source/PokemonSwSh/PokemonSwSh_Panels.cpp
deleted file mode 100644
index c9a5c2d24c..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/PokemonSwSh_Panels.cpp
+++ /dev/null
@@ -1,218 +0,0 @@
-/*  Pokemon Sword/Shield Panels
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/GlobalSettingsPanel.h"
-#include "PokemonSwSh_Panels.h"
-
-#include "PokemonSwSh_Settings.h"
-
-#include "Programs/QoLMacros/PokemonSwSh_FastCodeEntry.h"
-#include "Programs/QoLMacros/PokemonSwSh_FriendSearchDisconnect.h"
-
-#include "Programs/General/PokemonSwSh_MassRelease.h"
-#include "Programs/General/PokemonSwSh_SurpriseTrade.h"
-#include "Programs/General/PokemonSwSh_TradeBot.h"
-#include "Programs/General/PokemonSwSh_ClothingBuyer.h"
-#include "Programs/General/PokemonSwSh_BallThrower.h"
-#include "Programs/General/PokemonSwSh_AutonomousBallThrower.h"
-#include "Programs/General/PokemonSwSh_DexRecFinder.h"
-#include "Programs/General/PokemonSwSh_BoxReorderNationalDex.h"
-
-#include "Programs/DateSpamFarmers/PokemonSwSh_DateSpam-WattFarmer.h"
-#include "Programs/DateSpamFarmers/PokemonSwSh_DateSpam-BerryFarmer.h"
-#include "Programs/DateSpamFarmers/PokemonSwSh_DateSpam-BerryFarmer2.h"
-#include "Programs/DateSpamFarmers/PokemonSwSh_DateSpam-LotoFarmer.h"
-#include "Programs/DateSpamFarmers/PokemonSwSh_DateSpam-StowOnSideFarmer.h"
-#include "Programs/DateSpamFarmers/PokemonSwSh_DateSpam-DailyHighlightFarmer.h"
-#include "Programs/DateSpamFarmers/PokemonSwSh_DateSpam-PokeJobsFarmer.h"
-
-#include "Programs/DenHunting/PokemonSwSh_BeamReset.h"
-#include "Programs/DenHunting/PokemonSwSh_PurpleBeamFinder.h"
-#include "Programs/DenHunting/PokemonSwSh_EventBeamFinder.h"
-#include "Programs/DenHunting/PokemonSwSh_DaySkipperJPN.h"
-#include "Programs/DenHunting/PokemonSwSh_DaySkipperEU.h"
-#include "Programs/DenHunting/PokemonSwSh_DaySkipperUS.h"
-#include "Programs/DenHunting/PokemonSwSh_DaySkipperJPN-7.8k.h"
-
-#include "Programs/Hosting/PokemonSwSh_DenRoller.h"
-#include "Programs/Hosting/PokemonSwSh_AutoHost-Rolling.h"
-#include "Programs/Hosting/PokemonSwSh_AutoHost-MultiGame.h"
-
-#include "Programs/NonShinyHunting/PokemonSwSh_StatsReset.h"
-#include "Programs/NonShinyHunting/PokemonSwSh_StatsReset-Calyrex.h"
-#include "Programs/NonShinyHunting/PokemonSwSh_StatsReset-Moltres.h"
-#include "Programs/NonShinyHunting/PokemonSwSh_StatsReset-Regi.h"
-
-#include "Programs/RNG/PokemonSwSh_CramomaticRNG.h"
-#include "Programs/RNG/PokemonSwSh_SeedFinder.h"
-
-#include "Programs/ShinyHuntUnattended/PokemonSwSh_MultiGameFossil.h"
-#include "Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntUnattended-Regi.h"
-#include "Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntUnattended-SwordsOfJustice.h"
-#include "Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntUnattended-StrongSpawn.h"
-#include "Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntUnattended-Regigigas2.h"
-#include "Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntUnattended-IoATrade.h"
-#include "Programs/ShinyHuntUnattended/PokemonSwSh_CurryHunter.h"
-
-#include "Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Regi.h"
-#include "Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-SwordsOfJustice.h"
-#include "Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-StrongSpawn.h"
-#include "Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Regigigas2.h"
-#include "Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-IoATrade.h"
-#include "Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-BerryTree.h"
-#include "Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Whistling.h"
-#include "Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Fishing.h"
-#include "Programs/OverworldBot/PokemonSwSh_ShinyHuntAutonomous-Overworld.h"
-
-#include "Programs/EggPrograms/PokemonSwSh_EggAutonomous.h"
-#include "Programs/EggPrograms/PokemonSwSh_EggFetcher2.h"
-#include "Programs/EggPrograms/PokemonSwSh_EggFetcherMultiple.h"
-#include "Programs/EggPrograms/PokemonSwSh_EggHatcher.h"
-#include "Programs/EggPrograms/PokemonSwSh_EggCombined2.h"
-#include "Programs/EggPrograms/PokemonSwSh_EggSuperCombined2.h"
-#include "Programs/EggPrograms/PokemonSwSh_GodEggDuplication.h"
-#include "Programs/EggPrograms/PokemonSwSh_GodEggItemDupe.h"
-
-#include "Programs/PokemonSwSh_SynchronizedSpinning.h"
-#include "Programs/PokemonSwSh_RaidItemFarmerOKHO.h"
-
-#include "MaxLair/PokemonSwSh_MaxLair_Standard.h"
-#include "MaxLair/PokemonSwSh_MaxLair_StrongBoss.h"
-#include "MaxLair/PokemonSwSh_MaxLair_BossFinder.h"
-
-#include "Programs/TestPrograms/PokemonSwSh_ShinyEncounterTester.h"
-#include "InferenceTraining/PokemonSwSh_GenerateIVCheckerOCR.h"
-#include "InferenceTraining/PokemonSwSh_GenerateNameOCRPokedex.h"
-
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-
-PanelListFactory::PanelListFactory()
-    : PanelListDescriptor(Pokemon::STRING_POKEMON + " Sword and Shield")
-{}
-
-std::vector<PanelEntry> PanelListFactory::make_panels() const{
-    std::vector<PanelEntry> ret;
-
-    ret.emplace_back("---- Settings ----");
-    ret.emplace_back(make_settings<GameSettings_Descriptor, GameSettingsPanel>());
-
-    ret.emplace_back("---- QoL Macros ----");
-    ret.emplace_back(make_single_switch_program<FastCodeEntry_Descriptor, FastCodeEntry>());
-    ret.emplace_back(make_single_switch_program<FriendSearchDisconnect_Descriptor, FriendSearchDisconnect>());
-
-    ret.emplace_back("---- General ----");
-    ret.emplace_back(make_single_switch_program<MassRelease_Descriptor, MassRelease>());
-    ret.emplace_back(make_single_switch_program<SurpriseTrade_Descriptor, SurpriseTrade>());
-    ret.emplace_back(make_single_switch_program<TradeBot_Descriptor, TradeBot>());
-    ret.emplace_back(make_single_switch_program<ClothingBuyer_Descriptor, ClothingBuyer>());
-    ret.emplace_back(make_single_switch_program<BallThrower_Descriptor, BallThrower>());
-    ret.emplace_back(make_single_switch_program<AutonomousBallThrower_Descriptor, AutonomousBallThrower>());
-    ret.emplace_back(make_single_switch_program<DexRecFinder_Descriptor, DexRecFinder>());
-    ret.emplace_back(make_single_switch_program<BoxReorderNationalDex_Descriptor, BoxReorderNationalDex>());
-
-    ret.emplace_back("---- Date-Spam Farmers ----");
-    ret.emplace_back(make_single_switch_program<WattFarmer_Descriptor, WattFarmer>());
-    ret.emplace_back(make_single_switch_program<BerryFarmer_Descriptor, BerryFarmer>());
-//    if (PreloadSettings::instance().DEVELOPER_MODE){
-        ret.emplace_back(make_single_switch_program<BerryFarmer2_Descriptor, BerryFarmer2>());
-//    }
-    ret.emplace_back(make_single_switch_program<LotoFarmer_Descriptor, LotoFarmer>());
-    ret.emplace_back(make_single_switch_program<StowOnSideFarmer_Descriptor, StowOnSideFarmer>());
-    ret.emplace_back(make_single_switch_program<DailyHighlightFarmer_Descriptor, DailyHighlightFarmer>());
-    ret.emplace_back(make_single_switch_program<PokeJobsFarmer_Descriptor, PokeJobsFarmer>());
-
-    ret.emplace_back("---- Den Hunting ----");
-    ret.emplace_back(make_single_switch_program<BeamReset_Descriptor, BeamReset>());
-    ret.emplace_back(make_single_switch_program<PurpleBeamFinder_Descriptor, PurpleBeamFinder>());
-    ret.emplace_back(make_single_switch_program<EventBeamFinder_Descriptor, EventBeamFinder>());
-    ret.emplace_back(make_single_switch_program<DaySkipperJPN_Descriptor, DaySkipperJPN>());
-    ret.emplace_back(make_single_switch_program<DaySkipperEU_Descriptor, DaySkipperEU>());
-    ret.emplace_back(make_single_switch_program<DaySkipperUS_Descriptor, DaySkipperUS>());
-    ret.emplace_back(make_single_switch_program<DaySkipperJPN7p8k_Descriptor, DaySkipperJPN7p8k>());
-
-    ret.emplace_back("---- Hosting ----");
-    ret.emplace_back(make_single_switch_program<DenRoller_Descriptor, DenRoller>());
-    ret.emplace_back(make_single_switch_program<AutoHostRolling_Descriptor, AutoHostRolling>());
-    ret.emplace_back(make_single_switch_program<AutoHostMultiGame_Descriptor, AutoHostMultiGame>());
-
-    ret.emplace_back("---- Non-Shiny Hunting ----");
-    ret.emplace_back(make_single_switch_program<StatsReset_Descriptor, StatsReset>());
-    ret.emplace_back(make_single_switch_program<StatsResetCalyrex_Descriptor, StatsResetCalyrex>());
-    ret.emplace_back(make_single_switch_program<StatsResetMoltres_Descriptor, StatsResetMoltres>());
-    ret.emplace_back(make_single_switch_program<StatsResetRegi_Descriptor, StatsResetRegi>());
-
-    ret.emplace_back("---- Unattended Shiny Hunting ----");
-    ret.emplace_back(make_single_switch_program<MultiGameFossil_Descriptor, MultiGameFossil>());
-    ret.emplace_back(make_single_switch_program<ShinyHuntUnattendedRegi_Descriptor, ShinyHuntUnattendedRegi>());
-    ret.emplace_back(make_single_switch_program<ShinyHuntUnattendedSwordsOfJustice_Descriptor, ShinyHuntUnattendedSwordsOfJustice>());
-    ret.emplace_back(make_single_switch_program<ShinyHuntUnattendedStrongSpawn_Descriptor, ShinyHuntUnattendedStrongSpawn>());
-    ret.emplace_back(make_single_switch_program<ShinyHuntUnattendedRegigigas2_Descriptor, ShinyHuntUnattendedRegigigas2>());
-    ret.emplace_back(make_single_switch_program<ShinyHuntUnattendedIoATrade_Descriptor, ShinyHuntUnattendedIoATrade>());
-    ret.emplace_back(make_single_switch_program<CurryHunter_Descriptor, CurryHunter>());
-
-    ret.emplace_back("---- Autonomous Shiny Hunting ----");
-    ret.emplace_back(make_single_switch_program<ShinyHuntAutonomousRegi_Descriptor, ShinyHuntAutonomousRegi>());
-    ret.emplace_back(make_single_switch_program<ShinyHuntAutonomousSwordsOfJustice_Descriptor, ShinyHuntAutonomousSwordsOfJustice>());
-    ret.emplace_back(make_single_switch_program<ShinyHuntAutonomousStrongSpawn_Descriptor, ShinyHuntAutonomousStrongSpawn>());
-    ret.emplace_back(make_single_switch_program<ShinyHuntAutonomousRegigigas2_Descriptor, ShinyHuntAutonomousRegigigas2>());
-    ret.emplace_back(make_single_switch_program<ShinyHuntAutonomousIoATrade_Descriptor, ShinyHuntAutonomousIoATrade>());
-    ret.emplace_back(make_single_switch_program<ShinyHuntAutonomousBerryTree_Descriptor, ShinyHuntAutonomousBerryTree>());
-    ret.emplace_back(make_single_switch_program<ShinyHuntAutonomousWhistling_Descriptor, ShinyHuntAutonomousWhistling>());
-    ret.emplace_back(make_single_switch_program<ShinyHuntAutonomousFishing_Descriptor, ShinyHuntAutonomousFishing>());
-    ret.emplace_back(make_single_switch_program<ShinyHuntAutonomousOverworld_Descriptor, ShinyHuntAutonomousOverworld>());
-
-    ret.emplace_back("---- Eggs ----");
-    ret.emplace_back(make_single_switch_program<EggFetcher2_Descriptor, EggFetcher2>());
-    ret.emplace_back(make_single_switch_program<EggFetcherMultiple_Descriptor, EggFetcherMultiple>());
-    ret.emplace_back(make_single_switch_program<EggHatcher_Descriptor, EggHatcher>());
-    ret.emplace_back(make_single_switch_program<EggCombined2_Descriptor, EggCombined2>());
-    ret.emplace_back(make_single_switch_program<EggSuperCombined2_Descriptor, EggSuperCombined2>());
-//    if (PreloadSettings::instance().DEVELOPER_MODE){
-        ret.emplace_back(make_single_switch_program<EggAutonomous_Descriptor, EggAutonomous>());
-//    }
-    ret.emplace_back(make_single_switch_program<GodEggItemDupe_Descriptor, GodEggItemDupe>());
-    if (PreloadSettings::instance().NAUGHTY_MODE){
-        ret.emplace_back(make_single_switch_program<GodEggDuplication_Descriptor, GodEggDuplication>());
-    }
-
-//    if (PreloadSettings::instance().DEVELOPER_MODE){
-        ret.emplace_back("---- RNG ----");
-        ret.emplace_back(make_single_switch_program<SeedFinder_Descriptor, SeedFinder>());
-        ret.emplace_back(make_single_switch_program<CramomaticRNG_Descriptor, CramomaticRNG>());
-//    }
-
-    ret.emplace_back("---- Multi-Switch Programs ----");
-    ret.emplace_back(make_multi_switch_program<SynchronizedSpinning_Descriptor, SynchronizedSpinning>());
-    ret.emplace_back(make_multi_switch_program<RaidItemFarmerOHKO_Descriptor, RaidItemFarmerOHKO>());
-
-    ret.emplace_back("---- Auto Max Lair 2.0 ----");
-    ret.emplace_back(make_multi_switch_program<MaxLairStandard_Descriptor, MaxLairStandard>());
-    ret.emplace_back(make_multi_switch_program<MaxLairStrongBoss_Descriptor, MaxLairStrongBoss>());
-    ret.emplace_back(make_multi_switch_program<MaxLairBossFinder_Descriptor, MaxLairBossFinder>());
-
-    if (PreloadSettings::instance().DEVELOPER_MODE){
-        ret.emplace_back("---- Developer Tools ----");
-        ret.emplace_back(make_single_switch_program<ShinyEncounterTester_Descriptor, ShinyEncounterTester>());
-        ret.emplace_back(make_single_switch_program<GenerateIVCheckerOCR_Descriptor, GenerateIVCheckerOCR>());
-        ret.emplace_back(make_single_switch_program<GenerateNameOCRDataPokedex_Descriptor, GenerateNameOCRDataPokedex>());
-    }
-
-    return ret;
-}
-
-
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSwSh/PokemonSwSh_Panels.h b/SerialPrograms/Source/PokemonSwSh/PokemonSwSh_Panels.h
deleted file mode 100644
index b92d952ffc..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/PokemonSwSh_Panels.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*  Pokemon Sword/Shield Panels
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwordShieldPanels_H
-#define PokemonAutomation_PokemonSwordShieldPanels_H
-
-#include "CommonFramework/Panels/PanelList.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-
-class PanelListFactory : public PanelListDescriptor{
-public:
-    PanelListFactory();
-    virtual std::vector<PanelEntry> make_panels() const;
-};
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/PokemonSwSh_Settings.cpp b/SerialPrograms/Source/PokemonSwSh/PokemonSwSh_Settings.cpp
deleted file mode 100644
index afb03e74a0..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/PokemonSwSh_Settings.cpp
+++ /dev/null
@@ -1,351 +0,0 @@
-/*  Pokemon Sword/Shield Settings
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-#include "CommonFramework/Globals.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonSwSh_Settings.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-    using namespace Pokemon;
-
-
-
-GameSettings& GameSettings::instance(){
-    static GameSettings settings;
-    return settings;
-}
-GameSettings::GameSettings()
-    : BatchOption(LockWhileRunning::LOCKED)
-    , m_egg_options("<font size=4><b>Egg Options:</b></font>")
-    , AUTO_DEPOSIT(
-        "<b>Auto-Deposit:</b><br>true = Send " + STRING_POKEMON + " to boxes is \"Automatic\".<br>false = Send " + STRING_POKEMON + " to boxes is \"Manual\".",
-        LockWhileRunning::LOCKED,
-        true
-    )
-    , EGG_FETCH_EXTRA_LINE(
-        "<b>Egg Fetch Extra Line:</b><br>true = The daycare lady has an extra line of text in Japanese. Set this to true if you are running any of the egg programs in a Japanese game.",
-        LockWhileRunning::LOCKED,
-        false
-    )
-    , FETCH_EGG_MASH_DELAY(
-        "<b>Fetch Egg Mash Delay:</b><br>Time needed to mash B to fetch an egg and return to overworld when auto-deposit is on.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "800"
-    )
-    , m_den_options("<font size=4><b>Den Options:</b></font>")
-    , DODGE_UNCATCHABLE_PROMPT_FAST(
-        "<b>Dodge Uncatchable Prompt Fast:</b><br>Which method to use to bypass the uncatchable " + STRING_POKEMON + " prompt?<br>true = Use a fast (but potentially unreliable) method.<br>false = Use a slower (by about 5 seconds) method.",
-        LockWhileRunning::LOCKED,
-        false
-    )
-    , m_advanced_options("<font size=5><b>Advanced Options:</b></font> You shouldn't need to touch anything below here.")
-    , m_general_options("<font size=4><b>General Timings:</b></font>")
-    , AUTO_FR_DURATION(
-        "<b>Auto-FR Duration:</b><br>Time to accept FRs before returning to den lobby.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "8 * TICKS_PER_SECOND"
-    )
-    , m_menu_navigation("<font size=4><b>Menu Navigation Timings:</b></font>")
-    , OVERWORLD_TO_MENU_DELAY(
-        "<b>Overworld to Menu Delay:</b><br>Delay to bring up the menu when pressing X in the overworld.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "120"
-    )
-    , MENU_TO_OVERWORLD_DELAY(
-        "<b>Menu to Overworld Delay:</b><br>Delay to go from menu back to overworld.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "250"
-    )
-    , GAME_TO_HOME_DELAY_FAST(
-        "<b>Game to Home Delay (fast):</b><br>"
-        "Delay from pressing home to entering the the Switch home menu. This affects the speed of date-spamming programs.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "100"
-    )
-    , GAME_TO_HOME_DELAY_SAFE(
-        "<b>Game to Home Delay (safe):</b><br>"
-        "Delay from pressing home to entering the the Switch home menu. This affects the speed of date-spamming programs.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "125"
-    )
-    , HOME_TO_GAME_DELAY(
-        "<b>Home to Game Delay:</b><br>Delay to enter game from home menu.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "3 * TICKS_PER_SECOND"
-    )
-    , OPEN_YCOMM_DELAY(
-        "<b>Open Y-COMM Delay:</b><br>Time needed to open Y-COMM.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "200"
-    )
-    , ENTER_PROFILE_DELAY(
-        "<b>Enter Profile Delay:</b><br>Delay to enter your Switch profile.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "2 * TICKS_PER_SECOND"
-    )
-    , m_start_game_timings("<font size=4><b>Start Game Timings:</b></font>")
-    , START_GAME_MASH(
-        "<b>1. Start Game Mash:</b><br>Mash A for this long to start the game.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "2 * TICKS_PER_SECOND"
-    )
-    , START_GAME_WAIT(
-        "<b>2. Start Game Wait:</b><br>Wait this long for the game to load.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "20 * TICKS_PER_SECOND"
-    )
-    , ENTER_GAME_MASH(
-        "<b>3. Enter Game Mash:</b><br>Mash A for this long to enter the game.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "3 * TICKS_PER_SECOND"
-    )
-    , ENTER_GAME_WAIT(
-        "<b>4. Enter Game Wait:</b><br>Wait this long for the game to enter the overworld.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "11 * TICKS_PER_SECOND"
-    )
-    , m_den_timings("<font size=4><b>Den Timings:</b></font>")
-    , ENTER_OFFLINE_DEN_DELAY(
-        "<b>Enter Offline Game Delay:</b><br>Time needed to enter a den on final button press.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "125"
-    )
-    , REENTER_DEN_DELAY(
-        "<b>Re-enter Den Delay:</b><br>Time from exiting den after a day-skip to when you can collect watts and re-enter it.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "5 * TICKS_PER_SECOND"
-    )
-    , COLLECT_WATTS_OFFLINE_DELAY(
-        "<b>Collect Watts Delay (offline):</b>",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "80"
-    )
-    , COLLECT_WATTS_ONLINE_DELAY(
-        "<b>Collect Watts Delay (online):</b>",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "3 * TICKS_PER_SECOND"
-    )
-    , UNCATCHABLE_PROMPT_DELAY(
-        "<b>Uncatchable Prompt Delay:</b><br>Time needed to bypass uncatchable pokemon prompt.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "110"
-    )
-    , OPEN_LOCAL_DEN_LOBBY_DELAY(
-        "<b>Open Local Den Lobby Delay:</b><br>Time needed to open a den lobby on local connection.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "3 * TICKS_PER_SECOND"
-    )
-    , ENTER_SWITCH_POKEMON(
-        "<b>Enter Switch " + STRING_POKEMON + ":</b><br>Time needed to enter Switch " + STRING_POKEMON + ".",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "4 * TICKS_PER_SECOND"
-    )
-    , EXIT_SWITCH_POKEMON(
-        "<b>Exit Switch " + STRING_POKEMON + ":</b><br>Time needed to exit Switch " + STRING_POKEMON + " back to den lobby.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "3 * TICKS_PER_SECOND"
-    )
-    , FULL_LOBBY_TIMER(
-        "<b>Full Lobby Timer:</b><br>Always 3 minutes.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "180 * TICKS_PER_SECOND"
-    )
-    , m_box_timings("<font size=4><b>Box Timings:</b></font> (for egg programs)")
-    , BOX_SCROLL_DELAY(
-        "<b>Box Scroll Delay:</b><br>Delay to move the cursor.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "20"
-    )
-    , BOX_CHANGE_DELAY(
-        "<b>Box Change Delay:</b><br>Delay to change boxes.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "80"
-    )
-    , BOX_PICKUP_DROP_DELAY(
-        "<b>Box Pickup/Drop Delay:</b><br>Delay to pickup/drop " + STRING_POKEMON + ".",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "90"
-    )
-    , MENU_TO_POKEMON_DELAY(
-        "<b>Menu To " + STRING_POKEMON + " Delay:</b><br>Delay to enter " + STRING_POKEMON + " menu.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "300"
-    )
-    , POKEMON_TO_BOX_DELAY(
-        "<b>" + STRING_POKEMON + " to Box Delay:</b><br>Delay to enter box system.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "300"
-    )
-    , BOX_TO_POKEMON_DELAY(
-        "<b>Box to " + STRING_POKEMON + " Delay:</b><br>Delay to exit box system.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "250"
-    )
-    , POKEMON_TO_MENU_DELAY(
-        "<b>" + STRING_POKEMON + " to Menu Delay:</b><br>Delay to return to menu.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "250"
-    )
-    , m_shiny_detection("<font size=4><b>Shiny Detection:</b></font>")
-    , SHINY_ALPHA_THRESHOLD(
-        "<b>Shiny Threshold:</b><br>Threshold to detect a shiny encounter.",
-        LockWhileRunning::LOCKED,
-        2.0, 0
-    )
-    , BALL_SPARKLE_ALPHA(
-        "<b>Ball Sparkle Alpha:</b>",
-        LockWhileRunning::LOCKED,
-        0.4, 0
-    )
-    , STAR_SPARKLE_ALPHA(
-        "<b>Star Sparkle Alpha:</b>",
-        LockWhileRunning::LOCKED,
-        0.5, 0
-    )
-    , SQUARE_SPARKLE_ALPHA(
-        "<b>Ball Sparkle Alpha:</b>",
-        LockWhileRunning::LOCKED,
-        0.3, 0
-    )
-    , LINE_SPARKLE_ALPHA(
-        "<b>Star Sparkle Alpha:</b>",
-        LockWhileRunning::LOCKED,
-        0.3, 0
-    )
-    , SHINY_DIALOG_ALPHA(
-        "<b>Shiny Dialog Alpha:</b>",
-        LockWhileRunning::LOCKED,
-        1.2, 0
-    )
-//    , m_experimental("<font size=4><b>Experimental/Beta Features:</b></font>")
-{
-    PA_ADD_STATIC(m_egg_options);
-    PA_ADD_OPTION(AUTO_DEPOSIT);
-    PA_ADD_OPTION(EGG_FETCH_EXTRA_LINE);
-    PA_ADD_OPTION(FETCH_EGG_MASH_DELAY);
-
-    PA_ADD_STATIC(m_den_options);
-    PA_ADD_OPTION(DODGE_UNCATCHABLE_PROMPT_FAST);
-
-    PA_ADD_STATIC(m_advanced_options);
-
-    PA_ADD_STATIC(m_general_options);
-    PA_ADD_OPTION(AUTO_FR_DURATION);
-
-    PA_ADD_STATIC(m_menu_navigation);
-    PA_ADD_OPTION(OVERWORLD_TO_MENU_DELAY);
-    PA_ADD_OPTION(MENU_TO_OVERWORLD_DELAY);
-    PA_ADD_OPTION(GAME_TO_HOME_DELAY_FAST);
-    PA_ADD_OPTION(GAME_TO_HOME_DELAY_SAFE);
-    PA_ADD_OPTION(HOME_TO_GAME_DELAY);
-    PA_ADD_OPTION(OPEN_YCOMM_DELAY);
-    PA_ADD_OPTION(ENTER_PROFILE_DELAY);
-
-    PA_ADD_STATIC(m_start_game_timings);
-    PA_ADD_OPTION(START_GAME_MASH);
-    PA_ADD_OPTION(START_GAME_WAIT);
-    PA_ADD_OPTION(ENTER_GAME_MASH);
-    PA_ADD_OPTION(ENTER_GAME_WAIT);
-
-    PA_ADD_STATIC(m_den_timings);
-    PA_ADD_OPTION(ENTER_OFFLINE_DEN_DELAY);
-    PA_ADD_OPTION(REENTER_DEN_DELAY);
-    PA_ADD_OPTION(COLLECT_WATTS_OFFLINE_DELAY);
-    PA_ADD_OPTION(COLLECT_WATTS_ONLINE_DELAY);
-    PA_ADD_OPTION(UNCATCHABLE_PROMPT_DELAY);
-    PA_ADD_OPTION(OPEN_LOCAL_DEN_LOBBY_DELAY);
-    PA_ADD_OPTION(ENTER_SWITCH_POKEMON);
-    PA_ADD_OPTION(EXIT_SWITCH_POKEMON);
-    PA_ADD_OPTION(FULL_LOBBY_TIMER);
-
-    PA_ADD_STATIC(m_box_timings);
-    PA_ADD_OPTION(BOX_SCROLL_DELAY);
-    PA_ADD_OPTION(BOX_CHANGE_DELAY);
-    PA_ADD_OPTION(BOX_PICKUP_DROP_DELAY);
-    PA_ADD_OPTION(MENU_TO_POKEMON_DELAY);
-    PA_ADD_OPTION(POKEMON_TO_BOX_DELAY);
-    PA_ADD_OPTION(BOX_TO_POKEMON_DELAY);
-    PA_ADD_OPTION(POKEMON_TO_MENU_DELAY);
-
-    PA_ADD_STATIC(m_shiny_detection);
-    PA_ADD_OPTION(SHINY_ALPHA_THRESHOLD);
-    PA_ADD_OPTION(BALL_SPARKLE_ALPHA);
-    PA_ADD_OPTION(STAR_SPARKLE_ALPHA);
-    PA_ADD_OPTION(SQUARE_SPARKLE_ALPHA);
-    PA_ADD_OPTION(LINE_SPARKLE_ALPHA);
-    PA_ADD_OPTION(SHINY_DIALOG_ALPHA);
-
-//    PA_ADD_STATIC(m_experimental);
-}
-
-
-
-
-
-GameSettings_Descriptor::GameSettings_Descriptor()
-    : PanelDescriptor(
-        Color(),
-        "PokemonSwSh:GlobalSettings",
-        STRING_POKEMON + " SwSh", STRING_POKEMON + " Settings",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonSwSh/PokemonSettings.md",
-        "Global " + STRING_POKEMON + " Settings"
-    )
-{}
-
-
-
-GameSettingsPanel::GameSettingsPanel(const GameSettings_Descriptor& descriptor)
-    : SettingsPanelInstance(descriptor)
-    , settings(GameSettings::instance())
-{
-    PA_ADD_OPTION(settings);
-}
-
-
-
-
-
-}
-}
-}
-
-
-
-
-
-
diff --git a/SerialPrograms/Source/PokemonSwSh/PokemonSwSh_Settings.h b/SerialPrograms/Source/PokemonSwSh/PokemonSwSh_Settings.h
deleted file mode 100644
index 08c5e8141c..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/PokemonSwSh_Settings.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/*  Pokemon Sword/Shield Settings
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_Settings_H
-#define PokemonAutomation_PokemonSwSh_Settings_H
-
-#include "Common/Cpp/Options/StaticTextOption.h"
-#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
-#include "Common/Cpp/Options/FloatingPointOption.h"
-#include "Common/Cpp/Options/TimeExpressionOption.h"
-#include "CommonFramework/Panels/SettingsPanel.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-class GameSettings : public BatchOption{
-    GameSettings();
-public:
-    static GameSettings& instance();
-
-    SectionDividerOption m_egg_options;
-    BooleanCheckBoxOption AUTO_DEPOSIT;
-    BooleanCheckBoxOption EGG_FETCH_EXTRA_LINE;
-    TimeExpressionOption<uint16_t> FETCH_EGG_MASH_DELAY;
-
-    SectionDividerOption m_den_options;
-    BooleanCheckBoxOption DODGE_UNCATCHABLE_PROMPT_FAST;
-
-    SectionDividerOption m_advanced_options;
-
-    SectionDividerOption m_general_options;
-    TimeExpressionOption<uint16_t> AUTO_FR_DURATION;
-
-    SectionDividerOption m_menu_navigation;
-    TimeExpressionOption<uint16_t> OVERWORLD_TO_MENU_DELAY;
-    TimeExpressionOption<uint16_t> MENU_TO_OVERWORLD_DELAY;
-    TimeExpressionOption<uint16_t> GAME_TO_HOME_DELAY_FAST;
-    TimeExpressionOption<uint16_t> GAME_TO_HOME_DELAY_SAFE;
-    TimeExpressionOption<uint16_t> HOME_TO_GAME_DELAY;
-    TimeExpressionOption<uint16_t> OPEN_YCOMM_DELAY;
-    TimeExpressionOption<uint16_t> ENTER_PROFILE_DELAY;
-
-    SectionDividerOption m_start_game_timings;
-    TimeExpressionOption<uint16_t> START_GAME_MASH;
-    TimeExpressionOption<uint16_t> START_GAME_WAIT;
-    TimeExpressionOption<uint16_t> ENTER_GAME_MASH;
-    TimeExpressionOption<uint16_t> ENTER_GAME_WAIT;
-
-    SectionDividerOption m_den_timings;
-    TimeExpressionOption<uint16_t> ENTER_OFFLINE_DEN_DELAY;
-    TimeExpressionOption<uint16_t> REENTER_DEN_DELAY;
-    TimeExpressionOption<uint16_t> COLLECT_WATTS_OFFLINE_DELAY;
-    TimeExpressionOption<uint16_t> COLLECT_WATTS_ONLINE_DELAY;
-    TimeExpressionOption<uint16_t> UNCATCHABLE_PROMPT_DELAY;
-    TimeExpressionOption<uint16_t> OPEN_LOCAL_DEN_LOBBY_DELAY;
-    TimeExpressionOption<uint16_t> ENTER_SWITCH_POKEMON;
-    TimeExpressionOption<uint16_t> EXIT_SWITCH_POKEMON;
-    TimeExpressionOption<uint16_t> FULL_LOBBY_TIMER;
-
-    SectionDividerOption m_box_timings;
-    TimeExpressionOption<uint16_t> BOX_SCROLL_DELAY;
-    TimeExpressionOption<uint16_t> BOX_CHANGE_DELAY;
-    TimeExpressionOption<uint16_t> BOX_PICKUP_DROP_DELAY;
-    TimeExpressionOption<uint16_t> MENU_TO_POKEMON_DELAY;
-    TimeExpressionOption<uint16_t> POKEMON_TO_BOX_DELAY;
-    TimeExpressionOption<uint16_t> BOX_TO_POKEMON_DELAY;
-    TimeExpressionOption<uint16_t> POKEMON_TO_MENU_DELAY;
-
-    SectionDividerOption m_shiny_detection;
-    FloatingPointOption SHINY_ALPHA_THRESHOLD;
-
-    FloatingPointOption BALL_SPARKLE_ALPHA;
-    FloatingPointOption STAR_SPARKLE_ALPHA;
-    FloatingPointOption SQUARE_SPARKLE_ALPHA;
-    FloatingPointOption LINE_SPARKLE_ALPHA;
-
-    FloatingPointOption SHINY_DIALOG_ALPHA;
-};
-
-
-
-
-class GameSettings_Descriptor : public PanelDescriptor{
-public:
-    GameSettings_Descriptor();
-};
-
-
-class GameSettingsPanel : public SettingsPanelInstance{
-public:
-    GameSettingsPanel(const GameSettings_Descriptor& descriptor);
-private:
-    GameSettings& settings;
-};
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-BerryFarmer.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-BerryFarmer.cpp
deleted file mode 100644
index 565f2e1e99..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-BerryFarmer.cpp
+++ /dev/null
@@ -1,95 +0,0 @@
-/*  Berry Farmer
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Cpp/PrettyPrint.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Device.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonSwSh/PokemonSwSh_Settings.h"
-#include "PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.h"
-#include "PokemonSwSh_DateSpam-BerryFarmer.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-    using namespace Pokemon;
-
-
-BerryFarmer_Descriptor::BerryFarmer_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonSwSh:BerryFarmer",
-        STRING_POKEMON + " SwSh", "Date Spam - Berry Farmer",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonSwSh/DateSpam-BerryFarmer.md",
-        "Farm berries.",
-        FeedbackType::NONE,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-
-
-
-BerryFarmer::BerryFarmer()
-    : SKIPS(
-        "<b>Number of Fetch Attempts:</b>",
-        LockWhileRunning::LOCKED,
-        100000
-    )
-    , SAVE_ITERATIONS(
-        "<b>Save Every this Many Fetches:</b><br>(zero disables saving): ",
-        LockWhileRunning::LOCKED,
-        0
-    )
-{
-    PA_ADD_OPTION(START_LOCATION);
-    PA_ADD_OPTION(SKIPS);
-    PA_ADD_OPTION(SAVE_ITERATIONS);
-}
-
-void BerryFarmer::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    if (START_LOCATION.start_in_grip_menu()){
-        grip_menu_connect_go_home(context);
-    }else{
-        pbf_press_button(context, BUTTON_B, 5, 5);
-        pbf_press_button(context, BUTTON_HOME, 10, GameSettings::instance().GAME_TO_HOME_DELAY_FAST);
-    }
-
-    uint8_t year = MAX_YEAR;
-    uint16_t save_count = 0;
-    for (uint32_t c = 0; c < SKIPS; c++){
-        env.log("Fetch Attempts: " + tostr_u_commas(c));
-
-        home_roll_date_enter_game_autorollback(env.console, context, year);
-        pbf_mash_button(context, BUTTON_B, 90);
-
-        pbf_press_button(context, BUTTON_A, 10, 10);
-        pbf_mash_button(context, BUTTON_ZL, 385);
-        pbf_mash_button(context, BUTTON_B, 600);
-
-        if (SAVE_ITERATIONS != 0){
-            save_count++;
-            if (save_count >= SAVE_ITERATIONS){
-                save_count = 0;
-                pbf_mash_button(context, BUTTON_B, 2 * TICKS_PER_SECOND);
-                pbf_press_button(context, BUTTON_X, 20, GameSettings::instance().OVERWORLD_TO_MENU_DELAY);
-                pbf_press_button(context, BUTTON_R, 20, 2 * TICKS_PER_SECOND);
-                pbf_press_button(context, BUTTON_ZL, 20, 3 * TICKS_PER_SECOND);
-            }
-        }
-
-        //  Tap HOME and quickly spam B. The B spamming ensures that we don't
-        //  accidentally update the system if the system update window pops up.
-        pbf_press_button(context, BUTTON_HOME, 10, 5);
-        pbf_mash_button(context, BUTTON_B, GameSettings::instance().GAME_TO_HOME_DELAY_FAST - 15);
-    }
-}
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-BerryFarmer.h b/SerialPrograms/Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-BerryFarmer.h
deleted file mode 100644
index ec7392bf98..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-BerryFarmer.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*  Berry Farmer
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_BerryFarmer_H
-#define PokemonAutomation_PokemonSwSh_BerryFarmer_H
-
-#include "Common/Cpp/Options/SimpleIntegerOption.h"
-#include "NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-class BerryFarmer_Descriptor : public SingleSwitchProgramDescriptor{
-public:
-    BerryFarmer_Descriptor();
-};
-
-
-
-class BerryFarmer : public SingleSwitchProgramInstance{
-public:
-    BerryFarmer();
-
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-    StartInGripOrGameOption START_LOCATION;
-
-    SimpleIntegerOption<uint32_t> SKIPS;
-    SimpleIntegerOption<uint16_t> SAVE_ITERATIONS;
-};
-
-
-}
-}
-}
-#endif
-
-
-
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-BerryFarmer2.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-BerryFarmer2.cpp
deleted file mode 100644
index af384ed511..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-BerryFarmer2.cpp
+++ /dev/null
@@ -1,357 +0,0 @@
-/*  Berry Farmer 2
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Cpp/Exceptions.h"
-#include "Common/Cpp/PrettyPrint.h"
-#include "Common/Cpp/Time.h"
-#include "CommonFramework/Exceptions/ProgramFinishedException.h"
-#include "CommonFramework/Options/Environment/ThemeSelectorOption.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonSwSh/PokemonSwSh_Settings.h"
-#include "PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.h"
-#include "PokemonSwSh/Inference/Battles/PokemonSwSh_BattleMenuDetector.h"
-#include "PokemonSwSh/Inference/Battles/PokemonSwSh_StartBattleDetector.h"
-#include "PokemonSwSh/Inference/Sounds/PokemonSwSh_BerryTreeRustlingSoundDetector.h"
-#include "PokemonSwSh/Programs/PokemonSwSh_EncounterHandler.h"
-#include "PokemonSwSh_DateSpam-BerryFarmer2.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-    using namespace Pokemon;
-
-
-BerryFarmer2_Descriptor::BerryFarmer2_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonSwSh:BerryFarmer2",
-        STRING_POKEMON + " SwSh", "Date Spam - Berry Farmer 2",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonSwSh/DateSpam-BerryFarmer2.md",
-        "Farm berries using Feedback.",
-        FeedbackType::REQUIRED,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-
-class BerryFarmer2_Descriptor::Stats : public ShinyHuntTracker{
-public:
-    Stats()
-        : ShinyHuntTracker(true)
-        , days(m_stats["Days"])
-        , shakes(m_stats["Shakes"])
-    {
-        m_display_order.insert(m_display_order.begin() + 0, Stat("Days"));
-        m_display_order.insert(m_display_order.begin() + 1, Stat("Shakes"));
-    }
-
-public:
-    std::atomic<uint64_t>& days;
-    std::atomic<uint64_t>& shakes;
-};
-std::unique_ptr<StatsTracker> BerryFarmer2_Descriptor::make_stats() const{
-    return std::unique_ptr<StatsTracker>(new Stats());
-}
-
-
-
-BerryFarmer2::BerryFarmer2()
-    : REQUIRES_AUDIO(
-        html_color_text(
-            "<font size=4><b>Rustling detection uses sound. Make sure you have the correct audio input set.</b></font>",
-            COLOR_BLUE
-        )
-    )
-    , FETCH_ATTEMPTS(
-        "<b>Number of Fetch Attempts:</b>",
-        LockWhileRunning::LOCKED,
-        100000
-    )
-    , SAVE_ITERATIONS(
-        "<b>Save Every this Many Fetches:</b><br>(zero disables saving): ",
-        LockWhileRunning::LOCKED,
-        0
-    )
-    , ENCOUNTER_BOT_OPTIONS(false, true)
-    , NOTIFICATIONS({
-        &ENCOUNTER_BOT_OPTIONS.NOTIFICATION_NONSHINY,
-        &ENCOUNTER_BOT_OPTIONS.NOTIFICATION_SHINY,
-        &ENCOUNTER_BOT_OPTIONS.NOTIFICATION_CATCH_SUCCESS,
-        &ENCOUNTER_BOT_OPTIONS.NOTIFICATION_CATCH_FAILED,
-        &NOTIFICATION_PROGRAM_FINISH,
-        &NOTIFICATION_ERROR_FATAL,
-    })
-    , m_advanced_options(
-        "<font size=4><b>Advanced Options:</b> You should not need to touch anything below here.</font>"
-    )
-    , EXIT_BATTLE_TIMEOUT(
-        "<b>Exit Battle Timeout:</b><br>After running, wait this long to return to overworld.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "10 * TICKS_PER_SECOND"
-    )
-    , START_BATTLE_TIMEOUT(
-        "<b>Start Battle Timeout:</b><br>After a battle is detected, wait this long to flee in seconds.",
-        LockWhileRunning::LOCKED,
-        15
-    )
-    , RUSTLING_INTERVAL(
-        "<b>Rustling Interval:</b><br>How much time between two rustling sounds has to pass to be considered slow rustling in ms.",
-        LockWhileRunning::LOCKED,
-        1350
-    )
-    , RUSTLING_TIMEOUT(
-        "<b>Rustling Timeout:</b><br>Wait this many ticks to detect rustling.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "400"
-    )
-    , SECONDARY_ATTEMPT_MASH_TIME(
-        "<b>Secondary attempt mash time:</b><br>Mash ZL this many ticks for secondary fetch attempts.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "240"
-    )
-    , SOUND_THRESHOLD(
-        "<b>Maximum Sound Error Coefficient",
-        LockWhileRunning::LOCKED,
-        0.68, 0, 1.0
-    )
-{
-    PA_ADD_OPTION(REQUIRES_AUDIO);
-    PA_ADD_OPTION(START_LOCATION);
-    PA_ADD_OPTION(FETCH_ATTEMPTS);
-    PA_ADD_OPTION(SAVE_ITERATIONS);
-
-    PA_ADD_OPTION(LANGUAGE);
-    PA_ADD_OPTION(ENCOUNTER_BOT_OPTIONS);
-    PA_ADD_OPTION(NOTIFICATIONS);
-
-    PA_ADD_STATIC(m_advanced_options);
-    PA_ADD_OPTION(EXIT_BATTLE_TIMEOUT);
-    PA_ADD_OPTION(START_BATTLE_TIMEOUT);
-    PA_ADD_OPTION(RUSTLING_INTERVAL);
-    PA_ADD_OPTION(RUSTLING_TIMEOUT);
-    PA_ADD_OPTION(SECONDARY_ATTEMPT_MASH_TIME);
-    PA_ADD_OPTION(SOUND_THRESHOLD);
-}
-
-
-BerryFarmer2::Rustling BerryFarmer2::check_rustling(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    BerryFarmer2_Descriptor::Stats& stats = env.current_stats<BerryFarmer2_Descriptor::Stats>();
-
-    // wait some time in order to not detect rustling from previous fetch attempt
-    pbf_wait(context, 80);
-    context.wait_for_all_requests();
-
-    BerryTreeRustlingSoundDetector initial_rustling_detector(
-        env.console, [&](float error_coefficient) -> bool {
-            //  Warning: This callback will be run from a different thread than this function.
-            return true;
-        },
-        (float)SOUND_THRESHOLD
-    );
-
-    BerryTreeRustlingSoundDetector secondary_rustling_detector(
-        env.console, [&](float error_coefficient) -> bool {
-            //  Warning: This callback will be run from a different thread than this function.
-            return true;
-        },
-        (float)SOUND_THRESHOLD
-    );
-
-    StandardBattleMenuWatcher battle_menu_detector(false);
-    StartBattleWatcher start_battle_detector;
-
-    Rustling result = Rustling::No;
-    int ret = run_until(
-        env.console, context,
-        [&](BotBaseContext& context){
-            pbf_wait(context, RUSTLING_TIMEOUT);
-            context.wait_for_all_requests();
-        },
-        { {initial_rustling_detector}, {battle_menu_detector}, {start_battle_detector} }
-    );
-    switch (ret){
-    case 0:{
-        env.console.log("BerryFarmer: Initial Rustling detected.");
-        WallClock initial_rustling_time = current_time();
-        result = Rustling::Slow;
-
-        int ret1 = run_until(
-            env.console, context,
-            [&](BotBaseContext& context) {
-                pbf_wait(context, RUSTLING_TIMEOUT);
-                context.wait_for_all_requests();
-            },
-            { {secondary_rustling_detector} }
-        );
-
-        if (ret1 == 0){
-            env.console.log("BerryFarmer: Secondary Rustling detected.");
-            WallClock secondary_rustling_time = current_time();
-            if (std::chrono::duration_cast<Milliseconds>(secondary_rustling_time - initial_rustling_time).count() <= RUSTLING_INTERVAL){
-                result = Rustling::Fast;
-            }
-        }
-        break;
-    }
-    case 1:
-        env.log("Unexpected battle menu.", COLOR_RED);
-        stats.add_error();
-        env.update_stats();
-        pbf_mash_button(context, BUTTON_B, TICKS_PER_SECOND);
-        run_away(env.console, context, EXIT_BATTLE_TIMEOUT);
-        result = Rustling::Battle;
-        break;
-    case 2:{
-        env.console.log("BerryFarmer: Battle Start detected.");
-//        wait_until(env.console, context, std::chrono::seconds(START_BATTLE_TIMEOUT), { battle_menu_detector });
-
-        //  Detect shiny.
-        ShinyDetectionResult encounter_result = detect_shiny_battle(
-            env.console, context,
-            SHINY_BATTLE_REGULAR,
-            std::chrono::seconds(30)
-        );
-
-        StandardEncounterHandler handler(
-            env, env.console, context,
-            LANGUAGE,
-            ENCOUNTER_BOT_OPTIONS,
-            stats
-        );
-
-        bool stop = handler.handle_standard_encounter_end_battle(encounter_result, EXIT_BATTLE_TIMEOUT);
-        if (stop){
-            throw ProgramFinishedException();
-        }
-
-        result = Rustling::Battle;
-        break;
-    }
-    default:
-        result = Rustling::No;
-    }
-        
-    context.wait_for_all_requests();
-    return result;
-}
-
-uint16_t BerryFarmer2::do_secondary_attempts(SingleSwitchProgramEnvironment& env, BotBaseContext& context, Rustling rustling){
-    BerryFarmer2_Descriptor::Stats& stats = env.current_stats<BerryFarmer2_Descriptor::Stats>();
-
-    uint8_t no_rustling = (rustling == Rustling::No) ? 1 : 0;
-    Rustling current_rustling = rustling;
-    uint16_t attempts = 0;
-
-    while ((current_rustling == Rustling::Slow || current_rustling == Rustling::No) && no_rustling < 3) { 
-        /* Slow or No rustling, not in Battle! */
-        pbf_mash_button(context, BUTTON_ZL, 240);
-        pbf_mash_button(context, BUTTON_B, 10);
-        attempts++;
-        stats.shakes++;
-
-        current_rustling = check_rustling(env, context);
-
-        if (current_rustling == Rustling::No) {
-            no_rustling++;
-        }
-    }
-    /* Fast rustling, in Battle or too many times No rustling */
-    if (no_rustling >= 3) {
-        return attempts;
-    }
-    if (current_rustling == Rustling::Fast) {
-        // this is the last tree interaction for this time skip
-        pbf_mash_button(context, BUTTON_ZL, SECONDARY_ATTEMPT_MASH_TIME);
-        pbf_mash_button(context, BUTTON_B, 10);
-        attempts++;
-        stats.shakes++;
-        current_rustling = check_rustling(env, context);
-    }
-    if (current_rustling == Rustling::Battle) {
-        pbf_mash_button(context, BUTTON_B, TICKS_PER_SECOND);
-        env.console.log("Clearing dialog boxes...");
-//        run_away(env.console, context, EXIT_BATTLE_TIMEOUT);
-//        context.wait_for_all_requests();
-    }
-    return attempts;
-}
-
-void BerryFarmer2::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    if (START_LOCATION.start_in_grip_menu()){
-        grip_menu_connect_go_home(context);
-    }else {
-        pbf_press_button(context, BUTTON_B, 5, 5);
-        pbf_press_button(context, BUTTON_HOME, 10, GameSettings::instance().GAME_TO_HOME_DELAY_FAST);
-    }
-
-    BerryFarmer2_Descriptor::Stats& stats = env.current_stats<BerryFarmer2_Descriptor::Stats>();
-
-    uint8_t year = MAX_YEAR;
-    uint16_t save_count = 0;
-    uint32_t c = 0;
-    while (c < FETCH_ATTEMPTS){
-        env.update_stats();
-        uint16_t iteration_attempts = 1;
-        env.log("Fetch Attempts: " + tostr_u_commas(c));
-        
-        home_roll_date_enter_game_autorollback(env.console, context, year);
-        stats.days++;
-        // Interact with the tree
-        pbf_mash_button(context, BUTTON_ZL, 375);
-        pbf_mash_button(context, BUTTON_B, 10);
-        stats.shakes++;
-
-        // Rustling after the first fetch attempt
-        Rustling current_rustling = check_rustling(env, context);
-        
-        switch (current_rustling){
-        case Rustling::Battle:
-            pbf_mash_button(context, BUTTON_B, 1 * TICKS_PER_SECOND);
-            run_away(env.console, context, EXIT_BATTLE_TIMEOUT);
-            break;
-        case Rustling::Fast:
-            // Do nothing -> stop current tree session
-            break;
-        case Rustling::No:
-        case Rustling::Slow:
-            iteration_attempts += do_secondary_attempts(env, context, current_rustling);
-            break;
-        }
-
-        // end tree session
-        pbf_mash_button(context, BUTTON_B, iteration_attempts > 1 ? 800 : 600);
-
-        c += iteration_attempts;
-
-        if (SAVE_ITERATIONS != 0){
-            save_count += iteration_attempts;
-            if (save_count >= SAVE_ITERATIONS){
-                save_count = 0;
-                pbf_mash_button(context, BUTTON_B, 2 * TICKS_PER_SECOND);
-                pbf_press_button(context, BUTTON_X, 20, GameSettings::instance().OVERWORLD_TO_MENU_DELAY);
-                pbf_press_button(context, BUTTON_R, 20, 2 * TICKS_PER_SECOND);
-                pbf_press_button(context, BUTTON_ZL, 20, 3 * TICKS_PER_SECOND);
-            }
-        }
-
-        // Tap HOME and quickly spam B. The B spamming ensures that we don't
-        // accidentally update the system if the system update window pops up.
-        pbf_press_button(context, BUTTON_HOME, 10, 5);
-        pbf_mash_button(context, BUTTON_B, GameSettings::instance().GAME_TO_HOME_DELAY_FAST - 15);
-    }
-
-}
-}
-
-
-
-}
-}
-
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-BerryFarmer2.h b/SerialPrograms/Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-BerryFarmer2.h
deleted file mode 100644
index e4df4724de..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-BerryFarmer2.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*  Berry Farmer 2
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_BerryFarmer2_H
-#define PokemonAutomation_PokemonSwSh_BerryFarmer2_H
-
-#include "Common/Cpp/Options/StaticTextOption.h"
-#include "Common/Cpp/Options/SimpleIntegerOption.h"
-#include "Common/Cpp/Options/FloatingPointOption.h"
-#include "Common/Cpp/Options/TimeExpressionOption.h"
-#include "CommonFramework/Notifications/EventNotificationsTable.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-#include "NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h"
-#include "Pokemon/Options/Pokemon_EncounterBotOptions.h"
-#include "PokemonSwSh/Options/PokemonSwSh_EncounterBotCommon.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-using namespace Pokemon;
-
-
-class BerryFarmer2_Descriptor : public SingleSwitchProgramDescriptor {
-public:
-    BerryFarmer2_Descriptor();
-
-    class Stats;
-    virtual std::unique_ptr<StatsTracker> make_stats() const override;
-};
-
-
-
-class BerryFarmer2 : public SingleSwitchProgramInstance{
-public:
-    BerryFarmer2();
-
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-    enum Rustling{
-        No,
-        Slow,
-        Fast,
-        Battle
-    };
-
-private:
-    Rustling check_rustling(SingleSwitchProgramEnvironment& env, BotBaseContext& context);
-    uint16_t do_secondary_attempts(SingleSwitchProgramEnvironment& env, BotBaseContext& context, Rustling last_rustling);
-
-private:
-    StaticTextOption REQUIRES_AUDIO;
-    StartInGripOrGameOption START_LOCATION;
-
-    SimpleIntegerOption<uint32_t> FETCH_ATTEMPTS;
-    SimpleIntegerOption<uint16_t> SAVE_ITERATIONS;
-
-    EncounterBotLanguage LANGUAGE;
-    EncounterBotCommonOptions ENCOUNTER_BOT_OPTIONS;
-
-    EventNotificationsOption NOTIFICATIONS;
-
-    SectionDividerOption m_advanced_options;
-    TimeExpressionOption<uint16_t> EXIT_BATTLE_TIMEOUT;
-    SimpleIntegerOption<uint16_t> START_BATTLE_TIMEOUT;
-    SimpleIntegerOption<uint16_t> RUSTLING_INTERVAL;
-    TimeExpressionOption<uint16_t> RUSTLING_TIMEOUT;
-    TimeExpressionOption<uint16_t> SECONDARY_ATTEMPT_MASH_TIME;
-    FloatingPointOption SOUND_THRESHOLD;
-};
-
-
-}
-}
-}
-#endif
-
-
-
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-DailyHighlightFarmer.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-DailyHighlightFarmer.cpp
deleted file mode 100644
index 005f767d35..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-DailyHighlightFarmer.cpp
+++ /dev/null
@@ -1,95 +0,0 @@
-/*  Daily Highlight Farmer
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Cpp/PrettyPrint.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Device.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonSwSh/PokemonSwSh_Settings.h"
-#include "PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.h"
-#include "PokemonSwSh_DateSpam-DailyHighlightFarmer.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-    using namespace Pokemon;
-
-
-DailyHighlightFarmer_Descriptor::DailyHighlightFarmer_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonSwSh:DailyHighlightFarmer",
-        STRING_POKEMON + " SwSh", "Date Spam - Daily Highlight Farmer",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonSwSh/DateSpam-DailyHighlightFarmer.md",
-        "Farm the daily highlight watt trader in Crown Tundra.",
-        FeedbackType::NONE,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-
-
-
-DailyHighlightFarmer::DailyHighlightFarmer()
-    : SKIPS(
-        "<b>Number of Purchase Attempts:</b>",
-        LockWhileRunning::LOCKED,
-        100000
-    )
-    , SAVE_ITERATIONS(
-        "<b>Save Every this Many Fetches:</b><br>(zero disables saving): ",
-        LockWhileRunning::LOCKED,
-        0
-    )
-{
-    PA_ADD_OPTION(START_LOCATION);
-    PA_ADD_OPTION(SKIPS);
-    PA_ADD_OPTION(SAVE_ITERATIONS);
-}
-
-void DailyHighlightFarmer::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    if (START_LOCATION.start_in_grip_menu()){
-        grip_menu_connect_go_home(context);
-    }else{
-        pbf_press_button(context, BUTTON_B, 5, 5);
-        pbf_press_button(context, BUTTON_HOME, 10, GameSettings::instance().GAME_TO_HOME_DELAY_FAST);
-    }
-
-    uint8_t year = MAX_YEAR;
-    uint16_t save_count = 0;
-    for (uint32_t c = 0; c < SKIPS; c++){
-        env.log("Fetch Attempts: " + tostr_u_commas(c));
-        home_roll_date_enter_game_autorollback(env.console, context, year);
-        pbf_mash_button(context, BUTTON_B, 90);
-
-        pbf_press_button(context, BUTTON_A, 10, 110);
-        pbf_press_button(context, BUTTON_ZL, 10, 40);
-        pbf_press_dpad(context, DPAD_DOWN, 10, 10);
-        pbf_mash_button(context, BUTTON_ZL, 400);
-        pbf_mash_button(context, BUTTON_B, 700);
-
-        if (SAVE_ITERATIONS != 0){
-            save_count++;
-            if (save_count >= SAVE_ITERATIONS){
-                save_count = 0;
-                pbf_mash_button(context, BUTTON_B, 2 * TICKS_PER_SECOND);
-                pbf_press_button(context, BUTTON_X, 20, GameSettings::instance().OVERWORLD_TO_MENU_DELAY);
-                pbf_press_button(context, BUTTON_R, 20, 2 * TICKS_PER_SECOND);
-                pbf_press_button(context, BUTTON_ZL, 20, 3 * TICKS_PER_SECOND);
-            }
-        }
-
-        //  Tap HOME and quickly spam B. The B spamming ensures that we don't
-        //  accidentally update the system if the system update window pops up.
-        pbf_press_button(context, BUTTON_HOME, 10, 5);
-        pbf_mash_button(context, BUTTON_B, GameSettings::instance().GAME_TO_HOME_DELAY_FAST - 15);
-    }
-}
-
-
-}
-}
-}
-
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-DailyHighlightFarmer.h b/SerialPrograms/Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-DailyHighlightFarmer.h
deleted file mode 100644
index 13ecaa4f13..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-DailyHighlightFarmer.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*  Daily Highlight Farmer
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_DailyHighlightFarmer_H
-#define PokemonAutomation_PokemonSwSh_DailyHighlightFarmer_H
-
-#include "Common/Cpp/Options/SimpleIntegerOption.h"
-#include "NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-class DailyHighlightFarmer_Descriptor : public SingleSwitchProgramDescriptor{
-public:
-    DailyHighlightFarmer_Descriptor();
-};
-
-
-
-class DailyHighlightFarmer : public SingleSwitchProgramInstance{
-public:
-    DailyHighlightFarmer();
-
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-    StartInGripOrGameOption START_LOCATION;
-
-    SimpleIntegerOption<uint32_t> SKIPS;
-    SimpleIntegerOption<uint16_t> SAVE_ITERATIONS;
-};
-
-
-}
-}
-}
-#endif
-
-
-
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-LotoFarmer.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-LotoFarmer.cpp
deleted file mode 100644
index 6972076dda..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-LotoFarmer.cpp
+++ /dev/null
@@ -1,83 +0,0 @@
-/*  Loto Farmer
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Cpp/PrettyPrint.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Device.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonSwSh/PokemonSwSh_Settings.h"
-#include "PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.h"
-#include "PokemonSwSh_DateSpam-LotoFarmer.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-    using namespace Pokemon;
-
-
-LotoFarmer_Descriptor::LotoFarmer_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonSwSh:LotoFarmer",
-        STRING_POKEMON + " SwSh", "Date Spam - Loto Farmer",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonSwSh/DateSpam-LotoFarmer.md",
-        "Farm the Loto ID.",
-        FeedbackType::NONE,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-
-
-
-LotoFarmer::LotoFarmer()
-    : SKIPS(
-        "<b>Number of Loto Attempts:</b>",
-        LockWhileRunning::LOCKED,
-        100000
-    )
-    , MASH_B_DURATION(
-        "<b>Mash B for this long to exit the dialog:</b><br>(Some languages like German need to increase this.)",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "9 * TICKS_PER_SECOND"
-    )
-{
-    PA_ADD_OPTION(START_LOCATION);
-    PA_ADD_OPTION(SKIPS);
-    PA_ADD_OPTION(MASH_B_DURATION);
-}
-
-void LotoFarmer::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    if (START_LOCATION.start_in_grip_menu()){
-        grip_menu_connect_go_home(context);
-    }else{
-        pbf_press_button(context, BUTTON_B, 5, 5);
-        pbf_press_button(context, BUTTON_HOME, 10, GameSettings::instance().GAME_TO_HOME_DELAY_FAST);
-    }
-
-    uint8_t year = MAX_YEAR;
-    for (uint32_t c = 0; c < SKIPS; c++){
-        env.log("Fetch Attempts: " + tostr_u_commas(c));
-        home_roll_date_enter_game_autorollback(env.console, context, year);
-        pbf_mash_button(context, BUTTON_B, 90);
-
-        pbf_press_button(context, BUTTON_A, 10, 70);
-        pbf_press_button(context, BUTTON_B, 10, 70);
-        pbf_press_dpad(context, DPAD_DOWN, 10, 5);
-        pbf_mash_button(context, BUTTON_ZL, 490);
-        pbf_mash_button(context, BUTTON_B, MASH_B_DURATION);
-
-        //  Tap HOME and quickly spam B. The B spamming ensures that we don't
-        //  accidentally update the system if the system update window pops up.
-        pbf_press_button(context, BUTTON_HOME, 10, 5);
-        pbf_mash_button(context, BUTTON_B, GameSettings::instance().GAME_TO_HOME_DELAY_FAST - 15);
-    }
-}
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-LotoFarmer.h b/SerialPrograms/Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-LotoFarmer.h
deleted file mode 100644
index 6ae6e8e159..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-LotoFarmer.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*  Loto Farmer
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_LotoFarmer_H
-#define PokemonAutomation_PokemonSwSh_LotoFarmer_H
-
-#include "Common/Cpp/Options/SimpleIntegerOption.h"
-#include "Common/Cpp/Options/TimeExpressionOption.h"
-#include "NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-class LotoFarmer_Descriptor : public SingleSwitchProgramDescriptor{
-public:
-    LotoFarmer_Descriptor();
-};
-
-
-
-class LotoFarmer : public SingleSwitchProgramInstance{
-public:
-    LotoFarmer();
-
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-    StartInGripOrGameOption START_LOCATION;
-
-    SimpleIntegerOption<uint32_t> SKIPS;
-    TimeExpressionOption<uint16_t> MASH_B_DURATION;
-};
-
-
-}
-}
-}
-#endif
-
-
-
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-PokeJobsFarmer.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-PokeJobsFarmer.cpp
deleted file mode 100644
index 4aeb6ce2b5..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-PokeJobsFarmer.cpp
+++ /dev/null
@@ -1,170 +0,0 @@
-/*  Poke Jobs Farmer
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Cpp/PrettyPrint.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Device.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonSwSh/PokemonSwSh_Settings.h"
-#include "PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.h"
-#include "PokemonSwSh_DateSpam-PokeJobsFarmer.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-    using namespace Pokemon;
-
-
-
-PokeJobsFarmer_Descriptor::PokeJobsFarmer_Descriptor()
-    : SingleSwitchProgramDescriptor(
-          "PokemonSwSh:PokeJobsFarmer",
-          STRING_POKEMON + " SwSh",
-          "Date Spam - " + STRING_POKEJOB + "s Farmer",
-          "ComputerControl/blob/master/Wiki/Programs/PokemonSwSh/DateSpam-PokeJobsFarmer.md",
-          "Farm " + STRING_POKEJOB + "s.",
-          FeedbackType::NONE,
-          AllowCommandsWhenRunning::DISABLE_COMMANDS,
-          PABotBaseLevel::PABOTBASE_12KB)
-{
-}
-
-PokeJobsFarmer::PokeJobsFarmer()
-    : SKIPS(
-        "<b>Number of days:</b>",
-        LockWhileRunning::LOCKED,
-        200
-    )
-    , CONCURRENCY(
-        "<b>Number of concurrent " + STRING_POKEJOB + "s per day:</b>",
-        LockWhileRunning::LOCKED,
-        2
-    )
-    , MENU_INDEX(
-        "<b>Index of " + STRING_POKEJOB + "s in Rotom menu:</b>",
-        LockWhileRunning::LOCKED,
-        3
-    )
-    , m_advanced_options(
-        "<font size=4><b>Advanced Options:</b> You should not need to touch anything below here.</font>"
-    )
-    , MASH_B_DURATION(
-        "<b>Mash B for this long upon completion of " + STRING_POKEJOB + ":</b>",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "8 * TICKS_PER_SECOND"
-    )
-{
-    PA_ADD_OPTION(SKIPS);
-    PA_ADD_OPTION(CONCURRENCY);
-    PA_ADD_OPTION(MENU_INDEX);
-    PA_ADD_STATIC(m_advanced_options);
-    PA_ADD_OPTION(MASH_B_DURATION);
-}
-
-static void enter_jobs(BotBaseContext& context, uint16_t index){
-    // Enter menu
-    pbf_press_button(context, BUTTON_A, 10, 90);
-    pbf_press_button(context, BUTTON_B, 10, 90);
-    // Select entry
-    for (uint16_t i = 1; i < index; i++)
-    {
-        pbf_press_dpad(context, DPAD_DOWN, 10, 10);
-    }
-    pbf_press_button(context, BUTTON_A, 10, 5 * TICKS_PER_SECOND); // Wait for animation to complete
-}
-
-void PokeJobsFarmer::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    uint8_t year = MAX_YEAR;
-
-    // Play it safe in case some menu is open
-    pbf_mash_button(context, BUTTON_B, MASH_B_DURATION);
-
-    for (uint32_t c = 0; c < SKIPS; c++)
-    {
-        if (MAX_YEAR <= year)
-        {
-            // Roll back to 2001
-            env.log("Rolling back!");
-            pbf_press_button(context, BUTTON_B, 5, 5);
-            pbf_press_button(context, BUTTON_HOME, 10, GameSettings::instance().GAME_TO_HOME_DELAY_FAST);
-            home_roll_date_enter_game_autorollback(env.console, context, year);
-            pbf_mash_button(context, BUTTON_B, MASH_B_DURATION);
-
-            // Get rid of new jobs notification by entering Poke Jobs and leaving immediately
-            enter_jobs(context, MENU_INDEX);
-            pbf_mash_button(context, BUTTON_B, 5 * TICKS_PER_SECOND);
-        }
-
-        // Start new jobs
-        for (uint16_t j = 1; j <= CONCURRENCY; j++)
-        {
-            env.log("Starting job #" + tostr_u_commas(j) + " in year " + tostr_u_commas(2000 + year));
-
-            // Enter Poke Jobs
-            enter_jobs(context, MENU_INDEX);
-
-            // Select first Poke Job
-            env.log("#### Select first " + STRING_POKEJOB);
-            pbf_press_button(context, BUTTON_A, 10, 1 * TICKS_PER_SECOND);
-            pbf_press_button(context, BUTTON_A, 10, 1 * TICKS_PER_SECOND);
-            pbf_press_button(context, BUTTON_A, 10, 3 * TICKS_PER_SECOND);
-
-            // Select all Pokemons
-            env.log("#### Select all");
-            pbf_press_button(context, BUTTON_X, 10, 90);
-
-            // Send to Poke Job
-            env.log("#### Send to " + STRING_POKEJOB);
-            pbf_press_button(context, BUTTON_B, 10, 2 * TICKS_PER_SECOND);
-            pbf_mash_button(context, BUTTON_A, 6 * TICKS_PER_SECOND); // Mash until animation starts
-
-            // Wait for animation to end and exit Poke Jobs
-            env.log("#### Exit " + STRING_POKEJOB + "s");
-            pbf_mash_button(context, BUTTON_B, 5 * TICKS_PER_SECOND);
-        }
-
-        env.log("Skipping one year...");
-
-        // Go to home menu
-        env.log("#### Go to Switch home menu");
-        pbf_press_button(context, BUTTON_HOME, 10, GameSettings::instance().GAME_TO_HOME_DELAY_FAST);
-
-        // Skip frame
-        env.log("#### Skip frame");
-        home_roll_date_enter_game_autorollback(env.console, context, year);
-        pbf_mash_button(context, BUTTON_B, 1 * TICKS_PER_SECOND);
-
-        // Get rid of new jobs notification by entering Poke Jobs and leaving immediately
-        enter_jobs(context, MENU_INDEX);
-        pbf_mash_button(context, BUTTON_B, 5 * TICKS_PER_SECOND);
-
-        // Complete jobs
-        for (uint16_t j = 1; j <= CONCURRENCY; j++)
-        {
-            env.log("Completing job #" + tostr_u_commas(j) + " in year " + tostr_u_commas(2000 + year));
-
-            // Enter Poke Jobs
-            enter_jobs(context, MENU_INDEX);
-
-            // Select first Poke Job
-            env.log("#### Select first " + STRING_POKEJOB);
-            pbf_press_button(context, BUTTON_A, 10, 1 * TICKS_PER_SECOND);
-            pbf_press_button(context, BUTTON_A, 10, 1 * TICKS_PER_SECOND);
-            pbf_press_button(context, BUTTON_A, 10, 10 * TICKS_PER_SECOND); // Wait for animation to complete
-
-            // Skip through wall of text and exit
-            env.log("#### Exit " + STRING_POKEJOB + "s");
-            pbf_mash_button(context, BUTTON_B, MASH_B_DURATION);
-        }
-    }
-}
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-PokeJobsFarmer.h b/SerialPrograms/Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-PokeJobsFarmer.h
deleted file mode 100644
index eeb71a23c3..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-PokeJobsFarmer.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*  PokeJobs Farmer
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_PokeJobsFarmer_H
-#define PokemonAutomation_PokemonSwSh_PokeJobsFarmer_H
-
-#include "Common/Cpp/Options/StaticTextOption.h"
-#include "Common/Cpp/Options/SimpleIntegerOption.h"
-#include "Common/Cpp/Options/TimeExpressionOption.h"
-#include "NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-class PokeJobsFarmer_Descriptor : public SingleSwitchProgramDescriptor{
-public:
-    PokeJobsFarmer_Descriptor();
-};
-
-class PokeJobsFarmer : public SingleSwitchProgramInstance{
-public:
-    PokeJobsFarmer();
-
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-    StartInGripOrGameOption START_LOCATION;
-
-    SimpleIntegerOption<uint32_t> SKIPS;
-    SimpleIntegerOption<uint32_t> CONCURRENCY;
-    SimpleIntegerOption<uint16_t> MENU_INDEX;
-
-    SectionDividerOption m_advanced_options;
-
-    TimeExpressionOption<uint16_t> MASH_B_DURATION;
-};
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-StowOnSideFarmer.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-StowOnSideFarmer.cpp
deleted file mode 100644
index 46b105254d..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-StowOnSideFarmer.cpp
+++ /dev/null
@@ -1,92 +0,0 @@
-/*  Stow-On-Side Farmer
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Cpp/PrettyPrint.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Device.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonSwSh/PokemonSwSh_Settings.h"
-#include "PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.h"
-#include "PokemonSwSh_DateSpam-StowOnSideFarmer.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-    using namespace Pokemon;
-
-
-StowOnSideFarmer_Descriptor::StowOnSideFarmer_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonSwSh:StowOnSideFarmer",
-        STRING_POKEMON + " SwSh", "Date Spam - Stow-On-Side Farmer",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonSwSh/DateSpam-StowOnSideFarmer.md",
-        "Farm the Stow-on-Side items dealer.",
-        FeedbackType::NONE,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-
-
-
-StowOnSideFarmer::StowOnSideFarmer()
-    : SKIPS(
-        "<b>Number of Purchase Attempts:</b>",
-        LockWhileRunning::LOCKED,
-        100000
-    )
-    , SAVE_ITERATIONS(
-        "<b>Save Every this Many Fetches:</b><br>(zero disables saving): ",
-        LockWhileRunning::LOCKED,
-        0, 0
-    )
-{
-    PA_ADD_OPTION(START_LOCATION);
-    PA_ADD_OPTION(SKIPS);
-    PA_ADD_OPTION(SAVE_ITERATIONS);
-}
-
-void StowOnSideFarmer::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    if (START_LOCATION.start_in_grip_menu()){
-        grip_menu_connect_go_home(context);
-    }else{
-        pbf_press_button(context, BUTTON_B, 5, 5);
-        pbf_press_button(context, BUTTON_HOME, 10, GameSettings::instance().GAME_TO_HOME_DELAY_FAST);
-    }
-
-    uint8_t year = MAX_YEAR;
-    uint16_t save_count = 0;
-    for (uint32_t c = 0; c < SKIPS; c++){
-        env.log("Fetch Attempts: " + tostr_u_commas(c));
-        home_roll_date_enter_game_autorollback(env.console, context, year);
-        pbf_mash_button(context, BUTTON_B, 90);
-
-        pbf_press_button(context, BUTTON_A, 10, 10);
-        pbf_mash_button(context, BUTTON_ZL, 385);
-        pbf_mash_button(context, BUTTON_B, 700);
-
-        if (SAVE_ITERATIONS != 0){
-            save_count++;
-            if (save_count >= SAVE_ITERATIONS){
-                save_count = 0;
-                pbf_mash_button(context, BUTTON_B, 2 * TICKS_PER_SECOND);
-                pbf_press_button(context, BUTTON_X, 20, GameSettings::instance().OVERWORLD_TO_MENU_DELAY);
-                pbf_press_button(context, BUTTON_R, 20, 2 * TICKS_PER_SECOND);
-                pbf_press_button(context, BUTTON_ZL, 20, 3 * TICKS_PER_SECOND);
-            }
-        }
-
-        //  Tap HOME and quickly spam B. The B spamming ensures that we don't
-        //  accidentally update the system if the system update window pops up.
-        pbf_press_button(context, BUTTON_HOME, 10, 5);
-        pbf_mash_button(context, BUTTON_B, GameSettings::instance().GAME_TO_HOME_DELAY_FAST - 15);
-    }
-}
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-StowOnSideFarmer.h b/SerialPrograms/Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-StowOnSideFarmer.h
deleted file mode 100644
index 3eb82f8b6b..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-StowOnSideFarmer.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*  Stow-On-Side Farmer
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_StowOnSideFarmer_H
-#define PokemonAutomation_PokemonSwSh_StowOnSideFarmer_H
-
-#include "Common/Cpp/Options/SimpleIntegerOption.h"
-#include "NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-class StowOnSideFarmer_Descriptor : public SingleSwitchProgramDescriptor{
-public:
-    StowOnSideFarmer_Descriptor();
-};
-
-
-
-class StowOnSideFarmer : public SingleSwitchProgramInstance{
-public:
-    StowOnSideFarmer();
-
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-    StartInGripOrGameOption START_LOCATION;
-
-    SimpleIntegerOption<uint32_t> SKIPS;
-    SimpleIntegerOption<uint16_t> SAVE_ITERATIONS;
-};
-
-
-}
-}
-}
-#endif
-
-
-
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-WattFarmer.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-WattFarmer.cpp
deleted file mode 100644
index 96ab3a84c4..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-WattFarmer.cpp
+++ /dev/null
@@ -1,102 +0,0 @@
-/*  Watt Farmer
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Cpp/PrettyPrint.h"
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Device.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonSwSh/PokemonSwSh_Settings.h"
-#include "PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.h"
-#include "PokemonSwSh_DateSpam-WattFarmer.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-    using namespace Pokemon;
-
-
-WattFarmer_Descriptor::WattFarmer_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonSwSh:WattFarmer",
-        STRING_POKEMON + " SwSh", "Date Spam - Watt Farmer",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonSwSh/DateSpam-WattFarmer.md",
-        "Farm watts. (7.2 seconds/fetch, 1 million watts/hour)",
-        FeedbackType::NONE,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-
-
-
-WattFarmer::WattFarmer()
-    : GRIP_MENU_WAIT(
-        "<b>Exit Grip Menu Delay:</b> "
-        "Wait this long after leaving the grip menu to allow for the Switch to reestablish local connection.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "5 * TICKS_PER_SECOND"
-    )
-    , SKIPS(
-        "<b>Number of Fetch Attempts:</b>",
-        LockWhileRunning::LOCKED,
-        33334
-    )
-    , SAVE_ITERATIONS(
-        "<b>Save Every this Many Fetches:</b><br>(zero disables saving): ",
-        LockWhileRunning::LOCKED,
-        0, 0
-    )
-{
-    PA_ADD_OPTION(START_LOCATION);
-    PA_ADD_OPTION(SKIPS);
-    PA_ADD_OPTION(SAVE_ITERATIONS);
-}
-
-void WattFarmer::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    if (START_LOCATION.start_in_grip_menu()){
-        grip_menu_connect_go_home(context);
-        pbf_wait(context, GRIP_MENU_WAIT);
-    }else{
-        pbf_press_button(context, BUTTON_B, 5, 5);
-        pbf_press_button(context, BUTTON_HOME, 10, GameSettings::instance().GAME_TO_HOME_DELAY_FAST);
-    }
-
-    uint8_t year = MAX_YEAR;
-    uint16_t save_count = 0;
-    for (uint32_t c = 0; c < SKIPS; c++){
-        env.log("Fetch Attempts: " + tostr_u_commas(c));
-
-        home_roll_date_enter_game_autorollback(env.console, context, year);
-        pbf_mash_button(context, BUTTON_B, 90);
-
-        pbf_press_button(context, BUTTON_A, 5, 5);
-        pbf_mash_button(context, BUTTON_B, 215);
-
-        if (SAVE_ITERATIONS != 0){
-            save_count++;
-            if (save_count >= SAVE_ITERATIONS){
-                save_count = 0;
-                pbf_mash_button(context, BUTTON_B, 2 * TICKS_PER_SECOND);
-                pbf_press_button(context, BUTTON_X, 20, GameSettings::instance().OVERWORLD_TO_MENU_DELAY);
-                pbf_press_button(context, BUTTON_R, 20, 2 * TICKS_PER_SECOND);
-                pbf_press_button(context, BUTTON_ZL, 20, 3 * TICKS_PER_SECOND);
-            }
-        }
-
-        //  Tap HOME and quickly spam B. The B spamming ensures that we don't
-        //  accidentally update the system if the system update window pops up.
-        pbf_press_button(context, BUTTON_HOME, 10, 5);
-        pbf_mash_button(context, BUTTON_B, GameSettings::instance().GAME_TO_HOME_DELAY_FAST - 15);
-    }
-}
-
-
-}
-}
-}
-
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-WattFarmer.h b/SerialPrograms/Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-WattFarmer.h
deleted file mode 100644
index 3b8f488018..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-WattFarmer.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*  Watt Farmer
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_WattFarmer_H
-#define PokemonAutomation_PokemonSwSh_WattFarmer_H
-
-#include "Common/Cpp/Options/SimpleIntegerOption.h"
-#include "Common/Cpp/Options/TimeExpressionOption.h"
-#include "NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-class WattFarmer_Descriptor : public SingleSwitchProgramDescriptor{
-public:
-    WattFarmer_Descriptor();
-};
-
-
-
-class WattFarmer : public SingleSwitchProgramInstance{
-public:
-    WattFarmer();
-
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-    StartInGripOrGameOption START_LOCATION;
-    TimeExpressionOption<uint16_t> GRIP_MENU_WAIT;
-
-    SimpleIntegerOption<uint32_t> SKIPS;
-    SimpleIntegerOption<uint16_t> SAVE_ITERATIONS;
-};
-
-
-}
-}
-}
-#endif
-
-
-
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_BeamReset.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_BeamReset.cpp
deleted file mode 100644
index 152b7aed3f..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_BeamReset.cpp
+++ /dev/null
@@ -1,86 +0,0 @@
-/*  Beam Reset
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "NintendoSwitch/NintendoSwitch_Settings.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonSwSh/PokemonSwSh_Settings.h"
-#include "PokemonSwSh/Commands/PokemonSwSh_Commands_GameEntry.h"
-#include "PokemonSwSh_BeamReset.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-    using namespace Pokemon;
-
-
-BeamReset_Descriptor::BeamReset_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonSwSh:BeamReset",
-        STRING_POKEMON + " SwSh", "Beam Reset",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonSwSh/BeamReset.md",
-        "Reset a beam until you see a purple beam.",
-        FeedbackType::NONE,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-
-
-
-BeamReset::BeamReset()
-    : DELAY_BEFORE_RESET(
-        "<b>Delay before Reset:</b>",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "5 * TICKS_PER_SECOND"
-    )
-    , EXTRA_LINE(
-        "<b>Extra Line:</b><br>(German has an extra line of text.)",
-        LockWhileRunning::LOCKED,
-        false
-    )
-{
-    PA_ADD_OPTION(START_LOCATION);
-    PA_ADD_OPTION(DELAY_BEFORE_RESET);
-    PA_ADD_OPTION(EXTRA_LINE);
-}
-
-void BeamReset::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    if (START_LOCATION.start_in_grip_menu()){
-        grip_menu_connect_go_home(context);
-        resume_game_front_of_den_nowatts(context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_SLOW);
-    }else{
-        pbf_press_button(context, BUTTON_B, 5, 5);
-    }
-
-    while (true){
-        //  Talk to den.
-        pbf_press_button(context, BUTTON_A, 10, 450);
-        if (EXTRA_LINE){
-            pbf_press_button(context, BUTTON_A, 10, 300);
-        }
-        pbf_press_button(context, BUTTON_A, 10, 300);
-
-        //  Drop wishing piece.
-        pbf_press_button(context, BUTTON_A, 10, 70);
-        pbf_press_button(context, BUTTON_HOME, 10, GameSettings::instance().GAME_TO_HOME_DELAY_FAST);
-
-        for (uint16_t c = 0; c < 4; c++){
-            pbf_press_button(context, BUTTON_HOME, 10, 10);
-            pbf_press_button(context, BUTTON_HOME, 10, 220);
-        }
-        pbf_wait(context, DELAY_BEFORE_RESET);
-
-        reset_game_from_home(context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_SLOW);
-    }
-}
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_BeamReset.h b/SerialPrograms/Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_BeamReset.h
deleted file mode 100644
index 8ddc9528ab..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_BeamReset.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*  Beam Reset
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_BeamReset_H
-#define PokemonAutomation_PokemonSwSh_BeamReset_H
-
-#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
-#include "Common/Cpp/Options/TimeExpressionOption.h"
-#include "NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-class BeamReset_Descriptor : public SingleSwitchProgramDescriptor{
-public:
-    BeamReset_Descriptor();
-};
-
-
-
-class BeamReset : public SingleSwitchProgramInstance{
-public:
-    BeamReset();
-
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-    StartInGripOrGameOption START_LOCATION;
-
-    TimeExpressionOption<uint16_t> DELAY_BEFORE_RESET;
-    BooleanCheckBoxOption EXTRA_LINE;
-};
-
-
-}
-}
-}
-#endif
-
-
-
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperEU.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperEU.cpp
deleted file mode 100644
index 5826dcb0d3..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperEU.cpp
+++ /dev/null
@@ -1,137 +0,0 @@
-/*  Day Skipper (EU)
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Cpp/PrettyPrint.h"
-#include "Common/NintendoSwitch/NintendoSwitch_Protocol_PushButtons.h"
-#include "CommonFramework/Notifications/ProgramNotifications.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Device.h"
-#include "NintendoSwitch/FixedInterval.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonSwSh/Commands/PokemonSwSh_Commands_DaySkippers.h"
-#include "PokemonSwSh_DaySkipperStats.h"
-#include "PokemonSwSh_DaySkipperEU.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-    using namespace Pokemon;
-
-
-DaySkipperEU_Descriptor::DaySkipperEU_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonSwSh:DaySkipperEU",
-        STRING_POKEMON + " SwSh", "Day Skipper (EU)",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonSwSh/DaySkipperEU.md",
-        "A day skipper for EU date format that.  (~7500 skips/hour)",
-        FeedbackType::NONE,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_31KB
-    )
-{}
-std::unique_ptr<StatsTracker> DaySkipperEU_Descriptor::make_stats() const{
-    return std::unique_ptr<StatsTracker>(new SkipperStats());
-}
-
-
-
-DaySkipperEU::DaySkipperEU()
-    : SKIPS(
-        "<b>Number of Frame Skips:</b>",
-        LockWhileRunning::LOCKED,
-        10
-    )
-    , REAL_LIFE_YEAR(
-        "<b>Real Life Year:</b>",
-        LockWhileRunning::LOCKED,
-        2023, 2000, 2060
-    )
-    , NOTIFICATION_PROGRESS_UPDATE("Progress Update", true, false, std::chrono::seconds(3600))
-    , NOTIFICATION_PROGRAM_FINISH("Program Finished", true, true)
-    , NOTIFICATIONS({
-        &NOTIFICATION_PROGRESS_UPDATE,
-        &NOTIFICATION_PROGRAM_FINISH,
-        &NOTIFICATION_ERROR_FATAL,
-    })
-    , m_advanced_options(
-        "<font size=4><b>Advanced Options:</b> You should not need to touch anything below here.</font>"
-    )
-    , CORRECTION_SKIPS(
-        "<b>Auto-Correct Interval:</b><br>Run auto-recovery every this # of skips. Zero disables the auto-corrections.",
-        LockWhileRunning::LOCKED,
-        1000
-    )
-{
-    PA_ADD_OPTION(SKIPS);
-    PA_ADD_OPTION(REAL_LIFE_YEAR);
-    PA_ADD_OPTION(NOTIFICATIONS);
-    PA_ADD_STATIC(m_advanced_options);
-    PA_ADD_OPTION(CORRECTION_SKIPS);
-}
-
-
-void DaySkipperEU::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    SkipperStats& stats = env.current_stats<SkipperStats>();
-    stats.total_skips = SKIPS;
-    stats.runs++;
-
-    //  Setup globals.
-    uint8_t real_life_year = (uint8_t)(
-        REAL_LIFE_YEAR < 2000 ?  0 :
-        REAL_LIFE_YEAR > 2060 ? 60 : REAL_LIFE_YEAR - 2000
-    );
-    uint8_t year = 60;
-    uint32_t remaining_skips = SKIPS;
-
-    //  Connect
-    pbf_press_button(context, BUTTON_ZR, 5, 5);
-
-    //  Setup starting state.
-    skipper_init_view(context);
-    skipper_rollback_year_full(context, false);
-    year = 0;
-
-    uint16_t correct_count = 0;
-    while (remaining_skips > 0){
-        send_program_status_notification(env, NOTIFICATION_PROGRESS_UPDATE);
-
-        skipper_increment_day(context, false);
-
-        correct_count++;
-        year++;
-        remaining_skips--;
-        stats.issued++;
-//        env.log("Skips Remaining: " + tostr_u_commas(remaining_skips));
-        env.update_stats();
-
-        if (year >= 60){
-            if (real_life_year <= 36){
-                skipper_rollback_year_sync(context);
-                year = real_life_year;
-            }else{
-                skipper_rollback_year_full(context, false);
-                year = 0;
-            }
-        }
-        if (CORRECTION_SKIPS != 0 && correct_count == CORRECTION_SKIPS){
-            correct_count = 0;
-            skipper_auto_recovery(context);
-        }
-    }
-
-    //  Prevent the Switch from sleeping and the time from advancing.
-    context.wait_for_all_requests();
-    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
-
-    pbf_wait(context, 15 * TICKS_PER_SECOND);
-    while (true){
-        ssf_press_button1(context, BUTTON_A, 15 * TICKS_PER_SECOND);
-    }
-}
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperEU.h b/SerialPrograms/Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperEU.h
deleted file mode 100644
index 9543ccd92f..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperEU.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*  Day Skipper (EU)
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_DaySkipperEU_H
-#define PokemonAutomation_PokemonSwSh_DaySkipperEU_H
-
-#include "Common/Cpp/Options/StaticTextOption.h"
-#include "Common/Cpp/Options/SimpleIntegerOption.h"
-#include "CommonFramework/Notifications/EventNotificationsTable.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-class DaySkipperEU_Descriptor : public SingleSwitchProgramDescriptor{
-public:
-    DaySkipperEU_Descriptor();
-
-    virtual std::unique_ptr<StatsTracker> make_stats() const override;
-};
-
-
-
-class DaySkipperEU : public SingleSwitchProgramInstance{
-public:
-    DaySkipperEU();
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-    SimpleIntegerOption<uint32_t> SKIPS;
-    SimpleIntegerOption<uint16_t> REAL_LIFE_YEAR;
-
-    EventNotificationOption NOTIFICATION_PROGRESS_UPDATE;
-    EventNotificationOption NOTIFICATION_PROGRAM_FINISH;
-    EventNotificationsOption NOTIFICATIONS;
-
-    SectionDividerOption m_advanced_options;
-    SimpleIntegerOption<uint16_t> CORRECTION_SKIPS;
-};
-
-
-}
-}
-}
-#endif
-
-
-
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperJPN-7.8k.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperJPN-7.8k.cpp
deleted file mode 100644
index 25401caf41..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperJPN-7.8k.cpp
+++ /dev/null
@@ -1,206 +0,0 @@
-/*  Day Skipper (JPN) - 7.8k version
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Cpp/PrettyPrint.h"
-#include "CommonFramework/Notifications/ProgramNotifications.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Device.h"
-#include "NintendoSwitch/FixedInterval.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonSwSh/Commands/PokemonSwSh_Commands_DaySkippers.h"
-#include "PokemonSwSh_DaySkipperStats.h"
-#include "PokemonSwSh_DaySkipperJPN-7.8k.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-    using namespace Pokemon;
-
-
-DaySkipperJPN7p8k_Descriptor::DaySkipperJPN7p8k_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonSwSh:DaySkipperJPN7p8k",
-        STRING_POKEMON + " SwSh", "Day Skipper (JPN) - 7.8k",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonSwSh/DaySkipperJPN-7.8k.md",
-        "A faster, but less reliable Japanese date skipper. (7800 skips/hour)",
-        FeedbackType::NONE,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_31KB
-    )
-{}
-std::unique_ptr<StatsTracker> DaySkipperJPN7p8k_Descriptor::make_stats() const{
-    return std::unique_ptr<StatsTracker>(new SkipperStats());
-}
-
-
-
-DaySkipperJPN7p8k::DaySkipperJPN7p8k()
-    : SKIPS(
-        "<b>Number of Frame Skips:</b>",
-        LockWhileRunning::LOCKED,
-        10
-    )
-    , START_DATE(
-        "<b>Start Date:</b>",
-        QDate(2000, 1, 1), QDate(2060, 12, 31),
-        QDate(2000, 1, 1)
-    )
-    , NOTIFICATION_PROGRESS_UPDATE("Progress Update", true, false, std::chrono::seconds(3600))
-    , NOTIFICATIONS({
-        &NOTIFICATION_PROGRESS_UPDATE,
-        &NOTIFICATION_PROGRAM_FINISH,
-        &NOTIFICATION_ERROR_FATAL,
-    })
-    , m_advanced_options(
-        "<font size=4><b>Advanced Options:</b> You should not need to touch anything below here.</font>"
-    )
-    , CORRECTION_SKIPS(
-        "<b>Auto-Correct Interval:</b><br>Run auto-recovery every this # of skips. Zero disables the auto-corrections.",
-        LockWhileRunning::LOCKED,
-        1000
-    )
-{
-    PA_ADD_OPTION(SKIPS);
-    PA_ADD_OPTION(START_DATE);
-    PA_ADD_OPTION(NOTIFICATIONS);
-    PA_ADD_STATIC(m_advanced_options);
-    PA_ADD_OPTION(CORRECTION_SKIPS);
-}
-
-
-const uint8_t DAYS_PER_MONTH[] = {
-    31, //  January
-    28, //  February
-    31, //  March
-    30, //  April
-    31, //  May
-    30, //  June
-    31, //  July
-    31, //  August
-    30, //  September
-    31, //  October
-    30, //  November
-    31, //  December
-};
-uint8_t days_in_month(uint8_t year, uint8_t month){
-    return month != 2
-        ? DAYS_PER_MONTH[month - 1]
-        : (year & 0x3) ? 28 : 29;
-}
-typedef struct{
-    uint8_t year;
-    uint8_t month;
-    uint8_t day;
-} DateSmall;
-
-bool is_start(const DateSmall* date){
-    return date->year != 0 || date->month != 1 || date->day != 1;
-}
-bool date_increment_day(BotBaseContext& context, DateSmall* date, bool press){
-    uint8_t days = days_in_month(date->year, date->month);
-    if (date->day != days){
-        if (press){
-            skipper_increment_day(context, false);
-        }
-        date->day++;
-        return true;
-    }
-
-    date->day = 1;
-    date->month++;
-    if (date->month > 12){
-        date->month = 1;
-        date->year++;
-    }
-    if (date->year > 60){
-        date->year = 0;
-    }
-
-    if (!press){
-        return is_start(date);
-    }
-
-    if (date->month != 1){
-        skipper_increment_month(context, DAYS_PER_MONTH[date->month - 1]);
-        return true;
-    }
-
-    if (date->year != 0){
-        skipper_increment_all(context);
-        return true;
-    }
-
-    skipper_increment_all_rollback(context);
-    return false;
-}
-
-void DaySkipperJPN7p8k::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    SkipperStats& stats = env.current_stats<SkipperStats>();
-    stats.total_skips = SKIPS;
-    stats.runs++;
-
-    //  Setup globals.
-    uint32_t remaining_skips = SKIPS;
-
-    //  Connect
-    pbf_press_button(context, BUTTON_ZL, 5, 5);
-
-    //  Sanitize starting date.
-    uint16_t year = (uint16_t)((QDate)START_DATE).year();
-    if (year < 2000) year = 2000;
-    if (year > 2060) year = 2060;
-
-    DateSmall date;
-    date.year   = (uint8_t)(year - 2000);
-    date.month  = (uint8_t)((QDate)START_DATE).month();
-    date.day    = (uint8_t)((QDate)START_DATE).day();
-    if (date.month < 1)     date.month = 1;
-    if (date.month > 12)    date.month = 12;
-    if (date.day < 1)       date.day = 1;
-    {
-        uint8_t day = days_in_month(date.year, date.month);
-        if (date.day > day) date.day = day;
-    }
-
-    //  Setup starting state.
-    skipper_init_view(context);
-
-    uint16_t correct_count = 0;
-    while (remaining_skips > 0){
-        send_program_status_notification(env, NOTIFICATION_PROGRESS_UPDATE);
-
-        if (date_increment_day(context, &date, true)){
-            correct_count++;
-            remaining_skips--;
-            stats.issued++;
-            env.log("Expected Date: " + QDate(date.year + 2000, date.month, date.day).toString("yyyy/MM/dd").toStdString());
-//            env.log("Skips Remaining: " + tostr_u_commas(remaining_skips));
-            env.update_stats();
-        }
-        if (CORRECTION_SKIPS != 0 && correct_count == CORRECTION_SKIPS){
-            correct_count = 0;
-            skipper_auto_recovery(context);
-        }
-
-    }
-
-    //  Prevent the Switch from sleeping and the time from advancing.
-    context.wait_for_all_requests();
-    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
-
-    pbf_wait(context, 15 * TICKS_PER_SECOND);
-    while (true){
-        ssf_press_button1(context, BUTTON_A, 15 * TICKS_PER_SECOND);
-    }
-}
-
-
-
-}
-}
-}
-
-
-
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperJPN.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperJPN.cpp
deleted file mode 100644
index 1ce8a0d8c6..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperJPN.cpp
+++ /dev/null
@@ -1,119 +0,0 @@
-/*  Day Skipper (JPN)
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Cpp/PrettyPrint.h"
-#include "Common/NintendoSwitch/NintendoSwitch_Protocol_PushButtons.h"
-#include "CommonFramework/Notifications/ProgramNotifications.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Device.h"
-#include "NintendoSwitch/FixedInterval.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonSwSh/Commands/PokemonSwSh_Commands_DaySkippers.h"
-#include "PokemonSwSh_DaySkipperStats.h"
-#include "PokemonSwSh_DaySkipperJPN.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-    using namespace Pokemon;
-
-
-DaySkipperJPN_Descriptor::DaySkipperJPN_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonSwSh:DaySkipperJPN",
-        STRING_POKEMON + " SwSh", "Day Skipper (JPN)",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonSwSh/DaySkipperJPN.md",
-        "A day skipper for Japanese date format. (7600 skips/hour)",
-        FeedbackType::NONE,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_31KB
-    )
-{}
-
-std::unique_ptr<StatsTracker> DaySkipperJPN_Descriptor::make_stats() const{
-    return std::unique_ptr<StatsTracker>(new SkipperStats());
-}
-
-
-
-DaySkipperJPN::DaySkipperJPN()
-    : SKIPS(
-        "<b>Number of Frame Skips:</b>",
-        LockWhileRunning::LOCKED,
-        10
-    )
-    , NOTIFICATION_PROGRESS_UPDATE("Progress Update", true, false, std::chrono::seconds(3600))
-    , NOTIFICATIONS({
-        &NOTIFICATION_PROGRESS_UPDATE,
-        &NOTIFICATION_PROGRAM_FINISH,
-        &NOTIFICATION_ERROR_FATAL,
-    })
-    , m_advanced_options(
-        "<font size=4><b>Advanced Options:</b> You should not need to touch anything below here.</font>"
-    )
-    , CORRECTION_SKIPS(
-        "<b>Auto-Correct Interval:</b><br>Run auto-recovery every this # of skips. Zero disables the auto-corrections.",
-        LockWhileRunning::LOCKED,
-        1000
-    )
-{
-    PA_ADD_OPTION(SKIPS);
-    PA_ADD_OPTION(NOTIFICATIONS);
-    PA_ADD_STATIC(m_advanced_options);
-    PA_ADD_OPTION(CORRECTION_SKIPS);
-}
-
-void DaySkipperJPN::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    SkipperStats& stats = env.current_stats<SkipperStats>();
-    stats.total_skips = SKIPS;
-    stats.runs++;
-
-    //  Setup globals.
-    uint32_t remaining_skips = SKIPS;
-
-    //  Connect
-    pbf_press_button(context, BUTTON_ZR, 5, 5);
-
-    //  Setup starting state.
-    skipper_init_view(context);
-
-    uint8_t day = 1;
-    uint16_t correct_count = 0;
-    while (remaining_skips > 0){
-        send_program_status_notification(env, NOTIFICATION_PROGRESS_UPDATE);
-
-        skipper_increment_day(context, false);
-
-        if (day == 31){
-            day = 1;
-        }else{
-            correct_count++;
-            day++;
-            remaining_skips--;
-            stats.issued++;
-//            env.log("Skips Remaining: " + tostr_u_commas(remaining_skips));
-            env.update_stats();
-        }
-        if (CORRECTION_SKIPS != 0 && correct_count == CORRECTION_SKIPS){
-            correct_count = 0;
-            skipper_auto_recovery(context);
-        }
-
-    }
-
-    //  Prevent the Switch from sleeping and the time from advancing.
-    context.wait_for_all_requests();
-    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
-
-    pbf_wait(context, 15 * TICKS_PER_SECOND);
-    while (true){
-        ssf_press_button1(context, BUTTON_A, 15 * TICKS_PER_SECOND);
-    }
-}
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperJPN.h b/SerialPrograms/Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperJPN.h
deleted file mode 100644
index 0d3c057172..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperJPN.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*  Day Skipper (JPN)
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_DaySkipperJPN_H
-#define PokemonAutomation_PokemonSwSh_DaySkipperJPN_H
-
-#include "Common/Cpp/Options/StaticTextOption.h"
-#include "Common/Cpp/Options/SimpleIntegerOption.h"
-#include "CommonFramework/Notifications/EventNotificationsTable.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-class DaySkipperJPN_Descriptor : public SingleSwitchProgramDescriptor{
-public:
-    DaySkipperJPN_Descriptor();
-
-    virtual std::unique_ptr<StatsTracker> make_stats() const override;
-};
-
-
-
-class DaySkipperJPN : public SingleSwitchProgramInstance{
-public:
-    DaySkipperJPN();
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-    SimpleIntegerOption<uint32_t> SKIPS;
-
-    EventNotificationOption NOTIFICATION_PROGRESS_UPDATE;
-    EventNotificationsOption NOTIFICATIONS;
-
-    SectionDividerOption m_advanced_options;
-    SimpleIntegerOption<uint16_t> CORRECTION_SKIPS;
-};
-
-
-}
-}
-}
-#endif
-
-
-
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperUS.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperUS.cpp
deleted file mode 100644
index 4a7a06d0f2..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperUS.cpp
+++ /dev/null
@@ -1,137 +0,0 @@
-/*  Day Skipper (US)
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Cpp/PrettyPrint.h"
-#include "Common/NintendoSwitch/NintendoSwitch_Protocol_PushButtons.h"
-#include "CommonFramework/Notifications/ProgramNotifications.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Device.h"
-#include "NintendoSwitch/FixedInterval.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonSwSh/Commands/PokemonSwSh_Commands_DaySkippers.h"
-#include "PokemonSwSh_DaySkipperStats.h"
-#include "PokemonSwSh_DaySkipperUS.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-    using namespace Pokemon;
-
-
-DaySkipperUS_Descriptor::DaySkipperUS_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonSwSh:DaySkipperUS",
-        STRING_POKEMON + " SwSh", "Day Skipper (US)",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonSwSh/DaySkipperUS.md",
-        "A day skipper for US date format that.  (~7100 skips/hour)",
-        FeedbackType::NONE,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_31KB
-    )
-{}
-std::unique_ptr<StatsTracker> DaySkipperUS_Descriptor::make_stats() const{
-    return std::unique_ptr<StatsTracker>(new SkipperStats());
-}
-
-
-
-DaySkipperUS::DaySkipperUS()
-    : SKIPS(
-        "<b>Number of Frame Skips:</b>",
-        LockWhileRunning::LOCKED,
-        10
-    )
-    , REAL_LIFE_YEAR(
-        "<b>Real Life Year:</b>",
-        LockWhileRunning::LOCKED,
-        2023, 2000, 2060
-    )
-    , NOTIFICATION_PROGRESS_UPDATE("Progress Update", true, false, std::chrono::seconds(3600))
-    , NOTIFICATIONS({
-        &NOTIFICATION_PROGRESS_UPDATE,
-        &NOTIFICATION_PROGRAM_FINISH,
-        &NOTIFICATION_ERROR_FATAL,
-    })
-    , m_advanced_options(
-        "<font size=4><b>Advanced Options:</b> You should not need to touch anything below here.</font>"
-    )
-    , CORRECTION_SKIPS(
-        "<b>Auto-Correct Interval:</b><br>Run auto-recovery every this # of skips. Zero disables the auto-corrections.",
-        LockWhileRunning::LOCKED,
-        1000
-    )
-{
-    PA_ADD_OPTION(SKIPS);
-    PA_ADD_OPTION(REAL_LIFE_YEAR);
-    PA_ADD_OPTION(NOTIFICATIONS);
-    PA_ADD_STATIC(m_advanced_options);
-    PA_ADD_OPTION(CORRECTION_SKIPS);
-}
-
-
-void DaySkipperUS::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    SkipperStats& stats = env.current_stats<SkipperStats>();
-    stats.total_skips = SKIPS;
-    stats.runs++;
-
-    //  Setup globals.
-    uint8_t real_life_year = (uint8_t)(
-        REAL_LIFE_YEAR < 2000 ?  0 :
-        REAL_LIFE_YEAR > 2060 ? 60 : REAL_LIFE_YEAR - 2000
-    );
-    uint8_t year = 60;
-    uint32_t remaining_skips = SKIPS;
-
-    //  Connect
-    pbf_press_button(context, BUTTON_ZR, 5, 5);
-
-    //  Setup starting state.
-    skipper_init_view(context);
-    skipper_rollback_year_full(context, true);
-    year = 0;
-
-    uint16_t correct_count = 0;
-    while (remaining_skips > 0){
-        send_program_status_notification(env, NOTIFICATION_PROGRESS_UPDATE);
-
-        skipper_increment_day(context, true);
-
-        correct_count++;
-        year++;
-        remaining_skips--;
-        stats.issued++;
-//        env.log("Skips Remaining: " + tostr_u_commas(remaining_skips));
-        env.update_stats();
-
-        if (year >= 60){
-            if (real_life_year <= 36){
-                skipper_rollback_year_sync(context);
-                year = real_life_year;
-            }else{
-                skipper_rollback_year_full(context, true);
-                year = 0;
-            }
-        }
-        if (CORRECTION_SKIPS != 0 && correct_count == CORRECTION_SKIPS){
-            correct_count = 0;
-            skipper_auto_recovery(context);
-        }
-    }
-
-    //  Prevent the Switch from sleeping and the time from advancing.
-    context.wait_for_all_requests();
-    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
-
-    pbf_wait(context, 15 * TICKS_PER_SECOND);
-    while (true){
-        ssf_press_button1(context, BUTTON_A, 15 * TICKS_PER_SECOND);
-    }
-}
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperUS.h b/SerialPrograms/Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperUS.h
deleted file mode 100644
index db5c33120a..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperUS.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*  Day Skipper (US)
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_DaySkipperUS_H
-#define PokemonAutomation_PokemonSwSh_DaySkipperUS_H
-
-#include "Common/Cpp/Options/StaticTextOption.h"
-#include "Common/Cpp/Options/SimpleIntegerOption.h"
-#include "CommonFramework/Notifications/EventNotificationsTable.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-class DaySkipperUS_Descriptor : public SingleSwitchProgramDescriptor{
-public:
-    DaySkipperUS_Descriptor();
-
-    virtual std::unique_ptr<StatsTracker> make_stats() const override;
-};
-
-
-
-class DaySkipperUS : public SingleSwitchProgramInstance{
-public:
-    DaySkipperUS();
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-    SimpleIntegerOption<uint32_t> SKIPS;
-    SimpleIntegerOption<uint16_t> REAL_LIFE_YEAR;
-
-    EventNotificationOption NOTIFICATION_PROGRESS_UPDATE;
-    EventNotificationsOption NOTIFICATIONS;
-
-    SectionDividerOption m_advanced_options;
-    SimpleIntegerOption<uint16_t> CORRECTION_SKIPS;
-};
-
-
-}
-}
-}
-#endif
-
-
-
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_EventBeamFinder.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_EventBeamFinder.cpp
deleted file mode 100644
index 32a7a9ddfd..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_EventBeamFinder.cpp
+++ /dev/null
@@ -1,105 +0,0 @@
-/*  Event Beam Finder
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "NintendoSwitch/NintendoSwitch_Settings.h"
-#include "NintendoSwitch/FixedInterval.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonSwSh/PokemonSwSh_Settings.h"
-#include "PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
-#include "PokemonSwSh_EventBeamFinder.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-    using namespace Pokemon;
-
-
-EventBeamFinder_Descriptor::EventBeamFinder_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonSwSh:EventBeamFinder",
-        STRING_POKEMON + " SwSh", "Event Beam Finder",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonSwSh/EventBeamFinder.md",
-        "Drop wishing pieces until you find an event den.",
-        FeedbackType::NONE,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-
-
-
-EventBeamFinder::EventBeamFinder()
-    : WAIT_TIME_IN_DEN(
-        "<b>Wait time in Den:</b>",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "5 * TICKS_PER_SECOND"
-    )
-{
-    PA_ADD_OPTION(START_LOCATION);
-    PA_ADD_OPTION(WAIT_TIME_IN_DEN);
-}
-
-
-void EventBeamFinder::goto_near_den(BotBaseContext& context) const{
-    ssf_hold_joystick1(context, true, STICK_CENTER, STICK_MIN, 375);
-    pbf_wait(context, 50);
-    ssf_press_button1(context, BUTTON_PLUS, 100);
-    ssf_press_joystick2(context, true, STICK_MAX, STICK_CENTER, 100, 5);
-    ssf_press_button1(context, BUTTON_L, 100);
-    ssf_press_button1(context, BUTTON_PLUS, 100);
-    ssf_hold_joystick1(context, true, STICK_CENTER, STICK_MIN, 370);
-}
-void EventBeamFinder::goto_far_den(BotBaseContext& context) const{
-    ssf_hold_joystick1(context, true, STICK_CENTER, STICK_MIN, 992);
-    pbf_wait(context, 50);
-    ssf_press_button1(context, BUTTON_PLUS, 100);
-    ssf_press_joystick2(context, true, STICK_MIN, STICK_CENTER, 100, 5);
-    ssf_press_button1(context, BUTTON_L, 100);
-    ssf_press_button1(context, BUTTON_PLUS, 100);
-    ssf_hold_joystick1(context, true, STICK_CENTER, STICK_MIN, 300);
-}
-void EventBeamFinder::drop_wishing_piece(BotBaseContext& context) const{
-    ssf_press_button2(context, BUTTON_A, 200, 10);
-    ssf_press_button2(context, BUTTON_A, 150, 10);
-    ssf_press_button1(context, BUTTON_A, 5);
-    pbf_mash_button(context, BUTTON_B, 500);
-    ssf_press_button2(context, BUTTON_A, WAIT_TIME_IN_DEN + 100, 10);
-    pbf_mash_button(context, BUTTON_B, 600);
-}
-void EventBeamFinder::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    if (START_LOCATION.start_in_grip_menu()){
-        grip_menu_connect_go_home(context);
-        resume_game_no_interact(env.console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST);
-        pbf_mash_button(context, BUTTON_B, 700);
-    }else{
-        pbf_press_button(context, BUTTON_B, 5, 5);
-    }
-
-    bool parity = false;
-    while (true){
-        //  Fly back to daycare.
-        ssf_press_button2(context, BUTTON_X, GameSettings::instance().OVERWORLD_TO_MENU_DELAY, 20);
-        pbf_mash_button(context, BUTTON_A, 700);
-
-        //  Goto den.
-        if (parity){
-            goto_far_den(context);
-        }else{
-            goto_near_den(context);
-        }
-        parity = !parity;
-
-        //  Drop wishing piece and see what you get.
-        drop_wishing_piece(context);
-    }
-}
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_EventBeamFinder.h b/SerialPrograms/Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_EventBeamFinder.h
deleted file mode 100644
index 9781772dae..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_EventBeamFinder.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*  Event Beam Finder
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_EventBeamFinder_H
-#define PokemonAutomation_PokemonSwSh_EventBeamFinder_H
-
-#include "Common/Cpp/Options/TimeExpressionOption.h"
-#include "NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-class EventBeamFinder_Descriptor : public SingleSwitchProgramDescriptor{
-public:
-    EventBeamFinder_Descriptor();
-};
-
-
-
-class EventBeamFinder : public SingleSwitchProgramInstance{
-public:
-    EventBeamFinder();
-
-
-    void goto_near_den(BotBaseContext& context) const;
-    void goto_far_den(BotBaseContext& context) const;
-    void drop_wishing_piece(BotBaseContext& context) const;
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-    StartInGripOrGameOption START_LOCATION;
-
-    TimeExpressionOption<uint16_t> WAIT_TIME_IN_DEN;
-};
-
-
-}
-}
-}
-#endif
-
-
-
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_PurpleBeamFinder.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_PurpleBeamFinder.cpp
deleted file mode 100644
index 1dbc91e3bc..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_PurpleBeamFinder.cpp
+++ /dev/null
@@ -1,250 +0,0 @@
-/*  Purple Beam Finder
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Cpp/PrettyPrint.h"
-#include "CommonFramework/GlobalSettingsPanel.h"
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "CommonFramework/Notifications/ProgramNotifications.h"
-#include "CommonFramework/Tools/StatsTracking.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Device.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "NintendoSwitch/NintendoSwitch_Settings.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonSwSh/PokemonSwSh_Settings.h"
-#include "PokemonSwSh/Commands/PokemonSwSh_Commands_GameEntry.h"
-#include "PokemonSwSh/Inference/PokemonSwSh_SelectionArrowFinder.h"
-#include "PokemonSwSh/Inference/Dens/PokemonSwSh_BeamSetter.h"
-#include "PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
-#include "PokemonSwSh_PurpleBeamFinder.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-    using namespace Pokemon;
-
-
-PurpleBeamFinder_Descriptor::PurpleBeamFinder_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonSwSh:PurpleBeamFinder",
-        STRING_POKEMON + " SwSh", "Purple Beam Finder",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonSwSh/PurpleBeamFinder.md",
-        "Automatically reset for a purple beam.",
-        FeedbackType::REQUIRED,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-struct PurpleBeamFinder_Descriptor::Stats : public StatsTracker{
-    Stats()
-        : attempts(m_stats["Attempts"])
-        , errors(m_stats["Errors"])
-        , timeouts(m_stats["Timeouts"])
-        , red_detected(m_stats["Red Detected"])
-        , red_presumed(m_stats["Red Presumed"])
-        , red(m_stats["Red"])
-        , purple(m_stats["Purple"])
-    {
-        m_display_order.emplace_back(Stat("Attempts"));
-        m_display_order.emplace_back(Stat("Errors"));
-        m_display_order.emplace_back(Stat("Timeouts"));
-//        m_display_order.emplace_back(Stat("Red Detected"));
-//        m_display_order.emplace_back(Stat("Red Presumed"));
-        m_display_order.emplace_back(Stat("Red"));
-        m_display_order.emplace_back(Stat("Purple"));
-        m_aliases["Red Detected"] = "Red";
-        m_aliases["Red Presumed"] = "Red";
-    }
-    std::atomic<uint64_t>& attempts;
-    std::atomic<uint64_t>& errors;
-    std::atomic<uint64_t>& timeouts;
-    std::atomic<uint64_t>& red_detected;
-    std::atomic<uint64_t>& red_presumed;
-    std::atomic<uint64_t>& red;
-    std::atomic<uint64_t>& purple;
-};
-std::unique_ptr<StatsTracker> PurpleBeamFinder_Descriptor::make_stats() const{
-    return std::unique_ptr<StatsTracker>(new Stats());
-}
-
-
-
-PurpleBeamFinder::PurpleBeamFinder()
-    : NOTIFICATION_RED_BEAM("Red Beam", false, false)
-    , NOTIFICATION_PURPLE_BEAM("Purple Beam", true, true, ImageAttachmentMode::JPG)
-    , NOTIFICATIONS({
-        &NOTIFICATION_RED_BEAM,
-        &NOTIFICATION_PURPLE_BEAM,
-        &NOTIFICATION_ERROR_FATAL,
-    })
-    , m_advanced_options(
-        "<font size=4><b>Advanced Options:</b> Don't adjust these unless you're having problems.</font>"
-    )
-    , SAVE_SCREENSHOT(
-        "<b>Screenshot Purple Beams:</b> (for debugging purposes)",
-        LockWhileRunning::LOCKED,
-        false
-    )
-    , TIMEOUT_DELAY(
-        "<b>Timeout Delay:</b><br>Reset if no beam is detected after this long.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "2 * TICKS_PER_SECOND"
-    )
-//    , MAX_STDDEV(
-//        "<b>Maximum Standard Deviation:</b><br>Range: 0 - 768",
-//        10, 0, 768
-//    )
-    , MIN_BRIGHTNESS(
-        "<b>Minimum Brightness:</b><br>Range: 0 - 768",
-        LockWhileRunning::LOCKED,
-        500, 0, 768
-    )
-    , MIN_EUCLIDEAN(
-        "<b>Minimum Euclidean Distance:</b><br>Range: 0 - 443",
-        LockWhileRunning::LOCKED,
-        15, 0, 443
-    )
-    , MIN_DELTA_STDDEV_RATIO(
-        "<b>Minimum Delta/Stddev Ratio:</b>",
-        LockWhileRunning::LOCKED,
-        5.0, 0
-    )
-    , MIN_SIGMA_STDDEV_RATIO(
-        "<b>Minimum Sigma/Stddev Ratio:</b>",
-        LockWhileRunning::LOCKED,
-        5.0, 0
-    )
-{
-    PA_ADD_OPTION(START_LOCATION);
-    PA_ADD_OPTION(NOTIFICATIONS);
-    if (PreloadSettings::instance().DEVELOPER_MODE){
-        PA_ADD_STATIC(m_advanced_options);
-        PA_ADD_OPTION(TIMEOUT_DELAY);
-        PA_ADD_OPTION(MIN_BRIGHTNESS);
-        PA_ADD_OPTION(MIN_EUCLIDEAN);
-        PA_ADD_OPTION(MIN_DELTA_STDDEV_RATIO);
-        PA_ADD_OPTION(MIN_SIGMA_STDDEV_RATIO);
-    }
-}
-
-
-
-
-bool PurpleBeamFinder::run(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    PurpleBeamFinder_Descriptor::Stats& stats = env.current_stats<PurpleBeamFinder_Descriptor::Stats>();
-
-    SelectionArrowFinder arrow_detector(env.console.overlay(), {0.5, 0.5, 0.3, 0.3});
-    int ret = run_until(
-        env.console, context,
-        [](BotBaseContext& context){
-            pbf_mash_button(context, BUTTON_A, 1000);
-        },
-        { arrow_detector }
-    );
-    if (ret < 0){
-        env.log("Failed to detect cursor.", COLOR_RED);
-        stats.errors++;
-        return false;
-    }
-    env.log("Detected initial prompt.");
-
-    pbf_mash_button(context, BUTTON_A, 50);
-    pbf_wait(context, 100);
-    context.wait_for_all_requests();
-
-    ret = run_until(
-        env.console, context,
-        [](BotBaseContext& context){
-            pbf_press_button(context, BUTTON_A, 10, 300);
-        },
-        { arrow_detector }
-    );
-    if (ret < 0){
-        env.log("Failed to detect save confirmation.", COLOR_RED);
-        stats.errors++;
-        return false;
-    }
-    env.log("Detected save confirmation.");
-
-    BeamSetter::Detection detection;
-    {
-        BeamSetter setter(env, env.console, context);
-        detection = setter.run(
-            SAVE_SCREENSHOT,
-            TIMEOUT_DELAY,
-            MIN_BRIGHTNESS,
-            MIN_EUCLIDEAN,
-            MIN_DELTA_STDDEV_RATIO,
-            MIN_SIGMA_STDDEV_RATIO
-        );
-        stats.attempts++;
-    }
-    switch (detection){
-    case BeamSetter::NO_DETECTION:
-        stats.timeouts++;
-        send_program_status_notification(env, NOTIFICATION_RED_BEAM, "Red Beam...");
-        return false;
-    case BeamSetter::RED_DETECTED:
-        stats.red_detected++;
-        send_program_status_notification(env, NOTIFICATION_RED_BEAM, "Red Beam...");
-        return false;
-    case BeamSetter::RED_ASSUMED:
-        stats.red_presumed++;
-        send_program_status_notification(env, NOTIFICATION_RED_BEAM, "Red Beam...");
-        return false;
-    case BeamSetter::PURPLE:
-        stats.purple++;
-        return true;
-    }
-
-    return false;
-}
-
-void PurpleBeamFinder::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    if (START_LOCATION.start_in_grip_menu()){
-        grip_menu_connect_go_home(context);
-        resume_game_front_of_den_nowatts(context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST);
-        pbf_mash_button(context, BUTTON_B, 100);
-    }else{
-        pbf_press_button(context, BUTTON_B, 5, 5);
-    }
-    context.wait_for_all_requests();
-
-    while (true){
-        bool exit = run(env, context);
-        env.update_stats();
-        if (exit){
-            break;
-        }
-
-        pbf_press_button(context, BUTTON_HOME, 10, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE);
-        reset_game_from_home_with_inference(
-            env.console, context,
-            ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST
-        );
-    }
-
-    context.wait_for(std::chrono::seconds(2));
-    send_program_finished_notification(
-        env, NOTIFICATION_PURPLE_BEAM,
-        "Found a purple beam!",
-        env.console.video().snapshot()
-    );
-    while (true){
-        pbf_press_button(context, BUTTON_B, 20, 20);
-        pbf_press_button(context, BUTTON_LCLICK, 20, 20);
-    }
-}
-
-
-
-
-
-}
-}
-}
-
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggAutonomous.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggAutonomous.cpp
deleted file mode 100644
index eff502c37b..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggAutonomous.cpp
+++ /dev/null
@@ -1,846 +0,0 @@
-/*  Egg Autonomous
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <cmath>
-#include "CommonFramework/GlobalSettingsPanel.h"
-#include "CommonFramework/Exceptions/OperationFailedException.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
-#include "CommonFramework/Notifications/ProgramNotifications.h"
-#include "CommonFramework/Tools/ErrorDumper.h"
-#include "CommonFramework/Tools/StatsTracking.h"
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "CommonFramework/VideoPipeline/VideoOverlay.h"
-#include "NintendoSwitch/NintendoSwitch_Settings.h"
-#include "Pokemon/Pokemon_Notification.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.h"
-#include "PokemonSwSh/Inference/PokemonSwSh_BoxGenderDetector.h"
-#include "PokemonSwSh/Inference/PokemonSwSh_BoxShinySymbolDetector.h"
-#include "PokemonSwSh/Inference/PokemonSwSh_DialogBoxDetector.h"
-#include "PokemonSwSh/Inference/PokemonSwSh_IVCheckerReader.h"
-#include "PokemonSwSh/Inference/PokemonSwSh_BoxNatureDetector.h"
-#include "PokemonSwSh/Inference/PokemonSwSh_SelectionArrowFinder.h"
-#include "PokemonSwSh/Inference/PokemonSwSh_YCommDetector.h"
-#include "PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
-#include "PokemonSwSh_EggHelpers.h"
-#include "PokemonSwSh_EggAutonomous.h"
-#include "PokemonSwSh/Commands/PokemonSwSh_Commands_EggRoutines.h"
-#include "PokemonSwSh/Programs/PokemonSwSh_MenuNavigation.h"
-
-namespace PokemonAutomation{
-
-using namespace Pokemon;
-
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-namespace {
-
-// We assume Pokemon app is always at row 0, col 1
-const size_t POKEMON_APP_INDEX = 1;
-// We assume Town Map app is always at row 1, col 0
-const size_t TOWN_MAP_APP_INDEX = 5;
-
-
-}
-
-
-EggAutonomous_Descriptor::EggAutonomous_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonSwSh:EggAutonomous",
-        STRING_POKEMON + " SwSh", "Egg Autonomous",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonSwSh/EggAutonomous.md",
-        "Automatically fetch+hatch eggs and keep all shinies.",
-        FeedbackType::REQUIRED,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_31KB
-    )
-{}
-
-class EggAutonomous_Descriptor::Stats : public StatsTracker{
-public:
-    Stats()
-        : m_hatched(m_stats["Eggs Hatched"])
-        , m_errors(m_stats["Errors"])
-        , m_fetch_attempts(m_stats["Fetch Attempts"])
-        , m_fetch_success(m_stats["Fetch Success"])
-        , m_shinies(m_stats["Shinies"])
-    {
-        m_display_order.emplace_back("Eggs Hatched");
-        m_display_order.emplace_back("Errors", true);
-        m_display_order.emplace_back("Fetch Attempts");
-        m_display_order.emplace_back("Fetch Success");
-        m_display_order.emplace_back("Shinies");
-    }
-
-    std::atomic<uint64_t>& m_hatched;
-    std::atomic<uint64_t>& m_errors;
-    std::atomic<uint64_t>& m_fetch_attempts;
-    std::atomic<uint64_t>& m_fetch_success;
-    std::atomic<uint64_t>& m_shinies;
-};
-std::unique_ptr<StatsTracker> EggAutonomous_Descriptor::make_stats() const{
-    return std::unique_ptr<StatsTracker>(new Stats());
-}
-
-
-EggAutonomous::EggAutonomous()
-    : GO_HOME_WHEN_DONE(false)
-    , LANGUAGE(
-        "<b>Game Language:</b><br>Required to read IVs.",
-        IV_READER().languages(),
-        LockWhileRunning::LOCKED,
-        false
-    )
-    , MAX_KEEPERS(
-        "<b>Max Keepers:</b><br>Stop the program after keeping this many " + STRING_POKEMON + ". "
-        "This number plus the number of " + STRING_POKEMON + " in the box left to your current box must not exceed 30. "
-        "Otherwise, the program will break when that box is full.",
-        LockWhileRunning::LOCKED,
-        10, 1, 30
-    )
-    , LOOPS_PER_FETCH(
-        "<b>Bike Loops Per Fetch:</b><br>Fetch an egg after doing this many bike loops on Route 5.",
-        LockWhileRunning::LOCKED,
-        1, 1
-    )
-    , NUM_EGGS_IN_COLUMN(
-        "<b>Num Eggs in Column:</b><br>How many eggs already deposited in the first column in Box 1.",
-        {
-            {0, "0", "0"},
-            {1, "1", "1"},
-            {2, "2", "2"},
-            {3, "3", "3"},
-            {4, "4", "4"},
-            {5, "5", "5"},
-        },
-        LockWhileRunning::LOCKED,
-        0
-    )
-    , AUTO_SAVING(
-        "<b>Auto-Saving:</b><br>Automatically save the game to recover from crashes and allow eggs to be unhatched.<br>"
-        "(Unhatching eggs can be useful for obtaining breeding parents by rehatching a perfect egg in a game with a different language.)<br><br>"
-        "To collect (unhatched) eggs with the desired stats, set this option to \"Save before every batch\". "
-        "Then set the Action Table below to \"Stop Program\" on the desired stats. "
-        "Once the program stops on the baby with the desired stats, you can manually reset the game and it will revert to an egg in your party.",
-        {
-            {AutoSave::NoAutoSave, "none", "No auto-saving. (No error/crash recovery.)"},
-            {AutoSave::AfterStartAndKeep, "start-and-keep", "Save at beginning and after obtaining each baby that is kept. (Allows for error/crash recovery.)"},
-            {AutoSave::EveryBatch, "every-batch", "Save before every batch. (Allows you to unhatch eggs.)"},
-        },
-        LockWhileRunning::LOCKED,
-        AutoSave::AfterStartAndKeep
-    )
-    , DEBUG_PROCESSING_HATCHED(
-        "Debug the part of program after all eggs hatched",
-        LockWhileRunning::LOCKED,
-        false
-    )
-    , SAVE_DEBUG_VIDEO(
-        "<b>Save debug videos to Switch:</b>",
-        LockWhileRunning::LOCKED,
-        false
-    )
-    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
-    , NOTIFICATION_NONSHINY_KEEP(
-        "Non-Shiny Keep",
-        true, true, ImageAttachmentMode::JPG,
-        {"Notifs"}
-    )
-    , NOTIFICATION_SHINY(
-        "Shiny Hatch",
-        true, true, ImageAttachmentMode::JPG,
-        {"Notifs", "Showcase"}
-    )
-    , m_notification_noop("", false, false)
-    , NOTIFICATIONS({
-        &NOTIFICATION_STATUS_UPDATE,
-        &NOTIFICATION_NONSHINY_KEEP,
-        &NOTIFICATION_SHINY,
-        &NOTIFICATION_PROGRAM_FINISH,
-        &NOTIFICATION_ERROR_RECOVERABLE,
-        &NOTIFICATION_ERROR_FATAL,
-    })
-{
-    PA_ADD_OPTION(START_LOCATION);
-    PA_ADD_OPTION(TOUCH_DATE_INTERVAL);
-    // PA_ADD_OPTION(STEPS_TO_HATCH);
-
-    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
-    PA_ADD_OPTION(LANGUAGE);
-    PA_ADD_OPTION(MAX_KEEPERS);
-    PA_ADD_OPTION(LOOPS_PER_FETCH);
-    PA_ADD_OPTION(NUM_EGGS_IN_COLUMN);
-    PA_ADD_OPTION(AUTO_SAVING);
-    PA_ADD_OPTION(FILTERS);
-    PA_ADD_OPTION(NOTIFICATIONS);
-
-    if (PreloadSettings::instance().DEVELOPER_MODE){
-        PA_ADD_OPTION(DEBUG_PROCESSING_HATCHED);
-        PA_ADD_OPTION(SAVE_DEBUG_VIDEO);
-    }
-}
-
-void EggAutonomous::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    auto& stats = env.current_stats<EggAutonomous_Descriptor::Stats>();
-    env.update_stats();
-
-    if (START_LOCATION.start_in_grip_menu()){
-        grip_menu_connect_go_home(context);
-        resume_game_back_out(env.console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST, 400);
-    }else{
-        pbf_press_button(context, BUTTON_B, 5, 5);
-    }
-
-    if (DEBUG_PROCESSING_HATCHED){ // only for debugging
-        const bool need_taxi = true;
-        process_hatched_pokemon(env, context, stats, need_taxi);
-        return;
-    }
-
-
-    if (AUTO_SAVING == AutoSave::AfterStartAndKeep){
-        save_game(env, context);
-        m_num_eggs_in_storage_when_game_saved = static_cast<uint8_t>(NUM_EGGS_IN_COLUMN.current_value());
-    }
-    m_num_eggs_retrieved = static_cast<uint8_t>(NUM_EGGS_IN_COLUMN.current_value());
-
-    m_num_pokemon_kept = 0;
-
-    m_player_at_loop_start = false;
-
-    // while(run_batch(env, context, stats)){}
-
-    size_t consecutive_failures = 0;
-    while(m_num_pokemon_kept < MAX_KEEPERS){
-        try{
-            if (TOUCH_DATE_INTERVAL.ok_to_touch_now()){
-                env.log("Touching date to prevent rollover.");
-                env.console.overlay().add_log("Touching date", COLOR_WHITE);
-                pbf_press_button(context, BUTTON_HOME, 10, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE);
-                touch_date_from_home(context, ConsoleSettings::instance().SETTINGS_TO_HOME_DELAY);
-                resume_game_no_interact(env.console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST);
-            }
-
-            // Hatch one batch of eggs. If run_batch() returns true, stop the egg loop.
-            if (run_batch(env, context, stats)){
-                break;
-            }
-            env.log("stats: " + stats.to_str());
-            // We successfully finish one egg loop iteration without any error thrown.
-            // So we reset the failure counter.
-            consecutive_failures = 0;
-        }catch (OperationFailedException& e){
-            stats.m_errors++;
-            env.update_stats();
-            e.send_notification(env, NOTIFICATION_ERROR_RECOVERABLE);
-            
-            if (SAVE_DEBUG_VIDEO){
-                // Take a video to give more context for debugging
-                pbf_press_button(context, BUTTON_CAPTURE, 2 * TICKS_PER_SECOND, 2 * TICKS_PER_SECOND);
-                context.wait_for_all_requests();
-            }
-
-            // If there is no auto save, then we shouldn't reset to game to lose previous progress.
-            if (AUTO_SAVING == AutoSave::NoAutoSave){
-                throw;
-            }
-
-            consecutive_failures++;
-            if (consecutive_failures >= 3){
-                throw OperationFailedException(
-                    ErrorReport::SEND_ERROR_REPORT, env.console,
-                    "Failed 3 batches in the row.",
-                    true
-                );
-            }
-            pbf_press_button(context, BUTTON_HOME, 10, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE);
-            env.console.overlay().add_log("Reset game", COLOR_WHITE);
-            reset_game_from_home_with_inference(
-                env.console, context,
-                ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST
-            );
-
-            m_player_at_loop_start = false;
-            m_num_eggs_retrieved = m_num_eggs_in_storage_when_game_saved;
-        }
-    }
-
-    env.update_stats();
-    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
-    GO_HOME_WHEN_DONE.run_end_of_program(context);
-}
-
-// Run one iteration of the egg loop:
-// - Hatch five eggs while fetch five eggs.
-// - Check if pokemon needs to be kept. Keep them if needed.
-// - Put five eggs from storage to party. Save game if needed.
-// Return true if the egg loop should stop.
-bool EggAutonomous::run_batch(SingleSwitchProgramEnvironment& env, BotBaseContext& context, EggAutonomous_Descriptor::Stats& stats){
-    env.update_stats();
-    send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
-
-    if (m_player_at_loop_start == false){ // reset position
-        const bool fly_from_overworld = true; // fly from menu
-        call_flying_taxi(env, context, fly_from_overworld);
-    }
-
-    size_t bike_loop_count = 0;
-    const size_t MAX_BIKE_LOOP_COUNT = 100;
-    size_t num_eggs_hatched = 0;
-    m_player_at_loop_start = false;
-
-    // Each iteration in the while-loop is made by:
-    // - bike loops of LOOPS_PER_FETCH times. Bike loops begin at lady or nursery front door, end at lady.
-    // - if not enough eggs fetched, talk to lady to try fetching an egg.
-    while(num_eggs_hatched < 5 || m_num_eggs_retrieved < 5){
-        // Detect when Y-Comm icon disappears. This is the time an egg is hatching
-        const bool y_comm_visible_when_egg_hatching = false;
-        YCommIconDetector egg_hatching_detector(y_comm_visible_when_egg_hatching);
-
-        bool restart_bike_loop = false;
-        for(size_t i_bike_loop = 0; i_bike_loop < this->LOOPS_PER_FETCH && bike_loop_count < MAX_BIKE_LOOP_COUNT;){
-            context.wait_for_all_requests();
-            // +1 here because video overlay is for general users. Genearl users start counts at 1, while us programmers start count at 0.
-            if (restart_bike_loop){
-                env.console.overlay().add_log("Restart loop " + std::to_string(bike_loop_count+1), COLOR_WHITE);
-                restart_bike_loop = false;
-            } else {
-                env.console.overlay().add_log("Loop " + std::to_string(bike_loop_count+1), COLOR_WHITE);
-            }
-            int ret = run_until(
-                env.console, context,
-                [](BotBaseContext& context){
-                    travel_to_spin_location(context);
-                    travel_back_to_lady(context);
-                },
-                {{egg_hatching_detector}}
-            );
-
-            if (ret < 0){ // we are at nursery lady; no egg hatching detected
-                ++i_bike_loop;
-                ++bike_loop_count;
-                continue;
-            }
-
-            // Egg hatching
-            do {
-                ++num_eggs_hatched;
-                stats.m_hatched++;
-                env.update_stats();
-                wait_for_egg_hatched(env, context, stats, num_eggs_hatched);
-                if (num_eggs_hatched == 5){
-                    // We hatched all five eggs. No more eggs can hatch. Go to next loop
-                    break;
-                }
-                // Now we see if we can hatch one more egg.
-                ret = run_until(
-                    env.console, context,
-                    [](BotBaseContext& context){
-                        // Try move a little to hatch more:
-                        // We move toward lower-left so that it wont hit the lady or enter the Nursory.
-                        pbf_move_left_joystick(context, 0, 255, 100, 10);
-                    },
-                    {{egg_hatching_detector}}
-                );
-            } while(ret == 0);
-            // now no more hatching in this bike loop
-            // We either cannot find a consecutive hatch any more or we already hatch five of them
-
-            if (num_eggs_hatched == 5 && m_num_eggs_retrieved == 5){
-                m_player_at_loop_start = false;
-                break;
-            }
-
-            // Now we either cannot find a consecutive hatch any more, or we already hatch five for them, but
-            // we still need to fetch more eggs
-
-            // Use fly to reset the location because now we don't know where the player character is.
-            const bool fly_from_overworld = true;
-            call_flying_taxi(env, context, fly_from_overworld);
-            restart_bike_loop = true;
-            // We don't update i_bike_loop here because we haven't finished one full bike loop due to egg hatching
-        } // end one bike loop
-
-        if (bike_loop_count >= MAX_BIKE_LOOP_COUNT){
-            env.log("Reached max number of bike loops " + std::to_string(MAX_BIKE_LOOP_COUNT));
-            env.console.overlay().add_log("Error: max loops " + std::to_string(MAX_BIKE_LOOP_COUNT), COLOR_WHITE);
-            env.log("Take a screenshot of party to debug.");
-            // Now take a photo at the player's party for dumping debug info:
-            // Enter Rotom Phone menu
-            pbf_press_button(context, BUTTON_X, 10, GameSettings::instance().OVERWORLD_TO_MENU_DELAY);
-            // Select Pokemon App
-            navigate_to_menu_app(env, env.console, context, POKEMON_APP_INDEX, NOTIFICATION_ERROR_RECOVERABLE);
-            // From menu enter Pokemon App
-            ssf_press_button2(context, BUTTON_A, GameSettings::instance().MENU_TO_POKEMON_DELAY, EGG_BUTTON_HOLD_DELAY);
-            context.wait_for_all_requests();
-
-            throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, env.console,
-                "Max number of loops reached. Not enough eggs in party?",
-                true
-            );
-        }
-        
-        context.wait_for_all_requests();
-        if (m_num_eggs_retrieved < 5){
-            // Update num_eggs_retrieved
-            m_num_eggs_retrieved = talk_to_lady_to_fetch_egg(env, context, stats, m_num_eggs_retrieved);
-            if (num_eggs_hatched == 5 && m_num_eggs_retrieved == 5){
-                m_player_at_loop_start = true;
-                break;
-            }
-        }
-    }
-
-    // - Go to pokemon storage.
-    // - Check the hatched pokemon, keep shiny pokemon and those that match the stats requirements. Release the rest.
-    // - Retrieve the stored egg column to the party.
-    // - Call flying taxi to reset player location if needed
-    // Return true if the program should stop
-    size_t last_num_pokemon_kept = m_num_pokemon_kept;
-    if (process_hatched_pokemon(env, context, stats, !m_player_at_loop_start)){
-        // While checking hatched pokemon, we find that We need to stop the program:
-        return true;
-    }
-    m_num_eggs_retrieved = 0;
-    // after process_hatched_pokemon(), the player location is at the start of bike loop
-    m_player_at_loop_start = true;
-
-    bool save = false;
-    switch (AUTO_SAVING){
-    case AutoSave::NoAutoSave:
-        break;
-    case AutoSave::AfterStartAndKeep:
-        save = (last_num_pokemon_kept != m_num_pokemon_kept);
-        break;
-    case AutoSave::EveryBatch:
-        save = true;
-        break;
-    default:
-        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Invalid saving option.");
-    }
-
-    if (save){
-        save_game(env, context);
-        m_num_eggs_in_storage_when_game_saved = 0;
-    }
-    
-    context.wait_for_all_requests();
-    return false;
-}
-
-void EggAutonomous::save_game(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    context.wait_for_all_requests();
-    env.log("Save game.");
-    env.console.overlay().add_log("Save game", COLOR_WHITE);
-    pbf_press_button(context, BUTTON_X, 10, GameSettings::instance().OVERWORLD_TO_MENU_DELAY);
-    pbf_press_button(context, BUTTON_R, 10, 2 * TICKS_PER_SECOND);
-    pbf_press_button(context, BUTTON_A, 10, 5 * TICKS_PER_SECOND);
-    wait_for_y_comm_icon(env, context, "Cannot detect end of saving game.");
-}
-
-void EggAutonomous::call_flying_taxi(SingleSwitchProgramEnvironment& env, BotBaseContext& context, bool fly_from_overworld){
-    context.wait_for_all_requests();
-    env.log("Fly to reset position");
-    env.console.overlay().add_log("Call Flying Taxi", COLOR_WHITE);
-    if (fly_from_overworld){
-        // Open menu
-        ssf_press_button2(context, BUTTON_X, GameSettings::instance().OVERWORLD_TO_MENU_DELAY, 20);
-    }
-
-    navigate_to_menu_app(env, env.console, context, TOWN_MAP_APP_INDEX, NOTIFICATION_ERROR_RECOVERABLE);
-
-    fly_home(context, false);
-    wait_for_y_comm_icon(env, context, "Cannot detect end of flying taxi animation.");
-}
-
-void EggAutonomous::wait_for_egg_hatched(SingleSwitchProgramEnvironment& env, BotBaseContext& context, EggAutonomous_Descriptor::Stats& stats, size_t num_hatched_eggs){
-    env.console.overlay().add_log("Egg hatching " + std::to_string(num_hatched_eggs) + "/5", COLOR_GREEN);
-    const bool y_comm_visible_at_end_of_egg_hatching = true;
-    YCommIconDetector end_egg_hatching_detector(y_comm_visible_at_end_of_egg_hatching);
-    const int ret = run_until(
-        env.console, context,
-        [](BotBaseContext& context){
-            pbf_mash_button(context, BUTTON_B, 60 * TICKS_PER_SECOND);
-        },
-        {{end_egg_hatching_detector}}
-    );
-    if (ret > 0){
-        throw OperationFailedException(
-            ErrorReport::SEND_ERROR_REPORT, env.console,
-            "Cannot detect egg hatching ends.",
-            true
-        );
-    }
-}
-
-size_t EggAutonomous::talk_to_lady_to_fetch_egg(
-    SingleSwitchProgramEnvironment& env,
-    BotBaseContext& context,
-    EggAutonomous_Descriptor::Stats& stats,
-    size_t num_eggs_retrieved
-){
-    env.log("Fetching egg");
-    stats.m_fetch_attempts++;
-    env.update_stats();
-    // collect_egg(context);
-    RetrieveEggArrowFinder egg_arrow_detector(env.console);
-    CheckNurseryArrowFinder no_egg_arrow_detector(env.console);
-
-    int ret = run_until(
-        env.console, context,
-        [](BotBaseContext& context){
-            for (size_t i_hatched = 0; i_hatched < 2; i_hatched++){
-                pbf_press_button(context, BUTTON_A, 20, 150);
-            }
-            pbf_wait(context, 200);
-        },
-        {
-            {egg_arrow_detector},
-            {no_egg_arrow_detector},
-        }
-    );
-    
-    const bool y_comm_visible_at_end_of_dialog = true;
-    YCommIconDetector dialog_over_detector(y_comm_visible_at_end_of_dialog);
-    if (ret == 0){
-        ++num_eggs_retrieved;
-        env.log("Found egg");
-        env.console.overlay().add_log("Found egg " + std::to_string(num_eggs_retrieved) + "/5", COLOR_WHITE);
-        stats.m_fetch_success++;
-        env.update_stats();
-        // Press A to get the egg
-        ssf_press_button1(context, BUTTON_A, 10);
-
-        ret = run_until(
-            env.console, context,
-            [](BotBaseContext& context){
-                pbf_mash_button(context, BUTTON_B, TICKS_PER_SECOND * 30);
-            },
-            {{dialog_over_detector}}
-        );
-    } else if (ret == 1){
-        env.log("No egg");
-        env.console.overlay().add_log("No egg", COLOR_WHITE);
-        ret = run_until(
-            env.console, context,
-            [](BotBaseContext& context){
-                pbf_mash_button(context, BUTTON_B, TICKS_PER_SECOND * 30);
-            },
-            {{dialog_over_detector}}
-        );
-    } else {
-        throw OperationFailedException(
-            ErrorReport::SEND_ERROR_REPORT, env.console,
-            "Cannot detect dialog selection arrow when talking to Nursery lady.",
-            true
-        );
-    }
-    // If dialog over is not detected:
-    if (ret < 0){
-        throw OperationFailedException(
-            ErrorReport::SEND_ERROR_REPORT, env.console,
-            "Cannot detect end of Nursery lady dialog. No Y-Comm mark found.",
-            true
-        );
-    }
-
-    return num_eggs_retrieved;
-}
-
-// After all five eggs hatched and another five eggs deposit into the first column of the box,
-// call this function to:
-// - Go to pokemon storage.
-// - Check the hatched pokemon, keep shiny pokemon and those that match the stats requirements. Release the rest.
-// - Retrieve the stored egg column to the party.
-// - Call flying taxi to reset player location if needed
-// Return true if the program should stop
-bool EggAutonomous::process_hatched_pokemon(SingleSwitchProgramEnvironment& env, BotBaseContext& context, EggAutonomous_Descriptor::Stats& stats, bool need_taxi){
-    env.log("Checking hatched pokemon.");
-    env.console.overlay().add_log("Checking hatched pokemon", COLOR_WHITE);
-
-    // Press X to open menu
-    ssf_press_button2(context, BUTTON_X, GameSettings::instance().OVERWORLD_TO_MENU_DELAY, 20);
-
-    navigate_to_menu_app(env, env.console, context, POKEMON_APP_INDEX, NOTIFICATION_ERROR_RECOVERABLE);
-
-    const uint16_t BOX_SCROLL_DELAY = GameSettings::instance().BOX_SCROLL_DELAY;
-    const uint16_t BOX_CHANGE_DELAY = GameSettings::instance().BOX_CHANGE_DELAY;
-    const uint16_t BOX_PICKUP_DROP_DELAY = GameSettings::instance().BOX_PICKUP_DROP_DELAY;
-
-    // From menu enter Pokemon App
-    ssf_press_button2(context, BUTTON_A, GameSettings::instance().MENU_TO_POKEMON_DELAY, EGG_BUTTON_HOLD_DELAY);
-    // From Pokemon App to storage box
-    ssf_press_button2(context, BUTTON_R, GameSettings::instance().POKEMON_TO_BOX_DELAY, EGG_BUTTON_HOLD_DELAY);
-    // Move left down to the first hatched pokemon in the party
-    ssf_press_dpad2(context, DPAD_LEFT, BOX_SCROLL_DELAY, EGG_BUTTON_HOLD_DELAY);
-    ssf_press_dpad2(context, DPAD_DOWN, BOX_SCROLL_DELAY, EGG_BUTTON_HOLD_DELAY);
-
-    context.wait_for_all_requests();
-    {
-        // Define the scope of video overlay rendering for various checks:
-        VideoOverlaySet overlay_set(env.console.overlay());
-        BoxShinySymbolDetector::make_overlays(overlay_set);
-        BoxGenderDetector gender_detector;
-        gender_detector.make_overlays(overlay_set);
-        IVCheckerReaderScope iv_reader(env.console.overlay(), LANGUAGE);
-        BoxNatureDetector nature_detector(env.console.overlay());
-
-        for (size_t i_hatched = 0; i_hatched < 5; i_hatched++){
-            pbf_wait(context, 50); // wait for a while to make sure the pokemon stats are loaded.
-            context.wait_for_all_requests();
-            auto screen = env.console.video().snapshot();
-
-            bool shiny = BoxShinySymbolDetector::detect(screen);
-            if (shiny){
-                env.log("Pokemon " + std::to_string(i_hatched) + " is shiny!", COLOR_BLUE);
-                env.console.overlay().add_log("Pokemon " + std::to_string(i_hatched+1) + "/5 is shiny!", COLOR_YELLOW);
-                stats.m_shinies++;
-                env.update_stats();
-                send_encounter_notification(
-                    env,
-                    m_notification_noop,
-                    NOTIFICATION_SHINY,
-                    false, true, {{{}, ShinyType::UNKNOWN_SHINY}}, std::nan(""),
-                    screen
-                );
-            }else{
-                env.log("Pokemon " + std::to_string(i_hatched) + " is not shiny.", COLOR_PURPLE);
-                env.console.overlay().add_log("Pokemon " + std::to_string(i_hatched+1) + "/5 not shiny", COLOR_WHITE);
-            }
-            // Note: we assume the pokemon storage UI is in the state of judging pokemon stats.
-            //   In this way we can detect pokemon stats.
-
-            IVCheckerReader::Results IVs = iv_reader.read(env.console, screen);
-            EggHatchGenderFilter gender = gender_detector.detect(screen);
-            env.log(IVs.to_string(), COLOR_GREEN);
-            env.log("Gender: " + gender_to_string(gender), COLOR_GREEN);
-            NatureReader::Results nature = nature_detector.read(env.console.logger(), screen);
-
-            EggHatchAction action = FILTERS.get_action(shiny, IVs, gender, nature);
-
-            auto send_keep_notification = [&](){
-                if (!shiny){
-                    send_encounter_notification(
-                        env,
-                        NOTIFICATION_NONSHINY_KEEP,
-                        NOTIFICATION_SHINY,
-                        false, false, {}, std::nan(""),
-                        screen
-                    );
-                }
-            };
-            switch (action){
-            case EggHatchAction::StopProgram:
-                env.log("Program stop requested...");
-                env.console.overlay().add_log("Request program stop", COLOR_WHITE);
-                send_keep_notification();
-                return true;
-            case EggHatchAction::Keep:
-                env.log("Moving Pokemon to keep box...", COLOR_BLUE);
-                m_num_pokemon_kept++;
-                env.console.overlay().add_log("Keep pokemon " + std::to_string(m_num_pokemon_kept) + "/" + std::to_string(MAX_KEEPERS), COLOR_YELLOW);
-                send_keep_notification();
-
-                // Press A twice to pick the pokemon
-                ssf_press_button2(context, BUTTON_A, 60, EGG_BUTTON_HOLD_DELAY);
-                ssf_press_button2(context, BUTTON_A, BOX_PICKUP_DROP_DELAY, EGG_BUTTON_HOLD_DELAY);
-
-                // Move it rightward, so that it stays on top of the box area
-                ssf_press_dpad2(context, DPAD_RIGHT, BOX_SCROLL_DELAY, EGG_BUTTON_HOLD_DELAY);
-                // Press Button L to change to the box on the left
-                ssf_press_button2(context, BUTTON_L, BOX_CHANGE_DELAY, EGG_BUTTON_HOLD_DELAY);
-
-                // Because we don't know which place in the box to place the pokemon, we will
-                // throw the pokemon in the all-box view. So it automatically sit in the first empty slot
-                // in the box:
-                
-                // Move it three times upward, so that it stays on top of the "Box List" button
-                ssf_press_dpad2(context, DPAD_UP, BOX_SCROLL_DELAY, EGG_BUTTON_HOLD_DELAY);
-                ssf_press_dpad2(context, DPAD_UP, BOX_SCROLL_DELAY, EGG_BUTTON_HOLD_DELAY);
-                ssf_press_dpad2(context, DPAD_UP, BOX_SCROLL_DELAY, EGG_BUTTON_HOLD_DELAY);
-                
-                // Press the button to go to box list view
-                ssf_press_button2(context, BUTTON_A, BOX_CHANGE_DELAY, EGG_BUTTON_HOLD_DELAY);
-                // Press button A to drop the pokemon into the box
-                ssf_press_button2(context, BUTTON_A, BOX_PICKUP_DROP_DELAY, EGG_BUTTON_HOLD_DELAY);
-                // Press button B to go back to the last box
-                ssf_press_button2(context, BUTTON_B, BOX_CHANGE_DELAY, EGG_BUTTON_HOLD_DELAY);
-                // Press button R to change to the box on the right, the box with the next batch of eggs
-                ssf_press_button2(context, BUTTON_R, BOX_CHANGE_DELAY, EGG_BUTTON_HOLD_DELAY);
-                // Move cursor left to point to the last slot in the party
-                ssf_press_dpad2(context, DPAD_LEFT, BOX_SCROLL_DELAY, EGG_BUTTON_HOLD_DELAY);
-                // Move cursor downward three times so that it goes to the original place (second slot in the party)
-                ssf_press_dpad2(context, DPAD_DOWN, BOX_SCROLL_DELAY, EGG_BUTTON_HOLD_DELAY);
-                ssf_press_dpad2(context, DPAD_DOWN, BOX_SCROLL_DELAY, EGG_BUTTON_HOLD_DELAY);
-                ssf_press_dpad2(context, DPAD_DOWN, BOX_SCROLL_DELAY, EGG_BUTTON_HOLD_DELAY);
-                
-                if (m_num_pokemon_kept >= MAX_KEEPERS){
-                    env.log("Max keepers reached. Stopping program...");
-                    env.console.overlay().add_log("Max Keepers reached.", COLOR_WHITE);
-                    return true;
-                }
-                break;
-            case EggHatchAction::Release:
-                env.log("Releasing Pokemon...", COLOR_PURPLE);
-                env.console.overlay().add_log("Release Pokemon", COLOR_WHITE);
-
-                // ssf_press_button2(context, BUTTON_A, 60, 10);
-                // ssf_press_dpad2(context, DPAD_UP, BOX_SCROLL_DELAY, EGG_BUTTON_HOLD_DELAY);
-                // ssf_press_dpad2(context, DPAD_UP, BOX_SCROLL_DELAY, EGG_BUTTON_HOLD_DELAY);
-                // ssf_press_button2(context, BUTTON_A, 125, 10);
-                // ssf_press_dpad2(context, DPAD_UP, BOX_SCROLL_DELAY, EGG_BUTTON_HOLD_DELAY);
-                // pbf_mash_button(context, BUTTON_A, 180);
-
-                // Press A to open pokemon menu
-                pbf_press_button(context, BUTTON_A, 20, 50);
-                context.wait_for_all_requests();
-                StoragePokemonMenuArrowFinder pokemon_menu_detector(env.console.overlay());
-                int ret = wait_until(
-                    env.console, context, std::chrono::seconds(10),
-                    {{pokemon_menu_detector}}
-                );
-                if (ret != 0){
-                    throw OperationFailedException(
-                        ErrorReport::SEND_ERROR_REPORT, env.console,
-                        "Cannot detect pokemon menu in storage box.",
-                        true
-                    );
-                }
-
-                const bool stop_on_detected = true;
-                BlackDialogBoxDetector dialog_detector(stop_on_detected);
-                VideoOverlaySet dialog_overlay_set(env.console);
-                dialog_detector.make_overlays(dialog_overlay_set);
-
-                // Move cursor upward two times to point to "Release" menu item
-                pbf_press_dpad(context, DPAD_UP, 20, 10);
-                pbf_press_dpad(context, DPAD_UP, 20, 10);
-
-                // Press A to release
-                pbf_press_button(context, BUTTON_A, 20, 105);
-                // Move cursor from "Not release" to "release".
-                pbf_press_dpad(context, DPAD_UP, 20, 30);
-                // Press A to confirm release, wait for a while to let the next dialog box pop up.
-                pbf_press_button(context, BUTTON_A, 20, 200);
-
-                context.wait_for_all_requests();
-                ret = wait_until(
-                    env.console, context, std::chrono::seconds(10),
-                    {{dialog_detector}}
-                );
-                if (ret != 0){
-                    throw OperationFailedException(
-                        ErrorReport::SEND_ERROR_REPORT, env.console,
-                        "Miss second dialog when releasing pokemon.",
-                        true
-                    );
-                }
-                pbf_press_button(context, BUTTON_A, 20, 100);
-                
-                size_t dialog_count = 0;
-                const size_t max_dialog_count = 6;
-                for (; dialog_count < max_dialog_count; dialog_count++){
-                    context.wait_for_all_requests();
-                    if (!dialog_detector.process_frame(env.console.video().snapshot(), current_time())){
-                        break;
-                    }
-                    pbf_press_button(context, BUTTON_A, 20, 100);
-                }
-                if (dialog_count == max_dialog_count){
-                    throw OperationFailedException(
-                        ErrorReport::SEND_ERROR_REPORT, env.console,
-                        "Unexpected dialogs when releasing pokemon.",
-                        true
-                    );
-                }
-                break;
-            }
-        }
-    }
-
-    // Get eggs to party:
-
-    // Move cursor to the first slot in the box
-    ssf_press_dpad2(context, DPAD_UP, BOX_SCROLL_DELAY, EGG_BUTTON_HOLD_DELAY);
-    ssf_press_dpad2(context, DPAD_RIGHT, BOX_SCROLL_DELAY, EGG_BUTTON_HOLD_DELAY);
-
-    // Press Y twice to change selection method to group selection
-    pbf_press_button(context, BUTTON_Y, EGG_BUTTON_HOLD_DELAY, 50);
-    pbf_press_button(context, BUTTON_Y, EGG_BUTTON_HOLD_DELAY, 50);
-
-    // Press A to start selection
-    pbf_press_button(context, BUTTON_A, EGG_BUTTON_HOLD_DELAY, 50);
-    // Move down to selection the entire column
-    for (size_t c = 0; c < 4; c++){
-        ssf_press_dpad2(context, DPAD_DOWN, BOX_SCROLL_DELAY, EGG_BUTTON_HOLD_DELAY);
-    }
-    // Press A to finish the selection
-    ssf_press_button2(context, BUTTON_A, BOX_PICKUP_DROP_DELAY, EGG_BUTTON_HOLD_DELAY);
-    
-    // Move cursor to the second slot in the party
-    ssf_press_dpad2(context, DPAD_LEFT, BOX_SCROLL_DELAY, EGG_BUTTON_HOLD_DELAY);
-    ssf_press_dpad2(context, DPAD_DOWN, BOX_SCROLL_DELAY, EGG_BUTTON_HOLD_DELAY);
-
-    // Press A to finish dropping the egg column 
-    ssf_press_button2(context, BUTTON_A, BOX_PICKUP_DROP_DELAY, EGG_BUTTON_HOLD_DELAY);
-
-    // leave pokemon box, back to pokemon app
-    ssf_press_button2(context, BUTTON_B, GameSettings::instance().BOX_TO_POKEMON_DELAY, EGG_BUTTON_HOLD_DELAY);
-    //  Back out to menu.
-    ssf_press_button2(context, BUTTON_B, GameSettings::instance().POKEMON_TO_MENU_DELAY, EGG_BUTTON_HOLD_DELAY);
-
-    if (need_taxi){
-        bool fly_from_overworld = false; // fly from menu
-        call_flying_taxi(env, context, fly_from_overworld);
-    } else {
-        // Leave menu, go back to overworld
-        const bool y_comm_visible = true;
-        YCommIconDetector y_comm_detector(y_comm_visible);
-        const int ret = run_until(
-            env.console, context,
-            [](BotBaseContext& context){
-                pbf_mash_button(context, BUTTON_B, 5 * TICKS_PER_SECOND);
-            },
-            {{y_comm_detector}}
-        );
-        if (ret > 0){
-            throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, env.console,
-                "Cannot detect Y-Comm after leaving menu.",
-                true
-            );
-        }
-    }
-
-    return false;
-}
-
-void EggAutonomous::wait_for_y_comm_icon(SingleSwitchProgramEnvironment& env, BotBaseContext& context, const std::string& error_msg){
-    context.wait_for_all_requests();
-    const bool y_comm_visible = true;
-    YCommIconDetector y_comm_detector(y_comm_visible);
-    int ret = wait_until(
-        env.console, context, std::chrono::seconds(10),
-        {{y_comm_detector}}
-    );
-    if (ret != 0){
-        throw OperationFailedException(
-            ErrorReport::SEND_ERROR_REPORT, env.console,
-            error_msg + " No Y-Comm mark found.",
-            true
-        );
-    }
-}
-
-
-
-
-}
-}
-}
-
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggAutonomous.h b/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggAutonomous.h
deleted file mode 100644
index 80aecd4ee1..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggAutonomous.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/*  Egg Autonomous
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_EggAutonomous_H
-#define PokemonAutomation_PokemonSwSh_EggAutonomous_H
-
-#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
-#include "Common/Cpp/Options/SimpleIntegerOption.h"
-#include "CommonFramework/Notifications/EventNotificationsTable.h"
-#include "CommonFramework/Options/LanguageOCROption.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
-#include "NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h"
-#include "Pokemon/Options/Pokemon_EggHatchFilter.h"
-#include "PokemonSwSh/Options/PokemonSwSh_DateToucher.h"
-// #include "PokemonSwSh/Options/PokemonSwSh_EggStepCount.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-class EggAutonomous_Descriptor : public SingleSwitchProgramDescriptor{
-public:
-    EggAutonomous_Descriptor();
-    class Stats;
-    virtual std::unique_ptr<StatsTracker> make_stats() const override;
-};
-
-
-
-class EggAutonomous : public SingleSwitchProgramInstance{
-public:
-    EggAutonomous();
-
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-    // Run one iteration of the egg loop:
-    // - Hatch five eggs while fetch five eggs.
-    // - Check if pokemon needs to be kept. Keep them if needed.
-    // - Put five eggs from storage to party. Save game if needed.
-    // Return true if the egg loop should stop.
-    bool run_batch(SingleSwitchProgramEnvironment& env, BotBaseContext& context, EggAutonomous_Descriptor::Stats& stats);
-
-    void save_game(SingleSwitchProgramEnvironment& env, BotBaseContext& context);
-
-    // Call flying taxi to reset player character position to Nursery front door.
-    // fly_from_overworld: if true, the game is in the overworld while calling this function. If false, the game is in the menu.
-    // Note: the cursor in the menu must already be at Town Map.
-    void call_flying_taxi(SingleSwitchProgramEnvironment& env, BotBaseContext& context, bool fly_from_overworld);
-
-    // After detecting egg hatching, call this function to wait entil the end of the hatching.
-    // num_hatched_eggs: how many eggs hatched (including the current hatching one)
-    void wait_for_egg_hatched(SingleSwitchProgramEnvironment& env, BotBaseContext& context, EggAutonomous_Descriptor::Stats& stats, size_t num_hatched_eggs);
-
-    // Call this function when standing in front of the lady to fetch one egg.
-    // Return updated `num_eggs_retrieved` to reflect change in fetched eggs.
-    size_t talk_to_lady_to_fetch_egg(SingleSwitchProgramEnvironment& env, BotBaseContext& context, EggAutonomous_Descriptor::Stats& stats, size_t num_eggs_retrieved);
-
-    // After all five eggs hatched and another five eggs deposit into the first column of the box,
-    // call this function to:
-    // - Go to pokemon storage.
-    // - Check the hatched pokemon, keep shiny pokemon and those that match the stats requirements. Release the rest.
-    // - Retrieve the stored egg column to the party.
-    // - Call flying taxi to reset player location if needed
-    // Return true if the program should stop
-    bool process_hatched_pokemon(SingleSwitchProgramEnvironment& env, BotBaseContext& context, EggAutonomous_Descriptor::Stats& stats, bool need_taxi);
-
-    // Used to wait until Y-Comm icon shows up.
-    // Throw error if it does not find it after 10 sec.
-    void wait_for_y_comm_icon(SingleSwitchProgramEnvironment& env, BotBaseContext& context, const std::string& error_msg);
-
-    StartInGripOrGameOption START_LOCATION;
-    TouchDateIntervalOption TOUCH_DATE_INTERVAL;
-    // EggStepCountOption STEPS_TO_HATCH;
-    
-    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
-
-    OCR::LanguageOCROption LANGUAGE;
-
-    SimpleIntegerOption<uint8_t> MAX_KEEPERS;
-    SimpleIntegerOption<uint8_t> LOOPS_PER_FETCH;
-    IntegerEnumDropdownOption NUM_EGGS_IN_COLUMN;
-
-    enum class AutoSave{
-        NoAutoSave,
-        AfterStartAndKeep,
-        EveryBatch,
-    };
-    EnumDropdownOption<AutoSave> AUTO_SAVING;
-
-    Pokemon::EggHatchFilterTable FILTERS;
-
-    BooleanCheckBoxOption DEBUG_PROCESSING_HATCHED;
-    BooleanCheckBoxOption SAVE_DEBUG_VIDEO;
-
-    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
-    EventNotificationOption NOTIFICATION_NONSHINY_KEEP;
-    EventNotificationOption NOTIFICATION_SHINY;
-    EventNotificationOption m_notification_noop;
-    EventNotificationsOption NOTIFICATIONS;
-
-    // How many pokemon have been kept so far. These pokemon are shiny or met certain stats requirement.
-    size_t m_num_pokemon_kept = 0;
-
-    // How many eggs have been placed behind a game save.
-    // This is used so that if we recover from an error, we know how many eggs are in storage.
-    size_t m_num_eggs_in_storage_when_game_saved = 0;
-    // How many eggs are already deposited to storage so far.
-    size_t m_num_eggs_retrieved = 0;
-
-    // Is player's location at the bike loop start
-    bool m_player_at_loop_start = false;
-};
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggCombined2.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggCombined2.cpp
deleted file mode 100644
index 9b45b6ac0c..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggCombined2.cpp
+++ /dev/null
@@ -1,103 +0,0 @@
-/*  Egg Combined 2
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
-#include "PokemonSwSh_EggCombinedShared.h"
-#include "PokemonSwSh_EggCombined2.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-    using namespace Pokemon;
-
-
-EggCombined2_Descriptor::EggCombined2_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonSwSh:EggCombined2",
-        STRING_POKEMON + " SwSh", "Egg Combined 2",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonSwSh/EggCombined2.md",
-        "Fetch and hatch eggs at the same time. (Fastest - 1700 eggs/day for 5120-step)",
-        FeedbackType::NONE,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_31KB
-    )
-{}
-
-
-
-EggCombined2::EggCombined2()
-    : BOXES_TO_HATCH(
-        "<b>Boxes to Hatch:</b>",
-        LockWhileRunning::LOCKED,
-        32, 0, 32
-    )
-    , FETCHES_PER_BATCH(
-        "<b>Fetches per Batch:</b><br>For each batch of eggs, attempt this many egg fetches.",
-        LockWhileRunning::LOCKED,
-        6.0, 0, 7
-    )
-    , m_advanced_options(
-        "<font size=4><b>Advanced Options:</b> You should not need to touch anything below here.</font>"
-    )
-    , SAFETY_TIME(
-        "<b>Safety Time:</b><br>Additional time added to the spinning.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "12 * TICKS_PER_SECOND"
-    )
-    , EARLY_HATCH_SAFETY(
-        "<b>Early Hatch Safety:</b><br>Eggs will not hatch early by more than this period.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "5 * TICKS_PER_SECOND"
-    )
-    , HATCH_DELAY(
-        "<b>Hatch Delay:</b><br>Total animation time for hatching 5 eggs when there are no shinies.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "88 * TICKS_PER_SECOND"
-    )
-{
-    PA_ADD_OPTION(START_LOCATION);
-    PA_ADD_OPTION(TOUCH_DATE_INTERVAL);
-
-    PA_ADD_OPTION(BOXES_TO_HATCH);
-    PA_ADD_OPTION(STEPS_TO_HATCH);
-    PA_ADD_OPTION(FETCHES_PER_BATCH);
-    PA_ADD_STATIC(m_advanced_options);
-    PA_ADD_OPTION(SAFETY_TIME);
-    PA_ADD_OPTION(EARLY_HATCH_SAFETY);
-    PA_ADD_OPTION(HATCH_DELAY);
-}
-
-void EggCombined2::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    EggCombinedSession session{
-        BOXES_TO_HATCH,
-        STEPS_TO_HATCH,
-        (float)FETCHES_PER_BATCH,
-        SAFETY_TIME,
-        EARLY_HATCH_SAFETY,
-        HATCH_DELAY,
-        TOUCH_DATE_INTERVAL
-    };
-
-    if (START_LOCATION.start_in_grip_menu()){
-        grip_menu_connect_go_home(context);
-        resume_game_back_out(env.console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST, 400);
-    }else{
-        pbf_press_button(context, BUTTON_B, 5, 5);
-    }
-
-    session.eggcombined2_body(env.console, context);
-}
-
-
-
-}
-}
-}
-
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggCombined2.h b/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggCombined2.h
deleted file mode 100644
index 0aa0b00895..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggCombined2.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*  Egg Combined 2
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_EggCombined2_H
-#define PokemonAutomation_PokemonSwSh_EggCombined2_H
-
-#include "Common/Cpp/Options/StaticTextOption.h"
-#include "Common/Cpp/Options/SimpleIntegerOption.h"
-#include "Common/Cpp/Options/FloatingPointOption.h"
-#include "Common/Cpp/Options/TimeExpressionOption.h"
-#include "NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-#include "PokemonSwSh/Options/PokemonSwSh_DateToucher.h"
-#include "PokemonSwSh/Options/PokemonSwSh_EggStepCount.h"
-#include "PokemonSwSh_EggHelpers.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-class EggCombined2_Descriptor : public SingleSwitchProgramDescriptor{
-public:
-    EggCombined2_Descriptor();
-};
-
-
-
-class EggCombined2 : public SingleSwitchProgramInstance{
-public:
-    EggCombined2();
-
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-    StartInGripOrGameOption START_LOCATION;
-    TouchDateIntervalOption TOUCH_DATE_INTERVAL;
-
-    SimpleIntegerOption<uint8_t> BOXES_TO_HATCH;
-    EggStepCountOption STEPS_TO_HATCH;
-    FloatingPointOption FETCHES_PER_BATCH;
-    SectionDividerOption m_advanced_options;
-    TimeExpressionOption<uint16_t> SAFETY_TIME;
-    TimeExpressionOption<uint16_t> EARLY_HATCH_SAFETY;
-    TimeExpressionOption<uint16_t> HATCH_DELAY;
-};
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggCombinedShared.h b/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggCombinedShared.h
deleted file mode 100644
index 03f0d48cb9..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggCombinedShared.h
+++ /dev/null
@@ -1,272 +0,0 @@
-/*  Egg Combined Shared Libraries
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_EggCombinedShared_H
-#define PokemonAutomation_PokemonSwSh_EggCombinedShared_H
-
-#include "CommonFramework/Tools/ConsoleHandle.h"
-#include "NintendoSwitch/NintendoSwitch_Settings.h"
-#include "PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.h"
-#include "PokemonSwSh/Commands/PokemonSwSh_Commands_EggRoutines.h"
-#include "PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
-#include "PokemonSwSh/Options/PokemonSwSh_DateToucher.h"
-#include "PokemonSwSh_EggHelpers.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-typedef struct{
-    uint8_t fetches;
-    uint16_t spin_duration;
-    uint16_t total_duration;
-} EggCombinedBlock;
-
-struct EggCombinedSession{
-    uint8_t     BOXES_TO_HATCH;
-    uint16_t    STEPS_TO_HATCH;
-    float       FETCHES_PER_BATCH;
-    uint16_t    SAFETY_TIME;
-    uint16_t    EARLY_HATCH_SAFETY;
-    uint16_t    HATCH_DELAY;
-    TouchDateIntervalOption& TOUCH_DATE_INTERVAL;
-
-    EggCombinedBlock sanitize_fetch_count(uint8_t desired_fetches, uint16_t duration){
-        //  The amount of time during egg-fetches that counts towards incubation.
-        const uint16_t FETCH_TRAVEL_TIME = TRAVEL_RIGHT_DURATION + GO_TO_LADY_DURATION;
-
-        EggCombinedBlock block;
-
-        //  Cap the # of fetches to 7 because things can ugly at larger values.
-        block.fetches = desired_fetches;
-        if (desired_fetches == 0){
-            block.spin_duration = 0;
-            block.total_duration = TRAVEL_RIGHT_DURATION;
-            return block;
-        }
-        if (block.fetches > 7){
-            block.fetches = 7;
-        }
-
-        //  Divide the incubation time by the # of fetches. But don't let the fetch
-        //  interval drop below the FETCH_TRAVEL_TIME.
-        block.total_duration = duration / block.fetches;
-        if (block.total_duration >= FETCH_TRAVEL_TIME){
-            block.spin_duration = block.total_duration - FETCH_TRAVEL_TIME;
-        }else{
-            block.fetches = (uint8_t)(duration / FETCH_TRAVEL_TIME);
-            block.spin_duration = 0;
-            block.total_duration = block.fetches == 0
-                ? TRAVEL_RIGHT_DURATION
-                : FETCH_TRAVEL_TIME;
-        }
-
-        return block;
-    }
-    void withdraw_column_shiftR(BotBaseContext& context, uint8_t column){
-        menu_to_box(context, false);
-        party_to_column(context, column);
-        pickup_column(context, false);
-        ssf_press_button2(context, BUTTON_R, GameSettings::instance().BOX_CHANGE_DELAY, EGG_BUTTON_HOLD_DELAY);
-        column_to_party(context, column);
-        ssf_press_button2(context, BUTTON_A, GameSettings::instance().BOX_PICKUP_DROP_DELAY, EGG_BUTTON_HOLD_DELAY);
-        box_to_menu(context);
-    }
-    void deposit_column_shiftL(BotBaseContext& context, uint8_t column){
-        menu_to_box(context, true);
-        pickup_column(context, true);
-        party_to_column(context, column);
-        ssf_press_button2(context, BUTTON_L, GameSettings::instance().BOX_CHANGE_DELAY, EGG_BUTTON_HOLD_DELAY);
-        ssf_press_button2(context, BUTTON_A, GameSettings::instance().BOX_PICKUP_DROP_DELAY, EGG_BUTTON_HOLD_DELAY);
-        box_to_menu(context);
-    }
-    uint8_t swap_party_shift(BotBaseContext& context, uint8_t column){
-        menu_to_box(context, true);
-        pickup_column(context, true);
-
-        uint16_t BOX_CHANGE_DELAY = GameSettings::instance().BOX_CHANGE_DELAY;
-        uint16_t BOX_PICKUP_DROP_DELAY = GameSettings::instance().BOX_PICKUP_DROP_DELAY;
-        uint16_t BOX_SCROLL_DELAY = GameSettings::instance().BOX_SCROLL_DELAY;
-
-        //  Move to column.
-        party_to_column(context, column);
-        ssf_press_button2(context, BUTTON_L, BOX_CHANGE_DELAY, EGG_BUTTON_HOLD_DELAY);
-        ssf_press_button2(context, BUTTON_A, BOX_PICKUP_DROP_DELAY, EGG_BUTTON_HOLD_DELAY);
-
-        //  Move to next column.
-        column++;
-        if (column < 6){
-            ssf_press_dpad2(context, DPAD_RIGHT, BOX_SCROLL_DELAY, EGG_BUTTON_HOLD_DELAY);
-        }else{
-            column = 0;
-            ssf_press_button2(context, BUTTON_R, BOX_CHANGE_DELAY, EGG_BUTTON_HOLD_DELAY);
-            ssf_press_dpad2(context, DPAD_RIGHT, BOX_SCROLL_DELAY, EGG_BUTTON_HOLD_DELAY);
-            ssf_press_dpad2(context, DPAD_RIGHT, BOX_SCROLL_DELAY, EGG_BUTTON_HOLD_DELAY);
-        }
-
-        pickup_column(context, false);
-
-        //  Move to party.
-        ssf_press_button2(context, BUTTON_R, BOX_CHANGE_DELAY, EGG_BUTTON_HOLD_DELAY);
-        column_to_party(context, column);
-        ssf_press_button2(context, BUTTON_A, BOX_PICKUP_DROP_DELAY, EGG_BUTTON_HOLD_DELAY);
-
-        //  Return to menu.
-        box_to_menu(context);
-
-        return column;
-    }
-
-#define TRAVEL_TO_SPIN_SPOT_DURATION    (300)
-//#define TRAVEL_BACK_TO_LADY_DURATION    (30 + 260 + (580) + 120 + 120 * 0)
-#define TRAVEL_BACK_TO_LADY_DURATION    (30 + 260 + (620) + 120 + 120 * 0)
-
-    void eggcombined2_run_batch(
-        BotBaseContext& context,
-        uint16_t INCUBATION_DELAY_LOWER,
-        uint16_t remaining_travel_duration,
-        uint8_t column,
-        uint8_t fetches,
-        bool last_batch
-    ){
-        const uint16_t MIN_TRAVEL_TIME = TRAVEL_TO_SPIN_SPOT_DURATION + TRAVEL_BACK_TO_LADY_DURATION;
-
-        //  Trim off TRAVEL_TO_SPIN_SPOT_DURATION for the last iteration.
-        uint16_t loop_incubation = INCUBATION_DELAY_LOWER < TRAVEL_TO_SPIN_SPOT_DURATION
-            ? 0
-            : INCUBATION_DELAY_LOWER - TRAVEL_TO_SPIN_SPOT_DURATION;
-
-        while (fetches > 1 && loop_incubation >= MIN_TRAVEL_TIME){
-            uint16_t period = loop_incubation / (fetches - 1);
-            uint16_t spin = 0;
-            if (period >= MIN_TRAVEL_TIME){
-                spin = period - MIN_TRAVEL_TIME;
-                spin /= 128;
-                spin *= 128;
-            }
-
-            collect_egg(context);
-            collect_egg_mash_out(context, GameSettings::instance().AUTO_DEPOSIT);
-
-            travel_to_spin_location(context);
-            spin_and_mash_A(context, spin);
-            travel_back_to_lady(context);
-
-            fetches--;
-            loop_incubation -= MIN_TRAVEL_TIME + spin;
-            remaining_travel_duration -= MIN_TRAVEL_TIME + spin;
-        }
-
-        //  Last fetch.
-        if (fetches > 0){
-            collect_egg(context);
-            collect_egg_mash_out(context, GameSettings::instance().AUTO_DEPOSIT);
-            fetches--;
-        }
-        travel_to_spin_location(context);
-
-        //  Hatch eggs.
-        if (remaining_travel_duration >= END_BATCH_MASH_B_DURATION){
-            spin_and_mash_A(context, remaining_travel_duration - END_BATCH_MASH_B_DURATION);
-            pbf_mash_button(context, BUTTON_B, END_BATCH_MASH_B_DURATION);
-        }else{
-            spin_and_mash_A(context, remaining_travel_duration);
-        }
-
-        if (fetches == 0){
-            //  Swap party.
-            ssf_press_button2(context, BUTTON_X, GameSettings::instance().OVERWORLD_TO_MENU_DELAY, 20);
-            if (last_batch){
-                deposit_column_shiftL(context, column);
-                ssf_press_button2(context, BUTTON_B, GameSettings::instance().MENU_TO_OVERWORLD_DELAY, 20);
-            }else{
-                swap_party_shift(context, column);
-                fly_home_goto_lady(context, false);
-            }
-            return;
-        }
-
-        //  Additional fetches.
-        fly_home_goto_lady(context, true);
-        while (fetches-- > 0){
-            collect_egg(context);
-            collect_egg_mash_out(context, GameSettings::instance().AUTO_DEPOSIT);
-            eggfetcher_loop(context);
-        }
-
-        //  Swap party.
-        ssf_press_button2(context, BUTTON_X, GameSettings::instance().OVERWORLD_TO_MENU_DELAY, 20);
-        if (last_batch){
-            deposit_column_shiftL(context, column);
-        }else{
-            swap_party_shift(context, column);
-        }
-        ssf_press_button2(context, BUTTON_B, GameSettings::instance().MENU_TO_OVERWORLD_DELAY, 20);
-    }
-
-    void eggcombined2_body(ConsoleHandle& console, BotBaseContext& context){
-        if (BOXES_TO_HATCH == 0){
-            ssf_press_button2(context, BUTTON_HOME, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE, 10);
-            return;
-        }
-
-        //  Calculate lower/upper bounds for incubation time.
-        const uint16_t INCUBATION_DELAY_UPPER = (uint16_t)((uint32_t)STEPS_TO_HATCH * (uint32_t)103180 >> 16);
-        const uint16_t INCUBATION_DELAY_LOWER = INCUBATION_DELAY_UPPER >= EARLY_HATCH_SAFETY
-            ? INCUBATION_DELAY_UPPER - EARLY_HATCH_SAFETY
-            : 0;
-
-        const uint16_t FINISH_DELAY = HATCH_DELAY + SAFETY_TIME;
-
-        float fetches_per_batch = FETCHES_PER_BATCH;
-        if (fetches_per_batch < 0){
-            fetches_per_batch = 0;
-        }
-
-        float fetch_residual = 0;
-
-        //  Withdraw party.
-        ssf_press_button2(context, BUTTON_X, GameSettings::instance().OVERWORLD_TO_MENU_DELAY, 20);
-        withdraw_column_shiftR(context, 0);
-        fly_home_goto_lady(context, false);
-
-        for (uint8_t box = 0; box < BOXES_TO_HATCH; box++){
-            for (uint8_t column = 0; column < 6; column++){
-                //  Touch the date.
-                if (TOUCH_DATE_INTERVAL.ok_to_touch_now()){
-                    console.log("Touching date to prevent rollover.");
-                    pbf_press_button(context, BUTTON_HOME, 10, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE);
-                    touch_date_from_home(context, ConsoleSettings::instance().SETTINGS_TO_HOME_DELAY);
-                    resume_game_no_interact(console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST);
-                }
-
-                fetch_residual += fetches_per_batch;
-                uint8_t fetches = (uint8_t)fetch_residual;
-                eggcombined2_run_batch(
-                    context,
-                    INCUBATION_DELAY_LOWER,
-                    INCUBATION_DELAY_UPPER + FINISH_DELAY,
-                    column,
-                    fetches,
-                    box == BOXES_TO_HATCH - 1 && column == 5
-                );
-                fetch_residual -= (float)fetches;
-            }
-        }
-
-        //  Finish
-        ssf_press_button2(context, BUTTON_HOME, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE, 10);
-    }
-
-};
-
-
-
-}
-}
-}
-#endif
-
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggFetcher2.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggFetcher2.cpp
deleted file mode 100644
index 0e07bcd390..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggFetcher2.cpp
+++ /dev/null
@@ -1,95 +0,0 @@
-/*  Egg Fetcher 2
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Cpp/PrettyPrint.h"
-#include "NintendoSwitch/NintendoSwitch_Settings.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonSwSh/Commands/PokemonSwSh_Commands_GameEntry.h"
-#include "PokemonSwSh/Commands/PokemonSwSh_Commands_EggRoutines.h"
-#include "PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
-#include "PokemonSwSh_EggFetcher2.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-    using namespace Pokemon;
-
-
-EggFetcher2_Descriptor::EggFetcher2_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonSwSh:EggFetcher2",
-        STRING_POKEMON + " SwSh", "Egg Fetcher 2",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonSwSh/EggFetcher2.md",
-        "Fetch eggs without hatching them.",
-        FeedbackType::NONE,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_31KB
-    )
-{}
-
-
-
-EggFetcher2::EggFetcher2()
-    : MAX_FETCH_ATTEMPTS(
-        "<b>Fetch this many times:</b><br>This puts a limit on how many eggs you can get so you don't make a mess of your boxes for fetching too many.",
-        LockWhileRunning::LOCKED,
-        2000
-    )
-{
-    PA_ADD_OPTION(START_LOCATION);
-    PA_ADD_OPTION(MAX_FETCH_ATTEMPTS);
-}
-
-
-void EggFetcher2::run_eggfetcher(
-    Logger& logger, BotBaseContext& context,
-    bool deposit_automatically,
-    uint16_t attempts
-) const{
-    if (attempts == 0){
-        return;
-    }
-
-    uint16_t c = 0;
-
-    //  1st Fetch: Get into position.
-    {
-        logger.log("Fetch Attempts: " + tostr_u_commas(c));
-        fly_home_collect_egg(context, true);
-        collect_egg_mash_out(context, deposit_automatically);
-
-        c++;
-        if (c >= attempts){
-            return;
-        }
-    }
-
-    //  Now we are in steady state.
-    for (; c < attempts; c++){
-        logger.log("Fetch Attempts: " + tostr_u_commas(c));
-        eggfetcher_loop(context);
-        collect_egg(context);
-        collect_egg_mash_out(context, deposit_automatically);
-    }
-}
-
-void EggFetcher2::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    if (START_LOCATION.start_in_grip_menu()){
-        grip_menu_connect_go_home(context);
-        resume_game_back_out(env.console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST, 400);
-    }else{
-        pbf_press_button(context, BUTTON_B, 5, 5);
-    }
-
-    run_eggfetcher(env.console, context, GameSettings::instance().AUTO_DEPOSIT, MAX_FETCH_ATTEMPTS);
-
-    pbf_press_button(context, BUTTON_HOME, 10, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE);
-}
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggFetcher2.h b/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggFetcher2.h
deleted file mode 100644
index e0e8c081b7..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggFetcher2.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*  Egg Fetcher 2
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_EggFetcher2_H
-#define PokemonAutomation_PokemonSwSh_EggFetcher2_H
-
-#include "Common/Cpp/Options/SimpleIntegerOption.h"
-#include "NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-#include "PokemonSwSh_EggHelpers.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-class EggFetcher2_Descriptor : public SingleSwitchProgramDescriptor{
-public:
-    EggFetcher2_Descriptor();
-};
-
-
-
-class EggFetcher2 : public SingleSwitchProgramInstance{
-public:
-    EggFetcher2();
-
-    void run_eggfetcher(Logger& logger, BotBaseContext& context, bool deposit_automatically, uint16_t attempts) const;
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-    StartInGripOrGameOption START_LOCATION;
-    SimpleIntegerOption<uint16_t> MAX_FETCH_ATTEMPTS;
-};
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggFetcherMultiple.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggFetcherMultiple.cpp
deleted file mode 100644
index 67ccc4aea2..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggFetcherMultiple.cpp
+++ /dev/null
@@ -1,151 +0,0 @@
-/*  Egg Fetcher Multiple
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Cpp/PrettyPrint.h"
-#include "NintendoSwitch/NintendoSwitch_Settings.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonSwSh/Commands/PokemonSwSh_Commands_EggRoutines.h"
-#include "PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
-#include "PokemonSwSh_EggFetcherMultiple.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-    using namespace Pokemon;
-
-
-std::tuple<uint16_t, uint16_t, uint16_t> get_location(uint16_t index){
-    uint16_t box = index / 30;
-    index = index % 30;
-
-    uint16_t row = index / 6;
-    index = index % 6;
-
-    uint16_t column = index;
-    return { box, row, column };
-}
-
-EggFetcherMultiple_Descriptor::EggFetcherMultiple_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonSwSh:EggFetcherMultiple",
-        STRING_POKEMON + " SwSh", "Egg Fetcher Multiple",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonSwSh/EggFetcherMultiple.md",
-        "Fetch eggs from multiple species without hatching them.",
-        FeedbackType::NONE,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_31KB
-    )
-{}
-
-
-
-EggFetcherMultiple::EggFetcherMultiple()
-    : POKEMON_SPECIES_COUNT(
-        "<b>Breed this many species:</b>",
-        LockWhileRunning::LOCKED,
-        30
-    )
-    , MAX_FETCH_ATTEMPTS_PER_SPECIES(
-        "<b>Fetch this many times per species:</b>",
-        LockWhileRunning::LOCKED,
-        10
-    )
-{
-    PA_ADD_OPTION(START_LOCATION);
-    PA_ADD_OPTION(POKEMON_SPECIES_COUNT);
-    PA_ADD_OPTION(MAX_FETCH_ATTEMPTS_PER_SPECIES);
-}
-
-
-void EggFetcherMultiple::run_eggfetcher(
-    Logger& logger, BotBaseContext& context,
-    bool deposit_automatically,
-    uint16_t attempts
-) const {
-    if (attempts == 0) {
-        return;
-    }
-
-    uint16_t c = 0;
-
-    //  1st Fetch: Get into position.
-    {
-        logger.log("Fetch Attempts: " + tostr_u_commas(c));
-        fly_home_collect_egg(context, true);
-        collect_egg_mash_out(context, deposit_automatically);
-
-        c++;
-        if (c >= attempts) {
-            return;
-        }
-    }
-
-    //  Now we are in steady state.
-    for (; c < attempts; c++) {
-        logger.log("Fetch Attempts: " + tostr_u_commas(c));
-        eggfetcher_loop(context);
-        collect_egg(context);
-        collect_egg_mash_out(context, deposit_automatically);
-    }
-}
-
-void EggFetcherMultiple::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    if (START_LOCATION.start_in_grip_menu()){
-        grip_menu_connect_go_home(context);
-        resume_game_back_out(env.console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST, 400);
-    }else{
-        pbf_press_button(context, BUTTON_B, 5, 5);
-    }
-
-    for (uint16_t s = 0; s < POKEMON_SPECIES_COUNT; ++s){
-        fly_home_collect_egg(context, true);
-
-        //remove the second pokemon from the daycare
-        pbf_press_button(context, BUTTON_A , 10, (uint16_t)(1.5 * TICKS_PER_SECOND));
-        pbf_press_button(context, BUTTON_A , 10, (uint16_t)(1.5 * TICKS_PER_SECOND));
-        pbf_press_button(context, BUTTON_A , 10, 1 * TICKS_PER_SECOND);
-        pbf_press_dpad  (context, DPAD_DOWN, 10, 1 * TICKS_PER_SECOND);
-        pbf_press_button(context, BUTTON_A , 10, 1 * TICKS_PER_SECOND);
-        pbf_mash_button (context, BUTTON_B , 5 * TICKS_PER_SECOND);
-
-        //add a new second pokemon from the daycare
-        pbf_press_button(context, BUTTON_A, 10, 1 * TICKS_PER_SECOND);
-        pbf_press_button(context, BUTTON_A, 10, 1 * TICKS_PER_SECOND);
-        pbf_press_button(context, BUTTON_A, 10, (uint16_t)(1.5 * TICKS_PER_SECOND));
-        pbf_press_button(context, BUTTON_A, 10, 2 * TICKS_PER_SECOND);
-        auto [box, row, column] = get_location(s);
-        if (row == 0 && column == 0 && box != 0){
-            box = 1;
-        }
-        else{
-            box = 0;
-        }
-        for (uint16_t b = 0; b < box; ++b){
-            pbf_press_button(context, BUTTON_R, 10, 1 * TICKS_PER_SECOND);
-        }
-        for (uint16_t r = 0; r < row; ++r){
-            pbf_press_dpad(context, DPAD_DOWN, 10, 1 * TICKS_PER_SECOND);
-        }
-        for (uint16_t c = 0; c < column; ++c){
-            pbf_press_dpad(context, DPAD_RIGHT, 10, 1 * TICKS_PER_SECOND);
-        }
-        pbf_press_button(context, BUTTON_A, 10, 1 * TICKS_PER_SECOND);
-        pbf_press_button(context, BUTTON_A, 10, 2 * TICKS_PER_SECOND);
-        pbf_press_button(context, BUTTON_A, 10, 1 * TICKS_PER_SECOND);
-        pbf_press_button(context, BUTTON_A, 10, 5 * TICKS_PER_SECOND);
-        pbf_press_button(context, BUTTON_A, 10, 1 * TICKS_PER_SECOND);
-        pbf_press_button(context, BUTTON_A, 10, 1 * TICKS_PER_SECOND);
-
-        run_eggfetcher(env.console, context, GameSettings::instance().AUTO_DEPOSIT, MAX_FETCH_ATTEMPTS_PER_SPECIES);
-    }
-
-    pbf_press_button(context, BUTTON_HOME, 10, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE);
-}
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggFetcherMultiple.h b/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggFetcherMultiple.h
deleted file mode 100644
index 23e875a7d7..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggFetcherMultiple.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*  Egg Fetcher Multiple
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_EggFetcherMultiple_H
-#define PokemonAutomation_PokemonSwSh_EggFetcherMultiple_H
-
-#include "Common/Cpp/Options/SimpleIntegerOption.h"
-#include "NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-#include "PokemonSwSh_EggHelpers.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-class EggFetcherMultiple_Descriptor : public SingleSwitchProgramDescriptor{
-public:
-    EggFetcherMultiple_Descriptor();
-};
-
-
-
-class EggFetcherMultiple : public SingleSwitchProgramInstance{
-public:
-    EggFetcherMultiple();
-
-    void run_eggfetcher(Logger& logger, BotBaseContext& context, bool deposit_automatically, uint16_t attempts) const;
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-    StartInGripOrGameOption START_LOCATION;
-    SimpleIntegerOption<uint16_t> POKEMON_SPECIES_COUNT;
-    SimpleIntegerOption<uint16_t> MAX_FETCH_ATTEMPTS_PER_SPECIES;
-};
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggHatcher.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggHatcher.cpp
deleted file mode 100644
index ed5267d13b..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggHatcher.cpp
+++ /dev/null
@@ -1,173 +0,0 @@
-/*  Egg Hatcher
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "NintendoSwitch/NintendoSwitch_Settings.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonSwSh/Commands/PokemonSwSh_Commands_GameEntry.h"
-#include "PokemonSwSh/Commands/PokemonSwSh_Commands_EggRoutines.h"
-#include "PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
-#include "PokemonSwSh_EggHelpers.h"
-#include "PokemonSwSh_EggHatcher.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-    using namespace Pokemon;
-
-
-EggHatcher_Descriptor::EggHatcher_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonSwSh:EggHatcher",
-        STRING_POKEMON + " SwSh", "Egg Hatcher",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonSwSh/EggHatcher.md",
-        "Hatch eggs from boxes.",
-        FeedbackType::NONE,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_31KB
-    )
-{}
-
-
-
-void withdraw_column(BotBaseContext& context, uint8_t column){
-    menu_to_box(context, false);
-    party_to_column(context, column);
-    pickup_column(context, false);
-    column_to_party(context, column);
-    ssf_press_button1(context, BUTTON_A, GameSettings::instance().BOX_PICKUP_DROP_DELAY);
-    box_to_menu(context);
-}
-void deposit_column(BotBaseContext& context, uint8_t column){
-    menu_to_box(context, true);
-    pickup_column(context, true);
-    party_to_column(context, column);
-    ssf_press_button1(context, BUTTON_A, GameSettings::instance().BOX_PICKUP_DROP_DELAY);
-    box_to_menu(context);
-}
-uint8_t swap_party(BotBaseContext& context, uint8_t column){
-    menu_to_box(context, true);
-    pickup_column(context, true);
-
-    uint16_t BOX_PICKUP_DROP_DELAY = GameSettings::instance().BOX_PICKUP_DROP_DELAY;
-    uint16_t BOX_SCROLL_DELAY = GameSettings::instance().BOX_SCROLL_DELAY;
-
-    //  Move to column.
-    party_to_column(context, column);
-    ssf_press_button1(context, BUTTON_A, BOX_PICKUP_DROP_DELAY);
-
-    //  Move to next column.
-    column++;
-    if (column < 6){
-        ssf_press_dpad1(context, DPAD_RIGHT, BOX_SCROLL_DELAY);
-    }else{
-        column = 0;
-        ssf_press_button1(context, BUTTON_R, GameSettings::instance().BOX_CHANGE_DELAY);
-        ssf_press_dpad1(context, DPAD_RIGHT, BOX_SCROLL_DELAY);
-        ssf_press_dpad1(context, DPAD_RIGHT, BOX_SCROLL_DELAY);
-    }
-
-    pickup_column(context, false);
-
-    //  Move to party.
-    column_to_party(context, column);
-    ssf_press_button1(context, BUTTON_A, BOX_PICKUP_DROP_DELAY);
-
-    //  Return to menu.
-    box_to_menu(context);
-
-    return column;
-}
-
-
-EggHatcher::EggHatcher()
-    : BOXES_TO_HATCH(
-        "<b>Boxes to Hatch:</b>",
-        LockWhileRunning::LOCKED,
-        3
-    )
-    , m_advanced_options(
-        "<font size=4><b>Advanced Options:</b> You should not need to touch anything below here.</font>"
-    )
-    , SAFETY_TIME0(
-        "<b>Safety Time:</b><br>Additional time added to the spinning.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "12 * TICKS_PER_SECOND"
-    )
-    , HATCH_DELAY(
-        "<b>Hatch Delay:</b><br>Total animation time for hatching 5 eggs when there are no shinies.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "88 * TICKS_PER_SECOND"
-    )
-{
-    PA_ADD_OPTION(START_LOCATION);
-
-    PA_ADD_OPTION(BOXES_TO_HATCH);
-    PA_ADD_OPTION(STEPS_TO_HATCH);
-    PA_ADD_STATIC(m_advanced_options);
-    PA_ADD_OPTION(SAFETY_TIME0);
-    PA_ADD_OPTION(HATCH_DELAY);
-}
-void EggHatcher::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    //  Calculate upper bounds for incubation time.
-    uint16_t INCUBATION_DELAY_UPPER = (uint16_t)((uint32_t)STEPS_TO_HATCH * (uint32_t)103180 >> 16);
-    uint16_t TOTAL_DELAY = INCUBATION_DELAY_UPPER + HATCH_DELAY + SAFETY_TIME0 - TRAVEL_RIGHT_DURATION;
-
-    if (START_LOCATION.start_in_grip_menu()){
-        grip_menu_connect_go_home(context);
-        resume_game_back_out(env.console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST, 400);
-    }else{
-        pbf_press_button(context, BUTTON_B, 5, 5);
-    }
-
-    bool party_is_empty = true;
-    for (uint8_t box = 0; box < BOXES_TO_HATCH; box++){
-        for (uint8_t column = 0; column < 6; column++){
-            //  Get eggs from box.
-            pbf_press_button(context, BUTTON_X, 20, GameSettings::instance().OVERWORLD_TO_MENU_DELAY - 20);
-            if (party_is_empty){
-                withdraw_column(context, column);
-                party_is_empty = false;
-            }else if (column == 0){
-                swap_party(context, 5);
-            }else{
-                swap_party(context, column - 1);
-            }
-
-            fly_home(context, false);
-
-            //  Travel to spin location.
-            pbf_move_left_joystick(context, STICK_MAX, STICK_CENTER, TRAVEL_RIGHT_DURATION, 0);
-
-            //  Spin
-#if 0
-            spin_and_mash_A(TOTAL_DELAY);
-#else
-            if (TOTAL_DELAY >= END_BATCH_MASH_B_DURATION){
-                spin_and_mash_A(context, TOTAL_DELAY - END_BATCH_MASH_B_DURATION);
-                pbf_mash_button(context, BUTTON_B, END_BATCH_MASH_B_DURATION);
-            }else{
-                spin_and_mash_A(context, TOTAL_DELAY);
-            }
-#endif
-        }
-    }
-
-    uint16_t OVERWORLD_TO_MENU_DELAY = GameSettings::instance().OVERWORLD_TO_MENU_DELAY;
-
-    if (!party_is_empty){
-        pbf_press_button(context, BUTTON_X, 20, OVERWORLD_TO_MENU_DELAY - 20);
-        deposit_column(context, 5);
-        pbf_press_button(context, BUTTON_X, 20, OVERWORLD_TO_MENU_DELAY - 20);
-    }
-    pbf_press_button(context, BUTTON_HOME, 10, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE - 10);
-}
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggHatcher.h b/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggHatcher.h
deleted file mode 100644
index 1025d22990..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggHatcher.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*  Egg Hatcher
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_EggHatcher_H
-#define PokemonAutomation_PokemonSwSh_EggHatcher_H
-
-#include "Common/Cpp/Options/StaticTextOption.h"
-#include "Common/Cpp/Options/SimpleIntegerOption.h"
-#include "Common/Cpp/Options/TimeExpressionOption.h"
-#include "NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-#include "PokemonSwSh/Options/PokemonSwSh_EggStepCount.h"
-#include "PokemonSwSh_EggHelpers.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-class EggHatcher_Descriptor : public SingleSwitchProgramDescriptor{
-public:
-    EggHatcher_Descriptor();
-};
-
-
-
-class EggHatcher : public SingleSwitchProgramInstance{
-public:
-    EggHatcher();
-
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-
-private:
-    StartInGripOrGameOption START_LOCATION;
-
-    SimpleIntegerOption<uint8_t> BOXES_TO_HATCH;
-    EggStepCountOption STEPS_TO_HATCH;
-
-    SectionDividerOption m_advanced_options;
-    TimeExpressionOption<uint16_t> SAFETY_TIME0;
-    TimeExpressionOption<uint16_t> HATCH_DELAY;
-};
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggHelpers.h b/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggHelpers.h
deleted file mode 100644
index 09ce60821b..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggHelpers.h
+++ /dev/null
@@ -1,165 +0,0 @@
-/*  EggHelpers
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_EggHelpers_H
-#define PokemonAutomation_PokemonSwSh_EggHelpers_H
-
-#include "Common/Compiler.h"
-#include "PokemonSwSh/PokemonSwSh_Settings.h"
-#include "NintendoSwitch/FixedInterval.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-#define GO_TO_LADY_DURATION         51
-#define TRAVEL_RIGHT_DURATION       300
-#define END_BATCH_MASH_B_DURATION   (20 * TICKS_PER_SECOND)
-
-
-//  Collect egg.
-static void collect_egg(BotBaseContext& context){
-    ssf_press_button1(context, BUTTON_A, 120);
-    if (GameSettings::instance().EGG_FETCH_EXTRA_LINE){
-        ssf_press_button1(context, BUTTON_A, 120);
-    }
-    ssf_press_button1(context, BUTTON_A, 10);
-}
-static void collect_egg_mash_out(BotBaseContext& context, bool deposit_automatically){
-    uint16_t FETCH_EGG_MASH_DELAY = GameSettings::instance().FETCH_EGG_MASH_DELAY;
-    pbf_mash_button(
-        context,
-        BUTTON_B,
-        deposit_automatically
-            ? FETCH_EGG_MASH_DELAY
-            : FETCH_EGG_MASH_DELAY + 240
-    );
-}
-
-
-//  Fly Home: Used by everything.
-//  Assume the selected app in the menu is Twon Map.
-static void fly_home(BotBaseContext& context, char from_overworld){
-    if (from_overworld){
-        ssf_press_button2(context, BUTTON_X, GameSettings::instance().OVERWORLD_TO_MENU_DELAY, 20);
-    }
-    ssf_press_button2(context, BUTTON_A, 400, 10);
-    ssf_press_dpad2(context, DPAD_UP_RIGHT, 25, 5);
-    pbf_mash_button(context, BUTTON_A, 480);
-}
-
-//  Assume the selected app in the menu is Twon Map.
-static void fly_home_goto_lady(BotBaseContext& context, char from_overworld){
-    fly_home(context, from_overworld);
-
-    //  Go to lady.
-    //  If you change this, you MUST update "GO_TO_LADY_DURATION".
-    ssf_press_joystick2(context, true, STICK_MIN, STICK_CENTER, 16, 6);
-    ssf_press_joystick2(context, true, STICK_CENTER, STICK_MIN, 90, 45);
-}
-
-//  Assume the selected app in the menu is Twon Map.
-static void fly_home_collect_egg(BotBaseContext& context, char from_overworld){
-    fly_home_goto_lady(context, from_overworld);
-    collect_egg(context);
-}
-
-
-
-//  EggHatcher+EggCombined Helpers
-
-#define EGG_BUTTON_HOLD_DELAY   10
-
-// - From game menu to pokemon storage box
-// - Move cursor to the second pokemon in the party, aka first hatched pokemon in the party
-// - Press button Y two times to change pokemon selection to group selection
-static void menu_to_box(BotBaseContext& context, bool from_map){
-    uint16_t BOX_SCROLL_DELAY = GameSettings::instance().BOX_SCROLL_DELAY;
-    if (from_map){
-        ssf_press_dpad2(context, DPAD_UP, BOX_SCROLL_DELAY, EGG_BUTTON_HOLD_DELAY);
-        ssf_press_dpad2(context, DPAD_RIGHT, BOX_SCROLL_DELAY, EGG_BUTTON_HOLD_DELAY);
-    }
-    ssf_press_button2(context, BUTTON_A, GameSettings::instance().MENU_TO_POKEMON_DELAY, EGG_BUTTON_HOLD_DELAY);
-    ssf_press_button2(context, BUTTON_R, GameSettings::instance().POKEMON_TO_BOX_DELAY, EGG_BUTTON_HOLD_DELAY);
-    ssf_press_dpad2(context, DPAD_LEFT, BOX_SCROLL_DELAY, EGG_BUTTON_HOLD_DELAY);
-    ssf_press_dpad2(context, DPAD_DOWN, BOX_SCROLL_DELAY, EGG_BUTTON_HOLD_DELAY);
-    ssf_press_button2(context, BUTTON_Y, 30, EGG_BUTTON_HOLD_DELAY);
-    ssf_press_button2(context, BUTTON_Y, 30, EGG_BUTTON_HOLD_DELAY);
-}
-static void box_to_menu(BotBaseContext& context){
-    //  There are two states here which need to be merged:
-    //      1.  The depositing column was empty. The party has been swapped and
-    //          it's sitting in the box with no held pokemon.
-    //      2.  The depositing column was not empty. The party swap failed and
-    //          it's sitting in the box holding on the party pokemon.
-    //
-    //  Double press B quickly here to back out of the box.
-    //  In state (1):   The 1st B will begin back out of the box. The 2nd B will
-    //                  be swallowed by the animation.
-    //  In state (2):   The 1st B will drop the party pokemon. The 2nd B will
-    //                  back out of the box.
-
-    uint16_t BOX_SCROLL_DELAY = GameSettings::instance().BOX_SCROLL_DELAY;
-
-    ssf_press_button2(context, BUTTON_B, 20, EGG_BUTTON_HOLD_DELAY);
-    ssf_press_button2(context, BUTTON_B, GameSettings::instance().BOX_TO_POKEMON_DELAY, EGG_BUTTON_HOLD_DELAY);
-
-    //  Back out to menu.
-    ssf_press_button2(context, BUTTON_B, GameSettings::instance().POKEMON_TO_MENU_DELAY, EGG_BUTTON_HOLD_DELAY);
-
-    ssf_press_dpad2(context, DPAD_LEFT, BOX_SCROLL_DELAY, EGG_BUTTON_HOLD_DELAY);
-    ssf_press_dpad2(context, DPAD_DOWN, BOX_SCROLL_DELAY, EGG_BUTTON_HOLD_DELAY);
-}
-
-static void party_to_column(BotBaseContext& context, uint8_t column){
-    uint16_t BOX_SCROLL_DELAY = GameSettings::instance().BOX_SCROLL_DELAY;
-
-    ssf_press_dpad2(context, DPAD_UP, BOX_SCROLL_DELAY, EGG_BUTTON_HOLD_DELAY);
-    column++;
-    if (column <= 3){
-        for (uint8_t c = 0; c != column; c++){
-            ssf_press_dpad2(context, DPAD_RIGHT, BOX_SCROLL_DELAY, EGG_BUTTON_HOLD_DELAY);
-        }
-    }else{
-        for (uint8_t c = 7; c != column; c--){
-            ssf_press_dpad2(context, DPAD_LEFT, BOX_SCROLL_DELAY, EGG_BUTTON_HOLD_DELAY);
-        }
-    }
-}
-static void column_to_party(BotBaseContext& context, uint8_t column){
-    uint16_t BOX_SCROLL_DELAY = GameSettings::instance().BOX_SCROLL_DELAY;
-
-    column++;
-    if (column <= 3){
-        for (uint8_t c = column; c != 0; c--){
-            ssf_press_dpad2(context, DPAD_LEFT, BOX_SCROLL_DELAY, EGG_BUTTON_HOLD_DELAY);
-        }
-    }else{
-        for (uint8_t c = column; c != 7; c++){
-            ssf_press_dpad2(context, DPAD_RIGHT, BOX_SCROLL_DELAY, EGG_BUTTON_HOLD_DELAY);
-        }
-    }
-    ssf_press_dpad2(context, DPAD_DOWN, BOX_SCROLL_DELAY, EGG_BUTTON_HOLD_DELAY);
-}
-
-static void pickup_column(BotBaseContext& context, char party){
-    uint16_t BOX_SCROLL_DELAY = GameSettings::instance().BOX_SCROLL_DELAY;
-
-    ssf_press_button2(context, BUTTON_A, 20, EGG_BUTTON_HOLD_DELAY);
-    if (party){
-        ssf_press_dpad2(context, DPAD_UP, BOX_SCROLL_DELAY, EGG_BUTTON_HOLD_DELAY);
-    }
-    ssf_press_dpad2(context, DPAD_UP, BOX_SCROLL_DELAY, EGG_BUTTON_HOLD_DELAY);
-    ssf_press_button2(context, BUTTON_A, GameSettings::instance().BOX_PICKUP_DROP_DELAY, EGG_BUTTON_HOLD_DELAY);
-}
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggSuperCombined2.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggSuperCombined2.cpp
deleted file mode 100644
index 603b156ca8..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggSuperCombined2.cpp
+++ /dev/null
@@ -1,129 +0,0 @@
-/*  Egg Super-Combined 2
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonSwSh/Commands/PokemonSwSh_Commands_GameEntry.h"
-#include "PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
-#include "PokemonSwSh/Programs/ReleaseHelpers.h"
-#include "PokemonSwSh_EggCombinedShared.h"
-#include "PokemonSwSh_EggSuperCombined2.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-    using namespace Pokemon;
-
-
-EggSuperCombined2_Descriptor::EggSuperCombined2_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonSwSh:EggSuperCombined2",
-        STRING_POKEMON + " SwSh", "Egg Super-Combined 2",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonSwSh/EggSuperCombined2.md",
-        "Fetch and hatch eggs at the same time. (Fastest - 1700 eggs/day for 5120-step)",
-        FeedbackType::NONE,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_31KB
-    )
-{}
-
-
-
-EggSuperCombined2::EggSuperCombined2()
-    : BOXES_TO_RELEASE(
-        "<b>Boxes to Release:</b><br>Start by releasing this many boxes.",
-        LockWhileRunning::LOCKED,
-        2, 0, 32
-    )
-    , BOXES_TO_SKIP(
-        "<b>Boxes to Skip:</b><br>Then skip this many boxes.",
-        LockWhileRunning::LOCKED,
-        1, 0, 32
-    )
-    , BOXES_TO_HATCH(
-        "<b>Boxes to Hatch:</b>",
-        LockWhileRunning::LOCKED,
-        31, 0, 32
-    )
-    , FETCHES_PER_BATCH(
-        "<b>Fetches per Batch:</b><br>For each batch of eggs, attempt this many egg fetches.",
-        LockWhileRunning::LOCKED,
-        6.0, 0, 7
-    )
-    , m_advanced_options(
-        "<font size=4><b>Advanced Options:</b> You should not need to touch anything below here.</font>"
-    )
-    , SAFETY_TIME(
-        "<b>Safety Time:</b><br>Additional time added to the spinning.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "12 * TICKS_PER_SECOND"
-    )
-    , EARLY_HATCH_SAFETY(
-        "<b>Early Hatch Time:</b><br>Eggs should not hatch more than this much early.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "5 * TICKS_PER_SECOND"
-    )
-    , HATCH_DELAY(
-        "<b>Hatch Delay:</b><br>Total animation time for hatching 5 eggs when there are no shinies.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "88 * TICKS_PER_SECOND"
-    )
-{
-    PA_ADD_OPTION(START_LOCATION);
-    PA_ADD_OPTION(TOUCH_DATE_INTERVAL);
-
-    PA_ADD_OPTION(BOXES_TO_RELEASE);
-    PA_ADD_OPTION(BOXES_TO_SKIP);
-    PA_ADD_OPTION(BOXES_TO_HATCH);
-    PA_ADD_OPTION(STEPS_TO_HATCH);
-    PA_ADD_OPTION(FETCHES_PER_BATCH);
-    PA_ADD_STATIC(m_advanced_options);
-    PA_ADD_OPTION(SAFETY_TIME);
-    PA_ADD_OPTION(EARLY_HATCH_SAFETY);
-    PA_ADD_OPTION(HATCH_DELAY);
-}
-
-void EggSuperCombined2::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    EggCombinedSession session{
-        BOXES_TO_HATCH,
-        STEPS_TO_HATCH,
-        (float)FETCHES_PER_BATCH,
-        SAFETY_TIME,
-        EARLY_HATCH_SAFETY,
-        HATCH_DELAY,
-        TOUCH_DATE_INTERVAL
-    };
-
-    if (START_LOCATION.start_in_grip_menu()){
-        grip_menu_connect_go_home(context);
-        resume_game_back_out(env.console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST, 400);
-    }else{
-        pbf_press_button(context, BUTTON_B, 5, 5);
-    }
-
-    //  Mass Release
-    ssf_press_button2(context, BUTTON_X, GameSettings::instance().OVERWORLD_TO_MENU_DELAY, 20);
-    ssf_press_button1(context, BUTTON_A, 200);
-    ssf_press_button1(context, BUTTON_R, 250);
-    release_boxes(context, BOXES_TO_RELEASE, GameSettings::instance().BOX_SCROLL_DELAY, GameSettings::instance().BOX_CHANGE_DELAY);
-
-    //  Skip Boxes
-    for (uint8_t c = 0; c <= BOXES_TO_SKIP; c++){
-        ssf_press_button1(context, BUTTON_R, 60);
-    }
-    pbf_mash_button(context, BUTTON_B, 600);
-
-    session.eggcombined2_body(env.console, context);
-}
-
-
-
-}
-}
-}
-
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggSuperCombined2.h b/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggSuperCombined2.h
deleted file mode 100644
index e51b6d3229..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggSuperCombined2.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*  Egg Super-Combined 2
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_EggSuperCombined2_H
-#define PokemonAutomation_PokemonSwSh_EggSuperCombined2_H
-
-#include "Common/Cpp/Options/StaticTextOption.h"
-#include "Common/Cpp/Options/SimpleIntegerOption.h"
-#include "Common/Cpp/Options/FloatingPointOption.h"
-#include "Common/Cpp/Options/TimeExpressionOption.h"
-#include "NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-#include "PokemonSwSh/Options/PokemonSwSh_DateToucher.h"
-#include "PokemonSwSh/Options/PokemonSwSh_EggStepCount.h"
-#include "PokemonSwSh_EggHelpers.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-class EggSuperCombined2_Descriptor : public SingleSwitchProgramDescriptor{
-public:
-    EggSuperCombined2_Descriptor();
-};
-
-
-
-class EggSuperCombined2 : public SingleSwitchProgramInstance{
-public:
-    EggSuperCombined2();
-
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-    StartInGripOrGameOption START_LOCATION;
-    TouchDateIntervalOption TOUCH_DATE_INTERVAL;
-
-    SimpleIntegerOption<uint8_t> BOXES_TO_RELEASE;
-    SimpleIntegerOption<uint8_t> BOXES_TO_SKIP;
-    SimpleIntegerOption<uint8_t> BOXES_TO_HATCH;
-    EggStepCountOption STEPS_TO_HATCH;
-    FloatingPointOption FETCHES_PER_BATCH;
-    SectionDividerOption m_advanced_options;
-    TimeExpressionOption<uint16_t> SAFETY_TIME;
-    TimeExpressionOption<uint16_t> EARLY_HATCH_SAFETY;
-    TimeExpressionOption<uint16_t> HATCH_DELAY;
-};
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_GodEggDuplication.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_GodEggDuplication.cpp
deleted file mode 100644
index 85aa15e8b2..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_GodEggDuplication.cpp
+++ /dev/null
@@ -1,131 +0,0 @@
-/*  God Egg Duplication
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Cpp/PrettyPrint.h"
-#include "NintendoSwitch/NintendoSwitch_Settings.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonSwSh/Commands/PokemonSwSh_Commands_EggRoutines.h"
-#include "PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
-#include "PokemonSwSh_GodEggDuplication.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-    using namespace Pokemon;
-
-
-GodEggDuplication_Descriptor::GodEggDuplication_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonSwSh:GodEggDuplication",
-        STRING_POKEMON + " SwSh", "God Egg Duplication",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonSwSh/GodEggDuplication.md",
-        "Mass duplicate " + STRING_POKEMON + " with the God Egg.",
-        FeedbackType::NONE,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_31KB
-    )
-{}
-
-
-
-GodEggDuplication::GodEggDuplication()
-    : MAX_FETCH_ATTEMPTS(
-        "<b>Fetch this many times:</b><br>This puts a limit on how many eggs you can get so you don't make a mess of your boxes for fetching too many.",
-        LockWhileRunning::LOCKED,
-        2000
-    )
-    , PARTY_ROUND_ROBIN(
-        "<b>Party Round Robin:</b><br>Cycle through this many party members.",
-        LockWhileRunning::LOCKED,
-        6, 1, 6
-    )
-{
-    PA_ADD_OPTION(START_LOCATION);
-    PA_ADD_OPTION(MAX_FETCH_ATTEMPTS);
-    PA_ADD_OPTION(PARTY_ROUND_ROBIN);
-}
-
-
-void GodEggDuplication::collect_godegg(BotBaseContext& context, uint8_t party_slot) const{
-    pbf_wait(context, 50);
-    ssf_press_button1(context, BUTTON_B, 100);
-    ssf_press_button1(context, BUTTON_B, 100);
-    pbf_wait(context, 225);
-
-    //  "You received an Egg from the Nursery worker!"
-    ssf_press_button1(context, BUTTON_B, 300);
-
-    //  "Where do you want to send the Egg to?"
-    ssf_press_button1(context, BUTTON_A, 100);
-
-    //  (extra line of text for French)
-    ssf_press_button1(context, BUTTON_B, 100);
-
-    //  "Please select a Pokemon to swap from your party."
-    ssf_press_button1(context, BUTTON_B, GameSettings::instance().MENU_TO_POKEMON_DELAY);
-
-    //  Select the party member.
-    for (uint8_t c = 0; c < party_slot; c++){
-        ssf_press_dpad1(context, DPAD_DOWN, 10);
-    }
-    ssf_press_button1(context, BUTTON_A, 300);
-    pbf_mash_button(context, BUTTON_B, 500);
-}
-void GodEggDuplication::run_program(Logger& logger, BotBaseContext& context, uint16_t attempts) const{
-    if (attempts == 0){
-        return;
-    }
-
-    uint8_t items = PARTY_ROUND_ROBIN > 6 ? 6 : PARTY_ROUND_ROBIN;
-    uint8_t party_slot = 0;
-
-    uint16_t c = 0;
-
-    //  1st Fetch: Get into position.
-    {
-        logger.log("Fetch Attempts: " + tostr_u_commas(c));
-        fly_home_collect_egg(context, true);
-        collect_godegg(context, party_slot++);
-        if (party_slot >= items){
-            party_slot = 0;
-        }
-
-        c++;
-        if (c >= attempts){
-            return;
-        }
-    }
-
-    //  Now we are in steady state.
-    for (; c < attempts; c++){
-        logger.log("Fetch Attempts: " + tostr_u_commas(c));
-        eggfetcher_loop(context);
-        collect_egg(context);
-        collect_godegg(context, party_slot++);
-        if (party_slot >= items){
-            party_slot = 0;
-        }
-    }
-}
-
-void GodEggDuplication::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    if (START_LOCATION.start_in_grip_menu()){
-        grip_menu_connect_go_home(context);
-        resume_game_back_out(env.console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST, 400);
-    }else{
-        pbf_press_button(context, BUTTON_B, 5, 5);
-    }
-
-    run_program(env.console, context, MAX_FETCH_ATTEMPTS);
-    ssf_press_button2(context, BUTTON_HOME, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE, 10);
-}
-
-
-
-}
-}
-}
-
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_GodEggDuplication.h b/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_GodEggDuplication.h
deleted file mode 100644
index 6b880bca45..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_GodEggDuplication.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*  God Egg Duplication
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_GodEggDuplication_H
-#define PokemonAutomation_PokemonSwSh_GodEggDuplication_H
-
-#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
-#include "Common/Cpp/Options/SimpleIntegerOption.h"
-#include "NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-#include "PokemonSwSh_EggHelpers.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-class GodEggDuplication_Descriptor : public SingleSwitchProgramDescriptor{
-public:
-    GodEggDuplication_Descriptor();
-};
-
-
-
-class GodEggDuplication : public SingleSwitchProgramInstance{
-public:
-    GodEggDuplication();
-
-    void collect_godegg(BotBaseContext& context, uint8_t party_slot) const;
-    void run_program(Logger& logger, BotBaseContext& context, uint16_t attempts) const;
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-    StartInGripOrGameOption START_LOCATION;
-    SimpleIntegerOption<uint16_t> MAX_FETCH_ATTEMPTS;
-    SimpleIntegerOption<uint8_t> PARTY_ROUND_ROBIN;
-};
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_GodEggItemDupe.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_GodEggItemDupe.cpp
deleted file mode 100644
index 68c3f113d1..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_GodEggItemDupe.cpp
+++ /dev/null
@@ -1,184 +0,0 @@
-/*  God Egg Item Duplication
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Cpp/PrettyPrint.h"
-#include "NintendoSwitch/NintendoSwitch_Settings.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonSwSh/Commands/PokemonSwSh_Commands_EggRoutines.h"
-#include "PokemonSwSh/Commands/PokemonSwSh_Commands_Misc.h"
-#include "PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
-#include "PokemonSwSh/Programs/ReleaseHelpers.h"
-#include "PokemonSwSh_GodEggItemDupe.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-    using namespace Pokemon;
-
-
-GodEggItemDupe_Descriptor::GodEggItemDupe_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonSwSh:GodEggItemDupe",
-        STRING_POKEMON + " SwSh", "God Egg Item Duplication",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonSwSh/GodEggItemDuplication.md",
-        "Mass duplicate items with the God Egg.",
-        FeedbackType::NONE,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_31KB
-    )
-{}
-
-
-
-GodEggItemDupe::GodEggItemDupe()
-    : MAX_FETCH_ATTEMPTS(
-        "<b>Fetch this many times:</b><br>This puts a limit on how many eggs you can get so you don't make a mess of your boxes for fetching too many.",
-        LockWhileRunning::LOCKED,
-        2000
-    )
-    , PARTY_ROUND_ROBIN(
-        "<b>Party Round Robin:</b><br>Cycle through this many party members.",
-        LockWhileRunning::LOCKED,
-        6, 1, 6
-    )
-    , DETACH_BEFORE_RELEASE(
-        "<b>Detach before Release:</b><br>Needed for items like Rusted Sword/Shield.",
-        LockWhileRunning::LOCKED,
-        false
-    )
-{
-    PA_ADD_OPTION(START_LOCATION);
-    PA_ADD_OPTION(MAX_FETCH_ATTEMPTS);
-    PA_ADD_OPTION(PARTY_ROUND_ROBIN);
-    PA_ADD_OPTION(DETACH_BEFORE_RELEASE);
-}
-
-
-void GodEggItemDupe::collect_godegg(
-    BotBaseContext& context,
-    uint8_t party_slot,
-    bool map_to_pokemon,
-    bool pokemon_to_map
-) const{
-    pbf_wait(context, 50);
-    ssf_press_button1(context, BUTTON_B, 100);
-    ssf_press_button1(context, BUTTON_B, 100);
-    pbf_wait(context, 225);
-
-    //  "You received an Egg from the Nursery worker!"
-    ssf_press_button1(context, BUTTON_B, 300);
-
-    //  "Where do you want to send the Egg to?"
-    ssf_press_button1(context, BUTTON_A, 100);
-
-    //  (extra line of text for French)
-    ssf_press_button1(context, BUTTON_B, 100);
-
-    //  "Please select a Pokemon to swap from your party."
-    ssf_press_button1(context, BUTTON_B, GameSettings::instance().MENU_TO_POKEMON_DELAY);
-
-    //  Select the party member.
-    for (uint8_t c = 0; c < party_slot; c++){
-        ssf_press_dpad1(context, DPAD_DOWN, 10);
-    }
-    ssf_press_button1(context, BUTTON_A, 300);
-    pbf_mash_button(context, BUTTON_B, 500);
-
-    //  Enter box
-    ssf_press_button2(context, BUTTON_X, GameSettings::instance().OVERWORLD_TO_MENU_DELAY, 20);
-    if (map_to_pokemon){
-        ssf_press_dpad2(context, DPAD_UP, 20, 10);
-        ssf_press_dpad2(context, DPAD_RIGHT, 20, 10);
-    }
-    ssf_press_button2(context, BUTTON_A, GameSettings::instance().MENU_TO_POKEMON_DELAY, 10);
-    ssf_press_button2(context, BUTTON_R, GameSettings::instance().POKEMON_TO_BOX_DELAY, 10);
-
-    if (DETACH_BEFORE_RELEASE){
-        //  Detach item
-        ssf_press_button2(context, BUTTON_A, 50, 10);
-        ssf_press_dpad1(context, DPAD_DOWN, 10);
-        ssf_press_dpad1(context, DPAD_DOWN, 10);
-        ssf_press_button2(context, BUTTON_A, 150, 10);
-        ssf_press_button2(context, BUTTON_A, 150, 10);
-        ssf_press_button2(context, BUTTON_A, 100, 10);
-
-        //  Release
-        release(context);
-    }else{
-        //  Release (item detaches automatically)
-        ssf_press_button2(context, BUTTON_A, 60, 10);
-        ssf_press_dpad1(context, DPAD_DOWN, 15);
-        ssf_press_dpad1(context, DPAD_DOWN, 15);
-        ssf_press_dpad1(context, DPAD_DOWN, 15);
-        ssf_press_dpad1(context, DPAD_DOWN, 15);
-        ssf_press_button2(context, BUTTON_A, 125, 10);
-        ssf_press_dpad1(context, DPAD_UP, 10);
-        mash_A(context, 180);
-    }
-
-    //  Back out to menu.
-    if (pokemon_to_map){
-        box_to_menu(context);
-        ssf_press_button1(context, BUTTON_B, 250);
-    }else{
-        pbf_mash_button(context, BUTTON_B, 700);
-    }
-}
-void GodEggItemDupe::run_program(Logger& logger, BotBaseContext& context, uint16_t attempts) const{
-    if (attempts == 0){
-        return;
-    }
-
-    uint8_t items = PARTY_ROUND_ROBIN > 6 ? 6 : PARTY_ROUND_ROBIN;
-    uint8_t party_slot = 0;
-
-    uint16_t c = 0;
-
-    //  1st Fetch: Get into position.
-    {
-        logger.log("Fetch Attempts: " + tostr_u_commas(c));
-        fly_home_collect_egg(context, true);
-        collect_godegg(context, party_slot++, true, false);
-        if (party_slot >= items){
-            party_slot = 0;
-        }
-
-        c++;
-        if (c >= attempts){
-            return;
-        }
-    }
-
-    //  Now we are in steady state.
-    for (; c < attempts; c++){
-        logger.log("Fetch Attempts: " + tostr_u_commas(c));
-        eggfetcher_loop(context);
-        collect_egg(context);
-        collect_godegg(context, party_slot++, false, false);
-        if (party_slot >= items){
-            party_slot = 0;
-        }
-    }
-}
-
-void GodEggItemDupe::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    if (START_LOCATION.start_in_grip_menu()){
-        grip_menu_connect_go_home(context);
-        resume_game_back_out(env.console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST, 400);
-    }else{
-        pbf_press_button(context, BUTTON_B, 5, 5);
-    }
-
-    run_program(env.console, context, MAX_FETCH_ATTEMPTS);
-    ssf_press_button2(context, BUTTON_HOME, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE, 10);
-}
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_GodEggItemDupe.h b/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_GodEggItemDupe.h
deleted file mode 100644
index 92389b79a8..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_GodEggItemDupe.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*  God Egg Item Duplication
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_GodEggItemDupe_H
-#define PokemonAutomation_PokemonSwSh_GodEggItemDupe_H
-
-#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
-#include "Common/Cpp/Options/SimpleIntegerOption.h"
-#include "NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-#include "PokemonSwSh_EggHelpers.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-class GodEggItemDupe_Descriptor : public SingleSwitchProgramDescriptor{
-public:
-    GodEggItemDupe_Descriptor();
-};
-
-
-
-class GodEggItemDupe : public SingleSwitchProgramInstance{
-public:
-    GodEggItemDupe();
-
-    void collect_godegg(BotBaseContext& context, uint8_t party_slot, bool map_to_pokemon, bool pokemon_to_map) const;
-    void run_program(Logger& logger, BotBaseContext& context, uint16_t attempts) const;
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-    StartInGripOrGameOption START_LOCATION;
-    SimpleIntegerOption<uint16_t> MAX_FETCH_ATTEMPTS;
-    SimpleIntegerOption<uint8_t> PARTY_ROUND_ROBIN;
-    BooleanCheckBoxOption DETACH_BEFORE_RELEASE;
-};
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/General/PokemonSwSh_BallThrower.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/General/PokemonSwSh_BallThrower.cpp
deleted file mode 100644
index c949e53b02..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/General/PokemonSwSh_BallThrower.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-/*  Ball Thrower
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Device.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonSwSh/PokemonSwSh_Settings.h"
-#include "PokemonSwSh_BallThrower.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-    using namespace Pokemon;
-
-
-BallThrower_Descriptor::BallThrower_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonSwSh:BallThrower",
-        STRING_POKEMON + " SwSh", "Ball Thrower",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonSwSh/BallThrower.md",
-        "Blindly throw balls at the opposing " + STRING_POKEMON + " until it catches.",
-        FeedbackType::NONE,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-
-
-
-BallThrower::BallThrower(){
-    PA_ADD_OPTION(START_LOCATION);
-}
-
-void BallThrower::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    if (START_LOCATION.start_in_grip_menu()){
-        grip_menu_connect_go_home(context);
-        pbf_press_button(context, BUTTON_HOME, 10, GameSettings::instance().HOME_TO_GAME_DELAY);
-    }else{
-        pbf_press_button(context, BUTTON_X, 5, 5);
-    }
-
-    while (true){
-        pbf_press_button(context, BUTTON_X, 50, 50);
-        pbf_press_button(context, BUTTON_A, 50, 50);
-        pbf_mash_button(context, BUTTON_B, 100);
-    }
-
-    pbf_press_button(context, BUTTON_HOME, 10, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE);
-}
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/General/PokemonSwSh_BallThrower.h b/SerialPrograms/Source/PokemonSwSh/Programs/General/PokemonSwSh_BallThrower.h
deleted file mode 100644
index ec84f74dc7..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/General/PokemonSwSh_BallThrower.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*  Ball Thrower
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_BallThrower_H
-#define PokemonAutomation_PokemonSwSh_BallThrower_H
-
-#include "NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-class BallThrower_Descriptor : public SingleSwitchProgramDescriptor{
-public:
-    BallThrower_Descriptor();
-};
-
-
-
-class BallThrower : public SingleSwitchProgramInstance{
-public:
-    BallThrower();
-
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-    StartInGripOrGameOption START_LOCATION;
-};
-
-}
-}
-}
-#endif
-
-
-
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/General/PokemonSwSh_BoxReorderNationalDex.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/General/PokemonSwSh_BoxReorderNationalDex.cpp
deleted file mode 100644
index 284de9626e..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/General/PokemonSwSh_BoxReorderNationalDex.cpp
+++ /dev/null
@@ -1,246 +0,0 @@
-/*  Box Reorder National Dex
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <sstream>
-#include <map>
-#include "CommonFramework/Language.h"
-#include "CommonFramework/Exceptions/OperationFailedException.h"
-#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
-#include "CommonFramework/OCR/OCR_TextMatcher.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "Pokemon/Resources/Pokemon_PokemonSlugs.h"
-#include "Pokemon/Inference/Pokemon_NameReader.h"
-#include "PokemonSwSh/PokemonSwSh_Settings.h"
-#include "PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
-#include "PokemonSwSh_BoxReorderNationalDex.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-    using namespace Pokemon;
-
-
-namespace{
-
-constexpr uint16_t k_wait_after_move = TICKS_PER_SECOND / 1.5;
-constexpr std::chrono::milliseconds k_wait_after_read = std::chrono::milliseconds(200);
-
-// A location can be represented as a uint16_t, meaning the order of the location starting at the first box.
-// This function decodes this location into box ID and in-box 2D location.
-std::tuple<uint16_t, uint16_t, uint16_t> get_location(size_t index){
-    uint16_t box = (uint16_t)(index / 30);
-    index = index % 30;
-
-    uint16_t row = (uint16_t)(index / 6);
-    index = index % 6;
-
-    uint16_t column = (uint16_t)(index);
-    return { box, row, column };
-}
-
-// Move cursor from one location to another
-// The location is represented as a uint16_t, meaning the order of the location starting at the first box.
-// Decode this location into box ID and in-box 2D location by `get_location()`
-uint16_t move_to_location(Logger& logger, BotBaseContext& context, uint16_t from, uint16_t to){
-    auto [from_box, from_row, from_column] = get_location(from);
-    auto [to_box, to_row, to_column] = get_location(to);
-
-    std::ostringstream ss;
-    ss << "Moving from location index " << from << "(" << from_box << "/" << from_row << "/" << from_column << ")";
-    ss << " to location index " << to << "(" << to_box << "/" << to_row << "/" << to_column << ")";
-    logger.log(ss.str());
-
-    int difference_box = to_box - from_box;
-    int difference_row = to_row - from_row;
-    int difference_column = to_column - from_column;
-
-    // TODO: can make this more efficient by moving past grid boundary to appear at the other side
-
-    for (int i = 0; i < difference_box; ++i){
-        pbf_press_button(context, BUTTON_R, 10, k_wait_after_move);
-    }
-    for (int i = 0; i > difference_box; --i){
-        pbf_press_button(context, BUTTON_L, 10, k_wait_after_move);
-    }
-
-    for (int i = 0; i < difference_row; ++i){
-        pbf_press_dpad(context, DPAD_DOWN, 10, k_wait_after_move);
-    }
-    for (int i = 0; i > difference_row; --i){
-        pbf_press_dpad(context, DPAD_UP, 10, k_wait_after_move);
-    }
-
-    for (int i = 0; i < difference_column; ++i){
-        pbf_press_dpad(context, DPAD_RIGHT, 10, k_wait_after_move);
-    }
-    for (int i = 0; i > difference_column; --i){
-        pbf_press_dpad(context, DPAD_LEFT, 10, k_wait_after_move);
-    }
-    return to;
-}
-
-// Read the current displayed pokemon name. Return the pokemon slug.
-//
-// A slug is a unique name used in a program, different than the name that is displayed to user on UI.
-// In most cases, a pokemon slug is the lower-case version of the Pokemon name, but there are some cases
-// like the slug of the Pokemon Mr. Mime is "mr-mime".
-std::string read_selected_pokemon(ConsoleHandle& console, BotBaseContext& context, Language language){
-    context.wait_for_all_requests();
-    OverlayBoxScope box(console, ImageFloatBox(0.76, 0.08, 0.15, 0.064));
-    context.wait_for(k_wait_after_read);
-
-    VideoSnapshot screen = console.video().snapshot();
-    ImageViewRGB32 frame = extract_box_reference(screen, box);
-
-    OCR::StringMatchResult result = PokemonNameReader::instance().read_substring(
-        console, language, frame,
-        OCR::BLACK_TEXT_FILTERS()
-    );
-    result.log(console, PokemonNameReader::MAX_LOG10P);
-//        assert(result.results.size() == 1);
-    if (result.results.size() != 1){
-        return "";
-    }
-    return result.results.begin()->second.token;
-}
-
-// Move through some pokemon according to the box location order and read their names.
-// Return a list of pokemon slugs.
-std::vector<std::string> read_all_pokemon(Logger& logger, ConsoleHandle& console, BotBaseContext& context, uint16_t pokemon_count, Language language){
-    std::vector<std::string> pokemons;
-    uint16_t current_location = 0;
-    for (uint16_t i = 0; i < pokemon_count; ++i){
-        current_location = move_to_location(logger, context, current_location, i);
-        pokemons.push_back(read_selected_pokemon(console, context, language));
-    }
-    return pokemons;
-}
-
-}
-
-BoxReorderNationalDex_Descriptor::BoxReorderNationalDex_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonSwSh:BoxReorderNationalDex",
-        STRING_POKEMON + " SwSh", "Box Reorder National Dex",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonSwSh/BoxReorderNationalDex.md",
-        "Order boxes of " + STRING_POKEMON + ".",
-        FeedbackType::REQUIRED,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-
-
-
-BoxReorderNationalDex::BoxReorderNationalDex()
-    : LANGUAGE(
-        "<b>Game Language:</b><br>This needs to be set correctly for " + STRING_POKEMON + " to be identified correctly.",
-        PokemonNameReader::instance().languages(),
-        LockWhileRunning::LOCKED,
-        true
-    )
-    , POKEMON_COUNT(
-        "<b>Number of " + STRING_POKEMON + " to order:</b>",
-        LockWhileRunning::LOCKED,
-        30
-    )
-    , DODGE_SYSTEM_UPDATE_WINDOW(
-        "<b>Dodge System Update Window:</b>",
-        LockWhileRunning::LOCKED,
-        false
-    )
-{
-    PA_ADD_OPTION(START_LOCATION);
-    PA_ADD_OPTION(LANGUAGE);
-    PA_ADD_OPTION(POKEMON_COUNT);
-    PA_ADD_OPTION(DODGE_SYSTEM_UPDATE_WINDOW);
-}
-
-void BoxReorderNationalDex::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    if (START_LOCATION.start_in_grip_menu()){
-        grip_menu_connect_go_home(context);
-        resume_game_no_interact(env.console, context, DODGE_SYSTEM_UPDATE_WINDOW);
-    }else{
-        pbf_press_button(context, BUTTON_LCLICK, 5, 5);
-    }
-
-    // Read all the pokemon and return a list of their slugs in the current box order.
-    std::vector<std::string> current_order = read_all_pokemon(env.console, env.console, context, POKEMON_COUNT, LANGUAGE);
-
-    // The list of pokemon slugs in national order.
-    const std::vector<std::string>& dex_slugs = NATIONAL_DEX_SLUGS();
-    // Build a map of slug -> national dex ID for fast lookup
-    std::map<std::string, size_t> dex_slug_order;
-    for(size_t i = 0; i < dex_slugs.size(); ++i){
-        dex_slug_order.emplace(dex_slugs[i], i);
-    }
-
-    // check if we have any pokemon name read failure.
-    for(size_t i = 0; i < current_order.size(); ++i){
-        const auto it = dex_slug_order.find(current_order[i]);
-        // If OCR gives a name that is not in the nation dex, throw an error:
-        if (it == dex_slug_order.end()){
-            const auto [box, row, col] = get_location(i);
-            std::stringstream os;
-            os << "Failed to read pokemon name at box " << box << " row " << row << " col " << col;
-            throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, env.console,
-                os.str(),
-                true
-            );
-        }
-    }
-    
-    // Sort the read pokemon by the dex order.
-    std::vector<std::string> sorted_order = current_order;
-
-    std::sort(sorted_order.begin(), sorted_order.end(), [&](const std::string& str1, const std::string& str2){
-        const size_t id1 = dex_slug_order.find(str1)->second;
-        const size_t id2 = dex_slug_order.find(str2)->second;
-        return id1 < id2;
-    });
-
-    // Now the cursor is at the last pokemon:
-    uint16_t current_location = POKEMON_COUNT - 1;
-    for (uint16_t index = 0; index < current_order.size(); ++index){
-        if (current_order[index] == sorted_order[index]){
-            continue;
-        }
-
-        const auto it = std::find(current_order.begin() + index, current_order.end(), sorted_order[index]);
-        // Where the pokemon should be moved from
-        const uint16_t unsorted_location = it - current_order.begin();
-        // Where the pokemon should be moved to
-        const uint16_t sorted_location = index;
-
-        std::ostringstream ss;
-        ss << "Swapping " << current_order[unsorted_location] << " at location index " << unsorted_location << " and " << current_order[sorted_location] << " at location index " << sorted_location;
-        env.console.log(ss.str());
-        // Move the cursor to the unsorted_location
-        current_location = move_to_location(env.console, context, current_location, unsorted_location);
-        // Press A to grab the pokemon
-        pbf_press_button(context, BUTTON_A, 10, k_wait_after_move);
-        // Move the cursor to the sorted_location
-        current_location = move_to_location(env.console, context, current_location, sorted_location);
-        // Press A to finish swapping the pokemon
-        pbf_press_button(context, BUTTON_A, 10, k_wait_after_move);
-        // Now the order in the box is changed, update `current_order` to reflect this change.
-        std::swap(current_order[unsorted_location], current_order[sorted_location]);
-    }
-
-    // Go to Switch home menu
-    pbf_press_button(context, BUTTON_HOME, 10, GameSettings::instance().HOME_TO_GAME_DELAY);
-}
-
-
-
-}
-}
-}
-
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/General/PokemonSwSh_BoxReorderNationalDex.h b/SerialPrograms/Source/PokemonSwSh/Programs/General/PokemonSwSh_BoxReorderNationalDex.h
deleted file mode 100644
index ed74b9f396..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/General/PokemonSwSh_BoxReorderNationalDex.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*  Box Reorder National Dex
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_Ordering_H
-#define PokemonAutomation_PokemonSwSh_Ordering_H
-
-#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
-#include "Common/Cpp/Options/SimpleIntegerOption.h"
-#include "CommonFramework/Options/LanguageOCROption.h"
-#include "NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-class BoxReorderNationalDex_Descriptor : public SingleSwitchProgramDescriptor{
-public:
-    BoxReorderNationalDex_Descriptor();
-};
-
-
-
-class BoxReorderNationalDex : public SingleSwitchProgramInstance{
-public:
-    BoxReorderNationalDex();
-
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-    StartInGripOrGameOption START_LOCATION;
-    OCR::LanguageOCROption LANGUAGE;
-    SimpleIntegerOption<uint16_t> POKEMON_COUNT;
-    BooleanCheckBoxOption DODGE_SYSTEM_UPDATE_WINDOW;
-};
-
-
-}
-}
-}
-#endif
-
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/General/PokemonSwSh_ClothingBuyer.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/General/PokemonSwSh_ClothingBuyer.cpp
deleted file mode 100644
index 4e250ff884..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/General/PokemonSwSh_ClothingBuyer.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-/*  Clothing Buyer
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "NintendoSwitch/NintendoSwitch_Settings.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
-#include "PokemonSwSh_ClothingBuyer.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-    using namespace Pokemon;
-
-
-ClothingBuyer_Descriptor::ClothingBuyer_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonSwSh:ClothingBuyer",
-        STRING_POKEMON + " SwSh", "Clothing Buyer",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonSwSh/ClothingBuyer.md",
-        "Buy out all the clothing in a store.",
-        FeedbackType::NONE,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-
-
-
-ClothingBuyer::ClothingBuyer()
-    : CATEGORY_ROTATION(
-        "<b>Rotate Categories:</b><br>This slows down the program, but ensures it will cover all categories.",
-        LockWhileRunning::LOCKED,
-        true
-    )
-{
-    PA_ADD_OPTION(START_LOCATION);
-    PA_ADD_OPTION(CATEGORY_ROTATION);
-}
-
-void ClothingBuyer::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    if (START_LOCATION.start_in_grip_menu()){
-        grip_menu_connect_go_home(context);
-        resume_game_no_interact(env.console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST);
-    }else{
-        pbf_press_button(context, BUTTON_LCLICK, 5, 5);
-    }
-
-    while (true){
-        pbf_press_button(context, BUTTON_A, 10, 90);
-        if (CATEGORY_ROTATION){
-            pbf_press_dpad(context, DPAD_RIGHT, 10, 40);
-        }
-        pbf_press_button(context, BUTTON_A, 10, 90);
-        pbf_press_button(context, BUTTON_A, 10, 90);
-        pbf_press_dpad(context, DPAD_DOWN, 10, 40);
-    }
-}
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/General/PokemonSwSh_ClothingBuyer.h b/SerialPrograms/Source/PokemonSwSh/Programs/General/PokemonSwSh_ClothingBuyer.h
deleted file mode 100644
index ae7878bf4e..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/General/PokemonSwSh_ClothingBuyer.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*  Clothing Buyer
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_ClothingBuyer_H
-#define PokemonAutomation_PokemonSwSh_ClothingBuyer_H
-
-#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
-#include "NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-class ClothingBuyer_Descriptor : public SingleSwitchProgramDescriptor{
-public:
-    ClothingBuyer_Descriptor();
-};
-
-
-
-class ClothingBuyer : public SingleSwitchProgramInstance{
-public:
-    ClothingBuyer();
-
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-    StartInGripOrGameOption START_LOCATION;
-    BooleanCheckBoxOption CATEGORY_ROTATION;
-};
-
-
-
-}
-}
-}
-#endif
-
-
-
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/General/PokemonSwSh_DexRecFinder.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/General/PokemonSwSh_DexRecFinder.cpp
deleted file mode 100644
index 9de9b5b74a..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/General/PokemonSwSh_DexRecFinder.cpp
+++ /dev/null
@@ -1,249 +0,0 @@
-/*  Pokedex Recommendation Finder
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
-#include "CommonFramework/Notifications/ProgramNotifications.h"
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
-#include "CommonFramework/Tools/StatsTracking.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "Pokemon/Inference/Pokemon_NameReader.h"
-#include "PokemonSwSh/PokemonSwSh_Settings.h"
-#include "PokemonSwSh/Commands/PokemonSwSh_Commands_GameEntry.h"
-#include "PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.h"
-#include "PokemonSwSh/Resources/PokemonSwSh_NameDatabase.h"
-#include "PokemonSwSh_DexRecFinder.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-
-DexRecFinder_Descriptor::DexRecFinder_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonSwSh:DexRecFinder",
-        STRING_POKEMON + " SwSh", "Dex Rec Finder",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonSwSh/DexRecFinder.md",
-        "Search for a " + STRING_POKEDEX + " recommendation by date-spamming.",
-        FeedbackType::OPTIONAL_,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-struct DexRecFinder_Descriptor::Stats : public StatsTracker{
-    Stats()
-        : attempts(m_stats["Attempts"])
-        , errors(m_stats["Read Errors"])
-        , excluded(m_stats["Excluded"])
-        , matches(m_stats["Matches"])
-    {
-        m_display_order.emplace_back(Stat("Attempts"));
-        m_display_order.emplace_back(Stat("Read Errors"));
-        m_display_order.emplace_back(Stat("Excluded"));
-        m_display_order.emplace_back(Stat("Matches"));
-    }
-
-    std::atomic<uint64_t>& attempts;
-    std::atomic<uint64_t>& errors;
-    std::atomic<uint64_t>& excluded;
-    std::atomic<uint64_t>& matches;
-};
-std::unique_ptr<StatsTracker> DexRecFinder_Descriptor::make_stats() const{
-    return std::unique_ptr<StatsTracker>(new Stats());
-}
-
-
-
-DexRecFilters::DexRecFilters()
-    : GroupOption("Stop Automatically (requires video feedback)", LockWhileRunning::LOCKED, true, true)
-    , LANGUAGE(
-        "<b>Game Language:</b><br>This needs to be set correctly for stop filters to work correctly.",
-        PokemonNameReader::instance().languages(),
-        LockWhileRunning::LOCKED,
-        true
-    )
-    , DESIRED(
-        "<b>Desired " + STRING_POKEMON + ":</b><br>Stop when it finds this " + STRING_POKEMON + ". Requires the language be set.",
-        COMBINED_DEX_NAMES(),
-        LockWhileRunning::LOCKED,
-        "ralts"
-    )
-    , EXCLUSIONS(
-        "<b>Exclusions:</b><br>Do not stop on these " + STRING_POKEMON + " even if the desired " + STRING_POKEMON + " is found. "
-        "Use this to avoid dex recs that include other " + STRING_POKEMON + " in the spawn pool you don't want.",
-        STRING_POKEMON, COMBINED_DEX_NAMES(), "grubbin"
-    )
-{
-    PA_ADD_OPTION(LANGUAGE);
-    PA_ADD_OPTION(DESIRED);
-    PA_ADD_OPTION(EXCLUSIONS);
-}
-
-
-
-DexRecFinder::DexRecFinder()
-    : GO_HOME_WHEN_DONE(false)
-    , VIEW_TIME(
-        "<b>View Time:</b><br>View the " + STRING_POKEDEX + " for this long before continuing.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "2 * TICKS_PER_SECOND"
-    )
-    , NOTIFICATION_PROGRAM_FINISH("Program Finished", true, true, ImageAttachmentMode::JPG)
-    , NOTIFICATIONS({
-        &NOTIFICATION_PROGRAM_FINISH,
-        &NOTIFICATION_ERROR_FATAL,
-    })
-    , m_advanced_options(
-        "<font size=4><b>Advanced Options:</b> You should not need to touch anything below here.</font>"
-    )
-    , ENTER_POKEDEX_TIME(
-        "<b>Enter " + STRING_POKEDEX + " Time:</b><br>Wait this long for the " + STRING_POKEDEX + " to open.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "3 * TICKS_PER_SECOND"
-    )
-    , BACK_OUT_TIME(
-        "<b>Back Out Time:</b><br>Mash B for this long to return to the overworld.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "3 * TICKS_PER_SECOND"
-    )
-{
-    PA_ADD_OPTION(START_LOCATION);
-    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
-
-    PA_ADD_OPTION(FILTERS);
-    PA_ADD_OPTION(VIEW_TIME);
-    PA_ADD_OPTION(NOTIFICATIONS);
-
-    PA_ADD_STATIC(m_advanced_options);
-    PA_ADD_OPTION(ENTER_POKEDEX_TIME);
-    PA_ADD_OPTION(BACK_OUT_TIME);
-}
-
-
-void DexRecFinder::read_line(
-    bool& found,
-    bool& excluded,
-    bool& bad_read,
-    Logger& logger,
-    Language language,
-    const ImageViewRGB32& frame,
-    const ImageFloatBox& box,
-    const std::set<std::string>& desired,
-    const std::set<std::string>& exclusions
-){
-    ImageViewRGB32 image = extract_box_reference(frame, box);
-    OCR::StringMatchResult result = PokemonNameReader::instance().read_substring(
-        logger, language, image,
-        OCR::BLACK_TEXT_FILTERS()
-    );
-    if (result.results.empty()){
-        bad_read = true;
-        return;
-    }
-    for (const auto& hit : result.results){
-        if (desired.find(hit.second.token) != desired.end()){
-            found = true;
-        }
-        if (exclusions.find(hit.second.token) != exclusions.end()){
-            excluded = true;
-        }
-    }
-}
-
-void DexRecFinder::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    if (START_LOCATION.start_in_grip_menu()){
-        grip_menu_connect_go_home(context);
-    }else{
-        pbf_press_button(context, BUTTON_B, 5, 5);
-        pbf_press_button(context, BUTTON_HOME, 10, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE);
-    }
-
-    std::set<std::string> desired;
-    desired.insert(FILTERS.DESIRED.slug());
-
-    std::set<std::string> exclusions;
-    for (std::string& slug : FILTERS.EXCLUSIONS.all_slugs()){
-        exclusions.insert(std::move(slug));
-    }
-
-    DexRecFinder_Descriptor::Stats& stats = env.current_stats<DexRecFinder_Descriptor::Stats>();
-
-    while (true){
-        home_to_date_time(context, true, true);
-        neutral_date_skip(context);
-        settings_to_enter_game(context, true);
-        pbf_mash_button(context, BUTTON_B, 90);
-        pbf_press_button(context, BUTTON_X, 20, GameSettings::instance().OVERWORLD_TO_MENU_DELAY - 20);
-
-        if (FILTERS.enabled()){
-            context.wait_for_all_requests();
-            OverlayBoxScope box0(env.console, ImageFloatBox(0.75, 0.531 + 0 * 0.1115, 0.18, 0.059));
-            OverlayBoxScope box1(env.console, ImageFloatBox(0.75, 0.531 + 1 * 0.1115, 0.18, 0.059));
-            OverlayBoxScope box2(env.console, ImageFloatBox(0.75, 0.531 + 2 * 0.1115, 0.18, 0.059));
-            OverlayBoxScope box3(env.console, ImageFloatBox(0.75, 0.531 + 3 * 0.1115, 0.18, 0.059));
-            pbf_press_button(context, BUTTON_A, 10, ENTER_POKEDEX_TIME);
-            context.wait_for_all_requests();
-
-            VideoSnapshot frame = env.console.video().snapshot();
-            bool found = false;
-            bool excluded = false;
-            bool bad_read = false;
-            if (!frame){
-                bad_read = true;
-            }else{
-                read_line(found, excluded, bad_read, env.console, FILTERS.LANGUAGE, frame, box0, desired, exclusions);
-                read_line(found, excluded, bad_read, env.console, FILTERS.LANGUAGE, frame, box1, desired, exclusions);
-                read_line(found, excluded, bad_read, env.console, FILTERS.LANGUAGE, frame, box2, desired, exclusions);
-                read_line(found, excluded, bad_read, env.console, FILTERS.LANGUAGE, frame, box3, desired, exclusions);
-            }
-
-            stats.attempts++;
-            if (found){
-                if (excluded){
-                    env.log("Found desired, but contains exclusion.", COLOR_BLUE);
-                    stats.excluded++;
-                }else{
-                    env.log("Found a match!", COLOR_BLUE);
-                    stats.matches++;
-                    break;
-                }
-            }
-            if (bad_read){
-                env.log("Read Errors. Pausing for user to see.", COLOR_RED);
-                stats.errors++;
-                pbf_wait(context, VIEW_TIME);
-            }
-        }else{
-            stats.attempts++;
-//            stats.errors++;
-            pbf_press_button(context, BUTTON_A, 10, ENTER_POKEDEX_TIME);
-            pbf_wait(context, VIEW_TIME);
-        }
-        env.update_stats();
-
-        pbf_mash_button(context, BUTTON_B, BACK_OUT_TIME);
-        pbf_press_button(context, BUTTON_HOME, 10, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE);
-    }
-
-    env.update_stats();
-    send_program_finished_notification(
-        env, NOTIFICATION_PROGRAM_FINISH,
-        "Found a match!",
-        env.console.video().snapshot(), false
-    );
-    GO_HOME_WHEN_DONE.run_end_of_program(context);
-}
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/General/PokemonSwSh_DexRecFinder.h b/SerialPrograms/Source/PokemonSwSh/Programs/General/PokemonSwSh_DexRecFinder.h
deleted file mode 100644
index ccec6e31f1..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/General/PokemonSwSh_DexRecFinder.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/*  Pokedex Recommendation Finder
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_DexRecFinder_H
-#define PokemonAutomation_PokemonSwSh_DexRecFinder_H
-
-#include "Common/Cpp/Options/StaticTextOption.h"
-#include "Common/Cpp/Options/TimeExpressionOption.h"
-#include "CommonFramework/Options/LanguageOCROption.h"
-#include "CommonFramework/Options/ScreenshotFormatOption.h"
-#include "CommonFramework/Options/StringSelectTableOption.h"
-#include "CommonFramework/Notifications/EventNotificationsTable.h"
-#include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "Pokemon/Inference/Pokemon_NameReader.h"
-#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
-#include "NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-using namespace Pokemon;
-
-
-class DexRecFinder_Descriptor : public SingleSwitchProgramDescriptor{
-public:
-    DexRecFinder_Descriptor();
-
-    struct Stats;
-    virtual std::unique_ptr<StatsTracker> make_stats() const override;
-};
-
-
-
-class DexRecFilters : public GroupOption{
-public:
-    DexRecFilters();
-
-    OCR::LanguageOCROption LANGUAGE;
-    StringSelectOption DESIRED;
-    StringSelectTableOption EXCLUSIONS;
-};
-
-
-class DexRecFinder : public SingleSwitchProgramInstance{
-public:
-    DexRecFinder();
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-    void read_line(
-        bool& found,
-        bool& excluded,
-        bool& bad_read,
-        Logger& logger,
-        Language language,
-        const ImageViewRGB32& frame,
-        const ImageFloatBox& box,
-        const std::set<std::string>& desired,
-        const std::set<std::string>& exclusions
-    );
-
-private:
-    StartInGripOrGameOption START_LOCATION;
-    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
-
-    DexRecFilters FILTERS;
-    TimeExpressionOption<uint16_t> VIEW_TIME;
-
-    EventNotificationOption NOTIFICATION_PROGRAM_FINISH;
-    EventNotificationsOption NOTIFICATIONS;
-
-    SectionDividerOption m_advanced_options;
-    TimeExpressionOption<uint16_t> ENTER_POKEDEX_TIME;
-    TimeExpressionOption<uint16_t> BACK_OUT_TIME;
-};
-
-}
-}
-}
-#endif
-
-
-
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/General/PokemonSwSh_MassRelease.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/General/PokemonSwSh_MassRelease.cpp
deleted file mode 100644
index a6a881a850..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/General/PokemonSwSh_MassRelease.cpp
+++ /dev/null
@@ -1,72 +0,0 @@
-/*  Mass Release
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonSwSh/PokemonSwSh_Settings.h"
-#include "PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
-#include "PokemonSwSh/Programs/ReleaseHelpers.h"
-#include "PokemonSwSh_MassRelease.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-    using namespace Pokemon;
-
-
-MassRelease_Descriptor::MassRelease_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonSwSh:MassRelease",
-        STRING_POKEMON + " SwSh", "Mass Release",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonSwSh/MassRelease.md",
-        "Mass release boxes of " + STRING_POKEMON + ".",
-        FeedbackType::NONE,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-
-
-
-MassRelease::MassRelease()
-    : BOXES_TO_RELEASE(
-        "<b>Number of Boxes to Release:</b>",
-        LockWhileRunning::LOCKED,
-        2, 0, 32
-    )
-    , DODGE_SYSTEM_UPDATE_WINDOW(
-        "<b>Dodge System Update Window:</b>",
-        LockWhileRunning::LOCKED,
-        false
-    )
-{
-    PA_ADD_OPTION(START_LOCATION);
-    PA_ADD_OPTION(BOXES_TO_RELEASE);
-    PA_ADD_OPTION(DODGE_SYSTEM_UPDATE_WINDOW);
-}
-
-void MassRelease::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    if (START_LOCATION.start_in_grip_menu()){
-        grip_menu_connect_go_home(context);
-        resume_game_no_interact(env.console, context, DODGE_SYSTEM_UPDATE_WINDOW);
-    }else{
-        pbf_press_button(context, BUTTON_LCLICK, 5, 5);
-    }
-
-    release_boxes(
-        context,
-        BOXES_TO_RELEASE,
-        GameSettings::instance().BOX_SCROLL_DELAY,
-        GameSettings::instance().BOX_CHANGE_DELAY
-    );
-    pbf_press_button(context, BUTTON_HOME, 10, GameSettings::instance().HOME_TO_GAME_DELAY);
-}
-
-
-
-}
-}
-}
-
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/General/PokemonSwSh_SurpriseTrade.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/General/PokemonSwSh_SurpriseTrade.cpp
deleted file mode 100644
index 1a83dfa637..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/General/PokemonSwSh_SurpriseTrade.cpp
+++ /dev/null
@@ -1,152 +0,0 @@
-/*  Surprise Trade
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "NintendoSwitch/NintendoSwitch_Settings.h"
-#include "NintendoSwitch/FixedInterval.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonSwSh/PokemonSwSh_Settings.h"
-#include "PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
-#include "PokemonSwSh_SurpriseTrade.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-    using namespace Pokemon;
-
-
-SurpriseTrade_Descriptor::SurpriseTrade_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonSwSh:SurpriseTrade",
-        STRING_POKEMON + " SwSh", "Surprise Trade",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonSwSh/SurpriseTrade.md",
-        "Surprise trade away boxes of " + STRING_POKEMON,
-        FeedbackType::NONE,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-
-
-
-SurpriseTrade::SurpriseTrade()
-    : BOXES_TO_TRADE(
-        "<b>Number of Boxes to Trade:</b>",
-        LockWhileRunning::LOCKED,
-        2
-    )
-    , INITIAL_WAIT(
-        "<b>Time to wait for a Trade Partner:</b>",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "30 * TICKS_PER_SECOND"
-    )
-    , m_advanced_options(
-        "<font size=4><b>Advanced Options:</b> You should not need to touch anything below here.</font>"
-    )
-    , TRADE_ANIMATION(
-        "<b>Trade Animation Time:</b>",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "23 * TICKS_PER_SECOND"
-    )
-    , EVOLVE_DELAY(
-        "<b>Evolve Delay:</b>",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "30 * TICKS_PER_SECOND"
-    )
-{
-    PA_ADD_OPTION(START_LOCATION);
-
-    PA_ADD_OPTION(BOXES_TO_TRADE);
-    PA_ADD_OPTION(INITIAL_WAIT);
-    PA_ADD_STATIC(m_advanced_options);
-    PA_ADD_OPTION(TRADE_ANIMATION);
-    PA_ADD_OPTION(EVOLVE_DELAY);
-}
-
-
-void SurpriseTrade::trade_slot(BotBaseContext& context, uint8_t slot, bool next_box) const{
-    ssf_press_button2(context, BUTTON_Y, GameSettings::instance().OPEN_YCOMM_DELAY, 50);
-    ssf_press_dpad1(context, DPAD_DOWN, 10);
-    ssf_press_button2(context, BUTTON_A, 280, 20);
-
-    if (next_box){
-        ssf_press_button1(context, BUTTON_R, GameSettings::instance().BOX_CHANGE_DELAY);
-    }
-
-    //  Move to slot
-    while (slot >= 6){
-        ssf_press_dpad1(context, DPAD_DOWN, GameSettings::instance().BOX_SCROLL_DELAY);
-        slot -= 6;
-    }
-    while (slot > 0){
-        ssf_press_dpad1(context, DPAD_RIGHT, GameSettings::instance().BOX_SCROLL_DELAY);
-        slot--;
-    }
-
-    ssf_press_button1(context, BUTTON_A, 50);
-    ssf_press_button1(context, BUTTON_A, 500);
-    ssf_press_button1(context, BUTTON_A, 100);
-    ssf_press_button1(context, BUTTON_A, 100);
-
-    pbf_mash_button(context, BUTTON_B, INITIAL_WAIT);
-
-    //  This is a state-merging operation.
-    //  If we just finished a trade, this will start the animation for it.
-    //  If we failed the previous trade and are stuck in the wrong parity, this
-    //  is a no-op that will correct the parity and setup the next trade.
-    ssf_press_button1(context, BUTTON_Y, GameSettings::instance().OPEN_YCOMM_DELAY);
-    pbf_mash_button(context, BUTTON_B, TRADE_ANIMATION);
-}
-
-void SurpriseTrade::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    if (START_LOCATION.start_in_grip_menu()){
-        grip_menu_connect_go_home(context);
-        resume_game_no_interact(env.console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST);
-    }else{
-        pbf_press_button(context, BUTTON_B, 5, 5);
-    }
-
-    for (uint8_t box = 0; box < BOXES_TO_TRADE; box++){
-        //  At this point, we MUST be in the overworld with no pending trade.
-        //  Otherwise the box transition will fail. Therefore we add a cleanup
-        //  stage after each box to make sure we are in this state.
-        trade_slot(context, 0, box != 0);
-
-        for (uint8_t c = 1; c < 30; c++){
-            trade_slot(context, c, false);
-        }
-
-        //  If the previous trade isn't done, either wait to finish or cancel it.
-        //  Two iterations of this will merge all the following states:
-        //      1.  The last trade finished successfully. Both iterations are no-ops.
-        //      2.  The last trade was slightly too slow. The 1st iteration
-        //          will finish it. The 2nd iteration is a no-op.
-        //      3.  The last trade was very slow. The 1st iteration is suppressed
-        //          because the trade is in progress. The 2nd iteration finishes it.
-        //      4.  No partner was ever found. The 1st iteration will cancel the trade.
-        for (uint8_t c = 0; c < 2; c++){
-            ssf_press_button1(context, BUTTON_Y, 250);
-            ssf_press_dpad1(context, DPAD_DOWN, 20);
-            ssf_press_button1(context, BUTTON_A, 280);
-            ssf_press_button1(context, BUTTON_B, 280);
-            ssf_press_button1(context, BUTTON_B, 200);
-            ssf_press_button1(context, BUTTON_A, 100);
-            pbf_mash_button(context, BUTTON_B, TRADE_ANIMATION);
-        }
-
-        //  Wait out any new pokedex entries or trade evolutions.
-        pbf_mash_button(context, BUTTON_B, EVOLVE_DELAY);
-    }
-
-    ssf_press_button2(context, BUTTON_HOME, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE, 10);
-}
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/General/PokemonSwSh_SurpriseTrade.h b/SerialPrograms/Source/PokemonSwSh/Programs/General/PokemonSwSh_SurpriseTrade.h
deleted file mode 100644
index 64f2959520..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/General/PokemonSwSh_SurpriseTrade.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*  Surprise Trade
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_SurpriseTrade_H
-#define PokemonAutomation_PokemonSwSh_SurpriseTrade_H
-
-#include "Common/Cpp/Options/StaticTextOption.h"
-#include "Common/Cpp/Options/SimpleIntegerOption.h"
-#include "Common/Cpp/Options/TimeExpressionOption.h"
-#include "NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-class SurpriseTrade_Descriptor : public SingleSwitchProgramDescriptor{
-public:
-    SurpriseTrade_Descriptor();
-};
-
-
-
-class SurpriseTrade : public SingleSwitchProgramInstance{
-public:
-    SurpriseTrade();
-
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-    void trade_slot(BotBaseContext& context, uint8_t slot, bool next_box) const;
-
-private:
-    StartInGripOrGameOption START_LOCATION;
-
-    SimpleIntegerOption<uint8_t> BOXES_TO_TRADE;
-    TimeExpressionOption<uint16_t> INITIAL_WAIT;
-    SectionDividerOption m_advanced_options;
-    TimeExpressionOption<uint16_t> TRADE_ANIMATION;
-    TimeExpressionOption<uint16_t> EVOLVE_DELAY;
-};
-
-
-}
-}
-}
-#endif
-
-
-
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/General/PokemonSwSh_TradeBot.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/General/PokemonSwSh_TradeBot.cpp
deleted file mode 100644
index 800d49333f..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/General/PokemonSwSh_TradeBot.cpp
+++ /dev/null
@@ -1,219 +0,0 @@
-/*  TradeBot
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_DigitEntry.h"
-#include "NintendoSwitch/NintendoSwitch_Settings.h"
-#include "NintendoSwitch/FixedInterval.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonSwSh/PokemonSwSh_Settings.h"
-#include "PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
-#include "PokemonSwSh_TradeBot.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-    using namespace Pokemon;
-
-
-TradeBot_Descriptor::TradeBot_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonSwSh:TradeBot",
-        STRING_POKEMON + " SwSh", "Trade Bot",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonSwSh/TradeBot.md",
-        "Surprise trade with a code for hosting giveaways.",
-        FeedbackType::NONE,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-
-
-
-TradeBot::TradeBot()
-    : TRADE_CODE(
-        "<b>Trade Code:</b>",
-        8,
-        "1280 0000"
-    )
-    , BOXES_TO_TRADE(
-        "<b>Number of Boxes to Trade:</b>",
-        LockWhileRunning::LOCKED,
-        2
-    )
-    , LINK_TRADE_EXTRA_LINE(
-        "<b>Link Trade Extra Line:</b><br>Set this if you are playing in German.",
-        LockWhileRunning::LOCKED,
-        false
-    )
-    , SEARCH_DELAY(
-        "<b>Time to wait for a Trade Partner:</b>",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "20 * TICKS_PER_SECOND"
-    )
-    , CONFIRM_DELAY(
-        "<b>Time to wait for Partner to Confirm:</b>",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "10 * TICKS_PER_SECOND"
-    )
-    , TRADE_START(
-        "<b>Time for Trade to Start:</b>",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "10 * TICKS_PER_SECOND"
-    )
-    , TRADE_COMMUNICATION(
-        "<b>Communication Window:</b>",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "20 * TICKS_PER_SECOND"
-    )
-    , m_advanced_options(
-        "<font size=4><b>Advanced Options:</b> You should not need to touch anything below here.</font>"
-    )
-    , TRADE_ANIMATION(
-        "<b>Trade Animation Time:</b>",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "23 * TICKS_PER_SECOND"
-    )
-    , EVOLVE_DELAY(
-        "<b>Evolve Delay:</b>",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "30 * TICKS_PER_SECOND"
-    )
-{
-    PA_ADD_OPTION(START_LOCATION);
-
-    PA_ADD_OPTION(TRADE_CODE);
-    PA_ADD_OPTION(BOXES_TO_TRADE);
-    PA_ADD_OPTION(LINK_TRADE_EXTRA_LINE);
-    PA_ADD_OPTION(SEARCH_DELAY);
-    PA_ADD_OPTION(CONFIRM_DELAY);
-    PA_ADD_OPTION(TRADE_START);
-    PA_ADD_OPTION(TRADE_COMMUNICATION);
-    PA_ADD_STATIC(m_advanced_options);
-    PA_ADD_OPTION(TRADE_ANIMATION);
-    PA_ADD_OPTION(EVOLVE_DELAY);
-}
-
-
-void TradeBot::trade_slot(BotBaseContext& context, const uint8_t code[8], uint8_t slot) const{
-    ssf_press_button2(context, BUTTON_Y, GameSettings::instance().OPEN_YCOMM_DELAY, 50);
-    ssf_press_button2(context, BUTTON_A, 150, 20);
-    ssf_press_dpad1(context, DPAD_DOWN, 10);
-    ssf_press_button2(context, BUTTON_A, 200, 20);
-    if (LINK_TRADE_EXTRA_LINE){
-        ssf_press_button2(context, BUTTON_B, 50, 20);
-    }
-    ssf_press_button2(context, BUTTON_B, 200, 20);
-    ssf_press_dpad1(context, DPAD_UP, 10);
-    ssf_press_button1(context, BUTTON_A, 5);
-    ssf_press_button1(context, BUTTON_B, 5);
-
-    enter_digits(context, 8, code);
-    ssf_press_button1(context, BUTTON_PLUS, 200);
-    ssf_press_button2(context, BUTTON_B, 125, 10);
-    ssf_press_button2(context, BUTTON_A, 50, 10);
-    pbf_mash_button(context, BUTTON_B, 400);
-
-    pbf_wait(context, SEARCH_DELAY);
-
-    //  If we're not in a trade, enter Y-COMM to avoid a connection at this point.
-    ssf_press_button2(context, BUTTON_Y, GameSettings::instance().OPEN_YCOMM_DELAY, 50);
-    ssf_press_button2(context, BUTTON_A, 200, 20);
-    ssf_press_button2(context, BUTTON_B, 80, 10);
-
-    //  Move to slot
-    while (slot >= 6){
-        ssf_press_dpad1(context, DPAD_DOWN, GameSettings::instance().BOX_SCROLL_DELAY);
-        slot -= 6;
-    }
-    while (slot > 0){
-        ssf_press_dpad1(context, DPAD_RIGHT, GameSettings::instance().BOX_SCROLL_DELAY);
-        slot--;
-    }
-
-    //  Select Pokemon
-    ssf_press_button1(context, BUTTON_A, 100);
-    ssf_press_button1(context, BUTTON_A, CONFIRM_DELAY);
-
-    //  Start Trade
-    ssf_press_button1(context, BUTTON_A, TRADE_START);
-
-    //  Cancel out
-    for (uint16_t c = 0; c < TRADE_COMMUNICATION + TRADE_ANIMATION; c += 300){
-        ssf_press_button1(context, BUTTON_B, 100);
-        ssf_press_button1(context, BUTTON_B, 100);
-        ssf_press_button1(context, BUTTON_A, 100);
-    }
-}
-
-void TradeBot::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    uint8_t code[8];
-    TRADE_CODE.to_str(code);
-
-    if (START_LOCATION.start_in_grip_menu()){
-        grip_menu_connect_go_home(context);
-        resume_game_no_interact(env.console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST);
-    }else{
-        pbf_press_button(context, BUTTON_B, 5, 5);
-    }
-
-    for (uint8_t box = 0; box < BOXES_TO_TRADE; box++){
-        for (uint8_t c = 0; c < 30; c++){
-            trade_slot(context, code, c);
-        }
-
-        //  If the previous trade isn't done, either wait to finish or cancel it.
-        //  Two iterations of this will merge all the following states:
-        //      1.  The last trade finished successfully. Both iterations are no-ops.
-        //      2.  The last trade was slightly too slow. The 1st iteration
-        //          will finish it. The 2nd iteration is a no-op.
-        //      3.  The last trade was very slow. The 1st iteration is suppressed
-        //          because the trade is in progress. The 2nd iteration finishes it.
-        //      4.  No partner was ever found. The 1st iteration will cancel the trade.
-        for (uint8_t c = 0; c < 2; c++){
-            ssf_press_button1(context, BUTTON_Y, 250);
-            ssf_press_button1(context, BUTTON_A, 280);
-            ssf_press_button1(context, BUTTON_B, 280);
-            ssf_press_button1(context, BUTTON_B, 200);
-            ssf_press_button1(context, BUTTON_A, 100);
-            pbf_mash_button(context, BUTTON_B, TRADE_ANIMATION);
-        }
-
-        //  Wait out any new pokedex entries or trade evolutions.
-        pbf_mash_button(context, BUTTON_B, EVOLVE_DELAY);
-
-        //  Change boxes.
-        ssf_press_button2(context, BUTTON_X, GameSettings::instance().OVERWORLD_TO_MENU_DELAY, 20);
-        ssf_press_button2(context, BUTTON_A, GameSettings::instance().MENU_TO_POKEMON_DELAY, 10);
-        ssf_press_button2(context, BUTTON_R, GameSettings::instance().POKEMON_TO_BOX_DELAY, 10);
-        ssf_press_button2(context, BUTTON_R, GameSettings::instance().BOX_CHANGE_DELAY, 10);
-        pbf_mash_button(
-            context, BUTTON_B,
-            GameSettings::instance().BOX_TO_POKEMON_DELAY +
-            GameSettings::instance().POKEMON_TO_MENU_DELAY +
-            GameSettings::instance().OVERWORLD_TO_MENU_DELAY
-        );
-    }
-
-    ssf_press_button2(context, BUTTON_HOME, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE, 10);
-}
-
-
-}
-}
-}
-
-
-
-
-
-
-
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/General/PokemonSwSh_TradeBot.h b/SerialPrograms/Source/PokemonSwSh/Programs/General/PokemonSwSh_TradeBot.h
deleted file mode 100644
index fc5c2c500a..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/General/PokemonSwSh_TradeBot.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*  TradeBot
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_TradeBot_H
-#define PokemonAutomation_PokemonSwSh_TradeBot_H
-
-#include "Common/Cpp/Options/StaticTextOption.h"
-#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
-#include "Common/Cpp/Options/SimpleIntegerOption.h"
-#include "Common/Cpp/Options/TimeExpressionOption.h"
-#include "Common/Cpp/Options/FixedCodeOption.h"
-#include "NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-class TradeBot_Descriptor : public SingleSwitchProgramDescriptor{
-public:
-    TradeBot_Descriptor();
-};
-
-
-
-class TradeBot : public SingleSwitchProgramInstance{
-public:
-    TradeBot();
-
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-    void trade_slot(BotBaseContext& context, const uint8_t code[8], uint8_t slot) const;
-
-private:
-    StartInGripOrGameOption START_LOCATION;
-
-    FixedCodeOption TRADE_CODE;
-    SimpleIntegerOption<uint8_t> BOXES_TO_TRADE;
-    BooleanCheckBoxOption LINK_TRADE_EXTRA_LINE;
-    TimeExpressionOption<uint16_t> SEARCH_DELAY;
-    TimeExpressionOption<uint16_t> CONFIRM_DELAY;
-    TimeExpressionOption<uint16_t> TRADE_START;
-    TimeExpressionOption<uint16_t> TRADE_COMMUNICATION;
-    SectionDividerOption m_advanced_options;
-    TimeExpressionOption<uint16_t> TRADE_ANIMATION;
-    TimeExpressionOption<uint16_t> EVOLVE_DELAY;
-};
-
-
-
-}
-}
-}
-#endif
-
-
-
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHost-MultiGame.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHost-MultiGame.cpp
deleted file mode 100644
index 6730079199..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHost-MultiGame.cpp
+++ /dev/null
@@ -1,249 +0,0 @@
-/*  Multi-Game Auto-Host
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Cpp/PrettyPrint.h"
-#include "Common/Qt/ExpressionEvaluator.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Device.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Routines.h"
-#include "NintendoSwitch/NintendoSwitch_Settings.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonSwSh/Commands/PokemonSwSh_Commands_GameEntry.h"
-#include "PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.h"
-#include "PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
-#include "PokemonSwSh_DenTools.h"
-#include "PokemonSwSh_AutoHostStats.h"
-#include "PokemonSwSh_AutoHost.h"
-#include "PokemonSwSh_AutoHost-MultiGame.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-    using namespace Pokemon;
-
-
-AutoHostMultiGame_Descriptor::AutoHostMultiGame_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonSwSh:AutoHostMultiGame",
-        STRING_POKEMON + " SwSh", "Auto-Host Multi-Game",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonSwSh/AutoHost-MultiGame.md",
-        "Run AutoHost-Rolling across multiple game saves. (Up to 16 dens!)",
-        FeedbackType::OPTIONAL_,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-std::unique_ptr<StatsTracker> AutoHostMultiGame_Descriptor::make_stats() const{
-    return std::unique_ptr<StatsTracker>(new AutoHostStats());
-}
-
-
-
-AutoHostMultiGame::AutoHostMultiGame()
-    : SingleSwitchProgramInstance({"Notifs", "LiveHost"})
-    , RAID_CODE(8)
-    , HOST_ONLINE("<b>Host Online:</b>", LockWhileRunning::LOCKED, true)
-    , LOBBY_WAIT_DELAY(
-        "<b>Lobby Wait Delay:</b><br>Wait this long before starting raid. Start time is 3 minutes minus this number.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "60 * TICKS_PER_SECOND"
-    )
-    , GAME_LIST(true)
-    , FR_FORWARD_ACCEPT(
-        "<b>Forward Friend Accept:</b><br>Accept FRs this many raids in the future.",
-        LockWhileRunning::LOCKED,
-        1
-    )
-    , HOSTING_NOTIFICATIONS("Live-Hosting Announcements", false)
-    , NOTIFICATIONS({
-        &HOSTING_NOTIFICATIONS.NOTIFICATION,
-        &NOTIFICATION_ERROR_FATAL,
-    })
-    , m_internet_settings(
-        "<font size=4><b>Internet Settings:</b> Increase these if your internet is slow.</font>"
-    )
-    , CONNECT_TO_INTERNET_DELAY(
-        "<b>Connect to Internet Delay:</b><br>Time from \"Connect to Internet\" to when you're ready to enter den.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "20 * TICKS_PER_SECOND"
-    )
-    , ENTER_ONLINE_DEN_DELAY(
-        "<b>Enter Online Den Delay:</b><br>\"Communicating\" when entering den while online.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "8 * TICKS_PER_SECOND"
-    )
-    , OPEN_ONLINE_DEN_LOBBY_DELAY(
-        "<b>Open Online Den Delay:</b><br>Delay from \"Invite Others\" to when the clock starts ticking.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "8 * TICKS_PER_SECOND"
-    )
-    , RAID_START_TO_EXIT_DELAY(
-        "<b>Raid Start to Exit Delay:</b><br>Time from start raid to reset. (when not selecting move)",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "15 * TICKS_PER_SECOND"
-    )
-    , DELAY_TO_SELECT_MOVE(
-        "<b>Delay to Select Move:</b><br>This + above = time from start raid to select move.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "32 * TICKS_PER_SECOND"
-    )
-{
-    PA_ADD_OPTION(START_LOCATION);
-    PA_ADD_OPTION(TOUCH_DATE_INTERVAL);
-
-    PA_ADD_OPTION(RAID_CODE);
-    PA_ADD_OPTION(HOST_ONLINE);
-    PA_ADD_OPTION(LOBBY_WAIT_DELAY);
-    PA_ADD_OPTION(GAME_LIST);
-    PA_ADD_OPTION(FR_FORWARD_ACCEPT);
-    PA_ADD_OPTION(HOSTING_NOTIFICATIONS);
-    PA_ADD_OPTION(NOTIFICATIONS);
-
-    PA_ADD_OPTION(m_internet_settings);
-    PA_ADD_OPTION(CONNECT_TO_INTERNET_DELAY);
-    PA_ADD_OPTION(ENTER_ONLINE_DEN_DELAY);
-    PA_ADD_OPTION(OPEN_ONLINE_DEN_LOBBY_DELAY);
-    PA_ADD_OPTION(RAID_START_TO_EXIT_DELAY);
-    PA_ADD_OPTION(DELAY_TO_SELECT_MOVE);
-}
-
-
-
-
-void AutoHostMultiGame::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    uint16_t start_raid_delay = HOST_ONLINE
-        ? OPEN_ONLINE_DEN_LOBBY_DELAY
-        : GameSettings::instance().OPEN_LOCAL_DEN_LOBBY_DELAY;
-    const uint16_t lobby_wait_delay = LOBBY_WAIT_DELAY < start_raid_delay
-        ? 0
-        : LOBBY_WAIT_DELAY - start_raid_delay;
-
-    std::vector<std::unique_ptr<MultiHostSlot>> list = GAME_LIST.copy_snapshot();
-
-    //  Scan den list for any rolling dens.
-    bool enable_touch = true;
-    for (uint8_t index = 0; index < list.size(); index++){
-        const MultiHostSlot& game = *list[index];
-//        if (game.user_slot == 0){
-//            break;
-//        }
-        if (game.skips > 0){
-            enable_touch = false;
-            break;
-        }
-    }
-
-    if (START_LOCATION.start_in_grip_menu()){
-        grip_menu_connect_go_home(context);
-    }else{
-        pbf_press_button(context, BUTTON_B, 5, 5);
-        pbf_press_button(context, BUTTON_HOME, 10, GameSettings::instance().GAME_TO_HOME_DELAY_FAST);
-    }
-
-    if (enable_touch){
-        TOUCH_DATE_INTERVAL.touch_now_from_home_if_needed(context);
-    }
-
-    uint32_t raids = 0;
-    bool game_slot_flipped = false;
-    while (true){
-        env.log("Beginning from start of game list.");
-        for (uint8_t index = 0; index < list.size(); index++){
-            env.update_stats();
-
-            const MultiHostSlot& game = *list[index];
-//            if (game.user_slot == 0){
-//                break;
-//            }
-
-            env.log("Raids Attempted: " + tostr_u_commas(raids++));
-
-            //  Start game.
-            rollback_date_from_home(context, game.skips);
-
-            //  Sanitize game slot.
-            uint8_t game_slot = (uint8_t)game.game_slot.current_value();
-            if (game_slot > 2){
-                game_slot = 0;
-            }
-
-            //  Calculate current game slot.
-            switch (game_slot){
-            case 0:
-                break;
-            case 1:
-                game_slot = game_slot_flipped ? 2 : 0;
-                break;
-            case 2:
-                game_slot = game_slot_flipped ? 0 : 2;
-                break;
-            }
-            start_game_from_home_with_inference(
-                env.console, context,
-                ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_SLOW,
-                game_slot,
-                (uint8_t)game.user_slot.current_value(),
-                game.backup_save
-            );
-            if (game_slot == 2){
-                game_slot_flipped = !game_slot_flipped;
-            }
-
-            //  Calculate accept_FR_slot.
-            size_t FR_index = index;
-            for (uint8_t c = 0; c < FR_FORWARD_ACCEPT; c++){
-                FR_index++;
-                if (FR_index >= list.size()){
-                    FR_index = 0;
-                }
-            }
-
-            //  Run auto-host.
-            const MultiHostSlot& fr_game = *list[FR_index];
-            run_autohost(
-                env, env.console, context,
-                game.always_catchable
-                    ? Catchability::ALWAYS_CATCHABLE
-                    : Catchability::MAYBE_UNCATCHABLE,
-                (uint8_t)game.skips,
-                game.use_raid_code ? &RAID_CODE : nullptr, lobby_wait_delay,
-                HOST_ONLINE, fr_game.accept_FRs ? (uint8_t)fr_game.user_slot.current_value() : 0,
-                game.move_slot, game.dynamax, 0,
-                HOSTING_NOTIFICATIONS,
-                CONNECT_TO_INTERNET_DELAY,
-                ENTER_ONLINE_DEN_DELAY,
-                OPEN_ONLINE_DEN_LOBBY_DELAY,
-                RAID_START_TO_EXIT_DELAY,
-                DELAY_TO_SELECT_MOVE
-            );
-
-            //  Exit game.
-            pbf_press_button(context, BUTTON_HOME, 10, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE);
-            close_game(context);
-
-            //  Post-raid delay.
-            pbf_wait(context, game.post_raid_delay);
-
-            //  Touch the date.
-            if (enable_touch){
-                TOUCH_DATE_INTERVAL.touch_now_from_home_if_needed(context);
-            }
-        }
-    }
-}
-
-
-
-}
-}
-}
-
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHost-MultiGame.h b/SerialPrograms/Source/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHost-MultiGame.h
deleted file mode 100644
index ef54ed1c83..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHost-MultiGame.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*  Multi-Game Auto-Host
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_AutoHostMultiGame_H
-#define PokemonAutomation_PokemonSwSh_AutoHostMultiGame_H
-
-#include "Common/Cpp/Options/StaticTextOption.h"
-#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
-#include "Common/Cpp/Options/SimpleIntegerOption.h"
-#include "Common/Cpp/Options/RandomCodeOption.h"
-#include "Common/Cpp/Options/TimeExpressionOption.h"
-#include "Common/PokemonSwSh/PokemonSwSh_MultiHostTable.h"
-#include "CommonFramework/Options/ScreenshotFormatOption.h"
-#include "CommonFramework/Notifications/EventNotificationsTable.h"
-#include "NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h"
-#include "NintendoSwitch/Options/NintendoSwitch_FriendCodeListOption.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-#include "PokemonSwSh/Options/PokemonSwSh_DateToucher.h"
-#include "PokemonSwSh/Options/PokemonSwSh_AutoHostNotification.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-class AutoHostMultiGame_Descriptor : public SingleSwitchProgramDescriptor{
-public:
-    AutoHostMultiGame_Descriptor();
-
-    virtual std::unique_ptr<StatsTracker> make_stats() const override;
-};
-
-
-
-class AutoHostMultiGame : public SingleSwitchProgramInstance{
-public:
-    AutoHostMultiGame();
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-    StartInGripOrClosedOption START_LOCATION;
-    TouchDateIntervalOption TOUCH_DATE_INTERVAL;
-
-    RandomCodeOption RAID_CODE;
-    BooleanCheckBoxOption HOST_ONLINE;
-    TimeExpressionOption<uint16_t> LOBBY_WAIT_DELAY;
-    MultiHostTable GAME_LIST;
-    SimpleIntegerOption<uint8_t> FR_FORWARD_ACCEPT;
-
-    AutoHostNotificationOption HOSTING_NOTIFICATIONS;
-    EventNotificationsOption NOTIFICATIONS;
-
-    SectionDividerOption m_internet_settings;
-    TimeExpressionOption<uint16_t> CONNECT_TO_INTERNET_DELAY;
-    TimeExpressionOption<uint16_t> ENTER_ONLINE_DEN_DELAY;
-    TimeExpressionOption<uint16_t> OPEN_ONLINE_DEN_LOBBY_DELAY;
-    TimeExpressionOption<uint16_t> RAID_START_TO_EXIT_DELAY;
-    TimeExpressionOption<uint16_t> DELAY_TO_SELECT_MOVE;
-};
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHost-Rolling.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHost-Rolling.cpp
deleted file mode 100644
index 897c6648e4..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHost-Rolling.cpp
+++ /dev/null
@@ -1,238 +0,0 @@
-/*  Rolling Auto-Host
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Cpp/PrettyPrint.h"
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Device.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Routines.h"
-#include "NintendoSwitch/NintendoSwitch_Settings.h"
-#include "NintendoSwitch/FixedInterval.h"
-#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonSwSh/PokemonSwSh_Settings.h"
-#include "PokemonSwSh/Commands/PokemonSwSh_Commands_GameEntry.h"
-#include "PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.h"
-#include "PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
-#include "PokemonSwSh_DenTools.h"
-#include "PokemonSwSh_AutoHostStats.h"
-#include "PokemonSwSh_AutoHost.h"
-#include "PokemonSwSh_AutoHost-Rolling.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-    using namespace Pokemon;
-
-
-AutoHostRolling_Descriptor::AutoHostRolling_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonSwSh:AutoHostRolling",
-        STRING_POKEMON + " SwSh", "Auto-Host Rolling",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonSwSh/AutoHost-Rolling.md",
-        "Roll N days, host, SR and repeat. Also supports hard-locks and soft-locks.",
-        FeedbackType::OPTIONAL_,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-std::unique_ptr<StatsTracker> AutoHostRolling_Descriptor::make_stats() const{
-    return std::unique_ptr<StatsTracker>(new AutoHostStats());
-}
-
-
-
-AutoHostRolling::AutoHostRolling()
-    : SingleSwitchProgramInstance({"Notifs", "LiveHost"})
-    , RAID_CODE(8)
-    , SKIPS("<b>Day Skips:</b>", LockWhileRunning::LOCKED, 3)
-    , BACKUP_SAVE(
-        "<b>Load Backup Save:</b><br>For backup save soft-locking method.",
-        LockWhileRunning::LOCKED,
-        false
-    )
-    , HOST_ONLINE("<b>Host Online:</b>", LockWhileRunning::LOCKED, true)
-    , LOBBY_WAIT_DELAY(
-        "<b>Lobby Wait Delay:</b><br>Wait this long before starting raid. Start time is 3 minutes minus this number.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "60 * TICKS_PER_SECOND"
-    )
-    , FRIEND_ACCEPT_USER_SLOT(
-        "<b>Friend Request Accept Slot:</b><br>Zero disables friend accepts.",
-        LockWhileRunning::LOCKED,
-        0, 0, 8
-    )
-    , EXTRA_DELAY_BETWEEN_RAIDS(
-        "<b>Extra Delay Between Raids:</b><br>May aid in farming.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "0 * TICKS_PER_SECOND"
-    )
-    , MOVE_SLOT(
-        "<b>1st Move Select Slot:</b><br>Zero disables 1st move select.",
-        LockWhileRunning::LOCKED,
-        0, 0, 4
-    )
-    , DYNAMAX(
-        "<b>1st Move Dynamax:</b><br>Dynamax on first move. (only applies if above option is non-zero)",
-        LockWhileRunning::LOCKED,
-        true
-    )
-    , TROLL_HOSTING(
-        "<b>Troll Hosting:</b> (requires 1st move select)<br>0 disables the troll hosting option, 1 attacks the first ally, 2 attacks the second one, 3 attacks the third one. Dynamaxing will disable this option.",
-        LockWhileRunning::LOCKED,
-        0, 0, 3
-    )
-    , ALTERNATE_GAMES(
-        "<b>Alternate Games:</b><br>Alternate hosting between 1st and 2nd games. Host from both Sword and Shield.",
-        LockWhileRunning::LOCKED,
-        false
-    )
-    , HOSTING_NOTIFICATIONS("Live-Hosting Announcements", false)
-    , NOTIFICATIONS({
-        &HOSTING_NOTIFICATIONS.NOTIFICATION,
-        &NOTIFICATION_ERROR_FATAL,
-    })
-    , m_internet_settings(
-        "<font size=4><b>Internet Settings:</b> Increase these if your internet is slow.</font>"
-    )
-    , CONNECT_TO_INTERNET_DELAY(
-        "<b>Connect to Internet Delay:</b><br>Time from \"Connect to Internet\" to when you're ready to enter den.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "20 * TICKS_PER_SECOND"
-    )
-    , ENTER_ONLINE_DEN_DELAY(
-        "<b>Enter Online Den Delay:</b><br>\"Communicating\" when entering den while online.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "8 * TICKS_PER_SECOND"
-    )
-    , OPEN_ONLINE_DEN_LOBBY_DELAY(
-        "<b>Open Online Den Delay:</b><br>Delay from \"Invite Others\" to when the clock starts ticking.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "8 * TICKS_PER_SECOND"
-    )
-    , RAID_START_TO_EXIT_DELAY(
-        "<b>Raid Start to Exit Delay:</b><br>Time from start raid to reset. (when not selecting move)",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "15 * TICKS_PER_SECOND"
-    )
-    , DELAY_TO_SELECT_MOVE(
-        "<b>Delay to Select Move:</b><br>This + above = time from start raid to select move.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "32 * TICKS_PER_SECOND"
-    )
-{
-    PA_ADD_OPTION(START_LOCATION);
-    PA_ADD_OPTION(TOUCH_DATE_INTERVAL);
-
-    PA_ADD_OPTION(RAID_CODE);
-    PA_ADD_OPTION(SKIPS);
-    PA_ADD_OPTION(BACKUP_SAVE);
-    PA_ADD_OPTION(HOST_ONLINE);
-    PA_ADD_OPTION(LOBBY_WAIT_DELAY);
-    PA_ADD_OPTION(CATCHABILITY);
-    PA_ADD_OPTION(FRIEND_ACCEPT_USER_SLOT);
-    PA_ADD_OPTION(EXTRA_DELAY_BETWEEN_RAIDS);
-    PA_ADD_OPTION(MOVE_SLOT);
-    PA_ADD_OPTION(DYNAMAX);
-    PA_ADD_OPTION(TROLL_HOSTING);
-    PA_ADD_OPTION(ALTERNATE_GAMES);
-    PA_ADD_OPTION(HOSTING_NOTIFICATIONS);
-    PA_ADD_OPTION(NOTIFICATIONS);
-
-    PA_ADD_OPTION(m_internet_settings);
-    PA_ADD_OPTION(CONNECT_TO_INTERNET_DELAY);
-    PA_ADD_OPTION(ENTER_ONLINE_DEN_DELAY);
-    PA_ADD_OPTION(OPEN_ONLINE_DEN_LOBBY_DELAY);
-    PA_ADD_OPTION(RAID_START_TO_EXIT_DELAY);
-    PA_ADD_OPTION(DELAY_TO_SELECT_MOVE);
-}
-
-
-
-void AutoHostRolling::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    uint16_t start_raid_delay = HOST_ONLINE
-        ? OPEN_ONLINE_DEN_LOBBY_DELAY
-        : GameSettings::instance().OPEN_LOCAL_DEN_LOBBY_DELAY;
-    const uint16_t lobby_wait_delay = LOBBY_WAIT_DELAY < start_raid_delay
-        ? 0
-        : LOBBY_WAIT_DELAY - start_raid_delay;
-
-    if (START_LOCATION.start_in_grip_menu()){
-        grip_menu_connect_go_home(context);
-    }else{
-        pbf_press_button(context, BUTTON_B, 5, 5);
-        pbf_press_button(context, BUTTON_HOME, 10, GameSettings::instance().GAME_TO_HOME_DELAY_FAST);
-    }
-
-    if (SKIPS == 0){
-        TOUCH_DATE_INTERVAL.touch_now_from_home_if_needed(context);
-    }
-    rollback_date_from_home(context, SKIPS);
-    if (env.console.video().snapshot()){
-        NintendoSwitch::resume_game_from_home(env.console, context);
-    }else{
-        resume_game_front_of_den_nowatts(context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_SLOW);
-    }
-
-    for (uint32_t raids = 0;; raids++){
-        env.log("Raids Attempted: " + tostr_u_commas(raids));
-        env.update_stats();
-
-        run_autohost(
-            env, env.console, context,
-            CATCHABILITY, SKIPS,
-            &RAID_CODE, lobby_wait_delay,
-            HOST_ONLINE, FRIEND_ACCEPT_USER_SLOT,
-            MOVE_SLOT, DYNAMAX, TROLL_HOSTING,
-            HOSTING_NOTIFICATIONS,
-            CONNECT_TO_INTERNET_DELAY,
-            ENTER_ONLINE_DEN_DELAY,
-            OPEN_ONLINE_DEN_LOBBY_DELAY,
-            RAID_START_TO_EXIT_DELAY,
-            DELAY_TO_SELECT_MOVE
-        );
-
-        //  Exit game.
-        ssf_press_button2(context, BUTTON_HOME, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE, 10);
-        close_game(context);
-
-        //  Post-raid delay.
-        pbf_wait(context, EXTRA_DELAY_BETWEEN_RAIDS);
-
-        //  Touch the date.
-        if (SKIPS == 0){
-            TOUCH_DATE_INTERVAL.touch_now_from_home_if_needed(context);
-        }else{
-            rollback_date_from_home(context, SKIPS);
-        }
-
-        start_game_from_home_with_inference(
-            env.console, context,
-            ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_SLOW,
-            ALTERNATE_GAMES ? 2 : 0, 0,
-            BACKUP_SAVE
-        );
-    }
-}
-
-
-
-}
-}
-}
-
-
-
-
-
-
-
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHost-Rolling.h b/SerialPrograms/Source/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHost-Rolling.h
deleted file mode 100644
index 33c5f79530..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHost-Rolling.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*  Rolling Auto-Host
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_AutoHostRolling_H
-#define PokemonAutomation_PokemonSwSh_AutoHostRolling_H
-
-#include "Common/Cpp/Options/StaticTextOption.h"
-#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
-#include "Common/Cpp/Options/SimpleIntegerOption.h"
-#include "Common/Cpp/Options/RandomCodeOption.h"
-#include "Common/Cpp/Options/TimeExpressionOption.h"
-#include "CommonFramework/Options/ScreenshotFormatOption.h"
-#include "CommonFramework/Notifications/EventNotificationsTable.h"
-#include "NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h"
-#include "NintendoSwitch/Options/NintendoSwitch_FriendCodeListOption.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-#include "PokemonSwSh/Options/PokemonSwSh_DateToucher.h"
-#include "PokemonSwSh/Options/PokemonSwSh_Catchability.h"
-#include "PokemonSwSh/Options/PokemonSwSh_AutoHostNotification.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-class AutoHostRolling_Descriptor : public SingleSwitchProgramDescriptor{
-public:
-    AutoHostRolling_Descriptor();
-
-    virtual std::unique_ptr<StatsTracker> make_stats() const override;
-};
-
-
-
-class AutoHostRolling : public SingleSwitchProgramInstance{
-public:
-    AutoHostRolling();
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-    StartInGripOrGameOption START_LOCATION;
-    TouchDateIntervalOption TOUCH_DATE_INTERVAL;
-
-    RandomCodeOption RAID_CODE;
-    SimpleIntegerOption<uint8_t> SKIPS;
-    BooleanCheckBoxOption BACKUP_SAVE;
-    BooleanCheckBoxOption HOST_ONLINE;
-    TimeExpressionOption<uint16_t> LOBBY_WAIT_DELAY;
-    CatchabilitySelectorOption CATCHABILITY;
-    SimpleIntegerOption<uint8_t> FRIEND_ACCEPT_USER_SLOT;
-    TimeExpressionOption<uint16_t> EXTRA_DELAY_BETWEEN_RAIDS;
-
-    SimpleIntegerOption<uint8_t> MOVE_SLOT;
-    BooleanCheckBoxOption DYNAMAX;
-    SimpleIntegerOption<uint8_t> TROLL_HOSTING;
-
-    BooleanCheckBoxOption ALTERNATE_GAMES;
-
-    AutoHostNotificationOption HOSTING_NOTIFICATIONS;
-    EventNotificationsOption NOTIFICATIONS;
-
-    SectionDividerOption m_internet_settings;
-    TimeExpressionOption<uint16_t> CONNECT_TO_INTERNET_DELAY;
-    TimeExpressionOption<uint16_t> ENTER_ONLINE_DEN_DELAY;
-    TimeExpressionOption<uint16_t> OPEN_ONLINE_DEN_LOBBY_DELAY;
-    TimeExpressionOption<uint16_t> RAID_START_TO_EXIT_DELAY;
-    TimeExpressionOption<uint16_t> DELAY_TO_SELECT_MOVE;
-};
-
-
-
-}
-}
-}
-#endif
-
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHost.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHost.cpp
deleted file mode 100644
index 34d52a1045..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHost.cpp
+++ /dev/null
@@ -1,276 +0,0 @@
-/*  Auto-Hosting
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/Globals.h"
-#include "CommonFramework/GlobalSettingsPanel.h"
-#include "CommonFramework/Notifications/ProgramNotifications.h"
-#include "CommonFramework/Tools/ProgramEnvironment.h"
-#include "CommonFramework/Inference/BlackScreenDetector.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Device.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_DigitEntry.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonSwSh/PokemonSwSh_Settings.h"
-#include "PokemonSwSh/Commands/PokemonSwSh_Commands_AutoHosts.h"
-#include "PokemonSwSh/Inference/Dens/PokemonSwSh_RaidLobbyReader.h"
-#include "PokemonSwSh/Programs/PokemonSwSh_Internet.h"
-#include "PokemonSwSh_DenTools.h"
-#include "PokemonSwSh_AutoHostStats.h"
-#include "PokemonSwSh_LobbyWait.h"
-#include "PokemonSwSh_AutoHost.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-    using namespace Pokemon;
-
-
-bool connect_to_internet(
-    ConsoleHandle& console, BotBaseContext& context,
-    bool host_online,
-    uint16_t connect_to_internet_delay
-){
-    if (!host_online){
-        return true;
-    }
-    if (!console.video().snapshot()){
-        connect_to_internet(context, GameSettings::instance().OPEN_YCOMM_DELAY, connect_to_internet_delay);
-        return true;
-    }
-    if (connect_to_internet_with_inference(
-        console, context,
-        std::chrono::seconds(5), connect_to_internet_delay
-    )){
-        return true;
-    }
-    return false;
-}
-
-void send_raid_notification(
-    ProgramEnvironment& env,
-    ConsoleHandle& console,
-    AutoHostNotificationOption& settings,
-    bool has_code, uint8_t code[8],
-    const ImageViewRGB32& screenshot,
-    const DenMonReadResults& results,
-    const StatsTracker& stats_tracker
-){
-    if (!settings.enabled()){
-        return;
-    }
-
-    std::vector<std::pair<std::string, std::string>> embeds;
-
-    std::string description = settings.DESCRIPTION;
-    if (!description.empty()){
-        embeds.emplace_back("Description:", description);
-    }
-
-    std::string slugs;
-
-    if (results.type == DenMonReadResults::NOT_DETECTED){
-        slugs += "Unable to detect - Not in den lobby.";
-    }else if (results.slugs.results.empty()){
-        slugs += "Unable to detect.";
-    }else if (results.slugs.results.size() == 1){
-        slugs += results.slugs.results.begin()->second;
-    }else{
-        slugs += "Ambiguous: ";
-        size_t c = 0;
-        for (const auto& item : results.slugs.results){
-            if (c > 0){
-                slugs += ", ";
-            }
-            slugs += item.second;
-            c++;
-            if (c >= 5){
-                break;
-            }
-        }
-        if (c < results.slugs.results.size()){
-            slugs += ", (";
-            slugs += std::to_string(results.slugs.results.size() - c);
-            slugs += " more...)";
-        }
-    }
-    embeds.emplace_back("Current " + STRING_POKEMON + ":", slugs);
-
-    {
-        std::string code_str;
-        if (has_code){
-            size_t c = 0;
-            for (; c < 4; c++){
-                code_str += code[c] + '0';
-            }
-            code_str += " ";
-            for (; c < 8; c++){
-                code_str += code[c] + '0';
-            }
-        }else{
-            code_str += "None";
-        }
-        embeds.emplace_back("Raid Code:", code_str);
-    }
-
-    send_program_notification(
-        env, settings.NOTIFICATION,
-        Color(),
-        "Max Raid Notification",
-        embeds, "",
-        screenshot, false
-    );
-
-}
-
-
-void run_autohost(
-    ProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context,
-    Catchability catchability, uint8_t skips,
-    const RandomCodeOption* raid_code, uint16_t lobby_wait_delay,
-    bool host_online, uint8_t accept_FR_slot,
-    uint8_t move_slot, bool dynamax, uint8_t troll_hosting,
-    AutoHostNotificationOption& notifications,
-    uint16_t connect_to_internet_delay,
-    uint16_t enter_online_den_delay,
-    uint16_t open_online_den_lobby_delay,
-    uint16_t raid_start_to_exit_delay,
-    uint16_t delay_to_select_move
-){
-    AutoHostStats& stats = env.current_stats<AutoHostStats>();
-
-    roll_den(
-        console, context,
-        enter_online_den_delay,
-        open_online_den_lobby_delay,
-        skips,
-        catchability
-    );
-    context.wait_for_all_requests();
-
-    if (!connect_to_internet(
-        console, context,
-        host_online,
-        connect_to_internet_delay
-    )){
-        stats.add_timeout();
-        env.log("Timed out waiting for internet connection. Skipping raid.", COLOR_RED);
-        return;
-    }
-
-    {
-        DenMonReader reader(console, console);
-        enter_den(context, enter_online_den_delay, skips != 0, host_online);
-        context.wait_for_all_requests();
-
-        //  Make sure we're actually in a den.
-        VideoSnapshot screen = console.video().snapshot();
-        DenMonReadResults results;
-        if (screen){
-            results = reader.read(screen);
-            switch (results.type){
-            case DenMonReadResults::RED_BEAM:
-            case DenMonReadResults::PURPLE_BEAM:
-                break;
-            default:
-                console.log("Failed to detect den lobby. Skipping raid.", COLOR_RED);
-                return;
-            }
-        }
-
-        uint8_t code[8];
-        bool has_code = raid_code && raid_code->get_code(code);
-        if (has_code){
-            char str[8];
-            for (size_t c = 0; c < 8; c++){
-                str[c] = code[c] + '0';
-            }
-            env.log("Next Raid Code: " + std::string(str, sizeof(str)));
-            pbf_press_button(context, BUTTON_PLUS, 5, 145);
-            enter_digits(context, 8, code);
-            pbf_wait(context, 180);
-            pbf_press_button(context, BUTTON_A, 5, 95);
-        }
-        context.wait_for_all_requests();
-
-        screen = console.video().snapshot();
-        send_raid_notification(
-            env,
-            console,
-            notifications,
-            has_code, code,
-            screen, results, stats
-        );
-    }
-
-    enter_lobby(context, open_online_den_lobby_delay, host_online, catchability);
-
-    //  Accept friend requests while we wait.
-    RaidLobbyState raid_state = raid_lobby_wait(
-        console, context,
-        host_online,
-        accept_FR_slot,
-        lobby_wait_delay
-    );
-
-    //  Start Raid
-    pbf_press_dpad(context, DPAD_UP, 5, 45);
-
-    //  Mash A until it's time to close the game.
-    {
-        context.wait_for_all_requests();
-        uint32_t start = system_clock(context);
-        pbf_mash_button(context, BUTTON_A, 3 * TICKS_PER_SECOND);
-        context.wait_for_all_requests();
-
-        BlackScreenOverWatcher black_screen;
-        uint32_t now = start;
-        while (true){
-            if (black_screen.black_is_over(console.video().snapshot())){
-                env.log("Raid has Started!", COLOR_BLUE);
-                stats.add_raid(raid_state.raiders());
-                break;
-            }
-            if (now - start >= raid_start_to_exit_delay){
-                stats.add_timeout();
-                break;
-            }
-            pbf_mash_button(context, BUTTON_A, TICKS_PER_SECOND);
-            context.wait_for_all_requests();
-            now = system_clock(context);
-        }
-    }
-
-    //  Select a move.
-    if (move_slot > 0){
-        pbf_wait(context, delay_to_select_move);
-        pbf_press_button(context, BUTTON_A, 20, 80);
-        if (dynamax){
-            pbf_press_dpad(context, DPAD_LEFT, 20, 30);
-            pbf_press_button(context, BUTTON_A, 20, 60);
-        }
-        for (uint8_t c = 1; c < move_slot; c++){
-            pbf_press_dpad(context, DPAD_DOWN, 20, 30);
-        }
-        pbf_press_button(context, BUTTON_A, 20, 80);
-
-        // Disable the troll hosting option if the dynamax is set to TRUE.
-        if (!dynamax && troll_hosting > 0){
-            pbf_press_dpad(context, DPAD_DOWN, 20, 80);
-            for (uint8_t c = 0; c < troll_hosting; c++){
-                pbf_press_dpad(context, DPAD_RIGHT, 20, 80);
-            }
-        }
-
-        pbf_press_button(context, BUTTON_A, 20, 980);
-    }
-}
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHost.h b/SerialPrograms/Source/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHost.h
deleted file mode 100644
index f8bcea5b3a..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHost.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*  Auto-Hosting
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_AutoHost_H
-#define PokemonAutomation_PokemonSwSh_AutoHost_H
-
-#include "Common/Cpp/Options/RandomCodeOption.h"
-#include "CommonFramework/Tools/ConsoleHandle.h"
-#include "PokemonSwSh/Options/PokemonSwSh_Catchability.h"
-#include "PokemonSwSh/Options/PokemonSwSh_AutoHostNotification.h"
-#include "PokemonSwSh/Inference/Dens/PokemonSwSh_DenMonReader.h"
-
-namespace PokemonAutomation{
-    class BotBaseContext;
-    struct ProgramInfo;
-    class ProgramEnvironment;
-    class StatsTracker;
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-bool connect_to_internet(
-    ConsoleHandle& console, BotBaseContext& context,
-    bool host_online,
-    uint16_t connect_to_internet_delay
-);
-
-void send_raid_notification(
-    const ProgramEnvironment& env,
-    ConsoleHandle& console,
-    AutoHostNotificationOption& settings,
-    bool has_code, uint8_t code[8],
-    const ImageViewRGB32& screenshot,
-    const DenMonReadResults& results,
-    const StatsTracker& stats_tracker
-);
-
-
-void run_autohost(
-    ProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context,
-    Catchability catchability, uint8_t skips,
-    const RandomCodeOption* raid_code, uint16_t lobby_wait_delay,
-    bool host_online, uint8_t accept_FR_slot,
-    uint8_t move_slot, bool dynamax, uint8_t troll_hosting,
-    AutoHostNotificationOption& notifications,
-    uint16_t connect_to_internet_delay,
-    uint16_t enter_online_den_delay,
-    uint16_t open_online_den_lobby_delay,
-    uint16_t raid_start_to_exit_delay,
-    uint16_t delay_to_select_move
-);
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/Hosting/PokemonSwSh_DenRoller.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/Hosting/PokemonSwSh_DenRoller.cpp
deleted file mode 100644
index 5f3860049b..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/Hosting/PokemonSwSh_DenRoller.cpp
+++ /dev/null
@@ -1,208 +0,0 @@
-/*  Den Roller
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "CommonFramework/Notifications/ProgramNotifications.h"
-#include "CommonFramework/Tools/ErrorDumper.h"
-#include "CommonFramework/Tools/StatsTracking.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Device.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "NintendoSwitch/NintendoSwitch_Settings.h"
-#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonSwSh/Commands/PokemonSwSh_Commands_GameEntry.h"
-#include "PokemonSwSh/Inference/Dens/PokemonSwSh_DenMonReader.h"
-#include "PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
-#include "PokemonSwSh_DenTools.h"
-#include "PokemonSwSh_DenRoller.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-    using namespace Pokemon;
-
-
-DenRoller_Descriptor::DenRoller_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonSwSh:DenRoller",
-        STRING_POKEMON + " SwSh", "Den Roller",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonSwSh/DenRoller.md",
-        "Roll den to the N'th day, SR and repeat.",
-        FeedbackType::OPTIONAL_,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-struct DenRoller_Descriptor::Stats : public StatsTracker{
-    Stats()
-        : rolls(m_stats["Rolls"])
-        , skips(m_stats["Day Skips"])
-        , errors(m_stats["Errors"])
-        , matches(m_stats["Matches"])
-    {
-        m_display_order.emplace_back(Stat("Rolls"));
-        m_display_order.emplace_back(Stat("Day Skips"));
-        m_display_order.emplace_back(Stat("Errors"));
-        m_display_order.emplace_back(Stat("Matches"));
-    }
-    std::atomic<uint64_t>& rolls;
-    std::atomic<uint64_t>& skips;
-    std::atomic<uint64_t>& errors;
-    std::atomic<uint64_t>& matches;
-};
-std::unique_ptr<StatsTracker> DenRoller_Descriptor::make_stats() const{
-    return std::unique_ptr<StatsTracker>(new Stats());
-}
-
-
-
-DenRoller::DenRoller()
-    : SKIPS(
-        "<b>Number of Skips:</b>",
-        LockWhileRunning::LOCKED,
-        3, 0, 60
-    )
-    , FILTER(
-        "<b>Desired " + STRING_POKEMON + ":</b><br>"
-        "Automatically stop when this " + STRING_POKEMON + " is rolled. Video output is required."
-    )
-    , VIEW_TIME(
-        "<b>View Time:</b><br>Wait this long before restting. This wait is skipped if the desired " +
-        STRING_POKEMON + " is set since the program will be watching it for you.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "5 * TICKS_PER_SECOND"
-    )
-    , NOTIFICATION_PROGRAM_FINISH("Program Finished", true, true, ImageAttachmentMode::JPG)
-    , NOTIFICATIONS({
-        &NOTIFICATION_PROGRAM_FINISH,
-        &NOTIFICATION_ERROR_FATAL,
-    })
-    , m_advanced_options(
-        "<font size=4><b>Advanced Options:</b> You should not need to touch anything below here.</font>"
-    )
-    , READ_DELAY(
-        "<b>Read Delay:</b><br>Wait this long before attempting to " +
-        STRING_POKEMON + ". This needs to be long enough for the silhouette to load.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "1 * TICKS_PER_SECOND"
-    )
-{
-    PA_ADD_OPTION(START_LOCATION);
-    PA_ADD_OPTION(SKIPS);
-    PA_ADD_OPTION(FILTER);
-    PA_ADD_OPTION(CATCHABILITY);
-    PA_ADD_OPTION(VIEW_TIME);
-    PA_ADD_OPTION(NOTIFICATIONS);
-
-    PA_ADD_STATIC(m_advanced_options);
-    PA_ADD_OPTION(READ_DELAY);
-}
-
-
-
-
-void DenRoller::ring_bell(BotBaseContext& context, int count) const{
-    for (int c = 0; c < count; c++){
-        pbf_press_button(context, BUTTON_LCLICK, 5, 10);
-    }
-    pbf_wait(context, 200);
-}
-
-void DenRoller::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    DenRoller_Descriptor::Stats& stats = env.current_stats<DenRoller_Descriptor::Stats>();
-
-    if (START_LOCATION.start_in_grip_menu()){
-        grip_menu_connect_go_home(context);
-    }else{
-        pbf_press_button(context, BUTTON_B, 5, 5);
-        pbf_press_button(context, BUTTON_HOME, 10, GameSettings::instance().GAME_TO_HOME_DELAY_FAST);
-    }
-
-    rollback_date_from_home(context, SKIPS);
-    if (env.console.video().snapshot()){
-        NintendoSwitch::resume_game_from_home(env.console, context);
-    }else{
-        resume_game_front_of_den_nowatts(context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_SLOW);
-    }
-
-
-    VideoSnapshot screen;
-    while (true){
-        roll_den(env.console, context, 0, 0, SKIPS, CATCHABILITY);
-
-        size_t desired_index = FILTER.index();
-        std::string desired_slug = FILTER.slug();
-
-        if (desired_index == 0){
-            ring_bell(context, 20);
-        }else{
-            context.wait_for_all_requests();
-        }
-        stats.rolls++;
-        stats.skips += SKIPS;
-
-        {
-            DenMonReader reader(env.console, env.console);
-
-            enter_den(context, 0, SKIPS != 0, false);
-
-            if (desired_index != 0){
-                pbf_wait(context, READ_DELAY);
-            }
-            context.wait_for_all_requests();
-
-            screen = env.console.video().snapshot();
-            DenMonReadResults results = reader.read(screen);
-
-            //  Give user time to look at the mon.
-            if (desired_index == 0){
-                //  No filter enabled. Keep going.
-                pbf_wait(context, VIEW_TIME);
-            }else if (results.slugs.results.empty()){
-                //  No detection. Keep going.
-                stats.errors++;
-                dump_image(env.console, env.program_info(), "ReadDenMon", screen);
-                pbf_wait(context, VIEW_TIME);
-            }else{
-                //  Check if we got what we wanted.
-                for (const auto& item : results.slugs.results){
-                    if (item.second == desired_slug){
-                        stats.matches++;
-                        goto StopProgram;
-                    }
-                }
-            }
-        }
-        env.update_stats();
-
-        //  Add a little extra wait time since correctness matters here.
-        pbf_press_button(context, BUTTON_HOME, 10, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE - 10);
-
-        rollback_date_from_home(context, SKIPS);
-//        reset_game_from_home(TOLERATE_SYSTEM_UPDATE_MENU_SLOW);
-        reset_game_from_home_with_inference(
-            env.console, context,
-            ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST
-        );
-    }
-
-StopProgram:
-    env.update_stats();
-    send_program_finished_notification(
-        env, NOTIFICATION_PROGRAM_FINISH,
-        "Found a match!",
-        screen, false
-    );
-}
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/Hosting/PokemonSwSh_DenRoller.h b/SerialPrograms/Source/PokemonSwSh/Programs/Hosting/PokemonSwSh_DenRoller.h
deleted file mode 100644
index 938d19e1c9..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/Hosting/PokemonSwSh_DenRoller.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*  Den Roller
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_DenRoller_H
-#define PokemonAutomation_PokemonSwSh_DenRoller_H
-
-#include "Common/Cpp/Options/StaticTextOption.h"
-#include "Common/Cpp/Options/SimpleIntegerOption.h"
-#include "Common/Cpp/Options/TimeExpressionOption.h"
-#include "CommonFramework/Notifications/EventNotificationsTable.h"
-#include "NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-#include "PokemonSwSh/Options/PokemonSwSh_Catchability.h"
-#include "PokemonSwSh/Inference/Dens/PokemonSwSh_DenMonReader.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-class DenRoller_Descriptor : public SingleSwitchProgramDescriptor{
-public:
-    DenRoller_Descriptor();
-
-    struct Stats;
-    virtual std::unique_ptr<StatsTracker> make_stats() const override;
-};
-
-
-
-class DenRoller : public SingleSwitchProgramInstance{
-public:
-    DenRoller();
-
-    void ring_bell(BotBaseContext& context, int count) const;
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-    StartInGripOrGameOption START_LOCATION;
-    SimpleIntegerOption<uint8_t> SKIPS;
-    DenMonSelectOption FILTER;
-
-    CatchabilitySelectorOption CATCHABILITY;
-    TimeExpressionOption<uint16_t> VIEW_TIME;
-
-    EventNotificationOption NOTIFICATION_PROGRAM_FINISH;
-    EventNotificationsOption NOTIFICATIONS;
-
-    SectionDividerOption m_advanced_options;
-    TimeExpressionOption<uint16_t> READ_DELAY;
-};
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/Hosting/PokemonSwSh_DenTools.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/Hosting/PokemonSwSh_DenTools.cpp
deleted file mode 100644
index 77f5a36620..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/Hosting/PokemonSwSh_DenTools.cpp
+++ /dev/null
@@ -1,153 +0,0 @@
-/*  Den Tools
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Compiler.h"
-#include "CommonFramework/Globals.h"
-#include "CommonFramework/Notifications/ProgramNotifications.h"
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "NintendoSwitch/NintendoSwitch_Settings.h"
-#include "NintendoSwitch/FixedInterval.h"
-#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
-#include "PokemonSwSh/Commands/PokemonSwSh_Commands_Misc.h"
-#include "PokemonSwSh/Commands/PokemonSwSh_Commands_GameEntry.h"
-#include "PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.h"
-#include "PokemonSwSh/Inference/Dens/PokemonSwSh_DenMonReader.h"
-#include "PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
-#include "PokemonSwSh/Programs/PokemonSwSh_Internet.h"
-#include "PokemonSwSh_DenTools.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-void enter_den(BotBaseContext& context, uint16_t ENTER_ONLINE_DEN_DELAY, bool watts, bool online){
-    if (!online){
-        if (!watts){
-            ssf_press_button2(context, BUTTON_A, GameSettings::instance().ENTER_OFFLINE_DEN_DELAY, 10);
-        }else{
-            //  This is the critical den-rolling path. It needs to be fast.
-            mash_A(context, GameSettings::instance().COLLECT_WATTS_OFFLINE_DELAY);
-            pbf_wait(context, GameSettings::instance().ENTER_OFFLINE_DEN_DELAY);
-        }
-    }else{
-        if (!watts){
-            ssf_press_button2(context, BUTTON_A, ENTER_ONLINE_DEN_DELAY, 50);
-        }else{
-            ssf_press_button2(context, BUTTON_A, GameSettings::instance().COLLECT_WATTS_ONLINE_DELAY, 50);
-            ssf_press_button2(context, BUTTON_B, 100, 50);
-            ssf_press_button2(context, BUTTON_B, ENTER_ONLINE_DEN_DELAY, 50);
-        }
-    }
-}
-
-
-void enter_lobby(BotBaseContext& context, uint16_t OPEN_ONLINE_DEN_LOBBY_DELAY, bool online, Catchability catchability){
-    if (online){
-        switch (catchability){
-        case Catchability::ALWAYS_CATCHABLE:
-            ssf_press_button1(context, BUTTON_A, OPEN_ONLINE_DEN_LOBBY_DELAY);
-            return;
-        case Catchability::MAYBE_UNCATCHABLE:
-        case Catchability::ALWAYS_UNCATCHABLE:
-            ssf_press_button1(context, BUTTON_A, GameSettings::instance().UNCATCHABLE_PROMPT_DELAY);
-            ssf_press_button1(context, BUTTON_A, OPEN_ONLINE_DEN_LOBBY_DELAY);
-            return;
-        }
-    }
-
-    switch (catchability){
-    case Catchability::ALWAYS_CATCHABLE:
-        ssf_press_button1(context, BUTTON_A, GameSettings::instance().OPEN_LOCAL_DEN_LOBBY_DELAY);
-        return;
-    case Catchability::MAYBE_UNCATCHABLE:
-        ssf_press_button1(context, BUTTON_A, GameSettings::instance().UNCATCHABLE_PROMPT_DELAY);
-        ssf_press_button1(context, BUTTON_A, GameSettings::instance().OPEN_LOCAL_DEN_LOBBY_DELAY);
-
-        if (!GameSettings::instance().DODGE_UNCATCHABLE_PROMPT_FAST){
-            //  lobby-switch        switch-box
-            ssf_press_dpad1(context, DPAD_LEFT, 10);
-            //  lobby-switch        switch-party-red
-            ssf_press_button1(context, BUTTON_A, GameSettings::instance().ENTER_SWITCH_POKEMON);
-            //  switch-box          switch-confirm
-            ssf_press_button1(context, BUTTON_Y, 10);
-            ssf_press_dpad1(context, DPAD_LEFT, 10);
-            //  switch-party-blue   switch-confirm
-            ssf_press_button1(context, BUTTON_A, GameSettings::instance().EXIT_SWITCH_POKEMON);
-            //  lobby-switch        lobby-switch
-        }
-        return;
-    case Catchability::ALWAYS_UNCATCHABLE:
-        ssf_press_button1(context, BUTTON_A, GameSettings::instance().UNCATCHABLE_PROMPT_DELAY);
-        ssf_press_button1(context, BUTTON_A, GameSettings::instance().OPEN_LOCAL_DEN_LOBBY_DELAY);
-        return;
-    }
-}
-
-
-void roll_den(
-    ConsoleHandle& console, BotBaseContext& context,
-    uint16_t ENTER_ONLINE_DEN_DELAY,
-    uint16_t OPEN_ONLINE_DEN_LOBBY_DELAY,
-    uint8_t skips, Catchability catchability
-){
-    if (skips > 60){
-        skips = 60;
-    }
-    for (uint8_t c = 0; c < skips; c++){
-        enter_den(context, ENTER_ONLINE_DEN_DELAY, c != 0, false);
-        enter_lobby(context, OPEN_ONLINE_DEN_LOBBY_DELAY, false, catchability);
-
-        //  Skip forward.
-        ssf_press_button2(context, BUTTON_HOME, GameSettings::instance().GAME_TO_HOME_DELAY_FAST, 10);
-        home_to_date_time(context, true, false);
-        roll_date_forward_1(context, false);
-
-        //  Enter game
-        if (console.video().snapshot()){
-            console.log("Entering game using inference...");
-            pbf_press_button(context, BUTTON_HOME, 10, 90);
-            NintendoSwitch::resume_game_from_home(console, context);
-        }else{
-            console.log("Entering game without inference...", COLOR_RED);
-            settings_to_enter_game_den_lobby(
-                context,
-                ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_SLOW, true,
-                GameSettings::instance().ENTER_SWITCH_POKEMON, GameSettings::instance().EXIT_SWITCH_POKEMON
-            );
-        }
-
-        //  Exit Raid
-        ssf_press_button2(context, BUTTON_B, 120, 50);
-        ssf_press_button2(context, BUTTON_A, GameSettings::instance().REENTER_DEN_DELAY, 50);
-    }
-}
-void rollback_date_from_home(BotBaseContext& context, uint8_t skips){
-    if (skips == 0){
-        return;
-    }
-    if (skips > 60){
-        skips = 60;
-    }
-    home_to_date_time(context, true, false);
-    roll_date_backward_N(context, skips, false);
-//    pbf_wait(5);
-
-    //  Note that it is possible for this return animation to run longer than
-    //  "SETTINGS_TO_HOME_DELAY" and swallow a subsequent button press.
-    //  Therefore the caller needs to be able to tolerate this.
-    ssf_press_button2(context, BUTTON_HOME, ConsoleSettings::instance().SETTINGS_TO_HOME_DELAY, 10);
-}
-
-
-
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/Hosting/PokemonSwSh_DenTools.h b/SerialPrograms/Source/PokemonSwSh/Programs/Hosting/PokemonSwSh_DenTools.h
deleted file mode 100644
index d5092405da..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/Hosting/PokemonSwSh_DenTools.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*  Den Tools
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_DenTools_H
-#define PokemonAutomation_PokemonSwSh_DenTools_H
-
-#include "CommonFramework/Tools/ConsoleHandle.h"
-#include "PokemonSwSh/Options/PokemonSwSh_Catchability.h"
-
-namespace PokemonAutomation{
-    class BotBaseContext;
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-void enter_den(BotBaseContext& context, uint16_t ENTER_ONLINE_DEN_DELAY, bool watts, bool online);
-void enter_lobby(BotBaseContext& context, uint16_t OPEN_ONLINE_DEN_LOBBY_DELAY, bool online, Catchability catchability);
-
-void roll_den(
-    ConsoleHandle& console, BotBaseContext& context,
-    uint16_t ENTER_ONLINE_DEN_DELAY,
-    uint16_t OPEN_ONLINE_DEN_LOBBY_DELAY,
-    uint8_t skips, Catchability catchability
-);
-void rollback_date_from_home(BotBaseContext& context, uint8_t skips);
-
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/Hosting/PokemonSwSh_LobbyWait.h b/SerialPrograms/Source/PokemonSwSh/Programs/Hosting/PokemonSwSh_LobbyWait.h
deleted file mode 100644
index 19ab771599..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/Hosting/PokemonSwSh_LobbyWait.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/*  Lobby Wait
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_LobbyWait_H
-#define PokemonAutomation_PokemonSwSh_LobbyWait_H
-
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "CommonFramework/Tools/ConsoleHandle.h"
-#include "NintendoSwitch/NintendoSwitch_Settings.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Device.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "PokemonSwSh/PokemonSwSh_Settings.h"
-#include "PokemonSwSh/Commands/PokemonSwSh_Commands_AutoHosts.h"
-#include "PokemonSwSh/Inference/Dens/PokemonSwSh_RaidLobbyReader.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-static RaidLobbyState raid_lobby_wait(
-    ConsoleHandle& console, BotBaseContext& context,
-    bool HOST_ONLINE,
-    uint8_t accept_FR_slot,
-    uint16_t lobby_wait_delay
-){
-    uint16_t GAME_TO_HOME_DELAY_SAFE = GameSettings::instance().GAME_TO_HOME_DELAY_SAFE;
-    uint16_t AUTO_FR_DURATION = GameSettings::instance().AUTO_FR_DURATION;
-    bool TOLERATE_SYSTEM_UPDATE_MENU_SLOW = ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_SLOW;
-    uint16_t FULL_LOBBY_TIMER = GameSettings::instance().FULL_LOBBY_TIMER;
-
-    context.wait_for_all_requests();
-    uint32_t start = system_clock(context);
-    RaidLobbyReader inference(console, console);
-    RaidLobbyState state;
-
-    if (HOST_ONLINE && accept_FR_slot > 0){
-        accept_FRs(
-            console, context,
-            accept_FR_slot - 1, true,
-            GAME_TO_HOME_DELAY_SAFE,
-            AUTO_FR_DURATION,
-            TOLERATE_SYSTEM_UPDATE_MENU_SLOW
-        );
-        context.wait_for_all_requests();
-        uint32_t time_elapsed = system_clock(context) - start;
-        uint32_t delay = time_elapsed;
-
-        while (true){
-            state = inference.read(console.video().snapshot());
-            if (state.valid && state.raid_is_full() && state.raiders_are_ready()){
-                return state;
-            }
-            time_elapsed = system_clock(context) - start;
-            if (time_elapsed + delay >= lobby_wait_delay){
-                break;
-            }
-            accept_FRs(
-                console, context,
-                accept_FR_slot - 1, false,
-                GAME_TO_HOME_DELAY_SAFE,
-                AUTO_FR_DURATION,
-                TOLERATE_SYSTEM_UPDATE_MENU_SLOW
-            );
-            context.wait_for_all_requests();
-        }
-    }
-
-    while (true){
-        state = inference.read(console.video().snapshot());
-        if (state.valid && state.raid_is_full() && state.raiders_are_ready()){
-            return state;
-        }
-        uint32_t time_elapsed = system_clock(context) - start;
-        if (time_elapsed >= lobby_wait_delay){
-            break;
-        }
-        pbf_wait(
-            context,
-            std::min(
-                lobby_wait_delay - time_elapsed,
-                (uint32_t)TICKS_PER_SECOND
-            )
-        );
-        context.wait_for_all_requests();
-    }
-
-//    context.wait_for_all_requests();
-
-    while (true){
-        if (!state.valid || state.raiders_are_ready()){
-            return state;
-        }
-        uint32_t time_elapsed = system_clock(context) - start;
-        if (time_elapsed > FULL_LOBBY_TIMER){
-            return state;
-        }
-        pbf_wait(
-            context,
-            std::min(
-                FULL_LOBBY_TIMER - time_elapsed,
-                (uint32_t)TICKS_PER_SECOND
-            )
-        );
-        context.wait_for_all_requests();
-        state = inference.read(console.video().snapshot());
-    }
-}
-
-
-
-}
-}
-}
-#endif
-
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset-Calyrex.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset-Calyrex.cpp
deleted file mode 100644
index 883e541566..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset-Calyrex.cpp
+++ /dev/null
@@ -1,302 +0,0 @@
-/*  Stats Reset - Calyrex
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/Notifications/ProgramNotifications.h"
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
-#include "CommonFramework/Tools/StatsTracking.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "NintendoSwitch/NintendoSwitch_Settings.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonSwSh/PokemonSwSh_Settings.h"
-#include "PokemonSwSh/Inference/Battles/PokemonSwSh_BattleMenuDetector.h"
-#include "PokemonSwSh/Programs/PokemonSwSh_BasicCatcher.h"
-#include "PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
-#include "PokemonSwSh_StatsReset-Calyrex.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-StatsResetCalyrex_Descriptor::StatsResetCalyrex_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonSwSh:StatsResetCalyrex",
-        STRING_POKEMON + " SwSh", "Stats Reset - Calyrex",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonSwSh/StatsReset-Calyrex.md",
-        "Repeatedly catch calyrex (and its horse) until you get the stats you want.",
-        FeedbackType::REQUIRED,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-struct StatsResetCalyrex_Descriptor::Stats : public StatsTracker{
-    Stats()
-        : pokemon_caught(m_stats["Pokemon caught"])
-        , pokemon_fainted(m_stats["Pokemon fainted"])
-        , own_fainted(m_stats["Own fainted"])
-        , out_of_balls(m_stats["Out of balls"])
-        , errors(m_stats["Errors"])
-        , total_balls_thrown(m_stats["Total balls thrown"])
-        , matches(m_stats["Matches"])
-    {
-        m_display_order.emplace_back(Stat("Pokemon caught"));
-        m_display_order.emplace_back(Stat("Pokemon fainted"));
-        m_display_order.emplace_back(Stat("Own fainted"));
-        m_display_order.emplace_back(Stat("Out of balls"));
-        m_display_order.emplace_back(Stat("Errors"));
-        m_display_order.emplace_back(Stat("Total balls thrown"));
-        m_display_order.emplace_back(Stat("Matches"));
-    }
-
-    std::atomic<uint64_t>& pokemon_caught;
-    std::atomic<uint64_t>& pokemon_fainted;
-    std::atomic<uint64_t>& own_fainted;
-    std::atomic<uint64_t>& out_of_balls;
-    std::atomic<uint64_t>& errors;
-    std::atomic<uint64_t>& total_balls_thrown;
-    std::atomic<uint64_t>& matches;
-};
-std::unique_ptr<StatsTracker> StatsResetCalyrex_Descriptor::make_stats() const{
-    return std::unique_ptr<StatsTracker>(new Stats());
-}
-
-
-
-StatsResetCalyrex::StatsResetCalyrex()
-    : GO_HOME_WHEN_DONE(false)
-    , BALL_SELECT(
-        "<b>Ball Select:</b>",
-        LockWhileRunning::LOCKED,
-        "master-ball"
-    )
-    , LANGUAGE(
-        "<b>Game Language:</b>",
-        IV_READER().languages(),
-        LockWhileRunning::LOCKED,
-        true
-    )
-    , CHECK_CALYREX_STATS(
-        "<b>Check Calyrex stats</b>",
-        LockWhileRunning::LOCKED,
-        true
-    )
-    , CALYREX_HP("<b>Calyrex HP:</b>")
-    , CALYREX_ATTACK("<b>Calyrex Attack:</b>", IVCheckerFilter::NoGood)
-    , CALYREX_DEFENSE("<b>Calyrex Defense:</b>")
-    , CALYREX_SPATK("<b>Calyrex Sp. Atk:</b>")
-    , CALYREX_SPDEF("<b>Calyrex Sp. Def:</b>")
-    , CALYREX_SPEED("<b>Calyrex Speed:</b>")
-    , CHECK_HORSE_STATS(
-        "<b>Check Horse stats</b>",
-        LockWhileRunning::LOCKED,
-        true
-    )
-    , HORSE_HP("<b>Horse HP:</b>")
-    , HORSE_ATTACK("<b>Horse Attack:</b>", IVCheckerFilter::NoGood)
-    , HORSE_DEFENSE("<b>Horse Defense:</b>")
-    , HORSE_SPATK("<b>Horse Sp. Atk:</b>")
-    , HORSE_SPDEF("<b>Horse Sp. Def:</b>")
-    , HORSE_SPEED("<b>Horse Speed:</b>")
-    , NOTIFICATION_CATCH_SUCCESS("Catch Success", true, false, std::chrono::seconds(3600))
-    , NOTIFICATION_CATCH_FAILED("Catch Failed", true, false, std::chrono::seconds(3600))
-    , NOTIFICATIONS({
-        &NOTIFICATION_CATCH_SUCCESS,
-        &NOTIFICATION_CATCH_FAILED,
-        &NOTIFICATION_PROGRAM_FINISH,
-        &NOTIFICATION_ERROR_FATAL,
-    })
-{
-
-    PA_ADD_OPTION(START_LOCATION);
-    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
-
-    PA_ADD_OPTION(BALL_SELECT);
-    PA_ADD_OPTION(LANGUAGE);
-
-    PA_ADD_OPTION(CHECK_CALYREX_STATS);
-    PA_ADD_OPTION(CALYREX_HP);
-    PA_ADD_OPTION(CALYREX_ATTACK);
-    PA_ADD_OPTION(CALYREX_DEFENSE);
-    PA_ADD_OPTION(CALYREX_SPATK);
-    PA_ADD_OPTION(CALYREX_SPDEF);
-    PA_ADD_OPTION(CALYREX_SPEED);
-
-    PA_ADD_OPTION(CHECK_HORSE_STATS);
-    PA_ADD_OPTION(HORSE_HP);
-    PA_ADD_OPTION(HORSE_ATTACK);
-    PA_ADD_OPTION(HORSE_DEFENSE);
-    PA_ADD_OPTION(HORSE_SPATK);
-    PA_ADD_OPTION(HORSE_SPDEF);
-    PA_ADD_OPTION(HORSE_SPEED);
-
-    PA_ADD_OPTION(NOTIFICATIONS);
-}
-
-
-
-void StatsResetCalyrex::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    if (START_LOCATION.start_in_grip_menu()){
-        grip_menu_connect_go_home(context);
-        resume_game_back_out(env.console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST, 200);
-    }else{
-        pbf_press_button(context, BUTTON_B, 5, 5);
-    }
-
-    StatsResetCalyrex_Descriptor::Stats& stats = env.current_stats<StatsResetCalyrex_Descriptor::Stats>();
-
-    bool match_found = false;
-    while (!match_found){
-
-        bool calyrex_caught = false;
-        while (!calyrex_caught){
-            env.log("Talk to calyrex.", COLOR_PURPLE);
-            context.wait_for_all_requests();
-            {
-                StandardBattleMenuWatcher fight_detector(false);
-                int result = run_until(
-                    env.console, context,
-                    [](BotBaseContext& context){
-                        while (true){
-                            pbf_press_button(context, BUTTON_A, 10, 1 * TICKS_PER_SECOND);
-                        }
-                    },
-                    {{fight_detector}}
-                );
-                if (result == 0) {
-                    env.log("New fight detected, let's begin to throw balls.", COLOR_PURPLE);
-                    pbf_mash_button(context, BUTTON_B, 1 * TICKS_PER_SECOND);
-                }
-            }
-
-            pbf_mash_button(context, BUTTON_B, 1 * TICKS_PER_SECOND);
-            CatchResults result = basic_catcher(env.console, context, LANGUAGE, BALL_SELECT.slug());
-            switch (result.result){
-            case CatchResult::POKEMON_CAUGHT:
-                calyrex_caught = true;
-                stats.pokemon_caught++;
-                break;
-            case CatchResult::POKEMON_FAINTED:
-                stats.pokemon_fainted++;
-                break;
-            case CatchResult::OWN_FAINTED:
-                stats.own_fainted++;
-                break;
-            case CatchResult::OUT_OF_BALLS:
-                stats.out_of_balls++;
-                break;
-            case CatchResult::CANNOT_THROW_BALL:
-            case CatchResult::TIMED_OUT:
-                stats.errors++;
-                break;
-            }
-            stats.total_balls_thrown += result.balls_used;
-            env.update_stats();
-
-            if (calyrex_caught){
-                send_program_status_notification(
-                    env, NOTIFICATION_CATCH_SUCCESS,
-                    "Threw " + std::to_string(result.balls_used) + " ball(s) and caught it."
-                );
-            }else{
-                send_program_status_notification(
-                    env, NOTIFICATION_CATCH_FAILED,
-                    "Threw " + std::to_string(result.balls_used) + " ball(s) and did not catch it."
-                );
-            }
-
-            if (!calyrex_caught){
-                pbf_press_button(context, BUTTON_HOME, 10, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE);
-                reset_game_from_home_with_inference(
-                    env.console, context,
-                    ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST
-                );
-            }
-        }
-
-        env.log("Unfuse calyrex.", COLOR_PURPLE);
-        for (int i = 0; i < 40; i++){
-            pbf_press_button(context, BUTTON_A, 10, 1 * TICKS_PER_SECOND);
-        }
-        pbf_press_button(context, BUTTON_X  , 10, (uint16_t)(1.5 * TICKS_PER_SECOND));
-        pbf_press_dpad  (context, DPAD_RIGHT, 10, (uint16_t)(0.5 * TICKS_PER_SECOND));
-        pbf_press_dpad  (context, DPAD_RIGHT, 10, (uint16_t)(0.5 * TICKS_PER_SECOND));
-        pbf_press_button(context, BUTTON_A  , 10, 2   * TICKS_PER_SECOND);
-        pbf_press_dpad  (context, DPAD_LEFT , 10, (uint16_t)(0.5 * TICKS_PER_SECOND));
-        pbf_press_dpad  (context, DPAD_UP   , 10, (uint16_t)(0.5 * TICKS_PER_SECOND));
-        pbf_press_button(context, BUTTON_A  , 10, 2   * TICKS_PER_SECOND);
-        pbf_press_button(context, BUTTON_A  , 10, 2   * TICKS_PER_SECOND);
-        pbf_press_dpad  (context, DPAD_UP   , 10, 2   * TICKS_PER_SECOND);
-        pbf_press_button(context, BUTTON_A  , 10, 2   * TICKS_PER_SECOND);
-        pbf_press_button(context, BUTTON_A  , 10, 2   * TICKS_PER_SECOND);
-        context.wait_for_all_requests();
-
-        env.log("Check the stats.", COLOR_PURPLE);
-        for (int i = 0; i < 10; i++){
-            pbf_press_button(context, BUTTON_B, 10, 1 * TICKS_PER_SECOND);
-        }
-        pbf_press_button(context, BUTTON_X , 10, 2   * TICKS_PER_SECOND);
-        pbf_press_dpad  (context, DPAD_LEFT, 10, (uint16_t)(0.5 * TICKS_PER_SECOND));
-        pbf_press_button(context, BUTTON_A , 10, 2   * TICKS_PER_SECOND);
-        pbf_press_button(context, BUTTON_R , 10, 3   * TICKS_PER_SECOND);
-        pbf_press_dpad  (context, DPAD_LEFT, 10, 1   * TICKS_PER_SECOND);
-        pbf_press_dpad  (context, DPAD_UP  , 10, 1   * TICKS_PER_SECOND);
-        pbf_press_dpad  (context, DPAD_UP  , 10, 1   * TICKS_PER_SECOND);
-
-        if (CHECK_HORSE_STATS){
-            context.wait_for_all_requests();
-            IVCheckerReaderScope reader(env.console, LANGUAGE);
-            IVCheckerReader::Results results = reader.read(env.console, env.console.video().snapshot());
-            bool horse_ok = true;
-            horse_ok &= HORSE_HP.matches(stats.errors, results.hp);
-            horse_ok &= HORSE_ATTACK.matches(stats.errors, results.attack);
-            horse_ok &= HORSE_DEFENSE.matches(stats.errors, results.defense);
-            horse_ok &= HORSE_SPATK.matches(stats.errors, results.spatk);
-            horse_ok &= HORSE_SPDEF.matches(stats.errors, results.spdef);
-            horse_ok &= HORSE_SPEED.matches(stats.errors, results.speed);
-            if (horse_ok){
-                match_found = true;
-            }
-        }
-        if (CHECK_CALYREX_STATS){
-            pbf_press_dpad(context, DPAD_UP, 10, 1 * TICKS_PER_SECOND);
-            context.wait_for_all_requests();
-
-            IVCheckerReaderScope reader(env.console, LANGUAGE);
-            IVCheckerReader::Results results = reader.read(env.console, env.console.video().snapshot());
-            bool calyrex_ok = true;
-            calyrex_ok &= CALYREX_HP.matches(stats.errors, results.hp);
-            calyrex_ok &= CALYREX_ATTACK.matches(stats.errors, results.attack);
-            calyrex_ok &= CALYREX_DEFENSE.matches(stats.errors, results.defense);
-            calyrex_ok &= CALYREX_SPATK.matches(stats.errors, results.spatk);
-            calyrex_ok &= CALYREX_SPDEF.matches(stats.errors, results.spdef);
-            calyrex_ok &= CALYREX_SPEED.matches(stats.errors, results.speed);
-            if (calyrex_ok){
-                match_found = true;
-            }
-        }
-        if (!match_found){
-            pbf_press_button(context, BUTTON_HOME, 10, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE);
-            reset_game_from_home_with_inference(
-                env.console, context,
-                ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST
-            );
-        }
-    }
-    stats.matches++;
-    env.log("Result Found!", COLOR_BLUE);
-    env.update_stats();
-    send_program_finished_notification(
-        env, NOTIFICATION_PROGRAM_FINISH,
-        "Found a perfect match!"
-    );
-    GO_HOME_WHEN_DONE.run_end_of_program(context);
-}
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset-Calyrex.h b/SerialPrograms/Source/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset-Calyrex.h
deleted file mode 100644
index 680ea689e8..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset-Calyrex.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*  Stats Reset - Calyrex
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_StatsResetCalyrex_H
-#define PokemonAutomation_PokemonSwSh_StatsResetCalyrex_H
-
-#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
-#include "CommonFramework/Options/LanguageOCROption.h"
-#include "CommonFramework/Notifications/EventNotificationsTable.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
-#include "NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h"
-#include "Pokemon/Options/Pokemon_IVCheckerOption.h"
-#include "PokemonSwSh/Options/PokemonSwSh_BallSelectOption.h"
-#include "PokemonSwSh/Inference/PokemonSwSh_IVCheckerReader.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-using namespace Pokemon;
-
-
-class StatsResetCalyrex_Descriptor : public SingleSwitchProgramDescriptor{
-public:
-    StatsResetCalyrex_Descriptor();
-
-    struct Stats;
-    virtual std::unique_ptr<StatsTracker> make_stats() const override;
-};
-
-
-
-class StatsResetCalyrex : public SingleSwitchProgramInstance{
-public:
-    StatsResetCalyrex();
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-    StartInGripOrGameOption START_LOCATION;
-    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
-
-    PokemonBallSelectOption BALL_SELECT;
-    OCR::LanguageOCROption LANGUAGE;
-
-    BooleanCheckBoxOption CHECK_CALYREX_STATS;
-    IVCheckerFilterOption CALYREX_HP;
-    IVCheckerFilterOption CALYREX_ATTACK;
-    IVCheckerFilterOption CALYREX_DEFENSE;
-    IVCheckerFilterOption CALYREX_SPATK;
-    IVCheckerFilterOption CALYREX_SPDEF;
-    IVCheckerFilterOption CALYREX_SPEED;
-
-    BooleanCheckBoxOption CHECK_HORSE_STATS;
-    IVCheckerFilterOption HORSE_HP;
-    IVCheckerFilterOption HORSE_ATTACK;
-    IVCheckerFilterOption HORSE_DEFENSE;
-    IVCheckerFilterOption HORSE_SPATK;
-    IVCheckerFilterOption HORSE_SPDEF;
-    IVCheckerFilterOption HORSE_SPEED;
-
-    EventNotificationOption NOTIFICATION_CATCH_SUCCESS;
-    EventNotificationOption NOTIFICATION_CATCH_FAILED;
-    EventNotificationsOption NOTIFICATIONS;
-};
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset-Moltres.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset-Moltres.cpp
deleted file mode 100644
index 43db604f43..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset-Moltres.cpp
+++ /dev/null
@@ -1,232 +0,0 @@
-/*  Stats Reset - Moltres
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/Exceptions/OperationFailedException.h"
-#include "CommonFramework/Notifications/ProgramNotifications.h"
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
-#include "CommonFramework/Tools/StatsTracking.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "NintendoSwitch/NintendoSwitch_Settings.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonSwSh/PokemonSwSh_Settings.h"
-#include "PokemonSwSh/Inference/PokemonSwSh_IVCheckerReader.h"
-#include "PokemonSwSh/Inference/Battles/PokemonSwSh_BattleMenuDetector.h"
-#include "PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
-#include "PokemonSwSh/Programs/PokemonSwSh_BasicCatcher.h"
-#include "PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
-#include "PokemonSwSh_StatsReset-Moltres.h"
-
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-StatsResetMoltres_Descriptor::StatsResetMoltres_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonSwSh:StatsResetMoltres",
-        STRING_POKEMON + " SwSh", "Stats Reset - Moltres",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonSwSh/StatsReset-Moltres.md",
-        "Repeatedly catch moltres until you get the stats you want.",
-        FeedbackType::REQUIRED,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-struct StatsResetMoltres_Descriptor::Stats : public StatsTracker{
-    Stats()
-        : resets(m_stats["Resets"])
-        , errors(m_stats["Errors"])
-        , matches(m_stats["Matches"])
-    {
-        m_display_order.emplace_back(Stat("Resets"));
-        m_display_order.emplace_back(Stat("Errors"));
-        m_display_order.emplace_back(Stat("Matches"));
-    }
-
-    std::atomic<uint64_t>& resets;
-    std::atomic<uint64_t>& errors;
-    std::atomic<uint64_t>& matches;
-};
-std::unique_ptr<StatsTracker> StatsResetMoltres_Descriptor::make_stats() const{
-    return std::unique_ptr<StatsTracker>(new Stats());
-}
-
-
-
-
-StatsResetMoltres::StatsResetMoltres()
-    : GO_HOME_WHEN_DONE(false)
-    , LANGUAGE(
-        "<b>Game Language:</b>",
-        IV_READER().languages(),
-        LockWhileRunning::LOCKED,
-        true
-    )
-    , HP("<b>HP:</b>")
-    , ATTACK("<b>Attack:</b>", IVCheckerFilter::NoGood)
-    , DEFENSE("<b>Defense:</b>")
-    , SPATK("<b>Sp. Atk:</b>")
-    , SPDEF("<b>Sp. Def:</b>")
-    , SPEED("<b>Speed:</b>")
-    , NOTIFICATIONS({
-        &NOTIFICATION_PROGRAM_FINISH,
-        &NOTIFICATION_ERROR_FATAL,
-    })
-{
-    PA_ADD_OPTION(START_LOCATION);
-    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
-
-    PA_ADD_OPTION(LANGUAGE);
-    PA_ADD_OPTION(HP);
-    PA_ADD_OPTION(ATTACK);
-    PA_ADD_OPTION(DEFENSE);
-    PA_ADD_OPTION(SPATK);
-    PA_ADD_OPTION(SPDEF);
-    PA_ADD_OPTION(SPEED);
-
-    PA_ADD_OPTION(NOTIFICATIONS);
-}
-
-
-
-void StatsResetMoltres::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    if (START_LOCATION.start_in_grip_menu()){
-        grip_menu_connect_go_home(context);
-        resume_game_back_out(env.console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST, 200);
-    }else{
-        pbf_press_button(context, BUTTON_B, 5, 5);
-    }
-
-    StatsResetMoltres_Descriptor::Stats& stats = env.current_stats<StatsResetMoltres_Descriptor::Stats>();
-
-    while (true){
-        context.wait_for_all_requests();
-        env.log("Wait for moltres to attack you.", COLOR_PURPLE);
-        {
-            StandardBattleMenuWatcher fight_detector(false);
-            int result = run_until(
-                env.console, context,
-                [](BotBaseContext& context){
-                    while (true){
-                        pbf_wait(context, 1 * TICKS_PER_SECOND);
-                    }
-                },
-                {{fight_detector}}
-            );
-            if (result == 0){
-                env.log("New fight detected.", COLOR_PURPLE);
-                pbf_mash_button(context, BUTTON_B, 1 * TICKS_PER_SECOND);
-            }
-        }
-
-        context.wait_for_all_requests();
-        CatchResults result = basic_catcher(env.console, context, LANGUAGE, "master-ball");
-        if (result.result != CatchResult::POKEMON_CAUGHT){
-            throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, env.console,
-                "Unable to catch Moltres.",
-                true
-            );
-        }
-
-        context.wait_for_all_requests();
-        env.log("Exit the fight.", COLOR_PURPLE);
-        for (int i = 0; i < 20; i++){
-            pbf_press_button(context, BUTTON_B, 10, 1 * TICKS_PER_SECOND);
-        }
-
-        context.wait_for_all_requests();
-        env.log("Check the stats.", COLOR_PURPLE);
-        pbf_press_button(context, BUTTON_X , 10, GameSettings::instance().OVERWORLD_TO_MENU_DELAY);
-        pbf_press_dpad  (context, DPAD_UP  , 10, (uint16_t)(0.5 * TICKS_PER_SECOND));
-        pbf_press_button(context, BUTTON_A , 10, 2   * TICKS_PER_SECOND);
-        pbf_press_button(context, BUTTON_R , 10, 3   * TICKS_PER_SECOND);
-        pbf_press_dpad  (context, DPAD_LEFT, 10, 1   * TICKS_PER_SECOND);
-        pbf_press_dpad  (context, DPAD_UP  , 10, 1   * TICKS_PER_SECOND);
-        pbf_press_dpad  (context, DPAD_UP  , 10, 1   * TICKS_PER_SECOND);
-
-        context.wait_for_all_requests();
-        IVCheckerReaderScope reader(env.console, LANGUAGE);
-        IVCheckerReader::Results results = reader.read(env.console, env.console.video().snapshot());
-        bool ok = true;
-        ok &= HP.matches(stats.errors, results.hp);
-        ok &= ATTACK.matches(stats.errors, results.attack);
-        ok &= DEFENSE.matches(stats.errors, results.defense);
-        ok &= SPATK.matches(stats.errors, results.spatk);
-        ok &= SPDEF.matches(stats.errors, results.spdef);
-        ok &= SPEED.matches(stats.errors, results.speed);
-        env.update_stats();
-        if (ok){
-            break;
-        }else{
-            stats.resets++;
-            env.update_stats();
-            pbf_press_button(context, BUTTON_HOME, 10, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE);
-            reset_game_from_home_with_inference(
-                env.console, context,
-                ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST
-            );
-
-            context.wait_for_all_requests();
-            env.log("Wait for moltres to attack you.", COLOR_PURPLE);
-            {
-                StandardBattleMenuWatcher fight_detector(false);
-                int ret = run_until(
-                    env.console, context,
-                    [](BotBaseContext& context){
-                        while (true){
-                            pbf_wait(context, 1 * TICKS_PER_SECOND);
-                        }
-                    },
-                    {{fight_detector}}
-                );
-                if (ret == 0){
-                    env.log("New fight detected.", COLOR_PURPLE);
-                    pbf_mash_button(context, BUTTON_B, 1 * TICKS_PER_SECOND);
-                    pbf_press_dpad(context, DPAD_UP , 10, 1 * TICKS_PER_SECOND);
-                    pbf_press_button(context, BUTTON_A, 10, 1 * TICKS_PER_SECOND);
-                }
-            }
-            for (int i = 0; i < 10; i++){
-                pbf_press_button(context, BUTTON_B, 10, 1 * TICKS_PER_SECOND);
-            }
-
-            context.wait_for_all_requests();
-            env.log("Let's camp.", COLOR_PURPLE);
-            pbf_press_button(context, BUTTON_X  , 10, GameSettings::instance().OVERWORLD_TO_MENU_DELAY);
-            pbf_press_dpad  (context, DPAD_RIGHT, 10, 1 * TICKS_PER_SECOND);
-            pbf_press_dpad  (context, DPAD_DOWN , 10, 1 * TICKS_PER_SECOND);
-            pbf_press_button(context, BUTTON_A  , 10, 8 * TICKS_PER_SECOND);
-            pbf_press_button(context, BUTTON_X  , 10, 1 * TICKS_PER_SECOND);
-            pbf_press_dpad  (context, DPAD_LEFT , 10, 1 * TICKS_PER_SECOND);
-            pbf_press_button(context, BUTTON_A  , 10, 7 * TICKS_PER_SECOND);
-
-            context.wait_for_all_requests();
-            env.log("Let's save.", COLOR_PURPLE);
-            pbf_press_button(context, BUTTON_X , 10, GameSettings::instance().OVERWORLD_TO_MENU_DELAY);
-            pbf_press_button(context, BUTTON_R , 10, 1 * TICKS_PER_SECOND);
-            pbf_press_button(context, BUTTON_A , 10, 1 * TICKS_PER_SECOND);
-            pbf_press_button(context, BUTTON_A , 10, 1 * TICKS_PER_SECOND);
-        }
-    }
-
-    env.log("Result Found!", COLOR_BLUE);
-    stats.matches++;
-
-    env.update_stats();
-    send_program_finished_notification(
-        env, NOTIFICATION_PROGRAM_FINISH,
-        "Found a perfect match!"
-    );
-    GO_HOME_WHEN_DONE.run_end_of_program(context);
-}
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset-Moltres.h b/SerialPrograms/Source/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset-Moltres.h
deleted file mode 100644
index 945a11c84b..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset-Moltres.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*  Stats Reset - Moltres
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_StatsResetMoltres_H
-#define PokemonAutomation_PokemonSwSh_StatsResetMoltres_H
-
-#include "CommonFramework/Options/LanguageOCROption.h"
-#include "CommonFramework/Notifications/EventNotificationsTable.h"
-#include "CommonFramework/InferenceInfra/VisualInferenceCallback.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-#include "NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h"
-#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
-#include "Pokemon/Options/Pokemon_IVCheckerOption.h"
-#include "PokemonSwSh/Inference/Battles/PokemonSwSh_BattleBallReader.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-class StatsResetMoltres_Descriptor : public SingleSwitchProgramDescriptor{
-public:
-    StatsResetMoltres_Descriptor();
-
-    struct Stats;
-    virtual std::unique_ptr<StatsTracker> make_stats() const override;
-};
-
-
-
-class StatsResetMoltres : public SingleSwitchProgramInstance{
-public:
-    StatsResetMoltres();
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-    StartInGripOrGameOption START_LOCATION;
-    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
-
-    OCR::LanguageOCROption LANGUAGE;
-    IVCheckerFilterOption HP;
-    IVCheckerFilterOption ATTACK;
-    IVCheckerFilterOption DEFENSE;
-    IVCheckerFilterOption SPATK;
-    IVCheckerFilterOption SPDEF;
-    IVCheckerFilterOption SPEED;
-
-    EventNotificationsOption NOTIFICATIONS;
-};
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset-Regi.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset-Regi.cpp
deleted file mode 100644
index 10657e8ff2..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset-Regi.cpp
+++ /dev/null
@@ -1,241 +0,0 @@
-/*  Stats Reset - Regi
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/Notifications/ProgramNotifications.h"
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
-#include "CommonFramework/Tools/StatsTracking.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "NintendoSwitch/NintendoSwitch_Settings.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonSwSh/PokemonSwSh_Settings.h"
-#include "PokemonSwSh/Inference/Battles/PokemonSwSh_BattleMenuDetector.h"
-#include "PokemonSwSh/Programs/PokemonSwSh_BasicCatcher.h"
-#include "PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
-#include "PokemonSwSh_StatsReset-Regi.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-StatsResetRegi_Descriptor::StatsResetRegi_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonSwSh:StatsResetRegi",
-        STRING_POKEMON + " SwSh", "Stats Reset - Regi",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonSwSh/StatsReset-Regi.md",
-        "Repeatedly catch regi until you get the stats you want.",
-        FeedbackType::REQUIRED,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-struct StatsResetRegi_Descriptor::Stats : public StatsTracker{
-    Stats()
-        : pokemon_caught(m_stats["Pokemon caught"])
-        , pokemon_fainted(m_stats["Pokemon fainted"])
-        , own_fainted(m_stats["Own fainted"])
-        , out_of_balls(m_stats["Out of balls"])
-        , errors(m_stats["Errors"])
-        , total_balls_thrown(m_stats["Total balls thrown"])
-        , matches(m_stats["Matches"])
-    {
-        m_display_order.emplace_back(Stat("Pokemon caught"));
-        m_display_order.emplace_back(Stat("Pokemon fainted"));
-        m_display_order.emplace_back(Stat("Own fainted"));
-        m_display_order.emplace_back(Stat("Out of balls"));
-        m_display_order.emplace_back(Stat("Errors"));
-        m_display_order.emplace_back(Stat("Total balls thrown"));
-        m_display_order.emplace_back(Stat("Matches"));
-    }
-
-    std::atomic<uint64_t>& pokemon_caught;
-    std::atomic<uint64_t>& pokemon_fainted;
-    std::atomic<uint64_t>& own_fainted;
-    std::atomic<uint64_t>& out_of_balls;
-    std::atomic<uint64_t>& errors;
-    std::atomic<uint64_t>& total_balls_thrown;
-    std::atomic<uint64_t>& matches;
-};
-std::unique_ptr<StatsTracker> StatsResetRegi_Descriptor::make_stats() const{
-    return std::unique_ptr<StatsTracker>(new Stats());
-}
-
-
-
-StatsResetRegi::StatsResetRegi()
-    : GO_HOME_WHEN_DONE(false)
-    , BALL_SELECT(
-        "<b>Ball Select:</b>",
-        LockWhileRunning::LOCKED,
-        "master-ball"
-    )
-    , LANGUAGE(
-        "<b>Game Language:</b>",
-        IV_READER().languages(),
-        LockWhileRunning::LOCKED,
-        true
-    )
-    , HP("<b>HP:</b>")
-    , ATTACK("<b>Attack:</b>", IVCheckerFilter::NoGood)
-    , DEFENSE("<b>Defense:</b>")
-    , SPATK("<b>Sp. Atk:</b>")
-    , SPDEF("<b>Sp. Def:</b>")
-    , SPEED("<b>Speed:</b>")
-    , NOTIFICATION_CATCH_SUCCESS("Catch Success", true, false, std::chrono::seconds(3600))
-    , NOTIFICATION_CATCH_FAILED("Catch Failed", true, false, std::chrono::seconds(3600))
-    , NOTIFICATIONS({
-        &NOTIFICATION_CATCH_SUCCESS,
-        &NOTIFICATION_CATCH_FAILED,
-        &NOTIFICATION_PROGRAM_FINISH,
-        &NOTIFICATION_ERROR_FATAL,
-    })
-{
-    PA_ADD_OPTION(START_LOCATION);
-    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
-
-    PA_ADD_OPTION(BALL_SELECT);
-    PA_ADD_OPTION(LANGUAGE);
-    PA_ADD_OPTION(HP);
-    PA_ADD_OPTION(ATTACK);
-    PA_ADD_OPTION(DEFENSE);
-    PA_ADD_OPTION(SPATK);
-    PA_ADD_OPTION(SPDEF);
-    PA_ADD_OPTION(SPEED);
-
-    PA_ADD_OPTION(NOTIFICATIONS);
-}
-
-
-
-void StatsResetRegi::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    if (START_LOCATION.start_in_grip_menu()){
-        grip_menu_connect_go_home(context);
-        resume_game_back_out(env.console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST, 200);
-    }else{
-        pbf_press_button(context, BUTTON_B, 5, 5);
-    }
-
-    StatsResetRegi_Descriptor::Stats& stats = env.current_stats<StatsResetRegi_Descriptor::Stats>();
-
-    bool match_found = false;
-    while (!match_found){
-
-        bool regi_caught = false;
-        while (!regi_caught){
-            env.log("Talk to regi.", COLOR_PURPLE);
-            context.wait_for_all_requests();
-            {
-                StandardBattleMenuWatcher fight_detector(false);
-                int result = run_until(
-                    env.console, context,
-                    [](BotBaseContext& context){
-                        while (true){
-                            pbf_press_button(context, BUTTON_A, 10, 1 * TICKS_PER_SECOND);
-                        }
-                    },
-                    {{fight_detector}}
-                );
-                if (result == 0){
-                    env.log("New fight detected, let's begin to throw balls.", COLOR_PURPLE);
-                    pbf_mash_button(context, BUTTON_B, 1 * TICKS_PER_SECOND);
-                }
-            }
-
-            env.log("Catch regi.", COLOR_PURPLE);
-            CatchResults result = basic_catcher(env.console, context, LANGUAGE, BALL_SELECT.slug());
-            switch (result.result){
-            case CatchResult::POKEMON_CAUGHT:
-                regi_caught = true;
-                stats.pokemon_caught++;
-                break;
-            case CatchResult::POKEMON_FAINTED:
-                stats.pokemon_fainted++;
-                break;
-            case CatchResult::OWN_FAINTED:
-                stats.own_fainted++;
-                break;
-            case CatchResult::OUT_OF_BALLS:
-                stats.out_of_balls++;
-                break;
-            case CatchResult::CANNOT_THROW_BALL:
-            case CatchResult::TIMED_OUT:
-                stats.errors++;
-                break;
-            }
-            stats.total_balls_thrown += result.balls_used;
-            env.update_stats();
-
-            if (regi_caught){
-                send_program_status_notification(
-                    env, NOTIFICATION_CATCH_SUCCESS,
-                    "Threw " + std::to_string(result.balls_used) + " ball(s) and caught it."
-                );
-            }else{
-                send_program_status_notification(
-                    env, NOTIFICATION_CATCH_FAILED,
-                    "Threw " + std::to_string(result.balls_used) + " ball(s) and did not catch it."
-                );
-            }
-
-            if (!regi_caught){
-                pbf_press_button(context, BUTTON_HOME, 10, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE);
-                reset_game_from_home_with_inference(
-                    env.console, context,
-                    ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST
-                );
-            }
-        }
-
-        env.log("Check the stats.", COLOR_PURPLE);
-        for (int i = 0; i < 20; i++){
-            pbf_press_button(context, BUTTON_B, 10, 1 * TICKS_PER_SECOND);
-        }
-        pbf_press_button(context, BUTTON_X  , 10, 2   * TICKS_PER_SECOND);
-        pbf_press_dpad  (context, DPAD_RIGHT, 10, (uint16_t)(0.5 * TICKS_PER_SECOND));
-        pbf_press_button(context, BUTTON_A  , 10, 2   * TICKS_PER_SECOND);
-        pbf_press_button(context, BUTTON_R  , 10, 3   * TICKS_PER_SECOND);
-        pbf_press_dpad  (context, DPAD_LEFT , 10, 1   * TICKS_PER_SECOND);
-        pbf_press_dpad  (context, DPAD_UP   , 10, 1   * TICKS_PER_SECOND);
-        pbf_press_dpad  (context, DPAD_UP   , 10, 1   * TICKS_PER_SECOND);
-
-        context.wait_for_all_requests();
-        IVCheckerReaderScope reader(env.console, LANGUAGE);
-        IVCheckerReader::Results results = reader.read(env.console, env.console.video().snapshot());
-        bool ok = true;
-        ok &= HP.matches(stats.errors, results.hp);
-        ok &= ATTACK.matches(stats.errors, results.attack);
-        ok &= DEFENSE.matches(stats.errors, results.defense);
-        ok &= SPATK.matches(stats.errors, results.spatk);
-        ok &= SPDEF.matches(stats.errors, results.spdef);
-        ok &= SPEED.matches(stats.errors, results.speed);
-        env.update_stats();
-        match_found = ok;
-
-        if (!match_found){
-            pbf_press_button(context, BUTTON_HOME, 10, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE);
-            reset_game_from_home_with_inference(
-                env.console, context,
-                ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST
-            );
-        }
-    }
-
-    env.log("Result Found!", COLOR_BLUE);
-    stats.matches++;
-
-    env.update_stats();
-    send_program_finished_notification(
-        env, NOTIFICATION_PROGRAM_FINISH,
-        "Found a perfect match!"
-    );
-    GO_HOME_WHEN_DONE.run_end_of_program(context);
-}
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset-Regi.h b/SerialPrograms/Source/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset-Regi.h
deleted file mode 100644
index 3dc8f1091c..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset-Regi.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*  Stats Reset - Regi
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_StatsResetRegi_H
-#define PokemonAutomation_PokemonSwSh_StatsResetRegi_H
-
-#include "CommonFramework/Options/LanguageOCROption.h"
-#include "CommonFramework/Notifications/EventNotificationsTable.h"
-#include "CommonFramework/InferenceInfra/VisualInferenceCallback.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-#include "NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h"
-#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
-#include "Pokemon/Options/Pokemon_IVCheckerOption.h"
-#include "PokemonSwSh/Options/PokemonSwSh_BallSelectOption.h"
-#include "PokemonSwSh/Inference/PokemonSwSh_IVCheckerReader.h"
-#include "PokemonSwSh/Inference/Battles/PokemonSwSh_BattleBallReader.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-class StatsResetRegi_Descriptor : public SingleSwitchProgramDescriptor{
-public:
-    StatsResetRegi_Descriptor();
-
-    struct Stats;
-    virtual std::unique_ptr<StatsTracker> make_stats() const override;
-};
-
-
-
-class StatsResetRegi : public SingleSwitchProgramInstance{
-public:
-    StatsResetRegi();
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-    StartInGripOrGameOption START_LOCATION;
-    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
-
-    PokemonBallSelectOption BALL_SELECT;
-    OCR::LanguageOCROption LANGUAGE;
-    IVCheckerFilterOption HP;
-    IVCheckerFilterOption ATTACK;
-    IVCheckerFilterOption DEFENSE;
-    IVCheckerFilterOption SPATK;
-    IVCheckerFilterOption SPDEF;
-    IVCheckerFilterOption SPEED;
-
-    EventNotificationOption NOTIFICATION_CATCH_SUCCESS;
-    EventNotificationOption NOTIFICATION_CATCH_FAILED;
-    EventNotificationsOption NOTIFICATIONS;
-};
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset.cpp
deleted file mode 100644
index 3a20deb45b..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset.cpp
+++ /dev/null
@@ -1,190 +0,0 @@
-/*  Stats Reset
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/Notifications/ProgramNotifications.h"
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
-#include "CommonFramework/Inference/BlackScreenDetector.h"
-#include "CommonFramework/Tools/StatsTracking.h"
-#include "NintendoSwitch/NintendoSwitch_Settings.h"
-#include "NintendoSwitch/FixedInterval.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonSwSh/PokemonSwSh_Settings.h"
-#include "PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
-#include "PokemonSwSh_StatsReset.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-StatsReset_Descriptor::StatsReset_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonSwSh:StatsReset",
-        STRING_POKEMON + " SwSh", "Stats Reset",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonSwSh/StatsReset.md",
-        "Repeatedly receive gift " + STRING_POKEMON + " until you get the stats you want.",
-        FeedbackType::REQUIRED,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-struct StatsReset_Descriptor::Stats : public StatsTracker{
-    Stats()
-        : attempts(m_stats["Attempts"])
-        , errors(m_stats["Errors"])
-        , matches(m_stats["Matches"])
-    {
-        m_display_order.emplace_back(Stat("Attempts"));
-        m_display_order.emplace_back(Stat("Errors"));
-        m_display_order.emplace_back(Stat("Matches"));
-    }
-
-    std::atomic<uint64_t>& attempts;
-    std::atomic<uint64_t>& errors;
-    std::atomic<uint64_t>& matches;
-};
-std::unique_ptr<StatsTracker> StatsReset_Descriptor::make_stats() const{
-    return std::unique_ptr<StatsTracker>(new Stats());
-}
-
-
-
-StatsReset::StatsReset()
-    : GO_HOME_WHEN_DONE(false)
-    , LANGUAGE(
-        "<b>Game Language:</b>",
-        IV_READER().languages(),
-        LockWhileRunning::LOCKED
-    )
-    , POKEMON(
-        "<b>Gift " + STRING_POKEMON + ":</b>",
-        {
-            {GiftPokemon::TypeNull, "type-null",    "Type: Null"},
-            {GiftPokemon::Cosmog,   "cosmog",       "Cosmog"},
-            {GiftPokemon::Poipole,  "poipole",      "Poipole"},
-        },
-        LockWhileRunning::LOCKED,
-        GiftPokemon::TypeNull
-    )
-    , HP("<b>HP:</b>")
-    , ATTACK("<b>Attack:</b>", IVCheckerFilter::NoGood)
-    , DEFENSE("<b>Defense:</b>")
-    , SPATK("<b>Sp. Atk:</b>")
-    , SPDEF("<b>Sp. Def:</b>")
-    , SPEED("<b>Speed:</b>")
-    , NOTIFICATION_PROGRAM_FINISH("Program Finished", true, true, ImageAttachmentMode::JPG)
-    , NOTIFICATIONS({
-        &NOTIFICATION_PROGRAM_FINISH,
-        &NOTIFICATION_ERROR_FATAL,
-    })
-{
-    PA_ADD_OPTION(START_LOCATION);
-    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
-
-    PA_ADD_OPTION(LANGUAGE);
-    PA_ADD_OPTION(POKEMON);
-    PA_ADD_OPTION(HP);
-    PA_ADD_OPTION(ATTACK);
-    PA_ADD_OPTION(DEFENSE);
-    PA_ADD_OPTION(SPATK);
-    PA_ADD_OPTION(SPDEF);
-    PA_ADD_OPTION(SPEED);
-
-    PA_ADD_OPTION(NOTIFICATIONS);
-}
-
-
-
-void StatsReset::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    if (START_LOCATION.start_in_grip_menu()){
-        grip_menu_connect_go_home(context);
-        resume_game_back_out(env.console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST, 200);
-    }else{
-        pbf_press_button(context, BUTTON_B, 5, 5);
-    }
-
-    StatsReset_Descriptor::Stats& stats = env.current_stats<StatsReset_Descriptor::Stats>();
-
-    VideoSnapshot screen;
-    while (true){
-        env.update_stats();
-
-        context.wait_for_all_requests();
-        {
-            BlackScreenOverWatcher detector;
-            int result = run_until(
-                env.console, context,
-                [this](BotBaseContext& context){
-                    if (POKEMON == GiftPokemon::TypeNull){
-                        pbf_mash_button(context, BUTTON_A, 10 * TICKS_PER_SECOND);
-                    }else{
-                        pbf_mash_button(context, BUTTON_A, 5 * TICKS_PER_SECOND);
-                    }
-                    pbf_mash_button(context, BUTTON_B, 20 * TICKS_PER_SECOND);
-                },
-                {{detector}}
-            );
-            if (result == 0){
-                env.log(STRING_POKEMON + " receive menu detected.", COLOR_PURPLE);
-            }else{
-                env.log(STRING_POKEMON + " receive menu timed out.", COLOR_RED);
-            }
-        }
-        stats.attempts++;
-
-        pbf_mash_button(context, BUTTON_B, 1 * TICKS_PER_SECOND);
-
-        pbf_press_button(context, BUTTON_X, 10, GameSettings::instance().OVERWORLD_TO_MENU_DELAY);
-        ssf_press_dpad2(context, DPAD_RIGHT, GameSettings::instance().BOX_SCROLL_DELAY, 10);
-        ssf_press_button2(context, BUTTON_A, GameSettings::instance().MENU_TO_POKEMON_DELAY, 10);
-        ssf_press_button2(context, BUTTON_R, GameSettings::instance().POKEMON_TO_BOX_DELAY, 10);
-        context.wait_for_all_requests();
-
-        {
-            IVCheckerReaderScope reader(env.console, LANGUAGE);
-            screen = env.console.video().snapshot();
-            IVCheckerReader::Results results = reader.read(env.console, screen);
-            bool ok = true;
-            ok &= HP.matches(stats.errors, results.hp);
-            ok &= ATTACK.matches(stats.errors, results.attack);
-            ok &= DEFENSE.matches(stats.errors, results.defense);
-            ok &= SPATK.matches(stats.errors, results.spatk);
-            ok &= SPDEF.matches(stats.errors, results.spdef);
-            ok &= SPEED.matches(stats.errors, results.speed);
-            if (ok){
-                break;
-            }
-        }
-
-        //  Add a little extra wait time since correctness matters here.
-        pbf_press_button(context, BUTTON_HOME, 10, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE);
-
-        reset_game_from_home_with_inference(
-            env.console, context,
-            ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST
-        );
-    }
-
-    stats.matches++;
-    env.update_stats();
-    env.log("Result Found!", COLOR_BLUE);
-
-    pbf_wait(context, 5 * TICKS_PER_SECOND);
-    pbf_press_button(context, BUTTON_CAPTURE, 2 * TICKS_PER_SECOND, 5 * TICKS_PER_SECOND);
-
-    send_program_finished_notification(
-        env, NOTIFICATION_PROGRAM_FINISH,
-        "Found a match!",
-        screen, false
-    );
-    GO_HOME_WHEN_DONE.run_end_of_program(context);
-}
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset.h b/SerialPrograms/Source/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset.h
deleted file mode 100644
index f95dcc13b2..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*  Stats Reset
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_StatsReset_H
-#define PokemonAutomation_PokemonSwSh_StatsReset_H
-
-#include "Common/Cpp/Options/EnumDropdownOption.h"
-#include "CommonFramework/Options/ScreenshotFormatOption.h"
-#include "CommonFramework/Options/LanguageOCROption.h"
-#include "CommonFramework/Notifications/EventNotificationsTable.h"
-#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
-#include "NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-#include "Pokemon/Options/Pokemon_IVCheckerOption.h"
-#include "PokemonSwSh/Inference/PokemonSwSh_IVCheckerReader.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-class StatsReset_Descriptor : public SingleSwitchProgramDescriptor{
-public:
-    StatsReset_Descriptor();
-
-    struct Stats;
-    virtual std::unique_ptr<StatsTracker> make_stats() const override;
-};
-
-
-
-class StatsReset : public SingleSwitchProgramInstance{
-public:
-    StatsReset();
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-    StartInGripOrGameOption START_LOCATION;
-    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
-
-    OCR::LanguageOCROption LANGUAGE;
-
-    enum class GiftPokemon{
-        TypeNull,
-        Cosmog,
-        Poipole,
-    };
-    EnumDropdownOption<GiftPokemon> POKEMON;
-
-    IVCheckerFilterOption HP;
-    IVCheckerFilterOption ATTACK;
-    IVCheckerFilterOption DEFENSE;
-    IVCheckerFilterOption SPATK;
-    IVCheckerFilterOption SPDEF;
-    IVCheckerFilterOption SPEED;
-
-    EventNotificationOption NOTIFICATION_PROGRAM_FINISH;
-    EventNotificationsOption NOTIFICATIONS;
-};
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_OverworldMovement.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_OverworldMovement.cpp
deleted file mode 100644
index ee93793e0a..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_OverworldMovement.cpp
+++ /dev/null
@@ -1,97 +0,0 @@
-/*  Overworld Movement
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "PokemonSwSh_OverworldMovement.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-void move_in_circle_up(BotBaseContext& context, bool counter_clockwise){
-//    cout << "up" << endl;
-    if (counter_clockwise){
-        pbf_move_left_joystick(context, 255, 128, 16, 0);
-        pbf_move_left_joystick(context, 255, 0, 16, 0);
-        pbf_move_left_joystick(context, 128, 0, 16, 0);
-        pbf_move_left_joystick(context, 0, 0, 16, 0);
-        pbf_move_left_joystick(context, 0, 128, 16, 0);
-        pbf_move_left_joystick(context, 0, 255, 16, 0);
-        pbf_move_left_joystick(context, 128, 255, 16, 0);
-        pbf_move_left_joystick(context, 255, 255, 16, 0);
-    }else{
-        pbf_move_left_joystick(context, 0, 128, 16, 0);
-        pbf_move_left_joystick(context, 0, 0, 16, 0);
-        pbf_move_left_joystick(context, 128, 0, 16, 0);
-        pbf_move_left_joystick(context, 255, 0, 16, 0);
-        pbf_move_left_joystick(context, 255, 128, 16, 0);
-        pbf_move_left_joystick(context, 255, 255, 16, 0);
-        pbf_move_left_joystick(context, 128, 255, 16, 0);
-        pbf_move_left_joystick(context, 0, 255, 16, 0);
-    }
-}
-void move_in_circle_down(BotBaseContext& context, bool counter_clockwise){
-    if (counter_clockwise){
-        pbf_move_left_joystick(context, 0, 128, 16, 0);
-        pbf_move_left_joystick(context, 0, 255, 16, 0);
-        pbf_move_left_joystick(context, 128, 255, 16, 0);
-        pbf_move_left_joystick(context, 255, 255, 16, 0);
-        pbf_move_left_joystick(context, 255, 128, 16, 0);
-        pbf_move_left_joystick(context, 255, 0, 24, 0);
-        pbf_move_left_joystick(context, 128, 0, 24, 0);
-        pbf_move_left_joystick(context, 0, 0, 24, 0);
-    }else{
-        pbf_move_left_joystick(context, 255, 128, 16, 0);
-        pbf_move_left_joystick(context, 255, 255, 16, 0);
-        pbf_move_left_joystick(context, 128, 255, 16, 0);
-        pbf_move_left_joystick(context, 0, 255, 16, 0);
-        pbf_move_left_joystick(context, 0, 128, 16, 0);
-        pbf_move_left_joystick(context, 0, 0, 24, 0);
-        pbf_move_left_joystick(context, 128, 0, 24, 0);
-        pbf_move_left_joystick(context, 255, 0, 24, 0);
-    }
-}
-void circle_in_place(BotBaseContext& context, bool counter_clockwise){
-    if (counter_clockwise){
-        pbf_move_left_joystick(context, 0, 128, 64, 0);     //  Correct for bias.
-        pbf_move_left_joystick(context, 128, 255, 32, 0);
-        pbf_move_left_joystick(context, 255, 255, 32, 0);
-        pbf_move_left_joystick(context, 255, 128, 32, 0);
-        pbf_move_left_joystick(context, 255, 0, 32, 0);
-        pbf_move_left_joystick(context, 128, 0, 32, 0);
-        pbf_move_left_joystick(context, 0, 0, 32, 0);
-        pbf_move_left_joystick(context, 0, 128, 32, 0);
-        pbf_move_left_joystick(context, 0, 255, 32, 0);
-        pbf_move_left_joystick(context, 255, 128, 16, 0);   //  Correct for bias.
-    }else{
-        pbf_move_left_joystick(context, 255, 128, 64, 0);   //  Correct for bias.
-        pbf_move_left_joystick(context, 128, 255, 32, 0);
-        pbf_move_left_joystick(context, 0, 255, 32, 0);
-        pbf_move_left_joystick(context, 0, 128, 32, 0);
-        pbf_move_left_joystick(context, 0, 0, 32, 0);
-        pbf_move_left_joystick(context, 128, 0, 32, 0);
-        pbf_move_left_joystick(context, 255, 0, 32, 0);
-        pbf_move_left_joystick(context, 255, 128, 32, 0);
-        pbf_move_left_joystick(context, 255, 255, 32, 0);
-        pbf_move_left_joystick(context, 0, 128, 16, 0);     //  Correct for bias.
-    }
-}
-void move_in_line(BotBaseContext& context, bool horizontal){
-    if (horizontal){
-        pbf_move_left_joystick(context, 0, 128, 128, 32);
-        pbf_move_left_joystick(context, 255, 128, 128, 32);
-    }else{
-        pbf_move_left_joystick(context, 128, 255, 128, 32);
-        pbf_move_left_joystick(context, 128, 0, 128, 32);
-    }
-}
-
-
-}
-}
-}
-
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_OverworldMovement.h b/SerialPrograms/Source/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_OverworldMovement.h
deleted file mode 100644
index c971d10313..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_OverworldMovement.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*  Overworld Movement
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_OverworldMovement_H
-#define PokemonAutomation_PokemonSwSh_OverworldMovement_H
-
-#include "ClientSource/Connection/BotBase.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-void move_in_circle_up(BotBaseContext& context, bool counter_clockwise);
-void move_in_circle_down(BotBaseContext& context, bool counter_clockwise);
-void circle_in_place(BotBaseContext& context, bool counter_clockwise);
-void move_in_line(BotBaseContext& context, bool horizontal);
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_OverworldTrajectory.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_OverworldTrajectory.cpp
deleted file mode 100644
index e91b34156b..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_OverworldTrajectory.cpp
+++ /dev/null
@@ -1,98 +0,0 @@
-/*  Overworld Trajectory
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <algorithm>
-#include <cmath>
-#include "PokemonSwSh_OverworldTrajectory.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-
-const Trajectory TRAJECTORY_TABLE[8][6] = {
-    {{400,128,  0},{420,160,  0},{420,190,  0},{480,208,  0},{480,208,  0},{480,208,  0},},
-    {{210,128,  0},{220,164,  0},{250,200,  0},{280,208,  0},{300,209,  0},{320,209,  0},},
-    {{120,128,  0},{120,192,  0},{140,209,  0},{180,224,  0},{220,224,  0},{260,232,  0},},
-    {{ 60,128,  0},{ 65,224,  0},{ 95,255, 32},{125,255, 48},{160,255, 48},{200,255, 48},},
-    {{  0,128,128},{ 40,255,110},{ 70,255,105},{100,255,100},{130,255, 95},{160,255, 90},},
-    {{ 35,128,255},{ 45,255,255},{ 70,255,170},{ 90,255,160},{115,255,140},{140,255,128},},
-    {{ 55,128,255},{ 60,192,255},{ 75,255,255},{ 90,255,192},{110,255,176},{135,255,144},},
-    {{ 75,128,255},{ 80,160,255},{ 85,216,255},{ 95,255,224},{115,255,192},{130,255,176},},
-};
-Trajectory get_trajectory_int(int delta_x, int delta_y){
-    delta_x = std::max(delta_x, -5);
-    delta_x = std::min(delta_x, +5);
-    delta_y = std::max(delta_y, -4);
-    delta_y = std::min(delta_y, +3);
-
-    if (delta_x < 0){
-        Trajectory entry = get_trajectory_int(-delta_x, delta_y);
-        entry.joystick_x = (uint8_t)(256 - entry.joystick_x);
-        return entry;
-    }
-
-    return TRAJECTORY_TABLE[delta_y + 4][delta_x];
-}
-Trajectory get_trajectory_float(double delta_x, double delta_y){
-    delta_x *= 10;
-    delta_y *= 10;
-
-    int int_x = (int)std::floor(delta_x);
-    int int_y = (int)std::floor(delta_y);
-
-    double frac_x = delta_x - int_x;
-    double frac_y = delta_y - int_y;
-
-    Trajectory corner11 = get_trajectory_int(int_x, int_y);
-    Trajectory corner01 = get_trajectory_int(int_x + 1, int_y);
-    Trajectory corner10 = get_trajectory_int(int_x, int_y + 1);
-    Trajectory corner00 = get_trajectory_int(int_x + 1, int_y + 1);
-
-    double top_x = corner11.joystick_x * (1.0 - frac_x) + corner01.joystick_x * frac_x;
-    double bot_x = corner10.joystick_x * (1.0 - frac_x) + corner00.joystick_x * frac_x;
-    double x = top_x * (1.0 - frac_y) + bot_x * frac_y;
-//    cout << "top_x = " << top_x << endl;
-//    cout << "bot_x = " << bot_x << endl;
-//    cout << "x = " << x << endl;
-
-    double top_y = corner11.joystick_y * (1.0 - frac_y) + corner10.joystick_y * frac_y;
-    double bot_y = corner01.joystick_y * (1.0 - frac_y) + corner00.joystick_y * frac_y;
-    double y = top_y * (1.0 - frac_x) + bot_y * frac_x;
-
-    double top_d = corner11.distance_in_ticks * (1.0 - frac_x) + corner01.distance_in_ticks * frac_x;
-    double bot_d = corner10.distance_in_ticks * (1.0 - frac_x) + corner00.distance_in_ticks * frac_x;
-    double d = top_d * (1.0 - frac_y) + bot_d * frac_y;
-
-    x -= 128;
-    y -= 128;
-    double scale = std::max(std::abs(x), std::abs(y));
-    if (scale == 0){
-        x = 128;
-        y = 128;
-    }else{
-        scale = 128 / scale;
-        x *= scale;
-        y *= scale;
-    }
-    x += 128;
-    y += 128;
-
-    d = std::max(d, 0.0);
-    d = std::min(d, 65535.);
-    x = std::max(x, 0.0);
-    y = std::max(y, 0.0);
-    x = std::min(x, 255.);
-    y = std::min(y, 255.);
-
-    return Trajectory{(uint16_t)d, (uint8_t)x, (uint8_t)y};
-}
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_OverworldTrajectory.h b/SerialPrograms/Source/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_OverworldTrajectory.h
deleted file mode 100644
index 071cd4451d..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_OverworldTrajectory.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*  Overworld Trajectory
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_OverworldTrajectory_H
-#define PokemonAutomation_PokemonSwSh_OverworldTrajectory_H
-
-#include <stdint.h>
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-struct Trajectory{
-    uint16_t distance_in_ticks;
-    uint8_t joystick_x;
-    uint8_t joystick_y;
-};
-
-Trajectory get_trajectory_float(double delta_x, double delta_y);
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_OverworldTrigger.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_OverworldTrigger.cpp
deleted file mode 100644
index 1c239984c2..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_OverworldTrigger.cpp
+++ /dev/null
@@ -1,105 +0,0 @@
-/*  Overworld Trigger
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Compiler.h"
-#include "Common/Cpp/Exceptions.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "PokemonSwSh_OverworldMovement.h"
-#include "PokemonSwSh_OverworldTrigger.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-OverworldTrigger::OverworldTrigger(OverworldTargetTracker& target_tracker)
-    : m_target_tracker(target_tracker)
-{}
-void OverworldTrigger::whistle(BotBaseContext& context, bool rotate){
-    context.wait_for_all_requests();
-    m_target_tracker.set_stop_on_target(false);
-
-    if (rotate){
-        pbf_move_right_joystick(context, 192, 255, 50, 70);
-    }
-    pbf_press_button(context, BUTTON_LCLICK, 5, 0);
-    pbf_mash_button(context, BUTTON_B, 120);
-
-    context.wait_for_all_requests();
-    m_target_tracker.set_stop_on_target(true);
-    if (m_target_tracker.has_good_target()){
-        throw OperationCancelledException();
-    }
-
-    pbf_mash_button(context, BUTTON_B, 40);
-
-    context.wait_for_all_requests();
-    m_target_tracker.set_stop_on_target(false);
-}
-
-
-void OverworldTrigger_Whistle::run(BotBaseContext& context){
-    whistle(context, !m_first_after_battle);
-    m_first_after_battle = false;
-}
-
-
-OverworldTrigger_WhistleStaticAction::OverworldTrigger_WhistleStaticAction(
-    OverworldTargetTracker& target_tracker,
-    bool whistle_first,
-    size_t whistle_count,
-    size_t action_count
-)
-    : OverworldTrigger(target_tracker)
-    , m_whistle_first(whistle_first)
-    , m_whistle_count(whistle_count)
-    , m_action_count(action_count)
-{}
-void OverworldTrigger_WhistleStaticAction::run(BotBaseContext& context){
-    if (m_whistle_first){
-        whistle_loop(context);
-        action_loop(context);
-    }else{
-        action_loop(context);
-        whistle_loop(context);
-    }
-}
-void OverworldTrigger_WhistleStaticAction::whistle_loop(BotBaseContext& context){
-    for (size_t c = 0; c < m_whistle_count; c++){
-        whistle(context, !m_first_after_battle);
-        m_first_after_battle = false;
-    }
-}
-void OverworldTrigger_WhistleStaticAction::action_loop(BotBaseContext& context){
-    m_target_tracker.set_stop_on_target(true);
-    context.wait_for_all_requests();
-    for (size_t c = 0; c < m_action_count; c++){
-        action(context);
-        m_first_after_battle = false;
-    }
-    context.wait_for_all_requests();
-    m_target_tracker.set_stop_on_target(false);
-}
-
-
-void OverworldTrigger_WhistleCircle::action(BotBaseContext& context){
-    circle_in_place(context, rand() % 2);
-}
-void OverworldTrigger_WhistleHorizontal::action(BotBaseContext& context){
-    move_in_line(context, true);
-}
-void OverworldTrigger_WhistleVertical::action(BotBaseContext& context){
-    move_in_line(context, false);
-}
-
-
-
-}
-}
-}
-
-
-
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_OverworldTrigger.h b/SerialPrograms/Source/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_OverworldTrigger.h
deleted file mode 100644
index 2e5e190436..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_OverworldTrigger.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/*  Overworld Trigger
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_OverworldTrigger_H
-#define PokemonAutomation_PokemonSwSh_OverworldTrigger_H
-
-#include "ClientSource/Connection/BotBase.h"
-#include "PokemonSwSh_OverworldTargetTracker.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-class OverworldTrigger{
-public:
-    OverworldTrigger(OverworldTargetTracker& target_tracker);
-    virtual ~OverworldTrigger() = default;
-
-    virtual void run(BotBaseContext& context) = 0;
-
-protected:
-    void whistle(BotBaseContext& context, bool rotate);
-
-protected:
-    OverworldTargetTracker& m_target_tracker;
-};
-
-
-
-class OverworldTrigger_Whistle : public OverworldTrigger{
-public:
-    using OverworldTrigger::OverworldTrigger;
-    virtual void run(BotBaseContext& context) override;
-
-private:
-    bool m_first_after_battle = true;
-};
-
-
-class OverworldTrigger_WhistleStaticAction : public OverworldTrigger{
-public:
-    OverworldTrigger_WhistleStaticAction(
-        OverworldTargetTracker& target_tracker,
-        bool whistle_first,
-        size_t whistle_count,
-        size_t action_count
-    );
-    virtual void run(BotBaseContext& context) override;
-
-protected:
-    virtual void action(BotBaseContext& context) = 0;
-
-private:
-    void whistle_loop(BotBaseContext& context);
-    void action_loop(BotBaseContext& context);
-
-private:
-    bool m_whistle_first;
-    size_t m_whistle_count;
-    size_t m_action_count;
-    bool m_first_after_battle = true;
-};
-
-
-class OverworldTrigger_WhistleCircle : public OverworldTrigger_WhistleStaticAction{
-public:
-    using OverworldTrigger_WhistleStaticAction::OverworldTrigger_WhistleStaticAction;
-    virtual void action(BotBaseContext& context) override;
-};
-
-
-class OverworldTrigger_WhistleHorizontal : public OverworldTrigger_WhistleStaticAction{
-public:
-    using OverworldTrigger_WhistleStaticAction::OverworldTrigger_WhistleStaticAction;
-    virtual void action(BotBaseContext& context) override;
-};
-
-
-class OverworldTrigger_WhistleVertical : public OverworldTrigger_WhistleStaticAction{
-public:
-    using OverworldTrigger_WhistleStaticAction::OverworldTrigger_WhistleStaticAction;
-    virtual void action(BotBaseContext& context) override;
-};
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_ShinyHuntAutonomous-Overworld.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_ShinyHuntAutonomous-Overworld.cpp
deleted file mode 100644
index 95fc70f2b3..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_ShinyHuntAutonomous-Overworld.cpp
+++ /dev/null
@@ -1,457 +0,0 @@
-/*  Shiny Hunt Autonomous - Overworld
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <cmath>
-#include "Common/Cpp/PrettyPrint.h"
-#include "CommonFramework/Notifications/ProgramNotifications.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Device.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "NintendoSwitch/NintendoSwitch_Settings.h"
-#include "PokemonSwSh/PokemonSwSh_Settings.h"
-#include "PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.h"
-#include "PokemonSwSh/ShinyHuntTracker.h"
-#include "PokemonSwSh/Inference/Battles/PokemonSwSh_StartBattleDetector.h"
-#include "PokemonSwSh/Inference/Battles/PokemonSwSh_BattleMenuDetector.h"
-#include "PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
-#include "PokemonSwSh/Programs/PokemonSwSh_EncounterHandler.h"
-#include "PokemonSwSh_OverworldMovement.h"
-#include "PokemonSwSh_OverworldTrajectory.h"
-#include "PokemonSwSh_OverworldTrigger.h"
-#include "PokemonSwSh_ShinyHuntAutonomous-Overworld.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-ShinyHuntAutonomousOverworld_Descriptor::ShinyHuntAutonomousOverworld_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonSwSh:ShinyHuntAutonomousOverworld",
-        STRING_POKEMON + " SwSh", "Shiny Hunt Autonomous - Overworld",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonSwSh/ShinyHuntAutonomous-Overworld.md",
-        "Automatically shiny hunt overworld " + STRING_POKEMON + " with video feedback.",
-        FeedbackType::REQUIRED,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-struct ShinyHuntAutonomousOverworld_Descriptor::Stats : public ShinyHuntTracker{
-    Stats()
-        : ShinyHuntTracker(true)
-        , m_resets(m_stats["Resets"])
-    {
-        m_display_order.insert(m_display_order.begin() + 2, Stat("Resets"));
-        m_aliases["Unexpected Battles"] = "Errors";
-    }
-    std::atomic<uint64_t>& m_resets;
-};
-std::unique_ptr<StatsTracker> ShinyHuntAutonomousOverworld_Descriptor::make_stats() const{
-    return std::unique_ptr<StatsTracker>(new Stats());
-}
-
-
-
-ShinyHuntAutonomousOverworld::ShinyHuntAutonomousOverworld()
-    : GO_HOME_WHEN_DONE(false)
-    , TIME_ROLLBACK_HOURS(
-        "<b>Time Rollback (in hours):</b><br>Periodically roll back the time to keep the weather the same. If set to zero, this feature is disabled.",
-        LockWhileRunning::LOCKED,
-        1, 0, 11
-    )
-    , MARK_OFFSET(
-        "<b>Mark Offset:</b><br>Aim this far below the bottom of the exclamation/question mark. 1.0 is the height of the mark. "
-        "Increase this value when the " + STRING_POKEMON + " are large.",
-        LockWhileRunning::LOCKED,
-        0.5, 0, 20
-    )
-    , MARK_PRIORITY(
-        "<b>Mark Priority:</b><br>Favor exclamation marks or question marks?",
-        {
-            {MarkPriority::EXCLAMATION_ONLY,        "exclamation-only",         "Exclamation Marks Only (Ignore Question Marks)"},
-            {MarkPriority::PRIORITIZE_EXCLAMATION,  "prioritize-exclamation",   "Prioritize Exclamation Marks"},
-            {MarkPriority::NO_PREFERENCE,           "no-preference",            "No Preference"},
-            {MarkPriority::PRIORITIZE_QUESTION,     "prioritize-question",      "Prioritize Question Marks"},
-            {MarkPriority::QUESTION_ONLY,           "question-only",            "Question Marks Only (Ignore Exclamation Marks)"},
-        },
-        LockWhileRunning::LOCKED,
-        MarkPriority::PRIORITIZE_EXCLAMATION
-    )
-    , TRIGGER_METHOD(
-        "<b>Trigger Method:</b><br>How to trigger an overworld reaction mark?",
-        {
-            {TriggerMethod::WhistleOnly,            "whistle-only",         "Whistle Only"},
-            {TriggerMethod::Whistle3Circle1,        "whistle3-circle1",     "Whistle 3 times, then circle once."},
-            {TriggerMethod::Circle3Whistle3,        "circle3-whistle3",     "Circle 3 times, then whistle 3 times."},
-            {TriggerMethod::CircleOnly,             "circle-only",          "Circle Only"},
-            {TriggerMethod::Horizontal,             "horizontal",           "Horizontal Line Only"},
-            {TriggerMethod::Whistle3Horizontal1,    "whistle3-horizontal1", "Whistle 3 times, then do horizontal line once."},
-            {TriggerMethod::Horizontal3Whistle3,    "horizontal3-whistle3", "Do horizontal line 3 times, then whistle 3 times."},
-            {TriggerMethod::Vertical,               "vertical",             "Vertical Line Only"},
-            {TriggerMethod::Whistle3Vertical1,      "whistle3-vertical1",   "Whistle 3 times, then do vertical line once."},
-            {TriggerMethod::Vertical3Whistle3,      "vertical3-whistle3",   "Do vertical line 3 times, then whistle 3 times."},
-        },
-        LockWhileRunning::LOCKED,
-        TriggerMethod::Whistle3Circle1
-    )
-    , MAX_MOVE_DURATION(
-        "<b>Maximum Move Duration:</b><br>Do not move in the same direction for more than this long."
-        " If you set this too high, you may wander too far from the grassy area.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "200"
-    )
-    , MAX_TARGET_ALPHA(
-        "<b>Max Target Alpha:</b><br>Ignore all targets with alpha larger than this. Set to zero to ignore all marks.",
-        LockWhileRunning::LOCKED,
-        70000, 0
-    )
-    , ENCOUNTER_BOT_OPTIONS(true, true)
-    , NOTIFICATIONS({
-        &ENCOUNTER_BOT_OPTIONS.NOTIFICATION_NONSHINY,
-        &ENCOUNTER_BOT_OPTIONS.NOTIFICATION_SHINY,
-        &ENCOUNTER_BOT_OPTIONS.NOTIFICATION_CATCH_SUCCESS,
-        &ENCOUNTER_BOT_OPTIONS.NOTIFICATION_CATCH_FAILED,
-        &NOTIFICATION_PROGRAM_FINISH,
-        &NOTIFICATION_ERROR_FATAL,
-    })
-    , m_advanced_options(
-        "<font size=4><b>Advanced Options:</b> You should not need to touch anything below here.</font>"
-    )
-    , WATCHDOG_TIMER(
-        "<b>Watchdog Timer:</b><br>Reset the game if you go this long without any encounters.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "60 * TICKS_PER_SECOND"
-    )
-    , EXIT_BATTLE_TIMEOUT(
-        "<b>Exit Battle Timeout:</b><br>After running, wait this long to return to overworld.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "10 * TICKS_PER_SECOND"
-    )
-    , TARGET_CIRCLING(
-        "<b>Target Circling:</b><br>After moving towards a " + STRING_POKEMON + ", make a circle."
-        " This increases the chance of encountering the " + STRING_POKEMON + " if it has moved or if the trajectory missed.",
-        LockWhileRunning::LOCKED,
-        true
-    )
-{
-    PA_ADD_OPTION(START_LOCATION);
-    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
-    PA_ADD_OPTION(TIME_ROLLBACK_HOURS);
-
-    PA_ADD_OPTION(LANGUAGE);
-    PA_ADD_OPTION(MARK_OFFSET);
-    PA_ADD_OPTION(MARK_PRIORITY);
-    PA_ADD_OPTION(TRIGGER_METHOD);
-    PA_ADD_OPTION(MAX_MOVE_DURATION);
-    PA_ADD_OPTION(MAX_TARGET_ALPHA);
-
-    PA_ADD_OPTION(ENCOUNTER_BOT_OPTIONS);
-    PA_ADD_OPTION(NOTIFICATIONS);
-
-    PA_ADD_STATIC(m_advanced_options);
-    PA_ADD_OPTION(WATCHDOG_TIMER);
-    PA_ADD_OPTION(EXIT_BATTLE_TIMEOUT);
-    PA_ADD_OPTION(TARGET_CIRCLING);
-}
-
-
-
-
-bool ShinyHuntAutonomousOverworld::find_encounter(
-    ConsoleHandle& console, BotBaseContext& context,
-    ShinyHuntAutonomousOverworld_Descriptor::Stats& stats,
-    WallClock expiration
-) const{
-    OverlayBoxScope self(
-        console,
-        {
-            OverworldTargetTracker::OVERWORLD_CENTER_X - 0.02,
-            OverworldTargetTracker::OVERWORLD_CENTER_Y - 0.05,
-            0.04,
-            0.1
-        },
-        COLOR_CYAN
-    );
-
-    OverworldTargetTracker target_tracker(
-        console, console,
-        std::chrono::milliseconds(1000),
-        MARK_OFFSET,
-        MARK_PRIORITY,
-        MAX_TARGET_ALPHA
-    );
-
-    std::unique_ptr<OverworldTrigger> trigger;
-    switch (TRIGGER_METHOD){
-    case TriggerMethod::WhistleOnly:
-        trigger.reset(new OverworldTrigger_Whistle(target_tracker));
-        break;
-    case TriggerMethod::Whistle3Circle1:
-        trigger.reset(new OverworldTrigger_WhistleCircle(target_tracker, true, 3, 1));
-        break;
-    case TriggerMethod::Circle3Whistle3:
-        trigger.reset(new OverworldTrigger_WhistleCircle(target_tracker, false, 3, 3));
-        break;
-    case TriggerMethod::CircleOnly:
-        trigger.reset(new OverworldTrigger_WhistleCircle(target_tracker, false, 0, 1));
-        break;
-    case TriggerMethod::Horizontal:
-        trigger.reset(new OverworldTrigger_WhistleHorizontal(target_tracker, false, 0, 1));
-        break;
-    case TriggerMethod::Whistle3Horizontal1:
-        trigger.reset(new OverworldTrigger_WhistleHorizontal(target_tracker, true, 3, 1));
-        break;
-    case TriggerMethod::Horizontal3Whistle3:
-        trigger.reset(new OverworldTrigger_WhistleHorizontal(target_tracker, false, 3, 3));
-        break;
-    case TriggerMethod::Vertical:
-        trigger.reset(new OverworldTrigger_WhistleVertical(target_tracker, false, 0, 1));
-        break;
-    case TriggerMethod::Whistle3Vertical1:
-        trigger.reset(new OverworldTrigger_WhistleVertical(target_tracker, true, 3, 1));
-        break;
-    case TriggerMethod::Vertical3Whistle3:
-        trigger.reset(new OverworldTrigger_WhistleVertical(target_tracker, false, 3, 3));
-        break;
-    }
-
-    while (true){
-        //  Time expired.
-        if (current_time() > expiration){
-            return false;
-        }
-
-        target_tracker.clear_detections();
-
-        //  Run trigger.
-        {
-            StandardBattleMenuWatcher battle_menu_detector(false);
-            StartBattleWatcher start_battle_detector;
-
-            int result = run_until(
-                console, context,
-                [&](BotBaseContext& context){
-                    trigger->run(context);
-                },
-                {
-                    {battle_menu_detector},
-                    {start_battle_detector},
-                    {target_tracker},
-                }
-            );
-
-            switch (result){
-            case 0:
-                console.log("Unexpected Battle.", COLOR_RED);
-                return false;
-            case 1:
-                console.log("Battle started!");
-                return true;
-            }
-        }
-
-        std::pair<double, OverworldTarget> target = target_tracker.best_target();
-        target_tracker.clear_detections();
-
-//        env.log("target: " + std::to_string(target.first));
-
-        if (target.first < 0){
-            console.log("No targets found.", COLOR_ORANGE);
-            continue;
-        }
-        if (target.first > MAX_TARGET_ALPHA){
-            console.log(
-                std::string("Target too Weak: ") +
-                (target.second.mark == OverworldMark::EXCLAMATION_MARK ? "Exclamation" : "Question") +
-                " at [" +
-                tostr_default(target.second.delta_x) + " , " +
-                tostr_default(-target.second.delta_y) + "], alpha = " +
-                tostr_default(target.first),
-                COLOR_ORANGE
-            );
-            continue;
-        }
-
-        if (charge_at_target(console, context, target)){
-            return true;
-        }
-    }
-}
-
-
-bool ShinyHuntAutonomousOverworld::charge_at_target(
-    ConsoleHandle& console, BotBaseContext& context,
-    const std::pair<double, OverworldTarget>& target
-) const{
-    OverlayBoxScope target_box(console, target.second.box, COLOR_YELLOW);
-    console.log(
-        std::string("Best Target: ") +
-        (target.second.mark == OverworldMark::EXCLAMATION_MARK ? "Exclamation" : "Question") +
-        " at [" +
-        tostr_default(target.second.delta_x) + " , " +
-        tostr_default(-target.second.delta_y) + "], alpha = " +
-        tostr_default(target.first),
-        COLOR_PURPLE
-    );
-
-    const Trajectory& trajectory = target.second.trajectory;
-    double angle = std::atan2(
-        (double)trajectory.joystick_y - 128,
-        (double)trajectory.joystick_x - 128
-    ) * 57.295779513082320877;
-    console.log(
-        "Trajectory: Distance = " + std::to_string(trajectory.distance_in_ticks) +
-        ", Direction = " + tostr_default(-angle) + " degrees"
-    );
-
-    int duration = trajectory.distance_in_ticks + 16;
-    if (duration > (int)MAX_MOVE_DURATION){
-        duration = MAX_MOVE_DURATION;
-    }
-
-
-    StandardBattleMenuWatcher battle_menu_detector(false);
-    StartBattleWatcher start_battle_detector;
-    OverworldTargetTracker target_tracker(
-        console, console,
-        std::chrono::milliseconds(1000),
-        MARK_OFFSET,
-        MARK_PRIORITY,
-        MAX_TARGET_ALPHA
-    );
-
-    int result = run_until(
-        console, context,
-        [&](BotBaseContext& context){
-            //  Move to target.
-            pbf_move_left_joystick(
-                context,
-                trajectory.joystick_x,
-                trajectory.joystick_y,
-                (uint16_t)duration, 0
-            );
-
-            //  Circle Maneuver
-            if (TARGET_CIRCLING){
-                if (trajectory.joystick_y < 64 &&
-                    64 <= trajectory.joystick_x && trajectory.joystick_x <= 192
-                ){
-                    move_in_circle_up(context, trajectory.joystick_x > 128);
-                }else{
-                    move_in_circle_down(context, trajectory.joystick_x <= 128);
-                }
-            }
-        },
-        {
-            {battle_menu_detector},
-            {start_battle_detector},
-            {target_tracker},
-        }
-    );
-
-    switch (result){
-    case 0:
-        console.log("Unexpected Battle.", COLOR_RED);
-        return true;
-    case 1:
-        console.log("Battle started!");
-        return true;
-    default:
-        return false;
-    }
-}
-
-
-
-
-
-
-void ShinyHuntAutonomousOverworld::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    srand((unsigned)time(nullptr));
-
-    if (START_LOCATION.start_in_grip_menu()){
-        grip_menu_connect_go_home(context);
-        resume_game_back_out(env.console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST, 200);
-    }else{
-        pbf_press_button(context, BUTTON_B, 5, 5);
-    }
-    pbf_move_right_joystick(context, 128, 255, TICKS_PER_SECOND, 0);
-
-    const std::chrono::milliseconds TIMEOUT((uint64_t)WATCHDOG_TIMER * 1000 / TICKS_PER_SECOND);
-    const uint32_t PERIOD = (uint32_t)TIME_ROLLBACK_HOURS * 3600 * TICKS_PER_SECOND;
-    uint32_t last_touch = system_clock(context);
-
-    ShinyHuntAutonomousOverworld_Descriptor::Stats& stats = env.current_stats<ShinyHuntAutonomousOverworld_Descriptor::Stats>();
-    env.update_stats();
-
-    StandardEncounterHandler handler(
-        env, env.console, context,
-        LANGUAGE,
-        ENCOUNTER_BOT_OPTIONS,
-        stats
-    );
-
-    //  Encounter Loop
-    auto last = current_time();
-    while (true){
-        //  Touch the date.
-        if (TIME_ROLLBACK_HOURS > 0 && system_clock(context) - last_touch >= PERIOD){
-            pbf_press_button(context, BUTTON_HOME, 10, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE);
-            rollback_hours_from_home(context, TIME_ROLLBACK_HOURS, ConsoleSettings::instance().SETTINGS_TO_HOME_DELAY);
-            resume_game_no_interact(env.console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST);
-            last_touch += PERIOD;
-        }
-
-//        cout << "TOLERATE_SYSTEM_UPDATE_MENU_FAST = " << TOLERATE_SYSTEM_UPDATE_MENU_FAST << endl;
-
-        auto now = current_time();
-        if (now - last > TIMEOUT){
-            pbf_press_button(context, BUTTON_HOME, 10, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE);
-            reset_game_from_home_with_inference(
-                env.console, context,
-                ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST
-            );
-            stats.m_resets++;
-            last = current_time();
-            continue;
-        }
-
-        context.wait_for_all_requests();
-
-        bool battle = find_encounter(env.console, context, stats, last + TIMEOUT);
-        if (!battle){
-            continue;
-        }
-
-        //  Detect shiny.
-        ShinyDetectionResult result = detect_shiny_battle(
-            env.console, context,
-            SHINY_BATTLE_REGULAR,
-            std::chrono::seconds(30)
-        );
-//        shininess = ShinyDetection::SQUARE_SHINY;
-
-        bool stop = handler.handle_standard_encounter_end_battle(result, EXIT_BATTLE_TIMEOUT);
-        if (stop){
-            break;
-        }
-
-        last = current_time();
-    }
-
-    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
-    GO_HOME_WHEN_DONE.run_end_of_program(context);
-}
-
-
-
-}
-}
-}
-
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/PokemonSwSh_BasicCatcher.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/PokemonSwSh_BasicCatcher.cpp
deleted file mode 100644
index 8ff407ac66..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/PokemonSwSh_BasicCatcher.cpp
+++ /dev/null
@@ -1,218 +0,0 @@
-/*  Basic Pokemon Catcher
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
-#include "CommonFramework/Inference/BlackScreenDetector.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonSwSh/Inference/PokemonSwSh_ReceivePokemonDetector.h"
-#include "PokemonSwSh/Inference/Battles/PokemonSwSh_ExperienceGainDetector.h"
-#include "PokemonSwSh/Inference/Battles/PokemonSwSh_BattleMenuDetector.h"
-#include "PokemonSwSh_BasicCatcher.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-//  Returns the # of slots scrolled. Returns -1 if not found.
-int move_to_ball(
-    const BattleBallReader& reader,
-    ConsoleHandle& console, BotBaseContext& context,
-    const std::string& ball_slug,
-    bool forward, int attempts, uint16_t delay
-){
-    VideoSnapshot frame = console.video().snapshot();
-    std::string first_ball = reader.read_ball(frame);
-    if (first_ball == ball_slug){
-        return 0;
-    }
-
-    size_t repeat_counter = 0;
-    for (int c = 1; c < attempts; c++){
-        pbf_press_dpad(context, forward ? DPAD_RIGHT : DPAD_LEFT, 10, delay);
-        context.wait_for_all_requests();
-        frame = console.video().snapshot();
-        std::string current_ball = reader.read_ball(frame);
-        if (current_ball == ball_slug){
-            return c;
-        }
-        if (current_ball == first_ball){
-            repeat_counter++;
-            if (repeat_counter == 3){
-                return -1;
-            }
-        }
-    }
-    return -1;
-}
-
-//  Returns the quantity of the ball.
-//  Returns -1 if unable to read.
-int16_t move_to_ball(
-    const BattleBallReader& reader, ConsoleHandle& console, BotBaseContext& context,
-    const std::string& ball_slug
-){
-    //  Search forward at high speed.
-    int ret = move_to_ball(reader, console, context, ball_slug, true, 100, 40);
-    if (ret < 0){
-        return 0;
-    }
-    if (ret == 0){
-        uint16_t quantity = reader.read_quantity(console.video().snapshot());
-        return quantity == 0 ? -1 : quantity;
-    }
-
-    //  Wait a second to let the video catch up.
-    pbf_wait(context, TICKS_PER_SECOND);
-    context.wait_for_all_requests();
-
-    //  Now try again in reverse at a lower speed in case we overshot.
-    //  This will return immediately if we got it right the first time.
-    ret = move_to_ball(reader, console, context, ball_slug, false, 5, TICKS_PER_SECOND);
-    if (ret < 0){
-        return 0;
-    }
-    if (ret > 0){
-        console.log("Fast ball scrolling overshot by " + std::to_string(ret) + " slot(s).", COLOR_RED);
-    }
-    uint16_t quantity = reader.read_quantity(console.video().snapshot());
-    return quantity == 0 ? -1 : quantity;
-}
-
-
-CatchResults throw_balls(
-    ConsoleHandle& console, BotBaseContext& context,
-    Language language,
-    const std::string& ball_slug
-){
-    uint16_t balls_used = 0;
-    while (true){
-        {
-            BattleBallReader reader(console, language);
-
-            pbf_mash_button(context, BUTTON_X, 125);
-            context.wait_for_all_requests();
-
-            bool success = move_to_ball(reader, console, context, ball_slug);
-            if (!success){
-                return {CatchResult::OUT_OF_BALLS, balls_used};
-            }
-
-            pbf_mash_button(context, BUTTON_A, 125);
-            context.wait_for_all_requests();
-        }
-        balls_used++;
-
-        auto start = current_time();
-
-        StandardBattleMenuWatcher menu_detector(false);
-        ExperienceGainWatcher experience_detector;
-        int result = wait_until(
-            console, context,
-            std::chrono::seconds(60),
-            {
-                {menu_detector},
-                {experience_detector},
-            }
-        );
-        switch (result){
-        case 0:
-            if (current_time() < start + std::chrono::seconds(5)){
-                console.log("BasicCatcher: Unable to throw ball.", COLOR_RED);
-                return {CatchResult::CANNOT_THROW_BALL, balls_used};
-            }
-            console.log("BasicCatcher: Failed to catch.", COLOR_ORANGE);
-            continue;
-        case 1:
-            console.log("BasicCatcher: End of battle detected.", COLOR_PURPLE);
-            return {CatchResult::POKEMON_FAINTED, balls_used};
-        default:
-            console.log("BasicCatcher: Timed out.", COLOR_RED);
-            return {CatchResult::TIMED_OUT, balls_used};
-        }
-    }
-}
-
-
-CatchResults basic_catcher(
-    ConsoleHandle& console, BotBaseContext& context,
-    Language language,
-    const std::string& ball_slug
-){
-    context.wait_for_all_requests();
-    console.log("Attempting to catch with: " + ball_slug);
-
-    CatchResults results = throw_balls(console, context, language, ball_slug);
-    if (results.result == CatchResult::OUT_OF_BALLS){
-        return results;
-    }
-    if (results.result == CatchResult::CANNOT_THROW_BALL){
-        return results;
-    }
-    if (results.result == CatchResult::TIMED_OUT){
-        return results;
-    }
-
-
-    //  Need to distinguish between caught or faint.
-
-
-    //  Wait for end of battle.
-    {
-        BlackScreenOverWatcher black_screen_detector;
-        run_until(
-            console, context,
-            [](BotBaseContext& context){
-                pbf_mash_button(context, BUTTON_B, 120 * TICKS_PER_SECOND);
-            },
-            {{black_screen_detector}}
-        );
-    }
-
-    //  Look for the orange caught screen.
-    {
-        ReceivePokemonDetector caught_detector(true);
-
-        int result = run_until(
-            console, context,
-            [](BotBaseContext& context){
-                pbf_mash_button(context, BUTTON_B, 4 * TICKS_PER_SECOND);
-            },
-            {{caught_detector}}
-        );
-
-        switch (result){
-        case 0:
-            console.log("BasicCatcher: The wild " + STRING_POKEMON + " was caught!", COLOR_BLUE);
-            break;
-        default:
-            console.log("BasicCatcher: The wild " + STRING_POKEMON + " fainted.", COLOR_RED);
-            results.result = CatchResult::POKEMON_FAINTED;
-            return results;
-        }
-    }
-
-//    pbf_wait(context, 5 * TICKS_PER_SECOND);
-    {
-        BlackScreenOverWatcher black_screen_detector;
-        run_until(
-            console, context,
-            [](BotBaseContext& context){
-                pbf_mash_button(context, BUTTON_B, 10 * TICKS_PER_SECOND);
-            },
-            {{black_screen_detector}}
-        );
-    }
-
-    results.result = CatchResult::POKEMON_CAUGHT;
-    return results;
-}
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/PokemonSwSh_BasicCatcher.h b/SerialPrograms/Source/PokemonSwSh/Programs/PokemonSwSh_BasicCatcher.h
deleted file mode 100644
index 6fb8a0f199..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/PokemonSwSh_BasicCatcher.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*  Basic Pokemon Catcher
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_BasicCatcher_H
-#define PokemonAutomation_PokemonSwSh_BasicCatcher_H
-
-#include "CommonFramework/Language.h"
-#include "CommonFramework/Tools/ConsoleHandle.h"
-#include "Pokemon/Pokemon_Notification.h"
-#include "PokemonSwSh/Inference/Battles/PokemonSwSh_BattleBallReader.h"
-
-namespace PokemonAutomation{
-    class BotBaseContext;
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-using namespace Pokemon;
-
-
-//  Returns the quantity of the ball.
-//  Returns -1 if unable to read.
-int16_t move_to_ball(
-    const BattleBallReader& reader, ConsoleHandle& console, BotBaseContext& context,
-    const std::string& ball_slug
-);
-
-
-struct CatchResults{
-    CatchResult result;
-    uint16_t balls_used;
-};
-CatchResults basic_catcher(
-    ConsoleHandle& console, BotBaseContext& context,
-    Language language,
-    const std::string& ball_slug
-);
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/PokemonSwSh_EncounterDetection.h b/SerialPrograms/Source/PokemonSwSh/Programs/PokemonSwSh_EncounterDetection.h
deleted file mode 100644
index d92b7961e2..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/PokemonSwSh_EncounterDetection.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*  Encounter Detection
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_EncounterTracker_H
-#define PokemonAutomation_PokemonSwSh_EncounterTracker_H
-
-#include "CommonFramework/Language.h"
-#include "CommonFramework/Tools/ConsoleHandle.h"
-#include "Pokemon/Pokemon_EncounterStats.h"
-#include "PokemonSwSh/ShinyHuntTracker.h"
-#include "PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterOption.h"
-#include "PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_ShinyEncounterDetector.h"
-
-namespace PokemonAutomation{
-    class ProgramEnvironment;
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-class StandardEncounterDetection{
-public:
-    StandardEncounterDetection(
-        ProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context,
-        Language language,
-        const EncounterFilterOption& filter,
-        ShinyType shininess,
-        std::chrono::milliseconds read_name_delay = std::chrono::milliseconds(500)
-    );
-
-    bool is_shiny() const;
-    ShinyType shininess() const{ return m_shininess; }
-
-    //  nullptr     =   disabled
-    //  empty set   =   unable to detect
-    const std::set<std::string>* candidates();
-
-    std::pair<EncounterAction, std::string> get_action();
-
-private:
-    ProgramEnvironment& m_env;
-    ConsoleHandle& m_console;
-    BotBaseContext& m_context;
-
-    const Language m_language;
-
-    const EncounterFilterOption& m_filter;
-    const ShinyType m_shininess;
-    const std::chrono::milliseconds m_read_name_delay;
-
-    bool m_name_read = false;
-    std::set<std::string> m_candidates;
-};
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/PokemonSwSh_EncounterHandler.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/PokemonSwSh_EncounterHandler.cpp
deleted file mode 100644
index f2a5805241..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/PokemonSwSh_EncounterHandler.cpp
+++ /dev/null
@@ -1,298 +0,0 @@
-/*  Encounter Handler
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/Exceptions/OperationFailedException.h"
-#include "CommonFramework/Exceptions/FatalProgramException.h"
-#include "CommonFramework/Tools/ProgramEnvironment.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
-#include "CommonFramework/Inference/BlackScreenDetector.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "Pokemon/Pokemon_Notification.h"
-#include "PokemonSwSh/PokemonSwSh_Settings.h"
-#include "PokemonSwSh/Programs/PokemonSwSh_BasicCatcher.h"
-#include "PokemonSwSh_EncounterHandler.h"
-
-//#include <iostream>
-//using std::cout;
-//using std::endl;
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-void take_video(BotBaseContext& context){
-    pbf_wait(context, 5 * TICKS_PER_SECOND);
-    pbf_press_button(context, BUTTON_CAPTURE, 2 * TICKS_PER_SECOND, 5 * TICKS_PER_SECOND);
-//    context->wait_for_all_requests();
-}
-void run_away(
-    ConsoleHandle& console, BotBaseContext& context,
-    uint16_t exit_battle_time
-){
-    BlackScreenOverWatcher black_screen_detector;
-    run_until(
-        console, context,
-        [exit_battle_time](BotBaseContext& context){
-            pbf_press_dpad(context, DPAD_UP, 10, 0);
-            pbf_mash_button(context, BUTTON_A, TICKS_PER_SECOND);
-            if (exit_battle_time > TICKS_PER_SECOND){
-                pbf_mash_button(context, BUTTON_B, exit_battle_time - TICKS_PER_SECOND);
-            }
-        },
-        {{black_screen_detector}}
-    );
-}
-
-
-
-
-StandardEncounterHandler::StandardEncounterHandler(
-    ProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context,
-    Language language,
-    EncounterBotCommonOptions& settings,
-    ShinyHuntTracker& session_stats
-)
-    : m_env(env)
-    , m_context(context)
-    , m_console(console)
-    , m_language(language)
-    , m_settings(settings)
-    , m_session_stats(session_stats)
-//    , m_notification_sender(settings.notification_level)
-{}
-
-
-void StandardEncounterHandler::update_frequencies(StandardEncounterDetection& encounter){
-    const std::set<std::string>* slugs = encounter.candidates();
-    if (slugs){
-        m_frequencies += *slugs;
-        m_env.log(m_frequencies.dump_sorted_map("Encounter Stats:\n"));
-    }
-}
-void StandardEncounterHandler::run_away_and_update_stats(
-    StandardEncounterDetection& encounter,
-    uint16_t exit_battle_time,
-    const ShinyDetectionResult& result
-){
-    //  Initiate the run-away.
-    pbf_press_dpad(m_context, DPAD_UP, 10, 0);
-    pbf_mash_button(m_context, BUTTON_A, 60);
-    m_context.wait_for_all_requests();
-
-    update_frequencies(encounter);
-
-    const std::set<std::string>* candidates_ptr = encounter.candidates();
-    const std::set<std::string>& candidates = candidates_ptr
-        ? *candidates_ptr
-        : std::set<std::string>();
-    send_encounter_notification(
-        m_env,
-        m_settings.NOTIFICATION_NONSHINY,
-        m_settings.NOTIFICATION_SHINY,
-        candidates_ptr, is_likely_shiny(result.shiny_type),
-        {{candidates, result.shiny_type}}, result.alpha,
-        result.get_best_screenshot(),
-        &m_frequencies
-    );
-
-    BlackScreenOverWatcher black_screen_detector;
-    int ret = run_until(
-        m_console, m_context,
-        [exit_battle_time](BotBaseContext& context){
-            pbf_mash_button(context, BUTTON_A, TICKS_PER_SECOND);
-            if (exit_battle_time > TICKS_PER_SECOND){
-                pbf_mash_button(context, BUTTON_B, exit_battle_time - TICKS_PER_SECOND);
-            }
-        },
-        {{black_screen_detector}}
-    );
-    if (ret < 0){
-        m_console.log("Timed out waiting for end of battle. Are you stuck in the battle?", COLOR_RED);
-    }
-}
-
-
-bool StandardEncounterHandler::handle_standard_encounter(const ShinyDetectionResult& result){
-    if (result.shiny_type == ShinyType::UNKNOWN){
-        m_console.log("Unable to determine result of battle.", COLOR_RED);
-        m_session_stats.add_error();
-        m_consecutive_failures++;
-        if (m_consecutive_failures >= 3){
-            throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, m_console,
-                "3 consecutive failed encounter detections.",
-                true
-            );
-        }
-        return false;
-    }
-    m_consecutive_failures = 0;
-
-    m_session_stats += result.shiny_type;
-    m_env.update_stats();
-
-    if (result.shiny_type == ShinyType::UNKNOWN){
-        pbf_mash_button(m_context, BUTTON_B, TICKS_PER_SECOND);
-        return false;
-    }
-
-    StandardEncounterDetection encounter(
-        m_env, m_console, m_context,
-        m_language,
-        m_settings.FILTER,
-        result.shiny_type
-    );
-
-    update_frequencies(encounter);
-
-    const std::set<std::string>* candidates_ptr = encounter.candidates();
-    const std::set<std::string>& candidates = candidates_ptr
-        ? *candidates_ptr
-        : std::set<std::string>();
-    send_encounter_notification(
-        m_env,
-        m_settings.NOTIFICATION_NONSHINY,
-        m_settings.NOTIFICATION_SHINY,
-        candidates_ptr, is_likely_shiny(result.shiny_type),
-        {{candidates, result.shiny_type}}, result.alpha,
-        result.get_best_screenshot(),
-        &m_frequencies
-    );
-
-    if (m_settings.VIDEO_ON_SHINY && encounter.is_shiny()){
-        take_video(m_context);
-    }
-
-    return encounter.get_action().first == EncounterAction::StopProgram;
-}
-bool StandardEncounterHandler::handle_standard_encounter_end_battle(
-    const ShinyDetectionResult& result,
-    uint16_t exit_battle_time
-){
-    if (result.shiny_type == ShinyType::UNKNOWN){
-        m_console.log("Unable to determine result of battle.", COLOR_RED);
-        m_session_stats.add_error();
-        m_consecutive_failures++;
-        if (m_consecutive_failures >= 3){
-            throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, m_console,
-                "3 consecutive failed encounter detections.",
-                true
-            );
-        }
-        return false;
-    }
-    m_consecutive_failures = 0;
-
-    m_session_stats += result.shiny_type;
-    m_env.update_stats();
-
-    StandardEncounterDetection encounter(
-        m_env, m_console, m_context,
-        m_language,
-        m_settings.FILTER,
-        result.shiny_type
-    );
-
-    if (m_settings.VIDEO_ON_SHINY && encounter.is_shiny()){
-        take_video(m_context);
-    }
-
-    std::pair<EncounterAction, std::string> action = encounter.get_action();
-
-//    cout << "action = " << (int)action.first << " : " << action.second << endl;
-
-    //  Fast run-away sequence to save time.
-    if (action.first == EncounterAction::RunAway){
-        run_away_and_update_stats(encounter, exit_battle_time, result);
-        return false;
-    }
-
-    update_frequencies(encounter);
-    const std::set<std::string>* candidates_ptr = encounter.candidates();
-    const std::set<std::string>& candidates = candidates_ptr
-        ? *candidates_ptr
-        : std::set<std::string>();
-    send_encounter_notification(
-        m_env,
-        m_settings.NOTIFICATION_NONSHINY,
-        m_settings.NOTIFICATION_SHINY,
-        candidates_ptr, is_likely_shiny(result.shiny_type),
-        {{candidates, result.shiny_type}}, result.alpha,
-        result.get_best_screenshot(),
-        &m_frequencies
-    );
-
-    switch (action.first){
-    case EncounterAction::StopProgram:
-        return true;
-    case EncounterAction::RunAway:
-        return false;
-    case EncounterAction::ThrowBalls:{
-        CatchResults results = basic_catcher(m_console, m_context, m_language, action.second);
-        send_catch_notification(
-            m_env,
-            m_settings.NOTIFICATION_CATCH_SUCCESS,
-            m_settings.NOTIFICATION_CATCH_FAILED,
-            encounter.candidates(),
-            action.second,
-            results.balls_used,
-            results.result
-        );
-        switch (results.result){
-        case CatchResult::POKEMON_CAUGHT:
-        case CatchResult::POKEMON_FAINTED:
-            break;
-        default:
-            throw FatalProgramException(
-                ErrorReport::NO_ERROR_REPORT, m_console,
-                "Unable to recover from failed catch.",
-                true
-            );
-        }
-        return false;
-    }
-    case EncounterAction::ThrowBallsAndSave:{
-        CatchResults results = basic_catcher(m_console, m_context, m_language, action.second);
-        send_catch_notification(
-            m_env,
-            m_settings.NOTIFICATION_CATCH_SUCCESS,
-            m_settings.NOTIFICATION_CATCH_FAILED,
-            encounter.candidates(),
-            action.second,
-            results.balls_used,
-            results.result
-        );
-        switch (results.result){
-        case CatchResult::POKEMON_CAUGHT:
-            pbf_mash_button(m_context, BUTTON_B, 2 * TICKS_PER_SECOND);
-            pbf_press_button(m_context, BUTTON_X, 20, GameSettings::instance().OVERWORLD_TO_MENU_DELAY); //  Save game.
-            pbf_press_button(m_context, BUTTON_R, 20, 150);
-            pbf_press_button(m_context, BUTTON_A, 10, 500);
-            break;
-        case CatchResult::POKEMON_FAINTED:
-            pbf_mash_button(m_context, BUTTON_B, 2 * TICKS_PER_SECOND);
-            break;
-        default:
-            throw FatalProgramException(
-                ErrorReport::NO_ERROR_REPORT, m_console,
-                "Unable to recover from failed catch.",
-                true
-            );
-        }
-        return false;
-    }
-    }
-
-    return false;
-}
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/PokemonSwSh_EncounterHandler.h b/SerialPrograms/Source/PokemonSwSh/Programs/PokemonSwSh_EncounterHandler.h
deleted file mode 100644
index 5d02067130..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/PokemonSwSh_EncounterHandler.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*  Encounter Handler
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_EncounterHandler_H
-#define PokemonAutomation_PokemonSwSh_EncounterHandler_H
-
-#include "CommonFramework/Tools/ConsoleHandle.h"
-#include "Pokemon/Pokemon_Notification.h"
-#include "Pokemon/Options/Pokemon_EncounterBotOptions.h"
-#include "PokemonSwSh/Options/PokemonSwSh_EncounterBotCommon.h"
-#include "PokemonSwSh/Programs/PokemonSwSh_EncounterDetection.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-class StandardEncounterHandler{
-public:
-    StandardEncounterHandler(
-        ProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context,
-        Language language,
-        EncounterBotCommonOptions& settings,
-        ShinyHuntTracker& session_stats
-    );
-
-
-    //  Return true if program should stop.
-    bool handle_standard_encounter(const ShinyDetectionResult& result);
-    bool handle_standard_encounter_end_battle(const ShinyDetectionResult& result, uint16_t exit_battle_time);
-
-
-private:
-    void update_frequencies(StandardEncounterDetection& encounter);
-    void run_away_and_update_stats(
-        StandardEncounterDetection& encounter,
-        uint16_t exit_battle_time,
-        const ShinyDetectionResult& result
-    );
-
-private:
-    ProgramEnvironment& m_env;
-    BotBaseContext& m_context;
-    ConsoleHandle& m_console;
-    const Language m_language;
-    EncounterBotCommonOptions& m_settings;
-
-    EncounterFrequencies m_frequencies;
-    ShinyHuntTracker& m_session_stats;
-    size_t m_consecutive_failures = 0;
-
-//    EncounterNotificationSender m_notification_sender;
-};
-
-
-void take_video(BotBaseContext& context);
-void run_away(
-    ConsoleHandle& console, BotBaseContext& context,
-    uint16_t exit_battle_time
-);
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/PokemonSwSh_GameEntry.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/PokemonSwSh_GameEntry.cpp
deleted file mode 100644
index 9150eb12aa..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/PokemonSwSh_GameEntry.cpp
+++ /dev/null
@@ -1,155 +0,0 @@
-/*  Start Game
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/ImageTools/SolidColorTest.h"
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
-#include "CommonFramework/Inference/InferenceThrottler.h"
-#include "CommonFramework/Tools/ConsoleHandle.h"
-#include "NintendoSwitch/NintendoSwitch_Settings.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Routines.h"
-#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
-#include "PokemonSwSh/PokemonSwSh_Settings.h"
-#include "PokemonSwSh/Commands/PokemonSwSh_Commands_GameEntry.h"
-#include "PokemonSwSh_GameEntry.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-
-void resume_game_no_interact(
-    ConsoleHandle& console, BotBaseContext& context,
-    bool tolerate_update_menu
-){
-    bool video_available = (bool)console.video().snapshot();
-    if (video_available){
-        resume_game_from_home(console, context);
-    }else{
-        resume_game_no_interact_old(context, tolerate_update_menu);
-    }
-}
-void resume_game_back_out(
-    ConsoleHandle& console, BotBaseContext& context,
-    bool tolerate_update_menu, uint16_t mash_B_time
-){
-    bool video_available = (bool)console.video().snapshot();
-    if (video_available){
-        resume_game_from_home(console, context);
-    }else{
-        resume_game_back_out_old(context, tolerate_update_menu, mash_B_time);
-    }
-}
-
-
-
-
-void enter_loading_game(
-    ConsoleHandle& console, BotBaseContext& context,
-    bool backup_save,
-    uint16_t post_wait_time
-){
-    openedgame_to_gamemenu(console, context, GameSettings::instance().START_GAME_WAIT);
-
-    console.log("enter_loading_game(): Game Loaded. Entering game...", COLOR_PURPLE);
-    enter_game(context, backup_save, GameSettings::instance().ENTER_GAME_MASH, 0);
-    context.wait_for_all_requests();
-
-    //  Wait to enter game.
-    {
-        std::chrono::milliseconds timeout(GameSettings::instance().ENTER_GAME_WAIT * (1000 / TICKS_PER_SECOND));
-
-        OverlayBoxScope box(console, {0.2, 0.2, 0.6, 0.6});
-
-        bool black_found = false;
-
-        InferenceThrottler throttler(timeout);
-        while (true){
-            context.throw_if_cancelled();
-
-            VideoSnapshot screen = console.video().snapshot();
-            if (!screen){
-                console.log("enter_loading_game(): Screenshot failed.", COLOR_PURPLE);
-                throttler.set_period(std::chrono::milliseconds(1000));
-            }else{
-                bool black = is_black(extract_box_reference(screen, box));
-                if (black){
-                    if (!black_found){
-                        console.log("enter_loading_game(): Game entry started.", COLOR_PURPLE);
-                    }
-                    black_found = true;
-                }else if (black_found){
-                    break;
-                }
-            }
-
-            if (throttler.end_iteration(context)){
-                console.log("enter_loading_game(): Game entry timed out. Proceeding with default start delay.", COLOR_RED);
-                break;
-            }
-        }
-    }
-    console.log("start_game_with_inference(): Game started.", COLOR_PURPLE);
-
-    if (post_wait_time != 0){
-        pbf_wait(context, post_wait_time);
-    }
-}
-
-void start_game_from_home_with_inference(
-    ConsoleHandle& console, BotBaseContext& context,
-    bool tolerate_update_menu,
-    uint8_t game_slot,
-    uint8_t user_slot,
-    bool backup_save,
-    uint16_t post_wait_time
-){
-    NintendoSwitch::start_game_from_home(
-        console,
-        context,
-        tolerate_update_menu,
-        game_slot,
-        user_slot,
-        GameSettings::instance().START_GAME_MASH
-    );
-
-    //  Wait for game to load.
-    enter_loading_game(console, context, backup_save, post_wait_time);
-}
-
-void reset_game_from_home_with_inference(
-    ConsoleHandle& console, BotBaseContext& context,
-    bool tolerate_update_menu,
-    bool backup_save,
-    uint16_t post_wait_time
-){
-    bool video_available = (bool)console.video().snapshot();
-    if (video_available ||
-        ConsoleSettings::instance().START_GAME_REQUIRES_INTERNET ||
-        tolerate_update_menu
-    ){
-        close_game(context);
-        start_game_from_home_with_inference(
-            console, context, tolerate_update_menu, 0, 0, backup_save, post_wait_time
-        );
-        return;
-    }
-
-    fast_reset_game(context, GameSettings::instance().START_GAME_MASH, 0, 0, 0);
-    context.wait_for_all_requests();
-
-    //  Wait for game to load.
-    enter_loading_game(console, context, backup_save, post_wait_time);
-}
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/PokemonSwSh_GameEntry.h b/SerialPrograms/Source/PokemonSwSh/Programs/PokemonSwSh_GameEntry.h
deleted file mode 100644
index fad12b8017..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/PokemonSwSh_GameEntry.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*  Start Game
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_StartGame_H
-#define PokemonAutomation_PokemonSwSh_StartGame_H
-
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-
-namespace PokemonAutomation{
-    class ConsoleHandle;
-    class BotBaseContext;
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-void resume_game_no_interact(
-    ConsoleHandle& console, BotBaseContext& context,
-    bool tolerate_update_menu
-);
-void resume_game_back_out(
-    ConsoleHandle& console, BotBaseContext& context,
-    bool tolerate_update_menu, uint16_t mash_B_time
-);
-
-
-
-//  Start the game with the specified "game_slot" and "user_slot".
-//  If "game_slot" is zero, it uses whatever the cursor is on.
-//  If "user_slot" is zero, it uses whatever the cursor is on.
-void start_game_from_home_with_inference(
-    ConsoleHandle& console, BotBaseContext& context,
-    bool tolerate_update_menu,
-    uint8_t game_slot = 0,
-    uint8_t user_slot = 0,
-    bool backup_save = false,
-    uint16_t post_wait_time = 1 * TICKS_PER_SECOND
-);
-
-void reset_game_from_home_with_inference(
-    ConsoleHandle& console, BotBaseContext& context,
-    bool tolerate_update_menu,
-    bool backup_save = false,
-    uint16_t post_wait_time = 1 * TICKS_PER_SECOND
-);
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/PokemonSwSh_Internet.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/PokemonSwSh_Internet.cpp
deleted file mode 100644
index c6941d7be2..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/PokemonSwSh_Internet.cpp
+++ /dev/null
@@ -1,85 +0,0 @@
-/*  Internet
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
-#include "CommonFramework/Notifications/ProgramInfo.h"
-#include "CommonFramework/Tools/ErrorDumper.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "PokemonSwSh/Inference/PokemonSwSh_YCommDetector.h"
-#include "PokemonSwSh_Internet.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-bool connect_to_internet_with_inference(
-    ConsoleHandle& console, BotBaseContext& context,
-    std::chrono::milliseconds post_wait_time,
-    uint16_t timeout_ticks
-){
-    console.log("Connecting to internet...");
-    //  Enter Y-COMM.
-    bool ok = true;
-//    cout << "Waiting for Y-COMM to open..." << endl;
-    {
-        YCommMenuDetector detector(true);
-        if (!detector.detect(console.video().snapshot())){
-            pbf_press_button(context, BUTTON_Y, 10, TICKS_PER_SECOND);
-            context.wait_for_all_requests();
-        }
-        int result = wait_until(
-            console, context,
-            std::chrono::seconds(10),
-            {{detector}}
-        );
-        if (result == 0){
-            console.log("Y-COMM detected.");
-        }else{
-            console.log("Failed to detect Y-COMM after timeout.", COLOR_RED);
-            dump_image(console, ProgramInfo(), "connect_to_internet_with_inference", console.video().snapshot());
-            ok = false;
-        }
-    }
-
-    //  Connect to internet.
-    context.wait_for(std::chrono::seconds(1));
-    pbf_press_dpad(context, DPAD_UP, 5, 0);
-    pbf_move_right_joystick(context, 128, 0, 5, 0);
-    pbf_mash_button(context, BUTTON_PLUS, TICKS_PER_SECOND);
-    context.wait_for_all_requests();
-
-//    cout << "Waiting for Y-COMM to close..." << endl;
-    //  Mash B until you leave Y-COMM.
-    {
-        YCommMenuDetector detector(false);
-        int result = run_until(
-            console, context,
-            [&](BotBaseContext& context){
-                pbf_mash_button(context, BUTTON_B, timeout_ticks);
-            },
-            {{detector}}
-        );
-        if (result == 0){
-            console.log("Y-COMM no longer detected. Assume done connected to internet.");
-        }else{
-            console.log("Failed to see Y-COMM go away after timeout.", COLOR_RED);
-            ok = false;
-        }
-    }
-
-    //  Extra wait.
-    context.wait_for(post_wait_time);
-
-    return ok;
-}
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/PokemonSwSh_Internet.h b/SerialPrograms/Source/PokemonSwSh/Programs/PokemonSwSh_Internet.h
deleted file mode 100644
index 7b0f4c70b9..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/PokemonSwSh_Internet.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*  Internet
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_Internet_H
-#define PokemonAutomation_PokemonSwSh_Internet_H
-
-#include <chrono>
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-#include "CommonFramework/Tools/ConsoleHandle.h"
-
-namespace PokemonAutomation{
-    class BotBaseContext;
-    class ProgramEnvironment;
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-bool connect_to_internet_with_inference(
-    ConsoleHandle& console, BotBaseContext& context,
-    std::chrono::milliseconds post_wait_time = std::chrono::seconds(3),
-    uint16_t timeout_ticks = 120 * TICKS_PER_SECOND
-);
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/PokemonSwSh_MenuNavigation.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/PokemonSwSh_MenuNavigation.cpp
deleted file mode 100644
index 1c65b764a7..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/PokemonSwSh_MenuNavigation.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-/*  Start Game
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-
-#include "ClientSource/Connection/BotBase.h"
-#include "CommonFramework/Exceptions/OperationFailedException.h"
-#include "CommonFramework/Tools/ConsoleHandle.h"
-#include "CommonFramework/Tools/ErrorDumper.h"
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
-//#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "NintendoSwitch/FixedInterval.h"
-#include "PokemonSwSh/Inference/PokemonSwSh_SelectionArrowFinder.h"
-#include "PokemonSwSh/PokemonSwSh_Settings.h"
-#include "PokemonSwSh_MenuNavigation.h"
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-void navigate_to_menu_app(
-    ProgramEnvironment& env,
-    ConsoleHandle& console,
-    BotBaseContext& context,
-    size_t target_app_index,
-    EventNotificationOption& notification_option
-){
-    context.wait_for_all_requests();
-    RotomPhoneMenuArrowFinder menu_arrow_detector(console);
-    const int cur_app_index = menu_arrow_detector.detect(console.video().snapshot());
-    if (cur_app_index < 0){
-        throw OperationFailedException(
-            ErrorReport::SEND_ERROR_REPORT, console,
-            "Cannot detect Rotom phone menu.",
-            true
-        );
-    }
-    console.log("Detect menu cursor at " + std::to_string(cur_app_index) + ".");
-
-    const int cur_row = cur_app_index / 5;
-    const int cur_col = cur_app_index % 5;
-
-    const int target_row = (int)target_app_index / 5;
-    const int target_col = (int)target_app_index % 5;
-    
-    const uint16_t BOX_SCROLL_DELAY = GameSettings::instance().BOX_SCROLL_DELAY;
-
-    const DpadPosition dir = (cur_col < target_col ? DPAD_RIGHT : DPAD_LEFT);
-    const int steps = std::abs(cur_col - target_col);
-    for(int i = 0; i < steps; i++){
-        ssf_press_dpad2(context, dir, BOX_SCROLL_DELAY, 10);
-    }
-
-    if (cur_row < target_row){
-        ssf_press_dpad2(context, DPAD_DOWN, BOX_SCROLL_DELAY, 10);
-    } else if (cur_row > target_row){
-        ssf_press_dpad2(context, DPAD_UP, BOX_SCROLL_DELAY, 10);
-    }
-
-    context.wait_for_all_requests();
-    return;
-}
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/PokemonSwSh_MenuNavigation.h b/SerialPrograms/Source/PokemonSwSh/Programs/PokemonSwSh_MenuNavigation.h
deleted file mode 100644
index 26880950b2..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/PokemonSwSh_MenuNavigation.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*  Menu Navigation
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_MenuNavigation_H
-#define PokemonAutomation_PokemonSwSh_MenuNavigation_H
-
-#include <stddef.h>
-
-namespace PokemonAutomation{
-    class BotBaseContext;
-    class ConsoleHandle;
-    class EventNotificationOption;
-    class ProgramEnvironment;
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-// When Rotom Phone menu is opened, move the cursor to the target app.
-// The target app index is from 0 to 9, in the order of top to bottom, left to right.
-// e.g. by default, Pokemon app is at index 1, while Town Map app is at index 5.
-// The function detects the current cursor location. So the function works on any initial cursor location.
-// Will throw OperationFailedException when failed to detect menu
-void navigate_to_menu_app(
-    ProgramEnvironment& env,
-    ConsoleHandle& console,
-    BotBaseContext& context,
-    size_t app_index,
-    EventNotificationOption& notification_option
-    );
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/PokemonSwSh_RaidItemFarmerOKHO.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/PokemonSwSh_RaidItemFarmerOKHO.cpp
deleted file mode 100644
index 82ed1f557b..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/PokemonSwSh_RaidItemFarmerOKHO.cpp
+++ /dev/null
@@ -1,214 +0,0 @@
-/*  OHKO Raid Farmer
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Cpp/PrettyPrint.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Device.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Routines.h"
-#include "NintendoSwitch/NintendoSwitch_Settings.h"
-#include "NintendoSwitch/FixedInterval.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonSwSh/Commands/PokemonSwSh_Commands_GameEntry.h"
-#include "PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.h"
-#include "PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
-#include "PokemonSwSh/Programs/Hosting/PokemonSwSh_DenTools.h"
-#include "PokemonSwSh_RaidItemFarmerOKHO.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-    using namespace Pokemon;
-
-
-RaidItemFarmerOHKO_Descriptor::RaidItemFarmerOHKO_Descriptor()
-    : MultiSwitchProgramDescriptor(
-        "PokemonSwSh:RaidItemFarmerOHKO",
-        STRING_POKEMON + " SwSh", "Raid Item Farmer (OHKO)",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonSwSh/RaidItemFarmerOHKO.md",
-        "Farm items from raids that can be OHKO'ed. (requires multiple Switches)",
-        FeedbackType::NONE,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB,
-        2, 4, 2
-    )
-{}
-
-
-
-RaidItemFarmerOHKO::RaidItemFarmerOHKO()
-    : BACKUP_SAVE(
-        "<b>Load Backup Save:</b><br>For backup save soft-locking method.",
-        LockWhileRunning::LOCKED,
-        false
-    )
-//    , m_advanced_options(
-//        "<font size=4><b>Advanced Options:</b> You should not need to touch anything below here.</font>"
-//    )
-    , WAIT_FOR_STAMP_DELAY(
-        "<b>Wait for Stamp Delay:</b><br>Wait this long for the stamp to show up.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "3 * TICKS_PER_SECOND"
-    )
-    , ENTER_STAMP_MASH_DURATION(
-        "<b>Enter Stamp Mash Duration:</b><br>Mash A this long to enter a raid from its stamp.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "5 * TICKS_PER_SECOND"
-    )
-    , RAID_START_MASH_DURATION(
-        "<b>Raid Start Mash Duration:</b><br>Mash A this long to start raid.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "10 * TICKS_PER_SECOND"
-    )
-    , RAID_START_TO_ATTACK_DELAY(
-        "<b>Raid Start to Attack Delay:</b><br>Time from start raid to when the raiders attack.<br>"
-        "Do not over-optimize this timing unless you are running with 4 Switches. The Wishiwashi NPC will break the program.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "30 * TICKS_PER_SECOND"
-    )
-    , ATTACK_TO_CATCH_DELAY(
-        "<b>Attack to Catch Delay:</b><br>Time from when you attack to when the catch selection appears.<br>"
-        "Do not over-optimize this timing unless you are running with 4 Switches. The Clefairy NPC's Follow Me will break the program.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "18 * TICKS_PER_SECOND"
-    )
-    , RETURN_TO_OVERWORLD_DELAY(
-        "<b>Return to Overworld Delay:</b><br>Time from when you don't catch to when you return to the overworld.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "18 * TICKS_PER_SECOND"
-    )
-    , TOUCH_DATE_INTERVAL(
-        "<b>Rollover Prevention:</b><br>Prevent the den from rolling over by periodically touching the date. If set to zero, this feature is disabled.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "4 * 3600 * TICKS_PER_SECOND"
-    )
-{
-    PA_ADD_OPTION(BACKUP_SAVE);
-//    PA_ADD_STATIC(m_advanced_options);
-    PA_ADD_OPTION(WAIT_FOR_STAMP_DELAY);
-    PA_ADD_OPTION(ENTER_STAMP_MASH_DURATION);
-    PA_ADD_OPTION(RAID_START_MASH_DURATION);
-    PA_ADD_OPTION(RAID_START_TO_ATTACK_DELAY);
-    PA_ADD_OPTION(ATTACK_TO_CATCH_DELAY);
-    PA_ADD_OPTION(RETURN_TO_OVERWORLD_DELAY);
-    PA_ADD_OPTION(TOUCH_DATE_INTERVAL);
-}
-
-void RaidItemFarmerOHKO::program(MultiSwitchProgramEnvironment& env, CancellableScope& scope){
-    BotBaseContext host(scope, env.consoles[0].botbase());
-    size_t switches = env.consoles.size();
-
-    env.run_in_parallel(
-        scope,
-        [](ConsoleHandle& console, BotBaseContext& context){
-            grip_menu_connect_go_home(context);
-        }
-    );
-
-    uint32_t last_touch = 0;
-    if (TOUCH_DATE_INTERVAL > 0){
-        touch_date_from_home(host, ConsoleSettings::instance().SETTINGS_TO_HOME_DELAY);
-        last_touch = system_clock(host);
-    }
-    env.run_in_parallel(
-        scope,
-        [](ConsoleHandle& console, BotBaseContext& context){
-            if (console.index() == 0){
-                resume_game_front_of_den_nowatts(context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_SLOW);
-            }else{
-                resume_game_no_interact(console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_SLOW);
-            }
-        }
-    );
-
-
-    for (uint32_t raids = 0;; raids++){
-        env.log("Raids Completed: " + tostr_u_commas(raids));
-
-        host.wait_for_all_requests();
-        env.run_in_parallel(
-            scope,
-            [&](ConsoleHandle& console, BotBaseContext& context){
-                if (console.index() == 0){
-                    enter_den(context, 0, false, false);
-                }else{
-                    pbf_press_button(context, BUTTON_Y, 10, GameSettings::instance().OPEN_YCOMM_DELAY);
-                    pbf_press_dpad(context, DPAD_UP, 5, 0);
-                    pbf_move_right_joystick(context, 128, 0, 5, 0);
-                    pbf_press_button(context, BUTTON_X, 10, 10);
-                }
-            }
-        );
-
-        enter_lobby(host, 0, false, Catchability::ALWAYS_CATCHABLE);
-
-        host.wait_for_all_requests();
-        env.run_in_parallel(
-            scope, 1, switches,
-            [&](ConsoleHandle& console, BotBaseContext& context){
-                pbf_wait(context, WAIT_FOR_STAMP_DELAY);
-                pbf_press_button(context, BUTTON_X, 10, 10);
-                pbf_press_dpad(context, DPAD_RIGHT, 10, 10);
-                pbf_mash_button(context, BUTTON_A, ENTER_STAMP_MASH_DURATION);
-            }
-        );
-
-        //  Start Raid
-        pbf_press_dpad(host, DPAD_UP, 5, 45);
-
-        host.wait_for_all_requests();
-        env.run_in_parallel(
-            scope,
-            [&](ConsoleHandle& console, BotBaseContext& context){
-                pbf_mash_button(context, BUTTON_A, RAID_START_MASH_DURATION);
-                pbf_wait(context, RAID_START_TO_ATTACK_DELAY);
-                pbf_mash_button(context, BUTTON_A, 5 * TICKS_PER_SECOND);
-                pbf_wait(context, ATTACK_TO_CATCH_DELAY);
-
-                if (console.index() == 0){
-                    //  Add a little extra wait time since correctness matters here.
-                    ssf_press_button2(context, BUTTON_HOME, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE, 10);
-
-                    close_game(context);
-
-                    //  Touch the date.
-                    if (TOUCH_DATE_INTERVAL > 0 && system_clock(context) - last_touch >= TOUCH_DATE_INTERVAL){
-                        touch_date_from_home(context, ConsoleSettings::instance().SETTINGS_TO_HOME_DELAY);
-                        last_touch += TOUCH_DATE_INTERVAL;
-                    }
-                    start_game_from_home_with_inference(
-                        console, context,
-                        ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_SLOW,
-                        0, 0,
-                        BACKUP_SAVE
-                    );
-                }else{
-                    pbf_press_dpad(context, DPAD_DOWN, 10, 10);
-                    if (RETURN_TO_OVERWORLD_DELAY > 5 * TICKS_PER_SECOND){
-                        pbf_mash_button(context, BUTTON_A, RETURN_TO_OVERWORLD_DELAY - 5 * TICKS_PER_SECOND);
-                        pbf_mash_button(context, BUTTON_B, 5 * TICKS_PER_SECOND);
-                    }else{
-                        pbf_mash_button(context, BUTTON_A, RETURN_TO_OVERWORLD_DELAY);
-                    }
-                }
-            }
-        );
-
-
-    }
-
-}
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/PokemonSwSh_RaidItemFarmerOKHO.h b/SerialPrograms/Source/PokemonSwSh/Programs/PokemonSwSh_RaidItemFarmerOKHO.h
deleted file mode 100644
index ec954c7ebf..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/PokemonSwSh_RaidItemFarmerOKHO.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*  Raid Item Farmer (OHKO)
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_RaidItemFarmerOHKO_H
-#define PokemonAutomation_PokemonSwSh_RaidItemFarmerOHKO_H
-
-#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
-#include "Common/Cpp/Options/TimeExpressionOption.h"
-#include "NintendoSwitch/NintendoSwitch_MultiSwitchProgram.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-class RaidItemFarmerOHKO_Descriptor : public MultiSwitchProgramDescriptor{
-public:
-    RaidItemFarmerOHKO_Descriptor();
-};
-
-
-
-class RaidItemFarmerOHKO : public MultiSwitchProgramInstance{
-public:
-    RaidItemFarmerOHKO();
-
-    virtual void program(MultiSwitchProgramEnvironment& env, CancellableScope& scope) override;
-
-private:
-    BooleanCheckBoxOption BACKUP_SAVE;
-//    SectionDivider m_advanced_options;
-    TimeExpressionOption<uint16_t> WAIT_FOR_STAMP_DELAY;
-    TimeExpressionOption<uint16_t> ENTER_STAMP_MASH_DURATION;
-    TimeExpressionOption<uint16_t> RAID_START_MASH_DURATION;
-    TimeExpressionOption<uint16_t> RAID_START_TO_ATTACK_DELAY;
-    TimeExpressionOption<uint16_t> ATTACK_TO_CATCH_DELAY;
-    TimeExpressionOption<uint16_t> RETURN_TO_OVERWORLD_DELAY;
-    TimeExpressionOption<uint32_t> TOUCH_DATE_INTERVAL;
-};
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/PokemonSwSh_SynchronizedSpinning.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/PokemonSwSh_SynchronizedSpinning.cpp
deleted file mode 100644
index 4e6689cd0a..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/PokemonSwSh_SynchronizedSpinning.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-/*  Synchronized Spinning
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonSwSh_SynchronizedSpinning.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-    using namespace Pokemon;
-
-
-SynchronizedSpinning_Descriptor::SynchronizedSpinning_Descriptor()
-    : MultiSwitchProgramDescriptor(
-        "PokemonSwSh:SynchronizedSpinning",
-        STRING_POKEMON + " SwSh", "Synchronized Spinning", "",
-        "Don't ask... seriously, don't ask...",
-        FeedbackType::NONE,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB,
-        1, 4, 1
-    )
-{}
-
-
-
-SynchronizedSpinning::SynchronizedSpinning(){}
-
-void SynchronizedSpinning::program(MultiSwitchProgramEnvironment& env, CancellableScope& scope){
-    env.run_in_parallel(
-        scope,
-        [&](ConsoleHandle& console, BotBaseContext& context){
-            pbf_move_left_joystick(context, 128, 255, 5, 20);
-            while (true){
-                pbf_move_left_joystick(context, 128, 0, 5, 0);
-                pbf_move_left_joystick(context, 255, 0, 5, 0);
-                pbf_move_left_joystick(context, 255, 128, 5, 0);
-                pbf_move_left_joystick(context, 255, 255, 5, 0);
-                pbf_move_left_joystick(context, 128, 255, 5, 0);
-                pbf_move_left_joystick(context, 0, 255, 5, 0);
-                pbf_move_left_joystick(context, 0, 128, 5, 0);
-                pbf_move_left_joystick(context, 0, 0, 5, 0);
-            }
-        }
-    );
-}
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/QoLMacros/PokemonSwSh_FastCodeEntry.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/QoLMacros/PokemonSwSh_FastCodeEntry.cpp
deleted file mode 100644
index cb1f53559a..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/QoLMacros/PokemonSwSh_FastCodeEntry.cpp
+++ /dev/null
@@ -1,68 +0,0 @@
-/*  Fast Code Entry
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Device.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_DigitEntry.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonSwSh_FastCodeEntry.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-    using namespace Pokemon;
-
-
-FastCodeEntry_Descriptor::FastCodeEntry_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonSwSh:FastCodeEntry",
-        STRING_POKEMON + " SwSh", "Fast Code Entry (FCE)",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonSwSh/FastCodeEntry.md",
-        "Force your way into raids by entering 8-digit codes in under 1 second.",
-        FeedbackType::NONE,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-
-
-
-FastCodeEntry::FastCodeEntry()
-    : RAID_CODE(
-        "<b>Raid Code:</b>",
-        8,
-        "9107 3091"
-    )
-    , INITIAL_DELAY(
-        "<b>Initial Delay:</b><br>Wait this long before entering the code.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "0 * TICKS_PER_SECOND"
-    )
-{
-    PA_ADD_OPTION(RAID_CODE);
-    PA_ADD_OPTION(INITIAL_DELAY);
-}
-
-void FastCodeEntry::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    uint8_t code[8];
-    RAID_CODE.to_str(code);
-
-    if (INITIAL_DELAY != 0){
-        start_program_flash(context, INITIAL_DELAY);
-    }
-
-    pbf_press_button(context, BUTTON_PLUS, 5, 5);
-    pbf_press_button(context, BUTTON_PLUS, 5, 5);
-    enter_digits(context, 8, code);
-}
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/QoLMacros/PokemonSwSh_FastCodeEntry.h b/SerialPrograms/Source/PokemonSwSh/Programs/QoLMacros/PokemonSwSh_FastCodeEntry.h
deleted file mode 100644
index 6ef62811cf..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/QoLMacros/PokemonSwSh_FastCodeEntry.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*  Fast Code Entry
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_FastCodeEntry_H
-#define PokemonAutomation_PokemonSwSh_FastCodeEntry_H
-
-#include "Common/Cpp/Options/FixedCodeOption.h"
-#include "Common/Cpp/Options/TimeExpressionOption.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-class FastCodeEntry_Descriptor : public SingleSwitchProgramDescriptor{
-public:
-    FastCodeEntry_Descriptor();
-};
-
-
-
-class FastCodeEntry : public SingleSwitchProgramInstance{
-public:
-    FastCodeEntry();
-
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-    FixedCodeOption RAID_CODE;
-    TimeExpressionOption<uint16_t> INITIAL_DELAY;
-};
-
-
-
-
-}
-}
-}
-#endif
-
-
-
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/QoLMacros/PokemonSwSh_FriendSearchDisconnect.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/QoLMacros/PokemonSwSh_FriendSearchDisconnect.cpp
deleted file mode 100644
index a21d4c3adb..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/QoLMacros/PokemonSwSh_FriendSearchDisconnect.cpp
+++ /dev/null
@@ -1,57 +0,0 @@
-/*  Friend Search Disconnect
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "NintendoSwitch/FixedInterval.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonSwSh/PokemonSwSh_Settings.h"
-#include "PokemonSwSh/Commands/PokemonSwSh_Commands_GameEntry.h"
-#include "PokemonSwSh/Commands/PokemonSwSh_Commands_AutoHosts.h"
-#include "PokemonSwSh_FriendSearchDisconnect.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-    using namespace Pokemon;
-
-
-FriendSearchDisconnect_Descriptor::FriendSearchDisconnect_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonSwSh:FriendSearchDisconnect",
-        STRING_POKEMON + " SwSh", "Friend Search Disconnect",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonSwSh/FriendSearchDisconnect.md",
-        "Disconnect from the internet using the friend search method.",
-        FeedbackType::NONE,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-
-
-
-FriendSearchDisconnect::FriendSearchDisconnect()
-    : USER_SLOT(
-        "<b>User Slot:</b><br>Use this profile to disconnect.",
-        LockWhileRunning::LOCKED,
-        1, 1, 8
-    )
-{
-    PA_ADD_OPTION(USER_SLOT);
-}
-
-void FriendSearchDisconnect::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    ssf_press_button2(context, BUTTON_HOME, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE, 10);
-
-    home_to_add_friends(context, USER_SLOT - 1, 1, true);
-
-    //  Enter friend search.
-    pbf_mash_button(context, BUTTON_A, 100);
-    settings_to_enter_game(context, true);
-}
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/QoLMacros/PokemonSwSh_FriendSearchDisconnect.h b/SerialPrograms/Source/PokemonSwSh/Programs/QoLMacros/PokemonSwSh_FriendSearchDisconnect.h
deleted file mode 100644
index eeea3bb9fb..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/QoLMacros/PokemonSwSh_FriendSearchDisconnect.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*  Friend Search Disconnect
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_FriendSearchDisconnect_H
-#define PokemonAutomation_PokemonSwSh_FriendSearchDisconnect_H
-
-#include "Common/Cpp/Options/SimpleIntegerOption.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-class FriendSearchDisconnect_Descriptor : public SingleSwitchProgramDescriptor{
-public:
-    FriendSearchDisconnect_Descriptor();
-};
-
-
-
-class FriendSearchDisconnect : public SingleSwitchProgramInstance{
-public:
-    FriendSearchDisconnect();
-
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-    SimpleIntegerOption<uint8_t> USER_SLOT;
-};
-
-
-
-
-}
-}
-}
-#endif
-
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/RNG/PokemonSwSh_BasicRNG.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/RNG/PokemonSwSh_BasicRNG.cpp
deleted file mode 100644
index 9a80bdb7a0..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/RNG/PokemonSwSh_BasicRNG.cpp
+++ /dev/null
@@ -1,162 +0,0 @@
-/*  Basic RNG manipulation 
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <algorithm>
-#include "Common/Cpp/PrettyPrint.h"
-#include "CommonFramework/Exceptions/OperationFailedException.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "PokemonSwSh/Inference/RNG/PokemonSwSh_OrbeetleAttackAnimationDetector.h"
-#include "PokemonSwSh/Programs/RNG/PokemonSwSh_BasicRNG.h"
-
-namespace PokemonAutomation {
-namespace NintendoSwitch {
-namespace PokemonSwSh {
-
-Xoroshiro128PlusState find_rng_state(
-    ConsoleHandle& console,
-    BotBaseContext& context,
-    bool save_screenshots,
-    bool log_image_values
-) {
-    OrbeetleAttackAnimationDetector detector(console, context);
-    uint64_t last_bits0 = 0;
-    uint64_t last_bits1 = 0;
-
-    for (size_t i = 0; i < 128; i++) {
-        context.wait_for_all_requests();
-        std::string text = std::to_string(i + 1) + "/128";
-        console.log("RNG: Attack animation " + text);
-        OrbeetleAttackAnimationDetector::Detection detection = detector.run(save_screenshots, log_image_values);
-        uint64_t last_bit = 0;
-        switch (detection) {
-        case OrbeetleAttackAnimationDetector::NO_DETECTION:
-            throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, console,
-                "Attack animation could not be detected.",
-                true
-            );
-        case OrbeetleAttackAnimationDetector::SPECIAL:
-            text += " : Special";
-            last_bit = 1;
-            break;
-        case OrbeetleAttackAnimationDetector::PHYSICAL:
-            text += " : Physical";
-            last_bit = 0;
-            break;
-        }
-        console.overlay().add_log(text, COLOR_BLUE);
-        pbf_wait(context, 180);
-
-        if (i < 64) {
-            last_bits0 += last_bit << (63 - i);
-        }
-        else {
-            last_bits1 += last_bit << (63 - (i - 64));
-        }
-    }
-    Xoroshiro128Plus rng = Xoroshiro128Plus::xoroshiro128plus_from_last_bits(std::pair(last_bits0, last_bits1));
-
-    for (size_t j = 0; j < 128; j++) {
-        rng.next();
-    }
-    console.log("RNG: state[0] = " + tostr_hex(rng.get_state().s0));
-    console.log("RNG: state[1] = " + tostr_hex(rng.get_state().s1));
-    return rng.get_state();
-}
-
-
-Xoroshiro128PlusState refind_rng_state(
-    ConsoleHandle& console,
-    BotBaseContext& context,
-    Xoroshiro128PlusState last_known_state,
-    size_t min_advances,
-    size_t max_advances,
-    bool save_screenshots,
-    bool log_image_values)
-{
-    Xoroshiro128Plus rng(last_known_state.s0, last_known_state.s1);
-    for (size_t i = 0; i < min_advances; i++) {
-        rng.next();
-    }
-    OrbeetleAttackAnimationDetector detector(console, context);
-    size_t possible_indices = SIZE_MAX;
-    std::vector<bool> sequence = {};
-    std::vector<bool> last_bit_sequence = rng.generate_last_bit_sequence(max_advances - min_advances);
-    size_t distance = 0;
-
-    size_t i = 0;
-    while (possible_indices > 1) {
-        context.wait_for_all_requests();
-
-        std::string text = std::to_string(++i) + "/?";
-        OrbeetleAttackAnimationDetector::Detection detection = detector.run(save_screenshots, log_image_values);
-        switch (detection) {
-        case OrbeetleAttackAnimationDetector::NO_DETECTION:
-            throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, console,
-                "Attack animation could not be detected.",
-                true
-            );
-        case OrbeetleAttackAnimationDetector::SPECIAL:
-            text += " : Special";
-            sequence.emplace_back(true);
-            break;
-        case OrbeetleAttackAnimationDetector::PHYSICAL:
-            text += " : Physical";
-            sequence.emplace_back(false);
-            break;
-        }
-        console.overlay().add_log(text, COLOR_BLUE);
-        pbf_wait(context, 180);
-
-        std::vector<bool>::iterator last_bit_start = std::search(last_bit_sequence.begin(), last_bit_sequence.end(), sequence.begin(), sequence.end());
-        possible_indices = 0;
-        distance = 0;
-        while (last_bit_start != last_bit_sequence.end()) {
-            possible_indices++;
-            distance = std::distance(last_bit_sequence.begin(), last_bit_start);
-
-            last_bit_start++;
-            last_bit_start = std::search(last_bit_start, last_bit_sequence.end(), sequence.begin(), sequence.end());
-        }
-    }
-    if (possible_indices == 0) {
-        throw OperationFailedException(
-            ErrorReport::SEND_ERROR_REPORT, console,
-            "Detected sequence of attack motions does not exist in expected range."
-        );
-    }
-
-    distance += sequence.size();
-    console.log("RNG: needed " + std::to_string(sequence.size()) + " animations.");
-    console.log("RNG: new state is " + std::to_string(distance + min_advances) + " advances from last known state.");
-    for (size_t advance = 0; advance < distance; advance++) {
-        rng.next();
-    }
-    console.log("RNG: state[0] = " + tostr_hex(rng.get_state().s0));
-    console.log("RNG: state[1] = " + tostr_hex(rng.get_state().s1));
-
-    return rng.get_state();
-}
-
-
-void do_rng_advances(ConsoleHandle& console, BotBaseContext& context, Xoroshiro128Plus& rng, size_t advances, uint16_t press_duration, uint16_t release_duration) {
-    for (size_t i = 0; i < advances; i++) {
-        if ((i + 1) % 10 == 0) {
-            std::string text = std::to_string(i + 1) + "/" + std::to_string(advances);
-            console.log("RNG advance: " + text);
-            console.overlay().add_log("Advancing: " + text, COLOR_GREEN);
-        }
-        pbf_press_button(context, BUTTON_RCLICK, press_duration, release_duration);
-        rng.next();
-    }
-    pbf_wait(context, 1 * TICKS_PER_SECOND);
-}
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/RNG/PokemonSwSh_BasicRNG.h b/SerialPrograms/Source/PokemonSwSh/Programs/RNG/PokemonSwSh_BasicRNG.h
deleted file mode 100644
index c4a98e5902..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/RNG/PokemonSwSh_BasicRNG.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*  Basic RNG manipulation
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/Tools/ConsoleHandle.h"
-#include "PokemonSwSh/Inference/RNG/PokemonSwSh_OrbeetleAttackAnimationDetector.h"
-#include "PokemonSwSh/Programs/RNG/PokemonSwSh_Xoroshiro128Plus.h"
-
-namespace PokemonAutomation {
-class BotBaseContext;
-namespace NintendoSwitch {
-namespace PokemonSwSh {
-
-// Performs 128 Orbeetle attack animations. 
-// Returns the state after those animations.
-Xoroshiro128PlusState find_rng_state(
-    ConsoleHandle& console, BotBaseContext& context,
-    bool save_screenshots, bool log_values
-);
-
-// Performs Orbeetle attack animations until only one possible state is left.
-// Returns the state after those animations.
-Xoroshiro128PlusState refind_rng_state(
-    ConsoleHandle& console,
-    BotBaseContext& context,
-    Xoroshiro128PlusState last_known_state,
-    size_t min_advances,
-    size_t max_advances,
-    bool save_screenshots,
-    bool log_values
-);
-
-void do_rng_advances(ConsoleHandle& env, BotBaseContext& context, Xoroshiro128Plus& rng, size_t advances, uint16_t press_duration = 10, uint16_t release_duration = 10);
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/RNG/PokemonSwSh_CramomaticRNG.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/RNG/PokemonSwSh_CramomaticRNG.cpp
deleted file mode 100644
index 217a6dfa42..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/RNG/PokemonSwSh_CramomaticRNG.cpp
+++ /dev/null
@@ -1,582 +0,0 @@
-/*  Cram-o-matic RNG Manipulation
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- *  Credit goes to Anubis for discovering how the Cram-o-matic works
- *  and for the original code to calculate how many advances are needed
- *  to get the wanted balls.
- *
- */
-
-#include <algorithm>
-#include <set>
-#include "CommonFramework/Exceptions/ProgramFinishedException.h"
-#include "CommonFramework/Exceptions/OperationFailedException.h"
-#include "CommonFramework/ImageTools/ImageStats.h"
-#include "CommonFramework/ImageTools/SolidColorTest.h"
-#include "CommonFramework/Notifications/ProgramNotifications.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "CommonFramework/Tools/StatsTracking.h"
-#include "CommonFramework/Tools/DebugDumper.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "NintendoSwitch/NintendoSwitch_Settings.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "Pokemon/Inference/Pokemon_PokeballNameReader.h"
-#include "Pokemon/Inference/Pokemon_NameReader.h"
-#include "PokemonSwSh/PokemonSwSh_Settings.h"
-#include "PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.h"
-#include "PokemonSwSh/Inference/PokemonSwSh_SelectionArrowFinder.h"
-#include "PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
-#include "PokemonSwSh/Programs/RNG/PokemonSwSh_BasicRNG.h"
-#include "PokemonSwSh/Programs/RNG/PokemonSwSh_CramomaticRNG.h"
-
-//#include <iostream>
-//using std::cout;
-//using std::endl;
-
-namespace PokemonAutomation {
-namespace NintendoSwitch {
-namespace PokemonSwSh {
-using namespace Pokemon;
-
-CramomaticRNG_Descriptor::CramomaticRNG_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonSwSh:CramomaticRNG",
-        STRING_POKEMON + " SwSh", "Cram-o-matic RNG",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonSwSh/CramomaticRNG.md",
-        "Perform RNG manipulation to get rare balls from the Cram-o-matic.",
-        FeedbackType::REQUIRED,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-
-class CramomaticRNG_Descriptor::Stats : public StatsTracker{
-public:
-    Stats()
-        : iterations(m_stats["Iterations"])
-        , reads(m_stats["Seed Reads"])
-        , errors(m_stats["Errors"])
-        , total_balls(m_stats["Balls"])
-        , apri_balls(m_stats["Apriballs"])
-        , sport_safari_balls(m_stats["Safari/Sport Balls"])
-        , bonus(m_stats["Bonus"])
-    {
-        m_display_order.emplace_back("Iterations");
-        m_display_order.emplace_back("Seed Reads");
-        m_display_order.emplace_back("Errors", true);
-        m_display_order.emplace_back("Balls");
-        m_display_order.emplace_back("Apriballs");
-        m_display_order.emplace_back("Safari/Sport Balls");
-        m_display_order.emplace_back("Bonus", true);
-    }
-
-public:
-    std::atomic<uint64_t>& iterations;
-    std::atomic<uint64_t>& reads;
-    std::atomic<uint64_t>& errors;
-    std::atomic<uint64_t>& total_balls;
-    std::atomic<uint64_t>& apri_balls;
-    std::atomic<uint64_t>& sport_safari_balls;
-    std::atomic<uint64_t>& bonus;
-};
-std::unique_ptr<StatsTracker> CramomaticRNG_Descriptor::make_stats() const{
-    return std::unique_ptr<StatsTracker>(new Stats());
-}
-
-CramomaticRNG::CramomaticRNG()
-    : LANGUAGE(
-        "<b>Game Language:</b><br>Required to read the ball received.",
-        PokemonNameReader::instance().languages(),
-        LockWhileRunning::LOCKED,
-        true
-    )
-    , NUM_APRICORN_ONE(
-        "<b>Primary Apricorns:</b><br>Number of Apricorns in the selected slot.",
-        LockWhileRunning::LOCKED,
-        0
-    )
-    , NUM_APRICORN_TWO(
-        "<b>Secondary Apricorns:</b><br>Number of Apricorns in the slot below the selected one.",
-        LockWhileRunning::LOCKED,
-        0
-    )
-    , NUM_NPCS(
-        "<b>NPCs:</b><br>Number of NPCs in the dojo, including " + STRING_POKEMON + ".",
-        LockWhileRunning::LOCKED,
-        21
-    )
-    , BALL_TABLE(
-        "<b>Wanted Balls:</b><br>Exact kind depends on the currently selected apricorn."
-    )
-    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
-    , NOTIFICATIONS({
-        &NOTIFICATION_STATUS_UPDATE,
-        &NOTIFICATION_PROGRAM_FINISH,
-        &NOTIFICATION_ERROR_RECOVERABLE,
-        &NOTIFICATION_ERROR_FATAL,
-    })
-    , m_advanced_options(
-        "<font size=4><b>Advanced Options:</b> You should not need to touch anything below here.</font>"
-    )
-    , MAX_PRIORITY_ADVANCES(
-        "<b>Priority Advances:</b><br>How many advances to check when checking for higher priority selections.",
-        LockWhileRunning::LOCKED,
-        300
-    )
-    , MAX_UNKNOWN_ADVANCES(
-        "<b>Max Unknown advances:</b><br>How many advances to check when updating the rng state.",
-        LockWhileRunning::LOCKED,
-        300
-    )
-    , ADVANCE_PRESS_DURATION(
-        "<b>Advance Press Duration:</b><br>Hold the button down for this long to advance once.",
-        LockWhileRunning::LOCKED,
-        10
-    )
-    , ADVANCE_RELEASE_DURATION(
-        "<b>Advance Release Duration:</b><br>After releasing the button, wait this long before pressing it again.",
-        LockWhileRunning::LOCKED,
-        10
-    )
-    , SAVE_SCREENSHOTS(
-        "<b>Save Debug Screenshots:</b>",
-        LockWhileRunning::LOCKED,
-        false
-    )
-    , LOG_VALUES(
-        "<b>Log Animation Values:</br>",
-        LockWhileRunning::LOCKED,
-        false
-    )
-{
-    PA_ADD_OPTION(START_LOCATION);
-
-    PA_ADD_OPTION(LANGUAGE);
-    PA_ADD_OPTION(NUM_APRICORN_ONE);
-    PA_ADD_OPTION(NUM_APRICORN_TWO);
-    PA_ADD_OPTION(NUM_NPCS);
-    PA_ADD_OPTION(BALL_TABLE);
-
-    PA_ADD_OPTION(TOUCH_DATE_INTERVAL);
-
-    PA_ADD_OPTION(NOTIFICATIONS);
-
-    PA_ADD_STATIC(m_advanced_options);
-    PA_ADD_OPTION(MAX_PRIORITY_ADVANCES);
-    PA_ADD_OPTION(MAX_UNKNOWN_ADVANCES);
-    PA_ADD_OPTION(ADVANCE_PRESS_DURATION);
-    PA_ADD_OPTION(ADVANCE_RELEASE_DURATION);
-    PA_ADD_OPTION(SAVE_SCREENSHOTS);
-    PA_ADD_OPTION(LOG_VALUES);
-}
-
-void CramomaticRNG::navigate_to_party(SingleSwitchProgramEnvironment& env, BotBaseContext& context) {
-    pbf_press_button(context, BUTTON_X, 10, 125);
-    pbf_press_button(context, BUTTON_A, 10, 10);
-    pbf_wait(context, 2 * TICKS_PER_SECOND);
-}
-
-CramomaticTarget CramomaticRNG::calculate_target(SingleSwitchProgramEnvironment& env, Xoroshiro128PlusState state, std::vector<CramomaticSelection> selected_balls){
-    Xoroshiro128Plus rng(state);
-    size_t advances = 0;
-    uint16_t priority_advances = 0;
-    std::vector<CramomaticTarget> possible_targets;
-
-    std::sort(selected_balls.begin(), selected_balls.end(), [](CramomaticSelection sel1, CramomaticSelection sel2) { return sel1.priority > sel2.priority; });
-    // priority_advances only starts counting up after the first good result is found
-    while (priority_advances <= MAX_PRIORITY_ADVANCES) {
-        // calculate the result for the current temp_rng state
-        Xoroshiro128Plus temp_rng(rng.get_state());
-
-        for (size_t i = 0; i < NUM_NPCS; i++) {
-            temp_rng.nextInt(91);
-        }
-        temp_rng.next();
-        temp_rng.nextInt(60);
-
-        /*uint64_t item_roll =*/ temp_rng.nextInt(4);
-        uint64_t ball_roll = temp_rng.nextInt(100);
-        bool is_safari_sport = temp_rng.nextInt(1000) == 0;
-        bool is_bonus = false;
-
-        if (is_safari_sport || ball_roll == 99) {
-            is_bonus = temp_rng.nextInt(1000) == 0;
-        }
-        else {
-            is_bonus = temp_rng.nextInt(100) == 0;
-        }
-
-        CramomaticBallType type;
-        if (is_safari_sport) {
-            type = CramomaticBallType::Safari;
-        }
-        else if (ball_roll < 25) {
-            type = CramomaticBallType::Poke;
-        }
-        else if (ball_roll < 50) {
-            type = CramomaticBallType::Great;
-        }
-        else if (ball_roll < 75) {
-            type = CramomaticBallType::Shop1;
-        }
-        else if (ball_roll < 99) {
-            type = CramomaticBallType::Shop2;
-        }
-        else {
-            type = CramomaticBallType::Apricorn;
-        }
-        
-
-        // check whether the result is a good result
-        for (size_t i = 0; i < selected_balls.size(); i++) {
-            CramomaticSelection selection = selected_balls[i];
-            if (!selection.is_bonus || is_bonus) {
-                if (is_safari_sport) {
-                    if (selection.ball_type == CramomaticBallType::Safari || selection.ball_type == CramomaticBallType::Sport) {
-                        type = selection.ball_type;
-                    }
-                }
-                
-                if (selection.ball_type == type) {
-                    CramomaticTarget target;
-                    target.ball_type = type;
-                    target.is_bonus = is_bonus;
-                    target.needed_advances = advances;
-                    possible_targets.emplace_back(target);
-
-                    priority_advances = 0;
-
-                    uint16_t priority = selection.priority;
-                    selected_balls.erase(
-                        std::remove_if(selected_balls.begin(), selected_balls.end()
-                            , [priority](CramomaticSelection sel) { return sel.priority <= priority; })
-                        , selected_balls.end());
-                    break;
-                }
-
-            }
-        }
-        if (possible_targets.size() > 0) {
-            if (selected_balls.empty()) {
-                //priority_advances = MAX_PRIORITY_ADVANCES + 1;
-                break;
-            }
-            priority_advances++;
-        }
-
-        rng.next();
-        advances++;
-    }
-
-    // Choose the first result which doesn't overshadow a higher priority choice.
-    // Ignores rng advances done by NPCs when the menu closes
-    while (possible_targets.size() > 1) {
-        auto last_target = possible_targets.end() - 1;
-        auto second_to_last_target = possible_targets.end() - 2;
-
-        if ((*last_target).needed_advances - (*second_to_last_target).needed_advances > MAX_PRIORITY_ADVANCES) {
-            possible_targets.erase(last_target);
-        }
-        else {
-            possible_targets.erase(second_to_last_target);
-        }
-    }
-
-    return possible_targets[0];
-}
-
-void CramomaticRNG::leave_to_overworld_and_interact(SingleSwitchProgramEnvironment& env, BotBaseContext& context) {
-    pbf_press_button(context, BUTTON_B, 2 * TICKS_PER_SECOND, 5);
-    pbf_press_button(context, BUTTON_B, 10, 70);
-
-    pbf_mash_button(context, BUTTON_A, 320);
-    pbf_wait(context, 125);
-}
-
-void CramomaticRNG::choose_apricorn(SingleSwitchProgramEnvironment& env, BotBaseContext& context, bool sport) {
-    // check whether the bag is open
-    context.wait_for_all_requests();
-    VideoOverlaySet boxes(env.console);
-    SelectionArrowFinder bag_arrow_detector(env.console, ImageFloatBox(0.465, 0.195, 0.054, 0.57));
-    bag_arrow_detector.make_overlays(boxes);
-
-    int ret = wait_until(env.console, context, Milliseconds(5000), { bag_arrow_detector });
-    if (ret < 0) {
-        throw OperationFailedException(
-            ErrorReport::SEND_ERROR_REPORT, env.console,
-            "Could not detect bag.",
-            true
-        );
-    }
-
-    // select the apricorn(s)
-    pbf_wait(context, 1 * TICKS_PER_SECOND);
-    pbf_press_button(context, BUTTON_A, 10, 30);
-    if (sport) {
-        pbf_press_dpad(context, DPAD_DOWN, 20, 10);
-    }
-    pbf_press_button(context, BUTTON_A, 10, 30);
-    pbf_press_button(context, BUTTON_A, 10, 30);
-    if (sport) {
-        pbf_press_dpad(context, DPAD_UP, 20, 10);
-    }
-    pbf_press_button(context, BUTTON_A, 10, 30);
-
-    pbf_mash_button(context, BUTTON_A, 5 * TICKS_PER_SECOND);
-}
-
-std::pair<bool, std::string> CramomaticRNG::receive_ball(SingleSwitchProgramEnvironment& env, BotBaseContext& context) {
-    // receive ball and refuse to use the cram-o-matic again
-    VideoOverlaySet boxes(env.console);
-
-    SelectionArrowFinder arrow_detector(env.console, ImageFloatBox(0.350, 0.450, 0.500, 0.400));
-    arrow_detector.make_overlays(boxes);
-
-    OverlayBoxScope dialog_text(env.console, {0.21, 0.80, 0.53, 0.17});
-    OverlayBoxScope dialog_box(env.console, {0.70, 0.90, 0.03, 0.05});
-    const double LOG10P_THRESHOLD = -1.5;
-    std::string best_ball;
-
-    size_t presses = 0;
-    bool arrow_detected = false;
-
-    while (presses < 30 && !arrow_detected) {
-        presses++;
-        pbf_press_button(context, BUTTON_B, 10, 165);
-        context.wait_for_all_requests();
-
-        VideoSnapshot screen = env.console.video().snapshot();
-        if (SAVE_SCREENSHOTS) {
-            dump_debug_image(env.logger(), "cramomatic-rng", "receive", screen);
-        }
-
-        //  If we detect a dialog box, attempt to read the ball that was received.
-        ImageStats stats = image_stats(extract_box_reference(screen, dialog_box));
-//        cout << stats.average << stats.stddev << endl;
-        if (is_grey(stats, 0, 200, 5)){
-            OCR::StringMatchResult result = PokeballNameReader::instance().read_substring(
-                env.console, LANGUAGE,
-                extract_box_reference(screen, dialog_text),
-                {{0xff007f7f, 0xffc0ffff}}
-            );
-            result.clear_beyond_log10p(LOG10P_THRESHOLD);
-            if (best_ball.empty() && !result.results.empty()){
-                auto iter = result.results.begin();
-                if (iter->first < LOG10P_THRESHOLD){
-                    best_ball = iter->second.token;
-                }
-            }
-        }
-
-        if (arrow_detector.detect(screen)) {
-            arrow_detected = true;
-        }
-    }
-    pbf_press_button(context, BUTTON_B, 10, TICKS_PER_SECOND);
-    return {arrow_detected, best_ball};
-}
-
-void CramomaticRNG::recover_from_wrong_state(SingleSwitchProgramEnvironment& env, BotBaseContext& context) {
-    // Mash the B button to exit potential menus or dialog boxes
-    pbf_mash_button(context, BUTTON_B, 30 * TICKS_PER_SECOND);
-
-    // take a step in case Hyde repositioned the player
-    pbf_move_left_joystick(context, 128, 0, TICKS_PER_SECOND, 10);
-
-    context.wait_for_all_requests();
-}
-
-
-void CramomaticRNG::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) {
-    CramomaticRNG_Descriptor::Stats& stats = env.current_stats<CramomaticRNG_Descriptor::Stats>();
-    env.update_stats();
-
-    std::vector<CramomaticSelection> selections = BALL_TABLE.selected_balls();
-    if (selections.empty()) {
-        throw UserSetupError(env.console, "At least one type of ball needs to be selected!");
-    }
-
-
-    if (START_LOCATION.start_in_grip_menu()) {
-        grip_menu_connect_go_home(context);
-        resume_game_back_out(env.console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST, 200);
-    }
-    else {
-        pbf_press_button(context, BUTTON_B, 5, 5);
-    }
-
-    static const std::set<std::string> APRIBALLS{
-        "fast-ball",
-        "friend-ball",
-        "lure-ball",
-        "level-ball",
-        "heavy-ball",
-        "love-ball",
-        "moon-ball",
-    };
-    static const std::set<std::string> RARE_BALLS{
-        "sport-ball",
-        "safari-ball",
-    };
-
-    Xoroshiro128Plus rng(0, 0);
-    bool is_state_valid = false;
-    uint32_t num_apricorn_one = NUM_APRICORN_ONE;
-    uint32_t num_apricorn_two = NUM_APRICORN_TWO;
-
-    // if there is no Sport Ball in the selected balls we ignore num_apricorn_two
-    bool sport_wanted = false;
-    for (CramomaticSelection selection : selections) {
-        if (selection.ball_type == CramomaticBallType::Sport) {
-            sport_wanted = true;
-            break;
-        }
-    }
-
-    size_t iteration = 0;
-    uint16_t state_errors = 0;
-    uint16_t apricorn_selection_errors = 0;
-    while (num_apricorn_one > 4 && (!sport_wanted || num_apricorn_two > 2)) {
-        send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
-
-        //  Touch the date.
-        if (TOUCH_DATE_INTERVAL.ok_to_touch_now()){
-            env.log("Touching date to prevent rollover.");
-            pbf_press_button(context, BUTTON_HOME, 10, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE);
-            touch_date_from_home(context, ConsoleSettings::instance().SETTINGS_TO_HOME_DELAY);
-            resume_game_no_interact(env.console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST);
-        }
-
-        env.console.log("Cram-o-matic RNG iteration: " + std::to_string(iteration));
-        navigate_to_party(env, context);
-        context.wait_for_all_requests();
-
-        if (!is_state_valid) {
-            rng = Xoroshiro128Plus(find_rng_state(env.console, context, SAVE_SCREENSHOTS, LOG_VALUES));
-//            rng = Xoroshiro128Plus(100, 10000);
-            is_state_valid = true;
-            stats.reads++;
-        }
-        else {
-            rng = Xoroshiro128Plus(refind_rng_state(env.console, context, rng.get_state(), 0, MAX_UNKNOWN_ADVANCES, SAVE_SCREENSHOTS, LOG_VALUES));
-            stats.reads++;
-        }
-        env.update_stats();
-
-        Xoroshiro128PlusState rng_state = rng.get_state();
-        if (rng_state.s0 == 0 && rng_state.s1 == 0) {
-            stats.errors++;
-            env.update_stats();
-
-            state_errors++;
-            if (state_errors >= 3) {
-                throw OperationFailedException(
-                    ErrorReport::SEND_ERROR_REPORT, env.console,
-                    "Detected invalid RNG state three times in a row."
-                );
-            }
-            VideoSnapshot screen = env.console.video().snapshot();
-            send_program_recoverable_error_notification(env, NOTIFICATION_ERROR_RECOVERABLE, "Detected invalid RNG state.", screen);
-            recover_from_wrong_state(env, context);
-            is_state_valid = false;
-            continue;
-        }
-
-        CramomaticTarget target = calculate_target(env, rng.get_state(), BALL_TABLE.selected_balls());
-        bool sport = target.ball_type == CramomaticBallType::Sport;
-        env.console.log("Needed advances: " + std::to_string(target.needed_advances));
-        num_apricorn_one -= sport ? 2 : 4;
-        num_apricorn_two -= sport ? 2 : 0;
-
-        do_rng_advances(env.console, context, rng, target.needed_advances, ADVANCE_PRESS_DURATION, ADVANCE_RELEASE_DURATION);
-        leave_to_overworld_and_interact(env, context);
-
-        try {
-            choose_apricorn(env, context, sport);
-        }
-        catch (OperationFailedException& e) {
-            stats.errors++;
-            env.update_stats();
-            e.send_notification(env, NOTIFICATION_ERROR_RECOVERABLE);
-
-            apricorn_selection_errors++;
-            if (apricorn_selection_errors >= 3) {
-                throw OperationFailedException(
-                    ErrorReport::SEND_ERROR_REPORT, env.console,
-                    "Could not detect the bag three times on a row.",
-                    true
-                );
-            }
-            VideoSnapshot screen = env.console.video().snapshot();
-            send_program_recoverable_error_notification(env, NOTIFICATION_ERROR_RECOVERABLE, "Could not detect the bag.", screen);
-            is_state_valid = false;
-            recover_from_wrong_state(env, context);
-            continue;
-        }
-
-        std::pair<bool, std::string> result = receive_ball(env, context);
-
-        //  Update ball stats.
-        if (!result.second.empty()){
-            stats.total_balls++;
-        }
-        auto iter = APRIBALLS.find(result.second);
-        if (iter != APRIBALLS.end()){
-            stats.apri_balls++;
-        }
-        iter = RARE_BALLS.find(result.second);
-        if (iter != RARE_BALLS.end()){
-            stats.sport_safari_balls++;
-        }
-
-        //  Out of apricorns.
-        if (!result.first || num_apricorn_one <= 4 || (sport_wanted && num_apricorn_two <= 2)){
-            throw ProgramFinishedException(env.console, "Out of apricorns.");
-        }
-
-
-#if 0
-//        cout << "Ball Slug = " << ball << endl;
-        if (result.first || num_apricorn_one <= 4 || (sport_wanted && num_apricorn_two <= 2)){
-        }else{
-            is_state_valid = false;
-            stats.errors++;
-        }
-#endif
-
-#if 0
-        if (!ball.empty() || num_apricorn_one <= 4 || (sport_wanted && num_apricorn_two <= 2)){
-            int amount = target.is_bonus ? 5 : 1;
-            if (target.is_bonus) {
-                stats.bonus++;
-            }
-            if (target.ball_type == CramomaticBallType::Apricorn) {
-                stats.apri_balls += amount;
-            }
-            else if (target.ball_type == CramomaticBallType::Sport || target.ball_type == CramomaticBallType::Safari) {
-                stats.sport_safari_balls += amount;
-            }
-            stats.total_balls += amount;
-        }else{
-            is_state_valid = false;
-            stats.errors++;
-        }
-#endif
-        env.update_stats();
-
-        state_errors = 0;
-        apricorn_selection_errors = 0;
-
-        iteration++;
-        stats.iterations++;
-        env.update_stats();
-    }
-    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
-}
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/RNG/PokemonSwSh_CramomaticRNG.h b/SerialPrograms/Source/PokemonSwSh/Programs/RNG/PokemonSwSh_CramomaticRNG.h
deleted file mode 100644
index 7f3745c42a..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/RNG/PokemonSwSh_CramomaticRNG.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*  Cram-o-matic RNG Manipulation
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_CramomaticRNG_H
-#define PokemonAutomation_PokemonSwSh_CramomaticRNG_H
-
-#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
-#include "Common/Cpp/Options/SimpleIntegerOption.h"
-#include "Common/Cpp/Options/StaticTextOption.h"
-#include "CommonFramework/Notifications/EventNotificationsTable.h"
-#include "CommonFramework/Options/LanguageOCROption.h"
-#include "NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-#include "PokemonSwSh/Options/PokemonSwSh_DateToucher.h"
-#include "PokemonSwSh/Options/PokemonSwSh_CramomaticTable.h"
-#include "PokemonSwSh/Programs/RNG/PokemonSwSh_Xoroshiro128Plus.h"
-
-namespace PokemonAutomation {
-namespace NintendoSwitch {
-namespace PokemonSwSh {
-
-
-class CramomaticRNG_Descriptor : public SingleSwitchProgramDescriptor {
-public:
-    CramomaticRNG_Descriptor();
-
-    class Stats;
-    virtual std::unique_ptr<StatsTracker> make_stats() const override;
-};
-
-struct CramomaticTarget {
-    CramomaticBallType ball_type;
-    bool is_bonus;
-    size_t needed_advances;
-};
-
-class CramomaticRNG : public SingleSwitchProgramInstance {
-public:
-    CramomaticRNG();
-
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-    StartInGripOrGameOption START_LOCATION;
-    OCR::LanguageOCROption LANGUAGE;
-    SimpleIntegerOption<uint32_t> NUM_APRICORN_ONE;
-    SimpleIntegerOption<uint32_t> NUM_APRICORN_TWO;
-    SimpleIntegerOption<uint32_t> NUM_NPCS;
-    CramomaticTable BALL_TABLE;
-
-    TouchDateIntervalOption TOUCH_DATE_INTERVAL;
-
-    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
-    EventNotificationsOption NOTIFICATIONS;
-
-    SectionDividerOption m_advanced_options;
-    SimpleIntegerOption<uint16_t> MAX_PRIORITY_ADVANCES;
-    SimpleIntegerOption<uint16_t> MAX_UNKNOWN_ADVANCES;
-    SimpleIntegerOption<uint16_t> ADVANCE_PRESS_DURATION;
-    SimpleIntegerOption<uint16_t> ADVANCE_RELEASE_DURATION;
-    BooleanCheckBoxOption SAVE_SCREENSHOTS;
-    BooleanCheckBoxOption LOG_VALUES;
-
-    void navigate_to_party(SingleSwitchProgramEnvironment& env, BotBaseContext& context);
-    CramomaticTarget calculate_target(SingleSwitchProgramEnvironment& env, Xoroshiro128PlusState state, std::vector<CramomaticSelection> wanted_balls);
-    void leave_to_overworld_and_interact(SingleSwitchProgramEnvironment& env, BotBaseContext& context);
-    void choose_apricorn(SingleSwitchProgramEnvironment& env, BotBaseContext& context, bool sport);
-    std::pair<bool, std::string> receive_ball(SingleSwitchProgramEnvironment& env, BotBaseContext& context);
-    void recover_from_wrong_state(SingleSwitchProgramEnvironment& env, BotBaseContext& context);
-};
-
-
-
-
-}
-}
-}
-#endif
-
-
-
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/RNG/PokemonSwSh_SeedFinder.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/RNG/PokemonSwSh_SeedFinder.cpp
deleted file mode 100644
index 114c1200b4..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/RNG/PokemonSwSh_SeedFinder.cpp
+++ /dev/null
@@ -1,141 +0,0 @@
-/*  RNG Manipulation SeedFinder
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Cpp/Exceptions.h"
-#include "Common/Cpp/PrettyPrint.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "NintendoSwitch/NintendoSwitch_Settings.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
-#include "PokemonSwSh/Programs/RNG/PokemonSwSh_BasicRNG.h"
-#include "PokemonSwSh/Programs/RNG/PokemonSwSh_SeedFinder.h"
-
-#include <string>
-
-namespace PokemonAutomation {
-namespace NintendoSwitch {
-namespace PokemonSwSh {
-using namespace Pokemon;
-
-SeedFinder_Descriptor::SeedFinder_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonSwSh:SeedFinder",
-        STRING_POKEMON + " SwSh", "Seed Finder",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonSwSh/SeedFinder.md",
-        "Finds the current state to be used for manual RNG manipulation.",
-        FeedbackType::REQUIRED,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-
-SeedFinder::SeedFinder()
-    : STATE_0(
-        false,
-        "<b>state[0]:</b>",
-        LockWhileRunning::LOCKED,
-        "",
-        ""
-    )
-    , STATE_1(
-        false,
-        "<b>state[1]:</b>",
-        LockWhileRunning::LOCKED,
-        "",
-        ""
-    )
-    , UPDATE_STATE(
-        "<b>Update State</b>:<br>Use the last known state to update the rng state.",
-        LockWhileRunning::LOCKED,
-        false
-    )
-    , MIN_ADVANCES(
-        "<b>Min Advances:</b>",
-        LockWhileRunning::LOCKED,
-        0
-    )
-    , MAX_ADVANCES(
-        "<b>Max Advances:</b>",
-        LockWhileRunning::LOCKED,
-        10000
-    )
-    , m_advanced_options(
-        "<font size=4><b>Advanced Options:</b> You should not need to touch anything below here.</font>"
-    )
-    , SAVE_SCREENSHOTS(
-        "<b>Save Debug Screenshots:</b>",
-        LockWhileRunning::LOCKED,
-        false
-    )
-    , LOG_VALUES(
-        "<b>Log Animation Values:</br>",
-        LockWhileRunning::LOCKED,
-        false
-    )
-
-{
-    PA_ADD_OPTION(START_LOCATION);
-    PA_ADD_OPTION(STATE_0);
-    PA_ADD_OPTION(STATE_1);
-    PA_ADD_OPTION(UPDATE_STATE);
-    PA_ADD_OPTION(MIN_ADVANCES);
-    PA_ADD_OPTION(MAX_ADVANCES);
-
-    PA_ADD_STATIC(m_advanced_options);
-    PA_ADD_OPTION(SAVE_SCREENSHOTS);
-    PA_ADD_OPTION(LOG_VALUES);
-}
-
-
-
-void SeedFinder::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) {
-    Xoroshiro128PlusState state(0, 0);
-    // sanitize STATE_0 and STATE_1 and make ints
-    if (UPDATE_STATE) {
-        try {
-            state.s0 = std::stoull(STATE_0, nullptr, 16);
-            state.s1 = std::stoull(STATE_1, nullptr, 16);
-        }
-        catch (std::invalid_argument&) {
-            throw UserSetupError(env.console, "State is invalid.");
-        }
-        catch (std::out_of_range&) {
-            throw UserSetupError(env.console, "State is invalid. Are there any extra characters?");
-        }
-
-        // clean up STATE_0 and STATE_1
-        env.console.log("Known state: " + tostr_hex(state.s0));
-        env.console.log("Known state: " + tostr_hex(state.s1));
-        STATE_0.set(tostr_hex(state.s0));
-        STATE_1.set(tostr_hex(state.s1));
-    }
-
-
-    if (START_LOCATION.start_in_grip_menu()) {
-        grip_menu_connect_go_home(context);
-        resume_game_back_out(env.console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST, 200);
-    }
-    else {
-        pbf_press_dpad(context, DPAD_LEFT, 5, 5);
-    }
-
-
-    if (UPDATE_STATE) {
-        state = refind_rng_state(env.console, context, state, MIN_ADVANCES, MAX_ADVANCES, SAVE_SCREENSHOTS, LOG_VALUES);
-    }
-    else {
-        state = find_rng_state(env.console, context, SAVE_SCREENSHOTS, LOG_VALUES);
-    }
-
-    // show state to the user
-    STATE_0.set(tostr_hex(state.s0));
-    STATE_1.set(tostr_hex(state.s1));
-}
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/RNG/PokemonSwSh_SeedFinder.h b/SerialPrograms/Source/PokemonSwSh/Programs/RNG/PokemonSwSh_SeedFinder.h
deleted file mode 100644
index 74a3c094eb..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/RNG/PokemonSwSh_SeedFinder.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*  RNG Manipulation SeedFinder
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_SeedFinder_H
-#define PokemonAutomation_PokemonSwSh_SeedFinder_H
-
-#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
-#include "Common/Cpp/Options/SimpleIntegerOption.h"
-#include "Common/Cpp/Options/StaticTextOption.h"
-#include "Common/Cpp/Options/StringOption.h"
-#include "NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-#include "PokemonSwSh/Programs/RNG/PokemonSwSh_Xoroshiro128Plus.h"
-
-namespace PokemonAutomation {
-namespace NintendoSwitch {
-namespace PokemonSwSh {
-
-class SeedFinder_Descriptor : public SingleSwitchProgramDescriptor {
-public:
-    SeedFinder_Descriptor();
-};
-
-
-class SeedFinder : public SingleSwitchProgramInstance {
-public:
-    SeedFinder();
-
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-    StartInGripOrGameOption START_LOCATION;
-    
-    StringOption STATE_0;
-    StringOption STATE_1;
-    BooleanCheckBoxOption UPDATE_STATE;
-    SimpleIntegerOption<uint64_t> MIN_ADVANCES;
-    SimpleIntegerOption<uint64_t> MAX_ADVANCES;
-
-    SectionDividerOption m_advanced_options;
-    BooleanCheckBoxOption SAVE_SCREENSHOTS;
-    BooleanCheckBoxOption LOG_VALUES;
-};
-
-
-
-
-}
-}
-}
-#endif
-
-
-
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/RNG/PokemonSwSh_Xoroshiro128Plus.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/RNG/PokemonSwSh_Xoroshiro128Plus.cpp
deleted file mode 100644
index 739b161e2c..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/RNG/PokemonSwSh_Xoroshiro128Plus.cpp
+++ /dev/null
@@ -1,255 +0,0 @@
-/*  Xoroshiro128+ and reverse
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <cstddef>
-#include "PokemonSwSh/Programs/RNG/PokemonSwSh_Xoroshiro128Plus.h"
-
-namespace PokemonAutomation {
-
-Xoroshiro128PlusState::Xoroshiro128PlusState(uint64_t s0, uint64_t s1)
-    : s0(s0)
-    , s1(s1)
-{}
-
-
-Xoroshiro128Plus::Xoroshiro128Plus(Xoroshiro128PlusState state)
-    : state(state)
-{}
-
-Xoroshiro128Plus::Xoroshiro128Plus(uint64_t s0, uint64_t s1)
-    : state(Xoroshiro128PlusState(s0, s1))
-{}
-
-uint64_t Xoroshiro128Plus::rotl(const uint64_t x, const int k)
-{
-    return (x << k) | (x >> (64 - k));
-}
-
-uint64_t Xoroshiro128Plus::next()
-{
-    const uint64_t s0 = state.s0;
-    uint64_t s1 = state.s1;
-    const uint64_t result = s0 + s1;
-
-    s1 ^= s0;
-    state.s0 = rotl(s0, 24) ^ s1 ^ (s1 << 16);
-    state.s1 = rotl(s1, 37);
-
-    return result;
-}
-
-Xoroshiro128PlusState Xoroshiro128Plus::get_state() {
-    return state;
-}
-
-uint64_t nextPowerOfTwo(uint64_t number) {
-    uint64_t x = number;
-    x--;
-    x |= x >> 1;
-    x |= x >> 2;
-    x |= x >> 4;
-    x |= x >> 8;
-    x |= x >> 16;
-    x |= x >> 32;
-    x++;
-    return x;
-}
-
-uint64_t Xoroshiro128Plus::nextInt(uint64_t bound) {
-    uint64_t power = nextPowerOfTwo(bound);
-    uint64_t result = next() & (power - 1);
-    while (result >= bound) {
-        result = next() & (power - 1);
-    }
-    return result;
-}
-
-std::vector<bool> Xoroshiro128Plus::generate_last_bit_sequence(size_t max_advances) {
-    std::vector<bool> sequence(max_advances);
-    Xoroshiro128Plus temp_rng(Xoroshiro128PlusState(state.s0, state.s1));
-
-    for (size_t i = 0; i < max_advances; i++) {
-        sequence.at(i) = (temp_rng.next() & 1) == 1;
-    };
-
-    return sequence;
-}
-
-// The generic solution to the system of equations to calculate the initial state from the last bits of 128 consecutive Xoroshiro128+ results.
-uint64_t Xoroshiro128Plus::last_bits_reverse_matrix[128][2] = {
-    /*s0 bit 0*/ {0b0101001100100001111011111110111001010011111110101011100011001101, 0b0111010111110111000101010100001111101001111001011111001011010111} ,
-    {0b0101010001010011100010011010100000100100111101101001100001100000, 0b1000110000001001010011000111001111111111111101110011110001000000},
-    {0b0110010000111101101000100110010000011111010111011011100100011001, 0b0001001011110010110110010101101001011110101110010001100111010111},
-    {0b0001010111110001100111010110010001000000110101100100001111000111, 0b0000111010011000110111101101011111110010010111001110110100000001},
-    {0b0110101010001010010010010111001010100111110010110001110111010000, 0b1101010010101000010001000101100011010101101000011000010011111110},
-    {0b0101111110111111110111101011001011100111110010010100001101010000, 0b1100010100111110001001011000001101010100000101010000110111000000},
-    {0b1111100100110000110011011000111100000010110111001110111100110000, 0b1101011010100111000100100000001010000111011001100101001001110100},
-    {0b1111001001000110100100100111100110010101101110111010111011110010, 0b1000110011100101011101110110100100100110110000001111011111010101},
-    {0b1000101111010110110001111000100011001001011001111111010001011110, 0b1110010101111000110001000000001001111110111100101001111111110101},
-    {0b0011011111110111010101001010100101110101110011110001010000000110, 0b1001101100000101011110000110111010000000011110101011001110011000},
-    /*s0 bit 10*/{0b1100011000100101110010010000010101011101001101101101010111000011, 0b0010101110110011101000100011110010010010111000110111101010100100},
-    {0b0110000010110101110001110000100100111001111001000100101101001101, 0b0010011110100101001001100101011010101111101100100111000011001000},
-    {0b1110110100010111101100110100000010110110000011100110001000011110, 0b0111000000001101101000100001011000100010101110011110101011011111},
-    {0b1010100011101110101010100100100101001000101000111010101001011100, 0b1001011110110001011101001000101001010001011010000100011101010000},
-    {0b0010000111110000101111010001010001101111001100001011010011100001, 0b1010101000101111110011001100110001010110001001011101010111101011},
-    {0b0100010001011100011101011101110110101100101110001110111111100000, 0b0111101101010000011111111011110010101101100010010010111010001110},
-    {0b0111111111001100001101000111011100110100101010011100001010011010, 0b0110100110110000111011110010100000101101011100010000111111101111},
-    {0b0000100111110100110110011101110111111001110101001001010010010111, 0b1110000110010111000010101110100111001010110110011110110111011100},
-    {0b1001000011111110010011100000011010010001001011110010101100100010, 0b1011110101011010110010111010111110101110011111011010111111110000},
-    {0b0111100010101001011100110101100110111110100111110110110111010011, 0b1110111101010000001110110011000111111100100010111011100001100110},
-    /*s0 bit 20*/{0b1110100101000011101010001110100100111110011111001110000110100000, 0b0100100001111100111100101100000110011011010011110001001000110101},
-    {0b0011000101010101001110010101110000010011011100101100010100001000, 0b1101010100100011000001110111100010000010100011101101101010100010},
-    {0b0100011001010010001110110000011001011110011010111011111110100110, 0b1010100001010100001100101111101100101001010111101111100001111110},
-    {0b0101100011010100101011000110000110001011010100100111001011010010, 0b0101101111010000001110101101010001001101101001001010111111000001},
-    {0b0010111110010011001001110101001001001011110100101101001010000001, 0b0111100010111111111111100010010101001101010101110110000101101010},
-    {0b0001011001011000101011100111011010111011100111000000111010100000, 0b0101011010010110101110001110010001000100000000111001110000000111},
-    {0b0000111111111001100000000000111011000010010101001111100111111001, 0b1100111101001010010010100000101100011110011001101101101001010111},
-    {0b0011100110110100000010011101100000110000001110000010011001110000, 0b1100010010011001000100100111111100001000000010101010010111110010},
-    {0b1010011000110011100101100001110000000111011000110011001011110001, 0b0111000101010101011001100111010101100110110000000100101110010001},
-    {0b1000000111000001100010011001010101000010010010001011110101101100, 0b0110000111100001101111001010110000011011111000101000011011011110},
-    /*s0 bit 30*/{0b1000010011101001111010100010011101101001011010010010010111110101, 0b0111111100110100111110111110001110100000111001100010000011010011},
-    {0b1111011100001000010011011100010000000101011000011001001100100111, 0b1000110100100100010101000000111000101000000101011000010011001000},
-    {0b0100000111001101011011110101001011010001110101011001100001011000, 0b1110010100000101011010111100100111001111011011111110111101111010},
-    {0b0101000111111010111101001011101000011110011101010000010001100011, 0b0111110110010111100110001000100100011110100011100110000010101100},
-    {0b1100000011101010100010000111001001110011011101000111010010001110, 0b0001110001111001001111111010101110101011001101001000100010101111},
-    {0b0000100101111111110100100010111110001111000011001010000000000111, 0b0010101110100110110001001111000110010101111010010011010110111110},
-    {0b0010001110010011010010110110110110110111101110001001110101010001, 0b1001001100101001101011100101011100010110101110011000000101101101},
-    {0b1011011101111100011111010101000111010011001000100111010111010111, 0b0010001101010001100110100001001010111111110011100101110000110000},
-    {0b0111101101100000011000110010011011010010011111111110101111011111, 0b1000111000100111100001101000100010100111010100110111011000100000},
-    {0b0010101001101100100000010100111101100110000101000111100111110100, 0b1101010110010111110010001011010110100001101010110010111110011100},
-    /*s0 bit 40*/{0b0111100001010010101011110110000100100111000111101000001010001101, 0b1110001000110001011011101111111101011101011110010111001110111011},
-    {0b1011100000011000010000000110111010000100110111000111000010101000, 0b1001111111000111011010100010011110111101000100000110011110100101},
-    {0b0000100010001111110001011110101011111011101011001110100010101110, 0b0011011010000110001111100010001011011010000000011110010011110010},
-    {0b0110110011110000010000001010000100110101000111001000010101110101, 0b0111011110100101111011111011010010101001110101000111100111100001},
-    {0b0111000110101000111100011110111111110000001100100111100101001111, 0b0001111011110001111101100011110000001010000100111011111011001010},
-    {0b1001111100011001000010001100001110010110101100000001100010011001, 0b0010101111000000101001000110001100011010110110000101010110011111},
-    {0b1001100111000101100011001111101110110010100110111111111110000110, 0b0000011101001101011110010010010101110110100001001001001000010110},
-    {0b1000111010100011101100101101110010110100000110011101101010010001, 0b0010001100010110010100010100010011000001110000110101101010100101},
-    {0b0110110001011110000010110101110010111101000110101000110110011000, 0b1000110101110100110100100001000000001110100111011100111100111010},
-    {0b0110111010011100111011111011000001011011110110001111111011111011, 0b1111110110011000100001100000110001000000010011000010001010110101},
-    /*s0 bit 50*/{0b0100010010110110110111011011110010011111000100111001000000101100, 0b1001011111100111000011000010101110011100111000010111110001010110},
-    {0b0100010110011001111011001101111111011001011001111010110111110010, 0b0101010111111000100111011111110101010110100100001011111011101001},
-    {0b0111110001100101001000000101001011001001110111111000110101110110, 0b0101110111101000110000100100001011011001000000101100010011011101},
-    {0b0010010111110110111001111110010111101110001010001011000110101001, 0b1111011010110111100010111101010101101110101111110011110101010111},
-    {0b1011100111000100010001001111000100100001000100011001110100111111, 0b1110101110001011110110011001010010010101000110010001010001001001},
-    {0b0010010011001000000011110110010011000111001001100100110100110110, 0b0000100100100111000111101110101100000111011111110010111111010100},
-    {0b0101000101000011101011011110101110111010100111100101010101000101, 0b0100101110001011111010011111001010100111000101111111011110000000},
-    {0b1110011101110010110010110100001001000111011110100110100101010010, 0b0100000110001111100011100001000011110101101011010100000110011100},
-    {0b0111100001110000111100100011100011111001101101110011100111101001, 0b1110111101001000000101101011111000000111011001110111111011101010},
-    {0b0100000000010101110011101100101011111011001000011001100100011001, 0b1100010011111111001010001110010111101001101000000101000010001001},
-    /*s0 bit 60*/{0b0101101000111000001010101011111010000010011011111001100011011111, 0b1100110010111101001011101100100010001000110000001110011111000110},
-    {0b1000111011001110110011100010100110110010101001100111011101101011, 0b0000000010001010101110001011000110101000100111100000010010000100},
-    {0b1000110101011110011101010001001010111101101011001000100001001100, 0b1101001001010111001100111110110111100101100000111100001011001101},
-    {0b1011000110100011111010110001011111001011010001110101000010000101, 0b1110000000100101110011001011110001111001110010110111111110000011},
-
-    /*s1 bit 0*/{0b1101111011001010010100100111010111001001000000010111111000010001, 0b1111101110010001100010011011000000100010100111011110011011001111},
-    {0b1001101111110011000001000000111010001011101101011011101010011011, 0b1100001011011000000110000100101110110111100001000110110000100100},
-    {0b1110010101010001000000000110101110110011001011101111111100101000, 0b1011110111011110000010010100101111101100110100101000001001010011},
-    {0b0111000011001010101101011011100001010011001001100010001101100110, 0b1001000100110101011100111101101001110011010001110111111001001011},
-    {0b1110010000100100001010111100011101111001111000100000000000010100, 0b0000010101110100011010010000001100100010111000001000010100000001},
-    {0b1001100101110010010111001100001111000011000111010100000000010001, 0b1101000100011011101101000110001111011110011011011101011001010111},
-    {0b1111011001010100010100100001000000110010101011110100000001000101, 0b0111000011001011000011001001110101011101110110101000001110100110},
-    {0b0010110000001001101010111011001010011100110100011010110001010000, 0b1011110001100000000011001101001011111101100011000101010010011011},
-    {0b1100110000000010000010010011011111001101011000010110001101000010, 0b0000101101110000010110010010010100011111011100011111111111011111},
-    {0b0110101001010100101001110010111101101011101110100110001111000111, 0b0111111101111001101100100010111100101101111101000010010011001110},
-    /*s1 bit 10*/{0b0110101000101110100101100010111110011111011011101000011101110100, 0b0011101011011100101111111001011010001100010000101011010100001111},
-    {0b0111101111111001001101111001100111110010001101101101000000000100, 0b0001000000000000111000110000000000010001111110101101000011010001},
-    {0b0000000101110010010001101110001010110000010001101101011011110110, 0b1100101110010010011101101101000101000000101110010100010110000101},
-    {0b1100100011110111111111000110001011111000100111011000111010001011, 0b1001011100000101111100010100011001011011101001011010100100011111},
-    {0b1000010011110010011000101100110110101010101011110011101101101000, 0b0001101010110010110100010101000000001001111101000101111101111001},
-    {0b1010011001000000111101010000011101111000001000001111110001101011, 0b1110101001110110001111110111101001111110111100110011000101100010},
-    {0b0111010000100001000000001010001110100010100011000101000000110001, 0b1000111001010000110110111101010100101110111011011001001111110110},
-    {0b1111101000100101001111101101100111111111011100001111010011111100, 0b1011111111010100010000000000110000111001010100101011111110011111},
-    {0b1010110001110000111001001101111110011110010101111001001011110110, 0b1111111110000111111000011001001001011100011011010111001011001000},
-    {0b1010111011011011110001010000010111010011110011011101000001110001, 0b1001100011101010001101111010001011111101111101011110100001011110},
-    /*s1 bit 20*/{0b1111010010011011011110001111100110110100110100110100000001111101, 0b1000001010100001100110111100001101100000000111101001101000100100},
-    {0b0101100110000110110111011110000100000110000010101101101010001101, 0b1100001001111000001110001111010110111001000111100000000100001011},
-    {0b1011000101000111001010000111100110000110000111110100001010111110, 0b0001101001011111010111101000011000010000101101110010000001000101},
-    {0b1000100010110101110010001011100000100011011101011110111010111110, 0b0000101111000001011100100101111101011100110111001110001110101101},
-    {0b1110110001100100101111001001000110010100010000111111110101111010, 0b1010101011001100101101100100000010101101100000111011000111000000},
-    {0b0000000111111010000000110001111000000001011110111111011100000001, 0b1000001011111111010101100001101110110111001111100011001000110001},
-    {0b0000000000001010101100111101010011011101111000111011010100100001, 0b0101011110000101101110010001010011100010100000100010000000000001},
-    {0b0001101111011101110010001110001111101000000101000011100010011000, 0b0100101101001000100000001111001101110100011100100000100000110001},
-    {0b1001111101001011101010001001100110000011011001011111000011010111, 0b1100101000100111000100010110010001110010011001001000000011001001},
-    {0b0000001011010011111101111100101110000101000001010011100101000010, 0b0000100111011100000110010011011110000110010101010001011100001001},
-    /*s1 bit 30*/{0b1100101001110110010100011011100000100111111000001100000101000011, 0b0011111101011011010110100001101100000010001101110010011010010100},
-    {0b0001110101010110011101101011111101100001101100011000111010101000, 0b1111010000111101111000111010001100001100000000000010001111111111},
-    {0b1000110110010001101101110011011010010100010010111011001110100011, 0b0111111111001110100110101101010111110110011100111001011100101111},
-    {0b0001111011001001001111110011111001100000111001110101111011101011, 0b0100110011011000001111010011111110110101011110011010001110100100},
-    {0b1011110010010100110000000100001011001111001101111011000001100101, 0b0011011010001111010011100110001101010100000110110110011010011101},
-    {0b1000111110101001100111010111111000001000000011010010111000111001, 0b1101110000010001001110100100111011000011000001101100000001010100},
-    {0b1011101101000111111001110000110000111100111010101110111110000011, 0b1100100011111001100101001000001101011011000111010010111010101100},
-    {0b0101100000011100000011011000000101011001010100110001000001001111, 0b0111010101011011100000100100000011011111110000011011111101010111},
-    {0b0011011010011001111000010010000110010111101001010011011010010010, 0b0110111101001011100010101010110101111100100100010100000000110010},
-    {0b1101100011000001010110001001000011010001011100101101110011110000, 0b0010000010111010000100001001101000100110100000110111111010110101},
-    /*s1 bit 40*/{0b1100000000110010101011000101011101100000011111000100100110101110, 0b0000000101101001000010111001100000010101100110111101110010011110},
-    {0b0100101000001111000011000110011101010110110111001010101000110010, 0b0011011010111111100000100010110001011101001000010011010100100101},
-    {0b1100010000110011101100100110000101110100110100111001001000110110, 0b0111010111001001001110001001100101000100011101100001111111011001},
-    {0b0001011111011010011010011010100100101100010010110010010101010111, 0b1100111111000000011010011111101000000111001110010011100000110010},
-    {0b1110011110101001011111011101110011010000101010110111010111110111, 0b1110101100000011001011001101111100000101100101001000010010000111},
-    {0b0111100100011101010101011011001000011110111100010111001110101000, 0b1000010110111010010101000111101111100100001000011011101001110000},
-    {0b1010110011101111110111110110110000000111010001101100111001100101, 0b1011100011110001101000000011001011100000011111101000000001110001},
-    {0b0011101110110001101000000010000100010101010111110100001110111011, 0b1001010110111010110100100000010111110110101000110001000000100010},
-    {0b1101000110100111110010010111101000101010111100000011111100001010, 0b0010111010110110011111110001101001110111001000011011011101010010},
-    {0b1110111000100000100101010010101101101101000010100100111100010000, 0b0011001110010011011000011110111010010001010100011001000001110111},
-    /*s1 bit 50*/{0b1010000011001000011110100110011110001101101011001000110111111001, 0b1111011110100111001010000000001011000000011100101011100011011001},
-    {0b1000011111100101100001000101001101100010110000011110101011010110, 0b1111001101100011001010011101111100100011001010111000000101010101},
-    {0b0010111101000101010110101101000101110101110011111111001101000011, 0b1010100011010011110111011111111111100110011110110101110001101100},
-    {0b0001111111100110011001111011010000111111011011101001100110110001, 0b0011000110011111111001100011111111111001110010011111010010101100},
-    {0b0100010011010011100000100111011110110000010110000011110111010001, 0b0001111110100011001001010001100011111000111100010101101110000110},
-    {0b0111001011110000011111010000101100001000000011011000010001001101, 0b0111011011100100111011100010001000101001010010011001011010110000},
-    {0b0000011000101110010011110110100101010011011110001011110101111101, 0b1000011111111110111100100010001111011001111011010000001110101111},
-    {0b1001110100111111011101110011111010011101000100111100100101101100, 0b1000000011011111010000111111000101000101101000100000110010001110},
-    {0b1101010010110110110001010010001000010100010000111000111000111111, 0b1010010110110110110101100100111010101010101010010110111001101111},
-    {0b1001100010110011000000110001110001010110110111111110001011010110, 0b0110001000010010010110110010110010010000101110101101000010101011},
-    /*s1 bit 60*/{0b1001111001100111100101110000100011111101001001001011010100010000, 0b0110001010011111010010110110110101010111111011111000011000010000},
-    {0b1111100011111100100100000110000101111000100001111000100111010110, 0b0101010111101100111000111001000111111110010111111101110001100100},
-    {0b0000110110100110001011010111011111010011111000001010100101011100, 0b1011100011101010010001000110101001001111010111011100101111010101},
-    {0b0011000110100011111010110001011111001011010001110101000010000101, 0b1110000000100101110011001011110001111001110010110111111110000011}
-};
-
-
-Xoroshiro128Plus Xoroshiro128Plus::xoroshiro128plus_from_last_bits(std::pair<uint64_t, uint64_t> last_bits)
-{
-    uint64_t s0 = 0;
-    uint64_t s1 = 0;
-
-    for (size_t i = 0; i < 64; i++) {
-        uint64_t first_half = last_bits_reverse_matrix[i][0] & last_bits.first;
-        uint64_t second_half = last_bits_reverse_matrix[i][1] & last_bits.second;
-
-        uint64_t x = first_half ^ second_half;
-        x ^= x >> 32;
-        x ^= x >> 16;
-        x ^= x >> 8;
-        x ^= x >> 4;
-        x ^= x >> 2;
-        x ^= x >> 1;
-        x &= 1;
-
-        s0 += x << (63 - i);
-    }
-    for (size_t i = 0; i < 64; i++) {
-        uint64_t first_half = last_bits_reverse_matrix[i + 64][0] & last_bits.first;
-        uint64_t second_half = last_bits_reverse_matrix[i + 64][1] & last_bits.second;
-
-        uint64_t x = first_half ^ second_half;
-        x ^= x >> 32;
-        x ^= x >> 16;
-        x ^= x >> 8;
-        x ^= x >> 4;
-        x ^= x >> 2;
-        x ^= x >> 1;
-        x &= 1;
-
-        s1 += x << (63 - i);
-    }
-    Xoroshiro128PlusState state(s0, s1);
-    return Xoroshiro128Plus(state);
-}
-
-
-}
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/RNG/PokemonSwSh_Xoroshiro128Plus.h b/SerialPrograms/Source/PokemonSwSh/Programs/RNG/PokemonSwSh_Xoroshiro128Plus.h
deleted file mode 100644
index 338fc56d4d..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/RNG/PokemonSwSh_Xoroshiro128Plus.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*  Xoroshiro128+ and reverse
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_Xoroshiro128Plus_H
-#define PokemonAutomation_PokemonSwSh_Xoroshiro128Plus_H
-
-#include <stdint.h>
-#include <utility>
-#include <vector>
-
-namespace PokemonAutomation {
-
-struct Xoroshiro128PlusState {
-    Xoroshiro128PlusState(uint64_t s0, uint64_t s1);
-    uint64_t s0;
-    uint64_t s1;
-};
-
-class Xoroshiro128Plus {
-public:
-    Xoroshiro128PlusState state;
-
-    Xoroshiro128Plus(Xoroshiro128PlusState state);
-    Xoroshiro128Plus(uint64_t s0, uint64_t s1);
-    uint64_t next();
-    uint64_t nextInt(uint64_t);
-    Xoroshiro128PlusState get_state();
-    std::vector<bool> generate_last_bit_sequence(size_t max_advances);
-
-    static Xoroshiro128Plus xoroshiro128plus_from_last_bits(std::pair<uint64_t, uint64_t> last_bits);
-
-
-private:
-    static uint64_t last_bits_reverse_matrix[128][2];
-
-    uint64_t rotl(const uint64_t x, int k);
-};
-
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/ReleaseHelpers.h b/SerialPrograms/Source/PokemonSwSh/Programs/ReleaseHelpers.h
deleted file mode 100644
index 4a48b715d1..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/ReleaseHelpers.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*  Mass Release Helpers
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_ReleaseHelpers_H
-#define PokemonAutomation_PokemonSwSh_ReleaseHelpers_H
-
-#include "NintendoSwitch/FixedInterval.h"
-#include "PokemonSwSh/Commands/PokemonSwSh_Commands_Misc.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-// Release one pokemon in box
-static void release(BotBaseContext& context){
-    ssf_press_button2(context, BUTTON_A, 60, 10);
-    ssf_press_dpad1(context, DPAD_UP, 15);
-    ssf_press_dpad1(context, DPAD_UP, 15);
-    ssf_press_button2(context, BUTTON_A, 125, 10);
-    ssf_press_dpad1(context, DPAD_DOWN, 10);
-//    ssf_press_button1(context, BUTTON_A, 150);
-//    ssf_press_button1(context, BUTTON_A, 40);
-    mash_A(context, 180);
-}
-static void release_box(BotBaseContext& context, uint16_t box_scroll_delay){
-    for (uint8_t row = 0; row < 5; row++){
-        if (row != 0){
-            ssf_press_dpad1(context, DPAD_DOWN, box_scroll_delay);
-            ssf_press_dpad1(context, DPAD_RIGHT, box_scroll_delay);
-            ssf_press_dpad1(context, DPAD_RIGHT, box_scroll_delay);
-        }
-        for (uint8_t col = 0; col < 6; col++){
-            if (col != 0){
-                ssf_press_dpad1(context, DPAD_RIGHT, box_scroll_delay);
-            }
-            release(context);
-        }
-    }
-}
-static void release_boxes(
-    BotBaseContext& context,
-    uint8_t boxes,
-    uint16_t box_scroll_delay,
-    uint16_t box_change_delay
-){
-    if (boxes == 0){
-        return;
-    }
-    release_box(context, box_scroll_delay);
-    for (uint8_t box = 1; box < boxes; box++){
-        ssf_press_dpad1(context, DPAD_DOWN, box_scroll_delay);
-        ssf_press_dpad1(context, DPAD_DOWN, box_scroll_delay);
-        ssf_press_dpad1(context, DPAD_DOWN, box_scroll_delay);
-        ssf_press_dpad1(context, DPAD_RIGHT, box_scroll_delay);
-        ssf_press_dpad1(context, DPAD_RIGHT, box_scroll_delay);
-        ssf_press_button1(context, BUTTON_R, box_change_delay);
-        release_box(context, box_scroll_delay);
-    }
-}
-
-
-
-}
-}
-}
-#endif
-
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-BerryTree.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-BerryTree.cpp
deleted file mode 100644
index c771280a8b..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-BerryTree.cpp
+++ /dev/null
@@ -1,172 +0,0 @@
-/*  Shiny Hunt Autonomous - Berry Tree
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/Notifications/ProgramNotifications.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "NintendoSwitch/NintendoSwitch_Settings.h"
-#include "PokemonSwSh/PokemonSwSh_Settings.h"
-#include "PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.h"
-#include "PokemonSwSh/Inference/Battles/PokemonSwSh_StartBattleDetector.h"
-#include "PokemonSwSh/Inference/Battles/PokemonSwSh_BattleMenuDetector.h"
-#include "PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_ShinyEncounterDetector.h"
-#include "PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
-#include "PokemonSwSh/Programs/PokemonSwSh_EncounterHandler.h"
-#include "PokemonSwSh_ShinyHuntAutonomous-BerryTree.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-ShinyHuntAutonomousBerryTree_Descriptor::ShinyHuntAutonomousBerryTree_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonSwSh:ShinyHuntAutonomousBerryTree",
-        STRING_POKEMON + " SwSh", "Shiny Hunt Autonomous - Berry Tree",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonSwSh/ShinyHuntAutonomous-BerryTree.md",
-        "Automatically hunt for shiny berry tree " + STRING_POKEMON + " using video feedback.",
-        FeedbackType::REQUIRED,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-std::unique_ptr<StatsTracker> ShinyHuntAutonomousBerryTree_Descriptor::make_stats() const{
-    return std::unique_ptr<StatsTracker>(new ShinyHuntTracker(true));
-}
-
-
-
-ShinyHuntAutonomousBerryTree::ShinyHuntAutonomousBerryTree()
-    : GO_HOME_WHEN_DONE(false)
-    , ENCOUNTER_BOT_OPTIONS(false, true)
-    , NOTIFICATIONS({
-        &ENCOUNTER_BOT_OPTIONS.NOTIFICATION_NONSHINY,
-        &ENCOUNTER_BOT_OPTIONS.NOTIFICATION_SHINY,
-        &ENCOUNTER_BOT_OPTIONS.NOTIFICATION_CATCH_SUCCESS,
-        &ENCOUNTER_BOT_OPTIONS.NOTIFICATION_CATCH_FAILED,
-        &NOTIFICATION_PROGRAM_FINISH,
-        &NOTIFICATION_ERROR_FATAL,
-    })
-    , m_advanced_options(
-        "<font size=4><b>Advanced Options:</b> You should not need to touch anything below here.</font>"
-    )
-    , EXIT_BATTLE_TIMEOUT(
-        "<b>Exit Battle Timeout:</b><br>After running, wait this long to return to overworld.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "10 * TICKS_PER_SECOND"
-    )
-{
-    PA_ADD_OPTION(START_LOCATION);
-    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
-
-    PA_ADD_OPTION(LANGUAGE);
-    PA_ADD_OPTION(ENCOUNTER_BOT_OPTIONS);
-    PA_ADD_OPTION(NOTIFICATIONS);
-
-    PA_ADD_STATIC(m_advanced_options);
-    PA_ADD_OPTION(EXIT_BATTLE_TIMEOUT);
-}
-
-
-
-
-void ShinyHuntAutonomousBerryTree::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    if (START_LOCATION.start_in_grip_menu()){
-        grip_menu_connect_go_home(context);
-        resume_game_no_interact(env.console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST);
-    }else{
-        pbf_press_button(context, BUTTON_B, 5, 5);
-    }
-
-    ShinyHuntTracker& stats = env.current_stats<ShinyHuntTracker>();
-    env.update_stats();
-
-    StandardEncounterHandler handler(
-        env, env.console, context,
-        LANGUAGE,
-        ENCOUNTER_BOT_OPTIONS,
-        stats
-    );
-
-    uint8_t year = MAX_YEAR;
-    while (true){
-        pbf_press_button(context, BUTTON_HOME, 10, GameSettings::instance().GAME_TO_HOME_DELAY_FAST);
-        home_roll_date_enter_game_autorollback(env.console, context, year);
-//        home_to_date_time(context, true, true);
-//        neutral_date_skip(context);
-//        settings_to_enter_game(context, true);
-        pbf_mash_button(context, BUTTON_B, 90);
-        context.wait_for_all_requests();
-
-        {
-            StandardBattleMenuWatcher battle_menu_detector(false);
-            StartBattleWatcher start_battle_detector;
-
-            int result = run_until(
-                env.console, context,
-                [](BotBaseContext& context){
-                    pbf_mash_button(context, BUTTON_A, 60 * TICKS_PER_SECOND);
-                },
-                {
-                    {battle_menu_detector},
-                    {start_battle_detector},
-                }
-            );
-
-            switch (result){
-            case 0:
-                env.log("Unexpected battle menu.", COLOR_RED);
-                stats.add_error();
-                env.update_stats();
-                pbf_mash_button(context, BUTTON_B, TICKS_PER_SECOND);
-                run_away(env.console, context, EXIT_BATTLE_TIMEOUT);
-                continue;
-            case 1:
-                env.log("Battle started!");
-                break;
-            default:
-                stats.add_error();
-                env.update_stats();
-                env.log("Timed out.");
-                continue;
-            }
-        }
-
-        //  Detect shiny.
-        ShinyDetectionResult result = detect_shiny_battle(
-            env.console, context,
-            SHINY_BATTLE_REGULAR,
-            std::chrono::seconds(30)
-        );
-
-        bool stop = handler.handle_standard_encounter_end_battle(result, EXIT_BATTLE_TIMEOUT);
-        if (stop){
-            break;
-        }
-//        pbf_mash_button(context, BUTTON_B, 10 * TICKS_PER_SECOND);
-    }
-
-    pbf_press_button(context, BUTTON_HOME, 10, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE);
-
-    home_to_date_time(context, false, false);
-    pbf_press_button(context, BUTTON_A, 5, 5);
-    pbf_press_button(context, BUTTON_A, 5, 10);
-    pbf_press_button(context, BUTTON_HOME, 10, ConsoleSettings::instance().SETTINGS_TO_HOME_DELAY);
-
-    if (!GO_HOME_WHEN_DONE){
-        pbf_press_button(context, BUTTON_HOME, 10, GameSettings::instance().HOME_TO_GAME_DELAY);
-    }
-
-    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
-}
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-BerryTree.h b/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-BerryTree.h
deleted file mode 100644
index ced59f2f98..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-BerryTree.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*  Shiny Hunt Autonomous - BerryTree
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_ShinyHuntAutonomousBerryTree_H
-#define PokemonAutomation_PokemonSwSh_ShinyHuntAutonomousBerryTree_H
-
-#include "Common/Cpp/Options/StaticTextOption.h"
-#include "Common/Cpp/Options/TimeExpressionOption.h"
-#include "CommonFramework/Notifications/EventNotificationsTable.h"
-#include "NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h"
-#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-#include "Pokemon/Options/Pokemon_EncounterBotOptions.h"
-#include "PokemonSwSh/Options/PokemonSwSh_EncounterBotCommon.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-using namespace Pokemon;
-
-
-class ShinyHuntAutonomousBerryTree_Descriptor : public SingleSwitchProgramDescriptor{
-public:
-    ShinyHuntAutonomousBerryTree_Descriptor();
-
-    virtual std::unique_ptr<StatsTracker> make_stats() const override;
-};
-
-
-
-class ShinyHuntAutonomousBerryTree : public SingleSwitchProgramInstance{
-public:
-    ShinyHuntAutonomousBerryTree();
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-    StartInGripOrGameOption START_LOCATION;
-    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
-
-    EncounterBotLanguage LANGUAGE;
-    EncounterBotCommonOptions ENCOUNTER_BOT_OPTIONS;
-
-    EventNotificationsOption NOTIFICATIONS;
-
-    SectionDividerOption m_advanced_options;
-    TimeExpressionOption<uint16_t> EXIT_BATTLE_TIMEOUT;
-};
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Fishing.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Fishing.cpp
deleted file mode 100644
index 0790b5d81c..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Fishing.cpp
+++ /dev/null
@@ -1,203 +0,0 @@
-/*  Shiny Hunt Autonomous - Fishing
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
-#include "CommonFramework/Notifications/ProgramNotifications.h"
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Device.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "NintendoSwitch/NintendoSwitch_Settings.h"
-#include "PokemonSwSh/PokemonSwSh_Settings.h"
-#include "PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.h"
-#include "PokemonSwSh/ShinyHuntTracker.h"
-#include "PokemonSwSh/Inference/PokemonSwSh_FishingDetector.h"
-#include "PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_ShinyEncounterDetector.h"
-#include "PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
-#include "PokemonSwSh/Programs/PokemonSwSh_EncounterHandler.h"
-#include "PokemonSwSh_ShinyHuntAutonomous-Fishing.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-ShinyHuntAutonomousFishing_Descriptor::ShinyHuntAutonomousFishing_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonSwSh:ShinyHuntAutonomousFishing",
-        STRING_POKEMON + " SwSh", "Shiny Hunt Autonomous - Fishing",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonSwSh/ShinyHuntAutonomous-Fishing.md",
-        "Automatically hunt for shiny fishing " + STRING_POKEMON + " using video feedback.",
-        FeedbackType::REQUIRED,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-struct ShinyHuntAutonomousFishing_Descriptor::Stats : public ShinyHuntTracker{
-    Stats()
-        : ShinyHuntTracker(true)
-        , m_misses(m_stats["Misses"])
-    {
-        m_display_order.insert(m_display_order.begin() + 1, Stat("Misses"));
-        m_aliases["Timeouts"] = "Errors";
-        m_aliases["Unexpected Battles"] = "Errors";
-    }
-    std::atomic<uint64_t>& m_misses;
-};
-std::unique_ptr<StatsTracker> ShinyHuntAutonomousFishing_Descriptor::make_stats() const{
-    return std::unique_ptr<StatsTracker>(new Stats());
-}
-
-
-
-ShinyHuntAutonomousFishing::ShinyHuntAutonomousFishing()
-    : GO_HOME_WHEN_DONE(false)
-    , ENCOUNTER_BOT_OPTIONS(true, true)
-    , NOTIFICATIONS({
-        &ENCOUNTER_BOT_OPTIONS.NOTIFICATION_NONSHINY,
-        &ENCOUNTER_BOT_OPTIONS.NOTIFICATION_SHINY,
-        &ENCOUNTER_BOT_OPTIONS.NOTIFICATION_CATCH_SUCCESS,
-        &ENCOUNTER_BOT_OPTIONS.NOTIFICATION_CATCH_FAILED,
-        &NOTIFICATION_PROGRAM_FINISH,
-        &NOTIFICATION_ERROR_FATAL,
-    })
-    , m_advanced_options(
-        "<font size=4><b>Advanced Options:</b> You should not need to touch anything below here.</font>"
-    )
-    , EXIT_BATTLE_TIMEOUT(
-        "<b>Exit Battle Timeout:</b><br>After running, wait this long to return to overworld and for the fish to reappear.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "10 * TICKS_PER_SECOND"
-    )
-    , FISH_RESPAWN_TIME(
-        "<b>Fish Respawn Time:</b><br>Wait this long for fish to respawn.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "5 * TICKS_PER_SECOND"
-    )
-{
-    PA_ADD_OPTION(START_LOCATION);
-    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
-    PA_ADD_OPTION(TIME_ROLLBACK_HOURS);
-
-    PA_ADD_OPTION(LANGUAGE);
-    PA_ADD_OPTION(ENCOUNTER_BOT_OPTIONS);
-    PA_ADD_OPTION(NOTIFICATIONS);
-
-    PA_ADD_STATIC(m_advanced_options);
-    PA_ADD_OPTION(EXIT_BATTLE_TIMEOUT);
-    PA_ADD_OPTION(FISH_RESPAWN_TIME);
-}
-
-
-
-void ShinyHuntAutonomousFishing::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    if (START_LOCATION.start_in_grip_menu()){
-        grip_menu_connect_go_home(context);
-        resume_game_no_interact(env.console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST);
-    }else{
-        pbf_press_button(context, BUTTON_B, 5, 5);
-    }
-
-    const uint32_t PERIOD = (uint32_t)TIME_ROLLBACK_HOURS * 3600 * TICKS_PER_SECOND;
-    uint32_t last_touch = system_clock(context);
-
-    ShinyHuntAutonomousFishing_Descriptor::Stats& stats = env.current_stats<ShinyHuntAutonomousFishing_Descriptor::Stats>();
-    env.update_stats();
-
-    StandardEncounterHandler handler(
-        env, env.console, context,
-        LANGUAGE,
-        ENCOUNTER_BOT_OPTIONS,
-        stats
-    );
-
-    while (true){
-        //  Touch the date.
-        if (TIME_ROLLBACK_HOURS > 0 && system_clock(context) - last_touch >= PERIOD){
-            pbf_press_button(context, BUTTON_HOME, 10, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE);
-            rollback_hours_from_home(context, TIME_ROLLBACK_HOURS, ConsoleSettings::instance().SETTINGS_TO_HOME_DELAY);
-            resume_game_no_interact(env.console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST);
-            last_touch += PERIOD;
-        }
-
-        pbf_wait(context, FISH_RESPAWN_TIME);
-        context.wait_for_all_requests();
-
-        //  Trigger encounter.
-        {
-            pbf_press_button(context, BUTTON_A, 10, 10);
-            pbf_mash_button(context, BUTTON_B, TICKS_PER_SECOND);
-            context.wait_for_all_requests();
-
-            FishingMissDetector miss_detector;
-            FishingHookDetector hook_detector(env.console);
-            StandardBattleMenuWatcher menu_detector(false);
-            int result = wait_until(
-                env.console, context,
-                std::chrono::seconds(12),
-                {
-                    {miss_detector},
-                    {hook_detector},
-                    {menu_detector},
-                }
-            );
-            switch (result){
-            case 0:
-                env.log("Missed a hook.", COLOR_RED);
-                stats.m_misses++;
-                pbf_mash_button(context, BUTTON_B, 2 * TICKS_PER_SECOND);
-                continue;
-            case 1:
-                env.log("Detected hook!", COLOR_PURPLE);
-                pbf_mash_button(context, BUTTON_A, TICKS_PER_SECOND);
-                break;
-            case 2:
-                env.log("Unexpected battle menu.", COLOR_RED);
-                stats.add_error();
-                env.update_stats();
-                run_away(env.console, context, EXIT_BATTLE_TIMEOUT);
-                continue;
-            default:
-                env.log("Timed out.", COLOR_RED);
-                stats.add_error();
-                env.update_stats();
-                pbf_mash_button(context, BUTTON_B, 2 * TICKS_PER_SECOND);
-                continue;
-            }
-            context.wait_for(std::chrono::seconds(3));
-            if (miss_detector.detect(env.console.video().snapshot())){
-                env.log("False alarm! We actually missed.", COLOR_RED);
-                stats.m_misses++;
-                pbf_mash_button(context, BUTTON_B, 2 * TICKS_PER_SECOND);
-                continue;
-            }
-        }
-
-        //  Detect shiny.
-        ShinyDetectionResult result = detect_shiny_battle(
-            env.console, context,
-            SHINY_BATTLE_REGULAR,
-            std::chrono::seconds(30)
-        );
-
-        bool stop = handler.handle_standard_encounter_end_battle(result, EXIT_BATTLE_TIMEOUT);
-        if (stop){
-            break;
-        }
-    }
-
-    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
-    GO_HOME_WHEN_DONE.run_end_of_program(context);
-}
-
-
-
-}
-}
-}
-
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Fishing.h b/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Fishing.h
deleted file mode 100644
index aead74b91d..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Fishing.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*  Shiny Hunt Autonomous - Fishing
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_ShinyHuntAutonomousFishing_H
-#define PokemonAutomation_PokemonSwSh_ShinyHuntAutonomousFishing_H
-
-#include "Common/Cpp/Options/StaticTextOption.h"
-#include "Common/Cpp/Options/TimeExpressionOption.h"
-#include "CommonFramework/Notifications/EventNotificationsTable.h"
-#include "NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h"
-#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-#include "Pokemon/Options/Pokemon_EncounterBotOptions.h"
-#include "PokemonSwSh/Options/PokemonSwSh_DateToucher.h"
-#include "PokemonSwSh/Options/PokemonSwSh_EncounterBotCommon.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-using namespace Pokemon;
-
-
-class ShinyHuntAutonomousFishing_Descriptor : public SingleSwitchProgramDescriptor{
-public:
-    ShinyHuntAutonomousFishing_Descriptor();
-
-    struct Stats;
-    virtual std::unique_ptr<StatsTracker> make_stats() const override;
-};
-
-
-
-class ShinyHuntAutonomousFishing : public SingleSwitchProgramInstance{
-public:
-    ShinyHuntAutonomousFishing();
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-    StartInGripOrGameOption START_LOCATION;
-    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
-    TimeRollbackHoursOption TIME_ROLLBACK_HOURS;
-
-    EncounterBotLanguage LANGUAGE;
-    EncounterBotCommonOptions ENCOUNTER_BOT_OPTIONS;
-
-    EventNotificationsOption NOTIFICATIONS;
-
-    SectionDividerOption m_advanced_options;
-    TimeExpressionOption<uint16_t> EXIT_BATTLE_TIMEOUT;
-    TimeExpressionOption<uint16_t> FISH_RESPAWN_TIME;
-};
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-IoATrade.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-IoATrade.cpp
deleted file mode 100644
index 750b104fb2..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-IoATrade.cpp
+++ /dev/null
@@ -1,182 +0,0 @@
-/*  Shiny Hunt Autonomous - IoA Trade
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <cmath>
-#include "CommonFramework/GlobalSettingsPanel.h"
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "NintendoSwitch/NintendoSwitch_Settings.h"
-#include "Pokemon/Pokemon_Notification.h"
-#include "PokemonSwSh/PokemonSwSh_Settings.h"
-#include "PokemonSwSh/ShinyHuntTracker.h"
-#include "PokemonSwSh/Inference/PokemonSwSh_SummaryShinySymbolDetector.h"
-#include "PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
-#include "PokemonSwSh_ShinyHuntAutonomous-IoATrade.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-ShinyHuntAutonomousIoATrade_Descriptor::ShinyHuntAutonomousIoATrade_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonSwSh:ShinyHuntAutonomousIoATrade",
-        STRING_POKEMON + " SwSh", "Shiny Hunt Autonomous - IoA Trade",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonSwSh/ShinyHuntAutonomous-IoATrade.md",
-        "Hunt for shiny Isle of Armor trade using video feedback.",
-        FeedbackType::REQUIRED,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-std::unique_ptr<StatsTracker> ShinyHuntAutonomousIoATrade_Descriptor::make_stats() const{
-    return std::unique_ptr<StatsTracker>(new ShinyHuntTracker(false));
-}
-
-
-
-ShinyHuntAutonomousIoATrade::ShinyHuntAutonomousIoATrade()
-    : GO_HOME_WHEN_DONE(false)
-    , VIDEO_ON_SHINY(
-        "<b>Video Capture:</b><br>Take a video of the encounter if it is shiny.",
-        LockWhileRunning::LOCKED,
-        true
-    )
-    , NOTIFICATION_NONSHINY(
-        "Non-Shiny Encounter",
-        true, false,
-        {"Notifs"},
-        std::chrono::seconds(3600)
-    )
-    , NOTIFICATION_SHINY(
-        "Shiny Encounter",
-        true, true, ImageAttachmentMode::JPG,
-        {"Notifs", "Showcase"}
-    )
-//    , NOTIFICATION_PROGRAM_FINISH("Program Finished", true, true)
-    , NOTIFICATIONS({
-        &NOTIFICATION_NONSHINY,
-        &NOTIFICATION_SHINY,
-//        &NOTIFICATION_PROGRAM_FINISH,
-        &NOTIFICATION_ERROR_FATAL,
-    })
-    , m_advanced_options(
-        "<font size=4><b>Advanced Options:</b> You should not need to touch anything below here.</font>"
-    )
-    , MASH_TO_TRADE_DELAY(
-        "<b>Mash to Trade Delay:</b><br>Time to perform the trade.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "30 * TICKS_PER_SECOND"
-    )
-    , RUN_FROM_EVERYTHING(
-        "<b>Run from Everything:</b><br>Run from everything - even if it is shiny. (For testing only.)",
-        LockWhileRunning::LOCKED,
-        false
-    )
-{
-    PA_ADD_OPTION(START_LOCATION);
-    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
-    PA_ADD_OPTION(TOUCH_DATE_INTERVAL);
-
-    PA_ADD_OPTION(VIDEO_ON_SHINY);
-    PA_ADD_OPTION(NOTIFICATIONS);
-
-    PA_ADD_STATIC(m_advanced_options);
-    PA_ADD_OPTION(MASH_TO_TRADE_DELAY);
-    if (PreloadSettings::instance().DEVELOPER_MODE){
-        PA_ADD_OPTION(RUN_FROM_EVERYTHING);
-    }
-}
-
-
-void ShinyHuntAutonomousIoATrade::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    if (START_LOCATION.start_in_grip_menu()){
-        grip_menu_connect_go_home(context);
-        resume_game_back_out(env.console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST, 500);
-    }else{
-        pbf_press_button(context, BUTTON_B, 5, 5);
-    }
-
-    ShinyHuntTracker& stats = env.current_stats<ShinyHuntTracker>();
-
-    while (true){
-        env.update_stats();
-
-        pbf_press_button(context, BUTTON_A, 10, 100);
-        pbf_press_button(context, BUTTON_A, 10, 60);
-        pbf_press_button(context, BUTTON_A, 10, 100);
-        pbf_press_button(context, BUTTON_A, 10, 50);
-        pbf_press_button(context, BUTTON_A, 10, GameSettings::instance().POKEMON_TO_BOX_DELAY);
-        pbf_press_dpad(context, DPAD_LEFT, 10, 10);
-        pbf_mash_button(context, BUTTON_A, MASH_TO_TRADE_DELAY);
-
-        //  Enter box system.
-        pbf_press_button(context, BUTTON_X, 10, GameSettings::instance().OVERWORLD_TO_MENU_DELAY);
-        pbf_press_dpad(context, DPAD_RIGHT, 10, 10);
-        pbf_press_button(context, BUTTON_A, 10, GameSettings::instance().MENU_TO_POKEMON_DELAY);
-
-        //  View summary.
-        pbf_press_button(context, BUTTON_A, 10, 100);
-        pbf_press_button(context, BUTTON_A, 10, 0);
-        context.wait_for_all_requests();
-
-        SummaryShinySymbolDetector::Detection detection;
-        {
-            SummaryShinySymbolDetector detector(env.console, env.console);
-            detection = detector.wait_for_detection(context, env.console);
-//            detection = SummaryShinySymbolDetector::SHINY;
-        }
-        switch (detection){
-        case SummaryShinySymbolDetector::NO_DETECTION:
-            stats.add_error();
-            break;
-        case SummaryShinySymbolDetector::NOT_SHINY:
-            stats.add_non_shiny();
-            send_encounter_notification(
-                env,
-                NOTIFICATION_NONSHINY,
-                NOTIFICATION_SHINY,
-                false, false, {{{}, ShinyType::NOT_SHINY}}, std::nan(""),
-                ImageViewRGB32()
-            );
-            break;
-        case SummaryShinySymbolDetector::SHINY:
-            stats.add_unknown_shiny();
-            send_encounter_notification(
-                env,
-                NOTIFICATION_NONSHINY,
-                NOTIFICATION_SHINY,
-                false, true, {{{}, ShinyType::UNKNOWN_SHINY}}, std::nan(""),
-                env.console.video().snapshot()
-            );
-            if (VIDEO_ON_SHINY){
-                pbf_wait(context, 1 * TICKS_PER_SECOND);
-                pbf_press_button(context, BUTTON_CAPTURE, 2 * TICKS_PER_SECOND, 5 * TICKS_PER_SECOND);
-            }
-            if (!RUN_FROM_EVERYTHING){
-                goto StopProgram;
-            }
-        }
-
-        pbf_press_button(context, BUTTON_HOME, 10, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE);
-        TOUCH_DATE_INTERVAL.touch_now_from_home_if_needed(context);
-        reset_game_from_home_with_inference(
-            env.console, context,
-            ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST
-        );
-    }
-
-StopProgram:
-    env.update_stats();
-    GO_HOME_WHEN_DONE.run_end_of_program(context);
-}
-
-
-}
-}
-}
-
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Regi.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Regi.cpp
deleted file mode 100644
index 6122142d68..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Regi.cpp
+++ /dev/null
@@ -1,169 +0,0 @@
-/*  Shiny Hunt Autonomous - Regi
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/Notifications/ProgramNotifications.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "NintendoSwitch/NintendoSwitch_Settings.h"
-#include "PokemonSwSh/PokemonSwSh_Settings.h"
-#include "PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.h"
-#include "PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_ShinyEncounterDetector.h"
-#include "PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
-#include "PokemonSwSh/Programs/PokemonSwSh_EncounterHandler.h"
-#include "PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHunt-Regi.h"
-#include "PokemonSwSh_ShinyHuntAutonomous-Regi.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-ShinyHuntAutonomousRegi_Descriptor::ShinyHuntAutonomousRegi_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonSwSh:ShinyHuntAutonomousRegi",
-        STRING_POKEMON + " SwSh", "Shiny Hunt Autonomous - Regi",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonSwSh/ShinyHuntAutonomous-Regi.md",
-        "Automatically hunt for shiny Regi using video feedback.",
-        FeedbackType::REQUIRED,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-std::unique_ptr<StatsTracker> ShinyHuntAutonomousRegi_Descriptor::make_stats() const{
-    return std::unique_ptr<StatsTracker>(
-        new ShinyHuntTracker(
-            true,
-            {{"Light Resets", "Errors"}}
-        )
-    );
-}
-
-
-
-ShinyHuntAutonomousRegi::ShinyHuntAutonomousRegi()
-    : GO_HOME_WHEN_DONE(false)
-    , ENCOUNTER_BOT_OPTIONS(false, false)
-    , NOTIFICATIONS({
-        &ENCOUNTER_BOT_OPTIONS.NOTIFICATION_NONSHINY,
-        &ENCOUNTER_BOT_OPTIONS.NOTIFICATION_SHINY,
-        &NOTIFICATION_PROGRAM_FINISH,
-        &NOTIFICATION_ERROR_FATAL,
-    })
-    , m_advanced_options(
-        "<font size=4><b>Advanced Options:</b> You should not need to touch anything below here.</font>"
-    )
-    , EXIT_BATTLE_TIMEOUT(
-        "<b>Exit Battle Timeout:</b><br>After running, wait this long to return to overworld.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "10 * TICKS_PER_SECOND"
-    )
-    , POST_BATTLE_MASH_TIME(
-        "<b>Post-Battle Mash:</b><br>After each battle, mash B for this long to clear the dialogs.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "1 * TICKS_PER_SECOND"
-    )
-    , TRANSITION_DELAY(
-        "<b>Transition Delay:</b><br>Time to enter/exit the building.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "5 * TICKS_PER_SECOND"
-    )
-{
-    PA_ADD_OPTION(START_LOCATION);
-    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
-    PA_ADD_OPTION(TOUCH_DATE_INTERVAL);
-
-    PA_ADD_OPTION(LANGUAGE);
-    PA_ADD_OPTION(REGI_NAME);
-
-    PA_ADD_OPTION(ENCOUNTER_BOT_OPTIONS);
-    PA_ADD_OPTION(NOTIFICATIONS);
-
-    PA_ADD_STATIC(m_advanced_options);
-    PA_ADD_OPTION(EXIT_BATTLE_TIMEOUT);
-    PA_ADD_OPTION(POST_BATTLE_MASH_TIME);
-    PA_ADD_OPTION(TRANSITION_DELAY);
-}
-
-
-
-
-void ShinyHuntAutonomousRegi::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    if (START_LOCATION.start_in_grip_menu()){
-        grip_menu_connect_go_home(context);
-        resume_game_back_out(env.console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST, 200);
-    }else{
-        pbf_press_button(context, BUTTON_B, 5, 5);
-    }
-
-    ShinyHuntTracker& stats = env.current_stats<ShinyHuntTracker>();
-    env.update_stats();
-
-    StandardEncounterHandler handler(
-        env, env.console, context,
-        LANGUAGE,
-        ENCOUNTER_BOT_OPTIONS,
-        stats
-    );
-
-    bool error = false;
-    while (true){
-        pbf_mash_button(context, BUTTON_B, POST_BATTLE_MASH_TIME);
-        move_to_corner(env.console, context, error, TRANSITION_DELAY);
-        if (error){
-            env.update_stats();
-            error = false;
-        }
-
-        //  Touch the date.
-        if (TOUCH_DATE_INTERVAL.ok_to_touch_now()){
-            env.log("Touching date to prevent rollover.");
-            pbf_press_button(context, BUTTON_HOME, 10, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE);
-            touch_date_from_home(context, ConsoleSettings::instance().SETTINGS_TO_HOME_DELAY);
-            resume_game_no_interact(env.console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST);
-        }
-
-        //  Do the light puzzle.
-        run_regi_light_puzzle(env.console, context, REGI_NAME, stats.encounters());
-
-        //  Start the encounter.
-        pbf_mash_button(context, BUTTON_A, 5 * TICKS_PER_SECOND);
-        context.wait_for_all_requests();
-
-        //  Detect shiny.
-        ShinyDetectionResult result = detect_shiny_battle(
-            env.console, context,
-            SHINY_BATTLE_REGULAR,
-            std::chrono::seconds(30)
-        );
-//        shininess = ShinyDetection::SQUARE_SHINY;
-        if (result.shiny_type == ShinyType::UNKNOWN){
-            stats.add_error();
-            pbf_mash_button(context, BUTTON_B, TICKS_PER_SECOND);
-            run_away(env.console, context, EXIT_BATTLE_TIMEOUT);
-            error = true;
-            continue;
-        }
-
-        bool stop = handler.handle_standard_encounter_end_battle(result, EXIT_BATTLE_TIMEOUT);
-        if (stop){
-            break;
-        }
-    }
-
-    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
-    GO_HOME_WHEN_DONE.run_end_of_program(context);
-}
-
-
-
-
-}
-}
-}
-
-
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Regi.h b/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Regi.h
deleted file mode 100644
index c513d8c0b4..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Regi.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*  Shiny Hunt Autonomous - Regi
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_ShinyHuntAutonomousRegi_H
-#define PokemonAutomation_PokemonSwSh_ShinyHuntAutonomousRegi_H
-
-#include "Common/Cpp/Options/StaticTextOption.h"
-#include "Common/Cpp/Options/SimpleIntegerOption.h"
-#include "CommonFramework/Notifications/EventNotificationsTable.h"
-#include "NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h"
-#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-#include "Pokemon/Options/Pokemon_EncounterBotOptions.h"
-#include "PokemonSwSh/Options/PokemonSwSh_DateToucher.h"
-#include "PokemonSwSh/Options/PokemonSwSh_EncounterBotCommon.h"
-#include "PokemonSwSh/Options/PokemonSwSh_RegiSelector.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-using namespace Pokemon;
-
-
-class ShinyHuntAutonomousRegi_Descriptor : public SingleSwitchProgramDescriptor{
-public:
-    ShinyHuntAutonomousRegi_Descriptor();
-
-    virtual std::unique_ptr<StatsTracker> make_stats() const override;
-};
-
-
-
-class ShinyHuntAutonomousRegi : public SingleSwitchProgramInstance{
-public:
-    ShinyHuntAutonomousRegi();
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-    StartInGripOrGameOption START_LOCATION;
-    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
-    TouchDateIntervalOption TOUCH_DATE_INTERVAL;
-
-    EncounterBotLanguage LANGUAGE;
-
-    RegiSelectorOption REGI_NAME;
-    EncounterBotCommonOptions ENCOUNTER_BOT_OPTIONS;
-
-    EventNotificationsOption NOTIFICATIONS;
-
-    SectionDividerOption m_advanced_options;
-    TimeExpressionOption<uint16_t> EXIT_BATTLE_TIMEOUT;
-    TimeExpressionOption<uint16_t> POST_BATTLE_MASH_TIME;
-    TimeExpressionOption<uint16_t> TRANSITION_DELAY;
-};
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Regigigas2.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Regigigas2.cpp
deleted file mode 100644
index 7147d63dcb..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Regigigas2.cpp
+++ /dev/null
@@ -1,186 +0,0 @@
-/*  Shiny Hunt Autonomous - Regigigas2
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Cpp/PrettyPrint.h"
-#include "CommonFramework/Notifications/ProgramNotifications.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "NintendoSwitch/NintendoSwitch_Settings.h"
-#include "PokemonSwSh/PokemonSwSh_Settings.h"
-#include "PokemonSwSh/Inference/Battles/PokemonSwSh_StartBattleDetector.h"
-#include "PokemonSwSh/Inference/Dens/PokemonSwSh_RaidCatchDetector.h"
-#include "PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_ShinyEncounterDetector.h"
-#include "PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
-#include "PokemonSwSh/Programs/PokemonSwSh_EncounterHandler.h"
-#include "PokemonSwSh_ShinyHuntAutonomous-Regigigas2.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-ShinyHuntAutonomousRegigigas2_Descriptor::ShinyHuntAutonomousRegigigas2_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonSwSh:ShinyHuntAutonomousRegigigas2",
-        STRING_POKEMON + " SwSh", "Shiny Hunt Autonomous - Regigigas2",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonSwSh/ShinyHuntAutonomous-Regigigas2.md",
-        "Automatically hunt for shiny Regigigas using video feedback.",
-        FeedbackType::REQUIRED,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-std::unique_ptr<StatsTracker> ShinyHuntAutonomousRegigigas2_Descriptor::make_stats() const{
-    return std::unique_ptr<StatsTracker>(
-        new ShinyHuntTracker(
-            true,
-            {{"Timeouts", "Errors"}}
-        )
-    );
-}
-
-
-
-ShinyHuntAutonomousRegigigas2::ShinyHuntAutonomousRegigigas2()
-    : GO_HOME_WHEN_DONE(false)
-    , REVERSAL_PP(
-        "<b>Reversal PP:</b><br>The amount of Reversal PP you are saved with.",
-        LockWhileRunning::LOCKED,
-        24
-    )
-    , ENCOUNTER_BOT_OPTIONS(false, false)
-    , NOTIFICATIONS({
-        &ENCOUNTER_BOT_OPTIONS.NOTIFICATION_NONSHINY,
-        &ENCOUNTER_BOT_OPTIONS.NOTIFICATION_SHINY,
-        &NOTIFICATION_PROGRAM_FINISH,
-        &NOTIFICATION_ERROR_FATAL,
-    })
-    , m_advanced_options(
-        "<font size=4><b>Advanced Options:</b> You should not need to touch anything below here.</font>"
-    )
-    , CATCH_TO_OVERWORLD_DELAY(
-        "<b>Catch to Overworld Delay:</b>",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "8 * TICKS_PER_SECOND"
-    )
-{
-    PA_ADD_OPTION(START_LOCATION);
-    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
-    PA_ADD_OPTION(TOUCH_DATE_INTERVAL);
-
-    PA_ADD_OPTION(REVERSAL_PP);
-    PA_ADD_OPTION(ENCOUNTER_BOT_OPTIONS);
-    PA_ADD_OPTION(NOTIFICATIONS);
-
-    PA_ADD_STATIC(m_advanced_options);
-    PA_ADD_OPTION(CATCH_TO_OVERWORLD_DELAY);
-}
-
-
-
-bool ShinyHuntAutonomousRegigigas2::kill_and_return(ConsoleHandle& console, BotBaseContext& context) const{
-    pbf_mash_button(context, BUTTON_A, 4 * TICKS_PER_SECOND);
-
-    RaidCatchDetector detector(console);
-    int result = wait_until(
-        console, context,
-        std::chrono::seconds(30),
-        {{detector}}
-    );
-    switch (result){
-    case 0:
-        pbf_press_dpad(context, DPAD_DOWN, 10, 0);
-        pbf_press_button(context, BUTTON_A, 10, CATCH_TO_OVERWORLD_DELAY);
-        return true;
-    default:
-        console.log("Raid Catch Menu not found.", COLOR_RED);
-        return false;
-    }
-}
-void ShinyHuntAutonomousRegigigas2::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    if (START_LOCATION.start_in_grip_menu()){
-        grip_menu_connect_go_home(context);
-        resume_game_back_out(env.console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST, 500);
-    }else{
-        pbf_press_button(context, BUTTON_B, 5, 5);
-    }
-
-    ShinyHuntTracker& stats = env.current_stats<ShinyHuntTracker>();
-    env.update_stats();
-
-    StandardEncounterHandler handler(
-        env, env.console, context,
-        Language::None,
-        ENCOUNTER_BOT_OPTIONS,
-        stats
-    );
-
-    while (true){
-        for (uint8_t pp = REVERSAL_PP; pp > 0; pp--){
-            env.log("Starting Regigigas Encounter: " + tostr_u_commas(stats.encounters() + 1));
-
-            pbf_mash_button(context, BUTTON_A, 18 * TICKS_PER_SECOND);
-            context.wait_for_all_requests();
-
-            {
-                StartBattleWatcher detector;
-                int result = wait_until(
-                    env.console, context,
-                    std::chrono::seconds(30),
-                    {{detector}}
-                );
-                if (result < 0){
-                    stats.add_error();
-                    env.update_stats();
-                    break;
-                }
-                env.log("Detected battle start.");
-            }
-
-            ShinyDetectionResult result = detect_shiny_battle(
-                env.console, context,
-                SHINY_BATTLE_RAID,
-                std::chrono::seconds(30)
-            );
-//            shininess = ShinyDetection::STAR_SHINY;
-
-            bool stop = handler.handle_standard_encounter(result);
-            if (stop){
-                goto StopProgram;
-            }
-
-            if (result.shiny_type == ShinyType::UNKNOWN){
-                stats.add_error();
-                env.update_stats();
-                break;
-            }
-
-            kill_and_return(env.console, context);
-        }
-
-        pbf_press_button(context, BUTTON_HOME, 10, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE);
-        TOUCH_DATE_INTERVAL.touch_now_from_home_if_needed(context);
-        reset_game_from_home_with_inference(
-            env.console, context,
-            ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST
-        );
-    }
-
-
-StopProgram:
-    env.update_stats();
-    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
-    GO_HOME_WHEN_DONE.run_end_of_program(context);
-}
-
-
-
-}
-}
-}
-
-
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Regigigas2.h b/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Regigigas2.h
deleted file mode 100644
index 1c41a96748..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Regigigas2.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*  Shiny Hunt Autonomous - Regigigas2
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_ShinyHuntAutonomousRegigigas2_H
-#define PokemonAutomation_PokemonSwSh_ShinyHuntAutonomousRegigigas2_H
-
-#include "Common/Cpp/Options/StaticTextOption.h"
-#include "Common/Cpp/Options/SimpleIntegerOption.h"
-#include "Common/Cpp/Options/TimeExpressionOption.h"
-#include "CommonFramework/Notifications/EventNotificationsTable.h"
-#include "NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h"
-#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-#include "Pokemon/Options/Pokemon_EncounterBotOptions.h"
-#include "PokemonSwSh/Options/PokemonSwSh_DateToucher.h"
-#include "PokemonSwSh/Options/PokemonSwSh_EncounterBotCommon.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-class ShinyHuntAutonomousRegigigas2_Descriptor : public SingleSwitchProgramDescriptor{
-public:
-    ShinyHuntAutonomousRegigigas2_Descriptor();
-
-    virtual std::unique_ptr<StatsTracker> make_stats() const override;
-};
-
-
-
-class ShinyHuntAutonomousRegigigas2 : public SingleSwitchProgramInstance{
-public:
-    ShinyHuntAutonomousRegigigas2();
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-    bool kill_and_return(ConsoleHandle& console, BotBaseContext& context) const;
-
-private:
-    StartInGripOrGameOption START_LOCATION;
-    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
-    TouchDateIntervalOption TOUCH_DATE_INTERVAL;
-
-    SimpleIntegerOption<uint8_t> REVERSAL_PP;
-    EncounterBotCommonOptions ENCOUNTER_BOT_OPTIONS;
-
-    EventNotificationsOption NOTIFICATIONS;
-
-    SectionDividerOption m_advanced_options;
-    TimeExpressionOption<uint16_t> CATCH_TO_OVERWORLD_DELAY;
-};
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-StrongSpawn.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-StrongSpawn.cpp
deleted file mode 100644
index fc93c91edd..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-StrongSpawn.cpp
+++ /dev/null
@@ -1,135 +0,0 @@
-/*  Shiny Hunt Autonomous - Strong Spawn
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Cpp/PrettyPrint.h"
-#include "CommonFramework/Notifications/ProgramNotifications.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Device.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "NintendoSwitch/NintendoSwitch_Settings.h"
-#include "PokemonSwSh/PokemonSwSh_Settings.h"
-#include "PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.h"
-#include "PokemonSwSh/Inference/Battles/PokemonSwSh_StartBattleDetector.h"
-#include "PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_ShinyEncounterDetector.h"
-#include "PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
-#include "PokemonSwSh/Programs/PokemonSwSh_EncounterHandler.h"
-#include "PokemonSwSh_ShinyHuntAutonomous-StrongSpawn.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-ShinyHuntAutonomousStrongSpawn_Descriptor::ShinyHuntAutonomousStrongSpawn_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonSwSh:ShinyHuntAutonomousStrongSpawn",
-        STRING_POKEMON + " SwSh", "Shiny Hunt Autonomous - Strong Spawn",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonSwSh/ShinyHuntAutonomous-StrongSpawn.md",
-        "Automatically hunt for shiny strong spawns using video feedback.",
-        FeedbackType::REQUIRED,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-std::unique_ptr<StatsTracker> ShinyHuntAutonomousStrongSpawn_Descriptor::make_stats() const{
-    return std::unique_ptr<StatsTracker>(
-        new ShinyHuntTracker(
-            true,
-            {{"Timeouts", "Errors"}}
-        )
-    );
-}
-
-
-
-ShinyHuntAutonomousStrongSpawn::ShinyHuntAutonomousStrongSpawn()
-    : GO_HOME_WHEN_DONE(false)
-    , ENCOUNTER_BOT_OPTIONS(true, false)
-    , NOTIFICATIONS({
-        &ENCOUNTER_BOT_OPTIONS.NOTIFICATION_NONSHINY,
-        &ENCOUNTER_BOT_OPTIONS.NOTIFICATION_SHINY,
-        &NOTIFICATION_PROGRAM_FINISH,
-        &NOTIFICATION_ERROR_FATAL,
-    })
-//    , m_advanced_options(
-//        "<font size=4><b>Advanced Options:</b> You should not need to touch anything below here.</font>"
-//    )
-{
-    PA_ADD_OPTION(START_LOCATION);
-    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
-    PA_ADD_OPTION(TIME_ROLLBACK_HOURS);
-
-    PA_ADD_OPTION(LANGUAGE);
-
-    PA_ADD_OPTION(ENCOUNTER_BOT_OPTIONS);
-    PA_ADD_OPTION(NOTIFICATIONS);
-
-//    if (PERSISTENT_SETTINGS().developer_mode){
-//        PA_ADD_STATIC(m_advanced_options);
-//    }
-}
-
-
-
-void ShinyHuntAutonomousStrongSpawn::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    if (START_LOCATION.start_in_grip_menu()){
-        grip_menu_connect_go_home(context);
-    }else{
-        pbf_press_button(context, BUTTON_B, 5, 5);
-        pbf_press_button(context, BUTTON_HOME, 10, GameSettings::instance().GAME_TO_HOME_DELAY_FAST);
-    }
-
-    const uint32_t PERIOD = (uint32_t)TIME_ROLLBACK_HOURS * 3600 * TICKS_PER_SECOND;
-    uint32_t last_touch = system_clock(context);
-
-    ShinyHuntTracker& stats = env.current_stats<ShinyHuntTracker>();
-    env.update_stats();
-
-    StandardEncounterHandler handler(
-        env, env.console, context,
-        LANGUAGE,
-        ENCOUNTER_BOT_OPTIONS,
-        stats
-    );
-
-    while (true){
-        uint32_t now = system_clock(context);
-        if (TIME_ROLLBACK_HOURS > 0 && now - last_touch >= PERIOD){
-            rollback_hours_from_home(context, TIME_ROLLBACK_HOURS, ConsoleSettings::instance().SETTINGS_TO_HOME_DELAY);
-            last_touch += PERIOD;
-        }
-        reset_game_from_home_with_inference(
-            env.console, context,
-            ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST
-        );
-        env.log("Starting Encounter: " + tostr_u_commas(stats.encounters() + 1));
-        context.wait_for_all_requests();
-
-        //  Detect shiny.
-        ShinyDetectionResult result = detect_shiny_battle(
-            env.console, context,
-            SHINY_BATTLE_REGULAR,
-            std::chrono::seconds(30)
-        );
-
-        bool stop = handler.handle_standard_encounter(result);
-        if (stop){
-            break;
-        }
-
-        pbf_press_button(context, BUTTON_HOME, 10, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE);
-    }
-
-    env.update_stats();
-    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
-    GO_HOME_WHEN_DONE.run_end_of_program(context);
-}
-
-
-
-}
-}
-}
-
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-StrongSpawn.h b/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-StrongSpawn.h
deleted file mode 100644
index 24c17439af..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-StrongSpawn.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*  Shiny Hunt Autonomous - StrongSpawn
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_ShinyHuntAutonomousStrongSpawn_H
-#define PokemonAutomation_PokemonSwSh_ShinyHuntAutonomousStrongSpawn_H
-
-#include "Common/Cpp/Options/StaticTextOption.h"
-#include "Common/Cpp/Options/SimpleIntegerOption.h"
-#include "Common/Cpp/Options/TimeExpressionOption.h"
-#include "CommonFramework/Notifications/EventNotificationsTable.h"
-#include "NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h"
-#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-#include "Pokemon/Options/Pokemon_EncounterBotOptions.h"
-#include "PokemonSwSh/Options/PokemonSwSh_DateToucher.h"
-#include "PokemonSwSh/Options/PokemonSwSh_EncounterBotCommon.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-class ShinyHuntAutonomousStrongSpawn_Descriptor : public SingleSwitchProgramDescriptor{
-public:
-    ShinyHuntAutonomousStrongSpawn_Descriptor();
-
-    virtual std::unique_ptr<StatsTracker> make_stats() const override;
-};
-
-
-
-class ShinyHuntAutonomousStrongSpawn : public SingleSwitchProgramInstance{
-public:
-    ShinyHuntAutonomousStrongSpawn();
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-    StartInGripOrClosedOption START_LOCATION;
-    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
-    TimeRollbackHoursOption TIME_ROLLBACK_HOURS;
-
-    EncounterBotLanguage LANGUAGE;
-    EncounterBotCommonOptions ENCOUNTER_BOT_OPTIONS;
-
-    EventNotificationsOption NOTIFICATIONS;
-
-//    SectionDivider m_advanced_options;
-};
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-SwordsOfJustice.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-SwordsOfJustice.cpp
deleted file mode 100644
index c6e0f01780..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-SwordsOfJustice.cpp
+++ /dev/null
@@ -1,185 +0,0 @@
-/*  Shiny Hunt Autonomous - Swords Of Justice
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Cpp/PrettyPrint.h"
-#include "CommonFramework/Notifications/ProgramNotifications.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Device.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "NintendoSwitch/NintendoSwitch_Settings.h"
-#include "PokemonSwSh/PokemonSwSh_Settings.h"
-#include "PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.h"
-#include "PokemonSwSh/Inference/Battles/PokemonSwSh_StartBattleDetector.h"
-#include "PokemonSwSh/Inference/Battles/PokemonSwSh_BattleMenuDetector.h"
-#include "PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_ShinyEncounterDetector.h"
-#include "PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
-#include "PokemonSwSh/Programs/PokemonSwSh_EncounterHandler.h"
-#include "PokemonSwSh_ShinyHuntAutonomous-SwordsOfJustice.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-ShinyHuntAutonomousSwordsOfJustice_Descriptor::ShinyHuntAutonomousSwordsOfJustice_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonSwSh:ShinyHuntAutonomousSwordsOfJustice",
-        STRING_POKEMON + " SwSh", "Shiny Hunt Autonomous - Swords Of Justice",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonSwSh/ShinyHuntAutonomous-SwordsOfJustice.md",
-        "Automatically hunt for shiny Sword of Justice using video feedback.",
-        FeedbackType::REQUIRED,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-std::unique_ptr<StatsTracker> ShinyHuntAutonomousSwordsOfJustice_Descriptor::make_stats() const{
-    return std::unique_ptr<StatsTracker>(
-        new ShinyHuntTracker(
-            true,
-            {{"Timeouts", "Errors"}}
-        )
-    );
-}
-
-
-
-ShinyHuntAutonomousSwordsOfJustice::ShinyHuntAutonomousSwordsOfJustice()
-    : GO_HOME_WHEN_DONE(false)
-    , AIRPLANE_MODE(
-        "<b>Airplane Mode:</b><br>Enable if airplane mode is on.",
-        LockWhileRunning::LOCKED,
-        false
-    )
-    , ENCOUNTER_BOT_OPTIONS(true, false)
-    , NOTIFICATIONS({
-        &ENCOUNTER_BOT_OPTIONS.NOTIFICATION_NONSHINY,
-        &ENCOUNTER_BOT_OPTIONS.NOTIFICATION_SHINY,
-        &NOTIFICATION_PROGRAM_FINISH,
-        &NOTIFICATION_ERROR_FATAL,
-    })
-    , m_advanced_options(
-        "<font size=4><b>Advanced Options:</b> You should not need to touch anything below here.</font>"
-    )
-    , EXIT_BATTLE_TIMEOUT(
-        "<b>Exit Battle Timeout:</b><br>After running, wait this long to return to overworld.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "10 * TICKS_PER_SECOND"
-    )
-    , POST_BATTLE_MASH_TIME(
-        "<b>Post-Battle Mash:</b><br>After each battle, mash B for this long before entering the camp.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "1 * TICKS_PER_SECOND"
-    )
-    , ENTER_CAMP_DELAY(
-        "<b>Enter Camp Delay:</b>",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "8 * TICKS_PER_SECOND"
-    )
-{
-    PA_ADD_OPTION(START_LOCATION);
-    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
-    PA_ADD_OPTION(TIME_ROLLBACK_HOURS);
-
-    PA_ADD_OPTION(LANGUAGE);
-    PA_ADD_OPTION(AIRPLANE_MODE);
-    PA_ADD_OPTION(ENCOUNTER_BOT_OPTIONS);
-    PA_ADD_OPTION(NOTIFICATIONS);
-
-    PA_ADD_STATIC(m_advanced_options);
-    PA_ADD_OPTION(EXIT_BATTLE_TIMEOUT);
-    PA_ADD_OPTION(POST_BATTLE_MASH_TIME);
-    PA_ADD_OPTION(ENTER_CAMP_DELAY);
-}
-
-
-
-void ShinyHuntAutonomousSwordsOfJustice::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    if (START_LOCATION.start_in_grip_menu()){
-        grip_menu_connect_go_home(context);
-        resume_game_no_interact(env.console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST);
-    }else{
-        pbf_press_button(context, BUTTON_B, 5, 5);
-    }
-
-    const uint32_t PERIOD = (uint32_t)TIME_ROLLBACK_HOURS * 3600 * TICKS_PER_SECOND;
-    uint32_t last_touch = system_clock(context);
-
-    ShinyHuntTracker& stats = env.current_stats<ShinyHuntTracker>();
-    env.update_stats();
-
-    StandardEncounterHandler handler(
-        env, env.console, context,
-        LANGUAGE,
-        ENCOUNTER_BOT_OPTIONS,
-        stats
-    );
-
-    while (true){
-        //  Touch the date.
-        if (TIME_ROLLBACK_HOURS > 0 && system_clock(context) - last_touch >= PERIOD){
-            pbf_press_button(context, BUTTON_HOME, 10, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE);
-            rollback_hours_from_home(context, TIME_ROLLBACK_HOURS, ConsoleSettings::instance().SETTINGS_TO_HOME_DELAY);
-            resume_game_no_interact(env.console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST);
-            last_touch += PERIOD;
-        }
-
-        //  Trigger encounter.
-        pbf_mash_button(context, BUTTON_B, POST_BATTLE_MASH_TIME);
-        pbf_press_button(context, BUTTON_X, 10, GameSettings::instance().OVERWORLD_TO_MENU_DELAY);
-        pbf_press_button(context, BUTTON_A, 10, ENTER_CAMP_DELAY);
-        if (AIRPLANE_MODE){
-            pbf_press_button(context, BUTTON_A, 10, 100);
-            pbf_press_button(context, BUTTON_A, 10, 100);
-        }
-        pbf_press_button(context, BUTTON_X, 10, 50);
-        pbf_press_dpad(context, DPAD_LEFT, 10, 10);
-        env.log("Starting Encounter: " + tostr_u_commas(stats.encounters() + 1));
-        pbf_press_button(context, BUTTON_A, 10, 0);
-        context.wait_for_all_requests();
-
-        {
-            //  Wait for start of battle.
-            StandardBattleMenuWatcher battle_menu_detector(false);
-            StartBattleWatcher start_back_detector;
-            wait_until(
-                env.console, context,
-                std::chrono::seconds(30),
-                {
-                    {battle_menu_detector},
-                    {start_back_detector},
-                }
-            );
-        }
-
-        //  Detect shiny.
-        ShinyDetectionResult result = detect_shiny_battle(
-            env.console, context,
-            SHINY_BATTLE_REGULAR,
-            std::chrono::seconds(30)
-        );
-//        shininess = ShinyDetection::SQUARE_SHINY;
-
-        bool stop = handler.handle_standard_encounter_end_battle(result, EXIT_BATTLE_TIMEOUT);
-        if (stop){
-            break;
-        }
-    }
-
-    env.update_stats();
-    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
-    GO_HOME_WHEN_DONE.run_end_of_program(context);
-}
-
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-SwordsOfJustice.h b/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-SwordsOfJustice.h
deleted file mode 100644
index 5cf04b65f7..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-SwordsOfJustice.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*  Shiny Hunt Autonomous - Swords Of Justice
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_ShinyHuntAutonomousSwordsOfJustice_H
-#define PokemonAutomation_PokemonSwSh_ShinyHuntAutonomousSwordsOfJustice_H
-
-#include "Common/Cpp/Options/StaticTextOption.h"
-#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
-#include "Common/Cpp/Options/SimpleIntegerOption.h"
-#include "Common/Cpp/Options/TimeExpressionOption.h"
-#include "CommonFramework/Notifications/EventNotificationsTable.h"
-#include "NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h"
-#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-#include "Pokemon/Options/Pokemon_EncounterBotOptions.h"
-#include "PokemonSwSh/Options/PokemonSwSh_DateToucher.h"
-#include "PokemonSwSh/Options/PokemonSwSh_EncounterBotCommon.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-class ShinyHuntAutonomousSwordsOfJustice_Descriptor : public SingleSwitchProgramDescriptor{
-public:
-    ShinyHuntAutonomousSwordsOfJustice_Descriptor();
-
-    virtual std::unique_ptr<StatsTracker> make_stats() const override;
-};
-
-
-
-class ShinyHuntAutonomousSwordsOfJustice : public SingleSwitchProgramInstance{
-public:
-    ShinyHuntAutonomousSwordsOfJustice();
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-    StartInGripOrGameOption START_LOCATION;
-    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
-    TimeRollbackHoursOption TIME_ROLLBACK_HOURS;
-
-    EncounterBotLanguage LANGUAGE;
-
-    BooleanCheckBoxOption AIRPLANE_MODE;
-    EncounterBotCommonOptions ENCOUNTER_BOT_OPTIONS;
-
-    EventNotificationsOption NOTIFICATIONS;
-
-    SectionDividerOption m_advanced_options;
-    TimeExpressionOption<uint16_t> EXIT_BATTLE_TIMEOUT;
-    TimeExpressionOption<uint16_t> POST_BATTLE_MASH_TIME;
-    TimeExpressionOption<uint16_t> ENTER_CAMP_DELAY;
-};
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Whistling.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Whistling.cpp
deleted file mode 100644
index a9260809b7..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Whistling.cpp
+++ /dev/null
@@ -1,174 +0,0 @@
-/*  Shiny Hunt Autonomous - Whistling
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/Notifications/ProgramNotifications.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Device.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "NintendoSwitch/NintendoSwitch_Settings.h"
-#include "PokemonSwSh/PokemonSwSh_Settings.h"
-#include "PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.h"
-#include "PokemonSwSh/Inference/Battles/PokemonSwSh_StartBattleDetector.h"
-#include "PokemonSwSh/Inference/Battles/PokemonSwSh_BattleMenuDetector.h"
-#include "PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_ShinyEncounterDetector.h"
-#include "PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
-#include "PokemonSwSh/Programs/PokemonSwSh_EncounterHandler.h"
-#include "PokemonSwSh_ShinyHuntAutonomous-Whistling.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-ShinyHuntAutonomousWhistling_Descriptor::ShinyHuntAutonomousWhistling_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonSwSh:ShinyHuntAutonomousWhistling",
-        STRING_POKEMON + " SwSh", "Shiny Hunt Autonomous - Whistling",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonSwSh/ShinyHuntAutonomous-Whistling.md",
-        "Stand in one place and whistle. Shiny hunt everything that attacks you using video feedback.",
-        FeedbackType::REQUIRED,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-struct ShinyHuntAutonomousWhistling_Descriptor::Stats : public ShinyHuntTracker{
-    Stats()
-        : ShinyHuntTracker(true)
-        , m_unexpected_battles(m_stats["Unexpected Battles"])
-    {
-        m_display_order.insert(m_display_order.begin() + 2, Stat("Unexpected Battles"));
-        m_aliases["Timeouts"] = "Errors";
-    }
-    std::atomic<uint64_t>& m_unexpected_battles;
-};
-std::unique_ptr<StatsTracker> ShinyHuntAutonomousWhistling_Descriptor::make_stats() const{
-    return std::unique_ptr<StatsTracker>(new Stats());
-}
-
-
-
-ShinyHuntAutonomousWhistling::ShinyHuntAutonomousWhistling()
-    : GO_HOME_WHEN_DONE(false)
-    , ENCOUNTER_BOT_OPTIONS(true, true)
-    , NOTIFICATIONS({
-        &ENCOUNTER_BOT_OPTIONS.NOTIFICATION_NONSHINY,
-        &ENCOUNTER_BOT_OPTIONS.NOTIFICATION_SHINY,
-        &ENCOUNTER_BOT_OPTIONS.NOTIFICATION_CATCH_SUCCESS,
-        &ENCOUNTER_BOT_OPTIONS.NOTIFICATION_CATCH_FAILED,
-        &NOTIFICATION_PROGRAM_FINISH,
-        &NOTIFICATION_ERROR_FATAL,
-    })
-    , m_advanced_options(
-        "<font size=4><b>Advanced Options:</b> You should not need to touch anything below here.</font>"
-    )
-    , EXIT_BATTLE_TIMEOUT(
-        "<b>Exit Battle Timeout:</b><br>After running, wait this long to return to overworld.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "10 * TICKS_PER_SECOND"
-    )
-{
-    PA_ADD_OPTION(START_LOCATION);
-    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
-    PA_ADD_OPTION(TIME_ROLLBACK_HOURS);
-
-    PA_ADD_OPTION(LANGUAGE);
-    PA_ADD_OPTION(ENCOUNTER_BOT_OPTIONS);
-    PA_ADD_OPTION(NOTIFICATIONS);
-
-    PA_ADD_STATIC(m_advanced_options);
-    PA_ADD_OPTION(EXIT_BATTLE_TIMEOUT);
-}
-
-
-
-void ShinyHuntAutonomousWhistling::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    if (START_LOCATION.start_in_grip_menu()){
-        grip_menu_connect_go_home(context);
-        resume_game_back_out(env.console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST, 200);
-    }else{
-        pbf_press_button(context, BUTTON_B, 5, 5);
-    }
-
-    const uint32_t PERIOD = (uint32_t)TIME_ROLLBACK_HOURS * 3600 * TICKS_PER_SECOND;
-    uint32_t last_touch = system_clock(context);
-
-    ShinyHuntAutonomousWhistling_Descriptor::Stats& stats = env.current_stats<ShinyHuntAutonomousWhistling_Descriptor::Stats>();
-    env.update_stats();
-
-    StandardEncounterHandler handler(
-        env, env.console, context,
-        LANGUAGE,
-        ENCOUNTER_BOT_OPTIONS,
-        stats
-    );
-
-    while (true){
-        //  Touch the date.
-        if (TIME_ROLLBACK_HOURS > 0 && system_clock(context) - last_touch >= PERIOD){
-            pbf_press_button(context, BUTTON_HOME, 10, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE);
-            rollback_hours_from_home(context, TIME_ROLLBACK_HOURS, ConsoleSettings::instance().SETTINGS_TO_HOME_DELAY);
-            resume_game_no_interact(env.console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST);
-            last_touch += PERIOD;
-        }
-
-        context.wait_for_all_requests();
-        {
-            StandardBattleMenuWatcher battle_menu_detector(false);
-            StartBattleWatcher start_battle_detector;
-
-            int result = run_until(
-                env.console, context,
-                [](BotBaseContext& context){
-                    while (true){
-                        pbf_mash_button(context, BUTTON_LCLICK, TICKS_PER_SECOND);
-                        pbf_move_right_joystick(context, 192, 128, TICKS_PER_SECOND, 0);
-                    }
-                },
-                {
-                    {battle_menu_detector},
-                    {start_battle_detector},
-                }
-            );
-
-            switch (result){
-            case 0:
-                env.log("Unexpected battle menu.", COLOR_RED);
-                stats.m_unexpected_battles++;
-                env.update_stats();
-                pbf_mash_button(context, BUTTON_B, TICKS_PER_SECOND);
-                run_away(env.console, context, EXIT_BATTLE_TIMEOUT);
-                continue;
-            case 1:
-                env.log("Battle started!");
-                break;
-            }
-        }
-
-        //  Detect shiny.
-        ShinyDetectionResult result = detect_shiny_battle(
-            env.console, context,
-            SHINY_BATTLE_REGULAR,
-            std::chrono::seconds(30)
-        );
-
-        bool stop = handler.handle_standard_encounter_end_battle(result, EXIT_BATTLE_TIMEOUT);
-        if (stop){
-            break;
-        }
-    }
-
-    env.update_stats();
-    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
-    GO_HOME_WHEN_DONE.run_end_of_program(context);
-}
-
-
-
-}
-}
-}
-
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Whistling.h b/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Whistling.h
deleted file mode 100644
index 518e0bcc26..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Whistling.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*  Shiny Hunt Autonomous - Whistling
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_ShinyHuntAutonomousWhistling_H
-#define PokemonAutomation_PokemonSwSh_ShinyHuntAutonomousWhistling_H
-
-#include "Common/Cpp/Options/StaticTextOption.h"
-#include "Common/Cpp/Options/SimpleIntegerOption.h"
-#include "Common/Cpp/Options/TimeExpressionOption.h"
-#include "CommonFramework/Notifications/EventNotificationsTable.h"
-#include "NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h"
-#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-#include "Pokemon/Options/Pokemon_EncounterBotOptions.h"
-#include "PokemonSwSh/Options/PokemonSwSh_DateToucher.h"
-#include "PokemonSwSh/Options/PokemonSwSh_EncounterBotCommon.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-class ShinyHuntAutonomousWhistling_Descriptor : public SingleSwitchProgramDescriptor{
-public:
-    ShinyHuntAutonomousWhistling_Descriptor();
-
-    struct Stats;
-    virtual std::unique_ptr<StatsTracker> make_stats() const override;
-};
-
-
-
-class ShinyHuntAutonomousWhistling : public SingleSwitchProgramInstance{
-public:
-    ShinyHuntAutonomousWhistling();
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-    StartInGripOrGameOption START_LOCATION;
-    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
-    TimeRollbackHoursOption TIME_ROLLBACK_HOURS;
-
-    EncounterBotLanguage LANGUAGE;
-    EncounterBotCommonOptions ENCOUNTER_BOT_OPTIONS;
-
-    EventNotificationsOption NOTIFICATIONS;
-
-    SectionDividerOption m_advanced_options;
-    TimeExpressionOption<uint16_t> EXIT_BATTLE_TIMEOUT;
-};
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_CurryHunter.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_CurryHunter.cpp
deleted file mode 100644
index 72d054377d..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_CurryHunter.cpp
+++ /dev/null
@@ -1,285 +0,0 @@
-/*  Curry Hunter
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/Globals.h"
-#include "CommonFramework/InferenceInfra/InferenceSession.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "NintendoSwitch/NintendoSwitch_Settings.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonSwSh/PokemonSwSh_Settings.h"
-#include "PokemonSwSh/ShinyHuntTracker.h"
-#include "PokemonSwSh/Inference/PokemonSwSh_ReceivePokemonDetector.h"
-//#include "PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_ShinySparkleDetector.h"
-#include "PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
-#include "PokemonSwSh_CurryHunter.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-CurryHunter_Descriptor::CurryHunter_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonSwSh:CurryHunter",
-        STRING_POKEMON + " SwSh", "Curry Hunter",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonSwSh/CurryHunter.md",
-        "Cooks curry to attract " + STRING_POKEMON + " to your camp. This is a beta version. "
-        "<font color=\"red\">(This program cannot detect shinies. You must check manually or with " + STRING_POKEMON + " HOME.)</font>",
-        FeedbackType::OPTIONAL_,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-struct CurryHunter_Descriptor::Stats : public ShinyHuntTracker{
-    Stats()
-        : ShinyHuntTracker(true)
-        , m_attempts(m_stats["Attempts"])
-    {
-        for (auto& item : m_display_order){
-            item.omit_if_zero = true;
-        }
-        m_display_order.insert(m_display_order.begin(), Stat("Attempts"));
-    }
-    std::atomic<uint64_t>& m_attempts;
-};
-std::unique_ptr<StatsTracker> CurryHunter_Descriptor::make_stats() const{
-    return std::unique_ptr<StatsTracker>(new Stats());
-}
-
-
-CurryHunter::CurryHunter()
-    : WALK_UP_DELAY(
-        "<b>Walk up Delay:</b><br>Wait this long for the " + STRING_POKEMON + " to walk up to you.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "2 * TICKS_PER_SECOND"
-    )
-    , TAKE_VIDEO(
-        "<b>Take Videos:</b><br>Take a video after each cooking iteration. This will spam your album with videos.",
-        LockWhileRunning::LOCKED,
-        false
-    )
-    , ITERATIONS(
-        "<b>Iterations:</b><br># of cooking attempts.",
-        LockWhileRunning::LOCKED,
-        999
-    )
-{
-    PA_ADD_OPTION(WALK_UP_DELAY);
-    PA_ADD_OPTION(START_LOCATION);
-    PA_ADD_OPTION(TAKE_VIDEO);
-    PA_ADD_OPTION(ITERATIONS);
-}
-
-
-
-void CurryHunter::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    if (START_LOCATION.start_in_grip_menu()){
-        grip_menu_connect_go_home(context);
-        resume_game_no_interact(env.console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST);
-    }else{
-        pbf_press_button(context, BUTTON_R, 5, 50);
-    }
-
-
-    CurryHunter_Descriptor::Stats& stats = env.current_stats<CurryHunter_Descriptor::Stats>();
-    env.update_stats();
-
-
-    //  Select the cooking option.
-    pbf_press_button(context, BUTTON_X, 5, 125);
-    pbf_press_dpad(context, DPAD_RIGHT, 5, 100);
-    pbf_press_button(context, BUTTON_A, 5, 125);
-    pbf_press_button(context, BUTTON_A, 5, 300);
-
-
-    for (uint32_t it = 0; it < ITERATIONS; it++){
-        //  Which ingredient do you want to use?
-        pbf_press_button(context, BUTTON_A, 5, 75);     //  Get rid of the pop-up menu.
-        pbf_press_button(context, BUTTON_A, 5, 150);    //  75. english text is longer.
-        pbf_press_button(context, BUTTON_A, 5, 100);    //  Ingredient is now selected.
-
-        //  Which berries do you want to use?
-        pbf_press_button(context, BUTTON_A, 5, 75);     //  Get rid of the pop-up menu.
-        pbf_press_button(context, BUTTON_A, 5, 75);
-        pbf_press_dpad(context, DPAD_UP, 5, 75);
-        pbf_press_button(context, BUTTON_A, 5, 125);
-        pbf_press_button(context, BUTTON_PLUS, 5, 200); //  125. english text is longer.
-        pbf_press_button(context, BUTTON_A, 5, 1000);   //  Berries are now selected as well.
-
-
-        //  Around 17 seconds of A mashing for the first curry cooking phase.
-        for (uint16_t c = 0; c < 2100; c = c + 10){
-            pbf_press_button(context, BUTTON_A, 5, 5);
-        }
-
-        //  Slowing down to not burn the curry.
-        for (uint16_t c = 0; c < 300; c = c + 25){
-            pbf_press_button(context, BUTTON_A, 5, 20);
-        }
-        pbf_wait(context, 170);
-
-
-        //  Do circles with the joystick. Each circle has ten positions.
-        for (uint16_t i = 0; i < 2350; i = i + 50){
-            pbf_move_right_joystick(context, 128, 255, 5, 0);
-            pbf_move_right_joystick(context, 202, 231, 5, 0);
-            pbf_move_right_joystick(context, 249, 167, 5, 0);
-            pbf_move_right_joystick(context, 249, 88, 5, 0);
-            pbf_move_right_joystick(context, 202, 24, 5, 0);
-            pbf_move_right_joystick(context, 128, 0, 5, 0);
-            pbf_move_right_joystick(context, 53, 24, 5, 0);
-            pbf_move_right_joystick(context, 6, 88, 5, 0);
-            pbf_move_right_joystick(context, 6, 167, 5, 0);
-            pbf_move_right_joystick(context, 53, 231, 5, 0);
-        }
-
-
-        //  Last step for the curry cooking part.
-        pbf_wait(context, 425);
-        pbf_press_button(context, BUTTON_A, 5, 2250);
-
-        //  Press A when it shows your curry, and its class.
-        pbf_press_button(context, BUTTON_A, 5, 1500);
-        pbf_press_button(context, BUTTON_A, 5, 500);
-        // You are now back to the camping with your 6 Pokemon, and hopefully a curry Pokemon.
-
-        {
-            context.wait_for_all_requests();
-
-            ReceivePokemonDetector receive_detector(false);
-//            ShinySparkleDetector shiny_detector(
-//                env.console, env.console,
-//                ImageFloatBox(0.1, 0.01, 0.8, 0.77)
-//            );
-            InferenceSession inference(
-                context, env.console,
-                {
-                    {receive_detector},
-//                    {shiny_detector},
-                }
-            );
-
-            //  Different implementation of the "attract curry Pokemon" routine. DEFAULT
-            pbf_move_left_joystick(context, 0x80, 0x00, 40, 5);     //  Move up a bit to avoid talking to your pokemon.
-            pbf_press_button(context, BUTTON_A, 5, 5);
-            pbf_move_left_joystick(context, 0xff, 0x80, 55, 0);     //  Right
-            for (uint16_t i = 0;  i< 2; i++){
-                pbf_move_left_joystick(context, 0x00, 0x80, 27, 0); //  Left
-                pbf_press_button(context, BUTTON_A, 5, 5);
-                pbf_move_left_joystick(context, 0x00, 0x80, 27, 0); //  Left
-                pbf_press_button(context, BUTTON_A, 5, 5);
-                pbf_move_left_joystick(context, 0x00, 0x80, 27, 0); //  Left
-                pbf_press_button(context, BUTTON_A, 5, 5);
-                pbf_move_left_joystick(context, 0x00, 0x80, 27, 0); //  Left
-                pbf_press_button(context, BUTTON_A, 5, 5);
-                pbf_move_left_joystick(context, 0xff, 0x80, 27, 0); //  Right
-                pbf_press_button(context, BUTTON_A, 5, 5);
-                pbf_move_left_joystick(context, 0xff, 0x80, 27, 0); //  Right
-                pbf_press_button(context, BUTTON_A, 5, 5);
-                pbf_move_left_joystick(context, 0xff, 0x80, 27, 0); //  Right
-                pbf_press_button(context, BUTTON_A, 5, 5);
-                pbf_move_left_joystick(context, 0xff, 0x80, 27, 0); //  Right
-                pbf_press_button(context, BUTTON_A, 5, 5);
-            }
-
-
-            //  Give the pokemon the time to come to us.
-            pbf_wait(context, WALK_UP_DELAY);
-
-            //  Record the encounter.
-            if (TAKE_VIDEO){
-                pbf_press_button(context, BUTTON_CAPTURE, 250, 500);
-            }else{
-                pbf_wait(context, 750);
-            }
-
-
-            //  At this point, let's assume we have attracted the curry pokemon.
-            //  Now we need to add it to our party while making sure this won't break anything if there is
-            //  No curry encounter.
-            //  This sequence seems to work because when you whistle at a curry encounter, your camera
-            //  Automatically focuses on it, while it doesn't do that for your pokemons.
-
-            //  "a [wild pokemon] came to your camp !"
-            pbf_press_button(context, BUTTON_A, 5, 250);
-
-            //  "[wild pokemon] seems to want to come with you!"
-            pbf_press_button(context, BUTTON_A, 5, 200);
-
-            //  "do you want to adopt it ?"
-            pbf_press_button(context, BUTTON_A, 5, 200);
-
-            //  "you adopted [wild pokemon]!"
-            pbf_press_button(context, BUTTON_A, 5, 200);
-
-            //  "[wild pokemon] entered into a poke ball"
-            pbf_press_button(context, BUTTON_A, 5, 800);
-
-            //  "[wild pokemon] has been sent to the PC"
-            pbf_press_button(context, BUTTON_A, 5, 375);
-
-
-            context.wait_for_all_requests();
-            ShinyType shininess = ShinyType::NOT_SHINY;
-            if (receive_detector.triggered()){
-//                shininess = shiny_detector.results();
-#if 1
-                stats.add_non_shiny();
-#else
-                switch (shininess){
-                case ShinyType::UNKNOWN:
-                case ShinyType::NOT_SHINY:
-                    stats.add_non_shiny();
-                    break;
-                case ShinyType::UNKNOWN_SHINY:
-                    stats.add_unknown_shiny();
-                    break;
-                case ShinyType::STAR_SHINY:
-                    stats.add_star_shiny();
-                    break;
-                case ShinyType::SQUARE_SHINY:
-                    stats.add_square_shiny();
-                    break;
-
-                }
-#endif
-            }
-
-            stats.m_attempts++;
-            env.update_stats();
-            if (shininess != ShinyType::NOT_SHINY){
-                pbf_press_button(context, BUTTON_CAPTURE, 250, 500);
-            }
-        }
-
-
-        //  If you talked to the curry Pokemon too early, you can end up talking to one of your Pokemon
-        //  Once you reach this part of the program. The following sequence ensures that you
-        //  Are in a correct state to cook again.
-        pbf_move_left_joystick(context, 0xff, 0x80, 125, 5);
-        pbf_move_left_joystick(context, 0x80, 0x00, 125, 5);
-        pbf_move_left_joystick(context, 0x80, 0x00, 5, 50);
-        pbf_press_button(context, BUTTON_A, 5, 250);    //  Wait 2 seconds to be sure the following X press won't be dropped.
-
-        //  And now we cook another curry.
-        pbf_press_button(context, BUTTON_X, 5, 125);
-        pbf_press_button(context, BUTTON_A, 5, 125);
-        pbf_press_button(context, BUTTON_A, 5, 300);
-    }
-
-
-    //  Not really relevant here, but for programs that finish, go to
-    //  Switch home to idle.
-    pbf_press_button(context, BUTTON_HOME, 10, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE);
-}
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_CurryHunter.h b/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_CurryHunter.h
deleted file mode 100644
index da93f0230c..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_CurryHunter.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*  Curry Bot
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_CurryHunter_H
-#define PokemonAutomation_PokemonSwSh_CurryHunter_H
-
-#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
-#include "Common/Cpp/Options/SimpleIntegerOption.h"
-#include "Common/Cpp/Options/TimeExpressionOption.h"
-#include "NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-class CurryHunter_Descriptor : public SingleSwitchProgramDescriptor{
-public:
-    CurryHunter_Descriptor();
-
-    struct Stats;
-    virtual std::unique_ptr<StatsTracker> make_stats() const override;
-};
-
-
-
-class CurryHunter : public SingleSwitchProgramInstance{
-public:
-    CurryHunter();
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-    StartInGripOrGameOption START_LOCATION;
-    TimeExpressionOption<uint16_t> WALK_UP_DELAY;
-    BooleanCheckBoxOption TAKE_VIDEO;
-    SimpleIntegerOption<uint32_t> ITERATIONS;
-};
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_MultiGameFossil.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_MultiGameFossil.cpp
deleted file mode 100644
index d21132fb73..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_MultiGameFossil.cpp
+++ /dev/null
@@ -1,170 +0,0 @@
-/*  Multiple Game Fossil
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Device.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Routines.h"
-#include "NintendoSwitch/NintendoSwitch_Settings.h"
-#include "NintendoSwitch/FixedInterval.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonSwSh/PokemonSwSh_Settings.h"
-#include "PokemonSwSh/Commands/PokemonSwSh_Commands_GameEntry.h"
-#include "PokemonSwSh/Commands/PokemonSwSh_Commands_Misc.h"
-#include "PokemonSwSh_MultiGameFossil.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-    using namespace Pokemon;
-
-
-MultiGameFossil_Descriptor::MultiGameFossil_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonSwSh:MultiGameFossil",
-        STRING_POKEMON + " SwSh", "Multi-Game Fossil Revive",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonSwSh/MultiGameFossil.md",
-        "Revive fossils. Supports multiple saves so you can go afk for longer than 5 hours.",
-        FeedbackType::NONE,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-
-
-
-MultiGameFossil::MultiGameFossil(){
-    PA_ADD_OPTION(START_LOCATION);
-    PA_ADD_OPTION(GAME_LIST);
-}
-
-void run_fossil_batch(
-    Logger& logger,
-    BotBaseContext& context,
-    const FossilGame& batch,
-    bool* game_slot_flipped,
-    bool save_and_exit
-){
-    //  Sanitize Slots
-    uint8_t game_slot = (uint8_t)batch.game_slot.current_value();
-    uint8_t user_slot = (uint8_t)batch.user_slot.current_value();
-    if (game_slot > 2){
-        game_slot = 0;
-    }
-
-    logger.log(
-        std::string("Batch:") +
-        "\nGame Slot: " + std::to_string(game_slot) +
-        "\nUser Slot: " + std::to_string(user_slot) +
-        "\nFossil: " + std::to_string(batch.fossil.current_value()) +
-        "\nRevives: " + std::to_string(batch.revives)
-    );
-
-    //  Calculate current game slot.
-    switch (game_slot){
-    case 0:
-        break;
-    case 1:
-        game_slot = *game_slot_flipped ? 2 : 0;
-        break;
-    case 2:
-        game_slot = *game_slot_flipped ? 0 : 2;
-        break;
-    }
-
-    start_game_from_home(
-        context,
-        ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST,
-        game_slot,
-        user_slot,
-        false
-    );
-    if (game_slot == 2){
-        *game_slot_flipped = !*game_slot_flipped;
-    }
-
-    //  Revive
-#if 1
-    for (uint16_t c = 0; c < batch.revives; c++){
-#if 1
-        mash_A(context, 170);
-        pbf_wait(context, 65);
-#else
-        mash_A(context, 50);
-        pbf_wait(context, 140);
-        ssf_press_button1(context, BUTTON_A, 160);
-#endif
-        switch (batch.fossil){
-        case Fossil::Dracozolt:
-            ssf_press_button1(context, BUTTON_A, 160);
-            break;
-        case Fossil::Arctozolt:
-            ssf_press_button1(context, BUTTON_A, 160);
-            ssf_press_dpad1(context, DPAD_DOWN, 5);
-            break;
-        case Fossil::Dracovish:
-            ssf_press_dpad1(context, DPAD_DOWN, 5);
-            ssf_press_button1(context, BUTTON_A, 160);
-            break;
-        case Fossil::Arctovish:
-            ssf_press_dpad1(context, DPAD_DOWN, 5);
-            ssf_press_button1(context, BUTTON_A, 160);
-            ssf_press_dpad1(context, DPAD_DOWN, 5);
-            break;
-        }
-        mash_A(context, 400);
-        pbf_mash_button(
-            context,
-            BUTTON_B,
-            GameSettings::instance().AUTO_DEPOSIT ? 1400 : 1520
-        );
-    }
-    pbf_wait(context, 100);
-#endif
-
-    if (!save_and_exit){
-//        ssf_press_button2(BUTTON_HOME, GAME_TO_HOME_DELAY_SAFE, 10);
-        return;
-    }
-
-    //  Save game.
-    ssf_press_button2(context, BUTTON_X, GameSettings::instance().OVERWORLD_TO_MENU_DELAY, 20);
-    ssf_press_button2(context, BUTTON_R, 150, 20);
-    ssf_press_button2(context, BUTTON_A, 500, 10);
-
-    //  Exit game.
-    ssf_press_button2(context, BUTTON_HOME, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE, 10);
-    close_game(context);
-}
-
-
-void MultiGameFossil::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    if (START_LOCATION.start_in_grip_menu()){
-        grip_menu_connect_go_home(context);
-    }else{
-        pbf_press_button(context, BUTTON_B, 5, 5);
-        pbf_press_button(context, BUTTON_HOME, 10, GameSettings::instance().GAME_TO_HOME_DELAY_FAST);
-    }
-
-    std::vector<std::unique_ptr<FossilGame>> list = GAME_LIST.copy_snapshot();
-
-//    FossilGame2 batch;
-
-    size_t games = list.size();
-
-    bool game_slot_flipped = false;
-    for (size_t c = 0; c < games; c++){
-//        batch = GAME_LIST2[c];
-        run_fossil_batch(env.logger(), context, *list[c], &game_slot_flipped, c + 1 < games);
-    }
-
-    ssf_press_button2(context, BUTTON_HOME, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE, 10);
-}
-
-
-
-}
-}
-}
-
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_MultiGameFossil.h b/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_MultiGameFossil.h
deleted file mode 100644
index 8158147e9d..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_MultiGameFossil.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*  Multiple Game Fossil
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_MultiGameFossil_H
-#define PokemonAutomation_PokemonSwSh_MultiGameFossil_H
-
-#include "Common/PokemonSwSh/PokemonSwSh_FossilTable.h"
-#include "NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-class MultiGameFossil_Descriptor : public SingleSwitchProgramDescriptor{
-public:
-    MultiGameFossil_Descriptor();
-};
-
-
-
-class MultiGameFossil : public SingleSwitchProgramInstance{
-public:
-    MultiGameFossil();
-
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-    StartInGripOrClosedOption START_LOCATION;
-    FossilTable GAME_LIST;
-};
-
-
-}
-}
-}
-#endif
-
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHunt-Regi.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHunt-Regi.cpp
deleted file mode 100644
index cb39ec3a36..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHunt-Regi.cpp
+++ /dev/null
@@ -1,125 +0,0 @@
-/*  Regi Routines
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Cpp/PrettyPrint.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "PokemonSwSh_ShinyHunt-Regi.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-void move_to_corner(
-    Logger& logger, BotBaseContext& context,
-    bool correction, uint16_t TRANSITION_DELAY
-){
-    if (correction){
-        logger.log("Performing auto-correction.");
-        //  Move down to building exit and exit.
-        pbf_move_left_joystick(context, 128, 255, 500, TRANSITION_DELAY);
-        pbf_move_left_joystick(context, 128, 255, 300, TRANSITION_DELAY);
-
-        //  Navigate back into the corner.
-        pbf_move_left_joystick(context, 255, 64, 200, 0);
-        pbf_move_left_joystick(context, 120, 0, 250, 0);
-        pbf_move_left_joystick(context, 255, 100, 150, 10);
-    }else{
-        //  Move to corner.
-        pbf_move_left_joystick(context, 255, 100, 300, 10);
-    }
-}
-
-
-void regirock(BotBaseContext& context){
-    pbf_move_left_joystick(context, 0, 232, 169, 0);
-    pbf_move_left_joystick(context, 128, 255, 135, 0);
-    pbf_move_left_joystick(context, 0, 128, 109, 0);
-    pbf_move_left_joystick(context, 128, 0, 140, 0);
-    pbf_move_left_joystick(context, 226, 255, 90, 0);
-    pbf_move_left_joystick(context, 128, 0, 20, 0);
-    pbf_mash_button(context, BUTTON_A, 5 * TICKS_PER_SECOND);
-    pbf_move_left_joystick(context, 128, 0, 200, 0);
-}
-void regice(BotBaseContext& context){
-    pbf_move_left_joystick(context, 80, 255, 182, 0);
-    pbf_move_left_joystick(context, 0, 128, 114, 0);
-    pbf_move_left_joystick(context, 128, 255, 56, 0);
-    pbf_move_left_joystick(context, 32, 0, 76, 0);
-    pbf_move_left_joystick(context, 0, 128, 54, 0);
-    pbf_move_left_joystick(context, 255, 68, 154, 0);
-    pbf_move_left_joystick(context, 128, 0, 20, 0);
-    pbf_mash_button(context, BUTTON_A, 5 * TICKS_PER_SECOND - 20);
-    pbf_move_left_joystick(context, 128, 0, 170, 0);
-}
-void registeel(BotBaseContext& context){
-    pbf_move_left_joystick(context, 0, 232, 169, 0);
-    pbf_move_left_joystick(context, 192, 255, 64, 0);
-    pbf_move_left_joystick(context, 64, 255, 64, 0);
-    pbf_move_left_joystick(context, 0, 128, 110, 0);
-    pbf_move_left_joystick(context, 64, 0, 68, 0);
-    pbf_move_left_joystick(context, 192, 0, 66, 0);
-    pbf_move_left_joystick(context, 230, 255, 90, 0);
-    pbf_move_left_joystick(context, 128, 0, 50, 0);
-    pbf_mash_button(context, BUTTON_A, 5 * TICKS_PER_SECOND);
-    pbf_move_left_joystick(context, 128, 0, 250, 0);
-}
-void regieleki(BotBaseContext& context){
-    pbf_move_left_joystick(context, 16, 255, 162, 0);
-    pbf_move_left_joystick(context, 64, 255, 52, 0);
-    pbf_move_left_joystick(context, 200, 255, 52, 0);
-    pbf_move_left_joystick(context, 0, 50, 122, 0);
-    pbf_move_left_joystick(context, 0, 206, 93, 0);
-    pbf_move_left_joystick(context, 216, 0, 78, 0);
-    pbf_move_left_joystick(context, 56, 0, 80, 0);
-    pbf_mash_button(context, BUTTON_A, 5 * TICKS_PER_SECOND);
-    pbf_move_left_joystick(context, 216, 0, 170, 0);
-}
-void regidrago(BotBaseContext& context){
-    pbf_move_left_joystick(context, 16, 255, 160, 0);
-    pbf_move_left_joystick(context, 72, 255, 50, 0);
-    pbf_move_left_joystick(context, 48, 255, 104, 0);
-    pbf_move_left_joystick(context, 128, 0, 48, 0);
-    pbf_move_left_joystick(context, 0, 56, 60, 0);
-    pbf_move_left_joystick(context, 64, 0, 60, 0);
-    pbf_move_left_joystick(context, 255, 148, 75, 0);
-    pbf_mash_button(context, BUTTON_A, 5 * TICKS_PER_SECOND);
-    pbf_move_left_joystick(context, 128, 0, 180, 0);
-}
-
-void run_regi_light_puzzle(
-    Logger& logger, BotBaseContext& context,
-    RegiGolem regi, uint64_t encounter
-){
-    switch (regi){
-    case RegiGolem::Regirock:
-        regirock(context);
-        logger.log("Starting Regirock Encounter: " + tostr_u_commas(encounter + 1));
-        break;
-    case RegiGolem::Regice:
-        regice(context);
-        logger.log("Starting Regice Encounter: " + tostr_u_commas(encounter + 1));
-        break;
-    case RegiGolem::Registeel:
-        registeel(context);
-        logger.log("Starting Registeel Encounter: " + tostr_u_commas(encounter + 1));
-        break;
-    case RegiGolem::Regieleki:
-        regieleki(context);
-        logger.log("Starting Regieleki Encounter: " + tostr_u_commas(encounter + 1));
-        break;
-    case RegiGolem::Regidrago:
-        regidrago(context);
-        logger.log("Starting Regidrago Encounter: " + tostr_u_commas(encounter + 1));
-        break;
-    }
-}
-
-
-}
-}
-}
-
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHunt-Regi.h b/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHunt-Regi.h
deleted file mode 100644
index c15eaa35af..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHunt-Regi.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*  Regi Routines
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_RegiPatterns_H
-#define PokemonAutomation_PokemonSwSh_RegiPatterns_H
-
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-#include "PokemonSwSh/Options/PokemonSwSh_RegiSelector.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-void move_to_corner(
-    Logger& logger, BotBaseContext& context,
-    bool correction, uint16_t TRANSITION_DELAY
-);
-
-void run_regi_light_puzzle(
-    Logger& logger, BotBaseContext& context,
-    RegiGolem regi, uint64_t encounter
-);
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntTools.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntTools.cpp
deleted file mode 100644
index 48fa0f08fe..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntTools.cpp
+++ /dev/null
@@ -1,78 +0,0 @@
-/*  Shiny Hunting Tools
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Device.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Routines.h"
-#include "NintendoSwitch/NintendoSwitch_Settings.h"
-#include "NintendoSwitch/FixedInterval.h"
-#include "PokemonSwSh/PokemonSwSh_Settings.h"
-#include "PokemonSwSh/Commands/PokemonSwSh_Commands_GameEntry.h"
-#include "PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.h"
-#include "PokemonSwSh_ShinyHuntTools.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-void run_away_with_lights(BotBaseContext& context){
-    set_leds(context, true);
-    pbf_press_dpad(context, DPAD_UP, 10, 0);
-    pbf_press_button(context, BUTTON_A, 10, 3 * TICKS_PER_SECOND);
-    set_leds(context, false);
-}
-void enter_summary(BotBaseContext& context, bool regi_move_right){
-    pbf_press_dpad(context, DPAD_DOWN, 10, 0);
-    pbf_press_button(context, BUTTON_A, 10, 2 * TICKS_PER_SECOND);
-    pbf_press_button(context, BUTTON_A, 10, 200);
-    if (regi_move_right){
-        pbf_move_left_joystick(context, 255, 128, 20, 30);
-    }
-    pbf_press_dpad(context, DPAD_DOWN, 10, 0);
-    pbf_press_button(context, BUTTON_A, 10, 10);    //  For Regi, this clears the dialog after running.
-}
-void close_game_if_overworld(BotBaseContext& context, bool touch_date, uint8_t rollback_hours){
-    //  Enter Y-COMM.
-    ssf_press_button2(context, BUTTON_Y, GameSettings::instance().OPEN_YCOMM_DELAY, 10);
-
-    //  Move the cursor as far away from Link Trade and Surprise Trade as possible.
-    //  This is added safety in case connect to internet takes too long.
-    pbf_press_dpad(context, DPAD_UP, 5, 0);
-    pbf_move_right_joystick(context, 128, 0, 5, 0);
-    pbf_press_dpad(context, DPAD_RIGHT, 5, 0);
-
-    //  Connect to internet.
-    pbf_press_button(context, BUTTON_PLUS, 10, TICKS_PER_SECOND);
-
-    //  Enter Switch Home.
-    pbf_press_button(context, BUTTON_HOME, 10, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE);
-
-    if (touch_date){
-        touch_date_from_home(context, ConsoleSettings::instance().SETTINGS_TO_HOME_DELAY);
-    }
-    if (rollback_hours > 0){
-        rollback_hours_from_home(context, rollback_hours, ConsoleSettings::instance().SETTINGS_TO_HOME_DELAY);
-    }
-
-    //  Enter profile.
-    pbf_press_dpad(context, DPAD_UP, 10, 10);
-    pbf_press_button(context, BUTTON_A, 10, GameSettings::instance().ENTER_PROFILE_DELAY);
-
-    //  Back out.
-    pbf_press_dpad(context, DPAD_LEFT, 10, 10);
-    pbf_press_button(context, BUTTON_B, 10, TICKS_PER_SECOND);
-    pbf_press_dpad(context, DPAD_DOWN, 10, 10);
-
-    //  Close and restart game.
-    close_game(context);
-    pbf_press_button(context, BUTTON_HOME, 10, 190);
-}
-
-
-}
-}
-}
-
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntTools.h b/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntTools.h
deleted file mode 100644
index 417f725a15..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntTools.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*  Shiny Hunting Tools
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_ShinyHuntingTools_H
-#define PokemonAutomation_PokemonSwSh_ShinyHuntingTools_H
-
-#include "CommonFramework/Tools/ConsoleHandle.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-void run_away_with_lights(BotBaseContext& context);
-void enter_summary(BotBaseContext& context, bool regi_move_right);
-void close_game_if_overworld(BotBaseContext& context, bool touch_date, uint8_t rollback_hours);
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntUnattended-IoATrade.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntUnattended-IoATrade.cpp
deleted file mode 100644
index 9a7ca3d961..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntUnattended-IoATrade.cpp
+++ /dev/null
@@ -1,156 +0,0 @@
-/*  ShinyHuntUnattended-IoATrade
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Cpp/PrettyPrint.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "NintendoSwitch/NintendoSwitch_Settings.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonSwSh/PokemonSwSh_Settings.h"
-#include "PokemonSwSh/Commands/PokemonSwSh_Commands_Misc.h"
-#include "PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
-#include "PokemonSwSh_ShinyHuntTools.h"
-#include "PokemonSwSh_ShinyHuntUnattended-IoATrade.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-    using namespace Pokemon;
-
-
-ShinyHuntUnattendedIoATrade_Descriptor::ShinyHuntUnattendedIoATrade_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonSwSh:ShinyHuntUnattendedIoATrade",
-        STRING_POKEMON + " SwSh", "Shiny Hunt Unattended - IoA Trade",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonSwSh/ShinyHuntUnattended-IoATrade.md",
-        "Hunt for shiny Isle of Armor trade. Stop when a shiny is found.",
-        FeedbackType::NONE,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_31KB
-    )
-{}
-
-
-
-ShinyHuntUnattendedIoATrade::ShinyHuntUnattendedIoATrade()
-    : START_TO_RUN_DELAY(
-        "<b>Start to Run Delay:</b><br>This needs to be carefully calibrated.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "1260"
-    )
-    , m_advanced_options(
-        "<font size=4><b>Advanced Options:</b> You should not need to touch anything below here.</font>"
-    )
-    , FLY_DURATION(
-        "<b>Fly Duration:</b>",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "800"
-    )
-    , MOVE_DURATION(
-        "<b>Move to Beartic Duration:</b>",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "300"
-    )
-    , MASH_TO_TRADE_DELAY(
-        "<b>Mash to Trade Delay:</b><br>Time to perform the trade.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "30 * TICKS_PER_SECOND"
-    )
-{
-    PA_ADD_OPTION(START_LOCATION);
-    PA_ADD_OPTION(TOUCH_DATE_INTERVAL);
-
-    PA_ADD_OPTION(START_TO_RUN_DELAY);
-    PA_ADD_STATIC(m_advanced_options);
-    PA_ADD_OPTION(FLY_DURATION);
-    PA_ADD_OPTION(MOVE_DURATION);
-    PA_ADD_OPTION(MASH_TO_TRADE_DELAY);
-}
-
-void ShinyHuntUnattendedIoATrade::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    if (START_LOCATION.start_in_grip_menu()){
-        grip_menu_connect_go_home(context);
-        resume_game_back_out(env.console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST, 500);
-    }else{
-        pbf_press_button(context, BUTTON_B, 5, 5);
-    }
-
-    for (uint32_t c = 0; ; c++){
-        env.log("Starting Trade: " + tostr_u_commas(c + 1));
-
-        pbf_press_button(context, BUTTON_A, 10, 100);
-        pbf_press_button(context, BUTTON_A, 10, 60);
-        pbf_press_button(context, BUTTON_A, 10, 100);
-        pbf_press_button(context, BUTTON_A, 10, 50);
-        pbf_press_button(context, BUTTON_A, 10, GameSettings::instance().POKEMON_TO_BOX_DELAY);
-        pbf_press_dpad(context, DPAD_LEFT, 10, 10);
-        pbf_mash_button(context, BUTTON_A, MASH_TO_TRADE_DELAY);
-
-        if (true){
-            //  Enter box system.
-            pbf_press_button(context, BUTTON_X, 10, GameSettings::instance().OVERWORLD_TO_MENU_DELAY);
-            pbf_press_dpad(context, DPAD_RIGHT, 10, 10);
-            pbf_press_button(context, BUTTON_A, 10, GameSettings::instance().MENU_TO_POKEMON_DELAY);
-
-            //  Move item from 2nd party member to 1st.
-            pbf_press_button(context, BUTTON_X, 10, 50);
-            pbf_press_dpad(context, DPAD_DOWN, 10, 50);
-            pbf_press_button(context, BUTTON_A, 10, 50);
-            pbf_press_dpad(context, DPAD_UP, 10, 50);
-            pbf_press_button(context, BUTTON_A, 10, 50);
-
-            //  Back out to menu.
-            //  Prepend each B press by a DOWN press so that the B gets
-            //  swallowed while in the summary.
-            IoA_backout(context, GameSettings::instance().POKEMON_TO_MENU_DELAY);
-
-            //  Enter map.
-            pbf_press_dpad(context, DPAD_LEFT, 10, 0);
-            pbf_move_left_joystick(context, 128, 255, 10, 0);
-        }else{
-            pbf_press_dpad(context, DPAD_DOWN, 10, 50);
-        }
-        pbf_press_button(context, BUTTON_A, 10, 350);
-
-        //  Fly to Route 10.
-        pbf_press_button(context, BUTTON_L, 10, 100);
-        pbf_press_button(context, BUTTON_L, 10, 100);
-        pbf_press_dpad(context, DPAD_RIGHT, 15, 10);
-        pbf_press_dpad(context, DPAD_DOWN, 30, 10);
-        pbf_mash_button(context, BUTTON_A, FLY_DURATION);
-
-        //  Move to Beartic.
-        pbf_move_left_joystick(context, 240, 0, MOVE_DURATION, 0);
-
-        pbf_wait(context, START_TO_RUN_DELAY);
-
-        //  Run away.
-        run_away_with_lights(context);
-
-        //  Enter Pokemon menu if shiny.
-        enter_summary(context, false);
-
-        //  Conditional close game.
-        close_game_if_overworld(
-            context,
-            TOUCH_DATE_INTERVAL.ok_to_touch_now(),
-            0
-        );
-
-        start_game_from_home_with_inference(env.console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST, 0, 0, false);
-    }
-
-//    pbf_press_button(context, BUTTON_HOME, 10, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE);
-}
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntUnattended-IoATrade.h b/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntUnattended-IoATrade.h
deleted file mode 100644
index 6cd3b3a3c1..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntUnattended-IoATrade.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*  ShinyHuntUnattended-IoATrade
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_ShinyHuntUnattendedIoATrade_H
-#define PokemonAutomation_PokemonSwSh_ShinyHuntUnattendedIoATrade_H
-
-#include "Common/Cpp/Options/StaticTextOption.h"
-#include "Common/Cpp/Options/TimeExpressionOption.h"
-#include "NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-#include "PokemonSwSh/Options/PokemonSwSh_DateToucher.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-class ShinyHuntUnattendedIoATrade_Descriptor : public SingleSwitchProgramDescriptor{
-public:
-    ShinyHuntUnattendedIoATrade_Descriptor();
-};
-
-
-
-class ShinyHuntUnattendedIoATrade : public SingleSwitchProgramInstance{
-public:
-    ShinyHuntUnattendedIoATrade();
-
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-    StartInGripOrGameOption START_LOCATION;
-    TouchDateIntervalOption TOUCH_DATE_INTERVAL;
-
-    TimeExpressionOption<uint16_t> START_TO_RUN_DELAY;
-    SectionDividerOption m_advanced_options;
-    TimeExpressionOption<uint16_t> FLY_DURATION;
-    TimeExpressionOption<uint16_t> MOVE_DURATION;
-    TimeExpressionOption<uint16_t> MASH_TO_TRADE_DELAY;
-};
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntUnattended-Regi.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntUnattended-Regi.cpp
deleted file mode 100644
index cdc1a32737..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntUnattended-Regi.cpp
+++ /dev/null
@@ -1,130 +0,0 @@
-/*  ShinyHuntUnattended-Regi
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "NintendoSwitch/NintendoSwitch_Settings.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonSwSh/PokemonSwSh_Settings.h"
-#include "PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.h"
-#include "PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
-#include "PokemonSwSh_ShinyHuntTools.h"
-#include "PokemonSwSh_ShinyHunt-Regi.h"
-#include "PokemonSwSh_ShinyHuntUnattended-Regi.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-    using namespace Pokemon;
-
-
-ShinyHuntUnattendedRegi_Descriptor::ShinyHuntUnattendedRegi_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonSwSh:ShinyHuntUnattendedRegi",
-        STRING_POKEMON + " SwSh", "Shiny Hunt Unattended - Regi",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonSwSh/ShinyHuntUnattended-Regi.md",
-        "Hunt for shiny Regis. Stop when a shiny is found.",
-        FeedbackType::NONE,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-
-
-
-ShinyHuntUnattendedRegi::ShinyHuntUnattendedRegi()
-    : START_TO_RUN_DELAY(
-        "<b>Start to Run Delay:</b><br>This needs to be carefully calibrated.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "1990"
-    )
-    , m_advanced_options(
-        "<font size=4><b>Advanced Options:</b> You should not need to touch anything below here.</font>"
-    )
-    , CORRECTION_INTERVAL(
-        "<b>Correction Interval:</b><br>Periodically leave the building to fix broken lights. Zero disables these corrections.",
-        LockWhileRunning::LOCKED,
-        20
-    )
-    , TRANSITION_DELAY(
-        "<b>Transition Delay:</b><br>Time to enter/exit the building.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "5 * TICKS_PER_SECOND"
-    )
-{
-    PA_ADD_OPTION(START_LOCATION);
-    PA_ADD_OPTION(TOUCH_DATE_INTERVAL);
-
-    PA_ADD_OPTION(START_TO_RUN_DELAY);
-    PA_ADD_OPTION(REGI_NAME);
-    PA_ADD_STATIC(m_advanced_options);
-    PA_ADD_OPTION(CORRECTION_INTERVAL);
-    PA_ADD_OPTION(TRANSITION_DELAY);
-}
-
-
-
-void ShinyHuntUnattendedRegi::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    if (START_LOCATION.start_in_grip_menu()){
-        grip_menu_connect_go_home(context);
-        resume_game_back_out(env.console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST, 200);
-    }else{
-        pbf_press_button(context, BUTTON_B, 5, 5);
-    }
-
-    uint16_t correct_count = 0;
-    for (uint32_t c = 0; ; c++){
-        //  Auto-correction.
-        bool correct = CORRECTION_INTERVAL > 0 && correct_count >= CORRECTION_INTERVAL;
-        move_to_corner(env.console, context, correct, TRANSITION_DELAY);
-        if (correct){
-            correct_count = 0;
-        }
-
-        //  Touch the date.
-        if (TOUCH_DATE_INTERVAL.ok_to_touch_now()){
-            env.log("Touching date to prevent rollover.");
-            pbf_press_button(context, BUTTON_HOME, 10, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE);
-            touch_date_from_home(context, ConsoleSettings::instance().SETTINGS_TO_HOME_DELAY);
-            resume_game_no_interact(env.console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST);
-        }
-
-
-        //  Do the light puzzle.
-        run_regi_light_puzzle(env.console, context, REGI_NAME, c);
-
-        pbf_press_button(context, BUTTON_A, 10, 100);
-        pbf_press_button(context, BUTTON_A, 10, 100);
-        if (START_TO_RUN_DELAY >= 500){
-            //  Extra A press to fix A parity if the lights were messed up.
-            pbf_press_button(context, BUTTON_A, 10, 500);
-            pbf_press_button(context, BUTTON_A, 10, START_TO_RUN_DELAY - 500);
-        }else{
-            pbf_press_button(context, BUTTON_A, 10, START_TO_RUN_DELAY);
-        }
-
-        //  Run away if not shiny.
-        run_away_with_lights(context);
-
-        //  Enter Pokemon menu if shiny.
-        enter_summary(context, true);
-
-        correct_count++;
-    }
-
-//    pbf_press_button(context, BUTTON_HOME, 10, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE);
-//    end_program_callback(env.console);
-//    end_program_loop(env.console);
-}
-
-
-}
-}
-}
-
-
-
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntUnattended-Regi.h b/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntUnattended-Regi.h
deleted file mode 100644
index 248e2d7297..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntUnattended-Regi.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*  ShinyHuntUnattended-Regi
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_ShinyHuntUnattendedRegi_H
-#define PokemonAutomation_PokemonSwSh_ShinyHuntUnattendedRegi_H
-
-#include "Common/Cpp/Options/StaticTextOption.h"
-#include "Common/Cpp/Options/SimpleIntegerOption.h"
-#include "Common/Cpp/Options/TimeExpressionOption.h"
-#include "NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-#include "PokemonSwSh/Options/PokemonSwSh_DateToucher.h"
-#include "PokemonSwSh/Options/PokemonSwSh_RegiSelector.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-class ShinyHuntUnattendedRegi_Descriptor : public SingleSwitchProgramDescriptor{
-public:
-    ShinyHuntUnattendedRegi_Descriptor();
-};
-
-
-
-class ShinyHuntUnattendedRegi : public SingleSwitchProgramInstance{
-public:
-    ShinyHuntUnattendedRegi();
-
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-    StartInGripOrGameOption START_LOCATION;
-    TouchDateIntervalOption TOUCH_DATE_INTERVAL;
-
-    TimeExpressionOption<uint16_t> START_TO_RUN_DELAY;
-    RegiSelectorOption REGI_NAME;
-    SectionDividerOption m_advanced_options;
-    SimpleIntegerOption<uint16_t> CORRECTION_INTERVAL;
-    TimeExpressionOption<uint16_t> TRANSITION_DELAY;
-};
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntUnattended-Regigigas2.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntUnattended-Regigigas2.cpp
deleted file mode 100644
index 3b8851cdce..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntUnattended-Regigigas2.cpp
+++ /dev/null
@@ -1,127 +0,0 @@
-/*  ShinyHuntUnattended-Regigigas2
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Cpp/PrettyPrint.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Device.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "NintendoSwitch/NintendoSwitch_Settings.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonSwSh/PokemonSwSh_Settings.h"
-#include "PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
-#include "PokemonSwSh_ShinyHuntTools.h"
-#include "PokemonSwSh_ShinyHuntUnattended-Regigigas2.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-    using namespace Pokemon;
-
-
-ShinyHuntUnattendedRegigigas2_Descriptor::ShinyHuntUnattendedRegigigas2_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonSwSh:ShinyHuntUnattendedRegigigas2",
-        STRING_POKEMON + " SwSh", "Shiny Hunt Unattended - Regigigas2",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonSwSh/ShinyHuntUnattended-Regigigas2.md",
-        "A new version of the Regigigas program that is faster.",
-        FeedbackType::NONE,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-
-
-
-ShinyHuntUnattendedRegigigas2::ShinyHuntUnattendedRegigigas2()
-    : REVERSAL_PP(
-        "<b>Reversal PP:</b><br>The amount of Reversal PP you are saved with.",
-        LockWhileRunning::LOCKED,
-        24
-    )
-    , START_TO_ATTACK_DELAY(
-        "<b>Start to Attack Delay:</b><br>This needs to be carefully calibrated.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "3750"
-    )
-    , m_advanced_options(
-        "<font size=4><b>Advanced Options:</b> You should not need to touch anything below here.</font>"
-    )
-    , ATTACK_TO_CATCH_DELAY(
-        "<b>Attack to Catch Delay:</b><br>Increase this if you seem to be catching Regigigas very often.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "9 * TICKS_PER_SECOND"
-    )
-    , CATCH_TO_OVERWORLD_DELAY(
-        "<b>Catch to Overworld Delay:</b>",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "8 * TICKS_PER_SECOND"
-    )
-{
-    PA_ADD_OPTION(START_LOCATION);
-    PA_ADD_OPTION(TOUCH_DATE_INTERVAL);
-
-    PA_ADD_OPTION(REVERSAL_PP);
-    PA_ADD_OPTION(START_TO_ATTACK_DELAY);
-    PA_ADD_STATIC(m_advanced_options);
-    PA_ADD_OPTION(ATTACK_TO_CATCH_DELAY);
-    PA_ADD_OPTION(CATCH_TO_OVERWORLD_DELAY);
-}
-
-void ShinyHuntUnattendedRegigigas2::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    if (START_LOCATION.start_in_grip_menu()){
-        grip_menu_connect_go_home(context);
-        resume_game_back_out(env.console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST, 500);
-    }else{
-        pbf_press_button(context, BUTTON_B, 5, 5);
-    }
-
-    uint32_t encounter = 0;
-    while (true){
-        for (uint8_t pp = REVERSAL_PP; pp > 0; pp--){
-            env.log("Starting Regigigas Encounter: " + tostr_u_commas(++encounter));
-
-            pbf_press_button(context, BUTTON_A, 10, 3 * TICKS_PER_SECOND);
-            pbf_press_button(context, BUTTON_A, 10, TICKS_PER_SECOND);
-            pbf_press_button(context, BUTTON_A, 10, START_TO_ATTACK_DELAY);
-
-            set_leds(context, true);
-            pbf_press_button(context, BUTTON_A, 10, 2 * TICKS_PER_SECOND);
-            set_leds(context, false);
-
-            //  Enter Pokemon menu if shiny.
-            pbf_press_dpad(context, DPAD_DOWN, 10, 0);
-            pbf_mash_button(context, BUTTON_A, 2 * TICKS_PER_SECOND);
-
-            pbf_press_dpad(context, DPAD_DOWN, 10, 0);
-            pbf_press_button(context, BUTTON_A, 10, TICKS_PER_SECOND);
-            pbf_press_dpad(context, DPAD_DOWN, 10, 0);
-            pbf_press_button(context, BUTTON_A, 10, TICKS_PER_SECOND);
-
-            pbf_wait(context, ATTACK_TO_CATCH_DELAY);
-            pbf_press_dpad(context, DPAD_DOWN, 10, 0);
-            pbf_press_button(context, BUTTON_A, 10, CATCH_TO_OVERWORLD_DELAY);
-        }
-
-        //  Conditional close game.
-        close_game_if_overworld(
-            context,
-            TOUCH_DATE_INTERVAL.ok_to_touch_now(),
-            0
-        );
-
-        start_game_from_home_with_inference(env.console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST, 0, 0, false);
-    }
-
-    pbf_press_button(context, BUTTON_HOME, 10, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE);
-}
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntUnattended-Regigigas2.h b/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntUnattended-Regigigas2.h
deleted file mode 100644
index 4b5ffe107c..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntUnattended-Regigigas2.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*  ShinyHuntUnattended-Regigigas2
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_ShinyHuntUnattendedRegigigas2_H
-#define PokemonAutomation_PokemonSwSh_ShinyHuntUnattendedRegigigas2_H
-
-#include "Common/Cpp/Options/StaticTextOption.h"
-#include "Common/Cpp/Options/SimpleIntegerOption.h"
-#include "Common/Cpp/Options/TimeExpressionOption.h"
-#include "NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-#include "PokemonSwSh/Options/PokemonSwSh_DateToucher.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-class ShinyHuntUnattendedRegigigas2_Descriptor : public SingleSwitchProgramDescriptor{
-public:
-    ShinyHuntUnattendedRegigigas2_Descriptor();
-};
-
-
-
-class ShinyHuntUnattendedRegigigas2 : public SingleSwitchProgramInstance{
-public:
-    ShinyHuntUnattendedRegigigas2();
-
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-    StartInGripOrGameOption START_LOCATION;
-    TouchDateIntervalOption TOUCH_DATE_INTERVAL;
-
-    SimpleIntegerOption<uint8_t> REVERSAL_PP;
-    TimeExpressionOption<uint16_t> START_TO_ATTACK_DELAY;
-    SectionDividerOption m_advanced_options;
-    TimeExpressionOption<uint16_t> ATTACK_TO_CATCH_DELAY;
-    TimeExpressionOption<uint16_t> CATCH_TO_OVERWORLD_DELAY;
-};
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntUnattended-StrongSpawn.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntUnattended-StrongSpawn.cpp
deleted file mode 100644
index 0870f1dffa..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntUnattended-StrongSpawn.cpp
+++ /dev/null
@@ -1,120 +0,0 @@
-/*  ShinyHuntUnattended-StrongSpawn
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Cpp/PrettyPrint.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Device.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "NintendoSwitch/NintendoSwitch_Settings.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonSwSh/PokemonSwSh_Settings.h"
-#include "PokemonSwSh_ShinyHuntTools.h"
-#include "PokemonSwSh_ShinyHuntUnattended-StrongSpawn.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-    using namespace Pokemon;
-
-
-ShinyHuntUnattendedStrongSpawn_Descriptor::ShinyHuntUnattendedStrongSpawn_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonSwSh:ShinyHuntUnattendedStrongSpawn",
-        STRING_POKEMON + " SwSh", "Shiny Hunt Unattended - Strong Spawn",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonSwSh/ShinyHuntUnattended-StrongSpawn.md",
-        "Hunt for shiny strong spawns. Stop when a shiny is found.",
-        FeedbackType::NONE,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-
-
-
-ShinyHuntUnattendedStrongSpawn::ShinyHuntUnattendedStrongSpawn()
-    : ENTER_GAME_TO_RUN_DELAY(
-        "<b>Enter Game to Run Delay:</b><br>This needs to be carefully calibrated.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "2280"
-    )
-    , START_GAME_WAIT_DELAY(
-        "<b>Start Game Wait Delay:</b><br>Decrease this if your game starts quickly.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "20 * TICKS_PER_SECOND"
-    )
-{
-    PA_ADD_OPTION(START_LOCATION);
-    PA_ADD_OPTION(TIME_ROLLBACK_HOURS);
-
-    PA_ADD_OPTION(ENTER_GAME_TO_RUN_DELAY);
-    PA_ADD_OPTION(START_GAME_WAIT_DELAY);
-}
-
-
-
-void ShinyHuntUnattendedStrongSpawn::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    if (START_LOCATION.start_in_grip_menu()){
-        grip_menu_connect_go_home(context);
-    }else{
-        pbf_press_button(context, BUTTON_B, 5, 5);
-        pbf_press_button(context, BUTTON_HOME, 10, GameSettings::instance().GAME_TO_HOME_DELAY_FAST);
-    }
-
-    const uint32_t PERIOD = (uint32_t)TIME_ROLLBACK_HOURS * 3600 * TICKS_PER_SECOND;
-    uint32_t last_touch = system_clock(context);
-    for (uint32_t c = 0; ; c++){
-
-        //  If the update menu isn't there, these will get swallowed by the opening
-        //  animation for the select user menu.
-        if (ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST){
-            pbf_press_button(context, BUTTON_A, 5, 35); //  Choose game
-            pbf_press_dpad(context, DPAD_UP, 5, 0);     //  Skip the update window.
-        }
-
-        pbf_press_button(context, BUTTON_A, 10, 180);   //  Enter select user menu.
-        pbf_press_button(context, BUTTON_A, 10, 10);    //  Enter game
-
-        //  Switch to mashing ZR instead of A to get into the game.
-        //  Mash your way into the game.
-        uint16_t duration = GameSettings::instance().START_GAME_MASH;
-        if (ConsoleSettings::instance().START_GAME_REQUIRES_INTERNET){
-            //  Need to wait a bit longer for the internet check.
-            duration += ConsoleSettings::instance().START_GAME_INTERNET_CHECK_DELAY;
-        }
-        pbf_mash_button(context, BUTTON_ZR, duration);
-
-        //  Wait for game to start.
-        pbf_wait(context, START_GAME_WAIT_DELAY);
-
-        //  Enter game.
-        env.log("Starting Encounter: " + tostr_u_commas(c + 1));
-        pbf_press_button(context, BUTTON_A, 10, ENTER_GAME_TO_RUN_DELAY);
-
-        //  Run away.
-        run_away_with_lights(context);
-
-        //  Enter Pokemon menu if shiny.
-        enter_summary(context, false);
-
-        //  Touch the date and conditional close game.
-//        if (true){
-        if (TIME_ROLLBACK_HOURS > 0 && system_clock(context) - last_touch >= PERIOD){
-            last_touch += PERIOD;
-            close_game_if_overworld(context, false, TIME_ROLLBACK_HOURS);
-        }else{
-            close_game_if_overworld(context, false, 0);
-        }
-
-    }
-
-//    pbf_press_button(context, BUTTON_HOME, 10, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE);
-}
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntUnattended-StrongSpawn.h b/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntUnattended-StrongSpawn.h
deleted file mode 100644
index cb3c23bdef..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntUnattended-StrongSpawn.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*  ShinyHuntUnattended-StrongSpawn
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_ShinyHuntUnattendedStrongSpawn_H
-#define PokemonAutomation_PokemonSwSh_ShinyHuntUnattendedStrongSpawn_H
-
-#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
-#include "Common/Cpp/Options/SimpleIntegerOption.h"
-#include "Common/Cpp/Options/TimeExpressionOption.h"
-#include "NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-#include "PokemonSwSh/Options/PokemonSwSh_DateToucher.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-class ShinyHuntUnattendedStrongSpawn_Descriptor : public SingleSwitchProgramDescriptor{
-public:
-    ShinyHuntUnattendedStrongSpawn_Descriptor();
-};
-
-
-
-class ShinyHuntUnattendedStrongSpawn : public SingleSwitchProgramInstance{
-public:
-    ShinyHuntUnattendedStrongSpawn();
-
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-    StartInGripOrClosedOption START_LOCATION;
-    TimeRollbackHoursOption TIME_ROLLBACK_HOURS;
-
-    TimeExpressionOption<uint16_t> ENTER_GAME_TO_RUN_DELAY;
-    TimeExpressionOption<uint16_t> START_GAME_WAIT_DELAY;
-};
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntUnattended-SwordsOfJustice.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntUnattended-SwordsOfJustice.cpp
deleted file mode 100644
index a6e6e0dff4..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntUnattended-SwordsOfJustice.cpp
+++ /dev/null
@@ -1,115 +0,0 @@
-/*  ShinyHuntUnattended-SwordsOfJustice
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Cpp/PrettyPrint.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Device.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "NintendoSwitch/NintendoSwitch_Settings.h"
-#include "Pokemon/Pokemon_Strings.h"
-#include "PokemonSwSh/PokemonSwSh_Settings.h"
-#include "PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.h"
-#include "PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
-#include "PokemonSwSh_ShinyHuntTools.h"
-#include "PokemonSwSh_ShinyHuntUnattended-SwordsOfJustice.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-    using namespace Pokemon;
-
-
-ShinyHuntUnattendedSwordsOfJustice_Descriptor::ShinyHuntUnattendedSwordsOfJustice_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonSwSh:ShinyHuntUnattendedSwordsOfJustice",
-        STRING_POKEMON + " SwSh", "Shiny Hunt Unattended - Swords Of Justice",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonSwSh/ShinyHuntUnattended-SwordsOfJustice.md",
-        "Hunt for shiny SOJs. Stop when a shiny is found.",
-        FeedbackType::NONE,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-
-
-ShinyHuntUnattendedSwordsOfJustice::ShinyHuntUnattendedSwordsOfJustice()
-    : EXIT_CAMP_TO_RUN_DELAY(
-        "<b>Exit Camp to Run Delay:</b><br>This needs to be carefully calibrated.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "1890"
-    )
-    , AIRPLANE_MODE(
-        "<b>Airplane Mode:</b><br>Enable if airplane mode is on.",
-        LockWhileRunning::LOCKED,
-        false
-    )
-    , m_advanced_options(
-        "<font size=4><b>Advanced Options:</b> You should not need to touch anything below here.</font>"
-    )
-    , ENTER_CAMP_DELAY(
-        "<b>Enter Camp Delay:</b>",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "8 * TICKS_PER_SECOND"
-    )
-{
-    PA_ADD_OPTION(START_LOCATION);
-    PA_ADD_OPTION(TIME_ROLLBACK_HOURS);
-
-    PA_ADD_OPTION(EXIT_CAMP_TO_RUN_DELAY);
-    PA_ADD_OPTION(AIRPLANE_MODE);
-    PA_ADD_STATIC(m_advanced_options);
-    PA_ADD_OPTION(ENTER_CAMP_DELAY);
-}
-
-
-
-void ShinyHuntUnattendedSwordsOfJustice::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    if (START_LOCATION.start_in_grip_menu()){
-        grip_menu_connect_go_home(context);
-        resume_game_no_interact(env.console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST);
-    }else{
-        pbf_press_button(context, BUTTON_B, 5, 5);
-    }
-
-    const uint32_t PERIOD = (uint32_t)TIME_ROLLBACK_HOURS * 3600 * TICKS_PER_SECOND;
-    uint32_t last_touch = system_clock(context);
-    for (uint32_t c = 0; ; c++){
-        //  Touch the date.
-        if (TIME_ROLLBACK_HOURS > 0 && system_clock(context) - last_touch >= PERIOD){
-            pbf_press_button(context, BUTTON_HOME, 10, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE);
-            rollback_hours_from_home(context, TIME_ROLLBACK_HOURS, ConsoleSettings::instance().SETTINGS_TO_HOME_DELAY);
-            resume_game_no_interact(env.console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST);
-            last_touch += PERIOD;
-        }
-
-        //  Trigger encounter.
-        pbf_press_button(context, BUTTON_X, 10, GameSettings::instance().OVERWORLD_TO_MENU_DELAY);
-        pbf_press_button(context, BUTTON_A, 10, ENTER_CAMP_DELAY);
-        if (AIRPLANE_MODE){
-            pbf_press_button(context, BUTTON_A, 10, 100);
-            pbf_press_button(context, BUTTON_A, 10, 100);
-        }
-        pbf_press_button(context, BUTTON_X, 10, 50);
-        pbf_press_dpad(context, DPAD_LEFT, 10, 10);
-        env.log("Starting Encounter: " + tostr_u_commas(c + 1));
-        pbf_press_button(context, BUTTON_A, 10, EXIT_CAMP_TO_RUN_DELAY);
-
-        //  Run away if not shiny.
-        run_away_with_lights(context);
-
-        //  Enter Pokemon menu if shiny.
-        enter_summary(context, false);
-    }
-
-//    pbf_press_button(context, BUTTON_HOME, 10, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE);
-}
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntUnattended-SwordsOfJustice.h b/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntUnattended-SwordsOfJustice.h
deleted file mode 100644
index 3ea7a828bb..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntUnattended-SwordsOfJustice.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*  ShinyHuntUnattended-SwordsOfJustice
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_ShinyHuntUnattendedSwordsOfJustice_H
-#define PokemonAutomation_PokemonSwSh_ShinyHuntUnattendedSwordsOfJustice_H
-
-#include "Common/Cpp/Options/StaticTextOption.h"
-#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
-#include "Common/Cpp/Options/SimpleIntegerOption.h"
-#include "Common/Cpp/Options/TimeExpressionOption.h"
-#include "NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-#include "PokemonSwSh/Options/PokemonSwSh_DateToucher.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-class ShinyHuntUnattendedSwordsOfJustice_Descriptor : public SingleSwitchProgramDescriptor{
-public:
-    ShinyHuntUnattendedSwordsOfJustice_Descriptor();
-};
-
-
-
-class ShinyHuntUnattendedSwordsOfJustice : public SingleSwitchProgramInstance{
-public:
-    ShinyHuntUnattendedSwordsOfJustice();
-
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-    StartInGripOrGameOption START_LOCATION;
-    TimeRollbackHoursOption TIME_ROLLBACK_HOURS;
-
-    TimeExpressionOption<uint16_t> EXIT_CAMP_TO_RUN_DELAY;
-    BooleanCheckBoxOption AIRPLANE_MODE;
-    SectionDividerOption m_advanced_options;
-    TimeExpressionOption<uint16_t> ENTER_CAMP_DELAY;
-};
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/TestPrograms/PokemonSwSh_ShinyEncounterTester.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/TestPrograms/PokemonSwSh_ShinyEncounterTester.cpp
deleted file mode 100644
index 6d5d601675..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/TestPrograms/PokemonSwSh_ShinyEncounterTester.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-/*  Shiny Encounter Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Cpp/PrettyPrint.h"
-#include "ClientSource/Connection/BotBase.h"
-#include "PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_ShinyEncounterDetector.h"
-#include "PokemonSwSh_ShinyEncounterTester.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-ShinyEncounterTester_Descriptor::ShinyEncounterTester_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "PokemonSwSh:ShinyEncounterTester",
-        STRING_POKEMON + " SwSh", "Shiny Encounter Tester",
-        "",
-        "Test the shiny encounter detector. Start this program just before an encounter.",
-        FeedbackType::REQUIRED, AllowCommandsWhenRunning::ENABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-
-
-
-ShinyEncounterTester::ShinyEncounterTester()
-    : ENCOUNTER_TYPE(
-        "<b>Encounter Type:</b>",
-        {
-            {EncounterType::Wild, "wild", "Wild Encounter"},
-            {EncounterType::Raid, "raid", "Raid Den"},
-        },
-        LockWhileRunning::LOCKED,
-        EncounterType::Wild
-    )
-{
-    PA_ADD_OPTION(ENCOUNTER_TYPE);
-}
-
-
-void ShinyEncounterTester::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
-    ShinyDetectionResult result = detect_shiny_battle(
-        env.console, context,
-        ENCOUNTER_TYPE == EncounterType::Wild ? SHINY_BATTLE_REGULAR : SHINY_BATTLE_RAID,
-        std::chrono::seconds(30)
-    );
-    result.get_best_screenshot().save(now_to_filestring() + ".png");
-}
-
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/TestPrograms/PokemonSwSh_ShinyEncounterTester.h b/SerialPrograms/Source/PokemonSwSh/Programs/TestPrograms/PokemonSwSh_ShinyEncounterTester.h
deleted file mode 100644
index 24cb2724ca..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Programs/TestPrograms/PokemonSwSh_ShinyEncounterTester.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*  Shiny Encounter Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Cpp/Options/EnumDropdownOption.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-
-class ShinyEncounterTester_Descriptor : public SingleSwitchProgramDescriptor{
-public:
-    ShinyEncounterTester_Descriptor();
-};
-
-
-
-class ShinyEncounterTester : public SingleSwitchProgramInstance{
-public:
-    ShinyEncounterTester();
-
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-    enum class EncounterType{
-        Wild,
-        Raid,
-    };
-    EnumDropdownOption<EncounterType> ENCOUNTER_TYPE;
-};
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSwSh/Resources/PokemonSwSh_NameDatabase.cpp b/SerialPrograms/Source/PokemonSwSh/Resources/PokemonSwSh_NameDatabase.cpp
deleted file mode 100644
index e9ef6a0f1a..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Resources/PokemonSwSh_NameDatabase.cpp
+++ /dev/null
@@ -1,57 +0,0 @@
-/*  Name Database
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/Logging/Logger.h"
-#include "Pokemon/Resources/Pokemon_PokemonNames.h"
-#include "PokemonSwSh_PokemonSprites.h"
-#include "PokemonSwSh_NameDatabase.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-using namespace Pokemon;
-
-
-StringSelectDatabase make_name_database(const std::vector<std::string>& slugs){
-    const SpriteDatabase& sprites = ALL_POKEMON_SPRITES();
-
-    StringSelectDatabase database;
-    for (const std::string& slug : slugs){
-        const PokemonNames& name = get_pokemon_name(slug);
-        const SpriteDatabase::Sprite* sprite = sprites.get_nothrow(slug);
-        if (sprite){
-            database.add_entry(StringSelectEntry(
-                slug,
-                name.display_name(),
-                sprite->icon
-            ));
-        }else{
-            global_logger_tagged().log("No sprite for: " + slug);
-            database.add_entry(StringSelectEntry(
-                slug,
-                name.display_name()
-            ));
-        }
-    }
-    return database;
-}
-StringSelectDatabase make_name_database(const char* json_file_slugs){
-    return make_name_database(load_pokemon_slug_json_list(json_file_slugs));
-}
-
-
-const StringSelectDatabase& COMBINED_DEX_NAMES(){
-    static const StringSelectDatabase database = make_name_database("PokemonSwSh/Pokedex-Combined.json");
-    return database;
-}
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSwSh/Resources/PokemonSwSh_NameDatabase.h b/SerialPrograms/Source/PokemonSwSh/Resources/PokemonSwSh_NameDatabase.h
deleted file mode 100644
index 8e9cd94375..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Resources/PokemonSwSh_NameDatabase.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*  Name Database
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_NameDatabase_H
-#define PokemonAutomation_PokemonSwSh_NameDatabase_H
-
-#include "CommonFramework/Options/StringSelectOption.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-StringSelectDatabase make_name_database(const std::vector<std::string>& slugs);
-StringSelectDatabase make_name_database(const char* json_file_slugs);
-
-const StringSelectDatabase& COMBINED_DEX_NAMES();
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Resources/PokemonSwSh_PokeballSprites.h b/SerialPrograms/Source/PokemonSwSh/Resources/PokemonSwSh_PokeballSprites.h
deleted file mode 100644
index ccf5777d81..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Resources/PokemonSwSh_PokeballSprites.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*  Pokemon Sword/Shield Pokeball Sprites
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_PokeballSprites_H
-#define PokemonAutomation_PokemonSwSh_PokeballSprites_H
-
-#include "CommonFramework/Resources/SpriteDatabase.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-const SpriteDatabase& ALL_POKEBALL_SPRITES();
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Resources/PokemonSwSh_PokemonSprites.cpp b/SerialPrograms/Source/PokemonSwSh/Resources/PokemonSwSh_PokemonSprites.cpp
deleted file mode 100644
index b6e981e3d8..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Resources/PokemonSwSh_PokemonSprites.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-/*  Pokemon Sword/Shield Pokemon Sprites
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Cpp/Exceptions.h"
-#include "Common/Cpp/Json/JsonValue.h"
-#include "Common/Cpp/Json/JsonArray.h"
-#include "Common/Cpp/Json/JsonObject.h"
-#include "CommonFramework/Globals.h"
-#include "CommonFramework/ImageMatch/ImageCropper.h"
-#include "PokemonSwSh_PokemonSprites.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-const SpriteDatabase& ALL_POKEMON_SPRITES(){
-    static const SpriteDatabase database("PokemonSwSh/PokemonSprites.png", "PokemonSwSh/PokemonSprites.json");
-    return database;
-}
-const SpriteDatabase& ALL_POKEMON_SILHOUETTES(){
-    static const SpriteDatabase database("PokemonSwSh/PokemonSilhouettes.png", "PokemonSwSh/PokemonSprites.json");
-    return database;
-}
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/PokemonSwSh/Resources/PokemonSwSh_PokemonSprites.h b/SerialPrograms/Source/PokemonSwSh/Resources/PokemonSwSh_PokemonSprites.h
deleted file mode 100644
index 17762edf90..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Resources/PokemonSwSh_PokemonSprites.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*  Pokemon Sword/Shield Pokemon Sprites
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_PokemonSprites_H
-#define PokemonAutomation_PokemonSwSh_PokemonSprites_H
-
-#include "CommonFramework/Resources/SpriteDatabase.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-const SpriteDatabase& ALL_POKEMON_SPRITES();
-const SpriteDatabase& ALL_POKEMON_SILHOUETTES();
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Resources/PokemonSwSh_TypeSprites.h b/SerialPrograms/Source/PokemonSwSh/Resources/PokemonSwSh_TypeSprites.h
deleted file mode 100644
index c1e5377d0f..0000000000
--- a/SerialPrograms/Source/PokemonSwSh/Resources/PokemonSwSh_TypeSprites.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*  Pokemon Sword/Shield Type Sprites
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_TypeSprites_H
-#define PokemonAutomation_PokemonSwSh_TypeSprites_H
-
-#include <memory>
-#include "CommonFramework/ImageTools/FloatPixel.h"
-#include "CommonFramework/ImageMatch/ExactImageMatcher.h"
-#include "PokemonSwSh_TypeMatchup.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-
-class TypeSprite{
-public:
-    const std::string& slug() const{ return m_slug; }
-//    const ImageRGB32& sprite() const{ return m_sprite; }
-
-    const ImageMatch::WeightedExactImageMatcher& matcher() const{ return *m_matcher; }
-
-public:
-//    friend struct TypeSpriteDatabase;
-    TypeSprite(const std::string& slug);
-
-private:
-    std::string m_slug;
-
-    std::unique_ptr<ImageMatch::WeightedExactImageMatcher> m_matcher;
-};
-
-
-const TypeSprite& get_type_sprite(PokemonType type);
-const std::map<PokemonType, TypeSprite>& all_type_sprites();
-
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/StaticRegistration.h b/SerialPrograms/Source/StaticRegistration.h
new file mode 100644
index 0000000000..978c4cc7ed
--- /dev/null
+++ b/SerialPrograms/Source/StaticRegistration.h
@@ -0,0 +1,19 @@
+/*  Static Registration
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_StaticRegistration_H
+#define PokemonAutomation_StaticRegistration_H
+
+namespace PokemonAutomation{
+
+
+
+void register_all_statics();
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/StaticRegistrationQt.cpp b/SerialPrograms/Source/StaticRegistrationQt.cpp
new file mode 100644
index 0000000000..7416075c0c
--- /dev/null
+++ b/SerialPrograms/Source/StaticRegistrationQt.cpp
@@ -0,0 +1,163 @@
+/*  Static Registration
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonTools/Options/QtWidgets/ScreenWatchWidget.h"
+#include "Common/Qt/Options/BatchWidget.h"
+
+//  Basic Options
+#include "Common/Qt/Options/BooleanCheckBoxWidget.h"
+#include "Common/Qt/Options/BoxFloatWidget.h"
+#include "Common/Qt/Options/ButtonWidget.h"
+#include "Common/Qt/Options/CheckboxDropdownWidget.h"
+#include "Common/Qt/Options/ColorWidget.h"
+#include "Common/Qt/Options/DateWidget.h"
+//#include "Common/Qt/Options/ConfigWidget.h"
+#include "Common/Qt/Options/EditableTableWidget.h"
+#include "Common/Qt/Options/EnumDropdownWidget.h"
+#include "Common/Qt/Options/FixedCodeWidget.h"
+#include "Common/Qt/Options/FloatingPointWidget.h"
+#include "Common/Qt/Options/GroupWidget.h"
+#include "Common/Qt/Options/IntegerRangeWidget.h"
+#include "Common/Qt/Options/MacAddressWidget.h"
+#include "Common/Qt/Options/PathWidget.h"
+#include "Common/Qt/Options/RandomCodeWidget.h"
+#include "Common/Qt/Options/SimpleIntegerWidget.h"
+#include "Common/Qt/Options/StaticTableWidget.h"
+#include "Common/Qt/Options/StaticTextWidget.h"
+#include "Common/Qt/Options/StringWidget.h"
+#include "Common/Qt/Options/TextEditWidget.h"
+#include "Common/Qt/Options/TimeDurationWidget.h"
+#include "CommonFramework/Options/QtWidget/LabelCellWidget.h"
+
+//  Common Framework
+#include "CommonFramework/Notifications/EventNotificationWidget.h"
+#include "CommonFramework/Panels/UI/PanelWidget.h"
+#include "CommonFramework/Panels/UI/OptionsPanelWidget.h"
+#include "CommonFramework/ResourceDownload/SettingsResourceDownloadWidget.h"
+
+// Resource Download
+#include "CommonTools/Options/QtWidgets/StringSelectWidget.h"
+
+//  Common Tools
+#include "CommonTools/Options/QtWidgets/ScreenWatchWidget.h"
+#include "CommonTools/Options/QtWidgets/LanguageOCRWidget.h"
+#include "ComputerPrograms/Framework/ComputerProgramWidget.h"
+
+//  Computer Programs
+#include "ControllerInput/Keyboard/KeyBindingWidget.h"
+
+//  Controllers
+//#include "Controllers/NullControllerWidget.h"
+#include "Controllers/ControllerSelectorWidget.h"
+#include "Controllers/PABotBase2/SerialPABotBase2_SelectorWidget.h"
+#include "GameConsole/UI/ConsoleSystemWidget.h"
+
+//  Consoles
+#include "GameConsole/UI/ConsolePanelWidget.h"
+#include "GameConsole/UI/ConsoleProgramWidget.h"
+#include "GameConsole/UI/MultiConsoleSystemWidget.h"
+#include "GameConsole/UI/MultiConsolePanelWidget.h"
+#include "GameConsole/UI/MultiConsoleProgramWidget.h"
+#include "NintendoSwitch/Controllers/SysbotBase/SysbotBase_SelectorWidget.h"
+
+//  Nintendo Switch
+#include "VideoGames/PokemonLA/Options/QtWidgets/PokemonLA_CustomPathTableWidget.h"
+//#include "NintendoSwitch/Framework/UI/NintendoSwitch_SingleSwitchProgramWidget.h"
+
+//  Pokemon LA
+#include "StaticRegistration.h"
+
+namespace PokemonAutomation{
+
+
+
+void register_all_statics(){
+    //  Basic Options
+    RegisterUiStateQtWidget<BatchWidget>();
+    RegisterUiStateQtWidget<BooleanCheckBoxCellWidget>();
+    RegisterUiStateQtWidget<BooleanCheckBoxOptionWidget>();
+    RegisterUiStateQtWidget<BooleanCheckBoxCellWidget>();
+    RegisterUiStateQtWidget<BooleanCheckBoxOptionWidget>();
+    RegisterUiStateQtWidget<BoxFloatWidget>();
+    RegisterUiStateQtWidget<ButtonCellWidget>();
+    RegisterUiStateQtWidget<ButtonOptionWidget>();
+    RegisterUiStateQtWidget<CheckboxDropdownCellWidget>();
+    RegisterUiStateQtWidget<ColorCellWidget>();
+    RegisterUiStateQtWidget<ColorOptionWidget>();
+    RegisterUiStateQtWidget<DateTimeCellWidget>();
+    RegisterUiStateQtWidget<DateTimeOptionWidget>();
+    RegisterUiStateQtWidget<EditableTableWidget>();
+    RegisterUiStateQtWidget<EnumDropdownCellWidget>();
+    RegisterUiStateQtWidget<EnumDropdownOptionWidget>();
+    RegisterUiStateQtWidget<FixedCodeWidget>();
+    RegisterUiStateQtWidget<FloatingPointCellWidget>();
+    RegisterUiStateQtWidget<FloatingPointOptionWidget>();
+    RegisterUiStateQtWidget<GroupWidget>();
+    RegisterUiStateQtWidget<IntegerRangeCellWidget<uint8_t>>();
+    RegisterUiStateQtWidget<MacAddressCellWidget>();
+    RegisterUiStateQtWidget<PathCellWidget>();
+    RegisterUiStateQtWidget<PathOptionWidget>();
+    RegisterUiStateQtWidget<RandomCodeWidget>();
+    RegisterUiStateQtWidget<SimpleIntegerCellWidget>();
+    RegisterUiStateQtWidget<SimpleIntegerOptionWidget>();
+    RegisterUiStateQtWidget<StaticTableWidget>();
+    RegisterUiStateQtWidget<StaticTextWidget>();
+    RegisterUiStateQtWidget<StringCellWidget>();
+    RegisterUiStateQtWidget<StringOptionWidget>();
+    RegisterUiStateQtWidget<TextEditWidget>();
+    RegisterUiStateQtWidget<TimeDurationCellWidget<std::chrono::milliseconds>>();
+    RegisterUiStateQtWidget<TimeDurationCellWidget<std::chrono::microseconds>>();
+    RegisterUiStateQtWidget<TimeDurationOptionWidget<std::chrono::milliseconds>>();
+    RegisterUiStateQtWidget<TimeDurationOptionWidget<std::chrono::microseconds>>();
+
+    //  Common Framework
+    RegisterUiStateQtWidget<LabelCellWidget>();
+    RegisterUiStateQtWidget<TestButtonWidget>();
+    RegisterUiStateQtWidget<PanelWidget>();
+    RegisterUiStateQtWidget<OptionsPanelWidget>();
+
+    // Resource Download
+    RegisterUiStateQtWidget<SettingsDownloadButtonWidget>();
+    RegisterUiStateQtWidget<SettingsDeleteButtonWidget>();
+    RegisterUiStateQtWidget<SettingsCancelButtonWidget>();
+    RegisterUiStateQtWidget<SettingsProgressBarWidget>();
+    RegisterUiStateQtWidget<SettingsDownloadErrorWidget>();
+
+    //  Common Tools
+    RegisterUiStateQtWidget<StringSelectCellWidget>();
+    RegisterUiStateQtWidget<StringSelectOptionWidget>();
+    RegisterUiStateQtWidget<ScreenWatchWidget>();
+    RegisterUiStateQtWidget<OCR::LanguageOCRCellWidget>();
+    RegisterUiStateQtWidget<OCR::LanguageOCROptionWidget>();
+
+    //  Computer Programs
+    RegisterUiStateQtWidget<ComputerProgramWidget>();
+
+    //  Controllers
+//    RegisterUiStateQtWidget<NullControllerWidget>();
+    RegisterUiStateQtWidget<ControllerSelectorWidget>();
+    RegisterUiStateQtWidget<SerialPABotBase::SerialPABotBase2_SelectorWidget>();
+    RegisterUiStateQtWidget<KeyboardHidBindingCellWidget>();
+
+    //  Consoles
+    RegisterUiStateQtWidget<GameConsole::ConsoleSystemWidget>();
+    RegisterUiStateQtWidget<GameConsole::ConsolePanelWidget>();
+    RegisterUiStateQtWidget<GameConsole::ConsoleProgramWidget>();
+    RegisterUiStateQtWidget<GameConsole::MultiConsoleSystemWidget>();
+    RegisterUiStateQtWidget<GameConsole::MultiConsolePanelWidget>();
+    RegisterUiStateQtWidget<GameConsole::MultiConsoleProgramWidget>();
+
+    //  Nintendo Switch
+    RegisterUiStateQtWidget<SysbotBase::TcpSysbotBase_SelectorWidget>();
+
+    //  Pokemon LA
+    RegisterUiStateQtWidget<NintendoSwitch::PokemonLA::CustomPathTableWidget>();
+}
+
+
+
+
+}
diff --git a/SerialPrograms/Source/Tests/CommandLineTests.cpp b/SerialPrograms/Source/Tests/CommandLineTests.cpp
index f621ff9bd7..bed7f8997e 100644
--- a/SerialPrograms/Source/Tests/CommandLineTests.cpp
+++ b/SerialPrograms/Source/Tests/CommandLineTests.cpp
@@ -1,288 +1,40 @@
 /*  Command Line Tests
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 
+#include <iostream>
+#include "CommonFramework/ErrorReports/CrashBacktrace.h"
+#include "CommonFramework/Logging/Logger.h"
+#include "ComputerPrograms/ComputerPrograms_UnitTestRunner.h"
+
 #include "CommandLineTests.h"
-#include "CommonFramework/GlobalSettingsPanel.h"
-#include "PokemonLA_Tests.h"
-#include "TestMap.h"
-#include <QDir>
-#include <QDirIterator>
-#include <QFileInfo>
 
-#include <iostream>
-#include <chrono>
-#include <thread>
-#include <map>
-#include <list>
-#include <functional>
 using std::cout;
-using std::cerr;
 using std::endl;
 
 namespace PokemonAutomation{
 
 
-// CommandLineTests/                    <- root test folder
-// - PokemonLA/                         <- test space to organize tests
-//   - BattleMenuDetector/              <- test object, name of the class/function/file to test
-//     - IngoBattleDayTime_True.png     <- test file
-
-namespace{
-
-void print_equals(){
-    cout << "===========================================" << endl;
-}
-
-#define RETURN_IF_NOT_ZERO(statement) \
-    do { \
-        int _ret = (statement); \
-        if (_ret != 0){ \
-            return _ret; \
-        } \
-    } while (0)
-
-#define RETURN_IF_TEST_FAILED(test_func, file_path, num_passed) \
-    do { \
-        int _ret = test_func(file_path); \
-        if (_ret > 0) {\
-            print_equals(); \
-            cout << "Test: " << (file_path) << " failed." << endl; \
-            return _ret; \
-        } else if (_ret == 0){ \
-            num_passed++; \
-        } \
-    } while (0)
-
-bool skip_ignored_path(const QString& file_path, const std::vector<QString>& ignore_list){
-    for(const auto& path_prefix : ignore_list){
-        if (file_path.startsWith(path_prefix)){
-            cout << "* Skip ignored path " << file_path.toStdString() << endl;
-            return true;
-        }
-    }
-    return false;
-}
-
-int run_test_obj_dir(TestFunction test_func, const QString& directory_path, size_t& num_passed, const std::vector<QString>& ignore_list){
-    QDirIterator file_iter(directory_path, QDir::Filter::Files, QDirIterator::IteratorFlag::Subdirectories);
-
-    bool first_test_file = true;
-    while (file_iter.hasNext()){
-        if (first_test_file == false){
-            cout << "-------------------------------------------" << endl;
-        }
-        first_test_file = false;
-
-        const QString next_file = file_iter.next();
-        
-        // If filename starts with _, its considered a "hidden" file so skip it.
-        const QFileInfo file_info(next_file);
-        if (file_info.fileName().startsWith('_')){
-            continue;
-        }
-        const std::string file_path = next_file.toStdString();
-
-        // Check ignore list to determine whether to skip the test
-        if (skip_ignored_path(next_file, ignore_list)){
-            continue;
-        }
-
-        // Call the function to do the actual test:
-        cout << file_path << endl;
-        RETURN_IF_TEST_FAILED(test_func, file_path, num_passed);
-    }
-
-    return 0;
-}
-
-// Run the tests inside a folder representing a "test object".
-// It is usually defined as one detector, e.g. CommandLineTests/PokemonLA/BattleMenuDetector/
-int run_test_obj(const std::string& test_space, const QFileInfo& obj_info, size_t& num_passed, const std::vector<QString>& ignore_list){
-    const std::string test_name = obj_info.fileName().toStdString();
-    if (test_name == "." || test_name == ".."){
-        return 0;
-    }
-
-    print_equals();
-    const TestFunction test_func = find_test_function(test_space, test_name);
-    if (test_func == nullptr){
-        // No corresponding test code, skip the folder.
-        return 0;
-    }
-
-    if (skip_ignored_path(obj_info.filePath(), ignore_list)){
-        return 0;
-    }
-
-    cout << "Testing " << test_name << ":" << endl;
-
-    // Recursively get test filenames, like:
-    // ./CommandLineTests/PokemonLA/BattleMenuDetector/IngoBattleMenuDayTime_True.png
-    return run_test_obj_dir(test_func, obj_info.filePath(), num_passed, ignore_list);
-}
-
-// Run the tests inside a folder representing a "test space".
-// It is usually defined as one pokemon game, e.g. CommandLineTests/PokemonLA/
-int run_test_space(const QFileInfo& space_info, size_t& num_passed, const std::vector<QString>& ignore_list){
-    QDir sub_dir(space_info.filePath());
-    if (!sub_dir.exists()){
-        cerr << "Error: cannot access " << space_info.filePath().toStdString() << endl;
+int run_command_line_tests(bool augment_color_distortions){
+    install_crash_backtrace_handlers();
+    //  Keep stdout line-buffered: when piped, stdio defaults to full
+    //  buffering, and the last few KB of test output - including the lines
+    //  right before a crash - would otherwise be lost in the buffer. An
+    //  explicit buffer size is required: with 0, MSVC's ucrt can end up with
+    //  a zero-size buffer, which corrupts the next stdout write.
+    setvbuf(stdout, nullptr, _IOLBF, 8192);
+    cout << "Running parallel unit tests..." << endl;
+    ComputerPrograms::CommandLineUnitTestRunner runner(global_logger_command_line());
+    if (runner.run(augment_color_distortions)){
         return 1;
     }
-
-    if (skip_ignored_path(space_info.fileName(), ignore_list)){
-        return 0;
-    }
-
-    sub_dir.setFilter(QDir::Filter::Dirs);
-    // test_space e.g "PokemonLA". It's like the namespace.
-    const std::string test_space = space_info.fileName().toStdString();
-    if (test_space == "." || test_space == ".."){
-        return 0;
-    }
-
-    // Look for sub-sub-folders as test object names, e.g.
-    // ./CommandLineTests/PokemonLA/BattleMenuDetector/
-    const QFileInfoList obj_list = sub_dir.entryInfoList();
-    for(const QFileInfo& obj_info : obj_list){
-        RETURN_IF_NOT_ZERO(run_test_obj(test_space, obj_info, num_passed, ignore_list));
-    }
-
+    cout << "Running parallel unit tests... Done!" << endl;
     return 0;
 }
 
 
 
-
-} // end of anonymous namespace
-
-
-
-int run_command_line_tests(){
-    const auto& root_folder_name = GlobalSettings::instance().COMMAND_LINE_TEST_FOLDER;
-
-    QDir test_root_dir(root_folder_name.c_str());
-    if (!test_root_dir.exists()){
-        cerr << "Error: command line test folder " << root_folder_name << " does not exist." << endl;
-        return 1;
-    }
-
-    QFileInfo test_root_info(root_folder_name.c_str());
-
-    size_t num_passed = 0;
-
-    const auto& selected_test_list = GlobalSettings::instance().COMMAND_LINE_TEST_LIST;
-
-    // The ignore list will be used to skip path.
-    // The ignore list functions as path prefixes when determining which path to skip.
-    std::vector<QString> ignore_list;
-    for(const std::string& ignore_path : GlobalSettings::instance().COMMAND_LINE_IGNORE_LIST){
-        QString path_cleaned = QDir::cleanPath(QString::fromStdString(root_folder_name + "/" + ignore_path));
-        // Remove the trailing '/' or '\\' to make sure it can match the input path
-        // without the trailing '/' or '\\'.
-        if (path_cleaned.endsWith('/') || path_cleaned.endsWith('\\')){
-            path_cleaned.chop(1);
-        }
-        ignore_list.emplace_back(std::move(path_cleaned));
-    }
-
-    // Run all tests
-    if (selected_test_list.size() == 0){
-        // Look for sub-folders, e.g.
-        // ./CommandLineTests/PokemonLA/
-        // ./CommandLineTests/PokemonSwSh/
-        test_root_dir.setFilter(QDir::Filter::Dirs);
-        const QFileInfoList sub_dir_list = test_root_dir.entryInfoList();
-        for(const QFileInfo& sub_dir_info : sub_dir_list){
-            RETURN_IF_NOT_ZERO(run_test_space(sub_dir_info, num_passed, ignore_list));
-        }
-    } else{
-        // Only run on selected tests
-        for(const std::string& test_path : selected_test_list){
-            const std::string full_path = root_folder_name + "/" + test_path;
-            const QString full_path_cleaned = QDir::cleanPath(QString::fromStdString(full_path));
-
-            if (full_path_cleaned.size() == 0){
-                cerr << "Error: empty path found in TEST_LIST" << endl;
-                return 1;
-            }
-
-            if (skip_ignored_path(full_path_cleaned, ignore_list)){
-                continue;
-            }
-
-            QFileInfo selected_path_info(full_path_cleaned);
-
-            if (selected_path_info.exists() == false){
-                cerr << "Error: path " << full_path << " in TEST_LIST does not exist." << endl;
-                return 1;
-            }
-
-            std::list<QString> path_components;
-            {
-                QString path = full_path_cleaned;
-                QFileInfo cur_info(path);
-                while(cur_info != test_root_info) {
-                    path_components.push_front(cur_info.fileName());
-                    // Go upper one level of folder:
-                    path = cur_info.path();
-                    cur_info = QFileInfo(path);
-                }
-            }
-            // If full_path is "CommandLineTest/PokemonLA/DialogueEllipseDetector/macOS_bright/WendyNight_True.png", then
-            // path_components contains:
-            // - PokemonLA
-            // - DialogueEllipseDetector
-            // - macOS_bright
-            // - WendyNight_True.png
-            if (path_components.size() == 0){
-                cerr << "Error: cannot parse " << full_path << ". Empty path in TEST_LIST?" << endl;
-                return 1;
-            }
-
-            QDir cur_dir(root_folder_name.c_str());
-
-            auto it = path_components.begin();
-            std::string test_space = it->toStdString();
-            QFileInfo test_space_info(cur_dir.filePath(*it));
-            cur_dir = QDir(test_space_info.filePath());
-            if (path_components.size() == 1){
-                RETURN_IF_NOT_ZERO(run_test_space(test_space_info, num_passed, ignore_list));
-                continue;
-            }
-
-            it++;
-            std::string test_name = it->toStdString();
-            QFileInfo test_obj_info(cur_dir.filePath(*it));
-            if (path_components.size() == 2){
-                RETURN_IF_NOT_ZERO(run_test_obj(test_space, test_obj_info, num_passed, ignore_list));
-                continue;
-            }
-
-            const auto test_func = find_test_function(test_space, test_name);
-            if (test_func == nullptr){
-                return 2;
-            }
-
-            print_equals();
-            if (selected_path_info.isFile()){
-                // Call the function to do the actual test:
-                RETURN_IF_TEST_FAILED(test_func, full_path_cleaned.toStdString(), num_passed);
-            } else{
-                // selected_path_info is a directory, go through each file recursively in the directory
-                RETURN_IF_NOT_ZERO(run_test_obj_dir(test_func, full_path_cleaned, num_passed, ignore_list));
-            }
-        } // end selected_test_list
-    }
-
-    print_equals();
-    cout << num_passed << " test" << (num_passed > 1 ? "s" : "") << " passed" << std::endl;
-    return 0;
 }
-
-
-}
\ No newline at end of file
diff --git a/SerialPrograms/Source/Tests/CommandLineTests.h b/SerialPrograms/Source/Tests/CommandLineTests.h
index 7a7bc978cb..010de0c81f 100644
--- a/SerialPrograms/Source/Tests/CommandLineTests.h
+++ b/SerialPrograms/Source/Tests/CommandLineTests.h
@@ -1,86 +1,39 @@
 /*  Command Line Tests
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *  
- *  Explanation of the command line test framework
- * 
- *  Goals:
- * 
- *  - To build a unit test-like framework to ensure correctness of the various inference methods.
- *  - To allow efficient iterations during development of a new inference method without the need to launch GUI and click buttons.
- * 
- * 
- *  How to use the test folder:
- * 
- *  Enable the command line test mode by changing the SerialPrograms-Settings.json field:
- *  "20-GlobalSettings": "COMMAND_LINE_TESTS": "RUN" to true.
- *  In this mode, the program does not launch GUI. Instead it looks for a local folder which path is specified by the json field:
- *  "20-GlobalSettings": "COMMAND_LINE_TESTS": "FOLDER"
- *  and run tests inside it.
- *  The folder is structured as:
- *  ../CommandLineTests/                         <- root test folder
- *    - PokemonLA/                               <- test space, sub-folder to organize tests, e.g. by which games the inferences are used in
- *        - BattleMenuDetector/                    <- test object, name of the class/function/file to test
- *            - IngoBattleDayTime_True.png           <- test file for BattleMenuDetector
- *            - IngoBattleNightTime_True.png         <- test file for BattleMenuDetector
- *    - PokemonBDSP/                             <- another test space for inferences in another game
- *        - DialogDetector/                        <- test object, this time it's DialogDetector for BDSP
- *            - Win_Mirabox/                         <- can have more folders under test object to organize test files, e.g by OS and capture card
- *                - FetchEggDayTime_True.png           <- test file for DialogDetector
- * 
- *  The test framework will go to each test object's folder and use its path to determine which test object to call.
- *  For example, if the path is CommandLineTest/PokemonLA/BattleMenuDetector/, the program will test the code in
- *  Source/PokemonLA/Inference/Battles/PokemonLA_BattleMenuDetector.h.
- * 
- *  You can also selectively run some of the tests by setting
- *  "20-GlobalSettings": "COMMAND_LINE_TESTS": "TEST_LIST" as a list of strings.
- *  Each string will be a relative path. It can be any of:
- *  - "PokemonBDSP"
- *  - "PokemonBDSP/DialogDetector"
- *  - "PokemonBDSP/DialogDetector/Win_Mirabox"
- *  - "PokemonBDSP/DialogDetector/Win_Mirabox/FetchEggDayTime_True.png"
- *  This gives the flexibility to test the code for a game, a detector, a detector on a capture card or a detector on a particular image/audio/video.
- * 
- *  If you have put some test files for experimental code in a folder and later decide to not run that code for a while, you can use
- *  "20-GlobalSettings": "COMMAND_LINE_TESTS": "IGNORE_LIST" as a list of strings to skip the paths to those tests.
- *  Each string in the list serves as a prefix to the test path that the test framework uses to filter out paths.
- *  
- * Those "hidden" files are useful for storing some metadata in the folder, or serving as an extra file in case some tests need more than one test files.
- * 
- *  How to add new test code:
- * 
- *  The test framework calls TestMap.h: find_test_function(test_space, test_obj_name) to find the test function related to a test path.
- *  For example, given a path PokemonLA/BattleMenuDetector/IngoBattleDayTime_True.png, by extracting test_space as "PokemonLA" and test_obj_name as
- *  "BattleMenuDetector" from the path, find_test_function() returns the code that runs
- *  Source/PokemonLA/Inference/Battles/PokemonLA_BattleMenuDetector.h:BattleMenuDetector.
- *  
- *  Internally, find_test_function() searches in a map: TestMap.cpp:std::map<std::string, TestFunction> TEST_MAP to get the correct test function.
- *  The key of the map in the above example is "PokemonLA_BattleMenuDetector" (we use "_" to connect test space and test obj name). The value of the
- *  map is TestFunction = std::function<int(const std::string& test_file_path)>.
- *  Each implemented TestFunction needs to:
- *  - Check the test file path to see if the file is the desired data format (e.g. visual inference test checks for image files and audio inference test
- *    checks for audio files). If the file is not desired, simply return a negative integer to tell the caller that this file is skipped.
- *  - Run the test code on the file, if the the file format is desired. If test succeeds, return 0, otherwise return a positive integer to tell the caller
- *    the test failed.
- *  - While running the test code, we also need to know the target test code output (or the content in golden files) so that we can know whether the test is
- *    successful or not. For simple tasks like testing battle menu detector, the target of each test image is a single bool, indicating whether the current
- *    image represents a screenshot with battle menu. So we can embed the target output into the test file name: IngoBattleDayTime_True.png.
- *    For more complex outputs, like detecting how many or where some objects are on the screen, or where the shiny sound is in the audio file, it would
- *    need a very long filename to store them. So we chose to store those outputs in a golden file.
- * 
- *  To avoid implementing the above logic of skipping files and finding target outputs in every TestFunction, we add helper functions like
- *  TestMap.h:int screen_bool_detector_helper(ScreenBoolDetectorFunction test_func, const std::string& test_path)
- *  screen_bool_detector_helper helps implement visual inference test with single bool as output (just like BattleMenuDetector).
- *  It implements skipping non-image files and parse filename to get target output bool.
- *  It then calls ScreenBoolDetectorFunction = std::function<int(const ImageViewRGB32& image, bool target)> test_func which will be implemented by the test developer
- *  to call the actual inference code and check its result against the target bool.
- *  
- *  So in order to implement a test for, let's say, BattleMenuDetector:
- *  - Implement a ScreenBoolDetectorFunction, test_pokemonLA_BattleMenuDetector() that calls the detector code and compares the result with the target bool.
- *    The implementation is written in PokemonLA_Tests.cpp.
- *  - Write the function declaration in PokemonLA_Tests.h
- *  - Add a new entry to TestMap.cpp:TEST_MAP by utilizing screen_bool_detector_helper:
- *    {"PokemonLA_BattleMenuDetector", std::bind(screen_bool_detector_helper, test_pokemonLA_BattleMenuDetector, _1)}
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  Run all the unit tests from the command line, without launching the GUI.
+ *
+ *  How to run:
+ *  Launch the program with the argument "--command-line-test-mode", or set
+ *  "20-GlobalSettings": "COMMAND_LINE_TESTS": "RUN" to true in SerialPrograms-Settings.json.
+ *
+ *  How the tests work:
+ *  - Each kind of test is a class inheriting `UnitTest` (Common/Cpp/TestRunners/UnitTest.h)
+ *    that implements `run()` and returns a `UnitTestResult` (passed, failed with a message,
+ *    skipped or out of memory).
+ *  - Each test case is an instance of such a class, constructed with its test file path and
+ *    the expected results, e.g.
+ *      database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/squirtle_Shiny.png", 7, 700052, 1);
+ *    Test files are loaded relative to `UNIT_TEST_RESOURCE_PATH()`, which finds the
+ *    CommandLineTests repo (https://github.com/PokemonAutomation/CommandLineTests) next to
+ *    the program.
+ *  - Each module registers its test cases in an `add_tests_<Name>(UnitTestDatabase&)` function in
+ *    SerialPrograms/Source/ComputerPrograms/ComputerPrograms_UnitTestRunner.cpp.
+ *  - The tests are run in parallel by `UnitTestRunner` (Common/Cpp/TestRunners/ParallelUnitTestRunner.h),
+ *    within memory and thread limits.
+ *
+ *  Capture card distortions:
+ *  Pass "--augment-color-distortions" to run image tests with color distortion augmentation.
+ *  Each `ImageUnitTest` then also runs on its images re-colored like a few extreme capture card
+ *  setups, and fails if any of those runs fails. Its failure message names each failing setting, e.g.
+ *      [Win-MYPIN] Error: ...
+ *  This needs the CaptureCardCalibration/ folder of the CommandLineTests repo: if it can't be
+ *  loaded, no test runs and the program returns 1. See SerialPrograms/Source/Tests/ImageUnitTest.h
+ *  and Common/Cpp/TestRunners/TestImageDistortionManager.h.
+ *
+ *  The same tests can also be run from the GUI with the "Unit Test Runner" program, which can
+ *  run a single test, the tests matching a substring, or all tests.
  */
 
 
@@ -91,10 +44,12 @@
 namespace PokemonAutomation{
 
 
-// Called by main() to run tests on command line, without launching any GUI.
+// Called by main() to run all the unit tests on command line, without launching any GUI.
 // This function is only called when GlobalSettings::COMMAND_LINE_TEST_MODE is true.
-// Return 0 if all tests are passed.
-int run_command_line_tests();
+// `augment_color_distortions` is set by the "--augment-color-distortions" argument: also run image tests
+// with color distortion augmentation, using the distortion data from the test repo.
+// Return 0 if all tests are passed, and 1 if any test failed or the distortion data can't be loaded.
+int run_command_line_tests(bool augment_color_distortions);
 
 
 
diff --git a/SerialPrograms/Source/Tests/CommonFramework_Tests.cpp b/SerialPrograms/Source/Tests/CommonFramework_Tests.cpp
deleted file mode 100644
index 7302bc82ae..0000000000
--- a/SerialPrograms/Source/Tests/CommonFramework_Tests.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-/*  Common Framework Tests
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-
-#include "Common/Compiler.h"
-#include "Common/Cpp/Time.h"
-#include "CommonFramework/ImageTypes/ImageRGB32.h"
-#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
-#include "CommonFramework/Inference/BlackBorderDetector.h"
-#include "CommonFramework_Tests.h"
-#include "TestUtils.h"
-
-
-#include <iostream>
-using std::cout;
-using std::cerr;
-using std::endl;
-
-namespace PokemonAutomation{
-
-int test_CommonFramework_BlackBorderDetector(const ImageViewRGB32& image, bool target){
-    BlackBorderDetector detector;
-
-    bool result = detector.detect(image);
-
-    TEST_RESULT_EQUAL(result, target);
-
-    return 0;
-}
-
-
-}
diff --git a/SerialPrograms/Source/Tests/CommonFramework_Tests.h b/SerialPrograms/Source/Tests/CommonFramework_Tests.h
deleted file mode 100644
index b796e2f0a1..0000000000
--- a/SerialPrograms/Source/Tests/CommonFramework_Tests.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*  Common Framework Tests
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *  
- *  
- */
-
-
-#ifndef PokemonAutomation_Tests_CommonFramework_Tests_H
-#define PokemonAutomation_Tests_CommonFramework_Tests_H
-
-namespace PokemonAutomation{
-
-class ImageViewRGB32;
-
-int test_CommonFramework_BlackBorderDetector(const ImageViewRGB32& image, bool target);
-
-}
-
-#endif
diff --git a/SerialPrograms/Source/Tests/GuardPageImage.h b/SerialPrograms/Source/Tests/GuardPageImage.h
new file mode 100644
index 0000000000..279322a0c8
--- /dev/null
+++ b/SerialPrograms/Source/Tests/GuardPageImage.h
@@ -0,0 +1,66 @@
+/*  Guard Page Image
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  An RGB32 image for unit tests of image kernels. The rows are packed with
+ *  no padding (bytes_per_row = width * 4), and the last row ends right before
+ *  a no-access guard page. A kernel that reads or writes past the last pixel
+ *  faults right away.
+ *
+ *  ImageRGB32 pads every row to 64 bytes, so tests on it never notice a kernel
+ *  that reads a little past the end of a row. Views of other memory (like a
+ *  QImage frame) don't have that padding.
+ *
+ */
+
+#ifndef PokemonAutomation_Tests_GuardPageImage_H
+#define PokemonAutomation_Tests_GuardPageImage_H
+
+#include <stdint.h>
+#include "Common/Cpp/Containers/GuardPageBuffer.h"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+
+namespace PokemonAutomation{
+
+
+class GuardPageImageRGB32{
+public:
+    //  A blank image. Every pixel starts as zero.
+    GuardPageImageRGB32(size_t width, size_t height)
+        : m_width(width)
+        , m_height(height)
+        , m_pixels(width * height)
+    {}
+
+    //  A copy of "image".
+    explicit GuardPageImageRGB32(const ImageViewRGB32& image)
+        : GuardPageImageRGB32(image.width(), image.height())
+    {
+        for (size_t y = 0; y < m_height; y++){
+            for (size_t x = 0; x < m_width; x++){
+                m_pixels[x + y * m_width] = image.pixel(x, y);
+            }
+        }
+    }
+
+    size_t width() const{ return m_width; }
+    size_t height() const{ return m_height; }
+    size_t bytes_per_row() const{ return m_width * sizeof(uint32_t); }
+
+    const uint32_t* data() const{ return m_pixels.data(); }
+          uint32_t* data()      { return m_pixels.data(); }
+
+    uint32_t pixel(size_t x, size_t y) const{
+        return m_pixels[x + y * m_width];
+    }
+
+private:
+    size_t m_width;
+    size_t m_height;
+    GuardPageBuffer<uint32_t> m_pixels;
+};
+
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/Tests/ImageUnitTest.cpp b/SerialPrograms/Source/Tests/ImageUnitTest.cpp
new file mode 100644
index 0000000000..05b8fcf3df
--- /dev/null
+++ b/SerialPrograms/Source/Tests/ImageUnitTest.cpp
@@ -0,0 +1,132 @@
+/*  Image Unit Test
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <opencv2/core.hpp>
+#include "Common/Cpp/Exceptions.h"
+#include "Common/Cpp/CancellableScope.h"
+#include "Common/Cpp/TestRunners/TestImageDistortionManager.h"
+#include "CommonFramework/GlobalAutoPaths.h"
+#include "CommonFramework/StaticGlobals.h"
+#include "CommonFramework/ImageTypes/ImageRGB32_OpenCV.h"
+#include "ImageUnitTest.h"
+
+namespace PokemonAutomation{
+
+
+namespace{
+
+//  Return a copy of `image` with `transform` applied to the RGB of every pixel. Alpha is kept as it is.
+//  `ImageUnitTest::run()` uses this to re-color a test image as if it was captured through another
+//  capture card / video setup, with a transform from `TestImageDistortionManager::transform()`.
+//  The whole image is done in one `cv::transform()` call.
+ImageRGB32 apply_color_transform(const ImageViewRGB32& image, const ColorTransform3x4& transform){
+    if (!image){
+        return ImageRGB32();
+    }
+
+    //  `ImageRGB32` stores each pixel as a uint32_t 0xAARRGGBB, so its bytes in memory (little
+    //  endian) are B, G, R, A: OpenCV's BGRA. `cv::transform()` multiplies each pixel's 4 channels
+    //  and a constant 1 by a 4x5 matrix. Reorder the RGB transform's rows (outputs) and columns
+    //  (inputs) to BGR, and add a row that keeps alpha as it is:
+    //      B' = m[2][2]*B + m[2][1]*G + m[2][0]*R + 0*A + m[2][3]
+    //      G' = m[1][2]*B + m[1][1]*G + m[1][0]*R + 0*A + m[1][3]
+    //      R' = m[0][2]*B + m[0][1]*G + m[0][0]*R + 0*A + m[0][3]
+    //      A' =                                     1*A
+    const ColorTransform3x4& m = transform;
+    cv::Matx<float, 4, 5> bgra_matrix = cv::Matx<float, 4, 5>::zeros();
+    for (int out = 0; out < 3; out++){
+        const int rgb_row = 2 - out;
+        for (int in = 0; in < 3; in++){
+            bgra_matrix(out, in) = (float)m[rgb_row][2 - in];
+        }
+        bgra_matrix(out, 4) = (float)m[rgb_row][3];
+    }
+    bgra_matrix(3, 3) = 1;
+
+    ImageRGB32 distorted(image.width(), image.height());
+    cv::Mat output = to_OpenCV_ref(distorted);
+    // cv::transform handles clipping and rounding
+    cv::transform(to_OpenCV_ref(image), output, bgra_matrix);
+    return distorted;
+}
+
+}
+
+
+ImageUnitTest::ImageUnitTest(std::string name, std::vector<std::string> image_paths)
+    : UnitTest(std::move(name))
+    , m_image_paths(std::move(image_paths))
+{
+    //  The upper bound on the in-memory size of the test images this test loads.
+    //  Tests that keep extra full-size copies of the images, or load more images,
+    //  add to this in their constructor.
+    m_memory = MAX_TEST_IMAGE_RGB32_BYTES * image_paths.size();
+}
+
+
+UnitTestResult ImageUnitTest::run(Logger& logger, CancellableScope& scope) const{
+    std::vector<ImageRGB32> images;
+    for (const std::string& path : m_image_paths){
+        images.emplace_back(UNIT_TEST_RESOURCE_PATH() + path);
+    }
+
+    //  Run on the images as they are. Only a test that passes is worth running with distortions.
+    UnitTestResult result = run_on_images(logger, scope, images);
+    const TestImageDistortionManager* manager = test_image_distortion_manager();
+    if (result.result != UnitTestResult::PASSED || manager == nullptr){
+        return result;
+    }
+
+    //  When generating golden files, a test writes its results on the images as the expected
+    //  results. The distortion runs would overwrite them with results on re-colored images.
+    if (STATIC_GLOBALS.GENERATE_TEST_GOLDEN_FILES){
+        return result;
+    }
+
+    //  Run again on the images re-colored like each test distortion, and collect the failures.
+    std::string failures;
+    const size_t distortions = manager->num_applicable_distortions(m_image_paths);
+    for (size_t c = 0; c < distortions; c++){
+        scope.throw_if_cancelled();
+        const std::string& label = manager->test_distortion_label(c);
+        const std::string run_name = name() + " [" + label + "]";
+
+        std::vector<ImageRGB32> distorted_images;
+        for (size_t i = 0; i < images.size(); i++){
+            const ColorTransform3x4* transform = manager->transform(m_image_paths[i], label);
+            if (transform == nullptr){
+                //  The image has no known capture setup, or is already captured under the same
+                //  distortion setting the label refers to.
+                distorted_images.emplace_back(images[i].copy());
+            }else{
+                distorted_images.emplace_back(apply_color_transform(images[i], *transform));
+            }
+        }
+
+        //  Turn an exception into a failure of this distortion, so the message says which one threw.
+        UnitTestResult distorted_result;
+        try{
+            distorted_result = run_on_images(logger, scope, distorted_images);
+        }catch (Exception& e){
+            distorted_result = UnitTestResult(UnitTestResult::FAILED, e.to_str());
+        }
+
+        if (distorted_result.result == UnitTestResult::PASSED){
+            logger.log(run_name + ": passed", COLOR_BLUE);
+            continue;
+        }
+        logger.log(run_name + ": failed, Message: " + distorted_result.message, COLOR_RED);
+        failures += "\n[" + label + "] " + distorted_result.message;
+    }
+
+    if (failures.empty()){
+        return result;
+    }
+    return UnitTestResult(UnitTestResult::FAILED, "Failed with color distortions:" + failures);
+}
+
+
+}
diff --git a/SerialPrograms/Source/Tests/ImageUnitTest.h b/SerialPrograms/Source/Tests/ImageUnitTest.h
new file mode 100644
index 0000000000..a6af54017c
--- /dev/null
+++ b/SerialPrograms/Source/Tests/ImageUnitTest.h
@@ -0,0 +1,87 @@
+/*  Image Unit Test
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  Base class for unit tests that run on test images, e.g. a detector test that loads a screenshot
+ *  and checks the detector's result on it.
+ *
+ *  It loads the images itself and passes them to `run_on_images()`, which each test implements.
+ *  When color distortion augmentation is on ("--augment-color-distortions"), it also runs the test
+ *  again on the images re-colored like other capture card / video setups, so one test image covers
+ *  more of the color range users see. See Common/Cpp/TestRunners/TestImageDistortionManager.h.
+ */
+
+#ifndef PokemonAutomation_Tests_ImageUnitTest_H
+#define PokemonAutomation_Tests_ImageUnitTest_H
+
+#include <string>
+#include <vector>
+#include "Common/Cpp/TestRunners/UnitTest.h"
+#include "CommonFramework/ImageTypes/ImageRGB32.h"
+
+namespace PokemonAutomation{
+
+
+//  Upper bound on the in-memory size of a test image as an `ImageRGB32`
+//  (width x height x 4): 3840 x 2160 ("4K"), the largest size in the
+//  CommandLineTests repository. `ImageUnitTest` declares this many bytes in
+//  `UnitTest::m_memory` for the image it loads; tests that keep extra full-size
+//  copies of the image, or load more images, add to it in their constructor.
+//  A test that loads an image larger than 4K must set `m_memory` to the actual
+//  size instead of using this bound.
+constexpr uint64_t MAX_TEST_IMAGE_RGB32_BYTES = 3840ull * 2160ull * 4;
+
+
+//  Best-effort per-test memory estimates for the PaddleOCR (ONNX) pipeline, added to the
+//  test image size when setting `UnitTest::m_memory` on tests that run OCR. The ONNX
+//  sessions are loaded once per process and shared by all tests, but the estimates
+//  attribute the full cost to each test so the parallel test runner's memory budget
+//  stays safe. Single-line reads only use the recognition model; multi-line reads
+//  additionally load the ~84 MB detection model (PaddleOCRDetection/det.onnx) plus its
+//  activations.
+constexpr uint64_t PADDLE_OCR_SINGLE_LINE_MEMORY_ESTIMATE = 32ull * 1024 * 1024;
+constexpr uint64_t PADDLE_OCR_MULTILINE_MEMORY_ESTIMATE = 256ull * 1024 * 1024;
+
+
+class ImageUnitTest : public UnitTest{
+public:
+    //  `name`: the test name, as for `UnitTest`.
+    //  `image_paths`: the test images to load, relative to the test repo folder `UNIT_TEST_RESOURCE_PATH()`,
+    //  e.g. {"NintendoSwitch/UpdateMenuDetector/English_1_True.png"}.
+    ImageUnitTest(std::string name, std::vector<std::string> image_paths);
+
+    //  Load the test images and pass them to `run_on_images()`.
+    //  If that passes and color distortion augmentation is on (the global `TestImageDistortionManager`
+    //  is loaded), and at least one image has a known capture setup, call `run_on_images()` again once
+    //  per test distortion, on the images re-colored with `TestImageDistortionManager::transform()`.
+    //  The test passes only if every run passes. Otherwise the message lists each distortion that
+    //  failed with the message of that run, e.g. "[Win-MYPIN] Error: ...".
+    //  There are no distortion runs while generating golden files (`GENERATE_TEST_GOLDEN_FILES`), so the
+    //  golden files hold the results on the images as they are.
+    virtual UnitTestResult run(Logger& logger, CancellableScope& scope) const override final;
+
+    //  The test images, relative to `UNIT_TEST_RESOURCE_PATH()`, as given to the constructor.
+    const std::vector<std::string>& image_paths() const{
+        return m_image_paths;
+    }
+
+
+protected:
+    //  The test itself, implemented by each image test. `images` are the test images in the order
+    //  of `image_paths()`: as they are on the first call, then re-colored on the distortion calls.
+    //  If an image file is missing, `run()` throws FileException before calling this, which fails the test.
+    //  A file that exists but can't be decoded may be passed as an empty image.
+    //  It can be called several times in one `run()`, so it must not keep state between calls.
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const = 0;
+
+
+private:
+    const std::vector<std::string> m_image_paths;
+};
+
+
+}
+#endif
diff --git a/SerialPrograms/Source/Tests/Kernels_Tests.cpp b/SerialPrograms/Source/Tests/Kernels_Tests.cpp
deleted file mode 100644
index 247bee862e..0000000000
--- a/SerialPrograms/Source/Tests/Kernels_Tests.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-/*  Kernels Tests
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-
-#include "Common/Compiler.h"
-#include "Common/Cpp/Time.h"
-#include "CommonFramework/ImageTypes/ImageRGB32.h"
-#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
-#include "Kernels/ImageScaleBrightness/Kernels_ImageScaleBrightness.h"
-#include "Kernels_Tests.h"
-
-#include <iostream>
-using std::cout;
-using std::cerr;
-using std::endl;
-
-namespace PokemonAutomation{
-
-using namespace Kernels;
-
-// using namespace NintendoSwitch::PokemonLA;
-int test_kernels_ImageScaleBrightness(const ImageViewRGB32& image){
-    ImageRGB32 new_image = image.copy();
-    
-    int num_iterations = 5000;
-    auto time_start = current_time();
-    for(int i = 0; i < num_iterations; i++){
-        scale_brightness(new_image.width(), new_image.height(), new_image.data(), new_image.bytes_per_row(), 1.2f, 1.3f, 0.5f);
-        // break;
-    }
-    auto time_end = current_time();
-    const auto ms = std::chrono::duration_cast<Milliseconds>(time_end - time_start).count();
-    cout << "Time: " << ms << " ms, " << ms / 1000. << " s" << endl;
-
-    // new_image.save("./output.png");
-
-    return 0;
-}
-
-}
diff --git a/SerialPrograms/Source/Tests/Kernels_Tests.h b/SerialPrograms/Source/Tests/Kernels_Tests.h
deleted file mode 100644
index af35619f4a..0000000000
--- a/SerialPrograms/Source/Tests/Kernels_Tests.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*  Kernels Tests
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *  
- *  
- */
-
-
-#ifndef PokemonAutomation_Tests_Kernels_Tests_H
-#define PokemonAutomation_Tests_Kernels_Tests_H
-
-namespace PokemonAutomation{
-
-class ImageViewRGB32;
-
-int test_kernels_ImageScaleBrightness(const ImageViewRGB32& image);
-
-}
-
-#endif
diff --git a/SerialPrograms/Source/Tests/NintendoSwitch_Tests.cpp b/SerialPrograms/Source/Tests/NintendoSwitch_Tests.cpp
deleted file mode 100644
index 963db59094..0000000000
--- a/SerialPrograms/Source/Tests/NintendoSwitch_Tests.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-/*  NintendoSwitch Tests
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-
-#include "Common/Compiler.h"
-#include "Common/Cpp/Time.h"
-#include "CommonFramework/ImageTypes/ImageRGB32.h"
-#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
-#include "NintendoSwitch/Inference/NintendoSwitch_DetectHome.h"
-#include "NintendoSwitch_Tests.h"
-#include "TestUtils.h"
-
-#include <iostream>
-using std::cout;
-using std::cerr;
-using std::endl;
-
-namespace PokemonAutomation{
-
-using namespace NintendoSwitch;
-
-// using namespace NintendoSwitch::PokemonLA;
-int test_NintendoSwitch_UpdateMenuDetector(const ImageViewRGB32& image, bool target){
-    UpdateMenuDetector detector;
-    bool result = detector.detect(image);
-    TEST_RESULT_EQUAL(result, target);
-    return 0;
-}
-
-
-
-}
diff --git a/SerialPrograms/Source/Tests/NintendoSwitch_Tests.h b/SerialPrograms/Source/Tests/NintendoSwitch_Tests.h
deleted file mode 100644
index 71f7c6914f..0000000000
--- a/SerialPrograms/Source/Tests/NintendoSwitch_Tests.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*  Nintendo Switch Tests
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *  
- *  
- */
-
-
-#ifndef PokemonAutomation_Tests_NintendoSwitch_Tests_H
-#define PokemonAutomation_Tests_NintendoSwitch_Tests_H
-
-namespace PokemonAutomation{
-
-class ImageViewRGB32;
-
-int test_NintendoSwitch_UpdateMenuDetector(const ImageViewRGB32& image, bool target);
-
-}
-
-#endif
diff --git a/SerialPrograms/Source/Tests/PokemonLA_Tests.cpp b/SerialPrograms/Source/Tests/PokemonLA_Tests.cpp
deleted file mode 100644
index ab50e69c2b..0000000000
--- a/SerialPrograms/Source/Tests/PokemonLA_Tests.cpp
+++ /dev/null
@@ -1,680 +0,0 @@
-/*  PokemonLA Tests
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-
-#include "Common/Compiler.h"
-#include "PokemonLA_Tests.h"
-#include "TestUtils.h"
-#include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "CommonFramework/Language.h"
-#include "PokemonLA/Inference/Battles/PokemonLA_BattleMenuDetector.h"
-#include "PokemonLA/Inference/Battles/PokemonLA_BattlePokemonSwitchDetector.h"
-#include "PokemonLA/Inference/Battles/PokemonLA_BattleSpriteWatcher.h"
-#include "PokemonLA/Inference/Objects/PokemonLA_DialogueYellowArrowDetector.h"
-#include "PokemonLA/Inference/Objects/PokemonLA_MMOQuestionMarkDetector.h"
-#include "PokemonLA/Inference/Battles/PokemonLA_TransparentDialogueDetector.h"
-#include "PokemonLA/Inference/Battles/PokemonLA_BattleStartDetector.h"
-#include "PokemonLA/Inference/Objects/PokemonLA_BattleSpriteArrowDetector.h"
-#include "PokemonLA/Inference/PokemonLA_BerryTreeDetector.h"
-#include "PokemonLA/Inference/PokemonLA_BlackOutDetector.h"
-#include "PokemonLA/Inference/PokemonLA_DialogDetector.h"
-#include "PokemonLA/Inference/PokemonLA_StatusInfoScreenDetector.h"
-#include "PokemonLA/Inference/PokemonLA_WildPokemonFocusDetector.h"
-#include "PokemonLA/Inference/Map/PokemonLA_MapMarkerLocator.h"
-#include "PokemonLA/Inference/Map/PokemonLA_MapZoomLevelReader.h"
-#include "PokemonLA/Inference/Map/PokemonLA_MapMissionTabReader.h"
-#include "PokemonLA/Inference/Map/PokemonLA_MapWeatherAndTimeReader.h"
-#include "PokemonLA/Inference/Map/PokemonLA_PokemonMapSpriteReader.h"
-#include "PokemonLA/Inference/Objects/PokemonLA_FlagTracker.h"
-#include "PokemonLA/Inference/Sounds/PokemonLA_ShinySoundDetector.h"
-#include "PokemonLA/Programs/PokemonLA_GameSave.h"
-#include "PokemonLA/PokemonLA_Locations.h"
-#include "PokemonLA/PokemonLA_WeatherAndTime.h"
-
-#include <QFileInfo>
-#include <QDir>
-#include <algorithm>
-#include <cmath>
-#include <iostream>
-#include <iomanip>
-#include <sstream>
-#include <map>
-using std::cout;
-using std::cerr;
-using std::endl;
-
-namespace PokemonAutomation{
-
-using namespace NintendoSwitch::PokemonLA;
-
-int test_pokemonLA_BattleMenuDetector(const ImageViewRGB32& image, bool target){
-    auto& logger = global_logger_command_line();
-    auto overlay = DummyVideoOverlay();
-    const bool stop_on_detected = true;
-    BattleMenuDetector detector(logger, overlay, stop_on_detected);
-
-    bool result = detector.process_frame(image, current_time());
-    TEST_RESULT_EQUAL(result, target);
-    return 0;
-}
-
-int test_pokemonLA_BattlePokemonSwitchDetector(const ImageViewRGB32& image, bool target) {
-    auto& logger = global_logger_command_line();
-    auto overlay = DummyVideoOverlay();
-    const bool stop_on_detected = true;
-    BattlePokemonSwitchDetector detector(logger, overlay, stop_on_detected);
-
-    bool result = detector.process_frame(image, current_time());
-    TEST_RESULT_EQUAL(result, target);
-    return 0;
-}
-
-int test_pokemonLA_TransparentDialogueDetector(const ImageViewRGB32& image, bool target){
-    auto& logger = global_logger_command_line();
-    auto overlay = DummyVideoOverlay();
-    const bool stop_on_detected = true;
-    TransparentDialogueDetector detector(logger, overlay, stop_on_detected);
-
-    bool result = detector.process_frame(image, current_time());
-    TEST_RESULT_EQUAL(result, target);
-    return 0;
-}
-
-int test_pokemonLA_EventDialogDetector(const ImageViewRGB32& image, bool target){
-    auto& logger = global_logger_command_line();
-    auto overlay = DummyVideoOverlay();
-    const bool stop_on_detected = true;
-    EventDialogDetector detector(logger, overlay, stop_on_detected);
-
-    bool result = detector.process_frame(image, current_time());
-    TEST_RESULT_EQUAL(result, target);
-    return 0;
-}
-
-int test_pokemonLA_DialogueYellowArrowDetector(const ImageViewRGB32& image, bool target){
-    auto& logger = global_logger_command_line();
-    auto overlay = DummyVideoOverlay();
-    const bool stop_on_detected = true;
-    DialogueYellowArrowDetector detector(logger, overlay, stop_on_detected);
-
-    bool result = detector.process_frame(image, current_time());
-    TEST_RESULT_EQUAL(result, target);
-    return 0;
-}
-
-int test_pokemonLA_BlackOutDetector(const ImageViewRGB32& image, bool target){
-    auto& logger = global_logger_command_line();
-    auto overlay = DummyVideoOverlay();
-
-    BlackOutDetector detector(logger, overlay);
-    bool result = detector.process_frame(image, current_time());
-    TEST_RESULT_EQUAL(result, target);
-    return 0;
-}
-
-int test_pokemonLA_BattleStartDetector(const ImageViewRGB32& image, bool target){
-    auto& logger = global_logger_command_line();
-    auto overlay = DummyVideoOverlay();
-
-    BattleStartDetector detector(logger, overlay);
-    bool result = detector.process_frame(image, current_time());
-    TEST_RESULT_EQUAL(result, target);
-    return 0;
-}
-
-int test_pokemonLA_MMOQuestionMarkDetector(const ImageViewRGB32& image, const std::vector<std::string>& keywords){
-    bool hisui_kw_found = false;
-    std::array<bool, 5> target_hisui_region_has_MMO = {false};
-
-    bool region_kw_found = false;
-    int target_num_MMOs_on_region_map = -1;
-    int target_region_index = -1;
-
-    for(size_t keyword_index = 0; keyword_index < keywords.size(); keyword_index++){
-        const std::string& word = keywords[keyword_index];
-        if (hisui_kw_found == false && word == "Hisui"){
-            hisui_kw_found = true;
-            continue;
-        }
-        if (region_kw_found == false && word == "Region"){
-            region_kw_found = true;
-            continue;
-        }
-
-        if (hisui_kw_found){
-            // We have found the "Hisui" keyword. So the next words will be the index of the region on the Hisui map
-            // that has MMO.
-            try{
-                int region = std::stoi(word);
-                if (region < 0 || region > 4){
-                    cerr << "Error: wrong region number, must be [0, 4] but got " << region << endl;
-                    return 1;
-                }
-                target_hisui_region_has_MMO[region] = true;
-            } catch(std::exception&){
-                cerr << "Error: keyword must be a region number, ranging in [0, 4], but got " << word << endl;
-                return 1;
-            }
-        }
-        else if (region_kw_found){
-            // Found "Region" keyword, read a number as how many MMOs on the region map, and a region name.
-            if (target_region_index < 0){
-                for(size_t index = 0; index < 5; index++){
-                    if (word == WILD_REGION_SHORT_NAMES[index]){
-                        target_region_index = (int)index;
-                        break;
-                    }
-                }
-                if (target_region_index >= 0){
-                    continue;
-                }
-            }
-            if (target_num_MMOs_on_region_map < 0){
-                try{
-                    int num_MMOs = std::stoi(word);
-                    if (num_MMOs < 0){
-                        cerr << "Error: wrong number " << num_MMOs << ", must be non-negative" << endl;
-                        return 1;
-                    }
-                    target_num_MMOs_on_region_map = num_MMOs;
-                } catch(std::exception&){}
-            }
-        }
-    }
-
-    if (hisui_kw_found == false && region_kw_found == false){
-        cerr << "Error: need keyword \"Hisui\" or \"Region\" in filename/" << endl;
-        return 1;
-    }
-
-    auto& logger = global_logger_command_line();
-    MMOQuestionMarkDetector detector(logger);
-
-    if (hisui_kw_found){
-        const auto region_has_MMO = detector.detect_MMO_on_hisui_map(image);
-
-        for(size_t i = 0; i < 5; i++){
-            const bool result = region_has_MMO[i];
-            const bool target = target_hisui_region_has_MMO[i];
-            if (result != target) {
-                cerr << "Error: " << __func__ << " result on region " << i << " is " << result << " but should be " << target << "." << endl;
-                return 1;
-            }
-        }
-    } else { // Region keyword found
-        if (target_region_index < 0 || target_num_MMOs_on_region_map < 0){
-            cerr << "Error: need a region name and a number of MMOs in the filename (e.g. image-Fieldlands_5.png)." << endl; 
-        }
-        const auto results = detector.detect_MMOs_on_region_map(image);
-        TEST_RESULT_EQUAL((int)results.size(), target_num_MMOs_on_region_map);
-    }
-
-    return 0;
-}
-
-int read_pokemon_info_from_words(const std::vector<std::string>& keywords, Language& language, PokemonDetails& details){
-    // the last five keywords should be: <language> <pokemon name slug> <Shiny/NotShiny> <Alpha/NotAlpha> <Male/Female/Genderless>
-
-    if (keywords.size() < 5){
-        cerr << "Error: not enough number of keywords in the filename to generate PokemonDetails. Found only " << keywords.size() << "." << endl;
-        return 1;
-    }
-
-    language = language_code_to_enum(keywords[keywords.size()-5]);
-    if (language == Language::None || language == Language::EndOfList){
-        cerr << "Error: language keyword " << keywords[keywords.size()-5] << " is wrong." << endl;
-        return 1;
-    }
-
-    const std::string& pokemon_slug = keywords[keywords.size()-4];
-    details.name_candidates.insert(pokemon_slug);
-
-    const std::string& shiny_word = keywords[keywords.size()-3];
-    if (shiny_word == "Shiny"){
-        details.is_shiny = true;
-    } else if (shiny_word == "NotShiny"){
-        details.is_shiny = false;
-    } else{
-        cerr << "Error: shiny keyword " << shiny_word << " is wrong. Must be \"Shiny\" or \"NotShiny\"." << endl;
-        return 1;
-    }
-
-    const std::string& alpha_word = keywords[keywords.size()-2];
-    if (alpha_word == "Alpha"){
-        details.is_alpha = true;
-    } else if (alpha_word == "NotAlpha"){
-        details.is_alpha = false;
-    } else{
-        cerr << "Error: alpha keyword " << alpha_word << " is wrong. Must be \"Alpha\" or \"NotAlpha\"." << endl;
-        return 1;
-    }
-
-    const std::string& gender_word = keywords[keywords.size()-1];
-    if (gender_word == "Male"){
-        details.gender = Gender::Male;
-    } else if (gender_word == "Female"){
-        details.gender = Gender::Female;
-    } else if (gender_word == "Genderless"){
-        details.gender = Gender::Genderless;
-    } else {
-        cerr << "Error: gender keyword " << gender_word << " is wrong. Must be \"Male\", \"Female\" or \"Genderless\"." << endl;
-        return 1;
-    }
-
-    return 0;
-}
-
-int test_pokemon_details(const PokemonDetails& details, const PokemonDetails& target){
-    TEST_RESULT_COMPONENT_EQUAL(details.is_shiny, target.is_shiny, "shiny");
-    TEST_RESULT_COMPONENT_EQUAL(details.is_alpha, target.is_alpha, "alpha");
-    TEST_RESULT_COMPONENT_EQUAL_WITH_PRINT_FUNC(details.gender, target.gender, "gender", get_gender_str);
-
-    const std::string& pokemon_slug = *target.name_candidates.begin();
-    bool found_name = false;
-    for(const auto& slg : details.name_candidates){
-        if (slg == pokemon_slug){
-            found_name = true;
-            break;
-        }
-    }
-    if (found_name == false){
-        cerr << "Error: " << __func__ << " name result is ";
-        for(const auto& slg : details.name_candidates){
-            cerr << slg << ", ";
-        }
-        cerr << "but should be " << pokemon_slug << "." << endl;
-        return 1;
-    }
-    
-    return 0;
-}
-
-int test_pokemonLA_StatusInfoScreenDetector(const ImageViewRGB32& image, const std::vector<std::string>& keywords){
-    // the last five keywords should be: <language> <pokemon name slug> <Shiny/NotShiny> <Alpha/NotAlpha> <Male/Female/Genderless>
-    Language language = Language::None;
-    PokemonDetails target;
-
-    int ret = read_pokemon_info_from_words(keywords, language, target);
-    if (ret != 0){
-        return ret;
-    }
-
-    auto& logger = global_logger_command_line();
-    auto overlay = DummyVideoOverlay();
-    const PokemonDetails details = read_status_info(logger, overlay, image, language);
-
-    return test_pokemon_details(details, target);
-}
-
-int test_pokemonLA_WildPokemonFocusDetector(const ImageViewRGB32& image, const std::vector<std::string>& keywords){
-    // two keywords: <True/False> <True/False>
-    if (keywords.size() < 2){
-        cerr << "Error: not enough number of keywords in the filename. Found only " << keywords.size() << "." << endl;
-        return 1;
-    }
-
-    auto& logger = global_logger_command_line();
-    auto overlay = DummyVideoOverlay();
-
-    WildPokemonFocusDetector detector(logger, overlay);
-    bool result_has_focus = detector.process_frame(image, current_time());
-
-    auto check_can_change_focus = [&](const std::string& word) -> int {
-        bool result_can_change = detect_change_focus(logger, overlay, image);
-        bool target_can_change = false;
-        if (parse_bool(word, target_can_change) == false){
-            cerr << "Error: True/False keyword " << word << " is wrong. Must be \"True\" or \"False\"." << endl;
-            return 1;
-        }
-        TEST_RESULT_EQUAL(result_can_change, target_can_change);
-        return 0;
-    };
-
-    bool target_has_focus = false;
-    if (parse_bool(keywords[keywords.size()-2], target_has_focus) == true){
-        TEST_RESULT_EQUAL(result_has_focus, target_has_focus);
-
-        return check_can_change_focus(keywords[keywords.size()-1]);
-    }
-
-    // Or seven keywords:
-    // the last seven keywords should be: <True/False> <True/False> <language> <pokemon name slug> <Shiny/NotShiny> <Alpha/NotAlpha> <Male/Female/Genderless>
-    if (keywords.size() < 7){
-        cerr << "Error: not enough number of keywords in the filename. Found only " << keywords.size() << "." << endl;
-        return 1;
-    }
-
-    if (parse_bool(keywords[keywords.size()-7], target_has_focus) == false){
-        cerr << "Error: True/False keyword " << keywords[keywords.size()-7] << " is wrong. Must be \"True\" or \"False\"." << endl;
-        return 1;
-    }
-    
-    TEST_RESULT_EQUAL(result_has_focus, target_has_focus);
-
-    if (result_has_focus){
-        int ret = check_can_change_focus(keywords[keywords.size()-6]);
-        if (ret != 0){
-            return ret;
-        }
-
-        Language language = Language::None;
-        PokemonDetails target_info;
-        ret = read_pokemon_info_from_words(keywords, language, target_info);
-        if (ret != 0){
-            return ret;
-        }
-
-        const auto info = read_focused_wild_pokemon_info(logger, overlay, image, language);
-
-        return test_pokemon_details(info, target_info);
-    }
-
-    return 0;
-}
-
-
-int test_pokemonLA_BattleSpriteWatcher(const ImageViewRGB32& image, const std::vector<std::string>& keywords){
-    auto& logger = global_logger_command_line();
-    auto overlay = DummyVideoOverlay();
-
-    std::vector<bool> target;
-    for(auto it = keywords.rbegin(); it != keywords.rend(); it++){
-        const auto& word = *it;
-        if (word == "0"){
-            target.push_back(false);
-        } else if (word == "1"){
-            target.push_back(true);
-        } else {
-            break;
-        }
-    }
-    target.resize(MAX_WILD_POKEMON_IN_MULTI_BATTLE, false);
-
-    BattleSpriteWatcher watcher(logger, overlay);
-
-    watcher.process_frame(image, current_time());
-
-    auto result = watcher.sprites_appeared();
-
-    for(size_t i = 0; i < MAX_WILD_POKEMON_IN_MULTI_BATTLE; i++){
-        if (result[i] != target[i]){
-            cerr << "Error: in test_pokemonLA_BattleSpriteWatcher sprite " << i << " has " << result[i] << ", but should be " << target[i] << endl;
-            return 1;
-        }
-    }
-
-    return 0;
-}
-
-
-int test_pokemonLA_MapMarkerLocator(const ImageViewRGB32& image, float target_angle, float threshold){
-    float angle = get_orientation_on_map(image);
-    TEST_RESULT_APPROXIMATE(angle, target_angle, threshold);
-    return 0;
-}
-
-int test_pokemonLA_MapZoomLevelReader(const ImageViewRGB32& image, int target){
-    int zoom = read_map_zoom_level(image);
-    TEST_RESULT_EQUAL(zoom, target);
-    return 0;
-}
-
-int test_pokemonLA_BattleSpriteArrowDetector(const ImageViewRGB32& image, int target){
-    auto& logger = global_logger_command_line();
-    auto overlay = DummyVideoOverlay();
-
-    const size_t target_index = target;
-    for(size_t sprite_index = 0; sprite_index < MAX_WILD_POKEMON_IN_MULTI_BATTLE; sprite_index++){
-        BattleSpriteArrowDetector detector(logger, overlay, sprite_index, std::chrono::milliseconds(0), true);
-        bool result = detector.process_frame(image, current_time());
-        if (sprite_index != target_index && result){
-            cerr << "Error: in test_pokemonLA_BattleSpriteArrowDetector detected arrow at sprite index " << sprite_index
-                 << " but should be at sprite index " << target << endl;
-            return 1;
-        } else if (sprite_index == target_index && result == false){
-            cerr << "Error: in test_pokemonLA_BattleSpriteArrowDetector failed to detect arrow at sprite index " << sprite_index << endl;
-            return 1;
-        }
-    }
-
-    return 0;
-}
-
-int test_pokemonLA_MapMissionTabReader(const ImageViewRGB32& image, bool target){
-    bool result = is_map_mission_tab_raised(image);
-    TEST_RESULT_EQUAL(result, target);
-    return 0;
-}
-
-void test_pokemonLA_BerryTreeDetector(const ImageViewRGB32& image){
-    BerryTreeDetector detector;
-
-    detector.process_frame(image, current_time());
-}
-
-int test_pokemonLA_SaveScreenDetector(const ImageViewRGB32& image, const std::vector<std::string>& keywords){
-    // two keywords: <True/False> <True/False>
-    if (keywords.size() < 2){
-        cerr << "Error: not enough number of keywords in the filename. Found only " << keywords.size() << "." << endl;
-        return 1;
-    }
-
-    bool target_save_tab = false;
-    if (parse_bool(keywords[keywords.size()-2], target_save_tab) == false){
-        cerr << "Error: True/False keyword " << keywords[keywords.size()-2] << " is wrong. Must be \"True\" or \"False\"." << endl;
-        return 1;
-    }
-    bool target_save_disabled = false;
-    if (parse_bool(keywords[keywords.size()-1], target_save_disabled) == false){
-        cerr << "Error: True/False keyword " << keywords[keywords.size()-1] << " is wrong. Must be \"True\" or \"False\"." << endl;
-        return 1;
-    }
-
-    bool save_tab = save_tab_selected(image);
-    bool save_disabled = save_tab_disabled(image);
-    
-    TEST_RESULT_COMPONENT_EQUAL(save_tab, target_save_tab, "save tab");
-    TEST_RESULT_COMPONENT_EQUAL(save_disabled, target_save_disabled, "save disabled");
-
-    return 0;
-}
-
-
-int test_pokemonLA_shinySoundDetector(const std::vector<AudioSpectrum>& spectrums, bool target){
-    auto& logger = global_logger_command_line();
-    DummyBotBase botbase(logger);
-    DummyVideoFeed video_feed;
-    DummyVideoOverlay video_overlay;
-    DummyAudioFeed audio_feed;
-
-    ConsoleHandle console(0, logger, &botbase, video_feed, video_overlay, audio_feed);
-    ShinySoundDetector detector(console, [&](float error_coefficient) -> bool{
-        return true;
-    });
-
-    bool result = detector.process_spectrums(spectrums, audio_feed);
-    TEST_RESULT_EQUAL(result, target);
-    return 0;
-}
-
-// Load an image with MMO question marks from an MMO event, with filename <XXX.png>
-// Load an image with MMO question marks revealed by Munchlax to show each pokemon sprite from the same MMO event, with filename <_XXX.png>
-// Load a text file with each line the pokemon in the MMO event, with filename <_XXX.txt>. If more than one pokemon of the same species appears,
-// add a number as the number of appearance at end of that line.
-int test_pokemonLA_MMOSpriteMatcher(const std::string& filepath){
-    auto& logger = global_logger_command_line();
-    const QString full_path(QString::fromStdString(filepath));
-    const QFileInfo fileinfo(full_path);
-    const QString filename = fileinfo.fileName();
-    const QDir parent_dir = fileinfo.dir();
-
-    std::string base_name = fileinfo.baseName().toStdString();
-
-    const std::vector<std::string> filename_words = parse_words(base_name);
-    MapRegion region = MapRegion::NONE;
-    for(const std::string& word : filename_words){
-        if (word == "Fieldlands"){
-            region = MapRegion::FIELDLANDS;
-            break;
-        } else if (word == "Mirelands"){
-            region = MapRegion::MIRELANDS;
-            break;
-        } else if (word == "Coastlands"){
-            region = MapRegion::COASTLANDS;
-            break;
-        } else if (word == "Highlands"){
-            region = MapRegion::HIGHLANDS;
-            break;
-        } else if (word == "Icelands"){
-            region = MapRegion::ICELANDS;
-            break;
-        }
-    }
-    if (region == MapRegion::NONE){
-        cout << "Error: filename should contain a region name (e.g. \"Fieldlands\")." << endl;
-        return 1;
-    } 
-
-    const QString mmo_revealed_image_path = parent_dir.filePath("_" + filename);
-    const QString mmo_revealed_txt_path = parent_dir.filePath("_" + fileinfo.baseName() + ".txt");
-
-    ImageRGB32 question_mark_image(filepath);
-    ImageRGB32 sprite_image(mmo_revealed_image_path.toStdString());
-    
-    if (!question_mark_image){
-        cerr << "Error: cannot load MMO quesiton mark image file " << filepath << endl;
-        return 1;
-    }
-    if (!sprite_image){
-        cerr << "Error: cannot load MMO revealed sprites image file " << mmo_revealed_image_path.toStdString() << endl;
-        return 1;
-    }
-
-    std::vector<std::string> target_sprites;
-    if (load_slug_list(mmo_revealed_txt_path.toStdString(), target_sprites) == false){
-        return 1;
-    }
-
-    cout << "Target sprites: " << target_sprites.size() << " total" << endl;
-    for(const auto& slug : target_sprites){
-        cout << "- " << slug << endl;
-    }
-
-    MMOQuestionMarkDetector detector(logger);
-
-    std::vector<ImagePixelBox> quest_results = detector.detect_MMOs_on_region_map(question_mark_image);
-    std::sort(quest_results.begin(), quest_results.end(), [](const ImagePixelBox& a, const ImagePixelBox& b) -> bool {
-        if (a.center_y() < b.center_y()) {
-            return true;
-        }
-        if (a.center_y() > b.center_y()) {
-            return false;
-        }
-        return a.center_x() < b.center_x();
-    });
-
-    cout << "Detect MMO question marks:" << endl;
-    for(const auto& box : quest_results){
-        cout << "- " << box.center_x() << ", " << box.center_y() << " " << box.width() << " x " << box.height() << endl;
-    }
-
-    if (quest_results.size() != target_sprites.size()){
-        cerr << "Error: the number of MMO question marks detected is not correct: " << quest_results.size() << " should be " << 
-            target_sprites.size() << endl;
-        return 1;
-    }
-
-    // static int count = 0;
-    ImageRGB32 output_sprite = sprite_image.copy();
-    ImageRGB32 output_quest = question_mark_image.copy();
-    std::vector<ImagePixelBox> new_boxes;
-    for (size_t i = 0; i < quest_results.size(); i++){
-        auto box = quest_results[i];
-        draw_box(output_quest, box, combine_rgb(255, 0, 0));
-        draw_box(output_sprite, box, combine_rgb(255, 0, 0));
-
-        pxint_t radius = (pxint_t)((box.width() + box.height()) / 4 + 0.5);
-        pxint_t center_x = (pxint_t)box.center_x();
-        pxint_t center_y = (pxint_t)box.center_y();
-        auto new_box = ImagePixelBox(center_x - radius, center_y - radius, center_x + radius, center_y + radius);
-        new_boxes.push_back(new_box);
-        
-        // std::ostringstream os;
-        // os << "test_sprite_" << count << "_" << std::setfill('0') << std::setw(2) << i << ".png";
-        // std::string sprite_filename = os.str();
-        // extract_box_reference(sprite_image, new_box).save(sprite_filename);
-    }
-    // output_quest.save("test_MMO_question_mark_detection_" + std::to_string(count) + ".png");
-    // output_sprite.save("test_sprite_detection_" + std::to_string(count) + ".png");
-
-    size_t success_count = 0;
-    for (size_t i = 0; i < quest_results.size(); i++){
-        // XXX
-        // if (i != 9){
-            // continue;
-        // }
-        cout << "--------------------------------------------------------------------" << endl;
-        cout << i << ": Target slug: " << target_sprites[i] << endl;
-
-        bool debug_mode = false;
-        auto result = match_sprite_on_map(logger, sprite_image, new_boxes[i], region, debug_mode);
-        if (result.slug == target_sprites[i]){
-            success_count++;
-            cout << "Match SUCCESS" << endl;
-        } else{
-            cout << "Match FAILURE" << endl;
-        }
-    }
-
-    if (success_count == target_sprites.size()){
-        cout << "ALL SUCCESS" << endl;
-    }else{
-        cout << "FAILURE: " << target_sprites.size() - success_count << "/" << target_sprites.size() << endl;
-        return 1;
-    }
-    // count++;
-    
-    return 0;
-}
-
-int test_pokemonLA_MapWeatherAndTimeReader(const ImageViewRGB32& image, const std::vector<std::string>& keywords){
-    // two keywords: <Weather name> <Time of day name>
-    if (keywords.size() < 2){
-        cerr << "Error: not enough number of keywords in the filename. Found only " << keywords.size() << "." << endl;
-        return 1;
-    }
-
-    const auto& target_weather = keywords[keywords.size()-2];
-    const auto& target_time = keywords[keywords.size()-1];
-
-    auto& logger = global_logger_command_line();
-    const std::string weather_result = WEATHER_NAMES[(int)detect_weather_on_map(logger, image)];
-    const std::string time_result = TIME_OF_DAY_NAMES[(int)detect_time_of_day_on_map(logger, image)];
-    
-    TEST_RESULT_COMPONENT_EQUAL(weather_result, target_weather, "weather");
-    TEST_RESULT_COMPONENT_EQUAL(time_result, target_time, "time of day");
-
-    
-    return 0;
-}
-
-int test_pokemonLA_FlagTracker_performance(const ImageViewRGB32& image, int num_iterations){
-    auto& logger = global_logger_command_line();
-    auto overlay = DummyVideoOverlay();
-    FlagTracker tracker(logger, overlay);
-
-    auto time_start = current_time();
-    for(int i = 0; i < num_iterations; i++){
-        tracker.process_frame(image, current_time());
-    }
-    auto time_end = current_time();
-    const double ms = std::chrono::duration_cast<Milliseconds>(time_end - time_start).count() / (double)num_iterations;
-    cout << "Time: " << ms << " ms, " << ms / 1000. << " s" << endl;
-
-    return 0;
-}
-
-}
diff --git a/SerialPrograms/Source/Tests/PokemonLA_Tests.h b/SerialPrograms/Source/Tests/PokemonLA_Tests.h
deleted file mode 100644
index ceac03344b..0000000000
--- a/SerialPrograms/Source/Tests/PokemonLA_Tests.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*  PokemonLA Tests
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *  
- *  
- */
-
-
-#ifndef PokemonAutomation_Tests_PokemonLA_Tests_H
-#define PokemonAutomation_Tests_PokemonLA_Tests_H
-
-#include <vector>
-#include <string>
-
-#include "CommonFramework/AudioPipeline/AudioFeed.h"
-
-namespace PokemonAutomation{
-
-class ImageViewRGB32;
-
-
-int test_pokemonLA_BattleMenuDetector(const ImageViewRGB32& image, bool target);
-
-int test_pokemonLA_BattlePokemonSwitchDetector(const ImageViewRGB32& image, bool target);
-
-int test_pokemonLA_TransparentDialogueDetector(const ImageViewRGB32& image, bool target);
-
-int test_pokemonLA_EventDialogDetector(const ImageViewRGB32& image, bool target);
-
-int test_pokemonLA_DialogueYellowArrowDetector(const ImageViewRGB32& image, bool target);
-
-int test_pokemonLA_BlackOutDetector(const ImageViewRGB32& image, bool target);
-
-int test_pokemonLA_BattleStartDetector(const ImageViewRGB32& image, bool target);
-
-int test_pokemonLA_MMOQuestionMarkDetector(const ImageViewRGB32& image,  const std::vector<std::string>& keywords);
-
-int test_pokemonLA_StatusInfoScreenDetector(const ImageViewRGB32& image, const std::vector<std::string>& keywords);
-
-int test_pokemonLA_WildPokemonFocusDetector(const ImageViewRGB32& image, const std::vector<std::string>& keywords);
-
-int test_pokemonLA_BattleSpriteWatcher(const ImageViewRGB32& image, const std::vector<std::string>& keywords);
-
-int test_pokemonLA_SaveScreenDetector(const ImageViewRGB32& image, const std::vector<std::string>& keywords);
-
-int test_pokemonLA_MapMarkerLocator(const ImageViewRGB32& image, float target_angle, float threshold);
-
-int test_pokemonLA_MapZoomLevelReader(const ImageViewRGB32& image, int target);
-
-int test_pokemonLA_BattleSpriteArrowDetector(const ImageViewRGB32& image, int target);
-
-int test_pokemonLA_MapMissionTabReader(const ImageViewRGB32& image, bool target);
-
-void test_pokemonLA_BerryTreeDetector(const ImageViewRGB32& image);
-
-int test_pokemonLA_shinySoundDetector(const std::vector<AudioSpectrum>& spectrums, bool target);
-
-int test_pokemonLA_MMOSpriteMatcher(const std::string& filepath);
-
-int test_pokemonLA_MapWeatherAndTimeReader(const ImageViewRGB32& image, const std::vector<std::string>& keywords);
-
-int test_pokemonLA_FlagTracker_performance(const ImageViewRGB32& image, int num_iterations);
-
-}
-
-#endif
diff --git a/SerialPrograms/Source/Tests/PokemonSV_Tests.cpp b/SerialPrograms/Source/Tests/PokemonSV_Tests.cpp
deleted file mode 100644
index 6a8e3b5ece..0000000000
--- a/SerialPrograms/Source/Tests/PokemonSV_Tests.cpp
+++ /dev/null
@@ -1,446 +0,0 @@
-/*  PokemonSV Tests
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-
-#include "Common/Compiler.h"
-#include "PokemonSV_Tests.h"
-#include "TestUtils.h"
-
-#include "PokemonSV/Inference/Battles/PokemonSV_NormalBattleMenus.h"
-#include "PokemonSV/Inference/Boxes/PokemonSV_BoxDetection.h"
-#include "PokemonSV/Inference/Boxes/PokemonSV_BoxEggDetector.h"
-#include "PokemonSV/Inference/Boxes/PokemonSV_BoxGenderDetector.h"
-#include "PokemonSV/Inference/Boxes/PokemonSV_BoxShinyDetector.h"
-#include "PokemonSV/Inference/PokemonSV_MapDetector.h"
-#include "PokemonSV/Inference/Tera/PokemonSV_TeraCardDetector.h"
-#include "PokemonSV/Inference/Tera/PokemonSV_TeraSilhouetteReader.h"
-#include "PokemonSV/Inference/Tera/PokemonSV_TeraTypeReader.h"
-#include "PokemonSV/Inference/Picnics/PokemonSV_PicnicDetector.h"
-#include "PokemonSV/Inference/Picnics/PokemonSV_SandwichRecipeDetector.h"
-#include "PokemonSV/Inference/Picnics/PokemonSV_SandwichHandDetector.h"
-#include "PokemonSV/Inference/Picnics/PokemonSV_SandwichIngredientDetector.h"
-#include "PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h"
-#include "PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h"
-
-#include <iostream>
-using std::cout;
-using std::cerr;
-using std::endl;
-
-namespace PokemonAutomation{
-
-using namespace NintendoSwitch::PokemonSV;
-
-int test_pokemonSV_MapDetector(const ImageViewRGB32& image, const std::vector<std::string>& words){
-    // two words: <Map ready to exit> <In fixed view (instead of the rotated view)>
-    if (words.size() < 2){
-        cerr << "Error: not enough number of words in the filename. Found only " << words.size() << "." << endl;
-        return 1;
-    }
-
-    bool target_map_existence = false;
-    if (parse_bool(words[words.size()-2], target_map_existence) == false){
-        cerr << "Error: True/False word " << words[words.size()-2] << " is wrong. Must be \"True\" or \"False\"." << endl;
-        return 1;
-    }
-
-    bool target_is_fixed_view = false;
-    if (parse_bool(words[words.size()-1], target_is_fixed_view) == false){
-        cerr << "Error: True/False word " << words[words.size()-1] << " is wrong. Must be \"True\" or \"False\"." << endl;
-        return 1;
-    }
-
-    MapExitDetector map_exit_detector;
-    bool result_map = map_exit_detector.detect(image);
-
-    TEST_RESULT_EQUAL(result_map, target_map_existence);
-
-    if (result_map) {
-
-        MapFixedViewDetector map_fixed_view_detector;
-        MapRotatedViewDetector map_rotated_view_detected;
-        
-        bool result_fixed = map_fixed_view_detector.detect(image);
-        bool result_rotated = map_rotated_view_detected.detect(image);
-
-        TEST_RESULT_EQUAL(result_fixed, target_is_fixed_view);
-        TEST_RESULT_EQUAL(result_rotated, !target_is_fixed_view);
-    }
-
-    return 0;
-}
-
-int test_pokemonSV_PicnicDetector(const ImageViewRGB32& image, bool target){
-    PicnicDetector detector;
-
-    const bool result = detector.detect(image);
-    TEST_RESULT_EQUAL(result, target);
-
-    return 0;
-}
-
-int test_pokemonSV_TeraCardFinder(const ImageViewRGB32& image, bool target){
-    TeraCardWatcher detector(COLOR_RED);
-
-    bool result = detector.process_frame(image, current_time());
-    TEST_RESULT_EQUAL(result, false);
-
-    result = detector.process_frame(image, current_time() + std::chrono::milliseconds(250));
-    TEST_RESULT_EQUAL(result, target);
-    return 0;
-}
-
-int test_pokemonSV_TerastallizingDetector(const ImageViewRGB32& image, bool target){
-    TerastallizingDetector detector(COLOR_RED);
-
-    bool result = detector.detect(image);
-    TEST_RESULT_EQUAL(result, target);
-    return 0;
-}
-
-int test_pokemonSV_TeraSilhouetteReader(const ImageViewRGB32& image, const std::vector<std::string>& keywords){
-    TeraSilhouetteReader reader(COLOR_RED);
-    
-    ImageMatch::ImageMatchResult slugs = reader.read(image);
-    if (slugs.results.empty()){
-        cerr << "No silhouette detected" << endl;
-        return 1;
-    }
-    std::string best_match = slugs.results.begin()->second;
-
-    if (keywords.empty()){
-        cerr << "Must provide a pokemon silhouette slug" << endl;
-        return 1;
-    }
-    TEST_RESULT_EQUAL(best_match, keywords[keywords.size() - 1]);
-
-    return 0;
-}
-
-int test_pokemonSV_TeraTypeReader(const ImageViewRGB32& image, const std::vector<std::string>& keywords){
-    TeraTypeReader reader(COLOR_RED);
-
-    ImageMatch::ImageMatchResult types = reader.read(image);
-    if (types.results.empty()){
-        return 1;
-    }
-    std::string best_match = types.results.begin()->second;
-
-    if (keywords.empty()){
-        return 1;
-    }
-    TEST_RESULT_EQUAL(best_match, keywords[keywords.size() - 1]);
-
-    return 0;
-}
-
-int test_pokemonSV_SandwichRecipeDetector(const ImageViewRGB32& image, const std::vector<std::string>& words) {
-    auto& logger = global_logger_command_line();
-
-    // seven words: the sandwich recipe IDs on the screen. Order:
-    // --------------------------------------
-    // recipe_IDs[0]  |   recipe_IDs[1]
-    // recipe_IDs[2]  |   recipe_IDs[3]
-    // recipe_IDs[4]  |   recipe_IDs[5]
-    // --------------------------------------
-    // plus the current selected cell ID (range [0, 5]).
-    if (words.size() < 7){
-        cerr << "Error: not enough number of words in the filename. Found only " << words.size() << "." << endl;
-        return 1;
-    }
-
-    int target_IDs[6] = {0, 0, 0, 0, 0, 0};
-    for(int i = 0; i < 6; i++){
-        const auto& word = words[words.size() + i - 7];
-        if (parse_int(word, target_IDs[i]) == false || target_IDs[i] > 151){
-            cerr << "Error: word " << words[words.size() + i - 7] << " is wrong. Must be an integer < 151. " << endl;
-            return 1;
-        }
-    }
-
-    SandwichRecipeNumberDetector detector(logger);
-
-    size_t detected_IDs[6] = {0, 0, 0, 0, 0, 0};
-    detector.detect_recipes(image, detected_IDs);
-
-    for(int i = 0; i < 6; i++){
-        if (target_IDs[i] < 0){
-            continue;
-        }
-        TEST_RESULT_COMPONENT_EQUAL(detected_IDs[i], (size_t)target_IDs[i], "recipe at cell " + std::to_string(i));
-    }
-
-    int target_selection = 0;
-    if (parse_int(words[words.size()-1], target_selection) == false || target_selection < 0 || target_selection >= 6){
-        cerr << "Error: word " << words[words.size()-1] << " is wrong. Must be an integer in range [0, 6). " << endl;
-    }
-    SandwichRecipeSelectionWatcher selection_watcher;
-    bool result = selection_watcher.process_frame({image.copy(), current_time()});
-
-    TEST_RESULT_COMPONENT_EQUAL(result, true, "SandwichRecipeSelectionWatcher::process_frame() result");
-
-    int selected_cell = selection_watcher.selected_recipe_cell();
-
-    TEST_RESULT_COMPONENT_EQUAL(selected_cell, target_selection, "selected cell");
-
-    return 0;
-}
-
-int test_pokemonSV_SandwichHandDetector(const ImageViewRGB32& image, const std::vector<std::string>& words){
-    // five words: hand_type("Free"/"Grabbing"), <image float box (four words total)>
-    if (words.size() < 5){
-        cerr << "Error: not enough number of words in the filename. Found only " << words.size() << "." << endl;
-        return 1;
-    }
-
-    const auto& hand_type_word = words[words.size() - 5];
-    SandwichHandLocator::HandType hand_type = SandwichHandLocator::HandType::FREE;
-    if (hand_type_word == "Free"){
-        hand_type = SandwichHandLocator::HandType::FREE;
-    } else if (hand_type_word == "Grabbing"){
-        hand_type = SandwichHandLocator::HandType::GRABBING;
-    } else {
-        cerr << "Error: word " << hand_type_word << " should be \"Free\" or \"Grabbing\"." << endl;
-        return 1;
-    }
-
-    float box_values[4] = {0.0f};
-    for(int i = 0; i < 4; i++){
-        if (parse_float(words[words.size() - 4 + i], box_values[i]) == false){
-            cerr << "Error: word " << words[words.size() - 4 + i] << " should be a float, range [0.0, 1.0]" << endl;
-            return 1;
-        }
-    }
-
-    ImageFloatBox box(box_values[0], box_values[1], box_values[2], box_values[3]);
-
-    SandwichHandLocator detector(hand_type, box);
-
-    auto result = detector.detect(image);
-    bool has_hand = result.first >= 0.0;
-
-    TEST_RESULT_EQUAL(has_hand, true);
-
-    return 0;
-}
-
-int test_pokemonSV_BoxPokemonInfoDetector(const ImageViewRGB32& image, const std::vector<std::string>& words){
-    // two words: <shiny or not> <gender (1: male, 2: female, 3: genderless)
-    if (words.size() < 2){
-        cerr << "Error: not enough number of words in the filename. Found only " << words.size() << "." << endl;
-        return 1;
-    }
-
-    bool target_shiny = false;
-    int target_gender = 0;
-    if (parse_bool(words[words.size()-2], target_shiny) == false){
-        cerr << "Error: word " << words[words.size()-2] << " is wrong. Must be True or False. " << endl;
-        return 1;
-    }
-    if (parse_int(words[words.size()-1], target_gender) == false){
-        cerr << "Error: word " << words[words.size()-1] << " is wrong. Must be int (1: male, 2: female, 3: genderless). " << endl;
-        return 1;
-    }
-
-    SomethingInBoxSlotDetector sth_detector(COLOR_RED);
-    bool sth = sth_detector.detect(image);
-    TEST_RESULT_EQUAL(sth, true);
-
-    BoxShinyDetector shiny_detector;
-    bool shiny_result = shiny_detector.detect(image);
-
-    TEST_RESULT_EQUAL(shiny_result, target_shiny);
-
-    BoxGenderDetector gender_detector;
-    int gender_result = (int)gender_detector.detect(image);
-    TEST_RESULT_EQUAL(gender_result, target_gender);
-
-    return 0;
-}
-
-int test_pokemonSV_SomethingInBoxSlotDetector(const ImageViewRGB32& image, bool target){
-    SomethingInBoxSlotDetector sth_detector(COLOR_RED);
-    bool sth = sth_detector.detect(image);
-    TEST_RESULT_EQUAL(sth, target);
-
-    return 0;
-}
-
-int test_pokemonSV_BoxEggDetector(const ImageViewRGB32& image, bool target){
-    BoxCurrentEggDetector box_egg_detector(COLOR_RED);
-    bool egg = box_egg_detector.detect(image);
-    TEST_RESULT_EQUAL(egg, target);
-
-    return 0;
-}
-
-int test_pokemonSV_BoxPartyEggDetector(const ImageViewRGB32& image, int target){
-    uint8_t num_eggs = 0;
-    for(uint8_t i = 0; i < 5; i++){
-        BoxEggDetector detector(BoxCursorLocation::PARTY, i+1, 0);
-        if (detector.detect(image)){
-            num_eggs++;
-        }
-    }
-
-    TEST_RESULT_EQUAL((int)num_eggs, (int)target);
-    return 0;
-}
-
-int test_pokemonSV_OverworldDetector(const ImageViewRGB32& image, bool target){
-    OverworldDetector detector;
-    bool result = detector.detect(image);
-    TEST_RESULT_EQUAL(result, target);
-    return 0;
-}
-
-int test_pokemonSV_BoxBottomButtonDetector(const ImageViewRGB32& image, const std::vector<std::string>& words){
-    // two words: <button Y exists, true or false> <button B exists, true or false)
-    if (words.size() < 2){
-        cerr << "Error: not enough number of words in the filename. Found only " << words.size() << "." << endl;
-        return 1;
-    }
-
-    bool target_y = false, target_b = false;
-    if (parse_bool(words[words.size()-2], target_y) == false){
-        cerr << "Error: word " << words[words.size()-2] << " is wrong. Must be True or False." << endl;
-        return 1;
-    }
-    if (parse_bool(words[words.size()-1], target_b) == false){
-        cerr << "Error: word " << words[words.size()-1] << " is wrong. Must be True or False." << endl;
-        return 1;
-    }
-
-    BoxBottomButtonYDetector y_detector;
-    bool result_y = y_detector.detect(image);
-    TEST_RESULT_COMPONENT_EQUAL(result_y, target_y, "button Y");
-
-    // BoxBottomButtonBDetector b_detector;
-    // bool result_b = b_detector.detect(image);
-    // TEST_RESULT_COMPONENT_EQUAL(result_b, target_b, "button B");
-
-    return 0;
-}
-
-int test_pokemonSV_SandwichIngredientsDetector(const ImageViewRGB32& image, const std::vector<std::string>& words){
-    // three words: <current ingredient page "Fillings", "Condiments" or "Picks"> <how many fillings determined> <how many condiments determined>
-    if (words.size() < 3){
-        cerr << "Error: not enough number of words in the filename. Found only " << words.size() << "." << endl;
-        return 1;
-    }
-
-    std::string target_type = words[words.size() - 3];
-    bool is_condiments = target_type == "Condiments";
-    bool is_picks = target_type == "Picks";
-    if (!is_condiments && !is_picks && target_type != "Fillings"){
-        cerr << "Error: word " << words[words.size()-3] << " is wrong. Must be \"Fillings\", \"Condiments\" or \"Picks\"." << endl;
-        return 1;
-    }
-    int num_fillings = 0, num_condiments = 0;
-    if (parse_int(words[words.size()-2], num_fillings) == false){
-        cerr << "Error: word " << words[words.size()-2] << " is wrong. Must be int of range [0, 6]. " << endl;
-        return 1;
-    }
-    if (parse_int(words[words.size()-1], num_condiments) == false){
-        cerr << "Error: word " << words[words.size()-1] << " is wrong. Must be int of range [0, 4]. " << endl;
-        return 1;
-    }
-    
-    SandwichCondimentsPageDetector condiments_detector;
-    SandwichPicksPageDetector picks_detector;
-
-    bool condi_result = condiments_detector.detect(image);
-    TEST_RESULT_COMPONENT_EQUAL(condi_result, is_condiments, "condiments Page");
-
-    bool picks_result = picks_detector.detect(image);
-    TEST_RESULT_COMPONENT_EQUAL(picks_result, is_picks, "picks Page");
-
-    for(int i = 0; i < 10; i++){
-        auto type = (i < 6 ? SandwichIngredientType::FILLING : SandwichIngredientType::CONDIMENT);
-        size_t index = (i < 6 ? i : i - 6);
-        DeterminedSandwichIngredientDetector determined_detector(type, index);
-        bool target = (i < 6 ? i < num_fillings : i - 6 < num_condiments);
-        bool result = determined_detector.detect(image);
-
-        TEST_RESULT_COMPONENT_EQUAL(result, target, "ingredient slot " + std::to_string(i));
-    }
-
-    return 0;
-}
-
-int test_pokemonSV_SandwichIngredientReader(const ImageViewRGB32& image, const std::vector<std::string>& words){
-    // four words: <current ingredient page "Fillings" or "Condiments"> <language> <current selected ingredient index 0 to 9> <first ingredient> <second ingredient> ...
-    if (words.size() < 13){
-        cerr << "Error: not enough number of words in the filename. Found only " << words.size() << "." << endl;
-        return 1;
-    }
-    std::string target_type = words[words.size() - 13];
-    SandwichIngredientType sandwich_type;
-    if (target_type == "Fillings"){
-        sandwich_type = SandwichIngredientType::FILLING;
-    }
-    else if (target_type == "Condiments"){
-        sandwich_type = SandwichIngredientType::CONDIMENT;
-    }
-    else{
-        return 1;
-    }
-
-    Language language = language_code_to_enum(words[words.size() - 12]);
-    if (language == Language::None || language == Language::EndOfList){
-        cerr << "Error: language words " << words[words.size() - 2] << " is wrong." << endl;
-        return 1;
-    }
-
-    size_t selected_ingredient = 0;
-    if (parse_size_t(words[words.size() - 11], selected_ingredient) == false) {
-        cerr << "Error: word " << words[words.size() - 2] << " is wrong. Must be int of range [0, 9]. " << endl;
-        return 1;
-    }
-
-    for (size_t i = 0; i < 10; ++i){
-        SandwichIngredientReader reader(sandwich_type, i);
-        if (selected_ingredient == i){
-            // The icon matcher only works on the selected item, because we want to remove the yellow / orange background
-            ImageMatch::ImageMatchResult results = reader.read_with_icon_matcher(image);
-
-            if (results.results.empty()){
-                cerr << "No ingredient detected via icon matcher" << endl;
-                return 1;
-            }
-            std::string best_match_icon_matcher = results.results.begin()->second;
-            TEST_RESULT_COMPONENT_EQUAL(best_match_icon_matcher, words[words.size() - 10 + i], "image matcher : ingredient slot " + std::to_string(i));
-        }
-        {
-            OCR::StringMatchResult results = reader.read_with_ocr(image, global_logger_command_line(), language);
-
-            if (results.results.empty()){
-                cerr << "No ingredient detected via text" << endl;
-                return 1;
-            }
-            std::string best_match_ocr = results.results.begin()->second.token;
-            TEST_RESULT_COMPONENT_EQUAL(best_match_ocr, words[words.size() - 10 + i], "ocr : ingredient slot " + std::to_string(i));
-        }
-    }
-
-    return 0;
-}
-
-int test_pokemonSV_AdvanceDialogDetector(const ImageViewRGB32& image, bool target) {
-    AdvanceDialogDetector detector(COLOR_RED);
-    bool result = detector.detect(image);
-    TEST_RESULT_EQUAL(result, target);
-    return 0;
-}
-
-int test_pokemonSV_SwapMenuDetector(const ImageViewRGB32& image, bool target) {
-    SwapMenuDetector detector(COLOR_RED);
-    bool result = detector.detect(image);
-    TEST_RESULT_EQUAL(result, target);
-    return 0;
-}
-
-}
diff --git a/SerialPrograms/Source/Tests/PokemonSV_Tests.h b/SerialPrograms/Source/Tests/PokemonSV_Tests.h
deleted file mode 100644
index 6b270b4281..0000000000
--- a/SerialPrograms/Source/Tests/PokemonSV_Tests.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*  PokemonSV Tests
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *  
- *  
- */
-
-
-#ifndef PokemonAutomation_Tests_PokemonSV_Tests_H
-#define PokemonAutomation_Tests_PokemonSV_Tests_H
-
-#include <vector>
-#include <string>
-
-namespace PokemonAutomation{
-
-class ImageViewRGB32;
-
-int test_pokemonSV_MapDetector(const ImageViewRGB32& image, const std::vector<std::string>& words);
-
-int test_pokemonSV_PicnicDetector(const ImageViewRGB32& image, bool target);
-
-int test_pokemonSV_TeraCardFinder(const ImageViewRGB32& image, bool target);
-
-int test_pokemonSV_TerastallizingDetector(const ImageViewRGB32& image, bool target);
-
-int test_pokemonSV_TeraSilhouetteReader(const ImageViewRGB32& image, const std::vector<std::string>& keywords);
-
-int test_pokemonSV_TeraTypeReader(const ImageViewRGB32& image, const std::vector<std::string>& keywords);
-
-int test_pokemonSV_SandwichRecipeDetector(const ImageViewRGB32& image, const std::vector<std::string>& words);
-
-int test_pokemonSV_SandwichHandDetector(const ImageViewRGB32& image, const std::vector<std::string>& words);
-
-int test_pokemonSV_BoxPokemonInfoDetector(const ImageViewRGB32& image, const std::vector<std::string>& words);
-
-int test_pokemonSV_BoxEggDetector(const ImageViewRGB32& image, bool target);
-
-int test_pokemonSV_SomethingInBoxSlotDetector(const ImageViewRGB32& image, bool target);
-
-int test_pokemonSV_BoxPartyEggDetector(const ImageViewRGB32& image, int target);
-
-int test_pokemonSV_OverworldDetector(const ImageViewRGB32& image, bool target);
-
-int test_pokemonSV_BoxBottomButtonDetector(const ImageViewRGB32& image, const std::vector<std::string>& words);
-
-int test_pokemonSV_SandwichIngredientsDetector(const ImageViewRGB32& image, const std::vector<std::string>& words);
-
-int test_pokemonSV_SandwichIngredientReader(const ImageViewRGB32& image, const std::vector<std::string>& words);
-
-int test_pokemonSV_AdvanceDialogDetector(const ImageViewRGB32& image, bool target);
-
-int test_pokemonSV_SwapMenuDetector(const ImageViewRGB32& image, bool target);
-
-}
-
-#endif
diff --git a/SerialPrograms/Source/Tests/PokemonSwSh_Tests.cpp b/SerialPrograms/Source/Tests/PokemonSwSh_Tests.cpp
deleted file mode 100644
index 954b56783b..0000000000
--- a/SerialPrograms/Source/Tests/PokemonSwSh_Tests.cpp
+++ /dev/null
@@ -1,128 +0,0 @@
-/*  PokemonLA Tests
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-
-#include "Common/Compiler.h"
-#include "PokemonSwSh_Tests.h"
-#include "TestUtils.h"
-
-#include "PokemonSwSh/Inference/PokemonSwSh_BoxGenderDetector.h"
-#include "PokemonSwSh/Inference/PokemonSwSh_DialogTriangleDetector.h"
-#include "PokemonSwSh/Inference/PokemonSwSh_SelectionArrowFinder.h"
-#include "PokemonSwSh/Inference/PokemonSwSh_YCommDetector.h"
-#include "PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_BattleMenu.h"
-#include "PokemonSwSh/Inference/PokemonSwSh_DialogBoxDetector.h"
-#include "PokemonSwSh/Inference/PokemonSwSh_BoxShinySymbolDetector.h"
-
-#include <QFileInfo>
-#include <QDir>
-#include <cmath>
-#include <iostream>
-#include <iomanip>
-#include <sstream>
-#include <map>
-using std::cout;
-using std::cerr;
-using std::endl;
-
-namespace PokemonAutomation{
-
-using namespace NintendoSwitch::PokemonSwSh;
-
-int test_pokemonSwSh_YCommMenuDetector(const ImageViewRGB32& image, bool target){
-    YCommMenuDetector detector(true);
-
-    bool result = detector.process_frame(image, current_time());
-    TEST_RESULT_EQUAL(result, target);
-    return 0;
-}
-
-int test_pokemonSwSh_MaxLair_BattleMenuDetector(const ImageViewRGB32& image, bool target){
-    MaxLairInternal::BattleMenuDetector detector;
-
-    bool result = detector.detect(image);
-    TEST_RESULT_EQUAL(result, target);
-    return 0;
-}
-
-int test_pokemonSwSh_DialogTriangleDetector(const ImageViewRGB32& image, bool target){
-    auto& logger = global_logger_command_line();
-    auto overlay = DummyVideoOverlay();
-    const bool stop_on_detected = true;
-
-    DialogTriangleDetector detector(logger, overlay, stop_on_detected);
-
-    bool result = detector.process_frame(image, current_time());
-    TEST_RESULT_EQUAL(result, target);
-    return 0;    
-}
-
-int test_pokemonSwSh_RetrieveEggArrowFinder(const ImageViewRGB32& image, bool target){
-    auto overlay = DummyVideoOverlay();
-    RetrieveEggArrowFinder detector(overlay);
-
-    bool result = detector.process_frame(image, current_time());
-    TEST_RESULT_EQUAL(result, target);
-    return 0;
-}
-
-int test_pokemonSwSh_StoragePokemonMenuArrowFinder(const ImageViewRGB32& image, bool target){
-    auto overlay = DummyVideoOverlay();
-    StoragePokemonMenuArrowFinder detector(overlay);
-
-    bool result = detector.process_frame(image, current_time());
-    TEST_RESULT_EQUAL(result, target);
-    return 0;
-}
-
-int test_pokemonSwSh_CheckNurseryArrowFinder(const ImageViewRGB32& image, bool target){
-    auto overlay = DummyVideoOverlay();
-    CheckNurseryArrowFinder detector(overlay);
-
-    bool result = detector.process_frame(image, current_time());
-    TEST_RESULT_EQUAL(result, target);
-    return 0;
-}
-
-int test_pokemonSwSh_YCommIconDetector(const ImageViewRGB32& image, bool target){
-    const bool is_on = true;
-    YCommIconDetector detector(is_on);
-    bool result = detector.process_frame(image, current_time());
-    TEST_RESULT_EQUAL(result, target);
-    return 0;
-}
-
-int test_pokemonSwSh_RotomPhoneMenuArrowFinder(const ImageViewRGB32& image, int target){
-    auto overlay = DummyVideoOverlay();
-    RotomPhoneMenuArrowFinder finder(overlay);
-    int result = finder.detect(image);
-
-    TEST_RESULT_EQUAL(result, target);
-    return 0;
-}
-
-int test_pokemonSwSh_BlackDialogBoxDetector(const ImageViewRGB32& image, bool target){
-    const bool stop_on_detected = true;
-    BlackDialogBoxDetector detector(stop_on_detected);
-    bool result = detector.process_frame(image, current_time());
-    TEST_RESULT_EQUAL(result, target);
-    return 0;
-}
-
-int test_pokemonSwSh_BoxShinySymbolDetector(const ImageViewRGB32& image, bool target){
-    const bool result = BoxShinySymbolDetector::detect(image);
-    TEST_RESULT_EQUAL(result, target);
-    return 0;
-}
-
-int test_pokemonSwSh_BoxGenderDetector(const ImageViewRGB32& image, int target){
-    BoxGenderDetector detector;
-    const int result = int(detector.detect(image));
-    TEST_RESULT_EQUAL(result, target);
-    return 0;
-}
-
-}
diff --git a/SerialPrograms/Source/Tests/PokemonSwSh_Tests.h b/SerialPrograms/Source/Tests/PokemonSwSh_Tests.h
deleted file mode 100644
index af50469e7f..0000000000
--- a/SerialPrograms/Source/Tests/PokemonSwSh_Tests.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*  PokemonLA Tests
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *  
- *  
- */
-
-
-#ifndef PokemonAutomation_Tests_PokemonSwSh_Tests_H
-#define PokemonAutomation_Tests_PokemonSwSh_Tests_H
-
-#include <vector>
-#include <string>
-
-namespace PokemonAutomation{
-
-class ImageViewRGB32;
-
-int test_pokemonSwSh_YCommMenuDetector(const ImageViewRGB32& image, bool target);
-
-int test_pokemonSwSh_MaxLair_BattleMenuDetector(const ImageViewRGB32& image, bool target);
-
-int test_pokemonSwSh_DialogTriangleDetector(const ImageViewRGB32& image, bool target);
-
-int test_pokemonSwSh_RetrieveEggArrowFinder(const ImageViewRGB32& image, bool target);
-
-int test_pokemonSwSh_StoragePokemonMenuArrowFinder(const ImageViewRGB32& image, bool target);
-
-int test_pokemonSwSh_CheckNurseryArrowFinder(const ImageViewRGB32& image, bool target);
-
-int test_pokemonSwSh_YCommIconDetector(const ImageViewRGB32& image, bool target);
-
-int test_pokemonSwSh_RotomPhoneMenuArrowFinder(const ImageViewRGB32& image, int target);
-
-int test_pokemonSwSh_BlackDialogBoxDetector(const ImageViewRGB32& image, bool target);
-
-int test_pokemonSwSh_BoxShinySymbolDetector(const ImageViewRGB32& image, bool target);
-
-int test_pokemonSwSh_BoxGenderDetector(const ImageViewRGB32& image, int target);
-
-}
-
-#endif
diff --git a/SerialPrograms/Source/Tests/TestMap.cpp b/SerialPrograms/Source/Tests/TestMap.cpp
deleted file mode 100644
index 4ebfdca2a7..0000000000
--- a/SerialPrograms/Source/Tests/TestMap.cpp
+++ /dev/null
@@ -1,287 +0,0 @@
-/*  Test Map
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-
-#include "Common/Cpp/Containers/AlignedVector.tpp"
-#include "CommonFramework_Tests.h"
-#include "Kernels_Tests.h"
-#include "NintendoSwitch_Tests.h"
-#include "PokemonLA_Tests.h"
-#include "PokemonSwSh_Tests.h"
-#include "PokemonSV_Tests.h"
-#include "TestMap.h"
-#include "TestUtils.h"
-#include "CommonFramework/AudioPipeline/AudioTemplate.h"
-
-#include <QFileInfo>
-
-#include <iostream>
-#include <algorithm>
-#include <string>
-using std::cout;
-using std::cerr;
-using std::endl;
-
-using namespace std::placeholders;  // for _1, _2, _3... with std::bind()
-
-namespace PokemonAutomation{
-
-
-// For each test object, TestFunction will do the work of skipping non-test
-// files, read data from test file names or gold files and possibly more.
-// To reuse the code, we design the following helper functions.
-
-using ImageFilenameFunction = std::function<int(const ImageViewRGB32& image, const std::string& filename_base)>;
-
-using ImageBoolDetectorFunction = std::function<int(const ImageViewRGB32& image, bool target)>;
-
-using ImageFloatDetectorFunction = std::function<int(const ImageViewRGB32& image, float target, float threshold)>;
-
-using ImageIntDetectorFunction = std::function<int(const ImageViewRGB32& image, int target)>;
-
-using ImageWordsDetectorFunction = std::function<int(const ImageViewRGB32& image, const std::vector<std::string>& words)>;
-
-using ImageVoidDetectorFunction = std::function<void(const ImageViewRGB32& image)>;
-
-using SoundBoolDetectorFunction = std::function<int(const std::vector<AudioSpectrum>& spectrums, bool target)>;
-
-// Basic check on whether an image can be loaded.
-// Also strip the image format suffix (.png and so on)
-
-// Helper for testing code that reads an image and uses filename to get the target outcome for the code.
-// test_func: reads an image and the image filename base and returns an int code.
-int image_filename_detector_helper(ImageFilenameFunction test_func, const std::string& test_path){
-    ImageRGB32 image;
-    std::string basename;
-    try{
-        image = ImageRGB32(test_path);
-        
-        QFileInfo file_info(QString::fromStdString(test_path));
-        std::string full_name = file_info.fileName().toStdString();
-
-        // Find the basename (full name without file extension)
-        // QFileInfo has a function basename() to get basename, but we shouldn't use it
-        // because for a filename like Free_0.421_0.024_0.163_0.174.png where floating point values are
-        // put into the filename, QFileInfo::basename() will return a basename of "Free_0". It finds the
-        // first "." as the separation for extension, not the last.
-        size_t dot_loc = full_name.find_last_of(".");
-        basename = full_name.substr(0, dot_loc);
-        cout << "Parse file path: file name: " << full_name << ", base name: " << basename << endl;
-    }catch (FileException&){
-        cout << "Skip " << test_path << " as it cannot be read as image" << endl;
-        return -1;
-    }
-    return test_func(image, basename);
-}
-
-
-// Helper for testing detector code that reads an image and returns true or false.
-// The target test result (whether this test file should be detected as true or false)
-// is stored as part of the filename. For example, IngoBattleDayTime_True.png.
-int image_bool_detector_helper(ImageBoolDetectorFunction test_func, const std::string& test_path){
-    auto parse_filename_and_run_test = [&](const ImageViewRGB32& image, const std::string& filename_base){
-        const auto name_base = QString::fromStdString(filename_base);
-        bool target_bool = false;
-        if (name_base.endsWith("_True")){
-            target_bool = true;
-        } else if (name_base.endsWith("_False")){
-            target_bool = false;
-        } else{
-            cerr << "Error: image test file " << test_path << " has incorrect target detection result (_True/_False) set in the filename." << endl;
-            return 1;
-        }
-
-        return test_func(image, target_bool);
-    };
-
-    return image_filename_detector_helper(parse_filename_and_run_test, test_path);
-}
-
-// Helper for testing detector code that reads an image and returns some custom data that can be described
-// by words included in the test filename.
-// The helper will split the filename by "_" into words and send it in the same order to the test function.
-int image_words_detector_helper(ImageWordsDetectorFunction test_func, const std::string& test_path){
-    auto parse_filename_and_run_test = [&](const ImageViewRGB32& image, const std::string& filename_base){
-        return test_func(image, parse_words(filename_base));
-    };
-
-    return image_filename_detector_helper(parse_filename_and_run_test, test_path);
-}
-
-// Helper for testing detector code that reads an image and returns a non-negative float that can be described
-// in the filename for example <name_base>_0.4.png.
-int image_non_negative_float_detector_helper(ImageFloatDetectorFunction test_func, const std::string& test_path){
-    auto parse_filename_and_run_test = [&](const ImageViewRGB32& image, const std::vector<std::string>& words) -> int{
-        if (words.size() < 2){
-            cerr << "Error: image test file " << test_path << " does not have two non-negative floats (e.g image_0.4_0.001.png) set in the filename." << endl;
-            return 1;
-        }
-
-        float target_number = 0.0f, threshold = 0.0f;
-
-        if (parse_float(words[words.size()-2], target_number) == false || parse_float(words[words.size()-1], threshold) == false){
-            cerr << "Error: image test file " << test_path << " does not have two non-negative floats (e.g image_0.4_0.001.png) set in the filename." << endl;
-            return 1;
-        }
-
-        return test_func(image, target_number, threshold);
-    };
-
-    return image_words_detector_helper(parse_filename_and_run_test, test_path);
-}
-
-int image_int_detector_helper(ImageIntDetectorFunction test_func, const std::string& test_path){
-    auto parse_filename_and_run_test = [&](const ImageViewRGB32& image, const std::vector<std::string>& words) -> int{
-        if (words.size() == 0){
-            cerr << "Error: image test file " << test_path << " does not have an int (e.g image_5.png) set in the filename." << endl;
-            return 1;
-        }
-
-        int target_number = 0;
-
-        if (parse_int(words[words.size()-1], target_number) == false){
-            cerr << "Error: image test file " << test_path << " does not have an int (e.g image_5.png) set in the filename." << endl;
-            return 1;
-        }
-
-        return test_func(image, target_number);
-    };
-
-    return image_words_detector_helper(parse_filename_and_run_test, test_path);
-}
-
-
-// Helper for testing sdetector code that reads an image and returns nothing.
-// This is used for developing visual inference code where the developer writes custom
-// debugging output. So no need to get target values from the test framework.
-int image_void_detector_helper(ImageVoidDetectorFunction test_func, const std::string& test_path){
-    auto run_test = [&](const ImageViewRGB32& image, const std::string&) -> int{
-        test_func(image);
-        return 0;
-    };
-
-    return image_filename_detector_helper(run_test, test_path);
-}
-
-
-// Basic check on whether an image can be loaded.
-// Also strip the image format suffix (.png and so on)
-
-int sound_bool_detector_helper(SoundBoolDetectorFunction test_func, const std::string& test_path){
-    QFileInfo file_info(QString::fromStdString(test_path));
-    std::string filename = file_info.fileName().toStdString();
-
-    // Search for the target test result from test filename.
-    const size_t target_pos = filename.rfind('.');
-    if (target_pos == std::string::npos){
-        cerr << "Error: image test file " << test_path << " has no \".\" in the filename." << endl;
-        return 1;
-    }
-
-    // cout << "Test file: " << test_path << endl;
-    const auto filename_base = filename.substr(0, target_pos);
-
-    const auto name_base = QString::fromStdString(filename_base);
-    bool target_bool = false;
-    if (name_base.endsWith("_True")){
-        target_bool = true;
-    } else if (name_base.endsWith("_False")){
-        target_bool = false;
-    } else{
-        cerr << "Error: audio test file " << test_path << " has incorrect target detection result (_True/_False) set in the filename." << endl;
-        return 1;
-    }
-
-
-
-    // XXX for now we assume the audio in the command line test is always 48000.
-    //     in future we can read sample rate from filename
-    size_t sample_rate = 48000;
-    AudioTemplate audio_stream = loadAudioTemplate(test_path, sample_rate);
-    std::vector<AudioSpectrum> spectrums;
-    for(size_t i = 0; i < audio_stream.numWindows(); i++){
-        // AudioSpectrum(size_t s, size_t rate, std::shared_ptr<const AlignedVector<float>> m);
-        AlignedVector<float> freq_mag(audio_stream.numFrequencies());
-        memcpy(freq_mag.data(), audio_stream.getWindow(i), sizeof(float) * audio_stream.numFrequencies());
-        spectrums.emplace_back(0, sample_rate, std::make_shared<const AlignedVector<float>>(std::move(freq_mag)));
-    }
-
-    // Need to reverse spectrums, because audio detector interface accepts sepctrum vector in the order of
-    // from newest (largest timestamp) to oldest (smallest timestamp) in the vector.
-    std::reverse(spectrums.begin(), spectrums.end());
-
-    return test_func(spectrums, target_bool);
-}
-
-
-
-
-const std::map<std::string, TestFunction> TEST_MAP = {
-    {"Kernels_ImageScaleBrightness", std::bind(image_void_detector_helper, test_kernels_ImageScaleBrightness, _1)},
-    {"CommonFramework_BlackBorderDetector", std::bind(image_bool_detector_helper, test_CommonFramework_BlackBorderDetector, _1)},
-    {"NintendoSwitch_UpdateMenuDetector", std::bind(image_bool_detector_helper, test_NintendoSwitch_UpdateMenuDetector, _1)},
-    {"PokemonSwSh_YCommMenuDetector", std::bind(image_bool_detector_helper, test_pokemonSwSh_YCommMenuDetector, _1)},
-    {"PokemonSwSh_MaxLair_BattleMenuDetector", std::bind(image_bool_detector_helper, test_pokemonSwSh_MaxLair_BattleMenuDetector, _1)},
-    {"PokemonSwSh_DialogTriangleDetector", std::bind(image_bool_detector_helper, test_pokemonSwSh_DialogTriangleDetector, _1)},
-    {"PokemonSwSh_RetrieveEggArrowFinder", std::bind(image_bool_detector_helper, test_pokemonSwSh_RetrieveEggArrowFinder, _1)},
-    {"PokemonSwSh_YCommIconDetector", std::bind(image_bool_detector_helper, test_pokemonSwSh_YCommIconDetector, _1)},
-    {"PokemonSwSh_RotomPhoneMenuArrowFinder", std::bind(image_int_detector_helper, test_pokemonSwSh_RotomPhoneMenuArrowFinder, _1)},
-    {"PokemonSwSh_StoragePokemonMenuArrowFinder", std::bind(image_bool_detector_helper, test_pokemonSwSh_StoragePokemonMenuArrowFinder, _1)},
-    {"PokemonSwSh_CheckNurseryArrowFinder", std::bind(image_bool_detector_helper, test_pokemonSwSh_CheckNurseryArrowFinder, _1)},
-    {"PokemonSwSh_BlackDialogBoxDetector", std::bind(image_bool_detector_helper, test_pokemonSwSh_BlackDialogBoxDetector, _1)},
-    {"PokemonSwSh_BoxShinySymbolDetector", std::bind(image_bool_detector_helper, test_pokemonSwSh_BoxShinySymbolDetector, _1)},
-    {"PokemonSwSh_BoxGenderDetector", std::bind(image_int_detector_helper, test_pokemonSwSh_BoxGenderDetector, _1)},
-    {"PokemonLA_BattleMenuDetector", std::bind(image_bool_detector_helper, test_pokemonLA_BattleMenuDetector, _1)},
-    {"PokemonLA_BattlePokemonSwitchDetector", std::bind(image_bool_detector_helper, test_pokemonLA_BattlePokemonSwitchDetector, _1)},
-    {"PokemonLA_TransparentDialogueDetector", std::bind(image_bool_detector_helper, test_pokemonLA_TransparentDialogueDetector, _1)},
-    {"PokemonLA_EventDialogDetector", std::bind(image_bool_detector_helper, test_pokemonLA_EventDialogDetector, _1)},
-    {"PokemonLA_DialogueYellowArrowDetector", std::bind(image_bool_detector_helper, test_pokemonLA_DialogueYellowArrowDetector, _1)},
-    {"PokemonLA_BlackOutDetector", std::bind(image_bool_detector_helper, test_pokemonLA_BlackOutDetector, _1)},
-    {"PokemonLA_BattleStartDetector", std::bind(image_bool_detector_helper, test_pokemonLA_BattleStartDetector, _1)},
-    {"PokemonLA_BerryTreeDetector", std::bind(image_void_detector_helper, test_pokemonLA_BerryTreeDetector, _1)},
-    {"PokemonLA_MMOQuestionMarkDetector", std::bind(image_words_detector_helper, test_pokemonLA_MMOQuestionMarkDetector, _1)},
-    {"PokemonLA_StatusInfoScreenDetector", std::bind(image_words_detector_helper, test_pokemonLA_StatusInfoScreenDetector, _1)},
-    {"PokemonLA_WildPokemonFocusDetector", std::bind(image_words_detector_helper, test_pokemonLA_WildPokemonFocusDetector, _1)},
-    {"PokemonLA_BattleSpriteWatcher", std::bind(image_words_detector_helper, test_pokemonLA_BattleSpriteWatcher, _1)},
-    {"PokemonLA_SaveScreenDetector", std::bind(image_words_detector_helper, test_pokemonLA_SaveScreenDetector, _1)},
-    {"PokemonLA_MapMarkerLocator", std::bind(image_non_negative_float_detector_helper, test_pokemonLA_MapMarkerLocator, _1)},
-    {"PokemonLA_MapZoomLevelReader", std::bind(image_int_detector_helper, test_pokemonLA_MapZoomLevelReader, _1)},
-    {"PokemonLA_BattleSpriteArrowDetector", std::bind(image_int_detector_helper, test_pokemonLA_BattleSpriteArrowDetector, _1)},
-    {"PokemonLA_MapMissionTabReader", std::bind(image_bool_detector_helper, test_pokemonLA_MapMissionTabReader, _1)},
-    {"PokemonLA_ShinySoundDetector", std::bind(sound_bool_detector_helper, test_pokemonLA_shinySoundDetector, _1)},
-    {"PokemonLA_MMOSpriteMatcher", test_pokemonLA_MMOSpriteMatcher},
-    {"PokemonLA_MapWeatherAndTimeReader", std::bind(image_words_detector_helper, test_pokemonLA_MapWeatherAndTimeReader, _1)},
-    {"PokemonLA_FlagTrackerPerformance", std::bind(image_int_detector_helper, test_pokemonLA_FlagTracker_performance, _1)},
-    {"PokemonSV_MapDetector", std::bind(image_words_detector_helper, test_pokemonSV_MapDetector, _1)},
-    {"PokemonSV_PicnicDetector", std::bind(image_bool_detector_helper, test_pokemonSV_PicnicDetector, _1)},
-    {"PokemonSV_TeraCardFinder", std::bind(image_bool_detector_helper, test_pokemonSV_TeraCardFinder, _1)},
-    {"PokemonSV_TerastallizingDetector", std::bind(image_bool_detector_helper, test_pokemonSV_TerastallizingDetector, _1)},
-    {"PokemonSV_TeraSilhouetteReader", std::bind(image_words_detector_helper, test_pokemonSV_TeraSilhouetteReader, _1)},
-    {"PokemonSV_TeraTypeReader", std::bind(image_words_detector_helper, test_pokemonSV_TeraTypeReader, _1)},
-    {"PokemonSV_SandwichRecipeDetector", std::bind(image_words_detector_helper, test_pokemonSV_SandwichRecipeDetector, _1)},
-    {"PokemonSV_SandwichHandDetector", std::bind(image_words_detector_helper, test_pokemonSV_SandwichHandDetector, _1)},
-    {"PokemonSV_BoxPokemonInfoDetector", std::bind(image_words_detector_helper, test_pokemonSV_BoxPokemonInfoDetector, _1)},
-    {"PokemonSV_SomethingInBoxSlotDetector", std::bind(image_bool_detector_helper, test_pokemonSV_SomethingInBoxSlotDetector, _1)},
-    {"PokemonSV_BoxEggDetector", std::bind(image_bool_detector_helper, test_pokemonSV_BoxEggDetector, _1)},
-    {"PokemonSV_BoxPartyEggDetector", std::bind(image_int_detector_helper, test_pokemonSV_BoxPartyEggDetector, _1)},
-    {"PokemonSV_OverworldDetector", std::bind(image_bool_detector_helper, test_pokemonSV_OverworldDetector, _1)},
-    {"PokemonSV_BoxBottomButtonDetector", std::bind(image_words_detector_helper, test_pokemonSV_BoxBottomButtonDetector, _1)},
-    {"PokemonSV_SandwichIngredientsDetector", std::bind(image_words_detector_helper, test_pokemonSV_SandwichIngredientsDetector, _1)},
-    {"PokemonSV_SandwichIngredientReader", std::bind(image_words_detector_helper, test_pokemonSV_SandwichIngredientReader, _1)},
-    {"PokemonSV_AdvanceDialogDetector", std::bind(image_bool_detector_helper, test_pokemonSV_AdvanceDialogDetector, _1)},
-    {"PokemonSV_SwapMenuDetector", std::bind(image_bool_detector_helper, test_pokemonSV_SwapMenuDetector, _1)},
-};
-
-TestFunction find_test_function(const std::string& test_space, const std::string& test_name){
-    const auto it = TEST_MAP.find(test_space + "_" + test_name);
-    if (it == TEST_MAP.end()){
-        cerr << "Warning: no test object named " << test_space << "_" << test_name << " found in the code." << endl;
-        return nullptr;
-    }
-    return it->second;
-}
-
-}
diff --git a/SerialPrograms/Source/Tests/TestMap.h b/SerialPrograms/Source/Tests/TestMap.h
deleted file mode 100644
index 6399804ac7..0000000000
--- a/SerialPrograms/Source/Tests/TestMap.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*  Test Map
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *  
- *  
- */
-
-
-#ifndef PokemonAutomation_Tests_TestMap_H
-#define PokemonAutomation_Tests_TestMap_H
-
-#include <string>
-#include <functional>
-
-namespace PokemonAutomation{
-
-
-// For each test object, the command line test framework calls its specific
-// TestFunction with the string parameter as each test file.
-// TestFunction returns 0 if the test succeeds, > 0 if fails, < 0 if the test file is skipped.
-using TestFunction = std::function<int(const std::string& test_file_path)>;
-
-// Return the test function given test space and test object name.
-// Return nullptr if it cannot be found.
-// See CommandLineTests.h for details on test space and test object.
-TestFunction find_test_function(const std::string& test_space, const std::string& test_obj_name);
-
-}
-
-#endif
\ No newline at end of file
diff --git a/SerialPrograms/Source/Tests/TestUtils.cpp b/SerialPrograms/Source/Tests/TestUtils.cpp
index 466b1dc975..9f551b4fd0 100644
--- a/SerialPrograms/Source/Tests/TestUtils.cpp
+++ b/SerialPrograms/Source/Tests/TestUtils.cpp
@@ -1,15 +1,16 @@
 /*  Test Utils
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *  
  *  
  */
 
-#include "TestUtils.h"
-
 #include <iostream>
+
 #include <sstream>
 #include <fstream>
+#include "TestUtils.h"
+
 using std::cout;
 using std::cerr;
 using std::endl;
@@ -28,7 +29,7 @@ std::vector<std::string> parse_words(const std::string& filename_base){
     return words;
 }
 
-bool parse_size_t(const std::string& word, size_t& number) {
+bool parse_size_t(const std::string& word, size_t& number){
     std::istringstream iss(word);
     iss >> number;
     return iss.eof() && !iss.fail();
@@ -50,7 +51,7 @@ bool parse_bool(const std::string& word, bool& value){
     if (word == "True"){
         value = true;
         return true;
-    } else if (word == "False"){
+    }else if (word == "False"){
         value = false;
         return true;
     }
@@ -72,7 +73,7 @@ bool load_sprite_count(const std::string& txt_path, std::map<std::string, int>&
         is >> count;
         if (is.fail()){
             count = 1;
-        } else {
+        }else{
             if (count <= 0){
                 cerr << "Error: in file " << txt_path << " sprite count must be larger than zero, but got " << count << endl;
                 return false;
diff --git a/SerialPrograms/Source/Tests/TestUtils.h b/SerialPrograms/Source/Tests/TestUtils.h
index 07e7ba633b..1e2bb1286c 100644
--- a/SerialPrograms/Source/Tests/TestUtils.h
+++ b/SerialPrograms/Source/Tests/TestUtils.h
@@ -1,6 +1,6 @@
 /*  Test Utils
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *  
  *  
  */
@@ -9,18 +9,15 @@
 #ifndef PokemonAutomation_Tests_TestUtils_H
 #define PokemonAutomation_Tests_TestUtils_H
 
-#include "ClientSource/Connection/BotBase.h"
-#include "ClientSource/Connection/BotBaseMessage.h"
+#include <string>
+#include <vector>
+#include <map>
 #include "CommonFramework/AudioPipeline/AudioFeed.h"
-#include "CommonFramework/Logging/Logger.h"
-#include "CommonFramework/Tools/ConsoleHandle.h"
+//#include "CommonFramework/Logging/Logger.h"
 #include "CommonFramework/VideoPipeline/VideoFeed.h"
 #include "CommonFramework/VideoPipeline/VideoOverlay.h"
+//#include "NintendoSwitch/NintendoSwitch_ConsoleHandle.h"
 
-#include <iostream>
-#include <string>
-#include <vector>
-#include <map>
 
 namespace PokemonAutomation{
 
@@ -50,59 +47,30 @@ bool load_sprite_count(const std::string& filepath, std::map<std::string, int>&
 bool load_slug_list(const std::string& filepath, std::vector<std::string>& sprites);
 
 
-// Implement the dummy interface of BotBase so that we can run the test code
-// that relies on a BotBase.
-class DummyBotBase: public BotBase{
-public:
-    DummyBotBase(Logger& logger) : m_logger(logger) {}
-    
-    virtual Logger& logger() override { return m_logger; }
-
-    virtual State state() const override { return State::RUNNING; }
-
-    virtual void wait_for_all_requests(const Cancellable* cancelled = nullptr) override {}
-
-    virtual bool try_stop_all_commands() override { return true; }
-    virtual void stop_all_commands() override {}
-
-    virtual bool try_next_command_interrupt() override { return true; }
-    virtual void next_command_interrupt() override {};
-
-    virtual bool try_issue_request(
-        const BotBaseRequest& request,
-        const Cancellable* cancelled = nullptr
-    ) override { return true; }
-    virtual void issue_request(
-        const BotBaseRequest& request,
-        const Cancellable* cancelled = nullptr
-    ) override {}
-    virtual BotBaseMessage issue_request_and_wait(
-        const BotBaseRequest& request,
-        const Cancellable* cancelled = nullptr
-    ) override { return BotBaseMessage(0, ""); }
-
-    Logger& m_logger;
-};
-
 // Implement the dummy interface of VideoFeed so that we can test
 // the video inference code that relies on a VideoFeed.
 class DummyVideoFeed: public VideoFeed{
 public:
-    DummyVideoFeed() {}
+    DummyVideoFeed(){}
+
+    virtual void add_frame_listener(VideoFrameListener& listener) override{}
+    virtual void remove_frame_listener(VideoFrameListener& listener) override{}
 
     //  Can call from anywhere.
     virtual void reset() override{}
 
-    virtual VideoSnapshot snapshot() override{ return VideoSnapshot(); }
-    virtual double fps_source() override{ return 0; }
-    virtual double fps_display() override{ return 0; }
+    virtual VideoSnapshot snapshot_latest_blocking() override{ return VideoSnapshot(); }
+    virtual VideoSnapshot snapshot_recent_nonblocking(WallClock min_time) override{ return VideoSnapshot(); }
+
+    virtual double fps_source() const override{ return 0; }
+    virtual double fps_display() const override{ return 0; }
 };
 
 // Implement the dummy interface of VideoOverlay so that we can test
 // the video inference code that relies on a VideoOverlay.
 class DummyVideoOverlay: public VideoOverlay{
 public:
-    DummyVideoOverlay() {}
+    DummyVideoOverlay(){}
 
     virtual void add_box(const OverlayBox& box) override{}
     virtual void remove_box(const OverlayBox& box) override{}
@@ -110,18 +78,24 @@ class DummyVideoOverlay: public VideoOverlay{
     virtual void add_text(const OverlayText& text) override{}
     virtual void remove_text(const OverlayText& text) override{}
 
+    virtual void add_image(const OverlayImage& image) override{}
+    virtual void remove_image(const OverlayImage& image) override{}
+
     virtual void add_log(std::string message, Color color) override{}
     virtual void clear_log() override{}
 
     virtual void add_stat(OverlayStat& stat) override{}
     virtual void remove_stat(OverlayStat& stat) override{}
+
+    virtual void add_hid_listener(VideoDisplayHidListener& listener) override{}
+    virtual void remove_hid_listener(VideoDisplayHidListener& listener) override{}
 };
 
 // Implement the dummy interface of AudioFeed so that we can test
 // the audio inference code that relies on an AudioFeed.
 class DummyAudioFeed: public AudioFeed{
 public:
-    DummyAudioFeed() {}
+    DummyAudioFeed(){}
     virtual void reset() override {}
 
     virtual std::vector<AudioSpectrum> spectrums_since(uint64_t starting_seqnum) override { return std::vector<AudioSpectrum>(); }
@@ -134,42 +108,55 @@ class DummyAudioFeed: public AudioFeed{
 
 
 
-#define TEST_RESULT_EQUAL(result, target) \
+
+#define TEST_RESULT_EQUAL_STR(result, target) \
     do { \
-        if ((result) != (target)) {\
-            std::cerr << "Error: " << __func__ << ":" << __LINE__ << " result is " << (result) << " but should be " << (target) << "." << std::endl; \
-            return 1; \
+        if ((result) != (target)){\
+            std::stringstream _ss;   \
+            _ss << "Error: " << __func__ << ":" << __LINE__ << " result is " << (result) << " but should be " << (target) << "." << std::endl; \
+            return _ss.str(); \
         } \
     } while (0)
 
-
-#define TEST_RESULT_COMPONENT_EQUAL(result, target, component_name) \
+#define TEST_RESULT_COMPONENT_EQUAL_STR(result, target, component_name) \
     do { \
-        if ((result) != (target)) {\
-            std::cerr << "Error: " << __func__ << ":" << __LINE__ << " " << component_name << " result is " << (result) << " but should be " << \
+        if ((result) != (target)){\
+            std::stringstream _ss;   \
+            _ss << "Error: " << __func__ << ":" << __LINE__ << " " << component_name << " result is " << (result) << " but should be " << \
                 (target) << "." << std::endl; \
-            return 1; \
+            return _ss.str(); \
         } \
     } while (0)
 
-#define TEST_RESULT_COMPONENT_EQUAL_WITH_PRINT_FUNC(result, target, component_name, print_func) \
+#define TEST_RESULT_COMPONENT_EQUAL_WITH_PRINT_FUNC_STR(result, target, component_name, print_func) \
     do { \
-        if ((result) != (target)) {\
-            std::cerr << "Error: " << __func__ << ":" << __LINE__ << " " << component_name << " result is " << print_func(result) << " but should be " << \
+        if ((result) != (target)){\
+            std::stringstream _ss;   \
+            _ss << "Error: " << __func__ << ":" << __LINE__ << " " << component_name << " result is " << print_func(result) << " but should be " << \
                 print_func(target) << "." << std::endl; \
-            return 1; \
+            return _ss.str(); \
         } \
     } while (0)
 
-#define TEST_RESULT_APPROXIMATE(result, target, threshold) \
+#define TEST_RESULT_APPROXIMATE_STR(result, target, threshold) \
     do { \
-        if (std::fabs((result) - (target)) > (threshold)) {\
-            std::cerr << "Error: " << __func__ << ":" << __LINE__ << " result is " << (result) << " but should be close to " << (target) << \
+        if (std::fabs((result) - (target)) > (threshold)){\
+            std::stringstream _ss;   \
+            _ss << "Error: " << __func__ << ":" << __LINE__ << " result is " << (result) << " but should be close to " << (target) << \
                 " with threshold: " << (threshold) << "." << std::endl; \
-            return 1; \
+            return _ss.str(); \
         } \
     } while (0)
 
+#define TEST_RESULT_APPROXIMATE_STR(result, target, threshold) \
+    do { \
+        if (std::fabs((result) - (target)) > (threshold)){\
+            std::stringstream _ss;   \
+            _ss << "Error: " << __func__ << ":" << __LINE__ << " result is " << (result) << " but should be close to " << (target) << \
+                " with threshold: " << (threshold) << "." << std::endl; \
+            return _ss.str(); \
+        } \
+    } while (0)
 
 
 }
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Box/PokemonFRLG_BoxCellOccupiedDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Box/PokemonFRLG_BoxCellOccupiedDetector.cpp
new file mode 100644
index 0000000000..07a27d0463
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Box/PokemonFRLG_BoxCellOccupiedDetector.cpp
@@ -0,0 +1,89 @@
+/*  Box Cell Occupied Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/GlobalAutoPaths.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/ImageTools/ImageStats.h"
+#include "CommonFramework/ImageTypes/ImageRGB32.h"
+#include "VideoGames/PokemonFRLG/PokemonFRLG_Settings.h"
+#include "PokemonFRLG_BoxCellOccupiedDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+BoxCellOccupiedDetector::BoxCellOccupiedDetector(Color color)
+    : m_color(color)
+    , m_box(0.007, 0.556, 0.296, 0.253)
+{}
+
+void BoxCellOccupiedDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, GameSettings::instance().GAME_BOX.inner_to_outer(m_box));
+}
+
+bool BoxCellOccupiedDetector::detect(const ImageViewRGB32& screen){
+    const ImageViewRGB32 game_screen = extract_box_reference(screen, GameSettings::instance().GAME_BOX);
+    return image_stats(extract_box_reference(game_screen, m_box)).stddev.sum() > 10.0;
+}
+
+class Test_BoxCellOccupiedDetector : public UnitTest{
+public:
+    Test_BoxCellOccupiedDetector(const std::string& image, bool expected)
+        : UnitTest("PokemonFRLG::BoxCellOccupiedDetector - " + image)
+        , m_image(UNIT_TEST_RESOURCE_PATH() + image)
+        , m_expected(expected)
+    {}
+
+    virtual UnitTestResult run(Logger& logger, CancellableScope& scope) const override{
+        ImageRGB32 image(m_image);
+        BoxCellOccupiedDetector detector;
+        const bool result = detector.detect(image);
+        if (result == m_expected){
+            return true;
+        }
+        return m_expected ? "Expected an occupied cell, received empty." : "Expected an empty cell, received occupied.";
+    }
+
+private:
+    std::string m_image;
+    bool m_expected;
+};
+
+void add_tests_BoxCellOccupiedDetector(UnitTestDatabase& database){
+    database.add<Test_BoxCellOccupiedDetector>("PokemonFRLG/Box/Arcanine_M_100_White.png", true);
+    database.add<Test_BoxCellOccupiedDetector>("PokemonFRLG/Box/BoxHand_Closed_Gold.png", true);
+    database.add<Test_BoxCellOccupiedDetector>("PokemonFRLG/Box/BoxHand_Closed_White.png", true);
+    database.add<Test_BoxCellOccupiedDetector>("PokemonFRLG/Box/BoxHand_Gold_HD60Pro_NV12.png", true);
+    database.add<Test_BoxCellOccupiedDetector>("PokemonFRLG/Box/BoxHand_Gold_HD60Pro_YUYV.png", true);
+    database.add<Test_BoxCellOccupiedDetector>("PokemonFRLG/Box/BoxHand_White_HD60Pro_NV12.png", true);
+    database.add<Test_BoxCellOccupiedDetector>("PokemonFRLG/Box/BoxHand_White_HD60Pro_YUYV.png", true);
+    database.add<Test_BoxCellOccupiedDetector>("PokemonFRLG/Box/BoxSelection_Gold.png", false);
+    database.add<Test_BoxCellOccupiedDetector>("PokemonFRLG/Box/BoxSelection_Gold2.png", true);
+    database.add<Test_BoxCellOccupiedDetector>("PokemonFRLG/Box/BoxSelection_White.png", false);
+    database.add<Test_BoxCellOccupiedDetector>("PokemonFRLG/Box/BoxSelection_White2.png", true);
+    database.add<Test_BoxCellOccupiedDetector>("PokemonFRLG/Box/Caterpie_F_4_White.png", true);
+    database.add<Test_BoxCellOccupiedDetector>("PokemonFRLG/Box/CloseSelection_Gold.png", false);
+    database.add<Test_BoxCellOccupiedDetector>("PokemonFRLG/Box/CloseSelection_White.png", false);
+    database.add<Test_BoxCellOccupiedDetector>("PokemonFRLG/Box/Diglett_F_20_White.png", true);
+    database.add<Test_BoxCellOccupiedDetector>("PokemonFRLG/Box/Doduo-NV12.png", true);
+    database.add<Test_BoxCellOccupiedDetector>("PokemonFRLG/Box/Doduo-YUYV.png", true);
+    database.add<Test_BoxCellOccupiedDetector>("PokemonFRLG/Box/Dragonite_F_100_Whtie.png", true);
+    database.add<Test_BoxCellOccupiedDetector>("PokemonFRLG/Box/Nidokinq_M_23_White.png", true);
+    database.add<Test_BoxCellOccupiedDetector>("PokemonFRLG/Box/nidoran-f-mjpeg.png", true);
+    database.add<Test_BoxCellOccupiedDetector>("PokemonFRLG/Box/nidoran-f-NV12.png", true);
+    database.add<Test_BoxCellOccupiedDetector>("PokemonFRLG/Box/nidoran-f-YUYV.png", true);
+    database.add<Test_BoxCellOccupiedDetector>("PokemonFRLG/Box/nidoran-m-mjpeg.png", true);
+    database.add<Test_BoxCellOccupiedDetector>("PokemonFRLG/Box/nidoran-m-NV12.png", true);
+    database.add<Test_BoxCellOccupiedDetector>("PokemonFRLG/Box/nidoran-m-YUYV.png", true);
+    database.add<Test_BoxCellOccupiedDetector>("PokemonFRLG/Box/PartySelection_Gold.png", false);
+    database.add<Test_BoxCellOccupiedDetector>("PokemonFRLG/Box/PartySelection_White.png", false);
+    database.add<Test_BoxCellOccupiedDetector>("PokemonFRLG/Box/Rhydon-NV12.png", true);
+    database.add<Test_BoxCellOccupiedDetector>("PokemonFRLG/Box/Rhydon-YUYV.png", true);
+}
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Box/PokemonFRLG_BoxCellOccupiedDetector.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Box/PokemonFRLG_BoxCellOccupiedDetector.h
new file mode 100644
index 0000000000..ed86821319
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Box/PokemonFRLG_BoxCellOccupiedDetector.h
@@ -0,0 +1,36 @@
+/*  Box Cell Occupied Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonFRLG_BoxCellOccupiedDetector_H
+#define PokemonAutomation_PokemonFRLG_BoxCellOccupiedDetector_H
+
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/VisualDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+// Reads the current selection's information panel, not every cell in the grid.
+class BoxCellOccupiedDetector : public StaticScreenDetector{
+public:
+    BoxCellOccupiedDetector(Color color = COLOR_RED);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    Color m_color;
+    ImageFloatBox m_box;
+};
+
+void add_tests_BoxCellOccupiedDetector(UnitTestDatabase& database);
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Box/PokemonFRLG_BoxCellReader.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Box/PokemonFRLG_BoxCellReader.cpp
new file mode 100644
index 0000000000..a416f6a3a5
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Box/PokemonFRLG_BoxCellReader.cpp
@@ -0,0 +1,248 @@
+/*  Box Cell Reader
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <cctype>
+#include <set>
+#include "CommonFramework/GlobalAutoPaths.h"
+#include "CommonFramework/ImageTypes/ImageRGB32.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Images/ImageFilter.h"
+#include "Pokemon/Inference/Pokemon_NameReader.h"
+#include "Pokemon/Resources/Pokemon_PokemonSlugs.h"
+#include "VideoGames/PokemonFRLG/PokemonFRLG_Settings.h"
+#include "VideoGames/PokemonFRLG/Inference/PokemonFRLG_OcrPreprocessing.h"
+#include "Tests/ImageUnitTest.h"
+#include "PokemonFRLG_BoxCellOccupiedDetector.h"
+#include "PokemonFRLG_BoxCellReader.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+namespace{
+
+const Pokemon::PokemonNameReader& gen3_name_reader(){
+    static const Pokemon::PokemonNameReader reader([]{
+        std::set<std::string> species;
+        constexpr size_t GEN3_LAST_NATIONAL_DEX = 386;
+        const auto& national_dex = Pokemon::NATIONAL_DEX_SLUGS();
+        for (size_t index = 0; index < GEN3_LAST_NATIONAL_DEX; index++){
+            species.insert(national_dex[index]);
+        }
+        return species;
+    }());
+    return reader;
+}
+
+int parse_level(const std::string& text){
+    // Strip the Lv label before finding digits; OCR can mistake its L for 1.
+    const size_t label_end = text.find_last_of("vV");
+    const size_t start = text.find_first_of("0123456789", label_end == std::string::npos ? 0 : label_end + 1);
+    if (start == std::string::npos){
+        return -1;
+    }
+    int level = 0;
+    for (size_t i = start; i < text.size(); i++){
+        const unsigned char ch = (unsigned char)text[i];
+        if (std::isspace(ch)){
+            continue;
+        }
+        if (ch < '0' || ch > '9'){
+            return -1;
+        }
+        level = level * 10 + ch - '0';
+        if (level > 100){
+            return -1;
+        }
+    }
+    return level >= 1 ? level : -1;
+}
+
+}
+
+BoxCellReader::BoxCellReader(Color color)
+    : m_color(color)
+    , m_name_box(0.0006, 0.628, 0.32, 0.099)
+    , m_level_box(0.0697, 0.731, 0.189, 0.0763)
+{}
+
+void BoxCellReader::make_overlays(VideoOverlaySet& items) const{
+    const BoxOption& game_box = GameSettings::instance().GAME_BOX;
+    items.add(m_color, game_box.inner_to_outer(m_name_box));
+    items.add(m_color, game_box.inner_to_outer(m_level_box));
+}
+
+std::string BoxCellReader::read_name(Logger& logger, Language language, const ImageViewRGB32& screen) const{
+    if (!BoxCellOccupiedDetector().detect(screen)){
+        return "";
+    }
+    const ImageViewRGB32 game_screen = extract_box_reference(screen, GameSettings::instance().GAME_BOX);
+    const ImageViewRGB32 name_region = extract_box_reference(game_screen, m_name_box);
+    // Preserve letter details first: blur can turn D into O and yield a confident
+    // wrong species (e.g. DODUO -> Sudowoodo). Smooth only if the sharp read fails.
+    for (int blur_kernel_size : {0, 3}){
+        const ImageRGB32 name_ready = preprocess_for_ocr(name_region, blur_kernel_size, 1);
+        const OCR::StringMatchResult result = gen3_name_reader().read_substring(
+            logger, language, name_ready, BRIGHT_TEXT_FILTERS()
+        );
+        if (result.results.size() == 1){
+            return result.results.begin()->second.token;
+        }
+        std::set<std::string> candidates;
+        for (const auto& candidate : result.results){
+            candidates.insert(candidate.second.token);
+        }
+        if (candidates == std::set<std::string>{"nidoran-f", "nidoran-m"}){
+            const std::string name = read_nidoran_symbol(name_ready, BRIGHT_TEXT_FILTERS());
+            if (!name.empty()){
+                return name;
+            }
+        }
+    }
+    logger.log("Failed to read box species name unambiguously.", COLOR_RED);
+    return "";
+}
+
+int BoxCellReader::read_level(Logger& logger, const ImageViewRGB32& screen) const{
+    if (!BoxCellOccupiedDetector().detect(screen)){
+        return -1;
+    }
+    const ImageViewRGB32 game_screen = extract_box_reference(screen, GameSettings::instance().GAME_BOX);
+    const ImageRGB32 level_ready = preprocess_for_ocr(extract_box_reference(game_screen, m_level_box), 3, 1);
+    for (const auto& filter : BRIGHT_TEXT_FILTERS()){
+        size_t text_pixels = 0;
+        ImageRGB32 filtered = to_blackwhite_rgb32_range(text_pixels, level_ready, true, filter.mins, filter.maxs);
+        if (text_pixels == 0){
+            continue;
+        }
+        const int level = parse_level(OCR::ocr_read(Language::English, filtered, OCR::PageSegMode::SINGLE_LINE));
+        if (level != -1){
+            return level;
+        }
+    }
+    logger.log("Failed to read box level.", COLOR_RED);
+    return -1;
+}
+
+class Test_BoxCellReader_Name : public UnitTest{
+public:
+    Test_BoxCellReader_Name(const std::string& image, const std::string& expected)
+        : UnitTest("PokemonFRLG::BoxCellReader_Name - " + image)
+        , m_image(UNIT_TEST_RESOURCE_PATH() + image)
+        , m_expected(expected)
+    {
+        //  The test image, plus the PaddleOCR (ONNX) recognition session and its
+        //  working set.
+        m_memory = MAX_TEST_IMAGE_RGB32_BYTES + PADDLE_OCR_SINGLE_LINE_MEMORY_ESTIMATE;
+    }
+
+    virtual UnitTestResult run(Logger& logger, CancellableScope& scope) const override{
+        ImageRGB32 image(m_image);
+        const std::string result = BoxCellReader().read_name(logger, Language::English, image);
+        if (result == m_expected){
+            return true;
+        }
+        return "Expected species: \"" + m_expected + "\", received: \"" + result + "\".";
+    }
+
+private:
+    std::string m_image;
+    std::string m_expected;
+};
+
+class Test_BoxCellReader_Level : public UnitTest{
+public:
+    Test_BoxCellReader_Level(const std::string& image, int expected)
+        : UnitTest("PokemonFRLG::BoxCellReader_Level - " + image)
+        , m_image(UNIT_TEST_RESOURCE_PATH() + image)
+        , m_expected(expected)
+    {
+        //  The test image, plus the PaddleOCR (ONNX) recognition session and its
+        //  working set.
+        m_memory = MAX_TEST_IMAGE_RGB32_BYTES + PADDLE_OCR_SINGLE_LINE_MEMORY_ESTIMATE;
+    }
+
+    virtual UnitTestResult run(Logger& logger, CancellableScope& scope) const override{
+        ImageRGB32 image(m_image);
+        const int result = BoxCellReader().read_level(logger, image);
+        if (result == m_expected){
+            return true;
+        }
+        return "Expected level: " + std::to_string(m_expected) + ", received: " + std::to_string(result);
+    }
+
+private:
+    std::string m_image;
+    int m_expected;
+};
+
+void add_tests_BoxCellReader(UnitTestDatabase& database){
+    // Name tests
+    database.add<Test_BoxCellReader_Name>("PokemonFRLG/Box/Arcanine_M_100_White.png", "arcanine");
+    database.add<Test_BoxCellReader_Name>("PokemonFRLG/Box/BoxHand_Closed_Gold.png", "dodrio");
+    database.add<Test_BoxCellReader_Name>("PokemonFRLG/Box/BoxHand_Closed_White.png", "exeggcute");
+    database.add<Test_BoxCellReader_Name>("PokemonFRLG/Box/BoxHand_Gold_HD60Pro_NV12.png", "farfetch-d");
+    database.add<Test_BoxCellReader_Name>("PokemonFRLG/Box/BoxHand_Gold_HD60Pro_YUYV.png", "farfetch-d");
+    database.add<Test_BoxCellReader_Name>("PokemonFRLG/Box/BoxHand_White_HD60Pro_NV12.png", "farfetch-d");
+    database.add<Test_BoxCellReader_Name>("PokemonFRLG/Box/BoxHand_White_HD60Pro_YUYV.png", "farfetch-d");
+    database.add<Test_BoxCellReader_Name>("PokemonFRLG/Box/BoxSelection_Gold.png", "");
+    database.add<Test_BoxCellReader_Name>("PokemonFRLG/Box/BoxSelection_Gold2.png", "raichu");
+    database.add<Test_BoxCellReader_Name>("PokemonFRLG/Box/BoxSelection_White.png", "");
+    database.add<Test_BoxCellReader_Name>("PokemonFRLG/Box/BoxSelection_White2.png", "raichu");
+    database.add<Test_BoxCellReader_Name>("PokemonFRLG/Box/Caterpie_F_4_White.png", "caterpie");
+    database.add<Test_BoxCellReader_Name>("PokemonFRLG/Box/CloseSelection_Gold.png", "");
+    database.add<Test_BoxCellReader_Name>("PokemonFRLG/Box/CloseSelection_White.png", "");
+    database.add<Test_BoxCellReader_Name>("PokemonFRLG/Box/Diglett_F_20_White.png", "diglett");
+    database.add<Test_BoxCellReader_Name>("PokemonFRLG/Box/Doduo-NV12.png", "doduo");
+    database.add<Test_BoxCellReader_Name>("PokemonFRLG/Box/Doduo-YUYV.png", "doduo");
+    database.add<Test_BoxCellReader_Name>("PokemonFRLG/Box/Dragonite_F_100_Whtie.png", "dragonite");
+    database.add<Test_BoxCellReader_Name>("PokemonFRLG/Box/Nidokinq_M_23_White.png", "nidoking");
+    database.add<Test_BoxCellReader_Name>("PokemonFRLG/Box/nidoran-f-mjpeg.png", "nidoran-f");
+    database.add<Test_BoxCellReader_Name>("PokemonFRLG/Box/nidoran-f-NV12.png", "nidoran-f");
+    database.add<Test_BoxCellReader_Name>("PokemonFRLG/Box/nidoran-f-YUYV.png", "nidoran-f");
+    database.add<Test_BoxCellReader_Name>("PokemonFRLG/Box/nidoran-m-mjpeg.png", "nidoran-m");
+    database.add<Test_BoxCellReader_Name>("PokemonFRLG/Box/nidoran-m-NV12.png", "nidoran-m");
+    database.add<Test_BoxCellReader_Name>("PokemonFRLG/Box/nidoran-m-YUYV.png", "nidoran-m");
+    database.add<Test_BoxCellReader_Name>("PokemonFRLG/Box/PartySelection_Gold.png", "");
+    database.add<Test_BoxCellReader_Name>("PokemonFRLG/Box/PartySelection_White.png", "");
+    database.add<Test_BoxCellReader_Name>("PokemonFRLG/Box/Rhydon-NV12.png", "rhydon");
+    database.add<Test_BoxCellReader_Name>("PokemonFRLG/Box/Rhydon-YUYV.png", "rhydon");
+
+    // Level tests
+    database.add<Test_BoxCellReader_Level>("PokemonFRLG/Box/Arcanine_M_100_White.png", 100);
+    database.add<Test_BoxCellReader_Level>("PokemonFRLG/Box/BoxHand_Closed_Gold.png", 31);
+    database.add<Test_BoxCellReader_Level>("PokemonFRLG/Box/BoxHand_Closed_White.png", 25);
+    database.add<Test_BoxCellReader_Level>("PokemonFRLG/Box/BoxHand_Gold_HD60Pro_NV12.png", 33);
+    database.add<Test_BoxCellReader_Level>("PokemonFRLG/Box/BoxHand_Gold_HD60Pro_YUYV.png", 33);
+    database.add<Test_BoxCellReader_Level>("PokemonFRLG/Box/BoxHand_White_HD60Pro_NV12.png", 33);
+    database.add<Test_BoxCellReader_Level>("PokemonFRLG/Box/BoxHand_White_HD60Pro_YUYV.png", 33);
+    database.add<Test_BoxCellReader_Level>("PokemonFRLG/Box/BoxSelection_Gold.png", -1);
+    database.add<Test_BoxCellReader_Level>("PokemonFRLG/Box/BoxSelection_Gold2.png", 100);
+    database.add<Test_BoxCellReader_Level>("PokemonFRLG/Box/BoxSelection_White.png", -1);
+    database.add<Test_BoxCellReader_Level>("PokemonFRLG/Box/BoxSelection_White2.png", 100);
+    database.add<Test_BoxCellReader_Level>("PokemonFRLG/Box/Caterpie_F_4_White.png", 4);
+    database.add<Test_BoxCellReader_Level>("PokemonFRLG/Box/CloseSelection_Gold.png", -1);
+    database.add<Test_BoxCellReader_Level>("PokemonFRLG/Box/CloseSelection_White.png", -1);
+    database.add<Test_BoxCellReader_Level>("PokemonFRLG/Box/Diglett_F_20_White.png", 20);
+    database.add<Test_BoxCellReader_Level>("PokemonFRLG/Box/Doduo-NV12.png", 26);
+    database.add<Test_BoxCellReader_Level>("PokemonFRLG/Box/Doduo-YUYV.png", 26);
+    database.add<Test_BoxCellReader_Level>("PokemonFRLG/Box/Dragonite_F_100_Whtie.png", 100);
+    database.add<Test_BoxCellReader_Level>("PokemonFRLG/Box/Nidokinq_M_23_White.png", 23);
+    database.add<Test_BoxCellReader_Level>("PokemonFRLG/Box/nidoran-f-mjpeg.png", 6);
+    database.add<Test_BoxCellReader_Level>("PokemonFRLG/Box/nidoran-f-NV12.png", 6);
+    database.add<Test_BoxCellReader_Level>("PokemonFRLG/Box/nidoran-f-YUYV.png", 6);
+    database.add<Test_BoxCellReader_Level>("PokemonFRLG/Box/nidoran-m-mjpeg.png", 6);
+    database.add<Test_BoxCellReader_Level>("PokemonFRLG/Box/nidoran-m-NV12.png", 6);
+    database.add<Test_BoxCellReader_Level>("PokemonFRLG/Box/nidoran-m-YUYV.png", 6);
+    database.add<Test_BoxCellReader_Level>("PokemonFRLG/Box/PartySelection_Gold.png", -1);
+    database.add<Test_BoxCellReader_Level>("PokemonFRLG/Box/PartySelection_White.png", -1);
+    database.add<Test_BoxCellReader_Level>("PokemonFRLG/Box/Rhydon-NV12.png", 42);
+    database.add<Test_BoxCellReader_Level>("PokemonFRLG/Box/Rhydon-YUYV.png", 42);
+}
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Box/PokemonFRLG_BoxCellReader.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Box/PokemonFRLG_BoxCellReader.h
new file mode 100644
index 0000000000..39c7a9502f
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Box/PokemonFRLG_BoxCellReader.h
@@ -0,0 +1,48 @@
+/*  Box Cell Reader
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonFRLG_BoxCellReader_H
+#define PokemonAutomation_PokemonFRLG_BoxCellReader_H
+
+#include <string>
+#include "Common/Cpp/Color.h"
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/Language.h"
+
+namespace PokemonAutomation{
+
+class ImageViewRGB32;
+class VideoOverlaySet;
+
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+// Reads the species and level displayed for the currently selected box cell.
+class BoxCellReader{
+public:
+    BoxCellReader(Color color = COLOR_RED);
+
+    void make_overlays(VideoOverlaySet& items) const;
+
+    // Returns a species slug from National Dex 1-386, or "" if empty/unreadable.
+    std::string read_name(Logger& logger, Language language, const ImageViewRGB32& screen) const;
+
+    // Reads the number alongside Lv. Returns 1-100, or -1 if empty/unreadable.
+    int read_level(Logger& logger, const ImageViewRGB32& screen) const;
+
+private:
+    Color m_color;
+    ImageFloatBox m_name_box;
+    ImageFloatBox m_level_box;
+};
+
+void add_tests_BoxCellReader(UnitTestDatabase& database);
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Box/PokemonFRLG_BoxGenderReader.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Box/PokemonFRLG_BoxGenderReader.cpp
new file mode 100644
index 0000000000..48879c7e7a
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Box/PokemonFRLG_BoxGenderReader.cpp
@@ -0,0 +1,106 @@
+/*  Box Gender Reader
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/GlobalAutoPaths.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/ImageTools/ImageStats.h"
+#include "CommonFramework/ImageTypes/ImageRGB32.h"
+#include "CommonTools/Images/ImageFilter.h"
+#include "VideoGames/PokemonFRLG/PokemonFRLG_Settings.h"
+#include "PokemonFRLG_BoxGenderReader.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+BoxGenderReader::BoxGenderReader(Color color)
+    : m_color(color)
+    , m_box(0.0324, 0.72, 0.041, 0.089)
+{}
+
+void BoxGenderReader::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, GameSettings::instance().GAME_BOX.inner_to_outer(m_box));
+}
+
+Pokemon::StatsHuntGenderFilter BoxGenderReader::read(const ImageViewRGB32& screen) const{
+    const ImageViewRGB32 game_screen = extract_box_reference(screen, GameSettings::instance().GAME_BOX);
+    const ImageViewRGB32 region = extract_box_reference(game_screen, m_box);
+    const ImageRGB32 red = filter_rgb32_range(
+        region, combine_rgb(150, 0, 0), combine_rgb(255, 150, 150), Color(0), false
+    );
+    const ImageRGB32 blue = filter_rgb32_range(
+        region, combine_rgb(0, 0, 150), combine_rgb(120, 210, 255), Color(0), false
+    );
+    const uint64_t red_count = image_stats(red).count;
+    const uint64_t blue_count = image_stats(blue).count;
+    const size_t threshold = region.width() * region.height() / 100;
+    if (red_count > threshold && red_count > blue_count){
+        return Pokemon::StatsHuntGenderFilter::Female;
+    }
+    if (blue_count > threshold && blue_count > red_count){
+        return Pokemon::StatsHuntGenderFilter::Male;
+    }
+    return Pokemon::StatsHuntGenderFilter::Genderless;
+}
+
+class Test_BoxGenderReader : public UnitTest{
+public:
+    Test_BoxGenderReader(const std::string& image, Pokemon::StatsHuntGenderFilter expected)
+        : UnitTest("PokemonFRLG::BoxGenderReader - " + image)
+        , m_image(UNIT_TEST_RESOURCE_PATH() + image)
+        , m_expected(expected)
+    {}
+
+    virtual UnitTestResult run(Logger& logger, CancellableScope& scope) const override{
+        ImageRGB32 image(m_image);
+        const auto result = BoxGenderReader().read(image);
+        if (result == m_expected){
+            return true;
+        }
+        return "Expected: " + Pokemon::gender_to_string(m_expected) + ", received: " + Pokemon::gender_to_string(result);
+    }
+
+private:
+    std::string m_image;
+    Pokemon::StatsHuntGenderFilter m_expected;
+};
+
+void add_tests_BoxGenderReader(UnitTestDatabase& database){
+    using Gender = Pokemon::StatsHuntGenderFilter;
+    database.add<Test_BoxGenderReader>("PokemonFRLG/Box/Arcanine_M_100_White.png", Gender::Male);
+    database.add<Test_BoxGenderReader>("PokemonFRLG/Box/BoxHand_Closed_Gold.png", Gender::Female);
+    database.add<Test_BoxGenderReader>("PokemonFRLG/Box/BoxHand_Closed_White.png", Gender::Male);
+    database.add<Test_BoxGenderReader>("PokemonFRLG/Box/BoxHand_Gold_HD60Pro_NV12.png", Gender::Male);
+    database.add<Test_BoxGenderReader>("PokemonFRLG/Box/BoxHand_Gold_HD60Pro_YUYV.png", Gender::Male);
+    database.add<Test_BoxGenderReader>("PokemonFRLG/Box/BoxHand_White_HD60Pro_NV12.png", Gender::Male);
+    database.add<Test_BoxGenderReader>("PokemonFRLG/Box/BoxHand_White_HD60Pro_YUYV.png", Gender::Male);
+    database.add<Test_BoxGenderReader>("PokemonFRLG/Box/BoxSelection_Gold.png", Gender::Genderless);
+    database.add<Test_BoxGenderReader>("PokemonFRLG/Box/BoxSelection_Gold2.png", Gender::Male);
+    database.add<Test_BoxGenderReader>("PokemonFRLG/Box/BoxSelection_White.png", Gender::Genderless);
+    database.add<Test_BoxGenderReader>("PokemonFRLG/Box/BoxSelection_White2.png", Gender::Male);
+    database.add<Test_BoxGenderReader>("PokemonFRLG/Box/Caterpie_F_4_White.png", Gender::Female);
+    database.add<Test_BoxGenderReader>("PokemonFRLG/Box/CloseSelection_Gold.png", Gender::Genderless);
+    database.add<Test_BoxGenderReader>("PokemonFRLG/Box/CloseSelection_White.png", Gender::Genderless);
+    database.add<Test_BoxGenderReader>("PokemonFRLG/Box/Diglett_F_20_White.png", Gender::Female);
+    database.add<Test_BoxGenderReader>("PokemonFRLG/Box/Doduo-NV12.png", Gender::Male);
+    database.add<Test_BoxGenderReader>("PokemonFRLG/Box/Doduo-YUYV.png", Gender::Male);
+    database.add<Test_BoxGenderReader>("PokemonFRLG/Box/Dragonite_F_100_Whtie.png", Gender::Female);
+    database.add<Test_BoxGenderReader>("PokemonFRLG/Box/Nidokinq_M_23_White.png", Gender::Male);
+    database.add<Test_BoxGenderReader>("PokemonFRLG/Box/nidoran-f-mjpeg.png", Gender::Genderless);
+    database.add<Test_BoxGenderReader>("PokemonFRLG/Box/nidoran-f-NV12.png", Gender::Genderless);
+    database.add<Test_BoxGenderReader>("PokemonFRLG/Box/nidoran-f-YUYV.png", Gender::Genderless);
+    database.add<Test_BoxGenderReader>("PokemonFRLG/Box/nidoran-m-mjpeg.png", Gender::Genderless);
+    database.add<Test_BoxGenderReader>("PokemonFRLG/Box/nidoran-m-NV12.png", Gender::Genderless);
+    database.add<Test_BoxGenderReader>("PokemonFRLG/Box/nidoran-m-YUYV.png", Gender::Genderless);
+    database.add<Test_BoxGenderReader>("PokemonFRLG/Box/PartySelection_Gold.png", Gender::Genderless);
+    database.add<Test_BoxGenderReader>("PokemonFRLG/Box/PartySelection_White.png", Gender::Genderless);
+    database.add<Test_BoxGenderReader>("PokemonFRLG/Box/Rhydon-NV12.png", Gender::Male);
+    database.add<Test_BoxGenderReader>("PokemonFRLG/Box/Rhydon-YUYV.png", Gender::Male);
+}
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Box/PokemonFRLG_BoxGenderReader.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Box/PokemonFRLG_BoxGenderReader.h
new file mode 100644
index 0000000000..82eddcc338
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Box/PokemonFRLG_BoxGenderReader.h
@@ -0,0 +1,36 @@
+/*  Box Gender Reader
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonFRLG_BoxGenderReader_H
+#define PokemonAutomation_PokemonFRLG_BoxGenderReader_H
+
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "Pokemon/Options/Pokemon_StatsHuntFilter.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+class BoxGenderReader{
+public:
+    BoxGenderReader(Color color = COLOR_RED);
+
+    void make_overlays(VideoOverlaySet& items) const;
+    // Genderless also covers an empty selection with no gender symbol.
+    Pokemon::StatsHuntGenderFilter read(const ImageViewRGB32& screen) const;
+
+private:
+    Color m_color;
+    ImageFloatBox m_box;
+};
+
+void add_tests_BoxGenderReader(UnitTestDatabase& database);
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Box/PokemonFRLG_BoxSelectionModeDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Box/PokemonFRLG_BoxSelectionModeDetector.cpp
new file mode 100644
index 0000000000..31aa6c1c61
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Box/PokemonFRLG_BoxSelectionModeDetector.cpp
@@ -0,0 +1,241 @@
+/*  Box Selection Mode Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <algorithm>
+#include <cmath>
+#include "CommonFramework/GlobalAutoPaths.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/ImageTypes/ImageRGB32.h"
+#include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h"
+#include "CommonTools/Images/WaterfillUtilities.h"
+#include "Kernels/Waterfill/Kernels_Waterfill_Types.h"
+#include "VideoGames/PokemonFRLG/PokemonFRLG_Settings.h"
+#include "PokemonFRLG_BoxSelectionModeDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+namespace{
+
+const ImageFloatBox HAND_SEARCH_BOX(0.33, 0.0, 0.67, 0.95);
+
+class SelectionHandMatcher : public ImageMatch::WaterfillTemplateMatcher{
+public:
+    SelectionHandMatcher(const char* path, Color min_color, Color max_color)
+        : WaterfillTemplateMatcher(path, min_color, max_color, 100)
+    {
+        m_area_ratio_lower = 0.7;
+        m_area_ratio_upper = 1.3;
+    }
+};
+
+struct HandStyle{
+    SelectionHandMatcher matcher;
+    BoxSelectionMode mode;
+    bool inverted;
+    uint32_t min_color;
+    uint32_t max_color;
+    bool closed = false;
+};
+
+const auto& hand_styles(){
+    static const HandStyle styles[] = {
+        {{"PokemonFRLG/Box/SelectionHand_White.png", Color(180, 180, 180), Color(255, 255, 255)},
+            BoxSelectionMode::Normal, false, 0xffb4b4b4, 0xffffffff},
+        {{"PokemonFRLG/Box/SelectionHand_White2.png", Color(180, 180, 180), Color(255, 255, 255)},
+            BoxSelectionMode::Normal, false, 0xffb4b4b4, 0xffffffff},
+        {{"PokemonFRLG/Box/SelectionHand_White_Inverted.png", Color(180, 180, 180), Color(255, 255, 255)},
+            BoxSelectionMode::Normal, true, 0xffb4b4b4, 0xffffffff},
+        {{"PokemonFRLG/Box/SelectionHand_Gold.png", Color(180, 120, 0), Color(255, 255, 150)},
+            BoxSelectionMode::Relocate, false, 0xffb47800, 0xffffff96},
+        {{"PokemonFRLG/Box/SelectionHand_Gold2.png", Color(180, 120, 0), Color(255, 255, 150)},
+            BoxSelectionMode::Relocate, false, 0xffb47800, 0xffffff96},
+        {{"PokemonFRLG/Box/SelectionHand_Gold_Inverted.png", Color(180, 120, 0), Color(255, 255, 150)},
+            BoxSelectionMode::Relocate, true, 0xffb47800, 0xffffff96},
+        {{"PokemonFRLG/Box/SelectionHand_Closed_White.png", Color(180, 180, 180), Color(255, 255, 255)},
+            BoxSelectionMode::Normal, false, 0xffb4b4b4, 0xffffffff, true},
+        {{"PokemonFRLG/Box/SelectionHand_Closed_Gold.png", Color(180, 120, 0), Color(255, 255, 150)},
+            BoxSelectionMode::Relocate, false, 0xffb47800, 0xffffff96, true},
+    };
+    return styles;
+}
+
+std::optional<BoxSelection> selection_at(const ImageFloatBox& hand, const HandStyle& style){
+    constexpr double MAX_TOP_BUTTON_HAND_CENTER_Y = 0.15;
+    constexpr double BOX_TILE_GRID_HAND_CENTER_Y_SPLIT = 0.12;
+    constexpr double PARTY_CLOSE_BUTTON_HAND_CENTER_X_SPLIT = 0.62;
+    constexpr double FIRST_GRID_HAND_CENTER_X = 0.425;
+    constexpr double FIRST_GRID_HAND_CENTER_Y = 0.19;
+    constexpr double GRID_COLUMN_SPACING = 24.0 / 240;
+    constexpr double GRID_ROW_SPACING = 24.0 / 160;
+    constexpr int GRID_COLUMNS = 6;
+    constexpr int GRID_ROWS = 5;
+
+    const double center_x = hand.x + hand.width / 2;
+    const double center_y = hand.y + hand.height / 2;
+    // Closed hands keep their shape when carrying a Pokemon onto a top button.
+    if (style.inverted || (style.closed && center_y < BOX_TILE_GRID_HAND_CENTER_Y_SPLIT)){
+        if (center_y > MAX_TOP_BUTTON_HAND_CENTER_Y){
+            return std::nullopt;
+        }
+        return BoxSelection{style.mode, center_x < PARTY_CLOSE_BUTTON_HAND_CENTER_X_SPLIT
+            ? BoxSelectionLocation::OpenPartyButton : BoxSelectionLocation::CloseBoxButton, style.closed};
+    }
+    if (center_y < BOX_TILE_GRID_HAND_CENTER_Y_SPLIT){
+        return BoxSelection{style.mode, BoxSelectionLocation::BoxTile, style.closed};
+    }
+
+    const int column = (int)std::lround((center_x - FIRST_GRID_HAND_CENTER_X) / GRID_COLUMN_SPACING);
+    const int row = (int)std::lround((center_y - FIRST_GRID_HAND_CENTER_Y) / GRID_ROW_SPACING);
+    if (column < 0 || column >= GRID_COLUMNS || row < 0 || row >= GRID_ROWS){
+        return std::nullopt;
+    }
+    return BoxSelection{style.mode, BoxSelectionLocation::Grid, style.closed, (size_t)row, (size_t)column};
+}
+
+std::string selection_string(const BoxSelection& selection){
+    std::string result = selection.mode == BoxSelectionMode::Normal ? "Normal " : "Relocate ";
+    result += selection.closed ? "Closed " : "Open ";
+    switch (selection.location){
+    case BoxSelectionLocation::Grid:
+        return result + "Grid(" + std::to_string(selection.row) + ", " + std::to_string(selection.column) + ")";
+    case BoxSelectionLocation::BoxTile:
+        return result + "BoxTile";
+    case BoxSelectionLocation::OpenPartyButton:
+        return result + "OpenPartyButton";
+    case BoxSelectionLocation::CloseBoxButton:
+        return result + "CloseBoxButton";
+    }
+    return result;
+}
+
+}
+
+void BoxSelectionModeDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, GameSettings::instance().GAME_BOX.inner_to_outer(HAND_SEARCH_BOX));
+}
+
+std::optional<BoxSelection> BoxSelectionModeDetector::detect(const ImageViewRGB32& screen) const{
+    const ImageViewRGB32 game_screen = extract_box_reference(screen, GameSettings::instance().GAME_BOX);
+    const ImageViewRGB32 region = extract_box_reference(game_screen, HAND_SEARCH_BOX);
+    const double screen_rel_size = game_screen.height() / 1080.0;
+    const double screen_rel_size_2 = screen_rel_size * screen_rel_size;
+    constexpr double min_area_1080p = 540;
+    const size_t min_area = std::max<size_t>(1, size_t(screen_rel_size_2 * min_area_1080p));
+    double best_rmsd = 50;
+    std::optional<BoxSelection> best;
+    for (const HandStyle& style : hand_styles()){
+        match_template_by_waterfill(
+            game_screen.size(), region, style.matcher,
+            {{style.min_color, style.max_color}}, {min_area, SIZE_MAX}, best_rmsd,
+            [&](Kernels::Waterfill::WaterfillObject& object){
+                const ImageFloatBox hand = translate_to_parent(game_screen, HAND_SEARCH_BOX, object);
+                if (hand.width < 0.03 || hand.width > 0.085 || hand.height < 0.06 || hand.height > 0.15){
+                    return false;
+                }
+                const auto selection = selection_at(hand, style);
+                if (!selection){
+                    return false;
+                }
+                const double rmsd = style.matcher.rmsd_original(game_screen.size(), region, object);
+                if (rmsd < best_rmsd){
+                    best_rmsd = rmsd;
+                    best = selection;
+                }
+                return false;
+            }
+        );
+    }
+    return best;
+}
+
+BoxSelectionModeWatcher::BoxSelectionModeWatcher(
+    Color color, BoxSelectionMode mode, BoxSelectionLocation location, bool closed
+)
+    : BoxSelectionModeDetector(color)
+    , VisualInferenceCallback("BoxSelectionModeWatcher")
+    , m_mode(mode)
+    , m_location(location)
+    , m_closed(closed)
+{}
+
+bool BoxSelectionModeWatcher::process_frame(const ImageViewRGB32& frame, WallClock timestamp){
+    m_last_detected = detect(frame);
+    if (m_last_detected && m_last_detected->mode == m_mode
+        && m_last_detected->location == m_location && m_last_detected->closed == m_closed){
+        return true;
+    }
+    m_last_detected.reset();
+    return false;
+}
+
+class Test_BoxSelectionModeDetector : public UnitTest{
+public:
+    Test_BoxSelectionModeDetector(
+        const std::string& image, BoxSelectionMode mode, BoxSelectionLocation location,
+        size_t row = 0, size_t column = 0, bool closed = false
+    )
+        : UnitTest("PokemonFRLG::BoxSelectionModeDetector - " + image)
+        , m_image(UNIT_TEST_RESOURCE_PATH() + image)
+        , m_expected{mode, location, closed, row, column}
+    {}
+
+    virtual UnitTestResult run(Logger& logger, CancellableScope& scope) const override{
+        ImageRGB32 image(m_image);
+        const auto result = BoxSelectionModeDetector().detect(image);
+        if (!result){
+            return "Expected: " + selection_string(m_expected) + ", received no hand.";
+        }
+        if (result->mode != m_expected.mode || result->location != m_expected.location
+            || result->closed != m_expected.closed
+            || result->row != m_expected.row || result->column != m_expected.column){
+            return "Expected: " + selection_string(m_expected) + ", received: " + selection_string(*result);
+        }
+        return true;
+    }
+
+private:
+    std::string m_image;
+    BoxSelection m_expected;
+};
+
+void add_tests_BoxSelectionModeDetector(UnitTestDatabase& database){
+    using Mode = BoxSelectionMode;
+    using Location = BoxSelectionLocation;
+    database.add<Test_BoxSelectionModeDetector>("PokemonFRLG/Box/Arcanine_M_100_White.png", Mode::Normal, Location::Grid, 0, 4);
+    database.add<Test_BoxSelectionModeDetector>("PokemonFRLG/Box/BoxHand_Closed_Gold.png", Mode::Relocate, Location::Grid, 0, 2, true);
+    database.add<Test_BoxSelectionModeDetector>("PokemonFRLG/Box/BoxHand_Closed_White.png", Mode::Normal, Location::OpenPartyButton, 0, 0, true);
+    database.add<Test_BoxSelectionModeDetector>("PokemonFRLG/Box/BoxHand_Gold_HD60Pro_NV12.png", Mode::Relocate, Location::Grid, 0, 0);
+    database.add<Test_BoxSelectionModeDetector>("PokemonFRLG/Box/BoxHand_Gold_HD60Pro_YUYV.png", Mode::Relocate, Location::Grid, 0, 0);
+    database.add<Test_BoxSelectionModeDetector>("PokemonFRLG/Box/BoxHand_White_HD60Pro_NV12.png", Mode::Normal, Location::Grid, 0, 0);
+    database.add<Test_BoxSelectionModeDetector>("PokemonFRLG/Box/BoxHand_White_HD60Pro_YUYV.png", Mode::Normal, Location::Grid, 0, 0);
+    database.add<Test_BoxSelectionModeDetector>("PokemonFRLG/Box/BoxSelection_Gold.png", Mode::Relocate, Location::BoxTile);
+    database.add<Test_BoxSelectionModeDetector>("PokemonFRLG/Box/BoxSelection_Gold2.png", Mode::Relocate, Location::Grid, 2, 4);
+    database.add<Test_BoxSelectionModeDetector>("PokemonFRLG/Box/BoxSelection_White.png", Mode::Normal, Location::BoxTile);
+    database.add<Test_BoxSelectionModeDetector>("PokemonFRLG/Box/BoxSelection_White2.png", Mode::Normal, Location::Grid, 2, 4);
+    database.add<Test_BoxSelectionModeDetector>("PokemonFRLG/Box/Caterpie_F_4_White.png", Mode::Normal, Location::Grid, 0, 5);
+    database.add<Test_BoxSelectionModeDetector>("PokemonFRLG/Box/CloseSelection_Gold.png", Mode::Relocate, Location::CloseBoxButton);
+    database.add<Test_BoxSelectionModeDetector>("PokemonFRLG/Box/CloseSelection_White.png", Mode::Normal, Location::CloseBoxButton);
+    database.add<Test_BoxSelectionModeDetector>("PokemonFRLG/Box/Diglett_F_20_White.png", Mode::Normal, Location::Grid, 0, 1);
+    database.add<Test_BoxSelectionModeDetector>("PokemonFRLG/Box/Doduo-NV12.png", Mode::Normal, Location::Grid, 1, 2);
+    database.add<Test_BoxSelectionModeDetector>("PokemonFRLG/Box/Doduo-YUYV.png", Mode::Normal, Location::Grid, 1, 2);
+    database.add<Test_BoxSelectionModeDetector>("PokemonFRLG/Box/Dragonite_F_100_Whtie.png", Mode::Normal, Location::Grid, 2, 5);
+    database.add<Test_BoxSelectionModeDetector>("PokemonFRLG/Box/Nidokinq_M_23_White.png", Mode::Normal, Location::Grid, 1, 1);
+    database.add<Test_BoxSelectionModeDetector>("PokemonFRLG/Box/nidoran-f-mjpeg.png", Mode::Normal, Location::Grid, 2, 0);
+    database.add<Test_BoxSelectionModeDetector>("PokemonFRLG/Box/nidoran-f-NV12.png", Mode::Normal, Location::Grid, 2, 0);
+    database.add<Test_BoxSelectionModeDetector>("PokemonFRLG/Box/nidoran-f-YUYV.png", Mode::Normal, Location::Grid, 2, 0);
+    database.add<Test_BoxSelectionModeDetector>("PokemonFRLG/Box/nidoran-m-mjpeg.png", Mode::Normal, Location::Grid, 2, 2);
+    database.add<Test_BoxSelectionModeDetector>("PokemonFRLG/Box/nidoran-m-NV12.png", Mode::Normal, Location::Grid, 2, 2);
+    database.add<Test_BoxSelectionModeDetector>("PokemonFRLG/Box/nidoran-m-YUYV.png", Mode::Normal, Location::Grid, 2, 2);
+    database.add<Test_BoxSelectionModeDetector>("PokemonFRLG/Box/PartySelection_Gold.png", Mode::Relocate, Location::OpenPartyButton);
+    database.add<Test_BoxSelectionModeDetector>("PokemonFRLG/Box/PartySelection_White.png", Mode::Normal, Location::OpenPartyButton);
+    database.add<Test_BoxSelectionModeDetector>("PokemonFRLG/Box/Rhydon-NV12.png", Mode::Normal, Location::Grid, 3, 3);
+    database.add<Test_BoxSelectionModeDetector>("PokemonFRLG/Box/Rhydon-YUYV.png", Mode::Normal, Location::Grid, 3, 3);
+}
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Box/PokemonFRLG_BoxSelectionModeDetector.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Box/PokemonFRLG_BoxSelectionModeDetector.h
new file mode 100644
index 0000000000..32b27fbcfe
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Box/PokemonFRLG_BoxSelectionModeDetector.h
@@ -0,0 +1,84 @@
+/*  Box Selection Mode Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonFRLG_BoxSelectionModeDetector_H
+#define PokemonAutomation_PokemonFRLG_BoxSelectionModeDetector_H
+
+#include <optional>
+#include "Common/Cpp/Color.h"
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+enum class BoxSelectionMode{
+    Normal,
+    Relocate,
+};
+
+enum class BoxSelectionLocation{
+    Grid,
+    BoxTile,
+    OpenPartyButton,
+    CloseBoxButton,
+};
+
+struct BoxSelection{
+    BoxSelectionMode mode;
+    BoxSelectionLocation location;
+    bool closed = false;
+    // Zero-based coordinates in the 5-row, 6-column grid. Only valid for Grid.
+    size_t row = 0;
+    size_t column = 0;
+};
+
+class BoxSelectionModeDetector{
+public:
+    BoxSelectionModeDetector(Color color = COLOR_RED) : m_color(color) {}
+
+    void make_overlays(VideoOverlaySet& items) const;
+    // Returns no value when no selection hand can be matched.
+    std::optional<BoxSelection> detect(const ImageViewRGB32& screen) const;
+
+private:
+    Color m_color;
+};
+
+class BoxSelectionModeWatcher : public BoxSelectionModeDetector, public VisualInferenceCallback{
+public:
+    BoxSelectionModeWatcher(
+        Color color,
+        BoxSelectionMode mode,
+        BoxSelectionLocation location,
+        bool closed = false
+    );
+
+    virtual void make_overlays(VideoOverlaySet& items) const override{
+        BoxSelectionModeDetector::make_overlays(items);
+    }
+
+    using VisualInferenceCallback::process_frame;
+    virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override;
+
+    // Contains the matching hand and cursor coordinates after process_frame() succeeds.
+    const std::optional<BoxSelection>& last_detected() const{ return m_last_detected; }
+
+private:
+    BoxSelectionMode m_mode;
+    BoxSelectionLocation m_location;
+    bool m_closed;
+    std::optional<BoxSelection> m_last_detected;
+};
+
+void add_tests_BoxSelectionModeDetector(UnitTestDatabase& database);
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_BattleDialogs.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_BattleDialogs.cpp
new file mode 100644
index 0000000000..9c54f8c5d3
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_BattleDialogs.cpp
@@ -0,0 +1,344 @@
+/*  Battle Dialog Detectors
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonTools/Images/SolidColorTest.h"
+#include "CommonTools/Images/ImageFilter.h"
+#include "Tests/ImageUnitTest.h"
+#include "VideoGames/PokemonFRLG/PokemonFRLG_Settings.h"
+#include "PokemonFRLG_BattleDialogs.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+
+
+BattleDialogDetector::BattleDialogDetector(Color color)
+    : m_dialog_top_box(0.0372308, 0.750154, 0.925538, 0.00934615)
+    , m_dialog_right_box(0.956615, 0.7595, 0.00615385, 0.185885)
+    , m_dialog_top_jpn_box(0.043890, 0.749227, 0.910248, 0.008023) //jpn positions might work for other languages
+    , m_dialog_right_jpn_box(0.950583, 0.751901, 0.003556, 0.199230) //dialog might get in the way though
+{}
+void BattleDialogDetector::make_overlays(VideoOverlaySet& items) const{
+    const BoxOption& GAME_BOX = GameSettings::instance().GAME_BOX;
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_dialog_top_box));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_dialog_right_box));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_dialog_top_jpn_box));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_dialog_right_jpn_box));
+}
+bool BattleDialogDetector::detect(const ImageViewRGB32& screen){
+    ImageViewRGB32 game_screen = extract_box_reference(screen, GameSettings::instance().GAME_BOX);
+
+    ImageViewRGB32 dialog_top_image = extract_box_reference(game_screen, m_dialog_top_box);
+    ImageViewRGB32 dialog_right_image = extract_box_reference(game_screen, m_dialog_right_box);
+    ImageViewRGB32 dialog_top_jpn_image = extract_box_reference(game_screen, m_dialog_top_jpn_box);
+    ImageViewRGB32 dialog_right_jpn_image = extract_box_reference(game_screen, m_dialog_right_jpn_box);
+
+    if ((is_solid(dialog_top_image, { 0.176, 0.357, 0.467 }, 0.25, 20)
+        && is_solid(dialog_right_image, { 0.176, 0.357, 0.467 }, 0.25, 20))
+        ||
+        (is_solid(dialog_top_jpn_image, { 0.176, 0.357, 0.467 }, 0.25, 20)
+        && is_solid(dialog_right_jpn_image, { 0.176, 0.357, 0.467 }, 0.25, 20))
+    ){
+        return true;
+    }
+    return false;
+}
+
+
+BattleMenuDetector::BattleMenuDetector(Color color)
+    : m_menu_top_box(0.528308, 0.742885, 0.439385, 0.00830769) //top of the white dialog box
+    , m_menu_right_box(0.961538, 0.752231, 0.00615385, 0.200423)
+    , m_dialog_top_box(0.036, 0.749115, 0.459077, 0.0135)
+    , m_dialog_right_box(0.490154, 0.762615, 0.00615385, 0.178615) //right side, closest to the menu
+    , m_menu_top_jpn_box(0.593239, 0.743878, 0.373344, 0.009360) //very different positions!
+    , m_menu_right_jpn_box(0.961538, 0.752231, 0.00615385, 0.200423)
+    , m_dialog_top_jpn_box(0.043001, 0.750564, 0.520015, 0.002674)
+    , m_dialog_right_jpn_box(0.559460, 0.750564, 0.003556, 0.196556)
+{}
+void BattleMenuDetector::make_overlays(VideoOverlaySet& items) const{
+    const BoxOption& GAME_BOX = GameSettings::instance().GAME_BOX;
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_menu_top_box));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_menu_right_box));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_dialog_top_box));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_dialog_right_box));
+
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_menu_top_jpn_box));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_menu_right_jpn_box));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_dialog_top_jpn_box));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_dialog_right_jpn_box));
+}
+bool BattleMenuDetector::detect(const ImageViewRGB32& screen){
+    ImageViewRGB32 game_screen = extract_box_reference(screen, GameSettings::instance().GAME_BOX);
+
+    //Menu is white
+    ImageViewRGB32 menu_top_image = extract_box_reference(game_screen, m_menu_top_box);
+    ImageViewRGB32 menu_right_image = extract_box_reference(game_screen, m_menu_right_box);
+    ImageViewRGB32 menu_top_jpn_image = extract_box_reference(game_screen, m_menu_top_jpn_box);
+    ImageViewRGB32 menu_right_jpn_image = extract_box_reference(game_screen, m_menu_right_jpn_box);
+
+    //Background dialog is teal
+    ImageViewRGB32 dialog_top_image = extract_box_reference(game_screen, m_dialog_top_box);
+    ImageViewRGB32 dialog_right_image = extract_box_reference(game_screen, m_dialog_right_box);
+    ImageViewRGB32 dialog_top_jpn_image = extract_box_reference(game_screen, m_dialog_top_jpn_box);
+    ImageViewRGB32 dialog_right_jpn_image = extract_box_reference(game_screen, m_dialog_right_jpn_box);
+
+    if ((is_white(menu_top_image) //All languages except japanese
+        && is_white(menu_right_image)
+        && is_solid(dialog_top_image, { 0.176, 0.357, 0.467 }, 0.25, 20) //40, 81, 106 teal
+        && is_solid(dialog_right_image, { 0.176, 0.357, 0.467 }, 0.25, 20)
+        && !is_white(dialog_top_image))
+        ||
+        (is_white(menu_top_jpn_image) //japanese
+        && is_white(menu_right_jpn_image)
+        && is_solid(dialog_top_jpn_image, { 0.176, 0.357, 0.467 }, 0.25, 20)
+        && is_solid(dialog_right_jpn_image, { 0.176, 0.357, 0.467 }, 0.25, 20)
+        && !is_white(dialog_top_jpn_image))
+    ){
+        return true;
+    }
+    return false;
+}
+
+
+AdvanceBattleDialogDetector::AdvanceBattleDialogDetector(Color color)
+    : m_dialog_box(0.036, 0.748077, 0.926769, 0.204577)
+    , m_dialog_top_box(0.0372308, 0.750154, 0.925538, 0.00934615)
+    , m_dialog_right_box(0.956615, 0.7595, 0.00615385, 0.185885)
+    , m_dialog_jpn_box(0.043890, 0.749227, 0.911137, 0.203242) //this position is very different!
+    , m_dialog_top_jpn_box(0.043890, 0.749227, 0.910248, 0.008023)
+    , m_dialog_right_jpn_box(0.950583, 0.751901, 0.003556, 0.199230)
+{}
+void AdvanceBattleDialogDetector::make_overlays(VideoOverlaySet& items) const{
+    const BoxOption& GAME_BOX = GameSettings::instance().GAME_BOX;
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_dialog_box));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_dialog_top_box));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_dialog_right_box));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_dialog_jpn_box));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_dialog_top_jpn_box));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_dialog_right_jpn_box));
+}
+bool AdvanceBattleDialogDetector::detect(const ImageViewRGB32& screen){
+    ImageViewRGB32 game_screen = extract_box_reference(screen, GameSettings::instance().GAME_BOX);
+
+    const bool replace_color_within_range = false;
+
+    //Filter out background
+    ImageRGB32 filtered_region = filter_rgb32_range(
+        extract_box_reference(game_screen, m_dialog_box),
+        combine_rgb(164, 0, 0), combine_rgb(255, 114, 87), Color(0), replace_color_within_range
+    );
+    ImageStats stats = image_stats(filtered_region);
+
+    /*
+    filtered_region.save("./filtered_only.png");
+    cout << stats.average.r << endl;
+    cout << stats.average.g << endl;
+    cout << stats.average.b << endl;
+    */
+
+    //japanese
+    ImageRGB32 filtered_region_jpn = filter_rgb32_range(
+        extract_box_reference(game_screen, m_dialog_jpn_box),
+        combine_rgb(164, 0, 0), combine_rgb(255, 114, 87), Color(0), replace_color_within_range
+    );
+    ImageStats stats2 = image_stats(filtered_region_jpn);
+
+    ImageViewRGB32 dialog_top_image = extract_box_reference(game_screen, m_dialog_top_box);
+    ImageViewRGB32 dialog_right_image = extract_box_reference(game_screen, m_dialog_right_box);
+    ImageViewRGB32 dialog_top_jpn_image = extract_box_reference(game_screen, m_dialog_top_jpn_box);
+    ImageViewRGB32 dialog_right_jpn_image = extract_box_reference(game_screen, m_dialog_right_jpn_box);
+
+    if ((is_solid(dialog_top_image, { 0.176, 0.357, 0.467 }, 0.25, 20)
+        && is_solid(dialog_right_image, { 0.176, 0.357, 0.467 }, 0.25, 20)
+        && (stats.average.r > stats.average.b + 180)
+        && (stats.average.r > stats.average.g + 180))
+        ||
+        (is_solid(dialog_top_jpn_image, { 0.176, 0.357, 0.467 }, 0.25, 20)
+        && is_solid(dialog_right_jpn_image, { 0.176, 0.357, 0.467 }, 0.25, 20)
+        && (stats2.average.r > stats2.average.b + 180)
+        && (stats2.average.r > stats2.average.g + 180))
+    ){
+        return true;
+    }
+    return false;
+}
+
+BattleLearnDialogDetector::BattleLearnDialogDetector(Color color)
+    : m_menu_top_box(0.805, 0.445, 0.149, 0.006)
+    , m_menu_right_box(0.962, 0.445, 0.006, 0.200) // right side, Yes/No selection
+    , m_dialog_top_box(0.036, 0.763, 0.459, 0.014)
+    , m_dialog_right_box(0.941, 0.763, 0.006, 0.179) //right side, closest to the menu
+{}
+void BattleLearnDialogDetector::make_overlays(VideoOverlaySet& items) const{
+    const BoxOption& GAME_BOX = GameSettings::instance().GAME_BOX;
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_menu_top_box));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_menu_right_box));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_dialog_top_box));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_dialog_right_box));
+}
+bool BattleLearnDialogDetector::detect(const ImageViewRGB32& screen){
+    ImageViewRGB32 game_screen = extract_box_reference(screen, GameSettings::instance().GAME_BOX);
+
+    //Menu is white
+    ImageViewRGB32 menu_top_image = extract_box_reference(game_screen, m_menu_top_box);
+    ImageViewRGB32 menu_right_image = extract_box_reference(game_screen, m_menu_right_box);
+
+    //Background dialog is teal
+    ImageViewRGB32 dialog_top_image = extract_box_reference(game_screen, m_dialog_top_box);
+    ImageViewRGB32 dialog_right_image = extract_box_reference(game_screen, m_dialog_right_box);
+
+    if (is_white(menu_top_image)
+        && is_white(menu_right_image)
+        && is_solid(dialog_top_image, { 0.176, 0.357, 0.467 }, 0.25, 20) //40, 81, 106 teal
+        && is_solid(dialog_right_image, { 0.176, 0.357, 0.467 }, 0.25, 20)
+    ){
+        return true;
+    }
+    return false;
+}
+
+BattleOutOfPpDetector::BattleOutOfPpDetector(Color color)
+    : m_box(0.692901, 0.758376, 0.275753, 0.085431)
+    , m_area_ratio_threshold(0.01)
+{}
+void BattleOutOfPpDetector::make_overlays(VideoOverlaySet& items) const{
+    const BoxOption& GAME_BOX = GameSettings::instance().GAME_BOX;
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_box));
+}
+bool BattleOutOfPpDetector::detect(const ImageViewRGB32& screen){
+    ImageViewRGB32 game_screen = extract_box_reference(screen, GameSettings::instance().GAME_BOX);
+    const auto region = extract_box_reference(game_screen, m_box);
+
+    // Retain only red pixels from region ( ~ RGB(225, 74, 27) )
+    const bool replace_color_within_range = false;
+    const ImageRGB32 red_region = filter_rgb32_range(
+        region,
+        combine_rgb(180, 0, 0), combine_rgb(255, 120, 120), Color(0), replace_color_within_range
+    );
+    const size_t num_red_pixels = image_stats(red_region).count;
+    const double threshold = region.width() * region.height() * m_area_ratio_threshold;
+
+    return num_red_pixels > threshold;
+}
+
+BattleLevelUpDetector::BattleLevelUpDetector(Color color, BattleLevelUpDialog dialog_type, Language language)
+    : dialog_type(dialog_type)
+    , jpn(language == Language::Japanese)
+    , m_border_top_box(0.619231, 0.374038, 0.362179, 0.001923) // gray (120, 115, 140)
+    , m_border_right_box(0.982692, 0.376923, 0.001923, 0.597115)
+    , m_dialog_top_box(0.626282, 0.393492, 0.341026, 0.006175)  // white
+    , m_dialog_right_box(0.967949, 0.401923, 0.003846, 0.550962)
+    , m_plus_box(0.862663, 0.402852, 0.034267, 0.553560)
+    , m_plus_box_jpn(0.895663, 0.402852, 0.021267, 0.553560)
+{}
+void BattleLevelUpDetector::make_overlays(VideoOverlaySet& items) const{
+    const BoxOption& GAME_BOX = GameSettings::instance().GAME_BOX;
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_border_top_box));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_border_right_box));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_dialog_top_box));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_dialog_right_box));
+}
+bool BattleLevelUpDetector::detect(const ImageViewRGB32& screen){
+    ImageViewRGB32 game_screen = extract_box_reference(screen, GameSettings::instance().GAME_BOX);
+
+    //Border is teal
+    ImageViewRGB32 border_top_image = extract_box_reference(game_screen, m_border_top_box);
+    ImageViewRGB32 border_right_image = extract_box_reference(game_screen, m_border_right_box);
+
+    //Menu is white
+    ImageViewRGB32 dialog_top_image = extract_box_reference(game_screen, m_dialog_top_box);
+    ImageViewRGB32 dialog_right_image = extract_box_reference(game_screen, m_dialog_right_box);
+   
+    //Plus box is not solid white on the first screen, but is white on the second one
+    //For Japanese, this logic is flipped. The first screen will have no text in the 10s place,
+    //and the second screen always will
+    ImageViewRGB32 plus_image = extract_box_reference(game_screen, jpn ? m_plus_box_jpn : m_plus_box);
+    bool good_plus_image = false;
+    if (dialog_type == BattleLevelUpDialog::either){
+        good_plus_image = true;
+    }else if (jpn){
+        good_plus_image = (
+            (dialog_type == BattleLevelUpDialog::plus && is_white(plus_image)) ||
+            (dialog_type == BattleLevelUpDialog::stats && !is_white(plus_image))
+        );
+    }else{
+        good_plus_image = (
+            (dialog_type == BattleLevelUpDialog::plus && !is_white(plus_image)) ||
+            (dialog_type == BattleLevelUpDialog::stats && is_white(plus_image))
+        );
+    }
+
+    if (is_solid(border_top_image, { 0.320, 0.307, 0.373 }, 0.25, 20)
+        && is_solid(border_right_image, { 0.320, 0.307, 0.373 }, 0.25, 20)
+        && is_white(dialog_top_image)
+        && is_white(dialog_right_image)
+        && good_plus_image
+    ){
+        return true;
+    }
+    return false;
+}
+
+class Test_AdvanceBattleDialogDetector : public ImageUnitTest{
+public:
+
+    Test_AdvanceBattleDialogDetector(
+        const std::string& image,
+        bool expected
+    )
+        : ImageUnitTest("PokemonFRLG::AdvanceBattleDialogDetector - " + image, {image})
+        , m_expected(expected)
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        AdvanceBattleDialogDetector detector(COLOR_RED);
+        const ImageRGB32& image = images[0];
+        return detector.detect(image) == m_expected;
+    };
+
+private:
+    bool m_expected;
+};
+
+void add_tests_AdvanceBattleDialogDetector(UnitTestDatabase& database){
+    //todo: gather test images for this detector
+}
+
+class Test_BattleMenuDetector : public ImageUnitTest{
+public:
+
+    Test_BattleMenuDetector(
+        const std::string& image,
+        bool expected
+    )
+        : ImageUnitTest("PokemonFRLG::BattleMenuDetector - " + image, {image})
+        , m_expected(expected)
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        BattleMenuDetector detector(COLOR_RED);
+        const ImageRGB32& image = images[0];
+        return detector.detect(image) == m_expected;
+    };
+
+private:
+    bool m_expected;
+};
+
+void add_tests_BattleMenuDetector(UnitTestDatabase& database){
+    //todo: gather test images for this detector
+}
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_BattleDialogs.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_BattleDialogs.h
new file mode 100644
index 0000000000..f3c1f6b152
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_BattleDialogs.h
@@ -0,0 +1,183 @@
+/*  Battle Dialog Detectors
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonFRLG_BattleDialogs_H
+#define PokemonAutomation_PokemonFRLG_BattleDialogs_H
+
+#include <chrono>
+#include "Common/Cpp/Color.h"
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonFramework/Language.h"
+#include "CommonTools/VisualDetector.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+
+namespace PokemonAutomation{
+    class CancellableScope;
+    class VideoFeed;
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+
+
+
+// Battle dialog boxes are teal, similar to r/s/e
+class BattleDialogDetector : public StaticScreenDetector{
+public:
+    BattleDialogDetector(Color color);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    ImageFloatBox m_dialog_top_box;
+    ImageFloatBox m_dialog_right_box;
+
+    ImageFloatBox m_dialog_top_jpn_box;
+    ImageFloatBox m_dialog_right_jpn_box;
+};
+class BattleDialogWatcher : public DetectorToFinder<BattleDialogDetector>{
+public:
+    BattleDialogWatcher(Color color)
+        : DetectorToFinder("BattleDialogWatcher", std::chrono::milliseconds(250), color)
+    {}
+};
+
+
+// Battle menu is a white box on the right with FIGHT/POKEMON/BAG/RUN
+// The dialog box with "what will POKEMON do?" is dark teal/navy
+class BattleMenuDetector : public StaticScreenDetector{
+public:
+    BattleMenuDetector(Color color);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    ImageFloatBox m_menu_top_box;
+    ImageFloatBox m_menu_right_box;
+    ImageFloatBox m_dialog_top_box;
+    ImageFloatBox m_dialog_right_box;
+
+    ImageFloatBox m_menu_top_jpn_box;
+    ImageFloatBox m_menu_right_jpn_box;
+    ImageFloatBox m_dialog_top_jpn_box;
+    ImageFloatBox m_dialog_right_jpn_box;
+};
+class BattleMenuWatcher : public DetectorToFinder<BattleMenuDetector>{
+public:
+    BattleMenuWatcher(Color color)
+        : DetectorToFinder("BattleMenuWatcher", std::chrono::milliseconds(250), color)
+    {}
+};
+
+
+// Detect the red advancement arrow by filtering for red.
+// No red colored text in battle?
+// reuse the battledialog checks for the top and right
+class AdvanceBattleDialogDetector : public StaticScreenDetector{
+public:
+    AdvanceBattleDialogDetector(Color color);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    ImageFloatBox m_dialog_box;
+    ImageFloatBox m_dialog_top_box;
+    ImageFloatBox m_dialog_right_box;
+
+    ImageFloatBox m_dialog_jpn_box;
+    ImageFloatBox m_dialog_top_jpn_box;
+    ImageFloatBox m_dialog_right_jpn_box;
+};
+class AdvanceBattleDialogWatcher : public DetectorToFinder<AdvanceBattleDialogDetector>{
+public:
+    AdvanceBattleDialogWatcher(Color color)
+        : DetectorToFinder("AdvanceBattleDialogWatcher", std::chrono::milliseconds(250), color)
+    {}
+};
+
+
+// Similar to BattleMenuDetector, but looks for the white of the Yes/No box when learning a new move
+class BattleLearnDialogDetector : public StaticScreenDetector{
+public:
+    BattleLearnDialogDetector(Color color);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    ImageFloatBox m_menu_top_box;
+    ImageFloatBox m_menu_right_box;
+    ImageFloatBox m_dialog_top_box;
+    ImageFloatBox m_dialog_right_box;
+};
+class BattleLearnDialogWatcher : public DetectorToFinder<BattleLearnDialogDetector>{
+public:
+    BattleLearnDialogWatcher(Color color)
+        : DetectorToFinder("BattleLearnDialogWatcher", std::chrono::milliseconds(250), color)
+    {}
+};
+
+class BattleOutOfPpDetector : public StaticScreenDetector{
+public:
+    BattleOutOfPpDetector(Color color);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    ImageFloatBox m_box;
+    double m_area_ratio_threshold;
+};
+class BattleOutOfPpWatcher : public DetectorToFinder<BattleOutOfPpDetector>{
+public:
+    BattleOutOfPpWatcher(Color color)
+        : DetectorToFinder("BattleOutOfPpWatcher", std::chrono::milliseconds(250), color)
+    {}
+};
+
+enum class BattleLevelUpDialog{
+    plus,
+    stats,
+    either
+};
+
+class BattleLevelUpDetector : public StaticScreenDetector{
+public:
+    BattleLevelUpDetector(Color color, BattleLevelUpDialog dialog_type, Language Language);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    BattleLevelUpDialog dialog_type;
+    bool jpn;
+    ImageFloatBox m_border_top_box;
+    ImageFloatBox m_border_right_box;
+    ImageFloatBox m_dialog_top_box;
+    ImageFloatBox m_dialog_right_box;
+    ImageFloatBox m_plus_box;
+    ImageFloatBox m_plus_box_jpn;
+};
+class BattleLevelUpWatcher : public DetectorToFinder<BattleLevelUpDetector>{
+public:
+    BattleLevelUpWatcher(Color color, BattleLevelUpDialog dialog_type, Language language)
+        : DetectorToFinder("BattleLevelUpWatcher", std::chrono::milliseconds(250), color, dialog_type, language)
+    {}
+};
+
+void add_tests_AdvanceBattleDialogDetector(UnitTestDatabase& database);
+void add_tests_BattleMenuDetector(UnitTestDatabase& database);
+
+
+}
+}
+}
+
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_DialogDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_DialogDetector.cpp
new file mode 100644
index 0000000000..c87bebb817
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_DialogDetector.cpp
@@ -0,0 +1,202 @@
+/*  Dialog Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/ImageTypes/ImageRGB32.h"
+#include "CommonFramework/ImageTools/ImageStats.h"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Images/SolidColorTest.h"
+#include "CommonTools/Images/ImageFilter.h"
+//#include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h"
+//#include "CommonFramework/VideoPipeline/VideoOverlay.h"
+#include "Tests/ImageUnitTest.h"
+#include "PokemonFRLG_DialogDetector.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+WhiteDialogDetector::WhiteDialogDetector(Color color)
+    : m_right_box(0.923385, 0.748077, 0.00615385, 0.204577)
+    , m_top_box(0.0704615, 0.741846, 0.859077, 0.00623077)
+    , m_bottom_box(0.0716923, 0.943308, 0.851692, 0.00934615)
+{}
+void WhiteDialogDetector::make_overlays(VideoOverlaySet& items) const{
+    const BoxOption& GAME_BOX = GameSettings::instance().GAME_BOX;
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_right_box));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_top_box));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_bottom_box));
+}
+bool WhiteDialogDetector::detect(const ImageViewRGB32& screen){
+    ImageViewRGB32 game_screen = extract_box_reference(screen, GameSettings::instance().GAME_BOX);
+
+    ImageViewRGB32 right_image = extract_box_reference(game_screen, m_right_box);
+    ImageViewRGB32 top_image = extract_box_reference(game_screen, m_top_box);
+    ImageViewRGB32 bottom_image = extract_box_reference(game_screen, m_bottom_box);
+    if (is_white(right_image)
+        && is_white(top_image)
+        && is_white(bottom_image)
+    ){
+        return true;
+    }
+    return false;
+}
+
+AdvanceWhiteDialogDetector::AdvanceWhiteDialogDetector(Color color)
+    : m_dialog_box(0.0630769, 0.750154, 0.870154, 0.200423)
+    , m_right_box(0.923385, 0.748077, 0.00615385, 0.204577)
+    , m_top_box(0.0704615, 0.741846, 0.859077, 0.00623077)
+    , m_bottom_box(0.0716923, 0.943308, 0.851692, 0.00934615)
+{}
+void AdvanceWhiteDialogDetector::make_overlays(VideoOverlaySet& items) const{
+    const BoxOption& GAME_BOX = GameSettings::instance().GAME_BOX;
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_dialog_box));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_right_box));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_top_box));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_bottom_box));
+}
+bool AdvanceWhiteDialogDetector::detect(const ImageViewRGB32& screen){
+    ImageViewRGB32 game_screen = extract_box_reference(screen, GameSettings::instance().GAME_BOX);
+
+    const bool replace_color_within_range = false;
+
+    //Filter out background
+    ImageRGB32 filtered_region = filter_rgb32_range(
+        extract_box_reference(game_screen, m_dialog_box),
+        combine_rgb(164, 0, 0), combine_rgb(255, 114, 87), Color(0), replace_color_within_range
+    );
+    ImageStats stats = image_stats(filtered_region);
+
+    /*
+    filtered_region.save("./filtered_only.png");
+    cout << stats.average.r << endl;
+    cout << stats.average.g << endl;
+    cout << stats.average.b << endl;
+    */
+
+    ImageViewRGB32 right_image = extract_box_reference(game_screen, m_right_box);
+    ImageViewRGB32 top_image = extract_box_reference(game_screen, m_top_box);
+    ImageViewRGB32 bottom_image = extract_box_reference(game_screen, m_bottom_box);
+
+    if (is_white(right_image)
+        && is_white(top_image)
+        && is_white(bottom_image)
+        && (stats.average.r > stats.average.b + 180)
+        && (stats.average.r > stats.average.g + 180)
+    ){
+        return true;
+    }
+    return false;
+}
+
+SelectionDialogDetector::SelectionDialogDetector(Color color)
+    : m_right_box(0.923385, 0.748077, 0.00615385, 0.204577)
+    , m_top_box(0.0704615, 0.741846, 0.859077, 0.00623077)
+    , m_bottom_box(0.0716923, 0.943308, 0.851692, 0.00934615)
+    , m_selection_box(0.885231, 0.447962, 0.016, 0.2025)
+{}
+void SelectionDialogDetector::make_overlays(VideoOverlaySet& items) const{
+    const BoxOption& GAME_BOX = GameSettings::instance().GAME_BOX;
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_right_box));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_top_box));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_bottom_box));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_selection_box));
+}
+bool SelectionDialogDetector::detect(const ImageViewRGB32& screen){
+    ImageViewRGB32 game_screen = extract_box_reference(screen, GameSettings::instance().GAME_BOX);
+
+    ImageViewRGB32 right_image = extract_box_reference(game_screen, m_right_box);
+    ImageViewRGB32 top_image = extract_box_reference(game_screen, m_top_box);
+    ImageViewRGB32 bottom_image = extract_box_reference(game_screen, m_bottom_box);
+    ImageViewRGB32 selection_image = extract_box_reference(game_screen, m_selection_box);
+    if (is_white(right_image)
+        && is_white(top_image)
+        && is_white(bottom_image)
+        && is_white(selection_image)
+    ){
+        return true;
+    }
+    return false;
+}
+
+class Test_AdvanceWhiteDialogDetector : public ImageUnitTest{
+public:
+
+    Test_AdvanceWhiteDialogDetector(
+        const std::string& image,
+        bool expected
+    )
+        : ImageUnitTest("PokemonFRLG::AdvanceWhiteDialogDetector - " + image, {image})
+        , m_expected(expected)
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        AdvanceWhiteDialogDetector detector(COLOR_RED);
+        const ImageRGB32& image = images[0];
+        return detector.detect(image) == m_expected;
+    };
+
+private:
+    bool m_expected;
+};
+
+void add_tests_AdvanceWhiteDialogDetector(UnitTestDatabase& database){
+    database.add<Test_AdvanceWhiteDialogDetector>("PokemonFRLG/AdvanceWhiteDialogDetector/Eng-Select_False.png", false);
+    database.add<Test_AdvanceWhiteDialogDetector>("PokemonFRLG/AdvanceWhiteDialogDetector/English-Bulba_True.png", true);
+    database.add<Test_AdvanceWhiteDialogDetector>("PokemonFRLG/AdvanceWhiteDialogDetector/Ger-KennyExile-Bulba_True.png", true);
+    database.add<Test_AdvanceWhiteDialogDetector>("PokemonFRLG/AdvanceWhiteDialogDetector/Ger-KennyExile-Char_True.png", true);
+    database.add<Test_AdvanceWhiteDialogDetector>("PokemonFRLG/AdvanceWhiteDialogDetector/Ger-KennyExile-Sq_True.png", true);
+    database.add<Test_AdvanceWhiteDialogDetector>("PokemonFRLG/AdvanceWhiteDialogDetector/MacOS-not-ili-Char_False.png", false);
+    database.add<Test_AdvanceWhiteDialogDetector>("PokemonFRLG/AdvanceWhiteDialogDetector/MacOS-not-ili-Char_True.png", true);
+    database.add<Test_AdvanceWhiteDialogDetector>("PokemonFRLG/AdvanceWhiteDialogDetector/Spanish-AlejaKaiser-Bulba_True.png", true);
+    database.add<Test_AdvanceWhiteDialogDetector>("PokemonFRLG/AdvanceWhiteDialogDetector/Spanish-AlejaKaiser-Char_True.png", true);
+    database.add<Test_AdvanceWhiteDialogDetector>("PokemonFRLG/AdvanceWhiteDialogDetector/Spanish-AlejaKaiser-Squirtl_True.png", true);
+}
+
+class Test_SelectionDialogDetector : public ImageUnitTest{
+public:
+
+    Test_SelectionDialogDetector(
+        const std::string& image,
+        bool expected
+    )
+        : ImageUnitTest("PokemonFRLG::SelectionDialogDetector - " + image, {image})
+        , m_expected(expected)
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        SelectionDialogDetector detector(COLOR_RED);
+        const ImageRGB32& image = images[0];
+        return detector.detect(image) == m_expected;
+    };
+
+private:
+    bool m_expected;
+};
+
+void add_tests_SelectionDialogDetector(UnitTestDatabase& database){
+    database.add<Test_SelectionDialogDetector>("PokemonFRLG/SelectionDialogDetector/Eng-Select_True.png", true);
+    database.add<Test_SelectionDialogDetector>("PokemonFRLG/SelectionDialogDetector/English-Bulba-720p_True.png", true);
+    database.add<Test_SelectionDialogDetector>("PokemonFRLG/SelectionDialogDetector/English-Bulba_False.png", false);
+    database.add<Test_SelectionDialogDetector>("PokemonFRLG/SelectionDialogDetector/Ger-KennyExile-Sq_False.png", false);
+    database.add<Test_SelectionDialogDetector>("PokemonFRLG/SelectionDialogDetector/MacOS-not-ili-Char_False.png", false);
+    database.add<Test_SelectionDialogDetector>("PokemonFRLG/SelectionDialogDetector/MacOS-not-ili-Char_True.png", true);
+}
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_DialogDetector.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_DialogDetector.h
new file mode 100644
index 0000000000..b9041ac1a1
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_DialogDetector.h
@@ -0,0 +1,144 @@
+/*  Dialog Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonFRLG_DialogDetector_H
+#define PokemonAutomation_PokemonFRLG_DialogDetector_H
+
+#include <chrono>
+#include "Common/Cpp/Color.h"
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/VisualDetector.h"
+#include "CommonTools/VisualDetectors/BlackScreenDetector.h"
+#include "VideoGames/PokemonFRLG/PokemonFRLG_Settings.h"
+
+namespace PokemonAutomation{
+    class CancellableScope;
+    class VideoFeed;
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+
+class WhiteScreenOverWatcher : public PokemonAutomation::WhiteScreenOverWatcher{
+public:
+    WhiteScreenOverWatcher(Color color = COLOR_RED)
+        : PokemonAutomation::WhiteScreenOverWatcher(
+            color,
+            GameSettings::instance().GAME_BOX.inner_to_outer({0.231692, 0.0616538, 0.551385, 0.9045})
+        )
+    {}
+};
+class BlackScreenWatcher : public PokemonAutomation::BlackScreenWatcher{
+public:
+    BlackScreenWatcher(Color color = COLOR_RED)
+        : PokemonAutomation::BlackScreenWatcher(
+            color,
+            GameSettings::instance().GAME_BOX.inner_to_outer({0.231692, 0.0616538, 0.551385, 0.9045})
+        )
+    {}
+};
+class BlackScreenOverWatcher : public PokemonAutomation::BlackScreenOverWatcher{
+public:
+    BlackScreenOverWatcher(Color color = COLOR_RED)
+        : PokemonAutomation::BlackScreenOverWatcher(
+            color,
+            GameSettings::instance().GAME_BOX.inner_to_outer({0.231692, 0.0616538, 0.551385, 0.9045})
+        )
+    {}
+};
+
+
+
+// When given a choice popup, there is no advance arrow.
+// FRLG doesn't have an advance arrow on the final line of dialog when speaking to an npc!
+
+//Standard - npc dialog, interacting with items, etc.
+//tutorial - white box with grey mat like a picture frame
+
+// Common dialog box for npcs, etc.
+// This one detects the final line spoken, so no red arrow
+// This also detects all the other white dialogs, so use sparingly
+class WhiteDialogDetector : public StaticScreenDetector{
+public:
+    WhiteDialogDetector(Color color);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    ImageFloatBox m_right_box;
+    ImageFloatBox m_top_box;
+    ImageFloatBox m_bottom_box;
+};
+class WhiteDialogWatcher : public DetectorToFinder<WhiteDialogDetector>{
+public:
+    WhiteDialogWatcher(Color color)
+        : DetectorToFinder("WhiteDialogWatcher", std::chrono::milliseconds(250), color)
+    {}
+};
+
+class WhiteDialogOverWatcher : public DetectorToFinder<WhiteDialogDetector>{
+public:
+    WhiteDialogOverWatcher(Color color)
+        : DetectorToFinder("WhiteDialogOverWatcher", FinderType::GONE, std::chrono::milliseconds(250), color)
+    {}
+};
+
+// Same as WhiteDialogDetector, but filter for the red arrow
+// Detect the red advancement arrow by filtering for DARK red.
+// There is red/pink color text for female npcs in non-japan versions
+// might be an issue if using it for things other than shiny-hunt resetting
+// all gifts are black/blue dialogs?
+class AdvanceWhiteDialogDetector : public StaticScreenDetector{
+public:
+    AdvanceWhiteDialogDetector(Color color);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    ImageFloatBox m_dialog_box;
+    ImageFloatBox m_right_box;
+    ImageFloatBox m_top_box;
+    ImageFloatBox m_bottom_box;
+};
+class AdvanceWhiteDialogWatcher : public DetectorToFinder<AdvanceWhiteDialogDetector>{
+public:
+    AdvanceWhiteDialogWatcher(Color color)
+        : DetectorToFinder("AdvanceWhiteDialogWatcher", std::chrono::milliseconds(250), color)
+    {}
+};
+
+// Same as WhiteDialogDetector, but also looks for the white of the Yes/No box
+class SelectionDialogDetector : public StaticScreenDetector{
+public:
+    SelectionDialogDetector(Color color);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    ImageFloatBox m_right_box;
+    ImageFloatBox m_top_box;
+    ImageFloatBox m_bottom_box;
+    ImageFloatBox m_selection_box;
+};
+class SelectionDialogWatcher : public DetectorToFinder<SelectionDialogDetector>{
+public:
+    SelectionDialogWatcher(Color color)
+        : DetectorToFinder("SelectionDialogWatcher", std::chrono::milliseconds(250), color)
+    {}
+};
+
+void add_tests_AdvanceWhiteDialogDetector(UnitTestDatabase& database);
+void add_tests_SelectionDialogDetector(UnitTestDatabase& database);
+
+}
+}
+}
+
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_PartyDialogs.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_PartyDialogs.cpp
new file mode 100644
index 0000000000..8903a2d386
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_PartyDialogs.cpp
@@ -0,0 +1,135 @@
+/*  Party Dialog Detectors
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonTools/Images/SolidColorTest.h"
+#include "CommonTools/Images/ImageFilter.h"
+#include "VideoGames/PokemonFRLG/PokemonFRLG_Settings.h"
+#include "PokemonFRLG_PartyDialogs.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+
+PartySelectionDetector::PartySelectionDetector(Color color)
+    : m_dialog_right_box(0.955, 0.648, 0.010, 0.303)
+    , m_page_background_box(0.028, 0.500, 0.010, 0.250)
+{}
+void PartySelectionDetector::make_overlays(VideoOverlaySet& items) const{
+    const BoxOption& GAME_BOX = GameSettings::instance().GAME_BOX;
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_dialog_right_box));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_page_background_box));
+}
+bool PartySelectionDetector::detect(const ImageViewRGB32& screen){
+    ImageViewRGB32 game_screen = extract_box_reference(screen, GameSettings::instance().GAME_BOX);
+
+    //Dialog is white
+    ImageViewRGB32 dialog_right_image = extract_box_reference(game_screen, m_dialog_right_box);
+
+    //Menu background is teal
+    ImageViewRGB32 menu_background_image = extract_box_reference(game_screen, m_page_background_box);
+
+    if (is_white(dialog_right_image)
+        && is_solid(menu_background_image, { 0.020, 0.424, 0.412 }, 0.25, 20) //5, 108, 105 teal
+    ){
+        return true;
+    }
+    return false;
+}
+
+
+PartyLevelUpDetector::PartyLevelUpDetector(Color color, PartyLevelUpDialog dialog_type, Language language)
+    : dialog_type(dialog_type)
+    , jpn(language == Language::Japanese)
+    , m_border_top_box(0.619231, 0.023038, 0.362179, 0.001923) // gray (120, 115, 140)
+    , m_border_right_box(0.982692, 0.025923, 0.001923, 0.597115)
+    , m_dialog_top_box(0.626282, 0.042492, 0.341026, 0.006175)  // white
+    , m_dialog_right_box(0.967949, 0.050923, 0.003846, 0.550962)
+    , m_plus_box(0.862663, 0.051852, 0.017788, 0.553560)
+    , m_plus_box_jpn(0.895663, 0.051852, 0.021267, 0.553560)
+{}
+void PartyLevelUpDetector::make_overlays(VideoOverlaySet& items) const{
+    const BoxOption& GAME_BOX = GameSettings::instance().GAME_BOX;
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_border_top_box));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_border_right_box));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_dialog_top_box));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_dialog_right_box));
+}
+bool PartyLevelUpDetector::detect(const ImageViewRGB32& screen){
+    ImageViewRGB32 game_screen = extract_box_reference(screen, GameSettings::instance().GAME_BOX);
+
+    ImageViewRGB32 border_top_image = extract_box_reference(game_screen, m_border_top_box);
+    ImageViewRGB32 border_right_image = extract_box_reference(game_screen, m_border_right_box);
+
+    ImageViewRGB32 dialog_top_image = extract_box_reference(game_screen, m_dialog_top_box);
+    ImageViewRGB32 dialog_right_image = extract_box_reference(game_screen, m_dialog_right_box);
+   
+    //Plus box is not solid white on the first screen, but is white on the second one
+    //For Japanese, this logic is flipped. The first screen will have no text in the 10s place,
+    //and the second screen always will
+    ImageViewRGB32 plus_image = extract_box_reference(game_screen, jpn ? m_plus_box_jpn : m_plus_box);
+    bool good_plus_image = false;
+    if (dialog_type == PartyLevelUpDialog::either){
+        good_plus_image = true;
+    }else if (jpn){
+        good_plus_image = (
+            (dialog_type == PartyLevelUpDialog::plus && is_white(plus_image)) ||
+            (dialog_type == PartyLevelUpDialog::stats && !is_white(plus_image))
+        );
+    }else{
+        good_plus_image = (
+            (dialog_type == PartyLevelUpDialog::plus && !is_white(plus_image)) ||
+            (dialog_type == PartyLevelUpDialog::stats && is_white(plus_image))
+        );
+    }
+
+    if (is_solid(border_top_image, { 0.320, 0.307, 0.373 }, 0.25, 20)
+        && is_solid(border_right_image, { 0.320, 0.307, 0.373 }, 0.25, 20)
+        && is_white(dialog_top_image)
+        && is_white(dialog_right_image)
+        && good_plus_image
+    ){
+        return true;
+    }
+    return false;
+}
+
+PartyMoveLearnDetector::PartyMoveLearnDetector(Color color)
+    : m_border_top_box(0.685096, 0.422836, 0.229327, 0.002163) // gray (120, 115, 140)
+    , m_border_right_box(0.916346, 0.426442, 0.001442, 0.245913)
+    , m_dialog_top_box(0.699038, 0.445913, 0.200000, 0.006490)  // white
+    , m_dialog_right_box(0.899519, 0.454567, 0.004327, 0.194712)
+{}
+void PartyMoveLearnDetector::make_overlays(VideoOverlaySet& items) const{
+    const BoxOption& GAME_BOX = GameSettings::instance().GAME_BOX;
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_border_top_box));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_border_right_box));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_dialog_top_box));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_dialog_right_box));
+}
+bool PartyMoveLearnDetector::detect(const ImageViewRGB32& screen){
+    ImageViewRGB32 game_screen = extract_box_reference(screen, GameSettings::instance().GAME_BOX);
+
+    ImageViewRGB32 border_top_image = extract_box_reference(game_screen, m_border_top_box);
+    ImageViewRGB32 border_right_image = extract_box_reference(game_screen, m_border_right_box);
+
+    ImageViewRGB32 dialog_top_image = extract_box_reference(game_screen, m_dialog_top_box);
+    ImageViewRGB32 dialog_right_image = extract_box_reference(game_screen, m_dialog_right_box);
+
+    if (is_solid(border_top_image, { 0.320, 0.307, 0.373 }, 0.25, 20)
+        && is_solid(border_right_image, { 0.320, 0.307, 0.373 }, 0.25, 20)
+        && is_white(dialog_top_image)
+        && is_white(dialog_right_image)
+    ){
+        return true;
+    }
+    return false;
+}
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_PartyDialogs.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_PartyDialogs.h
new file mode 100644
index 0000000000..5b987af377
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_PartyDialogs.h
@@ -0,0 +1,102 @@
+/*  Party Dialog Detectors
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonFRLG_PartyDialogs_H
+#define PokemonAutomation_PokemonFRLG_PartyDialogs_H
+
+#include <chrono>
+#include "Common/Cpp/Color.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonFramework/Language.h"
+#include "CommonTools/VisualDetector.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+
+namespace PokemonAutomation{
+    class CancellableScope;
+    class VideoFeed;
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+
+// The Party menu has a white box in the bottom right corner when a Pokemon is selected
+// The background around the edges is dark teal/navy
+class PartySelectionDetector : public StaticScreenDetector{
+public:
+    PartySelectionDetector(Color color);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    ImageFloatBox m_dialog_right_box;
+    ImageFloatBox m_page_background_box;
+};
+class PartySelectionWatcher : public DetectorToFinder<PartySelectionDetector>{
+public:
+    PartySelectionWatcher(Color color)
+        : DetectorToFinder("PartySelectionWatcher", std::chrono::milliseconds(250), color)
+    {}
+};
+
+enum class PartyLevelUpDialog{
+    plus,
+    stats,
+    either
+};
+
+class PartyLevelUpDetector : public StaticScreenDetector{
+public:
+    PartyLevelUpDetector(Color color, PartyLevelUpDialog dialog_type, Language language);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    PartyLevelUpDialog dialog_type;
+    bool jpn;
+    ImageFloatBox m_border_top_box;
+    ImageFloatBox m_border_right_box;
+    ImageFloatBox m_dialog_top_box;
+    ImageFloatBox m_dialog_right_box;
+    ImageFloatBox m_plus_box;
+    ImageFloatBox m_plus_box_jpn;
+};
+class PartyLevelUpWatcher : public DetectorToFinder<PartyLevelUpDetector>{
+public:
+    PartyLevelUpWatcher(Color color, PartyLevelUpDialog dialog_type, Language language)
+        : DetectorToFinder("PartyLevelUpWatcher", std::chrono::milliseconds(250), color, dialog_type, language)
+    {}
+};
+
+
+class PartyMoveLearnDetector : public StaticScreenDetector{
+public:
+    PartyMoveLearnDetector(Color color);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    ImageFloatBox m_border_top_box;
+    ImageFloatBox m_border_right_box;
+    ImageFloatBox m_dialog_top_box;
+    ImageFloatBox m_dialog_right_box;
+};
+class PartyMoveLearnWatcher : public DetectorToFinder<PartyMoveLearnDetector>{
+public:
+    PartyMoveLearnWatcher(Color color)
+        : DetectorToFinder("PartyMoveLearnWatcher", std::chrono::milliseconds(250), color)
+    {}
+};
+
+
+
+}
+}
+}
+
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_PrizeSelectDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_PrizeSelectDetector.cpp
new file mode 100644
index 0000000000..bb1308d07a
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_PrizeSelectDetector.cpp
@@ -0,0 +1,83 @@
+/*  Prize Select Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/ImageTools/ImageStats.h"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Images/SolidColorTest.h"
+#include "CommonTools/Images/ImageFilter.h"
+#include "CommonTools/Images/WaterfillUtilities.h"
+#include "Tests/ImageUnitTest.h"
+#include "VideoGames/PokemonFRLG/PokemonFRLG_Settings.h"
+#include "PokemonFRLG_PrizeSelectDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+PrizeSelectDetector::PrizeSelectDetector(Color color)
+    : m_right_box(0.923385, 0.748077, 0.00615385, 0.204577)
+    , m_top_box(0.0704615, 0.75, 0.859077, 0.00623077)
+    , m_bottom_box(0.0716923, 0.943308, 0.851692, 0.00934615)
+    , m_selection_box(0.705538, 0.528962, 0.212923, 0.0602308)
+{}
+void PrizeSelectDetector::make_overlays(VideoOverlaySet& items) const{
+    const BoxOption& GAME_BOX = GameSettings::instance().GAME_BOX;
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_right_box));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_top_box));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_bottom_box));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_selection_box));
+}
+bool PrizeSelectDetector::detect(const ImageViewRGB32& screen){
+    ImageViewRGB32 game_screen = extract_box_reference(screen, GameSettings::instance().GAME_BOX);
+
+    ImageViewRGB32 right_image = extract_box_reference(game_screen, m_right_box);
+    ImageViewRGB32 top_image = extract_box_reference(game_screen, m_top_box);
+    ImageViewRGB32 bottom_image = extract_box_reference(game_screen, m_bottom_box);
+    ImageViewRGB32 selection_image = extract_box_reference(game_screen, m_selection_box);
+    if (is_white(right_image)
+        && is_white(top_image)
+        && is_white(bottom_image)
+        && is_white(selection_image)
+    ){
+        return true;
+    }
+    return false;
+}
+
+class Test_PrizeSelectDetector : public ImageUnitTest{
+public:
+
+    Test_PrizeSelectDetector(
+        const std::string& image,
+        bool expected
+    )
+        : ImageUnitTest("PokemonFRLG::PrizeSelectDetector - " + image, {image})
+        , m_expected(expected)
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        PrizeSelectDetector detector(COLOR_RED);
+        const ImageRGB32& image = images[0];
+        return detector.detect(image) == m_expected;
+    };
+
+private:
+    bool m_expected;
+};
+
+void add_tests_PrizeSelectDetector(UnitTestDatabase& database){
+    //todo: gather test images for this detector
+}
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_PrizeSelectDetector.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_PrizeSelectDetector.h
new file mode 100644
index 0000000000..5423c637e0
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_PrizeSelectDetector.h
@@ -0,0 +1,57 @@
+/*  Prize Select Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonFRLG_PrizeSelectDetector_H
+#define PokemonAutomation_PokemonFRLG_PrizeSelectDetector_H
+
+#include <chrono>
+#include <atomic>
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "Common/Cpp/Color.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonTools/VisualDetector.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+
+namespace PokemonAutomation{
+    class CancellableScope;
+    class VideoFeed;
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+// Same as WhiteDialogDetector, but also looks for the white on the final line of the prize select box
+// All 3 prize booths have 5 items, however the width of the box varies so we have to go by height
+// (also I'm not sure if width varies by language)
+// can't use the coin count in the top left, as that appears as soon as you talk to the booth
+// a future improvement might be to look for the selection arrow, but keep in mind width varies
+class PrizeSelectDetector : public StaticScreenDetector{
+public:
+    PrizeSelectDetector(Color color);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    ImageFloatBox m_right_box;
+    ImageFloatBox m_top_box;
+    ImageFloatBox m_bottom_box;
+    ImageFloatBox m_selection_box;
+};
+class PrizeSelectWatcher : public DetectorToFinder<PrizeSelectDetector>{
+public:
+    PrizeSelectWatcher(Color color)
+        : DetectorToFinder("PrizeSelectWatcher", std::chrono::milliseconds(250), color)
+    {}
+};
+
+void add_tests_PrizeSelectDetector(UnitTestDatabase& database);
+
+
+}
+}
+}
+
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Map/PokemonFRLG_MapDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Map/PokemonFRLG_MapDetector.cpp
new file mode 100644
index 0000000000..575e7f806b
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Map/PokemonFRLG_MapDetector.cpp
@@ -0,0 +1,56 @@
+/*  Map Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Images/SolidColorTest.h"
+#include "CommonTools/Images/ImageFilter.h"
+#include "CommonTools/Images/SolidColorTest.h"
+#include "CommonTools/Images/WaterfillUtilities.h"
+#include "VideoGames/PokemonFRLG/PokemonFRLG_Settings.h"
+#include "PokemonFRLG_MapDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+KantoMapDetector::KantoMapDetector(Color color)
+    : m_top_box(0.010, 0.010, 0.500, 0.080) // blue (0, 122, 255)
+    , m_left_box(0.069, 0.110, 0.025, 0.880) // white
+    , m_right_box(0.902, 0.110, 0.025, 0.880) // white
+    , m_land_box(0.105, 0.600, 0.087, 0.028) // green (31, 173, 0)
+    // , m_route_25_box(0.603, 0.252, 0.090, 0.040) // orange (255, 176, 0)
+{}
+void KantoMapDetector::make_overlays(VideoOverlaySet& items) const{
+    const BoxOption& GAME_BOX = GameSettings::instance().GAME_BOX;
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_top_box));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_left_box));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_right_box));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_land_box));
+}
+bool KantoMapDetector::detect(const ImageViewRGB32& screen){
+    ImageViewRGB32 game_screen = extract_box_reference(screen, GameSettings::instance().GAME_BOX);
+
+    ImageViewRGB32 top_image = extract_box_reference(game_screen, m_top_box);
+    ImageViewRGB32 left_image = extract_box_reference(game_screen, m_left_box);
+    ImageViewRGB32 right_image = extract_box_reference(game_screen, m_right_box);
+    ImageViewRGB32 land_image = extract_box_reference(game_screen, m_land_box);
+    if (is_solid(top_image, { 0.0000, 0.3236, 0.6764 }, 0.25, 20)
+        && is_white(left_image)
+        && is_white(right_image)
+        && is_solid(land_image, { 0.1520, 0.8480, 0.0000 }, 0.25, 20)
+    ){
+        return true;
+    }
+    return false;
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Map/PokemonFRLG_MapDetector.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Map/PokemonFRLG_MapDetector.h
new file mode 100644
index 0000000000..cfde346338
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Map/PokemonFRLG_MapDetector.h
@@ -0,0 +1,50 @@
+/*  Map Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonFRLG_MapDetector_H
+#define PokemonAutomation_PokemonFRLG_MapDetector_H
+
+#include <chrono>
+#include "Common/Cpp/Color.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonTools/VisualDetector.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+
+namespace PokemonAutomation{
+    class CancellableScope;
+    class VideoFeed;
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+// Detect the map screen for Kanto
+class KantoMapDetector : public StaticScreenDetector{
+public:
+    KantoMapDetector(Color color);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    ImageFloatBox m_top_box;
+    ImageFloatBox m_left_box;
+    ImageFloatBox m_right_box;
+    ImageFloatBox m_land_box;
+};
+class KantoMapWatcher : public DetectorToFinder<KantoMapDetector>{
+public:
+    KantoMapWatcher(Color color)
+        : DetectorToFinder("KantoMapWatcher", std::chrono::milliseconds(250), color)
+    {}
+};
+
+
+
+}
+}
+}
+
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Map/PokemonFRLG_PokemonLeagueDetectors.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Map/PokemonFRLG_PokemonLeagueDetectors.cpp
new file mode 100644
index 0000000000..7e844c3645
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Map/PokemonFRLG_PokemonLeagueDetectors.cpp
@@ -0,0 +1,353 @@
+/*  Pokemon League Detectors
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <array>
+#include <cstdio>
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/ImageTools/ImageStats.h"
+#include "CommonFramework/ImageTypes/ImageRGB32.h"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Images/SolidColorTest.h"
+#include "Tests/ImageUnitTest.h"
+#include "VideoGames/PokemonFRLG/PokemonFRLG_Settings.h"
+#include "PokemonFRLG_PokemonLeagueDetectors.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+
+const char* elite_four_room_name(EliteFourRoom room){
+    switch (room){
+    case EliteFourRoom::NONE:    return "unknown";
+    case EliteFourRoom::LORELEI: return "Lorelei's room";
+    case EliteFourRoom::BRUNO:   return "Bruno's room";
+    case EliteFourRoom::AGATHA:  return "Agatha's room";
+    case EliteFourRoom::LANCE:   return "Lance's room";
+    }
+    return "unknown";
+}
+
+
+namespace{
+
+//  Plain floor inside the white battle rectangle, below the center line,
+//  between the rectangle's side lines and the center circle. These spots
+//  are a few game pixels from every edge, so small framing differences
+//  between capture cards don't reach the lines, the circle or the pillar
+//  shadows. Coordinates are relative to the game box.
+const ImageFloatBox FLOOR_LEFT_BOX (0.356, 0.601, 0.034, 0.079);
+const ImageFloatBox FLOOR_RIGHT_BOX(0.611, 0.601, 0.034, 0.079);
+
+struct RoomColor{
+    EliteFourRoom room;
+    FloatPixel ratio;   //  floor color as r/g/b ratios (sum to 1)
+};
+
+//  Measured from screenshots of each room (floor colors in RGB:
+//  Lorelei 134,180,223 / Bruno 219,211,112 / Agatha 194,159,233 / Lance 91,172,173).
+const std::array<RoomColor, 4> ROOM_COLORS{{
+    {EliteFourRoom::LORELEI, {0.2501, 0.3353, 0.4146}},
+    {EliteFourRoom::BRUNO,   {0.4038, 0.3891, 0.2070}},
+    {EliteFourRoom::AGATHA,  {0.3316, 0.2716, 0.3968}},
+    {EliteFourRoom::LANCE,   {0.2096, 0.3941, 0.3963}},
+}};
+
+//  Standard solid-color tolerance, to allow for capture card differences.
+//  At this tolerance the three bluish rooms (Lorelei, Agatha, Lance) can't
+//  be told apart from each other, only from Bruno's yellow room. So the
+//  detector only checks for the room the program expects: the rooms are
+//  always entered in the same order, and this confirms the player made it
+//  into an Elite Four room after each door.
+const double ROOM_MAX_DISTANCE = 0.20;
+const double FLOOR_MAX_STDDEV_SUM = 60;     //  the floor has faint stripes
+const double FLOOR_MIN_RGB_SUM = 250;       //  rules out fades to black
+
+const FloatPixel& room_color(EliteFourRoom room){
+    for (const RoomColor& item : ROOM_COLORS){
+        if (item.room == room){
+            return item.ratio;
+        }
+    }
+    static const FloatPixel NO_COLOR(0, 0, 0);
+    return NO_COLOR;
+}
+
+bool floor_matches(const ImageStats& stats, EliteFourRoom room){
+    return room != EliteFourRoom::NONE
+        && stats.average.sum() >= FLOOR_MIN_RGB_SUM
+        && is_solid(stats, room_color(room), ROOM_MAX_DISTANCE, FLOOR_MAX_STDDEV_SUM);
+}
+
+//  The closest room within the tolerance, for error messages.
+EliteFourRoom closest_room(const ImageStats& stats){
+    if (stats.average.sum() < FLOOR_MIN_RGB_SUM || stats.stddev.sum() > FLOOR_MAX_STDDEV_SUM){
+        return EliteFourRoom::NONE;
+    }
+    const FloatPixel ratio = stats.average / stats.average.sum();
+
+    EliteFourRoom best = EliteFourRoom::NONE;
+    double best_distance = ROOM_MAX_DISTANCE;
+    for (const RoomColor& item : ROOM_COLORS){
+        double distance = euclidean_distance(ratio, item.ratio);
+        if (distance <= best_distance){
+            best_distance = distance;
+            best = item.room;
+        }
+    }
+    return best;
+}
+
+}
+
+
+std::string describe_elite_four_floor(const ImageViewRGB32& screen){
+    ImageViewRGB32 game_screen = extract_box_reference(screen, GameSettings::instance().GAME_BOX);
+    std::string ret;
+    const char* sides[] = {"left", "right"};
+    const ImageFloatBox* boxes[] = {&FLOOR_LEFT_BOX, &FLOOR_RIGHT_BOX};
+    for (int i = 0; i < 2; i++){
+        ImageStats stats = image_stats(extract_box_reference(game_screen, *boxes[i]));
+        char buffer[160];
+        std::snprintf(
+            buffer, sizeof(buffer),
+            "%s%s floor: rgb(%.0f, %.0f, %.0f), stddev sum %.1f",
+            i == 0 ? "" : " | ", sides[i],
+            stats.average.r, stats.average.g, stats.average.b, stats.stddev.sum()
+        );
+        ret += buffer;
+    }
+    return ret;
+}
+
+
+bool is_in_elite_four_room(const ImageViewRGB32& screen, EliteFourRoom room){
+    ImageViewRGB32 game_screen = extract_box_reference(screen, GameSettings::instance().GAME_BOX);
+    return floor_matches(image_stats(extract_box_reference(game_screen, FLOOR_LEFT_BOX)), room)
+        && floor_matches(image_stats(extract_box_reference(game_screen, FLOOR_RIGHT_BOX)), room);
+}
+
+EliteFourRoom read_elite_four_room(const ImageViewRGB32& screen){
+    ImageViewRGB32 game_screen = extract_box_reference(screen, GameSettings::instance().GAME_BOX);
+    EliteFourRoom left = closest_room(image_stats(extract_box_reference(game_screen, FLOOR_LEFT_BOX)));
+    EliteFourRoom right = closest_room(image_stats(extract_box_reference(game_screen, FLOOR_RIGHT_BOX)));
+    return left == right ? left : EliteFourRoom::NONE;
+}
+
+
+EliteFourRoomDetector::EliteFourRoomDetector(Color color, EliteFourRoom room)
+    : m_color(color)
+    , m_room(room)
+{}
+void EliteFourRoomDetector::make_overlays(VideoOverlaySet& items) const{
+    const BoxOption& GAME_BOX = GameSettings::instance().GAME_BOX;
+    items.add(m_color, GAME_BOX.inner_to_outer(FLOOR_LEFT_BOX));
+    items.add(m_color, GAME_BOX.inner_to_outer(FLOOR_RIGHT_BOX));
+}
+bool EliteFourRoomDetector::detect(const ImageViewRGB32& screen){
+    return is_in_elite_four_room(screen, m_room);
+}
+
+
+
+HallOfFameSavingDetector::HallOfFameSavingDetector(Color color)
+    : m_color(color)
+    //  Same edges as WhiteDialogDetector.
+    , m_dialog_right_box(0.923385, 0.748077, 0.00615385, 0.204577)
+    , m_dialog_top_box(0.0704615, 0.741846, 0.859077, 0.00623077)
+    , m_dialog_bottom_box(0.0716923, 0.943308, 0.851692, 0.00934615)
+    //  Plain light-blue Hall of Fame background (174, 190, 241) above the box.
+    , m_background_box(0.30, 0.20, 0.40, 0.30)
+    //  Dark blue-grey band (70, 78, 99) across the top of the screen.
+    , m_top_band_box(0.10, 0.02, 0.80, 0.06)
+{}
+void HallOfFameSavingDetector::make_overlays(VideoOverlaySet& items) const{
+    const BoxOption& GAME_BOX = GameSettings::instance().GAME_BOX;
+    items.add(m_color, GAME_BOX.inner_to_outer(m_dialog_right_box));
+    items.add(m_color, GAME_BOX.inner_to_outer(m_dialog_top_box));
+    items.add(m_color, GAME_BOX.inner_to_outer(m_dialog_bottom_box));
+    items.add(m_color, GAME_BOX.inner_to_outer(m_background_box));
+    items.add(m_color, GAME_BOX.inner_to_outer(m_top_band_box));
+}
+bool HallOfFameSavingDetector::detect(const ImageViewRGB32& screen){
+    ImageViewRGB32 game_screen = extract_box_reference(screen, GameSettings::instance().GAME_BOX);
+    if (!is_white(extract_box_reference(game_screen, m_dialog_right_box))
+        || !is_white(extract_box_reference(game_screen, m_dialog_top_box))
+        || !is_white(extract_box_reference(game_screen, m_dialog_bottom_box))
+    ){
+        return false;
+    }
+
+    //  A large plain light-blue area, with a darker plain band of a similar
+    //  hue above it. Overworld rooms with a dialogue box open fail the
+    //  plainness checks (sprites, pillars and floor patterns), so the color
+    //  tolerance can stay at the usual level.
+    ImageStats background = image_stats(extract_box_reference(game_screen, m_background_box));
+    ImageStats top_band = image_stats(extract_box_reference(game_screen, m_top_band_box));
+    return is_solid(background, {0.2872, 0.3144, 0.3984}, 0.20, 40)
+        && is_solid(top_band, {0.2825, 0.3150, 0.4025}, 0.20, 30)
+        && top_band.average.sum() < background.average.sum() * 0.7;
+}
+
+
+
+class Test_EliteFourRoomDetector : public ImageUnitTest{
+public:
+    Test_EliteFourRoomDetector(
+        const std::string& image,
+        EliteFourRoom room,
+        bool expected
+    )
+        : ImageUnitTest(
+            std::string("PokemonFRLG::EliteFourRoomDetector(") + elite_four_room_name(room) + ") - " + image,
+            {image}
+        )
+        , m_room(room)
+        , m_expected(expected)
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        EliteFourRoomDetector detector(COLOR_RED, m_room);
+        const ImageRGB32& image = images[0];
+        return detector.detect(image) == m_expected;
+    };
+
+private:
+    EliteFourRoom m_room;
+    bool m_expected;
+};
+
+void add_tests_EliteFourRoomDetector(UnitTestDatabase& database){
+    //  Captures from Kuroneko: 4K60, Shadowcast and MYPIN (a low-end benchmark
+    //  card) capture cards, each in NV12 and YUYV formats.
+    database.add<Test_EliteFourRoomDetector>("PokemonFRLG/EliteFourRoomDetector/Lorelei-4k60-NV12.png", EliteFourRoom::LORELEI, true);
+    database.add<Test_EliteFourRoomDetector>("PokemonFRLG/EliteFourRoomDetector/Lorelei-4k60-YUYV.png", EliteFourRoom::LORELEI, true);
+    database.add<Test_EliteFourRoomDetector>("PokemonFRLG/EliteFourRoomDetector/Lorelei-Shadowcast-NV12.png", EliteFourRoom::LORELEI, true);
+    database.add<Test_EliteFourRoomDetector>("PokemonFRLG/EliteFourRoomDetector/Lorelei-Shadowcast-YUYV.png", EliteFourRoom::LORELEI, true);
+    database.add<Test_EliteFourRoomDetector>("PokemonFRLG/EliteFourRoomDetector/Lorelei-MYPIN-NV12.png", EliteFourRoom::LORELEI, true);
+    database.add<Test_EliteFourRoomDetector>("PokemonFRLG/EliteFourRoomDetector/Lorelei-MYPIN-YUYV.png", EliteFourRoom::LORELEI, true);
+    database.add<Test_EliteFourRoomDetector>("PokemonFRLG/EliteFourRoomDetector/Bruno-4k60-NV12.png", EliteFourRoom::BRUNO, true);
+    database.add<Test_EliteFourRoomDetector>("PokemonFRLG/EliteFourRoomDetector/Bruno-4k60-YUYV.png", EliteFourRoom::BRUNO, true);
+    database.add<Test_EliteFourRoomDetector>("PokemonFRLG/EliteFourRoomDetector/Bruno-Shadowcast-NV12.png", EliteFourRoom::BRUNO, true);
+    database.add<Test_EliteFourRoomDetector>("PokemonFRLG/EliteFourRoomDetector/Bruno-Shadowcast-YUYV.png", EliteFourRoom::BRUNO, true);
+    database.add<Test_EliteFourRoomDetector>("PokemonFRLG/EliteFourRoomDetector/Bruno-MYPIN-NV12.png", EliteFourRoom::BRUNO, true);
+    database.add<Test_EliteFourRoomDetector>("PokemonFRLG/EliteFourRoomDetector/Bruno-MYPIN-YUYV.png", EliteFourRoom::BRUNO, true);
+    database.add<Test_EliteFourRoomDetector>("PokemonFRLG/EliteFourRoomDetector/Agatha-4k60-NV12.png", EliteFourRoom::AGATHA, true);
+    database.add<Test_EliteFourRoomDetector>("PokemonFRLG/EliteFourRoomDetector/Agatha-4k60-YUYV.png", EliteFourRoom::AGATHA, true);
+    database.add<Test_EliteFourRoomDetector>("PokemonFRLG/EliteFourRoomDetector/Agatha-Shadowcast-NV12.png", EliteFourRoom::AGATHA, true);
+    database.add<Test_EliteFourRoomDetector>("PokemonFRLG/EliteFourRoomDetector/Agatha-Shadowcast-YUYV.png", EliteFourRoom::AGATHA, true);
+    database.add<Test_EliteFourRoomDetector>("PokemonFRLG/EliteFourRoomDetector/Agatha-MYPIN-NV12.png", EliteFourRoom::AGATHA, true);
+    database.add<Test_EliteFourRoomDetector>("PokemonFRLG/EliteFourRoomDetector/Agatha-MYPIN-YUYV.png", EliteFourRoom::AGATHA, true);
+    database.add<Test_EliteFourRoomDetector>("PokemonFRLG/EliteFourRoomDetector/Lance-4k60-NV12.png", EliteFourRoom::LANCE, true);
+    database.add<Test_EliteFourRoomDetector>("PokemonFRLG/EliteFourRoomDetector/Lance-4k60-YUYV.png", EliteFourRoom::LANCE, true);
+    database.add<Test_EliteFourRoomDetector>("PokemonFRLG/EliteFourRoomDetector/Lance-Shadowcast-NV12.png", EliteFourRoom::LANCE, true);
+    database.add<Test_EliteFourRoomDetector>("PokemonFRLG/EliteFourRoomDetector/Lance-Shadowcast-YUYV.png", EliteFourRoom::LANCE, true);
+    database.add<Test_EliteFourRoomDetector>("PokemonFRLG/EliteFourRoomDetector/Lance-MYPIN-NV12.png", EliteFourRoom::LANCE, true);
+    database.add<Test_EliteFourRoomDetector>("PokemonFRLG/EliteFourRoomDetector/Lance-MYPIN-YUYV.png", EliteFourRoom::LANCE, true);
+
+    //  Bruno's yellow floor must not pass as any of the bluish rooms, and
+    //  the bluish rooms must not pass as Bruno's. (The three bluish rooms
+    //  overlap at this tolerance, so they are not tested against each other.)
+    database.add<Test_EliteFourRoomDetector>("PokemonFRLG/EliteFourRoomDetector/Lorelei-4k60-NV12.png", EliteFourRoom::BRUNO, false);
+    database.add<Test_EliteFourRoomDetector>("PokemonFRLG/EliteFourRoomDetector/Lorelei-4k60-YUYV.png", EliteFourRoom::BRUNO, false);
+    database.add<Test_EliteFourRoomDetector>("PokemonFRLG/EliteFourRoomDetector/Lorelei-Shadowcast-NV12.png", EliteFourRoom::BRUNO, false);
+    database.add<Test_EliteFourRoomDetector>("PokemonFRLG/EliteFourRoomDetector/Lorelei-Shadowcast-YUYV.png", EliteFourRoom::BRUNO, false);
+    database.add<Test_EliteFourRoomDetector>("PokemonFRLG/EliteFourRoomDetector/Lorelei-MYPIN-NV12.png", EliteFourRoom::BRUNO, false);
+    database.add<Test_EliteFourRoomDetector>("PokemonFRLG/EliteFourRoomDetector/Lorelei-MYPIN-YUYV.png", EliteFourRoom::BRUNO, false);
+    database.add<Test_EliteFourRoomDetector>("PokemonFRLG/EliteFourRoomDetector/Bruno-4k60-NV12.png", EliteFourRoom::LORELEI, false);
+    database.add<Test_EliteFourRoomDetector>("PokemonFRLG/EliteFourRoomDetector/Bruno-4k60-NV12.png", EliteFourRoom::AGATHA, false);
+    database.add<Test_EliteFourRoomDetector>("PokemonFRLG/EliteFourRoomDetector/Bruno-4k60-NV12.png", EliteFourRoom::LANCE, false);
+    database.add<Test_EliteFourRoomDetector>("PokemonFRLG/EliteFourRoomDetector/Bruno-4k60-YUYV.png", EliteFourRoom::LORELEI, false);
+    database.add<Test_EliteFourRoomDetector>("PokemonFRLG/EliteFourRoomDetector/Bruno-4k60-YUYV.png", EliteFourRoom::AGATHA, false);
+    database.add<Test_EliteFourRoomDetector>("PokemonFRLG/EliteFourRoomDetector/Bruno-4k60-YUYV.png", EliteFourRoom::LANCE, false);
+    database.add<Test_EliteFourRoomDetector>("PokemonFRLG/EliteFourRoomDetector/Bruno-Shadowcast-NV12.png", EliteFourRoom::LORELEI, false);
+    database.add<Test_EliteFourRoomDetector>("PokemonFRLG/EliteFourRoomDetector/Bruno-Shadowcast-NV12.png", EliteFourRoom::AGATHA, false);
+    database.add<Test_EliteFourRoomDetector>("PokemonFRLG/EliteFourRoomDetector/Bruno-Shadowcast-NV12.png", EliteFourRoom::LANCE, false);
+    database.add<Test_EliteFourRoomDetector>("PokemonFRLG/EliteFourRoomDetector/Bruno-Shadowcast-YUYV.png", EliteFourRoom::LORELEI, false);
+    database.add<Test_EliteFourRoomDetector>("PokemonFRLG/EliteFourRoomDetector/Bruno-Shadowcast-YUYV.png", EliteFourRoom::AGATHA, false);
+    database.add<Test_EliteFourRoomDetector>("PokemonFRLG/EliteFourRoomDetector/Bruno-Shadowcast-YUYV.png", EliteFourRoom::LANCE, false);
+    database.add<Test_EliteFourRoomDetector>("PokemonFRLG/EliteFourRoomDetector/Bruno-MYPIN-NV12.png", EliteFourRoom::LORELEI, false);
+    database.add<Test_EliteFourRoomDetector>("PokemonFRLG/EliteFourRoomDetector/Bruno-MYPIN-NV12.png", EliteFourRoom::AGATHA, false);
+    database.add<Test_EliteFourRoomDetector>("PokemonFRLG/EliteFourRoomDetector/Bruno-MYPIN-NV12.png", EliteFourRoom::LANCE, false);
+    database.add<Test_EliteFourRoomDetector>("PokemonFRLG/EliteFourRoomDetector/Bruno-MYPIN-YUYV.png", EliteFourRoom::LORELEI, false);
+    database.add<Test_EliteFourRoomDetector>("PokemonFRLG/EliteFourRoomDetector/Bruno-MYPIN-YUYV.png", EliteFourRoom::AGATHA, false);
+    database.add<Test_EliteFourRoomDetector>("PokemonFRLG/EliteFourRoomDetector/Bruno-MYPIN-YUYV.png", EliteFourRoom::LANCE, false);
+    database.add<Test_EliteFourRoomDetector>("PokemonFRLG/EliteFourRoomDetector/Agatha-4k60-NV12.png", EliteFourRoom::BRUNO, false);
+    database.add<Test_EliteFourRoomDetector>("PokemonFRLG/EliteFourRoomDetector/Agatha-4k60-YUYV.png", EliteFourRoom::BRUNO, false);
+    database.add<Test_EliteFourRoomDetector>("PokemonFRLG/EliteFourRoomDetector/Agatha-Shadowcast-NV12.png", EliteFourRoom::BRUNO, false);
+    database.add<Test_EliteFourRoomDetector>("PokemonFRLG/EliteFourRoomDetector/Agatha-Shadowcast-YUYV.png", EliteFourRoom::BRUNO, false);
+    database.add<Test_EliteFourRoomDetector>("PokemonFRLG/EliteFourRoomDetector/Agatha-MYPIN-NV12.png", EliteFourRoom::BRUNO, false);
+    database.add<Test_EliteFourRoomDetector>("PokemonFRLG/EliteFourRoomDetector/Agatha-MYPIN-YUYV.png", EliteFourRoom::BRUNO, false);
+    database.add<Test_EliteFourRoomDetector>("PokemonFRLG/EliteFourRoomDetector/Lance-4k60-NV12.png", EliteFourRoom::BRUNO, false);
+    database.add<Test_EliteFourRoomDetector>("PokemonFRLG/EliteFourRoomDetector/Lance-4k60-YUYV.png", EliteFourRoom::BRUNO, false);
+    database.add<Test_EliteFourRoomDetector>("PokemonFRLG/EliteFourRoomDetector/Lance-Shadowcast-NV12.png", EliteFourRoom::BRUNO, false);
+    database.add<Test_EliteFourRoomDetector>("PokemonFRLG/EliteFourRoomDetector/Lance-Shadowcast-YUYV.png", EliteFourRoom::BRUNO, false);
+    database.add<Test_EliteFourRoomDetector>("PokemonFRLG/EliteFourRoomDetector/Lance-MYPIN-NV12.png", EliteFourRoom::BRUNO, false);
+    database.add<Test_EliteFourRoomDetector>("PokemonFRLG/EliteFourRoomDetector/Lance-MYPIN-YUYV.png", EliteFourRoom::BRUNO, false);
+}
+
+
+class Test_HallOfFameSavingDetector : public ImageUnitTest{
+public:
+    Test_HallOfFameSavingDetector(
+        const std::string& image,
+        bool expected
+    )
+        : ImageUnitTest("PokemonFRLG::HallOfFameSavingDetector - " + image, {image})
+        , m_expected(expected)
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        HallOfFameSavingDetector detector(COLOR_RED);
+        const ImageRGB32& image = images[0];
+        return detector.detect(image) == m_expected;
+    };
+
+private:
+    bool m_expected;
+};
+
+void add_tests_HallOfFameSavingDetector(UnitTestDatabase& database){
+    database.add<Test_HallOfFameSavingDetector>("PokemonFRLG/HallOfFameSavingDetector/Switch-Saving_True.jpg", true);
+
+    //  Elite Four rooms must not pass as the save message.
+    database.add<Test_HallOfFameSavingDetector>("PokemonFRLG/EliteFourRoomDetector/Lorelei-4k60-NV12.png", false);
+    database.add<Test_HallOfFameSavingDetector>("PokemonFRLG/EliteFourRoomDetector/Lorelei-4k60-YUYV.png", false);
+    database.add<Test_HallOfFameSavingDetector>("PokemonFRLG/EliteFourRoomDetector/Lorelei-Shadowcast-NV12.png", false);
+    database.add<Test_HallOfFameSavingDetector>("PokemonFRLG/EliteFourRoomDetector/Lorelei-Shadowcast-YUYV.png", false);
+    database.add<Test_HallOfFameSavingDetector>("PokemonFRLG/EliteFourRoomDetector/Lorelei-MYPIN-NV12.png", false);
+    database.add<Test_HallOfFameSavingDetector>("PokemonFRLG/EliteFourRoomDetector/Lorelei-MYPIN-YUYV.png", false);
+    database.add<Test_HallOfFameSavingDetector>("PokemonFRLG/EliteFourRoomDetector/Bruno-4k60-NV12.png", false);
+    database.add<Test_HallOfFameSavingDetector>("PokemonFRLG/EliteFourRoomDetector/Bruno-4k60-YUYV.png", false);
+    database.add<Test_HallOfFameSavingDetector>("PokemonFRLG/EliteFourRoomDetector/Bruno-Shadowcast-NV12.png", false);
+    database.add<Test_HallOfFameSavingDetector>("PokemonFRLG/EliteFourRoomDetector/Bruno-Shadowcast-YUYV.png", false);
+    database.add<Test_HallOfFameSavingDetector>("PokemonFRLG/EliteFourRoomDetector/Bruno-MYPIN-NV12.png", false);
+    database.add<Test_HallOfFameSavingDetector>("PokemonFRLG/EliteFourRoomDetector/Bruno-MYPIN-YUYV.png", false);
+    database.add<Test_HallOfFameSavingDetector>("PokemonFRLG/EliteFourRoomDetector/Agatha-4k60-NV12.png", false);
+    database.add<Test_HallOfFameSavingDetector>("PokemonFRLG/EliteFourRoomDetector/Agatha-4k60-YUYV.png", false);
+    database.add<Test_HallOfFameSavingDetector>("PokemonFRLG/EliteFourRoomDetector/Agatha-Shadowcast-NV12.png", false);
+    database.add<Test_HallOfFameSavingDetector>("PokemonFRLG/EliteFourRoomDetector/Agatha-Shadowcast-YUYV.png", false);
+    database.add<Test_HallOfFameSavingDetector>("PokemonFRLG/EliteFourRoomDetector/Agatha-MYPIN-NV12.png", false);
+    database.add<Test_HallOfFameSavingDetector>("PokemonFRLG/EliteFourRoomDetector/Agatha-MYPIN-YUYV.png", false);
+    database.add<Test_HallOfFameSavingDetector>("PokemonFRLG/EliteFourRoomDetector/Lance-4k60-NV12.png", false);
+    database.add<Test_HallOfFameSavingDetector>("PokemonFRLG/EliteFourRoomDetector/Lance-4k60-YUYV.png", false);
+    database.add<Test_HallOfFameSavingDetector>("PokemonFRLG/EliteFourRoomDetector/Lance-Shadowcast-NV12.png", false);
+    database.add<Test_HallOfFameSavingDetector>("PokemonFRLG/EliteFourRoomDetector/Lance-Shadowcast-YUYV.png", false);
+    database.add<Test_HallOfFameSavingDetector>("PokemonFRLG/EliteFourRoomDetector/Lance-MYPIN-NV12.png", false);
+    database.add<Test_HallOfFameSavingDetector>("PokemonFRLG/EliteFourRoomDetector/Lance-MYPIN-YUYV.png", false);
+}
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Map/PokemonFRLG_PokemonLeagueDetectors.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Map/PokemonFRLG_PokemonLeagueDetectors.h
new file mode 100644
index 0000000000..ec8ccfd18d
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Map/PokemonFRLG_PokemonLeagueDetectors.h
@@ -0,0 +1,112 @@
+/*  Pokemon League Detectors
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  Detectors for the Indigo Plateau Pokemon League:
+ *    - Which Elite Four room the player is standing in (by floor color).
+ *    - The Hall of Fame "Saving... Don't turn off the power." message.
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonFRLG_PokemonLeagueDetectors_H
+#define PokemonAutomation_PokemonFRLG_PokemonLeagueDetectors_H
+
+#include <chrono>
+#include <string>
+#include "Common/Cpp/Color.h"
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/VisualDetector.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+
+enum class EliteFourRoom{
+    NONE,
+    LORELEI,
+    BRUNO,
+    AGATHA,
+    LANCE,
+};
+const char* elite_four_room_name(EliteFourRoom room);
+
+
+//  Whether the floor color on both sides of the battle area matches the
+//  given room. Only valid once the player has walked into the room (the
+//  camera then shows the floor in the sample boxes).
+bool is_in_elite_four_room(const ImageViewRGB32& screen, EliteFourRoom room);
+
+//  The room whose floor color is closest to what's on screen, for error
+//  messages. Returns EliteFourRoom::NONE when no room is close, including
+//  fades and the lobby.
+EliteFourRoom read_elite_four_room(const ImageViewRGB32& screen);
+
+//  The measured floor colors, for the log when a room isn't recognized.
+std::string describe_elite_four_floor(const ImageViewRGB32& screen);
+
+
+//  Detects that the player is in a specific Elite Four room.
+class EliteFourRoomDetector : public StaticScreenDetector{
+public:
+    EliteFourRoomDetector(Color color, EliteFourRoom room);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    Color m_color;
+    EliteFourRoom m_room;
+};
+class EliteFourRoomWatcher : public DetectorToFinder<EliteFourRoomDetector>{
+public:
+    EliteFourRoomWatcher(Color color, EliteFourRoom room)
+        : DetectorToFinder("EliteFourRoomWatcher", std::chrono::milliseconds(250), color, room)
+    {}
+};
+
+
+//  The Hall of Fame "Saving... Don't turn off the power." message: a white
+//  dialogue box over the plain light-blue Hall of Fame background. The game
+//  finishes saving while this message is on screen, so once it disappears
+//  it is safe to reset.
+class HallOfFameSavingDetector : public StaticScreenDetector{
+public:
+    HallOfFameSavingDetector(Color color);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    Color m_color;
+    ImageFloatBox m_dialog_right_box;
+    ImageFloatBox m_dialog_top_box;
+    ImageFloatBox m_dialog_bottom_box;
+    ImageFloatBox m_background_box;
+    ImageFloatBox m_top_band_box;
+};
+class HallOfFameSavingWatcher : public DetectorToFinder<HallOfFameSavingDetector>{
+public:
+    HallOfFameSavingWatcher(Color color)
+        : DetectorToFinder("HallOfFameSavingWatcher", std::chrono::milliseconds(100), color)
+    {}
+};
+class HallOfFameSavingOverWatcher : public DetectorToFinder<HallOfFameSavingDetector>{
+public:
+    HallOfFameSavingOverWatcher(Color color)
+        : DetectorToFinder("HallOfFameSavingOverWatcher", FinderType::GONE, std::chrono::milliseconds(100), color)
+    {}
+};
+
+
+void add_tests_EliteFourRoomDetector(UnitTestDatabase& database);
+void add_tests_HallOfFameSavingDetector(UnitTestDatabase& database);
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_BagDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_BagDetector.cpp
new file mode 100644
index 0000000000..323a0f3899
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_BagDetector.cpp
@@ -0,0 +1,106 @@
+/*  Bag Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Exceptions.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/ImageTools/ImageStats.h"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Images/SolidColorTest.h"
+#include "CommonTools/Images/ImageFilter.h"
+#include "CommonTools/Images/WaterfillUtilities.h"
+#include "Tests/ImageUnitTest.h"
+#include "PokemonFRLG_BagDetector.h"
+
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+
+BagDetector::BagDetector(Color color)
+    : m_bag_shadow_box(0.131250, 0.608173, 0.068269, 0.001442)
+    , m_pocket_underline_box(0.043269, 0.137259, 0.279808, 0.005769)
+    //  Stops short of the red arrow drawn over the frame once the list is
+    //  scrolled down.
+    , m_menu_top_box(0.029808, 0.029086, 0.550000, 0.003606)
+    , m_menu_right_box(0.977404, 0.034134, 0.005288, 0.597837)
+{}
+void BagDetector::make_overlays(VideoOverlaySet& items) const{
+    const BoxOption& GAME_BOX = GameSettings::instance().GAME_BOX;
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_bag_shadow_box));        // Gray   RGB(159, 159, 159)
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_pocket_underline_box));  // Orange RGB(255, 152,  50)
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_menu_top_box));          // Yellow RGB(255, 225,  93)
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_menu_right_box));        // Yellow
+
+}
+bool BagDetector::detect(const ImageViewRGB32& screen){
+    ImageViewRGB32 game_screen = extract_box_reference(screen, GameSettings::instance().GAME_BOX);
+
+    ImageViewRGB32 bag_shadow_image = extract_box_reference(game_screen, m_bag_shadow_box);
+    ImageViewRGB32 pocket_underline_image = extract_box_reference(game_screen, m_pocket_underline_box);
+    ImageViewRGB32 menu_top_image = extract_box_reference(game_screen, m_menu_top_box);
+    ImageViewRGB32 menu_right_image = extract_box_reference(game_screen, m_menu_right_box);
+
+
+    if (   is_solid(bag_shadow_image,       { 0.333, 0.333, 0.333 }, 0.25, 20)
+        && is_solid(pocket_underline_image, { 0.558, 0.333, 0.109 }, 0.25, 20)
+        && is_solid(menu_top_image,         { 0.445, 0.393, 0.162 }, 0.25, 20)
+        && is_solid(menu_right_image,       { 0.445, 0.393, 0.162 }, 0.25, 20)
+    ){
+        return true;
+    }
+    return false;
+}
+
+
+class Test_BagDetector : public ImageUnitTest{
+public:
+    Test_BagDetector(const std::string& image, bool expected)
+        : ImageUnitTest("PokemonFRLG::BagDetector - " + image, {image})
+        , m_expected(expected)
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger&, CancellableScope&,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        BagDetector detector(COLOR_RED);
+        const ImageRGB32& image = images[0];
+        const bool result = detector.detect(image);
+        if (result != m_expected){
+            return std::string("Expected bag = ") + (m_expected ? "true" : "false") +
+                ", got " + (result ? "true" : "false");
+        }
+        return true;
+    }
+
+private:
+    bool m_expected;
+};
+
+void add_tests_BagDetector(UnitTestDatabase& database){
+    database.add<Test_BagDetector>("PokemonFRLG/Bag/Items_Top_True.png", true);
+    database.add<Test_BagDetector>("PokemonFRLG/Bag/KeyItems_Top_True.png", true);
+    //  Scrolled down: a red up-arrow covers the middle of the top frame.
+    database.add<Test_BagDetector>("PokemonFRLG/Bag/Items_Scrolled_True.png", true);
+
+    //  A girl's bag, drawn differently from the boy's.
+    database.add<Test_BagDetector>("PokemonFRLG/Bag/Items_Top_Girl_True.png", true);
+    database.add<Test_BagDetector>("PokemonFRLG/Bag/Items_Potion_Girl_True.png", true);
+    database.add<Test_BagDetector>("PokemonFRLG/Bag/KeyItems_Top_Girl_True.png", true);
+    database.add<Test_BagDetector>("PokemonFRLG/Bag/PokeBalls_Top_Girl_True.png", true);
+
+    database.add<Test_BagDetector>("PokemonFRLG/Bag/Overworld_Route24_False.png", false);
+    database.add<Test_BagDetector>("PokemonFRLG/Bag/Overworld_Bedroom_Girl_False.png", false);
+    database.add<Test_BagDetector>("PokemonFRLG/Bag/StartMenu_Girl_False.png", false);
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_BagDetector.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_BagDetector.h
new file mode 100644
index 0000000000..d8170289a8
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_BagDetector.h
@@ -0,0 +1,54 @@
+/*  Bag Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonFRLG_BagDetector_H
+#define PokemonAutomation_PokemonFRLG_BagDetector_H
+
+#include <chrono>
+#include "Common/Cpp/Color.h"
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/VisualDetector.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+#include "VideoGames/PokemonFRLG/PokemonFRLG_Settings.h"
+
+namespace PokemonAutomation{
+    class CancellableScope;
+    class VideoFeed;
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+class BagDetector : public StaticScreenDetector{
+public:
+    BagDetector(Color color);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    ImageFloatBox m_bag_shadow_box;
+    ImageFloatBox m_pocket_underline_box;
+    ImageFloatBox m_menu_top_box;
+    ImageFloatBox m_menu_right_box;
+};
+class BagWatcher : public DetectorToFinder<BagDetector>{
+public:
+    BagWatcher(Color color)
+        : DetectorToFinder("BagWatcher", std::chrono::milliseconds(250), color)
+    {}
+};
+
+
+void add_tests_BagDetector(UnitTestDatabase& database);
+
+
+
+}
+}
+}
+
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_LoadMenuDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_LoadMenuDetector.cpp
new file mode 100644
index 0000000000..a5145818de
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_LoadMenuDetector.cpp
@@ -0,0 +1,51 @@
+/*  Load Menu Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/ImageTools/ImageStats.h"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Images/SolidColorTest.h"
+#include "CommonTools/Images/ImageFilter.h"
+#include "CommonTools/Images/WaterfillUtilities.h"
+#include "VideoGames/PokemonFRLG/PokemonFRLG_Settings.h"
+#include "PokemonFRLG_LoadMenuDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+LoadMenuDetector::LoadMenuDetector(Color color)
+    : m_right_box(0.941846, 0.0190769, 0.0516923, 0.960577)
+    , m_left_box(0.00646154, 0.0180385, 0.0566154, 0.961615)
+    , m_save_box(0.836, 0.0595769, 0.0578462, 0.0747692)
+{}
+void LoadMenuDetector::make_overlays(VideoOverlaySet& items) const{
+    const BoxOption& GAME_BOX = GameSettings::instance().GAME_BOX;
+    items.add(COLOR_BLUE, GAME_BOX.inner_to_outer(m_right_box));
+    items.add(COLOR_BLUE, GAME_BOX.inner_to_outer(m_left_box));
+    items.add(COLOR_BLUE, GAME_BOX.inner_to_outer(m_save_box));
+}
+bool LoadMenuDetector::detect(const ImageViewRGB32& screen){
+    ImageViewRGB32 game_screen = extract_box_reference(screen, GameSettings::instance().GAME_BOX);
+
+    ImageViewRGB32 right_image = extract_box_reference(game_screen, m_right_box);
+    ImageViewRGB32 left_image = extract_box_reference(game_screen, m_left_box);
+    ImageViewRGB32 save_image = extract_box_reference(game_screen, m_save_box);
+
+    if (is_solid(right_image, { 0.244, 0.282, 0.474 }) //blue
+        && is_solid(left_image, { 0.244, 0.282, 0.474 }) //blue
+        && is_solid(save_image, { 0.25, 0.38, 0.369 }) //white
+    ){
+        return true;
+    }
+    return false;
+}
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_LoadMenuDetector.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_LoadMenuDetector.h
new file mode 100644
index 0000000000..a9b74658b4
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_LoadMenuDetector.h
@@ -0,0 +1,50 @@
+/*  Load Menu Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonFRLG_LoadMenuDetector_H
+#define PokemonAutomation_PokemonFRLG_LoadMenuDetector_H
+
+#include <chrono>
+#include <atomic>
+#include "Common/Cpp/Color.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonTools/VisualDetector.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+
+namespace PokemonAutomation{
+    class CancellableScope;
+    class VideoFeed;
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+// Detect save load menu by looking for the blue on the sides and the white of the save file
+// Untested on new game, assumes there's a save.
+class LoadMenuDetector : public StaticScreenDetector{
+public:
+    LoadMenuDetector(Color color);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    ImageFloatBox m_right_box;
+    ImageFloatBox m_left_box;
+    ImageFloatBox m_save_box;
+};
+class LoadMenuWatcher : public DetectorToFinder<LoadMenuDetector>{
+public:
+    LoadMenuWatcher(Color color)
+        : DetectorToFinder("LoadMenuWatcher", std::chrono::milliseconds(250), color)
+    {}
+};
+
+
+}
+}
+}
+
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_PartyEmptySlotDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_PartyEmptySlotDetector.cpp
new file mode 100644
index 0000000000..4ad279c561
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_PartyEmptySlotDetector.cpp
@@ -0,0 +1,103 @@
+/*  Party Empty Slot Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Exceptions.h"
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "CommonFramework/ImageTypes/ImageRGB32.h"
+#include "CommonTools/Images/SolidColorTest.h"
+#include "Tests/ImageUnitTest.h"
+#include "VideoGames/PokemonFRLG/PokemonFRLG_Settings.h"
+#include "PokemonFRLG_PartyEmptySlotDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+ImageFloatBox PartyEmptySlotDetector::box_for_slot(PartySlot slot){
+    switch (slot){
+    case PartySlot::ONE:
+        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Invalid FRLG Party Empty Slot. Slot 1 should always be occupied.");
+    case PartySlot::TWO:
+        return ImageFloatBox(0.709, 0.078, 0.01, 0.018);
+    case PartySlot::THREE:
+        return ImageFloatBox(0.709, 0.228, 0.01, 0.018);
+    case PartySlot::FOUR:
+        return ImageFloatBox(0.709, 0.378, 0.01, 0.018);
+    case PartySlot::FIVE:
+        return ImageFloatBox(0.709, 0.527, 0.01, 0.018);
+    case PartySlot::SIX:
+        return ImageFloatBox(0.709, 0.677, 0.01, 0.018);
+    default:
+        break;
+    }
+    throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Invalid FRLG Party Empty Slot.");
+}
+
+PartyEmptySlotDetector::PartyEmptySlotDetector(
+    Color color,
+    PartySlot slot
+)
+    : m_color(color)
+    , m_box(box_for_slot(slot))
+{}
+void PartyEmptySlotDetector::make_overlays(VideoOverlaySet& items) const{
+    const BoxOption& GAME_BOX = GameSettings::instance().GAME_BOX;
+    items.add(m_color, GAME_BOX.inner_to_outer(m_box));
+}
+bool PartyEmptySlotDetector::detect(const ImageViewRGB32& screen){
+    const BoxOption& GAME_BOX = GameSettings::instance().GAME_BOX;
+    ImageViewRGB32 game_screen = extract_box_reference(screen, GAME_BOX);
+    const auto stats = image_stats(extract_box_reference(game_screen, m_box));
+    return stats.stddev.sum() > 20.0;
+}
+
+
+class Test_PartyEmptySlotDetector : public ImageUnitTest{
+public:
+    Test_PartyEmptySlotDetector(const std::string& image, PartySlot slot, bool expected)
+        : ImageUnitTest("PokemonFRLG::PartyEmptySlotDetector - " + image + " - slot " + std::to_string(static_cast<unsigned>(slot) + 1), {image})
+        , m_slot(slot)
+        , m_expected(expected)
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger&, CancellableScope&,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        PartyEmptySlotDetector detector(COLOR_RED, m_slot);
+        const ImageRGB32& image = images[0];
+        bool result = detector.detect(image);
+        if (result != m_expected){
+            return std::string("Expected empty slot = ") + (m_expected ? "true" : "false") +
+                ", got " + (result ? "true" : "false");
+        }
+        return true;
+    }
+
+private:
+    PartySlot m_slot;
+    bool m_expected;
+};
+
+void add_tests_PartyEmptySlotDetector(UnitTestDatabase& database){
+    // Slot 1 is always occupied and is not supported by PartyEmptySlotDetector.
+    for (unsigned c = 1; c < 6; c++){
+        PartySlot slot = static_cast<PartySlot>(c);
+        for (unsigned occupied = 1; occupied <= 6; occupied++){
+            database.add<Test_PartyEmptySlotDetector>(
+                "PokemonFRLG/Party/Party_" + std::to_string(occupied) + ".png", slot, c >= occupied
+            );
+        }
+        database.add<Test_PartyEmptySlotDetector>("PokemonFRLG/Party/JPN_HeldItem.png", slot, false);
+        database.add<Test_PartyEmptySlotDetector>("PokemonFRLG/Party/JPN_Party.png", slot, c >= 4);
+        database.add<Test_PartyEmptySlotDetector>("PokemonFRLG/Party/Party_6_With_Held_Items.png", slot, false);
+        database.add<Test_PartyEmptySlotDetector>("PokemonFRLG/Party/SPA_HeldItem.png", slot, false);
+    }
+}
+
+}
+}
+}
\ No newline at end of file
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_PartyEmptySlotDetector.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_PartyEmptySlotDetector.h
new file mode 100644
index 0000000000..32201013b3
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_PartyEmptySlotDetector.h
@@ -0,0 +1,41 @@
+/*  Party Empty Slot Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonFRLG_PartyEmptySlotDetector_H
+#define PokemonAutomation_PokemonFRLG_PartyEmptySlotDetector_H
+
+#include <chrono>
+#include "Common/Cpp/TestRunners/UnitTest.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/VisualDetector.h"
+#include "PokemonFRLG_PartySlot.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+class PartyEmptySlotDetector : public StaticScreenDetector{
+public:
+    PartyEmptySlotDetector(
+        Color color,
+        PartySlot slot
+    );
+    static ImageFloatBox box_for_slot(PartySlot slot);
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    // This is not const so that detectors can save/cache state.
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    Color m_color;
+    ImageFloatBox m_box;
+};
+
+void add_tests_PartyEmptySlotDetector(UnitTestDatabase& database);
+
+}
+}
+}
+#endif
\ No newline at end of file
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_PartyHeldItemDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_PartyHeldItemDetector.cpp
new file mode 100644
index 0000000000..61bcadeedd
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_PartyHeldItemDetector.cpp
@@ -0,0 +1,182 @@
+/*  Party Held Item Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Exceptions.h"
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "CommonFramework/ImageTypes/ImageRGB32.h"
+#include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h"
+#include "CommonTools/Images/ImageFilter.h"
+#include "CommonTools/Images/WaterfillUtilities.h"
+#include "Tests/ImageUnitTest.h"
+#include "VideoGames/PokemonFRLG/PokemonFRLG_Settings.h"
+#include "PokemonFRLG_PartyHeldItemDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+
+class PartyHeldItemMatcher : public ImageMatch::WaterfillTemplateMatcher{
+public:
+    PartyHeldItemMatcher(const char* path)
+        : WaterfillTemplateMatcher(
+            path,
+            Color(210, 210, 100),
+            Color(255, 255, 190),
+            20
+        )
+    {
+        m_aspect_ratio_lower = 0.5;
+        m_aspect_ratio_upper = 2.0;
+        m_area_ratio_lower = 0.2;
+        m_area_ratio_upper = 4.0;
+    }
+
+    static const PartyHeldItemMatcher& matcher(){
+        static PartyHeldItemMatcher matcher("PokemonFRLG/PartyHeldItem.png");
+        return matcher;
+    }
+};
+
+ImageFloatBox PartyHeldItemDetector::box_for_slot(PartySlot slot, Language language){
+    const double x_offset = language == Language::Japanese ? 0.03 : 0;
+    switch (slot){
+    case PartySlot::ONE:
+        return ImageFloatBox(0.069 + x_offset, 0.285, 0.025, 0.050);
+    case PartySlot::TWO:
+        return ImageFloatBox(0.432 + x_offset, 0.150, 0.025, 0.050);
+    case PartySlot::THREE:
+        return ImageFloatBox(0.432 + x_offset, 0.3, 0.025, 0.050);
+    case PartySlot::FOUR:
+        return ImageFloatBox(0.432 + x_offset, 0.45, 0.025, 0.050);
+    case PartySlot::FIVE:
+        return ImageFloatBox(0.432 + x_offset, 0.6, 0.025, 0.050);
+    case PartySlot::SIX:
+        return ImageFloatBox(0.432 + x_offset, 0.725, 0.025, 0.050);
+    default:
+        break;
+    }
+    throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Invalid FRLG Party Held Item Slot");
+}
+
+PartyHeldItemDetector::PartyHeldItemDetector(
+    Color color,
+    VideoOverlay* overlay,
+    PartySlot slot,
+    Language language
+)
+    : m_color(color)
+    , m_overlay(overlay)
+    , m_box(box_for_slot(slot, language))
+{}
+PartyHeldItemDetector::PartyHeldItemDetector(
+    Color color,
+    VideoOverlay* overlay,
+    const ImageFloatBox& box
+)
+    : m_color(color)
+    , m_overlay(overlay)
+    , m_box(box)
+{}
+void PartyHeldItemDetector::make_overlays(VideoOverlaySet& items) const{
+    const BoxOption& GAME_BOX = GameSettings::instance().GAME_BOX;
+    items.add(m_color, GAME_BOX.inner_to_outer(m_box));
+}
+bool PartyHeldItemDetector::detect(const ImageViewRGB32& screen){
+    const BoxOption& GAME_BOX = GameSettings::instance().GAME_BOX;
+    ImageViewRGB32 game_screen = extract_box_reference(screen, GAME_BOX);
+
+    double screen_rel_size = (game_screen.height() / 1080.0);
+    double screen_rel_size_2 = screen_rel_size * screen_rel_size;
+
+    double min_area_1080p = 100;
+    double rmsd_threshold = 220;
+    size_t min_area = size_t(screen_rel_size_2 * min_area_1080p);
+
+    const std::vector<std::pair<uint32_t, uint32_t>> FILTERS = {
+        {0xffd2d264, 0xffffffbe}
+    };
+
+    ImageViewRGB32 item_box = extract_box_reference(game_screen, m_box);
+    // The icon has a red band as well as a yellow body. Pokemon sprites can match the yellow alone.
+    size_t red_pixels;
+    filter_rgb32_range(red_pixels, item_box, 0xffc83c1e, 0xffffa08c, COLOR_BLACK, true);
+
+    bool found = red_pixels >= screen_rel_size_2 * 50 && match_template_by_waterfill(
+        game_screen.size(),
+        item_box,
+        PartyHeldItemMatcher::matcher(),
+        FILTERS,
+        {min_area, SIZE_MAX},
+        rmsd_threshold,
+        [&](Kernels::Waterfill::WaterfillObject& object) -> bool {
+            m_last_detected = translate_to_parent(game_screen, m_box, object);
+            return true;
+        }
+    );
+
+    if (m_overlay){
+        if (found){
+            m_last_detected_box.emplace(*m_overlay, GAME_BOX.inner_to_outer(m_last_detected), COLOR_GREEN);
+        }else{
+            m_last_detected_box.reset();
+        }
+    }
+
+    return found;
+}
+
+
+class Test_PartyHeldItemDetector : public ImageUnitTest{
+public:
+    Test_PartyHeldItemDetector(
+        const std::string& image, PartySlot slot, bool expected, Language language = Language::English
+    )
+        : ImageUnitTest("PokemonFRLG::PartyHeldItemDetector - " + image + " - slot " + std::to_string(static_cast<unsigned>(slot) + 1), {image})
+        , m_slot(slot)
+        , m_expected(expected)
+        , m_language(language)
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger&, CancellableScope&,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        PartyHeldItemDetector detector(COLOR_RED, nullptr, m_slot, m_language);
+        const ImageRGB32& image = images[0];
+        bool result = detector.detect(image);
+        if (result != m_expected){
+            return std::string("Expected held item = ") + (m_expected ? "true" : "false") +
+                ", got " + (result ? "true" : "false");
+        }
+        return true;
+    }
+
+private:
+    PartySlot m_slot;
+    bool m_expected;
+    Language m_language;
+};
+
+void add_tests_PartyHeldItemDetector(UnitTestDatabase& database){
+    for (unsigned c = 0; c < 6; c++){
+        PartySlot slot = static_cast<PartySlot>(c);
+        database.add<Test_PartyHeldItemDetector>("PokemonFRLG/Party/Party_1.png", slot, false);
+        database.add<Test_PartyHeldItemDetector>("PokemonFRLG/Party/Party_2.png", slot, false);
+        database.add<Test_PartyHeldItemDetector>("PokemonFRLG/Party/Party_3.png", slot, false);
+        database.add<Test_PartyHeldItemDetector>("PokemonFRLG/Party/Party_4.png", slot, false);
+        database.add<Test_PartyHeldItemDetector>("PokemonFRLG/Party/Party_5.png", slot, false);
+        database.add<Test_PartyHeldItemDetector>("PokemonFRLG/Party/Party_6.png", slot, false);
+        database.add<Test_PartyHeldItemDetector>("PokemonFRLG/Party/JPN_Party.png", slot, false, Language::Japanese);
+        database.add<Test_PartyHeldItemDetector>("PokemonFRLG/Party/Party_6_With_Held_Items.png", slot, c == 0 || c == 3);
+        database.add<Test_PartyHeldItemDetector>("PokemonFRLG/Party/SPA_HeldItem.png", slot, c == 0, Language::Spanish);
+    }
+    database.add<Test_PartyHeldItemDetector>("PokemonFRLG/Party/JPN_HeldItem.png", PartySlot::ONE, true, Language::Japanese);
+}
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_PartyHeldItemDetector.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_PartyHeldItemDetector.h
new file mode 100644
index 0000000000..a63099ed20
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_PartyHeldItemDetector.h
@@ -0,0 +1,81 @@
+/*  Party Held Item Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonFRLG_PartyHeldItemDetector_H
+#define PokemonAutomation_PokemonFRLG_PartyHeldItemDetector_H
+
+#include <chrono>
+#include "Common/Cpp/TestRunners/UnitTest.h"
+#include "CommonFramework/Language.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/VisualDetector.h"
+#include "PokemonFRLG_PartySlot.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+class PartyHeldItemDetector : public StaticScreenDetector{
+public:
+    PartyHeldItemDetector(
+        Color color,
+        VideoOverlay* overlay,
+        const ImageFloatBox& box
+    );
+    PartyHeldItemDetector(
+        Color color,
+        VideoOverlay* overlay,
+        PartySlot slot,
+        Language language = Language::English
+    );
+
+    static ImageFloatBox box_for_slot(PartySlot slot, Language language = Language::English);
+
+    const ImageFloatBox& last_detected() const { return m_last_detected; }
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+
+    // This is not const so that detectors can save/cache state.
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    friend class PartyHeldItemWatcher;
+
+    const Color m_color;
+    VideoOverlay* m_overlay;
+    const ImageFloatBox m_box;
+
+    ImageFloatBox m_last_detected;
+    std::optional<OverlayBoxScope> m_last_detected_box;
+};
+class PartyHeldItemWatcher : public DetectorToFinder<PartyHeldItemDetector>{
+public:
+    PartyHeldItemWatcher(
+        Color color,
+        VideoOverlay* overlay,
+        const ImageFloatBox& box,
+        std::chrono::milliseconds hold_duration = std::chrono::milliseconds(250)
+    )
+        : DetectorToFinder("PartyHeldItemWatcher", hold_duration, color, overlay, box)
+    {}
+    PartyHeldItemWatcher(
+        Color color,
+        VideoOverlay* overlay,
+        PartySlot slot,
+        Language language,
+        std::chrono::milliseconds hold_duration = std::chrono::milliseconds(250)
+    )
+        : DetectorToFinder("PartyHeldItemWatcher", hold_duration, color, overlay, slot, language)
+    {}
+};
+
+
+void add_tests_PartyHeldItemDetector(UnitTestDatabase& database);
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_PartyMenuDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_PartyMenuDetector.cpp
new file mode 100644
index 0000000000..b1d0d5624a
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_PartyMenuDetector.cpp
@@ -0,0 +1,177 @@
+/*  Party Menu Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Exceptions.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/ImageTypes/ImageRGB32.h"
+#include "CommonFramework/ImageTools/ImageStats.h"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Images/SolidColorTest.h"
+#include "CommonTools/Images/ImageFilter.h"
+#include "CommonTools/Images/WaterfillUtilities.h"
+#include "Tests/ImageUnitTest.h"
+#include "VideoGames/PokemonFRLG/PokemonFRLG_Settings.h"
+#include "PokemonFRLG_PartyMenuDetector.h"
+
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+
+PartyMenuDetector::PartyMenuDetector(Color color)
+    : m_dialog_top_box(0.028, 0.840, 0.705, 0.010)
+    , m_page_background_box(0.028, 0.500, 0.010, 0.250)
+{}
+void PartyMenuDetector::make_overlays(VideoOverlaySet& items) const{
+    const BoxOption& GAME_BOX = GameSettings::instance().GAME_BOX;
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_dialog_top_box));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_page_background_box));
+}
+bool PartyMenuDetector::detect(const ImageViewRGB32& screen){
+    ImageViewRGB32 game_screen = extract_box_reference(screen, GameSettings::instance().GAME_BOX);
+
+    //Dialog is white
+    ImageViewRGB32 dialog_top_image = extract_box_reference(game_screen, m_dialog_top_box);
+
+    //Menu background is teal
+    ImageViewRGB32 menu_background_image = extract_box_reference(game_screen, m_page_background_box);
+
+    if (is_white(dialog_top_image)
+        && is_solid(menu_background_image, { 0.020, 0.424, 0.412 }, 0.25, 20) //5, 108, 105 teal
+    ){
+        return true;
+    }
+    return false;
+}
+
+
+ImageFloatBox PartySlotDetector::party_slot_boxes(PartySlot position){
+    switch (position){
+    case PartySlot::ONE:
+        return ImageFloatBox(0.035000, 0.376617, 0.003280, 0.070000);
+    case PartySlot::TWO:
+        return ImageFloatBox(0.985000, 0.080000, 0.003280, 0.099663);
+    case PartySlot::THREE:
+        return ImageFloatBox(0.985000, 0.230000, 0.003280, 0.099663);
+    case PartySlot::FOUR:
+        return ImageFloatBox(0.985000, 0.380000, 0.003280, 0.099663);
+    case PartySlot::FIVE:
+        return ImageFloatBox(0.985000, 0.530000, 0.003280, 0.099663);
+    case PartySlot::SIX:
+        return ImageFloatBox(0.985000, 0.675000, 0.003280, 0.099663);
+    default:
+        break;
+    }
+    throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Invalid FRLG Party Slot Position");
+}
+PartySlotDetector::PartySlotDetector(
+    Color color,
+    const ImageFloatBox& box
+)
+    : m_color(color)
+    , m_party_box(box)
+{}
+PartySlotDetector::PartySlotDetector(
+    Color color, 
+    PartySlot position
+)
+    : m_color(color)
+    , m_party_box(party_slot_boxes(position))
+{}
+void PartySlotDetector::make_overlays(VideoOverlaySet& items) const{
+    const BoxOption& GAME_BOX = GameSettings::instance().GAME_BOX;
+    items.add(m_color, GAME_BOX.inner_to_outer(m_party_box));
+}
+bool PartySlotDetector::detect(const ImageViewRGB32& screen){
+    ImageViewRGB32 game_screen = extract_box_reference(screen, GameSettings::instance().GAME_BOX);
+
+    ImageViewRGB32 target_box_party = extract_box_reference(game_screen, m_party_box);
+
+    //orange FF701C border. light/dark blues in the selected box are close to each other.
+    if (is_solid(target_box_party, { 0.6455696, 0.2835, 0.070886 }, 0.25, 30)
+    ){
+        return true;
+    }
+    return false;
+}
+
+
+class Test_PartyMenuDetector : public ImageUnitTest{
+public:
+    Test_PartyMenuDetector(const std::string& image, bool expected)
+        : ImageUnitTest("PokemonFRLG::PartyMenuDetector - " + image, {image})
+        , m_expected(expected)
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger&, CancellableScope&,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        PartyMenuDetector detector(COLOR_RED);
+        const ImageRGB32& image = images[0];
+        bool result = detector.detect(image);
+        if (result != m_expected){
+            return std::string("Expected party menu = ") + (m_expected ? "true" : "false") +
+                ", got " + (result ? "true" : "false");
+        }
+        return true;
+    }
+
+private:
+    bool m_expected;
+};
+
+void add_tests_PartyMenuDetector(UnitTestDatabase& database){
+    database.add<Test_PartyMenuDetector>("PokemonFRLG/Party/Party_1.png", true);
+    database.add<Test_PartyMenuDetector>("PokemonFRLG/Party/Party_2.png", true);
+    database.add<Test_PartyMenuDetector>("PokemonFRLG/Party/Party_3.png", true);
+    database.add<Test_PartyMenuDetector>("PokemonFRLG/Party/Party_4.png", true);
+    database.add<Test_PartyMenuDetector>("PokemonFRLG/Party/Party_5.png", true);
+    database.add<Test_PartyMenuDetector>("PokemonFRLG/Party/Party_6.png", true);
+    database.add<Test_PartyMenuDetector>("PokemonFRLG/Party/JPN_HeldItem.png", true);
+    database.add<Test_PartyMenuDetector>("PokemonFRLG/Party/Party_6_With_Held_Items.png", true);
+
+    // A dialog covers the normal detection region in these images.
+    database.add<Test_PartyMenuDetector>("PokemonFRLG/Party/JPN_Party.png", false);
+    database.add<Test_PartyMenuDetector>("PokemonFRLG/Party/SPA_HeldItem.png", false);
+}
+
+
+class Test_PartySlotDetector : public ImageUnitTest{
+public:
+    Test_PartySlotDetector(
+        const std::string& image,
+        bool expected
+    )
+        : ImageUnitTest("PokemonFRLG::PartySlotDetector - " + image, {image})
+        , m_expected(expected)
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        PartySlotWatcher detector(COLOR_RED, PartySlot::SIX);
+        const ImageRGB32& image = images[0];
+        return detector.detect(image) == m_expected;
+    };
+
+private:
+    bool m_expected;
+};
+
+void add_tests_PartySlotDetector(UnitTestDatabase& database){
+    database.add<Test_PartySlotDetector>("PokemonFRLG/PartySlotDetector/elgato-PartySlotDetector_True.png", true);
+    database.add<Test_PartySlotDetector>("PokemonFRLG/PartySlotDetector/SirGArilla-PartySlotDetector_True.png", true);
+    database.add<Test_PartySlotDetector>("PokemonFRLG/PartySlotDetector/elgato-EmptySlot_False.png", false);
+    database.add<Test_PartySlotDetector>("PokemonFRLG/PartySlotDetector/elgato-PartySlotDetector_False.png", false);
+}
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_PartyMenuDetector.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_PartyMenuDetector.h
new file mode 100644
index 0000000000..9be5527e50
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_PartyMenuDetector.h
@@ -0,0 +1,87 @@
+/*  Party Menu Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonFRLG_PartyMenuDetector_H
+#define PokemonAutomation_PokemonFRLG_PartyMenuDetector_H
+
+#include <chrono>
+#include "Common/Cpp/Color.h"
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/VisualDetector.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+#include "VideoGames/PokemonFRLG/PokemonFRLG_Settings.h"
+#include "PokemonFRLG_PartySlot.h"
+
+namespace PokemonAutomation{
+    class CancellableScope;
+    class VideoFeed;
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+// The Party menu has a white box on the bottom
+// The background around the edges is dark teal/navy
+class PartyMenuDetector : public StaticScreenDetector{
+public:
+    PartyMenuDetector(Color color);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    ImageFloatBox m_dialog_top_box;
+    ImageFloatBox m_page_background_box;
+};
+class PartyMenuWatcher : public DetectorToFinder<PartyMenuDetector>{
+public:
+    PartyMenuWatcher(Color color)
+        : DetectorToFinder("PartyMenuWatcher", std::chrono::milliseconds(250), color)
+    {}
+};
+
+
+class PartySlotDetector : public StaticScreenDetector{
+public:
+    PartySlotDetector(
+        Color color,
+        const ImageFloatBox& box
+    );
+
+    PartySlotDetector(
+        Color color,
+        PartySlot position
+    );
+
+    static ImageFloatBox party_slot_boxes(PartySlot position);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    const Color m_color;
+    const ImageFloatBox m_party_box;
+};
+class PartySlotWatcher : public DetectorToFinder<PartySlotDetector>{
+public:
+    PartySlotWatcher(
+        Color color,
+        PartySlot position,
+        std::chrono::milliseconds hold_duration = std::chrono::milliseconds(250)
+    )
+        : DetectorToFinder("PartySlotWatcher", hold_duration, color, party_slot_boxes(position))
+    {
+    }
+};
+
+
+void add_tests_PartyMenuDetector(UnitTestDatabase& database);
+void add_tests_PartySlotDetector(UnitTestDatabase& database);
+}
+}
+}
+
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_PartySlot.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_PartySlot.h
new file mode 100644
index 0000000000..1cd50e2400
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_PartySlot.h
@@ -0,0 +1,27 @@
+/*  Party Slot
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonFRLG_PartySlot_H
+#define PokemonAutomation_PokemonFRLG_PartySlot_H
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+enum class PartySlot{
+    ONE,
+    TWO,
+    THREE,
+    FOUR,
+    FIVE,
+    SIX
+    //CXL
+};
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_StartMenuDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_StartMenuDetector.cpp
new file mode 100644
index 0000000000..3931a6336c
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_StartMenuDetector.cpp
@@ -0,0 +1,44 @@
+/*  Start Menu Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Color.h"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Images/SolidColorTest.h"
+#include "VideoGames/PokemonFRLG/PokemonFRLG_Settings.h"
+#include "VideoGames/PokemonFRLG/Programs/PokemonFRLG_StartMenuNavigation.h"
+#include "PokemonFRLG_StartMenuDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+StartMenuDetector::StartMenuDetector(Color color)
+    : m_selection_arrow(color, nullptr, MENU_ARROW_BOX)
+    , m_menu_top_box(0.728365, 0.043509, 0.238462, 0.006490)
+    , m_menu_left_box(0.728365, 0.050000, 0.003365, 0.427644)
+{}
+void StartMenuDetector::make_overlays(VideoOverlaySet& items) const{
+    const BoxOption& GAME_BOX = GameSettings::instance().GAME_BOX;
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(MENU_ARROW_BOX));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_menu_top_box));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_menu_left_box));
+}
+bool StartMenuDetector::detect(const ImageViewRGB32& screen){
+    ImageViewRGB32 game_screen = extract_box_reference(screen, GameSettings::instance().GAME_BOX);
+    ImageViewRGB32 menu_top_image = extract_box_reference(game_screen, m_menu_top_box);
+    ImageViewRGB32 menu_left_image = extract_box_reference(game_screen, m_menu_left_box);
+    return (
+        m_selection_arrow.detect(screen)
+        && is_white(menu_top_image)
+        && is_white(menu_left_image)
+    );
+}
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_StartMenuDetector.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_StartMenuDetector.h
new file mode 100644
index 0000000000..4aeec7c30a
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_StartMenuDetector.h
@@ -0,0 +1,47 @@
+/*  Start Menu Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonFRLG_StartMenuDetector_H
+#define PokemonAutomation_PokemonFRLG_StartMenuDetector_H
+
+#include <chrono>
+#include "Common/Cpp/Color.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/VisualDetector.h"
+#include "VideoGames/PokemonFRLG/Inference/PokemonFRLG_SelectionArrowDetector.h"
+
+namespace PokemonAutomation{
+    class CancellableScope;
+    class VideoFeed;
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+// Detect Start menu by looking for the selection arrow
+class StartMenuDetector : public StaticScreenDetector{
+public:
+    StartMenuDetector(Color color = COLOR_RED);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    SelectionArrowDetector m_selection_arrow;
+    ImageFloatBox m_menu_top_box;
+    ImageFloatBox m_menu_left_box;
+};
+class StartMenuWatcher : public DetectorToFinder<StartMenuDetector>{
+public:
+    StartMenuWatcher(Color color = COLOR_RED)
+        : DetectorToFinder("StartMenuWatcher", std::chrono::milliseconds(250), color)
+    {}
+};
+
+
+}
+}
+}
+
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_SummaryDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_SummaryDetector.cpp
new file mode 100644
index 0000000000..d1794892ad
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_SummaryDetector.cpp
@@ -0,0 +1,102 @@
+/*  Summary Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Images/SolidColorTest.h"
+#include "CommonTools/Images/ImageFilter.h"
+#include "CommonTools/Images/SolidColorTest.h"
+#include "CommonTools/Images/WaterfillUtilities.h"
+#include "VideoGames/PokemonFRLG/PokemonFRLG_Settings.h"
+#include "PokemonFRLG_SummaryDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+SummaryDetector::SummaryDetector(Color color)
+    : m_page_1_box(0.441235, 0.033869, 0.016889, 0.030754) //white
+    , m_page_2_box(0.509681, 0.035206, 0.014223, 0.026742) //blue
+    , m_page_3_box(0.577239, 0.039218, 0.012445, 0.021394) //blue
+{}
+void SummaryDetector::make_overlays(VideoOverlaySet& items) const{
+    const BoxOption& GAME_BOX = GameSettings::instance().GAME_BOX;
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_page_1_box));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_page_2_box));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_page_3_box));
+}
+bool SummaryDetector::detect(const ImageViewRGB32& screen){
+    ImageViewRGB32 game_screen = extract_box_reference(screen, GameSettings::instance().GAME_BOX);
+
+    ImageViewRGB32 page_1_image = extract_box_reference(game_screen, m_page_1_box);
+    ImageViewRGB32 page_2_image = extract_box_reference(game_screen, m_page_2_box);
+    ImageViewRGB32 page_3_image = extract_box_reference(game_screen, m_page_3_box);
+    if (is_white(page_1_image)
+        && is_solid(page_2_image, { 0, 0.3333, 0.6666 }, 0.25, 20)
+        && is_solid(page_3_image, { 0, 0.3333, 0.6666 }, 0.25, 20)
+    ){
+        return true;
+    }
+    return false;
+}
+
+SummaryPage2Detector::SummaryPage2Detector(Color color)
+    : m_page_1_box(0.441235, 0.033869, 0.016889, 0.030754) //tan
+    , m_page_2_box(0.509681, 0.035206, 0.014223, 0.026742) //white
+    , m_page_3_box(0.577239, 0.039218, 0.012445, 0.021394) //blue
+{}
+void SummaryPage2Detector::make_overlays(VideoOverlaySet& items) const{
+    const BoxOption& GAME_BOX = GameSettings::instance().GAME_BOX;
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_page_1_box));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_page_2_box));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_page_3_box));
+}
+bool SummaryPage2Detector::detect(const ImageViewRGB32& screen){
+    ImageViewRGB32 game_screen = extract_box_reference(screen, GameSettings::instance().GAME_BOX);
+
+    ImageViewRGB32 page_1_image = extract_box_reference(game_screen, m_page_1_box);
+    ImageViewRGB32 page_2_image = extract_box_reference(game_screen, m_page_2_box);
+    ImageViewRGB32 page_3_image = extract_box_reference(game_screen, m_page_3_box);
+    if (is_solid(page_1_image, { 0.5117, 0.3763, 0.2294 }, 0.25, 20)
+        && is_white(page_2_image)
+        && is_solid(page_3_image, { 0, 0.3333, 0.6666 }, 0.25, 20)
+    ){
+        return true;
+    }
+    return false;
+}
+
+SummaryPage3Detector::SummaryPage3Detector(Color color)
+    : m_page_1_box(0.441235, 0.033869, 0.016889, 0.030754) //tan
+    , m_page_2_box(0.509681, 0.035206, 0.014223, 0.026742) //tan
+    , m_page_3_box(0.577239, 0.039218, 0.012445, 0.021394) //white
+{}
+void SummaryPage3Detector::make_overlays(VideoOverlaySet& items) const{
+    const BoxOption& GAME_BOX = GameSettings::instance().GAME_BOX;
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_page_1_box));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_page_2_box));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_page_3_box));
+}
+bool SummaryPage3Detector::detect(const ImageViewRGB32& screen){
+    ImageViewRGB32 game_screen = extract_box_reference(screen, GameSettings::instance().GAME_BOX);
+
+    ImageViewRGB32 page_1_image = extract_box_reference(game_screen, m_page_1_box);
+    ImageViewRGB32 page_2_image = extract_box_reference(game_screen, m_page_2_box);
+    ImageViewRGB32 page_3_image = extract_box_reference(game_screen, m_page_3_box);
+    if (is_solid(page_1_image, { 0.5117, 0.3763, 0.2294 }, 0.25, 20)
+        && is_solid(page_2_image, { 0.5117, 0.3763, 0.2294 }, 0.25, 20)
+        && is_white(page_3_image)
+    ){
+        return true;
+    }
+    return false;
+}
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_SummaryDetector.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_SummaryDetector.h
new file mode 100644
index 0000000000..16a403bf68
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_SummaryDetector.h
@@ -0,0 +1,92 @@
+/*  Summary Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonFRLG_SummaryDetector_H
+#define PokemonAutomation_PokemonFRLG_SummaryDetector_H
+
+#include <chrono>
+#include "Common/Cpp/Color.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonTools/VisualDetector.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+
+namespace PokemonAutomation{
+    class CancellableScope;
+    class VideoFeed;
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+// Detect the default (first) Pokemon Summary page
+// This has nature and OT, but no stats
+// This will work with all languages, as the page indicators are in the same positions
+class SummaryDetector : public StaticScreenDetector{
+public:
+    SummaryDetector(Color color);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    ImageFloatBox m_page_1_box;
+    ImageFloatBox m_page_2_box;
+    ImageFloatBox m_page_3_box;
+};
+class SummaryWatcher : public DetectorToFinder<SummaryDetector>{
+public:
+    SummaryWatcher(Color color)
+        : DetectorToFinder("SummaryWatcher", std::chrono::milliseconds(250), color)
+    {}
+};
+
+// Detect that we are on page 2 of a pokemon summary
+// This is the stats screen
+// Note that when switching pages, wait a bit before pressing left/right
+class SummaryPage2Detector : public StaticScreenDetector{
+public:
+    SummaryPage2Detector(Color color);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    ImageFloatBox m_page_1_box;
+    ImageFloatBox m_page_2_box;
+    ImageFloatBox m_page_3_box;
+};
+class SummaryPage2Watcher : public DetectorToFinder<SummaryPage2Detector>{
+public:
+    SummaryPage2Watcher(Color color)
+        : DetectorToFinder("SummaryPage2Watcher", std::chrono::milliseconds(250), color)
+    {}
+};
+
+// Detect that we are on page 3 of a pokemon summary
+// This contains the pokemon's moves
+class SummaryPage3Detector : public StaticScreenDetector{
+public:
+    SummaryPage3Detector(Color color);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    ImageFloatBox m_page_1_box;
+    ImageFloatBox m_page_2_box;
+    ImageFloatBox m_page_3_box;
+};
+class SummaryPage3Watcher : public DetectorToFinder<SummaryPage3Detector>{
+public:
+    SummaryPage3Watcher(Color color)
+        : DetectorToFinder("SummaryPage3Watcher", std::chrono::milliseconds(250), color)
+    {}
+};
+
+}
+}
+}
+
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_TrainerCardDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_TrainerCardDetector.cpp
new file mode 100644
index 0000000000..bae2f30fa3
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_TrainerCardDetector.cpp
@@ -0,0 +1,64 @@
+/*  Trainer Card Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Images/SolidColorTest.h"
+#include "CommonTools/Images/ImageFilter.h"
+#include "CommonTools/Images/SolidColorTest.h"
+#include "CommonTools/Images/WaterfillUtilities.h"
+#include "VideoGames/PokemonFRLG/PokemonFRLG_Settings.h"
+#include "PokemonFRLG_TrainerCardDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+TrainerCardDetector::TrainerCardDetector(Color color)
+    : m_box_tid_top(0.68125, 0.108413, 0.232692, 0.007212) // light blue (227, 255, 255)
+    , m_box_tid_right(0.914904, 0.117067, 0.005769, 0.064904) 
+    , m_box_stripe_top(0.038942, 0.090384, 0.918269, 0.002885) // blue  (94, 177, 255)
+    , m_box_stripe_right(0.954808, 0.095432, 0.002885, 0.109615)
+    , m_box_border_top(0.051442, 0.040625, 0.895192, 0.003606) // gray (100, 100, 120)
+    , m_box_border_right(0.968750, 0.075961, 0.002885, 0.848077)
+{}
+void TrainerCardDetector::make_overlays(VideoOverlaySet& items) const{
+    const BoxOption& GAME_BOX = GameSettings::instance().GAME_BOX;
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_box_tid_top));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_box_tid_right));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_box_stripe_top));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_box_stripe_right));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_box_border_top));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_box_border_right));
+}
+bool TrainerCardDetector::detect(const ImageViewRGB32& screen){
+    ImageViewRGB32 game_screen = extract_box_reference(screen, GameSettings::instance().GAME_BOX);
+
+    ImageViewRGB32 image_tid_top = extract_box_reference(game_screen, m_box_tid_top);
+    ImageViewRGB32 image_tid_right = extract_box_reference(game_screen, m_box_tid_right);
+    ImageViewRGB32 image_stripe_top = extract_box_reference(game_screen, m_box_stripe_top);
+    ImageViewRGB32 image_stripe_right = extract_box_reference(game_screen, m_box_stripe_right);
+    ImageViewRGB32 image_border_top = extract_box_reference(game_screen, m_box_border_top);
+    ImageViewRGB32 image_border_right = extract_box_reference(game_screen, m_box_border_right);
+
+    if ( is_solid(image_tid_top, { 0.308, 0.346, 0.346 })
+        && is_solid(image_tid_right, { 0.308, 0.346, 0.346 })
+        && is_solid(image_stripe_top, { 0.179, 0.337, 0.485 })
+        && is_solid(image_stripe_right, { 0.179, 0.337, 0.485 })
+        && is_solid(image_border_top, { 0.313, 0.313, 0.375 })
+        && is_solid(image_border_right, { 0.313, 0.313, 0.375 })
+    ){
+        return true;
+    }
+    return false;
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_TrainerCardDetector.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_TrainerCardDetector.h
new file mode 100644
index 0000000000..ced9bdb4bf
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_TrainerCardDetector.h
@@ -0,0 +1,52 @@
+/*  Trainer Card Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonFRLG_TrainerCardDetector_H
+#define PokemonAutomation_PokemonFRLG_TrainerCardDetector_H
+
+#include <chrono>
+#include "Common/Cpp/Color.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonTools/VisualDetector.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+
+namespace PokemonAutomation{
+    class CancellableScope;
+    class VideoFeed;
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+// Detect the map screen for Kanto
+class TrainerCardDetector : public StaticScreenDetector{
+public:
+    TrainerCardDetector(Color color);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    ImageFloatBox m_box_tid_top;
+    ImageFloatBox m_box_tid_right;
+    ImageFloatBox m_box_stripe_top;
+    ImageFloatBox m_box_stripe_right;
+    ImageFloatBox m_box_border_top;
+    ImageFloatBox m_box_border_right;
+};
+class TrainerCardWatcher : public DetectorToFinder<TrainerCardDetector>{
+public:
+    TrainerCardWatcher(Color color)
+        : DetectorToFinder("TrainerCardWatcher", std::chrono::milliseconds(250), color)
+    {}
+};
+
+
+
+}
+}
+}
+
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_BattleLevelUpReader.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_BattleLevelUpReader.cpp
new file mode 100644
index 0000000000..acfe6b1a30
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_BattleLevelUpReader.cpp
@@ -0,0 +1,113 @@
+/*  Battle Level Up Reader
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <opencv2/imgproc.hpp>
+#include "Common/Cpp/Color.h"
+#include "Common/Cpp/Exceptions.h"
+#include "CommonFramework/GlobalSettingsPanel.h"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonFramework/GlobalAutoPaths.h"
+#include "CommonFramework/ImageTypes/ImageRGB32.h"
+#include "CommonTools/Images/ImageFilter.h"
+#include "CommonTools/OCR/OCR_NumberReader.h"
+#include "Tests/ImageUnitTest.h"
+#include "Pokemon/Pokemon_StatsCalculation.h"
+#include "Pokemon/Inference/Pokemon_NameReader.h"
+#include "VideoGames/PokemonFRLG/PokemonFRLG_Settings.h"
+#include "VideoGames/PokemonFRLG/PokemonFRLG_Tests.h"
+#include "PokemonFRLG_DigitReader.h"
+#include "PokemonFRLG_BattleLevelUpReader.h"
+
+
+namespace PokemonAutomation {
+namespace NintendoSwitch {
+namespace PokemonFRLG {
+
+
+BattleLevelUpReader::BattleLevelUpReader(Color color)
+    : m_color(color)
+    , m_box_hp(0.844069, 0.402852, 0.128535, 0.079387)
+    , m_box_attack(0.844069, 0.496052, 0.128535, 0.079387)
+    , m_box_defense(0.844069, 0.589252, 0.128535, 0.079387)
+    , m_box_sp_attack(0.844069, 0.682452, 0.128535, 0.079387)
+    , m_box_sp_defense(0.844069, 0.775652, 0.128535, 0.079387)
+    , m_box_speed(0.844069, 0.868852, 0.128535, 0.0793879)
+{}
+
+void BattleLevelUpReader::make_overlays(VideoOverlaySet &items) const {
+    const BoxOption &GAME_BOX = GameSettings::instance().GAME_BOX;
+    items.add(m_color, GAME_BOX.inner_to_outer(m_box_hp));
+    items.add(m_color, GAME_BOX.inner_to_outer(m_box_attack));
+    items.add(m_color, GAME_BOX.inner_to_outer(m_box_defense));
+    items.add(m_color, GAME_BOX.inner_to_outer(m_box_sp_attack));
+    items.add(m_color, GAME_BOX.inner_to_outer(m_box_sp_defense));
+    items.add(m_color, GAME_BOX.inner_to_outer(m_box_speed));
+}
+
+StatReads BattleLevelUpReader::read_stats(Logger &logger, const ImageViewRGB32& frame) const{
+    ImageViewRGB32 game_screen =
+            extract_box_reference(frame, GameSettings::instance().GAME_BOX);
+    
+    auto read_stat = [&](const ImageFloatBox &box, const std::string &name){
+        ImageViewRGB32 stat_region = extract_box_reference(game_screen, box);
+        return read_digits_waterfill_template(logger, stat_region, DigitTemplateType::DialogBox);
+    };
+
+    StatReads stats;
+    stats.hp = uint16_t(read_stat(m_box_hp, "hp"));
+    stats.attack = uint16_t(read_stat(m_box_attack, "attack"));
+    stats.defense = uint16_t(read_stat(m_box_defense, "defense"));
+    stats.spatk = uint16_t(read_stat(m_box_sp_attack, "spatk"));
+    stats.spdef = uint16_t(read_stat(m_box_sp_defense, "spdef"));
+    stats.speed = uint16_t(read_stat(m_box_speed, "speed"));
+    return stats;
+}
+
+
+class Test_BattleLevelUpReader : public ImageUnitTest{
+public:
+    Test_BattleLevelUpReader(const std::string& image)
+        : ImageUnitTest("PokemonFRLG::BattleLevelUpReader - " + image, {image})
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        const ImageRGB32& image = images[0];
+        BattleLevelUpReader reader;
+        StatReads stats = reader.read_stats(logger, image);
+
+        return check_against_golden_file(
+            UNIT_TEST_RESOURCE_PATH() + image_paths()[0],
+            {"hp", "attack", "defense", "spatk", "spdef", "speed"},
+            {
+                std::to_string(stats.hp),
+                std::to_string(stats.attack),
+                std::to_string(stats.defense),
+                std::to_string(stats.spatk),
+                std::to_string(stats.spdef),
+                std::to_string(stats.speed),
+            }
+        );
+    };
+};
+
+
+void add_tests_BattleLevelUpReader(UnitTestDatabase& database){
+    database.add<Test_BattleLevelUpReader>("PokemonFRLG/BattleLevelUpReader/charizard_1.png");
+    database.add<Test_BattleLevelUpReader>("PokemonFRLG/BattleLevelUpReader/horsea_1.png");
+    database.add<Test_BattleLevelUpReader>("PokemonFRLG/BattleLevelUpReader/horsea_2.png");
+    database.add<Test_BattleLevelUpReader>("PokemonFRLG/BattleLevelUpReader/horsea_3.png");
+    database.add<Test_BattleLevelUpReader>("PokemonFRLG/BattleLevelUpReader/deoxys_1_jpn.jpg");
+}
+
+
+} // namespace PokemonFRLG
+} // namespace NintendoSwitch
+} // namespace PokemonAutomation
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_BattleLevelUpReader.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_BattleLevelUpReader.h
new file mode 100644
index 0000000000..c7fefc0a8b
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_BattleLevelUpReader.h
@@ -0,0 +1,57 @@
+/*  Battle Level Up Reader
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonFRLG_BattleLevelUpReader_H
+#define PokemonAutomation_PokemonFRLG_BattleLevelUpReader_H
+
+#include <optional>
+#include <string>
+#include "Common/Cpp/Color.h"
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/Language.h"
+#include "Pokemon/Pokemon_StatsCalculation.h"
+
+
+namespace PokemonAutomation{
+
+class Logger;
+class ImageViewRGB32;
+class VideoOverlaySet;
+
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+using namespace Pokemon;
+
+
+class BattleLevelUpReader {
+public:
+    BattleLevelUpReader(Color color = COLOR_RED);
+
+    void make_overlays(VideoOverlaySet &items) const;
+
+    StatReads read_stats(Logger &logger, const ImageViewRGB32& frame) const;
+
+private:
+    Color m_color;
+    ImageFloatBox m_box_hp;
+    ImageFloatBox m_box_attack;
+    ImageFloatBox m_box_defense;
+    ImageFloatBox m_box_sp_attack;
+    ImageFloatBox m_box_sp_defense;
+    ImageFloatBox m_box_speed;
+
+};
+
+
+void add_tests_BattleLevelUpReader(UnitTestDatabase& database);
+
+} // namespace PokemonFRLG
+} // namespace NintendoSwitch
+} // namespace PokemonAutomation
+#endif
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_BattlePokemonDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_BattlePokemonDetector.cpp
new file mode 100644
index 0000000000..a07f83998a
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_BattlePokemonDetector.cpp
@@ -0,0 +1,98 @@
+/*  Battle Pokemon Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Images/SolidColorTest.h"
+#include "CommonTools/Images/ImageFilter.h"
+#include "CommonTools/Images/SolidColorTest.h"
+#include "CommonTools/Images/WaterfillUtilities.h"
+#include "VideoGames/PokemonFRLG/PokemonFRLG_Settings.h"
+#include "PokemonFRLG_BattlePokemonDetector.h"
+
+// #include <iostream>
+// using std::cout;
+// using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+BattlePokemonDetector::BattlePokemonDetector(Color color)
+    // be warned: the name/level/hp box moves up and down a little bit
+    : m_left_box(0.577404, 0.504327, 0.001442, 0.121875) // off-white rgb(255, 255, 235), can be interrupted by a status condition
+    , m_right_box(0.948558, 0.585096, 0.000481, 0.063462) // dark teal rgb(72, 106, 98)
+    , m_top_box(0.594712, 0.481971, 0.325962, 0.002163) // off-white, movement makes this unreliable
+    , m_bottom_box(0.554808, 0.674519, 0.034615, 0.002163) // dark teal
+    , m_background_box(0.552564, 0.583653, 0.414103, 0.009615) // depends on in-game location. white or rgb(215, 169, 96)
+{}
+void BattlePokemonDetector::make_overlays(VideoOverlaySet& items) const{
+    const BoxOption& GAME_BOX = GameSettings::instance().GAME_BOX;
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_left_box));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_right_box));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_top_box));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_bottom_box));
+}
+bool BattlePokemonDetector::detect(const ImageViewRGB32& screen){
+    ImageViewRGB32 game_screen = extract_box_reference(screen, GameSettings::instance().GAME_BOX);
+
+    ImageViewRGB32 left_image = extract_box_reference(game_screen, m_left_box);
+    ImageViewRGB32 right_image = extract_box_reference(game_screen, m_right_box);
+    ImageViewRGB32 top_image = extract_box_reference(game_screen, m_top_box);
+    ImageViewRGB32 bottom_image = extract_box_reference(game_screen, m_bottom_box);
+    ImageViewRGB32 background_image = extract_box_reference(game_screen, m_background_box);
+
+    if (is_grey(left_image, 680, 770, 20)
+        && is_grey(right_image, 220, 320, 20)
+        && is_grey(top_image, 680, 770, 20)
+        && is_grey(bottom_image, 220, 320, 20)
+        && !(is_white(background_image) || is_solid(background_image, {0.4468, 0.3528, 0.2004}, 0.25, 20))
+    ){
+        return true;
+    }
+    return false;
+}
+
+BattleOpponentDetector::BattleOpponentDetector(Color color)
+    : m_left_box(0.067308, 0.140865, 0.001442, 0.090144) // off-white rgb(255, 255, 235)
+    , m_right_box(0.422596, 0.132211, 0.000481, 0.054808) // off-white 
+    , m_top_box(0.085577, 0.119952, 0.329327, 0.000721) //  off-white
+    , m_bottom_box(0.109615, 0.264182, 0.328365, 0.001442) // dark teal rgb(72, 106, 98)
+    , m_background_box(0.050641, 0.126923, 0.388462, 0.063462) // depends on in-game location. white or rgb(187, 149, 65)
+{}
+void BattleOpponentDetector::make_overlays(VideoOverlaySet& items) const{
+    const BoxOption& GAME_BOX = GameSettings::instance().GAME_BOX;
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_left_box));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_right_box));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_top_box));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_bottom_box));
+}
+bool BattleOpponentDetector::detect(const ImageViewRGB32& screen){
+    ImageViewRGB32 game_screen = extract_box_reference(screen, GameSettings::instance().GAME_BOX);
+
+    ImageViewRGB32 left_image = extract_box_reference(game_screen, m_left_box);
+    ImageViewRGB32 right_image = extract_box_reference(game_screen, m_right_box);
+    ImageViewRGB32 top_image = extract_box_reference(game_screen, m_top_box);
+    ImageViewRGB32 bottom_image = extract_box_reference(game_screen, m_bottom_box);
+    ImageViewRGB32 background_image = extract_box_reference(game_screen, m_background_box);
+
+    if (is_grey(left_image, 680, 770, 20)
+        && is_grey(right_image, 680, 770, 20)
+        && is_grey(top_image, 680, 770, 20)
+        && is_grey(bottom_image, 220, 320, 20)
+        && !(is_white(background_image) || is_solid(background_image, {0.4663, 0.3716, 0.1621}, 0.25, 20))
+    ){
+        return true;
+    }
+    return false;
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_BattlePokemonDetector.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_BattlePokemonDetector.h
new file mode 100644
index 0000000000..e805581cc2
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_BattlePokemonDetector.h
@@ -0,0 +1,79 @@
+/*  Map Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonFRLG_BattlePokemonDetector_H
+#define PokemonAutomation_PokemonFRLG_BattlePokemonDetector_H
+
+#include <chrono>
+#include "Common/Cpp/Color.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonTools/VisualDetector.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+
+namespace PokemonAutomation{
+    class CancellableScope;
+    class VideoFeed;
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+// Detect a player's Pokemon that is currently battling (not fainted)
+class BattlePokemonDetector : public StaticScreenDetector{
+public:
+    BattlePokemonDetector(Color color);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    ImageFloatBox m_left_box;
+    ImageFloatBox m_right_box;
+    ImageFloatBox m_top_box;
+    ImageFloatBox m_bottom_box;
+    ImageFloatBox m_background_box;
+};
+
+// Watches for the player's Pokemon to disappear
+class BattleFaintWatcher : public DetectorToFinder<BattlePokemonDetector>{
+public:
+    BattleFaintWatcher(Color color)
+        : DetectorToFinder("BattleFaintWatcher", FinderType::GONE, std::chrono::milliseconds(2000), color)
+    {}
+};
+
+// Detect an opposing Pokemon that is currently battling (not fainted)
+class BattleOpponentDetector : public StaticScreenDetector{
+public:
+    BattleOpponentDetector(Color color);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    ImageFloatBox m_left_box;
+    ImageFloatBox m_right_box;
+    ImageFloatBox m_top_box;
+    ImageFloatBox m_bottom_box;
+    ImageFloatBox m_background_box;
+};
+
+// Watches for the opponent to disappear
+class BattleOpponentFaintWatcher : public DetectorToFinder<BattleOpponentDetector>{
+public:
+    BattleOpponentFaintWatcher(Color color)
+        : DetectorToFinder("BattleOPponentFaintWatcher", FinderType::GONE, std::chrono::milliseconds(1000), color)
+    {}
+};
+
+
+
+
+
+}
+}
+}
+
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_BattleSelectionArrowDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_BattleSelectionArrowDetector.cpp
new file mode 100644
index 0000000000..d6859afa48
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_BattleSelectionArrowDetector.cpp
@@ -0,0 +1,249 @@
+/*  Battle Selection Arrow Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Exceptions.h"
+#include "CommonFramework/ImageTypes/ImageRGB32.h"
+#include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h"
+#include "CommonTools/Images/WaterfillUtilities.h"
+#include "Tests/ImageUnitTest.h"
+#include "VideoGames/PokemonFRLG/PokemonFRLG_Settings.h"
+#include "PokemonFRLG_BattleSelectionArrowDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+
+class BattleSelectionArrowMatcher : public ImageMatch::WaterfillTemplateMatcher{
+public:
+    BattleSelectionArrowMatcher(const char* path)
+        : WaterfillTemplateMatcher(
+            path,
+            Color(35, 40, 40), Color(100, 100, 100), 70
+        )
+    {
+        m_aspect_ratio_lower = 0.8;
+        m_aspect_ratio_upper = 1.2;
+        m_area_ratio_lower = 0.8;
+        m_area_ratio_upper = 1.2;
+    }
+
+    static const BattleSelectionArrowMatcher& matcher(){
+        static BattleSelectionArrowMatcher matcher("PokemonFRLG/BattleSelectionArrow.png");
+        return matcher;
+    }
+};
+
+ImageFloatBox BattleSelectionArrowDetector::box_for_option(BattleMenuOption option){
+    switch (option){
+    case BattleMenuOption::FIGHT:
+        return ImageFloatBox(0.525, 0.765, 0.040, 0.080);
+    case BattleMenuOption::BAG:
+        return ImageFloatBox(0.760, 0.765, 0.040, 0.080);
+    case BattleMenuOption::POKEMON:
+        return ImageFloatBox(0.525, 0.865, 0.040, 0.080);
+    case BattleMenuOption::RUN:
+        return ImageFloatBox(0.760, 0.865, 0.040, 0.080);
+    default:
+        break;
+    }
+    throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Invalid FRLG Battle Menu Option");
+}
+ImageFloatBox BattleSelectionArrowDetector::box_for_option(SafariBattleMenuOption option){
+    switch (option){
+    case SafariBattleMenuOption::BALL:
+        return ImageFloatBox(0.525, 0.765, 0.040, 0.080);
+    case SafariBattleMenuOption::BAIT:
+        return ImageFloatBox(0.760, 0.765, 0.040, 0.080);
+    case SafariBattleMenuOption::ROCK:
+        return ImageFloatBox(0.525, 0.865, 0.040, 0.080);
+    case SafariBattleMenuOption::RUN:
+        return ImageFloatBox(0.760, 0.865, 0.040, 0.080);
+    default:
+        break;
+    }
+    throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Invalid FRLG Safari Battle Menu Option");
+}
+ImageFloatBox BattleSelectionArrowDetector::box_for_option(BattleMoveOption option){
+    switch (option){
+    case BattleMoveOption::MOVE_1:
+        return ImageFloatBox(0.028, 0.765, 0.040, 0.080);
+    case BattleMoveOption::MOVE_2:
+        return ImageFloatBox(0.328, 0.765, 0.040, 0.080);
+    case BattleMoveOption::MOVE_3:
+        return ImageFloatBox(0.028, 0.865, 0.040, 0.080);
+    case BattleMoveOption::MOVE_4:
+        return ImageFloatBox(0.328, 0.865, 0.040, 0.080);
+    default:
+        break;
+    }
+    throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Invalid FRLG Battle Move Option");
+}
+ImageFloatBox BattleSelectionArrowDetector::box_for_option(BattleConfirmationOption option){
+    switch (option){
+    case BattleConfirmationOption::YES:
+        return ImageFloatBox(0.795, 0.465, 0.030, 0.071);
+    case BattleConfirmationOption::NO:
+        return ImageFloatBox(0.795, 0.569, 0.030, 0.071);
+    default:
+        break;
+    }
+    throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Invalid FRLG Battle Confirmation Option");
+}
+
+BattleSelectionArrowDetector::BattleSelectionArrowDetector(
+    Color color,
+    VideoOverlay* overlay,
+    const ImageFloatBox& box
+)
+    : m_color(color)
+    , m_overlay(overlay)
+    , m_arrow_box(box)
+{}
+BattleSelectionArrowDetector::BattleSelectionArrowDetector(
+    Color color,
+    VideoOverlay* overlay,
+    BattleMenuOption option
+)
+    : m_color(color)
+    , m_overlay(overlay)
+    , m_arrow_box(box_for_option(option))
+{}
+BattleSelectionArrowDetector::BattleSelectionArrowDetector(
+    Color color,
+    VideoOverlay* overlay,
+    SafariBattleMenuOption option
+)
+    : m_color(color)
+    , m_overlay(overlay)
+    , m_arrow_box(box_for_option(option))
+{}
+BattleSelectionArrowDetector::BattleSelectionArrowDetector(
+    Color color,
+    VideoOverlay* overlay,
+    BattleMoveOption option
+)
+    : m_color(color)
+    , m_overlay(overlay)
+    , m_arrow_box(box_for_option(option))
+{}
+BattleSelectionArrowDetector::BattleSelectionArrowDetector(
+    Color color,
+    VideoOverlay* overlay
+)
+    : m_color(color)
+    , m_overlay(overlay)
+    , m_arrow_box(ImageFloatBox(0.768, 0.868, 0.212, 0.159))
+{}
+BattleSelectionArrowDetector::BattleSelectionArrowDetector(
+    Color color,
+    VideoOverlay* overlay,
+    BattleConfirmationOption option
+)
+    : m_color(color)
+    , m_overlay(overlay)
+    , m_arrow_box(box_for_option(option))
+{}
+void BattleSelectionArrowDetector::make_overlays(VideoOverlaySet& items) const{
+    const BoxOption& GAME_BOX = GameSettings::instance().GAME_BOX;
+    items.add(m_color, GAME_BOX.inner_to_outer(m_arrow_box));
+}
+bool BattleSelectionArrowDetector::detect(const ImageViewRGB32& screen){
+    const BoxOption& GAME_BOX = GameSettings::instance().GAME_BOX;
+    ImageViewRGB32 game_screen = extract_box_reference(screen, GAME_BOX);
+
+    double screen_rel_size = (game_screen.height() / 1080.0);
+    double screen_rel_size_2 = screen_rel_size * screen_rel_size;
+
+    double min_area_1080p = 700;
+    double rmsd_threshold = 80;
+    size_t min_area = size_t(screen_rel_size_2 * min_area_1080p);
+
+    const std::vector<std::pair<uint32_t, uint32_t>> FILTERS = {
+        {0xff000000, 0xff7f7f7f},
+        {0xff232828, 0xff646464},
+    };
+
+    bool found = match_template_by_waterfill(
+        game_screen.size(),
+        extract_box_reference(game_screen, m_arrow_box),
+        BattleSelectionArrowMatcher::matcher(),
+        FILTERS,
+        {min_area, SIZE_MAX},
+        rmsd_threshold,
+        [&](Kernels::Waterfill::WaterfillObject& object) -> bool {
+            m_last_detected = translate_to_parent(game_screen, m_arrow_box, object);
+            return true;
+        }
+    );
+
+    if (m_overlay){
+        if (found){
+            m_last_detected_box.emplace(*m_overlay, GAME_BOX.inner_to_outer(m_last_detected), COLOR_GREEN);
+        }else{
+            m_last_detected_box.reset();
+        }
+    }
+
+    return found;
+}
+
+
+
+//  Each image shows the FIGHT move list with the arrow on one move. The arrow
+//  must be found in that move's box and in none of the other three. Searching
+//  the whole move list (as the cursor navigation does) must also find it in
+//  the right place, not on the move names.
+class Test_BattleMoveSelectionArrow : public ImageUnitTest{
+public:
+    Test_BattleMoveSelectionArrow(
+        const std::string& image,
+        BattleMoveOption expected
+    )
+        : ImageUnitTest("PokemonFRLG::BattleMoveSelectionArrow - " + image, {image})
+        , m_expected(expected)
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        const ImageRGB32& image = images[0];
+        for (int i = 0; i < BATTLE_MOVE_OPTION_COUNT; i++){
+            BattleMoveOption option = static_cast<BattleMoveOption>(i);
+            BattleSelectionArrowDetector detector(COLOR_RED, nullptr, option);
+            if (detector.detect(image) != (option == m_expected)){
+                return false;
+            }
+        }
+
+        BattleSelectionArrowDetector whole_list(COLOR_RED, nullptr, BATTLE_MOVE_ARROW_BOX);
+        if (!whole_list.detect(image)){
+            return false;
+        }
+        const ImageFloatBox& found = whole_list.last_detected();
+        const ImageFloatBox expected = BattleSelectionArrowDetector::box_for_option(m_expected);
+        double cx = found.x + found.width / 2;
+        double cy = found.y + found.height / 2;
+        return expected.x <= cx && cx <= expected.x + expected.width
+            && expected.y <= cy && cy <= expected.y + expected.height;
+    };
+
+private:
+    BattleMoveOption m_expected;
+};
+
+void add_tests_BattleMoveSelectionArrow(UnitTestDatabase& database){
+    database.add<Test_BattleMoveSelectionArrow>("PokemonFRLG/BattleMoveSelectionArrow/MoveArrow-TopLeft.png", BattleMoveOption::MOVE_1);
+    database.add<Test_BattleMoveSelectionArrow>("PokemonFRLG/BattleMoveSelectionArrow/MoveArrow-TopRight.png", BattleMoveOption::MOVE_2);
+    database.add<Test_BattleMoveSelectionArrow>("PokemonFRLG/BattleMoveSelectionArrow/MoveArrow-BottomLeft.png", BattleMoveOption::MOVE_3);
+    database.add<Test_BattleMoveSelectionArrow>("PokemonFRLG/BattleMoveSelectionArrow/MoveArrow-BottomRight.png", BattleMoveOption::MOVE_4);
+}
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_BattleSelectionArrowDetector.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_BattleSelectionArrowDetector.h
new file mode 100644
index 0000000000..a36d4e1f09
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_BattleSelectionArrowDetector.h
@@ -0,0 +1,165 @@
+/*  Battle Selection Arrow Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonFRLG_BattleSelectionArrowDetector_H
+#define PokemonAutomation_PokemonFRLG_BattleSelectionArrowDetector_H
+
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/VisualDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+
+// The order of these enums matches the in-game layout (row-major, top-left to bottom-right).
+const int BATTLE_MENU_OPTION_COUNT = 4;
+enum class BattleMenuOption{
+    FIGHT,
+    BAG,
+    POKEMON,
+    RUN,
+};
+
+const int SAFARI_BATTLE_MENU_OPTION_COUNT = 4;
+enum class SafariBattleMenuOption{
+    BALL,
+    BAIT,
+    ROCK,
+    RUN,
+};
+
+// The four moves in the FIGHT move list, in the same row-major order.
+const int BATTLE_MOVE_OPTION_COUNT = 4;
+enum class BattleMoveOption{
+    MOVE_1,     //  top left
+    MOVE_2,     //  top right
+    MOVE_3,     //  bottom left
+    MOVE_4,     //  bottom right
+};
+
+enum class BattleConfirmationOption{
+    YES,
+    NO,
+};
+
+const ImageFloatBox BATTLE_MENU_ARROW_BOX(0.525, 0.741, 0.273, 0.212);
+const ImageFloatBox BATTLE_MOVE_ARROW_BOX(0.025, 0.741, 0.373, 0.212);
+
+class BattleSelectionArrowDetector : public StaticScreenDetector{
+public:
+    BattleSelectionArrowDetector(
+        Color color,
+        VideoOverlay* overlay,
+        const ImageFloatBox& box
+    );
+    BattleSelectionArrowDetector(
+        Color color,
+        VideoOverlay* overlay,
+        BattleMenuOption option
+    );
+    BattleSelectionArrowDetector(
+        Color color,
+        VideoOverlay* overlay,
+        SafariBattleMenuOption option
+    );
+    BattleSelectionArrowDetector(
+        Color color,
+        VideoOverlay* overlay,
+        BattleMoveOption option
+    );
+    BattleSelectionArrowDetector(
+        Color color,
+        VideoOverlay* overlay
+    );
+    BattleSelectionArrowDetector(
+        Color color,
+        VideoOverlay* overlay,
+        BattleConfirmationOption option
+    );
+
+    static ImageFloatBox box_for_option(BattleMenuOption option);
+    static ImageFloatBox box_for_option(SafariBattleMenuOption option);
+    static ImageFloatBox box_for_option(BattleMoveOption option);
+    static ImageFloatBox box_for_option(BattleConfirmationOption option);
+
+    const ImageFloatBox& last_detected() const { return m_last_detected; }
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+
+    // This is not const so that detectors can save/cache state.
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    friend class BattleSelectionArrowWatcher;
+
+    const Color m_color;
+    VideoOverlay* m_overlay;
+    const ImageFloatBox m_arrow_box;
+
+    ImageFloatBox m_last_detected;
+    std::optional<OverlayBoxScope> m_last_detected_box;
+};
+class BattleSelectionArrowWatcher : public DetectorToFinder<BattleSelectionArrowDetector>{
+public:
+    BattleSelectionArrowWatcher(
+        Color color,
+        VideoOverlay* overlay,
+        const ImageFloatBox& box,
+        std::chrono::milliseconds hold_duration = std::chrono::milliseconds(250)
+    )
+        : DetectorToFinder("BattleSelectionArrowWatcher", hold_duration, color, overlay, box)
+    {}
+    BattleSelectionArrowWatcher(
+        Color color,
+        VideoOverlay* overlay,
+        BattleMenuOption option,
+        std::chrono::milliseconds hold_duration = std::chrono::milliseconds(250)
+    )
+        : DetectorToFinder("BattleSelectionArrowWatcher", hold_duration, color, overlay, box_for_option(option))
+    {}
+    BattleSelectionArrowWatcher(
+        Color color,
+        VideoOverlay* overlay,
+        SafariBattleMenuOption option,
+        std::chrono::milliseconds hold_duration = std::chrono::milliseconds(250)
+    )
+        : DetectorToFinder("BattleSelectionArrowWatcher", hold_duration, color, overlay, box_for_option(option))
+    {}
+    BattleSelectionArrowWatcher(
+        Color color,
+        VideoOverlay* overlay,
+        BattleMoveOption option,
+        std::chrono::milliseconds hold_duration = std::chrono::milliseconds(250)
+    )
+        : DetectorToFinder("BattleSelectionArrowWatcher", hold_duration, color, overlay, box_for_option(option))
+    {}
+    BattleSelectionArrowWatcher(
+        Color color,
+        VideoOverlay* overlay,
+        BattleConfirmationOption option,
+        std::chrono::milliseconds hold_duration = std::chrono::milliseconds(250)
+    )
+        : DetectorToFinder("BattleSelectionArrowWatcher", hold_duration, color, overlay, box_for_option(option))
+    {}
+    BattleSelectionArrowWatcher(
+        Color color,
+        VideoOverlay* overlay,
+        std::chrono::milliseconds hold_duration = std::chrono::milliseconds(250)
+    )
+        : DetectorToFinder("BattleSelectionArrowWatcher", hold_duration, color, overlay, BATTLE_MENU_ARROW_BOX)
+    {}
+};
+
+
+void add_tests_BattleMoveSelectionArrow(UnitTestDatabase& database);
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_DaycareManDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_DaycareManDetector.cpp
new file mode 100644
index 0000000000..cc4fe12292
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_DaycareManDetector.cpp
@@ -0,0 +1,51 @@
+/*  Daycare Man Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Color.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/ImageTools/ImageStats.h"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Images/SolidColorTest.h"
+#include "VideoGames/PokemonFRLG/PokemonFRLG_Settings.h"
+#include "PokemonFRLG_DaycareManDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+DaycareManDetector::DaycareManDetector(Color color)
+    : m_box_man(0.741827, 0.492067, 0.052404, 0.009375)     // rgb(98, 219, 173) 
+    , m_box_grass(0.345047, 0.798244, 0.079690, 0.056954)   // rgb(98, 219, 173)     
+    , m_box_puddle(0.892758, 0.025567, 0.059451, 0.091126)  // rgb(82, 177, 255)
+    , m_box_sand(0.103447, 0.513473, 0.026563, 0.030375)    // rgb(255, 251, 127)
+    , m_box_roof(0.744762, 0.767868, 0.007590, 0.127197)    // rgb(255, 93, 60)  
+{}
+void DaycareManDetector::make_overlays(VideoOverlaySet& items) const{
+    const BoxOption& GAME_BOX = GameSettings::instance().GAME_BOX;
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_box_grass));
+    items.add(COLOR_GREEN, GAME_BOX.inner_to_outer(m_box_grass));
+    items.add(COLOR_BLUE, GAME_BOX.inner_to_outer(m_box_puddle));
+    items.add(COLOR_YELLOW, GAME_BOX.inner_to_outer(m_box_sand));
+    items.add(COLOR_ORANGE, GAME_BOX.inner_to_outer(m_box_roof));
+}
+bool DaycareManDetector::detect(const ImageViewRGB32& screen){
+    ImageViewRGB32 game_screen = extract_box_reference(screen, GameSettings::instance().GAME_BOX);
+
+    return (
+          !is_solid(extract_box_reference(game_screen, m_box_man),    { 0.200, 0.447, 0.353 }, 0.25, 20) // if egg is ready, the man is blocking the grass
+        && is_solid(extract_box_reference(game_screen, m_box_grass),  { 0.200, 0.447, 0.353 }, 0.25, 20)
+        && is_solid(extract_box_reference(game_screen, m_box_puddle), { 0.160, 0.344, 0.496 }, 0.25, 20)
+        && is_solid(extract_box_reference(game_screen, m_box_sand),   { 0.403, 0.396, 0.201 }, 0.25, 20)
+        && is_solid(extract_box_reference(game_screen, m_box_roof),   { 0.625, 0.228, 0.147 }, 0.25, 20)
+    );
+}
+
+
+}
+}
+}
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_DaycareManDetector.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_DaycareManDetector.h
new file mode 100644
index 0000000000..5781667e69
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_DaycareManDetector.h
@@ -0,0 +1,46 @@
+/*  Daycare Man Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonFRLG_DaycareManDetector_H
+#define PokemonAutomation_PokemonFRLG_DaycareManDetector_H
+
+#include "Common/Cpp/Logging/AbstractLogger.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/VisualDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+// Detects the grass in front of where the Day Care Man usually stands.
+// If an egg is ready, he will occupy the space. Otherwise, it will be solid green (empty grass).
+// Also detects other parts of the scene to avoid triggering on a black screen, etc
+class DaycareManDetector : public StaticScreenDetector{
+public:
+    DaycareManDetector(Color color);
+
+    virtual void make_overlays(VideoOverlaySet& items) const;
+    bool detect(const ImageViewRGB32& screen);
+
+private:
+    ImageFloatBox m_box_man;
+    ImageFloatBox m_box_grass;
+    ImageFloatBox m_box_puddle;
+    ImageFloatBox m_box_sand;
+    ImageFloatBox m_box_roof;
+};
+class DaycareManWatcher : public DetectorToFinder<DaycareManDetector>{
+public:
+    DaycareManWatcher(Color color)
+        : DetectorToFinder("DaycareManWatcher", std::chrono::milliseconds(250), color)
+    {}
+};
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_DigitReader.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_DigitReader.cpp
new file mode 100644
index 0000000000..5ee34a7e48
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_DigitReader.cpp
@@ -0,0 +1,337 @@
+/*  FRLG Digit Reader
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <algorithm>
+#include <array>
+#include <map>
+#include <memory>
+#include <string>
+#include <opencv2/imgproc.hpp>
+#include "Common/Cpp/Color.h" // needed for COLOR_RED, COLOR_ORANGE
+#include "Common/Cpp/Concurrency/Mutex.h"
+#include "Common/Cpp/Exceptions.h"
+#include "Common/Cpp/Logging/AbstractLogger.h"
+#include "Kernels/Waterfill/Kernels_Waterfill_Session.h"
+#include "CommonFramework/GlobalAutoPaths.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/ImageTypes/ImageRGB32.h"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/ImageTypes/ImageRGB32_OpenCV.h"
+#include "CommonTools/ImageMatch/ExactImageMatcher.h"
+#include "CommonTools/Images/BinaryImage_FilterRgb32.h"
+
+#include "PokemonFRLG_DigitReader.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+// ---------------------------------------------------------------------------
+// Template store: loads 10 digit matchers from a resource sub-directory.
+// Results are cached in a static map keyed by template type. Several threads
+// can read digits at the same time, so a lock guards the map.
+// Supports:
+// - StatBox (yellow stat boxes): PokemonFRLG/Digits/
+// - LevelBox (lilac level box): PokemonFRLG/LevelDigits/
+// - DialogBox (white dialog box): PokemonFRLG/DialogDigits/
+// ---------------------------------------------------------------------------
+
+static std::string get_template_path(DigitTemplateType type){
+    switch (type){
+    case DigitTemplateType::StatBox:
+        return "PokemonFRLG/Digits/";
+    case DigitTemplateType::LevelBox:
+        return "PokemonFRLG/LevelDigits/";
+    case DigitTemplateType::DialogBox:
+        return "PokemonFRLG/DialogDigits/";
+    default:
+        return "PokemonFRLG/Digits/";
+    }
+}
+
+struct DigitTemplates{
+    // matchers[d] is the matcher for digit d (0-9), or nullptr if missing.
+    std::array<std::unique_ptr<ImageMatch::ExactImageMatcher>, 10> matchers;
+    bool any_loaded = false;
+
+    explicit DigitTemplates(DigitTemplateType template_type){
+        std::string resource_subdir = get_template_path(template_type);
+        for (int d = 0; d < 10; ++d){
+            std::string path =
+                RESOURCE_PATH() + resource_subdir + std::to_string(d) + ".png";
+            try{
+                ImageRGB32 img(path);
+                if (img.width() > 0){
+                    matchers[d] =
+                            std::make_unique<ImageMatch::ExactImageMatcher>(std::move(img));
+                    any_loaded = true;
+                }
+            }catch (...){
+                // Template image missing - slot stays nullptr.
+            }
+        }
+        if (!any_loaded){
+            throw FileException(
+                nullptr, PA_CURRENT_FUNCTION,
+                "Failed to load any digit templates", resource_subdir
+            );
+        }
+    }
+
+    //  Return the templates of "template_type", and load them on the first call.
+    //  Threads can call this at the same time (for example the unit tests,
+    //  which run in parallel). Without the lock, two threads can insert into
+    //  the map at once, which corrupts it and crashes. The returned reference
+    //  stays valid after the unlock, because map entries never move and are
+    //  never removed.
+    static const DigitTemplates& get(DigitTemplateType template_type){
+        static Mutex lock;
+        static std::map<DigitTemplateType, DigitTemplates> cache;
+        std::lock_guard<Mutex> lg(lock);
+        auto it = cache.find(template_type);
+        if (it == cache.end()){
+            it = cache.emplace(template_type, DigitTemplates(template_type)).first;
+        }
+        return it->second;
+    }
+};
+
+// Shrink a digit's bounding box down to the glyph itself.
+static ImagePixelBox tighten_to_glyph(const ImageViewRGB32& region, const ImagePixelBox& box){
+    const size_t PADDING = 1;
+
+    auto brightness = [&](size_t x, size_t y) -> uint32_t{
+        uint32_t p = region.pixel(x, y);
+        return (p & 0xff) + ((p >> 8) & 0xff) + ((p >> 16) & 0xff);
+    };
+
+    uint32_t min_brightness = 0xffffffff;
+    uint32_t max_brightness = 0;
+    for (size_t y = box.min_y; y < box.max_y; ++y){
+        for (size_t x = box.min_x; x < box.max_x; ++x){
+            uint32_t b = brightness(x, y);
+            min_brightness = std::min(min_brightness, b);
+            max_brightness = std::max(max_brightness, b);
+        }
+    }
+    if (min_brightness > max_brightness){
+        return box;     //  Empty box.
+    }
+    uint32_t glyph_max = (min_brightness + max_brightness) / 2;
+
+    size_t glyph_min_x = box.max_x;
+    size_t glyph_min_y = box.max_y;
+    size_t glyph_max_x = box.min_x;
+    size_t glyph_max_y = box.min_y;
+    for (size_t y = box.min_y; y < box.max_y; ++y){
+        for (size_t x = box.min_x; x < box.max_x; ++x){
+            if (brightness(x, y) > glyph_max){
+                continue;
+            }
+            glyph_min_x = std::min(glyph_min_x, x);
+            glyph_min_y = std::min(glyph_min_y, y);
+            glyph_max_x = std::max(glyph_max_x, x);
+            glyph_max_y = std::max(glyph_max_y, y);
+        }
+    }
+    if (glyph_min_x > glyph_max_x || glyph_min_y > glyph_max_y){
+        return box;     //  Nothing dark enough to be a glyph.
+    }
+
+    //  max_x/max_y are exclusive, so the last glyph pixel needs a +1 of its own.
+    return ImagePixelBox(
+        glyph_min_x >= box.min_x + PADDING ? glyph_min_x - PADDING : box.min_x,
+        glyph_min_y >= box.min_y + PADDING ? glyph_min_y - PADDING : box.min_y,
+        std::min(glyph_max_x + 1 + PADDING, box.max_x),
+        std::min(glyph_max_y + 1 + PADDING, box.max_y)
+    );
+}
+
+// ---------------------------------------------------------------------------
+// Main function
+// ---------------------------------------------------------------------------
+int read_digits_waterfill_template(
+    Logger& logger,
+    const ImageViewRGB32& stat_region,
+    DigitTemplateType template_type,
+    double rmsd_threshold,
+    const std::string& dump_prefix,
+    uint8_t binarize_high,
+    bool save_debug_images
+){
+    using namespace Kernels::Waterfill;
+
+    if (!stat_region){
+        logger.log("DigitReader: empty stat region.", COLOR_RED);
+        return -1;
+    }
+
+    // ------------------------------------------------------------------
+    // Step 1: Gaussian blur on the NATIVE resolution image.
+    //   The GBA pixel font has 1-pixel gaps between segments.
+    //   A 5x5 kernel applied twice bridges those gaps so that waterfill
+    //   sees each digit as a single connected component.
+    // ------------------------------------------------------------------
+    cv::Mat src = to_OpenCV_ref(stat_region);
+    cv::Mat blurred;
+    src.copyTo(blurred);
+    cv::GaussianBlur(blurred, blurred, cv::Size(5, 5), 1.5);
+    cv::GaussianBlur(blurred, blurred, cv::Size(5, 5), 1.5);
+
+    ImageRGB32 blurred_img(blurred.cols, blurred.rows);
+    blurred.copyTo(to_OpenCV_ref(blurred_img));
+
+    // ------------------------------------------------------------------
+    // Step 2: Binarise the blurred image.
+    //   Pixels where ALL channels <= binarize_high become 1 (foreground).
+    //   Default 0xBE (190) works for yellow stat boxes.
+    //   Use 0x7F (127) for the lilac level box to prevent the blurred
+    //   lilac background (B~208, drops to ~156 near shadows) from being
+    //   captured and merging digit blobs.
+    // ------------------------------------------------------------------
+    uint32_t bh = binarize_high;
+    uint32_t binarize_color = 0xff000000u | (bh << 16) | (bh << 8) | bh;
+    PackedBinaryMatrix matrix =
+        compress_rgb32_to_binary_range(blurred_img, 0xff000000u, binarize_color);
+
+    // ------------------------------------------------------------------
+    // Step 3: Waterfill - find connected dark blobs (individual digits).
+    //   Minimum area of 4 pixels to discard lone noise specks.
+    //   Sort blobs left-to-right by their left edge (min_x).
+    // ------------------------------------------------------------------
+    const size_t min_area = 4;
+    std::map<size_t, WaterfillObject> blobs; // key = min_x, auto-sorted L->R
+    {
+        std::unique_ptr<WaterfillSession> session = make_WaterfillSession(matrix);
+        auto iter = session->make_iterator(min_area);
+        WaterfillObject obj;
+        while (blobs.size() < 8 && iter->find_next(obj, false)){
+            // Require at least 5px wide AND 15px tall to discard noise fragments.
+            if (obj.max_x - obj.min_x < 5 || obj.max_y - obj.min_y < 15){
+                continue;
+            }
+            // Use min_x as key so the map is automatically sorted left-to-right.
+            // If two blobs share an identical min_x, bump the key slightly.
+            size_t key = obj.min_x;
+            while (blobs.count(key)){
+                ++key;
+            }
+            blobs.emplace(key, std::move(obj));
+        }
+    }
+
+    if (blobs.empty()){
+        logger.log("DigitReader: waterfill found no digit blobs.", COLOR_RED);
+        return -1;
+    }
+
+    // ------------------------------------------------------------------
+    // Step 4: For each blob, crop the UNBLURRED original stat_region to
+    //   the blob's bounding box, then template-match against all 10 digit
+    //   templates using ExactImageMatcher::rmsd(). Pick the lowest RMSD.
+    // ------------------------------------------------------------------
+    const DigitTemplates& templates = DigitTemplates::get(template_type);
+    std::string result_str;
+
+    for (const auto &kv : blobs){
+        const WaterfillObject &obj = kv.second;
+
+        size_t width = obj.max_x - obj.min_x;
+        size_t height = obj.max_y - obj.min_y;
+
+        // GBA font digits are typically narrower than they are tall (aspect ~0.6).
+        // If the blob's width is wider than expected for a single digit, it's a
+        // merged blob.
+        int expected_digits = int(std::ceil((double)width / height / 0.6 - 0.5));
+        if (expected_digits < 1){
+            expected_digits = 1;
+        }
+
+        size_t split_w = width / expected_digits;
+
+        for (int i = 0; i < expected_digits; ++i){
+            size_t min_x = obj.min_x + i * split_w;
+            size_t max_x = (i == expected_digits - 1) ? obj.max_x : obj.min_x + (i + 1) * split_w;
+
+            // Crop the unblurred region to the split bounding box,
+            // shrink to the glyph so a captured drop shadow doesn't cause an offset
+            ImagePixelBox bbox = tighten_to_glyph(
+                stat_region, ImagePixelBox(min_x, obj.min_y, max_x, obj.max_y)
+            );
+            ImageViewRGB32 crop = extract_box_reference(stat_region, bbox);
+
+            if (save_debug_images && dump_prefix == "levelDigit"){
+                crop.save("DebugDumps/" + dump_prefix + "_x" + std::to_string(min_x) + "_split_raw.png");
+            }
+
+            // Compute RMSD against each digit template; pick the minimum.
+            // If no templates are loaded (extraction mode), skip matching entirely.
+            double best_rmsd = 9999.0;
+            int best_digit = -1;
+            if (templates.any_loaded){
+                for (int d = 0; d < 10; ++d){
+                    if (!templates.matchers[d])
+                        continue;
+                    double r = templates.matchers[d]->rmsd(crop);
+                    if (r < best_rmsd){
+                        best_rmsd = r;
+                        best_digit = d;
+                    }
+                }
+            }
+
+            if (best_rmsd > rmsd_threshold){
+                // Always save the raw crop for user inspection / template extraction.
+                if (save_debug_images){
+                    crop.save(
+                        "DebugDumps/" + dump_prefix + "_x" + std::to_string(min_x) + "_raw.png"
+                    );
+                }
+                logger.log(
+                    "DigitReader: blob at x=" + std::to_string(min_x) +
+                    " skipped (best RMSD=" + std::to_string(best_rmsd) +
+                    ", threshold=" + std::to_string(rmsd_threshold) + ").",
+                    COLOR_ORANGE
+                );
+                continue;
+            }
+
+            logger.log(
+                "DigitReader: blob at x=" + std::to_string(min_x) +
+                " -> digit " + std::to_string(best_digit) +
+                " (RMSD=" + std::to_string(best_rmsd) + ")"
+            );
+            // Save crop with prefix so level and stat crops are distinguishable.
+            if (save_debug_images){
+                crop.save(
+                    "DebugDumps/" + dump_prefix + "_x" + std::to_string(min_x) +
+                    "_match" + std::to_string(best_digit) + ".png"
+                );
+            }
+            result_str += static_cast<char>('0' + best_digit);
+        }
+    }
+
+    if (result_str.empty()){
+        return -1;
+    }
+
+    int number = std::atoi(result_str.c_str());
+    logger.log(
+        "DigitReader: \"" + result_str + "\" -> " +
+        std::to_string(number)
+    );
+    return number;
+}
+
+} // namespace PokemonFRLG
+} // namespace NintendoSwitch
+} // namespace PokemonAutomation
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_DigitReader.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_DigitReader.h
new file mode 100644
index 0000000000..d65859b43a
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_DigitReader.h
@@ -0,0 +1,56 @@
+/*  FRLG Digit Reader
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  Reads a string of decimal digits from a stat region using waterfill
+ *  segmentation on a blurred image to locate individual digit bounding boxes,
+ *  then template-matches each cropped digit against the pre-stored digit
+ *  templates (Resources/PokemonFRLG/Digits/0-9.png) on the unblurred original.
+ *
+ *  This is the Tesseract (PaddleOCR-free) fallback path.
+ */
+
+#ifndef PokemonAutomation_PokemonFRLG_DigitReader_H
+#define PokemonAutomation_PokemonFRLG_DigitReader_H
+
+#include <cstdint>
+#include <string>
+
+namespace PokemonAutomation{
+
+class Logger;
+class ImageViewRGB32;
+
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+enum class DigitTemplateType{
+    StatBox,      // Yellow stat boxes (default): PokemonFRLG/Digits/
+    LevelBox,     // Lilac level box: PokemonFRLG/LevelDigits/
+    DialogBox,    // White dialog box: PokemonFRLG/DialogDigits/
+};
+
+// Read a string of decimal digits from `stat_region`.
+//
+// template_type    Which template set to use (StatBox or LevelBox).
+// dump_prefix      Prefix used when saving debug crop PNGs to DebugDumps/.
+//
+// Returns the parsed integer, or -1 on failure.
+int read_digits_waterfill_template(
+    Logger& logger,
+    const ImageViewRGB32& stat_region,
+    DigitTemplateType template_type = DigitTemplateType::StatBox,
+    double rmsd_threshold = 175.0,
+    const std::string& dump_prefix = "digit",
+    uint8_t binarize_high = 0xBE,  // 0xBE=190 for yellow stat boxes;
+    bool save_debug_images = false
+    // use 0x7F=127 for lilac level box
+);
+
+
+} // namespace PokemonFRLG
+} // namespace NintendoSwitch
+} // namespace PokemonAutomation
+
+#endif
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_OcrPreprocessing.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_OcrPreprocessing.cpp
new file mode 100644
index 0000000000..865be9f7b3
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_OcrPreprocessing.cpp
@@ -0,0 +1,168 @@
+/*  FRLG OCR Preprocessing
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <algorithm>
+#include <opencv2/imgproc.hpp>
+#include "Common/Cpp/Color.h"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/ImageTypes/ImageRGB32_OpenCV.h"
+#include "CommonTools/ImageMatch/ImageCropper.h"
+#include "CommonTools/Images/ImageFilter.h"
+
+#include "PokemonFRLG_OcrPreprocessing.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+
+ImageRGB32 preprocess_for_ocr(
+    const ImageViewRGB32& image,
+    int blur_kernel_size, int blur_passes
+){
+    if (!image || image.width() == 0 || image.height() == 0){
+        return ImageRGB32();
+    }
+
+    // Rescale the image to match the expected height at 1080p
+    // so that the Gaussian blur size works across resolutions
+    constexpr int expected_height = 69;
+
+    double scale_factor = static_cast<double>(expected_height) / static_cast<double>(image.height());
+
+    int new_w = std::max(
+        1, cvRound(static_cast<int>(image.width() * scale_factor))
+    );
+
+    int new_h = std::max(
+        1, cvRound(static_cast<int>(image.height() * scale_factor))
+    );
+
+    ImageRGB32 blurred = image.scale_to(new_w, new_h);
+
+    // The 5x5 kernel reaches 2 pixels away (vs 1px for 3x3), bridging
+    // wider gaps in the seven-segment font. Two passes for heavy smoothing.
+    cv::Mat mat = to_OpenCV_ref(blurred);
+    if (blur_kernel_size > 0 && blur_passes > 0){
+        for (int i = 0; i < blur_passes; i++){
+            cv::GaussianBlur(
+                mat, mat,
+                cv::Size(blur_kernel_size, blur_kernel_size), 1.5
+            );
+        }
+    }
+
+    return blurred;
+}
+
+
+const std::vector<OCR::TextColorRange>& DARK_TEXT_FILTERS(){
+    static std::vector<OCR::TextColorRange> filters{
+        {combine_rgb(0, 0, 0), combine_rgb(96, 96, 96)},
+        {combine_rgb(0, 0, 0), combine_rgb(128, 128, 128)},
+        {combine_rgb(0, 0, 0), combine_rgb(160, 160, 160)},
+        {combine_rgb(0, 0, 0), combine_rgb(184, 184, 184)},
+        {combine_rgb(0, 0, 0), combine_rgb(208, 208, 208)},
+    };
+    return filters;
+}
+
+const std::vector<OCR::TextColorRange>& BRIGHT_TEXT_FILTERS(){
+    static std::vector<OCR::TextColorRange> filters{
+        {combine_rgb(180, 180, 180), combine_rgb(255, 255, 255)},
+        {combine_rgb(190, 190, 190), combine_rgb(255, 255, 255)},
+        {combine_rgb(200, 200, 200), combine_rgb(255, 255, 255)},
+        {combine_rgb(210, 210, 210), combine_rgb(255, 255, 255)},
+        {combine_rgb(220, 220, 220), combine_rgb(255, 255, 255)},
+        {combine_rgb(230, 230, 230), combine_rgb(255, 255, 255)},
+        {combine_rgb(240, 240, 240), combine_rgb(255, 255, 255)},
+    };
+    return filters;
+}
+
+
+std::string read_nidoran_symbol(
+    const ImageViewRGB32& name, const std::vector<OCR::TextColorRange>& text_color_ranges
+){
+    // OCR drops the monochrome gender suffix, so match its shape separately.
+    for (const auto& filter : text_color_ranges){
+        const ImageRGB32 filtered = filter_rgb32_range(name, filter.mins, filter.maxs, Color(0), false);
+        const ImageViewRGB32 text = ImageMatch::trim_image_alpha(filtered);
+        if (!text){
+            continue;
+        }
+
+        // Isolate the last glyph by the empty column separating it from the name.
+        size_t left = text.width();
+        while (left > 0){
+            bool foreground = false;
+            for (size_t y = 0; y < text.height(); y++){
+                if (Color(text.pixel(left - 1, y)).alpha() != 0){
+                    foreground = true;
+                    break;
+                }
+            }
+            if (!foreground){
+                break;
+            }
+            left--;
+        }
+        const ImageViewRGB32 symbol = ImageMatch::trim_image_alpha(
+            text.sub_image(left, 0, text.width() - left, text.height())
+        );
+        const double aspect_ratio = (double)symbol.width() / symbol.height();
+        // Japanese summary glyphs are wider than the Latin-font glyphs.
+        if (aspect_ratio < 0.4 || aspect_ratio > 0.8){
+            continue;
+        }
+
+        // The Latin font uses 5 x 10 glyphs; the Japanese font uses 7 x 10
+        // glyphs with a wider female cross and a taller male arrow.
+        struct SymbolFont{
+            size_t width;
+            const char* symbols[2];  // Female, male.
+        };
+        static constexpr SymbolFont fonts[] = {
+            {5, {
+                ".###." "#...#" "#...#" "#...#" ".###." "..#.." "#####" "..#.." "..#.." "..#..",
+                "..#.." ".###." "#.#.#" "..#.." "..#.." ".###." "#...#" "#...#" "#...#" ".###."
+            }},
+            {7, {
+                "..###.." ".#...#." ".#...#." ".#...#." "..###.." "...#..." "#######" "...#..." "...#..." "...#...",
+                "...#..." "..###.." ".#.#.#." "#..#..#" "...#..." "..###.." ".#...#." ".#...#." ".#...#." "..###.."
+            }}
+        };
+        double errors[2] = {255, 255};
+        for (const SymbolFont& font : fonts){
+            const ImageRGB32 scaled = symbol.scale_to(font.width, 10);
+            double font_errors[2] = {};
+            for (size_t y = 0; y < 10; y++){
+                for (size_t x = 0; x < font.width; x++){
+                    const uint8_t alpha = Color(scaled.pixel(x, y)).alpha();
+                    for (size_t gender = 0; gender < 2; gender++){
+                        font_errors[gender] += font.symbols[gender][y * font.width + x] == '#' ? 255 - alpha : alpha;
+                    }
+                }
+            }
+            // Compare the best match for each gender across both fonts.
+            for (size_t gender = 0; gender < 2; gender++){
+                errors[gender] = std::min(errors[gender], font_errors[gender] / (font.width * 10));
+            }
+        }
+        if (errors[0] < 50 && errors[0] + 20 < errors[1]){
+            return "nidoran-f";
+        }
+        if (errors[1] < 50 && errors[1] + 20 < errors[0]){
+            return "nidoran-m";
+        }
+    }
+    return "";
+}
+
+
+} // namespace PokemonFRLG
+} // namespace NintendoSwitch
+} // namespace PokemonAutomation
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_OcrPreprocessing.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_OcrPreprocessing.h
new file mode 100644
index 0000000000..140934f41a
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_OcrPreprocessing.h
@@ -0,0 +1,47 @@
+/*  FRLG OCR Preprocessing
+ *
+ *  From: https://github.com/PokemonAutomation/
+ * 
+ */
+
+#ifndef PokemonAutomation_PokemonFRLG_OcrPreprocessing_H
+#define PokemonAutomation_PokemonFRLG_OcrPreprocessing_H
+
+#include <string>
+#include <vector>
+#include "CommonFramework/ImageTypes/ImageRGB32.h"
+#include "CommonTools/OCR/OCR_Routines.h"
+
+namespace PokemonAutomation{
+
+class ImageViewRGB32;
+
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+
+//  Gaussian-blur `image` so the gaps in the GBA font close up.
+//  The blur is adjusted from the passed size to match the size of the image
+ImageRGB32 preprocess_for_ocr(
+    const ImageViewRGB32& image,
+    int blur_kernel_size = 7, int blur_passes = 2
+);
+
+//  For dark GBA text against a light background
+const std::vector<OCR::TextColorRange>& DARK_TEXT_FILTERS();
+
+//  For white GBA text against a dark background
+const std::vector<OCR::TextColorRange>& BRIGHT_TEXT_FILTERS();
+
+// Resolve the monochrome gender suffix when OCR cannot distinguish Nidoran.
+// Returns "nidoran-f", "nidoran-m", or "" if the suffix is unreadable.
+std::string read_nidoran_symbol(
+    const ImageViewRGB32& name, const std::vector<OCR::TextColorRange>& text_color_ranges
+);
+
+
+} // namespace PokemonFRLG
+} // namespace NintendoSwitch
+} // namespace PokemonAutomation
+
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_PartyLevelUpReader.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_PartyLevelUpReader.cpp
new file mode 100644
index 0000000000..a3f602a711
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_PartyLevelUpReader.cpp
@@ -0,0 +1,122 @@
+/*  Party Level Up Reader
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <opencv2/imgproc.hpp>
+#include "Common/Cpp/Color.h"
+#include "Common/Cpp/Exceptions.h"
+#include "CommonFramework/GlobalSettingsPanel.h"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonFramework/GlobalAutoPaths.h"
+#include "CommonFramework/ImageTypes/ImageRGB32.h"
+#include "CommonTools/Images/ImageFilter.h"
+#include "CommonTools/OCR/OCR_NumberReader.h"
+#include "Tests/ImageUnitTest.h"
+#include "Pokemon/Pokemon_StatsCalculation.h"
+#include "Pokemon/Inference/Pokemon_NameReader.h"
+#include "VideoGames/PokemonFRLG/PokemonFRLG_Settings.h"
+#include "VideoGames/PokemonFRLG/PokemonFRLG_Tests.h"
+#include "PokemonFRLG_DigitReader.h"
+#include "PokemonFRLG_PartyLevelUpReader.h"
+
+
+namespace PokemonAutomation {
+namespace NintendoSwitch {
+namespace PokemonFRLG {
+
+
+PartyLevelUpReader::PartyLevelUpReader(Color color)
+    : m_color(color)
+    , m_box_hp(0.844069, 0.051852, 0.128535, 0.079387)
+    , m_box_attack(0.844069, 0.145052, 0.128535, 0.079387)
+    , m_box_defense(0.844069, 0.238252, 0.128535, 0.079387)
+    , m_box_sp_attack(0.844069, 0.331452, 0.128535, 0.079387)
+    , m_box_sp_defense(0.844069, 0.424652, 0.128535, 0.079387)
+    , m_box_speed(0.844069, 0.517852, 0.128535, 0.0793879)
+{}
+
+void PartyLevelUpReader::make_overlays(VideoOverlaySet &items) const {
+    const BoxOption &GAME_BOX = GameSettings::instance().GAME_BOX;
+    items.add(m_color, GAME_BOX.inner_to_outer(m_box_hp));
+    items.add(m_color, GAME_BOX.inner_to_outer(m_box_attack));
+    items.add(m_color, GAME_BOX.inner_to_outer(m_box_defense));
+    items.add(m_color, GAME_BOX.inner_to_outer(m_box_sp_attack));
+    items.add(m_color, GAME_BOX.inner_to_outer(m_box_sp_defense));
+    items.add(m_color, GAME_BOX.inner_to_outer(m_box_speed));
+}
+
+StatReads PartyLevelUpReader::read_stats(Logger &logger, const ImageViewRGB32& frame) const{
+    ImageViewRGB32 game_screen =
+            extract_box_reference(frame, GameSettings::instance().GAME_BOX);
+    
+    auto read_stat = [&](const ImageFloatBox &box, const std::string &name){
+        ImageViewRGB32 stat_region = extract_box_reference(game_screen, box);
+        return read_digits_waterfill_template(logger, stat_region, DigitTemplateType::DialogBox);
+    };
+
+    StatReads stats;
+    stats.hp = uint16_t(read_stat(m_box_hp, "hp"));
+    stats.attack = uint16_t(read_stat(m_box_attack, "attack"));
+    stats.defense = uint16_t(read_stat(m_box_defense, "defense"));
+    stats.spatk = uint16_t(read_stat(m_box_sp_attack, "spatk"));
+    stats.spdef = uint16_t(read_stat(m_box_sp_defense, "spdef"));
+    stats.speed = uint16_t(read_stat(m_box_speed, "speed"));
+    return stats;
+}
+
+
+class Test_PartyLevelUpReader : public ImageUnitTest{
+public:
+    Test_PartyLevelUpReader(const std::string& image)
+        : ImageUnitTest("PokemonFRLG::PartyLevelUpReader - " + image, {image})
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        const ImageRGB32& image = images[0];
+        PartyLevelUpReader reader;
+        StatReads stats = reader.read_stats(logger, image);
+
+        return check_against_golden_file(
+            UNIT_TEST_RESOURCE_PATH() + image_paths()[0],
+            {"hp", "attack", "defense", "spatk", "spdef", "speed"},
+            {
+                std::to_string(stats.hp),
+                std::to_string(stats.attack),
+                std::to_string(stats.defense),
+                std::to_string(stats.spatk),
+                std::to_string(stats.spdef),
+                std::to_string(stats.speed),
+            }
+        );
+    };
+};
+
+
+void add_tests_PartyLevelUpReader(UnitTestDatabase& database){
+        database.add<Test_PartyLevelUpReader>("PokemonFRLG/PartyLevelUpReader/raikou_1.png");
+        database.add<Test_PartyLevelUpReader>("PokemonFRLG/PartyLevelUpReader/raikou_2.png");
+        database.add<Test_PartyLevelUpReader>("PokemonFRLG/PartyLevelUpReader/raikou_3.png");
+        database.add<Test_PartyLevelUpReader>("PokemonFRLG/PartyLevelUpReader/raikou_4.png");
+        database.add<Test_PartyLevelUpReader>("PokemonFRLG/PartyLevelUpReader/raikou_5.png");
+        database.add<Test_PartyLevelUpReader>("PokemonFRLG/PartyLevelUpReader/raikou_6.png");
+        database.add<Test_PartyLevelUpReader>("PokemonFRLG/PartyLevelUpReader/deoxys_1.png");
+        database.add<Test_PartyLevelUpReader>("PokemonFRLG/PartyLevelUpReader/deoxys_2.png");
+        database.add<Test_PartyLevelUpReader>("PokemonFRLG/PartyLevelUpReader/deoxys_3.png");
+        database.add<Test_PartyLevelUpReader>("PokemonFRLG/PartyLevelUpReader/dratini_1.png");
+        database.add<Test_PartyLevelUpReader>("PokemonFRLG/PartyLevelUpReader/dratini_2.png");
+        database.add<Test_PartyLevelUpReader>("PokemonFRLG/PartyLevelUpReader/dratini_3.png");
+        database.add<Test_PartyLevelUpReader>("PokemonFRLG/PartyLevelUpReader/dratini_4.png");
+        database.add<Test_PartyLevelUpReader>("PokemonFRLG/PartyLevelUpReader/dratini_5.png");
+}
+
+
+} // namespace PokemonFRLG
+} // namespace NintendoSwitch
+} // namespace PokemonAutomation
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_PartyLevelUpReader.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_PartyLevelUpReader.h
new file mode 100644
index 0000000000..bf0b2c67eb
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_PartyLevelUpReader.h
@@ -0,0 +1,57 @@
+/*  Party Level Up Reader
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonFRLG_PartyLevelUpReader_H
+#define PokemonAutomation_PokemonFRLG_PartyLevelUpReader_H
+
+#include <optional>
+#include <string>
+#include "Common/Cpp/Color.h"
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/Language.h"
+#include "Pokemon/Pokemon_StatsCalculation.h"
+
+
+namespace PokemonAutomation{
+
+class Logger;
+class ImageViewRGB32;
+class VideoOverlaySet;
+
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+using namespace Pokemon;
+
+
+class PartyLevelUpReader {
+public:
+    PartyLevelUpReader(Color color = COLOR_RED);
+
+    void make_overlays(VideoOverlaySet &items) const;
+
+    StatReads read_stats(Logger &logger, const ImageViewRGB32& frame) const;
+
+private:
+    Color m_color;
+    ImageFloatBox m_box_hp;
+    ImageFloatBox m_box_attack;
+    ImageFloatBox m_box_defense;
+    ImageFloatBox m_box_sp_attack;
+    ImageFloatBox m_box_sp_defense;
+    ImageFloatBox m_box_speed;
+
+};
+
+
+void add_tests_PartyLevelUpReader(UnitTestDatabase& database);
+
+} // namespace PokemonFRLG
+} // namespace NintendoSwitch
+} // namespace PokemonAutomation
+#endif
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_PokedexRegisteredDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_PokedexRegisteredDetector.cpp
new file mode 100644
index 0000000000..b3693f5c4e
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_PokedexRegisteredDetector.cpp
@@ -0,0 +1,137 @@
+/*  Pokedex Registered Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Kernels/Waterfill/Kernels_Waterfill_Types.h"
+#include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h"
+#include "CommonTools/Images/SolidColorTest.h"
+#include "CommonTools/Images/WaterfillUtilities.h"
+#include "VideoGames/PokemonFRLG/PokemonFRLG_Settings.h"
+#include "PokemonFRLG_PokedexRegisteredDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+
+class PokedexRegisteredMatcher : public ImageMatch::WaterfillTemplateMatcher{
+public:
+    PokedexRegisteredMatcher()
+        : WaterfillTemplateMatcher(
+            "PokemonFRLG/PokedexButtonA.png",
+            Color(128, 128, 128), Color(255, 255, 255), 100
+        )
+    {
+        m_aspect_ratio_lower = 0.5;
+        m_aspect_ratio_upper = 2.0;
+        m_area_ratio_lower = 0.5;
+        m_area_ratio_upper = 2.0;
+    }
+
+    static const PokedexRegisteredMatcher& matcher(){
+        static PokedexRegisteredMatcher matcher;
+        return matcher;
+    }
+};
+
+
+PokedexRegisteredDetector::PokedexRegisteredDetector(
+    Color color,
+    VideoOverlay* overlay
+)
+    : m_color(color)
+    , m_overlay(overlay)
+    , m_box(0.85, 0.923, 0.082, 0.070)
+    , m_top_box(0.940865, 0.013942, 0.049519, 0.071394)
+    , m_header_box(0.037019, 0.147355, 0.928365, 0.015865)
+    , m_divider_box(0.016827, 0.560577, 0.961827, 0.002885)
+    , m_body_box(0.016827, 0.582577, 0.961827, 0.002885)
+    , m_bottom_box(0.007692, 0.912500, 0.688942, 0.075721)
+{}
+
+void PokedexRegisteredDetector::make_overlays(VideoOverlaySet& items) const{
+    const BoxOption& GAME_BOX = GameSettings::instance().GAME_BOX;
+    items.add(m_color, GAME_BOX.inner_to_outer(m_box));           // White "A" button prompt
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_top_box));     // Green RGB(189, 205,   0)
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_header_box));  // White
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_divider_box)); // Brown RGB(136, 100,  38)
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_body_box));    // Beige RGB(255, 245, 204)
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_bottom_box));  // Green
+}
+
+bool PokedexRegisteredDetector::detect(const ImageViewRGB32& screen){
+    const BoxOption& GAME_BOX = GameSettings::instance().GAME_BOX;
+    ImageViewRGB32 game_screen = extract_box_reference(screen, GAME_BOX);
+
+    double screen_rel_size = (game_screen.height() / 1080.0);
+    double screen_rel_size_2 = screen_rel_size * screen_rel_size;
+
+    double min_area_1080p = 700;
+    double rmsd_threshold = 70;
+    size_t min_area = size_t(screen_rel_size_2 * min_area_1080p);
+
+    const std::vector<std::pair<uint32_t, uint32_t>> FILTERS = {
+        {0xff808080, 0xffffffff},
+        {0xff909090, 0xffffffff},
+        {0xffa0a0a0, 0xffffffff},
+        {0xffb0b0b0, 0xffffffff},
+        {0xffc0c0c0, 0xffffffff},
+        {0xffd0d0d0, 0xffffffff},
+        {0xffe0e0e0, 0xffffffff},
+        {0xfff0f0f0, 0xffffffff},
+    };
+
+    bool found = match_template_by_waterfill(
+        game_screen.size(),
+        extract_box_reference(game_screen, m_box),
+        PokedexRegisteredMatcher::matcher(),
+        FILTERS,
+        {min_area, SIZE_MAX},
+        rmsd_threshold,
+        [&](Kernels::Waterfill::WaterfillObject& object) -> bool {
+            m_last_detected = translate_to_parent(game_screen, m_box, object);
+            return true;
+        }
+    );
+
+    if (!found){
+        m_last_detected_box.reset();
+
+        ImageViewRGB32 top_image = extract_box_reference(game_screen, m_top_box);
+        ImageViewRGB32 header_image = extract_box_reference(game_screen, m_header_box);
+        ImageViewRGB32 divider_image = extract_box_reference(game_screen, m_divider_box);
+        ImageViewRGB32 body_image = extract_box_reference(game_screen, m_body_box);
+        ImageViewRGB32 bottom_image = extract_box_reference(game_screen, m_bottom_box);
+
+        if (is_solid(top_image, { 0.480, 0.520, 0.000 }, 0.25, 20)
+            && is_white(header_image)
+            && is_solid(divider_image, { 0.496, 0.365, 0.139 }, 0.25, 20)
+            && is_solid(body_image, { 0.362, 0.348, 0.290 }, 0.25, 20)
+            && is_solid(bottom_image, { 0.480, 0.520, 0.000 }, 0.25, 20)
+            && !is_white(top_image)
+            && !is_white(divider_image)
+            && !is_white(bottom_image)
+        ){
+            return true;
+        }
+
+        return false;
+    }
+
+    if (m_overlay){
+        if (found){
+            m_last_detected_box.emplace(*m_overlay, GAME_BOX.inner_to_outer(m_last_detected), COLOR_GREEN);
+        }else{
+            m_last_detected_box.reset();
+        }
+    }
+
+    return found;
+}
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_PokedexRegisteredDetector.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_PokedexRegisteredDetector.h
new file mode 100644
index 0000000000..4f9c37d221
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_PokedexRegisteredDetector.h
@@ -0,0 +1,63 @@
+/*  Pokedex Registered Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonFRLG_PokedexRegisteredDetector_H
+#define PokemonAutomation_PokemonFRLG_PokedexRegisteredDetector_H
+
+#include "optional"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/VisualDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+
+// Detects the white "A" button prompt that appears in the bottom right of the
+// screen when a Pokémon is registered in the Pokédex.
+// If that fails, detect the various colors of the Pokédex registration screen.
+class PokedexRegisteredDetector : public StaticScreenDetector{
+public:
+    PokedexRegisteredDetector(
+        Color color,
+        VideoOverlay* overlay
+    );
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+    virtual void reset_state() override { m_last_detected_box.reset(); }
+
+private:
+    Color m_color;
+    VideoOverlay* m_overlay;
+    const ImageFloatBox m_box;
+    const ImageFloatBox m_top_box;
+    const ImageFloatBox m_header_box;
+    const ImageFloatBox m_divider_box;
+    const ImageFloatBox m_body_box;
+    const ImageFloatBox m_bottom_box;
+
+    ImageFloatBox m_last_detected;
+    std::optional<OverlayBoxScope> m_last_detected_box;
+};
+
+class PokedexRegisteredWatcher : public DetectorToFinder<PokedexRegisteredDetector>{
+public:
+    PokedexRegisteredWatcher(
+        Color color,
+        VideoOverlay* overlay,
+        std::chrono::milliseconds hold_duration = std::chrono::milliseconds(250)
+    )
+        : DetectorToFinder("PokedexRegisteredWatcher", hold_duration, color, overlay)
+    {}
+};
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_PokemonSpriteReader.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_PokemonSpriteReader.cpp
new file mode 100644
index 0000000000..6e2c516038
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_PokemonSpriteReader.cpp
@@ -0,0 +1,98 @@
+/*  Pokemon FRLG Sprite Reader
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/ImageTools/ImageStats.h"
+#include "CommonFramework/GlobalSettingsPanel.h"
+#include "CommonTools/ImageMatch/ImageCropper.h"
+#include "VideoGames/PokemonFRLG/Resources/PokemonFRLG_PokemonSprites.h"
+#include "VideoGames/PokemonFRLG/PokemonFRLG_Settings.h"
+#include "PokemonFRLG_PokemonSpriteReader.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+
+PokemonSpriteMatcherExact::PokemonSpriteMatcherExact(const std::set<std::string>* subset, bool flipped)
+    : ExactImageDictionaryMatcher({1, 256})
+{
+    for (const auto& item : (flipped ? FLIPPED_POKEMON_SPRITES() : ALL_POKEMON_SPRITES())){
+        if (subset == nullptr || subset->find(item.first) != subset->end()){
+            add(item.first, item.second.sprite.copy());
+        }
+    }
+}
+
+
+PokemonSpriteMatcherCropped::PokemonSpriteMatcherCropped(const std::set<std::string>* subset, double min_euclidean_distance, bool flipped)
+    : CroppedImageDictionaryMatcher({1, 256})
+    , m_min_euclidean_distance_squared(min_euclidean_distance * min_euclidean_distance)
+{
+    for (const auto& item : (flipped ? FLIPPED_POKEMON_SPRITES() : ALL_POKEMON_SPRITES())){
+        if (subset == nullptr || subset->find(item.first) != subset->end()){
+            add(item.first, item.second.sprite);
+        }
+    }
+}
+
+auto PokemonSpriteMatcherCropped::get_crop_candidates(const ImageViewRGB32& image) const -> std::vector<ImageViewRGB32>{
+    ImageStats border = image_border_stats(image);
+    ImagePixelBox box = ImageMatch::enclosing_rectangle_with_pixel_filter(
+        image,
+        [&](Color pixel){
+            double r = (double)pixel.red() - border.average.r;
+            double g = (double)pixel.green() - border.average.g;
+            double b = (double)pixel.blue() - border.average.b;
+            bool stop = r*r + g*g + b*b >= m_min_euclidean_distance_squared;
+            return stop;
+        }
+    );
+    std::vector<ImageViewRGB32> ret;
+    ret.emplace_back(extract_box_reference(image, box));
+    return ret;
+}
+
+
+SummarySpriteReader::SummarySpriteReader(const std::set<std::string>& subset, Color color)
+    : m_color(color), 
+    m_box_sprite(0.113462, 0.209375, 0.274519, 0.381490),
+    sprite_matcher(&subset, 100, true),
+    exact_sprite_matcher(&subset, true)
+{}
+
+void SummarySpriteReader::make_overlays(VideoOverlaySet &items) const {
+    const BoxOption &GAME_BOX = GameSettings::instance().GAME_BOX;
+    items.add(m_color, GAME_BOX.inner_to_outer(m_box_sprite));
+}
+
+ImageMatch::ImageMatchResult SummarySpriteReader::read(const ImageViewRGB32& frame){
+    static const double CROPPED_ALPHA_SPREAD = 0.03;
+    static const double EXACT_ALPHA_SPREAD = 0.02;
+
+    static const double RETRY_ALPHA = 0.25;
+
+    ImageViewRGB32 game_screen =
+        extract_box_reference(frame, GameSettings::instance().GAME_BOX);
+
+    ImageViewRGB32 sprite_image = extract_box_reference(game_screen, m_box_sprite);
+
+    ImageMatch::ImageMatchResult result = sprite_matcher.match(sprite_image, CROPPED_ALPHA_SPREAD);
+    if (result.results.size() != 1 || result.results.begin()->first > RETRY_ALPHA){
+        result = exact_sprite_matcher.match(
+            sprite_image, m_box_sprite,
+            5, EXACT_ALPHA_SPREAD
+        );
+    }
+
+    return result;
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_PokemonSpriteReader.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_PokemonSpriteReader.h
new file mode 100644
index 0000000000..ff58e0bd5c
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_PokemonSpriteReader.h
@@ -0,0 +1,57 @@
+/*  Pokemon FRLG Sprite Reader
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonFRLG_PokemonSpriteReader_H
+#define PokemonAutomation_PokemonFRLG_PokemonSpriteReader_H
+
+#include <set>
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/ImageMatch/ExactImageDictionaryMatcher.h"
+#include "CommonTools/ImageMatch/CroppedImageDictionaryMatcher.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+
+class PokemonSpriteMatcherExact : public ImageMatch::ExactImageDictionaryMatcher{
+public:
+    PokemonSpriteMatcherExact(const std::set<std::string>* subset, bool flipped = true);
+};
+
+
+class PokemonSpriteMatcherCropped : public ImageMatch::CroppedImageDictionaryMatcher{
+public:
+    PokemonSpriteMatcherCropped(const std::set<std::string>* subset, double min_euclidean_distance = 100, bool flipped = true);
+
+private:
+    virtual std::vector<ImageViewRGB32> get_crop_candidates(const ImageViewRGB32& image) const override;
+
+private:
+    double m_min_euclidean_distance_squared;
+};
+
+
+class SummarySpriteReader{
+public:
+    SummarySpriteReader(const std::set<std::string>& subset, Color color = COLOR_RED);
+
+    void make_overlays(VideoOverlaySet& items) const;
+
+    ImageMatch::ImageMatchResult read(const ImageViewRGB32& frame);
+
+private:
+    Color m_color;
+    ImageFloatBox m_box_sprite;
+    PokemonSpriteMatcherCropped sprite_matcher;
+    PokemonSpriteMatcherExact exact_sprite_matcher;
+};
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_SelectionArrowDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_SelectionArrowDetector.cpp
new file mode 100644
index 0000000000..1c344364f2
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_SelectionArrowDetector.cpp
@@ -0,0 +1,202 @@
+/*  Selection Arrow Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Exceptions.h"
+#include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h"
+#include "CommonTools/Images/WaterfillUtilities.h"
+#include "VideoGames/PokemonFRLG/PokemonFRLG_Settings.h"
+#include "PokemonFRLG_SelectionArrowDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+ImageFloatBox SelectionArrowDetector::arrow_box_for_position(SelectionArrowPositionStartMenu position){
+    switch (position){
+    case SelectionArrowPositionStartMenu::POKEDEX:
+        return ImageFloatBox(0.727692, 0.0523077, 0.0369231, 0.0778846);
+    case SelectionArrowPositionStartMenu::POKEMON:
+        return ImageFloatBox(0.727692, 0.1457692, 0.0369231, 0.0778846);
+    case SelectionArrowPositionStartMenu::BAG:
+        return ImageFloatBox(0.727692, 0.2392307, 0.0369231, 0.0778846);
+    case SelectionArrowPositionStartMenu::TRAINER:
+        return ImageFloatBox(0.727692, 0.3378846, 0.0369231, 0.0778846);
+    case SelectionArrowPositionStartMenu::SAVE:
+        return ImageFloatBox(0.727692, 0.4261538, 0.0369231, 0.0778846);
+    case SelectionArrowPositionStartMenu::OPTION:
+        return ImageFloatBox(0.727692, 0.5248076, 0.0369231, 0.0778846);
+    case SelectionArrowPositionStartMenu::EXIT:
+        return ImageFloatBox(0.727692, 0.6182692, 0.0369231, 0.0778846);
+    default:
+        break;
+    }
+    throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Invalid FRLG Selection Arrow Position");
+}
+
+ImageFloatBox SelectionArrowDetector::arrow_box_for_position(SelectionArrowPositionSafariMenu position){
+    // Safari Zone menu has the same 7 slots as the overworld menu; RETIRE occupies slot 0,
+    // shifting POKEDEX..EXIT each down one relative to the overworld enum.
+    switch (position){
+    case SelectionArrowPositionSafariMenu::RETIRE:
+        return ImageFloatBox(0.727692, 0.0523077, 0.0369231, 0.0778846);
+    case SelectionArrowPositionSafariMenu::POKEDEX:
+        return ImageFloatBox(0.727692, 0.1457692, 0.0369231, 0.0778846);
+    case SelectionArrowPositionSafariMenu::POKEMON:
+        return ImageFloatBox(0.727692, 0.2392307, 0.0369231, 0.0778846);
+    case SelectionArrowPositionSafariMenu::BAG:
+        return ImageFloatBox(0.727692, 0.3378846, 0.0369231, 0.0778846);
+    case SelectionArrowPositionSafariMenu::TRAINER:
+        return ImageFloatBox(0.727692, 0.4261538, 0.0369231, 0.0778846);
+    case SelectionArrowPositionSafariMenu::OPTION:
+        return ImageFloatBox(0.727692, 0.5248076, 0.0369231, 0.0778846);
+    case SelectionArrowPositionSafariMenu::EXIT:
+        return ImageFloatBox(0.727692, 0.6182692, 0.0369231, 0.0778846);
+    default:
+        break;
+    }
+    throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Invalid FRLG Safari Selection Arrow Position");
+}
+
+ImageFloatBox SelectionArrowDetector::arrow_box_for_position(SelectionArrowPositionNoDexMenu position){
+    // Safari Zone menu has the same 7 slots as the overworld menu; RETIRE occupies slot 0,
+    // shifting POKEDEX..EXIT each down one relative to the overworld enum.
+    switch (position){
+    case SelectionArrowPositionNoDexMenu::POKEMON:
+        return ImageFloatBox(0.727692, 0.0523077, 0.0369231, 0.0778846);
+    case SelectionArrowPositionNoDexMenu::BAG:
+        return ImageFloatBox(0.727692, 0.1457692, 0.0369231, 0.0778846);
+    case SelectionArrowPositionNoDexMenu::TRAINER:
+        return ImageFloatBox(0.727692, 0.2392307, 0.0369231, 0.0778846);
+    case SelectionArrowPositionNoDexMenu::SAVE:
+        return ImageFloatBox(0.727692, 0.3378846, 0.0369231, 0.0778846);
+    case SelectionArrowPositionNoDexMenu::OPTION:
+        return ImageFloatBox(0.727692, 0.4261538, 0.0369231, 0.0778846);
+    case SelectionArrowPositionNoDexMenu::EXIT:
+        return ImageFloatBox(0.727692, 0.5248076, 0.0369231, 0.0778846);
+    default:
+        break;
+    }
+    throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Invalid FRLG Safari Selection Arrow Position");
+}
+
+ImageFloatBox SelectionArrowDetector::arrow_box_for_position(SelectionArrowPositionConfirmationMenu position){
+    switch (position){
+    case SelectionArrowPositionConfirmationMenu::YES:
+        return ImageFloatBox(0.69692, 0.4625, 0.037, 0.07788);
+    case SelectionArrowPositionConfirmationMenu::NO:
+        return ImageFloatBox(0.69692, 0.55, 0.037, 0.07788);
+    default:
+        break;
+    }
+    throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Invalid FRLG Selection Arrow Position");
+}
+
+class SelectionArrowMatcher : public ImageMatch::WaterfillTemplateMatcher{
+public:
+    SelectionArrowMatcher(const char* path)
+        : WaterfillTemplateMatcher(
+            path,
+            Color(50, 50, 50), Color(115, 115, 115), 70
+        )
+    {
+        m_aspect_ratio_lower = 0.8;
+        m_aspect_ratio_upper = 1.2;
+        m_area_ratio_lower = 0.8;
+        m_area_ratio_upper = 1.2;
+    }
+
+    static const SelectionArrowMatcher& matcher(){
+        static SelectionArrowMatcher matcher("PokemonFRLG/SelectionArrow.png");
+        return matcher;
+    }
+};
+
+SelectionArrowDetector::SelectionArrowDetector(
+    Color color,
+    VideoOverlay* overlay,
+    const ImageFloatBox& box
+)
+    : m_color(color)
+    , m_overlay(overlay)
+    , m_arrow_box(box)
+{}
+SelectionArrowDetector::SelectionArrowDetector(
+    Color color, 
+    VideoOverlay* overlay, 
+    SelectionArrowPositionStartMenu position
+)
+    : m_color(color)
+    , m_overlay(overlay)
+    , m_arrow_box(arrow_box_for_position(position))
+{}
+SelectionArrowDetector::SelectionArrowDetector(
+    Color color,
+    VideoOverlay* overlay,
+    SelectionArrowPositionConfirmationMenu position
+)
+    : m_color(color)
+    , m_overlay(overlay)
+    , m_arrow_box(arrow_box_for_position(position))
+{
+}
+SelectionArrowDetector::SelectionArrowDetector(
+    Color color,
+    VideoOverlay* overlay,
+    SelectionArrowPositionSafariMenu position
+)
+    : m_color(color)
+    , m_overlay(overlay)
+    , m_arrow_box(arrow_box_for_position(position))
+{
+}
+void SelectionArrowDetector::make_overlays(VideoOverlaySet& items) const{
+    const BoxOption& GAME_BOX = GameSettings::instance().GAME_BOX;
+    items.add(m_color, GAME_BOX.inner_to_outer(m_arrow_box));
+}
+bool SelectionArrowDetector::detect(const ImageViewRGB32& screen){
+    const BoxOption& GAME_BOX = GameSettings::instance().GAME_BOX;
+    ImageViewRGB32 game_screen = extract_box_reference(screen, GAME_BOX);
+
+    double screen_rel_size = (game_screen.height() / 1080.0);
+    double screen_rel_size_2 = screen_rel_size * screen_rel_size;
+
+    double min_area_1080p = 700;
+    double rmsd_threshold = 80;
+    size_t min_area = size_t(screen_rel_size_2 * min_area_1080p);
+
+    const std::vector<std::pair<uint32_t, uint32_t>> FILTERS = {
+        {0xff464646, 0xff787878},
+        {0xff3f413a, 0xff7f827c}
+    };
+
+    bool found = match_template_by_waterfill(
+        game_screen.size(),
+        extract_box_reference(game_screen, m_arrow_box),
+        SelectionArrowMatcher::matcher(),
+        FILTERS,
+        {min_area, SIZE_MAX},
+        rmsd_threshold,
+        [&](Kernels::Waterfill::WaterfillObject& object) -> bool {
+            m_last_detected = translate_to_parent(game_screen, m_arrow_box, object);
+            return true;
+        }
+    );
+
+    if (m_overlay){
+        if (found){
+            m_last_detected_box.emplace(*m_overlay, GAME_BOX.inner_to_outer(m_last_detected), COLOR_GREEN);
+        }else{
+            m_last_detected_box.reset();
+        }
+    }
+
+    return found;
+}
+
+
+}
+}
+}
\ No newline at end of file
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_SelectionArrowDetector.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_SelectionArrowDetector.h
new file mode 100644
index 0000000000..a552e9c12f
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_SelectionArrowDetector.h
@@ -0,0 +1,150 @@
+/*  Selection Arrow Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonFRLG_SelectionArrowDetector_H
+#define PokemonAutomation_PokemonFRLG_SelectionArrowDetector_H
+
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/VisualDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+// The order of these enums should be the same as the order of options in the game menu, from top to bottom, for ease of use with loops.
+const int SAFARI_START_MENU_OPTION_COUNT = 7;
+enum class SelectionArrowPositionSafariMenu {
+    RETIRE,
+    POKEDEX,
+    POKEMON,
+    BAG,
+    TRAINER,
+    OPTION,
+    EXIT
+};
+
+const int NO_DEX_START_MENU_OPTION_COUNT = 6;
+enum class SelectionArrowPositionNoDexMenu{
+    POKEMON,
+    BAG,
+    TRAINER,
+    SAVE,
+    OPTION,
+    EXIT
+};
+
+const int START_MENU_OPTION_COUNT = 7;
+enum class SelectionArrowPositionStartMenu{
+    POKEDEX,
+    POKEMON,
+    BAG,
+    TRAINER,
+    SAVE,
+    OPTION,
+    EXIT
+};
+
+enum class SelectionArrowPositionConfirmationMenu {
+    YES,
+    NO
+};
+
+class SelectionArrowDetector : public StaticScreenDetector{
+public:
+    SelectionArrowDetector(
+        Color color,
+        VideoOverlay* overlay,
+        const ImageFloatBox& box
+    );
+
+    SelectionArrowDetector(
+        Color color,
+        VideoOverlay* overlay,
+        SelectionArrowPositionStartMenu position
+    );
+
+    SelectionArrowDetector(
+        Color color,
+        VideoOverlay* overlay,
+        SelectionArrowPositionSafariMenu position
+    );
+
+    SelectionArrowDetector(
+        Color color,
+        VideoOverlay* overlay,
+        SelectionArrowPositionConfirmationMenu position
+    );
+
+    static ImageFloatBox arrow_box_for_position(SelectionArrowPositionStartMenu position);
+
+    static ImageFloatBox arrow_box_for_position(SelectionArrowPositionSafariMenu position);
+
+    static ImageFloatBox arrow_box_for_position(SelectionArrowPositionNoDexMenu position);
+
+    static ImageFloatBox arrow_box_for_position(SelectionArrowPositionConfirmationMenu position);
+
+    const ImageFloatBox& last_detected() const { return m_last_detected; }
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+
+    // This is not const so that detectors can save/cache state.
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    friend class SelectionArrowWatcher;
+
+    const Color m_color;
+    VideoOverlay* m_overlay;
+    const ImageFloatBox m_arrow_box;
+
+    ImageFloatBox m_last_detected;
+    std::optional<OverlayBoxScope> m_last_detected_box;
+};
+class SelectionArrowWatcher : public DetectorToFinder<SelectionArrowDetector>{
+public:
+    SelectionArrowWatcher(
+        Color color,
+        VideoOverlay* overlay,
+        const ImageFloatBox& box,
+        std::chrono::milliseconds hold_duration = std::chrono::milliseconds(250)
+    )
+         : DetectorToFinder("SelectionArrowWatcher", hold_duration, color, overlay, box)
+    {}
+    SelectionArrowWatcher(
+        Color color,
+        VideoOverlay* overlay,
+        SelectionArrowPositionStartMenu position,
+        std::chrono::milliseconds hold_duration = std::chrono::milliseconds(250)
+    )
+        : DetectorToFinder("SelectionArrowWatcher", hold_duration, color, overlay, arrow_box_for_position(position))
+    {
+    }
+    SelectionArrowWatcher(
+        Color color,
+        VideoOverlay* overlay,
+        SelectionArrowPositionSafariMenu position,
+        std::chrono::milliseconds hold_duration = std::chrono::milliseconds(250)
+    )
+        : DetectorToFinder("SelectionArrowWatcher", hold_duration, color, overlay, arrow_box_for_position(position))
+    {
+    }
+    SelectionArrowWatcher(
+        Color color,
+        VideoOverlay* overlay,
+        SelectionArrowPositionConfirmationMenu position,
+        std::chrono::milliseconds hold_duration = std::chrono::milliseconds(250)
+    )
+        : DetectorToFinder("SelectionArrowWatcher", hold_duration, color, overlay, arrow_box_for_position(position))
+    {
+    }
+};
+
+
+}
+}
+}
+
+#endif
\ No newline at end of file
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_ShinySymbolDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_ShinySymbolDetector.cpp
new file mode 100644
index 0000000000..11a3c4b15a
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_ShinySymbolDetector.cpp
@@ -0,0 +1,96 @@
+/*  Shiny Symbol Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Color.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/ImageTools/ImageStats.h"
+#include "CommonFramework/ImageTypes/ImageRGB32.h"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Images/ImageFilter.h"
+#include "Tests/ImageUnitTest.h"
+#include "VideoGames/PokemonFRLG/PokemonFRLG_Settings.h"
+#include "PokemonFRLG_ShinySymbolDetector.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+ShinySymbolDetector::ShinySymbolDetector(Color color)
+    : m_box_symbol(0.421231, 0.214308, 0.0406154, 0.0623077)
+{}
+void ShinySymbolDetector::make_overlays(VideoOverlaySet& items) const{
+    const BoxOption& GAME_BOX = GameSettings::instance().GAME_BOX;
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_box_symbol));
+}
+bool ShinySymbolDetector::read(Logger& logger, const ImageViewRGB32& frame){
+    ImageViewRGB32 game_screen = extract_box_reference(frame, GameSettings::instance().GAME_BOX);
+
+    const bool replace_color_within_range = false;
+
+    //Filter out background
+    ImageRGB32 filtered_region = filter_rgb32_range(
+        extract_box_reference(game_screen, m_box_symbol),
+        combine_rgb(193, 152, 0), combine_rgb(255, 255, 162), Color(0), replace_color_within_range
+    );
+    ImageStats stats = image_stats(filtered_region);
+
+    /*
+    filtered_region.save("./filtered_only.png");
+    cout << stats.average.r << endl;
+    cout << stats.average.g << endl;
+    cout << stats.average.b << endl;
+    */
+
+    /*
+    Shiny:
+    R: 195.786, G: 182.143, B: 142.286
+    */
+
+    if (stats.average.b + 20 < stats.average.r){
+        return true;
+    }
+    return false;
+}
+
+class Test_ShinySymbolDetector : public ImageUnitTest{
+public:
+
+    Test_ShinySymbolDetector(
+        const std::string& image,
+        bool expected
+    )
+        : ImageUnitTest("PokemonHome::ShinySymbolDetector - " + image, {image})
+        , m_expected(expected)
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        ShinySymbolDetector detector(COLOR_RED);
+        const ImageRGB32& image = images[0];
+        return detector.read(logger, image) == m_expected;
+    };
+
+private:
+    bool m_expected;
+};
+
+void add_tests_ShinySymbolDetector(UnitTestDatabase& database){
+    database.add<Test_ShinySymbolDetector>("PokemonFRLG/ShinySymbolDetector/Char_False.png", false);
+    database.add<Test_ShinySymbolDetector>("PokemonFRLG/ShinySymbolDetector/Karp-coloredited_True.png", true);
+    database.add<Test_ShinySymbolDetector>("PokemonFRLG/ShinySymbolDetector/Karp-snotyak_True.png", true);
+}
+
+}
+}
+}
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_ShinySymbolDetector.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_ShinySymbolDetector.h
new file mode 100644
index 0000000000..b9f6a7bba1
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_ShinySymbolDetector.h
@@ -0,0 +1,36 @@
+/*  Shiny Symbol Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonFRLG_ShinySymbolDetector_H
+#define PokemonAutomation_PokemonFRLG_ShinySymbolDetector_H
+
+#include "Common/Cpp/Logging/AbstractLogger.h"
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+// Shinies have a bright yellow star symbol in their summary
+// additionally, the border in the screen is blue instead of purple
+class ShinySymbolDetector{
+public:
+    ShinySymbolDetector(Color color);
+
+    virtual void make_overlays(VideoOverlaySet& items) const;
+    bool read(Logger& logger, const ImageViewRGB32& frame);
+
+private:
+    ImageFloatBox m_box_symbol;
+};
+
+void add_tests_ShinySymbolDetector(UnitTestDatabase& database);
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_StatsReader.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_StatsReader.cpp
new file mode 100644
index 0000000000..2b07020cad
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_StatsReader.cpp
@@ -0,0 +1,550 @@
+/*  Stats Reader
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <opencv2/imgproc.hpp>
+#include "Common/Cpp/Color.h"
+#include "Common/Cpp/Filesystem/Filesystem.h"
+#include "CommonFramework/GlobalSettingsPanel.h"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonFramework/ImageTools/ImageStats.h"
+#include "CommonFramework/GlobalAutoPaths.h"
+#include "CommonFramework/ImageTypes/ImageRGB32.h"
+#include "CommonTools/Images/ImageFilter.h"
+#include "CommonTools/OCR/OCR_NumberReader.h"
+#include "Tests/ImageUnitTest.h"
+#include "Tests/TestUtils.h"
+#include "Pokemon/Inference/Pokemon_NameReader.h"
+#include "Pokemon/Inference/Pokemon_NatureReader.h"
+#include "VideoGames/PokemonFRLG/PokemonFRLG_Settings.h"
+#include "VideoGames/PokemonFRLG/PokemonFRLG_Tests.h"
+#include "PokemonFRLG_StatsReader.h"
+#include "PokemonFRLG_DigitReader.h"
+#include "PokemonFRLG_OcrPreprocessing.h"
+
+namespace PokemonAutomation {
+namespace NintendoSwitch {
+namespace PokemonFRLG {
+
+StatsReader::StatsReader(Color color)
+    : m_color(color), 
+    m_box_nature(0.028976, 0.729610, 0.502487, 0.066639),
+    m_box_level(0.058333, 0.120140, 0.092308, 0.069416),
+    // m_box_name(0.163158, 0.122917, 0.262811, 0.066639),  // white text, top left
+    m_box_name(0.688942, 0.223798, 0.292308, 0.075721),     // black text, right side 
+    m_box_gender(0.430769, 0.114423, 0.034615, 0.081731),
+    m_box_hp(0.805274, 0.131247, 0.183790, 0.066639),
+    m_box_attack(0.891000, 0.245089, 0.097607, 0.066639),
+    m_box_defense(0.891000, 0.325612, 0.097607, 0.066639),
+    m_box_sp_attack(0.891000, 0.406134, 0.097607, 0.066639),
+    m_box_sp_defense(0.891000, 0.486657, 0.097607, 0.066639),
+    m_box_speed(0.891000, 0.567180, 0.097607, 0.066639),
+    m_box_nature_jpn(0.048718, 0.752884, 0.458205, 0.064423),
+    m_box_level_jpn(0.060256, 0.116346, 0.124359, 0.075962),
+    // m_box_name_jpn(0.176282, 0.114423, 0.257051, 0.077885),
+    m_box_name_jpn(0.688942, 0.210577, 0.261538, 0.069231),
+    m_box_gender_jpn(0.435256, 0.115384, 0.035256, 0.076923),
+    m_box_hp_jpn(0.717165, 0.131662, 0.269632, 0.066876),
+    m_box_attack_jpn(0.859615, 0.243269, 0.121795, 0.068269),
+    m_box_defense_jpn(0.859615, 0.323792, 0.121795, 0.068269),
+    m_box_sp_attack_jpn(0.859615, 0.404315, 0.121795, 0.068269),
+    m_box_sp_defense_jpn(0.859615, 0.484838, 0.121795, 0.068269),
+    m_box_speed_jpn(0.859615, 0.565361, 0.121795, 0.068269),
+    m_box_level_spa(0.062179, 0.120140, 0.088462, 0.069416)
+{}
+
+void StatsReader::make_overlays(VideoOverlaySet &items) const {
+    const BoxOption &GAME_BOX = GameSettings::instance().GAME_BOX;
+    items.add(m_color, GAME_BOX.inner_to_outer(m_box_nature));
+    items.add(m_color, GAME_BOX.inner_to_outer(m_box_level));
+    items.add(m_color, GAME_BOX.inner_to_outer(m_box_name));
+    items.add(m_color, GAME_BOX.inner_to_outer(m_box_gender));
+    items.add(m_color, GAME_BOX.inner_to_outer(m_box_hp));
+    items.add(m_color, GAME_BOX.inner_to_outer(m_box_attack));
+    items.add(m_color, GAME_BOX.inner_to_outer(m_box_defense));
+    items.add(m_color, GAME_BOX.inner_to_outer(m_box_sp_attack));
+    items.add(m_color, GAME_BOX.inner_to_outer(m_box_sp_defense));
+    items.add(m_color, GAME_BOX.inner_to_outer(m_box_speed));
+    items.add(m_color, GAME_BOX.inner_to_outer(m_box_nature_jpn));
+    items.add(m_color, GAME_BOX.inner_to_outer(m_box_level_jpn));
+    items.add(m_color, GAME_BOX.inner_to_outer(m_box_name_jpn));
+    items.add(m_color, GAME_BOX.inner_to_outer(m_box_gender_jpn));
+    items.add(m_color, GAME_BOX.inner_to_outer(m_box_hp_jpn));
+    items.add(m_color, GAME_BOX.inner_to_outer(m_box_attack_jpn));
+    items.add(m_color, GAME_BOX.inner_to_outer(m_box_defense_jpn));
+    items.add(m_color, GAME_BOX.inner_to_outer(m_box_sp_attack_jpn));
+    items.add(m_color, GAME_BOX.inner_to_outer(m_box_sp_defense_jpn));
+    items.add(m_color, GAME_BOX.inner_to_outer(m_box_speed_jpn));
+    items.add(m_color, GAME_BOX.inner_to_outer(m_box_level_spa));
+}
+
+bool StatsReader::read_name(
+    Logger& logger, Language language,
+    const ImageViewRGB32& game_screen,
+    PokemonFRLG_Stats& stats,
+    const std::set<std::string>& subset,
+    bool save_debug_images
+){
+    const bool jpn = language == Language::Japanese;
+
+    ImageViewRGB32 name_box = extract_box_reference(game_screen, jpn ? m_box_name_jpn : m_box_name);
+
+    ImageRGB32 name_ready = preprocess_for_ocr(name_box);
+
+    OCR::StringMatchResult result = subset.empty()
+        ? Pokemon::PokemonNameReader::instance().read_substring(
+            logger, language, name_ready, DARK_TEXT_FILTERS()
+        )
+        : Pokemon::PokemonNameReader(subset).read_substring(
+            logger, language, name_ready, DARK_TEXT_FILTERS()
+        );
+
+    if (!result.results.empty()){
+        stats.name = result.results.begin()->second.token;
+        if (stats.name != "nidoran-f" && stats.name != "nidoran-m"){
+            return true;
+        }
+        const std::string symbol_name = read_nidoran_symbol(preprocess_for_ocr(name_box, 3, 1), DARK_TEXT_FILTERS());
+        if (!symbol_name.empty() && (subset.empty() || subset.contains(symbol_name))){
+            stats.name = symbol_name;
+        }
+        return true;
+    }
+    logger.log("Failed to read species name.", COLOR_RED);
+    if (save_debug_images){
+        name_box.save("DebugDumps/ocr_name_box.png");
+        name_ready.save("DebugDumps/ocr_name_ready.png");
+    }
+    return false;
+}
+
+void StatsReader::read_gender(
+    Logger& logger, Language language,
+    const ImageViewRGB32& game_screen,
+    PokemonFRLG_Stats& stats,
+    const std::set<std::string>& subset
+){
+    const bool jpn = language == Language::Japanese;
+
+    // Detect gender by comparing red vs blue pixels
+    ImageViewRGB32 gender_box = extract_box_reference(game_screen, jpn ? m_box_gender_jpn : m_box_gender);
+
+    const bool replace_color_within_range = false;
+    const ImageRGB32 red_region = filter_rgb32_range(
+        gender_box,
+        combine_rgb(150, 0, 0), combine_rgb(255, 100, 100), Color(0), replace_color_within_range
+    );
+    const size_t num_red_pixels = image_stats(red_region).count;
+
+    const ImageRGB32 blue_region = filter_rgb32_range(
+        gender_box,
+        combine_rgb(0, 0, 180), combine_rgb(130, 130, 255), Color(0), replace_color_within_range
+    );
+    const size_t num_blue_pixels = image_stats(blue_region).count;
+
+    const double threshold = gender_box.width() * gender_box.height() * 0.1;
+
+    if (num_red_pixels > threshold){
+        stats.gender = SummaryGender::Female;
+        logger.log("Detected female gender.", COLOR_GREEN);
+    }else if (num_blue_pixels > threshold){
+        stats.gender = SummaryGender::Male;
+        logger.log("Detected male gender.", COLOR_GREEN);
+    }else{
+        stats.gender = SummaryGender::Genderless;
+        logger.log("No gender detected.", COLOR_GREEN);
+    }
+}
+
+bool StatsReader::read_level(
+    Logger& logger, Language language,
+    const ImageViewRGB32& game_screen,
+    PokemonFRLG_Stats& stats,
+    const std::set<std::string>& subset,
+    bool save_debug_images
+){
+    ImageViewRGB32 level_box = extract_box_reference(game_screen, 
+        language == Language::Japanese ? m_box_level_jpn :
+        language == Language::Spanish  ? m_box_level_spa :
+                                         m_box_level
+    );
+    
+    // The level uses white text with dark shadow on a lilac background.
+    // The digit reader's binarizer captures dark pixels (<=190 on all channels)
+    // but NOT the white text (all channels 255 -> excluded). This leaves the
+    // shadow outline fragmented into many small disconnected blobs.
+    // Preprocess: convert bright-white text pixels to black so the binarizer
+    // merges text + shadow into one solid connected blob per digit.
+    ImageRGB32 preprocessed = level_box.scale_to(level_box.width(), level_box.height());
+    for (size_t r = 0; r < level_box.height(); r++){
+        for (size_t c = 0; c < level_box.width(); c++){
+            Color pixel(level_box.pixel(c, r));
+            // Try to detect lilac background first based on low green channel, 
+            // replacing it with a darker lilac color (for matching the template)
+            // For other pixels, if it's bright it becomes black text. 
+            if ((pixel.blue() > pixel.green() + 25) && (pixel.red() > pixel.green() + 15)){
+                preprocessed.pixel(c, r) = (uint32_t)0xffd1b0f0; // from template
+            }else if (pixel.red() > 200 && pixel.green() > 200 && pixel.blue() > 200){
+                preprocessed.pixel(c, r) = (uint32_t)0xff000000; // Black
+            }
+        }
+    }
+    // Use threshold 230 (not 175): lilac-background blob crops inherently
+    // give higher RMSD than yellow stat-box crops due to background colour.
+    stats.level = read_digits_waterfill_template(
+            logger, preprocessed, DigitTemplateType::LevelBox, 230,
+            "levelDigit", 0x7F);
+    // log if it's an obviously bad read
+    if (!stats.level.has_value() || stats.level.value_or(-1) < 2 || stats.level.value_or(-1) > 100){
+        logger.log("Level OCR result out of range", COLOR_RED);
+        if (save_debug_images){
+            preprocessed.save("DebugDumps/ocr_level_preprocessed.png");
+        }
+        return false;
+    }
+    return true;
+
+    //  Old approach: PaddleOCR
+
+    // ImageRGB32 level_upscaled =
+    //     level_box.scale_to(level_box.width() * 4, level_box.height() * 4);
+    // ImageRGB32 level_ready(level_upscaled.width(), level_upscaled.height());
+    // for (size_t r = 0; r < level_upscaled.height(); r++){
+    //     for (size_t c = 0; c < level_upscaled.width(); c++){
+    //         Color pixel(level_upscaled.pixel(c, r));
+    //         // Try to detect lilac background first based on low green channel.
+    //         // For other pixels, if it's very bright (white text) OR very dark (shadow),
+    //         // it becomes black text. Otherwise, it becomes white background.
+    //         if ((pixel.blue() > pixel.green() + 25) && (pixel.red() > pixel.green() + 15)){
+    //             level_ready.pixel(c, r) = (uint32_t)0xffffffff; // White
+    //         }else if ((pixel.red() > 200 && pixel.green() > 200 && pixel.blue() > 200) ||
+    //                 (pixel.red() < 100 && pixel.green() < 100 && pixel.blue() < 100)){
+    //             level_ready.pixel(c, r) = (uint32_t)0xff000000; // Black
+    //         }else{
+    //             level_ready.pixel(c, r) = (uint32_t)0xffffffff; // White
+    //         }
+    //     }
+    // }
+    // // Pass the binarized image to PaddleOCR
+    // stats.level = OCR::read_number(logger, level_ready, language);
+    // // log if it's an obviously bad read
+    // if (!stats.level.has_value() || stats.level.value_or(-1) < 2 || stats.level.value_or(-1) > 100){
+    //     logger.log("Level OCR result out of range", COLOR_RED);
+    //     if (save_debug_images){
+    //         level_upscaled.save("DebugDumps/ocr_level_upscaled.png");
+    //         level_ready.save("DebugDumps/ocr_level_ready.png");
+    //     }
+    //     return false;
+    // }
+    // return true;
+}
+
+bool StatsReader::read_nature(
+    Logger& logger, Language language,
+    const ImageViewRGB32& game_screen,
+    PokemonFRLG_Stats& stats,
+    const std::set<std::string>& subset,
+    bool save_debug_images
+){
+    const bool jpn = language == Language::Japanese;
+
+    // Read Nature (black text on white/beige).
+    const static Pokemon::NatureReader reader("PokemonFRLG/NatureCheckerOCR.json");
+    ImageViewRGB32 nature_raw = extract_box_reference(game_screen, jpn ? m_box_nature_jpn : m_box_nature);
+
+    ImageRGB32 nature_ready = preprocess_for_ocr(nature_raw);
+
+    OCR::StringMatchResult nature_result = reader.read_substring(
+        logger, language, nature_ready, DARK_TEXT_FILTERS()
+    );
+
+    if (!nature_result.results.empty()){
+        stats.nature = nature_result.results.begin()->second.token;
+        return true;
+    }
+    logger.log("Unable to detect Nature.", COLOR_RED);
+    if (save_debug_images){
+        nature_raw.save("DebugDumps/ocr_nature_failed_raw.png");
+        nature_ready.save("DebugDumps/ocr_nature_failed_ready.png");
+    }
+    return false;
+}
+
+void StatsReader::read_page1(
+    Logger& logger, Language language,
+    const ImageViewRGB32& frame,
+    PokemonFRLG_Stats& stats,
+    const std::set<std::string>& subset
+){
+    const bool save_debug_images = GlobalSettings::instance().SAVE_DEBUG_IMAGES;
+    ImageViewRGB32 game_screen =
+            extract_box_reference(frame, GameSettings::instance().GAME_BOX);
+
+    bool success = read_name(logger, language, game_screen, stats, subset, save_debug_images);
+    success = read_level(logger, language, game_screen, stats, subset, save_debug_images) && success;
+    success = read_nature(logger, language, game_screen, stats, subset, save_debug_images) && success;
+
+    read_gender(logger, language, game_screen, stats, subset);
+
+    if (!success && save_debug_images){
+        frame.save("DebugDumps/ocr_page1_failed_frame.png");
+    }
+}
+
+void StatsReader::read_page2(
+    Logger& logger, Language language,
+    const ImageViewRGB32& frame, PokemonFRLG_Stats& stats
+){
+    const bool jpn = language == Language::Japanese;
+
+    ImageViewRGB32 game_screen =
+            extract_box_reference(frame, GameSettings::instance().GAME_BOX);
+
+    auto read_stat = [&](const ImageFloatBox& box, const std::string& name, bool& failed){
+        ImageViewRGB32 stat_region = extract_box_reference(game_screen, box);
+
+        // waterfill segmentation + template matching against the PokemonFRLG/Digits/0-9.png templates.
+        int stat = read_digits_waterfill_template(logger, stat_region, DigitTemplateType::StatBox);
+        // log impossible values or failed reads
+        if (name != "hp" && (stat < 1 || stat > 614)){ // 614 comes from a max Def Shuckle
+            logger.log("OCR result for " + name + " out of range: " + std::to_string(stat), COLOR_RED);
+            if (GlobalSettings::instance().SAVE_DEBUG_IMAGES){
+                stat_region.save("DebugDumps/ocr_" + name + "_failed_raw.png");
+            }
+            failed = true;
+        }
+        return stat;
+
+
+        // // PaddleOCR path (original): preprocess then per-digit waterfill OCR.
+        // // Dark text [0..190] -> black. Threshold at 190 captures the
+        // // blurred gap pixels between segments, making bridges thicker.
+        // // Not higher than 190 to avoid capturing yellow bg edge noise.
+        // ImageRGB32 ocr_ready = preprocess_for_ocr(
+        //     stat_region, name, 7, 2, true,
+        //     combine_rgb(0, 0, 0), combine_rgb(190, 190, 190)
+        // );
+
+        // // Waterfill isolates each digit -> per-char SINGLE_CHAR OCR.
+        // int stat = OCR::read_number_waterfill(
+        //     logger, ocr_ready, 0xff000000,
+        //     0xff808080
+        // );
+        // // log impossible values or failed reads
+        // if (name != "hp" && (stat < 1 || stat > 614)){ // 614 comes from a max Def Shuckle
+        //     logger.log("OCR result for " + name + " out of range: " + std::to_string(stat), COLOR_RED);
+        //     if (GlobalSettings::instance().SAVE_DEBUG_IMAGES){
+        //         stat_region.save("DebugDumps/ocr_" + name + "_failed_raw.png");
+        //         ocr_ready.save("DebugDumps/ocr_" + name + "_failed_ready.png");
+        //     }
+        //     failed = true;
+        // }
+        // return stat;
+    };
+
+    auto read_hp = [&](const ImageFloatBox& box, bool& failed){
+        // this captures the current HP, "/", and total HP
+        int res = read_stat(box, "hp", failed);
+
+        // check for wrong numbers of digits to remove the "/"
+        // since hp will always be a 2 or 3 digit number.
+        // Be warned: "/" is usually ignored entirely, but is sometimes detected as 2.
+        // Current HP can be anything between 0 and the total
+        std::string res_str = std::to_string(res);
+
+        // >5 digits unambiguously indicates the total HP should be 3 read digits
+        // For non-fainted Pokemon (a leading 0 would throw things off), 3 read digits unambiguously indicates the total HP should be 2 digits
+        // 4-5 read digits is ambiguous:
+        //      case 1: a 3-digit total where the "/" is included and current HP is one digit       (5 digits read)
+        //      case 2: a 2-digit total where the "/" is included and the current HP is two digits  (5 digits read)
+        //      case 3: a 3-digit total where the "/" is dropped and the current HP is one digit    (4 digits read)
+        //      case 4: a 2-digit total where the "/" is dropped and the current HP is two digits   (4 digits read)
+        // This will assume a 2-digit HP total in case of ambiguity, consistent with a Pokemon at full HP
+        if (res_str.size() > 5){ 
+            res = std::stoi(res_str.substr(res_str.size() - 3));
+        }else if (res_str.size() > 2){ 
+            res = std::stoi(res_str.substr(res_str.size() - 2));
+        }
+        // log impossible values or failed reads
+        if (res < 1 || res > 714){ // 714 comes from a max HP Blissey
+            logger.log("OCR result for HP out of range: " + std::to_string(res), COLOR_RED);
+            if (GlobalSettings::instance().SAVE_DEBUG_IMAGES){
+                ImageViewRGB32 stat_region = extract_box_reference(game_screen, box);
+                stat_region.save("DebugDumps/ocr_hp_failed_raw.png");
+            }
+            failed = true;
+        }
+        return res;
+    };
+
+    auto assign_stat = [](std::optional<unsigned>& field, int value){
+        if (value != -1){
+            field = static_cast<unsigned>(value);
+        }
+    };
+
+    bool failed = false;
+    assign_stat(stats.hp, read_hp(jpn ? m_box_hp_jpn : m_box_hp, failed));
+    assign_stat(stats.attack, read_stat(jpn ? m_box_attack_jpn : m_box_attack, "attack", failed));
+    assign_stat(stats.defense, read_stat(jpn ? m_box_defense_jpn : m_box_defense, "defense", failed));
+    assign_stat(stats.sp_attack, read_stat(jpn ? m_box_sp_attack_jpn : m_box_sp_attack, "spatk", failed));
+    assign_stat(stats.sp_defense, read_stat(jpn ? m_box_sp_defense_jpn : m_box_sp_defense, "spdef", failed));
+    assign_stat(stats.speed, read_stat(jpn ? m_box_speed_jpn : m_box_speed, "speed", failed));
+
+    if (failed && GlobalSettings::instance().SAVE_DEBUG_IMAGES){
+        frame.save("DebugDumps/ocr_page2_failed_frame.png");
+    }
+}
+
+
+namespace{
+
+std::string number_slug(const std::optional<unsigned>& value){
+    return value.has_value() ? std::to_string(*value) : "none";
+}
+std::string text_slug(const std::string& value){
+    return value.empty() ? "none" : value;
+}
+std::string gender_slug(const std::optional<SummaryGender>& gender){
+    if (!gender.has_value()){
+        return "none";
+    }
+    switch (*gender){
+    case SummaryGender::Male:
+        return "male";
+    case SummaryGender::Female:
+        return "female";
+    case SummaryGender::Genderless:
+        return "genderless";
+    }
+    return "none";
+}
+
+UnitTestResult language_from_filename(const std::string& image_path, Language& language){
+    const std::vector<std::string> words = parse_words(Filesystem::Path(image_path).stem().string());
+    if (words.empty()){
+        return "Error: filename must end with a language code.";
+    }
+    language = language_code_to_enum(words.back());
+    if (language == Language::None || language == Language::EndOfList){
+        return "Error: invalid language word in filename: " + words.back();
+    }
+    return true;
+}
+
+}
+
+
+class Test_StatsReaderPage1 : public ImageUnitTest{
+public:
+    Test_StatsReaderPage1(const std::string& image)
+        : ImageUnitTest("PokemonFRLG::StatsReader - page1 - " + image, {image})
+    {
+        //  Plus the PaddleOCR (ONNX) recognition session and its working set.
+        m_memory += PADDLE_OCR_SINGLE_LINE_MEMORY_ESTIMATE;
+    }
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        Language language = Language::None;
+        UnitTestResult parsed = language_from_filename(image_paths()[0], language);
+        if (parsed.result != UnitTestResult::PASSED){
+            return parsed;
+        }
+
+        const ImageRGB32& image = images[0];
+        StatsReader reader;
+        PokemonFRLG_Stats stats;
+        reader.read_page1(logger, language, image, stats);
+
+        return check_against_golden_file(
+            UNIT_TEST_RESOURCE_PATH() + image_paths()[0],
+            {"name", "level", "gender", "nature"},
+            {
+                text_slug(stats.name),
+                number_slug(stats.level),
+                gender_slug(stats.gender),
+                text_slug(stats.nature),
+            }
+        );
+    };
+};
+
+
+class Test_StatsReaderPage2 : public ImageUnitTest{
+public:
+    Test_StatsReaderPage2(const std::string& image)
+        : ImageUnitTest("PokemonFRLG::StatsReader - page2 - " + image, {image})
+    {
+        //  Plus the PaddleOCR (ONNX) recognition session and its working set.
+        m_memory += PADDLE_OCR_SINGLE_LINE_MEMORY_ESTIMATE;
+    }
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        Language language = Language::None;
+        UnitTestResult parsed = language_from_filename(image_paths()[0], language);
+        if (parsed.result != UnitTestResult::PASSED){
+            return parsed;
+        }
+
+        const ImageRGB32& image = images[0];
+        StatsReader reader;
+        PokemonFRLG_Stats stats;
+        reader.read_page2(logger, language, image, stats);
+
+        return check_against_golden_file(
+            UNIT_TEST_RESOURCE_PATH() + image_paths()[0],
+            {"hp", "attack", "defense", "spatk", "spdef", "speed"},
+            {
+                number_slug(stats.hp),
+                number_slug(stats.attack),
+                number_slug(stats.defense),
+                number_slug(stats.sp_attack),
+                number_slug(stats.sp_defense),
+                number_slug(stats.speed),
+            }
+        );
+    };
+};
+
+
+void add_tests_StatsReader(UnitTestDatabase& database){
+    database.add<Test_StatsReaderPage1>("PokemonFRLG/StatsReader/Page1/bulbasaur_1_eng.png");
+    database.add<Test_StatsReaderPage1>("PokemonFRLG/StatsReader/Page1/bulbasaur_2_eng.png");
+    database.add<Test_StatsReaderPage1>("PokemonFRLG/StatsReader/Page1/bulbasaur_3_eng.png");
+    database.add<Test_StatsReaderPage1>("PokemonFRLG/StatsReader/Page1/bulbasaur_4_eng.png");
+    database.add<Test_StatsReaderPage1>("PokemonFRLG/StatsReader/Page1/bulbasaur_1_fra.png");
+    database.add<Test_StatsReaderPage1>("PokemonFRLG/StatsReader/Page1/bulbasaur_1_jpn.png");
+    database.add<Test_StatsReaderPage1>("PokemonFRLG/StatsReader/Page1/abra_1_deu.png");
+    database.add<Test_StatsReaderPage1>("PokemonFRLG/StatsReader/Page1/deoxys_1_jpn.png");
+    database.add<Test_StatsReaderPage1>("PokemonFRLG/StatsReader/Page1/horsea_1_deu.png");
+    database.add<Test_StatsReaderPage1>("PokemonFRLG/StatsReader/Page1/horsea_2_deu.png");
+    database.add<Test_StatsReaderPage1>("PokemonFRLG/StatsReader/Page1/horsea_3_deu.png");
+    database.add<Test_StatsReaderPage1>("PokemonFRLG/StatsReader/Page1/magikarp_1_spa.png");
+    database.add<Test_StatsReaderPage1>("PokemonFRLG/StatsReader/Page1/moltres_1_eng.png");
+    database.add<Test_StatsReaderPage1>("PokemonFRLG/StatsReader/Page1/nidoran_m_eng.png");
+    database.add<Test_StatsReaderPage1>("PokemonFRLG/StatsReader/Page1/pidgey_1_ita.png");
+    database.add<Test_StatsReaderPage1>("PokemonFRLG/StatsReader/Page1/venonat_4k_eng.png");
+    database.add<Test_StatsReaderPage2>("PokemonFRLG/StatsReader/Page2/abra_1_deu.png");
+    database.add<Test_StatsReaderPage2>("PokemonFRLG/StatsReader/Page2/deoxys_1_jpn.png");
+    database.add<Test_StatsReaderPage2>("PokemonFRLG/StatsReader/Page2/mewtwo_1_spa.png");
+    database.add<Test_StatsReaderPage2>("PokemonFRLG/StatsReader/Page2/nidoranf_1_eng.jpg");
+    database.add<Test_StatsReaderPage2>("PokemonFRLG/StatsReader/Page2/raikou_1_eng.png");
+    database.add<Test_StatsReaderPage2>("PokemonFRLG/StatsReader/Page2/raikou_2_eng.png");
+    database.add<Test_StatsReaderPage2>("PokemonFRLG/StatsReader/Page2/venonat_1_eng.jpg");
+    database.add<Test_StatsReaderPage2>("PokemonFRLG/StatsReader/Page2/scyther_1_eng.png");
+}
+
+
+} // namespace PokemonFRLG
+} // namespace NintendoSwitch
+} // namespace PokemonAutomation
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_StatsReader.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_StatsReader.h
new file mode 100644
index 0000000000..b260b12e22
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_StatsReader.h
@@ -0,0 +1,135 @@
+/*  Stats Reader
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonFRLG_StatsReader_H
+#define PokemonAutomation_PokemonFRLG_StatsReader_H
+
+#include <optional>
+#include <string>
+#include "Common/Cpp/Color.h"
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/Language.h"
+
+
+namespace PokemonAutomation{
+
+class Logger;
+class ImageViewRGB32;
+class VideoOverlaySet;
+
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+
+enum class SummaryGender{
+    Male,
+    Female,
+    Genderless
+};
+
+struct PokemonFRLG_Stats{
+    std::string nature;
+    std::optional<unsigned> level;
+    std::optional<SummaryGender> gender;
+    std::string name;
+    std::optional<unsigned> hp;
+    std::optional<unsigned> attack;
+    std::optional<unsigned> defense;
+    std::optional<unsigned> sp_attack;
+    std::optional<unsigned> sp_defense;
+    std::optional<unsigned> speed;
+};
+
+class StatsReader {
+public:
+    StatsReader(Color color = COLOR_RED);
+
+    void make_overlays(VideoOverlaySet &items) const;
+
+    // Reads from page 1 (Nature, Level, Name)
+    void read_page1(
+        Logger& logger, Language language,
+        const ImageViewRGB32& frame, PokemonFRLG_Stats& stats,
+        const std::set<std::string>& subset = {}
+    );
+
+    // Reads from page 2 (Stats: HP, Atk, Def, SpA, SpD, Spe)
+    void read_page2(
+        Logger& logger, Language language,
+        const ImageViewRGB32& frame, PokemonFRLG_Stats& stats
+    );
+
+private:
+    Color m_color;
+    ImageFloatBox m_box_nature;
+    ImageFloatBox m_box_level;
+    ImageFloatBox m_box_name;
+    ImageFloatBox m_box_gender;
+    ImageFloatBox m_box_hp;
+    ImageFloatBox m_box_attack;
+    ImageFloatBox m_box_defense;
+    ImageFloatBox m_box_sp_attack;
+    ImageFloatBox m_box_sp_defense;
+    ImageFloatBox m_box_speed;
+    ImageFloatBox m_box_nature_jpn;
+    ImageFloatBox m_box_level_jpn;
+    ImageFloatBox m_box_name_jpn;
+    ImageFloatBox m_box_gender_jpn;
+    ImageFloatBox m_box_hp_jpn;
+    ImageFloatBox m_box_attack_jpn;
+    ImageFloatBox m_box_defense_jpn;
+    ImageFloatBox m_box_sp_attack_jpn;
+    ImageFloatBox m_box_sp_defense_jpn;
+    ImageFloatBox m_box_speed_jpn;
+    //  Spanish labels the level "Nv." where the other Latin-script languages
+    //  use "Lv". The trailing period pushes the digits ~6px right (at 1080p),
+    //  so Spanish needs its own left edge. Right edge matches m_box_level.
+    ImageFloatBox m_box_level_spa;
+
+    // return false if the read failed
+
+    bool read_name(
+        Logger& logger, Language language,
+        const ImageViewRGB32& game_screen,
+        PokemonFRLG_Stats& stats,
+        const std::set<std::string>& subset,
+        bool save_debug_images
+    );
+
+    void read_gender( // there are no checks that indicate failure
+        Logger& logger, Language language,
+        const ImageViewRGB32& game_screen,
+        PokemonFRLG_Stats& stats,
+        const std::set<std::string>& subset
+    );
+
+    bool read_level(
+        Logger& logger, Language language,
+        const ImageViewRGB32& game_screen,
+        PokemonFRLG_Stats& stats,
+        const std::set<std::string>& subset,
+        bool save_debug_images
+    );
+
+    bool read_nature(
+        Logger& logger, Language language,
+        const ImageViewRGB32& game_screen,
+        PokemonFRLG_Stats& stats,
+        const std::set<std::string>& subset,
+        bool save_debug_images
+    );
+
+};
+
+
+void add_tests_StatsReader(UnitTestDatabase& database);
+
+} // namespace PokemonFRLG
+} // namespace NintendoSwitch
+} // namespace PokemonAutomation
+#endif
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_TrainerIdReader.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_TrainerIdReader.cpp
new file mode 100644
index 0000000000..f505088994
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_TrainerIdReader.cpp
@@ -0,0 +1,106 @@
+/*  Trainer ID Reader
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Color.h"
+#include "Common/Cpp/Filesystem/Filesystem.h"
+#include "CommonFramework/GlobalSettingsPanel.h"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonFramework/ImageTypes/ImageRGB32.h"
+#include "CommonTools/Images/ImageFilter.h"
+#include "CommonTools/OCR/OCR_NumberReader.h"
+#include "CommonTools/OCR/OCR_Routines.h"
+#include "Tests/ImageUnitTest.h"
+#include "Tests/TestUtils.h"
+#include "VideoGames/PokemonFRLG/PokemonFRLG_Settings.h"
+#include "PokemonFRLG_TrainerIdReader.h"
+#include "PokemonFRLG_DigitReader.h"
+namespace PokemonAutomation {
+namespace NintendoSwitch {
+namespace PokemonFRLG {
+
+TrainerIdReader::TrainerIdReader(Color color)
+    : m_color(color)
+    , m_box_tid(0.742683, 0.117314, 0.129734, 0.076006)
+    , m_box_tid_spa(0.766667, 0.112286, 0.129345, 0.076068)
+    , m_box_tid_jpn(0.712981, 0.118836, 0.207212, 0.077373)
+    , m_box_tid_fra(0.759829, 0.120833, 0.129915, 0.07094)
+{}
+
+void TrainerIdReader::make_overlays(VideoOverlaySet &items) const {
+    const BoxOption &GAME_BOX = GameSettings::instance().GAME_BOX;
+    items.add(m_color, GAME_BOX.inner_to_outer(m_box_tid));
+    items.add(m_color, GAME_BOX.inner_to_outer(m_box_tid_spa));
+    items.add(m_color, GAME_BOX.inner_to_outer(m_box_tid_jpn));
+    items.add(m_color, GAME_BOX.inner_to_outer(m_box_tid_fra));
+}
+
+uint16_t TrainerIdReader::read_tid(
+    Logger& logger, Language language, const ImageViewRGB32& frame
+){
+    ImageViewRGB32 game_screen =
+            extract_box_reference(frame, GameSettings::instance().GAME_BOX);
+
+    
+    ImageViewRGB32 tid_region = extract_box_reference(game_screen, language == Language::Japanese ? m_box_tid_jpn :
+                                                                   language == Language::Spanish  ? m_box_tid_spa :
+                                                                   language == Language::French   ? m_box_tid_fra :
+                                                                   m_box_tid);
+
+    // waterfill segmentation + template matching
+    // against the PokemonFRLG/Digits/0-9.png templates.
+    return uint16_t(read_digits_waterfill_template(logger, tid_region, DigitTemplateType::DialogBox));
+}
+
+
+class Test_TrainerIdReader : public ImageUnitTest{
+public:
+    Test_TrainerIdReader(const std::string& image)
+        : ImageUnitTest("PokemonFRLG::TrainerIdReader - " + image, {image})
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        const std::vector<std::string> words =
+                parse_words(Filesystem::Path(image_paths()[0]).stem().string());
+        if (words.size() < 2){
+            return "Error: filename must be <anything>_<language code>_<trainer id>.";
+        }
+
+        const std::string& language_word = words[words.size() - 2];
+        Language language = language_code_to_enum(language_word);
+        if (language == Language::None || language == Language::EndOfList){
+            return "Error: invalid language word in filename: " + language_word;
+        }
+        int target_tid = 0;
+        if (!parse_int(words.back(), target_tid)){
+            return "Error: filename must end with the trainer ID: " + words.back();
+        }
+
+        const ImageRGB32& image = images[0];
+        TrainerIdReader reader;
+        int tid = reader.read_tid(logger, language, image);
+
+        TEST_RESULT_COMPONENT_EQUAL_STR(tid, target_tid, "trainer id");
+        return true;
+    };
+};
+
+
+void add_tests_TrainerIdReader(UnitTestDatabase& database){
+    database.add<Test_TrainerIdReader>("PokemonFRLG/TrainerIdReader/tom_eng_60895.jpg");
+    database.add<Test_TrainerIdReader>("PokemonFRLG/TrainerIdReader/nyash_jpn_45345.png");
+    database.add<Test_TrainerIdReader>("PokemonFRLG/TrainerIdReader/alberto_spa_65385.png");
+    database.add<Test_TrainerIdReader>("PokemonFRLG/TrainerIdReader/antoine_fra_57574.png");
+}
+
+
+} // namespace PokemonFRLG
+} // namespace NintendoSwitch
+} // namespace PokemonAutomation
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_TrainerIdReader.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_TrainerIdReader.h
new file mode 100644
index 0000000000..c763913704
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_TrainerIdReader.h
@@ -0,0 +1,53 @@
+/*  Trainer ID Reader
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonFRLG_TrainerIdReader_H
+#define PokemonAutomation_PokemonFRLG_TrainerIdReader_H
+
+#include <optional>
+#include <string>
+#include "Common/Cpp/Color.h"
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/Language.h"
+
+
+namespace PokemonAutomation{
+
+class Logger;
+class ImageViewRGB32;
+class VideoOverlaySet;
+
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+class TrainerIdReader {
+public:
+    TrainerIdReader(Color color = COLOR_RED);
+
+    void make_overlays(VideoOverlaySet &items) const;
+
+    // Reads the Trainer ID on the Trainer Card
+    uint16_t read_tid(
+        Logger& logger, Language language, const ImageViewRGB32& frame
+    );
+
+private:
+    Color m_color;
+    ImageFloatBox m_box_tid;
+    ImageFloatBox m_box_tid_spa;
+    ImageFloatBox m_box_tid_jpn;
+    ImageFloatBox m_box_tid_fra;
+};
+
+
+void add_tests_TrainerIdReader(UnitTestDatabase& database);
+
+} // namespace PokemonFRLG
+} // namespace NintendoSwitch
+} // namespace PokemonAutomation
+#endif
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_WildEncounterReader.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_WildEncounterReader.cpp
new file mode 100644
index 0000000000..1a2b0aa87f
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_WildEncounterReader.cpp
@@ -0,0 +1,140 @@
+/*  Wild Encounter Reader
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <opencv2/imgproc.hpp>
+#include "Common/Cpp/Color.h"
+#include "Common/Cpp/Filesystem/Filesystem.h"
+#include "CommonFramework/GlobalSettingsPanel.h"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonFramework/ImageTypes/ImageRGB32.h"
+#include "CommonTools/Images/ImageFilter.h"
+#include "CommonTools/OCR/OCR_NumberReader.h"
+#include "Tests/ImageUnitTest.h"
+#include "Tests/TestUtils.h"
+#include "Pokemon/Inference/Pokemon_NameReader.h"
+#include "VideoGames/PokemonFRLG/PokemonFRLG_Settings.h"
+#include "PokemonFRLG_WildEncounterReader.h"
+#include "PokemonFRLG_OcrPreprocessing.h"
+#include "PokemonFRLG_DigitReader.h"
+namespace PokemonAutomation {
+namespace NintendoSwitch {
+namespace PokemonFRLG {
+
+
+WildEncounterReader::WildEncounterReader(Color color)
+    : m_box_name(0.075, 0.120, 0.260, 0.063) 
+    , m_box_name_jpn(0.075, 0.120, 0.232, 0.063)
+    // , m_box_level(0.325, 0.120, 0.092, 0.063)
+    {}
+
+void WildEncounterReader::make_overlays(VideoOverlaySet& items) const {
+    const BoxOption& GAME_BOX = GameSettings::instance().GAME_BOX;
+    items.add(m_color, GAME_BOX.inner_to_outer(m_box_name));
+    items.add(m_color, GAME_BOX.inner_to_outer(m_box_name_jpn));
+    // items.add(m_color, GAME_BOX.inner_to_outer(m_box_level));
+}
+
+PokemonFRLG_WildEncounter WildEncounterReader::read_encounter(
+    Logger& logger, Language language,
+    const ImageViewRGB32& frame, 
+    const std::set<std::string>& subset,
+    double max_log10p
+){
+    const bool jpn = language == Language::Japanese;
+
+    PokemonFRLG_WildEncounter encounter; 
+    ImageViewRGB32 game_screen =
+            extract_box_reference(frame, GameSettings::instance().GAME_BOX);
+
+    ImageViewRGB32 name_box = extract_box_reference(game_screen, jpn ? m_box_name_jpn : m_box_name);
+
+    //  Dark text on the light battle HP bar. Blur to close the gaps in the GBA
+    //  font, then let the matcher try each threshold in turn.
+    ImageRGB32 name_ready = preprocess_for_ocr(name_box);
+
+    OCR::StringMatchResult name_result;
+    if (subset.size() == 0){
+        name_result = Pokemon::PokemonNameReader::instance().read_substring(
+            logger, language, name_ready,
+            DARK_TEXT_FILTERS(),
+            0.01, 0.50, max_log10p);
+    }else{
+        name_result = Pokemon::PokemonNameReader(subset).read_substring(
+            logger, language, name_ready,
+            DARK_TEXT_FILTERS(),
+            0.01, 0.50, max_log10p);
+    }
+   
+    if (!name_result.results.empty()){
+        encounter.name = name_result.results.begin()->second.token;
+    }else{
+    logger.log("Failed to read species name.", COLOR_RED);
+        if (GlobalSettings::instance().SAVE_DEBUG_IMAGES){
+            name_box.save("DebugDumps/ocr_encounter_box.png");
+            name_ready.save("DebugDumps/ocr_encounter_ready.png");
+            game_screen.save("DebugDumps/ocr_encounter_frame.png");
+        }
+    }
+    return encounter;
+}
+
+
+class Test_WildEncounterReader : public ImageUnitTest{
+public:
+    Test_WildEncounterReader(const std::string& image)
+        : ImageUnitTest("PokemonFRLG::WildEncounterReader - " + image, {image})
+    {
+        //  Plus the PaddleOCR (ONNX) recognition session and its working set.
+        m_memory += PADDLE_OCR_SINGLE_LINE_MEMORY_ESTIMATE;
+    }
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        const std::vector<std::string> words =
+                parse_words(Filesystem::Path(image_paths()[0]).stem().string());
+        if (words.size() < 2){
+            return "Error: filename must be <anything>_<language>_<species>.";
+        }
+
+        std::string language_word = words[words.size() - 2];
+        const std::string& target_species = words[words.size() - 1];
+
+        Language language = language_code_to_enum(language_word);
+        if (language == Language::None || language == Language::EndOfList){
+            return "Error: invalid language word in filename: " + language_word;
+        }
+
+        const ImageRGB32& image = images[0];
+        WildEncounterReader reader;
+        PokemonFRLG_WildEncounter encounter =
+                reader.read_encounter(logger, language, image, {});
+
+        TEST_RESULT_COMPONENT_EQUAL_STR(encounter.name, target_species, "species");
+        return true;
+    };
+};
+
+
+void add_tests_WildEncounterReader(UnitTestDatabase& database){
+    database.add<Test_WildEncounterReader>("PokemonFRLG/WildEncounterReader/eng_chansey.jpg");
+    database.add<Test_WildEncounterReader>("PokemonFRLG/WildEncounterReader/eng_machop.jpg");
+    database.add<Test_WildEncounterReader>("PokemonFRLG/WildEncounterReader/eng_kakuna.jpg");
+    database.add<Test_WildEncounterReader>("PokemonFRLG/WildEncounterReader/eng_ho-oh.jpg");
+    database.add<Test_WildEncounterReader>("PokemonFRLG/WildEncounterReader/eng_heracross.jpg");
+    database.add<Test_WildEncounterReader>("PokemonFRLG/WildEncounterReader/eng_dragonair.jpg");
+    database.add<Test_WildEncounterReader>("PokemonFRLG/WildEncounterReader/eng_articuno.jpg");
+    database.add<Test_WildEncounterReader>("PokemonFRLG/WildEncounterReader/fra_snorlax.jpg");
+    database.add<Test_WildEncounterReader>("PokemonFRLG/WildEncounterReader/dark_eng_chansey.png");
+}
+
+
+} // namespace PokemonFRLG
+} // namespace NintendoSwitch
+} // namespace PokemonAutomation
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_WildEncounterReader.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_WildEncounterReader.h
new file mode 100644
index 0000000000..a660a5de8a
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_WildEncounterReader.h
@@ -0,0 +1,64 @@
+/*  Wild Encounter Reader
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonFRLG_WildEncounterReader_H
+#define PokemonAutomation_PokemonFRLG_WildEncounterReader_H
+
+#include <optional>
+#include <string>
+#include "Common/Cpp/Color.h"
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/Language.h"
+
+
+namespace PokemonAutomation{
+
+class Logger;
+class ImageViewRGB32;
+class VideoOverlaySet;
+
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+struct PokemonFRLG_WildEncounter{
+    std::string name;
+    std::optional<unsigned> level;
+    // gender
+};
+
+class WildEncounterReader {
+public:
+    static constexpr double MAX_LOG10P = -1.40;
+
+    WildEncounterReader(Color color = COLOR_RED);
+
+    void make_overlays(VideoOverlaySet& items) const;
+
+    // Reads species from the top left of the battle screen
+    // by matching to the provided subset of species 
+    PokemonFRLG_WildEncounter read_encounter(
+        Logger& logger, Language language,
+        const ImageViewRGB32& frame, 
+        const std::set<std::string>& subset,
+        double max_log10p = MAX_LOG10P
+    );
+
+private:
+    Color m_color;
+    ImageFloatBox m_box_name;
+    ImageFloatBox m_box_name_jpn;
+    // ImageFloatBox m_box_level;
+};
+
+
+void add_tests_WildEncounterReader(UnitTestDatabase& database);
+
+} // namespace PokemonFRLG
+} // namespace NintendoSwitch
+} // namespace PokemonAutomation
+#endif
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Sounds/PokemonFRLG_CatchFanfareDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Sounds/PokemonFRLG_CatchFanfareDetector.cpp
new file mode 100644
index 0000000000..65a925c75a
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Sounds/PokemonFRLG_CatchFanfareDetector.cpp
@@ -0,0 +1,44 @@
+/*  Catch Fanfare Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonTools/Audio/AudioTemplateCache.h"
+#include "CommonTools/Audio/SpectrogramMatcher.h"
+#include "VideoGames/PokemonFRLG/PokemonFRLG_Settings.h"
+#include "PokemonFRLG_CatchFanfareDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+
+CatchFanfareDetector::CatchFanfareDetector(Logger& logger, DetectedCallback detected_callback)
+    : AudioPerSpectrumDetectorBase(
+        logger,
+        "CatchFanfareDetector",
+        "Catch fanfare",
+        COLOR_BLUE,
+        detected_callback
+    )
+{}
+
+
+float CatchFanfareDetector::get_score_threshold() const{
+    return (float)GameSettings::instance().CATCH_FANFARE_THRESHOLD;
+}
+
+std::unique_ptr<SpectrogramMatcher> CatchFanfareDetector::build_spectrogram_matcher(size_t sample_rate){
+    return std::make_unique<SpectrogramMatcher>(
+        "Catch fanfare",
+        AudioTemplateCache::instance().get_throw("PokemonFRLG/CatchFanfare", sample_rate),
+        SpectrogramMatcher::Mode::SPIKE_CONV, sample_rate, 50
+    );
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Sounds/PokemonFRLG_CatchFanfareDetector.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Sounds/PokemonFRLG_CatchFanfareDetector.h
new file mode 100644
index 0000000000..9f7d9cc283
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Sounds/PokemonFRLG_CatchFanfareDetector.h
@@ -0,0 +1,36 @@
+/*  Catch Fanfare Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonFRLG_CatchFanfareDetector_H
+#define PokemonAutomation_PokemonFRLG_CatchFanfareDetector_H
+
+#include "CommonTools/Audio/AudioPerSpectrumDetectorBase.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+
+class CatchFanfareDetector : public AudioPerSpectrumDetectorBase{
+public:
+    //  Warning: The callback will be called from the audio inference thread.
+    CatchFanfareDetector(Logger& logger, DetectedCallback detected_callback);
+
+    // Implement AudioPerSpectrumDetectorBase::get_score_threshold()
+    virtual float get_score_threshold() const override;
+
+protected:
+    // Implement AudioPerSpectrumDetectorBase::build_spectrogram_matcher()
+    virtual std::unique_ptr<SpectrogramMatcher> build_spectrogram_matcher(size_t sample_rate) override;
+};
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Sounds/PokemonFRLG_ShinySoundDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Sounds/PokemonFRLG_ShinySoundDetector.cpp
new file mode 100644
index 0000000000..35acc2b9e4
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Sounds/PokemonFRLG_ShinySoundDetector.cpp
@@ -0,0 +1,46 @@
+/*  Shiny Sound Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonTools/Audio/AudioTemplateCache.h"
+#include "CommonTools/Audio/SpectrogramMatcher.h"
+#include "VideoGames/PokemonFRLG/PokemonFRLG_Settings.h"
+#include "PokemonFRLG_ShinySoundDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+
+ShinySoundDetector::ShinySoundDetector(Logger& logger, DetectedCallback detected_callback)
+    // Use a yellow as the detection color because the shiny animation is yellow.
+    : AudioPerSpectrumDetectorBase(
+        logger,
+        "ShinySoundDetector",
+        "Shiny sound",
+        COLOR_YELLOW,
+        detected_callback
+    )
+{}
+
+
+float ShinySoundDetector::get_score_threshold() const{
+    return (float)GameSettings::instance().SHINY_SOUND_THRESHOLD;
+}
+
+std::unique_ptr<SpectrogramMatcher> ShinySoundDetector::build_spectrogram_matcher(size_t sample_rate){
+    return std::make_unique<SpectrogramMatcher>(
+        "Shiny Sound",
+        AudioTemplateCache::instance().get_throw("PokemonFRLG/ShinySound", sample_rate),
+        SpectrogramMatcher::Mode::SPIKE_CONV, sample_rate,
+        GameSettings::instance().SHINY_SOUND_LOW_FREQUENCY
+    );
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Sounds/PokemonFRLG_ShinySoundDetector.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Sounds/PokemonFRLG_ShinySoundDetector.h
new file mode 100644
index 0000000000..4547c37081
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Sounds/PokemonFRLG_ShinySoundDetector.h
@@ -0,0 +1,36 @@
+/*  Shiny Sound Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonFRLG_ShinySoundDetector_H
+#define PokemonAutomation_PokemonFRLG_ShinySoundDetector_H
+
+#include "CommonTools/Audio/AudioPerSpectrumDetectorBase.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+
+class ShinySoundDetector : public AudioPerSpectrumDetectorBase{
+public:
+    //  Warning: The callback will be called from the audio inference thread.
+    ShinySoundDetector(Logger& logger, DetectedCallback detected_callback);
+
+    // Implement AudioPerSpectrumDetectorBase::get_score_threshold()
+    virtual float get_score_threshold() const override;
+
+protected:
+    // Implement AudioPerSpectrumDetectorBase::build_spectrogram_matcher()
+    virtual std::unique_ptr<SpectrogramMatcher> build_spectrogram_matcher(size_t sample_rate) override;
+};
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/PokemonFRLG_Navigation.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/PokemonFRLG_Navigation.cpp
new file mode 100644
index 0000000000..970080ca26
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/PokemonFRLG_Navigation.cpp
@@ -0,0 +1,1656 @@
+/*  Pokemon FRLG Navigation
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  Soft reset, menus, etc.
+ *
+ */
+
+#include <array>
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonTools/Random.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "CommonTools/StartupChecks/StartProgramChecks.h"
+#include "CommonTools/StartupChecks/VideoResolutionCheck.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+#include "NintendoSwitch/NintendoSwitch_ConsoleHandle.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonFRLG/PokemonFRLG_Settings.h"
+#include "VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_DialogDetector.h"
+#include "VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_BattleDialogs.h"
+#include "VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_PartyDialogs.h"
+#include "VideoGames/PokemonFRLG/Inference/Sounds/PokemonFRLG_CatchFanfareDetector.h"
+#include "VideoGames/PokemonFRLG/Inference/Sounds/PokemonFRLG_ShinySoundDetector.h"
+#include "VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_BagDetector.h"
+#include "VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_StartMenuDetector.h"
+#include "VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_LoadMenuDetector.h"
+#include "VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_SummaryDetector.h"
+#include "VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_PartyEmptySlotDetector.h"
+#include "VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_PartyMenuDetector.h"
+#include "VideoGames/PokemonFRLG/Inference/Map/PokemonFRLG_MapDetector.h"
+#include "VideoGames/PokemonFRLG/Inference/PokemonFRLG_BattlePokemonDetector.h"
+#include "VideoGames/PokemonFRLG/Inference/PokemonFRLG_PokedexRegisteredDetector.h"
+#include "VideoGames/PokemonFRLG/Programs/PokemonFRLG_BattleMenuNavigation.h"
+#include "VideoGames/PokemonFRLG/Programs/PokemonFRLG_SafariOptimalAction.h"
+#include "VideoGames/PokemonFRLG/Programs/PokemonFRLG_StartMenuNavigation.h"
+#include "PokemonFRLG_Navigation.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+
+void home_black_border_check(ConsoleHandle& console, ProControllerContext& context){
+    if (GameSettings::instance().DEVICE == GameSettings::Device::switch_1_2){
+        console.log("Switch 1 or 2 selected in Settings.");
+
+        console.log("Checking for min 720p and 16:9.");
+        assert_16_9_720p_min(console, console);
+
+        console.log("Going to home to check for black border.");
+
+        //  Connect the controller.
+        require_player(console, context, BUTTON_ZL);
+
+        pbf_press_button(context, BUTTON_HOME, 120ms, 880ms);
+        try{
+            ensure_at_home(console, context, 2);
+        }catch (OperationFailedException&){
+            ControllerPlayerNumber current = context->get_player_number(context);
+            if (current == ControllerPlayerNumber::UNKNOWN){
+                throw UserSetupError(
+                    console,
+                    "Unable to find Home menu.\n\n"
+                    "Either your controller isn't connected or your screen size to not "
+                    "set to 100% in the TV Settings on your Nintendo Switch.\n\n"
+                    "If your Switch entered the Home screen and re-entered the game, then your "
+                    "controller is connected but your screen size is not set to 100%.\n\n"
+                    "If nothing happened at all, then your controller is not connected. "
+                    "Please disconnect all other controllers and try again.\n\n"
+                    "We recommend changing the controller to \"NS1: Wired Pro Controller\" "
+                    "as that will be able self-diagnose controller connection issues."
+                );
+            }else{
+                throw UserSetupError(
+                    console,
+                    "Unable to find Home menu.\n\n"
+                    "It is likely your screen size to not set to 100% in the TV Settings on your Nintendo Switch."
+                );
+            }
+        }
+
+//        context.wait_for_all_requests();
+        StartProgramChecks::check_border(console);
+        console.log("Returning to game.");
+        resume_game_from_home(console, context);
+        context.wait_for_all_requests();
+        console.log("Entered game.");
+    }else{
+        console.log("Non-Switch device selected in Settings.");
+        console.log("Skipping black border check.", COLOR_BLUE);
+    }
+}
+
+
+
+
+bool try_soft_reset(ConsoleHandle& console, ProControllerContext& context){
+    // A + B + Select + Start
+    pbf_press_button(context, BUTTON_B | BUTTON_A | BUTTON_MINUS | BUTTON_PLUS, 360ms, 1440ms);
+
+    pbf_mash_button(context, BUTTON_MINUS, GameSettings::instance().SELECT_BUTTON_MASH0);
+    context.wait_for_all_requests();
+
+    //Random wait before pressing start/A
+    console.log("Randomly waiting...");
+    Milliseconds rng_wait = std::chrono::milliseconds(random_u32(0, 5000));
+    pbf_wait(context, rng_wait);
+    context.wait_for_all_requests();
+
+    //Mash A until white screen to game load menu
+    WhiteScreenOverWatcher whitescreen(COLOR_RED);
+    LoadMenuWatcher load_menu(COLOR_BLUE);
+
+    int ls = run_until<ProControllerContext>(
+        console, context,
+        [](ProControllerContext& context){
+            pbf_mash_button(context, BUTTON_A, 1000ms);
+            pbf_wait(context, 5000ms);
+            context.wait_for_all_requests();
+        },
+        { whitescreen, load_menu }
+    );
+    context.wait_for_all_requests();
+    if (ls == 0){
+        console.log("Entered load menu. (WhiteScreenOver)");
+    }else if (ls == 1){
+        console.log("Entered load menu. (LoadMenu)");
+    }else{
+        console.log("soft_reset(): Unable to enter load menu.", COLOR_RED);
+        return false;
+    }
+    //Let the animation finish
+    pbf_wait(context, 500ms);
+    context.wait_for_all_requests();
+
+    //Load game
+    pbf_press_button(context, BUTTON_A, 160ms, 320ms);
+
+    //Wait for game to load in
+    BlackScreenOverWatcher detector(COLOR_RED);
+    int ret = wait_until(
+        console, context,
+        GameSettings::instance().ENTER_GAME_WAIT0,
+        {detector}
+    );
+    if (ret == 0){
+        console.log("Entered game!");
+    }else{
+        console.log("soft_reset(): Timed out waiting to enter game.", COLOR_RED);
+        return false;
+    }
+
+    //Mash past "previously on..."
+    pbf_mash_button(context, BUTTON_B, GameSettings::instance().ENTER_GAME_MASH0);
+    context.wait_for_all_requests();
+
+    //Random wait no.2
+    console.log("Randomly waiting...");
+    Milliseconds rng_wait2 = std::chrono::milliseconds(random_u32(0, 5000));
+    pbf_wait(context, rng_wait2);
+    context.wait_for_all_requests();
+
+    return true;
+}
+
+uint64_t soft_reset(ConsoleHandle& console, ProControllerContext& context){
+    uint64_t errors = 0;
+    for (; errors < 5; errors++){
+        if (try_soft_reset(console, context)){
+            console.log("Soft reset completed.");
+            return errors;
+        }
+    }
+    OperationFailedExceptionWithScreenshot::fire(
+        ErrorReportMode::SEND_ERROR_REPORT,
+        "soft_reset(): Failed to reset after 5 attempts.",
+        console
+    );
+}
+
+bool try_open_slot_six(ConsoleHandle& console, ProControllerContext& context){
+    //  Attempt to exit any dialog and open the start menu
+    StartMenuWatcher start_menu(COLOR_RED);
+
+    int ret = run_until<ProControllerContext>(
+        console, context,
+        [](ProControllerContext& context){
+            for (int i = 0; i < 10; i++){
+                pbf_press_button(context, BUTTON_B, 320ms, 640ms);
+                pbf_wait(context, 100ms);
+                context.wait_for_all_requests();
+                pbf_press_button(context, BUTTON_PLUS, 320ms, 640ms);
+                pbf_wait(context, 100ms);
+                context.wait_for_all_requests();
+            }
+        },
+        { start_menu }
+    );
+    context.wait_for_all_requests();
+    if (ret < 0){
+        console.log("open_slot_six(): Unable to open Start menu.", COLOR_RED);
+        return false;
+    }
+
+    if (!move_cursor_to_position(console, context, SelectionArrowPositionStartMenu::POKEMON)){
+        console.log("open_slot_six(): Unable to move menu cursor to: " + Pokemon::STRING_POKEMON, COLOR_RED);
+        return false;
+    }
+
+    console.log("Navigating to party menu.");
+    PartyMenuWatcher blk1(COLOR_RED);
+
+    int pm = run_until<ProControllerContext>(
+        console, context,
+        [](ProControllerContext& context){
+            pbf_press_button(context, BUTTON_A, 320ms, 5640ms);
+            context.wait_for_all_requests();
+        },
+        { blk1 }
+    );
+    if (pm == 0){
+        console.log("Entered party menu.");
+    }else{
+        console.log("open_slot_six(): Unable to enter Party menu.", COLOR_RED);
+        return false;
+    }
+    context.wait_for_all_requests();
+
+    //Press up twice to get to the last slot
+    PartySlotWatcher last_slot(COLOR_RED, PartySlot::SIX);
+    int ps = run_until<ProControllerContext>(
+        console, context,
+        [](ProControllerContext& context){
+            for (int i = 0; i < 15; i++){ //Enough to cycle through 6pty+cxl twice
+                pbf_wait(context, 320ms);
+                context.wait_for_all_requests();
+                pbf_press_dpad(context, DPAD_UP, 320ms, 320ms);
+            }
+        },
+        { last_slot }
+        );
+    context.wait_for_all_requests();
+    if (ps == 0){
+        console.log("Moved selection to slot six.");
+    }else{
+        console.log("open_slot_six(): Unable to move selection to slot six.", COLOR_RED);
+        return false;
+    }
+
+    //Two presses to open summary
+    BlackScreenOverWatcher blk2(COLOR_RED);
+    int sm = run_until<ProControllerContext>(
+        console, context,
+        [](ProControllerContext& context){
+            pbf_press_button(context, BUTTON_A, 320ms, 640ms);
+            pbf_press_button(context, BUTTON_A, 320ms, 640ms);
+            pbf_wait(context, 5000ms);
+            context.wait_for_all_requests();
+        },
+        { blk2 }
+    );
+    if (sm == 0){
+        console.log("Entered summary.");
+    }else{
+        console.log("open_slot_six(): Unable to enter summary.", COLOR_RED);
+        return false;
+    }
+
+    //Double check that we are on summary
+    SummaryWatcher sum1(COLOR_RED);
+    int sm1 = wait_until(
+        console, context,
+        std::chrono::seconds(5),
+        {{ sum1 }}
+    );
+    if (sm1 == 0){
+        console.log("Summary page dots detected.");
+    }else{
+        console.log("open_slot_six(): Unable to detect summary screen.", COLOR_RED);
+        return false;
+    }
+
+    pbf_wait(context, 1000ms);
+    context.wait_for_all_requests();
+    return true;
+}
+
+uint64_t open_slot_six(ConsoleHandle& console, ProControllerContext& context){
+    uint64_t errors = 0;
+    for (; errors < 5; errors++){
+        if (try_open_slot_six(console, context)){
+            return errors;
+        }else{
+            console.log("Mashing B to return to overworld and retry...");
+            pbf_mash_button(context, BUTTON_B, 10000ms);
+        }
+    }
+    OperationFailedExceptionWithScreenshot::fire(
+        ErrorReportMode::SEND_ERROR_REPORT,
+        "open_slot_six(): Failed to open party summary after 5 attempts.",
+        console
+    );
+}
+
+bool handle_encounter(ConsoleHandle& console, ProControllerContext& context, bool send_out_lead){
+    float shiny_coefficient = 1.0;
+    ShinySoundDetector shiny_detector(console.logger(), [&](float error_coefficient) -> bool{
+        shiny_coefficient = error_coefficient;
+        return true;
+    });
+    AdvanceBattleDialogWatcher battle_dialog(COLOR_YELLOW);
+    
+    int res = run_until<ProControllerContext>(
+        console, context,
+        [&](ProControllerContext& context){
+            int ret = wait_until(
+                console, context,
+                std::chrono::seconds(30), //More than enough time for shiny sound
+                {{battle_dialog}}
+            );
+            if (ret == 0){
+                console.log("Battle Advance arrow detected.");
+            }else{
+                OperationFailedExceptionWithScreenshot::fire(
+                    ErrorReportMode::SEND_ERROR_REPORT,
+                    "handle_encounter(): Did not detect battle advance arrow.",
+                    console
+                );
+            }
+            pbf_wait(context, 1000ms);
+            context.wait_for_all_requests();
+
+            /* 
+            //Send out shiny lead to test detection
+            BattleMenuWatcher battle_menu(COLOR_RED);
+            console.log("Sending out lead Pokemon.");
+            pbf_press_button(context, BUTTON_A, 320ms, 320ms);
+
+            int ret2 = wait_until(
+                console, context,
+                std::chrono::seconds(15),
+                { {battle_menu} }
+            );
+            if (ret2 == 0){
+                console.log("Battle menu detecteed!");
+            }else{
+                OperationFailedExceptionWithScreenshot::fire(
+                    ErrorReportMode::SEND_ERROR_REPORT,
+                    "handle_encounter(): Did not detect battle menu.",
+                    console
+                );
+            }
+            pbf_wait(context, 100000ms); //extreme audio delay on my cheap test device
+            context.wait_for_all_requests();
+            */
+
+        },
+        {{shiny_detector}}
+    );
+    shiny_detector.throw_if_no_sound(std::chrono::milliseconds(1000));
+    if (res == 0){
+        console.log("Shiny detected!");
+        return true;
+    }
+    console.log("No shiny detected.");
+
+    if (send_out_lead){
+        //Send out lead, no shiny detection needed. (Or wanted.)
+        BattleMenuWatcher battle_menu(COLOR_RED);
+        console.log("Sending out lead Pokemon.");
+        WallClock start = current_time();
+        
+        while (true){
+            if (current_time() - start > 60s){
+                OperationFailedExceptionWithScreenshot::fire(
+                    ErrorReportMode::SEND_ERROR_REPORT,
+                    "handle_encounter(): No battle menu detected after sixty seconds.",
+                    console
+                );
+            }
+            pbf_press_button(context, BUTTON_B, 320ms, 320ms);
+
+            int ret = wait_until(
+                console, context,
+                std::chrono::seconds(15),
+                { {battle_menu, battle_dialog} }
+            );
+
+            switch (ret){
+            case 0:
+                console.log("Battle menu detecteed!");
+                break;
+            case 1:
+                console.log("Battle Advance arrow detected. This is likely due to an ability triggering at the start of battle.");
+                pbf_press_button(context, BUTTON_B, 320ms, 320ms);
+                context.wait_for_all_requests();
+                continue;
+            default:
+                console.log("Did not detect battle menu or battle dialog.");
+                continue;
+            }
+
+            pbf_wait(context, 1000ms);
+            context.wait_for_all_requests();
+            break;
+        }
+    }
+
+    return false;
+}
+
+BattleResult spam_first_move(ConsoleHandle& console, ProControllerContext& context){
+    uint16_t errors = 0;
+    uint16_t times_moved = 0;
+    while (true){
+        if (errors > 5){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "spam_first_move(): Failed to use move 5 times.",
+                console
+            );  
+        }else if (times_moved > 50){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "spam_first_move(): More than 50 move uses detected.",
+                console
+            );  
+        }
+
+        BattleMenuWatcher battle_menu(COLOR_RED);
+        BattleFaintWatcher pokemon_fainted(COLOR_RED);
+        BattleOpponentFaintWatcher opponent_fainted(COLOR_RED);
+        BlackScreenWatcher battle_ended(COLOR_RED);
+        BattleOutOfPpWatcher out_of_pp(COLOR_RED);
+        AdvanceBattleDialogWatcher out_of_pp_dialog(COLOR_RED);
+
+        int ret = run_until<ProControllerContext>(
+            console, context,
+            [](ProControllerContext& context){
+                pbf_wait(context, 20000ms);
+                context.wait_for_all_requests();
+            },
+            { battle_menu, pokemon_fainted, opponent_fainted, battle_ended }
+        );
+
+        int ret2;
+        switch (ret){
+        case 0:
+            console.log("Using first move.");
+            context.wait_for_all_requests();
+            ret2 = run_until<ProControllerContext>(
+                console, context,
+                [](ProControllerContext& context){
+                    pbf_press_button(context, BUTTON_A, 200ms, 300ms); // leave enough time for PP color to be detected
+                    pbf_press_button(context, BUTTON_A, 200ms, 300ms);
+                    pbf_mash_button(context, BUTTON_A, 500ms);
+                    context.wait_for_all_requests();
+                },
+                { out_of_pp, out_of_pp_dialog }
+            );
+            if (ret2 < 0){
+                times_moved++;
+            }else{
+                console.log("Out of PP, fleeing battle.");
+                pbf_mash_button(context, BUTTON_B, 2000ms);
+                flee_battle(console, context);
+                context.wait_for_all_requests();
+                return BattleResult::outofpp;
+            }
+            continue;
+        case 1:
+            console.log("Player Pokemon fainted.");
+            return BattleResult::playerfainted;
+        case 2:
+            console.log("Opponent fainted.");
+            return BattleResult::opponentfainted;
+        case 3: 
+            console.log("Battle ended"); // the opponent probably fled
+            pbf_wait(context, 2000ms);
+            context.wait_for_all_requests();
+            return BattleResult::unknown;
+        default:
+            console.log("Failed to detect move use.");
+            pbf_mash_button(context, BUTTON_B, 2000ms); // get back to the top-level battle menu
+            context.wait_for_all_requests();
+            continue;
+        }
+    }
+}
+
+void flee_battle(ConsoleHandle& console, ProControllerContext& context){
+    uint16_t errors = 0;
+
+    BattleMenuWatcher battle_menu(COLOR_RED);
+    AdvanceBattleDialogWatcher ran_away(COLOR_YELLOW);
+    BlackScreenOverWatcher battle_over(COLOR_RED);
+
+    while (true)
+    {
+        if (errors > 5){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "flee_battle(): Failed to flee battle after 5 attempts.",
+                console
+            );
+        }
+
+        context.wait_for_all_requests();
+        int ret = run_until<ProControllerContext>(
+            console, context,
+            [](ProControllerContext& context){
+                pbf_wait(context, 1000ms);
+                pbf_mash_button(context, BUTTON_B, 9000ms);
+            },
+            { battle_menu }
+        );
+        if (ret < 0){
+            errors++;
+            console.log("flee_battle(): Failed to detect battle menu. Attempt " + std::to_string(errors) + "/5", COLOR_RED);
+            continue;
+        }
+
+        console.log("Navigate to Run.");
+        pbf_press_dpad(context, DPAD_RIGHT, 160ms, 160ms);
+        pbf_press_dpad(context, DPAD_DOWN, 160ms, 160ms);
+        pbf_press_button(context, BUTTON_A, 160ms, 320ms);
+
+        int ret2 = wait_until(
+            console, context,
+            std::chrono::seconds(5),
+            { {ran_away} }
+        );
+
+        if (ret2 == 0){
+            console.log("Running away...");
+        }
+        else {
+            // Even though we failed to detect the "ran away" dialog, we might have still successfully fled. 
+            // Attempt the next detections as a possible recovery.
+            console.log("flee_battle(): Failed to detect flee dialog.", COLOR_RED);
+        }
+
+        int ret3 = run_until<ProControllerContext>(
+            console, context,
+            [](ProControllerContext& context){
+                pbf_press_button(context, BUTTON_A, 320ms, 640ms);
+                pbf_wait(context, 5000ms);
+                context.wait_for_all_requests();
+            },
+            { battle_over, battle_menu }
+        );
+        if (ret3 == 0){
+            console.log("Successfully fled the battle.");
+            return;
+        }
+        else if (ret3 == 1){
+            errors++;
+            console.log("flee_battle(): Detected battle menu after attempting to flee. Attempt " + std::to_string(errors) + "/5", COLOR_RED);
+            continue;
+        }
+        else {
+            console.log("flee_battle(): failed to detect transition to overworld. Attempting to open start menu to verify successful flee..", COLOR_RED);
+            
+            open_start_menu(console, context);
+            close_start_menu(console, context);
+            context.wait_for_all_requests();
+            return;
+        }
+    }
+}
+
+WildBattleExitResult exit_wild_battle(
+    Logger& logger, WildBattleExitActions& actions,
+    bool stop_on_move_learn, bool prevent_evolution
+){
+    // For move learning, there are two dialog selection boxes in a row
+    // we need to decline the first one and accept the second one, so mashing B won't work
+    // The first one will occur after an Advance Battle Dialog
+    uint16_t errors = 0;
+    uint16_t loops = 0;
+    bool first_attempt = true;
+    bool rejected_first_box = false;
+    bool move_learned = false;
+    bool evolved = false;
+    while (true){
+        if (errors > 5 || loops > 5){
+            return WildBattleExitResult::Failed;
+        }
+
+        WildBattleExitEvent event = first_attempt
+            ? actions.mash_b_until_battle_exited()
+            : actions.press_until_dialog(rejected_first_box ? BUTTON_A : BUTTON_B);
+
+        switch (event){
+        case WildBattleExitEvent::BattleExited:
+            // check for the evolution screen
+            if (actions.evolution_started()){
+                logger.log("Evolution detected.");
+                evolved = true;
+                if (!prevent_evolution){
+                    // make sure B isn't pressed too soon, which would cancel the evolution
+                    actions.wait_for_evolution();
+                }
+                rejected_first_box = false;
+                continue; // press B as in other cases, and handle any move learning loops that might come up
+            }
+            logger.log("Battle exited.");
+            return move_learned ? WildBattleExitResult::ExitedAfterMoveLearn : WildBattleExitResult::Exited;
+        case WildBattleExitEvent::AdvanceDialog:
+            logger.log("Battle Advance arrow detected.");
+            actions.advance_dialog();
+            rejected_first_box = false;
+            continue;
+        case WildBattleExitEvent::MoveLearnPrompt:
+            if (stop_on_move_learn){
+                logger.log("Move learn detected.");
+                return WildBattleExitResult::StoppedOnMoveLearn;
+            }else if (rejected_first_box){
+                loops++;
+                logger.log("Declined to learn new move.");
+                actions.answer_move_prompt(BUTTON_A);
+            }else{
+                actions.answer_move_prompt(BUTTON_B);
+                rejected_first_box = true;
+                move_learned = true;
+            }
+            continue;
+        case WildBattleExitEvent::None:
+            // An evolution ends on the overworld without another black screen, so nothing above
+            // can see that it is over. Check for the overworld now, instead of pressing B for
+            // another 30 seconds first.
+            if (evolved){
+                evolved = false;
+                first_attempt = false;
+                if (actions.return_to_overworld()){
+                    logger.log("Battle exited.");
+                    return move_learned ? WildBattleExitResult::ExitedAfterMoveLearn : WildBattleExitResult::Exited;
+                }
+                continue;
+            }
+            if (first_attempt){
+                logger.log("Loop detected.");
+                first_attempt = false;
+                continue;
+            }
+            logger.log("Failed to detect expected battle dialogs.");
+            errors++;
+            if (actions.return_to_overworld()){
+                logger.log("Battle exited.");
+                return move_learned ? WildBattleExitResult::ExitedAfterMoveLearn : WildBattleExitResult::Exited;
+            }
+            rejected_first_box = false;
+            continue;
+        }
+    }
+}
+
+namespace{
+
+class ConsoleWildBattleExitActions : public WildBattleExitActions{
+public:
+    ConsoleWildBattleExitActions(ConsoleHandle& console, ProControllerContext& context)
+        : m_console(console), m_context(context)
+    {}
+
+    virtual WildBattleExitEvent mash_b_until_battle_exited() override{
+        BlackScreenWatcher battle_exited(COLOR_RED);
+        m_context.wait_for_all_requests();
+        int ret = run_until<ProControllerContext>(
+            m_console, m_context,
+            [](ProControllerContext& context){
+                pbf_mash_button(context, BUTTON_B, 20000ms);
+            },
+            { battle_exited }
+        );
+        return ret == 0 ? WildBattleExitEvent::BattleExited : WildBattleExitEvent::None;
+    }
+    virtual WildBattleExitEvent press_until_dialog(Button button) override{
+        BlackScreenWatcher battle_exited(COLOR_RED);
+        AdvanceBattleDialogWatcher advance_dialog(COLOR_RED);
+        BattleLearnDialogWatcher move_learn_select(COLOR_RED);
+        m_context.wait_for_all_requests();
+        WallClock deadline = current_time() + 30s;
+        int ret = run_until<ProControllerContext>(
+            m_console, m_context,
+            [deadline, button](ProControllerContext& context){
+                pbf_wait(context, 1000ms); // give the watchers a chance to detect something
+                while (current_time() < deadline){
+                    pbf_press_button(context, button, 200ms, 1800ms);
+                    // Presses are queued, so without this the loop queues a minute of them
+                    // before the deadline and keeps pressing long after it.
+                    context.wait_for_all_requests();
+                }
+            },
+            { battle_exited, advance_dialog, move_learn_select }
+        );
+        switch (ret){
+        case 0:
+            return WildBattleExitEvent::BattleExited;
+        case 1:
+            return WildBattleExitEvent::AdvanceDialog;
+        case 2:
+            return WildBattleExitEvent::MoveLearnPrompt;
+        default:
+            return WildBattleExitEvent::None;
+        }
+    }
+    virtual bool evolution_started() override{
+        BattleDialogWatcher evolution_started(COLOR_RED);
+        m_context.wait_for_all_requests();
+        int ret = run_until<ProControllerContext>(
+            m_console, m_context,
+            [](ProControllerContext& context){
+                pbf_wait(context, 2000ms);
+            },
+            { evolution_started }
+        );
+        return ret == 0;
+    }
+    virtual void wait_for_evolution() override{
+        pbf_wait(m_context, 20000ms);
+    }
+    virtual void advance_dialog() override{
+        pbf_press_button(m_context, BUTTON_B, 200ms, 800ms);
+    }
+    virtual void answer_move_prompt(Button button) override{
+        pbf_press_button(m_context, button, 200ms, 0ms);
+    }
+    virtual bool return_to_overworld() override{
+        StartMenuWatcher start_menu_open(COLOR_RED);
+        // attempt to exit any screen that might be open (party, bag, etc)
+        pbf_mash_button(m_context, BUTTON_B, 500ms);
+        // overworld detection: look for the start menu
+        m_context.wait_for_all_requests();
+        int ret = run_until<ProControllerContext>(
+            m_console, m_context,
+            [](ProControllerContext& context){
+                pbf_press_button(context, BUTTON_PLUS, 200ms, 800ms);
+                pbf_press_button(context, BUTTON_PLUS, 200ms, 800ms);
+                pbf_press_button(context, BUTTON_PLUS, 200ms, 800ms);
+            },
+            { start_menu_open }
+        );
+        if (ret == 0){
+            pbf_mash_button(m_context, BUTTON_B, 500ms);
+        }
+        m_context.wait_for_all_requests();
+        return ret == 0;
+    }
+
+private:
+    ConsoleHandle& m_console;
+    ProControllerContext& m_context;
+};
+
+}
+
+bool exit_wild_battle(ConsoleHandle& console, ProControllerContext& context, bool stop_on_move_learn, bool prevent_evolution){
+    ConsoleWildBattleExitActions actions(console, context);
+    switch (exit_wild_battle(console.logger(), actions, stop_on_move_learn, prevent_evolution)){
+    case WildBattleExitResult::Exited:
+        return false;
+    case WildBattleExitResult::ExitedAfterMoveLearn:
+    case WildBattleExitResult::StoppedOnMoveLearn:
+        return true;
+    case WildBattleExitResult::Failed:
+        break;
+    }
+    OperationFailedExceptionWithScreenshot::fire(
+        ErrorReportMode::SEND_ERROR_REPORT,
+        "exit_wild_battle(): Failed to exit battle.",
+        console
+    );
+}
+
+void open_party_menu_from_overworld(ConsoleHandle& console, ProControllerContext& context, StartMenuContext menu_context){
+    uint16_t errors = 0;
+    bool start_menu_is_open = false;
+    while (true){
+        if (errors > 5){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "open_party_menu_from_overworld(): Failed to open party menu 5 times in a row.",
+                console
+            );
+        }
+
+        context.wait_for_all_requests();
+        if (!start_menu_is_open){
+            open_start_menu(console, context); // This is unavoidable since we cannot detect the overworld.
+            start_menu_is_open = true;
+        }
+
+        StartMenuWatcher start_menu(COLOR_RED);
+        PartyMenuWatcher party_menu(COLOR_RED);
+
+        int ret = wait_until(
+            console, context, 10000ms,
+            { start_menu, party_menu }
+        );
+
+        switch (ret){
+        case 0:
+            if (menu_context == StartMenuContext::SAFARI_ZONE){
+                ret = move_cursor_to_position(console, context, SelectionArrowPositionSafariMenu::POKEMON);
+            }else if (menu_context == StartMenuContext::NO_DEX){
+                ret = move_cursor_to_position(console, context, SelectionArrowPositionNoDexMenu::POKEMON);
+            }else{
+                ret = move_cursor_to_position(console, context, SelectionArrowPositionStartMenu::POKEMON);
+            }
+
+            if (ret < 0){
+                console.log("Failed to navigate to POKEMON on the start menu.");
+                errors++;
+                context.wait_for_all_requests();
+                pbf_mash_button(context, BUTTON_B, 2000ms);
+                start_menu_is_open = false;
+            }else{
+                console.log("Navigated to POKEMON on the start menu");
+                context.wait_for_all_requests();
+                pbf_press_button(context, BUTTON_A, 200ms, 1300ms);
+            }
+            continue;
+        case 1:
+            console.log("Party menu opened.");
+            return;
+        default:
+            console.log("Failed to open party menu.");
+            errors++;
+            pbf_mash_button(context, BUTTON_B, 2000ms);
+            start_menu_is_open = false;
+            continue;
+        }
+    }
+}
+
+PartySlot detect_last_occupied_party_slot(ConsoleHandle& console){
+    const auto snapshot = console.video().snapshot();
+    constexpr std::array slots{
+        PartySlot::SIX,
+        PartySlot::FIVE,
+        PartySlot::FOUR,
+        PartySlot::THREE,
+        PartySlot::TWO,
+    };
+
+    for (PartySlot slot : slots){
+        PartyEmptySlotDetector empty_slot_detector(COLOR_RED, slot);
+        if (!empty_slot_detector.detect(snapshot)){
+            return slot;
+        }
+    }
+
+    return PartySlot::ONE;
+}
+
+void open_bag_from_overworld(ConsoleHandle& console, ProControllerContext& context, StartMenuContext menu_context){
+    uint16_t errors = 0;
+    bool start_menu_is_open = false;
+    while (true){
+        if (errors > 5){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "open_party_menu_from_overworld(): Failed to open party menu 5 times in a row.",
+                console
+            );
+        }
+
+        context.wait_for_all_requests();
+        if (!start_menu_is_open){
+            open_start_menu(console, context); // This is unavoidable since we cannot detect the overworld.
+            start_menu_is_open = true;
+        }
+
+        StartMenuWatcher start_menu(COLOR_RED);
+        BagWatcher bag(COLOR_RED);
+
+        int ret = wait_until(
+            console, context, 10000ms,
+            { start_menu, bag }
+        );
+
+        switch (ret){
+        case 0:
+            if (menu_context == StartMenuContext::SAFARI_ZONE){
+                ret = move_cursor_to_position(console, context, SelectionArrowPositionSafariMenu::BAG);
+            }else if (menu_context == StartMenuContext::NO_DEX){
+                ret = move_cursor_to_position(console, context, SelectionArrowPositionNoDexMenu::BAG);
+            }else{
+                ret = move_cursor_to_position(console, context, SelectionArrowPositionStartMenu::BAG);
+            }
+
+            if (ret < 0){
+                console.log("Failed to navigate to BAG on the start menu.");
+                errors++;
+                context.wait_for_all_requests();
+                pbf_mash_button(context, BUTTON_B, 2000ms);
+                start_menu_is_open = false;
+            }else{
+                console.log("Navigated to BAG on the start menu");
+                context.wait_for_all_requests();
+                pbf_press_button(context, BUTTON_A, 200ms, 1300ms);
+            }
+            continue;
+        case 1:
+            console.log("Bag opened.");
+            return;
+        default:
+            console.log("Failed to open bag.");
+            errors++;
+            pbf_mash_button(context, BUTTON_B, 2000ms);
+            start_menu_is_open = false;
+            continue;
+        }
+    }
+}
+
+void use_sweet_scent_from_overworld(ConsoleHandle& console, ProControllerContext& context, int from_last){
+    uint16_t errors = 0;
+    
+    while (true){
+        if (errors > 5){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "use_teleport_from_overworld(): Failed to use Teleport 5 times in a row.",
+                console
+            );
+        }
+
+        open_party_menu_from_overworld(console, context);
+        // navigate to last party slot
+        for (int i=0; i<(2+from_last); i++){
+            pbf_move_left_joystick(context, {0, +1}, 200ms, 300ms);
+        }
+
+        PartySelectionWatcher sweetscent_selected(COLOR_RED);
+
+        context.wait_for_all_requests();
+        int ret = run_until<ProControllerContext>(
+            console, context,
+            [](ProControllerContext& context){
+                pbf_press_button(context, BUTTON_A, 200ms, 1800ms);
+            },
+            { sweetscent_selected }
+        );
+
+        if (ret < 0){
+            console.log("Failed to select Sweet Scent user.");
+            errors++;
+            pbf_mash_button(context, BUTTON_B, 3000ms);
+            continue;
+        }
+        
+        // select Sweet Scent (2nd option, but maybe HMs could change this)
+        pbf_move_left_joystick(context, {0, -1}, 200ms, 300ms);
+        pbf_press_button(context, BUTTON_A, 200ms, 1800ms);
+        pbf_press_button(context, BUTTON_A, 200ms, 800ms);
+
+        context.wait_for_all_requests();
+        console.log("Used Sweet Scent.");
+        return;
+    }
+}
+
+void use_teleport_from_overworld(ConsoleHandle& console, ProControllerContext& context){
+    uint16_t errors = 0;
+    
+    while (true){
+        if (errors > 5){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "use_teleport_from_overworld(): Failed to use Teleport 5 times in a row.",
+                console
+            );
+        }
+
+        open_party_menu_from_overworld(console, context);
+        // navigate to last party slot
+        pbf_move_left_joystick(context, {0, +1}, 200ms, 300ms);
+        pbf_move_left_joystick(context, {0, +1}, 200ms, 300ms);
+
+        PartySelectionWatcher teleporter_selected(COLOR_RED);
+
+        context.wait_for_all_requests();
+        int ret = run_until<ProControllerContext>(
+            console, context,
+            [](ProControllerContext& context){
+                pbf_press_button(context, BUTTON_A, 200ms, 1800ms);
+            },
+            { teleporter_selected }
+        );
+
+        if (ret < 0){
+            console.log("Failed to select Teleport user.");
+            errors++;
+            pbf_mash_button(context, BUTTON_B, 3000ms);
+            continue;
+        }
+        
+        // select Teleport (2nd option, but maybe HMs could change this)
+        pbf_move_left_joystick(context, {0, -1}, 200ms, 300ms);
+        pbf_press_button(context, BUTTON_A, 200ms, 1800ms);
+        pbf_press_button(context, BUTTON_A, 200ms, 2800ms);
+
+        BlackScreenWatcher teleport_transition(COLOR_RED);
+
+        context.wait_for_all_requests();
+        ret = wait_until(
+            console, context, 20000ms,
+            {teleport_transition}
+        );
+
+        if (ret < 0){
+            console.log("Failed to use Teleport");
+            errors++;
+            pbf_mash_button(context, BUTTON_B, 4000ms);
+            continue;
+        }
+
+        pbf_wait(context, 3000ms);
+        context.wait_for_all_requests();
+        console.log("Used Teleport.");
+        return;
+    }
+}
+
+void open_fly_map_from_overworld(ConsoleHandle& console, ProControllerContext& context){
+    uint16_t errors = 0;
+    while (true){
+        if (errors > 5){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "open_fly_map_from_overworld(): Failed to open Fly map 5 times in a row.",
+                console
+            );
+        }
+
+        open_party_menu_from_overworld(console, context);
+        // navigate to last party slot
+        pbf_move_left_joystick(context, {0, +1}, 200ms, 300ms);
+        pbf_move_left_joystick(context, {0, +1}, 200ms, 300ms);
+
+        PartySelectionWatcher fly_user_selected(COLOR_RED);
+
+        context.wait_for_all_requests();
+        int ret = run_until<ProControllerContext>(
+            console, context,
+            [](ProControllerContext& context){
+                pbf_press_button(context, BUTTON_A, 200ms, 1800ms);
+            },
+            { fly_user_selected }
+        );
+
+        if (ret < 0){
+            console.log("Failed to select Fly user.");
+            errors++;
+            pbf_mash_button(context, BUTTON_B, 3000ms);
+            continue;
+        }
+        
+        // select Fly (2nd option, but maybe other HMs could change this)
+        KantoMapWatcher map_opened(COLOR_RED);
+        context.wait_for_all_requests();
+        pbf_move_left_joystick(context, {0, -1}, 200ms, 300ms);
+        pbf_press_button(context, BUTTON_A, 200ms, 0ms);
+        ret = wait_until(
+            console, context, 20000ms,
+            {map_opened}
+        );
+
+        if (ret < 0){
+            console.log("Failed to detect Kanto map");
+            errors++;
+            pbf_mash_button(context, BUTTON_B, 4000ms);
+            continue;
+        }
+
+        pbf_wait(context, 1000ms);
+        context.wait_for_all_requests();
+        console.log("Kanto map detected.");
+        return;
+    }
+}
+
+void fly_from_kanto_map(ConsoleHandle& console, ProControllerContext& context, KantoFlyLocation destination){
+    uint64_t errors = 0;
+    
+    while (true){
+        if (errors > 5){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "fly_from_kanto_map(): Failed to inititate Fly five times in a row.",
+                console
+            ); 
+        }
+
+        pbf_move_left_joystick(context, {-1, +1}, 4000ms, 500ms);
+        context.wait_for_all_requests();
+
+        // blindly move the cursor to the specified fly spot
+        switch (destination){
+        case KantoFlyLocation::pallettown:
+            pbf_move_left_joystick(context, {0, -1}, 900ms, 100ms);
+            pbf_move_left_joystick(context, {+1, 0}, 317ms, 100ms);
+            break;
+        case KantoFlyLocation::viridiancity:
+            pbf_move_left_joystick(context, {0, -1}, 633ms, 100ms);
+            pbf_move_left_joystick(context, {+1, 0}, 317ms, 100ms);
+            break;
+        case KantoFlyLocation::pewtercity:
+            pbf_move_left_joystick(context, {0, -1}, 317ms, 100ms);
+            pbf_move_left_joystick(context, {+1, 0}, 317ms, 100ms);
+            break;
+        case KantoFlyLocation::route4:
+            pbf_move_left_joystick(context, {0, -1}, 233ms, 100ms);
+            pbf_move_left_joystick(context, {+1, 0}, 633ms, 100ms);
+            break;
+        case KantoFlyLocation::ceruleancity:
+            pbf_move_left_joystick(context, {0, -1}, 233ms, 100ms);
+            pbf_move_left_joystick(context, {+1, 0}, 1150ms, 100ms);
+            break;
+        case KantoFlyLocation::vermilioncity:
+            pbf_move_left_joystick(context, {0, -1}, 700ms, 100ms);
+            pbf_move_left_joystick(context, {+1, 0}, 1150ms, 100ms);
+            break;
+        case KantoFlyLocation::route10:
+            pbf_move_left_joystick(context, {0, -1}, 233ms, 100ms);
+            pbf_move_left_joystick(context, {+1, 0}, 1500ms, 100ms);
+            break;
+        case KantoFlyLocation::lavendertown:
+            pbf_move_left_joystick(context, {0, -1}, 467ms, 100ms);
+            pbf_move_left_joystick(context, {+1, 0}, 1500ms, 100ms);
+            break;
+        case KantoFlyLocation::celadoncity:
+            pbf_move_left_joystick(context, {0, -1}, 467ms, 100ms);
+            pbf_move_left_joystick(context, {+1, 0}, 900ms, 100ms);
+            break;
+        case KantoFlyLocation::saffroncity:
+            pbf_move_left_joystick(context, {0, -1}, 467ms, 100ms);
+            pbf_move_left_joystick(context, {+1, 0}, 1150ms, 100ms);
+            break;
+        case KantoFlyLocation::fuschiacity:
+            pbf_move_left_joystick(context, {0, -1}, 967ms, 100ms);
+            pbf_move_left_joystick(context, {+1, 0}, 967ms, 100ms);
+            break;
+        case KantoFlyLocation::cinnabarisland:
+            pbf_move_left_joystick(context, {0, -1}, 1100ms, 100ms);
+            pbf_move_left_joystick(context, {+1, 0}, 317ms, 100ms);
+            break;
+        case KantoFlyLocation::indigoplateau:
+            pbf_move_left_joystick(context, {0, -1}, 200ms, 100ms);
+            pbf_move_left_joystick(context, {+1, 0}, 150ms, 100ms);
+            break;
+        default:
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "fly_from_kanto_map(): Unimplemented Kanto fly target.",
+                console
+            );
+        }
+
+        BlackScreenWatcher fly_initiated(COLOR_RED);
+        context.wait_for_all_requests();
+        int ret = run_until<ProControllerContext>(
+            console, context,
+            [](ProControllerContext& context){
+                // walk up to counter and initiate dialog
+                pbf_mash_button(context, BUTTON_A, 5000ms);
+            },
+            { fly_initiated }
+        );
+        
+        pbf_wait(context, 8000ms);
+        context.wait_for_all_requests();
+
+        if (ret == 0){
+            console.log("Fly initiated.");
+            return;
+        }else{
+            errors++;
+            console.log("Failed to detect black screen within 5 seconds of attempting to fly.");
+            continue;
+        }
+
+    }
+    
+}
+
+void enter_leave_pokecenter(ConsoleHandle& console, ProControllerContext& context, bool leave){
+    uint16_t errors = 0;
+
+    while (true){
+        if (errors > 5){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                leave ? "leave_pokecenter(): Failed to exit PokeCenter." : "enter_pokecenter(): Failed to enter PokeCenter.",
+                console
+            );
+        }
+
+        BlackScreenWatcher pokecenter_transition(COLOR_RED);
+
+        int ret = run_until<ProControllerContext>(
+            console, context,
+            [leave](ProControllerContext& context){
+                pbf_move_left_joystick(context, {0, (leave ? -1.0 : +1.0)}, 10000ms, 0ms);
+            },
+            { pokecenter_transition }
+        );
+
+        if (ret < 0){
+            console.log(leave ? "Failed to exit PokeCenter." : "Failed to enter PokeCenter.");
+            errors++;
+            pbf_mash_button(context, BUTTON_B, 1000ms);
+            continue;
+        }
+
+        pbf_wait(context, 2500ms);
+        context.wait_for_all_requests();
+        console.log(leave ? "Exited PokeCenter." : "Entered PokeCenter");
+        return;
+    }
+}
+
+void enter_pokecenter(ConsoleHandle& console, ProControllerContext& context){
+    enter_leave_pokecenter(console, context, false);
+}
+
+void leave_pokecenter(ConsoleHandle& console, ProControllerContext& context){
+    enter_leave_pokecenter(console, context, true);
+}
+
+void heal_at_pokecenter(ConsoleHandle& console, ProControllerContext& context){
+    uint16_t errors = 0;
+
+    while (true){
+        if (errors > 5){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "heal_at_pokecenter(): Failed to initiate PokeCenter dialog.",
+                console
+            );
+        }
+
+        WhiteDialogWatcher dialog(COLOR_RED);
+
+        context.wait_for_all_requests();
+        int ret = run_until<ProControllerContext>(
+            console, context,
+            [](ProControllerContext& context){
+                // walk up to counter and initiate dialog
+                ssf_press_left_joystick(context, {0, +1}, 0ms, 10000ms);
+                ssf_mash1_button(context, BUTTON_A, 10000ms);
+            },
+            { dialog }
+        );
+
+        if (ret < 0){
+            console.log("Failed to detect PokeCenter dialog within 10 seconds");
+            errors++;
+            pbf_mash_button(context, BUTTON_B, 2000ms);
+            continue;
+        }
+
+        console.log("Detected PokeCenter dialog.");
+        pbf_mash_button(context, BUTTON_A, 8000ms);
+        pbf_mash_button(context, BUTTON_B, 5000ms);
+        context.wait_for_all_requests();
+        return;
+    }
+}
+
+// tries to pull up the start menu to check if currently in the overworld
+bool in_overworld(
+    ConsoleHandle& console,
+    ProControllerContext& context
+){
+    StartMenuWatcher start_menu;
+    context.wait_for_all_requests();
+    int ret = run_until<ProControllerContext>(
+        console, context,
+        [](ProControllerContext& context){
+            for (int i = 0; i < 3; i++){
+                pbf_press_button(context, BUTTON_PLUS, 200ms, 1800ms);
+                pbf_mash_button(context, BUTTON_B, 500ms);
+            }
+        },
+        { start_menu }
+    );
+    bool overworld = (ret == 0);
+    if (overworld){
+        pbf_mash_button(context, BUTTON_B, 500ms);
+    }
+    context.wait_for_all_requests();
+    return overworld;
+}
+
+
+void exit_battle_after_catch(
+    ConsoleHandle& console,
+    ProControllerContext& context
+){
+    AdvanceBattleDialogWatcher advance_battle_dialog(COLOR_RED);
+    WhiteDialogWatcher white_dialog(COLOR_RED);
+    PokedexRegisteredWatcher dex_registration(COLOR_RED, &console.overlay());
+    BattleSelectionArrowWatcher nickname_question_arrow(
+        COLOR_RED,
+        &console.overlay(),
+        BattleConfirmationOption::YES
+    );
+
+    bool exiting_menus = true;
+    int attempts = 0;
+    while (exiting_menus){
+        int ret = wait_until(
+            console, context,
+            std::chrono::milliseconds(5000),
+            { nickname_question_arrow, white_dialog, advance_battle_dialog, dex_registration }
+        );
+
+        switch (ret){
+        case 0:
+        case 1:
+            pbf_mash_button(context, BUTTON_B, 2000ms);
+            context.wait_for_all_requests();
+            exiting_menus = false;
+            break;
+        case 2:
+        case 3:
+            pbf_press_button(context, BUTTON_B, 200ms, 0ms);
+            context.wait_for_all_requests();
+            break;
+        default:
+            pbf_press_button(context, BUTTON_B, 200ms, 0ms);
+            context.wait_for_all_requests();
+            attempts++;
+            if (attempts > 3){
+                if (in_overworld(console, context)){
+                    return;
+                }
+                OperationFailedExceptionWithScreenshot::fire(
+                    ErrorReportMode::SEND_ERROR_REPORT,
+                    "exit_battle_after_catch(): Failed to exit the battle.",
+                    console
+                );
+            }
+            break;
+        }
+    }
+    pbf_mash_button(context, BUTTON_B, 1500ms);
+    context.wait_for_all_requests();
+    return;
+}
+
+int auto_catch(
+    ConsoleHandle& console,
+    ProControllerContext& context,
+    const uint64_t& max_ball_throws
+){
+    float catch_coefficient = 1.0;
+
+    for (uint64_t i = 0; i <= max_ball_throws; i++){
+        WallClock last_detected_time = current_time();
+        while (true){
+            if (current_time() - last_detected_time > std::chrono::seconds(20)){
+                console.log("auto_catch(): no battle activity detected for 20 seconds");
+                return -1;
+            }
+
+            BattleMenuWatcher battle_menu(COLOR_RED);
+            PartyMenuWatcher party_menu(COLOR_RED);
+            PokedexRegisteredWatcher dex_registration(COLOR_RED, &console.overlay());
+            BlackScreenWatcher black_screen(COLOR_RED);
+            CatchFanfareDetector catch_detector(console.logger(), [&](float error_coefficient) -> bool{
+                catch_coefficient = error_coefficient;
+                return true;
+            });
+
+            context.wait_for_all_requests();
+            int ret = run_until<ProControllerContext>(
+                console, context,
+                [](ProControllerContext& context){
+                    for (int i = 0; i < 60; i++){
+                        pbf_press_button(context, BUTTON_B, 200ms, 300ms);
+                    }
+                },
+                { battle_menu, party_menu, black_screen, dex_registration, catch_detector },
+                10ms
+            );
+
+            switch (ret){
+            case 0:
+                console.log("Battle menu detected");
+                break;
+            case 1:
+                console.log("Party menu detected. Attempting to send out next Pokemon");
+                pbf_mash_button(context, BUTTON_B, 1000ms);
+                pbf_move_left_joystick(context, { 0, -1 }, 200ms, 300ms);
+                pbf_mash_button(context, BUTTON_A, 1000ms);
+                context.wait_for_all_requests();
+                continue;
+            case 2: // either failed catch or fainting -> party menu
+                pbf_wait(context, 200ms);
+                continue;
+            case 3:
+            case 4:
+                console.log("Pokemon Caught!", COLOR_BLUE);
+                exit_battle_after_catch(console, context);
+                return static_cast<int>(i);
+            default:
+                console.log("No recognized state. Try checking if in the overworld...");
+                if (in_overworld(console, context)){
+                    console.log("Overworld detected.");
+                    return 0; // no catch detected
+                }
+            }
+            break;
+        }
+
+        if (i == max_ball_throws){ 
+            break; 
+        }
+
+        // select BAG (selection arrow does not wrap around)
+        pbf_move_left_joystick(context, { +1, 0 }, 100ms, 150ms);
+        pbf_move_left_joystick(context, { 0, +1 }, 100ms, 150ms);
+        pbf_move_left_joystick(context, { +1, 0 }, 100ms, 150ms);
+        pbf_move_left_joystick(context, { 0, +1 }, 100ms, 150ms);
+
+        BagWatcher bag_open(COLOR_RED);
+        int ret2 = run_until<ProControllerContext>(
+            console, context,
+            [](ProControllerContext& context){
+                for (int i = 0; i < 5; i++){
+                    pbf_press_button(context, BUTTON_A, 200ms, 1800ms);
+                }
+            },
+            { bag_open }
+        );
+        if (ret2 < 0){
+            console.log("auto_catch(): failed to open bag.");
+            return -1;
+        }
+
+        if (i == 0){
+            // go to balls pocket (pockets do not wrap around, topmost item will already be selected)
+            pbf_move_left_joystick(context, { +1, 0 }, 200ms, 800ms);
+            pbf_move_left_joystick(context, { +1, 0 }, 200ms, 800ms);
+            pbf_move_left_joystick(context, { +1, 0 }, 200ms, 800ms);
+        }
+
+        // use ball
+        pbf_mash_button(context, BUTTON_A, 5s);
+    }
+
+    console.log("auto_catch(): ran out of balls.");
+    return 0;
+}
+
+int auto_catch_safari(
+    ConsoleHandle& console,
+    ProControllerContext& context,
+    Language game_language,
+    int& safari_balls_remaining, 
+    std::string encounter_name
+){
+    float catch_coefficient = 1.0;
+    bool battle_detected = false;
+
+    SafariOptimalAction safari_optimal_action(game_language);
+    auto actions = safari_optimal_action.get_optimal_actions(
+        console,
+        encounter_name,
+        safari_balls_remaining
+    );
+    size_t action_count = 0;
+
+    std::vector<SafariBattleMenuOption> action_list;
+    if (actions.has_value())
+        action_list = actions->get();
+
+    AdvanceBattleDialogWatcher advance_battle_dialog(COLOR_RED);
+    WhiteDialogWatcher white_dialog(COLOR_RED);
+    BattleMenuWatcher battle_menu(COLOR_RED);
+    PokedexRegisteredWatcher dex_registration(COLOR_RED, &console.overlay());
+    BlackScreenWatcher battle_end(COLOR_RED);
+    CatchFanfareDetector catch_detector(console.logger(), [&](float error_coefficient) -> bool{
+        catch_coefficient = error_coefficient;
+        return true;
+    });
+    BattleSelectionArrowWatcher nickname_question_arrow(
+        COLOR_RED,
+        &console.overlay(),
+        BattleConfirmationOption::YES
+    );
+
+    WallClock last_detected_time = current_time();
+    while (true){
+        if (current_time() - last_detected_time > std::chrono::seconds(20)){
+            console.log("auto_catch_safari(): No battle activity detected for 20 seconds.");
+
+            if (!battle_detected){
+                console.log("Unable to detect battle activity.");
+                return -1;
+            }
+
+            if (!in_overworld(console, context)){
+                console.log("auto_catch_safari(): no recognized state after 30 seconds.");
+                return -1;
+            }
+            console.log("Overworld detected.");
+            pbf_mash_button(context, BUTTON_B, 500ms);
+            context.wait_for_all_requests();
+            return 0;
+        }
+
+        catch_detector.clear();
+        int ret = wait_until(
+            console, context,
+            std::chrono::milliseconds(2000),
+            {  battle_menu, battle_end, advance_battle_dialog, nickname_question_arrow, catch_detector }
+        );
+
+        switch (ret){
+        case 0: { // Battle Menu
+            battle_detected = true;
+            last_detected_time = current_time();
+            SafariBattleMenuOption action = SafariBattleMenuOption::BALL;
+
+            if (action_count < action_list.size()){
+                action = action_list[action_count];
+                action_count++;
+            }
+
+            if (!move_cursor_to_option(console, context, action)){
+                console.log("Failed to move cursor to option.", COLOR_RED);
+                if (action_count > 0){
+                    action_count--;
+                }
+                break;
+            }
+
+            pbf_press_button(context, BUTTON_A, 200ms, 200ms);
+            context.wait_for_all_requests();
+
+            if (action == SafariBattleMenuOption::BALL){
+                safari_balls_remaining--;
+            }
+
+            break;
+        }
+        case 1: { // Battle End
+            console.log("Failed to catch pokemon.");
+            return 0;
+        }
+        case 2: // Various catch indicators
+        case 3:
+        case 4: 
+            console.log("Pokemon Caught!");
+            exit_battle_after_catch(console, context);
+            return 1;
+        }
+    }
+
+    return 0;
+}
+
+int grass_spin(ConsoleHandle& console, ProControllerContext& context, bool leftright, Seconds timeout){
+    BlackScreenWatcher battle_triggered(COLOR_RED);
+    AdvanceBattleDialogWatcher battle_entered(COLOR_RED);
+
+    context.wait_for_all_requests();
+    console.log("Starting grass spin.");
+
+    const size_t spins = (size_t)(timeout / 366ms);
+
+    int ret = run_until<ProControllerContext>(
+        console, context,
+        [leftright, spins](ProControllerContext& context){
+            for (size_t c = 0; c < spins; c++){
+                if (leftright){
+                    pbf_move_left_joystick(context, {+1, 0}, 33ms, 150ms);
+                    pbf_move_left_joystick(context, {-1, 0}, 33ms, 150ms);
+                }else{
+                    pbf_move_left_joystick(context, {0, +1}, 33ms, 150ms);
+                    pbf_move_left_joystick(context, {0, -1}, 33ms, 150ms);
+                }
+            }
+        },
+        { battle_triggered, battle_entered }
+    );
+
+    if (ret < 0){
+        return -1;
+    }
+
+    bool encounter_shiny;
+    try{
+        encounter_shiny = handle_encounter(console, context, true);
+    }catch (OperationFailedException&){
+        // check to see if it was a false positive
+        if (!in_overworld(console, context)){
+            throw;
+        }
+        console.log("grass_spin(): No battle started. Still in the overworld.", COLOR_RED);
+        return -1;
+    }
+    return encounter_shiny ? 1 : 0;
+}
+
+int fish_encounter(ConsoleHandle& console, ProControllerContext& context, Seconds timeout){
+    WhiteDialogWatcher fishing_dialog(COLOR_RED);
+    BlackScreenWatcher battle_entered(COLOR_RED);
+    AdvanceBattleDialogWatcher battle_dialog(COLOR_RED);
+    BattleMenuWatcher battle_menu(COLOR_RED);
+
+    context.wait_for_all_requests();
+    console.log("Starting fish encounter.");
+    WallClock start = current_time();
+
+    while (true){
+        if (current_time() - start > timeout){
+            console.log("No pokemon hooked after timeout.");
+            return -1;
+        }
+
+        pbf_press_button(context, BUTTON_MINUS, 200ms, 200ms);
+        context.wait_for_all_requests();
+
+        int ret = wait_until(
+            console, context,
+            std::chrono::milliseconds(2000),
+            { fishing_dialog, battle_entered, battle_dialog, battle_menu }
+        );
+
+        if (ret == 0){
+            console.log("Fishing dialog detected.");
+            pbf_press_button(context, BUTTON_B, 200ms, 200ms);
+            context.wait_for_all_requests();
+        }else if (ret == 1 || ret == 2 || ret == 3){
+            console.log("Battle entered.");
+            break;
+        }
+    }
+
+    bool encounter_shiny = handle_encounter(console, context, true);
+    return encounter_shiny ? 1 : 0;
+}
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/PokemonFRLG_Navigation.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/PokemonFRLG_Navigation.h
new file mode 100644
index 0000000000..e802a4be6d
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/PokemonFRLG_Navigation.h
@@ -0,0 +1,207 @@
+/*  Pokemon FRLG Navigation
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  Soft reset, menus, etc.
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonFRLG_Navigation_H
+#define PokemonAutomation_PokemonFRLG_Navigation_H
+
+#include "Common/Cpp/Logging/AbstractLogger.h"
+#include "CommonFramework/Language.h"
+#include "CommonFramework/Tools/VideoStream.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+#include "VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_PartySlot.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+    class ConsoleHandle;
+    class ProController;
+    using ProControllerContext = ControllerContext<ProController>;
+namespace PokemonFRLG{
+
+using namespace std::chrono_literals;
+
+
+enum class BattleResult{
+    opponentfainted,
+    playerfainted,
+    outofpp,
+    unknown
+};
+
+enum class KantoFlyLocation{
+    pallettown,
+    viridiancity,
+    pewtercity,
+    route4,
+    ceruleancity,
+    vermilioncity,
+    route10,
+    lavendertown,
+    celadoncity,
+    saffroncity,
+    fuschiacity,
+    cinnabarisland,
+    indigoplateau,
+};
+
+
+// Press A+B+Select+Start at the same time to soft reset, then re-enters the game.
+// There are two random waits, one before pressing start and another after loading in the game.
+// This is to prevent repeatedly getting the same pokemon, due to FRLG's RNG.
+uint64_t soft_reset(ConsoleHandle& console, ProControllerContext &context);
+
+// From the overworld, open the summary of the Pokemon in slot 6. This assumes the menu cursor is in the top slot (POKEDEX)
+uint64_t open_slot_six(ConsoleHandle& console, ProControllerContext& context);
+
+// After press A/walking up to enter a battle, run this handle the battle start and to check if opponent is shiny.
+// Set send_out_lead to true and then use flee_battle() after if for run away resets
+// For soft resets, send_out_lead as false and then soft_reset() to save time.
+bool handle_encounter(ConsoleHandle& console, ProControllerContext& context, bool send_out_lead);
+
+// Mash A to keep using the first move until a Pokemon faints (either the player's or the opponent)
+// Flees the battle if out of PP.
+// Returns a BattleResult indicating how the battle ended
+BattleResult spam_first_move(ConsoleHandle& console, ProControllerContext& context);
+
+// Run from battle. Cursor must start on the FIGHT button. Assumes fleeing will always work. (Smoke Ball)
+void flee_battle(ConsoleHandle& console, ProControllerContext& context);
+
+// Exit a wild battle after winning. Checks if a Pokemon is learning a new move.
+// If stop_on_move_learn is true, this exits early when a move is being learned without declining it. Otherwise, this returns to the overworld. 
+// Returns true if a move was learned (even if it was rejected) and false otherwise.
+bool exit_wild_battle(ConsoleHandle& console, ProControllerContext& context, bool stop_on_move_learn, bool prevent_evolution);
+
+// What a step of exit_wild_battle() saw.
+enum class WildBattleExitEvent{
+    BattleExited,       // The screen went black as the battle ended.
+    AdvanceDialog,      // A battle dialog is waiting for a button.
+    MoveLearnPrompt,    // A Pokemon is trying to learn a move.
+    None,               // Nothing was seen before the step timed out.
+};
+
+// The game steps that exit_wild_battle() takes. They are injected so that its decisions (what to
+// press after each dialog, when to give up) run in tests without a Switch.
+class WildBattleExitActions{
+public:
+    virtual ~WildBattleExitActions() = default;
+
+    // Mash B for up to 20 seconds, until the battle ends.
+    virtual WildBattleExitEvent mash_b_until_battle_exited() = 0;
+
+    // Press `button` every 2 seconds for up to 30 seconds, until the battle ends, a battle dialog
+    // waits for a button, or a move-learn prompt opens.
+    virtual WildBattleExitEvent press_until_dialog(Button button) = 0;
+
+    // Right after the battle ends, check for a dialog, which means a Pokemon is evolving.
+    virtual bool evolution_started() = 0;
+
+    // Wait for an evolution to finish without pressing B, which would cancel it.
+    virtual void wait_for_evolution() = 0;
+
+    // Close a battle dialog that is waiting for a button.
+    virtual void advance_dialog() = 0;
+
+    // Answer a move-learn prompt with `button`.
+    virtual void answer_move_prompt(Button button) = 0;
+
+    // Close any open screen, then check for the overworld by opening the start menu. Returns true
+    // if it opened; it is closed again.
+    virtual bool return_to_overworld() = 0;
+};
+
+enum class WildBattleExitResult{
+    Exited,
+    ExitedAfterMoveLearn,   // A move-learn prompt came up and the move was declined.
+    StoppedOnMoveLearn,     // Stopped at a move-learn prompt, as stop_on_move_learn asks.
+    Failed,
+};
+
+// The decisions of exit_wild_battle(), taking its game steps from `actions`.
+WildBattleExitResult exit_wild_battle(
+    Logger& logger, WildBattleExitActions& actions,
+    bool stop_on_move_learn, bool prevent_evolution
+);
+
+// Starting from the start menu, a sub-screen of the start menu, or the overworld, navigate to the party screen
+enum class StartMenuContext {
+    STANDARD,
+    SAFARI_ZONE,
+    NO_DEX,
+};
+void open_party_menu_from_overworld(ConsoleHandle& console, ProControllerContext& context, StartMenuContext menu_context = StartMenuContext::STANDARD);
+
+// Starting from the party menu, detect the last occupied party slot
+PartySlot detect_last_occupied_party_slot(ConsoleHandle& console);
+
+// Starting from the start menu, a sub-screen of the start menu, or the overworld, navigate to the bag
+void open_bag_from_overworld(ConsoleHandle& console, ProControllerContext& context, StartMenuContext menu_context = StartMenuContext::STANDARD);
+
+// Uses Sweet Scent, assuming that the specified party member has it learned
+// The last argument is the distance of the Sweet Scent user from the last party slot
+void use_sweet_scent_from_overworld(ConsoleHandle& console, ProControllerContext& context, int from_last = 0);
+
+// Uses Teleport to return to a PokeCenter. 
+// Assumes that Teleport is usable and the last party member has it learned
+void use_teleport_from_overworld(ConsoleHandle& console, ProControllerContext& context);
+
+// Navigates to the fly map. Assumes that Fly is usable and the last member of your party has it learned
+void open_fly_map_from_overworld(ConsoleHandle& console, ProControllerContext& context);
+
+// Starting from the Kanto Fly map, fly to a specified location.
+void fly_from_kanto_map(ConsoleHandle& console, ProControllerContext& context, KantoFlyLocation destination);
+
+// Enter a PokeCenter. Assumes the player is standing in front of its door
+void enter_pokecenter(ConsoleHandle& console, ProControllerContext& context);
+
+// Leave a PokeCenter. Assumes the player is standing directly north of the exit
+void leave_pokecenter(ConsoleHandle& console, ProControllerContext& context);
+
+// Approach the counter and heal at a PokeCenter. Assumed the player is directly south of the nurse
+// Combine with enter_pokecenter, leave_pokecenter, and use_teleport_from_overworld for automating healing your party
+void heal_at_pokecenter(ConsoleHandle& console, ProControllerContext& context);
+
+// Trigger encounters in grass without moving by tapping the left thumbstick back and forth
+// Can be used to alternate left/right and up/down. It is important that the player is not facing
+// the same direction as the first thumbstick press.
+// returns -1 if no encounter is triggered, 0 if a non-shiny is encounter, and 1 if a shiny is encountered
+// A spin that stops without starting a battle also returns -1, as long as the player is still in the overworld.
+int grass_spin(ConsoleHandle& console, ProControllerContext& context, bool leftright, Seconds timeout = 60s);
+
+// Trigger encounters by fishing with a registered rod. The player must be facing water.
+// returns -1 if no encounter is triggered, 0 if a non-shiny is encounter, and 1 if a shiny is encountered
+int fish_encounter(ConsoleHandle& console, ProControllerContext& context, Seconds timeout = 300s);
+
+// tries to pull up the start menu to check if currently in the overworld
+bool in_overworld(ConsoleHandle& console, ProControllerContext& context);
+
+// Automatically catch a Pokemon.
+// Returns -1 if there are detection issues, 0 if the Pokemon was not caught, and the number of balls thrown if it was caught.
+int auto_catch(
+    ConsoleHandle& console,
+    ProControllerContext& context,
+    const uint64_t& max_ball_throws
+);
+
+// Automatically catch a Pokemon encountered in the Safari Zone. 
+// uses optimal Safari Zone catching strategy.
+// safari_balls_remaining is updated to reflect the number of balls remaining after the encounter.
+// Returns -1 if there are detection issues, 0 if the Pokemon was not caught, and 1 if it was caught.
+int auto_catch_safari(
+    ConsoleHandle& console,
+    ProControllerContext& context,
+    Language game_language,
+    int& safari_balls_remaining, 
+    std::string encounter_name
+);
+
+// Go to home to check that scaling is 100%. Then resume game.
+void home_black_border_check(ConsoleHandle& console, ProControllerContext& context);
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/PokemonFRLG_Panels.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/PokemonFRLG_Panels.cpp
new file mode 100644
index 0000000000..7db5e9c999
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/PokemonFRLG_Panels.cpp
@@ -0,0 +1,117 @@
+/*  Pokemon FRLG Panels
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/StaticGlobals.h"
+#include "CommonFramework/GlobalAutoPaths.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "PokemonFRLG_Panels.h"
+
+#include "PokemonFRLG_Settings.h"
+#include "Programs/BoxOrganization/PokemonFRLG_BoxSorter.h"
+#include "Programs/Farming/PokemonFRLG_EliteFourFarmer.h"
+#include "Programs/Farming/PokemonFRLG_HeldItemFarmer-SafariZone.h"
+#include "Programs/Farming/PokemonFRLG_ItemDuplication.h"
+#include "Programs/Farming/PokemonFRLG_NuggetBridgeFarmer.h"
+#include "Programs/Farming/PokemonFRLG_PickupFarmer.h"
+#include "Programs/Farming/PokemonFRLG_EvTrainer.h"
+#include "Programs/ShinyHunting/PokemonFRLG_GiftReset.h"
+#include "Programs/ShinyHunting/PokemonFRLG_LegendaryReset.h"
+#include "Programs/ShinyHunting/PokemonFRLG_LegendaryRunAway.h"
+#include "Programs/ShinyHunting/PokemonFRLG_PrizeCornerReset.h"
+#include "Programs/ShinyHunting/PokemonFRLG_ShinyHunt-Fishing.h"
+#include "Programs/ShinyHunting/PokemonFRLG_ShinyHunt-Overworld.h"
+
+#include "Programs/RngManipulation/PokemonFRLG_RngHelper.h"
+#include "Programs/RngManipulation/PokemonFRLG_SidHelper.h"
+#include "Programs/RngManipulation/PokemonFRLG_StarterRng.h"
+#include "Programs/RngManipulation/PokemonFRLG_GiftRng.h"
+#include "Programs/RngManipulation/PokemonFRLG_StaticRng.h"
+#include "Programs/RngManipulation/PokemonFRLG_WildRng.h"
+#include "Programs/RngManipulation/PokemonFRLG_RoamingLegendaryRng.h"
+#include "Programs/RngManipulation/PokemonFRLG_EggRng.h"
+
+#include "Programs/TestPrograms/PokemonFRLG_SoundListener.h"
+#include "Programs/TestPrograms/PokemonFRLG_ReadStats.h"
+#include "Programs/TestPrograms/PokemonFRLG_ReadBattleLevelUp.h"
+#include "Programs/TestPrograms/PokemonFRLG_ReadTrainerId.h"
+#include "Programs/TestPrograms/PokemonFRLG_ReadEncounter.h"
+#include "Programs/TestPrograms/PokemonFRLG_ReadBoxInfo.h"
+#include "Programs/TestPrograms/PokemonFRLG_SafariOptimalActionTest.h"
+#include "Programs/TestPrograms/PokemonFRLG_TestPartyInference.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+
+
+PanelListFactory::PanelListFactory()
+    : PanelListDescriptor(
+        Pokemon::STRING_POKEMON + " FireRed and LeafGreen",
+        RESOURCE_PATH() + "CategoryIcons/PokemonFRLG.png"
+    )
+{}
+
+std::vector<PanelEntry> PanelListFactory::make_panels() const{
+    std::vector<PanelEntry> ret;
+    
+    ret.emplace_back("---- Settings ----");
+    ret.emplace_back(make_OptionsPanel<GameSettingsPanel>());
+
+    ret.emplace_back("---- Farming ----");
+    ret.emplace_back(make_SingleSwitchProgram<NuggetBridgeFarmer>());
+    ret.emplace_back(make_SingleSwitchProgram<PickupFarmer>());
+    ret.emplace_back(make_SingleSwitchProgram<EvTrainer>());
+    ret.emplace_back(make_SingleSwitchProgram<HeldItemFarmerSafariZone>());
+    ret.emplace_back(make_SingleSwitchProgram<ItemDuplication>());
+    ret.emplace_back(make_SingleSwitchProgram<EliteFourFarmer>());
+
+    //ret.emplace_back("---- General ----");
+
+    ret.emplace_back("---- Shiny Hunting  ----");
+    ret.emplace_back(make_SingleSwitchProgram<GiftReset>());
+    ret.emplace_back(make_SingleSwitchProgram<LegendaryReset>());
+    ret.emplace_back(make_SingleSwitchProgram<LegendaryRunAway>());
+    ret.emplace_back(make_SingleSwitchProgram<ShinyHuntFishing>());
+    ret.emplace_back(make_SingleSwitchProgram<ShinyHuntOverworld>());
+    ret.emplace_back(make_SingleSwitchProgram<PrizeCornerReset>());
+
+    ret.emplace_back("---- RNG Manipulation  ----");
+    ret.emplace_back(make_SingleSwitchProgram<RngHelper>());
+    ret.emplace_back(make_SingleSwitchProgram<SidHelper>());
+    ret.emplace_back(make_SingleSwitchProgram<StarterRng>());
+    ret.emplace_back(make_SingleSwitchProgram<GiftRng>());
+    ret.emplace_back(make_SingleSwitchProgram<StaticRng>());
+    ret.emplace_back(make_SingleSwitchProgram<WildRng>());
+    ret.emplace_back(make_SingleSwitchProgram<RoamingLegendaryRng>());
+    ret.emplace_back(make_SingleSwitchProgram<EggRng>());
+
+    if (IS_BETA_VERSION || STATIC_GLOBALS.DEVELOPER_MODE){
+        ret.emplace_back("---- Untested/Beta/WIP ----");
+        ret.emplace_back(make_SingleSwitchProgram<BoxSorter>());
+    }
+
+    if (STATIC_GLOBALS.DEVELOPER_MODE){
+        ret.emplace_back("---- Developer Tools ----");
+        ret.emplace_back(make_SingleSwitchProgram<SoundListener>());
+        ret.emplace_back(make_SingleSwitchProgram<ReadStats>());
+        ret.emplace_back(make_SingleSwitchProgram<ReadBattleLevelUp>());
+        ret.emplace_back(make_SingleSwitchProgram<ReadTrainerId>());
+        ret.emplace_back(make_SingleSwitchProgram<ReadEncounter>());
+        ret.emplace_back(make_SingleSwitchProgram<ReadBoxInfo>());
+        ret.emplace_back(make_SingleSwitchProgram<SafariOptimalActionTest>());
+        ret.emplace_back(make_SingleSwitchProgram<TestPartyInference>());
+    }
+
+    return ret;
+}
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/PokemonFRLG_Panels.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/PokemonFRLG_Panels.h
new file mode 100644
index 0000000000..b579755fb8
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/PokemonFRLG_Panels.h
@@ -0,0 +1,30 @@
+/*  Pokemon FRLG Panels
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonFRLG_Panels_H
+#define PokemonAutomation_PokemonFRLG_Panels_H
+
+#include "CommonFramework/Panels/PanelList.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+
+
+class PanelListFactory : public PanelListDescriptor{
+public:
+    PanelListFactory();
+private:
+    virtual std::vector<PanelEntry> make_panels() const override;
+};
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/PokemonFRLG_Settings.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/PokemonFRLG_Settings.cpp
new file mode 100644
index 0000000000..6a08282535
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/PokemonFRLG_Settings.cpp
@@ -0,0 +1,178 @@
+/*  Pokemon FRLG Settings
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Pokemon/Pokemon_Strings.h"
+
+#include "PokemonFRLG_Settings.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+using namespace Pokemon;
+
+
+
+GameSettings& GameSettings::instance(){
+    static GameSettings settings;
+    return settings;
+}
+GameSettings::~GameSettings(){
+    DEVICE.remove_listener(*this);
+    GAME_BOX.remove_listener(*this);
+    GAME_BOX.X.remove_listener(*this);
+    GAME_BOX.Y.remove_listener(*this);
+    GAME_BOX.WIDTH.remove_listener(*this);
+    GAME_BOX.HEIGHT.remove_listener(*this);
+}
+GameSettings::GameSettings()
+    : BatchOption(LockMode::LOCK_WHILE_RUNNING)
+    , m_game_device_settings("<font size=4><b>Game Device settings:</b></font>")
+    , DEVICE(
+        "<b>Device:</b><br>Select the device the game is running on. "
+        "Refer to the documentation for specific setups.",
+        {
+            {Device::switch_1_2,            "switch_1_2",           "Nintendo Switch 1 and 2"},
+            //{Device::dev_test,              "dev_test",             "dev test rg35xx"},
+            //{Device::custom,                "custom",               "Custom"},
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        Device::switch_1_2
+    )
+    , GAME_BOX(
+        "Game Box: The part of the screen containing the actual video feed.",
+        LockMode::LOCK_WHILE_RUNNING,
+        GroupOption::EnableMode::ALWAYS_ENABLED,
+        true,
+        {0.09375, 0.00462963, 0.8125, 0.962963}
+    )
+    , m_soft_reset_timings("<font size=4><b>Soft Reset Timings:</b></font>")
+    , SELECT_BUTTON_MASH0(
+        "<b>Start Button Mash:</b><br>Mash select for this long after a soft reset to get to Press Start.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "5000 ms"
+    )
+    , ENTER_GAME_WAIT0(
+        "<b>Enter Game Wait:</b><br>Wait this long for the game to load.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "3000 ms"
+    )
+    , ENTER_GAME_MASH0(
+        "<b>Enter Game Mash:</b><br>Mash B for this long after loading a save to bypass the \"Previously On Your Quest...\" screens.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "3000 ms"
+    )
+    , HANDLE_ONLINE_LICENSE_CHECK(
+        "<b>Handle Online License Check:</b><br>"
+        "Turn this on if your console checks the game's license online when it starts the game: "
+        "the game goes back to the Home menu for a few seconds before it starts. "
+        "The RNG programs' hard reset then waits for the game to start instead of using a fixed delay.",
+        LockMode::LOCK_WHILE_RUNNING,
+        false // default
+    )
+    , m_shiny_audio_settings("<font size=4><b>Shiny Audio Settings:</b></font>")
+    , SHINY_SOUND_THRESHOLD(
+        "<b>Shiny Sound Threshold:</b><br>Maximum error coefficient to trigger a shiny detection.",
+        LockMode::LOCK_WHILE_RUNNING,
+        0.80, 0, 1.0 //0.87
+    )
+    , SHINY_SOUND_LOW_FREQUENCY(
+        "<b>Shiny Sound Low Frequency (Hz):</b><br>High pass filter frequency for shiny sound.",
+        LockMode::LOCK_WHILE_RUNNING,
+        1000, 0, 48000 //2000
+    )
+    , m_catch_audio_settings("<font size=4><b>Catch Audio Settings:</b></font>")
+    , CATCH_FANFARE_THRESHOLD(
+        "<b>Shiny Sound Threshold:</b><br>Maximum error coefficient to trigger catch detection.",
+        LockMode::LOCK_WHILE_RUNNING,
+        0.80, 0, 1.0
+    )
+{
+    PA_ADD_STATIC(m_game_device_settings);
+    PA_ADD_OPTION(DEVICE);
+    PA_ADD_OPTION(GAME_BOX);
+    PA_ADD_STATIC(m_soft_reset_timings);
+    PA_ADD_OPTION(SELECT_BUTTON_MASH0);
+    PA_ADD_OPTION(ENTER_GAME_WAIT0);
+    PA_ADD_OPTION(ENTER_GAME_MASH0);
+    PA_ADD_OPTION(HANDLE_ONLINE_LICENSE_CHECK);
+    PA_ADD_STATIC(m_shiny_audio_settings);
+    PA_ADD_OPTION(SHINY_SOUND_THRESHOLD);
+    PA_ADD_OPTION(SHINY_SOUND_LOW_FREQUENCY);
+    PA_ADD_OPTION(m_catch_audio_settings);
+    PA_ADD_OPTION(CATCH_FANFARE_THRESHOLD);
+
+    GameSettings::on_config_value_changed(this);
+    DEVICE.add_listener(*this);
+    GAME_BOX.add_listener(*this);
+    GAME_BOX.X.add_listener(*this);
+    GAME_BOX.Y.add_listener(*this);
+    GAME_BOX.WIDTH.add_listener(*this);
+    GAME_BOX.HEIGHT.add_listener(*this);
+}
+
+void GameSettings::on_config_value_changed(void* object){
+    switch (DEVICE){
+    case Device::switch_1_2:
+        GAME_BOX.X.set(0.09375);
+        GAME_BOX.Y.set(0.00462963);
+        GAME_BOX.WIDTH.set(0.8125);
+        GAME_BOX.HEIGHT.set(0.962963);
+        GAME_BOX.set_visibility(ConfigOptionState::DISABLED);
+        break;
+    case Device::dev_test:
+        GAME_BOX.X.set(0.125);
+        GAME_BOX.Y.set(0.0564814814814815);
+        GAME_BOX.WIDTH.set(0.7494791666666667);
+        GAME_BOX.HEIGHT.set(0.8861111111111111);
+        GAME_BOX.set_visibility(ConfigOptionState::DISABLED);
+        break;
+    case Device::custom:
+        GAME_BOX.set_visibility(ConfigOptionState::ENABLED);
+        break;
+    default:
+        GAME_BOX.X.set(0.09375);
+        GAME_BOX.Y.set(0.00462963);
+        GAME_BOX.WIDTH.set(0.8125);
+        GAME_BOX.HEIGHT.set(0.962963);
+        GAME_BOX.set_visibility(ConfigOptionState::ENABLED);
+        break;
+    }
+}
+
+
+
+GameSettings_Descriptor::GameSettings_Descriptor()
+    : OptionsPanelDescriptor(
+        "PokemonFRLG:GlobalSettings",
+        STRING_POKEMON + " FRLG", "Game Settings",
+        "Programs/PokemonFRLG/FRLGSettings.html",
+        "Global " + STRING_POKEMON + " FireRed and LeafGreen Settings",
+        PanelQualityStanding::OFFICIAL
+    )
+{}
+
+
+
+GameSettingsPanel::GameSettingsPanel()
+    : settings(GameSettings::instance())
+{
+    PA_ADD_OPTION(settings);
+}
+
+
+
+
+
+}
+}
+}
+
+
+
+
+
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/PokemonFRLG_Settings.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/PokemonFRLG_Settings.h
new file mode 100644
index 0000000000..83583b1afb
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/PokemonFRLG_Settings.h
@@ -0,0 +1,77 @@
+/*  Pokemon FRLG Settings
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonFRLG_Settings_H
+#define PokemonAutomation_PokemonFRLG_Settings_H
+
+#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "Common/Cpp/Options/EnumDropdownOption.h"
+#include "Common/Cpp/Options/StaticTextOption.h"
+#include "Common/Cpp/Options/FloatingPointOption.h"
+#include "Common/Cpp/Options/TimeDurationOption.h"
+#include "CommonFramework/Options/BoxOption.h"
+#include "CommonFramework/Panels/OptionsPanel.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+
+class GameSettings : public BatchOption, private ConfigOption::Listener{
+    ~GameSettings();
+    GameSettings();
+public:
+    static GameSettings& instance();
+
+    enum class Device{
+        switch_1_2,
+        dev_test,
+        custom,
+    };
+
+    SectionDividerOption m_game_device_settings;
+    EnumDropdownOption<Device> DEVICE;
+
+    BoxOption GAME_BOX;
+
+    SectionDividerOption m_soft_reset_timings;
+    MillisecondsOption SELECT_BUTTON_MASH0;
+    MillisecondsOption ENTER_GAME_WAIT0;
+    MillisecondsOption ENTER_GAME_MASH0;
+    BooleanCheckBoxOption HANDLE_ONLINE_LICENSE_CHECK;
+
+    SectionDividerOption m_shiny_audio_settings;
+    FloatingPointOption SHINY_SOUND_THRESHOLD;
+    FloatingPointOption SHINY_SOUND_LOW_FREQUENCY;
+
+    SectionDividerOption m_catch_audio_settings;
+    FloatingPointOption CATCH_FANFARE_THRESHOLD;
+
+private:
+    virtual void on_config_value_changed(void* object) override;
+};
+
+
+
+class GameSettings_Descriptor : public OptionsPanelDescriptor{
+public:
+    GameSettings_Descriptor();
+};
+
+
+class GameSettingsPanel : public OptionsPanelInstance{
+public:
+    using Descriptor = GameSettings_Descriptor;
+    GameSettingsPanel();
+private:
+    GameSettings& settings;
+};
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/PokemonFRLG_Tests.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/PokemonFRLG_Tests.cpp
new file mode 100644
index 0000000000..d734e275f7
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/PokemonFRLG_Tests.cpp
@@ -0,0 +1,344 @@
+/*  Pokemon FRLG Tests
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <fstream>
+#include "Common/Cpp/Filesystem/Filesystem.h"
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "CommonFramework/StaticGlobals.h"
+#include "Inference/Box/PokemonFRLG_BoxCellOccupiedDetector.h"
+#include "Inference/Box/PokemonFRLG_BoxCellReader.h"
+#include "Inference/Box/PokemonFRLG_BoxGenderReader.h"
+#include "Inference/Box/PokemonFRLG_BoxSelectionModeDetector.h"
+#include "Inference/Dialogs/PokemonFRLG_BattleDialogs.h"
+#include "Inference/Dialogs/PokemonFRLG_DialogDetector.h"
+#include "Inference/Dialogs/PokemonFRLG_PrizeSelectDetector.h"
+#include "Inference/Map/PokemonFRLG_PokemonLeagueDetectors.h"
+#include "Inference/Menus/PokemonFRLG_BagDetector.h"
+#include "Inference/Menus/PokemonFRLG_PartyEmptySlotDetector.h"
+#include "Inference/Menus/PokemonFRLG_PartyHeldItemDetector.h"
+#include "Inference/Menus/PokemonFRLG_PartyMenuDetector.h"
+#include "Inference/PokemonFRLG_BattleLevelUpReader.h"
+#include "Inference/PokemonFRLG_BattleSelectionArrowDetector.h"
+#include "Inference/PokemonFRLG_PartyLevelUpReader.h"
+#include "Inference/PokemonFRLG_ShinySymbolDetector.h"
+#include "Inference/PokemonFRLG_StatsReader.h"
+#include "Inference/PokemonFRLG_TrainerIdReader.h"
+#include "Inference/PokemonFRLG_WildEncounterReader.h"
+#include "PokemonFRLG_Navigation.h"
+#include "Tests/TestUtils.h"
+
+#include "PokemonFRLG_Tests.h"
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+
+namespace{
+
+class NullLogger : public Logger{
+public:
+    virtual void log(const std::string&, Color) override{}
+};
+
+std::string button_name(Button button){
+    return button == BUTTON_A ? "A" : button == BUTTON_B ? "B" : "?";
+}
+
+// Steps that return scripted events, and record what exit_wild_battle() asked for.
+class ScriptedWildBattleExit : public WildBattleExitActions{
+public:
+    // Returned by the press steps in turn; None once used up. Mashing B only watches for the
+    // battle to end, so it takes the next event only if that is BattleExited.
+    std::vector<WildBattleExitEvent> events;
+    // Returned by evolution_started() in turn; false once used up.
+    std::vector<bool> evolutions;
+    // How many overworld checks fail before one finds it.
+    int overworld_misses = 0;
+
+    std::vector<std::string> steps;
+    // Seconds spent in steps that ran to their timeout, and waiting for an evolution: time in
+    // which the player sees nothing happen.
+    int idle_seconds = 0;
+
+    virtual WildBattleExitEvent mash_b_until_battle_exited() override{
+        steps.push_back("mash-B");
+        if (m_next_event < events.size() && events[m_next_event] == WildBattleExitEvent::BattleExited){
+            return events[m_next_event++];
+        }
+        idle_seconds += 20;
+        return WildBattleExitEvent::None;
+    }
+    virtual WildBattleExitEvent press_until_dialog(Button button) override{
+        steps.push_back("press-" + button_name(button));
+        WildBattleExitEvent event = next_event();
+        if (event == WildBattleExitEvent::None){
+            idle_seconds += 30;
+        }
+        return event;
+    }
+    virtual bool evolution_started() override{
+        steps.push_back("evolution?");
+        return m_next_evolution < evolutions.size() && evolutions[m_next_evolution++];
+    }
+    virtual void wait_for_evolution() override{
+        steps.push_back("wait");
+        idle_seconds += 20;
+    }
+    virtual void advance_dialog() override{
+        steps.push_back("advance");
+    }
+    virtual void answer_move_prompt(Button button) override{
+        steps.push_back("answer-" + button_name(button));
+    }
+    virtual bool return_to_overworld() override{
+        steps.push_back("overworld?");
+        return overworld_misses-- <= 0;
+    }
+
+private:
+    WildBattleExitEvent next_event(){
+        return m_next_event < events.size() ? events[m_next_event++] : WildBattleExitEvent::None;
+    }
+
+    size_t m_next_event = 0;
+    size_t m_next_evolution = 0;
+};
+
+struct WildBattleExitScenario{
+    std::string name;
+    std::vector<WildBattleExitEvent> events = {};
+    std::vector<bool> evolutions = {};
+    int overworld_misses = 0;
+    bool stop_on_move_learn = false;
+    bool prevent_evolution = false;
+    WildBattleExitResult expected_result = WildBattleExitResult::Exited;
+    std::string expected_steps;
+    int expected_idle_seconds = 0;
+};
+
+std::string result_name(WildBattleExitResult result){
+    switch (result){
+    case WildBattleExitResult::Exited:                 return "Exited";
+    case WildBattleExitResult::ExitedAfterMoveLearn:   return "ExitedAfterMoveLearn";
+    case WildBattleExitResult::StoppedOnMoveLearn:     return "StoppedOnMoveLearn";
+    case WildBattleExitResult::Failed:                 return "Failed";
+    }
+    return "?";
+}
+
+class Test_ExitWildBattle : public UnitTest{
+public:
+    Test_ExitWildBattle(WildBattleExitScenario scenario)
+        : UnitTest("PokemonFRLG::ExitWildBattle - " + scenario.name)
+        , m_scenario(std::move(scenario))
+    {}
+
+    virtual UnitTestResult run(Logger&, CancellableScope&) const override{
+        ScriptedWildBattleExit actions;
+        actions.events = m_scenario.events;
+        actions.evolutions = m_scenario.evolutions;
+        actions.overworld_misses = m_scenario.overworld_misses;
+
+        NullLogger logger;
+        const WildBattleExitResult result = exit_wild_battle(
+            logger, actions, m_scenario.stop_on_move_learn, m_scenario.prevent_evolution
+        );
+        if (result != m_scenario.expected_result){
+            return "Expected " + result_name(m_scenario.expected_result) + ", got " + result_name(result);
+        }
+        std::string steps;
+        for (const std::string& step : actions.steps){
+            if (!steps.empty()){
+                steps += ' ';
+            }
+            steps += step;
+        }
+        if (steps != m_scenario.expected_steps){
+            return "Expected steps: " + m_scenario.expected_steps + "\nActual steps:   " + steps;
+        }
+        if (actions.idle_seconds != m_scenario.expected_idle_seconds){
+            return "Expected " + std::to_string(m_scenario.expected_idle_seconds) + " idle seconds, got "
+                + std::to_string(actions.idle_seconds);
+        }
+        return true;
+    }
+
+private:
+    const WildBattleExitScenario m_scenario;
+};
+
+void add_tests_ExitWildBattle(UnitTestDatabase& database){
+    using enum WildBattleExitEvent;
+    const WildBattleExitScenario scenarios[] = {
+        {
+            .name = "battle exits",
+            .events = {BattleExited},
+            .expected_steps = "mash-B evolution?",
+        },
+        {
+            // Mashing B did not end the battle, so it presses B until a dialog shows.
+            .name = "dialog is advanced",
+            .events = {AdvanceDialog, BattleExited},
+            .expected_steps = "mash-B press-B advance press-B evolution?",
+            .expected_idle_seconds = 20,
+        },
+        {
+            // Decline "forget a move?" with B, then confirm "stop learning?" with A.
+            .name = "new move is declined",
+            .events = {MoveLearnPrompt, MoveLearnPrompt, BattleExited},
+            .expected_result = WildBattleExitResult::ExitedAfterMoveLearn,
+            .expected_steps = "mash-B press-B answer-B press-A answer-A press-A evolution?",
+            .expected_idle_seconds = 20,
+        },
+        {
+            .name = "stops at a new move when asked",
+            .events = {MoveLearnPrompt},
+            .stop_on_move_learn = true,
+            .expected_result = WildBattleExitResult::StoppedOnMoveLearn,
+            .expected_steps = "mash-B press-B",
+            .expected_idle_seconds = 20,
+        },
+        {
+            // After an evolution nothing ends the battle again, so the overworld is checked
+            // right after mashing B, without pressing B until the deadline first.
+            .name = "evolution",
+            .events = {BattleExited},
+            .evolutions = {true},
+            .expected_steps = "mash-B evolution? wait mash-B overworld?",
+            .expected_idle_seconds = 40,
+        },
+        {
+            // Mashing B right away cancels the evolution.
+            .name = "prevented evolution",
+            .events = {BattleExited},
+            .evolutions = {true},
+            .prevent_evolution = true,
+            .expected_steps = "mash-B evolution? mash-B overworld?",
+            .expected_idle_seconds = 20,
+        },
+        {
+            // A move to learn after the evolution keeps the overworld from being found, so it
+            // goes back to pressing B, which finds the move-learn prompt.
+            .name = "evolution then new move is declined",
+            .events = {BattleExited, MoveLearnPrompt, MoveLearnPrompt},
+            .evolutions = {true},
+            .overworld_misses = 1,
+            .expected_result = WildBattleExitResult::ExitedAfterMoveLearn,
+            .expected_steps =
+                "mash-B evolution? wait mash-B overworld? "
+                "press-B answer-B press-A answer-A press-A overworld?",
+            .expected_idle_seconds = 70,
+        },
+        {
+            // If the overworld is not found after the evolution, it goes back to pressing B.
+            .name = "evolution and overworld not found",
+            .events = {BattleExited},
+            .evolutions = {true},
+            .overworld_misses = 100,
+            .expected_result = WildBattleExitResult::Failed,
+            .expected_steps =
+                "mash-B evolution? wait mash-B overworld? "
+                "press-B overworld? press-B overworld? press-B overworld? "
+                "press-B overworld? press-B overworld? press-B overworld?",
+            .expected_idle_seconds = 220,
+        },
+        {
+            .name = "gives up when the overworld is not found",
+            .overworld_misses = 100,
+            .expected_result = WildBattleExitResult::Failed,
+            .expected_steps =
+                "mash-B press-B overworld? press-B overworld? press-B overworld? "
+                "press-B overworld? press-B overworld? press-B overworld?",
+            .expected_idle_seconds = 200,
+        },
+    };
+    for (const WildBattleExitScenario& scenario : scenarios){
+        database.add<Test_ExitWildBattle>(scenario);
+    }
+}
+
+}
+
+
+void add_tests(UnitTestDatabase& database){
+    add_tests_AdvanceWhiteDialogDetector(database);
+    add_tests_BoxCellOccupiedDetector(database);
+    add_tests_BoxCellReader(database);
+    add_tests_BoxGenderReader(database);
+    add_tests_BoxSelectionModeDetector(database);
+    add_tests_SelectionDialogDetector(database);
+    add_tests_ShinySymbolDetector(database);
+    add_tests_PrizeSelectDetector(database);
+    add_tests_AdvanceBattleDialogDetector(database);
+    add_tests_BattleMenuDetector(database);
+    add_tests_StatsReader(database);
+    add_tests_WildEncounterReader(database);
+    add_tests_TrainerIdReader(database);
+    add_tests_PartyLevelUpReader(database);
+    add_tests_BattleLevelUpReader(database);
+    add_tests_PartyEmptySlotDetector(database);
+    add_tests_PartyHeldItemDetector(database);
+    add_tests_PartyMenuDetector(database);
+    add_tests_PartySlotDetector(database);
+    add_tests_EliteFourRoomDetector(database);
+    add_tests_HallOfFameSavingDetector(database);
+    add_tests_BattleMoveSelectionArrow(database);
+    add_tests_BagDetector(database);
+    add_tests_ExitWildBattle(database);
+}
+
+
+UnitTestResult check_against_golden_file(
+    const std::string& image_path,
+    const std::vector<std::string>& labels,
+    const std::vector<std::string>& values
+){
+    if (labels.size() != values.size()){
+        return "Error: check_against_golden_file() called with " +
+               std::to_string(labels.size()) + " labels for " +
+               std::to_string(values.size()) + " values.";
+    }
+    for (size_t c = 0; c < values.size(); c++){
+        if (values[c].empty() || values[c].find_first_of(" \t\r\n") != std::string::npos){
+            return "Error: value for \"" + labels[c] + "\" is empty or contains whitespace. "
+                   "The golden file cannot represent it.";
+        }
+    }
+
+    Filesystem::Path file_path(image_path);
+    Filesystem::Path golden_path =
+            file_path.parent_path() / ("_" + file_path.stem().string() + ".txt");
+
+    if (STATIC_GLOBALS.GENERATE_TEST_GOLDEN_FILES){
+        std::ofstream output_file(golden_path.stdpath());
+        if (!output_file.is_open()){
+            return "Error: cannot open " + golden_path.string() + " for writing.";
+        }
+        for (const std::string& value : values){
+            output_file << value << std::endl;
+        }
+        return true;
+    }
+
+    std::vector<std::string> targets;
+    if (!load_slug_list(golden_path.string(), targets)){
+        return "Error: cannot load golden file " + golden_path.string() + ".";
+    }
+    if (targets.size() != values.size()){
+        return "Error: golden file " + golden_path.string() + " has " +
+               std::to_string(targets.size()) + " values, expected " +
+               std::to_string(values.size()) + ".";
+    }
+    for (size_t c = 0; c < values.size(); c++){
+        TEST_RESULT_COMPONENT_EQUAL_STR(values[c], targets[c], labels[c]);
+    }
+    return true;
+}
+
+
+}
+}
+}
\ No newline at end of file
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/PokemonFRLG_Tests.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/PokemonFRLG_Tests.h
new file mode 100644
index 0000000000..ea7f1861a8
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/PokemonFRLG_Tests.h
@@ -0,0 +1,34 @@
+/*  Pokemon FRLG Tests
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonFRLG_Tests_H
+#define PokemonAutomation_PokemonFRLG_Tests_H
+
+#include <string>
+#include <vector>
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+
+
+void add_tests(UnitTestDatabase& database);
+
+//  Shared helper for the readers that produce several values from one image.
+UnitTestResult check_against_golden_file(
+    const std::string& image_path,
+    const std::vector<std::string>& labels,
+    const std::vector<std::string>& values
+);
+
+
+
+}
+}
+}
+#endif
\ No newline at end of file
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/BoxOrganization/PokemonFRLG_BoxOrganization.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/BoxOrganization/PokemonFRLG_BoxOrganization.cpp
new file mode 100644
index 0000000000..20854d4936
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/BoxOrganization/PokemonFRLG_BoxOrganization.cpp
@@ -0,0 +1,585 @@
+/*  Box Organization Helpers
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <algorithm>
+#include <sstream>
+#include <utility>
+#include "Common/Cpp/Exceptions.h"
+#include "Common/Cpp/Json/JsonArray.h"
+#include "Common/Cpp/Json/JsonObject.h"
+#include "Common/Cpp/Json/JsonValue.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "CommonTools/VisualDetectors/FrozenImageDetector.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "Pokemon/Resources/Pokemon_PokemonNames.h"
+#include "Pokemon/Resources/Pokemon_PokemonSlugs.h"
+#include "VideoGames/PokemonFRLG/Inference/Box/PokemonFRLG_BoxCellOccupiedDetector.h"
+#include "VideoGames/PokemonFRLG/Inference/Box/PokemonFRLG_BoxCellReader.h"
+#include "VideoGames/PokemonFRLG/Inference/Box/PokemonFRLG_BoxGenderReader.h"
+#include "VideoGames/PokemonFRLG/Inference/Box/PokemonFRLG_BoxSelectionModeDetector.h"
+#include "VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_SummaryDetector.h"
+#include "VideoGames/PokemonFRLG/Inference/PokemonFRLG_SelectionArrowDetector.h"
+#include "VideoGames/PokemonFRLG/Inference/PokemonFRLG_ShinySymbolDetector.h"
+#include "VideoGames/PokemonFRLG/Inference/PokemonFRLG_StatsReader.h"
+#include "VideoGames/PokemonFRLG/PokemonFRLG_Settings.h"
+#include "PokemonFRLG_BoxOrganization.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+using namespace Pokemon;
+using namespace std::chrono_literals;
+
+namespace{
+
+template <typename T>
+std::string level_str(const T& level){
+    if constexpr (requires { level.has_value(); }){
+        return level.has_value() ? std::to_string(*level) : "?";
+    }else{
+        return std::to_string(level);
+    }
+}
+
+
+void move_cursor_to(
+    SingleSwitchProgramEnvironment& env, ProControllerContext& context,
+    const BoxSelectionModeDetector& detector, BoxCursor& cursor, const BoxCursor& destination,
+    BoxSelectionMode mode
+){
+    std::ostringstream ss;
+    ss << "Moving cursor from " << cursor << " to " << destination;
+    env.log(ss.str());
+
+    while (cursor.box != destination.box){
+        const bool forward = cursor.box < destination.box;
+        pbf_press_button(context, forward ? BUTTON_R : BUTTON_L, 80ms, 600ms);
+        context.wait_for_all_requests();
+        if (forward){
+            cursor.box++;
+        }else{
+            cursor.box--;
+        }
+    }
+
+    // Blindly move the cursor to the destination cell. Verify destination, and retry if necessary.
+    for (size_t attempts = 0; attempts < 5; attempts++){
+        const bool down = cursor.row < destination.row;
+        const size_t row_steps = down ? destination.row - cursor.row : cursor.row - destination.row;
+        for (size_t step = 0; step < row_steps; step++){
+            pbf_press_dpad(context, down ? DPAD_DOWN : DPAD_UP, 80ms, 240ms);
+        }
+        const size_t right_steps = (destination.column + BOX_COLS - cursor.column) % BOX_COLS;
+        const size_t left_steps = (cursor.column + BOX_COLS - destination.column) % BOX_COLS;
+        const bool right = right_steps <= left_steps;
+        const size_t column_steps = right ? right_steps : left_steps;
+        for (size_t step = 0; step < column_steps; step++){
+            pbf_press_dpad(context, right ? DPAD_RIGHT : DPAD_LEFT, 80ms, 240ms);
+        }
+
+        pbf_wait(context, 200ms);
+        context.wait_for_all_requests();
+        const auto selection = detector.detect(env.console.video().snapshot());
+        if (!selection || selection->location != BoxSelectionLocation::Grid || selection->mode != mode){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "Box Sorter: Unable to detect the expected selection hand in the box grid.", env.console
+            );
+        }
+        cursor.row = selection->row;
+        cursor.column = selection->column;
+        if (cursor.row == destination.row && cursor.column == destination.column){
+            return;
+        }
+    }
+    OperationFailedExceptionWithScreenshot::fire(
+        ErrorReportMode::SEND_ERROR_REPORT, "Box Sorter: Unable to reach the requested box cell.", env.console
+    );
+}
+
+BoxSelection wait_for_normal_selection(
+    SingleSwitchProgramEnvironment& env, ProControllerContext& context
+){
+    BoxSelectionModeWatcher selection(COLOR_RED, BoxSelectionMode::Normal, BoxSelectionLocation::Grid);
+    if (wait_until(env.console, context, 5s, {selection}) < 0){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "Box Sorter: Unable to detect the regular selection hand in the box grid.", env.console
+        );
+    }
+    return *selection.last_detected();
+}
+
+// Wait for the summary animation to finish and verify summary page detected.
+void wait_for_summary_animation(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    FrozenImageDetector still(COLOR_CYAN, GameSettings::instance().GAME_BOX, 500ms, 2.0);
+    if (wait_until(env.console, context, 10s, {still}) < 0){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "Box Sorter: Summary animation did not finish.", env.console
+        );
+    }
+    SummaryDetector summary(COLOR_RED);
+    if (!summary.detect(env.console.video().snapshot())){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "Box Sorter: Expected the first summary page.", env.console
+        );
+    }
+}
+
+void open_summary_screen(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    SelectionArrowWatcher move_arrow(COLOR_RED, &env.console.overlay(), { 0.6259, 0.1621, 0.0373, 0.0906 });
+    SelectionArrowWatcher summary_arrow(COLOR_RED, &env.console.overlay(), { 0.6267, 0.2635, 0.0373, 0.0799 });
+    pbf_press_button(context, BUTTON_A, 80ms, 200ms);
+    context.wait_for_all_requests();
+    if (wait_until(env.console, context, 5s, { move_arrow }) < 0){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT, "Box Sorter: Move menu arrow was not detected.", env.console
+        );
+    }
+    pbf_press_dpad(context, DPAD_DOWN, 80ms, 200ms);
+    context.wait_for_all_requests();
+    if (wait_until(env.console, context, 5s, { summary_arrow }) < 0){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT, "Box Sorter: Summary menu arrow was not detected.", env.console
+        );
+    }
+    pbf_press_button(context, BUTTON_A, 80ms, 300ms);
+    context.wait_for_all_requests();
+    SummaryWatcher summary(COLOR_RED);
+    if (wait_until(env.console, context, 5s, { summary }) < 0){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT, "Box Sorter: Unable to open the summary screen.", env.console
+        );
+    }
+    wait_for_summary_animation(env, context);
+}
+
+// Scroll through the detected pokemon and read their summary screens.
+// Currently only reads shininess, but could be extended to read other summary information.
+void scan_box_summaries(
+    SingleSwitchProgramEnvironment& env, ProControllerContext& context,
+    const BoxSelectionModeDetector& selection_detector, BoxCursor& cursor,
+    std::vector<std::optional<CollectedPokemonInfo>>& boxes_data
+){
+    const size_t box_start = cursor.box * BOX_ROWS * BOX_COLS;
+    std::vector<size_t> occupied;
+    for (size_t index = box_start; index < boxes_data.size(); index++){
+        if (boxes_data[index]){
+            occupied.push_back(index);
+        }
+    }
+    if (occupied.empty()){
+        return;
+    }
+
+    env.log("Reading shininess in box " + std::to_string(cursor.box + 1));
+    move_cursor_to(env, context, selection_detector, cursor, BoxCursor(occupied.back()), BoxSelectionMode::Normal);
+    
+    open_summary_screen(env, context);
+
+    StatsReader reader;
+    ShinySymbolDetector shiny_detector(COLOR_YELLOW);
+    VideoOverlaySet overlays(env.console.overlay());
+    shiny_detector.make_overlays(overlays);
+    for (size_t remaining = occupied.size(); remaining > 0; remaining--){
+        const size_t index = occupied[remaining - 1];
+        auto& pokemon = *boxes_data[index];
+        const VideoSnapshot screen = env.console.video().snapshot();
+        PokemonFRLG_Stats current_stats;
+        reader.read_page1(env.logger(), Language::English, screen, current_stats);
+        if (current_stats.name != pokemon.name_slug || current_stats.level != pokemon.level){
+            std::ostringstream ss;
+            ss << "Box Sorter: Summary species mismatch at " << BoxCursor(index)
+               << " (expected: " << pokemon.name_slug << " (level " << level_str(pokemon.level)
+                              << "), read: " << current_stats.name << " (level " << level_str(current_stats.level) << ")).";
+            OperationFailedExceptionWithScreenshot::fire(ErrorReportMode::SEND_ERROR_REPORT, ss.str(), env.console);
+        }
+        pokemon.shiny = shiny_detector.read(env.logger(), screen);
+        pbf_press_dpad(context, DPAD_UP, 80ms, 300ms);
+        context.wait_for_all_requests();
+        wait_for_summary_animation(env, context);
+    }
+    pbf_press_button(context, BUTTON_B, 80ms, 300ms);
+    context.wait_for_all_requests();
+    const BoxSelection selection = wait_for_normal_selection(env, context);
+    cursor.row = selection.row;
+    cursor.column = selection.column;
+    const BoxCursor first(occupied.front());
+    if (cursor.row != first.row || cursor.column != first.column){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "Box Sorter: Summary scan did not return to the first occupied cell.", env.console
+        );
+    }
+}
+
+} // namespace
+
+BoxOrganizationStats::BoxOrganizationStats()
+    : pokemon(m_stats["Pokemon"])
+    , empty(m_stats["Empty Slots"])
+    , compares(m_stats["Compares"])
+    , swaps(m_stats["Swaps"])
+{
+    m_display_order.emplace_back("Pokemon");
+    m_display_order.emplace_back("Empty Slots");
+    m_display_order.emplace_back("Compares");
+    m_display_order.emplace_back("Swaps");
+}
+
+BoxSortingPlan make_box_sorting_plan(
+    const std::vector<std::optional<CollectedPokemonInfo>>& boxes_data,
+    const std::vector<std::optional<CollectedPokemonInfo>>& boxes_sorted
+){
+    const size_t count = boxes_data.size();
+    if (boxes_sorted.size() != count){
+        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Box catalogue sizes do not match.");
+    }
+    BoxSortingPlan plan;
+    // Give each Pokemon a unique source index, including identical duplicates.
+    std::vector<size_t> destinations(count, count);
+    std::vector<bool> claimed(count, false);
+    std::vector<std::optional<size_t>> slots(count);
+    for (size_t source = 0; source < count; source++){
+        if (!boxes_data[source]){
+            continue;
+        }
+        slots[source] = source;
+        plan.compares++;
+        if (boxes_data[source] == boxes_sorted[source]){
+            // Leave Pokemon already in a valid final slot untouched.
+            destinations[source] = source;
+            claimed[source] = true;
+        }
+    }
+    for (size_t source = 0; source < count; source++){
+        if (!boxes_data[source] || destinations[source] != count){
+            continue;
+        }
+        for (size_t destination = 0; destination < count; destination++){
+            if (claimed[destination]){
+                continue;
+            }
+            plan.compares++;
+            if (boxes_data[source] == boxes_sorted[destination]){
+                destinations[source] = destination;
+                claimed[destination] = true;
+                break;
+            }
+        }
+        if (destinations[source] == count){
+            throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Pokemon missing from sorted box catalogue.");
+        }
+    }
+    for (size_t destination = 0; destination < count; destination++){
+        if (boxes_sorted[destination] && !claimed[destination]){
+            throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Sorted Pokemon missing from box catalogue.");
+        }
+    }
+
+    // Start open chains at slots that must end empty, then handle closed cycles.
+    // This avoids splitting a chain into several separate pickups.
+    for (size_t pass = 0; pass < 2; pass++){
+        for (size_t source = 0; source < count; source++){
+            if ((pass == 0 && boxes_sorted[source]) || !slots[source] || destinations[*slots[source]] == source){
+                continue;
+            }
+            std::vector<size_t> chain{source};
+            auto held = slots[source];
+            slots[source].reset();
+            while (held){
+                const size_t destination = destinations[*held];
+                chain.push_back(destination);
+                // Place the held Pokemon in its final slot and follow the displaced
+                // Pokemon to its own destination until reaching an empty cell.
+                std::swap(held, slots[destination]);
+            }
+            plan.chains.emplace_back(std::move(chain));
+        }
+    }
+    return plan;
+}
+
+bool is_viable_for_dex(
+    const LivingDexEntry& entry, const CollectedPokemonInfo& pokemon,
+    bool obey_gender_differences, bool shiny_dex
+){
+    if (entry.nat_id != pokemon.dex_number || (shiny_dex && !pokemon.shiny)){
+        return false;
+    }
+    if (obey_gender_differences && entry.has_gender_difference){
+        if (entry.slug.ends_with("-female") && pokemon.gender != StatsHuntGenderFilter::Female){
+            return false;
+        }
+        if (entry.slug.ends_with("-male") && pokemon.gender != StatsHuntGenderFilter::Male){
+            return false;
+        }
+    }
+    return true;
+}
+
+std::vector<std::optional<CollectedPokemonInfo>> make_living_dex_order(
+    Logger& logger,
+    const std::vector<std::optional<CollectedPokemonInfo>>& boxes_data,
+    const std::vector<LivingDexEntry>& living_dex_order,
+    bool obey_gender_differences, bool shiny_dex
+){
+    if (living_dex_order.size() > boxes_data.size()){
+        throw UserSetupError(logger, "Select enough boxes to hold the living dex template.");
+    }
+    std::vector<std::optional<CollectedPokemonInfo>> ordered(boxes_data.size());
+    std::vector<bool> used(boxes_data.size(), false);
+    // Reserve all viable Pokemon already in place before considering duplicates.
+    for (size_t i = 0; i < living_dex_order.size(); i++){
+        if (boxes_data[i] && is_viable_for_dex(living_dex_order[i], *boxes_data[i], obey_gender_differences, shiny_dex)){
+            ordered[i] = boxes_data[i];
+            used[i] = true;
+        }
+    }
+    for (size_t i = 0; i < living_dex_order.size(); i++){
+        if (ordered[i]){
+            continue;
+        }
+        for (size_t source = 0; source < boxes_data.size(); source++){
+            if (!used[source] && boxes_data[source] &&
+                is_viable_for_dex(living_dex_order[i], *boxes_data[source], obey_gender_differences, shiny_dex)
+                ){
+                ordered[i] = boxes_data[source];
+                used[source] = true;
+                break;
+            }
+        }
+    }
+    size_t destination = living_dex_order.size();
+    for (size_t source = 0; source < boxes_data.size(); source++){
+        if (used[source] || !boxes_data[source]){
+            continue;
+        }
+        if (destination == ordered.size()){
+            throw UserSetupError(logger,
+                "Not enough space after the living dex template for duplicates and other Pokemon. "
+                "Increase the number of boxes or remove extra Pokemon."
+            );
+        }
+        ordered[destination++] = boxes_data[source];
+    }
+    return ordered;
+}
+
+std::vector<LivingDexEntry> load_living_dex_template(const std::string& path){
+    const JsonValue json = load_json_file(path);
+    const JsonArray& entries = json.to_array_throw(path);
+    std::vector<LivingDexEntry> order;
+    order.reserve(entries.size());
+    for (const JsonValue& value : entries){
+        const JsonObject& entry = value.to_object_throw(path);
+        const int64_t nat_id = entry.get_integer_throw("natID", path);
+        if (nat_id < 1 || nat_id > 386){
+            throw FileException(nullptr, PA_CURRENT_FUNCTION, "Invalid FRLG National Dex number.", path);
+        }
+        order.push_back({
+            (uint16_t)nat_id,
+            entry.get_string_throw("slug", path),
+            entry.get_boolean_throw("has_gender_difference", path),
+            });
+    }
+    if (order.empty()){
+        throw FileException(nullptr, PA_CURRENT_FUNCTION, "Living dex template is empty.", path);
+    }
+    return order;
+}
+
+std::string make_missing_living_dex_report(
+    const std::vector<std::optional<CollectedPokemonInfo>>& boxes_sorted,
+    const std::vector<LivingDexEntry>& living_dex_order
+){
+    if (living_dex_order.size() > boxes_sorted.size()){
+        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Living dex template exceeds organized box slots.");
+    }
+    std::vector<uint16_t> missing;
+    for (size_t i = 0; i < living_dex_order.size(); i++){
+        if (!boxes_sorted[i]){
+            missing.push_back(living_dex_order[i].nat_id);
+        }
+    }
+    std::sort(missing.begin(), missing.end());
+    std::string report;
+    for (uint16_t dex_number : missing){
+        const std::string& slug = NATIONAL_DEX_SLUGS().at(dex_number - 1);
+        report += std::to_string(dex_number) + " " + get_pokemon_name(slug).display_name() + "\n";
+    }
+    return report;
+}
+
+BoxOrganizationScan scan_box_data(
+    SingleSwitchProgramEnvironment& env, ProControllerContext& context,
+    const std::vector<SortingRule>& preferences, size_t num_boxes, bool read_shininess
+){
+    bool read_summary = read_shininess || std::any_of(preferences.begin(), preferences.end(), [](const SortingRule& rule){
+        return rule.sort_type == SortingRuleType::Shiny;
+    });
+    auto& stats = env.current_stats<BoxOrganizationStats>();
+    const size_t slot_count = num_boxes * BOX_ROWS * BOX_COLS;
+    BoxSelectionModeDetector selection_detector;
+    BoxCellOccupiedDetector occupied_detector(COLOR_BLUE);
+    BoxCellReader cell_reader;
+    BoxGenderReader gender_reader;
+    VideoOverlaySet overlays(env.console.overlay());
+    selection_detector.make_overlays(overlays);
+    occupied_detector.make_overlays(overlays);
+    cell_reader.make_overlays(overlays);
+    gender_reader.make_overlays(overlays);
+
+    context.wait_for_all_requests();
+
+    // Get selection hand into starting position
+    auto selection = selection_detector.detect(env.console.video().snapshot());
+    if (!selection){
+        throw UserSetupError(env.console, "Unable to detect the selection hand. Start in Move Pokemon with an empty hand.");
+    }
+    if (selection->closed){
+        throw UserSetupError(env.console, "Cannot start while holding a Pokemon. Put it down before starting the program.");
+    }
+    if (selection->location != BoxSelectionLocation::Grid){
+        // X moves the hand to the box title from anywhere.
+        pbf_press_button(context, BUTTON_X, 80ms, 400ms);
+        context.wait_for_all_requests();
+        selection = selection_detector.detect(env.console.video().snapshot());
+        if (!selection || selection->location != BoxSelectionLocation::BoxTile){
+            throw UserSetupError(env.console, "Unable to reach the box title. Start in Move Pokemon with an empty hand.");
+        }
+        pbf_press_dpad(context, DPAD_DOWN, 80ms, 400ms);
+        context.wait_for_all_requests();
+        selection = selection_detector.detect(env.console.video().snapshot());
+    }
+    if (!selection || selection->location != BoxSelectionLocation::Grid){
+        throw UserSetupError(env.console, "Unable to enter the box grid from the box title.");
+    }
+    BoxCursor cursor(0, selection->row, selection->column);
+    if (read_summary && selection->mode != BoxSelectionMode::Normal){
+        pbf_press_button(context, BUTTON_MINUS, 80ms, 300ms);
+        context.wait_for_all_requests();
+        selection = wait_for_normal_selection(env, context);
+        cursor.row = selection->row;
+        cursor.column = selection->column;
+    }
+    const BoxSelectionMode scan_mode = selection->mode;
+    move_cursor_to(env, context, selection_detector, cursor, BoxCursor(0, 0, 0), scan_mode);
+
+    std::vector<std::optional<CollectedPokemonInfo>> boxes_data;
+    boxes_data.reserve(slot_count);
+
+    const size_t slots_per_box = BOX_ROWS * BOX_COLS;
+    for (size_t box = 0; box < num_boxes; box++){
+        const std::string message = "Checking box " + std::to_string(box + 1)
+            + "/" + std::to_string(num_boxes);
+        env.log(message);
+        env.console.overlay().add_log(message);
+        for (size_t slot = 0; slot < slots_per_box; slot++){
+            const BoxCursor destination(box * slots_per_box + slot);
+            move_cursor_to(env, context, selection_detector, cursor, destination, scan_mode);
+            pbf_wait(context, 200ms);
+            context.wait_for_all_requests();
+            const VideoSnapshot screen = env.console.video().snapshot();
+            if (!occupied_detector.detect(screen)){
+                boxes_data.emplace_back(std::nullopt);
+                stats.empty++;
+                env.update_stats();
+                continue;
+            }
+
+            const std::string name = cell_reader.read_name(env.logger(), Language::English, screen);
+            const int level = cell_reader.read_level(env.logger(), screen);
+            const auto& dex_numbers = SLUGS_TO_NATIONAL_DEX();
+            const auto dex = dex_numbers.find(name);
+            if (dex == dex_numbers.end() || dex->second == 0 || dex->second > 386 || level < 1 || level > 100){
+                std::ostringstream ss;
+                ss << "Box Sorter: Unable to read species/level at " << cursor
+                   << " (species: " << name << ", level: " << level << ").";
+                OperationFailedExceptionWithScreenshot::fire(
+                    ErrorReportMode::SEND_ERROR_REPORT, ss.str(), env.console
+                );
+            }
+
+            CollectedPokemonInfo pokemon;
+            pokemon.preferences = &preferences;
+            pokemon.dex_number = (uint16_t)dex->second;
+            pokemon.name_slug = name;
+            pokemon.level = (uint8_t)level;
+            pokemon.gender = gender_reader.read(screen);
+            boxes_data.emplace_back(std::move(pokemon));
+            env.console.overlay().add_log(create_overlay_info(*boxes_data.back()) + " Lv. " + std::to_string(level));
+            stats.pokemon++;
+            env.update_stats();
+        }
+        if (read_summary){
+            scan_box_summaries(env, context, selection_detector, cursor, boxes_data);
+        }
+    }
+    return {std::move(boxes_data), cursor, scan_mode};
+}
+
+void execute_box_sorting_plan(
+    SingleSwitchProgramEnvironment& env, ProControllerContext& context,
+    const BoxSortingPlan& plan, BoxCursor& cursor, BoxSelectionMode scan_mode
+){
+    auto& stats = env.current_stats<BoxOrganizationStats>();
+    BoxSelectionModeDetector selection_detector;
+    VideoOverlaySet overlays(env.console.overlay());
+    selection_detector.make_overlays(overlays);
+    if (scan_mode != BoxSelectionMode::Relocate){
+        pbf_press_button(context, BUTTON_MINUS, 80ms, 300ms);
+        context.wait_for_all_requests();
+    }
+
+    for (const auto& chain : plan.chains){
+        for (size_t step = 0; step < chain.size(); step++){
+            const BoxCursor destination(chain[step]);
+            std::ostringstream ss;
+            ss << (step == 0 ? "Picking up Pokemon at " : "Placing Pokemon at ") << destination;
+            env.log(ss.str());
+            move_cursor_to(env, context, selection_detector, cursor, destination, BoxSelectionMode::Relocate);
+            pbf_press_button(context, BUTTON_A, 80ms, 400ms);
+            context.wait_for_all_requests();
+            env.log("Step " + std::to_string(step + 1) + "/" + std::to_string(chain.size()) + " complete.");
+            auto selection = selection_detector.detect(env.console.video().snapshot());
+            if (!selection){
+                OperationFailedExceptionWithScreenshot::fire(
+                    ErrorReportMode::SEND_ERROR_REPORT,
+                    "Box Sorter: Unable to detect the selection hand after pressing A.", env.console
+                );
+            }
+            if (step == chain.size() - 1){
+                if (selection->closed){
+                    OperationFailedExceptionWithScreenshot::fire(
+                        ErrorReportMode::SEND_ERROR_REPORT,
+                        "Box Sorter: Unexpected closed hand at the end of the chain.", env.console
+                    );
+                }
+            } else if (!selection->closed){
+                OperationFailedExceptionWithScreenshot::fire(
+                    ErrorReportMode::SEND_ERROR_REPORT,
+                    "Box Sorter: Unexpected open hand before the end of the chain.", env.console
+                );
+            }
+            if (step != 0){
+                stats.swaps++;
+                env.update_stats();
+            }
+        }
+    }
+
+}
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/BoxOrganization/PokemonFRLG_BoxOrganization.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/BoxOrganization/PokemonFRLG_BoxOrganization.h
new file mode 100644
index 0000000000..27dc430f2e
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/BoxOrganization/PokemonFRLG_BoxOrganization.h
@@ -0,0 +1,93 @@
+/*  Box Organization Helpers
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonFRLG_BoxOrganization_H
+#define PokemonAutomation_PokemonFRLG_BoxOrganization_H
+
+#include <atomic>
+#include <cstdint>
+#include <optional>
+#include <vector>
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "Pokemon/Pokemon_BoxCursor.h"
+#include "Pokemon/Pokemon_CollectedPokemonInfo.h"
+#include "VideoGames/PokemonFRLG/Inference/Box/PokemonFRLG_BoxSelectionModeDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+struct BoxOrganizationStats : public StatsTracker{
+    BoxOrganizationStats();
+
+    std::atomic<uint64_t>& pokemon;
+    std::atomic<uint64_t>& empty;
+    std::atomic<uint64_t>& compares;
+    std::atomic<uint64_t>& swaps;
+};
+
+struct BoxSortingPlan{
+    // Pick up at the first slot, then place/swap at each remaining slot.
+    // Every placement is final and each chain ends with an empty hand.
+    std::vector<std::vector<size_t>> chains;
+    uint64_t compares = 0;
+};
+
+BoxSortingPlan make_box_sorting_plan(
+    const std::vector<std::optional<Pokemon::CollectedPokemonInfo>>& boxes_data,
+    const std::vector<std::optional<Pokemon::CollectedPokemonInfo>>& boxes_sorted
+);
+
+struct LivingDexEntry{
+    uint16_t nat_id;
+    std::string slug;
+    bool has_gender_difference;
+};
+
+bool is_viable_for_dex(
+    const LivingDexEntry& entry, const Pokemon::CollectedPokemonInfo& pokemon,
+    bool obey_gender_differences, bool shiny_dex = false
+);
+
+std::vector<std::optional<Pokemon::CollectedPokemonInfo>> make_living_dex_order(
+    Logger& logger,
+    const std::vector<std::optional<Pokemon::CollectedPokemonInfo>>& boxes_data,
+    const std::vector<LivingDexEntry>& living_dex_order,
+    bool obey_gender_differences, bool shiny_dex = false
+);
+
+// List empty template slots in National Dex order, with one number and English name per line.
+std::string make_missing_living_dex_report(
+    const std::vector<std::optional<Pokemon::CollectedPokemonInfo>>& boxes_sorted,
+    const std::vector<LivingDexEntry>& living_dex_order
+);
+
+std::vector<LivingDexEntry> load_living_dex_template(const std::string& path);
+
+struct BoxOrganizationScan{
+    std::vector<std::optional<Pokemon::CollectedPokemonInfo>> boxes_data;
+    Pokemon::BoxCursor cursor;
+    BoxSelectionMode mode;
+};
+
+// Detecting Shiny requires reading the summary screen, this is much slower than just reading the box data.
+BoxOrganizationScan scan_box_data(
+    SingleSwitchProgramEnvironment& env, ProControllerContext& context,
+    const std::vector<Pokemon::SortingRule>& preferences, size_t num_boxes,
+    bool read_shininess = false
+);
+
+void execute_box_sorting_plan(
+    SingleSwitchProgramEnvironment& env, ProControllerContext& context,
+    const BoxSortingPlan& plan, Pokemon::BoxCursor& cursor, BoxSelectionMode scan_mode
+);
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/BoxOrganization/PokemonFRLG_BoxSorter.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/BoxOrganization/PokemonFRLG_BoxSorter.cpp
new file mode 100644
index 0000000000..fdf5b5f545
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/BoxOrganization/PokemonFRLG_BoxSorter.cpp
@@ -0,0 +1,107 @@
+/*  Box Sorter
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <algorithm>
+#include "Common/Cpp/Exceptions.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonTools/StartupChecks/StartProgramChecks.h"
+#include "Pokemon/Pokemon_CollectedPokemonInfo.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "PokemonFRLG_BoxOrganization.h"
+#include "VideoGames/PokemonFRLG/PokemonFRLG_Navigation.h"
+#include "PokemonFRLG_BoxSorter.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+using namespace Pokemon;
+
+namespace{
+
+constexpr uint16_t MAX_BOXES = 14;
+
+}
+
+BoxSorter_Descriptor::BoxSorter_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonFRLG:BoxSorter",
+        Pokemon::STRING_POKEMON + " FRLG", "Box Sorter",
+        "Programs/PokemonFRLG/BoxSorter.html",
+        "Sort boxes of " + STRING_POKEMON + ". Start in Move " + STRING_POKEMON +
+        " with an empty hand in the first box to sort. Uses English species names.",
+        PanelQualityStanding::OFFICIAL_BETA,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+
+std::unique_ptr<StatsTracker> BoxSorter_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+BoxSorter::BoxSorter()
+    : NUM_BOXES(
+        "<b>Number of Boxes to Sort:</b><br>Starting with the current box and continuing to the right.",
+        LockMode::LOCK_WHILE_RUNNING, 1, 1, MAX_BOXES
+    )
+    , SORT_TABLE(
+        "<b>Sort Order Rules:</b><br>Sort order rules will be applied top to bottom.",
+        {SortingRuleType::DexNo, SortingRuleType::Level, SortingRuleType::Gender, SortingRuleType::Shiny}
+    )
+    , DRY_RUN(
+        "<b>Dry Run:</b><br>Scan boxes and write frlg-box_order.json and "
+        "frlg-box_order-sorted.json without moving any " + STRING_POKEMON + ".",
+        LockMode::LOCK_WHILE_RUNNING, false
+    )
+    , NOTIFICATIONS({&NOTIFICATION_PROGRAM_FINISH, &NOTIFICATION_ERROR_FATAL})
+{
+    PA_ADD_OPTION(NUM_BOXES);
+    PA_ADD_OPTION(SORT_TABLE);
+    PA_ADD_OPTION(DRY_RUN);
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+void BoxSorter::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    home_black_border_check(env.console, context);
+
+    const std::vector<SortingRule> preferences = SORT_TABLE.preferences();
+    if (preferences.empty()){
+        throw UserSetupError(env.console, "Select at least one sorting rule.");
+    }
+
+    auto& stats = env.current_stats<BoxSorter_Descriptor::Stats>();
+    BoxOrganizationScan scan = scan_box_data(env, context, preferences, (uint16_t)NUM_BOXES);
+    const auto& boxes_data = scan.boxes_data;
+
+    // Stable ordering avoids unnecessary moves for Pokemon with identical sort keys.
+    auto boxes_sorted = boxes_data;
+    std::stable_sort(boxes_sorted.begin(), boxes_sorted.end());
+    const BoxSortingPlan plan = make_box_sorting_plan(boxes_data, boxes_sorted);
+    stats.compares += plan.compares;
+    env.update_stats();
+    save_boxes_data_to_json(boxes_data, "frlg-box_order.json");
+    save_boxes_data_to_json(boxes_sorted, "frlg-box_order-sorted.json");
+    env.log("Saved current and sorted box catalogues.");
+
+    if (DRY_RUN){
+        env.log("Dry run complete.");
+        send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+        return;
+    }
+
+    env.log("Start sorting...");
+    execute_box_sorting_plan(env, context, plan, scan.cursor, scan.mode);
+
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+}
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/BoxOrganization/PokemonFRLG_BoxSorter.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/BoxOrganization/PokemonFRLG_BoxSorter.h
new file mode 100644
index 0000000000..af5234576c
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/BoxOrganization/PokemonFRLG_BoxSorter.h
@@ -0,0 +1,52 @@
+/*  Box Sorter
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonFRLG_BoxSorter_H
+#define PokemonAutomation_PokemonFRLG_BoxSorter_H
+
+#include <cstdint>
+#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "Pokemon/Options/Pokemon_BoxSortingTable.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+struct BoxOrganizationStats;
+
+class BoxSorter_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    BoxSorter_Descriptor();
+
+    using Stats = BoxOrganizationStats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+
+class BoxSorter : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = BoxSorter_Descriptor;
+    BoxSorter();
+
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+    virtual void start_program_border_check(VideoStream&, FeedbackType) override{}
+
+
+private:
+    SimpleIntegerOption<uint16_t> NUM_BOXES;
+    Pokemon::BoxSortingTable SORT_TABLE;
+    BooleanCheckBoxOption DRY_RUN;
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/Farming/PokemonFRLG_EliteFourFarmer.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/Farming/PokemonFRLG_EliteFourFarmer.cpp
new file mode 100644
index 0000000000..9d678de5c2
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/Farming/PokemonFRLG_EliteFourFarmer.cpp
@@ -0,0 +1,1005 @@
+/*  Elite Four Farmer
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  Loop:
+ *    1. From the overworld (outdoors), Fly to Indigo Plateau.
+ *    2. Walk through the lobby into Lorelei's room, check the room by its
+ *       floor color, and battle her. Then walk room to room through Bruno,
+ *       Agatha, Lance and the Champion.
+ *    3. After the Champion, wait for the Hall of Fame save message to come
+ *       and go, then soft reset. The save loads outside the player's house
+ *       in Pallet Town, ready for the next loop.
+ *
+ *  Battles: every opponent is one-hit KO'd by a fixed move (see the move
+ *  tables below). Each turn the opponent's species is read from the screen
+ *  and the move for it is used, so an opponent that survives a low damage
+ *  roll is simply attacked again. If the name can't be read, the move is
+ *  picked from the opponents' known send-out order instead.
+ *
+ */
+
+#include <algorithm>
+#include <array>
+#include <cmath>
+#include <map>
+#include <set>
+#include <string>
+#include <vector>
+#include "Common/Cpp/Exceptions.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_BattleDialogs.h"
+#include "VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_DialogDetector.h"
+#include "VideoGames/PokemonFRLG/Inference/Map/PokemonFRLG_PokemonLeagueDetectors.h"
+#include "VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_PartyMenuDetector.h"
+#include "VideoGames/PokemonFRLG/Inference/PokemonFRLG_BattlePokemonDetector.h"
+#include "VideoGames/PokemonFRLG/Inference/PokemonFRLG_WildEncounterReader.h"
+#include "VideoGames/PokemonFRLG/Programs/PokemonFRLG_BattleMenuNavigation.h"
+#include "VideoGames/PokemonFRLG/PokemonFRLG_Navigation.h"
+#include "PokemonFRLG_EliteFourFarmer.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+
+EliteFourFarmer_Descriptor::EliteFourFarmer_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonFRLG:EliteFourFarmer",
+        Pokemon::STRING_POKEMON + " FRLG", "Elite Four Farmer",
+        "Programs/PokemonFRLG/EliteFourFarmer.html",
+        "Repeatedly beat the rematch Elite Four and Champion with a single Pokemon.",
+        PanelQualityStanding::THIRD_PARTY,
+        ProgramControllerClass::StandardController_RequiresPrecision,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+struct EliteFourFarmer_Descriptor::Stats : public StatsTracker{
+    Stats()
+        : wins(m_stats["Wins"])
+        , battles(m_stats["Battles Won"])
+        , losses(m_stats["Losses"])
+        , resets(m_stats["Resets"])
+        , errors(m_stats["Errors"])
+    {
+        m_display_order.emplace_back("Wins");
+        m_display_order.emplace_back("Battles Won");
+        m_display_order.emplace_back("Losses", HIDDEN_IF_ZERO);
+        m_display_order.emplace_back("Resets", HIDDEN_IF_ZERO);
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+    }
+
+    std::atomic<uint64_t>& wins;
+    std::atomic<uint64_t>& battles;
+    std::atomic<uint64_t>& losses;
+    std::atomic<uint64_t>& resets;
+    std::atomic<uint64_t>& errors;
+};
+
+std::unique_ptr<StatsTracker> EliteFourFarmer_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+
+EliteFourFarmer::EliteFourFarmer()
+    : STOP_AFTER_CURRENT("Win")
+    , LANGUAGE(
+        "<b>Game Language:</b><br>"
+        "Used to read the opposing Pokemon's name.",
+        {
+            Language::English,
+            Language::Japanese,
+            Language::Spanish,
+            Language::French,
+            Language::German,
+            Language::Italian,
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        true
+    )
+    , ATTACKER(
+        "<b>Attacker:</b><br>"
+        "The Pokemon in slot 1 that battles. It must be level 100 with 252 EVs in Sp. Atk and Speed, "
+        "a +Sp. Atk nature, and exactly these moves in this order in the battle menu (top-left, top-right, bottom-left, bottom-right).",
+        {
+            {Attacker::STARMIE, "starmie", "Starmie: Surf / Psychic / Ice Beam / Thunderbolt (Sp. Atk 302+)"},
+            {Attacker::MEWTWO,  "mewtwo",  "Mewtwo: Psychic / Ice Beam / Thunderbolt / Water Pulse (Sp. Atk 445+, or 405+ holding Mystic Water)"},
+            {Attacker::LAPRAS,  "lapras",  "Lapras: Surf / Ice Beam / Psychic / Thunderbolt, holding NeverMeltIce (Sp. Atk 277+)"},
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        Attacker::STARMIE
+    )
+    , STARTER(
+        "<b>Your Starter:</b><br>"
+        "The starter you chose at the start of the game. This decides your rival's team.",
+        {
+            {Starter::BULBASAUR,  "bulbasaur",  "Bulbasaur"},
+            {Starter::CHARMANDER, "charmander", "Charmander"},
+            {Starter::SQUIRTLE,   "squirtle",   "Squirtle"},
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        Starter::CHARMANDER
+    )
+    , NUM_WINS(
+        "<b>Number of Wins:</b><br>"
+        "Stop after this many League wins. Zero runs until stopped.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        200, 0
+    )
+    , GO_HOME_WHEN_DONE(false)
+    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_STATUS_UPDATE,
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+{
+    PA_ADD_OPTION(STOP_AFTER_CURRENT);
+    PA_ADD_OPTION(LANGUAGE);
+    PA_ADD_OPTION(ATTACKER);
+    PA_ADD_OPTION(STARTER);
+    PA_ADD_OPTION(NUM_WINS);
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+
+
+namespace{
+
+
+enum class Move{
+    SURF,
+    PSYCHIC,
+    ICE_BEAM,
+    THUNDERBOLT,
+    WATER_PULSE,
+};
+
+const char* move_name(Move move){
+    switch (move){
+    case Move::SURF:        return "Surf";
+    case Move::PSYCHIC:     return "Psychic";
+    case Move::ICE_BEAM:    return "Ice Beam";
+    case Move::THUNDERBOLT: return "Thunderbolt";
+    case Move::WATER_PULSE: return "Water Pulse";
+    }
+    return "?";
+}
+
+enum class Trainer{
+    LORELEI,
+    BRUNO,
+    AGATHA,
+    LANCE,
+    CHAMPION,
+};
+
+const char* trainer_name(Trainer trainer){
+    switch (trainer){
+    case Trainer::LORELEI:  return "Lorelei";
+    case Trainer::BRUNO:    return "Bruno";
+    case Trainer::AGATHA:   return "Agatha";
+    case Trainer::LANCE:    return "Lance";
+    case Trainer::CHAMPION: return "Champion";
+    }
+    return "?";
+}
+
+
+//  Everything the program needs to know about one attacker.
+struct AttackerPlan{
+    //  Moves in battle-menu order: top-left, top-right, bottom-left, bottom-right.
+    std::array<Move, 4> slots;
+
+    //  Which move one-hit KOs each rematch opponent (min damage roll, no crit)
+    //  at the Sp. Atk listed in the option text. Some picks are not the
+    //  cheapest move, to keep every move within its base PP per run.
+    std::map<std::string, Move> move_for;
+
+    //  Observed send-out order, Lorelei / Bruno / Agatha / Lance.
+    std::array<std::vector<std::string>, 4> elite_four;
+
+    //  Observed send-out order of the Champion, indexed by the player's
+    //  starter: Bulbasaur / Charmander / Squirtle.
+    std::array<std::vector<std::string>, 3> champion;
+};
+
+
+const AttackerPlan& STARMIE_PLAN(){
+    static const AttackerPlan plan{
+        {Move::SURF, Move::PSYCHIC, Move::ICE_BEAM, Move::THUNDERBOLT},
+        {
+            {"dewgong",    Move::THUNDERBOLT},
+            {"cloyster",   Move::THUNDERBOLT},
+            {"piloswine",  Move::SURF},
+            {"jynx",       Move::SURF},
+            {"lapras",     Move::THUNDERBOLT},
+            {"steelix",    Move::SURF},
+            {"hitmonchan", Move::PSYCHIC},
+            {"hitmonlee",  Move::PSYCHIC},
+            {"machamp",    Move::PSYCHIC},
+            {"gengar",     Move::PSYCHIC},
+            {"crobat",     Move::THUNDERBOLT},  //  Psychic also works; Thunderbolt saves Psychic PP.
+            {"misdreavus", Move::SURF},
+            {"arbok",      Move::PSYCHIC},
+            {"gyarados",   Move::THUNDERBOLT},
+            {"dragonite",  Move::ICE_BEAM},
+            {"kingdra",    Move::PSYCHIC},      //  Sets Starmie's 302 Sp. Atk requirement.
+            {"aerodactyl", Move::SURF},
+            {"heracross",  Move::PSYCHIC},
+            {"alakazam",   Move::SURF},
+            {"tyranitar",  Move::SURF},
+            {"arcanine",   Move::SURF},
+            {"exeggutor",  Move::ICE_BEAM},
+            {"blastoise",  Move::THUNDERBOLT},
+            {"venusaur",   Move::PSYCHIC},
+            {"charizard",  Move::THUNDERBOLT},
+        },
+        {{
+            {"dewgong", "cloyster", "lapras", "piloswine", "jynx"},
+            {"steelix", "steelix", "hitmonlee", "hitmonchan", "machamp"},
+            {"gengar", "crobat", "arbok", "gengar", "misdreavus"},
+            {"gyarados", "dragonite", "dragonite", "kingdra", "aerodactyl"},
+        }},
+        {{
+            {"heracross", "alakazam", "exeggutor", "tyranitar", "gyarados", "charizard"},
+            {"heracross", "alakazam", "exeggutor", "tyranitar", "arcanine", "blastoise"},
+            {"heracross", "venusaur", "alakazam", "tyranitar", "gyarados", "arcanine"},
+        }},
+    };
+    return plan;
+}
+
+const AttackerPlan& MEWTWO_PLAN(){
+    static const AttackerPlan plan{
+        {Move::PSYCHIC, Move::ICE_BEAM, Move::THUNDERBOLT, Move::WATER_PULSE},
+        {
+            {"dewgong",    Move::THUNDERBOLT},
+            {"cloyster",   Move::THUNDERBOLT},
+            {"piloswine",  Move::WATER_PULSE},  //  Psychic also works; Water Pulse saves Psychic PP.
+            {"jynx",       Move::THUNDERBOLT},
+            {"lapras",     Move::THUNDERBOLT},
+            {"steelix",    Move::WATER_PULSE},
+            {"hitmonchan", Move::PSYCHIC},
+            {"hitmonlee",  Move::PSYCHIC},
+            {"machamp",    Move::PSYCHIC},
+            {"gengar",     Move::THUNDERBOLT},  //  Psychic also works; Thunderbolt saves Psychic PP.
+            {"crobat",     Move::THUNDERBOLT},  //  Same as above.
+            {"misdreavus", Move::PSYCHIC},
+            {"arbok",      Move::PSYCHIC},
+            {"gyarados",   Move::THUNDERBOLT},
+            {"dragonite",  Move::ICE_BEAM},
+            {"kingdra",    Move::PSYCHIC},
+            {"aerodactyl", Move::ICE_BEAM},
+            {"heracross",  Move::PSYCHIC},
+            {"alakazam",   Move::ICE_BEAM},
+            {"tyranitar",  Move::WATER_PULSE},  //  Sets Mewtwo's 445 (405 with Mystic Water) requirement.
+            {"arcanine",   Move::WATER_PULSE},  //  Psychic also works; Water Pulse saves Psychic PP.
+            {"exeggutor",  Move::ICE_BEAM},
+            {"blastoise",  Move::THUNDERBOLT},
+            {"venusaur",   Move::PSYCHIC},
+            {"charizard",  Move::THUNDERBOLT},
+        },
+        {{
+            {"dewgong", "cloyster", "piloswine", "jynx", "lapras"},
+            {"steelix", "steelix", "hitmonlee", "hitmonchan", "machamp"},
+            {"gengar", "crobat", "gengar", "misdreavus", "arbok"},
+            {"gyarados", "kingdra", "dragonite", "aerodactyl", "dragonite"},
+        }},
+        {{
+            {"heracross", "alakazam", "tyranitar", "exeggutor", "gyarados", "charizard"},
+            {"heracross", "alakazam", "tyranitar", "arcanine", "exeggutor", "blastoise"},
+            {"heracross", "alakazam", "tyranitar", "gyarados", "arcanine", "venusaur"},
+        }},
+    };
+    return plan;
+}
+
+const AttackerPlan& LAPRAS_PLAN(){
+    static const AttackerPlan plan{
+        {Move::SURF, Move::ICE_BEAM, Move::PSYCHIC, Move::THUNDERBOLT},
+        {
+            {"dewgong",    Move::THUNDERBOLT},
+            {"cloyster",   Move::THUNDERBOLT},
+            {"piloswine",  Move::SURF},
+            {"jynx",       Move::SURF},
+            {"lapras",     Move::THUNDERBOLT},  //  Water Absorb: never Surf.
+            {"steelix",    Move::SURF},
+            {"hitmonchan", Move::PSYCHIC},
+            {"hitmonlee",  Move::PSYCHIC},
+            {"machamp",    Move::PSYCHIC},
+            {"gengar",     Move::PSYCHIC},
+            {"crobat",     Move::THUNDERBOLT},
+            {"misdreavus", Move::SURF},
+            {"arbok",      Move::PSYCHIC},
+            {"gyarados",   Move::THUNDERBOLT},
+            {"dragonite",  Move::ICE_BEAM},
+            {"kingdra",    Move::ICE_BEAM},
+            {"aerodactyl", Move::THUNDERBOLT},
+            {"heracross",  Move::PSYCHIC},
+            {"alakazam",   Move::ICE_BEAM},
+            {"tyranitar",  Move::SURF},
+            {"arcanine",   Move::SURF},
+            {"exeggutor",  Move::ICE_BEAM},
+            {"blastoise",  Move::THUNDERBOLT},  //  Sets Lapras's 277 Sp. Atk requirement.
+            {"venusaur",   Move::ICE_BEAM},
+            {"charizard",  Move::THUNDERBOLT},
+        },
+        {{
+            {"dewgong", "piloswine", "lapras", "cloyster", "jynx"},
+            {"steelix", "hitmonchan", "hitmonlee", "machamp", "steelix"},
+            {"gengar", "misdreavus", "arbok", "gengar", "crobat"},
+            {"gyarados", "aerodactyl", "dragonite", "dragonite", "kingdra"},
+        }},
+        {{
+            {"heracross", "tyranitar", "exeggutor", "alakazam", "gyarados", "charizard"},
+            {"heracross", "tyranitar", "exeggutor", "alakazam", "arcanine", "blastoise"},
+            {"heracross", "tyranitar", "venusaur", "alakazam", "gyarados", "arcanine"},
+        }},
+    };
+    return plan;
+}
+
+const AttackerPlan& get_plan(EliteFourFarmer::Attacker attacker){
+    switch (attacker){
+    case EliteFourFarmer::Attacker::STARMIE: return STARMIE_PLAN();
+    case EliteFourFarmer::Attacker::MEWTWO:  return MEWTWO_PLAN();
+    case EliteFourFarmer::Attacker::LAPRAS:  return LAPRAS_PLAN();
+    }
+    return STARMIE_PLAN();
+}
+
+size_t starter_index(EliteFourFarmer::Starter starter){
+    switch (starter){
+    case EliteFourFarmer::Starter::BULBASAUR:  return 0;
+    case EliteFourFarmer::Starter::CHARMANDER: return 1;
+    case EliteFourFarmer::Starter::SQUIRTLE:   return 2;
+    }
+    return 1;
+}
+
+const std::vector<std::string>& expected_order(
+    const AttackerPlan& plan, EliteFourFarmer::Starter starter, Trainer trainer
+){
+    switch (trainer){
+    case Trainer::LORELEI:  return plan.elite_four[0];
+    case Trainer::BRUNO:    return plan.elite_four[1];
+    case Trainer::AGATHA:   return plan.elite_four[2];
+    case Trainer::LANCE:    return plan.elite_four[3];
+    case Trainer::CHAMPION: return plan.champion[starter_index(starter)];
+    }
+    return plan.elite_four[0];
+}
+
+int slot_of(const AttackerPlan& plan, Move move){
+    for (int i = 0; i < 4; i++){
+        if (plan.slots[i] == move){
+            return i;
+        }
+    }
+    return -1;
+}
+
+
+
+//  Overworld walking.
+//
+//  Gen 3 movement at walking speed (from the pokefirered decomp):
+//    - Pressing a direction the player is not facing first turns them in
+//      place, which takes 8 frames, then they start walking.
+//    - Each step takes 16 frames.
+//    - The game reads the d-pad only when a step finishes. If a new direction
+//      is held then, the player walks that way right away (no turn delay).
+//  So a path is held as one continuous input, switching direction halfway
+//  through the last step of each segment. That gives +/- 8 frames (~130 ms)
+//  of tolerance on every switch, and the player never stops between steps.
+//  (Running is not possible inside the Pokemon League.)
+constexpr double FRAME_MS = 16.74;
+constexpr double TURN_FRAMES = 8;
+constexpr double STEP_FRAMES = 16;
+
+Milliseconds frames_to_ms(double frames){
+    return Milliseconds((int64_t)std::lround(frames * FRAME_MS));
+}
+
+struct WalkSegment{
+    DpadPosition direction;
+    uint16_t steps;
+};
+
+//  Walk the path without stopping. "facing" is the direction the player
+//  faces before starting. The last segment is held for "extra" longer than
+//  it needs, so a path that ends in a door keeps walking until the warp.
+void walk_path(
+    ProControllerContext& context,
+    DpadPosition facing,
+    const std::vector<WalkSegment>& path,
+    Milliseconds extra
+){
+    const double start = path[0].direction == facing ? 0 : TURN_FRAMES;
+    double previous = 0;
+    uint32_t steps = 0;
+    for (size_t i = 0; i < path.size(); i++){
+        steps += path[i].steps;
+        if (i + 1 < path.size()){
+            //  Switch halfway through the last step of this segment.
+            double end = start + STEP_FRAMES * steps - STEP_FRAMES / 2;
+            pbf_press_dpad(context, path[i].direction, frames_to_ms(end - previous), 0ms);
+            previous = end;
+        }else{
+            double end = start + STEP_FRAMES * steps;
+            pbf_press_dpad(context, path[i].direction, frames_to_ms(end - previous) + extra, 0ms);
+        }
+    }
+}
+
+//  Walk the path into a door and wait until the next map has faded in.
+//
+//  One watcher sees the whole warp (screen goes black, then comes back), so
+//  a short fade can't slip by between two separate checks. The last segment
+//  is held only slightly past the door: by then the fade-out has started and
+//  input is ignored, so the player can't take an extra step on arrival.
+void walk_through_door(
+    ConsoleHandle& console, ProControllerContext& context,
+    DpadPosition facing, const std::vector<WalkSegment>& path,
+    const std::string& destination
+){
+    console.log("Walking to " + destination + "...");
+    BlackScreenOverWatcher warp_finished(COLOR_RED);
+    context.wait_for_all_requests();
+    int ret = run_until<ProControllerContext>(
+        console, context,
+        [&](ProControllerContext& context){
+            walk_path(context, facing, path, 300ms);
+            pbf_wait(context, 10000ms);
+        },
+        { warp_finished }
+    );
+    if (ret < 0){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "walk_through_door(): Did not go through the door to " + destination + ".",
+            console
+        );
+    }
+}
+
+EliteFourRoom room_of(Trainer trainer){
+    switch (trainer){
+    case Trainer::LORELEI:  return EliteFourRoom::LORELEI;
+    case Trainer::BRUNO:    return EliteFourRoom::BRUNO;
+    case Trainer::AGATHA:   return EliteFourRoom::AGATHA;
+    case Trainer::LANCE:    return EliteFourRoom::LANCE;
+    case Trainer::CHAMPION: return EliteFourRoom::NONE;
+    }
+    return EliteFourRoom::NONE;
+}
+
+//  Confirm the player walked into the expected Elite Four room.
+//  The game walks the player in by itself; the floor shows up in the
+//  sample boxes during that walk.
+//
+//  Being in a DIFFERENT Elite Four room is an error (the program would use
+//  the wrong moves). A floor that matches no room only logs a warning with
+//  the measured colors and carries on: talking to the trainer still has to
+//  work, so a real problem gets caught there.
+void check_room(ConsoleHandle& console, ProControllerContext& context, Trainer trainer){
+    const EliteFourRoom expected = room_of(trainer);
+    EliteFourRoomWatcher in_room(COLOR_RED, expected);
+    int ret = wait_until(console, context, 3000ms, { in_room });
+    if (ret == 0){
+        console.log(std::string("Entered ") + elite_four_room_name(expected) + ".");
+        return;
+    }
+
+    VideoSnapshot screen = console.video().snapshot();
+    const EliteFourRoom seen = read_elite_four_room(screen);
+    if (seen == EliteFourRoom::NONE || seen == expected){
+        console.log(
+            std::string("Could not confirm ") + elite_four_room_name(expected) +
+            " from the floor color. Continuing anyway. Measured " + describe_elite_four_floor(screen),
+            COLOR_RED
+        );
+        return;
+    }
+    OperationFailedExceptionWithScreenshot::fire(
+        ErrorReportMode::SEND_ERROR_REPORT,
+        std::string("check_room(): Expected to be in ") + elite_four_room_name(expected) +
+        ", but the screen shows " + elite_four_room_name(seen) + ".",
+        console,
+        screen
+    );
+}
+
+//  Mash B through dialogue until the battle menu ("What will X do?") appears.
+void mash_until_battle_menu(
+    ConsoleHandle& console, ProControllerContext& context,
+    Trainer trainer, Milliseconds timeout
+){
+    BattleMenuWatcher battle_menu(COLOR_RED);
+    context.wait_for_all_requests();
+    int ret = run_until<ProControllerContext>(
+        console, context,
+        [&](ProControllerContext& context){
+            pbf_mash_button(context, BUTTON_B, timeout);
+        },
+        { battle_menu }
+    );
+    if (ret < 0){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            std::string("mash_until_battle_menu(): The battle with ") + trainer_name(trainer) + " did not start.",
+            console
+        );
+    }
+    console.log("Battle menu detected.");
+}
+
+//  Called once the room check passes, while the game may still be walking
+//  the player in. Step up to the trainer (one tile) and press A, repeating
+//  until their dialogue opens. Inputs during the automatic walk are ignored,
+//  and extra presses of up just bump into the trainer.
+void talk_to_trainer(ConsoleHandle& console, ProControllerContext& context, Trainer trainer){
+    console.log(std::string("Talking to ") + trainer_name(trainer) + "...");
+    WhiteDialogWatcher dialog(COLOR_RED);
+    BattleMenuWatcher battle_menu(COLOR_RED);
+    context.wait_for_all_requests();
+    int ret = run_until<ProControllerContext>(
+        console, context,
+        [](ProControllerContext& context){
+            for (int i = 0; i < 20; i++){
+                pbf_press_dpad(context, DPAD_UP, 100ms, 150ms);
+                pbf_press_button(context, BUTTON_A, 100ms, 400ms);
+            }
+        },
+        { dialog, battle_menu }
+    );
+    switch (ret){
+    case 0:
+        mash_until_battle_menu(console, context, trainer, 30000ms);
+        return;
+    case 1:
+        console.log("Battle menu detected.");
+        return;
+    default:
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            std::string("talk_to_trainer(): Unable to talk to ") + trainer_name(trainer) + ".",
+            console
+        );
+    }
+}
+
+//  After a battle, the trainer says one more thing in the overworld (the
+//  next door is already open by then). Mash B until that dialogue closes.
+void clear_post_battle_dialog(ConsoleHandle& console, ProControllerContext& context, Trainer trainer){
+    WhiteDialogWatcher dialog(COLOR_RED);
+    int ret = wait_until(console, context, 20000ms, { dialog });
+    if (ret < 0){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            std::string("clear_post_battle_dialog(): No dialogue from ") + trainer_name(trainer) + " after the battle.",
+            console
+        );
+    }
+
+    WhiteDialogOverWatcher dialog_closed(COLOR_RED);
+    ret = run_until<ProControllerContext>(
+        console, context,
+        [](ProControllerContext& context){
+            pbf_mash_button(context, BUTTON_B, 20000ms);
+        },
+        { dialog_closed }
+    );
+    if (ret < 0){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            std::string("clear_post_battle_dialog(): The dialogue from ") + trainer_name(trainer) + " did not close.",
+            console
+        );
+    }
+}
+
+//  From the overworld (outdoors), Fly to Indigo Plateau and walk through the
+//  lobby into Lorelei's room.
+//  Assumes the Pokemon in the LAST party slot knows Fly as its first field move.
+void travel_to_lorelei(ConsoleHandle& console, ProControllerContext& context){
+    console.log("Flying to Indigo Plateau...");
+    open_fly_map_from_overworld(console, context);
+    fly_from_kanto_map(console, context, KantoFlyLocation::indigoplateau);
+
+    //  Fly lands right below the entrance.
+    walk_through_door(console, context, DPAD_NONE, {{DPAD_UP, 1}}, "the Indigo Plateau lobby");
+
+    //  The lobby door puts the player at (11, 16) facing up. Lorelei's door
+    //  is at (4, 1): 7 steps left, then 15 up.
+    walk_through_door(console, context, DPAD_UP, {{DPAD_LEFT, 7}, {DPAD_UP, 15}}, "Lorelei's room");
+}
+
+//  After a win, walk from below the defeated trainer, around them, and up
+//  through the door that opened behind them. The same path works in every
+//  Elite Four room.
+void walk_to_next_room(ConsoleHandle& console, ProControllerContext& context, Trainer next){
+    walk_through_door(
+        console, context, DPAD_UP,
+        {{DPAD_RIGHT, 1}, {DPAD_UP, 2}, {DPAD_LEFT, 1}, {DPAD_UP, 2}},
+        next == Trainer::CHAMPION ? std::string("the Champion's room") : std::string(elite_four_room_name(room_of(next)))
+    );
+}
+
+//  Enter a trainer's room and get to the battle menu.
+void start_battle(ConsoleHandle& console, ProControllerContext& context, Trainer trainer){
+    if (trainer == Trainer::CHAMPION){
+        //  The game walks the player up to the rival and the battle starts
+        //  on its own.
+        console.log("Entered the Champion's room.");
+        mash_until_battle_menu(console, context, trainer, 60000ms);
+        return;
+    }
+    check_room(console, context, trainer);
+    talk_to_trainer(console, context, trainer);
+}
+
+//  After the Champion, mash B through the dialogue and the Hall of Fame
+//  until "Saving... Don't turn off the power." appears, then wait for it to
+//  go away. The save is complete by then.
+void wait_for_hall_of_fame_save(ConsoleHandle& console, ProControllerContext& context){
+    console.log("Champion defeated. Waiting for the Hall of Fame to save...");
+    HallOfFameSavingWatcher saving(COLOR_RED);
+    context.wait_for_all_requests();
+    int ret = run_until<ProControllerContext>(
+        console, context,
+        [](ProControllerContext& context){
+            pbf_mash_button(context, BUTTON_B, 180000ms);
+        },
+        { saving }
+    );
+    if (ret < 0){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "wait_for_hall_of_fame_save(): The Hall of Fame save message did not appear.",
+            console
+        );
+    }
+    console.log("Saving...");
+
+    HallOfFameSavingOverWatcher saved(COLOR_RED);
+    ret = wait_until(console, context, 30000ms, { saved });
+    if (ret < 0){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "wait_for_hall_of_fame_save(): The save message did not go away.",
+            console
+        );
+    }
+    console.log("Saved.");
+}
+
+//  From the battle menu, choose FIGHT and then the move in the given slot.
+//  The arrow is read from the screen, so only the presses needed to reach
+//  the move are made (none if the arrow is already on it).
+void use_move_in_slot(ConsoleHandle& console, ProControllerContext& context, int slot){
+    if (!move_cursor_to_option(console, context, BattleMenuOption::FIGHT)){
+        console.log("Could not confirm the cursor is on FIGHT. Pressing A anyway.", COLOR_RED);
+    }
+    pbf_press_button(context, BUTTON_A, 200ms, 300ms);       //  open the move list
+    context.wait_for_all_requests();
+
+    if (!move_cursor_to_option(console, context, static_cast<BattleMoveOption>(slot))){
+        //  Could not see the arrow. Fall back to pressing left and up, which
+        //  always lands on the top-left move, then moving to the slot.
+        console.log("Could not find the move cursor. Moving to the move without it.", COLOR_RED);
+        pbf_press_dpad(context, DPAD_LEFT, 160ms, 240ms);
+        pbf_press_dpad(context, DPAD_UP, 160ms, 240ms);
+        if (slot & 1){
+            pbf_press_dpad(context, DPAD_RIGHT, 160ms, 240ms);
+        }
+        if (slot & 2){
+            pbf_press_dpad(context, DPAD_DOWN, 160ms, 240ms);
+        }
+        context.wait_for_all_requests();
+    }
+
+    //  The PP text turns red when the highlighted move is out of PP.
+    BattleOutOfPpWatcher out_of_pp(COLOR_RED);
+    int ret = wait_until(console, context, 500ms, { out_of_pp });
+    if (ret == 0){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "use_move_in_slot(): The selected move is out of PP.",
+            console
+        );
+    }
+
+    pbf_press_button(context, BUTTON_A, 200ms, 300ms);       //  use the move
+    context.wait_for_all_requests();
+}
+
+enum class TrainerBattleResult{
+    WON,
+    ATTACKER_FAINTED,
+};
+
+//  Read the opposing Pokemon's species from its name. It is matched against
+//  every species in the attacker's move table, not just this trainer's, so an
+//  unexpected opponent is reported by name instead of being misread.
+//  Returns an empty string if it can't be read.
+std::string read_opponent(
+    ConsoleHandle& console, Language language,
+    const std::set<std::string>& candidates
+){
+    WildEncounterReader reader(COLOR_RED);
+    VideoOverlaySet overlays(console.overlay());
+    reader.make_overlays(overlays);
+    VideoSnapshot screen = console.video().snapshot();
+    return reader.read_encounter(console.logger(), language, screen, candidates).name;
+}
+
+//  Fight one trainer from the battle menu until the battle ends.
+TrainerBattleResult run_battle(
+    ConsoleHandle& console, ProControllerContext& context, Language language,
+    const AttackerPlan& plan, const std::vector<std::string>& order, Trainer trainer
+){
+    //  Times the opponent's Pokemon left the field. This counts switch-outs
+    //  as well as faints, since both look the same on screen.
+    size_t left_field = 0;
+    size_t turns = 0;
+    std::string last_species;       //  the opponent we attacked last turn
+    bool same_opponent = false;     //  true if it did not leave the field
+
+    std::set<std::string> candidates;
+    for (const auto& item : plan.move_for){
+        candidates.insert(item.first);
+    }
+
+    while (true){
+        if (turns > 3 * order.size()){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                std::string("run_battle(): Too many turns against ") + trainer_name(trainer) + ".",
+                console
+            );
+        }
+
+        //  We are at the battle menu. Read who we are facing. If that fails,
+        //  assume the last opponent if it never left the field, otherwise
+        //  fall back to the expected send-out order.
+        std::string species = read_opponent(console, language, candidates);
+        if (species.empty()){
+            if (same_opponent){
+                species = last_species;
+                console.log("Could not read the opponent's name. Assuming " + species + " is still out.", COLOR_RED);
+            }else{
+                species = order[std::min(left_field, order.size() - 1)];
+                console.log("Could not read the opponent's name. Assuming " + species + " from the send-out order.", COLOR_RED);
+            }
+        }
+        last_species = species;
+        auto iter = plan.move_for.find(species);
+        if (iter == plan.move_for.end()){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::NO_ERROR_REPORT,
+                "run_battle(): No move set for opponent: " + species,
+                console
+            );
+        }
+        Move move = iter->second;
+        int slot = slot_of(plan, move);
+        console.log(
+            std::string(trainer_name(trainer)) + ", turn " + std::to_string(turns + 1) +
+            " (" + species + "): using " + move_name(move) + " (slot " + std::to_string(slot + 1) + ")"
+        );
+        use_move_in_slot(console, context, slot);
+        turns++;
+
+        //  Mash B through the battle text until the battle menu comes back
+        //  (next opponent, or the same one if it survived) or the battle ends
+        //  (fade to black). The next turn reads the name again, so a survivor
+        //  is attacked again.
+        bool faint_seen = false;
+        auto report_missed_faint = [&]{
+            if (!faint_seen){
+                console.log(
+                    "Did not see the opponent faint. It may have survived: "
+                    "check the attacker's Sp. Atk, nature and moves.",
+                    COLOR_RED
+                );
+            }
+        };
+
+        bool waiting = true;
+        while (waiting){
+            BattleMenuWatcher battle_menu(COLOR_RED);
+            BlackScreenWatcher battle_ended(COLOR_RED);
+            BattleFaintWatcher attacker_fainted(COLOR_RED);
+            BattleOpponentFaintWatcher opponent_fainted(COLOR_RED);
+
+            std::vector<PeriodicInferenceCallback> callbacks{battle_menu, battle_ended, attacker_fainted};
+            if (!faint_seen){
+                callbacks.emplace_back(opponent_fainted);
+            }
+
+            int ret = run_until<ProControllerContext>(
+                console, context,
+                [](ProControllerContext& context){
+                    pbf_mash_button(context, BUTTON_B, 60000ms);
+                },
+                callbacks
+            );
+
+            switch (ret){
+            case 0:     //  Battle menu: our next turn.
+                report_missed_faint();
+                same_opponent = !faint_seen;
+                waiting = false;
+                break;
+            case 1:{    //  Fade to black.
+                //  A won battle ends with the last opponent fainting, then a
+                //  fade to the overworld. If no faint was seen this turn, the
+                //  fade may instead be the game opening the party screen
+                //  because our attacker fainted (this can happen before the
+                //  attacker faint watcher triggers).
+                if (!faint_seen){
+                    PartyMenuWatcher party_menu(COLOR_RED);
+                    if (wait_until(console, context, 5000ms, { party_menu }) == 0){
+                        console.log(
+                            std::string("The attacker fainted against ") + trainer_name(trainer) +
+                            " (the party screen opened). Check its Sp. Atk, Speed, nature and moves against the requirements.",
+                            COLOR_RED
+                        );
+                        return TrainerBattleResult::ATTACKER_FAINTED;
+                    }
+                }
+                if (turns != order.size()){
+                    console.log(
+                        "Battle took " + std::to_string(turns) + " attacks (" +
+                        std::to_string(order.size()) + " if every attack is a one-hit KO).",
+                        COLOR_RED
+                    );
+                }
+                console.log(std::string("Defeated ") + trainer_name(trainer) + ".");
+                return TrainerBattleResult::WON;
+            }
+            case 2:     //  Our attacker fainted. The run is lost; no need to wait it out.
+                console.log(
+                    std::string("The attacker fainted against ") + trainer_name(trainer) +
+                    ". Check its Sp. Atk, nature and moves against the requirements.",
+                    COLOR_RED
+                );
+                return TrainerBattleResult::ATTACKER_FAINTED;
+            case 3:     //  Opponent fainted (or switched out). Keep waiting for the menu or the end.
+                console.log("Opponent left the field (fainted or switched out).");
+                faint_seen = true;
+                left_field++;
+                break;
+            default:
+                OperationFailedExceptionWithScreenshot::fire(
+                    ErrorReportMode::SEND_ERROR_REPORT,
+                    "run_battle(): Nothing detected for 60 seconds after attacking.",
+                    console
+                );
+            }
+        }
+    }
+}
+
+
+}   //  namespace
+
+
+
+void EliteFourFarmer::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    EliteFourFarmer_Descriptor::Stats& stats = env.current_stats<EliteFourFarmer_Descriptor::Stats>();
+    DeferredStopButtonOption::ResetOnExit reset_on_exit(STOP_AFTER_CURRENT);
+
+    const AttackerPlan& plan = get_plan(ATTACKER);
+    const Starter starter = STARTER;
+
+    const std::array<Trainer, 5> TRAINERS{
+        Trainer::LORELEI, Trainer::BRUNO, Trainer::AGATHA, Trainer::LANCE, Trainer::CHAMPION
+    };
+
+    uint32_t consecutive_errors = 0;
+    uint32_t consecutive_losses = 0;
+    while (true){
+        send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
+        if (NUM_WINS != 0 && stats.wins >= NUM_WINS){
+            break;
+        }
+
+        try{
+            travel_to_lorelei(env.console, context);
+
+            bool lost = false;
+            for (size_t i = 0; i < TRAINERS.size(); i++){
+                Trainer trainer = TRAINERS[i];
+                if (i > 0){
+                    walk_to_next_room(env.console, context, trainer);
+                }
+                start_battle(env.console, context, trainer);
+                TrainerBattleResult result = run_battle(env.console, context, LANGUAGE, plan, expected_order(plan, starter, trainer), trainer);
+                if (result == TrainerBattleResult::ATTACKER_FAINTED){
+                    lost = true;
+                    break;
+                }
+                stats.battles++;
+                env.update_stats();
+
+                if (trainer != Trainer::CHAMPION){
+                    clear_post_battle_dialog(env.console, context, trainer);
+                }
+            }
+
+            if (lost){
+                //  A lost run is not an error: reset right away and try again.
+                stats.losses++;
+                env.update_stats();
+                consecutive_losses++;
+                if (consecutive_losses >= 5){
+                    throw UserSetupError(
+                        env.console,
+                        "The attacker lost 5 runs in a row. Check its moves and move order, "
+                        "its Sp. Atk, Speed and nature, and the Attacker and Your Starter options."
+                    );
+                }
+                env.log("Run lost. Soft resetting and trying again.", COLOR_RED);
+                soft_reset(env.console, context);
+                stats.resets++;
+                env.update_stats();
+                if (STOP_AFTER_CURRENT.should_stop()){
+                    break;
+                }
+                continue;
+            }
+
+            //  The game is saved once the Hall of Fame save message is gone,
+            //  so reset right away.
+            wait_for_hall_of_fame_save(env.console, context);
+
+            stats.wins++;
+            env.update_stats();
+            consecutive_errors = 0;
+            consecutive_losses = 0;
+
+            env.log("Soft resetting to Pallet Town...");
+            soft_reset(env.console, context);
+            stats.resets++;
+            env.update_stats();
+        }catch (OperationFailedException&){
+            stats.errors++;
+            env.update_stats();
+            consecutive_errors++;
+            if (consecutive_errors >= 3){
+                throw;
+            }
+            //  The save is outside the house in Pallet Town (from the last
+            //  Hall of Fame), so a soft reset puts us back at the start.
+            env.log("Error. Soft resetting and trying again.", COLOR_RED);
+            soft_reset(env.console, context);
+            stats.resets++;
+            env.update_stats();
+        }
+
+        if (STOP_AFTER_CURRENT.should_stop()){
+            break;
+        }
+    }
+
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+    GO_HOME_WHEN_DONE.run_end_of_program(context);
+}
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/Farming/PokemonFRLG_EliteFourFarmer.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/Farming/PokemonFRLG_EliteFourFarmer.h
new file mode 100644
index 0000000000..d28abedc73
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/Farming/PokemonFRLG_EliteFourFarmer.h
@@ -0,0 +1,75 @@
+/*  Elite Four Farmer
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  Repeatedly beat the rematch Elite Four and Champion with a single
+ *  Pokemon that one-hit KOs every opponent.
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonFRLG_EliteFourFarmer_H
+#define PokemonAutomation_PokemonFRLG_EliteFourFarmer_H
+
+#include "Common/Cpp/Options/ButtonOption.h"
+#include "Common/Cpp/Options/EnumDropdownOption.h"
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "CommonTools/Options/LanguageOCROption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+
+class EliteFourFarmer_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    EliteFourFarmer_Descriptor();
+    struct Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+
+class EliteFourFarmer : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = EliteFourFarmer_Descriptor;
+    EliteFourFarmer();
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+    virtual void start_program_border_check(
+        VideoStream& stream,
+        FeedbackType feedback_type
+    ) override{}
+
+    // The Pokemon doing all the battling. Each needs a specific moveset;
+    // see the move tables in the .cpp.
+    enum class Attacker{
+        STARMIE,
+        MEWTWO,
+        LAPRAS,
+    };
+
+    // The starter the PLAYER chose. This decides the rival's team.
+    enum class Starter{
+        BULBASAUR,
+        CHARMANDER,
+        SQUIRTLE,
+    };
+
+private:
+    DeferredStopButtonOption STOP_AFTER_CURRENT;
+    OCR::LanguageOCROption LANGUAGE;
+    EnumDropdownOption<Attacker> ATTACKER;
+    EnumDropdownOption<Starter> STARTER;
+    SimpleIntegerOption<uint32_t> NUM_WINS;
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
+
+    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/Farming/PokemonFRLG_EvTrainer.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/Farming/PokemonFRLG_EvTrainer.cpp
new file mode 100644
index 0000000000..18aaacc7d2
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/Farming/PokemonFRLG_EvTrainer.cpp
@@ -0,0 +1,826 @@
+/*  EV Trainer
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <set>
+#include <map>
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "CommonTools/VisualDetectors/BlackScreenDetector.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_DialogDetector.h"
+#include "VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_BattleDialogs.h"
+#include "VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_PartyDialogs.h"
+#include "VideoGames/PokemonFRLG/Programs/PokemonFRLG_StartMenuNavigation.h"
+#include "VideoGames/PokemonFRLG/Inference/PokemonFRLG_WildEncounterReader.h"
+#include "VideoGames/PokemonFRLG/PokemonFRLG_Navigation.h"
+#include "PokemonFRLG_EvTrainer.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+EvTrainer_Descriptor::EvTrainer_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonFRLG:EvTrainer",
+        Pokemon::STRING_POKEMON + " FRLG", "EV Trainer",
+        "Programs/PokemonFRLG/EvTrainer.html",
+        "Defeats wild encounters to train EVs.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+struct EvTrainer_Descriptor::Stats : public StatsTracker{
+    Stats()
+        : encounters(m_stats["Encounters"])
+        , healing_trips(m_stats["Healing Trips"])
+        , times_fainted(m_stats["Times Fainted"])
+        , hp_evs(m_stats["HP EVs"])
+        , atk_evs(m_stats["Attack EVs"])
+        , def_evs(m_stats["Defense EVs"])
+        , spa_evs(m_stats["Sp. Attack EVs"])
+        , spd_evs(m_stats["Sp. Defense EVs"])
+        , spe_evs(m_stats["Speed EVs"])
+        , shinies(m_stats["Shinies"])
+        , errors(m_stats["Errors"])
+    {
+        m_display_order.emplace_back("Encounters");
+        m_display_order.emplace_back("Healing Trips");
+        m_display_order.emplace_back("Times Fainted", HIDDEN_IF_ZERO);
+        m_display_order.emplace_back("HP EVs", HIDDEN_IF_ZERO);
+        m_display_order.emplace_back("Attack EVs", HIDDEN_IF_ZERO);
+        m_display_order.emplace_back("Defense EVs", HIDDEN_IF_ZERO);
+        m_display_order.emplace_back("Sp. Attack EVs", HIDDEN_IF_ZERO);
+        m_display_order.emplace_back("Sp. Defense EVs", HIDDEN_IF_ZERO);
+        m_display_order.emplace_back("Speed EVs", HIDDEN_IF_ZERO);
+        m_display_order.emplace_back("Shinies", HIDDEN_IF_ZERO);
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+    }
+    std::atomic<uint64_t>& encounters;
+    std::atomic<uint64_t>& healing_trips;
+    std::atomic<uint64_t>& times_fainted;
+    std::atomic<uint64_t>& hp_evs;
+    std::atomic<uint64_t>& atk_evs;
+    std::atomic<uint64_t>& def_evs;
+    std::atomic<uint64_t>& spa_evs;
+    std::atomic<uint64_t>& spd_evs;
+    std::atomic<uint64_t>& spe_evs;
+    std::atomic<uint64_t>& shinies;
+    std::atomic<uint64_t>& errors;
+};
+std::unique_ptr<StatsTracker> EvTrainer_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+EvTrainer::EvTrainer()
+    : LANGUAGE(
+        "<b>Game Language:</b>",
+        {
+            Language::English,
+            Language::Japanese,
+            Language::Spanish,
+            Language::French,
+            Language::German,
+            Language::Italian,
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        true
+    )
+    , HP_EVS(
+        "<b>HP EVs:</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        0, 0, 255 // default, min, max
+    )
+    , ATK_EVS(
+        "<b>Attack EVs:</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        0, 0, 255 // default, min, max
+    ) 
+    , DEF_EVS(
+        "<b>Defense EVs:</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        0, 0, 255 // default, min, max
+    ) 
+    , SPATK_EVS(
+        "<b>Sp. Attack EVs:</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        0, 0, 255 // default, min, max
+    ) 
+    , SPDEF_EVS(
+        "<b>Sp. Defense EVs:</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        0, 0, 255 // default, min, max
+    )
+    , SPEED_EVS(
+        "<b>Speed EVs:</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        0, 0, 255 // default, min, max
+    )
+    , MACHO_BRACE(
+        "<b>Macho Brace:</b><br>Macho Brace doubles all earned EVs when held.",
+        LockMode::LOCK_WHILE_RUNNING, 
+        false // default
+    )
+    , POKERUS(
+        "<b>" + Pokemon::STRING_POKERUS + ":</b><br>" + Pokemon::STRING_POKERUS + " doubles all earned EVs (stacks with Macho Brace)",
+        LockMode::LOCK_WHILE_RUNNING, 
+        false // default
+    )
+    , PREVENT_EVOLUTION(
+        "<b>Prevent " + Pokemon::STRING_POKEMON + " from evolving:</b>",
+        LockMode::LOCK_WHILE_RUNNING, 
+        false // default
+    )
+    , STOP_ON_MOVE_LEARN(
+        "<b>Quit when a new move is learned:</b><br>Stop this program when a new move is learned. If unchecked, new moves will not be learned.",
+        LockMode::LOCK_WHILE_RUNNING, 
+        false // default
+    )
+    , IGNORE_SHINIES(
+        "<b>Ignore shinies:</b><br>Do not stop the program when a wild shiny is encountered.",
+        LockMode::LOCK_WHILE_RUNNING, 
+        false // default
+    )
+    , TAKE_VIDEO(
+        "<b>Take Video:</b><br>Record a video when the shiny is found.", 
+        LockMode::UNLOCK_WHILE_RUNNING, 
+        true // default
+    )
+    , GO_HOME_WHEN_DONE(true)
+    , NOTIFICATION_SHINY(
+        "Shiny found",
+        true, true, ImageAttachmentMode::JPG,
+        {"Notifs", "Showcase"}
+    )
+    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_SHINY,
+        &NOTIFICATION_STATUS_UPDATE,
+        &NOTIFICATION_PROGRAM_FINISH,
+    })
+{
+    PA_ADD_OPTION(LANGUAGE);
+    PA_ADD_OPTION(HP_EVS);
+    PA_ADD_OPTION(ATK_EVS);
+    PA_ADD_OPTION(DEF_EVS);
+    PA_ADD_OPTION(SPATK_EVS);
+    PA_ADD_OPTION(SPDEF_EVS);
+    PA_ADD_OPTION(SPEED_EVS);
+    PA_ADD_OPTION(MACHO_BRACE);
+    PA_ADD_OPTION(POKERUS);
+    PA_ADD_OPTION(PREVENT_EVOLUTION);
+    PA_ADD_OPTION(STOP_ON_MOVE_LEARN);
+    PA_ADD_OPTION(IGNORE_SHINIES);
+    PA_ADD_OPTION(TAKE_VIDEO);
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+namespace{
+
+void visit_pokecenter(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    enter_pokecenter(env.console, context);
+    heal_at_pokecenter(env.console, context);
+    leave_pokecenter(env.console, context);  
+}
+
+void travel_to_viridianforest(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    open_fly_map_from_overworld(env.console, context);
+    fly_from_kanto_map(env.console, context, KantoFlyLocation::pewtercity);
+    visit_pokecenter(env, context);
+    env.log("Walking to Viridian Forest.");
+    // down to the trees
+    pbf_move_left_joystick(context, {0, -1}, 2350ms, 200ms);
+    // right to the path
+    pbf_move_left_joystick(context, {+1, 0}, 1150ms, 200ms);
+    // down toward the gatehouse
+    pbf_move_left_joystick(context, {0, -1}, 4150ms, 200ms);
+    // left to line up with the door
+    pbf_move_left_joystick(context, {-1, 0}, 950ms, 200ms);
+    // down into the forest
+    pbf_move_left_joystick(context, {0, -1}, 10000ms, 1000ms);
+    context.wait_for_all_requests();
+}
+
+void travel_to_route22(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    open_fly_map_from_overworld(env.console, context);
+    fly_from_kanto_map(env.console, context, KantoFlyLocation::viridiancity);
+    visit_pokecenter(env, context);
+    context.wait_for_all_requests();
+    env.log("Walking to Route 22.");
+    // left a few steps
+    pbf_move_left_joystick(context, {-1, 0}, 900ms, 200ms);
+    // up to the bush
+    pbf_move_left_joystick(context, {0, +1}, 2300ms, 200ms);
+    // left to the trees
+    pbf_move_left_joystick(context, {-1, 0}, 7800ms, 200ms);
+    // down and over the ledge
+    pbf_move_left_joystick(context, {0, -1}, 3000ms, 200ms);
+    // left a couple of steps
+    pbf_move_left_joystick(context, {-1, 0}, 600ms, 200ms);
+    // up to into the grass
+    pbf_move_left_joystick(context, {0, +1}, 1500ms, 1000ms);
+    context.wait_for_all_requests();
+}
+
+void travel_to_rock_tunnel(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    open_fly_map_from_overworld(env.console, context);
+    fly_from_kanto_map(env.console, context, KantoFlyLocation::route10);
+    visit_pokecenter(env, context);
+    env.log("Walking to Rock Tunnel.");
+    // down to the fence
+    pbf_move_left_joystick(context, {0, -1}, 2367ms, 200ms);
+    // left to the wall
+    pbf_move_left_joystick(context, {-1, 0}, 3000ms, 200ms);
+    // up to the wall
+    pbf_move_left_joystick(context, {0, +1}, 2650ms, 200ms);
+    // right to the entrance
+    pbf_move_left_joystick(context, {+1, 0}, 1500ms, 200ms);
+    // up into the entrance
+    pbf_move_left_joystick(context, {0, +1}, 1000ms, 4000ms);
+    // down a few steps into the cave
+    pbf_move_left_joystick(context, {0, -1}, 500ms, 1000ms);
+    context.wait_for_all_requests();
+}
+
+void travel_to_pokemontower(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    open_fly_map_from_overworld(env.console, context);
+    fly_from_kanto_map(env.console, context, KantoFlyLocation::lavendertown);
+    visit_pokecenter(env, context);
+    env.log("Walking to Pokemon Tower.");
+    // PokeCenter to tower
+    pbf_move_left_joystick(context, {0, -1}, 400ms, 200ms);
+    pbf_move_left_joystick(context, {+1, 0}, 3200ms, 200ms);
+    pbf_move_left_joystick(context, {0, +1}, 1550ms, 2400ms);
+    // 1st floor to 2nd floor
+    pbf_move_left_joystick(context, {0, +1}, 2350ms, 200ms);
+    pbf_move_left_joystick(context, {+1, 0}, 3100ms, 1200ms);
+    // 2nd floor to 3rd floor
+    pbf_move_left_joystick(context, {0, +1}, 1000ms, 200ms);
+    pbf_move_left_joystick(context, {-1, 0}, 3600ms, 200ms);
+    pbf_move_left_joystick(context, {0, -1}, 1000ms, 200ms);
+    pbf_move_left_joystick(context, {-1, 0}, 700ms, 1500ms);
+    // take a few steps away from the stairs
+    pbf_move_left_joystick(context, {0, +1}, 700ms, 1000ms);
+    context.wait_for_all_requests();
+}
+
+void travel_to_surf_spot(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    int errors = 0;
+    while (true){
+        if (errors > 3){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "Failed to surf 3 times in a row.",
+                env.console
+            );
+        }
+
+        open_fly_map_from_overworld(env.console, context);
+        fly_from_kanto_map(env.console, context, KantoFlyLocation::vermilioncity);
+        visit_pokecenter(env, context);
+        env.log("Walking to the shore and Surfing.");
+
+        WhiteDialogWatcher surf_dialog(COLOR_RED);
+
+        context.wait_for_all_requests();
+        int ret = run_until<ProControllerContext>(
+            env.console, context,
+            [](ProControllerContext& context){
+                // walk up to counter and initiate dialog
+                ssf_press_left_joystick(context, {-1, 0}, 0ms, 10000ms);
+                ssf_mash1_button(context, BUTTON_A, 10000ms);
+            },
+            { surf_dialog }
+        );
+        if (ret < 0){
+            env.log("Failed to detect surf dialog");
+            errors++;
+            pbf_mash_button(context, BUTTON_B, 1000ms);
+            context.wait_for_all_requests();
+            continue;
+        }
+        pbf_mash_button(context, BUTTON_A, 2000ms);
+        // move away from the shore a little bit
+        pbf_move_left_joystick(context, {-1, 0}, 3000ms, 200ms);
+        context.wait_for_all_requests();
+        return;
+    }
+}
+
+void travel_to_route1(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    open_fly_map_from_overworld(env.console, context);
+    fly_from_kanto_map(env.console, context, KantoFlyLocation::viridiancity);
+    visit_pokecenter(env, context);
+    context.wait_for_all_requests();
+    env.log("Walking to Route 1.");
+    // left a couple of steps
+    pbf_move_left_joystick(context, {-1, 0}, 800ms, 100ms);
+    // down to the tall grass
+    pbf_move_left_joystick(context, {0, -1}, 5200ms, 100ms);
+    context.wait_for_all_requests();
+}
+
+void use_dig(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    uint16_t errors = 0;
+    while (true){
+        if (errors > 5){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "Failed to use Dig 5 times in a row.",
+                env.console
+            );
+        }
+
+        open_party_menu_from_overworld(env.console, context);
+        // navigate to 2nd to last party slot
+        pbf_move_left_joystick(context, {0, +1}, 200ms, 300ms);
+        pbf_move_left_joystick(context, {0, +1}, 200ms, 300ms);
+        pbf_move_left_joystick(context, {0, +1}, 200ms, 300ms);
+
+        PartySelectionWatcher teleporter_selected(COLOR_RED);
+
+        context.wait_for_all_requests();
+        int ret = run_until<ProControllerContext>(
+            env.console, context,
+            [](ProControllerContext& context){
+                pbf_press_button(context, BUTTON_A, 200ms, 1800ms);
+            },
+            { teleporter_selected }
+        );
+
+        if (ret < 0){
+            env.log("Failed to select Dig user.");
+            errors++;
+            pbf_mash_button(context, BUTTON_B, 3000ms);
+            continue;
+        }
+        
+        // select Teleport (2nd option, but maybe HMs could change this)
+        pbf_move_left_joystick(context, {0, -1}, 200ms, 300ms);
+        pbf_press_button(context, BUTTON_A, 200ms, 1800ms);
+        pbf_press_button(context, BUTTON_A, 200ms, 2800ms);
+
+        BlackScreenWatcher dig_transition(COLOR_RED);
+
+        context.wait_for_all_requests();
+        ret = wait_until(
+            env.console, context, 20000ms,
+            {dig_transition}
+        );
+
+        if (ret < 0){
+            env.log("Failed to use Dig");
+            errors++;
+            pbf_mash_button(context, BUTTON_B, 4000ms);
+            continue;
+        }
+
+        pbf_wait(context, 3000ms);
+        context.wait_for_all_requests();
+        env.log("Used Dig.");
+        return;
+    }
+}
+
+std::string get_ev_message(EvTrainer_Descriptor::Stats& stats){
+    std::string message = "EVs earned: ";
+    bool nonzero = false;
+    if (stats.hp_evs){
+        message += std::to_string(stats.hp_evs);
+        message += " HP, ";
+        nonzero = true;
+    }
+    if (stats.atk_evs){
+        message += std::to_string(stats.atk_evs);
+        message += " Attack, ";
+        nonzero = true;
+    }
+    if (stats.def_evs){
+        message += std::to_string(stats.def_evs);
+        message += " Defense, ";
+        nonzero = true;
+    }
+    if (stats.spa_evs){
+        message += std::to_string(stats.spa_evs);
+        message += " Sp. Attack, ";
+        nonzero = true;
+    }
+    if (stats.spd_evs){
+        message += std::to_string(stats.spd_evs);
+        message += " Sp. Defense, ";
+        nonzero = true;
+    }
+    if (stats.spe_evs){
+        message += std::to_string(stats.spe_evs);
+        message += " Speed, ";
+        nonzero = true;
+    }   
+
+    if (!nonzero){
+        message = "No EVs earned";
+    }else{
+        message.erase(message.size()-2);
+    }
+
+    return message;
+}
+
+} // namespace
+
+
+bool EvTrainer::check_if_finished(EvTrainer_Descriptor::Stats& stats, uint8_t EV_MULTIPLIER
+    , SimpleIntegerOption<uint64_t>& HP_EVS
+    , SimpleIntegerOption<uint64_t>& ATK_EVS
+    , SimpleIntegerOption<uint64_t>& DEF_EVS
+    , SimpleIntegerOption<uint64_t>& SPATK_EVS
+    , SimpleIntegerOption<uint64_t>& SPDEF_EVS
+    , SimpleIntegerOption<uint64_t>& SPEED_EVS
+){
+    return ( stats.hp_evs + EV_MULTIPLIER > HP_EVS
+        && stats.atk_evs + EV_MULTIPLIER > ATK_EVS
+        && stats.def_evs + EV_MULTIPLIER > DEF_EVS
+        && stats.spa_evs + EV_MULTIPLIER > SPATK_EVS
+        && stats.spd_evs + EV_MULTIPLIER > SPDEF_EVS
+        && stats.spe_evs + EV_MULTIPLIER > SPEED_EVS
+    );
+}
+
+EvTrainer::EvTrainingLocation EvTrainer::get_next_location(SingleSwitchProgramEnvironment& env, EvTrainer_Descriptor::Stats& stats
+    , SimpleIntegerOption<uint64_t>& HP_EVS
+    , SimpleIntegerOption<uint64_t>& ATK_EVS
+    , SimpleIntegerOption<uint64_t>& DEF_EVS
+    , SimpleIntegerOption<uint64_t>& SPATK_EVS
+    , SimpleIntegerOption<uint64_t>& SPDEF_EVS
+    , SimpleIntegerOption<uint64_t>& SPEED_EVS
+){
+    if (stats.hp_evs < HP_EVS){
+        return EvTrainingLocation::viridianforest;
+    }else if (stats.atk_evs < ATK_EVS){
+        return EvTrainingLocation::route22;
+    }else if (stats.def_evs < DEF_EVS){
+        return EvTrainingLocation::rocktunnel;
+    }else if (stats.spa_evs < SPATK_EVS){
+        return EvTrainingLocation::pokemontower;
+    }else if (stats.spd_evs < SPDEF_EVS){
+        return EvTrainingLocation::surfspot;
+    }else if (stats.spe_evs < SPEED_EVS){
+        return EvTrainingLocation::route1;
+    }else{
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "EvTrainer(): program failed to exit after earning all EVs",
+            env.console
+        );
+    }
+}
+
+bool EvTrainer::travel_to_location(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EvTrainingLocation location){
+    switch (location){
+    case EvTrainingLocation::viridianforest:
+        travel_to_viridianforest(env, context);
+        return true;
+    case EvTrainingLocation::route22:
+        travel_to_route22(env, context);
+        return true;
+    case EvTrainingLocation::rocktunnel:
+        travel_to_rock_tunnel(env, context);
+        return true;
+    case EvTrainingLocation::pokemontower:
+        travel_to_pokemontower(env, context);
+        return true;
+    case EvTrainingLocation::surfspot:
+        travel_to_surf_spot(env, context);
+        return false;
+    case EvTrainingLocation::route1:
+        travel_to_route1(env, context);
+        return true;
+    default:
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "EvTrainer: Invalid EV Training location.",
+            env.console
+        );
+    }
+}
+
+std::string EvTrainer::get_encounter_species(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EvTrainingLocation location){
+    const double MAX_SPECIES_LOG10P = -1.2; // relaxed from the default of -1.4 to prevent failure to get OCR matches for some species
+    
+    // make OCR more reliable by providing possible wild encounters for each location
+    std::set<std::string> subset = {};
+    switch (location){
+    case EvTrainingLocation::viridianforest:
+        subset = { "caterpie", "metapod", "weedle", "kakuna", "pikachu"};
+        break;
+    case EvTrainingLocation::route22:
+        subset = { "rattata", "spearow", "mankey" };
+        break;
+    case EvTrainingLocation::rocktunnel:
+        subset = { "geodude", "zubat", "mankey", "machop", "onix" };
+        break;
+    case EvTrainingLocation::pokemontower:
+        subset = { "gastly", "haunter", "cubone" };
+        break;
+    case EvTrainingLocation::surfspot:
+        subset = { "tentacool" };
+        break;
+    case EvTrainingLocation::route1:
+        subset = { "pidgey", "rattata" };
+    }
+
+    context.wait_for_all_requests();
+
+    WildEncounterReader reader(COLOR_RED);
+    VideoOverlaySet overlays(env.console.overlay());
+    reader.make_overlays(overlays);
+
+    env.log("Reading name...");
+    VideoSnapshot screen = env.console.video().snapshot();
+    PokemonFRLG_WildEncounter encounter = reader.read_encounter(env.logger(), LANGUAGE, screen, subset, MAX_SPECIES_LOG10P);
+    env.log("Name: " + encounter.name);
+
+    return encounter.name;
+}
+
+EvTrainer::EffortValues EvTrainer::get_ev_yield(SingleSwitchProgramEnvironment& env, ProControllerContext& context, std::string& species, uint8_t EV_MULTIPLIER){
+    std::set<std::string> subset;
+    // It's probably a better idea to generate a more complete list of EVs to use as a resource
+    // ... but this one is enough for the limited number of possible encounters in these few locations
+    const std::map<std::string, EffortValues> ev_map = {
+        {"caterpie",    {1,0,0,0,0,0}},
+        {"metapod",     {0,0,2,0,0,0}},
+        {"weedle",      {0,0,0,0,0,1}},
+        {"kakuna",      {0,0,2,0,0,0}},
+        {"pidgey",      {0,0,0,0,0,1}},
+        {"rattata",     {0,0,0,0,0,1}},
+        {"spearow",     {0,0,0,0,0,1}},
+        {"pikachu",     {0,0,0,0,0,2}},
+        {"zubat",       {0,0,0,0,0,1}},
+        {"mankey",      {0,1,0,0,0,0}},
+        {"machop",      {0,1,0,0,0,0}},
+        {"tentacool",   {0,0,0,0,1,0}},
+        {"geodude",     {0,0,1,0,0,0}},
+        {"gastly",      {0,0,0,1,0,0}},
+        {"haunter",     {0,0,0,2,0,0}},
+        {"onix",        {0,0,1,0,0,0}},
+        {"cubone",      {0,0,1,0,0,0}},
+    };
+
+    if (species == ""){
+        env.log("get_ev_yield(): failed to detect species");
+        return {999, 999, 999, 999, 999, 999}; // this will always trigger running away
+    }else if (ev_map.find(species) == ev_map.end()){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "get_ev_yield(): Missing EV yield for " + species,
+            env.console
+        );
+    }
+
+    EvTrainer::EffortValues evs = ev_map.find(species)->second;
+    if (EV_MULTIPLIER > 1){
+        evs = {
+            evs.hp * EV_MULTIPLIER,
+            evs.attack * EV_MULTIPLIER,
+            evs.defense * EV_MULTIPLIER,
+            evs.spatk * EV_MULTIPLIER,
+            evs.spdef * EV_MULTIPLIER,
+            evs.speed * EV_MULTIPLIER
+        };
+    }
+    return evs;
+}
+
+EvTrainer::EvTrainerEncounterResult EvTrainer::trigger_wild_encounter(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EvTrainer_Descriptor::Stats& stats, bool spin_leftright){
+    EvTrainerEncounterResult res = { false, false };
+
+    int ret = grass_spin(env.console, context, spin_leftright);
+    res.shiny_found = (ret == 1);
+    if (ret < 0){
+        res.failed_encounter = true;
+        env.log("Failed to trigger encounter: restarting travel");
+        // exit a menu in case there is one open
+        pbf_mash_button(context, BUTTON_B, 1000ms);
+    }else{
+        stats.encounters++;
+    }
+
+    return res;
+}
+
+
+EvTrainer::EvTrainerBattleResult EvTrainer::handle_wild_battle(SingleSwitchProgramEnvironment& env, ProControllerContext& context
+        , EvTrainer_Descriptor::Stats& stats, bool STOP_ON_MOVE_LEARN, bool PREVENT_EVOLUTION
+        , uint8_t EV_MULTIPLIER, EvTrainingLocation location 
+        , SimpleIntegerOption<uint64_t>& HP_EVS
+        , SimpleIntegerOption<uint64_t>& ATK_EVS
+        , SimpleIntegerOption<uint64_t>& DEF_EVS
+        , SimpleIntegerOption<uint64_t>& SPATK_EVS
+        , SimpleIntegerOption<uint64_t>& SPDEF_EVS
+        , SimpleIntegerOption<uint64_t>& SPEED_EVS
+){
+    EvTrainerBattleResult res = { false, false, false };
+    
+    std::string encounter_species = get_encounter_species(env, context, location);
+    EffortValues ev_yield = get_ev_yield(env, context, encounter_species, EV_MULTIPLIER);
+    if (   (ev_yield.hp + stats.hp_evs > HP_EVS) 
+        || (ev_yield.attack + stats.atk_evs> ATK_EVS)
+        || (ev_yield.defense + stats.def_evs > DEF_EVS)
+        || (ev_yield.spatk + stats.spa_evs > SPATK_EVS)
+        || (ev_yield.spdef + stats.spd_evs > SPDEF_EVS)
+        || (ev_yield.speed + stats.spe_evs> SPEED_EVS)
+    ){
+        flee_battle(env.console, context);
+    }else{
+        BattleResult ret = spam_first_move(env.console, context);
+        if (ret == BattleResult::playerfainted){
+            stats.times_fainted++;
+            res.should_heal = true;
+            //TODO: handle exiting the battle in case the player can't escape (low speed, no Smoke Ball)
+            pbf_mash_button(context, BUTTON_B, 5000ms);
+            context.wait_for_all_requests();
+        }else if (ret == BattleResult::unknown){ // battle fled (no EV gain)
+            // continue;
+        }else if (ret == BattleResult::outofpp){
+            res.should_heal = true;
+        }else if (ret == BattleResult::opponentfainted){
+            stats.hp_evs  += ev_yield.hp;
+            stats.atk_evs += ev_yield.attack;
+            stats.def_evs += ev_yield.defense;
+            stats.spa_evs += ev_yield.spatk;
+            stats.spd_evs += ev_yield.spdef;
+            stats.spe_evs += ev_yield.speed;
+            
+            switch (location){
+            case EvTrainingLocation::viridianforest:
+                res.finished_stat = stats.hp_evs + EV_MULTIPLIER > HP_EVS; // avoid overshooting with Macho Brace / Pokerus
+                break;
+            case EvTrainingLocation::route22:
+                res.finished_stat = stats.atk_evs + EV_MULTIPLIER > ATK_EVS;
+                break;
+            case EvTrainingLocation::rocktunnel:
+                res.finished_stat = stats.def_evs + EV_MULTIPLIER > DEF_EVS;
+                break;
+            case EvTrainingLocation::pokemontower:
+                res.finished_stat = stats.spa_evs + EV_MULTIPLIER > SPATK_EVS;
+                break;
+            case EvTrainingLocation::surfspot:
+                res.finished_stat = stats.spd_evs + EV_MULTIPLIER > SPDEF_EVS;
+                break;
+            case EvTrainingLocation::route1:
+                res.finished_stat = stats.spe_evs + EV_MULTIPLIER > SPEED_EVS;
+                break;
+            default:
+                res.finished_stat = false;
+            }
+
+            res.move_learned = exit_wild_battle(env.console, context, !!STOP_ON_MOVE_LEARN, !!PREVENT_EVOLUTION);
+        }
+    }  
+
+    return res;
+}
+
+void EvTrainer::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    /*
+    * Settings: Text Speed fast
+    */
+
+    EvTrainer_Descriptor::Stats& stats = env.current_stats<EvTrainer_Descriptor::Stats>();
+
+    home_black_border_check(env.console, context);
+
+    uint8_t EV_MULTIPLIER = (MACHO_BRACE ? 2 : 1) * (POKERUS ? 2 : 1);
+
+    bool failed_last_encounter = false;
+    uint8_t failed_encounters = 0;
+
+    bool spin_leftright = true;
+    bool should_heal = false;
+
+    EvTrainingLocation current_location = EvTrainingLocation::viridianforest;
+
+    bool finished_stat = false;
+    bool finished_all = check_if_finished(stats, EV_MULTIPLIER, HP_EVS, ATK_EVS, DEF_EVS, SPATK_EVS, SPDEF_EVS, SPEED_EVS);
+
+    while (!finished_all){
+        try{
+            if (failed_encounters >= 5){
+                OperationFailedExceptionWithScreenshot::fire(
+                    ErrorReportMode::SEND_ERROR_REPORT,
+                    "Failed to trigger a wild encounter within 60 seconds 5 times in a row",
+                    env.console
+                );
+            }
+
+            // travel to the relevant Fly spot, heal at a PokeCenter, and walk to the grass
+            if (stats.encounters == 0 || failed_last_encounter || finished_stat || should_heal){
+                // use dig to get out of Pokemon Tower or Rock Tunnel
+                if (current_location == EvTrainingLocation::pokemontower  || current_location == EvTrainingLocation::rocktunnel){
+                    use_dig(env, context);
+                }
+
+                current_location = get_next_location(env, stats, HP_EVS, ATK_EVS, DEF_EVS, SPATK_EVS, SPDEF_EVS, SPEED_EVS);
+                spin_leftright = travel_to_location(env, context, current_location);
+
+                stats.healing_trips++;
+                should_heal = false;
+                failed_last_encounter = false;
+                finished_stat = false;
+            }
+
+               
+            // trigger a wild encounter
+            EvTrainerEncounterResult encounter_res = trigger_wild_encounter(env, context, stats, spin_leftright);
+            failed_last_encounter = encounter_res.failed_encounter;
+            if (failed_last_encounter){
+                failed_encounters++;
+                continue;
+            }else{
+                spin_leftright = !spin_leftright;
+                failed_encounters = 0;
+            }
+
+
+            // handle shiny encounters
+            if (encounter_res.shiny_found){
+                env.log("Shiny found!");
+                stats.shinies++;
+                VideoSnapshot screen = env.console.video().snapshot();
+                send_program_notification(
+                    env,
+                    NOTIFICATION_SHINY,
+                    COLOR_YELLOW,
+                    "Shiny found!",
+                    {}, "",
+                    screen,
+                    true
+                );
+                if (TAKE_VIDEO){
+                    pbf_press_button(context, BUTTON_CAPTURE, 2000ms, 0ms);
+                }
+                if (!IGNORE_SHINIES){
+                    break;
+                }
+            }
+
+
+            // handle the battle and avoid overshooting the target EVs
+            EvTrainerBattleResult battle_res = handle_wild_battle(env, context, stats
+                , !!STOP_ON_MOVE_LEARN, !!PREVENT_EVOLUTION , EV_MULTIPLIER, current_location
+                , HP_EVS , ATK_EVS, DEF_EVS, SPATK_EVS, SPDEF_EVS, SPEED_EVS);
+
+            should_heal = battle_res.should_heal;
+            finished_stat = battle_res.finished_stat;
+            finished_all = check_if_finished(stats, EV_MULTIPLIER, HP_EVS, ATK_EVS, DEF_EVS, SPATK_EVS, SPDEF_EVS, SPEED_EVS);
+
+            if (battle_res.move_learned && STOP_ON_MOVE_LEARN){
+                VideoSnapshot screen = env.console.video().snapshot();
+                send_program_notification(
+                    env, 
+                    NOTIFICATION_STATUS_UPDATE,
+                    COLOR_BLUE,
+                    "Stopping: move learned.",
+                    {}, "",
+                    screen,
+                    true
+                );
+                break;
+            }
+
+
+            send_program_status_notification(
+                env, NOTIFICATION_STATUS_UPDATE,
+                "EV Training."
+            );
+            env.update_stats();
+            context.wait_for_all_requests();
+
+        }catch (OperationFailedException&){
+            stats.errors++;
+            throw;
+        }
+    }
+
+    if (GO_HOME_WHEN_DONE){
+        pbf_press_button(context, BUTTON_HOME, 200ms, 1000ms);
+    }
+
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH, get_ev_message(stats));
+}
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/Farming/PokemonFRLG_EvTrainer.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/Farming/PokemonFRLG_EvTrainer.h
new file mode 100644
index 0000000000..cfcd37d399
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/Farming/PokemonFRLG_EvTrainer.h
@@ -0,0 +1,135 @@
+/*  EV Trainer
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonFRLG_EvTrainer_H
+#define PokemonAutomation_PokemonFRLG_EvTrainer_H
+
+#include <optional>
+#include <string>
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "CommonTools/Options/LanguageOCROption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+class EvTrainer_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    EvTrainer_Descriptor();
+    struct Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+class EvTrainer : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = EvTrainer_Descriptor;
+    EvTrainer();
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext &context) override;
+    virtual void start_program_border_check(
+        VideoStream& stream,
+        FeedbackType feedback_type
+    ) override{}
+
+private:
+    enum class EvTrainingLocation{
+        viridianforest,
+        route22,
+        rocktunnel,
+        pokemontower,
+        surfspot,
+        route1
+    };
+    
+    struct EffortValues{
+        uint64_t hp = 0;
+        uint64_t attack = 0;
+        uint64_t defense = 0;
+        uint64_t spatk = 0;
+        uint64_t spdef = 0;
+        uint64_t speed = 0;
+    };
+
+    struct EvTrainerEncounterResult{
+        bool failed_encounter;
+        bool shiny_found;
+    };
+
+    struct EvTrainerBattleResult{
+        bool should_heal;
+        bool finished_stat;
+        bool move_learned;
+    };
+
+    bool check_if_finished(EvTrainer_Descriptor::Stats& stats, uint8_t ev_multiplier
+    , SimpleIntegerOption<uint64_t>& HP_EVS
+    , SimpleIntegerOption<uint64_t>& ATK_EVS
+    , SimpleIntegerOption<uint64_t>& DEF_EVS
+    , SimpleIntegerOption<uint64_t>& SPATK_EVS
+    , SimpleIntegerOption<uint64_t>& SPDEF_EVS
+    , SimpleIntegerOption<uint64_t>& SPEED_EVS);
+
+    EvTrainingLocation get_next_location(SingleSwitchProgramEnvironment& env, EvTrainer_Descriptor::Stats& stats
+    , SimpleIntegerOption<uint64_t>& HP_EVS
+    , SimpleIntegerOption<uint64_t>& ATK_EVS
+    , SimpleIntegerOption<uint64_t>& DEF_EVS
+    , SimpleIntegerOption<uint64_t>& SPATK_EVS
+    , SimpleIntegerOption<uint64_t>& SPDEF_EVS
+    , SimpleIntegerOption<uint64_t>& SPEED_EVS);
+
+    // returns the appropriate spin_leftright value
+    bool travel_to_location(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EvTrainingLocation location);
+
+    std::string get_encounter_species(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EvTrainingLocation location);
+
+    EffortValues get_ev_yield(SingleSwitchProgramEnvironment& env, ProControllerContext& context, std::string& species, uint8_t ev_multiplier);
+
+    EvTrainerEncounterResult trigger_wild_encounter(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EvTrainer_Descriptor::Stats& stats, bool spin_leftright);
+
+    EvTrainerBattleResult handle_wild_battle(SingleSwitchProgramEnvironment& env, ProControllerContext& context
+        , EvTrainer_Descriptor::Stats& stats, bool STOP_ON_MOVE_LEARN, bool PREVENT_EVOLUTION
+        , uint8_t ev_multiplier, EvTrainingLocation location 
+        , SimpleIntegerOption<uint64_t>& HP_EVS
+        , SimpleIntegerOption<uint64_t>& ATK_EVS
+        , SimpleIntegerOption<uint64_t>& DEF_EVS
+        , SimpleIntegerOption<uint64_t>& SPATK_EVS
+        , SimpleIntegerOption<uint64_t>& SPDEF_EVS
+        , SimpleIntegerOption<uint64_t>& SPEED_EVS);
+
+    OCR::LanguageOCROption LANGUAGE;
+
+    SimpleIntegerOption<uint64_t> HP_EVS;
+    SimpleIntegerOption<uint64_t> ATK_EVS;
+    SimpleIntegerOption<uint64_t> DEF_EVS;
+    SimpleIntegerOption<uint64_t> SPATK_EVS;
+    SimpleIntegerOption<uint64_t> SPDEF_EVS;
+    SimpleIntegerOption<uint64_t> SPEED_EVS;
+
+    BooleanCheckBoxOption MACHO_BRACE;
+    BooleanCheckBoxOption POKERUS;
+
+    BooleanCheckBoxOption PREVENT_EVOLUTION;
+    BooleanCheckBoxOption STOP_ON_MOVE_LEARN;
+    BooleanCheckBoxOption IGNORE_SHINIES;
+
+    BooleanCheckBoxOption TAKE_VIDEO;
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
+    EventNotificationOption NOTIFICATION_SHINY;
+    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
+    EventNotificationsOption NOTIFICATIONS;
+
+};
+
+}
+}
+}
+#endif
+
+
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/Farming/PokemonFRLG_HeldItemFarmer-SafariZone.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/Farming/PokemonFRLG_HeldItemFarmer-SafariZone.cpp
new file mode 100644
index 0000000000..6db116ec08
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/Farming/PokemonFRLG_HeldItemFarmer-SafariZone.cpp
@@ -0,0 +1,671 @@
+/*  Held Item Farmer - Safari Zone
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Options/ButtonOption.h"
+#include "Common/Cpp/Exceptions.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/Language.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_DialogDetector.h"
+#include "VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_BattleDialogs.h"
+#include "VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_PartyHeldItemDetector.h"
+#include "VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_PartyMenuDetector.h"
+#include "VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_StartMenuDetector.h"
+#include "VideoGames/PokemonFRLG/Inference/PokemonFRLG_WildEncounterReader.h"
+#include "VideoGames/PokemonFRLG/PokemonFRLG_Navigation.h"
+#include "VideoGames/PokemonFRLG/Programs/PokemonFRLG_SafariOptimalAction.h"
+#include "VideoGames/PokemonFRLG/Programs/PokemonFRLG_BattleMenuNavigation.h"
+#include "PokemonFRLG_HeldItemFarmer-SafariZone.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+HeldItemFarmerSafariZone_Descriptor::HeldItemFarmerSafariZone_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonFRLG:HeldItemFarmerSafariZone",
+        Pokemon::STRING_POKEMON + " FRLG", "Held Item Farmer - Safari Zone",
+        "Programs/PokemonFRLG/HeldItemFarmer-SafariZone.html",
+        "Farm held items from Chansey and Dragonair in the Safari Zone.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_RequiresPrecision,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+struct HeldItemFarmerSafariZone_Descriptor::Stats : public StatsTracker {
+    public:
+    Stats()
+        : encounters(m_stats["Encounters"])
+        , target_pokemon_found(m_stats["Target Pokemon Found"])
+        , target_pokemon_caught(m_stats["Target Pokemon Caught"])
+        , items(m_stats["Items"])
+        , shinies(m_stats["Shinies"])
+        , errors(m_stats["Errors"])
+    {
+        m_display_order.emplace_back("Encounters");
+        m_display_order.emplace_back("Target Pokemon Found");
+        m_display_order.emplace_back("Target Pokemon Caught");
+        m_display_order.emplace_back("Items");
+        m_display_order.emplace_back("Shinies", HIDDEN_IF_ZERO);
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+        m_aliases["Lucky Eggs Found"] = "Items";
+        m_aliases["Lucky Eggs"] = "Items";
+        m_aliases["Chanseys Found"] = "Target Pokemon Found";
+        m_aliases["Chanseys Caught"] = "Target Pokemon Caught";
+    }
+
+    std::atomic<uint64_t>& encounters;
+    std::atomic<uint64_t>& target_pokemon_found;
+    std::atomic<uint64_t>& target_pokemon_caught;
+    std::atomic<uint64_t>& items;
+    std::atomic<uint64_t>& shinies;
+    std::atomic<uint64_t>& errors;
+};
+
+std::unique_ptr<StatsTracker> HeldItemFarmerSafariZone_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+EnumDropdownDatabase<HeldItemFarmerSafariZone::ItemToFarm> HeldItemFarmerSafariZone::item_to_farm_options(){
+    EnumDropdownDatabase<ItemToFarm> options{
+        {ItemToFarm::LUCKY_EGG, "Lucky Egg", "Farm Chansey for Lucky Eggs."},
+        {ItemToFarm::DRAGON_FANG, "Dragon Fang", "Farm Dragonair for Dragon Fangs."}
+    };
+
+    return options;
+}
+
+HeldItemFarmerSafariZone::HeldItemFarmerSafariZone()
+    : ITEM_TO_FARM(
+        "<b>Item to Farm:</b>",
+        item_to_farm_options(),
+        LockMode::LOCK_WHILE_RUNNING,
+        ItemToFarm::LUCKY_EGG
+    )
+    , LANGUAGE(
+        "<b>Game Language:</b>",
+        {
+            Language::English,
+            Language::Japanese,
+            Language::Spanish,
+            Language::French,
+            Language::German,
+            Language::Italian,
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        true
+    )
+    , STOP_AFTER_CURRENT("Reset")
+    , TAKE_VIDEO(
+        "<b>Take Video:</b><br>Record a video when a lucky egg or shiny is found.",
+        LockMode::UNLOCK_WHILE_RUNNING, true
+    )
+    , GO_HOME_WHEN_DONE(false)
+    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATION_HELD_ITEM(
+        "Held Item Found",
+        true, true, ImageAttachmentMode::JPG,
+        { "Notifs", "Showcase" }
+    )
+    , NOTIFICATION_SHINY(
+        "Shiny found",
+        true, true, ImageAttachmentMode::JPG,
+        { "Notifs", "Showcase" }
+    )
+    , NOTIFICATIONS({
+        &NOTIFICATION_STATUS_UPDATE,
+        &NOTIFICATION_HELD_ITEM,
+        &NOTIFICATION_SHINY,
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+{
+    PA_ADD_OPTION(ITEM_TO_FARM);
+    PA_ADD_OPTION(LANGUAGE);
+    PA_ADD_OPTION(STOP_AFTER_CURRENT);
+    PA_ADD_OPTION(TAKE_VIDEO);
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+bool HeldItemFarmerSafariZone::navigate_to_chansey(ConsoleHandle& console, ProControllerContext& context){
+    BlackScreenWatcher zone_exit(COLOR_RED);
+
+    int ret = run_until<ProControllerContext>(
+        console, context,
+        [](ProControllerContext& context){
+            ssf_press_button(context, BUTTON_B, 0ms, 4045ms);
+            pbf_press_dpad(context, DPAD_UP, 100ms, 0ms);
+            pbf_press_dpad(context, DPAD_RIGHT, 1966ms, 0ms);
+            pbf_press_dpad(context, DPAD_UP, 1800ms, 0ms);
+            pbf_press_dpad(context, DPAD_RIGHT, 600ms, 0ms);
+            pbf_wait(context, 1000ms);
+        },
+        { zone_exit }
+    );
+
+    context.wait_for_all_requests();
+
+    if (ret != 0){
+        console.log("Failed to detect zone transition after initial navigation.");
+        return false;
+    }
+
+    BlackScreenOverWatcher overworld_entered(COLOR_RED);
+
+    ret = wait_until(
+        console, context,
+        std::chrono::milliseconds(5000),
+        { overworld_entered }
+    );
+
+    if (ret != 0){
+        pbf_wait(context, 1000ms);
+        context.wait_for_all_requests();
+
+        console.log("Failed to detect overworld after first zone transition. Attempting to open Start menu as a secondary check.");
+        StartMenuWatcher start_menu(COLOR_RED);
+
+        context.wait_for_all_requests();
+        ret = run_until<ProControllerContext>(
+            console, context,
+            [](ProControllerContext& context){
+                pbf_press_button(context, BUTTON_PLUS, 200ms, 1800ms);
+            },
+            { start_menu }
+        );
+
+        if (ret != 0){
+            console.log("Failed to open Start menu.");
+            context.wait_for_all_requests();
+            pbf_mash_button(context, BUTTON_B, 1000ms);
+            return false;
+        }
+
+        pbf_mash_button(context, BUTTON_B, 1000ms);
+    }
+
+    console.log("Exiting first zone...");
+
+    pbf_wait(context, 1000ms);
+    context.wait_for_all_requests();
+
+    ret = run_until<ProControllerContext>(
+        console, context,
+        [](ProControllerContext& context){
+            ssf_press_button(context, BUTTON_B, 0ms, 143005ms);
+            pbf_press_dpad(context, DPAD_RIGHT, 1600ms, 0ms);
+            pbf_press_dpad(context, DPAD_DOWN, 100ms, 0ms);
+            pbf_press_dpad(context, DPAD_RIGHT, 2650ms, 0ms);
+            pbf_press_dpad(context, DPAD_UP, 600ms, 0ms);
+            pbf_press_dpad(context, DPAD_LEFT, 920ms, 0ms);
+            pbf_press_dpad(context, DPAD_DOWN, 325ms, 0ms);
+            pbf_press_dpad(context, DPAD_LEFT, 800ms, 0ms);
+            pbf_press_dpad(context, DPAD_UP, 2000ms, 0ms);
+            pbf_press_dpad(context, DPAD_RIGHT, 975ms, 0ms);
+            pbf_press_dpad(context, DPAD_DOWN, 300ms, 0ms);
+            pbf_press_dpad(context, DPAD_RIGHT, 550ms, 0ms);
+            pbf_press_dpad(context, DPAD_UP, 675ms, 0ms);
+            pbf_press_dpad(context, DPAD_LEFT, 2000ms, 0ms);
+            pbf_press_dpad(context, DPAD_DOWN, 130ms, 0ms);
+            pbf_press_dpad(context, DPAD_LEFT, 3300ms, 0ms);
+        },
+        { zone_exit }
+    );
+
+    if (ret != 0){
+        console.log("Failed to detect zone transition while exiting second zone.");
+        return false;
+    }
+
+    context.wait_for_all_requests();
+
+    ret = wait_until(
+        console, context,
+        std::chrono::milliseconds(5000),
+        { overworld_entered }
+    );
+
+    if (ret != 0){
+        pbf_wait(context, 1000ms);
+        context.wait_for_all_requests();
+
+        console.log("Failed to detect overworld after second zone transition. Attempting to open Start menu as a secondary check.");
+        StartMenuWatcher start_menu(COLOR_RED);
+
+        context.wait_for_all_requests();
+        ret = run_until<ProControllerContext>(
+            console, context,
+            [](ProControllerContext& context){
+                pbf_press_button(context, BUTTON_PLUS, 200ms, 1800ms);
+            },
+            { start_menu }
+        );
+
+        if (ret != 0){
+            console.log("Failed to open Start menu.");
+            context.wait_for_all_requests();
+            pbf_mash_button(context, BUTTON_B, 1000ms);
+            return false;
+        }
+
+        pbf_mash_button(context, BUTTON_B, 1000ms);
+    }
+
+    console.log("Exiting second zone...");
+
+    pbf_wait(context, 1000ms);
+    context.wait_for_all_requests();
+
+    ssf_press_button(context, BUTTON_B, 0ms, 2800ms);
+    pbf_press_dpad(context, DPAD_LEFT, 2000ms, 0ms);
+    pbf_press_dpad(context, DPAD_UP, 800ms, 0ms);
+
+    context.wait_for_all_requests();
+
+    return true;
+}
+
+void HeldItemFarmerSafariZone::navigate_to_dragonair(ConsoleHandle& console, ProControllerContext& context){
+    ssf_press_button(context, BUTTON_B, 0ms, 2848ms);
+    pbf_press_dpad(context, DPAD_UP, 1315ms, 0ms);
+    pbf_press_dpad(context, DPAD_RIGHT, 755ms, 0ms);
+    pbf_press_dpad(context, DPAD_UP, 580ms, 0ms);
+}
+
+void HeldItemFarmerSafariZone::swap_lead_pokemon(ConsoleHandle& console, ProControllerContext& context){
+    open_party_menu_from_overworld(console, context, StartMenuContext::SAFARI_ZONE);
+    pbf_press_button(context, BUTTON_A, 250ms, 100ms);
+    pbf_press_dpad(context, DPAD_UP, 250ms, 100ms);
+    pbf_press_dpad(context, DPAD_UP, 250ms, 100ms);
+    pbf_press_dpad(context, DPAD_UP, 250ms, 100ms);
+    pbf_press_button(context, BUTTON_A, 250ms, 100ms);
+    pbf_press_dpad(context, DPAD_RIGHT, 250ms, 100ms);
+    pbf_press_button(context, BUTTON_A, 250ms, 100ms);
+    pbf_wait(context, 1000ms);
+    pbf_mash_button(context, BUTTON_B, 1500ms);
+    context.wait_for_all_requests();
+}
+
+int HeldItemFarmerSafariZone::find_encounter_grass(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    ssf_press_button(context, BUTTON_B, 0ms, 400ms);
+    pbf_press_dpad(context, DPAD_RIGHT, 400ms, 0ms);
+    pbf_wait(context, 100ms);
+    context.wait_for_all_requests();
+
+    BlackScreenWatcher battle_entered(COLOR_RED);
+    AdvanceBattleDialogWatcher battle_dialog(COLOR_RED);
+
+    // This could be removed if spin in place stops drifting.
+    AdvanceWhiteDialogWatcher out_of_steps(COLOR_RED);
+
+    while (true){
+        int ret = run_until<ProControllerContext>(
+            env.console, context,
+            [](ProControllerContext& context){
+                pbf_move_left_joystick(context, { +1, 0 }, 50ms, 150ms);
+                context.wait_for_all_requests();
+                pbf_move_left_joystick(context, { -1, 0 }, 33ms, 150ms);
+                context.wait_for_all_requests();
+            },
+            { battle_entered, battle_dialog, out_of_steps }
+        );
+
+        pbf_wait(context, 100ms);
+        context.wait_for_all_requests();
+
+        switch (ret){
+        case 0:
+        case 1:
+            env.log("Battle entered.");
+            return handle_encounter(env.console, context, true) ? 1 : 0;
+        case 2:
+            env.log("Out of steps dialog detected. Resetting...");
+            return -1;
+        }
+    }
+}
+
+bool HeldItemFarmerSafariZone::is_chansey(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    std::set<std::string> subset = {
+        "nidoran-f",
+        "nidoran-m",
+        "nidorino",
+        "nidorina",
+        "exeggcute",
+        "rhyhorn",
+        "venomoth",
+        "chansey",
+        "tauros",
+    };
+
+    WildEncounterReader reader(COLOR_RED);
+    VideoOverlaySet overlays(env.console.overlay());
+    reader.make_overlays(overlays);
+
+    env.log("Reading name...");
+    VideoSnapshot screen = env.console.video().snapshot();
+    PokemonFRLG_WildEncounter encounter = reader.read_encounter(env.logger(), LANGUAGE, screen, subset);
+    env.log("Name: " + encounter.name);
+
+    return encounter.name == "chansey";
+}
+
+bool HeldItemFarmerSafariZone::is_dragonair(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    std::set<std::string> subset = {
+        "goldeen",
+        "seaking",
+        "dratini",
+        "psyduck",
+        "slowpoke",
+        "dragonair"
+    };
+
+    WildEncounterReader reader(COLOR_RED);
+    VideoOverlaySet overlays(env.console.overlay());
+    reader.make_overlays(overlays);
+
+    env.log("Reading name...");
+    VideoSnapshot screen = env.console.video().snapshot();
+    PokemonFRLG_WildEncounter encounter = reader.read_encounter(env.logger(), LANGUAGE, screen, subset);
+    env.log("Name: " + encounter.name);
+
+    return encounter.name == "dragonair";
+}
+
+bool HeldItemFarmerSafariZone::check_for_held_item(ConsoleHandle& console, ProControllerContext& context, bool returned_to_building, int party_count){
+    if (returned_to_building){
+        open_party_menu_from_overworld(console, context, StartMenuContext::STANDARD);
+    } 
+    else {
+        open_party_menu_from_overworld(console, context, StartMenuContext::SAFARI_ZONE);
+    }
+
+    PartyHeldItemDetector held_item_detector(COLOR_RED, &console.overlay(), static_cast<PartySlot>(party_count - 1), LANGUAGE);
+    if (held_item_detector.detect(console.video().snapshot())){
+        return true;
+    }
+
+    return false;
+}
+
+bool HeldItemFarmerSafariZone::run_safari_zone(SingleSwitchProgramEnvironment& env, ProControllerContext& context, int party_count){
+    HeldItemFarmerSafariZone_Descriptor::Stats& stats = env.current_stats<HeldItemFarmerSafariZone_Descriptor::Stats>();
+
+    int balls_left = 30;
+
+    while (party_count < 6){
+        send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
+        int encounter_result = -1;
+        if (ITEM_TO_FARM == ItemToFarm::LUCKY_EGG){
+            encounter_result = find_encounter_grass(env, context);
+        }else{
+            encounter_result = fish_encounter(env.console, context);
+        }
+
+        switch (encounter_result){
+        case 0:
+            stats.encounters++;
+            env.update_stats();
+            break;
+        case 1:
+            stats.encounters++;
+            stats.shinies++;
+            env.update_stats();
+            send_program_notification(
+                env,
+                NOTIFICATION_SHINY,
+                COLOR_YELLOW,
+                "Shiny found!",
+                {}, "",
+                env.console.video().snapshot(),
+                true
+            );
+            if (TAKE_VIDEO){
+                pbf_press_button(context, BUTTON_CAPTURE, 2000ms, 0ms);
+            }
+            return true;
+        case -1:
+        default:
+            // Failed to find an encounter in the allotted time or ran out of steps in the grass. Soft Reset and try again.
+            return false;
+        }
+
+        if (ITEM_TO_FARM == ItemToFarm::LUCKY_EGG){
+            if (!is_chansey(env, context)){
+                env.log("Not a Chansey. Fleeing...");
+                flee_battle(env.console, context);
+                context.wait_for_all_requests();
+                continue;
+            }
+        }else{
+            if (!is_dragonair(env, context)){
+                env.log("Not a Dragonair. Fleeing...");
+                flee_battle(env.console, context);
+                context.wait_for_all_requests();
+                continue;
+            }
+        }
+
+        env.log("Target Pokemon found!");
+        stats.target_pokemon_found++;
+        env.update_stats();
+
+        std::string encounter_name = (ITEM_TO_FARM == ItemToFarm::LUCKY_EGG) ? "chansey" : "dragonair";
+
+        int catch_result = auto_catch_safari(env.console, context, LANGUAGE, balls_left, encounter_name);
+        env.log("Catch result: " + std::to_string(catch_result));
+
+        bool caught = false;
+        if (catch_result < 0){
+            stats.errors++;
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "auto_catch_safari() encountered an error.",
+                env.console
+            );
+        }else if (catch_result == 1){
+            env.log("Target Pokemon caught!");
+            caught = true;
+            stats.target_pokemon_caught++;
+            env.update_stats();
+            party_count++;
+        }
+
+        pbf_wait(context, 500ms);
+        context.wait_for_all_requests();
+
+        WhiteDialogDetector dialog(COLOR_RED);
+        bool in_safari_zone_building = dialog.detect(env.console.video().snapshot());
+        if (in_safari_zone_building){
+            env.log("Detected Safari Zone building.");
+        }
+
+        if (balls_left <= 0){
+            env.log("Out of Safari balls.");
+            in_safari_zone_building = true;
+        }
+
+        if (in_safari_zone_building && !caught){
+            env.log("In Safari Zone building and target Pokemon not caught. Resetting.");
+            return false;
+        }
+
+        if (in_safari_zone_building){
+            pbf_mash_button(context, BUTTON_B, 500ms);
+            context.wait_for_all_requests();
+        }
+
+        if (caught){
+            if (check_for_held_item(env.console, context, in_safari_zone_building, party_count)){
+                env.log("Held Item found!");
+                stats.items++;
+                env.update_stats();
+                if (TAKE_VIDEO){
+                    pbf_press_button(context, BUTTON_CAPTURE, 2000ms, 0ms);
+                }
+                send_program_notification(
+                    env,
+                    NOTIFICATION_HELD_ITEM,
+                    Color(0xffffc0cb),
+                    "Held Item found!",
+                    {}, "",
+                    env.console.video().snapshot(),
+                    true
+                );
+                return true;
+            }
+            env.log("Held Item not found. Continuing to farm...");
+            pbf_mash_button(context, BUTTON_B, 1500ms);
+            context.wait_for_all_requests();
+        }
+
+        if (balls_left <= 0){
+            env.log("Out of Safari balls. Resetting...");
+            return false;
+        }
+    }
+
+    return false;
+}
+
+void HeldItemFarmerSafariZone::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+
+    home_black_border_check(env.console, context);
+
+    DeferredStopButtonOption::ResetOnExit reset_on_exit(STOP_AFTER_CURRENT);
+
+    open_party_menu_from_overworld(env.console, context, StartMenuContext::STANDARD);
+    PartySlot detected_party_slot = detect_last_occupied_party_slot(env.console);
+    int party_count = (int)detected_party_slot + 1;
+
+    if (party_count >= 6){
+        throw UserSetupError(env.console, "Party is full. Please remove some Pokemon from the party and try again.");
+    }
+
+    if (ITEM_TO_FARM == ItemToFarm::LUCKY_EGG && party_count == 1){
+        throw UserSetupError(env.console, "Farming Chansey requires at least 2 Pokemon in the party.");
+    }
+
+    StartMenuDetector start_menu_detector(COLOR_RED);
+    PartyMenuDetector party_menu_detector(COLOR_RED);
+
+    while (true){
+        pbf_mash_button(context, BUTTON_B, 1000ms);
+        context.wait_for_all_requests();
+        VideoSnapshot snapshot = env.console.video().snapshot();
+        if (!start_menu_detector.detect(snapshot) && !party_menu_detector.detect(snapshot)){
+            break;
+        } 
+    }
+
+    while (true){
+        env.log("Walking forward to start Safari Zone dialog.");
+        pbf_press_dpad(context, DPAD_UP, 200ms, 0ms);
+
+        WallClock start_time = current_time();
+        while (true){
+            BlackScreenWatcher safari_zone_exit(COLOR_RED);
+
+            int ret = run_until<ProControllerContext>(
+                env.console, context,
+                [](ProControllerContext& context){
+                    pbf_press_button(context, BUTTON_A, 200ms, 200ms);
+                },
+                { safari_zone_exit }
+            );
+
+            if (ret == 0){
+                env.log("Detected Safari Zone transition.");
+                break;
+            }
+
+            if (current_time() - start_time > std::chrono::seconds(60)){
+                env.log("Didn't detect Safari Zone transition after 60 seconds. Assuming entered safari zone.");
+                break;
+            }
+        }
+
+        start_time = current_time();
+        bool detected_overworld = false;
+        while (true){
+            BlackScreenOverWatcher overworld_entered(COLOR_RED);
+
+            int ret = wait_until(
+                env.console, context,
+                std::chrono::milliseconds(2000),
+                { overworld_entered }
+            );
+
+            if (ret == 0){
+                env.log("Detected overworld entered.");
+                detected_overworld = true;
+                break;
+            }
+
+            if (current_time() - start_time > std::chrono::seconds(20)){
+                env.log("Didn't detect overworld entered after 20 seconds. Checking if in overworld.");
+                if (!in_overworld(env.console, context)){
+                    env.log("Couldn't detect overworld. Resetting.");
+                    soft_reset(env.console, context);
+                    break;
+                }
+                detected_overworld = true;
+                break;
+            }
+        }
+
+        if (!detected_overworld){
+            continue;
+        }
+
+        // There is a small delay from seeing the overworld to being able to actually move.
+        pbf_wait(context, 2000ms);
+        context.wait_for_all_requests();
+
+        if (ITEM_TO_FARM == ItemToFarm::LUCKY_EGG){
+            if (!navigate_to_chansey(env.console, context)){
+                env.console.log("Navigation failed. Resetting...");
+                soft_reset(env.console, context);
+                continue;
+            }
+
+            swap_lead_pokemon(env.console, context);
+
+        }else{ // Dragon Fang
+            navigate_to_dragonair(env.console, context);
+        }
+
+        if (run_safari_zone(env, context, party_count)){
+            GO_HOME_WHEN_DONE.run_end_of_program(context);
+            return; // Already sent notification in run_safari_zone if shiny or held item found.
+        }
+
+        soft_reset(env.console, context);
+
+        if (STOP_AFTER_CURRENT.should_stop()){
+            break;
+        }
+    }
+
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+    GO_HOME_WHEN_DONE.run_end_of_program(context);
+}
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/Farming/PokemonFRLG_HeldItemFarmer-SafariZone.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/Farming/PokemonFRLG_HeldItemFarmer-SafariZone.h
new file mode 100644
index 0000000000..5d9b78f8a0
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/Farming/PokemonFRLG_HeldItemFarmer-SafariZone.h
@@ -0,0 +1,93 @@
+/*  Held Item Farmer - Safari Zone
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonFRLG_HeldItemFarmer_SafariZone_H
+#define PokemonAutomation_PokemonFRLG_HeldItemFarmer_SafariZone_H
+
+#include "Common/Cpp/Options/ButtonOption.h"
+#include "CommonFramework/Notifications/EventNotificationOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "CommonTools/Options/LanguageOCROption.h"
+#include "NintendoSwitch/NintendoSwitch_ConsoleHandle.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+class HeldItemFarmerSafariZone_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    HeldItemFarmerSafariZone_Descriptor();
+    struct Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+class HeldItemFarmerSafariZone : public SingleSwitchProgramInstance {
+public:
+    using Descriptor = HeldItemFarmerSafariZone_Descriptor;
+    HeldItemFarmerSafariZone();
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+    virtual void start_program_border_check(
+        VideoStream& stream,
+        FeedbackType feedback_type
+    ) override {
+    }
+
+private:
+    enum class ItemToFarm{
+        LUCKY_EGG,
+        DRAGON_FANG
+    };
+
+    static EnumDropdownDatabase<ItemToFarm> item_to_farm_options();
+
+    // After exiting the safari zone building navigate to grass with Chansey.
+    // Currently only supports running. Should add Surf option...
+    bool navigate_to_chansey(ConsoleHandle& console, ProControllerContext& context);
+    // After exiting the safari zone building navigate to water with Dragonair.
+    // Currently only supports running.
+    void navigate_to_dragonair(ConsoleHandle& console, ProControllerContext& context);
+    // Swap first and second pokemon. 
+    // First pokemon used to avoid encounters on the route to Chansey. Second pokemon used to improve encounter rates.
+    void swap_lead_pokemon(ConsoleHandle& console, ProControllerContext& context);
+    // Reads wild encounter name and returns true if Chansey, uses a set list of possible names in the expected area.
+    bool is_chansey(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+    // Reads wild encounter name and returns true if Dragonair, uses a set list of possible names in the expected area.
+    bool is_dragonair(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+    // Handles the grass encounter logic. Attempts to spin in place. Resets position to the top right corner of grass.
+    // returns -1 if no encounter is triggered, 0 if a non-shiny is encountered, and 1 if a shiny is encountered
+    int find_encounter_grass(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+    // Opens the party menu from a given overworld location (safari zone, or the main safari zone building)
+    // Checks the last four party slots for held items. Returns true if item detected.
+    bool check_for_held_item(ConsoleHandle& console, ProControllerContext& context, bool returned_to_building, int party_count);
+    // Handles the main loop once we are in the grass ready to search for a Chansey. 
+    // Returns true if a stop condition is met (lucky egg or shiny found).
+    // Returns false if we need to soft reset (out of safari balls, out of steps, caught a full party of Chansey).
+    bool run_safari_zone(SingleSwitchProgramEnvironment& env, ProControllerContext& context, int party_count);
+
+    EnumDropdownOption<ItemToFarm> ITEM_TO_FARM;
+    OCR::LanguageOCROption LANGUAGE;
+
+    DeferredStopButtonOption STOP_AFTER_CURRENT;
+    BooleanCheckBoxOption TAKE_VIDEO;
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
+
+    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
+    EventNotificationOption NOTIFICATION_HELD_ITEM;
+    EventNotificationOption NOTIFICATION_SHINY;
+    EventNotificationsOption NOTIFICATIONS;
+
+};
+
+}
+}
+}
+     
+
+
+
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/Farming/PokemonFRLG_ItemDuplication.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/Farming/PokemonFRLG_ItemDuplication.cpp
new file mode 100644
index 0000000000..3d37e65c2c
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/Farming/PokemonFRLG_ItemDuplication.cpp
@@ -0,0 +1,233 @@
+/*  Item Duplication
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Color.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonFRLG/Inference/PokemonFRLG_SelectionArrowDetector.h"
+#include "VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_PartyHeldItemDetector.h"
+#include "VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_DialogDetector.h"
+#include "VideoGames/PokemonFRLG/PokemonFRLG_Navigation.h"
+#include "PokemonFRLG_ItemDuplication.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+ItemDuplication_Descriptor::ItemDuplication_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonFRLG:ItemDuplication",
+        Pokemon::STRING_POKEMON + " FRLG", "Item Duplication",
+        "Programs/PokemonFRLG/ItemDuplication.html",
+        "Duplicate items using the Retro Mail glitch.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+struct ItemDuplication_Descriptor::Stats : public StatsTracker {
+    public:
+    Stats()
+        : duplications(m_stats["Items Duplicated"])
+        , errors(m_stats["Errors"])
+    {
+        m_display_order.emplace_back("Items Duplicated");
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+    }
+
+    std::atomic<uint64_t>& duplications;
+    std::atomic<uint64_t>& errors;
+};
+
+std::unique_ptr<StatsTracker> ItemDuplication_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+ItemDuplication::ItemDuplication()
+    : STOP_AFTER_CURRENT("Duplication")
+    , NUM_DUPLICATIONS(
+        "<b>Number of Duplications:</b><br>"
+        "Zero will run until 'Stop after Current Duplication' is pressed or the program is manually stopped.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        100,
+        0
+    )
+    , LANGUAGE(
+        "<b>Game Language:</b>",
+        {
+            Language::English,
+            Language::Japanese,
+            Language::Spanish,
+            Language::French,
+            Language::German,
+            Language::Italian,
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        true
+        )
+    , GO_HOME_WHEN_DONE(false)
+    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_STATUS_UPDATE,
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+{
+    PA_ADD_OPTION(STOP_AFTER_CURRENT);
+
+    PA_ADD_OPTION(LANGUAGE);
+    PA_ADD_OPTION(NUM_DUPLICATIONS);
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+void ItemDuplication::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+
+    home_black_border_check(env.console, context);
+
+    ItemDuplication_Descriptor::Stats& stats = env.current_stats<ItemDuplication_Descriptor::Stats>();
+    DeferredStopButtonOption::ResetOnExit reset_on_exit(STOP_AFTER_CURRENT);
+
+    ImageFloatBox mail_arrow_box{ 0.3670769231, 0.06373076639, 0.028, 0.077 };
+    ImageFloatBox mail_confirmation_arrow_box{ 0.7289230769, 0.4604230588, 0.029, 0.076 };
+    SelectionArrowWatcher mail_selection_arrow(COLOR_BLUE, &env.console.overlay(), mail_arrow_box);
+    PartyHeldItemWatcher farfetchd_held_item(COLOR_BLUE, &env.console.overlay(), PartySlot::ONE, LANGUAGE);
+    AdvanceWhiteDialogWatcher item_description(COLOR_BLUE);
+    SelectionArrowWatcher confirmation_arrow(COLOR_BLUE, &env.console.overlay(), SelectionArrowPositionConfirmationMenu::YES);
+    SelectionArrowWatcher mail_confirmation_arrow(COLOR_BLUE, &env.console.overlay(), mail_confirmation_arrow_box);
+
+    while (true){
+        send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
+        if (NUM_DUPLICATIONS != 0 && stats.duplications >= NUM_DUPLICATIONS){
+            break;
+        }
+
+        // Detect retro mail in bag
+        int ret = wait_until(
+            env.console, context,
+            std::chrono::seconds(4),
+            { mail_selection_arrow }
+        );
+
+        if (ret < 0){
+            stats.errors++;
+            env.update_stats();
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "program(): Unable to detect selection arrow for Retro Mail. Please ensure Retro Mail is the top slot.",
+                env.console
+            );
+        }
+
+        pbf_press_button(context, BUTTON_A, 200ms, 100ms);
+        pbf_press_dpad(context, DPAD_DOWN, 200ms, 100ms);
+        pbf_press_button(context, BUTTON_A, 200ms, 100ms);
+
+        // Detect held item to be duplicated
+        int ret2 = wait_until(
+            env.console, context,
+            std::chrono::seconds(4),
+            { farfetchd_held_item }
+        );
+
+        if (ret2 < 0){
+            stats.errors++;
+            env.update_stats();
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "program(): Unable to detect farfetchd held item. Please ensure farfetchd is holding an item to duplicate.",
+                env.console
+            );
+        }
+
+        pbf_press_button(context, BUTTON_A, 200ms, 300ms);
+
+        // Item description text box
+        int ret3 = wait_until(
+            env.console, context,
+            std::chrono::seconds(4),
+            { item_description }
+        );
+
+        if (ret3 < 0){
+            stats.errors++;
+            env.update_stats();
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "program(): Unable to detect item description.",
+                env.console
+            );
+        }
+
+        pbf_press_button(context, BUTTON_A, 200ms, 100ms);
+
+        // Confirmation prompt to swap item to farfetchd
+        int ret4 = wait_until(
+            env.console, context,
+            std::chrono::seconds(4),
+            { confirmation_arrow }
+        );
+
+        if (ret4 < 0){
+            stats.errors++;
+            env.update_stats();
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "program(): Unable to detect confirmation prompt.",
+                env.console
+            );
+        }
+        pbf_press_button(context, BUTTON_A, 200ms, 100ms);
+        pbf_wait(context, 500ms); // Quick load screen
+        context.wait_for_all_requests();
+
+        // Dectect "???" screen?
+
+        pbf_press_button(context, BUTTON_PLUS, 200ms, 100ms);
+
+        // Confirmation prompt in "???" screen
+        int ret5 = wait_until(
+            env.console, context,
+            std::chrono::seconds(4),
+            { mail_confirmation_arrow }
+        );
+
+        if (ret5 < 0){
+            stats.errors++;
+            env.update_stats();
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "program(): Unable to detect confirmation prompt on mail screen.",
+                env.console
+            );
+        }
+        pbf_press_button(context, BUTTON_A, 200ms, 100ms);
+        pbf_wait(context, 300ms); // Quick load screen
+        context.wait_for_all_requests();
+
+        stats.duplications++;
+        env.update_stats();
+
+        if (STOP_AFTER_CURRENT.should_stop()){
+            break;
+        }
+    }
+
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+    GO_HOME_WHEN_DONE.run_end_of_program(context);
+}
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/Farming/PokemonFRLG_ItemDuplication.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/Farming/PokemonFRLG_ItemDuplication.h
new file mode 100644
index 0000000000..8f938ab455
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/Farming/PokemonFRLG_ItemDuplication.h
@@ -0,0 +1,59 @@
+/*  Item Duplication
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonFRLG_ItemDuplication_H
+#define PokemonAutomation_PokemonFRLG_ItemDuplication_H
+
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "Common/Cpp/Options/ButtonOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "CommonTools/Options/LanguageOCROption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+class ItemDuplication_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    ItemDuplication_Descriptor();
+    struct Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+class ItemDuplication : public SingleSwitchProgramInstance {
+public:
+    using Descriptor = ItemDuplication_Descriptor;
+    ItemDuplication();
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+    virtual void start_program_border_check(
+        VideoStream& stream,
+        FeedbackType feedback_type
+    ) override {
+    }
+
+private:
+
+    DeferredStopButtonOption STOP_AFTER_CURRENT;
+    SimpleIntegerOption<uint32_t> NUM_DUPLICATIONS;
+    OCR::LanguageOCROption LANGUAGE;
+
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
+
+    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
+    EventNotificationsOption NOTIFICATIONS;
+
+};
+
+}
+}
+}
+
+
+
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/Farming/PokemonFRLG_NuggetBridgeFarmer.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/Farming/PokemonFRLG_NuggetBridgeFarmer.cpp
new file mode 100644
index 0000000000..10b8bad43f
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/Farming/PokemonFRLG_NuggetBridgeFarmer.cpp
@@ -0,0 +1,236 @@
+/*  Nugget Bridge Farmer
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_DialogDetector.h"
+#include "VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_BattleDialogs.h"
+#include "VideoGames/PokemonFRLG/PokemonFRLG_Navigation.h"
+#include "VideoGames/PokemonFRLG/Programs/PokemonFRLG_StartMenuNavigation.h"
+#include "PokemonFRLG_NuggetBridgeFarmer.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+NuggetBridgeFarmer_Descriptor::NuggetBridgeFarmer_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonFRLG:NuggetBridgeFarmer",
+        Pokemon::STRING_POKEMON + " FRLG", "Nugget Bridge Farmer",
+        "Programs/PokemonFRLG/NuggetBridgeFarmer.html",
+        "Farm the Nugget Bridge for money.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_RequiresPrecision,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+struct NuggetBridgeFarmer_Descriptor::Stats : public StatsTracker {
+    public:
+    Stats()
+        : nuggets(m_stats["Nuggets"])
+        , errors(m_stats["Errors"])
+    {
+        m_display_order.emplace_back("Nuggets");
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+    }
+
+    std::atomic<uint64_t>& nuggets;
+    std::atomic<uint64_t>& errors;
+};
+
+std::unique_ptr<StatsTracker> NuggetBridgeFarmer_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+NuggetBridgeFarmer::NuggetBridgeFarmer()
+    : STOP_AFTER_CURRENT("Nugget")
+    , NUM_NUGGETS(
+        "<b>Number of Nuggets:</b><br>"
+        "Zero will run until 'Stop after Current Nugget' is pressed or the program is manually stopped.",
+        LockMode::UNLOCK_WHILE_RUNNING, 
+        100, // About 2 hours of farming. 
+        0
+    )
+    , GO_HOME_WHEN_DONE(false)
+    , PERIODIC_SAVE(
+        "<b>Periodically Save:</b><br>"
+        "Save the game every this many nuggets. This reduces the loss to game crashes. Set to zero to disable.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        50,
+        0
+    )
+    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_STATUS_UPDATE,
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+{
+    PA_ADD_OPTION(STOP_AFTER_CURRENT);
+
+    PA_ADD_OPTION(NUM_NUGGETS);
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+    PA_ADD_OPTION(PERIODIC_SAVE);
+
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+void NuggetBridgeFarmer::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+
+    home_black_border_check(env.console, context);
+
+    NuggetBridgeFarmer_Descriptor::Stats& stats = env.current_stats<NuggetBridgeFarmer_Descriptor::Stats>();
+    DeferredStopButtonOption::ResetOnExit reset_on_exit(STOP_AFTER_CURRENT);
+
+    for (uint32_t nuggets_since_last_save = 0;; nuggets_since_last_save++){
+        send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
+        if (NUM_NUGGETS != 0 && stats.nuggets >= NUM_NUGGETS){
+            break;
+        }
+
+        if (PERIODIC_SAVE != 0 && nuggets_since_last_save >= PERIODIC_SAVE){
+            env.console.log("Saving game...");
+
+            save_game_to_overworld(env.console, context);
+            nuggets_since_last_save = 0;
+        }
+
+        env.console.log("Exiting Pokemon Center...");
+        while (true){
+            BlackScreenWatcher pokemon_ceter_exit(COLOR_RED);
+
+            int ret = run_until<ProControllerContext>(
+                env.console, context,
+                [](ProControllerContext& context){
+                    pbf_press_dpad(context, DPAD_DOWN, 2000ms, 0ms);
+                },
+                { pokemon_ceter_exit }
+            );
+
+            if (ret == 0){
+                break;
+            }
+        }
+
+        env.console.log("Detecting overworld...");
+        while (true){
+            BlackScreenOverWatcher overworld_entered(COLOR_RED);
+
+            int ret = wait_until(
+                env.console, context,
+                std::chrono::milliseconds(2000),
+                {overworld_entered}
+            );
+
+            if (ret == 0){
+                break;
+            }
+        }
+
+        // There is a small delay from seeing the overworld to being able to a actually move.
+        pbf_wait(context, 1000ms);
+        context.wait_for_all_requests();
+
+        env.console.log("Navigating to Team Rocket member...");
+
+        ssf_press_button(context, BUTTON_B, 0ms, 12000ms);
+        pbf_press_dpad(context, DPAD_LEFT, 590ms, 0ms);
+        pbf_press_dpad(context, DPAD_UP, 510ms, 0ms);
+        pbf_press_dpad(context, DPAD_LEFT, 1550ms, 0ms);
+        pbf_press_dpad(context, DPAD_UP, 1175ms, 0ms);
+        pbf_press_dpad(context, DPAD_RIGHT, 1950ms, 0ms);
+        pbf_press_dpad(context, DPAD_UP, 5300ms, 0ms);
+
+        context.wait_for_all_requests();
+
+        env.console.log("Starting battle...");
+        while (true){
+            BattleMenuWatcher battle_menu(COLOR_RED);
+
+            int ret = run_until<ProControllerContext>(
+                env.console, context,
+                [](ProControllerContext& context){
+                    pbf_mash_button(context, BUTTON_B, 2000ms);
+                },
+                { battle_menu }
+            );
+
+            if (ret == 0){
+                break;
+            }
+        }
+
+        env.console.log("Loosing battle...");
+        while (true){
+            BlackScreenWatcher battle_lost(COLOR_RED);
+
+            int ret = run_until<ProControllerContext>(
+                env.console, context,
+                [](ProControllerContext& context){
+                    pbf_mash_button(context, BUTTON_A, 2000ms);
+                },
+                { battle_lost }
+            );
+
+            if (ret == 0){
+                break;
+            }
+        }
+
+        env.console.log("Talking to nurse joy...");
+        while (true){
+            WhiteDialogWatcher nurse_joy_dialog(COLOR_RED);
+            int ret = run_until<ProControllerContext>(
+                env.console, context,
+                [](ProControllerContext& context){
+                    pbf_mash_button(context, BUTTON_B, 2000ms);
+                },
+                { nurse_joy_dialog }
+            );
+
+            if (ret == 0){
+                break;
+            }
+        }
+
+        // Spam B till nurse joy stops talking
+        while (true){
+            WhiteDialogWatcher nurse_joy_dialog(COLOR_RED);
+            int ret = run_until<ProControllerContext>(
+                env.console, context,
+                [](ProControllerContext& context){
+                    pbf_mash_button(context, BUTTON_B, 2000ms);
+                },
+                { nurse_joy_dialog }
+            );
+
+            if (ret != 0){
+                break;
+            }
+        }
+
+        stats.nuggets++;
+        env.update_stats();
+
+        if (STOP_AFTER_CURRENT.should_stop()){
+            break;
+        }
+    }
+
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+    GO_HOME_WHEN_DONE.run_end_of_program(context);
+}
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/Farming/PokemonFRLG_NuggetBridgeFarmer.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/Farming/PokemonFRLG_NuggetBridgeFarmer.h
new file mode 100644
index 0000000000..610dfc4c5e
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/Farming/PokemonFRLG_NuggetBridgeFarmer.h
@@ -0,0 +1,59 @@
+/*  Nugget Bridge Farmer
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonFRLG_NuggetBridgeFarmer_H
+#define PokemonAutomation_PokemonFRLG_NuggetBridgeFarmer_H
+
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "Common/Cpp/Options/ButtonOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+class NuggetBridgeFarmer_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    NuggetBridgeFarmer_Descriptor();
+    struct Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+class NuggetBridgeFarmer : public SingleSwitchProgramInstance {
+public:
+    using Descriptor = NuggetBridgeFarmer_Descriptor;
+    NuggetBridgeFarmer();
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+    virtual void start_program_border_check(
+        VideoStream& stream,
+        FeedbackType feedback_type
+    ) override {
+    }
+
+private:
+
+    DeferredStopButtonOption STOP_AFTER_CURRENT;
+    SimpleIntegerOption<uint32_t> NUM_NUGGETS;
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
+
+    SimpleIntegerOption<uint32_t> PERIODIC_SAVE;
+
+    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
+    EventNotificationsOption NOTIFICATIONS;
+
+};
+
+}
+}
+}
+     
+
+
+
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/Farming/PokemonFRLG_PickupFarmer.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/Farming/PokemonFRLG_PickupFarmer.cpp
new file mode 100644
index 0000000000..4d5638c2c1
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/Farming/PokemonFRLG_PickupFarmer.cpp
@@ -0,0 +1,368 @@
+/*  Pickup Farmer
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_BattleDialogs.h"
+#include "VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_PartyDialogs.h"
+#include "VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_PartyMenuDetector.h"
+#include "VideoGames/PokemonFRLG/Programs/PokemonFRLG_StartMenuNavigation.h"
+#include "VideoGames/PokemonFRLG/PokemonFRLG_Navigation.h"
+#include "PokemonFRLG_PickupFarmer.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+PickupFarmer_Descriptor::PickupFarmer_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonFRLG:PickupFarmer",
+        Pokemon::STRING_POKEMON + " FRLG", "Pickup Farmer",
+        "Programs/PokemonFRLG/PickupFarmer.html",
+        "Farms berries, nuggets, rare candies, PP-UP, and TM10 by battling wild encounters and periodically checking for picked-up items.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+struct PickupFarmer_Descriptor::Stats : public StatsTracker{
+    Stats()
+        : encounters(m_stats["Encounters Won"])
+        , item_checks(m_stats["Item Checks"])
+        , healing_trips(m_stats["Healing Trips"])
+        , times_fainted(m_stats["Times Fainted"])
+        , shinies(m_stats["Shinies"])
+        , errors(m_stats["Errors"])
+    {
+        m_display_order.emplace_back("Encounters Won");
+        m_display_order.emplace_back("Item Checks");
+        m_display_order.emplace_back("Healing Trips");
+        m_display_order.emplace_back("Times Fainted", HIDDEN_IF_ZERO);
+        m_display_order.emplace_back("Shinies", HIDDEN_IF_ZERO);
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+    }
+    std::atomic<uint64_t>& encounters;
+    std::atomic<uint64_t>& item_checks;
+    std::atomic<uint64_t>& healing_trips;
+    std::atomic<uint64_t>& times_fainted;
+    std::atomic<uint64_t>& shinies;
+    std::atomic<uint64_t>& errors;
+};
+std::unique_ptr<StatsTracker> PickupFarmer_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+PickupFarmer::PickupFarmer()
+    : GAME_LOCATION(
+        "<b>Game Location:</b><br>",
+        {
+            {GameLocation::route1,  "route1",  "Route 1"},
+            {GameLocation::route22, "route22", "Route 22"}
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        GameLocation::route1
+    )
+    , TRAVEL_METHOD(
+        "<b>Travel Method:</b><br>This move should be learned by the last " + Pokemon::STRING_POKEMON + " in your party.",
+        {
+            {TravelMethod::fly,  "fly",  "Fly"},
+            {TravelMethod::teleport, "teleport", "Teleport"}
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        TravelMethod::fly
+    )
+    , MAX_ENCOUNTERS(
+        "<b>Max Encounters to Defeat:</b><br>Set to 0 to continue indefinitely.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        0, 0 // default, min
+    )
+    , BATTLES_PER_ITEM_CHECK(
+        "<b>Number of battles between item checks:</b><br>",
+        LockMode::LOCK_WHILE_RUNNING,
+        10, 1 // default, min
+    )
+    , PREVENT_EVOLUTION(
+        "<b>Prevent " + Pokemon::STRING_POKEMON + " from evolving</b>",
+        LockMode::LOCK_WHILE_RUNNING, 
+        false // default
+    )
+    , STOP_ON_MOVE_LEARN(
+        "<b>Quit when a new move is learned</b><br>Stop this program when a new move is learned. If unchecked, new moves will not be learned.",
+        LockMode::LOCK_WHILE_RUNNING, 
+        false // default
+    )
+    , IGNORE_SHINIES(
+        "<b>Ignore shinies</b><br>Do not stop the program when a wild shiny is encountered.",
+        LockMode::LOCK_WHILE_RUNNING, 
+        false // default
+    )
+    , TAKE_VIDEO(
+        "<b>Take Video:</b><br>Record a video when the shiny is found.", 
+        LockMode::UNLOCK_WHILE_RUNNING, 
+        true // default
+    )
+    , GO_HOME_WHEN_DONE(true)
+    , NOTIFICATION_SHINY(
+        "Shiny found",
+        true, true, ImageAttachmentMode::JPG,
+        {"Notifs", "Showcase"}
+    )
+    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_SHINY,
+        &NOTIFICATION_STATUS_UPDATE,
+        &NOTIFICATION_PROGRAM_FINISH,
+    })
+{
+    PA_ADD_OPTION(GAME_LOCATION);
+    PA_ADD_OPTION(TRAVEL_METHOD);
+    PA_ADD_OPTION(MAX_ENCOUNTERS);
+    PA_ADD_OPTION(BATTLES_PER_ITEM_CHECK);
+    PA_ADD_OPTION(STOP_ON_MOVE_LEARN);
+    PA_ADD_OPTION(IGNORE_SHINIES);
+    PA_ADD_OPTION(TAKE_VIDEO);
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+namespace{
+
+void walk_to_route1(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    env.log("Walking to Route 1.");
+    // left a couple of steps
+    pbf_move_left_joystick(context, {-1, 0}, 800ms, 100ms);
+    // down to the tall grass
+    pbf_move_left_joystick(context, {0, -1}, 5200ms, 100ms);
+    // left and up to the corner
+    pbf_move_left_joystick(context, {-1, 0}, 900ms, 100ms);
+    pbf_move_left_joystick(context, {0, +1}, 900ms, 900ms);
+    context.wait_for_all_requests();
+}
+
+void walk_to_route22(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    env.log("Walking to Route 22.");
+    // left a few steps
+    pbf_move_left_joystick(context, {-1, 0}, 900ms, 200ms);
+    // up to the bush
+    pbf_move_left_joystick(context, {0, +1}, 2300ms, 200ms);
+    // left to the trees
+    pbf_move_left_joystick(context, {-1, 0}, 7800ms, 200ms);
+    // down and over the ledge
+    pbf_move_left_joystick(context, {0, -1}, 3000ms, 200ms);
+    // left a couple of steps
+    pbf_move_left_joystick(context, {-1, 0}, 600ms, 200ms);
+    // up to into the grass
+    pbf_move_left_joystick(context, {0, +1}, 1500ms, 500ms);
+    context.wait_for_all_requests();
+}
+
+void take_pickup_items(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    env.log("Collecting items from party.");
+    open_party_menu_from_overworld(env.console, context);
+    pbf_move_left_joystick(context, {+1, 0}, 200ms, 300ms); // move to slot 2
+
+    PartySelectionWatcher selection_open(COLOR_RED);
+    int ret;
+    // take items from positions 2-5. This works even if they haven't picked up an item
+    for(int i = 2; i <= 5; i++){
+        context.wait_for_all_requests();
+        ret = run_until<ProControllerContext>(
+            env.console, context,
+            [](ProControllerContext& context){
+                pbf_press_button(context, BUTTON_A, 200ms, 1800ms);
+            },
+            { selection_open }
+        );
+        if (ret < 0){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "Failed to detect selection menu.",
+                env.console
+            );
+        }
+        pbf_move_left_joystick(context, {0, +1}, 200ms, 300ms);
+        pbf_move_left_joystick(context, {0, +1}, 200ms, 300ms);
+        pbf_press_button(context, BUTTON_A, 200ms, 300ms);
+        pbf_move_left_joystick(context, {0, -1}, 200ms, 300ms);
+        pbf_press_button(context, BUTTON_A, 200ms, 1300ms);
+        pbf_press_button(context, BUTTON_A, 200ms, 300ms);
+        pbf_move_left_joystick(context, {0, -1}, 200ms, 300ms);
+    }
+    // close the start menu
+    pbf_press_button(context, BUTTON_B, 200ms, 300ms);
+    pbf_press_button(context, BUTTON_B, 200ms, 800ms);
+    close_start_menu(env.console, context);
+}
+
+} // namespace
+
+
+void PickupFarmer::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    /*
+    * Settings: Text Speed fast
+    */
+
+    PickupFarmer_Descriptor::Stats& stats = env.current_stats<PickupFarmer_Descriptor::Stats>();
+
+    home_black_border_check(env.console, context);
+
+    bool shiny_found = false;
+    bool failed_encounter = false;
+
+    bool spin_leftright = true;
+    bool out_of_pp = false;
+    uint16_t encounters_since_item_check = 0;
+    
+    while (!shiny_found){
+        try{
+            if (stats.encounters == 0 || failed_encounter || out_of_pp){
+                switch (TRAVEL_METHOD){
+                case TravelMethod::fly:
+                    open_fly_map_from_overworld(env.console, context);
+                    fly_from_kanto_map(env.console, context, KantoFlyLocation::viridiancity);
+                    break;
+                case TravelMethod::teleport:
+                    use_teleport_from_overworld(env.console, context);
+                    break;
+                default:
+                OperationFailedExceptionWithScreenshot::fire(
+                    ErrorReportMode::SEND_ERROR_REPORT,
+                    "Travel option not recognized. Please report this as a bug.",
+                    env.console
+                );
+                }
+                enter_pokecenter(env.console, context);
+                heal_at_pokecenter(env.console, context);
+                leave_pokecenter(env.console, context);
+                stats.healing_trips++;
+                switch (GAME_LOCATION){
+                case GameLocation::route1:
+                    walk_to_route1(env, context);
+                    break;
+                case GameLocation::route22:
+                    walk_to_route22(env, context);
+                    break;
+                default:
+                    OperationFailedExceptionWithScreenshot::fire(
+                        ErrorReportMode::SEND_ERROR_REPORT,
+                        "Game location not recognized. Please report this as a bug.",
+                        env.console
+                    );
+                }
+                
+                out_of_pp = false;
+                failed_encounter = false;
+                spin_leftright = true;
+            }
+
+            uint16_t errors = 0;
+            int ret = grass_spin(env.console, context, spin_leftright);
+            shiny_found = (ret == 1);
+            if (ret < 0){
+                failed_encounter = true;
+                env.log("Failed to trigger encounter: traveling back to PokeCenter");
+                errors++;
+                if (errors >= 5){
+                    OperationFailedExceptionWithScreenshot::fire(
+                        ErrorReportMode::SEND_ERROR_REPORT,
+                        "Failed 5 times to trigger a wild encounter within 60 seconds",
+                        env.console
+                    );
+                }
+                // exit a menu in case there is one open
+                pbf_mash_button(context, BUTTON_B, 1000ms);
+                continue;
+            }else{
+                spin_leftright = !spin_leftright;
+            }
+
+            if (shiny_found && !IGNORE_SHINIES){
+                env.log("Shiny found!");
+                stats.shinies++;
+                VideoSnapshot screen = env.console.video().snapshot();
+                send_program_notification(
+                    env,
+                    NOTIFICATION_SHINY,
+                    COLOR_YELLOW,
+                    "Shiny found!",
+                    {}, "",
+                    screen,
+                    true
+                );
+                if (TAKE_VIDEO){
+                    pbf_press_button(context, BUTTON_CAPTURE, 2000ms, 0ms);
+                }
+                break;
+            }
+            shiny_found = false;
+
+            BattleResult ret2 = spam_first_move(env.console, context);
+            if (ret2 == BattleResult::playerfainted){
+                stats.times_fainted++;
+                out_of_pp = true; // triggers a healing trip
+                //TODO: handle exiting the battle in case the player can't escape (due to low speed stat)
+                pbf_mash_button(context, BUTTON_B, 5000ms);
+                context.wait_for_all_requests();
+            }else if (ret2 == BattleResult::unknown){ // battle fled (no EV gain)
+                // continue;
+            }else if (ret2 == BattleResult::outofpp){
+                out_of_pp = true;
+            }else if (ret2 == BattleResult::opponentfainted){
+                stats.encounters++;
+                encounters_since_item_check++;
+                bool move_learned = exit_wild_battle(env.console, context, !!STOP_ON_MOVE_LEARN, !!PREVENT_EVOLUTION);
+                if (move_learned && STOP_ON_MOVE_LEARN){
+                    send_program_status_notification(
+                        env, NOTIFICATION_STATUS_UPDATE,
+                        "Stopping: move learned."
+                    );
+                    break;
+                }
+            }
+
+            if (encounters_since_item_check >= BATTLES_PER_ITEM_CHECK){
+                take_pickup_items(env, context);
+                stats.item_checks++;
+                encounters_since_item_check = 0;
+            }
+
+            if (MAX_ENCOUNTERS > 0 && stats.encounters >= MAX_ENCOUNTERS){
+                send_program_status_notification(
+                    env, NOTIFICATION_STATUS_UPDATE,
+                    "Maximum resets reached."
+                );
+                break;
+            }else{
+                send_program_status_notification(
+                    env, NOTIFICATION_STATUS_UPDATE,
+                    "Farming."
+                );
+                env.update_stats();
+                context.wait_for_all_requests();
+            }
+        }catch (OperationFailedException&){
+            stats.errors++;
+            throw;
+        }
+    }
+
+    if (GO_HOME_WHEN_DONE){
+        pbf_press_button(context, BUTTON_HOME, 200ms, 1000ms);
+    }
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+}
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/Farming/PokemonFRLG_PickupFarmer.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/Farming/PokemonFRLG_PickupFarmer.h
new file mode 100644
index 0000000000..5a210a8174
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/Farming/PokemonFRLG_PickupFarmer.h
@@ -0,0 +1,72 @@
+/*  Pickup Farmer
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonFRLG_PickupFarmer_H
+#define PokemonAutomation_PokemonFRLG_PickupFarmer_H
+
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+class PickupFarmer_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    PickupFarmer_Descriptor();
+    struct Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+class PickupFarmer : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = PickupFarmer_Descriptor;
+    PickupFarmer();
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext &context) override;
+    virtual void start_program_border_check(
+        VideoStream& stream,
+        FeedbackType feedback_type
+    ) override{}
+
+private:
+    enum class GameLocation{
+        route1,
+        route22
+    };
+
+    enum class TravelMethod{
+        fly,
+        teleport
+    };
+
+
+    EnumDropdownOption<GameLocation> GAME_LOCATION;
+    EnumDropdownOption<TravelMethod> TRAVEL_METHOD;
+
+    SimpleIntegerOption<uint64_t> MAX_ENCOUNTERS;
+    SimpleIntegerOption<uint64_t> BATTLES_PER_ITEM_CHECK;
+
+    BooleanCheckBoxOption PREVENT_EVOLUTION;
+    BooleanCheckBoxOption STOP_ON_MOVE_LEARN;
+    BooleanCheckBoxOption IGNORE_SHINIES;
+
+    BooleanCheckBoxOption TAKE_VIDEO;
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
+    EventNotificationOption NOTIFICATION_SHINY;
+    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+}
+}
+}
+#endif
+
+
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/PokemonFRLG_BattleMenuNavigation.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/PokemonFRLG_BattleMenuNavigation.cpp
new file mode 100644
index 0000000000..bb7ac34c24
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/PokemonFRLG_BattleMenuNavigation.cpp
@@ -0,0 +1,124 @@
+/*  Battle Menu Navigation
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "cmath"
+#include "limits"
+#include "functional"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+#include "NintendoSwitch/NintendoSwitch_ConsoleHandle.h"
+#include "VideoGames/PokemonFRLG/Inference/PokemonFRLG_BattleSelectionArrowDetector.h"
+#include "PokemonFRLG_BattleMenuNavigation.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+
+namespace{
+
+const int BATTLE_MENU_COLS = 2;
+
+bool move_cursor_2d_impl(
+    ConsoleHandle& console,
+    ProControllerContext& context,
+    const ImageFloatBox& search_box,
+    int option_count,
+    int cols,
+    std::function<ImageFloatBox(int)> box_for_index,
+    int destination_index
+){
+    BattleSelectionArrowWatcher arrow(COLOR_RED, &console.overlay(), search_box);
+
+    int ret = wait_until(
+        console, context,
+        std::chrono::seconds(2),
+        { arrow }
+    );
+
+    if (ret < 0){
+        console.log("Unable to detect battle selection arrow. Not moving cursor.", COLOR_RED);
+        return false;
+    }
+
+    double detected_cx = arrow.last_detected().x + arrow.last_detected().width / 2.0;
+    double detected_cy = arrow.last_detected().y + arrow.last_detected().height / 2.0;
+
+    int current_index = 0;
+    double closest_dist = std::numeric_limits<double>::max();
+    for (int i = 0; i < option_count; i++){
+        ImageFloatBox pos_box = box_for_index(i);
+        double cx = pos_box.x + pos_box.width / 2.0;
+        double cy = pos_box.y + pos_box.height / 2.0;
+        double dx = detected_cx - cx;
+        double dy = detected_cy - cy;
+        double dist = dx * dx + dy * dy;
+        if (dist < closest_dist){
+            closest_dist = dist;
+            current_index = i;
+        }
+    }
+
+    int current_row = current_index / cols;
+    int current_col = current_index % cols;
+    int dest_row = destination_index / cols;
+    int dest_col = destination_index % cols;
+
+    int row_diff = dest_row - current_row;
+    for (int i = 0; i < std::abs(row_diff); i++){
+        pbf_press_dpad(context, row_diff > 0 ? DPAD_DOWN : DPAD_UP, 320ms, 400ms);
+    }
+
+    int col_diff = dest_col - current_col;
+    for (int i = 0; i < std::abs(col_diff); i++){
+        pbf_press_dpad(context, col_diff > 0 ? DPAD_RIGHT : DPAD_LEFT, 320ms, 400ms);
+    }
+
+    context.wait_for_all_requests();
+    return true;
+}
+
+} // anonymous namespace
+
+
+bool move_cursor_to_option(ConsoleHandle& console, ProControllerContext& context, BattleMenuOption destination){
+    return move_cursor_2d_impl(
+        console, context,
+        BATTLE_MENU_ARROW_BOX,
+        BATTLE_MENU_OPTION_COUNT,
+        BATTLE_MENU_COLS,
+        [](int i){ return BattleSelectionArrowDetector::box_for_option(static_cast<BattleMenuOption>(i)); },
+        static_cast<int>(destination)
+    );
+}
+
+bool move_cursor_to_option(ConsoleHandle& console, ProControllerContext& context, BattleMoveOption destination){
+    return move_cursor_2d_impl(
+        console, context,
+        BATTLE_MOVE_ARROW_BOX,
+        BATTLE_MOVE_OPTION_COUNT,
+        BATTLE_MENU_COLS,
+        [](int i){ return BattleSelectionArrowDetector::box_for_option(static_cast<BattleMoveOption>(i)); },
+        static_cast<int>(destination)
+    );
+}
+
+bool move_cursor_to_option(ConsoleHandle& console, ProControllerContext& context, SafariBattleMenuOption destination){
+    return move_cursor_2d_impl(
+        console, context,
+        BATTLE_MENU_ARROW_BOX,
+        SAFARI_BATTLE_MENU_OPTION_COUNT,
+        BATTLE_MENU_COLS,
+        [](int i){ return BattleSelectionArrowDetector::box_for_option(static_cast<SafariBattleMenuOption>(i)); },
+        static_cast<int>(destination)
+    );
+}
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/PokemonFRLG_BattleMenuNavigation.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/PokemonFRLG_BattleMenuNavigation.h
new file mode 100644
index 0000000000..cf1b7fa8e4
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/PokemonFRLG_BattleMenuNavigation.h
@@ -0,0 +1,50 @@
+/*  Battle Menu Navigation
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonFRLG_BattleMenuNavigation_H
+#define PokemonAutomation_PokemonFRLG_BattleMenuNavigation_H
+
+#include "VideoGames/PokemonFRLG/Inference/PokemonFRLG_BattleSelectionArrowDetector.h"
+
+namespace PokemonAutomation{
+
+template <typename Type> class ControllerContext;
+
+namespace NintendoSwitch{
+
+class ConsoleHandle;
+class ProController;
+using ProControllerContext = ControllerContext<ProController>;
+
+namespace PokemonFRLG{
+
+
+// Starting from the normal battle command menu, move the selection arrow to the specified option.
+// Returns true if successful, false otherwise (e.g. if selection arrow is not detected).
+bool move_cursor_to_option(
+    ConsoleHandle& console, ProControllerContext& context,
+    BattleMenuOption destination
+);
+
+// Starting from the FIGHT move list, move the selection arrow to the specified move.
+// Returns true if successful, false otherwise (e.g. if selection arrow is not detected).
+bool move_cursor_to_option(
+    ConsoleHandle& console, ProControllerContext& context,
+    BattleMoveOption destination
+);
+
+// Starting from the Safari Zone battle command menu, move the selection arrow to the specified option.
+// Returns true if successful, false otherwise (e.g. if selection arrow is not detected).
+bool move_cursor_to_option(
+    ConsoleHandle& console, ProControllerContext& context,
+    SafariBattleMenuOption destination
+);
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/PokemonFRLG_SafariOptimalAction.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/PokemonFRLG_SafariOptimalAction.cpp
new file mode 100644
index 0000000000..9b017f6879
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/PokemonFRLG_SafariOptimalAction.cpp
@@ -0,0 +1,94 @@
+/*  FRLG Safari Optimal Action
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Json/JsonValue.h"
+#include "Common/Cpp/Json/JsonArray.h"
+#include "CommonFramework/GlobalAutoPaths.h"
+#include "NintendoSwitch/NintendoSwitch_ConsoleHandle.h"
+#include "VideoGames/PokemonFRLG/Programs/PokemonFRLG_SafariOptimalAction.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+namespace{
+
+SafariBattleMenuOption parse_safari_action(const JsonValue& json, const std::string& path){
+    int64_t value = json.to_integer_throw(path);
+    switch (value){
+    case 0:
+        return SafariBattleMenuOption::BALL;
+    case 1:
+        return SafariBattleMenuOption::BAIT;
+    case 2:
+        return SafariBattleMenuOption::ROCK;
+    case 3:
+        return SafariBattleMenuOption::RUN;
+    default:
+        throw JsonParseException(path, "Invalid SafariBattleMenuOption value: " + std::to_string(value));
+    }
+}
+
+}
+
+SafariOptimalAction::SafariOptimalAction(Language game_language){
+    std::string language_folder = game_language == Language::Japanese ? "Japanese/" : "International/";
+    std::string path = RESOURCE_PATH() + "PokemonFRLG/SafariOptimalAction/" + language_folder;
+
+    for (const std::string& pokemon_name : SAFARI_ZONE_POKEMON_SUBSET){
+        std::string json_path = path + pokemon_name + ".json";
+        JsonValue json = load_json_file(json_path);
+        JsonArray& root = json.to_array_throw(json_path);
+
+        std::vector<std::vector<SafariBattleMenuOption>>& action_table = m_action_table_by_pokemon[pokemon_name];
+        action_table.reserve(root.size());
+
+        for (const JsonValue& row_value : root){
+            const JsonArray& row = row_value.to_array_throw(json_path);
+            std::vector<SafariBattleMenuOption>& actions = action_table.emplace_back();
+            actions.reserve(row.size());
+
+            for (const JsonValue& action_value : row){
+                actions.emplace_back(parse_safari_action(action_value, json_path));
+            }
+        }
+    }
+}
+
+std::optional<std::reference_wrapper<const std::vector<SafariBattleMenuOption>>> SafariOptimalAction::get_optimal_actions(
+    ConsoleHandle& console,
+    const std::string& pokemon_name,
+    int balls_remaining
+) const{
+    if (balls_remaining < 1 || balls_remaining > 30){
+        console.log("Invalid number of Safari Balls remaining: " + std::to_string(balls_remaining));
+        return std::nullopt;
+    }
+
+    auto iter = m_action_table_by_pokemon.find(pokemon_name);
+    if (iter == m_action_table_by_pokemon.end()){
+        console.log("Unknown Pokemon: " + pokemon_name);
+        return std::nullopt;
+    }
+
+    const std::vector<std::vector<SafariBattleMenuOption>>& action_table = iter->second;
+    if ((size_t)balls_remaining > action_table.size()){
+        console.log("Invalid number of Safari Balls remaining: " + std::to_string(balls_remaining));
+        return std::nullopt;
+    }
+
+    const std::vector<SafariBattleMenuOption>& actions = action_table[balls_remaining - 1];
+    if (actions.empty()){
+        console.log("No actions available for Pokemon: " + pokemon_name + " with " + std::to_string(balls_remaining) + " Safari Balls remaining.");
+        return std::nullopt;
+    }
+
+    return std::cref(actions);
+}
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/PokemonFRLG_SafariOptimalAction.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/PokemonFRLG_SafariOptimalAction.h
new file mode 100644
index 0000000000..b4d0da7155
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/PokemonFRLG_SafariOptimalAction.h
@@ -0,0 +1,45 @@
+/*  FRLG Safari Optimal Action
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonFRLG_SafariOptimalAction
+#define PokemonAutomation_PokemonFRLG_SafariOptimalAction
+
+#include <map>
+#include <optional>
+#include <set>
+#include <string>
+#include <vector>
+
+#include "CommonFramework/Language.h"
+#include "VideoGames/PokemonFRLG/Inference/PokemonFRLG_BattleSelectionArrowDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+    class ConsoleHandle;
+namespace PokemonFRLG{
+
+static const std::set<std::string> SAFARI_ZONE_POKEMON_SUBSET = {
+    "chansey", "doduo", "dragonair", "dratini", "exeggcute", "goldeen", "kangaskhan", "magikarp", "nidoran", "nidorina", "nidorino", "paras", "parasect", "pinsir", "poliwag", "psyduck", "rhyhorn", "scyther", "seaking", "slowpoke", "tauros", "venomoth", "venonat"
+};
+
+class SafariOptimalAction
+{
+public:
+    SafariOptimalAction(Language game_language);
+
+    // Returns the optimal action sequence for the given Pokemon and number of Safari Balls remaining.
+    // Returns std::nullopt if no actions are available.
+    std::optional<std::reference_wrapper<const std::vector<SafariBattleMenuOption>>> get_optimal_actions(ConsoleHandle& console, const std::string& pokemon_name, int balls_remaining) const;
+
+private:
+    std::map<std::string, std::vector<std::vector<SafariBattleMenuOption>>> m_action_table_by_pokemon;
+};
+
+}
+}
+}
+
+#endif
\ No newline at end of file
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/PokemonFRLG_StartMenuNavigation.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/PokemonFRLG_StartMenuNavigation.cpp
new file mode 100644
index 0000000000..b9bce90f60
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/PokemonFRLG_StartMenuNavigation.cpp
@@ -0,0 +1,244 @@
+/*  Start Menu Navigation
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Time.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+#include "NintendoSwitch/NintendoSwitch_ConsoleHandle.h"
+#include "VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_StartMenuDetector.h"
+#include "VideoGames/PokemonFRLG/Inference/PokemonFRLG_SelectionArrowDetector.h"
+#include "PokemonFRLG_StartMenuNavigation.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG {
+
+void open_start_menu(ConsoleHandle& console, ProControllerContext& context){
+    uint16_t errors = 0;
+
+    while(true){
+        if (errors > 5){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "Failed to open Start menu 5 times in a row.",
+                console
+            );
+        }
+
+        StartMenuWatcher start_menu(COLOR_RED);
+
+        context.wait_for_all_requests();
+        int ret = run_until<ProControllerContext>(
+            console, context,
+            [](ProControllerContext& context){
+                pbf_wait(context, 500ms);
+                pbf_press_button(context, BUTTON_PLUS, 200ms, 1800ms);
+            },
+            { start_menu }
+        );
+
+        if (ret < 0){
+            console.log("Failed to open Start menu.");
+            errors++;
+            context.wait_for_all_requests();
+            pbf_mash_button(context, BUTTON_B, 1000ms);
+            continue;
+        }
+        
+        console.log("Start menu opened.");
+        return;
+    }
+}
+
+void close_start_menu(ConsoleHandle& console, ProControllerContext& context){
+    pbf_mash_button(context, BUTTON_B, 1000ms);
+    // TODO: add overworld detection
+    console.log("Start menu closed.");
+}
+
+namespace {
+
+bool move_cursor_impl(
+    ConsoleHandle& console,
+    ProControllerContext& context,
+    const ImageFloatBox& search_box,
+    int option_count,
+    std::function<ImageFloatBox(int)> box_for_index,
+    int destination_index
+){
+    SelectionArrowWatcher arrow(COLOR_RED, &console.overlay(), search_box);
+
+    int ret = wait_until(
+        console, context,
+        std::chrono::seconds(2),
+        { arrow }
+    );
+
+    if (ret < 0){
+        console.log("Unable to detect selection arrow. Not moving cursor.", COLOR_RED);
+        return false;
+    }
+
+    double detected_center_y = arrow.last_detected().y + arrow.last_detected().height / 2;
+    int current_index = 0;
+    double closest_dist = std::numeric_limits<double>::max();
+    for (int i = 0; i < option_count; i++){
+        ImageFloatBox pos_box = box_for_index(i);
+        double pos_center_y = pos_box.y + pos_box.height / 2;
+        double dist = std::abs(detected_center_y - pos_center_y);
+        if (dist < closest_dist){
+            closest_dist = dist;
+            current_index = i;
+        }
+    }
+
+    int forward = (destination_index - current_index + option_count) % option_count;
+    int backward = (current_index - destination_index + option_count) % option_count;
+    if (forward <= backward){
+        for (int i = 0; i < forward; i++){
+            pbf_press_dpad(context, DPAD_DOWN, 320ms, 400ms);
+        }
+    }else{
+        for (int i = 0; i < backward; i++){
+            pbf_press_dpad(context, DPAD_UP, 320ms, 400ms);
+        }
+    }
+    context.wait_for_all_requests();
+
+    return true;
+}
+
+} // anonymous namespace
+
+bool move_cursor_to_position(ConsoleHandle& console, ProControllerContext& context, SelectionArrowPositionStartMenu destination){
+    return move_cursor_impl(
+        console, context,
+        MENU_ARROW_BOX,
+        START_MENU_OPTION_COUNT,
+        [](int i){ return SelectionArrowDetector::arrow_box_for_position(static_cast<SelectionArrowPositionStartMenu>(i)); },
+        static_cast<int>(destination)
+    );
+}
+
+bool move_cursor_to_position(ConsoleHandle& console, ProControllerContext& context, SelectionArrowPositionSafariMenu destination){
+    return move_cursor_impl(
+        console, context,
+        MENU_ARROW_BOX,
+        SAFARI_START_MENU_OPTION_COUNT,
+        [](int i){ return SelectionArrowDetector::arrow_box_for_position(static_cast<SelectionArrowPositionSafariMenu>(i)); },
+        static_cast<int>(destination)
+    );
+}
+
+bool move_cursor_to_position(ConsoleHandle& console, ProControllerContext& context, SelectionArrowPositionNoDexMenu destination){
+    return move_cursor_impl(
+        console, context,
+        MENU_ARROW_BOX,
+        NO_DEX_START_MENU_OPTION_COUNT,
+        [](int i){ return SelectionArrowDetector::arrow_box_for_position(static_cast<SelectionArrowPositionNoDexMenu>(i)); },
+        static_cast<int>(destination)
+    );
+}
+
+void save_game_to_overworld(ConsoleHandle& console, ProControllerContext& context){
+
+    WallClock start = current_time();
+    while (true){
+        context.wait_for_all_requests();
+
+        if (current_time() - start > std::chrono::seconds(120)){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "save_game_to_overworld(): Unable to save game after 2 minutes.",
+                console
+            );
+        }
+
+        StartMenuWatcher start_menu = StartMenuWatcher(COLOR_RED);
+
+        int ret = wait_until(
+            console, context,
+            std::chrono::seconds(1),
+            {
+                start_menu
+            }
+        );
+
+        if (ret != 0){
+            console.log("Start menu not detected. Attempting to open start menu.");
+            pbf_press_button(context, BUTTON_X, 320ms, 320ms);
+            context.wait_for_all_requests();
+            continue;
+        }
+
+        if (!move_cursor_to_position(console, context, SelectionArrowPositionStartMenu::SAVE)){
+            console.log("Unable to detect selection arrow. Attempting to open start menu again.");
+            pbf_mash_button(context, BUTTON_B, 320ms);
+            context.wait_for_all_requests();
+            continue;
+        }
+        
+        pbf_press_button(context, BUTTON_A, 320ms, 400ms);
+        context.wait_for_all_requests();
+
+        SelectionArrowWatcher save_arrow = SelectionArrowWatcher(
+            COLOR_RED,
+            &console.overlay(),
+            SelectionArrowPositionConfirmationMenu::YES
+        );
+
+        int ret4 = wait_until(
+            console, context,
+            std::chrono::seconds(1),
+            {
+                save_arrow
+            }
+        );
+
+        if (ret4 != 0){
+            console.log("Unable to detect Save Arrow. Attempting to open start menu again.");
+            pbf_mash_button(context, BUTTON_B, 320ms);
+            context.wait_for_all_requests();
+            continue;
+        }
+
+        console.log("Detected Save Arrow. Saving game.");
+        pbf_press_button(context, BUTTON_A, 320ms, 200ms);
+        context.wait_for_all_requests();
+
+        SelectionArrowWatcher save_confirm_arrow = SelectionArrowWatcher(
+            COLOR_RED,
+            &console.overlay(),
+            SelectionArrowPositionConfirmationMenu::YES
+        );
+
+        int ret5 = wait_until(
+            console, context,
+            std::chrono::seconds(2),
+            {
+                save_confirm_arrow
+            }
+        );
+
+        if (ret5 != 0){
+            console.log("Unable to detect Save Confirmation Arrow. Assuming this was the first save.");
+            return;
+        }
+
+        console.log("Detected Save Confirmation Arrow. Saving game.");
+        pbf_press_button(context, BUTTON_A, 320ms, 200ms);
+        context.wait_for_all_requests();
+
+        return;
+    }
+
+}
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/PokemonFRLG_StartMenuNavigation.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/PokemonFRLG_StartMenuNavigation.h
new file mode 100644
index 0000000000..8b0b3b4197
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/PokemonFRLG_StartMenuNavigation.h
@@ -0,0 +1,65 @@
+/*  Start Menu Navigation
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonFRLG_StartMenuNavigation_H
+#define PokemonAutomation_PokemonFRLG_StartMenuNavigation_H
+
+#include "VideoGames/PokemonFRLG/Inference/PokemonFRLG_SelectionArrowDetector.h"
+
+namespace PokemonAutomation{
+
+class ImageRGB32;
+
+template <typename Type> class ControllerContext;
+struct ImageFloatBox;
+
+namespace NintendoSwitch{
+
+class ConsoleHandle;
+class ProController;
+using ProControllerContext = ControllerContext<ProController>;
+
+namespace PokemonFRLG {
+
+// Box that contains all the possible start menu selection arrow positions
+const ImageFloatBox MENU_ARROW_BOX(0.727692, 0.0523077, 0.0369231, 0.6438461);
+
+// Open the start menu from the overworld. Throws OperationFailedException if it fails to open the menu after several attempts.
+void open_start_menu(ConsoleHandle& console, ProControllerContext& context);
+
+// Close the start menu to return to the overworld
+void close_start_menu(ConsoleHandle& console, ProControllerContext& context);
+
+// Starting from the start menu, move the selection arrow to the specified position.
+// Return true if successful, false otherwise (e.g. if selection arrow is not detected).
+bool move_cursor_to_position(
+    ConsoleHandle& console, ProControllerContext& context, 
+    SelectionArrowPositionStartMenu destination
+);
+
+// Starting from the Safari Zone start menu, move the selection arrow to the specified position.
+// Return true if successful, false otherwise (e.g. if selection arrow is not detected).
+bool move_cursor_to_position(
+    ConsoleHandle& console, ProControllerContext& context,
+    SelectionArrowPositionSafariMenu destination
+);
+
+// Starting from the start menu before the PokeDex has been received, move the selection arrow to the specified position.
+// Return true if successful, false otherwise (e.g. if selection arrow is not detected).
+bool move_cursor_to_position(
+    ConsoleHandle& console, ProControllerContext& context,
+    SelectionArrowPositionNoDexMenu destination
+);
+
+//  Starting from either the overworld or the main menu, save the game.
+//  This function returns in the overworld.
+void save_game_to_overworld(ConsoleHandle& console, ProControllerContext& context);
+
+}
+}
+}
+
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_BlindNavigation.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_BlindNavigation.cpp
new file mode 100644
index 0000000000..795c83331e
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_BlindNavigation.cpp
@@ -0,0 +1,820 @@
+/*  Blind Navigation
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <cmath>
+#include <string>
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonTools/Random.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+#include "NintendoSwitch/NintendoSwitch_ConsoleHandle.h"
+#include "PokemonFRLG_BlindNavigation.h"
+#include "PokemonFRLG_RngCalibration.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+// The fixed parts (ms) of the button press sequences for each target,
+// including the 4000ms spent loading the save and skipping the recap in load_game_after_delay().
+static const uint64_t STARTER_FIXED_DURATION        = 7200;     // 4000ms + 3000ms + 200ms
+static const uint64_t HITMON_FIXED_DURATION         = 4200;     // 4000ms + 200ms
+static const uint64_t EEVEE_FIXED_DURATION          = 4000;
+static const uint64_t FOSSIL_FIXED_DURATION         = 5700;     // 4000ms + 1500ms + 200ms
+static const uint64_t GAMECORNER_FIXED_DURATION     = 8200;     // 4000ms + 3000ms + (400ms * 5) + 200ms
+static const uint64_t TOGEPI_FIXED_DURATION         = 11700;    // 4000ms + 7500ms + 200ms
+static const uint64_t TOGEPI_FAST_FIXED_DURATION    = 5200;     // 4000ms + 500ms + 500ms + 200ms
+static const uint64_t EGG_HELD_FIXED_DURATION       = 4000;
+static const uint64_t EGG_PICKUP_FIXED_DURATION     = 12000;    // 4000ms + 500ms + 500ms + 6000ms + 1000ms
+static const uint64_t STATIC_FIXED_DURATION         = 5000;     // 4000ms + 1000ms
+static const uint64_t SNORLAX_FIXED_DURATION        = 15700;    // 4000ms + 1500ms + 10000ms + 200ms
+static const uint64_t MEWTWO_FIXED_DURATION         = 4200;     // 4000ms + 200ms
+static const uint64_t HOOH_FIXED_DURATION           = 4000;
+static const uint64_t HYPNO_FIXED_DURATION          = 12700;    // 4000ms + 8500ms + 200ms
+static const uint64_t SWEET_SCENT_FIXED_DURATION    = 7400;
+static const uint64_t SAFARI_SWEET_SCENT_FIXED_DURATION = 7900; // there is an extra menu option at the top of the start menu
+static const uint64_t ROCK_SMASH_FIXED_DURATION     = 6500;     // 4000ms + 2000ms + 500ms
+static const uint64_t FISHING_FIXED_DURATION        = 4200;     // 4000ms + 200ms
+static const uint64_t FISHING_MAX_RNG_WAIT          = 1000;     // 50ms * 20. The random wait before casting comes out of the variable wait
+
+// The part of the in-game delay (ms) that is spent walking to each Safari Zone target.
+static const uint64_t SAFARI_CENTER_WALK_DURATION   = 2170;
+static const uint64_t SAFARI_EAST_WALK_DURATION     = 17660;
+static const uint64_t SAFARI_NORTH_WALK_DURATION    = 18910;
+static const uint64_t SAFARI_WEST_WALK_DURATION     = 32930;
+static const uint64_t SAFARI_SURF_WALK_DURATION     = 11800;
+static const uint64_t SAFARI_FISH_WALK_DURATION     = 5300;
+
+// The minimum delay (ms) before the final button press to avoid button press drops
+static const uint64_t MIN_PRESS_GAP = 300;
+
+// frames, approximate
+static const int64_t DEFAULT_ADVANCES_OFFSET = 160;
+static const int64_t SWEET_SCENT_ADVANCES_OFFSET = -352;
+
+static uint64_t magikarp_fixed_duration(Language language){
+    uint64_t duration = 7200; // 4000ms + 3000ms + 200ms
+    if (language == Language::French){
+        duration -= 1500;
+    }
+    if (language == Language::Japanese){
+        duration += 1500;
+    }
+    return duration;
+}
+
+static uint64_t lapras_fixed_duration(Language language){
+    uint64_t duration = 7200; // 4000ms + 3000ms + 200ms
+    if (language == Language::French){
+        duration -= 1500;
+    }
+    return duration;
+}
+
+static uint64_t safari_zone_entrance_duration(Language language){
+    uint64_t duration = 20000;
+    if (language == Language::Japanese){
+        duration += 1500;
+    }
+    return duration;
+}
+
+static uint64_t roamer_fixed_duration(Language language){
+    uint64_t duration = 26700; // 5500ms + 4*1500ms + 3500ms + 5500ms + 4*1500 + 200
+    if (language == Language::Japanese){
+        duration += 1500; 
+    }else if (language == Language::Spanish){
+        duration += 3000;
+    }
+    return duration;
+}
+
+
+void set_seed_after_delay(ProControllerContext& context, SeedButton seed_button, BlackoutButton extra_button, int64_t seed_delay, ConsoleType console_type){
+    // be warned: not tested with all console types
+    switch (console_type){
+    case ConsoleType::Switch1:
+        // Switch 1 enters the game a little bit earlier
+        pbf_wait(context, 750ms);
+        break;
+    default:
+        break;
+    }
+
+    // wait on title screen for the specified delay    
+    // hold the "blackout" button starting from the black screen after the copyright text until getting to the continue screen
+    if (extra_button != BlackoutButton::None){
+        Button b_button;
+        switch (extra_button){
+        case BlackoutButton::L:
+            b_button = BUTTON_L;
+            break;
+        case BlackoutButton::R:
+            b_button = BUTTON_R;
+            break;
+        default:
+            b_button = BUTTON_L;
+        }
+        Milliseconds blackout_wait = 3800ms; // wait for the copyright text to disappear
+        Milliseconds blackout_delay = std::chrono::milliseconds(seed_delay) - blackout_wait;
+        Milliseconds blackout_hold = 30000ms; // wait for leaves/flames to appear on the title screen. It's okay if this is held over the seed button press
+        ssf_do_nothing(context, blackout_wait);
+        ssf_press_button(context, b_button, blackout_delay, blackout_hold, 0ms);
+    }else{
+        pbf_wait(context, std::chrono::milliseconds(seed_delay));
+    }
+
+    // hold the specified button for a few seconds through the transition to the Continue Screen
+    Button s_button;
+    switch (seed_button){
+    case SeedButton::A:
+        s_button = BUTTON_A;
+        break;
+    case SeedButton::Start:
+        s_button = BUTTON_PLUS;
+        break;
+    case SeedButton::L:
+        s_button = BUTTON_L;
+        break;
+    default:
+        s_button = BUTTON_A;
+        break;
+    }
+    pbf_press_button(context, s_button, 3000ms, 0ms);
+}
+
+void load_game_after_delay(ProControllerContext& context, uint64_t csf_delay){
+    pbf_wait(context, std::chrono::milliseconds(csf_delay - 3000));
+    pbf_press_button(context, BUTTON_A, 50ms, 1450ms);
+    // skip recap
+    pbf_press_button(context, BUTTON_B, 50ms, 2450ms);
+    // need to later subtract 4000ms from delay to hit desired number of advances
+}
+
+void wait_with_teachy_tv(ProControllerContext& context, uint64_t teachy_delay){
+    // open start menu -> bag -> key items -> Teachy TV -> use
+    pbf_press_button(context, BUTTON_PLUS, 200ms, 300ms);
+    pbf_move_left_joystick(context, {0, -1}, 200ms, 300ms);
+    pbf_move_left_joystick(context, {0, -1}, 200ms, 300ms);
+    pbf_press_button(context, BUTTON_A, 200ms, 2300ms);
+    pbf_move_left_joystick(context, {+1, 0}, 200ms, 2300ms);
+    pbf_press_button(context, BUTTON_A, 200ms, 300ms);
+    pbf_press_button(context, BUTTON_A, 200ms, 367ms); // the "static fuzz" that adds RNG advances doesn't kick in right away
+    pbf_wait(context, std::chrono::milliseconds(teachy_delay));
+    // close teachy tv -> close bag -> reset start menu cursor position - > close start menu
+    pbf_press_button(context, BUTTON_B, 200ms, 2300ms);
+    pbf_press_button(context, BUTTON_B, 200ms, 2300ms);
+    pbf_move_left_joystick(context, {0, +1}, 200ms, 300ms);
+    pbf_move_left_joystick(context, {0, +1}, 200ms, 300ms);
+    pbf_press_button(context, BUTTON_B, 200ms, 300ms);
+    // total non-teachy delay duration: 14067ms
+}
+
+
+void collect_starter_after_delay(ProControllerContext& context, uint64_t ingame_delay){
+    // Advance through starter dialogue and wait on "really quite energetic!"
+    pbf_press_button(context, BUTTON_A, 200ms, 1300ms);
+    pbf_press_button(context, BUTTON_A, 200ms, 1300ms);
+    pbf_press_button(context, BUTTON_A, 200ms, std::chrono::milliseconds(ingame_delay - STARTER_FIXED_DURATION));
+    // Finish dialogue (hits the target advance)
+    pbf_press_button(context, BUTTON_A, 200ms, 5800ms);
+    // Decline nickname
+    pbf_mash_button(context, BUTTON_B, 2500ms);
+    // Advance through rival choice
+    pbf_mash_button(context, BUTTON_B, 5000ms);
+    context.wait_for_all_requests();
+}
+
+void collect_magikarp_after_delay(ProControllerContext& context, uint64_t ingame_delay, Language language){
+    // Advance through starter dialogue and wait on YES/NO
+    pbf_press_button(context, BUTTON_A, 200ms, 1300ms);
+    if (language != Language::French){
+        pbf_press_button(context, BUTTON_A, 200ms, 1300ms);
+    }
+    if (language == Language::Japanese){
+        pbf_press_button(context, BUTTON_A, 200ms, 1300ms);
+    }
+    pbf_press_button(context, BUTTON_A, 200ms, std::chrono::milliseconds(ingame_delay - magikarp_fixed_duration(language)));
+    // Finish dialogue (hits the target advance)
+    pbf_press_button(context, BUTTON_A, 200ms, 3800ms);
+    // Decline nickname
+    pbf_mash_button(context, BUTTON_B, 2000ms);
+    context.wait_for_all_requests();
+}
+
+void collect_hitmon_after_delay(ProControllerContext& context, uint64_t ingame_delay){
+    // One dialog before accepting
+    pbf_press_button(context, BUTTON_A, 200ms, std::chrono::milliseconds(ingame_delay - HITMON_FIXED_DURATION));
+    // Confirm selection
+    pbf_press_button(context, BUTTON_A, 200ms, 1800ms);
+    // Decline nickname
+    pbf_mash_button(context, BUTTON_B, 2000ms);
+    context.wait_for_all_requests();
+}
+
+void collect_eevee_after_delay(ProControllerContext& context, uint64_t ingame_delay){
+    // No dialogue to advance through -- just wait
+    pbf_wait(context, std::chrono::milliseconds(ingame_delay - EEVEE_FIXED_DURATION));
+    // Interact with the pokeball
+    pbf_press_button(context, BUTTON_A, 200ms, 3800ms);
+    // Decline nickname
+    pbf_mash_button(context, BUTTON_B, 2000ms);
+    context.wait_for_all_requests();
+}
+
+void collect_lapras_after_delay(ProControllerContext& context, uint64_t ingame_delay, Language language){
+    // 3 dialog presses
+    pbf_press_button(context, BUTTON_A, 200ms, 1300ms);
+    if (language != Language::French){
+        pbf_press_button(context, BUTTON_A, 200ms, 1300ms);
+    }
+    pbf_press_button(context, BUTTON_A, 200ms, std::chrono::milliseconds(ingame_delay - lapras_fixed_duration(language)));
+    // Accept Lapras on target frame
+    pbf_press_button(context, BUTTON_A, 200ms, 3800ms);
+    // Decline nickname and exit dialog
+    pbf_mash_button(context, BUTTON_B, 7500ms);
+    context.wait_for_all_requests();
+}
+
+void collect_fossil_after_delay(ProControllerContext& context, uint64_t ingame_delay){
+    // 2 dialog presses
+    pbf_press_button(context, BUTTON_A, 200ms, 1300ms);
+    pbf_press_button(context, BUTTON_A, 200ms, std::chrono::milliseconds(ingame_delay - FOSSIL_FIXED_DURATION));
+    // Advance dialog on target frame
+    pbf_press_button(context, BUTTON_A, 200ms, 2800ms);
+    // Decline nickname
+    pbf_mash_button(context, BUTTON_B, 2000ms);
+    context.wait_for_all_requests();
+}
+
+void collect_gamecorner_after_delay(ProControllerContext& context, uint64_t ingame_delay, int SLOT){
+    // 2 dialog presses
+    pbf_press_button(context, BUTTON_A, 200ms, 1300ms);
+    pbf_press_button(context, BUTTON_A, 200ms, 1300ms);
+    // navigate to desired option
+    for (int i=0; i<SLOT; i++){
+        pbf_move_left_joystick(context, {0,-1}, 100ms, 300ms);
+    }
+    for (int i=SLOT; i<5; i++){
+        pbf_wait(context, 400ms);
+    }
+    // select option and wait on confirmation
+    pbf_press_button(context, BUTTON_A, 200ms, std::chrono::milliseconds(ingame_delay - GAMECORNER_FIXED_DURATION));
+    // confirm prize
+    pbf_press_button(context, BUTTON_A, 200ms, 2800ms);
+    // decline nickname
+    pbf_mash_button(context, BUTTON_B, 2000ms);
+    context.wait_for_all_requests();
+}
+
+void collect_togepi_egg_after_delay(ProControllerContext& context, uint64_t ingame_delay){
+    // 6 dialog presses
+    pbf_press_button(context, BUTTON_A, 200ms, 1300ms);
+    pbf_press_button(context, BUTTON_A, 200ms, 1300ms);
+    pbf_press_button(context, BUTTON_A, 200ms, 1300ms);
+    pbf_press_button(context, BUTTON_A, 200ms, 1300ms);
+    pbf_press_button(context, BUTTON_A, 200ms, 1300ms);
+    pbf_press_button(context, BUTTON_A, 200ms, std::chrono::milliseconds(ingame_delay - TOGEPI_FIXED_DURATION));
+    // accept egg
+    pbf_press_button(context, BUTTON_A, 200ms, 2800ms);
+    // exit dialogue
+    pbf_mash_button(context, BUTTON_B, 2500ms);
+    context.wait_for_all_requests();    
+}
+
+void collect_preapproved_togepi_egg_after_delay(ProControllerContext& context, uint64_t ingame_delay){
+    // wait with the start menu open to avoid overworld stuff causing extra advances
+    pbf_press_button(context, BUTTON_PLUS, 200ms, 300ms);
+    pbf_wait(context, std::chrono::milliseconds(ingame_delay - TOGEPI_FAST_FIXED_DURATION));
+    pbf_press_button(context, BUTTON_B, 200ms, 300ms);
+    // accept egg
+    pbf_press_button(context, BUTTON_A, 200ms, 2800ms);
+    // exit dialogue
+    pbf_mash_button(context, BUTTON_B, 2500ms);
+}
+
+void trigger_held_daycare_egg_after_delay(ProControllerContext& context, uint64_t ingame_delay){
+    // No dialogue to advance through -- just wait
+    pbf_wait(context, std::chrono::milliseconds(ingame_delay - EGG_HELD_FIXED_DURATION));
+    // Trigger the encounter (WALK LEFT)
+    pbf_move_left_joystick(context, {-1, 0}, 200ms, 800ms);
+    context.wait_for_all_requests();
+}
+
+void collect_daycare_egg_after_delay(ProControllerContext& context, uint64_t ingame_delay){
+    // wait with the start menu open to avoid overworld stuff causing extra advances
+    pbf_press_button(context, BUTTON_PLUS, 200ms, 300ms);
+    pbf_wait(context, std::chrono::milliseconds(ingame_delay - EGG_PICKUP_FIXED_DURATION));
+    pbf_press_button(context, BUTTON_B, 200ms, 300ms);
+    // 5 dialog presses
+    pbf_press_button(context, BUTTON_A, 200ms, 1300ms);
+    pbf_press_button(context, BUTTON_A, 200ms, 1300ms);
+    pbf_press_button(context, BUTTON_A, 200ms, 1300ms);
+    pbf_press_button(context, BUTTON_A, 200ms, 1300ms);
+    pbf_press_button(context, BUTTON_A, 200ms, 800ms);
+    // accept egg
+    pbf_press_button(context, BUTTON_A, 200ms, 2800ms);
+    // exit dialogue
+    pbf_mash_button(context, BUTTON_B, 2500ms);
+    context.wait_for_all_requests();    
+}
+
+void encounter_static_after_delay(ProControllerContext& context, uint64_t ingame_delay){
+    // No dialogue to advance through -- just wait in the start menu (avoids extra RNG advances by boulders Mt Ember and Seafoam Islands)
+    pbf_press_button(context, BUTTON_PLUS, 200ms, 300ms);
+    pbf_wait(context, std::chrono::milliseconds(ingame_delay - STATIC_FIXED_DURATION));
+    pbf_press_button(context, BUTTON_B, 200ms, 300ms);
+    // Interact with the static encounter
+    pbf_press_button(context, BUTTON_A, 200ms, 800ms);
+    pbf_mash_button(context, BUTTON_A, 1000ms); // finishes dialog for the legendary birds
+    context.wait_for_all_requests();
+}
+
+void encounter_snorlax_after_delay(ProControllerContext& context, uint64_t ingame_delay){
+    // Interact with Snorlax, YES to PokeFlute, wait on "woke up!"
+    pbf_press_button(context, BUTTON_A, 200ms, 1300ms);
+    pbf_press_button(context, BUTTON_A, 200ms, 9800ms); // PokeFlute tune
+    pbf_press_button(context, BUTTON_A, 200ms, std::chrono::milliseconds(ingame_delay - SNORLAX_FIXED_DURATION));
+    pbf_press_button(context, BUTTON_A, 200ms, 200ms); 
+    context.wait_for_all_requests();
+}
+
+void encounter_mewtwo_after_delay(ProControllerContext& context, uint64_t ingame_delay){
+    // one dialogue before the encounter happens
+    pbf_press_button(context, BUTTON_A, 200ms, std::chrono::milliseconds(ingame_delay - MEWTWO_FIXED_DURATION));
+    // Initiate encounter
+    pbf_press_button(context, BUTTON_A, 200ms, 200ms); 
+    context.wait_for_all_requests();
+}
+
+void encounter_hooh_after_delay(ProControllerContext& context, uint64_t ingame_delay){
+    // No dialogue to advance through -- just wait
+    pbf_wait(context, std::chrono::milliseconds(ingame_delay - HOOH_FIXED_DURATION));
+    // Trigger the encounter (WALK UP)
+    pbf_move_left_joystick(context, {0, +1}, 800ms, 700ms);
+    context.wait_for_all_requests();
+}
+
+void encounter_hypno_after_delay(ProControllerContext& context, uint64_t ingame_delay){
+    // 5 dialog advances, with the 5th needing some extra time
+    pbf_press_button(context, BUTTON_A, 200ms, 1300ms);
+    pbf_press_button(context, BUTTON_A, 200ms, 1300ms);
+    pbf_press_button(context, BUTTON_A, 200ms, 1300ms);
+    pbf_press_button(context, BUTTON_A, 200ms, 1300ms);
+    pbf_press_button(context, BUTTON_A, 200ms, 2300ms);
+    // Wait after the 6th
+    pbf_press_button(context, BUTTON_A, 200ms, std::chrono::milliseconds(ingame_delay - HYPNO_FIXED_DURATION));
+    // Initiate encounter
+    pbf_press_button(context, BUTTON_A, 200ms, 200ms); 
+    context.wait_for_all_requests();
+}
+
+void use_sweet_scent(ProControllerContext& context, uint64_t ingame_delay, bool safari_zone = false){
+    // navigate to last party slot
+    pbf_press_button(context, BUTTON_PLUS, 200ms, 300ms);
+    pbf_move_left_joystick(context, {0, -1}, 200ms, 300ms);
+    if (safari_zone) { // there is an extra menu option at the top of the start menu
+        pbf_move_left_joystick(context, {0, -1}, 200ms, 300ms); 
+    }
+    pbf_press_button(context, BUTTON_A, 200ms, 1000ms);
+    pbf_move_left_joystick(context, {0, +1}, 200ms, 300ms);
+    pbf_move_left_joystick(context, {0, +1}, 200ms, 300ms);
+    pbf_press_button(context, BUTTON_A, 200ms, 300ms);
+    // hover over Sweet Scent (2nd option, but maybe HMs could change this)
+    pbf_move_left_joystick(context, {0, -1}, 200ms, std::chrono::milliseconds(ingame_delay - (safari_zone ? SAFARI_SWEET_SCENT_FIXED_DURATION : SWEET_SCENT_FIXED_DURATION)));
+    pbf_press_button(context, BUTTON_A, 200ms, 800ms);
+    context.wait_for_all_requests();
+}
+
+void use_rock_smash(ProControllerContext& context, uint64_t ingame_delay){
+    // three button presses
+    pbf_press_button(context, BUTTON_A, 200ms, 1800ms);
+    pbf_press_button(context, BUTTON_A, 200ms, 300ms);
+    pbf_wait(context, std::chrono::milliseconds(ingame_delay - ROCK_SMASH_FIXED_DURATION));
+    pbf_press_button(context, BUTTON_A, 200ms, 800ms);
+    context.wait_for_all_requests();
+}
+
+void use_registered_fishing_rod(ProControllerContext& context, uint64_t ingame_delay){
+    uint32_t rng_wait = 50 * random_u32(0, 20); // helps avoid always hitting "Not even a nibble" (?)
+    pbf_wait(context, std::chrono::milliseconds(rng_wait));
+    pbf_press_button(context, BUTTON_MINUS, 200ms, std::chrono::milliseconds(ingame_delay - rng_wait - FISHING_FIXED_DURATION));
+    pbf_press_button(context, BUTTON_A, 200ms, 800ms);
+    context.wait_for_all_requests();
+}
+
+void enter_safarizone(ProControllerContext& context, Language language){
+    // walk up to initiate dialogue
+    pbf_move_left_joystick(context, {0, +1}, 600ms, 400ms);
+    // Advance through the dialogue (waiting a little longer when Safari Balls are recieved)
+    pbf_press_button(context, BUTTON_A, 200ms, 1300ms);
+    pbf_press_button(context, BUTTON_A, 200ms, 1300ms);
+    pbf_press_button(context, BUTTON_A, 200ms, 1300ms);
+    pbf_press_button(context, BUTTON_A, 200ms, 1300ms);
+    pbf_press_button(context, BUTTON_A, 200ms, 1300ms);
+    if (language == Language::Japanese){
+        pbf_press_button(context, BUTTON_A, 200ms, 1300ms);
+    }
+    pbf_press_button(context, BUTTON_A, 200ms, 3300ms);
+    pbf_press_button(context, BUTTON_A, 200ms, 1300ms);
+    // this last press is needed for German and Japanese, but is performed for all languages
+    // in case it's necessary for languages that haven't been tested directly by a developer
+    pbf_press_button(context, BUTTON_A, 200ms, 1300ms);
+    // finish dialogue and automatically enter the Safari Zone
+    pbf_press_button(context, BUTTON_A, 200ms, 4800ms);
+    // total duration: 20000ms (+1500ms for Japanese)
+}
+
+void walk_to_safarizonefish(ProControllerContext& context, Language language){
+    enter_safarizone(context, language); // 20000ms (+1500ms for Japanese)
+    // walk from the entrance to the pond in the central area
+    pbf_move_left_joystick(context, {0, +1}, 2200ms, 300ms);
+    pbf_move_left_joystick(context, {+1, 0}, 1600ms, 300ms);
+    pbf_move_left_joystick(context, {0, +1}, 600ms, 300ms);
+    // total duration: 25300ms (+1500ms for Japanese)
+}
+
+void walk_to_safarizonesurf(ProControllerContext& context, Language language){
+    walk_to_safarizonefish(context, language); // 25300ms (+1500ms for Japanese)
+    // start surfing
+    pbf_press_button(context, BUTTON_A, 200ms, 1300ms);
+    pbf_press_button(context, BUTTON_A, 200ms, 1300ms);
+    pbf_press_button(context, BUTTON_A, 200ms, 3300ms);
+    // total duration: 31800ms (+1500ms for Japanese)
+}
+
+void walk_to_safarizonecenter(ProControllerContext& context, Language language){
+    enter_safarizone(context, language); // 20000ms (+1500ms for Japanese)
+    // walk from the entrance to the nearest grass
+    pbf_move_left_joystick(context, {0, +1}, 460ms, 300ms);
+    pbf_move_left_joystick(context, {-1, 0}, 1110ms, 300ms);
+    // total duration: 22170ms (+1500ms for Japanese)
+}
+
+void walk_to_safarizoneeast(ProControllerContext& context, Language language){
+    enter_safarizone(context, language); // 20000ms (+1500ms for Japanese)
+    // walk from the entrance to the east area
+    pbf_move_left_joystick(context, {0, +1}, 160ms, 300ms);
+    pbf_move_left_joystick(context, {+1, 0}, 4400ms, 300ms);
+    pbf_move_left_joystick(context, {0, +1}, 3550ms, 300ms);
+    // walk to the nearest grass
+    pbf_move_left_joystick(context, {+1, 0}, 3600ms, 300ms);
+    pbf_move_left_joystick(context, {0, -1}, 700ms, 300ms);
+    pbf_move_left_joystick(context, {+1, 0}, 3450ms, 300ms);
+    // total duration: 37660ms (+1500ms for Japanese)
+}
+
+void walk_to_safarizonenorth(ProControllerContext& context, Language language){
+    walk_to_safarizonesurf(context, language); // 31800ms (+1500ms for Japanese)
+    // from the pond to the grass in the north area
+    pbf_move_left_joystick(context, {0, +1}, 2810ms, 300ms);
+    pbf_move_left_joystick(context, {-1, 0}, 1530ms, 300ms);
+    pbf_move_left_joystick(context, {0, +1}, 1870ms, 300ms);
+    // total duration: 38910ms (+1500ms for Japanese)
+}
+
+void walk_to_safarizonewest(ProControllerContext& context, Language language){
+    walk_to_safarizonesurf(context, language); // 31800ms (+1500ms for Japanese)
+    // surf past the hedge and exit the pond
+    pbf_move_left_joystick(context, {-1, 0}, 500ms, 300ms);
+    pbf_move_left_joystick(context, {0, -1}, 260ms, 500ms);
+    // walk to the west area
+    pbf_move_left_joystick(context, {-1, 0}, 5500ms, 300ms);
+    pbf_move_left_joystick(context, {0, +1}, 240ms, 300ms);
+    pbf_move_left_joystick(context, {-1, 0}, 1200ms, 500ms);
+    // walk to the grass
+    pbf_move_left_joystick(context, {-1, 0}, 2860ms, 300ms);
+    pbf_move_left_joystick(context, {0, +1}, 1390ms, 300ms);
+    pbf_move_left_joystick(context, {-1, 0}, 1510ms, 300ms);
+    pbf_move_left_joystick(context, {0, -1}, 770ms, 300ms);
+    pbf_move_left_joystick(context, {-1, 0}, 2400ms, 300ms);
+    pbf_move_left_joystick(context, {0, -1}, 600ms, 300ms);
+    // total duration: 52930ms (+1500ms for Japanese)
+}
+
+void activate_roamer(ProControllerContext& context, Language language, uint64_t ingame_delay){
+    uint64_t offset = roamer_fixed_duration(language);
+    
+    // a lot of dialogue while Celio inserts the Sapphire
+    pbf_press_button(context, BUTTON_A, 200ms, 5300ms); // handed the sapphire to Celio
+                                                        // "So this is the gem..."
+    pbf_press_button(context, BUTTON_A, 200ms, 1300ms); // "<Player>, you've gone through a lot..."
+    if (language == Language::Japanese){                // extra dialog box for the above message
+        pbf_press_button(context, BUTTON_A, 200ms, 1300ms);
+    }
+    pbf_press_button(context, BUTTON_A, 200ms, 1300ms); // "You don't have to tell  me..."
+    pbf_press_button(context, BUTTON_A, 200ms, 1300ms); // "Thank you so much!"
+    pbf_press_button(context, BUTTON_A, 200ms, 1300ms); // "Now it's my turn..."
+    pbf_press_button(context, BUTTON_A, 200ms, 3300ms); // "Okay, this is good..."
+    pbf_press_button(context, BUTTON_A, 200ms, 5300ms); // "I did it! I linked up with LANETTE!"
+    if (language == Language::Spanish){                 // "con AREDIA!" is pushed to a new line
+        pbf_press_button(context, BUTTON_A, 200ms, 1300ms);
+    }
+    pbf_press_button(context, BUTTON_A, 200ms, 1300ms); // "<Player!>! <Player>, I did it!"
+    pbf_press_button(context, BUTTON_A, 200ms, 1300ms); // "I've managed to link up with TRAINERS in the HOENN region!"
+    if (language == Language::Spanish){                 // "de HOENN!" gets pushed to a new line
+        pbf_press_button(context, BUTTON_A, 200ms, 1300ms);
+    }
+    pbf_press_button(context, BUTTON_A, 200ms, 1300ms); // "Finally, the Network Machine..."
+    pbf_press_button(context, BUTTON_A, 200ms, 1300ms); // "<Player>, I owe it all to you!"
+    pbf_press_button(context, BUTTON_A, 200ms, std::chrono::milliseconds(ingame_delay - offset)); 
+                                                        // "Thanks to you, my dream came true..."
+    pbf_press_button(context, BUTTON_A, 200ms, 800ms);  // finalize roamer and exit dialogue
+    context.wait_for_all_requests();
+}
+
+
+struct IngameSequence{
+    const char* name;
+    uint64_t fixed_duration;   
+    uint64_t min_wait;
+    int64_t advances_offset;   
+};
+
+IngameSequence get_ingame_sequence(PokemonFRLG_RngTarget target, Language language){
+    switch (target){
+    case PokemonFRLG_RngTarget::starters:
+        return {"Starters", STARTER_FIXED_DURATION, MIN_PRESS_GAP, DEFAULT_ADVANCES_OFFSET};
+    case PokemonFRLG_RngTarget::magikarp:
+        return {"Magikarp", magikarp_fixed_duration(language), MIN_PRESS_GAP, DEFAULT_ADVANCES_OFFSET};
+    case PokemonFRLG_RngTarget::hitmonchan:
+    case PokemonFRLG_RngTarget::hitmonlee:
+    case PokemonFRLG_RngTarget::hitmon:
+        return {"Hitmonchan/Hitmonlee", HITMON_FIXED_DURATION, MIN_PRESS_GAP, DEFAULT_ADVANCES_OFFSET};
+    case PokemonFRLG_RngTarget::eevee:
+        return {"Eevee", EEVEE_FIXED_DURATION, 0, DEFAULT_ADVANCES_OFFSET};
+    case PokemonFRLG_RngTarget::lapras:
+        return {"Lapras", lapras_fixed_duration(language), MIN_PRESS_GAP, DEFAULT_ADVANCES_OFFSET};
+    case PokemonFRLG_RngTarget::omanyte:
+    case PokemonFRLG_RngTarget::kabuto:
+    case PokemonFRLG_RngTarget::aerodactyl:
+    case PokemonFRLG_RngTarget::fossils:
+        return {"Fossils", FOSSIL_FIXED_DURATION, MIN_PRESS_GAP, DEFAULT_ADVANCES_OFFSET};
+    case PokemonFRLG_RngTarget::gamecornerabra:
+    case PokemonFRLG_RngTarget::gamecornerclefairy:
+    case PokemonFRLG_RngTarget::gamecornerdratinifr:
+    case PokemonFRLG_RngTarget::gamecornerdratinilg:
+    case PokemonFRLG_RngTarget::gamecornerscyther:
+    case PokemonFRLG_RngTarget::gamecornerpinsir:
+    case PokemonFRLG_RngTarget::gamecornerporygon:
+        return {"Game Corner", GAMECORNER_FIXED_DURATION, MIN_PRESS_GAP, DEFAULT_ADVANCES_OFFSET};
+    case PokemonFRLG_RngTarget::togepi:
+        return {"Togepi", TOGEPI_FIXED_DURATION, MIN_PRESS_GAP, DEFAULT_ADVANCES_OFFSET};
+    case PokemonFRLG_RngTarget::togepifast:
+        return {"Togepi (pre-approved)", TOGEPI_FAST_FIXED_DURATION, 0, DEFAULT_ADVANCES_OFFSET};
+    case PokemonFRLG_RngTarget::eggheld:
+        return {"Held Frame", EGG_HELD_FIXED_DURATION, 0, 135};
+    case PokemonFRLG_RngTarget::eggpickup:
+        return {"Pickup Frame", EGG_PICKUP_FIXED_DURATION, 0, -246};
+    case PokemonFRLG_RngTarget::electrode:
+    case PokemonFRLG_RngTarget::articuno:
+    case PokemonFRLG_RngTarget::zapdos:
+    case PokemonFRLG_RngTarget::moltres:
+    case PokemonFRLG_RngTarget::lugia:
+    case PokemonFRLG_RngTarget::deoxys_attack:
+    case PokemonFRLG_RngTarget::deoxys_defense:
+    case PokemonFRLG_RngTarget::staticencounter:
+        return {"Static Encounter", STATIC_FIXED_DURATION, 0, DEFAULT_ADVANCES_OFFSET};
+    case PokemonFRLG_RngTarget::snorlax:
+        return {"Snorlax", SNORLAX_FIXED_DURATION, MIN_PRESS_GAP, DEFAULT_ADVANCES_OFFSET};
+    case PokemonFRLG_RngTarget::mewtwo:
+        return {"Mewtwo", MEWTWO_FIXED_DURATION, MIN_PRESS_GAP, DEFAULT_ADVANCES_OFFSET};
+    case PokemonFRLG_RngTarget::hooh:
+        return {"Ho-oh", HOOH_FIXED_DURATION, 0, DEFAULT_ADVANCES_OFFSET};
+    case PokemonFRLG_RngTarget::hypno:
+        return {"Hypno", HYPNO_FIXED_DURATION, MIN_PRESS_GAP, DEFAULT_ADVANCES_OFFSET};
+    case PokemonFRLG_RngTarget::sweetscent:
+        return {"Sweet Scent", SWEET_SCENT_FIXED_DURATION, MIN_PRESS_GAP, SWEET_SCENT_ADVANCES_OFFSET};
+    case PokemonFRLG_RngTarget::rocksmash:
+        return {"Rock Smash", ROCK_SMASH_FIXED_DURATION, 0, SWEET_SCENT_ADVANCES_OFFSET};
+    case PokemonFRLG_RngTarget::fishing:
+        return {"Fishing", FISHING_FIXED_DURATION + FISHING_MAX_RNG_WAIT, MIN_PRESS_GAP, DEFAULT_ADVANCES_OFFSET};
+    case PokemonFRLG_RngTarget::safarizonecenter:
+        return {"Safari Zone Center", safari_zone_entrance_duration(language) + SAFARI_CENTER_WALK_DURATION + SAFARI_SWEET_SCENT_FIXED_DURATION, MIN_PRESS_GAP, SWEET_SCENT_ADVANCES_OFFSET};
+    case PokemonFRLG_RngTarget::safarizoneeast:
+        return {"Safari Zone East", safari_zone_entrance_duration(language) + SAFARI_EAST_WALK_DURATION + SAFARI_SWEET_SCENT_FIXED_DURATION, MIN_PRESS_GAP, SWEET_SCENT_ADVANCES_OFFSET};
+    case PokemonFRLG_RngTarget::safarizonenorth:
+        return {"Safari Zone North", safari_zone_entrance_duration(language) + SAFARI_NORTH_WALK_DURATION + SAFARI_SWEET_SCENT_FIXED_DURATION, MIN_PRESS_GAP, SWEET_SCENT_ADVANCES_OFFSET};
+    case PokemonFRLG_RngTarget::safarizonewest:
+        return {"Safari Zone West", safari_zone_entrance_duration(language) + SAFARI_WEST_WALK_DURATION + SAFARI_SWEET_SCENT_FIXED_DURATION, MIN_PRESS_GAP, SWEET_SCENT_ADVANCES_OFFSET};
+    case PokemonFRLG_RngTarget::safarizonesurf:
+        return {"Safari Zone Surfing", safari_zone_entrance_duration(language) + SAFARI_SURF_WALK_DURATION + SAFARI_SWEET_SCENT_FIXED_DURATION, MIN_PRESS_GAP, SWEET_SCENT_ADVANCES_OFFSET};
+    case PokemonFRLG_RngTarget::safarizonefish:
+        return {"Safari Zone Fishing", safari_zone_entrance_duration(language) + SAFARI_FISH_WALK_DURATION + FISHING_FIXED_DURATION + FISHING_MAX_RNG_WAIT, MIN_PRESS_GAP, DEFAULT_ADVANCES_OFFSET};
+    case PokemonFRLG_RngTarget::raikou:
+    case PokemonFRLG_RngTarget::entei:
+    case PokemonFRLG_RngTarget::suicune:
+    case PokemonFRLG_RngTarget::roaming:
+        return {"Roaming", roamer_fixed_duration(language), MIN_PRESS_GAP, DEFAULT_ADVANCES_OFFSET};
+    }
+    return {nullptr, 0, 0, 0};
+}
+
+int64_t fixed_advances_offset(PokemonFRLG_RngTarget target){
+    return get_ingame_sequence(target, Language::None).advances_offset;
+}
+
+void check_timings(
+    ConsoleHandle& console,
+    PokemonFRLG_RngTarget TARGET,
+    const RngTimings& timings,
+    Language language,
+    uint64_t ingame_advances,
+    uint64_t continue_screen_frames
+){
+    if (timings.csf_delay < 3200){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::NO_ERROR_REPORT,
+            "The Continue Screen delay cannot be less than 3200ms (192 advances). Check your Continue Screen calibration.",
+            console
+        );
+    }
+    if (timings.seed_delay < 29650){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::NO_ERROR_REPORT,
+            "The title screen delay cannot be less than 30s. Check your seed delay and calibration.",
+            console
+        );
+    }
+
+    IngameSequence sequence = get_ingame_sequence(TARGET, language);
+    if (sequence.name == nullptr){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::NO_ERROR_REPORT,
+            "RNG target not recognized. Please report this as a bug.",
+            console
+        );
+    }
+
+    uint64_t min_delay = sequence.fixed_duration + sequence.min_wait;
+    if (timings.ingame_delay >= min_delay){
+        return;
+    }
+
+    std::string message = std::string(sequence.name) + ": the in-game delay (" + std::to_string(timings.ingame_delay)
+        + "ms) cannot be less than " + std::to_string(min_delay) + "ms. ";
+    if (timings.teachy_delay > 0){
+        // extra advances would be spent in the Teachy TV rather than added to the in-game delay
+        message += "The Teachy TV doesn't leave enough time for this target. Disable the Teachy TV or pick a new target.";
+    }else{
+        // each frame of in-game delay is worth 2 advances. Round up to the nearest 10 advances.
+        uint64_t missing_advances = uint64_t(std::ceil((min_delay - timings.ingame_delay) * 2 / FRLG_FRAME_DURATION));
+        uint64_t min_ingame_advances = (ingame_advances + missing_advances + 9) / 10 * 10;
+        message += "With your current calibration, this target needs at least " + std::to_string(min_ingame_advances)
+            + " in-game advances (" + std::to_string(min_ingame_advances + continue_screen_frames)
+            + " total). Check your advances and calibration or pick a new target.";
+    }
+    OperationFailedExceptionWithScreenshot::fire(
+        ErrorReportMode::NO_ERROR_REPORT,
+        message,
+        console
+    );
+}
+
+void perform_blind_sequence(
+    ProControllerContext& context, 
+    Language language,
+    PokemonFRLG_RngTarget target,
+    SeedButton seed_button,
+    BlackoutButton extra_button,
+    const RngTimings& timings,
+    bool safari_zone,
+    ConsoleType console_type
+){
+    pbf_press_button(context, BUTTON_A, 80ms, 0ms); // start the game from the Home screen
+    set_seed_after_delay(context, seed_button, extra_button, timings.seed_delay, console_type);
+    load_game_after_delay(context, timings.csf_delay);
+    if (timings.teachy_delay > 0){
+        wait_with_teachy_tv(context, timings.teachy_delay);
+    }
+
+    uint64_t modified_ingame_delay;
+    switch (target){
+    case PokemonFRLG_RngTarget::starters:
+        collect_starter_after_delay(context, timings.ingame_delay);
+        return;
+    case PokemonFRLG_RngTarget::magikarp:
+        collect_magikarp_after_delay(context, timings.ingame_delay, language);
+        return;
+    case PokemonFRLG_RngTarget::hitmonchan:
+    case PokemonFRLG_RngTarget::hitmonlee:
+    case PokemonFRLG_RngTarget::hitmon:
+        collect_hitmon_after_delay(context, timings.ingame_delay);
+        return;
+    case PokemonFRLG_RngTarget::eevee:
+        collect_eevee_after_delay(context, timings.ingame_delay);
+        return;
+    case PokemonFRLG_RngTarget::lapras:
+        collect_lapras_after_delay(context, timings.ingame_delay, language);
+        return;
+    case PokemonFRLG_RngTarget::omanyte:
+    case PokemonFRLG_RngTarget::kabuto:
+    case PokemonFRLG_RngTarget::aerodactyl:
+    case PokemonFRLG_RngTarget::fossils:
+        collect_fossil_after_delay(context, timings.ingame_delay);
+        return;
+    case PokemonFRLG_RngTarget::gamecornerabra:
+        collect_gamecorner_after_delay(context, timings.ingame_delay, 0);
+        return;
+    case PokemonFRLG_RngTarget::gamecornerclefairy:
+        collect_gamecorner_after_delay(context, timings.ingame_delay, 1);
+        return;
+    case PokemonFRLG_RngTarget::gamecornerdratinifr:
+    case PokemonFRLG_RngTarget::gamecornerpinsir:
+        collect_gamecorner_after_delay(context, timings.ingame_delay, 2);
+        return;
+    case PokemonFRLG_RngTarget::gamecornerscyther:
+    case PokemonFRLG_RngTarget::gamecornerdratinilg:
+        collect_gamecorner_after_delay(context, timings.ingame_delay, 3);
+        return;
+    case PokemonFRLG_RngTarget::gamecornerporygon:
+        collect_gamecorner_after_delay(context, timings.ingame_delay, 4);
+        return;
+    case PokemonFRLG_RngTarget::togepi:
+        collect_togepi_egg_after_delay(context, timings.ingame_delay);
+        return;
+    case PokemonFRLG_RngTarget::togepifast:
+        collect_preapproved_togepi_egg_after_delay(context, timings.ingame_delay);
+        return;
+    case PokemonFRLG_RngTarget::eggheld:
+        trigger_held_daycare_egg_after_delay(context, timings.ingame_delay);
+        return;
+    case PokemonFRLG_RngTarget::eggpickup:
+        collect_daycare_egg_after_delay(context, timings.ingame_delay);
+        return;
+    case PokemonFRLG_RngTarget::electrode:
+    case PokemonFRLG_RngTarget::articuno:
+    case PokemonFRLG_RngTarget::zapdos:
+    case PokemonFRLG_RngTarget::moltres:
+    case PokemonFRLG_RngTarget::lugia:
+    case PokemonFRLG_RngTarget::deoxys_attack:
+    case PokemonFRLG_RngTarget::deoxys_defense:
+    case PokemonFRLG_RngTarget::staticencounter:
+        encounter_static_after_delay(context, timings.ingame_delay);
+        return;
+    case PokemonFRLG_RngTarget::snorlax:
+        encounter_snorlax_after_delay(context, timings.ingame_delay);
+        return;
+    case PokemonFRLG_RngTarget::mewtwo:
+        encounter_mewtwo_after_delay(context, timings.ingame_delay);
+        return;
+    case PokemonFRLG_RngTarget::hooh:
+        encounter_hooh_after_delay(context, timings.ingame_delay);
+        return;
+    case PokemonFRLG_RngTarget::hypno:
+        encounter_hypno_after_delay(context, timings.ingame_delay);
+        return;
+    case PokemonFRLG_RngTarget::sweetscent:
+        use_sweet_scent(context, timings.ingame_delay, safari_zone);
+        return;
+    case PokemonFRLG_RngTarget::rocksmash:
+        use_rock_smash(context, timings.ingame_delay);
+        return;
+    case PokemonFRLG_RngTarget::fishing:
+        use_registered_fishing_rod(context, timings.ingame_delay);
+        return;
+    case PokemonFRLG_RngTarget::safarizonecenter:
+        modified_ingame_delay = timings.ingame_delay - safari_zone_entrance_duration(language) - SAFARI_CENTER_WALK_DURATION;
+        walk_to_safarizonecenter(context, language);
+        use_sweet_scent(context, modified_ingame_delay, true);
+        return;
+    case PokemonFRLG_RngTarget::safarizoneeast:
+        modified_ingame_delay = timings.ingame_delay - safari_zone_entrance_duration(language) - SAFARI_EAST_WALK_DURATION;
+        walk_to_safarizoneeast(context, language);
+        use_sweet_scent(context, modified_ingame_delay, true);
+        return;
+    case PokemonFRLG_RngTarget::safarizonenorth:
+        modified_ingame_delay = timings.ingame_delay - safari_zone_entrance_duration(language) - SAFARI_NORTH_WALK_DURATION;
+        walk_to_safarizonenorth(context, language);
+        use_sweet_scent(context, modified_ingame_delay, true);
+        return;
+    case PokemonFRLG_RngTarget::safarizonewest:
+        modified_ingame_delay = timings.ingame_delay - safari_zone_entrance_duration(language) - SAFARI_WEST_WALK_DURATION;
+        walk_to_safarizonewest(context, language);
+        use_sweet_scent(context, modified_ingame_delay, true);
+        return;
+    case PokemonFRLG_RngTarget::safarizonesurf:
+        modified_ingame_delay = timings.ingame_delay - safari_zone_entrance_duration(language) - SAFARI_SURF_WALK_DURATION;
+        walk_to_safarizonesurf(context, language);
+        use_sweet_scent(context, modified_ingame_delay, true);
+        return;
+    case PokemonFRLG_RngTarget::safarizonefish:
+        modified_ingame_delay = timings.ingame_delay - safari_zone_entrance_duration(language) - SAFARI_FISH_WALK_DURATION;
+        walk_to_safarizonefish(context, language);
+        use_registered_fishing_rod(context, modified_ingame_delay);
+        return;
+    case PokemonFRLG_RngTarget::raikou:
+    case PokemonFRLG_RngTarget::entei:
+    case PokemonFRLG_RngTarget::suicune:
+    case PokemonFRLG_RngTarget::roaming:
+        activate_roamer(context, language, timings.ingame_delay);
+    }
+}
+
+}
+}
+}
\ No newline at end of file
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_BlindNavigation.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_BlindNavigation.h
new file mode 100644
index 0000000000..b46d001e64
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_BlindNavigation.h
@@ -0,0 +1,123 @@
+/*  Blind Navigation
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonFRLG_BlindNavigation_H
+#define PokemonAutomation_PokemonFRLG_BlindNavigation_H
+
+#include "CommonFramework/Language.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+#include "NintendoSwitch/NintendoSwitch_ConsoleState.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+    class ConsoleHandle;
+    class ProController;
+    using ProControllerContext = ControllerContext<ProController>;
+namespace PokemonFRLG{
+
+
+    enum class PokemonFRLG_RngTarget{
+        starters,
+        magikarp,
+        hitmon,
+        hitmonchan,
+        hitmonlee,
+        eevee,
+        lapras,
+        fossils,
+        omanyte,
+        kabuto,
+        aerodactyl,
+        gamecornerabra,
+        gamecornerclefairy,
+        gamecornerdratinifr,
+        gamecornerdratinilg,
+        gamecornerscyther,
+        gamecornerpinsir,
+        gamecornerporygon,
+        togepi,
+        togepifast,
+        eggheld,
+        eggpickup,
+        electrode,
+        articuno,
+        zapdos,
+        moltres,
+        lugia,
+        deoxys_attack,
+        deoxys_defense,
+        staticencounter,
+        snorlax,
+        mewtwo,
+        hooh,
+        hypno,
+        sweetscent,
+        rocksmash,
+        fishing,
+        safarizonecenter,
+        safarizoneeast,
+        safarizonenorth,
+        safarizonewest,
+        safarizonesurf,
+        safarizonefish,
+        raikou,
+        entei,
+        suicune,
+        roaming
+    };
+
+    enum class SeedButton{
+        A,
+        Start,
+        L
+    };
+
+    enum class BlackoutButton{
+        None,
+        L,
+        R
+    };
+
+    struct RngTimings{
+        uint64_t seed_delay;
+        uint64_t csf_delay;
+        uint64_t teachy_delay;
+        uint64_t ingame_delay;
+    };
+
+
+    // the approximate fixed difference (in frames) between the in-game delay and the advances hit for each target
+    int64_t fixed_advances_offset(PokemonFRLG_RngTarget target);
+
+    // checks seed, continue screen, and in-game timings for the specificed RNG manipulation target
+    // and fires an error if any of the timings are too short.
+    // ingame_advances and continue_screen_frames are the uncalibrated values the timings were prepared from.
+    // They're used to report the minimum advances the target needs.
+    void check_timings(
+        ConsoleHandle& console,
+        PokemonFRLG_RngTarget TARGET,
+        const RngTimings& timings,
+        Language language,
+        uint64_t ingame_advances,
+        uint64_t continue_screen_frames
+    );
+
+    // performs the blind sequence between launching the game and arriving at the RNG manipulation target
+    void perform_blind_sequence(
+        ProControllerContext& context,
+        Language language,
+        PokemonFRLG_RngTarget target,
+        SeedButton seed_button,
+        BlackoutButton extra_button,
+        const RngTimings& timings,
+        bool safari_zone,
+        ConsoleType console_type
+    );
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_EggRng.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_EggRng.cpp
new file mode 100644
index 0000000000..483b5fd0d9
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_EggRng.cpp
@@ -0,0 +1,1024 @@
+/*  Egg RNG
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <cmath>
+#include <algorithm>
+#include "Common/Cpp/Strings/StringTools.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonFramework/Language.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonFRLG/Inference/PokemonFRLG_DaycareManDetector.h"
+#include "VideoGames/PokemonFRLG/Programs/PokemonFRLG_StartMenuNavigation.h"
+#include "VideoGames/PokemonFRLG/PokemonFRLG_Navigation.h"
+#include "PokemonFRLG_RngNavigation.h"
+#include "PokemonFRLG_HardReset.h"
+#include "PokemonFRLG_RngCalibration.h"
+#include "PokemonFRLG_RngLoopRoutines.h"
+#include "PokemonFRLG_EncountersDatabase.h"
+#include "PokemonFRLG_EggRng.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+static const int64_t FIXED_SEED_OFFSET = -845;              // ms, approximate
+static const uint64_t CONTINUE_SCREEN_FRAMES = 200;
+
+ParentIVsRow::ParentIVsRow(int index, std::string&& label)
+    : StaticTableRow(label)
+    , parent(LockMode::LOCK_WHILE_RUNNING, label)
+    , hp(LockMode::LOCK_WHILE_RUNNING, 31, 0, 31)
+    , atk(LockMode::LOCK_WHILE_RUNNING, 31, 0, 31)
+    , def(LockMode::LOCK_WHILE_RUNNING, 31, 0, 31)
+    , spa(LockMode::LOCK_WHILE_RUNNING, 31, 0, 31)
+    , spd(LockMode::LOCK_WHILE_RUNNING, 31, 0, 31)
+    , spe(LockMode::LOCK_WHILE_RUNNING, 31, 0, 31)
+    , index(index)
+{
+    PA_ADD_OPTION(parent);
+    PA_ADD_OPTION(hp);
+    PA_ADD_OPTION(atk);
+    PA_ADD_OPTION(def);
+    PA_ADD_OPTION(spa);
+    PA_ADD_OPTION(spd);
+    PA_ADD_OPTION(spe);
+}
+
+ParentIVsTable::ParentIVsTable()
+    : StaticTableOption("<b>Parent IVs</b>.", LockMode::LOCK_WHILE_RUNNING)
+{
+    add_row(std::make_unique<ParentIVsRow>(0, "Parent A"));
+    add_row(std::make_unique<ParentIVsRow>(1, "Parent B"));
+    finish_construction();
+}
+std::vector<std::string> ParentIVsTable::make_header() const{
+    std::vector<std::string> ret{
+        "Parent",
+        "HP",
+        "Attack",
+        "Defense",
+        "Sp.Attack",
+        "Sp.Defense",
+        "Speed"
+    };
+    return ret;
+}
+
+
+EggRng_Descriptor::EggRng_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonFRLG:EggRng",
+        Pokemon::STRING_POKEMON + " FRLG", "Egg RNG",
+        "Programs/PokemonFRLG/EggRng.html",
+        "Automatically calibrate timings to hit a specific RNG target for daycare eggs.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_RequiresPrecision,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+struct EggRng_Descriptor::Stats : public StatsTracker{
+    Stats()
+        : resets(m_stats["Resets"])
+        , heldframes(m_stats["Held Frames Checked"])
+        , pickupframes(m_stats["Pickup Frames Checked"])
+        , shinies(m_stats["Shinies"])
+        , nonshiny(m_stats["Non-Shiny Hits"])
+        , balls(m_stats["Balls Used"])
+        , candies(m_stats["Rare Candies Used"])
+        , errors(m_stats["Errors"])
+    {
+        m_display_order.emplace_back("Resets");
+        m_display_order.emplace_back("Held Frames Checked");
+        m_display_order.emplace_back("Pickup Frames Checked");
+        m_display_order.emplace_back("Shinies");
+        m_display_order.emplace_back("Non-Shiny Hits", HIDDEN_IF_ZERO);
+        m_display_order.emplace_back("Balls Used", HIDDEN_IF_ZERO);
+        m_display_order.emplace_back("Rare Candies Used", HIDDEN_IF_ZERO);
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+    }
+    std::atomic<uint64_t>& resets;
+    std::atomic<uint64_t>& heldframes;
+    std::atomic<uint64_t>& pickupframes;
+    std::atomic<uint64_t>& shinies;
+    std::atomic<uint64_t>& nonshiny;
+    std::atomic<uint64_t>& balls;
+    std::atomic<uint64_t>& candies;
+    std::atomic<uint64_t>& errors;
+};
+std::unique_ptr<StatsTracker> EggRng_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+EggRng::~EggRng(){
+    HELD_SEED.remove_listener(*this);
+    PICKUP_SEED.remove_listener(*this);
+    STARTING_POINT.remove_listener(*this);
+}
+
+EggRng::EggRng()
+    : m_calibration_displays("Calibration Displays")
+    , HELD_CALIBRATION("Held Frame Calibration")
+    , PICKUP_CALIBRATION("Pickup Frame Calibration")
+    , m_game_info("Game Information")
+    , LANGUAGE(
+        "<b>Game Language:</b>",
+        {
+            Language::English,
+            Language::Japanese,
+            Language::Spanish,
+            Language::French,
+            Language::German,
+            Language::Italian,
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        true
+        )
+    , GAME_VERSION(
+        "<b>Game Version:</b>",
+        {
+            {GameVersion::firered, "firered", "FireRed"},
+            {GameVersion::leafgreen, "leafgreen", "LeafGreen"}
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        GameVersion::firered
+        )
+    , SOUND(
+        "<b>Sound:</b><br>"
+        "Your in-game sound setting. This affects the possible seeds.",
+        {
+            {SoundSetting::Mono, "mono", "Mono"},
+            {SoundSetting::Stereo, "stereo", "Stereo"}
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        SoundSetting::Mono
+        )
+    , m_target_settings("Target Settings")
+    , EGG_SPECIES(
+        "<b>Egg Species:</b>",
+        "PokemonFRLG/EggSpeciesGen3.json"
+        )
+    , COMPATIBILITY(
+        "<b>Parent Compatiblity:</b>",
+        {
+            {AdvEggCompatibility::low, "low", "The two don't seem to like each other"},
+            {AdvEggCompatibility::medium, "medium", "The two seem to get along"},
+            {AdvEggCompatibility::high, "high", "The two seem to get along very well"}
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        AdvEggCompatibility::low
+        )
+    , m_held_settings("Held Frame Settings")
+    , HELD_SEED(
+        false,
+        "<b>Held Seed:</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        "70FE", "70FE"
+        )
+    , HELD_ADVANCES(
+        "<b>Held Advances:</b><br>The total number of RNG advances for your held target.",
+        LockMode::LOCK_WHILE_RUNNING,
+        10000, 700, 1000000000 // default, min
+        )
+    , m_pickup_settings("Pickup Frame Settings")
+    , PICKUP_SEED(
+        false,
+        "<b>Pickup Seed:</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        "70FE", "70FE"
+        )
+    , PICKUP_ADVANCES(
+        "<b>Pickup Advances:</b><br>The total number of RNG advances for your pickup target.",
+        LockMode::LOCK_WHILE_RUNNING,
+        10000, 700, 1000000000 // default, min
+        )
+    , m_program_settings("Program Settings")
+    , SEED_RADIUS(
+        "<b>Nearby Seed Radius:</b><br>"
+        "The number of nearby seeds on each side of the target to search when identifying which seed was hit.",
+        LockMode::LOCK_WHILE_RUNNING,
+        5, 1 // default, min
+        )
+    , STARTING_POINT(
+        "<b>Starting Point:</b>",
+        {
+            {EggProgramState::held_prep, "held_prep", "Parents Dropped Off"},
+            {EggProgramState::held_calibration, "held_calibration", "Held Frame Calibration"},
+            {EggProgramState::pickup_calibration, "pickup_frame", "Pickup Frame Calibration"}
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        EggProgramState::held_prep
+        )
+    , ROCK_SMASH(
+        "<b>Use Rock Smash:</b><br>"
+        "When checked, the boulder on the beach will be smashed to prevent RNG noise.",
+        LockMode::LOCK_WHILE_RUNNING,
+        true // default
+        )
+    , MAX_RESETS(
+        "<b>Max Resets:</b>",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        400, 0 // default, min
+        )
+    , MAX_RARE_CANDIES(
+        "<b>Max Rare Candies:</b><br>"
+        "The number of rare candies in your bag. Make sure these are at the top position of the bag.<br>"
+        "Rare candies used during calibration will be restored after resetting.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        0, 0, 999 // default, min, max
+        )
+    , MAX_BALL_THROWS(
+        "<b>Max Balls Thrown:</b><br>"
+        "The number of " + STRING_POKEBALL + "s in your bag to attempt to throw. Make sure these are at the top position of the bag.<br>"
+                                "Balls thrown during calibration will be restored after resetting.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        20, 2, 999 // default, min, max
+        )
+    , PROFILE(
+        "<b>User Profile Position:</b><br>"
+        "The position, from left to right, of the Switch profile with the FRLG save you'd like to use.<br>"
+        "If this is set to 0, Switch 1 defaults to the last-used profile, while Switch 2 defaults to the first profile (position 1)",
+        LockMode::LOCK_WHILE_RUNNING,
+        0, 0, 8 // default, min, max
+        )
+    , TAKE_VIDEO(
+        "<b>Take Video:</b><br>Record a video when the shiny is found.",
+        LockMode::LOCK_WHILE_RUNNING,
+        true // default
+        )
+    , GO_HOME_WHEN_DONE(true)
+    , NOTIFICATION_SHINY(
+        "Shiny found",
+        true, true, ImageAttachmentMode::JPG,
+        {"Notifs", "Showcase"}
+        )
+    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_SHINY,
+        &NOTIFICATION_STATUS_UPDATE,
+        &NOTIFICATION_PROGRAM_FINISH,
+        })
+{
+    PA_ADD_OPTION(m_calibration_displays);
+    PA_ADD_OPTION(RNG_TARGET);
+    PA_ADD_OPTION(RNG_FILTERS);
+    PA_ADD_OPTION(HELD_CALIBRATION);
+    PA_ADD_OPTION(PICKUP_CALIBRATION);
+    PA_ADD_OPTION(m_game_info);
+    PA_ADD_OPTION(LANGUAGE);
+    PA_ADD_OPTION(GAME_VERSION);
+    PA_ADD_OPTION(SOUND);
+    PA_ADD_OPTION(m_target_settings);
+    PA_ADD_OPTION(EGG_SPECIES);
+    PA_ADD_OPTION(COMPATIBILITY);
+    PA_ADD_OPTION(PARENT_IVS);
+    PA_ADD_OPTION(m_held_settings);
+    PA_ADD_OPTION(HELD_SEED);
+    PA_ADD_OPTION(HELD_ADVANCES);
+    PA_ADD_OPTION(m_pickup_settings);
+    PA_ADD_OPTION(PICKUP_SEED);
+    PA_ADD_OPTION(PICKUP_ADVANCES);
+    PA_ADD_OPTION(m_program_settings);
+    PA_ADD_OPTION(SEED_RADIUS);
+    PA_ADD_OPTION(STARTING_POINT);
+    PA_ADD_OPTION(ROCK_SMASH);
+    PA_ADD_OPTION(MAX_RESETS);
+    PA_ADD_OPTION(MAX_BALL_THROWS);
+    PA_ADD_OPTION(MAX_RARE_CANDIES);
+    PA_ADD_OPTION(PROFILE);
+    PA_ADD_OPTION(TAKE_VIDEO);
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+    PA_ADD_OPTION(NOTIFICATIONS);
+
+    HELD_SEED.add_listener(*this);
+    PICKUP_SEED.add_listener(*this);
+    STARTING_POINT.add_listener(*this);
+}
+
+void EggRng::on_config_value_changed(void* object){
+    if (object == &HELD_SEED){
+        HELD_SEED.set(StringTools::strip(static_cast<std::string>(HELD_SEED)));
+        return;
+    }
+    if (object == &PICKUP_SEED){
+        PICKUP_SEED.set(StringTools::strip(static_cast<std::string>(PICKUP_SEED)));
+        return;
+    }
+    // switch between separate calibrations for the held and pickup frames
+    if (STARTING_POINT.current_value() == 2){
+        HELD_CALIBRATION.set_visibility(ConfigOptionState::HIDDEN);
+        PICKUP_CALIBRATION.set_visibility(ConfigOptionState::ENABLED);
+    }else{
+        HELD_CALIBRATION.set_visibility(ConfigOptionState::ENABLED);
+        PICKUP_CALIBRATION.set_visibility(ConfigOptionState::HIDDEN);
+    }
+}
+
+
+
+
+void EggRng::prep_held_resets(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    use_max_repel(env.console, context);
+    daycare_steps(env.console, context);
+    save_game_to_overworld(env.console, context);
+    pbf_wait(context, 5000ms);
+    context.wait_for_all_requests();
+}
+
+// void EggRng::prep_pickup_resets(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+
+// }
+
+bool EggRng::reset_and_check_seed(
+    SingleSwitchProgramEnvironment& env, 
+    ProControllerContext& context,
+    EggRng_Descriptor::Stats& stats,
+    EggCalibrationHistories& hist,
+    const EggFrameTargets& frame_targets,
+    AdvRngWildSearcher& wild_searcher,
+    WallClock& timestamp,
+    uint16_t& current_seed,
+    uint64_t& balls_left,
+    uint64_t& candies_left,
+    uint16_t& failed_searches,
+    uint16_t& times_not_held,
+    bool& shiny_found,
+    const bool& previously_hit_held_frame,
+    Milliseconds& launch_delay,
+    const std::set<std::string>& SPECIES_LIST,
+    const RngStatsDatabase& STATS_DATA,
+    bool pickup_frame
+){
+    RngCalibrations& calibrations = hist.calibrations;
+    RngUncertainHistory& wild_uncertain_history = hist.wild_uncertain;
+    RngCalibrationHistory& wild_history = hist.wild;
+
+    const EggFrameTarget& frame_target = frame_targets.frame(pickup_frame);
+    const uint64_t& SEED_DELAY = frame_target.seed_delay;
+    const std::vector<uint16_t>& SEED_VALUES = frame_target.seed_values;
+    const int16_t& SEED_POSITION = frame_target.seed_position;
+    const SeedButton& SEED_BUTTON = frame_target.seed_button;
+    const BlackoutButton& EXTRA_BUTTON = frame_target.extra_button;
+
+    static const uint64_t WILD_ADVANCES_RADIUS = 4096;
+    
+    static const uint16_t MAX_HISTORY_LENGTH = 2;
+
+    send_program_status_notification(
+        env, NOTIFICATION_STATUS_UPDATE,
+        pickup_frame ? "Calibrating pickup frame" : "Calibrating held frame"
+    );
+    env.update_stats();
+
+    uint64_t advances = pickup_frame ? PICKUP_ADVANCES : HELD_ADVANCES;
+    PokemonFRLG_RngTarget target = pickup_frame ? PokemonFRLG_RngTarget::eggpickup : PokemonFRLG_RngTarget::eggheld;  
+
+    select_calibrations_for_frame(
+        env, hist, SEED_VALUES, SEED_POSITION, advances, pickup_frame, previously_hit_held_frame, times_not_held
+    );
+
+    uint64_t ingame_advances = advances - CONTINUE_SCREEN_FRAMES;
+
+    RngTimings timings = prepare_timings(
+        env.console, target,
+        SEED_DELAY, CONTINUE_SCREEN_FRAMES, ingame_advances,
+        false, calibrations,
+        FIXED_SEED_OFFSET
+    );
+
+    // Step 1: reset and perform blind sequence
+    env.log("Resetting Game...");
+    reset_and_perform_blind_sequence(
+        env.console, context, LANGUAGE, target,
+        SEED_BUTTON, EXTRA_BUTTON,
+        timings, launch_delay, false, PROFILE
+    );
+    stats.resets++; 
+
+    RNG_FILTERS.reset();
+    if (pickup_frame){
+        PICKUP_CALIBRATION.set_calibrations(calibrations);
+    }else{
+        HELD_CALIBRATION.set_calibrations(calibrations);
+    }
+
+    // grab a timestamp after the blind button presses are over
+    // this is used for estimating what advances wild encounters and test pickups occur on
+    timestamp = current_time(); //
+
+    // Step 2: walk to the pond
+    if (pickup_frame){
+        walk_from_daycare_man_to_pond(env.console, context);
+    }else{
+        leave_pokecenter(env.console, context);
+
+        DaycareManWatcher egg_ready(COLOR_RED);
+        context.wait_for_all_requests();
+        int ret = wait_until(
+            env.console, context,
+            std::chrono::milliseconds(5000),
+            { egg_ready }
+        );
+
+        if (ret < 0){
+            env.log("Egg not ready. Resetting...");
+            times_not_held++;
+            return false;
+        }
+        env.log("Egg ready. Checking seed...");
+        times_not_held = 0;
+
+        walk_from_daycare_to_pond(env.console, context);
+    }
+
+    // Step 3: Catch a wild encounter and use it to determine the current seed
+    AdvObservedPokemon pokemon;
+    RngStats species_stats;
+    AdvRngFilters filters;
+    uint64_t wild_advances_estimate;
+    WildCatchOutcome catch_outcome = catch_wild_for_seed_id(
+        env, context, stats.errors, NOTIFICATION_ERROR_RECOVERABLE, LANGUAGE,
+        timestamp, advances, pickup_frame ? 2 : 0,
+        balls_left, SPECIES_LIST, STATS_DATA,
+        pokemon, species_stats, filters, wild_advances_estimate,
+        [&](const AdvRngFilters& f){ RNG_FILTERS.set(f); }
+    );
+    shiny_found = (catch_outcome == WildCatchOutcome::shiny);
+    if (shiny_found){
+        return true;
+    }
+    if (catch_outcome == WildCatchOutcome::failed){
+        return false;
+    }
+
+    // For the wild step we only need to confirm the correct seed was hit; advance timing is
+    // irrelevant and wild_history is largely unused, so result_determined just checks same_seeds.
+    std::vector<AdvRngState> search_hits = refine_calibration_with_rare_candy(
+        env, context, LANGUAGE, pokemon, filters, species_stats.base_stats,
+        wild_uncertain_history, wild_history, calibrations,
+        MAX_HISTORY_LENGTH, candies_left, AdvRngMethod::Any, false,
+        stats.errors, NOTIFICATION_ERROR_RECOVERABLE,
+        [&](AdvRngFilters& f){
+            return get_wild_search_results(env.console, wild_searcher, f, SEED_VALUES, wild_advances_estimate, WILD_ADVANCES_RADIUS, species_stats.gender_threshold);
+        },
+        [&](const std::vector<AdvRngState>& h){
+            if (pickup_frame){ PICKUP_CALIBRATION.set_hits(h); }else{ HELD_CALIBRATION.set_hits(h); }
+        },
+        [&](const AdvRngFilters& f){ RNG_FILTERS.set(f); },
+        [](const std::vector<AdvRngState>& h){ return same_seeds(h); }
+    );
+    candies_left -= uint64_t(pokemon.stats.size() - 1);
+
+    if (search_hits.size() == 0){
+        env.log("No Wild RNG matches found. Resetting...");
+        failed_searches++;
+        return false;
+    }else{
+        env.log("Wild RNG search finished.");
+        failed_searches = 0;
+    }
+
+    if (search_hits[0].seed != SEED_VALUES[SEED_POSITION]){
+        env.log("Wrong seed hit.");
+        if (pickup_frame || previously_hit_held_frame){
+            return false;
+        }
+    }else{
+        env.log("Hit target seed.");
+    }
+
+    current_seed = search_hits[0].seed;
+    return true;
+}
+
+bool EggRng::held_frame_check(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EggRng_Descriptor::Stats& stats,
+    EggCalibrationHistories& hist,
+    AdvRngEggSearcher& egg_searcher,
+    const WallClock& timestamp,
+    const uint16_t& current_seed,
+    uint64_t& candies_left,
+    uint16_t& failed_searches,
+    bool& shiny_found,
+    bool& previously_hit_held_frame,
+    const uint16_t& TARGET_HELD_SEED,
+    const RngStats& EGG_STATS,
+    AdvIVs& PARENT_A,
+    AdvIVs& PARENT_B
+){
+    RngCalibrations& calibrations = hist.calibrations;
+    RngUncertainHistory& egg_uncertain_history = hist.egg_uncertain;
+    RngCalibrationHistory& held_calibration_history = hist.held;
+
+    static const uint64_t HELD_CHECK_ADVANCES_RADIUS = 8092;
+
+    static const uint16_t MAX_HISTORY_LENGTH = 10;
+    static const uint64_t INITIAL_ADVANCES_RADIUS = 128;
+
+    uint64_t advances_radius = 
+        previously_hit_held_frame ? 4 
+        : get_advances_radius(env.console, held_calibration_history, INITIAL_ADVANCES_RADIUS);
+
+    pbf_mash_button(context, BUTTON_B, 5000ms); // return to overworld
+    walk_from_pond_to_daycare_man(env.console, context);
+
+    // decide if it's a good idea to save and commit to this held frame
+    bool locked_in = false;
+    if (previously_hit_held_frame && (current_seed == TARGET_HELD_SEED)){
+        if (ROCK_SMASH){
+            env.log("Smashing rock on the beach...");
+            smash_daycare_rock(env.console, context);
+        }
+        env.log("Committing to this Held Frame and saving the game...");
+        save_game_to_overworld(env.console, context);
+        locked_in = true;
+    }
+
+    // collect and hatch egg
+    egg_pickup(env.console, context);
+    WallDuration elapsed = current_time() - timestamp;
+    pbf_press_button(context, BUTTON_MINUS, 200ms, 800ms); // hop on bike
+    hatch_daycare_egg(env.console, context);
+    shiny_found = shiny_check_summary(env.console, context);
+    if (shiny_found){
+        return true;
+    }
+
+    // read stats
+    AdvObservedPokemon observed_egg = read_summary(env.console, context, LANGUAGE);
+    observed_egg.level[0] = 5;
+    AdvRngFilters filters = observation_to_filters(observed_egg, EGG_STATS.base_stats, AdvRngMethod::Any);
+    RNG_FILTERS.set(filters);
+
+    // narrow down possible hits 
+    auto elapsed_ms = std::chrono::duration_cast<Milliseconds>(elapsed);
+    uint64_t advances_estimate = uint64_t(HELD_ADVANCES + 2 * elapsed_ms.count() / FRLG_FRAME_DURATION);
+    env.log("Test pickup advances estimate: " + std::to_string(advances_estimate));    
+
+    std::vector<AdvRngState> held_hits = refine_egg_calibration(
+        env, context, LANGUAGE, observed_egg, filters, EGG_STATS.base_stats,
+        egg_uncertain_history, held_calibration_history, calibrations,
+        MAX_HISTORY_LENGTH, candies_left,
+        EggRefineOptions{ true, 1, 0 },
+        stats.errors, NOTIFICATION_ERROR_RECOVERABLE,
+        [&](AdvRngFilters& f){
+            return get_egg_search_results(
+                env.console, egg_searcher, f,
+                { current_seed }, { current_seed },
+                HELD_ADVANCES, advances_radius, advances_estimate, HELD_CHECK_ADVANCES_RADIUS,
+                PARENT_A, PARENT_B, COMPATIBILITY,
+                EGG_STATS.gender_threshold, 0
+            );
+        },
+        [&](const std::vector<AdvRngState>& h){ HELD_CALIBRATION.set_hits(h); },
+        [&](const AdvRngFilters& f){ RNG_FILTERS.set(f); },
+        [&](const std::vector<std::pair<AdvRngState, AdvRngState>>& pairs){
+            return all_indistinguishable(pairs, egg_searcher, EGG_STATS.gender_threshold, PARENT_A, PARENT_B);
+        }
+    );
+
+    candies_left -= uint64_t(observed_egg.stats.size() - 1);
+
+    env.log("RNG Search finished");
+    update_failed_searches(failed_searches, held_hits);
+
+    bool possibly_hit_held_frame = false;
+    if (egg_uncertain_history.results.size()){
+        for (const AdvRngState& hit : held_hits){
+            if (have_hit_target(TARGET_HELD_SEED, HELD_ADVANCES, hit)){
+                possibly_hit_held_frame = true;
+                break;
+            }
+        }
+    }
+
+    if (held_calibration_history.results.empty()){
+        return false;
+    }
+
+    bool definitely_hit_held_frame = confirm_held_frame_hit(
+        held_calibration_history, egg_uncertain_history, locked_in, TARGET_HELD_SEED, HELD_ADVANCES
+    );
+
+    if (locked_in && definitely_hit_held_frame){
+        env.log("Hit the target held frame!");
+    }else if (!locked_in && definitely_hit_held_frame){
+        env.log("Confirmed hit on the target held frame!");
+    }else if(possibly_hit_held_frame){
+        env.log("Possibly hit target held frame.");
+    }else{
+        env.log("Missed the target held frame.");
+    }
+
+    if (locked_in && !(definitely_hit_held_frame || possibly_hit_held_frame)){
+        STARTING_POINT.set(EggProgramState::held_prep);
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "EggRng(): Missed held frame after saving. Restart the program after repeating the manual in-game setup.",
+            env.console
+        ); 
+    }
+
+    previously_hit_held_frame = definitely_hit_held_frame;
+
+    return (locked_in && (definitely_hit_held_frame || possibly_hit_held_frame));
+}
+
+
+bool EggRng::pickup_frame_check(
+    SingleSwitchProgramEnvironment& env, 
+    ProControllerContext& context,
+    EggRng_Descriptor::Stats& stats,
+    EggCalibrationHistories& hist,
+    AdvRngEggSearcher& egg_searcher,
+    uint64_t& candies_left,
+    uint16_t& failed_searches,
+    bool& shiny_found,
+    const uint16_t& TARGET_HELD_SEED,
+    const uint16_t& TARGET_PICKUP_SEED,
+    const RngStats& EGG_STATS,
+    AdvIVs& PARENT_A,
+    AdvIVs& PARENT_B
+){
+    RngCalibrations& calibrations = hist.calibrations;
+    RngUncertainHistory& egg_uncertain_history = hist.egg_uncertain;
+    RngCalibrationHistory& pickup_calibration_history = hist.pickup;
+
+    static const uint16_t MAX_HISTORY_LENGTH = 5;
+    static const uint64_t INITIAL_ADVANCES_RADIUS = 128;
+
+    uint64_t advances_radius = get_advances_radius(env.console, pickup_calibration_history, INITIAL_ADVANCES_RADIUS);
+
+    pbf_mash_button(context, BUTTON_B, 5000ms); // return to overworld
+    walk_from_pond_to_daycare_man(env.console, context);
+
+    // egg already collected. Hatch...
+    pbf_press_button(context, BUTTON_MINUS, 200ms, 800ms); // hop on bike
+    hatch_daycare_egg(env.console, context);
+    shiny_found = shiny_check_summary(env.console, context, 1);
+    if (shiny_found){
+        return true;
+    }
+
+    // ... read ...
+    AdvObservedPokemon observed_egg = read_summary(env.console, context, LANGUAGE);
+    observed_egg.level[0] = 5;
+    AdvRngFilters filters = observation_to_filters(observed_egg, EGG_STATS.base_stats, AdvRngMethod::Any);
+    RNG_FILTERS.set(filters);
+
+    // ...and narrow down possible hits
+    std::vector<AdvRngState> pickup_hits = refine_egg_calibration(
+        env, context, LANGUAGE, observed_egg, filters, EGG_STATS.base_stats,
+        egg_uncertain_history, pickup_calibration_history, calibrations,
+        MAX_HISTORY_LENGTH, candies_left,
+        EggRefineOptions{ false, 2, 1 },
+        stats.errors, NOTIFICATION_ERROR_RECOVERABLE,
+        [&](AdvRngFilters& f){
+            return get_egg_search_results(
+                env.console, egg_searcher, f,
+                { TARGET_HELD_SEED }, { TARGET_PICKUP_SEED },
+                HELD_ADVANCES, 0, PICKUP_ADVANCES, advances_radius,
+                PARENT_A, PARENT_B, COMPATIBILITY,
+                EGG_STATS.gender_threshold, 0
+            );
+        },
+        [&](const std::vector<AdvRngState>& h){ PICKUP_CALIBRATION.set_hits(h); },
+        [&](const AdvRngFilters& f){ RNG_FILTERS.set(f); },
+        [&](const std::vector<std::pair<AdvRngState, AdvRngState>>& pairs){
+            return all_indistinguishable(pairs, egg_searcher, EGG_STATS.gender_threshold, PARENT_A, PARENT_B);
+        }
+    );
+    candies_left -= uint64_t(observed_egg.stats.size() - 1);
+
+    env.log("RNG Search finished");
+    update_failed_searches(failed_searches, pickup_hits);
+
+    if (pickup_calibration_history.results.empty()){
+        return false;
+    }
+
+    auto newest_result = pickup_calibration_history.results.back();
+    return (
+        newest_result.seed == TARGET_PICKUP_SEED
+        && newest_result.advance == PICKUP_ADVANCES
+    );
+    
+}
+
+
+void EggRng::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    /*
+    * Settings: Text Speed fast
+    */
+
+    EggRng_Descriptor::Stats& stats = env.current_stats<EggRng_Descriptor::Stats>();
+
+    home_black_border_check(env.console, context);
+
+    // prepare database of base stats and gender thresholds
+    RngStatsDatabase STATS_DATA("PokemonFRLG/BaseStats.json");
+
+    RngStats EGG_STATS;
+    try{
+        EGG_STATS = STATS_DATA.get_throw(EGG_SPECIES.slug());        
+    }catch (const InternalProgramError& err){
+        env.log(err.message());
+        env.log(EGG_SPECIES.slug());
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            err.message(),
+            env.console
+        ); 
+    }
+
+    // get the relevant encounter slots
+    EncountersDatabase encounters_data(GAME_VERSION == GameVersion::firered ? "PokemonFRLG/EncounterSlotsFR.json" : "PokemonFRLG/EncounterSlotsLG.json");
+    std::map<std::string, std::vector<AdvEncounterSlot>> location_map = encounters_data.get_throw("surfing");
+    std::vector<AdvEncounterSlot> ENCOUNTER_SLOTS = location_map.find("four_island")->second;
+    env.log("Pond Encounter slots");
+    for (size_t i=0; i<ENCOUNTER_SLOTS.size(); i++){
+        AdvEncounterSlot& slot = ENCOUNTER_SLOTS[i];
+        env.log("   Slot " + std::to_string(i) + ": " + slot.species + " " + std::to_string(slot.minlevel) + "-" + std::to_string(slot.maxlevel));
+    }    
+
+    std::set<std::string> SPECIES_LIST;
+    for (auto slot : ENCOUNTER_SLOTS){
+        SPECIES_LIST.emplace(slot.species);
+    }
+
+    const SeedsDatabase seeds_db(seeds_json_path(GAME_VERSION == GameVersion::firered, LANGUAGE));
+
+    // held timings
+    const uint16_t TARGET_HELD_SEED = parse_seed(env.console, HELD_SEED);
+    const SeedMatch held_match = seeds_db.find_seed(TARGET_HELD_SEED, SOUND, SEED_RADIUS);
+    if (!held_match.found){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "EggRng(): Held Seed was not found in the seed database for this game version, language, and sound setting.",
+            env.console
+        );
+    }
+    env.log("Target Held Seed Value: " + to_hex_string(TARGET_HELD_SEED)
+        + " (delay " + std::to_string(held_match.seed_delay) + "ms, button mode " + held_match.button_mode + ")");
+
+    // pickup timings
+    const uint16_t TARGET_PICKUP_SEED = parse_seed(env.console, PICKUP_SEED);
+    const SeedMatch pickup_match = seeds_db.find_seed(TARGET_PICKUP_SEED, SOUND, SEED_RADIUS);
+    if (!pickup_match.found){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "EggRng(): Pickup Seed was not found in the seed database for this game version, language, and sound setting.",
+            env.console
+        );
+    }
+    env.log("Target Pickup Seed Value: " + to_hex_string(TARGET_PICKUP_SEED)
+        + " (delay " + std::to_string(pickup_match.seed_delay) + "ms, button mode " + pickup_match.button_mode + ")");
+
+    EggFrameTargets frame_targets{
+        { held_match.seed_delay, held_match.seed_values, held_match.seed_position, held_match.seed_button, held_match.extra_button },
+        { pickup_match.seed_delay, pickup_match.seed_values, pickup_match.seed_position, pickup_match.seed_button, pickup_match.extra_button }
+    };
+
+    // searchers
+    AdvRngWildSearcher wild_searcher(TARGET_HELD_SEED, HELD_ADVANCES, ENCOUNTER_SLOTS, AdvRngMethod::Any);
+    AdvRngEggSearcher egg_searcher(TARGET_HELD_SEED, HELD_ADVANCES, TARGET_PICKUP_SEED, PICKUP_ADVANCES, AdvRngMethod::Any);
+
+    ParentIVsRow& rowA = static_cast<ParentIVsRow&>(*PARENT_IVS.table()[0]);
+    ParentIVsRow& rowB = static_cast<ParentIVsRow&>(*PARENT_IVS.table()[1]);
+    AdvIVs PARENT_A = { rowA.hp, rowA.atk, rowA.def, rowA.spa, rowA.spd, rowA.spe };
+    AdvIVs PARENT_B = { rowB.hp, rowB.atk, rowB.def, rowB.spa, rowB.spd, rowB.spe };
+
+    AdvPokemonResult target_result = egg_searcher.generate_pokemon(PARENT_A, PARENT_B);
+    RNG_TARGET.set_target(target_result, EGG_STATS.gender_threshold);
+    log_target_pokemon(env.console, target_result, true);
+
+    Milliseconds launch_delay = INITIAL_LAUNCH_DELAY;
+
+    const RngCalibrations initial_held_calibrations = {
+        HELD_CALIBRATION.seed_calibration / FRLG_FRAME_DURATION,
+        HELD_CALIBRATION.csf_calibration,
+        HELD_CALIBRATION.advances_calibration
+    };
+
+    EggCalibrationHistories hist(initial_held_calibrations);
+    if (STARTING_POINT == EggProgramState::pickup_calibration){
+        hist.calibrations = {
+            PICKUP_CALIBRATION.seed_calibration / FRLG_FRAME_DURATION,
+            PICKUP_CALIBRATION.csf_calibration,
+            PICKUP_CALIBRATION.advances_calibration
+        };
+    }else{
+        hist.calibrations = initial_held_calibrations;
+    }
+
+    log_calibrations(env.console, hist.calibrations, true);
+
+    // check timings for the pickup phase before starting
+    if (STARTING_POINT != EggProgramState::pickup_calibration){
+        env.log("Checking held frame timings...");
+        prepare_timings(
+            env.console, PokemonFRLG_RngTarget::eggheld,
+            frame_targets.held.seed_delay, CONTINUE_SCREEN_FRAMES, HELD_ADVANCES - CONTINUE_SCREEN_FRAMES,
+            false, initial_held_calibrations,
+            FIXED_SEED_OFFSET
+        );
+    }
+    env.log("Checking pickup frame timings...");
+    prepare_timings(
+        env.console, PokemonFRLG_RngTarget::eggpickup,
+        frame_targets.pickup.seed_delay, CONTINUE_SCREEN_FRAMES, PICKUP_ADVANCES - CONTINUE_SCREEN_FRAMES,
+        false,
+        {
+            PICKUP_CALIBRATION.seed_calibration / FRLG_FRAME_DURATION,
+            PICKUP_CALIBRATION.csf_calibration,
+            PICKUP_CALIBRATION.advances_calibration
+        },
+        FIXED_SEED_OFFSET
+    );
+
+    bool shiny_found = false;
+
+    bool previously_hit_held_frame = false;
+
+    uint64_t balls_left = MAX_BALL_THROWS;
+    uint64_t candies_left = MAX_RARE_CANDIES;
+    uint16_t failed_searches = 0;
+    uint16_t times_not_held = 0;
+
+    EggProgramState program_state = STARTING_POINT;
+
+    
+    // main loop
+    while (true){
+        if (shiny_found){
+            env.log("Shiny found!");
+            stats.shinies++;
+            send_program_notification(
+                env,
+                NOTIFICATION_SHINY,
+                COLOR_YELLOW,
+                "Shiny found!",
+                {}, "",
+                env.console.video().snapshot(),
+                true
+            );
+            if (TAKE_VIDEO){
+                pbf_press_button(context, BUTTON_CAPTURE, 2000ms, 0ms);
+            }
+            break;
+        }
+
+        if (hist.pickup.results.size() > 0){
+            env.log("Checking for nonshiny target hit...");
+            if (have_hit_target(TARGET_PICKUP_SEED, PICKUP_ADVANCES, hist.pickup.results.back())){
+                env.log("Target Hit!");
+                stats.nonshiny++;
+                break;
+            }
+            env.log("Missed target.");
+        }
+
+        if (failed_searches >= 5){
+            env.log("Failed to find any matches 5 times in a row");
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::NO_ERROR_REPORT,
+                "Failed to find any matches 5 times in a row. Check your seed and advances settings.",
+                env.console
+            ); 
+            break;
+        }
+
+        if (stats.resets > MAX_RESETS){
+            env.log("Max resets reached.");
+            break;
+        }
+
+        bool hit_seed;
+        bool held_finished;
+        bool pickup_finished;
+
+        WallClock timestamp; 
+
+        uint16_t current_seed;
+
+        uint64_t temp_balls_left;
+        uint64_t temp_candies_left;
+
+        switch (program_state){
+        case EggProgramState::held_prep:
+            prep_held_resets(env, context);
+            hist.clear_uncertain();
+            program_state = EggProgramState::held_calibration;
+            STARTING_POINT.set(EggProgramState::held_calibration);
+            continue;
+
+        case EggProgramState::held_calibration:
+            current_seed = 0;
+            temp_balls_left = balls_left;
+            temp_candies_left = candies_left;
+            hit_seed = reset_and_check_seed(
+                env, context, stats,
+                hist, frame_targets, wild_searcher,
+                timestamp, current_seed,
+                temp_balls_left, temp_candies_left, failed_searches,
+                times_not_held, shiny_found, previously_hit_held_frame,
+                launch_delay,
+                SPECIES_LIST, STATS_DATA,
+                false
+            );
+
+            if (!hit_seed) { continue; }
+
+            held_finished = held_frame_check(
+                env, context, stats,
+                hist, egg_searcher,
+                timestamp, current_seed,
+                temp_candies_left, failed_searches,
+                shiny_found, previously_hit_held_frame,
+                TARGET_HELD_SEED,
+                EGG_STATS, PARENT_A, PARENT_B
+            );
+            stats.heldframes++;
+
+            if (held_finished){
+                env.log("Hit held frame after saving. Moving on to pickup frame calibration...");
+                stats.balls += (balls_left - temp_balls_left);
+                stats.candies += (candies_left - temp_candies_left);
+                balls_left = temp_balls_left;
+                candies_left = temp_candies_left;
+                hist.clear_uncertain();
+                program_state = EggProgramState::pickup_calibration;
+                STARTING_POINT.set(EggProgramState::pickup_calibration);
+                hist.calibrations = {
+                    PICKUP_CALIBRATION.seed_calibration / FRLG_FRAME_DURATION,
+                    PICKUP_CALIBRATION.csf_calibration,
+                    PICKUP_CALIBRATION.advances_calibration
+                };
+            }
+            continue;
+
+        case EggProgramState::pickup_calibration:
+            current_seed = 0; // unused here
+            temp_balls_left = balls_left;
+            temp_candies_left = candies_left;
+            hit_seed = reset_and_check_seed(
+                env, context, stats,
+                hist, frame_targets, wild_searcher,
+                timestamp, current_seed,
+                temp_balls_left, temp_candies_left, failed_searches,
+                times_not_held, shiny_found, previously_hit_held_frame,
+                launch_delay,
+                SPECIES_LIST, STATS_DATA,
+                true
+            );
+
+            if (!hit_seed) { continue; }
+
+            pickup_finished = pickup_frame_check(
+                env, context, stats,
+                hist, egg_searcher,
+                temp_candies_left, failed_searches, shiny_found,
+                TARGET_HELD_SEED, TARGET_PICKUP_SEED,
+                EGG_STATS, PARENT_A, PARENT_B
+            );
+            stats.pickupframes++;
+
+            if (pickup_finished){
+                stats.balls += (balls_left - temp_balls_left);
+                stats.candies += (candies_left - temp_candies_left);
+                env.log("Hit pickup frame!");
+                program_state = EggProgramState::finished;
+                STARTING_POINT.set(EggProgramState::held_prep);
+            }
+            continue;
+
+        case EggProgramState::finished:
+        default:
+            break;
+        }
+    }
+
+    if (GO_HOME_WHEN_DONE){
+        pbf_press_button(context, BUTTON_HOME, 200ms, 1000ms);
+    }
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_EggRng.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_EggRng.h
new file mode 100644
index 0000000000..5462ee2eac
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_EggRng.h
@@ -0,0 +1,185 @@
+/*  Egg RNG
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonFRLG_EggRng_H
+#define PokemonAutomation_PokemonFRLG_EggRng_H
+
+#include "Common/Cpp/Options/StaticTextOption.h"
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "Common/Cpp/Options/TextEditOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "CommonFramework/Options/LabelCellOption.h"
+#include "CommonTools/Options/LanguageOCROption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+#include "Pokemon/Options/Pokemon_NameSelectOption.h"
+#include "Pokemon/Pokemon_AdvRng.h"
+#include "PokemonFRLG_BlindNavigation.h"
+#include "PokemonFRLG_RngCalibration.h"
+#include "PokemonFRLG_RngStatsDatabase.h"
+#include "PokemonFRLG_RngDisplays.h"
+#include "PokemonFRLG_RngLoopRoutines.h"
+#include "PokemonFRLG_SeedsDatabase.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+class ParentIVsRow : public StaticTableRow{
+public:
+    ParentIVsRow(int index, std::string&& label);
+    LabelCellOption parent;
+    SimpleIntegerCell<uint8_t> hp;
+    SimpleIntegerCell<uint8_t> atk;
+    SimpleIntegerCell<uint8_t> def;
+    SimpleIntegerCell<uint8_t> spa;
+    SimpleIntegerCell<uint8_t> spd;
+    SimpleIntegerCell<uint8_t> spe;
+    int index;
+};
+
+class ParentIVsTable : public StaticTableOption {
+public:
+    ParentIVsTable();
+    virtual std::vector<std::string> make_header() const;
+};
+
+
+class EggRng_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    EggRng_Descriptor();
+    struct Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+class EggRng : public SingleSwitchProgramInstance, public ConfigOption::Listener{
+public:
+    using Descriptor = EggRng_Descriptor;
+    ~EggRng();
+    EggRng();
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext &context) override;
+    virtual void start_program_border_check(
+        VideoStream& stream,
+        FeedbackType feedback_type
+    ) override{}
+
+private:
+    virtual void on_config_value_changed(void* object) override;
+
+    enum class GameVersion{
+        firered,
+        leafgreen
+    };
+
+    enum class EggProgramState{
+        held_prep,
+        held_calibration,
+        pickup_calibration,
+        finished
+    };
+
+    void prep_held_resets(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+
+    bool reset_and_check_seed(
+        SingleSwitchProgramEnvironment& env,
+        ProControllerContext& context,
+        EggRng_Descriptor::Stats& stats,
+        EggCalibrationHistories& hist,
+        const EggFrameTargets& frame_targets,
+        AdvRngWildSearcher& wild_searcher,
+        WallClock& timestamp,
+        uint16_t& current_seed,
+        uint64_t& balls_left,
+        uint64_t& candies_left,
+        uint16_t& failed_searches,
+        uint16_t& times_not_held,
+        bool& shiny_found,
+        const bool& previously_hit_held_frame,
+        Milliseconds& launch_delay,
+        const std::set<std::string>& SPECIES_LIST,
+        const RngStatsDatabase& STATS_DATA,
+        bool pickup_frame
+    );
+    
+    bool held_frame_check(
+        SingleSwitchProgramEnvironment& env,
+        ProControllerContext& context,
+        EggRng_Descriptor::Stats& stats,
+        EggCalibrationHistories& hist,
+        AdvRngEggSearcher& egg_searcher,
+        const WallClock& timestamp,
+        const uint16_t& current_seed,
+        uint64_t& candies_left,
+        uint16_t& failed_searches,
+        bool& shiny_found,
+        bool& previously_hit_held_frame,
+        const uint16_t& TARGET_HELD_SEED,
+        const RngStats& EGG_STATS,
+        AdvIVs& PARENT_A,
+        AdvIVs& PARENT_B
+    );
+
+    bool pickup_frame_check(
+        SingleSwitchProgramEnvironment& env,
+        ProControllerContext& context,
+        EggRng_Descriptor::Stats& stats,
+        EggCalibrationHistories& hist,
+        AdvRngEggSearcher& egg_searcher,
+        uint64_t& candies_left,
+        uint16_t& failed_searches,
+        bool& shiny_found,
+        const uint16_t& TARGET_HELD_SEED,
+        const uint16_t& TARGET_PICKUP_SEED,
+        const RngStats& EGG_STATS,
+        AdvIVs& PARENT_A,
+        AdvIVs& PARENT_B
+    );
+
+
+    SectionDividerOption m_calibration_displays;
+    RngTargetDisplay RNG_TARGET;
+    RngFilterDisplay RNG_FILTERS;
+    RngCalibrationDisplay HELD_CALIBRATION;
+    RngCalibrationDisplay PICKUP_CALIBRATION;
+
+    SectionDividerOption m_game_info;
+    OCR::LanguageOCROption LANGUAGE;
+    EnumDropdownOption<GameVersion> GAME_VERSION;
+    EnumDropdownOption<SoundSetting> SOUND;
+
+    SectionDividerOption m_target_settings;
+    PokemonNameSelectOption EGG_SPECIES;
+    EnumDropdownOption<AdvEggCompatibility> COMPATIBILITY;
+    ParentIVsTable PARENT_IVS;
+
+    SectionDividerOption m_held_settings;
+    StringOption HELD_SEED;
+    SimpleIntegerOption<uint64_t>HELD_ADVANCES;
+
+    SectionDividerOption m_pickup_settings;
+    StringOption PICKUP_SEED;
+    SimpleIntegerOption<uint64_t>PICKUP_ADVANCES;
+
+    SectionDividerOption m_program_settings;
+    SimpleIntegerOption<uint16_t> SEED_RADIUS;
+    EnumDropdownOption<EggProgramState> STARTING_POINT;
+    BooleanCheckBoxOption ROCK_SMASH;
+    SimpleIntegerOption<uint64_t> MAX_RESETS;
+    SimpleIntegerOption<uint64_t> MAX_RARE_CANDIES;
+    SimpleIntegerOption<uint64_t> MAX_BALL_THROWS;
+    SimpleIntegerOption<uint8_t> PROFILE;
+    BooleanCheckBoxOption TAKE_VIDEO;
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
+    EventNotificationOption NOTIFICATION_SHINY;
+    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_EncountersDatabase.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_EncountersDatabase.cpp
new file mode 100644
index 0000000000..6db8b6240c
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_EncountersDatabase.cpp
@@ -0,0 +1,64 @@
+/*  Encounters Database
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Json/JsonValue.h"
+#include "Common/Cpp/Json/JsonObject.h"
+#include "Common/Cpp/Json/JsonArray.h"
+#include "CommonFramework/GlobalAutoPaths.h"
+#include "PokemonFRLG_EncountersDatabase.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+
+EncountersDatabase::EncountersDatabase(const char* json_path){
+    std::string path = RESOURCE_PATH() + json_path;
+    JsonValue json = load_json_file(path);
+    JsonObject& root = json.to_object_throw(path);
+
+    for (auto& item : root){
+        const std::string& encounter_type = item.first;
+        JsonObject& type_obj = item.second.to_object_throw(path);
+        std::map<std::string, std::vector<AdvEncounterSlot>> loc_map;
+        for (auto& loc_item : type_obj){
+            const std::string& loc_name = loc_item.first;
+            JsonArray& encs_arr = loc_item.second.to_array_throw(path);
+            std::vector<AdvEncounterSlot> encounter_slots;
+            for (auto& enc_item : encs_arr){
+                JsonObject& enc_obj = enc_item.to_object_throw(path);
+                std::string species = enc_obj.get_string_throw("species", path);
+                uint8_t minlevel = uint8_t(enc_obj.get_integer_throw("minLevel", path));
+                uint8_t maxlevel = uint8_t(enc_obj.get_integer_throw("maxLevel", path));
+                AdvEncounterSlot slot = { species, minlevel, maxlevel };
+                encounter_slots.emplace_back(slot);
+            }
+            loc_map.emplace(loc_name, encounter_slots);
+        }
+        m_database.emplace(encounter_type, loc_map);
+    }
+}
+
+const std::map<std::string, std::vector<AdvEncounterSlot>>& EncountersDatabase::get_throw(const std::string& slug) const{
+    auto iter = m_database.find(slug);
+    if (iter == m_database.end()){
+        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Slug not found in database: " + slug);
+    }
+    return iter->second;
+}
+const std::map<std::string, std::vector<AdvEncounterSlot>>* EncountersDatabase::get_nothrow(const std::string& slug) const{
+    auto iter = m_database.find(slug);
+    if (iter == m_database.end()){
+        return nullptr;
+    }
+    return &iter->second;
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_EncountersDatabase.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_EncountersDatabase.h
new file mode 100644
index 0000000000..fd306f38ad
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_EncountersDatabase.h
@@ -0,0 +1,45 @@
+/*  Encounters Database
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonFRLG_EncountersDatabase_H
+#define PokemonAutomation_PokemonFRLG_EncountersDatabase_H
+
+#include <map>
+#include "Pokemon/Pokemon_AdvRng.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+using namespace Pokemon;
+
+class EncountersDatabase{
+public:
+    EncountersDatabase(const char* json_path);
+    const std::map<std::string, std::vector<AdvEncounterSlot>>& get_throw(const std::string& slug) const;
+    const std::map<std::string, std::vector<AdvEncounterSlot>>* get_nothrow(const std::string& slug) const;
+
+public:
+    using const_iterator = std::map<std::string, std::map<std::string, std::vector<AdvEncounterSlot>>>::const_iterator;
+    using       iterator = std::map<std::string, std::map<std::string, std::vector<AdvEncounterSlot>>>::iterator;
+
+    const_iterator cbegin   () const{ return m_database.cbegin(); }
+    const_iterator begin    () const{ return m_database.begin(); }
+          iterator begin    (){ return m_database.begin(); }
+    const_iterator cend   () const{ return m_database.cend(); }
+    const_iterator end    () const{ return m_database.end(); }
+          iterator end    (){ return m_database.end(); }
+
+private:
+    std::map<std::string, std::map<std::string, std::vector<AdvEncounterSlot>>> m_database;
+};
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_GiftRng.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_GiftRng.cpp
new file mode 100644
index 0000000000..3341d8cef2
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_GiftRng.cpp
@@ -0,0 +1,497 @@
+/*  Gift RNG
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Strings/StringTools.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonFramework/Language.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonFRLG/PokemonFRLG_Navigation.h"
+#include "PokemonFRLG_RngNavigation.h"
+#include "PokemonFRLG_HardReset.h"
+#include "PokemonFRLG_RngCalibration.h"
+#include "PokemonFRLG_RngLoopRoutines.h"
+#include "PokemonFRLG_GiftRng.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+
+GiftRng_Descriptor::GiftRng_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonFRLG:GiftRng",
+        Pokemon::STRING_POKEMON + " FRLG", "Gift RNG",
+        "Programs/PokemonFRLG/GiftRng.html",
+        "Automatically calibrate timings to hit a specific RNG target for FRLG gift " + STRING_POKEMON,
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_RequiresPrecision,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+struct GiftRng_Descriptor::Stats : public StatsTracker{
+    Stats()
+        : resets(m_stats["Resets"])
+        , shinies(m_stats["Shinies"])
+        , nonshiny(m_stats["Non-Shiny Hits"])
+        , errors(m_stats["Errors"])
+    {
+        m_display_order.emplace_back("Resets");
+        m_display_order.emplace_back("Shinies");
+        m_display_order.emplace_back("Non-Shiny Hits", HIDDEN_IF_ZERO);
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+    }
+    std::atomic<uint64_t>& resets;
+    std::atomic<uint64_t>& shinies;
+    std::atomic<uint64_t>& nonshiny;
+    std::atomic<uint64_t>& errors;
+};
+std::unique_ptr<StatsTracker> GiftRng_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+GiftRng::~GiftRng(){
+    SEED.remove_listener(*this);
+}
+
+GiftRng::GiftRng()
+    : m_calibration_displays(
+        "<font size=4><b>Calibration Displays</b></font> — These will update automatically as the program runs"
+    )
+    , m_game_info(
+        "<font size=4><b>Game Information</b></font>"
+    )
+    , GAME_VERSION(
+        "<b>Game Version:</b>",
+        {
+            {GameVersion::firered, "firered", "FireRed"},
+            {GameVersion::leafgreen, "leafgreen", "LeafGreen"}
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        GameVersion::firered
+    )
+    , LANGUAGE(
+        "<b>Game Language:</b>",
+        {
+            Language::English,
+            Language::Japanese,
+            Language::Spanish,
+            Language::French,
+            Language::German,
+            Language::Italian,
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        true
+    )
+    , SOUND(
+        "<b>Sound:</b><br>"
+        "Your in-game sound setting. This affects the possible seeds.",
+        {
+            {SoundSetting::Mono, "mono", "Mono"},
+            {SoundSetting::Stereo, "stereo", "Stereo"}
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        SoundSetting::Mono
+    )
+    , m_target_settings(
+        "<font size=4><b>Target Settings</b></font> — Get these from an RNG search tool"
+    )
+    , TARGET(
+        "<b>Target:</b>",
+        {
+            {PokemonFRLG_RngTarget::magikarp, "magikarp", "Magikarp"},
+            {PokemonFRLG_RngTarget::hitmonchan, "hitmonchan", "Hitmonchan"},
+            {PokemonFRLG_RngTarget::hitmonlee, "hitmonlee", "Hitmonlee"},
+            {PokemonFRLG_RngTarget::eevee, "eevee", "Eevee"},
+            {PokemonFRLG_RngTarget::lapras, "lapras", "Lapras"},
+            {PokemonFRLG_RngTarget::omanyte, "omanyte", "Omanyte"},
+            {PokemonFRLG_RngTarget::kabuto, "kabuto", "Kabuto"},
+            {PokemonFRLG_RngTarget::aerodactyl, "aerodactyl", "Aerodactyl"},
+            {PokemonFRLG_RngTarget::gamecornerabra, "gamecornerabra", "Game Corner Abra"},
+            {PokemonFRLG_RngTarget::gamecornerclefairy, "gamecornerclefairy", "Game Corner Clefairy"},
+            {PokemonFRLG_RngTarget::gamecornerdratinifr, "gamecornerdratinifr", "Game Corner Dratini (FireRed)"},
+            {PokemonFRLG_RngTarget::gamecornerdratinilg, "gamecornerdratinilg", "Game Corner Dratini (LeafGreen)"},
+            {PokemonFRLG_RngTarget::gamecornerscyther, "gamecornerscyther", "Game Corner Scyther"},
+            {PokemonFRLG_RngTarget::gamecornerpinsir, "gamecornerpinsir", "Game Corner Pinsir"},
+            {PokemonFRLG_RngTarget::gamecornerporygon, "gamecornerporygon", "Game Corner Porygon"},
+            {PokemonFRLG_RngTarget::togepi, "togepi", "Togepi"},
+            {PokemonFRLG_RngTarget::togepifast, "togepifast", "Togepi (pre-approved)"}
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        PokemonFRLG_RngTarget::magikarp
+    )    
+    , SEED(
+        false,
+        "<b>Target Seed:</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        "70FE", "70FE"
+    )
+    , ADVANCES(
+        "<b>Advances:</b><br>The total number of RNG advances for your target.",
+        LockMode::LOCK_WHILE_RUNNING,
+        10000, 520, 1000000000 // default, min, max
+    )
+    , m_program_settings(
+        "<font size=4><b>Program Settings</b></font>"
+    )
+    , USE_TEACHY_TV(
+        "<b>Use Teachy TV:</b>"
+        "<br>Opens the Teachy TV to quickly advance the RNG at 313x speed.<br>"
+        "<i>Warning: can result in larger misses.</i>",
+        LockMode::LOCK_WHILE_RUNNING,
+        false // default
+    )
+    , SEED_RADIUS(
+        "<b>Nearby Seed Radius:</b><br>"
+        "The number of nearby seeds on each side of the target to search when identifying which seed was hit.",
+        LockMode::LOCK_WHILE_RUNNING,
+        5, 1 // default, min
+    )
+    , MAX_RESETS(
+        "<b>Max Resets:</b>",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        50, 0 // default, min
+    )
+    , MAX_RARE_CANDIES(
+        "<b>Max Rare Candies:</b><br>"
+        "The number of rare candies in your bag. Make sure these are at the top position of the bag.<br>"
+        "Rare candies used during calibration will be restored after resetting.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        0, 0, 95 // default, min, max
+    )
+    , PROFILE(
+        "<b>User Profile Position:</b><br>"
+        "The position, from left to right, of the Switch profile with the FRLG save you'd like to use.<br>"
+        "If this is set to 0, Switch 1 defaults to the last-used profile, while Switch 2 defaults to the first profile (position 1)",
+        LockMode::LOCK_WHILE_RUNNING,
+        0, 0, 8 // default, min, max
+    )
+    , TAKE_VIDEO(
+        "<b>Take Video:</b><br>Record a video when the shiny is found.", 
+        LockMode::LOCK_WHILE_RUNNING, 
+        true // default
+    )
+    , GO_HOME_WHEN_DONE(true)
+    , NOTIFICATION_SHINY(
+        "Shiny found",
+        true, true, ImageAttachmentMode::JPG,
+        {"Notifs", "Showcase"}
+    )
+    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_SHINY,
+        &NOTIFICATION_STATUS_UPDATE,
+        &NOTIFICATION_PROGRAM_FINISH,
+    })
+{
+    PA_ADD_OPTION(m_calibration_displays);
+    PA_ADD_OPTION(RNG_TARGET);
+    PA_ADD_OPTION(RNG_FILTERS);
+    PA_ADD_OPTION(RNG_CALIBRATION);
+    PA_ADD_OPTION(m_game_info);
+    PA_ADD_OPTION(GAME_VERSION);
+    PA_ADD_OPTION(LANGUAGE);
+    PA_ADD_OPTION(SOUND);
+    PA_ADD_OPTION(m_target_settings);
+    PA_ADD_OPTION(TARGET);
+    PA_ADD_OPTION(SEED);
+    PA_ADD_OPTION(ADVANCES);
+    PA_ADD_OPTION(m_program_settings);
+    PA_ADD_OPTION(USE_TEACHY_TV);
+    PA_ADD_OPTION(SEED_RADIUS);
+    PA_ADD_OPTION(MAX_RESETS);
+    PA_ADD_OPTION(MAX_RARE_CANDIES);
+    PA_ADD_OPTION(PROFILE);
+    PA_ADD_OPTION(TAKE_VIDEO);
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+    PA_ADD_OPTION(NOTIFICATIONS);
+
+    SEED.add_listener(*this);
+}
+
+void GiftRng::on_config_value_changed(void* object){
+    if (object == &SEED){
+        SEED.set(StringTools::strip(static_cast<std::string>(SEED)));
+        return;
+    }
+}
+
+
+
+void GiftRng::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    /*
+    * Settings: Text Speed fast
+    */
+
+    GiftRng_Descriptor::Stats& stats = env.current_stats<GiftRng_Descriptor::Stats>();
+
+    home_black_border_check(env.console, context);
+
+    RNG_FILTERS.reset();
+    RNG_CALIBRATION.reset_hits();
+
+    const uint16_t TARGET_SEED = parse_seed(env.console, SEED);
+    SeedsDatabase seeds_db(seeds_json_path(GAME_VERSION == GameVersion::firered, LANGUAGE));
+    const SeedMatch seed_match = seeds_db.find_seed(TARGET_SEED, SOUND, SEED_RADIUS);
+    if (!seed_match.found){
+        throw UserSetupError(env.console, "The target Seed was not found in the seed database for this game version, language, and sound setting.");
+    }
+    const std::vector<uint16_t> SEED_VALUES = seed_match.seed_values;
+    const int16_t SEED_POSITION = seed_match.seed_position;
+    const uint64_t SEED_DELAY = seed_match.seed_delay;
+    const SeedButton SEED_BUTTON = seed_match.seed_button;
+    const BlackoutButton EXTRA_BUTTON = seed_match.extra_button;
+    env.log("Seed delay: " + std::to_string(SEED_DELAY) + "ms, button mode: " + seed_match.button_mode
+        + ", column: " + seed_match.column_name);
+
+    BaseStats BASE_STATS;
+    int16_t GENDER_THRESHOLD = -1;
+    uint8_t LEVEL = 0;
+    switch (TARGET){
+    case PokemonFRLG_RngTarget::magikarp:
+        BASE_STATS = { 20, 10, 55, 15, 20, 80 };
+        GENDER_THRESHOLD = 126;
+        LEVEL = 5;
+        break;
+    case PokemonFRLG_RngTarget::hitmonchan:
+        BASE_STATS = { 50, 105, 79, 35, 110, 76 };
+        GENDER_THRESHOLD = -1;
+        LEVEL = 25;
+        break;
+    case PokemonFRLG_RngTarget::hitmonlee:
+        BASE_STATS = { 50, 120, 53, 35, 110, 87 };
+        GENDER_THRESHOLD = -1;
+        LEVEL = 25;
+        break;
+    case PokemonFRLG_RngTarget::eevee:
+        BASE_STATS = { 55, 55, 50, 45, 65, 55 };
+        GENDER_THRESHOLD = 30;
+        LEVEL = 25;
+        break;
+    case PokemonFRLG_RngTarget::lapras:
+        BASE_STATS = { 130, 85, 80, 85, 95, 60 };
+        GENDER_THRESHOLD = 126;
+        LEVEL = 25;
+        break;
+    case PokemonFRLG_RngTarget::omanyte:
+        BASE_STATS = { 35, 40, 100, 90, 55, 35 };
+        GENDER_THRESHOLD = 30;
+        LEVEL = 5;
+        break;
+    case PokemonFRLG_RngTarget::kabuto:
+        BASE_STATS = { 30, 80, 90, 55, 45, 55 };
+        GENDER_THRESHOLD = 30;
+        LEVEL = 5;
+        break;
+    case PokemonFRLG_RngTarget::aerodactyl:
+        BASE_STATS = { 80, 105, 65, 60, 75, 130 };
+        GENDER_THRESHOLD = 30;
+        LEVEL = 5;
+        break;
+    case PokemonFRLG_RngTarget::gamecornerabra:
+        BASE_STATS = { 25, 20, 15, 105, 55, 90 };
+        GENDER_THRESHOLD = 63;
+        break;
+    case PokemonFRLG_RngTarget::gamecornerclefairy:
+        BASE_STATS = { 70, 45, 48, 60, 65, 35 };
+        GENDER_THRESHOLD = 190;
+        break;
+    case PokemonFRLG_RngTarget::gamecornerdratinifr:
+    case PokemonFRLG_RngTarget::gamecornerdratinilg:
+        BASE_STATS = { 41, 64, 45, 50, 50, 50 };
+        GENDER_THRESHOLD = 126;
+        break;
+    case PokemonFRLG_RngTarget::gamecornerscyther:
+        BASE_STATS = { 70, 110, 80, 55, 80, 105 };
+        GENDER_THRESHOLD = 126;
+        LEVEL = 25;
+        break;
+    case PokemonFRLG_RngTarget::gamecornerpinsir:
+        BASE_STATS = { 65, 125, 100, 55, 70, 85 };
+        GENDER_THRESHOLD = 126;
+        LEVEL = 18;
+        break;
+    case PokemonFRLG_RngTarget::gamecornerporygon:
+        BASE_STATS = { 65, 60, 70, 85, 75, 40 };
+        GENDER_THRESHOLD = -1;
+        break;
+    case PokemonFRLG_RngTarget::togepi:
+    case PokemonFRLG_RngTarget::togepifast:
+        BASE_STATS = { 35, 20, 65, 40, 65, 20 };
+        GENDER_THRESHOLD = 30;
+        LEVEL = 5;
+        break; 
+    default:
+        break;
+    }
+
+    static const int64_t FIXED_SEED_OFFSET = -845; // milliseconds, approximate
+
+    static const uint64_t CONTINUE_SCREEN_FRAMES = 200;
+
+    const uint64_t INITIAL_ADVANCES_RADIUS = USE_TEACHY_TV ? 4096 : 1024;
+
+    const uint8_t MAX_HISTORY_LENGTH = USE_TEACHY_TV ? 2 : 10;
+
+    static const std::set<std::string> SPECIES_LIST = {
+        "magikarp", "hitmonchan", "hitmonlee", "eevee", "lapras",
+        "omanyte", "kabuto", "aerodactyl", 
+        "abra", "clefairy", "dratini", "scyther", "pinsir", "porygon",
+        "togepi"
+    };
+
+    env.log("RNG Target: " + std::to_string(TARGET.current_value()));
+    env.log("Target Seed: " + to_hex_string(TARGET_SEED));
+    env.log("Target Advances: " + std::to_string(ADVANCES));
+
+    AdvRngSearcher searcher(TARGET_SEED, ADVANCES, AdvRngMethod::Method1);
+    AdvPokemonResult target_result = searcher.generate_pokemon();
+    RNG_TARGET.set_target(target_result, GENDER_THRESHOLD);
+    log_target_pokemon(env.console, target_result);
+
+    RngCalibrations calibrations = {
+        RNG_CALIBRATION.seed_calibration / FRLG_FRAME_DURATION,
+        RNG_CALIBRATION.csf_calibration,
+        RNG_CALIBRATION.advances_calibration
+    };
+    log_calibrations(env.console, calibrations, true);
+
+    Milliseconds launch_delay = INITIAL_LAUNCH_DELAY;
+
+    RngUncertainHistory uncertain_history;
+    RngCalibrationHistory calibration_history; 
+
+    uint16_t failed_searches = 0;
+
+    while (true){
+        if (calibration_history.results.size() > 0){
+            env.log("Checking for nonshiny target hit...");
+            if (have_hit_target(TARGET_SEED, ADVANCES, calibration_history.results.back())){
+                env.log("Target Hit!");
+                stats.nonshiny++;
+                break;
+            }
+            env.log("Missed target.");
+        }
+
+        if (failed_searches >= 5){
+            env.log("Failed to find any matches 5 times in a row");
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::NO_ERROR_REPORT,
+                "Failed to find any matches 5 times in a row. Check your seed and advances settings.",
+                env.console
+            ); 
+            break;
+        }
+
+        if (stats.resets > MAX_RESETS){
+            env.log("Max resets reached.");
+            break;
+        }
+
+        send_program_status_notification(
+            env, NOTIFICATION_STATUS_UPDATE,
+            "Calibrating."
+        );
+        env.update_stats();
+
+
+        uint64_t advances_radius = get_advances_radius(env.console, calibration_history, INITIAL_ADVANCES_RADIUS);
+
+        if (calibration_history.results.size() > 0){
+            calibrations = get_calibrations(env.console, calibration_history, SEED_VALUES, SEED_POSITION, ADVANCES);
+        }
+
+        // if previous resets had uncertain advances, slightly modify the seed delay to try to hit a different target
+        apply_seed_bump(calibrations, uncertain_history);
+
+        uint64_t ingame_advances = ADVANCES - CONTINUE_SCREEN_FRAMES;
+
+        RngTimings timings = prepare_timings(
+            env.console, TARGET,
+            SEED_DELAY, CONTINUE_SCREEN_FRAMES, ingame_advances,
+            USE_TEACHY_TV, calibrations,
+            FIXED_SEED_OFFSET, LANGUAGE
+        );
+
+        env.log("Resetting Game...");
+        reset_and_perform_blind_sequence(
+            env.console, context, LANGUAGE, TARGET, 
+            SEED_BUTTON, EXTRA_BUTTON, timings, 
+            launch_delay, false, PROFILE
+        );
+        stats.resets++; 
+
+        RNG_FILTERS.reset();
+        RNG_CALIBRATION.set_calibrations(calibrations);
+        RNG_CALIBRATION.reset_hits();
+
+        bool shiny_found = check_for_shiny(env.console, context, TARGET);
+
+        if (shiny_found){
+            env.log("Shiny found!");
+            stats.shinies++;
+            RNG_CALIBRATION.hits.set("Shiny!");
+            send_program_notification(
+                env,
+                NOTIFICATION_SHINY,
+                COLOR_YELLOW,
+                "Shiny found!",
+                {}, "",
+                env.console.video().snapshot(),
+                true
+            );
+            if (TAKE_VIDEO){
+                pbf_press_button(context, BUTTON_CAPTURE, 2000ms, 0ms);
+            }
+            break;
+        }
+
+        AdvObservedPokemon pokemon = read_summary(env.console, context, LANGUAGE, SPECIES_LIST);
+        if (LEVEL > 0){
+            pokemon.level[0] = LEVEL;
+        }
+        AdvRngFilters filters = observation_to_filters(pokemon, BASE_STATS);
+        RNG_FILTERS.set(filters);
+
+        std::vector<AdvRngState> search_hits = refine_calibration_with_rare_candy(
+            env, context, LANGUAGE, pokemon, filters, BASE_STATS,
+            uncertain_history, calibration_history, calibrations,
+            MAX_HISTORY_LENGTH, MAX_RARE_CANDIES, AdvRngMethod::Method1, false,
+            stats.errors, NOTIFICATION_ERROR_RECOVERABLE,
+            [&](AdvRngFilters& f){
+                return get_search_results(env.console, searcher, f, SEED_VALUES, ADVANCES, advances_radius, GENDER_THRESHOLD);
+            },
+            [&](const std::vector<AdvRngState>& h){ RNG_CALIBRATION.set_hits(h); },
+            [&](const AdvRngFilters& f){ RNG_FILTERS.set(f); },
+            [&](const std::vector<AdvRngState>& h){
+                return all_equal(h) || all_indistinguishable(h, searcher, GENDER_THRESHOLD);
+            }
+        );
+
+        env.log("RNG search finished.");
+        update_failed_searches(failed_searches, search_hits);
+
+    }
+
+    if (GO_HOME_WHEN_DONE){
+        pbf_press_button(context, BUTTON_HOME, 200ms, 1000ms);
+    }
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_GiftRng.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_GiftRng.h
new file mode 100644
index 0000000000..3df8e600ac
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_GiftRng.h
@@ -0,0 +1,83 @@
+/*  Gift RNG
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonFRLG_GiftRng_H
+#define PokemonAutomation_PokemonFRLG_GiftRng_H
+
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "Common/Cpp/Options/StaticTextOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "CommonTools/Options/LanguageOCROption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+#include "PokemonFRLG_BlindNavigation.h"
+#include "PokemonFRLG_RngDisplays.h"
+#include "PokemonFRLG_SeedsDatabase.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+class GiftRng_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    GiftRng_Descriptor();
+    struct Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+class GiftRng : public SingleSwitchProgramInstance, private ConfigOption::Listener{
+public:
+    using Descriptor = GiftRng_Descriptor;
+    ~GiftRng();
+    GiftRng();
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext &context) override;
+    virtual void start_program_border_check(
+        VideoStream& stream,
+        FeedbackType feedback_type
+    ) override{}
+
+private:
+    virtual void on_config_value_changed(void* object) override;
+
+    enum class GameVersion{
+        firered,
+        leafgreen
+    };
+
+    SectionDividerOption m_calibration_displays;
+    RngTargetDisplay RNG_TARGET;
+    RngFilterDisplay RNG_FILTERS;
+    RngCalibrationDisplay RNG_CALIBRATION;
+
+    SectionDividerOption m_game_info;
+    EnumDropdownOption<GameVersion> GAME_VERSION;
+    OCR::LanguageOCROption LANGUAGE;
+    EnumDropdownOption<SoundSetting> SOUND;
+
+    SectionDividerOption m_target_settings;
+    EnumDropdownOption<PokemonFRLG_RngTarget> TARGET;
+    StringOption SEED;
+    SimpleIntegerOption<uint64_t>ADVANCES;
+
+    SectionDividerOption m_program_settings;
+    BooleanCheckBoxOption USE_TEACHY_TV;
+    SimpleIntegerOption<uint16_t> SEED_RADIUS;
+    SimpleIntegerOption<uint64_t> MAX_RESETS;
+    SimpleIntegerOption<uint64_t> MAX_RARE_CANDIES;
+    SimpleIntegerOption<uint8_t> PROFILE;
+
+    BooleanCheckBoxOption TAKE_VIDEO;
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
+    EventNotificationOption NOTIFICATION_SHINY;
+    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_HardReset.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_HardReset.cpp
new file mode 100644
index 0000000000..37bfac49cf
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_HardReset.cpp
@@ -0,0 +1,343 @@
+/*  Hard Reset
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "CommonTools/VisualDetectors/BlackScreenDetector.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Inference/NintendoSwitch_CheckOnlineDetector.h"
+#include "NintendoSwitch/Inference/NintendoSwitch_HomeMenuDetector.h"
+#include "NintendoSwitch/Inference/NintendoSwitch_StartGameUserSelectDetector.h"
+#include "NintendoSwitch/Inference/NintendoSwitch_UpdatePopupDetector.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "VideoGames/PokemonFRLG/PokemonFRLG_Settings.h"
+#include "PokemonFRLG_BlindNavigation.h"
+#include "PokemonFRLG_HardReset.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+namespace{
+
+//  Press A on the selected profile. Return true only if the startup black screen
+//  was observed here. False means no observation: either license handling is
+//  disabled (the fixed delay is used without checking video), or the wait timed
+//  out. False does not by itself mean launch failed; the caller still checks
+//  startup and the resulting screen after pressing HOME.
+bool start_game_and_wait(
+    ConsoleHandle& console, ProControllerContext& context,
+    Milliseconds launch_delay
+){
+    if (!GameSettings::instance().HANDLE_ONLINE_LICENSE_CHECK){
+        pbf_press_button(context, BUTTON_A, 50ms, launch_delay);
+        return false;
+    }
+    pbf_press_button(context, BUTTON_A, 50ms, 0ms);
+    context.wait_for_all_requests();
+    BlackScreenWatcher black_screen(COLOR_BLUE, {0.1, 0.15, 0.8, 0.7});
+    const int result = wait_until(
+        console, context, std::chrono::seconds(30), { black_screen },
+        /* default_video_period */ 1ms
+    );
+    if (result < 0){
+        console.log("Game did not start within 30 seconds of the online license check.", COLOR_RED);
+    }
+    return result == 0;
+}
+
+}
+
+void rng_reset_and_return_home(
+    ConsoleHandle& console, ProControllerContext& context,
+    Milliseconds& launch_delay,
+    uint8_t user_slot
+){
+    // close the game
+    go_home(console, context);
+    close_game_from_home(console, context);
+
+    bool update_popup = false;
+    WallClock deadline = current_time() + std::chrono::minutes(5);
+    while (true){
+        if (current_time() > deadline){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "rng_start_game_and_return_home(): Failed to start game and return to Home within 5 minutes.",
+                console
+            );
+        }
+
+        StartGameUserSelectWatcher user_select(console, COLOR_GREEN);
+        HomeMenuWatcher home(console, false, COLOR_RED, std::chrono::milliseconds(2000));
+        UpdateMenuWatcher update_menu(console, COLOR_PURPLE);
+        CheckOnlineWatcher check_online(COLOR_CYAN);
+        BlackScreenWatcher black_screen(COLOR_BLUE, {0.1, 0.15, 0.8, 0.7});
+
+        // first, get to the user select screen
+        context.wait_for_all_requests();
+        int ret2 = wait_until(
+            console, context,
+            std::chrono::seconds(30),
+            {
+                user_select,
+                home,
+                update_menu,
+                check_online,
+                black_screen
+            }
+        );
+
+        //  Wait for screen to stabilize.
+        context.wait_for(std::chrono::milliseconds(100));
+
+        // some of these states might not be relevant at this point (if they would only show up after pressing A on a profile)
+        switch (ret2){
+        case 0:
+            console.log("Detected user-select screen.");
+            move_to_user(context, user_slot);
+            break;
+        case 1:
+            console.log("Detected Home screen.", COLOR_BLUE);
+            pbf_press_button(context, BUTTON_A, 160ms, 840ms);            
+            continue;
+        case 2:
+            console.log("Detected update menu.", COLOR_BLUE);
+            pbf_press_dpad(context, DPAD_UP, 40ms, 0ms);
+            pbf_press_button(context, BUTTON_A, 160ms, 840ms);     
+            continue;
+        case 3:
+            console.log("Detected check online.", COLOR_BLUE);
+            context.wait_for(std::chrono::seconds(1));
+            pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+            continue;
+        case 4: 
+            console.log("Detected black screen (no user selection screen). Closing game...");
+            go_home(console, context);
+            close_game_from_home(console, context);
+            break;
+        default:
+            console.log("rng_start_game_and_return_home(): No recognizable state after 30 seconds.", COLOR_RED);
+            pbf_press_button(context, BUTTON_HOME, 160ms, 840ms);
+            continue;
+        }
+
+        context.wait_for_all_requests();
+
+        // By this point, the user selection menu is open with the desired profile selected, and the game hasn't yet been started.
+        // OR the Switch only has one user, so the game will open directly from the Home screen
+        // Everything up to this point has not been time-sensitive.
+        // Waiting for all requests and using inference should be avoided for any button presses that happen *while the game is open*, 
+        // but we can make sure we've gotten back to the home screen and pause there
+
+        if (update_popup){
+            pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+            pbf_press_dpad(context, DPAD_UP, 40ms, 0ms);
+        }
+        // Preserve startup seen before HOME: the later watcher may only see HOME.
+        bool black_screen_detected = start_game_and_wait(console, context, launch_delay);
+        pbf_press_button(context, BUTTON_HOME, 200ms, 1800ms);
+
+        while(current_time() < deadline){
+            // make sure a black screen appeared as a result of the button presses
+            // if a popup appears, flag that it happened even if it gets closed by the home button press
+            int ret3 = wait_until(
+                console, context,
+                std::chrono::seconds(2 + (update_popup ? 1 : 0)),
+                { black_screen, update_menu },
+                /* default_video_period */ 1ms
+            );
+            switch (ret3){
+            case 0:
+                console.log("Black screen detected.");
+                black_screen_detected = true;
+                break;
+            case 1:
+                console.log("Update menu detected.", COLOR_BLUE);
+                update_popup = true;
+            }
+
+            context.wait_for_all_requests();
+
+            // make sure we're back at the home screen. Otherwise, handle any undesired states
+            int ret4 = wait_until(
+                console, context,
+                std::chrono::seconds(10),
+                { 
+                    home, 
+                    user_select,
+                    update_menu
+                }
+            );
+
+            switch (ret4){
+            case 0:
+                if (black_screen_detected){
+                    console.log("Detected Home screen after black screen.");
+                    return;
+                }else{
+                    console.log("Detected Home screen, but no black screen. Trying again from the beginning...", COLOR_BLUE);
+                    launch_delay += 50ms; // bump this up in case it was too short
+                    break; // back to the outer loop
+                }
+                return;
+            case 1:
+                console.log("Detected user-select screen. Trying again...", COLOR_BLUE);
+                move_to_user(context, user_slot);
+                black_screen_detected = start_game_and_wait(console, context, launch_delay);
+                pbf_press_button(context, BUTTON_HOME, 200ms, 2800ms);
+                continue;
+            case 2:
+                console.log("Detected update menu. Trying again...", COLOR_BLUE);
+                pbf_press_dpad(context, DPAD_UP, 40ms, 0ms);
+                black_screen_detected = start_game_and_wait(console, context, launch_delay);
+                pbf_press_button(context, BUTTON_HOME, 200ms, 2800ms);
+                continue;
+            default:
+                console.log("rng_start_game_and_return_home(): No recognizable state after 10 seconds.", COLOR_RED);
+                pbf_press_button(context, BUTTON_HOME, 160ms, 840ms);
+                break; // back to outer loop
+            }
+
+            break;
+        }
+    }
+}
+
+
+void reset_and_perform_blind_sequence(
+    ConsoleHandle& console, 
+    ProControllerContext& context, 
+    const Language& language,
+    PokemonFRLG_RngTarget target,
+    const SeedButton& seed_button,
+    const BlackoutButton& extra_button,
+    const RngTimings& timings,
+    Milliseconds& launch_delay,
+    bool safari_zone,
+    uint8_t profile
+){
+    rng_reset_and_return_home(console, context, launch_delay, profile); 
+    ConsoleType console_type = console.state().console_type();
+
+    // attempt to resume the game and perform the blind sequence
+    // by this point, the license check should be over, so we don't need to worry about it when resuming the game
+    uint8_t attempts = 0;
+    while(true){
+        if (attempts >= 5){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "RngHelper(): Failed to reset the game 5 times in a row.",
+                console
+            );  
+        }
+        console.log("Starting blind button presses...");
+        UpdateMenuWatcher update_detector(console);
+        StartGameUserSelectWatcher user_selection_detector(console);
+        // any other fail conditions should be added here
+        context.wait_for_all_requests();
+        int ret = run_until<ProControllerContext>(
+            console, context,
+            [language, target, seed_button, extra_button, timings, safari_zone, console_type](ProControllerContext& context){
+                perform_blind_sequence(context, language, target, seed_button, extra_button, timings, safari_zone, console_type);
+            },
+            { update_detector, user_selection_detector },
+            5000ms
+        );
+
+        switch (ret){
+        case 0: 
+            attempts++;
+            console.log("Detected update window.", COLOR_RED);
+            pbf_press_dpad(context, DPAD_UP, 40ms, 0ms);
+            pbf_press_button(context, BUTTON_A, 80ms, 4000ms);
+            context.wait_for_all_requests();
+            continue;
+        case 1:
+            attempts++;
+            console.log("Detected the user selection screen. Reattempting to start the game");
+            pbf_press_button(context, BUTTON_A, 160ms, 1040ms);
+            go_home(console, context);
+            continue;
+        default:
+            return;
+        }
+    }
+}
+
+#if 0
+void reset_and_detect_copyright_text(ConsoleHandle& console, ProControllerContext& context, uint8_t profile){
+    go_home(console, context);
+    close_game_from_home(console, context);
+    rng_start_game_and_return_home(console, context, uint8_t(0), profile);
+    pbf_wait(context, 200ms); // add an extra delay to try to ensure the game doesn't fail to launch
+    go_home(console, context);
+
+    uint8_t attempts = 0;
+    while(true){
+        if (attempts >= 5){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "Failed to resume the game 5 times in a row.",
+                console
+            );  
+        }
+
+        UpdateMenuWatcher update_detector(console);
+        StartGameUserSelectWatcher user_selection_detector(console);
+        BlackScreenWatcher blackscreen_detector(COLOR_RED);
+        context.wait_for_all_requests();
+        int ret = run_until<ProControllerContext>(
+            console, context,
+            [](ProControllerContext& context){
+                pbf_press_button(context, BUTTON_A, 80ms, 9920ms);
+            },
+            { update_detector, user_selection_detector, blackscreen_detector }
+        );
+
+        BlackScreenOverWatcher copyright_detector(COLOR_RED);
+        int ret2;
+        switch (ret){
+        case 0: 
+            attempts++;
+            console.log("Detected update window.", COLOR_RED);
+            pbf_press_dpad(context, DPAD_UP, 40ms, 0ms);
+            pbf_press_button(context, BUTTON_A, 80ms, 4000ms);
+            context.wait_for_all_requests();
+            continue;
+        case 1:
+            attempts++;
+            console.log("Detected the user selection screen. Reattempting to start the game");
+            pbf_press_button(context, BUTTON_A, 160ms, 1040ms);
+            go_home(console, context);
+            continue;
+        case 2: 
+            context.wait_for_all_requests();
+            ret2 = wait_until(
+                console, context, 10000ms,
+                {copyright_detector },
+                1ms // catch black screen as quickly as possible
+            );
+            if (ret2 < 0){
+                OperationFailedExceptionWithScreenshot::fire(
+                    ErrorReportMode::SEND_ERROR_REPORT,
+                    "Black screen detected for more than 10 seconds after starting game.",
+                    console
+                );
+            }
+            return;
+        default:
+            console.log("No black screen or update popup detected. Pressing A again...");
+            continue;
+        }
+    }
+
+}
+#endif
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_HardReset.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_HardReset.h
new file mode 100644
index 0000000000..cf07c91e8c
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_HardReset.h
@@ -0,0 +1,47 @@
+/*  Hard Reset
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonFRLG_HardReset_H
+#define PokemonAutomation_PokemonFRLG_HardReset_H
+
+
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+#include "PokemonFRLG_BlindNavigation.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+static const Milliseconds INITIAL_LAUNCH_DELAY = 950ms;
+
+void reset_and_perform_blind_sequence(
+    ConsoleHandle& console, 
+    ProControllerContext& context, 
+    const Language& language,
+    PokemonFRLG_RngTarget target,
+    const SeedButton& seed_button,
+    const BlackoutButton& extra_button,
+    const RngTimings& timings,
+    Milliseconds& launch_delay,
+    bool safari_zone,
+    uint8_t profile
+);
+
+#if 0
+void reset_and_detect_copyright_text(
+    ConsoleHandle& console, 
+    ProControllerContext& context, 
+    uint8_t PROFILE = 0
+);
+#endif
+
+}
+}
+}
+#endif
+
+
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_LocationsDatabase.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_LocationsDatabase.cpp
new file mode 100644
index 0000000000..36c7219ef5
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_LocationsDatabase.cpp
@@ -0,0 +1,51 @@
+/*  Locations Database
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Json/JsonValue.h"
+#include "Common/Cpp/Json/JsonObject.h"
+#include "CommonFramework/GlobalAutoPaths.h"
+#include "PokemonFRLG_LocationsDatabase.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+
+std::vector<std::pair<std::string, std::string>> load_location_slug_json_list(const char* json_path){
+    std::string path = RESOURCE_PATH() + json_path;
+    JsonValue json = load_json_file(path);
+    JsonObject& obj = json.to_object_throw();
+
+    std::vector<std::pair<std::string, std::string>> list;
+    for (auto& item : obj){
+        std::string slug = item.first;
+        std::string name = item.second.to_string_throw();
+        std::pair<std::string, std::string> pair = {slug, name};
+        list.emplace_back(pair);
+    }
+    return list;
+}
+
+StringSelectDatabase make_locations_database(const std::vector<std::pair<std::string, std::string>>& slug_pairs){
+    StringSelectDatabase database;
+    for (const std::pair<std::string, std::string>& slug_pair : slug_pairs){
+        database.add_entry(StringSelectEntry(
+            slug_pair.first,
+            slug_pair.second
+        ));
+    }
+    return database;
+}
+
+StringSelectDatabase make_locations_database(const char* json_file_slugs){
+    return make_locations_database(load_location_slug_json_list(json_file_slugs));
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_LocationsDatabase.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_LocationsDatabase.h
new file mode 100644
index 0000000000..e1287ddf64
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_LocationsDatabase.h
@@ -0,0 +1,24 @@
+/*  Locations Database
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonFRLG_LocationsDatabase_H
+#define PokemonAutomation_PokemonFRLG_LocationsDatabase_H
+
+#include "CommonTools/Options/StringSelectOption.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+
+StringSelectDatabase make_locations_database(const char* json_file_slugs);
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngCalibration.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngCalibration.cpp
new file mode 100644
index 0000000000..379b9c6d33
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngCalibration.cpp
@@ -0,0 +1,747 @@
+/*  RNG Calibration
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <cmath>
+#include <utility>
+#include <sstream>
+#include <algorithm>
+#include <set>
+#include "PokemonFRLG_BlindNavigation.h"
+#include "PokemonFRLG_RngCalibration.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+void check_seed_validity(ConsoleHandle& console, std::string seed_string){
+    static const std::map<char, char> MAP{
+        {'1', '1'},
+        {'2', '2'},
+        {'3', '3'},
+        {'4', '4'},
+        {'5', '5'},
+        {'6', '6'},
+        {'7', '7'},
+        {'8', '8'},
+        {'9', '9'},
+        {'0', '0'},
+        {'A', 'A'}, {'a', 'A'},
+        {'B', 'B'}, {'b', 'B'},
+        {'C', 'C'}, {'c', 'C'},
+        {'D', 'D'}, {'d', 'D'},
+        {'E', 'E'}, {'e', 'E'},
+        {'F', 'F'}, {'f', 'F'}
+    };
+
+    if (seed_string.size() != 4){
+        throw UserSetupError(console, "Invalid seed length. Seeds should be 4 characters.");
+    }
+
+    for (char ch : seed_string){
+        auto iter = MAP.find(ch);
+        if (iter == MAP.end()){
+            throw UserSetupError(console, "Invalid seed character. Seeds should be valid hex strings (valid characters are 0-9 and A-F");
+        }
+    }
+}
+
+uint16_t parse_seed(ConsoleHandle& console, std::string seed_string){
+    check_seed_validity(console, seed_string);
+    std::istringstream converter(seed_string);
+    uint16_t value;
+    converter >> std::hex >> value;
+    return value;
+}
+
+std::vector<uint16_t> parse_seed_list(ConsoleHandle& console, std::string seed_list_string){
+    std::vector<uint16_t> values;
+    auto ss = std::stringstream{seed_list_string};
+    for (std::string line; std::getline(ss, line, '\n');){
+        values.push_back(parse_seed(console, line));
+    }
+    return values;    
+}
+
+int16_t seed_position_in_list(uint16_t seed, std::vector<uint16_t> list){
+    for (size_t i=0; i<list.size(); i++){
+        if (seed == list[i]){
+            return int16_t(i);
+        }
+    }
+    return -1;
+}
+
+std::string to_hex_string(const uint16_t& val){
+    std::ostringstream s;
+    s << std::hex << val;
+    return s.str();
+}
+std::string to_hex_string(const uint32_t& val){
+    std::ostringstream s;
+    s << std::hex << val;
+    return s.str();
+}
+
+bool have_hit_target(uint32_t target_seed, uint64_t target_advances, const AdvRngState& hit){
+    return (hit.seed == target_seed) && (hit.advance == target_advances);
+}
+
+void apply_seed_bump(RngCalibrations& calibrations, const RngUncertainHistory& uncertain_history){
+    static const double SEED_BUMPS[] = {0, 1, -1, 2, -2};
+    double seed_bump = SEED_BUMPS[uncertain_history.results.size() % 5];
+    calibrations.seed_offset += seed_bump;
+}
+
+void log_target_pokemon(ConsoleHandle& console, const AdvPokemonResult& result, bool normal_method_note){
+    console.log("Target PID: " + to_hex_string(result.pid));
+    console.log("Target Nature: " + nature_to_string(result.nature));
+    console.log(normal_method_note ? "Target IVs (assuming Normal method):" : "Target IVs:");
+    console.log("   HP: " + std::to_string(result.ivs.hp));
+    console.log("   Atk: " + std::to_string(result.ivs.attack));
+    console.log("   Def: " + std::to_string(result.ivs.defense));
+    console.log("   SpA: " + std::to_string(result.ivs.spatk));
+    console.log("   SpD: " + std::to_string(result.ivs.spdef));
+    console.log("   Spe: " + std::to_string(result.ivs.speed));
+}
+
+void log_calibrations(ConsoleHandle& console, const RngCalibrations& calibrations, bool initial){
+    std::string prefix = initial ? "Initial " : "";
+    console.log(prefix + "Seed calibration (frames): " + std::to_string(calibrations.seed_offset));
+    console.log(prefix + "CSF calibration (frames): " + std::to_string(calibrations.csf_offset));
+    console.log(prefix + "In-game calibration (frames x2): " + std::to_string(calibrations.ingame_offset));
+}
+
+RngTimings prepare_timings(
+    ConsoleHandle& console,
+    PokemonFRLG_RngTarget target,
+    uint64_t SEED_DELAY,
+    uint64_t CONTINUE_SCREEN_FRAMES,
+    uint64_t INGAME_ADVANCES,
+    bool USE_TEACHY_TV,
+    const RngCalibrations& calibrations,
+    int64_t FIXED_SEED_OFFSET,
+    Language LANGUAGE
+){
+    double modified_ingame_advances = INGAME_ADVANCES + calibrations.ingame_offset + fixed_advances_offset(target);
+    if (modified_ingame_advances < 0){
+        throw UserSetupError(console, "In-game advances cannot be negative. Check your in-game advances and calibration.");
+    }
+
+    bool safari_zone = (
+        target == PokemonFRLG_RngTarget::safarizonecenter ||
+        target == PokemonFRLG_RngTarget::safarizoneeast ||
+        target == PokemonFRLG_RngTarget::safarizonenorth ||
+        target == PokemonFRLG_RngTarget::safarizonewest ||
+        target == PokemonFRLG_RngTarget::safarizonesurf ||
+        target == PokemonFRLG_RngTarget::safarizonefish
+    );
+
+    uint64_t TEACHY_ADVANCES = 0;
+
+    uint64_t TEACHY_TV_BUFFER = safari_zone ? 20000 : 12000; // Safari zone targets need extra time to walk to the right position
+
+    bool should_use_teachy_tv = USE_TEACHY_TV && (modified_ingame_advances > TEACHY_TV_BUFFER); // don't use Teachy TV for short in-game advance targets
+    if (should_use_teachy_tv){
+        TEACHY_ADVANCES = uint64_t((int)std::floor((modified_ingame_advances - TEACHY_TV_BUFFER + 7500) / 313) * 313);
+    }
+
+    console.log("Seed calibration (frames): " + std::to_string(calibrations.seed_offset));
+    console.log("CSF calibration (frames): " + std::to_string(calibrations.csf_offset));
+    console.log("In-game calibration (frames x2): " + std::to_string(calibrations.ingame_offset));
+
+    double seed_delay = SEED_DELAY + (calibrations.seed_offset * FRLG_FRAME_DURATION) + FIXED_SEED_OFFSET;
+    double csf_delay = (CONTINUE_SCREEN_FRAMES + calibrations.csf_offset) * FRLG_FRAME_DURATION;
+    double teachy_delay = TEACHY_ADVANCES * FRLG_FRAME_DURATION / 313;
+    double ingame_delay = (modified_ingame_advances - TEACHY_ADVANCES) * FRLG_FRAME_DURATION / 2 - (should_use_teachy_tv ? 14067 : 0);
+
+    if (seed_delay < 0){
+        throw UserSetupError(console, "prepare_timings(): seed delay cannot be negative. Check your calibration values.");
+    }
+        if (csf_delay < 0){
+        throw UserSetupError(console, "prepare_timings(): CSF duration cannot be negative. Check your calibration values.");
+    }
+        if (teachy_delay < 0){
+        throw UserSetupError(console, "prepare_timings(): Teachy TV duration cannot be negative. Check your calibration values.");
+    }
+    if (ingame_delay < 0){
+        throw UserSetupError(console, "prepare_timings(): in-game duration cannot be negative. Check your calibration values.");
+    }
+
+    RngTimings timings;
+    timings.seed_delay   = uint64_t(seed_delay);
+    timings.csf_delay    = uint64_t(csf_delay);
+    timings.teachy_delay = uint64_t(teachy_delay);
+    timings.ingame_delay = uint64_t(ingame_delay);
+
+    console.log("Seed delay: " + std::to_string(timings.seed_delay) + "ms");
+    console.log("Continue Screen delay: " + std::to_string(timings.csf_delay) + "ms");
+    console.log("Teachy TV delay: " + std::to_string(timings.teachy_delay) + "ms");
+    console.log("In-game delay: " + std::to_string(timings.ingame_delay) + "ms");
+    console.log("Total time: " + std::to_string(timings.seed_delay + timings.csf_delay + timings.teachy_delay + timings.ingame_delay) + "ms");
+
+    check_timings(console, target, timings, LANGUAGE, INGAME_ADVANCES, CONTINUE_SCREEN_FRAMES);
+
+    return timings;
+}
+
+
+std::vector<AdvRngState> get_search_results(
+    ConsoleHandle& console,
+    AdvRngSearcher& searcher, 
+    AdvRngFilters& filters,
+    const std::vector<uint16_t>& SEED_VALUES,
+    uint64_t ADVANCES, 
+    uint64_t advances_radius,
+    int16_t gender_threshold,
+    uint16_t tid_xor_sid
+
+){
+    std::vector<AdvRngState> search_hits;
+    for (int i=0; i<4; i++){
+        uint64_t adv_radius = advances_radius * (uint64_t(1) << i);
+        uint64_t min_adv = ADVANCES - std::min(uint64_t(ADVANCES), adv_radius);    
+        uint64_t max_adv = ADVANCES + adv_radius;
+        search_hits = searcher.search(filters, SEED_VALUES, min_adv, max_adv, gender_threshold, tid_xor_sid);
+        if (search_hits.size() > 0){
+            console.log("Number of search hits: " + std::to_string(search_hits.size()));
+            return search_hits;
+        }
+    }
+    console.log("Number of search hits: " + std::to_string(search_hits.size()));
+    return search_hits;
+}
+
+std::vector<AdvRngState> get_wild_search_results(
+    ConsoleHandle& console,
+    AdvRngWildSearcher& searcher, 
+    AdvRngFilters& filters,
+    const std::vector<uint16_t>& SEED_VALUES,
+    uint64_t ADVANCES, 
+    uint64_t advances_radius,
+    int16_t gender_threshold,
+    bool super_rod,
+    uint16_t tid_xor_sid
+
+){
+    std::vector<AdvRngState> search_hits;
+    for (int i=0; i<4; i++){
+        uint64_t adv_radius = advances_radius * (uint64_t(1) << i);
+        uint64_t min_adv = ADVANCES - std::min(uint64_t(ADVANCES), adv_radius);    
+        uint64_t max_adv = ADVANCES + adv_radius;
+        search_hits = searcher.search(filters, SEED_VALUES, min_adv, max_adv, gender_threshold, super_rod, tid_xor_sid);
+        if (search_hits.size() > 0){
+            console.log("Number of search hits: " + std::to_string(search_hits.size()));
+            return search_hits;
+        }
+    }
+    console.log("Number of search hits: " + std::to_string(search_hits.size()));
+    return search_hits;
+}
+
+std::vector<std::pair<AdvRngState,AdvRngState>> get_egg_search_results(
+    ConsoleHandle& console,
+    AdvRngEggSearcher& searcher, 
+    AdvRngFilters& filters,
+    const std::vector<uint16_t>& HELD_SEED_VALUES,
+    const std::vector<uint16_t>& PICKUP_SEED_VALUES,
+    uint64_t HELD_ADVANCES, 
+    uint64_t held_advances_radius,
+    uint64_t PICKUP_ADVANCES, 
+    uint64_t pickup_advances_radius,
+    AdvIVs& parentA,
+    AdvIVs& parentB,
+    AdvEggCompatibility compatibility,
+    int16_t gender_threshold,
+    uint16_t tid_xor_sid
+){
+    std::vector<std::pair<AdvRngState,AdvRngState>> search_hits;
+    for (int i=0; i<1; i++){
+        uint64_t held_adv_radius = held_advances_radius * (uint64_t(1) << i);
+        uint64_t held_min_adv = HELD_ADVANCES - std::min(uint64_t(HELD_ADVANCES), held_adv_radius);    
+        uint64_t held_max_adv = HELD_ADVANCES + held_adv_radius;
+        uint64_t pickup_adv_radius = pickup_advances_radius * (uint64_t(1) << i);
+        uint64_t pickup_min_adv = PICKUP_ADVANCES - std::min(uint64_t(PICKUP_ADVANCES), pickup_adv_radius);    
+        uint64_t pickup_max_adv = PICKUP_ADVANCES + pickup_adv_radius;
+        search_hits = searcher.search(
+            filters, HELD_SEED_VALUES, 
+            held_min_adv, held_max_adv, 
+            PICKUP_SEED_VALUES, pickup_min_adv, pickup_max_adv, 
+            parentA, parentB, compatibility,
+            gender_threshold, tid_xor_sid
+        );
+        if (search_hits.size() > 0){
+            console.log("Number of search hits: " + std::to_string(search_hits.size()));
+            return search_hits;
+        }
+    }
+    console.log("Number of search hits: " + std::to_string(search_hits.size()));
+    return search_hits;
+}
+
+bool range_is_valid(IvRange iv){
+    return (
+        iv.low <= iv.high &&
+        iv.low >= 0 &&
+        iv.high >= 0
+    );
+}
+
+bool ranges_are_valid(IvRanges ivs){
+    return (
+        range_is_valid(ivs.hp) &&
+        range_is_valid(ivs.attack) &&
+        range_is_valid(ivs.defense) &&
+        range_is_valid(ivs.spatk) &&
+        range_is_valid(ivs.spdef) &&
+        range_is_valid(ivs.speed)
+    );
+}
+
+// reading raw stats is more reliable than reading the level
+bool validate_level(
+    AdvRngFilters& filters, 
+    AdvObservedPokemon& pokemon, 
+    const std::vector<AdvEncounterSlot>& ENCOUNTER_SLOTS, 
+    const BaseStats& BASE_STATS
+){
+    std::vector<AdvEncounterSlot> valid_slots;
+    for (const AdvEncounterSlot& slot : ENCOUNTER_SLOTS){
+        if (base_species_slug(filters.species) == base_species_slug(slot.species)){
+            valid_slots.push_back(slot);
+        }
+    }
+    for (const AdvEncounterSlot& slot : valid_slots){
+        if (   filters.level >= slot.minlevel
+            && filters.level <= slot.maxlevel
+            && ranges_are_valid(filters.ivs)
+        ){
+            return true;
+        }
+    }
+    // try all levels within the encounter slots for the observed species if there was no valid match.
+    // slots commonly overlap in level, so only count each distinct level once.
+    const AdvRngFilters original_filters = filters;
+    const uint8_t original_level = pokemon.level[0];
+    std::set<uint8_t> levels;
+    for (const AdvEncounterSlot& slot : valid_slots){
+        for (uint8_t level = slot.minlevel; level <= slot.maxlevel; level++){
+            if (levels.find(level) != levels.end()){
+                continue;
+            }
+            pokemon.level[0] = level;
+            AdvRngFilters candidate = observation_to_filters(pokemon, BASE_STATS, filters.method);
+            if (ranges_are_valid(candidate.ivs)){
+                levels.insert(level);
+            }
+        }
+    }
+    if (levels.size() == 1){
+        pokemon.level[0] = *levels.begin();
+        filters = observation_to_filters(pokemon, BASE_STATS, filters.method);
+        return true;
+    }
+    // no unambiguous level was found: leave the caller's state as it was found
+    pokemon.level[0] = original_level;
+    filters = original_filters;
+    return false;
+}
+
+void update_filters(
+    AdvRngFilters& filters, 
+    AdvObservedPokemon& pokemon, 
+    const StatReads& stats, 
+    const EVs& evyield, 
+    const BaseStats& BASE_STATS,
+    AdvRngMethod method
+){
+    level_up_observed_pokemon(pokemon, stats, evyield);
+
+    if (pokemon.level.empty() || pokemon.stats.empty() || pokemon.evs.empty()){
+        filters.ivs = { {0,31}, {0,31}, {0,31}, {0,31}, {0,31}, {0,31} };
+        return;
+    }
+
+    const uint8_t new_level = pokemon.level.back();
+    const EVs new_evs = pokemon.evs.back();
+
+    while (true){
+        if (pokemon.level.size() == 0){
+            pokemon.level = { new_level };
+            pokemon.stats = { stats };
+            pokemon.evs = { new_evs };
+            filters.ivs = { {0,31}, {0,31}, {0,31}, {0,31}, {0,31}, {0,31} };
+            return;
+        }
+
+        AdvRngFilters new_filters = observation_to_filters(pokemon, BASE_STATS, method);
+
+        if (!ranges_are_valid(new_filters.ivs)){
+            IvRanges new_stat_ivs = calc_iv_ranges(BASE_STATS, pokemon.level.back(), pokemon.evs.back(), pokemon.stats.back(), nature_to_adjustment(pokemon.nature));
+            if (!ranges_are_valid(new_stat_ivs)){
+                // the newest reading is impossible on its own. 
+                // don't keep it
+                pokemon.level.pop_back();
+                pokemon.stats.pop_back();
+                pokemon.evs.pop_back();
+            }else{
+                // the newest reading is self-consistent but conflicts with an older one.
+                // discard the oldest reading until things are consistent again
+                pokemon.level.erase(pokemon.level.begin());
+                pokemon.stats.erase(pokemon.stats.begin());
+                pokemon.evs.erase(pokemon.evs.begin());
+            }
+            continue;
+        }
+
+        filters.ivs = new_filters.ivs;
+        return;
+    }
+
+}
+
+
+uint64_t get_advances_radius(
+    ConsoleHandle& console, 
+    const RngCalibrationHistory& calibration_history,
+    uint64_t initial_radius
+){
+    uint64_t advances_radius = initial_radius;
+    for (size_t i=0; i<calibration_history.results.size(); i++){
+        advances_radius = advances_radius / 2;
+        if (advances_radius <= 4){
+            advances_radius = 4;
+            break;
+        }
+    }
+    console.log("Advances search radius: " + std::to_string(advances_radius));
+
+    return advances_radius;
+}
+
+double get_seed_calibration_frames(
+    const RngCalibrationHistory& history, 
+    const std::vector<uint16_t>& seed_values, 
+    int16_t seed_position
+){
+    double sum = 0;
+    uint16_t len = 0;
+    for (size_t i=0; i<history.results.size(); i++){
+        uint16_t seed = history.results[i].seed;
+        int16_t position = -1;
+        for (size_t j=0; j<seed_values.size(); j++){
+            if (seed == seed_values[j]){
+                position = int16_t(j);
+                break;
+            }
+        }
+        if (position < 0){
+            continue;
+        }
+        double calibration = history.calibrations[i].seed_offset;
+        double offset = seed_position - position + calibration;
+        sum += offset;
+        len++;
+    }
+
+    if (len == 0){
+        return 0;
+    }
+
+    double average_offset = sum / len;
+    return average_offset;
+}
+
+double get_advances_calibration(const RngCalibrationHistory& history, uint64_t advance_target){
+    double sum = 0;
+    uint16_t len = 0;
+    for (size_t i=0; i<history.results.size(); i++){
+        uint64_t advance = history.results[i].advance;
+        double calibration = history.calibrations[i].ingame_offset + history.calibrations[i].csf_offset;
+        double offset = calibration + advance_target - advance;
+        sum += offset;
+        len++;
+    }
+
+    if (len == 0){
+        return 0;
+    }
+
+    double average_offset = sum / len;
+    return average_offset;
+}
+
+RngCalibrations get_calibrations(
+    ConsoleHandle& console,
+    const RngCalibrationHistory& history,
+    const std::vector<uint16_t>& seed_values,
+    int16_t seed_position,
+    uint64_t advances,
+    bool csf_first
+){
+    RngCalibrations calibrations{};
+
+    if (history.results.size() > 0){
+        
+        calibrations.seed_offset = get_seed_calibration_frames(history, seed_values, seed_position);
+
+        AdvRngState prev_hit = history.results.back();
+        double prev_csf_offset = history.calibrations.back().csf_offset;
+        double prev_ingame_offset = history.calibrations.back().ingame_offset;
+        int64_t prev_advance_miss = int64_t(prev_hit.advance) - int64_t(advances);
+
+        if (prev_advance_miss == 0){
+            // don't change anything if the advance target has been hit
+            calibrations.csf_offset = prev_csf_offset;
+            calibrations.ingame_offset = prev_ingame_offset;
+        }else if (std::abs(prev_advance_miss) < 2){
+            // when very close, take the previous calibration and bump the CSF in the right direction
+            if (prev_advance_miss > 0){
+                calibrations.csf_offset = prev_csf_offset - 0.5;
+            }else{
+                calibrations.csf_offset = prev_csf_offset + 0.5;
+            }
+            calibrations.csf_offset = fmod(calibrations.csf_offset, 2);
+            calibrations.ingame_offset = get_advances_calibration(history, advances) - calibrations.csf_offset;
+        }else if(csf_first){
+            // adjust the csf, putting anything beyond +/-2 frames into the in-game calibration
+            double new_advances_calibration = get_advances_calibration(history, advances);
+            double total_diff = new_advances_calibration - prev_ingame_offset - prev_csf_offset;
+            calibrations.csf_offset = fmod(prev_csf_offset + total_diff, 2);
+            calibrations.ingame_offset = new_advances_calibration - calibrations.csf_offset;
+        }else{
+            // only adjust the in-game offset
+            calibrations.csf_offset = prev_csf_offset;
+            calibrations.ingame_offset = get_advances_calibration(history, advances) - prev_csf_offset;
+        }
+    }
+
+    return calibrations;
+}
+
+
+bool update_history(
+    ConsoleHandle& console,
+    RngUncertainHistory& uncertain_history,
+    RngCalibrationHistory& calibration_history, 
+    uint16_t max_history_length,
+    const RngCalibrations calibrations,
+    const std::vector<AdvRngState>& search_hits,
+    uint32_t max_advance_possibilities,
+    uint32_t advance_radius,
+    bool force_finish
+){
+    if (search_hits.size() == 0){
+        console.log("No matches found.");
+        return true;
+    }
+
+    if (!force_finish && search_hits.size() > max_advance_possibilities && !all_equal(search_hits)){
+        return false;
+    }
+    
+    std::vector<int64_t> uncal_advances; // hit advance - calibrations
+    std::vector<AdvRngState> hits;
+    for(auto hit : search_hits){
+        uncal_advances.emplace_back(int64_t(std::round(hit.advance - calibrations.csf_offset - calibrations.ingame_offset)));
+        hits.emplace_back(hit);
+    }
+    
+    // get unique advances from new search results
+    std::sort(uncal_advances.begin(), uncal_advances.end());
+    std::vector<int64_t>::iterator iter;
+    iter = std::unique(uncal_advances.begin(), uncal_advances.begin() + uncal_advances.size());
+    uncal_advances.resize(std::distance(uncal_advances.begin(), iter));
+
+    int64_t mode = 0;
+    uncertain_history.calibrations.emplace_back(calibrations);
+    uncertain_history.results.emplace_back(hits);
+
+    if (uncal_advances.size() == 1){
+        mode = uncal_advances[0];
+    }else {        
+        // check advance history for repeated values
+        std::vector<uint64_t> counts;
+        uint64_t best = 0;
+        bool tie = false;
+        for (int64_t& uadv : uncal_advances){
+            uint64_t count = 0;
+            for (size_t i=0; i<uncertain_history.results.size(); i++){
+                auto& cals = uncertain_history.calibrations[i];
+                auto& res = uncertain_history.results[i];
+                for (auto& state : res){
+                    if (std::abs(int64_t(std::round(state.advance - cals.csf_offset - cals.ingame_offset)) - uadv) <= advance_radius){
+                        count++;
+                        break; // only count one possible hit from each attempt
+                    }
+                }
+            }
+            if (count > best){
+                mode = uadv;
+                best = count;
+                tie = false;
+            }else if (count == best){
+                tie = true;
+            }
+        }
+
+        if (tie){
+            console.log("More than 1 possible advances value hit.");
+            return true;
+        }
+    }
+    
+    // add the closest possibility to the advances mode for each attempt to the calibration history
+    console.log("Hits from previous " + std::to_string(uncertain_history.results.size()) + " attempt(s): ");
+    for (size_t i=0; i<uncertain_history.results.size(); i++){
+        auto& cals = uncertain_history.calibrations[i];
+        auto& res = uncertain_history.results[i];
+        AdvRngState most_likely_hit;
+        int64_t lowest_dist = INTMAX_MAX;
+        for (auto& state : res){
+            int64_t state_dist = std::abs(int64_t(state.advance - cals.csf_offset - cals.ingame_offset) - int64_t(mode));
+            if (state_dist < lowest_dist){
+                most_likely_hit = state;
+                lowest_dist = state_dist;
+            }
+        }
+        calibration_history.calibrations.emplace_back(cals);
+        calibration_history.results.emplace_back(most_likely_hit);
+        console.log("   " + to_hex_string(most_likely_hit.seed) + " / " + std::to_string(most_likely_hit.advance));
+    }
+
+
+    while (calibration_history.results.size() > max_history_length){
+        calibration_history.calibrations.erase(calibration_history.calibrations.begin());
+        calibration_history.results.erase(calibration_history.results.begin());
+    }
+
+    uncertain_history.results.clear();
+    uncertain_history.calibrations.clear();
+
+    return true;
+}
+
+bool all_equal(const std::vector<AdvRngState>& search_hits){
+    if (search_hits.size() < 2){ return true; }
+    const AdvRngState& first = search_hits[0];
+    for (size_t i=1; i<search_hits.size(); i++){
+        if (search_hits[i].seed != first.seed
+         || search_hits[i].advance != first.advance
+        ){
+            return false;
+        }
+    }
+    return true;
+}
+
+
+bool are_indistinguishable(AdvPokemonResult res1, AdvPokemonResult res2, int16_t gender_threshold){
+    return (
+        res1.nature == res2.nature &&
+        gender_from_gender_value(res1.gender, gender_threshold) == gender_from_gender_value(res2.gender, gender_threshold) &&
+        // res1.ability == res2.ability &&
+        res1.ivs.hp == res2.ivs.hp &&
+        res1.ivs.attack == res2.ivs.attack &&
+        res1.ivs.defense == res2.ivs.defense &&
+        res1.ivs.spatk == res2.ivs.spatk &&
+        res1.ivs.spdef == res2.ivs.spdef &&
+        res1.ivs.speed == res2.ivs.speed
+    );
+}
+
+bool are_indistinguishable(AdvWildPokemonResult res1, AdvWildPokemonResult res2, int16_t gender_threshold){
+    return (
+        res1.species == res2.species &&
+        res1.level == res2.level &&
+        res1.nature == res2.nature &&
+        gender_from_gender_value(res1.gender, gender_threshold) == gender_from_gender_value(res2.gender, gender_threshold) &&        
+        // res1.ability == res2.ability &&
+        res1.ivs.hp == res2.ivs.hp &&
+        res1.ivs.attack == res2.ivs.attack &&
+        res1.ivs.defense == res2.ivs.defense &&
+        res1.ivs.spatk == res2.ivs.spatk &&
+        res1.ivs.spdef == res2.ivs.spdef &&
+        res1.ivs.speed == res2.ivs.speed
+    );
+}
+
+bool all_indistinguishable(const std::vector<AdvRngState>& hits, AdvRngSearcher& searcher, int16_t gender_threshold){
+    if (hits.size() < 2){
+        return true;
+    }
+    searcher.state = hits[0];
+    AdvPokemonResult first_result = searcher.generate_pokemon();
+    for (size_t i=1; i<hits.size(); i++){
+        searcher.state = hits[i];
+        AdvPokemonResult other_result = searcher.generate_pokemon();
+        if (!are_indistinguishable(first_result, other_result, gender_threshold)){
+            return false;
+        }
+    }
+    return true;
+}
+
+bool all_indistinguishable(const std::vector<AdvRngState>& hits, AdvRngWildSearcher& searcher, int16_t gender_threshold, bool super_rod){
+    if (hits.size() < 2){
+        return true;
+    }
+    searcher.state = hits[0];
+    AdvWildPokemonResult first_result = searcher.generate_pokemon(super_rod);
+
+    for (size_t i=1; i<hits.size(); i++){
+        searcher.state = hits[i];
+        AdvWildPokemonResult other_result = searcher.generate_pokemon(super_rod);
+        if (!are_indistinguishable(first_result, other_result, gender_threshold)){
+            return false;
+        }
+    }
+    return true;
+}
+
+bool all_indistinguishable(
+    const std::vector<std::pair<AdvRngState, AdvRngState>>& hits, 
+    AdvRngEggSearcher& searcher,
+    int16_t gender_threshold,
+    AdvIVs& parentA_ivs, AdvIVs& parentB_ivs
+){
+    if (hits.size() < 2){
+        return true;
+    }
+    searcher.held_state = hits[0].first;
+    searcher.pickup_state = hits[0].second;
+
+    AdvPokemonResult first_result = searcher.generate_pokemon(parentA_ivs, parentB_ivs);
+
+     for (size_t i=1; i<hits.size(); i++){
+        searcher.held_state = hits[i].first;
+        searcher.pickup_state = hits[i].second;
+        AdvPokemonResult other_result = searcher.generate_pokemon(parentA_ivs, parentB_ivs);
+        if (!are_indistinguishable(first_result, other_result, gender_threshold)){
+            return false;
+        }
+    }
+    return true;
+}
+
+bool same_seeds(std::vector<AdvRngState> hits){
+    if (hits.size() < 2){
+        return true;
+    }
+    uint16_t first_seed = hits[0].seed;
+
+    for (size_t i=1; i<hits.size(); i++){
+        if (hits[i].seed != first_seed){
+            return false;
+        }
+    }
+    return true;
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngCalibration.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngCalibration.h
new file mode 100644
index 0000000000..4951b58ee7
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngCalibration.h
@@ -0,0 +1,213 @@
+/*  RNG Calibration
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonFRLG_RngCalibration_H
+#define PokemonAutomation_PokemonFRLG_RngCalibration_H
+
+#include <string>
+#include "NintendoSwitch/NintendoSwitch_ConsoleHandle.h"
+#include "Pokemon/Pokemon_AdvRng.h"
+#include "VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_BlindNavigation.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+using namespace Pokemon;
+
+
+static const double FRLG_FRAMERATE = 59.999977; // FPS
+static const double FRLG_FRAME_DURATION = 1000.0 / FRLG_FRAMERATE;
+
+struct RngCalibrations{
+    double seed_offset;
+    double csf_offset;
+    double ingame_offset;
+
+    bool operator==(const RngCalibrations& other) const {
+        return (
+               seed_offset   == other.seed_offset
+            && csf_offset    == other.csf_offset
+            && ingame_offset == other.ingame_offset
+        );
+    }
+};
+
+struct RngUncertainHistory{
+    std::vector<RngCalibrations> calibrations;
+    std::vector<std::vector<AdvRngState>> results;
+};
+
+struct RngCalibrationHistory{
+    std::vector<RngCalibrations> calibrations;
+    std::vector<AdvRngState> results;
+};
+
+
+void check_seed_validity(ConsoleHandle& console, std::string seed_string);
+uint16_t parse_seed(ConsoleHandle& console, std::string seed_string);
+std::vector<uint16_t> parse_seed_list(ConsoleHandle& console, std::string seed_list_string);
+int16_t seed_position_in_list(uint16_t seed, std::vector<uint16_t> list);
+
+std::string to_hex_string(const uint16_t& val);
+std::string to_hex_string(const uint32_t& val);
+
+
+// true if a search hit matches the target seed and advance
+bool have_hit_target(uint32_t target_seed, uint64_t target_advances, const AdvRngState& hit);
+
+// if previous resets had uncertain advances, slightly nudge the seed offset to try
+// to land on a different target. Cycles through {0, +1, -1, +2, -2} frames.
+void apply_seed_bump(RngCalibrations& calibrations, const RngUncertainHistory& uncertain_history);
+
+// increment the failed-search counter when a search returned no hits, otherwise reset it.
+// templated so it accepts both plain hit vectors and the egg searcher's pair vectors.
+template <typename HitType>
+void update_failed_searches(uint16_t& failed_searches, const std::vector<HitType>& search_hits){
+    if (search_hits.size() == 0){
+        failed_searches++;
+    }else{
+        failed_searches = 0;
+    }
+}
+
+// log the PID, nature, and IVs of a target pokemon result
+void log_target_pokemon(ConsoleHandle& console, const AdvPokemonResult& result, bool normal_method_note = false);
+
+// log the three calibration offsets (seed/CSF/in-game), in frames
+void log_calibrations(ConsoleHandle& console, const RngCalibrations& calibrations, bool initial = false);
+
+RngTimings prepare_timings(
+    ConsoleHandle& console,
+    PokemonFRLG_RngTarget target,
+    uint64_t SEED_DELAY,
+    uint64_t CONTINUE_SCREEN_FRAMES,
+    uint64_t INGAME_ADVANCES,
+    bool USE_TEACHY_TV,
+    const RngCalibrations& calibrations,
+    int64_t FIXED_SEED_OFFSET,
+    Language LANGUAGE = Language::None
+);
+
+// get search hits for any of the provided seed values and advances range
+std::vector<AdvRngState> get_search_results(
+    ConsoleHandle& console,
+    AdvRngSearcher& searcher, 
+    AdvRngFilters& filters,
+    const std::vector<uint16_t>& SEED_VALUES,
+    uint64_t ADVANCES, 
+    uint64_t advances_radius,
+    int16_t gender_threshold = 126,
+    uint16_t tid_xor_sid = 0
+);
+
+std::vector<AdvRngState> get_wild_search_results(
+    ConsoleHandle& console,
+    AdvRngWildSearcher& searcher, 
+    AdvRngFilters& filters,
+    const std::vector<uint16_t>& SEED_VALUES,
+    uint64_t ADVANCES, 
+    uint64_t advances_radius,
+    int16_t gender_threshold = 126,
+    bool super_rod = false,
+    uint16_t tid_xor_sid = 0
+);
+
+std::vector<std::pair<AdvRngState,AdvRngState>> get_egg_search_results(
+    ConsoleHandle& console,
+    AdvRngEggSearcher& searcher, 
+    AdvRngFilters& filters,
+    const std::vector<uint16_t>& HELD_SEED_VALUES,
+    const std::vector<uint16_t>& PICKUP_SEED_VALUES,
+    uint64_t HELD_ADVANCES, 
+    uint64_t held_advances_radius,
+    uint64_t PICKUP_ADVANCES, 
+    uint64_t pickup_advances_radius,
+    AdvIVs& parentA,
+    AdvIVs& parentB,
+    AdvEggCompatibility compatibility,
+    int16_t gender_threshold,
+    uint16_t tid_xor_sid
+);
+
+// double-check read level against possible encounter slots for the observed species and return true if valid
+// if stats from the original read are invalid, this tries all possible levels and checks whether IVs are valid,
+// returning true if exactly one level produces valid IV ranges
+bool validate_level(
+    AdvRngFilters& filters, 
+    AdvObservedPokemon& pokemon, 
+    const std::vector<AdvEncounterSlot>& ENCOUNTER_SLOTS, 
+    const BaseStats& BASE_STATS
+);
+
+// update IV ranges for RNG search filters with new stats/EVs after leveling up
+void update_filters(
+    AdvRngFilters& filters, 
+    AdvObservedPokemon& pokemon, 
+    const StatReads& stats, 
+    const EVs& evyield, 
+    const BaseStats& BASE_STATS,
+    AdvRngMethod method = AdvRngMethod::Method1
+);
+
+// get the search radius across advances based on the length of the RNG calibration history
+uint64_t get_advances_radius(
+    ConsoleHandle& console, 
+    const RngCalibrationHistory& calibration_history,
+    uint64_t initial_radius
+);
+
+// get seed calibration based on average offset in the RNG calibration history
+double get_seed_calibration_frames(
+    const RngCalibrationHistory& history, 
+    const std::vector<uint16_t>& seed_values, 
+    int16_t seed_position
+);
+
+// get advances calibration based on average offset in the RNG calibration history
+double get_advances_calibration(const RngCalibrationHistory& calibration_history, uint64_t advances);
+
+// get RngCalibrations from the RNG calibration history
+RngCalibrations get_calibrations(
+    ConsoleHandle& console,
+    const RngCalibrationHistory& history,
+    const std::vector<uint16_t>& seed_values,
+    int16_t seed_position,
+    uint64_t advances,
+    bool csf_first = false
+);
+
+// infer hit seeds/advances, update the calibration history, and return whether or not the search is finished
+bool update_history(
+    ConsoleHandle& console,
+    RngUncertainHistory& advance_history,
+    RngCalibrationHistory& calibration_history, 
+    uint16_t max_history_length,
+    const RngCalibrations calibrations,
+    const std::vector<AdvRngState>& search_hits,
+    uint32_t max_advance_possibilities = 1,
+    uint32_t advance_radius = 2,
+    bool force_finish = false
+);
+
+bool all_equal(const std::vector<AdvRngState>& search_hits);
+
+bool all_indistinguishable(const std::vector<AdvRngState>& hits, AdvRngSearcher& searcher, int16_t gender_threshold);
+bool all_indistinguishable(const std::vector<AdvRngState>& hits, AdvRngWildSearcher& searcher, int16_t gender_threshold, bool super_rod);
+bool all_indistinguishable(
+    const std::vector<std::pair<AdvRngState, AdvRngState>>& hits, 
+    AdvRngEggSearcher& searcher,
+    int16_t gender_threshold,
+    AdvIVs& parentA_ivs, AdvIVs& parentB_ivs
+);
+
+bool same_seeds(std::vector<AdvRngState> hits);
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngDisplays.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngDisplays.cpp
new file mode 100644
index 0000000000..82b6dc3f7b
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngDisplays.cpp
@@ -0,0 +1,194 @@
+/*  RNG Displays
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <cmath>
+#include <vector>
+#include <iostream>
+#include <sstream>
+#include "Pokemon/Resources/Pokemon_PokemonNames.h"
+#include "PokemonFRLG_RngDisplays.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+using namespace Pokemon;
+
+SidHelperDisplay::SidHelperDisplay()
+    : GroupOption("TID/SID Results", LockMode::READ_ONLY)
+    , tid(false, "<b>Trainer ID:</b>", LockMode::READ_ONLY, "-", "")
+    , sids("<b>SID Possibilities:</b>", LockMode::READ_ONLY, "-", "")
+{
+    PA_ADD_STATIC(tid);
+    PA_ADD_STATIC(sids);
+}
+std::string SidHelperDisplay::get_sids_string(const std::vector<std::pair<std::string, std::string>>& sid_messages){
+    std::string sid_str = "";
+    for (auto& str_pair : sid_messages){
+        sid_str += str_pair.first + ": ";
+        sid_str += str_pair.second + "\n";
+    }
+    return sid_str;
+}
+void SidHelperDisplay::set(uint16_t trainerId, const std::vector<std::pair<std::string, std::string>>& sid_messages){
+    tid.set(std::to_string(trainerId));
+    sids.set(get_sids_string(sid_messages));
+}
+
+std::string RngTargetDisplay::result_to_string(const AdvPokemonResult& pokemon, const int16_t& gender_threshold){
+    std::string out;
+    out += gender_to_string(gender_from_gender_value(pokemon.gender, gender_threshold)) + " ";
+    out += nature_to_string(pokemon.nature) + " ";
+    out +=  std::to_string(pokemon.ivs.hp) + "/" +
+            std::to_string(pokemon.ivs.attack) + "/" +
+            std::to_string(pokemon.ivs.defense) + "/" +
+            std::to_string(pokemon.ivs.spatk) + "/" +
+            std::to_string(pokemon.ivs.spdef) + "/" +
+            std::to_string(pokemon.ivs.speed) + " ";
+    return out;
+}   
+
+std::string RngTargetDisplay::result_to_string(const AdvWildPokemonResult& pokemon, const int16_t& gender_threshold){
+    std::string name;
+    if (pokemon.species.find("unown") != std::string::npos){
+        char form = char(toupper(pokemon.species.substr(6,1)[0]));
+        name = get_pokemon_name("unown").display_name() + " (" + form + ")";
+    }else{
+        name = get_pokemon_name(pokemon.species).display_name();
+    }
+    std::string out;
+    out += name + " ";
+    out += "Lv" + std::to_string(pokemon.level) + " ";
+    out += gender_to_string(gender_from_gender_value(pokemon.gender, gender_threshold)) + " ";
+    out += nature_to_string(pokemon.nature) + " ";
+    out +=  std::to_string(pokemon.ivs.hp) + "/" +
+            std::to_string(pokemon.ivs.attack) + "/" +
+            std::to_string(pokemon.ivs.defense) + "/" +
+            std::to_string(pokemon.ivs.spatk) + "/" +
+            std::to_string(pokemon.ivs.spdef) + "/" +
+            std::to_string(pokemon.ivs.speed) + " ";
+    return out;
+}   
+
+void RngTargetDisplay::set_target(const AdvPokemonResult& pokemon, const int16_t& gender_threshold){
+    set(result_to_string(pokemon, gender_threshold));
+}
+void RngTargetDisplay::set_target(const AdvWildPokemonResult& pokemon, const int16_t& gender_threshold){
+    set(result_to_string(pokemon, gender_threshold));
+}
+
+
+RngFilterDisplay::RngFilterDisplay()
+    : GroupOption("Observed Stats", LockMode::READ_ONLY)
+    , species(false, "<b>Species:</b>", LockMode::READ_ONLY, "-", "")
+    , gender(false, "<b>Gender:</b>", LockMode::READ_ONLY, "-", "")
+    , nature(false, "<b>Nature:</b>", LockMode::READ_ONLY, "-", "")
+    , level(false, "<b>Level:</b>", LockMode::READ_ONLY, "-", "")
+    , hp(false, "<b>HP IV:</b>", LockMode::READ_ONLY, "-", "")
+    , atk(false, "<b>Attack IV:</b>", LockMode::READ_ONLY, "-", "")
+    , def(false, "<b>Defense IV:</b>", LockMode::READ_ONLY, "-", "")
+    , spatk(false, "<b>Special Attack IV:</b>", LockMode::READ_ONLY, "-", "")
+    , spdef(false, "<b>Special Defense IV:</b>", LockMode::READ_ONLY, "-", "")
+    , speed(false, "<b>Speed IV:</b>", LockMode::READ_ONLY, "-", "")
+{   
+    PA_ADD_STATIC(species);
+    PA_ADD_STATIC(gender);
+    PA_ADD_STATIC(nature);
+    PA_ADD_STATIC(level);
+    PA_ADD_STATIC(hp);
+    PA_ADD_STATIC(atk);
+    PA_ADD_STATIC(def);
+    PA_ADD_STATIC(spatk);
+    PA_ADD_STATIC(spdef);
+    PA_ADD_STATIC(speed);
+}
+std::string RngFilterDisplay::get_range_string(const IvRange& range){
+    if (range.low < 0 || range.high < 0){
+        return "(invalid or unable to read)";
+    }
+    if (range.low == range.high){
+        return std::to_string(range.low);
+    }
+    return std::to_string(range.low) + " - " + std::to_string(range.high);
+}
+
+void RngFilterDisplay::set(const AdvRngFilters& filter){
+    species.set(get_pokemon_name(filter.species).display_name());
+    gender.set(gender_to_string(filter.gender));
+    nature.set(nature_to_string(filter.nature));
+    level.set(std::to_string(filter.level));
+    hp.set(get_range_string(filter.ivs.hp));
+    atk.set(get_range_string(filter.ivs.attack));
+    def.set(get_range_string(filter.ivs.defense));
+    spatk.set(get_range_string(filter.ivs.spatk));
+    spdef.set(get_range_string(filter.ivs.spdef));
+    speed.set(get_range_string(filter.ivs.speed));
+}
+
+void RngFilterDisplay::reset(){
+    species.set("-");
+    gender.set("-");
+    nature.set("-");
+    level.set("-");
+    hp.set("-");
+    atk.set("-");
+    def.set("-");
+    spatk.set("-");
+    spdef.set("-");
+    speed.set("-");
+
+}
+
+RngCalibrationDisplay::RngCalibrationDisplay(std::string label)
+    : GroupOption(label, LockMode::READ_ONLY)
+    , seed_calibration("<b>Seed Calibration (ms):</b>", LockMode::LOCK_WHILE_RUNNING, 0)
+    , csf_calibration("<b>Continue Screen Frames Calibration:</b>", LockMode::LOCK_WHILE_RUNNING, 0.0)
+    , advances_calibration("<b>In-Game Advances Calibration:</b>", LockMode::LOCK_WHILE_RUNNING, 0.0)
+    , hits(false, "<b>Seeds/Advances:</b>", LockMode::READ_ONLY, "-", "")
+{
+    PA_ADD_OPTION(seed_calibration);
+    PA_ADD_OPTION(csf_calibration);
+    PA_ADD_OPTION(advances_calibration);
+    PA_ADD_STATIC(hits);
+}
+
+std::string RngCalibrationDisplay::get_hits_string(const std::vector<AdvRngState>& rng_states){
+    std::string hits_string;
+    for (size_t i=0; i<rng_states.size(); i++){
+        if (i > 0){
+            hits_string += ", ";
+        }
+        AdvRngState hit = rng_states[i];
+        uint16_t seed = hit.seed;
+        std::ostringstream s;
+        s << std::hex << seed;
+        hits_string += s.str();
+        hits_string += "/";
+        hits_string += std::to_string(hit.advance);
+    }
+    if (hits_string.size() == 0){
+        hits_string += "No matches found";
+    }
+    return hits_string;
+}
+
+void RngCalibrationDisplay::set_calibrations(const RngCalibrations& calibrations){
+    seed_calibration.set(int64_t(std::round(calibrations.seed_offset * FRLG_FRAME_DURATION)));
+    csf_calibration.set(calibrations.csf_offset);
+    advances_calibration.set(calibrations.ingame_offset);
+}
+
+void RngCalibrationDisplay::set_hits(const std::vector<AdvRngState>& rng_states){
+    hits.set(get_hits_string(rng_states));
+}
+
+void RngCalibrationDisplay::reset_hits(){
+    hits.set("-");
+}
+
+}
+}
+}
\ No newline at end of file
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngDisplays.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngDisplays.h
new file mode 100644
index 0000000000..2f8182f7a5
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngDisplays.h
@@ -0,0 +1,104 @@
+/*  RNG Displays
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonFRLG_RngDisplays_H
+#define PokemonAutomation_PokemonFRLG_RngDisplays_H
+
+#include <vector>
+#include "Common/Cpp/Options/StringOption.h"
+#include "Common/Cpp/Options/TextEditOption.h"
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "Common/Cpp/Options/FloatingPointOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "Pokemon/Pokemon_AdvRng.h"
+#include "PokemonFRLG_RngCalibration.h"
+
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+using namespace Pokemon;
+
+class SidHelperDisplay: public GroupOption{
+public:
+    SidHelperDisplay();
+
+    void set(uint16_t trainerId, const std::vector<std::pair<std::string, std::string>>& sid_messages);
+
+private:
+    static std::string get_sids_string(const std::vector<std::pair<std::string, std::string>>& sid_messages);
+
+public:
+    StringOption tid;
+    TextEditOption sids;
+};
+
+class RngTargetDisplay : public StringOption{
+public:
+    RngTargetDisplay()
+        : StringOption(
+            false,
+            "<b>Target Details:</b>",
+            LockMode::READ_ONLY,
+            "-", ""
+        )
+    {}
+
+    void set_target(const AdvPokemonResult& pokemon, const int16_t& gender_threshold);
+    void set_target(const AdvWildPokemonResult& pokemon, const int16_t& gender_threshold);
+
+private:
+    std::string result_to_string(const AdvPokemonResult& pokemon, const int16_t& gender_threshold);
+    std::string result_to_string(const AdvWildPokemonResult& pokemon, const int16_t& gender_threshold);
+};
+
+class RngFilterDisplay : public GroupOption{
+public:
+    RngFilterDisplay();
+
+    void set(const AdvRngFilters& filter);
+    void reset();
+
+private:
+    static std::string get_range_string(const IvRange& range);
+
+public:
+    StringOption species;
+    StringOption gender;
+    StringOption nature;
+    StringOption level;
+    StringOption hp;
+    StringOption atk;
+    StringOption def;
+    StringOption spatk;
+    StringOption spdef;
+    StringOption speed;
+};
+
+
+class RngCalibrationDisplay : public GroupOption{
+public:
+    RngCalibrationDisplay(std::string label = "RNG Calibration");
+
+    void set_calibrations(const RngCalibrations& calibrations);
+    void set_hits(const std::vector<AdvRngState>& rng_states);
+    void reset_hits();
+
+private:
+    static std::string get_hits_string(const std::vector<AdvRngState>& rng_states);
+public:
+    SimpleIntegerOption<int64_t> seed_calibration;
+    FloatingPointOption csf_calibration;
+    FloatingPointOption advances_calibration;
+    StringOption hits;
+};
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngHelper.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngHelper.cpp
new file mode 100644
index 0000000000..16065cbda0
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngHelper.cpp
@@ -0,0 +1,342 @@
+/*  RNG Helper
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonFRLG/PokemonFRLG_Navigation.h"
+#include "PokemonFRLG_RngNavigation.h"
+#include "PokemonFRLG_RngCalibration.h"
+#include "PokemonFRLG_HardReset.h"
+#include "PokemonFRLG_RngHelper.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+RngHelper_Descriptor::RngHelper_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonFRLG:RngHelper",
+        Pokemon::STRING_POKEMON + " FRLG", "RNG Helper",
+        "Programs/PokemonFRLG/RngHelper.html",
+        "Soft reset with specific timings for hitting a target Seed and Frame for RNG manipulation.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_RequiresPrecision,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+struct RngHelper_Descriptor::Stats : public StatsTracker{
+    Stats()
+        : resets(m_stats["Resets"])
+        , shinies(m_stats["Shinies"])
+        , errors(m_stats["Errors"])
+    {
+        m_display_order.emplace_back("Resets");
+        m_display_order.emplace_back("Shinies");
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+    }
+    std::atomic<uint64_t>& resets;
+    std::atomic<uint64_t>& shinies;
+    std::atomic<uint64_t>& errors;
+};
+std::unique_ptr<StatsTracker> RngHelper_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+RngHelper::RngHelper()
+    : m_game_info(
+        "<font size=4><b>Game Information</b></font>"
+    )
+    , LANGUAGE(
+        "<b>Game Language:</b>",
+        {
+            Language::English,
+            Language::Japanese,
+            Language::Spanish,
+            Language::French,
+            Language::German,
+            Language::Italian,
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        true
+    )
+    , m_target_settings(
+        "<font size=4><b>Target Settings</b></font> — Get these from an RNG search tool"
+    )
+    , TARGET(
+        "<b>Target:</b>",
+        {
+            {PokemonFRLG_RngTarget::starters, "starters", "Bulbasaur / Squirtle / Charmander"},
+            {PokemonFRLG_RngTarget::magikarp, "magikarp", "Magikarp"},
+            {PokemonFRLG_RngTarget::hitmon, "hitmon", "Hitmonlee / Hitmonchan"},
+            {PokemonFRLG_RngTarget::eevee, "eevee", "Eevee"},
+            {PokemonFRLG_RngTarget::lapras, "lapras", "Lapras"},
+            {PokemonFRLG_RngTarget::fossils, "fossils", "Omanyte / Kabuto / Aerodactyl"},
+            {PokemonFRLG_RngTarget::gamecornerabra, "gamecornerabra", "Game Corner Abra"},
+            {PokemonFRLG_RngTarget::gamecornerclefairy, "gamecornerclefairy", "Game Corner Clefairy"},
+            {PokemonFRLG_RngTarget::gamecornerdratinifr, "gamecornerdratinifr", "Game Corner Dratini (FireRed)"},
+            {PokemonFRLG_RngTarget::gamecornerdratinilg, "gamecornerdratinilg", "Game Corner Dratini (LeafGreen)"},
+            {PokemonFRLG_RngTarget::gamecornerscyther, "gamecornerscyther", "Game Corner Scyther"},
+            {PokemonFRLG_RngTarget::gamecornerpinsir, "gamecornerpinsir", "Game Corner Pinsir"},
+            {PokemonFRLG_RngTarget::gamecornerporygon, "gamecornerporygon", "Game Corner Porygon"},
+            {PokemonFRLG_RngTarget::togepi, "togepi", "Togepi"},
+            {PokemonFRLG_RngTarget::togepifast, "togepifast", "Togepi (pre-approved)"},
+            {PokemonFRLG_RngTarget::eggheld, "eggheld", "Daycare Egg Held Frame"},
+            {PokemonFRLG_RngTarget::eggpickup, "eggpickup", "Daycare Egg Pickup"},
+            {PokemonFRLG_RngTarget::staticencounter, "staticencounter", "Static Overworld Encounters"},
+            {PokemonFRLG_RngTarget::snorlax, "snorlax", "Snorlax"},
+            {PokemonFRLG_RngTarget::mewtwo, "mewtwo", "Mewtwo"},
+            {PokemonFRLG_RngTarget::hooh, "hooh", "Ho-oh"},
+            {PokemonFRLG_RngTarget::hypno, "berryforesthypno", "Berry Forest Hypno"},
+            {PokemonFRLG_RngTarget::sweetscent, "sweetscent", "Sweet Scent"},
+            {PokemonFRLG_RngTarget::rocksmash, "rocksmash", "Rock Smash"},
+            {PokemonFRLG_RngTarget::fishing, "fishing", "Fishing"},
+            {PokemonFRLG_RngTarget::safarizonecenter, "safarizonecenter", "Safari Zone Center (Sweet Scent)"},
+            {PokemonFRLG_RngTarget::safarizoneeast, "safarizoneeast", "Safari Zone East (Sweet Scent)"},
+            {PokemonFRLG_RngTarget::safarizonenorth, "safarizonenorth", "Safari Zone North (Sweet Scent)"},
+            {PokemonFRLG_RngTarget::safarizonewest, "safarizonewest", "Safari Zone West (Sweet Scent)"},
+            {PokemonFRLG_RngTarget::safarizonesurf, "safarizonesurf", "Safari Zone Surfing"},
+            {PokemonFRLG_RngTarget::safarizonefish, "safarizonefish", "Safari Zone Fishing"},
+            {PokemonFRLG_RngTarget::roaming, "roaming", "Roaming Legendaries"}
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        PokemonFRLG_RngTarget::starters
+    )    
+    , SEED_BUTTON(
+        "<b>Seed Button:</b><br>"
+        "The button to be pressed on the title screen to set the seed.",
+        {
+            {SeedButton::A, "A", "A"},
+            {SeedButton::Start, "Start", "Start"},
+            {SeedButton::L, "L", "L (L=A)"},
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        SeedButton::A
+    )
+    , EXTRA_BUTTON(
+        "<b>Extra Button:</b><br>"
+        "Additional button presses that affect the seed.",
+        {
+            {BlackoutButton::None, "None", "None"},
+            {BlackoutButton::L, "L", "Blackout L"},
+            {BlackoutButton::R, "R", "Blackout R"},
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        BlackoutButton::None
+    )
+    , SEED_DELAY(
+        "<b>Seed Delay Time (ms):</b><br>"
+        "The delay between starting the game and advancing past the title screen. Set this to match your target seed.<br>"
+        "<i>If using Ten Lines for seed info, select <b>Nintendo Switch 1</b> as your console even if using a Switch 2.</i><br>"
+        "<b><i>Warning: values close to 30500ms can sometimes cause problems, and you may need to increase your seed calibration or pick a new target.</i></b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        31338, 30400 // default, min
+    )
+    , SEED_CALIBRATION(
+         "<b>Seed Calibration (ms):</b>"
+         "<br>Modifies the seed delay time. This should be changed in the opposite of the direction that you missed your seed.<br>"
+         "<i>Example: if you missed your target seed by +16ms (meaning the button press was too late), <b>decrease</b> your seed calibration by -16 (shortening the delay).</i>",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        0  // default
+    )
+    , CONTINUE_SCREEN_FRAMES(
+        "<b>Continue Screen Frames:</b>"
+        "<br>The number of RNG advances before loading the game.<br>"
+        "These pass at the \"normal\" rate compared to other consoles.",
+        LockMode::LOCK_WHILE_RUNNING,
+        200, 192 // default, min
+    )
+    , CONTINUE_SCREEN_CALIBRATION(
+        "<b>Continue Screen Frames Calibration:</b>"
+        "<br>A \"fine adjustment\" that modifies the RNG advances passed on the Continue Screen.<br>"
+        "<i>Example: if your target advance was 10000 and you hit 10025, you can <b>decrease</b> your calibration value by 25.</i>",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        0 // default
+    )
+    , INGAME_ADVANCES(
+        "<b>In-Game Advances:</b>"
+        "<br>The number of in-game RNG advances before triggering the gift/encounter.<br>"
+        "These pass at double the rate compared to other consoles, where every frame results in 2 advances.<br>"
+        "<i>Warning: this needs to be long enough to accomodate all in-game button presses prior to the gift/encounter</i>",
+        LockMode::LOCK_WHILE_RUNNING,
+        9800, 320 // default, min
+    )
+    , INGAME_CALIBRATION(
+        "<b>In-Game Advances Calibration:</b>"
+        "<br>A \"coarse adjustment\" that modifies the RNG advances passed after loading the game.<br>"
+        "<i>Example: if your target advance was 10000 and you hit 8500, you can <b>increase</b> your calibration value by 1500.</i>",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        0 // default
+    )
+    , m_program_settings(
+        "<font size=4><b>Program Settings</b></font>"
+    )    
+    , USE_TEACHY_TV(
+        "<b>Use Teachy TV:</b>"
+        "<br>Opens the Teachy TV to quickly advance the RNG at 313x speed.<br>"
+        "<i>Warning: can result in larger misses.</i>",
+        LockMode::LOCK_WHILE_RUNNING,
+        false // default
+    )
+    , NUM_RESETS(
+        "<b>Max Resets:</b><br>"
+        "This program requires manual calibration, so this should usually be set to 1 while calibrating.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        1, 0 // default, min
+    )
+    , PROFILE(
+        "<b>User Profile Position:</b><br>"
+        "The position, from left to right, of the Switch profile with the FRLG save you'd like to use.<br>"
+        "If this is set to 0, Switch 1 defaults to the last-used profile, while Switch 2 defaults to the first profile (position 1)",
+        LockMode::LOCK_WHILE_RUNNING,
+        0, 0, 8 // default, min, max
+    )
+    , TAKE_VIDEO(
+        "<b>Take Video:</b><br>Record a video when the shiny is found.", 
+        LockMode::LOCK_WHILE_RUNNING, 
+        true // default
+    )
+    , GO_HOME_WHEN_DONE(true)
+    , NOTIFICATION_SHINY(
+        "Shiny found",
+        true, true, ImageAttachmentMode::JPG,
+        {"Notifs", "Showcase"}
+    )
+    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_SHINY,
+        &NOTIFICATION_STATUS_UPDATE,
+        &NOTIFICATION_PROGRAM_FINISH,
+    })
+{
+    PA_ADD_OPTION(m_game_info);
+    PA_ADD_OPTION(LANGUAGE);
+    PA_ADD_OPTION(m_target_settings);
+    PA_ADD_OPTION(TARGET);
+    PA_ADD_OPTION(SEED_BUTTON);
+    PA_ADD_OPTION(EXTRA_BUTTON);
+    PA_ADD_OPTION(SEED_DELAY);
+    PA_ADD_OPTION(SEED_CALIBRATION);
+    PA_ADD_OPTION(CONTINUE_SCREEN_FRAMES);
+    PA_ADD_OPTION(CONTINUE_SCREEN_CALIBRATION);
+    PA_ADD_OPTION(INGAME_ADVANCES);
+    PA_ADD_OPTION(INGAME_CALIBRATION);
+    PA_ADD_OPTION(m_program_settings);
+    PA_ADD_OPTION(USE_TEACHY_TV);
+    PA_ADD_OPTION(NUM_RESETS);
+    PA_ADD_OPTION(PROFILE);
+    PA_ADD_OPTION(TAKE_VIDEO);
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+void RngHelper::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    /*
+    * Settings: Text Speed fast
+    */
+
+    RngHelper_Descriptor::Stats& stats = env.current_stats<RngHelper_Descriptor::Stats>();
+
+    home_black_border_check(env.console, context);
+
+    bool shiny_found = false;
+
+    static const int64_t FIXED_SEED_OFFSET = -845; // milliseconds, approximate
+
+    const bool SAFARI_ZONE = (TARGET == PokemonFRLG_RngTarget::safarizonecenter
+        || TARGET == PokemonFRLG_RngTarget::safarizoneeast
+        || TARGET == PokemonFRLG_RngTarget::safarizonenorth
+        || TARGET == PokemonFRLG_RngTarget::safarizonewest
+        || TARGET == PokemonFRLG_RngTarget::safarizonesurf
+        || TARGET == PokemonFRLG_RngTarget::safarizonefish 
+    );
+    
+    env.log("Target: " + std::to_string(TARGET.current_value()));
+    env.log("Seed Delay: " + std::to_string(SEED_DELAY) + "ms");
+    env.log("Continue Screen Frames: " + std::to_string(CONTINUE_SCREEN_FRAMES) + " frames");
+    env.log("In-game Advances: " + std::to_string(INGAME_ADVANCES) + " advances");
+
+    const RngCalibrations CALIBRATIONS = {
+        static_cast<double>(SEED_CALIBRATION),
+        CONTINUE_SCREEN_CALIBRATION,
+        INGAME_CALIBRATION
+    };
+    env.log("Seed calibration (frames): " + std::to_string(CALIBRATIONS.seed_offset));
+    env.log("CSF calibration (frames): " + std::to_string(CALIBRATIONS.csf_offset));
+    env.log("In-game calibration (frames x2): " + std::to_string(CALIBRATIONS.ingame_offset));
+
+    Milliseconds launch_delay = INITIAL_LAUNCH_DELAY;
+
+    while (!shiny_found){
+        RngTimings timings = prepare_timings(
+            env.console, TARGET,
+            SEED_DELAY, CONTINUE_SCREEN_FRAMES, INGAME_ADVANCES,
+            USE_TEACHY_TV, CALIBRATIONS,
+            FIXED_SEED_OFFSET, LANGUAGE
+        );
+        
+        // handle the blind part
+        reset_and_perform_blind_sequence(
+            env.console, context, 
+            LANGUAGE, TARGET, 
+            SEED_BUTTON, EXTRA_BUTTON, 
+            timings, launch_delay,
+            SAFARI_ZONE, PROFILE
+        );
+        env.log("Blind button presses complete.");
+        stats.resets++;
+
+        // detect shinies
+        shiny_found = check_for_shiny(env.console, context, TARGET, LANGUAGE);
+        if (shiny_found){
+            env.log("Shiny found!");
+            stats.shinies++;
+            send_program_notification(
+                env,
+                NOTIFICATION_SHINY,
+                COLOR_YELLOW,
+                "Shiny found!",
+                {}, "",
+                env.console.video().snapshot(),
+                true
+            );
+            if (TAKE_VIDEO){
+                pbf_press_button(context, BUTTON_CAPTURE, 2000ms, 0ms);
+            }
+            break;
+        }else if (stats.resets >= NUM_RESETS){
+            send_program_status_notification(
+                env, NOTIFICATION_STATUS_UPDATE,
+                "Maximum resets reached."
+            );
+            break;
+        }else{
+            env.log("Pokemon is not shiny.");
+            env.log("Resetting.");
+            send_program_status_notification(
+                env, NOTIFICATION_STATUS_UPDATE,
+                "Resetting."
+            );
+            env.update_stats();
+            context.wait_for_all_requests();
+        }
+    }
+
+    if (GO_HOME_WHEN_DONE){
+        pbf_press_button(context, BUTTON_HOME, 200ms, 1000ms);
+    }
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+}
+
+}
+}
+}
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngHelper.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngHelper.h
new file mode 100644
index 0000000000..3f4e694065
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngHelper.h
@@ -0,0 +1,74 @@
+/*  RNG Helper
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonFRLG_RngHelper_H
+#define PokemonAutomation_PokemonFRLG_RngHelper_H
+
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "Common/Cpp/Options/FloatingPointOption.h"
+#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "Common/Cpp/Options/StaticTextOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "CommonTools/Options/LanguageOCROption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+#include "PokemonFRLG_BlindNavigation.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+class RngHelper_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    RngHelper_Descriptor();
+    struct Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+class RngHelper : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = RngHelper_Descriptor;
+    RngHelper();
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext &context) override;
+    virtual void start_program_border_check(
+        VideoStream& stream,
+        FeedbackType feedback_type
+    ) override{}
+
+private:
+    SectionDividerOption m_game_info;
+    OCR::LanguageOCROption LANGUAGE;
+
+    SectionDividerOption m_target_settings;
+    EnumDropdownOption<PokemonFRLG_RngTarget> TARGET;
+    EnumDropdownOption<SeedButton> SEED_BUTTON;
+    EnumDropdownOption<BlackoutButton> EXTRA_BUTTON;
+    SimpleIntegerOption<uint64_t> SEED_DELAY;
+    SimpleIntegerOption<int64_t> SEED_CALIBRATION;
+    SimpleIntegerOption<uint64_t> CONTINUE_SCREEN_FRAMES;
+    FloatingPointOption CONTINUE_SCREEN_CALIBRATION;
+    SimpleIntegerOption<uint64_t> INGAME_ADVANCES;
+    FloatingPointOption INGAME_CALIBRATION;
+
+    SectionDividerOption m_program_settings;
+    BooleanCheckBoxOption USE_TEACHY_TV;
+    SimpleIntegerOption<uint64_t> NUM_RESETS;
+    SimpleIntegerOption<uint8_t> PROFILE;
+
+    BooleanCheckBoxOption TAKE_VIDEO;
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
+    EventNotificationOption NOTIFICATION_SHINY;
+    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+}
+}
+}
+#endif
+
+
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngLoopRoutines.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngLoopRoutines.cpp
new file mode 100644
index 0000000000..e1e30bf6d4
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngLoopRoutines.cpp
@@ -0,0 +1,333 @@
+/*  RNG Loop Routines
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <algorithm>
+#include <cmath>
+#include "Common/Cpp/Time.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonTools/Random.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "VideoGames/PokemonFRLG/PokemonFRLG_Navigation.h"
+#include "PokemonFRLG_RngNavigation.h"
+#include "PokemonFRLG_RngLoopRoutines.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+namespace {
+    // pull one side out of each (held, pickup) pair, sorted and de-duplicated
+    std::vector<AdvRngState> states_from_pairs(
+        const std::vector<std::pair<AdvRngState, AdvRngState>>& pairs,
+        bool take_first
+    ){
+        std::vector<AdvRngState> states;
+        states.reserve(pairs.size());
+        for (const auto& pair : pairs){
+            states.emplace_back(take_first ? pair.first : pair.second);
+        }
+        std::sort(states.begin(), states.end());
+        states.erase(std::unique(states.begin(), states.end()), states.end());
+        return states;
+    }
+} // namespace
+
+
+void select_calibrations_for_frame(
+    SingleSwitchProgramEnvironment& env,
+    EggCalibrationHistories& hist,
+    const std::vector<uint16_t>& seed_values,
+    const int16_t& seed_position,
+    uint64_t advances,
+    bool pickup_frame,
+    bool previously_hit_held_frame,
+    uint16_t times_not_held
+){
+    RngCalibrations& calibrations = hist.calibrations;
+    const RngCalibrationHistory& egg_history = hist.frame(pickup_frame);
+    const RngCalibrationHistory& wild_history = hist.wild;
+    const RngUncertainHistory& egg_uncertain_history = hist.egg_uncertain;
+
+    if (egg_history.results.size() > 0){
+        calibrations = get_calibrations(env.console, egg_history, seed_values, seed_position, advances, !pickup_frame);
+    }
+    if (wild_history.results.size() > egg_history.results.size()){
+        calibrations.seed_offset = get_seed_calibration_frames(wild_history, seed_values, seed_position);
+        env.log("Updated Seed Calibration (frames): " + std::to_string(calibrations.seed_offset));
+    }
+
+    // if previous resets had uncertain advances, slightly modify the seed delay to try to hit a different target
+    if (pickup_frame){
+        apply_seed_bump(calibrations, egg_uncertain_history);
+    }
+
+    // if the egg isn't ready over several resets,
+    // or if there is repeated uncertainty about advances from previous resets,
+    // bump the advances
+    if (!pickup_frame && !previously_hit_held_frame){
+        if (egg_history.results.empty()){
+            // avoid cumulative bumps when there is no history
+            if (egg_uncertain_history.calibrations.size() > 0){
+                calibrations = egg_uncertain_history.calibrations.back();
+            }else{
+                env.log("No calibration history yet. Using initial calibrations from UI...");
+                calibrations = hist.initial_calibrations;
+            }
+        }
+        double bumpval = std::floor(times_not_held / 4) + std::floor(egg_uncertain_history.results.size() / 2);
+        double advances_bump = std::pow(-1, bumpval) * std::floor((bumpval+1) / 2); // 0, -1, +1, -2, +2...
+        double orig_csf_offset = calibrations.csf_offset;
+        calibrations.csf_offset = fmod(orig_csf_offset + advances_bump, 2);
+        calibrations.ingame_offset += advances_bump - (calibrations.csf_offset - orig_csf_offset);
+    }
+}
+
+
+WildCatchOutcome catch_wild_for_seed_id(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    std::atomic<uint64_t>& errors,
+    EventNotificationOption& error_notification,
+    Language language,
+    const WallClock& timestamp,
+    uint64_t advances,
+    int sweet_scent_from_last,
+    uint64_t& balls_left,
+    const std::set<std::string>& species_list,
+    const RngStatsDatabase& stats_data,
+    AdvObservedPokemon& pokemon,
+    RngStats& species_stats,
+    AdvRngFilters& filters,
+    uint64_t& wild_advances_estimate,
+    const std::function<void(const AdvRngFilters&)>& publish_filters
+){
+    uint32_t rng_wait = 50 * random_u32(0, 20); // avoid hitting the same wild targets
+    pbf_wait(context, std::chrono::milliseconds(rng_wait));
+
+    use_sweet_scent_from_overworld(env.console, context, sweet_scent_from_last);
+
+    WallDuration elapsed = current_time() - timestamp;
+    auto elapsed_ms = std::chrono::duration_cast<Milliseconds>(elapsed);
+    wild_advances_estimate = uint64_t(advances + 2 * elapsed_ms.count() / FRLG_FRAME_DURATION);
+    env.log("Wild advances estimate: " + std::to_string(wild_advances_estimate));
+
+    int ret = watch_for_shiny_encounter(env.console, context);
+    if (ret < 0){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "catch_wild_for_seed_id(): Failed to trigger battle",
+            env.console
+        );
+    }
+    if (ret == 1){
+        return WildCatchOutcome::shiny;
+    }
+
+    int balls_thrown = auto_catch(env.console, context, balls_left);
+    if (balls_thrown < 0){
+        errors++;
+        send_program_recoverable_error_notification(
+            env, error_notification,
+            "auto_catch() encountered an error."
+        );
+        return WildCatchOutcome::failed;
+    }else if(balls_thrown == 0){
+        env.log("Failed catch.");
+        return WildCatchOutcome::failed;
+    }
+
+    balls_left -= balls_thrown;
+
+    go_to_summary(env.console, context);
+    pokemon = read_summary(env.console, context, language, species_list);
+    try{
+        species_stats = stats_data.get_throw(pokemon.species);
+    }catch (const InternalProgramError& err){
+        env.log(err.message());
+        env.log("Failed to load base stats.");
+        return WildCatchOutcome::failed;
+    }
+
+    filters = observation_to_filters(pokemon, species_stats.base_stats, AdvRngMethod::Any);
+    publish_filters(filters);
+    return WildCatchOutcome::caught;
+}
+
+
+bool confirm_held_frame_hit(
+    RngCalibrationHistory& calibration_history,
+    const RngUncertainHistory& egg_uncertain_history,
+    bool locked_in,
+    uint16_t target_seed,
+    uint64_t target_advances
+){
+    if (locked_in){
+        return have_hit_target(target_seed, target_advances, calibration_history.results.back());
+    }
+    // an uncertain history means we can't yet trust the committed results
+    if (egg_uncertain_history.results.size() != 0){
+        return false;
+    }
+
+    // keep only the calibrations that resulted in hitting the target
+    bool confirmed = false;
+    std::vector<AdvRngState> kept_results;
+    std::vector<RngCalibrations> kept_calibrations;
+    for (size_t i = 0; i < calibration_history.results.size(); i++){
+        if (have_hit_target(target_seed, target_advances, calibration_history.results[i])){
+            confirmed = true;
+            kept_results.emplace_back(calibration_history.results[i]);
+            kept_calibrations.emplace_back(calibration_history.calibrations[i]);
+        }
+    }
+    if (confirmed){
+        calibration_history.results = kept_results;
+        calibration_history.calibrations = kept_calibrations;
+    }
+    return confirmed;
+}
+
+
+std::vector<AdvRngState> refine_calibration_with_rare_candy(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    Language language,
+    AdvObservedPokemon& pokemon,
+    AdvRngFilters& filters,
+    const BaseStats& base_stats,
+    RngUncertainHistory& uncertain_history,
+    RngCalibrationHistory& calibration_history,
+    const RngCalibrations& calibrations,
+    uint16_t max_history_length,
+    uint64_t max_rare_candies,
+    AdvRngMethod method,
+    bool safari_zone,
+    std::atomic<uint64_t>& errors,
+    EventNotificationOption& error_notification,
+    const std::function<std::vector<AdvRngState>(AdvRngFilters&)>& run_search,
+    const std::function<void(const std::vector<AdvRngState>&)>& publish_hits,
+    const std::function<void(const AdvRngFilters&)>& publish_filters,
+    const std::function<bool(const std::vector<AdvRngState>&)>& result_determined
+){
+    std::vector<AdvRngState> search_hits = run_search(filters);
+    publish_hits(search_hits);
+
+    bool force_finish = (max_rare_candies == 0) || result_determined(search_hits);
+    bool finished = update_history(
+        env.console, uncertain_history, calibration_history, max_history_length,
+        calibrations, search_hits, 1, 2, force_finish
+    );
+
+    for (uint64_t i = 0; i < max_rare_candies; i++){
+        if (finished){
+            break;
+        }
+
+        bool failed = use_rare_candy(
+            env.console, context, language, pokemon, filters,
+            base_stats, method, safari_zone, i == 0
+        );
+        if (failed){
+            update_history(
+                env.console, uncertain_history, calibration_history,
+                max_history_length, calibrations, search_hits, 1, 2, true
+            );
+            errors++;
+            send_program_recoverable_error_notification(
+                env, error_notification,
+                "Failed to use Rare Candy."
+            );
+        }
+        publish_filters(filters);
+
+        search_hits = run_search(filters);
+        publish_hits(search_hits);
+
+        force_finish = (
+               failed
+            || (i == (max_rare_candies - 1))
+            || result_determined(search_hits)
+        );
+        finished = update_history(
+            env.console, uncertain_history,
+            calibration_history, max_history_length,
+            calibrations, search_hits,
+            1, 2, force_finish
+        );
+    }
+
+    return search_hits;
+}
+
+
+std::vector<AdvRngState> refine_egg_calibration(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    Language language,
+    AdvObservedPokemon& observed_egg,
+    AdvRngFilters& filters,
+    const BaseStats& base_stats,
+    RngUncertainHistory& uncertain_history,
+    RngCalibrationHistory& calibration_history,
+    const RngCalibrations& calibrations,
+    uint16_t max_history_length,
+    uint64_t candies_left,
+    const EggRefineOptions& options,
+    std::atomic<uint64_t>& errors,
+    EventNotificationOption& error_notification,
+    const std::function<std::vector<std::pair<AdvRngState, AdvRngState>>(AdvRngFilters&)>& run_search,
+    const std::function<void(const std::vector<AdvRngState>&)>& publish_hits,
+    const std::function<void(const AdvRngFilters&)>& publish_filters,
+    const std::function<bool(const std::vector<std::pair<AdvRngState, AdvRngState>>&)>& indistinguishable
+){
+    std::vector<std::pair<AdvRngState, AdvRngState>> search_hits = run_search(filters);
+    std::vector<AdvRngState> hits = states_from_pairs(search_hits, options.take_first);
+    publish_hits(hits);
+
+    bool force_finish = (candies_left == 0)
+        || all_equal(hits)
+        || indistinguishable(search_hits);
+    bool finished = update_history(
+        env.console, uncertain_history, calibration_history, max_history_length,
+        calibrations, hits, 1, options.advance_radius, force_finish
+    );
+
+    for (uint64_t i = 0; i < candies_left; i++){
+        if (finished){
+            break;
+        }
+
+        bool failed = use_rare_candy(
+            env.console, context, language, observed_egg, filters,
+            base_stats, AdvRngMethod::Any, false, i == 0, options.from_last
+        );
+        if (failed){
+            errors++;
+            send_program_recoverable_error_notification(
+                env, error_notification,
+                "Failed to use Rare Candy."
+            );
+        }
+        publish_filters(filters);
+
+        search_hits = run_search(filters);
+        hits = states_from_pairs(search_hits, options.take_first);
+        publish_hits(hits);
+
+        force_finish = failed || (i == (candies_left - 1)) || indistinguishable(search_hits);
+        finished = update_history(
+            env.console, uncertain_history, calibration_history, max_history_length,
+            calibrations, hits, 1, options.advance_radius, force_finish
+        );
+    }
+
+    return hits;
+}
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngLoopRoutines.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngLoopRoutines.h
new file mode 100644
index 0000000000..18c0ef90a1
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngLoopRoutines.h
@@ -0,0 +1,178 @@
+/*  RNG Loop Routines
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonFRLG_RngLoopRoutines_H
+#define PokemonAutomation_PokemonFRLG_RngLoopRoutines_H
+
+#include <atomic>
+#include <functional>
+#include <set>
+#include <string>
+#include <utility>
+#include <vector>
+#include "CommonFramework/Language.h"
+#include "CommonFramework/Notifications/EventNotificationOption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "Pokemon/Pokemon_AdvRng.h"
+#include "PokemonFRLG_BlindNavigation.h"
+#include "PokemonFRLG_RngCalibration.h"
+#include "PokemonFRLG_RngStatsDatabase.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+using namespace Pokemon;
+
+
+struct EggCalibrationHistories{
+    const RngCalibrations initial_calibrations;
+    RngCalibrations calibrations;
+    RngUncertainHistory wild_uncertain;
+    RngUncertainHistory egg_uncertain;
+    RngCalibrationHistory wild;
+    RngCalibrationHistory held;
+    RngCalibrationHistory pickup;
+
+    EggCalibrationHistories(RngCalibrations calibrations)
+    : initial_calibrations(calibrations)
+    {};
+
+    RngCalibrationHistory& frame(bool pickup_frame){ return pickup_frame ? pickup : held; }
+
+    void clear_uncertain(){
+        wild_uncertain.results.clear();
+        wild_uncertain.calibrations.clear();
+        egg_uncertain.results.clear();
+        egg_uncertain.calibrations.clear();
+    }
+};
+
+// Per-frame seed configuration: the nearby-seed list, the target's position in it, the seed
+// delay, and the button combination (derived from the seed database) that reaches the seed.
+struct EggFrameTarget{
+    uint64_t seed_delay;
+    std::vector<uint16_t> seed_values;
+    int16_t seed_position;
+    SeedButton seed_button;
+    BlackoutButton extra_button;
+};
+struct EggFrameTargets{
+    EggFrameTarget held;
+    EggFrameTarget pickup;
+
+    const EggFrameTarget& frame(bool pickup_frame) const{ return pickup_frame ? pickup : held; }
+};
+
+// result of catching a wild encounter to identify the current seed
+enum class WildCatchOutcome{
+    shiny,
+    failed,
+    caught
+};
+
+
+// Adjust the calibrations for the upcoming reset for Egg RNG
+void select_calibrations_for_frame(
+    SingleSwitchProgramEnvironment& env,
+    EggCalibrationHistories& hist,
+    const std::vector<uint16_t>& seed_values,
+    const int16_t& seed_position,
+    uint64_t advances,
+    bool pickup_frame,
+    bool previously_hit_held_frame,
+    uint16_t times_not_held
+);
+
+// Catch a wild encounter at the daycare pond and read it, to identify which seed was hit.
+WildCatchOutcome catch_wild_for_seed_id(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    std::atomic<uint64_t>& errors,
+    EventNotificationOption& error_notification,
+    Language language,
+    const WallClock& timestamp,
+    uint64_t advances,
+    int sweet_scent_from_last,
+    uint64_t& balls_left,
+    const std::set<std::string>& species_list,
+    const RngStatsDatabase& stats_data,
+    AdvObservedPokemon& pokemon,
+    RngStats& species_stats,
+    AdvRngFilters& filters,
+    uint64_t& wild_advances_estimate,
+    const std::function<void(const AdvRngFilters&)>& publish_filters
+);
+
+// Returns whether a calibration result confirms the target frame was hit. 
+// When confirmed before locking in by saving, this prunes calibration_history 
+// down to only the entries that hit the target.
+bool confirm_held_frame_hit(
+    RngCalibrationHistory& calibration_history,
+    const RngUncertainHistory& egg_uncertain_history,
+    bool locked_in,
+    uint16_t target_seed,
+    uint64_t target_advances
+);
+
+// Shared Rare Candy refinement loop used by RNG programs
+std::vector<AdvRngState> refine_calibration_with_rare_candy(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    Language language,
+    AdvObservedPokemon& pokemon,
+    AdvRngFilters& filters,
+    const BaseStats& base_stats,
+    RngUncertainHistory& uncertain_history,
+    RngCalibrationHistory& calibration_history,
+    const RngCalibrations& calibrations,
+    uint16_t max_history_length,
+    uint64_t max_rare_candies,
+    AdvRngMethod method,
+    bool safari_zone,
+    std::atomic<uint64_t>& errors,
+    EventNotificationOption& error_notification,
+    const std::function<std::vector<AdvRngState>(AdvRngFilters&)>& run_search,
+    const std::function<void(const std::vector<AdvRngState>&)>& publish_hits,
+    const std::function<void(const AdvRngFilters&)>& publish_filters,
+    const std::function<bool(const std::vector<AdvRngState>&)>& result_determined
+);
+
+// Options describing the small differences between EggRng's held-frame and pickup-frame loops.
+struct EggRefineOptions{
+    bool take_first;
+    uint32_t advance_radius;
+    int from_last;
+};
+
+// Searches with the egg searcher (pairs), extracts one side of each pair, 
+// and levels with Rare Candy until the result is determined (or can't be further narrowed down). 
+// Returns a vector of possible hits after the search completes.
+std::vector<AdvRngState> refine_egg_calibration(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    Language language,
+    AdvObservedPokemon& observed_egg,
+    AdvRngFilters& filters,
+    const BaseStats& base_stats,
+    RngUncertainHistory& uncertain_history,
+    RngCalibrationHistory& calibration_history,
+    const RngCalibrations& calibrations,
+    uint16_t max_history_length,
+    uint64_t candies_left,
+    const EggRefineOptions& options,
+    std::atomic<uint64_t>& errors,
+    EventNotificationOption& error_notification,
+    const std::function<std::vector<std::pair<AdvRngState, AdvRngState>>(AdvRngFilters&)>& run_search,
+    const std::function<void(const std::vector<AdvRngState>&)>& publish_hits,
+    const std::function<void(const AdvRngFilters&)>& publish_filters,
+    const std::function<bool(const std::vector<std::pair<AdvRngState, AdvRngState>>&)>& indistinguishable
+);
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngNavigation.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngNavigation.cpp
new file mode 100644
index 0000000000..498057f0a3
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngNavigation.cpp
@@ -0,0 +1,813 @@
+/*  Rng Navigation
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "NintendoSwitch/NintendoSwitch_ConsoleHandle.h"
+#include "VideoGames/PokemonFRLG/Inference/PokemonFRLG_ShinySymbolDetector.h"
+#include "VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_DialogDetector.h"
+#include "VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_BattleDialogs.h"
+#include "VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_PartyDialogs.h"
+#include "VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_SummaryDetector.h"
+#include "VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_PartyMenuDetector.h"
+#include "VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_BagDetector.h"
+#include "VideoGames/PokemonFRLG/Inference/PokemonFRLG_StatsReader.h"
+#include "VideoGames/PokemonFRLG/Inference/PokemonFRLG_WildEncounterReader.h"
+#include "VideoGames/PokemonFRLG/Inference/PokemonFRLG_PokemonSpriteReader.h"
+#include "VideoGames/PokemonFRLG/Inference/PokemonFRLG_PartyLevelUpReader.h"
+#include "VideoGames/PokemonFRLG/PokemonFRLG_Navigation.h"
+#include "PokemonFRLG_BlindNavigation.h"
+#include "PokemonFRLG_RngCalibration.h"
+#include "PokemonFRLG_RngNavigation.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+using namespace Pokemon;
+
+void go_to_summary(ConsoleHandle& console, ProControllerContext& context, int from_last, StartMenuContext menu_context){
+    // navigate to the specified party slot
+    open_party_menu_from_overworld(console, context, menu_context);
+    for (int i=0; i<(2+from_last); i++){
+        pbf_move_left_joystick(context, {0, +1}, 200ms, 300ms);
+    }
+
+    // open summary
+    SummaryWatcher summary_open(COLOR_RED);
+    context.wait_for_all_requests();
+    int ret = run_until<ProControllerContext>(
+        console, context,
+        [](ProControllerContext& context){
+            pbf_press_button(context, BUTTON_A, 200ms, 1000ms);
+            for (int i=0; i<3; i++){
+                pbf_press_button(context, BUTTON_A, 200ms, 2800ms);
+            }
+        },
+        { summary_open }
+    );
+
+    if (ret < 0){
+        console.log("go_to_summary(): failed to open the summary.");
+    }else{
+        console.log("Summary opened.");
+    }
+}
+
+bool shiny_check_summary(ConsoleHandle& console, ProControllerContext& context, int from_last, StartMenuContext menu_context){
+    go_to_summary(console, context, from_last, menu_context);
+    context.wait_for_all_requests();
+    VideoSnapshot screen = console.video().snapshot();
+    ShinySymbolDetector shiny_checker(COLOR_YELLOW);
+    return shiny_checker.read(console.logger(), screen);
+}
+
+AdvObservedPokemon read_summary(
+    ConsoleHandle& console, ProControllerContext& context, 
+    const Language& language, std::set<std::string> species
+){
+    // read stats
+    PokemonFRLG_Stats stats;
+    StatsReader reader(COLOR_RED);
+
+    console.log("Reading Page 1 (Name, Level, Nature, Gender)...");
+    VideoSnapshot screen1 = console.video().snapshot();
+    reader.read_page1(console.logger(), language, screen1, stats, species);
+
+    SummaryPage2Watcher page_two(COLOR_RED);
+    context.wait_for_all_requests();
+    int ret2 = run_until<ProControllerContext>(
+        console, context,
+        [](ProControllerContext& context){
+            for (int i=0; i<5; i++){
+                pbf_press_dpad(context, DPAD_RIGHT, 200ms, 1800ms);
+            }
+        },
+        { page_two }
+    );
+
+    if (ret2 < 0){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "read_summary(): Failed to detect second summary screen.",
+            console
+        ); 
+    }
+
+    console.log("Reading Page 2 (Stats)...");
+    VideoSnapshot screen2 = console.video().snapshot();
+    reader.read_page2(console.logger(), language, screen2, stats);
+
+    StatReads statreads = {
+        static_cast<int16_t>(stats.hp.value_or(0)),
+        static_cast<int16_t>(stats.attack.value_or(0)),
+        static_cast<int16_t>(stats.defense.value_or(0)),
+        static_cast<int16_t>(stats.sp_attack.value_or(0)),
+        static_cast<int16_t>(stats.sp_defense.value_or(0)),
+        static_cast<int16_t>(stats.speed.value_or(0))
+    };
+
+    AdvGender gender;
+    switch(stats.gender.value_or(SummaryGender::Genderless)){
+    case SummaryGender::Male:
+        gender = AdvGender::Male;
+        break;
+    case SummaryGender::Female:
+        gender = AdvGender::Female;
+        break;
+    default:
+        gender = AdvGender::Any;
+        break;
+    }
+    
+    if (
+           stats.name.empty()
+        || stats.name == "nidoran-m"
+        || stats.name == "nidoran-f"
+    ){
+        SummarySpriteReader sprite_reader(species);
+        ImageMatch::ImageMatchResult result = sprite_reader.read(screen1);
+        if (result.results.size() > 0){
+            stats.name = result.results.begin()->second;
+            console.log("Matched sprite: " + stats.name);
+        }
+    }
+
+    AdvObservedPokemon pokemon = {
+        stats.name,
+        gender,
+        string_to_nature(stats.nature),
+        AdvAbility::Any,
+        { uint8_t(stats.level.value_or(5)) },
+        { statreads },
+        { {0,0,0,0,0,0} },
+        AdvShinyType::Any
+    };
+
+    return pokemon;
+}
+
+bool use_rare_candy(
+    ConsoleHandle& console, 
+    ProControllerContext& context,
+    const Language& language, 
+    AdvObservedPokemon& pokemon,
+    AdvRngFilters& filters,
+    const BaseStats& base_stats,
+    AdvRngMethod method,
+    bool safari_zone,
+    bool first,
+    int from_last
+){
+    // navigate to the bag (only needed for the first use)
+    if (first){
+        open_bag_from_overworld(console, context, safari_zone ? PokemonFRLG::StartMenuContext::SAFARI_ZONE : PokemonFRLG::StartMenuContext::STANDARD);
+        // move left to the correct pocket (in case Teachy TV was used)
+        pbf_move_left_joystick(context, {-1, 0}, 200ms, 800ms);
+        pbf_move_left_joystick(context, {-1, 0}, 200ms, 800ms);
+        pbf_move_left_joystick(context, {-1, 0}, 200ms, 800ms);
+        pbf_move_left_joystick(context, {0, +1}, 200ms, 300ms);
+        pbf_move_left_joystick(context, {0, +1}, 200ms, 300ms);
+        pbf_move_left_joystick(context, {0, +1}, 200ms, 300ms);
+    }
+
+    // use rare candy and watch for the party screen
+    PartyMenuWatcher party_menu(COLOR_RED);
+    context.wait_for_all_requests();
+    int ret = run_until<ProControllerContext>(
+        console, context,
+        [](ProControllerContext& context){
+            for (int i=0; i<5; i++){
+                pbf_press_button(context, BUTTON_A, 200ms, 2800ms);
+            }
+        },
+        { party_menu }
+    );
+    if (ret < 0){
+        console.log("use_rare_candy(): failed to detect party menu."); 
+        return true;
+    }
+
+    // select the last party slot (unknown how full the party is, so we can't detect a particular slot)
+    // only needed on the first use
+    if (first){
+        context.wait_for_all_requests();
+        for (int i=0; i<(2+from_last); i++){
+            pbf_move_left_joystick(context, {0, +1}, 200ms, 300ms);
+        }
+    }
+
+    // watch for level up stats
+    PartyLevelUpWatcher level_up(COLOR_RED, PartyLevelUpDialog::stats, language);
+    context.wait_for_all_requests();
+    int ret2 = run_until<ProControllerContext>(
+        console, context,
+        [](ProControllerContext& context){
+            for (int i=0; i<30; i++){
+                pbf_press_button(context, BUTTON_A, 200ms, 800ms);
+            }
+        },
+        { level_up }
+    );
+    if (ret2 < 0){
+        console.log("use_rare_candy(): failed to detect level-up stats."); 
+        return true;
+    }
+
+    PartyLevelUpReader reader(COLOR_RED);
+    VideoOverlaySet overlays(console.overlay());
+    reader.make_overlays(overlays);
+
+    console.log("Reading stats...");
+    VideoSnapshot screen = console.video().snapshot();
+    StatReads statreads = reader.read_stats(console.logger(), screen);    
+
+    // try to exit the party menu before using the BattleDialogueWatcher,
+    // since the fading party screen can trigger it.
+    pbf_press_button(context, BUTTON_B, 200ms, 1800ms);
+
+    update_filters(filters, pokemon, statreads, {}, base_stats, method);
+
+    // return to the bag (possibly learning a move, but trying to prevent evolution)
+    int attempts = 0;
+    while (true){
+        if (attempts > 25){
+            console.log("use_rare_candy(): failed to return to bag menu.");
+            return true;
+        }
+        BagWatcher bag_menu(COLOR_RED);
+        PartyMoveLearnWatcher move_learn(COLOR_RED);
+        BattleDialogWatcher evolution(COLOR_RED);
+        context.wait_for_all_requests();
+        int ret3 = run_until<ProControllerContext>(
+            console, context,
+            [](ProControllerContext& context){
+                pbf_wait(context, 1000ms);
+                for (int i=0; i<15; i++){
+                    pbf_press_button(context, BUTTON_B, 200ms, 1800ms);
+                }
+            },
+            { bag_menu, move_learn, evolution }
+        );
+        attempts++;
+        switch (ret3){
+        case 0:
+            console.log("Returned to bag.");
+            return false;
+        case 1:
+            console.log("Move learn opportunity detected.");
+            // don't learn move
+            pbf_press_button(context, BUTTON_B, 200ms, 1800ms);
+            pbf_press_button(context, BUTTON_A, 200ms, 2800ms);
+            continue;
+        case 2:
+            console.log("Evolution screen detected.");
+            pbf_press_button(context, BUTTON_B, 200ms, 2800ms);
+            continue;
+        default:
+            console.log("use_rare_candy(): failed to return to bag menu.");
+            return true;
+        }
+    }
+}
+
+void hatch_togepi_egg(ConsoleHandle& console, ProControllerContext& context){
+    // assumes the player is already on a bike and that the nearby trainer has been defeated
+    // cycle to the right
+    pbf_move_left_joystick(context, {+1, 0}, 1000ms, 200ms);
+    pbf_move_left_joystick(context, {-1, 0}, 100ms, 500ms);
+    WhiteDialogWatcher egg_dialog(COLOR_RED);
+    context.wait_for_all_requests();
+    WallClock deadline = current_time() + 600s;
+    console.log("Hatching Togepi egg...");
+    int ret = run_until<ProControllerContext>(
+        console, context,
+        [deadline](ProControllerContext& context){
+            // cycle back and forth
+            while (current_time() < deadline){
+                pbf_move_left_joystick(context, {-1, 0}, 400ms, 0ms);
+                pbf_move_left_joystick(context, {+1, 0}, 400ms, 0ms); 
+            }
+        },
+        { egg_dialog }
+    );
+    if (ret < 0){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "Togepi: failed to hatch egg within 10 minutes. Check your in-game setup.",
+            console
+        );
+    }
+
+    // watch hatching animation and decline nickname
+    pbf_mash_button(context, BUTTON_B, 15000ms);
+    context.wait_for_all_requests();
+}
+
+void hatch_daycare_egg(ConsoleHandle& console, ProControllerContext& context){
+    // assumes the player is already on a bike
+    pbf_move_left_joystick(context, {-1, 0}, 1000ms, 500ms);
+    pbf_move_left_joystick(context, {+1, 0}, 60ms, 440ms);
+    WhiteDialogWatcher egg_dialog(COLOR_RED);
+    context.wait_for_all_requests();
+    WallClock deadline = current_time() + 2700s;
+    console.log("Hatching Day Care egg...");
+    int ret = run_until<ProControllerContext>(
+        console, context,
+        [deadline](ProControllerContext& context){
+            // cycle back and forth
+            while (current_time() < deadline){
+                pbf_move_left_joystick(context, {+1, 0}, 1700ms, 30ms);
+                pbf_move_left_joystick(context, {-1, 0}, 1700ms, 30ms); 
+            }
+        },
+        { egg_dialog }
+    );
+    if (ret < 0){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "Daycare Egg: failed to hatch egg within 45 minutes. Check your in-game setup.",
+            console
+        );
+    }
+
+    // watch hatching animation and decline nickname
+    pbf_mash_button(context, BUTTON_B, 15000ms);
+    context.wait_for_all_requests();
+}
+
+
+void travel_from_celio_to_kanto(ConsoleHandle& console, ProControllerContext& context){
+    // assumes the player is standing on Celio's left (west) side
+    pbf_move_left_joystick(context, {-1, 0}, 1280ms, 300ms);
+    leave_pokecenter(console, context);
+    // walk down to the One Island sign
+    WhiteDialogWatcher dialog_detected(COLOR_RED);
+    int ret = run_until<ProControllerContext>(
+        console, context,
+        [](ProControllerContext& context){
+            // walk down
+            pbf_move_left_joystick(context, {0, -1}, 15000ms, 0ms);
+
+        },
+        { dialog_detected }
+    );
+    if (ret < 0){        
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "travel_from_celio_to_route2(): Failed to detect One Island sign.",
+            console
+        ); 
+    }
+
+    // walk to the ferry and take it to Vermilion
+    pbf_wait(context, 500ms);
+    pbf_move_left_joystick(context, {-1, 0 }, 430ms, 300ms);
+
+    context.wait_for_all_requests();
+    int ret2 = run_until<ProControllerContext>(
+        console, context,
+        [](ProControllerContext& context){
+            // walk down to the sailor and initiate dialog
+            ssf_press_left_joystick(context, {0, -1}, 0ms, 20000ms);
+            ssf_mash1_button(context, BUTTON_A, 20000ms);
+        },
+        { dialog_detected }
+    );
+    if (ret2 < 0){        
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "travel_from_celio_to_route2(): Failed to initiate Seagallop ferry dialogue.",
+            console
+        ); 
+    }
+
+    BlackScreenWatcher black_screen(COLOR_RED);
+    context.wait_for_all_requests();
+    int ret3 = run_until<ProControllerContext>(
+        console, context,
+        [](ProControllerContext& context){
+            // select vermilion (default option) and take ferry
+            pbf_mash_button(context, BUTTON_A, 20000ms);
+        },
+        { black_screen }
+    );
+    if (ret3 < 0){        
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "travel_from_celio_to_kanto(): Failed to initiate Seagallop ferry travel.",
+            console
+        );
+    }
+
+    // fly to pewter city
+    pbf_wait(context, 6000ms);
+    context.wait_for_all_requests();
+    console.log("Arrived at the Vermilion docks.");
+}
+
+void travel_to_route1(ConsoleHandle& console, ProControllerContext& context){
+    open_fly_map_from_overworld(console, context);
+    fly_from_kanto_map(console, context, KantoFlyLocation::pallettown);
+
+    // walk to the boundary of route 1
+    pbf_move_left_joystick(context, {+1, 0}, 1370ms, 300ms);
+    pbf_move_left_joystick(context, {0, +1}, 1450ms, 300ms);
+    pbf_move_left_joystick(context, {+1, 0}, 300ms,  300ms);
+    pbf_move_left_joystick(context, {0, +1}, 800ms, 300ms);
+
+    pbf_wait(context, 500ms);
+    context.wait_for_all_requests();
+    console.log("Arrived at Route 1.");
+}
+
+void use_repel(ConsoleHandle& console, ProControllerContext& context){
+    open_bag_from_overworld(console, context);
+    // move back to the Items pocket in case Teachy TV was used
+    pbf_move_left_joystick(context, {-1, 0}, 500ms, 500ms);
+    pbf_move_left_joystick(context, {-1, 0}, 500ms, 500ms);
+    // Repel is required to be in the 2nd position (Rare Candy is first)
+    for (int i=0; i<4; i++){
+        pbf_move_left_joystick(context, {0, +1}, 200ms, 300ms);
+    }
+    pbf_wait(context, 500ms);
+    pbf_move_left_joystick(context, {0, -1}, 200ms, 300ms);
+    pbf_mash_button(context, BUTTON_A, 2000ms);
+    // exit to overworld
+    pbf_mash_button(context, BUTTON_B, 5000ms);
+    context.wait_for_all_requests();
+    console.log("Used Repel.");
+}
+
+int watch_for_shiny_encounter(ConsoleHandle& console, ProControllerContext& context){
+    BlackScreenWatcher battle_entered(COLOR_RED);
+    context.wait_for_all_requests();
+    int ret = wait_until(
+        console, context, 10000ms,
+        {battle_entered}
+    );
+    if (ret < 0){
+        // OperationFailedExceptionWithScreenshot::fire(
+        //     ErrorReportMode::SEND_ERROR_REPORT,
+        //     "Failed to initiate encounter.",
+        //     console
+        // );
+        return -1;
+    }
+    console.log("Wild encounter started.");
+    bool encounter_shiny = handle_encounter(console, context, false);
+    return encounter_shiny ? 1 : 0;
+}
+
+int encounter_roamer(
+    ConsoleHandle& console, ProControllerContext& context, 
+    Language language, const std::set<std::string>& subset
+){
+    travel_from_celio_to_kanto(console, context);
+    int attempts = 0;
+    while (true){
+        if (attempts >= 250){
+            console.log("encounter_roamer(): Failed to encounter roamer in 250 attempts.");
+            return -1;
+        }
+        if ((attempts % 5) == 0){
+            travel_to_route1(console, context);
+        }
+        if (attempts == 0){
+            use_repel(console, context);
+        }
+
+        context.wait_for_all_requests();
+        pbf_move_left_joystick(context, {0, +1}, 200ms, 800ms);
+        int ret = grass_spin(console, context, true, 8s);
+        if (ret < 0){
+            attempts++;
+            pbf_move_left_joystick(context, {0, -1}, 200ms, 800ms);
+            continue;
+        }else if (ret == 1){
+            return ret;
+        }else{
+            WildEncounterReader reader(COLOR_RED);
+            VideoOverlaySet overlays(console.overlay());
+            reader.make_overlays(overlays);
+            console.log("Reading name...");
+            VideoSnapshot screen = console.video().snapshot();
+            PokemonFRLG_WildEncounter encounter = reader.read_encounter(console.logger(), language, screen, subset);
+            console.log("Name: " + encounter.name);
+
+            if (encounter.name == "pidgey" || encounter.name == "rattata"){
+                flee_battle(console, context);
+                use_repel(console, context);
+                pbf_move_left_joystick(context, {0, -1}, 200ms, 800ms);
+                continue;
+            }
+
+            return ret; // 0
+        }
+    }
+}
+
+bool check_for_shiny(
+    ConsoleHandle& console, ProControllerContext& context, 
+    PokemonFRLG_RngTarget TARGET,
+    Language language, const std::set<std::string>& subset
+){
+    switch (TARGET){
+    case PokemonFRLG_RngTarget::eggheld:
+        return false;
+    case PokemonFRLG_RngTarget::eggpickup:
+        hatch_daycare_egg(console, context);
+        return shiny_check_summary(console, context);
+    case PokemonFRLG_RngTarget::starters:
+        return shiny_check_summary(console, context, -2, StartMenuContext::NO_DEX);
+    case PokemonFRLG_RngTarget::togepi:
+    case PokemonFRLG_RngTarget::togepifast:
+        hatch_togepi_egg(console, context);
+    case PokemonFRLG_RngTarget::magikarp:
+    case PokemonFRLG_RngTarget::hitmonlee:
+    case PokemonFRLG_RngTarget::hitmonchan:
+    case PokemonFRLG_RngTarget::hitmon:
+    case PokemonFRLG_RngTarget::eevee:
+    case PokemonFRLG_RngTarget::lapras:
+    case PokemonFRLG_RngTarget::omanyte:
+    case PokemonFRLG_RngTarget::kabuto:
+    case PokemonFRLG_RngTarget::aerodactyl:
+    case PokemonFRLG_RngTarget::fossils:
+    case PokemonFRLG_RngTarget::gamecornerabra:
+    case PokemonFRLG_RngTarget::gamecornerclefairy:
+    case PokemonFRLG_RngTarget::gamecornerdratinifr:
+    case PokemonFRLG_RngTarget::gamecornerdratinilg:
+    case PokemonFRLG_RngTarget::gamecornerscyther:
+    case PokemonFRLG_RngTarget::gamecornerpinsir:
+    case PokemonFRLG_RngTarget::gamecornerporygon:
+        return shiny_check_summary(console, context);
+    case PokemonFRLG_RngTarget::electrode:
+    case PokemonFRLG_RngTarget::articuno:
+    case PokemonFRLG_RngTarget::zapdos:
+    case PokemonFRLG_RngTarget::moltres:
+    case PokemonFRLG_RngTarget::lugia:
+    case PokemonFRLG_RngTarget::deoxys_attack:
+    case PokemonFRLG_RngTarget::deoxys_defense:
+    case PokemonFRLG_RngTarget::staticencounter:
+    case PokemonFRLG_RngTarget::snorlax:
+    case PokemonFRLG_RngTarget::mewtwo:
+    case PokemonFRLG_RngTarget::hooh:
+    case PokemonFRLG_RngTarget::hypno:
+    case PokemonFRLG_RngTarget::sweetscent:
+    case PokemonFRLG_RngTarget::rocksmash:
+    case PokemonFRLG_RngTarget::fishing:
+    case PokemonFRLG_RngTarget::safarizonecenter:
+    case PokemonFRLG_RngTarget::safarizoneeast:
+    case PokemonFRLG_RngTarget::safarizonenorth:
+    case PokemonFRLG_RngTarget::safarizonewest:
+    case PokemonFRLG_RngTarget::safarizonesurf:
+    case PokemonFRLG_RngTarget::safarizonefish:
+        return watch_for_shiny_encounter(console, context) == 1;
+    case PokemonFRLG_RngTarget::raikou:
+    case PokemonFRLG_RngTarget::entei:
+    case PokemonFRLG_RngTarget::suicune:
+    case PokemonFRLG_RngTarget::roaming:
+        return encounter_roamer(console, context, language, subset) == 1;
+    default:
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "RNG target not recognized. Please report this as a bug.",
+            console
+        );
+    }
+}
+
+
+void use_max_repel(ConsoleHandle& console, ProControllerContext& context){
+    console.log("Using a Max Repel (2nd bag slot from top)...");
+    open_bag_from_overworld(console, context);
+    pbf_move_left_joystick(context, {-1, 0}, 100ms, 900ms);
+    pbf_move_left_joystick(context, {-1, 0}, 100ms, 900ms);
+    pbf_move_left_joystick(context, {-1, 0}, 100ms, 900ms);
+    for (int i=0; i<20; i++){
+        pbf_move_left_joystick(context, {0, +1}, 100ms, 100ms);
+    }
+    pbf_move_left_joystick(context, {0, -1}, 100ms, 300ms);
+
+    pbf_mash_button(context, BUTTON_A, 3000ms);
+    pbf_mash_button(context, BUTTON_B, 5000ms);
+
+}
+
+void daycare_steps(ConsoleHandle& console, ProControllerContext& context){
+    console.log("Taking 250 steps...");
+    // walk down to the south wall
+    pbf_move_left_joystick(context, {0, -1}, 930ms, 570ms);
+    // walk to the southeast corner
+    pbf_move_left_joystick(context, {+1, 0}, 2500ms, 300ms);
+
+    WhiteDialogWatcher repel_over(COLOR_RED);
+    context.wait_for_all_requests();
+    int ret = run_until<ProControllerContext>(
+        console, context,
+        [](ProControllerContext& context){
+            pbf_press_button(context, BUTTON_A, 200ms, 1000ms);
+            for (int i=0; i<20; i++){
+                pbf_move_left_joystick(context, {-1, 0}, 2700ms, 300ms);
+                pbf_move_left_joystick(context, {+1, 0}, 2700ms, 300ms);
+            }
+        },
+        { repel_over }
+    );
+    if (ret < 0){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::NO_ERROR_REPORT,
+            "daycare_steps(): No Max Repel dialogue box detected.",
+            console
+        );
+    }
+
+    console.log("Max Repel wore off. Taking 4 more steps...");
+    pbf_mash_button(context, BUTTON_B, 1000ms);
+
+    // take 4 steps to the left
+    pbf_move_left_joystick(context, {-1, 0}, 200ms, 720ms);
+    pbf_move_left_joystick(context, {-1, 0}, 30ms, 720ms);
+    pbf_move_left_joystick(context, {-1, 0}, 30ms, 720ms);
+    pbf_move_left_joystick(context, {-1, 0}, 30ms, 720ms);
+
+    console.log("254 steps taken.");
+}
+
+bool walk_from_daycare_to_pond(ConsoleHandle& console, ProControllerContext& context){
+    console.log("Walking to the daycare pond...");
+    pbf_move_left_joystick(context, {0, -1}, 190ms, 300ms);
+    pbf_move_left_joystick(context, {+1, 0}, 2470ms, 300ms);
+    pbf_move_left_joystick(context, {0, -1}, 380ms, 300ms);
+
+    // start surfing
+    WhiteDialogWatcher surf_dialog(COLOR_RED);
+
+    context.wait_for_all_requests();
+    int ret = run_until<ProControllerContext>(
+        console, context,
+        [](ProControllerContext& context){
+            ssf_press_left_joystick(context, {0, -1}, 0ms, 10000ms);
+            ssf_mash1_button(context, BUTTON_A, 10000ms);
+        },
+        { surf_dialog }
+    );
+    if (ret < 0){
+        console.log("Failed to detect surf dialog");
+        return true;
+    }
+    console.log("Started surfing.");
+    pbf_mash_button(context, BUTTON_A, 2000ms);
+    context.wait_for_all_requests();
+    return false;
+}
+
+void walk_from_pond_to_daycare_man(ConsoleHandle& console, ProControllerContext& context){
+    console.log("Walking to the daycare man...");
+    pbf_move_left_joystick(context, {0, +1}, 1080ms, 300ms);
+    pbf_move_left_joystick(context, {-1, 0}, 1300ms, 300ms);
+    pbf_move_left_joystick(context, {0, +1}, 300ms, 300ms);
+}
+
+bool smash_daycare_rock(ConsoleHandle& console, ProControllerContext& context){
+    // run to the smashable rock on the beach
+    ssf_press_button(context, BUTTON_B, 200ms, 6400ms);
+    pbf_move_left_joystick(context, {-1, 0}, 1250ms, 200ms);
+    pbf_move_left_joystick(context, {0, -1}, 1350ms, 200ms);
+    pbf_move_left_joystick(context, {-1, 0}, 750ms,  200ms);
+    pbf_move_left_joystick(context, {0, +1}, 2250ms, 300ms);
+
+    // smash rock
+    WhiteDialogWatcher rock_dialog(COLOR_RED);
+    context.wait_for_all_requests();
+    int ret = run_until<ProControllerContext>(
+        console, context,
+        [](ProControllerContext& context){
+            ssf_mash1_button(context, BUTTON_A, 10000ms);
+        },
+        { rock_dialog }
+    );
+    if (ret < 0){
+        console.log("Failed to detect rock smash dialog");
+        return true;
+    }
+    pbf_mash_button(context, BUTTON_A, 2000ms);
+    pbf_mash_button(context, BUTTON_B, 4000ms);
+
+    // run back to the day care man
+    ssf_press_button(context, BUTTON_B, 200ms, 6750ms);
+    pbf_move_left_joystick(context, {0, -1}, 2250ms, 200ms);
+    pbf_move_left_joystick(context, {+1, 0}, 600ms,  200ms);
+    pbf_move_left_joystick(context, {0, +1}, 2000ms, 200ms);
+    pbf_move_left_joystick(context, {+1, 0}, 1000ms, 500ms);
+    
+    pbf_move_left_joystick(context, {0, -1}, 200ms, 300ms);
+    pbf_move_left_joystick(context, {+1, 0}, 200ms, 300ms);
+    pbf_move_left_joystick(context, {0, +1}, 200ms, 300ms);
+    return false;
+}
+
+void egg_pickup(ConsoleHandle& console, ProControllerContext& context){
+    console.log("Picking up egg...");
+
+    // Clear the save dialogue, if it is open
+    WhiteDialogOverWatcher dialogue_cleared(COLOR_RED);
+    context.wait_for_all_requests();
+    int ret = run_until<ProControllerContext>(
+        console, context,
+        [](ProControllerContext& context){
+            pbf_mash_button(context, BUTTON_B, 5000ms);
+        },
+        { dialogue_cleared }
+    );
+    if (ret < 0){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "egg_pickup(): Failed to clear dialogue before talking to the daycare man.",
+            console
+        );
+    }
+
+    // Talk to the daycare man and wait for the egg prompt.
+    SelectionDialogWatcher egg_prompt(COLOR_RED);
+    context.wait_for_all_requests();
+    ret = run_until<ProControllerContext>(
+        console, context,
+        [](ProControllerContext& context){
+            for (int i=0; i<12; i++){
+                pbf_press_button(context, BUTTON_A, 200ms, 800ms);
+            }
+        },
+        { egg_prompt }
+    );
+    if (ret < 0){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "egg_pickup(): Failed to detect the egg selection dialogue.",
+            console
+        );
+    }
+    console.log("Egg selection dialogue detected. Taking the egg...");
+
+    // accept the egg
+    pbf_mash_button(context, BUTTON_A, 1000ms);
+
+    // clear the rest of the dialogue
+    WhiteDialogOverWatcher dialogue_over(COLOR_RED);
+    context.wait_for_all_requests();
+    ret = run_until<ProControllerContext>(
+        console, context,
+        [](ProControllerContext& context){
+            pbf_mash_button(context, BUTTON_B, 10000ms);
+        },
+        { dialogue_over }
+    );
+    if (ret < 0){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "egg_pickup(): Failed to return to the overworld after taking the egg.",
+            console
+        );
+    }
+    context.wait_for_all_requests();
+
+    console.log("Egg picked up.");
+}
+
+bool walk_from_daycare_man_to_pond(ConsoleHandle& console, ProControllerContext& context){
+    console.log("Walking to the daycare man...");
+    pbf_move_left_joystick(context, {0, -1}, 380ms, 300ms);
+    pbf_move_left_joystick(context, {+1, 0}, 1340ms, 300ms);
+    pbf_move_left_joystick(context, {0, -1}, 300ms, 300ms);
+
+    // start surfing
+    WhiteDialogWatcher surf_dialog(COLOR_RED);
+
+    context.wait_for_all_requests();
+    int ret = run_until<ProControllerContext>(
+        console, context,
+        [](ProControllerContext& context){
+            ssf_press_left_joystick(context, {0, -1}, 0ms, 10000ms);
+            ssf_mash1_button(context, BUTTON_A, 10000ms);
+        },
+        { surf_dialog }
+    );
+    if (ret < 0){
+        console.log("Failed to detect surf dialog");
+        return true;
+    }
+    console.log("Started surfing.");
+    pbf_mash_button(context, BUTTON_A, 2000ms);
+    context.wait_for_all_requests();
+    return false;
+}
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngNavigation.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngNavigation.h
new file mode 100644
index 0000000000..6179ca74cf
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngNavigation.h
@@ -0,0 +1,91 @@
+/*  Rng Navigation
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonFRLG_RngNavigation_H
+#define PokemonAutomation_PokemonFRLG_RngNavigation_H
+
+#include "CommonFramework/Language.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+#include "Pokemon/Pokemon_AdvRng.h"
+#include "VideoGames/PokemonFRLG/PokemonFRLG_Navigation.h"
+#include "PokemonFRLG_BlindNavigation.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+    class ConsoleHandle;
+    class ProController;
+    using ProControllerContext = ControllerContext<ProController>;
+namespace PokemonFRLG{
+
+using namespace Pokemon;
+
+static const std::set<std::string> ROAMER_ROUTE1_SUBSET = { 
+    "raikou", "suicune", "entei", "rattata", "pidgey" 
+};
+    
+void go_to_summary(
+    ConsoleHandle& console, 
+    ProControllerContext& context, 
+    int from_last = 0, 
+    StartMenuContext menu_context = StartMenuContext::STANDARD
+);
+
+bool shiny_check_summary(
+    ConsoleHandle& console, ProControllerContext& context, 
+    int from_last = 0, StartMenuContext menu_context = StartMenuContext::STANDARD
+);
+
+AdvObservedPokemon read_summary(
+    ConsoleHandle& console, 
+    ProControllerContext& context, 
+    const Language& language, 
+    std::set<std::string> species = {}
+);
+
+bool use_rare_candy(
+    ConsoleHandle& console, 
+    ProControllerContext& context,
+    const Language& language, 
+    AdvObservedPokemon& pokemon,
+    AdvRngFilters& filters,
+    const BaseStats& base_stats,
+    AdvRngMethod method = AdvRngMethod::Method1,
+    bool safari_zone = false,
+    bool first = false,
+    int from_last = 0
+);
+
+int watch_for_shiny_encounter(ConsoleHandle& console, ProControllerContext& context);
+
+int encounter_roamer(
+    ConsoleHandle& console, ProControllerContext& context, 
+    Language language, const std::set<std::string>& subset
+);
+
+bool check_for_shiny(
+    ConsoleHandle& console, ProControllerContext& context, 
+    PokemonFRLG_RngTarget TARGET,
+    Language language = Language::English, 
+    const std::set<std::string>& subset = ROAMER_ROUTE1_SUBSET
+);
+
+void hatch_daycare_egg(ConsoleHandle& console, ProControllerContext& context);
+
+
+// Daycare (Four Island) navigation for egg RNG.
+// bool methods return true when they fail to start surfing or smash the rock
+void use_max_repel(ConsoleHandle& console, ProControllerContext& context);
+void daycare_steps(ConsoleHandle& console, ProControllerContext& context);
+bool walk_from_daycare_to_pond(ConsoleHandle& console, ProControllerContext& context);
+void walk_from_pond_to_daycare_man(ConsoleHandle& console, ProControllerContext& context);
+bool smash_daycare_rock(ConsoleHandle& console, ProControllerContext& context);
+void egg_pickup(ConsoleHandle& console, ProControllerContext& context);
+bool walk_from_daycare_man_to_pond(ConsoleHandle& console, ProControllerContext& context);
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngStatsDatabase.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngStatsDatabase.cpp
new file mode 100644
index 0000000000..bb35deccdc
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngStatsDatabase.cpp
@@ -0,0 +1,75 @@
+/*  RNG Stats Database
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Json/JsonValue.h"
+#include "Common/Cpp/Json/JsonObject.h"
+#include "Common/Cpp/Json/JsonArray.h"
+#include "CommonFramework/GlobalAutoPaths.h"
+#include "PokemonFRLG_RngStatsDatabase.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+
+RngStatsDatabase::RngStatsDatabase(const char* json_path){
+    std::string path = RESOURCE_PATH() + json_path;
+    JsonValue json = load_json_file(path);
+    JsonObject& root = json.to_object_throw(path);
+
+    for (auto& item : root){
+        const std::string& slug = item.first;
+        JsonObject& obj = item.second.to_object_throw(path);
+        std::vector<uint8_t> readstats;
+        JsonArray& statsarr = obj.get_array_throw("baseStats", path);
+        for (auto& stat : statsarr){
+            auto statval = stat.to_integer_throw();
+            readstats.emplace_back(uint8_t(statval));
+        }
+        if (readstats.size() != 6){
+            throw FileException(nullptr, PA_CURRENT_FUNCTION, "Invalid length for base stats.", path);
+        }
+        BaseStats base_stats = { readstats[0], readstats[1], readstats[2], readstats[3], readstats[4], readstats[5] };
+
+        int16_t gender_threshold = int16_t(obj.get_integer_throw("genderThreshold", path));
+
+        RngStats rng_stats = { base_stats, gender_threshold };
+
+        m_database.emplace(
+            slug,
+            rng_stats
+        );
+    }
+}
+
+const RngStats& RngStatsDatabase::get_throw(const std::string& slug) const{
+    std::string sl = slug;
+    if (slug.find("unown") != std::string::npos){
+        sl = "unown";
+    }
+    auto iter = m_database.find(sl);
+    if (iter == m_database.end()){
+        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Slug not found in database: " + sl);
+    }
+    return iter->second;
+}
+const RngStats* RngStatsDatabase::get_nothrow(const std::string& slug) const{
+    std::string sl = slug;
+    if (slug.find("unown") != std::string::npos){
+        sl = "unown";
+    }
+    auto iter = m_database.find(sl);
+    if (iter == m_database.end()){
+        return nullptr;
+    }
+    return &iter->second;
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngStatsDatabase.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngStatsDatabase.h
new file mode 100644
index 0000000000..c4b93139fe
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngStatsDatabase.h
@@ -0,0 +1,51 @@
+/*  RNG Database
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonFRLG_RngStatsDatabase_H
+#define PokemonAutomation_PokemonFRLG_RngStatsDatabase_H
+
+#include <map>
+#include "Pokemon/Pokemon_AdvRng.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+using namespace Pokemon;
+
+struct RngStats{
+    BaseStats base_stats;
+    int16_t gender_threshold;
+    // std::vector<string> abilities;
+};
+
+class RngStatsDatabase{
+public:
+    RngStatsDatabase(const char* json_path);
+    const RngStats& get_throw(const std::string& slug) const;
+    const RngStats* get_nothrow(const std::string& slug) const;
+
+public:
+    using const_iterator = std::map<std::string, RngStats>::const_iterator;
+    using       iterator = std::map<std::string, RngStats>::iterator;
+
+    const_iterator cbegin   () const{ return m_database.cbegin(); }
+    const_iterator begin    () const{ return m_database.begin(); }
+          iterator begin    (){ return m_database.begin(); }
+    const_iterator cend   () const{ return m_database.cend(); }
+    const_iterator end    () const{ return m_database.end(); }
+          iterator end    (){ return m_database.end(); }
+
+private:
+    std::map<std::string, RngStats> m_database;
+};
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RoamingLegendaryRng.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RoamingLegendaryRng.cpp
new file mode 100644
index 0000000000..fe284e8a2c
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RoamingLegendaryRng.cpp
@@ -0,0 +1,460 @@
+/*  Roaming Legendary RNG
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Strings/StringTools.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonFramework/Language.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonFRLG/PokemonFRLG_Navigation.h"
+#include "PokemonFRLG_RngNavigation.h"
+#include "PokemonFRLG_HardReset.h"
+#include "PokemonFRLG_RngCalibration.h"
+#include "PokemonFRLG_RngLoopRoutines.h"
+#include "PokemonFRLG_RoamingLegendaryRng.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+
+RoamingLegendaryRng_Descriptor::RoamingLegendaryRng_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonFRLG:RoamingLegendaryRng",
+        Pokemon::STRING_POKEMON + " FRLG", "Roaming Legendary RNG",
+        "Programs/PokemonFRLG/RoamingLegendaryRng.html",
+        "Automatically calibrate timings to hit a specific RNG target for FRLG Roaming Legendary " + STRING_POKEMON,
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_RequiresPrecision,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+struct RoamingLegendaryRng_Descriptor::Stats : public StatsTracker{
+    Stats()
+        : resets(m_stats["Resets"])
+        , shinies(m_stats["Shinies"])
+        , nonshiny(m_stats["Non-Shiny Hits"])
+        , errors(m_stats["Errors"])
+    {
+        m_display_order.emplace_back("Resets");
+        m_display_order.emplace_back("Shinies");
+        m_display_order.emplace_back("Non-Shiny Hits", HIDDEN_IF_ZERO);
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+    }
+    std::atomic<uint64_t>& resets;
+    std::atomic<uint64_t>& shinies;
+    std::atomic<uint64_t>& nonshiny;
+    std::atomic<uint64_t>& errors;
+};
+std::unique_ptr<StatsTracker> RoamingLegendaryRng_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+RoamingLegendaryRng::~RoamingLegendaryRng(){
+    SEED.remove_listener(*this);
+}
+
+RoamingLegendaryRng::RoamingLegendaryRng()
+    : m_calibration_displays(
+        "<font size=4><b>Calibration Displays</b></font> — These will update automatically as the program runs"
+    )
+    , m_game_info(
+        "<font size=4><b>Game Information</b></font>"
+    )
+    , GAME_VERSION(
+        "<b>Game Version:</b>",
+        {
+            {GameVersion::firered, "firered", "FireRed"},
+            {GameVersion::leafgreen, "leafgreen", "LeafGreen"}
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        GameVersion::firered
+    )
+    , LANGUAGE(
+        "<b>Game Language:</b>",
+        {
+            Language::English,
+            Language::Japanese,
+            Language::Spanish,
+            Language::French,
+            Language::German,
+            Language::Italian,
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        true
+    )
+    , SOUND(
+        "<b>Sound:</b><br>"
+        "Your in-game sound setting. This affects the possible seeds.",
+        {
+            {SoundSetting::Mono, "mono", "Mono"},
+            {SoundSetting::Stereo, "stereo", "Stereo"}
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        SoundSetting::Mono
+    )
+    , m_target_settings(
+        "<font size=4><b>Target Settings</b></font> — Get these from an RNG search tool"
+    )
+    , TARGET(
+        "<b>Target:</b>",
+        {
+            {PokemonFRLG_RngTarget::raikou, "raikou", "Raikou"},
+            {PokemonFRLG_RngTarget::entei, "entei", "Entei"},
+            {PokemonFRLG_RngTarget::suicune, "suicune", "Suicune"},
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        PokemonFRLG_RngTarget::raikou
+    )    
+    , SEED(
+        false,
+        "<b>Target Seed:</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        "70FE", "70FE"
+    )
+    , ADVANCES(
+        "<b>Advances:</b><br>The total number of RNG advances for your target.",
+        LockMode::LOCK_WHILE_RUNNING,
+        10000, 520, 1000000000 // default, min, max
+    )
+    , m_program_settings(
+        "<font size=4><b>Program Settings</b></font>"
+    )
+    , USE_TEACHY_TV(
+        "<b>Use Teachy TV:</b>"
+        "<br>Opens the Teachy TV to quickly advance the RNG at 313x speed.<br>"
+        "<i>Warning: can result in larger misses.</i>",
+        LockMode::LOCK_WHILE_RUNNING,
+        false // default
+    )
+    , SEED_RADIUS(
+        "<b>Nearby Seed Radius:</b><br>"
+        "The number of nearby seeds on each side of the target to search when identifying which seed was hit.",
+        LockMode::LOCK_WHILE_RUNNING,
+        5, 1 // default, min
+    )
+    , MAX_RESETS(
+        "<b>Max Resets:</b>",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        50, 0 // default, min
+    )
+    , MAX_RARE_CANDIES(
+        "<b>Max Rare Candies:</b><br>"
+        "The number of rare candies in your bag. Make sure these are at the top position of the bag.<br>"
+        "Rare candies used during calibration will be restored after resetting.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        0, 0, 50 // default, min, max
+    )
+    , MAX_BALL_THROWS(
+        "<b>Max Balls Thrown:</b><br>"
+        "The number of " + STRING_POKEBALL + "s in your bag to attempt to throw. Make sure these are at the top position of the bag.<br>"
+        "Balls thrown during calibration will be restored after resetting.<br>"
+        "<i>Master Balls are strongly recommended for Roaming Legendary RNG.</i>",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        30, 1, 999 // default, min, max
+    )
+    , PROFILE(
+        "<b>User Profile Position:</b><br>"
+        "The position, from left to right, of the Switch profile with the FRLG save you'd like to use.<br>"
+        "If this is set to 0, Switch 1 defaults to the last-used profile, while Switch 2 defaults to the first profile (position 1)",
+        LockMode::LOCK_WHILE_RUNNING,
+        0, 0, 8 // default, min, max
+    )
+    , TAKE_VIDEO(
+        "<b>Take Video:</b><br>Record a video when the shiny is found.", 
+        LockMode::LOCK_WHILE_RUNNING, 
+        true // default
+    )
+    , GO_HOME_WHEN_DONE(true)
+    , NOTIFICATION_SHINY(
+        "Shiny found",
+        true, true, ImageAttachmentMode::JPG,
+        {"Notifs", "Showcase"}
+    )
+    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_SHINY,
+        &NOTIFICATION_STATUS_UPDATE,
+        &NOTIFICATION_PROGRAM_FINISH,
+    })
+{
+    PA_ADD_OPTION(m_calibration_displays);
+    PA_ADD_OPTION(RNG_TARGET);
+    PA_ADD_OPTION(RNG_FILTERS);
+    PA_ADD_OPTION(RNG_CALIBRATION);
+    PA_ADD_OPTION(m_game_info);
+    PA_ADD_OPTION(GAME_VERSION);
+    PA_ADD_OPTION(LANGUAGE);
+    PA_ADD_OPTION(SOUND);
+    PA_ADD_OPTION(m_target_settings);
+    PA_ADD_OPTION(TARGET);
+    PA_ADD_OPTION(SEED);
+    PA_ADD_OPTION(ADVANCES);
+    PA_ADD_OPTION(m_program_settings);
+    PA_ADD_OPTION(USE_TEACHY_TV);
+    PA_ADD_OPTION(SEED_RADIUS);
+    PA_ADD_OPTION(MAX_RESETS);
+    PA_ADD_OPTION(MAX_RARE_CANDIES);
+    PA_ADD_OPTION(MAX_BALL_THROWS);
+    PA_ADD_OPTION(PROFILE);
+    PA_ADD_OPTION(TAKE_VIDEO);
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+    PA_ADD_OPTION(NOTIFICATIONS);
+
+    SEED.add_listener(*this);
+}
+
+void RoamingLegendaryRng::on_config_value_changed(void* object){
+    if (object == &SEED){
+        SEED.set(StringTools::strip(static_cast<std::string>(SEED)));
+        return;
+    }
+}
+
+
+
+void RoamingLegendaryRng::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    /*
+    * Settings: Text Speed fast
+    */
+
+    RoamingLegendaryRng_Descriptor::Stats& stats = env.current_stats<RoamingLegendaryRng_Descriptor::Stats>();
+
+    home_black_border_check(env.console, context);
+
+    RNG_FILTERS.reset();
+    RNG_CALIBRATION.reset_hits();
+
+    const uint16_t TARGET_SEED = parse_seed(env.console, SEED);
+    SeedsDatabase seeds_db(seeds_json_path(GAME_VERSION == GameVersion::firered, LANGUAGE));
+    const SeedMatch seed_match = seeds_db.find_seed(TARGET_SEED, SOUND, SEED_RADIUS);
+    if (!seed_match.found){
+        throw UserSetupError(env.console, "The target Seed was not found in the seed database for this game version, language, and sound setting.");
+    }
+    const std::vector<uint16_t> SEED_VALUES = seed_match.seed_values;
+    const int16_t SEED_POSITION = seed_match.seed_position;
+    const uint64_t SEED_DELAY = seed_match.seed_delay;
+    const SeedButton SEED_BUTTON = seed_match.seed_button;
+    const BlackoutButton EXTRA_BUTTON = seed_match.extra_button;
+    env.log("Seed delay: " + std::to_string(SEED_DELAY) + "ms, button mode: " + seed_match.button_mode
+        + ", column: " + seed_match.column_name);
+
+    BaseStats BASE_STATS;
+    int16_t GENDER_THRESHOLD = -1;
+    switch (TARGET){
+    case PokemonFRLG_RngTarget::raikou:
+        BASE_STATS = { 90, 85, 75, 115, 100, 115 };
+        GENDER_THRESHOLD = -1;
+        break;
+    case PokemonFRLG_RngTarget::entei:
+        BASE_STATS = { 115, 115, 85, 90, 75, 100 };
+        GENDER_THRESHOLD = -1;
+        break;
+    case PokemonFRLG_RngTarget::suicune:
+        BASE_STATS = { 100, 75, 115, 90, 115, 85 };
+        GENDER_THRESHOLD = -1;
+        break;
+    default:
+        break;
+    }
+
+    static const int64_t FIXED_SEED_OFFSET = -845; // milliseconds, approximate
+
+    static const uint64_t CONTINUE_SCREEN_FRAMES = 200;
+
+    const uint64_t INITIAL_ADVANCES_RADIUS = USE_TEACHY_TV ? 4096 : 1024;
+
+    const uint8_t MAX_HISTORY_LENGTH = USE_TEACHY_TV ? 2 : 10;
+
+    env.log("RNG Target: " + std::to_string(TARGET.current_value()));
+    env.log("Target Seed: " + to_hex_string(TARGET_SEED));
+    env.log("Target Advances: " + std::to_string(ADVANCES));
+
+    AdvRngSearcher searcher(TARGET_SEED, ADVANCES, AdvRngMethod::Method1, true);
+    AdvPokemonResult target_result = searcher.generate_pokemon();
+    RNG_TARGET.set_target(target_result, GENDER_THRESHOLD);
+    log_target_pokemon(env.console, target_result);
+
+    RngCalibrations calibrations = {
+        RNG_CALIBRATION.seed_calibration / FRLG_FRAME_DURATION,
+        RNG_CALIBRATION.csf_calibration,
+        RNG_CALIBRATION.advances_calibration
+    };
+    log_calibrations(env.console, calibrations, true);
+
+    Milliseconds launch_delay = INITIAL_LAUNCH_DELAY;
+
+    RngUncertainHistory uncertain_history;
+    RngCalibrationHistory calibration_history; 
+
+    uint16_t failed_to_encounter = 0;
+    uint16_t failed_searches = 0;
+
+    while (true){
+        if (calibration_history.results.size() > 0){
+            env.log("Checking for nonshiny target hit...");
+            if (have_hit_target(TARGET_SEED, ADVANCES, calibration_history.results.back())){
+                env.log("Target Hit!");
+                stats.nonshiny++;
+                break;
+            }
+            env.log("Missed target.");
+        }
+
+        if (failed_searches >= 5){
+            env.log("Failed to find any matches 5 times in a row");
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::NO_ERROR_REPORT,
+                "Failed to find any matches 5 times in a row. Check your seed and advances settings.",
+                env.console
+            ); 
+            break;
+        }
+
+        if (failed_to_encounter >= 5){
+            env.log("Failed to encounter the Roaming Legendary 5 times in a row");
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::NO_ERROR_REPORT,
+                "Failed to encounter the Roaming Legendary 5 times in a row",
+                env.console
+            ); 
+            break;
+        }
+
+        if (stats.resets > MAX_RESETS){
+            env.log("Max resets reached.");
+            break;
+        }
+
+        send_program_status_notification(
+            env, NOTIFICATION_STATUS_UPDATE,
+            "Calibrating."
+        );
+        env.update_stats();
+
+
+        uint64_t advances_radius = get_advances_radius(env.console, calibration_history, INITIAL_ADVANCES_RADIUS);
+
+        if (calibration_history.results.size() > 0){
+            calibrations = get_calibrations(env.console, calibration_history, SEED_VALUES, SEED_POSITION, ADVANCES);
+        }
+
+        // if previous resets had uncertain advances, slightly modify the seed delay to try to hit a different target
+        apply_seed_bump(calibrations, uncertain_history);
+
+        uint64_t ingame_advances = ADVANCES - CONTINUE_SCREEN_FRAMES;
+
+        RngTimings timings = prepare_timings(
+            env.console, TARGET,
+            SEED_DELAY, CONTINUE_SCREEN_FRAMES, ingame_advances,
+            USE_TEACHY_TV, calibrations,
+            FIXED_SEED_OFFSET, LANGUAGE
+        );
+
+        env.log("Resetting Game...");
+        reset_and_perform_blind_sequence(
+            env.console, context, LANGUAGE, TARGET, 
+            SEED_BUTTON, EXTRA_BUTTON, timings, 
+            launch_delay, false, PROFILE
+        );
+        stats.resets++; 
+
+        RNG_FILTERS.reset();
+        RNG_CALIBRATION.set_calibrations(calibrations);
+        RNG_CALIBRATION.reset_hits();
+
+        int ret = encounter_roamer(env.console, context, LANGUAGE, ROAMER_ROUTE1_SUBSET);
+        if (ret < 0){
+            failed_to_encounter++;
+            continue;
+        }
+        failed_to_encounter = 0;
+        bool shiny_found = (ret == 1);
+
+        if (shiny_found){
+            env.log("Shiny found!");
+            stats.shinies++;
+            RNG_CALIBRATION.hits.set("Shiny!");
+            send_program_notification(
+                env,
+                NOTIFICATION_SHINY,
+                COLOR_YELLOW,
+                "Shiny found!",
+                {}, "",
+                env.console.video().snapshot(),
+                true
+            );
+            if (TAKE_VIDEO){
+                pbf_press_button(context, BUTTON_CAPTURE, 2000ms, 0ms);
+            }
+            break;
+        }
+
+        int balls_thrown = auto_catch(env.console, context, MAX_BALL_THROWS);
+        if (balls_thrown < 0){
+            stats.errors++;
+            send_program_recoverable_error_notification(
+                env, NOTIFICATION_ERROR_RECOVERABLE,
+                "auto_catch() encountered an error."
+            ); 
+            continue;
+        }else if(balls_thrown == 0){
+            env.log("Failed catch.");
+            continue;
+        }
+
+        go_to_summary(env.console, context);
+        AdvObservedPokemon pokemon = read_summary(env.console, context, LANGUAGE, ROAMER_ROUTE1_SUBSET);
+        pokemon.level[0] = 50;
+        AdvRngFilters filters = observation_to_filters(pokemon, BASE_STATS);
+        filters.ivs.defense = {0,0};
+        filters.ivs.spatk   = {0,0};
+        filters.ivs.spdef   = {0,0};
+        filters.ivs.speed   = {0,0};
+        RNG_FILTERS.set(filters);
+
+        std::vector<AdvRngState> search_hits = refine_calibration_with_rare_candy(
+            env, context, LANGUAGE, pokemon, filters, BASE_STATS,
+            uncertain_history, calibration_history, calibrations,
+            MAX_HISTORY_LENGTH, MAX_RARE_CANDIES, AdvRngMethod::Method1, false,
+            stats.errors, NOTIFICATION_ERROR_RECOVERABLE,
+            [&](AdvRngFilters& f){
+                f.ivs.defense = {0,0};
+                f.ivs.spatk   = {0,0};
+                f.ivs.spdef   = {0,0};
+                f.ivs.speed   = {0,0};
+                return get_search_results(env.console, searcher, f, SEED_VALUES, ADVANCES, advances_radius, GENDER_THRESHOLD);
+            },
+            [&](const std::vector<AdvRngState>& h){ RNG_CALIBRATION.set_hits(h); },
+            [&](const AdvRngFilters& f){ RNG_FILTERS.set(f); },
+            [&](const std::vector<AdvRngState>& h){
+                return all_equal(h) || all_indistinguishable(h, searcher, GENDER_THRESHOLD);
+            }
+        );
+
+        env.log("RNG search finished.");
+        update_failed_searches(failed_searches, search_hits);
+
+    }
+
+    if (GO_HOME_WHEN_DONE){
+        pbf_press_button(context, BUTTON_HOME, 200ms, 1000ms);
+    }
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RoamingLegendaryRng.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RoamingLegendaryRng.h
new file mode 100644
index 0000000000..f53f60a6ce
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RoamingLegendaryRng.h
@@ -0,0 +1,84 @@
+/*  Roaming Legendary RNG
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonFRLG_RoamingLegendaryRng_H
+#define PokemonAutomation_PokemonFRLG_RoamingLegendaryRng_H
+
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "Common/Cpp/Options/StaticTextOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "CommonTools/Options/LanguageOCROption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+#include "PokemonFRLG_BlindNavigation.h"
+#include "PokemonFRLG_RngDisplays.h"
+#include "PokemonFRLG_SeedsDatabase.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+class RoamingLegendaryRng_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    RoamingLegendaryRng_Descriptor();
+    struct Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+class RoamingLegendaryRng : public SingleSwitchProgramInstance, private ConfigOption::Listener{
+public:
+    using Descriptor = RoamingLegendaryRng_Descriptor;
+    ~RoamingLegendaryRng();
+    RoamingLegendaryRng();
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext &context) override;
+    virtual void start_program_border_check(
+        VideoStream& stream,
+        FeedbackType feedback_type
+    ) override{}
+
+private:
+    virtual void on_config_value_changed(void* object) override;
+
+    enum class GameVersion{
+        firered,
+        leafgreen
+    };
+
+    SectionDividerOption m_calibration_displays;
+    RngTargetDisplay RNG_TARGET;
+    RngFilterDisplay RNG_FILTERS;
+    RngCalibrationDisplay RNG_CALIBRATION;
+
+    SectionDividerOption m_game_info;
+    EnumDropdownOption<GameVersion> GAME_VERSION;
+    OCR::LanguageOCROption LANGUAGE;
+    EnumDropdownOption<SoundSetting> SOUND;
+
+    SectionDividerOption m_target_settings;
+    EnumDropdownOption<PokemonFRLG_RngTarget> TARGET;
+    StringOption SEED;
+    SimpleIntegerOption<uint64_t>ADVANCES;
+
+    SectionDividerOption m_program_settings;
+    BooleanCheckBoxOption USE_TEACHY_TV;
+    SimpleIntegerOption<uint16_t> SEED_RADIUS;
+    SimpleIntegerOption<uint64_t> MAX_RESETS;
+    SimpleIntegerOption<uint64_t> MAX_RARE_CANDIES;
+    SimpleIntegerOption<uint64_t> MAX_BALL_THROWS;
+    SimpleIntegerOption<uint8_t> PROFILE;
+
+    BooleanCheckBoxOption TAKE_VIDEO;
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
+    EventNotificationOption NOTIFICATION_SHINY;
+    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_SeedsDatabase.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_SeedsDatabase.cpp
new file mode 100644
index 0000000000..6bbc0a28cf
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_SeedsDatabase.cpp
@@ -0,0 +1,182 @@
+/*  Seeds Database
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Exceptions.h"
+#include "Common/Cpp/Json/JsonValue.h"
+#include "Common/Cpp/Json/JsonObject.h"
+#include "Common/Cpp/Json/JsonArray.h"
+#include "CommonFramework/GlobalAutoPaths.h"
+#include "PokemonFRLG_SeedsDatabase.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+
+std::string seeds_json_path(bool firered, Language language){
+    std::string version = firered ? "FR" : "LG";
+    std::string lang = (language == Language::Japanese) ? "Jpn" : "Eng";
+    return "PokemonFRLG/RngSeeds/" + version + "_" + lang + ".json";
+}
+
+
+namespace{
+
+uint16_t parse_hex_seed(const std::string& text, const std::string& path){
+    try{
+        size_t consumed = 0;
+        unsigned long value = std::stoul(text, &consumed, 16);
+        if (consumed != text.size() || value > 0xFFFF){
+            throw FileException(nullptr, PA_CURRENT_FUNCTION, "Invalid seed value: " + text, path);
+        }
+        return uint16_t(value);
+    }catch (const std::invalid_argument&){
+        throw FileException(nullptr, PA_CURRENT_FUNCTION, "Invalid seed value: " + text, path);
+    }catch (const std::out_of_range&){
+        throw FileException(nullptr, PA_CURRENT_FUNCTION, "Invalid seed value: " + text, path);
+    }
+}
+
+// Column names have the form "<Sound> / <Button Mode> / <Seed Button>"
+void parse_column_name(
+    const std::string& name, const std::string& path,
+    SoundSetting& sound, std::string& button_mode, SeedButton& seed_button
+){
+    std::vector<std::string> parts;
+    size_t start = 0;
+    while (true){
+        size_t sep = name.find(" / ", start);
+        if (sep == std::string::npos){
+            parts.push_back(name.substr(start));
+            break;
+        }
+        parts.push_back(name.substr(start, sep - start));
+        start = sep + 3;
+    }
+    if (parts.size() != 3){
+        throw FileException(nullptr, PA_CURRENT_FUNCTION, "Malformed seed column name: " + name, path);
+    }
+
+    if (parts[0] == "Mono"){
+        sound = SoundSetting::Mono;
+    }else if (parts[0] == "Stereo"){
+        sound = SoundSetting::Stereo;
+    }else{
+        throw FileException(nullptr, PA_CURRENT_FUNCTION, "Unknown sound setting in column: " + name, path);
+    }
+
+    button_mode = parts[1];
+
+    if (parts[2] == "A"){
+        seed_button = SeedButton::A;
+    }else if (parts[2] == "START" || parts[2] == "Start"){
+        seed_button = SeedButton::Start;
+    }else if (parts[2] == "L"){
+        seed_button = SeedButton::L;
+    }else{
+        throw FileException(nullptr, PA_CURRENT_FUNCTION, "Unknown seed button in column: " + name, path);
+    }
+}
+
+}
+
+
+SeedsDatabase::SeedsDatabase(const std::string& json_path){
+    std::string path = RESOURCE_PATH() + json_path;
+    JsonValue json = load_json_file(path);
+    JsonObject& root = json.to_object_throw(path);
+
+    JsonArray& delays = root.get_array_throw("Delay", path);
+    m_delays.reserve(delays.size());
+    for (auto& delay : delays){
+        m_delays.emplace_back(uint64_t(delay.to_integer_throw(path)));
+    }
+
+    for (auto& item : root){
+        const std::string& name = item.first;
+        if (name == "Delay"){
+            continue;
+        }
+        SeedColumn column;
+        column.name = name;
+        parse_column_name(name, path, column.sound, column.button_mode, column.seed_button);
+
+        JsonArray& seeds = item.second.to_array_throw(path);
+        column.seeds.reserve(seeds.size());
+        for (auto& seed : seeds){
+            column.seeds.emplace_back(parse_hex_seed(seed.to_string_throw(path), path));
+        }
+        m_columns.emplace_back(std::move(column));
+    }
+}
+
+
+SeedMatch SeedsDatabase::find_seed(uint16_t target_seed, SoundSetting sound, int radius) const{
+    struct Variant{
+        BlackoutButton extra_button;
+        uint16_t search_value;
+    };
+    const Variant variants[] = {
+        {BlackoutButton::None, target_seed},
+        {BlackoutButton::L, uint16_t(target_seed + BLACKOUT_SEED_OFFSET)},
+    };
+
+    SeedMatch best;
+    uint64_t best_delay = 0xFFFFFFFFFFFFFFFF;
+
+    for (const SeedColumn& column : m_columns){
+        if (column.sound != sound){
+            continue;
+        }
+        // Only the "Help" button mode is supported: seed lists for other button modes
+        // are almost entirely empty, and it is not exposed as a user setting.
+        if (column.button_mode != "Help"){
+            continue;
+        }
+        for (const Variant& variant : variants){
+            for (size_t i = 0; i < column.seeds.size() && i < m_delays.size(); i++){
+                if (column.seeds[i] != variant.search_value){
+                    continue;
+                }
+                if (m_delays[i] >= best_delay){
+                    break;
+                }
+
+                size_t list_start = (i > (size_t)radius) ? i - (size_t)radius : 0;
+                size_t list_end = std::min(column.seeds.size() - 1, i + (size_t)radius);
+                std::vector<uint16_t> seed_values;
+                seed_values.reserve(list_end - list_start + 1);
+                for (size_t j = list_start; j <= list_end; j++){
+                    uint16_t value = column.seeds[j];
+                    if (variant.extra_button != BlackoutButton::None){
+                        value = uint16_t(value - BLACKOUT_SEED_OFFSET);
+                    }
+                    seed_values.emplace_back(value);
+                }
+
+                best_delay = m_delays[i];
+                best.found = true;
+                best.seed_values = std::move(seed_values);
+                best.seed_position = int16_t(i - list_start);
+                best.seed_delay = m_delays[i];
+                best.seed_button = column.seed_button;
+                best.extra_button = variant.extra_button;
+                best.sound = column.sound;
+                best.button_mode = column.button_mode;
+                best.column_name = column.name;
+                break;
+            }
+        }
+    }
+
+    return best;
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_SeedsDatabase.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_SeedsDatabase.h
new file mode 100644
index 0000000000..12c1b2a77e
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_SeedsDatabase.h
@@ -0,0 +1,68 @@
+/*  Seeds Database
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonFRLG_SeedsDatabase_H
+#define PokemonAutomation_PokemonFRLG_SeedsDatabase_H
+
+#include <cstdint>
+#include <string>
+#include <vector>
+#include "CommonFramework/Language.h"
+#include "PokemonFRLG_BlindNavigation.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+
+enum class SoundSetting{
+    Mono,
+    Stereo,
+};
+
+static const uint16_t BLACKOUT_SEED_OFFSET = 0x0024;
+
+// Only English and Japanese lists exist; other languages fall back to English.
+std::string seeds_json_path(bool firered, Language language);
+
+
+struct SeedMatch{
+    bool found = false;
+    std::vector<uint16_t> seed_values;
+    int16_t seed_position = -1;
+    uint64_t seed_delay = 0;
+    SeedButton seed_button = SeedButton::A;
+    BlackoutButton extra_button = BlackoutButton::None;
+    SoundSetting sound = SoundSetting::Mono;
+    std::string button_mode;
+    std::string column_name;
+};
+
+
+class SeedsDatabase{
+public:
+    SeedsDatabase(const std::string& json_path);
+    SeedMatch find_seed(uint16_t target_seed, SoundSetting sound, int radius) const;
+
+private:
+    struct SeedColumn{
+        std::string name;
+        SoundSetting sound;
+        std::string button_mode;
+        SeedButton seed_button;
+        std::vector<uint16_t> seeds;
+    };
+
+    std::vector<uint64_t> m_delays;
+    std::vector<SeedColumn> m_columns;
+};
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_SidHelper.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_SidHelper.cpp
new file mode 100644
index 0000000000..0c3ac9bd67
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_SidHelper.cpp
@@ -0,0 +1,332 @@
+/*  SID Helper
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <vector>
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "CommonTools/VisualDetectors/BlackScreenDetector.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "Pokemon/Pokemon_AdvRng.h"
+#include "VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_TrainerCardDetector.h"
+#include "VideoGames/PokemonFRLG/Inference/PokemonFRLG_TrainerIdReader.h"
+#include "VideoGames/PokemonFRLG/PokemonFRLG_Navigation.h"
+#include "VideoGames/PokemonFRLG/Programs/PokemonFRLG_StartMenuNavigation.h"
+#include "PokemonFRLG_RngCalibration.h"
+#include "PokemonFRLG_SidHelper.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+SidHelper_Descriptor::SidHelper_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonFRLG:SidHelper",
+        Pokemon::STRING_POKEMON + " FRLG", "SID Helper",
+        "Programs/PokemonFRLG/SidHelper.html",
+        "Hit a specific RNG advance when starting a new game and determine the corresponding SID.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_RequiresPrecision,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+struct SidHelper_Descriptor::Stats : public StatsTracker {
+public:
+    Stats()
+        : errors(m_stats["Errors"])
+    {
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+    }
+
+    std::atomic<uint64_t>& errors;
+};
+
+std::unique_ptr<StatsTracker> SidHelper_Descriptor::make_stats() const{
+//    return std::unique_ptr<StatsTracker>(new Stats());
+    return nullptr;
+}
+
+SidHelper::SidHelper()
+    : LANGUAGE(
+        "<b>Game Language:</b><br>"
+        "Language affects the number of advances (based on the number of text characters) that pass after the last button press.",
+        {
+            Language::English,
+            Language::Japanese,
+            Language::Spanish,
+            Language::French,
+            Language::German,
+            Language::Italian,
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        true
+    )
+    , TARGET_ADVANCES(
+        "<b>Target Advances:</b><br>"
+        "The target advances for finalizing the SID. This is arbitrary unless you're attempting to hit a specific TID/SID combination.<br>"
+        "This value should always be odd.",
+        LockMode::LOCK_WHILE_RUNNING, 
+        3001, 2275 // default, min
+    )
+    , NUM_CANDIDATES(
+        "<b># Candidate SIDs:</b><br>"
+        "The number of SIDs to list near the target.",
+        LockMode::LOCK_WHILE_RUNNING, 
+        5, 1, 11 // default, min, max
+    )
+    , GO_HOME_WHEN_DONE(false)
+    , NOTIFICATION_SIDS("SID Candidates", true, true)
+    , NOTIFICATIONS({
+        &NOTIFICATION_SIDS,
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+{
+    PA_ADD_OPTION(SIDS_DISPLAY);
+    PA_ADD_OPTION(LANGUAGE);
+    PA_ADD_OPTION(TARGET_ADVANCES);
+    PA_ADD_OPTION(NUM_CANDIDATES);
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+namespace{
+
+void set_sid_from_name_screen(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    const uint64_t& SID_DELAY,
+    bool extra_press_at_end
+){
+    // this is performed blind to try to maximize consistency of timing
+    // ensure the OK button is selected
+    pbf_press_button(context, BUTTON_PLUS, 200ms, 300ms);
+    // confirm name (SID delay starts now)
+    pbf_press_button(context, BUTTON_A, 200ms, 1800ms);
+    // advance to "...about to unfold!", picking the default rival name
+    pbf_press_button(context, BUTTON_A, 200ms, 2300ms);
+    pbf_press_button(context, BUTTON_A, 200ms, 1050ms);
+    pbf_press_button(context, BUTTON_A, 200ms, 1550ms);
+    pbf_move_left_joystick(context, {0,-1}, 200ms, 300ms);
+    pbf_press_button(context, BUTTON_A, 200ms, 1050ms);
+    pbf_press_button(context, BUTTON_A, 200ms, 1550ms);
+    pbf_press_button(context, BUTTON_A, 200ms, 2300ms);
+
+    // 2000 + 2500 + 1250 + 1750 + 500 + 1250 + 1750 + 2500 + 200 ms
+    Milliseconds delay(SID_DELAY > 13700
+        ? SID_DELAY - 13700
+        : 0
+    );
+
+    if (extra_press_at_end){
+        pbf_press_button(context, BUTTON_A, 200ms, 1300ms);
+        delay = delay > 1500ms ? delay - 1500ms : 0ms;
+    }
+
+    pbf_press_button(context, BUTTON_A, 200ms, delay);
+
+    // finish dialogue and lock in SID
+    pbf_press_button(context, BUTTON_A, 200ms, 0ms);
+    context.wait_for_all_requests();
+}
+
+void finish_intro_animations(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    BlackScreenWatcher black_screen;
+    context.wait_for_all_requests();
+    int ret = wait_until(
+        env.console, context, 10s,
+        { black_screen }
+    );
+
+    if (ret < 0){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT, "SidHelper(): black screen not detected within 10 seconds of setting SID", env.console
+        );
+    }
+    
+    BlackScreenOverWatcher black_screen_over;
+    context.wait_for_all_requests();
+    int ret2 = wait_until(
+        env.console, context, 10s,
+        { black_screen_over }
+    );
+
+    if (ret2 < 0){
+        env.log("finish_intro_animations(): end of black screen not detected within 10 seconds. Continuing anyway...");
+        // if there's a problem, an error will be thrown when trying to navigate to the trainer card
+    }
+
+    pbf_wait(context, 2000ms);
+    context.wait_for_all_requests();
+}
+
+void navigate_to_trainer_card(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    int errors = 0;
+    while (true){
+        if (errors >= 5){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT, "SidHelper(): failed 5 times to navigate to the Trainer Card", env.console
+            ); 
+        }
+
+        open_start_menu(env.console, context);
+
+        // the positions are different before recieving a Pokemon and Pokedex
+        bool cursor = move_cursor_to_position(
+            env.console, context, SelectionArrowPositionStartMenu(1)
+        );
+        if (!cursor){
+            errors++;
+            pbf_mash_button(context, BUTTON_B, 2000ms);
+            continue;
+        }
+
+        TrainerCardWatcher trainer_card(COLOR_RED);
+        context.wait_for_all_requests();
+        int ret = run_until<ProControllerContext>(
+            env.console, context,
+            [](ProControllerContext& context){
+                pbf_press_button(context, BUTTON_A, 200ms, 2300ms);
+                pbf_press_button(context, BUTTON_A, 200ms, 2300ms);
+            },
+            { trainer_card }
+        );
+
+        if (ret < 0){
+            env.log("SidHelper(): failed to detect Trainer Card");
+            errors++;
+            pbf_mash_button(context, BUTTON_B, 2000ms);
+            continue;
+        }
+
+        break;
+    }
+}
+
+uint16_t read_tid(SingleSwitchProgramEnvironment& env, ProControllerContext& context, Language lang){
+    TrainerIdReader reader;
+    VideoOverlaySet overlays(env.console.overlay());
+    reader.make_overlays(overlays);
+
+    VideoSnapshot screen = env.console.video().snapshot();
+    env.log("Trainer Card detected.");
+    env.log("Reading TID...");
+    uint16_t tid = reader.read_tid(env.logger(), lang, screen);
+    env.log("TID: " + std::to_string(tid));
+
+    context.wait_for_all_requests();
+
+    return tid;
+}
+
+std::vector<std::pair<std::string, std::string>> get_sid_messages(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    uint16_t tid,
+    SimpleIntegerOption<uint32_t>& TARGET_ADVANCES,
+    SimpleIntegerOption<uint8_t>& NUM_CANDIDATES
+){
+    std::vector<std::pair<std::string, std::string>> messages;
+
+    int start = -1 * NUM_CANDIDATES / 2;
+    int end = start + NUM_CANDIDATES;
+
+    Pokemon::AdvRngSearcher searcher(tid, TARGET_ADVANCES + 2*start);
+
+    for (int i = start; i < end; i++){
+        std::pair<std::string, std::string> m;
+        uint16_t sid = searcher.state.s0 >> 16;
+
+        m.first = std::to_string(searcher.state.advance) + " Advances";
+        m.second = std::to_string(sid);
+        messages.push_back(m);
+
+        env.log(m.first + ": " + m.second);
+
+        searcher.advance_state();
+        searcher.advance_state(); // 2 by 2
+    }
+
+    return messages;
+}
+
+} // namespace
+
+void SidHelper::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    if (TARGET_ADVANCES % 2 == 0){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::NO_ERROR_REPORT, "SidHelper(): the Target Advances setting needs to be odd", env.console
+        ); 
+    }
+
+    home_black_border_check(env.console, context);
+
+    // SidHelper_Descriptor::Stats& stats = env.current_stats<SidHelper_Descriptor::Stats>();
+
+    uint64_t FINAL_TEXT_FRAMES;
+    Language lang = LANGUAGE;
+    switch (lang){
+    case Language::English:
+        FINAL_TEXT_FRAMES = 249;
+        break;
+    case Language::Japanese:
+        FINAL_TEXT_FRAMES = 194;
+        break;
+    case Language::Italian:
+        FINAL_TEXT_FRAMES = 236;
+        break;
+    case Language::French:
+        FINAL_TEXT_FRAMES = 205;
+        break;
+    case Language::German:
+        FINAL_TEXT_FRAMES = 208;
+        break;
+    case Language::Spanish:
+        FINAL_TEXT_FRAMES = 202;
+        break;
+    default:
+        FINAL_TEXT_FRAMES = 249;
+    }
+
+    static const int64_t FIXED_ADVANCES_OFFSET = 7; // determined empirically. Probably not console/setup dependent
+
+    bool extra_press_at_end = (
+        LANGUAGE == Language::German ||
+        LANGUAGE == Language::Japanese ||
+        LANGUAGE == Language::Spanish ||
+        LANGUAGE == Language::French
+    );
+
+    const uint64_t SID_DELAY = uint64_t((TARGET_ADVANCES - 2*FINAL_TEXT_FRAMES + FIXED_ADVANCES_OFFSET) * FRLG_FRAME_DURATION / 2); // advances pass 2 by 2
+    env.log("Delay: " + std::to_string(SID_DELAY) + "ms");
+
+    set_sid_from_name_screen(env, context, SID_DELAY, extra_press_at_end);
+    finish_intro_animations(env, context);
+    navigate_to_trainer_card(env, context);
+
+    uint16_t tid = read_tid(env, context, lang);
+
+    std::vector<std::pair<std::string, std::string>> sid_messages = get_sid_messages(
+        env, context, tid, TARGET_ADVANCES, NUM_CANDIDATES
+    );
+
+    SIDS_DISPLAY.set(tid, sid_messages);
+
+    send_program_notification(env, NOTIFICATION_SIDS, COLOR_BLUE, "Possible SIDs:", sid_messages, "");
+
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+    GO_HOME_WHEN_DONE.run_end_of_program(context);
+}
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_SidHelper.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_SidHelper.h
new file mode 100644
index 0000000000..4e1d89f2c1
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_SidHelper.h
@@ -0,0 +1,59 @@
+/*  SID Helper
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonFRLG_SidHelper_H
+#define PokemonAutomation_PokemonFRLG_SidHelper_H
+
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "CommonTools/Options/LanguageOCROption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+#include "PokemonFRLG_RngDisplays.h"
+
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+class SidHelper_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    SidHelper_Descriptor();
+    struct Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+class SidHelper : public SingleSwitchProgramInstance {
+public:
+    using Descriptor = SidHelper_Descriptor;
+    SidHelper();
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+    virtual void start_program_border_check(
+        VideoStream& stream,
+        FeedbackType feedback_type
+    ) override {}
+
+private:
+    OCR::LanguageOCROption LANGUAGE;
+
+    SimpleIntegerOption<uint32_t> TARGET_ADVANCES;
+    SimpleIntegerOption<uint8_t> NUM_CANDIDATES;
+
+    SidHelperDisplay SIDS_DISPLAY;
+
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
+    EventNotificationOption NOTIFICATION_SIDS;
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+}
+}
+}
+     
+
+
+
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_StarterRng.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_StarterRng.cpp
new file mode 100644
index 0000000000..5b22bee42f
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_StarterRng.cpp
@@ -0,0 +1,861 @@
+/*  Starter RNG
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Strings/StringTools.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_BattleDialogs.h"
+#include "VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_DialogDetector.h"
+#include "VideoGames/PokemonFRLG/Inference/PokemonFRLG_BattlePokemonDetector.h"
+#include "VideoGames/PokemonFRLG/Inference/PokemonFRLG_BattleLevelUpReader.h"
+#include "VideoGames/PokemonFRLG/PokemonFRLG_Navigation.h"
+#include "PokemonFRLG_RngNavigation.h"
+#include "PokemonFRLG_HardReset.h"
+#include "PokemonFRLG_SeedsDatabase.h"
+#include "PokemonFRLG_StarterRng.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+
+StarterRng_Descriptor::StarterRng_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonFRLG:StarterRng",
+        Pokemon::STRING_POKEMON + " FRLG", "Starter RNG",
+        "Programs/PokemonFRLG/StarterRng.html",
+        "Automatically calibrate timings to hit a specific RNG target for FRLG starters.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_RequiresPrecision,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+struct StarterRng_Descriptor::Stats : public StatsTracker{
+    Stats()
+        : resets(m_stats["Resets"])
+        , shinies(m_stats["Shinies"])
+        , nonshiny(m_stats["Non-Shiny Hits"])
+        , wildshinies(m_stats["Wild Shinies"])
+        , errors(m_stats["Errors"])
+    {
+        m_display_order.emplace_back("Resets");
+        m_display_order.emplace_back("Shinies");
+        m_display_order.emplace_back("Non-Shiny Hits", HIDDEN_IF_ZERO);
+        m_display_order.emplace_back("Wild Shinies", HIDDEN_IF_ZERO);
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+    }
+    std::atomic<uint64_t>& resets;
+    std::atomic<uint64_t>& shinies;
+    std::atomic<uint64_t>& nonshiny;
+    std::atomic<uint64_t>& wildshinies;
+    std::atomic<uint64_t>& errors;
+};
+std::unique_ptr<StatsTracker> StarterRng_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+StarterRng::~StarterRng(){
+    SEED.remove_listener(*this);
+}
+
+StarterRng::StarterRng()
+    : m_calibration_displays(
+        "<font size=4><b>Calibration Displays</b></font> — These will update automatically as the program runs"
+    )
+    , m_game_info(
+        "<font size=4><b>Game Information</b></font>"
+    )
+    , GAME_VERSION(
+        "<b>Game Version:</b>",
+        {
+            {GameVersion::firered, "firered", "FireRed"},
+            {GameVersion::leafgreen, "leafgreen", "LeafGreen"}
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        GameVersion::firered
+    )
+    , LANGUAGE(
+        "<b>Game Language:</b>",
+        {
+            Language::English,
+            Language::Japanese,
+            Language::Spanish,
+            Language::French,
+            Language::German,
+            Language::Italian,
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        true
+    )
+    , SOUND(
+        "<b>Sound:</b><br>"
+        "Your in-game sound setting. This affects the possible seeds.",
+        {
+            {SoundSetting::Mono, "mono", "Mono"},
+            {SoundSetting::Stereo, "stereo", "Stereo"}
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        SoundSetting::Mono
+    )
+    , m_target_settings(
+        "<font size=4><b>Target Settings</b></font> — Get these from an RNG search tool"
+    )
+    , STARTER(
+        "<b>Starter Species:</b>",
+        {
+            {Starter::bulbasaur, "bulbasaur", "Bulbasaur"},
+            {Starter::squirtle, "squirtle", "Squirtle"},
+            {Starter::charmander, "charmander", "Charmander"},
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        Starter::bulbasaur
+    )    
+    , SEED(
+        false,
+        "<b>Target Seed:</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        "70FE", "70FE"
+    )
+    , ADVANCES(
+        "<b>Advances:</b><br>"
+        "The total number of RNG advances for your target.",
+        LockMode::LOCK_WHILE_RUNNING,
+        10000, 940, 1000000000 // default, min
+    )
+    , m_program_settings(
+        "<font size=4><b>Program Settings</b></font>"
+    )
+    , SEED_RADIUS(
+        "<b>Nearby Seed Radius:</b><br>"
+        "The number of nearby seeds on each side of the target to search when identifying which seed was hit.",
+        LockMode::LOCK_WHILE_RUNNING,
+        5, 1 // default, min
+    )
+    , MAX_RESETS(
+        "<b>Max Resets:</b>",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        50, 0 // default, min
+    )
+    , IGNORE_WILD_SHINIES(
+        "<b>Ignore wild shinies</b><br>"
+        "Do not stop the program when a wild shiny is encountered.",
+        LockMode::LOCK_WHILE_RUNNING, 
+        false // default
+    )
+    , PROFILE(
+        "<b>User Profile Position:</b><br>"
+        "The position, from left to right, of the Switch profile with the FRLG save you'd like to use.<br>"
+        "If this is set to 0, Switch 1 defaults to the last-used profile, while Switch 2 defaults to the first profile (position 1)",
+        LockMode::LOCK_WHILE_RUNNING,
+        0, 0, 8 // default, min, max
+    )
+    , TAKE_VIDEO(
+        "<b>Take Video:</b><br>"
+        "Record a video when the shiny is found.", 
+        LockMode::LOCK_WHILE_RUNNING, 
+        true // default
+    )
+    , GO_HOME_WHEN_DONE(true)
+    , NOTIFICATION_SHINY(
+        "Shiny found",
+        true, true, ImageAttachmentMode::JPG,
+        {"Notifs", "Showcase"}
+    )
+    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_SHINY,
+        &NOTIFICATION_STATUS_UPDATE,
+        &NOTIFICATION_PROGRAM_FINISH,
+    })
+{
+    PA_ADD_OPTION(m_calibration_displays);
+    PA_ADD_OPTION(RNG_TARGET);
+    PA_ADD_OPTION(RNG_FILTERS);
+    PA_ADD_OPTION(RNG_CALIBRATION);
+    PA_ADD_OPTION(m_game_info);
+    PA_ADD_OPTION(GAME_VERSION);
+    PA_ADD_OPTION(LANGUAGE);
+    PA_ADD_OPTION(SOUND);
+    PA_ADD_OPTION(m_target_settings);
+    PA_ADD_OPTION(STARTER);
+    PA_ADD_OPTION(SEED);
+    PA_ADD_OPTION(ADVANCES);
+    PA_ADD_OPTION(m_program_settings);
+    PA_ADD_OPTION(SEED_RADIUS);
+    PA_ADD_OPTION(MAX_RESETS);
+    PA_ADD_OPTION(PROFILE);
+    PA_ADD_OPTION(TAKE_VIDEO);
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+    PA_ADD_OPTION(NOTIFICATIONS);
+
+    SEED.add_listener(*this);
+}
+
+void StarterRng::on_config_value_changed(void* object){
+    if (object == &SEED){
+        SEED.set(StringTools::strip(static_cast<std::string>(SEED)));
+        return;
+    }
+}
+
+
+
+
+
+bool StarterRng::walk_to_rival_battle(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    // return to the overworld
+    pbf_mash_button(context, BUTTON_B, 5000ms);
+    int num_steps_to_the_left;
+    switch(STARTER){
+    case Starter::bulbasaur:
+        num_steps_to_the_left = 2;
+        break;
+    case Starter::squirtle:
+        num_steps_to_the_left = 3;
+        break;
+    case Starter::charmander:
+        num_steps_to_the_left = 4;
+        break;
+    default:
+        num_steps_to_the_left = 2;
+    }
+
+    // dodge rival
+    pbf_move_left_joystick(context, {0, -1}, 40ms, 460ms);
+    pbf_move_left_joystick(context, {0, -1}, 100ms, 400ms);
+
+    // line up with the doorway
+    pbf_move_left_joystick(context, {-1, 0}, 40ms, 460ms); // pivot left
+    for (int i=0; i<num_steps_to_the_left; i++){
+        pbf_move_left_joystick(context, {-1, 0}, 100ms, 400ms);
+    }
+    
+    // walk down and trigger battle
+    BlackScreenWatcher black_screen(COLOR_RED);
+    context.wait_for_all_requests();
+    int ret =  run_until<ProControllerContext>(
+        env.console, context,
+        [](ProControllerContext& context){
+            for (int i=0; i<5; i++){
+                ssf_press_left_joystick(context, {0, -1}, 0ms, 20000ms, 0ms);
+                ssf_mash1_button(context, BUTTON_B, 20000ms); 
+            }
+        },
+        { black_screen }
+    );
+
+    bool failed = ret < 0;
+    if (failed){
+        send_program_recoverable_error_notification(
+            env, NOTIFICATION_ERROR_RECOVERABLE,
+            "walk_to_rival_battle(): failed to initiate battle."
+        ); 
+    }
+    return failed;
+}
+
+bool StarterRng::auto_battle_rival(
+    SingleSwitchProgramEnvironment& env, 
+    ProControllerContext& context, 
+    AdvObservedPokemon& pokemon,
+    AdvRngFilters& filters,
+    const BaseStats& BASE_STATS
+){
+    Pokemon::EVs evyield = {0, 0, 0, 0, 0, 0};
+    switch(STARTER){
+        case Starter::bulbasaur:
+            evyield.speed = 1;   // from charmander
+            break;
+        case Starter::squirtle:
+            evyield.spatk = 1;   // from bulbasaur
+            break;
+        case Starter::charmander:
+            evyield.defense = 1; // from squirtle
+    }
+
+    // detect the battle menu
+    BattleMenuWatcher battle_ready(COLOR_RED);
+    context.wait_for_all_requests();
+    int ret1 = run_until<ProControllerContext>(
+        env.console, context,
+        [](ProControllerContext& context){
+            pbf_mash_button(context, BUTTON_B, 30s);
+        },
+        { battle_ready }
+    );
+    if (ret1 < 0){
+        send_program_recoverable_error_notification(
+            env, NOTIFICATION_ERROR_RECOVERABLE,
+            "auto_battle_rival(): failed to detect the battle menu."
+        );
+        return true;
+    }
+    env.log("Battle started. Using first move...");
+
+    // perform the first move and get through Oak's dialogue,
+    // which messes up most detectors when it dims the screen
+    pbf_mash_button(context, BUTTON_A, 1000ms); // execute first move
+    context.wait_for_all_requests();
+    int ret2 = run_until<ProControllerContext>(
+        env.console, context,
+        [](ProControllerContext& context){
+            pbf_mash_button(context, BUTTON_B, 30s);
+        },
+        { battle_ready }
+    );
+    if (ret2 < 0){
+        send_program_recoverable_error_notification(
+            env, NOTIFICATION_ERROR_RECOVERABLE,
+            "auto_battle_rival(): failed to detect the battle menu."
+        );
+        return true;
+    }
+    env.log("Oak tutorial dialogue finished. Mashing A...");
+
+    // mash A until somebody faints
+    BattleOpponentFaintWatcher player_won(COLOR_RED);
+    BattleFaintWatcher player_lost(COLOR_RED);
+    context.wait_for_all_requests();
+    int ret3 = run_until<ProControllerContext>(
+        env.console, context,
+        [](ProControllerContext& context){
+            pbf_mash_button(context, BUTTON_A, 300s);
+        },
+        { player_won, player_lost }
+    );
+
+    switch(ret3){
+    case 0:
+        env.log("Won battle against rival. Watching for level-up stats...");
+        break;
+    case 1:
+        env.log("Lost battle against rival.");
+        pbf_mash_button(context, BUTTON_B, 20s); // exit battle and dialogue
+        return false;
+    default:
+        send_program_recoverable_error_notification(
+            env, NOTIFICATION_ERROR_RECOVERABLE,
+            "auto_battle_rival(): no fainting detected with 5 minutes."
+        );
+        return true;
+    }
+
+    // slowly advance dialog until level-up stats are visible
+    BattleLevelUpWatcher level_up_stats(COLOR_RED, BattleLevelUpDialog::stats, LANGUAGE);
+    BlackScreenWatcher black_screen(COLOR_RED);
+    context.wait_for_all_requests();
+    int ret4 = run_until<ProControllerContext>(
+        env.console, context,
+        [](ProControllerContext& context){
+            for(int i=0; i<60; i++){
+                pbf_press_button(context, BUTTON_A, 200ms, 1800ms);
+            }
+        },
+        { level_up_stats, black_screen }
+    );
+
+    switch(ret4){
+    case 0:
+        env.log("Level-up stats detected.");
+        break;
+    case 1:
+        env.log("Battle exited without detecting level-up stats");
+        return true; // will cause issues with keeping track of level and EVs
+    default:
+        env.log("auto_battle_rival(): no recognized state within 2 minutes of winning battle.");
+        return true;
+    }
+
+    // read stats
+    BattleLevelUpReader reader(COLOR_RED);
+    VideoOverlaySet overlays(env.console.overlay());
+    reader.make_overlays(overlays);
+
+    env.log("Reading stats...");
+    VideoSnapshot screen = env.console.video().snapshot();
+    StatReads stats = reader.read_stats(env.logger(), screen);    
+
+    update_filters(filters, pokemon, stats, evyield, BASE_STATS);
+    RNG_FILTERS.set(filters);   
+
+    // exit battle
+    pbf_mash_button(context, BUTTON_B, 20s);
+    context.wait_for_all_requests();
+
+    return false;
+}
+
+
+
+bool StarterRng::walk_to_route1_from_lab(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    // exit the lab
+    env.log("Exiting the lab...");
+    BlackScreenWatcher black_screen(COLOR_RED);
+    context.wait_for_all_requests();
+    int ret = run_until<ProControllerContext>(
+        env.console, context,
+        [](ProControllerContext& context){
+            pbf_move_left_joystick(context, {0, -1}, 10s, 0ms);
+        },
+        { black_screen }
+    );
+
+    if (ret < 0){
+        send_program_recoverable_error_notification(
+            env, NOTIFICATION_ERROR_RECOVERABLE,
+            "walk_to_route1_from_lab(): failed to exit lab."
+        );
+        return true;
+    }
+
+    env.log("Lab exited. Walking to Route 1...");
+    pbf_wait(context, 5000ms);
+    pbf_move_left_joystick(context, {-1, 0}, 1280ms, 300ms);
+    pbf_move_left_joystick(context, {0, +1}, 3150ms, 300ms);
+    pbf_move_left_joystick(context, {+1, 0}, 330ms, 300ms);
+    pbf_move_left_joystick(context, {0, +1}, 720ms, 300ms);
+    context.wait_for_all_requests();
+    return false;
+}
+
+bool StarterRng::walk_to_route1_from_home(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    // exit the house
+    env.log("Exiting the house...");
+    BlackScreenWatcher black_screen(COLOR_RED);
+    context.wait_for_all_requests();
+    int ret = run_until<ProControllerContext>(
+        env.console, context,
+        [](ProControllerContext& context){
+            pbf_move_left_joystick(context, {0, -1}, 1000ms, 300ms);
+            pbf_move_left_joystick(context, {-1, 0}, 900ms, 300ms);
+            pbf_move_left_joystick(context, {0, -1}, 1000ms, 300ms);
+        },
+        { black_screen }
+    );
+
+    if (ret < 0){
+        send_program_recoverable_error_notification(
+            env, NOTIFICATION_ERROR_RECOVERABLE,
+            "walk_to_route1_from_home(): failed to exit the house."
+        );
+        return true;
+    }
+
+    env.log("House exited. Walking to Route 1...");
+    pbf_wait(context, 5s);
+    pbf_move_left_joystick(context, {+1, 0}, 1370ms, 300ms);
+    pbf_move_left_joystick(context, {0, +1}, 1450ms, 300ms);
+    pbf_move_left_joystick(context, {+1, 0}, 300ms,  300ms);
+    pbf_move_left_joystick(context, {0, +1}, 1250ms, 300ms);
+
+    return false;
+}
+
+int StarterRng::autolevel_on_route1(
+    SingleSwitchProgramEnvironment& env, 
+    ProControllerContext& context, 
+    AdvObservedPokemon& pokemon,
+    AdvRngFilters& filters,
+    const BaseStats& BASE_STATS
+){
+    Pokemon::EVs evyield = {0, 0, 0, 0, 0, 0};
+    Pokemon::StatReads stats;
+
+    env.log("Arrived at Route 1.");
+    bool leftright = true;
+    context.wait_for_all_requests();
+
+    while (true){
+        // trigger encounter
+        env.log("Triggering wild encounters...");
+        int ret = grass_spin(env.console, context, leftright);
+        if (ret < 0){
+            send_program_recoverable_error_notification(
+                env, NOTIFICATION_ERROR_RECOVERABLE,
+                "autolevel_on_route1(): failed to trigger encounter."
+            );
+            return -1;
+        }
+
+        if (ret == 1){ // shiny
+            return 1;
+        }
+
+        // auto battle
+        BattleResult ret2 = spam_first_move(env.console, context);
+
+        BattleLevelUpWatcher level_up(COLOR_RED, BattleLevelUpDialog::stats, LANGUAGE);
+        BlackScreenWatcher black_screen(COLOR_RED);
+        VideoSnapshot screen;
+        int ret3;
+        bool failed;
+        BattleLevelUpReader reader;          
+
+        switch (ret2){
+        case BattleResult::opponentfainted:
+            env.log("Opponent fainted.");
+            evyield.speed++; // always rattata or pidgey
+            leftright = !leftright;
+
+            context.wait_for_all_requests();
+            ret3 = run_until<ProControllerContext>(
+                env.console, context,
+                [](ProControllerContext& context){
+                    for (int i=0; i<5; i++){
+                        pbf_press_button(context, BUTTON_B, 200ms, 1800ms);
+                    }
+                },
+                { level_up, black_screen }
+            );
+
+            switch (ret3){
+            case 0:
+                env.log("Level-up stats detected. Reading stats...");
+                screen = env.console.video().snapshot();      
+                stats = reader.read_stats(env.logger(), screen);
+                update_filters(filters, pokemon, stats, evyield, BASE_STATS);
+                RNG_FILTERS.set(filters);
+                exit_wild_battle(env.console, context, false, true);
+                return 0;
+            case -1:
+                exit_wild_battle(env.console, context, false, true);
+            default:
+                pbf_wait(context, 1000ms);
+                context.wait_for_all_requests();
+                continue;
+            }
+        case BattleResult::playerfainted:
+            env.log("Pokemon fainted. Mashing B through dialogues...");
+            pbf_mash_button(context, BUTTON_B, 30s); // skip through a few transitions and lots of dialogue
+            failed = walk_to_route1_from_home(env, context);
+            if (failed){
+                return -1;
+            }
+            context.wait_for_all_requests();
+            leftright = true;
+            continue;
+        case BattleResult::outofpp:
+        case BattleResult::unknown:
+        default:
+            return -1;
+        }
+    }
+}
+
+void StarterRng::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    /*
+    * Settings: Text Speed fast
+    */
+
+    StarterRng_Descriptor::Stats& stats = env.current_stats<StarterRng_Descriptor::Stats>();
+
+    home_black_border_check(env.console, context);
+
+    RNG_FILTERS.reset();
+    RNG_CALIBRATION.reset_hits();
+
+    const uint16_t TARGET_SEED = parse_seed(env.console, SEED);
+    SeedsDatabase seeds_db(seeds_json_path(GAME_VERSION == GameVersion::firered, LANGUAGE));
+    const SeedMatch seed_match = seeds_db.find_seed(TARGET_SEED, SOUND, SEED_RADIUS);
+    if (!seed_match.found){
+        throw UserSetupError(env.console, "The target Seed was not found in the seed database for this game version, language, and sound setting.");
+    }
+    const std::vector<uint16_t> SEED_VALUES = seed_match.seed_values;
+    const int16_t SEED_POSITION = seed_match.seed_position;
+    const uint64_t SEED_DELAY = seed_match.seed_delay;
+    const SeedButton SEED_BUTTON = seed_match.seed_button;
+    const BlackoutButton EXTRA_BUTTON = seed_match.extra_button;
+    env.log("Seed delay: " + std::to_string(SEED_DELAY) + "ms, button mode: " + seed_match.button_mode
+        + ", column: " + seed_match.column_name);
+
+    BaseStats BASE_STATS;
+    switch (STARTER){
+    case Starter::bulbasaur:
+        BASE_STATS = { 45, 49, 49, 65, 65, 45 };
+        break;
+    case Starter::squirtle:
+        BASE_STATS = { 44, 48, 65, 50, 64, 43 };
+        break;
+    case Starter::charmander:
+        BASE_STATS = { 39, 52, 43, 60, 50, 65 };
+        break;
+    default:
+        break;
+    }
+
+    static const int64_t FIXED_SEED_OFFSET = -845; // milliseconds, approximate
+
+    static const uint64_t CONTINUE_SCREEN_FRAMES = 200;
+
+    static const uint64_t INITIAL_ADVANCES_RADIUS = 1024;
+
+    static const uint8_t MAX_HISTORY_LENGTH = 10;
+
+    static const int16_t GENDER_THRESHOLD = 30;
+
+    static const std::set<std::string> SPECIES_LIST = { "bulbasaur", "squirtle", "charmander" };
+
+    env.log("RNG Target: " + std::to_string(STARTER.current_value()));
+    env.log("Target Seed: " + to_hex_string(TARGET_SEED));
+    env.log("Target Advances: " + std::to_string(ADVANCES));
+
+    AdvRngSearcher searcher(TARGET_SEED, ADVANCES, AdvRngMethod::Method1);
+    AdvPokemonResult target_result = searcher.generate_pokemon();
+    RNG_TARGET.set_target(target_result, GENDER_THRESHOLD);
+    log_target_pokemon(env.console, target_result);
+
+    RngCalibrations calibrations = {
+        RNG_CALIBRATION.seed_calibration / FRLG_FRAME_DURATION,
+        RNG_CALIBRATION.csf_calibration,
+        RNG_CALIBRATION.advances_calibration
+    };
+    log_calibrations(env.console, calibrations, true);
+
+    Milliseconds launch_delay = INITIAL_LAUNCH_DELAY;
+
+    RngUncertainHistory uncertain_history;
+    RngCalibrationHistory calibration_history; 
+
+    bool wildshiny_found = false;
+
+    uint16_t failed_searches = 0;
+
+    while (true){
+        if (calibration_history.results.size() > 0){
+            env.log("Checking for nonshiny target hit...");
+            if (have_hit_target(TARGET_SEED, ADVANCES, calibration_history.results.back())){
+                env.log("Target Hit!");
+                stats.nonshiny++;
+                break;
+            }
+            env.log("Missed target.");
+        }
+
+        if (failed_searches >= 5){
+            env.log("Failed to find any matches 5 times in a row");
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::NO_ERROR_REPORT,
+                "Failed to find any matches 5 times in a row. Check your seed and advances settings.",
+                env.console
+            ); 
+            break;
+        }
+
+        if (stats.resets > MAX_RESETS){
+            env.log("Max resets reached.");
+            break;
+        }
+
+        if (wildshiny_found){
+            break;
+        }
+
+        send_program_status_notification(
+            env, NOTIFICATION_STATUS_UPDATE,
+            "Calibrating."
+        );
+        env.update_stats();
+
+
+        uint64_t advances_radius = get_advances_radius(env.console, calibration_history, INITIAL_ADVANCES_RADIUS);
+
+        if (calibration_history.results.size() > 0){
+            calibrations = get_calibrations(env.console, calibration_history, SEED_VALUES, SEED_POSITION, ADVANCES);
+        }
+
+        // if previous resets had uncertain advances, slightly modify the seed delay to try to hit a different target
+        apply_seed_bump(calibrations, uncertain_history);
+
+        uint64_t ingame_advances = ADVANCES - CONTINUE_SCREEN_FRAMES;
+
+        RngTimings timings = prepare_timings(
+            env.console, PokemonFRLG_RngTarget::starters,
+            SEED_DELAY, CONTINUE_SCREEN_FRAMES, ingame_advances,
+            false, calibrations,
+            FIXED_SEED_OFFSET
+        );
+
+        env.log("Resetting Game...");
+        reset_and_perform_blind_sequence(
+            env.console, context, 
+            LANGUAGE, PokemonFRLG_RngTarget::starters, 
+            SEED_BUTTON, EXTRA_BUTTON, timings,
+            launch_delay, false, PROFILE
+        );
+        stats.resets++; 
+
+        RNG_FILTERS.reset();
+        RNG_CALIBRATION.set_calibrations(calibrations);
+        RNG_CALIBRATION.reset_hits();
+
+        bool shiny_found = check_for_shiny(env.console, context, PokemonFRLG_RngTarget::starters);
+
+        if (shiny_found){
+            env.log("Shiny found!");
+            stats.shinies++;
+            RNG_CALIBRATION.hits.set("Shiny!");
+            send_program_notification(
+                env,
+                NOTIFICATION_SHINY,
+                COLOR_YELLOW,
+                "Shiny found!",
+                {}, "",
+                env.console.video().snapshot(),
+                true
+            );
+            if (TAKE_VIDEO){
+                pbf_press_button(context, BUTTON_CAPTURE, 2000ms, 0ms);
+            }
+            break;
+        }
+
+        // Stage 1: initial search -- starter received
+        AdvObservedPokemon pokemon = read_summary(env.console, context, LANGUAGE, SPECIES_LIST);
+        pokemon.level[0] = 5;
+        AdvRngFilters filters = observation_to_filters(pokemon, BASE_STATS);
+        RNG_FILTERS.set(filters);
+
+        std::vector<AdvRngState> search_hits = get_search_results(env.console, searcher, filters, SEED_VALUES, ADVANCES, advances_radius, GENDER_THRESHOLD);
+        RNG_CALIBRATION.set_hits(search_hits);        
+        bool finished = update_history(
+            env.console, uncertain_history, calibration_history, 
+            MAX_HISTORY_LENGTH, calibrations, search_hits, 1
+        );
+        if (finished){
+            env.log("RNG search finished.");
+            update_failed_searches(failed_searches, search_hits);
+            continue;
+        }
+
+        // Stage 2: first search update -- post-rival-battle
+        bool failed = walk_to_rival_battle(env, context);
+        if (failed){
+            update_history(
+                env.console, uncertain_history, calibration_history, 
+                MAX_HISTORY_LENGTH, calibrations, search_hits, 1, 2, true
+            );
+            stats.errors++;
+            continue; // reset game
+        }
+
+        failed = auto_battle_rival(env, context, pokemon, filters, BASE_STATS);
+        if (failed){
+            update_history(
+                env.console, uncertain_history, calibration_history, 
+                MAX_HISTORY_LENGTH, calibrations, search_hits, 1, 2, true
+            );
+            stats.errors++;
+            continue; // reset game
+        }
+        if (pokemon.level.size() > 1){
+            search_hits = get_search_results(env.console, searcher, filters, SEED_VALUES, ADVANCES, advances_radius, GENDER_THRESHOLD);
+            RNG_CALIBRATION.set_hits(search_hits);        
+            env.log("Number of search hits: " + std::to_string(search_hits.size()));
+            finished = update_history(
+                env.console, uncertain_history, calibration_history, 
+                MAX_HISTORY_LENGTH, calibrations, search_hits, 5
+            );            
+            if (finished){
+                env.log("RNG search finished.");
+                update_failed_searches(failed_searches, search_hits);
+                continue;
+            }
+        }
+
+        // Stage 3: subsequent search updates -- leveling up from wild encounters
+        failed = walk_to_route1_from_lab(env, context);
+        if (failed){
+            update_history(
+                env.console, uncertain_history, calibration_history, 
+                MAX_HISTORY_LENGTH, calibrations, search_hits, 1, 2, true
+            );
+            stats.errors++;
+            continue; // reset game
+        }
+
+        auto num_levels = pokemon.level.size();
+        uint16_t MAX_LEVELS = 3;
+        while(true){
+            if (num_levels > MAX_LEVELS){
+                env.log("RNG search not complete after 3 level-ups.");
+                finished = update_history(
+                    env.console, uncertain_history, calibration_history, 
+                    MAX_HISTORY_LENGTH, calibrations, search_hits, 5, 2, true
+                );         
+                break;
+            }
+
+            env.log("Level: " + std::to_string(4 + pokemon.level.size()));
+            env.log("Speed EVs: " + std::to_string(pokemon.evs.back().speed));
+
+            int ret2 = autolevel_on_route1(env, context, pokemon, filters, BASE_STATS);
+            if (ret2 < 0){
+                update_history(
+                    env.console, uncertain_history, calibration_history, 
+                    MAX_HISTORY_LENGTH, calibrations, search_hits, 1, 2, true
+                );
+                stats.errors++;
+                break;
+            }else if(ret2 == 1){
+                env.log("Wild shiny found!");
+                stats.wildshinies++;
+                send_program_notification(
+                    env,
+                    NOTIFICATION_SHINY,
+                    COLOR_YELLOW,
+                    "Wild Shiny found!",
+                    {}, "",
+                    env.console.video().snapshot(),
+                    true
+                );
+                if (TAKE_VIDEO){
+                    pbf_press_button(context, BUTTON_CAPTURE, 2000ms, 0ms);
+                }
+                if (!IGNORE_WILD_SHINIES){
+                    wildshiny_found = true;
+                    break;
+                }
+            }
+            
+            // force the search to finish after enough level-ups 
+            if (pokemon.level.size() > num_levels){
+                num_levels = pokemon.level.size();
+                search_hits = get_search_results(env.console, searcher, filters, SEED_VALUES, ADVANCES, advances_radius, GENDER_THRESHOLD);
+                RNG_CALIBRATION.set_hits(search_hits);
+                env.log("Number of search hits: " + std::to_string(search_hits.size()));
+                update_history(
+                    env.console, uncertain_history, calibration_history, 
+                    MAX_HISTORY_LENGTH, calibrations, search_hits, 5, 2, true
+                );
+                env.log("RNG search finished.");
+                update_failed_searches(failed_searches, search_hits);
+                break;
+            }
+        }
+
+    }
+
+    if (GO_HOME_WHEN_DONE){
+        pbf_press_button(context, BUTTON_HOME, 200ms, 1000ms);
+    }
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_StarterRng.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_StarterRng.h
new file mode 100644
index 0000000000..4e99f55bda
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_StarterRng.h
@@ -0,0 +1,108 @@
+/*  Starter RNG
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonFRLG_StarterRng_H
+#define PokemonAutomation_PokemonFRLG_StarterRng_H
+
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "Common/Cpp/Options/StaticTextOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "CommonTools/Options/LanguageOCROption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+#include "Pokemon/Pokemon_StatsCalculation.h"
+#include "Pokemon/Pokemon_AdvRng.h"
+#include "PokemonFRLG_RngDisplays.h"
+#include "PokemonFRLG_SeedsDatabase.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+class StarterRng_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    StarterRng_Descriptor();
+    struct Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+class StarterRng : public SingleSwitchProgramInstance, private ConfigOption::Listener{
+public:
+    using Descriptor = StarterRng_Descriptor;
+    ~StarterRng();
+    StarterRng();
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext &context) override;
+    virtual void start_program_border_check(
+        VideoStream& stream,
+        FeedbackType feedback_type
+    ) override{}
+
+private:
+    virtual void on_config_value_changed(void* object) override;
+
+    enum class Starter{
+        bulbasaur,
+        squirtle,
+        charmander
+    };
+
+    enum class GameVersion{
+        firered,
+        leafgreen
+    };
+
+    bool walk_to_rival_battle(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+    bool auto_battle_rival(
+        SingleSwitchProgramEnvironment& env, 
+        ProControllerContext& context, 
+        AdvObservedPokemon& pokemon,
+        AdvRngFilters& filters,
+        const BaseStats& BASE_STATS
+    );
+
+    bool walk_to_route1_from_lab(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+    bool walk_to_route1_from_home(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+    int autolevel_on_route1(
+        SingleSwitchProgramEnvironment& env, 
+        ProControllerContext& context, 
+        AdvObservedPokemon& pokemon,
+        AdvRngFilters& filters,
+        const BaseStats& BASE_STATS
+    );
+
+    SectionDividerOption m_calibration_displays;
+    RngTargetDisplay RNG_TARGET;
+    RngFilterDisplay RNG_FILTERS;
+    RngCalibrationDisplay RNG_CALIBRATION;
+
+    SectionDividerOption m_game_info;
+    EnumDropdownOption<GameVersion> GAME_VERSION;
+    OCR::LanguageOCROption LANGUAGE;
+    EnumDropdownOption<SoundSetting> SOUND;
+
+    SectionDividerOption m_target_settings;
+    EnumDropdownOption<Starter> STARTER;
+    StringOption SEED;
+    SimpleIntegerOption<uint64_t>ADVANCES;
+
+    SectionDividerOption m_program_settings;
+    SimpleIntegerOption<uint16_t> SEED_RADIUS;
+    SimpleIntegerOption<uint64_t> MAX_RESETS;
+    BooleanCheckBoxOption IGNORE_WILD_SHINIES;
+    SimpleIntegerOption<uint8_t> PROFILE;
+
+    BooleanCheckBoxOption TAKE_VIDEO;
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
+    EventNotificationOption NOTIFICATION_SHINY;
+    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_StaticRng.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_StaticRng.cpp
new file mode 100644
index 0000000000..30bdaaea7a
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_StaticRng.cpp
@@ -0,0 +1,489 @@
+/*  Static RNG
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Strings/StringTools.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonFramework/Language.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonFRLG/PokemonFRLG_Navigation.h"
+#include "PokemonFRLG_RngNavigation.h"
+#include "PokemonFRLG_HardReset.h"
+#include "PokemonFRLG_RngCalibration.h"
+#include "PokemonFRLG_RngLoopRoutines.h"
+#include "PokemonFRLG_StaticRng.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+
+StaticRng_Descriptor::StaticRng_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonFRLG:StaticRng",
+        Pokemon::STRING_POKEMON + " FRLG", "Static RNG",
+        "Programs/PokemonFRLG/StaticRng.html",
+        "Automatically calibrate timings to hit a specific RNG target for FRLG static encounters.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_RequiresPrecision,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+struct StaticRng_Descriptor::Stats : public StatsTracker{
+    Stats()
+        : resets(m_stats["Resets"])
+        , shinies(m_stats["Shinies"])
+        , nonshiny(m_stats["Non-Shiny Hits"])
+        , errors(m_stats["Errors"])
+    {
+        m_display_order.emplace_back("Resets");
+        m_display_order.emplace_back("Shinies");
+        m_display_order.emplace_back("Non-Shiny Hits", HIDDEN_IF_ZERO);
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+    }
+    std::atomic<uint64_t>& resets;
+    std::atomic<uint64_t>& shinies;
+    std::atomic<uint64_t>& nonshiny;
+    std::atomic<uint64_t>& errors;
+};
+std::unique_ptr<StatsTracker> StaticRng_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+StaticRng::~StaticRng(){
+    SEED.remove_listener(*this);
+}
+
+StaticRng::StaticRng()
+    : m_calibration_displays(
+        "<font size=4><b>Calibration Displays</b></font> — These will update automatically as the program runs"
+    )
+    , m_game_info(
+        "<font size=4><b>Game Information</b></font>"
+    )
+    , GAME_VERSION(
+        "<b>Game Version:</b>",
+        {
+            {GameVersion::firered, "firered", "FireRed"},
+            {GameVersion::leafgreen, "leafgreen", "LeafGreen"}
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        GameVersion::firered
+    )
+    , LANGUAGE(
+        "<b>Game Language:</b>",
+        {
+            Language::English,
+            Language::Japanese,
+            Language::Spanish,
+            Language::French,
+            Language::German,
+            Language::Italian,
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        true
+    )
+    , SOUND(
+        "<b>Sound:</b><br>"
+        "Your in-game sound setting. This affects the possible seeds.",
+        {
+            {SoundSetting::Mono, "mono", "Mono"},
+            {SoundSetting::Stereo, "stereo", "Stereo"}
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        SoundSetting::Mono
+    )
+    , m_target_settings(
+        "<font size=4><b>Target Settings</b></font> — Get these from an RNG search tool"
+    )
+    , TARGET(
+        "<b>Target:</b>",
+        {
+            {PokemonFRLG_RngTarget::electrode, "electrode", "Electrode"},
+            {PokemonFRLG_RngTarget::snorlax, "snorlax", "Snorlax"},
+            {PokemonFRLG_RngTarget::articuno, "articuno", "Articuno"},
+            {PokemonFRLG_RngTarget::zapdos, "zapdos", "Zapdos"},
+            {PokemonFRLG_RngTarget::moltres, "moltres", "Moltres"},
+            {PokemonFRLG_RngTarget::mewtwo, "mewtwo", "Mewtwo"},
+            {PokemonFRLG_RngTarget::hypno, "hypno", "Hypno"},
+            {PokemonFRLG_RngTarget::hooh, "hooh", "Ho-oh"},
+            {PokemonFRLG_RngTarget::lugia, "lugia", "Lugia"},
+            {PokemonFRLG_RngTarget::deoxys_attack, "deoxys_attack", "Deoxys-Attack"},
+            {PokemonFRLG_RngTarget::deoxys_defense, "deoxys_defense", "Deoxys-Defense"}
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        PokemonFRLG_RngTarget::electrode
+    )    
+    , SEED(
+        false,
+        "<b>Target Seed:</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        "70FE", "70FE"
+    )
+    , ADVANCES(
+        "<b>Advances:</b><br>The total number of RNG advances for your target.",
+        LockMode::LOCK_WHILE_RUNNING,
+        10000, 520, 1000000000 // default, min
+    )
+    , m_program_settings(
+        "<font size=4><b>Program Settings</b></font>"
+    )
+    , USE_TEACHY_TV(
+        "<b>Use Teachy TV:</b>"
+        "<br>Opens the Teachy TV to quickly advance the RNG at 313x speed.<br>"
+        "<i>Warning: can result in larger misses.</i>",
+        LockMode::LOCK_WHILE_RUNNING,
+        false // default
+    )
+    , SEED_RADIUS(
+        "<b>Nearby Seed Radius:</b><br>"
+        "The number of nearby seeds on each side of the target to search when identifying which seed was hit.",
+        LockMode::LOCK_WHILE_RUNNING,
+        5, 1 // default, min
+    )
+    , MAX_RESETS(
+        "<b>Max Resets:</b>",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        50, 0 // default, min
+    )
+    , MAX_RARE_CANDIES(
+        "<b>Max Rare Candies:</b><br>"
+        "The number of rare candies in your bag. Make sure these are at the top position of the bag.<br>"
+        "Rare candies used during calibration will be restored after resetting.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        0, 0, 70 // default, min, max
+    )
+    , MAX_BALL_THROWS(
+        "<b>Max Balls Thrown:</b><br>"
+        "The number of " + STRING_POKEBALL + "s in your bag to attempt to throw. Make sure these are at the top position of the bag.<br>"
+        "Balls thrown during calibration will be restored after resetting.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        30, 1, 999 // default, min, max
+    )
+    , PROFILE(
+        "<b>User Profile Position:</b><br>"
+        "The position, from left to right, of the Switch profile with the FRLG save you'd like to use.<br>"
+        "If this is set to 0, Switch 1 defaults to the last-used profile, while Switch 2 defaults to the first profile (position 1)",
+        LockMode::LOCK_WHILE_RUNNING,
+        0, 0, 8 // default, min, max
+    )
+    , TAKE_VIDEO(
+        "<b>Take Video:</b><br>Record a video when the shiny is found.", 
+        LockMode::LOCK_WHILE_RUNNING, 
+        true // default
+    )
+    , GO_HOME_WHEN_DONE(true)
+    , NOTIFICATION_SHINY(
+        "Shiny found",
+        true, true, ImageAttachmentMode::JPG,
+        {"Notifs", "Showcase"}
+    )
+    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_SHINY,
+        &NOTIFICATION_STATUS_UPDATE,
+        &NOTIFICATION_PROGRAM_FINISH,
+    })
+{
+    PA_ADD_OPTION(m_calibration_displays);
+    PA_ADD_OPTION(RNG_TARGET);
+    PA_ADD_OPTION(RNG_FILTERS);
+    PA_ADD_OPTION(RNG_CALIBRATION);
+    PA_ADD_OPTION(m_game_info);
+    PA_ADD_OPTION(GAME_VERSION);
+    PA_ADD_OPTION(LANGUAGE);
+    PA_ADD_OPTION(SOUND);
+    PA_ADD_OPTION(m_target_settings);
+    PA_ADD_OPTION(TARGET);
+    PA_ADD_OPTION(SEED);
+    PA_ADD_OPTION(ADVANCES);
+    PA_ADD_OPTION(m_program_settings);
+    PA_ADD_OPTION(USE_TEACHY_TV);
+    PA_ADD_OPTION(SEED_RADIUS);
+    PA_ADD_OPTION(MAX_RESETS);
+    PA_ADD_OPTION(MAX_BALL_THROWS);
+    PA_ADD_OPTION(MAX_RARE_CANDIES);
+    PA_ADD_OPTION(PROFILE);
+    PA_ADD_OPTION(TAKE_VIDEO);
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+    PA_ADD_OPTION(NOTIFICATIONS);
+
+    SEED.add_listener(*this);
+}
+
+void StaticRng::on_config_value_changed(void* object){
+    if (object == &SEED){
+        SEED.set(StringTools::strip(static_cast<std::string>(SEED)));
+        return;
+    }
+}
+
+
+
+void StaticRng::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    /*
+    * Settings: Text Speed fast
+    */
+
+    StaticRng_Descriptor::Stats& stats = env.current_stats<StaticRng_Descriptor::Stats>();
+
+    home_black_border_check(env.console, context);
+
+    RNG_FILTERS.reset();
+    RNG_CALIBRATION.reset_hits();
+
+    const uint16_t TARGET_SEED = parse_seed(env.console, SEED);
+    SeedsDatabase seeds_db(seeds_json_path(GAME_VERSION == GameVersion::firered, LANGUAGE));
+    const SeedMatch seed_match = seeds_db.find_seed(TARGET_SEED, SOUND, SEED_RADIUS);
+    if (!seed_match.found){
+        throw UserSetupError(env.console, "The target Seed was not found in the seed database for this game version, language, and sound setting.");
+    }
+    const std::vector<uint16_t> SEED_VALUES = seed_match.seed_values;
+    const int16_t SEED_POSITION = seed_match.seed_position;
+    const uint64_t SEED_DELAY = seed_match.seed_delay;
+    const SeedButton SEED_BUTTON = seed_match.seed_button;
+    const BlackoutButton EXTRA_BUTTON = seed_match.extra_button;
+    env.log("Seed delay: " + std::to_string(SEED_DELAY) + "ms, button mode: " + seed_match.button_mode
+        + ", column: " + seed_match.column_name);
+
+    BaseStats BASE_STATS;
+    int16_t GENDER_THRESHOLD = -1;
+    uint8_t LEVEL = 30;
+    switch (TARGET){
+    case PokemonFRLG_RngTarget::electrode:
+        BASE_STATS = { 60, 50, 70, 80, 80, 140 };
+        GENDER_THRESHOLD = -1;
+        LEVEL = 34;
+        break;
+    case PokemonFRLG_RngTarget::snorlax:
+        BASE_STATS = { 160, 110, 65, 65, 110, 30 };
+        GENDER_THRESHOLD = 30;
+        LEVEL = 30;
+        break;
+    case PokemonFRLG_RngTarget::articuno:
+        BASE_STATS = { 90, 85, 100, 95, 125, 85 };
+        GENDER_THRESHOLD = -1;
+        LEVEL = 50;
+        break;
+    case PokemonFRLG_RngTarget::zapdos:
+        BASE_STATS = { 90, 90, 85, 125, 90, 100 };
+        GENDER_THRESHOLD = -1;
+        LEVEL = 50;
+        break;
+    case PokemonFRLG_RngTarget::moltres:
+        BASE_STATS = { 90, 100, 90, 125, 85, 90 };
+        GENDER_THRESHOLD = -1;
+        LEVEL = 50;
+        break;
+    case PokemonFRLG_RngTarget::mewtwo:
+        BASE_STATS = { 106, 110, 90, 154, 90, 130 };
+        GENDER_THRESHOLD = -1;
+        LEVEL = 70;
+        break;
+    case PokemonFRLG_RngTarget::hypno:
+        BASE_STATS = { 85, 73, 70, 73, 115, 67 };
+        GENDER_THRESHOLD = 126;
+        LEVEL = 30;
+        break;
+    case PokemonFRLG_RngTarget::hooh:
+        BASE_STATS = { 106, 130, 90, 110, 154, 90 };
+        GENDER_THRESHOLD = -1;
+        LEVEL = 70;
+        break;
+    case PokemonFRLG_RngTarget::lugia:
+        BASE_STATS = { 106, 90, 130, 90, 154, 110 };
+        GENDER_THRESHOLD = -1;
+        LEVEL = 70;
+        break;
+    case PokemonFRLG_RngTarget::deoxys_attack:
+        BASE_STATS = { 50, 180, 20, 180, 20, 150 };
+        GENDER_THRESHOLD = -1;
+        LEVEL = 30;
+        break;
+    case PokemonFRLG_RngTarget::deoxys_defense:
+        BASE_STATS = { 50, 70, 160, 70, 160, 90 };
+        GENDER_THRESHOLD = -1;
+        LEVEL = 30;
+        break;
+    default:
+        break;
+    }
+
+    static const int64_t FIXED_SEED_OFFSET = -845; // milliseconds, approximate
+    
+    static const uint64_t CONTINUE_SCREEN_FRAMES = 200;
+
+    const uint8_t MAX_HISTORY_LENGTH = USE_TEACHY_TV ? 2 : 10;
+
+    const uint64_t INITIAL_ADVANCES_RADIUS = USE_TEACHY_TV ? 4096 : 1024;
+
+    static const std::set<std::string> SPECIES_LIST = {
+        "electrode", "snorlax", 
+        "articuno", "zapdos", "moltres", "mewtwo", 
+        "hypno", "ho-oh", "lugia", "deoxys" 
+    };
+
+    env.log("RNG Target: " + std::to_string(TARGET.current_value()));
+    env.log("Target Seed: " + to_hex_string(TARGET_SEED));
+    env.log("Target Advances: " + std::to_string(ADVANCES));
+
+    AdvRngSearcher searcher(TARGET_SEED, ADVANCES, AdvRngMethod::Method1);
+    AdvPokemonResult target_result = searcher.generate_pokemon();
+    RNG_TARGET.set_target(target_result, GENDER_THRESHOLD);
+    log_target_pokemon(env.console, target_result);
+
+    RngCalibrations calibrations = {
+        RNG_CALIBRATION.seed_calibration / FRLG_FRAME_DURATION,
+        RNG_CALIBRATION.csf_calibration,
+        RNG_CALIBRATION.advances_calibration
+    };
+    log_calibrations(env.console, calibrations, true);
+
+    Milliseconds launch_delay = INITIAL_LAUNCH_DELAY;
+
+    RngUncertainHistory uncertain_history;
+    RngCalibrationHistory calibration_history; 
+
+    uint16_t failed_searches = 0;
+
+    while (true){
+        if (calibration_history.results.size() > 0){
+            env.log("Checking for nonshiny target hit...");
+            if (have_hit_target(TARGET_SEED, ADVANCES, calibration_history.results.back())){
+                env.log("Target Hit!");
+                stats.nonshiny++;
+                break;
+            }
+            env.log("Missed target.");
+        }
+
+        if (failed_searches >= 5){
+            throw UserSetupError(env.console, "The target Seed is missing from the list of nearby seeds.");
+        }
+
+        if (stats.resets > MAX_RESETS){
+            env.log("Max resets reached.");
+            break;
+        }
+
+        send_program_status_notification(
+            env, NOTIFICATION_STATUS_UPDATE,
+            "Calibrating."
+        );
+        env.update_stats();
+
+        uint64_t advances_radius = get_advances_radius(env.console, calibration_history, INITIAL_ADVANCES_RADIUS);
+
+        if (calibration_history.results.size() > 0){
+            calibrations = get_calibrations(env.console, calibration_history, SEED_VALUES, SEED_POSITION, ADVANCES);
+        }
+
+        // if previous resets had uncertain advances, slightly modify the seed delay to try to hit a different target
+        apply_seed_bump(calibrations, uncertain_history);
+
+        uint64_t ingame_advances = ADVANCES - CONTINUE_SCREEN_FRAMES;
+
+        RngTimings timings = prepare_timings(
+            env.console, TARGET,
+            SEED_DELAY, CONTINUE_SCREEN_FRAMES, ingame_advances,
+            USE_TEACHY_TV, calibrations,
+            FIXED_SEED_OFFSET
+        );
+
+        env.log("Resetting Game...");
+        reset_and_perform_blind_sequence(
+            env.console, context, LANGUAGE, TARGET, 
+            SEED_BUTTON, EXTRA_BUTTON, timings, 
+            launch_delay, false, PROFILE
+        );
+        stats.resets++;
+
+        RNG_FILTERS.reset();
+        RNG_CALIBRATION.set_calibrations(calibrations);
+        RNG_CALIBRATION.reset_hits();
+
+        bool shiny_found = check_for_shiny(env.console, context, TARGET);
+
+        if (shiny_found){
+            env.log("Shiny found!");
+            stats.shinies++;
+            RNG_CALIBRATION.hits.set("Shiny!");
+            send_program_notification(
+                env,
+                NOTIFICATION_SHINY,
+                COLOR_YELLOW,
+                "Shiny found!",
+                {}, "",
+                env.console.video().snapshot(),
+                true
+            );
+            if (TAKE_VIDEO){
+                pbf_press_button(context, BUTTON_CAPTURE, 2000ms, 0ms);
+            }
+            break;
+        }
+
+        int balls_thrown = auto_catch(env.console, context, MAX_BALL_THROWS);
+        if (balls_thrown < 0){
+            stats.errors++;
+            send_program_recoverable_error_notification(
+                env, NOTIFICATION_ERROR_RECOVERABLE,
+                "auto_catch() encountered an error."
+            ); 
+            continue;
+        }else if(balls_thrown == 0){
+            env.log("Failed catch.");
+            continue;
+        }
+
+        // skip through dialogue after the Hypno battle
+        if (TARGET == PokemonFRLG_RngTarget::hypno){
+            pbf_mash_button(context, BUTTON_B, 15s);
+        }
+
+        go_to_summary(env.console, context);
+        AdvObservedPokemon pokemon = read_summary(env.console, context, LANGUAGE, SPECIES_LIST);
+        pokemon.level[0] = LEVEL;
+        AdvRngFilters filters = observation_to_filters(pokemon, BASE_STATS);
+        RNG_FILTERS.set(filters);
+
+        std::vector<AdvRngState> search_hits = refine_calibration_with_rare_candy(
+            env, context, LANGUAGE, pokemon, filters, BASE_STATS,
+            uncertain_history, calibration_history, calibrations,
+            MAX_HISTORY_LENGTH, MAX_RARE_CANDIES, AdvRngMethod::Method1, false,
+            stats.errors, NOTIFICATION_ERROR_RECOVERABLE,
+            [&](AdvRngFilters& f){
+                return get_search_results(env.console, searcher, f, SEED_VALUES, ADVANCES, advances_radius, GENDER_THRESHOLD);
+            },
+            [&](const std::vector<AdvRngState>& h){ RNG_CALIBRATION.set_hits(h); },
+            [&](const AdvRngFilters& f){ RNG_FILTERS.set(f); },
+            [&](const std::vector<AdvRngState>& h){
+                return all_equal(h) || all_indistinguishable(h, searcher, GENDER_THRESHOLD);
+            }
+        );
+
+        env.log("RNG search finished.");
+        update_failed_searches(failed_searches, search_hits);
+
+    }
+
+    if (GO_HOME_WHEN_DONE){
+        pbf_press_button(context, BUTTON_HOME, 200ms, 1000ms);
+    }
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_StaticRng.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_StaticRng.h
new file mode 100644
index 0000000000..29e117f7fa
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_StaticRng.h
@@ -0,0 +1,89 @@
+/*  Static RNG
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonFRLG_StaticRng_H
+#define PokemonAutomation_PokemonFRLG_StaticRng_H
+
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "Common/Cpp/Options/FloatingPointOption.h"
+#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "Common/Cpp/Options/StaticTextOption.h"
+#include "Common/Cpp/Options/TextEditOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "CommonTools/Options/LanguageOCROption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+#include "Pokemon/Pokemon_StatsCalculation.h"
+#include "Pokemon/Pokemon_AdvRng.h"
+#include "PokemonFRLG_BlindNavigation.h"
+#include "PokemonFRLG_RngCalibration.h"
+#include "PokemonFRLG_RngDisplays.h"
+#include "PokemonFRLG_SeedsDatabase.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+class StaticRng_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    StaticRng_Descriptor();
+    struct Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+class StaticRng : public SingleSwitchProgramInstance, private ConfigOption::Listener{
+public:
+    using Descriptor = StaticRng_Descriptor;
+    ~StaticRng();
+    StaticRng();
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext &context) override;
+    virtual void start_program_border_check(
+        VideoStream& stream,
+        FeedbackType feedback_type
+    ) override{}
+
+private:
+    virtual void on_config_value_changed(void* object) override;
+
+    enum class GameVersion{
+        firered,
+        leafgreen
+    };
+
+    SectionDividerOption m_calibration_displays;
+    RngTargetDisplay RNG_TARGET;
+    RngFilterDisplay RNG_FILTERS;
+    RngCalibrationDisplay RNG_CALIBRATION;
+
+    SectionDividerOption m_game_info;
+    EnumDropdownOption<GameVersion> GAME_VERSION;
+    OCR::LanguageOCROption LANGUAGE;
+    EnumDropdownOption<SoundSetting> SOUND;
+
+    SectionDividerOption m_target_settings;
+    EnumDropdownOption<PokemonFRLG_RngTarget> TARGET;
+    StringOption SEED;
+    SimpleIntegerOption<uint64_t>ADVANCES;
+
+    SectionDividerOption m_program_settings;
+    BooleanCheckBoxOption USE_TEACHY_TV;
+    SimpleIntegerOption<uint16_t> SEED_RADIUS;
+    SimpleIntegerOption<uint64_t> MAX_RESETS;
+    SimpleIntegerOption<uint64_t> MAX_RARE_CANDIES;
+    SimpleIntegerOption<uint64_t> MAX_BALL_THROWS;
+    SimpleIntegerOption<uint8_t> PROFILE;
+
+    BooleanCheckBoxOption TAKE_VIDEO;
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
+    EventNotificationOption NOTIFICATION_SHINY;
+    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_WildRng.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_WildRng.cpp
new file mode 100644
index 0000000000..9aeb97fb45
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_WildRng.cpp
@@ -0,0 +1,637 @@
+/*  Wild RNG
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Strings/StringTools.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/Language.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonFRLG/Inference/PokemonFRLG_WildEncounterReader.h"
+#include "VideoGames/PokemonFRLG/Programs/PokemonFRLG_SafariOptimalAction.h"
+#include "VideoGames/PokemonFRLG/PokemonFRLG_Navigation.h"
+#include "PokemonFRLG_RngNavigation.h"
+#include "PokemonFRLG_HardReset.h"
+#include "PokemonFRLG_RngCalibration.h"
+#include "PokemonFRLG_RngLoopRoutines.h"
+#include "PokemonFRLG_LocationsDatabase.h"
+#include "PokemonFRLG_RngStatsDatabase.h"
+#include "PokemonFRLG_EncountersDatabase.h"
+#include "PokemonFRLG_WildRng.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+
+WildRng_Descriptor::WildRng_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonFRLG:WildRng",
+        Pokemon::STRING_POKEMON + " FRLG", "Wild RNG",
+        "Programs/PokemonFRLG/WildRng.html",
+        "Automatically calibrate timings to hit a specific RNG target for FRLG random wild encounters.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_RequiresPrecision,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+struct WildRng_Descriptor::Stats : public StatsTracker{
+    Stats()
+        : resets(m_stats["Resets"])
+        , shinies(m_stats["Shinies"])
+        , nonshiny(m_stats["Non-Shiny Hits"])
+        , errors(m_stats["Errors"])
+    {
+        m_display_order.emplace_back("Resets");
+        m_display_order.emplace_back("Shinies");
+        m_display_order.emplace_back("Non-Shiny Hits", HIDDEN_IF_ZERO);
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+    }
+    std::atomic<uint64_t>& resets;
+    std::atomic<uint64_t>& shinies;
+    std::atomic<uint64_t>& nonshiny;
+    std::atomic<uint64_t>& errors;
+};
+std::unique_ptr<StatsTracker> WildRng_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+WildRng::~WildRng(){
+    GAME_LOCATION.remove_listener(*this);
+    SEED.remove_listener(*this);
+}
+
+WildRng::WildRng()
+    : m_calibration_displays(
+        "<font size=4><b>Calibration Displays</b></font> — These will update automatically as the program runs"
+    )
+    , m_game_info(
+        "<font size=4><b>Game Information</b></font>"
+    )
+    , GAME_VERSION(
+        "<b>Game Version:</b>",
+        {
+            {GameVersion::firered, "firered", "FireRed"},
+            {GameVersion::leafgreen, "leafgreen", "LeafGreen"}
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        GameVersion::firered
+    )
+    , LANGUAGE(
+        "<b>Game Language:</b>",
+        {
+            Language::English,
+            Language::Japanese,
+            Language::Spanish,
+            Language::French,
+            Language::German,
+            Language::Italian,
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        true
+    )
+    , SOUND(
+        "<b>Sound:</b><br>"
+        "Your in-game sound setting. This affects the possible seeds.",
+        {
+            {SoundSetting::Mono, "mono", "Mono"},
+            {SoundSetting::Stereo, "stereo", "Stereo"}
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        SoundSetting::Mono
+    )
+    , m_target_settings(
+        "<font size=4><b>Target Settings</b></font> — Get these from an RNG search tool"
+    )
+    , ENCOUNTER_TYPE(
+        "<b>Encounter Type:</b>",
+        {
+            {EncounterType::grass, "grass", "Grass"},
+            {EncounterType::rocksmash, "rocksmash", "Rock Smash"},
+            {EncounterType::surfing, "surfing", "Surfing"},
+            {EncounterType::oldrod, "oldrod", "Old Rod"},
+            {EncounterType::goodrod, "goodrod", "Good Rod"},
+            {EncounterType::superrod, "superrod", "Super Rod"},
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        EncounterType::grass
+    )
+    , LOCATIONS_DATABASE(make_locations_database("PokemonFRLG/Locations.json"))
+    , GAME_LOCATION(
+        "<b>Location:</b>",
+        LOCATIONS_DATABASE,
+        LockMode::LOCK_WHILE_RUNNING,
+        "route_1"
+    )    
+    , RNG_METHOD(
+        "<b>RNG Method:</b><br>"
+        "This should usually be set to Method1 for Grass encounters.<br>"
+        "All RNG methods are checked during calibration regardless of this setting.",
+        {
+            {AdvRngMethod::Method1, "Method1", "Method1"},
+            {AdvRngMethod::Method2, "Method2", "Method2"},
+            {AdvRngMethod::Method4, "Method4", "Method4"},
+
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        AdvRngMethod::Method1
+    )
+    , SEED(
+        false,
+        "<b>Target Seed:</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        "70FE", "70FE"
+    )
+    , ADVANCES(
+        "<b>Advances:</b><br>The total number of RNG advances for your target.",
+        LockMode::LOCK_WHILE_RUNNING,
+        10000, 700, 1000000000 // default, min
+    )
+    , m_program_settings(
+        "<font size=4><b>Program Settings</b></font>"
+    )
+    , AUTO_CATCH_SHINY(
+        "<b>Auto Catch Shiny:</b><br>"
+        "Attempt to catch shinies in the Safari Zone using the optimal catching strategy.<br>"
+        "If the catch fails, reset and keep hunting.",
+        LockMode::LOCK_WHILE_RUNNING,
+        false
+    )
+    , USE_TEACHY_TV(
+        "<b>Use Teachy TV:</b>"
+        "<br>Opens the Teachy TV to quickly advance the RNG at 313x speed.<br>"
+        "<i>Warning: can result in larger misses.</i>",
+        LockMode::LOCK_WHILE_RUNNING,
+        false // default
+    )
+    , SEED_RADIUS(
+        "<b>Nearby Seed Radius:</b><br>"
+        "The number of nearby seeds on each side of the target to search when identifying which seed was hit.",
+        LockMode::LOCK_WHILE_RUNNING,
+        5, 1 // default, min
+    )
+    , MAX_RESETS(
+        "<b>Max Resets:</b>",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        50, 0 // default, min
+    )
+    , MAX_RARE_CANDIES(
+        "<b>Max Rare Candies:</b><br>"
+        "The number of rare candies in your bag. Make sure these are at the top position of the bag.<br>"
+        "Rare candies used during calibration will be restored after resetting.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        0, 0, 98 // default, min, max
+    )
+    , MAX_BALL_THROWS(
+        "<b>Max Balls Thrown:</b><br>"
+        "The number of " + STRING_POKEBALL + "s in your bag to attempt to throw. Make sure these are at the top position of the bag.<br>"
+        "Balls thrown during calibration will be restored after resetting.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        30, 1, 999 // default, min, max
+    )
+    , PROFILE(
+        "<b>User Profile Position:</b><br>"
+        "The position, from left to right, of the Switch profile with the FRLG save you'd like to use.<br>"
+        "If this is set to 0, Switch 1 defaults to the last-used profile, while Switch 2 defaults to the first profile (position 1)",
+        LockMode::LOCK_WHILE_RUNNING,
+        0, 0, 8 // default, min, max
+    )
+    , TAKE_VIDEO(
+        "<b>Take Video:</b><br>Record a video when the shiny is found.", 
+        LockMode::LOCK_WHILE_RUNNING, 
+        true // default
+    )
+    , GO_HOME_WHEN_DONE(true)
+    , NOTIFICATION_SHINY(
+        "Shiny found",
+        true, true, ImageAttachmentMode::JPG,
+        {"Notifs", "Showcase"}
+    )
+    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_SHINY,
+        &NOTIFICATION_STATUS_UPDATE,
+        &NOTIFICATION_PROGRAM_FINISH,
+    })
+{
+    PA_ADD_OPTION(m_calibration_displays);
+    PA_ADD_OPTION(RNG_TARGET);
+    PA_ADD_OPTION(RNG_FILTERS);
+    PA_ADD_OPTION(RNG_CALIBRATION);
+    PA_ADD_OPTION(m_game_info);
+    PA_ADD_OPTION(GAME_VERSION);
+    PA_ADD_OPTION(LANGUAGE);
+    PA_ADD_OPTION(SOUND);
+    PA_ADD_OPTION(m_target_settings);
+    PA_ADD_OPTION(ENCOUNTER_TYPE);
+    PA_ADD_OPTION(GAME_LOCATION);
+    PA_ADD_OPTION(RNG_METHOD);
+    PA_ADD_OPTION(SEED);
+    PA_ADD_OPTION(ADVANCES);
+    PA_ADD_OPTION(m_program_settings);
+    PA_ADD_OPTION(AUTO_CATCH_SHINY);
+    PA_ADD_OPTION(USE_TEACHY_TV);
+    PA_ADD_OPTION(SEED_RADIUS);
+    PA_ADD_OPTION(MAX_RESETS);
+    PA_ADD_OPTION(MAX_BALL_THROWS);
+    PA_ADD_OPTION(MAX_RARE_CANDIES);
+    PA_ADD_OPTION(PROFILE);
+    PA_ADD_OPTION(TAKE_VIDEO);
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+    PA_ADD_OPTION(NOTIFICATIONS);
+
+    WildRng::on_config_value_changed(this);
+    GAME_LOCATION.add_listener(*this);
+    SEED.add_listener(*this);
+}
+
+
+
+void WildRng::on_config_value_changed(void* object){
+    if (object == &SEED){
+        SEED.set(StringTools::strip(static_cast<std::string>(SEED)));
+        return;
+    }
+
+    AUTO_CATCH_SHINY.set_visibility(in_safari_zone() ? ConfigOptionState::ENABLED : ConfigOptionState::HIDDEN);
+}
+
+bool WildRng::in_safari_zone() const{
+    const std::string& loc_slug = GAME_LOCATION.slug();
+    return loc_slug == "safari_zone_area_1_east"
+        || loc_slug == "safari_zone_area_2_north"
+        || loc_slug == "safari_zone_area_3_west"
+        || loc_slug == "safari_zone_entrance";
+}
+
+void WildRng::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    /*
+    * Settings: Text Speed fast
+    */
+
+    WildRng_Descriptor::Stats& stats = env.current_stats<WildRng_Descriptor::Stats>();
+
+    home_black_border_check(env.console, context);
+
+    RNG_FILTERS.reset();
+    RNG_CALIBRATION.reset_hits();
+
+    // prepare database of base stats and gender thresholds
+    RngStatsDatabase STATS_DATA("PokemonFRLG/BaseStats.json");
+
+    // get the relevant encounter slots
+    EncountersDatabase encounters_data(GAME_VERSION == GameVersion::firered ? "PokemonFRLG/EncounterSlotsFR.json" : "PokemonFRLG/EncounterSlotsLG.json");
+
+    EncounterType enc = ENCOUNTER_TYPE;
+    int enc_idx = static_cast <int> (enc);
+    auto enc_entry = ENCOUNTER_TYPE.database().find(enc_idx);
+    std::string enc_slug = enc_entry->slug;
+
+
+    std::string loc_slug = GAME_LOCATION.slug();
+
+    std::map<std::string, std::vector<AdvEncounterSlot>> location_map = encounters_data.get_throw(enc_slug);
+    if (location_map.find(loc_slug)==location_map.end()){
+        throw UserSetupError(env.console, "The target encounter type / location combination could not be found.");
+    }
+
+    std::vector<AdvEncounterSlot> ENCOUNTER_SLOTS = location_map.find(loc_slug)->second;
+    env.log("Encounter slots");
+    for (size_t i=0; i<ENCOUNTER_SLOTS.size(); i++){
+        AdvEncounterSlot& slot = ENCOUNTER_SLOTS[i];
+        env.log("   Slot " + std::to_string(i) + ": " + slot.species + " " + std::to_string(slot.minlevel) + "-" + std::to_string(slot.maxlevel));
+    }    
+
+    std::set<std::string> SPECIES_LIST;
+    for (auto slot : ENCOUNTER_SLOTS){
+        if (slot.species.find("unown") != std::string::npos){
+            SPECIES_LIST.emplace("unown");
+        }else{
+            SPECIES_LIST.emplace(slot.species);
+        }
+    }
+
+    const bool SUPER_ROD = ENCOUNTER_TYPE == EncounterType::superrod;
+
+    const bool UNOWN_BUMPS = (loc_slug == "tanoby_ruins_monean_chamber" ||
+                              loc_slug == "tanoby_ruins_viapois_chamber");
+
+    // prepare timings
+
+    const uint16_t TARGET_SEED = parse_seed(env.console, SEED);
+    SeedsDatabase seeds_db(seeds_json_path(GAME_VERSION == GameVersion::firered, LANGUAGE));
+    const SeedMatch seed_match = seeds_db.find_seed(TARGET_SEED, SOUND, SEED_RADIUS);
+    if (!seed_match.found){
+        throw UserSetupError(env.console, "The target Seed was not found in the seed database for this game version, language, and sound setting.");
+    }
+    const std::vector<uint16_t> SEED_VALUES = seed_match.seed_values;
+    const int16_t SEED_POSITION = seed_match.seed_position;
+    const uint64_t SEED_DELAY = seed_match.seed_delay;
+    const SeedButton SEED_BUTTON = seed_match.seed_button;
+    const BlackoutButton EXTRA_BUTTON = seed_match.extra_button;
+    env.log("Seed delay: " + std::to_string(SEED_DELAY) + "ms, button mode: " + seed_match.button_mode
+        + ", column: " + seed_match.column_name);
+
+    PokemonFRLG_RngTarget TARGET = PokemonFRLG_RngTarget::sweetscent;
+
+    const bool safari_zone = in_safari_zone();
+    switch (ENCOUNTER_TYPE){
+        case EncounterType::rocksmash:
+            TARGET = PokemonFRLG_RngTarget::rocksmash;
+            break;
+        case EncounterType::grass:
+            if (safari_zone){
+                if (loc_slug == "safari_zone_area_1_east"){
+                    TARGET = PokemonFRLG_RngTarget::safarizoneeast;
+                }else if (loc_slug == "safari_zone_area_2_north"){
+                    TARGET = PokemonFRLG_RngTarget::safarizonenorth;
+                }else if (loc_slug == "safari_zone_area_3_west"){
+                    TARGET = PokemonFRLG_RngTarget::safarizonewest;
+                }else{
+                    TARGET = PokemonFRLG_RngTarget::safarizonecenter;
+                }
+                break;
+            }
+        case EncounterType::surfing:
+            TARGET = safari_zone ? PokemonFRLG_RngTarget::safarizonesurf : PokemonFRLG_RngTarget::sweetscent;
+            break;
+        case EncounterType::oldrod:
+        case EncounterType::goodrod:
+        case EncounterType::superrod:
+            TARGET = safari_zone ? PokemonFRLG_RngTarget::safarizonefish : PokemonFRLG_RngTarget::fishing;
+            break;
+        default:
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "WildRng(): Unrecognized encounter type",
+                env.console
+            ); 
+    }
+
+    static const int64_t FIXED_SEED_OFFSET = -845; // milliseconds, approximate
+
+    static const uint64_t CONTINUE_SCREEN_FRAMES = 200;
+
+    const uint64_t INITIAL_ADVANCES_RADIUS = USE_TEACHY_TV ? 4096 : 1024;
+
+    const uint8_t MAX_HISTORY_LENGTH = USE_TEACHY_TV ? 2 : 10;
+
+    env.log("Game Location: " + loc_slug);
+    env.log("Encounter Type: " + enc_slug);
+    env.log("Target Seed: " + to_hex_string(TARGET_SEED));
+    env.log("Target Advances: " + std::to_string(ADVANCES));
+
+    AdvRngWildSearcher searcher(TARGET_SEED, ADVANCES, ENCOUNTER_SLOTS, RNG_METHOD);
+    AdvWildPokemonResult target_result = searcher.generate_pokemon(SUPER_ROD);
+    RNG_TARGET.set_target(target_result, STATS_DATA.get_nothrow(target_result.species)->gender_threshold);
+    env.log("Target Species: " + target_result.species);
+    env.log("Target Level: " + std::to_string(target_result.level));
+    env.log("Target Encounter Slot: " + std::to_string(target_result.slot));
+    env.log("Target PID: " + to_hex_string(target_result.pid));
+    env.log("Target Nature: " + nature_to_string(target_result.nature));
+    env.log("Target IVs:");
+    env.log("   HP: " + std::to_string(target_result.ivs.hp));
+    env.log("   Atk: " + std::to_string(target_result.ivs.attack));
+    env.log("   Def: " + std::to_string(target_result.ivs.defense));
+    env.log("   SpA: " + std::to_string(target_result.ivs.spatk));
+    env.log("   SpD: " + std::to_string(target_result.ivs.spdef));
+    env.log("   Spe: " + std::to_string(target_result.ivs.speed));
+
+    const RngCalibrations initial_calibrations = {
+        RNG_CALIBRATION.seed_calibration / FRLG_FRAME_DURATION,
+        RNG_CALIBRATION.csf_calibration,
+        RNG_CALIBRATION.advances_calibration
+    };
+    RngCalibrations calibrations = initial_calibrations;
+    log_calibrations(env.console, calibrations, true);
+
+    Milliseconds launch_delay = INITIAL_LAUNCH_DELAY;
+
+    RngUncertainHistory uncertain_history;
+    RngCalibrationHistory calibration_history; 
+
+    uint16_t failed_searches = 0;
+    uint16_t advances_bump = 0;
+
+    while (true){
+        if (calibration_history.results.size() > 0){
+            env.log("Checking for nonshiny target hit...");
+            if (have_hit_target(TARGET_SEED, ADVANCES, calibration_history.results.back())){
+                env.log("Target Hit!");
+                stats.nonshiny++;
+                break;
+            }
+            env.log("Missed target.");
+        }
+
+        if (failed_searches >= 5){
+            env.log("Failed to find any matches 5 times in a row");
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::NO_ERROR_REPORT,
+                "Failed to find any matches 5 times in a row. Check your seed and advances settings.",
+                env.console
+            ); 
+            break;
+        }
+
+        if (stats.resets > MAX_RESETS){
+            env.log("Max resets reached.");
+            break;
+        }
+
+        send_program_status_notification(
+            env, NOTIFICATION_STATUS_UPDATE,
+            "Calibrating."
+        );
+        env.update_stats();
+
+        uint64_t advances_radius = get_advances_radius(env.console, calibration_history, INITIAL_ADVANCES_RADIUS);
+
+        if (calibration_history.results.size() > 0){
+            calibrations = get_calibrations(env.console, calibration_history, SEED_VALUES, SEED_POSITION, ADVANCES);
+        }else{
+            calibrations = initial_calibrations;
+        }
+
+        // there can be long runs of identical unowns (especially for A and Z), 
+        // so a moderate offset may be needed to gain additional info about advances position
+        if (UNOWN_BUMPS){
+            if (uncertain_history.results.empty()){
+                advances_bump = 0;
+            }else{
+                calibrations.ingame_offset += advances_bump;
+            }
+        }else{
+            // if previous resets had uncertain advances, slightly modify the seed delay to try to hit a different target
+            apply_seed_bump(calibrations, uncertain_history);
+        }
+
+        uint64_t ingame_advances = ADVANCES - CONTINUE_SCREEN_FRAMES;
+
+        RngTimings timings = prepare_timings(
+            env.console, TARGET,
+            SEED_DELAY, CONTINUE_SCREEN_FRAMES, ingame_advances,
+            USE_TEACHY_TV, calibrations,
+            FIXED_SEED_OFFSET
+        );
+
+        env.log("Resetting Game...");
+        reset_and_perform_blind_sequence(
+            env.console, context, LANGUAGE, TARGET, 
+            SEED_BUTTON, EXTRA_BUTTON, timings, 
+            launch_delay, safari_zone, PROFILE
+        );
+        stats.resets++; 
+
+        RNG_FILTERS.reset();
+        RNG_CALIBRATION.set_calibrations(calibrations);
+        RNG_CALIBRATION.reset_hits();
+
+        int ret = watch_for_shiny_encounter(env.console, context);
+        if (ret < 0){
+            if (   TARGET == PokemonFRLG_RngTarget::fishing 
+                || TARGET == PokemonFRLG_RngTarget::rocksmash
+                || TARGET == PokemonFRLG_RngTarget::safarizonefish
+            ){
+                env.log("No battle triggered. Resetting...");
+                continue;
+            }else{
+                OperationFailedExceptionWithScreenshot::fire(
+                    ErrorReportMode::SEND_ERROR_REPORT,
+                    "WildRng(): Failed to trigger battle",
+                    env.console
+                ); 
+            }
+        }
+        bool shiny_found = (ret == 1);
+
+        if (shiny_found){
+            env.log("Shiny found!");
+            stats.shinies++;
+            RNG_CALIBRATION.hits.set("Shiny!");
+            send_program_notification(
+                env,
+                NOTIFICATION_SHINY,
+                COLOR_YELLOW,
+                "Shiny found!",
+                {}, "",
+                env.console.video().snapshot(),
+                true
+            );
+            if (TAKE_VIDEO){
+                pbf_press_button(context, BUTTON_CAPTURE, 2000ms, 0ms);
+            }
+
+            if (!AUTO_CATCH_SHINY || !safari_zone){
+                break;
+            }
+        }
+
+        int catch_result = 0;
+        if (safari_zone){
+            int safari_balls_remaining = 30;
+
+            pbf_press_button(context, BUTTON_B, 100ms, 500ms);
+            context.wait_for_all_requests();
+
+            WildEncounterReader reader(COLOR_RED);
+            VideoOverlaySet overlays(env.console.overlay());
+            reader.make_overlays(overlays);
+            VideoSnapshot screen = env.console.video().snapshot();
+            PokemonFRLG_WildEncounter encounter = reader.read_encounter(env.logger(), LANGUAGE, screen, SAFARI_ZONE_POKEMON_SUBSET);
+
+            catch_result = auto_catch_safari(env.console, context, LANGUAGE, safari_balls_remaining, encounter.name);
+        }else{
+            catch_result = auto_catch(env.console, context, MAX_BALL_THROWS);
+        }
+
+        if (catch_result < 0){
+            stats.errors++;
+            send_program_recoverable_error_notification(
+                env, NOTIFICATION_ERROR_RECOVERABLE,
+                safari_zone ? "auto_catch_safari() encountered an error." : "auto_catch() encountered an error."
+            );
+            continue;
+        }else if (catch_result == 0){
+            env.log("Failed catch.");
+            continue;
+        }
+
+        if (shiny_found){
+            env.log("Shiny caught!");
+            break;
+        }
+
+        go_to_summary(env.console, context, 0, safari_zone ? StartMenuContext::SAFARI_ZONE : StartMenuContext::STANDARD);
+        AdvObservedPokemon pokemon = read_summary(env.console, context, LANGUAGE, SPECIES_LIST);
+        RngStats species_stats;
+        try{
+            species_stats = STATS_DATA.get_throw(pokemon.species);        
+        }catch (const InternalProgramError& err){
+            env.log(err.message());
+            env.log("Failed to load base stats.", COLOR_RED);
+            continue;
+        }
+        BaseStats base_stats = species_stats.base_stats;
+        int16_t gender_threshold = species_stats.gender_threshold;
+
+        AdvRngFilters filters = observation_to_filters(pokemon, base_stats, AdvRngMethod::Any);
+        bool valid_stats = validate_level(filters, pokemon, ENCOUNTER_SLOTS, base_stats);
+        RNG_FILTERS.set(filters);
+
+        if (!valid_stats){
+            env.log("Invalid encounter stats. Resetting...", COLOR_RED);
+            failed_searches++;
+            continue;
+        }
+
+        std::vector<AdvRngState> search_hits = refine_calibration_with_rare_candy(
+            env, context, LANGUAGE, pokemon, filters, base_stats,
+            uncertain_history, calibration_history, calibrations,
+            MAX_HISTORY_LENGTH, MAX_RARE_CANDIES, AdvRngMethod::Any, safari_zone,
+            stats.errors, NOTIFICATION_ERROR_RECOVERABLE,
+            [&](AdvRngFilters& f){
+                return get_wild_search_results(env.console, searcher, f, SEED_VALUES, ADVANCES, advances_radius, gender_threshold, SUPER_ROD);
+            },
+            [&](const std::vector<AdvRngState>& h){ RNG_CALIBRATION.set_hits(h); },
+            [](const AdvRngFilters&){}, // WildRng intentionally does not refresh the filter display mid-loop
+            [&](const std::vector<AdvRngState>& h){
+                return all_equal(h) || all_indistinguishable(h, searcher, gender_threshold, SUPER_ROD);
+            }
+        );
+
+        env.log("RNG search finished.");
+        update_failed_searches(failed_searches, search_hits);
+
+        if (   UNOWN_BUMPS
+            && search_hits.size() > 0
+            && same_seeds(search_hits)
+            && search_hits[0].seed == TARGET_SEED
+        ){
+            // keep increasing advances until hitting something that provides new information (A/Z form with different nature/IVs or a !/? form)
+            // only bump advances for the target seed to ensure nothing is missed
+            advances_bump++;
+        }
+    }
+
+    if (GO_HOME_WHEN_DONE){
+        pbf_press_button(context, BUTTON_HOME, 200ms, 1000ms);
+    }
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_WildRng.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_WildRng.h
new file mode 100644
index 0000000000..1fa342063a
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_WildRng.h
@@ -0,0 +1,100 @@
+/*  Wild RNG
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonFRLG_WildRng_H
+#define PokemonAutomation_PokemonFRLG_WildRng_H
+
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "Common/Cpp/Options/StaticTextOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "CommonTools/Options/LanguageOCROption.h"
+#include "CommonTools/Options/StringSelectOption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+#include "Pokemon/Pokemon_AdvRng.h"
+#include "PokemonFRLG_BlindNavigation.h"
+#include "PokemonFRLG_RngDisplays.h"
+#include "PokemonFRLG_SeedsDatabase.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+class WildRng_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    WildRng_Descriptor();
+    struct Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+class WildRng : public SingleSwitchProgramInstance, private ConfigOption::Listener{
+public:
+    using Descriptor = WildRng_Descriptor;
+    ~WildRng();
+    WildRng();
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext &context) override;
+    virtual void start_program_border_check(
+        VideoStream& stream,
+        FeedbackType feedback_type
+    ) override{}
+
+private:
+    virtual void on_config_value_changed(void* object) override;
+    bool in_safari_zone() const;
+
+    enum class GameVersion{
+        firered,
+        leafgreen
+    };
+
+    enum class EncounterType{
+        grass,
+        rocksmash,
+        surfing,
+        oldrod,
+        goodrod,
+        superrod
+    };
+
+    SectionDividerOption m_calibration_displays;
+    RngTargetDisplay RNG_TARGET;
+    RngFilterDisplay RNG_FILTERS;
+    RngCalibrationDisplay RNG_CALIBRATION;
+
+    SectionDividerOption m_game_info;
+    EnumDropdownOption<GameVersion> GAME_VERSION;
+    OCR::LanguageOCROption LANGUAGE;
+    EnumDropdownOption<SoundSetting> SOUND;
+
+    SectionDividerOption m_target_settings;
+    EnumDropdownOption<EncounterType> ENCOUNTER_TYPE;
+    StringSelectDatabase LOCATIONS_DATABASE;
+    StringSelectOption GAME_LOCATION;
+    EnumDropdownOption<AdvRngMethod> RNG_METHOD;
+    StringOption SEED;
+    SimpleIntegerOption<uint64_t>ADVANCES;
+
+    SectionDividerOption m_program_settings;
+    BooleanCheckBoxOption AUTO_CATCH_SHINY;
+    BooleanCheckBoxOption USE_TEACHY_TV;
+    SimpleIntegerOption<uint16_t> SEED_RADIUS;
+    SimpleIntegerOption<uint64_t> MAX_RESETS;
+    SimpleIntegerOption<uint64_t> MAX_RARE_CANDIES;
+    SimpleIntegerOption<uint64_t> MAX_BALL_THROWS;
+    SimpleIntegerOption<uint8_t> PROFILE;
+
+    BooleanCheckBoxOption TAKE_VIDEO;
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
+    EventNotificationOption NOTIFICATION_SHINY;
+    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_GiftReset.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_GiftReset.cpp
new file mode 100644
index 0000000000..cc6e5a70bc
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_GiftReset.cpp
@@ -0,0 +1,508 @@
+/*  Gift Reset
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_DialogDetector.h"
+#include "VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_PartyMenuDetector.h"
+#include "VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_StartMenuDetector.h"
+#include "VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_SummaryDetector.h"
+#include "VideoGames/PokemonFRLG/Inference/PokemonFRLG_ShinySymbolDetector.h"
+#include "VideoGames/PokemonFRLG/PokemonFRLG_Navigation.h"
+#include "VideoGames/PokemonFRLG/Programs/PokemonFRLG_StartMenuNavigation.h"
+#include "PokemonFRLG_GiftReset.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+GiftReset_Descriptor::GiftReset_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonFRLG:GiftReset",
+        Pokemon::STRING_POKEMON + " FRLG", "Gift Reset",
+        "Programs/PokemonFRLG/GiftReset.html",
+        "Soft reset for a shiny gift Pokemon.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+struct GiftReset_Descriptor::Stats : public StatsTracker{
+    Stats()
+        : resets(m_stats["Resets"])
+        , shinies(m_stats["Shinies"])
+        , errors(m_stats["Errors"])
+    {
+        m_display_order.emplace_back("Resets");
+        m_display_order.emplace_back("Shinies");
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+    }
+    std::atomic<uint64_t>& resets;
+    std::atomic<uint64_t>& shinies;
+    std::atomic<uint64_t>& errors;
+};
+std::unique_ptr<StatsTracker> GiftReset_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+GiftReset::GiftReset()
+    : TARGET(
+        "<b>Target:</b><br>",
+        {
+            {Target::starters, "starters", "Bulbasaur / Squirtle / Charmander"},
+            {Target::hitmon, "hitmon", "Magikarp, Hitmonlee / Hitmonchan"},
+            {Target::eevee, "eevee", "Eevee"},
+            {Target::lapras, "lapras", "Lapras"},
+            {Target::fossils, "fossils", "Omanyte / Kabuto / Aerodactyl "},
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        Target::starters
+    )
+    , TAKE_VIDEO("<b>Take Video:</b><br>Record a video when the shiny is found.", LockMode::UNLOCK_WHILE_RUNNING, true)
+    , GO_HOME_WHEN_DONE(true)
+    , NOTIFICATION_SHINY(
+        "Shiny found",
+        true, true, ImageAttachmentMode::JPG,
+        {"Notifs", "Showcase"}
+    )
+    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_SHINY,
+        &NOTIFICATION_STATUS_UPDATE,
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_RECOVERABLE,
+    })
+{
+    PA_ADD_OPTION(TARGET);
+    PA_ADD_OPTION(TAKE_VIDEO);
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+//Pick up starter, say no to nickname
+void GiftReset::obtain_pokemon(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    GiftReset_Descriptor::Stats& stats = env.current_stats<GiftReset_Descriptor::Stats>();
+
+    /*
+    Ah, starter is your choice... red adv arrow
+    So you're claiming... YES/NO box
+    rly quite energetic... no arrow
+    player received the starter from... no arrow, jingle must complete
+    nickname YES/NO box
+    wait, then rival picks up... no arrow
+    rival received the ... no arrow DONE
+    */
+
+    env.log("Obtaining Pokemon.");
+    if (TARGET == Target::starters){
+        AdvanceWhiteDialogWatcher adv_white_start(COLOR_RED);
+        int rets = run_until<ProControllerContext>(
+            env.console, context,
+            [](ProControllerContext& context){
+                for (int i = 0; i < 10; i++){
+                    pbf_press_button(context, BUTTON_A, 320ms, 640ms);
+                    pbf_wait(context, 2000ms);
+                    context.wait_for_all_requests();
+                }
+            },
+            { adv_white_start }
+            );
+        context.wait_for_all_requests();
+        if (rets < 0){
+            stats.errors++;
+            env.update_stats();
+            env.log("obtain_pokemon(): Unable to start starter dialog after 10 attempts.", COLOR_RED);
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "obtain_pokemon(): Unable to start starter dialog after 10 attempts.",
+                env.console
+            );
+        }
+        env.log("Initial A press completed.");
+    }else{
+        //Need to double check what the first dialog box is for the other gifts
+        pbf_press_button(context, BUTTON_A, 320ms, 640ms);
+    }
+    bool seen_selection_arrow = false;
+    //bool seen_nickname_arrow = false;
+    while (true){
+        context.wait_for_all_requests();
+
+        AdvanceWhiteDialogWatcher adv_white(COLOR_RED);
+        SelectionDialogWatcher selection_dialog(COLOR_RED);
+        //WhiteDialogWatcher white_dialog_no_arrow(COLOR_RED);
+        
+        int ret = wait_until(
+            env.console, context,
+            10s,
+            {
+                adv_white,
+                selection_dialog,
+                //white_dialog_no_arrow,
+            }
+        );
+        context.wait_for(500ms);
+
+        switch (ret){
+        case 0:
+            env.log("Detected Advance Dialog. Pressing B.");
+            pbf_press_button(context, BUTTON_B, 320ms, 640ms);
+            continue;
+        case 1:
+            env.log("Detected Selection Dialog. Pressing A.");
+            if (!seen_selection_arrow){
+
+                if (TARGET == Target::starters || TARGET == Target::hitmon){
+                    env.log("First selection box detected. YES to starter.");
+                    seen_selection_arrow = true;
+                    pbf_press_button(context, BUTTON_A, 320ms, 640ms);
+                }else{
+                    env.log("Selection box detected. NO to nickname.");
+                    pbf_press_button(context, BUTTON_B, 320ms, 640ms);
+                    context.wait_for_all_requests();
+                    return;
+                }
+
+                if (TARGET == Target::starters){
+                    //Skip past energetic and jingle
+                    pbf_press_button(context, BUTTON_B, 320ms, 640ms);
+                    pbf_wait(context, 500ms);
+                    context.wait_for_all_requests();
+                }
+                pbf_press_button(context, BUTTON_B, 320ms, 640ms);
+
+            }else{
+                env.log("Second selection box detected. NO to nickname.");
+                pbf_press_button(context, BUTTON_B, 320ms, 640ms);
+                //seen_nickname_arrow = true;
+
+                if (TARGET == Target::starters){
+                    //Press B some to try and skip the rival's pickup
+                    pbf_press_button(context, BUTTON_B, 320ms, 640ms);
+                    pbf_press_button(context, BUTTON_B, 320ms, 640ms);
+                    pbf_press_button(context, BUTTON_B, 320ms, 640ms);
+                }
+                context.wait_for_all_requests();
+                return;
+            }
+            continue;
+        //case 2:
+        //    if (seen_selection_arrow){
+        //        env.log("White dialog box detected. Pressing B.");
+        //        pbf_press_button(context, BUTTON_B, 320ms, 640ms);
+        //    }
+        //    continue;
+        default:
+            stats.errors++;
+            env.update_stats();
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "obtain_starter(): No recognized state after 10 seconds.",
+                env.console
+            );
+        }
+    }
+    context.wait_for_all_requests();
+}
+
+//Different as lapras has multiple no-red-arrow dialog boxes
+void GiftReset::obtain_lapras(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    env.log("Obtaining Lapras.");
+    pbf_press_button(context, BUTTON_A, 320ms, 640ms);
+
+    //At least 9 lines of dialog/No to nickname for Lapras
+    //At least 4 lines of dialog for fossils
+    //This takes care of the entire conversion+nickname+exit dialog
+    int limit = 10;
+    if (TARGET == Target::fossils){
+        limit = 5;
+    }
+    for (int i = 0; i < limit; i++){
+        pbf_press_button(context, BUTTON_B, 320ms, 640ms);
+        pbf_wait(context, 100ms);
+        context.wait_for_all_requests();
+    }
+    context.wait_for_all_requests();
+}
+
+//After declining to nickname, clear rival pickup and open your starter's summary
+bool GiftReset::try_open_summary(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    //From no to nickname to overworld
+    StartMenuWatcher start_menu(COLOR_RED);
+
+    int ret = run_until<ProControllerContext>(
+        env.console, context,
+        [](ProControllerContext& context){
+            for (int i = 0; i < 10; i++){
+                pbf_press_button(context, BUTTON_B, 320ms, 640ms);
+                pbf_wait(context, 100ms);
+                context.wait_for_all_requests();
+                pbf_press_button(context, BUTTON_PLUS, 320ms, 640ms);
+                pbf_wait(context, 100ms);
+                context.wait_for_all_requests();
+            }
+        },
+        { start_menu }
+    );
+    context.wait_for_all_requests();
+    if (ret < 0){
+        env.update_stats();
+        env.log("open_summary(): Unable to open Start menu after 10 attempts.", COLOR_RED);
+        send_program_recoverable_error_notification(
+            env, NOTIFICATION_ERROR_RECOVERABLE,
+            "open_summary(): Unable to open Start menu after 10 attempts."
+        );
+        return false;
+    }
+
+    if (TARGET == Target::starters){
+        //  We navigate to pokedex since we don't have it yet so it becomes Pokemon.
+        if (!move_cursor_to_position(env.console, context, SelectionArrowPositionStartMenu::POKEDEX)){
+            std::string str = "open_summary(): Unable to move menu cursor to: " + Pokemon::STRING_POKEMON;
+            env.log(str, COLOR_RED);
+            send_program_recoverable_error_notification(
+                env, NOTIFICATION_ERROR_RECOVERABLE,
+                str
+            );
+            return false;
+        }
+    }else{
+        //Pokedex, Pokemon, Bag, Trainer, Save, Option, Exit
+        env.log("Navigating to party menu.");
+        pbf_wait(context, 200ms);
+        context.wait_for_all_requests();
+
+        if (!move_cursor_to_position(env.console, context, SelectionArrowPositionStartMenu::POKEMON)){
+            std::string str = "open_summary(): Unable to move menu cursor to: " + Pokemon::STRING_POKEMON;
+            env.log(str, COLOR_RED);
+            send_program_recoverable_error_notification(
+                env, NOTIFICATION_ERROR_RECOVERABLE,
+                str
+            );
+            return false;
+        }
+    }
+
+    //Open party menu
+    PartyMenuWatcher blk1(COLOR_RED);
+
+    int pm = run_until<ProControllerContext>(
+        env.console, context,
+        [](ProControllerContext& context){
+            pbf_press_button(context, BUTTON_A, 320ms, 640ms);
+            pbf_wait(context, 5000ms);
+            context.wait_for_all_requests();
+        },
+        { blk1 }
+    );
+    context.wait_for_all_requests();
+    if (pm == 0){
+        env.log("Entered party menu.");
+    }else{
+        env.log("open_summary(): Unable to enter party menu.", COLOR_RED);
+        send_program_recoverable_error_notification(
+            env, NOTIFICATION_ERROR_RECOVERABLE,
+            "open_summary(): Unable to enter party menu."
+        );
+        return false;
+    }
+
+    //Press up twice to get to the last slot
+    if (TARGET != Target::starters){
+        PartySlotWatcher last_slot(COLOR_RED, PartySlot::SIX);
+        int ps = run_until<ProControllerContext>(
+            env.console, context,
+            [](ProControllerContext& context){
+                for (int i = 0; i < 15; i++){ //Enough to cycle through 6pty+cxl twice
+                    pbf_wait(context, 320ms);
+                    context.wait_for_all_requests();
+                    pbf_press_dpad(context, DPAD_UP, 320ms, 320ms);
+                }
+            },
+            { last_slot }
+            );
+        context.wait_for_all_requests();
+        if (ps == 0){
+            env.log("Moved selection to slot six.");
+        }else{
+            env.log("open_summary(): Unable to move selection to slot six.", COLOR_RED);
+            send_program_recoverable_error_notification(
+                env, NOTIFICATION_ERROR_RECOVERABLE,
+                "open_summary(): Unable to move selection to slot six."
+            );
+            return false;
+        }
+    }
+
+    //Two presses to open summary
+    BlackScreenOverWatcher blk2(COLOR_RED);
+    int sm = run_until<ProControllerContext>(
+        env.console, context,
+        [](ProControllerContext& context){
+            pbf_press_button(context, BUTTON_A, 320ms, 320ms);
+            pbf_press_button(context, BUTTON_A, 320ms, 320ms);
+            pbf_wait(context, 5000ms);
+            context.wait_for_all_requests();
+        },
+        { blk2 }
+    );
+    if (sm == 0){
+        env.log("Entered summary.");
+    }else{
+        env.log("open_summary(): Unable to enter summary.", COLOR_RED);
+        send_program_recoverable_error_notification(
+            env, NOTIFICATION_ERROR_RECOVERABLE,
+            "open_summary(): Unable to enter summary."
+        );
+        return false;
+    }
+
+    //Double check that we are on summary
+    SummaryWatcher sum1(COLOR_RED);
+    int sm1 = wait_until(
+        env.console, context,
+        std::chrono::seconds(5),
+        {{ sum1 }}
+    );
+    if (sm1 == 0){
+        env.log("Summary page dots detected.");
+    }else{
+        env.log("open_summary(): Unable to detect summary screen.", COLOR_RED);
+        send_program_recoverable_error_notification(
+            env, NOTIFICATION_ERROR_RECOVERABLE,
+            "open_summary(): Unable to detect summary screen."
+        );
+        return false;
+    }
+
+    pbf_wait(context, 1000ms);
+    context.wait_for_all_requests();
+    return true;
+}
+uint64_t GiftReset::open_summary(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    uint64_t errors = 0;
+    for (; errors < 5; errors++){
+        if (try_open_summary(env, context)){
+            return errors;
+        }else{
+            env.log("Mashing B to return to overworld and retry...");
+            pbf_mash_button(context, BUTTON_B, 10000ms);
+        }
+    }
+    OperationFailedExceptionWithScreenshot::fire(
+        ErrorReportMode::SEND_ERROR_REPORT,
+        "open_summary(): Failed to open party summary after 5 attempts.",
+        env.console
+    );
+}
+
+
+void GiftReset::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    //StartProgramChecks::check_performance_class_wired_or_wireless(context);
+
+    GiftReset_Descriptor::Stats& stats = env.current_stats<GiftReset_Descriptor::Stats>();
+
+    home_black_border_check(env.console, context);
+
+    /*
+    * Settings: Text Speed fast. Default borders.
+    * Setup: 5 pokemon in your party. None for starter. Stand in front of the pokemon. Save the game.
+    * For non-starters: move menu cursor back to the top (POKEDEX)!
+    * for starters, pokemon menu will be on top as it is added after picking
+    * For magikarp: you need money to buy it
+    * fossils: need to corner the scientist
+    */
+
+    switch (TARGET){
+    case Target::starters:
+        env.log("Targeting starters.");
+        break;
+    case Target::hitmon:
+        env.log("Targeting Magikarp, Hitmonlee, and Hitmonchan.");
+        break;
+    case Target::eevee:
+        env.log("Targeting Eevee.");
+        break;
+    case Target::lapras:
+        env.log("Targeting Lapras.");
+        break;
+    case Target::fossils:
+        env.log("Targeting fossils.");
+        break;
+    default:
+        stats.errors++;
+        env.update_stats();
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "GiftReset: Invalid target selection.",
+            env.console
+        );
+        break;
+    }
+
+    bool shiny_starter = false;
+
+    while (!shiny_starter){
+        if (TARGET != Target::lapras && TARGET != Target::fossils){
+            obtain_pokemon(env, context);
+        }else{
+            obtain_lapras(env, context);
+        }
+        stats.errors += open_summary(env, context);
+
+        VideoSnapshot screen = env.console.video().snapshot();
+
+        ShinySymbolDetector shiny_checker(COLOR_YELLOW);
+        shiny_starter = shiny_checker.read(env.console.logger(), screen);
+
+        if (shiny_starter){
+            env.log("Shiny found!");
+            stats.shinies++;
+            send_program_notification(
+                env,
+                NOTIFICATION_SHINY,
+                COLOR_YELLOW,
+                "Shiny found!",
+                {}, "",
+                screen,
+                true
+            );
+            if (TAKE_VIDEO){
+                pbf_press_button(context, BUTTON_CAPTURE, 2000ms, 0ms);
+            }
+            break;
+        }else{
+            env.log("Pokemon is not shiny.");
+            env.log("Soft resetting.");
+            send_program_status_notification(
+                env, NOTIFICATION_STATUS_UPDATE,
+                "Soft resetting."
+            );
+            stats.errors += soft_reset(env.console, context);
+            stats.resets++;
+            env.update_stats();
+            context.wait_for_all_requests();
+        }
+    }
+
+    if (GO_HOME_WHEN_DONE){
+        pbf_press_button(context, BUTTON_HOME, 200ms, 1000ms);
+    }
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+}
+
+}
+}
+}
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_GiftReset.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_GiftReset.h
new file mode 100644
index 0000000000..b4f9454191
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_GiftReset.h
@@ -0,0 +1,67 @@
+/*  Gift Reset
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonFRLG_GiftReset_H
+#define PokemonAutomation_PokemonFRLG_GiftReset_H
+
+#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+class GiftReset_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    GiftReset_Descriptor();
+    struct Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+class GiftReset : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = GiftReset_Descriptor;
+    GiftReset();
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext &context) override;
+
+    virtual void start_program_border_check(
+        VideoStream& stream,
+        FeedbackType feedback_type
+    ) override{}
+
+private:
+    void obtain_pokemon(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+    void obtain_lapras(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+    bool try_open_summary(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+    uint64_t open_summary(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+
+    enum class Target{
+        starters,
+        hitmon,
+        eevee,
+        lapras,
+        fossils,
+    };
+    EnumDropdownOption<Target> TARGET;
+
+    BooleanCheckBoxOption TAKE_VIDEO;
+
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
+
+    EventNotificationOption NOTIFICATION_SHINY;
+    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+}
+}
+}
+#endif
+
+
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_LegendaryReset.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_LegendaryReset.cpp
new file mode 100644
index 0000000000..70e6a7bd89
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_LegendaryReset.cpp
@@ -0,0 +1,192 @@
+/*  Legendary Reset
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_DialogDetector.h"
+#include "VideoGames/PokemonFRLG/PokemonFRLG_Navigation.h"
+#include "PokemonFRLG_LegendaryReset.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+LegendaryReset_Descriptor::LegendaryReset_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonFRLG:LegendaryReset",
+        Pokemon::STRING_POKEMON + " FRLG", "Legendary Reset",
+        "Programs/PokemonFRLG/LegendaryReset.html",
+        "Shiny hunt legendary Pokemon using soft resets.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+struct LegendaryReset_Descriptor::Stats : public StatsTracker{
+    Stats()
+        : resets(m_stats["Resets"])
+        , shinies(m_stats["Shinies"])
+        , errors(m_stats["Errors"])
+    {
+        m_display_order.emplace_back("Resets");
+        m_display_order.emplace_back("Shinies");
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+    }
+    std::atomic<uint64_t>& resets;
+    std::atomic<uint64_t>& shinies;
+    std::atomic<uint64_t>& errors;
+};
+std::unique_ptr<StatsTracker> LegendaryReset_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+LegendaryReset::LegendaryReset()
+    : TARGET(
+        "<b>Target:</b><br>",
+        {
+            {Target::press_a, "press_a", "Press A: Articuno, Zapdos, Moltres, Mewtwo, Deoxys, Lugia, Electrode"},
+            {Target::walk_up, "walk_up", "Walk Up: Ho-Oh"},
+            {Target::snorlax, "snorlax", "Snorlax"},
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        Target::press_a
+    )
+    , TAKE_VIDEO("<b>Take Video:</b><br>Record a video when the shiny is found.", LockMode::UNLOCK_WHILE_RUNNING, true)
+    , GO_HOME_WHEN_DONE(true)
+    , NOTIFICATION_SHINY(
+        "Shiny found",
+        true, true, ImageAttachmentMode::JPG,
+        {"Notifs", "Showcase"}
+    )
+    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_SHINY,
+        &NOTIFICATION_STATUS_UPDATE,
+        &NOTIFICATION_PROGRAM_FINISH,
+    })
+{
+    PA_ADD_STATIC(SHINY_REQUIRES_AUDIO);
+    PA_ADD_OPTION(TARGET);
+    PA_ADD_OPTION(TAKE_VIDEO);
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+void LegendaryReset::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    LegendaryReset_Descriptor::Stats& stats = env.current_stats<LegendaryReset_Descriptor::Stats>();
+
+    home_black_border_check(env.console, context);
+
+    /*
+    * Settings: Text Speed fast. Default borders. Audio required.
+    * Setup: Stand in front of target. Save the game.
+    * Lead can be shiny, reset is before lead is even sent out.
+    * This is the same as RSE resets.
+    * For deoxys solve the puzzle first.
+    */
+
+    while (true){
+        switch (TARGET){
+        case Target::press_a:
+            env.log("Target: Press A.");
+            //Talk to target
+            pbf_press_button(context, BUTTON_A, 320ms, 320ms);
+            break;
+        case Target::walk_up:
+            env.log("Target: Walk Up.");
+            //Step forward to start the encounter.
+            pbf_press_dpad(context, DPAD_UP, 320ms, 400ms);
+            break;
+        case Target::snorlax:
+            env.log("Target: Snorlax.");
+            //Use Pokeflute
+            pbf_mash_button(context, BUTTON_A, 3000ms);
+            //Wait a bit for the sound effect before B mash starts
+            pbf_wait(context, 3000ms);
+            context.wait_for_all_requests();
+            break;
+        }
+
+        //Mash B until black screen detected but not over (entered battle)
+        BlackScreenWatcher battle_entered(COLOR_RED);
+        int ret = run_until<ProControllerContext>(
+            env.console, context,
+            [](ProControllerContext& context){
+                //Long mash + wait for cases like Deoxys
+                pbf_mash_button(context, BUTTON_B, 120s);
+                context.wait_for_all_requests();
+            },
+            {battle_entered}
+        );
+        context.wait_for_all_requests();
+        if (ret != 0){
+            stats.errors++;
+            env.update_stats();
+            env.log("Failed to enter battle.", COLOR_RED);
+            stats.errors += soft_reset(env.console, context);
+            continue;
+#if 0
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "Failed to enter battle.",
+                env.console
+            );
+#endif
+        }else{
+            env.log("Battle started.");
+        }
+
+        //handle_encounter will wait for "POKEMON appeared!"
+        bool legendary_shiny = handle_encounter(env.console, context, false);
+        if (legendary_shiny){
+            stats.shinies++;
+            env.update_stats();
+            send_program_notification(
+                env,
+                NOTIFICATION_SHINY,
+                COLOR_YELLOW,
+                "Shiny found!",
+                {}, "",
+                env.console.video().snapshot(),
+                true
+            );
+            if (TAKE_VIDEO){
+                pbf_press_button(context, BUTTON_CAPTURE, 2000ms, 0ms);
+            }
+            break;
+        }
+
+        //No shiny found
+        env.log("Soft resetting.");
+        send_program_status_notification(
+            env, NOTIFICATION_STATUS_UPDATE,
+            "Soft resetting."
+        );
+
+        stats.errors += soft_reset(env.console, context);
+        stats.resets++;
+        env.update_stats();
+        context.wait_for_all_requests();
+    }
+
+    if (GO_HOME_WHEN_DONE){
+        pbf_press_button(context, BUTTON_HOME, 200ms, 1000ms);
+    }
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+}
+
+}
+}
+}
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_LegendaryReset.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_LegendaryReset.h
new file mode 100644
index 0000000000..0acacaab13
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_LegendaryReset.h
@@ -0,0 +1,64 @@
+/*  Legendary Reset
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonFRLG_LegendaryReset_H
+#define PokemonAutomation_PokemonFRLG_LegendaryReset_H
+
+#include "Common/Cpp/Options/EnumDropdownOption.h"
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+#include "VideoGames/PokemonLA/Options/PokemonLA_ShinyDetectedAction.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+class LegendaryReset_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    LegendaryReset_Descriptor();
+    struct Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+class LegendaryReset : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = LegendaryReset_Descriptor;
+    LegendaryReset();
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext &context) override;
+
+    virtual void start_program_border_check(
+        VideoStream& stream,
+        FeedbackType feedback_type
+    ) override{}
+
+private:
+    PokemonLA::ShinyRequiresAudioText SHINY_REQUIRES_AUDIO;
+
+    enum class Target{
+        press_a,
+        walk_up,
+        snorlax,
+    };
+    EnumDropdownOption<Target> TARGET;
+
+    BooleanCheckBoxOption TAKE_VIDEO;
+
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
+
+    EventNotificationOption NOTIFICATION_SHINY;
+    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+}
+}
+}
+#endif
+
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_LegendaryRunAway.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_LegendaryRunAway.cpp
new file mode 100644
index 0000000000..88015c253a
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_LegendaryRunAway.cpp
@@ -0,0 +1,356 @@
+/*  Legendary Run Away
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_DialogDetector.h"
+#include "VideoGames/PokemonFRLG/PokemonFRLG_Navigation.h"
+#include "PokemonFRLG_LegendaryRunAway.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+LegendaryRunAway_Descriptor::LegendaryRunAway_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonFRLG:LegendaryRunAway",
+        Pokemon::STRING_POKEMON + " FRLG", "Legendary Run Away",
+        "Programs/PokemonFRLG/LegendaryRunAway.html",
+        "Shiny hunt legendary Pokemon using the run away method.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+struct LegendaryRunAway_Descriptor::Stats : public StatsTracker{
+    Stats()
+        : resets(m_stats["Resets"])
+        , shinies(m_stats["Shinies"])
+        , errors(m_stats["Errors"])
+    {
+        m_display_order.emplace_back("Resets");
+        m_display_order.emplace_back("Shinies");
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+    }
+    std::atomic<uint64_t>& resets;
+    std::atomic<uint64_t>& shinies;
+    std::atomic<uint64_t>& errors;
+};
+std::unique_ptr<StatsTracker> LegendaryRunAway_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+LegendaryRunAway::LegendaryRunAway()
+    : TARGET(
+        "<b>Target:</b><br>",
+        {
+            {Target::hooh, "hooh", "Ho-Oh"},
+            {Target::lugia, "lugia", "Lugia"},
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        Target::hooh
+    )
+    , TAKE_VIDEO("<b>Take Video:</b><br>Record a video when the shiny is found.", LockMode::UNLOCK_WHILE_RUNNING, true)
+    , GO_HOME_WHEN_DONE(true)
+    , NOTIFICATION_SHINY(
+        "Shiny found",
+        true, true, ImageAttachmentMode::JPG,
+        {"Notifs", "Showcase"}
+    )
+    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_SHINY,
+        &NOTIFICATION_STATUS_UPDATE,
+        &NOTIFICATION_PROGRAM_FINISH,
+    })
+    , m_advanced_options(
+        "<font size=4><b>Advanced Options:</b> You should not need to touch anything below here.</font>"
+    )
+    , HOOH_UP_DOWN(
+        "<b>Ho-Oh up/down time:</b><br>Time it takes to run up to Ho-Oh or down away to reset.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "1000 ms"
+    )
+    , HOOH_LEFT_RIGHT(
+        "<b>Ho-Oh left/right time:</b><br>Time it takes when facing the same direction to take one step left or right.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "240 ms"
+    )
+    , LUGIA_UP_DOWN0(
+        "<b>Lugia up/down:</b><br>Time it takes to run up to Lugia or down away to reset.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "620 ms"
+    )
+    , LUGIA_LEFT_RIGHT0(
+        "<b>Lugia left time:</b><br>Time it takes walk three steps left after entering Lugia's room.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "520 ms"
+    )
+{
+    PA_ADD_STATIC(SHINY_REQUIRES_AUDIO);
+    PA_ADD_OPTION(TARGET);
+    PA_ADD_OPTION(TAKE_VIDEO);
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+    PA_ADD_OPTION(NOTIFICATIONS);
+    PA_ADD_STATIC(m_advanced_options);
+    PA_ADD_OPTION(HOOH_UP_DOWN);
+    PA_ADD_OPTION(HOOH_LEFT_RIGHT);
+    PA_ADD_OPTION(LUGIA_UP_DOWN0);
+    PA_ADD_OPTION(LUGIA_LEFT_RIGHT0);
+}
+
+void LegendaryRunAway::reset_hooh(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    BlackScreenOverWatcher exit_area(COLOR_RED);
+    //Turn around, 10 steps down
+    ssf_press_button(context, BUTTON_B, 0ms, HOOH_UP_DOWN);
+    pbf_press_dpad(context, DPAD_DOWN, HOOH_UP_DOWN, 0ms);
+    context.wait_for_all_requests();
+
+    //Turn right, take 1 step. Wait for black screen over.
+    int ret = run_until<ProControllerContext>(
+        env.console, context,
+        [&](ProControllerContext& context){
+            ssf_press_button(context, BUTTON_B, 0ms, 500ms);
+            pbf_press_dpad(context, DPAD_RIGHT, 500ms, 0ms);
+            pbf_wait(context, 2400ms);
+        },
+        {exit_area}
+    );
+    context.wait_for_all_requests();
+    if (ret != 0){
+        env.log("Failed to exit area.", COLOR_RED);
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "reset_hooh(): Failed to exit area.",
+            env.console
+        );
+    }else{
+        env.log("Left area.");
+        send_program_status_notification(
+            env, NOTIFICATION_STATUS_UPDATE,
+            "reset_hooh(): Left area."
+        );
+    }
+
+    BlackScreenOverWatcher enter_area(COLOR_RED);
+    //turn left, take one step. now turn back right and take a step. wait for black screen over.
+    int ret2 = run_until<ProControllerContext>(
+        env.console, context,
+        [&](ProControllerContext& context){
+            pbf_wait(context, 500ms);
+            context.wait_for_all_requests();
+
+            ssf_press_button(context, BUTTON_B, 0ms, 500ms);
+            pbf_press_dpad(context, DPAD_LEFT, 500ms, 0ms);
+            context.wait_for_all_requests();
+
+            ssf_press_button(context, BUTTON_B, 0ms, 500ms);
+            pbf_press_dpad(context, DPAD_RIGHT, 500ms, 160ms);
+            pbf_wait(context, 2400ms);
+        },
+        {enter_area}
+    );
+    context.wait_for_all_requests();
+    if (ret2 != 0){
+        env.log("Failed to enter area.", COLOR_RED);
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "reset_hooh(): Failed to enter area.",
+            env.console
+        );
+    }else{
+        env.log("Entered area.");
+        send_program_status_notification(
+            env, NOTIFICATION_STATUS_UPDATE,
+            "reset_hooh(): Entered area."
+        );
+    }
+    //Wait after loading in to zone
+    pbf_wait(context, 500ms);
+    context.wait_for_all_requests();
+
+    //reverse above steps, but only take 9 steps up
+    //doesn't really matter since we want to trigger the encounter anyway
+    pbf_press_dpad(context, DPAD_LEFT, HOOH_LEFT_RIGHT, 160ms);
+
+    ssf_press_button(context, BUTTON_B, 0ms, HOOH_UP_DOWN);
+    pbf_press_dpad(context, DPAD_UP, HOOH_UP_DOWN, 160ms);
+
+    context.wait_for_all_requests();
+}
+
+void LegendaryRunAway::reset_lugia(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    BlackScreenOverWatcher exit_area(COLOR_RED);
+    //Turn around, 5 steps down
+    ssf_press_button(context, BUTTON_B, 0ms, LUGIA_UP_DOWN0);
+    pbf_press_dpad(context, DPAD_DOWN, LUGIA_UP_DOWN0, 0ms);
+    context.wait_for_all_requests();
+
+    //Turn right, 3 steps right. Wait for black screen over.
+    int ret = run_until<ProControllerContext>(
+        env.console, context,
+        [](ProControllerContext& context){
+            ssf_press_button(context, BUTTON_B, 0ms, 720ms);
+            pbf_press_dpad(context, DPAD_RIGHT, 720ms, 160ms);
+            pbf_wait(context, 2400ms);
+        },
+        {exit_area}
+    );
+    context.wait_for_all_requests();
+    if (ret != 0){
+        env.log("Failed to exit area.", COLOR_RED);
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "reset_lugia(): Failed to exit area.",
+            env.console
+        );
+    }else{
+        env.log("Left area.");
+        send_program_status_notification(
+            env, NOTIFICATION_STATUS_UPDATE,
+            "reset_lugia(): Left area."
+        );
+    }
+
+    BlackScreenOverWatcher enter_area(COLOR_RED);
+    //turn up, take one step. then turn back down and take a step. wait for black screen over.
+    int ret2 = run_until<ProControllerContext>(
+        env.console, context,
+        [](ProControllerContext& context){
+            pbf_wait(context, 500ms);
+            context.wait_for_all_requests();
+
+            ssf_press_button(context, BUTTON_B, 0ms, 500ms);
+            pbf_press_dpad(context, DPAD_UP, 500ms, 0ms);
+            context.wait_for_all_requests();
+            ssf_press_button(context, BUTTON_B, 0ms, 500ms);
+            pbf_press_dpad(context, DPAD_DOWN, 500ms, 160ms);
+            pbf_wait(context, 2400ms);
+        },
+        {enter_area}
+    );
+    context.wait_for_all_requests();
+    if (ret2 != 0){
+        env.log("Failed to enter area.", COLOR_RED);
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "reset_lugia(): Failed to enter area.",
+            env.console
+        );
+    }else{
+        env.log("Entered area.");
+        send_program_status_notification(
+            env, NOTIFICATION_STATUS_UPDATE,
+            "reset_lugia(): Entered area."
+        );
+    }
+    //Wait after loading in to zone
+    pbf_wait(context, 500ms);
+    context.wait_for_all_requests();
+
+    //reverse above steps
+    ssf_press_button(context, BUTTON_B, 0ms, LUGIA_LEFT_RIGHT0);
+    pbf_press_dpad(context, DPAD_LEFT, LUGIA_LEFT_RIGHT0, 0ms);
+    context.wait_for_all_requests();
+
+    ssf_press_button(context, BUTTON_B, 0ms, LUGIA_UP_DOWN0);
+    pbf_press_dpad(context, DPAD_UP, LUGIA_UP_DOWN0, 160ms);
+    context.wait_for_all_requests();
+}
+
+void LegendaryRunAway::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    LegendaryRunAway_Descriptor::Stats& stats = env.current_stats<LegendaryRunAway_Descriptor::Stats>();
+
+    home_black_border_check(env.console, context);
+
+    /*
+    * Settings: Text Speed fast. Default borders. Battle animations off. Audio required.
+    * Smoke Ball or fast pokemon required.
+    * Setup: Stand in front of target. Save the game.
+    * Lead can be shiny, reset is before lead is even sent out.
+    * This is the same as RSE resets.
+    */
+
+    while (true){
+        if (TARGET == Target::hooh){
+            //Step forward to start the encounter.
+            pbf_press_dpad(context, DPAD_UP, 160ms, 400ms);
+        }else{
+            //Press A to start the encounter.
+            pbf_press_button(context, BUTTON_A, 320ms, 320ms);
+        }
+        send_program_status_notification(
+            env, NOTIFICATION_STATUS_UPDATE,
+            "Starting encounter."
+        );
+        
+        bool legendary_shiny = handle_encounter(env.console, context, true);
+        if (legendary_shiny){
+            stats.shinies++;
+            env.update_stats();
+            send_program_notification(env,
+                NOTIFICATION_SHINY,
+                COLOR_YELLOW,
+                "Shiny found!",
+                {}, "",
+                env.console.video().snapshot(),
+                true
+            );
+            if (TAKE_VIDEO){
+                pbf_press_button(context, BUTTON_CAPTURE, 2000ms, 0ms);
+            }
+            break;
+        }
+        env.log("No shiny found.");
+        send_program_status_notification(
+            env, NOTIFICATION_STATUS_UPDATE,
+            "No shiny found."
+        );
+        flee_battle(env.console, context);
+        
+        //Close out dialog box
+        pbf_mash_button(context, BUTTON_B, 2000ms);
+        context.wait_for_all_requests();
+        
+        //Exit and re-enter the room
+        switch (TARGET){
+        case Target::hooh:
+            reset_hooh(env, context);
+            break;
+        case Target::lugia:
+            reset_lugia(env, context);
+            break;
+        default:
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "Invalid target!",
+                env.console
+            );
+            break;
+        }
+        stats.resets++;
+        env.update_stats();
+    }
+
+    if (GO_HOME_WHEN_DONE){
+        pbf_press_button(context, BUTTON_HOME, 200ms, 1000ms);
+    }
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+}
+
+}
+}
+}
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_LegendaryRunAway.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_LegendaryRunAway.h
new file mode 100644
index 0000000000..64b3b25aa7
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_LegendaryRunAway.h
@@ -0,0 +1,73 @@
+/*  Legendary Run Away
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonFRLG_LegendaryRunAway_H
+#define PokemonAutomation_PokemonFRLG_LegendaryRunAway_H
+
+#include "Common/Cpp/Options/StaticTextOption.h"
+#include "Common/Cpp/Options/EnumDropdownOption.h"
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "Common/Cpp/Options/TimeDurationOption.h"
+#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+#include "VideoGames/PokemonLA/Options/PokemonLA_ShinyDetectedAction.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+class LegendaryRunAway_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    LegendaryRunAway_Descriptor();
+    struct Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+class LegendaryRunAway : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = LegendaryRunAway_Descriptor;
+    LegendaryRunAway();
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext &context) override;
+
+    virtual void start_program_border_check(
+        VideoStream& stream,
+        FeedbackType feedback_type
+    ) override{}
+
+private:
+    enum class Target{
+        hooh,
+        lugia,
+    };
+    EnumDropdownOption<Target> TARGET;
+
+    void reset_hooh(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+    void reset_lugia(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+
+    PokemonLA::ShinyRequiresAudioText SHINY_REQUIRES_AUDIO;
+    BooleanCheckBoxOption TAKE_VIDEO;
+
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
+
+    EventNotificationOption NOTIFICATION_SHINY;
+    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
+    EventNotificationsOption NOTIFICATIONS;
+
+    SectionDividerOption m_advanced_options;
+    MillisecondsOption HOOH_UP_DOWN;
+    MillisecondsOption HOOH_LEFT_RIGHT;
+    MillisecondsOption LUGIA_UP_DOWN0;
+    MillisecondsOption LUGIA_LEFT_RIGHT0;
+};
+
+}
+}
+}
+#endif
+
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_PrizeCornerReset.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_PrizeCornerReset.cpp
new file mode 100644
index 0000000000..9e5928f186
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_PrizeCornerReset.cpp
@@ -0,0 +1,278 @@
+/*  Prize Corner Reset
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_DialogDetector.h"
+#include "VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_PrizeSelectDetector.h"
+#include "VideoGames/PokemonFRLG/Inference/PokemonFRLG_ShinySymbolDetector.h"
+#include "VideoGames/PokemonFRLG/PokemonFRLG_Navigation.h"
+#include "PokemonFRLG_PrizeCornerReset.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+PrizeCornerReset_Descriptor::PrizeCornerReset_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonFRLG:PrizeCornerReset",
+        Pokemon::STRING_POKEMON + " FRLG", "Prize Corner Reset",
+        "Programs/PokemonFRLG/PrizeCornerReset.html",
+        "Redeem and soft reset for a shiny Game Corner prize.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+struct PrizeCornerReset_Descriptor::Stats : public StatsTracker{
+    Stats()
+        : prizes(m_stats["Prizes"])
+        , resets(m_stats["Resets"])
+        , shinies(m_stats["Shinies"])
+        , errors(m_stats["Errors"])
+    {
+        m_display_order.emplace_back("Prizes");
+        m_display_order.emplace_back("Resets");
+        m_display_order.emplace_back("Shinies");
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+    }
+    std::atomic<uint64_t>& prizes;
+    std::atomic<uint64_t>& resets;
+    std::atomic<uint64_t>& shinies;
+    std::atomic<uint64_t>& errors;
+};
+std::unique_ptr<StatsTracker> PrizeCornerReset_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+PrizeCornerReset::~PrizeCornerReset(){
+    SLOT.remove_listener(*this);
+    NUM_REDEEM.remove_listener(*this);
+}
+
+PrizeCornerReset::PrizeCornerReset()
+    : SLOT(
+        "<b>Slot:</b><br>Position of the prize in the selection dialog.",
+        {
+            {0, "slot0", "Slot 1 (Abra)"},
+            {1, "slot1", "Slot 2 (Clefairy)"},
+            {2, "slot2", "Slot 3 (FR: Dratini / LG: Pinsir)"},
+            {3, "slot3", "Slot 4 (FR: Scyther / LG: Dratini)"},
+            {4, "slot4", "Slot 5 (Porygon)"},
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        0
+    )
+    , NUM_REDEEM(
+        "<b>Number of redemptions:</b><br>How many times to redeem a prize per reset. "
+        "Make sure your party has enough room, and that you have enough coins for multiple redemptions."
+        "<br> ex. When buying 3 Dratini (2,800 * 3 = 8,400 coins) in FireRed, have a party of 3, with 3 open slots. "
+        "This cannot be done in LeafGreen, as Dratini costs more, so the max there would be 2 Dratini (4,600 * 2 = 9,200 coins) and your party size would be 4, with 2 open slots.",
+        LockMode::LOCK_WHILE_RUNNING,
+        1, 1, 5
+    )
+    , WARNING("")
+    , TAKE_VIDEO("<b>Take Video:</b><br>Record a video when the shiny is found.", LockMode::UNLOCK_WHILE_RUNNING, true)
+    , GO_HOME_WHEN_DONE(true)
+    , NOTIFICATION_SHINY(
+        "Shiny found",
+        true, true, ImageAttachmentMode::JPG,
+        {"Notifs", "Showcase"}
+    )
+    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_SHINY,
+        &NOTIFICATION_STATUS_UPDATE,
+        &NOTIFICATION_PROGRAM_FINISH,
+    })
+{
+    PA_ADD_OPTION(SLOT);
+    PA_ADD_OPTION(NUM_REDEEM);
+    PA_ADD_OPTION(WARNING);
+    PA_ADD_OPTION(TAKE_VIDEO);
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+    PA_ADD_OPTION(NOTIFICATIONS);
+
+    PrizeCornerReset::on_config_value_changed(this);
+    SLOT.add_listener(*this);
+    NUM_REDEEM.add_listener(*this);
+    WARNING.set_visibility(ConfigOptionState::HIDDEN);
+}
+
+void PrizeCornerReset::on_config_value_changed(void* object){
+    std::string error = check_amount_redeemed((uint16_t)SLOT.current_value(), NUM_REDEEM);
+
+    if (error.empty()){
+        WARNING.set_visibility(ConfigOptionState::HIDDEN);
+    }else{
+        WARNING.set_text("<font color=\"red\">" + error + "</font>");
+        WARNING.set_visibility(ConfigOptionState::ENABLED);
+    }
+}
+
+std::string PrizeCornerReset::check_amount_redeemed(uint16_t slot_num, uint32_t redeem_num) const{
+    if (slot_num == 4 && redeem_num != 1){ //Only 1 Porygon in both FR and LG
+        return "Error: Cannot redeem more than 1 Porygon per reset due to coin case limit.";
+    }else if (slot_num == 3 && redeem_num > 2){ //2 Dratini LG or 1 Scyther FR
+        return "Error: Maximum redemption of 2 Dratini in LG or 1 Scyther in FR per reset due to coin case limit.";
+    }else if (slot_num == 2 && redeem_num > 3){ //Max of 3 for both games
+        return "Error: Maximum redemption of 3 Dratini/Pinsir due to coin case limit.";
+    } //Abra/Clefairy will run out of party space first before coins.
+    return "";
+}
+
+void PrizeCornerReset::obtain_prize(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    PrizeCornerReset_Descriptor::Stats& stats = env.current_stats<PrizeCornerReset_Descriptor::Stats>();
+
+    for (int attempts = 0;; attempts++){
+        PrizeSelectWatcher prize_dialog(COLOR_RED);
+
+        //Only 1 line to press through in english, not sure about other languages?
+        int ret = run_until<ProControllerContext>(
+            env.console, context,
+            [&](ProControllerContext& context){
+                env.log("Talking to booth.");
+                pbf_press_button(context, BUTTON_A, 320ms, 640ms);
+                pbf_press_button(context, BUTTON_B, 320ms, 1680ms);
+                pbf_press_button(context, BUTTON_B, 320ms, 1680ms);
+                pbf_press_button(context, BUTTON_B, 320ms, 1680ms);
+            },
+            { prize_dialog }
+        );
+        context.wait_for_all_requests();
+        if (ret == 0){
+            break;
+        }
+
+        stats.errors++;
+        env.update_stats();
+        if (attempts >= 5){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "obtain_prize(): Unable to open prize menu after 5 attempts.",
+                env.console
+            );
+        }
+
+        env.log("Unable to find prize menu... Retrying...", COLOR_RED);
+
+        pbf_mash_button(context, BUTTON_B, 5000ms);
+    }
+
+    //Select prize slot
+    env.log("Selecting prize.");
+    for (uint16_t c = 0; c < (uint16_t)SLOT.current_value(); c++){
+        pbf_press_dpad(context, DPAD_DOWN, 320ms, 320ms);
+    }
+    context.wait_for_all_requests();
+
+    //Select prize
+    pbf_press_button(context, BUTTON_A, 320ms, 640ms);
+    pbf_press_button(context, BUTTON_A, 320ms, 640ms); //Yes to redeem
+
+    //Exit dialog
+    pbf_mash_button(context, BUTTON_B, 2000ms);
+    context.wait_for_all_requests();
+
+    stats.prizes++;
+    env.update_stats();
+}
+
+void PrizeCornerReset::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    PrizeCornerReset_Descriptor::Stats& stats = env.current_stats<PrizeCornerReset_Descriptor::Stats>();
+
+    std::string amount_check;
+    amount_check = check_amount_redeemed((uint16_t)SLOT.current_value(), NUM_REDEEM);
+    if (amount_check != ""){
+        throw UserSetupError(env.console, "Invalid number of redemptions for the selected prize. Please check your selected options.");
+    }
+
+    home_black_border_check(env.console, context);
+
+    /*
+    * Settings: Text Speed fast. Default borders.
+    * Setup: Have a party of 5. Stand in front of the prize redemption. Save game. Move cursor back to top.
+    * Make sure you can afford the prize.
+    */
+
+    bool shiny_found = false;
+
+    while (!shiny_found){
+        for (uint16_t i = 0; i < NUM_REDEEM; i++){
+            env.log("Obtaining prize.");
+            obtain_prize(env, context);
+        }
+        stats.errors += open_slot_six(env.console, context);
+        env.update_stats();
+
+        env.log("Checking prizes.");
+        for (uint16_t i = 0; i < NUM_REDEEM; i++){
+            VideoSnapshot screen = env.console.video().snapshot();
+
+            ShinySymbolDetector shiny_checker(COLOR_YELLOW);
+            bool check = shiny_checker.read(env.console.logger(), screen);
+
+            if (check){
+                env.log("Shiny found!");
+                stats.shinies++;
+                env.update_stats();
+                send_program_notification(
+                    env,
+                    NOTIFICATION_SHINY,
+                    COLOR_YELLOW,
+                    "Shiny found!",
+                    {}, "",
+                    screen,
+                    true
+                );
+                if (TAKE_VIDEO){
+                    pbf_press_button(context, BUTTON_CAPTURE, 2000ms, 0ms);
+                }
+                shiny_found = true;
+            }else{
+                env.log("Prize is not shiny.");
+            }
+
+            if(i < NUM_REDEEM - 1){
+                //Check the next pokemon
+                pbf_press_dpad(context, DPAD_UP, 320ms, 320ms);
+                pbf_wait(context, 1000ms);
+                context.wait_for_all_requests();
+            }
+        }
+
+        if (!shiny_found){
+            env.log("Out of Pokemon to check.");
+            env.log("Soft resetting.");
+            send_program_status_notification(
+                env, NOTIFICATION_STATUS_UPDATE,
+                "Soft resetting."
+            );
+            stats.errors += soft_reset(env.console, context);
+            stats.resets++;
+            env.update_stats();
+            context.wait_for_all_requests();
+        }
+    }
+
+    if (GO_HOME_WHEN_DONE){
+        pbf_press_button(context, BUTTON_HOME, 200ms, 1000ms);
+    }
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+}
+
+}
+}
+}
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_PrizeCornerReset.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_PrizeCornerReset.h
new file mode 100644
index 0000000000..d2a09078c9
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_PrizeCornerReset.h
@@ -0,0 +1,66 @@
+/*  Prize Corner Reset
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonFRLG_PrizeCornerReset_H
+#define PokemonAutomation_PokemonFRLG_PrizeCornerReset_H
+
+#include "Common/Cpp/Options/StaticTextOption.h"
+#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "Common/Cpp/Options/EnumDropdownOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+class PrizeCornerReset_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    PrizeCornerReset_Descriptor();
+    struct Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+class PrizeCornerReset : public SingleSwitchProgramInstance, private ConfigOption::Listener{
+public:
+    using Descriptor = PrizeCornerReset_Descriptor;
+    ~PrizeCornerReset();
+    PrizeCornerReset();
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext &context) override;
+
+    virtual void start_program_border_check(
+        VideoStream& stream,
+        FeedbackType feedback_type
+    ) override{}
+
+private:
+    void obtain_prize(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+
+    IntegerEnumDropdownOption SLOT;
+    SimpleIntegerOption<uint32_t> NUM_REDEEM;
+    StaticTextOption WARNING;
+
+    BooleanCheckBoxOption TAKE_VIDEO;
+
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
+
+    EventNotificationOption NOTIFICATION_SHINY;
+    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
+    EventNotificationsOption NOTIFICATIONS;
+
+private:
+    virtual void on_config_value_changed(void* object) override;
+    std::string check_amount_redeemed(uint16_t slot_num, uint32_t redeem_num) const;
+};
+
+}
+}
+}
+#endif
+
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_ShinyHunt-Fishing.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_ShinyHunt-Fishing.cpp
new file mode 100644
index 0000000000..33d35413d4
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_ShinyHunt-Fishing.cpp
@@ -0,0 +1,136 @@
+/*  Shiny Hunt - Fishing
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  Program Overview:
+ *  This program automates fishing encounters in Pokemon FireRed/LeafGreen
+ *  and stops when a shiny Pokemon is detected.
+ *
+ *  Assumptions:
+ *  - Fishing rod is registered to the SELECT button
+ *  - Player is facing fishable water
+ *  - Lead Pokemon can always flee (Smoke Ball recommended)
+ *  - Text speed is set to FAST
+ */
+
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_DialogDetector.h"
+#include "VideoGames/PokemonFRLG/PokemonFRLG_Navigation.h"
+#include "PokemonFRLG_ShinyHunt-Fishing.h"
+
+namespace PokemonAutomation {
+namespace NintendoSwitch {
+namespace PokemonFRLG {
+
+
+ShinyHuntFishing_Descriptor::ShinyHuntFishing_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonFRLG:ShinyHuntFishing",
+        Pokemon::STRING_POKEMON + " FRLG",
+        "Shiny Hunt - Fishing",
+        "Programs/PokemonFRLG/ShinyHunt-Fishing.html",
+        "Automated fishing shiny hunt.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+struct ShinyHuntFishing_Descriptor::Stats : public StatsTracker {
+    Stats()
+        : encounters(m_stats["Encounters"])
+        , shinies(m_stats["Shinies"])
+        , errors(m_stats["Errors"])
+    {
+        m_display_order.emplace_back("Encounters");
+        m_display_order.emplace_back("Shinies");
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+    }
+    std::atomic<uint64_t>& encounters;
+    std::atomic<uint64_t>& shinies;
+    std::atomic<uint64_t>& errors;
+};
+std::unique_ptr<StatsTracker>
+ShinyHuntFishing_Descriptor::make_stats() const {return std::make_unique<Stats>();}
+
+
+ShinyHuntFishing::ShinyHuntFishing() : SingleSwitchProgramInstance()
+    , GO_HOME_WHEN_DONE(true)
+    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATION_SHINY("Shiny found", true, true, ImageAttachmentMode::JPG, {"Notifs", "Showcase"})
+    , NOTIFICATIONS({
+        &NOTIFICATION_STATUS_UPDATE,
+        &NOTIFICATION_SHINY,
+        &NOTIFICATION_PROGRAM_FINISH,
+    })
+{
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+void ShinyHuntFishing::program(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context
+){
+    ShinyHuntFishing_Descriptor::Stats& stats = env.current_stats<ShinyHuntFishing_Descriptor::Stats>();
+
+    home_black_border_check(env.console, context);
+
+    /*
+    Program setup requirements:
+    - Player must be facing fishable water
+    - Fishing rod must be registered
+    - Text speed must be FAST
+    */
+    env.log("FRLG Fishing shiny hunt started.");
+
+    bool finished = false;
+    while (!finished){
+        send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
+        int fish_result = fish_encounter(env.console, context);
+
+        switch (fish_result){
+        case -1:
+            stats.errors++;
+            env.update_stats();
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "program(): No fish hooked after 5 minutes. Please ensure you are facing water with a rod registered.",
+                env.console
+            );
+            break;
+        case 0:
+            stats.encounters++;
+            env.update_stats();
+            flee_battle(env.console, context);
+            context.wait_for_all_requests();
+            continue;
+        case 1:
+            stats.shinies++;
+            env.update_stats();
+            send_program_notification(
+                env,
+                NOTIFICATION_SHINY,
+                COLOR_YELLOW,
+                "Shiny found!",
+                {},
+                "",
+                env.console.video().snapshot(),
+                true
+            );
+            finished = true;
+            break;
+        }
+    }
+
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+    GO_HOME_WHEN_DONE.run_end_of_program(context);
+}
+}  // namespace PokemonFRLG
+}  // namespace NintendoSwitch
+}  // namespace PokemonAutomation
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_ShinyHunt-Fishing.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_ShinyHunt-Fishing.h
new file mode 100644
index 0000000000..2a62d1b2ef
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_ShinyHunt-Fishing.h
@@ -0,0 +1,54 @@
+/*  Shiny Hunt - Fishing
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+#ifndef PokemonAutomation_PokemonFRLG_ShinyHuntFishing_H
+#define PokemonAutomation_PokemonFRLG_ShinyHuntFishing_H
+
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+
+namespace PokemonAutomation {
+namespace NintendoSwitch {
+namespace PokemonFRLG {
+
+class ShinyHuntFishing_Descriptor : public SingleSwitchProgramDescriptor {
+public:
+    ShinyHuntFishing_Descriptor();
+
+    struct Stats;
+    std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+class ShinyHuntFishing : public SingleSwitchProgramInstance {
+public:
+    using Descriptor = ShinyHuntFishing_Descriptor;
+    ShinyHuntFishing();
+
+    void program(
+        SingleSwitchProgramEnvironment& env,
+        ProControllerContext& context
+        ) override;
+
+    // Disable strict border detection
+    void start_program_border_check(
+        VideoStream&,
+        FeedbackType
+        ) override {}
+
+private:
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
+
+    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
+    EventNotificationOption NOTIFICATION_SHINY;
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+}  // namespace PokemonFRLG
+}  // namespace NintendoSwitch
+}  // namespace PokemonAutomation
+
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_ShinyHunt-Overworld.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_ShinyHunt-Overworld.cpp
new file mode 100644
index 0000000000..fa6fc5ae3a
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_ShinyHunt-Overworld.cpp
@@ -0,0 +1,241 @@
+/*  Shiny Hunt - Overworld
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_DialogDetector.h"
+#include "VideoGames/PokemonFRLG/PokemonFRLG_Navigation.h"
+#include "PokemonFRLG_ShinyHunt-Overworld.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+ShinyHuntOverworld_Descriptor::ShinyHuntOverworld_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonFRLG:ShinyHuntOverworld",
+        Pokemon::STRING_POKEMON + " FRLG", "Shiny Hunt - Overworld",
+        "Programs/PokemonFRLG/ShinyHunt-Overworld.html",
+        "Shiny hunt Overworld Pokemon.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+struct ShinyHuntOverworld_Descriptor::Stats : public StatsTracker{
+    Stats()
+        : encounters(m_stats["Encounters"])
+        , shinies(m_stats["Shinies"])
+        , errors(m_stats["Errors"])
+    {
+        m_display_order.emplace_back("Encounters");
+        m_display_order.emplace_back("Shinies");
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+    }
+    std::atomic<uint64_t>& encounters;
+    std::atomic<uint64_t>& shinies;
+    std::atomic<uint64_t>& errors;
+};
+std::unique_ptr<StatsTracker> ShinyHuntOverworld_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+ShinyHuntOverworld::ShinyHuntOverworld()
+    : TRIGGER_METHOD(
+        "<b>Maneuver:</b><br>How to trigger an encounter",
+        {
+            {TriggerMethod::HORIZONTAL_NO_BIAS,     "horizontal-none",  "Move left/right. (no bias)"},
+            {TriggerMethod::HORIZONTAL_BIAS_LEFT,   "horizontal-left",  "Move left/right. (bias left)"},
+            {TriggerMethod::HORIZONTAL_BIAS_RIGHT,  "horizontal-right", "Move left/right. (bias right)"},
+            {TriggerMethod::VERTICAL_NO_BIAS,       "vertical-none",    "Move up/down. (no bias)"},
+            {TriggerMethod::VERTICAL_BIAS_UP,       "vertical-up",      "Move up/down. (bias up)"},
+            {TriggerMethod::VERTICAL_BIAS_DOWN,     "vertical-down",    "Move up/down. (bias down)"}
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        TriggerMethod::HORIZONTAL_NO_BIAS
+        )
+    , MOVE_DURATION0(
+        "<b>Move Duration:</b><br>Move in each direction for this long before turning around.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "1000 ms"
+    )
+    , TAKE_VIDEO("<b>Take Video:</b><br>Record a video when the shiny is found.", LockMode::UNLOCK_WHILE_RUNNING, true)
+    , GO_HOME_WHEN_DONE(true)
+    , NOTIFICATION_SHINY(
+        "Shiny found",
+        true, true, ImageAttachmentMode::JPG,
+        {"Notifs", "Showcase"}
+    )
+    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_SHINY,
+        &NOTIFICATION_STATUS_UPDATE,
+        &NOTIFICATION_PROGRAM_FINISH,
+    })
+{
+    PA_ADD_STATIC(SHINY_REQUIRES_AUDIO);
+    PA_ADD_OPTION(TRIGGER_METHOD);
+    PA_ADD_OPTION(MOVE_DURATION0);
+    PA_ADD_OPTION(TAKE_VIDEO);
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+void ShinyHuntOverworld::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    ShinyHuntOverworld_Descriptor::Stats& stats = env.current_stats<ShinyHuntOverworld_Descriptor::Stats>();
+
+    home_black_border_check(env.console, context);
+
+    /*
+    * Settings: Text Speed fast. Audio required.
+    * Setup: Stand in grass.
+    * Lead can't be shiny.
+    */
+
+    while (true){
+        bool encounter_found = find_encounter(env, context);
+
+        if (!encounter_found){
+            stats.errors += 1;
+            env.update_stats();
+            break;
+        }
+
+        //handle_encounter will wait for "POKEMON appeared!"
+        bool encounter_shiny = handle_encounter(env.console, context, true);
+        if (encounter_shiny){
+            stats.shinies++;
+            env.update_stats();
+            send_program_notification(
+                env,
+                NOTIFICATION_SHINY,
+                COLOR_YELLOW,
+                "Shiny found!",
+                {}, "",
+                env.console.video().snapshot(),
+                true
+            );
+            if (TAKE_VIDEO){
+                pbf_press_button(context, BUTTON_CAPTURE, 2000ms, 0ms);
+            }
+            break;
+        }
+
+        flee_battle(env.console, context);
+        context.wait_for_all_requests();
+
+        stats.encounters++;
+        env.update_stats();
+        send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
+    }
+
+    if (GO_HOME_WHEN_DONE){
+        pbf_press_button(context, BUTTON_HOME, 200ms, 1000ms);
+    }
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+}
+
+bool ShinyHuntOverworld::find_encounter(SingleSwitchProgramEnvironment& env, ProControllerContext& context) const
+{
+    BlackScreenWatcher battle_entered(COLOR_RED);
+
+    Milliseconds normal_duration = MOVE_DURATION0;
+    Milliseconds biased_duration = MOVE_DURATION0.get() + 200ms;
+    Milliseconds mash_duration = normal_duration - 64ms;
+
+    int ret = 1;
+    while (ret != 0){
+        switch (TRIGGER_METHOD){
+        case TriggerMethod::HORIZONTAL_NO_BIAS:
+            ret = run_until<ProControllerContext>(
+                env.console, context,
+                [normal_duration, mash_duration](ProControllerContext& context){
+                    ssf_press_left_joystick(context, { -1, 0 }, 0ms, normal_duration);
+                    ssf_mash1_button(context, BUTTON_B, mash_duration);
+                    ssf_press_left_joystick(context, { +1, 0 }, 0ms, normal_duration);
+                    ssf_mash1_button(context, BUTTON_B, mash_duration);
+                },
+                { battle_entered }
+            );
+            break;
+        case TriggerMethod::HORIZONTAL_BIAS_LEFT:
+            ret = run_until<ProControllerContext>(
+                env.console, context,
+                [normal_duration, mash_duration, biased_duration](ProControllerContext& context){
+                    ssf_press_left_joystick(context, { -1, 0 }, 0ms, biased_duration);
+                    ssf_mash1_button(context, BUTTON_B, mash_duration);
+                    ssf_press_left_joystick(context, { +1, 0 }, 0ms, normal_duration);
+                    ssf_mash1_button(context, BUTTON_B, mash_duration);
+                },
+                { battle_entered }
+            );
+            break;
+        case TriggerMethod::HORIZONTAL_BIAS_RIGHT:
+            ret = run_until<ProControllerContext>(
+                env.console, context,
+                [normal_duration, mash_duration, biased_duration](ProControllerContext& context){
+                    ssf_press_left_joystick(context, { +1, 0 }, 0ms, biased_duration);
+                    ssf_mash1_button(context, BUTTON_B, mash_duration);
+                    ssf_press_left_joystick(context, { -1, 0 }, 0ms, normal_duration);
+                    ssf_mash1_button(context, BUTTON_B, mash_duration);
+                },
+                { battle_entered }
+            );
+            break;
+        case TriggerMethod::VERTICAL_NO_BIAS:
+            ret = run_until<ProControllerContext>(
+                env.console, context,
+                [normal_duration, mash_duration](ProControllerContext& context){
+                    ssf_press_left_joystick(context, { 0, +1 }, 0ms, normal_duration);
+                    ssf_mash1_button(context, BUTTON_B, mash_duration);
+                    ssf_press_left_joystick(context, { 0, -1 }, 0ms, normal_duration);
+                    ssf_mash1_button(context, BUTTON_B, mash_duration);
+                },
+                { battle_entered }
+            );
+            break;
+        case TriggerMethod::VERTICAL_BIAS_UP:
+            ret = run_until<ProControllerContext>(
+                env.console, context,
+                [normal_duration, mash_duration, biased_duration](ProControllerContext& context){
+                    ssf_press_left_joystick(context, { 0, +1 }, 0ms, biased_duration);
+                    ssf_mash1_button(context, BUTTON_B, mash_duration);
+                    ssf_press_left_joystick(context, { 0, -1 }, 0ms, normal_duration);
+                    ssf_mash1_button(context, BUTTON_B, mash_duration);
+                },
+                { battle_entered }
+            );
+            break;
+        case TriggerMethod::VERTICAL_BIAS_DOWN:
+            ret = run_until<ProControllerContext>(
+                env.console, context,
+                [normal_duration, mash_duration, biased_duration](ProControllerContext& context){
+                    ssf_press_left_joystick(context, { 0, -1 }, 0ms, biased_duration);
+                    ssf_mash1_button(context, BUTTON_B, mash_duration);
+                    ssf_press_left_joystick(context, { 0, +1 }, 0ms, normal_duration);
+                    ssf_mash1_button(context, BUTTON_B, mash_duration);
+                },
+                { battle_entered }
+            );
+            break;
+        default:;
+        }
+    }
+
+    return true;
+}
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_ShinyHunt-Overworld.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_ShinyHunt-Overworld.h
new file mode 100644
index 0000000000..18d6da29d8
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_ShinyHunt-Overworld.h
@@ -0,0 +1,70 @@
+/*  Shiny Hunt - Overworld
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonFRLG_ShinyHuntOverworld_H
+#define PokemonAutomation_PokemonFRLG_ShinyHuntOverworld_H
+
+#include "Common/Cpp/Options/EnumDropdownOption.h"
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+#include "VideoGames/PokemonLA/Options/PokemonLA_ShinyDetectedAction.h"
+
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+class ShinyHuntOverworld_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    ShinyHuntOverworld_Descriptor();
+    struct Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+class ShinyHuntOverworld : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = ShinyHuntOverworld_Descriptor;
+    ShinyHuntOverworld();
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext &context) override;
+
+    virtual void start_program_border_check(
+        VideoStream& stream,
+        FeedbackType feedback_type
+    ) override {
+    }
+
+private:
+    bool find_encounter(SingleSwitchProgramEnvironment& env, ProControllerContext& context) const;
+
+    enum class TriggerMethod {
+        HORIZONTAL_NO_BIAS,
+        HORIZONTAL_BIAS_LEFT,
+        HORIZONTAL_BIAS_RIGHT,
+        VERTICAL_NO_BIAS,
+        VERTICAL_BIAS_UP,
+        VERTICAL_BIAS_DOWN
+    };
+
+
+    PokemonLA::ShinyRequiresAudioText SHINY_REQUIRES_AUDIO;
+    EnumDropdownOption<TriggerMethod> TRIGGER_METHOD;
+    MillisecondsOption MOVE_DURATION0;
+
+    BooleanCheckBoxOption TAKE_VIDEO;
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
+
+    EventNotificationOption NOTIFICATION_SHINY;
+    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_ReadBattleLevelUp.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_ReadBattleLevelUp.cpp
new file mode 100644
index 0000000000..694769f707
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_ReadBattleLevelUp.cpp
@@ -0,0 +1,102 @@
+/*  Read Battle Level Up
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <chrono>
+#include <string>
+#include "Common/Cpp/Color.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "Pokemon/Inference/Pokemon_NameReader.h"
+#include "VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_BattleDialogs.h"
+#include "VideoGames/PokemonFRLG/Inference/PokemonFRLG_BattleLevelUpReader.h"
+#include "PokemonFRLG_ReadBattleLevelUp.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+using namespace std::chrono_literals;
+
+
+ReadBattleLevelUp_Descriptor::ReadBattleLevelUp_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonFRLG:ReadBattleLevelUp",
+        Pokemon::STRING_POKEMON + " FRLG",
+        "Read Battle Level-Up Stats", "",
+        "Read stats from the relevant popup after leveling up during a battle.",
+        PanelQualityStanding::DEVELOPER,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+){}
+
+ReadBattleLevelUp::ReadBattleLevelUp()
+    : LANGUAGE(
+        "<b>Game Language:</b>",
+        Pokemon::PokemonNameReader::instance().languages(),
+        LockMode::LOCK_WHILE_RUNNING, true
+    )
+{
+    PA_ADD_OPTION(LANGUAGE);
+}
+
+void ReadBattleLevelUp::program(
+    SingleSwitchProgramEnvironment &env,
+    CancellableScope& scope
+){
+    env.log(
+        "Starting Read Battle Level Up program..."
+    );
+
+    BattleLevelUpDetector plus_detector(COLOR_RED, BattleLevelUpDialog::plus, LANGUAGE);
+    BattleLevelUpDetector stats_detector(COLOR_RED, BattleLevelUpDialog::stats, LANGUAGE);
+
+    env.log("Detecting the relevant dialogue box...");
+    VideoSnapshot screen = env.console.video().snapshot();
+    bool plus_dialog = plus_detector.detect(screen);
+    bool stats_dialog = stats_detector.detect(screen);
+
+    if (plus_dialog){
+        env.log("Wrong dialogue box is visible. Stats are read from the next one.");
+    }
+    if (!stats_dialog){
+        env.log("Stats dialogue box not detected.");
+    }else{
+        env.log("Stats dialogue box detected!");
+    }
+
+
+    BattleLevelUpReader reader(COLOR_RED);
+    VideoOverlaySet overlays(env.console.overlay());
+    reader.make_overlays(overlays);
+
+
+    env.log("Reading stats...");
+    VideoSnapshot screen1 = env.console.video().snapshot();
+    StatReads stats = reader.read_stats(env.logger(), screen1);
+
+    env.log("Max HP: " + (stats.hp > 0 ? std::to_string(stats.hp) : "???"));
+    env.log("Attack: " +
+            (stats.attack > 0 ? std::to_string(stats.attack) : "???"));
+    env.log("Defense: " +
+            (stats.defense > 0 ? std::to_string(stats.defense) : "???"));
+    env.log("Sp. Attack: " +
+            (stats.spatk > 0 ? std::to_string(stats.spatk) : "???"));
+    env.log("Sp. Defense: " +
+            (stats.spdef > 0 ? std::to_string(stats.spdef) : "???"));
+    env.log("Speed: " +
+            (stats.speed > 0 ? std::to_string(stats.speed) : "???"));
+
+    env.log("Finished Reading Stats. Verification boxes are on overlay.",
+                    COLOR_BLUE);
+    scope.wait_for(10s);
+}
+
+} // namespace PokemonFRLG
+} // namespace NintendoSwitch
+} // namespace PokemonAutomation
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_ReadBattleLevelUp.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_ReadBattleLevelUp.h
new file mode 100644
index 0000000000..90287d8fc3
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_ReadBattleLevelUp.h
@@ -0,0 +1,41 @@
+/*  Read Battle Level Up
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonFRLG_ReadBattleLevelUp_H
+#define PokemonAutomation_PokemonFRLG_ReadBattleLevelUp_H
+
+#include "CommonFramework/Tools/VideoStream.h"
+#include "CommonTools/Options/LanguageOCROption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_BattleDialogs.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+class ReadBattleLevelUp_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    ReadBattleLevelUp_Descriptor();
+};
+
+class ReadBattleLevelUp : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = ReadBattleLevelUp_Descriptor;
+    ReadBattleLevelUp();
+
+    virtual void start_program_border_check(VideoStream &stream, FeedbackType feedback_type) override{}
+
+    virtual void program(SingleSwitchProgramEnvironment& env, CancellableScope& scope) override;
+
+
+    OCR::LanguageOCROption LANGUAGE;
+};
+
+} // namespace PokemonFRLG
+} // namespace NintendoSwitch
+} // namespace PokemonAutomation
+#endif
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_ReadBoxInfo.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_ReadBoxInfo.cpp
new file mode 100644
index 0000000000..5925c1f33f
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_ReadBoxInfo.cpp
@@ -0,0 +1,109 @@
+/*  Read Box Info
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <chrono>
+#include <sstream>
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "Pokemon/Inference/Pokemon_NameReader.h"
+#include "VideoGames/PokemonFRLG/Inference/Box/PokemonFRLG_BoxCellOccupiedDetector.h"
+#include "VideoGames/PokemonFRLG/Inference/Box/PokemonFRLG_BoxCellReader.h"
+#include "VideoGames/PokemonFRLG/Inference/Box/PokemonFRLG_BoxGenderReader.h"
+#include "VideoGames/PokemonFRLG/Inference/Box/PokemonFRLG_BoxSelectionModeDetector.h"
+#include "PokemonFRLG_ReadBoxInfo.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+ReadBoxInfo_Descriptor::ReadBoxInfo_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonFRLG:ReadBoxInfo",
+        Pokemon::STRING_POKEMON + " FRLG", "Read Box Info", "",
+        "Start on the box screen. Read one frame and log the selection hand, "
+        "cursor location, occupancy, species, level, and gender. ",
+        PanelQualityStanding::DEVELOPER,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+ReadBoxInfo::ReadBoxInfo()
+    : LANGUAGE(
+        "<b>Game Language:</b>",
+        Pokemon::PokemonNameReader::instance().languages(),
+        LockMode::LOCK_WHILE_RUNNING, true
+    )
+{
+    PA_ADD_OPTION(LANGUAGE);
+}
+
+void ReadBoxInfo::program(SingleSwitchProgramEnvironment& env, CancellableScope& scope){
+    BoxSelectionModeDetector selection_detector(COLOR_YELLOW);
+    BoxCellOccupiedDetector occupied_detector(COLOR_GREEN);
+    BoxCellReader cell_reader(COLOR_RED);
+    BoxGenderReader gender_reader(COLOR_BLUE);
+    VideoOverlaySet overlays(env.console.overlay());
+    selection_detector.make_overlays(overlays);
+    occupied_detector.make_overlays(overlays);
+    cell_reader.make_overlays(overlays);
+    gender_reader.make_overlays(overlays);
+
+    env.log("Reading FRLG box inference from one frame...");
+    const VideoSnapshot screen = env.console.video().snapshot();
+    if (!screen){
+        env.log("Box inference: no video frame available.", COLOR_RED);
+        return;
+    }
+
+    const auto selection = selection_detector.detect(screen);
+    const bool occupied = occupied_detector.detect(screen);
+    const std::string species = cell_reader.read_name(env.logger(), LANGUAGE, screen);
+    const int level = cell_reader.read_level(env.logger(), screen);
+    const auto gender = gender_reader.read(screen);
+
+    // Print the report after OCR diagnostics so the results stay together.
+    std::ostringstream report;
+    report << "========== FRLG Box Inference ==========\n"
+           << "Selection hand\n"
+           << "  Detected:  " << (selection ? "Yes" : "No") << '\n';
+    if (selection){
+        report << "  Mode:      " << (selection->mode == BoxSelectionMode::Normal ? "Normal (white)" : "Relocate (gold)") << '\n'
+               << "  Hand:      " << (selection->closed ? "Closed" : "Open") << '\n'
+               << "  Location:  ";
+        switch (selection->location){
+        case BoxSelectionLocation::Grid:
+            report << "Grid - row " << selection->row + 1 << ", column " << selection->column + 1 << " (1-based)";
+            break;
+        case BoxSelectionLocation::BoxTile:
+            report << "Box title";
+            break;
+        case BoxSelectionLocation::OpenPartyButton:
+            report << "Party Pokemon button";
+            break;
+        case BoxSelectionLocation::CloseBoxButton:
+            report << "Close Box button";
+            break;
+        }
+        report << '\n';
+    }else{
+        report << "  Mode/hand/location: Unknown\n";
+    }
+    report << "Selected Pokemon panel\n"
+           << "  Occupied:  " << (occupied ? "Yes" : "No") << '\n'
+           << "  Species:   " << (species.empty() ? "(empty or unreadable)" : species) << '\n'
+           << "  Level:     " << (level == -1 ? "(empty or unreadable: -1)" : std::to_string(level)) << '\n'
+           << "  Gender:    " << Pokemon::gender_to_string(gender) << '\n'
+           << "========================================";
+    env.log(report.str(), COLOR_BLUE);
+    scope.wait_for(std::chrono::seconds(10));
+}
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_ReadBoxInfo.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_ReadBoxInfo.h
new file mode 100644
index 0000000000..141b719a9b
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_ReadBoxInfo.h
@@ -0,0 +1,37 @@
+/*  Read Box Info
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonFRLG_ReadBoxInfo_H
+#define PokemonAutomation_PokemonFRLG_ReadBoxInfo_H
+
+#include "CommonTools/Options/LanguageOCROption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+class ReadBoxInfo_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    ReadBoxInfo_Descriptor();
+};
+
+class ReadBoxInfo : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = ReadBoxInfo_Descriptor;
+    ReadBoxInfo();
+
+    virtual void start_program_border_check(VideoStream& stream, FeedbackType feedback_type) override{}
+    virtual void program(SingleSwitchProgramEnvironment& env, CancellableScope& scope) override;
+
+private:
+    OCR::LanguageOCROption LANGUAGE;
+};
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_ReadEncounter.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_ReadEncounter.cpp
new file mode 100644
index 0000000000..dfcf44ce16
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_ReadEncounter.cpp
@@ -0,0 +1,71 @@
+/*  Read Encounter
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <chrono>
+#include <string>
+#include "Common/Cpp/Color.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "Pokemon/Inference/Pokemon_NameReader.h"
+#include "VideoGames/PokemonFRLG/Inference/PokemonFRLG_WildEncounterReader.h"
+#include "PokemonFRLG_ReadEncounter.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+using namespace std::chrono_literals;
+
+
+ReadEncounter_Descriptor::ReadEncounter_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonFRLG:ReadEncounter",
+        Pokemon::STRING_POKEMON + " FRLG",
+        "Read Wild Encounter", "",
+        "Read name and level of a wild encounter.",
+        PanelQualityStanding::DEVELOPER,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+){}
+
+ReadEncounter::ReadEncounter()
+    : LANGUAGE(
+        "<b>Game Language:</b>",
+        Pokemon::PokemonNameReader::instance().languages(),
+        LockMode::LOCK_WHILE_RUNNING, true
+    )
+{
+    PA_ADD_OPTION(LANGUAGE);
+}
+
+void ReadEncounter::program(
+    SingleSwitchProgramEnvironment& env,
+    CancellableScope& scope
+){
+    env.log(
+        "Starting Read Encounter program..."
+    );
+
+    WildEncounterReader reader(COLOR_RED);
+    VideoOverlaySet overlays(env.console.overlay());
+    reader.make_overlays(overlays);
+
+    env.log("Reading name and level...");
+    VideoSnapshot screen = env.console.video().snapshot();
+    PokemonFRLG_WildEncounter encounter = reader.read_encounter(env.logger(), LANGUAGE, screen, {});
+
+    env.log("Name: " + encounter.name);
+
+    env.log("Finished reading encounter.", COLOR_BLUE);
+    scope.wait_for(10s);
+}
+
+} // namespace PokemonFRLG
+} // namespace NintendoSwitch
+} // namespace PokemonAutomation
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_ReadEncounter.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_ReadEncounter.h
new file mode 100644
index 0000000000..bb1cc477bf
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_ReadEncounter.h
@@ -0,0 +1,41 @@
+/*  Read Encounter
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonFRLG_ReadEncounter_H
+#define PokemonAutomation_PokemonFRLG_ReadEncounter_H
+
+#include "CommonFramework/Tools/VideoStream.h"
+#include "CommonTools/Options/LanguageOCROption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+class ReadEncounter_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    ReadEncounter_Descriptor();
+};
+
+class ReadEncounter : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = ReadEncounter_Descriptor;
+    ReadEncounter();
+
+    virtual void start_program_border_check(VideoStream &stream, FeedbackType feedback_type) override{}
+    virtual void program(SingleSwitchProgramEnvironment& env, CancellableScope& scope) override;
+
+
+private:
+    OCR::LanguageOCROption LANGUAGE;
+
+};
+
+} // namespace PokemonFRLG
+} // namespace NintendoSwitch
+} // namespace PokemonAutomation
+#endif
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_ReadStats.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_ReadStats.cpp
new file mode 100644
index 0000000000..7966c0d736
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_ReadStats.cpp
@@ -0,0 +1,116 @@
+/*  Read Stats
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <chrono>
+#include <string>
+#include "Common/Cpp/Color.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "Pokemon/Inference/Pokemon_NameReader.h"
+#include "VideoGames/PokemonFRLG/Inference/PokemonFRLG_StatsReader.h"
+#include "PokemonFRLG_ReadStats.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+using namespace std::chrono_literals;
+
+
+ReadStats_Descriptor::ReadStats_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonFRLG:ReadStats",
+        Pokemon::STRING_POKEMON + " FRLG",
+        "Read Summary Stats", "",
+        "Read stats, level, name, and nature from the summary screen. Start "
+        "on page 1 of summary.",
+        PanelQualityStanding::DEVELOPER,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+){}
+
+ReadStats::ReadStats()
+    : LANGUAGE(
+        "<b>Game Language:</b>",
+        Pokemon::PokemonNameReader::instance().languages(),
+        LockMode::LOCK_WHILE_RUNNING, true
+    )
+    , PAGE(
+        "<b>Summary Page:</b>",
+        {
+            { SummaryPage::first, "first", "first" },
+            { SummaryPage::second, "second", "second" }
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        SummaryPage::first
+    )
+{
+    PA_ADD_OPTION(LANGUAGE);
+    PA_ADD_OPTION(PAGE);
+}
+
+void ReadStats::program(
+    SingleSwitchProgramEnvironment &env,
+    CancellableScope &scope
+){
+    env.log(
+        "Starting Read Stats program... Please ensure you are on Page 1 (POKEMON INFO)."
+    );
+
+    StatsReader reader;
+    VideoOverlaySet overlays(env.console.overlay());
+    reader.make_overlays(overlays);
+
+    PokemonFRLG_Stats stats;
+
+    if (PAGE == SummaryPage::first){
+        env.log("Reading Page 1 (Name, Level, Nature)...");
+        VideoSnapshot screen1 = env.console.video().snapshot();
+        reader.read_page1(env.logger(), LANGUAGE, screen1, stats);
+
+        std::string gender_strings[] = {"Male", "Female", "Genderless"};
+
+        env.log("Name: " + stats.name);
+        env.log("Level: " +
+                (stats.level.has_value() ? std::to_string(*stats.level) : "???"));
+        env.log("Nature: " + stats.nature);
+        env.log("Gender: " + std::string(
+            stats.gender.has_value() ? (
+                (stats.gender == SummaryGender::Male) ? "Male" : (
+                    (stats.gender == SummaryGender::Female) ? "Female" : "Genderless"
+                )
+            ) : "???"));
+    }
+
+    if (PAGE == SummaryPage::second){
+        env.log("Reading Page 2 (Stats)...");
+        VideoSnapshot screen2 = env.console.video().snapshot();
+        reader.read_page2(env.logger(), LANGUAGE, screen2, stats);
+
+        env.log("HP (Total): " + (stats.hp.has_value() ? std::to_string(*stats.hp) : "???"));
+        env.log("Attack: " +
+                (stats.attack.has_value() ? std::to_string(*stats.attack) : "???"));
+        env.log("Defense: " +
+                (stats.defense.has_value() ? std::to_string(*stats.defense) : "???"));
+        env.log("Sp. Attack: " +
+                (stats.sp_attack.has_value() ? std::to_string(*stats.sp_attack) : "???"));
+        env.log("Sp. Defense: " +
+                (stats.sp_defense.has_value() ? std::to_string(*stats.sp_defense) : "???"));
+        env.log("Speed: " +
+                (stats.speed.has_value() ? std::to_string(*stats.speed) : "???"));
+    }
+
+    env.log("Finished Reading Stats. Verification boxes are on overlay.",
+                    COLOR_BLUE);
+    scope.wait_for(10s);
+}
+
+} // namespace PokemonFRLG
+} // namespace NintendoSwitch
+} // namespace PokemonAutomation
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_ReadStats.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_ReadStats.h
new file mode 100644
index 0000000000..524e1c4bc6
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_ReadStats.h
@@ -0,0 +1,49 @@
+/*  Read Stats
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonFRLG_ReadStats_H
+#define PokemonAutomation_PokemonFRLG_ReadStats_H
+
+#include "CommonFramework/Tools/VideoStream.h"
+#include "CommonTools/Options/LanguageOCROption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+class ReadStats_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    ReadStats_Descriptor();
+};
+
+class ReadStats : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = ReadStats_Descriptor;
+    ReadStats();
+
+    virtual void start_program_border_check(
+        VideoStream &stream, FeedbackType feedback_type
+    ) override{}
+    virtual void program(
+        SingleSwitchProgramEnvironment &env,
+        CancellableScope &scope
+    ) override;
+
+private:
+    enum class SummaryPage{
+        first,
+        second
+    };
+    OCR::LanguageOCROption LANGUAGE;
+    EnumDropdownOption<SummaryPage> PAGE;
+};
+
+} // namespace PokemonFRLG
+} // namespace NintendoSwitch
+} // namespace PokemonAutomation
+#endif
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_ReadTrainerId.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_ReadTrainerId.cpp
new file mode 100644
index 0000000000..0d1f539aea
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_ReadTrainerId.cpp
@@ -0,0 +1,88 @@
+/*  Read Trainer ID
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <chrono>
+#include <string>
+#include "Common/Cpp/Color.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_TrainerCardDetector.h"
+#include "VideoGames/PokemonFRLG/Inference/PokemonFRLG_TrainerIdReader.h"
+#include "PokemonFRLG_ReadTrainerId.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+using namespace std::chrono_literals;
+
+
+ReadTrainerId_Descriptor::ReadTrainerId_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonFRLG:ReadTrainerId",
+        Pokemon::STRING_POKEMON + " FRLG",
+        "Read TID", "",
+        "Read TID from the trainer card.",
+        PanelQualityStanding::DEVELOPER,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+){}
+
+ReadTrainerId::ReadTrainerId()
+    : LANGUAGE(
+        "<b>Game Language:</b><br>"
+        "Language affects the number of advances (based on the number of text characters) that pass after the last button press.",
+        {
+            Language::English,
+            Language::Japanese,
+            Language::Spanish,
+            Language::French,
+            Language::German,
+            Language::Italian,
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        true
+    )
+{
+    PA_ADD_OPTION(LANGUAGE);
+}
+
+void ReadTrainerId::program(
+    SingleSwitchProgramEnvironment &env,
+    CancellableScope& scope
+){
+    env.log(
+        "Starting Read Trainer ID program... Please ensure you are on the Trainer Card."
+    );
+
+    TrainerCardDetector detector(COLOR_RED);
+    TrainerIdReader reader;
+    VideoOverlaySet overlays(env.console.overlay());
+    detector.make_overlays(overlays);
+    reader.make_overlays(overlays);
+
+    VideoSnapshot screen = env.console.video().snapshot();
+    bool trainercard = detector.detect(screen);
+    if (trainercard){
+        env.log("Trainer Card detected.", COLOR_BLUE);
+    }else{
+        env.log("Trainer Card not detected!", COLOR_RED);
+    }
+    env.log("Reading TID...");
+    uint16_t tid = reader.read_tid(env.logger(), LANGUAGE, screen);
+    env.log("TID: " + std::to_string(tid));
+
+    env.log("Finished Reading TID. Verification boxes are on overlay.",
+                    COLOR_BLUE);
+    scope.wait_for(10s);
+}
+
+} // namespace PokemonFRLG
+} // namespace NintendoSwitch
+} // namespace PokemonAutomation
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_ReadTrainerId.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_ReadTrainerId.h
new file mode 100644
index 0000000000..fed2b7279c
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_ReadTrainerId.h
@@ -0,0 +1,39 @@
+/*  Read Trainer ID
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonFRLG_ReadTrainerId_H
+#define PokemonAutomation_PokemonFRLG_ReadTrainerId_H
+
+#include "CommonFramework/Tools/VideoStream.h"
+#include "CommonTools/Options/LanguageOCROption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+class ReadTrainerId_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    ReadTrainerId_Descriptor();
+};
+
+class ReadTrainerId : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = ReadTrainerId_Descriptor;
+    ReadTrainerId();
+
+    virtual void start_program_border_check(VideoStream &stream, FeedbackType feedback_type) override{}
+    virtual void program(SingleSwitchProgramEnvironment& env, CancellableScope& scope) override;
+
+private:
+    OCR::LanguageOCROption LANGUAGE;    
+};
+
+} // namespace PokemonFRLG
+} // namespace NintendoSwitch
+} // namespace PokemonAutomation
+#endif
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_SafariOptimalActionTest.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_SafariOptimalActionTest.cpp
new file mode 100644
index 0000000000..caad863fa0
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_SafariOptimalActionTest.cpp
@@ -0,0 +1,148 @@
+/*  Safari Optimal Action Test
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <chrono>
+#include <string>
+#include "Common/Cpp/Color.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "Pokemon/Inference/Pokemon_NameReader.h"
+#include "VideoGames/PokemonFRLG/Inference/PokemonFRLG_WildEncounterReader.h"
+#include "VideoGames/PokemonFRLG/Programs/PokemonFRLG_BattleMenuNavigation.h"
+#include "VideoGames/PokemonFRLG/Programs/PokemonFRLG_SafariOptimalAction.h"
+#include "PokemonFRLG_SafariOptimalActionTest.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+using namespace std::chrono_literals;
+
+namespace{
+
+std::string safari_action_to_string(SafariBattleMenuOption action){
+    switch (action){
+    case SafariBattleMenuOption::BALL:
+        return "BALL";
+    case SafariBattleMenuOption::BAIT:
+        return "BAIT";
+    case SafariBattleMenuOption::ROCK:
+        return "ROCK";
+    case SafariBattleMenuOption::RUN:
+        return "RUN";
+    default:
+        return "UNKNOWN";
+    }
+}
+
+std::string safari_actions_to_string(const std::vector<SafariBattleMenuOption>& actions){
+    std::string ret;
+    for (size_t c = 0; c < actions.size(); c++){
+        if (!ret.empty()){
+            ret += " -> ";
+        }
+        ret += safari_action_to_string(actions[c]);
+    }
+    return ret;
+}
+
+}
+
+SafariOptimalActionTest_Descriptor::SafariOptimalActionTest_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonFRLG:SafariOptimalActionTest",
+        Pokemon::STRING_POKEMON + " FRLG",
+        "Safari Optimal Action Test", "",
+        "Start in a Safari Zone encounter with the Safari battle menu already visible. "
+        "The program reads the encounter and attempts to execute the optimal actions until the Safari battle menu is no longer detected.",
+        PanelQualityStanding::DEVELOPER,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    ){}
+
+SafariOptimalActionTest::SafariOptimalActionTest()
+    : LANGUAGE(
+        "<b>Game Language:</b>",
+        Pokemon::PokemonNameReader::instance().languages(),
+        LockMode::LOCK_WHILE_RUNNING, true
+    )
+    , BALLS_REMAINING(
+        "<b>Safari Balls Remaining:</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        (uint8_t)30, (uint8_t)1, (uint8_t)30
+    )
+{
+    PA_ADD_OPTION(LANGUAGE);
+    PA_ADD_OPTION(BALLS_REMAINING);
+}
+
+void SafariOptimalActionTest::program(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context
+){
+    WildEncounterReader reader(COLOR_RED);
+    VideoOverlaySet overlays(env.console.overlay());
+    reader.make_overlays(overlays);
+
+    env.log("Reading encounter...");
+    VideoSnapshot screen = env.console.video().snapshot();
+    PokemonFRLG_WildEncounter encounter = reader.read_encounter(env.logger(), LANGUAGE, screen, SAFARI_ZONE_POKEMON_SUBSET);
+    env.log("Encounter: " + encounter.name);
+
+    SafariOptimalAction safari_optimal_action(LANGUAGE);
+    auto actions = safari_optimal_action.get_optimal_actions(
+        env.console,
+        encounter.name,
+        BALLS_REMAINING
+    );
+
+    if (!actions.has_value()){
+        env.log("No optimal action sequence found for this encounter.", COLOR_RED);
+        return;
+    }
+
+    const std::vector<SafariBattleMenuOption>& action_list = actions->get();
+
+    env.log("Optimal actions: " + safari_actions_to_string(action_list));
+
+    BattleSelectionArrowWatcher battle_arrow(COLOR_RED, &env.console.overlay());
+
+    for (size_t c = 0; c < action_list.size(); c++){
+        int ret = wait_until(
+            env.console, context,
+            std::chrono::seconds(10),
+            { battle_arrow }
+        );
+
+        if (ret != 0){
+            env.log("Safari battle menu not detected. Stopping.", COLOR_RED);
+            return;
+        }
+
+        SafariBattleMenuOption action = action_list[c];
+        env.log(
+            "Executing action " + std::to_string(c + 1) + "/" + std::to_string(action_list.size()) + ": " + safari_action_to_string(action)
+        );
+
+        if (!move_cursor_to_option(env.console, context, action)){
+            env.log("Failed to move cursor to option.", COLOR_RED);
+            return;
+        }
+
+        pbf_press_button(context, BUTTON_A, 200ms, 1000ms);
+        context.wait_for_all_requests();
+    }
+
+    env.log("Finished executing Safari optimal actions.", COLOR_BLUE);
+}
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_SafariOptimalActionTest.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_SafariOptimalActionTest.h
new file mode 100644
index 0000000000..0cc452e5ec
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_SafariOptimalActionTest.h
@@ -0,0 +1,41 @@
+/*  Safari Optimal Action Test
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonFRLG_SafariOptimalActionTest_H
+#define PokemonAutomation_PokemonFRLG_SafariOptimalActionTest_H
+
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "CommonFramework/Tools/VideoStream.h"
+#include "CommonTools/Options/LanguageOCROption.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+class SafariOptimalActionTest_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    SafariOptimalActionTest_Descriptor();
+};
+
+class SafariOptimalActionTest : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = SafariOptimalActionTest_Descriptor;
+    SafariOptimalActionTest();
+
+    virtual void start_program_border_check(VideoStream& stream, FeedbackType feedback_type) override{}
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    OCR::LanguageOCROption LANGUAGE;
+    SimpleIntegerOption<uint8_t> BALLS_REMAINING;
+};
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_SoundListener.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_SoundListener.cpp
new file mode 100644
index 0000000000..e57488c9b9
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_SoundListener.cpp
@@ -0,0 +1,93 @@
+/*  Sound Listener
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <chrono>
+#include <iostream>
+#include "Common/Cpp/Exceptions.h"
+#include "CommonTools/Async/InferenceSession.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonFRLG/Inference/Sounds/PokemonFRLG_ShinySoundDetector.h"
+#include "PokemonFRLG_SoundListener.h"
+
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+    using namespace Pokemon;
+
+
+SoundListener_Descriptor::SoundListener_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonFRLG:SoundListener",
+        STRING_POKEMON + " FRLG", "Sound Listener",
+        "",
+        "Test sound detectors listening to audio stream.",
+        PanelQualityStanding::DEVELOPER,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::ENABLE_COMMANDS
+    )
+{}
+
+
+SoundListener::SoundListener()
+    : SOUND_TYPE("<b>Which Sound to Detect</b>",
+        {
+            {SoundType::SHINY, "shiny", "Shiny Sound"},
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        SoundType::SHINY
+    )
+    , STOP_ON_DETECTED_SOUND(
+        "<b>Stop on the detected sound</b><br>Stop program when the sound is detected.",
+        LockMode::LOCK_WHILE_RUNNING,
+        false
+    )
+{
+    PA_ADD_OPTION(SOUND_TYPE);
+    PA_ADD_OPTION(STOP_ON_DETECTED_SOUND);
+}
+
+void SoundListener::program(SingleSwitchProgramEnvironment& env, CancellableScope& scope){
+    // search_alpha_roar_from_audio_dump();
+    // return;
+
+    std::cout << "Running audio test program." << std::endl;
+
+    std::shared_ptr<AudioInferenceCallback> detector;
+    auto action = [&](float error_coefficient) -> bool{
+        // This lambda function will be called when the sound is detected.
+        // Its return will determine whether to stop the program:
+        return STOP_ON_DETECTED_SOUND;
+    };
+
+    SoundType type = SOUND_TYPE;
+    switch (type){
+    case SoundType::SHINY:
+        detector = std::make_shared<ShinySoundDetector>(env.console, action);
+        break;
+    default:
+        throw InternalProgramError(
+            &env.logger(), PA_CURRENT_FUNCTION,
+            "Not such sound detector as sound type " + std::to_string((size_t)type)
+        );
+        return;
+    }
+
+    InferenceSession session(
+        scope, env.console,
+        {{*detector, std::chrono::milliseconds(20)}}
+    );
+    scope.wait_until_cancel();
+
+    std::cout << "Audio test program Sound listener finished." << std::endl;
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_SoundListener.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_SoundListener.h
new file mode 100644
index 0000000000..680360f1e9
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_SoundListener.h
@@ -0,0 +1,50 @@
+/*  Sound Listener
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *  
+ *  Debug program to test all kinds of sound detectors.
+ */
+
+#ifndef PokemonAutomation_PokemonFRLG_SoundListener_H
+#define PokemonAutomation_PokemonFRLG_SoundListener_H
+
+#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "Common/Cpp/Options/EnumDropdownOption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+//#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+
+namespace PokemonAutomation{ 
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+
+class SoundListener_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    SoundListener_Descriptor();
+};
+
+
+class SoundListener : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = SoundListener_Descriptor;
+    SoundListener();
+
+    virtual void start_program_border_check(VideoStream &stream, FeedbackType feedback_type) override{}
+    virtual void program(SingleSwitchProgramEnvironment& env, CancellableScope& scope) override;
+
+private:
+    enum class SoundType{
+        SHINY,
+    };
+
+    EnumDropdownOption<SoundType> SOUND_TYPE;
+    BooleanCheckBoxOption STOP_ON_DETECTED_SOUND;
+};
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_TestPartyInference.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_TestPartyInference.cpp
new file mode 100644
index 0000000000..82bb323a72
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_TestPartyInference.cpp
@@ -0,0 +1,95 @@
+/*  Test Party Inference
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <chrono>
+#include <string>
+#include "Common/Cpp/CancellableScope.h"
+#include "Common/Cpp/Color.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_PartyEmptySlotDetector.h"
+#include "VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_PartyHeldItemDetector.h"
+#include "VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_PartyMenuDetector.h"
+#include "PokemonFRLG_TestPartyInference.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+TestPartyInference_Descriptor::TestPartyInference_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonFRLG:TestPartyInference",
+        Pokemon::STRING_POKEMON + " FRLG",
+        "Test Party Inference", "",
+        "Start on the party menu. Log party menu detection, empty slots, and held items from one snapshot.",
+        PanelQualityStanding::DEVELOPER,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+TestPartyInference::TestPartyInference()
+    : LANGUAGE(
+        "<b>Game Language:</b>",
+        {
+            Language::English,
+            Language::Japanese,
+            Language::Spanish,
+            Language::French,
+            Language::German,
+            Language::Italian,
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        true
+    )
+{
+    PA_ADD_OPTION(LANGUAGE);
+}
+
+void TestPartyInference::program(SingleSwitchProgramEnvironment& env, CancellableScope& scope){
+    VideoOverlaySet overlays(env.console.overlay());
+    PartyMenuDetector menu_detector(COLOR_RED);
+    menu_detector.make_overlays(overlays);
+
+    VideoSnapshot screen = env.console.video().snapshot();
+    bool party_menu = menu_detector.detect(screen);
+    env.log(std::string("PartyMenuDetector: ") + (party_menu ? "detected" : "not detected"));
+    if (!party_menu){
+        env.log("Party menu not detected. Slot results below may be invalid.", COLOR_RED);
+    }
+
+    const PartySlot slots[] = {
+        PartySlot::ONE, PartySlot::TWO, PartySlot::THREE,
+        PartySlot::FOUR, PartySlot::FIVE, PartySlot::SIX,
+    };
+    for (PartySlot slot : slots){
+        scope.throw_if_cancelled();
+        std::string empty_result = "N/A (slot 1 is always occupied)";
+        if (slot != PartySlot::ONE){
+            PartyEmptySlotDetector empty_detector(COLOR_CYAN, slot);
+            empty_detector.make_overlays(overlays);
+            empty_result = empty_detector.detect(screen) ? "yes" : "no";
+        }
+
+        PartyHeldItemDetector held_item_detector(COLOR_YELLOW, nullptr, slot, LANGUAGE);
+        held_item_detector.make_overlays(overlays);
+        bool held_item = held_item_detector.detect(screen);
+        env.log(
+            "Slot " + std::to_string(static_cast<unsigned>(slot) + 1) +
+            ": PartyEmptySlotDetector = " + empty_result +
+            "; PartyHeldItemDetector = " + (held_item ? "yes" : "no")
+        );
+    }
+
+    env.log("Finished party inference. Detection regions remain visible for 10 seconds.", COLOR_BLUE);
+    scope.wait_for(std::chrono::seconds(10));
+}
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_TestPartyInference.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_TestPartyInference.h
new file mode 100644
index 0000000000..b3e010dfaf
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_TestPartyInference.h
@@ -0,0 +1,37 @@
+/*  Test Party Inference
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonFRLG_TestPartyInference_H
+#define PokemonAutomation_PokemonFRLG_TestPartyInference_H
+
+#include "CommonTools/Options/LanguageOCROption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+class TestPartyInference_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    TestPartyInference_Descriptor();
+};
+
+class TestPartyInference : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = TestPartyInference_Descriptor;
+    TestPartyInference();
+
+    virtual void start_program_border_check(VideoStream&, FeedbackType) override{}
+    virtual void program(SingleSwitchProgramEnvironment& env, CancellableScope& scope) override;
+
+private:
+    OCR::LanguageOCROption LANGUAGE;
+};
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Resources/PokemonFRLG_PokemonSprites.cpp b/SerialPrograms/Source/VideoGames/PokemonFRLG/Resources/PokemonFRLG_PokemonSprites.cpp
new file mode 100644
index 0000000000..ff6181ced1
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Resources/PokemonFRLG_PokemonSprites.cpp
@@ -0,0 +1,27 @@
+/*  Pokemon FRLG Pokemon Sprites
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "PokemonFRLG_PokemonSprites.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+
+const SpriteDatabase& ALL_POKEMON_SPRITES(){
+    static const SpriteDatabase database("PokemonFRLG/PokemonSprites.png", "PokemonFRLG/PokemonSprites.json");
+    return database;
+}
+const SpriteDatabase& FLIPPED_POKEMON_SPRITES(){
+    static const SpriteDatabase database("PokemonFRLG/PokemonSpritesFlipped.png", "PokemonFRLG/PokemonSprites.json");
+    return database;
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonFRLG/Resources/PokemonFRLG_PokemonSprites.h b/SerialPrograms/Source/VideoGames/PokemonFRLG/Resources/PokemonFRLG_PokemonSprites.h
new file mode 100644
index 0000000000..c5e289c4ea
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonFRLG/Resources/PokemonFRLG_PokemonSprites.h
@@ -0,0 +1,24 @@
+/*  Pokemon FRLG Pokemon Sprites
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonFRLG_PokemonSprites_H
+#define PokemonAutomation_PokemonFRLG_PokemonSprites_H
+
+#include "CommonTools/Resources/SpriteDatabase.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonFRLG{
+
+
+const SpriteDatabase& ALL_POKEMON_SPRITES();
+const SpriteDatabase& FLIPPED_POKEMON_SPRITES();
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_AlphaDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_AlphaDetector.cpp
new file mode 100644
index 0000000000..54123c2b78
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_AlphaDetector.cpp
@@ -0,0 +1,229 @@
+/*  Alpha Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/ImageTools/ImageStats.h"
+#include "CommonFramework/ImageTypes/ImageRGB32.h"
+#include "Tests/ImageUnitTest.h"
+#include "PokemonHome_AlphaDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonHome{
+
+
+AlphaDetector::AlphaDetector(Color color, VideoOverlay* overlay)
+    : m_color(color)
+    , m_overlay(overlay)
+    , m_box(0.787, 0.095, 0.024, 0.046)
+{}
+
+void AlphaDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_box);
+}
+
+bool AlphaDetector::detect(const ImageViewRGB32& screen){
+    const bool found = image_stddev(extract_box_reference(screen, m_box)).sum() > 40;
+    if (m_overlay){
+        if (found){
+            m_last_detected_box.emplace(*m_overlay, m_box, COLOR_GREEN);
+        }else{
+            m_last_detected_box.reset();
+        }
+    }
+    return found;
+}
+
+class Test_AlphaDetector : public ImageUnitTest{
+public:
+    Test_AlphaDetector(const std::string& image, bool expected)
+        : ImageUnitTest("PokemonHome::AlphaDetector - " + image, {image})
+        , m_expected(expected)
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        const ImageRGB32& image = images[0];
+        AlphaDetector detector;
+        return detector.detect(image) == m_expected;
+    }
+
+private:
+    bool m_expected;
+};
+
+void add_tests_AlphaDetector(UnitTestDatabase& database){
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/annihilape_Regular.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/bidoof_Regular.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/bulbasaur_Regular.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/bulbasuar_Shiny_Go.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/bulbasuar_Shiny_Lza.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/capskid_Regular.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/castform_Regular.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/cyclizar_Regular.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/dudunsparce_Regular.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/dudunsparce_Regular_Sv.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/enamorus_Shiny.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/gimmighoul_Regular.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/glimmet_Regular.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/gogoat_Regular.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/greatTusk_Shiny.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/hatterne_Regular.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/houndstone_Regular.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/ironBunde_Regular.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/ironBundle_Regular_Sv.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/ironJugulis_Regular.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/ironThorns_Regular.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/kilowattrel_Regular.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/kingler_Shiny.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/komala_Regular.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/krabby_Shiny.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/machamp_Regular.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/pancham_Shiny.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/rapidash_Regular.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/rellor_Regular.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/riolu_Regular.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/rowlet_ShinyAlpha.png", true);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/scovillain_Regular.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/slitherWing_Shiny.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/squirtle_Shiny.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/tapuLele_Shiny.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/tatsugiri_Regular.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/teddiursa_Regular.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/terapagos_regular.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/vulpix_Regular.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/vulpix_Shiny.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/wartortle_Regular.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/wurmple_Regular.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/GBA-Origin-ElgatoHD60Pro-NV12.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/GBA-Origin-ElgatoHD60Pro-YUYV.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/Farfetchd-fast-ball.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/Machamp-gigaton-ball.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/Machoke-gigaton-ball.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/Machop-gigaton-ball.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/Magnemite-gigaton-ball.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/Magneton-gigaton-ball.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/Slowpoke-fast-ball.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/absol_Regular_none_1792424917318.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/arrokuda_Regular_none_1792424917770.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/azelf_Regular_none_1792424918264.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/bisharp_Regular_none_1792424918722.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/budew_Regular_none_1792424919162.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/buneary_Regular_none_1792424919615.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/bunnelby_Regular_none_1792424920096.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/buzzwole_Regular_none_1792424920562.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/calyrex_Regular_none_1792424921051.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/centiskorch_Regular_none_1792424921522.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/charjabug_Regular_none_1792424921973.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/charmander_Regular_none_1792424922423.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/cherubi_Regular_none_1792424922878.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/cottonee_Regular_none_1792424923397.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/cottonee_Regular_none_1792424923843.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/cramorant_Regular_none_1792424924277.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/cubone_Regular_none_1792424924758.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/delibird_Regular_none_1792424925212.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/dracovish_Regular_none_1792424925673.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/dreepy_Regular_none_1792424926124.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/dusclops_Regular_none_1792424926621.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/electrike_Regular_none_1792424927083.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/electrike_Regular_none_1792424927528.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/eternatus_Regular_Shiny_none_1792424927959.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/eternatus_Regular_none_1792424928413.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/ferroseed_Regular_none_1792424928886.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/fletchling_Regular_none_1792424929346.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/gastly_Regular_none_1792424929814.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/gible_Regular_none_1792424930272.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/gible_Regular_none_1792424930703.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/golurk_Regular_none_1792424931148.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/golurk_Regular_none_1792424931632.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/goodra_Regular_none_1792424932092.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/grookey_Regular_none_1792424932537.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/gurdurr_Regular_none_1792424932986.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/gyarados_Regular_none_1792424933448.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/hattrem_Regular_none_1792424933893.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/hattrem_Regular_none_1792424934353.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/haunter_Regular_none_1792424934828.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/honedge_Regular_none_1792424935285.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/jellicent_Regular_none_1792424935736.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/keldeo_Regular_Shiny_none_1792424936178.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/linoone_Regular_none_1792424936621.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/litten_Regular_none_1792424937059.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/litten_Regular_none_1792424937516.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/machoke_Regular_none_1792424937960.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/machoke_Regular_none_1792424938413.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/machop_Regular_none_1792424938862.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/magearna_Regular_none_1792424939321.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/magikarp_Regular_none_1792424939790.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/melmetal_Regular_none_1792424940261.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/melmetal_Regular_none_1792424940711.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/meowth_Regular_none_1792424941158.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/meowth_Regular_none_1792424941611.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/metapod_Regular_none_1792424942051.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/milcery_Regular_none_1792424942492.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/mime-jr_Regular_none_1792424942964.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/mudkip_Regular_none_1792424943412.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/nidoking_Regular_none_1792424943853.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/nidoran-f_Regular_none_1792424944297.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/nidoran-m_Regular_none_1792424944756.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/ninjask_Regular_none_1792424945199.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/noibat_Regular_none_1792424945647.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/orbeetle_Regular_none_1792424946083.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/pangoro_Regular_none_1792424946529.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/pikachu_Regular_none_1792424946978.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/poliwhirl_Regular_none_1792424947416.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/pumpkaboo_Regular_none_1792424947882.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/purrloin_Regular_none_1792424948321.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/ralts_Regular_none_1792424948769.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/rapidash_Regular_none_1792424949229.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/remoraid_Regular_none_1792424949680.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/rhydon_Regular_none_1792424950146.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/rookidee_Regular_none_1792424950592.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/rotom_Regular_none_1792424951021.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/sandaconda_Regular_none_1792424951459.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/sandslash_Regular_none_1792424951934.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/scorbunny_Regular_none_1792424952390.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/seismitoad_Regular_none_1792424952847.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/sharpedo_Regular_none_1792424953289.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/shellos_Regular_none_1792424953738.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/shiinotic_Regular_none_1792424954189.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/sizzlipede_Regular_none_1792424954668.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/sizzlipede_Regular_none_1792424955123.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/sizzlipede_Regular_none_1792424955582.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/skwovet_Regular_none_1792424956033.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/slowpoke_Regular_none_1792424956466.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/snover_Regular_none_1792424956935.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/sobble_Regular_none_1792424957377.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/stunfisk_Regular_none_1792424957817.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/stunfisk_Regular_none_1792424958276.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/tapu-bulu_Regular_none_1792424958716.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/tapu-lele_Regular_none_1792424959172.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/timburr_Regular_none_1792424959640.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/timburr_Regular_none_1792424960105.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/timburr_Regular_none_1792424960552.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/timburr_Regular_none_1792424960992.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/timburr_Regular_none_1792424961449.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/toxapex_Regular_none_1792424961906.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/toxtricity_Regular_none_1792424962375.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/tranquill_Regular_none_1792424962829.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/tympole_Regular_none_1792424963266.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/vanillish_Regular_none_1792424963705.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/vanillish_Regular_none_1792424964155.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/vulpix_Regular_none_1792424964627.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/vulpix_Regular_none_1792424965074.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/wishiwashi_Regular_none_1792424965509.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/wobbuffet_Regular_none_1792424965947.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/wynaut_Regular_none_1792424966405.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/zarude_Regular_none_1792424966858.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/zarude_Regular_none_1792424967363.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/zigzagoon_Regular_none_1792424967861.png", false);
+    database.add<Test_AlphaDetector>("PokemonHome/SummaryScreen/zigzagoon_Regular_none_1792424968351.png", false);
+}
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_AlphaDetector.h b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_AlphaDetector.h
new file mode 100644
index 0000000000..8630bc3ac2
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_AlphaDetector.h
@@ -0,0 +1,41 @@
+/*  Alpha Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonHome_AlphaDetector_H
+#define PokemonAutomation_PokemonHome_AlphaDetector_H
+
+#include <optional>
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/VisualDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonHome{
+
+
+class AlphaDetector : public StaticScreenDetector{
+public:
+    AlphaDetector(Color color = COLOR_RED, VideoOverlay* overlay = nullptr);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    Color m_color;
+    VideoOverlay* m_overlay;
+    ImageFloatBox m_box;
+    std::optional<OverlayBoxScope> m_last_detected_box;
+};
+
+void add_tests_AlphaDetector(UnitTestDatabase& database);
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_BallReader.cpp b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_BallReader.cpp
new file mode 100644
index 0000000000..3c95950971
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_BallReader.cpp
@@ -0,0 +1,520 @@
+/*  Ball Reader
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <algorithm>
+#include <map>
+#include "Common/Cpp/Exceptions.h"
+#include "Kernels/Waterfill/Kernels_Waterfill_Session.h"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/Notifications/ProgramInfo.h"
+#include "CommonFramework/Recording/StreamHistorySession.h"
+#include "CommonFramework/Tools/ErrorDumper.h"
+#include "CommonTools/Images/BinaryImage_FilterRgb32.h"
+#include "CommonTools/ImageMatch/ImageCropper.h"
+#include "Tests/ImageUnitTest.h"
+#include "Tests/TestUtils.h"
+#include "VideoGames/PokemonHome/Resources/PokemonHome_PokeballSprites.h"
+#include "PokemonHome_BallReader.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonHome{
+
+namespace{
+    constexpr double MAX_BALL_ALPHA = 0.40;
+
+    ImageViewRGB32 crop_ball_sprite(const ImageViewRGB32& image, double min_distance_squared){
+        ImageStats border = image_border_stats(image);
+        ImagePixelBox box = ImageMatch::enclosing_rectangle_with_pixel_filter(
+            image,
+            [&](Color pixel){
+                double r = (double)pixel.red() - border.average.r;
+                double g = (double)pixel.green() - border.average.g;
+                double b = (double)pixel.blue() - border.average.b;
+                return r*r + g*g + b*b >= min_distance_squared;
+            }
+        );
+        return extract_box_reference(image, box);
+    }
+}
+
+
+
+class PokeballSpriteMatcher::SimilarBallGroupMatcher{
+    struct PairMatchers{
+        PairMatchers(size_t first, size_t second, ImageRGB32 a, ImageRGB32 b)
+            : first(first), second(second)
+            , a(std::move(a), {1, 128})
+            , b(std::move(b), {1, 128})
+        {}
+        size_t first;
+        size_t second;
+        ImageMatch::WeightedExactImageMatcher a;
+        ImageMatch::WeightedExactImageMatcher b;
+    };
+
+public:
+    SimilarBallGroupMatcher(
+        const SimilarBallGroup& config,
+        const std::map<std::string, ImageRGB32>& cleaned_sprites
+    )
+        : m_config(config)
+    {
+        if (config.slugs.size() < 2 || config.comparison_width == 0 || config.comparison_height == 0
+            || config.min_detail_pixels < 2 || config.min_pixel_distance <= 0
+            || config.crop_distance <= 0 || config.coarse_spread < 0
+            || config.max_detail_alpha < 0 || config.detail_spread < 0
+        ){
+            throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Invalid similar ball group.");
+        }
+
+        std::vector<ImageRGB32> sprites;
+        for (const std::string& slug : config.slugs){
+            auto iter = cleaned_sprites.find(slug);
+            if (iter == cleaned_sprites.end()){
+                throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Invalid similar ball group member: " + slug);
+            }
+            ImageViewRGB32 trimmed = ImageMatch::trim_image_alpha(iter->second);
+            sprites.emplace_back(trimmed.scale_to(config.comparison_width, config.comparison_height));
+        }
+
+        for (size_t i = 0; i < sprites.size(); i++){
+            for (size_t j = 0; j < i; j++){
+                ImageRGB32 a = sprites[j].copy();
+                ImageRGB32 b = sprites[i].copy();
+                size_t detail_pixels = 0;
+                for (size_t y = 0; y < config.comparison_height; y++){
+                    for (size_t x = 0; x < config.comparison_width; x++){
+                        Color first(a.pixel(x, y)), second(b.pixel(x, y));
+                        double r = (double)first.red() - second.red();
+                        double g = (double)first.green() - second.green();
+                        double blue = (double)first.blue() - second.blue();
+                        if (first.alpha() == 255 && second.alpha() == 255
+                            && r*r + g*g + blue*blue >= config.min_pixel_distance * config.min_pixel_distance
+                        ){
+                            detail_pixels++;
+                        }else{
+                            a.pixel(x, y) = 0;
+                            b.pixel(x, y) = 0;
+                        }
+                    }
+                }
+                if (detail_pixels >= config.min_detail_pixels){
+                    m_pairs.emplace_back(std::make_unique<PairMatchers>(j, i, std::move(a), std::move(b)));
+                }
+            }
+        }
+    }
+
+    double coarse_spread() const{ return m_config.coarse_spread; }
+
+    bool contains(const std::string& slug) const{
+        return std::find(m_config.slugs.begin(), m_config.slugs.end(), slug) != m_config.slugs.end();
+    }
+
+    std::string winner(const ImageViewRGB32& image) const{
+        ImageViewRGB32 crop = crop_ball_sprite(image, m_config.crop_distance * m_config.crop_distance);
+        std::vector<size_t> wins(m_config.slugs.size(), 0);
+        for (const auto& pair : m_pairs){
+            double a = pair->a.diff(crop);
+            double b = pair->b.diff(crop);
+            if (a <= m_config.max_detail_alpha && b - a > m_config.detail_spread){
+                wins[pair->first]++;
+            }
+            if (b <= m_config.max_detail_alpha && a - b > m_config.detail_spread){
+                wins[pair->second]++;
+            }
+        }
+        for (size_t i = 0; i < wins.size(); i++){
+            if (wins[i] == m_config.slugs.size() - 1){
+                return m_config.slugs[i];
+            }
+        }
+        return "";
+    }
+
+private:
+    SimilarBallGroup m_config;
+    std::vector<std::unique_ptr<PairMatchers>> m_pairs;
+};
+
+
+PokeballSpriteMatcher::PokeballSpriteMatcher(double min_euclidean_distance)
+    : PokeballSpriteMatcher(
+        {
+            SimilarBallGroup{
+                .slugs = {"heavy-ball-pla", "leaden-ball", "gigaton-ball"},
+            },
+            SimilarBallGroup{
+                .slugs = {"fast-ball", "poke-ball"},
+            },
+        },
+        min_euclidean_distance
+    )
+{}
+PokeballSpriteMatcher::PokeballSpriteMatcher(
+    const std::vector<SimilarBallGroup>& groups, double min_euclidean_distance
+)
+    : CroppedImageDictionaryMatcher({1, 128})
+    , m_min_euclidean_distance_squared(min_euclidean_distance * min_euclidean_distance)
+{
+    std::map<std::string, ImageRGB32> cleaned_sprites;
+    for (const auto& item : PokemonHome::ALL_POKEBALL_SPRITES()){
+        ImageRGB32 sprite = remove_white_border(item.second.sprite);
+        add(item.first, sprite);
+        cleaned_sprites.emplace(item.first, std::move(sprite));
+    }
+    std::vector<std::string> grouped_slugs;
+    for (const SimilarBallGroup& group : groups){
+        for (const std::string& slug : group.slugs){
+            if (std::find(grouped_slugs.begin(), grouped_slugs.end(), slug) != grouped_slugs.end()){
+                throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Overlapping similar ball groups: " + slug);
+            }
+            grouped_slugs.emplace_back(slug);
+        }
+        m_similar_groups.emplace_back(std::make_unique<SimilarBallGroupMatcher>(group, cleaned_sprites));
+    }
+}
+PokeballSpriteMatcher::~PokeballSpriteMatcher() = default;
+
+ImageMatch::ImageMatchResult PokeballSpriteMatcher::match(const ImageViewRGB32& image, double alpha_spread) const{
+    double coarse_spread = alpha_spread;
+    for (const auto& group : m_similar_groups){
+        coarse_spread = std::max(coarse_spread, group->coarse_spread());
+    }
+
+    ImageMatch::ImageMatchResult coarse = CroppedImageDictionaryMatcher::match(image, coarse_spread);
+    if (coarse.results.empty()){
+        return coarse;
+    }
+    ImageMatch::ImageMatchResult result = coarse;
+    result.clear_beyond_spread(alpha_spread);
+    const double best_alpha = coarse.results.begin()->first;
+    if (best_alpha <= MAX_BALL_ALPHA){
+        for (const auto& group : m_similar_groups){
+            bool plausible = false;
+            for (const auto& item : coarse.results){
+                if (group->contains(item.second) && item.first <= MAX_BALL_ALPHA
+                    && item.first <= best_alpha + group->coarse_spread()
+                ){
+                    plausible = true;
+                    break;
+                }
+            }
+            if (!plausible){
+                continue;
+            }
+
+            std::string winner = group->winner(image);
+            auto selected = std::find_if(coarse.results.begin(), coarse.results.end(), [&](const auto& item){
+                return item.second == winner && item.first <= MAX_BALL_ALPHA
+                    && item.first <= best_alpha + group->coarse_spread();
+            });
+            if (selected == coarse.results.end()){
+                continue;
+            }
+
+            for (auto iter = result.results.begin(); iter != result.results.end();){
+                if (group->contains(iter->second)){
+                    iter = result.results.erase(iter);
+                }else{
+                    ++iter;
+                }
+            }
+            result.add(selected->first, winner);
+        }
+    }
+    result.clear_beyond_spread(alpha_spread);
+    return result;
+}
+ImageRGB32 PokeballSpriteMatcher::remove_white_border(const ImageViewRGB32& image){
+    using namespace Kernels::Waterfill;
+
+    ImageRGB32 ret = image.copy();
+    {
+        auto matrix = compress_rgb32_to_binary_range(ret, 0x00000000, 0x7f000000);
+        auto session = make_WaterfillSession(matrix);
+        auto iter = session->make_iterator(200);
+        WaterfillObject object;
+        if (!iter->find_next(object, true)){
+            return ret;
+        }
+        filter_by_mask(object.packed_matrix(), ret, Color(0xffffffff), false);
+    }
+    {
+        auto matrix = compress_rgb32_to_binary_range(ret, 0x00808080, 0xffffffff);
+        auto session = make_WaterfillSession(matrix);
+        auto iter = session->make_iterator(200);
+        WaterfillObject object;
+        if (!iter->find_next(object, true)){
+            return ret;
+        }
+        filter_by_mask(object.packed_matrix(), ret, Color(0x00000000), false);
+    }
+    return ret;
+}
+auto PokeballSpriteMatcher::get_crop_candidates(const ImageViewRGB32& image) const -> std::vector<ImageViewRGB32>{
+    std::vector<ImageViewRGB32> ret;
+    ret.emplace_back(crop_ball_sprite(image, m_min_euclidean_distance_squared));
+    return ret;
+}
+
+
+
+
+
+
+const double BallReader::MAX_ALPHA = MAX_BALL_ALPHA;
+const double BallReader::ALPHA_SPREAD = 0.02;
+
+
+const PokeballSpriteMatcher& BALL_SPRITE_MATCHER(){
+    static PokeballSpriteMatcher matcher;
+    return matcher;
+}
+
+
+
+BallReader::BallReader(VideoStream& stream)
+    : m_matcher(BALL_SPRITE_MATCHER())
+    , m_stream(stream)
+    , m_box_sprite(stream.overlay(), {0.228, 0.095, 0.030, 0.049})
+{}
+
+
+
+std::string BallReader::read_ball(const ImageViewRGB32& screen) const{
+    if (!screen){
+        return "";
+    }
+
+    ImageMatch::ImageMatchResult sprite_result;
+    {
+        ImageViewRGB32 image = extract_box_reference(screen, m_box_sprite);
+        sprite_result = m_matcher.match(image, ALPHA_SPREAD);
+        sprite_result.log(m_stream.logger(), 0.50);
+        if (!sprite_result.results.empty() && sprite_result.results.begin()->first > MAX_ALPHA){
+            sprite_result.results.clear();
+        }
+    }
+
+    if (sprite_result.results.size() != 1){
+        dump_image(m_stream.logger(), ProgramInfo(), "BallReader", screen);
+    }
+    if (sprite_result.results.empty()){
+        return "";
+    }
+
+    return sprite_result.results.begin()->second;
+}
+
+class Test_BallReader : public ImageUnitTest{
+public:
+
+    Test_BallReader(
+        const std::string& image,
+        const std::string& expected
+    )
+        : ImageUnitTest("PokemonHome::BallReader - " + image, {image})
+        , m_expected(expected)
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        DummyAudioFeed audio_feed;
+        DummyVideoFeed video_feed;
+        StreamHistorySession history(logger);
+        DummyVideoOverlay video_overlay;
+        VideoStream stream(logger, audio_feed, video_feed, history, video_overlay);
+        const ImageRGB32& image = images[0];
+        BallReader reader(stream);
+        std::string result = reader.read_ball(image);
+
+        if (result == m_expected)
+            return true;
+
+        return "Expected: " + m_expected + ", received: " + result;
+    };
+
+private:
+    std::string m_expected;
+};
+
+void add_tests_BallReader(UnitTestDatabase& database){
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/annihilape_Regular.png", "poke-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/bidoof_Regular.png", "ultra-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/bulbasaur_Regular.png", "ultra-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/bulbasuar_Shiny_Go.png", "poke-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/bulbasuar_Shiny_Lza.png", "repeat-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/capskid_Regular.png", "poke-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/castform_Regular.png", "poke-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/cyclizar_Regular.png", "poke-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/dudunsparce_Regular.png", "poke-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/dudunsparce_Regular_Sv.png", "quick-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/enamorus_Shiny.png", "cherish-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/gimmighoul_Regular.png", "ultra-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/glimmet_Regular.png", "poke-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/gogoat_Regular.png", "poke-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/greatTusk_Shiny.png", "poke-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/hatterne_Regular.png", "ultra-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/houndstone_Regular.png", "poke-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/ironBunde_Regular.png", "dive-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/ironBundle_Regular_Sv.png", "quick-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/ironJugulis_Regular.png", "quick-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/ironThorns_Regular.png", "ultra-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/kilowattrel_Regular.png", "poke-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/kingler_Shiny.png", "net-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/komala_Regular.png", "poke-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/krabby_Shiny.png", "ultra-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/machamp_Regular.png", "repeat-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/pancham_Shiny.png", "luxury-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/rapidash_Regular.png", "ultra-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/rellor_Regular.png", "great-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/riolu_Regular.png", "poke-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/rowlet_ShinyAlpha.png", "jet-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/scovillain_Regular.png", "great-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/slitherWing_Shiny.png", "beast-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/squirtle_Shiny.png", "poke-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/tapuLele_Shiny.png", "cherish-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/tatsugiri_Regular.png", "quick-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/teddiursa_Regular.png", "wing-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/terapagos_regular.png", "luxury-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/vulpix_Regular.png", "poke-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/vulpix_Shiny.png", "luxury-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/wartortle_Regular.png", "ultra-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/wurmple_Regular.png", "premier-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/GBA-Origin-ElgatoHD60Pro-NV12.png", "poke-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/GBA-Origin-ElgatoHD60Pro-YUYV.png", "poke-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/Farfetchd-fast-ball.png", "fast-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/Machamp-gigaton-ball.png", "gigaton-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/Machoke-gigaton-ball.png", "gigaton-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/Machop-gigaton-ball.png", "gigaton-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/Magnemite-gigaton-ball.png", "gigaton-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/Magneton-gigaton-ball.png", "gigaton-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/Slowpoke-fast-ball.png", "fast-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/absol_Regular_none_1792424917318.png", "ultra-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/arrokuda_Regular_none_1792424917770.png", "great-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/azelf_Regular_none_1792424918264.png", "ultra-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/bisharp_Regular_none_1792424918722.png", "ultra-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/budew_Regular_none_1792424919162.png", "great-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/buneary_Regular_none_1792424919615.png", "quick-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/bunnelby_Regular_none_1792424920096.png", "poke-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/buzzwole_Regular_none_1792424920562.png", "ultra-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/calyrex_Regular_none_1792424921051.png", "timer-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/centiskorch_Regular_none_1792424921522.png", "great-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/charjabug_Regular_none_1792424921973.png", "poke-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/charmander_Regular_none_1792424922423.png", "poke-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/cherubi_Regular_none_1792424922878.png", "ultra-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/cottonee_Regular_none_1792424923397.png", "love-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/cottonee_Regular_none_1792424923843.png", "love-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/cramorant_Regular_none_1792424924277.png", "timer-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/cubone_Regular_none_1792424924758.png", "quick-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/delibird_Regular_none_1792424925212.png", "poke-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/dracovish_Regular_none_1792424925673.png", "poke-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/dreepy_Regular_none_1792424926124.png", "poke-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/dusclops_Regular_none_1792424926621.png", "great-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/electrike_Regular_none_1792424927083.png", "heal-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/electrike_Regular_none_1792424927528.png", "heal-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/eternatus_Regular_Shiny_none_1792424927959.png", "cherish-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/eternatus_Regular_none_1792424928413.png", "luxury-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/ferroseed_Regular_none_1792424928886.png", "poke-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/fletchling_Regular_none_1792424929346.png", "nest-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/gastly_Regular_none_1792424929814.png", "great-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/gible_Regular_none_1792424930272.png", "poke-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/gible_Regular_none_1792424930703.png", "poke-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/golurk_Regular_none_1792424931148.png", "poke-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/golurk_Regular_none_1792424931632.png", "poke-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/goodra_Regular_none_1792424932092.png", "great-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/grookey_Regular_none_1792424932537.png", "poke-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/gurdurr_Regular_none_1792424932986.png", "ultra-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/gyarados_Regular_none_1792424933448.png", "poke-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/hattrem_Regular_none_1792424933893.png", "quick-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/hattrem_Regular_none_1792424934353.png", "quick-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/haunter_Regular_none_1792424934828.png", "great-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/honedge_Regular_none_1792424935285.png", "premier-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/jellicent_Regular_none_1792424935736.png", "great-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/keldeo_Regular_Shiny_none_1792424936178.png", "cherish-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/linoone_Regular_none_1792424936621.png", "poke-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/litten_Regular_none_1792424937059.png", "poke-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/litten_Regular_none_1792424937516.png", "poke-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/machoke_Regular_none_1792424937960.png", "ultra-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/machoke_Regular_none_1792424938413.png", "ultra-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/machop_Regular_none_1792424938862.png", "great-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/magearna_Regular_none_1792424939321.png", "cherish-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/magikarp_Regular_none_1792424939790.png", "great-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/melmetal_Regular_none_1792424940261.png", "cherish-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/melmetal_Regular_none_1792424940711.png", "cherish-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/meowth_Regular_none_1792424941158.png", "poke-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/meowth_Regular_none_1792424941611.png", "heal-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/metapod_Regular_none_1792424942051.png", "poke-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/milcery_Regular_none_1792424942492.png", "repeat-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/mime-jr_Regular_none_1792424942964.png", "poke-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/mudkip_Regular_none_1792424943412.png", "ultra-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/nidoking_Regular_none_1792424943853.png", "poke-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/nidoran-f_Regular_none_1792424944297.png", "luxury-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/nidoran-m_Regular_none_1792424944756.png", "quick-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/ninjask_Regular_none_1792424945199.png", "premier-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/noibat_Regular_none_1792424945647.png", "great-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/orbeetle_Regular_none_1792424946083.png", "ultra-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/pangoro_Regular_none_1792424946529.png", "poke-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/pikachu_Regular_none_1792424946978.png", "poke-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/poliwhirl_Regular_none_1792424947416.png", "quick-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/pumpkaboo_Regular_none_1792424947882.png", "nest-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/purrloin_Regular_none_1792424948321.png", "great-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/ralts_Regular_none_1792424948769.png", "love-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/rapidash_Regular_none_1792424949229.png", "great-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/remoraid_Regular_none_1792424949680.png", "quick-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/rhydon_Regular_none_1792424950146.png", "ultra-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/rookidee_Regular_none_1792424950592.png", "nest-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/rotom_Regular_none_1792424951021.png", "poke-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/sandaconda_Regular_none_1792424951459.png", "ultra-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/sandslash_Regular_none_1792424951934.png", "ultra-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/scorbunny_Regular_none_1792424952390.png", "poke-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/seismitoad_Regular_none_1792424952847.png", "ultra-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/sharpedo_Regular_none_1792424953289.png", "quick-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/shellos_Regular_none_1792424953738.png", "dive-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/shiinotic_Regular_none_1792424954189.png", "ultra-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/sizzlipede_Regular_none_1792424954668.png", "great-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/sizzlipede_Regular_none_1792424955123.png", "great-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/sizzlipede_Regular_none_1792424955582.png", "sport-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/skwovet_Regular_none_1792424956033.png", "poke-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/slowpoke_Regular_none_1792424956466.png", "poke-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/snover_Regular_none_1792424956935.png", "ultra-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/sobble_Regular_none_1792424957377.png", "poke-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/stunfisk_Regular_none_1792424957817.png", "poke-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/stunfisk_Regular_none_1792424958276.png", "poke-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/tapu-bulu_Regular_none_1792424958716.png", "great-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/tapu-lele_Regular_none_1792424959172.png", "great-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/timburr_Regular_none_1792424959640.png", "poke-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/timburr_Regular_none_1792424960105.png", "heal-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/timburr_Regular_none_1792424960552.png", "poke-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/timburr_Regular_none_1792424960992.png", "heal-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/timburr_Regular_none_1792424961449.png", "poke-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/toxapex_Regular_none_1792424961906.png", "poke-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/toxtricity_Regular_none_1792424962375.png", "poke-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/tranquill_Regular_none_1792424962829.png", "poke-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/tympole_Regular_none_1792424963266.png", "great-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/vanillish_Regular_none_1792424963705.png", "great-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/vanillish_Regular_none_1792424964155.png", "great-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/vulpix_Regular_none_1792424964627.png", "great-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/vulpix_Regular_none_1792424965074.png", "great-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/wishiwashi_Regular_none_1792424965509.png", "poke-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/wobbuffet_Regular_none_1792424965947.png", "repeat-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/wynaut_Regular_none_1792424966405.png", "ultra-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/zarude_Regular_none_1792424966858.png", "cherish-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/zarude_Regular_none_1792424967363.png", "cherish-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/zigzagoon_Regular_none_1792424967861.png", "poke-ball");
+    database.add<Test_BallReader>("PokemonHome/SummaryScreen/zigzagoon_Regular_none_1792424968351.png", "poke-ball");
+
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_BallReader.h b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_BallReader.h
new file mode 100644
index 0000000000..f13a58f4a9
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_BallReader.h
@@ -0,0 +1,81 @@
+/*  Ball Reader
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonHome_BallReader_H
+#define PokemonAutomation_PokemonHome_BallReader_H
+
+#include <memory>
+#include <string>
+#include <vector>
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "CommonFramework/ImageTypes/ImageRGB32.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonFramework/Tools/VideoStream.h"
+#include "CommonTools/ImageMatch/CroppedImageDictionaryMatcher.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonHome{
+
+
+
+struct SimilarBallGroup{
+    std::vector<std::string> slugs;
+    size_t comparison_width = 20;
+    size_t comparison_height = 19;
+    double crop_distance = 200;
+    double coarse_spread = 0.08;
+    double max_detail_alpha = 0.20;
+    double detail_spread = 0.03;
+    double min_pixel_distance = 30;
+    size_t min_detail_pixels = 25;
+};
+
+class PokeballSpriteMatcher : public ImageMatch::CroppedImageDictionaryMatcher{
+public:
+    PokeballSpriteMatcher(double min_euclidean_distance = 100);
+    PokeballSpriteMatcher(const std::vector<SimilarBallGroup>& groups, double min_euclidean_distance = 100);
+    virtual ~PokeballSpriteMatcher();
+
+    ImageMatch::ImageMatchResult match(const ImageViewRGB32& image, double alpha_spread) const;
+
+private:
+    static ImageRGB32 remove_white_border(const ImageViewRGB32& image);
+    virtual std::vector<ImageViewRGB32> get_crop_candidates(const ImageViewRGB32& image) const override;
+
+private:
+    class SimilarBallGroupMatcher;
+    double m_min_euclidean_distance_squared;
+    std::vector<std::unique_ptr<SimilarBallGroupMatcher>> m_similar_groups;
+};
+
+
+
+
+class BallReader{
+    static const double MAX_ALPHA;
+    static const double ALPHA_SPREAD;
+
+public:
+    BallReader(VideoStream& stream);
+
+public:
+    std::string read_ball(const ImageViewRGB32& screen) const;
+
+private:
+    const PokeballSpriteMatcher& m_matcher;
+    VideoStream& m_stream;
+    OverlayBoxScope m_box_sprite;
+};
+
+void add_tests_BallReader(UnitTestDatabase& database);
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_BoxGenderDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_BoxGenderDetector.cpp
new file mode 100644
index 0000000000..131f203b40
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_BoxGenderDetector.cpp
@@ -0,0 +1,269 @@
+/*  Box Gender Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <iostream>
+#include "Common/Cpp/Color.h"
+#include "CommonFramework/StaticGlobals.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/ImageTypes/ImageRGB32.h"
+#include "CommonFramework/ImageTools/ImageStats.h"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Images/ImageFilter.h"
+#include "Tests/ImageUnitTest.h"
+#include "PokemonHome_BoxGenderDetector.h"
+
+using std::cout;
+using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonHome{
+
+namespace{
+    ImageFloatBox GENDER_BOX{0.417, 0.097, 0.031, 0.046};
+}
+
+void BoxGenderDetector::make_overlays(VideoOverlaySet& items){
+    items.add(COLOR_RED, GENDER_BOX);
+}
+
+Pokemon::StatsHuntGenderFilter BoxGenderDetector::detect(const ImageViewRGB32& screen){
+    const auto region = extract_box_reference(screen, GENDER_BOX);
+
+    // Retain only red pixels from region
+    const bool replace_color_within_range = false;
+    const ImageRGB32 red_region = filter_rgb32_range(
+        region,
+        combine_rgb(150, 0, 0), combine_rgb(255, 100, 100), Color(0), replace_color_within_range
+    );
+    const size_t num_red_pixels = image_stats(red_region).count;
+
+    // Retain only blue pixels from region
+    const ImageRGB32 blue_region = filter_rgb32_range(
+        region,
+        combine_rgb(0, 0, 150), combine_rgb(100, 100, 255), Color(0), replace_color_within_range
+    );
+    const size_t num_blue_pixels = image_stats(blue_region).count;
+
+    if (STATIC_GLOBALS.COLOR_CHECK){
+        cout << "num_red_pixels: " << num_red_pixels << ", num_blue_pixels: " << num_blue_pixels
+             << ", region " << region.width() << " x " << region.height() << endl;
+
+        cout << "Save images to ./red_only.png and ./blue_only.png" << endl;
+        red_region.save("./red_only.png");
+        blue_region.save("./blue_only.png");
+    }
+
+    const size_t threshold = region.width() * region.height() / 100;
+
+    if (num_red_pixels > threshold){
+        return Pokemon::StatsHuntGenderFilter::Female;
+    }else if (num_blue_pixels > threshold){
+        return Pokemon::StatsHuntGenderFilter::Male;
+    }
+    return Pokemon::StatsHuntGenderFilter::Genderless;
+}
+
+class Test_BoxGenderDetector : public ImageUnitTest{
+public:
+
+    Test_BoxGenderDetector(
+        const std::string& image,
+        Pokemon::StatsHuntGenderFilter expected
+    )
+        : ImageUnitTest("PokemonHome::BoxGenderDetector - " + image, {image})
+        , m_expected(expected)
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        const ImageRGB32& image = images[0];
+        Pokemon::StatsHuntGenderFilter result = BoxGenderDetector::detect(image);
+
+        if (result == m_expected)
+            return true;
+
+        return "Expected: " + Pokemon::gender_to_string(m_expected) + ", received: " + Pokemon::gender_to_string(result);
+    };
+
+private:
+    Pokemon::StatsHuntGenderFilter m_expected;
+};
+
+void add_tests_BoxGenderDetector(UnitTestDatabase& database){
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/annihilape_Regular.png", Pokemon::StatsHuntGenderFilter::Male);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/bidoof_Regular.png", Pokemon::StatsHuntGenderFilter::Female);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/bulbasaur_Regular.png", Pokemon::StatsHuntGenderFilter::Female);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/bulbasuar_Shiny_Go.png", Pokemon::StatsHuntGenderFilter::Male);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/bulbasuar_Shiny_Lza.png", Pokemon::StatsHuntGenderFilter::Male);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/capskid_Regular.png", Pokemon::StatsHuntGenderFilter::Male);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/castform_Regular.png", Pokemon::StatsHuntGenderFilter::Male);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/cyclizar_Regular.png", Pokemon::StatsHuntGenderFilter::Female);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/dudunsparce_Regular.png", Pokemon::StatsHuntGenderFilter::Male);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/dudunsparce_Regular_Sv.png", Pokemon::StatsHuntGenderFilter::Male);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/enamorus_Shiny.png", Pokemon::StatsHuntGenderFilter::Female);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/gimmighoul_Regular.png", Pokemon::StatsHuntGenderFilter::Genderless);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/glimmet_Regular.png", Pokemon::StatsHuntGenderFilter::Male);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/gogoat_Regular.png", Pokemon::StatsHuntGenderFilter::Male);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/greatTusk_Shiny.png", Pokemon::StatsHuntGenderFilter::Genderless);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/hatterne_Regular.png", Pokemon::StatsHuntGenderFilter::Female);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/houndstone_Regular.png", Pokemon::StatsHuntGenderFilter::Female);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/ironBunde_Regular.png", Pokemon::StatsHuntGenderFilter::Genderless);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/ironBundle_Regular_Sv.png", Pokemon::StatsHuntGenderFilter::Genderless);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/ironJugulis_Regular.png", Pokemon::StatsHuntGenderFilter::Genderless);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/ironThorns_Regular.png", Pokemon::StatsHuntGenderFilter::Genderless);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/kilowattrel_Regular.png", Pokemon::StatsHuntGenderFilter::Female);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/kingler_Shiny.png", Pokemon::StatsHuntGenderFilter::Female);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/komala_Regular.png", Pokemon::StatsHuntGenderFilter::Female);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/krabby_Shiny.png", Pokemon::StatsHuntGenderFilter::Male);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/machamp_Regular.png", Pokemon::StatsHuntGenderFilter::Male);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/pancham_Shiny.png", Pokemon::StatsHuntGenderFilter::Male);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/rapidash_Regular.png", Pokemon::StatsHuntGenderFilter::Female);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/rellor_Regular.png", Pokemon::StatsHuntGenderFilter::Male);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/riolu_Regular.png", Pokemon::StatsHuntGenderFilter::Male);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/rowlet_ShinyAlpha.png", Pokemon::StatsHuntGenderFilter::Male);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/scovillain_Regular.png", Pokemon::StatsHuntGenderFilter::Female);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/slitherWing_Shiny.png", Pokemon::StatsHuntGenderFilter::Genderless);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/squirtle_Shiny.png", Pokemon::StatsHuntGenderFilter::Male);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/tapuLele_Shiny.png", Pokemon::StatsHuntGenderFilter::Genderless);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/tatsugiri_Regular.png", Pokemon::StatsHuntGenderFilter::Male);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/teddiursa_Regular.png", Pokemon::StatsHuntGenderFilter::Female);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/terapagos_regular.png", Pokemon::StatsHuntGenderFilter::Male);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/vulpix_Regular.png", Pokemon::StatsHuntGenderFilter::Male);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/vulpix_Shiny.png", Pokemon::StatsHuntGenderFilter::Female);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/wartortle_Regular.png", Pokemon::StatsHuntGenderFilter::Male);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/wurmple_Regular.png", Pokemon::StatsHuntGenderFilter::Female);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/GBA-Origin-ElgatoHD60Pro-NV12.png", Pokemon::StatsHuntGenderFilter::Female);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/GBA-Origin-ElgatoHD60Pro-YUYV.png", Pokemon::StatsHuntGenderFilter::Female);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/Farfetchd-fast-ball.png", Pokemon::StatsHuntGenderFilter::Female);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/Machamp-gigaton-ball.png", Pokemon::StatsHuntGenderFilter::Male);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/Machoke-gigaton-ball.png", Pokemon::StatsHuntGenderFilter::Male);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/Machop-gigaton-ball.png", Pokemon::StatsHuntGenderFilter::Male);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/Magnemite-gigaton-ball.png", Pokemon::StatsHuntGenderFilter::Genderless);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/Magneton-gigaton-ball.png", Pokemon::StatsHuntGenderFilter::Genderless);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/Slowpoke-fast-ball.png", Pokemon::StatsHuntGenderFilter::Female);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/absol_Regular_none_1792424917318.png", Pokemon::StatsHuntGenderFilter::Female);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/arrokuda_Regular_none_1792424917770.png", Pokemon::StatsHuntGenderFilter::Male);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/azelf_Regular_none_1792424918264.png", Pokemon::StatsHuntGenderFilter::Genderless);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/bisharp_Regular_none_1792424918722.png", Pokemon::StatsHuntGenderFilter::Male);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/budew_Regular_none_1792424919162.png", Pokemon::StatsHuntGenderFilter::Male);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/buneary_Regular_none_1792424919615.png", Pokemon::StatsHuntGenderFilter::Female);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/bunnelby_Regular_none_1792424920096.png", Pokemon::StatsHuntGenderFilter::Female);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/buzzwole_Regular_none_1792424920562.png", Pokemon::StatsHuntGenderFilter::Genderless);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/calyrex_Regular_none_1792424921051.png", Pokemon::StatsHuntGenderFilter::Genderless);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/centiskorch_Regular_none_1792424921522.png", Pokemon::StatsHuntGenderFilter::Female);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/charjabug_Regular_none_1792424921973.png", Pokemon::StatsHuntGenderFilter::Male);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/charmander_Regular_none_1792424922423.png", Pokemon::StatsHuntGenderFilter::Male);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/cherubi_Regular_none_1792424922878.png", Pokemon::StatsHuntGenderFilter::Female);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/cottonee_Regular_none_1792424923397.png", Pokemon::StatsHuntGenderFilter::Male);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/cottonee_Regular_none_1792424923843.png", Pokemon::StatsHuntGenderFilter::Male);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/cramorant_Regular_none_1792424924277.png", Pokemon::StatsHuntGenderFilter::Female);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/cubone_Regular_none_1792424924758.png", Pokemon::StatsHuntGenderFilter::Male);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/delibird_Regular_none_1792424925212.png", Pokemon::StatsHuntGenderFilter::Male);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/dracovish_Regular_none_1792424925673.png", Pokemon::StatsHuntGenderFilter::Genderless);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/dreepy_Regular_none_1792424926124.png", Pokemon::StatsHuntGenderFilter::Female);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/dusclops_Regular_none_1792424926621.png", Pokemon::StatsHuntGenderFilter::Male);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/electrike_Regular_none_1792424927083.png", Pokemon::StatsHuntGenderFilter::Male);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/electrike_Regular_none_1792424927528.png", Pokemon::StatsHuntGenderFilter::Male);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/eternatus_Regular_Shiny_none_1792424927959.png", Pokemon::StatsHuntGenderFilter::Genderless);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/eternatus_Regular_none_1792424928413.png", Pokemon::StatsHuntGenderFilter::Genderless);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/ferroseed_Regular_none_1792424928886.png", Pokemon::StatsHuntGenderFilter::Female);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/fletchling_Regular_none_1792424929346.png", Pokemon::StatsHuntGenderFilter::Female);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/gastly_Regular_none_1792424929814.png", Pokemon::StatsHuntGenderFilter::Female);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/gible_Regular_none_1792424930272.png", Pokemon::StatsHuntGenderFilter::Male);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/gible_Regular_none_1792424930703.png", Pokemon::StatsHuntGenderFilter::Male);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/golurk_Regular_none_1792424931148.png", Pokemon::StatsHuntGenderFilter::Genderless);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/golurk_Regular_none_1792424931632.png", Pokemon::StatsHuntGenderFilter::Genderless);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/goodra_Regular_none_1792424932092.png", Pokemon::StatsHuntGenderFilter::Male);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/grookey_Regular_none_1792424932537.png", Pokemon::StatsHuntGenderFilter::Male);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/gurdurr_Regular_none_1792424932986.png", Pokemon::StatsHuntGenderFilter::Female);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/gyarados_Regular_none_1792424933448.png", Pokemon::StatsHuntGenderFilter::Male);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/hattrem_Regular_none_1792424933893.png", Pokemon::StatsHuntGenderFilter::Female);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/hattrem_Regular_none_1792424934353.png", Pokemon::StatsHuntGenderFilter::Female);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/haunter_Regular_none_1792424934828.png", Pokemon::StatsHuntGenderFilter::Male);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/honedge_Regular_none_1792424935285.png", Pokemon::StatsHuntGenderFilter::Male);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/jellicent_Regular_none_1792424935736.png", Pokemon::StatsHuntGenderFilter::Female);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/keldeo_Regular_Shiny_none_1792424936178.png", Pokemon::StatsHuntGenderFilter::Genderless);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/linoone_Regular_none_1792424936621.png", Pokemon::StatsHuntGenderFilter::Male);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/litten_Regular_none_1792424937059.png", Pokemon::StatsHuntGenderFilter::Male);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/litten_Regular_none_1792424937516.png", Pokemon::StatsHuntGenderFilter::Male);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/machoke_Regular_none_1792424937960.png", Pokemon::StatsHuntGenderFilter::Male);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/machoke_Regular_none_1792424938413.png", Pokemon::StatsHuntGenderFilter::Female);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/machop_Regular_none_1792424938862.png", Pokemon::StatsHuntGenderFilter::Female);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/magearna_Regular_none_1792424939321.png", Pokemon::StatsHuntGenderFilter::Genderless);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/magikarp_Regular_none_1792424939790.png", Pokemon::StatsHuntGenderFilter::Female);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/melmetal_Regular_none_1792424940261.png", Pokemon::StatsHuntGenderFilter::Genderless);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/melmetal_Regular_none_1792424940711.png", Pokemon::StatsHuntGenderFilter::Genderless);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/meowth_Regular_none_1792424941158.png", Pokemon::StatsHuntGenderFilter::Female);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/meowth_Regular_none_1792424941611.png", Pokemon::StatsHuntGenderFilter::Male);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/metapod_Regular_none_1792424942051.png", Pokemon::StatsHuntGenderFilter::Male);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/milcery_Regular_none_1792424942492.png", Pokemon::StatsHuntGenderFilter::Female);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/mime-jr_Regular_none_1792424942964.png", Pokemon::StatsHuntGenderFilter::Female);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/mudkip_Regular_none_1792424943412.png", Pokemon::StatsHuntGenderFilter::Male);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/nidoking_Regular_none_1792424943853.png", Pokemon::StatsHuntGenderFilter::Male);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/nidoran-f_Regular_none_1792424944297.png", Pokemon::StatsHuntGenderFilter::Female);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/nidoran-m_Regular_none_1792424944756.png", Pokemon::StatsHuntGenderFilter::Male);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/ninjask_Regular_none_1792424945199.png", Pokemon::StatsHuntGenderFilter::Male);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/noibat_Regular_none_1792424945647.png", Pokemon::StatsHuntGenderFilter::Female);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/orbeetle_Regular_none_1792424946083.png", Pokemon::StatsHuntGenderFilter::Male);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/pangoro_Regular_none_1792424946529.png", Pokemon::StatsHuntGenderFilter::Female);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/pikachu_Regular_none_1792424946978.png", Pokemon::StatsHuntGenderFilter::Male);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/poliwhirl_Regular_none_1792424947416.png", Pokemon::StatsHuntGenderFilter::Female);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/pumpkaboo_Regular_none_1792424947882.png", Pokemon::StatsHuntGenderFilter::Male);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/purrloin_Regular_none_1792424948321.png", Pokemon::StatsHuntGenderFilter::Female);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/ralts_Regular_none_1792424948769.png", Pokemon::StatsHuntGenderFilter::Female);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/rapidash_Regular_none_1792424949229.png", Pokemon::StatsHuntGenderFilter::Male);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/remoraid_Regular_none_1792424949680.png", Pokemon::StatsHuntGenderFilter::Male);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/rhydon_Regular_none_1792424950146.png", Pokemon::StatsHuntGenderFilter::Male);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/rookidee_Regular_none_1792424950592.png", Pokemon::StatsHuntGenderFilter::Male);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/rotom_Regular_none_1792424951021.png", Pokemon::StatsHuntGenderFilter::Genderless);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/sandaconda_Regular_none_1792424951459.png", Pokemon::StatsHuntGenderFilter::Female);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/sandslash_Regular_none_1792424951934.png", Pokemon::StatsHuntGenderFilter::Male);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/scorbunny_Regular_none_1792424952390.png", Pokemon::StatsHuntGenderFilter::Male);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/seismitoad_Regular_none_1792424952847.png", Pokemon::StatsHuntGenderFilter::Female);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/sharpedo_Regular_none_1792424953289.png", Pokemon::StatsHuntGenderFilter::Female);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/shellos_Regular_none_1792424953738.png", Pokemon::StatsHuntGenderFilter::Male);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/shiinotic_Regular_none_1792424954189.png", Pokemon::StatsHuntGenderFilter::Male);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/sizzlipede_Regular_none_1792424954668.png", Pokemon::StatsHuntGenderFilter::Female);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/sizzlipede_Regular_none_1792424955123.png", Pokemon::StatsHuntGenderFilter::Female);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/sizzlipede_Regular_none_1792424955582.png", Pokemon::StatsHuntGenderFilter::Female);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/skwovet_Regular_none_1792424956033.png", Pokemon::StatsHuntGenderFilter::Female);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/slowpoke_Regular_none_1792424956466.png", Pokemon::StatsHuntGenderFilter::Female);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/snover_Regular_none_1792424956935.png", Pokemon::StatsHuntGenderFilter::Female);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/sobble_Regular_none_1792424957377.png", Pokemon::StatsHuntGenderFilter::Male);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/stunfisk_Regular_none_1792424957817.png", Pokemon::StatsHuntGenderFilter::Female);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/stunfisk_Regular_none_1792424958276.png", Pokemon::StatsHuntGenderFilter::Female);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/tapu-bulu_Regular_none_1792424958716.png", Pokemon::StatsHuntGenderFilter::Genderless);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/tapu-lele_Regular_none_1792424959172.png", Pokemon::StatsHuntGenderFilter::Genderless);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/timburr_Regular_none_1792424959640.png", Pokemon::StatsHuntGenderFilter::Female);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/timburr_Regular_none_1792424960105.png", Pokemon::StatsHuntGenderFilter::Female);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/timburr_Regular_none_1792424960552.png", Pokemon::StatsHuntGenderFilter::Female);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/timburr_Regular_none_1792424960992.png", Pokemon::StatsHuntGenderFilter::Female);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/timburr_Regular_none_1792424961449.png", Pokemon::StatsHuntGenderFilter::Female);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/toxapex_Regular_none_1792424961906.png", Pokemon::StatsHuntGenderFilter::Male);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/toxtricity_Regular_none_1792424962375.png", Pokemon::StatsHuntGenderFilter::Female);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/tranquill_Regular_none_1792424962829.png", Pokemon::StatsHuntGenderFilter::Male);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/tympole_Regular_none_1792424963266.png", Pokemon::StatsHuntGenderFilter::Male);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/vanillish_Regular_none_1792424963705.png", Pokemon::StatsHuntGenderFilter::Female);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/vanillish_Regular_none_1792424964155.png", Pokemon::StatsHuntGenderFilter::Female);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/vulpix_Regular_none_1792424964627.png", Pokemon::StatsHuntGenderFilter::Female);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/vulpix_Regular_none_1792424965074.png", Pokemon::StatsHuntGenderFilter::Female);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/wishiwashi_Regular_none_1792424965509.png", Pokemon::StatsHuntGenderFilter::Male);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/wobbuffet_Regular_none_1792424965947.png", Pokemon::StatsHuntGenderFilter::Female);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/wynaut_Regular_none_1792424966405.png", Pokemon::StatsHuntGenderFilter::Female);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/zarude_Regular_none_1792424966858.png", Pokemon::StatsHuntGenderFilter::Genderless);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/zarude_Regular_none_1792424967363.png", Pokemon::StatsHuntGenderFilter::Genderless);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/zigzagoon_Regular_none_1792424967861.png", Pokemon::StatsHuntGenderFilter::Female);
+    database.add<Test_BoxGenderDetector>("PokemonHome/SummaryScreen/zigzagoon_Regular_none_1792424968351.png", Pokemon::StatsHuntGenderFilter::Male);
+}
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_BoxGenderDetector.h b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_BoxGenderDetector.h
new file mode 100644
index 0000000000..0dc8810968
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_BoxGenderDetector.h
@@ -0,0 +1,36 @@
+/*  Box Gender Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonHome_BoxGenderDetector_H
+#define PokemonAutomation_PokemonHome_BoxGenderDetector_H
+
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "Pokemon/Options/Pokemon_StatsHuntFilter.h"
+
+namespace PokemonAutomation{
+
+class ImageViewRGB32;
+class VideoOverlaySet;
+
+namespace NintendoSwitch{
+namespace PokemonHome{
+
+// Detect gender symbol inside the pokemon storage box
+class BoxGenderDetector{
+public:
+    static void make_overlays(VideoOverlaySet& items);
+    
+    // Return StatsHuntGenderFilter::Male, Female or Genderless
+    static Pokemon::StatsHuntGenderFilter detect(const ImageViewRGB32& screen);
+};
+
+void add_tests_BoxGenderDetector(UnitTestDatabase& database);
+
+}
+}
+}
+
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_BoxViewDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_BoxViewDetector.cpp
new file mode 100644
index 0000000000..7a467a560a
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_BoxViewDetector.cpp
@@ -0,0 +1,229 @@
+/*  Button Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <string>
+#include "Common/Cpp/Color.h"
+#include "CommonFramework/ImageTypes/ImageRGB32.h"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/VideoPipeline/VideoOverlay.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "Tests/ImageUnitTest.h"
+#include "Tests/TestUtils.h"
+#include "VideoGames/PokemonHome/Inference/PokemonHome_ButtonDetector.h"
+#include "PokemonHome_BoxViewDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonHome{
+
+BoxViewDetector::BoxViewDetector(VideoOverlay* overlay) : m_button_plus_detector(COLOR_BLACK, ButtonType::ButtonPlus, { 0.100, 0.956, 0.107, 0.041 }, overlay){}
+
+void BoxViewDetector::make_overlays(VideoOverlaySet& items) const{
+    m_button_plus_detector.make_overlays(items);
+}
+
+bool BoxViewDetector::detect(const ImageViewRGB32& screen){
+    return m_button_plus_detector.detect(screen);
+}
+
+
+
+class Test_BoxViewDetector : public ImageUnitTest{
+public:
+
+    Test_BoxViewDetector(
+        const std::string& image,
+        bool expected
+    )
+        : ImageUnitTest("PokemonHome::BoxViewDetector - " + image, {image})
+        , m_expected(expected)
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        DummyVideoOverlay overlay;
+        BoxViewDetector detector(&overlay);
+        const ImageRGB32& image = images[0];
+        return detector.detect(image) == m_expected;
+    };
+
+private:
+    bool m_expected;
+};
+
+void add_tests_BoxViewDetector(UnitTestDatabase& database){
+    database.add<Test_BoxViewDetector>("PokemonHome/BoxView/BoxView-1.png", true);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/annihilape_Regular.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/bidoof_Regular.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/bulbasaur_Regular.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/bulbasuar_Shiny_Go.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/bulbasuar_Shiny_Lza.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/capskid_Regular.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/castform_Regular.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/cyclizar_Regular.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/dudunsparce_Regular.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/dudunsparce_Regular_Sv.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/enamorus_Shiny.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/gimmighoul_Regular.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/glimmet_Regular.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/gogoat_Regular.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/greatTusk_Shiny.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/hatterne_Regular.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/houndstone_Regular.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/ironBunde_Regular.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/ironBundle_Regular_Sv.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/ironJugulis_Regular.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/ironThorns_Regular.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/kilowattrel_Regular.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/kingler_Shiny.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/komala_Regular.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/krabby_Shiny.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/machamp_Regular.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/pancham_Shiny.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/rapidash_Regular.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/rellor_Regular.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/riolu_Regular.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/rowlet_ShinyAlpha.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/scovillain_Regular.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/slitherWing_Shiny.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/squirtle_Shiny.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/tapuLele_Shiny.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/tatsugiri_Regular.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/teddiursa_Regular.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/terapagos_regular.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/vulpix_Regular.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/vulpix_Shiny.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/wartortle_Regular.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/wurmple_Regular.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/GBA-Origin-ElgatoHD60Pro-NV12.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/GBA-Origin-ElgatoHD60Pro-YUYV.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/Farfetchd-fast-ball.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/Machamp-gigaton-ball.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/Machoke-gigaton-ball.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/Machop-gigaton-ball.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/Magnemite-gigaton-ball.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/Magneton-gigaton-ball.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/Slowpoke-fast-ball.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/absol_Regular_none_1792424917318.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/arrokuda_Regular_none_1792424917770.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/azelf_Regular_none_1792424918264.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/bisharp_Regular_none_1792424918722.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/budew_Regular_none_1792424919162.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/buneary_Regular_none_1792424919615.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/bunnelby_Regular_none_1792424920096.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/buzzwole_Regular_none_1792424920562.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/calyrex_Regular_none_1792424921051.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/centiskorch_Regular_none_1792424921522.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/charjabug_Regular_none_1792424921973.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/charmander_Regular_none_1792424922423.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/cherubi_Regular_none_1792424922878.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/cottonee_Regular_none_1792424923397.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/cottonee_Regular_none_1792424923843.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/cramorant_Regular_none_1792424924277.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/cubone_Regular_none_1792424924758.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/delibird_Regular_none_1792424925212.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/dracovish_Regular_none_1792424925673.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/dreepy_Regular_none_1792424926124.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/dusclops_Regular_none_1792424926621.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/electrike_Regular_none_1792424927083.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/electrike_Regular_none_1792424927528.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/eternatus_Regular_Shiny_none_1792424927959.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/eternatus_Regular_none_1792424928413.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/ferroseed_Regular_none_1792424928886.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/fletchling_Regular_none_1792424929346.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/gastly_Regular_none_1792424929814.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/gible_Regular_none_1792424930272.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/gible_Regular_none_1792424930703.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/golurk_Regular_none_1792424931148.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/golurk_Regular_none_1792424931632.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/goodra_Regular_none_1792424932092.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/grookey_Regular_none_1792424932537.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/gurdurr_Regular_none_1792424932986.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/gyarados_Regular_none_1792424933448.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/hattrem_Regular_none_1792424933893.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/hattrem_Regular_none_1792424934353.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/haunter_Regular_none_1792424934828.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/honedge_Regular_none_1792424935285.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/jellicent_Regular_none_1792424935736.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/keldeo_Regular_Shiny_none_1792424936178.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/linoone_Regular_none_1792424936621.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/litten_Regular_none_1792424937059.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/litten_Regular_none_1792424937516.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/machoke_Regular_none_1792424937960.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/machoke_Regular_none_1792424938413.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/machop_Regular_none_1792424938862.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/magearna_Regular_none_1792424939321.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/magikarp_Regular_none_1792424939790.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/melmetal_Regular_none_1792424940261.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/melmetal_Regular_none_1792424940711.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/meowth_Regular_none_1792424941158.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/meowth_Regular_none_1792424941611.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/metapod_Regular_none_1792424942051.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/milcery_Regular_none_1792424942492.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/mime-jr_Regular_none_1792424942964.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/mudkip_Regular_none_1792424943412.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/nidoking_Regular_none_1792424943853.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/nidoran-f_Regular_none_1792424944297.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/nidoran-m_Regular_none_1792424944756.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/ninjask_Regular_none_1792424945199.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/noibat_Regular_none_1792424945647.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/orbeetle_Regular_none_1792424946083.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/pangoro_Regular_none_1792424946529.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/pikachu_Regular_none_1792424946978.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/poliwhirl_Regular_none_1792424947416.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/pumpkaboo_Regular_none_1792424947882.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/purrloin_Regular_none_1792424948321.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/ralts_Regular_none_1792424948769.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/rapidash_Regular_none_1792424949229.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/remoraid_Regular_none_1792424949680.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/rhydon_Regular_none_1792424950146.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/rookidee_Regular_none_1792424950592.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/rotom_Regular_none_1792424951021.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/sandaconda_Regular_none_1792424951459.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/sandslash_Regular_none_1792424951934.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/scorbunny_Regular_none_1792424952390.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/seismitoad_Regular_none_1792424952847.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/sharpedo_Regular_none_1792424953289.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/shellos_Regular_none_1792424953738.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/shiinotic_Regular_none_1792424954189.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/sizzlipede_Regular_none_1792424954668.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/sizzlipede_Regular_none_1792424955123.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/sizzlipede_Regular_none_1792424955582.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/skwovet_Regular_none_1792424956033.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/slowpoke_Regular_none_1792424956466.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/snover_Regular_none_1792424956935.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/sobble_Regular_none_1792424957377.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/stunfisk_Regular_none_1792424957817.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/stunfisk_Regular_none_1792424958276.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/tapu-bulu_Regular_none_1792424958716.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/tapu-lele_Regular_none_1792424959172.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/timburr_Regular_none_1792424959640.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/timburr_Regular_none_1792424960105.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/timburr_Regular_none_1792424960552.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/timburr_Regular_none_1792424960992.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/timburr_Regular_none_1792424961449.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/toxapex_Regular_none_1792424961906.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/toxtricity_Regular_none_1792424962375.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/tranquill_Regular_none_1792424962829.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/tympole_Regular_none_1792424963266.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/vanillish_Regular_none_1792424963705.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/vanillish_Regular_none_1792424964155.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/vulpix_Regular_none_1792424964627.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/vulpix_Regular_none_1792424965074.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/wishiwashi_Regular_none_1792424965509.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/wobbuffet_Regular_none_1792424965947.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/wynaut_Regular_none_1792424966405.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/zarude_Regular_none_1792424966858.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/zarude_Regular_none_1792424967363.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/zigzagoon_Regular_none_1792424967861.png", false);
+    database.add<Test_BoxViewDetector>("PokemonHome/SummaryScreen/zigzagoon_Regular_none_1792424968351.png", false);
+}
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_BoxViewDetector.h b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_BoxViewDetector.h
new file mode 100644
index 0000000000..65d55445fe
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_BoxViewDetector.h
@@ -0,0 +1,45 @@
+/*  Box View Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonHome_BoxViewDetector_H
+#define PokemonAutomation_PokemonHome_BoxViewDetector_H
+
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/VisualDetector.h"
+#include "VideoGames/PokemonHome/Inference/PokemonHome_ButtonDetector.h"
+
+namespace PokemonAutomation{
+class Logger;
+namespace NintendoSwitch{
+namespace PokemonHome{
+
+class BoxViewDetector : public StaticScreenDetector{
+public:
+    BoxViewDetector(VideoOverlay* overlay = nullptr);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+    virtual void reset_state() override { m_button_plus_detector.reset_state(); }
+
+private:
+    ButtonDetector m_button_plus_detector;
+
+};
+class BoxViewWatcher : public DetectorToFinder<BoxViewDetector>{
+public:
+    BoxViewWatcher(VideoOverlay* overlay = nullptr)
+        : DetectorToFinder("BoxViewWatcher", Milliseconds(100), overlay)
+    {}
+};
+
+void add_tests_BoxViewDetector(UnitTestDatabase& database);
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_ButtonDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_ButtonDetector.cpp
new file mode 100644
index 0000000000..5f8bb30b08
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_ButtonDetector.cpp
@@ -0,0 +1,378 @@
+/*  Button Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Kernels/Waterfill/Kernels_Waterfill_Types.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Images/WaterfillUtilities.h"
+#include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h"
+#include "Tests/ImageUnitTest.h"
+#include "Tests/TestUtils.h"
+#include "PokemonHome_ButtonDetector.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonHome{
+
+
+
+class ButtonMatcher : public ImageMatch::WaterfillTemplateMatcher{
+public:
+    // image template matcher for buttons
+    // - min_width: candidate image min width if video stream is 4k
+    // - min_height: candidate image min height if video stream is 4k
+    ButtonMatcher(ButtonType type, size_t min_width, size_t min_height, double max_rmsd);
+    
+    static const ButtonMatcher& B(){
+        static ButtonMatcher matcher(ButtonType::ButtonB, 25, 25, 80);
+        return matcher;
+    }
+    static const ButtonMatcher& Plus(){
+        static ButtonMatcher matcher(ButtonType::ButtonPlus, 25, 25, 80);
+        return matcher;
+    }
+    
+
+    virtual bool check_image(Resolution input_resolution, const ImageViewRGB32& image) const override{
+        size_t min_width = m_min_width * input_resolution.width / 1920;
+        size_t min_height = m_min_height * input_resolution.height / 1080;
+//        cout << "???? check_image() ???? min size " << min_width << " x " << min_height
+//             << " got " << image.width() << " x " << image.height() << endl;
+        return image.width() >= min_width && image.height() >= min_height;
+    };
+
+    size_t m_min_width;
+    size_t m_min_height;
+    double m_max_rmsd;
+};
+
+
+
+
+
+
+
+const char* template_path(ButtonType type){
+    switch (type){
+    case ButtonType::ButtonB:
+        return "PokemonHome/Buttons/ButtonB-Template.png";
+    case ButtonType::ButtonPlus:
+        return "PokemonHome/Buttons/ButtonPlus-Template.png";
+    default:
+        return "";
+    }
+}
+
+const char* button_name(ButtonType type){
+    switch (type){
+    case ButtonType::ButtonB:
+        return "ButtonB";
+    case ButtonType::ButtonPlus:
+        return "ButtonPlus";
+    default:
+        return "";
+    }
+}
+
+const ButtonMatcher& get_button_matcher(ButtonType type){
+    switch (type){
+    case ButtonType::ButtonB:
+        return ButtonMatcher::B();
+    case ButtonType::ButtonPlus:
+        return ButtonMatcher::Plus();
+    default:
+        throw std::runtime_error("No corresponding ButtonMatcher for ButtonType");
+    }
+}
+
+
+
+ButtonMatcher::ButtonMatcher(ButtonType type, size_t min_width, size_t min_height, double max_rmsd)
+    : WaterfillTemplateMatcher(template_path(type), COLOR_BLACK, COLOR_WHITE, 100)
+    , m_min_width(min_width)
+    , m_min_height(min_height)
+    , m_max_rmsd(max_rmsd)
+{}
+
+
+
+ButtonDetector::ButtonDetector(
+    Color color,
+    ButtonType button_type,
+    const ImageFloatBox& box,
+    VideoOverlay* overlay
+)
+    : m_color(color)
+    , m_matcher(get_button_matcher(button_type))
+    , m_box(box)
+    , m_overlay(overlay)
+{
+
+}
+void ButtonDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_box);
+}
+bool ButtonDetector::detect(const ImageViewRGB32& screen){
+
+    const double screen_rel_size = (screen.height() / 1080.0);
+    const double screen_rel_size_2 = screen_rel_size * screen_rel_size;
+
+    const double min_area_1080p = 500.0;
+    const size_t min_area = size_t(screen_rel_size_2 * min_area_1080p);
+
+    const std::vector<std::pair<uint32_t, uint32_t>> FILTERS = {
+        {0xff000000, 0xffe0e0e0},
+        {0xff000000, 0xffd0d0d0},
+        {0xff000000, 0xffc0c0c0},
+    };
+
+    bool found = match_template_by_waterfill(
+        screen.size(),
+        extract_box_reference(screen, m_box),
+        m_matcher,
+        FILTERS,
+        {min_area, SIZE_MAX},
+        m_matcher.m_max_rmsd,
+        [&](Kernels::Waterfill::WaterfillObject& object) -> bool {
+//            cout << "width = " << object.width() << ", height = " << object.height() << endl;
+            m_last_detected = translate_to_parent(screen, m_box, object);
+            return true;
+        }
+    );
+
+    if (m_overlay){
+        if (found){
+            m_last_detected_box.emplace(*m_overlay, m_last_detected, COLOR_GREEN);
+        }else{
+            m_last_detected_box.reset();
+        }
+    }
+
+    return found;
+}
+
+class Test_ButtonDetector : public ImageUnitTest{
+public:
+
+    Test_ButtonDetector(
+        const std::string& image,
+        std::optional<ButtonType> expected
+    )
+        : ImageUnitTest("PokemonHome::ButtonDetector - " + image, {image})
+        , m_expected(expected)
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        DummyVideoOverlay video_overlay;
+        const ImageRGB32& image = images[0];
+        ImageFloatBox box(0.100, 0.956, 0.107, 0.041);
+        ButtonDetector b_detector(COLOR_RED, ButtonType::ButtonB, box, &video_overlay);
+        ButtonDetector plus_detector(COLOR_RED, ButtonType::ButtonPlus, box, &video_overlay);
+
+        const bool b_detected = b_detector.detect(image);
+        const bool plus_detected = plus_detector.detect(image);
+        const bool expected_b = m_expected && *m_expected == ButtonType::ButtonB;
+        const bool expected_plus = m_expected && *m_expected == ButtonType::ButtonPlus;
+
+        if (b_detected == expected_b && plus_detected == expected_plus)
+            return true;
+
+        std::string received;
+        if (b_detected && plus_detected){
+            received = "ButtonB and ButtonPlus";
+        }else if (b_detected){
+            received = button_name(ButtonType::ButtonB);
+        }else if (plus_detected){
+            received = button_name(ButtonType::ButtonPlus);
+        }else{
+            received = "none";
+        }
+
+        return std::string("Expected: ") + (m_expected ? button_name(*m_expected) : "none")
+            + ", received: " + received;
+    };
+
+private:
+    std::optional<ButtonType> m_expected;
+};
+
+void add_tests_ButtonDetector(UnitTestDatabase& database){
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/annihilape_Regular.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/bidoof_Regular.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/bulbasaur_Regular.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/bulbasuar_Shiny_Go.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/bulbasuar_Shiny_Lza.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/capskid_Regular.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/castform_Regular.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/cyclizar_Regular.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/dudunsparce_Regular.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/dudunsparce_Regular_Sv.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/enamorus_Shiny.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/gimmighoul_Regular.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/glimmet_Regular.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/gogoat_Regular.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/greatTusk_Shiny.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/hatterne_Regular.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/houndstone_Regular.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/ironBunde_Regular.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/ironBundle_Regular_Sv.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/ironJugulis_Regular.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/ironThorns_Regular.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/kilowattrel_Regular.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/kingler_Shiny.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/komala_Regular.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/krabby_Shiny.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/machamp_Regular.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/pancham_Shiny.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/rapidash_Regular.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/rellor_Regular.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/riolu_Regular.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/rowlet_ShinyAlpha.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/scovillain_Regular.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/slitherWing_Shiny.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/squirtle_Shiny.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/tapuLele_Shiny.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/tatsugiri_Regular.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/teddiursa_Regular.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/terapagos_regular.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/vulpix_Regular.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/vulpix_Shiny.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/wartortle_Regular.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/wurmple_Regular.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/GBA-Origin-ElgatoHD60Pro-NV12.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/GBA-Origin-ElgatoHD60Pro-YUYV.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/Farfetchd-fast-ball.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/Machamp-gigaton-ball.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/Machoke-gigaton-ball.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/Machop-gigaton-ball.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/Magnemite-gigaton-ball.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/Magneton-gigaton-ball.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/Slowpoke-fast-ball.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/absol_Regular_none_1792424917318.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/arrokuda_Regular_none_1792424917770.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/azelf_Regular_none_1792424918264.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/bisharp_Regular_none_1792424918722.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/budew_Regular_none_1792424919162.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/buneary_Regular_none_1792424919615.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/bunnelby_Regular_none_1792424920096.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/buzzwole_Regular_none_1792424920562.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/calyrex_Regular_none_1792424921051.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/centiskorch_Regular_none_1792424921522.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/charjabug_Regular_none_1792424921973.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/charmander_Regular_none_1792424922423.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/cherubi_Regular_none_1792424922878.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/cottonee_Regular_none_1792424923397.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/cottonee_Regular_none_1792424923843.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/cramorant_Regular_none_1792424924277.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/cubone_Regular_none_1792424924758.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/delibird_Regular_none_1792424925212.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/dracovish_Regular_none_1792424925673.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/dreepy_Regular_none_1792424926124.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/dusclops_Regular_none_1792424926621.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/electrike_Regular_none_1792424927083.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/electrike_Regular_none_1792424927528.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/eternatus_Regular_Shiny_none_1792424927959.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/eternatus_Regular_none_1792424928413.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/ferroseed_Regular_none_1792424928886.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/fletchling_Regular_none_1792424929346.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/gastly_Regular_none_1792424929814.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/gible_Regular_none_1792424930272.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/gible_Regular_none_1792424930703.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/golurk_Regular_none_1792424931148.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/golurk_Regular_none_1792424931632.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/goodra_Regular_none_1792424932092.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/grookey_Regular_none_1792424932537.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/gurdurr_Regular_none_1792424932986.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/gyarados_Regular_none_1792424933448.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/hattrem_Regular_none_1792424933893.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/hattrem_Regular_none_1792424934353.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/haunter_Regular_none_1792424934828.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/honedge_Regular_none_1792424935285.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/jellicent_Regular_none_1792424935736.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/keldeo_Regular_Shiny_none_1792424936178.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/linoone_Regular_none_1792424936621.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/litten_Regular_none_1792424937059.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/litten_Regular_none_1792424937516.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/machoke_Regular_none_1792424937960.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/machoke_Regular_none_1792424938413.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/machop_Regular_none_1792424938862.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/magearna_Regular_none_1792424939321.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/magikarp_Regular_none_1792424939790.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/melmetal_Regular_none_1792424940261.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/melmetal_Regular_none_1792424940711.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/meowth_Regular_none_1792424941158.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/meowth_Regular_none_1792424941611.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/metapod_Regular_none_1792424942051.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/milcery_Regular_none_1792424942492.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/mime-jr_Regular_none_1792424942964.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/mudkip_Regular_none_1792424943412.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/nidoking_Regular_none_1792424943853.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/nidoran-f_Regular_none_1792424944297.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/nidoran-m_Regular_none_1792424944756.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/ninjask_Regular_none_1792424945199.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/noibat_Regular_none_1792424945647.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/orbeetle_Regular_none_1792424946083.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/pangoro_Regular_none_1792424946529.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/pikachu_Regular_none_1792424946978.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/poliwhirl_Regular_none_1792424947416.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/pumpkaboo_Regular_none_1792424947882.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/purrloin_Regular_none_1792424948321.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/ralts_Regular_none_1792424948769.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/rapidash_Regular_none_1792424949229.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/remoraid_Regular_none_1792424949680.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/rhydon_Regular_none_1792424950146.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/rookidee_Regular_none_1792424950592.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/rotom_Regular_none_1792424951021.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/sandaconda_Regular_none_1792424951459.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/sandslash_Regular_none_1792424951934.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/scorbunny_Regular_none_1792424952390.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/seismitoad_Regular_none_1792424952847.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/sharpedo_Regular_none_1792424953289.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/shellos_Regular_none_1792424953738.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/shiinotic_Regular_none_1792424954189.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/sizzlipede_Regular_none_1792424954668.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/sizzlipede_Regular_none_1792424955123.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/sizzlipede_Regular_none_1792424955582.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/skwovet_Regular_none_1792424956033.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/slowpoke_Regular_none_1792424956466.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/snover_Regular_none_1792424956935.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/sobble_Regular_none_1792424957377.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/stunfisk_Regular_none_1792424957817.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/stunfisk_Regular_none_1792424958276.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/tapu-bulu_Regular_none_1792424958716.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/tapu-lele_Regular_none_1792424959172.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/timburr_Regular_none_1792424959640.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/timburr_Regular_none_1792424960105.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/timburr_Regular_none_1792424960552.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/timburr_Regular_none_1792424960992.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/timburr_Regular_none_1792424961449.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/toxapex_Regular_none_1792424961906.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/toxtricity_Regular_none_1792424962375.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/tranquill_Regular_none_1792424962829.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/tympole_Regular_none_1792424963266.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/vanillish_Regular_none_1792424963705.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/vanillish_Regular_none_1792424964155.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/vulpix_Regular_none_1792424964627.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/vulpix_Regular_none_1792424965074.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/wishiwashi_Regular_none_1792424965509.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/wobbuffet_Regular_none_1792424965947.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/wynaut_Regular_none_1792424966405.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/zarude_Regular_none_1792424966858.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/zarude_Regular_none_1792424967363.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/zigzagoon_Regular_none_1792424967861.png", ButtonType::ButtonB);
+    database.add<Test_ButtonDetector>("PokemonHome/SummaryScreen/zigzagoon_Regular_none_1792424968351.png", ButtonType::ButtonB);
+
+}
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_ButtonDetector.h b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_ButtonDetector.h
new file mode 100644
index 0000000000..d3b2928f18
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_ButtonDetector.h
@@ -0,0 +1,71 @@
+/*  Button Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonHome_ButtonDetector_H
+#define PokemonAutomation_PokemonHome_ButtonDetector_H
+
+#include <optional>
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/VisualDetector.h"
+
+namespace PokemonAutomation{
+    class Logger;
+namespace NintendoSwitch{
+namespace PokemonHome{
+
+
+enum class ButtonType{
+    ButtonB,
+    ButtonPlus,
+};
+
+class ButtonMatcher;
+
+
+
+
+class ButtonDetector : public StaticScreenDetector{
+public:
+    ButtonDetector(
+        Color color,
+        ButtonType button_type,
+        const ImageFloatBox& box,
+        VideoOverlay* overlay = nullptr
+    );
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+    virtual void reset_state() override { m_last_detected_box.reset(); }
+
+private:
+    Color m_color;
+    const ButtonMatcher& m_matcher;
+    ImageFloatBox m_box;
+    VideoOverlay* m_overlay;
+
+    ImageFloatBox m_last_detected;
+    std::optional<OverlayBoxScope> m_last_detected_box;
+};
+class ButtonWatcher : public DetectorToFinder<ButtonDetector>{
+public:
+    ButtonWatcher(
+        Color color,
+        ButtonType button_type,
+        const ImageFloatBox& box,
+        VideoOverlay* overlay = nullptr,
+        Milliseconds hold_duration = Milliseconds(50)
+    )
+         : DetectorToFinder("ButtonWatcher", hold_duration, color, button_type, box, overlay)
+    {}
+};
+
+void add_tests_ButtonDetector(UnitTestDatabase& database);
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_GigantamaxDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_GigantamaxDetector.cpp
new file mode 100644
index 0000000000..1263c8b428
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_GigantamaxDetector.cpp
@@ -0,0 +1,290 @@
+/*  Gigantamax Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Kernels/Waterfill/Kernels_Waterfill_Types.h"
+#include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h"
+#include "CommonTools/Images/WaterfillUtilities.h"
+#include "Tests/ImageUnitTest.h"
+#include "Tests/TestUtils.h"
+#include "PokemonHome_GigantamaxDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonHome{
+
+
+class GigantamaxMatcher : public ImageMatch::WaterfillTemplateMatcher{
+public:
+    GigantamaxMatcher()
+        : WaterfillTemplateMatcher(
+            "PokemonHome/Home_Gigantamax.png",
+            Color(196, 32, 88), Color(255, 220, 235),
+            100
+        )
+    {
+        m_aspect_ratio_lower = 0.9;
+        m_aspect_ratio_upper = 1.1;
+        m_area_ratio_lower = 0.85;
+        m_area_ratio_upper = 1.1;
+    }
+
+    static const GigantamaxMatcher& instance(){
+        static GigantamaxMatcher matcher;
+        return matcher;
+    }
+};
+
+
+GigantamaxDetector::GigantamaxDetector(
+    Color color,
+    VideoOverlay* overlay,
+    const ImageFloatBox& box
+)
+    : m_color(color)
+    , m_overlay(overlay)
+    , m_box(box)
+{}
+void GigantamaxDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_box);
+}
+bool GigantamaxDetector::detect(const ImageViewRGB32& screen){
+    const double screen_rel_size = (screen.height() / 1080.0);
+    const double screen_rel_size_2 = screen_rel_size * screen_rel_size;
+
+    const double min_area_1080p = 400;
+    const double rmsd_threshold = 80;
+    const size_t min_area = size_t(screen_rel_size_2 * min_area_1080p);
+
+    const std::vector<std::pair<uint32_t, uint32_t>> FILTERS = {
+        {0xffc42058, 0xffffdceb},
+        {0xffc42058, 0xffffe8ff},
+    };
+
+    const bool found = match_template_by_waterfill(
+        screen.size(),
+        extract_box_reference(screen, m_box),
+        GigantamaxMatcher::instance(),
+        FILTERS,
+        {min_area, SIZE_MAX},
+        rmsd_threshold,
+        [&](Kernels::Waterfill::WaterfillObject& object) -> bool {
+            m_last_detected = translate_to_parent(screen, m_box, object);
+            return true;
+        }
+    );
+
+    if (m_overlay){
+        if (found){
+            m_last_detected_box.emplace(*m_overlay, m_last_detected, COLOR_GREEN);
+        }else{
+            m_last_detected_box.reset();
+        }
+    }
+
+    return found;
+}
+
+class Test_GigantamaxDetector : public ImageUnitTest{
+public:
+
+    Test_GigantamaxDetector(
+        const std::string& image,
+        bool expected
+    )
+        : ImageUnitTest("PokemonHome::GigantamaxDetector - " + image, {image})
+        , m_expected(expected)
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        DummyVideoOverlay video_overlay;
+        const ImageRGB32& image = images[0];
+        GigantamaxDetector detector(COLOR_BLACK, &video_overlay);
+        bool result = detector.detect(image);
+
+        if (result == m_expected)
+            return true;
+
+        return "Expected: " + std::to_string(m_expected) + ", received: " + std::to_string(result);
+    };
+
+private:
+    bool m_expected;
+};
+
+void add_tests_GigantamaxDetector(UnitTestDatabase& database){
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/annihilape_Regular.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/bidoof_Regular.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/bulbasaur_Regular.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/bulbasuar_Shiny_Go.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/bulbasuar_Shiny_Lza.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/capskid_Regular.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/castform_Regular.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/cyclizar_Regular.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/dudunsparce_Regular.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/dudunsparce_Regular_Sv.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/enamorus_Shiny.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/gimmighoul_Regular.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/glimmet_Regular.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/gogoat_Regular.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/greatTusk_Shiny.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/hatterne_Regular.png", true);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/houndstone_Regular.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/ironBunde_Regular.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/ironBundle_Regular_Sv.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/ironJugulis_Regular.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/ironThorns_Regular.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/kilowattrel_Regular.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/kingler_Shiny.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/komala_Regular.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/krabby_Shiny.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/machamp_Regular.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/pancham_Shiny.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/rapidash_Regular.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/rellor_Regular.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/riolu_Regular.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/rowlet_ShinyAlpha.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/scovillain_Regular.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/slitherWing_Shiny.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/squirtle_Shiny.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/tapuLele_Shiny.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/tatsugiri_Regular.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/teddiursa_Regular.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/terapagos_regular.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/vulpix_Regular.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/vulpix_Shiny.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/wartortle_Regular.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/wurmple_Regular.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/GBA-Origin-ElgatoHD60Pro-NV12.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/GBA-Origin-ElgatoHD60Pro-YUYV.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/Farfetchd-fast-ball.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/Machamp-gigaton-ball.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/Machoke-gigaton-ball.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/Machop-gigaton-ball.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/Magnemite-gigaton-ball.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/Magneton-gigaton-ball.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/Slowpoke-fast-ball.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/absol_Regular_none_1792424917318.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/arrokuda_Regular_none_1792424917770.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/azelf_Regular_none_1792424918264.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/bisharp_Regular_none_1792424918722.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/budew_Regular_none_1792424919162.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/buneary_Regular_none_1792424919615.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/bunnelby_Regular_none_1792424920096.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/buzzwole_Regular_none_1792424920562.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/calyrex_Regular_none_1792424921051.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/centiskorch_Regular_none_1792424921522.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/charjabug_Regular_none_1792424921973.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/charmander_Regular_none_1792424922423.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/cherubi_Regular_none_1792424922878.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/cottonee_Regular_none_1792424923397.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/cottonee_Regular_none_1792424923843.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/cramorant_Regular_none_1792424924277.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/cubone_Regular_none_1792424924758.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/delibird_Regular_none_1792424925212.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/dracovish_Regular_none_1792424925673.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/dreepy_Regular_none_1792424926124.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/dusclops_Regular_none_1792424926621.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/electrike_Regular_none_1792424927083.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/electrike_Regular_none_1792424927528.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/eternatus_Regular_Shiny_none_1792424927959.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/eternatus_Regular_none_1792424928413.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/ferroseed_Regular_none_1792424928886.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/fletchling_Regular_none_1792424929346.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/gastly_Regular_none_1792424929814.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/gible_Regular_none_1792424930272.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/gible_Regular_none_1792424930703.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/golurk_Regular_none_1792424931148.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/golurk_Regular_none_1792424931632.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/goodra_Regular_none_1792424932092.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/grookey_Regular_none_1792424932537.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/gurdurr_Regular_none_1792424932986.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/gyarados_Regular_none_1792424933448.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/hattrem_Regular_none_1792424933893.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/hattrem_Regular_none_1792424934353.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/haunter_Regular_none_1792424934828.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/honedge_Regular_none_1792424935285.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/jellicent_Regular_none_1792424935736.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/keldeo_Regular_Shiny_none_1792424936178.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/linoone_Regular_none_1792424936621.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/litten_Regular_none_1792424937059.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/litten_Regular_none_1792424937516.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/machoke_Regular_none_1792424937960.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/machoke_Regular_none_1792424938413.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/machop_Regular_none_1792424938862.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/magearna_Regular_none_1792424939321.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/magikarp_Regular_none_1792424939790.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/melmetal_Regular_none_1792424940261.png", true);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/melmetal_Regular_none_1792424940711.png", true);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/meowth_Regular_none_1792424941158.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/meowth_Regular_none_1792424941611.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/metapod_Regular_none_1792424942051.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/milcery_Regular_none_1792424942492.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/mime-jr_Regular_none_1792424942964.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/mudkip_Regular_none_1792424943412.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/nidoking_Regular_none_1792424943853.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/nidoran-f_Regular_none_1792424944297.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/nidoran-m_Regular_none_1792424944756.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/ninjask_Regular_none_1792424945199.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/noibat_Regular_none_1792424945647.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/orbeetle_Regular_none_1792424946083.png", true);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/pangoro_Regular_none_1792424946529.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/pikachu_Regular_none_1792424946978.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/poliwhirl_Regular_none_1792424947416.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/pumpkaboo_Regular_none_1792424947882.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/purrloin_Regular_none_1792424948321.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/ralts_Regular_none_1792424948769.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/rapidash_Regular_none_1792424949229.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/remoraid_Regular_none_1792424949680.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/rhydon_Regular_none_1792424950146.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/rookidee_Regular_none_1792424950592.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/rotom_Regular_none_1792424951021.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/sandaconda_Regular_none_1792424951459.png", true);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/sandslash_Regular_none_1792424951934.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/scorbunny_Regular_none_1792424952390.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/seismitoad_Regular_none_1792424952847.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/sharpedo_Regular_none_1792424953289.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/shellos_Regular_none_1792424953738.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/shiinotic_Regular_none_1792424954189.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/sizzlipede_Regular_none_1792424954668.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/sizzlipede_Regular_none_1792424955123.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/sizzlipede_Regular_none_1792424955582.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/skwovet_Regular_none_1792424956033.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/slowpoke_Regular_none_1792424956466.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/snover_Regular_none_1792424956935.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/sobble_Regular_none_1792424957377.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/stunfisk_Regular_none_1792424957817.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/stunfisk_Regular_none_1792424958276.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/tapu-bulu_Regular_none_1792424958716.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/tapu-lele_Regular_none_1792424959172.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/timburr_Regular_none_1792424959640.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/timburr_Regular_none_1792424960105.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/timburr_Regular_none_1792424960552.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/timburr_Regular_none_1792424960992.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/timburr_Regular_none_1792424961449.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/toxapex_Regular_none_1792424961906.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/toxtricity_Regular_none_1792424962375.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/tranquill_Regular_none_1792424962829.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/tympole_Regular_none_1792424963266.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/vanillish_Regular_none_1792424963705.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/vanillish_Regular_none_1792424964155.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/vulpix_Regular_none_1792424964627.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/vulpix_Regular_none_1792424965074.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/wishiwashi_Regular_none_1792424965509.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/wobbuffet_Regular_none_1792424965947.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/wynaut_Regular_none_1792424966405.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/zarude_Regular_none_1792424966858.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/zarude_Regular_none_1792424967363.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/zigzagoon_Regular_none_1792424967861.png", false);
+    database.add<Test_GigantamaxDetector>("PokemonHome/SummaryScreen/zigzagoon_Regular_none_1792424968351.png", false);
+}
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_GigantamaxDetector.h b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_GigantamaxDetector.h
new file mode 100644
index 0000000000..81998fa19f
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_GigantamaxDetector.h
@@ -0,0 +1,59 @@
+/*  Gigantamax Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonHome_GigantamaxDetector_H
+#define PokemonAutomation_PokemonHome_GigantamaxDetector_H
+
+#include <optional>
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/VisualDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonHome{
+
+
+class GigantamaxDetector : public StaticScreenDetector{
+public:
+    GigantamaxDetector(
+        Color color,
+        VideoOverlay* overlay,
+        const ImageFloatBox& box = ImageFloatBox(0.463, 0.09, 0.04, 0.06)
+    );
+
+    const ImageFloatBox& last_detected() const{ return m_last_detected; }
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    const Color m_color;
+    VideoOverlay* m_overlay;
+    const ImageFloatBox m_box;
+
+    ImageFloatBox m_last_detected;
+    std::optional<OverlayBoxScope> m_last_detected_box;
+};
+class GigantamaxWatcher : public DetectorToFinder<GigantamaxDetector>{
+public:
+    GigantamaxWatcher(
+        Color color,
+        VideoOverlay* overlay,
+        const ImageFloatBox& box,
+        std::chrono::milliseconds hold_duration = std::chrono::milliseconds(250)
+    )
+        : DetectorToFinder("GigantamaxWatcher", hold_duration, color, overlay, box)
+    {}
+};
+
+void add_tests_GigantamaxDetector(UnitTestDatabase& database);
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_OriginMarkReader.cpp b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_OriginMarkReader.cpp
new file mode 100644
index 0000000000..468f66352e
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_OriginMarkReader.cpp
@@ -0,0 +1,535 @@
+/*  Origin Mark Reader
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <map>
+#include <vector>
+#include "Kernels/Waterfill/Kernels_Waterfill_Types.h"
+#include "CommonFramework/ImageTools/ImageStats.h"
+#include "CommonTools/Images/WaterfillUtilities.h"
+#include "CommonTools/DetectedBoxes.h"
+#include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h"
+#include "Tests/ImageUnitTest.h"
+#include "PokemonHome_OriginMarkReader.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonHome{
+
+using Pokemon::ORIGIN_MARK_SLUGS;
+
+class MarkIconMatcher : public ImageMatch::WaterfillTemplateMatcher{
+public:
+    MarkIconMatcher(
+        const char* path,
+        std::string name,
+        Color min_color, Color max_color,
+        size_t min_area,
+        double max_rmsd,
+        std::vector<std::pair<uint32_t, uint32_t>> filters,
+        double area_ratio_override = 0
+    )
+        : WaterfillTemplateMatcher(path, min_color, max_color, min_area)
+        , m_name(std::move(name))
+        , m_max_rmsd(max_rmsd)
+        , m_filters(std::move(filters))
+    {
+        if (area_ratio_override != 0){
+            m_area_ratio = area_ratio_override;
+        }
+    }
+
+    const std::string& name() const{
+        return m_name;
+    }
+    double max_rmsd() const{
+        return m_max_rmsd;
+    }
+    const std::vector<std::pair<uint32_t, uint32_t>>& filters() const{
+        return m_filters;
+    }
+
+private:
+    std::string m_name;
+    double m_max_rmsd;
+    std::vector<std::pair<uint32_t, uint32_t>> m_filters;
+};
+
+const MarkIconMatcher& MarkIcon_Kalos(){
+    static MarkIconMatcher ret(
+        "PokemonHome/OriginMarks/kalos.png",
+        "kalos",
+        Color(0xff61645c), Color(0xff646664),
+        10,
+        60.0,
+        {
+            {0xff61645c, 0xff646664},
+            {0xff49523f, 0xff898e7e}
+        }
+    );
+    return ret;
+}
+
+const MarkIconMatcher& MarkIcon_Alola(){
+    static MarkIconMatcher ret(
+        "PokemonHome/OriginMarks/alola.png",
+        "alola",
+        Color(0xff5f6456), Color(0xff6d706b),
+        10,
+        35.0,
+        {
+            {0xff5f6456, 0xff6d706b},
+            {0xff3e4733, 0xffa5ae99}
+        }
+    );
+    return ret;
+}
+
+const MarkIconMatcher& MarkIcon_GameBoy(){
+    static MarkIconMatcher ret(
+        "PokemonHome/OriginMarks/gameboy.png",
+        "gameboy",
+        Color(0xff61645b), Color(0xff646664),
+        10,
+        60.0,
+        {
+            {0xff61645b, 0xff646664},
+            {0xff424c3c, 0xffb7c6a9}
+        }
+        );
+    return ret;
+}
+
+const MarkIconMatcher& MarkIcon_Go(){
+    static MarkIconMatcher ret(
+        "PokemonHome/OriginMarks/go.png",
+        "go",
+        Color(0xff5c644e), Color(0xff798073),
+        10,
+        110.0,
+        {
+            {0xff5c644e, 0xff798073},
+            {0xff364029, 0xffc5d5b5}
+        }
+    );
+    return ret;
+}
+
+const MarkIconMatcher& MarkIcon_Lgpe(){
+    static MarkIconMatcher ret(
+        "PokemonHome/OriginMarks/lgpe.png",
+        "lgpe",
+        Color(0xff616459), Color(0xff676d64),
+        10,
+        45.0,
+        {
+            {0xff616459, 0xff676d64},
+            {0xff3e4832, 0xff85907c}
+        }
+    );
+    return ret;
+}
+
+const MarkIconMatcher& MarkIcon_Galar(){
+    static MarkIconMatcher ret(
+        "PokemonHome/OriginMarks/galar.png",
+        "galar",
+        Color(0xff5e6453), Color(0xff757870),
+        10,
+        60.0,
+        {
+            {0xff5e6453, 0xff757870},
+            {0xff47503d, 0xff909090},
+            {0xff47503d, 0xfffffff8}
+        }
+    );
+    return ret;
+}
+
+const MarkIconMatcher& MarkIcon_Bdsp(){
+    static MarkIconMatcher ret(
+        "PokemonHome/OriginMarks/bdsp.png",
+        "bdsp",
+        Color(0xff5f6457), Color(0xff767972),
+        10,
+        60.0,
+        {
+            {0xff5f6457, 0xff767972},
+            {0xff3d4731, 0xffb6c6ad}
+        }
+    );
+    return ret;
+}
+
+const MarkIconMatcher& MarkIcon_La(){
+    static MarkIconMatcher ret(
+        "PokemonHome/OriginMarks/la.png",
+        "la",
+        Color(0xff606459), Color(0xff686a65),
+        10,
+        90.0,
+        {
+            {0xff606459, 0xff686a65},
+            {0xff3a462e, 0xffe4f4ce}
+        }
+    );
+    return ret;
+}
+
+const MarkIconMatcher& MarkIcon_Sv(){
+    static MarkIconMatcher ret(
+        "PokemonHome/OriginMarks/sv.png",
+        "sv",
+        Color(0xff5d6450), Color(0xff747771),
+        10,
+        90,
+        {
+            {0xff5d6450, 0xff747771},
+            {0xff38422c, 0xfff7ffd7}
+        }
+    );
+    return ret;
+}
+
+const MarkIconMatcher& MarkIcon_Lza(){
+    static MarkIconMatcher ret(
+        "PokemonHome/OriginMarks/lza.png",
+        "lza",
+        Color(0xff61645b), Color(0xff646764),
+        10,
+        70.0,
+        {
+            {0xff61645b, 0xff646764},
+            {0xff424c3c, 0xffb7c6a9}
+        }
+    );
+    return ret;
+}
+
+const MarkIconMatcher& MarkIcon_GameBoyAdvance(){
+    static MarkIconMatcher ret(
+        "PokemonHome/OriginMarks/gba.png",
+        "gameboyadvance",
+        Color(0xff61645b), Color(0xff646664),
+        10,
+        60.0,
+        {
+            {0xff61645b, 0xff646664},
+            {0xff424c3c, 0xffb7c6a9}
+        }
+    );
+    return ret;
+}
+
+const std::vector<const MarkIconMatcher*>& ALL_ORIGIN_MARK_MATCHERS(){
+    static const std::vector<const MarkIconMatcher*> matchers = {
+        &MarkIcon_Kalos(),
+        &MarkIcon_Alola(),
+        &MarkIcon_GameBoy(),
+        &MarkIcon_Go(),
+        &MarkIcon_Lgpe(),
+        &MarkIcon_Galar(),
+        &MarkIcon_Bdsp(),
+        &MarkIcon_La(),
+        &MarkIcon_Sv(),
+        &MarkIcon_Lza(),
+        &MarkIcon_GameBoyAdvance(),
+    };
+    return matchers;
+}
+
+const MarkIconMatcher& get_mark_icon_matcher(OriginMark mark){
+    switch (mark){
+    case OriginMark::KALOS:
+        return MarkIcon_Kalos();
+    case OriginMark::ALOLA:
+        return MarkIcon_Alola();
+    case OriginMark::GAMEBOY:
+        return MarkIcon_GameBoy();
+    case OriginMark::GO:
+        return MarkIcon_Go();
+    case OriginMark::LGPE:
+        return MarkIcon_Lgpe();
+    case OriginMark::GALAR:
+        return MarkIcon_Galar();
+    case OriginMark::BDSP:
+        return MarkIcon_Bdsp();
+    case OriginMark::LA:
+        return MarkIcon_La();
+    case OriginMark::SV:
+        return MarkIcon_Sv();
+    case OriginMark::LZA:
+        return MarkIcon_Lza();
+    case OriginMark::GAMEBOYADVANCE:
+        return MarkIcon_GameBoyAdvance();
+    default:
+        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Invalid origin mark: " + std::to_string((int)mark));
+    }
+}
+
+OriginMark origin_mark_from_slug(const std::string& slug){
+    for (const auto& item : Pokemon::ORIGIN_MARK_SLUGS()){
+        if (item.second == slug){
+            return item.first;
+        }
+    }
+    throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Invalid origin mark slug: " + slug);
+}
+
+OriginMarkReader::OriginMarkReader(Color color, VideoOverlay* overlay)
+    : m_color(color)
+    , m_overlay(overlay)
+    , m_box(0.617, 0.084, 0.044, 0.069)
+{}
+
+void OriginMarkReader::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_box);
+}
+
+OriginMark OriginMarkReader::read_mark(const ImageViewRGB32& original_screen){
+    const double screen_rel_size = (original_screen.height() / 1080.0);
+    const double screen_rel_size_2 = screen_rel_size * screen_rel_size;
+
+    const double min_area_1080p = 400;
+    const size_t min_area = size_t(screen_rel_size_2 * min_area_1080p);
+
+    ImageViewRGB32 image = extract_box_reference(original_screen, m_box);
+
+    m_last_detected.clear();
+    m_last_detected_box.reset();
+
+    std::multimap<double, std::pair<OriginMark, ImagePixelBox>> candidates;
+
+    for (const MarkIconMatcher* matcher : ALL_ORIGIN_MARK_MATCHERS()){
+        match_template_by_waterfill(
+            original_screen.size(),
+            image,
+            *matcher,
+            matcher->filters(),
+            { min_area, SIZE_MAX },
+            matcher->max_rmsd(),
+            [&](Kernels::Waterfill::WaterfillObject& object) -> bool {
+                
+                m_last_detected.emplace_back(
+                    DetectedBox{
+                        matcher->name(),
+                        translate_to_parent(original_screen, m_box, object)
+                    }
+                );
+                return true;
+            }
+        );
+
+        if (!m_last_detected.empty()){
+            if (m_overlay){
+                m_last_detected_box.emplace(*m_overlay, m_box, COLOR_GREEN);
+            }
+            return origin_mark_from_slug(m_last_detected[0].name);
+        }
+    }
+
+    return OriginMark::NONE;
+}
+
+class Test_OriginMarkReader : public ImageUnitTest{
+public:
+
+    Test_OriginMarkReader(
+        const std::string& image,
+        OriginMark expected
+    )
+        : ImageUnitTest("PokemonHome::OriginMarkReader - " + image, {image})
+        , m_expected(expected)
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        const ImageRGB32& image = images[0];
+        OriginMark result = OriginMarkReader().read_mark(image);
+
+        if (result == m_expected)
+            return true;
+
+        return "Expected: " + ORIGIN_MARK_SLUGS().get_string(m_expected) + ", received: " + ORIGIN_MARK_SLUGS().get_string(result);
+    };
+
+private:
+    OriginMark m_expected;
+};
+
+void add_tests_OriginMarkReader(UnitTestDatabase& database){
+    database.add<Test_OriginMarkReader>("PokemonHome/BoxView/BoxView-1.png", OriginMark::NONE);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/annihilape_Regular.png", OriginMark::SV);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/bidoof_Regular.png", OriginMark::NONE);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/bulbasaur_Regular.png", OriginMark::LGPE);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/bulbasuar_Shiny_Go.png", OriginMark::GO);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/bulbasuar_Shiny_Lza.png", OriginMark::LZA);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/capskid_Regular.png", OriginMark::SV);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/castform_Regular.png", OriginMark::GO);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/cyclizar_Regular.png", OriginMark::SV);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/dudunsparce_Regular.png", OriginMark::SV);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/dudunsparce_Regular_Sv.png", OriginMark::SV);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/enamorus_Shiny.png", OriginMark::LA);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/gimmighoul_Regular.png", OriginMark::SV);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/glimmet_Regular.png", OriginMark::SV);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/gogoat_Regular.png", OriginMark::KALOS);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/greatTusk_Shiny.png", OriginMark::SV);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/hatterne_Regular.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/houndstone_Regular.png", OriginMark::SV);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/ironBunde_Regular.png", OriginMark::SV);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/ironBundle_Regular_Sv.png", OriginMark::SV);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/ironJugulis_Regular.png", OriginMark::SV);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/ironThorns_Regular.png", OriginMark::SV);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/kilowattrel_Regular.png", OriginMark::SV);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/kingler_Shiny.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/komala_Regular.png", OriginMark::SV);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/krabby_Shiny.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/machamp_Regular.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/pancham_Shiny.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/rapidash_Regular.png", OriginMark::LGPE);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/rellor_Regular.png", OriginMark::SV);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/riolu_Regular.png", OriginMark::LZA);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/rowlet_ShinyAlpha.png", OriginMark::LA);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/scovillain_Regular.png", OriginMark::SV);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/slitherWing_Shiny.png", OriginMark::SV);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/squirtle_Shiny.png", OriginMark::GO);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/tapuLele_Shiny.png", OriginMark::ALOLA);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/tatsugiri_Regular.png", OriginMark::SV);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/teddiursa_Regular.png", OriginMark::LA);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/terapagos_regular.png", OriginMark::SV);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/vulpix_Regular.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/vulpix_Shiny.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/wartortle_Regular.png", OriginMark::GO);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/wurmple_Regular.png", OriginMark::BDSP);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/GBA-Origin-ElgatoHD60Pro-YUYV.png", OriginMark::GAMEBOYADVANCE);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/GBA-Origin-ElgatoHD60Pro-NV12.png", OriginMark::GAMEBOYADVANCE);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/Farfetchd-fast-ball.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/Machamp-gigaton-ball.png", OriginMark::LA);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/Machoke-gigaton-ball.png", OriginMark::LA);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/Machop-gigaton-ball.png", OriginMark::LA);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/Magnemite-gigaton-ball.png", OriginMark::LA);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/Magneton-gigaton-ball.png", OriginMark::LA);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/Slowpoke-fast-ball.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/absol_Regular_none_1792424917318.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/arrokuda_Regular_none_1792424917770.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/azelf_Regular_none_1792424918264.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/bisharp_Regular_none_1792424918722.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/budew_Regular_none_1792424919162.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/buneary_Regular_none_1792424919615.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/bunnelby_Regular_none_1792424920096.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/buzzwole_Regular_none_1792424920562.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/calyrex_Regular_none_1792424921051.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/centiskorch_Regular_none_1792424921522.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/charjabug_Regular_none_1792424921973.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/charmander_Regular_none_1792424922423.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/cherubi_Regular_none_1792424922878.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/cottonee_Regular_none_1792424923397.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/cottonee_Regular_none_1792424923843.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/cramorant_Regular_none_1792424924277.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/cubone_Regular_none_1792424924758.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/delibird_Regular_none_1792424925212.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/dracovish_Regular_none_1792424925673.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/dreepy_Regular_none_1792424926124.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/dusclops_Regular_none_1792424926621.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/electrike_Regular_none_1792424927083.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/electrike_Regular_none_1792424927528.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/eternatus_Regular_Shiny_none_1792424927959.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/eternatus_Regular_none_1792424928413.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/ferroseed_Regular_none_1792424928886.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/fletchling_Regular_none_1792424929346.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/gastly_Regular_none_1792424929814.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/gible_Regular_none_1792424930272.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/gible_Regular_none_1792424930703.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/golurk_Regular_none_1792424931148.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/golurk_Regular_none_1792424931632.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/goodra_Regular_none_1792424932092.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/grookey_Regular_none_1792424932537.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/gurdurr_Regular_none_1792424932986.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/gyarados_Regular_none_1792424933448.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/hattrem_Regular_none_1792424933893.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/hattrem_Regular_none_1792424934353.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/haunter_Regular_none_1792424934828.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/honedge_Regular_none_1792424935285.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/jellicent_Regular_none_1792424935736.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/keldeo_Regular_Shiny_none_1792424936178.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/linoone_Regular_none_1792424936621.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/litten_Regular_none_1792424937059.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/litten_Regular_none_1792424937516.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/machoke_Regular_none_1792424937960.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/machoke_Regular_none_1792424938413.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/machop_Regular_none_1792424938862.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/magearna_Regular_none_1792424939321.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/magikarp_Regular_none_1792424939790.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/melmetal_Regular_none_1792424940261.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/melmetal_Regular_none_1792424940711.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/meowth_Regular_none_1792424941158.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/meowth_Regular_none_1792424941611.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/metapod_Regular_none_1792424942051.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/milcery_Regular_none_1792424942492.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/mime-jr_Regular_none_1792424942964.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/mudkip_Regular_none_1792424943412.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/nidoking_Regular_none_1792424943853.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/nidoran-f_Regular_none_1792424944297.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/nidoran-m_Regular_none_1792424944756.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/ninjask_Regular_none_1792424945199.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/noibat_Regular_none_1792424945647.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/orbeetle_Regular_none_1792424946083.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/pangoro_Regular_none_1792424946529.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/pikachu_Regular_none_1792424946978.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/poliwhirl_Regular_none_1792424947416.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/pumpkaboo_Regular_none_1792424947882.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/purrloin_Regular_none_1792424948321.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/ralts_Regular_none_1792424948769.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/rapidash_Regular_none_1792424949229.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/remoraid_Regular_none_1792424949680.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/rhydon_Regular_none_1792424950146.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/rookidee_Regular_none_1792424950592.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/rotom_Regular_none_1792424951021.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/sandaconda_Regular_none_1792424951459.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/sandslash_Regular_none_1792424951934.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/scorbunny_Regular_none_1792424952390.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/seismitoad_Regular_none_1792424952847.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/sharpedo_Regular_none_1792424953289.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/shellos_Regular_none_1792424953738.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/shiinotic_Regular_none_1792424954189.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/sizzlipede_Regular_none_1792424954668.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/sizzlipede_Regular_none_1792424955123.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/sizzlipede_Regular_none_1792424955582.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/skwovet_Regular_none_1792424956033.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/slowpoke_Regular_none_1792424956466.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/snover_Regular_none_1792424956935.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/sobble_Regular_none_1792424957377.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/stunfisk_Regular_none_1792424957817.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/stunfisk_Regular_none_1792424958276.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/tapu-bulu_Regular_none_1792424958716.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/tapu-lele_Regular_none_1792424959172.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/timburr_Regular_none_1792424959640.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/timburr_Regular_none_1792424960105.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/timburr_Regular_none_1792424960552.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/timburr_Regular_none_1792424960992.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/timburr_Regular_none_1792424961449.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/toxapex_Regular_none_1792424961906.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/toxtricity_Regular_none_1792424962375.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/tranquill_Regular_none_1792424962829.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/tympole_Regular_none_1792424963266.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/vanillish_Regular_none_1792424963705.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/vanillish_Regular_none_1792424964155.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/vulpix_Regular_none_1792424964627.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/vulpix_Regular_none_1792424965074.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/wishiwashi_Regular_none_1792424965509.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/wobbuffet_Regular_none_1792424965947.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/wynaut_Regular_none_1792424966405.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/zarude_Regular_none_1792424966858.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/zarude_Regular_none_1792424967363.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/zigzagoon_Regular_none_1792424967861.png", OriginMark::GALAR);
+    database.add<Test_OriginMarkReader>("PokemonHome/SummaryScreen/zigzagoon_Regular_none_1792424968351.png", OriginMark::GALAR);
+}
+
+
+}
+}
+}
\ No newline at end of file
diff --git a/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_OriginMarkReader.h b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_OriginMarkReader.h
new file mode 100644
index 0000000000..67c4f933cc
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_OriginMarkReader.h
@@ -0,0 +1,50 @@
+/*  Origin Mark Reader
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonHome_OriginMarkReader_H
+#define PokemonAutomation_PokemonHome_OriginMarkReader_H
+
+#include <optional>
+#include <vector>
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/DetectedBoxes.h"
+#include "Pokemon/Pokemon_OriginMarks.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonHome{
+
+
+using Pokemon::OriginMark;
+
+class OriginMarkReader{
+public:
+    OriginMarkReader(Color color = COLOR_RED, VideoOverlay* overlay = nullptr);
+
+    void make_overlays(VideoOverlaySet& items) const;
+
+    OriginMark read_mark(
+        const ImageViewRGB32& original_screen
+    );
+
+private:
+    Color m_color;
+    VideoOverlay* m_overlay;
+    ImageFloatBox m_box;
+    std::vector<DetectedBox> m_last_detected;
+    std::optional<OverlayBoxScope> m_last_detected_box;
+
+};
+
+void add_tests_OriginMarkReader(UnitTestDatabase& database);
+
+}
+}
+}
+#endif
\ No newline at end of file
diff --git a/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_SelectionArrowDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_SelectionArrowDetector.cpp
new file mode 100644
index 0000000000..278ef8e843
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_SelectionArrowDetector.cpp
@@ -0,0 +1,330 @@
+/*  Selection Arrow Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Exceptions.h"
+#include "Kernels/Waterfill/Kernels_Waterfill_Types.h"
+#include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h"
+#include "CommonTools/Images/WaterfillUtilities.h"
+#include "Tests/ImageUnitTest.h"
+#include "Tests/TestUtils.h"
+#include "PokemonHome_SelectionArrowDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonHome{
+
+
+class SelectionArrowMatcher : public ImageMatch::WaterfillTemplateMatcher{
+public:
+    // The Pokemon Home arrows are red on a light background.
+    SelectionArrowMatcher(const char* path)
+        : WaterfillTemplateMatcher(
+            path,
+            Color(0xffa00000), Color(0xffffc0c0), 100
+        )
+    {
+        m_aspect_ratio_lower = 0.9;
+        m_aspect_ratio_upper = 1.1;
+        m_area_ratio_lower = 0.85;
+        m_area_ratio_upper = 1.1;
+    }
+
+    static const SelectionArrowMatcher& matcher(SelectionArrowType type){
+        switch (type){
+        case SelectionArrowType::RIGHT:
+            return RIGHT_ARROW();
+        case SelectionArrowType::DOWN:
+            return DOWN_ARROW();
+        default:
+            throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Invalid enum.");
+        }
+    }
+    static const SelectionArrowMatcher& RIGHT_ARROW(){
+        static SelectionArrowMatcher matcher("PokemonHome/SelectionArrows/SelectionArrowRight.png");
+        return matcher;
+    }
+    static const SelectionArrowMatcher& DOWN_ARROW(){
+        static SelectionArrowMatcher matcher("PokemonHome/SelectionArrows/SelectionArrowDown.png");
+        return matcher;
+    }
+};
+
+SelectionArrowDetector::SelectionArrowDetector(
+    Color color,
+    VideoOverlay* overlay,
+    SelectionArrowType type,
+    const ImageFloatBox& box
+)
+    : m_color(color)
+    , m_overlay(overlay)
+    , m_type(type)
+    , m_arrow_box(box)
+{}
+void SelectionArrowDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_arrow_box);
+}
+bool SelectionArrowDetector::detect(const ImageViewRGB32& screen){
+    double screen_rel_size = (screen.height() / 1080.0);
+    double screen_rel_size_2 = screen_rel_size * screen_rel_size;
+
+    double min_area_1080p = 700;
+    double rmsd_threshold = 80;
+    size_t min_area = size_t(screen_rel_size_2 * min_area_1080p);
+
+    const std::vector<std::pair<uint32_t, uint32_t>> FILTERS = {
+        {0xff800000, 0xffff9090},
+        {0xffa00000, 0xffffa0a0},
+        {0xffc00000, 0xffffc0c0},
+        {0xffd00000, 0xffffd0d0},
+    };
+
+    bool found = match_template_by_waterfill(
+        screen.size(),
+        extract_box_reference(screen, m_arrow_box),
+        SelectionArrowMatcher::matcher(m_type),
+        FILTERS,
+        {min_area, SIZE_MAX},
+        rmsd_threshold,
+        [&](Kernels::Waterfill::WaterfillObject& object) -> bool {
+            m_last_detected = translate_to_parent(screen, m_arrow_box, object);
+            return true;
+        }
+    );
+
+    if (m_overlay){
+        if (found){
+            m_last_detected_box.emplace(*m_overlay, m_last_detected, COLOR_GREEN);
+        }else{
+            m_last_detected_box.reset();
+        }
+    }
+
+    return found;
+}
+
+class Test_SelectionArrowDetector : public ImageUnitTest{
+public:
+
+    Test_SelectionArrowDetector(
+        const std::string& image,
+        std::optional<SelectionArrowType> expected
+    )
+        : ImageUnitTest("PokemonHome::SelectionArrowDetector - " + image, {image})
+        , m_expected(expected)
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        DummyVideoOverlay video_overlay;
+        const ImageRGB32& image = images[0];
+        SelectionArrowDetector right_detector(COLOR_BLACK, &video_overlay, SelectionArrowType::RIGHT, ImageFloatBox(0.463, 0.09, 0.04, 0.06));
+        SelectionArrowDetector down_detector(COLOR_BLACK, &video_overlay, SelectionArrowType::DOWN, ImageFloatBox(0.463, 0.09, 0.04, 0.06));
+
+        const bool right_detected = right_detector.detect(image);
+        const bool down_detected = down_detector.detect(image);
+
+        const bool expected_right = m_expected && *m_expected == SelectionArrowType::RIGHT;
+        const bool expected_down = m_expected && *m_expected == SelectionArrowType::DOWN;
+
+        if (right_detected == expected_right && down_detected == expected_down)
+            return true;
+
+        auto arrow_name = [](std::optional<SelectionArrowType> arrow){
+            if (!arrow)
+                return std::string("none");
+            return *arrow == SelectionArrowType::RIGHT
+                ? std::string("RIGHT")
+                : std::string("DOWN");
+        };
+
+        std::optional<SelectionArrowType> result;
+        if (right_detected && down_detected){
+            return "Expected: " + arrow_name(m_expected) + ", received: RIGHT and DOWN";
+        }else if (right_detected){
+            result = SelectionArrowType::RIGHT;
+        }else if (down_detected){
+            result = SelectionArrowType::DOWN;
+        }
+
+        return "Expected: " + arrow_name(m_expected) + ", received: " + arrow_name(result);
+    };
+
+private:
+    std::optional<SelectionArrowType> m_expected;
+};
+
+void add_tests_SelectionArrowDetector(UnitTestDatabase& database){
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/annihilape_Regular.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/bidoof_Regular.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/bulbasaur_Regular.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/bulbasuar_Shiny_Go.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/bulbasuar_Shiny_Lza.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/capskid_Regular.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/castform_Regular.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/cyclizar_Regular.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/dudunsparce_Regular.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/dudunsparce_Regular_Sv.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/enamorus_Shiny.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/gimmighoul_Regular.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/glimmet_Regular.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/gogoat_Regular.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/greatTusk_Shiny.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/hatterne_Regular.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/houndstone_Regular.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/ironBunde_Regular.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/ironBundle_Regular_Sv.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/ironJugulis_Regular.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/ironThorns_Regular.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/kilowattrel_Regular.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/kingler_Shiny.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/komala_Regular.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/krabby_Shiny.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/machamp_Regular.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/pancham_Shiny.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/rapidash_Regular.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/rellor_Regular.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/riolu_Regular.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/rowlet_ShinyAlpha.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/scovillain_Regular.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/slitherWing_Shiny.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/squirtle_Shiny.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/tapuLele_Shiny.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/tatsugiri_Regular.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/teddiursa_Regular.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/terapagos_regular.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/vulpix_Regular.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/vulpix_Shiny.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/wartortle_Regular.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/wurmple_Regular.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/GBA-Origin-ElgatoHD60Pro-NV12.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/GBA-Origin-ElgatoHD60Pro-YUYV.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/Farfetchd-fast-ball.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/Machamp-gigaton-ball.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/Machoke-gigaton-ball.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/Machop-gigaton-ball.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/Magnemite-gigaton-ball.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/Magneton-gigaton-ball.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/Slowpoke-fast-ball.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/absol_Regular_none_1792424917318.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/arrokuda_Regular_none_1792424917770.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/azelf_Regular_none_1792424918264.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/bisharp_Regular_none_1792424918722.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/budew_Regular_none_1792424919162.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/buneary_Regular_none_1792424919615.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/bunnelby_Regular_none_1792424920096.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/buzzwole_Regular_none_1792424920562.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/calyrex_Regular_none_1792424921051.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/centiskorch_Regular_none_1792424921522.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/charjabug_Regular_none_1792424921973.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/charmander_Regular_none_1792424922423.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/cherubi_Regular_none_1792424922878.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/cottonee_Regular_none_1792424923397.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/cottonee_Regular_none_1792424923843.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/cramorant_Regular_none_1792424924277.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/cubone_Regular_none_1792424924758.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/delibird_Regular_none_1792424925212.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/dracovish_Regular_none_1792424925673.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/dreepy_Regular_none_1792424926124.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/dusclops_Regular_none_1792424926621.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/electrike_Regular_none_1792424927083.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/electrike_Regular_none_1792424927528.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/eternatus_Regular_Shiny_none_1792424927959.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/eternatus_Regular_none_1792424928413.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/ferroseed_Regular_none_1792424928886.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/fletchling_Regular_none_1792424929346.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/gastly_Regular_none_1792424929814.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/gible_Regular_none_1792424930272.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/gible_Regular_none_1792424930703.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/golurk_Regular_none_1792424931148.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/golurk_Regular_none_1792424931632.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/goodra_Regular_none_1792424932092.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/grookey_Regular_none_1792424932537.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/gurdurr_Regular_none_1792424932986.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/gyarados_Regular_none_1792424933448.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/hattrem_Regular_none_1792424933893.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/hattrem_Regular_none_1792424934353.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/haunter_Regular_none_1792424934828.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/honedge_Regular_none_1792424935285.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/jellicent_Regular_none_1792424935736.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/keldeo_Regular_Shiny_none_1792424936178.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/linoone_Regular_none_1792424936621.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/litten_Regular_none_1792424937059.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/litten_Regular_none_1792424937516.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/machoke_Regular_none_1792424937960.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/machoke_Regular_none_1792424938413.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/machop_Regular_none_1792424938862.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/magearna_Regular_none_1792424939321.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/magikarp_Regular_none_1792424939790.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/melmetal_Regular_none_1792424940261.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/melmetal_Regular_none_1792424940711.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/meowth_Regular_none_1792424941158.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/meowth_Regular_none_1792424941611.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/metapod_Regular_none_1792424942051.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/milcery_Regular_none_1792424942492.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/mime-jr_Regular_none_1792424942964.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/mudkip_Regular_none_1792424943412.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/nidoking_Regular_none_1792424943853.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/nidoran-f_Regular_none_1792424944297.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/nidoran-m_Regular_none_1792424944756.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/ninjask_Regular_none_1792424945199.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/noibat_Regular_none_1792424945647.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/orbeetle_Regular_none_1792424946083.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/pangoro_Regular_none_1792424946529.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/pikachu_Regular_none_1792424946978.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/poliwhirl_Regular_none_1792424947416.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/pumpkaboo_Regular_none_1792424947882.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/purrloin_Regular_none_1792424948321.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/ralts_Regular_none_1792424948769.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/rapidash_Regular_none_1792424949229.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/remoraid_Regular_none_1792424949680.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/rhydon_Regular_none_1792424950146.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/rookidee_Regular_none_1792424950592.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/rotom_Regular_none_1792424951021.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/sandaconda_Regular_none_1792424951459.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/sandslash_Regular_none_1792424951934.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/scorbunny_Regular_none_1792424952390.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/seismitoad_Regular_none_1792424952847.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/sharpedo_Regular_none_1792424953289.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/shellos_Regular_none_1792424953738.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/shiinotic_Regular_none_1792424954189.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/sizzlipede_Regular_none_1792424954668.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/sizzlipede_Regular_none_1792424955123.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/sizzlipede_Regular_none_1792424955582.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/skwovet_Regular_none_1792424956033.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/slowpoke_Regular_none_1792424956466.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/snover_Regular_none_1792424956935.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/sobble_Regular_none_1792424957377.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/stunfisk_Regular_none_1792424957817.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/stunfisk_Regular_none_1792424958276.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/tapu-bulu_Regular_none_1792424958716.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/tapu-lele_Regular_none_1792424959172.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/timburr_Regular_none_1792424959640.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/timburr_Regular_none_1792424960105.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/timburr_Regular_none_1792424960552.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/timburr_Regular_none_1792424960992.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/timburr_Regular_none_1792424961449.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/toxapex_Regular_none_1792424961906.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/toxtricity_Regular_none_1792424962375.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/tranquill_Regular_none_1792424962829.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/tympole_Regular_none_1792424963266.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/vanillish_Regular_none_1792424963705.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/vanillish_Regular_none_1792424964155.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/vulpix_Regular_none_1792424964627.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/vulpix_Regular_none_1792424965074.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/wishiwashi_Regular_none_1792424965509.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/wobbuffet_Regular_none_1792424965947.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/wynaut_Regular_none_1792424966405.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/zarude_Regular_none_1792424966858.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/zarude_Regular_none_1792424967363.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/zigzagoon_Regular_none_1792424967861.png", std::nullopt);
+    database.add<Test_SelectionArrowDetector>("PokemonHome/SummaryScreen/zigzagoon_Regular_none_1792424968351.png", std::nullopt);
+}
+
+}
+}
+}
\ No newline at end of file
diff --git a/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_SelectionArrowDetector.h b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_SelectionArrowDetector.h
new file mode 100644
index 0000000000..21c17b5693
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_SelectionArrowDetector.h
@@ -0,0 +1,71 @@
+/*  Selection Arrow Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonHome_SelectionArrowDetector_H
+#define PokemonAutomation_PokemonHome_SelectionArrowDetector_H
+
+#include <optional>
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/VisualDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonHome{
+
+
+enum class SelectionArrowType{
+    RIGHT,
+    DOWN,
+};
+
+
+class SelectionArrowDetector : public StaticScreenDetector{
+public:
+    SelectionArrowDetector(
+        Color color,
+        VideoOverlay* overlay,
+        SelectionArrowType type,
+        const ImageFloatBox& box
+    );
+
+    const ImageFloatBox& last_detected() const{ return m_last_detected; }
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    friend class SelectionArrowWatcher;
+
+    const Color m_color;
+    VideoOverlay* m_overlay;
+    const SelectionArrowType m_type;
+    const ImageFloatBox m_arrow_box;
+
+    ImageFloatBox m_last_detected;
+    std::optional<OverlayBoxScope> m_last_detected_box;
+};
+class SelectionArrowWatcher : public DetectorToFinder<SelectionArrowDetector>{
+public:
+    SelectionArrowWatcher(
+        Color color,
+        VideoOverlay* overlay,
+        SelectionArrowType type,
+        const ImageFloatBox& box,
+        std::chrono::milliseconds hold_duration = std::chrono::milliseconds(250)
+    )
+         : DetectorToFinder("SelectionArrowWatcher", hold_duration, color, overlay, type, box)
+    {}
+};
+
+void add_tests_SelectionArrowDetector(UnitTestDatabase& database);
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_ShinyDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_ShinyDetector.cpp
new file mode 100644
index 0000000000..189bf7abe6
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_ShinyDetector.cpp
@@ -0,0 +1,229 @@
+/*  Shiny Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/ImageTools/ImageStats.h"
+#include "CommonFramework/ImageTypes/ImageRGB32.h"
+#include "Tests/ImageUnitTest.h"
+#include "PokemonHome_ShinyDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonHome{
+
+
+ShinyDetector::ShinyDetector(Color color, VideoOverlay* overlay)
+    : m_color(color)
+    , m_overlay(overlay)
+    , m_box(0.702, 0.09, 0.04, 0.06)
+{}
+
+void ShinyDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_box);
+}
+
+bool ShinyDetector::detect(const ImageViewRGB32& screen){
+    const bool found = image_stddev(extract_box_reference(screen, m_box)).sum() > 30;
+    if (m_overlay){
+        if (found){
+            m_last_detected_box.emplace(*m_overlay, m_box, COLOR_GREEN);
+        }else{
+            m_last_detected_box.reset();
+        }
+    }
+    return found;
+}
+
+class Test_ShinyDetector : public ImageUnitTest{
+public:
+    Test_ShinyDetector(const std::string& image, bool expected)
+        : ImageUnitTest("PokemonHome::ShinyDetector - " + image, {image})
+        , m_expected(expected)
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        const ImageRGB32& image = images[0];
+        ShinyDetector detector;
+        return detector.detect(image) == m_expected;
+    }
+
+private:
+    bool m_expected;
+};
+
+void add_tests_ShinyDetector(UnitTestDatabase& database){
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/annihilape_Regular.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/bidoof_Regular.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/bulbasaur_Regular.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/bulbasuar_Shiny_Go.png", true);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/bulbasuar_Shiny_Lza.png", true);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/capskid_Regular.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/castform_Regular.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/cyclizar_Regular.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/dudunsparce_Regular.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/dudunsparce_Regular_Sv.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/enamorus_Shiny.png", true);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/gimmighoul_Regular.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/glimmet_Regular.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/gogoat_Regular.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/greatTusk_Shiny.png", true);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/hatterne_Regular.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/houndstone_Regular.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/ironBunde_Regular.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/ironBundle_Regular_Sv.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/ironJugulis_Regular.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/ironThorns_Regular.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/kilowattrel_Regular.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/kingler_Shiny.png", true);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/komala_Regular.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/krabby_Shiny.png", true);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/machamp_Regular.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/pancham_Shiny.png", true);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/rapidash_Regular.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/rellor_Regular.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/riolu_Regular.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/rowlet_ShinyAlpha.png", true);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/scovillain_Regular.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/slitherWing_Shiny.png", true);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/squirtle_Shiny.png", true);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/tapuLele_Shiny.png", true);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/tatsugiri_Regular.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/teddiursa_Regular.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/terapagos_regular.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/vulpix_Regular.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/vulpix_Shiny.png", true);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/wartortle_Regular.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/wurmple_Regular.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/GBA-Origin-ElgatoHD60Pro-NV12.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/GBA-Origin-ElgatoHD60Pro-YUYV.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/Farfetchd-fast-ball.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/Machamp-gigaton-ball.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/Machoke-gigaton-ball.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/Machop-gigaton-ball.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/Magnemite-gigaton-ball.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/Magneton-gigaton-ball.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/Slowpoke-fast-ball.png", true);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/absol_Regular_none_1792424917318.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/arrokuda_Regular_none_1792424917770.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/azelf_Regular_none_1792424918264.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/bisharp_Regular_none_1792424918722.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/budew_Regular_none_1792424919162.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/buneary_Regular_none_1792424919615.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/bunnelby_Regular_none_1792424920096.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/buzzwole_Regular_none_1792424920562.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/calyrex_Regular_none_1792424921051.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/centiskorch_Regular_none_1792424921522.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/charjabug_Regular_none_1792424921973.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/charmander_Regular_none_1792424922423.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/cherubi_Regular_none_1792424922878.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/cottonee_Regular_none_1792424923397.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/cottonee_Regular_none_1792424923843.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/cramorant_Regular_none_1792424924277.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/cubone_Regular_none_1792424924758.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/delibird_Regular_none_1792424925212.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/dracovish_Regular_none_1792424925673.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/dreepy_Regular_none_1792424926124.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/dusclops_Regular_none_1792424926621.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/electrike_Regular_none_1792424927083.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/electrike_Regular_none_1792424927528.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/eternatus_Regular_Shiny_none_1792424927959.png", true);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/eternatus_Regular_none_1792424928413.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/ferroseed_Regular_none_1792424928886.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/fletchling_Regular_none_1792424929346.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/gastly_Regular_none_1792424929814.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/gible_Regular_none_1792424930272.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/gible_Regular_none_1792424930703.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/golurk_Regular_none_1792424931148.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/golurk_Regular_none_1792424931632.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/goodra_Regular_none_1792424932092.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/grookey_Regular_none_1792424932537.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/gurdurr_Regular_none_1792424932986.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/gyarados_Regular_none_1792424933448.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/hattrem_Regular_none_1792424933893.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/hattrem_Regular_none_1792424934353.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/haunter_Regular_none_1792424934828.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/honedge_Regular_none_1792424935285.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/jellicent_Regular_none_1792424935736.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/keldeo_Regular_Shiny_none_1792424936178.png", true);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/linoone_Regular_none_1792424936621.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/litten_Regular_none_1792424937059.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/litten_Regular_none_1792424937516.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/machoke_Regular_none_1792424937960.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/machoke_Regular_none_1792424938413.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/machop_Regular_none_1792424938862.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/magearna_Regular_none_1792424939321.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/magikarp_Regular_none_1792424939790.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/melmetal_Regular_none_1792424940261.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/melmetal_Regular_none_1792424940711.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/meowth_Regular_none_1792424941158.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/meowth_Regular_none_1792424941611.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/metapod_Regular_none_1792424942051.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/milcery_Regular_none_1792424942492.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/mime-jr_Regular_none_1792424942964.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/mudkip_Regular_none_1792424943412.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/nidoking_Regular_none_1792424943853.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/nidoran-f_Regular_none_1792424944297.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/nidoran-m_Regular_none_1792424944756.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/ninjask_Regular_none_1792424945199.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/noibat_Regular_none_1792424945647.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/orbeetle_Regular_none_1792424946083.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/pangoro_Regular_none_1792424946529.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/pikachu_Regular_none_1792424946978.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/poliwhirl_Regular_none_1792424947416.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/pumpkaboo_Regular_none_1792424947882.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/purrloin_Regular_none_1792424948321.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/ralts_Regular_none_1792424948769.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/rapidash_Regular_none_1792424949229.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/remoraid_Regular_none_1792424949680.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/rhydon_Regular_none_1792424950146.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/rookidee_Regular_none_1792424950592.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/rotom_Regular_none_1792424951021.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/sandaconda_Regular_none_1792424951459.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/sandslash_Regular_none_1792424951934.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/scorbunny_Regular_none_1792424952390.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/seismitoad_Regular_none_1792424952847.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/sharpedo_Regular_none_1792424953289.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/shellos_Regular_none_1792424953738.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/shiinotic_Regular_none_1792424954189.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/sizzlipede_Regular_none_1792424954668.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/sizzlipede_Regular_none_1792424955123.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/sizzlipede_Regular_none_1792424955582.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/skwovet_Regular_none_1792424956033.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/slowpoke_Regular_none_1792424956466.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/snover_Regular_none_1792424956935.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/sobble_Regular_none_1792424957377.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/stunfisk_Regular_none_1792424957817.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/stunfisk_Regular_none_1792424958276.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/tapu-bulu_Regular_none_1792424958716.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/tapu-lele_Regular_none_1792424959172.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/timburr_Regular_none_1792424959640.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/timburr_Regular_none_1792424960105.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/timburr_Regular_none_1792424960552.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/timburr_Regular_none_1792424960992.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/timburr_Regular_none_1792424961449.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/toxapex_Regular_none_1792424961906.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/toxtricity_Regular_none_1792424962375.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/tranquill_Regular_none_1792424962829.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/tympole_Regular_none_1792424963266.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/vanillish_Regular_none_1792424963705.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/vanillish_Regular_none_1792424964155.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/vulpix_Regular_none_1792424964627.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/vulpix_Regular_none_1792424965074.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/wishiwashi_Regular_none_1792424965509.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/wobbuffet_Regular_none_1792424965947.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/wynaut_Regular_none_1792424966405.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/zarude_Regular_none_1792424966858.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/zarude_Regular_none_1792424967363.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/zigzagoon_Regular_none_1792424967861.png", false);
+    database.add<Test_ShinyDetector>("PokemonHome/SummaryScreen/zigzagoon_Regular_none_1792424968351.png", false);
+}
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_ShinyDetector.h b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_ShinyDetector.h
new file mode 100644
index 0000000000..4610f9b689
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_ShinyDetector.h
@@ -0,0 +1,41 @@
+/*  Shiny Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonHome_ShinyDetector_H
+#define PokemonAutomation_PokemonHome_ShinyDetector_H
+
+#include <optional>
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/VisualDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonHome{
+
+
+class ShinyDetector : public StaticScreenDetector{
+public:
+    ShinyDetector(Color color = COLOR_RED, VideoOverlay* overlay = nullptr);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    Color m_color;
+    VideoOverlay* m_overlay;
+    ImageFloatBox m_box;
+    std::optional<OverlayBoxScope> m_last_detected_box;
+};
+
+void add_tests_ShinyDetector(UnitTestDatabase& database);
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_SummaryReader.cpp b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_SummaryReader.cpp
new file mode 100644
index 0000000000..e476914df6
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_SummaryReader.cpp
@@ -0,0 +1,1030 @@
+/*  Pokemon Home Summary Reader
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <string>
+#include <tuple>
+#include <utility>
+#include <vector>
+#include "Common/Cpp/CancellableScope.h"
+#include "Common/Cpp/Json/JsonObject.h"
+#include "Common/Cpp/Json/JsonValue.h"
+#include "Common/Cpp/Strings/Unicode.h"
+#include "CommonFramework/GlobalAutoPaths.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/Tools/GlobalThreadPools.h"
+#include "CommonTools/Images/ImageFilter.h"
+#include "CommonTools/OCR/OCR_NumberReader.h"
+#include "CommonTools/OCR/OCR_DictionaryMatcher.h"
+#include "CommonTools/OCR/OCR_Routines.h"
+#include "CommonTools/OCR/OCR_StringNormalization.h"
+#include "Tests/ImageUnitTest.h"
+#include "Pokemon/Inference/Pokemon_AbilityReader.h"
+#include "Pokemon/Inference/Pokemon_NatureReader.h"
+#include "PokemonHome_SummaryReader.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonHome{
+
+namespace{
+
+class LanguageOfOriginMatcher : public OCR::DictionaryMatcher{
+public:
+    LanguageOfOriginMatcher(){
+        const std::string path = RESOURCE_PATH() + "Pokemon/LanguageOfOrigin.json";
+        JsonValue json = load_json_file(path);
+        const JsonObject& dictionary = json.to_object_throw(path);
+        m_database.emplace(
+            std::piecewise_construct,
+            std::forward_as_tuple(Language::English),
+            std::forward_as_tuple(
+                dictionary, nullptr,
+                language_data(Language::English).random_match_chance,
+                false
+            )
+        );
+        m_languages += Language::English;
+    }
+};
+
+const std::vector<std::pair<uint32_t, uint32_t>>& white_number_filters(){
+    static const std::vector<std::pair<uint32_t, uint32_t>> filters = {
+        {0xff808080, 0xffffffff},
+        {0xff909090, 0xffffffff},
+        {0xffa0a0a0, 0xffffffff},
+        {0xffc0c0c0, 0xffffffff},
+    };
+    return filters;
+}
+
+const std::vector<std::pair<uint32_t, uint32_t>>& gray_number_filters(){
+    static const std::vector<std::pair<uint32_t, uint32_t>> filters = {
+        {0x323232, 0xffe1e8e4},
+    };
+    return filters;
+}
+
+const std::vector<BlackWhiteRgb32Range>& white_text_filters(){
+    static const std::vector<BlackWhiteRgb32Range> filters = []{
+        std::vector<BlackWhiteRgb32Range> ret;
+        for (const OCR::TextColorRange& filter : OCR::WHITE_TEXT_FILTERS())
+            ret.push_back({ true, filter.mins, filter.maxs });
+        return ret;
+        }();
+    return filters;
+}
+
+const std::vector<BlackWhiteRgb32Range>& gray_text_filters(){
+    static const std::vector<BlackWhiteRgb32Range> filters = {
+        {true, 0x323232, 0xffe1e8e4},
+    };
+    return filters;
+}
+
+const std::vector<OCR::TextColorRange>& gray_nature_text_filters(){
+    static const std::vector<OCR::TextColorRange> filters = {
+        {0x323232, 0xffe1e8e4},
+    };
+    return filters;
+}
+
+std::string read_text(
+    Language language,
+    const ImageViewRGB32& screen, const ImageFloatBox& box,
+    const std::vector<BlackWhiteRgb32Range>& filters
+){
+    if (language == Language::None)
+        return "";
+
+    std::string best_raw;
+    for (auto& [image, pixel_count] : to_blackwhite_rgb32_range(extract_box_reference(screen, box), filters)){
+        if (pixel_count == 0)
+            continue;
+        std::string candidate = OCR::ocr_read(language, image, OCR::PageSegMode::SINGLE_LINE);
+        if (!candidate.empty()){
+            best_raw = candidate;
+            break;
+        }
+    }
+    return utf32_to_str(OCR::normalize_utf32(best_raw));
+}
+
+int read_number(
+    Logger& logger, const ImageViewRGB32& screen, const ImageFloatBox& box,
+    const std::vector<std::pair<uint32_t, uint32_t>>& filters
+){
+    return OCR::read_number_waterfill_multifilter(
+        logger,
+        GlobalThreadPools::computation_normal(),
+        extract_box_reference(screen, box),
+        filters
+    );
+}
+
+} //namespace
+
+SummaryReader::SummaryReader(Color color)
+    : m_color(color)
+    , m_national_dex_number_box(0.448, 0.245, 0.049, 0.04)
+    , m_level_box(0.506141, 0.090805, 0.100194, 0.057471)
+    , m_original_trainer_id_box(0.782, 0.719, 0.193, 0.046)
+    , m_original_trainer_name_box(0.492, 0.719, 0.165, 0.049)
+    , m_nature_box(0.157, 0.783, 0.212, 0.042)
+    , m_ability_box(0.158, 0.838, 0.213, 0.042)
+    , m_language_of_origin_box(0.0265, 0.176, 0.056, 0.035)
+{}
+
+void SummaryReader::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_national_dex_number_box);
+    items.add(m_color, m_level_box);
+    items.add(m_color, m_original_trainer_id_box);
+    items.add(m_color, m_original_trainer_name_box);
+    items.add(m_color, m_nature_box);
+    items.add(m_color, m_ability_box);
+    items.add(m_color, m_language_of_origin_box);
+}
+
+int SummaryReader::read_national_dex(Logger& logger, const ImageViewRGB32& screen) const{
+    return read_number(logger, screen, m_national_dex_number_box, white_number_filters());
+}
+
+int SummaryReader::read_original_trainer_id(Logger& logger, const ImageViewRGB32& screen) const{
+    return read_number(logger, screen, m_original_trainer_id_box, white_number_filters());
+}
+
+std::string SummaryReader::read_original_trainer_name(Language language, const ImageViewRGB32& screen) const{
+    return read_text(language, screen, m_original_trainer_name_box, white_text_filters());
+}
+
+std::string SummaryReader::read_nature(Logger& logger, Language language, const ImageViewRGB32& screen) const{
+    static const Pokemon::NatureReader reader("Pokemon/NatureCheckerOCR.json");
+    OCR::StringMatchResult result = reader.read_substring(
+        logger,
+        language,
+        extract_box_reference(screen, m_nature_box),
+        gray_nature_text_filters()
+    );
+    return result.results.size() == 1 ? result.results.begin()->second.token : "";
+}
+
+std::string SummaryReader::read_ability(Logger& logger, Language language, const ImageViewRGB32& screen) const{
+    static const Pokemon::AbilityReader reader;
+    OCR::StringMatchResult result = reader.read_substring(
+        logger,
+        language,
+        extract_box_reference(screen, m_ability_box),
+        gray_nature_text_filters()
+    );
+    return result.results.size() == 1 ? result.results.begin()->second.token : "";
+}
+
+std::string SummaryReader::read_language_of_origin(const ImageViewRGB32& screen) const{
+    static const LanguageOfOriginMatcher dictionary;
+    OCR::StringMatchResult result = dictionary.match_substring_from_image_multifiltered(
+        nullptr,
+        Language::English,
+        extract_box_reference(screen, m_language_of_origin_box),
+        OCR::BLACK_TEXT_FILTERS(),
+        -1.30,
+        0.50,
+        0.01,
+        0.50,
+        OCR::PageSegMode::SINGLE_LINE
+    );
+
+    if (result.results.empty()){
+        return "";
+    }
+    return result.results.begin()->second.token;
+}
+
+// Due to the position of the level changing slightly depending on digits and language. The box contains the "Lv" text and the level number.
+int SummaryReader::read_level(Logger& logger, const ImageViewRGB32& screen) const{
+    try{
+        std::string text = read_text(Language::English, screen, m_level_box, gray_text_filters());
+        //logger.log("Level text: " + text, COLOR_BLUE);
+        size_t pos = text.find('v');
+
+        if (pos != std::string::npos){
+            std::string level = text.substr(pos + 1);
+            return std::stoi(level);
+        }
+
+        return std::stoi(text.c_str());
+    }
+    catch (const std::exception&){
+        logger.log("Failed to read level from summary screen.", COLOR_RED);
+        return -1;
+    }
+}
+
+class Test_SummaryReader_Numbers : public ImageUnitTest{
+public:
+    Test_SummaryReader_Numbers(const std::string& image, int expected_dex, int expected_ot_id, int expected_level)
+        : ImageUnitTest("PokemonHome::SummaryReader_Numbers - " + image, {image})
+        , m_expected_dex(expected_dex)
+        , m_expected_ot_id(expected_ot_id)
+        , m_expected_level(expected_level)
+    {
+        //  Plus the PaddleOCR (ONNX) recognition session and its working set.
+        m_memory += PADDLE_OCR_SINGLE_LINE_MEMORY_ESTIMATE;
+    }
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        const ImageRGB32& image = images[0];
+        SummaryReader reader;
+        int dex = reader.read_national_dex(logger, image);
+        int ot_id = reader.read_original_trainer_id(logger, image);
+        int level = reader.read_level(logger, image);
+        std::string errors;
+        if (dex != m_expected_dex){
+            errors += "National Dex number: Expected: " + std::to_string(m_expected_dex) + ", received: " + std::to_string(dex) + "\n";
+        }
+        if (ot_id != m_expected_ot_id){
+            errors += "Original Trainer ID: Expected: " + std::to_string(m_expected_ot_id) + ", received: " + std::to_string(ot_id) + "\n";
+        }
+        if (level != m_expected_level){
+            errors += "Level: Expected: " + std::to_string(m_expected_level) + ", received: " + std::to_string(level) + "\n";
+        }
+
+        return errors.empty() ? UnitTestResult(true) : UnitTestResult(std::move(errors));
+    }
+
+private:
+    int m_expected_dex;
+    int m_expected_ot_id;
+    int m_expected_level;
+};
+
+class Test_SummaryReader_Text : public ImageUnitTest{
+public:
+    Test_SummaryReader_Text(const std::string& image, std::string expected_nature, std::string expected_ability, Language language)
+        : ImageUnitTest("PokemonHome::SummaryReader_Text - " + image, {image})
+        , m_expected_nature(expected_nature)
+        , m_expected_ability(expected_ability)
+        , m_language(language)
+    {
+        //  Plus the PaddleOCR (ONNX) recognition session and its working set.
+        m_memory += PADDLE_OCR_SINGLE_LINE_MEMORY_ESTIMATE;
+    }
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        const ImageRGB32& image = images[0];
+        SummaryReader reader;
+
+        std::string nature = reader.read_nature(logger, m_language, image);
+        std::string ability = reader.read_ability(logger, m_language, image);
+        std::string errors;
+        if (nature != m_expected_nature){
+            errors += "Nature: Expected: " + m_expected_nature + ", received: " + nature + "\n";
+        }
+        if (ability != m_expected_ability){
+            errors += "Ability: Expected: " + m_expected_ability + ", received: " + ability + "\n";
+        }
+
+        return errors.empty() ? UnitTestResult(true) : UnitTestResult(std::move(errors));
+    }
+
+private:
+    std::string m_expected_nature;
+    std::string m_expected_ability;
+    Language m_language;
+};
+
+class Test_SummaryReader_OtName : public ImageUnitTest{
+public:
+    Test_SummaryReader_OtName(const std::string& image, std::string expected_ot_name, Language language)
+        : ImageUnitTest("PokemonHome::SummaryReader_OtName - " + image, {image})
+        , m_expected_ot_name(expected_ot_name)
+        , m_language(language)
+    {
+        //  Plus the PaddleOCR (ONNX) recognition session and its working set.
+        m_memory += PADDLE_OCR_SINGLE_LINE_MEMORY_ESTIMATE;
+    }
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        const ImageRGB32& image = images[0];
+        SummaryReader reader;
+        std::string ot_name = reader.read_original_trainer_name(m_language, image);
+        if (ot_name == m_expected_ot_name){
+            return true;
+        }
+
+        return "Original Trainer name: Expected: " + m_expected_ot_name + ", received: " + ot_name;
+    }
+
+private:
+    std::string m_expected_ot_name;
+    Language m_language;
+};
+
+class Test_SummaryReader_LanguageOfOrigin : public ImageUnitTest{
+public:
+    Test_SummaryReader_LanguageOfOrigin(const std::string& image, std::string expected)
+        : ImageUnitTest("PokemonHome::SummaryReader_LanguageOfOrigin - " + image, {image})
+        , m_expected(expected)
+    {
+        //  Plus the PaddleOCR (ONNX) recognition session and its working set.
+        m_memory += PADDLE_OCR_SINGLE_LINE_MEMORY_ESTIMATE;
+    }
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        const ImageRGB32& image = images[0];
+        std::string language = SummaryReader().read_language_of_origin(image);
+        if (language == m_expected){
+            return true;
+        }
+
+        return "Expected: " + m_expected + ", received: " + language;
+    }
+
+private:
+    std::string m_expected;
+};
+
+void add_tests_SummaryReader(UnitTestDatabase& database){
+    //Numbers
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/annihilape_Regular.png", 979, 493124, 75);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/bidoof_Regular.png", 399, 4610, 5);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/bulbasaur_Regular.png", 1, 493001, 6);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/bulbasuar_Shiny_Go.png", 1, 493001, 4);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/bulbasuar_Shiny_Lza.png", 1, 725174, 51);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/capskid_Regular.png", 951, 493124, 15);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/castform_Regular.png", 351, 248782, 13);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/cyclizar_Regular.png", 967, 254804, 45);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/dudunsparce_Regular.png", 982, 911993, 45);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/dudunsparce_Regular_Sv.png", 982, 787315, 60);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/enamorus_Shiny.png", 905, 250128, 50);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/gimmighoul_Regular.png", 999, 493124, 35);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/glimmet_Regular.png", 969, 254804, 35);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/gogoat_Regular.png", 673, 57594, 38);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/greatTusk_Shiny.png", 984, 402737, 100);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/hatterne_Regular.png", 858, 302862, 60);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/houndstone_Regular.png", 972, 254804, 45);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/ironBunde_Regular.png", 991, 92396, 60);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/ironBundle_Regular_Sv.png", 991, 493124, 57);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/ironJugulis_Regular.png", 993, 493124, 58);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/ironThorns_Regular.png", 995, 493124, 57);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/kilowattrel_Regular.png", 941, 254804, 45);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/kingler_Shiny.png", 99, 840209, 40);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/komala_Regular.png", 775, 254804, 45);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/krabby_Shiny.png", 98, 840209, 20);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/machamp_Regular.png", 68, 639783, 100);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/pancham_Shiny.png", 674, 225962, 29);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/rapidash_Regular.png", 78, 144934, 37);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/rellor_Regular.png", 953, 493124, 26);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/riolu_Regular.png", 447, 348226, 25);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/rowlet_ShinyAlpha.png", 722, 764041, 31);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/scovillain_Regular.png", 952, 493124, 41);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/slitherWing_Shiny.png", 988, 402737, 100);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/squirtle_Shiny.png", 7, 700052, 1);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/tapuLele_Shiny.png", 786, 181130, 62);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/tatsugiri_Regular.png", 978, 493124, 52);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/teddiursa_Regular.png", 216, 333685, 29);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/terapagos_regular.png", 1024, 493124, 100);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/vulpix_Regular.png", 37, 226403, 11);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/vulpix_Shiny.png", 37, 225962, 14);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/wartortle_Regular.png", 8, 379916, 15);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/wurmple_Regular.png", 265, 843926, 1);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/GBA-Origin-ElgatoHD60Pro-NV12.png", 14, 40419, 8);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/GBA-Origin-ElgatoHD60Pro-YUYV.png", 14, 40419, 8);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/Farfetchd-fast-ball.png", 83, 801876, 1);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/Machamp-gigaton-ball.png", 68, 611957, 100);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/Machoke-gigaton-ball.png", 67, 611957, 100);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/Machop-gigaton-ball.png", 66, 611957, 100);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/Magnemite-gigaton-ball.png", 81, 611957, 100);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/Magneton-gigaton-ball.png", 82, 611957, 100);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/Slowpoke-fast-ball.png", 79, 801876, 48);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/absol_Regular_none_1792424917318.png", 359, 330279, 63);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/arrokuda_Regular_none_1792424917770.png", 846, 999056, 20);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/azelf_Regular_none_1792424918264.png", 482, 330279, 70);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/bisharp_Regular_none_1792424918722.png", 625, 330279, 48);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/budew_Regular_none_1792424919162.png", 406, 999056, 9);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/buneary_Regular_none_1792424919615.png", 427, 999056, 60);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/bunnelby_Regular_none_1792424920096.png", 659, 260338, 8);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/buzzwole_Regular_none_1792424920562.png", 794, 330279, 70);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/calyrex_Regular_none_1792424921051.png", 898, 999056, 80);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/centiskorch_Regular_none_1792424921522.png", 851, 330279, 29);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/charjabug_Regular_none_1792424921973.png", 737, 431290, 20);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/charmander_Regular_none_1792424922423.png", 4, 768144, 5);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/cherubi_Regular_none_1792424922878.png", 420, 330279, 60);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/cottonee_Regular_none_1792424923397.png", 546, 105260, 1);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/cottonee_Regular_none_1792424923843.png", 546, 105260, 1);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/cramorant_Regular_none_1792424924277.png", 845, 999056, 40);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/cubone_Regular_none_1792424924758.png", 104, 330279, 60);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/delibird_Regular_none_1792424925212.png", 225, 330279, 40);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/dracovish_Regular_none_1792424925673.png", 882, 299694, 10);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/dreepy_Regular_none_1792424926124.png", 885, 894064, 1);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/dusclops_Regular_none_1792424926621.png", 356, 999056, 39);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/electrike_Regular_none_1792424927083.png", 309, 330279, 22);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/electrike_Regular_none_1792424927528.png", 309, 330279, 22);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/eternatus_Regular_Shiny_none_1792424927959.png", 890, 221118, 100);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/eternatus_Regular_none_1792424928413.png", 890, 999056, 62);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/ferroseed_Regular_none_1792424928886.png", 597, 972741, 1);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/fletchling_Regular_none_1792424929346.png", 661, 186292, 1);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/gastly_Regular_none_1792424929814.png", 92, 999056, 27);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/gible_Regular_none_1792424930272.png", 443, 136887, 1);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/gible_Regular_none_1792424930703.png", 443, 136887, 1);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/golurk_Regular_none_1792424931148.png", 623, 330279, 38);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/golurk_Regular_none_1792424931632.png", 623, 330279, 38);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/goodra_Regular_none_1792424932092.png", 706, 847242, 51);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/grookey_Regular_none_1792424932537.png", 810, 209651, 5);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/gurdurr_Regular_none_1792424932986.png", 533, 999056, 39);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/gyarados_Regular_none_1792424933448.png", 130, 999056, 20);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/hattrem_Regular_none_1792424933893.png", 857, 999056, 38);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/hattrem_Regular_none_1792424934353.png", 857, 999056, 34);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/haunter_Regular_none_1792424934828.png", 93, 999056, 34);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/honedge_Regular_none_1792424935285.png", 679, 717895, 1);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/jellicent_Regular_none_1792424935736.png", 593, 999056, 41);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/keldeo_Regular_Shiny_none_1792424936178.png", 647, 250212, 50);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/linoone_Regular_none_1792424936621.png", 264, 330279, 20);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/litten_Regular_none_1792424937059.png", 725, 395385, 1);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/litten_Regular_none_1792424937516.png", 725, 395385, 1);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/machoke_Regular_none_1792424937960.png", 67, 999056, 30);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/machoke_Regular_none_1792424938413.png", 67, 999056, 29);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/machop_Regular_none_1792424938862.png", 66, 999056, 14);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/magearna_Regular_none_1792424939321.png", 801, 768144, 50);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/magikarp_Regular_none_1792424939790.png", 129, 773808, 1);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/melmetal_Regular_none_1792424940261.png", 809, 808809, 100);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/melmetal_Regular_none_1792424940711.png", 809, 808809, 100);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/meowth_Regular_none_1792424941158.png", 52, 494288, 5);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/meowth_Regular_none_1792424941611.png", 52, 999056, 23);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/metapod_Regular_none_1792424942051.png", 11, 113125, 25);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/milcery_Regular_none_1792424942492.png", 868, 558526, 1);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/mime-jr_Regular_none_1792424942964.png", 439, 330279, 1);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/mudkip_Regular_none_1792424943412.png", 258, 228890, 1);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/nidoking_Regular_none_1792424943853.png", 34, 330279, 57);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/nidoran-f_Regular_none_1792424944297.png", 29, 910654, 1);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/nidoran-m_Regular_none_1792424944756.png", 32, 330279, 60);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/ninjask_Regular_none_1792424945199.png", 291, 999056, 21);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/noibat_Regular_none_1792424945647.png", 714, 999056, 23);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/orbeetle_Regular_none_1792424946083.png", 826, 330279, 60);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/pangoro_Regular_none_1792424946529.png", 675, 330279, 32);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/pikachu_Regular_none_1792424946978.png", 25, 200212, 5);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/poliwhirl_Regular_none_1792424947416.png", 61, 330279, 60);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/pumpkaboo_Regular_none_1792424947882.png", 710, 999056, 14);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/purrloin_Regular_none_1792424948321.png", 509, 999056, 10);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/ralts_Regular_none_1792424948769.png", 280, 237114, 1);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/rapidash_Regular_none_1792424949229.png", 78, 330279, 41);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/remoraid_Regular_none_1792424949680.png", 223, 999056, 42);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/rhydon_Regular_none_1792424950146.png", 112, 999056, 41);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/rookidee_Regular_none_1792424950592.png", 821, 330279, 6);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/rotom_Regular_none_1792424951021.png", 479, 768144, 5);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/sandaconda_Regular_none_1792424951459.png", 844, 330279, 60);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/sandslash_Regular_none_1792424951934.png", 28, 32955, 47);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/scorbunny_Regular_none_1792424952390.png", 813, 209651, 5);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/seismitoad_Regular_none_1792424952847.png", 537, 330279, 61);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/sharpedo_Regular_none_1792424953289.png", 319, 330279, 60);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/shellos_Regular_none_1792424953738.png", 422, 25232, 1);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/shiinotic_Regular_none_1792424954189.png", 756, 330279, 39);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/sizzlipede_Regular_none_1792424954668.png", 850, 330279, 1);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/sizzlipede_Regular_none_1792424955123.png", 850, 330279, 1);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/sizzlipede_Regular_none_1792424955582.png", 850, 624848, 1);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/skwovet_Regular_none_1792424956033.png", 819, 330279, 24);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/slowpoke_Regular_none_1792424956466.png", 79, 330279, 16);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/snover_Regular_none_1792424956935.png", 459, 999056, 26);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/sobble_Regular_none_1792424957377.png", 816, 209651, 5);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/stunfisk_Regular_none_1792424957817.png", 618, 330279, 25);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/stunfisk_Regular_none_1792424958276.png", 618, 330279, 25);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/tapu-bulu_Regular_none_1792424958716.png", 787, 330279, 70);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/tapu-lele_Regular_none_1792424959172.png", 786, 330279, 70);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/timburr_Regular_none_1792424959640.png", 532, 999056, 13);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/timburr_Regular_none_1792424960105.png", 532, 330279, 20);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/timburr_Regular_none_1792424960552.png", 532, 999056, 13);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/timburr_Regular_none_1792424960992.png", 532, 330279, 20);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/timburr_Regular_none_1792424961449.png", 532, 999056, 13);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/toxapex_Regular_none_1792424961906.png", 748, 330279, 55);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/toxtricity_Regular_none_1792424962375.png", 849, 999056, 60);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/tranquill_Regular_none_1792424962829.png", 520, 330279, 22);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/tympole_Regular_none_1792424963266.png", 535, 999056, 11);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/vanillish_Regular_none_1792424963705.png", 583, 999056, 38);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/vanillish_Regular_none_1792424964155.png", 583, 999056, 38);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/vulpix_Regular_none_1792424964627.png", 37, 330279, 24);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/vulpix_Regular_none_1792424965074.png", 37, 999056, 24);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/wishiwashi_Regular_none_1792424965509.png", 746, 330279, 22);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/wobbuffet_Regular_none_1792424965947.png", 202, 330279, 60);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/wynaut_Regular_none_1792424966405.png", 360, 330279, 1);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/zarude_Regular_none_1792424966858.png", 893, 201225, 70);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/zarude_Regular_none_1792424967363.png", 893, 210915, 70);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/zigzagoon_Regular_none_1792424967861.png", 263, 330279, 7);
+    database.add<Test_SummaryReader_Numbers>("PokemonHome/SummaryScreen/zigzagoon_Regular_none_1792424968351.png", 263, 999056, 20);
+    
+    //Text
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/annihilape_Regular.png", "Hardy", "Inner Focus", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/bidoof_Regular.png", "Lonely", "Simple", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/bulbasaur_Regular.png", "Relaxed", "", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/bulbasuar_Shiny_Go.png", "Lonely", "", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/bulbasuar_Shiny_Lza.png", "Sassy", "", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/capskid_Regular.png", "Sassy", "Insomnia", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/castform_Regular.png", "Modest", "Forecast", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/cyclizar_Regular.png", "Impish", "Shed Skin", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/dudunsparce_Regular.png", "Calm", "Rattled", Language::German);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/dudunsparce_Regular_Sv.png", "Relaxed", "Serene Grace", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/enamorus_Shiny.png", "Naive", "", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/gimmighoul_Regular.png", "Quiet", "Rattled", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/glimmet_Regular.png", "Naive", "Toxic Debris", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/gogoat_Regular.png", "Quirky", "Sap Sipper", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/greatTusk_Shiny.png", "Adamant", "Protosynthesis", Language::ChineseSimplified);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/hatterne_Regular.png", "Quiet", "Healer", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/houndstone_Regular.png", "Bold", "Sand Rush", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/ironBunde_Regular.png", "Careful", "Quark Drive", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/ironBundle_Regular_Sv.png", "Calm", "Quark Drive", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/ironJugulis_Regular.png", "Docile", "Quark Drive", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/ironThorns_Regular.png", "Careful", "Quark Drive", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/kilowattrel_Regular.png", "Impish", "Volt Absorb", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/kingler_Shiny.png", "Lonely", "Sheer Force", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/komala_Regular.png", "Gentle", "Comatose", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/krabby_Shiny.png", "Hasty", "Hyper Cutter", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/machamp_Regular.png", "Bold", "Guts", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/pancham_Shiny.png", "Naive", "Iron Fist", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/rapidash_Regular.png", "Calm", "", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/rellor_Regular.png", "Hasty", "Compound Eyes", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/riolu_Regular.png", "Rash", "", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/rowlet_ShinyAlpha.png", "Rash", "", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/scovillain_Regular.png", "Timid", "Insomnia", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/slitherWing_Shiny.png", "Adamant", "Protosynthesis", Language::ChineseSimplified);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/squirtle_Shiny.png", "Quiet", "Torrent", Language::German);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/tapuLele_Shiny.png", "Sassy", "Psychic Surge", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/tatsugiri_Regular.png", "Rash", "Commander", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/teddiursa_Regular.png", "Mild", "", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/terapagos_regular.png", "Hardy", "Tera Shift", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/vulpix_Regular.png", "Naughty", "Flash Fire", Language::German);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/vulpix_Shiny.png", "Jolly", "Flash Fire", Language::German);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/wartortle_Regular.png", "Brave", "Torrent", Language::German);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/wurmple_Regular.png", "Sassy", "Shield Dust", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/GBA-Origin-ElgatoHD60Pro-NV12.png", "Gentle", "Shed Skin", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/GBA-Origin-ElgatoHD60Pro-YUYV.png", "Gentle", "Shed Skin", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/Farfetchd-fast-ball.png", "Jolly", "Steadfast", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/Machamp-gigaton-ball.png", "Mild", "", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/Machoke-gigaton-ball.png", "Hardy", "", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/Machop-gigaton-ball.png", "Hasty", "", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/Magnemite-gigaton-ball.png", "Hardy", "", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/Magneton-gigaton-ball.png", "Timid", "", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/Slowpoke-fast-ball.png", "Sassy", "Regenerator", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/absol_Regular_none_1792424917318.png", "Calm", "Super Luck", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/arrokuda_Regular_none_1792424917770.png", "Sassy", "Swift Swim", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/azelf_Regular_none_1792424918264.png", "Calm", "Levitate", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/bisharp_Regular_none_1792424918722.png", "Gentle", "Pressure", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/budew_Regular_none_1792424919162.png", "Careful", "Natural Cure", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/buneary_Regular_none_1792424919615.png", "Mild", "Run Away", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/bunnelby_Regular_none_1792424920096.png", "Lax", "Pickup", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/buzzwole_Regular_none_1792424920562.png", "Docile", "Beast Boost", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/calyrex_Regular_none_1792424921051.png", "Impish", "Unnerve", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/centiskorch_Regular_none_1792424921522.png", "Bashful", "White Smoke", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/charjabug_Regular_none_1792424921973.png", "Adamant", "Battery", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/charmander_Regular_none_1792424922423.png", "Timid", "Solar Power", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/cherubi_Regular_none_1792424922878.png", "Bashful", "Chlorophyll", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/cottonee_Regular_none_1792424923397.png", "Modest", "Infiltrator", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/cottonee_Regular_none_1792424923843.png", "Modest", "Infiltrator", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/cramorant_Regular_none_1792424924277.png", "Hasty", "Gulp Missile", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/cubone_Regular_none_1792424924758.png", "Modest", "Rock Head", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/delibird_Regular_none_1792424925212.png", "Naughty", "Insomnia", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/dracovish_Regular_none_1792424925673.png", "Naive", "Water Absorb", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/dreepy_Regular_none_1792424926124.png", "Jolly", "Clear Body", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/dusclops_Regular_none_1792424926621.png", "Careful", "Pressure", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/electrike_Regular_none_1792424927083.png", "Lonely", "Lightning Rod", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/electrike_Regular_none_1792424927528.png", "Lonely", "Lightning Rod", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/eternatus_Regular_Shiny_none_1792424927959.png", "Timid", "Pressure", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/eternatus_Regular_none_1792424928413.png", "Jolly", "Pressure", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/ferroseed_Regular_none_1792424928886.png", "Brave", "Iron Barbs", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/fletchling_Regular_none_1792424929346.png", "Bold", "Big Pecks", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/gastly_Regular_none_1792424929814.png", "Quirky", "Levitate", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/gible_Regular_none_1792424930272.png", "Hasty", "Sand Veil", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/gible_Regular_none_1792424930703.png", "Hasty", "Sand Veil", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/golurk_Regular_none_1792424931148.png", "Rash", "Iron Fist", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/golurk_Regular_none_1792424931632.png", "Rash", "Iron Fist", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/goodra_Regular_none_1792424932092.png", "Modest", "Hydration", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/grookey_Regular_none_1792424932537.png", "Adamant", "Grassy Surge", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/gurdurr_Regular_none_1792424932986.png", "Modest", "Guts", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/gyarados_Regular_none_1792424933448.png", "Serious", "Intimidate", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/hattrem_Regular_none_1792424933893.png", "Hardy", "Anticipation", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/hattrem_Regular_none_1792424934353.png", "Mild", "Anticipation", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/haunter_Regular_none_1792424934828.png", "Calm", "Levitate", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/honedge_Regular_none_1792424935285.png", "Adamant", "No Guard", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/jellicent_Regular_none_1792424935736.png", "Modest", "Water Absorb", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/keldeo_Regular_Shiny_none_1792424936178.png", "Modest", "Justified", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/linoone_Regular_none_1792424936621.png", "Bold", "Pickup", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/litten_Regular_none_1792424937059.png", "Adamant", "Blaze", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/litten_Regular_none_1792424937516.png", "Adamant", "Blaze", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/machoke_Regular_none_1792424937960.png", "Bold", "Guts", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/machoke_Regular_none_1792424938413.png", "Jolly", "Guts", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/machop_Regular_none_1792424938862.png", "Sassy", "Guts", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/magearna_Regular_none_1792424939321.png", "Mild", "Soul-Heart", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/magikarp_Regular_none_1792424939790.png", "Gentle", "Swift Swim", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/melmetal_Regular_none_1792424940261.png", "Brave", "Iron Fist", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/melmetal_Regular_none_1792424940711.png", "Brave", "Iron Fist", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/meowth_Regular_none_1792424941158.png", "Mild", "Rattled", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/meowth_Regular_none_1792424941611.png", "Rash", "Tough Claws", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/metapod_Regular_none_1792424942051.png", "Impish", "Shed Skin", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/milcery_Regular_none_1792424942492.png", "Calm", "Aroma Veil", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/mime-jr_Regular_none_1792424942964.png", "Naive", "", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/mudkip_Regular_none_1792424943412.png", "Calm", "Damp", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/nidoking_Regular_none_1792424943853.png", "Timid", "Sheer Force", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/nidoran-f_Regular_none_1792424944297.png", "Lax", "Rivalry", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/nidoran-m_Regular_none_1792424944756.png", "Mild", "Poison Point", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/ninjask_Regular_none_1792424945199.png", "Naughty", "Speed Boost", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/noibat_Regular_none_1792424945647.png", "Quiet", "Frisk", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/orbeetle_Regular_none_1792424946083.png", "Bashful", "Telepathy", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/pangoro_Regular_none_1792424946529.png", "Bold", "Mold Breaker", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/pikachu_Regular_none_1792424946978.png", "Hardy", "", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/poliwhirl_Regular_none_1792424947416.png", "Mild", "Damp", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/pumpkaboo_Regular_none_1792424947882.png", "Serious", "Frisk", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/purrloin_Regular_none_1792424948321.png", "Lonely", "Limber", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/ralts_Regular_none_1792424948769.png", "Timid", "Trace", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/rapidash_Regular_none_1792424949229.png", "Adamant", "Pastel Veil", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/remoraid_Regular_none_1792424949680.png", "Rash", "Sniper", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/rhydon_Regular_none_1792424950146.png", "Calm", "Rock Head", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/rookidee_Regular_none_1792424950592.png", "Timid", "Unnerve", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/rotom_Regular_none_1792424951021.png", "Timid", "Levitate", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/sandaconda_Regular_none_1792424951459.png", "Lonely", "Shed Skin", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/sandslash_Regular_none_1792424951934.png", "Naughty", "Sand Veil", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/scorbunny_Regular_none_1792424952390.png", "Jolly", "Libero", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/seismitoad_Regular_none_1792424952847.png", "Modest", "Poison Touch", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/sharpedo_Regular_none_1792424953289.png", "Quirky", "Rough Skin", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/shellos_Regular_none_1792424953738.png", "Relaxed", "Storm Drain", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/shiinotic_Regular_none_1792424954189.png", "Jolly", "Effect Spore", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/sizzlipede_Regular_none_1792424954668.png", "Naughty", "Flash Fire", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/sizzlipede_Regular_none_1792424955123.png", "Docile", "Flash Fire", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/sizzlipede_Regular_none_1792424955582.png", "Quiet", "Flash Fire", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/skwovet_Regular_none_1792424956033.png", "Bold", "Cheek Pouch", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/slowpoke_Regular_none_1792424956466.png", "Bold", "Own Tempo", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/snover_Regular_none_1792424956935.png", "Bashful", "Snow Warning", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/sobble_Regular_none_1792424957377.png", "Modest", "Sniper", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/stunfisk_Regular_none_1792424957817.png", "Modest", "Mimicry", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/stunfisk_Regular_none_1792424958276.png", "Modest", "Mimicry", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/tapu-bulu_Regular_none_1792424958716.png", "Brave", "Grassy Surge", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/tapu-lele_Regular_none_1792424959172.png", "Hasty", "Psychic Surge", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/timburr_Regular_none_1792424959640.png", "Mild", "Sheer Force", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/timburr_Regular_none_1792424960105.png", "Hardy", "Guts", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/timburr_Regular_none_1792424960552.png", "Mild", "Sheer Force", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/timburr_Regular_none_1792424960992.png", "Hardy", "Guts", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/timburr_Regular_none_1792424961449.png", "Mild", "Sheer Force", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/toxapex_Regular_none_1792424961906.png", "Gentle", "Regenerator", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/toxtricity_Regular_none_1792424962375.png", "Sassy", "Plus", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/tranquill_Regular_none_1792424962829.png", "Docile", "Super Luck", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/tympole_Regular_none_1792424963266.png", "Brave", "Swift Swim", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/vanillish_Regular_none_1792424963705.png", "Lonely", "Ice Body", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/vanillish_Regular_none_1792424964155.png", "Lonely", "Ice Body", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/vulpix_Regular_none_1792424964627.png", "Rash", "Flash Fire", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/vulpix_Regular_none_1792424965074.png", "Lonely", "Flash Fire", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/wishiwashi_Regular_none_1792424965509.png", "Hasty", "Schooling", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/wobbuffet_Regular_none_1792424965947.png", "Lax", "Shadow Tag", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/wynaut_Regular_none_1792424966405.png", "Relaxed", "Shadow Tag", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/zarude_Regular_none_1792424966858.png", "Adamant", "Leaf Guard", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/zarude_Regular_none_1792424967363.png", "Adamant", "Leaf Guard", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/zigzagoon_Regular_none_1792424967861.png", "Adamant", "Pickup", Language::English);
+    database.add<Test_SummaryReader_Text>("PokemonHome/SummaryScreen/zigzagoon_Regular_none_1792424968351.png", "Lonely", "Gluttony", Language::English);
+
+    //OT Name
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/annihilape_Regular.png", "da1t0n", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/bidoof_Regular.png", "h1karu", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/bulbasaur_Regular.png", "kev1n", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/bulbasuar_Shiny_Go.png", "kev1n", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/bulbasuar_Shiny_Lza.png", "zazuba", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/capskid_Regular.png", "da1t0n", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/castform_Regular.png", "kr0n0s", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/cyclizar_Regular.png", "da1t0n", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/dudunsparce_Regular.png", "bj0rn", Language::German);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/dudunsparce_Regular_Sv.png", "mythra", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/enamorus_Shiny.png", "h0me", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/gimmighoul_Regular.png", "da1t0n", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/glimmet_Regular.png", "da1t0n", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/gogoat_Regular.png", "このは", Language::Japanese);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/greatTusk_Shiny.png", "yam1", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/hatterne_Regular.png", "hunter", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/houndstone_Regular.png", "da1t0n", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/ironBunde_Regular.png", "t0r1", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/ironBundle_Regular_Sv.png", "da1t0n", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/ironJugulis_Regular.png", "da1t0n", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/ironThorns_Regular.png", "da1t0n", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/kilowattrel_Regular.png", "da1t0n", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/kingler_Shiny.png", "maarxx1e", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/komala_Regular.png", "da1t0n", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/krabby_Shiny.png", "maarxx1e", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/machamp_Regular.png", "g10r1a", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/pancham_Shiny.png", "m00n", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/rapidash_Regular.png", "emmy", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/rellor_Regular.png", "da1t0n", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/riolu_Regular.png", "b0nd", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/rowlet_ShinyAlpha.png", "akar1", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/scovillain_Regular.png", "da1t0n", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/slitherWing_Shiny.png", "yam1", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/squirtle_Shiny.png", "puppycat1012", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/tapuLele_Shiny.png", "aka1a", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/tatsugiri_Regular.png", "da1t0n", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/teddiursa_Regular.png", "コウ", Language::Japanese);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/terapagos_regular.png", "da1t0n", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/vulpix_Regular.png", "bj0rn", Language::German);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/vulpix_Shiny.png", "m00n", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/wartortle_Regular.png", "ru", Language::German);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/wurmple_Regular.png", "r0n", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/GBA-Origin-ElgatoHD60Pro-NV12.png", "da1t0n", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/GBA-Origin-ElgatoHD60Pro-YUYV.png", "da1t0n", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/Farfetchd-fast-ball.png", "1javy", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/Machamp-gigaton-ball.png", "1javy", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/Machoke-gigaton-ball.png", "1javy", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/Machop-gigaton-ball.png", "1javy", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/Magnemite-gigaton-ball.png", "1javy", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/Magneton-gigaton-ball.png", "1javy", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/Slowpoke-fast-ball.png", "1javy", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/absol_Regular_none_1792424917318.png", "kev1n", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/arrokuda_Regular_none_1792424917770.png", "kev1n", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/azelf_Regular_none_1792424918264.png", "kev1n", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/bisharp_Regular_none_1792424918722.png", "kev1n", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/budew_Regular_none_1792424919162.png", "kev1n", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/buneary_Regular_none_1792424919615.png", "kev1n", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/bunnelby_Regular_none_1792424920096.png", "beg0", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/buzzwole_Regular_none_1792424920562.png", "kev1n", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/calyrex_Regular_none_1792424921051.png", "kev1n", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/centiskorch_Regular_none_1792424921522.png", "kev1n", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/charjabug_Regular_none_1792424921973.png", "dak0ta", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/charmander_Regular_none_1792424922423.png", "zazuba", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/cherubi_Regular_none_1792424922878.png", "kev1n", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/cottonee_Regular_none_1792424923397.png", "いすも", Language::Japanese);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/cottonee_Regular_none_1792424923843.png", "いすも", Language::Japanese);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/cramorant_Regular_none_1792424924277.png", "kev1n", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/cubone_Regular_none_1792424924758.png", "kev1n", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/delibird_Regular_none_1792424925212.png", "kev1n", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/dracovish_Regular_none_1792424925673.png", "magg1e", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/dreepy_Regular_none_1792424926124.png", "しよう", Language::Japanese);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/dusclops_Regular_none_1792424926621.png", "kev1n", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/electrike_Regular_none_1792424927083.png", "kev1n", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/electrike_Regular_none_1792424927528.png", "kev1n", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/eternatus_Regular_Shiny_none_1792424927959.png", "ga1ar", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/eternatus_Regular_none_1792424928413.png", "kev1n", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/ferroseed_Regular_none_1792424928886.png", "とと", Language::Japanese);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/fletchling_Regular_none_1792424929346.png", "har00n", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/gastly_Regular_none_1792424929814.png", "kev1n", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/gible_Regular_none_1792424930272.png", "0", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/gible_Regular_none_1792424930703.png", "0", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/golurk_Regular_none_1792424931148.png", "kev1n", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/golurk_Regular_none_1792424931632.png", "kev1n", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/goodra_Regular_none_1792424932092.png", "bagg1ns", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/grookey_Regular_none_1792424932537.png", "zazuba2", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/gurdurr_Regular_none_1792424932986.png", "kev1n", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/gyarados_Regular_none_1792424933448.png", "kev1n", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/hattrem_Regular_none_1792424933893.png", "kev1n", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/hattrem_Regular_none_1792424934353.png", "kev1n", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/haunter_Regular_none_1792424934828.png", "kev1n", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/honedge_Regular_none_1792424935285.png", "かなて", Language::Japanese);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/jellicent_Regular_none_1792424935736.png", "kev1n", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/keldeo_Regular_Shiny_none_1792424936178.png", "h0me", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/linoone_Regular_none_1792424936621.png", "kev1n", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/litten_Regular_none_1792424937059.png", "1e1nad", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/litten_Regular_none_1792424937516.png", "1e1nad", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/machoke_Regular_none_1792424937960.png", "kev1n", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/machoke_Regular_none_1792424938413.png", "kev1n", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/machop_Regular_none_1792424938862.png", "kev1n", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/magearna_Regular_none_1792424939321.png", "zazuba", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/magikarp_Regular_none_1792424939790.png", "dark", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/melmetal_Regular_none_1792424940261.png", "h0me", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/melmetal_Regular_none_1792424940711.png", "h0me", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/meowth_Regular_none_1792424941158.png", "fen1xz", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/meowth_Regular_none_1792424941611.png", "kev1n", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/metapod_Regular_none_1792424942051.png", "taka0", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/milcery_Regular_none_1792424942492.png", "agu", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/mime-jr_Regular_none_1792424942964.png", "kev1n", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/mudkip_Regular_none_1792424943412.png", "cha0s", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/nidoking_Regular_none_1792424943853.png", "kev1n", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/nidoran-f_Regular_none_1792424944297.png", "ユウリ", Language::Japanese);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/nidoran-m_Regular_none_1792424944756.png", "kev1n", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/ninjask_Regular_none_1792424945199.png", "kev1n", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/noibat_Regular_none_1792424945647.png", "kev1n", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/orbeetle_Regular_none_1792424946083.png", "kev1n", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/pangoro_Regular_none_1792424946529.png", "kev1n", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/pikachu_Regular_none_1792424946978.png", "h0me", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/poliwhirl_Regular_none_1792424947416.png", "kev1n", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/pumpkaboo_Regular_none_1792424947882.png", "kev1n", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/purrloin_Regular_none_1792424948321.png", "kev1n", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/ralts_Regular_none_1792424948769.png", "우리", Language::Korean);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/rapidash_Regular_none_1792424949229.png", "kev1n", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/remoraid_Regular_none_1792424949680.png", "kev1n", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/rhydon_Regular_none_1792424950146.png", "kev1n", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/rookidee_Regular_none_1792424950592.png", "kev1n", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/rotom_Regular_none_1792424951021.png", "zazuba", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/sandaconda_Regular_none_1792424951459.png", "kev1n", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/sandslash_Regular_none_1792424951934.png", "raym0nd", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/scorbunny_Regular_none_1792424952390.png", "zazuba2", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/seismitoad_Regular_none_1792424952847.png", "kev1n", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/sharpedo_Regular_none_1792424953289.png", "kev1n", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/shellos_Regular_none_1792424953738.png", "2de", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/shiinotic_Regular_none_1792424954189.png", "kev1n", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/sizzlipede_Regular_none_1792424954668.png", "kev1n", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/sizzlipede_Regular_none_1792424955123.png", "kev1n", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/sizzlipede_Regular_none_1792424955582.png", "ka1t0", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/skwovet_Regular_none_1792424956033.png", "kev1n", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/slowpoke_Regular_none_1792424956466.png", "kev1n", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/snover_Regular_none_1792424956935.png", "kev1n", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/sobble_Regular_none_1792424957377.png", "zazuba2", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/stunfisk_Regular_none_1792424957817.png", "kev1n", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/stunfisk_Regular_none_1792424958276.png", "kev1n", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/tapu-bulu_Regular_none_1792424958716.png", "kev1n", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/tapu-lele_Regular_none_1792424959172.png", "kev1n", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/timburr_Regular_none_1792424959640.png", "kev1n", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/timburr_Regular_none_1792424960105.png", "kev1n", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/timburr_Regular_none_1792424960552.png", "kev1n", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/timburr_Regular_none_1792424960992.png", "kev1n", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/timburr_Regular_none_1792424961449.png", "kev1n", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/toxapex_Regular_none_1792424961906.png", "kev1n", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/toxtricity_Regular_none_1792424962375.png", "kev1n", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/tranquill_Regular_none_1792424962829.png", "kev1n", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/tympole_Regular_none_1792424963266.png", "kev1n", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/vanillish_Regular_none_1792424963705.png", "kev1n", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/vanillish_Regular_none_1792424964155.png", "kev1n", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/vulpix_Regular_none_1792424964627.png", "kev1n", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/vulpix_Regular_none_1792424965074.png", "kev1n", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/wishiwashi_Regular_none_1792424965509.png", "kev1n", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/wobbuffet_Regular_none_1792424965947.png", "kev1n", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/wynaut_Regular_none_1792424966405.png", "kev1n", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/zarude_Regular_none_1792424966858.png", "jung1e", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/zarude_Regular_none_1792424967363.png", "jung1e", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/zigzagoon_Regular_none_1792424967861.png", "kev1n", Language::English);
+    database.add<Test_SummaryReader_OtName>("PokemonHome/SummaryScreen/zigzagoon_Regular_none_1792424968351.png", "kev1n", Language::English);
+    
+    // Language of Origin
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/annihilape_Regular.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/bidoof_Regular.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/bulbasaur_Regular.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/bulbasuar_Shiny_Go.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/bulbasuar_Shiny_Lza.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/capskid_Regular.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/castform_Regular.png", "ITA");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/cyclizar_Regular.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/dudunsparce_Regular.png", "DEU");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/dudunsparce_Regular_Sv.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/enamorus_Shiny.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/gimmighoul_Regular.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/glimmet_Regular.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/gogoat_Regular.png", "JPN");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/greatTusk_Shiny.png", "CHS");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/hatterne_Regular.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/houndstone_Regular.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/ironBunde_Regular.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/ironBundle_Regular_Sv.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/ironJugulis_Regular.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/ironThorns_Regular.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/kilowattrel_Regular.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/kingler_Shiny.png", "ITA");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/komala_Regular.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/krabby_Shiny.png", "ITA");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/machamp_Regular.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/pancham_Shiny.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/rapidash_Regular.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/rellor_Regular.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/riolu_Regular.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/rowlet_ShinyAlpha.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/scovillain_Regular.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/slitherWing_Shiny.png", "CHS");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/squirtle_Shiny.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/tapuLele_Shiny.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/tatsugiri_Regular.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/teddiursa_Regular.png", "JPN");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/terapagos_regular.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/vulpix_Regular.png", "DEU");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/vulpix_Shiny.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/wartortle_Regular.png", "DEU");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/wurmple_Regular.png", "FRA");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/GBA-Origin-ElgatoHD60Pro-NV12.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/GBA-Origin-ElgatoHD60Pro-YUYV.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/Farfetchd-fast-ball.png", "ES-ES");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/Machamp-gigaton-ball.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/Machoke-gigaton-ball.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/Machop-gigaton-ball.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/Magnemite-gigaton-ball.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/Magneton-gigaton-ball.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/Slowpoke-fast-ball.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/absol_Regular_none_1792424917318.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/arrokuda_Regular_none_1792424917770.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/azelf_Regular_none_1792424918264.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/bisharp_Regular_none_1792424918722.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/budew_Regular_none_1792424919162.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/buneary_Regular_none_1792424919615.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/bunnelby_Regular_none_1792424920096.png", "ES-ES");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/buzzwole_Regular_none_1792424920562.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/calyrex_Regular_none_1792424921051.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/centiskorch_Regular_none_1792424921522.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/charjabug_Regular_none_1792424921973.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/charmander_Regular_none_1792424922423.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/cherubi_Regular_none_1792424922878.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/cottonee_Regular_none_1792424923397.png", "JPN");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/cottonee_Regular_none_1792424923843.png", "JPN");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/cramorant_Regular_none_1792424924277.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/cubone_Regular_none_1792424924758.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/delibird_Regular_none_1792424925212.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/dracovish_Regular_none_1792424925673.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/dreepy_Regular_none_1792424926124.png", "JPN");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/dusclops_Regular_none_1792424926621.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/electrike_Regular_none_1792424927083.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/electrike_Regular_none_1792424927528.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/eternatus_Regular_Shiny_none_1792424927959.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/eternatus_Regular_none_1792424928413.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/ferroseed_Regular_none_1792424928886.png", "JPN");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/fletchling_Regular_none_1792424929346.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/gastly_Regular_none_1792424929814.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/gible_Regular_none_1792424930272.png", "JPN");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/gible_Regular_none_1792424930703.png", "JPN");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/golurk_Regular_none_1792424931148.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/golurk_Regular_none_1792424931632.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/goodra_Regular_none_1792424932092.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/grookey_Regular_none_1792424932537.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/gurdurr_Regular_none_1792424932986.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/gyarados_Regular_none_1792424933448.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/hattrem_Regular_none_1792424933893.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/hattrem_Regular_none_1792424934353.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/haunter_Regular_none_1792424934828.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/honedge_Regular_none_1792424935285.png", "JPN");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/jellicent_Regular_none_1792424935736.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/keldeo_Regular_Shiny_none_1792424936178.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/linoone_Regular_none_1792424936621.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/litten_Regular_none_1792424937059.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/litten_Regular_none_1792424937516.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/machoke_Regular_none_1792424937960.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/machoke_Regular_none_1792424938413.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/machop_Regular_none_1792424938862.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/magearna_Regular_none_1792424939321.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/magikarp_Regular_none_1792424939790.png", "ES-ES");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/melmetal_Regular_none_1792424940261.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/melmetal_Regular_none_1792424940711.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/meowth_Regular_none_1792424941158.png", "ES-ES");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/meowth_Regular_none_1792424941611.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/metapod_Regular_none_1792424942051.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/milcery_Regular_none_1792424942492.png", "JPN");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/mime-jr_Regular_none_1792424942964.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/mudkip_Regular_none_1792424943412.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/nidoking_Regular_none_1792424943853.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/nidoran-f_Regular_none_1792424944297.png", "JPN");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/nidoran-m_Regular_none_1792424944756.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/ninjask_Regular_none_1792424945199.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/noibat_Regular_none_1792424945647.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/orbeetle_Regular_none_1792424946083.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/pangoro_Regular_none_1792424946529.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/pikachu_Regular_none_1792424946978.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/poliwhirl_Regular_none_1792424947416.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/pumpkaboo_Regular_none_1792424947882.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/purrloin_Regular_none_1792424948321.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/ralts_Regular_none_1792424948769.png", "KOR");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/rapidash_Regular_none_1792424949229.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/remoraid_Regular_none_1792424949680.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/rhydon_Regular_none_1792424950146.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/rookidee_Regular_none_1792424950592.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/rotom_Regular_none_1792424951021.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/sandaconda_Regular_none_1792424951459.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/sandslash_Regular_none_1792424951934.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/scorbunny_Regular_none_1792424952390.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/seismitoad_Regular_none_1792424952847.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/sharpedo_Regular_none_1792424953289.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/shellos_Regular_none_1792424953738.png", "JPN");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/shiinotic_Regular_none_1792424954189.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/sizzlipede_Regular_none_1792424954668.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/sizzlipede_Regular_none_1792424955123.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/sizzlipede_Regular_none_1792424955582.png", "ITA");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/skwovet_Regular_none_1792424956033.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/slowpoke_Regular_none_1792424956466.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/snover_Regular_none_1792424956935.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/sobble_Regular_none_1792424957377.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/stunfisk_Regular_none_1792424957817.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/stunfisk_Regular_none_1792424958276.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/tapu-bulu_Regular_none_1792424958716.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/tapu-lele_Regular_none_1792424959172.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/timburr_Regular_none_1792424959640.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/timburr_Regular_none_1792424960105.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/timburr_Regular_none_1792424960552.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/timburr_Regular_none_1792424960992.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/timburr_Regular_none_1792424961449.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/toxapex_Regular_none_1792424961906.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/toxtricity_Regular_none_1792424962375.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/tranquill_Regular_none_1792424962829.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/tympole_Regular_none_1792424963266.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/vanillish_Regular_none_1792424963705.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/vanillish_Regular_none_1792424964155.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/vulpix_Regular_none_1792424964627.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/vulpix_Regular_none_1792424965074.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/wishiwashi_Regular_none_1792424965509.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/wobbuffet_Regular_none_1792424965947.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/wynaut_Regular_none_1792424966405.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/zarude_Regular_none_1792424966858.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/zarude_Regular_none_1792424967363.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/zigzagoon_Regular_none_1792424967861.png", "ENG");
+    database.add<Test_SummaryReader_LanguageOfOrigin>("PokemonHome/SummaryScreen/zigzagoon_Regular_none_1792424968351.png", "ENG");
+
+}
+    
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_SummaryReader.h b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_SummaryReader.h
new file mode 100644
index 0000000000..8000508973
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_SummaryReader.h
@@ -0,0 +1,51 @@
+/*  Pokemon Home Summary Reader
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonHome_SummaryReader_H
+#define PokemonAutomation_PokemonHome_SummaryReader_H
+
+#include <string>
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "Common/Cpp/Logging/AbstractLogger.h"
+#include "CommonFramework/Language.h"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonHome{
+
+class SummaryReader{
+public:
+    SummaryReader(Color color = COLOR_RED);
+
+    void make_overlays(VideoOverlaySet& items) const;
+
+    int read_national_dex(Logger& logger, const ImageViewRGB32& screen) const;
+    int read_original_trainer_id(Logger& logger, const ImageViewRGB32& screen) const;
+    std::string read_original_trainer_name(Language language, const ImageViewRGB32& screen) const;
+    std::string read_nature(Logger& logger, Language language, const ImageViewRGB32& screen) const;
+    std::string read_ability(Logger& logger, Language language, const ImageViewRGB32& screen) const;
+    std::string read_language_of_origin(const ImageViewRGB32& screen) const;
+    int read_level(Logger& logger, const ImageViewRGB32& screen) const;
+
+private:
+    Color m_color;
+    ImageFloatBox m_national_dex_number_box;
+    ImageFloatBox m_level_box;
+    ImageFloatBox m_original_trainer_id_box;
+    ImageFloatBox m_original_trainer_name_box;
+    ImageFloatBox m_nature_box;
+    ImageFloatBox m_ability_box;
+    ImageFloatBox m_language_of_origin_box;
+};
+
+void add_tests_SummaryReader(UnitTestDatabase& database);
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_SummaryScreenDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_SummaryScreenDetector.cpp
new file mode 100644
index 0000000000..82babb7285
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_SummaryScreenDetector.cpp
@@ -0,0 +1,226 @@
+/*  Button Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <string>
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "Tests/ImageUnitTest.h"
+#include "Tests/TestUtils.h"
+#include "VideoGames/PokemonHome/Inference/PokemonHome_ButtonDetector.h"
+#include "PokemonHome_SummaryScreenDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonHome{
+
+
+SummaryScreenDetector::SummaryScreenDetector(VideoOverlay* overlay) 
+    : m_button_B_detector(COLOR_BLACK, ButtonType::ButtonB, { 0.100, 0.956, 0.107, 0.041 }, overlay){}
+
+void SummaryScreenDetector::make_overlays(VideoOverlaySet& items) const{
+    m_button_B_detector.make_overlays(items);
+}
+
+bool SummaryScreenDetector::detect(const ImageViewRGB32& screen){
+    return m_button_B_detector.detect(screen);
+}
+
+
+class Test_SummaryScreenDetector : public ImageUnitTest{
+public:
+
+    Test_SummaryScreenDetector(
+        const std::string& image,
+        bool expected
+    )
+        : ImageUnitTest("PokemonHome::SummaryScreenDetector - " + image, {image})
+        , m_expected(expected)
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        DummyVideoOverlay overlay;
+        SummaryScreenDetector detector(&overlay);
+        const ImageRGB32& image = images[0];
+        return detector.detect(image) == m_expected;
+    };
+
+private:
+    bool m_expected;
+};
+
+void add_tests_SummaryScreenDetector(UnitTestDatabase& database){
+    database.add<Test_SummaryScreenDetector>("PokemonHome/BoxView/BoxView-1.png", false);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/annihilape_Regular.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/bidoof_Regular.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/bulbasaur_Regular.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/bulbasuar_Shiny_Go.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/bulbasuar_Shiny_Lza.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/capskid_Regular.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/castform_Regular.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/cyclizar_Regular.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/dudunsparce_Regular.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/dudunsparce_Regular_Sv.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/enamorus_Shiny.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/gimmighoul_Regular.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/glimmet_Regular.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/gogoat_Regular.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/greatTusk_Shiny.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/hatterne_Regular.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/houndstone_Regular.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/ironBunde_Regular.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/ironBundle_Regular_Sv.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/ironJugulis_Regular.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/ironThorns_Regular.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/kilowattrel_Regular.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/kingler_Shiny.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/komala_Regular.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/krabby_Shiny.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/machamp_Regular.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/pancham_Shiny.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/rapidash_Regular.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/rellor_Regular.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/riolu_Regular.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/rowlet_ShinyAlpha.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/scovillain_Regular.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/slitherWing_Shiny.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/squirtle_Shiny.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/tapuLele_Shiny.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/tatsugiri_Regular.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/teddiursa_Regular.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/terapagos_regular.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/vulpix_Regular.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/vulpix_Shiny.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/wartortle_Regular.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/wurmple_Regular.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/GBA-Origin-ElgatoHD60Pro-NV12.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/GBA-Origin-ElgatoHD60Pro-YUYV.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/Farfetchd-fast-ball.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/Machamp-gigaton-ball.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/Machoke-gigaton-ball.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/Machop-gigaton-ball.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/Magnemite-gigaton-ball.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/Magneton-gigaton-ball.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/Slowpoke-fast-ball.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/absol_Regular_none_1792424917318.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/arrokuda_Regular_none_1792424917770.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/azelf_Regular_none_1792424918264.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/bisharp_Regular_none_1792424918722.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/budew_Regular_none_1792424919162.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/buneary_Regular_none_1792424919615.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/bunnelby_Regular_none_1792424920096.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/buzzwole_Regular_none_1792424920562.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/calyrex_Regular_none_1792424921051.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/centiskorch_Regular_none_1792424921522.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/charjabug_Regular_none_1792424921973.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/charmander_Regular_none_1792424922423.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/cherubi_Regular_none_1792424922878.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/cottonee_Regular_none_1792424923397.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/cottonee_Regular_none_1792424923843.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/cramorant_Regular_none_1792424924277.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/cubone_Regular_none_1792424924758.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/delibird_Regular_none_1792424925212.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/dracovish_Regular_none_1792424925673.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/dreepy_Regular_none_1792424926124.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/dusclops_Regular_none_1792424926621.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/electrike_Regular_none_1792424927083.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/electrike_Regular_none_1792424927528.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/eternatus_Regular_Shiny_none_1792424927959.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/eternatus_Regular_none_1792424928413.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/ferroseed_Regular_none_1792424928886.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/fletchling_Regular_none_1792424929346.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/gastly_Regular_none_1792424929814.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/gible_Regular_none_1792424930272.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/gible_Regular_none_1792424930703.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/golurk_Regular_none_1792424931148.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/golurk_Regular_none_1792424931632.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/goodra_Regular_none_1792424932092.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/grookey_Regular_none_1792424932537.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/gurdurr_Regular_none_1792424932986.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/gyarados_Regular_none_1792424933448.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/hattrem_Regular_none_1792424933893.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/hattrem_Regular_none_1792424934353.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/haunter_Regular_none_1792424934828.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/honedge_Regular_none_1792424935285.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/jellicent_Regular_none_1792424935736.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/keldeo_Regular_Shiny_none_1792424936178.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/linoone_Regular_none_1792424936621.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/litten_Regular_none_1792424937059.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/litten_Regular_none_1792424937516.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/machoke_Regular_none_1792424937960.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/machoke_Regular_none_1792424938413.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/machop_Regular_none_1792424938862.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/magearna_Regular_none_1792424939321.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/magikarp_Regular_none_1792424939790.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/melmetal_Regular_none_1792424940261.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/melmetal_Regular_none_1792424940711.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/meowth_Regular_none_1792424941158.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/meowth_Regular_none_1792424941611.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/metapod_Regular_none_1792424942051.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/milcery_Regular_none_1792424942492.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/mime-jr_Regular_none_1792424942964.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/mudkip_Regular_none_1792424943412.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/nidoking_Regular_none_1792424943853.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/nidoran-f_Regular_none_1792424944297.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/nidoran-m_Regular_none_1792424944756.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/ninjask_Regular_none_1792424945199.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/noibat_Regular_none_1792424945647.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/orbeetle_Regular_none_1792424946083.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/pangoro_Regular_none_1792424946529.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/pikachu_Regular_none_1792424946978.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/poliwhirl_Regular_none_1792424947416.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/pumpkaboo_Regular_none_1792424947882.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/purrloin_Regular_none_1792424948321.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/ralts_Regular_none_1792424948769.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/rapidash_Regular_none_1792424949229.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/remoraid_Regular_none_1792424949680.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/rhydon_Regular_none_1792424950146.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/rookidee_Regular_none_1792424950592.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/rotom_Regular_none_1792424951021.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/sandaconda_Regular_none_1792424951459.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/sandslash_Regular_none_1792424951934.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/scorbunny_Regular_none_1792424952390.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/seismitoad_Regular_none_1792424952847.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/sharpedo_Regular_none_1792424953289.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/shellos_Regular_none_1792424953738.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/shiinotic_Regular_none_1792424954189.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/sizzlipede_Regular_none_1792424954668.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/sizzlipede_Regular_none_1792424955123.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/sizzlipede_Regular_none_1792424955582.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/skwovet_Regular_none_1792424956033.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/slowpoke_Regular_none_1792424956466.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/snover_Regular_none_1792424956935.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/sobble_Regular_none_1792424957377.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/stunfisk_Regular_none_1792424957817.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/stunfisk_Regular_none_1792424958276.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/tapu-bulu_Regular_none_1792424958716.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/tapu-lele_Regular_none_1792424959172.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/timburr_Regular_none_1792424959640.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/timburr_Regular_none_1792424960105.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/timburr_Regular_none_1792424960552.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/timburr_Regular_none_1792424960992.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/timburr_Regular_none_1792424961449.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/toxapex_Regular_none_1792424961906.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/toxtricity_Regular_none_1792424962375.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/tranquill_Regular_none_1792424962829.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/tympole_Regular_none_1792424963266.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/vanillish_Regular_none_1792424963705.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/vanillish_Regular_none_1792424964155.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/vulpix_Regular_none_1792424964627.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/vulpix_Regular_none_1792424965074.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/wishiwashi_Regular_none_1792424965509.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/wobbuffet_Regular_none_1792424965947.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/wynaut_Regular_none_1792424966405.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/zarude_Regular_none_1792424966858.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/zarude_Regular_none_1792424967363.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/zigzagoon_Regular_none_1792424967861.png", true);
+    database.add<Test_SummaryScreenDetector>("PokemonHome/SummaryScreen/zigzagoon_Regular_none_1792424968351.png", true);
+}
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_SummaryScreenDetector.h b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_SummaryScreenDetector.h
new file mode 100644
index 0000000000..38b1415e12
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_SummaryScreenDetector.h
@@ -0,0 +1,45 @@
+/*  Summary Screen Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonHome_SummaryScreenDetector_H
+#define PokemonAutomation_PokemonHome_SummaryScreenDetector_H
+
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/VisualDetector.h"
+#include "VideoGames/PokemonHome/Inference/PokemonHome_ButtonDetector.h"
+
+namespace PokemonAutomation{
+class Logger;
+namespace NintendoSwitch{
+namespace PokemonHome{
+
+class SummaryScreenDetector : public StaticScreenDetector{
+public:
+    SummaryScreenDetector(VideoOverlay* overlay = nullptr);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+    virtual void reset_state() override { m_button_B_detector.reset_state(); }
+
+private:
+    ButtonDetector m_button_B_detector;
+
+};
+class SummaryScreenWatcher : public DetectorToFinder<SummaryScreenDetector>{
+public:
+    SummaryScreenWatcher(VideoOverlay* overlay = nullptr)
+        : DetectorToFinder("SummaryScreenWatcher", Milliseconds(100), overlay)
+    {}
+};
+
+void add_tests_SummaryScreenDetector(UnitTestDatabase& database);
+
+}
+}
+}
+#endif
\ No newline at end of file
diff --git a/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_TeraTypeReader.cpp b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_TeraTypeReader.cpp
new file mode 100644
index 0000000000..ab2aee0c28
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_TeraTypeReader.cpp
@@ -0,0 +1,500 @@
+/*  Tera Type Reader
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Kernels/Waterfill/Kernels_Waterfill.h"
+#include "CommonFramework/GlobalAutoPaths.h"
+#include "CommonFramework/ImageTools/ImageStats.h"
+#include "CommonTools/ImageMatch/ExactImageMatcher.h"
+#include "CommonTools/Images/ImageFilter.h"
+#include "CommonTools/Images/BinaryImage_FilterRgb32.h"
+#include "Tests/ImageUnitTest.h"
+#include "Pokemon/Pokemon_Types.h"
+#include "PokemonHome_GigantamaxDetector.h"
+#include "PokemonHome_TeraTypeReader.h"
+
+namespace PokemonAutomation {
+namespace NintendoSwitch {
+namespace PokemonHome {
+
+using namespace Kernels;
+using namespace Kernels::Waterfill;
+using Pokemon::PokemonTeraType;
+using Pokemon::POKEMON_TERA_TYPE_SLUGS;
+
+namespace {
+
+class TypeSprite {
+public:
+    TypeSprite(const std::string& slug, const std::string& resource_location)
+        : m_slug(slug)
+    {
+        ImageRGB32 sprite(RESOURCE_PATH() + resource_location);
+
+        sprite = filter_rgb32_range(
+            sprite,
+            0xff000000, 0xffffffff,
+            Color(0), false
+        );
+
+        PackedBinaryMatrix matrix = compress_rgb32_to_binary_min(sprite, 224, 224, 224);
+        std::vector<WaterfillObject> objects = find_objects_inplace(matrix, 10);
+
+        WaterfillObject object;
+        for (const WaterfillObject& item : objects){
+            object.merge_assume_no_overlap(item);
+        }
+
+        m_aspect_ratio = object.aspect_ratio();
+        m_matcher = std::make_unique<ImageMatch::WeightedExactImageMatcher>(
+            sprite.sub_image(object.min_x, object.min_y, object.width(), object.height()).copy(),
+            ImageMatch::WeightedExactImageMatcher::InverseStddevWeight{ 1, 64 }
+        );
+    }
+
+    const std::string& slug() const { return m_slug; }
+    double aspect_ratio() const { return m_aspect_ratio; }
+    const ImageMatch::WeightedExactImageMatcher& matcher() const { return *m_matcher; }
+
+private:
+    std::string m_slug;
+    double m_aspect_ratio;
+    std::unique_ptr<ImageMatch::WeightedExactImageMatcher> m_matcher;
+};
+
+struct TeraTypeSpriteDatabase {
+    std::map<PokemonTeraType, TypeSprite> m_type_map;
+
+    static TeraTypeSpriteDatabase& instance(){
+        static TeraTypeSpriteDatabase data;
+        return data;
+    }
+
+    TeraTypeSpriteDatabase(){
+        for (const auto& item : POKEMON_TERA_TYPE_SLUGS()){
+            if (item.first == PokemonTeraType::NONE){
+                continue;
+            }
+            m_type_map.emplace(item.first, TypeSprite(item.second, "PokemonHome/TeraTypes/" + item.second + ".png"));
+        }
+    }
+};
+
+size_t distance_sqr(const ImagePixelBox& a, const ImagePixelBox& b){
+    bool overlap_x = a.min_x <= b.max_x && b.min_x <= a.max_x;
+    bool overlap_y = a.min_y <= b.max_y && b.min_y <= a.max_y;
+    if (overlap_x && overlap_y){
+        return 0;
+    }
+
+    size_t dist_x = 0;
+    if (!overlap_x){
+        dist_x = a.max_x < b.min_x
+            ? b.min_x - a.max_x
+            : a.min_x - b.max_x;
+    }
+
+    size_t dist_y = 0;
+    if (!overlap_y){
+        dist_y = a.max_y < b.min_y
+            ? b.min_y - a.max_y
+            : a.min_y - b.max_y;
+    }
+
+    return dist_x * dist_x + dist_y * dist_y;
+}
+
+bool image_validation(const ImageViewRGB32& image){
+    size_t width = image.width();
+    size_t height = image.height();
+    if (width * height < 100){
+        return false;
+    }
+    if (width > 3 * height){
+        return false;
+    }
+    if (height > 3 * width){
+        return false;
+    }
+    ImageStats stats = image_stats(image);
+    if (stats.stddev.sum() < 50){
+        return false;
+    }
+
+    return true;
+}
+
+std::pair<double, PokemonTeraType> match_tera_type_symbol(const ImageViewRGB32& image){
+    if (!image_validation(image)){
+        return { 1.0, PokemonTeraType::NONE };
+    }
+
+    size_t width = image.width();
+    size_t height = image.height();
+
+    double aspect_ratio = (double)width / height;
+
+    const std::map<PokemonTeraType, TypeSprite>* type_sprite_map = &TeraTypeSpriteDatabase::instance().m_type_map;
+
+    double best_score = 0.45;
+    PokemonTeraType best_type = PokemonTeraType::NONE;
+    for (const auto& item : *type_sprite_map){
+        double expected_aspect_ratio = item.second.aspect_ratio();
+        double ratio = aspect_ratio / expected_aspect_ratio;
+
+        if (std::abs(ratio - 1) > 0.2){
+            continue;
+        }
+
+        double rmsd_alpha = item.second.matcher().diff(image);
+
+        if (best_score > rmsd_alpha){
+            best_score = rmsd_alpha;
+            best_type = item.first;
+        }
+    }
+
+    return { best_score, best_type };
+}
+
+void find_tera_type_symbol_candidates(
+    std::multimap<double, std::pair<PokemonTeraType, ImagePixelBox>>& candidates,
+    const ImageViewPlanar32& original_screen,
+    const ImageViewRGB32& image,
+    PackedBinaryMatrix& matrix,
+    double max_area_ratio
+){
+    size_t max_area = (size_t)(image.width() * image.height() * max_area_ratio);
+    std::vector<WaterfillObject> objects = find_objects_inplace(
+        matrix,
+        (size_t)(18. * original_screen.total_pixels() / (1920 * 1080))
+    );
+
+    std::map<size_t, WaterfillObject> objmap;
+    for (size_t c = 0; c < objects.size(); c++){
+        if (objects[c].area > max_area){
+            continue;
+        }
+        objmap[c] = objects[c];
+    }
+
+    bool changed;
+    do{
+        changed = false;
+        for (auto iter0 = objmap.begin(); iter0 != objmap.end(); ++iter0){
+            for (auto iter1 = objmap.begin(); iter1 != objmap.end();){
+                if (iter0->first >= iter1->first){
+                    ++iter1;
+                    continue;
+                }
+                const WaterfillObject& obj0 = iter0->second;
+                const WaterfillObject& obj1 = iter1->second;
+                size_t distance = distance_sqr(
+                    ImagePixelBox(obj0.min_x, obj0.min_y, obj0.max_x, obj0.max_y),
+                    ImagePixelBox(obj1.min_x, obj1.min_y, obj1.max_x, obj1.max_y)
+                );
+                if (distance < 5 * 5){
+                    iter0->second.merge_assume_no_overlap(iter1->second);
+                    iter1 = objmap.erase(iter1);
+                    changed = true;
+                }else{
+                    ++iter1;
+                }
+            }
+        }
+    }
+    while (changed);
+
+    for (const auto& item : objmap){
+        ImageViewRGB32 img = extract_box_reference(image, item.second);
+
+        std::pair<double, PokemonTeraType> result = match_tera_type_symbol(img);
+        if (result.second != PokemonTeraType::NONE){
+            const WaterfillObject& obj = item.second;
+            candidates.emplace(
+                result.first,
+                std::pair<PokemonTeraType, ImagePixelBox>(
+                    result.second,
+                    ImagePixelBox(obj.min_x, obj.min_y, obj.max_x, obj.max_y)
+                )
+            );
+        }
+    }
+}
+
+}
+
+std::multimap<double, std::pair<PokemonTeraType, ImagePixelBox>> find_tera_type_symbols(
+    const ImageViewPlanar32& original_screen,
+    const ImageViewRGB32& image,
+    double max_area_ratio
+){
+    std::multimap<double, std::pair<PokemonTeraType, ImagePixelBox>> candidates;
+
+    {
+        std::vector<PackedBinaryMatrix> matrices = compress_rgb32_to_binary_range(
+            image,
+            {
+                {0xff808060, 0xffffffff},
+                {0xffa0a060, 0xffffffff},
+                {0xff606060, 0xffffffff},
+                {0xff707070, 0xffffffff},
+                {0xff808080, 0xffffffff},
+                {0xff909090, 0xffffffff},
+                {0xffa0a0a0, 0xffffffff},
+                {0xffb0b0b0, 0xffffffff},
+                {0xffc0c0c0, 0xffffffff},
+                {0xffd0d0d0, 0xffffffff},
+                {0xffd8d8d8, 0xffffffff},
+                {0xffe0e0e0, 0xffffffff},
+            }
+                );
+        for (PackedBinaryMatrix& matrix : matrices){
+            find_tera_type_symbol_candidates(candidates, original_screen, image, matrix, max_area_ratio);
+        }
+    }
+
+    std::multimap<double, std::pair<PokemonTeraType, ImagePixelBox>> filtered;
+    for (const auto& candidate : candidates){
+        bool is_dupe = false;
+        for (const auto& item : filtered){
+            if (distance_sqr(candidate.second.second, item.second.second) == 0){
+                is_dupe = true;
+                break;
+            }
+        }
+        if (!is_dupe){
+            filtered.emplace(candidate);
+        }
+    }
+
+    return filtered;
+}
+
+PokemonTeraType read_pokemon_tera_type(
+    const ImageViewRGB32& original_screen,
+    const ImageFloatBox& box
+){
+    GigantamaxDetector gmax_detector(COLOR_RED, nullptr, box);
+    if (gmax_detector.detect(original_screen)){
+        return PokemonTeraType::NONE;
+    }
+
+    ImageViewRGB32 image = extract_box_reference(original_screen, box);
+
+    std::multimap<double, std::pair<PokemonTeraType, ImagePixelBox>> filtered = find_tera_type_symbols(
+        original_screen,
+        image,
+        0.20
+    );
+
+    if (filtered.empty()){
+        return PokemonTeraType::NONE;
+    }
+
+    return filtered.begin()->second.first;
+}
+
+class Test_TeraTypeReader : public ImageUnitTest{
+public:
+
+    Test_TeraTypeReader(
+        const std::string& image,
+        PokemonTeraType expected
+    )
+        : ImageUnitTest("PokemonHome::TeraTypeReader - " + image, {image})
+        , m_expected(expected)
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        const ImageRGB32& image = images[0];
+        PokemonTeraType result = read_pokemon_tera_type(image);
+        
+        if (result == m_expected)
+            return true;
+
+        return "Expected: " + POKEMON_TERA_TYPE_SLUGS().get_string(m_expected) + ", received: " + POKEMON_TERA_TYPE_SLUGS().get_string(result);
+    };
+
+private:
+    PokemonTeraType m_expected;
+};
+
+//TODO: Missing multiple positive test cases for TeraTypeReader.
+void add_tests_TeraTypeReader(UnitTestDatabase& database){
+    database.add<Test_TeraTypeReader>("PokemonHome/BoxView/BoxView-1.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/annihilape_Regular.png", PokemonTeraType::ICE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/bidoof_Regular.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/bulbasaur_Regular.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/bulbasuar_Shiny_Go.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/bulbasuar_Shiny_Lza.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/capskid_Regular.png", PokemonTeraType::GRASS);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/castform_Regular.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/cyclizar_Regular.png", PokemonTeraType::FAIRY);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/dudunsparce_Regular.png", PokemonTeraType::DARK);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/dudunsparce_Regular_Sv.png", PokemonTeraType::NORMAL);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/enamorus_Shiny.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/gimmighoul_Regular.png", PokemonTeraType::GHOST);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/glimmet_Regular.png", PokemonTeraType::ELECTRIC);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/gogoat_Regular.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/greatTusk_Shiny.png", PokemonTeraType::STEEL);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/hatterne_Regular.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/houndstone_Regular.png", PokemonTeraType::GROUND);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/ironBunde_Regular.png", PokemonTeraType::WATER);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/ironBundle_Regular_Sv.png", PokemonTeraType::WATER);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/ironJugulis_Regular.png", PokemonTeraType::FLYING);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/ironThorns_Regular.png", PokemonTeraType::ROCK);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/kilowattrel_Regular.png", PokemonTeraType::POISON);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/kingler_Shiny.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/komala_Regular.png", PokemonTeraType::PSYCHIC);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/krabby_Shiny.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/machamp_Regular.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/pancham_Shiny.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/rapidash_Regular.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/rellor_Regular.png", PokemonTeraType::BUG);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/riolu_Regular.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/rowlet_ShinyAlpha.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/scovillain_Regular.png", PokemonTeraType::FIRE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/slitherWing_Shiny.png", PokemonTeraType::FIGHTING);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/squirtle_Shiny.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/tapuLele_Shiny.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/tatsugiri_Regular.png", PokemonTeraType::DRAGON);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/teddiursa_Regular.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/terapagos_regular.png", PokemonTeraType::STELLAR);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/vulpix_Regular.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/vulpix_Shiny.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/wartortle_Regular.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/wurmple_Regular.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/GBA-Origin-ElgatoHD60Pro-NV12.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/GBA-Origin-ElgatoHD60Pro-YUYV.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/Farfetchd-fast-ball.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/Machamp-gigaton-ball.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/Machoke-gigaton-ball.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/Machop-gigaton-ball.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/Magnemite-gigaton-ball.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/Magneton-gigaton-ball.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/Slowpoke-fast-ball.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/absol_Regular_none_1792424917318.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/arrokuda_Regular_none_1792424917770.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/azelf_Regular_none_1792424918264.png", PokemonTeraType::PSYCHIC);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/bisharp_Regular_none_1792424918722.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/budew_Regular_none_1792424919162.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/buneary_Regular_none_1792424919615.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/bunnelby_Regular_none_1792424920096.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/buzzwole_Regular_none_1792424920562.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/calyrex_Regular_none_1792424921051.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/centiskorch_Regular_none_1792424921522.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/charjabug_Regular_none_1792424921973.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/charmander_Regular_none_1792424922423.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/cherubi_Regular_none_1792424922878.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/cottonee_Regular_none_1792424923397.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/cottonee_Regular_none_1792424923843.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/cramorant_Regular_none_1792424924277.png", PokemonTeraType::FLYING);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/cubone_Regular_none_1792424924758.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/delibird_Regular_none_1792424925212.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/dracovish_Regular_none_1792424925673.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/dreepy_Regular_none_1792424926124.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/dusclops_Regular_none_1792424926621.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/electrike_Regular_none_1792424927083.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/electrike_Regular_none_1792424927528.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/eternatus_Regular_Shiny_none_1792424927959.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/eternatus_Regular_none_1792424928413.png", PokemonTeraType::POISON);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/ferroseed_Regular_none_1792424928886.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/fletchling_Regular_none_1792424929346.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/gastly_Regular_none_1792424929814.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/gible_Regular_none_1792424930272.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/gible_Regular_none_1792424930703.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/golurk_Regular_none_1792424931148.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/golurk_Regular_none_1792424931632.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/goodra_Regular_none_1792424932092.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/grookey_Regular_none_1792424932537.png", PokemonTeraType::GRASS);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/gurdurr_Regular_none_1792424932986.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/gyarados_Regular_none_1792424933448.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/hattrem_Regular_none_1792424933893.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/hattrem_Regular_none_1792424934353.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/haunter_Regular_none_1792424934828.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/honedge_Regular_none_1792424935285.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/jellicent_Regular_none_1792424935736.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/keldeo_Regular_Shiny_none_1792424936178.png", PokemonTeraType::WATER);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/linoone_Regular_none_1792424936621.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/litten_Regular_none_1792424937059.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/litten_Regular_none_1792424937516.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/machoke_Regular_none_1792424937960.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/machoke_Regular_none_1792424938413.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/machop_Regular_none_1792424938862.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/magearna_Regular_none_1792424939321.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/magikarp_Regular_none_1792424939790.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/melmetal_Regular_none_1792424940261.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/melmetal_Regular_none_1792424940711.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/meowth_Regular_none_1792424941158.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/meowth_Regular_none_1792424941611.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/metapod_Regular_none_1792424942051.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/milcery_Regular_none_1792424942492.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/mime-jr_Regular_none_1792424942964.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/mudkip_Regular_none_1792424943412.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/nidoking_Regular_none_1792424943853.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/nidoran-f_Regular_none_1792424944297.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/nidoran-m_Regular_none_1792424944756.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/ninjask_Regular_none_1792424945199.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/noibat_Regular_none_1792424945647.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/orbeetle_Regular_none_1792424946083.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/pangoro_Regular_none_1792424946529.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/pikachu_Regular_none_1792424946978.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/poliwhirl_Regular_none_1792424947416.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/pumpkaboo_Regular_none_1792424947882.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/purrloin_Regular_none_1792424948321.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/ralts_Regular_none_1792424948769.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/rapidash_Regular_none_1792424949229.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/remoraid_Regular_none_1792424949680.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/rhydon_Regular_none_1792424950146.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/rookidee_Regular_none_1792424950592.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/rotom_Regular_none_1792424951021.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/sandaconda_Regular_none_1792424951459.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/sandslash_Regular_none_1792424951934.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/scorbunny_Regular_none_1792424952390.png", PokemonTeraType::FIRE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/seismitoad_Regular_none_1792424952847.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/sharpedo_Regular_none_1792424953289.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/shellos_Regular_none_1792424953738.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/shiinotic_Regular_none_1792424954189.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/sizzlipede_Regular_none_1792424954668.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/sizzlipede_Regular_none_1792424955123.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/sizzlipede_Regular_none_1792424955582.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/skwovet_Regular_none_1792424956033.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/slowpoke_Regular_none_1792424956466.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/snover_Regular_none_1792424956935.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/sobble_Regular_none_1792424957377.png", PokemonTeraType::WATER);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/stunfisk_Regular_none_1792424957817.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/stunfisk_Regular_none_1792424958276.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/tapu-bulu_Regular_none_1792424958716.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/tapu-lele_Regular_none_1792424959172.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/timburr_Regular_none_1792424959640.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/timburr_Regular_none_1792424960105.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/timburr_Regular_none_1792424960552.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/timburr_Regular_none_1792424960992.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/timburr_Regular_none_1792424961449.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/toxapex_Regular_none_1792424961906.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/toxtricity_Regular_none_1792424962375.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/tranquill_Regular_none_1792424962829.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/tympole_Regular_none_1792424963266.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/vanillish_Regular_none_1792424963705.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/vanillish_Regular_none_1792424964155.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/vulpix_Regular_none_1792424964627.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/vulpix_Regular_none_1792424965074.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/wishiwashi_Regular_none_1792424965509.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/wobbuffet_Regular_none_1792424965947.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/wynaut_Regular_none_1792424966405.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/zarude_Regular_none_1792424966858.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/zarude_Regular_none_1792424967363.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/zigzagoon_Regular_none_1792424967861.png", PokemonTeraType::NONE);
+    database.add<Test_TeraTypeReader>("PokemonHome/SummaryScreen/zigzagoon_Regular_none_1792424968351.png", PokemonTeraType::NONE);
+
+}
+
+}
+}
+}
\ No newline at end of file
diff --git a/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_TeraTypeReader.h b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_TeraTypeReader.h
new file mode 100644
index 0000000000..260cc5018b
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonHome/Inference/PokemonHome_TeraTypeReader.h
@@ -0,0 +1,39 @@
+/*  Tera Type Reader
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonHome_TeraTypeReader_H
+#define PokemonAutomation_PokemonHome_TeraTypeReader_H
+
+#include <map>
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "Pokemon/Pokemon_Types.h"
+
+namespace PokemonAutomation {
+namespace NintendoSwitch {
+namespace PokemonHome {
+
+//  Find all tera type symbols inside the image.
+std::multimap<double, std::pair<Pokemon::PokemonTeraType, ImagePixelBox>> find_tera_type_symbols(
+    const ImageViewPlanar32& original_screen,
+    const ImageViewRGB32& image,
+    double max_area_ratio
+);
+
+// Reads the tera type of a Pokemon.
+Pokemon::PokemonTeraType read_pokemon_tera_type(
+    const ImageViewRGB32& original_screen,
+    const ImageFloatBox& box = ImageFloatBox(0.463, 0.09, 0.04, 0.06)
+);
+
+void add_tests_TeraTypeReader(UnitTestDatabase& database);
+
+}
+}
+}
+
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonHome/PokemonHome_Panels.cpp b/SerialPrograms/Source/VideoGames/PokemonHome/PokemonHome_Panels.cpp
new file mode 100644
index 0000000000..f9b2b9d08e
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonHome/PokemonHome_Panels.cpp
@@ -0,0 +1,65 @@
+/*  Pokemon Home Panels
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/StaticGlobals.h"
+#include "CommonFramework/GlobalAutoPaths.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "PokemonHome_Panels.h"
+
+#include "Programs/PokemonHome_PageSwap.h"
+#include "Programs/PokemonHome_BoxSorter.h"
+#include "Programs/PokemonHome_BoxSorterLivingDex.h"
+#include "Programs/PokemonHome_GenerateNameOCR.h"
+
+#include "Programs/TestPrograms/PokemonHome_ReadSummaryScreen.h"
+#include "Programs/TestPrograms/PokemonHome_TestDatabaseGenerator.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonHome{
+
+
+
+PanelListFactory::PanelListFactory()
+    : PanelListDescriptor(
+        Pokemon::STRING_POKEMON + " Home",
+        RESOURCE_PATH() + "CategoryIcons/PokemonHome.png"
+    )
+{}
+
+std::vector<PanelEntry> PanelListFactory::make_panels() const{
+    std::vector<PanelEntry> ret;
+
+//    ret.emplace_back("---- Settings ----");
+//    ret.emplace_back(make_settings<GameSettings_Descriptor, GameSettingsPanel>());
+    ret.emplace_back("---- General ----");
+    ret.emplace_back(make_SingleSwitchProgram<PokemonHome::PageSwap>());
+    ret.emplace_back(make_SingleSwitchProgram<PokemonHome::BoxSorter>());
+    ret.emplace_back(make_SingleSwitchProgram<PokemonHome::BoxSorterLivingDex>());
+    if (IS_BETA_VERSION || STATIC_GLOBALS.DEVELOPER_MODE){
+    }
+//    ret.emplace_back("---- Trading ----");
+
+//    ret.emplace_back("---- Farming ----");
+
+//    ret.emplace_back("---- Shiny Hunting ----");
+
+    if (STATIC_GLOBALS.DEVELOPER_MODE){
+        ret.emplace_back("---- Developer Tools ----");
+        ret.emplace_back(make_SingleSwitchProgram<PokemonHome::GenerateNameOCRData>());
+        ret.emplace_back(make_SingleSwitchProgram<PokemonHome::ReadSummaryScreen>());
+        ret.emplace_back(make_SingleSwitchProgram<PokemonHome::TestDatabaseGenerator>());
+    }
+
+    return ret;
+}
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonHome/PokemonHome_Panels.h b/SerialPrograms/Source/VideoGames/PokemonHome/PokemonHome_Panels.h
new file mode 100644
index 0000000000..adc705aad5
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonHome/PokemonHome_Panels.h
@@ -0,0 +1,30 @@
+/*  Pokemon Scarlet/Violet Panels
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonHome_Panels_H
+#define PokemonAutomation_PokemonHome_Panels_H
+
+#include "CommonFramework/Panels/PanelList.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonHome{
+
+
+
+class PanelListFactory : public PanelListDescriptor{
+public:
+    PanelListFactory();
+private:
+    virtual std::vector<PanelEntry> make_panels() const override;
+};
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonHome/PokemonHome_Settings.cpp b/SerialPrograms/Source/VideoGames/PokemonHome/PokemonHome_Settings.cpp
new file mode 100644
index 0000000000..4c0acea13b
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonHome/PokemonHome_Settings.cpp
@@ -0,0 +1,59 @@
+/*  Pokemon SV Settings
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+#include "Pokemon/Pokemon_Strings.h"
+#include "PokemonHome_Settings.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonHome{
+    using namespace Pokemon;
+
+
+
+GameSettings& GameSettings::instance(){
+    static GameSettings settings;
+    return settings;
+}
+GameSettings::GameSettings()
+    : BatchOption(LockMode::LOCK_WHILE_RUNNING)
+{
+}
+
+
+
+
+
+GameSettings_Descriptor::GameSettings_Descriptor()
+    : OptionsPanelDescriptor(
+        "PokemonHome:GlobalSettings",
+        STRING_POKEMON + " Home", STRING_POKEMON + " Settings",
+        "Programs/PokemonHome/PokemonSettings.html",
+        "Global " + STRING_POKEMON + " Settings",
+        PanelQualityStanding::OFFICIAL
+    )
+{}
+
+
+
+GameSettingsPanel::GameSettingsPanel()
+    : settings(GameSettings::instance())
+{
+    PA_ADD_OPTION(settings);
+}
+
+
+
+
+
+}
+}
+}
+
+
+
+
+
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonHome/PokemonHome_Settings.h b/SerialPrograms/Source/VideoGames/PokemonHome/PokemonHome_Settings.h
new file mode 100644
index 0000000000..e162d94c5c
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonHome/PokemonHome_Settings.h
@@ -0,0 +1,45 @@
+/*  Pokemon Home Settings
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonHome_Settings_H
+#define PokemonAutomation_PokemonHome_Settings_H
+
+#include "CommonFramework/Panels/OptionsPanel.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonHome{
+
+
+class GameSettings : public BatchOption{
+    GameSettings();
+public:
+    static GameSettings& instance();
+
+};
+
+
+
+
+class GameSettings_Descriptor : public OptionsPanelDescriptor{
+public:
+    GameSettings_Descriptor();
+};
+
+
+class GameSettingsPanel : public OptionsPanelInstance{
+public:
+    using Descriptor = GameSettings_Descriptor;
+    GameSettingsPanel();
+private:
+    GameSettings& settings;
+};
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonHome/PokemonHome_Tests.cpp b/SerialPrograms/Source/VideoGames/PokemonHome/PokemonHome_Tests.cpp
new file mode 100644
index 0000000000..0ac5e1bd97
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonHome/PokemonHome_Tests.cpp
@@ -0,0 +1,45 @@
+/*  Pokemon Home Tests
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "Inference/PokemonHome_AlphaDetector.h"
+#include "Inference/PokemonHome_BallReader.h"
+#include "Inference/PokemonHome_BoxGenderDetector.h"
+#include "Inference/PokemonHome_BoxViewDetector.h"
+#include "Inference/PokemonHome_ButtonDetector.h"
+#include "Inference/PokemonHome_GigantamaxDetector.h"
+#include "Inference/PokemonHome_OriginMarkReader.h"
+#include "Inference/PokemonHome_SelectionArrowDetector.h"
+#include "Inference/PokemonHome_ShinyDetector.h"
+#include "Inference/PokemonHome_SummaryReader.h"
+#include "Inference/PokemonHome_SummaryScreenDetector.h"
+#include "Inference/PokemonHome_TeraTypeReader.h"
+#include "PokemonHome_Tests.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonHome{
+
+
+void add_tests(UnitTestDatabase& database){
+    add_tests_AlphaDetector(database);
+    add_tests_BallReader(database);
+    add_tests_BoxGenderDetector(database);
+    add_tests_BoxViewDetector(database);
+    add_tests_ButtonDetector(database);
+    add_tests_GigantamaxDetector(database);
+    add_tests_OriginMarkReader(database);
+    add_tests_SelectionArrowDetector(database);
+    add_tests_ShinyDetector(database);
+    add_tests_SummaryReader(database);
+    add_tests_SummaryScreenDetector(database);
+    add_tests_TeraTypeReader(database);
+}
+
+
+}
+}
+}
\ No newline at end of file
diff --git a/SerialPrograms/Source/VideoGames/PokemonHome/PokemonHome_Tests.h b/SerialPrograms/Source/VideoGames/PokemonHome/PokemonHome_Tests.h
new file mode 100644
index 0000000000..83905ae9a2
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonHome/PokemonHome_Tests.h
@@ -0,0 +1,25 @@
+/*  Pokemon Home Tests
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonHome_Tests_H
+#define PokemonAutomation_PokemonHome_Tests_H
+
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonHome{
+
+
+
+void add_tests(UnitTestDatabase& database);
+
+
+
+}
+}
+}
+#endif
\ No newline at end of file
diff --git a/SerialPrograms/Source/VideoGames/PokemonHome/Programs/PokemonHome_BoxNavigation.cpp b/SerialPrograms/Source/VideoGames/PokemonHome/Programs/PokemonHome_BoxNavigation.cpp
new file mode 100644
index 0000000000..6ef0b2bd05
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonHome/Programs/PokemonHome_BoxNavigation.cpp
@@ -0,0 +1,369 @@
+/*  Home Box Navigation
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <array>
+#include <optional>
+#include <sstream>
+#include <vector>
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/ImageTools/ImageStats.h"
+#include "CommonFramework/Notifications/ProgramInfo.h"
+#include "CommonFramework/Tools/ErrorDumper.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "Pokemon/Resources/Pokemon_PokemonSlugs.h"
+#include "Pokemon/Inference/Pokemon_TypeReader.h"
+#include "VideoGames/PokemonHome/Inference/PokemonHome_BallReader.h"
+#include "VideoGames/PokemonHome/Inference/PokemonHome_AlphaDetector.h"
+#include "VideoGames/PokemonHome/Inference/PokemonHome_BoxGenderDetector.h"
+#include "VideoGames/PokemonHome/Inference/PokemonHome_GigantamaxDetector.h"
+#include "VideoGames/PokemonHome/Inference/PokemonHome_OriginMarkReader.h"
+#include "VideoGames/PokemonHome/Inference/PokemonHome_ShinyDetector.h"
+#include "VideoGames/PokemonHome/Inference/PokemonHome_SummaryReader.h"
+#include "VideoGames/PokemonHome/Inference/PokemonHome_TeraTypeReader.h"
+#include "PokemonHome_BoxNavigation.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonHome{
+using namespace Pokemon;
+
+
+// Move the red cursor to the first slot of the box
+// If the cursor is not at the first slot, move the cursor to the left and up one row at a time until it is at the first slot. 
+bool go_to_first_slot(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    Milliseconds VIDEO_DELAY
+){
+    ImageFloatBox first_slot_cursor_box(0.07, 0.15, 0.01, 0.01); //cursor position of the first slot of the box
+    VideoSnapshot screen = env.console.video().snapshot();
+    FloatPixel first_slot_cursor_color = image_stats(extract_box_reference(screen, first_slot_cursor_box)).average;
+    env.console.log("BoxCursor color detection: " + first_slot_cursor_color.to_string());
+    VideoOverlaySet BoxRender(env.console);
+    BoxRender.add(COLOR_BLUE, first_slot_cursor_box);
+
+    // If the cursor is not at the first slot
+    if (first_slot_cursor_color.r <= first_slot_cursor_color.g + first_slot_cursor_color.b){
+        bool cursor_found = false;
+        for (uint8_t rows = 0; rows < 7; rows++){
+            for (uint8_t column = 0; column < 5; column++){
+                pbf_press_dpad(context, DPAD_LEFT, 80ms, VIDEO_DELAY);
+                context.wait_for_all_requests();
+                screen = env.console.video().snapshot();
+                first_slot_cursor_color = image_stats(extract_box_reference(screen, first_slot_cursor_box)).average;
+                env.console.log("BoxCursor color detection: " + first_slot_cursor_color.to_string());
+
+                if (first_slot_cursor_color.r > first_slot_cursor_color.g + first_slot_cursor_color.b){
+                    cursor_found = true;
+                    break;
+                }
+            }
+            if (!cursor_found){
+                pbf_press_dpad(context, DPAD_UP, 80ms, VIDEO_DELAY);
+                context.wait_for_all_requests();
+                screen = env.console.video().snapshot();
+                first_slot_cursor_color = image_stats(extract_box_reference(screen, first_slot_cursor_box)).average;
+                env.console.log("BoxCursor color detection: " + first_slot_cursor_color.to_string());
+
+                if (first_slot_cursor_color.r > first_slot_cursor_color.g + first_slot_cursor_color.b){
+                    cursor_found = true;
+                    break;
+                }
+            }
+            else {
+                break;
+            }
+        }
+        if (!cursor_found){
+            return false;
+        }
+    }
+    BoxRender.clear();
+    return true;
+}
+
+//Move the cursor to the given coordinates, knowing current pos via the cursor struct
+[[nodiscard]] BoxCursor move_cursor_to(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    const BoxCursor& cur_cursor,
+    const BoxCursor& dest_cursor,
+    Milliseconds GAME_DELAY
+){
+
+    std::ostringstream ss;
+    ss << "Moving cursor from " << cur_cursor << " to " << dest_cursor;
+    env.console.log(ss.str());
+
+    // TODO: shortest path movement through pages, boxes
+    for (size_t i = cur_cursor.box; i < dest_cursor.box; ++i){
+        pbf_press_button(context, BUTTON_R, 80ms, GAME_DELAY + 240ms);
+    }
+    for (size_t i = dest_cursor.box; i < cur_cursor.box; ++i){
+        pbf_press_button(context, BUTTON_L, 80ms, GAME_DELAY + 240ms);
+    }
+
+
+    // direct nav up or down through rows
+    if (!(cur_cursor.row == 0 && dest_cursor.row == 4) && !(dest_cursor.row == 0 && cur_cursor.row == 4)){
+        for (size_t i = cur_cursor.row; i < dest_cursor.row; ++i){
+            pbf_press_dpad(context, DPAD_DOWN, 80ms, GAME_DELAY);
+        }
+        for (size_t i = dest_cursor.row; i < cur_cursor.row; ++i){
+            pbf_press_dpad(context, DPAD_UP, 80ms, GAME_DELAY);
+        }
+    }
+    else { // wrap around is faster to move between first or last row
+        if (cur_cursor.row == 0 && dest_cursor.row == 4){
+            for (size_t i = 0; i <= 2; ++i){
+                pbf_press_dpad(context, DPAD_UP, 80ms, GAME_DELAY);
+            }
+        }
+        else {
+            for (size_t i = 0; i <= 2; ++i){
+                pbf_press_dpad(context, DPAD_DOWN, 80ms, GAME_DELAY);
+            }
+        }
+    }
+
+    // direct nav forward or backward through columns
+    if ((dest_cursor.column > cur_cursor.column && dest_cursor.column - cur_cursor.column <= 3) || (cur_cursor.column > dest_cursor.column && cur_cursor.column - dest_cursor.column <= 3)){
+        for (size_t i = cur_cursor.column; i < dest_cursor.column; ++i){
+            pbf_press_dpad(context, DPAD_RIGHT, 80ms, GAME_DELAY);
+        }
+        for (size_t i = dest_cursor.column; i < cur_cursor.column; ++i){
+            pbf_press_dpad(context, DPAD_LEFT, 80ms, GAME_DELAY);
+        }
+    }
+    else { // wrap around is faster if direct movement is more than 3 away
+        if (dest_cursor.column > cur_cursor.column){
+            for (size_t i = 0; i < BOX_COLS - (dest_cursor.column - cur_cursor.column); ++i){
+                pbf_press_dpad(context, DPAD_LEFT, 80ms, GAME_DELAY);
+            }
+        }
+        if (cur_cursor.column > dest_cursor.column){
+            for (size_t i = 0; i < BOX_COLS - (cur_cursor.column - dest_cursor.column); ++i){
+                pbf_press_dpad(context, DPAD_RIGHT, 80ms, GAME_DELAY);
+            }
+        }
+    }
+
+    context.wait_for_all_requests();
+    return dest_cursor;
+}
+
+// Read current screen to find occupied and empty slots in the box.
+// Add a placeholder value for each slot in order into `boxes_data`. For empty slot the value is just std::nullopt, while
+// for the occupied slot it is an empty pokemon struct `CollectedPokemonInfo`.
+// Return the (row, col) index of the first pokemon (aka non-empty) slot in the box.
+std::array<size_t, 2> find_occupied_slots_in_box(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    std::vector<std::optional<CollectedPokemonInfo>>& boxes_data,
+    const std::vector<SortingRule>& sort_preferences)
+{
+    //BoxSorter_Descriptor::Stats& stats = env.current_stats< BoxSorter_Descriptor::Stats>();
+
+    VideoSnapshot screen = env.console.video().snapshot();
+
+    std::ostringstream ss;
+    ss << "\n";
+
+    std::array<size_t, 2> first_pokemon_slot = { SIZE_MAX, SIZE_MAX };
+
+    int num_empty_slots = 0;
+    for (size_t row = 0; row < BOX_ROWS; row++){
+        for (size_t col = 0; col < BOX_COLS; col++){
+            ImageFloatBox slot_box(0.06 + (0.072 * col), 0.2 + (0.105 * row), 0.03, 0.057);
+            int current_box_value = (int)image_stddev(extract_box_reference(screen, slot_box)).sum();
+
+            ss << current_box_value;
+
+            //checking color to know if a pokemon is on the slot or not
+            if (current_box_value < 10){
+                //stats.empty++;
+                num_empty_slots++;
+                boxes_data.push_back(std::nullopt); //empty optional to make sorting easier later
+                ss << "\u274c ";    //  "X"
+            }
+            else {
+                if (first_pokemon_slot[0] == SIZE_MAX){
+                    first_pokemon_slot = { row, col };
+                }
+                //stats.pkmn++;
+                boxes_data.push_back(
+                    CollectedPokemonInfo{
+                        .preferences = &sort_preferences
+                    }
+                ); //default initialised pokemon to know there is a pokemon here that needs a value
+                ss << "\u2705 ";    //  checkbox
+            }
+        }
+        ss << "\n";
+    }
+
+    //env.update_stats();
+    env.log(ss.str());
+    env.log_to_ui("Empty: " + std::to_string(num_empty_slots) + "/30");
+
+    return first_pokemon_slot;
+}
+
+// Read the current summary screen and assign various pokemon info into `cur_pokemon_info`
+void read_summary_screen(
+    SingleSwitchProgramEnvironment& env, 
+    CollectedPokemonInfo& cur_pokemon_info, 
+    Language ot_name_language, 
+    Language home_language
+){
+    VideoOverlaySet video_overlay_set(env.console);
+
+    ImageFloatBox pokemon_box(0.69, 0.18, 0.28, 0.46); // pokemon render pos
+    ImageFloatBox type_box(0.615, 0.240, 0.071, 0.057); // Type symbols
+    video_overlay_set.add(COLOR_DARK_BLUE, pokemon_box);
+    video_overlay_set.add(COLOR_RED, type_box);
+
+    GigantamaxDetector gmax_detector(COLOR_RED, &env.console.overlay());
+    ShinyDetector shiny_detector(COLOR_RED, &env.console.overlay());
+    AlphaDetector alpha_detector(COLOR_RED, &env.console.overlay());
+    OriginMarkReader origin_mark_reader(COLOR_RED, &env.console.overlay());
+    SummaryReader summary_reader(COLOR_RED);
+
+    gmax_detector.make_overlays(video_overlay_set);
+    shiny_detector.make_overlays(video_overlay_set);
+    alpha_detector.make_overlays(video_overlay_set);
+    origin_mark_reader.make_overlays(video_overlay_set);
+    summary_reader.make_overlays(video_overlay_set);
+    BoxGenderDetector::make_overlays(video_overlay_set);
+
+    VideoSnapshot screen = env.console.video().snapshot();
+
+    const int dex_number = summary_reader.read_national_dex(env.console, screen);
+    if (dex_number <= 0 || dex_number > static_cast<int>(NATIONAL_DEX_SLUGS().size())){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "BoxSorter Check Summary: Unable to read a correct dex number, found: " + std::to_string(dex_number),
+            env.console
+        );
+    }
+    cur_pokemon_info.dex_number = static_cast<uint16_t>(dex_number);
+    cur_pokemon_info.name_slug = NATIONAL_DEX_SLUGS()[dex_number - 1];
+
+    const bool is_shiny = shiny_detector.detect(screen);
+    cur_pokemon_info.shiny = is_shiny;
+
+    cur_pokemon_info.gmax = gmax_detector.detect(screen);
+
+    cur_pokemon_info.tera_type = read_pokemon_tera_type(screen);
+
+    const bool is_alpha = alpha_detector.detect(screen);
+    cur_pokemon_info.alpha = is_alpha;
+
+    BallReader ball_reader(env.console);
+    cur_pokemon_info.ball_slug = ball_reader.read_ball(screen);
+
+    const StatsHuntGenderFilter gender = BoxGenderDetector::detect(screen);
+    env.console.log("Gender: " + gender_to_string(gender), COLOR_GREEN);
+    cur_pokemon_info.gender = gender;
+
+    const int ot_id = summary_reader.read_original_trainer_id(env.console, screen);
+    if (ot_id < 0 || ot_id > 999'999){
+        dump_image(env.console, ProgramInfo(), "ReadSummary_OT", screen);
+    }
+    cur_pokemon_info.ot_id = ot_id;
+
+    auto [primary_type, secondary_type] = read_pokemon_types(screen, type_box, PokemonTypeGeneration::GEN9);
+
+    cur_pokemon_info.primary_type = primary_type;
+    cur_pokemon_info.secondary_type = secondary_type;
+
+    cur_pokemon_info.ot_name = summary_reader.read_original_trainer_name(
+        ot_name_language, screen
+    );
+
+    const int level = summary_reader.read_level(env.console, screen);
+    if (level < 0 || level > 100){
+        dump_image(env.console, ProgramInfo(), "ReadSummary_Level", screen);
+        env.console.log("Failed to read level from summary screen.", COLOR_RED);
+    }else{
+        cur_pokemon_info.level = static_cast<uint8_t>(level);
+    }
+
+    if (home_language != Language::None){
+        cur_pokemon_info.nature = summary_reader.read_nature(
+            env.console, home_language, screen
+        );
+        cur_pokemon_info.ability = summary_reader.read_ability(
+            env.console, home_language, screen
+        );
+    }
+
+    cur_pokemon_info.origin_mark = origin_mark_reader.read_mark(screen);
+
+    cur_pokemon_info.language_of_origin = summary_reader.read_language_of_origin(screen);
+
+    env.log_to_ui(create_overlay_info(cur_pokemon_info));
+    video_overlay_set.clear();
+
+    // NOTE edit when adding new struct members (detections go here likely)
+}
+
+void print_boxes_data(const std::vector<std::optional<CollectedPokemonInfo>>& boxes_data, SingleSwitchProgramEnvironment& env){
+    std::ostringstream ss;
+    for (const std::optional<CollectedPokemonInfo>& pokemon : boxes_data){
+        ss << pokemon << "\n";
+    }
+    env.console.log(ss.str());
+}
+
+void exit_menus(SingleSwitchProgramEnvironment& env, ProControllerContext& context, std::chrono::milliseconds video_delay){
+    VideoSnapshot screen = env.console.video().snapshot();
+    VideoOverlaySet video_overlay_set(env.console);
+
+    ImageFloatBox select_check(0.495, 0.0045, 0.01, 0.005); // square color to check which mode is active
+    FloatPixel image_value = image_stats(extract_box_reference(screen, select_check)).average;
+
+    env.console.log("Color detected from the select square: " + image_value.to_string());
+
+    //if the correct color is not detected, getting out of every possible menu to make sure the program work no matter where you start it in your pokemon home
+    video_overlay_set.add(COLOR_BLUE, select_check);
+    if (image_value.r <= image_value.g + image_value.b){
+        for (int var = 0; var < 5; ++var){
+            pbf_press_button(context, BUTTON_B, 80ms, video_delay + 80ms);
+        }
+        context.wait_for_all_requests();
+        context.wait_for(std::chrono::milliseconds(video_delay));
+        screen = env.console.video().snapshot();
+        image_value = image_stats(extract_box_reference(screen, select_check)).average;
+        env.console.log("Color detected from the select square: " + image_value.to_string());
+        if (image_value.r <= image_value.g + image_value.b){
+            for (int i = 0; i < 2; ++i){
+                pbf_press_button(context, BUTTON_ZR, 80ms, video_delay + 240ms); //additional delay because this animation is slower than the rest
+                context.wait_for_all_requests();
+                screen = env.console.video().snapshot();
+                image_value = image_stats(extract_box_reference(screen, select_check)).average;
+                env.console.log("Color detected from the select square: " + image_value.to_string());
+                if (image_value.r > image_value.g + image_value.b){
+                    break;
+                }
+                else if (i == 1){
+                    dump_image(env.console, ProgramInfo(), "SelectSquare", screen);
+                    env.console.log("ERROR: Could not find correct color mode please check color logs and timings\n", COLOR_RED);
+                    return;
+                }
+            }
+        }
+    }
+
+    video_overlay_set.clear();
+}
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonHome/Programs/PokemonHome_BoxNavigation.h b/SerialPrograms/Source/VideoGames/PokemonHome/Programs/PokemonHome_BoxNavigation.h
new file mode 100644
index 0000000000..5793e41e45
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonHome/Programs/PokemonHome_BoxNavigation.h
@@ -0,0 +1,69 @@
+/*  Home Box Navigation
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonHome_BoxNavigation_H
+#define PokemonAutomation_PokemonHome_BoxNavigation_H
+
+#include <array>
+#include <cstddef>
+#include <optional>
+#include <vector>
+#include "Common/Cpp/Time.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "Pokemon/Pokemon_BoxCursor.h"
+#include "Pokemon/Pokemon_CollectedPokemonInfo.h"
+#include "Pokemon/Options/Pokemon_BoxSortingTable.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonHome{
+
+inline constexpr size_t MAX_HOME_BOXES = 300;
+
+// Move the red cursor to the first slot of the box
+bool go_to_first_slot(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    Milliseconds VIDEO_DELAY
+);
+
+// Move the cursor to the given coordinates, knowing current pos via the cursor struct
+[[nodiscard]] Pokemon::BoxCursor move_cursor_to(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    const Pokemon::BoxCursor& cur_cursor,
+    const Pokemon::BoxCursor& dest_cursor,
+    Milliseconds GAME_DELAY
+);
+
+// Read current screen to find occupied and empty slots in the box.
+// Returns the (row, col) index of the first pokemon (aka non-empty) slot in the box.
+std::array<size_t, 2> find_occupied_slots_in_box(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    std::vector<std::optional<Pokemon::CollectedPokemonInfo>>& boxes_data,
+    const std::vector<Pokemon::SortingRule>& sort_preferences
+);
+
+// Read the current summary screen and assign various pokemon info into cur_pokemon_info
+void read_summary_screen(
+    SingleSwitchProgramEnvironment& env,
+    Pokemon::CollectedPokemonInfo& cur_pokemon_info,
+    Language ot_name_language = Language::None,
+    Language home_language = Language::None
+);
+
+void print_boxes_data(
+    const std::vector<std::optional<Pokemon::CollectedPokemonInfo>>& boxes_data, 
+    SingleSwitchProgramEnvironment& env
+);
+
+void exit_menus(SingleSwitchProgramEnvironment& env, ProControllerContext& context, std::chrono::milliseconds video_delay);
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonHome/Programs/PokemonHome_BoxSorter.cpp b/SerialPrograms/Source/VideoGames/PokemonHome/Programs/PokemonHome_BoxSorter.cpp
new file mode 100644
index 0000000000..2deea9ade5
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonHome/Programs/PokemonHome_BoxSorter.cpp
@@ -0,0 +1,351 @@
+/*  Home Box Sorter
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+/* TODO ideas
+read pokemon name and store the slug (easier to detect missread than reading a number)
+Optimise the swapping algo
+Add enum for ball ? Also, BDSP is reading from swsh data. Worth refactoring ?
+
+ideas for more checks :
+ability
+nature
+type
+original game
+OT
+moves
+stats
+level
+surname
+language
+"stamps"
+*/
+
+#include <array>
+#include <optional>
+#include <sstream>
+#include <algorithm>
+#include "Common/Cpp/Exceptions.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "CommonTools/StartupChecks/StartProgramChecks.h"
+#include "CommonTools/VisualDetectors/FrozenImageDetector.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "Pokemon/Pokemon_BoxCursor.h"
+#include "Pokemon/Pokemon_CollectedPokemonInfo.h"
+#include "VideoGames/PokemonHome/Inference/PokemonHome_BoxViewDetector.h"
+#include "VideoGames/PokemonHome/Inference/PokemonHome_SummaryScreenDetector.h"
+#include "PokemonHome_BoxNavigation.h"
+#include "PokemonHome_BoxSorter.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonHome{
+using namespace Pokemon;
+
+
+BoxSorter_Descriptor::BoxSorter_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonHome:BoxSorter",
+        STRING_POKEMON + " Home", "Box Sorter",
+        "Programs/PokemonHome/BoxSorter.html",
+        "Order boxes of " + STRING_POKEMON + ".",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_RequiresPrecision,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+struct BoxSorter_Descriptor::Stats : public StatsTracker{
+    Stats()
+        : pkmn(m_stats["Pokemon"])
+        , empty(m_stats["Empty Slots"])
+        , compare(m_stats["Compares"])
+        , swaps(m_stats["Swaps"])
+    {
+        m_display_order.emplace_back(Stat("Pokemon"));
+        m_display_order.emplace_back(Stat("Empty Slots"));
+        m_display_order.emplace_back(Stat("Compares"));
+        m_display_order.emplace_back(Stat("Swaps"));
+    }
+    std::atomic<uint64_t>& pkmn;
+    std::atomic<uint64_t>& empty;
+    std::atomic<uint64_t>& compare;
+    std::atomic<uint64_t>& swaps;
+};
+std::unique_ptr<StatsTracker> BoxSorter_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+BoxSorter::BoxSorter()
+    : BOX_NUMBER(
+        "<b>Number of Boxes to Sort:</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        1, 1, MAX_HOME_BOXES
+    )
+    , HOME_LANGUAGE(
+        "<b>Home Language:</b>",
+        {
+            Language::English,
+            Language::Japanese,
+            Language::Spanish,
+            Language::French,
+            Language::German,
+            Language::Italian,
+            Language::Korean,
+            Language::ChineseSimplified,
+            Language::ChineseTraditional,
+        },
+        LockMode::LOCK_WHILE_RUNNING
+    )
+    , VIDEO_DELAY(
+          "<b>Capture Card Delay:</b>",
+          LockMode::LOCK_WHILE_RUNNING,
+          "400 ms"
+    )
+    , GAME_DELAY(
+          "<b>" + STRING_POKEMON + " Home App Delay:</b>",
+          LockMode::LOCK_WHILE_RUNNING,
+          "240 ms"
+    )
+    , SORT_TABLE(
+          "<b>Sort Order Rules:</b><br>Sort order rules will be applied top to bottom."
+    )
+    , OUTPUT_FILE(
+          false,
+          "<b>Output File:</b><br>JSON file basename to catalogue box info found by the program.",
+          LockMode::LOCK_WHILE_RUNNING,
+          "box_order",
+          "box_order"
+    )
+    , DRY_RUN(
+          "<b>Dry Run:</b><br>Catalogue and make sorting plan without execution. Check output at <output_file>.json and <output_file>-sorted.json)",
+          LockMode::LOCK_WHILE_RUNNING,
+          false
+    )
+    , NOTIFICATIONS({
+          &NOTIFICATION_PROGRAM_FINISH
+    })
+{
+    PA_ADD_OPTION(BOX_NUMBER); //number of box to check and sort
+    PA_ADD_OPTION(HOME_LANGUAGE);
+    PA_ADD_OPTION(VIDEO_DELAY); //delay for every input that need video feedback, user will be able to modify this to enhance capture card delay compatibility
+    PA_ADD_OPTION(GAME_DELAY);  //delay for non video feedback, this way I can go as fast as pokemon home can handle movement when needed
+    PA_ADD_OPTION(SORT_TABLE);
+    PA_ADD_OPTION(OUTPUT_FILE);
+    PA_ADD_OPTION(DRY_RUN);
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+void sort(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    std::vector<std::optional<CollectedPokemonInfo>> boxes_data,
+    std::vector<std::optional<CollectedPokemonInfo>> boxes_sorted,
+    BoxSorter_Descriptor::Stats& stats,
+    BoxCursor& cur_cursor,
+    Milliseconds GAME_DELAY
+){
+    env.log("Start sorting...");
+    env.log_to_ui("Start Sorting...");
+
+    std::ostringstream ss;
+    // this need to be separated into functions when I will redo the whole thing but I just wanted it to work
+
+    // going thru the sorted list one by one and for each one go through the current pokemon layout to find the closest possible match to fill the slot
+    for (size_t poke_nb_s = 0; poke_nb_s < boxes_sorted.size(); poke_nb_s++){
+        if (boxes_sorted[poke_nb_s] == std::nullopt){ // we've hit the end of the sorted list.
+            break;
+        }
+        for (size_t poke_nb = poke_nb_s; poke_nb < boxes_data.size(); poke_nb++){
+            BoxCursor cursor_s(poke_nb_s);
+            BoxCursor cursor(poke_nb);
+
+            // ss << "Comparing " << boxes_data[poke_nb] << " at " << cursor << " to " << boxes_sorted[poke_nb_s] << " at " << cursor_s;
+            // env.console.log(ss.str());
+            // ss.str("");
+
+            //check for a match and also check if the pokemon is not already in the slot
+            stats.compare++;
+            env.update_stats();
+            if(boxes_sorted[poke_nb_s] == boxes_data[poke_nb] && poke_nb_s == poke_nb){ // Same spot no need to move.
+                break;
+            }
+            if(boxes_sorted[poke_nb_s] == boxes_data[poke_nb]){
+                ss << "Swapping " << boxes_data[poke_nb] << " at " << cursor << " and " << boxes_sorted[poke_nb_s] << " at " << cursor_s;
+                env.console.log(ss.str());
+                ss.str("");
+
+                //moving cursor to the pokemon to pick it up
+                cur_cursor = move_cursor_to(env, context, cur_cursor, cursor, GAME_DELAY);
+                pbf_press_button(context, BUTTON_Y, 80ms, GAME_DELAY + 240ms);
+
+                //moving to destination to place it or swap it
+                cur_cursor = move_cursor_to(env, context, cur_cursor, cursor_s, GAME_DELAY);
+                pbf_press_button(context, BUTTON_Y, 80ms, GAME_DELAY + 240ms);
+
+                context.wait_for_all_requests();
+
+                std::swap(boxes_data[poke_nb_s], boxes_data[poke_nb]);
+                stats.swaps++;
+                env.update_stats();
+
+                break;
+            }
+        }
+    }
+}
+
+void BoxSorter::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    StartProgramChecks::check_performance_class_wired_or_wireless(context);
+    
+    const std::vector<SortingRule> sort_preferences = SORT_TABLE.preferences();
+    if (sort_preferences.empty()){
+        throw UserSetupError(env.console, "At least one sorting method selection needs to be made!");
+    }
+
+    BoxSorter_Descriptor::Stats& stats = env.current_stats< BoxSorter_Descriptor::Stats>();
+
+    // vector that will store data for each slot
+    std::vector<std::optional<CollectedPokemonInfo>> boxes_data;
+
+    BoxCursor cur_cursor{static_cast<uint16_t>(BOX_NUMBER-1), 0, 0};
+
+    VideoOverlaySet video_overlay_set(env.console);
+
+    BoxCursor dest_cursor;
+    BoxCursor nav_cursor = {0, 0, 0};
+
+    exit_menus(env, context, VIDEO_DELAY.get());
+    
+    BoxViewWatcher box_view_watcher(&env.console.overlay());
+    SummaryScreenWatcher summary_screen_watcher(&env.console.overlay());
+
+    //cycle through each box
+    for (size_t box_idx = 0; box_idx < BOX_NUMBER; box_idx++){
+        if(box_idx != 0){
+            // Press button R to move to next box
+            pbf_press_button(context, BUTTON_R, 80ms, VIDEO_DELAY.get() + 800ms);
+        }else{
+            // Moving the cursor until it goes to the first slot
+            if(!go_to_first_slot(env, context, VIDEO_DELAY)){
+                throw UserSetupError(
+                    env.logger(),
+                    "ERROR: Could not move cursor to the first slot, please consider adjusting delay."
+                );
+            }
+        }
+
+        context.wait_for_all_requests();
+        const std::string log_msg = "Checking box " + std::to_string(box_idx+1) + "/" + std::to_string(BOX_NUMBER);
+        env.log(log_msg);
+        env.console.overlay().add_log(log_msg);
+
+
+        // Check box grid color stddev to find occupied slots and fill boxes_data with placeholder pokemon info.
+        const std::array<size_t, 2> first_pokemon_slot = find_occupied_slots_in_box(env, context, boxes_data, sort_preferences);
+
+        //enter the summary screen to read pokemon info
+        if (first_pokemon_slot[0] != SIZE_MAX){
+            // moving cursor to the first pokemon slot
+            dest_cursor = {0, first_pokemon_slot[0], first_pokemon_slot[1]};
+            nav_cursor = move_cursor_to(env, context, nav_cursor, dest_cursor, GAME_DELAY);
+
+            env.log_to_ui("Checking Summary...");
+
+            pbf_press_button(context, BUTTON_A, 80ms, GAME_DELAY);
+            context.wait_for_all_requests();
+            video_overlay_set.clear();
+            pbf_press_dpad(context, DPAD_DOWN, 80ms, GAME_DELAY);
+            pbf_press_button(context, BUTTON_A, 80ms, 100ms);
+            context.wait_for_all_requests();
+            int ret = wait_until(env.console, context, Seconds(5), {summary_screen_watcher});
+            if (ret != 0){
+                OperationFailedExceptionWithScreenshot::fire(
+                    ErrorReportMode::SEND_ERROR_REPORT, "HomeBoxSorter(): does not find summary screen after 5 sec", env.console
+                );
+            }
+
+            // cycle through each summary of the current box and fill pokemon information
+            for (size_t row = 0; row < BOX_ROWS; row++){
+                for (size_t column = 0; column < BOX_COLS; column++){
+                    const size_t global_idx = to_global_index(box_idx, row, column);
+                    if (!boxes_data[global_idx].has_value()){
+                        continue;
+                    }
+
+                    // Read the summary screen and assign data to boxes_data[global_idx]
+                    read_summary_screen(env, boxes_data[global_idx].value(), Language::None, HOME_LANGUAGE);
+
+                    // Press button R to go to next summary screen
+                    pbf_press_button(context, BUTTON_R, 80ms, 300ms);
+                    context.wait_for_all_requests();
+
+                    // Wait for the summary screen transition to end
+                    FrozenImageDetector frozen_image_detector(COLOR_GREEN, { 0.388, 0.238, 0.109, 0.062 }, Milliseconds(80), 20);
+                    frozen_image_detector.make_overlays(video_overlay_set);
+                    wait_until(env.console, context, 5s, { frozen_image_detector });
+                }
+            }
+
+            // log detailed pokemon infomation of this box
+            std::ostringstream ss;
+            ss << std::endl;
+            for (size_t row = 0; row < BOX_ROWS; row++){
+                for (size_t column = 0; column < BOX_COLS; column++){
+                    ss << "[" << row << ", " << column << "]: " << boxes_data[to_global_index(box_idx, row, column)] << std::endl;
+                }
+            }
+            env.log(ss.str());
+
+            //get out of summary with a lot of delay because it's slow for some reasons
+            pbf_press_button(context, BUTTON_B, 80ms, 100ms);
+            context.wait_for_all_requests();
+            ret = wait_until(env.console, context, Seconds(5), {box_view_watcher});
+            if (ret != 0){
+                OperationFailedExceptionWithScreenshot::fire(
+                    ErrorReportMode::SEND_ERROR_REPORT, "HomeBoxSorter(): does not find box view after 5 sec", env.console
+                );
+            }
+            video_overlay_set.clear();
+        }
+
+        video_overlay_set.clear();
+
+        dest_cursor = {0, 0, 0};
+        nav_cursor = move_cursor_to(env, context, nav_cursor, dest_cursor, GAME_DELAY);
+        context.wait_for_all_requests();
+    } // end if (find_first_poke){
+
+    // copy boxes data to sort
+    std::vector<std::optional<CollectedPokemonInfo>> boxes_sorted = boxes_data;
+
+    // sorting copy of boxes_data
+    std::sort(boxes_sorted.begin(), boxes_sorted.end());
+
+    env.log("Current boxes data :");
+    print_boxes_data(boxes_data, env);
+    const std::string json_path_basename = OUTPUT_FILE;
+    save_boxes_data_to_json(boxes_data, json_path_basename + ".json");
+
+    env.log("Sorted boxes data :");
+    print_boxes_data(boxes_sorted, env);
+    save_boxes_data_to_json(boxes_sorted, json_path_basename + "-sorted.json");
+
+    if (!DRY_RUN){
+        sort(env, context, boxes_data, boxes_sorted, stats, cur_cursor, GAME_DELAY);
+    }
+
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+
+}
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonHome/Programs/PokemonHome_BoxSorter.h b/SerialPrograms/Source/VideoGames/PokemonHome/Programs/PokemonHome_BoxSorter.h
new file mode 100644
index 0000000000..c9a34dcbd9
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonHome/Programs/PokemonHome_BoxSorter.h
@@ -0,0 +1,55 @@
+/*  Home Box Sorter
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonHome_BoxSorter_H
+#define PokemonAutomation_PokemonHome_BoxSorter_H
+
+#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "Common/Cpp/Options/StringOption.h"
+#include "Common/Cpp/Options/TimeDurationOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "CommonTools/Options/LanguageOCROption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "Pokemon/Options/Pokemon_BoxSortingTable.h"
+
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonHome{
+
+class BoxSorter_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    BoxSorter_Descriptor();
+
+    struct Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+class BoxSorter : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = BoxSorter_Descriptor;
+    BoxSorter();
+
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    SimpleIntegerOption<uint16_t> BOX_NUMBER;
+    OCR::LanguageOCROption HOME_LANGUAGE;
+    MillisecondsOption VIDEO_DELAY;
+    MillisecondsOption GAME_DELAY;
+    Pokemon::BoxSortingTable SORT_TABLE;
+    StringOption OUTPUT_FILE;
+    BooleanCheckBoxOption DRY_RUN;
+    EventNotificationsOption NOTIFICATIONS;
+
+};
+
+}
+}
+}
+#endif // BOXSORTING_H
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonHome/Programs/PokemonHome_BoxSorterLivingDex.cpp b/SerialPrograms/Source/VideoGames/PokemonHome/Programs/PokemonHome_BoxSorterLivingDex.cpp
new file mode 100644
index 0000000000..8db9e688dc
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonHome/Programs/PokemonHome_BoxSorterLivingDex.cpp
@@ -0,0 +1,675 @@
+/*  Home Box Sorter Living Dex
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <array>
+#include <cmath>
+#include <optional>
+#include <sstream>
+#include <vector>
+#include "Common/Cpp/Exceptions.h"
+#include "Common/Cpp/Strings/Unicode.h"
+#include "Common/Cpp/Json/JsonValue.h"
+#include "Common/Cpp/Json/JsonArray.h"
+#include "Common/Cpp/Json/JsonObject.h"
+#include "CommonFramework/GlobalAutoPaths.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "CommonTools/StartupChecks/StartProgramChecks.h"
+#include "CommonTools/OCR/OCR_StringNormalization.h"
+#include "CommonTools/VisualDetectors/FrozenImageDetector.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "Pokemon/Pokemon_BoxCursor.h"
+#include "Pokemon/Pokemon_CollectedPokemonInfo.h"
+#include "VideoGames/PokemonHome/Inference/PokemonHome_BoxViewDetector.h"
+#include "VideoGames/PokemonHome/Inference/PokemonHome_SummaryScreenDetector.h"
+#include "PokemonHome_BoxNavigation.h"
+#include "PokemonHome_BoxSorterLivingDex.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonHome{
+using namespace Pokemon;
+
+
+BoxSorterLivingDex_Descriptor::BoxSorterLivingDex_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonHome:BoxSorterLivingDex",
+        STRING_POKEMON + " Home", "Box Sorter Living Dex",
+        "Programs/PokemonHome/BoxSorterLivingDex.html",
+        "Arrange boxes of " + STRING_POKEMON + " into living dex order.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_RequiresPrecision,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+struct BoxSorterLivingDex_Descriptor::Stats : public StatsTracker{
+    Stats()
+        : pkmn(m_stats["Pokemon"])
+        , empty(m_stats["Empty Slots"])
+        , swaps(m_stats["Swaps"])
+    {
+        m_display_order.emplace_back(Stat("Pokemon"));
+        m_display_order.emplace_back(Stat("Empty Slots"));
+        m_display_order.emplace_back(Stat("Swaps"));
+    }
+    std::atomic<uint64_t>& pkmn;
+    std::atomic<uint64_t>& empty;
+    std::atomic<uint64_t>& swaps;
+};
+
+std::unique_ptr<StatsTracker> BoxSorterLivingDex_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+BoxSorterLivingDex::~BoxSorterLivingDex(){
+    OT_NAME_LANGUAGE.remove_listener(*this);
+};
+
+BoxSorterLivingDex::BoxSorterLivingDex()
+    : LIVING_DEX_START_BOX(
+        "<b>Living Dex Starting Box:</b><br>Box number where the living dex placement begins (1-indexed).",
+        LockMode::LOCK_WHILE_RUNNING,
+        1, 1, (uint16_t)MAX_HOME_BOXES
+    )
+    , REJECT_BOX_START(
+        "<b>Reject Box Range Start:</b><br>First box of the range reserved for rejected or overflow " + STRING_POKEMON + ".",
+        LockMode::LOCK_WHILE_RUNNING,
+        1, 1, (uint16_t)MAX_HOME_BOXES
+    )
+    , REJECT_BOX_END(
+        "<b>Reject Box Range End:</b><br>Last box of the range reserved for rejected or overflow " + STRING_POKEMON + ".",
+        LockMode::LOCK_WHILE_RUNNING,
+        1, 1, (uint16_t)MAX_HOME_BOXES
+    )
+    , LIVING_DEX_STYLE(
+        "<b>Living Dex Style:</b><br>Please see the wiki for a detailed explanation of each style.",
+        {
+            {LivingDexStyle::SORTED_BY_FORMS, "sorted_by_forms", "Sorted by Forms"},
+            {LivingDexStyle::SORTED_BY_SPECIES, "sorted_by_species", "Sorted by Species"},
+            {LivingDexStyle::AJP_FINAL_FORM, "ajp_final_form", "AJP Final Form"},
+            {LivingDexStyle::AJP_FINAL_FORM_FORM, "ajp_final_form_form", "AJP Final Form Form"},
+            {LivingDexStyle::AJP_LIVING, "ajp_living", "AJP Living"},
+            {LivingDexStyle::AJP_LIVING_FORM, "ajp_living_form", "AJP Living Form"},
+            {LivingDexStyle::AJP_LIVING_FORM_LITE, "ajp_living_form_lite", "AJP Living Form Lite"},
+            {LivingDexStyle::POKEPC_FULLY_SORTED, "pokepc_fully_sorted", "PokePC Fully Sorted"},
+            {LivingDexStyle::POKEPC_FULLY_SORTED_MINIMAL, "pokepc_fully_sorted_minimal", "PokePC Fully Sorted (Minimal)"},
+            {LivingDexStyle::POKEPC_GROUPED_BALANCED, "pokepc_grouped_balanced", "PokePC Grouped Balanced"},
+            {LivingDexStyle::POKEPC_GROUPED_REGION, "pokepc_grouped_region", "PokePC Grouped by Region"},
+            {LivingDexStyle::POKEPC_SORTED_SPECIES, "pokepc_sorted_species", "PokePC Sorted by Species"},
+            {LivingDexStyle::POKEPC_SORTED_SPECIES_MINIMAL, "pokepc_sorted_species_minimal", "PokePC Sorted by Species (Minimal)"},
+            {LivingDexStyle::POKEPC_SPECIES_FIRST, "pokepc_species_first", "PokePC Species First"},
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        LivingDexStyle::SORTED_BY_FORMS
+    )
+    , SHINY_DEX(
+        "<b>Shiny Dex:</b><br>Enable or disable shiny dex mode.",
+        LockMode::LOCK_WHILE_RUNNING,
+        false
+    )
+    , OT_NAME_LANGUAGE(
+        "<b>OT Name Language:</b><br>Language of the OT name you are filtering for. "
+        "If set to None, OT names will not be read.",
+        LanguageSet{
+            Language::English,
+            Language::Japanese,
+            Language::Spanish,
+            Language::French,
+            Language::German,
+            Language::Italian,
+            Language::Korean,
+            Language::ChineseSimplified,
+            Language::ChineseTraditional,
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        false
+    )
+    , OT_NAME(
+        false,
+        "<b>OT Name Filter:</b><br>Only keep pokemon with this OT name in the living dex. "
+        "Leave blank to accept any OT name.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "",
+        "Enter OT name here..."
+    )
+    , VIDEO_DELAY(
+          "<b>Capture Card Delay:</b>",
+          LockMode::LOCK_WHILE_RUNNING,
+          "400 ms"
+    )
+    , GAME_DELAY(
+          "<b>" + STRING_POKEMON + " Home App Delay:</b>",
+          LockMode::LOCK_WHILE_RUNNING,
+          "240 ms"
+    )
+    , OUTPUT_FILE(
+          false,
+          "<b>Output File:</b><br>JSON file basename to catalogue box info found by the program.",
+          LockMode::LOCK_WHILE_RUNNING,
+          "living_dex_order",
+          "living_dex_order"
+    )
+    , DRY_RUN(
+          "<b>Dry Run:</b><br>Catalogue and make sorting plan without execution. Check output at <output_file>.json and <output_file>-sorted.json)",
+          LockMode::LOCK_WHILE_RUNNING,
+          false
+    )
+    , NOTIFICATIONS({
+          &NOTIFICATION_PROGRAM_FINISH
+    })
+{
+    PA_ADD_OPTION(LIVING_DEX_START_BOX);
+    PA_ADD_OPTION(REJECT_BOX_START);
+    PA_ADD_OPTION(REJECT_BOX_END);
+    PA_ADD_OPTION(LIVING_DEX_STYLE);
+    PA_ADD_OPTION(SHINY_DEX);
+    PA_ADD_OPTION(OT_NAME_LANGUAGE);
+    PA_ADD_OPTION(OT_NAME);
+    PA_ADD_OPTION(VIDEO_DELAY);
+    PA_ADD_OPTION(GAME_DELAY);
+    PA_ADD_OPTION(OUTPUT_FILE);
+    PA_ADD_OPTION(DRY_RUN);
+    PA_ADD_OPTION(NOTIFICATIONS);
+
+    BoxSorterLivingDex::on_config_value_changed(this);
+
+    OT_NAME_LANGUAGE.add_listener(*this);
+}
+
+void BoxSorterLivingDex::on_config_value_changed(void* object){
+    if (OT_NAME_LANGUAGE == Language::None){
+        OT_NAME.set_visibility(ConfigOptionState::HIDDEN);
+    }else{
+        OT_NAME.set_visibility(ConfigOptionState::ENABLED);
+    }
+}
+
+bool BoxSorterLivingDex::is_viable_for_dex(
+    const LivingDexEntry& entry, 
+    const CollectedPokemonInfo& pokemonInfo, 
+    const std::string& normalized_ot_name
+){
+    if (OT_NAME_LANGUAGE != Language::None){
+        if (normalized_ot_name != pokemonInfo.ot_name){
+            return false;
+        }
+    }
+
+    if (SHINY_DEX != pokemonInfo.shiny){
+        return false;
+    }
+
+    if (entry.nat_id != pokemonInfo.dex_number){
+        return false;
+    }
+
+    if (entry.has_gender_difference){
+        if (entry.slug.ends_with("-female") && pokemonInfo.gender != StatsHuntGenderFilter::Female){
+            return false;
+        }
+
+        if (entry.slug.ends_with("-male") && pokemonInfo.gender != StatsHuntGenderFilter::Male){
+            return false;
+        }
+    }
+
+    if (entry.primary_type != pokemonInfo.primary_type || entry.secondary_type != pokemonInfo.secondary_type){
+        return false;
+    }
+
+    if (entry.form_slug == "gigantamax" && !pokemonInfo.gmax){
+        return false;
+    }
+
+    return true;
+}
+
+[[nodiscard]] BoxCursor BoxSorterLivingDex::populate_box_data(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    std::vector<SortingRule> sort_preferences,
+    std::vector<std::optional<CollectedPokemonInfo>>& boxes_data,
+    size_t box_count,
+    BoxCursor& nav_cursor,
+    Language ot_name_language
+){
+    BoxCursor dest_cursor;
+    size_t starting_box(nav_cursor.box);
+    VideoOverlaySet video_overlay_set(env.console);
+    BoxViewWatcher box_view_watcher(&env.console.overlay());
+    SummaryScreenWatcher summary_screen_watcher(&env.console.overlay());
+
+    for (size_t box_idx = 0; box_idx < box_count; box_idx++){
+        if (box_idx != 0){
+            dest_cursor = BoxCursor(starting_box + box_idx, 0, 0);
+            nav_cursor = move_cursor_to(env, context, nav_cursor, dest_cursor, GAME_DELAY);
+        }else{
+            env.log("Moving the cursor to the first slot on the page.");
+            if (!go_to_first_slot(env, context, VIDEO_DELAY)){
+                throw UserSetupError(
+                    env.logger(),
+                    "ERROR: Could not move cursor to the first slot, please consider adjusting delay."
+                );
+            }
+        }
+
+        context.wait_for_all_requests();
+        const std::string log_msg = "Checking box " + std::to_string(box_idx + 1) + "/" + std::to_string(box_count);
+        env.log(log_msg);
+        env.console.overlay().add_log(log_msg);
+
+        // Check box grid color stddev to find occupied slots and fill boxes_data with placeholder pokemon info.
+        const std::array<size_t, 2> first_pokemon_slot = find_occupied_slots_in_box(env, context, boxes_data, sort_preferences);
+
+        //enter the summary screen to read pokemon info
+        if (first_pokemon_slot[0] != SIZE_MAX){
+            // moving cursor to the first pokemon slot
+            dest_cursor = { starting_box + box_idx, first_pokemon_slot[0], first_pokemon_slot[1] };
+            nav_cursor = move_cursor_to(env, context, nav_cursor, dest_cursor, GAME_DELAY);
+
+            env.log_to_ui("Checking Summary...");
+
+            pbf_press_button(context, BUTTON_A, 80ms, GAME_DELAY);
+            context.wait_for_all_requests();
+            video_overlay_set.clear();
+            pbf_press_dpad(context, DPAD_DOWN, 80ms, GAME_DELAY);
+            pbf_press_button(context, BUTTON_A, 80ms, 100ms);
+            context.wait_for_all_requests();
+            int ret = wait_until(env.console, context, Seconds(5), { summary_screen_watcher });
+            if (ret != 0){
+                OperationFailedExceptionWithScreenshot::fire(
+                    ErrorReportMode::SEND_ERROR_REPORT, "HomeBoxSorter(): does not find summary screen after 5 sec", env.console
+                );
+            }
+
+            // cycle through each summary of the current box and fill pokemon information
+            for (size_t row = 0; row < BOX_ROWS; row++){
+                for (size_t column = 0; column < BOX_COLS; column++){
+                    const size_t global_idx = to_global_index(box_idx, row, column);
+                    if (!boxes_data[global_idx].has_value()){
+                        continue;
+                    }
+
+                    // Read the summary screen and assign data to boxes_data[global_idx]
+                    read_summary_screen(env, boxes_data[global_idx].value(), ot_name_language, Language::None);
+
+                    // Press button R to go to next summary screen
+                    pbf_press_button(context, BUTTON_R, 80ms, 300ms);
+                    context.wait_for_all_requests();
+
+                    // Wait for the summary screen transition to end
+                    FrozenImageDetector frozen_image_detector(COLOR_GREEN, { 0.388, 0.238, 0.109, 0.062 }, Milliseconds(80), 20);
+                    frozen_image_detector.make_overlays(video_overlay_set);
+                    wait_until(env.console, context, 5s, { frozen_image_detector });
+                }
+            }
+
+            // log detailed pokemon infomation of this box
+            std::ostringstream ss;
+            ss << std::endl;
+            for (size_t row = 0; row < BOX_ROWS; row++){
+                for (size_t column = 0; column < BOX_COLS; column++){
+                    ss << "[" << row << ", " << column << "]: " << boxes_data[to_global_index(box_idx, row, column)] << std::endl;
+                }
+            }
+            env.log(ss.str());
+
+            //get out of summary with a lot of delay because it's slow for some reasons
+            pbf_press_button(context, BUTTON_B, 80ms, 100ms);
+            context.wait_for_all_requests();
+            ret = wait_until(env.console, context, Seconds(5), { box_view_watcher });
+            if (ret != 0){
+                OperationFailedExceptionWithScreenshot::fire(
+                    ErrorReportMode::SEND_ERROR_REPORT, "BoxSorterLivingDex(): does not find box view after 5 sec", env.console
+                );
+            }
+            video_overlay_set.clear();
+        }
+        video_overlay_set.clear();
+    }
+
+    return nav_cursor;
+}
+
+void BoxSorterLivingDex::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    StartProgramChecks::check_performance_class_wired_or_wireless(context);
+
+    std::string path;
+    
+    switch (LIVING_DEX_STYLE){
+        case LivingDexStyle::SORTED_BY_FORMS:
+            path = RESOURCE_PATH() + "PokemonHome/DexTemplates/living_dex_by_forms.json";
+            break;
+        case LivingDexStyle::SORTED_BY_SPECIES:
+            path = RESOURCE_PATH() + "PokemonHome/DexTemplates/living_dex_by_species.json";
+            break;
+        case LivingDexStyle::AJP_FINAL_FORM:
+            path = RESOURCE_PATH() + "PokemonHome/DexTemplates/ajp_final_form.json";
+            break;
+        case LivingDexStyle::AJP_FINAL_FORM_FORM:
+            path = RESOURCE_PATH() + "PokemonHome/DexTemplates/ajp_final_form_form.json";
+            break;
+        case LivingDexStyle::AJP_LIVING:
+            path = RESOURCE_PATH() + "PokemonHome/DexTemplates/ajp_living.json";
+            break;
+        case LivingDexStyle::AJP_LIVING_FORM:
+            path = RESOURCE_PATH() + "PokemonHome/DexTemplates/ajp_living_form.json";
+            break;
+        case LivingDexStyle::AJP_LIVING_FORM_LITE:
+            path = RESOURCE_PATH() + "PokemonHome/DexTemplates/ajp_living_form_lite.json";
+            break;
+        case LivingDexStyle::POKEPC_FULLY_SORTED:
+            path = RESOURCE_PATH() + "PokemonHome/DexTemplates/pokepc_fully_sorted.json";
+            break;
+        case LivingDexStyle::POKEPC_FULLY_SORTED_MINIMAL:
+            path = RESOURCE_PATH() + "PokemonHome/DexTemplates/pokepc_fully_sorted_minimal.json";
+            break;
+        case LivingDexStyle::POKEPC_GROUPED_BALANCED:
+            path = RESOURCE_PATH() + "PokemonHome/DexTemplates/pokepc_grouped_balanced.json";
+            break;
+        case LivingDexStyle::POKEPC_GROUPED_REGION:
+            path = RESOURCE_PATH() + "PokemonHome/DexTemplates/pokepc_grouped_region.json";
+            break;
+        case LivingDexStyle::POKEPC_SORTED_SPECIES:
+            path = RESOURCE_PATH() + "PokemonHome/DexTemplates/pokepc_sorted_species.json";
+            break;
+        case LivingDexStyle::POKEPC_SORTED_SPECIES_MINIMAL:
+            path = RESOURCE_PATH() + "PokemonHome/DexTemplates/pokepc_sorted_species_minimal.json";
+            break;
+        case LivingDexStyle::POKEPC_SPECIES_FIRST:
+            path = RESOURCE_PATH() + "PokemonHome/DexTemplates/pokepc_species_first.json";
+            break;
+        default:
+            throw InternalProgramError(
+                &env.logger(), PA_CURRENT_FUNCTION, "Invalid living dex style"
+            );
+    }
+    
+    JsonValue json = load_json_file(path);
+    const JsonArray& slugs = json.to_array_throw(path);
+
+    std::vector<LivingDexEntry> living_dex_order;
+    living_dex_order.reserve(slugs.size());
+    for (const JsonValue& entry_value : slugs){
+        const JsonObject& obj = entry_value.to_object_throw(path);
+        LivingDexEntry entry;
+        entry.species_slug = obj.get_string_throw("species_slug", path);
+        entry.form_slug = obj.get_string_throw("form_slug", path);
+        entry.nat_id = (uint16_t)obj.get_integer_throw("natID", path);
+        entry.primary_type = POKEMON_TYPE_SLUGS().get_enum(obj.get_string_throw("primaryType", path), PokemonType::NONE);
+        entry.secondary_type = POKEMON_TYPE_SLUGS().get_enum(obj.get_string_default("secondaryType", "none"), PokemonType::NONE);
+        entry.slug = obj.get_string_throw("slug", path);
+        entry.has_gender_difference = obj.get_boolean_throw("has_gender_difference", path);
+        living_dex_order.emplace_back(std::move(entry));
+    }
+
+    std::string ot_name = static_cast<std::string>(OT_NAME);
+    env.log("OT Name user input: " + ot_name);
+    std::string ot_name_normalized = utf32_to_str(OCR::normalize_utf32(ot_name));
+    env.log("OT Name normalized: " + ot_name_normalized);
+
+    // TODO allow users to have rules for the "best" version of a pokemon to be kept in the living dex box
+    // It would be nice to add OT as most users that care about living dex also like to have it with their OT
+    // Sort preferences isn't really used as the json/options dictate the exact pokemon to be placed in each slot.
+    const std::vector<SortingRule> sort_preferences(
+        {
+            { SortingRuleType::DexNo, false } 
+        });
+
+    BoxSorterLivingDex_Descriptor::Stats& stats = env.current_stats<BoxSorterLivingDex_Descriptor::Stats>();
+
+    // vector that will store data for each slot
+    std::vector<std::optional<CollectedPokemonInfo>> living_dex_boxes_data;
+
+    exit_menus(env, context, VIDEO_DELAY.get());
+
+    BoxCursor dest_cursor;
+    BoxCursor nav_cursor((LIVING_DEX_START_BOX - 1), 0, 0);
+
+    size_t living_dex_box_count = (size_t)std::ceil((double)living_dex_order.size() / 30);
+    size_t living_dex_end = LIVING_DEX_START_BOX + living_dex_box_count - 1;
+
+    if (REJECT_BOX_START > REJECT_BOX_END){
+        throw UserSetupError(
+            env.logger(),
+            "ERROR: Reject box range is invalid, please ensure start is less than or equal to end."
+        );
+    }
+
+    if (living_dex_end > MAX_HOME_BOXES){
+        throw UserSetupError(
+            env.logger(),
+            "ERROR: Living dex boxes exceed max box count, please adjust box settings."
+        );
+    }
+
+    if (LIVING_DEX_START_BOX <= REJECT_BOX_END && REJECT_BOX_START <= living_dex_end){
+        throw UserSetupError(
+            env.logger(),
+            "ERROR: Living dex boxes overlap with reject boxes, please adjust box settings."
+        );
+    }
+
+    nav_cursor = populate_box_data(env, context, sort_preferences, living_dex_boxes_data, living_dex_box_count, nav_cursor, OT_NAME_LANGUAGE);
+
+    dest_cursor = BoxCursor((REJECT_BOX_START - 1), 0, 0);
+    nav_cursor = move_cursor_to(env, context, nav_cursor, dest_cursor, GAME_DELAY);
+    context.wait_for_all_requests();
+
+    std::vector<std::optional<CollectedPokemonInfo>> reject_boxes_data;
+    size_t reject_box_count = REJECT_BOX_END - REJECT_BOX_START + 1;
+
+    nav_cursor = populate_box_data(env, context, sort_preferences, reject_boxes_data, reject_box_count, nav_cursor, OT_NAME_LANGUAGE);
+
+    if (DRY_RUN){
+        save_boxes_data_to_json(living_dex_boxes_data, "living_boxes_unsorted.json");
+        save_boxes_data_to_json(reject_boxes_data, "reject_boxes_unsorted.json");
+    }
+
+    std::ostringstream ss;
+
+    for (size_t i = 0; i < living_dex_order.size(); i++){
+        bool found = false;
+        LivingDexEntry entry = living_dex_order[i];
+        env.log("Looking for " + entry.slug + " in the living dex boxes.");
+        for(size_t j = i; j < living_dex_boxes_data.size(); j++){
+            if (!living_dex_boxes_data[j].has_value()){
+                continue;
+            }
+
+            if (!is_viable_for_dex(entry, *living_dex_boxes_data[j], ot_name_normalized)){
+                continue;
+            }
+
+            found = true;
+            if (i == j){
+                // already in the right spot, do nothing
+                break;
+            }
+            else{
+
+                BoxCursor pokemon_cursor = BoxCursor(LIVING_DEX_START_BOX - 1 + j / 30, (j / 6) % 5, j % 6);
+                BoxCursor destination_cursor = BoxCursor(LIVING_DEX_START_BOX - 1 + i / 30, (i / 6) % 5, i % 6);
+
+                if (!DRY_RUN){
+                    ss << "Swapping " << living_dex_boxes_data[j] << " at " << pokemon_cursor << " and " << living_dex_boxes_data[i] << " at " << destination_cursor;
+                    env.console.log(ss.str());
+                    ss.str("");
+
+                    nav_cursor = move_cursor_to(env, context, nav_cursor, pokemon_cursor, GAME_DELAY);
+                    pbf_press_button(context, BUTTON_Y, 80ms, GAME_DELAY.get() + 240ms);
+
+                    nav_cursor = move_cursor_to(env, context, nav_cursor, destination_cursor, GAME_DELAY);
+                    pbf_press_button(context, BUTTON_Y, 80ms, GAME_DELAY.get() + 240ms);
+
+                    context.wait_for_all_requests();
+
+                    stats.swaps++;
+                    env.update_stats();
+                }
+
+                std::swap(living_dex_boxes_data[j], living_dex_boxes_data[i]);  
+            }
+
+            break;
+        }
+
+        if (found){
+            continue;
+        }
+
+        env.log("Could not find a pokemon for " + entry.slug + " in the living dex boxes, looking in reject boxes for a valid match.");
+
+        for (size_t j = 0; j < reject_boxes_data.size(); j++){
+            if (!reject_boxes_data[j].has_value()){
+                continue;
+            }
+
+            if (!is_viable_for_dex(entry, *reject_boxes_data[j], ot_name_normalized)){
+                continue;
+            }
+
+            found = true;
+
+            BoxCursor pokemon_cursor = BoxCursor(REJECT_BOX_START - 1 + j / 30, (j / 6) % 5, j % 6);
+            BoxCursor destination_cursor = BoxCursor(LIVING_DEX_START_BOX - 1 + i / 30, (i / 6) % 5, i % 6);
+            
+            if (!DRY_RUN){
+                ss << "Swapping " << reject_boxes_data[j] << " at " << pokemon_cursor << " and " << living_dex_boxes_data[i] << " at " << destination_cursor;
+                env.console.log(ss.str());
+                ss.str("");
+                nav_cursor = move_cursor_to(env, context, nav_cursor, pokemon_cursor, GAME_DELAY);
+                pbf_press_button(context, BUTTON_Y, 80ms, GAME_DELAY.get() + 240ms);
+                nav_cursor = move_cursor_to(env, context, nav_cursor, destination_cursor, GAME_DELAY);
+                pbf_press_button(context, BUTTON_Y, 80ms, GAME_DELAY.get() + 240ms);
+                context.wait_for_all_requests();
+                stats.swaps++;
+                env.update_stats();
+            }
+
+            std::swap(living_dex_boxes_data[i], reject_boxes_data[j]);
+
+            break;
+        }
+
+        if (found){
+            continue;
+        }
+
+        if (!living_dex_boxes_data[i].has_value()){
+            continue;
+        }
+
+        // move the pokemon in the current living dex slot to the reject box or later in the living dex
+        size_t empty_reject_slot = SIZE_MAX;
+        size_t empty_living_dex_slot = SIZE_MAX;
+        for (size_t j = 0; j < reject_boxes_data.size(); j++){
+            if (!reject_boxes_data[j].has_value()){
+                empty_reject_slot = j;
+                break;
+            }
+        }
+        if (empty_reject_slot == SIZE_MAX){
+            env.log("No empty reject box slots available to move pokemon out of the way, placing in open slot in living dex for now.");
+
+            for (size_t j = i + 1; j < living_dex_boxes_data.size(); j++){
+                if (!living_dex_boxes_data[j].has_value()){
+                    empty_living_dex_slot = j;
+                    break;
+                }
+            }
+        }
+        BoxCursor pokemon_cursor = BoxCursor(LIVING_DEX_START_BOX - 1 + i / 30, (i / 6) % 5, i % 6);
+        BoxCursor destination_cursor;
+        
+        if (empty_reject_slot != SIZE_MAX){
+            destination_cursor = BoxCursor(REJECT_BOX_START - 1 + empty_reject_slot / 30, (empty_reject_slot / 6) % 5, empty_reject_slot % 6);
+        }
+        else if (empty_living_dex_slot != SIZE_MAX){
+            destination_cursor = BoxCursor(LIVING_DEX_START_BOX - 1 + empty_living_dex_slot / 30, (empty_living_dex_slot / 6) % 5, empty_living_dex_slot % 6);
+        }
+        else{
+            throw UserSetupError(
+                env.logger(),
+                "ERROR: No empty slots available to move pokemon out of the way, please consider removing some duplicates or increasing the reject box range."
+            );
+        }
+
+        if (!DRY_RUN){
+            ss << "Moving " << living_dex_boxes_data[i] << " at " << pokemon_cursor << " to " << destination_cursor;
+            env.console.log(ss.str());
+            ss.str("");
+            nav_cursor = move_cursor_to(env, context, nav_cursor, pokemon_cursor, GAME_DELAY);
+            pbf_press_button(context, BUTTON_Y, 80ms, GAME_DELAY.get() + 240ms);
+            nav_cursor = move_cursor_to(env, context, nav_cursor, destination_cursor, GAME_DELAY);
+            pbf_press_button(context, BUTTON_Y, 80ms, GAME_DELAY.get() + 240ms);
+            context.wait_for_all_requests();
+            stats.swaps++;
+            env.update_stats();
+        }
+
+        if (empty_living_dex_slot != SIZE_MAX){
+            std::swap(living_dex_boxes_data[i], living_dex_boxes_data[empty_living_dex_slot]);
+        }
+        else{
+            std::swap(living_dex_boxes_data[i], reject_boxes_data[empty_reject_slot]);
+        }
+    }
+
+    for (size_t i = living_dex_order.size(); i < living_dex_boxes_data.size(); i++){
+        if (!living_dex_boxes_data[i].has_value()){
+            continue;
+        }
+
+        size_t empty_reject_slot = SIZE_MAX;
+        for (size_t j = 0; j < reject_boxes_data.size(); j++){
+            if (!reject_boxes_data[j].has_value()){
+                empty_reject_slot = j;
+                break;
+            }
+        }
+
+        if (empty_reject_slot == SIZE_MAX){
+            break;
+        }
+
+        BoxCursor pokemon_cursor = BoxCursor(LIVING_DEX_START_BOX - 1 + i / 30, i % 5, i % 6);
+        BoxCursor destination_cursor = BoxCursor(REJECT_BOX_START - 1 + empty_reject_slot / 30, (empty_reject_slot / 6) % 5, empty_reject_slot % 6);
+
+        if (!DRY_RUN){
+            ss << "Moving " << living_dex_boxes_data[i] << " at " << pokemon_cursor << " to " << destination_cursor;
+            env.console.log(ss.str());
+            ss.str("");
+            nav_cursor = move_cursor_to(env, context, nav_cursor, pokemon_cursor, GAME_DELAY);
+            pbf_press_button(context, BUTTON_Y, 80ms, GAME_DELAY.get() + 240ms);
+            nav_cursor = move_cursor_to(env, context, nav_cursor, destination_cursor, GAME_DELAY);
+            pbf_press_button(context, BUTTON_Y, 80ms, GAME_DELAY.get() + 240ms);
+            context.wait_for_all_requests();
+            stats.swaps++;
+            env.update_stats();
+        }
+        
+        std::swap(living_dex_boxes_data[i], reject_boxes_data[empty_reject_slot]);
+        
+    }
+
+    if (DRY_RUN){
+        save_boxes_data_to_json(living_dex_boxes_data, "living_boxes_sorted.json");
+        save_boxes_data_to_json(reject_boxes_data, "reject_boxes_sorted.json");
+    }
+
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+}
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonHome/Programs/PokemonHome_BoxSorterLivingDex.h b/SerialPrograms/Source/VideoGames/PokemonHome/Programs/PokemonHome_BoxSorterLivingDex.h
new file mode 100644
index 0000000000..82cfa6cda2
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonHome/Programs/PokemonHome_BoxSorterLivingDex.h
@@ -0,0 +1,115 @@
+/*  Home Box Sorter Living Dex
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonHome_BoxSorterLivingDex_H
+#define PokemonAutomation_PokemonHome_BoxSorterLivingDex_H
+
+#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "Common/Cpp/Options/StringOption.h"
+#include "Common/Cpp/Options/TimeDurationOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "CommonTools/Options/LanguageOCROption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "Pokemon/Pokemon_CollectedPokemonInfo.h"
+#include "Pokemon/Pokemon_Types.h"
+#include "Pokemon/Pokemon_BoxCursor.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonHome{
+using namespace Pokemon;
+
+class BoxSorterLivingDex_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    BoxSorterLivingDex_Descriptor();
+
+    struct Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+class BoxSorterLivingDex : public SingleSwitchProgramInstance, public ConfigOption::Listener{
+public:
+    using Descriptor = BoxSorterLivingDex_Descriptor;
+    ~BoxSorterLivingDex();
+    BoxSorterLivingDex();
+
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    struct LivingDexEntry{
+        std::string species_slug;
+        std::string form_slug;
+        uint16_t nat_id;
+        PokemonType primary_type;
+        PokemonType secondary_type;
+        std::string slug;
+        bool has_gender_difference;
+    };
+
+
+    enum class LivingDexStyle{
+        SORTED_BY_FORMS,
+        SORTED_BY_SPECIES,
+        AJP_FINAL_FORM,
+        AJP_FINAL_FORM_FORM,
+        AJP_LIVING,
+        AJP_LIVING_FORM,
+        AJP_LIVING_FORM_LITE,
+        POKEPC_FULLY_SORTED,
+        POKEPC_FULLY_SORTED_MINIMAL,
+        POKEPC_GROUPED_BALANCED,
+        POKEPC_GROUPED_REGION,
+        POKEPC_SORTED_SPECIES,
+        POKEPC_SORTED_SPECIES_MINIMAL,
+        POKEPC_SPECIES_FIRST,
+    };
+
+    // Checks if the given pokemon is viable for the living dex entry. 
+    // Currently the checks include: 
+    // National Dex Id, Types (for regional forms), Gender (if no gender difference either is fine)
+    // Shiny (if the user has selected to only include shinies in the living dex).
+    bool is_viable_for_dex(const LivingDexEntry& entry, const CollectedPokemonInfo& pokemonInfo, const std::string& normalized_ot_name);
+
+    // Goes through the summary screen of each pokemon in the range of boxes. 
+    // Populates the boxes_data vector with the pokemon info. Returns the final cursor position after reading the boxes.
+    [[nodiscard]] BoxCursor populate_box_data(
+        SingleSwitchProgramEnvironment& env,
+        ProControllerContext& context,
+        std::vector<SortingRule> sort_preferences,
+        std::vector<std::optional<CollectedPokemonInfo>>& boxes_data,
+        size_t box_count,
+        BoxCursor& nav_cursor,
+        Language ot_name_language
+    );
+
+    virtual void on_config_value_changed(void* object) override;
+
+    // Working boxes
+    SimpleIntegerOption<uint16_t> LIVING_DEX_START_BOX;
+    SimpleIntegerOption<uint16_t> REJECT_BOX_START;
+    SimpleIntegerOption<uint16_t> REJECT_BOX_END;
+
+    // Living dex style.
+    EnumDropdownOption<LivingDexStyle> LIVING_DEX_STYLE;
+
+    // Dex filters
+    BooleanCheckBoxOption SHINY_DEX;
+    OCR::LanguageOCROption OT_NAME_LANGUAGE;
+    StringOption OT_NAME;
+
+    // Setup options
+    MillisecondsOption VIDEO_DELAY;
+    MillisecondsOption GAME_DELAY;
+    StringOption OUTPUT_FILE;
+    BooleanCheckBoxOption DRY_RUN;
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+}
+}
+}
+#endif // PokemonAutomation_PokemonHome_BoxSorterLivingDex_H
diff --git a/SerialPrograms/Source/VideoGames/PokemonHome/Programs/PokemonHome_GenerateNameOCR.cpp b/SerialPrograms/Source/VideoGames/PokemonHome/Programs/PokemonHome_GenerateNameOCR.cpp
new file mode 100644
index 0000000000..c59301f5c5
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonHome/Programs/PokemonHome_GenerateNameOCR.cpp
@@ -0,0 +1,110 @@
+/*  Pokemon Home Generate Name OCR
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Filesystem/Filesystem.h"
+#include "Common/Cpp/PrettyPrint.h"
+#include "Common/Cpp/Json/JsonValue.h"
+#include "Common/Cpp/Json/JsonArray.h"
+#include "CommonFramework/GlobalAutoPaths.h"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "Pokemon/Inference/Pokemon_NameReader.h"
+#include "PokemonHome_GenerateNameOCR.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonHome{
+using namespace Pokemon;
+
+
+GenerateNameOCRData_Descriptor::GenerateNameOCRData_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonHome:GenerateNameOCR",
+        STRING_POKEMON + " Home", STRING_POKEMON + " Home: Generate Name OCR",
+        "",
+        "Generate " + STRING_POKEMON + " Name OCR data by iterating the National " + STRING_POKEDEX + ".",
+        PanelQualityStanding::DEVELOPER,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+
+
+GenerateNameOCRData::GenerateNameOCRData()
+    : LANGUAGE(
+        "<b>Game Language:</b>",
+        PokemonNameReader::instance().languages(),
+        LockMode::LOCK_WHILE_RUNNING
+    )
+    , DELAY0(
+        "<b>Delay Between Each Iteration:</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        "240 ms"
+    )
+{
+    PA_ADD_OPTION(LANGUAGE);
+    PA_ADD_OPTION(DELAY0);
+
+}
+
+
+void GenerateNameOCRData::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    std::string resource_path = RESOURCE_PATH() + "Pokemon/Pokedex/Pokedex-National.json";
+    JsonValue json = load_json_file(resource_path);
+    JsonArray& array = json.to_array_throw(resource_path);
+
+    std::vector<std::string> slugs;
+    for (auto& item : array){
+        std::string& slug = item.to_string_throw(resource_path);
+        slugs.emplace_back(std::move(slug));
+    }
+
+
+    OverlayBoxScope box(env.console, {0.705, 0.815, 0.219, 0.055});
+    std::string language_code = language_data(LANGUAGE).code;
+
+    for (const std::string& slug : slugs){
+        context.wait_for_all_requests();
+
+        VideoSnapshot screen = env.console.video().snapshot();
+        ImageViewRGB32 image = extract_box_reference(screen, box);
+
+        std::string path = "PokemonNameOCR/";
+        path += language_code;
+        path += "/";
+
+        if (!Filesystem::exists(Filesystem::Path(path))){
+            Filesystem::create_directories(Filesystem::Path(path));
+        }
+
+        path += slug;
+        path += "-";
+        path += now_to_filestring();
+        path += ".png";
+        image.save(path);
+
+        pbf_press_dpad(context, DPAD_RIGHT, 80ms, DELAY0);
+
+        OCR::StringMatchResult result = PokemonNameReader::instance().read_substring(
+            env.console, LANGUAGE, image,
+            OCR::BLACK_TEXT_FILTERS()
+        );
+    }
+
+
+}
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonHome/Programs/PokemonHome_GenerateNameOCR.h b/SerialPrograms/Source/VideoGames/PokemonHome/Programs/PokemonHome_GenerateNameOCR.h
new file mode 100644
index 0000000000..da69546ceb
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonHome/Programs/PokemonHome_GenerateNameOCR.h
@@ -0,0 +1,43 @@
+/*  Pokemon Home Generate Name OCR
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonHome_GenerateNameOCR_H
+#define PokemonAutomation_PokemonHome_GenerateNameOCR_H
+
+#include "Common/Cpp/Options/TimeDurationOption.h"
+#include "CommonTools/Options/LanguageOCROption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonHome{
+
+
+class GenerateNameOCRData_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    GenerateNameOCRData_Descriptor();
+};
+
+
+
+class GenerateNameOCRData : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = GenerateNameOCRData_Descriptor;
+    GenerateNameOCRData();
+
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    OCR::LanguageOCROption LANGUAGE;
+    MillisecondsOption DELAY0;
+};
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonHome/Programs/PokemonHome_PageSwap.cpp b/SerialPrograms/Source/VideoGames/PokemonHome/Programs/PokemonHome_PageSwap.cpp
new file mode 100644
index 0000000000..ef65247e97
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonHome/Programs/PokemonHome_PageSwap.cpp
@@ -0,0 +1,111 @@
+/*  Pokemon Home Page Swap
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
+#include "PokemonHome_PageSwap.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonHome{
+    using namespace Pokemon;
+
+
+
+PageSwap_Descriptor::PageSwap_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonHome:PageSwap",
+        STRING_POKEMON + " Home", STRING_POKEMON + " Home: Page Swap",
+        "Programs/PokemonHome/PageSwap.html",
+        "Swap 30 boxes (1 page) in " + STRING_POKEMON + " Home.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::NONE,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+
+
+PageSwap::PageSwap()
+    : DODGE_SYSTEM_UPDATE_WINDOW(
+        "<b>Dodge System Update Window:</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        false
+    )
+{
+    PA_ADD_OPTION(START_LOCATION);
+    PA_ADD_OPTION(DODGE_SYSTEM_UPDATE_WINDOW);
+}
+
+void PageSwap::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    if (START_LOCATION.start_in_grip_menu()){
+        grip_menu_connect_go_home(context);
+        PokemonSwSh::resume_game_no_interact(env.console, context, DODGE_SYSTEM_UPDATE_WINDOW);
+    }else{
+        pbf_press_button(context, BUTTON_RCLICK, 40ms, 40ms);
+    }
+
+    const Milliseconds PICKUP_DELAY = 2000ms;
+    const Milliseconds SCROLL_DELAY = 160ms;
+
+    for (uint8_t i = 0; i < 2; i++){
+        for (uint8_t j = 0; j < 3; j++){
+            pbf_press_button(context, BUTTON_Y, 80ms, PICKUP_DELAY);
+            for (uint8_t c = 0; c < 6; c++){
+                pbf_press_dpad(context, DPAD_RIGHT, 80ms, SCROLL_DELAY);
+            }
+            pbf_press_button(context, BUTTON_Y, 80ms, PICKUP_DELAY);
+            pbf_press_dpad(context, DPAD_RIGHT, 80ms, SCROLL_DELAY);
+            pbf_press_button(context, BUTTON_Y, 80ms, PICKUP_DELAY);
+            for (uint8_t c = 0; c < 6; c++){
+                pbf_press_dpad(context, DPAD_LEFT, 80ms, SCROLL_DELAY);
+            }
+            pbf_press_button(context, BUTTON_Y, 80ms, PICKUP_DELAY);
+            pbf_press_dpad(context, DPAD_RIGHT, 80ms, SCROLL_DELAY);
+        }
+        pbf_press_dpad(context, DPAD_DOWN, 80ms, SCROLL_DELAY);
+        for (uint8_t j = 0; j < 3; j++){
+            pbf_press_button(context, BUTTON_Y, 80ms, PICKUP_DELAY);
+            for (uint8_t c = 0; c < 6; c++){
+                pbf_press_dpad(context, DPAD_LEFT, 80ms, SCROLL_DELAY);
+            }
+            pbf_press_button(context, BUTTON_Y, 80ms, PICKUP_DELAY);
+            pbf_press_dpad(context, DPAD_RIGHT, 80ms, SCROLL_DELAY);
+            pbf_press_button(context, BUTTON_Y, 80ms, PICKUP_DELAY);
+            for (uint8_t c = 0; c < 6; c++){
+                pbf_press_dpad(context, DPAD_RIGHT, 80ms, SCROLL_DELAY);
+            }
+            pbf_press_button(context, BUTTON_Y, 80ms, PICKUP_DELAY);
+            pbf_press_dpad(context, DPAD_RIGHT, 80ms, SCROLL_DELAY);
+        }
+        pbf_press_dpad(context, DPAD_DOWN, 80ms, SCROLL_DELAY);
+    }
+    for (uint8_t j = 0; j < 3; j++){
+        pbf_press_button(context, BUTTON_Y, 80ms, PICKUP_DELAY);
+        for (uint8_t c = 0; c < 6; c++){
+            pbf_press_dpad(context, DPAD_RIGHT, 80ms, SCROLL_DELAY);
+        }
+        pbf_press_button(context, BUTTON_Y, 80ms, PICKUP_DELAY);
+        pbf_press_dpad(context, DPAD_RIGHT, 80ms, SCROLL_DELAY);
+        pbf_press_button(context, BUTTON_Y, 80ms, PICKUP_DELAY);
+        for (uint8_t c = 0; c < 6; c++){
+            pbf_press_dpad(context, DPAD_LEFT, 80ms, SCROLL_DELAY);
+        }
+        pbf_press_button(context, BUTTON_Y, 80ms, PICKUP_DELAY);
+        pbf_press_dpad(context, DPAD_RIGHT, 80ms, SCROLL_DELAY);
+    }
+}
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/PokemonHome/Programs/PokemonHome_PageSwap.h b/SerialPrograms/Source/VideoGames/PokemonHome/Programs/PokemonHome_PageSwap.h
similarity index 75%
rename from SerialPrograms/Source/PokemonHome/Programs/PokemonHome_PageSwap.h
rename to SerialPrograms/Source/VideoGames/PokemonHome/Programs/PokemonHome_PageSwap.h
index 8e5706eb23..9c0cdf5640 100644
--- a/SerialPrograms/Source/PokemonHome/Programs/PokemonHome_PageSwap.h
+++ b/SerialPrograms/Source/VideoGames/PokemonHome/Programs/PokemonHome_PageSwap.h
@@ -1,6 +1,6 @@
 /*  Pokemon Home Page Swap
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -23,9 +23,10 @@ class PageSwap_Descriptor : public SingleSwitchProgramDescriptor{
 
 class PageSwap : public SingleSwitchProgramInstance{
 public:
+    using Descriptor = PageSwap_Descriptor;
     PageSwap();
 
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
 
 private:
     StartInGripOrGameOption START_LOCATION;
diff --git a/SerialPrograms/Source/VideoGames/PokemonHome/Programs/TestPrograms/PokemonHome_ReadSummaryScreen.cpp b/SerialPrograms/Source/VideoGames/PokemonHome/Programs/TestPrograms/PokemonHome_ReadSummaryScreen.cpp
new file mode 100644
index 0000000000..5247ee0f46
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonHome/Programs/TestPrograms/PokemonHome_ReadSummaryScreen.cpp
@@ -0,0 +1,103 @@
+/*  Read Summary Screen
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <optional>
+#include <sstream>
+#include "Common/Cpp/CancellableScope.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "Pokemon/Pokemon_CollectedPokemonInfo.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonHome/Inference/PokemonHome_SummaryReader.h"
+#include "VideoGames/PokemonHome/Programs/PokemonHome_BoxNavigation.h"
+#include "PokemonHome_ReadSummaryScreen.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonHome{
+using namespace Pokemon;
+
+ReadSummaryScreen_Descriptor::ReadSummaryScreen_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonHome:ReadSummaryScreen",
+        STRING_POKEMON + " Home", "Read Summary Screen",
+        "",
+        "Read the current Pokemon summary screen in Pokemon Home and log the detected data.",
+        PanelQualityStanding::DEVELOPER,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+ReadSummaryScreen::ReadSummaryScreen()
+    : OT_NAME_LANGUAGE(
+        "<b>Original Trainer Name Language:</b>",
+        {
+            Language::English,
+            Language::Japanese,
+            Language::Spanish,
+            Language::French,
+            Language::German,
+            Language::Italian,
+            Language::Korean,
+            Language::ChineseSimplified,
+            Language::ChineseTraditional,
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        false
+    )
+    , HOME_LANGUAGE(
+        "<b>Home Language:</b>",
+        {
+            Language::English,
+            Language::Japanese,
+            Language::Spanish,
+            Language::French,
+            Language::German,
+            Language::Italian,
+            Language::Korean,
+            Language::ChineseSimplified,
+            Language::ChineseTraditional,
+        },
+        LockMode::LOCK_WHILE_RUNNING
+    )
+{
+    PA_ADD_OPTION(OT_NAME_LANGUAGE);
+    PA_ADD_OPTION(HOME_LANGUAGE);
+}
+
+void ReadSummaryScreen::program(
+    SingleSwitchProgramEnvironment& env,
+    CancellableScope& scope
+){
+    SummaryReader reader;
+    VideoOverlaySet overlays(env.console);
+    reader.make_overlays(overlays);
+
+    VideoSnapshot screen = env.console.video().snapshot();
+
+
+    std::string language_of_origin = reader.read_language_of_origin(screen);
+    std::string level_text = std::to_string(reader.read_level(env.console, screen));
+    std::string ability = reader.read_ability(env.console, HOME_LANGUAGE, screen);
+    std::string nature = reader.read_nature(env.console, HOME_LANGUAGE, screen);
+
+    CollectedPokemonInfo pokemon_info{};
+    read_summary_screen(env, pokemon_info, OT_NAME_LANGUAGE, HOME_LANGUAGE);
+
+    std::optional<CollectedPokemonInfo> logged_info = pokemon_info;
+    std::ostringstream ss;
+    ss << logged_info;
+    env.log("Summary screen result: " + ss.str());
+    env.log("Language of origin: " + language_of_origin);
+    env.log("Level: " + level_text);
+    env.log("Ability: " + ability);
+    env.log("Nature: " + nature);
+}
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonHome/Programs/TestPrograms/PokemonHome_ReadSummaryScreen.h b/SerialPrograms/Source/VideoGames/PokemonHome/Programs/TestPrograms/PokemonHome_ReadSummaryScreen.h
new file mode 100644
index 0000000000..c08824fbd1
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonHome/Programs/TestPrograms/PokemonHome_ReadSummaryScreen.h
@@ -0,0 +1,38 @@
+/*  Read Summary Screen
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonHome_ReadSummaryScreen_H
+#define PokemonAutomation_PokemonHome_ReadSummaryScreen_H
+
+#include "Common/Cpp/CancellableScope.h"
+#include "CommonTools/Options/LanguageOCROption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonHome{
+
+class ReadSummaryScreen_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    ReadSummaryScreen_Descriptor();
+};
+
+class ReadSummaryScreen : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = ReadSummaryScreen_Descriptor;
+    ReadSummaryScreen();
+
+    virtual void program(SingleSwitchProgramEnvironment& env, CancellableScope& scope) override;
+
+private:
+    OCR::LanguageOCROption OT_NAME_LANGUAGE;
+    OCR::LanguageOCROption HOME_LANGUAGE;
+};
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonHome/Programs/TestPrograms/PokemonHome_TestDatabaseGenerator.cpp b/SerialPrograms/Source/VideoGames/PokemonHome/Programs/TestPrograms/PokemonHome_TestDatabaseGenerator.cpp
new file mode 100644
index 0000000000..c9c10139f8
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonHome/Programs/TestPrograms/PokemonHome_TestDatabaseGenerator.cpp
@@ -0,0 +1,389 @@
+/*  Pokemon Home Test Database Generator
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <algorithm>
+#include <cctype>
+#include <chrono>
+#include <filesystem>
+#include <format>
+#include <fstream>
+#include <sstream>
+#include <string>
+#include <vector>
+#include "Common/Cpp/Filesystem/Filesystem.h"
+#include "CommonFramework/ImageTypes/ImageRGB32.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "Pokemon/Options/Pokemon_StatsHuntFilter.h"
+#include "Pokemon/Pokemon_OriginMarks.h"
+#include "Pokemon/Resources/Pokemon_PokemonSlugs.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "Pokemon/Pokemon_Types.h"
+#include "VideoGames/PokemonHome/Inference/PokemonHome_BallReader.h"
+#include "VideoGames/PokemonHome/Inference/PokemonHome_AlphaDetector.h"
+#include "VideoGames/PokemonHome/Inference/PokemonHome_BoxGenderDetector.h"
+#include "VideoGames/PokemonHome/Inference/PokemonHome_BoxViewDetector.h"
+#include "VideoGames/PokemonHome/Inference/PokemonHome_ButtonDetector.h"
+#include "VideoGames/PokemonHome/Inference/PokemonHome_GigantamaxDetector.h"
+#include "VideoGames/PokemonHome/Inference/PokemonHome_OriginMarkReader.h"
+#include "VideoGames/PokemonHome/Inference/PokemonHome_SelectionArrowDetector.h"
+#include "VideoGames/PokemonHome/Inference/PokemonHome_ShinyDetector.h"
+#include "VideoGames/PokemonHome/Inference/PokemonHome_SummaryReader.h"
+#include "VideoGames/PokemonHome/Inference/PokemonHome_SummaryScreenDetector.h"
+#include "VideoGames/PokemonHome/Inference/PokemonHome_TeraTypeReader.h"
+#include "PokemonHome_TestDatabaseGenerator.h"
+
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonHome{
+using namespace Pokemon;
+
+
+TestDatabaseGenerator_Descriptor::TestDatabaseGenerator_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonHome:TestDatabaseGenerator",
+        STRING_POKEMON + " Home", "Test Database Generator",
+        "",
+        "Run all Pokemon Home image readers and detectors against a directory of screenshots.",
+        PanelQualityStanding::DEVELOPER,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::NONE,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+TestDatabaseGenerator::TestDatabaseGenerator()
+    : DIRECTORY(
+        "<b>Screenshot Directory:</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        "",
+        "",
+        "Path to a directory containing PNG screenshots.",
+        true
+    )
+    , PRINT_DIRECTORY(
+        false,
+        "<b>Printed Directory Override:</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        "",
+        "Optional directory prefix for logged and generated database paths."
+    )
+    , RENAME_FILES(
+        "<b>Rename Screenshots:</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        false
+    )
+{
+    PA_ADD_OPTION(DIRECTORY);
+    PA_ADD_OPTION(PRINT_DIRECTORY);
+    PA_ADD_OPTION(RENAME_FILES);
+}
+
+namespace{
+
+[[nodiscard]] std::string optional_arrow_name(std::optional<SelectionArrowType> arrow){
+    if (!arrow){
+        return "none";
+    }
+    return *arrow == SelectionArrowType::RIGHT ? "right" : "down";
+}
+
+[[nodiscard]] std::string to_uppercase(std::string value){
+    std::transform(value.begin(), value.end(), value.begin(), [](unsigned char c){
+        return static_cast<char>(std::toupper(c));
+    });
+    return value;
+}
+
+[[nodiscard]] std::string quote_string(std::string value){
+    return "\"" + value + "\"";
+}
+
+[[nodiscard]] std::string boolean(bool value){
+    return value ? "true" : "false";
+}
+
+}
+
+struct TestEntry{
+    std::string box_view;
+    std::string summary;
+    std::string shiny;
+    std::string alpha;
+    std::string gigantamax;
+    std::string selection_arrow;
+    std::string button;
+    std::string ball;
+    std::string gender;
+    std::string tera_type;
+    std::string origin_mark;
+    std::string summary_numbers;
+    std::string summary_text;
+    std::string summary_ot_name;
+    std::string language_of_origin;
+};
+
+
+void TestDatabaseGenerator::program(
+    SingleSwitchProgramEnvironment& env,
+    CancellableScope& scope
+){
+    const Filesystem::Path directory = Filesystem::Path((std::string)DIRECTORY);
+    std::vector<Filesystem::Path> screenshots;
+
+    try{
+        for (const std::filesystem::directory_entry& entry : std::filesystem::directory_iterator(directory.stdpath())){
+            if (!entry.is_regular_file())
+                continue;
+
+            Filesystem::Path path(entry.path());
+            std::string extension = path.extension().string();
+            std::transform(extension.begin(), extension.end(), extension.begin(), [](unsigned char c){
+                return (char)std::tolower(c);
+            });
+            if (extension == ".png")
+                screenshots.emplace_back(std::move(path));
+        }
+    }catch (const std::filesystem::filesystem_error& error){
+        env.log(std::string("Unable to read screenshot directory: ") + error.what(), COLOR_RED);
+        return;
+    }
+
+    std::sort(screenshots.begin(), screenshots.end(), [](const Filesystem::Path& x, const Filesystem::Path& y){
+        return x.string() < y.string();
+    });
+
+    std::vector<TestEntry> entries;
+    entries.reserve(screenshots.size());
+
+    for (const Filesystem::Path& path : screenshots){
+        try{
+            ImageRGB32 image(path.string());
+            ImageFloatBox arrow_box(0.021, 0.073, 0.47, 0.72);
+            ImageFloatBox button_box(0.100, 0.956, 0.107, 0.041);
+
+            SummaryReader summary_reader;
+            const int dex_number = summary_reader.read_national_dex(env.console, image);
+            const int original_trainer_id = summary_reader.read_original_trainer_id(env.console, image);
+            const std::string original_trainer_name = summary_reader.read_original_trainer_name(Language::English, image);
+            const std::string nature = summary_reader.read_nature(env.console, Language::English, image);
+            const std::string ability = summary_reader.read_ability(env.console, Language::English, image);
+            const int level = summary_reader.read_level(env.console, image);
+            BoxViewDetector box_view_detector(&env.console.overlay());
+            SummaryScreenDetector summary_detector(&env.console.overlay());
+            ShinyDetector shiny_detector(COLOR_RED, &env.console.overlay());
+            AlphaDetector alpha_detector(COLOR_RED, &env.console.overlay());
+            GigantamaxDetector gigantamax_detector(COLOR_RED, &env.console.overlay());
+            SelectionArrowDetector right_arrow_detector(COLOR_RED, &env.console.overlay(), SelectionArrowType::RIGHT, arrow_box);
+            SelectionArrowDetector down_arrow_detector(COLOR_RED, &env.console.overlay(), SelectionArrowType::DOWN, arrow_box);
+            ButtonDetector b_detector(COLOR_RED, ButtonType::ButtonB, button_box, &env.console.overlay());
+            ButtonDetector plus_detector(COLOR_RED, ButtonType::ButtonPlus, button_box, &env.console.overlay());
+            BallReader ball_reader(env.console);
+            OriginMarkReader origin_reader;
+
+            const bool box_view = box_view_detector.detect(image);
+            const bool summary = summary_detector.detect(image);
+            const bool shiny = shiny_detector.detect(image);
+            const bool alpha = alpha_detector.detect(image);
+            const bool gigantamax = gigantamax_detector.detect(image);
+            const bool right_arrow = right_arrow_detector.detect(image);
+            const bool down_arrow = down_arrow_detector.detect(image);
+            const bool button_b = b_detector.detect(image);
+            const bool button_plus = plus_detector.detect(image);
+            const std::string ball = ball_reader.read_ball(image);
+            const std::string language_of_origin = summary_reader.read_language_of_origin(image);
+            const Pokemon::StatsHuntGenderFilter gender = BoxGenderDetector::detect(image);
+            const Pokemon::PokemonTeraType tera_type = read_pokemon_tera_type(image, { 0.463, 0.09, 0.04, 0.06 });
+            const Pokemon::OriginMark origin = origin_reader.read_mark(image);
+
+            std::string renamed_path;
+            if (RENAME_FILES){
+                if (dex_number <= 0 || dex_number > static_cast<int>(NATIONAL_DEX_SLUGS().size())){
+                    env.log(path.string() + " | unable to rename: invalid dex number " + std::to_string(dex_number), COLOR_RED);
+                }else{
+                    const std::string new_name = NATIONAL_DEX_SLUGS()[dex_number - 1]
+                        + "_" + (alpha ? "Alpha" : "Regular")
+                        + (shiny ? "_Shiny" : "")
+                        + "_" + ORIGIN_MARK_SLUGS().get_string(origin)
+                        + "_" + std::to_string(
+                            std::chrono::duration_cast<std::chrono::milliseconds>(
+                                std::chrono::system_clock::now().time_since_epoch())
+                            .count()
+                        )
+                        + ".png";
+                    const Filesystem::Path destination = path.parent_path() / new_name;
+                    if (destination == path){
+                        renamed_path = destination.string();
+                    }else if (Filesystem::exists(destination)){
+                        env.log(path.string() + " | unable to rename: destination already exists " + destination.string(), COLOR_RED);
+                    }else{
+                        Filesystem::rename(path, destination);
+                        renamed_path = destination.string();
+                    }
+                }
+            }
+
+            std::optional<SelectionArrowType> arrow;
+            if (right_arrow)
+                arrow = SelectionArrowType::RIGHT;
+            else if (down_arrow)
+                arrow = SelectionArrowType::DOWN;
+
+            const Filesystem::Path database_file = renamed_path.empty() ? path : Filesystem::Path(renamed_path);
+            const std::string print_directory = (std::string)PRINT_DIRECTORY;
+            const std::string database_path = print_directory.empty()
+                ? database_file.string()
+                : print_directory + database_file.filename().string();
+
+            std::ostringstream output;
+            output << std::boolalpha
+                   << database_path;
+            if (!renamed_path.empty()){
+                output << " (renamed -> " << renamed_path << ")";
+            }
+            output << "\n"
+
+                   << "  UI State:       box-view=" << box_view
+                   << ", summary=" << summary
+                   << ", arrow=" << optional_arrow_name(arrow)
+                   << ", B=" << button_b
+                   << ", plus=" << button_plus << "\n"
+
+                   << "  Box Indicators: form=" << (alpha ? "Alpha" : "Regular")
+                   << ", shiny=" << shiny
+                   << ", gigantamax=" << gigantamax
+                   << ", gender=" << gender_to_string(gender)
+                   << ", ball=" << (ball.empty() ? "none" : ball)
+                   << ", tera=" << POKEMON_TERA_TYPE_SLUGS().get_string(tera_type)
+                   << ", origin=" << ORIGIN_MARK_SLUGS().get_string(origin) << "\n"
+
+                   << "  Summary Info:   dex=" << dex_number
+                   << ", level=" << level
+                   << ", language-of-origin=" << (language_of_origin.empty() ? "none" : language_of_origin)
+                   << ", nature=" << quote_string(nature)
+                   << ", ability=" << quote_string(ability)
+                   << ", OT=" << quote_string(original_trainer_name)
+                   << ", OT-ID=" << original_trainer_id;
+            env.log(output.str());
+
+            TestEntry entry;
+            entry.summary_numbers = std::format(
+                "database.add<Test_SummaryReader_Numbers>({}, {}, {}, {});",
+                quote_string(database_path), dex_number, original_trainer_id, level
+            );
+
+            entry.summary_text = std::format(
+                "database.add<Test_SummaryReader_Text>({}, {}, {}, Language::English);",
+                quote_string(database_path), quote_string(nature), quote_string(ability)
+            );
+
+            entry.summary_ot_name = std::format(
+                "database.add<Test_SummaryReader_OtName>({}, {}, Language::English);",
+                quote_string(database_path), quote_string(original_trainer_name)
+            );
+
+            entry.language_of_origin = std::format(
+                "database.add<Test_SummaryReader_LanguageOfOrigin>({}, {});",
+                quote_string(database_path), quote_string(language_of_origin)
+            );
+
+            entry.box_view = std::format(
+                "database.add<Test_BoxViewDetector>({}, {});", quote_string(database_path), boolean(box_view)
+            );
+
+            entry.summary = std::format(
+                "database.add<Test_SummaryScreenDetector>({}, {});", quote_string(database_path), boolean(summary)
+            );
+
+            entry.shiny = std::format(
+                "database.add<Test_ShinyDetector>({}, {});", quote_string(database_path), boolean(shiny)
+            );
+
+            entry.alpha = std::format(
+                "database.add<Test_AlphaDetector>({}, {});", quote_string(database_path), boolean(alpha)
+            );
+
+            entry.gigantamax = std::format(
+                "database.add<Test_GigantamaxDetector>({}, {});", quote_string(database_path), boolean(gigantamax)
+            );
+
+            entry.selection_arrow = std::format(
+                "database.add<Test_SelectionArrowDetector>({}, {});",
+                quote_string(database_path),
+                arrow ? "SelectionArrowType::" + to_uppercase(optional_arrow_name(arrow)) : "std::nullopt"
+            );
+
+            entry.button = std::format(
+                "database.add<Test_ButtonDetector>({}, {});",
+                quote_string(database_path),
+                button_b ? "ButtonType::ButtonB" : button_plus ? "ButtonType::ButtonPlus" : "std::nullopt"
+            );
+
+            entry.ball = std::format(
+                "database.add<Test_BallReader>({}, {});", quote_string(database_path), quote_string(ball)
+            );
+
+            entry.gender = std::format(
+                "database.add<Test_BoxGenderDetector>({}, Pokemon::StatsHuntGenderFilter::{});",
+                quote_string(database_path), gender_to_string(gender)
+            );
+
+            entry.tera_type = std::format(
+                "database.add<Test_TeraTypeReader>({}, PokemonTeraType::{});",
+                quote_string(database_path), to_uppercase(POKEMON_TERA_TYPE_SLUGS().get_string(tera_type))
+            );
+
+            entry.origin_mark = std::format(
+                "database.add<Test_OriginMarkReader>({}, OriginMark::{});",
+                quote_string(database_path), to_uppercase(ORIGIN_MARK_SLUGS().get_string(origin))
+            );
+
+            entries.push_back(std::move(entry));
+        }catch (const std::exception& error){
+            env.log(path.string() + " | error: " + error.what(), COLOR_RED);
+        }
+    }
+
+    struct Section{
+        const char* name;
+        std::string TestEntry::* member;
+    };
+    static constexpr Section SECTIONS[] = {
+        {"BoxViewDetector",         &TestEntry::box_view},
+        {"SummaryScreenDetector",   &TestEntry::summary},
+        {"ShinyDetector",           &TestEntry::shiny},
+        {"AlphaDetector",           &TestEntry::alpha},
+        {"GigantamaxDetector",      &TestEntry::gigantamax},
+        {"SelectionArrowDetector",  &TestEntry::selection_arrow},
+        {"ButtonDetector",          &TestEntry::button},
+        {"BallReader",              &TestEntry::ball},
+        {"BoxGenderDetector",       &TestEntry::gender},
+        {"TeraTypeReader",          &TestEntry::tera_type},
+        {"OriginMarkReader",        &TestEntry::origin_mark},
+        {"SummaryReader_Numbers",   &TestEntry::summary_numbers},
+        {"SummaryReader_Text",      &TestEntry::summary_text},
+        {"SummaryReader_OtName",    &TestEntry::summary_ot_name},
+        {"SummaryReader_LanguageOfOrigin",& TestEntry::language_of_origin}
+    };
+
+    const Filesystem::Path output_path = directory / "PokemonHome_TestDatabase.txt";
+    std::ofstream output_file(output_path.string());
+    if (!output_file){
+        env.log("Unable to write database output file: " + output_path.string(), COLOR_RED);
+        return;
+    }
+
+    for (const Section& section : SECTIONS){
+        output_file << section.name << ":\n";
+        for (const TestEntry& entry : entries){
+            output_file << entry.*section.member << "\n";
+        }
+    }
+}
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonHome/Programs/TestPrograms/PokemonHome_TestDatabaseGenerator.h b/SerialPrograms/Source/VideoGames/PokemonHome/Programs/TestPrograms/PokemonHome_TestDatabaseGenerator.h
new file mode 100644
index 0000000000..4891d4a56d
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonHome/Programs/TestPrograms/PokemonHome_TestDatabaseGenerator.h
@@ -0,0 +1,44 @@
+/*  Pokemon Home Test Database Generator
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonHome_TestDatabaseGenerator_H
+#define PokemonAutomation_PokemonHome_TestDatabaseGenerator_H
+
+#include "Common/Cpp/Options/PathOption.h"
+#include "Common/Cpp/Options/StringOption.h"
+#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonHome{
+
+
+class TestDatabaseGenerator_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    TestDatabaseGenerator_Descriptor();
+};
+
+class TestDatabaseGenerator : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = TestDatabaseGenerator_Descriptor;
+    TestDatabaseGenerator();
+    virtual void program(
+        SingleSwitchProgramEnvironment& env,
+        CancellableScope& scope
+    ) override;
+
+private:
+    PathOption DIRECTORY;
+    StringOption PRINT_DIRECTORY;
+    BooleanCheckBoxOption RENAME_FILES;
+};
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonHome/Resources/PokemonHome_PokeballSprites.cpp b/SerialPrograms/Source/VideoGames/PokemonHome/Resources/PokemonHome_PokeballSprites.cpp
new file mode 100644
index 0000000000..7fe7987655
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonHome/Resources/PokemonHome_PokeballSprites.cpp
@@ -0,0 +1,23 @@
+/*  Pokemon Home Pokeball Sprites
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "PokemonHome_PokeballSprites.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonHome{
+
+
+const SpriteDatabase& ALL_POKEBALL_SPRITES(){
+    static const SpriteDatabase database("PokemonHome/PokeballSprites.png", "PokemonHome/PokeballSprites.json");
+    return database;
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonHome/Resources/PokemonHome_PokeballSprites.h b/SerialPrograms/Source/VideoGames/PokemonHome/Resources/PokemonHome_PokeballSprites.h
new file mode 100644
index 0000000000..175429e27e
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonHome/Resources/PokemonHome_PokeballSprites.h
@@ -0,0 +1,24 @@
+/*  Pokemon s Pokeball Sprites
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonHome_PokeballSprites_H
+#define PokemonAutomation_PokemonHome_PokeballSprites_H
+
+#include "CommonTools/Resources/SpriteDatabase.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonHome{
+
+
+const SpriteDatabase& ALL_POKEBALL_SPRITES();
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattleMenuDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattleMenuDetector.cpp
new file mode 100644
index 0000000000..4edad182fe
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattleMenuDetector.cpp
@@ -0,0 +1,114 @@
+/*  Battle Menu Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "CommonFramework/ImageTools/ImageStats.h"
+#include "CommonTools/Images/SolidColorTest.h"
+#include "Tests/ImageUnitTest.h"
+#include "Tests/TestUtils.h"
+#include "PokemonLA_BattleMenuDetector.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+
+BattleMenuDetector::BattleMenuDetector(Logger& logger, VideoOverlay& overlay, bool stop_on_detected)
+    : VisualInferenceCallback("BattleMenuDetector")
+    , m_stop_on_detected(stop_on_detected)
+    , m_detected(false)
+    , m_pokemon_stroke_bg_left  (0.056, 0.948, 0.013, 0.020)
+    , m_pokemon_stroke_bg_right (0.174, 0.948, 0.032, 0.046)
+    , m_button_A_detector(logger, overlay, ButtonType::ButtonA, ImageFloatBox{0.764, 0.752, 0.034, 0.054}, std::chrono::milliseconds(0), false)
+    // , m_button_B_detector(logger, overlay, ButtonType::ButtonB, ImageFloatBox{0.720, 0.828, 0.027, 0.048}, std::chrono::milliseconds(0), false)
+{}
+
+void BattleMenuDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(COLOR_RED, m_pokemon_stroke_bg_left);
+    items.add(COLOR_RED, m_pokemon_stroke_bg_right);
+}
+
+
+bool BattleMenuDetector::process_frame(const ImageViewRGB32& frame, WallClock timestamp){
+    const ImageStats stroke_left = image_stats(extract_box_reference(frame, m_pokemon_stroke_bg_left));
+//    cout << stroke_left.average << stroke_left.stddev << endl;
+    if (is_solid(stroke_left,{0.179,0.386,0.435}, 0.2, 15) == false){
+        m_detected.store(false, std::memory_order_release);
+        return false;
+    }
+    
+
+    const ImageStats stroke_right = image_stats(extract_box_reference(frame, m_pokemon_stroke_bg_right));
+    if (is_solid(stroke_right, {0.228,0.358,0.414}, 0.2, 15) == false){
+        m_detected.store(false, std::memory_order_release);
+        return false;
+    }
+
+    m_button_A_detector.process_frame(frame, timestamp);
+
+    // m_button_B_detector.process_frame(frame, timestamp);
+    // hits += m_button_B_detector.detected();
+
+    bool detected = m_button_A_detector.detected();
+    m_detected.store(detected, std::memory_order_release);
+
+    return detected && m_stop_on_detected;
+}
+
+
+
+
+
+
+class Test_BattleMenuDetector : public ImageUnitTest{
+public:
+    Test_BattleMenuDetector(
+        const std::string& image,
+        bool expected
+    )
+        : ImageUnitTest("PokemonLA::BattleMenuDetector - " + image, {image})
+        , m_expected(expected)
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        DummyVideoOverlay overlay;
+        BattleMenuDetector detector(logger, overlay, true);
+        const ImageRGB32& image = images[0];
+        return detector.process_frame(image, current_time()) == m_expected;
+    };
+
+private:
+    bool m_expected;
+};
+
+
+void add_tests_BattleMenuDetector(UnitTestDatabase& database){
+    database.add<Test_BattleMenuDetector>("PokemonLA/BattleMenuDetector/CoastlandsMidday_True.png", true);
+    database.add<Test_BattleMenuDetector>("PokemonLA/BattleMenuDetector/CoastlandsSeaMidday_True.jpg", true);
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/PokemonLA/Inference/Battles/PokemonLA_BattleMenuDetector.h b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattleMenuDetector.h
similarity index 77%
rename from SerialPrograms/Source/PokemonLA/Inference/Battles/PokemonLA_BattleMenuDetector.h
rename to SerialPrograms/Source/VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattleMenuDetector.h
index 1f7a274bdf..e53a086d29 100644
--- a/SerialPrograms/Source/PokemonLA/Inference/Battles/PokemonLA_BattleMenuDetector.h
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattleMenuDetector.h
@@ -1,6 +1,6 @@
 /*  Dialog Detector
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *  
  *  Detect the battle menu, which has the option (A) battle, (B) run, 
  *  DPAD_UP for items and DPAD_DOWN to change pokemon.
@@ -9,9 +9,10 @@
 #ifndef PokemonAutomation_PokemonLA_BattleMenuDetector_H
 #define PokemonAutomation_PokemonLA_BattleMenuDetector_H
 
+#include "Common/Cpp/TestRunners/UnitTest.h"
 #include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "CommonFramework/InferenceInfra/VisualInferenceCallback.h"
-#include "PokemonLA/Inference/Objects/PokemonLA_ButtonDetector.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+#include "VideoGames/PokemonLA/Inference/Objects/PokemonLA_ButtonDetector.h"
 
 namespace PokemonAutomation{
 
@@ -44,6 +45,11 @@ class BattleMenuDetector : public VisualInferenceCallback{
 };
 
 
+
+void add_tests_BattleMenuDetector(UnitTestDatabase& database);
+
+
+
 }
 }
 }
diff --git a/SerialPrograms/Source/PokemonLA/Inference/Battles/PokemonLA_BattleMoveSelectionDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattleMoveSelectionDetector.cpp
similarity index 89%
rename from SerialPrograms/Source/PokemonLA/Inference/Battles/PokemonLA_BattleMoveSelectionDetector.cpp
rename to SerialPrograms/Source/VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattleMoveSelectionDetector.cpp
index 50f80a2464..510de4b4df 100644
--- a/SerialPrograms/Source/PokemonLA/Inference/Battles/PokemonLA_BattleMoveSelectionDetector.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattleMoveSelectionDetector.cpp
@@ -1,18 +1,18 @@
 /*  Battle Move Selection Detector
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include "Common/Cpp/AbstractLogger.h"
+#include "Common/Cpp/Logging/AbstractLogger.h"
 #include "CommonFramework/ImageTools/ImageStats.h"
-#include "CommonFramework/ImageTools/SolidColorTest.h"
 #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Images/SolidColorTest.h"
 #include "PokemonLA_BattleMoveSelectionDetector.h"
 
-#include <iostream>
-using std::cout;
-using std::endl;
+//#include <iostream>
+//using std::cout;
+//using std::endl;
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
diff --git a/SerialPrograms/Source/PokemonLA/Inference/Battles/PokemonLA_BattleMoveSelectionDetector.h b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattleMoveSelectionDetector.h
similarity index 87%
rename from SerialPrograms/Source/PokemonLA/Inference/Battles/PokemonLA_BattleMoveSelectionDetector.h
rename to SerialPrograms/Source/VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattleMoveSelectionDetector.h
index e9a085d1c3..5d4610d692 100644
--- a/SerialPrograms/Source/PokemonLA/Inference/Battles/PokemonLA_BattleMoveSelectionDetector.h
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattleMoveSelectionDetector.h
@@ -1,6 +1,6 @@
 /*  Battle Move Selection Detector
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  *  Detect the move selection screen. Useful to detect whether a move has no PP so it can
  *  not be used.
@@ -12,7 +12,7 @@
 
 #include <atomic>
 #include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "CommonFramework/InferenceInfra/VisualInferenceCallback.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
 
 namespace PokemonAutomation{
 
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattlePokemonSwitchDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattlePokemonSwitchDetector.cpp
new file mode 100644
index 0000000000..cf341ab615
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattlePokemonSwitchDetector.cpp
@@ -0,0 +1,157 @@
+/*  Battle Move Selection Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "CommonFramework/ImageTools/ImageStats.h"
+#include "CommonTools/Images/SolidColorTest.h"
+#include "Tests/ImageUnitTest.h"
+#include "Tests/TestUtils.h"
+#include "VideoGames/PokemonLA/Inference/PokemonLA_CommonColorCheck.h"
+#include "PokemonLA_BattlePokemonSwitchDetector.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+
+BattlePokemonSwitchDetector::BattlePokemonSwitchDetector(Logger& logger, VideoOverlay& overlay, bool stop_on_detected)
+    : VisualInferenceCallback("BattlePokemonSwitchDetector")
+    , m_stop_on_detected(stop_on_detected)
+    , m_detected(false)
+    , m_white_bg_1(0.641, 0.178, 0.05, 0.023)
+    , m_white_bg_2(0.641, 0.248, 0.05, 0.023)
+    , m_white_bg_3(0.517, 0.195, 0.011, 0.061)
+    , m_white_bg_4(0.924, 0.185, 0.019, 0.076)
+    , m_ready_to_battle_bg_1(0.538, 0.216, 0.008, 0.018)
+    , m_ready_to_battle_bg_2(0.686, 0.216, 0.008, 0.018)
+    , m_button_plus_detector(logger, overlay, ButtonType::ButtonPlus, ImageFloatBox{0.044, 0.091, 0.043, 0.077}, std::chrono::milliseconds(0), false)
+{}
+
+void BattlePokemonSwitchDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(COLOR_YELLOW, m_white_bg_1);
+    items.add(COLOR_YELLOW, m_white_bg_2);
+    items.add(COLOR_YELLOW, m_white_bg_3);
+    items.add(COLOR_YELLOW, m_white_bg_4);
+    items.add(COLOR_YELLOW, m_ready_to_battle_bg_1);
+    items.add(COLOR_YELLOW, m_ready_to_battle_bg_2);
+}
+
+
+bool BattlePokemonSwitchDetector::process_frame(const ImageViewRGB32& frame, WallClock timestamp){
+    const ImageStats white_1 = image_stats(extract_box_reference(frame, m_white_bg_1));
+    if(is_white(white_1, 500, 10) == false){
+        // std::cout << "no white_1" << std::endl;
+        m_detected.store(false, std::memory_order_release);
+        return false;
+    }
+
+    const ImageStats white_2 = image_stats(extract_box_reference(frame, m_white_bg_2));
+    if(is_white(white_2, 500, 10) == false){
+        // std::cout << "no white_2" << std::endl;
+        m_detected.store(false, std::memory_order_release);
+        return false;
+    }
+
+    const ImageStats white_3 = image_stats(extract_box_reference(frame, m_white_bg_3));
+    if(is_white(white_3, 500, 15) == false){
+        // std::cout << "no white_3" << std::endl;
+        m_detected.store(false, std::memory_order_release);
+        return false;
+    }
+
+    const ImageStats white_4 = image_stats(extract_box_reference(frame, m_white_bg_4));
+    if(is_white(white_4, 500, 10) == false){
+        // std::cout << "no white_4" << std::endl;
+        m_detected.store(false, std::memory_order_release);
+        return false;
+    }
+
+    const ImageStats battle_1 = image_stats(extract_box_reference(frame, m_ready_to_battle_bg_1));
+    if (!is_LA_dark_blue(battle_1)){
+        // std::cout << "battle_1 not enough " << battle_1.average << " " << battle_1.stddev << std::endl;
+        m_detected.store(false, std::memory_order_release);
+        return false;
+    }
+
+    const ImageStats battle_2 = image_stats(extract_box_reference(frame, m_ready_to_battle_bg_2));
+    if (!is_LA_dark_blue(battle_2)){
+        // std::cout << "battle_2  not enough" << battle_2.average << " " << battle_2.stddev << std::endl;
+        m_detected.store(false, std::memory_order_release);
+        return false;
+    }
+    
+
+    m_button_plus_detector.process_frame(frame, timestamp);
+    bool detected = m_button_plus_detector.detected();
+    // std::cout << "button plus detected " << detected << std::endl;
+    m_detected.store(detected, std::memory_order_release);
+
+    return detected && m_stop_on_detected;
+}
+
+
+
+
+
+
+
+
+class Test_BattlePokemonSwitchDetector : public ImageUnitTest{
+public:
+    Test_BattlePokemonSwitchDetector(
+        const std::string& image,
+        bool expected
+    )
+        : ImageUnitTest("PokemonLA::BattlePokemonSwitchDetector - " + image, {image})
+        , m_expected(expected)
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        DummyVideoOverlay overlay;
+        BattlePokemonSwitchDetector detector(logger, overlay, true);
+        const ImageRGB32& image = images[0];
+        return detector.process_frame(image, current_time()) == m_expected;
+    };
+
+private:
+    bool m_expected;
+};
+
+
+
+
+
+
+
+
+void add_tests_BattlePokemonSwitchDetector(UnitTestDatabase& database){
+    database.add<Test_BattlePokemonSwitchDetector>("PokemonLA/BattlePokemonSwitchDetector/IngoBattle_1_True.png", true);
+    database.add<Test_BattlePokemonSwitchDetector>("PokemonLA/BattlePokemonSwitchDetector/IngoBattle_2_True.png", true);
+    database.add<Test_BattlePokemonSwitchDetector>("PokemonLA/BattlePokemonSwitchDetector/IngoBattle_3_True.png", true);
+    database.add<Test_BattlePokemonSwitchDetector>("PokemonLA/BattlePokemonSwitchDetector/IngoBattleFrenchAlive_True.png", true);
+    database.add<Test_BattlePokemonSwitchDetector>("PokemonLA/BattlePokemonSwitchDetector/IngoBattleFrenchDead_True.png", true);
+    database.add<Test_BattlePokemonSwitchDetector>("PokemonLA/BattlePokemonSwitchDetector/French/IngoBattleFrench_True.png", true);
+
+}
+
+
+
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/PokemonLA/Inference/Battles/PokemonLA_BattlePokemonSwitchDetector.h b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattlePokemonSwitchDetector.h
similarity index 77%
rename from SerialPrograms/Source/PokemonLA/Inference/Battles/PokemonLA_BattlePokemonSwitchDetector.h
rename to SerialPrograms/Source/VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattlePokemonSwitchDetector.h
index 47172607a9..c18d143d9d 100644
--- a/SerialPrograms/Source/PokemonLA/Inference/Battles/PokemonLA_BattlePokemonSwitchDetector.h
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattlePokemonSwitchDetector.h
@@ -1,6 +1,6 @@
 /*  Battle Pokemon Switch Detector
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  *  Detect the screen of switching to another pokemon during battle.
  */
@@ -8,10 +8,10 @@
 #ifndef PokemonAutomation_PokemonLA_BattlePokemonSwitchDetector_H
 #define PokemonAutomation_PokemonLA_BattlePokemonSwitchDetector_H
 
-#include "CommonFramework/Logging/Logger.h"
+#include "Common/Cpp/TestRunners/UnitTest.h"
 #include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "CommonFramework/InferenceInfra/VisualInferenceCallback.h"
-#include "PokemonLA/Inference/Objects/PokemonLA_ButtonDetector.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+#include "VideoGames/PokemonLA/Inference/Objects/PokemonLA_ButtonDetector.h"
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
@@ -46,6 +46,13 @@ class BattlePokemonSwitchDetector : public VisualInferenceCallback{
 };
 
 
+
+
+void add_tests_BattlePokemonSwitchDetector(UnitTestDatabase& database);
+
+
+
+
 }
 }
 }
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattleSpriteWatcher.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattleSpriteWatcher.cpp
new file mode 100644
index 0000000000..7f8023c64e
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattleSpriteWatcher.cpp
@@ -0,0 +1,132 @@
+/*  Battle Sprite Watcher
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <vector>
+#include "Common/Cpp/Logging/AbstractLogger.h"
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "CommonFramework/StaticGlobals.h"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/ImageTools/ImageStats.h"
+#include "CommonFramework/Tools/DebugDumper.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "Tests/ImageUnitTest.h"
+#include "Tests/TestUtils.h"
+#include "PokemonLA_BattleSpriteWatcher.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+const size_t MAX_WILD_POKEMON_IN_MULTI_BATTLE = 8;
+
+
+
+BattleSpriteWatcher::BattleSpriteWatcher(Logger& logger, VideoOverlay& overlay)
+    : VisualInferenceCallback("BattleSpriteWatcher")
+    , m_logger(logger)
+    , m_battle_start_detector(logger, overlay)
+{
+    for (size_t i = 0; i < MAX_WILD_POKEMON_IN_MULTI_BATTLE; i++){
+        m_sprite_boxes.emplace_back(0.957 - 0.035*i, 0.044, 0.021, 0.035);
+    }
+    m_sprite_appeared.resize(m_sprite_boxes.size(), false);
+}
+
+void BattleSpriteWatcher::make_overlays(VideoOverlaySet& items) const{
+    for (const auto& box : m_sprite_boxes){
+        items.add(COLOR_RED, box);
+    }
+}
+
+bool BattleSpriteWatcher::process_frame(const ImageViewRGB32& frame, WallClock timestamp){
+    bool in_battle = m_battle_start_detector.process_frame(frame, timestamp);
+    if (in_battle == false){
+        return false;
+    }
+
+    const bool found_new_sprites = set_detected_sprites(frame, m_sprite_appeared);
+    if (found_new_sprites && STATIC_GLOBALS.DEVELOPER_MODE){
+        dump_debug_image(m_logger, "PokemonLA/BattleSpriteWatcher", "SpriteDetected", frame);
+    }
+
+    return false;
+}
+
+
+std::vector<bool> BattleSpriteWatcher::detect_sprites(const ImageViewRGB32& frame) const{
+    std::vector<bool> ret(m_sprite_boxes.size(), false);
+    set_detected_sprites(frame, ret);
+    return ret;
+}
+
+
+bool BattleSpriteWatcher::set_detected_sprites(const ImageViewRGB32& frame, std::vector<bool>& sprites) const{
+    bool ret = false;
+    for (size_t i = 0; i < m_sprite_boxes.size(); i++){
+        const auto& box = m_sprite_boxes[i];
+        const auto stats = image_stats(extract_box_reference(frame, box));
+        // cout << stats.average.to_string() << " " << stats.stddev.to_string() << endl;
+        if (sprites[i] == false && (stats.average.sum() > 150.0 || stats.stddev.sum() > 60.0)){
+            ret = true;
+            sprites[i] = true;
+        }
+    }
+
+    return ret;
+}
+
+
+
+
+
+
+
+class Test_BattleSpriteWatcher : public ImageUnitTest{
+public:
+    Test_BattleSpriteWatcher(
+        const std::string& image,
+        bool expected
+    )
+        : ImageUnitTest("PokemonLA::BattleSpriteWatcher - " + image, {image})
+        , m_expected(expected)
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        DummyVideoOverlay overlay;
+        BattleSpriteWatcher detector(logger, overlay);
+        const ImageRGB32& image = images[0];
+        return detector.process_frame(image, current_time()) == m_expected;
+    };
+
+private:
+    bool m_expected;
+};
+
+
+
+void add_tests_BattleSpriteWatcher(UnitTestDatabase& database){
+
+}
+
+
+
+
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/PokemonLA/Inference/Battles/PokemonLA_BattleSpriteWatcher.h b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattleSpriteWatcher.h
similarity index 87%
rename from SerialPrograms/Source/PokemonLA/Inference/Battles/PokemonLA_BattleSpriteWatcher.h
rename to SerialPrograms/Source/VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattleSpriteWatcher.h
index 5f3d6a00c5..764e2d01b9 100644
--- a/SerialPrograms/Source/PokemonLA/Inference/Battles/PokemonLA_BattleSpriteWatcher.h
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattleSpriteWatcher.h
@@ -1,6 +1,6 @@
 /*  Battle Sprite Watcher
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *  
  *  Watch the sprites appear on the upper right corner of the screen during a mult-pokemon
  *  battle. This is useful to detect if any skittish pokemon escape during the starting
@@ -13,8 +13,8 @@
 #include "CommonFramework/ImageTools/ImageBoxes.h"
 #include "CommonFramework/Logging/Logger.h"
 #include "CommonFramework/VideoPipeline/VideoOverlay.h"
-#include "CommonFramework/InferenceInfra/VisualInferenceCallback.h"
-#include "PokemonLA/Inference/Battles/PokemonLA_BattleStartDetector.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+#include "VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattleStartDetector.h"
 
 namespace PokemonAutomation{
 
@@ -62,6 +62,13 @@ class BattleSpriteWatcher : public VisualInferenceCallback{
 };
 
 
+
+
+
+void add_tests_BattleSpriteWatcher(UnitTestDatabase& database);
+
+
+
 }
 }
 }
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattleStartDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattleStartDetector.cpp
new file mode 100644
index 0000000000..ee5cd4c7b3
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattleStartDetector.cpp
@@ -0,0 +1,115 @@
+/*  Battle Start Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/ImageTools/ImageStats.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Images/ImageGradient.h"
+#include "Tests/ImageUnitTest.h"
+#include "Tests/TestUtils.h"
+#include "PokemonLA_BattleStartDetector.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+
+BattleStartDetector::BattleStartDetector(Logger& logger, VideoOverlay& overlay)
+    : VisualInferenceCallback("BattleStartDetector")
+    , m_logger(logger)
+    , m_upper_boundary  (0.0, 0.113, 1.0, 0.15)
+    , m_lower_boundary (0.2, 0.871, 0.63, 0.015)
+{}
+
+void BattleStartDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(COLOR_BLUE, m_upper_boundary);
+    items.add(COLOR_BLUE, m_lower_boundary);
+}
+
+bool BattleStartDetector::process_frame(const ImageViewRGB32& frame, WallClock timestamp){
+
+    Color threshold(50, 50, 50);
+    
+    const ImageViewRGB32 upper_boundary = extract_box_reference(frame, m_upper_boundary);
+    
+    const size_t upper_border_length = count_horizontal_translucent_border_pixels(upper_boundary, threshold, true);
+
+    bool detected = upper_border_length / (float)upper_boundary.width() > 0.9;
+
+    if (detected == false){
+        return false;
+    }
+
+    const ImageViewRGB32 lower_boundary = extract_box_reference(frame, m_lower_boundary);
+
+    const size_t lower_border_length = count_horizontal_translucent_border_pixels(lower_boundary, threshold, false);
+
+    detected = lower_border_length / (float)lower_boundary.width() > 0.9;
+
+    if (detected && m_started == false){
+        m_started = true;
+        m_logger.log("Detected battle start by black borders.");
+    }
+
+    return detected;
+}
+
+
+
+
+
+
+
+
+
+
+
+
+class Test_BattleStartDetector : public ImageUnitTest{
+public:
+    Test_BattleStartDetector(
+        const std::string& image,
+        bool expected
+    )
+        : ImageUnitTest("PokemonLA::BattleStartDetector - " + image, {image})
+        , m_expected(expected)
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        DummyVideoOverlay overlay;
+        BattleStartDetector detector(logger, overlay);
+        const ImageRGB32& image = images[0];
+        return detector.process_frame(image, current_time()) == m_expected;
+    };
+
+private:
+    bool m_expected;
+};
+
+
+
+
+void add_tests_BattleStartDetector(UnitTestDatabase& database){
+
+}
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/PokemonLA/Inference/Battles/PokemonLA_BattleStartDetector.h b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattleStartDetector.h
similarity index 78%
rename from SerialPrograms/Source/PokemonLA/Inference/Battles/PokemonLA_BattleStartDetector.h
rename to SerialPrograms/Source/VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattleStartDetector.h
index 6543e11550..30efa123e0 100644
--- a/SerialPrograms/Source/PokemonLA/Inference/Battles/PokemonLA_BattleStartDetector.h
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattleStartDetector.h
@@ -1,6 +1,6 @@
 /*  Battle Start Detector
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *  
  *  Detect the start of a battle when the upper and lower part of the screen
  *  is covered by black.
@@ -9,10 +9,10 @@
 #ifndef PokemonAutomation_PokemonLA_BattleStartDetector_H
 #define PokemonAutomation_PokemonLA_BattleStartDetector_H
 
+#include "Common/Cpp/TestRunners/UnitTest.h"
 #include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "CommonFramework/Logging/Logger.h"
 #include "CommonFramework/VideoPipeline/VideoOverlay.h"
-#include "CommonFramework/InferenceInfra/VisualInferenceCallback.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
@@ -35,6 +35,14 @@ class BattleStartDetector : public VisualInferenceCallback{
 };
 
 
+
+
+
+void add_tests_BattleStartDetector(UnitTestDatabase& database);
+
+
+
+
 }
 }
 }
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Battles/PokemonLA_TransparentDialogueDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Battles/PokemonLA_TransparentDialogueDetector.cpp
new file mode 100644
index 0000000000..7ca5a66405
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Battles/PokemonLA_TransparentDialogueDetector.cpp
@@ -0,0 +1,93 @@
+/*  Transparent Dialogue Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "Tests/ImageUnitTest.h"
+#include "Tests/TestUtils.h"
+#include "PokemonLA_TransparentDialogueDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+
+TransparentDialogueDetector::TransparentDialogueDetector(
+    Logger& logger, VideoOverlay& overlay,
+    bool stop_on_detected
+)
+    : VisualInferenceCallback("TransparentDialogueDetector")
+    , m_arrow_detector(logger, overlay, stop_on_detected)
+    , m_ellipse_detector(logger, overlay, std::chrono::milliseconds(0), stop_on_detected)
+{}
+
+
+void TransparentDialogueDetector::make_overlays(VideoOverlaySet& items) const{
+    m_arrow_detector.make_overlays(items);
+    m_ellipse_detector.make_overlays(items);
+}
+
+
+bool TransparentDialogueDetector::process_frame(const ImageViewRGB32& frame, WallClock timestamp){
+    bool stop = m_arrow_detector.process_frame(frame, timestamp);
+    bool detected = m_arrow_detector.detected();
+    if (detected){
+        stop = stop && m_ellipse_detector.process_frame(frame, timestamp);
+        detected = m_ellipse_detector.detected();
+    }
+
+    m_detected.store(detected, std::memory_order_release);
+
+    return stop;
+}
+
+
+
+
+
+
+class Test_TransparentDialogueDetector : public ImageUnitTest{
+public:
+    Test_TransparentDialogueDetector(
+        const std::string& image,
+        bool expected
+    )
+        : ImageUnitTest("PokemonLA::TransparentDialogueDetector - " + image, {image})
+        , m_expected(expected)
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        DummyVideoOverlay overlay;
+        TransparentDialogueDetector detector(logger, overlay, true);
+        const ImageRGB32& image = images[0];
+        return detector.process_frame(image, current_time()) == m_expected;
+    };
+
+private:
+    bool m_expected;
+};
+
+
+void add_tests_TransparentDialogueDetector(UnitTestDatabase& database){
+    database.add<Test_TransparentDialogueDetector>("PokemonLA/TransparentDialogueDetector/macOS_bright/Avalugg_1_False.png", false);
+    database.add<Test_TransparentDialogueDetector>("PokemonLA/TransparentDialogueDetector/macOS_bright/Avalugg_2_False.png", false);
+    database.add<Test_TransparentDialogueDetector>("PokemonLA/TransparentDialogueDetector/macOS_bright/BrenDay_True.png", true);
+    database.add<Test_TransparentDialogueDetector>("PokemonLA/TransparentDialogueDetector/macOS_bright/BrenEvening_1_True.png", true);
+    database.add<Test_TransparentDialogueDetector>("PokemonLA/TransparentDialogueDetector/macOS_bright/BrenEvening_2_True.png", true);
+    database.add<Test_TransparentDialogueDetector>("PokemonLA/TransparentDialogueDetector/macOS_bright/BrenMorning_True.png", true);
+    database.add<Test_TransparentDialogueDetector>("PokemonLA/TransparentDialogueDetector/macOS_bright/BrenNight_True.png", true);
+    database.add<Test_TransparentDialogueDetector>("PokemonLA/TransparentDialogueDetector/macOS_bright/FieldlandsCoinDay_True.png", true);
+    database.add<Test_TransparentDialogueDetector>("PokemonLA/TransparentDialogueDetector/macOS_bright/MirelandsCoinEvening_True.png", true);
+    database.add<Test_TransparentDialogueDetector>("PokemonLA/TransparentDialogueDetector/macOS_bright/WendyNight_True.png", true);
+
+}
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Battles/PokemonLA_TransparentDialogueDetector.h b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Battles/PokemonLA_TransparentDialogueDetector.h
new file mode 100644
index 0000000000..c87c13d17f
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Battles/PokemonLA_TransparentDialogueDetector.h
@@ -0,0 +1,52 @@
+/*  Transparent Dialogue Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  Detect the transparent dialogue box from your opponent shown before and/or after the battle, like
+ *  Ingo's battles or Fortune Sisters'.
+ */
+
+#ifndef PokemonAutomation_PokemonLA_TransparentDialogueDetector_H
+#define PokemonAutomation_PokemonLA_TransparentDialogueDetector_H
+
+#include "Common/Cpp/TestRunners/UnitTest.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+#include "VideoGames/PokemonLA/Inference/Objects/PokemonLA_DialogEllipseDetector.h"
+#include "VideoGames/PokemonLA/Inference/Objects/PokemonLA_DialogYellowArrowDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+
+class TransparentDialogueDetector : public VisualInferenceCallback{
+public:
+    TransparentDialogueDetector(
+        Logger& logger, VideoOverlay& overlay,
+        bool stop_on_detected
+    );
+
+    bool detected() const{
+        return m_detected;
+    }
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+
+    virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override;
+
+private:
+    DialogYellowArrowDetector m_arrow_detector;
+    DialogueEllipseDetector m_ellipse_detector;
+    std::atomic<bool> m_detected;
+};
+
+
+
+void add_tests_TransparentDialogueDetector(UnitTestDatabase& database);
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/PokemonLA/Inference/Map/PokemonLA_MMOSpriteStarSymbolDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_MMOSpriteStarSymbolDetector.cpp
similarity index 81%
rename from SerialPrograms/Source/PokemonLA/Inference/Map/PokemonLA_MMOSpriteStarSymbolDetector.cpp
rename to SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_MMOSpriteStarSymbolDetector.cpp
index c1fb3660d9..9403396b89 100644
--- a/SerialPrograms/Source/PokemonLA/Inference/Map/PokemonLA_MMOSpriteStarSymbolDetector.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_MMOSpriteStarSymbolDetector.cpp
@@ -1,18 +1,18 @@
 /*  Map Detector
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include "CommonFramework/ImageTools/SolidColorTest.h"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/ImageTools/ImageDiff.h"
 #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
 #include "PokemonLA_MMOSpriteStarSymbolDetector.h"
-#include "CommonFramework/ImageMatch/ImageDiff.h"
 
 
-#include <iostream>
-using std::cout;
-using std::endl;
+//#include <iostream>
+//using std::cout;
+//using std::endl;
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
@@ -26,14 +26,14 @@ MMOSpriteStarSymbolDetector::MMOSpriteStarSymbolDetector(const ImageViewRGB32& f
     , m_symbol_colors(star_boxes.size(), FloatPixel())
     , m_frame_width(frame.width()), m_frame_height(frame.height())
 {
-    for(size_t i = 0; i < m_boxes.size(); i++){
+    for (size_t i = 0; i < m_boxes.size(); i++){
         ImageViewRGB32 ref = extract_box_reference(frame, m_boxes[i]);
         m_initial_images.push_back(std::move(ref));
     }
 }
 
 void MMOSpriteStarSymbolDetector::make_overlays(VideoOverlaySet& items) const{
-    for(const auto& box : m_boxes){
+    for (const auto& box : m_boxes){
         items.add(COLOR_RED, pixelbox_to_floatbox(m_frame_width, m_frame_height, box));
     }
 }
@@ -46,7 +46,7 @@ bool MMOSpriteStarSymbolDetector::process_frame(const ImageViewRGB32& frame, Wal
     }
 
     // Collect image color stats:
-    for(size_t i = 0; i < m_boxes.size(); i++){
+    for (size_t i = 0; i < m_boxes.size(); i++){
         ImageViewRGB32 ref = extract_box_reference(frame, m_boxes[i]);
         double rmsd = ImageMatch::pixel_RMSD(m_initial_images[i], ref);
         m_rmsd[i] += rmsd;
@@ -65,7 +65,7 @@ bool MMOSpriteStarSymbolDetector::process_frame(const ImageViewRGB32& frame, Wal
     // Caller of this detector can query `m_is_star` to know the detection result.
     // Details of the detection can be queried via `m_rmsd` and `m_symbol_colors`
     // 
-    for(size_t i = 0; i < m_boxes.size(); i++){
+    for (size_t i = 0; i < m_boxes.size(); i++){
         // Compute average values:
         m_rmsd[i] = m_rmsd[i] / (double)m_num_frames;
         m_symbol_colors[i] = m_symbol_colors[i] / (double)m_num_frames;
@@ -74,14 +74,14 @@ bool MMOSpriteStarSymbolDetector::process_frame(const ImageViewRGB32& frame, Wal
             continue;
         }
 
-        if (m_symbol_colors[i].r <= m_symbol_colors[i].g * 1.2 && m_symbol_colors[i].g > 200 && m_symbol_colors[i].r > 220) {
+        if (m_symbol_colors[i].r <= m_symbol_colors[i].g * 1.2 && m_symbol_colors[i].g > 200 && m_symbol_colors[i].r > 220){
             // It's not very red, so it's not a berry symbol
             m_is_star[i] = true;
         }
     }
 
     // ImageRGB32 output = frame.copy();
-    // for(size_t i = 0; i < m_boxes.size(); i++){
+    // for (size_t i = 0; i < m_boxes.size(); i++){
     //     draw_box(output, m_boxes[i], combine_rgb(255, 0,0));
     //     draw_box(output, ImagePixelBox(m_boxes[i].center_x()-1, m_boxes[i].center_y()-1, m_boxes[i].center_x()+1, m_boxes[i].center_y()+1), 
     //         combine_rgb(0, 255,0));
diff --git a/SerialPrograms/Source/PokemonLA/Inference/Map/PokemonLA_MMOSpriteStarSymbolDetector.h b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_MMOSpriteStarSymbolDetector.h
similarity index 91%
rename from SerialPrograms/Source/PokemonLA/Inference/Map/PokemonLA_MMOSpriteStarSymbolDetector.h
rename to SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_MMOSpriteStarSymbolDetector.h
index 184c7c15dc..107e712bdd 100644
--- a/SerialPrograms/Source/PokemonLA/Inference/Map/PokemonLA_MMOSpriteStarSymbolDetector.h
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_MMOSpriteStarSymbolDetector.h
@@ -1,6 +1,6 @@
 /*  MMO Sprite Star Symbol Detector
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  *  Detect the star symbols on MMO sprite on the map
  */
@@ -11,7 +11,7 @@
 #include <vector>
 #include "CommonFramework/ImageTools/ImageBoxes.h"
 #include "CommonFramework/ImageTools/FloatPixel.h"
-#include "CommonFramework/InferenceInfra/VisualInferenceCallback.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
diff --git a/SerialPrograms/Source/PokemonLA/Inference/Map/PokemonLA_MapDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_MapDetector.cpp
similarity index 87%
rename from SerialPrograms/Source/PokemonLA/Inference/Map/PokemonLA_MapDetector.cpp
rename to SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_MapDetector.cpp
index 31dfd307d9..d2a1817670 100644
--- a/SerialPrograms/Source/PokemonLA/Inference/Map/PokemonLA_MapDetector.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_MapDetector.cpp
@@ -1,11 +1,11 @@
 /*  Map Detector
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include "CommonFramework/ImageTools/SolidColorTest.h"
 #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Images/SolidColorTest.h"
 #include "PokemonLA_MapDetector.h"
 
 namespace PokemonAutomation{
diff --git a/SerialPrograms/Source/PokemonLA/Inference/Map/PokemonLA_MapDetector.h b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_MapDetector.h
similarity index 80%
rename from SerialPrograms/Source/PokemonLA/Inference/Map/PokemonLA_MapDetector.h
rename to SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_MapDetector.h
index ffe872182e..a9cef6f7a0 100644
--- a/SerialPrograms/Source/PokemonLA/Inference/Map/PokemonLA_MapDetector.h
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_MapDetector.h
@@ -1,6 +1,6 @@
 /*  Map Detector
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -8,7 +8,7 @@
 #define PokemonAutomation_PokemonLA_MapDetector_H
 
 #include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "CommonFramework/InferenceInfra/VisualInferenceCallback.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
diff --git a/SerialPrograms/Source/PokemonLA/Inference/Map/PokemonLA_MapMarkerLocator.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_MapMarkerLocator.cpp
similarity index 80%
rename from SerialPrograms/Source/PokemonLA/Inference/Map/PokemonLA_MapMarkerLocator.cpp
rename to SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_MapMarkerLocator.cpp
index 0aef28d05e..7bb39ba7e3 100644
--- a/SerialPrograms/Source/PokemonLA/Inference/Map/PokemonLA_MapMarkerLocator.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_MapMarkerLocator.cpp
@@ -1,21 +1,23 @@
 /*  Item Compatibility Detector
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
+#include <cfloat>
 #include <cmath>
+#include <iostream>
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
 #include "Kernels/Waterfill/Kernels_Waterfill_Session.h"
 #include "CommonFramework/ImageTypes/ImageRGB32.h"
-#include "CommonFramework/ImageTools/BinaryImage_FilterRgb32.h"
 #include "CommonFramework/ImageTools/ImageStats.h"
 #include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "CommonFramework/ImageTools/WaterfillUtilities.h"
+#include "CommonTools/Images/BinaryImage_FilterRgb32.h"
+#include "CommonTools/Images/WaterfillUtilities.h"
+#include "Tests/ImageUnitTest.h"
+#include "Tests/TestUtils.h"
 #include "PokemonLA_MapMarkerLocator.h"
-#include "PokemonLA/PokemonLA_Locations.h"
 
-#include <cfloat>
-#include <iostream>
 using std::cout;
 using std::endl;
 
@@ -95,7 +97,7 @@ double get_orientation_on_map(const ImageViewRGB32& screen, bool avoid_lava_area
 
     // The angle of each marker end relative to the marker center
     double end_angles[3] = {0.0, 0.0, 0.0};
-    for(int i = 0; i < 3; i++){
+    for (int i = 0; i < 3; i++){
         ptrdiff_t x = (ptrdiff_t)marker_ends[i].center_of_gravity_x() - (ptrdiff_t)local_marker_center_x;
         ptrdiff_t y = (ptrdiff_t)marker_ends[i].center_of_gravity_y() - (ptrdiff_t)local_marker_center_y;
         double angle = std::atan2(y, x) * 57.29577951308232;
@@ -109,7 +111,7 @@ double get_orientation_on_map(const ImageViewRGB32& screen, bool avoid_lava_area
     double end_angle_distances[3] = {0.0, 0.0, 0.0};
     // Find out which two ends form the smallest angular distance between them
     int min_angle_distance_index = 0;
-    for(int i = 0; i < 3; i++){
+    for (int i = 0; i < 3; i++){
         end_angle_distances[i] = std::fabs(end_angles[i] - end_angles[(i+1)%3]);
         if (end_angle_distances[i] > 180){
             end_angle_distances[i] = 360 - end_angle_distances[i];
@@ -134,6 +136,49 @@ double get_orientation_on_map(const ImageViewRGB32& screen, bool avoid_lava_area
 
 
 
+
+
+
+
+
+
+
+class Test_MapMarkerLocator : public ImageUnitTest{
+public:
+    Test_MapMarkerLocator(
+        const std::string& image,
+        float target_angle, float threshold
+    )
+        : ImageUnitTest("PokemonLA::MapMarkerLocator - " + image, {image})
+        , m_target_angle(target_angle)
+        , m_threshold(threshold)
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        const ImageRGB32& image = images[0];
+        double angle = get_orientation_on_map(image);
+        TEST_RESULT_APPROXIMATE_STR(angle, m_target_angle, m_threshold);
+        return true;
+    };
+
+private:
+    float m_target_angle;
+    float m_threshold;
+};
+
+
+
+
+void add_tests_MapMarkerLocator(UnitTestDatabase& database){
+
+}
+
+
+
+
 }
 }
 }
diff --git a/SerialPrograms/Source/PokemonLA/Inference/Map/PokemonLA_MapMarkerLocator.h b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_MapMarkerLocator.h
similarity index 87%
rename from SerialPrograms/Source/PokemonLA/Inference/Map/PokemonLA_MapMarkerLocator.h
rename to SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_MapMarkerLocator.h
index 3820a5a17f..9f5ed2df4b 100644
--- a/SerialPrograms/Source/PokemonLA/Inference/Map/PokemonLA_MapMarkerLocator.h
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_MapMarkerLocator.h
@@ -1,6 +1,6 @@
 /*  Map Location
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *  
  *  Function to detect player character location and orientation on the in-game map.
  */
@@ -8,6 +8,8 @@
 #ifndef PokemonAutomation_PokemonLA_MapLocation_H
 #define PokemonAutomation_PokemonLA_MapLocation_H
 
+#include "Common/Cpp/TestRunners/UnitTest.h"
+
 namespace PokemonAutomation{
     class ImageViewRGB32;
 namespace NintendoSwitch{
@@ -31,6 +33,11 @@ enum class MapRegion;
 double get_orientation_on_map(const ImageViewRGB32& screen, bool avoid_lava_area = false);
 
 
+
+
+void add_tests_MapMarkerLocator(UnitTestDatabase& database);
+
+
 }
 }
 }
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_MapMissionTabReader.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_MapMissionTabReader.cpp
new file mode 100644
index 0000000000..701f88eda0
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_MapMissionTabReader.cpp
@@ -0,0 +1,71 @@
+/*  Map Zoom Level Reader
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "CommonFramework/ImageTypes/ImageRGB32.h"
+#include "CommonFramework/ImageTools/ImageStats.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonTools/Images/SolidColorTest.h"
+//#include "Tests/TestUtils.h"
+#include "Tests/ImageUnitTest.h"
+#include "PokemonLA_MapMissionTabReader.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+bool is_map_mission_tab_raised(const ImageViewRGB32& screen){
+    // The white area around the "R" button when the tab is raise.
+    const ImageFloatBox box0{0.9235, 0.617, 0.003, 0.019};
+    const ImageFloatBox box1{0.937, 0.62, 0.0035, 0.012};
+
+    return is_white(image_stats(extract_box_reference(screen, box0))) || 
+        is_white(image_stats(extract_box_reference(screen, box1)));
+}
+
+
+
+
+
+
+
+
+
+class Test_MapMissionTabReader : public ImageUnitTest{
+public:
+    Test_MapMissionTabReader(
+        const std::string& image,
+        bool expected
+    )
+        : ImageUnitTest("PokemonLA::MapMissionTabReader - " + image, {image})
+        , m_expected(expected)
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        const ImageRGB32& image = images[0];
+        return is_map_mission_tab_raised(image) == m_expected;
+    };
+
+private:
+    bool m_expected;
+};
+
+
+
+void add_tests_MapMissionTabReader(UnitTestDatabase& database){
+
+}
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_MapMissionTabReader.h b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_MapMissionTabReader.h
new file mode 100644
index 0000000000..9324a2095a
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_MapMissionTabReader.h
@@ -0,0 +1,36 @@
+/*  Map Mission Tab Reader
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+
+#ifndef PokemonAutomation_PokemonLA_MapMissionTabReader_H
+#define PokemonAutomation_PokemonLA_MapMissionTabReader_H
+
+#include "Common/Cpp/TestRunners/UnitTest.h"
+
+namespace PokemonAutomation{
+    class ImageViewRGB32;
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+
+// Whether the Missions & Requests tab is raised on map view.
+// The detection is most reliable when map is in zoom level 1: the full region map view.
+// Suggest using this detection only when zoom level is 1.
+bool is_map_mission_tab_raised(const ImageViewRGB32& screen);
+
+
+
+
+
+void add_tests_MapMissionTabReader(UnitTestDatabase& database);
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_MapWeatherAndTimeReader.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_MapWeatherAndTimeReader.cpp
new file mode 100644
index 0000000000..432bea37d5
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_MapWeatherAndTimeReader.cpp
@@ -0,0 +1,190 @@
+/*  Selected Region Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <iostream>
+#include <sstream>
+#include "Common/Cpp/Logging/AbstractLogger.h"
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonTools/Images/ImageFilter.h"
+#include "CommonTools/ImageMatch/ImageCropper.h"
+#include "CommonTools/ImageMatch/SilhouetteDictionaryMatcher.h"
+#include "Tests/ImageUnitTest.h"
+#include "Tests/TestUtils.h"
+#include "VideoGames/PokemonLA/Resources/PokemonLA_WeatherAndTimeIcons.h"
+#include "PokemonLA_MapWeatherAndTimeReader.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+
+ImageMatch::SilhouetteDictionaryMatcher BUILD_WEATHER_ICON_MATCHER(){
+    ImageMatch::SilhouetteDictionaryMatcher matcher;
+    for (size_t i = 0; i < NUM_WEATHER; i++){
+        matcher.add(WEATHER_NAMES[i], ALL_WEATHER_ICONS()[i]);
+    }
+    return matcher;
+}
+
+const ImageMatch::SilhouetteDictionaryMatcher& WEATHER_ICON_MATCHER(){
+    const static auto matcher = BUILD_WEATHER_ICON_MATCHER();
+    return matcher;
+}
+
+
+ImageMatch::SilhouetteDictionaryMatcher BUILD_TIME_OF_DAY_ICON_MATCHER(){
+    ImageMatch::SilhouetteDictionaryMatcher matcher;
+    for (size_t i = 0; i < NUM_TIMES_OF_DAY; i++){
+        // +1 here to skip the name of TimeOfDay::NONE
+        matcher.add(TIME_OF_DAY_NAMES[i+1], ALL_TIME_OF_DAY_ICONS()[i]);
+    }
+    return matcher;
+}
+
+const ImageMatch::SilhouetteDictionaryMatcher& TIME_OF_DAY_ICON_MATCHER(){
+    const static auto matcher = BUILD_TIME_OF_DAY_ICON_MATCHER();
+    return matcher;
+}
+
+
+
+
+Weather detect_weather_on_map(Logger& logger, const ImageViewRGB32& screen){
+    const ImageFloatBox box{0.0285, 0.069, 0.025, 0.044};
+    
+    // Get a loose crop of the weather icon
+    ImageViewRGB32 cropped_image = extract_box_reference(screen, box);
+
+    // image.save("./weather_crop.png");
+    // Get a tight crop:
+    const ImagePixelBox tight_box = ImageMatch::enclosing_rectangle_with_pixel_filter(
+        cropped_image,
+        // The filter is a lambda function that returns true on white weather icon pixels.
+        [](Color pixel){
+            return (uint32_t)pixel.red() + pixel.green() + pixel.blue() > 600;
+        }
+    );
+    cropped_image = extract_box_reference(cropped_image, tight_box);
+
+    // Replace the background dark pixels (outside the range from 0xffa0a0a0 to 0xffffffff) with
+    // 0-alpha black pixels.
+    const bool replace_range = false;
+    ImageRGB32 icon_image = filter_rgb32_range(
+        cropped_image,
+        0xffa0a0a0, 0xffffffff, Color(0), replace_range
+    );
+
+    const auto match_result = WEATHER_ICON_MATCHER().match(icon_image, 100);
+    std::ostringstream os;
+    os << "Weather icon match result: ";
+    for (auto result : match_result.results){
+        os << result.second << "(" << result.first << ") ";
+    }
+    logger.log(os.str(), COLOR_BLUE);
+
+    return get_weather(match_result.results.begin()->second);
+}
+
+
+TimeOfDay detect_time_of_day_on_map(Logger& logger, const ImageViewRGB32& screen){
+    const ImageFloatBox box{0.910, 0.070, 0.034, 0.041};
+    
+    // Get a loose crop of the time of day icon
+    ImageViewRGB32 cropped_image = extract_box_reference(screen, box);
+
+    // Get a tight crop:
+    const ImagePixelBox tight_box = ImageMatch::enclosing_rectangle_with_pixel_filter(
+        cropped_image,
+        // The filter is a lambda function that returns true on white time of day icon pixels.
+        [](Color pixel){
+            return (uint32_t)pixel.red() + pixel.green() + pixel.blue() > 600;
+        }
+    );
+    cropped_image = extract_box_reference(cropped_image, tight_box);
+
+    // Replace the background dark pixels (outside the range from 0xffa0a0a0 to 0xffffffff) with
+    // 0-alpha black pixels.
+    const bool replace_range = false;
+    ImageRGB32 icon_image = filter_rgb32_range(
+        cropped_image,
+        0xffa0a0a0, 0xffffffff, Color(0), replace_range
+    );
+
+    const auto match_result = TIME_OF_DAY_ICON_MATCHER().match(icon_image, 100);
+
+    std::ostringstream os;
+    os << "Time of day icon match result: ";
+    for (auto result : match_result.results){
+        os << result.second << "(" << result.first << ") ";
+    }
+    logger.log(os.str(), COLOR_BLUE);
+
+    return get_time_of_day(match_result.results.begin()->second);
+}
+
+
+
+
+
+
+
+class Test_MapWeatherAndTimeReader : public ImageUnitTest{
+public:
+    Test_MapWeatherAndTimeReader(
+        const std::string& image,
+        std::vector<std::string> keywords
+    )
+        : ImageUnitTest("PokemonLA::MapWeatherAndTimeReader - " + image, {image})
+        , m_keywords(std::move(keywords))
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        // two keywords: <Weather name> <Time of day name>
+        if (m_keywords.size() < 2){
+            std::stringstream ss;
+            ss << "Error: not enough number of keywords in the filename. Found only " << m_keywords.size() << "." << std::endl;
+            return ss.str();
+        }
+
+        const auto& target_weather = m_keywords[m_keywords.size()-2];
+        const auto& target_time = m_keywords[m_keywords.size()-1];
+
+        const ImageRGB32& image = images[0];
+        const std::string weather_result = WEATHER_NAMES[(int)detect_weather_on_map(logger, image)];
+        const std::string time_result = TIME_OF_DAY_NAMES[(int)detect_time_of_day_on_map(logger, image)];
+
+        TEST_RESULT_COMPONENT_EQUAL_STR(weather_result, target_weather, "weather");
+        TEST_RESULT_COMPONENT_EQUAL_STR(time_result, target_time, "time of day");
+
+        return true;
+    };
+
+private:
+    std::vector<std::string> m_keywords;
+};
+
+
+
+
+
+
+void add_tests_MapWeatherAndTimeReader(UnitTestDatabase& database){
+
+}
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_MapWeatherAndTimeReader.h b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_MapWeatherAndTimeReader.h
new file mode 100644
index 0000000000..74d64ee52b
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_MapWeatherAndTimeReader.h
@@ -0,0 +1,37 @@
+/*  Map weather & Time Reader
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *  
+ *  Read the weather and time symbols on the map.
+ */
+
+
+#ifndef PokemonAutomation_PokemonLA_MapWeatherAndTimeReader_H
+#define PokemonAutomation_PokemonLA_MapWeatherAndTimeReader_H
+
+#include "Common/Cpp/TestRunners/UnitTest.h"
+#include "VideoGames/PokemonLA/PokemonLA_WeatherAndTime.h"
+
+namespace PokemonAutomation{
+    class Logger;
+    class ImageViewRGB32;
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+
+Weather detect_weather_on_map(Logger& logger, const ImageViewRGB32& screen);
+
+
+TimeOfDay detect_time_of_day_on_map(Logger& logger, const ImageViewRGB32& screen);
+
+
+
+
+void add_tests_MapWeatherAndTimeReader(UnitTestDatabase& database);
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_MapZoomLevelReader.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_MapZoomLevelReader.cpp
new file mode 100644
index 0000000000..f402550f6b
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_MapZoomLevelReader.cpp
@@ -0,0 +1,120 @@
+/*  Map Zoom Level Reader
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <cmath>
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "CommonFramework/ImageTypes/ImageRGB32.h"
+#include "CommonFramework/ImageTools/ImageStats.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonTools/Images/ImageFilter.h"
+//#include "Tests/TestUtils.h"
+#include "Tests/ImageUnitTest.h"
+#include "PokemonLA_MapZoomLevelReader.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+int read_map_zoom_level(const ImageViewRGB32& screen){
+    
+    // The three locations of the yellow disk on the zoom gauge, from left to right.
+    // Left most is Hisui map, zoom level 0. Right most is local view, zoom level 2.
+    const ImageFloatBox boxes[3] = {
+        {0.780, 0.085, 0.008, 0.014},
+        {0.795, 0.082, 0.010, 0.019},
+        {0.807, 0.081, 0.014, 0.022},
+    };
+
+    double max_yellow = 0;
+    int max_yellow_index = -1;
+
+    for (int i = 0; i < 3; i++){
+
+        // Replacing non-yellow color with zero-alpha color so that they won't be counted in
+        // the following image_stats()
+        const bool replace_background = true;
+        size_t pixels_filtered;
+        ImageRGB32 region = filter_rgb32_range(
+            pixels_filtered,
+            extract_box_reference(screen, boxes[i]),
+            combine_rgb(0, 0, 0), combine_rgb(200, 200, 255), Color(0), replace_background
+        );
+        if (pixels_filtered == (size_t)region.width() * (size_t)region.height()){
+            // All pixels are filtered out, so no yellow color. In this case, this is defenitiely not the location
+            // of the yellow disk:
+            // std::cout << "No yellow disk at " << i << std::endl;
+            continue;
+        }
+
+        const auto stats = image_stats(region);
+
+        if (std::isnan(stats.average.r) == false && std::isnan(stats.average.g) == false){
+            const double yellow = (stats.average.r + stats.average.g) / 2.0;
+            if (yellow > max_yellow){
+                max_yellow_index = i;
+                max_yellow = yellow;
+            }
+        }
+        // std::cout << "Compatibility color " << stats.average << " " << stats.stddev << std::endl;
+    }
+
+    return max_yellow_index;
+}
+
+
+
+
+
+
+
+
+class Test_MapZoomLevelReader : public ImageUnitTest{
+public:
+    Test_MapZoomLevelReader(
+        const std::string& image,
+        int expected
+    )
+        : ImageUnitTest("PokemonLA::MapZoomLevelReader - " + image, {image})
+        , m_expected(expected)
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        const ImageRGB32& image = images[0];
+        int zoom = read_map_zoom_level(image);
+        return zoom == m_expected;
+    };
+
+private:
+    int m_expected;
+};
+
+
+
+void add_tests_MapZoomLevelReader(UnitTestDatabase& database){
+    database.add<Test_MapZoomLevelReader>("PokemonLA/MapZoomLevelReader/macOS_bright/Icelands_1.png", 1);
+    database.add<Test_MapZoomLevelReader>("PokemonLA/MapZoomLevelReader/macOS_bright/Icelands_2.png", 2);
+    database.add<Test_MapZoomLevelReader>("PokemonLA/MapZoomLevelReader/macOS_bright/IcelandsBerryIconLeft_2.png", 2);
+    database.add<Test_MapZoomLevelReader>("PokemonLA/MapZoomLevelReader/macOS_bright/IcelandsBerryIconMiddle_2.png", 2);
+    database.add<Test_MapZoomLevelReader>("PokemonLA/MapZoomLevelReader/macOS_bright/Village_0.png", 0);
+
+}
+
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_MapZoomLevelReader.h b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_MapZoomLevelReader.h
new file mode 100644
index 0000000000..ca94e4ac3c
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_MapZoomLevelReader.h
@@ -0,0 +1,35 @@
+/*  Map Zoom Level Reader
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+
+#ifndef PokemonAutomation_PokemonLA_MapZoomLevelReader_H
+#define PokemonAutomation_PokemonLA_MapZoomLevelReader_H
+
+#include "Common/Cpp/TestRunners/UnitTest.h"
+
+namespace PokemonAutomation{
+    class ImageViewRGB32;
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+
+// Return the zoom level of the map by checking the location of the yellow disk in
+// the zoom gauge.
+// zoom level 0: full Hisui map view
+// zoom level 1: full region map view
+// zoom level 2: local view
+// Return -1 if the reading fails.
+int read_map_zoom_level(const ImageViewRGB32& screen);
+
+
+
+void add_tests_MapZoomLevelReader(UnitTestDatabase& database);
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/PokemonLA/Inference/Map/PokemonLA_OutbreakReader.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_OutbreakReader.cpp
similarity index 86%
rename from SerialPrograms/Source/PokemonLA/Inference/Map/PokemonLA_OutbreakReader.cpp
rename to SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_OutbreakReader.cpp
index e56f328a6a..4e0ebca76f 100644
--- a/SerialPrograms/Source/PokemonLA/Inference/Map/PokemonLA_OutbreakReader.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_OutbreakReader.cpp
@@ -1,6 +1,6 @@
 /*  Outbreak Reader
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -24,6 +24,10 @@ OutbreakReader::OutbreakReader(Logger& logger, Language language, VideoOverlay&
     , m_text_box(overlay, {0.050, 0.177, 0.200, 0.038})
 {}
 
+void OutbreakReader::make_overlays(VideoOverlaySet& items) const{
+    items.add(COLOR_RED, m_dialog_box0);
+    items.add(COLOR_RED, m_dialog_box1);
+}
 OCR::StringMatchResult OutbreakReader::read(const ImageViewRGB32& screen) const{
     OCR::StringMatchResult result;
     ImageStats box0 = image_stats(extract_box_reference(screen, m_dialog_box0));
diff --git a/SerialPrograms/Source/PokemonLA/Inference/Map/PokemonLA_OutbreakReader.h b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_OutbreakReader.h
similarity index 79%
rename from SerialPrograms/Source/PokemonLA/Inference/Map/PokemonLA_OutbreakReader.h
rename to SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_OutbreakReader.h
index c08da1f2ea..16d6d671cb 100644
--- a/SerialPrograms/Source/PokemonLA/Inference/Map/PokemonLA_OutbreakReader.h
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_OutbreakReader.h
@@ -1,6 +1,6 @@
 /*  Outbreak Reader
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *  
  *  Read Outbreak pokemon text on map when leaving village
  */
@@ -9,10 +9,9 @@
 #define PokemonAutomation_PokemonLA_OutbreakReader_H
 
 #include "CommonFramework/Language.h"
-#include "CommonFramework/Logging/Logger.h"
 #include "CommonFramework/ImageTools/ImageBoxes.h"
 #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
-#include "CommonFramework/OCR/OCR_StringMatchResult.h"
+#include "CommonTools/OCR/OCR_StringMatchResult.h"
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
@@ -23,6 +22,7 @@ class OutbreakReader{
 public:
     OutbreakReader(Logger& logger, Language language, VideoOverlay& overlay);
 
+    void make_overlays(VideoOverlaySet& items) const;
     OCR::StringMatchResult read(const ImageViewRGB32& screen) const;
 
 
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_PokemonMapSpriteReader.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_PokemonMapSpriteReader.cpp
new file mode 100644
index 0000000000..6e95276262
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_PokemonMapSpriteReader.cpp
@@ -0,0 +1,1230 @@
+/*  Selected Region Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <math.h>
+#ifndef M_PI
+#define M_PI 3.14159265358979323846
+#endif
+
+#include <cmath>
+#include <cfloat>
+#include <functional>
+#include <sstream>
+#include <array>
+#include <string>
+#include <vector>
+#include <map>
+#include <algorithm>
+#include <iostream>
+#include "Common/Compiler.h"
+#include "Common/Cpp/Exceptions.h"
+#include "Common/Cpp/Filesystem/Filesystem.h"
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "CommonFramework/GlobalAutoPaths.h"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/ImageTypes/ImageHSV32.h"
+#include "CommonFramework/ImageTools/ImageStats.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/ImageTools/ImageDiff.h"
+#include "CommonFramework/Tools/DebugDumper.h"
+#include "CommonTools/Resources/SpriteDatabase.h"
+#include "CommonTools/Images/ImageFilter.h"
+#include "Tests/ImageUnitTest.h"
+#include "Tests/TestUtils.h"
+#include "VideoGames/PokemonLA/Resources/PokemonLA_AvailablePokemon.h"
+#include "VideoGames/PokemonLA/Inference/Objects/PokemonLA_MMOQuestionMarkDetector.h"
+#include "PokemonLA_PokemonMapSpriteReader.h"
+
+using std::cout;
+using std::cerr;
+using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+namespace{
+
+using FeatureType = double;
+using FeatureVector = std::vector<FeatureType>;
+
+using ImageMatch::ExactImageDictionaryMatcher;
+
+// We set each sprite resolution to be 50 x 50 during image matching.
+const size_t IMAGE_TEMPLATE_SIZE = 50;
+// The amount of pixel offset allowed in color matching
+const size_t IMAGE_COLOR_MATCH_EXTRA_SIDE_EXT = 2;
+
+const size_t EXTENDED_IMAGE_SIZE = IMAGE_TEMPLATE_SIZE + IMAGE_COLOR_MATCH_EXTRA_SIDE_EXT * 2;
+
+// Defined locally stored data for matching MMO sprites:
+// Store data belonging to one sprite
+struct PerSpriteMatchingData{
+    
+    FeatureVector feature;
+
+    ImageStats rgb_stats;
+    
+    ImageHSV32 hsv_image;
+    
+    ImageRGB32 gradient_image;
+};
+
+using MMOSpriteMatchingMap = std::map<std::string, PerSpriteMatchingData>;
+
+inline bool is_transparent(uint32_t g){
+    return (g >> 24) < 128;
+}
+
+
+FeatureType feature_distance(const FeatureVector& a, const FeatureVector& b){
+    if (a.size() != b.size()){
+        cout << "Error, feature size mismatch " << a.size() << " " << b.size() << endl;
+        throw std::runtime_error("feature size mismatch");
+    }
+    FeatureType sum = 0.0f;
+    for (size_t i = 0; i < a.size(); i++){
+        FeatureType d = a[i] - b[i];
+        sum += d*d;
+    }
+
+    return sum;
+}
+
+std::string feature_to_str(const FeatureVector& a){
+    std::ostringstream os;
+    os << "[";
+    for (size_t i = 0; i < a.size(); i++){
+        if (i != 0){
+            os << ", ";
+        }
+        os << a[i];
+    }
+    os << "]";
+    return os.str();
+}
+
+void run_Sobel_gradient_filter(const ImageViewRGB32& image, std::function<void(size_t x, size_t y, int sum_x[3], int sum_y[3])> process_gradient){
+    const size_t width = image.width();
+    const size_t height = image.height();
+    // Kernel for computing gradient along x axis
+    const int kx[3][3] = {
+        {-1, 0, 1},
+        {-2, 0, 2},
+        {-1, 0, 1},
+    };
+    // kernel for gradient along y axis
+    const int ky[3][3] = {
+        { 1,  2,  1},
+        { 0,  0,  0},
+        {-1, -2, -1},
+    };
+    const int ksz = 3; // kernel size
+    if (width <= ksz || height <= ksz){
+        return;
+    }
+    const size_t x_end = width - ksz + 1;
+    const size_t y_end = height - ksz + 1;
+
+    for (size_t y = 0; y < y_end; y++){
+        for (size_t x = 0; x < x_end; x++){
+            int sum_x[3] = {0, 0, 0};
+            int sum_y[3] = {0, 0, 0};
+            bool has_alpha_pixel = false;
+            for (size_t sy = 0; sy < 3; sy++){
+                for (size_t sx = 0; sx < 3; sx++){
+                    uint32_t p = image.pixel(x + sx, y + sy);
+                    int alpha = p >> 24;
+                    if (alpha < 128){
+                        // We don't compute gradient when there is a pixel in the kernel
+                        // scope that is transparent
+                        has_alpha_pixel = true;
+                        break;
+                    }
+                    for (int ch = 0; ch < 3; ch++){ // rgb channel
+                        int shift = ch * 8;
+                        int c = (uint32_t(0xff) & p >> shift);
+
+                        sum_x[ch] += c * kx[sy][sx];
+                        sum_y[ch] += c * ky[sy][sx];
+                    }
+                }
+                if (has_alpha_pixel){
+                    break;
+                }
+            } // end of kernel operation
+            if (has_alpha_pixel){
+                continue;
+            }
+
+            process_gradient(x+1, y+1, sum_x, sum_y);
+        }
+    }
+}
+
+ImageRGB32 smooth_image(const ImageViewRGB32& image){
+    // static int count = 0;
+    // {
+    //     image.save("./test_smooth_before_" + std::to_string(count) + ".png");
+    // }
+
+    ImageRGB32 result(image.width(), image.height());
+    result.fill(0);
+
+    const float filter[5] = {0.062f, 0.244f, 0.388f, 0.244f, 0.062f};
+
+    size_t image_width = image.width();
+    size_t image_height = image.height();
+    for (size_t y = 0; y < image_height; y++){
+        for (size_t x = 0; x < image_width; x++){
+            float sum[3] = {0,0,0};
+            float weights = 0.0;
+            for (size_t i = 0; i < 5; i++){
+                if (x + i < 2 || x + i >= image_width + 2){
+                    continue;
+                }
+                size_t sx = x + i - 2;
+            
+                uint32_t p = image.pixel(sx, y);
+                if (is_transparent(p)){
+                    continue;
+                }
+
+                weights += filter[i];
+
+                for (int ch = 0; ch < 3; ch++){
+                    int shift = 16 - ch * 8;
+                    int c = (uint32_t(0xff) & p >> shift);
+                    sum[ch] += filter[i] * c;
+                }
+            }
+            if (weights == 0){
+                continue;
+            }
+
+            char c[3];
+            for (int ch = 0; ch < 3; ch++){
+                sum[ch] /= weights;
+                int v = std::min(std::max(int(sum[ch] + 0.5f), 0), 255);
+                c[ch] = (char)v;
+            }
+            result.pixel(x, y) = combine_rgb(c[0], c[1], c[2]);
+        }
+    }
+
+    ImageRGB32 result2(image.width(), image.height());
+    result2.fill(0);
+
+    for (size_t y = 0; y < image_height; y++){
+        for (size_t x = 0; x < image_width; x++){
+            float sum[3] = {0,0,0};
+            float weights = 0.0;
+            for (size_t i = 0; i < 5; i++){
+                if (y + i < 2 || y + i - 2 >= image_height){
+                    continue;
+                }
+                size_t sy = y + i - 2;
+
+                uint32_t p = result.pixel(x, sy);
+                if (is_transparent(p)){
+                    continue;
+                }
+
+                weights += filter[i];
+
+                for (int ch = 0; ch < 3; ch++){
+                    int shift = 16 - ch * 8;
+                    int c = (uint32_t(0xff) & (p >> shift));
+                    sum[ch] += filter[i] * c;
+                }
+            }
+            if (weights == 0){
+                continue;
+            }
+
+            char c[3];
+            for (int ch = 0; ch < 3; ch++){
+                sum[ch] /= weights;
+                int v = std::min(std::max(int(sum[ch] + 0.5f), 0), 255);
+                c[ch] = (char)v;
+            }
+            result2.pixel(x, y) = combine_rgb(c[0], c[1], c[2]);
+        }
+    }
+
+    // {
+    //     result_ref.save("./test_smooth_middle_" + std::to_string(count) + ".png");
+    //     result_ref2.save("./test_smooth_after_" + std::to_string(count) + ".png");
+    //     count++;
+    // }
+    // exit(0);
+
+    return result2;
+}
+
+
+ImageRGB32 compute_image_gradient(const ImageViewRGB32& image){
+    ImageRGB32 result(image.width(), image.height());
+    result.fill(0);
+
+    run_Sobel_gradient_filter(image, [&](size_t x, size_t y, int sum_x[3], int sum_y[3]){
+        int gx = (sum_x[0] + sum_x[1] + sum_x[2] + 1) / 3;
+        int gy = (sum_y[0] + sum_y[1] + sum_y[2] + 1) / 3;
+
+        uint8_t gxc = (uint8_t)std::min(std::abs(gx), 255);
+        uint8_t gyc = (uint8_t)std::min(std::abs(gy), 255);
+
+        result.pixel(x, y) = combine_rgb(gxc, gyc, 0);
+    });
+
+    return result;
+}
+
+FeatureVector compute_gradient_histogram(const ImageViewRGB32& image){
+    const int num_angle_divisions = 8;
+    double division_angle = 2. * M_PI / num_angle_divisions;
+    double inverse_division_angle = 1.0 / division_angle;
+
+    std::array<int, num_angle_divisions> bin = {0};
+
+    int num_grad = 0;
+
+    run_Sobel_gradient_filter(image, [&](size_t x, size_t y, int sum_x[3], int sum_y[3]){
+        int gx = sum_x[0] + sum_x[1] + sum_x[2];
+        int gy = sum_y[0] + sum_y[1] + sum_y[2];
+        if (gx*gx + gy*gy <= 2000){
+            return;
+        }
+        num_grad++;
+
+        // if (count == 0){
+        //     // cout << "gxy " << sum_x[0] << " " << sum_x[1] << " " << sum_x[2] << ", " <<
+        //     //  sum_y[0] << " " << sum_y[1] << " " << sum_y[2] << endl;
+        //     int gxc = std::min(std::abs(gx), 255);
+        //     int gyc = std::min(std::abs(gy), 255);
+
+        //     output_image->setPixelColor(x, y, QColor(gxc, gyc, 0));
+        // }
+
+        double angle = std::atan2(gy, gx); // range in -pi, pi
+        int bin_idx = int((angle + M_PI) * inverse_division_angle);
+        // clamp bin to [0, 11]
+        bin_idx = std::min(std::max(bin_idx, 0), num_angle_divisions-1);
+        bin[bin_idx]++;
+    });
+
+    FeatureVector result(num_angle_divisions);
+    for (size_t i = 0; i < num_angle_divisions; i++){
+        result[i] = bin[i] / (FeatureType)num_grad;
+    }
+
+    return result;
+}
+
+} // end anonymous namespace
+
+FeatureVector compute_feature(const ImageViewRGB32& input_image){
+    ImageRGB32 image = input_image.copy();
+    size_t width = image.width();
+    size_t height = image.height();
+
+    // Set pixel outside the sprite circle to transparent:
+    double r = (width + height) / 4.0;
+    double center_x  = (width-1) / 2.0f;
+    double center_y = (height-1) / 2.0f;
+    double r2 = r * r;
+    for (size_t y = 0; y < height; y++){
+        for (size_t x = 0; x < width; x++){
+            if ((x-center_x)*(x-center_x) + (y-center_y)*(y-center_y) >= r2){
+                image.pixel(x, y) = 0;
+            }
+        }
+    }    
+
+    // Divide the image into 4 areas, compute average color on each.
+    // Note: we skip the upper right area because that area may overlap with
+    // the berry or star (bonus wave) symbol.
+    const int num_divisions = 2;
+    const double portion = 1.0 / (double)num_divisions;
+    FeatureVector result;
+    for (int i = 0; i < num_divisions; i++){
+        for (int j = 0; j < num_divisions; j++){
+            if (i == 1 && j == 0){
+                continue; // skip the berry / bonus wave overlapping area
+            }
+            ImageFloatBox box{i*portion, j*portion, portion, portion};
+            auto sub_image = extract_box_reference(image, box);
+
+            ImageStats stats = image_stats(sub_image);
+
+            result.push_back(stats.average.r);
+            result.push_back(stats.average.g);
+            result.push_back(stats.average.b);
+        }
+    }
+
+    return result;
+}
+
+void load_and_visit_MMO_sprite(std::function<void(const std::string& slug, const ImageViewRGB32& sprite)> visit_sprit){
+    static const SpriteDatabase database("PokemonLA/MMOSprites.png", "PokemonLA/MMOSprites.json");
+    for (const auto& item : database){
+        // cout << "sprite " << count << endl;
+        const std::string& slug = item.first;
+        const auto& sprite = item.second.sprite;
+        if (sprite.width() != 128 || sprite.height() != 128){
+            throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Wrong size of Loaded MMO Sprite sprite: " + slug);
+        }
+        visit_sprit(slug, item.second.sprite.sub_image(12, 12, 104, 104).scale_to(50, 50));
+    }
+}
+
+MMOSpriteMatchingMap build_MMO_sprite_matching_data(){
+
+    MMOSpriteMatchingMap sprite_map;
+
+    load_and_visit_MMO_sprite([&](const std::string& slug, const ImageViewRGB32& sprite){
+
+        PerSpriteMatchingData per_sprite_data;
+
+        per_sprite_data.rgb_stats = image_stats(sprite);
+        per_sprite_data.hsv_image = ImageHSV32(sprite);
+
+        ImageRGB32 smoothed_sprite = smooth_image(sprite);
+        per_sprite_data.gradient_image = compute_image_gradient(smoothed_sprite);
+        per_sprite_data.feature = compute_feature(smoothed_sprite);
+
+        sprite_map.emplace(slug, std::move(per_sprite_data));
+    });
+
+    return sprite_map;
+}
+
+const MMOSpriteMatchingMap& MMO_SPRITE_MATCHING_DATA(){
+    const static auto& sprite_matching_data = build_MMO_sprite_matching_data();
+
+    return sprite_matching_data;
+}
+
+
+std::multimap<double, std::string> match_pokemon_map_sprite_feature(const ImageViewRGB32& image, MapRegion region){
+    const FeatureVector& image_feature = compute_feature(image);
+
+    const MMOSpriteMatchingMap& sprite_map = MMO_SPRITE_MATCHING_DATA();
+
+    const std::array<std::vector<std::string>, 5>& region_available_sprites = MMO_FIRST_WAVE_REGION_SPRITE_SLUGS();
+    int region_index = 0;
+    switch(region){
+    case MapRegion::FIELDLANDS:
+        region_index = 0;
+        break;
+    case MapRegion::MIRELANDS:
+        region_index = 1;
+        break;
+    case MapRegion::COASTLANDS:
+        region_index = 2;
+        break;
+    case MapRegion::HIGHLANDS:
+        region_index = 3;
+        break;
+    case MapRegion::ICELANDS:
+        region_index = 4;
+        break;
+    default:
+        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Invalid region.");
+//        return {};
+    }
+
+    // cout << "input image feature: " << feature_to_str(image_feature) << endl;
+
+    // FeatureType closest_dist = FLT_MAX;
+    // std::string closest_slug = "";
+
+    std::multimap<double, std::string> result;
+
+    for (const auto& slug : region_available_sprites[region_index]){
+        auto it = sprite_map.find(slug);
+        if (it == sprite_map.end()){
+            throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Inconsistent sprite slug definitions in resource: " + slug);
+        }
+
+        const FeatureVector& feature = it->second.feature;
+        const FeatureType dist = feature_distance(image_feature, feature);
+        result.emplace(dist, slug);
+    }
+
+    // cout << "Closest feature distance " << closest_dist << ", slug " << closest_slug << endl;
+    // cout << feature_to_str(features.find(closest_slug)->second) << endl;
+
+    return result;
+}
+
+
+ImageHSV32 compute_MMO_sprite_color_hsv(const ImageViewRGB32& image_rgb){
+    // Convert the image to HSV during ImageHSV32 class construction
+    ImageHSV32 result = [&](){
+        if (image_rgb.width() == EXTENDED_IMAGE_SIZE || image_rgb.height() == EXTENDED_IMAGE_SIZE){
+            return ImageHSV32(image_rgb);
+        }
+        // First scale the image
+        return ImageHSV32(image_rgb.scale_to(EXTENDED_IMAGE_SIZE, EXTENDED_IMAGE_SIZE));
+    }();
+    
+    const size_t width = result.width();
+    const size_t height = result.height();
+    
+    // Set all the pixels outside the sprite area transparent to avoid matching the template to background colors.
+    double r = (width + height) / 4.0;
+    double center_x  = (width-1) / 2.0f;
+    double center_y = (height-1) / 2.0f;
+    // -r/12 to remove some boundary areas
+    double dist2_th = (r - r/12) * (r - r/12);
+    for (size_t y = 0; y < height; y++){
+        for (size_t x = 0; x < width; x++){
+            if ((x-center_x)*(x-center_x) + (y-center_y)*(y-center_y) >= dist2_th){
+                // color outside of the sprite circle is set to zero transparency
+                result.pixel(x, y) = uint32_t(0);
+            }
+            // else if (x > center_x && y < center_y){
+            //     // Upper-right part of the sprite is set to zero transparency to avoid matching the 
+            //     // berry or star symbol
+            //     result.pixel(x, y) = uint32_t(0);
+            // }
+        }
+    }
+    return result;
+}
+
+
+// For a sprite on the screenshot, create gradient image of it
+ImageRGB32 compute_MMO_sprite_gradient(const ImageViewRGB32& image){
+
+    ImageRGB32 result = [&](){
+        if (image.width() == IMAGE_TEMPLATE_SIZE || image.height() == IMAGE_TEMPLATE_SIZE){
+            return smooth_image(image);
+        }
+        // First scale the image
+        return smooth_image(image.scale_to(IMAGE_TEMPLATE_SIZE, IMAGE_TEMPLATE_SIZE));
+    }();
+    result = compute_image_gradient(result);
+    
+    size_t width = image.width();
+    size_t height = image.height();
+    if (width == 0 || height == 0){
+        return result;
+    }
+
+    // Remove gradients outside of the image area
+    double r = (width + height) / 4.0;
+    double center_x  = (width-1) / 2.0f;
+    double center_y = (height-1) / 2.0f;
+    // -r/8 to remove some boundary areas
+    double dist2_th = (r - r/8) * (r - r/8);
+    for (size_t y = 0; y < height; y++){
+        for (size_t x = 0; x < width; x++){
+            if ((x-center_x)*(x-center_x) + (y-center_y)*(y-center_y) >= dist2_th){
+                // gradients outside of the sprite circle is set to zero
+                result.pixel(x, y) = combine_argb(0,0,0,0);
+            }
+            // else if (x > center_x && y < center_y){
+            //     // Upper-right part of the sprite is set to zero transparency to avoid matching the 
+            //     // berry or star symbol
+            //     result.pixel(x, y) = uint32_t(0);
+            // }
+        }
+    }
+    return result;
+}
+
+
+
+
+
+
+
+
+
+
+
+double compute_MMO_sprite_gradient_distance(const ImageViewRGB32& gradient_template, const ImageViewRGB32& gradient){
+    int tempt_width = (int)gradient_template.width();
+    int tempt_height = (int)gradient_template.height();
+
+    double score = 0.0f;
+    int max_offset = 2;
+
+    auto compute_pixel_dist = [](uint32_t t_g, uint32_t g){
+        int gx = uint32_t(0xff) & (g >> 16);
+        int gy = uint32_t(0xff) & (g >> 8);
+        int t_gx = uint32_t(0xff) & (t_g >> 16);
+        int t_gy = uint32_t(0xff) & (t_g >> 8);
+        double pixel_score = std::max(t_gx, gx) * (gx - t_gx) * (gx - t_gx) + std::max(t_gy, gy) * (gy - t_gy) * (gy - t_gy);
+        pixel_score /= 255;
+        return pixel_score;
+    };
+
+
+// #define USE_IMAGE_LEVEL_TRANSLATION
+// #define USE_PIXEL_LEVEL_TRANSLATION
+#define USE_BLOCK_LEVEL_TRANSLATION
+
+#ifdef USE_IMAGE_LEVEL_TRANSLATION
+    score = FLT_MAX;
+    for (int oy = -max_offset; oy <= max_offset; oy++){ // offset_y
+        for (int ox = -max_offset; ox <= max_offset; ox++){ // offset_x
+
+            float match_score = 0.0;
+            int num_gradients = 0;
+            for (size_t y = 0; y < gradient.height(); y++){
+                for (size_t x = 0; x < gradient.width(); x++){
+                    uint32_t g = gradient.pixel(x, y);
+                    if (is_transparent(g)){
+                        continue;
+                    }
+                    int my = (int)(y + oy); // moved y
+                    int mx = (int)(x + ox); // moved x
+                    if (mx < 0 || mx >= tempt_width || my < 0 || my >= tempt_height){
+                        continue;
+                    }
+
+                    uint32_t t_g = gradient_template.pixel(mx, my);
+                    if (is_transparent(t_g)){
+                        continue;
+                    }
+
+                    num_gradients++;
+
+                    float pixel_score = compute_pixel_dist(t_g, g);
+                    match_score += pixel_score;
+
+                    // output.setPixelColor(x, y, QColor(
+                    //     std::min((int)std::sqrt(gx*gx+gy*gy),255),
+                    //     std::min((int)std::sqrt(t_gx*t_gx+t_gy*t_gy), 255),
+                    //     0
+                    // ));
+                }
+            }
+
+            match_score = std::sqrt(match_score / num_gradients);
+            if (match_score < score){
+                score = match_score;
+            }
+        }
+    }
+    score = std::sqrt(score);
+#endif
+
+#ifdef USE_PIXEL_LEVEL_TRANSLATION
+    score = 0;
+    int num_gradients = 0;
+    for (size_t y = 0; y < gradient.height(); y++){
+        for (size_t x = 0; x < gradient.width(); x++){
+            uint32_t g = gradient.pixel(x, y);
+            uint32_t gx = uint32_t(0xff) & (g >> 16);
+            uint32_t gy = uint32_t(0xff) & (g >> 8);
+            uint32_t alpha = g >> 24;
+            if (alpha < 128){
+                continue;
+            }
+
+            float min_pixel_score = FLT_MAX;
+            for (int oy = -max_offset; oy <= max_offset; oy++){ // offset_y
+                for (int ox = -max_offset; ox <= max_offset; ox++){ // offset_x
+                    int my = (int)(y + oy); // moved y
+                    int mx = (int)(x + ox); // moved x
+                    if (mx < 0 || mx >= tempt_width || my < 0 || my >= tempt_height){
+                        continue;
+                    }
+                    // int dist_x = std::abs(ox);
+                    // int dist_y = std::abs(oy);
+                    // int dist2 = dist_x * dist_x + dist_y * dist_y;
+                    uint32_t t_g = scaled_template.pixel(mx, my);
+                    uint32_t t_a = t_g >> 24;
+                    if (t_a < 128){
+                        continue;
+                    }
+
+                    uint32_t t_gx = uint32_t(0xff) & (t_g >> 16);
+                    uint32_t t_gy = uint32_t(0xff) & (t_g >> 8);
+                    float pixel_score = std::max(t_gx, gx) * (gx - t_gx) * (gx - t_gx) + std::max(t_gy, gy) * (gy - t_gy) * (gy - t_gy);
+                    pixel_score /= 255;
+                    if (pixel_score < min_pixel_score){
+                        min_pixel_score = pixel_score;
+                    }
+
+                    if (ox == 0 && oy == 0){
+                        output.setPixelColor(x, y, QColor(
+                            std::min((int)std::sqrt(gx*gx+gy*gy),255),
+                            std::min((int)std::sqrt(t_gx*t_gx+t_gy*t_gy), 255),
+                            0
+                        ));
+                    }
+                }
+            } // end offset
+
+            if (min_pixel_score < FLT_MAX){
+                score += min_pixel_score;
+                num_gradients++;
+            }
+        }
+    }
+    score = std::sqrt(score / num_gradients);
+#endif
+
+#ifdef USE_BLOCK_LEVEL_TRANSLATION
+    int block_radius = 5;
+
+    score = 0;
+    int num_gradients = 0;
+
+    for (int y = 0; y < (int)gradient.height(); y++){
+        for (int x = 0; x < (int)gradient.width(); x++){
+            uint32_t g = gradient.pixel(x, y);
+            if (is_transparent(g)){
+                continue;
+            }
+
+            double min_block_score = FLT_MAX;
+            for (int oy = -max_offset; oy <= max_offset; oy++){ // offset_y
+                for (int ox = -max_offset; ox <= max_offset; ox++){ // offset_x
+
+                    double block_score = 0.0;
+                    int block_size = 0;
+                    for (int by = y - block_radius; by <= y + block_radius; by++){
+                        for (int bx = x - block_radius; bx <= x + block_radius; bx++){
+                            if (bx < 0 || bx >= (int)gradient.width() || by < 0 || by >= (int)gradient.height()){
+                                continue;
+                            }
+
+                            uint32_t bg = gradient.pixel(bx, by);
+                            if (is_transparent(bg)){
+                                continue;
+                            }
+
+                            int ty = by + oy; // template y
+                            int tx = bx + ox; // template x
+                            if (tx < 0 || tx >= tempt_width || ty < 0 || ty >= tempt_height){
+                                continue;
+                            }
+                            uint32_t t_bg = gradient_template.pixel(tx, ty);
+                            if (is_transparent(t_bg)){
+                                continue;
+                            }
+
+                            block_score += compute_pixel_dist(t_bg, bg);
+                            block_size++;
+                        }
+                    }
+                    block_score = block_score / block_size;
+                    min_block_score = std::min(min_block_score, block_score);
+                }
+            } // end offset
+
+            if (min_block_score < FLT_MAX){
+                score += min_block_score;
+                num_gradients++;
+            }
+        }
+    }
+    score = std::sqrt(score / num_gradients);
+#endif
+
+    return score;
+}
+
+double compute_hsv_dist2(uint32_t template_color, uint32_t color){
+    int t_h = (uint32_t(0xff) & (template_color >> 16));
+    int t_s = (uint32_t(0xff) & (template_color >> 8));
+    int t_v = (uint32_t(0xff) & template_color);
+
+    int h = (uint32_t(0xff) & (color >> 16));
+    int s = (uint32_t(0xff) & (color >> 8));
+    int v = (uint32_t(0xff) & color);
+
+    int h_dif = std::abs(t_h - h);
+    if (h_dif > 255 - h_dif){
+        h_dif = 256 - h_dif;
+    }
+
+    return h_dif * h_dif + (t_s - s) * (t_s - s) + 0.5 * (t_v - v) * (t_v - v);
+}
+
+double compute_MMO_sprite_hsv_distance(const ImageViewHSV32& image_template, const ImageViewHSV32& query_image){
+    size_t tempt_width = image_template.width();
+    size_t tempt_height = image_template.height();
+
+    // cout << tempt_width << " " << tempt_height << " " << query_image.width() << " " << query_image.height() << endl;
+    double score = 0.0;
+    int num_pixels = 0;
+    for (size_t y = 0; y < query_image.height(); y++){
+        for (size_t x = 0; x < query_image.width(); x++){
+            uint32_t p = query_image.pixel(x, y);
+            if (is_transparent(p)){
+                // cout << "Skip query pixel " << x << " " << y << endl;
+                continue;
+            }
+            if (x >= tempt_width || y >= tempt_height){
+                continue;
+            }
+
+            uint32_t t_p = image_template.pixel(x, y);
+            if (is_transparent(t_p)){
+                // cout << "Skip template pixel " << x << " " << y << endl;
+                continue;
+            }
+
+            num_pixels++;
+
+            double pixel_score = compute_hsv_dist2(t_p, p);
+            score += pixel_score;
+        }
+    }
+
+    score = std::sqrt(score / num_pixels);
+    // cout << "score " << score << " " << num_pixels << endl;
+    // exit(0);
+    return score;
+}
+
+
+MapSpriteMatchResult match_sprite_on_map(Logger& logger, const ImageViewRGB32& screen, const ImagePixelBox& box, MapRegion region, bool debug_mode){
+    const static auto& sprite_map = MMO_SPRITE_MATCHING_DATA();
+
+    auto save_debug_image_if_required = [&](const MapSpriteMatchResult& result){
+        if (debug_mode == false){
+            return;
+        }
+        const std::string debug_path = std::string("PokemonLA/PokemonMapSpriteReader/") + std::string(WILD_REGION_SHORT_NAMES[(int)region-2])
+             + "/" + result.slug;
+
+        dump_debug_image(logger, debug_path, result.slug, extract_box_reference(screen, box.expand_as(5)));
+    };
+
+    // configs for the algorithm:
+    const size_t num_feature_candidates = 10;
+    const double color_difference_threshold = 10.0;
+    const double gradient_confidence_threshold = 2.0;
+    const double color_to_gradient_confidence_scale = 2.0;
+
+    MapSpriteMatchResult result;
+    logger.log("Start map MMO sprite matching:");
+
+    // This map has the match score for all sprites.
+    // This map must be not empty for subsequent computation.
+    const auto& feature_map = match_pokemon_map_sprite_feature(extract_box_reference(screen, box), region);
+    
+    for (const auto& p : feature_map){
+        result.candidates.push_back(p.second);
+        if (result.candidates.size() >= num_feature_candidates){
+            break;
+        }
+    }
+
+    {
+        std::ostringstream os;
+        os << "  Candidates: ";
+        for (size_t i = 0; i < result.candidates.size(); i++){
+            if (i > 0){
+                os << ", ";
+            }
+            os << result.candidates[i];
+        }
+        logger.log(os.str());
+    }
+
+    // Should not happen if we correctly loads the sprite data.
+    if (result.candidates.size() == 0){
+        return result;
+    }
+
+    logger.log("Color matching...");
+    {
+        const ImagePixelBox expanded_box = box.expand_as(2);
+        const ImageHSV32 sprite_hsv = compute_MMO_sprite_color_hsv(extract_box_reference(screen, expanded_box));
+        
+        for (const auto& slug: result.candidates){
+            const ImageHSV32& candidate_template = sprite_map.find(slug)->second.hsv_image;
+            double score = FLT_MAX;
+            for (size_t ox = 0; ox <= 4; ox++){
+                for (size_t oy = 0; oy <= 4; oy++){
+                    ImagePixelBox shifted_box(ox, oy, box.width(), box.height());
+                    double match_score = compute_MMO_sprite_hsv_distance(
+                        candidate_template,
+                        extract_box_reference(sprite_hsv, shifted_box)
+                    );
+                    score = std::min(match_score, score);
+                }
+            }
+
+            result.color_match_results.emplace(score, slug);
+        }
+    }
+
+    // Build a map from sprite to their color score and output scores for debugging
+    std::map<std::string, double> color_match_sprite_scores;
+    int result_count = 0;
+    for (const auto& p : result.color_match_results){
+        const auto& slug = p.second;
+        color_match_sprite_scores.emplace(slug, p.first);
+        if (result_count < 5){
+            const auto& stats = sprite_map.find(slug)->second.rgb_stats;
+            std::ostringstream os;
+            os << p.first << " - " << slug << " " << stats.stddev.sum();
+            logger.log(os.str());
+        }
+        if (result_count == 5){
+            size_t num_rest_results = result.color_match_results.size() - 5;
+            std::ostringstream os;
+            os << "Skip " << num_rest_results << " more result" << (num_rest_results > 1 ? "s" : "");
+            logger.log(os.str());
+        }
+        
+        result_count++;
+    }
+
+    auto color_top = result.color_match_results.begin();
+    const std::string& color_top_slug = color_top->second;
+    auto color_second = color_top;
+    color_second++;
+
+    result.slug = color_top_slug;
+    result.color_score = color_top->first;
+
+    if (color_second == result.color_match_results.end()){
+        // we only have one color match result.
+        result.color_lead = DBL_MAX;
+        logger.log("Single color match result: " + color_top_slug);
+        save_debug_image_if_required(result);
+        return result;
+    }
+
+    // We have some sprites which have closer scores to the top color match:
+    // Find the difference between the top and second match score
+    result.color_lead = color_second->first - result.color_score;
+    {
+        std::ostringstream os;
+        os << "Top color score: " << result.color_score << " diff to second: " << result.color_lead;
+        logger.log(os.str());
+    }
+
+    if (result.color_lead >= color_difference_threshold){
+        logger.log("Color difference large enough. Good match: " + result.slug);
+        result.second_slug = color_second->second;
+        save_debug_image_if_required(result);
+        return result;
+    }
+
+    logger.log("Gradient matching...");
+    ImageRGB32 gradient_image = compute_MMO_sprite_gradient(extract_box_reference(screen, box));
+    
+    // std::ostringstream os;
+    // os << "test_sprite_gradient" << count << "_" << std::setfill('0') << std::setw(2) << i << ".png";
+    // std::string sprite_filename = os.str();
+    // gradient_image.save(sprite_filename);
+
+    for (const auto& p : result.color_match_results){
+        const auto& slug = p.second;
+        ImageViewRGB32 template_gradient = sprite_map.find(slug)->second.gradient_image;
+        double score = compute_MMO_sprite_gradient_distance(template_gradient, gradient_image);
+        result.gradient_match_results.emplace(score, slug);
+    }
+
+    result_count = 0;
+    for (const auto& p : result.gradient_match_results){
+        if (result_count == 5){
+            size_t num_rest_results = result.gradient_match_results.size() - 5;
+            std::ostringstream os;
+            os << "Skip " << num_rest_results << " more result" << (num_rest_results > 1 ? "s" : "");
+            logger.log(os.str());
+            break;
+        }
+        std::ostringstream os;
+        os << p.first << " - " << p.second;
+        logger.log(os.str());
+        result_count++;
+    }
+
+    // In case the gradient match is not confident, rely again on the color match:
+    auto gradient_top = result.gradient_match_results.begin();
+    const auto& gradient_top_slug = gradient_top->second;
+    auto gradient_second = gradient_top;
+    gradient_second++;
+    const auto& gradient_second_slug = gradient_second->second;
+
+    result.slug = gradient_top_slug;
+    result.gradient_score = gradient_top->first;
+    result.gradient_lead = gradient_second->first - gradient_top->first;
+    result.second_slug = gradient_second_slug;
+
+    {
+        std::ostringstream os;
+        os << "Top gradient score: " << result.gradient_score << " diff to second: " << result.gradient_lead;
+        logger.log(os.str());
+    }
+
+    if (result.gradient_lead >= gradient_confidence_threshold){
+        logger.log("Gradient difference large enough. Good match: " + result.slug);
+        save_debug_image_if_required(result);
+        return result;
+    }
+
+    // The diff between top and second gradient match is close
+    // Let's check their color score:
+    result.graident_top_color_score = color_match_sprite_scores[gradient_top_slug];
+    result.gradient_second_color_score = color_match_sprite_scores[gradient_second_slug];
+    double color_diff = result.gradient_second_color_score - result.graident_top_color_score;
+
+    {
+        std::ostringstream os;
+        os << "Gradient difference not large enough. Check color difference: " << 
+            result.graident_top_color_score << " vs " << result.gradient_second_color_score << ", diff: " <<
+            color_diff;
+        logger.log(os.str());
+    }
+    
+    // If color score is more confident in telling those two sprites apart
+    if (std::fabs(color_diff) > result.gradient_lead * color_to_gradient_confidence_scale){ 
+        if (color_diff < 0){ // second gradient sprite is better in color matching than the first graident sprite:
+            result.pick_gradient_second = true;
+            std::swap(result.slug, result.second_slug);
+            logger.log("Switch to more confident color result: " + result.slug);
+        }
+    }else{
+        logger.log("Low confidence match: " + result.slug);
+    }
+
+    save_debug_image_if_required(result);
+    return result;
+}
+
+
+
+
+
+
+
+
+class Test_MMOSpriteMatcher : public ImageUnitTest{
+public:
+    Test_MMOSpriteMatcher(
+        const std::string& image
+    )
+        : ImageUnitTest("PokemonLA::MMOSpriteMatcher - " + image, {image, revealed_image_path(image)})
+    {}
+
+    //  The test image with the MMO sprites revealed: the same file name with a leading "_", e.g.
+    //  ".../Mirelands/_MMO_Region_Mirelands_07.png" for ".../Mirelands/MMO_Region_Mirelands_07.png".
+    //  It is the second test image, so the distortion runs re-color it along with the first one.
+    static std::string revealed_image_path(const std::string& image){
+        const Filesystem::Path image_path(image);
+        return (image_path.parent_path() / Filesystem::Path("_" + image_path.filename().string())).string();
+    }
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        const Filesystem::Path image_path(UNIT_TEST_RESOURCE_PATH() + image_paths()[0]);
+        const Filesystem::Path parent_dir = image_path.parent_path();
+
+        const std::string base_name = image_path.stem().string();
+
+        const std::vector<std::string> filename_words = parse_words(base_name);
+        MapRegion region = MapRegion::NONE;
+        for (const std::string& word : filename_words){
+            if (word == "Fieldlands"){
+                region = MapRegion::FIELDLANDS;
+                break;
+            }else if (word == "Mirelands"){
+                region = MapRegion::MIRELANDS;
+                break;
+            }else if (word == "Coastlands"){
+                region = MapRegion::COASTLANDS;
+                break;
+            }else if (word == "Highlands"){
+                region = MapRegion::HIGHLANDS;
+                break;
+            }else if (word == "Icelands"){
+                region = MapRegion::ICELANDS;
+                break;
+            }
+        }
+        if (region == MapRegion::NONE){
+            cout << "Error: filename should contain a region name (e.g. \"Fieldlands\")." << endl;
+            return 1;
+        }
+
+        const std::string mmo_revealed_txt_path = (parent_dir / Filesystem::Path("_" + base_name + ".txt")).string();
+
+        const ImageRGB32& question_mark_image = images[0];
+        const ImageRGB32& sprite_image = images[1];
+
+        if (!question_mark_image){
+            cerr << "Error: cannot load MMO question mark image file " << image_paths()[0] << endl;
+            return "Error: cannot load MMO question mark image file " + image_paths()[0];
+        }
+        if (!sprite_image){
+            cerr << "Error: cannot load MMO revealed sprites image file " << image_paths()[1] << endl;
+            return "Error: cannot load MMO revealed sprites image file " + image_paths()[1];
+        }
+
+        std::vector<std::string> target_sprites;
+        if (load_slug_list(mmo_revealed_txt_path, target_sprites) == false){
+            return false;
+        }
+
+        cout << "Target sprites: " << target_sprites.size() << " total" << endl;
+        for (const auto& slug : target_sprites){
+            cout << "- " << slug << endl;
+        }
+
+        MMOQuestionMarkDetector detector(logger);
+
+        std::vector<ImagePixelBox> quest_results = detector.detect_MMOs_on_region_map(question_mark_image);
+        std::sort(quest_results.begin(), quest_results.end(), [](const ImagePixelBox& a, const ImagePixelBox& b) -> bool {
+            if (a.center_y() < b.center_y()){
+                return true;
+            }
+            if (a.center_y() > b.center_y()){
+                return false;
+            }
+            return a.center_x() < b.center_x();
+        });
+
+        cout << "Detect MMO question marks:" << endl;
+        for (const auto& box : quest_results){
+            cout << "- " << box.center_x() << ", " << box.center_y() << " " << box.width() << " x " << box.height() << endl;
+        }
+
+        if (quest_results.size() != target_sprites.size()){
+            cerr << "Error: the number of MMO question marks detected is not correct: " << quest_results.size() << " should be " <<
+                target_sprites.size() << endl;
+            return "Error: the number of MMO question marks detected is not correct: " + std::to_string(quest_results.size()) +
+            " should be " + std::to_string(target_sprites.size());
+        }
+
+        // static int count = 0;
+        ImageRGB32 output_sprite = sprite_image.copy();
+        ImageRGB32 output_quest = question_mark_image.copy();
+        std::vector<ImagePixelBox> new_boxes;
+        for (size_t i = 0; i < quest_results.size(); i++){
+            auto box = quest_results[i];
+            draw_box(output_quest, box, combine_rgb(255, 0, 0));
+            draw_box(output_sprite, box, combine_rgb(255, 0, 0));
+
+            pxint_t radius = (pxint_t)((box.width() + box.height()) / 4 + 0.5);
+            pxint_t center_x = (pxint_t)box.center_x();
+            pxint_t center_y = (pxint_t)box.center_y();
+            auto new_box = ImagePixelBox(center_x - radius, center_y - radius, center_x + radius, center_y + radius);
+            new_boxes.push_back(new_box);
+
+            // std::ostringstream os;
+            // os << "test_sprite_" << count << "_" << std::setfill('0') << std::setw(2) << i << ".png";
+            // std::string sprite_filename = os.str();
+            // extract_box_reference(sprite_image, new_box).save(sprite_filename);
+        }
+        // output_quest.save("test_MMO_question_mark_detection_" + std::to_string(count) + ".png");
+        // output_sprite.save("test_sprite_detection_" + std::to_string(count) + ".png");
+
+        size_t success_count = 0;
+        for (size_t i = 0; i < quest_results.size(); i++){
+            // XXX
+            // if (i != 9){
+                // continue;
+            // }
+            cout << "--------------------------------------------------------------------" << endl;
+            cout << i << ": Target slug: " << target_sprites[i] << endl;
+
+            bool debug_mode = false;
+            auto result = match_sprite_on_map(logger, sprite_image, new_boxes[i], region, debug_mode);
+            if (result.slug == target_sprites[i]){
+                success_count++;
+                cout << "Match SUCCESS" << endl;
+            }else{
+                cout << "Match FAILURE" << endl;
+            }
+        }
+
+        if (success_count == target_sprites.size()){
+            cout << "ALL SUCCESS" << endl;
+        }else{
+            cout << "FAILURE: " << target_sprites.size() - success_count << "/" << target_sprites.size() << endl;
+            return "FAILURE: " + std::to_string(target_sprites.size() - success_count) + "/" + std::to_string(target_sprites.size());
+        }
+        // count++;
+
+        return true;
+    };
+};
+
+
+
+
+
+
+
+void add_tests_PokemonMapSpriteReader(UnitTestDatabase& database){
+    database.add<Test_MMOSpriteMatcher>("PokemonLA/MMOSpriteMatcher/macOS_bright/Coastlands/MMO_Region_Coastlands_01.png");
+    database.add<Test_MMOSpriteMatcher>("PokemonLA/MMOSpriteMatcher/macOS_bright/Coastlands/MMO_Region_Coastlands_02.png");
+    database.add<Test_MMOSpriteMatcher>("PokemonLA/MMOSpriteMatcher/macOS_bright/Coastlands/MMO_Region_Coastlands_03.png");
+    database.add<Test_MMOSpriteMatcher>("PokemonLA/MMOSpriteMatcher/macOS_bright/Coastlands/MMO_Region_Coastlands_04.png");
+    database.add<Test_MMOSpriteMatcher>("PokemonLA/MMOSpriteMatcher/macOS_bright/Coastlands/MMO_Region_Coastlands_05.png");
+    database.add<Test_MMOSpriteMatcher>("PokemonLA/MMOSpriteMatcher/macOS_bright/Coastlands/MMO_Region_Coastlands_06.png");
+    database.add<Test_MMOSpriteMatcher>("PokemonLA/MMOSpriteMatcher/macOS_bright/Fieldlands/MMO_Region_Fieldlands_01.png");
+    database.add<Test_MMOSpriteMatcher>("PokemonLA/MMOSpriteMatcher/macOS_bright/Fieldlands/MMO_Region_Fieldlands_02.png");
+    database.add<Test_MMOSpriteMatcher>("PokemonLA/MMOSpriteMatcher/macOS_bright/Fieldlands/MMO_Region_Fieldlands_03.png");
+    database.add<Test_MMOSpriteMatcher>("PokemonLA/MMOSpriteMatcher/macOS_bright/Fieldlands/MMO_Region_Fieldlands_04.png");
+    database.add<Test_MMOSpriteMatcher>("PokemonLA/MMOSpriteMatcher/macOS_bright/Fieldlands/MMO_Region_Fieldlands_05.png");
+    database.add<Test_MMOSpriteMatcher>("PokemonLA/MMOSpriteMatcher/macOS_bright/Fieldlands/MMO_Region_Fieldlands_06.png");
+    database.add<Test_MMOSpriteMatcher>("PokemonLA/MMOSpriteMatcher/macOS_bright/Fieldlands/MMO_Region_Fieldlands_07.png");
+    database.add<Test_MMOSpriteMatcher>("PokemonLA/MMOSpriteMatcher/macOS_bright/Fieldlands/MMO_Region_Fieldlands_08.png");
+    database.add<Test_MMOSpriteMatcher>("PokemonLA/MMOSpriteMatcher/macOS_bright/Fieldlands/MMO_Region_Fieldlands_09.png");
+    database.add<Test_MMOSpriteMatcher>("PokemonLA/MMOSpriteMatcher/macOS_bright/Fieldlands/MMO_Region_Fieldlands_10.png");
+    database.add<Test_MMOSpriteMatcher>("PokemonLA/MMOSpriteMatcher/macOS_bright/Highlands/MMO_Region_Highlands_01.png");
+    database.add<Test_MMOSpriteMatcher>("PokemonLA/MMOSpriteMatcher/macOS_bright/Highlands/MMO_Region_Highlands_02.png");
+    database.add<Test_MMOSpriteMatcher>("PokemonLA/MMOSpriteMatcher/macOS_bright/Highlands/MMO_Region_Highlands_03.png");
+    database.add<Test_MMOSpriteMatcher>("PokemonLA/MMOSpriteMatcher/macOS_bright/Highlands/MMO_Region_Highlands_04.png");
+    database.add<Test_MMOSpriteMatcher>("PokemonLA/MMOSpriteMatcher/macOS_bright/Highlands/MMO_Region_Highlands_05.png");
+    database.add<Test_MMOSpriteMatcher>("PokemonLA/MMOSpriteMatcher/macOS_bright/Highlands/MMO_Region_Highlands_06.png");
+    database.add<Test_MMOSpriteMatcher>("PokemonLA/MMOSpriteMatcher/macOS_bright/Highlands/MMO_Region_Highlands_07.png");
+    database.add<Test_MMOSpriteMatcher>("PokemonLA/MMOSpriteMatcher/macOS_bright/Highlands/MMO_Region_Highlands_08.png");
+    database.add<Test_MMOSpriteMatcher>("PokemonLA/MMOSpriteMatcher/macOS_bright/Highlands/MMO_Region_Highlands_09.png");
+    database.add<Test_MMOSpriteMatcher>("PokemonLA/MMOSpriteMatcher/macOS_bright/Highlands/MMO_Region_Highlands_10.png");
+    database.add<Test_MMOSpriteMatcher>("PokemonLA/MMOSpriteMatcher/macOS_bright/Highlands/MMO_Region_Highlands_11.png");
+    database.add<Test_MMOSpriteMatcher>("PokemonLA/MMOSpriteMatcher/macOS_bright/Highlands/MMO_Region_Highlands_12.png");
+    database.add<Test_MMOSpriteMatcher>("PokemonLA/MMOSpriteMatcher/macOS_bright/Icelands/MMO_Region_Icelands_01.png");
+    database.add<Test_MMOSpriteMatcher>("PokemonLA/MMOSpriteMatcher/macOS_bright/Icelands/MMO_Region_Icelands_02.png");
+    database.add<Test_MMOSpriteMatcher>("PokemonLA/MMOSpriteMatcher/macOS_bright/Icelands/MMO_Region_Icelands_03.png");
+    database.add<Test_MMOSpriteMatcher>("PokemonLA/MMOSpriteMatcher/macOS_bright/Icelands/MMO_Region_Icelands_04.png");
+    database.add<Test_MMOSpriteMatcher>("PokemonLA/MMOSpriteMatcher/macOS_bright/Icelands/MMO_Region_Icelands_05.png");
+    database.add<Test_MMOSpriteMatcher>("PokemonLA/MMOSpriteMatcher/macOS_bright/Icelands/MMO_Region_Icelands_06.png");
+    database.add<Test_MMOSpriteMatcher>("PokemonLA/MMOSpriteMatcher/macOS_bright/Icelands/MMO_Region_Icelands_07.png");
+    database.add<Test_MMOSpriteMatcher>("PokemonLA/MMOSpriteMatcher/macOS_bright/Icelands/MMO_Region_Icelands_08.png");
+    database.add<Test_MMOSpriteMatcher>("PokemonLA/MMOSpriteMatcher/macOS_bright/Icelands/MMO_Region_Icelands_09.png");
+    database.add<Test_MMOSpriteMatcher>("PokemonLA/MMOSpriteMatcher/macOS_bright/Icelands/MMO_Region_Icelands_10.png");
+    database.add<Test_MMOSpriteMatcher>("PokemonLA/MMOSpriteMatcher/macOS_bright/Mirelands/MMO_Region_Mirelands_01.png");
+    database.add<Test_MMOSpriteMatcher>("PokemonLA/MMOSpriteMatcher/macOS_bright/Mirelands/MMO_Region_Mirelands_02.png");
+    database.add<Test_MMOSpriteMatcher>("PokemonLA/MMOSpriteMatcher/macOS_bright/Mirelands/MMO_Region_Mirelands_03.png");
+    database.add<Test_MMOSpriteMatcher>("PokemonLA/MMOSpriteMatcher/macOS_bright/Mirelands/MMO_Region_Mirelands_04.png");
+    database.add<Test_MMOSpriteMatcher>("PokemonLA/MMOSpriteMatcher/macOS_bright/Mirelands/MMO_Region_Mirelands_05.png");
+    database.add<Test_MMOSpriteMatcher>("PokemonLA/MMOSpriteMatcher/macOS_bright/Mirelands/MMO_Region_Mirelands_06.png");
+    database.add<Test_MMOSpriteMatcher>("PokemonLA/MMOSpriteMatcher/macOS_bright/Mirelands/MMO_Region_Mirelands_07.png");
+    database.add<Test_MMOSpriteMatcher>("PokemonLA/MMOSpriteMatcher/macOS_bright/Mirelands/MMO_Region_Mirelands_08.png");
+    database.add<Test_MMOSpriteMatcher>("PokemonLA/MMOSpriteMatcher/macOS_bright/Mirelands/MMO_Region_Mirelands_09.png");
+
+    database.add<Test_MMOSpriteMatcher>("PokemonLA/MMOSpriteMatcher/WinShadowCast/MMO_Region_Fieldlands.png");
+
+}
+
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_PokemonMapSpriteReader.h b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_PokemonMapSpriteReader.h
new file mode 100644
index 0000000000..9ecc3a37e3
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_PokemonMapSpriteReader.h
@@ -0,0 +1,70 @@
+/*  Pokemon Map Sprite Reader
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+
+#ifndef PokemonAutomation_PokemonLA_PokemonMapSpriteReader_H
+#define PokemonAutomation_PokemonLA_PokemonMapSpriteReader_H
+
+#include <vector>
+#include <map>
+#include "Common/Cpp/TestRunners/UnitTest.h"
+#include "CommonTools/ImageMatch/ExactImageDictionaryMatcher.h"
+#include "VideoGames/PokemonLA/PokemonLA_Locations.h"
+
+struct ImagePixelBox;
+
+namespace PokemonAutomation{
+
+
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+struct MapSpriteMatchResult{
+    std::string slug;
+
+    std::vector<std::string> candidates;
+
+    std::multimap<double, std::string> color_match_results;
+
+    std::multimap<double, std::string> gradient_match_results;
+
+    double color_score = 0.0;
+    
+    double color_lead = 0.0;
+
+    double gradient_score = 0.0;
+    
+    double gradient_lead = 0.0;
+
+    double graident_top_color_score = 0.0;
+    
+    double gradient_second_color_score = 0.0;
+    
+    bool pick_gradient_second = false;
+
+    std::string second_slug;
+};
+
+MapSpriteMatchResult match_sprite_on_map(
+    Logger& logger,
+    const ImageViewRGB32& screen,
+    const ImagePixelBox& box,
+    MapRegion region,
+    bool debug_mode = false
+);
+
+
+
+
+void add_tests_PokemonMapSpriteReader(UnitTestDatabase& database);
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_SelectedRegionDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_SelectedRegionDetector.cpp
new file mode 100644
index 0000000000..732316214e
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_SelectedRegionDetector.cpp
@@ -0,0 +1,125 @@
+/*  Selected Region Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/ImageTools/ImageDiff.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+#include "PokemonLA_SelectedRegionDetector.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+
+class MapLocationDetector : public VisualInferenceCallback{
+public:
+    MapLocationDetector()
+        : VisualInferenceCallback("MapLocationDetector")
+        , m_current_region(MapRegion::NONE)
+    {}
+
+    MapRegion current_region() const{
+        return m_current_region;
+    }
+
+    virtual void make_overlays(VideoOverlaySet& items) const override{
+//        for (const RegionState& region : m_regions){
+//            items.add(COLOR_CYAN, region.box);
+//        }
+    }
+
+    virtual bool process_frame(const VideoSnapshot& frame) override{
+        if (!frame){
+            return false;
+        }
+        if (m_regions.empty()){
+            reload_reference(frame.frame);
+        }
+
+        MapRegion current_region = MapRegion::NONE;
+        for (RegionState& region : m_regions){
+            ImageViewRGB32 current = extract_box_reference(frame, region.box);
+
+            if (current.width() != (size_t)region.start.width() || current.height() != (size_t)region.start.height()){
+                reload_reference(frame.frame);
+                return false;
+            }
+
+            double rmsd = ImageMatch::pixel_RMSD(region.start, current);
+            if (rmsd > 20){
+                if (current_region == MapRegion::NONE){
+                    current_region = region.region;
+                }else{
+                    //  Multiple large diffs. Frame isn't stable.
+//                    cout << "Multiple diffs: " << rmsd << endl;
+                    reload_reference(frame.frame);
+                    return false;
+                }
+            }
+        }
+
+        m_current_region = current_region;
+        return current_region != MapRegion::NONE;
+    }
+
+    void reload_reference(std::shared_ptr<const ImageRGB32> screen){
+        m_screen = std::move(screen);
+        m_regions.clear();
+        m_regions.emplace_back(MapRegion::JUBILIFE,     ImageFloatBox(0.252, 0.400, 0.025, 0.150), *m_screen);
+        m_regions.emplace_back(MapRegion::FIELDLANDS,   ImageFloatBox(0.415, 0.550, 0.025, 0.150), *m_screen);
+        m_regions.emplace_back(MapRegion::MIRELANDS,    ImageFloatBox(0.750, 0.570, 0.025, 0.150), *m_screen);
+        m_regions.emplace_back(MapRegion::COASTLANDS,   ImageFloatBox(0.865, 0.240, 0.025, 0.150), *m_screen);
+        m_regions.emplace_back(MapRegion::HIGHLANDS,    ImageFloatBox(0.508, 0.320, 0.025, 0.150), *m_screen);
+        m_regions.emplace_back(MapRegion::ICELANDS,     ImageFloatBox(0.457, 0.060, 0.025, 0.150), *m_screen);
+        m_regions.emplace_back(MapRegion::RETREAT,      ImageFloatBox(0.635, 0.285, 0.025, 0.150), *m_screen);
+    }
+
+private:
+    struct RegionState{
+        MapRegion region;
+        ImageFloatBox box;
+        ImageViewRGB32 start;
+        RegionState(MapRegion p_region, const ImageFloatBox& p_box, const ImageViewRGB32& screen)
+            : region(p_region)
+            , box(p_box)
+            , start(extract_box_reference(screen, box))
+        {}
+    };
+
+    std::shared_ptr<const ImageRGB32> m_screen;
+    std::vector<RegionState> m_regions;
+    MapRegion m_current_region;
+};
+
+
+MapRegion detect_selected_region(VideoStream& stream, CancellableScope& scope){
+    MapLocationDetector detector;
+    int ret = wait_until(
+        stream, scope,
+        std::chrono::seconds(2),
+        {{detector}}
+    );
+    MapRegion region = detector.current_region();
+    if (ret < 0){
+        stream.log("Unable to detect active region on map.", COLOR_RED);
+    }else{
+        stream.log(std::string("Current Selection: ") + MAP_REGION_NAMES[(int)region]);
+    }
+    return region;
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_SelectedRegionDetector.h b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_SelectedRegionDetector.h
new file mode 100644
index 0000000000..209ac505ff
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_SelectedRegionDetector.h
@@ -0,0 +1,29 @@
+/*  Selected Region Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+
+#ifndef PokemonAutomation_PokemonLA_SelectedRegionDetector_H
+#define PokemonAutomation_PokemonLA_SelectedRegionDetector_H
+
+#include "CommonFramework/Tools/VideoStream.h"
+#include "VideoGames/PokemonLA/PokemonLA_Locations.h"
+
+namespace PokemonAutomation{
+    class CancellableScope;
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+// On the map that you see when you leave village, detect which region the cursor is currently
+// floats on.
+// The function detects the region by checking which red region name sign is moving up and down.
+MapRegion detect_selected_region(VideoStream& stream, CancellableScope& scope);
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/PokemonLA/Inference/Objects/PokemonLA_ArcDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_ArcDetector.cpp
similarity index 85%
rename from SerialPrograms/Source/PokemonLA/Inference/Objects/PokemonLA_ArcDetector.cpp
rename to SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_ArcDetector.cpp
index e4c7059dc0..2edaaaf2b5 100644
--- a/SerialPrograms/Source/PokemonLA/Inference/Objects/PokemonLA_ArcDetector.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_ArcDetector.cpp
@@ -1,13 +1,14 @@
 /*  Arc Detector
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include "Common/Cpp/Exceptions.h"
 #include "Kernels/Waterfill/Kernels_Waterfill.h"
-#include "CommonFramework/ImageTools/BinaryImage_FilterRgb32.h"
-#include "CommonFramework/ImageMatch/SubObjectTemplateMatcher.h"
+#include "CommonTools/Images/BinaryImage_FilterRgb32.h"
+#include "CommonTools/ImageMatch/SubObjectTemplateMatcher.h"
+#include "CommonTools/DetectedBoxes.h"
 #include "PokemonLA_ArcDetector.h"
 
 namespace PokemonAutomation{
@@ -69,7 +70,11 @@ ArcDetector::ArcDetector()
         }
     )
 {}
-void ArcDetector::process_object(const ImageViewRGB32& image, const WaterfillObject& object){
+void ArcDetector::process_object(
+    Resolution input_resolution,
+    const ImageViewRGB32& image,
+    const WaterfillObject& object
+){
     ImagePixelBox object_box;
     if (ArcMatcher::left().matches(object_box, image, object)){
         m_left.emplace_back(object_box);
@@ -116,7 +121,7 @@ void ArcDetector::finish(const ImageViewRGB32& image){
     }
     m_left.clear();
     m_right.clear();
-    merge_heavily_overlapping();
+    merge_overlapping_boxes(m_detections);
 }
 
 
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_ArcDetector.h b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_ArcDetector.h
new file mode 100644
index 0000000000..a8b8a58ad7
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_ArcDetector.h
@@ -0,0 +1,38 @@
+/*  Arc Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLA_ArcDetector_H
+#define PokemonAutomation_PokemonLA_ArcDetector_H
+
+#include <list>
+#include "PokemonLA_WhiteObjectDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+
+class ArcDetector : public WhiteObjectDetector{
+public:
+    ArcDetector();
+    virtual void process_object(
+        Resolution input_resolution,
+        const ImageViewRGB32& image,
+        const WaterfillObject& object
+    ) override;
+    virtual void finish(const ImageViewRGB32& image) override;
+
+private:
+    std::list<ImagePixelBox> m_left;
+    std::list<ImagePixelBox> m_right;
+};
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_ArcPhoneDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_ArcPhoneDetector.cpp
new file mode 100644
index 0000000000..a586456666
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_ArcPhoneDetector.cpp
@@ -0,0 +1,150 @@
+/*  Arc Phone Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Logging/AbstractLogger.h"
+#include "Kernels/Waterfill/Kernels_Waterfill_Types.h"
+#include "CommonTools/DetectedBoxes.h"
+#include "PokemonLA_ArcPhoneDetector.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+
+ArcPhoneMatcher::ArcPhoneMatcher()
+    : WaterfillTemplateMatcher(
+        "PokemonLA/ArcPhone-Template.png",
+        Color(0xff808008), Color(0xffffffff), 100
+    )
+{}
+const ArcPhoneMatcher& ArcPhoneMatcher::instance(){
+    static ArcPhoneMatcher matcher;
+    return matcher;
+}
+
+
+ArcPhoneTracker::ArcPhoneTracker()
+    : WhiteObjectDetector(
+        COLOR_CYAN,
+        {
+            Color(0xff808080),
+            Color(0xff909090),
+            Color(0xffa0a0a0),
+            Color(0xffb0b0b0),
+            Color(0xffc0c0c0),
+            Color(0xffd0d0d0),
+            Color(0xffe0e0e0),
+            Color(0xfff0f0f0),
+        }
+    )
+{}
+
+void ArcPhoneTracker::process_object(
+    Resolution input_resolution,
+    const ImageViewRGB32& image,
+    const WaterfillObject& object
+){
+//    cout << "asdf" << endl;
+//    static int c = 0;
+//    cout << "c = " << c << endl;
+//    extract_box_reference(image, object).save("testA-" + std::to_string(c++) + ".png");
+//    image.save("test-" + std::to_string(c++) + "-A.png");
+//    extract_box_reference(image, object).save("testB-" + std::to_string(c++) + ".png");
+
+    double width = (double)object.width() / image.width();
+    if (width < 0.40 || width > 0.50){
+        return;
+    }
+
+//    cout << (double)object.width() / image.width() << endl;
+
+    double rmsd = ArcPhoneMatcher::instance().rmsd_original(input_resolution, image, object);
+//    cout << "rmsd = " << rmsd << endl;
+    if (rmsd < 80){
+//        cout << "rmsd = " << rmsd << endl;
+//         extract_box(image, object).save("test.png");
+        m_detections.emplace_back(object);
+    }
+}
+void ArcPhoneTracker::finish(const ImageViewRGB32& image){
+//    static int count = 0;
+//    image.save("test0-" + std::to_string(count++) + ".png");
+    merge_overlapping_boxes(m_detections);
+}
+
+
+
+ArcPhoneDetector::ArcPhoneDetector(
+    Logger& logger, VideoOverlay& overlay,
+    std::chrono::milliseconds min_streak,
+    bool stop_on_detected
+)
+    : VisualInferenceCallback("CenterAButtonDetector")
+    , m_logger(logger)
+    , m_box(0.010, 0.700, 0.050, 0.100)
+    , m_stop_on_detected(stop_on_detected)
+    , m_tracker_button(ButtonType::ButtonMinus)
+    , m_watcher(
+        overlay, m_box, {
+            {m_tracker_phone, false},
+            {m_tracker_button, false},
+        }
+    )
+    , m_debouncer_phone(
+        false, min_streak,
+        [&](bool value){
+            if (value){
+                m_logger.log("Detected Arc Phone.", COLOR_PURPLE);
+            }else{
+                m_logger.log("Arc Phone has disappeared.", COLOR_PURPLE);
+            }
+        }
+    )
+    , m_debouncer_button(
+        false, min_streak,
+        [&](bool value){
+            if (value){
+                m_logger.log("Detected (-) Button.", COLOR_PURPLE);
+            }else{
+                m_logger.log("(-) button has disappeared.", COLOR_PURPLE);
+            }
+        }
+    )
+{}
+
+
+void ArcPhoneDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(COLOR_RED, m_box);
+}
+bool ArcPhoneDetector::process_frame(const ImageViewRGB32& frame, WallClock timestamp){
+    m_watcher.process_frame(frame, timestamp);
+//    cout << "White Objects = " << m_tracker_phone.detections().size() << endl;
+    bool detected0 = m_debouncer_phone.push_value(!m_tracker_phone.detections().empty(), timestamp);
+    bool detected1 = m_debouncer_button.push_value(!m_tracker_phone.detections().empty(), timestamp);
+
+//    cout << detected0 << ", " << detected1 << endl;
+
+#if 0
+    if (detected){
+        static size_t c = 0;
+        frame.save("ArcPhoneTriggered-" + std::to_string(c++) + ".png");
+    }
+#endif
+
+    return detected0 && detected1 && m_stop_on_detected;
+}
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_ArcPhoneDetector.h b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_ArcPhoneDetector.h
new file mode 100644
index 0000000000..a3c97ed86c
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_ArcPhoneDetector.h
@@ -0,0 +1,79 @@
+/*  Arc Phone Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLA_ArcPhoneDetector_H
+#define PokemonAutomation_PokemonLA_ArcPhoneDetector_H
+
+#include "Common/Cpp/Concurrency/SpinLock.h"
+#include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+#include "CommonTools/DetectionDebouncer.h"
+#include "PokemonLA_WhiteObjectDetector.h"
+#include "PokemonLA_ButtonDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+
+class ArcPhoneMatcher : public ImageMatch::WaterfillTemplateMatcher{
+public:
+    ArcPhoneMatcher();
+    static const ArcPhoneMatcher& instance();
+};
+
+
+
+class ArcPhoneTracker : public WhiteObjectDetector{
+public:
+    ArcPhoneTracker();
+
+    virtual void process_object(
+        Resolution input_resolution,
+        const ImageViewRGB32& image,
+        const WaterfillObject& object
+    ) override;
+    virtual void finish(const ImageViewRGB32& image) override;
+};
+
+
+
+class ArcPhoneDetector : public VisualInferenceCallback{
+public:
+    ArcPhoneDetector(
+        Logger& logger, VideoOverlay& overlay,
+        std::chrono::milliseconds min_streak,
+        bool stop_on_detected
+    );
+
+    bool detected() const{
+        return m_debouncer_phone.get() && m_debouncer_button.get();
+    }
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+
+    virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override;
+
+private:
+    Logger& m_logger;
+    ImageFloatBox m_box;
+    bool m_stop_on_detected;
+
+    SpinLock m_lock;
+    ArcPhoneTracker m_tracker_phone;
+    ButtonTracker m_tracker_button;
+    WhiteObjectWatcher m_watcher;
+
+    DetectionDebouncer<bool> m_debouncer_phone;
+    DetectionDebouncer<bool> m_debouncer_button;
+};
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_BattleSpriteArrowDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_BattleSpriteArrowDetector.cpp
new file mode 100644
index 0000000000..6a8aefc7c5
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_BattleSpriteArrowDetector.cpp
@@ -0,0 +1,168 @@
+/*  Battle Sprite Arrow Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Logging/AbstractLogger.h"
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "CommonTools/DetectedBoxes.h"
+#include "Tests/ImageUnitTest.h"
+#include "Tests/TestUtils.h"
+#include "VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattleSpriteWatcher.h"
+#include "PokemonLA_BattleSpriteArrowDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+
+BattleSpriteArrowMatcher::BattleSpriteArrowMatcher()
+    : WaterfillTemplateMatcher(
+        "PokemonLA/BattleSpriteArrow-Template.png",
+        Color(0xff808008), Color(0xffffffff), 100
+    )
+{
+    m_aspect_ratio_lower = 0.95;
+    m_aspect_ratio_upper = 1.05;
+    m_area_ratio_lower = 0.95;
+    m_area_ratio_upper = 1.05;
+}
+
+const BattleSpriteArrowMatcher& BattleSpriteArrowMatcher::instance(){
+    static BattleSpriteArrowMatcher matcher;
+    return matcher;
+}
+
+
+BattleSpriteArrowTracker::BattleSpriteArrowTracker()
+    : WhiteObjectDetector(
+        COLOR_CYAN,
+        {
+            Color(0xff808080),
+            Color(0xff909090),
+            Color(0xffa0a0a0),
+            Color(0xffb0b0b0),
+        }
+    )
+{}
+
+void BattleSpriteArrowTracker::process_object(
+    Resolution input_resolution,
+    const ImageViewRGB32& image,
+    const WaterfillObject& object
+){
+    double rmsd = BattleSpriteArrowMatcher::instance().rmsd_original(
+        input_resolution,
+        image,
+        object
+    );
+    if (rmsd < 80){
+        m_detections.emplace_back(object);
+    }
+}
+
+void BattleSpriteArrowTracker::finish(const ImageViewRGB32& image){
+    merge_overlapping_boxes(m_detections);
+}
+
+
+
+BattleSpriteArrowDetector::BattleSpriteArrowDetector(
+    Logger& logger, VideoOverlay& overlay,
+    size_t sprite_index,
+    std::chrono::milliseconds min_streak,
+    bool stop_on_detected
+)
+    : VisualInferenceCallback("BattleSpriteArrowButtonDetector")
+    , m_logger(logger)
+    , m_box(0.936 - 0.035*sprite_index, 0.018, 0.015, 0.027)
+    , m_stop_on_detected(stop_on_detected)
+    , m_watcher(overlay, m_box, { {m_tracker, false} })
+    , m_debouncer(
+        false, min_streak,
+        [&](bool value){
+            if (value){
+                m_logger.log("Detected sprite arrow.", COLOR_PURPLE);
+            }else{
+                m_logger.log("Sprite arrow disappeared.", COLOR_PURPLE);
+            }
+        }
+    )
+{}
+
+
+void BattleSpriteArrowDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(COLOR_RED, m_box);
+}
+bool BattleSpriteArrowDetector::process_frame(const ImageViewRGB32& frame, WallClock timestamp){
+    m_watcher.process_frame(frame, timestamp);
+    bool detected = m_debouncer.push_value(!m_tracker.detections().empty(), timestamp);
+    return detected && m_stop_on_detected;
+}
+
+
+
+
+
+
+
+
+
+class Test_BattleSpriteArrowDetector : public ImageUnitTest{
+public:
+    Test_BattleSpriteArrowDetector(
+        const std::string& image,
+        int target
+    )
+        : ImageUnitTest("PokemonLA::BattleSpriteArrowDetector - " + image, {image})
+        , m_target(target)
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        DummyVideoOverlay overlay;
+        const ImageRGB32& image = images[0];
+
+        const size_t target_index = m_target;
+        for (size_t sprite_index = 0; sprite_index < MAX_WILD_POKEMON_IN_MULTI_BATTLE; sprite_index++){
+            BattleSpriteArrowDetector detector(logger, overlay, sprite_index, std::chrono::milliseconds(0), true);
+            bool result = detector.process_frame(image, current_time());
+            if (sprite_index != target_index && result){
+                std::stringstream ss;
+                ss << "Error: in test_pokemonLA_BattleSpriteArrowDetector detected arrow at sprite index " << sprite_index
+                     << " but should be at sprite index " << m_target << std::endl;
+                return ss.str();
+            }else if (sprite_index == target_index && result == false){
+                std::stringstream ss;
+                ss << "Error: in test_pokemonLA_BattleSpriteArrowDetector failed to detect arrow at sprite index " << sprite_index << std::endl;
+                return ss.str();
+            }
+        }
+
+        return true;
+    };
+
+private:
+    int m_target;
+};
+
+
+
+
+
+void add_tests_BattleSpriteArrowDetector(UnitTestDatabase& database){
+
+}
+
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_BattleSpriteArrowDetector.h b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_BattleSpriteArrowDetector.h
new file mode 100644
index 0000000000..f478fce295
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_BattleSpriteArrowDetector.h
@@ -0,0 +1,84 @@
+/*  Battle Sprite Arrow Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  Detect the white arrow pointing towards left on the selected sprite, in the upper right corner
+ *  of the screen, during a multi-pokemon battle.
+ */
+
+#ifndef PokemonAutomation_PokemonLA_BattleSpriteArrowDetector_H
+#define PokemonAutomation_PokemonLA_BattleSpriteArrowDetector_H
+
+#include "Common/Cpp/TestRunners/UnitTest.h"
+#include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+#include "CommonTools/DetectionDebouncer.h"
+#include "VideoGames/PokemonLA/Inference/Objects/PokemonLA_WhiteObjectDetector.h"
+
+namespace PokemonAutomation{
+    class Logger;
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+
+class BattleSpriteArrowMatcher : public ImageMatch::WaterfillTemplateMatcher{
+public:
+    BattleSpriteArrowMatcher();
+    static const BattleSpriteArrowMatcher& instance();
+};
+
+
+
+class BattleSpriteArrowTracker : public WhiteObjectDetector{
+public:
+    BattleSpriteArrowTracker();
+
+    virtual void process_object(
+        Resolution input_resolution,
+        const ImageViewRGB32& image,
+        const WaterfillObject& object
+    ) override;
+    virtual void finish(const ImageViewRGB32& image) override;
+};
+
+
+
+class BattleSpriteArrowDetector : public VisualInferenceCallback{
+public:
+    // Sprite index: the index of the sprite the current selected arrow is on top of.
+    //   The index is ordered from right to left on the screen.
+    BattleSpriteArrowDetector(
+        Logger& logger, VideoOverlay& overlay,
+        size_t sprite_index,
+        std::chrono::milliseconds min_streak,
+        bool stop_on_detected
+    );
+
+    bool detected() const{
+        return m_debouncer.get();
+    }
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+
+    virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override;
+
+private:
+    Logger& m_logger;
+    ImageFloatBox m_box;
+    bool m_stop_on_detected;
+
+    BattleSpriteArrowTracker m_tracker;
+    WhiteObjectWatcher m_watcher;
+
+    DetectionDebouncer<bool> m_debouncer;
+};
+
+
+
+void add_tests_BattleSpriteArrowDetector(UnitTestDatabase& database);
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/PokemonLA/Inference/Objects/PokemonLA_BubbleDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_BubbleDetector.cpp
similarity index 79%
rename from SerialPrograms/Source/PokemonLA/Inference/Objects/PokemonLA_BubbleDetector.cpp
rename to SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_BubbleDetector.cpp
index 54651849b9..4f3c9eae88 100644
--- a/SerialPrograms/Source/PokemonLA/Inference/Objects/PokemonLA_BubbleDetector.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_BubbleDetector.cpp
@@ -1,14 +1,15 @@
 /*  Bubble Detector
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include "Common/Cpp/Exceptions.h"
 #include "Kernels/Waterfill/Kernels_Waterfill.h"
 #include "CommonFramework/ImageTypes/ImageViewRGB32.h"
-#include "CommonFramework/ImageTools/BinaryImage_FilterRgb32.h"
-#include "CommonFramework/ImageMatch/SubObjectTemplateMatcher.h"
+#include "CommonTools/Images/BinaryImage_FilterRgb32.h"
+#include "CommonTools/ImageMatch/SubObjectTemplateMatcher.h"
+#include "CommonTools/DetectedBoxes.h"
 #include "PokemonLA_BubbleDetector.h"
 
 namespace PokemonAutomation{
@@ -56,7 +57,11 @@ class BubbleMatcher : public ImageMatch::SubObjectTemplateMatcher{
 BubbleDetector::BubbleDetector()
     : WhiteObjectDetector(COLOR_GREEN, {Color(0xffb0b0b0)})
 {}
-void BubbleDetector::process_object(const ImageViewRGB32& image, const WaterfillObject& object){
+void BubbleDetector::process_object(
+    Resolution input_resolution,
+    const ImageViewRGB32& image,
+    const WaterfillObject& object
+){
     if (object.area < 200){
         return;
     }
@@ -72,7 +77,7 @@ void BubbleDetector::process_object(const ImageViewRGB32& image, const Waterfill
     }
 }
 void BubbleDetector::finish(const ImageViewRGB32& image){
-    merge_heavily_overlapping();
+    merge_overlapping_boxes(m_detections);
 }
 
 
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_BubbleDetector.h b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_BubbleDetector.h
new file mode 100644
index 0000000000..77b6881a3e
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_BubbleDetector.h
@@ -0,0 +1,34 @@
+/*  Bubble Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLA_BubbleDetector_H
+#define PokemonAutomation_PokemonLA_BubbleDetector_H
+
+#include <list>
+#include "PokemonLA_WhiteObjectDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+
+class BubbleDetector : public WhiteObjectDetector{
+public:
+    BubbleDetector();
+    virtual void process_object(
+        Resolution input_resolution,
+        const ImageViewRGB32& image,
+        const WaterfillObject& object
+    ) override;
+    virtual void finish(const ImageViewRGB32& image) override;
+};
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/PokemonLA/Inference/Objects/PokemonLA_ButtonDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_ButtonDetector.cpp
similarity index 78%
rename from SerialPrograms/Source/PokemonLA/Inference/Objects/PokemonLA_ButtonDetector.cpp
rename to SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_ButtonDetector.cpp
index db228d8b7b..1df03e3e7a 100644
--- a/SerialPrograms/Source/PokemonLA/Inference/Objects/PokemonLA_ButtonDetector.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_ButtonDetector.cpp
@@ -1,18 +1,24 @@
 /*  Button Detector
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
+#include "Common/Cpp/Logging/AbstractLogger.h"
+#include "CommonTools/DetectedBoxes.h"
 #include "PokemonLA_ButtonDetector.h"
 
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
 namespace PokemonAutomation{
 namespace NintendoSwitch{
 namespace PokemonLA{
 
 namespace{
 
-const char* templatePath(ButtonType type){
+const char* template_path(ButtonType type){
     switch (type){
     case ButtonType::ButtonA:
         return "PokemonLA/Buttons/ButtonA-Template.png";
@@ -50,7 +56,7 @@ const char* button_name(ButtonType type){
     }
 }
 
-const ButtonMatcher& getButtonMatcher(ButtonType type){
+const ButtonMatcher& get_button_matcher(ButtonType type){
     switch (type){
     case ButtonType::ButtonA:
         return ButtonMatcher::A();
@@ -71,20 +77,23 @@ const ButtonMatcher& getButtonMatcher(ButtonType type){
 
 }
 
-ButtonMatcher::ButtonMatcher(ButtonType type, size_t min_width, size_t max_width, double max_rmsd)
+ButtonMatcher::ButtonMatcher(ButtonType type, size_t min_width, size_t min_height, double max_rmsd)
     : WaterfillTemplateMatcher(
-        templatePath(type), Color(0xff808008), Color(0xffffffff), 100
+        template_path(type),
+        Color(0xff808008),
+        Color(0xffffffff),
+        100
     )
     , m_min_width(min_width)
-    , m_min_height(max_width)
+    , m_min_height(min_height)
     , m_max_rmsd(max_rmsd)
 {}
 const ButtonMatcher& ButtonMatcher::A(){
-    static ButtonMatcher matcher(ButtonType::ButtonA, 15, 15, 80);
+    static ButtonMatcher matcher(ButtonType::ButtonA, 15, 15, 90);
     return matcher;
 }
 const ButtonMatcher& ButtonMatcher::B(){
-    static ButtonMatcher matcher(ButtonType::ButtonB, 15, 15, 80);
+    static ButtonMatcher matcher(ButtonType::ButtonB, 15, 15, 90);
     return matcher;
 }
 const ButtonMatcher& ButtonMatcher::Plus(){
@@ -120,25 +129,34 @@ ButtonTracker::ButtonTracker(ButtonType type)
             Color(0xffd0d0d0),
         }
     )
-    , m_matcher(getButtonMatcher(type))
+    , m_matcher(get_button_matcher(type))
 {}
 
-void ButtonTracker::process_object(const ImageViewRGB32& image, const WaterfillObject& object){
+void ButtonTracker::process_object(
+    Resolution input_resolution,
+    const ImageViewRGB32& image,
+    const WaterfillObject& object
+){
 //    cout << "asdf" << endl;
 //    static int c = 0;
 //    extract_box(image, object).save("test-" + std::to_string(c++) + ".png");
 //    image.save("test-" + std::to_string(c++) + "-A.png");
 //    extract_box(image, object).save("test-" + std::to_string(c++) + "-B.png");
 
-    double rmsd = m_matcher.rmsd_precropped(extract_box_reference(image, object), object);
+    double rmsd = m_matcher.rmsd_precropped(
+        input_resolution,
+        extract_box_reference(image, object),
+        object
+    );
 //    cout << "rmsd = " << rmsd << endl;
+//    cout << "max = " << m_matcher.m_max_rmsd << endl;
     if (rmsd < m_matcher.m_max_rmsd){
-//        cout << "rmsd = " << rmsd << endl;
+//        cout << "matching rmsd = " << rmsd << endl;
         m_detections.emplace_back(object);
     }
 }
 void ButtonTracker::finish(const ImageViewRGB32& image){
-    merge_heavily_overlapping();
+    merge_overlapping_boxes(m_detections);
 }
 
 
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_ButtonDetector.h b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_ButtonDetector.h
new file mode 100644
index 0000000000..ab280df49a
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_ButtonDetector.h
@@ -0,0 +1,105 @@
+/*  Button Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLA_ButtonDetector_H
+#define PokemonAutomation_PokemonLA_ButtonDetector_H
+
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+#include "CommonTools/DetectionDebouncer.h"
+#include "VideoGames/PokemonLA/Inference/Objects/PokemonLA_WhiteObjectDetector.h"
+
+namespace PokemonAutomation{
+    class Logger;
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+
+enum class ButtonType{
+    ButtonA,
+    ButtonB,
+    ButtonPlus,
+    ButtonMinus,
+    ArrowLeft,
+    ArrowRight,
+};
+
+
+class ButtonMatcher : public ImageMatch::WaterfillTemplateMatcher{
+public:
+    ButtonMatcher(ButtonType type, size_t min_width, size_t min_height, double max_rmsd);
+    static const ButtonMatcher& A();
+    static const ButtonMatcher& B();
+    static const ButtonMatcher& Plus();
+    static const ButtonMatcher& Minus();
+    static const ButtonMatcher& ArrowLeft();
+    static const ButtonMatcher& ArrowRight();
+
+    virtual bool check_image(Resolution input_resolution, const ImageViewRGB32& image) const override{
+        return image.width() >= m_min_width && image.height() >= m_min_height;
+    };
+
+    size_t m_min_width;
+    size_t m_min_height;
+    double m_max_rmsd;
+};
+
+
+
+
+class ButtonTracker : public WhiteObjectDetector{
+public:
+    ButtonTracker(ButtonType type);
+
+    virtual void process_object(
+        Resolution input_resolution,
+        const ImageViewRGB32& image,
+        const WaterfillObject& object
+    ) override;
+    virtual void finish(const ImageViewRGB32& image) override;
+
+private:
+    const ButtonMatcher& m_matcher;
+};
+
+
+
+class ButtonDetector : public VisualInferenceCallback{
+public:
+    ButtonDetector(
+        Logger& logger, VideoOverlay& overlay,
+        ButtonType type,
+        const ImageFloatBox& box,
+        std::chrono::milliseconds min_streak,
+        bool stop_on_detected
+    );
+
+    bool detected() const{
+        return m_debouncer.get();
+    }
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+
+    virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override;
+
+private:
+    Logger& m_logger;
+    ImageFloatBox m_box;
+    bool m_stop_on_detected;
+
+    ButtonTracker m_tracker;
+    WhiteObjectWatcher m_watcher;
+
+    DetectionDebouncer<bool> m_debouncer;
+};
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_DialogEllipseDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_DialogEllipseDetector.cpp
new file mode 100644
index 0000000000..34bd7e5cce
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_DialogEllipseDetector.cpp
@@ -0,0 +1,107 @@
+/*  Dialogue Ellipse Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Logging/AbstractLogger.h"
+#include "CommonTools/DetectedBoxes.h"
+#include "PokemonLA_DialogEllipseDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+
+DialogueEllipseMatcher::DialogueEllipseMatcher()
+    : WaterfillTemplateMatcher(
+        "PokemonLA/DialogueEllipse-Template.png",
+        Color(0xff808008), Color(0xffffffff), 300
+    )
+{
+    m_aspect_ratio_lower = 0.95;
+    m_aspect_ratio_upper = 1.05;
+    m_area_ratio_lower = 0.95;
+    m_area_ratio_upper = 1.05;
+}
+
+const DialogueEllipseMatcher& DialogueEllipseMatcher::instance(){
+    static DialogueEllipseMatcher matcher;
+    return matcher;
+}
+
+
+DialogueEllipseTracker::DialogueEllipseTracker()
+    : WhiteObjectDetector(
+        COLOR_CYAN,
+        {
+            Color(0xff808080),
+            Color(0xff909090),
+            Color(0xffa0a0a0),
+            Color(0xffb0b0b0),
+        }
+    )
+{}
+
+void DialogueEllipseTracker::process_object(
+    Resolution input_resolution,
+    const ImageViewRGB32& image,
+    const WaterfillObject& object
+){
+    double rmsd = DialogueEllipseMatcher::instance().rmsd_original(input_resolution, image, object);
+    if (rmsd < 80){
+        m_detections.emplace_back(object);
+    }
+}
+
+void DialogueEllipseTracker::finish(const ImageViewRGB32& image){
+    merge_overlapping_boxes(m_detections);
+}
+
+
+
+DialogueEllipseDetector::DialogueEllipseDetector(
+    Logger& logger, VideoOverlay& overlay,
+    std::chrono::milliseconds min_streak,
+    bool stop_on_detected
+)
+    : VisualInferenceCallback("DialogueEllipseButtonDetector")
+    , m_logger(logger)
+    , m_box(0.741, 0.811, 0.028, 0.023)
+    , m_stop_on_detected(stop_on_detected)
+    , m_watcher(overlay, m_box, { {m_tracker, false} })
+    , m_debouncer(
+        false, min_streak,
+        [&](bool value){
+            if (value){
+                m_logger.log("Detected transparent dialogue box ellipse button.", COLOR_PURPLE);
+            }else{
+                m_logger.log("Transparent dialogue box ellipse button disappeared.", COLOR_PURPLE);
+            }
+        }
+    )
+{}
+
+
+void DialogueEllipseDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(COLOR_RED, m_box);
+}
+bool DialogueEllipseDetector::process_frame(const ImageViewRGB32& frame, WallClock timestamp){
+    m_watcher.process_frame(frame, timestamp);
+    bool detected = m_debouncer.push_value(!m_tracker.detections().empty(), timestamp);
+
+    // static int count = 0;
+    // if (detected){
+    //     frame.save("./debug_transparentEllipse" + std::to_string(count) + ".png");
+    //     count++;
+    // }
+    return detected && m_stop_on_detected;
+}
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_DialogEllipseDetector.h b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_DialogEllipseDetector.h
new file mode 100644
index 0000000000..fe55391707
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_DialogEllipseDetector.h
@@ -0,0 +1,78 @@
+/*  Dialogue Ellipse Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  Detect the white wide ellipse at the end of the transparent dialogue box.
+ *  The transparent dialogue box comes from your opponent shown before and/or after the battle, like
+ *  Ingo's battles or Fortune Sisters'.
+ */
+
+#ifndef PokemonAutomation_PokemonLA_DialogEllipseDetector_H
+#define PokemonAutomation_PokemonLA_DialogEllipseDetector_H
+
+#include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+#include "CommonTools/DetectionDebouncer.h"
+#include "VideoGames/PokemonLA/Inference/Objects/PokemonLA_WhiteObjectDetector.h"
+
+namespace PokemonAutomation{
+    class Logger;
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+
+class DialogueEllipseMatcher : public ImageMatch::WaterfillTemplateMatcher{
+public:
+    DialogueEllipseMatcher();
+    static const DialogueEllipseMatcher& instance();
+};
+
+
+
+class DialogueEllipseTracker : public WhiteObjectDetector{
+public:
+    DialogueEllipseTracker();
+
+    virtual void process_object(
+        Resolution input_resolution,
+        const ImageViewRGB32& image,
+        const WaterfillObject& object
+    ) override;
+    virtual void finish(const ImageViewRGB32& image) override;
+};
+
+
+
+class DialogueEllipseDetector : public VisualInferenceCallback{
+public:
+    DialogueEllipseDetector(
+        Logger& logger, VideoOverlay& overlay,
+        std::chrono::milliseconds min_streak,
+        bool stop_on_detected
+    );
+
+    bool detected() const{
+        return m_debouncer.get();
+    }
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+
+    virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override;
+
+private:
+    Logger& m_logger;
+    ImageFloatBox m_box;
+    bool m_stop_on_detected;
+
+    DialogueEllipseTracker m_tracker;
+    WhiteObjectWatcher m_watcher;
+
+    DetectionDebouncer<bool> m_debouncer;
+};
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_DialogYellowArrowDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_DialogYellowArrowDetector.cpp
new file mode 100644
index 0000000000..49be005c2e
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_DialogYellowArrowDetector.cpp
@@ -0,0 +1,148 @@
+/*  Dialogue Yellow Arrow Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <stdint.h>
+#include <vector>
+#include "Common/Cpp/Logging/AbstractLogger.h"
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "Kernels/Waterfill/Kernels_Waterfill_Types.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Images/WaterfillUtilities.h"
+#include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h"
+#include "Tests/ImageUnitTest.h"
+#include "Tests/TestUtils.h"
+#include "PokemonLA_DialogYellowArrowDetector.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+namespace{
+    // This box covers all possible locations of the yellow arrow
+    ImageFloatBox YELLOW_ARROW_BOX{0.720, 0.759, 0.049, 0.128};
+}
+
+class DialogueYellowArrowMatcher : public ImageMatch::WaterfillTemplateMatcher{
+public:
+    DialogueYellowArrowMatcher();
+    static const DialogueYellowArrowMatcher& instance();
+};
+
+
+DialogueYellowArrowMatcher::DialogueYellowArrowMatcher()
+    : WaterfillTemplateMatcher(
+        "PokemonLA/YellowArrow-Template.png",
+        Color(0xff808008), Color(0xffffffff), 200
+    )
+{
+    m_aspect_ratio_lower = 0.9;
+    m_aspect_ratio_upper = 1.1;
+    m_area_ratio_lower = 0.9;
+    m_area_ratio_upper = 1.1;
+}
+
+const DialogueYellowArrowMatcher& DialogueYellowArrowMatcher::instance(){
+    static DialogueYellowArrowMatcher matcher;
+    return matcher;
+}
+
+
+
+DialogYellowArrowDetector::DialogYellowArrowDetector(
+    Logger& logger, VideoOverlay& overlay,
+    bool stop_on_detected
+)
+    : VisualInferenceCallback("DialogYellowArrowDetector")
+    , m_logger(logger)
+    , m_stop_on_detected(stop_on_detected)
+{}
+
+
+void DialogYellowArrowDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(COLOR_RED, YELLOW_ARROW_BOX);
+}
+bool DialogYellowArrowDetector::process_frame(const ImageViewRGB32& frame, WallClock timestamp){
+    const std::vector<std::pair<uint32_t, uint32_t>> filters = {
+        {combine_rgb(160, 160, 0), combine_rgb(255, 255, 255)},
+        {combine_rgb(200, 200, 0), combine_rgb(255, 255, 255)},
+        {combine_rgb(200, 200, 0), combine_rgb(255, 255, 180)},
+    };
+
+    // We found 200 to be a good minimal yellow arrow pixel count on a 1920x1080 resolution screenshot.
+    const double screen_scale = frame.height() / 1080.0;
+    const size_t min_size = size_t(200 * screen_scale * screen_scale);
+    
+    const bool detected = match_template_by_waterfill(
+        frame.size(),
+        extract_box_reference(frame, YELLOW_ARROW_BOX), 
+        DialogueYellowArrowMatcher::instance(),
+        filters,
+        {min_size, SIZE_MAX},
+        80,
+        [](Kernels::Waterfill::WaterfillObject& object) -> bool { return true; }
+    );
+
+    if (detected){
+        m_logger.log("Detected yellow arrow in transparent dialogue box.", COLOR_PURPLE);
+    }
+
+    m_detected.store(detected, std::memory_order_release);
+
+#if 0
+    if (detected){
+        static size_t c = 0;
+        frame.save("YellowArrowTriggered-" + std::to_string(c++) + ".png");
+    }
+#endif
+
+    return detected && m_stop_on_detected;
+}
+
+
+
+
+
+class Test_DialogYellowArrowDetector : public ImageUnitTest{
+public:
+    Test_DialogYellowArrowDetector(
+        const std::string& image,
+        bool expected
+    )
+        : ImageUnitTest("PokemonLA::DialogYellowArrowDetector - " + image, {image})
+        , m_expected(expected)
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        DummyVideoOverlay overlay;
+        DialogYellowArrowDetector detector(logger, overlay, true);
+        const ImageRGB32& image = images[0];
+        return detector.process_frame(image, current_time()) == m_expected;
+    };
+
+private:
+    bool m_expected;
+};
+
+
+void add_tests_DialogYellowArrowDetector(UnitTestDatabase& database){
+    database.add<Test_DialogYellowArrowDetector>("PokemonLA/DialogueYellowArrowDetector/macOS_bright/MirelandsMai_True.png", true);
+    database.add<Test_DialogYellowArrowDetector>("PokemonLA/DialogueYellowArrowDetector/WinMyPin/ProfessorNight_True.png", true);
+    database.add<Test_DialogYellowArrowDetector>("PokemonLA/DialogueYellowArrowDetector/WinShadowCast/ProfessorNight_True.png", true);
+
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_DialogYellowArrowDetector.h b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_DialogYellowArrowDetector.h
new file mode 100644
index 0000000000..e2f04dbf55
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_DialogYellowArrowDetector.h
@@ -0,0 +1,56 @@
+/*  Dialogue Yellow Arrow Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  The yellow marker pointing to the button to advance dialogue boxes.
+ *  For different types of dialogue boxes, the locations of the yellow arrow is different.
+ *  This detector covers all possible locations of the yellow arrow.
+ */
+
+#ifndef PokemonAutomation_PokemonLA_DialogYellowArrowDetector_H
+#define PokemonAutomation_PokemonLA_DialogYellowArrowDetector_H
+
+#include <atomic>
+#include "Common/Cpp/TestRunners/UnitTest.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+
+namespace PokemonAutomation{
+    class Logger;
+    class VideoOverlay;
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+
+
+class DialogYellowArrowDetector : public VisualInferenceCallback{
+public:
+    DialogYellowArrowDetector(
+        Logger& logger, VideoOverlay& overlay,
+        bool stop_on_detected
+    );
+
+    bool detected() const{
+        return m_detected.load(std::memory_order_acquire);
+    }
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+
+    virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override;
+
+private:
+    Logger& m_logger;
+    bool m_stop_on_detected;
+
+    std::atomic<bool> m_detected;
+};
+
+
+
+
+void add_tests_DialogYellowArrowDetector(UnitTestDatabase& database);
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/PokemonLA/Inference/Objects/PokemonLA_FlagDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_FlagDetector.cpp
similarity index 91%
rename from SerialPrograms/Source/PokemonLA/Inference/Objects/PokemonLA_FlagDetector.cpp
rename to SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_FlagDetector.cpp
index 7a71bc4c32..8e56069838 100644
--- a/SerialPrograms/Source/PokemonLA/Inference/Objects/PokemonLA_FlagDetector.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_FlagDetector.cpp
@@ -1,6 +1,6 @@
 /*  Flag Detector
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -8,14 +8,15 @@
 #include "Common/Cpp/Exceptions.h"
 #include "Kernels/Waterfill/Kernels_Waterfill.h"
 #include "Kernels/Waterfill/Kernels_Waterfill_Session.h"
-#include "CommonFramework/ImageTools/BinaryImage_FilterRgb32.h"
-#include "CommonFramework/ImageMatch/WaterfillTemplateMatcher.h"
-#include "CommonFramework/ImageMatch/SubObjectTemplateMatcher.h"
+#include "CommonTools/Images/BinaryImage_FilterRgb32.h"
+#include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h"
+#include "CommonTools/ImageMatch/SubObjectTemplateMatcher.h"
+#include "CommonTools/DetectedBoxes.h"
 #include "PokemonLA_FlagDetector.h"
 
-#include <iostream>
-using std::cout;
-using std::endl;
+//#include <iostream>
+//using std::cout;
+//using std::endl;
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
@@ -105,7 +106,11 @@ FlagDetector::FlagDetector()
         }
     )
 {}
-void FlagDetector::process_object(const ImageViewRGB32& image, const WaterfillObject& object){
+void FlagDetector::process_object(
+    Resolution input_resolution,
+    const ImageViewRGB32& image,
+    const WaterfillObject& object
+){
 //    cout << "FlagDetector::process_object()" << endl;
     if (object.area < 50){
         return;
@@ -202,7 +207,7 @@ void FlagDetector::finish(const ImageViewRGB32& image){
     m_left.clear();
     m_right.clear();
 //    cout << "m_detections = " << m_detections.size() << endl;
-    merge_heavily_overlapping(0.3);
+    merge_overlapping_boxes(m_detections, 0.3);
 }
 
 
@@ -234,13 +239,17 @@ std::vector<std::pair<int, DigitMatcher>> make_digit_matchers(){
 }
 
 
-std::pair<double, int> read_digit(const ImageViewRGB32& image, const WaterfillObject& object){
+std::pair<double, int> read_digit(
+    Resolution input_resolution,
+    const ImageViewRGB32& image,
+    const WaterfillObject& object
+){
     static const std::vector<std::pair<int, DigitMatcher>> MATCHERS = make_digit_matchers();
     double best_rmsd = 99999;
     int best_digit = -1;
     for (const auto& item : MATCHERS){
 //        cout << item.first << " : " <<  << endl;
-        double rmsd = item.second.rmsd_original(image, object);
+        double rmsd = item.second.rmsd_original(input_resolution, image, object);
         if (best_rmsd > rmsd){
             best_rmsd = rmsd;
             best_digit = item.first;
@@ -307,7 +316,7 @@ int read_flag_distance(const ImageViewRGB32& screen, double flag_x, double flag_
 //                static int c = 0;
 //                extract_box_reference(image, object).save("image-" + std::to_string(c++) + ".png");
 
-                std::pair<double, int> digit = read_digit(image, object);
+                std::pair<double, int> digit = read_digit(screen.size(), image, object);
                 if (digit.second >= 0){
                     hits.emplace(
                         object.min_x,
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_FlagDetector.h b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_FlagDetector.h
new file mode 100644
index 0000000000..e60a564ae8
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_FlagDetector.h
@@ -0,0 +1,47 @@
+/*  Flag Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLA_FlagDetector_H
+#define PokemonAutomation_PokemonLA_FlagDetector_H
+
+#include <list>
+#include "PokemonLA_WhiteObjectDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+
+// Detect white flag, which is a user placed marker on map and visible
+// on overworld.
+// The white flag is made by two separate white part: the pole and the flag
+// itself.
+class FlagDetector : public WhiteObjectDetector{
+public:
+    FlagDetector();
+    virtual void process_object(
+        Resolution input_resolution,
+        const ImageViewRGB32& image,
+        const WaterfillObject& object
+    ) override;
+    virtual void finish(const ImageViewRGB32& image) override;
+
+private:
+    std::list<ImagePixelBox> m_left;
+    std::list<ImagePixelBox> m_right;
+};
+
+
+
+int read_flag_distance(const ImageViewRGB32& screen, double flag_x, double flag_y);
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_FlagTracker.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_FlagTracker.cpp
new file mode 100644
index 0000000000..a3264146cf
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_FlagTracker.cpp
@@ -0,0 +1,182 @@
+/*  Flag Tracker
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <cmath>
+#include <map>
+#include <iostream>
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "Tests/ImageUnitTest.h"
+#include "Tests/TestUtils.h"
+#include "PokemonLA_FlagTracker.h"
+
+using std::cout;
+using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+
+
+FlagTracker::FlagTracker(Logger& /*logger*/, VideoOverlay& overlay)
+    : VisualInferenceCallback("FlagTracker")
+    // , m_logger(logger)
+    , m_watcher(overlay, {0, 0, 1, 1}, {{m_flags, false}})
+{}
+
+void FlagTracker::make_overlays(VideoOverlaySet& items) const{
+    m_watcher.make_overlays(items);
+}
+
+bool FlagTracker::get(
+    double& distance, double& x, double& y,
+    WallClock timestamp
+) const{
+    ReadSpinLock lg(m_lock, PA_CURRENT_FUNCTION);
+
+    //  If history is empty or stale, return no detection.
+    if (m_history.empty() || m_history.back().timestamp + std::chrono::milliseconds(500) < timestamp){
+        return false;
+    }
+
+    {
+        const Sample& sample = m_history.back();
+        x = sample.x;
+        y = sample.y;
+    }
+
+    //  Distance reading is unreliable. So look at the last 2 seconds of history to infer it.
+    std::multimap<int, WallClock> distances;
+    for (const Sample& sample : m_history){
+        if (0 <= sample.distance && sample.distance <= 999){
+            distances.emplace(sample.distance, sample.timestamp);
+        }
+    }
+
+    if (distances.size() < 5){
+        distance = -1;
+        return true;
+    }
+
+    //  Find the median.
+    double median;
+    {
+        size_t mid = distances.size() / 2;
+        auto iter = distances.begin();
+        for (size_t c = 0; c < mid; c++){
+            ++iter;
+        }
+        median = iter->first;
+    }
+
+//    distance = median;
+//    cout << distance << endl;
+
+    //  Pick the latest value that isn't too far from the median.
+    for (auto iter = m_history.rbegin(); iter != m_history.rend(); ++iter){
+        if (std::abs(iter->distance - median) < 20){
+            distance = iter->distance;
+            return true;
+        }
+    }
+    distance = -1;
+    return true;
+}
+
+bool FlagTracker::process_frame(const ImageViewRGB32& frame, WallClock timestamp){
+    m_watcher.process_frame(frame, timestamp);
+
+    Sample sample;
+
+    const std::vector<ImagePixelBox>& flags = m_flags.detections();
+    bool ok = flags.size() == 1;
+    if (ok){
+        sample.timestamp = timestamp;
+        sample.x = (double)(flags[0].min_x + flags[0].max_x) / (frame.width() * 2);
+        sample.y = (double)(flags[0].min_y + flags[0].max_y) / (frame.height() * 2);
+        sample.distance = read_flag_distance(frame, sample.x, sample.y);
+
+#if 0
+//        cout << sample.distance << endl;
+        if (sample.distance > 0 && sample.distance < 10){
+            static int c = 0;
+            frame.save("test-" + std::to_string(c++) + ".png");
+        }
+#endif
+    }else{
+//        frame.save("test.png");
+//        cout << "no flag" << endl;
+    }
+
+
+    WriteSpinLock lg(m_lock, PA_CURRENT_FUNCTION);
+
+    //  Clear out old history.
+    WallClock threshold = timestamp - std::chrono::seconds(2);
+    while (!m_history.empty() && m_history.front().timestamp < threshold){
+        m_history.pop_front();
+    }
+
+    if (ok){
+        m_history.emplace_back(std::move(sample));
+    }
+
+    return false;
+}
+
+
+
+
+
+
+
+class Test_FlagTrackerPerformance : public ImageUnitTest{
+public:
+    Test_FlagTrackerPerformance(
+        const std::string& image,
+        size_t num_iterations
+    )
+        : ImageUnitTest("PokemonLA::FlagTrackerPerformance - " + image, {image})
+        , m_num_iterations(num_iterations)
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        DummyVideoOverlay overlay;
+        FlagTracker tracker(logger, overlay);
+        const ImageRGB32& image = images[0];
+
+        auto time_start = current_time();
+        for (size_t i = 0; i < m_num_iterations; i++){
+            tracker.process_frame(image, current_time());
+        }
+        auto time_end = current_time();
+        const double ms = std::chrono::duration_cast<Milliseconds>(time_end - time_start).count() / (double)m_num_iterations;
+        cout << "Time: " << ms << " ms, " << ms / 1000. << " s" << endl;
+
+        return true;
+    };
+
+private:
+    size_t m_num_iterations;
+};
+
+
+
+void add_tests_FlagTracker(UnitTestDatabase& database){
+    database.add<Test_FlagTrackerPerformance>("PokemonLA/FlagTrackerPerformance/Braviary_Fly_10.png", 10);
+}
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/PokemonLA/Inference/Objects/PokemonLA_FlagTracker.h b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_FlagTracker.h
similarity index 76%
rename from SerialPrograms/Source/PokemonLA/Inference/Objects/PokemonLA_FlagTracker.h
rename to SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_FlagTracker.h
index 5a44d550f4..92a6290619 100644
--- a/SerialPrograms/Source/PokemonLA/Inference/Objects/PokemonLA_FlagTracker.h
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_FlagTracker.h
@@ -1,6 +1,6 @@
 /*  Flag Tracker
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -8,7 +8,8 @@
 #define PokemonAutomation_PokemonLA_FlagTracker_H
 
 #include <deque>
-#include "Common/Cpp/AbstractLogger.h"
+#include "Common/Cpp/Logging/AbstractLogger.h"
+#include "Common/Cpp/TestRunners/UnitTest.h"
 #include "Common/Cpp/Concurrency/SpinLock.h"
 #include "PokemonLA_WhiteObjectDetector.h"
 #include "PokemonLA_FlagDetector.h"
@@ -27,7 +28,7 @@ class FlagTracker : public VisualInferenceCallback{
     bool get(
         double& distance, double& x, double& y,
         WallClock timestamp = current_time()
-    );
+    ) const;
 
     virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override;
 
@@ -42,7 +43,7 @@ class FlagTracker : public VisualInferenceCallback{
 private:
     // Logger& m_logger;
 
-    SpinLock m_lock;
+    mutable SpinLock m_lock;
     FlagDetector m_flags;
     WhiteObjectWatcher m_watcher;
 
@@ -51,6 +52,12 @@ class FlagTracker : public VisualInferenceCallback{
 
 
 
+
+void add_tests_FlagTracker(UnitTestDatabase& database);
+
+
+
+
 }
 }
 }
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_MMOQuestionMarkDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_MMOQuestionMarkDetector.cpp
new file mode 100644
index 0000000000..97e3992240
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_MMOQuestionMarkDetector.cpp
@@ -0,0 +1,380 @@
+/*  MMO Question Marks Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <sstream>
+#include <iostream>
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "Kernels/Waterfill/Kernels_Waterfill_Types.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Images/WaterfillUtilities.h"
+#include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h"
+#include "Tests/ImageUnitTest.h"
+#include "Tests/TestUtils.h"
+#include "VideoGames/PokemonLA/PokemonLA_Locations.h"
+#include "PokemonLA_MMOQuestionMarkDetector.h"
+
+using std::cout;
+using std::cerr;
+using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+using namespace Kernels::Waterfill;
+
+namespace{
+
+// Match the dark blue background of the question mark
+class MMOQuestionMarkBackgroundMatcher : public ImageMatch::WaterfillTemplateMatcher{
+public:
+    MMOQuestionMarkBackgroundMatcher();
+    static const MMOQuestionMarkBackgroundMatcher& instance();
+};
+
+MMOQuestionMarkBackgroundMatcher::MMOQuestionMarkBackgroundMatcher()
+    : WaterfillTemplateMatcher(
+        "PokemonLA/MMOQuestionMark-Template.png",
+        Color(0, 20, 40), Color(60, 90, 130), 200
+    )
+{
+    m_aspect_ratio_lower = 0.8;
+    m_aspect_ratio_upper = 1.2;
+    m_area_ratio_lower = 0.8;
+    m_area_ratio_upper = 1.2;
+}
+
+const MMOQuestionMarkBackgroundMatcher& MMOQuestionMarkBackgroundMatcher::instance(){
+    static MMOQuestionMarkBackgroundMatcher matcher;
+    return matcher;
+}
+
+
+// Match the main curve of the question mark
+class MMOQuestionMarkCurveMatcher : public ImageMatch::WaterfillTemplateMatcher{
+public:
+    MMOQuestionMarkCurveMatcher();
+    static const MMOQuestionMarkCurveMatcher& instance();
+};
+
+MMOQuestionMarkCurveMatcher::MMOQuestionMarkCurveMatcher()
+    : WaterfillTemplateMatcher(
+        "PokemonLA/MMOQuestionMark-Template.png",
+        Color(0xff808080), Color(0xffffffff), 200
+    )
+{
+    m_aspect_ratio_lower = 0.8;
+    m_aspect_ratio_upper = 1.2;
+    m_area_ratio_lower = 0.8;
+    m_area_ratio_upper = 1.2;
+}
+
+const MMOQuestionMarkCurveMatcher& MMOQuestionMarkCurveMatcher::instance(){
+    static MMOQuestionMarkCurveMatcher matcher;
+    return matcher;
+}
+
+
+
+// The boxes that cover the locations on the Hisui map that MMO question marks will appear.
+const std::array<ImageFloatBox, 5> hisui_map_boxes{{
+    {0.362, 0.670, 0.045, 0.075},
+    {0.683, 0.555, 0.039, 0.076},
+    {0.828, 0.372, 0.042, 0.082},
+    {0.485, 0.440, 0.044, 0.080},
+    {0.393, 0.144, 0.050, 0.084}
+}};
+
+
+bool detect_MMO_question_mark(const PokemonAutomation::ImageViewRGB32& frame, const ImageFloatBox& box){
+    auto image = extract_box_reference(frame, box);
+
+    const double screen_rel_size = (frame.height() / 1080.0);
+    const double rel_scale = screen_rel_size * screen_rel_size;
+
+    const size_t min_bg_size = 1300;
+    const size_t max_bg_size = 1600;
+
+    auto scale = [&](size_t size) -> size_t{
+        return size_t(size * rel_scale);
+    };
+
+    bool detected = match_template_by_waterfill(
+        frame.size(),
+        image,
+        MMOQuestionMarkBackgroundMatcher::instance(),
+        {
+            {combine_rgb(0, 0, 0), combine_rgb(127, 127, 127)},
+            {combine_rgb(0, 10, 30), combine_rgb(60, 90, 130)},
+        },
+        {scale(min_bg_size), scale(max_bg_size)},
+        90,
+        [](WaterfillObject&){ return true; }
+    );
+
+//    cout << "detected = " << detected << endl;
+
+    if (detected){
+        const size_t min_curve_size = 250;
+        const size_t max_curve_size = 450;
+        detected = match_template_by_waterfill(
+            frame.size(),
+            image, MMOQuestionMarkCurveMatcher::instance(),
+            {{combine_rgb(180, 180, 180), combine_rgb(255, 255, 255)}},
+            {scale(min_curve_size), scale(max_curve_size)}, 100,
+            [](WaterfillObject&){ return true; }
+        );
+    }
+
+    return detected;
+}
+
+} // anonymous namespace
+
+
+MMOQuestionMarkDetector::MMOQuestionMarkDetector(Logger& logger)
+    : m_logger(logger)
+{}
+
+
+void MMOQuestionMarkDetector::make_overlays(VideoOverlaySet& items) const{
+    for (size_t i = 0; i < hisui_map_boxes.size(); i++){
+        items.add(COLOR_RED, hisui_map_boxes[i]);
+    }
+}
+
+std::array<bool, 5> MMOQuestionMarkDetector::detect_MMO_on_hisui_map(const ImageViewRGB32& frame){
+    std::array<bool, 5> detected{false};
+    for (size_t i = 0; i < hisui_map_boxes.size(); i++){
+        detected[i] = detect_MMO_question_mark(frame, hisui_map_boxes[i]);
+    }
+    
+    if (std::find(detected.begin(), detected.end(), true) != detected.end()){
+        std::ostringstream os;
+        os << "Detected MMO question mark on region ";
+        for (size_t i = 0; i < detected.size(); i++){
+            if (detected[i]){
+                os << WILD_REGION_SHORT_NAMES[i] << ", ";
+            }
+        }
+        m_logger.log(os.str(), COLOR_PURPLE);
+    }
+
+    return detected;
+}
+
+std::vector<ImagePixelBox> MMOQuestionMarkDetector::detect_MMOs_on_region_map(const ImageViewRGB32& frame){
+    ImageFloatBox map_view{0.261, 0.060, 0.481, 0.842};
+    size_t map_min_x = (size_t)(frame.width() * map_view.x + 0.5);
+    size_t map_min_y = (size_t)(frame.height() * map_view.y + 0.5);
+    size_t map_width = (size_t)(frame.width() * map_view.width + 0.5);
+    size_t map_height = (size_t)(frame.height() * map_view.height + 0.5);
+    ImageViewRGB32 map_image(frame.sub_image(map_min_x, map_min_y, map_width, map_height));
+
+    std::vector<ImagePixelBox> results;
+
+    const double screen_rel_size = (frame.height() / 1080.0);
+    const double rel_scale = screen_rel_size * screen_rel_size;
+
+    const size_t min_bg_size = 1300;
+    const size_t max_bg_size = 1800;
+
+    auto scale = [&](size_t size) -> size_t{
+        return size_t(size * rel_scale);
+    };
+
+    match_template_by_waterfill(
+        frame.size(),
+        map_image, MMOQuestionMarkBackgroundMatcher::instance(),
+        {{combine_rgb(0, 5, 30), combine_rgb(100, 130, 130)}},
+        {scale(min_bg_size), scale(max_bg_size)}, 110,
+        [&](WaterfillObject& object){
+            size_t min_x = object.min_x + map_min_x;
+            size_t min_y = object.min_y + map_min_y;
+            size_t max_x = object.max_x + map_min_x;
+            size_t max_y = object.max_y + map_min_y;
+            results.emplace_back(min_x, min_y, max_x, max_y);
+            return false;
+        }
+    );
+
+    return results;
+}
+
+
+
+
+void add_hisui_MMO_detection_to_overlay(const std::array<bool, 5>& detection_result, VideoOverlaySet& items){
+    for (size_t i = 0; i < hisui_map_boxes.size(); i++){
+        if (detection_result[i]){
+            items.add(COLOR_CYAN, hisui_map_boxes[i]);
+        }
+    }
+}
+
+
+
+
+
+
+class Test_MMOQuestionMarkDetector : public ImageUnitTest{
+public:
+    Test_MMOQuestionMarkDetector(
+        const std::string& image,
+        std::vector<std::string> keywords
+    )
+        : ImageUnitTest("PokemonLA::MMOQuestionMarkDetector - " + image, {image})
+        , m_keywords(std::move(keywords))
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        bool hisui_kw_found = false;
+        std::array<bool, 5> target_hisui_region_has_MMO = {false};
+
+        bool region_kw_found = false;
+        int target_num_MMOs_on_region_map = -1;
+        int target_region_index = -1;
+
+        for (size_t keyword_index = 0; keyword_index < m_keywords.size(); keyword_index++){
+            const std::string& word = m_keywords[keyword_index];
+            if (hisui_kw_found == false && word == "Hisui"){
+                hisui_kw_found = true;
+                continue;
+            }
+            if (region_kw_found == false && word == "Region"){
+                region_kw_found = true;
+                continue;
+            }
+
+            if (hisui_kw_found){
+                // We have found the "Hisui" keyword. So the next words will be the index of the region on the Hisui map
+                // that has MMO.
+                try{
+                    int region = std::stoi(word);
+                    if (region < 0 || region > 4){
+                        cerr << "Error: wrong region number, must be [0, 4] but got " << region << endl;
+                        return "Error: wrong region number, must be [0, 4] but got " + std::to_string(region);
+                    }
+                    target_hisui_region_has_MMO[region] = true;
+                }catch (std::exception&){
+                    cerr << "Error: keyword must be a region number, ranging in [0, 4], but got " << word << endl;
+                    return "Error: keyword must be a region number, ranging in [0, 4], but got " + word;
+                }
+            }else if (region_kw_found){
+                // Found "Region" keyword, read a number as how many MMOs on the region map, and a region name.
+                if (target_region_index < 0){
+                    for (size_t index = 0; index < 5; index++){
+                        if (word == WILD_REGION_SHORT_NAMES[index]){
+                            target_region_index = (int)index;
+                            break;
+                        }
+                    }
+                    if (target_region_index >= 0){
+                        continue;
+                    }
+                }
+                if (target_num_MMOs_on_region_map < 0){
+                    try{
+                        int num_MMOs = std::stoi(word);
+                        if (num_MMOs < 0){
+                            cerr << "Error: wrong number " << num_MMOs << ", must be non-negative" << endl;
+                            return "Error: wrong number " + std::to_string(num_MMOs) + ", must be non-negative";
+                        }
+                        target_num_MMOs_on_region_map = num_MMOs;
+                    }catch (std::exception&){}
+                }
+            }
+        }
+
+        if (hisui_kw_found == false && region_kw_found == false){
+            cerr << "Error: need keyword \"Hisui\" or \"Region\" in filename/" << endl;
+            return "Error: need keyword \"Hisui\" or \"Region\" in filename/";
+        }
+
+        MMOQuestionMarkDetector detector(logger);
+        const ImageRGB32& image = images[0];
+
+        if (hisui_kw_found){
+            const auto region_has_MMO = detector.detect_MMO_on_hisui_map(image);
+
+            for (size_t i = 0; i < 5; i++){
+                const bool result = region_has_MMO[i];
+                const bool target = target_hisui_region_has_MMO[i];
+                if (result != target){
+                    cerr << "Error: " << __func__ << " result on region " << i << " is " << result << " but should be " << target << "." << endl;
+                    return std::string("Error: ") + __func__ +
+                    " result on region " + std::to_string(i) +
+                    " is " + std::to_string(result) +
+                    " but should be " + std::to_string(target) + ".";
+                }
+            }
+        }else{ // Region keyword found
+            if (target_region_index < 0 || target_num_MMOs_on_region_map < 0){
+                cerr << "Error: need a region name and a number of MMOs in the filename (e.g. image-Fieldlands_5.png)." << endl;
+            }
+            const auto results = detector.detect_MMOs_on_region_map(image);
+            TEST_RESULT_EQUAL_STR((int)results.size(), target_num_MMOs_on_region_map);
+        }
+
+        return true;
+    };
+
+private:
+    std::vector<std::string> m_keywords;
+};
+
+
+
+
+void add_tests_MMOQuestionMarkDetector(UnitTestDatabase& database){
+    database.add<Test_MMOQuestionMarkDetector>(
+        "PokemonLA/MMOQuestionMarkDetector/macOS_bright/All_Hisui_0_1_2_3_4.png",
+        std::vector<std::string>{"All", "Hisui", "0", "1", "2", "3", "4"}
+    );
+    database.add<Test_MMOQuestionMarkDetector>(
+        "PokemonLA/MMOQuestionMarkDetector/macOS_bright/MMO_Whiscash_Hisui_0_3.png",
+        std::vector<std::string>{"MMO", "Whiscash", "Hisui", "0", "3"}
+    );
+    database.add<Test_MMOQuestionMarkDetector>(
+        "PokemonLA/MMOQuestionMarkDetector/WinElgato/MMO_Barboach_Hisui_0_3.png",
+        std::vector<std::string>{"MMO", "Barboach", "Hisui", "0", "3"}
+    );
+    database.add<Test_MMOQuestionMarkDetector>(
+        "PokemonLA/MMOQuestionMarkDetector/WinElgato/MMO_Hisui_3_4.png",
+        std::vector<std::string>{"MMO", "Hisui", "3", "4"}
+    );
+    database.add<Test_MMOQuestionMarkDetector>(
+        "PokemonLA/MMOQuestionMarkDetector/WinHD60S/MMO_Hisui_3_4.png",
+        std::vector<std::string>{"MMO", "Hisui", "3", "4"}
+    );
+    database.add<Test_MMOQuestionMarkDetector>(
+        "PokemonLA/MMOQuestionMarkDetector/WinHD60S/MMO_Yanmega_Hisui_3_4.png",
+        std::vector<std::string>{"MMO", "Yanmega", "Hisui", "3", "4"}
+    );
+    database.add<Test_MMOQuestionMarkDetector>(
+        "PokemonLA/MMOQuestionMarkDetector/WinMirabox/MMO_Hisui_0_1_3.png",
+        std::vector<std::string>{"MMO", "Hisui", "0", "1", "3"}
+    );
+    database.add<Test_MMOQuestionMarkDetector>(
+        "PokemonLA/MMOQuestionMarkDetector/WinMirabox/MMO_Hisui_3_4.png",
+        std::vector<std::string>{"MMO", "Hisui", "3", "4"}
+    );
+}
+
+
+
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/PokemonLA/Inference/Objects/PokemonLA_MMOQuestionMarkDetector.h b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_MMOQuestionMarkDetector.h
similarity index 78%
rename from SerialPrograms/Source/PokemonLA/Inference/Objects/PokemonLA_MMOQuestionMarkDetector.h
rename to SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_MMOQuestionMarkDetector.h
index 142e0bebc2..d21a939242 100644
--- a/SerialPrograms/Source/PokemonLA/Inference/Objects/PokemonLA_MMOQuestionMarkDetector.h
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_MMOQuestionMarkDetector.h
@@ -1,6 +1,6 @@
 /*  MMO Question Mark Detector
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  *  Detect MMO question mark symbol.
  */
@@ -9,11 +9,10 @@
 #define PokemonAutomation_PokemonLA_MMOQuestionMarkDetector_H
 
 #include <array>
-#include "Common/Cpp/Color.h"
-#include "Common/Cpp/Concurrency/SpinLock.h"
+#include <vector>
+#include "Common/Cpp/Logging/AbstractLogger.h"
+#include "Common/Cpp/TestRunners/UnitTest.h"
 #include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "CommonFramework/Logging/Logger.h"
-#include "CommonFramework/ImageMatch/WaterfillTemplateMatcher.h"
 
 namespace PokemonAutomation{
 
@@ -25,7 +24,7 @@ namespace PokemonLA{
 
 
 
-class MMOQuestionMarkDetector {
+class MMOQuestionMarkDetector{
 public:
     MMOQuestionMarkDetector(Logger& logger);
 
@@ -47,6 +46,11 @@ class MMOQuestionMarkDetector {
 void add_hisui_MMO_detection_to_overlay(const std::array<bool, 5>& detection_result, VideoOverlaySet& items);
 
 
+
+
+void add_tests_MMOQuestionMarkDetector(UnitTestDatabase& database);
+
+
 }
 }
 }
diff --git a/SerialPrograms/Source/PokemonLA/Inference/Objects/PokemonLA_QuestMarkDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_QuestMarkDetector.cpp
similarity index 76%
rename from SerialPrograms/Source/PokemonLA/Inference/Objects/PokemonLA_QuestMarkDetector.cpp
rename to SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_QuestMarkDetector.cpp
index d95a720d81..4c83744948 100644
--- a/SerialPrograms/Source/PokemonLA/Inference/Objects/PokemonLA_QuestMarkDetector.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_QuestMarkDetector.cpp
@@ -1,12 +1,13 @@
 /*  Quest Mark Detector
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include "Kernels/Waterfill/Kernels_Waterfill.h"
-#include "CommonFramework/ImageTools/BinaryImage_FilterRgb32.h"
-#include "CommonFramework/ImageMatch/SubObjectTemplateMatcher.h"
+#include "CommonTools/Images/BinaryImage_FilterRgb32.h"
+#include "CommonTools/ImageMatch/SubObjectTemplateMatcher.h"
+#include "CommonTools/DetectedBoxes.h"
 #include "PokemonLA_QuestMarkDetector.h"
 
 namespace PokemonAutomation{
@@ -63,12 +64,16 @@ QuestMarkDetector::QuestMarkDetector()
         }
     )
 {}
-void QuestMarkDetector::process_object(const ImageViewRGB32& image, const WaterfillObject& object){
+void QuestMarkDetector::process_object(
+    Resolution input_resolution,
+    const ImageViewRGB32& image,
+    const WaterfillObject& object
+){
     ImagePixelBox object_box;
     if (QuestMarkMatcher::instance().matches(object_box, image, object)){
         m_detections.emplace_back(object_box);
     }
-    merge_heavily_overlapping();
+    merge_overlapping_boxes(m_detections);
 }
 
 
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_QuestMarkDetector.h b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_QuestMarkDetector.h
new file mode 100644
index 0000000000..dbb1e8541f
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_QuestMarkDetector.h
@@ -0,0 +1,33 @@
+/*  Quest Mark Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLA_QuestMarkDetector_H
+#define PokemonAutomation_PokemonLA_QuestMarkDetector_H
+
+#include <list>
+#include "PokemonLA_WhiteObjectDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+
+class QuestMarkDetector : public WhiteObjectDetector{
+public:
+    QuestMarkDetector();
+    virtual void process_object(
+        Resolution input_resolution,
+        const ImageViewRGB32& image,
+        const WaterfillObject& object
+    ) override;
+};
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/PokemonLA/Inference/Objects/PokemonLA_ShinySymbolDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_ShinySymbolDetector.cpp
similarity index 91%
rename from SerialPrograms/Source/PokemonLA/Inference/Objects/PokemonLA_ShinySymbolDetector.cpp
rename to SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_ShinySymbolDetector.cpp
index 33019ab6bf..f79a84250c 100644
--- a/SerialPrograms/Source/PokemonLA/Inference/Objects/PokemonLA_ShinySymbolDetector.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_ShinySymbolDetector.cpp
@@ -1,14 +1,14 @@
 /*  Shiny Symbol Detector
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include "Common/Cpp/Exceptions.h"
 #include "Kernels/Waterfill/Kernels_Waterfill.h"
 #include "Kernels/Waterfill/Kernels_Waterfill_Session.h"
-#include "CommonFramework/ImageTools/BinaryImage_FilterRgb32.h"
-#include "CommonFramework/ImageMatch/SubObjectTemplateMatcher.h"
+#include "CommonTools/Images/BinaryImage_FilterRgb32.h"
+#include "CommonTools/ImageMatch/SubObjectTemplateMatcher.h"
 #include "PokemonLA_ShinySymbolDetector.h"
 
 namespace PokemonAutomation{
diff --git a/SerialPrograms/Source/PokemonLA/Inference/Objects/PokemonLA_ShinySymbolDetector.h b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_ShinySymbolDetector.h
similarity index 88%
rename from SerialPrograms/Source/PokemonLA/Inference/Objects/PokemonLA_ShinySymbolDetector.h
rename to SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_ShinySymbolDetector.h
index c25477e9c4..537475e644 100644
--- a/SerialPrograms/Source/PokemonLA/Inference/Objects/PokemonLA_ShinySymbolDetector.h
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_ShinySymbolDetector.h
@@ -1,6 +1,6 @@
 /*  Shiny Symbol Detector
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -10,7 +10,7 @@
 #include <vector>
 #include "CommonFramework/ImageTools/ImageBoxes.h"
 #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
-#include "CommonFramework/InferenceInfra/VisualInferenceCallback.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_WhiteObjectDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_WhiteObjectDetector.cpp
new file mode 100644
index 0000000000..1be7cea0ad
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_WhiteObjectDetector.cpp
@@ -0,0 +1,127 @@
+/*  White Object Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+#include "Kernels/Waterfill/Kernels_Waterfill_Session.h"
+#include "CommonTools/Images/BinaryImage_FilterRgb32.h"
+#include "PokemonLA_WhiteObjectDetector.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+using namespace Kernels::Waterfill;
+
+
+
+// hardcode white object found in waterfill to have min area threshold of 50
+void find_overworld_white_objects(
+    Resolution input_resolution,
+    const std::vector<std::pair<WhiteObjectDetector&, bool>>& detectors,
+    const ImageViewRGB32& image
+){
+    // collect color filters from all white object detectors
+    std::set<Color> threshold_set;
+    for (const auto& item : detectors){
+        const std::set<Color>& thresholds = item.first.thresholds();
+        threshold_set.insert(thresholds.begin(), thresholds.end());
+    }
+
+//    FixedLimitVector<CompressRgb32ToBinaryRangeFilter> filters(threshold_set.size());
+//    for (Color filter : threshold_set){
+//        filters.emplace_back(image.width(), image.height(), (uint32_t)filter, 0xffffffff);
+//    }
+//    compress_rgb32_to_binary_range(image, filters.data(), filters.size());
+
+//    static int count = 0;
+    {
+        std::vector<std::pair<uint32_t, uint32_t>> filters;
+        for (Color filter : threshold_set){
+            filters.emplace_back((uint32_t)filter, 0xffffffff);
+        }
+        std::vector<PackedBinaryMatrix> matrix = compress_rgb32_to_binary_range(image, filters);
+
+#if 1
+        std::unique_ptr<WaterfillSession> session = make_WaterfillSession();
+        for (size_t c = 0; c < filters.size(); c++){
+
+//            cout << "filter[" << c << "] = " << filters[c].first << endl;
+//            cout << matrix[c].width() << " x " << matrix[c].height() << endl;
+//            cout << matrix[c].dump() << endl;
+            session->set_source(matrix[c]);
+            auto finder = session->make_iterator(50);
+            WaterfillObject object;
+            while (finder->find_next(object, false)){
+//                cout << object.area << endl;
+//                cout << matrix[c].submatrix(object.min_x, object.min_y, object.width(), object.height()).dump() << endl;
+//                extract_box_reference(image, object).save("test-" + std::to_string(count++) + "-" + std::to_string(c) + ".png");
+                for (const auto& detector : detectors){
+                    const std::set<Color>& thresholds = detector.first.thresholds();
+                    if (thresholds.find((Color)filters[c].first) != thresholds.end()){
+                        detector.first.process_object(input_resolution, image, object);
+                    }
+                }
+            }
+        }
+#endif
+    }
+
+    for (const auto& detector : detectors){
+        detector.first.finish(image);
+    }
+}
+
+
+
+WhiteObjectWatcher::WhiteObjectWatcher(
+    VideoOverlay& overlay,
+    const ImageFloatBox& box,
+    std::vector<std::pair<WhiteObjectDetector&, bool>> detectors
+)
+    : VisualInferenceCallback("WhiteObjectWatcher")
+    , m_box(box)
+    , m_overlays(overlay)
+    , m_detectors(detectors)
+{}
+
+void WhiteObjectWatcher::make_overlays(VideoOverlaySet& items) const{
+    items.add(COLOR_RED, m_box);
+}
+bool WhiteObjectWatcher::process_frame(const ImageViewRGB32& frame, WallClock timestamp){
+    for (auto& detector : m_detectors){
+        detector.first.clear();
+    }
+
+    find_overworld_white_objects(
+        frame.size(),
+        m_detectors,
+        extract_box_reference(frame, m_box)
+    );
+    m_overlays.clear();
+
+    for (auto& detector : m_detectors){
+        for (const ImagePixelBox& obj : detector.first.detections()){
+            ImageFloatBox box = translate_to_parent(frame, m_box, obj);
+            m_overlays.add(detector.first.color(), box);
+        }
+    }
+    for (auto& detector : m_detectors){
+        if (detector.second && !detector.first.detections().empty()){
+            return true;
+        }
+    }
+    return false;
+}
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_WhiteObjectDetector.h b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_WhiteObjectDetector.h
new file mode 100644
index 0000000000..07044e36f8
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_WhiteObjectDetector.h
@@ -0,0 +1,143 @@
+/*  White Object Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLA_WhiteObjectDetector_H
+#define PokemonAutomation_PokemonLA_WhiteObjectDetector_H
+
+#include <vector>
+#include <set>
+#include "Common/Compiler.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+
+namespace PokemonAutomation{
+namespace Kernels{
+namespace Waterfill{
+    class WaterfillObject;
+}
+}
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+
+// Abstract base class for detecting white/bright objects in overworld using waterfill.
+// Virtual methods to implement:
+//    - process_object(): Called for each candidate object found by waterfill (required)
+//    - finish(): Called after all objects processed for post-processing (optional)
+class WhiteObjectDetector{
+protected:
+    using WaterfillObject = Kernels::Waterfill::WaterfillObject;
+
+public:
+    virtual ~WhiteObjectDetector() = default;
+    WhiteObjectDetector(const WhiteObjectDetector&) = delete;
+    void operator=(const WhiteObjectDetector&) = delete;
+
+    // thresholds: thresholds for various filters. Each filter has a different threshold
+    // to filter out candidate objects on an image. The thresholds specified here are the
+    // min color thresholds. The max color thresholds for all filters are always 0xffffffff.
+    WhiteObjectDetector(Color inference_box_color, std::set<Color> thresholds)
+        : m_box_color(inference_box_color)
+        , m_thresholds(std::move(thresholds))
+    {}
+
+    // return inference box color
+    Color color() const{ return m_box_color; }
+    // return lower bound thresholds for used color filters. Higher bounds are always 0xffffffff.
+    const std::set<Color>& thresholds() const{ return m_thresholds; }
+
+    // return detected locations
+    const std::vector<ImagePixelBox>& detections() const{ return m_detections; }
+
+    // clear stored detection results
+    void clear(){ m_detections.clear(); }
+
+    // To be implemented by derived class:
+    // Called for each candidate waterfill object found by waterfill to check if it is a match
+    // (in case the object is a single white piece) or part of a match (in case the target object
+    // is made by multiple disjoint white parts). Store found objects/parts in `m_detections`.
+    // Note due to multiple color filters with different thresholds, we may end up with multiple
+    // versions of the same objects/parts stored in `m_detections` (an object can be picked by more
+    // than one color filter). This is OK. We will use `finish()` to finalize detection, which can
+    // call `merge_overlapping_boxes()` to deduplicate found objects.
+    // - input_resolution: full screen resolution
+    // - image: the image region on screen where the white object detection is run on.
+    // - object: a waterfill object found by one of the color filters (one in `m_thresholds`) on
+    //   the `image`.
+    virtual void process_object(
+        Resolution input_resolution,
+        const ImageViewRGB32& image,
+        const WaterfillObject& object
+    ) = 0;
+
+    // Optional method to be implemented by derived class:
+    // Called after all objects are processed by process_object() to finalize detection.
+    // Example use case:
+    // To detect the player-placed white flag on the overworld, we need to detect the two white
+    // components of the flag, the pole and the flag itself, separately as two waterfill object,
+    // given to `process_object()`. So in `finish()` we find the pair of the white object
+    // representing the pole and the flag based on their relative position and size to determine
+    // a flag match.
+    virtual void finish(const ImageViewRGB32& image){}
+
+protected:
+    Color m_box_color;  // inference box color
+    std::set<Color> m_thresholds;  // lower bound thresholds for color filters
+    std::vector<ImagePixelBox> m_detections; // detected locations
+};
+
+
+// A watcher to run a bunch of WhiteObjectDetectors to detect various white objects on screen.
+class WhiteObjectWatcher : public VisualInferenceCallback{
+public:
+    // box: the region on the screen to run detection.
+    // detectors: various WhiteObjectDetectors -> whether to let `process_frame()` return true
+    //   when that detector finds a match.
+    WhiteObjectWatcher(
+        VideoOverlay& overlay,
+        const ImageFloatBox& box,
+        std::vector<std::pair<WhiteObjectDetector&, bool>> detectors
+    );
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+
+    //  Use the stored WhtieObjectDetectors to detect various white objects on screen by calling
+    //  `find_overworld_white_objects()`.
+    //  Return true if one of the detectors finds a match and its corresponding `bool` passed into
+    //  the constructor is True.
+    virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override;
+
+
+private:
+    ImageFloatBox m_box;
+    VideoOverlaySet m_overlays;
+
+    std::vector<std::pair<WhiteObjectDetector&, bool>> m_detectors;
+};
+
+
+// Run a group of WhiteObjectDetectors with a combined waterfill session on input image.
+// Each candiate waterfill object is passed to matching WhiteObjectDetectors by calling
+// WhiteObjectDetector::process_object(). After waterill session, call each
+// WhiteObjectDetector::finish() to finalize white object detection.
+// - input_resolution: full screen resolution. Some WhiteObjectDetector may need this info.
+// - detectors: various WhiteObjectDetectors passed to WhiteObjectWatcher. The "bool" data
+//   is not used in this function.
+// - image: a crop of the screen to run detection on.
+void find_overworld_white_objects(
+    Resolution input_resolution,
+    const std::vector<std::pair<WhiteObjectDetector&, bool>>& detectors,
+    const ImageViewRGB32& image
+);
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/PokemonLA/Inference/PokemonLA_BerryTreeDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_BerryTreeDetector.cpp
similarity index 87%
rename from SerialPrograms/Source/PokemonLA/Inference/PokemonLA_BerryTreeDetector.cpp
rename to SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_BerryTreeDetector.cpp
index 3b94a9d007..fb52b869a5 100644
--- a/SerialPrograms/Source/PokemonLA/Inference/PokemonLA_BerryTreeDetector.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_BerryTreeDetector.cpp
@@ -1,6 +1,6 @@
 /*  Map Detector
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -8,22 +8,20 @@
 #include <algorithm>
 #include <sstream>
 #include <map>
-//#include "Common/Compiler.h"
+#include <iostream>
 #include "Common/Cpp/Color.h"
 #include "Common/Cpp/Time.h"
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
 #include "Kernels/Waterfill/Kernels_Waterfill_Session.h"
 #include "Kernels/Algorithm/Kernels_Algorithm_DisjointSet.h"
 #include "CommonFramework/ImageTypes/ImageRGB32.h"
 #include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "CommonFramework/ImageTools/BinaryImage_FilterRgb32.h"
-#include "CommonFramework/ImageTools/WaterfillUtilities.h"
-//#include "CommonFramework/ImageTools/ImageFilter.h"
-//#include "CommonFramework/ImageTools/SolidColorTest.h"
-//#include "CommonFramework/VideoPipeline/VideoOverlay.h"
+#include "CommonTools/Images/BinaryImage_FilterRgb32.h"
+#include "CommonTools/Images/WaterfillUtilities.h"
+#include "Tests/ImageUnitTest.h"
+#include "VideoGames/PokemonLA/PokemonLA_Locations.h"
 #include "PokemonLA_BerryTreeDetector.h"
-#include "PokemonLA/PokemonLA_Locations.h"
 
-#include <iostream>
 using std::cout;
 using std::endl;
 
@@ -52,7 +50,7 @@ std::vector<ImagePixelBox> merge_overlapping_boxes(std::vector<ImagePixelBox>& b
     DisjointSet disjoint_set(boxes.size());
 
     for (size_t i = 0; i < boxes.size(); i++){
-        for(size_t j = i + 1; j < boxes.size(); j++){
+        for (size_t j = i + 1; j < boxes.size(); j++){
             // box_j and the ones behind it won't overlap with cur_box.
             if (boxes[j].min_x >= boxes[i].max_x){
                 // break;
@@ -65,7 +63,7 @@ std::vector<ImagePixelBox> merge_overlapping_boxes(std::vector<ImagePixelBox>& b
     }
 
     std::map<size_t, ImagePixelBox> merged_boxes;
-    for(size_t i = 0; i < boxes.size(); i++){
+    for (size_t i = 0; i < boxes.size(); i++){
         size_t rep_box = disjoint_set.find(i);
         auto it = merged_boxes.find(rep_box);
         if (it == merged_boxes.end()){
@@ -79,7 +77,7 @@ std::vector<ImagePixelBox> merge_overlapping_boxes(std::vector<ImagePixelBox>& b
     }
 
     std::vector<ImagePixelBox> output_boxes;
-    for(const auto& p : merged_boxes){
+    for (const auto& p : merged_boxes){
         output_boxes.push_back(p.second);
     }
 
@@ -94,7 +92,7 @@ bool detect_sphere(const Kernels::Waterfill::WaterfillObject& object, ImageRGB32
     double threshold = 0.3;
     if (object.area >= 900){
         threshold = 0.5;
-    } else if (object.area >= 100) {
+    }else if (object.area >= 100){
         // For area size (assuming square shape) from 10.0 to 30.0, linearly raise
         // threshold from 0.3 to 0.5.
         threshold = 0.3 + 0.2 * (std::sqrt(object.area) - 10.0) / 20.0;
@@ -148,7 +146,11 @@ struct TreeColor{
 
     ColorPair leave;
 
-    TreeColor(ColorPair fruit_core, ColorPair fruit_full, ColorPair leave) : fruit_core(fruit_core), fruit_full(fruit_full), leave(leave) {}
+    TreeColor(ColorPair fruit_core, ColorPair fruit_full, ColorPair leave)
+        : fruit_core(fruit_core)
+        , fruit_full(fruit_full)
+        , leave(leave)
+    {}
 };
 
 enum class BerryTreeType{
@@ -275,7 +277,7 @@ bool BerryTreeDetector::process_frame(const ImageViewRGB32& frame, WallClock tim
 
     std::vector<ImagePixelBox> berry_boxes;
 
-    for(const auto& candidate_box: berry_candidate_areas){
+    for (const auto& candidate_box: berry_candidate_areas){
         std::cout << "candidate box " << to_str(candidate_box) << std::endl;
         // std::cout << std::endl;
 
@@ -321,7 +323,7 @@ bool BerryTreeDetector::process_frame(const ImageViewRGB32& frame, WallClock tim
     }
 
     // Check leaf color around berries
-    for(const auto& berry_box : berry_boxes){
+    for (const auto& berry_box : berry_boxes){
         draw_box(debug_image, berry_box, uint32_t(COLOR_GREEN), 1);
 
         ImagePixelBox enlarged_box;
@@ -345,8 +347,8 @@ bool BerryTreeDetector::process_frame(const ImageViewRGB32& frame, WallClock tim
             }
         );
 
-        // for(int x = 0; x < enlarged_box.width(); x++){
-        //     for(int y = 0; y < enlarged_box.height(); y++){
+        // for (int x = 0; x < enlarged_box.width(); x++){
+        //     for (int y = 0; y < enlarged_box.height(); y++){
         //         if (leaf_matrix.get(x, y)){
         //             debug_image.setPixelColor(enlarged_box.min_x + x, enlarged_box.min_y + y, QColor(255, 0, 0));
         //         }
@@ -372,8 +374,8 @@ bool BerryTreeDetector::process_frame(const ImageViewRGB32& frame, WallClock tim
 
     
 
-    // for(int x = 0; x < debug_image.width(); x++){
-    //     for(int y = 0; y < debug_image.height(); y++){
+    // for (int x = 0; x < debug_image.width(); x++){
+    //     for (int y = 0; y < debug_image.height(); y++){
     //         if (matrices[0].get(x, y)){
     //             debug_image.setPixelColor(x, y, QColor(255, 0, 0));
     //         }
@@ -387,6 +389,45 @@ bool BerryTreeDetector::process_frame(const ImageViewRGB32& frame, WallClock tim
 
 
 
+
+
+
+
+
+class Test_BerryTreeDetector : public ImageUnitTest{
+public:
+    Test_BerryTreeDetector(
+        const std::string& image,
+        bool expected
+    )
+        : ImageUnitTest("PokemonLA::BerryTreeDetector - " + image, {image})
+        , m_expected(expected)
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        BerryTreeDetector detector;
+        const ImageRGB32& image = images[0];
+        return detector.process_frame(image, current_time()) == m_expected;
+    };
+
+private:
+    bool m_expected;
+};
+
+
+void add_tests_BerryTreeDetector(UnitTestDatabase& database){
+
+}
+
+
+
+
+
+
+
 }
 }
 }
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_BerryTreeDetector.h b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_BerryTreeDetector.h
new file mode 100644
index 0000000000..dce9575a06
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_BerryTreeDetector.h
@@ -0,0 +1,40 @@
+/*  Berry Tree Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLA_BerryTreeDetector_H
+#define PokemonAutomation_PokemonLA_BerryTreeDetector_H
+
+#include "Common/Cpp/TestRunners/UnitTest.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+
+class BerryTreeDetector : public VisualInferenceCallback{
+public:
+    BerryTreeDetector();
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+
+    //  Return true if the inference session should stop.
+    virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override;
+
+private:
+};
+
+
+
+
+void add_tests_BerryTreeDetector(UnitTestDatabase& database);
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_BlackOutDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_BlackOutDetector.cpp
new file mode 100644
index 0000000000..53dabc4c7a
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_BlackOutDetector.cpp
@@ -0,0 +1,143 @@
+/*  Black Out Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Images/SolidColorTest.h"
+#include "Tests/ImageUnitTest.h"
+#include "Tests/TestUtils.h"
+#include "PokemonLA_BlackOutDetector.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+namespace{
+
+// const std::array<ImageSolidCheck, 18> dropped_item_bg_checks = {
+//     ImageSolidCheck(0.031, 0.900, 0.024, 0.017, 0.444, 0.440, 0.116, 0.15, 20.0),
+//     ImageSolidCheck(0.026, 0.743, 0.021, 0.038, 0.407, 0.397, 0.196, 0.15, 50.0),
+//     ImageSolidCheck(0.022, 0.581, 0.020, 0.018, 0.332, 0.433, 0.234, 0.15, 30.0),
+//     ImageSolidCheck(0.152, 0.482, 0.017, 0.040, 0.343, 0.451, 0.207, 0.15, 30.0),
+//     ImageSolidCheck(0.016, 0.218, 0.018, 0.021, 0.341, 0.350, 0.309, 0.15, 20.0),
+//     ImageSolidCheck(0.169, 0.103, 0.024, 0.036, 0.216, 0.385, 0.399, 0.15, 10.0),
+//     ImageSolidCheck(0.815, 0.244, 0.026, 0.026, 0.339, 0.350, 0.310, 0.15, 40.0),
+//     ImageSolidCheck(0.737, 0.126, 0.045, 0.056, 0.227, 0.384, 0.389, 0.15, 30.0),
+//     ImageSolidCheck(0.806, 0.431, 0.043, 0.026, 0.350, 0.371, 0.278, 0.15, 20.0),
+//     ImageSolidCheck(0.827, 0.507, 0.023, 0.028, 0.327, 0.386, 0.287, 0.15, 30.0),
+//     ImageSolidCheck(0.747, 0.603, 0.087, 0.086, 0.402, 0.439, 0.159, 0.15, 20.0),
+//     ImageSolidCheck(0.885, 0.653, 0.041, 0.093, 0.353, 0.404, 0.242, 0.15, 20.0),
+//     ImageSolidCheck(0.934, 0.556, 0.039, 0.038, 0.413, 0.446, 0.141, 0.15, 30.0),
+//     ImageSolidCheck(0.761, 0.913, 0.071, 0.051, 0.373, 0.424, 0.203, 0.15, 30.0),
+//     ImageSolidCheck(0.865, 0.098, 0.022, 0.030, 0.326, 0.353, 0.321, 0.15, 50.0),
+//     ImageSolidCheck(0.202, 0.631, 0.057, 0.075, 0.414, 0.468, 0.118, 0.15, 20.0),
+//     ImageSolidCheck(0.099, 0.265, 0.072, 0.070, 0.288, 0.376, 0.336, 0.15, 20.0),
+//     ImageSolidCheck(0.908, 0.313, 0.020, 0.017, 0.316, 0.387, 0.297, 0.15, 20.0),
+// };
+
+
+}
+
+
+BlackOutDetector::BlackOutDetector(Logger& logger, VideoOverlay& overlay)
+    : VisualInferenceCallback("BlackOutDetector")
+    , m_black_screen(0.068, 0.088, 0.864, 0.581)
+    , m_yellow_arrow_detector(logger, overlay, true)
+    // , m_button_Y_detector(logger, overlay, ButtonType::ButtonY, ImageFloatBox{0.439, 0.819, 0.029, 0.059}, std::chrono::milliseconds(0), false)
+{}
+
+void BlackOutDetector::make_overlays(VideoOverlaySet& items) const{
+    m_yellow_arrow_detector.make_overlays(items);
+    items.add(COLOR_BLUE, m_black_screen);
+}
+
+//  Return true if the inference session should stop.
+bool BlackOutDetector::process_frame(const ImageViewRGB32& frame, WallClock timestamp){
+
+    auto save_image = [&](){
+//        static int count = 0;
+//        frame.save("BlackOut-" + std::to_string(count) + ".png");
+//        count++;
+    };
+
+    // check whether it is the black out screen
+    const bool is_screen_black = is_black(extract_box_reference(frame, m_black_screen), 100, 10);
+    if (is_screen_black && m_yellow_arrow_detector.process_frame(frame, timestamp)){
+        // We have both a mostly black screen and a yellow arrow:
+        save_image();
+        return true;
+    }
+
+    return false;
+
+
+    // // Check each patch of background color of the dropped item screen
+    // for (const auto& check: dropped_item_bg_checks){
+    //     if (check.check(frame) == false){
+    //         // cout << "Check failed " << check.debug_string(frame) << endl;
+    //         return false;
+    //     }
+    // }
+    // save_image();
+    // return true;
+}
+
+
+
+
+
+
+class Test_BlackOutDetector : public ImageUnitTest{
+public:
+    Test_BlackOutDetector(
+        const std::string& image,
+        bool expected
+    )
+        : ImageUnitTest("PokemonLA::BlackOutDetector - " + image, {image})
+        , m_expected(expected)
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        DummyVideoOverlay overlay;
+        BlackOutDetector detector(logger, overlay);
+        const ImageRGB32& image = images[0];
+        return detector.process_frame(image, current_time()) == m_expected;
+    };
+
+private:
+    bool m_expected;
+};
+
+
+
+
+
+void add_tests_BlackOutDetector(UnitTestDatabase& database){
+    database.add<Test_BlackOutDetector>("PokemonLA/BlackOutDetector/macOS_bright/BlackOut1_True.png", true);
+    database.add<Test_BlackOutDetector>("PokemonLA/BlackOutDetector/macOS_bright/BlackOut2_True.png", true);
+    database.add<Test_BlackOutDetector>("PokemonLA/BlackOutDetector/macOS_bright/Coastlands_False.png", false);
+    database.add<Test_BlackOutDetector>("PokemonLA/BlackOutDetector/macOS_bright/Fieldlands_False.jpg", false);
+    database.add<Test_BlackOutDetector>("PokemonLA/BlackOutDetector/macOS_bright/Mirelands_False.png", false);
+    database.add<Test_BlackOutDetector>("PokemonLA/BlackOutDetector/macOS_bright/Village_False.png", false);
+
+    database.add<Test_BlackOutDetector>("PokemonLA/BlackOutDetector/WinPowcxy/BlackOut_True.png", true);
+
+}
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_BlackOutDetector.h b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_BlackOutDetector.h
new file mode 100644
index 0000000000..4926f87f63
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_BlackOutDetector.h
@@ -0,0 +1,51 @@
+/*  Black Out Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  Detect the black out screen when player character blacks out.
+ */
+
+#ifndef PokemonAutomation_PokemonLA_BlackOutDetector_H
+#define PokemonAutomation_PokemonLA_BlackOutDetector_H
+
+#include "Common/Cpp/TestRunners/UnitTest.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+#include "VideoGames/PokemonLA/Inference/Objects/PokemonLA_DialogYellowArrowDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+
+class BlackOutDetector : public VisualInferenceCallback{
+public:
+    BlackOutDetector(Logger& logger, VideoOverlay& overlay);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+
+    //  Return true if the inference session should stop.
+    virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override;
+
+private:
+    // The black screen when the dialog of "Everything went black!" appears
+    ImageFloatBox m_black_screen;
+    // The yellow arrow pointing to the white button on the "Everything went black!" dialog box.
+    DialogYellowArrowDetector m_yellow_arrow_detector;
+    // The bottom white space of the "Return to Base Camp" button.
+    // ImageFloatBox m_return_camp_bottom;
+
+    // ButtonDetector m_button_Y_detector;
+};
+
+
+
+void add_tests_BlackOutDetector(UnitTestDatabase& database);
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_CommonColorCheck.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_CommonColorCheck.cpp
new file mode 100644
index 0000000000..f6b974f9ff
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_CommonColorCheck.cpp
@@ -0,0 +1,24 @@
+/*  Common Color Check
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/ImageTools/ImageStats.h"
+#include "PokemonLA_CommonColorCheck.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+
+bool is_LA_dark_blue(const ImageStats& stats){
+    return (stats.average.sum() <= 300 && stats.stddev.sum() <= 15 &&
+        stats.average.b > stats.average.r && stats.average.b > stats.average.g
+    );
+}
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_CommonColorCheck.h b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_CommonColorCheck.h
new file mode 100644
index 0000000000..d40c846bf7
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_CommonColorCheck.h
@@ -0,0 +1,28 @@
+/*  Common Color Check
+ *
+ *  From: https://github.com/PokemonAutomation/
+ * 
+ *  Several checks for commonly used color in LA. These checks are used by various inference detector classes.
+ */
+
+#ifndef PokemonAutomation_PokemonLA_CommonColorCheck_H
+#define PokemonAutomation_PokemonLA_CommonColorCheck_H
+
+namespace PokemonAutomation{
+
+struct ImageStats;
+
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+// The dark blue used as the background of the title text on normal and surprise diallgue boxes.
+// The color is also used as the selected tab on the top of the screen in the main menu space
+// (entered by pressing DPAD_UP from overworld).
+bool is_LA_dark_blue(const ImageStats& stats);
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/PokemonLA/Inference/PokemonLA_DialogDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_DialogDetector.cpp
similarity index 75%
rename from SerialPrograms/Source/PokemonLA/Inference/PokemonLA_DialogDetector.cpp
rename to SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_DialogDetector.cpp
index cf89337989..9f0fd1db1d 100644
--- a/SerialPrograms/Source/PokemonLA/Inference/PokemonLA_DialogDetector.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_DialogDetector.cpp
@@ -1,17 +1,20 @@
 /*  Dialog Detector
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
 #include "CommonFramework/ImageTools/ImageStats.h"
-#include "CommonFramework/ImageTools/SolidColorTest.h"
+#include "CommonTools/Images/SolidColorTest.h"
+#include "Tests/ImageUnitTest.h"
+#include "Tests/TestUtils.h"
 #include "PokemonLA_CommonColorCheck.h"
 #include "PokemonLA_DialogDetector.h"
 
-#include <iostream>
-using std::cout;
-using std::endl;
+//#include <iostream>
+//using std::cout;
+//using std::endl;
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
@@ -175,7 +178,7 @@ bool EventDialogDetector::process_frame(const ImageViewRGB32& frame, WallClock t
     auto dialog_bg_color_check = [](const ImageStats & stats) -> bool{
         // cout << "stats " << stats.average << " " << stats.stddev << endl;
         const auto& avg = stats.average;
-        return avg.r < 50.0 && avg.g < 70.0 && avg.b < 100.0 && avg.r < avg.b * 1.3 && avg.g < avg.b * 1.3 && stats.stddev.sum() < 20.;
+        return avg.r < 60.0 && avg.g < 80.0 && avg.b < 120.0 && avg.r < avg.b * 1.4 && avg.g < avg.b * 1.4 && stats.stddev.sum() < 30.;
     };
 
     ImageStats left_blue = image_stats(extract_box_reference(frame, m_left_blue));
@@ -192,6 +195,66 @@ bool EventDialogDetector::process_frame(const ImageViewRGB32& frame, WallClock t
 
     return detected && m_stop_on_detected;
 }
+
+
+
+
+
+
+
+
+
+
+
+
+
+class Test_EventDialogDetector : public ImageUnitTest{
+public:
+    Test_EventDialogDetector(
+        const std::string& image,
+        bool expected
+    )
+        : ImageUnitTest("PokemonLA::EventDialogDetector - " + image, {image})
+        , m_expected(expected)
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        DummyVideoOverlay overlay;
+        EventDialogDetector detector(logger, overlay, true);
+        const ImageRGB32& image = images[0];
+        return detector.process_frame(image, current_time()) == m_expected;
+    };
+
+private:
+    bool m_expected;
+};
+
+
+
+
+
+
+void add_tests_DialogDetector(UnitTestDatabase& database){
+    database.add<Test_EventDialogDetector>("PokemonLA/EventDialogDetector/French_Fieldlands_720P_True.jpeg", true);
+    database.add<Test_EventDialogDetector>("PokemonLA/EventDialogDetector/macOS_bright/MMO_Coastlands_True.png", true);
+    database.add<Test_EventDialogDetector>("PokemonLA/EventDialogDetector/macOS_bright/MMO_Mirelands_True.png", true);
+    database.add<Test_EventDialogDetector>("PokemonLA/EventDialogDetector/macOS_bright/Tent_True.png", true);
+    database.add<Test_EventDialogDetector>("PokemonLA/EventDialogDetector/WinMyPin/MyPin_BlackDialog_True.png", true);
+    database.add<Test_EventDialogDetector>("PokemonLA/EventDialogDetector/WinShadowCast/Icelands_True.png", true);
+    database.add<Test_EventDialogDetector>("PokemonLA/EventDialogDetector/WinShadowCast/Mirelands_True.png", true);
+
+}
+
+
+
+
+
+
+
+
 }
 }
 }
diff --git a/SerialPrograms/Source/PokemonLA/Inference/PokemonLA_DialogDetector.h b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_DialogDetector.h
similarity index 84%
rename from SerialPrograms/Source/PokemonLA/Inference/PokemonLA_DialogDetector.h
rename to SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_DialogDetector.h
index b8439ae949..be7661063c 100644
--- a/SerialPrograms/Source/PokemonLA/Inference/PokemonLA_DialogDetector.h
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_DialogDetector.h
@@ -1,6 +1,6 @@
 /*  Dialog Detector
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -8,9 +8,9 @@
 #define PokemonAutomation_PokemonLA_DialogDetector_H
 
 #include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "CommonFramework/InferenceInfra/VisualInferenceCallback.h"
-#include "PokemonLA/Inference/Objects/PokemonLA_ArcPhoneDetector.h"
-#include "PokemonLA/Inference/Objects/PokemonLA_DialogueYellowArrowDetector.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+#include "VideoGames/PokemonLA/Inference/Objects/PokemonLA_ArcPhoneDetector.h"
+#include "VideoGames/PokemonLA/Inference/Objects/PokemonLA_DialogYellowArrowDetector.h"
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
@@ -83,9 +83,23 @@ class EventDialogDetector : public VisualInferenceCallback{
     std::atomic<bool> m_detected;
     ImageFloatBox m_left_blue;
     ImageFloatBox m_right_blue;
-    DialogueYellowArrowDetector m_yellow_arrow_detector;
+    DialogYellowArrowDetector m_yellow_arrow_detector;
 };
 
+
+
+
+
+
+
+
+
+
+void add_tests_DialogDetector(UnitTestDatabase& database);
+
+
+
+
 }
 }
 }
diff --git a/SerialPrograms/Source/PokemonLA/Inference/PokemonLA_ItemCompatibilityDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_ItemCompatibilityDetector.cpp
similarity index 78%
rename from SerialPrograms/Source/PokemonLA/Inference/PokemonLA_ItemCompatibilityDetector.cpp
rename to SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_ItemCompatibilityDetector.cpp
index e0e2c772b2..de6def9571 100644
--- a/SerialPrograms/Source/PokemonLA/Inference/PokemonLA_ItemCompatibilityDetector.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_ItemCompatibilityDetector.cpp
@@ -1,18 +1,18 @@
 /*  Item Compatibility Detector
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include "CommonFramework/ImageTypes/ImageRGB32.h"
 #include "CommonFramework/ImageTools/ImageStats.h"
 #include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "CommonFramework/ImageTools/ImageFilter.h"
+#include "CommonTools/Images/ImageFilter.h"
 #include "PokemonLA_ItemCompatibilityDetector.h"
 
-#include <iostream>
-using std::cout;
-using std::endl;
+//#include <iostream>
+//using std::cout;
+//using std::endl;
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
@@ -34,7 +34,7 @@ ItemCompatibility detect_item_compatibility(const ImageViewRGB32& screen){
     );
 
     ImageStats stats = image_stats(region);
-    // std::cout << "Compability color " << stats.average.r << " " << stats.average.g << " " << stats.average.b << std::endl;
+    // std::cout << "Compatibility color " << stats.average.r << " " << stats.average.g << " " << stats.average.b << std::endl;
     if (stats.average.r > stats.average.b + 50.0){
         return ItemCompatibility::INCOMPATIBLE;
     }
diff --git a/SerialPrograms/Source/PokemonLA/Inference/PokemonLA_ItemCompatibilityDetector.h b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_ItemCompatibilityDetector.h
similarity index 88%
rename from SerialPrograms/Source/PokemonLA/Inference/PokemonLA_ItemCompatibilityDetector.h
rename to SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_ItemCompatibilityDetector.h
index 6f2030c20d..0a8e823427 100644
--- a/SerialPrograms/Source/PokemonLA/Inference/PokemonLA_ItemCompatibilityDetector.h
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_ItemCompatibilityDetector.h
@@ -1,6 +1,6 @@
 /*  Item Compatibility Detector
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/PokemonLA/Inference/PokemonLA_MountDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_MountDetector.cpp
similarity index 87%
rename from SerialPrograms/Source/PokemonLA/Inference/PokemonLA_MountDetector.cpp
rename to SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_MountDetector.cpp
index 0c977d7df3..8bd5fc479f 100644
--- a/SerialPrograms/Source/PokemonLA/Inference/PokemonLA_MountDetector.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_MountDetector.cpp
@@ -1,25 +1,22 @@
 /*  Mount Detector
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include <sstream>
+#include <iostream>
 #include "Common/Cpp/Exceptions.h"
-#include "Kernels/ImageFilters/Kernels_ImageFilter_Basic.h"
-#include "Kernels/Waterfill/Kernels_Waterfill.h"
 #include "Kernels/Waterfill/Kernels_Waterfill_Session.h"
-#include "CommonFramework/Globals.h"
+#include "CommonFramework/GlobalAutoPaths.h"
+#include "CommonFramework/Logging/Logger.h"
 #include "CommonFramework/Tools/ErrorDumper.h"
-#include "CommonFramework/ImageTools/ImageFilter.h"
-#include "CommonFramework/ImageTools/BinaryImage_FilterRgb32.h"
-#include "CommonFramework/ImageMatch/WaterfillTemplateMatcher.h"
-#include "CommonFramework/ImageMatch/SubObjectTemplateMatcher.h"
 #include "CommonFramework/Notifications/ProgramInfo.h"
-#include "PokemonLA/Inference/Objects/PokemonLA_ButtonDetector.h"
+#include "CommonTools/Images/ImageFilter.h"
+#include "CommonTools/Images/BinaryImage_FilterRgb32.h"
+#include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h"
+#include "VideoGames/PokemonLA/Inference/Objects/PokemonLA_ButtonDetector.h"
 #include "PokemonLA_MountDetector.h"
 
-#include <iostream>
 using std::cout;
 using std::endl;
 
@@ -61,17 +58,17 @@ ImageRGB32 make_MountMatcher2Image(const char* path){
         ImageViewRGB32 cropped = extract_box_reference(image, object);
 //        cropped.save("test-" + std::to_string(c++) + ".png");
 
-        double current_rmsd_plus = ButtonMatcher::Plus().rmsd_precropped(cropped, object);
+        double current_rmsd_plus = ButtonMatcher::Plus().rmsd_precropped(image.size(), cropped, object);
         if (rmsd_plus > current_rmsd_plus){
             rmsd_plus = current_rmsd_plus;
             plus = object;
         }
-        double current_rmsd_arrowL = ButtonMatcher::ArrowLeft().rmsd_precropped(cropped, object);
+        double current_rmsd_arrowL = ButtonMatcher::ArrowLeft().rmsd_precropped(image.size(), cropped, object);
         if (rmsd_arrowL > current_rmsd_arrowL){
             rmsd_arrowL = current_rmsd_arrowL;
             arrowL = object;
         }
-        double current_rmsd_arrowR = ButtonMatcher::ArrowRight().rmsd_precropped(cropped, object);
+        double current_rmsd_arrowR = ButtonMatcher::ArrowRight().rmsd_precropped(image.size(), cropped, object);
         if (rmsd_arrowR > current_rmsd_arrowR){
             rmsd_arrowR = current_rmsd_arrowR;
             arrowR = object;
@@ -363,7 +360,12 @@ struct MountDetectorFilteredImage{
 std::vector<MountDetectorFilteredImage> run_filters(const ImageViewRGB32& image, const std::vector<std::pair<uint32_t, uint32_t>>& range){
     std::vector<FilterRgb32Range> filters;
     for (size_t c = 0; c < range.size(); c++){
-        filters.emplace_back(FilterRgb32Range{range[c].first, range[c].second, COLOR_BLACK, false});
+        filters.emplace_back(
+            FilterRgb32Range{
+                COLOR_BLACK, false,
+                range[c].first, range[c].second
+            }
+        );
     }
 
     std::vector<PackedBinaryMatrix> matrices = compress_rgb32_to_binary_range(image, range);
@@ -428,19 +430,19 @@ MountState MountDetector::detect(const ImageViewRGB32& screen) const{
 
 
                 //  Read the buttons.
-                double current_rmsd_plus = ButtonMatcher::Plus().rmsd_precropped(cropped, object);
+                double current_rmsd_plus = ButtonMatcher::Plus().rmsd_precropped(screen.size(), cropped, object);
                 if (rmsd_plus > current_rmsd_plus){
                     rmsd_plus = current_rmsd_plus;
                     plus = object;
                 }
 //                cout << "Arrow (left)" << endl;
-                double current_rmsd_arrowL = ButtonMatcher::ArrowLeft().rmsd_precropped(cropped, object);
+                double current_rmsd_arrowL = ButtonMatcher::ArrowLeft().rmsd_precropped(screen.size(), cropped, object);
                 if (rmsd_arrowL > current_rmsd_arrowL){
                     rmsd_arrowL = current_rmsd_arrowL;
                     arrowL = object;
                 }
 //                cout << "Arrow (right)" << endl;
-                double current_rmsd_arrowR = ButtonMatcher::ArrowRight().rmsd_precropped(cropped, object);
+                double current_rmsd_arrowR = ButtonMatcher::ArrowRight().rmsd_precropped(screen.size(), cropped, object);
 //                cout << "rmsd_arrowR = " << rmsd_arrowR << endl;
                 if (rmsd_arrowR > current_rmsd_arrowR){
                     rmsd_arrowR = current_rmsd_arrowR;
@@ -457,16 +459,16 @@ MountState MountDetector::detect(const ImageViewRGB32& screen) const{
 
                 ImageViewRGB32 filtered_cropped = extract_box_reference(filtered.image, object);
 #if 1
-                candidates.add_filtered(MountWyrdeerMatcher      ::off().rmsd_precropped(filtered_cropped, object), MountState::WYRDEER_OFF);
-                candidates.add_direct  (MountWyrdeerMatcher      ::off().rmsd_precropped(cropped         , object), MountState::WYRDEER_OFF);
-                candidates.add_filtered(MountUrsalunaMatcher     ::off().rmsd_precropped(filtered_cropped, object), MountState::URSALUNA_OFF);
-                candidates.add_direct  (MountUrsalunaMatcher     ::off().rmsd_precropped(cropped         , object), MountState::URSALUNA_OFF);
-                candidates.add_filtered(MountBasculegionMatcher  ::off().rmsd_precropped(filtered_cropped, object), MountState::BASCULEGION_OFF);
-                candidates.add_direct  (MountBasculegionMatcher  ::off().rmsd_precropped(cropped         , object), MountState::BASCULEGION_OFF);
-                candidates.add_filtered(MountSneaslerMatcher     ::off().rmsd_precropped(filtered_cropped, object), MountState::SNEASLER_OFF);
-                candidates.add_direct  (MountSneaslerMatcher     ::off().rmsd_precropped(cropped         , object), MountState::SNEASLER_OFF);
-                candidates.add_filtered(MountBraviaryMatcher     ::off().rmsd_precropped(filtered_cropped, object), MountState::BRAVIARY_OFF);
-                candidates.add_direct  (MountBraviaryMatcher     ::off().rmsd_precropped(cropped         , object), MountState::BRAVIARY_OFF);
+                candidates.add_filtered(MountWyrdeerMatcher      ::off().rmsd_precropped(screen.size(), filtered_cropped, object), MountState::WYRDEER_OFF);
+                candidates.add_direct  (MountWyrdeerMatcher      ::off().rmsd_precropped(screen.size(), cropped         , object), MountState::WYRDEER_OFF);
+                candidates.add_filtered(MountUrsalunaMatcher     ::off().rmsd_precropped(screen.size(), filtered_cropped, object), MountState::URSALUNA_OFF);
+                candidates.add_direct  (MountUrsalunaMatcher     ::off().rmsd_precropped(screen.size(), cropped         , object), MountState::URSALUNA_OFF);
+                candidates.add_filtered(MountBasculegionMatcher  ::off().rmsd_precropped(screen.size(), filtered_cropped, object), MountState::BASCULEGION_OFF);
+                candidates.add_direct  (MountBasculegionMatcher  ::off().rmsd_precropped(screen.size(), cropped         , object), MountState::BASCULEGION_OFF);
+                candidates.add_filtered(MountSneaslerMatcher     ::off().rmsd_precropped(screen.size(), filtered_cropped, object), MountState::SNEASLER_OFF);
+                candidates.add_direct  (MountSneaslerMatcher     ::off().rmsd_precropped(screen.size(), cropped         , object), MountState::SNEASLER_OFF);
+                candidates.add_filtered(MountBraviaryMatcher     ::off().rmsd_precropped(screen.size(), filtered_cropped, object), MountState::BRAVIARY_OFF);
+                candidates.add_direct  (MountBraviaryMatcher     ::off().rmsd_precropped(screen.size(), cropped         , object), MountState::BRAVIARY_OFF);
 #endif
 
             }
@@ -546,16 +548,16 @@ MountState MountDetector::detect(const ImageViewRGB32& screen) const{
                 ImageViewRGB32 cropped = extract_box_reference(image, object);
                 ImageViewRGB32 filtered_cropped = extract_box_reference(filtered.image, object);
 #if 1
-                candidates.add_filtered(MountWyrdeerMatcher      ::on().rmsd(filtered_cropped), MountState::WYRDEER_ON);
-                candidates.add_direct  (MountWyrdeerMatcher      ::on().rmsd(cropped         ), MountState::WYRDEER_ON);
-                candidates.add_filtered(MountUrsalunaMatcher     ::on().rmsd(filtered_cropped), MountState::URSALUNA_ON);
-                candidates.add_direct  (MountUrsalunaMatcher     ::on().rmsd(cropped         ), MountState::URSALUNA_ON);
-                candidates.add_filtered(MountBasculegionMatcher  ::on().rmsd(filtered_cropped), MountState::BASCULEGION_ON);
-                candidates.add_direct  (MountBasculegionMatcher  ::on().rmsd(cropped         ), MountState::BASCULEGION_ON);
-                candidates.add_filtered(MountSneaslerMatcher     ::on().rmsd(filtered_cropped), MountState::SNEASLER_ON);
-                candidates.add_direct  (MountSneaslerMatcher     ::on().rmsd(cropped         ), MountState::SNEASLER_ON);
-                candidates.add_filtered(MountBraviaryMatcher     ::on().rmsd(filtered_cropped), MountState::BRAVIARY_ON);
-                candidates.add_direct  (MountBraviaryMatcher     ::on().rmsd(cropped         ), MountState::BRAVIARY_ON);
+                candidates.add_filtered(MountWyrdeerMatcher      ::on().rmsd(screen.size(), filtered_cropped), MountState::WYRDEER_ON);
+                candidates.add_direct  (MountWyrdeerMatcher      ::on().rmsd(screen.size(), cropped         ), MountState::WYRDEER_ON);
+                candidates.add_filtered(MountUrsalunaMatcher     ::on().rmsd(screen.size(), filtered_cropped), MountState::URSALUNA_ON);
+                candidates.add_direct  (MountUrsalunaMatcher     ::on().rmsd(screen.size(), cropped         ), MountState::URSALUNA_ON);
+                candidates.add_filtered(MountBasculegionMatcher  ::on().rmsd(screen.size(), filtered_cropped), MountState::BASCULEGION_ON);
+                candidates.add_direct  (MountBasculegionMatcher  ::on().rmsd(screen.size(), cropped         ), MountState::BASCULEGION_ON);
+                candidates.add_filtered(MountSneaslerMatcher     ::on().rmsd(screen.size(), filtered_cropped), MountState::SNEASLER_ON);
+                candidates.add_direct  (MountSneaslerMatcher     ::on().rmsd(screen.size(), cropped         ), MountState::SNEASLER_ON);
+                candidates.add_filtered(MountBraviaryMatcher     ::on().rmsd(screen.size(), filtered_cropped), MountState::BRAVIARY_ON);
+                candidates.add_direct  (MountBraviaryMatcher     ::on().rmsd(screen.size(), cropped         ), MountState::BRAVIARY_ON);
 #endif
 //                extract_box(image, object).save("test-" + std::to_string(i) + ".png");
 //                i++;
@@ -602,8 +604,6 @@ bool MountTracker::process_frame(const ImageViewRGB32& frame, WallClock timestam
     MountState state = m_detector.detect(frame);
 //    cout << "state = " << (int)state << endl;
 
-//    SpinLockGuard lg(m_lock);
-
     //  Clear out old history.
     WallClock threshold = timestamp - std::chrono::seconds(1);
     while (!m_history.empty()){
diff --git a/SerialPrograms/Source/PokemonLA/Inference/PokemonLA_MountDetector.h b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_MountDetector.h
similarity index 83%
rename from SerialPrograms/Source/PokemonLA/Inference/PokemonLA_MountDetector.h
rename to SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_MountDetector.h
index 27c9c759f4..fb83fc9ffc 100644
--- a/SerialPrograms/Source/PokemonLA/Inference/PokemonLA_MountDetector.h
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_MountDetector.h
@@ -1,6 +1,6 @@
 /*  Mount Detector
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -9,11 +9,13 @@
 
 #include <deque>
 #include <map>
-#include "Common/Cpp/Concurrency/SpinLock.h"
+#include <atomic>
+#include "Common/Cpp/Logging/AbstractLogger.h"
+//#include "Common/Cpp/Concurrency/SpinLock.h"
 #include "Common/Cpp/Options/EnumDropdownOption.h"
-#include "CommonFramework/Logging/Logger.h"
+//#include "CommonFramework/Logging/Logger.h"
 #include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "CommonFramework/InferenceInfra/VisualInferenceCallback.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
@@ -52,7 +54,7 @@ class MountDetectorLoggingOption : public EnumDropdownOption<MountDetectorLoggin
                 {MountDetectorLogging::LOG_ONLY,                "log",      "Log to output window."},
                 {MountDetectorLogging::LOG_AND_DUMP_FAILURES,   "log+dump", "Log to output window and save to file."},
             },
-            LockWhileRunning::LOCKED,
+            LockMode::LOCK_WHILE_RUNNING,
             MountDetectorLogging::LOG_AND_DUMP_FAILURES
         )
     {}
@@ -96,7 +98,7 @@ class MountTracker : public VisualInferenceCallback{
     Logger& m_logger;
     std::atomic<MountState> m_state;
 
-    SpinLock m_lock;
+//    SpinLock m_lock;
     MountDetector m_detector;
 
     std::deque<Sample> m_history;
diff --git a/SerialPrograms/Source/PokemonLA/Inference/PokemonLA_NotificationReader.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_NotificationReader.cpp
similarity index 91%
rename from SerialPrograms/Source/PokemonLA/Inference/PokemonLA_NotificationReader.cpp
rename to SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_NotificationReader.cpp
index 9ef6a41dd2..94867de036 100644
--- a/SerialPrograms/Source/PokemonLA/Inference/PokemonLA_NotificationReader.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_NotificationReader.cpp
@@ -1,18 +1,18 @@
 /*  Notification Reader
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include "Kernels/Waterfill/Kernels_Waterfill_Session.h"
 #include "CommonFramework/ImageTypes/BinaryImage.h"
-#include "CommonFramework/ImageTools/BinaryImage_FilterRgb32.h"
 #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Images/BinaryImage_FilterRgb32.h"
 #include "PokemonLA_NotificationReader.h"
 
-#include <iostream>
-using std::cout;
-using std::endl;
+//#include <iostream>
+//using std::cout;
+//using std::endl;
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
diff --git a/SerialPrograms/Source/PokemonLA/Inference/PokemonLA_NotificationReader.h b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_NotificationReader.h
similarity index 84%
rename from SerialPrograms/Source/PokemonLA/Inference/PokemonLA_NotificationReader.h
rename to SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_NotificationReader.h
index fb22704e0a..60f1143c3a 100644
--- a/SerialPrograms/Source/PokemonLA/Inference/PokemonLA_NotificationReader.h
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_NotificationReader.h
@@ -1,6 +1,6 @@
 /*  Notification Reader
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *  
  *  Read overworld notification texts like when distortion appears.
  */
@@ -9,9 +9,9 @@
 #define PokemonAutomation_PokemonLA_NotificationReader_H
 
 #include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "CommonFramework/OCR/OCR_SmallDictionaryMatcher.h"
-#include "CommonFramework/Inference/VisualDetector.h"
-#include "CommonFramework/InferenceInfra/VisualInferenceCallback.h"
+#include "CommonTools/OCR/OCR_SmallDictionaryMatcher.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+#include "CommonTools/VisualDetector.h"
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
diff --git a/SerialPrograms/Source/PokemonLA/Inference/PokemonLA_OverworldDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_OverworldDetector.cpp
similarity index 88%
rename from SerialPrograms/Source/PokemonLA/Inference/PokemonLA_OverworldDetector.cpp
rename to SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_OverworldDetector.cpp
index 6a603535cb..20699cd9a1 100644
--- a/SerialPrograms/Source/PokemonLA/Inference/PokemonLA_OverworldDetector.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_OverworldDetector.cpp
@@ -1,17 +1,16 @@
 /*  Overworld Detector
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include "Kernels/Waterfill/Kernels_Waterfill_Session.h"
-#include "CommonFramework/ImageTools/SolidColorTest.h"
-#include "CommonFramework/ImageTools/BinaryImage_FilterRgb32.h"
+#include "CommonTools/Images/BinaryImage_FilterRgb32.h"
 #include "PokemonLA_OverworldDetector.h"
 
-#include <iostream>
-using std::cout;
-using std::endl;
+//#include <iostream>
+//using std::cout;
+//using std::endl;
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
diff --git a/SerialPrograms/Source/PokemonLA/Inference/PokemonLA_OverworldDetector.h b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_OverworldDetector.h
similarity index 88%
rename from SerialPrograms/Source/PokemonLA/Inference/PokemonLA_OverworldDetector.h
rename to SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_OverworldDetector.h
index 3d2fd05126..30cc8e98b1 100644
--- a/SerialPrograms/Source/PokemonLA/Inference/PokemonLA_OverworldDetector.h
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_OverworldDetector.h
@@ -1,14 +1,14 @@
 /*  Overworld Detector
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifndef PokemonAutomation_PokemonLA_OverworldDetector_H
 #define PokemonAutomation_PokemonLA_OverworldDetector_H
 
-#include "PokemonLA_MountDetector.h"
 #include "Objects/PokemonLA_ArcPhoneDetector.h"
+#include "PokemonLA_MountDetector.h"
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_StatusInfoScreenDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_StatusInfoScreenDetector.cpp
new file mode 100644
index 0000000000..cd40aee1b1
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_StatusInfoScreenDetector.cpp
@@ -0,0 +1,280 @@
+/*  Status Info Screen Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <iostream>
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/ImageTools/ImageStats.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Images/SolidColorTest.h"
+#include "Tests/ImageUnitTest.h"
+#include "Tests/TestUtils.h"
+#include "Pokemon/Inference/Pokemon_NameReader.h"
+#include "PokemonLA_CommonColorCheck.h"
+#include "PokemonLA_StatusInfoScreenDetector.h"
+
+using std::cout;
+using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+
+
+PokemonDetails read_status_info(
+    Logger& logger, VideoOverlay& overlay,
+    const ImageViewRGB32& frame,
+    Language language
+){
+    OverlayBoxScope shiny_box(overlay, {0.726, 0.133, 0.015, 0.023}, COLOR_BLUE);
+    OverlayBoxScope alpha_box(overlay, {0.750, 0.133, 0.015, 0.023}, COLOR_RED);
+    OverlayBoxScope gender_box(overlay, {0.777, 0.138, 0.001, 0.015}, COLOR_PURPLE);
+    OverlayBoxScope name_box(overlay, {0.525, 0.130, 0.100, 0.038}, COLOR_BLACK);
+
+    PokemonDetails ret;
+
+    {
+        const ImageStats shiny_box_stats = image_stats(extract_box_reference(frame, shiny_box));
+        // std::cout << "ImageStats " << shiny_box_stats.average << "  " << shiny_box_stats.stddev << std::endl;
+        const auto& stddev = shiny_box_stats.stddev;
+        const double max_stddev = std::max(std::max(stddev.r, stddev.g), stddev.b);
+        if(!is_solid(shiny_box_stats, {0.333333, 0.333333, 0.333333}, 0.2, 15) || max_stddev > 8.){
+            ret.is_shiny = true;
+            logger.log("Detected Shiny!", COLOR_BLUE);
+        }
+    }
+
+    const ImageStats alpha_stats = image_stats(extract_box_reference(frame, alpha_box));
+    if (alpha_stats.stddev.sum() > 80 &&
+        alpha_stats.average.r > alpha_stats.average.g + 30 &&
+        alpha_stats.average.r > alpha_stats.average.b + 30
+    ){
+        ret.is_alpha = true;
+        logger.log("Detected Alpha!", COLOR_BLUE);
+    }
+
+    const ImageStats gender_stats = image_stats(extract_box_reference(frame, gender_box));
+//    cout << gender_stats.average << gender_stats.stddev << endl;
+    if (is_solid(gender_stats, {0.333333, 0.333333, 0.333333}, 0.1, 10)){
+        ret.gender = Gender::Genderless;
+        logger.log("Gender: Genderless");
+    }else if (gender_stats.average.b > gender_stats.average.g + 30 && gender_stats.average.b > gender_stats.average.r + 30){
+        ret.gender = Gender::Male;
+        logger.log("Gender: Male");
+    }else if (gender_stats.average.r > gender_stats.average.g + 30 && gender_stats.average.r > gender_stats.average.b + 30){
+        ret.gender = Gender::Female;
+        logger.log("Gender: Female");
+    }else{
+        logger.log("Gender: Unable to detect", COLOR_RED);
+    }
+
+    if (language == Language::None){
+        return ret;
+    }
+
+    ImageViewRGB32 image = extract_box_reference(frame, name_box);
+
+    OCR::StringMatchResult result = Pokemon::PokemonNameReader::instance().read_substring(
+        logger, language, image,
+        OCR::BLACK_TEXT_FILTERS()
+    );
+
+    for (auto& item : result.results){
+        ret.name_candidates.insert(std::move(item.second.token));
+    }
+
+    return ret;
+}
+
+
+
+
+
+
+
+std::string read_pokemon_info_from_words(const std::vector<std::string>& keywords, Language& language, PokemonDetails& details){
+    // the last five keywords should be: <language> <pokemon name slug> <Shiny/NotShiny> <Alpha/NotAlpha> <Male/Female/Genderless>
+
+    if (keywords.size() < 5){
+        std::stringstream ss;
+        ss << "Error: not enough number of keywords in the filename to generate PokemonDetails. Found only " << keywords.size() << "." << endl;
+        return ss.str();
+    }
+
+    language = language_code_to_enum(keywords[keywords.size()-5]);
+    if (language == Language::None || language == Language::EndOfList){
+        std::stringstream ss;
+        ss << "Error: language keyword " << keywords[keywords.size()-5] << " is wrong." << endl;
+        return ss.str();
+    }
+
+    const std::string& pokemon_slug = keywords[keywords.size()-4];
+    details.name_candidates.insert(pokemon_slug);
+
+    const std::string& shiny_word = keywords[keywords.size()-3];
+    if (shiny_word == "Shiny"){
+        details.is_shiny = true;
+    }else if (shiny_word == "NotShiny"){
+        details.is_shiny = false;
+    }else{
+        std::stringstream ss;
+        ss << "Error: shiny keyword " << shiny_word << " is wrong. Must be \"Shiny\" or \"NotShiny\"." << endl;
+        return ss.str();
+    }
+
+    const std::string& alpha_word = keywords[keywords.size()-2];
+    if (alpha_word == "Alpha"){
+        details.is_alpha = true;
+    }else if (alpha_word == "NotAlpha"){
+        details.is_alpha = false;
+    }else{
+        std::stringstream ss;
+        ss << "Error: alpha keyword " << alpha_word << " is wrong. Must be \"Alpha\" or \"NotAlpha\"." << endl;
+        return ss.str();
+    }
+
+    const std::string& gender_word = keywords[keywords.size()-1];
+    if (gender_word == "Male"){
+        details.gender = Gender::Male;
+    }else if (gender_word == "Female"){
+        details.gender = Gender::Female;
+    }else if (gender_word == "Genderless"){
+        details.gender = Gender::Genderless;
+    }else{
+        std::stringstream ss;
+        ss << "Error: gender keyword " << gender_word << " is wrong. Must be \"Male\", \"Female\" or \"Genderless\"." << endl;
+        return ss.str();
+    }
+
+    return "";
+}
+
+
+
+
+std::string test_pokemon_details(const PokemonDetails& details, const PokemonDetails& target){
+    TEST_RESULT_COMPONENT_EQUAL_STR(details.is_shiny, target.is_shiny, "shiny");
+    TEST_RESULT_COMPONENT_EQUAL_STR(details.is_alpha, target.is_alpha, "alpha");
+    TEST_RESULT_COMPONENT_EQUAL_WITH_PRINT_FUNC_STR(details.gender, target.gender, "gender", get_gender_str);
+
+    const std::string& pokemon_slug = *target.name_candidates.begin();
+    bool found_name = false;
+    for (const auto& slg : details.name_candidates){
+        if (slg == pokemon_slug){
+            found_name = true;
+            break;
+        }
+    }
+    if (found_name == false){
+        std::stringstream ss;
+        ss << "Error: " << __func__ << " name result is ";
+        for (const auto& slg : details.name_candidates){
+            ss << slg << ", ";
+        }
+        ss << "but should be " << pokemon_slug << "." << endl;
+        return ss.str();
+    }
+
+    return "";
+}
+
+
+
+class Test_StatusInfoScreenDetector : public ImageUnitTest{
+public:
+    Test_StatusInfoScreenDetector(
+        const std::string& image,
+        std::vector<std::string> keywords
+    )
+        : ImageUnitTest("PokemonLA::StatusInfoScreenDetector - " + image, {image})
+        , m_keywords(std::move(keywords))
+    {
+        //  Plus the PaddleOCR (ONNX) recognition session and its working set.
+        m_memory += PADDLE_OCR_SINGLE_LINE_MEMORY_ESTIMATE;
+    }
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        // the last five keywords should be: <language> <pokemon name slug> <Shiny/NotShiny> <Alpha/NotAlpha> <Male/Female/Genderless>
+        Language language = Language::None;
+        PokemonDetails target;
+
+        std::string ret = read_pokemon_info_from_words(m_keywords, language, target);
+        if (!ret.empty()){
+            return ret;
+        }
+
+        DummyVideoOverlay overlay;
+        const ImageRGB32& image = images[0];
+        const PokemonDetails details = read_status_info(logger, overlay, image, language);
+
+        ret = test_pokemon_details(details, target);
+        if (ret.empty()){
+            return true;
+        }
+        return ret;
+    };
+
+private:
+    std::vector<std::string> m_keywords;
+};
+
+
+
+void add_tests_StatusInfoScreenDetector(UnitTestDatabase& database){
+    database.add<Test_StatusInfoScreenDetector>(
+        "PokemonLA/StatusInfoScreenDetector/macOS_bright/eng_arceus_NotShiny_NotAlpha_Genderless.png",
+        parse_words("eng_arceus_NotShiny_NotAlpha_Genderless")
+    );
+    database.add<Test_StatusInfoScreenDetector>(
+        "PokemonLA/StatusInfoScreenDetector/macOS_bright/eng_graveler_Shiny_Alpha_Male.png",
+        parse_words("eng_graveler_Shiny_Alpha_Male")
+    );
+    database.add<Test_StatusInfoScreenDetector>(
+        "PokemonLA/StatusInfoScreenDetector/macOS_bright/eng_snorunt_NotShiny_NotAlpha_Female.png",
+        parse_words("eng_snorunt_NotShiny_NotAlpha_Female")
+    );
+
+    database.add<Test_StatusInfoScreenDetector>(
+        "PokemonLA/StatusInfoScreenDetector/WinElgato/eng_burmy_NotShiny_NotAlpha_Female.png",
+        parse_words("eng_burmy_NotShiny_NotAlpha_Female")
+    );
+    database.add<Test_StatusInfoScreenDetector>(
+        "PokemonLA/StatusInfoScreenDetector/WinElgato/eng_burmy_NotShiny_NotAlpha_Male.png",
+        parse_words("eng_burmy_NotShiny_NotAlpha_Male")
+    );
+    database.add<Test_StatusInfoScreenDetector>(
+        "PokemonLA/StatusInfoScreenDetector/WinElgato/eng_geodude_NotShiny_NotAlpha_Male.jpg",
+        parse_words("eng_geodude_NotShiny_NotAlpha_Male")
+    );
+
+    database.add<Test_StatusInfoScreenDetector>(
+        "PokemonLA/StatusInfoScreenDetector/WinMyPin/eng_gardevoir_Shiny_Alpha_Female.png",
+        parse_words("eng_gardevoir_Shiny_Alpha_Female")
+    );
+    database.add<Test_StatusInfoScreenDetector>(
+        "PokemonLA/StatusInfoScreenDetector/WinMyPin/eng_geodude_NotShiny_NotAlpha_Male.png",
+        parse_words("eng_geodude_NotShiny_NotAlpha_Male")
+    );
+
+    database.add<Test_StatusInfoScreenDetector>(
+        "PokemonLA/StatusInfoScreenDetector/WinShadowCast/eng_gardevoir_Shiny_Alpha_Female.png",
+        parse_words("eng_gardevoir_Shiny_Alpha_Female")
+    );
+    database.add<Test_StatusInfoScreenDetector>(
+        "PokemonLA/StatusInfoScreenDetector/WinShadowCast/eng_geodude_NotShiny_NotAlpha_Male.png",
+        parse_words("eng_geodude_NotShiny_NotAlpha_Male")
+    );
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_StatusInfoScreenDetector.h b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_StatusInfoScreenDetector.h
new file mode 100644
index 0000000000..414743e29d
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_StatusInfoScreenDetector.h
@@ -0,0 +1,40 @@
+/*  Status Info Screen Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  Detect shiny and alpha on the Status Info Screen in a battle.
+ */
+
+#ifndef PokemonAutomation_PokemonLA_StatusInfoScreenDetector_H
+#define PokemonAutomation_PokemonLA_StatusInfoScreenDetector_H
+
+#include "Common/Cpp/TestRunners/UnitTest.h"
+#include "CommonFramework/Language.h"
+#include "CommonFramework/Logging/Logger.h"
+#include "CommonFramework/VideoPipeline/VideoOverlay.h"
+#include "VideoGames/PokemonLA/Resources/PokemonLA_PokemonInfo.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+
+PokemonDetails read_status_info(
+    Logger& logger, VideoOverlay& overlay,
+    const ImageViewRGB32& frame,
+    Language language
+);
+
+
+
+std::string read_pokemon_info_from_words(const std::vector<std::string>& keywords, Language& language, PokemonDetails& details);
+std::string test_pokemon_details(const PokemonDetails& details, const PokemonDetails& target);
+
+void add_tests_StatusInfoScreenDetector(UnitTestDatabase& database);
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/PokemonLA/Inference/PokemonLA_UnderAttackDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_UnderAttackDetector.cpp
similarity index 87%
rename from SerialPrograms/Source/PokemonLA/Inference/PokemonLA_UnderAttackDetector.cpp
rename to SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_UnderAttackDetector.cpp
index e7ebe354ee..adbcb471ef 100644
--- a/SerialPrograms/Source/PokemonLA/Inference/PokemonLA_UnderAttackDetector.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_UnderAttackDetector.cpp
@@ -1,6 +1,6 @@
 /*  Under Attack Detector
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -9,9 +9,9 @@
 #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
 #include "PokemonLA_UnderAttackDetector.h"
 
-#include <iostream>
-using std::cout;
-using std::endl;
+//#include <iostream>
+//using std::cout;
+//using std::endl;
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
@@ -29,7 +29,7 @@ UnderAttackWatcher::UnderAttackWatcher(Logger& logger)
     : VisualInferenceCallback("UnderAttackWatcher")
     , m_logger(logger)
     , m_box(0.49, 0.07, 0.02, 0.03)
-    , m_state(UnderAttackState::UNKONWN)
+    , m_state(UnderAttackState::UNKNOWN)
 {}
 
 void UnderAttackWatcher::make_overlays(VideoOverlaySet& items) const{
@@ -38,8 +38,6 @@ void UnderAttackWatcher::make_overlays(VideoOverlaySet& items) const{
 bool UnderAttackWatcher::process_frame(const ImageViewRGB32& frame, WallClock timestamp){
     UnderAttackState state = detect(frame);
 
-//    SpinLockGuard lg(m_lock);
-
     //  Clear out old history.
     WallClock threshold = timestamp - std::chrono::seconds(1);
     while (!m_history.empty()){
@@ -56,7 +54,7 @@ bool UnderAttackWatcher::process_frame(const ImageViewRGB32& frame, WallClock ti
     count++;
 
     //  Return most reported state in the last window.
-    UnderAttackState best_state = UnderAttackState::UNKONWN;
+    UnderAttackState best_state = UnderAttackState::UNKNOWN;
     size_t best_count = 0;
     for (const auto& item : m_counts){
         if (best_count < item.second){
diff --git a/SerialPrograms/Source/PokemonLA/Inference/PokemonLA_UnderAttackDetector.h b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_UnderAttackDetector.h
similarity index 78%
rename from SerialPrograms/Source/PokemonLA/Inference/PokemonLA_UnderAttackDetector.h
rename to SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_UnderAttackDetector.h
index 664bfd51fd..70be835e78 100644
--- a/SerialPrograms/Source/PokemonLA/Inference/PokemonLA_UnderAttackDetector.h
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_UnderAttackDetector.h
@@ -1,19 +1,18 @@
 /*  Under Attack Detector
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-
 #ifndef PokemonAutomation_PokemonLA_UnderAttackDetector_H
 #define PokemonAutomation_PokemonLA_UnderAttackDetector_H
 
 #include <deque>
 #include <map>
-#include "Common/Cpp/Concurrency/SpinLock.h"
-#include "CommonFramework/Logging/Logger.h"
+#include <atomic>
+#include "Common/Cpp/Logging/AbstractLogger.h"
 #include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "CommonFramework/InferenceInfra/VisualInferenceCallback.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
@@ -21,7 +20,7 @@ namespace PokemonLA{
 
 
 enum class UnderAttackState{
-    UNKONWN,
+    UNKNOWN,
     SAFE,
     UNDER_ATTACK,
 };
@@ -55,7 +54,7 @@ class UnderAttackWatcher : public VisualInferenceCallback{
 
     std::atomic<UnderAttackState> m_state;
 
-    SpinLock m_lock;
+//    SpinLock m_lock;
     std::deque<Sample> m_history;
     std::map<UnderAttackState, size_t> m_counts;
 };
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_WildPokemonFocusDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_WildPokemonFocusDetector.cpp
new file mode 100644
index 0000000000..20d430722e
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_WildPokemonFocusDetector.cpp
@@ -0,0 +1,271 @@
+/*  Wild Pokemon Focus Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "CommonFramework/ImageTools/ImageStats.h"
+#include "CommonFramework/VideoPipeline/VideoOverlay.h"
+#include "CommonFramework/Tools/DebugDumper.h"
+#include "CommonTools/Images/ImageFilter.h"
+#include "CommonTools/Images/ImageGradient.h"
+#include "CommonTools/OCR/OCR_Routines.h"
+#include "Tests/ImageUnitTest.h"
+#include "Tests/TestUtils.h"
+#include "Pokemon/Inference/Pokemon_NameReader.h"
+#include "VideoGames/PokemonLA/Inference/PokemonLA_StatusInfoScreenDetector.h"
+#include "VideoGames/PokemonLA/Inference/Objects/PokemonLA_ButtonDetector.h"
+#include "VideoGames/PokemonLA/Inference/Objects/PokemonLA_ShinySymbolDetector.h"
+#include "PokemonLA_WildPokemonFocusDetector.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+
+WildPokemonFocusDetector::WildPokemonFocusDetector(Logger& logger, VideoOverlay& overlay)
+    : VisualInferenceCallback("WildPokemonFocusDetector")
+    , m_pokemon_tab_upper_bound(0.109, 0.857, 0.24, 0.012)
+    , m_pokemon_tab_lower_bound(0.109, 0.949, 0.24, 0.012)
+    , m_pokemon_tab_left_bound(0.102, 0.875, 0.007, 0.073)
+    , m_pokemon_tab_right_bound(0.348, 0.873, 0.007, 0.073)
+{}
+
+void WildPokemonFocusDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(COLOR_BLUE, m_pokemon_tab_upper_bound);
+    items.add(COLOR_BLUE, m_pokemon_tab_lower_bound);
+    items.add(COLOR_BLUE, m_pokemon_tab_left_bound);
+    items.add(COLOR_BLUE, m_pokemon_tab_right_bound);
+}
+
+//  Return true if the inference session should stop.
+bool WildPokemonFocusDetector::process_frame(const ImageViewRGB32& frame, WallClock timestamp){
+
+    // dump_debug_image(m_logger, "PokemonLA/WildPokemonFocusDetector", "Received", frame);
+
+    // float threshold = 10.0;
+    const Color threshold(10, 10, 10);
+    const ImageViewRGB32& upper_border = extract_box_reference(frame, m_pokemon_tab_upper_bound);
+
+    const size_t upper_border_length = count_horizontal_translucent_border_pixels(
+        upper_border, threshold, false);
+    
+    if (upper_border_length / (float)upper_border.width() <= 0.9){
+        return false;
+    }
+
+    const ImageViewRGB32& lower_border = extract_box_reference(frame, m_pokemon_tab_lower_bound);
+    
+    const size_t lower_border_length = count_horizontal_translucent_border_pixels(
+        lower_border, threshold, true);
+    
+    if (lower_border_length / (float)lower_border.width() <= 0.9){
+        return false;
+    }
+
+    const ImageViewRGB32& left_border = extract_box_reference(frame, m_pokemon_tab_left_bound);
+    const size_t left_border_length = count_vertical_translucent_border_pixels(
+        left_border, threshold, false);
+    if (left_border_length / (float)left_border.height() <= 0.9){
+        return false;
+    }
+
+    const ImageViewRGB32& right_border = extract_box_reference(frame, m_pokemon_tab_right_bound);
+    const size_t right_border_length = count_vertical_translucent_border_pixels(
+        right_border, threshold, true);
+    if (right_border_length / (float)right_border.height() <= 0.9){
+        return false;
+    }
+
+    // dump_debug_image(m_logger, "PokemonLA/WildPokemonFocusDetector", "Detected", frame);
+    return true;
+}
+
+
+PokemonDetails read_focused_wild_pokemon_info(
+    Logger& logger, VideoOverlay& overlay,
+    const ImageViewRGB32& frame,
+    Language language
+){
+    PokemonDetails ret;
+
+    const OverlayBoxScope name_box(overlay, {0.108, 0.868, 0.135, 0.037}, COLOR_BLACK);
+    const OverlayBoxScope gender_box(overlay, {0.307, 0.873, 0.016, 0.030}, COLOR_PURPLE);
+    const OverlayBoxScope alpha_box(overlay, {0.307, 0.920, 0.016, 0.029}, COLOR_RED);
+
+    const ImageViewRGB32 name_image = extract_box_reference(frame, name_box);
+
+    const OCR::StringMatchResult name_result = Pokemon::PokemonNameReader::instance().read_substring(
+        logger, language, name_image,
+        OCR::WHITE_TEXT_FILTERS());
+    for (const auto& item : name_result.results){
+        ret.name_candidates.insert(std::move(item.second.token));
+    }
+
+    // Replacing white color of the gender symbol with zero-alpha color so that they won't be counted in
+    // the following image_stats().
+    // The white color is defined as the color between (160, 160, 160) and (255, 255, 255).
+    bool replace_color_range = true;
+    const ImageStats gender_stats = image_stats(filter_rgb32_range(
+        extract_box_reference(frame, gender_box),
+        combine_rgb(160, 160, 160), combine_rgb(255, 255, 255), Color(0), replace_color_range
+    ));
+    const FloatPixel gender_avg = gender_stats.average;
+    if (gender_stats.count > 0 && gender_avg.r > gender_avg.b + 50.0 && gender_avg.r > 150.0){
+        ret.gender = Gender::Female;
+        logger.log("Gender Female, color " + gender_avg.to_string());
+    }else if (gender_stats.count > 0 && gender_avg.b > gender_avg.r + 50.0 && gender_avg.b > 150.0){
+        ret.gender = Gender::Male;
+        logger.log("Gender Male, color " + gender_avg.to_string());
+    }else{
+        ret.gender = Gender::Genderless;
+        logger.log("Gender Genderless, color " + gender_avg.to_string());
+    }
+
+    // Replace non-red color with zero-alpha color so that they won't be counted in
+    // the following image_stats().
+    // The red color is defined as ranging from (200, 0, 0) to (255, 100, 100).
+    replace_color_range = false;
+    const ImageStats alpha_stats = image_stats(filter_rgb32_range(
+        extract_box_reference(frame, alpha_box),
+        combine_rgb(200, 0, 0), combine_rgb(255, 100, 100), Color(0), replace_color_range
+    ));
+    const FloatPixel alpha_avg = alpha_stats.average;
+    logger.log("Alpha color " + alpha_avg.to_string());
+    if (alpha_stats.count > 0 && alpha_avg.r > alpha_avg.g + 100.0 && alpha_avg.r > alpha_avg.b + 100.0 && alpha_avg.r > 200.0){
+        ret.is_alpha = true;
+        logger.log("Is alpha, color " + alpha_avg.to_string());
+    }
+    
+    const std::vector<ImagePixelBox> shiny_locations = find_shiny_symbols(frame);
+    if (shiny_locations.size() > 0){
+        ret.is_shiny = true;
+        logger.log("Found shiny symbol.");
+    }
+
+    return ret;
+}
+
+
+bool detect_change_focus(Logger& logger, VideoOverlay& overlay, const ImageViewRGB32& frame){
+    const bool stop_on_detect = true;
+    ButtonDetector button(logger, overlay, ButtonType::ButtonA, {0.244, 0.815, 0.026, 0.047},
+        std::chrono::milliseconds(0), stop_on_detect);
+    
+    return button.process_frame(frame, current_time());
+}
+
+
+
+
+
+
+
+
+class Test_WildPokemonFocusDetector : public ImageUnitTest{
+public:
+    Test_WildPokemonFocusDetector(
+        const std::string& image,
+        std::vector<std::string> keywords
+    )
+        : ImageUnitTest("PokemonLA::WildPokemonFocusDetector - " + image, {image})
+        , m_keywords(std::move(keywords))
+    {
+        //  Plus the PaddleOCR (ONNX) recognition session and its working set.
+        m_memory += PADDLE_OCR_SINGLE_LINE_MEMORY_ESTIMATE;
+    }
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        std::stringstream ss;
+
+        // two keywords: <True/False> <True/False>
+        if (m_keywords.size() < 2){
+            ss << "Error: not enough number of keywords in the filename. Found only " << m_keywords.size() << "." << std::endl;
+            return ss.str();
+        }
+
+        DummyVideoOverlay overlay;
+
+        WildPokemonFocusDetector detector(logger, overlay);
+        const ImageRGB32& image = images[0];
+        bool result_has_focus = detector.process_frame(image, current_time());
+
+        auto check_can_change_focus = [&](const std::string& word) -> std::string {
+            bool result_can_change = detect_change_focus(logger, overlay, image);
+            bool target_can_change = false;
+            if (parse_bool(word, target_can_change) == false){
+                ss << "Error: True/False keyword " << word << " is wrong. Must be \"True\" or \"False\"." << std::endl;
+                return ss.str();
+            }
+            TEST_RESULT_EQUAL_STR(result_can_change, target_can_change);
+            return "";
+        };
+
+        bool target_has_focus = false;
+        if (parse_bool(m_keywords[m_keywords.size()-2], target_has_focus) == true){
+            TEST_RESULT_EQUAL_STR(result_has_focus, target_has_focus);
+
+            return check_can_change_focus(m_keywords[m_keywords.size()-1]);
+        }
+
+        // Or seven keywords:
+        // the last seven keywords should be: <True/False> <True/False> <language> <pokemon name slug> <Shiny/NotShiny> <Alpha/NotAlpha> <Male/Female/Genderless>
+        if (m_keywords.size() < 7){
+            ss << "Error: not enough number of keywords in the filename. Found only " << m_keywords.size() << "." << std::endl;
+            return ss.str();
+        }
+
+        if (parse_bool(m_keywords[m_keywords.size()-7], target_has_focus) == false){
+            ss << "Error: True/False keyword " << m_keywords[m_keywords.size()-7] << " is wrong. Must be \"True\" or \"False\"." << std::endl;
+            return ss.str();
+        }
+
+        TEST_RESULT_EQUAL_STR(result_has_focus, target_has_focus);
+
+        if (result_has_focus){
+            std::string ret = check_can_change_focus(m_keywords[m_keywords.size()-6]);
+            if (!ret.empty()){
+                return ret;
+            }
+
+            Language language = Language::None;
+            PokemonDetails target_info;
+            ret = read_pokemon_info_from_words(m_keywords, language, target_info);
+            if (!ret.empty()){
+                return ret;
+            }
+
+            const auto info = read_focused_wild_pokemon_info(logger, overlay, image, language);
+
+            return test_pokemon_details(info, target_info);
+        }
+
+        return true;
+    };
+
+private:
+    std::vector<std::string> m_keywords;
+};
+
+
+
+
+
+void add_tests_WildPokemonFocusDetector(UnitTestDatabase& database){
+
+}
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/PokemonLA/Inference/PokemonLA_WildPokemonFocusDetector.h b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_WildPokemonFocusDetector.h
similarity index 82%
rename from SerialPrograms/Source/PokemonLA/Inference/PokemonLA_WildPokemonFocusDetector.h
rename to SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_WildPokemonFocusDetector.h
index 1dccd83af3..8fc6a32de7 100644
--- a/SerialPrograms/Source/PokemonLA/Inference/PokemonLA_WildPokemonFocusDetector.h
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/PokemonLA_WildPokemonFocusDetector.h
@@ -1,6 +1,6 @@
 /*  Wild Pokemon Focus Detector
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  *  Detect the lower left dark translucent tab when player focuses on one pokemon
  */
@@ -8,13 +8,12 @@
 #ifndef PokemonAutomation_PokemonLA_WildPokemonFocusDetector_H
 #define PokemonAutomation_PokemonLA_WildPokemonFocusDetector_H
 
+#include "Common/Cpp/TestRunners/UnitTest.h"
 #include "CommonFramework/Language.h"
 #include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "CommonFramework/InferenceInfra/VisualInferenceCallback.h"
-#include "CommonFramework/Logging/Logger.h"
 #include "CommonFramework/VideoPipeline/VideoOverlay.h"
-#include "PokemonLA/Resources/PokemonLA_PokemonInfo.h"
-#include <utility>
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+#include "VideoGames/PokemonLA/Resources/PokemonLA_PokemonInfo.h"
 
 namespace PokemonAutomation{
 
@@ -55,6 +54,13 @@ PokemonDetails read_focused_wild_pokemon_info(
 bool detect_change_focus(Logger& logger, VideoOverlay& overlay, const ImageViewRGB32& frame);
 
 
+
+
+
+void add_tests_WildPokemonFocusDetector(UnitTestDatabase& database);
+
+
+
 }
 }
 }
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Sounds/PokemonLA_AlphaMusicDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Sounds/PokemonLA_AlphaMusicDetector.cpp
new file mode 100644
index 0000000000..ec9322fd7e
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Sounds/PokemonLA_AlphaMusicDetector.cpp
@@ -0,0 +1,49 @@
+/*  Alpha Music Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonTools/Audio/SpectrogramMatcher.h"
+#include "CommonTools/Audio/AudioTemplateCache.h"
+#include "VideoGames/PokemonLA/PokemonLA_Settings.h"
+#include "PokemonLA_AlphaMusicDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+
+
+AlphaMusicDetector::AlphaMusicDetector(VideoStream& stream, DetectedCallback detected_callback)
+    // Use a red as the detection color because the alpha symbol is red.
+    : AudioPerSpectrumDetectorBase(
+        stream.logger(),
+        "AlphaMusicDetector",
+        "Alpha music",
+        COLOR_RED,
+        detected_callback
+    )
+{}
+
+float AlphaMusicDetector::get_score_threshold() const{
+    return (float)GameSettings::instance().ALPHA_MUSIC_THRESHOLD;
+}
+
+std::unique_ptr<SpectrogramMatcher> AlphaMusicDetector::build_spectrogram_matcher(size_t sample_rate){
+    const double low_frequency_filter = 50.0; // we don't match frequencies under 50.0 Hz
+    const size_t templateSubdivision = 12;
+    return std::make_unique<SpectrogramMatcher>(
+        "Alpha Music",
+        AudioTemplateCache::instance().get_throw("PokemonLA/AlphaMusic", sample_rate),
+        SpectrogramMatcher::Mode::RAW, sample_rate,
+        low_frequency_filter, templateSubdivision
+    );
+}
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Sounds/PokemonLA_AlphaMusicDetector.h b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Sounds/PokemonLA_AlphaMusicDetector.h
new file mode 100644
index 0000000000..0d698abe1e
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Sounds/PokemonLA_AlphaMusicDetector.h
@@ -0,0 +1,37 @@
+/*  Alpha Music Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLA_AlphaMusicDetector_H
+#define PokemonAutomation_PokemonLA_AlphaMusicDetector_H
+
+#include "CommonFramework/Tools/VideoStream.h"
+#include "CommonTools/Audio/AudioPerSpectrumDetectorBase.h"
+
+
+namespace PokemonAutomation{
+    class SpectrogramMatcher;
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+
+class AlphaMusicDetector : public AudioPerSpectrumDetectorBase{
+public:
+    AlphaMusicDetector(VideoStream& stream, DetectedCallback detected_callback);
+
+    // Implement AudioPerSpectrumDetectorBase::get_score_threshold()
+    virtual float get_score_threshold() const override;
+
+protected:
+    // Implement AudioPerSpectrumDetectorBase::build_spectrogram_matcher()
+    virtual std::unique_ptr<SpectrogramMatcher> build_spectrogram_matcher(size_t sample_rate) override;
+};
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Sounds/PokemonLA_AlphaRoarDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Sounds/PokemonLA_AlphaRoarDetector.cpp
new file mode 100644
index 0000000000..01f8b2e098
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Sounds/PokemonLA_AlphaRoarDetector.cpp
@@ -0,0 +1,49 @@
+/*  Alpha Roar Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonTools/Audio/SpectrogramMatcher.h"
+#include "CommonTools/Audio/AudioTemplateCache.h"
+#include "VideoGames/PokemonLA/PokemonLA_Settings.h"
+#include "PokemonLA_AlphaRoarDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+
+
+AlphaRoarDetector::AlphaRoarDetector(VideoStream& stream, DetectedCallback detected_callback)
+    // Use a purple as the detection color because the alpha symbol is red. To differentiate with the
+    // detection color of alpha music, the roar (which is loud -> heavy -> darker color) uses purple.
+    : AudioPerSpectrumDetectorBase(
+        stream.logger(),
+        "AlphaRoarDetector",
+        "Alpha roar",
+        COLOR_PURPLE,
+        detected_callback
+    )
+{}
+
+float AlphaRoarDetector::get_score_threshold() const{
+    return (float)GameSettings::instance().ALPHA_ROAR_THRESHOLD;
+}
+
+std::unique_ptr<SpectrogramMatcher> AlphaRoarDetector::build_spectrogram_matcher(size_t sample_rate){
+    const double low_frequency_filter = 100.0; // we don't match frequencies under 100.0 Hz
+    return std::make_unique<SpectrogramMatcher>(
+        "Alpha Roar",
+        AudioTemplateCache::instance().get_throw("PokemonLA/AlphaRoar", sample_rate),
+        SpectrogramMatcher::Mode::RAW, sample_rate,
+        low_frequency_filter
+    );
+}
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Sounds/PokemonLA_AlphaRoarDetector.h b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Sounds/PokemonLA_AlphaRoarDetector.h
new file mode 100644
index 0000000000..5ed6835763
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Sounds/PokemonLA_AlphaRoarDetector.h
@@ -0,0 +1,35 @@
+/*  Alpha Roar Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLA_AlphaRoarDetector_H
+#define PokemonAutomation_PokemonLA_AlphaRoarDetector_H
+
+#include "CommonFramework/Tools/VideoStream.h"
+#include "CommonTools/Audio/AudioPerSpectrumDetectorBase.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+
+class AlphaRoarDetector : public AudioPerSpectrumDetectorBase{
+public:
+    AlphaRoarDetector(VideoStream& stream, DetectedCallback detected_callback);
+
+    // Implement AudioPerSpectrumDetectorBase::get_score_threshold()
+    virtual float get_score_threshold() const override;
+
+protected:
+    // Implement AudioPerSpectrumDetectorBase::build_spectrogram_matcher()
+    virtual std::unique_ptr<SpectrogramMatcher> build_spectrogram_matcher(size_t sample_rate) override;
+};
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Sounds/PokemonLA_ItemDropSoundDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Sounds/PokemonLA_ItemDropSoundDetector.cpp
new file mode 100644
index 0000000000..88b070dddc
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Sounds/PokemonLA_ItemDropSoundDetector.cpp
@@ -0,0 +1,46 @@
+/*  Item Drop Sound Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonTools/Audio/SpectrogramMatcher.h"
+#include "CommonTools/Audio/AudioTemplateCache.h"
+#include "VideoGames/PokemonLA/PokemonLA_Settings.h"
+#include "PokemonLA_ItemDropSoundDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+
+ItemDropSoundDetector::ItemDropSoundDetector(VideoStream& stream, DetectedCallback detected_callback)
+    // Use a green as the detection color because the shiny symbol in LA is green.
+    : AudioPerSpectrumDetectorBase(
+        stream.logger(),
+        "ItemDropSoundDetector",
+        "Item drop sound",
+        COLOR_DARKGREEN,
+        detected_callback
+    )
+{}
+
+
+float ItemDropSoundDetector::get_score_threshold() const{
+    return (float)GameSettings::instance().ITEM_DROP_SOUND_THRESHOLD;
+}
+
+std::unique_ptr<SpectrogramMatcher> ItemDropSoundDetector::build_spectrogram_matcher(size_t sample_rate){
+    return std::make_unique<SpectrogramMatcher>(
+        "Item Drop",
+        AudioTemplateCache::instance().get_throw("PokemonLA/ItemDropSound", sample_rate),
+        SpectrogramMatcher::Mode::SPIKE_CONV, sample_rate,
+        GameSettings::instance().ITEM_DROP_SOUND_LOW_FREQUENCY
+    );
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Sounds/PokemonLA_ItemDropSoundDetector.h b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Sounds/PokemonLA_ItemDropSoundDetector.h
new file mode 100644
index 0000000000..9bba39e928
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Sounds/PokemonLA_ItemDropSoundDetector.h
@@ -0,0 +1,37 @@
+/*  Item Drop Sound Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLA_ItemDropSoundDetector_H
+#define PokemonAutomation_PokemonLA_ItemDropSoundDetector_H
+
+#include "CommonFramework/Tools/VideoStream.h"
+#include "CommonTools/Audio/AudioPerSpectrumDetectorBase.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+
+class ItemDropSoundDetector : public AudioPerSpectrumDetectorBase{
+public:
+    //  Warning: The callback will be called from the audio inference thread.
+    ItemDropSoundDetector(VideoStream& stream, DetectedCallback detected_callback);
+
+    // Implement AudioPerSpectrumDetectorBase::get_score_threshold()
+    virtual float get_score_threshold() const override;
+
+protected:
+    // Implement AudioPerSpectrumDetectorBase::build_spectrogram_matcher()
+    virtual std::unique_ptr<SpectrogramMatcher> build_spectrogram_matcher(size_t sample_rate) override;
+};
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Sounds/PokemonLA_ShinySoundDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Sounds/PokemonLA_ShinySoundDetector.cpp
new file mode 100644
index 0000000000..b58b5f526e
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Sounds/PokemonLA_ShinySoundDetector.cpp
@@ -0,0 +1,83 @@
+/*  Shiny Sound Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonTools/Audio/SpectrogramMatcher.h"
+#include "CommonTools/Audio/AudioTemplateCache.h"
+#include "Tests/TestUtils.h"
+#include "GameConsole/Framework/ConsoleSystemSession.h"
+#include "NintendoSwitch/NintendoSwitch_ConsoleHandle.h"
+#include "VideoGames/PokemonLA/PokemonLA_Settings.h"
+#include "PokemonLA_ShinySoundDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+
+ShinySoundDetector::ShinySoundDetector(Logger& logger, DetectedCallback detected_callback)
+    // Use a yellow as the detection color because the shiny animation is yellow.
+    : AudioPerSpectrumDetectorBase(
+        logger,
+        "ShinySoundDetector",
+        "Shiny sound",
+        COLOR_YELLOW,
+        detected_callback
+    )
+{}
+
+
+float ShinySoundDetector::get_score_threshold() const{
+    return (float)GameSettings::instance().SHINY_SOUND_THRESHOLD;
+}
+
+std::unique_ptr<SpectrogramMatcher> ShinySoundDetector::build_spectrogram_matcher(size_t sample_rate){
+    return std::make_unique<SpectrogramMatcher>(
+        "Shiny Sound",
+        AudioTemplateCache::instance().get_throw("PokemonLA/ShinySound", sample_rate),
+        SpectrogramMatcher::Mode::SPIKE_CONV, sample_rate,
+        GameSettings::instance().SHINY_SOUND_LOW_FREQUENCY
+    );
+}
+
+
+
+
+class Test_ShinySoundDetector : public UnitTest{
+public:
+    Test_ShinySoundDetector(std::vector<AudioSpectrum> spectrums, bool expected)
+        : UnitTest("PokemonLA::ShinySoundDetector")
+        , m_spectrums(std::move(spectrums))
+        , m_expected(expected)
+    {}
+
+    virtual UnitTestResult run(Logger& logger, CancellableScope& scope) const override{
+        GameConsole::ConsoleSystemOption option(1);
+        GameConsole::ConsoleSystemSession session(option, false, 0, {});
+        ConsoleHandle console(session);
+        ShinySoundDetector detector(console, [&](float error_coefficient) -> bool{
+            return true;
+        });
+
+        bool result = detector.process_spectrums(m_spectrums, console.audio());
+        TEST_RESULT_EQUAL_STR(result, m_expected);
+        return true;
+    };
+
+private:
+    std::vector<AudioSpectrum> m_spectrums;
+    bool m_expected;
+};
+
+
+void add_tests_ShinySoundDetector(UnitTestDatabase& database){
+
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Sounds/PokemonLA_ShinySoundDetector.h b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Sounds/PokemonLA_ShinySoundDetector.h
new file mode 100644
index 0000000000..31a3a4c7dd
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Inference/Sounds/PokemonLA_ShinySoundDetector.h
@@ -0,0 +1,40 @@
+/*  Shiny Sound Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLA_ShinySoundDetector_H
+#define PokemonAutomation_PokemonLA_ShinySoundDetector_H
+
+#include "Common/Cpp/TestRunners/UnitTest.h"
+#include "CommonTools/Audio/AudioPerSpectrumDetectorBase.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+
+class ShinySoundDetector : public AudioPerSpectrumDetectorBase{
+public:
+    //  Warning: The callback will be called from the audio inference thread.
+    ShinySoundDetector(Logger& logger, DetectedCallback detected_callback);
+
+    // Implement AudioPerSpectrumDetectorBase::get_score_threshold()
+    virtual float get_score_threshold() const override;
+
+protected:
+    // Implement AudioPerSpectrumDetectorBase::build_spectrogram_matcher()
+    virtual std::unique_ptr<SpectrogramMatcher> build_spectrogram_matcher(size_t sample_rate) override;
+};
+
+
+
+
+void add_tests_ShinySoundDetector(UnitTestDatabase& database);
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/PokemonLA/Options/PokemonLA_BattlePokemonActionTable.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Options/PokemonLA_BattlePokemonActionTable.cpp
similarity index 78%
rename from SerialPrograms/Source/PokemonLA/Options/PokemonLA_BattlePokemonActionTable.cpp
rename to SerialPrograms/Source/VideoGames/PokemonLA/Options/PokemonLA_BattlePokemonActionTable.cpp
index 5735a0ad4f..e78508b133 100644
--- a/SerialPrograms/Source/PokemonLA/Options/PokemonLA_BattlePokemonActionTable.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Options/PokemonLA_BattlePokemonActionTable.cpp
@@ -1,14 +1,14 @@
 /*  Battle Pokemon Action Table
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-
-#include "Common/Compiler.h"
-#include "Common/Cpp/Json/JsonValue.h"
-#include "Common/Cpp/Json/JsonObject.h"
-#include "CommonFramework/Globals.h"
+#include <limits>
+//#include "Common/Compiler.h"
+//#include "Common/Cpp/Json/JsonValue.h"
+//#include "Common/Cpp/Json/JsonObject.h"
+//#include "CommonFramework/Globals.h"
 #include "Pokemon/Pokemon_Strings.h"
 #include "PokemonLA_BattlePokemonActionTable.h"
 
@@ -23,8 +23,8 @@ namespace PokemonLA{
 
 
 
-const EnumDatabase<MoveStyle>& MoveStyle_Database(){
-    static const EnumDatabase<MoveStyle> database({
+const EnumDropdownDatabase<MoveStyle>& MoveStyle_Database(){
+    static const EnumDropdownDatabase<MoveStyle> database({
         {MoveStyle::NoStyle,    "none",     "No Style"},
         {MoveStyle::Agile,      "agile",    "Agile"},
         {MoveStyle::Strong,     "strong",   "Strong"},
@@ -35,11 +35,12 @@ const EnumDatabase<MoveStyle>& MoveStyle_Database(){
 
 
 
-BattlePokemonActionRow::BattlePokemonActionRow()
-    : switch_pokemon(LockWhileRunning::LOCKED, false)
-    , num_turns_to_switch(LockWhileRunning::LOCKED, 1)
-    , stop_after_num_moves(LockWhileRunning::LOCKED, false)
-    , num_moves_to_stop(LockWhileRunning::LOCKED, 25, 0)
+BattlePokemonActionRow::BattlePokemonActionRow(EditableTableOption& parent_table)
+    : EditableTableRow(parent_table)
+    , switch_pokemon(LockMode::LOCK_WHILE_RUNNING, false)
+    , num_turns_to_switch(LockMode::LOCK_WHILE_RUNNING, 1)
+    , stop_after_num_moves(LockMode::LOCK_WHILE_RUNNING, false)
+    , num_moves_to_stop(LockMode::LOCK_WHILE_RUNNING, 25, 0)
 {
     PA_ADD_OPTION(style[0]);
     PA_ADD_OPTION(style[1]);
@@ -51,7 +52,7 @@ BattlePokemonActionRow::BattlePokemonActionRow()
     PA_ADD_OPTION(num_moves_to_stop);
 }
 std::unique_ptr<EditableTableRow> BattlePokemonActionRow::clone() const{
-    std::unique_ptr<BattlePokemonActionRow> ret(new BattlePokemonActionRow());
+    std::unique_ptr<BattlePokemonActionRow> ret(new BattlePokemonActionRow(parent()));
     ret->style[0].set(style[0]);
     ret->style[1].set(style[1]);
     ret->style[2].set(style[2]);
@@ -66,7 +67,7 @@ std::unique_ptr<EditableTableRow> BattlePokemonActionRow::clone() const{
 
 std::vector<std::unique_ptr<EditableTableRow>> BattlePokemonActionTable::make_defaults(){
     std::vector<std::unique_ptr<EditableTableRow>> ret;
-    ret.emplace_back(std::make_unique<BattlePokemonActionRow>());
+    ret.emplace_back(std::make_unique<BattlePokemonActionRow>(*this));
     return ret;
 }
 BattlePokemonActionTable::BattlePokemonActionTable()
@@ -79,7 +80,7 @@ BattlePokemonActionTable::BattlePokemonActionTable()
         "Note: if your second last " + STRING_POKEMON + " faints, the game will send your last " + STRING_POKEMON + " automatically for you.<br>"
         "The program cannot detect this switch as there is no switch selection screen. "
         "Therefore the program will treat it as the same " + STRING_POKEMON + ".",
-        LockWhileRunning::LOCKED,
+        LockMode::LOCK_WHILE_RUNNING,
         make_defaults()
     )
 {}
@@ -133,18 +134,20 @@ bool BattlePokemonActionTable::stop_battle(size_t pokemon, size_t num_move_attem
 
 
 
-OneMoveBattlePokemonActionRow::OneMoveBattlePokemonActionRow(){
+OneMoveBattlePokemonActionRow::OneMoveBattlePokemonActionRow(EditableTableOption& parent_table)
+    : EditableTableRow(parent_table)
+{
     PA_ADD_OPTION(style);
 }
 std::unique_ptr<EditableTableRow> OneMoveBattlePokemonActionRow::clone() const{
-    std::unique_ptr<OneMoveBattlePokemonActionRow> ret(new OneMoveBattlePokemonActionRow());
+    std::unique_ptr<OneMoveBattlePokemonActionRow> ret(new OneMoveBattlePokemonActionRow(parent()));
     ret->style.set(style);
     return ret;
 }
 
-std::vector<std::unique_ptr<EditableTableRow>> OneMoveBattlePokemonActionTable::make_defaults() const{
+std::vector<std::unique_ptr<EditableTableRow>> OneMoveBattlePokemonActionTable::make_defaults(){
     std::vector<std::unique_ptr<EditableTableRow>> ret;
-    ret.emplace_back(std::make_unique<OneMoveBattlePokemonActionRow>());
+    ret.emplace_back(std::make_unique<OneMoveBattlePokemonActionRow>(*this));
     return ret;
 }
 OneMoveBattlePokemonActionTable::OneMoveBattlePokemonActionTable()
@@ -153,7 +156,7 @@ OneMoveBattlePokemonActionTable::OneMoveBattlePokemonActionTable()
         "Set what move style to use for each " + STRING_POKEMON + " to grind against a Magikarp. "
         "Each row is the action for one " + STRING_POKEMON + ". "
         "The table follows the order that " + STRING_POKEMON + " are sent to battle.",
-        LockWhileRunning::LOCKED,
+        LockMode::LOCK_WHILE_RUNNING,
         make_defaults()
     )
 {}
@@ -177,8 +180,8 @@ MoveStyle OneMoveBattlePokemonActionTable::get_style(size_t pokemon){
 
 
 
-const IntegerEnumDatabase& PokemonIndex_Database(){
-    static const IntegerEnumDatabase database({
+const IntegerEnumDropdownDatabase& PokemonIndex_Database(){
+    static const IntegerEnumDropdownDatabase database({
         {0, "1st", "1st " + STRING_POKEMON},
         {1, "2nd", "2nd " + STRING_POKEMON},
         {2, "3rd", "3rd " + STRING_POKEMON},
@@ -186,8 +189,8 @@ const IntegerEnumDatabase& PokemonIndex_Database(){
     });
     return database;
 }
-const IntegerEnumDatabase& MoveIndex_Database(){
-    static const IntegerEnumDatabase database({
+const IntegerEnumDropdownDatabase& MoveIndex_Database(){
+    static const IntegerEnumDropdownDatabase database({
         {0, "1st", "1st Move"},
         {1, "2nd", "2nd Move"},
         {2, "3rd", "3rd Move"},
@@ -198,10 +201,11 @@ const IntegerEnumDatabase& MoveIndex_Database(){
 
 
 
-MoveGrinderActionRow::MoveGrinderActionRow()
-    : pokemon_index(PokemonIndex_Database(), LockWhileRunning::LOCKED, 0)
-    , move_index(MoveIndex_Database(), LockWhileRunning::LOCKED, 0)
-    , attempts(LockWhileRunning::LOCKED, 1, 1)
+MoveGrinderActionRow::MoveGrinderActionRow(EditableTableOption& parent_table)
+    : EditableTableRow(parent_table)
+    , pokemon_index(PokemonIndex_Database(), LockMode::LOCK_WHILE_RUNNING, 0)
+    , move_index(MoveIndex_Database(), LockMode::LOCK_WHILE_RUNNING, 0)
+    , attempts(LockMode::LOCK_WHILE_RUNNING, 1, 1)
 {
     PA_ADD_OPTION(pokemon_index);
     PA_ADD_OPTION(move_index);
@@ -209,7 +213,7 @@ MoveGrinderActionRow::MoveGrinderActionRow()
     PA_ADD_OPTION(attempts);
 }
 std::unique_ptr<EditableTableRow> MoveGrinderActionRow::clone() const{
-    std::unique_ptr<MoveGrinderActionRow> ret(new MoveGrinderActionRow());
+    std::unique_ptr<MoveGrinderActionRow> ret(new MoveGrinderActionRow(parent()));
     ret->pokemon_index.set_value(pokemon_index.current_value());
     ret->move_index.set_value(move_index.current_value());
     ret->style.set(style);
@@ -219,8 +223,8 @@ std::unique_ptr<EditableTableRow> MoveGrinderActionRow::clone() const{
 
 MoveGrinderActionTable::MoveGrinderActionTable()
     : EditableTableOption_t<MoveGrinderActionRow>(
-        "For every move you want to perform, input the style and the number of attemps you want to achieve.",
-        LockWhileRunning::LOCKED
+        "For every move you want to perform, input the style and the number of attempts you want to achieve.",
+        LockMode::LOCK_WHILE_RUNNING
     )
 {}
 Move MoveGrinderActionTable::get_move(size_t pokemon, size_t move) const{
diff --git a/SerialPrograms/Source/PokemonLA/Options/PokemonLA_BattlePokemonActionTable.h b/SerialPrograms/Source/VideoGames/PokemonLA/Options/PokemonLA_BattlePokemonActionTable.h
similarity index 88%
rename from SerialPrograms/Source/PokemonLA/Options/PokemonLA_BattlePokemonActionTable.h
rename to SerialPrograms/Source/VideoGames/PokemonLA/Options/PokemonLA_BattlePokemonActionTable.h
index 042739005f..1f76a82de1 100644
--- a/SerialPrograms/Source/PokemonLA/Options/PokemonLA_BattlePokemonActionTable.h
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Options/PokemonLA_BattlePokemonActionTable.h
@@ -1,6 +1,6 @@
 /*  Battle Pokemon Action Table
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  *  Tables to set moves and switching during battle.
  *
@@ -24,7 +24,7 @@ enum class MoveStyle{
     Agile,
     Strong,
 };
-const EnumDatabase<MoveStyle>& MoveStyle_Database();
+const EnumDropdownDatabase<MoveStyle>& MoveStyle_Database();
 
 
 
@@ -33,7 +33,7 @@ class MoveStyleCell : public EnumDropdownCell<MoveStyle>{
     MoveStyleCell()
         : EnumDropdownCell<MoveStyle>(
             MoveStyle_Database(),
-            LockWhileRunning::LOCKED,
+            LockMode::LOCK_WHILE_RUNNING,
             MoveStyle::NoStyle
         )
     {}
@@ -50,7 +50,7 @@ class MoveStyleCell : public EnumDropdownCell<MoveStyle>{
 
 class BattlePokemonActionRow : public EditableTableRow{
 public:
-    BattlePokemonActionRow();
+    BattlePokemonActionRow(EditableTableOption& parent_table);
     virtual std::unique_ptr<EditableTableRow> clone() const override;
 
 public:
@@ -82,7 +82,7 @@ class BattlePokemonActionTable : public EditableTableOption_t<BattlePokemonActio
 
 private:
     virtual std::vector<std::string> make_header() const;
-    static std::vector<std::unique_ptr<EditableTableRow>> make_defaults();
+    std::vector<std::unique_ptr<EditableTableRow>> make_defaults();
 };
 
 
@@ -100,7 +100,7 @@ class BattlePokemonActionTable : public EditableTableOption_t<BattlePokemonActio
 // Used by MagikarpMoveGrinder, for each pokemon, set what style the first move to use
 class OneMoveBattlePokemonActionRow : public EditableTableRow{
 public:
-    OneMoveBattlePokemonActionRow();
+    OneMoveBattlePokemonActionRow(EditableTableOption& parent_table);
     virtual std::unique_ptr<EditableTableRow> clone() const override;
 
 public:
@@ -119,7 +119,7 @@ class OneMoveBattlePokemonActionTable : public EditableTableOption_t<OneMoveBatt
 
 private:
     virtual std::vector<std::string> make_header() const;
-    std::vector<std::unique_ptr<EditableTableRow>> make_defaults() const;
+    std::vector<std::unique_ptr<EditableTableRow>> make_defaults();
 };
 
 
@@ -129,7 +129,7 @@ class OneMoveBattlePokemonActionTable : public EditableTableOption_t<OneMoveBatt
 
 class MoveGrinderActionRow : public EditableTableRow{
 public:
-    MoveGrinderActionRow();
+    MoveGrinderActionRow(EditableTableOption& parent_table);
     virtual std::unique_ptr<EditableTableRow> clone() const override;
 
 public:
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Options/PokemonLA_CustomPathTable.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Options/PokemonLA_CustomPathTable.cpp
new file mode 100644
index 0000000000..c85560dfbd
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Options/PokemonLA_CustomPathTable.cpp
@@ -0,0 +1,362 @@
+/*  Battle Pokemon Action Table
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Json/JsonValue.h"
+#include "Common/Cpp/Json/JsonObject.h"
+#include "PokemonLA_CustomPathTable.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+using namespace std::chrono_literals;
+
+
+
+
+const EnumDropdownDatabase<PathAction>& PathAction_Database(){
+    static const EnumDropdownDatabase<PathAction> database({
+        {PathAction::NO_ACTION,             "no-action",            "NO Action"},
+        {PathAction::CHANGE_MOUNT,          "change-mount",         "Change Mount"},
+        {PathAction::MOVE_FORWARD,          "move-forward",         "Move Forward"},
+        {PathAction::MOVE_IN_DIRECTION,     "move-in-direction",    "Move in Direction"},
+        {PathAction::CENTER_CAMERA,         "center-camera",        "Center Camera"},
+        {PathAction::JUMP,                  "jump",                 "Jump"},
+        {PathAction::WAIT,                  "wait",                 "Wait"},
+        {PathAction::START_LISTEN,          "start-listen",         "Start Listen"},
+        {PathAction::END_LISTEN,            "end-listen",           "End Listen"}
+    });
+    return database;
+}
+const EnumDropdownDatabase<PathMount>& PathMount_Database(){
+    static const EnumDropdownDatabase<PathMount> database({
+        {PathMount::NO_MOUNT,       "none",         "No Mount"},
+        {PathMount::WYRDEER,        "wrydeer",      "Wrydeer"},
+        {PathMount::URSALUNA,       "ursaluna",     "Ursaluna"},
+        {PathMount::BASCULEGION,    "basculegion",  "Basculegion"},
+        {PathMount::SNEASLER,       "sneasler",     "Sneasler"},
+        {PathMount::BRAVIARY,       "braviary",     "Braviary"},
+    });
+    return database;
+}
+const EnumDropdownDatabase<PathSpeed>& PathSpeed_Database(){
+    static const EnumDropdownDatabase<PathSpeed> database({
+        {PathSpeed::NORMAL_SPEED,   "normal",   "Normal Speed"},
+        {PathSpeed::SLOW_SPEED,     "slow",     "Slow Speed"},
+        {PathSpeed::RUN,            "run",      "Run on Foot"},
+        {PathSpeed::DASH,           "dash",     "Dash on Ride"},
+        {PathSpeed::DASH_B_SPAM,    "mash-b",   "Dash on Braviary B Spam"},
+        {PathSpeed::DIVE,           "dive",     "Dive on Braviary"},
+    });
+    return database;
+}
+
+
+
+
+
+CustomPathCell::~CustomPathCell(){
+    m_action.remove_listener(*this);
+}
+void CustomPathCell::operator=(const CustomPathCell& x){
+    text.set_text(x.text.text());
+    mount.set(x.mount);
+    move_forward.set(x.move_forward.current_text());
+    move_speed.set(x.move_speed);
+    left_x.set(x.left_x);
+    left_y.set(x.left_y);
+    jump_wait.set(x.jump_wait.current_text());
+    wait.set(x.wait.current_text());
+}
+CustomPathCell::CustomPathCell(EnumDropdownCell<PathAction>& action)
+    : BatchOption(LockMode::LOCK_WHILE_RUNNING, true)
+    , m_action(action)
+    , text("", false)
+    , mount(PathMount_Database(), LockMode::LOCK_WHILE_RUNNING, PathMount::NO_MOUNT)
+    , move_forward(
+        "Duration (ms):", false,
+        LockMode::LOCK_WHILE_RUNNING,
+        0ms, Milliseconds::max(),
+        "2000 ms"
+    )
+    , move_speed(PathSpeed_Database(), LockMode::LOCK_WHILE_RUNNING,PathSpeed::NORMAL_SPEED)
+    , left_x("x: [left: -1.0, right: 1.0]", LockMode::LOCK_WHILE_RUNNING, 0, -1.0, 1.0)
+    , left_y("y: [backward: -1.0, forward: 1.0]", LockMode::LOCK_WHILE_RUNNING, 0, -1.0, 1.0)
+    , jump_wait(
+        "Wait after jump (ms):", false,
+        LockMode::LOCK_WHILE_RUNNING,
+        0ms, Milliseconds::max(),
+        "2000 ms"
+    )
+    , wait(
+        "Wait Time (ms):", false,
+        LockMode::LOCK_WHILE_RUNNING,
+        0ms, Milliseconds::max(),
+        "2000 ms"
+    )
+{
+    PA_ADD_STATIC(text);
+    PA_ADD_OPTION(mount);
+    PA_ADD_OPTION(move_forward);
+    PA_ADD_OPTION(move_speed);
+    PA_ADD_OPTION(left_x);
+    PA_ADD_OPTION(left_y);
+    PA_ADD_OPTION(jump_wait);
+    PA_ADD_OPTION(wait);
+
+    CustomPathCell::on_config_value_changed(this);
+    action.add_listener(*this);
+}
+void CustomPathCell::on_config_value_changed(void* object){
+    text.set_visibility(ConfigOptionState::HIDDEN);
+    mount.set_visibility(ConfigOptionState::HIDDEN);
+    move_forward.set_visibility(ConfigOptionState::HIDDEN);
+    move_speed.set_visibility(ConfigOptionState::HIDDEN);
+    left_x.set_visibility(ConfigOptionState::HIDDEN);
+    left_y.set_visibility(ConfigOptionState::HIDDEN);
+    jump_wait.set_visibility(ConfigOptionState::HIDDEN);
+    wait.set_visibility(ConfigOptionState::HIDDEN);
+    switch (m_action){
+    case PathAction::NO_ACTION:
+        break;
+    case PathAction::CHANGE_MOUNT:
+        mount.set_visibility(ConfigOptionState::ENABLED);
+        break;
+    case PathAction::MOVE_FORWARD:
+        move_forward.set_visibility(ConfigOptionState::ENABLED);
+        move_speed.set_visibility(ConfigOptionState::ENABLED);
+        break;
+    case PathAction::MOVE_IN_DIRECTION:
+        move_forward.set_visibility(ConfigOptionState::ENABLED);
+        left_x.set_visibility(ConfigOptionState::ENABLED);
+        left_y.set_visibility(ConfigOptionState::ENABLED);
+        break;
+    case PathAction::CENTER_CAMERA:
+        text.set_text("Center the camera so that you can move straight forward.");
+        text.set_visibility(ConfigOptionState::ENABLED);
+        break;
+    case PathAction::JUMP:
+        jump_wait.set_visibility(ConfigOptionState::ENABLED);
+        break;
+    case PathAction::WAIT:
+        wait.set_visibility(ConfigOptionState::ENABLED);
+        break;
+    case PathAction::START_LISTEN:
+        text.set_text("If shiny detected, use \"Destination Shiny Action\".");
+        text.set_visibility(ConfigOptionState::ENABLED);
+        break;
+    case PathAction::END_LISTEN:
+        text.set_text("If shiny detected, use \"Enroute Shiny Action\".");
+        text.set_visibility(ConfigOptionState::ENABLED);
+        break;
+    default:
+        break;
+    }
+}
+
+
+
+
+CustomPathTableRow::CustomPathTableRow(EditableTableOption& parent_table)
+    : EditableTableRow(parent_table)
+    , action(PathAction_Database(), LockMode::LOCK_WHILE_RUNNING, PathAction::NO_ACTION)
+    , parameters(action)
+{
+    PA_ADD_OPTION(action);
+    PA_ADD_OPTION(parameters);
+}
+std::unique_ptr<EditableTableRow> CustomPathTableRow::clone() const{
+    std::unique_ptr<CustomPathTableRow> ret(new CustomPathTableRow(parent()));
+    ret->action.set(action);
+    ret->parameters = parameters;
+    return ret;
+}
+JsonValue CustomPathTableRow::to_json() const{
+    JsonObject obj;
+    obj["Action"] = action.to_json();
+    switch (action){
+    case PathAction::CHANGE_MOUNT:
+        obj["Mount"] = parameters.mount.to_json();
+        break;
+    case PathAction::MOVE_FORWARD:
+        obj["MoveForwardMs"] = parameters.move_forward.to_json();
+        obj["Speed"] = parameters.move_speed.to_json();
+        break;
+    case PathAction::MOVE_IN_DIRECTION:
+        obj["MoveForwardMs"] = parameters.move_forward.to_json();
+//        obj["Speed"] = parameters.move_speed.to_json();
+        obj["MoveDirectionX"] = parameters.left_x.to_json();
+        obj["MoveDirectionY"] = parameters.left_y.to_json();
+        break;
+    case PathAction::JUMP:
+        obj["JumpWaitMs"] = parameters.jump_wait.to_json();
+        break;
+    case PathAction::WAIT:
+        obj["WaitMs"] = parameters.wait.to_json();
+        break;
+    default:
+        break;
+    }
+    return obj;
+}
+void CustomPathTableRow::load_json(const JsonValue& json){
+    const JsonObject* obj = json.to_object();
+    if (obj == nullptr){
+        return;
+    }
+
+    const JsonValue* value = obj->get_value("Action");
+    if (value == nullptr){
+        return;
+    }
+    action.load_json(*value);
+
+    switch(action){
+    case PathAction::CHANGE_MOUNT:
+        value = obj->get_value("Mount");
+        if (value != nullptr){
+            parameters.mount.load_json(*value);
+        }
+        break;
+    case PathAction::MOVE_FORWARD:
+        value = obj->get_value("MoveForwardTicks");
+        if (value != nullptr && value->is_integer()){
+            parameters.move_forward.set(std::to_string(value->to_integer_default() * 8));
+        }
+        value = obj->get_value("MoveForwardMs");
+        if (value != nullptr){
+            parameters.move_forward.load_json(*value);
+        }
+        value = obj->get_value("Speed");
+        if (value != nullptr){
+            parameters.move_speed.load_json(*value);
+        }
+        break;
+    case PathAction::MOVE_IN_DIRECTION:
+        value = obj->get_value("MoveForwardTicks");
+        if (value != nullptr && value->is_integer()){
+            parameters.move_forward.set(std::to_string(value->to_integer_default() * 8));
+        }
+        value = obj->get_value("MoveForwardMs");
+        if (value != nullptr){
+            parameters.move_forward.load_json(*value);
+        }
+//        value = obj->get_value("Speed");
+//        if (value != nullptr){
+//            parameters.move_speed.load_json(*value);
+//        }
+        value = obj->get_value("MoveDirectionX");
+        if (value != nullptr){
+            parameters.left_x.load_json(*value);
+        }
+        value = obj->get_value("MoveDirectionY");
+        if (value != nullptr){
+            parameters.left_y.load_json(*value);
+        }
+        break;
+    case PathAction::JUMP:
+        value = obj->get_value("JumpWaitTicks");
+        if (value != nullptr && value->is_integer()){
+            parameters.jump_wait.set(std::to_string(value->to_integer_default() * 8));
+        }
+        value = obj->get_value("JumpWaitMs");
+        if (value != nullptr){
+            parameters.jump_wait.load_json(*value);
+        }
+        break;
+    case PathAction::WAIT:
+        value = obj->get_value("WaitTicks");
+        if (value != nullptr && value->is_integer()){
+            parameters.wait.set(std::to_string(value->to_integer_default() * 8));
+        }
+        value = obj->get_value("WaitMs");
+        if (value != nullptr){
+            parameters.wait.load_json(*value);
+        }
+        break;
+    default:
+        break;
+    }
+}
+
+CustomPathTable::CustomPathTable()
+    : EditableTableOption_t<CustomPathTableRow>(
+        "<b>Custom Path Table:</b><br>"
+        "Set a sequence of actions to navigate the map. By default, the shiny detected behavior is \"Enroute Shiny Action\".<br>"
+        "<font color=\"red\">If you wish to ignore enroute shinies, make sure you set \"Enroute Shiny Action\" to ignore shinies.</font>",
+        LockMode::LOCK_WHILE_RUNNING,
+        false,  //  Disable the save/load buttons since we have our own.
+        20,
+        make_defaults()
+    )
+{}
+std::vector<std::string> CustomPathTable::make_header() const{
+    return std::vector<std::string>{
+        "Action",
+        "Parameters",
+    };
+}
+std::vector<std::unique_ptr<EditableTableRow>> CustomPathTable::make_defaults(){
+    std::vector<std::unique_ptr<EditableTableRow>> ret;
+    auto row = std::make_unique<CustomPathTableRow>(*this);
+    row->action.set(PathAction::START_LISTEN);
+    ret.emplace_back(std::move(row));
+
+    row = std::make_unique<CustomPathTableRow>(*this);
+    row->action.set(PathAction::CHANGE_MOUNT);
+    row->parameters.mount.set(PathMount::WYRDEER);
+    ret.emplace_back(std::move(row));
+
+    row = std::make_unique<CustomPathTableRow>(*this);
+    row->action.set(PathAction::MOVE_IN_DIRECTION);
+    row->parameters.move_forward.set("3200 ms");
+    row->parameters.left_x.set(-1.0);
+    row->parameters.left_y.set(1.0);
+    ret.emplace_back(std::move(row));
+
+    row = std::make_unique<CustomPathTableRow>(*this);
+    row->action.set(PathAction::CENTER_CAMERA);
+    ret.emplace_back(std::move(row));
+
+    row = std::make_unique<CustomPathTableRow>(*this);
+    row->action.set(PathAction::MOVE_FORWARD);
+    row->parameters.move_speed.set(PathSpeed::DASH);
+    row->parameters.move_forward.set("3200 ms");
+    ret.emplace_back(std::move(row));
+
+    return ret;
+}
+
+
+
+
+
+
+CustomPathTableFromJubilife::CustomPathTableFromJubilife()
+    : UiState<CustomPathTableFromJubilife, BatchOption>(LockMode::LOCK_WHILE_RUNNING)
+//    : PATH(
+//        "<b>Custom Path Table:</b><br>"
+//        "Set a sequence of actions to navigate the map. By default, the shiny detected behavior is \"Enroute Shiny Action\".<br>"
+//        "<font color=\"red\">If you wish to ignore enroute shinies, make sure you set \"Enroute Shiny Action\" to ignore shinies.</font>",
+//        m_factory, make_defaults()
+//    )
+{
+    PA_ADD_OPTION(TRAVEL_LOCATION);
+    PA_ADD_OPTION(PATH);
+}
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Options/PokemonLA_CustomPathTable.h b/SerialPrograms/Source/VideoGames/PokemonLA/Options/PokemonLA_CustomPathTable.h
new file mode 100644
index 0000000000..1c3aea0d4c
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Options/PokemonLA_CustomPathTable.h
@@ -0,0 +1,131 @@
+/*  Custom Path Table
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLA_CustomPathTableTable_H
+#define PokemonAutomation_PokemonLA_CustomPathTableTable_H
+
+#include "Common/Cpp/Options/ConfigOption.h"
+#include "Common/Cpp/Options/BatchOption.h"
+#include "Common/Cpp/Options/StaticTextOption.h"
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "Common/Cpp/Options/FloatingPointOption.h"
+#include "Common/Cpp/Options/TimeDurationOption.h"
+#include "Common/Cpp/Options/EnumDropdownOption.h"
+#include "Common/Cpp/Options/EditableTableOption.h"
+#include "PokemonLA_TravelLocation.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+
+
+enum class PathAction{
+    NO_ACTION,
+    CHANGE_MOUNT,
+    MOVE_FORWARD,
+    MOVE_IN_DIRECTION,
+    CENTER_CAMERA,
+    JUMP,
+    WAIT,
+    START_LISTEN,
+    END_LISTEN,
+};
+const EnumDropdownDatabase<PathAction>& PathAction_Database();
+
+enum class PathMount{
+    NO_MOUNT,
+    WYRDEER,
+    URSALUNA,
+    BASCULEGION,
+    SNEASLER,
+    BRAVIARY,
+};
+const EnumDropdownDatabase<PathMount>& PathMount_Database();
+
+enum class PathSpeed{
+    NORMAL_SPEED,
+    SLOW_SPEED,
+    RUN,
+    DASH,
+    DASH_B_SPAM,
+    DIVE,
+};
+const EnumDropdownDatabase<PathSpeed>& PathSpeed_Database();
+
+
+
+
+class CustomPathCell : public BatchOption, private ConfigOption::Listener{
+public:
+    ~CustomPathCell();
+    void operator=(const CustomPathCell& x);
+    CustomPathCell(EnumDropdownCell<PathAction>& action);
+
+    virtual void on_config_value_changed(void* object) override;
+
+private:
+    EnumDropdownCell<PathAction>& m_action;
+
+public:
+    StaticTextOption text;
+    EnumDropdownCell<PathMount> mount;
+    MillisecondsOption move_forward;
+    EnumDropdownCell<PathSpeed> move_speed;
+    FloatingPointOption left_x;
+    FloatingPointOption left_y;
+    MillisecondsOption jump_wait;
+    MillisecondsOption wait;
+};
+
+class CustomPathTableRow : public EditableTableRow{
+public:
+    CustomPathTableRow(EditableTableOption& parent_table);
+    virtual std::unique_ptr<EditableTableRow> clone() const override;
+
+    virtual JsonValue to_json() const override;
+    virtual void load_json(const JsonValue& json) override;
+
+public:
+    EnumDropdownCell<PathAction> action;
+    CustomPathCell parameters;
+};
+
+class CustomPathTable : public EditableTableOption_t<CustomPathTableRow>{
+public:
+    CustomPathTable();
+    virtual std::vector<std::string> make_header() const override;
+
+private:
+    std::vector<std::unique_ptr<EditableTableRow>> make_defaults();
+};
+
+
+
+
+
+// A program option to build a custom path to navigate the map
+class CustomPathTableFromJubilife : public UiState<CustomPathTableFromJubilife, BatchOption>{
+public:
+    CustomPathTableFromJubilife();
+
+    const WildTravelLocationOption& travel_location() const{ return TRAVEL_LOCATION; }
+
+public:
+    friend class CustomPathTableWidget;
+
+    WildTravelLocationOption TRAVEL_LOCATION;
+    CustomPathTable PATH;
+};
+
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/PokemonLA/Options/PokemonLA_IngoOpponent.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Options/PokemonLA_IngoOpponent.cpp
similarity index 92%
rename from SerialPrograms/Source/PokemonLA/Options/PokemonLA_IngoOpponent.cpp
rename to SerialPrograms/Source/VideoGames/PokemonLA/Options/PokemonLA_IngoOpponent.cpp
index 2c5e8ae493..d946fbe618 100644
--- a/SerialPrograms/Source/PokemonLA/Options/PokemonLA_IngoOpponent.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Options/PokemonLA_IngoOpponent.cpp
@@ -1,6 +1,6 @@
 /*  Ingo Opponent Option
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -72,7 +72,7 @@ IngoOpponentOption::IngoOpponentOption()
             {IngoOpponents::Ress,           "ress",         "Ress"},
             {IngoOpponents::Ingo_Alphas,    "ingo-alphas",  "Ingo - but using alphas"},
         },
-        LockWhileRunning::LOCKED,
+        LockMode::LOCK_WHILE_RUNNING,
         IngoOpponents::Wenton
     )
 {}
diff --git a/SerialPrograms/Source/PokemonLA/Options/PokemonLA_IngoOpponent.h b/SerialPrograms/Source/VideoGames/PokemonLA/Options/PokemonLA_IngoOpponent.h
similarity index 88%
rename from SerialPrograms/Source/PokemonLA/Options/PokemonLA_IngoOpponent.h
rename to SerialPrograms/Source/VideoGames/PokemonLA/Options/PokemonLA_IngoOpponent.h
index 3efea6663c..4af4341e37 100644
--- a/SerialPrograms/Source/PokemonLA/Options/PokemonLA_IngoOpponent.h
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Options/PokemonLA_IngoOpponent.h
@@ -1,6 +1,6 @@
 /*  Ingo Opponent Option
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/PokemonLA/Options/PokemonLA_MiscOptions.h b/SerialPrograms/Source/VideoGames/PokemonLA/Options/PokemonLA_MiscOptions.h
similarity index 87%
rename from SerialPrograms/Source/PokemonLA/Options/PokemonLA_MiscOptions.h
rename to SerialPrograms/Source/VideoGames/PokemonLA/Options/PokemonLA_MiscOptions.h
index 44a7c3a80b..1f2925d850 100644
--- a/SerialPrograms/Source/PokemonLA/Options/PokemonLA_MiscOptions.h
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Options/PokemonLA_MiscOptions.h
@@ -1,6 +1,6 @@
 /*  Misc. Options
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -8,7 +8,7 @@
 #define PokemonAutomation_PokemonLA_MiscOptions_H
 
 #include "Common/Cpp/Options/EnumDropdownOption.h"
-#include "PokemonLA/PokemonLA_WeatherAndTime.h"
+#include "VideoGames/PokemonLA/PokemonLA_WeatherAndTime.h"
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
@@ -29,7 +29,7 @@ class ResetMethodOption : public EnumDropdownOption<ResetMethod>{
                 {ResetMethod::SoftReset,        "reset",                "Soft Reset"},
                 {ResetMethod::GoBackToVillage,  "return-to-village",    "Go back to village"},
             },
-            LockWhileRunning::LOCKED,
+            LockMode::UNLOCK_WHILE_RUNNING,
             ResetMethod::SoftReset
         )
     {}
@@ -57,7 +57,7 @@ class StopOnOption : public EnumDropdownOption<StopOn>{
                 {StopOn::ShinyOrAlpha,  "shiny-or-alpha",   "Shiny or Alpha"},
                 {StopOn::ShinyAndAlpha, "shiny-and-alpha",  "Shiny and Alpha"},
             },
-            LockWhileRunning::LOCKED,
+            LockMode::UNLOCK_WHILE_RUNNING,
             StopOn::ShinyOrAlpha
         )
     {}
@@ -79,7 +79,7 @@ class ExitBattleMethodOption : public EnumDropdownOption<ExitBattleMethod>{
                 {ExitBattleMethod::RunAway, "run", "Run Away"},
                 {ExitBattleMethod::MashAToKill, "mash-a-to-kill", "Mash A to Kill"},
             },
-            LockWhileRunning::LOCKED,
+            LockMode::UNLOCK_WHILE_RUNNING,
             ExitBattleMethod::RunAway
         )
     {}
@@ -98,7 +98,7 @@ class TimeOfDayOption : public EnumDropdownOption<TimeOfDay>{
                 {TimeOfDay::EVENING,  TIME_OF_DAY_NAMES[int(TimeOfDay::EVENING)], "Evening"},
                 {TimeOfDay::MIDNIGHT, TIME_OF_DAY_NAMES[int(TimeOfDay::MIDNIGHT)], "Midnight"},
             },
-            LockWhileRunning::LOCKED,
+            LockMode::UNLOCK_WHILE_RUNNING,
             TimeOfDay::NONE
         )
     {}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Options/PokemonLA_ShinyDetectedAction.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Options/PokemonLA_ShinyDetectedAction.cpp
new file mode 100644
index 0000000000..b079b55c96
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Options/PokemonLA_ShinyDetectedAction.cpp
@@ -0,0 +1,221 @@
+/*  Shiny Detected Action
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <sstream>
+#include "Common/Cpp/ColoredText.h"
+#include "CommonFramework/Exceptions/ProgramFinishedException.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/Tools/ProgramEnvironment.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "Pokemon/Pokemon_Notification.h"
+#include "VideoGames/PokemonLA/PokemonLA_Settings.h"
+#include "PokemonLA_ShinyDetectedAction.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+
+
+ShinyRequiresAudioText::ShinyRequiresAudioText()
+    : StaticTextOption(
+        html_color_text(
+            "<font size=4><b>Shiny detection uses sound. Make sure you have the correct audio input set.</b></font>",
+            COLOR_BLUE
+        )
+    )
+{}
+
+
+
+
+OverworldShinyDetectedActionOption::OverworldShinyDetectedActionOption(
+    std::string label, std::string description,
+    std::string default_delay,
+    OverworldShinyDetectedAction default_action
+)
+    : GroupOption(std::move(label), LockMode::UNLOCK_WHILE_RUNNING)
+    , DESCRIPTION(std::move(description))
+    , ACTION(
+        "<b>Shiny Detected Action:</b>",
+        {
+            {OverworldShinyDetectedAction::IGNORE,                  "ignore",       "Ignore the shiny. Do not stop the program."},
+            {OverworldShinyDetectedAction::STOP_PROGRAM,            "stop",         "Stop program. Align camera for a screenshot. Then go Home."},
+            {OverworldShinyDetectedAction::TAKE_VIDEO_STOP_PROGRAM, "video+stop",   "Stop program. Align camera for a screenshot + video. Then go Home."},
+        },
+        LockMode::UNLOCK_WHILE_RUNNING,
+        default_action
+    )
+//    , STOP_PROGRAM("<b>Stop Program:</b><br>Stop program and go Home if it hears a shiny.", true)
+//    , TAKE_VIDEO("<b>Take Video:</b><br>Take a video if a shiny is heard.", true)
+    , SCREENSHOT_DELAY0(
+        "<b>Screenshot Delay:</b><br>"
+        "Align the camera, then wait this long before taking a screenshot + video of the shiny.<br>"
+        "Set to zero to skip this. Don't set this too large or the shiny may run away!",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        std::move(default_delay)
+    )
+    , NOTIFICATIONS(
+        this->label(),
+        true, true,
+        ImageAttachmentMode::JPG,
+        {"Notifs", "Showcase"}
+    )
+{
+    if (!DESCRIPTION.text().empty()){
+        PA_ADD_OPTION(DESCRIPTION);
+    }
+    PA_ADD_OPTION(ACTION);
+//    PA_ADD_OPTION(STOP_PROGRAM);
+//    PA_ADD_OPTION(TAKE_VIDEO);
+    PA_ADD_OPTION(SCREENSHOT_DELAY0);
+}
+bool OverworldShinyDetectedActionOption::stop_on_shiny() const{
+    return ACTION != OverworldShinyDetectedAction::IGNORE;
+}
+
+
+
+BattleMatchActionOption::BattleMatchActionOption(
+    std::string label, std::string description,
+    std::string default_delay
+)
+    : GroupOption(std::move(label), LockMode::UNLOCK_WHILE_RUNNING)
+    , DESCRIPTION(std::move(description))
+    , TAKE_VIDEO("<b>Take Video:</b>", LockMode::UNLOCK_WHILE_RUNNING, true)
+    , NOTIFICATIONS(
+        this->label(),
+        true, true,
+        ImageAttachmentMode::JPG,
+        {"Notifs", "Showcase"}
+    )
+{
+    if (!DESCRIPTION.text().empty()){
+        PA_ADD_OPTION(DESCRIPTION);
+    }
+    PA_ADD_OPTION(TAKE_VIDEO);
+}
+
+
+
+
+
+
+bool on_shiny_callback(
+    ProgramEnvironment& env, VideoStream& stream,
+    OverworldShinyDetectedActionOption& options,
+    float error_coefficient
+){
+    {
+        std::ostringstream ss;
+        ss << "Detected Shiny Sound! (error coefficient = " << error_coefficient << ")";
+        stream.log(ss.str(), COLOR_BLUE);
+
+        //  If we're not ignoring the shiny, return now. Actions will be deferred
+        //  until after the session ends.
+        OverworldShinyDetectedAction action = options.ACTION;
+        if (action != OverworldShinyDetectedAction::IGNORE){
+            return true;
+        }
+    }
+
+    stream.log("Ignoring shiny per user settings...", COLOR_RED);
+
+    std::vector<std::pair<std::string, std::string>> embeds;
+
+    std::ostringstream ss;
+    ss << "Error Coefficient: " << error_coefficient << "\n(Shiny may not be visible on the screen.)";
+    embeds.emplace_back("Detection Results:", ss.str());
+
+    send_program_notification(
+        env, options.NOTIFICATIONS,
+        Pokemon::COLOR_STAR_SHINY,
+        "Detected Shiny Sound",
+        embeds, "",
+        stream.video().snapshot(), true
+    );
+    return false;
+}
+void on_shiny_sound(
+    ProgramEnvironment& env, VideoStream& stream, ProControllerContext& context,
+    OverworldShinyDetectedActionOption& options,
+    float error_coefficient
+){
+    std::vector<std::pair<std::string, std::string>> embeds;
+
+    std::ostringstream ss;
+    ss << "Error Coefficient: ";
+    ss << error_coefficient;
+    ss << "\n(Shiny may not be visible on the screen.)";
+    embeds.emplace_back("Detection Results:", ss.str());
+
+//    pbf_press_button(context, BUTTON_ZL, 20, options.SCREENSHOT_DELAY);
+    pbf_mash_button(context, BUTTON_ZL, options.SCREENSHOT_DELAY0);
+    context.wait_for_all_requests();
+
+    send_program_notification(
+        env, options.NOTIFICATIONS,
+        Pokemon::COLOR_STAR_SHINY,
+        "Detected Shiny Sound",
+        embeds, "",
+        stream.video().snapshot(), true
+    );
+
+    switch (options.ACTION){
+    case OverworldShinyDetectedAction::IGNORE:
+        break;
+    case OverworldShinyDetectedAction::STOP_PROGRAM:
+        pbf_press_button(context, BUTTON_HOME, 160ms, GameSettings::instance().GAME_TO_HOME_DELAY0);
+        context.wait_for_all_requests();
+        throw ProgramFinishedException();
+    case OverworldShinyDetectedAction::TAKE_VIDEO_STOP_PROGRAM:
+        pbf_press_button(context, BUTTON_CAPTURE, 2000ms, 0ms);
+        pbf_press_button(context, BUTTON_HOME, 160ms, GameSettings::instance().GAME_TO_HOME_DELAY0);
+        context.wait_for_all_requests();
+        throw ProgramFinishedException();
+    }
+}
+
+void on_battle_match_found(
+    ProgramEnvironment& env, VideoStream& stream, ProControllerContext& context,
+    BattleMatchActionOption& options,
+    bool allow_notification
+){
+    context.wait_for_all_requests();
+
+    if (allow_notification){
+        send_program_notification(
+            env, options.NOTIFICATIONS,
+            Pokemon::COLOR_STAR_SHINY,
+            "Match Found",
+            {}, "",
+            stream.video().snapshot(), true
+        );
+    }
+
+    if (options.TAKE_VIDEO){
+        pbf_press_button(context, BUTTON_CAPTURE, 2000ms, 0ms);
+    }
+
+    stream.log("Stopping...");
+    context.wait_for_all_requests();
+    throw ProgramFinishedException();
+}
+
+
+
+
+
+
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Options/PokemonLA_ShinyDetectedAction.h b/SerialPrograms/Source/VideoGames/PokemonLA/Options/PokemonLA_ShinyDetectedAction.h
new file mode 100644
index 0000000000..1dd3a57a9d
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Options/PokemonLA_ShinyDetectedAction.h
@@ -0,0 +1,117 @@
+/*  Shiny Detected Action
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLA_ShinyDetectedAction_H
+#define PokemonAutomation_PokemonLA_ShinyDetectedAction_H
+
+#include "Common/Cpp/Options/StaticTextOption.h"
+#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "Common/Cpp/Options/EnumDropdownOption.h"
+#include "Common/Cpp/Options/TimeDurationOption.h"
+#include "Common/Cpp/Options/GroupOption.h"
+#include "CommonFramework/Notifications/EventNotificationOption.h"
+#include "CommonFramework/Tools/VideoStream.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+
+namespace PokemonAutomation{
+    class EventNotificationOption;
+    class StatsTracker;
+    class ProgramEnvironment;
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+
+class ShinyRequiresAudioText : public StaticTextOption{
+public:
+    ShinyRequiresAudioText();
+};
+
+
+
+class ShinySoundDetector;
+
+
+class ShinyStatIncrementer{
+public:
+    virtual void add_shiny() = 0;
+};
+
+
+
+
+enum class OverworldShinyDetectedAction{
+    IGNORE,
+    STOP_PROGRAM,
+    TAKE_VIDEO_STOP_PROGRAM,
+};
+
+
+class OverworldShinyDetectedActionOption : public GroupOption{
+public:
+    OverworldShinyDetectedActionOption(
+        std::string label, std::string description,
+        std::string default_delay,
+        OverworldShinyDetectedAction default_action = OverworldShinyDetectedAction::TAKE_VIDEO_STOP_PROGRAM
+    );
+
+    bool stop_on_shiny() const;
+
+    StaticTextOption DESCRIPTION;
+    EnumDropdownOption<OverworldShinyDetectedAction> ACTION;
+//    BooleanCheckBoxOption STOP_PROGRAM;
+//    BooleanCheckBoxOption TAKE_VIDEO;
+    MillisecondsOption SCREENSHOT_DELAY0;
+    EventNotificationOption NOTIFICATIONS;
+};
+class BattleMatchActionOption : public GroupOption{
+public:
+    BattleMatchActionOption(
+        std::string label, std::string description,
+        std::string default_delay
+    );
+
+    bool stop_on_shiny() const;
+
+    StaticTextOption DESCRIPTION;
+    BooleanCheckBoxOption TAKE_VIDEO;
+    EventNotificationOption NOTIFICATIONS;
+};
+
+
+
+//  Call this inside the ShinySoundDetector callback.
+//  Returns true if session should stop.
+bool on_shiny_callback(
+    ProgramEnvironment& env, VideoStream& stream,
+    OverworldShinyDetectedActionOption& options,
+    float error_coefficient
+);
+
+//  Call this after the session ends. Only if the session stopped on the shiny.
+void on_shiny_sound(
+    ProgramEnvironment& env, VideoStream& stream, ProControllerContext& context,
+    OverworldShinyDetectedActionOption& options,
+    float error_coefficient
+);
+
+// Alternative for matches (shiny/alphas) not found by sound.
+void on_battle_match_found(
+    ProgramEnvironment& env, VideoStream& stream, ProControllerContext& context,
+    BattleMatchActionOption& options,
+    bool allow_notification
+);
+
+
+
+
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/PokemonLA/Options/PokemonLA_TradeCountTable.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Options/PokemonLA_TradeCountTable.cpp
similarity index 75%
rename from SerialPrograms/Source/PokemonLA/Options/PokemonLA_TradeCountTable.cpp
rename to SerialPrograms/Source/VideoGames/PokemonLA/Options/PokemonLA_TradeCountTable.cpp
index ebd5cad8b9..b81553de6c 100644
--- a/SerialPrograms/Source/PokemonLA/Options/PokemonLA_TradeCountTable.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Options/PokemonLA_TradeCountTable.cpp
@@ -1,17 +1,17 @@
 /*  Trade Count Table
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include "Common/Cpp/Exceptions.h"
 #include "Common/Cpp/Json/JsonValue.h"
 #include "Common/Cpp/Json/JsonObject.h"
-#include "CommonFramework/Globals.h"
+#include "CommonFramework/GlobalAutoPaths.h"
 #include "Pokemon/Pokemon_Strings.h"
 #include "Pokemon/Resources/Pokemon_PokemonNames.h"
-#include "PokemonLA/Resources/PokemonLA_AvailablePokemon.h"
-#include "PokemonLA/Resources/PokemonLA_PokemonSprites.h"
+#include "VideoGames/PokemonLA/Resources/PokemonLA_AvailablePokemon.h"
+#include "VideoGames/PokemonLA/Resources/PokemonLA_PokemonSprites.h"
 #include "PokemonLA_TradeCountTable.h"
 
 namespace PokemonAutomation{
@@ -24,11 +24,11 @@ namespace PokemonLA{
 std::map<std::string, uint8_t> make_research_catch_count_map(){
     std::string path = RESOURCE_PATH() + "PokemonLA/ResearchMaxCatches.json";
     JsonValue json = load_json_file(path);
-    JsonObject& root = json.get_object_throw(path);
+    JsonObject& root = json.to_object_throw(path);
 
     std::map<std::string, uint8_t> map;
     for (auto& item : root){
-        map.emplace(item.first, (uint8_t)item.second.get_integer_throw(path));
+        map.emplace(item.first, (uint8_t)item.second.to_integer_throw(path));
     }
 
     return map;
@@ -48,9 +48,9 @@ uint8_t research_catch_count(const std::string& slug){
 TradeCountTableRow::TradeCountTableRow(const std::string& slug, const ImageViewRGB32& icon)
     : StaticTableRow(slug)
     , default_value(research_catch_count(slug))
-    , pokemon(LockWhileRunning::LOCKED, Pokemon::get_pokemon_name(slug).display_name(), icon, 40)
-    , count(LockWhileRunning::LOCKED, default_value, 0, default_value)
-    , default_label(LockWhileRunning::LOCKED, std::to_string(default_value), ImageViewRGB32())
+    , pokemon(LockMode::LOCK_WHILE_RUNNING, Pokemon::get_pokemon_name(slug).display_name(), icon, 40)
+    , count(LockMode::LOCK_WHILE_RUNNING, default_value, 0, default_value)
+    , default_label(LockMode::LOCK_WHILE_RUNNING, std::to_string(default_value), ImageViewRGB32())
 {
     PA_ADD_STATIC(pokemon);
     add_option(count, "Count");
@@ -64,7 +64,7 @@ TradeCountTable::TradeCountTable()
         "The defaults here are the # of catches needed to max out research. "
         "Maxing out catches is sufficient to reach level 10 for everything except Unown, Spritomb, and legendaries. "
         "Note that gen1 trade evolutions cannot be touch traded. The program will skip them. This applies to Kadabra, Haunter, Graveler, and Machoke.",
-        LockWhileRunning::LOCKED
+        LockMode::LOCK_WHILE_RUNNING
     )
 {
     for (const std::string& slug : HISUI_DEX_SLUGS()){
diff --git a/SerialPrograms/Source/PokemonLA/Options/PokemonLA_TradeCountTable.h b/SerialPrograms/Source/VideoGames/PokemonLA/Options/PokemonLA_TradeCountTable.h
similarity index 89%
rename from SerialPrograms/Source/PokemonLA/Options/PokemonLA_TradeCountTable.h
rename to SerialPrograms/Source/VideoGames/PokemonLA/Options/PokemonLA_TradeCountTable.h
index 10e31d4efc..c373948549 100644
--- a/SerialPrograms/Source/PokemonLA/Options/PokemonLA_TradeCountTable.h
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Options/PokemonLA_TradeCountTable.h
@@ -1,6 +1,6 @@
 /*  Trade Count Table
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Options/PokemonLA_TravelLocation.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Options/PokemonLA_TravelLocation.cpp
new file mode 100644
index 0000000000..a75162cb89
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Options/PokemonLA_TravelLocation.cpp
@@ -0,0 +1,50 @@
+/*  Travel Location
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Exceptions.h"
+#include "PokemonLA_TravelLocation.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+
+WildTravelLocationOption::WildTravelLocationOption()
+    : IntegerEnumDropdownOption(
+        "<b>Start Location:</b><br>Travel from this location.",
+        TravelLocations::instance().database_outside_village(),
+        LockMode::LOCK_WHILE_RUNNING,
+        0
+    )
+{}
+
+WildTravelLocationOption::operator const TravelLocation&() const{
+    size_t index = this->current_value();
+    return TravelLocations::instance()[index];
+}
+
+
+AllTravelLocationOption::AllTravelLocationOption()
+    : IntegerEnumDropdownOption(
+        "<b>Start Location:</b><br>Travel from this location.",
+        TravelLocations::instance().database_including_village(),
+        LockMode::LOCK_WHILE_RUNNING,
+        0
+    )
+{}
+
+AllTravelLocationOption::operator const TravelLocation&() const{
+    size_t index = this->current_value();
+    return TravelLocations::instance()[index];
+}
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Options/PokemonLA_TravelLocation.h b/SerialPrograms/Source/VideoGames/PokemonLA/Options/PokemonLA_TravelLocation.h
new file mode 100644
index 0000000000..c7f064ef5c
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Options/PokemonLA_TravelLocation.h
@@ -0,0 +1,37 @@
+/*  Travel Location
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLA_TravelLocation_H
+#define PokemonAutomation_PokemonLA_TravelLocation_H
+
+#include "Common/Cpp/Options/EnumDropdownOption.h"
+#include "VideoGames/PokemonLA/PokemonLA_TravelLocations.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+
+// Warp points in wild areas + custom location after hardcoded movement + ancient retreat
+class WildTravelLocationOption : public IntegerEnumDropdownOption{
+public:
+    WildTravelLocationOption();
+    operator const TravelLocation&() const;
+};
+
+// All locations in WildTravelLocationOption + Jubilife village warp points
+class AllTravelLocationOption : public IntegerEnumDropdownOption{
+public:
+    AllTravelLocationOption();
+    operator const TravelLocation&() const;
+};
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Options/QtWidgets/PokemonLA_CustomPathTableWidget.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Options/QtWidgets/PokemonLA_CustomPathTableWidget.cpp
new file mode 100644
index 0000000000..9344eec94d
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Options/QtWidgets/PokemonLA_CustomPathTableWidget.cpp
@@ -0,0 +1,90 @@
+/*  Custom Path Table
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <iostream>
+#include <QHBoxLayout>
+#include <QVBoxLayout>
+#include <QPushButton>
+#include <QFileDialog>
+#include <QMessageBox>
+#include "Common/Cpp/Json/JsonValue.h"
+#include "Common/Cpp/Json/JsonObject.h"
+#include "PokemonLA_CustomPathTableWidget.h"
+
+namespace PokemonAutomation{
+
+template class RegisterUiStateQtWidget<NintendoSwitch::PokemonLA::CustomPathTableWidget>;
+
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+
+CustomPathTableWidget::CustomPathTableWidget(QWidget& parent, CustomPathTableFromJubilife& value)
+    : QWidget(&parent)
+    , ConfigWidget(value, *this)
+{
+    // m_table_widget is class EditableTableWidget : public EditableTableBaseWidget, public ConfigWidget
+    // EditableTableBaseWidget inherits QWidget.
+    // Since it's a QWidget, we don't need to care about its memory ownership after its parent is set (as `this`).
+
+    m_travel_location = ConfigWidget::make_from_option(value.TRAVEL_LOCATION, this);
+    m_table_widget = ConfigWidget::make_from_option(value.PATH, this);
+
+    QVBoxLayout* layout = new QVBoxLayout(this);
+    layout->setContentsMargins(0, 0, 0, 0);
+    layout->addWidget(&m_travel_location->widget());
+    layout->addWidget(&m_table_widget->widget());
+
+    QHBoxLayout* button_layout = new QHBoxLayout();
+    button_layout->setContentsMargins(0, 0, 0, 0);
+    layout->addLayout(button_layout);
+    auto load_button = new QPushButton("Load Path", this);
+    button_layout->addWidget(load_button, 1);
+    auto save_button = new QPushButton("Save Path", this);
+    button_layout->addWidget(save_button, 1);
+    button_layout->addStretch(2);
+
+    connect(load_button,  &QPushButton::clicked, this, [&value, this](bool){
+        std::string path = QFileDialog::getOpenFileName(this, tr("Open option file"), ".", "*.json").toStdString();
+        std::cout << "Load CustomPathTableFromJubilife from " << path << std::endl;
+        if (path.empty()){
+            return;
+        }
+        JsonValue json = load_json_file(path);
+        JsonObject& root = json.to_object_throw(path);
+        JsonValue& obj = root.get_value_throw("CUSTOM_PATH_TABLE", path);
+        value.load_json(obj);
+        if (m_table_widget == nullptr){
+            QMessageBox box;
+            box.critical(nullptr, "Error", "Internal code error, cannot convert to EditableTableBaseWidget.");
+            return;
+        }
+//            m_travel_location->update();
+//            m_table_widget->update();
+    });
+
+    connect(save_button,  &QPushButton::clicked, this, [&value, this](bool){
+        std::string path = QFileDialog::getSaveFileName(this, tr("Open option file"), ".", "*.json").toStdString();
+        std::cout << "Save CustomPathTableFromJubilife from " << path << std::endl;
+        if (path.size() > 0){
+            try{
+                JsonObject root;
+                root["CUSTOM_PATH_TABLE"] = value.to_json();
+                root.dump(path);
+            }catch (FileException&){
+                QMessageBox box;
+                box.critical(nullptr, "Error", QString::fromStdString("Failed to save to file: " + path));
+                return;
+            }
+        }
+    });
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Options/QtWidgets/PokemonLA_CustomPathTableWidget.h b/SerialPrograms/Source/VideoGames/PokemonLA/Options/QtWidgets/PokemonLA_CustomPathTableWidget.h
new file mode 100644
index 0000000000..601a6b4c61
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Options/QtWidgets/PokemonLA_CustomPathTableWidget.h
@@ -0,0 +1,37 @@
+/*  Custom Path Table
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLA_CustomPathTableTableWidget_H
+#define PokemonAutomation_PokemonLA_CustomPathTableTableWidget_H
+
+#include <QWidget>
+#include "Common/Qt/Options/ConfigWidget.h"
+#include "VideoGames/PokemonLA/Options/PokemonLA_CustomPathTable.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+
+
+class CustomPathTableWidget : public QWidget, public ConfigWidget{
+public:
+    using ParentState = CustomPathTableFromJubilife;
+
+public:
+    CustomPathTableWidget(QWidget& parent, CustomPathTableFromJubilife& value);
+
+private:
+    ConfigWidget* m_travel_location = nullptr;
+    ConfigWidget* m_table_widget = nullptr;
+};
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/PokemonLA/PokemonLA_Locations.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/PokemonLA_Locations.cpp
similarity index 90%
rename from SerialPrograms/Source/PokemonLA/PokemonLA_Locations.cpp
rename to SerialPrograms/Source/VideoGames/PokemonLA/PokemonLA_Locations.cpp
index 80bb109622..3b0d2eb660 100644
--- a/SerialPrograms/Source/PokemonLA/PokemonLA_Locations.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/PokemonLA_Locations.cpp
@@ -1,10 +1,8 @@
 /*  Pokemon Legends Arceus Locations
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
-
-#include <map>
 #include "Common/Cpp/Exceptions.h"
 #include "PokemonLA_Locations.h"
 
diff --git a/SerialPrograms/Source/PokemonLA/PokemonLA_Locations.h b/SerialPrograms/Source/VideoGames/PokemonLA/PokemonLA_Locations.h
similarity index 90%
rename from SerialPrograms/Source/PokemonLA/PokemonLA_Locations.h
rename to SerialPrograms/Source/VideoGames/PokemonLA/PokemonLA_Locations.h
index cd7167eef5..154b367bc5 100644
--- a/SerialPrograms/Source/PokemonLA/PokemonLA_Locations.h
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/PokemonLA_Locations.h
@@ -1,6 +1,6 @@
 /*  Pokemon Legends Arceus Locations
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/PokemonLA_Panels.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/PokemonLA_Panels.cpp
new file mode 100644
index 0000000000..48dd9a13ee
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/PokemonLA_Panels.cpp
@@ -0,0 +1,123 @@
+/*  Pokemon LA Panels
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/StaticGlobals.h"
+#include "CommonFramework/GlobalAutoPaths.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "PokemonLA_Panels.h"
+
+#include "PokemonLA_Settings.h"
+
+#include "Programs/General/PokemonLA_BraviaryHeightGlitch.h"
+#include "Programs/General/PokemonLA_DistortionWaiter.h"
+#include "Programs/General/PokemonLA_OutbreakFinder.h"
+#include "Programs/General/PokemonLA_ClothingBuyer.h"
+#include "Programs/General/PokemonLA_SkipToFullMoon.h"
+#include "Programs/General/PokemonLA_PokedexTasksReader.h"
+#include "Programs/General/PokemonLA_RamanasIslandCombee.h"
+#include "Programs/General/PokemonLA_ApplyGrits.h"
+
+#include "Programs/Trading/PokemonLA_SelfBoxTrade.h"
+#include "Programs/Trading/PokemonLA_SelfTouchTrade.h"
+#include "Programs/Farming/PokemonLA_IngoBattleGrinder.h"
+#include "Programs/Farming/PokemonLA_IngoMoveGrinder.h"
+#include "Programs/Farming/PokemonLA_MagikarpMoveGrinder.h"
+#include "Programs/Farming/PokemonLA_NuggetFarmerHighlands.h"
+#include "Programs/Farming/PokemonLA_TenacityCandyFarmer.h"
+#include "Programs/Farming/PokemonLA_LeapGrinder.h"
+
+#include "Programs/ShinyHunting/PokemonLA_AutoMultiSpawn.h"
+#include "Programs/ShinyHunting/PokemonLA_GalladeFinder.h"
+#include "Programs/ShinyHunting/PokemonLA_CrobatFinder.h"
+#include "Programs/ShinyHunting/PokemonLA_FroslassFinder.h"
+#include "Programs/ShinyHunting/PokemonLA_BurmyFinder.h"
+#include "Programs/ShinyHunting/PokemonLA_UnownFinder.h"
+#include "Programs/ShinyHunting/PokemonLA_ShinyHunt-FlagPin.h"
+#include "Programs/ShinyHunting/PokemonLA_PostMMOSpawnReset.h"
+#include "Programs/ShinyHunting/PokemonLA_ShinyHunt-CustomPath.h"
+
+#include "Programs/TestPrograms/PokemonLA_MountDetectionTest.h"
+#include "Programs/TestPrograms/PokemonLA_OverworldWatcher.h"
+#include "Programs/TestPrograms/PokemonLA_FlagNavigationTest.h"
+#include "Programs/TestPrograms/PokemonLA_SoundListener.h"
+
+#include "Programs/ML/PokemonLA_GeneratePokemonImageTrainingData.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+
+
+PanelListFactory::PanelListFactory()
+    : PanelListDescriptor(
+        Pokemon::STRING_POKEMON + " Legends: Arceus",
+        RESOURCE_PATH() + "CategoryIcons/PokemonLA.png"
+    )
+{}
+
+std::vector<PanelEntry> PanelListFactory::make_panels() const{
+    std::vector<PanelEntry> ret;
+
+    ret.emplace_back("---- Settings ----");
+    ret.emplace_back(make_OptionsPanel<GameSettingsPanel>());
+
+    ret.emplace_back("---- General ----");
+    ret.emplace_back(make_SingleSwitchProgram<BraviaryHeightGlitch>());
+    ret.emplace_back(make_SingleSwitchProgram<DistortionWaiter>());
+    ret.emplace_back(make_SingleSwitchProgram<OutbreakFinder>());
+    ret.emplace_back(make_SingleSwitchProgram<ClothingBuyer>());
+    ret.emplace_back(make_SingleSwitchProgram<SkipToFullMoon>());
+    ret.emplace_back(make_SingleSwitchProgram<ApplyGrits>());
+    ret.emplace_back(make_SingleSwitchProgram<PokedexTasksReader>());
+    ret.emplace_back(make_SingleSwitchProgram<RamanasCombeeFinder>());
+
+    ret.emplace_back("---- Trading ----");
+    ret.emplace_back(make_MultiSwitchProgram<SelfBoxTrade>());
+    ret.emplace_back(make_MultiSwitchProgram<SelfTouchTrade>());
+
+    ret.emplace_back("---- Farming ----");
+    ret.emplace_back(make_SingleSwitchProgram<NuggetFarmerHighlands>());
+    ret.emplace_back(make_SingleSwitchProgram<IngoBattleGrinder>());
+    ret.emplace_back(make_SingleSwitchProgram<IngoMoveGrinder>());
+    ret.emplace_back(make_SingleSwitchProgram<MagikarpMoveGrinder>());
+    ret.emplace_back(make_SingleSwitchProgram<TenacityCandyFarmer>());
+    ret.emplace_back(make_SingleSwitchProgram<LeapGrinder>());
+
+    ret.emplace_back("---- Shiny Hunting ----");
+    ret.emplace_back(make_SingleSwitchProgram<CrobatFinder>());
+    ret.emplace_back(make_SingleSwitchProgram<GalladeFinder>());
+    ret.emplace_back(make_SingleSwitchProgram<FroslassFinder>());
+    ret.emplace_back(make_SingleSwitchProgram<BurmyFinder>());
+    ret.emplace_back(make_SingleSwitchProgram<UnownFinder>());
+    ret.emplace_back(make_SingleSwitchProgram<ShinyHuntFlagPin>());
+    ret.emplace_back(make_SingleSwitchProgram<PostMMOSpawnReset>());
+    ret.emplace_back(make_SingleSwitchProgram<ShinyHuntCustomPath>());
+
+    if (STATIC_GLOBALS.DEVELOPER_MODE){
+        ret.emplace_back("---- Untested/Beta/WIP ----");
+        ret.emplace_back(make_SingleSwitchProgram<AutoMultiSpawn>());
+    }
+    if (STATIC_GLOBALS.DEVELOPER_MODE){
+        ret.emplace_back("---- Machine Learning ----");
+        ret.emplace_back(make_SingleSwitchProgram<GeneratePokemonImageTrainingData>());
+
+        ret.emplace_back("---- Developer Tools ----");
+        ret.emplace_back(make_SingleSwitchProgram<MountDetectionTest>());
+        ret.emplace_back(make_SingleSwitchProgram<OverworldWatcher>());
+        ret.emplace_back(make_SingleSwitchProgram<SoundListener>());
+        ret.emplace_back(make_SingleSwitchProgram<FlagNavigationTest>());
+    }
+
+    return ret;
+}
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/PokemonLA_Panels.h b/SerialPrograms/Source/VideoGames/PokemonLA/PokemonLA_Panels.h
new file mode 100644
index 0000000000..6077b1ccda
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/PokemonLA_Panels.h
@@ -0,0 +1,30 @@
+/*  Pokemon Legends Arceus Panels
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLA_Panels_H
+#define PokemonAutomation_PokemonLA_Panels_H
+
+#include "CommonFramework/Panels/PanelList.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+
+
+class PanelListFactory : public PanelListDescriptor{
+public:
+    PanelListFactory();
+private:
+    virtual std::vector<PanelEntry> make_panels() const override;
+};
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/PokemonLA_Settings.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/PokemonLA_Settings.cpp
new file mode 100644
index 0000000000..25525edcec
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/PokemonLA_Settings.cpp
@@ -0,0 +1,146 @@
+/*  Pokemon Legends Arceus Settings
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Pokemon/Pokemon_Strings.h"
+#include "PokemonLA_Settings.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+using namespace Pokemon;
+
+
+
+GameSettings& GameSettings::instance(){
+    static GameSettings settings;
+    return settings;
+}
+GameSettings::GameSettings()
+    : BatchOption(LockMode::LOCK_WHILE_RUNNING)
+    , m_general("<font size=4><b>General Settings:</b></font>")
+    , POST_WARP_DELAY0(
+        "<b>Post-Warp Delay:</b><br>After warping, wait this many seconds before continuing.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "1000 ms"
+    )
+    , m_menu_navigation("<font size=4><b>Menu Navigation Timings:</b></font>")
+    , GAME_TO_HOME_DELAY0(
+        "<b>Game to Home Delay:</b><br>Delay from pressing home to entering the the Switch home menu.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "1000 ms"
+    )
+    , LOAD_REGION_TIMEOUT0(
+        "<b>Load Region Timeout:</b><br>Wait at most this long to enter a region before giving up.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "30 s"
+    )
+    , m_start_game_timings("<font size=4><b>Start Game Timings:</b></font>")
+    , START_GAME_WAIT1(
+        "<b>Start Game Wait:</b><br>Wait this long for the game to load.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "40 s"
+    )
+    , ENTER_GAME_MASH0(
+        "<b>Enter Game Mash:</b><br>Mash A for this long to enter the game.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "5000 ms"
+    )
+    , ENTER_GAME_WAIT0(
+        "<b>Enter Game Wait:</b><br>Wait this long for the game to enter the overworld.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "15 s"
+    )
+    , m_advanced_options(
+        "<font size=4><b>Advanced Options:</b> You should not need to touch anything below here.</font>"
+    )
+    , SHINY_SOUND_THRESHOLD(
+        "<b>Shiny Sound Threshold:</b><br>Maximum error coefficient to trigger a shiny detection.",
+        LockMode::LOCK_WHILE_RUNNING,
+        0.87, 0, 1.0
+    )
+    , SHINY_SOUND_LOW_FREQUENCY(
+        "<b>Shiny Sound Low Frequency (Hz):</b><br>High pass filter frequency for shiny sound.",
+        LockMode::LOCK_WHILE_RUNNING,
+        5000, 0, 48000
+    )
+    , ALPHA_ROAR_THRESHOLD(
+        "<b>Alpha Roar Threshold:</b><br>Maximum error coefficient to trigger an alpha roar detection.",
+        LockMode::LOCK_WHILE_RUNNING,
+        0.65, 0, 1.0
+    )
+    , ALPHA_MUSIC_THRESHOLD(
+        "<b>Alpha Music Threshold:</b><br>Maximum error coefficient to trigger an alpha music detection.",
+        LockMode::LOCK_WHILE_RUNNING,
+        0.81, 0, 1.0
+    )
+    , ITEM_DROP_SOUND_THRESHOLD(
+        "<b>Item Drop Sound Threshold:</b><br>Maximum error coefficient to trigger an item drop sound detection.",
+        LockMode::LOCK_WHILE_RUNNING,
+        0.9, 0, 1.0
+    )
+    , ITEM_DROP_SOUND_LOW_FREQUENCY(
+        "<b>Item Drop Sound Low Frequency (Hz):</b><br>High pass filter frequency for item drop sound.",
+        LockMode::LOCK_WHILE_RUNNING,
+        5000, 0, 48000
+    )
+{
+    PA_ADD_STATIC(m_general);
+    PA_ADD_OPTION(POST_WARP_DELAY0);
+
+    PA_ADD_STATIC(m_menu_navigation);
+    PA_ADD_OPTION(GAME_TO_HOME_DELAY0);
+    PA_ADD_OPTION(LOAD_REGION_TIMEOUT0);
+
+    PA_ADD_STATIC(m_start_game_timings);
+    PA_ADD_OPTION(START_GAME_WAIT1);
+    PA_ADD_OPTION(ENTER_GAME_MASH0);
+    PA_ADD_OPTION(ENTER_GAME_WAIT0);
+
+    PA_ADD_STATIC(m_advanced_options);
+    PA_ADD_OPTION(SHINY_SOUND_THRESHOLD);
+    PA_ADD_OPTION(SHINY_SOUND_LOW_FREQUENCY);
+    PA_ADD_OPTION(ALPHA_ROAR_THRESHOLD);
+    PA_ADD_OPTION(ALPHA_MUSIC_THRESHOLD);
+    PA_ADD_OPTION(ITEM_DROP_SOUND_THRESHOLD);
+    PA_ADD_OPTION(ITEM_DROP_SOUND_LOW_FREQUENCY);
+}
+
+
+
+
+
+GameSettings_Descriptor::GameSettings_Descriptor()
+    : OptionsPanelDescriptor(
+        "PokemonLA:GlobalSettings",
+        STRING_POKEMON + " LA", "Game Settings",
+        "Programs/PokemonLA/PokemonSettings.html",
+        "Global " + STRING_POKEMON + " Legends Arceus Settings",
+        PanelQualityStanding::OFFICIAL
+    )
+{}
+
+
+
+GameSettingsPanel::GameSettingsPanel()
+    : settings(GameSettings::instance())
+{
+    PA_ADD_OPTION(settings);
+}
+
+
+
+
+
+}
+}
+}
+
+
+
+
+
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/PokemonLA_Settings.h b/SerialPrograms/Source/VideoGames/PokemonLA/PokemonLA_Settings.h
new file mode 100644
index 0000000000..6ef286890c
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/PokemonLA_Settings.h
@@ -0,0 +1,67 @@
+/*  Pokemon Legends Arceus Settings
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLA_Settings_H
+#define PokemonAutomation_PokemonLA_Settings_H
+
+#include "Common/Cpp/Options/StaticTextOption.h"
+#include "Common/Cpp/Options/FloatingPointOption.h"
+#include "Common/Cpp/Options/TimeDurationOption.h"
+#include "CommonFramework/Panels/OptionsPanel.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+
+class GameSettings : public BatchOption{
+    GameSettings();
+public:
+    static GameSettings& instance();
+
+    SectionDividerOption m_general;
+    MillisecondsOption POST_WARP_DELAY0;
+
+    SectionDividerOption m_menu_navigation;
+    MillisecondsOption GAME_TO_HOME_DELAY0;
+    MillisecondsOption LOAD_REGION_TIMEOUT0;
+
+    SectionDividerOption m_start_game_timings;
+    MillisecondsOption START_GAME_WAIT1;
+    MillisecondsOption ENTER_GAME_MASH0;
+    MillisecondsOption ENTER_GAME_WAIT0;
+
+    SectionDividerOption m_advanced_options;
+    FloatingPointOption SHINY_SOUND_THRESHOLD;
+    FloatingPointOption SHINY_SOUND_LOW_FREQUENCY;
+    FloatingPointOption ALPHA_ROAR_THRESHOLD;
+    FloatingPointOption ALPHA_MUSIC_THRESHOLD;
+    FloatingPointOption ITEM_DROP_SOUND_THRESHOLD;
+    FloatingPointOption ITEM_DROP_SOUND_LOW_FREQUENCY;
+};
+
+
+
+
+class GameSettings_Descriptor : public OptionsPanelDescriptor{
+public:
+    GameSettings_Descriptor();
+};
+
+
+class GameSettingsPanel : public OptionsPanelInstance{
+public:
+    using Descriptor = GameSettings_Descriptor;
+    GameSettingsPanel();
+private:
+    GameSettings& settings;
+};
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/PokemonLA_Tests.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/PokemonLA_Tests.cpp
new file mode 100644
index 0000000000..429a55fe62
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/PokemonLA_Tests.cpp
@@ -0,0 +1,70 @@
+/*  Pokemon LA Tests
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "Inference/PokemonLA_DialogDetector.h"
+#include "Inference/PokemonLA_BlackOutDetector.h"
+#include "Inference/PokemonLA_StatusInfoScreenDetector.h"
+#include "Inference/PokemonLA_WildPokemonFocusDetector.h"
+#include "Inference/PokemonLA_BerryTreeDetector.h"
+#include "Inference/Objects/PokemonLA_DialogYellowArrowDetector.h"
+#include "Inference/Objects/PokemonLA_FlagTracker.h"
+#include "Inference/Objects/PokemonLA_MMOQuestionMarkDetector.h"
+#include "Inference/Objects/PokemonLA_BattleSpriteArrowDetector.h"
+#include "Inference/Map/PokemonLA_MapZoomLevelReader.h"
+#include "Inference/Map/PokemonLA_PokemonMapSpriteReader.h"
+#include "Inference/Map/PokemonLA_MapMarkerLocator.h"
+#include "Inference/Map/PokemonLA_MapMissionTabReader.h"
+#include "Inference/Map/PokemonLA_MapWeatherAndTimeReader.h"
+#include "Inference/Battles/PokemonLA_TransparentDialogueDetector.h"
+#include "Inference/Battles/PokemonLA_BattleMenuDetector.h"
+#include "Inference/Battles/PokemonLA_BattlePokemonSwitchDetector.h"
+#include "Inference/Battles/PokemonLA_BattleSpriteWatcher.h"
+#include "Inference/Battles/PokemonLA_BattleStartDetector.h"
+#include "Inference/Sounds/PokemonLA_ShinySoundDetector.h"
+#include "Programs/PokemonLA_GameSave.h"
+#include "PokemonLA_Tests.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+
+
+void add_tests(UnitTestDatabase& database){
+    add_tests_DialogDetector(database);
+    add_tests_BlackOutDetector(database);
+    add_tests_StatusInfoScreenDetector(database);
+    add_tests_WildPokemonFocusDetector(database);
+    add_tests_BerryTreeDetector(database);
+
+    add_tests_DialogYellowArrowDetector(database);
+    add_tests_FlagTracker(database);
+    add_tests_MMOQuestionMarkDetector(database);
+    add_tests_BattleSpriteArrowDetector(database);
+
+    add_tests_MapZoomLevelReader(database);
+    add_tests_PokemonMapSpriteReader(database);
+    add_tests_MapMarkerLocator(database);
+    add_tests_MapMissionTabReader(database);
+    add_tests_MapWeatherAndTimeReader(database);
+
+    add_tests_TransparentDialogueDetector(database);
+    add_tests_BattleMenuDetector(database);
+    add_tests_BattlePokemonSwitchDetector(database);
+    add_tests_BattleSpriteWatcher(database);
+    add_tests_BattleStartDetector(database);
+
+    add_tests_ShinySoundDetector(database);
+
+    add_tests_GameSave(database);
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/PokemonLA_Tests.h b/SerialPrograms/Source/VideoGames/PokemonLA/PokemonLA_Tests.h
new file mode 100644
index 0000000000..d87ea5ead3
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/PokemonLA_Tests.h
@@ -0,0 +1,25 @@
+/*  Pokemon LA Tests
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLA_Tests_H
+#define PokemonAutomation_PokemonLA_Tests_H
+
+#include "Common/Cpp/TestRunners/UnitTest.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+
+
+void add_tests(UnitTestDatabase& database);
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/PokemonLA_TravelLocations.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/PokemonLA_TravelLocations.cpp
new file mode 100644
index 0000000000..3be2db795a
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/PokemonLA_TravelLocations.cpp
@@ -0,0 +1,242 @@
+/*  Travel Locations
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+#include "Common/Cpp/Exceptions.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "VideoGames/PokemonLA/Programs/PokemonLA_MountChange.h"
+#include "PokemonLA_TravelLocations.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+
+TravelLocation::TravelLocation(
+    const char* p_slug, const char* p_display,
+    MapRegion p_region,
+    uint8_t p_warp_slot, uint8_t p_warp_sub_slot,
+    std::function<void(VideoStream& stream, ProControllerContext& context)>&& p_post_arrival_maneuver,
+    bool p_reverse_sub_menu_direction
+)
+    : slug(p_slug)
+    , display(p_display)
+    , region(p_region)
+    , warp_slot(p_warp_slot)
+    , warp_sub_slot(p_warp_sub_slot)
+    , reverse_sub_menu_direction(p_reverse_sub_menu_direction)
+    , post_arrival_maneuver(std::move(p_post_arrival_maneuver))
+{}
+
+
+const TravelLocations& TravelLocations::instance(){
+    static const TravelLocations locations;
+    return locations;
+}
+
+
+void TravelLocations::add_location(const TravelLocation& location, bool inside_village){
+    if (!m_map.emplace(location.display, &location).second){
+        throw InternalProgramError(
+            nullptr, PA_CURRENT_FUNCTION,
+            std::string("Duplicate TravelLocation name: ") + location.display
+        );
+    }
+    m_list.emplace_back(&location);
+    m_database_include_village.add(m_list.size() - 1, location.slug, location.display, true);
+    
+    if (!inside_village){
+        m_database_outside_village.add(m_list.size() - 1, location.slug, location.display, true);    
+    }
+    
+}
+TravelLocations::TravelLocations()
+    : Fieldlands_Fieldlands(
+        "fieldlands-fieldlands",
+        "Obsidian Fieldlands - Fieldlands Camp",
+        MapRegion::FIELDLANDS, 0, 0, nullptr
+    )
+    , Fieldlands_Heights(
+        "fieldlands-heights",
+        "Obsidian Fieldlands - Heights Camp",
+        MapRegion::FIELDLANDS, 1, 0, nullptr
+    )
+    , Fieldlands_Arena(
+        "fieldlands-arena",
+        "Obsidian Fieldlands - Grandtree Arena",
+        MapRegion::FIELDLANDS, 0, 2, nullptr
+    )
+
+    , Mirelands_Mirelands(
+        "mirelands-mirelands",
+        "Crimson Mirelands - Mirelands Camp",
+        MapRegion::MIRELANDS, 0, 0, nullptr
+    )
+    , Mirelands_Bogbound(
+        "mirelands-bogboung",
+        "Crimson Mirelands - Bogbound Camp",
+        MapRegion::MIRELANDS, 1, 0, nullptr
+    )
+    , Mirelands_DiamondSettlement(
+        "mirelands-settlement",
+        "Crimson Mirelands - Diamond Settlement",
+        MapRegion::MIRELANDS, 0, 2, nullptr
+    )
+    , Mirelands_Arena(
+        "mirelands-arena",
+        "Crimson Mirelands - Brava Arena",
+        MapRegion::MIRELANDS, 0, 2, nullptr, true
+    )
+
+    , Coastlands_Beachside(
+        "coastlands-beachside",
+        "Cobalt Coastlands - Beachside Camp",
+        MapRegion::COASTLANDS, 0, 0, nullptr
+    )
+    , Coastlands_Coastlands(
+        "coastlands-coastlands",
+        "Cobalt Coastlands - Coastlands Camp",
+        MapRegion::COASTLANDS, 1, 0, nullptr
+    )
+    , Coastlands_Arena(
+        "coastlands-arena",
+        "Cobalt Coastlands - Molten Arena",
+        MapRegion::COASTLANDS, 0, 2, nullptr
+    )
+    , Coastlands_Arena_NW(
+        "coastlands-arena-nw",
+        "Cobalt Coastlands - Molten Arena (NW of Volcano)",
+        MapRegion::COASTLANDS, 0, 2, [](VideoStream& stream, ProControllerContext& context){
+            change_mount(stream, context, MountState::BRAVIARY_ON);
+            pbf_move_left_joystick(context, {+0.252, +1}, 1280ms, 0ms);
+            pbf_mash_button(context, BUTTON_B, 4000ms);
+        }
+    )
+
+    , Highlands_Highlands(
+        "highlands-highlands",
+        "Coronet Highlands - Highlands Camp",
+        MapRegion::HIGHLANDS, 0, 0, nullptr
+    )
+    , Highlands_Mountain(
+        "highlands-mountain",
+        "Coronet Highlands - Mountain Camp",
+        MapRegion::HIGHLANDS, 1, 0, nullptr
+    )
+    , Highlands_Summit(
+        "highlands-summit",
+        "Coronet Highlands - Summit Camp",
+        MapRegion::HIGHLANDS, 2, 0, nullptr
+    )
+    , Highlands_Arena(
+        "highlands-arena",
+        "Coronet Highlands - Moonview Arena",
+        MapRegion::HIGHLANDS, 0, 2, nullptr, true
+    )
+
+    , Icelands_Snowfields(
+        "icelands-icelands",
+        "Alabaster Icelands - Snowfields Camp",
+        MapRegion::ICELANDS, 0, 0, nullptr
+    )
+    , Icelands_Icepeak(
+        "icelands-icepeak",
+        "Alabaster Icelands - Icepeak Camp",
+        MapRegion::ICELANDS, 1, 0, nullptr
+    )
+    , Icelands_PearlSettlement(
+        "icelands-settlement",
+        "Alabaster Icelands - Pearl Settlement",
+        MapRegion::ICELANDS, 0, 2, nullptr
+    )
+    , Icelands_PearlSettlement_SW(
+        "icelands-settlement-sw",
+        "Alabaster Icelands - Pearl Settlement (SW of landing spot)",
+        MapRegion::ICELANDS, 0, 2, [](VideoStream& stream, ProControllerContext& context){
+            change_mount(stream, context, MountState::BRAVIARY_ON);
+            pbf_move_left_joystick(context, {+0.5, -1}, 1280ms, 0ms);
+            pbf_mash_button(context, BUTTON_B, 2000ms);
+        }
+    )
+    , Icelands_Arena(
+        "icelands-arena",
+        "Alabaster Icelands - Icepeak Arena",
+        MapRegion::ICELANDS, 0, 2, nullptr, true
+    )
+    , Retreat(
+        "retreat",
+        "Ancient Retreat",
+        MapRegion::RETREAT, 0, 0, nullptr, false
+    )
+    , Village_GalaxyHall(
+        "village-galaxyhall",
+        "Jubilife Village - Galaxy Hall",
+        MapRegion::JUBILIFE, 0, 0, nullptr, false
+    )
+    , Village_FrontGate(
+        "village-frontgate",
+        "Jubilife Village - Front Gate",
+        MapRegion::JUBILIFE, 0, 1, nullptr, false
+    )
+    , Village_PracticeField(
+        "village-practicefield",
+        "Jubilife Village - Practice Field",
+        MapRegion::JUBILIFE, 0, 2, nullptr, false
+    )
+    , Village_Farm(
+        "village-farm",
+        "Jubilife Village - Farm",
+        MapRegion::JUBILIFE, 0, 3, nullptr, false
+    )
+    , Village_TrainingGrounds(
+        "village-traininggrounds",
+        "Jubilife Village - Training Grounds",
+        MapRegion::JUBILIFE, 0, 2, nullptr, true
+    )
+{
+    add_location(Fieldlands_Fieldlands);
+    add_location(Fieldlands_Heights);
+    add_location(Fieldlands_Arena);
+
+    add_location(Mirelands_Mirelands);
+    add_location(Mirelands_Bogbound);
+    add_location(Mirelands_DiamondSettlement);
+    add_location(Mirelands_Arena);
+
+    add_location(Coastlands_Beachside);
+    add_location(Coastlands_Coastlands);
+    add_location(Coastlands_Arena);
+    add_location(Coastlands_Arena_NW);
+
+    add_location(Highlands_Highlands);
+    add_location(Highlands_Mountain);
+    add_location(Highlands_Summit);
+    add_location(Highlands_Arena);
+
+    add_location(Icelands_Snowfields);
+    add_location(Icelands_Icepeak);
+    add_location(Icelands_PearlSettlement);
+    add_location(Icelands_PearlSettlement_SW);
+    add_location(Icelands_Arena);
+    add_location(Retreat);
+
+    const bool inside_village = true;
+    add_location(Village_GalaxyHall, inside_village);
+    add_location(Village_FrontGate, inside_village);
+    add_location(Village_PracticeField, inside_village);
+    add_location(Village_Farm, inside_village);
+    add_location(Village_TrainingGrounds, inside_village);
+}
+
+
+
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/PokemonLA_TravelLocations.h b/SerialPrograms/Source/VideoGames/PokemonLA/PokemonLA_TravelLocations.h
new file mode 100644
index 0000000000..8717813a4a
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/PokemonLA_TravelLocations.h
@@ -0,0 +1,118 @@
+/*  Travel Locations
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLA_TravelLocations_H
+#define PokemonAutomation_PokemonLA_TravelLocations_H
+
+#include <functional>
+#include <string>
+#include <vector>
+#include <map>
+#include "Common/Cpp/Options/EnumDropdownDatabase.h"
+#include "CommonFramework/Tools/VideoStream.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+#include "PokemonLA_Locations.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+
+
+struct TravelLocation{
+    const char* slug;
+    const char* display;
+
+    MapRegion region;
+    // which menu slot to warp from the full-Hisui map when leaving the village.
+    uint8_t warp_slot;
+    // which menu slot to warp across the region map, if the location is a settlement
+    // or arena that requires an in-region warp.
+    uint8_t warp_sub_slot; 
+    // whether it is faster to go upwards in the in-region warp map to reach the
+    // destination slot.
+    bool reverse_sub_menu_direction; 
+
+    std::function<void(VideoStream& stream, ProControllerContext& context)> post_arrival_maneuver;
+
+    TravelLocation(
+        const char* p_slug, const char* p_display,
+        MapRegion p_region,
+        uint8_t p_warp_slot, uint8_t p_warp_sub_slot,
+        std::function<void(VideoStream& stream, ProControllerContext& context)>&& p_post_arrival_maneuver,
+        bool reverse_sub_menu_direction = false
+    );
+};
+
+
+// Singleton to return all travel locations from the Jubilife Village Gate
+// To create a program option to select travel location, use:
+// SerialPrograms/Source/PokemonLA/Options/PokemonLA_TravelLocation.h:TravelLocationOption
+class TravelLocations{
+public:
+    static const TravelLocations& instance();
+
+    const TravelLocation& operator[](size_t index) const{
+        return *m_list[index];
+    }
+    const IntegerEnumDropdownDatabase& database_outside_village() const { return m_database_outside_village; }
+    const IntegerEnumDropdownDatabase& database_including_village() const { return m_database_include_village; }
+
+
+public:
+    const TravelLocation Fieldlands_Fieldlands;
+    const TravelLocation Fieldlands_Heights;
+    const TravelLocation Fieldlands_Arena;
+
+    const TravelLocation Mirelands_Mirelands;
+    const TravelLocation Mirelands_Bogbound;
+    const TravelLocation Mirelands_DiamondSettlement;
+    const TravelLocation Mirelands_Arena;
+
+    const TravelLocation Coastlands_Beachside;
+    const TravelLocation Coastlands_Coastlands;
+    const TravelLocation Coastlands_Arena;
+    const TravelLocation Coastlands_Arena_NW;
+
+    const TravelLocation Highlands_Highlands;
+    const TravelLocation Highlands_Mountain;
+    const TravelLocation Highlands_Summit;
+    const TravelLocation Highlands_Arena;
+
+    const TravelLocation Icelands_Snowfields;
+    const TravelLocation Icelands_Icepeak;
+    const TravelLocation Icelands_PearlSettlement;
+    const TravelLocation Icelands_PearlSettlement_SW;
+    const TravelLocation Icelands_Arena;
+
+    const TravelLocation Retreat;
+
+    const TravelLocation Village_GalaxyHall;
+    const TravelLocation Village_FrontGate;
+    const TravelLocation Village_PracticeField;
+    const TravelLocation Village_Farm;
+    const TravelLocation Village_TrainingGrounds;
+
+private:
+    TravelLocations();
+    void add_location(const TravelLocation& location, bool inside_village = false);
+
+    std::vector<const TravelLocation*> m_list;
+    std::map<std::string, const TravelLocation*> m_map;
+ 
+    IntegerEnumDropdownDatabase m_database_outside_village;
+    IntegerEnumDropdownDatabase m_database_include_village;
+};
+
+
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/PokemonLA/PokemonLA_WeatherAndTime.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/PokemonLA_WeatherAndTime.cpp
similarity index 91%
rename from SerialPrograms/Source/PokemonLA/PokemonLA_WeatherAndTime.cpp
rename to SerialPrograms/Source/VideoGames/PokemonLA/PokemonLA_WeatherAndTime.cpp
index 5bb68a2aae..f56eb578bd 100644
--- a/SerialPrograms/Source/PokemonLA/PokemonLA_WeatherAndTime.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/PokemonLA_WeatherAndTime.cpp
@@ -1,12 +1,11 @@
 /*  Weather and Time of Day Definitions
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include <algorithm>
 #include <string>
-#include <map>
 #include "Common/Cpp/Exceptions.h"
 #include "PokemonLA_WeatherAndTime.h"
 
diff --git a/SerialPrograms/Source/PokemonLA/PokemonLA_WeatherAndTime.h b/SerialPrograms/Source/VideoGames/PokemonLA/PokemonLA_WeatherAndTime.h
similarity index 89%
rename from SerialPrograms/Source/PokemonLA/PokemonLA_WeatherAndTime.h
rename to SerialPrograms/Source/VideoGames/PokemonLA/PokemonLA_WeatherAndTime.h
index 3c2db49c14..729005141f 100644
--- a/SerialPrograms/Source/PokemonLA/PokemonLA_WeatherAndTime.h
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/PokemonLA_WeatherAndTime.h
@@ -1,21 +1,21 @@
 /*  Weather and Time of Day Definitions
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifndef PokemonAutomation_PokemonLA_WeatherAndTime_H
 #define PokemonAutomation_PokemonLA_WeatherAndTime_H
 
+#include <stdint.h>
 #include <array>
 #include <string>
-#include <stdint.h>
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
 namespace PokemonLA{
 
-enum class Weather {
+enum class Weather{
     SUNNY = 0,
     CLOUDY,
     RAIN,
@@ -45,7 +45,7 @@ Weather get_weather(const std::string& name);
 // The order of `TimeOfDay` enums corresponds to the order
 // of setting the time in the camp, with `NONE` being no
 // change of time while using the camp
-enum class TimeOfDay {
+enum class TimeOfDay{
     NONE = 0,
     MORNING,
     MIDDAY,
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Farming/PokemonLA_IngoBattleGrinder.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Farming/PokemonLA_IngoBattleGrinder.cpp
new file mode 100644
index 0000000000..07b93ac6b3
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Farming/PokemonLA_IngoBattleGrinder.cpp
@@ -0,0 +1,419 @@
+/*  Ingo Battle Grinder
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <chrono>
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/Tools/ErrorDumper.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattleMenuDetector.h"
+#include "VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattlePokemonSwitchDetector.h"
+#include "VideoGames/PokemonLA/Programs/PokemonLA_BattleRoutines.h"
+#include "VideoGames/PokemonLA/Inference/Objects/PokemonLA_ArcPhoneDetector.h"
+#include "VideoGames/PokemonLA/Inference/Objects/PokemonLA_DialogEllipseDetector.h"
+#include "VideoGames/PokemonLA/Inference/PokemonLA_DialogDetector.h"
+#include "PokemonLA_IngoBattleGrinder.h"
+
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+using namespace Pokemon;
+
+
+// #define DEBUG_INGO_BATTLE
+
+
+
+IngoBattleGrinder_Descriptor::IngoBattleGrinder_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonLA:IngoBattleGrinder",
+        STRING_POKEMON + " LA", "Ingo Battle Grinder",
+        "Programs/PokemonLA/IngoBattleGrinder.html",
+        "Attend Ingo's battles to grind exp and move related " + STRING_POKEDEX + " research tasks. "
+        "Less effective than Ingo Move Grinder for " + STRING_POKEDEX + " research tasks but more effective for everything else.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+class IngoBattleGrinder_Descriptor::Stats : public StatsTracker{
+public:
+    Stats()
+        : battles(m_stats["Battles"])
+        , turns(m_stats["Turns"])
+        , lead_move_attempts(m_stats["Lead Move Attempts"])
+        , faint_switches(m_stats["Faint Switches"])
+        , errors(m_stats["Errors"])
+    {
+        m_display_order.emplace_back("Battles");
+        m_display_order.emplace_back("Turns");
+        m_display_order.emplace_back("Lead Move Attempts");
+        m_display_order.emplace_back("Faint Switches", HIDDEN_IF_ZERO);
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+    }
+
+    std::atomic<uint64_t>& battles;
+    std::atomic<uint64_t>& turns;
+    std::atomic<uint64_t>& lead_move_attempts;
+    std::atomic<uint64_t>& faint_switches;
+    std::atomic<uint64_t>& errors;
+};
+std::unique_ptr<StatsTracker> IngoBattleGrinder_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+
+IngoBattleGrinder::IngoBattleGrinder()
+    : NOTIFICATION_STATUS("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_STATUS,
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+{
+    PA_ADD_OPTION(OPPONENT);
+    PA_ADD_OPTION(POKEMON_ACTIONS);
+
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+
+
+bool IngoBattleGrinder::start_dialog(VideoStream& stream, ProControllerContext& context){
+    // First press A to start talking with Ingo.
+    pbf_press_button(context, BUTTON_A, 160ms, 1200ms);
+    context.wait_for_all_requests();
+
+    {
+        ButtonDetector button0(
+            stream.logger(), stream.overlay(),
+            ButtonType::ButtonA,
+            {0.50, 0.408, 0.40, 0.042},
+            std::chrono::milliseconds(100),
+            true
+        );
+        ButtonDetector button1(
+            stream.logger(), stream.overlay(),
+            ButtonType::ButtonA,
+            {0.50, 0.450, 0.40, 0.042},
+            std::chrono::milliseconds(100),
+            true
+        );
+        ButtonDetector button2(
+            stream.logger(), stream.overlay(),
+            ButtonType::ButtonA,
+            {0.50, 0.492, 0.40, 0.042},
+            std::chrono::milliseconds(100),
+            true
+        );
+        int ret = run_until<ProControllerContext>(
+            stream, context,
+            [&](ProControllerContext& context){
+                for (size_t c = 0; c < 10; c++){
+                    pbf_press_button(context, BUTTON_A, 160ms, 1200ms);
+                }
+            },
+            {
+                {button0},
+                {button1},
+                {button2},
+            }
+        );
+        switch (ret){
+        case 0:
+            //  Version 1.1 without new options unlocked.
+            return false;
+        case 1:
+            //  Version 1.0
+            return true;
+        case 2:
+            //  Version 1.1 with new options unlocked.
+            break;
+        default:
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "Unable to detect options after 10 A presses.",
+                stream
+            );
+        }
+    }
+
+    pbf_press_button(context, BUTTON_A, 160ms, 1200ms);
+    context.wait_for_all_requests();
+
+    ButtonDetector button2(
+        stream.logger(), stream.overlay(),
+        ButtonType::ButtonA,
+        {0.50, 0.350, 0.40, 0.400},
+        std::chrono::milliseconds(100),
+        true
+    );
+    int ret = run_until<ProControllerContext>(
+        stream, context,
+        [&](ProControllerContext& context){
+            for (size_t c = 0; c < 5; c++){
+                pbf_press_button(context, BUTTON_A, 160ms, 1200ms);
+            }
+        },
+        {{button2}}
+    );
+    switch (ret){
+    case 0:
+        return false;
+    default:
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "Unable to find opponent list options after 5 A presses.",
+            stream
+        );
+    }
+}
+
+
+bool IngoBattleGrinder::run_iteration(SingleSwitchProgramEnvironment& env, ProControllerContext& context, std::map<size_t, size_t>& pokemon_move_attempts){
+    IngoBattleGrinder_Descriptor::Stats& stats = env.current_stats<IngoBattleGrinder_Descriptor::Stats>();
+
+    env.console.log("Starting battle...");
+
+    // Talk to Ingo to start conversation and select regular battles:
+    // The dialogues are different between version 10 (the vanilla version) and later versions.
+    bool version_10 = start_dialog(env.console, context);
+    env.log(std::string("Detected current version: ") + (version_10 ? "1.0" : "1.2"));
+
+    IngoOpponentMenuLocation menu_location = version_10
+        ? INGO_OPPONENT_MENU_LOCATIONS_V10[OPPONENT.current_value()]
+        : INGO_OPPONENT_MENU_LOCATIONS_V12[OPPONENT.current_value()];
+
+    // Choose which opponent
+    if (menu_location.page < 0){
+        throw UserSetupError(env.console, "Opponent doesn't exist in this version of the game.");
+    }
+
+    //  Move to page.
+    for (int8_t c = 0; c < menu_location.page; c++){
+        pbf_press_dpad(context, DPAD_UP, 80ms, 480ms);
+        pbf_press_dpad(context, DPAD_UP, 80ms, 480ms);
+        pbf_press_button(context, BUTTON_A, 80ms, 800ms);
+    }
+
+    //  Move to slot.
+    for (int8_t c = 0; c < menu_location.index; c++){
+        pbf_press_dpad(context, DPAD_DOWN, 80ms, 480ms);
+    }
+
+    // Press the button to select the opponent
+    pbf_press_button(context, BUTTON_A, 80ms, 920ms);
+    pbf_wait(context, 1000ms);
+    context.wait_for_all_requests();
+
+    env.log("Finish selecting the opponent. Battle should start now.");
+
+    // Which move (0, 1, 2 or 3) to use in next turn.
+    size_t cur_move = 0;
+    // The battle-order index of the current pokemon on the battle field.
+    // This index starts at 0. Whenever a new pokemon is sent to battle, the index adds by 1.
+    // It is equal to how many pokemon have left the battle.
+    // Note: battle order is different than party order, which is the order of the pokemon in the party.
+    // When the player selects a pokemon in the lower right corner of the screen in the overworld using "L"
+    // and "R" buttons, this pokemon will be sent to the battle first, with battle-order index of 0. But this
+    // pokemon can be in any place in the party list, therefore can have any party-order index.
+    size_t cur_pokemon = 0;
+    // How many turns have passed for the current pokemon in this battle.
+    // This turn count is reset to zero when a new pokemon is sent to battle.
+    size_t num_turns = 0;
+    // Used to skip fainted pokemon in the party when switching a pokemon
+    // This is the party-order index of the pokemon to switch to.
+    // The index is the index in the pokemon party list.
+    size_t next_pokemon_to_switch_to = 0;
+
+    // Whether this is the last battle. After the last battle ends, stops the program.
+    bool last_battle = false;
+
+    // Switch pokemon and update the battle states:
+    auto switch_cur_pokemon = [&](){
+        cur_move = 0;
+        num_turns = 0;
+        next_pokemon_to_switch_to = switch_pokemon(env.console, context, next_pokemon_to_switch_to);
+        next_pokemon_to_switch_to++;
+        cur_pokemon++;
+    };
+
+    while(true){
+        const bool stop_on_detected = true;
+        BattleMenuDetector battle_menu_detector(env.console, env.console, stop_on_detected);
+        // dialogue ellipse appears on a semi-transparent dialog box if you win the fight.
+        DialogueEllipseDetector dialogue_ellipse_detector(env.console, env.console, std::chrono::milliseconds(200), stop_on_detected);
+        BattlePokemonSwitchDetector pokemon_switch_detector(env.console, env.console, stop_on_detected);
+        // normal dialogue appears if you lose the fight.
+        NormalDialogDetector normal_dialogue_detector(env.console, env.console, stop_on_detected);
+        ArcPhoneDetector arc_phone_detector(env.console, env.console, std::chrono::milliseconds(200), stop_on_detected);
+        int ret = wait_until(
+            env.console, context, std::chrono::minutes(2),
+            {
+                {battle_menu_detector},
+                {dialogue_ellipse_detector},
+                {normal_dialogue_detector},
+                {pokemon_switch_detector},
+                {arc_phone_detector},
+            }
+        );
+        if (ret < 0){
+            env.console.log("Error: Failed to find battle menu after 2 minutes.");
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "Failed to find battle menu after 2 minutes.",
+                env.console
+            );
+        }
+
+        if (ret == 0){
+            env.console.log("Our turn!", COLOR_BLUE);
+            stats.turns++;
+
+            // User may want to switch the pokemon after some turns, to get more exp, or prevent if from
+            // fainting.
+            if (POKEMON_ACTIONS.switch_pokemon(cur_pokemon, num_turns)){
+                env.console.log("Switch pokemon");
+
+                // Go to the switching pokemon screen:
+                pbf_press_dpad(context, DPAD_DOWN, 160ms, 800ms);
+
+                switch_cur_pokemon();
+            }else{
+                // Choose move to use!
+                if (cur_pokemon == 0){
+                    // We collect the stat of move attempts of the first pokemon.
+                    stats.lead_move_attempts++;
+                }
+
+                // Press A to select moves
+                pbf_press_button(context, BUTTON_A, 80ms, 1000ms);
+                context.wait_for_all_requests();
+
+                // Use move. 
+                // Use while loop to go to next move if the current move has no PP.
+                // No PP is detected by checking whether the pixels on the selected move menu item is still the same
+                // after about one second.
+                // Note: if the pokemon has no PP on any moves and results to Struggle, the fight animation should
+                // ensure we won't get the same pixels on the area that the move menu item would appear, so we won't
+                // get stuck in this while loop.
+                MoveStyle style = POKEMON_ACTIONS.get_style(cur_pokemon, cur_move);
+                const bool check_move_success = true;
+                while (use_move(env.console, context, cur_pokemon, cur_move, style, check_move_success) == false){
+                    // We are still on the move selection screen. No PP.
+                    if (cur_move == 3){
+                        // Pokemon has zero PP on all moves. This should not happen as it will just use
+                        // Struggle.
+                        env.console.log("No PP on all moves. Abort program.", COLOR_RED);
+                        OperationFailedExceptionWithScreenshot::fire(
+                            ErrorReportMode::SEND_ERROR_REPORT,
+                            "No PP on all moves.",
+                            env.console
+                        );
+                    }
+                    
+                    // Go to the next move.
+                    pbf_press_dpad(context, DPAD_DOWN, 160ms, 800ms);
+                    // env.console.context().wait_for_all_requests();
+                    cur_move++;
+                    env.console.log("No PP. Use next move, " + std::to_string(cur_move), COLOR_RED);
+                    
+                    style = POKEMON_ACTIONS.get_style(cur_pokemon, cur_move);
+                }
+
+                num_turns++;
+                pokemon_move_attempts[cur_pokemon]++;
+                // Check whether to stop battle
+                if (last_battle == false){
+                    last_battle = POKEMON_ACTIONS.stop_battle(cur_pokemon, pokemon_move_attempts[cur_pokemon]);
+                    if (last_battle){
+                        env.log("Target move attempts reached: " + std::to_string(pokemon_move_attempts[cur_pokemon]) +
+                            ". Stop program after this battle finishes.");
+                    }
+                }
+            }
+
+            env.update_stats();
+        }else if (ret == 1){
+            env.console.log("Transparent dialogue box.");
+            
+            pbf_press_button(context, BUTTON_B, 160ms, 800ms);
+            context.wait_for_all_requests();
+        }else if(ret == 2){
+            env.console.log("Normal dialogue box.");
+
+            pbf_press_button(context, BUTTON_B, 160ms, 800ms);
+            context.wait_for_all_requests();
+        }else if (ret == 3){
+            env.console.log("Pokemon fainted.", COLOR_RED);
+            stats.faint_switches++;
+            env.update_stats();
+
+            switch_cur_pokemon();
+        }else{ // ret is 4
+            env.console.log("Battle finished.");
+            break;
+        }
+    }
+
+    stats.battles++;
+    env.update_stats();
+
+    return last_battle;
+}
+
+
+
+void IngoBattleGrinder::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    IngoBattleGrinder_Descriptor::Stats& stats = env.current_stats<IngoBattleGrinder_Descriptor::Stats>();
+
+    //  Connect the controller.
+    require_player(env.console, context, BUTTON_LCLICK);
+
+    // {
+    //     // ImageRGB32 image("./scripts/LA_switch_pokemon_Kuro.png");
+    //     ImageRGB32 image("./PLA_test_data/ingoBattle/broken_dialogue_detector.png");
+    //     const bool stop_on_detected = true;
+    //     NormalDialogDetector detector(env.console, env.console, stop_on_detected);
+    //     bool detected = detector.process_frame(image, current_time());
+    //     std::cout << "detector " << detected << std::endl;
+    //     return;
+    // }
+
+    // pokemon index -> number of move attempts made so far
+    std::map<size_t, size_t> pokemon_move_attempts;
+
+    while (true){
+        env.update_stats();
+        send_program_status_notification(env, NOTIFICATION_STATUS);
+        try{
+            if (run_iteration(env, context, pokemon_move_attempts)){
+                break;
+            }
+        }catch (OperationFailedException&){
+            stats.errors++;
+            throw;
+        }
+    }
+
+    env.update_stats();
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+}
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Farming/PokemonLA_IngoBattleGrinder.h b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Farming/PokemonLA_IngoBattleGrinder.h
new file mode 100644
index 0000000000..6714f0c459
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Farming/PokemonLA_IngoBattleGrinder.h
@@ -0,0 +1,58 @@
+/*  Ingo Battle Grinder
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLA_IngoBattleGrinder_H
+#define PokemonAutomation_PokemonLA_IngoBattleGrinder_H
+
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "VideoGames/PokemonLA/Options/PokemonLA_IngoOpponent.h"
+#include "VideoGames/PokemonLA/Options/PokemonLA_BattlePokemonActionTable.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+
+
+
+
+class IngoBattleGrinder_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    IngoBattleGrinder_Descriptor();
+
+    class Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+class IngoBattleGrinder : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = IngoBattleGrinder_Descriptor;
+    IngoBattleGrinder();
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    bool run_iteration(SingleSwitchProgramEnvironment& env, ProControllerContext& context, std::map<size_t, size_t>& pokemon_move_attempts);
+
+    //  Returns true if version 1.0.
+    bool start_dialog(VideoStream& stream, ProControllerContext& context);
+
+private:
+    IngoOpponentOption OPPONENT;
+    BattlePokemonActionTable POKEMON_ACTIONS;
+
+    EventNotificationOption NOTIFICATION_STATUS;
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Farming/PokemonLA_IngoMoveGrinder.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Farming/PokemonLA_IngoMoveGrinder.cpp
new file mode 100644
index 0000000000..7d6a423f66
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Farming/PokemonLA_IngoMoveGrinder.cpp
@@ -0,0 +1,451 @@
+/*  Ingo Move Grinder
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/Tools/ErrorDumper.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattleMenuDetector.h"
+#include "VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattlePokemonSwitchDetector.h"
+#include "VideoGames/PokemonLA/Inference/Objects/PokemonLA_ButtonDetector.h"
+#include "VideoGames/PokemonLA/Inference/Objects/PokemonLA_DialogEllipseDetector.h"
+#include "VideoGames/PokemonLA/Inference/PokemonLA_DialogDetector.h"
+#include "VideoGames/PokemonLA/Programs/PokemonLA_BattleRoutines.h"
+#include "PokemonLA_IngoMoveGrinder.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+using namespace Pokemon;
+
+
+
+
+IngoMoveGrinder_Descriptor::IngoMoveGrinder_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonLA:IngoMoveGrinder",
+        STRING_POKEMON + " LA", "Ingo Move Grinder",
+        "Programs/PokemonLA/IngoMoveGrinder.html",
+        "Attend Ingo's battles to grind move related " + STRING_POKEDEX + " research tasks. "
+        "More effective than Ingo Battle Grinder for " + STRING_POKEDEX + " research tasks but less effective for everything else.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+class IngoMoveGrinder_Descriptor::Stats : public StatsTracker{
+public:
+    Stats()
+        : battles(m_stats["Battles"])
+        , turns(m_stats["Turns"])
+        , move_attempts(m_stats["Move Attempts"])
+        , faint_switches(m_stats["Faint Switches"])
+        , errors(m_stats["Errors"])
+    {
+        m_display_order.emplace_back("Battles");
+        m_display_order.emplace_back("Turns");
+        m_display_order.emplace_back("Move Attempts");
+        m_display_order.emplace_back("Faint Switches", HIDDEN_IF_ZERO);
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+    }
+
+    std::atomic<uint64_t>& battles;
+    std::atomic<uint64_t>& turns;
+    std::atomic<uint64_t>& move_attempts;
+    std::atomic<uint64_t>& faint_switches;
+    std::atomic<uint64_t>& errors;
+};
+std::unique_ptr<StatsTracker> IngoMoveGrinder_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+
+IngoMoveGrinder::IngoMoveGrinder()
+    : NOTIFICATION_STATUS("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_STATUS,
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+{
+    PA_ADD_OPTION(OPPONENT);
+    PA_ADD_OPTION(POKEMON_ACTIONS);
+
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+
+bool IngoMoveGrinder::start_dialog(VideoStream& stream, ProControllerContext& context){
+    // First press A to start talking with Ingo.
+    pbf_press_button(context, BUTTON_A, 160ms, 1200ms);
+    context.wait_for_all_requests();
+
+    {
+        ButtonDetector button0(
+            stream.logger(), stream.overlay(),
+            ButtonType::ButtonA,
+            {0.50, 0.408, 0.40, 0.042},
+            std::chrono::milliseconds(100),
+            true
+        );
+        ButtonDetector button1(
+            stream.logger(), stream.overlay(),
+            ButtonType::ButtonA,
+            {0.50, 0.450, 0.40, 0.042},
+            std::chrono::milliseconds(100),
+            true
+        );
+        ButtonDetector button2(
+            stream.logger(), stream.overlay(),
+            ButtonType::ButtonA,
+            {0.50, 0.492, 0.40, 0.042},
+            std::chrono::milliseconds(100),
+            true
+        );
+        int ret = run_until<ProControllerContext>(
+            stream, context,
+            [&](ProControllerContext& context){
+                for (size_t c = 0; c < 10; c++){
+                    pbf_press_button(context, BUTTON_A, 160ms, 1200ms);
+                }
+            },
+            {
+                {button0},
+                {button1},
+                {button2},
+            }
+        );
+        switch (ret){
+        case 0:
+            //  Version 1.1 without new options unlocked.
+            return false;
+        case 1:
+            //  Version 1.0
+            return true;
+        case 2:
+            //  Version 1.1 with new options unlocked.
+            break;
+        default:
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "Unable to detect options after 10 A presses.",
+                stream
+            );
+        }
+    }
+
+    pbf_press_button(context, BUTTON_A, 160ms, 1200ms);
+    context.wait_for_all_requests();
+
+    ButtonDetector button2(
+        stream.logger(), stream.overlay(),
+        ButtonType::ButtonA,
+        {0.50, 0.350, 0.40, 0.400},
+        std::chrono::milliseconds(100),
+        true
+    );
+    int ret = run_until<ProControllerContext>(
+        stream, context,
+        [&](ProControllerContext& context){
+            for (size_t c = 0; c < 5; c++){
+                pbf_press_button(context, BUTTON_A, 160ms, 1200ms);
+            }
+        },
+        {{button2}}
+    );
+    switch (ret){
+    case 0:
+        return false;
+    default:
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "Unable to find opponent list options after 5 A presses.",
+            stream
+        );
+    }
+}
+
+bool IngoMoveGrinder::run_iteration(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    IngoMoveGrinder_Descriptor::Stats& stats = env.current_stats<IngoMoveGrinder_Descriptor::Stats>();
+
+    env.console.log("Starting battle...");
+
+    cur_pokemon = 0;
+    cur_move = 0;
+
+    // Talk to Ingo to start conversation and select regular battles:
+    // The dialogues are different between version 10 (the vanilla version) and later versions.
+    bool version_10 = start_dialog(env.console, context);
+    env.log(std::string("Detected current version: ") + (version_10 ? "1.0" : "1.2"));
+
+    IngoOpponentMenuLocation menu_location = version_10
+        ? INGO_OPPONENT_MENU_LOCATIONS_V10[OPPONENT.current_value()]
+        : INGO_OPPONENT_MENU_LOCATIONS_V12[OPPONENT.current_value()];
+
+    // Choose which opponent
+    if (menu_location.page < 0){
+        throw UserSetupError(env.console, "Opponent doesn't exist in this version of the game.");
+    }
+
+    //  Move to page.
+    for (int8_t c = 0; c < menu_location.page; c++){
+        pbf_press_dpad(context, DPAD_UP, 80ms, 480ms);
+        pbf_press_dpad(context, DPAD_UP, 80ms, 480ms);
+        pbf_press_button(context, BUTTON_A, 80ms, 800ms);
+    }
+
+    //  Move to slot.
+    for (int8_t c = 0; c < menu_location.index; c++){
+        pbf_press_dpad(context, DPAD_DOWN, 80ms, 480ms);
+    }
+
+    // Press the button to select the opponent
+    pbf_press_button(context, BUTTON_A, 80ms, 920ms);
+    pbf_wait(context, 1000ms);
+    context.wait_for_all_requests();
+
+    env.log("Finish selecting the opponent. Battle should start now.");
+
+    while(true){
+        const bool stop_on_detected = true;
+        BattleMenuDetector battle_menu_detector(env.console, env.console, stop_on_detected);
+        // dialogue ellipse appears on a semi-transparent dialog box if you win the fight.
+        DialogueEllipseDetector dialogue_ellipse_detector(env.console, env.console, std::chrono::milliseconds(200), stop_on_detected);
+        BattlePokemonSwitchDetector pokemon_switch_detector(env.console, env.console, stop_on_detected);
+        // normal dialogue appears if you lose the fight.
+        NormalDialogDetector normal_dialogue_detector(env.console, env.console, stop_on_detected);
+        ArcPhoneDetector arc_phone_detector(env.console, env.console, std::chrono::milliseconds(200), stop_on_detected);
+        int ret = wait_until(
+            env.console, context, std::chrono::minutes(2),
+            {
+                {battle_menu_detector},
+                {dialogue_ellipse_detector},
+                {normal_dialogue_detector},
+                {pokemon_switch_detector},
+                {arc_phone_detector},
+            }
+        );
+        if (ret < 0){
+            env.console.log("Error: Failed to find battle menu after 2 minutes.");
+//            auto snapshot = env.console.video().snapshot();
+//            dump_image(env.logger(), env.program_info(), "BattleMenuNotFound", snapshot);
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "Failed to find battle menu after 2 minutes.",
+                env.console
+            );
+        }
+
+        if (ret == 0){
+            env.console.log("Our turn!", COLOR_BLUE);
+
+            Move move = POKEMON_ACTIONS.get_move(cur_pokemon, cur_move);
+            if (move_issued[cur_pokemon][cur_move] < move.attempts){
+                // Press A to select moves
+                pbf_press_button(context, BUTTON_A, 80ms, 1000ms);
+                context.wait_for_all_requests();
+                const bool check_move_success = true;
+                if (use_move(env.console, context, cur_pokemon, cur_move, move.style, check_move_success)){
+                    stats.turns++;
+                    if (cur_pokemon < 4)
+                    {
+                        stats.move_attempts++;
+                        move_issued[cur_pokemon][cur_move]++;
+                        env.console.log("Successfully attempted a new move " + debug_current_info() + debug_move_attempts_info());
+                    }
+                    context.wait_for_all_requests();
+                }else{
+                    pbf_press_button(context, BUTTON_B, 160ms, 2000ms);
+                    env.console.log("No PP left for pokemon " + std::to_string(cur_pokemon) + " and move " + std::to_string(cur_move));
+                    if (get_next_move_to_switch_to() == 4){
+                        // Press down to select pokemons
+                        pbf_press_dpad(context, DPAD_DOWN, 160ms, 800ms);
+                        go_to_next_pokemon(env, context);
+
+                    }else
+{
+                        go_to_next_move(env, context);
+                    }
+                }
+            }else{
+                env.console.log("Done grinding for pokemon " + std::to_string(cur_pokemon) + " and move " + std::to_string(cur_move));
+                if (get_next_move_to_switch_to() == 4){
+                    // Press down to select pokemons
+                    pbf_press_dpad(context, DPAD_DOWN, 160ms, 800ms);
+                    go_to_next_pokemon(env, context);
+
+                }else{
+                    go_to_next_move(env, context);
+                }
+            }
+
+            env.update_stats();
+        }else if (ret == 1){
+            env.console.log("Transparent dialogue box.");
+            
+            pbf_press_button(context, BUTTON_B, 160ms, 800ms);
+            context.wait_for_all_requests();
+        }else if(ret == 2){
+            env.console.log("Normal dialogue box.");
+
+            pbf_press_button(context, BUTTON_B, 160ms, 800ms);
+            context.wait_for_all_requests();
+        }else if (ret == 3){
+            env.console.log("Pokemon fainted.", COLOR_RED);
+            stats.faint_switches++;
+            env.update_stats();
+
+            go_to_next_pokemon(env, context);
+        }else{ // ret is 4
+            env.console.log("Battle finished.");
+            break;
+        }
+    }
+
+    stats.battles++;
+    env.update_stats();
+    for (size_t i = 0; i < 4; ++i)
+    {
+        for (size_t j = 0; j < 4; ++j)
+        {
+            if (move_issued[i][j] < POKEMON_ACTIONS.get_move(i, j).attempts)
+            {
+                env.console.log("Grinding will continue." + debug_move_attempts_info());
+                return false;
+            }
+        }
+    }
+    env.console.log("Grinding will stop." + debug_move_attempts_info());
+    return true;
+}
+
+
+
+void IngoMoveGrinder::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    IngoMoveGrinder_Descriptor::Stats& stats = env.current_stats<IngoMoveGrinder_Descriptor::Stats>();
+
+    //  Connect the controller.
+    require_player(env.console, context, BUTTON_LCLICK);
+
+    for (auto& row : move_issued)
+    {
+        for (auto& elem : row)
+        {
+            elem = 0;
+        }
+    }
+
+    while (true){
+        env.update_stats();
+        send_program_status_notification(env, NOTIFICATION_STATUS);
+        try{
+            if (run_iteration(env, context)){
+                break;
+            }
+        }catch (OperationFailedException&){
+            stats.errors++;
+            throw;
+        }
+    }
+
+    env.update_stats();
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+}
+
+void IngoMoveGrinder::go_to_next_move(SingleSwitchProgramEnvironment& env, ProControllerContext& context)
+{
+    env.console.log("Switch to next move " + debug_current_info() + debug_move_attempts_info());
+    pbf_press_button(context, BUTTON_A, 80ms, 1000ms);
+    size_t next_move = get_next_move_to_switch_to();
+    for (size_t i = 0; i < next_move - cur_move; ++i)
+    {
+        pbf_press_dpad(context, DPAD_DOWN, 160ms, 800ms);
+    }
+    pbf_press_button(context, BUTTON_B, 80ms, 1000ms);
+    cur_move = next_move;
+    env.console.log("Switched to next move " + debug_current_info() + debug_move_attempts_info());
+    context.wait_for_all_requests();
+}
+
+void IngoMoveGrinder::go_to_next_pokemon(SingleSwitchProgramEnvironment& env, ProControllerContext& context)
+{
+    if (cur_pokemon == 4){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "Abort program. Your 4 first pokemons are done grinding moves, dead or without PP. "
+            "Your fifth pokemon (Arceus) died so no other choice than stopping the program.",
+            env.console
+        );
+    }
+    env.console.log("Switch to next pokemon " + debug_current_info() + debug_move_attempts_info());
+    cur_pokemon = get_next_pokemon_to_switch_to();
+    cur_move = 0;
+    switch_pokemon(env.console, context, cur_pokemon);
+    env.console.log("Switched to next pokemon " + debug_current_info() + debug_move_attempts_info());
+    context.wait_for_all_requests();
+}
+
+size_t IngoMoveGrinder::get_next_move_to_switch_to() const
+{
+    for (size_t i = cur_move + 1; i < 4; ++i)
+    {
+        if (move_issued[cur_pokemon][i] < POKEMON_ACTIONS.get_move(cur_pokemon, i).attempts)
+        {
+            return i;
+        }
+    }
+    // Means switch to next pokemon
+    return 4;
+}
+
+size_t IngoMoveGrinder::get_next_pokemon_to_switch_to() const
+{
+    for (size_t i = cur_pokemon + 1; i < 4; ++i)
+    {
+        for (size_t j = 0; j < 4; ++j)
+        {
+            if (move_issued[i][j] < POKEMON_ACTIONS.get_move(i, j).attempts)
+            {
+                return i;
+            }
+        }
+    }
+    // Means switch to arceus and spam moves to end the battle
+    return 4;
+}
+
+std::string IngoMoveGrinder::debug_current_info() const
+{
+    return "(cur_pokemon : " + std::to_string(cur_pokemon) + ", cur_move : " + std::to_string(cur_move) + ")";
+}
+
+std::string IngoMoveGrinder::debug_move_attempts_info() const
+{
+    std::string debug = "\n";
+    for (size_t i = 0; i < 4; ++i){
+        for (size_t j = 0; j < 4; ++j){
+            Move move = POKEMON_ACTIONS.get_move(i, j);
+            if (move.attempts != 0)
+            {
+                debug += "(pokemon : " + std::to_string(i) + ", move : " + std::to_string(j) + " did " + std::to_string(move_issued[i][j]) + " out of " + std::to_string(move.attempts) + ")\n";
+            }
+        }
+    }
+    return debug;
+}
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Farming/PokemonLA_IngoMoveGrinder.h b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Farming/PokemonLA_IngoMoveGrinder.h
new file mode 100644
index 0000000000..83a7fc5b99
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Farming/PokemonLA_IngoMoveGrinder.h
@@ -0,0 +1,68 @@
+/*  Ingo Move Grinder
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLA_IngoMoveGrinder_H
+#define PokemonAutomation_PokemonLA_IngoMoveGrinder_H
+
+#include <array>
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "VideoGames/PokemonLA/Options/PokemonLA_IngoOpponent.h"
+#include "VideoGames/PokemonLA/Options/PokemonLA_BattlePokemonActionTable.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+
+
+class IngoMoveGrinder_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    IngoMoveGrinder_Descriptor();
+
+    class Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+class IngoMoveGrinder : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = IngoMoveGrinder_Descriptor;
+    IngoMoveGrinder();
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    bool run_iteration(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+
+    //  Returns true if version 1.0.
+    bool start_dialog(VideoStream& stream, ProControllerContext& context);
+
+private:
+    void go_to_next_move(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+    void go_to_next_pokemon(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+    size_t get_next_move_to_switch_to() const;
+    size_t get_next_pokemon_to_switch_to() const;
+    std::string debug_current_info() const;
+    std::string debug_move_attempts_info() const;
+
+    IngoOpponentOption OPPONENT;
+    MoveGrinderActionTable POKEMON_ACTIONS;
+
+    EventNotificationOption NOTIFICATION_STATUS;
+    EventNotificationsOption NOTIFICATIONS;
+
+    size_t cur_pokemon = 0;
+    size_t cur_move = 0;
+    std::array<std::array<uint16_t, 4>, 5> move_issued{};
+};
+
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Farming/PokemonLA_LeapGrinder.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Farming/PokemonLA_LeapGrinder.cpp
new file mode 100644
index 0000000000..82e030ae77
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Farming/PokemonLA_LeapGrinder.cpp
@@ -0,0 +1,335 @@
+/*  Leap Grinder
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/PrettyPrint.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "Pokemon/Pokemon_Notification.h"
+#include "Pokemon/Inference/Pokemon_NameReader.h"
+#include "VideoGames/PokemonLA/PokemonLA_Settings.h"
+#include "VideoGames/PokemonLA/Resources/PokemonLA_NameDatabase.h"
+#include "VideoGames/PokemonLA/Inference/Sounds/PokemonLA_ShinySoundDetector.h"
+#include "VideoGames/PokemonLA/Inference/PokemonLA_OverworldDetector.h"
+#include "VideoGames/PokemonLA/Programs/PokemonLA_GameEntry.h"
+#include "VideoGames/PokemonLA/Programs/PokemonLA_LeapPokemonActions.h"
+#include "VideoGames/PokemonLA/Programs/Farming/PokemonLA_LeapGrinder.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+    using namespace Pokemon;
+
+
+LeapGrinder_Descriptor::LeapGrinder_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonLA:Leap Grinder",
+        STRING_POKEMON + " LA", "Leap Grinder",
+        "Programs/PokemonLA/LeapGrinder.html",
+        "Shake trees and ores to grind tasks",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::VIDEO_AUDIO,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+class LeapGrinder_Descriptor::Stats : public StatsTracker{
+public:
+    Stats()
+        : attempts(m_stats["Attempts"])
+        , errors(m_stats["Errors"])
+        , leaps(m_stats["Leaps"])
+        , found(m_stats["Found"])
+        , enroute_shinies(m_stats["Enroute Shinies"])
+        , leap_alphas(m_stats["Leap Alphas"])
+        , leap_shinies(m_stats["Leap Shinies"])
+    {
+        m_display_order.emplace_back("Attempts");
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+        m_display_order.emplace_back("Leaps");
+        m_display_order.emplace_back("Found");
+        m_display_order.emplace_back("Enroute Shinies");
+        m_display_order.emplace_back("Leap Alphas");
+        m_display_order.emplace_back("Leap Shinies");
+        m_aliases["Shinies"] = "Enroute Shinies";
+        m_aliases["Alphas"] = "Leap Alphas";
+    }
+
+    std::atomic<uint64_t>& attempts;
+    std::atomic<uint64_t>& errors;
+    std::atomic<uint64_t>& leaps;
+    std::atomic<uint64_t>& found;
+    std::atomic<uint64_t>& enroute_shinies;
+    std::atomic<uint64_t>& leap_alphas;
+    std::atomic<uint64_t>& leap_shinies;
+};
+std::unique_ptr<StatsTracker> LeapGrinder_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+
+LeapGrinder::LeapGrinder()
+    : LANGUAGE(
+        "<b>Game Language</b>",
+        Pokemon::PokemonNameReader::instance().languages(),
+        LockMode::LOCK_WHILE_RUNNING,
+        true
+    )
+    , POKEMON_DATABASE(make_name_database({
+        "aipom",
+        "burmy",
+        "cherrim",
+        "cherubi",
+        "combee",
+        "heracross",
+        "pachirisu",
+        "vespiquen",
+        "wormadam",
+        "geodude",
+        "graveler",
+        "bonsly",
+        "bronzor",
+        "nosepass",
+        "bergmite",
+    }))
+    , POKEMON(
+        "<b>Pokemon Species</b>",
+        POKEMON_DATABASE,
+        LockMode::UNLOCK_WHILE_RUNNING,
+        "cherubi"
+    )
+    , LEAPS(
+        "<b>Leaps</b> <br>How many leaps before stopping the program</br>",
+        LockMode::LOCK_WHILE_RUNNING,
+        1, 1, 100
+    )
+    , SHINY_DETECTED_ENROUTE(
+        "Enroute Shiny Action",
+        "This applies if a shiny is detected while traveling in the overworld.",
+        "0 ms"
+    )
+    , FOUND_SHINY_OR_ALPHA(
+        "Found Shiny or Alpha",
+        true, true,
+        ImageAttachmentMode::JPG,
+        {"Notifs", "Showcase"}
+    )
+    , MATCH_DETECTED_OPTIONS(
+        "Match Action",
+        "What to do when the leaping " + Pokemon::STRING_POKEMON + " matches the \"Stop On\" parameter.",
+        "Found Shiny or Alpha"
+    )
+    , NOTIFICATION_STATUS("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_STATUS,
+        &SHINY_DETECTED_ENROUTE.NOTIFICATIONS,
+        &FOUND_SHINY_OR_ALPHA,
+        &MATCH_DETECTED_OPTIONS.NOTIFICATIONS,
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_RECOVERABLE,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+{
+    PA_ADD_OPTION(LANGUAGE);
+    PA_ADD_OPTION(POKEMON);
+    PA_ADD_OPTION(LEAPS);
+    PA_ADD_OPTION(STOP_ON);
+    PA_ADD_OPTION(EXIT_METHOD);
+    PA_ADD_OPTION(SHINY_DETECTED_ENROUTE);
+    PA_ADD_OPTION(MATCH_DETECTED_OPTIONS);
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+
+bool LeapGrinder::run_iteration(
+    SingleSwitchProgramEnvironment& env, ProControllerContext& context,
+    bool fresh_from_reset
+){
+
+    LeapGrinder_Descriptor::Stats& stats = env.current_stats<LeapGrinder_Descriptor::Stats>();
+    stats.attempts++;
+
+    env.console.log("Starting route and shiny detection...");
+
+    for (size_t c = 0; true; c++){
+        context.wait_for_all_requests();
+        if (is_pokemon_selection(env.console, env.console.video().snapshot())){
+            break;
+        }
+        if (c >= 5){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "Failed to switch to Pokemon selection after 5 attempts.",
+                env.console
+            );
+        }
+        env.console.log("Not on Pokemon selection. Attempting to switch to it...", COLOR_ORANGE);
+        pbf_press_button(context, BUTTON_X, 160ms, 1840ms);
+    }
+
+    float shiny_coefficient = 1.0;
+    ShinySoundDetector shiny_detector(env.console, [&](float error_coefficient) -> bool{
+        //  Warning: This callback will be run from a different thread than this function.
+        stats.enroute_shinies++;
+        shiny_coefficient = error_coefficient;
+        return on_shiny_callback(env, env.console, SHINY_DETECTED_ENROUTE, error_coefficient);
+    });
+
+    int ret = run_until<ProControllerContext>(
+        env.console, context,
+        [&](ProControllerContext& context){
+            route(env, env.console, context, (LeapPokemon)POKEMON.index(), fresh_from_reset);
+        },
+        {{shiny_detector}}
+    );
+    shiny_detector.throw_if_no_sound();
+    if (ret == 0){
+        on_shiny_sound(env, env.console, context, SHINY_DETECTED_ENROUTE, shiny_coefficient);
+    }
+
+    env.console.log("End of route and shiny detection...");
+
+    bool battle_found = check_tree_or_ore_for_battle(env.console, context);
+
+    context.wait_for_all_requests();
+
+    if (battle_found){
+        env.console.log("Pokemon leaped!");
+        stats.leaps++;
+
+        PokemonDetails pokemon = get_pokemon_details(env.console, context, LANGUAGE);
+        pbf_press_button(context, BUTTON_B, 160ms, 1800ms);
+        context.wait_for_all_requests();
+
+        env.console.log("Looking for: " + POKEMON.slug());
+        env.console.log("Found: " + set_to_str(pokemon.name_candidates));
+        env.console.log("Gender: " + std::string(get_gender_str(pokemon.gender)));
+        env.console.log("Alpha: " + std::string(pokemon.is_alpha ? "Yes" : "No"));
+        env.console.log("Shiny: " + std::string(pokemon.is_shiny ? "Yes" : "No"));
+
+        if (pokemon.name_candidates.find(POKEMON.slug()) != pokemon.name_candidates.end()){
+            env.console.log("Expected Pokemon leaped!");
+            stats.found++;
+        }else{
+            env.console.log("Not the expected pokemon.");
+        }
+
+        //  Match validation
+
+        if (pokemon.is_alpha && pokemon.is_shiny){
+            env.console.log("Found Shiny Alpha!");
+            stats.leap_shinies++;
+            stats.leap_alphas++;
+        }else if (pokemon.is_alpha){
+            env.console.log("Found Alpha!");
+            stats.leap_alphas++;
+        }else if (pokemon.is_shiny){
+            env.console.log("Found Shiny!");
+            stats.leap_shinies++;
+        }else{
+            env.console.log("Normie in the tree -_-");
+        }
+        env.update_stats();
+
+        bool is_match = false;
+        switch (STOP_ON){
+        case StopOn::Shiny:
+            is_match = pokemon.is_shiny;
+            break;
+        case StopOn::Alpha:
+            is_match = pokemon.is_alpha;
+            break;
+        case StopOn::ShinyOrAlpha:
+            is_match = pokemon.is_alpha || pokemon.is_shiny;
+            break;
+        case StopOn::ShinyAndAlpha:
+            is_match = pokemon.is_alpha && pokemon.is_shiny;
+            break;
+        }
+
+        bool notification_sent = false;
+        do{
+            std::string str;
+            if (pokemon.is_shiny){
+                if (pokemon.is_alpha){
+                    str = "Found Shiny Alpha!";
+                }else{
+                    str = "Found Shiny!";
+                }
+            }else{
+                if (pokemon.is_alpha){
+                    str = "Found Alpha!";
+                }else{
+                    break;
+                }
+            }
+            notification_sent |= send_program_notification(
+                env, FOUND_SHINY_OR_ALPHA,
+                Pokemon::COLOR_STAR_SHINY,
+                std::move(str),
+                {}, "",
+                env.console.video().snapshot(), true
+            );
+        }while (false);
+
+        if (is_match){
+            on_battle_match_found(env, env.console, context, MATCH_DETECTED_OPTIONS, !notification_sent);
+        }
+
+        exit_battle(env.console, context, EXIT_METHOD);
+    }
+
+    env.console.log("Remaining Leaps:" + std::to_string(LEAPS - stats.leaps));
+
+    return_to_jubilife(env, env.console, context, (LeapPokemon)POKEMON.index());
+
+    if (stats.leaps == LEAPS){
+        return true;
+    }
+
+    return false;
+}
+
+void LeapGrinder::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    LeapGrinder_Descriptor::Stats& stats = env.current_stats<LeapGrinder_Descriptor::Stats>();
+
+    //  Connect the controller.
+    require_player(env.console, context, BUTTON_LCLICK);
+
+    bool fresh_from_reset = false;
+    while (true){
+        env.update_stats();
+        send_program_status_notification(env, NOTIFICATION_STATUS);
+        try{
+            if(run_iteration(env, context, fresh_from_reset)){
+                break;
+            }
+        }catch (OperationFailedExceptionWithScreenshot& e){
+            stats.errors++;
+            e.send_recoverable_error_notif_and_telemetry_report(env, NOTIFICATION_ERROR_RECOVERABLE);
+
+            pbf_press_button(context, BUTTON_HOME, 160ms, GameSettings::instance().GAME_TO_HOME_DELAY0);
+            fresh_from_reset = reset_game_from_home(env, env.console, context);
+            // Switch from items to pokemons
+            pbf_press_button(context, BUTTON_X, 160ms, 240ms);
+        }
+    }
+
+    env.update_stats();
+    pbf_press_button(context, BUTTON_HOME, 160ms, GameSettings::instance().GAME_TO_HOME_DELAY0);
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Farming/PokemonLA_LeapGrinder.h b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Farming/PokemonLA_LeapGrinder.h
new file mode 100644
index 0000000000..6c9b8df703
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Farming/PokemonLA_LeapGrinder.h
@@ -0,0 +1,70 @@
+/*  Tree Leap Grinder
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLA_LeapGrinder_H
+#define PokemonAutomation_PokemonLA_LeapGrinder_H
+
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "CommonTools/Options/StringSelectOption.h"
+#include "CommonTools/Options/LanguageOCROption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "VideoGames/PokemonLA/Options/PokemonLA_MiscOptions.h"
+#include "VideoGames/PokemonLA/Options/PokemonLA_ShinyDetectedAction.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+class LeapGrinder_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    LeapGrinder_Descriptor();
+
+    class Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+class LeapGrinder : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = LeapGrinder_Descriptor;
+    LeapGrinder();
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    bool run_iteration(
+        SingleSwitchProgramEnvironment& env, ProControllerContext& context,
+        bool fresh_from_reset
+    );
+    bool quick_check(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+
+private:
+    class RunRoute;
+
+    OCR::LanguageOCROption LANGUAGE;
+
+    StringSelectDatabase POKEMON_DATABASE;
+    StringSelectOption POKEMON;
+
+    SimpleIntegerOption<uint8_t> LEAPS;
+    StopOnOption STOP_ON;
+    ExitBattleMethodOption EXIT_METHOD;
+
+    OverworldShinyDetectedActionOption SHINY_DETECTED_ENROUTE;
+    EventNotificationOption FOUND_SHINY_OR_ALPHA;
+    BattleMatchActionOption MATCH_DETECTED_OPTIONS;
+
+    EventNotificationOption NOTIFICATION_STATUS;
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/PokemonLA/Programs/Farming/PokemonLA_MagikarpMoveGrinder.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Farming/PokemonLA_MagikarpMoveGrinder.cpp
similarity index 75%
rename from SerialPrograms/Source/PokemonLA/Programs/Farming/PokemonLA_MagikarpMoveGrinder.cpp
rename to SerialPrograms/Source/VideoGames/PokemonLA/Programs/Farming/PokemonLA_MagikarpMoveGrinder.cpp
index ae3fdd40b3..2b5161ad5d 100644
--- a/SerialPrograms/Source/PokemonLA/Programs/Farming/PokemonLA_MagikarpMoveGrinder.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Farming/PokemonLA_MagikarpMoveGrinder.cpp
@@ -1,25 +1,22 @@
 /*  Ingo Battle Grinder
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include <chrono>
-#include <iostream>
-#include "CommonFramework/Exceptions/OperationFailedException.h"
-#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
 #include "CommonFramework/Notifications/ProgramNotifications.h"
-#include "CommonFramework/Tools/ErrorDumper.h"
-#include "CommonFramework/Tools/StatsTracking.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonTools/Async/InferenceRoutines.h"
 #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
 #include "Pokemon/Pokemon_Strings.h"
-#include "PokemonLA/Inference/Battles/PokemonLA_BattleMenuDetector.h"
-#include "PokemonLA/Inference/Battles/PokemonLA_BattlePokemonSwitchDetector.h"
-#include "PokemonLA/Programs/PokemonLA_BattleRoutines.h"
+#include "VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattleMenuDetector.h"
+#include "VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattlePokemonSwitchDetector.h"
+#include "VideoGames/PokemonLA/Programs/PokemonLA_BattleRoutines.h"
+#include "VideoGames/PokemonLA/Inference/Objects/PokemonLA_ArcPhoneDetector.h"
 #include "PokemonLA_MagikarpMoveGrinder.h"
-#include "PokemonLA/Inference/Objects/PokemonLA_ArcPhoneDetector.h"
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
@@ -31,11 +28,12 @@ MagikarpMoveGrinder_Descriptor::MagikarpMoveGrinder_Descriptor()
     : SingleSwitchProgramDescriptor(
         "PokemonLA:MagikarpMoveGrinder",
         STRING_POKEMON + " LA", "Magikarp Move Grinder",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonLA/MagikarpMoveGrinder.md",
+        "Programs/PokemonLA/MagikarpMoveGrinder.html",
         "grind status moves with any style against a Magikarp to finish " + STRING_POKEDEX + " research tasks.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
         FeedbackType::REQUIRED,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
     )
 {}
 class MagikarpMoveGrinder_Descriptor::Stats : public StatsTracker{
@@ -47,7 +45,7 @@ class MagikarpMoveGrinder_Descriptor::Stats : public StatsTracker{
     {
         m_display_order.emplace_back("Magikarp");
         m_display_order.emplace_back("Move Attempts");
-        m_display_order.emplace_back("Errors", true);
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
     }
 
     std::atomic<uint64_t>& magikarp;
@@ -65,7 +63,7 @@ MagikarpMoveGrinder::MagikarpMoveGrinder()
         "<b>Special Case, Mimic:</b><br>Grind Mimic move usages by switching between first two " + STRING_POKEMON + ". Set the first move as Mimic on the first two " + STRING_POKEMON + ".<br>"
         "After switching, the retreated " + STRING_POKEMON + " will forget the move learned by Mimic, allowing efficient Mimic grinding.<br>"
         "Choosing this will ignore the content in " + STRING_POKEMON + " Action Table.",
-        LockWhileRunning::LOCKED,
+        LockMode::LOCK_WHILE_RUNNING,
         false
     )
     , NOTIFICATION_STATUS("Status Update", true, false, std::chrono::seconds(3600))
@@ -82,7 +80,7 @@ MagikarpMoveGrinder::MagikarpMoveGrinder()
 
 
 
-void MagikarpMoveGrinder::grind_mimic(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
+void MagikarpMoveGrinder::grind_mimic(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
     MagikarpMoveGrinder_Descriptor::Stats& stats = env.current_stats<MagikarpMoveGrinder_Descriptor::Stats>();
     env.log("Special case: grinding Mimic...");
 
@@ -106,11 +104,12 @@ void MagikarpMoveGrinder::grind_mimic(SingleSwitchProgramEnvironment& env, BotBa
         );
         if (ret < 0){
             env.console.log("Error: Failed to find battle menu after 2 minutes.");
-            dump_image(env.logger(), env.program_info(), "BattleMenuNotFound", env.console.video().snapshot());
-            throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, env.console,
+//            auto snapshot = env.console.video().snapshot();
+//            dump_image(env.logger(), env.program_info(), "BattleMenuNotFound", snapshot);
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
                 "Failed to find battle menu after 2 minutes.",
-                true
+                env.console
             );
         }
 
@@ -122,15 +121,14 @@ void MagikarpMoveGrinder::grind_mimic(SingleSwitchProgramEnvironment& env, BotBa
                 env.console.log("Switch Pokemon after Mimic used.", COLOR_RED);;
 
                 // Go to the switching pokemon screen:
-                pbf_press_dpad(context, DPAD_DOWN, 20, 100);
+                pbf_press_dpad(context, DPAD_DOWN, 160ms, 800ms);
                 
                 cur_pokemon = switch_pokemon(env.console, context, cur_pokemon);
 
                 to_switch_pokemon = false;
-            }
-            else{
+            }else{
                 // Press A to select moves
-                pbf_press_button(context, BUTTON_A, 10, 125);
+                pbf_press_button(context, BUTTON_A, 80ms, 1000ms);
                 context.wait_for_all_requests();
                 
                 const MoveStyle style = MoveStyle::NoStyle;
@@ -139,27 +137,24 @@ void MagikarpMoveGrinder::grind_mimic(SingleSwitchProgramEnvironment& env, BotBa
                     // Finish grinding.
                     env.log("No PP. Finish grinding.");
                     return;
-                }
-                else{
+                }else{
                     stats.move_attempts++;
                     env.update_stats();
 
                     to_switch_pokemon = true;
                 }
             }
-        }
-        else if (ret == 1){
+        }else if (ret == 1){
             env.log("Your pokemon fainted. Can only happen if Magikarp Struggled and defeated your pokemon.");
             return;
-        }
-        else{ // ret is 2
+        }else{ // ret is 2
             env.log("Battle finished.");
             return;
         }
     }
 }
 
-void MagikarpMoveGrinder::battle_magikarp(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
+void MagikarpMoveGrinder::battle_magikarp(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
     MagikarpMoveGrinder_Descriptor::Stats& stats = env.current_stats<MagikarpMoveGrinder_Descriptor::Stats>();
 
     // Which pokemon in the party is not fainted
@@ -180,11 +175,12 @@ void MagikarpMoveGrinder::battle_magikarp(SingleSwitchProgramEnvironment& env, B
         );
         if (ret < 0){
             env.console.log("Error: Failed to find battle menu after 2 minutes.");
-            dump_image(env.logger(), env.program_info(), "BattleMenuNotFound", env.console.video().snapshot());
-            throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, env.console,
+//            auto snapshot = env.console.video().snapshot();
+//            dump_image(env.logger(), env.program_info(), "BattleMenuNotFound", snapshot);
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
                 "Failed to find battle menu after 2 minutes.",
-                true
+                env.console
             );
         }
 
@@ -192,7 +188,7 @@ void MagikarpMoveGrinder::battle_magikarp(SingleSwitchProgramEnvironment& env, B
             env.console.log("Our turn!", COLOR_BLUE);
 
             // Press A to select moves
-            pbf_press_button(context, BUTTON_A, 10, 125);
+            pbf_press_button(context, BUTTON_A, 80ms, 1000ms);
             context.wait_for_all_requests();
             
             const MoveStyle style = POKEMON_ACTIONS.get_style(cur_pokemon);
@@ -208,19 +204,17 @@ void MagikarpMoveGrinder::battle_magikarp(SingleSwitchProgramEnvironment& env, B
                 env.console.log("No PP. Switch Pokemon.", COLOR_RED);
 
                 // Press B to leave move selection menu
-                pbf_press_button(context, BUTTON_B, 10, 125);
+                pbf_press_button(context, BUTTON_B, 80ms, 1000ms);
 
                 // Go to the switching pokemon screen:
-                pbf_press_dpad(context, DPAD_DOWN, 20, 100);
+                pbf_press_dpad(context, DPAD_DOWN, 160ms, 800ms);
                 
                 cur_pokemon = switch_pokemon(env.console, context, cur_pokemon, POKEMON_ACTIONS.num_pokemon());
-            }
-            else{
+            }else{
                 stats.move_attempts++;
                 env.update_stats();
             }
-        }
-        else if (ret == 1){
+        }else if (ret == 1){
             env.console.log("Pokemon fainted.");
             cur_pokemon++;
             if (cur_pokemon >= POKEMON_ACTIONS.num_pokemon()){
@@ -228,8 +222,7 @@ void MagikarpMoveGrinder::battle_magikarp(SingleSwitchProgramEnvironment& env, B
                 break;
             }
             cur_pokemon = switch_pokemon(env.console, context, cur_pokemon, POKEMON_ACTIONS.num_pokemon());
-        }
-        else{ // ret is 2
+        }else{ // ret is 2
             env.console.log("Battle finished.");
             break;
         }
@@ -238,15 +231,15 @@ void MagikarpMoveGrinder::battle_magikarp(SingleSwitchProgramEnvironment& env, B
 
 
 
-void MagikarpMoveGrinder::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
+void MagikarpMoveGrinder::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
     MagikarpMoveGrinder_Descriptor::Stats& stats = env.current_stats<MagikarpMoveGrinder_Descriptor::Stats>();
 
     if (POKEMON_ACTIONS.num_pokemon() == 0){
-        throw UserSetupError(env.console, "No Pokemon sepecified to grind.");
+        throw UserSetupError(env.console, "No Pokemon specified to grind.");
     }
 
     //  Connect the controller.
-    pbf_press_button(context, BUTTON_LCLICK, 5, 5);
+    require_player(env.console, context, BUTTON_LCLICK);
 
     env.update_stats();
     send_program_status_notification(env, NOTIFICATION_STATUS);
@@ -255,8 +248,7 @@ void MagikarpMoveGrinder::program(SingleSwitchProgramEnvironment& env, BotBaseCo
     try{
         if (SPECIAL_CASE_MIMIC){
             grind_mimic(env, context);
-        }
-        else{
+        }else{
             battle_magikarp(env, context);
         }
 
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Farming/PokemonLA_MagikarpMoveGrinder.h b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Farming/PokemonLA_MagikarpMoveGrinder.h
new file mode 100644
index 0000000000..4853b73142
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Farming/PokemonLA_MagikarpMoveGrinder.h
@@ -0,0 +1,56 @@
+/*  Magikarp Move Grinder
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  Battle a magikarp to grind move related research tasks.
+ */
+
+#ifndef PokemonAutomation_PokemonLA_MagikarpMoveGrinder_H
+#define PokemonAutomation_PokemonLA_MagikarpMoveGrinder_H
+
+#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "VideoGames/PokemonLA/Options/PokemonLA_BattlePokemonActionTable.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+
+class MagikarpMoveGrinder_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    MagikarpMoveGrinder_Descriptor();
+
+    class Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+class MagikarpMoveGrinder : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = MagikarpMoveGrinder_Descriptor;
+    MagikarpMoveGrinder();
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    void battle_magikarp(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+
+    void grind_mimic(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+
+private:
+    OneMoveBattlePokemonActionTable POKEMON_ACTIONS;
+
+    BooleanCheckBoxOption SPECIAL_CASE_MIMIC;
+
+    EventNotificationOption NOTIFICATION_STATUS;
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Farming/PokemonLA_NuggetFarmerHighlands.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Farming/PokemonLA_NuggetFarmerHighlands.cpp
new file mode 100644
index 0000000000..45165efca7
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Farming/PokemonLA_NuggetFarmerHighlands.cpp
@@ -0,0 +1,255 @@
+/*  Money Farmer (Highlands)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonLA/PokemonLA_Settings.h"
+#include "VideoGames/PokemonLA/PokemonLA_TravelLocations.h"
+#include "VideoGames/PokemonLA/Inference/PokemonLA_DialogDetector.h"
+#include "VideoGames/PokemonLA/Inference/Sounds/PokemonLA_ShinySoundDetector.h"
+#include "VideoGames/PokemonLA/Programs/PokemonLA_BattleRoutines.h"
+#include "VideoGames/PokemonLA/Programs/PokemonLA_GameEntry.h"
+#include "VideoGames/PokemonLA/Programs/PokemonLA_GameSave.h"
+#include "VideoGames/PokemonLA/Programs/PokemonLA_MountChange.h"
+#include "VideoGames/PokemonLA/Programs/PokemonLA_RegionNavigation.h"
+#include "PokemonLA_NuggetFarmerHighlands.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+    using namespace Pokemon;
+
+
+NuggetFarmerHighlands_Descriptor::NuggetFarmerHighlands_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonLA:NuggetFarmerHighlands",
+        STRING_POKEMON + " LA", "Nugget Farmer (Highlands)",
+        "Programs/PokemonLA/NuggetFarmerHighlands.html",
+        "Farm nuggets off the Miss Fortune sisters in the Coronet Highlands.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::VIDEO_AUDIO,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+class NuggetFarmerHighlands_Descriptor::Stats : public StatsTracker, public ShinyStatIncrementer{
+public:
+    Stats()
+        : attempts(m_stats["Attempts"])
+        , errors(m_stats["Errors"])
+        , charm(m_stats["Charm"])
+        , coin(m_stats["Coin"])
+        , shinies(m_stats["Shinies"])
+    {
+        m_display_order.emplace_back("Attempts");
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+        m_display_order.emplace_back("Charm", HIDDEN_IF_ZERO);
+        m_display_order.emplace_back("Coin", HIDDEN_IF_ZERO);
+        m_display_order.emplace_back("Shinies", HIDDEN_IF_ZERO);
+    }
+    virtual void add_shiny() override{
+        shinies++;
+    }
+
+    std::atomic<uint64_t>& attempts;
+    std::atomic<uint64_t>& errors;
+    std::atomic<uint64_t>& charm;
+    std::atomic<uint64_t>& coin;
+    std::atomic<uint64_t>& shinies;
+};
+std::unique_ptr<StatsTracker> NuggetFarmerHighlands_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+
+NuggetFarmerHighlands::NuggetFarmerHighlands()
+    : SHINY_DETECTED("Shiny Detected Action", "", "2000 ms")
+    , NOTIFICATION_STATUS("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_STATUS,
+        &SHINY_DETECTED.NOTIFICATIONS,
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_RECOVERABLE,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+{
+    PA_ADD_STATIC(SHINY_REQUIRES_AUDIO);
+    PA_ADD_OPTION(SHINY_DETECTED);
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+
+
+bool NuggetFarmerHighlands::run_iteration(
+    SingleSwitchProgramEnvironment& env, ProControllerContext& context,
+    bool fresh_from_reset
+){
+    NuggetFarmerHighlands_Descriptor::Stats& stats = env.current_stats<NuggetFarmerHighlands_Descriptor::Stats>();
+
+    //  Go to Coronet Highlands Mountain camp.
+    goto_camp_from_jubilife(
+        env, env.console, context,
+        TravelLocations::instance().Highlands_Mountain,
+        fresh_from_reset
+    );
+
+    stats.attempts++;
+
+    change_mount(env.console, context, MountState::WYRDEER_ON);
+
+
+    bool success = false;
+
+
+    env.console.log("Traveling to Charm's location...");
+    {
+        DialogSurpriseDetector dialog_detector(env.console, env.console, true);
+
+        float shiny_coefficient = 1.0;
+        ShinySoundDetector shiny_detector(env.console, [&](float error_coefficient) -> bool{
+            //  Warning: This callback will be run from a different thread than this function.
+            stats.shinies++;
+            shiny_coefficient = error_coefficient;
+            return on_shiny_callback(env, env.console, SHINY_DETECTED, error_coefficient);
+        });
+
+        int ret = run_until<ProControllerContext>(
+            env.console, context,
+            [](ProControllerContext& context){
+                pbf_move_left_joystick(context, {-1, -0.661}, 400ms, 0ms);
+                pbf_press_button(context, BUTTON_B, 3936ms, 640ms);
+
+                pbf_move_left_joystick(context, {+0.756, +1}, 400ms, 0ms);
+//                pbf_press_button(context, BUTTON_B, 350, 80);
+                pbf_press_button(context, BUTTON_B, 640ms, 0ms);
+                for (size_t c = 0; c < 7; c++){
+                    pbf_press_button(context, BUTTON_A | BUTTON_B, 40ms, 0ms);
+                    pbf_press_button(context, BUTTON_B, 40ms, 0ms);
+                }
+                pbf_press_button(context, BUTTON_B, 1600ms, 640ms);
+                pbf_wait(context, 640ms);
+
+                pbf_move_left_joystick(context, {-1, +0.5}, 400ms, 0ms);
+                pbf_press_button(context, BUTTON_B, 2000ms, 640ms);
+
+                pbf_move_left_joystick(context, {-1, +0.625}, 400ms, 0ms);
+                pbf_press_button(context, BUTTON_B, 2000ms, 0ms);
+
+                pbf_move_left_joystick(context, {-0.5, -1}, 400ms, 0ms);
+                pbf_press_button(context, BUTTON_B, 1200ms, 2000ms);
+
+            },
+            {
+                {dialog_detector},
+                {shiny_detector},
+            }
+        );
+        switch (ret){
+        case 0:
+            env.console.log("Found Charm!", COLOR_BLUE);
+            stats.charm++;
+            mash_A_until_end_of_battle(env.console, context);
+            env.console.log("Battle succeeded!", COLOR_BLUE);
+            success = true;
+            break;
+        case 1:
+            on_shiny_sound(env, env.console, context, SHINY_DETECTED, shiny_coefficient);
+            break;
+        }
+    }
+
+
+#if 0
+    env.console.log("Traveling to Coin's location...");
+    {
+
+    }
+#endif
+
+
+    env.console.log("Returning to Jubilife...");
+
+
+    {
+        float shiny_coefficient = 1.0;
+        ShinySoundDetector shiny_detector(env.console, [&](float error_coefficient) -> bool{
+            //  Warning: This callback will be run from a different thread than this function.
+            stats.shinies++;
+            shiny_coefficient = error_coefficient;
+            return on_shiny_callback(env, env.console, SHINY_DETECTED, error_coefficient);
+        });
+
+        int ret = run_until<ProControllerContext>(env.console, context,
+            [&env](ProControllerContext& context){
+                goto_camp_from_overworld(env, env.console, context);
+                goto_professor(env.console, context, Camp::HIGHLANDS_HIGHLANDS);
+            },
+            {{shiny_detector}}
+        );
+        shiny_detector.throw_if_no_sound();
+        if (ret == 0){
+            on_shiny_sound(env, env.console, context, SHINY_DETECTED, shiny_coefficient);
+        }
+    }
+
+
+    from_professor_return_to_jubilife(env, env.console, context);
+
+    if (success){
+        save_game_from_overworld(env, env.console, context);
+    }
+
+    return false;
+}
+
+
+
+void NuggetFarmerHighlands::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    NuggetFarmerHighlands_Descriptor::Stats& stats = env.current_stats<NuggetFarmerHighlands_Descriptor::Stats>();
+
+    //  Connect the controller.
+    require_player(env.console, context, BUTTON_LCLICK);
+
+    // Put a save here so that when the program reloads from error it won't break.
+    save_game_from_overworld(env, env.console, context);
+
+    bool fresh_from_reset = false;
+    while (true){
+        env.update_stats();
+        send_program_status_notification(env, NOTIFICATION_STATUS);
+        try{
+            if (run_iteration(env, context, fresh_from_reset)){
+                break;
+            }
+        }catch (OperationFailedExceptionWithScreenshot& e){
+            stats.errors++;
+            e.send_recoverable_error_notif_and_telemetry_report(env, NOTIFICATION_ERROR_RECOVERABLE);
+
+            pbf_press_button(context, BUTTON_HOME, 160ms, GameSettings::instance().GAME_TO_HOME_DELAY0);
+            fresh_from_reset = reset_game_from_home(env, env.console, context);
+        }
+    }
+
+    env.update_stats();
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+}
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Farming/PokemonLA_NuggetFarmerHighlands.h b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Farming/PokemonLA_NuggetFarmerHighlands.h
new file mode 100644
index 0000000000..13f5979af5
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Farming/PokemonLA_NuggetFarmerHighlands.h
@@ -0,0 +1,58 @@
+/*  Money Farmer (Highlands)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLA_MoneyFarmerHighlands_H
+#define PokemonAutomation_PokemonLA_MoneyFarmerHighlands_H
+
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "VideoGames/PokemonLA/Options/PokemonLA_ShinyDetectedAction.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+
+class NuggetFarmerHighlands_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    NuggetFarmerHighlands_Descriptor();
+
+    class Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+
+class NuggetFarmerHighlands : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = NuggetFarmerHighlands_Descriptor;
+    NuggetFarmerHighlands();
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    bool run_iteration(
+        SingleSwitchProgramEnvironment& env, ProControllerContext& context,
+        bool fresh_from_reset
+    );
+
+private:
+    class RunRoute;
+
+    ShinyRequiresAudioText SHINY_REQUIRES_AUDIO;
+
+    OverworldShinyDetectedActionOption SHINY_DETECTED;
+
+    EventNotificationOption NOTIFICATION_STATUS;
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/PokemonLA/Programs/Farming/PokemonLA_TenacityCandyFarmer.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Farming/PokemonLA_TenacityCandyFarmer.cpp
similarity index 75%
rename from SerialPrograms/Source/PokemonLA/Programs/Farming/PokemonLA_TenacityCandyFarmer.cpp
rename to SerialPrograms/Source/VideoGames/PokemonLA/Programs/Farming/PokemonLA_TenacityCandyFarmer.cpp
index f37ff573c1..0c569aa62f 100644
--- a/SerialPrograms/Source/PokemonLA/Programs/Farming/PokemonLA_TenacityCandyFarmer.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Farming/PokemonLA_TenacityCandyFarmer.cpp
@@ -1,25 +1,25 @@
 /*  Tenacity Candy Farmer
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include <chrono>
-#include <iostream>
-#include "CommonFramework/Exceptions/OperationFailedException.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
 #include "CommonFramework/Notifications/ProgramNotifications.h"
-#include "CommonFramework/Tools/StatsTracking.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonTools/Async/InferenceRoutines.h"
 #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
 #include "Pokemon/Pokemon_Strings.h"
-#include "PokemonLA/Inference/Battles/PokemonLA_BattleMenuDetector.h"
-#include "PokemonLA/Inference/Battles/PokemonLA_BattlePokemonSwitchDetector.h"
-#include "PokemonLA/Programs/PokemonLA_BattleRoutines.h"
-#include "PokemonLA/Programs/PokemonLA_GameSave.h"
+#include "VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattleMenuDetector.h"
+#include "VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattlePokemonSwitchDetector.h"
+#include "VideoGames/PokemonLA/Programs/PokemonLA_BattleRoutines.h"
+#include "VideoGames/PokemonLA/Programs/PokemonLA_GameSave.h"
+#include "VideoGames/PokemonLA/Inference/Objects/PokemonLA_ArcPhoneDetector.h"
+#include "VideoGames/PokemonLA/Inference/Objects/PokemonLA_ButtonDetector.h"
+#include "VideoGames/PokemonLA/Inference/PokemonLA_DialogDetector.h"
 #include "PokemonLA_TenacityCandyFarmer.h"
-#include "PokemonLA/Inference/Objects/PokemonLA_ArcPhoneDetector.h"
-#include "PokemonLA/Inference/Objects/PokemonLA_ButtonDetector.h"
-#include "PokemonLA/Inference/PokemonLA_DialogDetector.h"
 
 
 namespace PokemonAutomation{
@@ -33,11 +33,13 @@ TenacityCandyFarmer_Descriptor::TenacityCandyFarmer_Descriptor()
     : SingleSwitchProgramDescriptor(
         "PokemonLA:TenacityCandyFarmer",
         STRING_POKEMON + " LA", "Tenacity Candy Farmer",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonLA/TenacityCandyFarmer.md",
-        "Attend Ingo's Path of Tenacity battles leading with a stats fully upgraded, max level, Modest nature Arceus with Legend Plate applied to grind exp, exp candies XL and evolution items.",
+        "Programs/PokemonLA/TenacityCandyFarmer.html",
+        "Attend Ingo's Path of Tenacity battles leading with a stats fully upgraded, max level, "
+        "Modest nature Arceus with Legend Plate applied to grind exp, exp candies XL and evolution items.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
         FeedbackType::REQUIRED,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
     )
 {}
 class TenacityCandyFarmer_Descriptor::Stats : public StatsTracker{
@@ -49,9 +51,9 @@ class TenacityCandyFarmer_Descriptor::Stats : public StatsTracker{
         , errors(m_stats["Errors"])
     {
         m_display_order.emplace_back("Battles");
-        m_display_order.emplace_back("Faint Switches", true);
-        m_display_order.emplace_back("Fourth Moves", true);
-        m_display_order.emplace_back("Errors", true);
+        m_display_order.emplace_back("Faint Switches", HIDDEN_IF_ZERO);
+        m_display_order.emplace_back("Fourth Moves", HIDDEN_IF_ZERO);
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
     }
 
     std::atomic<uint64_t>& battles;
@@ -72,12 +74,12 @@ TenacityCandyFarmer::TenacityCandyFarmer()
             {FourthMoveOn::Mamoswine,   "mamoswine", "Mamoswine (fourth move needs to be set to Flamethrower)"},
             {FourthMoveOn::Avalugg,     "avalugg", "Avalugg (fourth move needs to be set to Rock Smash)"},
         },
-        LockWhileRunning::LOCKED,
+        LockMode::LOCK_WHILE_RUNNING,
         FourthMoveOn::None
     )
     , SAVE_EVERY_FEW_BATTLES(
         "<b>Save every few battles:</b><br>After every this number of battles, save the game. Enter zero to never save the game.",
-        LockWhileRunning::LOCKED,
+        LockMode::LOCK_WHILE_RUNNING,
         0
     )
     , NOTIFICATION_STATUS("Status Update", true, false, std::chrono::seconds(3600))
@@ -94,20 +96,20 @@ TenacityCandyFarmer::TenacityCandyFarmer()
 
 
 
-bool TenacityCandyFarmer::run_iteration(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
+bool TenacityCandyFarmer::run_iteration(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
     TenacityCandyFarmer_Descriptor::Stats& stats = env.current_stats<TenacityCandyFarmer_Descriptor::Stats>();
 
     env.console.log("Starting battle...");
 
     // Talk to Ingo to start conversation and select Path of Tenacity:
     // Press A to start talking
-    pbf_press_button(context, BUTTON_A, 20, 100);
+    pbf_press_button(context, BUTTON_A, 160ms, 800ms);
     // Press A to show battle type selection menu box
-    pbf_press_button(context, BUTTON_A, 20, 50);
+    pbf_press_button(context, BUTTON_A, 160ms, 400ms);
     // Move down the menu box to select Path of Tenacity
-    pbf_press_dpad(context, DPAD_DOWN, 10, 50);
+    pbf_press_dpad(context, DPAD_DOWN, 80ms, 400ms);
     // Press A to select Path of Tenacity
-    pbf_press_button(context, BUTTON_A, 20, 200);
+    pbf_press_button(context, BUTTON_A, 160ms, 1600ms);
 
     // Press A repeatedly to show the opponenet team selection menu box.
     // Note: in different languages, there are different number of dialogue boxes to clear to show the team selection menu.
@@ -115,11 +117,11 @@ bool TenacityCandyFarmer::run_iteration(SingleSwitchProgramEnvironment& env, Bot
     {
         context.wait_for_all_requests();
         ButtonDetector button(env.console, env.console, ButtonType::ButtonA, {0.56, 0.46, 0.33, 0.27}, std::chrono::milliseconds(100), true);
-        int ret = run_until(
+        int ret = run_until<ProControllerContext>(
             env.console, context,
-            [&](BotBaseContext& context){
+            [&](ProControllerContext& context){
                 for (size_t c = 0; c < 10; c++){
-                    pbf_press_button(context, BUTTON_A, 20, 150);
+                    pbf_press_button(context, BUTTON_A, 160ms, 1200ms);
                 }
             },
             {
@@ -127,18 +129,18 @@ bool TenacityCandyFarmer::run_iteration(SingleSwitchProgramEnvironment& env, Bot
             }
         );
         if (ret != 0){
-            throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, env.console,
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
                 "Unable to detect Tenacity path menu after 10 A presses.",
-                true
+                env.console
             );
         }
     }
     // Move down the menu box to select Pearl Clan
-    pbf_press_dpad(context, DPAD_DOWN, 10, 50);
-    pbf_press_dpad(context, DPAD_DOWN, 10, 50);
+    pbf_press_dpad(context, DPAD_DOWN, 80ms, 400ms);
+    pbf_press_dpad(context, DPAD_DOWN, 80ms, 400ms);
     // Select Pearl Plan to start Path of Tenacity
-    pbf_mash_button(context, BUTTON_A, 200);
+    pbf_mash_button(context, BUTTON_A, 1600ms);
     context.wait_for_all_requests();
 
     // First opponent, Lian:
@@ -191,7 +193,7 @@ bool TenacityCandyFarmer::run_iteration(SingleSwitchProgramEnvironment& env, Bot
             num_turns = 0;
         }
         clearing_dialogues = true;
-        pbf_press_button(context, BUTTON_B, 20, 100);
+        pbf_press_button(context, BUTTON_B, 160ms, 800ms);
         context.wait_for_all_requests();
 
         if (cur_battle >= 3){
@@ -199,17 +201,17 @@ bool TenacityCandyFarmer::run_iteration(SingleSwitchProgramEnvironment& env, Bot
             // All three battles are now finished, wait for ArcPhoneDetector
             const bool stop_on_detected = true;
             ArcPhoneDetector arc_phone_detector(env.console, env.console, std::chrono::milliseconds(200), stop_on_detected);
-            int ret = run_until(
-                env.console, context, [](BotBaseContext& context){
-                    pbf_mash_button(context, BUTTON_B, 20 * TICKS_PER_SECOND);
+            int ret = run_until<ProControllerContext>(
+                env.console, context, [](ProControllerContext& context){
+                    pbf_mash_button(context, BUTTON_B, 20000ms);
                 },
                 {{arc_phone_detector}}
             );
             if (ret < 0){
-                throw OperationFailedException(
-                    ErrorReport::SEND_ERROR_REPORT, env.console,
+                OperationFailedExceptionWithScreenshot::fire(
+                    ErrorReportMode::SEND_ERROR_REPORT,
                     "Failed to find Arc phone after 20 seconds when the last battle ends.",
-                    true
+                    env.console
                 );
             }
             env.log("Found Arc Phone. End of one path.");
@@ -240,10 +242,10 @@ bool TenacityCandyFarmer::run_iteration(SingleSwitchProgramEnvironment& env, Bot
         if (ret < 0){
             env.console.log("Error: Failed to find battle menu after 2 minutes.");
 //            return true;
-            throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, env.console,
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
                 "Failed to find battle menu after 2 minutes.",
-                true
+                env.console
             );
         }
 
@@ -253,13 +255,13 @@ bool TenacityCandyFarmer::run_iteration(SingleSwitchProgramEnvironment& env, Bot
 
             if (cur_battle == 1 && num_turns == 1){
                 // Change opponent to Froslass as Froslass is fast and Avalugg is slow.
-                // So better to finish Forslass first so that we may move immediately to finsih Avalugg
+                // So better to finish Forslass first so that we may move immediately to finish Avalugg
                 // without taking damage.
-                pbf_press_button(context, BUTTON_ZL, 10, 100);
+                pbf_press_button(context, BUTTON_ZL, 80ms, 800ms);
             }
 
             // Press A to select moves
-            pbf_press_button(context, BUTTON_A, 10, 125);
+            pbf_press_button(context, BUTTON_A, 80ms, 1000ms);
             context.wait_for_all_requests();
 
             // Choose move to use!
@@ -271,8 +273,7 @@ bool TenacityCandyFarmer::run_iteration(SingleSwitchProgramEnvironment& env, Bot
                     target_move = 3;
                     stats.fourth_moves++;
                     env.update_stats();
-                }
-                else if (FOURTH_MOVE_ON == FourthMoveOn::Avalugg && cur_battle == 1 && num_turns >= 1){
+                }else if (FOURTH_MOVE_ON == FourthMoveOn::Avalugg && cur_battle == 1 && num_turns >= 1){
                     // Use Flash Cannon to finish Froslass first, then use fourth move, Rock Smash to grind Avalugg.
                     target_move = (num_turns == 1 ? 2 : 3);
                     if (num_turns == 2){
@@ -284,13 +285,13 @@ bool TenacityCandyFarmer::run_iteration(SingleSwitchProgramEnvironment& env, Bot
 
                 if (cur_move < target_move){
                     // Move move selection down
-                    for(size_t i = 0; i < target_move - cur_move; i++){
-                        pbf_press_dpad(context, DPAD_DOWN, 20, 100);
+                    for (size_t i = 0; i < target_move - cur_move; i++){
+                        pbf_press_dpad(context, DPAD_DOWN, 160ms, 800ms);
                     }
-                } else if (cur_move > target_move){
+                }else if (cur_move > target_move){
                     // Move move selection up
-                    for(size_t i = 0; i < cur_move - target_move; i++){
-                        pbf_press_dpad(context, DPAD_UP, 20, 100);
+                    for (size_t i = 0; i < cur_move - target_move; i++){
+                        pbf_press_dpad(context, DPAD_UP, 160ms, 800ms);
                     }
                 }
                 cur_move = target_move;
@@ -301,25 +302,24 @@ bool TenacityCandyFarmer::run_iteration(SingleSwitchProgramEnvironment& env, Bot
             while (use_move(env.console, context, cur_pokemon, cur_move, no_style, check_move_success) == false){
                 // We are still on the move selection screen. No PP.
                 // Go to the next move.
-                pbf_press_dpad(context, DPAD_DOWN, 20, 100);
+                pbf_press_dpad(context, DPAD_DOWN, 160ms, 800ms);
                 // env.console.context().wait_for_all_requests();
                 cur_move = (cur_move + 1) % 4;
                 env.console.log("No PP. Use next move, " + std::to_string(cur_move), COLOR_RED);
             }
 
             num_turns++;
-        } else if(ret == 1){
+        }else if(ret == 1){
             env.console.log("Normal dialogue box.");
             if (clear_dialogue_box()){
                 break;
             }
-        } else if(ret == 2){
+        }else if(ret == 2){
             env.console.log("Surprise dialogue box.");
             if (clear_dialogue_box()){
                 break;
             }
-        }
-        else if (ret == 3){
+        }else if (ret == 3){
             env.console.log("Pokemon fainted.", COLOR_RED);
 
             clearing_dialogues = false;
@@ -330,8 +330,7 @@ bool TenacityCandyFarmer::run_iteration(SingleSwitchProgramEnvironment& env, Bot
             next_pokemon_to_switch_to++;
             next_pokemon_to_switch_to = switch_pokemon(env.console, context, next_pokemon_to_switch_to);
             cur_pokemon++;
-        }
-        else{ // ret is 4
+        }else{ // ret is 4
             env.console.log("Battle finished.");
             break;
         }
@@ -345,11 +344,11 @@ bool TenacityCandyFarmer::run_iteration(SingleSwitchProgramEnvironment& env, Bot
 
 
 
-void TenacityCandyFarmer::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
+void TenacityCandyFarmer::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
     TenacityCandyFarmer_Descriptor::Stats& stats = env.current_stats<TenacityCandyFarmer_Descriptor::Stats>();
 
     //  Connect the controller.
-    pbf_press_button(context, BUTTON_LCLICK, 5, 5);
+    require_player(env.console, context, BUTTON_LCLICK);
 
     // {
     //     // ImageRGB32 image("./scripts/LA_switch_pokemon_Kuro.png");
diff --git a/SerialPrograms/Source/PokemonLA/Programs/Farming/PokemonLA_TenacityCandyFarmer.h b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Farming/PokemonLA_TenacityCandyFarmer.h
similarity index 77%
rename from SerialPrograms/Source/PokemonLA/Programs/Farming/PokemonLA_TenacityCandyFarmer.h
rename to SerialPrograms/Source/VideoGames/PokemonLA/Programs/Farming/PokemonLA_TenacityCandyFarmer.h
index 3444bb9c53..45916cd2c8 100644
--- a/SerialPrograms/Source/PokemonLA/Programs/Farming/PokemonLA_TenacityCandyFarmer.h
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Farming/PokemonLA_TenacityCandyFarmer.h
@@ -1,6 +1,6 @@
 /*  Tenacity Candy Farmer
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  *  Battle Pearl Clan in Path of Tenacity to farm exp, Exp Candy XL and random evolution items.
  */
@@ -8,7 +8,6 @@
 #ifndef PokemonAutomation_PokemonLA_TenacityCandyFarmer_H
 #define PokemonAutomation_PokemonLA_TenacityCandyFarmer_H
 
-#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
 #include "Common/Cpp/Options/SimpleIntegerOption.h"
 #include "Common/Cpp/Options/EnumDropdownOption.h"
 #include "CommonFramework/Notifications/EventNotificationsTable.h"
@@ -29,11 +28,12 @@ class TenacityCandyFarmer_Descriptor : public SingleSwitchProgramDescriptor{
 
 class TenacityCandyFarmer : public SingleSwitchProgramInstance{
 public:
+    using Descriptor = TenacityCandyFarmer_Descriptor;
     TenacityCandyFarmer();
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
 
 private:
-    bool run_iteration(SingleSwitchProgramEnvironment& env, BotBaseContext& context);
+    bool run_iteration(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
 
 private:
     enum class FourthMoveOn{
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/General/PokemonLA_ApplyGrits.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/General/PokemonLA_ApplyGrits.cpp
new file mode 100644
index 0000000000..a76417f9a2
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/General/PokemonLA_ApplyGrits.cpp
@@ -0,0 +1,134 @@
+/*  Apply Grits
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Exceptions.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "PokemonLA_ApplyGrits.h"
+
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+using namespace Pokemon;
+
+namespace{
+
+// For each grit item, how many levels it can increase:
+const size_t grit_level_increase[4] = {3, 3, 3, 1};
+
+}
+
+
+ApplyGrits_Descriptor::ApplyGrits_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonLA:ApplyGrits",
+        STRING_POKEMON + " LA", "Apply Grits",
+        "Programs/PokemonLA/ApplyGrits.html",
+        "Use Grits items on " + STRING_POKEMON,
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::NONE,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+
+ApplyGrits::ApplyGrits()
+    : NUM_POKEMON(
+        "<b>Number of " + STRING_POKEMON + " to Apply Grits</b>:",
+        {
+            {1, "1", "1"},
+            {2, "2", "2"},
+            {3, "3", "3"},
+            {4, "4", "4"},
+            {5, "5", "5"},
+            {6, "6", "6"},
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        1
+    )
+    , NOTIFICATIONS({
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+{
+    PA_ADD_OPTION(NUM_POKEMON);
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+void ApplyGrits::ApplyGritsOnOnePokemon(SingleSwitchProgramEnvironment& env, ProControllerContext& context, size_t pokemon_index){
+    // Start the function when the game is in the item menu, with cursor hovering over Grit Dust
+    // Grit Gravel, Grit Pebble and Grit Rock must be on the right side of Grit Dust, in the correct order.
+
+    for (size_t grit_index = 0; grit_index < 4; grit_index++){
+        
+        if (grit_index > 0){
+            // Move to the next Grit item
+            pbf_press_dpad(context, DPAD_RIGHT, 160ms, 400ms);
+        }
+
+        // Press A to open the item menu of Grit Dust
+        pbf_press_button(context, BUTTON_A, 160ms, 400ms);
+        // Press A again to use the item
+        pbf_press_button(context, BUTTON_A, 160ms, 400ms);
+
+        // Move down the pokemon list
+        for (size_t i = 0; i < pokemon_index; i++){
+            pbf_press_dpad(context, DPAD_DOWN, 160ms, 640ms);
+        }
+
+        // Select the pokemon
+        pbf_press_button(context, BUTTON_A, 160ms, 640ms);
+
+        // For each of the size pokemon attributes: HP, Attack, Defense, Sp. Atk, Sp. Def, Speed
+        for (size_t attr_index = 0; attr_index < 6; attr_index++){
+            if (attr_index > 0){
+                // Move to the next attribute
+                pbf_press_dpad(context, DPAD_DOWN, 160ms, 400ms);
+            }
+            for (size_t i = 0; i < grit_level_increase[grit_index]; i++){
+                // One press to apply the Grit item
+                pbf_press_button(context, BUTTON_A, 160ms, 800ms);
+                // Second press to clear the message box, whether it is applied successfully or not.
+                pbf_press_button(context, BUTTON_A, 160ms, 800ms);
+            }
+        }
+
+        // Press B twice to back to item selection
+        pbf_press_button(context, BUTTON_B, 160ms, 400ms);
+        pbf_press_button(context, BUTTON_B, 160ms, 400ms);
+    }
+
+    // Move back to hovering over Grit Dust
+    pbf_press_dpad(context, DPAD_LEFT, 160ms, 400ms);
+    pbf_press_dpad(context, DPAD_LEFT, 160ms, 400ms);
+    pbf_press_dpad(context, DPAD_LEFT, 160ms, 400ms);
+
+    context.wait_for_all_requests();
+}
+
+void ApplyGrits::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    //  Connect the controller.
+    require_player(env.console, context, BUTTON_LCLICK);
+
+    size_t num_pokemon = NUM_POKEMON.current_value();
+    for (size_t i = 0; i < num_pokemon; i++){
+        ApplyGritsOnOnePokemon(env, context, i);
+    }
+
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+}
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/General/PokemonLA_ApplyGrits.h b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/General/PokemonLA_ApplyGrits.h
new file mode 100644
index 0000000000..2ae0c41d04
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/General/PokemonLA_ApplyGrits.h
@@ -0,0 +1,48 @@
+/*  Apply Grits
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLA_ApplyGrits_H
+#define PokemonAutomation_PokemonLA_ApplyGrits_H
+
+#include "Common/Cpp/Options/EnumDropdownOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+
+class ApplyGrits_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    ApplyGrits_Descriptor();
+};
+
+
+class ApplyGrits : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = ApplyGrits_Descriptor;
+    ApplyGrits();
+
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+
+    void ApplyGritsOnOnePokemon(SingleSwitchProgramEnvironment& env, ProControllerContext& context, size_t pokemon_index);
+
+    IntegerEnumDropdownOption NUM_POKEMON;
+
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/General/PokemonLA_BraviaryHeightGlitch.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/General/PokemonLA_BraviaryHeightGlitch.cpp
new file mode 100644
index 0000000000..0b9cad6cd5
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/General/PokemonLA_BraviaryHeightGlitch.cpp
@@ -0,0 +1,51 @@
+/*  Braviary Height Glitch
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "PokemonLA_BraviaryHeightGlitch.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+    using namespace Pokemon;
+
+
+BraviaryHeightGlitch_Descriptor::BraviaryHeightGlitch_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonLA:BraviaryHeightGlitch",
+        STRING_POKEMON + " LA", "Braviary Height Glitch",
+        "Programs/PokemonLA/BraviaryHeightGlitch.html",
+        "Increase your height in place using the height glitch.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::NONE,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+
+BraviaryHeightGlitch::BraviaryHeightGlitch(){}
+
+
+void BraviaryHeightGlitch::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    //  Connect the controller.
+    require_player(env.console, context, BUTTON_LCLICK);
+
+    while (true){
+        pbf_press_button(context, BUTTON_Y, 240ms, 0ms);
+        pbf_press_button(context, BUTTON_PLUS, 240ms, 80ms);
+        pbf_press_button(context, BUTTON_PLUS, 240ms, 240ms);
+    }
+}
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/General/PokemonLA_BraviaryHeightGlitch.h b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/General/PokemonLA_BraviaryHeightGlitch.h
new file mode 100644
index 0000000000..c203e335c9
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/General/PokemonLA_BraviaryHeightGlitch.h
@@ -0,0 +1,38 @@
+/*  Braviary Height Glitch
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLA_BraviaryHeightGlitch_H
+#define PokemonAutomation_PokemonLA_BraviaryHeightGlitch_H
+
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+
+class BraviaryHeightGlitch_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    BraviaryHeightGlitch_Descriptor();
+};
+
+
+class BraviaryHeightGlitch : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = BraviaryHeightGlitch_Descriptor;
+    BraviaryHeightGlitch();
+
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+};
+
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/General/PokemonLA_ClothingBuyer.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/General/PokemonLA_ClothingBuyer.cpp
new file mode 100644
index 0000000000..52fba5724d
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/General/PokemonLA_ClothingBuyer.cpp
@@ -0,0 +1,80 @@
+/*  Clothing Buyer
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "PokemonLA_ClothingBuyer.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+    using namespace Pokemon;
+
+
+ClothingBuyer_Descriptor::ClothingBuyer_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonLA:ClothingBuyer",
+        STRING_POKEMON + " LA", "Clothing Buyer",
+        "Programs/PokemonLA/ClothingBuyer.html",
+        "Buy out all the clothing in the store.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::NONE,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+
+ClothingBuyer::ClothingBuyer()
+    : CATEGORY_ROTATION(
+        "<b>Rotate Categories:</b><br>This slows down the program, but ensures it will cover all categories.",
+        LockMode::LOCK_WHILE_RUNNING,
+        true
+    )
+{
+    PA_ADD_OPTION(CATEGORY_ROTATION);
+}
+
+
+void ClothingBuyer::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    //  Connect the controller.
+    require_player(env.console, context, BUTTON_LCLICK);
+
+    while (true){
+        // If this clothing is not bought:
+        // Press A to pop purchase dialogue
+        // Press A to confirm purchase
+        // Press B to not wear it
+        // Press B to clear dialogue
+
+        // If this clothing is already bought:
+        // Press A to do nothing
+        // Press A to do nothing
+        // Press B to be asked whether to leave menu
+        // Press B to not leave
+
+        pbf_press_button(context, BUTTON_A, 80ms, 960ms);
+        pbf_press_button(context, BUTTON_A, 80ms, 1040ms);
+        pbf_press_button(context, BUTTON_B, 80ms, 960ms);
+        pbf_press_button(context, BUTTON_B, 80ms, 480ms);
+
+        // Move to the next clothing in the same category
+        pbf_press_dpad(context, DPAD_DOWN, 80ms, 320ms);
+
+        // Move to the next category
+        if (CATEGORY_ROTATION){
+            pbf_press_button(context, BUTTON_R, 80ms, 320ms);
+        }
+    }
+}
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/General/PokemonLA_ClothingBuyer.h b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/General/PokemonLA_ClothingBuyer.h
new file mode 100644
index 0000000000..8bc048b088
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/General/PokemonLA_ClothingBuyer.h
@@ -0,0 +1,44 @@
+/*  Clothing Buyer
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLA_ClothingBuyer_H
+#define PokemonAutomation_PokemonLA_ClothingBuyer_H
+
+#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+
+class ClothingBuyer_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    ClothingBuyer_Descriptor();
+};
+
+
+class ClothingBuyer : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = ClothingBuyer_Descriptor;
+    ClothingBuyer();
+
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+
+    BooleanCheckBoxOption CATEGORY_ROTATION;
+
+};
+
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/General/PokemonLA_DistortionWaiter.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/General/PokemonLA_DistortionWaiter.cpp
new file mode 100644
index 0000000000..f2737b63d9
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/General/PokemonLA_DistortionWaiter.cpp
@@ -0,0 +1,158 @@
+/*  Distortion Waiter
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "Pokemon/Inference/Pokemon_NameReader.h"
+#include "VideoGames/PokemonLA/PokemonLA_Settings.h"
+#include "VideoGames/PokemonLA/Inference/PokemonLA_NotificationReader.h"
+#include "PokemonLA_DistortionWaiter.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+    using namespace Pokemon;
+
+
+DistortionWaiter_Descriptor::DistortionWaiter_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonLA:DistortionWaiter",
+        STRING_POKEMON + " LA", "Distortion Waiter",
+        "Programs/PokemonLA/DistortionWaiter.html",
+        "Wait for a distortion to appear.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+class DistortionWaiter_Descriptor::Stats : public StatsTracker{
+public:
+    Stats()
+        : minutes_waited(m_stats["Minutes Waited"])
+        , distortions(m_stats["Distortions"])
+        , other(m_stats["Other Notifications"])
+        , errors(m_stats["Errors"])
+    {
+        m_display_order.emplace_back("Minutes Waited");
+        m_display_order.emplace_back("Distortions");
+        m_display_order.emplace_back("Other Notifications", HIDDEN_IF_ZERO);
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+    }
+
+    std::atomic<uint64_t>& minutes_waited;
+    std::atomic<uint64_t>& distortions;
+    std::atomic<uint64_t>& other;
+    std::atomic<uint64_t>& errors;
+};
+std::unique_ptr<StatsTracker> DistortionWaiter_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+
+DistortionWaiter::DistortionWaiter()
+    : LANGUAGE(
+        "<b>Game Language:</b>",
+        Pokemon::PokemonNameReader::instance().languages(),
+        LockMode::LOCK_WHILE_RUNNING,
+        true
+    )
+    , NOTIFICATION_DISTORTION(
+        "Distortion Appeared",
+        true, true, ImageAttachmentMode::JPG,
+        {"Notifs"}
+    )
+    , NOTIFICATIONS({
+        &NOTIFICATION_DISTORTION,
+        &NOTIFICATION_ERROR_RECOVERABLE,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+{
+    PA_ADD_OPTION(LANGUAGE);
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+
+
+void DistortionWaiter::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    DistortionWaiter_Descriptor::Stats& stats = env.current_stats<DistortionWaiter_Descriptor::Stats>();
+
+    //  Connect the controller.
+    require_player(env.console, context, BUTTON_LCLICK);
+
+
+    NotificationDetector detector(env.console, LANGUAGE);
+
+    WallClock start = current_time();
+    while (true){
+        env.update_stats();
+
+        int ret = run_until<ProControllerContext>(
+            env.console, context,
+            [&](ProControllerContext& context){
+                for (size_t c = 0; c < 60; c++){
+                    pbf_press_button(context, BUTTON_LCLICK, 160ms, 60000ms - 160ms);
+                    context.wait_for_all_requests();
+                    auto elapsed = current_time() - start;
+                    uint64_t minutes = std::chrono::duration_cast<std::chrono::minutes>(elapsed).count();
+                    if (minutes != stats.minutes_waited.load(std::memory_order_relaxed)){
+                        stats.minutes_waited.store(minutes, std::memory_order_relaxed);
+                        env.update_stats();
+                    }
+                }
+            },
+            {{detector}}
+        );
+        if (ret < 0){
+            stats.errors++;
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "No distortion found after one hour.",
+                env.console
+            );
+        }
+
+        auto elapsed = current_time() - start;
+        uint64_t minutes = std::chrono::duration_cast<std::chrono::minutes>(elapsed).count();
+        stats.minutes_waited.store(minutes, std::memory_order_relaxed);
+
+        if (detector.result() == Notification::DISTORTION_FORMING){
+            stats.distortions++;
+            break;
+        }
+        if (detector.result() == Notification::ERROR){
+            stats.errors++;
+        }else{
+            stats.other++;
+        }
+
+        context.wait_for(std::chrono::seconds(10));
+    }
+
+
+    env.update_stats();
+
+    send_program_notification(
+        env, NOTIFICATION_DISTORTION,
+        COLOR_GREEN,
+        "Found Distortion",
+        {}, "",
+        env.console.video().snapshot()
+    );
+    pbf_press_button(context, BUTTON_HOME, 160ms, GameSettings::instance().GAME_TO_HOME_DELAY0);
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/General/PokemonLA_DistortionWaiter.h b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/General/PokemonLA_DistortionWaiter.h
new file mode 100644
index 0000000000..eeb875a350
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/General/PokemonLA_DistortionWaiter.h
@@ -0,0 +1,49 @@
+/*  Distortion Waiter
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLA_DistortionWaiter_H
+#define PokemonAutomation_PokemonLA_DistortionWaiter_H
+
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "CommonTools/Options/LanguageOCROption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+
+class DistortionWaiter_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    DistortionWaiter_Descriptor();
+
+    class Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+
+class DistortionWaiter : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = DistortionWaiter_Descriptor;
+    DistortionWaiter();
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+
+private:
+    OCR::LanguageOCROption LANGUAGE;
+
+    EventNotificationOption NOTIFICATION_DISTORTION;
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/General/PokemonLA_MMORoutines.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/General/PokemonLA_MMORoutines.cpp
new file mode 100644
index 0000000000..9536ca0556
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/General/PokemonLA_MMORoutines.cpp
@@ -0,0 +1,306 @@
+/*  Pokemon LA MMO Routines
+ *
+ *  Functions to run MMO related tasks
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <sstream>
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "VideoGames/PokemonLA/Inference/Map/PokemonLA_PokemonMapSpriteReader.h"
+#include "VideoGames/PokemonLA/Inference/Map/PokemonLA_MapDetector.h"
+#include "VideoGames/PokemonLA/Inference/Map/PokemonLA_MapMissionTabReader.h"
+#include "VideoGames/PokemonLA/Inference/Map/PokemonLA_MapZoomLevelReader.h"
+#include "VideoGames/PokemonLA/Inference/Map/PokemonLA_MMOSpriteStarSymbolDetector.h"
+#include "VideoGames/PokemonLA/Inference/Objects/PokemonLA_MMOQuestionMarkDetector.h"
+#include "VideoGames/PokemonLA/Inference/PokemonLA_DialogDetector.h"
+#include "VideoGames/PokemonLA/PokemonLA_Locations.h"
+#include "VideoGames/PokemonLA/PokemonLA_TravelLocations.h"
+#include "VideoGames/PokemonLA/Programs/PokemonLA_RegionNavigation.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+    
+std::vector<std::string> load_mmo_names(){
+    return {
+        "fieldlands-mmo",
+        "mirelands-mmo",
+        "coastlands-mmo",
+        "highlands-mmo",
+        "icelands-mmo"
+    };
+}
+
+const std::vector<std::string>& MMO_NAMES(){
+    const static std::vector<std::string> mmo_names = load_mmo_names();
+    return mmo_names;
+}
+
+
+std::set<std::string> enter_region_and_read_MMO(
+    SingleSwitchProgramEnvironment& env, ProControllerContext& context,
+    const std::string& mmo_name,
+    const std::set<std::string>& desired_MMOs,
+    const std::set<std::string>& desired_star_MMOs,
+    bool debug_mode,
+    int& num_mmo_pokemon_found,
+    int& num_star_mmo_found,
+    bool fresh_from_reset
+){
+    MapRegion region = MapRegion::NONE;
+    TravelLocation location = TravelLocations::instance().Fieldlands_Fieldlands;
+    Camp camp = Camp::FIELDLANDS_FIELDLANDS;
+    // When you open the map in a region, the map cursor is initialized at your current location
+    // on map. But when you land in a region, the initial location is a camp, the map cursor
+    // will show a text box "xxx Camp - Take a rest or do some crafting". This may occlude some
+    // MMO question marks. So we have to move the map cursor away after we land in the region.
+    double map_cursor_move_x = 0;
+    double map_cursor_move_y = 0;
+    const Milliseconds map_cursor_move_duration = 400ms;
+
+    for (size_t i = 0; i < 5; i++){
+        if (mmo_name == MMO_NAMES()[i]){
+            switch (i){
+            case 0:
+                region = MapRegion::FIELDLANDS;
+                location = TravelLocations::instance().Fieldlands_Fieldlands;
+                camp = Camp::FIELDLANDS_FIELDLANDS;
+                map_cursor_move_x = 0;
+                map_cursor_move_y = +1;
+                break;
+            case 1:
+                region = MapRegion::MIRELANDS;
+                location = TravelLocations::instance().Mirelands_Mirelands;
+                camp = Camp::MIRELANDS_MIRELANDS;
+                map_cursor_move_x = -1;
+                map_cursor_move_y = 0;
+                break;
+            case 2:
+                region = MapRegion::COASTLANDS;
+                location = TravelLocations::instance().Coastlands_Beachside;
+                camp = Camp::COASTLANDS_BEACHSIDE;
+                map_cursor_move_x = -1;
+                map_cursor_move_y = 0;
+                break;
+            case 3:
+                region = MapRegion::HIGHLANDS;
+                location = TravelLocations::instance().Highlands_Highlands;
+                camp = Camp::HIGHLANDS_HIGHLANDS;
+                map_cursor_move_x = 0;
+                map_cursor_move_y = -1;
+                break;
+            case 4:
+                region = MapRegion::ICELANDS;
+                location = TravelLocations::instance().Icelands_Snowfields;
+                camp = Camp::ICELANDS_SNOWFIELDS;
+                map_cursor_move_x = 0;
+                map_cursor_move_y = -1;
+                break;
+            }
+        }
+    }
+    if (region == MapRegion::NONE){
+        throw InternalProgramError(&env.console.logger(), PA_CURRENT_FUNCTION, "No MMO region name found.");
+    }
+
+    env.log("Go to " + std::string(MAP_REGION_NAMES[int(region)]) + " to check MMO.");
+    goto_camp_from_jubilife(env, env.console, context, location, fresh_from_reset);
+
+    // Open map
+    pbf_press_button(context, BUTTON_MINUS, 400ms, 800ms);
+    context.wait_for_all_requests();
+
+    // Take a photo of the map before 
+    VideoSnapshot question_mark_image = env.console.video().snapshot();
+
+    // Fix zoom level:
+    const int zoom_level = read_map_zoom_level(question_mark_image);
+    if (zoom_level < 0){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "Canot read map zoom level.",
+            env.console
+        );
+    }
+    if (zoom_level == 0){
+        pbf_press_button(context, BUTTON_ZR, 400ms, 400ms);
+        context.wait_for_all_requests();
+        question_mark_image = env.console.video().snapshot();
+    }else if (zoom_level == 2){
+        pbf_press_button(context, BUTTON_ZL, 400ms, 400ms);
+        context.wait_for_all_requests();
+        question_mark_image = env.console.video().snapshot();
+    }
+
+    // Move cursor away so that it does not show a text box that occludes MMO sprites.
+    pbf_move_left_joystick(context, {map_cursor_move_x, map_cursor_move_y}, map_cursor_move_duration, 240ms);
+    context.wait_for_all_requests();
+
+    // Fix Missions & Requests tab:
+    if (is_map_mission_tab_raised(question_mark_image)){
+        pbf_press_button(context, BUTTON_R, 400ms, 800ms);
+        context.wait_for_all_requests();
+        question_mark_image = env.console.video().snapshot();
+    }
+
+    // Now detect question marks:
+    MMOQuestionMarkDetector question_mark_detector(env.logger());
+
+    const auto quest_results = question_mark_detector.detect_MMOs_on_region_map(question_mark_image);
+    env.log("Detected MMO question marks:");
+    for (const auto& box : quest_results){
+        std::ostringstream os;
+        os << "- " << box.center_x() << ", " << box.center_y() << " " << box.width() << " x " << box.height();
+        env.log(os.str());
+    }
+
+    // Clean the detected boxes, make them square.
+    std::vector<ImagePixelBox> new_boxes;
+    for (size_t i = 0; i < quest_results.size(); i++){
+        const auto& box = quest_results[i];
+
+        pxint_t radius = (pxint_t)((box.width() + box.height()) / 4 + 0.5);
+        pxint_t center_x = (pxint_t)box.center_x();
+        pxint_t center_y = (pxint_t)box.center_y();
+        auto new_box = ImagePixelBox(center_x - radius, center_y - radius, center_x + radius, center_y + radius);
+        new_boxes.push_back(new_box);
+    }
+
+    // Leave map view, back to overworld
+    pbf_press_button(context, BUTTON_B, 160ms, 400ms);
+
+    // Now go to Mai to see the reviewed map
+    goto_Mai_from_camp(env.logger(), context, camp);
+
+    pbf_mash_button(context, BUTTON_A, 2800ms);
+    context.wait_for_all_requests();
+
+    // Wait for the last dialog box before the MMO pokemon sprites are revealed.
+    {
+        EventDialogDetector event_dialog_detector(env.logger(), env.console.overlay(), true);
+        int ret = wait_until(env.console, context, std::chrono::seconds(10), {{event_dialog_detector}});
+        if (ret < 0){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "Dialog box not detected when waiting for MMO map.",
+                env.console
+            );
+        }
+    }
+    pbf_press_button(context, BUTTON_B, 400ms, 400ms);
+
+    while (true){
+        EventDialogDetector event_dialog_detector(env.logger(), env.console.overlay(), true);
+        MapDetector map_detector;
+        context.wait_for_all_requests();
+        int ret = wait_until(
+            env.console, context, std::chrono::seconds(10),
+            {event_dialog_detector, map_detector}
+        );
+        switch (ret){
+        case 0:
+            env.console.log("Detected dialog.");
+            pbf_press_button(context, BUTTON_B, 160ms, 840ms);
+            continue;
+        case 1:
+            env.console.log("Found revealed map thanks to Munchlax!");
+            break;
+        default:
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "Map not detected after talking to Mai.",
+                env.console
+            );
+        }
+        break;
+    }
+
+#if 0
+    MapDetector map_detector;
+    ret = wait_until(env.console, context, std::chrono::seconds(5), {{map_detector}});
+    if (ret < 0){
+        OperationFailedExceptionWithScreenshot::fire(
+            env.console, ErrorReportMode::SEND_ERROR_REPORT,
+            "Map not detected after talking to Mai.",
+            true
+        );
+    }
+    env.console.log("Found revealed map thanks to Munchlax!");
+#endif
+
+    VideoOverlaySet mmo_sprites_overlay(env.console);
+    for (size_t i = 0; i < new_boxes.size(); i++){
+        mmo_sprites_overlay.add(COLOR_BLUE, pixelbox_to_floatbox(question_mark_image, new_boxes[i]));
+    }
+
+    // Move cursor away so that it does not show a text box that occludes MMO sprites.
+    pbf_move_left_joystick(context, {map_cursor_move_x, map_cursor_move_y}, map_cursor_move_duration, 240ms);
+    context.wait_for_all_requests();
+
+    std::set<std::string> found;
+
+    // Check MMO results:
+    std::vector<std::string> sprites;
+    VideoSnapshot sprites_screen = env.console.video().snapshot();
+    for (size_t i = 0; i < new_boxes.size(); i++){
+        auto result = match_sprite_on_map(env.logger(), sprites_screen, new_boxes[i], region, debug_mode);
+        env.console.log("Found MMO sprite " + result.slug);
+        num_mmo_pokemon_found++;
+
+        sprites.push_back(result.slug);
+        if (desired_MMOs.find(result.slug) != desired_MMOs.end()){
+            found.insert(result.slug);
+        }
+    }
+
+    // Check star MMO results:
+    std::vector<ImagePixelBox> star_boxes;
+    for (size_t i = 0; i < new_boxes.size(); i++){
+        const auto& sprite_box = new_boxes[i];
+        pxint_t radius = (pxint_t)sprite_box.width() / 2;
+        pxint_t center_x = (pxint_t)sprite_box.center_x();
+        pxint_t center_y = (pxint_t)sprite_box.center_y();
+        ImagePixelBox star_box(
+            center_x + radius/10,
+            center_y - radius*16/10,
+            center_x + radius * 5/4,
+            center_y
+        );
+        star_boxes.push_back(std::move(star_box));
+    }
+
+    MMOSpriteStarSymbolDetector star_detector(sprites_screen, star_boxes);
+
+    env.log("Detect star symbols...");
+    wait_until(env.console, context, std::chrono::seconds(5), {{star_detector}});
+    for (size_t i = 0; i < new_boxes.size(); i++){
+        std::ostringstream os;
+        os << "- " << sprites[i] << " box [" << star_boxes[i].min_x << ", " << star_boxes[i].min_y
+           << star_boxes[i].max_x << ", " << star_boxes[i].max_y << "]"
+           <<  " motion: " << star_detector.animation_value(i)
+           << " color: " << star_detector.symbol_color(i);
+        if (star_detector.is_star(i)){
+            num_star_mmo_found++;
+            os << ", has star";
+            if (desired_star_MMOs.find(sprites[i]) != desired_star_MMOs.end()){
+                found.insert(sprites[i]);
+            }
+        }
+        env.log(os.str());
+    }
+    return found;
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/General/PokemonLA_MMORoutines.h b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/General/PokemonLA_MMORoutines.h
new file mode 100644
index 0000000000..8e8cdd3672
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/General/PokemonLA_MMORoutines.h
@@ -0,0 +1,53 @@
+/*  Pokemon LA MMO Routines
+ *
+ *  Functions to run MMO related tasks
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <set>
+#include <string>
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+class SingleSwitchProgramEnvironment;
+
+namespace PokemonLA{
+
+// The name of each MMO event happening at each region. Their slugs are:
+// - "fieldlands-mmo"
+// - "mirelands-mmo"
+// - "coastlands-mmo"
+// - "highlands-mmo"
+// - "icelands-mmo"
+const std::vector<std::string>& MMO_NAMES();
+
+
+// After we find an MMO on map specified by `mmo_name`,
+// start from Jubilife Village gate, with camera facing towards the village, run towards the gate
+// and travel to the region with that MMO. Go to Mai to show all MMO pokemon on map and read their
+// sprites and star symbols.
+// The function returns when the map opened by Mai is shown with all pokemon revealed.
+// Return true if an MMO pokemon matches slugs in `desired_MMOs`, or if an MMO pokemon with a star
+// matches slugs in `desired_star_MMOs`.
+// - mmo_name: MMO event slug, e.g. "fieldlands-mmo"
+// - num_mmo_found: update this value by adding how many MMO pokemon found during this function.
+// - num_star_mmo_found: update this value by adding how many MMO pokemon with star symbol found.
+std::set<std::string> enter_region_and_read_MMO(
+    SingleSwitchProgramEnvironment& env, ProControllerContext& context,
+    const std::string& mmo_name,
+    const std::set<std::string>& desired_MMOs,
+    const std::set<std::string>& desired_star_MMOs,
+    bool debug,
+    int& num_mmo_found,
+    int& num_star_mmo_found,
+    bool fresh_from_reset
+);
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/General/PokemonLA_OutbreakFinder.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/General/PokemonLA_OutbreakFinder.cpp
new file mode 100644
index 0000000000..92d267d149
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/General/PokemonLA_OutbreakFinder.cpp
@@ -0,0 +1,631 @@
+/*  Outbreak Finder
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <iterator>
+#include <sstream>
+#include "Common/Cpp/Exceptions.h"
+#include "CommonFramework/StaticGlobals.h"
+#include "CommonFramework/GlobalAutoPaths.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/Tools/ErrorDumper.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "Pokemon/Resources/Pokemon_PokemonNames.h"
+#include "Pokemon/Inference/Pokemon_NameReader.h"
+#include "VideoGames/PokemonLA/Inference/Map/PokemonLA_SelectedRegionDetector.h"
+#include "VideoGames/PokemonLA/Inference/Map/PokemonLA_OutbreakReader.h"
+#include "VideoGames/PokemonLA/PokemonLA_Settings.h"
+#include "VideoGames/PokemonLA/Programs/PokemonLA_GameEntry.h"
+#include "VideoGames/PokemonLA/Programs/PokemonLA_GameSave.h"
+#include "VideoGames/PokemonLA/Programs/PokemonLA_RegionNavigation.h"
+#include "VideoGames/PokemonLA/Resources/PokemonLA_AvailablePokemon.h"
+#include "VideoGames/PokemonLA/Resources/PokemonLA_PokemonSprites.h"
+#include "VideoGames/PokemonLA/Inference/Objects/PokemonLA_ButtonDetector.h"
+#include "VideoGames/PokemonLA/Inference/Objects/PokemonLA_MMOQuestionMarkDetector.h"
+#include "PokemonLA_MMORoutines.h"
+
+
+#include "PokemonLA_OutbreakFinder.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+    using namespace Pokemon;
+
+
+
+StringSelectDatabase make_mo_database(){
+    const SpriteDatabase& sprites = ALL_POKEMON_SPRITES();
+    const std::vector<std::string>& slugs = HISUI_OUTBREAK_SLUGS();
+
+    static const ImageRGB32 mmo_sprite(RESOURCE_PATH() + "PokemonLA/MMOQuestionMark-Template.png");
+
+    StringSelectDatabase ret;
+    ret.add_entry(StringSelectEntry("fieldlands-mmo",   "Fieldlands MMO",   mmo_sprite));
+    ret.add_entry(StringSelectEntry("mirelands-mmo",    "Mirelands MMO",    mmo_sprite));
+    ret.add_entry(StringSelectEntry("coastlands-mmo",   "Coastlands MMO",   mmo_sprite));
+    ret.add_entry(StringSelectEntry("highlands-mmo",    "Highlands MMO",    mmo_sprite));
+    ret.add_entry(StringSelectEntry("icelands-mmo",     "Icelands MMO",     mmo_sprite));
+    for (const std::string& slug : slugs){
+        const PokemonNames& name = get_pokemon_name(slug);
+        const SpriteDatabase::Sprite& sprite = sprites.get_throw(slug);
+        ret.add_entry(StringSelectEntry(
+            slug, name.display_name(),
+            sprite.icon
+        ));
+    }
+    return ret;
+}
+const StringSelectDatabase& MO_DATABASE(){
+    static const StringSelectDatabase database = make_mo_database();
+    return database;
+}
+
+StringSelectDatabase make_mmo_database(){
+    const SpriteDatabase& sprites = ALL_MMO_SPRITES();
+    const std::vector<std::string>& slugs = MMO_FIRST_WAVE_SPRITE_SLUGS();
+    std::vector<std::string> displays = load_pokemon_slug_json_list("PokemonLA/MMOFirstWaveSpriteNameDisplay.json");
+
+    if (slugs.size() != displays.size()){
+        throw FileException(
+            nullptr, PA_CURRENT_FUNCTION,
+            "Name and slug lists are not the same size.",
+            "PokemonLA/MMOFirstWaveSpriteNameDisplay.json"
+        );
+    }
+
+    StringSelectDatabase ret;
+    for (size_t c = 0; c < displays.size(); c++){
+        ret.add_entry(StringSelectEntry(
+            slugs[c], std::move(displays[c]),
+            sprites.get_throw(slugs[c]).icon
+        ));
+    }
+    return ret;
+}
+const StringSelectDatabase& MMO_DATABASE(){
+    static const StringSelectDatabase database = make_mmo_database();
+    return database;
+}
+
+
+OutbreakFinder_Descriptor::OutbreakFinder_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonLA:OutbreakFinder",
+        STRING_POKEMON + " LA", "Outbreak Finder",
+        "Programs/PokemonLA/OutbreakFinder.html",
+        "Search for an outbreak for a specific " + STRING_POKEMON,
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+class OutbreakFinder_Descriptor::Stats : public StatsTracker{
+public:
+    Stats()
+        : checks(m_stats["Checks"])
+        , errors(m_stats["Errors"])
+        , outbreaks(m_stats["Outbreaks"])
+        , mmos(m_stats["MMOs"])
+        , mmo_pokemon(m_stats["MMO Pokemon"])
+        , stars(m_stats["Stars"])
+        , matches(m_stats["Matches"])
+    {
+        m_display_order.emplace_back("Checks");
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+        m_display_order.emplace_back("Outbreaks");
+        m_display_order.emplace_back("MMOs");
+        m_display_order.emplace_back("MMO Pokemon");
+        m_display_order.emplace_back("Stars");
+        m_display_order.emplace_back("Matches", HIDDEN_IF_ZERO);
+    }
+
+    std::atomic<uint64_t>& checks;
+    std::atomic<uint64_t>& errors;
+    std::atomic<uint64_t>& outbreaks;
+    std::atomic<uint64_t>& mmos;
+    std::atomic<uint64_t>& mmo_pokemon;
+    std::atomic<uint64_t>& stars; // MMO star symbols
+    std::atomic<uint64_t>& matches;
+};
+std::unique_ptr<StatsTracker> OutbreakFinder_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+
+
+
+
+OutbreakFinder::OutbreakFinder()
+    : GO_HOME_WHEN_DONE(false)
+    , RESET_GAME_AND_CONTINUE_SEARCHING(
+        "<b>Reset Game and Skip Outbreak at Start</b><br>If the last outbreak found by the program does not yield what you want, check "
+        "this option to let the program reset the game and skip the ongoing outbreaks at start, before continuing the search.<br>"
+        "Note: you must have saved at Jubilife Village front gate beforehand.",
+        LockMode::LOCK_WHILE_RUNNING,
+        false
+    )
+    , LANGUAGE(
+        "<b>Game Language:</b>",
+        Pokemon::PokemonNameReader::instance().languages(),
+        LockMode::LOCK_WHILE_RUNNING,
+        true
+    )
+    , DESIRED_MO_SLUGS(
+        "<b>Desired Outbreak " + STRING_POKEMON + ":</b><br>Stop when anything on this list is found.",
+        STRING_POKEMON, MO_DATABASE(), "cherubi"
+    )
+    , DESIRED_MMO_SLUGS(
+        "<b>Desired first MMO wave " + STRING_POKEMON + ":</b><br>Stop when anything on this list is found.",
+        STRING_POKEMON, MMO_DATABASE(), "rowlet"
+    )
+    , DESIRED_STAR_MMO_SLUGS(
+        "<b>Desired first MMO wave " + STRING_POKEMON + " with shiny symbols:</b><br>Stop when anything on this list is found.",
+        STRING_POKEMON, MMO_DATABASE(), "rowlet"
+    )
+    , DEBUG_MODE(
+        "<b>Debug Mode:</b><br>Save MMO Sprite to debug folder.",
+        LockMode::LOCK_WHILE_RUNNING,
+        false
+    )
+    , NOTIFICATION_STATUS("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATION_MATCHED(
+        "Match Found",
+        true, true, ImageAttachmentMode::JPG,
+        {"Notifs"}
+    )
+    , NOTIFICATIONS({
+        &NOTIFICATION_STATUS,
+        &NOTIFICATION_MATCHED,
+        &NOTIFICATION_ERROR_RECOVERABLE,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+{
+    PA_ADD_OPTION(RESET_GAME_AND_CONTINUE_SEARCHING);
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+    PA_ADD_OPTION(LANGUAGE);
+    PA_ADD_OPTION(DESIRED_MO_SLUGS);
+    PA_ADD_OPTION(DESIRED_MMO_SLUGS);
+    PA_ADD_OPTION(DESIRED_STAR_MMO_SLUGS);
+    PA_ADD_OPTION(NOTIFICATIONS);
+
+    if (STATIC_GLOBALS.DEVELOPER_MODE){
+        PA_ADD_OPTION(DEBUG_MODE);
+    }
+}
+
+
+std::set<std::string> OutbreakFinder::read_travel_map_outbreaks(
+    SingleSwitchProgramEnvironment& env, ProControllerContext& context,
+    const std::set<std::string>& desired_events
+){
+    OutbreakFinder_Descriptor::Stats& stats = env.current_stats<OutbreakFinder_Descriptor::Stats>();
+
+    VideoOverlaySet overlays(env.console);
+
+    MapRegion start_region = MapRegion::NONE;
+
+    MapRegion current_region = detect_selected_region(env.console, context);
+    if (current_region == MapRegion::NONE){
+        env.console.log("Unable to detect selected region.", COLOR_RED);
+        return std::set<std::string>();
+    }
+
+    OutbreakReader reader(env.console, LANGUAGE, env.console);
+    reader.make_overlays(overlays);
+
+    MMOQuestionMarkDetector question_mark_detector(env.logger());
+//    VideoOverlaySet mmo_overlay_set(env.console);
+    std::array<bool, 5> mmo_appears = question_mark_detector.detect_MMO_on_hisui_map(env.console.video().snapshot());
+    add_hisui_MMO_detection_to_overlay(mmo_appears, overlays);
+
+    // If the current region is a wild area, the yellow cursor may overlap with the MMO question marker, causing
+    // wrong detection. So we have to check it's location again by moving the cursor to the next location
+    if (current_region != MapRegion::JUBILIFE && current_region != MapRegion::RETREAT){
+        // MapRegion starts with None and JUBILIFE. Skip those two, so -2.
+        size_t current_wild_area_index = (int)current_region - 2;
+        pbf_press_dpad(context, DPAD_RIGHT, 160ms, 320ms);
+        context.wait_for_all_requests();
+        auto new_mmo_read = question_mark_detector.detect_MMO_on_hisui_map(env.console.video().snapshot());
+        mmo_appears[current_wild_area_index] = new_mmo_read[current_wild_area_index];
+        if (new_mmo_read[current_wild_area_index]){
+            add_hisui_MMO_detection_to_overlay(mmo_appears, overlays);
+        }
+        // now mmo_appears should contain correct detection of MMO question marks.
+    }
+
+    // reset current_region to start the looping of checking each wild area's outbreak pokemon name:
+    current_region = MapRegion::NONE;
+
+    std::set<std::string> found;
+
+    // First, check whether we match MMOs:
+    const auto& mmo_names = MMO_NAMES();
+    for (int i = 0; i < 5; i++){
+        if (mmo_appears[i]){
+            auto iter = desired_events.find(mmo_names[i]);
+            if (iter != desired_events.end()){
+                env.console.log("Found a match!", COLOR_BLUE);
+                found.insert(mmo_names[i]);
+            }
+            stats.mmos++;
+        }
+    }
+    env.update_stats();
+    
+    // Next, go to each region, read the outbreak names:
+    while (true){
+        current_region = detect_selected_region(env.console, context);
+        if (current_region == MapRegion::NONE){
+            env.console.log("Unable to detect selected region.", COLOR_RED);
+            return std::set<std::string>();
+        }
+        if (start_region == MapRegion::NONE){
+            start_region = current_region;
+        }else if (start_region == current_region){
+            // We've visited all the regions. Exit the loop.
+            break;
+        }
+
+        if (current_region != MapRegion::JUBILIFE && current_region != MapRegion::RETREAT){
+            // MapRegion starts with None and JUBILIFE. Skip those two, so -2.
+            const int wild_region_index = (int)current_region - 2;
+            if (mmo_appears[wild_region_index]){
+                env.log(std::string(MAP_REGION_NAMES[(int)current_region]) + " have MMO.", COLOR_ORANGE);
+            }else{
+                OCR::StringMatchResult result = reader.read(env.console.video().snapshot());
+                if (!result.results.empty()){
+                    stats.outbreaks++;
+                }
+                for (const auto& item : result.results){
+                    auto iter = desired_events.find(item.second.token);
+                    if (iter != desired_events.end()){
+                        env.console.log("Found a match!", COLOR_BLUE);
+                        found.insert(item.second.token);
+                    }
+                }
+            }
+        }
+
+        pbf_press_dpad(context, DPAD_RIGHT, 160ms, 320ms);
+        context.wait_for_all_requests();
+    }
+
+    stats.checks++;
+
+    return found;
+}
+
+
+void OutbreakFinder::goto_region_and_return(
+    SingleSwitchProgramEnvironment& env, ProControllerContext& context,
+    bool inside_travel_map,
+    bool fresh_from_reset
+){
+    env.log("Go to a random region and back to refresh outbreaks...");
+    env.console.overlay().add_log("Refresh outbreaks");
+    OutbreakFinder_Descriptor::Stats& stats = env.current_stats<OutbreakFinder_Descriptor::Stats>();
+
+    if (inside_travel_map == false){
+        // Move to guard to open map
+        open_travel_map_from_jubilife(env, env.console, context, fresh_from_reset);
+        context.wait_for(std::chrono::milliseconds(500));
+    }
+
+    MapRegion current_region = MapRegion::NONE;
+    for (size_t c = 0; c < 10; c++){
+        current_region = detect_selected_region(env.console, context);
+        if (is_wild_land(current_region)){
+            break;
+        }
+
+        if (current_region == MapRegion::JUBILIFE){
+            // Move to fieldlands
+            pbf_press_dpad(context, DPAD_RIGHT, 160ms, 320ms);
+        }else if (current_region == MapRegion::RETREAT){
+            // Move to icelands
+            pbf_press_dpad(context, DPAD_LEFT, 160ms, 320ms);
+        }else{
+            // Cannot read current region. Try move to another region
+            pbf_press_dpad(context, DPAD_RIGHT, 160ms, 320ms);
+        }
+        context.wait_for_all_requests();
+    }
+    if (is_wild_land(current_region) == false){
+        dump_image(env.console.logger(), env.program_info(), "FindRegion", env.console.video().snapshot());
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "Unable to find a wild land.",
+            env.console
+        );
+    }
+
+    mash_A_to_change_region(env, env.console, context);
+
+    Camp camp = Camp::FIELDLANDS_FIELDLANDS;
+    switch (current_region){
+    case MapRegion::FIELDLANDS:
+        camp = Camp::FIELDLANDS_FIELDLANDS;
+        break;
+    case MapRegion::MIRELANDS:
+        camp = Camp::MIRELANDS_MIRELANDS;
+        break;
+    case MapRegion::COASTLANDS:
+        camp = Camp::COASTLANDS_BEACHSIDE;
+        break;
+    case MapRegion::HIGHLANDS:
+        camp = Camp::HIGHLANDS_HIGHLANDS;
+        break;
+    case MapRegion::ICELANDS:
+        camp = Camp::ICELANDS_SNOWFIELDS;
+        break;
+    default:
+        throw InternalProgramError(&env.console.logger(), PA_CURRENT_FUNCTION, "Invalid region.");
+    }
+    goto_professor(env.console, context, camp);
+
+    while (true){
+        context.wait_for_all_requests();
+        ButtonDetector button_detector(
+            env.console, env.console,
+            ButtonType::ButtonA, ImageFloatBox(0.50, 0.50, 0.30, 0.30),
+            std::chrono::milliseconds(200), true
+        );
+        int ret = run_until<ProControllerContext>(
+            env.console, context,
+            [](ProControllerContext& context){
+                for (size_t c = 0; c < 10; c++){
+                    pbf_press_button(context, BUTTON_A, 160ms, 1000ms);
+                }
+            },
+            {{button_detector}}
+        );
+        if (ret >= 0){
+            context.wait_for(std::chrono::milliseconds(500));
+            pbf_press_dpad(context, DPAD_DOWN, 160ms, 840ms);
+            break;
+        }
+        env.console.log("Did not detect option to return to Jubilife.", COLOR_RED);
+        pbf_mash_button(context, BUTTON_B, 5000ms);
+        stats.errors++;
+    }
+
+    mash_A_to_change_region(env, env.console, context);
+}
+
+
+std::vector<std::string> OutbreakFinder::run_iteration(
+    SingleSwitchProgramEnvironment& env, ProControllerContext& context,
+    const std::set<std::string>& desired_hisui_map_events,
+    const std::set<std::string>& desired_outbreaks,
+    const std::set<std::string>& desired_MMOs,
+    const std::set<std::string>& desired_star_MMOs,
+    bool& fresh_from_reset
+){
+    OutbreakFinder_Descriptor::Stats& stats = env.current_stats<OutbreakFinder_Descriptor::Stats>();
+
+    //  Enter map.
+    try{
+        open_travel_map_from_jubilife(env, env.console, context, fresh_from_reset);
+    }catch (OperationFailedException&){
+        stats.errors++;
+        throw;
+    }
+    context.wait_for(std::chrono::milliseconds(500));
+
+    // found_hisui_map_events: desired pokemon names or MMO names
+    std::set<std::string> found_hisui_map_events;
+    found_hisui_map_events = read_travel_map_outbreaks(env, context, desired_hisui_map_events);
+
+    bool inside_travel_map = true;
+    if (found_hisui_map_events.size() > 0){
+        // Check if we found any Massive Outbreak pokemon (including MMO symbol targets)
+        {
+            std::vector<std::string> desired_outbreaks_found;
+            for (const auto& found : found_hisui_map_events){
+                if (desired_outbreaks.find(found) != desired_outbreaks.end()){
+                    desired_outbreaks_found.push_back(found);
+                }
+            }
+            if (desired_outbreaks_found.size() > 0){
+                stats.matches += desired_outbreaks_found.size();
+                std::ostringstream os;
+                os << "Found following desired outbreak" << (desired_outbreaks_found.size() > 1 ? "s: " : ": ");
+                for (const auto& outbreak: desired_outbreaks_found){
+                    os << outbreak << ", ";
+                    env.console.overlay().add_log("Found " + outbreak, COLOR_GREEN);
+                }
+                env.log(os.str(), COLOR_GREEN);
+
+                return desired_outbreaks_found;
+            }
+            
+            env.log("No desired outbreak.");
+        }
+
+        // What we found is MMO symbols for MMO pokemon.
+        // Go into those regions to check MMO details.
+
+        // Cancel map view
+        inside_travel_map = false;
+        pbf_press_button(context, BUTTON_B, 400ms, 400ms);
+        // Leave the guard.
+        pbf_move_left_joystick(context, {0, +1}, 800ms, 400ms);
+        // Checking MMO costs Aguav Berries.
+        // To not waste them, save here so that we can reset to get berries back.
+        save_game_from_overworld(env, env.console, context);
+
+        for (const auto& mmo_name: found_hisui_map_events){
+            int num_new_mmo_pokemon_found = 0;
+            int num_new_star_mmo_found = 0;
+            std::set<std::string> found_pokemon = enter_region_and_read_MMO(
+                env, context,
+                mmo_name,
+                desired_MMOs,
+                desired_star_MMOs,
+                DEBUG_MODE,
+                num_new_mmo_pokemon_found,
+                num_new_star_mmo_found,
+                fresh_from_reset
+            );
+            stats.mmo_pokemon += num_new_mmo_pokemon_found;
+            stats.stars += num_new_star_mmo_found;
+            env.update_stats();
+
+            if (found_pokemon.size() > 0){
+                stats.matches += found_pokemon.size();
+                std::ostringstream os;
+                os << "Found desired MMO pokemon (including desired MMO pokemon with star symbols): ";
+                for (const auto& pokemon : found_pokemon){
+                    os << pokemon << ", ";
+                    env.console.overlay().add_log("Found " + pokemon, COLOR_GREEN);
+                }
+                env.log(os.str(), COLOR_GREEN);
+                return std::vector<std::string>(found_pokemon.begin(), found_pokemon.end());
+            }
+
+            env.log("No target MMO sprite found. Reset game...");
+            env.console.overlay().add_log("No target MMO");
+            pbf_press_button(context, BUTTON_HOME, 160ms, GameSettings::instance().GAME_TO_HOME_DELAY0);
+            fresh_from_reset = reset_game_from_home(env, env.console, context);
+        }
+    }
+
+    env.update_stats();
+    send_program_status_notification(env, NOTIFICATION_STATUS);
+
+    //  Go to an arbitrary region and return to refresh outbreaks.
+    goto_region_and_return(env, context, inside_travel_map, fresh_from_reset);
+
+    return std::vector<std::string>();
+}
+
+
+std::set<std::string> OutbreakFinder::to_set(const StringSelectTableOption& option){
+    std::set<std::string> ret;
+    for (std::string& slug : option.all_slugs()){
+        ret.insert(std::move(slug));
+    }
+    return ret;
+}
+
+void OutbreakFinder::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    //  Connect the controller.
+    require_player(env.console, context, BUTTON_ZL);
+
+    bool fresh_from_reset = false;
+    if (RESET_GAME_AND_CONTINUE_SEARCHING){
+        // the outbreak found by the last program run did not yield what the user wants.
+        // so we reset the game now and skip the ongoing outbreaks
+        env.log("Reset game and skip ongoing outbreaks");
+        pbf_press_button(context, BUTTON_HOME, 160ms, GameSettings::instance().GAME_TO_HOME_DELAY0);
+        fresh_from_reset = reset_game_from_home(env, env.console, context);
+
+        //  Go to region and return.
+        bool inside_travel_map = false;
+        goto_region_and_return(env, context, inside_travel_map, fresh_from_reset);
+    }
+
+    std::set<std::string> desired_outbreaks = to_set(DESIRED_MO_SLUGS);
+    std::set<std::string> desired_MMO_pokemon = to_set(DESIRED_MMO_SLUGS);
+    std::set<std::string> desired_star_MMO_pokemon = to_set(DESIRED_STAR_MMO_SLUGS);
+    {
+        std::ostringstream os;
+        os << "Desired outbreaks: ";
+        std::copy(desired_outbreaks.begin(), desired_outbreaks.end(), std::ostream_iterator<std::string>(os, ", "));
+        env.log(os.str());
+        os = std::ostringstream();
+        os << "Desired first-wave MMO pokemon: ";
+        std::copy(desired_MMO_pokemon.begin(), desired_MMO_pokemon.end(), std::ostream_iterator<std::string>(os, ", "));
+        env.log(os.str());
+        os = std::ostringstream();
+        os << "Desired MMO pokemon with star: ";
+        std::copy(desired_star_MMO_pokemon.begin(), desired_star_MMO_pokemon.end(), std::ostream_iterator<std::string>(os, ", "));
+        env.log(os.str());
+    }
+
+    // desired_hisui_map_events: the slugs of travel map event. This includes
+    // - Massive Outbreak pokemon
+    // - Question mark MMO event at any region
+    std::set<std::string> desired_hisui_map_events = desired_outbreaks;
+
+    // If the user sets MMO pokemon, then we should add the MMO map events that may spawn those MMO pokemon to
+    // `desired_hisui_map_events`.
+
+    // MMO_targets: MMO map event slug (e.g. "fieldlands-mmo") -> how many desired MMO pokemon can spawn on this map
+    std::map<std::string, int> MMO_targets;
+    // Check if each MMO map event may spawn desired MMO pokemon:
+    for (size_t i = 0; i < 5; i++){
+        for (const std::string& sprite_slug: MMO_FIRST_WAVE_REGION_SPRITE_SLUGS()[i]){
+            if (desired_MMO_pokemon.find(sprite_slug) != desired_MMO_pokemon.end()
+                || desired_star_MMO_pokemon.find(sprite_slug) != desired_star_MMO_pokemon.end()
+            ){
+                MMO_targets[MMO_NAMES()[i]]++;
+            }
+        }
+    }
+
+    std::ostringstream os;
+    os << "User requires MMO pokemon. Need to visit (\"map MMO name\", \"how many desired MMO pokemon on the map\"): ";
+    for (const auto& p : MMO_targets){
+        os << "(" << p.first << ", " << p.second << ") ";
+    }
+    env.log(os.str());
+
+    // Add MMO map event targets (e.g. "fieldlands-mmo") derived from user selected MMO pokemon to 
+    // `desired_hisui_map_events`.
+    for (const auto& p : MMO_targets){
+        desired_hisui_map_events.insert(p.first);
+    }
+
+    std::vector<std::string> found_outbreaks;
+    while (true){
+        found_outbreaks = run_iteration(
+            env, context,
+            desired_hisui_map_events,
+            desired_outbreaks,
+            desired_MMO_pokemon,
+            desired_star_MMO_pokemon,
+            fresh_from_reset
+        );
+        if (found_outbreaks.size() > 0)
+        {
+            break;
+        }
+    }
+
+    env.update_stats();
+
+    os.str("");  // clear ostringstream
+    os << "Found ";
+    for (size_t i = 0; i < found_outbreaks.size(); i++){
+        os << found_outbreaks[i];
+        if (i + 1 != found_outbreaks.size()){
+            os << ", ";
+        }
+    }
+    send_program_finished_notification(
+        env, NOTIFICATION_MATCHED,
+        os.str(),
+        env.console.video().snapshot()
+    );
+
+    GO_HOME_WHEN_DONE.run_end_of_program(context);
+}
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/General/PokemonLA_OutbreakFinder.h b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/General/PokemonLA_OutbreakFinder.h
new file mode 100644
index 0000000000..7b4fdfe004
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/General/PokemonLA_OutbreakFinder.h
@@ -0,0 +1,110 @@
+/*  Outbreak Finder
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLA_OutbreakFinder_H
+#define PokemonAutomation_PokemonLA_OutbreakFinder_H
+
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "CommonTools/Options/StringSelectTableOption.h"
+#include "CommonTools/Options/LanguageOCROption.h"
+#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+
+class OutbreakFinder_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    OutbreakFinder_Descriptor();
+
+    class Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+
+class OutbreakFinder : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = OutbreakFinder_Descriptor;
+    OutbreakFinder();
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+
+private:
+    // Run one iteration of the outbreak finder loop and return any found outbreaks.
+    // The iteration includes:
+    // 1. Starting at Jubilife Village gate, go to check the map for outbreaks.
+    // 2. If found desired outbreaks, stop.
+    // 3. If need to check MMOs, save in front of gate, then go to each region with MMO and talk to Mai to
+    //    reveal MMO pokemon. Reset if no desired MMO to conserve Aguav Berries. 
+    // 4. If found desired MMO pokemon, stop.
+    // 5. No desired outbreak in this iteration, go to an arbitrary region and return to village to refresh outbreaks.
+    //
+    // - desired_hisui_map_events: desired events happening on the travel map of Hisui when leaving Jubilife Village.
+    //   It contains desired pokemon outbreak names and MMO outbreak names (e.g. "fieldlands-mmo"). If there are
+    //   desired MMO pokemon (including those with star symbols), the MMO outbreaks that may spawn them are also
+    //   included in `desired_hisui_map_events`.
+    // - desired_outbreaks: desired events happening on the travel map of Hisui when leaving Jubilife Village.
+    //   This includes any user selected outbreak pokemon and user explicitly selected MMO events (e.g. "fieldlands-mmo")
+    //   in DESIRED_MO_SLUGS.
+    //   User selected MMO pokemon (including those with star symbols) do not affect `desired_outbreaks`.
+    // - desired_MMO_pokemon: user desired MMO pokemon selected by `DESIRED_MMO_SLUGS`.
+    //   User selected MMO pokemon with star symbols, `DESIRED_STAR_MMO_SLUGS` do not affect `desired_MMO_pokemon`. 
+    // - desired_star_MMO_pokemon: user desired MMO pokemon with star symbols.
+    std::vector<std::string> run_iteration(SingleSwitchProgramEnvironment& env, ProControllerContext& context,
+        const std::set<std::string>& desired_hisui_map_events,
+        const std::set<std::string>& desired_outbreaks,
+        const std::set<std::string>& desired_MMO_pokemon,
+        const std::set<std::string>& desired_star_MMO_pokemon,
+        bool& fresh_from_reset
+    );
+    
+    //  Read the travel map from Jublilife village to find any desired pokemon or MMO events. 
+    //  Return true if program should stop (match found).
+    //  desired_events: the desired set of pokemon slugs and MMO events.
+    std::set<std::string> read_travel_map_outbreaks(
+        SingleSwitchProgramEnvironment& env, ProControllerContext& context,
+        const std::set<std::string>& desired_events
+    );
+
+    // Go to a random wild region and return to refresh outbreaks.
+    // If `inside_map` is true, the function is called when the game is inside the travel map.
+    // Otherwise, the function is called when the player character is standing at the program start location.
+    void goto_region_and_return(
+        SingleSwitchProgramEnvironment& env, ProControllerContext& context,
+        bool inside_map,
+        bool fresh_from_reset
+    );
+
+    static std::set<std::string> to_set(const StringSelectTableOption& option);
+
+
+private:
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
+    BooleanCheckBoxOption RESET_GAME_AND_CONTINUE_SEARCHING;
+
+    OCR::LanguageOCROption LANGUAGE;
+
+    StringSelectTableOption DESIRED_MO_SLUGS;
+    StringSelectTableOption DESIRED_MMO_SLUGS;
+    StringSelectTableOption DESIRED_STAR_MMO_SLUGS;
+
+    BooleanCheckBoxOption DEBUG_MODE;
+
+    EventNotificationOption NOTIFICATION_STATUS;
+    EventNotificationOption NOTIFICATION_MATCHED;
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/General/PokemonLA_PokedexTasksReader.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/General/PokemonLA_PokedexTasksReader.cpp
new file mode 100644
index 0000000000..3c64dca785
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/General/PokemonLA_PokedexTasksReader.cpp
@@ -0,0 +1,107 @@
+/*  Pokedex Tasks Reader
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <array>
+#include <fstream>
+#include "CommonFramework/ImageTypes/ImageRGB32.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Images/ImageFilter.h"
+#include "CommonTools/OCR/OCR_NumberReader.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+
+#include "Pokemon/Pokemon_Strings.h"
+#include "PokemonLA_PokedexTasksReader.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+    using namespace Pokemon;
+
+
+class PokemonTasksReader{
+public:
+    PokemonTasksReader(VideoStream& stream)
+        : m_stream(stream)
+        , m_tasks_box{
+            OverlayBoxScope(stream.overlay(), {0.400, 0.190, 0.040, 0.045}),
+            OverlayBoxScope(stream.overlay(), {0.400, 0.244, 0.040, 0.045}),
+            OverlayBoxScope(stream.overlay(), {0.400, 0.298, 0.040, 0.045}),
+            OverlayBoxScope(stream.overlay(), {0.400, 0.353, 0.040, 0.045}),
+            OverlayBoxScope(stream.overlay(), {0.400, 0.406, 0.040, 0.045}),
+            OverlayBoxScope(stream.overlay(), {0.400, 0.460, 0.040, 0.045}),
+            OverlayBoxScope(stream.overlay(), {0.400, 0.514, 0.040, 0.045}),
+            OverlayBoxScope(stream.overlay(), {0.400, 0.568, 0.040, 0.045}),
+            OverlayBoxScope(stream.overlay(), {0.400, 0.622, 0.040, 0.045})
+        }
+    {}
+
+    std::array<int, 9> read_tasks(const ImageViewRGB32& screen) const
+    {
+        std::array<int, 9> tasks{};
+        for (size_t i = 0; i < m_tasks_box.size(); ++i)
+        {
+            ImageRGB32 image = to_blackwhite_rgb32_range(
+                extract_box_reference(screen, m_tasks_box[i]),
+                false,
+                0xff808080, 0xffffffff
+            );
+            tasks[i] = OCR::read_number(m_stream.logger(), image);
+        }
+        return tasks;
+    }
+
+private:
+    VideoStream& m_stream;
+    std::array<OverlayBoxScope, 9> m_tasks_box;
+};
+
+PokedexTasksReader_Descriptor::PokedexTasksReader_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonLA:PokedexTasksReader",
+        STRING_POKEMON + " LA", STRING_POKEDEX + " Tasks Reader",
+        "Programs/PokemonLA/PokedexTasksReader.html",
+        "Read all the tasks in your " + STRING_POKEDEX + " and output a file with the tasks you did.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+
+PokedexTasksReader::PokedexTasksReader(){}
+
+
+void PokedexTasksReader::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    //  Connect the controller.
+    require_player(env.console, context, BUTTON_LCLICK);
+
+    std::ofstream output_file("output.txt");
+
+    for (int i = 0; i < 242; ++i){
+        PokemonTasksReader reader(env.console);
+        std::array<int, 9> tasks = reader.read_tasks(env.console.video().snapshot());
+        for (auto task : tasks){
+            if (task != -1){
+                output_file << task << "\n";
+            }
+        }
+        pbf_press_dpad(context, DPAD_DOWN, 80ms, 1000ms);
+        context.wait_for_all_requests();
+    }
+
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+}
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/General/PokemonLA_PokedexTasksReader.h b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/General/PokemonLA_PokedexTasksReader.h
new file mode 100644
index 0000000000..e868b943b7
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/General/PokemonLA_PokedexTasksReader.h
@@ -0,0 +1,38 @@
+/*  Pokedex Tasks Reader
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLA_PokedexTasksReader_H
+#define PokemonAutomation_PokemonLA_PokedexTasksReader_H
+
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+
+class PokedexTasksReader_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    PokedexTasksReader_Descriptor();
+};
+
+
+class PokedexTasksReader : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = PokedexTasksReader_Descriptor;
+    PokedexTasksReader();
+
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+};
+
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/General/PokemonLA_RamanasIslandCombee.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/General/PokemonLA_RamanasIslandCombee.cpp
new file mode 100644
index 0000000000..a4d9b74610
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/General/PokemonLA_RamanasIslandCombee.cpp
@@ -0,0 +1,354 @@
+/*  Ramanas Island Combee Finder
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/StaticGlobals.h"
+#include "CommonFramework/Exceptions/ProgramFinishedException.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "Pokemon/Inference/Pokemon_NameReader.h"
+#include "VideoGames/PokemonLA/PokemonLA_Settings.h"
+#include "VideoGames/PokemonLA/PokemonLA_TravelLocations.h"
+#include "VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattleMenuDetector.h"
+#include "VideoGames/PokemonLA/Inference/PokemonLA_BlackOutDetector.h"
+#include "VideoGames/PokemonLA/Inference/PokemonLA_OverworldDetector.h"
+#include "VideoGames/PokemonLA/Inference/Sounds/PokemonLA_ShinySoundDetector.h"
+#include "VideoGames/PokemonLA/Programs/PokemonLA_MountChange.h"
+#include "VideoGames/PokemonLA/Programs/PokemonLA_GameEntry.h"
+#include "VideoGames/PokemonLA/Programs/General/PokemonLA_RamanasIslandCombee.h"
+#include "VideoGames/PokemonLA/Programs/PokemonLA_LeapPokemonActions.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+    using namespace Pokemon;
+
+
+
+RamanasCombeeFinder_Descriptor::RamanasCombeeFinder_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonLA:Ramanas Island Combee Finder",
+        STRING_POKEMON + " LA", "Ramanas Combee Finder",
+        "Programs/PokemonLA/RamanasCombeeFinder.html",
+        "Check Ramanas Island Tree until a Combee is found.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+class RamanasCombeeFinder_Descriptor::Stats : public StatsTracker{
+public:
+    Stats()
+        : attempts(m_stats["Attempts"])
+        , trees(m_stats["Trees"])
+        , errors(m_stats["Errors"])
+        , blackouts(m_stats["Blackouts"])
+        , found(m_stats["Found"])
+        , enroute_shinies(m_stats["Enroute Shinies"])
+    {
+        m_display_order.emplace_back("Attempts");
+        m_display_order.emplace_back("Trees");
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+        m_display_order.emplace_back("Blackouts", HIDDEN_IF_ZERO);
+        m_display_order.emplace_back("Found");
+        m_display_order.emplace_back("Enroute Shinies");
+        m_aliases["Shinies"] = "Enroute Shinies";
+    }
+
+    std::atomic<uint64_t>& attempts;
+    std::atomic<uint64_t>& trees;
+    std::atomic<uint64_t>& errors;
+    std::atomic<uint64_t>& blackouts;
+    std::atomic<uint64_t>& found;
+    std::atomic<uint64_t>& enroute_shinies;
+};
+std::unique_ptr<StatsTracker> RamanasCombeeFinder_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+
+RamanasCombeeFinder:: RamanasCombeeFinder()
+    : LANGUAGE(
+        "<b>Game Language</b>",
+        Pokemon::PokemonNameReader::instance().languages(),
+        LockMode::LOCK_WHILE_RUNNING,
+        true
+    )
+    , SHINY_DETECTED_ENROUTE(
+        "Enroute Shiny Action",
+        "This applies if a shiny is detected while traveling in the overworld.",
+        "0 ms"
+    )
+    , NOTIFICATION_STATUS("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_STATUS,
+        &SHINY_DETECTED_ENROUTE.NOTIFICATIONS,
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_RECOVERABLE,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+    , SAVE_DEBUG_VIDEO(
+        "<b>Save debug videos to Switch:</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        false
+    )
+{
+    PA_ADD_OPTION(LANGUAGE);
+    PA_ADD_OPTION(SHINY_DETECTED_ENROUTE);
+    PA_ADD_OPTION(NOTIFICATIONS);
+    if (STATIC_GLOBALS.DEVELOPER_MODE){
+        PA_ADD_OPTION(SAVE_DEBUG_VIDEO);
+    }
+}
+
+
+void RamanasCombeeFinder::check_tree_no_stop(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    context.wait_for_all_requests();
+    disable_shiny_sound(context);
+    // Throw pokemon
+    pbf_press_button(context, BUTTON_ZR, 500ms, 1500ms);
+    context.wait_for_all_requests();
+    env.current_stats<RamanasCombeeFinder_Descriptor::Stats>().trees++;
+    env.update_stats();
+}
+
+bool RamanasCombeeFinder::check_tree(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    context.wait_for_all_requests();
+
+    disable_shiny_sound(context);
+    bool battle_found = check_tree_or_ore_for_battle(env.console, context);
+    env.current_stats<RamanasCombeeFinder_Descriptor::Stats>().trees++;
+    env.update_stats();
+
+    context.wait_for_all_requests();
+
+    bool ret = false;
+    if (battle_found){
+        ret = handle_battle(env, context);
+    }
+
+    enable_shiny_sound(context);
+
+    return ret;
+}
+
+
+void RamanasCombeeFinder::disable_shiny_sound(ProControllerContext& context){
+    context.wait_for_all_requests();
+    m_enable_shiny_sound.store(false, std::memory_order_release);
+}
+void RamanasCombeeFinder::enable_shiny_sound(ProControllerContext& context){
+    context.wait_for_all_requests();
+    m_enable_shiny_sound.store(true, std::memory_order_release);
+}
+
+bool RamanasCombeeFinder::handle_battle(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    RamanasCombeeFinder_Descriptor::Stats& stats = env.current_stats<RamanasCombeeFinder_Descriptor::Stats>();
+
+    PokemonDetails pokemon = get_pokemon_details(env.console, context, LANGUAGE);
+
+    pbf_press_button(context, BUTTON_B, 160ms, 1800ms);
+
+    context.wait_for_all_requests();
+
+    if (pokemon.name_candidates.find("combee") == pokemon.name_candidates.end()){
+        env.console.log("Not a Combee, leaving battle.");
+        exit_battle(env.console, context, ExitBattleMethod::RunAway);
+        return false;
+    }
+
+    env.console.log("Combee found");
+    stats.found++;
+
+    context.wait_for_all_requests();
+    throw ProgramFinishedException();
+//    on_battle_match_found(env, env.console, context, SHINY_DETECTED_ENROUTE, true);
+//    return true;
+}
+
+void RamanasCombeeFinder::grouped_path(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+
+    BattleMenuDetector battle_menu_detector(env.console, env.console, true);
+
+    int ret = run_until<ProControllerContext>(
+        env.console, context,
+        [&](ProControllerContext& context){
+
+            env.console.log("Checking Tree 1");
+            change_mount(env.console,context,MountState::BRAVIARY_ON);
+            pbf_move_left_joystick(context, {+0.874, +1}, 800ms, 160ms);
+            pbf_press_button(context, BUTTON_B, 19120ms, 0ms);
+            pbf_press_button(context, BUTTON_Y, 3040ms, 0ms);
+            pbf_move_right_joystick(context, {0, -1}, 720ms, 160ms);
+            check_tree_no_stop(env, context);
+
+            env.console.log("Checking Tree 2");
+            pbf_press_button(context, BUTTON_PLUS, 160ms, 1600ms);
+            pbf_move_left_joystick(context, {+0.898, +1}, 800ms, 160ms);
+            context.wait_for_all_requests();
+            enable_shiny_sound(context);
+            pbf_press_button(context, BUTTON_B, 3360ms, 0ms);
+            pbf_press_button(context, BUTTON_Y, 3040ms, 0ms);
+            pbf_move_right_joystick(context, {0, -1}, 720ms, 160ms);
+            check_tree_no_stop(env, context);
+
+            env.console.log("Checking Tree 3");
+            pbf_press_button(context, BUTTON_PLUS, 160ms, 1600ms);
+            pbf_move_left_joystick(context, {-1, +0.531}, 800ms, 160ms);
+            context.wait_for_all_requests();
+            enable_shiny_sound(context);
+            pbf_press_button(context, BUTTON_B, 2800ms, 0ms);
+            pbf_press_button(context, BUTTON_Y, 3040ms, 0ms);
+            pbf_move_right_joystick(context, {0, -1}, 720ms, 160ms);
+            check_tree_no_stop(env, context);
+
+            env.console.log("Checking Tree 4");
+            pbf_press_button(context, BUTTON_PLUS, 160ms, 1600ms);
+            pbf_move_left_joystick(context, {-0.609, -1}, 800ms, 160ms);
+            context.wait_for_all_requests();
+            enable_shiny_sound(context);
+            pbf_press_button(context, BUTTON_B, 3000ms, 0ms);
+            pbf_press_button(context, BUTTON_Y, 3040ms, 0ms);
+            pbf_move_right_joystick(context, {0, -1}, 720ms, 160ms);
+            check_tree_no_stop(env, context);
+
+            env.console.log("Checking Tree 5");
+            pbf_press_button(context, BUTTON_PLUS, 160ms, 1600ms);
+            pbf_move_left_joystick(context, {+0.567, +1}, 800ms, 160ms);
+            context.wait_for_all_requests();
+            enable_shiny_sound(context);
+            pbf_press_button(context, BUTTON_B, 680ms, 0ms);
+            pbf_press_button(context, BUTTON_Y, 3040ms, 0ms);
+            pbf_move_right_joystick(context, {0, -1}, 720ms, 160ms);
+        },
+        {
+            {battle_menu_detector},
+        }
+    );
+
+    if (ret == 0){
+        if (handle_battle(env, context)){
+            env.console.log("Battle found before last tree in the path.");
+        }
+
+    }else{
+        check_tree(env, context);
+        env.console.log("Checked all trees in the path.");
+    }
+
+}
+
+void RamanasCombeeFinder::run_iteration(
+    SingleSwitchProgramEnvironment& env, ProControllerContext& context,
+    bool fresh_from_reset
+){
+    RamanasCombeeFinder_Descriptor::Stats& stats = env.current_stats<RamanasCombeeFinder_Descriptor::Stats>();
+    stats.attempts++;
+    env.update_stats();
+    env.console.log("Starting route and shiny detection...");
+
+    for (size_t c = 0; true; c++){
+        context.wait_for_all_requests();
+        if (is_pokemon_selection(env.console, env.console.video().snapshot())){
+            break;
+        }
+        if (c >= 5){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "Failed to switch to Pokemon selection after 5 attempts.",
+                env.console
+            );
+        }
+        env.console.log("Not on Pokemon selection. Attempting to switch to it...", COLOR_ORANGE);
+        pbf_press_button(context, BUTTON_X, 160ms, 1840ms);
+    }
+
+    float shiny_coefficient = 1.0;
+
+    ShinySoundDetector shiny_detector(env.console, [&](float error_coefficient) -> bool{
+        //  Warning: This callback will be run from a different thread than this function.
+        if (!m_enable_shiny_sound.load()){
+            return false;
+        }
+        stats.enroute_shinies++;
+        shiny_coefficient = error_coefficient;
+        return on_shiny_callback(env, env.console, SHINY_DETECTED_ENROUTE, error_coefficient);
+    });
+
+    BlackOutDetector black_out_detector(env.console, env.console);
+
+    goto_camp_from_jubilife(
+        env, env.console, context,
+        TravelLocations::instance().Fieldlands_Heights,
+        fresh_from_reset
+    );
+
+    int ret = run_until<ProControllerContext>(
+        env.console, context,
+        [&](ProControllerContext& context){
+            grouped_path(env, context);
+            context.wait_for_all_requests();
+            goto_camp_from_overworld(env, env.console, context);
+            goto_professor(env.console, context, Camp::FIELDLANDS_FIELDLANDS);
+        },
+        {{shiny_detector, black_out_detector}}
+    );
+    shiny_detector.throw_if_no_sound();
+    if (ret == 0){
+        on_shiny_sound(env, env.console, context, SHINY_DETECTED_ENROUTE, shiny_coefficient);
+    }else if (ret == 1){
+        env.log("Character blacks out");
+        // black out.
+        stats.blackouts++;
+        env.update_stats();
+        if (SAVE_DEBUG_VIDEO){
+            // Take a video to know why it blacks out
+            pbf_press_button(context, BUTTON_CAPTURE, 2000ms, 2000ms);
+            context.wait_for_all_requests();
+        }
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "Black out.",
+            env.console
+        );
+    }
+
+    from_professor_return_to_jubilife(env, env.console, context);
+}
+
+void RamanasCombeeFinder::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    RamanasCombeeFinder_Descriptor::Stats& stats = env.current_stats<RamanasCombeeFinder_Descriptor::Stats>();
+
+    //  Connect the controller.
+    require_player(env.console, context, BUTTON_LCLICK);
+
+    bool fresh_from_reset = false;
+    while (true){
+        env.update_stats();
+        send_program_status_notification(env, NOTIFICATION_STATUS);
+        try{
+            run_iteration(env, context, fresh_from_reset);
+        }catch (OperationFailedExceptionWithScreenshot& e){
+            stats.errors++;
+            e.send_recoverable_error_notif_and_telemetry_report(env, NOTIFICATION_ERROR_RECOVERABLE);
+
+            pbf_press_button(context, BUTTON_HOME, 160ms, GameSettings::instance().GAME_TO_HOME_DELAY0);
+            fresh_from_reset = reset_game_from_home(env, env.console, context);
+        }
+    }
+
+    env.update_stats();
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+}
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/General/PokemonLA_RamanasIslandCombee.h b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/General/PokemonLA_RamanasIslandCombee.h
new file mode 100644
index 0000000000..ed486de84f
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/General/PokemonLA_RamanasIslandCombee.h
@@ -0,0 +1,65 @@
+/*  Combee Finder
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLA_RamanasIslandCombee_H
+#define PokemonAutomation_PokemonLA_RamanasIslandCombee_H
+
+#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "CommonTools/Options/LanguageOCROption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "VideoGames/PokemonLA/Options/PokemonLA_ShinyDetectedAction.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+
+class RamanasCombeeFinder_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    RamanasCombeeFinder_Descriptor();
+
+    class Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+
+class RamanasCombeeFinder: public SingleSwitchProgramInstance{
+public:
+    using Descriptor = RamanasCombeeFinder_Descriptor;
+    RamanasCombeeFinder();
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    void run_iteration(
+        SingleSwitchProgramEnvironment& env, ProControllerContext& context,
+        bool fresh_from_reset
+    );
+    void grouped_path(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+    void check_tree_no_stop(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+    bool check_tree(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+    bool handle_battle(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+    void disable_shiny_sound(ProControllerContext& context);
+    void enable_shiny_sound(ProControllerContext& context);
+
+private:
+    class RunRoute;
+
+    std::atomic<bool> m_enable_shiny_sound{true};
+
+    OCR::LanguageOCROption LANGUAGE;
+    OverworldShinyDetectedActionOption SHINY_DETECTED_ENROUTE;
+
+    EventNotificationOption NOTIFICATION_STATUS;
+    EventNotificationsOption NOTIFICATIONS;
+
+    BooleanCheckBoxOption SAVE_DEBUG_VIDEO;
+};
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/General/PokemonLA_SkipToFullMoon.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/General/PokemonLA_SkipToFullMoon.cpp
new file mode 100644
index 0000000000..011f28780e
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/General/PokemonLA_SkipToFullMoon.cpp
@@ -0,0 +1,130 @@
+/*  Skip to Full Moon
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonLA/Inference/Objects/PokemonLA_ArcPhoneDetector.h"
+#include "VideoGames/PokemonLA/Inference/PokemonLA_ItemCompatibilityDetector.h"
+#include "PokemonLA_SkipToFullMoon.h"
+
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+using namespace Pokemon;
+
+
+SkipToFullMoon_Descriptor::SkipToFullMoon_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonLA:SkipToFullMoon",
+        STRING_POKEMON + " LA", "Skip to Full Moon",
+        "Programs/PokemonLA/SkipToFullMoon.html",
+        "Skip nights until full moon.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+
+SkipToFullMoon::SkipToFullMoon()
+    : NOTIFICATIONS({
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+{
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+
+void SkipToFullMoon::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    //  Connect the controller.
+    require_player(env.console, context, BUTTON_LCLICK);
+
+    while (true){
+        // Open menu
+        pbf_press_dpad(context, DPAD_UP, 160ms, 960ms);
+        context.wait_for_all_requests();
+
+        const auto compatibility = detect_item_compatibility(env.console.video().snapshot());
+
+        if (compatibility == ItemCompatibility::NONE){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "Unable to detect item compatibility.",
+                env.console
+            );
+        }
+
+        if (compatibility == ItemCompatibility::COMPATIBLE){
+            // Ursaring can evolve, it's full moon now.
+            break;
+        }
+
+        // Do another time skip:
+
+        // Close menu
+        pbf_press_button(context, BUTTON_B, 160ms, 800ms);
+        // Character turn around to face the tent
+        pbf_move_left_joystick(context, {0, +1}, 160ms, 800ms);
+        // Press A to show the "how long do you rest" dialogue
+        pbf_press_button(context, BUTTON_A, 80ms, 800ms);
+        // Press A to show the time menu
+        pbf_press_button(context, BUTTON_A, 80ms, 240ms);
+        // Move the selection to "Until nightfall"
+        pbf_press_dpad(context, DPAD_UP, 80ms, 240ms);
+        pbf_press_dpad(context, DPAD_UP, 80ms, 400ms);
+
+        // Press A to sleep to next night
+        pbf_press_button(context, BUTTON_A, 160ms, 400ms);
+        // Sleeping
+        pbf_wait(context, 8000ms);
+        context.wait_for_all_requests();
+
+        const bool stop_on_detected = true;
+
+        // DialogueEllipseDetector dialogue_ellipse_detector(env.console, env.console, std::chrono::milliseconds(200), 
+        //     DialogueEllipseDetector::EllipseLocation::TENT, stop_on_detected);
+        // int ret = wait_until(
+        //     env.console, context, std::chrono::seconds(8),
+        //     {{dialogue_ellipse_detector}}
+        // );
+        // if (ret != 0){
+        //     std::cout << "ERROR! Cannot detect the dialogue ellipse" << std::endl;
+        // }
+        // Press B to clear the "You Pokemon happy and healthy" dialogue.
+        // pbf_press_button(context, BUTTON_B, 160ms, 800ms);
+
+
+        ArcPhoneDetector arc_phone_detector(env.console, env.console, std::chrono::milliseconds(100), stop_on_detected);
+        run_until<ProControllerContext>(
+            env.console, context,
+            [](ProControllerContext& local_context){
+                // pbf_mash_button(local_context, BUTTON_B, 7000ms);
+                for (size_t i = 0; i < 15; i++){
+                     pbf_press_button(local_context, BUTTON_B, 160ms, 640ms);
+                }
+            },
+            {{arc_phone_detector}}
+        );        
+    }
+
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+}
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/General/PokemonLA_SkipToFullMoon.h b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/General/PokemonLA_SkipToFullMoon.h
new file mode 100644
index 0000000000..dd397fc94f
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/General/PokemonLA_SkipToFullMoon.h
@@ -0,0 +1,43 @@
+/*  Skip to Full Moon
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLA_SkipToFullMoon_H
+#define PokemonAutomation_PokemonLA_SkipToFullMoon_H
+
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+
+class SkipToFullMoon_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    SkipToFullMoon_Descriptor();
+};
+
+
+class SkipToFullMoon : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = SkipToFullMoon_Descriptor;
+    SkipToFullMoon();
+
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ML/PokemonLA_GeneratePokemonImageTrainingData.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ML/PokemonLA_GeneratePokemonImageTrainingData.cpp
new file mode 100644
index 0000000000..8bd2a3c82f
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ML/PokemonLA_GeneratePokemonImageTrainingData.cpp
@@ -0,0 +1,221 @@
+/*  Generate Pokemon Image Training Data
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Exceptions.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/Exceptions/ProgramFinishedException.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonLA/Programs/PokemonLA_RegionNavigation.h"
+#include "VideoGames/PokemonLA/PokemonLA_TravelLocations.h"
+#include "PokemonLA_GeneratePokemonImageTrainingData.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+using namespace Pokemon;
+
+const TravelLocation& to_travel_location(StartingLocation location){
+    const TravelLocations& locations = TravelLocations::instance();
+
+    switch(location){
+    case StartingLocation::JUBILIFE_VILLAGE:
+        return locations.Village_FrontGate;
+    case StartingLocation::FIELDLANDS_FIELDLANDS:
+        return locations.Fieldlands_Fieldlands;
+    case StartingLocation::FIELDLANDS_HEIGHTS:
+        return locations.Fieldlands_Heights;
+    case StartingLocation::MIRELANDS_MIRELANDS:
+        return locations.Mirelands_Mirelands;
+    case StartingLocation::MIRELANDS_BOGBOUND:
+        return locations.Mirelands_Bogbound;
+    case StartingLocation::COASTLANDS_BEACHSIDE:
+        return locations.Coastlands_Beachside;
+    case StartingLocation::COASTLANDS_COASTLANDS:
+        return locations.Coastlands_Coastlands;
+    case StartingLocation::HIGHLANDS_HIGHLANDS:
+        return locations.Highlands_Highlands;
+    case StartingLocation::HIGHLANDS_MOUNTAIN:
+        return locations.Highlands_Mountain;
+    case StartingLocation::HIGHLANDS_SUMMIT:
+        return locations.Highlands_Summit;
+    case StartingLocation::ICELANDS_SNOWFIELDS:
+        return locations.Icelands_Snowfields;
+    case StartingLocation::ICELANDS_ICEPEAK:
+        return locations.Icelands_Icepeak;
+    }
+
+    // Should never reach here, but return default to avoid compiler warning
+    throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Invalid StartingLocation: " + std::to_string(int(location)));
+}
+
+GeneratePokemonImageTrainingData_Descriptor::GeneratePokemonImageTrainingData_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonLA:GeneratePokemonImageTrainingData",
+        STRING_POKEMON + " LA", "Generate " + STRING_POKEMON + " Image Training Data",
+        "Programs/PokemonLA/GeneratePokemonImageTrainingData.html",
+        "Generate training images of " + STRING_POKEMON + " for machine learning purposes.",
+        PanelQualityStanding::DEVELOPER,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+
+GeneratePokemonImageTrainingData::GeneratePokemonImageTrainingData()
+    : STARTING_LOCATION(
+        "<b>Starting Location:</b><br>Where you are starting the program.",
+        {
+            {StartingLocation::JUBILIFE_VILLAGE, "jubilife_village", "Jubilife Village"},
+            {StartingLocation::FIELDLANDS_FIELDLANDS, "fieldlands_fieldlands", "Fieldlands - Fieldlands Camp"},
+            {StartingLocation::FIELDLANDS_HEIGHTS, "fieldlands_heights", "Fieldlands - Heights Camp"},
+            {StartingLocation::MIRELANDS_MIRELANDS, "mirelands_mirelands", "Mirelands - Mirelands Camp"},
+            {StartingLocation::MIRELANDS_BOGBOUND, "mirelands_bogbound", "Mirelands - Bogbound Camp"},
+            {StartingLocation::COASTLANDS_BEACHSIDE, "coastlands_beachside", "Coastlands - Beachside Camp"},
+            {StartingLocation::COASTLANDS_COASTLANDS, "coastlands_coastlands", "Coastlands - Coastlands Camp"},
+            {StartingLocation::HIGHLANDS_HIGHLANDS, "highlands_highlands", "Highlands - Highlands Camp"},
+            {StartingLocation::HIGHLANDS_MOUNTAIN, "highlands_mountain", "Highlands - Mountain Camp"},
+            {StartingLocation::HIGHLANDS_SUMMIT, "highlands_summit", "Highlands - Summit Camp"},
+            {StartingLocation::ICELANDS_SNOWFIELDS, "icelands_snowfields", "Icelands - Snowfields Camp"},
+            {StartingLocation::ICELANDS_ICEPEAK, "icelands_icepeak", "Icelands - Icepeak Camp"},
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        StartingLocation::JUBILIFE_VILLAGE
+    )
+    , NUM_BOXES(
+        "<b>Number of Boxes to Process:</b><br>How many boxes to capture " + STRING_POKEMON + " from.",
+        LockMode::LOCK_WHILE_RUNNING,
+        5, 1, 30
+    )
+    , GO_HOME_WHEN_DONE(false)
+    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_STATUS_UPDATE,
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+{
+    PA_ADD_OPTION(STARTING_LOCATION);
+    PA_ADD_OPTION(NUM_BOXES);
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+void GeneratePokemonImageTrainingData::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    // Send program starting notification
+    send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
+
+    try{
+        // Step 1: Select starting location and navigate to box NPC
+        select_starting_location(env, context);
+
+        // Step 2: Talk to box NPC to access box system
+        talk_to_box_npc(env, context);
+
+        // TODO: Implement remaining steps
+    }catch (ProgramFinishedException&){
+        // Program was stopped by user
+        send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+        throw;
+    }catch (OperationFailedExceptionWithScreenshot& e){
+        std::string fail_message = e.message();
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            fail_message,
+            env.console
+        );
+        throw;
+    }
+    env.update_stats();
+    GO_HOME_WHEN_DONE.run_end_of_program(context);
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+}
+
+void GeneratePokemonImageTrainingData::select_starting_location(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    env.log("Selecting starting location...");
+
+    StartingLocation location = STARTING_LOCATION;
+    const TravelLocation& travel_loc = to_travel_location(location);
+    // fast travel to the target camp to reset player character position
+    fast_travel_from_overworld(env, env.console, context, travel_loc);
+        
+    // move to the npc to open box system
+    switch(location){
+    case StartingLocation::JUBILIFE_VILLAGE:
+        env.log("Starting at Jubilife Village");
+        // at gate, face towards the gate
+        pbf_move_left_joystick(context, {0, -1}, 1920ms, 240ms); // move backwards
+        pbf_move_left_joystick(context, {+1, -0.173}, 960ms, 480ms); // move to right
+        pbf_press_button(context, BUTTON_ZL, 240ms, 1000ms); // rotate camera to point to where the character is facing
+        pbf_move_left_joystick(context, {0, +1}, 5600ms, 240ms); // move forward
+        pbf_move_left_joystick(context, {+1, +0.023}, 240ms, 480ms); // move to right
+        break;
+    case StartingLocation::FIELDLANDS_FIELDLANDS:
+        env.log("Starting at Fieldlands - Fieldlands Camp");
+        pbf_move_left_joystick(context, {-0.609, +1}, 1040ms, 80ms);
+        break;
+    case StartingLocation::FIELDLANDS_HEIGHTS:
+        env.log("Starting at Fieldlands - Heights Camp");
+        pbf_move_left_joystick(context, {-0.688, +1}, 1320ms, 80ms);
+        break;
+    case StartingLocation::MIRELANDS_MIRELANDS:
+        env.log("Starting at Mirelands - Mirelands Camp");
+        pbf_move_left_joystick(context, {+0.567, +1}, 1120ms, 80ms);
+        break;
+    case StartingLocation::MIRELANDS_BOGBOUND:
+        env.log("Starting at Mirelands - Bogbound Camp");
+        pbf_move_left_joystick(context, {-1, +0.57}, 1720ms, 80ms);
+        break;
+    case StartingLocation::COASTLANDS_BEACHSIDE:
+        env.log("Starting at Coastlands - Beachside Camp");
+        pbf_move_left_joystick(context, {-1, +0.727}, 1280ms, 80ms);
+        break;
+    case StartingLocation::COASTLANDS_COASTLANDS:
+        env.log("Starting at Coastlands - Coastlands Camp");
+        pbf_move_left_joystick(context, {-1, +0.688}, 1440ms, 80ms);
+        break;
+    case StartingLocation::HIGHLANDS_HIGHLANDS:
+        env.log("Starting at Highlands - Highlands Camp");
+        pbf_move_left_joystick(context, {-1, +0.844}, 1120ms, 80ms);
+        break;
+    case StartingLocation::HIGHLANDS_MOUNTAIN:
+        env.log("Starting at Highlands - Mountain Camp");
+        pbf_move_left_joystick(context, {-1, +0.883}, 800ms, 80ms);
+        break;
+    case StartingLocation::HIGHLANDS_SUMMIT:
+        env.log("Starting at Highlands - Summit Camp");
+        pbf_move_left_joystick(context, {-0.922, +1}, 1200ms, 80ms);
+        break;
+    case StartingLocation::ICELANDS_SNOWFIELDS:
+        env.log("Starting at Icelands - Snowfields Camp");
+        pbf_move_left_joystick(context, {-1, +0.844}, 1120ms, 80ms);
+        break;
+    case StartingLocation::ICELANDS_ICEPEAK:
+        env.log("Starting at Icelands - Icepeak Camp");
+        pbf_move_left_joystick(context, {-0.844, +1}, 1440ms, 80ms);
+        break;
+    }
+    context.wait_for_all_requests();
+
+    // For now, assume player is already at the selected location
+    // TODO: Add location-specific navigation logic if needed
+
+    env.log("Location selection completed.");
+}
+
+void GeneratePokemonImageTrainingData::talk_to_box_npc(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    env.log("Talking to box NPC...");
+}
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ML/PokemonLA_GeneratePokemonImageTrainingData.h b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ML/PokemonLA_GeneratePokemonImageTrainingData.h
new file mode 100644
index 0000000000..374647c611
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ML/PokemonLA_GeneratePokemonImageTrainingData.h
@@ -0,0 +1,76 @@
+/*  Generate Pokemon Image Training Data
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *  
+ *  Starting at Jubilife Village or any camp, talk to npc to get pokemon from box to party,
+ *  throw the pokemon out onto the field to take screenshots with it, move around it to take
+ *  screenshots from various angles. Repeat for rest of the pokemon in specified boxes.
+ */
+
+#ifndef PokemonAutomation_PokemonLA_GeneratePokemonImageTrainingData_H
+#define PokemonAutomation_PokemonLA_GeneratePokemonImageTrainingData_H
+
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "Common/Cpp/Options/EnumDropdownOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+struct TravelLocation;
+
+enum class StartingLocation{
+    JUBILIFE_VILLAGE,
+    FIELDLANDS_FIELDLANDS,
+    FIELDLANDS_HEIGHTS,
+    MIRELANDS_MIRELANDS,
+    MIRELANDS_BOGBOUND,
+    COASTLANDS_BEACHSIDE,
+    COASTLANDS_COASTLANDS,
+    HIGHLANDS_HIGHLANDS,
+    HIGHLANDS_MOUNTAIN,
+    HIGHLANDS_SUMMIT,
+    ICELANDS_SNOWFIELDS,
+    ICELANDS_ICEPEAK,
+};
+
+const TravelLocation& to_travel_location(StartingLocation location);
+
+class GeneratePokemonImageTrainingData_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    GeneratePokemonImageTrainingData_Descriptor();
+};
+
+
+class GeneratePokemonImageTrainingData : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = GeneratePokemonImageTrainingData_Descriptor;
+    GeneratePokemonImageTrainingData();
+
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    // Helper methods
+    void select_starting_location(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+    void talk_to_box_npc(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+
+    // Location selection
+    EnumDropdownOption<StartingLocation> STARTING_LOCATION;
+
+    SimpleIntegerOption<uint16_t> NUM_BOXES;
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
+
+    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_BattleRoutines.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_BattleRoutines.cpp
new file mode 100644
index 0000000000..367951f3a6
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_BattleRoutines.cpp
@@ -0,0 +1,201 @@
+/*  Mount Change
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "CommonTools/VisualDetectors/ImageMatchDetector.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "VideoGames/PokemonLA/Inference/PokemonLA_OverworldDetector.h"
+#include "VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattlePokemonSwitchDetector.h"
+#include "PokemonLA_BattleRoutines.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+
+
+void mash_A_until_end_of_battle(VideoStream& stream, ProControllerContext& context){
+    OverworldDetector detector(stream.logger(), stream.overlay());
+    int ret = run_until<ProControllerContext>(
+        stream, context,
+        [](ProControllerContext& context){
+            pbf_mash_button(context, BUTTON_A, 180000ms);
+        },
+        {{detector}}
+    );
+    if (ret < 0){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "Failed to return to overworld after 3 minutes.",
+            stream
+        );
+    }
+    stream.log("Returned to overworld.");
+}
+
+
+
+size_t switch_pokemon(
+    VideoStream& stream, ProControllerContext& context,
+    size_t pokemon_to_switch_to,
+    size_t max_num_pokemon
+){
+    if (pokemon_to_switch_to >= max_num_pokemon){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "Cannot send any more Pokemon to battle, max: " + std::to_string(max_num_pokemon),
+            stream
+        );
+    }
+    // Move past leading fainted pokemon
+    for (size_t i = 0; i < pokemon_to_switch_to; i++){
+        pbf_press_dpad(context, DPAD_DOWN, 160ms, 640ms);
+    }
+
+    while(true){
+        // Choose the next pokemon to battle.
+        pbf_press_button(context, BUTTON_A, 160ms, 800ms);
+        pbf_press_button(context, BUTTON_A, 160ms, 1200ms);
+        context.wait_for_all_requests();
+
+        // Check whether we can send this pokemon to battle:
+        const bool stop_on_detected = true;
+        BattlePokemonSwitchDetector switch_detector(stream.logger(), stream.overlay(), stop_on_detected);
+        VideoSnapshot screen = stream.video().snapshot();
+        if (switch_detector.process_frame(screen, current_time()) == false){
+            // No longer at the switching pokemon screen
+            break;
+        }
+
+        // We are still in the switching pokemon screen. So the current selected pokemon is fainted
+        // and therefore cannot be used. Try the next pokemon:
+        pokemon_to_switch_to++;
+        if (pokemon_to_switch_to >= max_num_pokemon){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "Cannot send any more Pokemon to battle, max: " + std::to_string(max_num_pokemon),
+                stream
+            );
+        }
+
+        // Fist hit B to clear the "cannot send pokemon" dialogue
+        pbf_press_button(context, BUTTON_B, 160ms, 800ms);
+        // Move to the next pokemon
+        pbf_press_dpad(context, DPAD_DOWN, 160ms, 640ms);
+    }
+
+    return pokemon_to_switch_to;
+}
+
+
+void use_move_blindly(
+    VideoStream& stream, ProControllerContext& context,
+    MoveStyle style,
+    size_t cur_pokemon,
+    size_t cur_move
+){
+    // Select move styles
+    if (style == MoveStyle::Agile){
+        // Agile style
+        pbf_press_button(context, BUTTON_L, 80ms, 1000ms);
+    }else if (style == MoveStyle::Strong){
+        // Strong style
+        pbf_press_button(context, BUTTON_R, 80ms, 1000ms);
+    }
+
+    // Use the move
+    pbf_press_button(context, BUTTON_A, 80ms, 1000ms);
+
+    stream.log(
+        "Using pokemon " + std::to_string(cur_pokemon) + " move " + std::to_string(cur_move) +
+        " style " + MoveStyle_Database().find(style)->display
+    );
+
+    pbf_wait(context, 1000ms);
+    context.wait_for_all_requests();
+}
+
+
+bool use_move(
+    VideoStream& stream, ProControllerContext& context,
+    size_t cur_pokemon,
+    size_t cur_move,
+    MoveStyle style,
+    bool check_success
+){
+    if (check_success == false){
+        use_move_blindly(stream, context, style, cur_pokemon, cur_move);
+        return true;
+    }
+
+    // The location of the move slots when choosing which move to use during battle.
+    // These boxes will be used to check whether the content in those boxes are changed or not
+    // after selecting one move to use. In this way we can detect whether the move is out of PP.
+    const ImageFloatBox move_slot_boxes[4] = {
+        {0.6600, 0.6220, 0.2500, 0.0320},
+        {0.6395, 0.6875, 0.2500, 0.0320},
+        {0.6190, 0.7530, 0.2500, 0.0320},
+        {0.5985, 0.8185, 0.2500, 0.0320},
+    };
+
+    VideoSnapshot screen = stream.video().snapshot();
+    ImageMatchDetector move_slot_detector(std::move(screen.frame), move_slot_boxes[cur_move], 10.0);
+
+    use_move_blindly(stream, context, style, cur_pokemon, cur_move);
+
+    screen = stream.video().snapshot();
+
+    const bool still_on_move_screen = move_slot_detector.detect(screen);
+
+#ifdef DEBUG_NO_PP
+    if (still_on_move_screen == false){
+        static int count = 0;
+        screen.save("./no_pp." + std::to_string(count++) + ".png");
+    }
+#endif
+
+    return still_on_move_screen == false;
+}
+
+void use_next_move_with_pp(
+    VideoStream& stream, ProControllerContext& context,
+    size_t cur_pokemon,
+    size_t& cur_move
+){
+    const bool check_move_success = true;
+    while (use_move(stream, context, cur_pokemon, cur_move, MoveStyle::NoStyle, check_move_success) == false){
+        // We are still on the move selection screen. No PP.
+        if (cur_move == 3){
+            // Pokemon has zero PP on all moves. This should not happen as it will just use
+            // Struggle.
+            stream.log("No PP on all moves. Abort program.", COLOR_RED);
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "No PP on all moves.",
+                stream
+            );
+        }
+        
+        // Go to the next move.
+        pbf_press_dpad(context, DPAD_DOWN, 160ms, 800ms);
+        // env.console.context().wait_for_all_requests();
+        cur_move++;
+        stream.log("No PP. Use next move, " + std::to_string(cur_move), COLOR_RED);
+    }
+}
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_BattleRoutines.h b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_BattleRoutines.h
new file mode 100644
index 0000000000..5ffe33da3f
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_BattleRoutines.h
@@ -0,0 +1,63 @@
+/*  Battle Routines
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLA_BattleRoutines_H
+#define PokemonAutomation_PokemonLA_BattleRoutines_H
+
+#include "CommonFramework/Tools/VideoStream.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+#include "VideoGames/PokemonLA/Options/PokemonLA_BattlePokemonActionTable.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+
+void mash_A_until_end_of_battle(VideoStream& stream, ProControllerContext& context);
+
+// Assuming the game is in the switching pokemon screen, select a pokemon to send to battle.
+// pokemon_to_switch_to: the index of the pokemon in the party to switch to.
+// If the pokemon cannot be sent either due to already on the battlefield or fainted, it will select the next
+// pokemon in the party list, until it is successfully sent.
+// Return the index of the party that is actually sent to battle.
+// max_num_pokemon: if the pokemon index to switch to is >= `max_num_pokemon`, throw an OperationFailedException.
+size_t switch_pokemon(
+    VideoStream& stream, ProControllerContext& context,
+    size_t pokemon_to_switch_to,
+    size_t max_num_pokemon = SIZE_MAX
+);
+
+// Assuming the game is at the move selection menu, use the current selected move in desired style in battle.
+// `cur_pokemon` does not affect game control. It is passed in only for the logging purpose.
+// `cur_move` the index of the move (0, 1, 2 or 3). It is only used when `check_success` is true.
+// If `check_success` is true, return whether the move is successfully used, by checking whether the game is still in the move selection
+// menu after some ticks (need correct `cur_move` to do this). If `check_success` is false, always return true.
+// `wait_for_all_requests()` is called at the end of the function no matter `check_success` is true or false.
+bool use_move(
+    VideoStream& stream, ProControllerContext& context,
+    size_t cur_pokemon,
+    size_t cur_move,
+    MoveStyle style,
+    bool check_success
+);
+
+// Assuming the game is at the move selection menu, use the current selected move with no style.
+// If the move has no PP, move to use the next move.
+// `cur_pokemon` does not affect game control. It is passed in only for the logging purpose.
+// In order for the move PP detection to be correct, must pass in the correct `cur_move`.
+// When the function moves to using the next move, it also updates `cur_move`.
+// This function assumes it starts with the move selection menu, so it does not consider the case the pokemon has no PP and has to use Struggle.
+void use_next_move_with_pp(
+    VideoStream& stream, ProControllerContext& context,
+    size_t cur_pokemon,
+    size_t& cur_move
+);
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_EscapeFromAttack.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_EscapeFromAttack.cpp
new file mode 100644
index 0000000000..d17545ddf8
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_EscapeFromAttack.cpp
@@ -0,0 +1,199 @@
+/*  Escape From Attack
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Tools/VideoStream.h"
+#include "CommonTools/Async/InterruptableCommands.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "PokemonLA_EscapeFromAttack.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+
+//const Milliseconds GET_ON_MOUNT_TIME = Milliseconds(1000);
+const Milliseconds GET_ON_BRAVIARY_TIME = Milliseconds(2240);
+
+
+
+EscapeFromAttack::EscapeFromAttack(
+    ProgramEnvironment& env,
+    VideoStream& stream, ProControllerContext& context,
+    std::chrono::seconds time_min,
+    std::chrono::seconds time_limit
+)
+    : SuperControlSession(env, stream, context)
+    , m_min_stop(current_time() + time_min)
+    , m_deadline(current_time() + time_limit)
+    , m_attacked(stream.logger())
+    , m_mount(stream.logger())
+    , m_centerA(
+        stream.logger(), stream.overlay(),
+        ButtonType::ButtonA,
+        {0.40, 0.50, 0.40, 0.50},
+        std::chrono::milliseconds(200),
+        false
+    )
+    , m_leftB(
+        stream.logger(), stream.overlay(),
+        ButtonType::ButtonB,
+        {0.02, 0.40, 0.05, 0.20},
+        std::chrono::milliseconds(200),
+        false
+    )
+    , m_get_on_sneasler_time(WallClock::min())
+{
+    *this += m_attacked;
+    *this += m_mount;
+    *this += m_centerA;
+    *this += m_leftB;
+
+    register_state_command(State::UNKNOWN, [this](){
+        m_stream.log("Unknown state. Moving forward...");
+        m_active_command->dispatch([](ProControllerContext& context){
+            pbf_move_left_joystick(context, {0, +1}, 300000ms, 0ms);
+        });
+        return false;
+    });
+    register_state_command(State::WYRDEER_BASCULEGION_OFF, [this](){
+        m_stream.log("Switching from Wyrdeer/Basculegion (off) to Braviary (on)...");
+        m_active_command->dispatch([](ProControllerContext& context){
+            pbf_press_dpad(context, DPAD_RIGHT, 160ms, 400ms);
+            pbf_press_button(context, BUTTON_PLUS, 160ms, GET_ON_BRAVIARY_TIME);
+        });
+        return false;
+    });
+    register_state_command(State::WYRDEER_BASCULEGION_ON, [this](){
+        m_stream.log("Switching from Wyrdeer/Basculegion (on) to Braviary (on)...");
+        m_active_command->dispatch([](ProControllerContext& context){
+            pbf_press_dpad(context, DPAD_RIGHT, 160ms, GET_ON_BRAVIARY_TIME);
+        });
+        return false;
+    });
+    register_state_command(State::URSALUNA_OFF, [this](){
+        m_stream.log("Switching from Ursaluna (off) to Braviary (on)...");
+        m_active_command->dispatch([](ProControllerContext& context){
+            pbf_press_dpad(context, DPAD_RIGHT, 160ms, 400ms);
+            pbf_press_dpad(context, DPAD_RIGHT, 160ms, 400ms);
+            pbf_press_button(context, BUTTON_PLUS, 160ms, GET_ON_BRAVIARY_TIME);
+        });
+        return false;
+    });
+    register_state_command(State::URSALUNA_ON, [this](){
+        m_stream.log("Switching from Ursaluna (on) to Braviary (on)...");
+        m_active_command->dispatch([](ProControllerContext& context){
+            pbf_press_dpad(context, DPAD_RIGHT, 160ms, 400ms);
+            pbf_press_dpad(context, DPAD_RIGHT, 160ms, GET_ON_BRAVIARY_TIME);
+        });
+        return false;
+    });
+    register_state_command(State::SNEASLER_OFF, [this](){
+        m_stream.log("Switching from Sneasler (off) to Braviary (on)...");
+        m_active_command->dispatch([](ProControllerContext& context){
+            pbf_press_dpad(context, DPAD_LEFT, 160ms, 400ms);
+            pbf_press_button(context, BUTTON_PLUS, 160ms, GET_ON_BRAVIARY_TIME);
+        });
+        return false;
+    });
+    register_state_command(State::SNEASLER_ON, [this](){
+        m_stream.log("Switching from Sneasler (on) to Braviary (on)...");
+        m_active_command->dispatch([](ProControllerContext& context){
+            pbf_move_left_joystick(context, {0, +1}, 1000ms, 0ms);
+            pbf_press_dpad(context, DPAD_LEFT, 160ms, GET_ON_BRAVIARY_TIME);
+        });
+        return false;
+    });
+    register_state_command(State::BRAVIARY_OFF, [this](){
+        m_stream.log("Switching from Braviary (off) to Braviary (on)...");
+        m_active_command->dispatch([](ProControllerContext& context){
+            pbf_press_button(context, BUTTON_PLUS, 160ms, GET_ON_BRAVIARY_TIME);
+        });
+        return false;
+    });
+    register_state_command(State::DASH_FORWARD, [this](){
+        bool delay_dash =
+            current_time() < m_get_on_sneasler_time + GET_ON_BRAVIARY_TIME;
+        if (delay_dash){
+            m_stream.log("Dashing forward... (delayed due to being on Sneasler)");
+        }else{
+            m_stream.log("Dashing forward...");
+        }
+        m_active_command->dispatch([delay_dash](ProControllerContext& context){
+            if (delay_dash){
+                pbf_move_left_joystick(context, {0, +1}, 1000ms, 0ms);
+            }
+            pbf_mash_button(context, BUTTON_B, 300000ms);
+        });
+        return false;
+    });
+    register_state_command(State::GET_ON_SNEASLER, [this](){
+        m_stream.log("Getting on Sneasler...");
+        m_active_command->dispatch([](ProControllerContext& context){
+            pbf_press_button(context, BUTTON_A, 160ms, 1840ms);
+        });
+        m_get_on_sneasler_time = current_time();
+        return false;
+    });
+    register_state_command(State::CLIMBING, [this](){
+        m_stream.log("Climbing wall...");
+        m_active_command->dispatch([](ProControllerContext& context){
+            pbf_move_left_joystick(context, {0, +1}, 300000ms, 0ms);
+        });
+        return false;
+    });
+}
+bool EscapeFromAttack::run_state(AsyncCommandSession<ProController>& commands, WallClock timestamp){
+    if (timestamp > m_deadline){
+        return true;
+    }
+    if (m_attacked.state() == UnderAttackState::SAFE && timestamp >= m_min_stop){
+        return true;
+    }
+
+    switch (m_mount.state()){
+    case MountState::NOTHING:
+        return run_state_action(State::UNKNOWN);
+    case MountState::WYRDEER_OFF:
+    case MountState::BASCULEGION_OFF:
+        return run_state_action(State::WYRDEER_BASCULEGION_OFF);
+    case MountState::WYRDEER_ON:
+    case MountState::BASCULEGION_ON:
+        return run_state_action(State::WYRDEER_BASCULEGION_ON);
+    case MountState::URSALUNA_OFF:
+        return run_state_action(State::URSALUNA_OFF);
+    case MountState::URSALUNA_ON:
+        return run_state_action(State::URSALUNA_ON);
+    case MountState::SNEASLER_OFF:
+        return run_state_action(State::SNEASLER_OFF);
+    case MountState::SNEASLER_ON:
+        return run_climbing(commands, timestamp);
+    case MountState::BRAVIARY_OFF:
+        return run_state_action(State::BRAVIARY_OFF);
+    case MountState::BRAVIARY_ON:
+        return run_flying(commands, timestamp);
+    }
+
+    m_stream.log("No state handler for current state.", COLOR_RED);
+    return false;
+}
+bool EscapeFromAttack::run_flying(AsyncCommandSession<ProController>& commands, WallClock timestamp){
+    if (m_centerA.detected() && timestamp - last_state_change() > std::chrono::seconds(3)){
+        return run_state_action(State::GET_ON_SNEASLER);
+    }
+    return run_state_action(State::DASH_FORWARD);
+}
+bool EscapeFromAttack::run_climbing(AsyncCommandSession<ProController>& commands, WallClock timestamp){
+    //  Can't jump off means you're able to stand. Switch back to Braviary.
+    if (!m_leftB.detected()){
+        return run_state_action(State::SNEASLER_OFF);
+    }
+    return run_state_action(State::CLIMBING);
+}
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_EscapeFromAttack.h b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_EscapeFromAttack.h
new file mode 100644
index 0000000000..370b76c572
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_EscapeFromAttack.h
@@ -0,0 +1,78 @@
+/*  Escape From Attack
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLA_EscapeFromAttack_H
+#define PokemonAutomation_PokemonLA_EscapeFromAttack_H
+
+#include "CommonTools/Async/SuperControlSession.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+#include "VideoGames/PokemonLA/Inference/PokemonLA_UnderAttackDetector.h"
+#include "VideoGames/PokemonLA/Inference/PokemonLA_MountDetector.h"
+#include "VideoGames/PokemonLA/Inference/Objects/PokemonLA_ButtonDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+
+class EscapeFromAttack : public SuperControlSession<ProController>{
+public:
+    EscapeFromAttack(
+        ProgramEnvironment& env,
+        VideoStream& stream, ProControllerContext& context,
+        std::chrono::seconds time_min,
+        std::chrono::seconds time_limit
+    );
+
+    UnderAttackState state() const{
+        return m_attacked.state();
+    }
+
+
+private:
+    enum class State{
+        UNKNOWN,
+        WYRDEER_BASCULEGION_OFF,
+        WYRDEER_BASCULEGION_ON,
+        URSALUNA_OFF,
+        URSALUNA_ON,
+        SNEASLER_OFF,
+        SNEASLER_ON,
+        BRAVIARY_OFF,
+        DASH_FORWARD,
+        GET_ON_SNEASLER,
+        CLIMBING,
+    };
+    void register_state_command(State state, std::function<bool()>&& action){
+        SuperControlSession::register_state_command((size_t)state, std::move(action));
+    }
+    bool run_state_action(State state){
+        return SuperControlSession::run_state_action((size_t)state);
+    }
+
+    virtual bool run_state(AsyncCommandSession<ProController>& commands, WallClock timestamp) override;
+
+    bool run_flying(AsyncCommandSession<ProController>& commands, WallClock timestamp);
+    bool run_climbing(AsyncCommandSession<ProController>& commands, WallClock timestamp);
+
+private:
+    const WallClock m_min_stop;
+    const WallClock m_deadline;
+
+    UnderAttackWatcher m_attacked;
+    MountTracker m_mount;
+    ButtonDetector m_centerA;
+    ButtonDetector m_leftB;
+
+    WallClock m_get_on_sneasler_time;
+};
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_FlagNavigationAir.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_FlagNavigationAir.cpp
new file mode 100644
index 0000000000..1c67205602
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_FlagNavigationAir.cpp
@@ -0,0 +1,538 @@
+/*  Flag Navigation (Air)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <sstream>
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/Tools/ErrorDumper.h"
+#include "CommonTools/Async/InterruptableCommands.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "PokemonLA_FlagNavigationAir.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+
+
+//const Milliseconds GET_ON_MOUNT_TIME = 1000ms;
+const Milliseconds GET_ON_BRAVIARY_TIME = 2240ms;
+
+
+
+
+FlagNavigationAir::FlagNavigationAir(
+    ProgramEnvironment& env, VideoStream& stream, ProControllerContext& context,
+    uint16_t stop_radius,
+    double flag_reached_delay,
+    std::chrono::seconds navigate_timeout
+)
+    : SuperControlSession(env, stream, context)
+    , m_stop_radius(stop_radius)
+    , m_flag_reached_delay(std::chrono::milliseconds((uint64_t)(flag_reached_delay * 1000)))
+    , m_navigate_timeout(navigate_timeout)
+    , m_flag(stream.logger(), stream.overlay())
+    , m_mount(stream.logger())
+    , m_centerA(stream.logger(), stream.overlay(), ButtonType::ButtonA, {0.40, 0.50, 0.40, 0.50}, std::chrono::milliseconds(200), false)
+    , m_leftB(stream.logger(), stream.overlay(), ButtonType::ButtonB, {0.02, 0.40, 0.05, 0.20}, std::chrono::milliseconds(200), false)
+    , m_dialog_detector(stream.logger(), stream.overlay(), false)
+    , m_looking_straight_ahead(false)
+    , m_looking_straight_ahead_timestamp(WallClock::min())
+//    , m_last_good_state(WallClock::min())
+    , m_last_known_mount(MountState::NOTHING)
+    , m_find_flag_failed(false)
+    , m_flag_reached_time(WallClock::max())
+    , m_last_flag_detection(WallClock::min())
+    , m_flag_distance(-1)
+    , m_flag_x(0.5)
+    , m_flag_y(0.0)
+    , m_last_flag_print(WallClock::min())
+{
+    *this += m_flag;
+    *this += m_mount;
+    *this += m_centerA;
+    *this += m_leftB;
+    *this += m_dialog_detector;
+
+    auto find_flag = [this](ProControllerContext& context){
+        double turn = m_flag_x <= 0.5 ? -1 : +1;
+        for (size_t c = 0; c < 2; c++){
+            pbf_mash_button(context, BUTTON_ZL, 2000ms);
+            pbf_move_right_joystick(context, {turn, 0}, 3200ms, 0ms);
+            pbf_move_right_joystick(context, {0, -1}, 960ms, 0ms);
+            pbf_move_right_joystick(context, {turn, 0}, 3200ms, 0ms);
+            pbf_move_right_joystick(context, {0, +1}, 1600ms, 0ms);
+            pbf_move_right_joystick(context, {turn, 0}, 3200ms, 0ms);
+        }
+        context.wait_for_all_requests();
+        m_find_flag_failed.store(true, std::memory_order_release);
+    };
+
+    register_state_command(State::UNKNOWN, [this, find_flag](){
+        m_stream.log("Unknown state. Moving camera around...");
+        m_active_command->dispatch(find_flag);
+        m_looking_straight_ahead.store(false, std::memory_order_release);
+        return false;
+    });
+    register_state_command(State::WYRDEER_BASCULEGION_OFF, [this](){
+        m_stream.log("Switching from Wyrdeer/Basculegion (off) to Braviary (on)...");
+        m_active_command->dispatch([](ProControllerContext& context){
+            pbf_press_dpad(context, DPAD_RIGHT, 160ms, 400ms);
+            pbf_press_button(context, BUTTON_PLUS, 160ms, GET_ON_BRAVIARY_TIME);
+        });
+        return false;
+    });
+    register_state_command(State::WYRDEER_BASCULEGION_ON, [this](){
+        m_stream.log("Switching from Wyrdeer/Basculegion (on) to Braviary (on)...");
+        m_active_command->dispatch([](ProControllerContext& context){
+            pbf_press_dpad(context, DPAD_RIGHT, 160ms, GET_ON_BRAVIARY_TIME);
+        });
+        return false;
+    });
+    register_state_command(State::URSALUNA_OFF, [this](){
+        m_stream.log("Switching from Ursaluna (off) to Braviary (on)...");
+        m_active_command->dispatch([](ProControllerContext& context){
+            pbf_press_dpad(context, DPAD_RIGHT, 160ms, 400ms);
+//            pbf_press_dpad(context, DPAD_RIGHT, 160ms, 400ms);
+//            pbf_press_button(context, BUTTON_PLUS, 20, GET_ON_BRAVIARY_TIME);
+        });
+        return false;
+    });
+    register_state_command(State::URSALUNA_ON, [this](){
+        m_stream.log("Switching from Ursaluna (on) to Braviary (on)...");
+        m_active_command->dispatch([](ProControllerContext& context){
+            pbf_press_dpad(context, DPAD_RIGHT, 160ms, 400ms);
+//            pbf_press_dpad(context, DPAD_RIGHT, 20, GET_ON_BRAVIARY_TIME);
+        });
+        return false;
+    });
+    register_state_command(State::SNEASLER_OFF, [this](){
+        m_stream.log("Switching from Sneasler (off) to Braviary (on)...");
+        m_active_command->dispatch([](ProControllerContext& context){
+            pbf_press_dpad(context, DPAD_LEFT, 160ms, 400ms);
+            pbf_press_button(context, BUTTON_PLUS, 160ms, GET_ON_BRAVIARY_TIME);
+        });
+        return false;
+    });
+    register_state_command(State::SNEASLER_ON, [this](){
+        m_stream.log("Switching from Sneasler (on) to Braviary (on)...");
+        m_looking_straight_ahead.store(false, std::memory_order_release);
+        m_active_command->dispatch([](ProControllerContext& context){
+            pbf_move_left_joystick(context, {0, +1}, 1000ms, 0ms);
+            pbf_press_dpad(context, DPAD_LEFT, 160ms, GET_ON_BRAVIARY_TIME);
+        });
+        return false;
+    });
+    register_state_command(State::BRAVIARY_OFF, [this](){
+        m_stream.log("Switching from Braviary (off) to Braviary (on)...");
+        m_looking_straight_ahead.store(false, std::memory_order_release);
+        m_active_command->dispatch([](ProControllerContext& context){
+            pbf_press_button(context, BUTTON_PLUS, 160ms, GET_ON_BRAVIARY_TIME);
+        });
+        return false;
+    });
+    register_state_command(State::GET_ON_SNEASLER, [this](){
+        m_stream.log("Getting on Sneasler...");
+        m_looking_straight_ahead.store(false, std::memory_order_release);
+        m_active_command->dispatch([](ProControllerContext& context){
+            pbf_press_button(context, BUTTON_A, 160ms, 1840ms);
+        });
+        return false;
+    });
+    register_state_command(State::CLIMBING, [this](){
+        m_stream.log("Climbing wall...");
+        m_looking_straight_ahead.store(false, std::memory_order_release);
+        m_active_command->dispatch([](ProControllerContext& context){
+            pbf_move_left_joystick(context, {0, +1}, 300000ms, 0ms);
+        });
+        return false;
+    });
+
+    register_state_command(State::DASH_FORWARD_MASH_B, [this](){
+        m_stream.log("Dashing forward (mash B)...");
+        m_active_command->dispatch([this](ProControllerContext& context){
+            //  Move forward to straighten out direction.
+            if (!m_looking_straight_ahead.load(std::memory_order_acquire)){
+                pbf_move_left_joystick(context, {0, +1}, 1280ms, 0ms);
+                context.wait_for_all_requests();
+                m_looking_straight_ahead_timestamp.store(current_time());
+                m_looking_straight_ahead.store(true, std::memory_order_release);
+//                cout << "State::DASH_FORWARD: m_looking_straight_ahead = true" << endl;
+            }
+            pbf_mash_button(context, BUTTON_B, 300000ms);
+        });
+        return false;
+    });
+    register_state_command(State::DASH_FORWARD_HOLD_B, [this](){
+        m_stream.log("Dashing forward (hold B)...");
+        m_active_command->dispatch([this](ProControllerContext& context){
+            //  Move forward to straighten out direction.
+            if (!m_looking_straight_ahead.load(std::memory_order_acquire)){
+                pbf_move_left_joystick(context, {0, +1}, 1280ms, 0ms);
+                context.wait_for_all_requests();
+                m_looking_straight_ahead_timestamp.store(current_time());
+                m_looking_straight_ahead.store(true, std::memory_order_release);
+//                cout << "State::DASH_FORWARD: m_looking_straight_ahead = true" << endl;
+            }
+            pbf_press_button(context, BUTTON_B, 300000ms, 0ms);
+        });
+        return false;
+    });
+
+    auto dash_turn = [this](){
+        m_stream.log("Dashing Turn...");
+        m_active_command->dispatch([this](ProControllerContext& context){
+            //  Move forward to straighten out direction.
+//            cout << "Straight ahead = " << m_looking_straight_ahead.load(std::memory_order_acquire) << endl;
+            if (!m_looking_straight_ahead.load(std::memory_order_acquire)){
+//                pbf_wait(context, 1000ms);
+                pbf_move_left_joystick(context, {0, +1}, 1280ms, 0ms);
+                context.wait_for_all_requests();
+                m_looking_straight_ahead_timestamp.store(current_time());
+                m_looking_straight_ahead.store(true, std::memory_order_release);
+//                cout << "State::DASH_LEFT: m_looking_straight_ahead = true" << endl;
+            }
+//            pbf_press_button(context, BUTTON_B, 80ms, 0ms);
+            double shift = 0;
+            double distance, flag_x, flag_y;
+            if (m_flag.get(distance, flag_x, flag_y)){
+                shift = (flag_x - 0.5) * 2.5;
+                shift = std::max(shift, -1/4.);
+                shift = std::min(shift, 1/4.);
+            }
+            pbf_controller_state(context, BUTTON_B, DPAD_NONE, {shift, 0}, {0, 0}, 2000ms);
+        });
+        return false;
+    };
+    register_state_command(State::DASH_LEFT, dash_turn);
+    register_state_command(State::DASH_RIGHT, dash_turn);
+
+    register_state_command(State::DIVE_STRAIGHT, [this](){
+        m_stream.log("Diving Straight...");
+        m_active_command->dispatch([this](ProControllerContext& context){
+            //  Move forward to straighten out direction.
+            if (!m_looking_straight_ahead.load(std::memory_order_acquire)){
+                pbf_move_left_joystick(context, {0, +1}, 1280ms, 0ms);
+                context.wait_for_all_requests();
+                m_looking_straight_ahead_timestamp.store(current_time());
+                m_looking_straight_ahead.store(true, std::memory_order_release);
+//                cout << "State::DASH_FORWARD: m_looking_straight_ahead = true" << endl;
+            }
+            pbf_press_button(context, BUTTON_Y, 60000ms, 0ms);
+        });
+        return false;
+    });
+
+    auto dive_turn = [this](){
+        m_stream.log("Diving Turn...");
+        m_active_command->dispatch([this](ProControllerContext& context){
+            //  Move forward to straighten out direction.
+            if (!m_looking_straight_ahead.load(std::memory_order_acquire)){
+                pbf_move_left_joystick(context, {0, +1}, 1280ms, 0ms);
+                context.wait_for_all_requests();
+                m_looking_straight_ahead_timestamp.store(current_time());
+                m_looking_straight_ahead.store(true, std::memory_order_release);
+//                cout << "State::DASH_LEFT: m_looking_straight_ahead = true" << endl;
+            }
+//            pbf_press_button(context, BUTTON_Y, 80ms, 0ms);
+            double shift = 0;
+            double distance, flag_x, flag_y;
+            if (m_flag.get(distance, flag_x, flag_y)){
+                shift = (flag_x - 0.5) * 5;
+                shift = std::max(shift, -1/4.);
+                shift = std::min(shift, 1/4.);
+            }
+            pbf_controller_state(context, BUTTON_Y, DPAD_NONE, {shift, 0}, {0, 0}, 1000ms);
+        });
+        return false;
+    };
+    register_state_command(State::DIVE_LEFT, dive_turn);
+    register_state_command(State::DIVE_RIGHT, dive_turn);
+
+    register_state_command(State::TURN_LEFT, [this](){
+        m_stream.log("Turning Left...");
+        m_active_command->dispatch([this](ProControllerContext& context){
+            pbf_wait(context, 1200ms);
+            context.wait_for_all_requests();
+            double distance, flag_x, flag_y;
+            if (m_flag.get(distance, flag_x, flag_y)){
+                pbf_move_right_joystick(
+                    context,
+                    {-1, 0},
+                    Milliseconds((int64_t)(640 * (0.5 - flag_x))),
+                    0ms
+                );
+            }
+        });
+        m_looking_straight_ahead.store(false, std::memory_order_release);
+        return false;
+    });
+    register_state_command(State::TURN_RIGHT, [this](){
+        m_stream.log("Turning Right...");
+        m_active_command->dispatch([this](ProControllerContext& context){
+            pbf_wait(context, 1200ms);
+            context.wait_for_all_requests();
+            double distance, flag_x, flag_y;
+            if (m_flag.get(distance, flag_x, flag_y)){
+                pbf_move_right_joystick(
+                    context,
+                    {+1, 0},
+                    Milliseconds((int64_t)(640 * (flag_x - 0.5))),
+                    0ms
+                );
+            }
+        });
+        m_looking_straight_ahead.store(false, std::memory_order_release);
+        return false;
+    });
+
+    register_state_command(State::FIND_FLAG, [this, find_flag](){
+        m_stream.log("Looking for flag...");
+        m_active_command->dispatch(find_flag);
+        m_looking_straight_ahead.store(false, std::memory_order_release);
+        return false;
+    });
+}
+void FlagNavigationAir::set_distance_callback(std::function<void(double distance)> flag_callback){
+    m_flag_callback = std::move(flag_callback);
+}
+
+bool FlagNavigationAir::run_state(AsyncCommandSession<ProController>& commands, WallClock timestamp){
+    if (last_state_change() + std::chrono::seconds(60) < timestamp){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "No state change detected after 60 seconds.",
+            m_stream
+        );
+    }
+    if (start_time() + m_navigate_timeout < timestamp){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "Unable to reach flag after timeout period.",
+            m_stream
+        );
+    }
+    if (m_dialog_detector.detected()){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::NO_ERROR_REPORT,
+            "Potential ambush by Miss Fortune sister.",
+            m_stream
+        );
+    }
+    if (m_find_flag_failed.load(std::memory_order_acquire)){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::NO_ERROR_REPORT,
+            "Unable to find flag.",
+            m_stream
+        );
+    }
+
+    //  Read flag.
+    m_flag_detected = m_flag.get(m_flag_distance, m_flag_x, m_flag_y, timestamp);
+    if (m_flag_detected){
+        m_last_flag_detection = timestamp;
+        if (m_flag_callback){
+            m_flag_callback(m_flag_distance);
+        }
+    }else{
+//        m_console.log("Flag not detected.", COLOR_ORANGE);
+    }
+#if 1
+    if (true
+        && m_flag_detected
+        && m_flag_distance >= 0
+        && m_last_flag_print + std::chrono::seconds(1) <= timestamp
+    ){
+        std::ostringstream ss;
+        ss << "Flag: Distance = " << (m_flag_distance < 0 ? "?" : std::to_string(m_flag_distance))
+           << ", x = " << m_flag_x << ", y = " << m_flag_y << std::endl;
+        m_stream.log(ss.str(), COLOR_PURPLE);
+        m_last_flag_print = timestamp;
+    }
+#endif
+
+
+    //  Check if we've reached the flag.
+    if (m_flag_distance >= 0){
+        if (m_flag_distance > m_stop_radius){
+            //  If we haven't reached the flag, reset the timer.
+            m_flag_reached_time = WallClock::max();
+        }else if (m_flag_distance <= m_stop_radius && m_flag_reached_time == WallClock::max()){
+            //  If we've reached the flag, start timer if we haven't already.
+            m_stream.log("Target reached. Waiting out grace period...");
+            m_flag_reached_time = timestamp;
+        }
+    }
+    if (m_flag_reached_time <= timestamp - m_flag_reached_delay){
+        m_stream.log("Grace period finished. Stopping flag navigation...");
+        return true;
+    }
+
+
+    MountState mount = m_mount.state();
+    if (mount != MountState::NOTHING){
+        m_last_known_mount = mount;
+    }else{
+        m_stream.log(
+            std::string("Unable to detect mount. Assuming last known mount: ") +
+            MOUNT_STATE_STRINGS[(size_t)m_last_known_mount]
+        );
+        mount = m_last_known_mount;
+    }
+    if (mount == MountState::NOTHING){
+        return run_state_action(State::UNKNOWN);
+    }
+#if 0
+    if (mount == MountState::NOTHING){
+        if (m_last_good_state + std::chrono::seconds(2) < timestamp){
+            return run_state_action(State::UNKNOWN);
+        }
+        return false;
+    }else{
+        m_last_good_state = timestamp;
+    }
+#endif
+
+    switch (mount){
+    case MountState::NOTHING:
+        return false;
+    case MountState::WYRDEER_OFF:
+    case MountState::BASCULEGION_OFF:
+        return run_state_action(State::WYRDEER_BASCULEGION_OFF);
+    case MountState::WYRDEER_ON:
+    case MountState::BASCULEGION_ON:
+        return run_state_action(State::WYRDEER_BASCULEGION_ON);
+    case MountState::URSALUNA_OFF:
+        return run_state_action(State::URSALUNA_OFF);
+    case MountState::URSALUNA_ON:
+        return run_state_action(State::URSALUNA_ON);
+    case MountState::SNEASLER_OFF:
+        return run_state_action(State::SNEASLER_OFF);
+    case MountState::SNEASLER_ON:
+        return run_climbing(commands, timestamp);
+    case MountState::BRAVIARY_OFF:
+        return run_state_action(State::BRAVIARY_OFF);
+    case MountState::BRAVIARY_ON:
+        return run_flying(commands, timestamp);
+    }
+
+    m_stream.log("No state handler for current state.", COLOR_RED);
+    return false;
+}
+bool FlagNavigationAir::run_flying(AsyncCommandSession<ProController>& commands, WallClock timestamp){
+    //  Need to get on Sneasler.
+    if (m_centerA.detected() && last_state_change() + std::chrono::seconds(2) < timestamp){
+        return run_state_action(State::GET_ON_SNEASLER);
+    }
+
+//    cout << "m_last_known_flag_y = " << m_last_known_flag_y << endl;
+
+    State state = (State)this->last_state();
+#if 0
+    if (m_flag_y > 0.9 && last_state_change() + std::chrono::seconds(2) < timestamp){
+//        cout << "state = " << (size_t)state << endl;
+        switch (state){
+        case State::DASH_FORWARD_MASH_B:
+        case State::DASH_FORWARD_HOLD_B:
+        case State::DIVE:
+            m_console.log("Target passed under you. Target reached.");
+            return true;
+        default:;
+        }
+    }
+#endif
+
+//    if (m_last_flag_detection + std::chrono::seconds(20) < timestamp){
+//        OperationFailedExceptionWithScreenshot::fire(m_console, "Flag not detected after 20 seconds.", true);
+//    }
+//    double flag_age = std::chrono::duration_cast<std::chrono::milliseconds>(timestamp - m_last_flag_detection).count() / 1000.;
+//    if (flag_age > 0){
+//        m_console.log("Flag Age = " + std::to_string(flag_age));
+//    }
+
+    //  Flag is stale.
+    if (m_last_flag_detection + std::chrono::seconds(1) < timestamp){
+        return run_state_action(State::FIND_FLAG);
+    }
+
+
+    //  Re-center the flag.
+    if (m_flag_x <= 0.30){
+        return run_state_action(State::TURN_LEFT);
+    }
+    if (m_flag_x >= 0.70){
+        return run_state_action(State::TURN_RIGHT);
+    }
+
+    //  Dive
+    double dive_threshold = 0.80;
+    switch (state){
+    case State::DIVE_STRAIGHT:
+    case State::DIVE_LEFT:
+    case State::DIVE_RIGHT:
+        dive_threshold = 0.10;
+        break;
+    case State::DASH_FORWARD_HOLD_B:
+    case State::DASH_FORWARD_MASH_B:
+    case State::DASH_LEFT:
+    case State::DASH_RIGHT:{
+        if (m_looking_straight_ahead.load(std::memory_order_acquire) &&
+            m_looking_straight_ahead_timestamp.load(std::memory_order_acquire) + std::chrono::seconds(1) < timestamp){
+            dive_threshold = 0.45;
+        }
+        break;
+    }
+    default:;
+    }
+//    cout << "m_flag_y = " << m_flag_y << endl;
+    if (m_flag_detected && m_flag_y > dive_threshold){
+        if (0.49 <= m_flag_x && m_flag_x <= 0.51){
+            return run_state_action(State::DIVE_STRAIGHT);
+        }else{
+            return run_state_action(m_flag_x < 0.5 ? State::DIVE_LEFT : State::DIVE_RIGHT);
+        }
+    }
+
+    //  Turning Cruise
+    if (0.48 > m_flag_x || m_flag_x > 0.52){
+        return run_state_action(m_flag_x < 0.5 ? State::DASH_LEFT : State::DASH_RIGHT);
+    }
+
+    //  B-mash Cruise
+    return run_state_action(State::DASH_FORWARD_MASH_B);
+
+#if 0
+    if (m_flag_y <= 0.40){
+        //  B-mash Cruise
+        return run_state_action(State::DASH_FORWARD_MASH_B);
+    }else{
+        //  Normal Cruise
+        return run_state_action(State::DASH_FORWARD_HOLD_B);
+    }
+
+    //  No known state left.
+    return run_state_action(State::DIVE_STRAIGHT);
+#endif
+}
+bool FlagNavigationAir::run_climbing(AsyncCommandSession<ProController>& commands, WallClock timestamp){
+    //  Can't jump off means you're able to stand. Switch back to Braviary.
+    if (!m_leftB.detected()){
+        return run_state_action(State::SNEASLER_ON);
+    }
+    return run_state_action(State::CLIMBING);
+}
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_FlagNavigationAir.h b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_FlagNavigationAir.h
new file mode 100644
index 0000000000..3a5c1ddd8e
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_FlagNavigationAir.h
@@ -0,0 +1,108 @@
+/*  Flag Navigation (Air)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLA_FlagNavigation_H
+#define PokemonAutomation_PokemonLA_FlagNavigation_H
+
+#include "CommonTools/Async/SuperControlSession.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+#include "VideoGames/PokemonLA/Inference/Objects/PokemonLA_FlagTracker.h"
+#include "VideoGames/PokemonLA/Inference/Objects/PokemonLA_ButtonDetector.h"
+#include "VideoGames/PokemonLA/Inference/PokemonLA_DialogDetector.h"
+#include "VideoGames/PokemonLA/Inference/PokemonLA_MountDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+
+class FlagNavigationAir : public SuperControlSession<ProController>{
+public:
+    FlagNavigationAir(
+        ProgramEnvironment& env,
+        VideoStream& stream, ProControllerContext& context,
+        uint16_t stop_radius,
+        double flag_reached_delay,
+        std::chrono::seconds navigate_timeout
+    );
+
+    void set_distance_callback(std::function<void(double distance)> flag_callback);
+
+
+private:
+    virtual bool run_state(AsyncCommandSession<ProController>& commands, WallClock timestamp) override;
+
+    bool run_flying(AsyncCommandSession<ProController>& commands, WallClock timestamp);
+    bool run_climbing(AsyncCommandSession<ProController>& commands, WallClock timestamp);
+
+
+private:
+    enum class State{
+        UNKNOWN,
+        WYRDEER_BASCULEGION_OFF,
+        WYRDEER_BASCULEGION_ON,
+        URSALUNA_OFF,
+        URSALUNA_ON,
+        SNEASLER_OFF,
+        SNEASLER_ON,
+        BRAVIARY_OFF,
+        GET_ON_SNEASLER,
+        CLIMBING,
+        DASH_FORWARD_MASH_B,
+        DASH_FORWARD_HOLD_B,
+        DASH_LEFT,
+        DASH_RIGHT,
+        DIVE_STRAIGHT,
+        DIVE_LEFT,
+        DIVE_RIGHT,
+        TURN_LEFT,
+        TURN_RIGHT,
+        FIND_FLAG,
+    };
+    void register_state_command(State state, std::function<bool()>&& action){
+        SuperControlSession::register_state_command((size_t)state, std::move(action));
+    }
+    bool run_state_action(State state){
+        return SuperControlSession::run_state_action((size_t)state);
+    }
+
+    uint16_t m_stop_radius;
+    std::chrono::milliseconds m_flag_reached_delay;
+    std::chrono::seconds m_navigate_timeout;
+
+    std::function<void(double distance)> m_flag_callback;
+
+    FlagTracker m_flag;
+    MountTracker m_mount;
+    ButtonDetector m_centerA;
+    ButtonDetector m_leftB;
+    DialogSurpriseDetector m_dialog_detector;
+
+    std::atomic<bool> m_looking_straight_ahead;
+    std::atomic<WallClock> m_looking_straight_ahead_timestamp;
+//    WallClock m_last_good_state;
+    MountState m_last_known_mount;
+
+    std::atomic<bool> m_find_flag_failed;
+    WallClock m_flag_reached_time;
+
+    WallClock m_last_flag_detection;
+    bool m_flag_detected;
+
+    //  Last known values.
+    double m_flag_distance;
+    double m_flag_x;
+    double m_flag_y;
+
+    WallClock m_last_flag_print;
+};
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_GameEntry.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_GameEntry.cpp
new file mode 100644
index 0000000000..911e41fae6
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_GameEntry.cpp
@@ -0,0 +1,112 @@
+/*  Game Entry
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Tools/ErrorDumper.h"
+#include "CommonFramework/Tools/ProgramEnvironment.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "CommonTools/VisualDetectors/BlackScreenDetector.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "VideoGames/PokemonLA/PokemonLA_Settings.h"
+#include "PokemonLA_GameEntry.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+
+bool reset_game_to_gamemenu(
+    ConsoleHandle& console, ProControllerContext& context
+){
+    from_home_close_and_reopen_game(console, context, true);
+
+    // Now the game has opened:
+    return openedgame_to_gamemenu(console, context, GameSettings::instance().START_GAME_WAIT1);
+}
+
+//  From the game menu screen (where "Press A" is displayed to enter the game),
+//  mash A to enter the game and wait until the black screen is gone.
+bool gamemenu_to_ingame(
+    VideoStream& stream, ProControllerContext& context,
+    Milliseconds mash_duration, Milliseconds enter_game_timeout
+){
+    stream.log("Mashing A to enter game...");
+    BlackScreenOverWatcher detector(COLOR_RED, {0.2, 0.2, 0.6, 0.6});
+    pbf_mash_button(context, BUTTON_A, mash_duration);
+    context.wait_for_all_requests();
+    stream.log("Waiting to enter game...");
+    int ret = wait_until(
+        stream, context,
+        std::chrono::milliseconds(enter_game_timeout),
+        {{detector}}
+    );
+    if (ret == 0){
+        stream.log("Entered game!");
+        return true;
+    }else{
+        stream.log("Timed out waiting to enter game.", COLOR_RED);
+        return false;
+    }
+}
+
+bool reset_game_from_home(
+    ProgramEnvironment& env,
+    ConsoleHandle& console, ProControllerContext& context,
+    bool backup_save,
+    Milliseconds enter_game_mash,
+    Milliseconds enter_game_timeout,
+    Milliseconds post_wait_time
+){
+    bool ok = true;
+    ok &= reset_game_to_gamemenu(console, context);
+
+    if (backup_save){
+        console.log("Loading backup save!");
+        pbf_wait(context, 1000ms);
+        ssf_press_dpad(context, DPAD_UP, 0ms, 200ms);
+        ssf_press_button(context, BUTTON_B | BUTTON_X, 1000ms, 200ms);
+    }
+
+    ok &= gamemenu_to_ingame(
+        console, context,
+        enter_game_mash,
+        enter_game_timeout
+    );
+    if (!ok){
+        dump_image(console.logger(), env.program_info(), console.video(), "StartGame");
+    }
+    console.log("Entered game! Waiting out grace period.");
+    pbf_wait(context, post_wait_time);
+    context.wait_for_all_requests();
+    return ok;
+}
+bool reset_game_from_home(
+    ProgramEnvironment& env,
+    ConsoleHandle& console, ProControllerContext& context,
+    bool backup_save,
+    Milliseconds post_wait_time
+){
+    return reset_game_from_home(
+        env, console, context,
+        backup_save,
+        GameSettings::instance().ENTER_GAME_MASH0,
+        GameSettings::instance().ENTER_GAME_WAIT0,
+        post_wait_time
+    );
+}
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_GameEntry.h b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_GameEntry.h
new file mode 100644
index 0000000000..e59f01ea0f
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_GameEntry.h
@@ -0,0 +1,52 @@
+/*  Game Entry
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLA_GameEntry_H
+#define PokemonAutomation_PokemonLA_GameEntry_H
+
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+#include "NintendoSwitch/NintendoSwitch_ConsoleHandle.h"
+
+namespace PokemonAutomation{
+    class ProgramEnvironment;
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+using namespace std::chrono_literals;
+
+
+//  From Switch Home menu, reset game and wait until the game menu screen (where
+//  "Press A" is displayed to enter the game) is shown.
+bool reset_game_to_gamemenu(
+    ConsoleHandle& console, ProControllerContext& context
+);
+
+//  From Switch Home menu, start game and wait until the player character
+//  appears in game.
+//  post_wait_time: how many ticks to wait after the black screen
+//  (shown when loading the map) is over.
+bool reset_game_from_home(
+    ProgramEnvironment& env,
+    ConsoleHandle& console, ProControllerContext& context,
+    bool backup_save,
+    Milliseconds enter_game_mash,
+    Milliseconds enter_game_timeout,
+    Milliseconds post_wait_time
+);
+bool reset_game_from_home(
+    ProgramEnvironment& env,
+    ConsoleHandle& console, ProControllerContext& context,
+    bool backup_save = false,
+    Milliseconds post_wait_time = 1000ms
+);
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_GameSave.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_GameSave.cpp
new file mode 100644
index 0000000000..53f9b32919
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_GameSave.cpp
@@ -0,0 +1,185 @@
+/*  Game Save
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/ImageTools/ImageStats.h"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/ImageTypes/ImageRGB32.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonFramework/Tools/ProgramEnvironment.h"
+#include "CommonTools/Images/ImageFilter.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "Tests/ImageUnitTest.h"
+#include "Tests/TestUtils.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "VideoGames/PokemonLA/Inference/Objects/PokemonLA_ArcPhoneDetector.h"
+#include "PokemonLA_GameSave.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+namespace{
+
+const ImageFloatBox tab_box{0.450, 0.005, 0.040, 0.010};
+const ImageFloatBox save_icon_box{0.456, 0.015, 0.026, 0.041};
+
+}
+
+
+bool save_tab_selected(const ImageViewRGB32 &screen){
+
+    const ImageStats stats = image_stats(extract_box_reference(screen, tab_box));
+    return (stats.stddev.sum() < 15 &&
+        stats.average.b > stats.average.r && stats.average.b > stats.average.g
+    );
+}
+
+bool save_tab_disabled(const ImageViewRGB32 &screen){
+
+    // Replace white background with zero-alpha color so that they won't be counted in
+    // the following image_stats()
+    // The white background is defined as the color between 0xffa0a0a0 and 0xffffffff.
+    const bool replace_background = true;
+    ImageRGB32 region = filter_rgb32_range(
+        extract_box_reference(screen, save_icon_box),
+        0xffa0a0a0, 0xffffffff, Color(0), replace_background
+    );
+
+    ImageStats stats = image_stats(region);
+    // cout << "color " << stats.count << " " << stats.average.to_string() << endl;
+    return (stats.average.r > stats.average.b + 50.0);
+}
+
+
+bool save_game_from_overworld(
+    ProgramEnvironment& env,
+    VideoStream& stream, ProControllerContext& context
+){
+    OverlayBoxScope tab_box_scope(stream.overlay(), tab_box);
+    OverlayBoxScope icon_box_scope(stream.overlay(), save_icon_box);
+    stream.log("Saving game...");
+    stream.overlay().add_log("Saving game...", COLOR_WHITE);
+
+    // Press DPAD_UP to open menu
+    pbf_press_dpad(context, DPAD_UP, 160ms, 960ms);
+    context.wait_for_all_requests();
+    auto snapshot = stream.video().snapshot();
+    if (save_tab_disabled(snapshot)){
+        return false;
+    }
+
+    bool found = false;
+    for (size_t c = 0; c < 10; c++){
+        if (save_tab_selected(snapshot)){
+            pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+            pbf_press_button(context, BUTTON_B, 160ms, 840ms);
+//            pbf_press_button(context, BUTTON_B, 160ms, 840ms);
+            context.wait_for_all_requests();
+            found = true;
+            break;
+        }
+        pbf_press_button(context, BUTTON_ZR, 160ms, 640ms);
+        context.wait_for_all_requests();
+        snapshot = stream.video().snapshot();
+    }
+    if (!found){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "Unable to find save menu.",
+            stream
+        );
+    }
+
+    ArcPhoneDetector detector(stream.logger(), stream.overlay(), std::chrono::milliseconds(100), true);
+    int ret = run_until<ProControllerContext>(
+        stream, context,
+        [&](ProControllerContext& context){
+            for (size_t c = 0; c < 10; c++){
+                pbf_press_button(context, BUTTON_B, 160ms, 1840ms);
+            }
+        },
+        {detector}
+    );
+    if (ret < 0){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "Unable to return to overworld.",
+            stream
+        );
+    }
+    stream.log("Saving game... Done.");
+
+    return true;
+}
+
+
+
+
+
+class Test_GameSave : public ImageUnitTest{
+public:
+    Test_GameSave(
+        const std::string& image,
+        std::vector<std::string> keywords
+    )
+        : ImageUnitTest("PokemonLA::GameSave - " + image, {image})
+        , m_keywords(std::move(keywords))
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+
+        // two keywords: <True/False> <True/False>
+        if (m_keywords.size() < 2){
+            std::stringstream ss;
+            ss << "Error: not enough number of keywords in the filename. Found only " << m_keywords.size() << "." << std::endl;
+            return ss.str();
+        }
+
+        bool target_save_tab = false;
+        if (parse_bool(m_keywords[m_keywords.size()-2], target_save_tab) == false){
+            std::stringstream ss;
+            ss << "Error: True/False keyword " << m_keywords[m_keywords.size()-2] << " is wrong. Must be \"True\" or \"False\"." << std::endl;
+            return ss.str();
+        }
+        bool target_save_disabled = false;
+        if (parse_bool(m_keywords[m_keywords.size()-1], target_save_disabled) == false){
+            std::stringstream ss;
+            ss << "Error: True/False keyword " << m_keywords[m_keywords.size()-1] << " is wrong. Must be \"True\" or \"False\"." << std::endl;
+            return ss.str();
+        }
+
+        const ImageRGB32& image = images[0];
+        bool save_tab = save_tab_selected(image);
+        bool save_disabled = save_tab_disabled(image);
+
+        TEST_RESULT_COMPONENT_EQUAL_STR(save_tab, target_save_tab, "save tab");
+        TEST_RESULT_COMPONENT_EQUAL_STR(save_disabled, target_save_disabled, "save disabled");
+
+        return true;
+    };
+
+private:
+    std::vector<std::string> m_keywords;
+};
+
+void add_tests_GameSave(UnitTestDatabase& database){
+
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_GameSave.h b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_GameSave.h
new file mode 100644
index 0000000000..3eeeedcdb9
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_GameSave.h
@@ -0,0 +1,44 @@
+/*  Game Save
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLA_GameSave_H
+#define PokemonAutomation_PokemonLA_GameSave_H
+
+#include "Common/Cpp/TestRunners/UnitTest.h"
+#include "CommonFramework/Tools/VideoStream.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+
+namespace PokemonAutomation{
+    class ProgramEnvironment;
+    class ImageViewRGB32;
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+// Whether the current tab is the save game tab
+bool save_tab_selected(const ImageViewRGB32 &screen);
+
+// Whether the save game tab is disabled: a red "forbidden" synbol appears on the location of the save game tab icon.
+bool save_tab_disabled(const ImageViewRGB32 &screen);
+
+// Open menu to save game. Return true if success.
+// Return false if in current state the game cannot be saved. This can happen if the player character is in the air
+// or is rolling or falling.
+bool save_game_from_overworld(
+    ProgramEnvironment& env,
+    VideoStream& stream, ProControllerContext& context
+);
+
+
+
+
+void add_tests_GameSave(UnitTestDatabase& database);
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_LeapPokemonActions.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_LeapPokemonActions.cpp
new file mode 100644
index 0000000000..514445f8e0
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_LeapPokemonActions.cpp
@@ -0,0 +1,346 @@
+/*  Leap Pokemon Actions
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "VideoGames/PokemonLA/Resources/PokemonLA_PokemonInfo.h"
+#include "VideoGames/PokemonLA/Inference/PokemonLA_StatusInfoScreenDetector.h"
+#include "VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattleMenuDetector.h"
+#include "VideoGames/PokemonLA/PokemonLA_TravelLocations.h"
+#include "PokemonLA_MountChange.h"
+#include "PokemonLA_RegionNavigation.h"
+#include "PokemonLA_BattleRoutines.h"
+#include "PokemonLA_LeapPokemonActions.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+void route(
+    ProgramEnvironment& env, VideoStream& stream, ProControllerContext& context,
+    LeapPokemon pokemon,
+    bool fresh_from_reset
+){
+    switch (pokemon){
+    case LeapPokemon::Aipom:
+        goto_camp_from_jubilife(
+            env, stream, context,
+            TravelLocations::instance().Coastlands_Beachside,
+            fresh_from_reset
+        );
+        pbf_move_left_joystick(context, {+0.866, -1}, 240ms, 240ms);
+        pbf_press_button(context, BUTTON_ZL, 160ms, 500ms);
+        change_mount(stream, context, MountState::BRAVIARY_ON);
+        pbf_press_button(context, BUTTON_B, 20000ms, 1000ms);
+        pbf_press_button(context, BUTTON_PLUS, 1000ms, 500ms);
+        pbf_move_left_joystick(context, {+1, -0.252}, 240ms, 500ms);
+        pbf_press_button(context, BUTTON_ZL, 160ms, 500ms);
+        pbf_move_left_joystick(context, {-0.008, +1}, 3000ms, 1000ms);
+        break;
+    case LeapPokemon::Burmy:
+        goto_camp_from_jubilife(
+            env, stream, context,
+            TravelLocations::instance().Fieldlands_Heights,
+            fresh_from_reset
+        );
+        pbf_move_left_joystick(context, {+0.331, -1}, 240ms, 240ms);
+        change_mount(stream, context, MountState::BRAVIARY_ON);
+        pbf_press_button(context, BUTTON_B, 6350ms, 160ms);
+        pbf_press_button(context, BUTTON_PLUS, 160ms, 1000ms);
+        pbf_press_button(context, BUTTON_PLUS, 160ms, 500ms);
+        pbf_press_button(context, BUTTON_PLUS, 160ms, 1500ms);
+        pbf_move_left_joystick(context, {+1, +0.008}, 240ms, 500ms);
+        pbf_press_button(context, BUTTON_ZL, 160ms, 500ms);
+        pbf_move_right_joystick(context, {0, -1}, 100ms, 500ms);
+        break;
+    case LeapPokemon::Cherrim:
+        goto_camp_from_jubilife(
+            env, stream, context,
+            TravelLocations::instance().Highlands_Mountain,
+            fresh_from_reset
+        );
+        pbf_move_left_joystick(context, {+1, +0.727}, 240ms, 240ms);
+        pbf_press_button(context, BUTTON_ZL, 160ms, 500ms);
+        change_mount(stream, context, MountState::BRAVIARY_ON);
+        pbf_press_button(context, BUTTON_B, 3350ms, 1000ms);
+        pbf_press_button(context, BUTTON_PLUS, 160ms, 1000ms);
+        pbf_press_button(context, BUTTON_PLUS, 160ms, 500ms);
+        pbf_press_button(context, BUTTON_PLUS, 160ms, 1500ms);
+        pbf_move_left_joystick(context, {-1, +0.008}, 160ms, 160ms);
+        pbf_press_button(context, BUTTON_ZL, 160ms, 500ms);
+        pbf_move_right_joystick(context, {0, -1}, 200ms, 500ms);
+        break;
+    case LeapPokemon::Cherubi:
+        goto_camp_from_jubilife(
+            env, stream, context,
+            TravelLocations::instance().Fieldlands_Arena,
+            fresh_from_reset
+        );
+        pbf_move_left_joystick(context, {+1, -0.189}, 240ms, 240ms);
+        change_mount(stream, context, MountState::BRAVIARY_ON);
+        pbf_press_button(context, BUTTON_B, 25500ms, 1000ms);
+        pbf_press_button(context, BUTTON_PLUS, 160ms, 500ms);
+        break;
+    case LeapPokemon::Combee:
+        goto_camp_from_jubilife(
+            env, stream, context,
+            TravelLocations::instance().Fieldlands_Arena,
+            fresh_from_reset
+        );
+        pbf_move_left_joystick(context, {-0.555, -1}, 160ms, 500ms);
+        pbf_press_button(context, BUTTON_ZL, 160ms, 500ms);
+        change_mount(stream, context, MountState::BRAVIARY_ON);
+        pbf_press_button(context, BUTTON_B, 2750ms, 1000ms);
+        pbf_press_button(context, BUTTON_PLUS, 160ms, 1000ms);
+        break;
+    case LeapPokemon::Heracross:
+        goto_camp_from_jubilife(
+            env, stream, context,
+            TravelLocations::instance().Highlands_Mountain,
+            fresh_from_reset
+        );
+        pbf_move_left_joystick(context, {-1, -0.724}, 240ms, 240ms);
+        pbf_press_button(context, BUTTON_ZL, 160ms, 500ms);
+        pbf_move_left_joystick(context, {-0.008, +1}, 4000ms, 500ms);
+        pbf_move_right_joystick(context, {0, -1}, 170ms, 1000ms);
+        break;
+    case LeapPokemon::Pachirisu:
+    case LeapPokemon::Vespiquen:
+        goto_camp_from_jubilife(
+            env, stream, context,
+            TravelLocations::instance().Mirelands_Bogbound,
+            fresh_from_reset
+        );
+        pbf_move_left_joystick(context, {-1, -0.331}, 240ms, 240ms);
+        pbf_press_button(context, BUTTON_ZL, 160ms, 500ms);
+        change_mount(stream, context, MountState::BRAVIARY_ON);
+        pbf_press_button(context, BUTTON_B, 10200ms, 160ms);
+        pbf_press_button(context, BUTTON_PLUS, 160ms, 1000ms);
+        break;
+    case LeapPokemon::Wormadam:
+        goto_camp_from_jubilife(
+            env, stream, context,
+            TravelLocations::instance().Fieldlands_Fieldlands,
+            fresh_from_reset
+        );
+        pbf_move_left_joystick(context, {-0.141, -1}, 240ms, 240ms);
+        change_mount(stream, context, MountState::BRAVIARY_ON);
+        pbf_press_button(context, BUTTON_B, 6250ms, 160ms);
+        pbf_press_button(context, BUTTON_PLUS, 160ms, 1000ms);
+        pbf_move_left_joystick(context, {+1, +0.219}, 160ms, 160ms);
+        pbf_press_button(context, BUTTON_ZL, 160ms, 500ms);
+        pbf_move_right_joystick(context, {0, -1}, 200ms, 500ms);
+        break;
+    case LeapPokemon::Geodude:
+        goto_camp_from_jubilife(
+            env, stream, context,
+            TravelLocations::instance().Fieldlands_Heights,
+            fresh_from_reset
+        );
+        pbf_move_left_joystick(context, {+0.567, -1}, 160ms, 160ms);
+        pbf_press_button(context, BUTTON_ZL, 160ms, 500ms);
+        change_mount(stream, context, MountState::BRAVIARY_ON);
+        pbf_press_button(context, BUTTON_B, 3750ms, 160ms);
+        pbf_press_button(context, BUTTON_PLUS, 160ms, 1000ms);
+        pbf_press_button(context, BUTTON_PLUS, 160ms, 500ms);
+        pbf_press_button(context, BUTTON_PLUS, 160ms, 1000ms);
+        pbf_move_left_joystick(context, {0, -1}, 160ms, 160ms);
+        pbf_press_button(context, BUTTON_ZL, 160ms, 500ms);
+        break;
+    case LeapPokemon::Graveler:
+        goto_camp_from_jubilife(
+            env, stream, context,
+            TravelLocations::instance().Highlands_Highlands,
+            fresh_from_reset
+        );
+        pbf_move_left_joystick(context, {+1, -0.134}, 160ms, 160ms);
+        pbf_press_button(context, BUTTON_ZL, 160ms, 500ms);
+        pbf_move_left_joystick(context, {-0.008, +1}, 5000ms, 500ms);
+        break;
+    case LeapPokemon::Bonsly:
+        goto_camp_from_jubilife(
+            env, stream, context,
+            TravelLocations::instance().Mirelands_DiamondSettlement,
+            fresh_from_reset
+        );
+        pbf_move_left_joystick(context, {-1, -0.173}, 160ms, 500ms);
+        pbf_press_button(context, BUTTON_ZL, 160ms, 500ms);
+        change_mount(stream, context, MountState::BRAVIARY_ON);
+        pbf_move_left_joystick(context, {-0.008, +1}, 10000ms, 500ms);
+        break;
+    case LeapPokemon::Bronzor:
+        goto_camp_from_jubilife(
+            env, stream, context,
+            TravelLocations::instance().Highlands_Mountain,
+            fresh_from_reset
+        );
+        pbf_move_left_joystick(context, {-0.57, -1}, 160ms, 500ms);
+        pbf_press_button(context, BUTTON_ZL, 160ms, 500ms);
+        change_mount(stream, context, MountState::WYRDEER_ON);
+        pbf_press_button(context, BUTTON_B, 6500ms, 1000ms);
+        pbf_press_button(context, BUTTON_PLUS, 160ms, 500ms);
+        pbf_move_right_joystick(context, {0, -1}, 200ms, 500ms);
+        break;
+    case LeapPokemon::Nosepass:
+        goto_camp_from_jubilife(
+            env, stream, context,
+            TravelLocations::instance().Highlands_Summit,
+            fresh_from_reset
+        );
+        pbf_move_left_joystick(context, {+1, -0.37}, 160ms, 500ms);
+        pbf_press_button(context, BUTTON_ZL, 160ms, 500ms);
+        change_mount(stream, context, MountState::WYRDEER_ON);
+        pbf_press_button(context, BUTTON_B, 2500ms, 1000ms);
+        pbf_press_button(context, BUTTON_PLUS, 160ms, 500ms);
+        pbf_move_right_joystick(context, {0, -1}, 200ms, 500ms);
+        break;
+    case LeapPokemon::Bergimite:
+        goto_camp_from_jubilife(
+            env, stream, context,
+            TravelLocations::instance().Icelands_Snowfields,
+            fresh_from_reset
+        );
+        pbf_move_left_joystick(context, {-0.102, -1}, 160ms, 500ms);
+        pbf_press_button(context, BUTTON_ZL, 160ms, 500ms);
+        change_mount(stream, context, MountState::WYRDEER_ON);
+        pbf_press_button(context, BUTTON_B, 3200ms, 1000ms);
+        pbf_press_button(context, BUTTON_PLUS, 160ms, 500ms);
+        pbf_move_right_joystick(context, {0, -1}, 200ms, 500ms);
+        break;
+    }
+    context.wait_for_all_requests();
+}
+
+void return_to_jubilife(ProgramEnvironment& env, VideoStream& stream, ProControllerContext& context, LeapPokemon pokemon){
+    goto_camp_from_overworld(env, stream, context);
+    switch (pokemon){
+    case LeapPokemon::Aipom:
+        goto_professor(stream.logger(), context, Camp::COASTLANDS_BEACHSIDE);
+        break;
+    case LeapPokemon::Burmy:
+    case LeapPokemon::Cherubi:
+    case LeapPokemon::Combee:
+    case LeapPokemon::Wormadam:
+    case LeapPokemon::Geodude:
+        goto_professor(stream.logger(), context, Camp::FIELDLANDS_FIELDLANDS);
+        break;
+    case LeapPokemon::Cherrim:
+    case LeapPokemon::Heracross:
+    case LeapPokemon::Graveler:
+    case LeapPokemon::Bronzor:
+    case LeapPokemon::Nosepass:
+        goto_professor(stream.logger(), context, Camp::HIGHLANDS_HIGHLANDS);
+        break;
+    case LeapPokemon::Pachirisu:
+    case LeapPokemon::Vespiquen:
+    case LeapPokemon::Bonsly:
+        goto_professor(stream.logger(), context, Camp::MIRELANDS_MIRELANDS);
+        break;
+    case LeapPokemon::Bergimite:
+        goto_professor(stream.logger(), context, Camp::ICELANDS_SNOWFIELDS);
+        break;
+    }
+    from_professor_return_to_jubilife(env, stream, context);
+    context.wait_for_all_requests();
+}
+
+bool check_tree_or_ore_for_battle(VideoStream& stream, ProControllerContext& context){
+    pbf_press_button(context, BUTTON_ZR, 500ms, 160ms); //throw pokemon
+    pbf_wait(context, 4500ms);
+    context.wait_for_all_requests();
+
+    MountDetector mount_detector;
+
+    VideoSnapshot snapshot = stream.video().snapshot();
+    MountState mount = mount_detector.detect(snapshot);
+    bool found = false;
+    for (int i = 0; i < 4; i++){
+        if (mount == MountState::NOTHING){
+            found = true;
+            break;
+        }else{
+            stream.log("Attempt " + std::to_string(i) + ". Found: " + MOUNT_STATE_STRINGS[(int)mount]);
+            pbf_wait(context, 500ms);
+            context.wait_for_all_requests();
+            snapshot = stream.video().snapshot();
+        }
+        mount = mount_detector.detect(snapshot);
+    }
+
+    if (!found){
+        stream.log("Battle not found. Tree or ore might be empty.");
+        return false;
+    }
+
+    stream.log("Mount icon seems to be gone, waiting for battle menu...");
+
+    BattleMenuDetector battle_menu_detector(stream.logger(), stream.overlay(), true);
+    wait_until(
+       stream, context, std::chrono::seconds(10),
+       {{battle_menu_detector}}
+    );
+
+    if(battle_menu_detector.detected()){
+        stream.log("Battle found!");
+        return true;
+    }
+
+    stream.log("Battle menu not found. Tree or ore might be empty.");
+    return false;
+}
+
+void exit_battle(VideoStream& stream, ProControllerContext& context, ExitBattleMethod exit_method){
+//    pbf_press_button(context, BUTTON_B, 160ms, 1800ms);
+
+    if (exit_method == ExitBattleMethod::RunAway){
+        stream.log("Running from battle...");
+        pbf_press_button(context, BUTTON_B, 160ms, 1800ms);
+        pbf_press_button(context, BUTTON_A, 160ms, 4300ms);
+        context.wait_for_all_requests();
+        return;
+    }
+
+    context.wait_for_all_requests();
+    stream.log("Mashing A to battle!");
+    mash_A_until_end_of_battle(stream, context);
+}
+
+PokemonDetails get_pokemon_details(VideoStream& stream, ProControllerContext& context, Language language){
+    //  Open Info Screen
+    pbf_wait(context, 1000ms);
+    pbf_press_button(context, BUTTON_PLUS, 500ms, 1000ms);
+    pbf_press_button(context, BUTTON_R, 500ms, 1000ms);
+
+    context.wait_for_all_requests();
+    VideoSnapshot screen = stream.video().snapshot();
+
+    return read_status_info(stream.logger(), stream.overlay(), screen, language);
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_LeapPokemonActions.h b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_LeapPokemonActions.h
new file mode 100644
index 0000000000..342a83701e
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_LeapPokemonActions.h
@@ -0,0 +1,55 @@
+/*  Leap Pokemon Actions
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLA_LeapPokemonActions_H
+#define PokemonAutomation_PokemonLA_LeapPokemonActions_H
+
+#include "CommonFramework/Language.h"
+#include "CommonFramework/Tools/VideoStream.h"
+#include "VideoGames/PokemonLA/Resources/PokemonLA_PokemonInfo.h"
+#include "VideoGames/PokemonLA/Options/PokemonLA_MiscOptions.h"
+#include "PokemonLA_RegionNavigation.h"
+
+namespace PokemonAutomation{
+    class ProgramEnvironment;
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+enum class LeapPokemon
+{
+    Aipom,
+    Burmy,
+    Cherrim,
+    Cherubi,
+    Combee,
+    Heracross,
+    Pachirisu,
+    Vespiquen,
+    Wormadam,
+    Geodude,
+    Graveler,
+    Bonsly,
+    Bronzor,
+    Nosepass,
+    Bergimite
+};
+
+void setup(ProgramEnvironment& env, VideoStream& stream, ProControllerContext& context);
+void route(
+    ProgramEnvironment& env, VideoStream& stream, ProControllerContext& context,
+    LeapPokemon pokemon,
+    bool fresh_from_reset
+);
+bool check_tree_or_ore_for_battle(VideoStream& stream, ProControllerContext& context);
+void exit_battle(VideoStream& stream, ProControllerContext& context, ExitBattleMethod exit_method);
+void return_to_jubilife(ProgramEnvironment& env, VideoStream& stream, ProControllerContext& context, LeapPokemon pokemon);
+PokemonDetails get_pokemon_details(VideoStream& stream, ProControllerContext& context, Language language);
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_MountChange.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_MountChange.cpp
new file mode 100644
index 0000000000..c1475ad18e
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_MountChange.cpp
@@ -0,0 +1,147 @@
+/*  Mount Change
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "PokemonLA_MountChange.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+
+bool get_mount_coordinates(size_t& index, MountState mount){
+    switch (mount){
+    case MountState::WYRDEER_OFF:
+    case MountState::BASCULEGION_OFF:
+        index = 0;
+        return false;
+    case MountState::WYRDEER_ON:
+    case MountState::BASCULEGION_ON:
+        index = 0;
+        return true;
+    case MountState::URSALUNA_OFF:
+        index = 1;
+        return false;
+    case MountState::URSALUNA_ON:
+        index = 1;
+        return true;
+    case MountState::SNEASLER_OFF:
+        index = 2;
+        return false;
+    case MountState::SNEASLER_ON:
+        index = 2;
+        return true;
+    case MountState::BRAVIARY_OFF:
+        index = 3;
+        return false;
+    case MountState::BRAVIARY_ON:
+        index = 3;
+        return true;
+    default:
+        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Invalid MountState = " + std::to_string((size_t)mount));
+    }
+}
+
+void change_mount(VideoStream& stream, ProControllerContext& context, MountState mount){
+    size_t desired_index;
+    bool desired_on = get_mount_coordinates(desired_index, mount);
+
+    MountDetector mount_detector;
+    for (size_t c = 0; c < 20; c++){
+        context.wait_for_all_requests();
+
+        MountState current = mount_detector.detect(stream.video().snapshot());
+        if (mount == current){
+            return;
+        }
+        if (current == MountState::NOTHING){
+            pbf_press_dpad(context, DPAD_RIGHT, 160ms, 400ms);
+            continue;
+        }
+
+        size_t current_index;
+        bool current_on = get_mount_coordinates(current_index, current);
+
+        if (!desired_on && current_on){
+            pbf_press_button(context, BUTTON_PLUS, 160ms, 840ms);
+        }
+
+        size_t index_diff = (4 + current_index - desired_index) % 4;
+        switch (index_diff){
+        case 0:
+            break;
+        case 1:
+            pbf_press_dpad(context, DPAD_RIGHT, 160ms, 400ms);
+            break;
+        case 2:
+            pbf_press_dpad(context, DPAD_RIGHT, 160ms, 400ms);
+            pbf_press_dpad(context, DPAD_RIGHT, 160ms, 400ms);
+            break;
+        case 3:
+            pbf_press_dpad(context, DPAD_LEFT, 160ms, 400ms);
+            break;
+        }
+
+        if (desired_on && !current_on){
+            if (desired_index == 3){
+                pbf_press_button(context, BUTTON_PLUS, 160ms, 1840ms);
+            }else{
+                pbf_press_button(context, BUTTON_PLUS, 160ms, 840ms);
+            }
+        }
+    }
+
+    OperationFailedExceptionWithScreenshot::fire(
+        ErrorReportMode::SEND_ERROR_REPORT,
+        std::string("Unable to find ") + MOUNT_STATE_STRINGS[(size_t)mount] + " after 10 attempts.",
+        stream
+    );
+}
+
+void dismount(VideoStream& stream, ProControllerContext& context){
+    MountDetector mount_detector;
+    for (size_t c = 0; c < 10; c++){
+        context.wait_for_all_requests();
+
+        MountState current = mount_detector.detect(stream.video().snapshot());
+        switch (current){
+        case MountState::WYRDEER_OFF:
+        case MountState::URSALUNA_OFF:
+        case MountState::BASCULEGION_OFF:
+        case MountState::SNEASLER_OFF:
+        case MountState::BRAVIARY_OFF:
+            // Already unmount
+            return;
+        default:
+            break;
+        }
+
+        if (current == MountState::NOTHING){
+            pbf_press_dpad(context, DPAD_RIGHT, 160ms, 400ms);
+            continue;
+        }
+
+        // We are mounted. Press + to unmount
+        pbf_press_button(context, BUTTON_PLUS, 160ms, 840ms);
+    }
+
+    OperationFailedExceptionWithScreenshot::fire(
+        ErrorReportMode::SEND_ERROR_REPORT,
+        "Unable to dismount after 10 attempts.",
+        stream
+    );
+}
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_MountChange.h b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_MountChange.h
new file mode 100644
index 0000000000..97e1907068
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_MountChange.h
@@ -0,0 +1,29 @@
+/*  Mount Change
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLA_MountChange_H
+#define PokemonAutomation_PokemonLA_MountChange_H
+
+#include "CommonFramework/Tools/VideoStream.h"
+#include "VideoGames/PokemonLA/Inference/PokemonLA_MountDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+
+//  Be careful when changing away from Braviary (on) since you will fall down.
+void change_mount(VideoStream& stream, ProControllerContext& context, MountState mount);
+
+//  Dismount player character.
+//  Be careful when changing away from Braviary (on) since you will fall down.
+void dismount(VideoStream& stream, ProControllerContext& context);
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_RegionNavigation.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_RegionNavigation.cpp
new file mode 100644
index 0000000000..203c87b158
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_RegionNavigation.cpp
@@ -0,0 +1,626 @@
+/*  Region Navigation
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Exceptions.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/Tools/ErrorDumper.h"
+#include "CommonFramework/Tools/ProgramEnvironment.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "CommonTools/VisualDetectors/BlackScreenDetector.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "VideoGames/PokemonLA/Inference/Objects/PokemonLA_ButtonDetector.h"
+#include "VideoGames/PokemonLA/Inference/Objects/PokemonLA_ArcPhoneDetector.h"
+#include "VideoGames/PokemonLA/Inference/Map/PokemonLA_MapDetector.h"
+#include "VideoGames/PokemonLA/Inference/Map/PokemonLA_SelectedRegionDetector.h"
+#include "VideoGames/PokemonLA/PokemonLA_Settings.h"
+#include "VideoGames/PokemonLA/PokemonLA_TravelLocations.h"
+#include "VideoGames/PokemonLA/Programs/PokemonLA_EscapeFromAttack.h"
+#include "PokemonLA_RegionNavigation.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+
+
+void goto_professor(Logger& logger, ProControllerContext& context, Camp camp){
+    switch (camp){
+    case Camp::FIELDLANDS_FIELDLANDS:
+        pbf_move_left_joystick(context, {+1, +1}, 1000ms, 0ms);
+        return;
+    case Camp::FIELDLANDS_HEIGHTS:
+        pbf_move_left_joystick(context, {+0.882, +1}, 1600ms, 0ms);
+        return;
+    case Camp::MIRELANDS_MIRELANDS:
+        pbf_move_left_joystick(context, {+1, +0.5}, 1280ms, 0ms);
+        return;
+    case Camp::MIRELANDS_BOGBOUND:
+        pbf_move_left_joystick(context, {+1, +0.5}, 1120ms, 0ms);
+        return;
+    case Camp::COASTLANDS_BEACHSIDE:
+        pbf_move_left_joystick(context, {+1, +0.25}, 1000ms, 0ms);
+        return;
+    case Camp::COASTLANDS_COASTLANDS:
+        pbf_move_left_joystick(context, {+1, +0.625}, 840ms, 0ms);
+        return;
+    case Camp::HIGHLANDS_HIGHLANDS:
+        pbf_move_left_joystick(context, {+1, +0.5}, 1408ms, 0ms);
+        return;
+    case Camp::HIGHLANDS_MOUNTAIN:
+        pbf_move_left_joystick(context, {+1, +0.75}, 1000ms, 0ms);
+        return;
+    case Camp::HIGHLANDS_SUMMIT:
+        pbf_move_left_joystick(context, {+1, +1}, 1000ms, 0ms);
+        return;
+    case Camp::ICELANDS_SNOWFIELDS:
+        pbf_move_left_joystick(context, {+1, +0.562}, 1000ms, 0ms);
+        return;
+    case Camp::ICELANDS_ICEPEAK:
+        pbf_move_left_joystick(context, {+1, +0.625}, 600ms, 0ms);
+        return;
+    default:
+        throw InternalProgramError(
+            &logger, PA_CURRENT_FUNCTION,
+            "Unknown Camp: " + std::to_string((int)camp)
+        );
+    }
+}
+void from_professor_return_to_jubilife(
+    ProgramEnvironment& env, VideoStream& stream, ProControllerContext& context
+){
+    ButtonDetector button_detector0(
+        stream.logger(), stream.overlay(),
+        ButtonType::ButtonA, ImageFloatBox(0.500, 0.578, 0.300, 0.043),
+        std::chrono::milliseconds(200), true
+    );
+    ButtonDetector button_detector1(
+        stream.logger(), stream.overlay(),
+        ButtonType::ButtonA, ImageFloatBox(0.500, 0.621, 0.300, 0.043),
+        std::chrono::milliseconds(200), true
+    );
+    ButtonDetector bottom_B(
+        stream.logger(), stream.overlay(),
+        ButtonType::ButtonB, ImageFloatBox(0.900, 0.955, 0.080, 0.045),
+        std::chrono::milliseconds(100), true
+    );
+    while (true){
+        context.wait_for_all_requests();
+        int ret = run_until<ProControllerContext>(
+            stream, context,
+            [](ProControllerContext& context){
+                for (size_t c = 0; c < 20; c++){
+                    pbf_press_button(context, BUTTON_A, 160ms, 1000ms);
+                }
+            },
+            {
+                {button_detector0},
+                {button_detector1},
+                {bottom_B}
+            }
+        );
+        context.wait_for(std::chrono::milliseconds(500));
+        switch (ret){
+        case 0:
+            stream.log("Detected return option...");
+            pbf_press_dpad(context, DPAD_DOWN, 160ms, 840ms);
+            mash_A_to_change_region(env, stream, context);
+            return;
+        case 1:
+            stream.log("Detected report research option...");
+            pbf_press_button(context, BUTTON_A, 160ms, 1000ms);
+            break;
+        case 2:
+            stream.log("Backing out of Pokedex...");
+            pbf_mash_button(context, BUTTON_B, 160ms);
+            break;
+        default:
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "Did not detect option to return to Jubilife.",
+                stream
+            );
+        }
+    }
+}
+
+
+void mash_A_to_enter_sub_area(
+    ProgramEnvironment& env, VideoStream& stream, ProControllerContext& context
+){
+    BlackScreenOverWatcher black_screen0(COLOR_RED, {0.2, 0.2, 0.6, 0.6}, 100, 10);
+    int ret = run_until<ProControllerContext>(
+        stream, context,
+        [](ProControllerContext& context){
+            pbf_mash_button(context, BUTTON_A, 7000ms);
+        },
+        {{black_screen0}}
+    );
+    if (ret < 0){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "Failed to load into sub area after 7 seconds.",
+            stream
+        );
+    }
+
+    stream.log("Loaded into sub area...");
+    context.wait_for(std::chrono::milliseconds(200));
+}
+
+
+void mash_A_to_change_region(
+    ProgramEnvironment& env, VideoStream& stream, ProControllerContext& context
+){
+    context.wait_for_all_requests();
+
+#if 0
+    stream.log("Waiting for loading screen...");
+    BlackScreenOverWatcher black_screen0;
+    int ret = run_until<ProControllerContext>(
+        stream, context,
+        [](ProControllerContext& context){
+            pbf_mash_button(context, BUTTON_A, GameSettings::instance().LOAD_REGION_TIMEOUT);
+        },
+        {{black_screen0}}
+    );
+    if (ret < 0){
+        OperationFailedExceptionWithScreenshot::fire(
+            stream, ErrorReportMode::SEND_ERROR_REPORT,
+            "Failed to load into region after timeout."
+        );
+    }
+    context.wait_for(std::chrono::milliseconds(1000));
+#endif
+
+    {
+        stream.log("Waiting for end of loading screen...");
+        BlackScreenOverWatcher black_screen1a(COLOR_RED, {0.20, 0.02, 0.60, 0.05});
+        BlackScreenOverWatcher black_screen1b(COLOR_RED, {0.20, 0.93, 0.60, 0.05});
+        int ret = run_until<ProControllerContext>(
+            stream, context,
+            [](ProControllerContext& context){
+                pbf_mash_button(context, BUTTON_A, GameSettings::instance().LOAD_REGION_TIMEOUT0);
+            },
+            {
+                {black_screen1a},
+                {black_screen1b},
+            }
+        );
+        if (ret < 0){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "Failed to load into region after timeout.",
+                stream
+            );
+        }
+    }
+    {
+        stream.log("Waiting for overworld...");
+        ArcPhoneDetector phone(stream.logger(), stream.overlay(), std::chrono::milliseconds(250), true);
+        int ret = wait_until(
+            stream, context,
+            GameSettings::instance().LOAD_REGION_TIMEOUT0,
+            {phone}
+        );
+        if (ret < 0){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "Failed to load into region after timeout.",
+                stream
+            );
+        }
+    }
+
+    stream.log("Loaded into map...");
+    context.wait_for(GameSettings::instance().POST_WARP_DELAY0);
+}
+
+
+void open_travel_map_from_jubilife(
+    ProgramEnvironment& env, VideoStream& stream, ProControllerContext& context,
+    bool fresh_from_reset
+){
+    pbf_move_left_joystick(context, {0, -1}, 1600ms, 0ms);
+    MapDetector detector;
+    int ret = run_until<ProControllerContext>(
+        stream, context,
+        [](ProControllerContext& context){
+            for (size_t c = 0; c < 10; c++){
+                pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+            }
+        },
+        {{detector}}
+    );
+    if (ret < 0){
+        if (fresh_from_reset){
+            throw UserSetupError(
+                stream.logger(),
+                "Map not detected after reset.\n"
+                "Make sure you save your game in Jubilife with your back facing the gate."
+            );
+        }else{
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "Map not detected after 10 x A presses.",
+                stream
+            );
+        }
+    }
+    stream.log("Found map!");
+}
+
+
+void goto_camp_from_jubilife(
+    ProgramEnvironment& env, VideoStream& stream, ProControllerContext& context,
+    const TravelLocation& location,
+    bool fresh_from_reset
+){
+    stream.overlay().add_log("Travel to " + std::string(MAP_REGION_NAMES[int(location.region)]));
+    // Move backwards and talk to guard to open the map.
+    context.wait_for_all_requests();
+    open_travel_map_from_jubilife(env, stream, context, fresh_from_reset);
+    context.wait_for(std::chrono::milliseconds(500));
+
+    DpadPosition direction = location.region < MapRegion::HIGHLANDS ? DPAD_RIGHT : DPAD_LEFT;
+    if (location.region == MapRegion::JUBILIFE){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            std::string("Should not choose Jubilife Village as destination when leaving camp"),
+            stream
+        );
+    }
+
+    //  Move to region.
+    MapRegion current_region = MapRegion::NONE;
+    for (size_t c = 0; c < 10; c++){
+        current_region = detect_selected_region(stream, context);
+        if (current_region == location.region){
+            break;
+        }
+        pbf_press_dpad(context, direction, 160ms, 320ms);
+        context.wait_for_all_requests();
+    }
+    if (current_region != location.region){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            std::string("Unable to find: ") + location.display,
+            stream
+        );
+    }
+
+    if (location.warp_slot != 0){
+        pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+        for (size_t c = 0; c < location.warp_slot; c++){
+            pbf_press_dpad(context, DPAD_DOWN, 160ms, 240ms);
+        }
+    }
+
+    //  Enter the region.
+    mash_A_to_change_region(env, stream, context);
+
+    if (location.warp_sub_slot == 0){
+        // The destination is a camp.
+        // No need to do a warp in the region.
+        return;
+    }
+
+    // The destination is not a camp.
+    // It's a settlement or arena that requires another warp:
+
+    //  Open the map.
+    pbf_press_button(context, BUTTON_MINUS, 160ms, 240ms);
+    {
+        MapDetector detector;
+        int ret = wait_until(
+            stream, context,
+            std::chrono::seconds(5),
+            {{detector}}
+        );
+        if (ret < 0){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "Map not detected after 5 seconds.",
+                stream
+            );
+        }
+        stream.log("Found map!");
+        context.wait_for(std::chrono::milliseconds(500));
+    }
+
+    //  Warp to sub-camp.
+    pbf_press_button(context, BUTTON_X, 160ms, 240ms);
+    {
+        ButtonDetector detector(
+            stream.logger(), stream.overlay(),
+            ButtonType::ButtonA,
+            {0.55, 0.40, 0.20, 0.40},
+            std::chrono::milliseconds(200), true
+        );
+        int ret = wait_until(
+            stream, context,
+            std::chrono::seconds(2),
+            {{detector}}
+        );
+        if (ret < 0){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "Unable to fly. Are you under attack?",
+                stream
+            );
+        }
+    }
+    pbf_wait(context, 400ms);
+    for (size_t c = 0; c < location.warp_sub_slot; c++){
+        const DpadPosition dir = (location.reverse_sub_menu_direction ? DPAD_UP : DPAD_DOWN);
+        pbf_press_dpad(context, dir, 160ms, 240ms);
+    }
+    pbf_mash_button(context, BUTTON_A, 1000ms);
+
+    BlackScreenOverWatcher black_screen(COLOR_RED, {0.1, 0.1, 0.8, 0.6});
+    int ret = wait_until(
+        stream, context,
+        std::chrono::seconds(20),
+        {{black_screen}}
+    );
+    if (ret < 0){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "Failed to fly to camp after 20 seconds.",
+            stream
+        );
+    }
+    stream.log("Arrived at sub-camp...");
+    context.wait_for(GameSettings::instance().POST_WARP_DELAY0);
+
+    if (location.post_arrival_maneuver == nullptr){
+        return;
+    }
+
+    location.post_arrival_maneuver(stream, context);
+    context.wait_for_all_requests();
+}
+
+
+
+
+void goto_camp_from_overworld(
+    ProgramEnvironment& env, VideoStream& stream, ProControllerContext& context
+){
+    auto start = current_time();
+    std::chrono::seconds grace_period(0);
+    while (true){
+        {
+            EscapeFromAttack session(
+                env, stream, context,
+                grace_period, std::chrono::seconds(10)
+            );
+            session.run_session();
+        }
+
+        if (current_time() - start > std::chrono::seconds(60)){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::NO_ERROR_REPORT,
+                "Unable to escape from being attacked.",
+                stream
+            );
+        }
+
+        //  Open the map.
+        pbf_press_button(context, BUTTON_MINUS, 160ms, 240ms);
+        {
+            MapDetector detector;
+            int ret = wait_until(
+                stream, context,
+                std::chrono::seconds(5),
+                {{detector}}
+            );
+            if (ret < 0){
+//                dump_image(stream.logger(), env.program_info(), "MapNotDetected", stream.video().snapshot());
+                stream.log("Map not detected after 5 seconds.", COLOR_RED);
+                pbf_mash_button(context, BUTTON_B, 1000ms);
+                context.wait_for_all_requests();
+                continue;
+            }
+            stream.log("Found map!");
+            context.wait_for(std::chrono::milliseconds(500));
+        }
+
+        //  Try to fly back to camp.
+        pbf_press_button(context, BUTTON_X, 160ms, 240ms);
+
+        {
+            ButtonDetector detector(
+                stream.logger(), stream.overlay(),
+                ButtonType::ButtonA,
+                {0.55, 0.40, 0.20, 0.40},
+                std::chrono::milliseconds(200), true
+            );
+            int ret = wait_until(
+                stream, context,
+                std::chrono::seconds(2),
+                {{detector}}
+            );
+            if (ret >= 0){
+                stream.log("Flying back to camp...");
+                pbf_mash_button(context, BUTTON_A, 1000ms);
+                break;
+            }
+            stream.log("Unable to fly. Are you under attack?", COLOR_RED);
+        }
+
+        pbf_mash_button(context, BUTTON_B, 1000ms);
+        grace_period = std::chrono::seconds(5);
+    }
+
+    BlackScreenOverWatcher black_screen(COLOR_RED, {0.1, 0.1, 0.8, 0.6});
+    int ret = wait_until(
+        stream, context,
+        std::chrono::seconds(20),
+        {{black_screen}}
+    );
+    if (ret < 0){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "Failed to fly to camp after 20 seconds.",
+            stream
+        );
+    }
+    stream.log("Arrived at camp...");
+    context.wait_for(GameSettings::instance().POST_WARP_DELAY0);
+}
+
+void fast_travel_from_overworld(
+    ProgramEnvironment& env, VideoStream& stream, ProControllerContext& context,
+    const TravelLocation& location
+){
+
+    auto start = current_time();
+    std::chrono::seconds grace_period(0);
+    while (true){
+        {
+            EscapeFromAttack session(
+                env, stream, context,
+                grace_period, std::chrono::seconds(10)
+            );
+            session.run_session();
+        }
+
+        if (current_time() - start > std::chrono::seconds(60)){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::NO_ERROR_REPORT,
+                "Unable to escape from being attacked.",
+                stream
+            );
+        }
+
+        //  Open the map.
+        pbf_press_button(context, BUTTON_MINUS, 160ms, 240ms);
+        {
+            MapDetector detector;
+            int ret = wait_until(
+                stream, context,
+                std::chrono::seconds(5),
+                {{detector}}
+            );
+            if (ret < 0){
+                OperationFailedExceptionWithScreenshot::fire(
+                    ErrorReportMode::SEND_ERROR_REPORT,
+                    "Map not detected after 5 seconds.",
+                    stream
+                );
+            }
+            stream.log("Found map!");
+            context.wait_for(std::chrono::milliseconds(500));
+        }
+
+        //  Warp to sub-camp.
+        pbf_press_button(context, BUTTON_X, 160ms, 240ms);
+        {
+            ButtonDetector detector(
+                stream.logger(), stream.overlay(),
+                ButtonType::ButtonA,
+                {0.55, 0.40, 0.20, 0.40},
+                std::chrono::milliseconds(200), true
+            );
+            int ret = wait_until(
+                stream, context,
+                std::chrono::seconds(2),
+                {{detector}}
+            );
+            if (ret >= 0){
+                stream.log("Fast traveling...");
+                pbf_wait(context, 400ms);
+                if (location.warp_slot != 0){
+                    for (size_t c = 0; c < location.warp_slot; c++){
+                        pbf_press_dpad(context, DPAD_DOWN, 160ms, 240ms);
+                    }
+                }
+                for (size_t c = 0; c < location.warp_sub_slot; c++){
+                    const DpadPosition dir = (location.reverse_sub_menu_direction ? DPAD_UP : DPAD_DOWN);
+                    pbf_press_dpad(context, dir, 160ms, 240ms);
+                }
+                pbf_mash_button(context, BUTTON_A, 1000ms);
+                break;
+            }
+        }
+
+        pbf_mash_button(context, BUTTON_B, 1000ms);
+        grace_period = std::chrono::seconds(5);
+    }
+    BlackScreenOverWatcher black_screen(COLOR_RED, {0.1, 0.1, 0.8, 0.6});
+    int ret = wait_until(
+        stream, context,
+        std::chrono::seconds(20),
+        {{black_screen}}
+    );
+    if (ret < 0){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "Failed to fly to camp after 20 seconds.",
+            stream
+        );
+    }
+    stream.log("Arrived at camp...");
+    context.wait_for(GameSettings::instance().POST_WARP_DELAY0);
+    context.wait_for_all_requests();
+}
+
+
+void goto_Mai_from_camp(
+    Logger& logger, ProControllerContext& context, Camp camp
+){
+    switch (camp){
+    case Camp::FIELDLANDS_FIELDLANDS:
+        // 80 - 128, time - 400
+        pbf_move_left_joystick(context, {-0.336, -1}, 2400ms, 0ms);
+        return;
+    case Camp::MIRELANDS_MIRELANDS:
+        pbf_move_left_joystick(context, {-1, +0.062}, 2480ms, 0ms);
+        return;
+    case Camp::COASTLANDS_BEACHSIDE:
+        // 255, 150 -170, 600 too long
+        pbf_move_left_joystick(context, {+1, -0.291}, 4400ms, 0ms);
+        return;
+    case Camp::HIGHLANDS_HIGHLANDS:
+        // 255, 150 - 170
+        pbf_move_left_joystick(context, {+1, -0.291}, 2960ms, 0ms);
+        return;
+    case Camp::ICELANDS_SNOWFIELDS:
+        pbf_move_left_joystick(context, {+1, +0.031}, 2000ms, 0ms);
+        return;
+    default:
+        throw InternalProgramError(
+            &logger, PA_CURRENT_FUNCTION,
+            "Unknown Camp when going to Mai: " + std::to_string((int)camp)
+        );
+    }
+}
+
+void goto_professor(Logger& logger, ProControllerContext& context, const TravelLocation& location){
+    Camp camp = map_region_default_camp(location.region);
+    goto_professor(logger, context, camp);
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_RegionNavigation.h b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_RegionNavigation.h
new file mode 100644
index 0000000000..4247642973
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_RegionNavigation.h
@@ -0,0 +1,76 @@
+/*  Region Navigation
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLA_RegionNavigation_H
+#define PokemonAutomation_PokemonLA_RegionNavigation_H
+
+#include "CommonFramework/Tools/VideoStream.h"
+#include "VideoGames/PokemonLA/PokemonLA_Locations.h"
+#include "VideoGames/PokemonLA/Options/PokemonLA_ShinyDetectedAction.h"
+
+namespace PokemonAutomation{
+    class ProgramEnvironment;
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+struct TravelLocation;
+
+void goto_professor(Logger& logger, ProControllerContext& context, Camp camp);
+
+void goto_professor(Logger& logger, ProControllerContext& context, const TravelLocation& location);
+
+void from_professor_return_to_jubilife(
+    ProgramEnvironment& env, VideoStream& stream, ProControllerContext& context
+);
+
+
+void mash_A_to_enter_sub_area(
+    ProgramEnvironment& env, VideoStream& stream, ProControllerContext& context
+);
+void mash_A_to_change_region(
+    ProgramEnvironment& env, VideoStream& stream, ProControllerContext& context
+);
+
+// Start from Jubilife Village gate, with camera facing towards the village, run towards the gate
+// and travel to a location.
+void goto_camp_from_jubilife(
+    ProgramEnvironment& env, VideoStream& stream, ProControllerContext& context,
+    const TravelLocation& location,
+    bool fresh_from_reset
+);
+
+
+// From overworld, open map, press X to open the fast travel popup menu and fast travel to
+// the first camp from the menu.
+void goto_camp_from_overworld(
+    ProgramEnvironment& env, VideoStream& stream, ProControllerContext& context
+);
+
+// From overworld, open map, press X to open the fast travel popup menu and go to the specified
+// travel location.
+void fast_travel_from_overworld(
+    ProgramEnvironment& env, VideoStream& stream, ProControllerContext& context,
+    const TravelLocation& location
+);
+
+// From a camp location, run to Mai in that camp.
+void goto_Mai_from_camp(
+    Logger& logger, ProControllerContext& context, Camp camp
+);
+
+// From the program starting position at Jubilife Village, move backwards and talk to guard to open the map.
+// Return after the map is detected.
+// Throw an error if map is not found.
+void open_travel_map_from_jubilife(
+    ProgramEnvironment& env, VideoStream& stream, ProControllerContext& context,
+    bool fresh_from_reset
+);
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_TimeOfDayChange.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_TimeOfDayChange.cpp
new file mode 100644
index 0000000000..7d2b4c8eb0
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_TimeOfDayChange.cpp
@@ -0,0 +1,140 @@
+/*  Time of Day Change
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/VideoPipeline/VideoOverlay.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "VideoGames/PokemonLA/Inference/Objects/PokemonLA_DialogYellowArrowDetector.h"
+#include "PokemonLA_TimeOfDayChange.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+
+void change_time_of_day_at_tent(
+    VideoStream& stream, ProControllerContext& context,
+    TimeOfDay target_time,
+    Camp camp
+){
+    stream.overlay().add_log("Change time to " + std::string(TIME_OF_DAY_NAMES[int(target_time)]), COLOR_WHITE);
+    // Move to the tent
+    switch (camp)
+    {
+    case Camp::FIELDLANDS_FIELDLANDS:
+        pbf_move_left_joystick(context, {-0.18, +1}, 1760ms, 160ms);
+        break;
+    
+    case Camp::FIELDLANDS_HEIGHTS:
+        pbf_move_left_joystick(context, {-0.258, +1}, 2000ms, 160ms);
+        break;
+    
+    case Camp::MIRELANDS_MIRELANDS:
+        pbf_move_left_joystick(context, {-0.453, +1}, 1440ms, 160ms);
+        break;
+    
+    case Camp::MIRELANDS_BOGBOUND:
+        pbf_move_left_joystick(context, {-0.453, +1}, 1360ms, 160ms);
+        break;
+    
+    case Camp::COASTLANDS_BEACHSIDE:
+        pbf_move_left_joystick(context, {-0.219, +1}, 1040ms, 160ms);
+        break;
+    
+    case Camp::COASTLANDS_COASTLANDS:
+        pbf_move_left_joystick(context, {-0.414, +1}, 1280ms, 160ms);
+        break;
+    
+    case Camp::HIGHLANDS_HIGHLANDS:
+        pbf_move_left_joystick(context, {-0.258, +1}, 1520ms, 160ms);
+        break;
+    
+    case Camp::HIGHLANDS_MOUNTAIN:
+        pbf_move_left_joystick(context, {-0.531, +1}, 1520ms, 160ms);
+        break;
+    
+    case Camp::HIGHLANDS_SUMMIT:
+        pbf_move_left_joystick(context, {-0.219, +1}, 1760ms, 160ms);
+        break;
+    
+    case Camp::ICELANDS_SNOWFIELDS:
+        pbf_move_left_joystick(context, {-0.375, +1}, 1200ms, 160ms);
+        break;
+
+    case Camp::ICELANDS_ICEPEAK:
+        pbf_move_left_joystick(context, {-0.141, +1}, 1760ms, 160ms);
+        break;
+    }
+
+    // Press A to interact with tent
+    pbf_press_button(context, BUTTON_A, 240ms, 240ms);
+    context.wait_for_all_requests();
+
+    const bool stop_on_detected = true;
+    DialogYellowArrowDetector yellow_arrow_detector(stream.logger(), stream.overlay(), stop_on_detected);
+
+    context.wait_for_all_requests();
+    // Wait for the dialog box to show up
+    int ret = wait_until(
+        stream, context, std::chrono::seconds(5), {{yellow_arrow_detector}}
+    );
+    if (ret < 0){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "Did not interact with a tent.",
+            stream
+        );
+    }
+
+    // Press A to clear the dialog box, and show the time menu
+    // pbf_wait(context, 40);
+    pbf_press_button(context, BUTTON_A, 240ms, 640ms);
+    stream.log("Change time of day to " + std::string(TIME_OF_DAY_NAMES[int(target_time)]));
+
+    // Move down the menu to find the target time
+
+    int num_movements = (int)target_time;
+    DpadPosition dpad_dir = DPAD_DOWN;
+    if (target_time == TimeOfDay::MIDNIGHT){
+        num_movements = 2;
+        dpad_dir = DPAD_UP;
+    }
+    for (int i = 0; i < num_movements; i++){
+        pbf_press_dpad(context, dpad_dir, 240ms, 560ms);
+    }
+
+    // Press A to start resting
+    pbf_press_button(context, BUTTON_A, 240ms, 800ms);
+    context.wait_for_all_requests();
+
+    // Wait for the dialog box to show up
+    ret = wait_until(
+        stream, context, std::chrono::seconds(30), {{yellow_arrow_detector}}
+    );
+    if (ret < 0){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "Failed to stand up after resting in a tent.",
+            stream
+        );
+    }
+
+    // Press A again to clear the dialog box
+    pbf_press_button(context, BUTTON_A, 240ms, 800ms);
+
+    context.wait_for_all_requests();
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_TimeOfDayChange.h b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_TimeOfDayChange.h
new file mode 100644
index 0000000000..7c2169bd3a
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_TimeOfDayChange.h
@@ -0,0 +1,32 @@
+/*  Time of Day Change
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLA_TimeOfDayChange_H
+#define PokemonAutomation_PokemonLA_TimeOfDayChange_H
+
+#include "CommonFramework/Tools/VideoStream.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+#include "VideoGames/PokemonLA/PokemonLA_WeatherAndTime.h"
+#include "VideoGames/PokemonLA/PokemonLA_Locations.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+// From a camp teleport location, move to the tent and change time of day.
+// if `target_time` is TimeOfDay::NONE, it resets for only a while, healing the pokemon but no change of time.
+void change_time_of_day_at_tent(
+    VideoStream& stream, ProControllerContext& context,
+    TimeOfDay target_time,
+    Camp camp
+);
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_AutoMultiSpawn.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_AutoMultiSpawn.cpp
similarity index 75%
rename from SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_AutoMultiSpawn.cpp
rename to SerialPrograms/Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_AutoMultiSpawn.cpp
index 1d9f637ccf..6bea56baa7 100644
--- a/SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_AutoMultiSpawn.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_AutoMultiSpawn.cpp
@@ -1,43 +1,43 @@
 /*  Auto Multi-Spawn
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include "CommonFramework/GlobalSettingsPanel.h"
-#include "CommonFramework/Exceptions/OperationFailedException.h"
-#include "CommonFramework/ImageTypes/ImageRGB32.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
+#include <set>
+//#include <atomic>
+#include <chrono>
+#include <iterator>
+#include <sstream>
+#include "CommonFramework/StaticGlobals.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
 #include "CommonFramework/Notifications/ProgramNotifications.h"
 #include "CommonFramework/VideoPipeline/VideoFeed.h"
 #include "CommonFramework/Tools/DebugDumper.h"
-#include "CommonFramework/Tools/InterruptableCommands.h"
+#include "CommonTools/Async/InterruptableCommands.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "CommonTools/StartupChecks/StartProgramChecks.h"
 #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
 #include "Pokemon/Inference/Pokemon_NameReader.h"
 #include "Pokemon/Pokemon_Strings.h"
-#include "PokemonLA/Inference/Battles/PokemonLA_BattleMenuDetector.h"
-#include "PokemonLA/Inference/Battles/PokemonLA_BattleSpriteWatcher.h"
-#include "PokemonLA/Inference/Objects/PokemonLA_ArcPhoneDetector.h"
-#include "PokemonLA/Inference/Objects/PokemonLA_ArcPhoneDetector.h"
-#include "PokemonLA/Inference/PokemonLA_OverworldDetector.h"
-#include "PokemonLA/Inference/PokemonLA_WildPokemonFocusDetector.h"
-#include "PokemonLA/PokemonLA_TravelLocations.h"
-#include "PokemonLA/Programs/PokemonLA_BattleRoutines.h"
-#include "PokemonLA/Programs/PokemonLA_MountChange.h"
-#include "PokemonLA/Programs/PokemonLA_RegionNavigation.h"
-#include "PokemonLA/Programs/PokemonLA_TimeOfDayChange.h"
-#include "PokemonLA/PokemonLA_WeatherAndTime.h"
+#include "VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattleMenuDetector.h"
+#include "VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattleSpriteWatcher.h"
+#include "VideoGames/PokemonLA/Inference/Objects/PokemonLA_ArcPhoneDetector.h"
+#include "VideoGames/PokemonLA/Inference/Objects/PokemonLA_ArcPhoneDetector.h"
+#include "VideoGames/PokemonLA/Inference/PokemonLA_OverworldDetector.h"
+#include "VideoGames/PokemonLA/Inference/PokemonLA_WildPokemonFocusDetector.h"
+#include "VideoGames/PokemonLA/PokemonLA_TravelLocations.h"
+#include "VideoGames/PokemonLA/Programs/PokemonLA_BattleRoutines.h"
+#include "VideoGames/PokemonLA/Programs/PokemonLA_MountChange.h"
+#include "VideoGames/PokemonLA/Programs/PokemonLA_RegionNavigation.h"
+#include "VideoGames/PokemonLA/Programs/PokemonLA_TimeOfDayChange.h"
+#include "VideoGames/PokemonLA/PokemonLA_WeatherAndTime.h"
 #include "PokemonLA_AutoMultiSpawn.h"
 
-#include <iostream>
-#include <sstream>
-#include <set>
-#include <atomic>
-#include <chrono>
-#include <thread>
-#include <iterator>
-using std::cout;
-using std::endl;
+//#include <iostream>
+//using std::cout;
+//using std::endl;
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
@@ -73,22 +73,26 @@ const std::set<std::string> WILD_NEARBY_POKEMON[] = {
 // Otherwise, it returns the details of the pokemon thrown at.
 std::pair<bool, PokemonDetails> control_focus_to_throw(
     SingleSwitchProgramEnvironment& env,
-    BotBaseContext& context, 
+    ProControllerContext& context,
     const std::set<std::string>& target_pokemon,
     const std::set<std::string>& nearby_pokemon,
     Language language
 ){
     // A session that creates a new thread to send button commands to controller
-    AsyncCommandSession session(context, env.console.logger(), env.realtime_dispatcher(), env.console.botbase());
+    AsyncCommandSession<ProController> session(
+        context,
+        env.console.logger(),
+        env.console.controller<ProController>()
+    );
 
     // First, let controller press ZL non-stop to start focusing on a pokemon
-    session.dispatch([](BotBaseContext& context){
-        pbf_press_button(context, BUTTON_ZL, 10000, 0);
+    session.dispatch([](ProControllerContext& context){
+        pbf_press_button(context, BUTTON_ZL, 80000ms, 0ms);
     });
 
     // We try at most 4 focus change attempts
     int max_focus_change_attempt = 4;
-    for(int focus_index = 0; focus_index <= max_focus_change_attempt; focus_index++){
+    for (int focus_index = 0; focus_index <= max_focus_change_attempt; focus_index++){
         WildPokemonFocusDetector focus_detector(env.console.logger(), env.console);
         int ret = wait_until(
             env.console, context, std::chrono::seconds(3),
@@ -125,7 +129,7 @@ std::pair<bool, PokemonDetails> control_focus_to_throw(
         bool found_nearby_pokemon = false;
         { // Filter out names that are not target pokemon
             std::set<std::string> filtered_names;
-            for(const auto& name : details.name_candidates){
+            for (const auto& name : details.name_candidates){
                 if (target_pokemon.find(name) != target_pokemon.end()){
                     filtered_names.insert(name);
                 }
@@ -141,9 +145,9 @@ std::pair<bool, PokemonDetails> control_focus_to_throw(
             // We are focusing on a target pokemon
             // Press ZR to throw sth.
             // Dispatch a new series of commands that overwrites the last ones
-            session.dispatch([](BotBaseContext& context){
-                pbf_press_button(context, BUTTON_ZL | BUTTON_ZR, 30, 0);
-                pbf_press_button(context, BUTTON_ZL, 50, 0);
+            session.dispatch([](ProControllerContext& context){
+                pbf_press_button(context, BUTTON_ZL | BUTTON_ZR, 240ms, 0ms);
+                pbf_press_button(context, BUTTON_ZL, 400ms, 0ms);
             });
 
             env.log("Sending command to throw pokemon to start battle");
@@ -164,7 +168,7 @@ std::pair<bool, PokemonDetails> control_focus_to_throw(
                 // just we are unlucky that the target pokemon is too far from our current position or the
                 // player character is facing a wrong direction.
                 env.log("Only one pokemon can be focused. No target pokemon nearby.");
-            } else {
+            }else{
                 // We focused on an unexpected pokemon. Maybe the trip is wrong.
                 env.log("Focus on an unexpected pokemon.");
             }
@@ -176,9 +180,9 @@ std::pair<bool, PokemonDetails> control_focus_to_throw(
         if (focus_index < max_focus_change_attempt){
             // We focused onto a pokemon that is not the target pokemon, but there are other pokemon that can be focused.
             // Press A to change focus.
-            session.dispatch([](BotBaseContext& context){
-                pbf_press_button(context, BUTTON_ZL | BUTTON_A, 30, 0);
-                pbf_press_button(context, BUTTON_ZL, 10000, 0);
+            session.dispatch([](ProControllerContext& context){
+                pbf_press_button(context, BUTTON_ZL | BUTTON_A, 240ms, 0ms);
+                pbf_press_button(context, BUTTON_ZL, 80000ms, 0ms);
             });
 
             // Wait some time to let the button A press executed, the game focused on another pokemon
@@ -198,11 +202,12 @@ AutoMultiSpawn_Descriptor::AutoMultiSpawn_Descriptor()
     : SingleSwitchProgramDescriptor(
         "PokemonLA:AutoMultiSpawn",
         STRING_POKEMON + " LA", "Auto Multi-Spawn",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonLA/AutoMultiSpawn.md",
+        "Programs/PokemonLA/AutoMultiSpawn.html",
         "Advance a path in MultiSpawn shiny hunting method.",
+        PanelQualityStanding::UNMAINTAINED,
+        ProgramControllerClass::StandardController_RequiresPrecision,
         FeedbackType::REQUIRED,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
     )
 {}
 
@@ -211,7 +216,7 @@ AutoMultiSpawn::AutoMultiSpawn()
     : LANGUAGE(
         "<b>Game Language</b>",
         Pokemon::PokemonNameReader::instance().languages(),
-        LockWhileRunning::LOCKED,
+        LockMode::LOCK_WHILE_RUNNING,
         true
     )
     , SPAWN(
@@ -219,13 +224,13 @@ AutoMultiSpawn::AutoMultiSpawn()
         {
             {MultiSpawn::MirelandsHippopotas, "mirelands-hippopotas", "Mirelands - Hippopotas"},
         },
-        LockWhileRunning::LOCKED,
+        LockMode::LOCK_WHILE_RUNNING,
         MultiSpawn::MirelandsHippopotas
     )
     , PATH(
         false,
         "<b>Multi-Spawn Path<b>:<br>e.g. \"A1|A1|A2|A2|A1|A1|A1|A2\".",
-        LockWhileRunning::LOCKED,
+        LockMode::LOCK_WHILE_RUNNING,
         "", ""
     )
     , NOTIFICATIONS({
@@ -242,8 +247,8 @@ AutoMultiSpawn::AutoMultiSpawn()
 std::vector<int> parse_multispawn_path(SingleSwitchProgramEnvironment& env, const std::string& path, int max_num_despawn){
     std::vector<int> path_despawns;
     std::string raw_path = path + "|";
-    for(size_t pos = 0, next_pos = 0; (next_pos = raw_path.find('|', pos)) != std::string::npos; pos = next_pos + 1){
-        if (pos == next_pos){ // In the case it's jsut one "|"
+    for (size_t pos = 0, next_pos = 0; (next_pos = raw_path.find('|', pos)) != std::string::npos; pos = next_pos + 1){
+        if (pos == next_pos){ // In the case it's just one "|"
             continue;
         }
 
@@ -255,7 +260,7 @@ std::vector<int> parse_multispawn_path(SingleSwitchProgramEnvironment& env, cons
             );
         }
         raw_path[next_pos] = '\0';
-        int despawn_count = strtol(raw_path.data() + pos+1, nullptr, 10);
+        int despawn_count = static_cast<int>(strtol(raw_path.data() + pos+1, nullptr, 10));
         if (despawn_count <= 0 || despawn_count > max_num_despawn){
             throw InternalProgramError(
                 &env.console.logger(),
@@ -270,9 +275,11 @@ std::vector<int> parse_multispawn_path(SingleSwitchProgramEnvironment& env, cons
 }
 
 
-void AutoMultiSpawn::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
+void AutoMultiSpawn::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    StartProgramChecks::check_performance_class_wired_or_wireless(context);
+
     //  Connect the controller.
-    pbf_press_button(context, BUTTON_LCLICK, 5, 5);
+    require_player(env.console, context, BUTTON_LCLICK);
 
     MultiSpawn spawn = SPAWN;
     const int max_num_despawn = MAX_DESPAWN_COUNT[(size_t)spawn];
@@ -281,14 +288,14 @@ void AutoMultiSpawn::program(SingleSwitchProgramEnvironment& env, BotBaseContext
     std::vector<int> path_despawns = parse_multispawn_path(env, PATH, max_num_despawn);
     std::vector<TimeOfDay> path_times;
     // We + 1 here because we need one more time change to read the desired target pokemon at the end (usually a shiny alpha)
-    for(size_t i = 0; i < path_despawns.size() + 1; i++){
+    for (size_t i = 0; i < path_despawns.size() + 1; i++){
         // TODO: if murkrow path is added, need to output 'N'
         path_times.push_back(i % 2 == 0 ? TimeOfDay::MORNING : TimeOfDay::MIDDAY);
     }
     
     {
         std::ostringstream os;
-        for(size_t i = 0; i < path_despawns.size(); i++){
+        for (size_t i = 0; i < path_despawns.size(); i++){
             if (i >0){
                 os << '|';
             }
@@ -297,10 +304,10 @@ void AutoMultiSpawn::program(SingleSwitchProgramEnvironment& env, BotBaseContext
         env.log("The path is: " + os.str());
     }
     
-    goto_any_camp_from_overworld(env, env.console, context, TravelLocations::instance().Mirelands_Mirelands);
+    fast_travel_from_overworld(env, env.console, context, TravelLocations::instance().Mirelands_Mirelands);
     change_time_of_day_at_tent(env.console, context, path_times[0], Camp::MIRELANDS_MIRELANDS);
 
-    for(size_t iStep = 0; iStep < path_despawns.size(); iStep++){
+    for (size_t iStep = 0; iStep < path_despawns.size(); iStep++){
         // - Teleport to a camp
         // - From camp, go to the spawn point
         // - Battle the pokemon there to remove them
@@ -309,7 +316,7 @@ void AutoMultiSpawn::program(SingleSwitchProgramEnvironment& env, BotBaseContext
         advance_one_path_step(env, context, max_num_despawn, path_despawns[iStep], path_times[iStep], path_times[iStep+1]);
 
         std::ostringstream os;
-        for(size_t jStep = 0; jStep < path_despawns.size(); jStep++){
+        for (size_t jStep = 0; jStep < path_despawns.size(); jStep++){
             os << 'A' << path_despawns[jStep] << '(' << timeOfDayOneLetter(path_times[jStep]) << ")|";
             if (iStep == jStep){
                 os << '*';
@@ -323,7 +330,7 @@ void AutoMultiSpawn::program(SingleSwitchProgramEnvironment& env, BotBaseContext
 
 void AutoMultiSpawn::advance_one_path_step(
     SingleSwitchProgramEnvironment& env,
-    BotBaseContext& context,
+    ProControllerContext& context,
     size_t num_spawned_pokemon,
     size_t num_to_despawn,
     TimeOfDay cur_time,
@@ -333,27 +340,29 @@ void AutoMultiSpawn::advance_one_path_step(
     // Switch to pokemon selection so that we can press X to throw a pokemon out to start a battle
     for (size_t c = 0; true; c++){
         context.wait_for_all_requests();
-        if (is_pokemon_selection(env.console, env.console.video().snapshot())){
+        auto snapshot = env.console.video().snapshot();
+        if (is_pokemon_selection(env.console, snapshot)){
             break;
         }
         if (c >= 5){
-            throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, env.console,
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
                 "Failed to switch to Pokemon selection after 5 attempts.",
-                true
+                env.console,
+                std::move(snapshot)
             );
         }
         env.console.log("Not on Pokemon selection. Attempting to switch to it...", COLOR_ORANGE);
-        pbf_press_button(context, BUTTON_X, 20, 230);
+        pbf_press_button(context, BUTTON_X, 160ms, 1840ms);
     }
 
-    goto_any_camp_from_overworld(env, env.console, context, TravelLocations::instance().Mirelands_Mirelands);
+    fast_travel_from_overworld(env, env.console, context, TravelLocations::instance().Mirelands_Mirelands);
     
     // We try at most three battles to remove pokemon
     size_t already_removed_pokemon = 0;
     size_t remained_to_remove = num_to_despawn;
     size_t pokemon_left = num_spawned_pokemon;
-    for(int i = 0; i < 3; i++){
+    for (int i = 0; i < 3; i++){
         // Go to spawn point to start a battle, remove some pokemon, then return to camp.
         size_t num_pokemon_removed = try_one_battle_to_remove_pokemon(env, context, pokemon_left, remained_to_remove);
         already_removed_pokemon += num_pokemon_removed;
@@ -362,11 +371,11 @@ void AutoMultiSpawn::advance_one_path_step(
              + std::to_string(already_removed_pokemon) + " pokemon removed, target total pokemon to remove: " + std::to_string(num_to_despawn)
          );
         if (already_removed_pokemon > num_to_despawn){
-            throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, env.console,
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
                 "Removed more pokemon than required. Removed "
                 + std::to_string(already_removed_pokemon) + " while target is " + std::to_string(num_to_despawn),
-                true
+                env.console
             );
         }
 
@@ -382,10 +391,10 @@ void AutoMultiSpawn::advance_one_path_step(
         }
     }
     if (remained_to_remove > 0){
-        throw OperationFailedException(
-            ErrorReport::SEND_ERROR_REPORT, env.console,
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
             "After trying to start three battles, cannot remove enough pokemon.",
-            true
+            env.console
         );
     }
 
@@ -396,14 +405,14 @@ void AutoMultiSpawn::advance_one_path_step(
 // From camp, go to spawn, do one battle to remove pokemon. If no error, return camp
 size_t AutoMultiSpawn::try_one_battle_to_remove_pokemon(
     SingleSwitchProgramEnvironment& env,
-    BotBaseContext& context,
+    ProControllerContext& context,
     size_t num_left,
     size_t num_to_despawn
 ){
     // Try to go to spawn point and focus on one pokemon
     PokemonDetails focused_pokemon;
     const size_t num_tries = 5;
-    for(size_t i = 0; i < num_tries; i++){
+    for (size_t i = 0; i < num_tries; i++){
         // From camp go to the spawn point, try focusing on one pokemon.
         // Return the pokemon details if found the target pokemon. Otherwise if cannot find one, return empty details.
         focused_pokemon = go_to_spawn_point_and_try_focusing_pokemon(env, context, num_left);
@@ -416,15 +425,15 @@ size_t AutoMultiSpawn::try_one_battle_to_remove_pokemon(
         env.log("Cannot focus on any pokemon. Retry.");
         // TODO: escape routine may scare wild pokemon. A better way is to reset and load from the backup save?
         // or load from a previous save?
-        goto_any_camp_from_overworld(env, env.console, context, TravelLocations::instance().Mirelands_Mirelands);
+        fast_travel_from_overworld(env, env.console, context, TravelLocations::instance().Mirelands_Mirelands);
         // TODO: May need to reset time of day here
     }
 
     if (focused_pokemon.name_candidates.size() == 0){
-        throw OperationFailedException(
-            ErrorReport::SEND_ERROR_REPORT, env.console,
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
             "Cannot focus on a pokemon after going to the spawn point  " + std::to_string(num_tries) + " times",
-            true
+            env.console
         );
     }
     
@@ -463,15 +472,15 @@ size_t AutoMultiSpawn::try_one_battle_to_remove_pokemon(
         );
 
         if (ret < 0){
-            throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, env.console,
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
                 "Cannot detect a battle after 30 seconds.",
-                true
+                env.console
             );
         }
 
         if (battle_starting){
-            for(bool appeared: battle_sprite_watcher.sprites_appeared()){
+            for (bool appeared: battle_sprite_watcher.sprites_appeared()){
                 num_initial_sprites += appeared;
             }
 
@@ -490,7 +499,7 @@ size_t AutoMultiSpawn::try_one_battle_to_remove_pokemon(
                 // Note we need `battle_menu_detectd == false` condition because if battle ends without entering battle menu, battle sprite
                 // watcher will have lots of false positives when the upper and lower dark borders gradually fade away.
                 num_removed_pokemon = 1;
-            } else {
+            }else{
                 // More than one pokemon attended the battle and they all fled.
                 // We think our pokemon is strong enough to defeat all the wild pokemon in the battle, so it is not possible
                 // that the battle ends because we lost.
@@ -504,12 +513,12 @@ size_t AutoMultiSpawn::try_one_battle_to_remove_pokemon(
         const auto sprite_detection_frame = env.console.video().snapshot().frame;
         const auto sprites_remain = battle_sprite_watcher.detect_sprites(*sprite_detection_frame);
         size_t num_sprites_remain = 0;
-        for(bool remain : sprites_remain){
+        for (bool remain : sprites_remain){
             num_sprites_remain += remain;
         }
         num_removed_pokemon = num_initial_sprites - num_sprites_remain;
 
-        if (PreloadSettings::instance().DEVELOPER_MODE){
+        if (STATIC_GLOBALS.DEVELOPER_MODE){
             dump_debug_image(env.logger(), "PokemonLA/AutoMultiSpawn", "battle_sprite_" + std::to_string(num_sprites_remain), *sprite_detection_frame);
         }
         env.log("Found battle menu, num sprites removed: " + std::to_string(num_removed_pokemon));
@@ -518,15 +527,15 @@ size_t AutoMultiSpawn::try_one_battle_to_remove_pokemon(
             // Oh no, we removed more than needed.
             // XXX can try to reset the game to fix this. But for now let user handles this.
             env.log("Removed more than needed!");
-            throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, env.console,
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
                 "Removed more pokemon than needed!",
-                true
+                env.console
             );
-        } else if (num_removed_pokemon < num_to_despawn){
+        }else if (num_removed_pokemon < num_to_despawn){
 
             // Press A to select moves
-            pbf_press_button(context, BUTTON_A, 10, 100);
+            pbf_press_button(context, BUTTON_A, 80ms, 800ms);
             context.wait_for_all_requests();
             use_next_move_with_pp(env.console, context, 0, cur_move);
             continue;
@@ -536,65 +545,65 @@ size_t AutoMultiSpawn::try_one_battle_to_remove_pokemon(
         // We removed exactly what we need.
         // Escape battle
         env.log("Running from battle...");
-        pbf_press_button(context, BUTTON_B, 20, 225);
-        pbf_press_button(context, BUTTON_A, 20, 100);
+        pbf_press_button(context, BUTTON_B, 160ms, 1800ms);
+        pbf_press_button(context, BUTTON_A, 160ms, 800ms);
         context.wait_for_all_requests();
         ArcPhoneDetector escape_detector(env.console, env.console, std::chrono::milliseconds(100), stop_on_detected);
         ret = wait_until(
             env.console, context, std::chrono::seconds(30), {{escape_detector}}
         );
         if (ret < 0){
-            throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, env.console,
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
                 "Cannot detect end of battle when escaping.",
-                true
+                env.console
             );
         }
     }
 
-    goto_any_camp_from_overworld(env, env.console, context, TravelLocations::instance().Mirelands_Mirelands);
+    fast_travel_from_overworld(env, env.console, context, TravelLocations::instance().Mirelands_Mirelands);
     return num_removed_pokemon;
 }
 
 PokemonDetails AutoMultiSpawn::go_to_spawn_point_and_try_focusing_pokemon(
     SingleSwitchProgramEnvironment& env,
-    BotBaseContext& context,
+    ProControllerContext& context,
     size_t nun_pokemon_left
 ){
     // From camp fly to the spawn point, focus on a target pokemon and start a battle
     change_mount(env.console, context, MountState::BRAVIARY_ON);
-    pbf_wait(context, 40);
+    pbf_wait(context, 320ms);
     
     // Move to spawn location on Braviary
-    pbf_move_left_joystick(context, 255, 165, 150, 0); // 170
-    pbf_press_button(context, BUTTON_B, 200, 10);
-    pbf_mash_button(context, BUTTON_B, 1500); // 1450
+    pbf_move_left_joystick(context, {+1, -0.291}, 1200ms, 0ms); // 170
+    pbf_press_button(context, BUTTON_B, 1600ms, 80ms);
+    pbf_mash_button(context, BUTTON_B, 12000ms); // 1450
 
     // Descend down from the air:
-    for(int i = 0; i < 2 ; i++){
+    for (int i = 0; i < 2 ; i++){
         change_mount(env.console, context, MountState::BRAVIARY_OFF);
         context.wait_for(std::chrono::milliseconds(300));
         change_mount(env.console, context, MountState::BRAVIARY_ON);
     }
 
-    // pbf_press_button(context, BUTTON_PLUS, 20, 150); // jump down from Braviary
-    // for(int i = 0; i < 2; i++){
-    //     pbf_press_button(context, BUTTON_PLUS, 20, 50); // Call back Braviary to stop falling
-    //     pbf_press_button(context, BUTTON_PLUS, 20, 150); // fall down again
+    // pbf_press_button(context, BUTTON_PLUS, 160ms, 1200ms); // jump down from Braviary
+    // for (int i = 0; i < 2; i++){
+    //     pbf_press_button(context, BUTTON_PLUS, 160ms, 400ms); // Call back Braviary to stop falling
+    //     pbf_press_button(context, BUTTON_PLUS, 160ms, 1200ms); // fall down again
     // }
     // In case the character hits a tree and change the Braviary mount state due to the hit,
     // use visual feedback to makse sure the character is now dismounted.
     change_mount(env.console, context, MountState::BRAVIARY_OFF);
-    pbf_wait(context, 50);
+    pbf_wait(context, 400ms);
     
     // Move forward on foot
-    pbf_move_left_joystick(context, 128, 0, 160, 0);
+    pbf_move_left_joystick(context, {0, +1}, 1280ms, 0ms);
 
     context.wait_for_all_requests();
 
     // Try three focus sessions:
     const int max_focus_try = 5;
-    for(int i = 0; i < max_focus_try; i++){
+    for (int i = 0; i < max_focus_try; i++){
         // ret.first: whether we can focus on some pokemon
         // ret.second: the details of the target pokemon being focused, or empty if no target pokemon found.
         MultiSpawn spawn = SPAWN;
@@ -610,14 +619,14 @@ PokemonDetails AutoMultiSpawn::go_to_spawn_point_and_try_focusing_pokemon(
 
         if (i + 1 < max_focus_try){
             env.log("Try another focus attempt.");
-            pbf_wait(context, 200);
+            pbf_wait(context, 1600ms);
             context.wait_for_all_requests();
         }
 
         if (i == 2 && nun_pokemon_left == 1){
             // If its' only one pokemon to despawn, then we don't need to worry about scare multiple pokemon at once.
             // We can move closer.
-            pbf_move_left_joystick(context, 128, 0, 150, 60);
+            pbf_move_left_joystick(context, {0, +1}, 1200ms, 480ms);
             context.wait_for_all_requests();
         }
     }
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_AutoMultiSpawn.h b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_AutoMultiSpawn.h
new file mode 100644
index 0000000000..1374ee6026
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_AutoMultiSpawn.h
@@ -0,0 +1,79 @@
+/*  Auto Multi-Spawn
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *  
+ *  Advance a path in Multi-Spawn shiny hunting method
+ */
+
+#ifndef PokemonAutomation_PokemonLA_AutoMultiSpawn_H
+#define PokemonAutomation_PokemonLA_AutoMultiSpawn_H
+
+#include "Common/Cpp/Options/StringOption.h"
+#include "Common/Cpp/Options/EnumDropdownOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "CommonTools/Options/LanguageOCROption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "VideoGames/PokemonLA/PokemonLA_WeatherAndTime.h"
+#include "VideoGames/PokemonLA/Resources/PokemonLA_PokemonInfo.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+
+class AutoMultiSpawn_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    AutoMultiSpawn_Descriptor();
+};
+
+
+enum class MultiSpawn{
+    MirelandsHippopotas,
+};
+
+
+class AutoMultiSpawn : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = AutoMultiSpawn_Descriptor;
+    AutoMultiSpawn();
+
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    // Advance one step (e.g. A1 or A2) in the multi-spawn path
+    void advance_one_path_step(
+        SingleSwitchProgramEnvironment& env,
+        ProControllerContext& context,
+        size_t num_spawned_pokemon,
+        size_t num_to_despawn,
+        TimeOfDay cur_time,
+        TimeOfDay next_time
+    );
+
+    // From camp, go to the spawn point, start one battle to remove some pokemon
+    // Return how many pokemon removed in the battle.
+    // The function will use a loop to do multiple trips to the spawn point if it cannot find a target pokemon after a trip.
+    size_t try_one_battle_to_remove_pokemon(SingleSwitchProgramEnvironment& env, ProControllerContext& context, size_t num_pokemon_left, size_t num_to_despawn);
+
+    // From camp go to the spawn point, try focusing on one pokemon
+    // Return the pokemon details if found the target pokemon. Otherwise if cannot find one, return empty details
+    // The function will use a loop to do multiple focusing to try to get a target pokemon focused
+    PokemonDetails go_to_spawn_point_and_try_focusing_pokemon(SingleSwitchProgramEnvironment& env, ProControllerContext& context, size_t nun_pokemon_left);
+
+    OCR::LanguageOCROption LANGUAGE;
+
+    EnumDropdownOption<MultiSpawn> SPAWN;
+
+    StringOption PATH;
+
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_BurmyFinder.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_BurmyFinder.cpp
new file mode 100644
index 0000000000..1aa754b039
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_BurmyFinder.cpp
@@ -0,0 +1,861 @@
+/*  Burmy Hunter
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <array>
+#include <sstream>
+#include "Common/Cpp/PrettyPrint.h"
+#include "CommonFramework/StaticGlobals.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "Pokemon/Pokemon_Notification.h"
+#include "Pokemon/Inference/Pokemon_NameReader.h"
+#include "VideoGames/PokemonLA/PokemonLA_Settings.h"
+#include "VideoGames/PokemonLA/PokemonLA_TravelLocations.h"
+#include "VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattleMenuDetector.h"
+#include "VideoGames/PokemonLA/Inference/PokemonLA_BlackOutDetector.h"
+#include "VideoGames/PokemonLA/Inference/PokemonLA_OverworldDetector.h"
+#include "VideoGames/PokemonLA/Inference/Sounds/PokemonLA_ShinySoundDetector.h"
+#include "VideoGames/PokemonLA/Programs/PokemonLA_MountChange.h"
+#include "VideoGames/PokemonLA/Programs/PokemonLA_GameEntry.h"
+#include "VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_BurmyFinder.h"
+#include "VideoGames/PokemonLA/Programs/PokemonLA_LeapPokemonActions.h"
+
+#ifdef _MSC_VER
+#pragma warning(disable:4244)   //  double -> int precision loss
+#endif
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+    using namespace Pokemon;
+
+
+
+BurmyFinder_Descriptor::BurmyFinder_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonLA:Burmy Hunter",
+        STRING_POKEMON + " LA", "Burmy Hunter",
+        "Programs/PokemonLA/BurmyHunter.html",
+        "Check nearby trees for a possible Shiny, Alpha or Alpha Shiny Burmy",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_PerformanceClassSensitive,
+        FeedbackType::VIDEO_AUDIO,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+class BurmyFinder_Descriptor::Stats : public StatsTracker{
+public:
+    Stats()
+        : attempts(m_stats["Attempts"])
+        , trees(m_stats["Trees"])
+        , errors(m_stats["Errors"])
+        , blackouts(m_stats["Blackouts"])
+        , found(m_stats["Found"])
+        , enroute_shinies(m_stats["Enroute Shinies"])
+        , tree_alphas(m_stats["Tree Alphas"])
+        , tree_shinies(m_stats["Tree Shinies"])
+    {
+        m_display_order.emplace_back("Attempts");
+        m_display_order.emplace_back("Trees");
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+        m_display_order.emplace_back("Blackouts", HIDDEN_IF_ZERO);
+        m_display_order.emplace_back("Found");
+        m_display_order.emplace_back("Enroute Shinies");
+        m_display_order.emplace_back("Tree Alphas");
+        m_display_order.emplace_back("Tree Shinies");
+        m_aliases["Shinies"] = "Enroute Shinies";
+        m_aliases["Alphas"] = "Tree Alphas";
+    }
+
+    std::atomic<uint64_t>& attempts;
+    std::atomic<uint64_t>& trees;
+    std::atomic<uint64_t>& errors;
+    std::atomic<uint64_t>& blackouts;
+    std::atomic<uint64_t>& found;
+    std::atomic<uint64_t>& enroute_shinies;
+    std::atomic<uint64_t>& tree_alphas;
+    std::atomic<uint64_t>& tree_shinies;
+
+};
+std::unique_ptr<StatsTracker> BurmyFinder_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+
+BurmyFinder::BurmyFinder()
+    : LANGUAGE(
+        "<b>Game Language</b>",
+        Pokemon::PokemonNameReader::instance().languages(),
+        LockMode::LOCK_WHILE_RUNNING,
+        true
+    )
+    , SHINY_DETECTED_ENROUTE(
+        "Enroute Shiny Action",
+        "This applies if a shiny is detected while traveling in the overworld.",
+        "0 ms"
+    )
+    , FOUND_SHINY_OR_ALPHA(
+        "Found Shiny or Alpha",
+        true, true,
+        ImageAttachmentMode::JPG,
+        {"Notifs", "Showcase"}
+    )
+    , MATCH_DETECTED_OPTIONS(
+        "Match Action",
+        "What to do when a Burmy is found that matches the \"Stop On\" parameter.",
+        "Found Shiny or Alpha"
+    )
+    , NOTIFICATION_STATUS("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_STATUS,
+        &SHINY_DETECTED_ENROUTE.NOTIFICATIONS,
+        &FOUND_SHINY_OR_ALPHA,
+        &MATCH_DETECTED_OPTIONS.NOTIFICATIONS,
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_RECOVERABLE,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+    , SAVE_DEBUG_VIDEO(
+        "<b>Save debug videos to Switch:</b>",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        false
+    )
+{
+    PA_ADD_OPTION(LANGUAGE);
+    PA_ADD_OPTION(STOP_ON);
+    PA_ADD_OPTION(EXIT_METHOD);
+    PA_ADD_OPTION(SHINY_DETECTED_ENROUTE);
+    PA_ADD_OPTION(MATCH_DETECTED_OPTIONS);
+    PA_ADD_OPTION(NOTIFICATIONS);
+    if (STATIC_GLOBALS.DEVELOPER_MODE){
+        PA_ADD_OPTION(SAVE_DEBUG_VIDEO);
+    }
+}
+
+
+
+struct BurmyFinder::TreeCounter{
+    std::array<uint64_t, 16> tree = {};
+    
+    void log(Logger& logger) const{
+        std::ostringstream oss;
+        for (size_t i = 0; i < size(tree); i++){
+            if (i != 0){
+                oss << " - ";
+            }
+            oss << "Tree " << i << ": " << tostr_u_commas(tree[i]);
+        }
+        logger.log(oss.str());
+    }
+};
+
+bool BurmyFinder::handle_battle(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    BurmyFinder_Descriptor::Stats& stats = env.current_stats<BurmyFinder_Descriptor::Stats>();
+
+    PokemonDetails pokemon = get_pokemon_details(env.console, context, LANGUAGE);
+    pbf_press_button(context, BUTTON_B, 160ms, 1800ms);
+    context.wait_for_all_requests();
+
+    if (pokemon.name_candidates.find("burmy") == pokemon.name_candidates.end()){
+        env.console.log("Not a burmy. Leaving battle.");
+        exit_battle(env.console, context, EXIT_METHOD);
+        return false;
+    }
+
+    stats.found++;
+    //  Match validation
+
+    if (pokemon.is_alpha && pokemon.is_shiny){
+        env.console.log("Found Shiny Alpha!");
+        stats.tree_shinies++;
+        stats.tree_alphas++;
+    }else if (pokemon.is_alpha){
+        env.console.log("Found Alpha!");
+        stats.tree_alphas++;
+    }else if (pokemon.is_shiny){
+        env.console.log("Found Shiny!");
+        stats.tree_shinies++;
+    }else{
+        env.console.log("Normie in the tree -_-");
+    }
+    env.update_stats();
+
+    bool is_match = false;
+    switch (STOP_ON){
+    case StopOn::Shiny:
+        is_match = pokemon.is_shiny;
+        break;
+    case StopOn::Alpha:
+        is_match = pokemon.is_alpha;
+        break;
+    case StopOn::ShinyOrAlpha:
+        is_match = pokemon.is_alpha || pokemon.is_shiny;
+        break;
+    case StopOn::ShinyAndAlpha:
+        is_match = pokemon.is_alpha && pokemon.is_shiny;
+        break;
+    }
+
+    bool notification_sent = false;
+    do{
+        std::string str;
+        if (pokemon.is_shiny){
+            if (pokemon.is_alpha){
+                str = "Found Shiny Alpha!";
+            }else{
+                str = "Found Shiny!";
+            }
+        }else{
+            if (pokemon.is_alpha){
+                str = "Found Alpha!";
+            }else{
+                break;
+            }
+        }
+        notification_sent |= send_program_notification(
+            env, FOUND_SHINY_OR_ALPHA,
+            Pokemon::COLOR_STAR_SHINY,
+            std::move(str),
+            {}, "",
+            env.console.video().snapshot(), true
+        );
+    }while (false);
+
+    if (is_match){
+        on_battle_match_found(env, env.console, context, MATCH_DETECTED_OPTIONS, !notification_sent);
+    }
+
+    exit_battle(env.console, context, EXIT_METHOD);
+
+    return true;
+}
+
+
+bool BurmyFinder::check_tree(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    context.wait_for_all_requests();
+
+    disable_shiny_sound(context);
+    bool battle_found = check_tree_or_ore_for_battle(env.console, context);
+    env.current_stats<BurmyFinder_Descriptor::Stats>().trees++;
+    env.update_stats();
+
+    context.wait_for_all_requests();
+
+    bool ret = false;
+    if (battle_found){
+        ret = handle_battle(env, context);
+    }
+
+    enable_shiny_sound(context);
+
+    return ret;
+}
+
+void BurmyFinder::check_tree_no_stop(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    context.wait_for_all_requests();
+    disable_shiny_sound(context);
+    // Throw pokemon
+    pbf_press_button(context, BUTTON_ZR, 500ms, 1500ms);
+    context.wait_for_all_requests();
+    env.current_stats<BurmyFinder_Descriptor::Stats>().trees++;
+    env.update_stats();
+//    enable_shiny_sound(context);
+}
+
+void BurmyFinder::disable_shiny_sound(ProControllerContext& context){
+    context.wait_for_all_requests();
+    m_enable_shiny_sound.store(false, std::memory_order_release);
+}
+void BurmyFinder::enable_shiny_sound(ProControllerContext& context){
+    context.wait_for_all_requests();
+    m_enable_shiny_sound.store(true, std::memory_order_release);
+}
+
+void BurmyFinder::go_to_height_camp(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    const bool stop_on_detected = true;
+    BattleMenuDetector battle_menu_detector(env.console, env.console, stop_on_detected);
+    int ret = run_until<ProControllerContext>(
+        env.console, context,
+        [&](ProControllerContext& context){
+            fast_travel_from_overworld(env, env.console, context, TravelLocations::instance().Fieldlands_Heights);
+        },
+        {
+            {battle_menu_detector},
+        }
+    );
+    if (ret == 0){
+        env.log("Warning: found inside a battle when trying to return to camp.");
+        // Unexpected battle during movement to camp
+        if (SAVE_DEBUG_VIDEO){
+            // Take a video to know why it enters battle during return trip
+            pbf_press_button(context, BUTTON_CAPTURE, 2000ms, 2000ms);
+            context.wait_for_all_requests();
+        }
+        // Finish battle
+        handle_battle(env, context);
+        // Go back to camp
+        fast_travel_from_overworld(env, env.console, context, TravelLocations::instance().Fieldlands_Heights);
+    }
+}
+
+size_t BurmyFinder::grouped_path(SingleSwitchProgramEnvironment& env, ProControllerContext& context, size_t path, TreeCounter& tree_counter){
+
+    size_t last_checked_tree = 0;
+
+    if (path != 0){
+        go_to_height_camp(env, context);
+    }
+
+    env.console.log("Currently Checking Path:" + std::to_string(path));
+
+    BattleMenuDetector battle_menu_detector(env.console, env.console, true);
+
+    int ret = run_until<ProControllerContext>(
+        env.console, context,
+        [&](ProControllerContext& context){
+            switch (path){
+            case 0:
+                //============ Tree 0=============//
+                env.console.log("Checking tree: 0");
+                pbf_move_left_joystick(context, {+1, +0.336}, 160ms, 500ms);
+                pbf_press_button(context, BUTTON_ZL, 160ms, 600ms);
+                change_mount(env.console, context, MountState::BRAVIARY_ON);
+                pbf_wait(context, 700ms);
+                pbf_press_button(context, BUTTON_B, 5100ms, 0ms);
+                pbf_press_button(context, BUTTON_Y, 4200ms, 0ms);
+                pbf_press_button(context, BUTTON_PLUS, 160ms, 1000ms);
+                pbf_move_right_joystick(context, {0, -1}, 300ms, 200ms);
+                last_checked_tree = 0;
+                check_tree_no_stop(env, context);
+
+                //============ Tree 1=============//
+                env.console.log("Checking tree: 1");
+                pbf_press_button(context, BUTTON_PLUS, 160ms, 1000ms);
+                pbf_move_left_joystick(context, {+1, +0.922}, 1000ms, 0ms);
+                context.wait_for_all_requests();
+                enable_shiny_sound(context);
+                pbf_press_button(context, BUTTON_B, 600ms, 0ms);
+                pbf_press_button(context, BUTTON_Y, 2700ms, 0ms);
+                pbf_press_button(context, BUTTON_PLUS, 160ms, 1000ms);
+                pbf_move_right_joystick(context, {0, -1}, 100ms, 300ms);
+                last_checked_tree = 1;
+                check_tree_no_stop(env, context);
+
+                //============ Tree 2=============//
+                env.console.log("Checking tree: 2");
+                pbf_press_button(context, BUTTON_PLUS, 160ms, 800ms);
+                pbf_move_left_joystick(context, {+1, -0.016}, 1000ms, 0ms);
+                context.wait_for_all_requests();
+                enable_shiny_sound(context);
+                pbf_press_button(context, BUTTON_B, 600ms, 0ms);
+                pbf_press_button(context, BUTTON_Y, 2400ms, 0ms);
+                pbf_press_button(context, BUTTON_PLUS, 160ms, 1000ms);
+                pbf_move_right_joystick(context, {0, -1}, 100ms, 300ms);
+                last_checked_tree = 2;
+                check_tree_no_stop(env, context);
+
+                //============ Tree 3=============//
+                env.console.log("Checking tree: 3");
+                pbf_press_button(context, BUTTON_PLUS, 160ms, 800ms);
+                pbf_move_left_joystick(context, {-1, +0.258}, 1000ms, 0ms);
+                context.wait_for_all_requests();
+                enable_shiny_sound(context);
+                pbf_press_button(context, BUTTON_B, 880ms, 0ms);
+                pbf_press_button(context, BUTTON_Y, 2300ms, 0ms);
+                pbf_press_button(context, BUTTON_PLUS, 160ms, 1000ms);
+                pbf_move_right_joystick(context, {0, -1}, 100ms, 300ms);
+                last_checked_tree = 3;
+                break;
+            case 1:
+                //============ Tree 4=============//
+                env.console.log("Checking tree: 4");
+                pbf_move_left_joystick(context, {+1, -0.291}, 160ms, 500ms);
+                pbf_press_button(context, BUTTON_ZL, 160ms, 500ms);
+                change_mount(env.console, context, MountState::BRAVIARY_ON);
+                pbf_wait(context, 600ms);
+                pbf_press_button(context, BUTTON_B, 4800ms, 600ms);
+                pbf_press_button(context, BUTTON_Y, 1700ms, 500ms);
+                pbf_press_button(context, BUTTON_PLUS, 160ms, 1000ms);
+                pbf_move_right_joystick(context, {0, -1}, 200ms, 500ms);
+                last_checked_tree = 4;
+                check_tree_no_stop(env, context);
+
+                //============ Tree 5=============//
+                env.console.log("Checking tree: 5");
+                pbf_press_button(context, BUTTON_PLUS, 160ms, 1000ms);
+                pbf_move_left_joystick(context, {+1, -0.488}, 1000ms, 0ms);
+                context.wait_for_all_requests();
+                enable_shiny_sound(context);
+                pbf_press_button(context, BUTTON_B, 500ms, 0ms);
+                pbf_press_button(context, BUTTON_Y, 2600ms, 0ms);
+                pbf_press_button(context, BUTTON_PLUS, 160ms, 1000ms);
+                pbf_move_right_joystick(context, {0, -1}, 150ms, 500ms);
+                last_checked_tree = 5;
+                check_tree_no_stop(env, context);
+
+                //============ Tree 6=============//
+                env.console.log("Checking tree: 6");
+                pbf_press_button(context, BUTTON_PLUS, 160ms, 1000ms);
+                pbf_move_left_joystick(context, {-1, -0.016}, 1000ms, 0ms);
+                context.wait_for_all_requests();
+                enable_shiny_sound(context);
+                pbf_press_button(context, BUTTON_B, 1300ms, 0ms);
+                pbf_press_button(context, BUTTON_Y, 3200ms, 0ms);
+                pbf_press_button(context, BUTTON_PLUS, 160ms, 1000ms);
+                pbf_move_right_joystick(context, {0, -1}, 150ms, 500ms);
+                last_checked_tree = 6;
+                break;
+            case 2:
+                //============ Tree 7=============//
+                env.console.log("Checking tree: 7");
+                pbf_move_left_joystick(context, {+0.409, -1}, 160ms, 500ms);
+                change_mount(env.console, context, MountState::BRAVIARY_ON);
+                pbf_press_button(context, BUTTON_B, 7200ms, 0ms);
+                pbf_press_button(context, BUTTON_Y, 4200ms, 0ms);
+                pbf_press_button(context, BUTTON_PLUS, 160ms, 1000ms);
+                pbf_move_left_joystick(context, {-1, +0.008}, 1500ms, 500ms);
+                pbf_press_button(context, BUTTON_ZL, 160ms, 160ms);
+                pbf_move_right_joystick(context, {0, -1}, 500ms, 160ms);
+                last_checked_tree = 7;
+                check_tree_no_stop(env, context);
+
+                //============ Tree 8=============//
+                env.console.log("Checking tree: 8");
+                pbf_press_button(context, BUTTON_PLUS, 160ms, 1000ms);
+                pbf_move_left_joystick(context, {+1, -0.803}, 500ms, 500ms);
+                context.wait_for_all_requests();
+                enable_shiny_sound(context);
+                pbf_press_button(context, BUTTON_Y, 1700ms, 500ms);
+                pbf_press_button(context, BUTTON_PLUS, 160ms, 1000ms);
+                pbf_move_right_joystick(context, {0, -1}, 500ms, 500ms);
+                last_checked_tree = 8;
+                check_tree_no_stop(env, context);
+
+                //============ Tree 9=============//
+                env.console.log("Checking tree: 8");
+                pbf_press_button(context, BUTTON_PLUS, 160ms, 1000ms);
+                pbf_move_left_joystick(context, {-0.297, +1}, 500ms, 500ms);
+                context.wait_for_all_requests();
+                enable_shiny_sound(context);
+                pbf_press_button(context, BUTTON_B, 600ms, 0ms);
+                pbf_press_button(context, BUTTON_Y, 2000ms, 500ms);
+                pbf_press_button(context, BUTTON_PLUS, 160ms, 1000ms);
+                pbf_move_right_joystick(context, {0, -1}, 200ms, 500ms);
+                last_checked_tree = 9;
+                check_tree_no_stop(env, context);
+
+                //============ Tree 10=============//
+                env.console.log("Checking tree: 10");
+                pbf_press_button(context, BUTTON_PLUS, 160ms, 1000ms);
+                pbf_move_left_joystick(context, {-1, -0.843}, 500ms, 500ms);
+                context.wait_for_all_requests();
+                enable_shiny_sound(context);
+                pbf_press_button(context, BUTTON_B, 2500ms, 0ms);
+                pbf_press_button(context, BUTTON_Y, 2500ms, 500ms);
+                pbf_move_right_joystick(context, {0, -1}, 200ms, 500ms);
+                last_checked_tree = 10;
+                check_tree_no_stop(env, context);
+
+                //============ Tree 11=============//
+                env.console.log("Checking tree: 11");
+                pbf_press_button(context, BUTTON_PLUS, 160ms, 1000ms);
+                pbf_move_left_joystick(context, {+0.134, +1}, 500ms, 500ms);
+                context.wait_for_all_requests();
+                enable_shiny_sound(context);
+                pbf_press_button(context, BUTTON_B, 1800ms, 0ms);
+                pbf_press_button(context, BUTTON_Y, 1800ms, 500ms);
+                pbf_press_button(context, BUTTON_PLUS, 160ms, 1000ms);
+                pbf_move_right_joystick(context, {0, -1}, 300ms, 500ms);
+                last_checked_tree = 11;
+                break;
+            case 3:
+                //============ Tree 12=============//
+                env.console.log("Checking tree: 12");
+                pbf_move_left_joystick(context, {+0.157, -1}, 160ms, 160ms);
+                change_mount(env.console, context, MountState::BRAVIARY_ON);
+                pbf_press_button(context, BUTTON_B, 9700ms, 160ms);
+                pbf_press_button(context, BUTTON_Y, 2200ms, 160ms);
+                pbf_press_button(context, BUTTON_PLUS, 160ms, 1000ms);
+                pbf_move_left_joystick(context, {+1, +0.008}, 240ms, 500ms);
+                pbf_press_button(context, BUTTON_ZL, 160ms, 500ms);
+                pbf_move_right_joystick(context, {0, -1}, 200ms, 500ms);
+                last_checked_tree = 12;
+                check_tree_no_stop(env, context);
+
+                //============ Tree 13=============//
+                env.console.log("Checking tree: 13");
+                pbf_move_left_joystick(context, {+0.157, +1}, 160ms, 160ms);
+                change_mount(env.console, context, MountState::BRAVIARY_ON);
+                context.wait_for_all_requests();
+                enable_shiny_sound(context);
+                pbf_press_button(context, BUTTON_B, 2000ms, 0ms);
+                pbf_press_button(context, BUTTON_Y, 3000ms, 0ms);
+                pbf_move_right_joystick(context, {0, -1}, 200ms, 500ms);
+                last_checked_tree = 13;
+                check_tree_no_stop(env, context);
+
+                //============ Tree 14=============//
+                env.console.log("Checking tree: 14");
+                pbf_move_left_joystick(context, {+1, -0.213}, 160ms, 500ms);
+                pbf_press_button(context, BUTTON_ZL, 160ms, 500ms);
+                change_mount(env.console, context, MountState::BRAVIARY_ON);
+                context.wait_for_all_requests();
+                enable_shiny_sound(context);
+                pbf_move_left_joystick(context, {-0.008, +1}, 6600ms, 160ms);
+                pbf_move_right_joystick(context, {0, -1}, 200ms, 500ms);
+                last_checked_tree = 14;
+                check_tree_no_stop(env, context);
+
+                //============ Tree 15=============//
+                env.console.log("Checking tree: 15");
+                pbf_move_left_joystick(context, {+0.567, +1}, 160ms, 500ms);
+                pbf_press_button(context, BUTTON_ZL, 160ms, 500ms);
+                change_mount(env.console, context, MountState::BRAVIARY_ON);
+                context.wait_for_all_requests();
+                enable_shiny_sound(context);
+                pbf_press_button(context, BUTTON_ZL, 160ms, 500ms);
+                pbf_press_button(context, BUTTON_B, 1700ms, 0ms);
+                pbf_press_button(context, BUTTON_Y, 3000ms, 0ms);
+                pbf_move_right_joystick(context, {0, -1}, 100ms, 500ms);
+                last_checked_tree = 15;
+                break;
+            }
+        },
+        {
+            {battle_menu_detector},
+        }
+    );
+
+    if (ret == 0){
+        if (handle_battle(env, context)){
+            env.console.log("Battle found before last tree in the path.");
+            tree_counter.tree[last_checked_tree]++;
+        }
+    }else{
+        // Check last tree
+        if (check_tree(env, context)){
+            tree_counter.tree[last_checked_tree]++;
+        }
+        env.console.log("Checked all trees in the path.");
+    }
+
+    return last_checked_tree;
+}
+
+void BurmyFinder::single_path(SingleSwitchProgramEnvironment& env, ProControllerContext& context, size_t path, size_t last_tree, TreeCounter& tree_counter){
+    env.console.log("Last tree was: " + std::to_string(last_tree));
+
+    switch (path){
+    case 0:
+        if (last_tree < 1){
+            env.console.log("Heading to tree 1");
+            go_to_height_camp(env, context);
+            pbf_move_left_joystick(context, {+1, +0.141}, 160ms, 500ms);
+            pbf_press_button(context, BUTTON_ZL, 160ms, 500ms);
+            change_mount(env.console, context, MountState::BRAVIARY_ON);
+            pbf_press_button(context, BUTTON_B, 7200ms, 0ms);
+            pbf_press_button(context, BUTTON_Y, 4500ms, 0ms);
+            pbf_move_left_joystick(context, {+0.409, +1}, 160ms, 500ms);
+            pbf_move_right_joystick(context, {0, -1}, 200ms, 500ms);
+            if (check_tree(env, context)){
+                tree_counter.tree[1]++;
+            }
+        }
+
+        if (last_tree < 2){
+            env.console.log("Heading to tree 2");
+            go_to_height_camp(env, context);
+            pbf_move_left_joystick(context, {+1, -0.15}, 160ms, 500ms);
+            pbf_press_button(context, BUTTON_ZL, 160ms, 500ms);
+            change_mount(env.console, context, MountState::BRAVIARY_ON);
+            pbf_press_button(context, BUTTON_B, 6600ms, 0ms);
+            pbf_press_button(context, BUTTON_Y, 4400ms, 0ms);
+            pbf_press_button(context, BUTTON_PLUS, 160ms, 500ms);
+            if (check_tree(env, context)){
+                tree_counter.tree[2]++;
+            }
+        }
+
+        if (last_tree < 3){
+            env.console.log("Heading to tree 3");
+            go_to_height_camp(env, context);
+            pbf_move_left_joystick(context, {+1, -0.236}, 160ms, 500ms);
+            pbf_press_button(context, BUTTON_ZL, 160ms, 500ms);
+            change_mount(env.console, context, MountState::BRAVIARY_ON);
+            pbf_press_button(context, BUTTON_B, 9500ms, 0ms);
+            pbf_press_button(context, BUTTON_Y, 4500ms, 1000ms);
+            if (check_tree(env, context)){
+                tree_counter.tree[3]++;
+            }
+        }
+        break;
+    case 1:
+        if (last_tree < 5){
+            env.console.log("Heading to Tree 5");
+            go_to_height_camp(env, context);
+            pbf_move_left_joystick(context, {+0.882, -0.882}, 160ms, 500ms);
+            pbf_press_button(context, BUTTON_ZL, 160ms, 500ms);
+            change_mount(env.console, context, MountState::BRAVIARY_ON);
+            pbf_press_button(context, BUTTON_B, 5950ms, 1000ms);
+            pbf_press_button(context, BUTTON_PLUS, 160ms, 1200ms);
+            pbf_press_button(context, BUTTON_PLUS, 160ms, 500ms);
+            pbf_press_button(context, BUTTON_PLUS, 160ms, 1500ms);
+            pbf_move_left_joystick(context, {-1, +1}, 160ms, 500ms);
+            pbf_press_button(context, BUTTON_ZL, 160ms, 500ms);
+            pbf_move_right_joystick(context, {0, -1}, 200ms, 500ms);
+            if (check_tree(env, context)){
+                tree_counter.tree[5]++;
+            }
+        }
+
+        if (last_tree < 6){
+            env.console.log("Heading to Tree 6");
+            go_to_height_camp(env, context);
+            pbf_move_left_joystick(context, {+1, -0.843}, 160ms, 500ms);
+            pbf_press_button(context, BUTTON_ZL, 160ms, 500ms);
+            change_mount(env.console, context, MountState::BRAVIARY_ON);
+            pbf_press_button(context, BUTTON_B, 8000ms, 0ms);
+            pbf_press_button(context, BUTTON_Y, 4000ms, 0ms);
+            if (check_tree(env, context)){
+                tree_counter.tree[6]++;
+            }
+        }
+        break;
+
+    case 2:
+        if (last_tree < 8){
+            env.console.log("Heading to Tree 8");
+            go_to_height_camp(env, context);
+            pbf_move_left_joystick(context, {+0.354, -1}, 160ms, 500ms);
+            change_mount(env.console, context, MountState::BRAVIARY_ON);
+            pbf_press_button(context, BUTTON_B, 8800ms, 0ms);
+            pbf_press_button(context, BUTTON_Y, 4400ms, 0ms);
+            pbf_press_button(context, BUTTON_PLUS, 160ms, 160ms);
+            if (check_tree(env, context)){
+                tree_counter.tree[8]++;
+            }
+        }
+
+        if (last_tree < 9){
+            env.console.log("Heading to Tree 9");
+            go_to_height_camp(env, context);
+            pbf_move_left_joystick(context, {+0.276, -1}, 160ms, 500ms);
+            change_mount(env.console, context, MountState::BRAVIARY_ON);
+            pbf_press_button(context, BUTTON_B, 11700ms, 0ms);
+            pbf_press_button(context, BUTTON_Y, 3800ms, 0ms);
+            pbf_press_button(context, BUTTON_PLUS, 160ms, 160ms);
+            if (check_tree(env, context)){
+                tree_counter.tree[8]++;
+            }
+        }
+
+        if (last_tree < 10){
+            env.console.log("Heading to Tree 10");
+            go_to_height_camp(env, context);
+            pbf_move_left_joystick(context, {+0.709, -1}, 160ms, 500ms);
+            change_mount(env.console, context, MountState::BRAVIARY_ON);
+            pbf_press_button(context, BUTTON_B, 10400ms, 0ms);
+            pbf_press_button(context, BUTTON_Y, 3800ms, 0ms);
+            pbf_press_button(context, BUTTON_PLUS, 160ms, 160ms);
+            if (check_tree(env, context)){
+                tree_counter.tree[8]++;
+            }
+        }
+
+        if (last_tree < 11){
+            env.console.log("Heading to Tree 11");
+            go_to_height_camp(env, context);
+            pbf_move_left_joystick(context, {+1, -0.803}, 160ms, 500ms);
+            change_mount(env.console, context, MountState::BRAVIARY_ON);
+            pbf_press_button(context, BUTTON_B, 11400ms, 0ms);
+            pbf_press_button(context, BUTTON_Y, 3800ms, 0ms);
+            pbf_press_button(context, BUTTON_PLUS, 160ms, 160ms);
+            if (check_tree(env, context)){
+                tree_counter.tree[11]++;
+            }
+        }
+        break;
+    case 3:
+        if (last_tree < 13){
+            env.console.log("Heading to Tree 13");
+            go_to_height_camp(env, context);
+            pbf_move_left_joystick(context, {-0.188, -1}, 240ms, 240ms);
+            change_mount(env.console, context, MountState::BRAVIARY_ON);
+            pbf_press_button(context, BUTTON_B, 11000ms, 1000ms);
+            pbf_press_button(context, BUTTON_PLUS, 160ms, 1300ms);
+            pbf_press_button(context, BUTTON_PLUS, 160ms, 500ms);
+            pbf_press_button(context, BUTTON_PLUS, 160ms, 1500ms);
+            pbf_move_right_joystick(context, {0, -1}, 200ms, 500ms);
+            if (check_tree(env, context)){
+                tree_counter.tree[13]++;
+            }
+        }
+
+        if (last_tree < 14){
+            env.console.log("Heading to Tree 14");
+            go_to_height_camp(env, context);
+            pbf_move_left_joystick(context, {-0.156, -1}, 160ms, 160ms);
+            change_mount(env.console, context, MountState::BRAVIARY_ON);
+            pbf_press_button(context, BUTTON_B, 8700ms, 1000ms);
+            pbf_press_button(context, BUTTON_PLUS, 160ms, 1000ms);
+            pbf_move_left_joystick(context, {+0.094, -1}, 160ms, 160ms);
+            pbf_press_button(context, BUTTON_ZL, 160ms, 500ms);
+            pbf_move_right_joystick(context, {+0.094, -1}, 200ms, 500ms);
+            if (check_tree(env, context)){
+                tree_counter.tree[14]++;
+            }
+        }
+        if (last_tree < 15){
+            env.console.log("Heading to Tree 15");
+            go_to_height_camp(env, context);
+            pbf_move_left_joystick(context, {+0.252, -1}, 240ms, 240ms);
+            change_mount(env.console, context, MountState::BRAVIARY_ON);
+            pbf_press_button(context, BUTTON_B, 6350ms, 160ms);
+            pbf_press_button(context, BUTTON_PLUS, 160ms, 1000ms);
+            pbf_press_button(context, BUTTON_PLUS, 160ms, 500ms);
+            pbf_press_button(context, BUTTON_PLUS, 160ms, 1500ms);
+            pbf_move_left_joystick(context, {+1, -0.055}, 240ms, 500ms);
+            pbf_press_button(context, BUTTON_ZL, 160ms, 500ms);
+            pbf_move_right_joystick(context, {0, -1}, 200ms, 500ms);
+            if (check_tree(env, context)){
+                tree_counter.tree[15]++;
+            }
+        }
+
+        break;
+
+    }
+
+}
+
+void BurmyFinder::run_iteration(
+    SingleSwitchProgramEnvironment& env, ProControllerContext& context,
+    TreeCounter& tree_counter,
+    bool fresh_from_reset
+){
+    BurmyFinder_Descriptor::Stats& stats = env.current_stats<BurmyFinder_Descriptor::Stats>();
+    stats.attempts++;
+    env.update_stats();
+    env.console.log("Starting route and shiny detection...");
+
+    for (size_t c = 0; true; c++){
+        context.wait_for_all_requests();
+        auto snapshot = env.console.video().snapshot();
+        if (is_pokemon_selection(env.console, snapshot)){
+            break;
+        }
+        if (c >= 5){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "Failed to switch to Pokemon selection after 5 attempts.",
+                env.console,
+                std::move(snapshot)
+            );
+        }
+        env.console.log("Not on Pokemon selection. Attempting to switch to it...", COLOR_ORANGE);
+        pbf_press_button(context, BUTTON_X, 160ms, 1840ms);
+    }
+
+    float shiny_coefficient = 1.0;
+
+    ShinySoundDetector shiny_detector(env.console, [&](float error_coefficient) -> bool{
+        //  Warning: This callback will be run from a different thread than this function.
+        if (!m_enable_shiny_sound.load()){
+            return false;
+        }
+        stats.enroute_shinies++;
+        shiny_coefficient = error_coefficient;
+        return on_shiny_callback(env, env.console, SHINY_DETECTED_ENROUTE, error_coefficient);
+    });
+
+    BlackOutDetector black_out_detector(env.console, env.console);
+
+    goto_camp_from_jubilife(
+        env, env.console, context,
+        TravelLocations::instance().Fieldlands_Heights,
+        fresh_from_reset
+    );
+
+    int ret = run_until<ProControllerContext>(
+        env.console, context,
+        [&](ProControllerContext& context){
+
+            for (int path = 0; path < 4; path++){
+                size_t last_tree = grouped_path(env, context, path, tree_counter);
+                context.wait_for_all_requests();
+                single_path(env, context, path, last_tree, tree_counter);
+                context.wait_for_all_requests();
+            }
+            //  End
+            goto_camp_from_overworld(env, env.console, context);
+            goto_professor(env.console, context, Camp::FIELDLANDS_FIELDLANDS);
+        },
+        {{shiny_detector, black_out_detector}}
+    );
+    shiny_detector.throw_if_no_sound();
+    if (ret == 0){
+        on_shiny_sound(env, env.console, context, SHINY_DETECTED_ENROUTE, shiny_coefficient);
+    }else if (ret == 1){
+        env.log("Character blacks out");
+        // black out.
+        stats.blackouts++;
+        env.update_stats();
+        if (SAVE_DEBUG_VIDEO){
+            // Take a video to know why it blacks out
+            pbf_press_button(context, BUTTON_CAPTURE, 2000ms, 2000ms);
+            context.wait_for_all_requests();
+        }
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "Black out.",
+            env.console
+        );
+    }
+
+    from_professor_return_to_jubilife(env, env.console, context);
+}
+
+void BurmyFinder::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    BurmyFinder_Descriptor::Stats& stats = env.current_stats<BurmyFinder_Descriptor::Stats>();
+
+    //  Connect the controller.
+    require_player(env.console, context, BUTTON_LCLICK);
+
+    TreeCounter counters;
+
+    bool fresh_from_reset = false;
+    while (true){
+        env.update_stats();
+        counters.log(env.logger());
+        send_program_status_notification(env, NOTIFICATION_STATUS);
+        try{
+            run_iteration(env, context, counters, fresh_from_reset);
+        }catch (OperationFailedExceptionWithScreenshot& e){
+            stats.errors++;
+            e.send_recoverable_error_notif_and_telemetry_report(env, NOTIFICATION_ERROR_RECOVERABLE);
+
+            pbf_press_button(context, BUTTON_HOME, 160ms, GameSettings::instance().GAME_TO_HOME_DELAY0);
+            fresh_from_reset = reset_game_from_home(
+                env, env.console, context
+            );
+        }
+    }
+
+    env.update_stats();
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_BurmyFinder.h b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_BurmyFinder.h
new file mode 100644
index 0000000000..ad160aa81d
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_BurmyFinder.h
@@ -0,0 +1,118 @@
+/*  Burmy Hunter
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLA_BurmyFinder_H
+#define PokemonAutomation_PokemonLA_BurmyFinder_H
+
+#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "CommonTools/Options/LanguageOCROption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "VideoGames/PokemonLA/Options/PokemonLA_MiscOptions.h"
+#include "VideoGames/PokemonLA/Options/PokemonLA_ShinyDetectedAction.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+
+class BurmyFinder_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    BurmyFinder_Descriptor();
+
+    class Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+class BurmyFinder : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = BurmyFinder_Descriptor;
+    BurmyFinder();
+
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    struct TreeCounter;
+
+    void run_iteration(
+        SingleSwitchProgramEnvironment& env, ProControllerContext& context,
+        TreeCounter& tree_counter,
+        bool fresh_from_reset
+    );
+    // Press X to throw pokemon, check whether there is pokemon in the tree. Wait for potential battle
+    // after pokemon is thrown.
+    // Return true if encountering a burmy in the tree. False otherwise.
+    // Also during pokemon throwing and battle, disable shiny sound detection. This is because a shiny burmy
+    // will play the shiny sound when it jumps out of the tree. To avoid this shiny sound be categorized as
+    // enroute shiny, we disable the sound detection when a burmy may jump out.
+    bool check_tree(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+    // Throw pokemon to check a tree.
+    // Does not wait for potential battle to start.
+    // Unlike `check_tree()`, shiny sound detection is not disabled. 
+    void check_tree_no_stop(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+
+    // While during battle, press + button to check pokemon details.
+    // May throw ProgramFinishedException if a Burmy match is found.
+    // Finish battle by mashing A or escape. 
+    // Return true if a burmy is in the battle. False otherwise.
+    bool handle_battle(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+
+    // Set `m_enable_shiny_sound` to false to disable sound detection.
+    // Also call `context.wait_for_all_requests()` to make sure controller commands are all executed.
+    // See `m_enable_shiny_sound` for more context.
+    void disable_shiny_sound(ProControllerContext& context);
+    // Re-enable shiny sound detection.
+    // Also call `context.wait_for_all_requests()` to make sure controller commands are all executed.
+    // See `m_enable_shiny_sound` for more context.
+    void enable_shiny_sound(ProControllerContext& context);
+
+    // From any place on the fieldlands, return to Height Camp.
+    // It will try to ride on Braviary to escape from attacking pokemon if it can not transport via map.
+    // For robustness, the function will detect pokemon battles if for some reason the player character
+    // is entering a pokemon battle when this function is called.
+    // In the case of an active battle, it calls `handle_battle()` to check potential Burmy and then finish
+    // battle. After that, try to go back to Height Camp again.
+    void go_to_height_camp(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+
+    // From camp it will go to trees in sequence instead of heading to camp.
+    // It returns the last tree checked so the remain can be checked on single_path
+    size_t grouped_path(SingleSwitchProgramEnvironment& env, ProControllerContext& context, size_t path, TreeCounter& tree_counter);
+
+    // Check trees individually going from camp based on the last tree checked for each path
+    void single_path(SingleSwitchProgramEnvironment& env, ProControllerContext& context, size_t path, size_t last_tree, TreeCounter& tree_counter);
+
+
+private:
+    class RunRoute;
+
+    // Atomic bool to control whether to skip shiny sound for shiny sound detector.
+    // Shiny pokemon will play the shiny sound when it jumps out of a tree. To prevent this shiny sound from being
+    // treated as enroute shiny (shiny tree pokemon should be regarded as tree shiny), we disable shiny sound
+    // detection when throwing pokemon to shake a tree.
+    std::atomic<bool> m_enable_shiny_sound{true};
+
+    OCR::LanguageOCROption LANGUAGE;
+    StopOnOption STOP_ON;
+    ExitBattleMethodOption EXIT_METHOD;
+
+    OverworldShinyDetectedActionOption SHINY_DETECTED_ENROUTE;
+    EventNotificationOption FOUND_SHINY_OR_ALPHA;
+    BattleMatchActionOption MATCH_DETECTED_OPTIONS;
+
+    EventNotificationOption NOTIFICATION_STATUS;
+    EventNotificationsOption NOTIFICATIONS;
+
+    BooleanCheckBoxOption SAVE_DEBUG_VIDEO;
+};
+
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_CrobatFinder.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_CrobatFinder.cpp
new file mode 100644
index 0000000000..580956e41f
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_CrobatFinder.cpp
@@ -0,0 +1,218 @@
+/*  Alpha Crobat Hunter
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonLA/PokemonLA_Settings.h"
+#include "VideoGames/PokemonLA/Inference/PokemonLA_MountDetector.h"
+#include "VideoGames/PokemonLA/Inference/Sounds/PokemonLA_ShinySoundDetector.h"
+#include "VideoGames/PokemonLA/Programs/PokemonLA_GameEntry.h"
+#include "VideoGames/PokemonLA/Programs/PokemonLA_RegionNavigation.h"
+#include "PokemonLA_CrobatFinder.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+using namespace Pokemon;
+
+
+CrobatFinder_Descriptor::CrobatFinder_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonLA:CrobatFinder",
+        STRING_POKEMON + " LA", "Alpha Crobat Hunter",
+        "Programs/PokemonLA/AlphaCrobatHunter.html",
+        "Constantly reset the cave to find Shiny Alpha Crobat.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::VIDEO_AUDIO,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+class CrobatFinder_Descriptor::Stats : public StatsTracker, public ShinyStatIncrementer{
+public:
+    Stats()
+        : attempts(m_stats["Attempts"])
+        , errors(m_stats["Errors"])
+        , shinies(m_stats["Shinies"])
+    {
+        m_display_order.emplace_back("Attempts");
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+        m_display_order.emplace_back("Shinies", HIDDEN_IF_ZERO);
+    }
+    virtual void add_shiny() override{
+        shinies++;
+    }
+
+    std::atomic<uint64_t>& attempts;
+    std::atomic<uint64_t>& errors;
+    std::atomic<uint64_t>& shinies;
+};
+std::unique_ptr<StatsTracker> CrobatFinder_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+
+CrobatFinder::CrobatFinder()
+    : SHINY_DETECTED_ENROUTE(
+        "Enroute Shiny Action",
+        "This applies if you are still traveling to the Crobat.",
+        "2000 ms"
+    )
+    , SHINY_DETECTED_DESTINATION(
+        "Destination Shiny Action",
+        "This applies if you are near the Crobat.",
+        "2000 ms"
+    )
+    , NOTIFICATION_STATUS("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_STATUS,
+        &SHINY_DETECTED_ENROUTE.NOTIFICATIONS,
+        &SHINY_DETECTED_DESTINATION.NOTIFICATIONS,
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_RECOVERABLE,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+{
+    PA_ADD_STATIC(SHINY_REQUIRES_AUDIO);
+    PA_ADD_OPTION(SHINY_DETECTED_ENROUTE);
+    PA_ADD_OPTION(SHINY_DETECTED_DESTINATION);
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+
+
+void CrobatFinder::run_iteration(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    // NOTE: there's no "stunned by alpha" detection in case any of the close ones are alphas!
+    CrobatFinder_Descriptor::Stats& stats = env.current_stats<CrobatFinder_Descriptor::Stats>();
+
+    stats.attempts++;
+
+    // program should be started right in front of the entrance
+    // so enter the sub region
+    env.console.log("Entering Wayward Cave...");
+    mash_A_to_enter_sub_area(env, env.console, context);
+
+    env.console.log("Beginning navigation to the Alpha Crobat...");
+    //  Switch to Wrydeer.
+    bool error = true;
+    MountDetector mount_detector;
+    for (size_t c = 0; c < 10; c++){
+        MountState mount = mount_detector.detect(env.console.video().snapshot());
+        if (mount == MountState::WYRDEER_OFF){
+            pbf_press_button(context, BUTTON_PLUS, 160ms, 840ms);
+            error = false;
+            break;
+        }
+        if (mount == MountState::WYRDEER_ON){
+            pbf_wait(context, 5000ms);
+            error = false;
+            break;
+        }
+        pbf_press_dpad(context, DPAD_LEFT, 160ms, 400ms);
+        context.wait_for_all_requests();
+    }
+    if (error){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "Unable to find Wyrdeer after 10 attempts.",
+            env.console
+        );
+    }
+
+    env.console.log("Beginning Shiny Detection...");
+    // start the shiny detection, there's nothing initially
+    {
+        float shiny_coefficient = 1.0;
+        std::atomic<OverworldShinyDetectedActionOption*> shiny_action(&SHINY_DETECTED_ENROUTE);
+        WallClock destination_time = WallClock::max();
+
+        ShinySoundDetector shiny_detector(env.console, [&](float error_coefficient) -> bool{
+            //  Warning: This callback will be run from a different thread than this function.
+            stats.shinies++;
+            shiny_coefficient = error_coefficient;
+            OverworldShinyDetectedActionOption* action = shiny_action.load(std::memory_order_acquire);
+            return on_shiny_callback(env, env.console, *action, error_coefficient);
+        });
+
+        int ret = run_until<ProControllerContext>(
+            env.console, context,
+            [&](ProControllerContext& context){
+
+                // FORWARD PORTION OF CAVE UNTIL LEDGE
+                pbf_press_button(context, BUTTON_B, 2200ms, 640ms); // wyrdeer sprint
+                pbf_move_left_joystick(context, {-1, 0},  80ms, 160ms); // turn left
+                pbf_press_button(context, BUTTON_ZL, 160ms, 400ms); // align camera
+
+                // ASCEND THE LEDGE WITH BRAVIARY
+                pbf_press_dpad(context, DPAD_RIGHT, 160ms, 400ms); // swap to braviary
+                pbf_wait(context, 600ms); // wait for the ascent
+                pbf_press_button(context, BUTTON_Y, 2400ms, 160ms); // descend to swap to Wyrdeer automatically
+
+                // TO CROBAT PORTION
+                pbf_press_button(context, BUTTON_B, 1050ms, 640ms); // sprint forward for a split second
+                pbf_move_left_joystick(context, {+1, -0.173}, 80ms, 160ms); // rotate slightly right
+                pbf_press_button(context, BUTTON_ZL, 160ms, 560ms); // align camera
+
+                context.wait_for_all_requests();
+                destination_time = current_time();
+                shiny_action.store(&SHINY_DETECTED_DESTINATION, std::memory_order_release);
+
+                pbf_move_left_joystick(context, {0, +1}, 3800ms, 0ms); // forward to crobat check
+
+            },
+            {{shiny_detector}}
+        );
+        shiny_detector.throw_if_no_sound();
+        if (ret == 0 || shiny_detector.last_detection() > destination_time){
+            OverworldShinyDetectedActionOption* action = shiny_action.load(std::memory_order_acquire);
+            on_shiny_sound(env, env.console, context, *action, shiny_coefficient);
+        }
+    };
+
+    // then reset since no shiny was found
+    env.console.log("No shiny detected, restarting the game!");
+
+    pbf_press_button(context, BUTTON_HOME, 160ms, GameSettings::instance().GAME_TO_HOME_DELAY0);
+    reset_game_from_home(env, env.console, context);
+}
+
+
+void CrobatFinder::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    CrobatFinder_Descriptor::Stats& stats = env.current_stats<CrobatFinder_Descriptor::Stats>();
+
+    //  Connect the controller.
+    require_player(env.console, context, BUTTON_LCLICK);
+
+    while (true){
+        env.update_stats();
+        send_program_status_notification(env, NOTIFICATION_STATUS);
+        try{
+            run_iteration(env, context);
+        }catch (OperationFailedExceptionWithScreenshot& e){
+            stats.errors++;
+            e.send_recoverable_error_notif_and_telemetry_report(env, NOTIFICATION_ERROR_RECOVERABLE);
+
+            pbf_press_button(context, BUTTON_HOME, 160ms, GameSettings::instance().GAME_TO_HOME_DELAY0);
+            reset_game_from_home(env, env.console, context);
+        }
+    }
+
+    env.update_stats();
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_CrobatFinder.h b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_CrobatFinder.h
new file mode 100644
index 0000000000..65f678da14
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_CrobatFinder.h
@@ -0,0 +1,54 @@
+/*  Alpha Crobat Hunter
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLA_CrobatFinder_H
+#define PokemonAutomation_PokemonLA_CrobatFinder_H
+
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "VideoGames/PokemonLA/Options/PokemonLA_ShinyDetectedAction.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+
+class CrobatFinder_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    CrobatFinder_Descriptor();
+
+    class Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+
+class CrobatFinder : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = CrobatFinder_Descriptor;
+    CrobatFinder();
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    void run_iteration(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+
+private:
+    ShinyRequiresAudioText SHINY_REQUIRES_AUDIO;
+
+    OverworldShinyDetectedActionOption SHINY_DETECTED_ENROUTE;
+    OverworldShinyDetectedActionOption SHINY_DETECTED_DESTINATION;
+
+    EventNotificationOption NOTIFICATION_STATUS;
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_FroslassFinder.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_FroslassFinder.cpp
new file mode 100644
index 0000000000..2ee63509b2
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_FroslassFinder.cpp
@@ -0,0 +1,210 @@
+/*  Alpha Froslass Finder
+*
+*  From: https://github.com/PokemonAutomation/
+*
+*/
+
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonLA/PokemonLA_Settings.h"
+#include "VideoGames/PokemonLA/PokemonLA_TravelLocations.h"
+#include "VideoGames/PokemonLA/Inference/Sounds/PokemonLA_ShinySoundDetector.h"
+#include "VideoGames/PokemonLA/Programs/PokemonLA_MountChange.h"
+#include "VideoGames/PokemonLA/Programs/PokemonLA_GameEntry.h"
+#include "VideoGames/PokemonLA/Programs/PokemonLA_RegionNavigation.h"
+#include "VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_FroslassFinder.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+    using namespace Pokemon;
+
+
+
+FroslassFinder_Descriptor::FroslassFinder_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonLA:AlphaFroslassFinder",
+        STRING_POKEMON + " LA", "Alpha Froslass Hunter",
+        "Programs/PokemonLA/AlphaFroslassHunter.html",
+        "Constantly reset to find a Alpha Froslass or any Shiny in the path.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::VIDEO_AUDIO,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+class FroslassFinder_Descriptor::Stats : public StatsTracker, public ShinyStatIncrementer{
+public:
+    Stats()
+        : attempts(m_stats["Attempts"])
+        , errors(m_stats["Errors"])
+        , shinies(m_stats["Shinies"])
+    {
+        m_display_order.emplace_back("Attempts");
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+        m_display_order.emplace_back("Shinies", HIDDEN_IF_ZERO);
+    }
+    virtual void add_shiny() override{
+        shinies++;
+    }
+
+    std::atomic<uint64_t>& attempts;
+    std::atomic<uint64_t>& errors;
+    std::atomic<uint64_t>& shinies;
+};
+std::unique_ptr<StatsTracker> FroslassFinder_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+
+
+FroslassFinder::FroslassFinder()
+    : DASH_DURATION0(
+        "<b>Braviary dash duration:</b><br>"
+        "How many ticks for Braviary to dash to reach the hole.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "7888"
+    )
+    , SHINY_DETECTED_ENROUTE(
+        "Enroute Shiny Action",
+        "This applies if a shiny is detected while enroute to the cave. (Does not ignore Misdreavus and Glalie)",
+        "0 ms"
+    )
+    , SHINY_DETECTED_DESTINATION(
+        "Destination Shiny Action",
+        "This applies if a shiny is detected at or near Froslass.",
+        "0 ms"
+    )
+    , NOTIFICATION_STATUS("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_STATUS,
+        &SHINY_DETECTED_ENROUTE.NOTIFICATIONS,
+        &SHINY_DETECTED_DESTINATION.NOTIFICATIONS,
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_RECOVERABLE,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+{
+    PA_ADD_STATIC(SHINY_REQUIRES_AUDIO);
+    PA_ADD_OPTION(DASH_DURATION0);
+    PA_ADD_OPTION(SHINY_DETECTED_ENROUTE);
+    PA_ADD_OPTION(SHINY_DETECTED_DESTINATION);
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+
+void FroslassFinder::run_iteration(
+    SingleSwitchProgramEnvironment& env, ProControllerContext& context,
+    bool fresh_from_reset
+){
+    FroslassFinder_Descriptor::Stats& stats = env.current_stats<FroslassFinder_Descriptor::Stats>();
+
+    stats.attempts++;
+
+    goto_camp_from_jubilife(
+        env, env.console, context,
+        TravelLocations::instance().Icelands_Arena,
+        fresh_from_reset
+    );
+
+    //Start path
+    env.console.log("Beginning Shiny Detection...");
+
+    //Setup
+    pbf_move_left_joystick(context, {-0.156, -1}, 160ms, 160ms);
+    pbf_press_button(context, BUTTON_ZL, 80ms, 80ms);
+    pbf_wait(context, 500ms);
+    change_mount(env.console, context, MountState::BRAVIARY_ON);
+    pbf_wait(context, 500ms);
+
+    {
+        float shiny_coefficient = 1.0;
+        std::atomic<OverworldShinyDetectedActionOption*> shiny_action(&SHINY_DETECTED_ENROUTE);
+        WallClock destination_time = WallClock::max();
+
+        ShinySoundDetector shiny_detector(env.console, [&](float error_coefficient) -> bool{
+            //  Warning: This callback will be run from a different thread than this function.
+            stats.shinies++;
+            shiny_coefficient = error_coefficient;
+            OverworldShinyDetectedActionOption* action = shiny_action.load(std::memory_order_acquire);
+            return on_shiny_callback(env, env.console, *action, error_coefficient);
+        });
+
+        int ret = run_until<ProControllerContext>(
+            env.console, context,
+            [&](ProControllerContext& context){
+                //  Route to cave entrance
+                pbf_press_button(context, BUTTON_B, 2000ms, 80ms);  //Get some distance from the moutain
+                pbf_press_button(context, BUTTON_Y, 4000ms, 80ms);  //Descend
+                pbf_press_button(context, BUTTON_B, DASH_DURATION0, 80ms);  //Reach to the cave entrance
+                pbf_wait(context, 500ms);
+                pbf_press_button(context, BUTTON_PLUS, 80ms, 80ms);
+                pbf_wait(context, 1100ms);
+                pbf_press_button(context, BUTTON_PLUS, 80ms, 80ms);
+                pbf_press_button(context, BUTTON_B, 2800ms, 80ms);  // Braviary Second Push
+
+                context.wait_for_all_requests();
+                destination_time = current_time();
+                shiny_action.store(&SHINY_DETECTED_DESTINATION, std::memory_order_release);
+
+                //  Move to Froslass
+                pbf_press_dpad(context, DPAD_LEFT, 160ms, 160ms);
+                pbf_press_button(context, BUTTON_B, 5000ms, 2000ms);
+                context.wait_for_all_requests();
+
+            },
+            {{shiny_detector}}
+        );
+        shiny_detector.throw_if_no_sound();
+        if (ret == 0 || shiny_detector.last_detection() > destination_time){
+            OverworldShinyDetectedActionOption* action = shiny_action.load(std::memory_order_acquire);
+            on_shiny_sound(env, env.console, context, *action, shiny_coefficient);
+        }
+    }
+
+    env.console.log("No shiny detected, Reset game!");
+    pbf_press_button(context, BUTTON_HOME, 160ms, GameSettings::instance().GAME_TO_HOME_DELAY0);
+    fresh_from_reset = reset_game_from_home(
+        env, env.console, context
+    );
+}
+
+
+void FroslassFinder::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    FroslassFinder_Descriptor::Stats& stats = env.current_stats<FroslassFinder_Descriptor::Stats>();
+
+    //  Connect the controller.
+    require_player(env.console, context, BUTTON_LCLICK);
+
+    bool fresh_from_reset = false;
+    while (true){
+        env.update_stats();
+        send_program_status_notification(env, NOTIFICATION_STATUS);
+        try{
+            run_iteration(env, context, fresh_from_reset);
+        }catch (OperationFailedExceptionWithScreenshot& e){
+            stats.errors++;
+            e.send_recoverable_error_notif_and_telemetry_report(env, NOTIFICATION_ERROR_RECOVERABLE);
+
+            pbf_press_button(context, BUTTON_HOME, 160ms, GameSettings::instance().GAME_TO_HOME_DELAY0);
+            fresh_from_reset = reset_game_from_home(
+                env, env.console, context
+            );
+        }
+    }
+
+    env.update_stats();
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+}
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_FroslassFinder.h b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_FroslassFinder.h
new file mode 100644
index 0000000000..1874c1c6de
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_FroslassFinder.h
@@ -0,0 +1,57 @@
+/*  Alpha Froslass Hunter
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLA_FroslassFinder_H
+#define PokemonAutomation_PokemonLA_FroslassFinder_H
+
+#include "Common/Cpp/Options/TimeDurationOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "VideoGames/PokemonLA/Options/PokemonLA_ShinyDetectedAction.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+class FroslassFinder_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    FroslassFinder_Descriptor();
+
+    class Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+class FroslassFinder : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = FroslassFinder_Descriptor;
+    FroslassFinder();
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    void run_iteration(
+        SingleSwitchProgramEnvironment& env, ProControllerContext& context,
+        bool fresh_from_reset
+    );
+
+private:
+    class RunRoute;
+
+    ShinyRequiresAudioText SHINY_REQUIRES_AUDIO;
+
+    MillisecondsOption DASH_DURATION0;
+
+    OverworldShinyDetectedActionOption SHINY_DETECTED_ENROUTE;
+    OverworldShinyDetectedActionOption SHINY_DETECTED_DESTINATION;
+
+    EventNotificationOption NOTIFICATION_STATUS;
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+}
+}
+}
+#endif
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_GalladeFinder.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_GalladeFinder.cpp
new file mode 100644
index 0000000000..d74a38a1a9
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_GalladeFinder.cpp
@@ -0,0 +1,201 @@
+/*  Alpha Gallade Hunter
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonLA/PokemonLA_Settings.h"
+#include "VideoGames/PokemonLA/Inference/Sounds/PokemonLA_ShinySoundDetector.h"
+#include "VideoGames/PokemonLA/Programs/PokemonLA_GameEntry.h"
+#include "VideoGames/PokemonLA/Programs/PokemonLA_RegionNavigation.h"
+#include "PokemonLA_GalladeFinder.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+    using namespace Pokemon;
+
+
+GalladeFinder_Descriptor::GalladeFinder_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonLA:GalladeFinder",
+        STRING_POKEMON + " LA", "Alpha Gallade Hunter",
+        "Programs/PokemonLA/AlphaGalladeHunter.html",
+        "Constantly reset the Snowpoint Temple to find Shiny Alpha Gallade.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::VIDEO_AUDIO,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+class GalladeFinder_Descriptor::Stats : public StatsTracker, public ShinyStatIncrementer{
+public:
+    Stats()
+        : attempts(m_stats["Attempts"])
+        , errors(m_stats["Errors"])
+        , shinies(m_stats["Shinies"])
+    {
+        m_display_order.emplace_back("Attempts");
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+        m_display_order.emplace_back("Shinies", HIDDEN_IF_ZERO);
+    }
+    virtual void add_shiny() override{
+        shinies++;
+    }
+
+    std::atomic<uint64_t>& attempts;
+    std::atomic<uint64_t>& errors;
+    std::atomic<uint64_t>& shinies;
+};
+std::unique_ptr<StatsTracker> GalladeFinder_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+
+GalladeFinder::GalladeFinder()
+    : SHINY_DETECTED_ENROUTE(
+        "Enroute Shiny Action",
+        "This applies if you are still traveling to the Gallade.",
+        "0 ms"
+    )
+    , SHINY_DETECTED_DESTINATION(
+        "Destination Shiny Action",
+        "This applies if you are near the Gallade.",
+        "0 ms"
+    )
+    , NOTIFICATION_STATUS("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_STATUS,
+        &SHINY_DETECTED_ENROUTE.NOTIFICATIONS,
+        &SHINY_DETECTED_DESTINATION.NOTIFICATIONS,
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_RECOVERABLE,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+{
+    PA_ADD_STATIC(SHINY_REQUIRES_AUDIO);
+    PA_ADD_OPTION(SHINY_DETECTED_ENROUTE);
+    PA_ADD_OPTION(SHINY_DETECTED_DESTINATION);
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+
+
+void GalladeFinder::run_iteration(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    // NOTE: there's no "stunned by alpha" detection in case the first spawn is an alpha!
+    // NOTE: there is also no mitigation for if you get attacked by a Kirlia if it hates you
+    GalladeFinder_Descriptor::Stats& stats = env.current_stats<GalladeFinder_Descriptor::Stats>();
+
+    stats.attempts++;
+
+    // program should be started right in front of the entrance
+    // so enter the sub region
+    env.console.log("Entering Snowpoint Temple...");
+    mash_A_to_enter_sub_area(env, env.console, context);
+
+    env.console.log("Beginning navigation to the Alpha Gallade...");
+    // start the shiny detection, there's nothing initially
+    env.console.log("Enabling Shiny Detection...");
+    {
+        float shiny_coefficient = 1.0;
+        std::atomic<OverworldShinyDetectedActionOption*> shiny_action(&SHINY_DETECTED_ENROUTE);
+        WallClock destination_time = WallClock::max();
+
+        ShinySoundDetector shiny_detector(env.console, [&](float error_coefficient) -> bool{
+            //  Warning: This callback will be run from a different thread than this function.
+            stats.shinies++;
+            shiny_coefficient = error_coefficient;
+            OverworldShinyDetectedActionOption* action = shiny_action.load(std::memory_order_acquire);
+            return on_shiny_callback(env, env.console, *action, error_coefficient);
+        });
+
+        int ret = run_until<ProControllerContext>(
+            env.console, context,
+            [&](ProControllerContext& context){
+                // forward portion
+                pbf_controller_state(context, BUTTON_LCLICK, DPAD_NONE, {0, +1}, {0, 0}, 6800ms); // forward while running until stairs, mash y a few times down the stairs
+                pbf_mash_button(context, BUTTON_Y, 2800ms); // roll down the stairs, recover stamina
+                pbf_controller_state(context, BUTTON_LCLICK, DPAD_NONE, {0, +1}, {0, 0}, 4000ms); // forward while sprinting again
+                pbf_mash_button(context, BUTTON_Y, 2000ms); // two mashes and then one y
+                pbf_controller_state(context, BUTTON_LCLICK, DPAD_NONE, {0, +1}, {0, 0}, 3800ms); // forward while sprinting again
+                // basic map layout is walk forward for a while, move right, run back, then align camera, then walk left then forward to Gallade
+
+                // right portion
+                pbf_move_left_joystick(context, {+1, 0}, 500ms, 0ms); // right alone
+                pbf_controller_state(context, BUTTON_LCLICK, DPAD_NONE, {+1, 0}, {0, 0}, 2400ms); // forward while running until stairs
+                pbf_mash_button(context, BUTTON_Y, 1800ms); // roll down the stairs, recover stamina
+                pbf_move_left_joystick(context, {+1, 0}, 1800ms, 160ms); // right alone
+
+                // down portion
+                // pbf_move_left_joystick(context, {0, -1}, 1900ms, 160ms); // OLD down
+                pbf_controller_state(context, BUTTON_LCLICK, DPAD_NONE, {0, -1}, {0, 0}, 1800ms);
+
+                // camera align
+                pbf_press_button(context, BUTTON_ZL, 160ms, 0ms); // camera align
+                pbf_wait(context, 560ms);
+
+                context.wait_for_all_requests();
+                destination_time = current_time();
+                shiny_action.store(&SHINY_DETECTED_DESTINATION, std::memory_order_release);
+
+                pbf_move_left_joystick(context, {-1, 0},  2000ms, 0ms); // left
+
+                // then forward left
+                pbf_move_left_joystick(context, {-1, +1}, 1100ms, 0ms);
+
+                pbf_controller_state(context, BUTTON_LCLICK, DPAD_NONE, {0, +1}, {0, 0}, 3500ms);   // forward while sprinting until stairs, mash y a few times down the stairs
+                // we should easily be in range of gallade at this point, so if there's no shiny we're done
+            },
+            {{shiny_detector}}
+        );
+        shiny_detector.throw_if_no_sound();
+        if (ret == 0 || shiny_detector.last_detection() > destination_time){
+            OverworldShinyDetectedActionOption* action = shiny_action.load(std::memory_order_acquire);
+            on_shiny_sound(env, env.console, context, *action, shiny_coefficient);
+        }
+    };
+
+    // then reset
+    env.console.log("No shiny detected, restarting the game!");
+
+    pbf_press_button(context, BUTTON_HOME, 160ms, GameSettings::instance().GAME_TO_HOME_DELAY0);
+    reset_game_from_home(env, env.console, context);
+}
+
+
+void GalladeFinder::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    GalladeFinder_Descriptor::Stats& stats = env.current_stats<GalladeFinder_Descriptor::Stats>();
+
+    //  Connect the controller.
+    require_player(env.console, context, BUTTON_LCLICK);
+
+    while (true){
+        env.update_stats();
+        send_program_status_notification(env, NOTIFICATION_STATUS);
+        try{
+            run_iteration(env, context);
+        }catch (OperationFailedExceptionWithScreenshot& e){
+            stats.errors++;
+            e.send_recoverable_error_notif_and_telemetry_report(env, NOTIFICATION_ERROR_RECOVERABLE);
+
+            pbf_press_button(context, BUTTON_HOME, 160ms, GameSettings::instance().GAME_TO_HOME_DELAY0);
+            reset_game_from_home(env, env.console, context);
+        }
+    }
+
+    env.update_stats();
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_GalladeFinder.h b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_GalladeFinder.h
new file mode 100644
index 0000000000..4a6838029b
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_GalladeFinder.h
@@ -0,0 +1,54 @@
+/*  Alpha Gallade Hunter
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLA_GalladeFinder_H
+#define PokemonAutomation_PokemonLA_GalladeFinder_H
+
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "VideoGames/PokemonLA/Options/PokemonLA_ShinyDetectedAction.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+
+class GalladeFinder_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    GalladeFinder_Descriptor();
+
+    class Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+
+class GalladeFinder : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = GalladeFinder_Descriptor;
+    GalladeFinder();
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    void run_iteration(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+
+private:
+    ShinyRequiresAudioText SHINY_REQUIRES_AUDIO;
+
+    OverworldShinyDetectedActionOption SHINY_DETECTED_ENROUTE;
+    OverworldShinyDetectedActionOption SHINY_DETECTED_DESTINATION;
+
+    EventNotificationOption NOTIFICATION_STATUS;
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_PostMMOSpawnReset.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_PostMMOSpawnReset.cpp
new file mode 100644
index 0000000000..802b3b2238
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_PostMMOSpawnReset.cpp
@@ -0,0 +1,174 @@
+/*  Post MMO Spawn Reset
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonLA/PokemonLA_Settings.h"
+#include "VideoGames/PokemonLA/Inference/Sounds/PokemonLA_ShinySoundDetector.h"
+#include "VideoGames/PokemonLA/Programs/PokemonLA_GameEntry.h"
+#include "PokemonLA_PostMMOSpawnReset.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+    using namespace Pokemon;
+
+
+
+PostMMOSpawnReset_Descriptor::PostMMOSpawnReset_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonLA:PostMMOSpawnReset",
+        STRING_POKEMON + " LA", "Post-MMO Spawn Reset",
+        "Programs/PokemonLA/PostMMOSpawnReset.html",
+        "Constantly reset the spawn after MMO finishes.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::VIDEO_AUDIO,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+class PostMMOSpawnReset_Descriptor::Stats : public StatsTracker, public ShinyStatIncrementer{
+public:
+    Stats()
+        : attempts(m_stats["Attempts"])
+        , errors(m_stats["Errors"])
+        , shinies(m_stats["Shinies"])
+    {
+        m_display_order.emplace_back("Attempts");
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+        m_display_order.emplace_back("Shinies", HIDDEN_IF_ZERO);
+    }
+    virtual void add_shiny() override{
+        shinies++;
+    }
+
+    std::atomic<uint64_t>& attempts;
+    std::atomic<uint64_t>& errors;
+    std::atomic<uint64_t>& shinies;
+};
+std::unique_ptr<StatsTracker> PostMMOSpawnReset_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+
+PostMMOSpawnReset::PostMMOSpawnReset()
+    : TURN_DURATION0(
+        "<b>Camera Turn:</b><br>How many ticks to turn the camera. <br>Positive values for right turns. Negative values for left turns.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "0 ms"
+    )
+    , FORWARD_DURATION0(
+        "<b>Move Forward:</b><br>After turning the camera, how many ticks to move forward.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "0 ms"
+    )
+    , WAIT_DURATION0(
+        "<b>Wait Time:</b><br> Wait time after movement.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "5000 ms"
+    )
+    , SHINY_DETECTED("Shiny Detected Action", "", "0 ms")
+    , NOTIFICATION_STATUS("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_STATUS,
+        &SHINY_DETECTED.NOTIFICATIONS,
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_RECOVERABLE,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+{
+    PA_ADD_STATIC(SHINY_REQUIRES_AUDIO);
+    PA_ADD_OPTION(TURN_DURATION0);
+    PA_ADD_OPTION(FORWARD_DURATION0);
+    PA_ADD_OPTION(WAIT_DURATION0);
+    PA_ADD_OPTION(SHINY_DETECTED);
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+
+
+void PostMMOSpawnReset::run_iteration(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    PostMMOSpawnReset_Descriptor::Stats& stats = env.current_stats<PostMMOSpawnReset_Descriptor::Stats>();
+
+    // From game to Switch Home
+    pbf_press_button(context, BUTTON_HOME, 160ms, GameSettings::instance().GAME_TO_HOME_DELAY0);
+    {
+        float shiny_coefficient = 1.0;
+        ShinySoundDetector shiny_detector(env.console, [&](float error_coefficient) -> bool{
+            //  Warning: This callback will be run from a different thread than this function.
+            stats.shinies++;
+            shiny_coefficient = error_coefficient;
+            return on_shiny_callback(env, env.console, SHINY_DETECTED, error_coefficient);
+        });
+
+        int ret = run_until<ProControllerContext>(
+            env.console, context,
+            [this, &env](ProControllerContext& context){
+                reset_game_from_home(env, env.console, context);
+                env.console.log("Entered game! Checking shiny sound...");
+
+                // forward portion
+                if (TURN_DURATION0.get() > 0ms){
+                    pbf_move_right_joystick(context, {+1, 0}, TURN_DURATION0, 0ms);
+                }else if (TURN_DURATION0.get() < 0ms){
+                    pbf_move_right_joystick(context, {-1, 0}, -TURN_DURATION0.get(), 0ms);
+                }
+                
+                pbf_controller_state(context, BUTTON_LCLICK, DPAD_NONE, {0, +1}, {0, 0}, FORWARD_DURATION0);
+
+                pbf_wait(context, WAIT_DURATION0);
+
+                context.wait_for_all_requests();
+            },
+            {{shiny_detector}}
+        );
+        shiny_detector.throw_if_no_sound();
+        if (ret == 0){
+            on_shiny_sound(env, env.console, context, SHINY_DETECTED, shiny_coefficient);
+        }
+    }
+
+    stats.attempts++;
+    env.console.log("No shiny detected, restarting the game!");
+}
+
+
+void PostMMOSpawnReset::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    PostMMOSpawnReset_Descriptor::Stats& stats = env.current_stats<PostMMOSpawnReset_Descriptor::Stats>();
+
+    //  Connect the controller.
+    require_player(env.console, context, BUTTON_LCLICK);
+
+    while (true){
+        env.update_stats();
+        send_program_status_notification(env, NOTIFICATION_STATUS);
+        try{
+            run_iteration(env, context);
+        }catch (OperationFailedExceptionWithScreenshot& e){
+            stats.errors++;
+            e.send_recoverable_error_notif_and_telemetry_report(env, NOTIFICATION_ERROR_RECOVERABLE);
+
+            // run_iteration() restarts the game first then listens to shiny sound.
+            // If there is any error generated when the game is running and is caught here,
+            // we just do nothing to handle the error as in the next iteration of run_iteration()
+            // the game will be immediately restarted.
+        }
+    }
+
+    env.update_stats();
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_PostMMOSpawnReset.h b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_PostMMOSpawnReset.h
new file mode 100644
index 0000000000..2fc8aabaab
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_PostMMOSpawnReset.h
@@ -0,0 +1,58 @@
+/*  Post MMO Spawn Reset
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLA_PostMMOSpawnReset_H
+#define PokemonAutomation_PokemonLA_PostMMOSpawnReset_H
+
+#include "Common/Cpp/Options/TimeDurationOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "VideoGames/PokemonLA/Options/PokemonLA_ShinyDetectedAction.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+
+class PostMMOSpawnReset_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    PostMMOSpawnReset_Descriptor();
+
+    class Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+
+class PostMMOSpawnReset : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = PostMMOSpawnReset_Descriptor;
+    PostMMOSpawnReset();
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    void run_iteration(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+
+private:
+    ShinyRequiresAudioText SHINY_REQUIRES_AUDIO;
+
+    MillisecondsOption TURN_DURATION0;
+    MillisecondsOption FORWARD_DURATION0;
+    MillisecondsOption WAIT_DURATION0;
+
+    OverworldShinyDetectedActionOption SHINY_DETECTED;
+
+    EventNotificationOption NOTIFICATION_STATUS;
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_ShinyHunt-CustomPath.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_ShinyHunt-CustomPath.cpp
new file mode 100644
index 0000000000..922fdde45f
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_ShinyHunt-CustomPath.cpp
@@ -0,0 +1,337 @@
+/*  Shiny Hunt - Custom Path
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonLA/PokemonLA_Settings.h"
+#include "VideoGames/PokemonLA/Inference/Sounds/PokemonLA_ShinySoundDetector.h"
+#include "VideoGames/PokemonLA/Programs/PokemonLA_GameEntry.h"
+#include "VideoGames/PokemonLA/Programs/PokemonLA_RegionNavigation.h"
+#include "VideoGames/PokemonLA/Programs/PokemonLA_MountChange.h"
+#include "VideoGames/PokemonLA/Programs/PokemonLA_TimeOfDayChange.h"
+#include "PokemonLA_ShinyHunt-CustomPath.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+    using namespace Pokemon;
+
+
+ShinyHuntCustomPath_Descriptor::ShinyHuntCustomPath_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonLA:ShinyHunt-CustomPath",
+        STRING_POKEMON + " LA", "Shiny Hunt - Custom Path",
+        "Programs/PokemonLA/ShinyHunt-CustomPath.html",
+        "Repeatedly travel on a custom path to shiny hunt " + STRING_POKEMON + " around it.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_PerformanceClassSensitive,
+        FeedbackType::VIDEO_AUDIO,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+class ShinyHuntCustomPath_Descriptor::Stats : public StatsTracker, public ShinyStatIncrementer{
+public:
+    Stats()
+        : attempts(m_stats["Attempts"])
+        , errors(m_stats["Errors"])
+        , shinies(m_stats["Shinies"])
+    {
+        m_display_order.emplace_back("Attempts");
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+        m_display_order.emplace_back("Shinies", HIDDEN_IF_ZERO);
+    }
+    virtual void add_shiny() override{
+        shinies++;
+    }
+
+    std::atomic<uint64_t>& attempts;
+    std::atomic<uint64_t>& errors;
+    std::atomic<uint64_t>& shinies;
+};
+std::unique_ptr<StatsTracker> ShinyHuntCustomPath_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+
+ShinyHuntCustomPath::ShinyHuntCustomPath()
+    : TIME_OF_DAY(
+        "<b>Time of Day:</b><br>Reset time of day if <b>Reset Method</b> is Soft Reset. Use this to only hunt " + STRING_POKEMON
+        + " at day or night, or to avoid visual inference errors on white snow at daytime."
+    )
+    , RUNS_PER_TIME_RESET(
+        "<b>How Many Runs Before Resetting Time of Day:</b><br>To avoid too much time spent on resetting time of day, reset only every several runs.",
+        LockMode::LOCK_WHILE_RUNNING,
+        5, 1
+    )
+    , TEST_PATH(
+        "<b>Test Path:</b><br>Run the path immediately on the map to test it.",
+        LockMode::LOCK_WHILE_RUNNING,
+        false
+    )
+    , SHINY_DETECTED_ENROUTE(
+        "Enroute Shiny Action",
+        "This applies if a shiny is detected while you are ignoring shinies.",
+        "0 ms"
+    )
+    , SHINY_DETECTED_DESTINATION(
+        "Destination Shiny Action",
+        "This applies if a shiny is detected while you are listening for shinies.",
+        "0 ms"
+    )
+    , NOTIFICATION_STATUS("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_STATUS,
+        &SHINY_DETECTED_DESTINATION.NOTIFICATIONS,
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_RECOVERABLE,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+{
+
+    PA_ADD_STATIC(SHINY_REQUIRES_AUDIO);
+//    PA_ADD_OPTION(TRAVEL_LOCATION);
+    PA_ADD_OPTION(PATH);
+    PA_ADD_OPTION(RESET_METHOD);
+    PA_ADD_OPTION(TIME_OF_DAY);
+    PA_ADD_OPTION(RUNS_PER_TIME_RESET);
+    PA_ADD_OPTION(TEST_PATH);
+    PA_ADD_OPTION(SHINY_DETECTED_ENROUTE);
+    PA_ADD_OPTION(SHINY_DETECTED_DESTINATION);
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+
+void ShinyHuntCustomPath::do_non_listen_action(
+    VideoStream& stream, ProControllerContext& context,
+    const CustomPathTableRow& row
+){
+    stream.log("Execute action " + row.action.current_display());
+    switch(row.action){
+    case PathAction::CHANGE_MOUNT:{
+        MountState mountState = MountState::NOTHING;
+        switch(row.parameters.mount){
+        case PathMount::WYRDEER:
+            mountState = MountState::WYRDEER_ON;
+            break;
+        case PathMount::URSALUNA:
+            mountState = MountState::URSALUNA_ON;
+            break;
+        case PathMount::BASCULEGION:
+            mountState = MountState::BASCULEGION_ON;
+            break;
+        case PathMount::SNEASLER:
+            mountState = MountState::SNEASLER_ON;
+            break;
+        case PathMount::BRAVIARY:
+            mountState = MountState::BRAVIARY_ON;
+            break;
+        default:
+            break;
+        }
+
+        if (mountState == MountState::NOTHING){
+            dismount(stream, context);
+        }else{
+            change_mount(stream, context, mountState);
+        }
+        break;
+    }
+    case PathAction::MOVE_FORWARD:{
+        switch(row.parameters.move_speed){
+        case PathSpeed::NORMAL_SPEED:
+            pbf_move_left_joystick(context, {0, +1}, row.parameters.move_forward, 0ms);
+            break;
+        case PathSpeed::SLOW_SPEED:
+            pbf_move_left_joystick(context, {0, +0.5}, row.parameters.move_forward, 0ms);
+            break;
+        case PathSpeed::RUN:
+            pbf_controller_state(context, BUTTON_LCLICK, DPAD_NONE, {0, +1}, {0, 0}, row.parameters.move_forward);
+            break;
+        case PathSpeed::DASH:
+            pbf_press_button(context, BUTTON_B, row.parameters.move_forward, 0ms);
+            break;
+        case PathSpeed::DASH_B_SPAM:
+            pbf_mash_button(context, BUTTON_B, row.parameters.move_forward);
+            break;
+        case PathSpeed::DIVE:
+            pbf_press_button(context, BUTTON_Y, row.parameters.move_forward, 0ms);
+            break;
+        }
+        break;
+    }
+    case PathAction::MOVE_IN_DIRECTION:{
+        pbf_move_left_joystick(
+            context,
+            {row.parameters.left_x, row.parameters.left_y},
+            row.parameters.move_forward,
+            0ms
+        );
+        break;
+    }
+    case PathAction::CENTER_CAMERA:{
+        pbf_mash_button(context, BUTTON_ZL, 1600ms);
+        break;
+    }
+    case PathAction::JUMP:{
+        pbf_press_button(context, BUTTON_Y, 80ms, row.parameters.jump_wait);
+        break;
+    }
+    case PathAction::WAIT:{
+        pbf_wait(context, row.parameters.wait);
+        break;
+    }
+    default:
+        break;
+    } // end switch action
+    context.wait_for_all_requests();
+}
+
+
+void ShinyHuntCustomPath::run_path(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+
+    std::vector<std::unique_ptr<CustomPathTableRow>> table = PATH.PATH.copy_snapshot();
+
+    //  Check whether the user has set shiny sound listen action:
+    {
+        bool has_listen_action = false;
+        for (const std::unique_ptr<CustomPathTableRow>& row : table){
+            if (row->action == PathAction::START_LISTEN){
+                has_listen_action = true;
+                break;
+            }
+        }
+        if (has_listen_action == false){
+            throw UserSetupError(env.console, "No START LISTEN action specified.");
+        }
+    }
+
+    ShinyHuntCustomPath_Descriptor::Stats& stats = env.current_stats<ShinyHuntCustomPath_Descriptor::Stats>();
+
+    std::atomic<bool> listen_for_shiny(false);
+    float shiny_coefficient = 1.0;
+    OverworldShinyDetectedActionOption* shiny_action = nullptr;
+    ShinySoundDetector shiny_detector(env.console, [&](float error_coefficient) -> bool{
+        //  Warning: This callback will be run from a different thread than this function.
+        stats.shinies++;
+        shiny_coefficient = error_coefficient;
+        if (listen_for_shiny.load(std::memory_order_acquire)){
+            shiny_action = &SHINY_DETECTED_DESTINATION;
+        }else{
+            shiny_action = &SHINY_DETECTED_ENROUTE;
+        }
+        return on_shiny_callback(env, env.console, *shiny_action, error_coefficient);
+    });
+
+    int ret = run_until<ProControllerContext>(
+        env.console, context,
+        [&](ProControllerContext& context){
+            for (const std::unique_ptr<CustomPathTableRow>& row : table){
+                if (row->action == PathAction::START_LISTEN){
+                    listen_for_shiny.store(true, std::memory_order_release);
+                    continue;
+                }else if (row->action == PathAction::END_LISTEN){
+                    listen_for_shiny.store(false, std::memory_order_release);
+                    continue;
+                }
+
+                do_non_listen_action(env.console, context, *row);
+                context.wait_for_all_requests();
+            }
+        },
+        {{shiny_detector}}
+    );
+    shiny_detector.throw_if_no_sound();
+    if (ret == 0){
+        on_shiny_sound(env, env.console, context, *shiny_action, shiny_coefficient);
+    }
+}
+
+
+void ShinyHuntCustomPath::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    ShinyHuntCustomPath_Descriptor::Stats& stats = env.current_stats<ShinyHuntCustomPath_Descriptor::Stats>();
+
+    //  Connect the controller.
+    require_player(env.console, context, BUTTON_LCLICK);
+
+    if (TEST_PATH){
+        // Run the test path immediately
+        env.log("Testing path...");
+        run_path(env, context);
+        return;
+    }
+
+    // How many runs so far after last time reset
+    uint32_t time_reset_run_count = 0;
+
+    bool fresh_from_reset = false;
+    while (true){
+        env.update_stats();
+        send_program_status_notification(env, NOTIFICATION_STATUS);
+        try{
+            stats.attempts++;
+
+            const TravelLocation location = PATH.travel_location();
+            goto_camp_from_jubilife(env, env.console, context, location, fresh_from_reset);
+            run_path(env, context);
+            ++time_reset_run_count;
+
+            if(RESET_METHOD == ResetMethod::SoftReset){
+                env.console.log("Resetting by closing the game.");
+                pbf_press_button(context, BUTTON_HOME, 160ms, GameSettings::instance().GAME_TO_HOME_DELAY0);
+                fresh_from_reset = reset_game_from_home(
+                    env, env.console, context
+                );
+            }else{
+                env.console.log("Resetting by going to village.");
+                goto_camp_from_overworld(env, env.console, context);
+
+                // Now we are at this camp
+                const Camp camp = map_region_default_camp(location.region);
+                TimeOfDay target_time = TIME_OF_DAY;
+                if (target_time != TimeOfDay::NONE && time_reset_run_count >= RUNS_PER_TIME_RESET){
+                    env.log("Reset time to " + TIME_OF_DAY_NAMES[int(target_time)]);
+                    time_reset_run_count = 0;
+                    change_time_of_day_at_tent(env.console, context, target_time, camp);
+                    // Reset location again since we now are at the tent, not the camp warp spot
+                    goto_camp_from_overworld(env, env.console, context);
+                }
+                goto_professor(env.console.logger(), context, camp);
+                from_professor_return_to_jubilife(env, env.console, context);
+            }
+
+        }catch (OperationFailedExceptionWithScreenshot& e){
+            stats.errors++;
+            e.send_recoverable_error_notif_and_telemetry_report(env, NOTIFICATION_ERROR_RECOVERABLE);
+
+            time_reset_run_count = 0;
+            pbf_press_button(context, BUTTON_HOME, 160ms, GameSettings::instance().GAME_TO_HOME_DELAY0);
+            fresh_from_reset = reset_game_from_home(
+                env, env.console, context
+            );
+        }
+
+    }
+
+    env.update_stats();
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+}
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_ShinyHunt-CustomPath.h b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_ShinyHunt-CustomPath.h
new file mode 100644
index 0000000000..12308c5e09
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_ShinyHunt-CustomPath.h
@@ -0,0 +1,75 @@
+/*  Shiny Hunt - Custom Path
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLA_ShinyHuntCustomPath_H
+#define PokemonAutomation_PokemonLA_ShinyHuntCustomPath_H
+
+#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "VideoGames/PokemonLA/Options/PokemonLA_MiscOptions.h"
+#include "VideoGames/PokemonLA/Options/PokemonLA_ShinyDetectedAction.h"
+#include "VideoGames/PokemonLA/Options/PokemonLA_CustomPathTable.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+
+
+class ShinyHuntCustomPath_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    ShinyHuntCustomPath_Descriptor();
+
+    class Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+
+class ShinyHuntCustomPath : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = ShinyHuntCustomPath_Descriptor;
+    ShinyHuntCustomPath();
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    // Run the custom path on overworld.
+    void run_path(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+
+    // Do one action (while ignoring listen-related actions)
+    void do_non_listen_action(
+        VideoStream& stream, ProControllerContext& context,
+        const CustomPathTableRow& row
+    );
+
+private:
+    ShinyRequiresAudioText SHINY_REQUIRES_AUDIO;
+
+    CustomPathTableFromJubilife PATH;
+
+    ResetMethodOption RESET_METHOD;
+
+    TimeOfDayOption TIME_OF_DAY;
+    SimpleIntegerOption<uint32_t> RUNS_PER_TIME_RESET;
+
+    BooleanCheckBoxOption TEST_PATH;
+
+    OverworldShinyDetectedActionOption SHINY_DETECTED_ENROUTE;
+    OverworldShinyDetectedActionOption SHINY_DETECTED_DESTINATION;
+
+    EventNotificationOption NOTIFICATION_STATUS;
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_ShinyHunt-FlagPin.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_ShinyHunt-FlagPin.cpp
new file mode 100644
index 0000000000..fea1227cd8
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_ShinyHunt-FlagPin.cpp
@@ -0,0 +1,222 @@
+/*  Shiny Hunt - Fixed Point
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonLA/PokemonLA_Settings.h"
+#include "VideoGames/PokemonLA/Inference/Sounds/PokemonLA_ShinySoundDetector.h"
+#include "VideoGames/PokemonLA/Programs/PokemonLA_GameEntry.h"
+#include "VideoGames/PokemonLA/Programs/PokemonLA_RegionNavigation.h"
+#include "VideoGames/PokemonLA/Programs/PokemonLA_FlagNavigationAir.h"
+#include "PokemonLA_ShinyHunt-FlagPin.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+    using namespace Pokemon;
+
+
+
+ShinyHuntFlagPin_Descriptor::ShinyHuntFlagPin_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonLA:ShinyHunt-FlagPin",
+        STRING_POKEMON + " LA", "Shiny Hunt - Flag Pin",
+        "Programs/PokemonLA/ShinyHunt-FlagPin.html",
+        "Repeatedly travel to a flag pin to shiny hunt " + STRING_POKEMON + " around it.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::VIDEO_AUDIO,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+class ShinyHuntFlagPin_Descriptor::Stats : public StatsTracker, public ShinyStatIncrementer{
+public:
+    Stats()
+        : attempts(m_stats["Attempts"])
+        , errors(m_stats["Errors"])
+        , shinies(m_stats["Shinies"])
+    {
+        m_display_order.emplace_back("Attempts");
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+        m_display_order.emplace_back("Shinies", HIDDEN_IF_ZERO);
+    }
+    virtual void add_shiny() override{
+        shinies++;
+    }
+
+    std::atomic<uint64_t>& attempts;
+    std::atomic<uint64_t>& errors;
+    std::atomic<uint64_t>& shinies;
+};
+std::unique_ptr<StatsTracker> ShinyHuntFlagPin_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+
+ShinyHuntFlagPin::ShinyHuntFlagPin()
+    : ENROUTE_DISTANCE(
+        "<b>Enroute Distance:</b><br>"
+        "You are considered \"enroute\" if you are further than this distance from the flag.<br><br>"
+        "<font color=\"red\">If you wish to ignore enroute shinies, scroll down to "
+        "\"Enroute Shiny Action\" and set it to ignore shinies. "
+        "Keep in mind that the shiny sound radius is 30 and you will need some headroom.</font>",
+        LockMode::LOCK_WHILE_RUNNING,
+        60
+    )
+    , SHINY_DETECTED_ENROUTE(
+        "Enroute Shiny Action",
+        "This applies if a shiny is detected while enroute to the flag. (defined as being more than the \"Enroute Distance\" specified above)",
+        "0 ms"
+    )
+    , SHINY_DETECTED_DESTINATION(
+        "Destination Shiny Action",
+        "This applies if a shiny is detected at or near the flag. (defined as being less than the \"Enroute Distance\" specified above)",
+        "0 ms"
+    )
+    , NOTIFICATION_STATUS("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_STATUS,
+        &SHINY_DETECTED_ENROUTE.NOTIFICATIONS,
+        &SHINY_DETECTED_DESTINATION.NOTIFICATIONS,
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_RECOVERABLE,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+    , m_advanced_options(
+        "<font size=4><b>Advanced Options:</b> You should not need to touch anything below here.</font>"
+    )
+    , STOP_DISTANCE(
+        "<b>Stop Distance:</b><br>"
+        "Reset the game when you come within this distance of the flag. "
+        "Don't set this too small. The navigation is not precise enough to land directly on the flag.",
+        LockMode::LOCK_WHILE_RUNNING,
+        20
+    )
+    , FLAG_REACHED_DELAY(
+        "<b>Target Reached Delay:</b><br>"
+        "Once you have reached the flag, wait this many seconds to ensure everything loads and that any shinies are heard before resetting.",
+        LockMode::LOCK_WHILE_RUNNING,
+        1.0, 0, 60
+    )
+    , NAVIGATION_TIMEOUT(
+        "<b>Navigation Timeout:</b><br>Give up and reset if flag is not reached after this many seconds.",
+        LockMode::LOCK_WHILE_RUNNING,
+        180, 0
+    )
+{
+    PA_ADD_STATIC(SHINY_REQUIRES_AUDIO);
+    PA_ADD_OPTION(TRAVEL_LOCATION);
+    PA_ADD_OPTION(ENROUTE_DISTANCE);
+    PA_ADD_OPTION(RESET_METHOD);
+    PA_ADD_OPTION(SHINY_DETECTED_ENROUTE);
+    PA_ADD_OPTION(SHINY_DETECTED_DESTINATION);
+    PA_ADD_OPTION(NOTIFICATIONS);
+    PA_ADD_STATIC(m_advanced_options);
+    PA_ADD_OPTION(STOP_DISTANCE);
+    PA_ADD_OPTION(FLAG_REACHED_DELAY);
+    PA_ADD_OPTION(NAVIGATION_TIMEOUT);
+}
+
+
+
+void ShinyHuntFlagPin::run_iteration(
+    SingleSwitchProgramEnvironment& env, ProControllerContext& context,
+    bool& fresh_from_reset
+){
+    ShinyHuntFlagPin_Descriptor::Stats& stats = env.current_stats<ShinyHuntFlagPin_Descriptor::Stats>();
+    stats.attempts++;
+
+    {
+        std::atomic<double> flag_distance(10000);
+
+        float shiny_coefficient = 1.0;
+        OverworldShinyDetectedActionOption* shiny_action = nullptr;
+
+        ShinySoundDetector shiny_detector(env.console, [&](float error_coefficient) -> bool{
+            //  Warning: This callback will be run from a different thread than this function.
+            stats.shinies++;
+            shiny_coefficient = error_coefficient;
+            if (flag_distance.load(std::memory_order_acquire) <= ENROUTE_DISTANCE){
+                shiny_action = &SHINY_DETECTED_DESTINATION;
+            }else{
+                shiny_action = &SHINY_DETECTED_ENROUTE;
+            }
+            return on_shiny_callback(env, env.console, *shiny_action, error_coefficient);
+        });
+
+        int ret = run_until<ProControllerContext>(
+            env.console, context,
+            [&](ProControllerContext& context){
+                goto_camp_from_jubilife(env, env.console, context, TRAVEL_LOCATION, fresh_from_reset);
+                FlagNavigationAir session(
+                    env, env.console, context,
+                    STOP_DISTANCE,
+                    FLAG_REACHED_DELAY,
+                    std::chrono::seconds(NAVIGATION_TIMEOUT)
+                );
+                session.set_distance_callback([&](double distance){
+                    flag_distance.store(distance, std::memory_order_release);
+                });
+                session.run_session();
+            },
+            {{shiny_detector}}
+        );
+        shiny_detector.throw_if_no_sound();
+        if (ret == 0){
+            on_shiny_sound(env, env.console, context, *shiny_action, shiny_coefficient);
+        }
+
+        if(RESET_METHOD == ResetMethod::SoftReset){
+            env.console.log("Resetting by closing the game.");
+            pbf_press_button(context, BUTTON_HOME, 160ms, GameSettings::instance().GAME_TO_HOME_DELAY0);
+            fresh_from_reset = reset_game_from_home(env, env.console, context);
+        }else{
+            env.console.log("Resetting by going to village.");
+            goto_camp_from_overworld(env, env.console, context);
+            goto_professor(env.console.logger(), context, TRAVEL_LOCATION);
+            from_professor_return_to_jubilife(env, env.console, context);
+        }
+    }
+}
+
+
+void ShinyHuntFlagPin::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    ShinyHuntFlagPin_Descriptor::Stats& stats = env.current_stats<ShinyHuntFlagPin_Descriptor::Stats>();
+
+    //  Connect the controller.
+    require_player(env.console, context, BUTTON_LCLICK);
+
+    bool fresh_from_reset = false;
+    while (true){
+        env.update_stats();
+        send_program_status_notification(env, NOTIFICATION_STATUS);
+        try{
+            run_iteration(env, context, fresh_from_reset);
+        }catch (OperationFailedExceptionWithScreenshot& e){
+            stats.errors++;
+            e.send_recoverable_error_notif_and_telemetry_report(env, NOTIFICATION_ERROR_RECOVERABLE);
+
+            pbf_press_button(context, BUTTON_HOME, 160ms, GameSettings::instance().GAME_TO_HOME_DELAY0);
+            fresh_from_reset = reset_game_from_home(env, env.console, context);
+        }
+    }
+
+    env.update_stats();
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+}
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_ShinyHunt-FlagPin.h b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_ShinyHunt-FlagPin.h
new file mode 100644
index 0000000000..7ba9dd9b66
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_ShinyHunt-FlagPin.h
@@ -0,0 +1,72 @@
+/*  Shiny Hunt - Fixed Point
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLA_ShinyHuntFlagPin_H
+#define PokemonAutomation_PokemonLA_ShinyHuntFlagPin_H
+
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "Common/Cpp/Options/FloatingPointOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "VideoGames/PokemonLA/Options/PokemonLA_MiscOptions.h"
+#include "VideoGames/PokemonLA/Options/PokemonLA_ShinyDetectedAction.h"
+#include "VideoGames/PokemonLA/Options/PokemonLA_TravelLocation.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+
+class ShinyHuntFlagPin_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    ShinyHuntFlagPin_Descriptor();
+
+    class Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+
+class ShinyHuntFlagPin : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = ShinyHuntFlagPin_Descriptor;
+    ShinyHuntFlagPin();
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    void run_iteration(
+        SingleSwitchProgramEnvironment& env, ProControllerContext& context,
+        bool& fresh_from_reset
+    );
+
+private:
+    ShinyRequiresAudioText SHINY_REQUIRES_AUDIO;
+
+    WildTravelLocationOption TRAVEL_LOCATION;
+
+    SimpleIntegerOption<uint16_t> ENROUTE_DISTANCE;
+
+    ResetMethodOption RESET_METHOD;
+
+    OverworldShinyDetectedActionOption SHINY_DETECTED_ENROUTE;
+    OverworldShinyDetectedActionOption SHINY_DETECTED_DESTINATION;
+
+    EventNotificationOption NOTIFICATION_STATUS;
+    EventNotificationsOption NOTIFICATIONS;
+
+    SectionDividerOption m_advanced_options;
+    SimpleIntegerOption<uint16_t> STOP_DISTANCE;
+    FloatingPointOption FLAG_REACHED_DELAY;
+    SimpleIntegerOption<uint64_t> NAVIGATION_TIMEOUT;
+};
+
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_UnownFinder.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_UnownFinder.cpp
new file mode 100644
index 0000000000..a1fda8f9ae
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_UnownFinder.cpp
@@ -0,0 +1,208 @@
+/*  Unown Finder
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonLA/PokemonLA_Settings.h"
+#include "VideoGames/PokemonLA/PokemonLA_TravelLocations.h"
+#include "VideoGames/PokemonLA/Inference/Sounds/PokemonLA_ShinySoundDetector.h"
+#include "VideoGames/PokemonLA/Programs/PokemonLA_MountChange.h"
+#include "VideoGames/PokemonLA/Programs/PokemonLA_GameEntry.h"
+#include "VideoGames/PokemonLA/Programs/PokemonLA_RegionNavigation.h"
+#include "VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_UnownFinder.h"
+
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+    using namespace Pokemon;
+
+
+
+UnownFinder_Descriptor::UnownFinder_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonLA:UnownFinder",
+        STRING_POKEMON + " LA", "Unown Hunter",
+        "Programs/PokemonLA/UnownHunter.html",
+        "Constantly reset to find a Shiny Unown or any Shiny in the path.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::VIDEO_AUDIO,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+class UnownFinder_Descriptor::Stats : public StatsTracker, public ShinyStatIncrementer{
+public:
+    Stats()
+        : attempts(m_stats["Attempts"])
+        , errors(m_stats["Errors"])
+        , shinies(m_stats["Shinies"])
+    {
+        m_display_order.emplace_back("Attempts");
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+        m_display_order.emplace_back("Shinies", HIDDEN_IF_ZERO);
+    }
+    virtual void add_shiny() override{
+        shinies++;
+    }
+
+    std::atomic<uint64_t>& attempts;
+    std::atomic<uint64_t>& errors;
+    std::atomic<uint64_t>& shinies;
+};
+std::unique_ptr<StatsTracker> UnownFinder_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+
+
+
+UnownFinder::UnownFinder()
+    : SHINY_DETECTED_ENROUTE(
+        "Enroute Shiny Action",
+        "This applies if a shiny is detected while enroute to the ruins.",
+        "0 ms"
+    )
+    , SHINY_DETECTED_DESTINATION(
+        "Destination Shiny Action",
+        "This applies if a shiny is detected inside the ruins.",
+        "0 ms"
+    )
+    , NOTIFICATION_STATUS("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_STATUS,
+        &SHINY_DETECTED_ENROUTE.NOTIFICATIONS,
+        &SHINY_DETECTED_DESTINATION.NOTIFICATIONS,
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_RECOVERABLE,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+{
+    PA_ADD_STATIC(SHINY_REQUIRES_AUDIO);
+    PA_ADD_OPTION(SHINY_DETECTED_ENROUTE);
+    PA_ADD_OPTION(SHINY_DETECTED_DESTINATION);
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+
+void ruins_entrance_route(ProControllerContext& context){
+    pbf_wait(context, 500ms);
+    pbf_move_left_joystick(context, {+0.087, +0.062}, 80ms, 80ms);
+    pbf_wait(context, 1300ms);
+
+    pbf_press_button(context, BUTTON_B, 9500ms, 80ms);
+    pbf_wait(context, 800ms);
+    pbf_move_left_joystick(context, {-0.141, +0.297}, 160ms, 80ms);
+
+    pbf_press_dpad(context, DPAD_LEFT, 80ms, 80ms);
+    pbf_press_button(context, BUTTON_PLUS, 80ms, 80ms);
+}
+
+void enter_ruins(ProControllerContext& context){
+    pbf_press_button(context, BUTTON_B, 4000ms, 80ms);
+    pbf_wait(context, 1500ms);
+    pbf_move_left_joystick(context, {0, -1}, 80ms, 0ms);
+    pbf_press_button(context, BUTTON_B, 2000ms, 80ms);
+}
+
+
+void UnownFinder::run_iteration(
+    SingleSwitchProgramEnvironment& env, ProControllerContext& context,
+    bool fresh_from_reset
+){
+    UnownFinder_Descriptor::Stats& stats = env.current_stats<UnownFinder_Descriptor::Stats>();
+
+    stats.attempts++;
+
+    goto_camp_from_jubilife(
+        env, env.console, context,
+        TravelLocations::instance().Mirelands_Mirelands,
+        fresh_from_reset
+    );
+
+    change_mount(env.console, context, MountState::BRAVIARY_ON);
+
+    // Start path
+    env.console.log("Beginning Shiny Detection...");
+    {
+        float shiny_coefficient = 1.0;
+        std::atomic<OverworldShinyDetectedActionOption*> shiny_action(&SHINY_DETECTED_ENROUTE);
+        WallClock destination_time = WallClock::max();
+
+        ShinySoundDetector shiny_detector(env.console, [&](float error_coefficient) -> bool{
+            //  Warning: This callback will be run from a different thread than this function.
+            stats.shinies++;
+            shiny_coefficient = error_coefficient;
+            OverworldShinyDetectedActionOption* action = shiny_action.load(std::memory_order_acquire);
+            return on_shiny_callback(env, env.console, *action, error_coefficient);
+        });
+
+        int ret = run_until<ProControllerContext>(
+            env.console, context,
+            [&](ProControllerContext& context){
+                ruins_entrance_route(context);
+
+                context.wait_for_all_requests();
+                destination_time = current_time();
+                shiny_action.store(&SHINY_DETECTED_DESTINATION, std::memory_order_release);
+
+                enter_ruins(context);
+            },
+            {{shiny_detector}}
+        );
+        shiny_detector.throw_if_no_sound();
+        if (ret == 0 || shiny_detector.last_detection() > destination_time){
+            OverworldShinyDetectedActionOption* action = shiny_action.load(std::memory_order_acquire);
+            on_shiny_sound(env, env.console, context, *action, shiny_coefficient);
+        }
+    };
+
+    env.console.log("No shiny detected, returning to Jubilife!");
+    goto_camp_from_overworld(env, env.console, context);
+    pbf_press_dpad(context, DPAD_RIGHT, 80ms, 80ms);
+    goto_professor(env.console, context, Camp::MIRELANDS_MIRELANDS);
+    from_professor_return_to_jubilife(env, env.console, context);
+}
+
+
+void UnownFinder::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    UnownFinder_Descriptor::Stats& stats = env.current_stats<UnownFinder_Descriptor::Stats>();
+
+    //  Connect the controller.
+    require_player(env.console, context, BUTTON_LCLICK);
+
+
+    bool fresh_from_reset = false;
+    while (true){
+        env.update_stats();
+        send_program_status_notification(env, NOTIFICATION_STATUS);
+        try{
+            run_iteration(env, context, fresh_from_reset);
+        }catch (OperationFailedExceptionWithScreenshot& e){
+            stats.errors++;
+            e.send_recoverable_error_notif_and_telemetry_report(env, NOTIFICATION_ERROR_RECOVERABLE);
+
+            pbf_press_button(context, BUTTON_HOME, 160ms, GameSettings::instance().GAME_TO_HOME_DELAY0);
+            fresh_from_reset = reset_game_from_home(
+                env, env.console, context
+            );
+        }
+    }
+
+    env.update_stats();
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_UnownFinder.h b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_UnownFinder.h
new file mode 100644
index 0000000000..e0651f47d3
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_UnownFinder.h
@@ -0,0 +1,56 @@
+/*  Unown Hunter
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLA_UnownFinder_H
+#define PokemonAutomation_PokemonLA_UnownFinder_H
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "VideoGames/PokemonLA/Options/PokemonLA_ShinyDetectedAction.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+class UnownFinder_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    UnownFinder_Descriptor();
+
+    class Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+class UnownFinder : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = UnownFinder_Descriptor;
+    UnownFinder();
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    void run_iteration(
+        SingleSwitchProgramEnvironment& env, ProControllerContext& context,
+        bool fresh_from_reset
+    );
+
+private:
+    class RunRoute;
+
+    ShinyRequiresAudioText SHINY_REQUIRES_AUDIO;
+
+    OverworldShinyDetectedActionOption SHINY_DETECTED_ENROUTE;
+    OverworldShinyDetectedActionOption SHINY_DETECTED_DESTINATION;
+
+    EventNotificationOption NOTIFICATION_STATUS;
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/TestPrograms/PokemonLA_FlagNavigationTest.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/TestPrograms/PokemonLA_FlagNavigationTest.cpp
new file mode 100644
index 0000000000..4964cc6449
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/TestPrograms/PokemonLA_FlagNavigationTest.cpp
@@ -0,0 +1,78 @@
+/*  Flag Navigation Test
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonLA/Programs/PokemonLA_FlagNavigationAir.h"
+#include "PokemonLA_FlagNavigationTest.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+    using namespace Pokemon;
+
+
+FlagNavigationTest_Descriptor::FlagNavigationTest_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonLA:FlagNavigationTest",
+        STRING_POKEMON + " LA", "Flag Navigation Test",
+        "",
+        "Navigate to the flag pin.",
+        PanelQualityStanding::DEVELOPER,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+
+FlagNavigationTest::FlagNavigationTest()
+    : STOP_DISTANCE(
+        "<b>Stop Distance:</b><br>"
+        "You have reached the flag when you come within this distance of it. "
+        "Don't set this too small. The navigation is not precise enough to land directly on the flag.",
+        LockMode::LOCK_WHILE_RUNNING,
+        20
+    )
+    , FLAG_REACHED_DELAY(
+        "<b>Target Reached Delay:</b><br>"
+        "Once you have reached the flag, wait this many seconds to ensure everything loads and that any shinies are heard before resetting.",
+        LockMode::LOCK_WHILE_RUNNING,
+        1.0, 0, 60
+    )
+    , NAVIGATION_TIMEOUT(
+        "<b>Navigation Timeout:</b><br>Give up if flag is not reached after this many seconds.",
+        LockMode::LOCK_WHILE_RUNNING,
+        180, 0
+    )
+{
+    PA_ADD_OPTION(STOP_DISTANCE);
+    PA_ADD_OPTION(FLAG_REACHED_DELAY);
+    PA_ADD_OPTION(NAVIGATION_TIMEOUT);
+//    PA_ADD_OPTION(SHINY_DETECTED);
+}
+
+
+void FlagNavigationTest::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    //  Connect the controller.
+    require_player(env.console, context, BUTTON_LCLICK);
+
+    FlagNavigationAir session(
+        env, env.console, context,
+//        SHINY_DETECTED.stop_on_shiny(),
+        STOP_DISTANCE,
+        FLAG_REACHED_DELAY,
+        std::chrono::seconds(NAVIGATION_TIMEOUT)
+    );
+    session.run_session();
+
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/TestPrograms/PokemonLA_FlagNavigationTest.h b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/TestPrograms/PokemonLA_FlagNavigationTest.h
new file mode 100644
index 0000000000..aead0c0323
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/TestPrograms/PokemonLA_FlagNavigationTest.h
@@ -0,0 +1,47 @@
+/*  Flag Navigation Test
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLA_FlagNavigationTest_H
+#define PokemonAutomation_PokemonLA_FlagNavigationTest_H
+
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "Common/Cpp/Options/FloatingPointOption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+//#include "VideoGames/PokemonLA/Options/PokemonLA_ShinyDetectedAction.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+
+
+class FlagNavigationTest_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    FlagNavigationTest_Descriptor();
+};
+
+
+class FlagNavigationTest : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = FlagNavigationTest_Descriptor;
+    FlagNavigationTest();
+
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    SimpleIntegerOption<uint16_t> STOP_DISTANCE;
+    FloatingPointOption FLAG_REACHED_DELAY;
+
+    SimpleIntegerOption<uint64_t> NAVIGATION_TIMEOUT;
+//    ShinyDetectedActionOption SHINY_DETECTED;
+};
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/TestPrograms/PokemonLA_MountDetectionTest.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/TestPrograms/PokemonLA_MountDetectionTest.cpp
new file mode 100644
index 0000000000..d6c7208e15
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/TestPrograms/PokemonLA_MountDetectionTest.cpp
@@ -0,0 +1,51 @@
+/*  Mount Detection Test
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonTools/Async/InferenceSession.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonLA/Inference/PokemonLA_MountDetector.h"
+#include "PokemonLA_MountDetectionTest.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+    using namespace Pokemon;
+
+
+MountDetectionTest_Descriptor::MountDetectionTest_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonLA:MountDetectionTest",
+        STRING_POKEMON + " LA", "Mount Detection Test",
+        "",
+        "Test the mount detection in the bottom right corner.",
+        PanelQualityStanding::DEVELOPER,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::ENABLE_COMMANDS
+    )
+{}
+
+
+MountDetectionTest::MountDetectionTest(){
+    PA_ADD_OPTION(FAILED_ACTION);
+}
+
+
+void MountDetectionTest::program(SingleSwitchProgramEnvironment& env, CancellableScope& scope){
+    MountTracker tracker(env.console, FAILED_ACTION);
+    InferenceSession session(
+        scope, env.console,
+        {{tracker, std::chrono::seconds(1)}}
+    );
+    scope.wait_until_cancel();
+}
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/TestPrograms/PokemonLA_MountDetectionTest.h b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/TestPrograms/PokemonLA_MountDetectionTest.h
new file mode 100644
index 0000000000..a77c2150d3
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/TestPrograms/PokemonLA_MountDetectionTest.h
@@ -0,0 +1,41 @@
+/*  Mount Detection Test
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLA_MountDetectionTest_H
+#define PokemonAutomation_PokemonLA_MountDetectionTest_H
+
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "VideoGames/PokemonLA/Inference/PokemonLA_MountDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+
+
+class MountDetectionTest_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    MountDetectionTest_Descriptor();
+};
+
+
+class MountDetectionTest : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = MountDetectionTest_Descriptor;
+    MountDetectionTest();
+
+    virtual void program(SingleSwitchProgramEnvironment& env, CancellableScope& scope) override;
+
+private:
+    MountDetectorLoggingOption FAILED_ACTION;
+};
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/TestPrograms/PokemonLA_OverworldWatcher.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/TestPrograms/PokemonLA_OverworldWatcher.cpp
new file mode 100644
index 0000000000..c74182b514
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/TestPrograms/PokemonLA_OverworldWatcher.cpp
@@ -0,0 +1,69 @@
+/*  Shiny Hunt - Overworld Watcher
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonTools/Async/InferenceSession.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonLA/Inference/Objects/PokemonLA_BubbleDetector.h"
+#include "VideoGames/PokemonLA/Inference/Objects/PokemonLA_ArcDetector.h"
+#include "VideoGames/PokemonLA/Inference/Objects/PokemonLA_QuestMarkDetector.h"
+#include "VideoGames/PokemonLA/Inference/Objects/PokemonLA_FlagDetector.h"
+#include "PokemonLA_OverworldWatcher.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+using namespace Pokemon;
+
+
+OverworldWatcher_Descriptor::OverworldWatcher_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonLA:OverworldWatcher",
+        STRING_POKEMON + " LA", "Overworld Watcher",
+        "",
+        "This is a test program that simply observes the game and labels things of interest. "
+        "This program doesn't really do anything.",
+        PanelQualityStanding::DEVELOPER,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::ENABLE_COMMANDS
+    )
+{}
+
+
+OverworldWatcher::OverworldWatcher(){}
+
+
+void OverworldWatcher::program(SingleSwitchProgramEnvironment& env, CancellableScope& scope){
+    BubbleDetector bubbles;
+    ArcDetector arcs;
+    QuestMarkDetector quest_marks;
+    FlagDetector flags;
+
+    WhiteObjectWatcher watcher(
+        env.console,
+        {0, 0, 1, 1},
+        {
+            {bubbles, false},
+            {arcs, false},
+            {quest_marks, false},
+            {flags, false},
+        }
+    );
+
+    InferenceSession session(
+        scope, env.console,
+        {watcher}
+    );
+    scope.wait_until_cancel();
+}
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/TestPrograms/PokemonLA_OverworldWatcher.h b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/TestPrograms/PokemonLA_OverworldWatcher.h
new file mode 100644
index 0000000000..9c8844528f
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/TestPrograms/PokemonLA_OverworldWatcher.h
@@ -0,0 +1,38 @@
+/*  Overworld Watcher
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLA_OverworldWatcher_H
+#define PokemonAutomation_PokemonLA_OverworldWatcher_H
+
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+
+class OverworldWatcher_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    OverworldWatcher_Descriptor();
+};
+
+
+class OverworldWatcher : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = OverworldWatcher_Descriptor;
+    OverworldWatcher();
+
+    virtual void program(SingleSwitchProgramEnvironment& env, CancellableScope& scope) override;
+};
+
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/TestPrograms/PokemonLA_SoundListener.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/TestPrograms/PokemonLA_SoundListener.cpp
new file mode 100644
index 0000000000..1fbf297c8f
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/TestPrograms/PokemonLA_SoundListener.cpp
@@ -0,0 +1,219 @@
+/*  Sound Listener
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <float.h>
+#include <chrono>
+#include <cstring>
+#include <map>
+#include <iostream>
+#include <fstream>
+#include <sstream>
+#include "Common/Cpp/Exceptions.h"
+#include "Common/Cpp/Containers/AlignedVector.h"
+#include "Common/Cpp/Containers/AlignedVector.tpp"
+#include "CommonFramework/AudioPipeline/AudioFeed.h"
+#include "CommonFramework/AudioPipeline/AudioTemplate.h"
+#include "CommonTools/Audio/AudioTemplateCache.h"
+#include "CommonTools/Audio/SpectrogramMatcher.h"
+#include "CommonTools/Async/InferenceSession.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonLA/Inference/Sounds/PokemonLA_AlphaMusicDetector.h"
+#include "VideoGames/PokemonLA/Inference/Sounds/PokemonLA_AlphaRoarDetector.h"
+#include "VideoGames/PokemonLA/Inference/Sounds/PokemonLA_ItemDropSoundDetector.h"
+#include "VideoGames/PokemonLA/Inference/Sounds/PokemonLA_ShinySoundDetector.h"
+#include "PokemonLA_SoundListener.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+using namespace Pokemon;
+
+
+
+SoundListener_Descriptor::SoundListener_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonLA:SoundListener",
+        STRING_POKEMON + " LA", "Sound Listener",
+        "",
+        "Test sound detectors listening to audio stream.",
+        PanelQualityStanding::DEVELOPER,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::ENABLE_COMMANDS
+    )
+{}
+
+
+SoundListener::SoundListener()
+    : SOUND_TYPE("<b>Which Sound to Detect</b>",
+        {
+            {SoundType::Shiny,      "shiny",        "Shiny Sound"},
+            {SoundType::AlphaRoar,  "alpha-roar",   "Alpha Roar"},
+            {SoundType::AlphaMusic, "alpha-music",  "Alpha Music"},
+            {SoundType::ItemDrop,   "item-drop",    "Item Drop Sound"},
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        SoundType::Shiny
+    )
+    , STOP_ON_DETECTED_SOUND(
+        "<b>Stop on the detected sound</b><br>Stop program when the sound is detected.",
+        LockMode::LOCK_WHILE_RUNNING,
+        false
+    )
+{
+    PA_ADD_OPTION(SOUND_TYPE);
+    PA_ADD_OPTION(STOP_ON_DETECTED_SOUND);
+}
+
+
+// void search_alpha_roar_from_audio_dump();
+
+void SoundListener::program(SingleSwitchProgramEnvironment& env, CancellableScope& scope){
+    //  Connect the controller.
+    // pbf_move_right_joystick(context, {-1, -1}, 80ms, 0ms);
+
+    // search_alpha_roar_from_audio_dump();
+    // return;
+
+    std::cout << "Running audio test program." << std::endl;
+
+    std::unique_ptr<AudioInferenceCallback> detector;
+    auto action = [&](float error_coefficient) -> bool{
+        // This lambda function will be called when the sound is detected.
+        // Its return will determine whether to stop the program:
+        return STOP_ON_DETECTED_SOUND;
+    };
+
+    SoundType type = SOUND_TYPE;
+    switch (type){
+    case SoundType::Shiny:
+        detector = std::make_unique<ShinySoundDetector>(env.console, action);
+        break;
+    case SoundType::AlphaRoar:
+        detector = std::make_unique<AlphaRoarDetector>(env.console, action);
+        break;
+    case SoundType::AlphaMusic:
+        detector = std::make_unique<AlphaMusicDetector>(env.console, action);
+        break;
+    case SoundType::ItemDrop:
+        detector = std::make_unique<ItemDropSoundDetector>(env.console, action);
+        break;
+    default:
+        throw InternalProgramError(
+            &env.logger(), PA_CURRENT_FUNCTION,
+            "Not such sound detector as sound type " + std::to_string((size_t)type)
+        );
+    }
+
+    InferenceSession session(
+        scope, env.console,
+        {{*detector, std::chrono::milliseconds(20)}}
+    );
+    scope.wait_until_cancel();
+
+    std::cout << "Audio test program Sound listener finished." << std::endl;
+}
+
+
+// A function used to search for the alpha roar on LA audio dump.
+// But we didn't find the shound sound :P
+void search_alpha_roar_from_audio_dump(){
+
+    const size_t SAMPLE_RATE = 48000;
+
+    SpectrogramMatcher matcher(
+        "Alpha Roar",
+        AudioTemplateCache::instance().get_throw("PokemonLA/AlphaRoar", SAMPLE_RATE),
+        SpectrogramMatcher::Mode::RAW, SAMPLE_RATE,
+        100.0
+    );
+
+    // std::string file_listFile = "./scripts/short_audio_files.txt";
+    std::string file_listFile = "1.txt";
+    // std::string file_listFile = "./scripts/all_audio_files.txt";
+    std::ifstream fin(file_listFile.c_str());
+    std::vector<std::string> file_list;
+    while(!fin.eof()){
+        std::string line;
+        std::getline(fin, line);
+        file_list.push_back(line);
+        fin >> std::ws;
+    }
+    std::cout << "File num " << file_list.size() << std::endl;
+
+    std::map<float, std::string> closest_files;
+
+    std::ofstream fout("file_check_output.txt");
+
+    for (size_t fileIdx = 0; fileIdx < file_list.size(); fileIdx++){
+        matcher.clear();
+
+
+        const auto& path = file_list[fileIdx];
+        std::ostringstream os;
+        os << "File " << fileIdx << "/" << file_list.size() << " " << path << " ";
+        AudioTemplate audio = load_audio_template(path);
+        if (audio.num_windows() == 0){
+            os << "Fail" << std::endl;
+            fout << os.str();
+            std::cout << os.str() << std::flush;
+            continue;
+        }
+
+        // audio.scale(2.0);
+
+        os << "#W " << audio.num_windows() << " ";
+
+        // match!
+        float minScore = FLT_MAX;
+        std::vector<AudioSpectrum> new_spectrums;
+        size_t numStreamWindows = std::max(matcher.num_matched_windows(), audio.num_windows());
+        for (size_t audioIdx = 0; audioIdx < numStreamWindows; audioIdx++){
+            new_spectrums.clear();
+            AlignedVector<float> freqVector(audio.num_frequencies());
+            if (audioIdx < audio.num_windows()){
+                const float * freq = audio.get_window(audioIdx);
+                memcpy(freqVector.data(), freq, sizeof(float) * audio.num_frequencies());
+            }else{
+                // add zero-freq window
+            }
+            new_spectrums.emplace_back(
+                audioIdx, SAMPLE_RATE,
+                std::make_unique<AlignedVector<float>>(std::move(freqVector))
+            );
+            float score = matcher.match(new_spectrums);
+            minScore = std::min(score, minScore);
+        } // end audio Idx
+
+        os << "dist " << minScore << std::endl;
+        fout << os.str();
+        std::cout << os.str() << std::flush;
+
+        closest_files.emplace(minScore, path);
+    }
+
+    fout.close();
+
+    auto it = closest_files.begin();
+    std::cout << "--------------" << std::endl;
+    fout.open("file_check_output_sorted.txt");
+    for (int i = 0; it != closest_files.end(); i++, it++){
+        if (i < 40)
+            std::cout << it->first << ", " << it->second << std::endl;
+        fout << it->first << ", " << it->second << std::endl;
+    }
+    fout.close();
+    return;
+}
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/PokemonLA/Programs/TestPrograms/PokemonLA_SoundListener.h b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/TestPrograms/PokemonLA_SoundListener.h
similarity index 78%
rename from SerialPrograms/Source/PokemonLA/Programs/TestPrograms/PokemonLA_SoundListener.h
rename to SerialPrograms/Source/VideoGames/PokemonLA/Programs/TestPrograms/PokemonLA_SoundListener.h
index 2b0493efb0..8d1719bf1e 100644
--- a/SerialPrograms/Source/PokemonLA/Programs/TestPrograms/PokemonLA_SoundListener.h
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/TestPrograms/PokemonLA_SoundListener.h
@@ -1,6 +1,6 @@
 /*  Sound Listener
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *  
  *  Debug program to test all kinds of sound detectors.
  */
@@ -25,9 +25,10 @@ class SoundListener_Descriptor : public SingleSwitchProgramDescriptor{
 
 class SoundListener : public SingleSwitchProgramInstance{
 public:
+    using Descriptor = SoundListener_Descriptor;
     SoundListener();
 
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
+    virtual void program(SingleSwitchProgramEnvironment& env, CancellableScope& scope) override;
 
 private:
     enum class SoundType{
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Trading/PokemonLA_SelfBoxTrade.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Trading/PokemonLA_SelfBoxTrade.cpp
new file mode 100644
index 0000000000..d4f8c7fa66
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Trading/PokemonLA_SelfBoxTrade.cpp
@@ -0,0 +1,184 @@
+/*  Self Box Trade
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonFramework/ImageTools/ImageStats.h"
+#include "CommonTools/Images/SolidColorTest.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "Pokemon/Inference/Pokemon_NameReader.h"
+#include "PokemonLA_TradeRoutines.h"
+#include "PokemonLA_SelfBoxTrade.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+    using namespace Pokemon;
+
+
+
+
+SelfBoxTrade_Descriptor::SelfBoxTrade_Descriptor()
+    : MultiSwitchProgramDescriptor(
+        "PokemonLA:SelfBoxTrade",
+        STRING_POKEMON + " LA", "Self Box Trade",
+        "Programs/PokemonLA/SelfBoxTrade.html",
+        "Trade boxes across two Switches.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS,
+        2, 2, 2
+    )
+{}
+std::unique_ptr<StatsTracker> SelfBoxTrade_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new TradeStats());
+}
+
+
+
+SelfBoxTrade::SelfBoxTrade()
+    : LANGUAGE_LEFT(
+        "<b>Game Language of Left Switch:</b>",
+        Pokemon::PokemonNameReader::instance().languages(),
+        LockMode::LOCK_WHILE_RUNNING,
+        true
+    )
+    , LANGUAGE_RIGHT(
+        "<b>Game Language of Right Switch:</b>",
+        Pokemon::PokemonNameReader::instance().languages(),
+        LockMode::LOCK_WHILE_RUNNING,
+        true
+    )
+    , BOXES_TO_TRADE(
+        "<b>Number of Boxes to Trade:</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        2, 0, 32
+    )
+    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_STATUS_UPDATE,
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+{
+    PA_ADD_OPTION(LANGUAGE_LEFT);
+    PA_ADD_OPTION(LANGUAGE_RIGHT);
+    PA_ADD_OPTION(BOXES_TO_TRADE);
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+
+
+
+
+bool SelfBoxTrade::move_to_next(
+    MultiSwitchProgramEnvironment& env, CancellableScope& scope,
+    uint8_t& row, uint8_t& col
+){
+    //  Returns true if moved to next box.
+
+    env.log("Moving to next slot.");
+    if (col < 5){
+        env.run_in_parallel<ProController>(scope, [](ConsoleHandle& console, ProControllerContext& context){
+            pbf_press_dpad(context, DPAD_RIGHT, 160ms, 1120ms);
+        });
+        col++;
+        return false;
+    }
+    if (row < 4){
+        env.run_in_parallel<ProController>(scope, [](ConsoleHandle& console, ProControllerContext& context){
+            pbf_press_dpad(context, DPAD_RIGHT, 160ms, 840ms);
+            pbf_press_dpad(context, DPAD_RIGHT, 160ms, 840ms);
+            pbf_press_dpad(context, DPAD_DOWN, 160ms, 1120ms);
+        });
+        col = 0;
+        row++;
+        return false;
+    }
+    env.run_in_parallel<ProController>(scope, [](ConsoleHandle& console, ProControllerContext& context){
+        pbf_press_button(context, BUTTON_R, 160ms, 1840ms);
+        pbf_press_dpad(context, DPAD_RIGHT, 160ms, 840ms);
+        pbf_press_dpad(context, DPAD_RIGHT, 160ms, 840ms);
+        pbf_press_dpad(context, DPAD_DOWN, 160ms, 1120ms);
+    });
+    col = 0;
+    row = 0;
+    return true;
+}
+
+
+void SelfBoxTrade::program(MultiSwitchProgramEnvironment& env, CancellableScope& scope){
+    TradeStats& stats = env.current_stats<TradeStats>();
+
+    //  Connect both controllers.
+    env.run_in_parallel<ProController>(scope, [&](ConsoleHandle& console, ProControllerContext& context){
+        //  Connect the controller.
+        require_player(console, context, BUTTON_LCLICK);
+    });
+
+    uint8_t row = 0;
+    uint8_t col = 0;
+    for (uint8_t boxes = 0; boxes < BOXES_TO_TRADE;){
+        env.update_stats();
+        send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
+
+        //  Make sure both consoles have selected something.
+        std::atomic<bool> ok(true);
+        OverlayBoxScope box0(env.console(0), {0.925, 0.100, 0.014, 0.030});
+        OverlayBoxScope box1(env.console(1), {0.925, 0.100, 0.014, 0.030});
+        TradeNameReader name_reader0(env.console(0), env.console(0), LANGUAGE_LEFT);
+        TradeNameReader name_reader1(env.console(1), env.console(1), LANGUAGE_RIGHT);
+        env.run_in_parallel<ProController>(scope, [&](ConsoleHandle& console, ProControllerContext& context){
+            auto snapshot = console.video().snapshot();
+            ImageStats stats = image_stats(extract_box_reference(snapshot, box0));
+            bool is_ok = is_white(stats);
+            if (!is_ok){
+                console.log("Skipping empty slot.", COLOR_ORANGE);
+                ok.store(false, std::memory_order_release);
+                return;
+            }
+
+            std::string slug = (console.index() == 0 ? name_reader0 : name_reader1).read(snapshot);
+            if (slug == "machoke" || slug == "haunter" || slug == "graveler" || slug == "kadabra"){
+                console.log("Skipping trade evolution: " + slug, COLOR_RED);
+                ok.store(false, std::memory_order_release);
+                return;
+            }
+        });
+
+        if (ok.load(std::memory_order_acquire)){
+            //  Perform trade.
+            MultiConsoleErrorState error_state;
+            env.run_in_parallel<ProController>(scope, [&](ConsoleHandle& console, ProControllerContext& context){
+                trade_current_pokemon(console, context, error_state, stats);
+            });
+            stats.m_trades++;
+        }else{
+            stats.m_errors++;
+        }
+
+        //  Move to next slot.
+        if (move_to_next(env, scope, row, col)){
+            boxes++;
+        }
+    }
+
+    env.update_stats();
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+}
+
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/PokemonLA/Programs/Trading/PokemonLA_SelfBoxTrade.h b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Trading/PokemonLA_SelfBoxTrade.h
similarity index 85%
rename from SerialPrograms/Source/PokemonLA/Programs/Trading/PokemonLA_SelfBoxTrade.h
rename to SerialPrograms/Source/VideoGames/PokemonLA/Programs/Trading/PokemonLA_SelfBoxTrade.h
index a82a3a6740..5d7f29bfc9 100644
--- a/SerialPrograms/Source/PokemonLA/Programs/Trading/PokemonLA_SelfBoxTrade.h
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Trading/PokemonLA_SelfBoxTrade.h
@@ -1,6 +1,6 @@
 /*  Self Box Trade
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -8,8 +8,8 @@
 #define PokemonAutomation_PokemonLA_SelfBoxTrade_H
 
 #include "Common/Cpp/Options/SimpleIntegerOption.h"
-#include "CommonFramework/Options/LanguageOCROption.h"
 #include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "CommonTools/Options/LanguageOCROption.h"
 #include "NintendoSwitch/NintendoSwitch_MultiSwitchProgram.h"
 
 namespace PokemonAutomation{
@@ -28,6 +28,8 @@ class SelfBoxTrade_Descriptor : public MultiSwitchProgramDescriptor{
 
 class SelfBoxTrade : public MultiSwitchProgramInstance{
 public:
+    using Descriptor = SelfBoxTrade_Descriptor;
+
     SelfBoxTrade();
     virtual void program(MultiSwitchProgramEnvironment& env, CancellableScope& scope) override;
 
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Trading/PokemonLA_SelfTouchTrade.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Trading/PokemonLA_SelfTouchTrade.cpp
new file mode 100644
index 0000000000..db90307c97
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Trading/PokemonLA_SelfTouchTrade.cpp
@@ -0,0 +1,225 @@
+/*  Self Touch Trade
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Exceptions.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonFramework/ImageTools/ImageStats.h"
+#include "CommonFramework/Tools/ErrorDumper.h"
+#include "CommonTools/Images/SolidColorTest.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "Pokemon/Inference/Pokemon_NameReader.h"
+#include "PokemonLA_TradeRoutines.h"
+#include "PokemonLA_SelfTouchTrade.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+    using namespace Pokemon;
+
+
+
+SelfTouchTrade_Descriptor::SelfTouchTrade_Descriptor()
+    : MultiSwitchProgramDescriptor(
+        "PokemonLA:SelfTouchTrade",
+        STRING_POKEMON + " LA", "Self Touch Trade",
+        "Programs/PokemonLA/SelfTouchTrade.html",
+        "Repeatedly trade " + STRING_POKEMON + " between two local Switches to fill up research.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS,
+        2, 2, 2
+    )
+{}
+std::unique_ptr<StatsTracker> SelfTouchTrade_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new TradeStats());
+}
+
+
+
+SelfTouchTrade::SelfTouchTrade()
+    : LANGUAGE(
+        "<b>Game Language of the Hosting Switch:</b>",
+        Pokemon::PokemonNameReader::instance().languages(),
+        LockMode::LOCK_WHILE_RUNNING,
+        true
+    )
+    , HOSTING_SWITCH(
+        "<b>Host Switch:</b><br>This is the Switch hosting the " + STRING_POKEMON + " to be touch-traded to the other.",
+        {
+            {HostingSwitch::Switch0, "switch0", "Switch 0 (Left)"},
+            {HostingSwitch::Switch1, "switch1", "Switch 1 (Right)"},
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        HostingSwitch::Switch0
+    )
+    , BOXES_TO_TRADE(
+        "<b>Number of Boxes to Touch-Trade:</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        2, 0, 32
+    )
+    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_STATUS_UPDATE,
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+{
+    PA_ADD_OPTION(LANGUAGE);
+    PA_ADD_OPTION(HOSTING_SWITCH);
+    PA_ADD_OPTION(BOXES_TO_TRADE);
+    PA_ADD_OPTION(TRADE_COUNTS);
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+
+
+
+bool SelfTouchTrade::trade_one(
+    MultiSwitchProgramEnvironment& env, CancellableScope& scope,
+    std::map<std::string, SimpleIntegerCell<uint8_t>*>& trades_left
+){
+    TradeStats& stats = env.current_stats<TradeStats>();
+
+    ConsoleHandle& host = HOSTING_SWITCH == HostingSwitch::Switch0 ? env.console(0) : env.console(1);
+
+    //  Read the name and see if the receiver still needs it.
+    TradeNameReader name_reader(host, host, LANGUAGE);
+    VideoSnapshot snapshot = host.video().snapshot();
+    std::string slug = name_reader.read(snapshot);
+    auto iter = trades_left.find(slug);
+    if (iter == trades_left.end()){
+        host.log("Unable to read name. Moving on...", COLOR_RED);
+        stats.m_errors++;
+        dump_image(host, env.program_info(), "ReadName", snapshot);
+        return false;
+    }
+    uint8_t current_trades_left = iter->second->current_value();
+    if (current_trades_left <= 0){
+        host.log(STRING_POKEMON + " not needed anymore. Moving on...");
+        return false;
+    }
+    if (slug == "machoke" || slug == "haunter" || slug == "graveler" || slug == "kadabra"){
+        host.log("Skipping trade evolution: " + slug, COLOR_RED);
+        return false;
+    }
+
+    //  Perform trade.
+    host.log("\"" + slug + "\" - Trades Remaining: " + std::to_string(current_trades_left));
+#if 1
+    MultiConsoleErrorState error_state;
+    env.run_in_parallel<ProController>(scope, [&](ConsoleHandle& console, ProControllerContext& context){
+        trade_current_pokemon(console, context, error_state, stats);
+    });
+    stats.m_trades++;
+    iter->second->set(current_trades_left - 1);
+#else
+    env.wait_for(std::chrono::milliseconds(5000));
+    return false;
+#endif
+    scope.wait_for(std::chrono::milliseconds(500));
+
+    return true;
+}
+bool SelfTouchTrade::move_to_next(Logger& logger, ProControllerContext& host, uint8_t& row, uint8_t& col){
+    //  Returns true if moved to next box.
+
+    logger.log("Moving to next slot.");
+    if (col < 5){
+        pbf_press_dpad(host, DPAD_RIGHT, 160ms, 1120ms);
+        col++;
+        return false;
+    }
+    if (row < 4){
+        pbf_press_dpad(host, DPAD_RIGHT, 160ms, 840ms);
+        pbf_press_dpad(host, DPAD_RIGHT, 160ms, 840ms);
+        pbf_press_dpad(host, DPAD_DOWN, 160ms, 1120ms);
+        col = 0;
+        row++;
+        return false;
+    }
+    pbf_press_button(host, BUTTON_R, 160ms, 1840ms);
+    pbf_press_dpad(host, DPAD_RIGHT, 160ms, 840ms);
+    pbf_press_dpad(host, DPAD_RIGHT, 160ms, 840ms);
+    pbf_press_dpad(host, DPAD_DOWN, 160ms, 1120ms);
+    col = 0;
+    row = 0;
+    return true;
+}
+
+
+void SelfTouchTrade::program(MultiSwitchProgramEnvironment& env, CancellableScope& scope){
+    //  Build list of what's needed.
+    std::map<std::string, SimpleIntegerCell<uint8_t>*> trades_left;
+    for (StaticTableRow* item : TRADE_COUNTS.table()){
+        trades_left[item->slug()] = &static_cast<TradeCountTableRow&>(*item).count;
+    }
+
+    //  Connect both controllers.
+    env.run_in_parallel<ProController>(scope, [&](ConsoleHandle& console, ProControllerContext& context){
+        //  Connect the controller.
+        require_player(console, context, BUTTON_LCLICK);
+    });
+
+    uint8_t row = 0;
+    uint8_t col = 0;
+
+    bool host0 = HOSTING_SWITCH == HostingSwitch::Switch0;
+    ProControllerContext host_context(scope, (host0 ? env.console(0) : env.console(1)).controller<ProController>());
+    ConsoleHandle& host = host0 ? env.console(0) : env.console(1);
+    ConsoleHandle& recv = host0 ? env.console(1) : env.console(0);
+
+    for (uint8_t boxes = 0; boxes < BOXES_TO_TRADE;){
+        env.update_stats();
+        send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
+
+        //  Make sure both consoles have selected something.
+        bool host_ok, recv_ok;
+        OverlayBoxScope box0(host, {0.925, 0.100, 0.014, 0.030});
+        OverlayBoxScope box1(recv, {0.925, 0.100, 0.014, 0.030});
+        env.run_in_parallel<ProController>(scope, [&](ConsoleHandle& console, ProControllerContext& context){
+            ImageStats stats = image_stats(extract_box_reference(console.video().snapshot(), box0));
+            bool ok = is_white(stats);
+            if (host.index() == console.index()){
+                host_ok = ok;
+            }else{
+                recv_ok = ok;
+            }
+        });
+
+        if (!recv_ok){
+            throw UserSetupError(recv, "Receiving Switch has not selected a " + STRING_POKEMON + ".");
+        }
+
+        //  Perform trade.
+        bool traded = false;
+        if (host_ok){
+            traded = trade_one(env, scope, trades_left);
+        }else{
+            recv.log("Skipping empty slot on host...", COLOR_PURPLE);
+        }
+
+        //  Move to next slot.
+        if (!traded){
+            if (move_to_next(host, host_context, row, col)){
+                boxes++;
+            }
+            host_context.wait_for_all_requests();
+        }
+    }
+
+    env.update_stats();
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Trading/PokemonLA_SelfTouchTrade.h b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Trading/PokemonLA_SelfTouchTrade.h
new file mode 100644
index 0000000000..c08c5ff440
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Trading/PokemonLA_SelfTouchTrade.h
@@ -0,0 +1,67 @@
+/*  Self Touch Trade
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLA_SelfTouchTrade_H
+#define PokemonAutomation_PokemonLA_SelfTouchTrade_H
+
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "Common/Cpp/Options/EnumDropdownOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "CommonTools/Options/LanguageOCROption.h"
+#include "NintendoSwitch/NintendoSwitch_MultiSwitchProgram.h"
+#include "VideoGames/PokemonLA/Options/PokemonLA_TradeCountTable.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+
+class SelfTouchTrade_Descriptor : public MultiSwitchProgramDescriptor{
+public:
+    SelfTouchTrade_Descriptor();
+
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+
+class SelfTouchTrade : public MultiSwitchProgramInstance{
+public:
+    using Descriptor = SelfTouchTrade_Descriptor;
+
+    SelfTouchTrade();
+    virtual void program(MultiSwitchProgramEnvironment& env, CancellableScope& scope) override;
+
+private:
+    bool trade_one(
+        MultiSwitchProgramEnvironment& env, CancellableScope& scope,
+        std::map<std::string, SimpleIntegerCell<uint8_t>*>& trades_left
+    );
+    bool move_to_next(Logger& logger, ProControllerContext& host, uint8_t& row, uint8_t& col);
+
+private:
+    OCR::LanguageOCROption LANGUAGE;
+
+    enum class HostingSwitch{
+        Switch0,
+        Switch1
+    };
+    EnumDropdownOption<HostingSwitch> HOSTING_SWITCH;
+
+    SimpleIntegerOption<uint8_t> BOXES_TO_TRADE;
+    TradeCountTable TRADE_COUNTS;
+
+    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Trading/PokemonLA_TradeRoutines.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Trading/PokemonLA_TradeRoutines.cpp
new file mode 100644
index 0000000000..d6f904743c
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Trading/PokemonLA_TradeRoutines.cpp
@@ -0,0 +1,215 @@
+/*  Trade Routines
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Json/JsonValue.h"
+#include "Common/Cpp/Json/JsonArray.h"
+#include "CommonFramework/GlobalAutoPaths.h"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonFramework/Notifications/ProgramInfo.h"
+#include "CommonFramework/Tools/ErrorDumper.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "CommonTools/VisualDetectors/BlackScreenDetector.h"
+#include "CommonTools/VisualDetectors/ImageMatchDetector.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "Pokemon/Inference/Pokemon_NameReader.h"
+#include "VideoGames/PokemonLA/Inference/Objects/PokemonLA_ButtonDetector.h"
+#include "PokemonLA_TradeRoutines.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+
+
+TradeStats::TradeStats()
+    : m_trades(m_stats["Trades"])
+    , m_errors(m_stats["Errors"])
+{
+    m_display_order.emplace_back("Trades");
+    m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+}
+
+
+
+void trade_current_pokemon(
+    VideoStream& stream, ProControllerContext& context,
+    MultiConsoleErrorState& tracker,
+    TradeStats& stats
+){
+    tracker.check_unrecoverable_error(stream.logger());
+
+    context.wait_for_all_requests();
+    VideoSnapshot box_image = stream.video().snapshot();
+    ImageMatchWatcher box_detector(std::move(box_image.frame), {0.02, 0.15, 0.15, 0.80}, 50);
+
+    {
+        pbf_press_button(context, BUTTON_A, 160ms, 0ms);
+        context.wait_for_all_requests();
+        ButtonDetector detector(
+            stream.logger(), stream.overlay(),
+            ButtonType::ButtonA, ImageFloatBox(0.25, 0.15, 0.50, 0.75),
+            std::chrono::milliseconds(0), true
+        );
+        int ret = wait_until(
+            stream, context, std::chrono::seconds(120),
+            {{detector}}
+        );
+        if (ret < 0){
+            stats.m_errors++;
+            tracker.report_unrecoverable_error(stream, "Failed to detect trade select prompt after 2 minutes.");
+        }
+        stream.log("Detected trade prompt.");
+        context.wait_for(std::chrono::milliseconds(100));
+        tracker.check_unrecoverable_error(stream.logger());
+    }
+    {
+        pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+        context.wait_for_all_requests();
+        ButtonDetector detector(
+            stream.logger(), stream.overlay(),
+            ButtonType::ButtonA, ImageFloatBox(0.50, 0.52, 0.40, 0.10),
+            std::chrono::milliseconds(0), true
+        );
+        int ret = wait_until(
+            stream, context, std::chrono::seconds(10),
+            {{detector}}
+        );
+        if (ret < 0){
+            stats.m_errors++;
+            tracker.report_unrecoverable_error(stream, "Failed to detect trade confirm prompt after 10 seconds.");
+        }
+        stream.log("Detected trade confirm prompt.");
+        context.wait_for(std::chrono::milliseconds(100));
+        tracker.check_unrecoverable_error(stream.logger());
+    }
+
+    //  Start trade.
+    pbf_press_button(context, BUTTON_A, 160ms, 0ms);
+
+    //  Wait for black screen.
+    {
+        BlackScreenOverWatcher black_screen;
+        int ret = wait_until(
+            stream, context, std::chrono::minutes(2),
+            {{black_screen}}
+        );
+        if (ret < 0){
+            stats.m_errors++;
+            tracker.report_unrecoverable_error(stream, "Failed to detect start of trade after 2 minutes.");
+        }
+        stream.log("Detected start of trade.");
+        context.wait_for(std::chrono::milliseconds(100));
+        tracker.check_unrecoverable_error(stream.logger());
+    }
+
+    //  Mash B until 2nd black screen.
+    {
+        BlackScreenWatcher black_screen;
+        int ret = run_until<ProControllerContext>(
+            stream, context,
+            [](ProControllerContext& context){
+                pbf_mash_button(context, BUTTON_B, 120000ms);
+            },
+            {{black_screen}}
+        );
+        if (ret < 0){
+            stats.m_errors++;
+            tracker.report_unrecoverable_error(stream, "Failed to detect end of trade after 2 minutes.");
+        }
+        stream.log("Detected end of trade.");
+        context.wait_for(std::chrono::milliseconds(100));
+        tracker.check_unrecoverable_error(stream.logger());
+    }
+
+    //  Wait to return to box.
+    {
+        int ret = wait_until(
+            stream, context, std::chrono::minutes(2),
+            {{box_detector}}
+        );
+        if (ret < 0){
+            stats.m_errors++;
+//            box_image->save("ExpectedBox.png");
+            tracker.report_unrecoverable_error(stream, "Failed to return to box after 2 minutes after a trade.");
+        }
+        stream.log("Detected box. Trade completed.");
+        tracker.check_unrecoverable_error(stream.logger());
+    }
+}
+
+
+
+
+
+TradeNameReader::TradeNameReader(Logger& logger, VideoOverlay& overlay, Language language)
+    : m_logger(logger)
+    , m_language(language)
+    , m_box(overlay, {0.80, 0.155, 0.18, 0.05})
+{
+    std::string path = RESOURCE_PATH() + "Pokemon/Pokedex/Pokedex-Hisui.json";
+    JsonValue json = load_json_file(path);
+    JsonArray& array = json.to_array_throw(path);
+    for (auto& item : array){
+        m_slugs.insert(std::move(item.to_string_throw(path)));
+    }
+}
+
+std::string TradeNameReader::read(const ImageViewRGB32& screen) const{
+    ImageViewRGB32 image = extract_box_reference(screen, m_box);
+    OCR::StringMatchResult result = Pokemon::PokemonNameReader::instance().read_substring(
+        m_logger, m_language, image,
+        OCR::WHITE_TEXT_FILTERS()
+    );
+    result.clear_beyond_log10p(Pokemon::PokemonNameReader::MAX_LOG10P);
+
+    for (auto iter = result.results.begin(); iter != result.results.end();){
+        //  Remove from candidates if it's not in PLA.
+        if (m_slugs.find(iter->second.token) == m_slugs.end()){
+            iter = result.results.erase(iter);
+        }else{
+            ++iter;
+        }
+    }
+
+    if (result.results.size() != 1){
+        dump_image(m_logger, ProgramInfo(), "TradeNameReader", screen);
+        return "";
+    }
+
+    return std::move(result.results.begin()->second.token);
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Trading/PokemonLA_TradeRoutines.h b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Trading/PokemonLA_TradeRoutines.h
new file mode 100644
index 0000000000..8e41d8de4b
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/Trading/PokemonLA_TradeRoutines.h
@@ -0,0 +1,57 @@
+/*  Trade Routines
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLA_TradeRoutines_H
+#define PokemonAutomation_PokemonLA_TradeRoutines_H
+
+#include "CommonFramework/Language.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonFramework/Tools/VideoStream.h"
+#include "CommonTools/MultiConsoleErrors.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+
+namespace PokemonAutomation{
+    class ProgramEnvironment;
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+
+struct TradeStats : public StatsTracker{
+    TradeStats();
+    std::atomic<uint64_t>& m_trades;
+    std::atomic<uint64_t>& m_errors;
+};
+
+
+void trade_current_pokemon(
+    VideoStream& stream, ProControllerContext& context,
+    MultiConsoleErrorState& tracker,
+    TradeStats& stats
+);
+
+
+
+class TradeNameReader{
+public:
+    TradeNameReader(Logger& logger, VideoOverlay& overlay, Language language);
+
+    std::string read(const ImageViewRGB32& screen) const;
+
+private:
+    Logger& m_logger;
+    Language m_language;
+    OverlayBoxScope m_box;
+    std::set<std::string> m_slugs;
+};
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/PokemonLA/Resources/PokemonLA_AvailablePokemon.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Resources/PokemonLA_AvailablePokemon.cpp
similarity index 88%
rename from SerialPrograms/Source/PokemonLA/Resources/PokemonLA_AvailablePokemon.cpp
rename to SerialPrograms/Source/VideoGames/PokemonLA/Resources/PokemonLA_AvailablePokemon.cpp
index 8b01741bb3..3bd17592b9 100644
--- a/SerialPrograms/Source/PokemonLA/Resources/PokemonLA_AvailablePokemon.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Resources/PokemonLA_AvailablePokemon.cpp
@@ -1,11 +1,10 @@
 /*  Available Pokemon
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include "Common/Cpp/Exceptions.h"
-#include "CommonFramework/Globals.h"
 #include "Pokemon/Resources/Pokemon_PokemonNames.h"
 #include "PokemonLA_AvailablePokemon.h"
 
@@ -32,7 +31,7 @@ const std::vector<std::string>& MMO_FIRST_WAVE_SPRITE_SLUGS(){
 
 std::array<std::vector<std::string>, 5> load_MMO_first_wave_region_sprite_slugs(){
     std::array<std::vector<std::string>, 5> slugs;
-    for(int i = 0; i < 5; i++){
+    for (int i = 0; i < 5; i++){
         std::string filename = "PokemonLA/MMOFirstWaveSpriteList-" + std::to_string(i) + ".json";
         slugs[i] = Pokemon::load_pokemon_slug_json_list(filename.c_str());
     }
diff --git a/SerialPrograms/Source/PokemonLA/Resources/PokemonLA_AvailablePokemon.h b/SerialPrograms/Source/VideoGames/PokemonLA/Resources/PokemonLA_AvailablePokemon.h
similarity index 89%
rename from SerialPrograms/Source/PokemonLA/Resources/PokemonLA_AvailablePokemon.h
rename to SerialPrograms/Source/VideoGames/PokemonLA/Resources/PokemonLA_AvailablePokemon.h
index cdb758cae0..a8e31c7b8c 100644
--- a/SerialPrograms/Source/PokemonLA/Resources/PokemonLA_AvailablePokemon.h
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Resources/PokemonLA_AvailablePokemon.h
@@ -1,6 +1,6 @@
 /*  Available Pokemon
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/PokemonLA/Resources/PokemonLA_NameDatabase.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Resources/PokemonLA_NameDatabase.cpp
similarity index 92%
rename from SerialPrograms/Source/PokemonLA/Resources/PokemonLA_NameDatabase.cpp
rename to SerialPrograms/Source/VideoGames/PokemonLA/Resources/PokemonLA_NameDatabase.cpp
index 2345e8d939..383c2fd922 100644
--- a/SerialPrograms/Source/PokemonLA/Resources/PokemonLA_NameDatabase.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Resources/PokemonLA_NameDatabase.cpp
@@ -1,6 +1,6 @@
 /*  Name Database
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Resources/PokemonLA_NameDatabase.h b/SerialPrograms/Source/VideoGames/PokemonLA/Resources/PokemonLA_NameDatabase.h
new file mode 100644
index 0000000000..eceff03b00
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Resources/PokemonLA_NameDatabase.h
@@ -0,0 +1,28 @@
+/*  Name Database
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLA_NameDatabase_H
+#define PokemonAutomation_PokemonLA_NameDatabase_H
+
+#include "CommonTools/Options/StringSelectOption.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+
+StringSelectDatabase make_name_database(const std::vector<std::string>& slugs);
+StringSelectDatabase make_name_database(const char* json_file_slugs);
+
+const StringSelectDatabase& ALL_POKEMON_NAMES();
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Resources/PokemonLA_PokemonInfo.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Resources/PokemonLA_PokemonInfo.cpp
new file mode 100644
index 0000000000..62fbd68735
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Resources/PokemonLA_PokemonInfo.cpp
@@ -0,0 +1,18 @@
+/*  Pokemon LA Info
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/PokemonLA/Resources/PokemonLA_PokemonInfo.h b/SerialPrograms/Source/VideoGames/PokemonLA/Resources/PokemonLA_PokemonInfo.h
similarity index 87%
rename from SerialPrograms/Source/PokemonLA/Resources/PokemonLA_PokemonInfo.h
rename to SerialPrograms/Source/VideoGames/PokemonLA/Resources/PokemonLA_PokemonInfo.h
index 20ccab6c49..446a00bc53 100644
--- a/SerialPrograms/Source/PokemonLA/Resources/PokemonLA_PokemonInfo.h
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Resources/PokemonLA_PokemonInfo.h
@@ -1,6 +1,6 @@
 /*  Pokemon LA Info
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/PokemonLA/Resources/PokemonLA_PokemonSprites.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Resources/PokemonLA_PokemonSprites.cpp
similarity index 84%
rename from SerialPrograms/Source/PokemonLA/Resources/PokemonLA_PokemonSprites.cpp
rename to SerialPrograms/Source/VideoGames/PokemonLA/Resources/PokemonLA_PokemonSprites.cpp
index c64b3d2a80..b061c547e3 100644
--- a/SerialPrograms/Source/PokemonLA/Resources/PokemonLA_PokemonSprites.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Resources/PokemonLA_PokemonSprites.cpp
@@ -1,6 +1,6 @@
 /*  Pokemon LA Icons
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Resources/PokemonLA_PokemonSprites.h b/SerialPrograms/Source/VideoGames/PokemonLA/Resources/PokemonLA_PokemonSprites.h
new file mode 100644
index 0000000000..870550fb70
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Resources/PokemonLA_PokemonSprites.h
@@ -0,0 +1,25 @@
+/*  Pokemon LA Sprites
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLA_PokemonSprites_H
+#define PokemonAutomation_PokemonLA_PokemonSprites_H
+
+#include "CommonTools/Resources/SpriteDatabase.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLA{
+
+// All pokemon sprites in LA
+const SpriteDatabase& ALL_POKEMON_SPRITES();
+
+// All icons of pokemon sprites in MMO
+const SpriteDatabase& ALL_MMO_SPRITES();
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/PokemonLA/Resources/PokemonLA_WeatherAndTimeIcons.cpp b/SerialPrograms/Source/VideoGames/PokemonLA/Resources/PokemonLA_WeatherAndTimeIcons.cpp
similarity index 84%
rename from SerialPrograms/Source/PokemonLA/Resources/PokemonLA_WeatherAndTimeIcons.cpp
rename to SerialPrograms/Source/VideoGames/PokemonLA/Resources/PokemonLA_WeatherAndTimeIcons.cpp
index 7d929b319b..51f4243f2b 100644
--- a/SerialPrograms/Source/PokemonLA/Resources/PokemonLA_WeatherAndTimeIcons.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Resources/PokemonLA_WeatherAndTimeIcons.cpp
@@ -1,12 +1,12 @@
 /*  Pokemon LA Weather And Time Icons
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include "CommonFramework/ImageMatch/ImageCropper.h"
+#include "CommonFramework/GlobalAutoPaths.h"
 #include "CommonFramework/ImageTypes/ImageRGB32.h"
-#include "CommonFramework/Globals.h"
+#include "CommonTools/ImageMatch/ImageCropper.h"
 #include "PokemonLA_WeatherAndTimeIcons.h"
 
 // #include <iostream>
@@ -19,7 +19,7 @@ std::array<ImageRGB32, NUM_WEATHER> BUILD_WEATHER_ICONS(){
     const std::string image_folder_path = RESOURCE_PATH() + "PokemonLA/Weather/";
 
     std::array<ImageRGB32, NUM_WEATHER> ret;
-    for(size_t i = 0; i < NUM_WEATHER; i++){
+    for (size_t i = 0; i < NUM_WEATHER; i++){
         const auto& weather_name = WEATHER_NAMES[i];
         const std::string image_path = image_folder_path + weather_name + ".png";
         // std::cout << image_path << std::endl;
@@ -41,7 +41,7 @@ std::array<ImageRGB32, NUM_TIMES_OF_DAY> BUILD_TIME_OF_DAY_ICONS(){
     const std::string image_folder_path = RESOURCE_PATH() + "PokemonLA/Time/";
 
     std::array<ImageRGB32, NUM_TIMES_OF_DAY> ret;
-    for(size_t i = 0; i < NUM_TIMES_OF_DAY; i++){
+    for (size_t i = 0; i < NUM_TIMES_OF_DAY; i++){
         // +1 here to skip TimeOfDay::NONE
         const auto& time_name = TIME_OF_DAY_NAMES[i+1];
         const std::string image_path = image_folder_path + time_name + ".png";
diff --git a/SerialPrograms/Source/PokemonLA/Resources/PokemonLA_WeatherAndTimeIcons.h b/SerialPrograms/Source/VideoGames/PokemonLA/Resources/PokemonLA_WeatherAndTimeIcons.h
similarity index 82%
rename from SerialPrograms/Source/PokemonLA/Resources/PokemonLA_WeatherAndTimeIcons.h
rename to SerialPrograms/Source/VideoGames/PokemonLA/Resources/PokemonLA_WeatherAndTimeIcons.h
index b735662fad..8aec3b971b 100644
--- a/SerialPrograms/Source/PokemonLA/Resources/PokemonLA_WeatherAndTimeIcons.h
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Resources/PokemonLA_WeatherAndTimeIcons.h
@@ -1,6 +1,6 @@
 /*  Pokemon LA Weather And Time Icons
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -9,7 +9,7 @@
 
 #include <array>
 #include <string>
-#include "PokemonLA/PokemonLA_WeatherAndTime.h"
+#include "VideoGames/PokemonLA/PokemonLA_WeatherAndTime.h"
 
 
 namespace PokemonAutomation{
diff --git a/SerialPrograms/Source/VideoGames/PokemonLGPE/Commands/PokemonLGPE_DateSpam.cpp b/SerialPrograms/Source/VideoGames/PokemonLGPE/Commands/PokemonLGPE_DateSpam.cpp
new file mode 100644
index 0000000000..61a8ad3cac
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLGPE/Commands/PokemonLGPE_DateSpam.cpp
@@ -0,0 +1,67 @@
+/*  Auto Host Routines
+ * 
+ *  From: https://github.com/PokemonAutomation/
+ * 
+ */
+
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "PokemonLGPE_DateSpam.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLGPE{
+
+void roll_date_forward_1(JoyconContext& context){
+    Milliseconds tv = context->timing_variation();
+    Milliseconds unit = 24ms + tv;
+
+    pbf_press_button(context, BUTTON_A, 2*unit, unit);
+    pbf_move_joystick(context, {0, +1}, 2*unit, unit);
+    pbf_press_button(context, BUTTON_A, 2*unit, unit);
+
+    pbf_move_joystick(context, {+1, 0}, 2*unit, unit);
+    pbf_move_joystick(context, {0, +1}, 2*unit, unit);
+    pbf_move_joystick(context, {+1, 0}, 2*unit, unit);
+    pbf_press_button(context, BUTTON_A, 2*unit, unit);
+    pbf_move_joystick(context, {+1, 0}, 2*unit, unit);
+    pbf_move_joystick(context, {+1, 0}, 2*unit, unit);
+    pbf_press_button(context, BUTTON_A, 2*unit, unit);
+}
+
+void roll_date_backward_N(JoyconContext& context, uint8_t skips){
+    if (skips == 0){
+        return;
+    }
+
+    Milliseconds tv = context->timing_variation();
+    Milliseconds unit = 24ms + tv;
+
+    pbf_press_button(context, BUTTON_A, 2*unit, unit);
+
+    for (uint8_t c = 0; c < skips - 1; c++){
+        pbf_move_joystick(context, {0, -1}, 2*unit, unit);
+    }
+
+    pbf_press_button(context, BUTTON_A, 2*unit, unit);
+    pbf_move_joystick(context, {+1, 0}, 2*unit, unit);
+
+    for (uint8_t c = 0; c < skips - 1; c++){
+        pbf_move_joystick(context, {0, -1}, 2*unit, unit);
+    }
+
+    pbf_press_button(context, BUTTON_A, 2*unit, unit);
+    pbf_move_joystick(context, {+1, 0}, 2*unit, unit);
+    pbf_move_joystick(context, {+1, 0}, 2*unit, unit);
+    pbf_press_button(context, BUTTON_A, 2*unit, unit);
+    pbf_press_button(context, BUTTON_A, 2*unit, unit);
+}
+
+
+
+
+
+}
+
+}
+}
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonLGPE/Commands/PokemonLGPE_DateSpam.h b/SerialPrograms/Source/VideoGames/PokemonLGPE/Commands/PokemonLGPE_DateSpam.h
new file mode 100644
index 0000000000..8f68aaca85
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLGPE/Commands/PokemonLGPE_DateSpam.h
@@ -0,0 +1,24 @@
+/*  Date Spamming Routines
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLGPE_Commands_DateSpam_H
+#define PokemonAutomation_PokemonLGPE_Commands_DateSpam_H
+
+#include "CommonFramework/Tools/VideoStream.h"
+#include "NintendoSwitch/Controllers/Joycon/NintendoSwitch_Joycon.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLGPE{
+
+void roll_date_forward_1                    (JoyconContext& context);
+void roll_date_backward_N                   (JoyconContext& context, uint8_t skips);
+
+}
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLGPE/Inference/Battles/PokemonLGPE_BattleArrowDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLGPE/Inference/Battles/PokemonLGPE_BattleArrowDetector.cpp
new file mode 100644
index 0000000000..0e02396af0
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLGPE/Inference/Battles/PokemonLGPE_BattleArrowDetector.cpp
@@ -0,0 +1,107 @@
+/*  Battle Arrow Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Containers/FixedLimitVector.tpp"
+#include "Kernels/Waterfill/Kernels_Waterfill_Session.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonTools/Images/BinaryImage_FilterRgb32.h"
+#include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h"
+#include "PokemonLGPE_BattleArrowDetector.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLGPE{
+
+
+FixedLimitVector<ImageMatch::WaterfillTemplateMatcher> make_battle_arrow_template(){
+    static constexpr size_t TOTAL_IMAGES = 8;
+    FixedLimitVector<ImageMatch::WaterfillTemplateMatcher> ret(TOTAL_IMAGES);
+    for (size_t c = 0; c < TOTAL_IMAGES; c++){
+        ret.emplace_back(
+            ("PokemonLGPE/BattleArrow-" + std::to_string(c) + ".png").c_str(),
+            Color(0xffc0c0c0), Color(0xffffffff),
+            100
+        );
+    }
+    return ret;
+}
+
+
+const FixedLimitVector<ImageMatch::WaterfillTemplateMatcher>& BATTLE_ARROWS(){
+    static FixedLimitVector<ImageMatch::WaterfillTemplateMatcher> matcher = make_battle_arrow_template();
+    return matcher;
+}
+
+BattleArrowDetector::BattleArrowDetector(Color color, const ImageFloatBox& box)
+    : m_color(color)
+    , m_box(box)
+{}
+void BattleArrowDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_box);
+}
+bool BattleArrowDetector::detect(const ImageViewRGB32& screen){
+    using namespace Kernels::Waterfill;
+
+    ImageViewRGB32 region = extract_box_reference(screen, m_box);
+
+//    cout << "------------" << endl;
+    auto matrix = compress_rgb32_to_binary_range(region, 0xffc0c0c0, 0xffffffff);
+    auto session = make_WaterfillSession(matrix);
+    auto iter = session->make_iterator(100);
+    WaterfillObject object;
+
+    //static int c = 0;
+    while (iter->find_next(object, false)){
+        double aspect_ratio = object.aspect_ratio();
+        if (aspect_ratio < 0.8 || aspect_ratio > 1.3){
+            continue;
+        }
+        ImageViewRGB32 cropped = extract_box_reference(region, object);
+//        cropped.save("test-object-" + std::to_string(c++) + ".png");
+//        cropped.save("testT.png");
+        for (const ImageMatch::WaterfillTemplateMatcher& matcher : BATTLE_ARROWS()){
+ //           matcher.image_template().save("test0.png");
+            double rmsd = matcher.rmsd(Resolution(screen.width(), screen.height()), cropped);
+//            cout << rmsd << endl;
+            if (rmsd < 60){
+                return true;
+            }
+        }
+    }
+
+    return false;
+}
+
+
+#if 0
+bool BattleArrowWatcher::process_frame(const ImageViewRGB32& frame, WallClock timestamp){
+    if (!detect(frame)){
+        return false;
+    }
+    m_detections.emplace_back(timestamp);
+
+    WallClock threshold = timestamp - std::chrono::seconds(5);
+    while (!m_detections.empty() && m_detections.front() < threshold){
+        m_detections.pop_front();
+    }
+
+//    cout << "m_detections = " << m_detections.size() << endl;
+
+    return m_detections.size() >= 3;
+}
+#endif
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLGPE/Inference/Battles/PokemonLGPE_BattleArrowDetector.h b/SerialPrograms/Source/VideoGames/PokemonLGPE/Inference/Battles/PokemonLGPE_BattleArrowDetector.h
new file mode 100644
index 0000000000..5ca284737d
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLGPE/Inference/Battles/PokemonLGPE_BattleArrowDetector.h
@@ -0,0 +1,86 @@
+/*  Battle Arrow Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLGPE_BattleArrowDetector_H
+#define PokemonAutomation_PokemonLGPE_BattleArrowDetector_H
+
+#include <chrono>
+//#include <atomic>
+#include <deque>
+#include "Common/Cpp/Color.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonTools/VisualDetector.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLGPE{
+
+class BattleArrowDetector : public StaticScreenDetector{
+public:
+    /*
+    |Fight|Pokemon|Bag|Run| for wild battle
+    |---|Fight|Pokemon|Bag| for trainer battle
+    (align right)
+    Don't know what changes for a double battle.
+    */
+    //Arrow bounces back and forth.
+    BattleArrowDetector(Color color, const ImageFloatBox& box);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+protected:
+    Color m_color;
+    ImageFloatBox m_box;
+};
+class BattleArrowWatcher : public DetectorToFinder<BattleArrowDetector>{
+public:
+    BattleArrowWatcher(Color color = COLOR_RED, ImageFloatBox box = {0.546, 0.863, 0.045, 0.068})
+         : DetectorToFinder(
+            "BattleArrowWatcher",
+            FinderType::PRESENT,
+            std::chrono::milliseconds(250),
+            color,
+            box
+        )
+    {}
+};
+
+
+
+#if 0
+//
+//  We use a custom watcher because the arrow wiggles and thus is less likely to
+//  maintain consecutive detections.
+//
+class BattleArrowWatcher : public BattleArrowDetector, public VisualInferenceCallback{
+public:
+    BattleArrowWatcher(Color color = COLOR_RED, ImageFloatBox box = {0.546, 0.863, 0.045, 0.068})
+         : BattleArrowDetector(color, box)
+         , VisualInferenceCallback("BattleArrowWatcher")
+    {}
+
+    virtual void make_overlays(VideoOverlaySet& items) const override{
+        BattleArrowDetector::make_overlays(items);
+    }
+
+    using VisualInferenceCallback::process_frame;
+    virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override;
+
+private:
+    std::deque<WallClock> m_detections;
+};
+#endif
+
+
+
+}
+}
+}
+
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLGPE/Inference/PokemonLGPE_ShinySymbolDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLGPE/Inference/PokemonLGPE_ShinySymbolDetector.cpp
new file mode 100644
index 0000000000..122d4bb499
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLGPE/Inference/PokemonLGPE_ShinySymbolDetector.cpp
@@ -0,0 +1,48 @@
+/*  Shiny Symbol Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Color.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/ImageTools/ImageStats.h"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Images/ImageFilter.h"
+#include "PokemonLGPE_ShinySymbolDetector.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLGPE{
+
+ShinySymbolDetector::ShinySymbolDetector(Color color)
+    : m_box_star(0.666, 0.779, 0.028, 0.044)
+{}
+void ShinySymbolDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(COLOR_RED, m_box_star);
+}
+bool ShinySymbolDetector::read(Logger& logger, const ImageViewRGB32& frame){
+    /*
+    Shiny (charizard):
+    Add infer box: (0.6660, 0.7790, 0.0280, 0.0440), RGB avg [159, 123, 125] avg sum 408 ratio [0.391, 0.301, 0.308] stddev [74.898, 54.696, 53.354] sum 182.948 crop size (54, 48)
+
+    Not shiny (chansey):
+    Add infer box: (0.6660, 0.7790, 0.0280, 0.0440), RGB avg [82, 113, 100] avg sum 295 ratio [0.276, 0.384, 0.340] stddev [15.477, 2.178, 2.648] sum 20.303 crop size (54, 48)
+
+    Only had the two to test with for now.
+    */
+
+    const auto stats = image_stats(extract_box_reference(frame, m_box_star));
+    return stats.stddev.sum() > 100;
+}
+
+
+}
+}
+}
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonLGPE/Inference/PokemonLGPE_ShinySymbolDetector.h b/SerialPrograms/Source/VideoGames/PokemonLGPE/Inference/PokemonLGPE_ShinySymbolDetector.h
new file mode 100644
index 0000000000..efee31b608
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLGPE/Inference/PokemonLGPE_ShinySymbolDetector.h
@@ -0,0 +1,35 @@
+/*  Shiny Symbol Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLGPE_ShinySymbolDetector_H
+#define PokemonAutomation_PokemonLGPE_ShinySymbolDetector_H
+
+#include "Common/Cpp/Logging/AbstractLogger.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLGPE{
+
+//Check for the red shiny star on a Pokemon's summary from the Party/Box menu.
+//This does not work for the summary that appears after a catch.
+class ShinySymbolDetector{
+public:
+    ShinySymbolDetector(Color color);
+
+    virtual void make_overlays(VideoOverlaySet& items) const;
+    bool read(Logger& logger, const ImageViewRGB32& frame);
+
+private:
+    ImageFloatBox m_box_star;
+};
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLGPE/Inference/Sounds/PokemonLGPE_ShinySoundDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLGPE/Inference/Sounds/PokemonLGPE_ShinySoundDetector.cpp
new file mode 100644
index 0000000000..8c27a23b1d
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLGPE/Inference/Sounds/PokemonLGPE_ShinySoundDetector.cpp
@@ -0,0 +1,46 @@
+/*  Shiny Sound Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonTools/Audio/AudioTemplateCache.h"
+#include "CommonTools/Audio/SpectrogramMatcher.h"
+#include "VideoGames/PokemonLGPE/PokemonLGPE_Settings.h"
+#include "PokemonLGPE_ShinySoundDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLGPE{
+
+
+ShinySoundDetector::ShinySoundDetector(Logger& logger, DetectedCallback detected_callback)
+    // Use a yellow as the detection color because the shiny animation is yellow.
+    : AudioPerSpectrumDetectorBase(
+        logger,
+        "ShinySoundDetector",
+        "Shiny sound",
+        COLOR_YELLOW,
+        detected_callback
+    )
+{}
+
+
+float ShinySoundDetector::get_score_threshold() const{
+    return (float)GameSettings::instance().SHINY_SOUND_THRESHOLD;
+}
+
+std::unique_ptr<SpectrogramMatcher> ShinySoundDetector::build_spectrogram_matcher(size_t sample_rate){
+    return std::make_unique<SpectrogramMatcher>(
+        "Shiny Sound",
+        AudioTemplateCache::instance().get_throw("PokemonLGPE/ShinySound", sample_rate),
+        SpectrogramMatcher::Mode::SPIKE_CONV, sample_rate,
+        GameSettings::instance().SHINY_SOUND_LOW_FREQUENCY
+    );
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLGPE/Inference/Sounds/PokemonLGPE_ShinySoundDetector.h b/SerialPrograms/Source/VideoGames/PokemonLGPE/Inference/Sounds/PokemonLGPE_ShinySoundDetector.h
new file mode 100644
index 0000000000..46b3ef0d93
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLGPE/Inference/Sounds/PokemonLGPE_ShinySoundDetector.h
@@ -0,0 +1,36 @@
+/*  Shiny Sound Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLGPE_ShinySoundDetector_H
+#define PokemonAutomation_PokemonLGPE_ShinySoundDetector_H
+
+#include "CommonTools/Audio/AudioPerSpectrumDetectorBase.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLGPE{
+
+
+class ShinySoundDetector : public AudioPerSpectrumDetectorBase{
+public:
+    //  Warning: The callback will be called from the audio inference thread.
+    ShinySoundDetector(Logger& logger, DetectedCallback detected_callback);
+
+    // Implement AudioPerSpectrumDetectorBase::get_score_threshold()
+    virtual float get_score_threshold() const override;
+
+protected:
+    // Implement AudioPerSpectrumDetectorBase::build_spectrogram_matcher()
+    virtual std::unique_ptr<SpectrogramMatcher> build_spectrogram_matcher(size_t sample_rate) override;
+};
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLGPE/PokemonLGPE_Panels.cpp b/SerialPrograms/Source/VideoGames/PokemonLGPE/PokemonLGPE_Panels.cpp
new file mode 100644
index 0000000000..b1de6e8553
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLGPE/PokemonLGPE_Panels.cpp
@@ -0,0 +1,62 @@
+/*  Pokemon LGPE Panels
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/StaticGlobals.h"
+#include "CommonFramework/GlobalAutoPaths.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "PokemonLGPE_Panels.h"
+
+#include "PokemonLGPE_Settings.h"
+
+#include "Programs/Farming/PokemonLGPE_DailyItemFarmer.h"
+
+#include "Programs/ShinyHunting/PokemonLGPE_AlolanTrade.h"
+#include "Programs/ShinyHunting/PokemonLGPE_FossilRevival.h"
+#include "Programs/ShinyHunting/PokemonLGPE_GiftReset.h"
+#include "Programs/ShinyHunting/PokemonLGPE_LegendaryReset.h"
+
+#include "Programs/TestPrograms/PokemonLGPE_SoundListener.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLGPE{
+
+PanelListFactory::PanelListFactory()
+    : PanelListDescriptor(
+        Pokemon::STRING_POKEMON + " Let's Go Pikachu and Eevee",
+        RESOURCE_PATH() + "CategoryIcons/PokemonLGPE.png"
+    )
+{}
+
+std::vector<PanelEntry> PanelListFactory::make_panels() const{
+    std::vector<PanelEntry> ret;
+    
+    ret.emplace_back("---- Settings ----");
+    ret.emplace_back(make_OptionsPanel<GameSettingsPanel>());
+
+    ret.emplace_back("---- General ----");
+    ret.emplace_back(make_SingleSwitchProgram<DailyItemFarmer>());
+
+    ret.emplace_back("---- Shiny Hunting ----");
+    ret.emplace_back(make_SingleSwitchProgram<AlolanTrade>());
+    ret.emplace_back(make_SingleSwitchProgram<FossilRevival>());
+    ret.emplace_back(make_SingleSwitchProgram<GiftReset>());
+    ret.emplace_back(make_SingleSwitchProgram<LegendaryReset>());
+
+    if (STATIC_GLOBALS.DEVELOPER_MODE){
+        ret.emplace_back("---- Developer Tools ----");
+        ret.emplace_back(make_SingleSwitchProgram<SoundListener>());
+    }
+
+    return ret;
+}
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLGPE/PokemonLGPE_Panels.h b/SerialPrograms/Source/VideoGames/PokemonLGPE/PokemonLGPE_Panels.h
new file mode 100644
index 0000000000..4c5d0b925e
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLGPE/PokemonLGPE_Panels.h
@@ -0,0 +1,28 @@
+/*  Pokemon LGPE Panels
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLGPE_Panels_H
+#define PokemonAutomation_PokemonLGPE_Panels_H
+
+#include "CommonFramework/Panels/PanelList.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLGPE{
+
+class PanelListFactory : public PanelListDescriptor{
+public:
+    PanelListFactory();
+private:
+    virtual std::vector<PanelEntry> make_panels() const override;
+};
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLGPE/PokemonLGPE_Settings.cpp b/SerialPrograms/Source/VideoGames/PokemonLGPE/PokemonLGPE_Settings.cpp
new file mode 100644
index 0000000000..800416e063
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLGPE/PokemonLGPE_Settings.cpp
@@ -0,0 +1,108 @@
+/*  Pokemon Let's Go Settings
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Pokemon/Pokemon_Strings.h"
+#include "PokemonLGPE_Settings.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLGPE{
+
+using namespace Pokemon;
+
+
+
+GameSettings& GameSettings::instance(){
+    static GameSettings settings;
+    return settings;
+}
+GameSettings::GameSettings()
+    : BatchOption(LockMode::LOCK_WHILE_RUNNING)
+    , m_general("<font size=4><b>General Settings:</b></font>")
+    , m_menu_navigation("<font size=4><b>Menu Navigation Timings:</b></font>")
+    , GAME_TO_HOME_DELAY0(
+        "<b>Game to Home Delay:</b><br>Delay from pressing home to entering the the Switch home menu.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "1000 ms"
+    )
+    , m_start_game_timings("<font size=4><b>Start Game Timings:</b></font>")
+    , START_GAME_WAIT1(
+        "<b>Start Game Wait:</b><br>Wait this long for the game to load.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "20 s"
+    )
+    , ENTER_GAME_MASH0(
+        "<b>Enter Game Mash:</b><br>Mash A for this long to enter the game.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "5 s"
+    )
+    , ENTER_GAME_WAIT0(
+        "<b>Enter Game Wait:</b><br>Wait this long for the opening animations to finish.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "15 s"
+    )
+    , m_shiny_audio_settings("<font size=4><b>Shiny Audio Settings:</b></font>")
+    , SHINY_SOUND_THRESHOLD(
+        "<b>Shiny Sound Threshold:</b><br>Maximum error coefficient to trigger a shiny detection.",
+        LockMode::LOCK_WHILE_RUNNING,
+        0.95, 0, 1.0
+    )
+    , SHINY_SOUND_LOW_FREQUENCY(
+        "<b>Shiny Sound Low Frequency (Hz):</b><br>High pass filter frequency for shiny sound.",
+        LockMode::LOCK_WHILE_RUNNING,
+        1000, 0, 48000
+    )
+{
+    PA_ADD_STATIC(m_general);
+
+    PA_ADD_STATIC(m_menu_navigation);
+    PA_ADD_OPTION(GAME_TO_HOME_DELAY0);
+
+    PA_ADD_STATIC(m_start_game_timings);
+    PA_ADD_OPTION(START_GAME_WAIT1);
+    PA_ADD_OPTION(ENTER_GAME_MASH0);
+    PA_ADD_OPTION(ENTER_GAME_WAIT0);
+
+    PA_ADD_STATIC(m_shiny_audio_settings);
+    PA_ADD_OPTION(SHINY_SOUND_THRESHOLD);
+    PA_ADD_OPTION(SHINY_SOUND_LOW_FREQUENCY);
+}
+
+
+
+
+
+GameSettings_Descriptor::GameSettings_Descriptor()
+    : OptionsPanelDescriptor(
+        "PokemonLGPE:GlobalSettings",
+        STRING_POKEMON + " LGPE", "Game Settings",
+        "Programs/PokemonLGPE/PokemonSettings.html",
+        "Global " + STRING_POKEMON + " Let's Go Settings",
+        PanelQualityStanding::OFFICIAL
+    )
+{}
+
+
+
+GameSettingsPanel::GameSettingsPanel()
+    : settings(GameSettings::instance())
+{
+    PA_ADD_OPTION(settings);
+}
+
+
+
+
+
+}
+}
+}
+
+
+
+
+
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonLGPE/PokemonLGPE_Settings.h b/SerialPrograms/Source/VideoGames/PokemonLGPE/PokemonLGPE_Settings.h
new file mode 100644
index 0000000000..c06d4c6236
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLGPE/PokemonLGPE_Settings.h
@@ -0,0 +1,61 @@
+/*  Pokemon Let's Go Settings
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLGPE_Settings_H
+#define PokemonAutomation_PokemonLGPE_Settings_H
+
+#include "Common/Cpp/Options/StaticTextOption.h"
+#include "Common/Cpp/Options/FloatingPointOption.h"
+#include "Common/Cpp/Options/TimeDurationOption.h"
+#include "CommonFramework/Panels/OptionsPanel.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLGPE{
+
+
+class GameSettings : public BatchOption{
+    GameSettings();
+public:
+    static GameSettings& instance();
+
+    SectionDividerOption m_general;
+
+    SectionDividerOption m_menu_navigation;
+    MillisecondsOption GAME_TO_HOME_DELAY0;
+
+    SectionDividerOption m_start_game_timings;
+    MillisecondsOption START_GAME_WAIT1;
+    MillisecondsOption ENTER_GAME_MASH0;
+    MillisecondsOption ENTER_GAME_WAIT0;
+
+    SectionDividerOption m_shiny_audio_settings;
+    FloatingPointOption SHINY_SOUND_THRESHOLD;
+    FloatingPointOption SHINY_SOUND_LOW_FREQUENCY;
+};
+
+
+
+
+class GameSettings_Descriptor : public OptionsPanelDescriptor{
+public:
+    GameSettings_Descriptor();
+};
+
+
+class GameSettingsPanel : public OptionsPanelInstance{
+public:
+    using Descriptor = GameSettings_Descriptor;
+    GameSettingsPanel();
+private:
+    GameSettings& settings;
+};
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLGPE/Programs/Farming/PokemonLGPE_DailyItemFarmer.cpp b/SerialPrograms/Source/VideoGames/PokemonLGPE/Programs/Farming/PokemonLGPE_DailyItemFarmer.cpp
new file mode 100644
index 0000000000..c8e0ea0873
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLGPE/Programs/Farming/PokemonLGPE_DailyItemFarmer.cpp
@@ -0,0 +1,267 @@
+/*  LGPE Daily Item Farmer
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+//#include "CommonFramework/Exceptions/OperationFailedException.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+//#include "CommonFramework/VideoPipeline/VideoFeed.h"
+//#include "CommonTools/Async/InferenceRoutines.h"
+#include "CommonTools/StartupChecks/VideoResolutionCheck.h"
+#include "NintendoSwitch/NintendoSwitch_Settings.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Controllers/Joycon/NintendoSwitch_Joycon.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "NintendoSwitch/Programs/DateSpam/NintendoSwitch_HomeToDateTime.h"
+#include "Pokemon/Pokemon_Strings.h"
+//#include "CommonTools/VisualDetectors/BlackScreenDetector.h"
+#include "VideoGames/PokemonLGPE/Commands/PokemonLGPE_DateSpam.h"
+//#include "VideoGames/PokemonLGPE/Inference/PokemonLGPE_ShinySymbolDetector.h"
+//#include "VideoGames/PokemonLGPE/Programs/PokemonLGPE_GameEntry.h"
+#include "VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.h"
+#include "PokemonLGPE_DailyItemFarmer.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLGPE{
+
+DailyItemFarmer_Descriptor::DailyItemFarmer_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonLGPE:DailyItemFarmer",
+        Pokemon::STRING_POKEMON + " LGPE", "Daily Item Farmer",
+        "Programs/PokemonLGPE/DailyItemFarmer.html",
+        "Farm daily item respawns (ex. fossils) by date-skipping.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::SpecializedController,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+struct DailyItemFarmer_Descriptor::Stats : public StatsTracker{
+    Stats()
+        : skips(m_stats["Skips"])
+    {
+        m_display_order.emplace_back("Skips");
+    }
+    std::atomic<uint64_t>& skips;
+};
+std::unique_ptr<StatsTracker> DailyItemFarmer_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+DailyItemFarmer::DailyItemFarmer()
+    : ATTEMPTS(
+        "<b>Number of attempts:</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        30, 1
+    )
+    , LINK_CODE(
+        "<b>Link Code:</b><br>The link code used when matching for a trade/battle. This only needs to be changed when running multiple LGPE date-skip programs at the same time.",
+        {   //Combinations of 3 different symbols is possible but 10 choices seems like enough.
+            {LinkCode::Pikachu,     "pikachu",      "Pikachu"},
+            {LinkCode::Eevee,       "eevee",        "Eevee"},
+            {LinkCode::Bulbasaur,   "bulbasaur",    "Bulbasaur"},
+            {LinkCode::Charmander,  "charmander",   "Charmander"},
+            {LinkCode::Squirtle,    "squirtle",     "Squirtle"},
+            {LinkCode::Pidgey,      "pidgey",       "Pidgey"},
+            {LinkCode::Caterpie,    "caterpie",     "Caterpie"},
+            {LinkCode::Rattata,     "rattata",      "Rattata"},
+            {LinkCode::Jigglypuff,  "jigglypuff",   "Jigglypuff"},
+            {LinkCode::Diglett,     "diglett",      "Diglett"},
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        LinkCode::Pikachu
+    )
+    , FIX_TIME_WHEN_DONE(
+        "<b>Fix Time when Done:</b><br>Fix the time after the program finishes.",
+        LockMode::UNLOCK_WHILE_RUNNING, false
+    )
+    , GO_HOME_WHEN_DONE(false)
+    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_STATUS_UPDATE,
+        &NOTIFICATION_PROGRAM_FINISH,
+    })
+{
+    PA_ADD_OPTION(ATTEMPTS);
+    PA_ADD_OPTION(LINK_CODE);
+    PA_ADD_OPTION(FIX_TIME_WHEN_DONE);
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+void DailyItemFarmer::start_local_trade(SingleSwitchProgramEnvironment& env, JoyconContext& context){
+    env.log("Starting local trade.");
+    //Open Menu -> Communication -> Nearby player -> Local Trade
+    pbf_press_button(context, BUTTON_X, 200ms, 800ms);
+    pbf_move_joystick(context, {+1, 0}, 100ms, 400ms);
+    pbf_press_button(context, BUTTON_A, 200ms, 1000ms);
+    pbf_press_button(context, BUTTON_A, 200ms, 2000ms); //  Black screen
+    pbf_press_button(context, BUTTON_A, 200ms, 1000ms);
+    pbf_press_button(context, BUTTON_A, 200ms, 1000ms);
+
+    //Enter link code
+    switch(LINK_CODE){
+    case LinkCode::Pikachu:
+        break;
+    case LinkCode::Eevee:
+        pbf_move_joystick(context, {+1, 0}, 100ms, 100ms);
+        break;
+    case LinkCode::Bulbasaur:
+        pbf_move_joystick(context, {+1, 0}, 100ms, 100ms);
+        pbf_move_joystick(context, {+1, 0}, 100ms, 100ms);
+        break;
+    case LinkCode::Charmander:
+        pbf_move_joystick(context, {-1, 0}, 100ms, 100ms);
+        pbf_move_joystick(context, {-1, 0}, 100ms, 100ms);
+        break;
+    case LinkCode::Squirtle:
+        pbf_move_joystick(context, {-1, 0}, 100ms, 100ms);
+        break;
+    case LinkCode::Pidgey:
+        pbf_move_joystick(context, {0, -1}, 100ms, 100ms);
+        break;
+    case LinkCode::Caterpie:
+        pbf_move_joystick(context, {0, -1}, 100ms, 100ms);
+        pbf_move_joystick(context, {+1, 0}, 100ms, 100ms);
+        break;
+    case LinkCode::Rattata:
+        pbf_move_joystick(context, {0, -1}, 100ms, 100ms);
+        pbf_move_joystick(context, {-1, 0}, 100ms, 100ms);
+        pbf_move_joystick(context, {-1, 0}, 100ms, 100ms);
+        break;
+    case LinkCode::Jigglypuff:
+        pbf_move_joystick(context, {0, -1}, 100ms, 100ms);
+        pbf_move_joystick(context, {-1, 0}, 100ms, 100ms);
+        pbf_move_joystick(context, {-1, 0}, 100ms, 100ms);
+        break;
+    case LinkCode::Diglett:
+        pbf_move_joystick(context, {0, -1}, 100ms, 100ms);
+        pbf_move_joystick(context, {-1, 0}, 100ms, 100ms);
+        break;
+    default:
+        env.log("Invalid link code selection. Defaulting to Pikachu.");
+        break;
+    }
+    //Select symbol three times, then enter link search
+    pbf_press_button(context, BUTTON_A, 200ms, 100ms);
+    pbf_press_button(context, BUTTON_A, 200ms, 100ms);
+    pbf_press_button(context, BUTTON_A, 200ms, 100ms);
+    pbf_wait(context, 1000ms); //let search start
+    context.wait_for_all_requests();
+}
+
+void DailyItemFarmer::program(SingleSwitchProgramEnvironment& env, CancellableScope& scope){
+    JoyconContext context(scope, env.console.controller<RightJoycon>());
+    assert_16_9_720p_min(env.logger(), env.console);
+    DailyItemFarmer_Descriptor::Stats& stats = env.current_stats<DailyItemFarmer_Descriptor::Stats>();
+
+    /* Stand in front of the fossil spawn near Mewtwo.
+    *  Use a repel to keep wild encounters away.
+    *  Start program in-game.
+    *  100% daily spawn. Only works near Mewtwo.
+    *  Other cave item spawns are tied to steps taken.
+    *  Should work for other hidden daily items, game corner, mt moon moonstones, etc.
+    */
+
+    uint8_t year = MAX_YEAR;
+
+    //Roll the date back before doing anything else.
+    start_local_trade(env, context);
+
+    go_home(env.console, context);
+
+    //  Initiating a local connection tends to mess up the wireless schedule.
+    //  Thus we wait a bit for the connection to clear up.
+    pbf_press_button(context, BUTTON_ZL, 160ms, 840ms);
+    pbf_press_button(context, BUTTON_ZL, 160ms, 840ms);
+    pbf_press_button(context, BUTTON_ZL, 160ms, 840ms);
+    context.wait_for_all_requests();
+    context.wait_for(1000ms);
+
+    home_to_date_time(env.console, context, true);
+
+    env.log("Rolling date back.");
+    roll_date_backward_N(context, MAX_YEAR);
+    year = 0;
+    pbf_press_button(context, BUTTON_HOME, 160ms, ConsoleSettings::instance().SETTINGS_TO_HOME_DELAY0);
+    pbf_press_button(context, BUTTON_HOME, 160ms, ConsoleSettings::instance().SETTINGS_TO_HOME_DELAY0);
+
+    //  Start with one B press while the poll rate changes.
+    //  If we mash here we silent disconnect the ESP32.
+    pbf_press_button(context, BUTTON_B, 200ms, 1800ms);
+    pbf_mash_button(context, BUTTON_B, 5000ms);
+    context.wait_for_all_requests();
+
+    env.log("Starting pickup loop.");
+    for (uint32_t count = 0; count < ATTEMPTS; count++){
+        env.log("Pick up item.");
+
+        pbf_mash_button(context, BUTTON_A, 4000ms);
+        context.wait_for_all_requests();
+
+        start_local_trade(env, context);
+
+        //  Dateskip
+        go_home(env.console, context);
+
+#if 1
+        //  Initiating a local connection tends to mess up the wireless schedule.
+        //  Thus we wait a bit for the connection to clear up.
+        pbf_press_button(context, BUTTON_ZL, 160ms, 840ms);
+        pbf_press_button(context, BUTTON_ZL, 160ms, 840ms);
+        pbf_press_button(context, BUTTON_ZL, 160ms, 840ms);
+        context.wait_for_all_requests();
+        context.wait_for(1000ms);
+#endif
+
+        home_to_date_time(env.console, context, true);
+
+        if (year >= MAX_YEAR){
+            env.log("Rolling date back.");
+            roll_date_backward_N(context, MAX_YEAR);
+            year = 0;
+        }else{
+            env.log("Rolling date forward.");
+            roll_date_forward_1(context);
+            year++;
+        }
+        pbf_press_button(context, BUTTON_HOME, 160ms, ConsoleSettings::instance().SETTINGS_TO_HOME_DELAY0);
+
+        //  Re-enter game and close out link menu
+        pbf_press_button(context, BUTTON_HOME, 160ms, ConsoleSettings::instance().SETTINGS_TO_HOME_DELAY0);
+
+        //  Start with one B press while the poll rate changes.
+        //  If we mash here we silent disconnect the ESP32.
+        pbf_press_button(context, BUTTON_B, 200ms, 1800ms);
+        pbf_mash_button(context, BUTTON_B, 5000ms);
+        context.wait_for_all_requests();
+
+        stats.skips++;
+        env.update_stats();
+    }
+
+    if (FIX_TIME_WHEN_DONE){
+        go_home(env.console, context);
+        home_to_date_time(env.console, context, false);
+        pbf_press_button(context, BUTTON_A, 50ms, 500ms);
+        pbf_press_button(context, BUTTON_A, 50ms, 500ms);
+        pbf_wait(context, 100ms);
+        context.wait_for_all_requests();
+        pbf_press_button(context, BUTTON_HOME, 160ms, ConsoleSettings::instance().SETTINGS_TO_HOME_DELAY0);
+        resume_game_from_home(env.console, context);
+    }
+
+    if (GO_HOME_WHEN_DONE){
+        pbf_press_button(context, BUTTON_HOME, 200ms, 1000ms);
+    }
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+}
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLGPE/Programs/Farming/PokemonLGPE_DailyItemFarmer.h b/SerialPrograms/Source/VideoGames/PokemonLGPE/Programs/Farming/PokemonLGPE_DailyItemFarmer.h
new file mode 100644
index 0000000000..7ea1456e2a
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLGPE/Programs/Farming/PokemonLGPE_DailyItemFarmer.h
@@ -0,0 +1,68 @@
+/*  LGPE Daily Item Farmer
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLGPE_DailyItemFarmer_H
+#define PokemonAutomation_PokemonLGPE_DailyItemFarmer_H
+
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/Controllers/Joycon/NintendoSwitch_Joycon.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLGPE{
+
+class DailyItemFarmer_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    DailyItemFarmer_Descriptor();
+    struct Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+class DailyItemFarmer : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = DailyItemFarmer_Descriptor;
+    DailyItemFarmer();
+    virtual void program(SingleSwitchProgramEnvironment& env, CancellableScope& scope) override;
+
+private:
+    void start_local_trade(SingleSwitchProgramEnvironment& env, JoyconContext& context);
+
+    SimpleIntegerOption<uint32_t> ATTEMPTS;
+
+    enum class LinkCode{
+        Pikachu,
+        Eevee,
+        Bulbasaur,
+        Charmander,
+        Squirtle,
+        Pidgey,
+        Caterpie,
+        Rattata,
+        Jigglypuff,
+        Diglett,
+    };
+    EnumDropdownOption<LinkCode> LINK_CODE;
+    
+    BooleanCheckBoxOption FIX_TIME_WHEN_DONE;
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
+
+    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+
+
+
+}
+}
+}
+#endif
+
+
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonLGPE/Programs/PokemonLGPE_GameEntry.cpp b/SerialPrograms/Source/VideoGames/PokemonLGPE/Programs/PokemonLGPE_GameEntry.cpp
new file mode 100644
index 0000000000..ae7f31aace
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLGPE/Programs/PokemonLGPE_GameEntry.cpp
@@ -0,0 +1,176 @@
+/*  Game Entry
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+//#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonFramework/Tools/ErrorDumper.h"
+#include "CommonFramework/Tools/ProgramEnvironment.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "CommonTools/VisualDetectors/BlackScreenDetector.h"
+//#include "Controllers/ControllerTypes.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "VideoGames/PokemonLGPE/PokemonLGPE_Settings.h"
+#include "PokemonLGPE_GameEntry.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLGPE{
+
+
+bool reset_game_to_gamemenu(
+    ConsoleHandle& console, JoyconContext& context
+){
+    close_game_from_home(console, context);
+    start_game_from_home(
+        console,
+        context,
+        0, 0
+    );
+
+    // Now the game has opened:
+    return openedgame_to_gamemenu(console, context, GameSettings::instance().START_GAME_WAIT1);
+}
+
+bool gamemenu_to_ingame(
+    VideoStream& stream, JoyconContext& context,
+    Milliseconds mash_duration, Milliseconds enter_game_timeout
+){
+    //  Includes choosing the controller.
+    //  Controllers are disconnected? on selection screen so make sure to mash.
+    stream.log("Mashing A to enter game and select controller...");
+
+    //  Slow mash to minimize chance of silent disconnect while the controller
+    //  disconnects and reconnects.
+    {
+        BlackScreenOverWatcher detector(COLOR_RED, {0.2, 0.2, 0.6, 0.6});
+        stream.log("Connecting controller...");
+        int ret = run_until<JoyconContext>(
+            stream, context,
+            [](JoyconContext& context){
+                for (int c = 0; c < 20; c++){
+                    pbf_press_button(context, BUTTON_A, 200ms, 800ms);
+                }
+            },
+            {detector}
+        );
+        if (ret == 0){
+            stream.log("Loading game...");
+        }else{
+            stream.log("Timed out waiting to connect controller.", COLOR_RED);
+            return false;
+        }
+    }
+//    pbf_mash_button(context, BUTTON_A, mash_duration);
+
+    context.wait_for_all_requests();
+
+    //  White screen, Pikachu/Eevee running across the screen. Mash will not speed it up.
+    //  Mash A at then end to enter continue screen
+    {
+        BlackScreenOverWatcher detector(COLOR_RED, {0.2, 0.2, 0.6, 0.6});
+        stream.log("Waiting to enter game...");
+        int ret = run_until<JoyconContext>(
+            stream, context,
+            [&enter_game_timeout](JoyconContext& context){
+                pbf_wait(context, enter_game_timeout);
+                for (int c = 0; c < 20; c++){
+                    pbf_press_button(context, BUTTON_A, 200ms, 800ms);
+                }
+            },
+            {detector}
+        );
+        if (ret == 0){
+            stream.log("At continue screen.");
+        }else{
+            stream.log("Timed out waiting to enter game and select continue.", COLOR_RED);
+            return false;
+        }
+    }
+    pbf_wait(context, 1000ms);
+    context.wait_for_all_requests();
+
+    //  Continue your adventure.
+    {
+        BlackScreenOverWatcher detector(COLOR_YELLOW, {0.2, 0.2, 0.6, 0.6});
+        int ret = run_until<JoyconContext>(
+            stream, context,
+            [](JoyconContext& context){
+                for (int c = 0; c < 20; c++){
+                    pbf_press_button(context, BUTTON_A, 200ms, 800ms);
+                }
+            },
+            {detector}
+        );
+        if (ret == 0){
+            stream.log("Entered game!");
+            return true;
+        }else{
+            stream.log("Timed out waiting to enter game.", COLOR_RED);
+            return false;
+        }
+    }
+}
+
+bool reset_game_from_home(
+    ProgramEnvironment& env,
+    ConsoleHandle& console, JoyconContext& context,
+    Milliseconds post_wait_time
+){
+    if (dynamic_cast<RightJoycon*>(&context.controller()) == nullptr){
+        console.log("Right Joycon required!", COLOR_RED);
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "reset_game_from_home(): Right Joycon required.",
+            console
+        );
+    }
+    bool ok = true;
+    ok &= reset_game_to_gamemenu(console, context);
+    ok &= gamemenu_to_ingame(
+        console, context,
+        GameSettings::instance().ENTER_GAME_MASH0,
+        GameSettings::instance().ENTER_GAME_WAIT0
+    );
+    if (!ok){
+        dump_image(console.logger(), env.program_info(), console.video(), "StartGame");
+    }
+    console.log("Entered game! Waiting out grace period.");
+    pbf_wait(context, post_wait_time);
+    context.wait_for_all_requests();
+    return ok;
+}
+
+
+void reset_game_from_game(
+    ProgramEnvironment& env,
+    ConsoleHandle& console, JoyconContext& context,
+    std::atomic<uint64_t>* errors,
+    Milliseconds post_wait_time
+){
+    while (true){
+        pbf_press_button(context, BUTTON_HOME, 200ms, 2000ms);
+        if (reset_game_from_home(env, console, context, 3000ms)){
+            break;
+        }
+        env.log("Resetting...", COLOR_RED);
+        if (errors){
+            (*errors)++;
+            env.update_stats();
+        }
+    }
+
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLGPE/Programs/PokemonLGPE_GameEntry.h b/SerialPrograms/Source/VideoGames/PokemonLGPE/Programs/PokemonLGPE_GameEntry.h
new file mode 100644
index 0000000000..1fbcdb55e0
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLGPE/Programs/PokemonLGPE_GameEntry.h
@@ -0,0 +1,56 @@
+/*  Game Entry
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLGPE_GameEntry_H
+#define PokemonAutomation_PokemonLGPE_GameEntry_H
+
+#include <stdint.h>
+#include "CommonFramework/Tools/VideoStream.h"
+#include "NintendoSwitch/Controllers/Joycon/NintendoSwitch_Joycon.h"
+#include "NintendoSwitch/NintendoSwitch_ConsoleHandle.h"
+
+namespace PokemonAutomation{
+    class ProgramEnvironment;
+namespace NintendoSwitch{
+namespace PokemonLGPE{
+
+
+
+// From Switch Home menu, reset game and wait until the game menu screen (where
+// "Press A" is displayed to enter the game) is shown.
+bool reset_game_to_gamemenu(
+    ConsoleHandle& console, JoyconContext& context
+);
+
+// From the game menu screen (where "Press A" is displayed to enter the game),
+// mash A to enter the game and wait until the black screen is gone.
+bool gamemenu_to_ingame(
+    VideoStream& stream, JoyconContext& context,
+    Milliseconds mash_duration, Milliseconds enter_game_timeout
+);
+
+// From Switch Home menu, start game and wait until the player character appears in game.
+// post_wait_time: how many ticks to wait after the black screen (shown when loading the map) is over.
+bool reset_game_from_home(
+    ProgramEnvironment& env,
+    ConsoleHandle& console, JoyconContext& context,
+    Milliseconds post_wait_time = std::chrono::milliseconds(125)
+);
+
+void reset_game_from_game(
+    ProgramEnvironment& env,
+    ConsoleHandle& console, JoyconContext& context,
+    std::atomic<uint64_t>* errors,
+    Milliseconds post_wait_time = std::chrono::milliseconds(125)
+);
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLGPE/Programs/ShinyHunting/PokemonLGPE_AlolanTrade.cpp b/SerialPrograms/Source/VideoGames/PokemonLGPE/Programs/ShinyHunting/PokemonLGPE_AlolanTrade.cpp
new file mode 100644
index 0000000000..8446c66417
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLGPE/Programs/ShinyHunting/PokemonLGPE_AlolanTrade.cpp
@@ -0,0 +1,296 @@
+/*  LGPE Alolan Trade
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "CommonTools/StartupChecks/VideoResolutionCheck.h"
+#include "CommonTools/VisualDetectors/BlackScreenDetector.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Controllers/Joycon/NintendoSwitch_Joycon.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonLGPE/Inference/PokemonLGPE_ShinySymbolDetector.h"
+#include "VideoGames/PokemonLGPE/Programs/PokemonLGPE_GameEntry.h"
+#include "PokemonLGPE_AlolanTrade.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLGPE{
+
+AlolanTrade_Descriptor::AlolanTrade_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonLGPE:AlolanTrade",
+        Pokemon::STRING_POKEMON + " LGPE", "Alolan Trade",
+        "Programs/PokemonLGPE/AlolanTrade.html",
+        "Shiny hunt Alolan forms by trading in-game.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::SpecializedController,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+struct AlolanTrade_Descriptor::Stats : public StatsTracker{
+    Stats()
+        : trades(m_stats["Trades"])
+        , resets(m_stats["Resets"])
+        , shinies(m_stats["Shinies"])
+        , errors(m_stats["Errors"])
+    {
+        m_display_order.emplace_back("Trades");
+        m_display_order.emplace_back("Resets");
+        m_display_order.emplace_back("Shinies");
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+    }
+    std::atomic<uint64_t>& trades;
+    std::atomic<uint64_t>& resets;
+    std::atomic<uint64_t>& shinies;
+    std::atomic<uint64_t>& errors;
+};
+std::unique_ptr<StatsTracker> AlolanTrade_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+AlolanTrade::AlolanTrade()
+    : NUM_TRADES(
+        "<b>Number of Pokemon to trade:</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        30, 1
+    )
+    , GO_HOME_WHEN_DONE(false)
+    , NOTIFICATION_SHINY(
+        "Shiny Found",
+        true, true, ImageAttachmentMode::JPG,
+        {"Notifs", "Showcase"}
+    )
+    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_SHINY,
+        &NOTIFICATION_STATUS_UPDATE,
+        &NOTIFICATION_PROGRAM_FINISH,
+    })
+{
+    PA_ADD_OPTION(NUM_TRADES);
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+void AlolanTrade::run_trade(SingleSwitchProgramEnvironment& env, JoyconContext& context){
+    AlolanTrade_Descriptor::Stats& stats = env.current_stats<AlolanTrade_Descriptor::Stats>();
+    //Talk to NPC, say Yes, select Pokemon from box.
+    BlackScreenOverWatcher trade_started(COLOR_RED);
+    int ret = run_until<JoyconContext>(
+        env.console, context,
+        [](JoyconContext& context){
+            pbf_mash_button(context, BUTTON_A, 15000ms);
+        },
+        {trade_started}
+    );
+    context.wait_for_all_requests();
+    if (ret != 0){
+        env.log("Failed to start trade.", COLOR_RED);
+        stats.errors++;
+        env.update_stats();
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "Failed to start trade.",
+            env.console
+        );
+    }else{
+        env.log("Trade started.");
+    }
+
+    //Wait for trade to complete.
+    BlackScreenOverWatcher trade_completed(COLOR_YELLOW);
+    int ret2 = wait_until(
+        env.console, context,
+        std::chrono::seconds(120),
+        {trade_completed}
+    );
+    context.wait_for_all_requests();
+    if (ret2 != 0){
+        stats.errors++;
+        env.update_stats();
+        env.log("Did not detect end of trade.", COLOR_RED);
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "Did not detect end of trade.",
+            env.console
+        );
+    }else{
+        env.log("Trade completed.");
+    }
+
+    //Summary will appear the first time you trade in a session(?)
+    //Sometimes it appears anyway, don't know what determines it
+    //Exit menu and dialog.
+    pbf_mash_button(context, BUTTON_B, 3000ms);
+    context.wait_for_all_requests();
+}
+
+void AlolanTrade::program(SingleSwitchProgramEnvironment& env, CancellableScope& scope){
+    JoyconContext context(scope, env.console.controller<RightJoycon>());
+    assert_16_9_720p_min(env.logger(), env.console);
+    AlolanTrade_Descriptor::Stats& stats = env.current_stats<AlolanTrade_Descriptor::Stats>();
+
+    /*
+    WARNING: JOYCON TEST PROGRAM. Not well tested. Bare minimum in general.
+
+    Right joycon required for home button (this means no on-switch screenshots).
+    Also don't remap any of the buttons in the switch button mapping settings.
+
+    Preconditions:
+    DO NOT have any Pokemon you want to keep in your boxes. Move them out to Home first.
+    Favoriting a Pokemon does not prevent it from being traded.
+    ?This must not be your first time doing the trade? (I've done all the trades, so I can't check first time trade behavior.)
+
+    Setup:
+    Catch the Kanto variant of the target. Put this number in NUM_TRADES.
+    Stand in front of trade NPC.
+    Save the game.
+    Start the program in-game.
+    
+    Future additions?:
+    skip favorited pokemon - they have a symbol to indicate fav status (imo still risky to do, just move them out)
+    detect when all pokemon traded - trading screen will open but text will appear in the center
+    "you don't have any pokemon your trading partner wants"
+    detect dialog box, detect yes/no confirm box
+    actual enter game and start screen detectors
+    menu detectors, etc.
+    get rid of all this blindly mashing A in general...so need everything really.
+    */
+
+    bool shiny_found = false;
+    while (!shiny_found){
+        //Run trades
+        for (uint16_t i = 0; i < NUM_TRADES; i++){
+            env.log("Running trade.");
+            run_trade(env, context);
+
+            stats.trades++;
+            env.update_stats();
+        }
+
+        env.log("Done trading. Checking boxes.");
+        send_program_status_notification(
+            env, NOTIFICATION_STATUS_UPDATE,
+            "Done trading. Checking boxes."
+        );
+
+        //To check pokemon in menu boxes
+        //Open menu - always defaults to center (Party)
+        //Menu:
+        // --Play with Partner--(centered)
+        //Pokedex - Bag - Party - Communicate - Save (these all have a colored line under when selected + an arrow to indicate)
+        //(Press Y for options)
+
+        //Make sure any extra dialog is closed
+        pbf_mash_button(context, BUTTON_B, 3000ms);
+        context.wait_for_all_requests();
+
+        //Wait a bit.
+        pbf_wait(context, 2500ms);
+        context.wait_for_all_requests();
+
+        //Open menu, open party, open boxes
+        env.log("Opening boxes.");
+        pbf_press_button(context, BUTTON_X, 200ms, 500ms);
+        pbf_press_button(context, BUTTON_A, 200ms, 1500ms);
+        pbf_press_button(context, BUTTON_Y, 200ms, 2000ms);
+        context.wait_for_all_requests();
+
+        //Sort by order caught
+        env.log("Sorting by order caught.");
+        pbf_press_button(context, BUTTON_Y, 200ms, 1000ms);
+        pbf_press_button(context, BUTTON_A, 200ms, 1000ms);
+        pbf_press_button(context, BUTTON_A, 200ms, 1000ms);
+        context.wait_for_all_requests();
+
+        //Press left to go to last (most recent) Pokemon
+        env.log("Opening summary of most recent Pokemon.");
+        pbf_move_joystick(context, {-1, 0}, 100ms, 100ms);
+        context.wait_for_all_requests();
+
+        //View summary - it takes a moment to load
+        pbf_press_button(context, BUTTON_A, 200ms, 1000ms);
+        pbf_move_joystick(context, {0, -1}, 100ms, 100ms);
+        pbf_move_joystick(context, {0, -1}, 100ms, 100ms);
+        pbf_press_button(context, BUTTON_A, 200ms, 100ms);
+        context.wait_for_all_requests();
+
+        pbf_wait(context, 5000ms);
+        context.wait_for_all_requests();
+
+        //Now check for shinies. Check everything that was traded.
+        env.log("Checking received Pokemon.");
+        for (uint16_t i = 0; i < NUM_TRADES; i++){
+            VideoSnapshot screen = env.console.video().snapshot();
+            ShinySymbolDetector shiny_checker(COLOR_YELLOW);
+            bool check = shiny_checker.read(env.console.logger(), screen);
+
+            if (check){
+                env.log("Shiny detected!");
+                stats.shinies++;
+                env.update_stats();
+                send_program_notification(env, NOTIFICATION_SHINY, COLOR_YELLOW, "Shiny found!", {}, "", screen, true);
+                shiny_found = true;
+
+                //Back out to menu and favorite the shiny.
+                env.log("Favoriting shiny.");
+                pbf_press_button(context, BUTTON_B, 200ms, 5000ms);
+                pbf_press_button(context, BUTTON_A, 200ms, 1000ms);
+                pbf_move_joystick(context, {0, +1}, 100ms, 100ms);
+                pbf_move_joystick(context, {0, +1}, 100ms, 100ms);
+                pbf_move_joystick(context, {0, +1}, 100ms, 200ms);
+                pbf_press_button(context, BUTTON_A, 200ms, 800ms);
+                pbf_press_button(context, BUTTON_A, 200ms, 800ms);
+                pbf_press_button(context, BUTTON_B, 200ms, 800ms);
+
+                //Go into summary again
+                env.log("Navigating back into summary.");
+                pbf_press_button(context, BUTTON_A, 200ms, 1000ms);
+                pbf_move_joystick(context, {0, -1}, 100ms, 100ms);
+                pbf_move_joystick(context, {0, -1}, 100ms, 100ms);
+                pbf_press_button(context, BUTTON_A, 200ms, 100ms);
+                context.wait_for_all_requests();
+                pbf_wait(context, 5000ms);
+                context.wait_for_all_requests();
+            }else{
+                env.log("Not shiny.");
+            }
+
+            //Move left, check next.
+            pbf_move_joystick(context, {-1, 0}, 100ms, 100ms);
+            pbf_press_button(context, BUTTON_X, 0ms, 1000ms);
+            context.wait_for_all_requests();
+        }
+        
+        if (!shiny_found){
+            env.log("Out of Pokemon to trade and no shiny found. Resetting game.");
+            send_program_status_notification(
+                env, NOTIFICATION_STATUS_UPDATE,
+                "Out of Pokemon to trade and no shiny found. Resetting game."
+            );
+
+
+            reset_game_from_game(env, env.console, context, &stats.errors, 3000ms);
+            stats.resets++;
+            env.update_stats();
+        }
+    }
+
+    if (GO_HOME_WHEN_DONE){
+        pbf_press_button(context, BUTTON_HOME, 200ms, 1000ms);
+    }
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+}
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLGPE/Programs/ShinyHunting/PokemonLGPE_AlolanTrade.h b/SerialPrograms/Source/VideoGames/PokemonLGPE/Programs/ShinyHunting/PokemonLGPE_AlolanTrade.h
new file mode 100644
index 0000000000..1ade94ddfe
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLGPE/Programs/ShinyHunting/PokemonLGPE_AlolanTrade.h
@@ -0,0 +1,54 @@
+/*  LGPE Alolan Trade
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLGPE_AlolanTrade_H
+#define PokemonAutomation_PokemonLGPE_AlolanTrade_H
+
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/Controllers/Joycon/NintendoSwitch_Joycon.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLGPE{
+
+class AlolanTrade_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    AlolanTrade_Descriptor();
+    struct Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+class AlolanTrade : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = AlolanTrade_Descriptor;
+    AlolanTrade();
+    virtual void program(SingleSwitchProgramEnvironment& env, CancellableScope& scope) override;
+
+private:
+    void run_trade(SingleSwitchProgramEnvironment& env, JoyconContext& context);
+
+    SimpleIntegerOption<uint32_t> NUM_TRADES;
+    
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
+
+    EventNotificationOption NOTIFICATION_SHINY;
+    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+
+
+
+}
+}
+}
+#endif
+
+
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonLGPE/Programs/ShinyHunting/PokemonLGPE_FossilRevival.cpp b/SerialPrograms/Source/VideoGames/PokemonLGPE/Programs/ShinyHunting/PokemonLGPE_FossilRevival.cpp
new file mode 100644
index 0000000000..1259be9687
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLGPE/Programs/ShinyHunting/PokemonLGPE_FossilRevival.cpp
@@ -0,0 +1,303 @@
+/*  LGPE Fossil Revival
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "CommonTools/StartupChecks/VideoResolutionCheck.h"
+#include "CommonTools/VisualDetectors/BlackScreenDetector.h"
+#include "NintendoSwitch/Controllers/Joycon/NintendoSwitch_Joycon.h"
+//#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonLGPE/Inference/PokemonLGPE_ShinySymbolDetector.h"
+#include "VideoGames/PokemonLGPE/Programs/PokemonLGPE_GameEntry.h"
+#include "PokemonLGPE_FossilRevival.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLGPE{
+
+FossilRevival_Descriptor::FossilRevival_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonLGPE:FossilRevival",
+        Pokemon::STRING_POKEMON + " LGPE", "Fossil Revival",
+        "Programs/PokemonLGPE/FossilRevival.html",
+        "Shiny hunt fossil Pokemon by reviving and resetting.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::SpecializedController,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+struct FossilRevival_Descriptor::Stats : public StatsTracker{
+    Stats()
+        : revives(m_stats["Revives"])
+        , resets(m_stats["Resets"])
+        , shinies(m_stats["Shinies"])
+        , errors(m_stats["Errors"])
+    {
+        m_display_order.emplace_back("Revives");
+        m_display_order.emplace_back("Resets");
+        m_display_order.emplace_back("Shinies");
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+    }
+    std::atomic<uint64_t>& revives;
+    std::atomic<uint64_t>& resets;
+    std::atomic<uint64_t>& shinies;
+    std::atomic<uint64_t>& errors;
+};
+std::unique_ptr<StatsTracker> FossilRevival_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+FossilRevival::FossilRevival()
+    : SLOT(
+        "<b>Fossil slot:</b><br>Position of the fossil in the selection dialog.",
+        {
+            {0, "slot0", "Slot 1"},
+            {1, "slot1", "Slot 2"},
+            {2, "slot2", "Slot 3"},
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        0
+    )
+    ,NUM_REVIVALS(
+        "<b>Number of fossils to revive:</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        30, 1
+    )
+    , GO_HOME_WHEN_DONE(false)
+    , NOTIFICATION_SHINY(
+        "Shiny Found",
+        true, true, ImageAttachmentMode::JPG,
+        {"Notifs", "Showcase"}
+    )
+    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_SHINY,
+        &NOTIFICATION_STATUS_UPDATE,
+        &NOTIFICATION_PROGRAM_FINISH,
+    })
+{
+    PA_ADD_OPTION(SLOT);
+    PA_ADD_OPTION(NUM_REVIVALS);
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+void FossilRevival::run_revives(SingleSwitchProgramEnvironment& env, JoyconContext& context){
+    FossilRevival_Descriptor::Stats& stats = env.current_stats<FossilRevival_Descriptor::Stats>();
+    //Press A to get to selection
+    env.log("Starting dialog.");
+    pbf_press_button(context, BUTTON_A, 100ms, 800ms);
+    pbf_wait(context, 1000ms); //Wait for scientist to turn and face player
+    context.wait_for_all_requests();
+    pbf_press_button(context, BUTTON_A, 100ms, 500ms);
+    pbf_press_button(context, BUTTON_A, 100ms, 500ms);
+    pbf_press_button(context, BUTTON_A, 100ms, 500ms);
+    pbf_press_button(context, BUTTON_A, 100ms, 500ms);
+    context.wait_for_all_requests();
+
+    pbf_wait(context, 500ms);
+    context.wait_for_all_requests();
+
+    //Select fossil slot
+    env.log("Selecting fossil.");
+    for (uint16_t c = 0; c < (uint16_t)SLOT.current_value(); c++){
+        pbf_move_joystick(context, {0, -1}, 100ms, 200ms);
+    }
+    context.wait_for_all_requests();
+
+    //Mash A until revival over
+    BlackScreenOverWatcher revival_over(COLOR_RED);
+    int ret = run_until<JoyconContext>(
+        env.console, context,
+        [](JoyconContext& context){
+            pbf_mash_button(context, BUTTON_A, 15000ms);
+        },
+        {revival_over}
+    );
+    context.wait_for_all_requests();
+    if (ret != 0){
+        stats.errors++;
+        env.update_stats();
+        env.log("Failed to revive fossil.", COLOR_RED);
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "Failed to revive fossil.",
+            env.console
+        );
+    }else{
+        env.log("Fossil revived.");
+    }
+
+    //Now mash B until next black screen (end of summary/tucked pokemon away)
+    BlackScreenOverWatcher summary_over(COLOR_YELLOW);
+    int ret2 = run_until<JoyconContext>(
+        env.console, context,
+        [](JoyconContext& context){
+            pbf_mash_button(context, BUTTON_B, 15000ms);
+        },
+        {summary_over}
+    );
+    context.wait_for_all_requests();
+    if (ret2 != 0){
+        stats.errors++;
+        env.update_stats();
+        env.log("Did not detect summary over.", COLOR_RED);
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "Did not detect summary over.",
+            env.console
+        );
+    }else{
+        env.log("Summary closed/Pokemon tucked away in box/team.");
+    }
+
+    //Close out come back soon text.
+    pbf_mash_button(context, BUTTON_B, 1000ms);
+    context.wait_for_all_requests();
+}
+
+void FossilRevival::program(SingleSwitchProgramEnvironment& env, CancellableScope& scope){
+    JoyconContext context(scope, env.console.controller<RightJoycon>());
+    assert_16_9_720p_min(env.logger(), env.console);
+    FossilRevival_Descriptor::Stats& stats = env.current_stats<FossilRevival_Descriptor::Stats>();
+
+    /*
+    Settings:
+    Text speed fast
+
+    is first time dialog different? clear it out first.
+    selection dialog still appears if only one fossil type
+
+    Setup:
+    Stand in front of the scientist in cinnebar.
+    Save the game.
+    Start the program in-game.
+    */
+
+    bool shiny_found = false;
+    while (!shiny_found){
+        //Run revives
+        for (uint16_t i = 0; i < NUM_REVIVALS; i++){
+            env.log("Running trade.");
+            run_revives(env, context);
+
+            stats.revives++;
+            env.update_stats();
+        }
+
+        env.log("Done reviving. Checking boxes.");
+        send_program_status_notification(
+            env, NOTIFICATION_STATUS_UPDATE,
+            "Done reviving. Checking boxes."
+        );
+
+        //Wait a bit.
+        pbf_wait(context, 2500ms);
+        context.wait_for_all_requests();
+
+        //Open menu, open party, open boxes
+        env.log("Opening boxes.");
+        pbf_press_button(context, BUTTON_X, 200ms, 500ms);
+        pbf_press_button(context, BUTTON_A, 200ms, 1500ms);
+        pbf_press_button(context, BUTTON_Y, 200ms, 2000ms);
+        context.wait_for_all_requests();
+
+        //Sort by order caught
+        env.log("Sorting by order caught.");
+        pbf_press_button(context, BUTTON_Y, 200ms, 1000ms);
+        pbf_press_button(context, BUTTON_A, 200ms, 1000ms);
+        pbf_press_button(context, BUTTON_A, 200ms, 1000ms);
+        context.wait_for_all_requests();
+
+        //Press left to go to last (most recent) Pokemon
+        env.log("Opening summary of most recent Pokemon.");
+        pbf_move_joystick(context, {-1, 0}, 100ms, 100ms);
+        context.wait_for_all_requests();
+
+        //View summary - it takes a moment to load
+        pbf_press_button(context, BUTTON_A, 200ms, 1000ms);
+        pbf_move_joystick(context, {0, -1}, 100ms, 100ms);
+        pbf_move_joystick(context, {0, -1}, 100ms, 100ms);
+        pbf_press_button(context, BUTTON_A, 200ms, 100ms);
+        context.wait_for_all_requests();
+
+        pbf_wait(context, 5000ms);
+        context.wait_for_all_requests();
+
+        //Now check for shinies. Check everything that was traded.
+        env.log("Checking received Pokemon.");
+        for (uint16_t i = 0; i < NUM_REVIVALS; i++){
+            VideoSnapshot screen = env.console.video().snapshot();
+            ShinySymbolDetector shiny_checker(COLOR_YELLOW);
+            bool check = shiny_checker.read(env.console.logger(), screen);
+
+            if (check){
+                env.log("Shiny detected!");
+                stats.shinies++;
+                env.update_stats();
+                send_program_notification(env, NOTIFICATION_SHINY, COLOR_YELLOW, "Shiny found!", {}, "", screen, true);
+                shiny_found = true;
+
+                //Back out to menu and favorite the shiny.
+                env.log("Favoriting shiny.");
+                pbf_press_button(context, BUTTON_B, 200ms, 5000ms);
+                pbf_press_button(context, BUTTON_A, 200ms, 1000ms);
+                pbf_move_joystick(context, {0, +1}, 100ms, 100ms);
+                pbf_move_joystick(context, {0, +1}, 100ms, 100ms);
+                pbf_move_joystick(context, {0, +1}, 100ms, 200ms);
+                pbf_press_button(context, BUTTON_A, 200ms, 800ms);
+                pbf_press_button(context, BUTTON_A, 200ms, 800ms);
+                pbf_press_button(context, BUTTON_B, 200ms, 800ms);
+
+                //Go into summary again
+                env.log("Navigating back into summary.");
+                pbf_press_button(context, BUTTON_A, 200ms, 1000ms);
+                pbf_move_joystick(context, {0, -1}, 100ms, 100ms);
+                pbf_move_joystick(context, {0, -1}, 100ms, 100ms);
+                pbf_press_button(context, BUTTON_A, 200ms, 100ms);
+                context.wait_for_all_requests();
+                pbf_wait(context, 5000ms);
+                context.wait_for_all_requests();
+            }else{
+                env.log("Not shiny.");
+            }
+
+            //Move left, check next.
+            pbf_move_joystick(context, {-1, 0}, 100ms, 100ms);
+            pbf_press_button(context, BUTTON_X, 0ms, 1000ms);
+            context.wait_for_all_requests();
+        }
+        
+        if (!shiny_found){
+            env.log("Out of Pokemon to check and no shiny found. Resetting game.");
+            send_program_status_notification(
+                env, NOTIFICATION_STATUS_UPDATE,
+                "Out of Pokemon to check and no shiny found. Resetting game."
+            );
+
+            reset_game_from_game(env, env.console, context, &stats.errors, 3000ms);
+            stats.resets++;
+            env.update_stats();
+        }
+    }
+
+    if (GO_HOME_WHEN_DONE){
+        pbf_press_button(context, BUTTON_HOME, 200ms, 1000ms);
+    }
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+}
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLGPE/Programs/ShinyHunting/PokemonLGPE_FossilRevival.h b/SerialPrograms/Source/VideoGames/PokemonLGPE/Programs/ShinyHunting/PokemonLGPE_FossilRevival.h
new file mode 100644
index 0000000000..a89fc24cbe
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLGPE/Programs/ShinyHunting/PokemonLGPE_FossilRevival.h
@@ -0,0 +1,56 @@
+/*  LGPE Fossil Revival
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLGPE_FossilRevival_H
+#define PokemonAutomation_PokemonLGPE_FossilRevival_H
+
+#include "Common/Cpp/Options/EnumDropdownOption.h"
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/Controllers/Joycon/NintendoSwitch_Joycon.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLGPE{
+
+class FossilRevival_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    FossilRevival_Descriptor();
+    struct Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+class FossilRevival : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = FossilRevival_Descriptor;
+    FossilRevival();
+    virtual void program(SingleSwitchProgramEnvironment& env, CancellableScope& scope) override;
+
+private:
+    void run_revives(SingleSwitchProgramEnvironment& env, JoyconContext& context);
+
+    IntegerEnumDropdownOption SLOT;
+    SimpleIntegerOption<uint32_t> NUM_REVIVALS;
+    
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
+
+    EventNotificationOption NOTIFICATION_SHINY;
+    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+
+
+
+}
+}
+}
+#endif
+
+
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonLGPE/Programs/ShinyHunting/PokemonLGPE_GiftReset.cpp b/SerialPrograms/Source/VideoGames/PokemonLGPE/Programs/ShinyHunting/PokemonLGPE_GiftReset.cpp
new file mode 100644
index 0000000000..63339e78f8
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLGPE/Programs/ShinyHunting/PokemonLGPE_GiftReset.cpp
@@ -0,0 +1,198 @@
+/*  LGPE Gift Reset
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "CommonTools/StartupChecks/VideoResolutionCheck.h"
+#include "CommonTools/VisualDetectors/BlackScreenDetector.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Controllers/Joycon/NintendoSwitch_Joycon.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonLGPE/Inference/PokemonLGPE_ShinySymbolDetector.h"
+#include "VideoGames/PokemonLGPE/Programs/PokemonLGPE_GameEntry.h"
+#include "PokemonLGPE_GiftReset.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLGPE{
+
+GiftReset_Descriptor::GiftReset_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonLGPE:GiftReset",
+        Pokemon::STRING_POKEMON + " LGPE", "Gift Reset",
+        "Programs/PokemonLGPE/GiftReset.html",
+        "Shiny hunt gift Pokemon by resetting the game.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::SpecializedController,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+struct GiftReset_Descriptor::Stats : public StatsTracker{
+    Stats()
+        : resets(m_stats["Resets"])
+        , shinies(m_stats["Shinies"])
+        , errors(m_stats["Errors"])
+    {
+        m_display_order.emplace_back("Resets");
+        m_display_order.emplace_back("Shinies");
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+    }
+    std::atomic<uint64_t>& resets;
+    std::atomic<uint64_t>& shinies;
+    std::atomic<uint64_t>& errors;
+};
+std::unique_ptr<StatsTracker> GiftReset_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+GiftReset::GiftReset()
+    : EXTRA_DIALOG(
+        "<b>Persian/Arcanine:</b><br>Check this if the gift Pokemon is Persian or Arcanine.",
+        LockMode::UNLOCK_WHILE_RUNNING, false
+    )
+    , GO_HOME_WHEN_DONE(false)
+    , NOTIFICATION_SHINY(
+        "Shiny Found",
+        true, true, ImageAttachmentMode::JPG,
+        {"Notifs", "Showcase"}
+    )
+    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_SHINY,
+        &NOTIFICATION_STATUS_UPDATE,
+        &NOTIFICATION_PROGRAM_FINISH,
+    })
+{
+    PA_ADD_OPTION(EXTRA_DIALOG);
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+void GiftReset::program(SingleSwitchProgramEnvironment& env, CancellableScope& scope){
+    JoyconContext context(scope, env.console.controller<RightJoycon>());
+    assert_16_9_720p_min(env.logger(), env.console);
+    GiftReset_Descriptor::Stats& stats = env.current_stats<GiftReset_Descriptor::Stats>();
+
+    /*
+    Setup:
+    Stand in front of trade NPC.
+    Start the program in-game.
+
+    Must have 500yen for magikarp.
+    Gift Pokemon: https://www.serebii.net/letsgopikachueevee/gift.shtml
+    Tested with Magikarp on a new save. Should work with most of the others.
+    Can always add a dropdown with target if it doesn't.
+    Fossils will be handled in a different program.
+    */
+
+    bool shiny_found = false;
+    while (!shiny_found){
+        //Purchase Magikarp
+        BlackScreenOverWatcher gift_obtained(COLOR_RED);
+        int ret = run_until<JoyconContext>(
+            env.console, context,
+            [](JoyconContext& context){
+                pbf_mash_button(context, BUTTON_A, 20000ms);
+            },
+            {gift_obtained}
+        );
+        context.wait_for_all_requests();
+        if (ret != 0){
+            stats.errors++;
+            env.update_stats();
+            env.log("Failed to receive gift Pokemon.", COLOR_RED);
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "Failed to receive gift Pokemon.",
+                env.console
+            );
+        }else{
+            env.log("Received gift Pokemon.");
+        }
+        send_program_status_notification(
+            env, NOTIFICATION_STATUS_UPDATE,
+            "Received gift Pokemon."
+        );
+
+        if (EXTRA_DIALOG){
+            env.log("Persian/Arcanine selected. Mashing B to exit dialog.");
+            pbf_mash_button(context, BUTTON_B, 4100ms);
+            context.wait_for_all_requests();
+        }
+
+        //Wait a bit.
+        pbf_wait(context, 2500ms);
+        context.wait_for_all_requests();
+
+        //Open menu, open party, open boxes
+        env.log("Opening boxes.");
+        pbf_press_button(context, BUTTON_X, 200ms, 500ms);
+        pbf_press_button(context, BUTTON_A, 200ms, 1500ms);
+        pbf_press_button(context, BUTTON_Y, 200ms, 2000ms);
+        context.wait_for_all_requests();
+
+        //Sort by order caught
+        env.log("Sorting by order caught.");
+        pbf_press_button(context, BUTTON_Y, 200ms, 1000ms);
+        pbf_press_button(context, BUTTON_A, 200ms, 1000ms);
+        pbf_press_button(context, BUTTON_A, 200ms, 1000ms);
+        context.wait_for_all_requests();
+
+        //Press left to go to last (most recent) Pokemon
+        env.log("Opening summary of most recent Pokemon.");
+        pbf_move_joystick(context, {-1, 0}, 100ms, 100ms);
+        context.wait_for_all_requests();
+
+        //View summary - it takes a moment to load
+        env.log("Viewing summary.");
+        pbf_press_button(context, BUTTON_A, 200ms, 1000ms);
+        pbf_move_joystick(context, {0, -1}, 100ms, 100ms);
+        pbf_move_joystick(context, {0, -1}, 100ms, 100ms);
+        pbf_press_button(context, BUTTON_A, 200ms, 100ms);
+        context.wait_for_all_requests();
+
+        pbf_wait(context, 5000ms);
+        context.wait_for_all_requests();
+
+        //Now check for shinies. Check everything that was traded.
+        VideoSnapshot screen = env.console.video().snapshot();
+        ShinySymbolDetector shiny_checker(COLOR_YELLOW);
+        bool check = shiny_checker.read(env.console.logger(), screen);
+
+        if (check){
+            env.log("Shiny detected!");
+            stats.shinies++;
+            env.update_stats();
+            send_program_notification(env, NOTIFICATION_SHINY, COLOR_YELLOW, "Shiny found!", {}, "", screen, true);
+            shiny_found = true;
+        }else{
+            env.log("Not shiny. Resetting game.");
+            send_program_status_notification(
+                env, NOTIFICATION_STATUS_UPDATE,
+                "Not shiny. Resetting game."
+            );
+
+            reset_game_from_game(env, env.console, context, &stats.errors, 3000ms);
+            stats.resets++;
+            env.update_stats();
+        }
+    }
+
+    if (GO_HOME_WHEN_DONE){
+        pbf_press_button(context, BUTTON_HOME, 200ms, 1000ms);
+    }
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+}
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLGPE/Programs/ShinyHunting/PokemonLGPE_GiftReset.h b/SerialPrograms/Source/VideoGames/PokemonLGPE/Programs/ShinyHunting/PokemonLGPE_GiftReset.h
new file mode 100644
index 0000000000..b3165f13af
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLGPE/Programs/ShinyHunting/PokemonLGPE_GiftReset.h
@@ -0,0 +1,49 @@
+/*  LGPE Gift Reset
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLGPE_GiftReset_H
+#define PokemonAutomation_PokemonLGPE_GiftReset_H
+
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLGPE{
+
+class GiftReset_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    GiftReset_Descriptor();
+    struct Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+class GiftReset : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = GiftReset_Descriptor;
+    GiftReset();
+    virtual void program(SingleSwitchProgramEnvironment& env, CancellableScope& scope) override;
+
+private:
+    BooleanCheckBoxOption EXTRA_DIALOG;
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
+
+    EventNotificationOption NOTIFICATION_SHINY;
+    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+
+
+
+}
+}
+}
+#endif
+
+
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonLGPE/Programs/ShinyHunting/PokemonLGPE_LegendaryReset.cpp b/SerialPrograms/Source/VideoGames/PokemonLGPE/Programs/ShinyHunting/PokemonLGPE_LegendaryReset.cpp
new file mode 100644
index 0000000000..329f1bcae8
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLGPE/Programs/ShinyHunting/PokemonLGPE_LegendaryReset.cpp
@@ -0,0 +1,279 @@
+/*  LGPE Legendary Reset
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "CommonTools/StartupChecks/VideoResolutionCheck.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Controllers/Joycon/NintendoSwitch_Joycon.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonLGPE/Inference/Battles/PokemonLGPE_BattleArrowDetector.h"
+#include "VideoGames/PokemonLGPE/Inference/Sounds/PokemonLGPE_ShinySoundDetector.h"
+#include "VideoGames/PokemonLGPE/Programs/PokemonLGPE_GameEntry.h"
+#include "PokemonLGPE_LegendaryReset.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLGPE{
+
+LegendaryReset_Descriptor::LegendaryReset_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonLGPE:LegendaryReset",
+        Pokemon::STRING_POKEMON + " LGPE", "Legendary Reset",
+        "Programs/PokemonLGPE/LegendaryReset.html",
+        "Shiny hunt Legendary Pokemon by resetting the game.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::SpecializedController,
+        FeedbackType::VIDEO_AUDIO,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+struct LegendaryReset_Descriptor::Stats : public StatsTracker{
+    Stats()
+        : resets(m_stats["Resets"])
+        , shinies(m_stats["Shinies"])
+        , errors(m_stats["Errors"])
+    {
+        m_display_order.emplace_back("Resets");
+        m_display_order.emplace_back("Shinies");
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+    }
+    std::atomic<uint64_t>& resets;
+    std::atomic<uint64_t>& shinies;
+    std::atomic<uint64_t>& errors;
+};
+std::unique_ptr<StatsTracker> LegendaryReset_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+LegendaryReset::LegendaryReset()
+    : TARGET(
+        "<b>Target:</b><br>",
+        {
+            {Target::mewtwo, "mewtwo", "Mewtwo, Articuno, Zapdos, Moltres"},
+            {Target::snorlax, "snorlax", "Snorlax"},
+            {Target::electrode, "electrode", "Electrode"},
+            //{Target::snorlax2, "snorlax2", "Snorlax (w/Fuji)"},
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        Target::mewtwo
+    )
+    , GO_HOME_WHEN_DONE(true)
+    , NOTIFICATION_SHINY(
+        "Shiny Found",
+        true, true, ImageAttachmentMode::JPG,
+        {"Notifs", "Showcase"}
+    )
+    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_SHINY,
+        &NOTIFICATION_STATUS_UPDATE,
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_RECOVERABLE,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+{
+    PA_ADD_OPTION(TARGET);
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+bool LegendaryReset::run_encounter(SingleSwitchProgramEnvironment& env, JoyconContext& context){
+    LegendaryReset_Descriptor::Stats& stats = env.current_stats<LegendaryReset_Descriptor::Stats>();
+    float shiny_coefficient = 1.0;
+    ShinySoundDetector shiny_detector(env.logger(), [&](float error_coefficient) -> bool{
+        shiny_coefficient = error_coefficient;
+        return true;
+    });
+    BattleArrowWatcher battle_started(COLOR_RED, {0.546, 0.863, 0.045, 0.068});
+
+    env.log("Starting battle.");
+    switch (TARGET){
+    case Target::mewtwo:
+        pbf_mash_button(context, BUTTON_A, 3000ms);
+        context.wait_for_all_requests();
+        pbf_press_button(context, BUTTON_PLUS, 500ms, 100ms);
+        break;
+    case Target::snorlax:
+        pbf_mash_button(context, BUTTON_A, 5000ms);
+        context.wait_for_all_requests();
+        pbf_mash_button(context, BUTTON_B, 10000ms);
+        break;
+    case Target::electrode:
+        pbf_press_button(context, BUTTON_A, 200ms, 200ms);
+        pbf_mash_button(context, BUTTON_B, 5000ms);
+        break;
+    }
+    context.wait_for_all_requests();
+
+    int res = run_until<JoyconContext>(
+        env.console, context,
+        [&](JoyconContext& context){
+            int ret = wait_until(
+                env.console, context,
+                std::chrono::seconds(90),
+                {{battle_started}}
+            );
+            if (ret == 0){
+                env.log("HP boxes detected.");
+            }else{
+                stats.errors++;
+                env.update_stats();
+                OperationFailedExceptionWithScreenshot::fire(
+                    ErrorReportMode::SEND_ERROR_REPORT,
+                    "run_battle(): Did not detect battle start.",
+                    env.console
+                );
+            }
+            context.wait_for_all_requests();
+        },
+        {{shiny_detector}}
+    );
+    shiny_detector.throw_if_no_sound();
+    if (res == 0){
+        env.log("Shiny detected!");
+        return true;
+    }
+    env.log("Shiny not found.");
+
+    return false;
+}
+
+void LegendaryReset::program(SingleSwitchProgramEnvironment& env, CancellableScope& scope){
+    JoyconContext context(scope, env.console.controller<RightJoycon>());
+    assert_16_9_720p_min(env.logger(), env.console);
+    LegendaryReset_Descriptor::Stats& stats = env.current_stats<LegendaryReset_Descriptor::Stats>();
+
+    /*
+    Setup:
+    Stand in front of encounter. (And save)
+    Start the program in game.
+    Your lead must not be shiny.
+
+    Settings:
+    Text Speed fast
+    Skip cutscene On
+    Skip move animation On
+
+    Mewtwo, Articuno, Zapdos, Moltres, Snorlax, Electrode(?)
+    Don't do it on the first Snorlax, otherwise have to sit through fuji tutorial
+    */
+
+    size_t consecutive_failures = 0;
+
+    while (true){
+        env.update_stats();
+
+        if (consecutive_failures >= 3){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "Failed 3 times in the row.",
+                env.console
+            );
+        }
+
+        try{
+            bool encounter_battle = run_encounter(env, context);
+            if (encounter_battle){
+                stats.shinies++;
+                env.update_stats();
+                send_program_notification(env, NOTIFICATION_SHINY, COLOR_YELLOW, "Shiny found!", {}, "", env.console.video().snapshot(), true);
+                break;
+            }
+
+            env.log("No shiny found. Resetting game.");
+            send_program_status_notification(
+                env, NOTIFICATION_STATUS_UPDATE,
+                "No shiny found. Resetting game."
+            );
+            context.wait_for_all_requests();
+            consecutive_failures = 0;
+        }catch (OperationFailedExceptionWithScreenshot& e){
+            e.send_recoverable_error_notif_and_telemetry_report(env, NOTIFICATION_ERROR_RECOVERABLE);
+            consecutive_failures++;
+        }
+
+        reset_game_from_game(env, env.console, context, &stats.errors, 3000ms);
+        stats.resets++;
+    }
+    //Shiny found, complete the battle
+    WallClock start = current_time();
+    BattleArrowWatcher catching_started(COLOR_RED, {0.004251, 0.638941, 0.062699, 0.115312});
+    int res = run_until<JoyconContext>(
+        env.console, context,
+        [&](JoyconContext& context){
+            while(true){
+                if (current_time() - start > std::chrono::minutes(5)){
+                    stats.errors++;
+                    env.update_stats();
+                    env.log("Timed out during battle after 5 minutes.", COLOR_RED);
+                    OperationFailedExceptionWithScreenshot::fire(
+                        ErrorReportMode::SEND_ERROR_REPORT,
+                        "Timed out during battle after 5 minutes.",
+                        env.console
+                    );
+                }
+                BattleArrowWatcher battle_menu(COLOR_YELLOW, {0.546, 0.863, 0.045, 0.068});
+                context.wait_for_all_requests();
+
+                int ret = wait_until(
+                    env.console, context,
+                    std::chrono::seconds(30),
+                    { battle_menu }
+                );
+                switch (ret){
+                case 0:
+                    env.log("Detected battle menu. Mashing A to attack.");
+                    pbf_mash_button(context, BUTTON_A, 3000ms);
+                    context.wait_for_all_requests();
+                    break;
+                default:
+                    stats.errors++;
+                    env.update_stats();
+                    env.log("Timed out during battle. Stuck, crashed, or took more than 30 seconds for a turn.", COLOR_RED);
+                    OperationFailedExceptionWithScreenshot::fire(
+                        ErrorReportMode::SEND_ERROR_REPORT,
+                        "Timed out during battle. Stuck, crashed, or took more than 30 seconds for a turn.",
+                        env.console
+                    );
+                }
+            }
+        },
+        {{catching_started}}
+    );
+    switch (res){
+    case 0:
+        env.log("Catching menu detected.");
+        send_program_status_notification(
+            env, NOTIFICATION_STATUS_UPDATE,
+            "Catching menu detected."
+        );
+        break;
+    default:
+        stats.errors++;
+        env.update_stats();
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "Failed to detect catching menu.",
+            env.console
+        );
+        break;
+    }
+
+    if (GO_HOME_WHEN_DONE){
+        pbf_press_button(context, BUTTON_HOME, 200ms, 1000ms);
+    }
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+}
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLGPE/Programs/ShinyHunting/PokemonLGPE_LegendaryReset.h b/SerialPrograms/Source/VideoGames/PokemonLGPE/Programs/ShinyHunting/PokemonLGPE_LegendaryReset.h
new file mode 100644
index 0000000000..f4c1748432
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLGPE/Programs/ShinyHunting/PokemonLGPE_LegendaryReset.h
@@ -0,0 +1,59 @@
+/*  LGPE Legendary Reset
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLGPE_LegendaryReset_H
+#define PokemonAutomation_PokemonLGPE_LegendaryReset_H
+
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/Controllers/Joycon/NintendoSwitch_Joycon.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLGPE{
+
+class LegendaryReset_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    LegendaryReset_Descriptor();
+    struct Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+class LegendaryReset : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = LegendaryReset_Descriptor;
+    LegendaryReset();
+    virtual void program(SingleSwitchProgramEnvironment& env, CancellableScope& scope) override;
+
+private:
+    bool run_encounter(SingleSwitchProgramEnvironment& env, JoyconContext& context);
+
+    enum class Target{
+        mewtwo,
+        snorlax,
+        electrode,
+        //snorlax2,
+    };
+    EnumDropdownOption<Target> TARGET;
+
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
+
+    EventNotificationOption NOTIFICATION_SHINY;
+    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+
+
+
+}
+}
+}
+#endif
+
+
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonLGPE/Programs/TestPrograms/PokemonLGPE_SoundListener.cpp b/SerialPrograms/Source/VideoGames/PokemonLGPE/Programs/TestPrograms/PokemonLGPE_SoundListener.cpp
new file mode 100644
index 0000000000..f80e410099
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLGPE/Programs/TestPrograms/PokemonLGPE_SoundListener.cpp
@@ -0,0 +1,92 @@
+/*  Sound Listener
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <chrono>
+#include <iostream>
+#include "Common/Cpp/Exceptions.h"
+#include "CommonTools/Async/InferenceSession.h"
+#include "NintendoSwitch/Controllers/Joycon/NintendoSwitch_Joycon.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonLGPE/Inference/Sounds/PokemonLGPE_ShinySoundDetector.h"
+#include "PokemonLGPE_SoundListener.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLGPE{
+    using namespace Pokemon;
+
+
+SoundListener_Descriptor::SoundListener_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonLGPE:SoundListener",
+        STRING_POKEMON + " LGPE", "Sound Listener",
+        "",
+        "Test sound detectors listening to audio stream.",
+        PanelQualityStanding::DEVELOPER,
+        ProgramControllerClass::SpecializedController,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::ENABLE_COMMANDS
+    )
+{}
+
+
+SoundListener::SoundListener()
+    : SOUND_TYPE("<b>Which Sound to Detect</b>",
+        {
+            {SoundType::SHINY, "shiny", "Shiny Sound"},
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        SoundType::SHINY
+    )
+    , STOP_ON_DETECTED_SOUND(
+        "<b>Stop on the detected sound</b><br>Stop program when the sound is detected.",
+        LockMode::LOCK_WHILE_RUNNING,
+        false
+    )
+{
+    PA_ADD_OPTION(SOUND_TYPE);
+    PA_ADD_OPTION(STOP_ON_DETECTED_SOUND);
+}
+
+void SoundListener::program(SingleSwitchProgramEnvironment& env, CancellableScope& scope){
+    JoyconContext context(scope, env.console.controller<JoyconController>());
+
+    std::cout << "Running audio test program." << std::endl;
+
+    std::shared_ptr<AudioInferenceCallback> detector;
+    auto action = [&](float error_coefficient) -> bool{
+        // This lambda function will be called when the sound is detected.
+        // Its return will determine whether to stop the program:
+        return STOP_ON_DETECTED_SOUND;
+    };
+
+    SoundType type = SOUND_TYPE;
+    switch (type){
+    case SoundType::SHINY:
+        detector = std::make_shared<ShinySoundDetector>(env.console, action);
+        break;
+    default:
+        throw InternalProgramError(
+            &env.logger(), PA_CURRENT_FUNCTION,
+            "No such sound detector as sound type " + std::to_string((size_t)type)
+        );
+        return;
+    }
+
+    InferenceSession session(
+        context, env.console,
+        {{*detector, std::chrono::milliseconds(20)}}
+    );
+    context.wait_until_cancel();
+
+    std::cout << "Audio test program Sound listener finished." << std::endl;
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLGPE/Programs/TestPrograms/PokemonLGPE_SoundListener.h b/SerialPrograms/Source/VideoGames/PokemonLGPE/Programs/TestPrograms/PokemonLGPE_SoundListener.h
new file mode 100644
index 0000000000..edeb030a16
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLGPE/Programs/TestPrograms/PokemonLGPE_SoundListener.h
@@ -0,0 +1,53 @@
+/*  Sound Listener
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *  
+ *  Debug program to test all kinds of sound detectors.
+ */
+
+#ifndef PokemonAutomation_PokemonLGPE_SoundListener_H
+#define PokemonAutomation_PokemonLGPE_SoundListener_H
+
+#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "Common/Cpp/Options/EnumDropdownOption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+//#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+
+namespace PokemonAutomation{ 
+namespace NintendoSwitch{
+namespace PokemonLGPE{
+
+
+class SoundListener_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    SoundListener_Descriptor();
+};
+
+
+class SoundListener : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = SoundListener_Descriptor;
+    SoundListener();
+    virtual void program(SingleSwitchProgramEnvironment& env, CancellableScope& scope) override;
+
+    virtual void start_program_border_check(
+        VideoStream& stream,
+        FeedbackType feedback_type
+    ) override{}
+
+private:
+    enum class SoundType{
+        SHINY,
+    };
+
+    EnumDropdownOption<SoundType> SOUND_TYPE;
+    BooleanCheckBoxOption STOP_ON_DETECTED_SOUND;
+};
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Battles/PokemonLZA_MoveEffectivenessSymbol.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Battles/PokemonLZA_MoveEffectivenessSymbol.cpp
new file mode 100644
index 0000000000..9ffcb64b92
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Battles/PokemonLZA_MoveEffectivenessSymbol.cpp
@@ -0,0 +1,195 @@
+/*  Move Effectiveness Symbol
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Kernels/Waterfill/Kernels_Waterfill_Session.h"
+//#include "CommonFramework/Logging/Logger.h"
+#include "CommonTools/Images/ImageFilter.h"
+#include "CommonTools/Images/BinaryImage_FilterRgb32.h"
+#include "PokemonLZA_MoveEffectivenessSymbol.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+
+const char* template_path(MoveEffectivenessSymbol symbol){
+    switch (symbol){
+    case MoveEffectivenessSymbol::NoEffect:
+        return "PokemonLZA/MoveEffectiveness/MoveEffectiveness-NoEffect.png";
+    case MoveEffectivenessSymbol::NotVeryEffective:
+        return "PokemonLZA/MoveEffectiveness/MoveEffectiveness-NotVeryEffective.png";
+    case MoveEffectivenessSymbol::Normal:
+        return "PokemonLZA/MoveEffectiveness/MoveEffectiveness-Normal.png";
+    case MoveEffectivenessSymbol::SuperEffective:
+        return "PokemonLZA/MoveEffectiveness/MoveEffectiveness-SuperEffective.png";
+    default:
+        return "";
+    }
+}
+
+
+const char* to_string(MoveEffectivenessSymbol symbol){
+    switch (symbol){
+    case MoveEffectivenessSymbol::NoEffect:
+        return "No Effect";
+    case MoveEffectivenessSymbol::NotVeryEffective:
+        return "Not Very Effective";
+    case MoveEffectivenessSymbol::Normal:
+        return "Effective";
+    case MoveEffectivenessSymbol::SuperEffective:
+        return "Super Effective";
+    default:
+        return nullptr;
+    }
+}
+
+
+
+
+MoveEffectivenessSymbolMatcher::MoveEffectivenessSymbolMatcher(MoveEffectivenessSymbol symbol)
+    : WaterfillTemplateMatcher(
+        template_path(symbol),
+        Color(0xffe0e0e0),
+        Color(0xffffffff),
+        100
+    )
+{}
+
+
+
+MoveEffectivenessSymbolDetector::MoveEffectivenessSymbolDetector(Color color, VideoOverlay* overlay)
+    : m_color(color)
+    , m_box_top(0.780000, 0.750000, 0.025000, 0.041000)
+    , m_box_left(0.750000, 0.800000, 0.025000, 0.041000)
+    , m_box_right(0.806000, 0.800000, 0.025000, 0.041000)
+    , m_box_bottom(0.780000, 0.850000, 0.025000, 0.041000)
+    , m_overlay(overlay)
+{}
+
+void MoveEffectivenessSymbolDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, ImageFloatBox(0.729553, 0.704854, 0.125409, 0.223301));
+//    items.add(m_color, m_box_top);
+//    items.add(m_color, m_box_left);
+//    items.add(m_color, m_box_right);
+//    items.add(m_color, m_box_bottom);
+}
+bool MoveEffectivenessSymbolDetector::detect(const ImageViewRGB32& screen){
+    bool found = false;
+    found |= detect_box(0, screen, m_box_top);
+    found |= detect_box(1, screen, m_box_left);
+    found |= detect_box(2, screen, m_box_right);
+    found |= detect_box(3, screen, m_box_bottom);
+    return found;
+}
+bool MoveEffectivenessSymbolDetector::detect_box(
+    int index,
+    const ImageViewRGB32& screen,
+    const ImageFloatBox& box
+){
+    using namespace Kernels::Waterfill;
+
+    const std::vector<std::pair<uint32_t, uint32_t>> FILTERS{
+//        {0xff808080, 0xffffffff},
+//        {0xff909090, 0xffffffff},
+//        {0xffa0a0a0, 0xffffffff},
+//        {0xffb0b0b0, 0xffffffff},
+        {0xffc0c0c0, 0xffffffff},
+        {0xffd0d0d0, 0xffffffff},
+        {0xffe0e0e0, 0xffffffff},
+        {0xfff0f0f0, 0xffffffff},
+    };
+
+    ImageViewRGB32 image = extract_box_reference(screen, box);
+
+    double best_rmsd = 99999;
+    MoveEffectivenessSymbol best_symbol = MoveEffectivenessSymbol::None;
+    ImagePixelBox best_box;
+    Color best_color;
+    const char* best_label = nullptr;
+
+    std::vector<PackedBinaryMatrix> matrices = compress_rgb32_to_binary_range(image, FILTERS);
+    auto session = make_WaterfillSession();
+    for (PackedBinaryMatrix& matrix : matrices){
+        ImageRGB32 filtered = image.copy();
+        filter_by_mask(matrix, filtered, Color(0xff000000), true);
+
+        session->set_source(matrix);
+        auto iter = session->make_iterator(50);
+
+        WaterfillObject object;
+        while (iter->find_next(object, false)){
+            ImageViewRGB32 cropped = extract_box_reference(filtered, object);
+            {
+                double rmsd = MoveEffectivenessSymbolMatcher::NoEffect().rmsd(screen.size(), cropped);
+                if (best_rmsd > rmsd){
+                    best_rmsd = rmsd;
+                    best_symbol = MoveEffectivenessSymbol::NoEffect;
+                    best_box = object;
+                    best_color = COLOR_RED;
+                    best_label = "No Effect";
+                }
+            }
+            {
+                double rmsd = MoveEffectivenessSymbolMatcher::NotVeryEffective().rmsd(screen.size(), cropped);
+                if (best_rmsd > rmsd){
+                    best_rmsd = rmsd;
+                    best_symbol = MoveEffectivenessSymbol::NotVeryEffective;
+                    best_box = object;
+                    best_color = COLOR_YELLOW;
+                    best_label = "Not Very Effective";
+                }
+            }
+            {
+                double rmsd = MoveEffectivenessSymbolMatcher::Normal().rmsd(screen.size(), cropped);
+                if (best_rmsd > rmsd){
+                    best_rmsd = rmsd;
+                    best_symbol = MoveEffectivenessSymbol::Normal;
+                    best_box = object;
+                    best_color = COLOR_GREEN;
+                    best_label = "Effective";
+                }
+            }
+            {
+                double rmsd = MoveEffectivenessSymbolMatcher::SuperEffective().rmsd(screen.size(), cropped);
+                if (best_rmsd > rmsd){
+                    best_rmsd = rmsd;
+                    best_symbol = MoveEffectivenessSymbol::SuperEffective;
+                    best_box = object;
+                    best_color = COLOR_BLUE;
+                    best_label = "Super Effective";
+                }
+            }
+        }
+    }
+
+//    cout << "best_symbol = " << (int)best_symbol << ", rmsd = " << best_rmsd << endl;
+
+    if (best_rmsd > 150){
+        m_last_detection[index] = MoveEffectivenessSymbol::None;
+        m_last_detection_boxes[index].reset();
+        return false;
+    }else{
+        m_last_detection[index] = best_symbol;
+        m_last_detection_boxes[index].emplace(
+            *m_overlay,
+            best_color,
+            translate_to_parent(screen, box, best_box),
+            best_label
+        );
+//        global_logger_tagged().log("Detected!");
+        return true;
+    }
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Battles/PokemonLZA_MoveEffectivenessSymbol.h b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Battles/PokemonLZA_MoveEffectivenessSymbol.h
new file mode 100644
index 0000000000..b9ac700110
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Battles/PokemonLZA_MoveEffectivenessSymbol.h
@@ -0,0 +1,123 @@
+/*  Move Effectiveness Symbol
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLZA_MoveEffectivenessSymbol_H
+#define PokemonAutomation_PokemonLZA_MoveEffectivenessSymbol_H
+
+#include <optional>
+#include "Common/Cpp/Color.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/VisualDetector.h"
+#include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+
+
+
+enum class MoveEffectivenessSymbol{
+    None,
+    NoEffect,
+    NotVeryEffective,
+    Normal,
+    SuperEffective,
+};
+const char* to_string(MoveEffectivenessSymbol symbol);
+
+
+
+class MoveEffectivenessSymbolMatcher : public ImageMatch::WaterfillTemplateMatcher{
+public:
+    MoveEffectivenessSymbolMatcher(MoveEffectivenessSymbol symbol);
+
+    static const MoveEffectivenessSymbolMatcher& NoEffect(){
+        static MoveEffectivenessSymbolMatcher matcher(MoveEffectivenessSymbol::NoEffect);
+        return matcher;
+    }
+    static const MoveEffectivenessSymbolMatcher& NotVeryEffective(){
+        static MoveEffectivenessSymbolMatcher matcher(MoveEffectivenessSymbol::NotVeryEffective);
+        return matcher;
+    }
+    static const MoveEffectivenessSymbolMatcher& Normal(){
+        static MoveEffectivenessSymbolMatcher matcher(MoveEffectivenessSymbol::Normal);
+        return matcher;
+    }
+    static const MoveEffectivenessSymbolMatcher& SuperEffective(){
+        static MoveEffectivenessSymbolMatcher matcher(MoveEffectivenessSymbol::SuperEffective);
+        return matcher;
+    }
+
+    virtual bool check_image(Resolution input_resolution, const ImageViewRGB32& image) const override{
+        size_t min_width = 40 * input_resolution.width / 3840;
+        size_t min_height = 40 * input_resolution.height / 2160;
+        return image.width() >= min_width && image.height() >= min_height;
+    };
+
+
+};
+
+
+
+
+
+class MoveEffectivenessSymbolDetector : public StaticScreenDetector{
+public:
+    MoveEffectivenessSymbolDetector(Color color, VideoOverlay* overlay);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+    //  index 0: top
+    //  index 1: left
+    //  index 2: right
+    //  index 3: bottom
+    MoveEffectivenessSymbol operator[](size_t index) const{
+        return m_last_detection[index];
+    }
+
+
+private:
+    bool detect_box(
+        int index,
+        const ImageViewRGB32& screen,
+        const ImageFloatBox& box
+    );
+
+
+private:
+    Color m_color;
+    const ImageFloatBox m_box_top;
+    const ImageFloatBox m_box_left;
+    const ImageFloatBox m_box_right;
+    const ImageFloatBox m_box_bottom;
+    VideoOverlay* m_overlay;
+
+    MoveEffectivenessSymbol m_last_detection[4];
+    std::optional<OverlayBoxScope> m_last_detection_boxes[4];
+};
+class MoveEffectivenessSymbolWatcher : public DetectorToFinder<MoveEffectivenessSymbolDetector>{
+public:
+    MoveEffectivenessSymbolWatcher(
+        Color color,
+        VideoOverlay* overlay = nullptr,
+        std::chrono::milliseconds hold_duration = std::chrono::milliseconds(250)
+    )
+         : DetectorToFinder("MoveEffectivenessSymbolWatcher", hold_duration, color, overlay)
+    {}
+};
+
+
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Battles/PokemonLZA_RunFromBattleDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Battles/PokemonLZA_RunFromBattleDetector.cpp
new file mode 100644
index 0000000000..900c53c698
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Battles/PokemonLZA_RunFromBattleDetector.cpp
@@ -0,0 +1,37 @@
+/*  Run From Battle Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "PokemonLZA_RunFromBattleDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+
+
+
+RunFromBattleDetector::RunFromBattleDetector(Color color, VideoOverlay* overlay)
+    : m_button(
+        color, ButtonType::ButtonMinus,
+        {0.004456, 0.635499, 0.065062, 0.077655},
+        overlay
+    )
+{}
+void RunFromBattleDetector::make_overlays(VideoOverlaySet& items) const{
+    m_button.make_overlays(items);
+}
+bool RunFromBattleDetector::detect(const ImageViewRGB32& screen){
+    return m_button.detect(screen);
+}
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Battles/PokemonLZA_RunFromBattleDetector.h b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Battles/PokemonLZA_RunFromBattleDetector.h
new file mode 100644
index 0000000000..0df3d12b40
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Battles/PokemonLZA_RunFromBattleDetector.h
@@ -0,0 +1,47 @@
+/*  Run From Battle Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLZA_RunFromBattleDetector_H
+#define PokemonAutomation_PokemonLZA_RunFromBattleDetector_H
+
+#include "VideoGames/PokemonLZA/Inference/PokemonLZA_ButtonDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+
+
+
+class RunFromBattleDetector : public StaticScreenDetector{
+public:
+    RunFromBattleDetector(Color color, VideoOverlay* overlay);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+
+private:
+//    Color m_color;
+    ButtonDetector m_button;
+};
+class RunFromBattleWatcher : public DetectorToFinder<RunFromBattleDetector>{
+public:
+    RunFromBattleWatcher(
+        Color color,
+        VideoOverlay* overlay = nullptr,
+        std::chrono::milliseconds hold_duration = std::chrono::milliseconds(100)
+    )
+         : DetectorToFinder("RunFromBattleWatcher", hold_duration, color, overlay)
+    {}
+};
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Boxes/PokemonLZA_BoxDetection.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Boxes/PokemonLZA_BoxDetection.cpp
new file mode 100644
index 0000000000..fe14e4dc8b
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Boxes/PokemonLZA_BoxDetection.cpp
@@ -0,0 +1,774 @@
+/*  Box Detection
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <iostream>
+#include "Common/Cpp/Exceptions.h"
+#include "Kernels/Waterfill/Kernels_Waterfill.h"
+#include "Kernels/Waterfill/Kernels_Waterfill_Session.h"
+#include "CommonFramework/StaticGlobals.h"
+#include "CommonFramework/Exceptions/FatalProgramException.h"
+#include "CommonFramework/ImageTools/ImageStats.h"
+#include "CommonFramework/ImageTypes/ImageHSV32.h"
+#include "CommonFramework/VideoPipeline/VideoOverlay.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonFramework/Tools/ErrorDumper.h"
+#include "CommonFramework/Tools/VideoStream.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonTools/Images/SolidColorTest.h"
+#include "CommonTools/ImageMatch/SubObjectTemplateMatcher.h"
+#include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h"
+#include "CommonTools/Images/BinaryImage_FilterRgb32.h"
+#include "CommonTools/Images/WaterfillUtilities.h"
+#include "Tests/ImageUnitTest.h"
+#include "Tests/TestUtils.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+#include "VideoGames/PokemonLZA/Inference/Boxes/PokemonLZA_BoxInfoDetector.h"
+
+#include "PokemonLZA_BoxDetection.h"
+ //#include <sstream>
+using std::cout;
+using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+using namespace Kernels::Waterfill;
+
+namespace{
+bool debug_switch = false;
+}
+
+
+// match the downward arrow (green border, white interior) in the box system view
+class BoxCellSelectionArrowMatcher : public ImageMatch::SubObjectTemplateMatcher{
+public:
+    BoxCellSelectionArrowMatcher()
+        : SubObjectTemplateMatcher("PokemonLZA/SelectionArrowDown.png", 125)
+    {
+        // relaxed area ratio upper bound
+        m_area_ratio_upper = 1.5;
+        PackedBinaryMatrix matrix = compress_rgb32_to_binary_range(
+            m_matcher.image_template(),
+            128, 255,
+            128, 255,
+            128, 255
+        );
+        std::vector<WaterfillObject> objects = find_objects_inplace(matrix, 20);
+        if (objects.size() != 1){
+            throw FileException(
+                nullptr, PA_CURRENT_FUNCTION,
+                "Failed to find exactly one object in resource.",
+                m_path
+            );
+        }
+
+        set_subobject(objects[0]);
+
+        // Analyze template HSV values to determine green hue range
+        // analyze_template_hsv();
+
+//        extract_box_reference(m_matcher.image_template(), objects[0]).save("template.png");
+    }
+
+    // Optional custom image validation hook called before rmsd checks.
+    // Check if the input image contains green pixels with hue close to 51
+    virtual bool check_image(const ImageViewRGB32& input_image) const override{
+        // Convert RGB to HSV
+        ImageHSV32 input_hsv(input_image);
+        ImageViewHSV32 hsv_view(input_hsv);
+
+        // Target hue for green arrow border
+        const uint32_t target_hue = 50;
+        const uint32_t hue_tolerance = 10;
+        const uint32_t min_hue = target_hue - hue_tolerance;
+        const uint32_t max_hue = target_hue + hue_tolerance;
+
+        // Minimum saturation and value to avoid detecting grayish/dark pixels as green
+        const uint32_t min_saturation = 30;  // At least 30/255 saturation
+        const uint32_t min_value = 30;        // At least 30/255 brightness
+
+        // Count pixels with green hue
+        size_t green_pixel_count = 0;
+        const size_t total_pixels = input_image.width() * input_image.height();
+
+        for (size_t y = 0; y < hsv_view.height(); y++){
+            for (size_t x = 0; x < hsv_view.width(); x++){
+                uint32_t hsv_pixel = hsv_view.pixel(x, y);
+                uint32_t hue = (hsv_pixel >> 16) & 0xFF;
+                uint32_t sat = (hsv_pixel >> 8) & 0xFF;
+                uint32_t val = hsv_pixel & 0xFF;
+
+                // Check if pixel is green with target hue
+                if (hue >= min_hue && hue <= max_hue &&
+                    sat >= min_saturation &&
+                    val >= min_value){
+                    green_pixel_count++;
+                }
+            }
+        }
+
+        // Require at least 33% of pixels to be green
+        const size_t min_required_green_pixels = total_pixels / 3;
+        const bool has_green = green_pixel_count >= min_required_green_pixels;
+
+        if (debug_switch){
+            static int counter = 0;
+            cout << "check_image() input image: check_image_input_" << counter << ".png" << endl;
+            input_image.save("check_image_input_" + std::to_string(counter++) + ".png");
+            cout << "check_image() HSV validation:" << endl;
+            cout << "  Green pixels found: " << green_pixel_count << " / " << total_pixels
+                << " (" << (100.0 * green_pixel_count / total_pixels) << "%)" << endl;
+            cout << "  Required minimum: " << min_required_green_pixels
+                << " (" << (100.0 * min_required_green_pixels / total_pixels) << "%)" << endl;
+            cout << "  Hue range: [" << min_hue << ", " << max_hue << "]" << endl;
+            cout << "  Result: " << (has_green ? "PASS" : "FAIL") << endl;
+        }
+
+        return has_green;
+    };
+
+    static const BoxCellSelectionArrowMatcher& matcher(){
+        static BoxCellSelectionArrowMatcher matcher;
+        return matcher;
+    }
+};
+
+
+class BoxCellSelectionArrowGreenPartMatcher : public ImageMatch::WaterfillTemplateMatcher{
+public:
+    BoxCellSelectionArrowGreenPartMatcher();
+
+    static const BoxCellSelectionArrowGreenPartMatcher& instance();
+};
+
+BoxCellSelectionArrowGreenPartMatcher::BoxCellSelectionArrowGreenPartMatcher()
+    : WaterfillTemplateMatcher(
+        "PokemonLZA/SelectionArrowDown.png",
+        Color(150, 200, 20),
+        Color(200, 250, 50),
+        100
+    )
+{}
+
+const BoxCellSelectionArrowGreenPartMatcher& BoxCellSelectionArrowGreenPartMatcher::instance(){
+    static BoxCellSelectionArrowGreenPartMatcher matcher;
+    return matcher;
+}
+
+
+BoxDetector::BoxDetector(Color color, VideoOverlay* overlay)
+    : m_color(color)
+    , m_plus_button(color, ButtonType::ButtonPlus, {0.581, 0.940, 0.310, 0.046}, overlay)
+{
+    for (size_t row = 0; row < 6; row++){
+        double y = (row == 0 ? 0.122 : 0.333 + (0.797 - 0.331)/ 4.0 * (row-1));
+        for (size_t col = 0; col < 6; col++){
+            double x = 0.058 + col * (0.386 - 0.059)/5.0;
+            m_arrow_boxes.emplace_back(x, y, 0.018, 0.026);
+            // m_lifted_arrow_boxes.emplace_back(x+0.011, y-0.010, 0.023, 0.032);
+            m_gaps_for_lifted.emplace_back(x+0.011, y+0.010, 0.023, 0.004);
+        }
+    }
+}
+
+void BoxDetector::make_overlays(VideoOverlaySet& items) const{
+    m_plus_button.make_overlays(items);
+    for (const ImageFloatBox& box : m_arrow_boxes){
+        items.add(m_color, box);
+    }
+}
+
+
+// detect arrow's white interior first
+// then use subobject template matcher BoxCellSelectionArrowMatcher to detect the whole arrow
+bool BoxDetector::detect_at_cell(uint8_t cell_idx, const ImageViewRGB32& screen){
+#if 0
+    const auto& box = (m_holding_pokemon ? m_lifted_arrow_boxes[cell_idx] : m_arrow_boxes[cell_idx]);
+    ImageViewRGB32 image_crop = extract_box_reference(screen, box);
+
+    if (m_holding_pokemon){
+        // If the box cursor is holding a pokemon, it will be a green downard arrow with white interior.
+        // This green arrow may appear on top of the bottom part of a pokemon on the upper row of the box.
+        // If the pokemon above has white bottom part, like a regular-color Spewpa, the arrrow white interior
+        // blends in with the Spewpa white color and make it impossible to find the arrow interior using
+        // waterfill. So we do a waterfill for the green part of the arrow against non-green background here.
+        const std::vector<std::pair<uint32_t, uint32_t>> FILTERS = {
+            {combine_rgb(170, 230, 50), combine_rgb(200, 255, 100)},
+            {combine_rgb(140, 180, 0), combine_rgb(200, 255, 100)},
+        };
+        const double screen_rel_size = (screen.height() / 1080.0);
+        const size_t min_area = static_cast<size_t>(250 * screen_rel_size * screen_rel_size);
+        const double rmsd_threshold = 70.0;
+        const bool detected = match_template_by_waterfill(
+            screen_resolution,
+            image_crop,
+            BoxCellSelectionArrowGreenPartMatcher::instance(),
+            FILTERS,
+            {min_area, SIZE_MAX},
+            rmsd_threshold,
+            [&](Kernels::Waterfill::WaterfillObject& object) -> bool {
+                return true;
+            }
+        );
+        if (detected){
+            return true;
+        }
+    }
+#else
+    if (m_holding_pokemon){
+        // If the box cursor is holding a pokemon, it will be a green downward arrow with white interior.
+        // This green arrow may appear on top of the bottom part of a pokemon on the upper row of the box.
+        // If the pokemon above has white bottom part, like a regular-color Spewpa, the arrrow white interior
+        // blends in with the Spewpa white color and make it impossible to find the arrow interior using
+        // waterfill. If the held pokemon is green (e.g. shiny Scizor) it will blend with the green part of
+        // the arrow, making waterfill impossible. So we have to use this alternative detection:
+        // Use the stddev of a cross section of the green-white arrow.
+        // If there is an arrow, the bright green and white color makes the stddev quite high (>= 100)
+        // while without the arrow, it is the background, which are the blurred overworld view which
+        // typically has stddev lower than 50.
+        ImageViewRGB32 image_crop = extract_box_reference(screen, m_gaps_for_lifted[cell_idx]);
+        const auto stats = image_stats(image_crop);
+        return stats.stddev.sum() > 80;
+    }
+
+    ImageViewRGB32 image_crop = extract_box_reference(screen, m_arrow_boxes[cell_idx]);
+#endif
+
+    // The box curosr either is not holding a pokemon, or it is holding a pokemon but the background of the cursor
+    // happens to be green (bottom part of a green pokemon) failing the arrow green part waterfill detection.
+    // In both cases, we try to use waterfill to find the white interior of the arrow and then match the full arrow
+    // tempalte image around the found white interior: 
+
+    // The arrow's white interior has color between rgb [220, 220, 220] to [255, 255, 255]
+    // The arrow's green border has color between rgb [170, 230, 50] to [190, 255, 80]
+    std::vector<std::pair<uint32_t, uint32_t>> filters = {
+        {0xff808080, 0xffffffff},
+        {0xff909090, 0xffffffff},
+        {0xffa0a0a0, 0xffffffff},
+        {0xffb0b0b0, 0xffffffff},
+        {0xffc0c0c0, 0xffffffff},
+        {0xffd0d0d0, 0xffffffff},
+        {0xffe0e0e0, 0xffffffff},
+        {0xfff0f0f0, 0xffffffff},
+    };
+    std::vector<PackedBinaryMatrix> matrices = compress_rgb32_to_binary_range(image_crop, filters);
+
+    const size_t total_crop_area = image_crop.width() * image_crop.height();
+    const size_t min_area = static_cast<size_t>(total_crop_area / 60.0);
+    const size_t max_area = static_cast<size_t>(total_crop_area / 10.0);
+
+    int saved_object_id = 0;
+    if (debug_switch){
+        cout << "detect_at_cell() area threshold " << min_area << " - " << max_area << endl;
+        cout << "input image size " << image_crop.width() << "x" << image_crop.height() << endl;
+        cout << "Saving image_crop to input_image_crop.png" << endl;
+        image_crop.save("input_image_crop.png");
+    }
+
+    bool detected = false;
+    auto& matcher = BoxCellSelectionArrowMatcher::matcher();
+    for (size_t i_matrix = 0; i_matrix < matrices.size(); i_matrix++){
+        PackedBinaryMatrix& matrix = matrices[i_matrix];
+
+        std::unique_ptr<WaterfillSession> session = make_WaterfillSession();
+        Kernels::Waterfill::WaterfillObject object;
+
+        session->set_source(matrix);
+        auto finder = session->make_iterator(min_area);
+        const bool keep_object_matrix = false;
+        while (finder->find_next(object, keep_object_matrix)){
+            //  Exclude everything that touches the boundaries.
+            if (object.min_x == 0 ||
+                object.min_y == 0 ||
+                object.max_x >= image_crop.width() ||
+                object.max_y >= image_crop.height()
+                ){
+#if 0
+                cout << "object.min_x = " << object.min_x << ", object.min_y = " << object.min_y
+                    << ", object.max_x = " << object.max_x << ", object.max_y = " << object.max_y
+                    << " : " << image_crop.width() << " x " << image_crop.height() << endl;
+#endif
+                continue;
+            }
+
+            if (debug_switch){
+                cout << "Find object: area " << object.area << ", save to found_subobject" << saved_object_id << ".png" << endl;
+                ImagePixelBox box(object);
+                extract_box_reference(image_crop, box).save("found_subobject" + std::to_string(saved_object_id++) + ".png");
+            }
+            if (object.area > max_area){
+                continue;
+            }
+
+            ImagePixelBox found_arrow_box;
+
+            if (debug_switch){
+                double rmsd_value = matcher.rmsd(found_arrow_box, image_crop, object);
+                cout << "rmsd_value: " << rmsd_value << endl;
+#if 0
+                if (!matcher.check_aspect_ratio(object.width(), object.height())){
+                    cout << "aspect ratio check failed" << endl;
+                }
+                if (!matcher.check_area_ratio(object.area_ratio())){
+                    cout << "area ratio check failed: candidate object " << object.area_ratio() << " template " << matcher.m_subobject_area_ratio << endl;
+                }
+#endif
+            }
+
+            if (matcher.matches(found_arrow_box, image_crop, object)){
+                if (debug_switch){
+                    cout << "detected!!!!!" << endl;
+                }
+                detected = true;
+                break;
+            }
+        }
+
+        if (detected){
+            break;
+        }
+    }
+    return detected;
+}
+
+
+bool BoxDetector::detect(const ImageViewRGB32& screen){
+    if (!m_plus_button.detect(screen)){
+        return false;
+    }
+    m_found_row = m_found_col = BoxCursorCoordinates::INVALID;
+
+    bool arrow_found = false;
+    for (uint8_t row = 0, cell_idx = 0; row < 6; row++){
+        for (uint8_t col = 0; col < 6; col++, cell_idx++){
+#if 0
+            if (row != 3 || col != 5){
+                continue;
+            }
+            cout << "row = " << (int)row << ", col = " << (int)col << endl;
+#endif
+            // image_crop.save("cell_" + std::to_string(row) + "_" + std::to_string(col) + ".png");
+            const uint8_t debug_cell_row = STATIC_GLOBALS.BOX_SYSTEM_CELL_ROW;
+            const uint8_t debug_cell_col = STATIC_GLOBALS.BOX_SYSTEM_CELL_COL;
+            if (row == debug_cell_row && col == debug_cell_col){
+                debug_switch = true;
+                cout << "start debugging switch at " << int(row) << ", " << int(col) << endl;
+                STATIC_GLOBALS.IMAGE_TEMPLATE_MATCHING = true;
+            }
+            const bool detected = detect_at_cell(cell_idx, screen);
+            if (row == debug_cell_row && col == debug_cell_col){
+                debug_switch = false;
+                STATIC_GLOBALS.IMAGE_TEMPLATE_MATCHING = false;
+            }
+            if (detected){
+                if (arrow_found && m_debug_mode){
+                    cout << "Multiple box selection arrows detected! First detection (" << int(m_found_row) << ", " << int(m_found_col) << ")"
+                        << " second detection (" << int(row) << ", " << int(col) << ")" << endl;
+                    throw FatalProgramException(ErrorReportMode::NO_ERROR_REPORT,
+                        "Multiple box selection arrows detected!", nullptr, screen.copy());
+                }
+                arrow_found = true;
+                m_found_row = row;
+                m_found_col = col;
+                if (!m_debug_mode){
+                    break;
+                }
+            }
+        }
+        if (arrow_found && !m_debug_mode){
+            break;
+        }
+    }
+    // cout << "Box detector arrow found ? " << arrow_found << endl;
+    if (!arrow_found){
+        // screen.save("mac_box_fletchling_shiny_alpha.png");
+    }
+    return arrow_found;
+}
+
+BoxCursorCoordinates BoxDetector::detected_location() const{
+    return {m_found_row, m_found_col};
+}
+
+void BoxDetector::move_cursor(
+    const ProgramInfo& info, VideoStream& stream, ProControllerContext& context,
+    uint8_t row, uint8_t col, bool holding_pokemon
+){
+    if (row >= 6 || col >= 6){
+        throw InternalProgramError(&stream.logger(), "BoxDetector::move_cursor",
+            "row or col out of range: " + std::to_string(row) + ", " + std::to_string(col));
+    }
+    this->holding_pokemon(holding_pokemon);
+
+    WallClock start = current_time();
+    while (true){
+        if (current_time() - start > std::chrono::seconds(60)){
+            dump_image_and_throw_recoverable_exception(
+                info, stream, "BoxMoveCursor",
+                "Failed to move cursor to desired location after 1 minute."
+            );
+        }
+
+        // pbf_wait(context, 500ms);
+        context.wait_for_all_requests();
+        VideoSnapshot screen = stream.video().snapshot();
+        this->detect(screen);
+        BoxCursorCoordinates current = this->detected_location();
+        if (current.row == BoxCursorCoordinates::INVALID || current.col == BoxCursorCoordinates::INVALID){
+            // no cursor found. wait a bit
+            pbf_wait(context, 100ms);
+            continue;
+        }
+
+        if (current.row == row && current.col == col){
+            //            cout << "done!" << endl;
+            return;
+        }
+
+        // cout << "Current at row " << int(current.row) << " col " << int(current.col) << endl;
+
+        // try move along x axis first
+        if (current.col != col){
+            uint8_t left_dist, right_dist;
+            if (current.col > col){
+                left_dist = current.col - col;
+                right_dist = col + 6 - current.col;
+            }else{
+                right_dist = col - current.col;
+                left_dist = current.col + 6 - col;
+            }
+            if (left_dist < right_dist){
+                pbf_press_dpad(context, DPAD_LEFT, 160ms, 240ms);
+                // cout << "move left" << endl;
+            }else{
+                pbf_press_dpad(context, DPAD_RIGHT, 160ms, 240ms);
+                // cout << "move right" << endl;
+            }
+        }else{ // move along y axis
+            uint8_t up_dist, down_dist;
+            if (current.row > row){
+                up_dist = current.row - row;
+                down_dist = row + 6 - current.row;
+            }else{
+                down_dist = row - current.row;
+                up_dist = current.row + 6 - row;
+            }
+            if (up_dist < down_dist){
+                pbf_press_dpad(context, DPAD_UP, 160ms, 240ms);
+                // cout << "move up" << endl;
+            }else{
+                pbf_press_dpad(context, DPAD_DOWN, 160ms, 240ms);
+                // cout << "move down" << endl;
+            }
+        }
+    }
+}
+
+
+SomethingInBoxCellDetector::SomethingInBoxCellDetector(Color color, VideoOverlay* overlay)
+: m_right_stick_up_down_detector(color, ButtonType::RightStickUpDown, {0.933, 0.381, 0.027, 0.051}, overlay)
+, m_left_white_space_box{0.453, 0.100, 0.009, 0.059}, m_right_white_space_box{0.947, 0.107, 0.010, 0.052} {}
+
+void SomethingInBoxCellDetector::make_overlays(VideoOverlaySet& items) const{
+    m_right_stick_up_down_detector.make_overlays(items);
+    items.add(COLOR_BLACK, m_left_white_space_box);
+    items.add(COLOR_BLACK, m_right_white_space_box);
+}
+
+bool SomethingInBoxCellDetector::detect(const ImageViewRGB32& screen){
+    const double min_white_color_sum = 500.0;
+    const double max_white_color_stddev_sum = 15.0;
+    bool detected = is_white(extract_box_reference(screen, m_left_white_space_box), min_white_color_sum, max_white_color_stddev_sum);
+    if (!detected){
+        return false;
+    }
+    detected = is_white(extract_box_reference(screen, m_right_white_space_box), min_white_color_sum, max_white_color_stddev_sum);
+    if (!detected){
+        return false;
+    }
+    return m_right_stick_up_down_detector.detect(screen);
+}
+
+
+
+
+
+
+class Test_BoxCellInfoDetector : public ImageUnitTest{
+public:
+    Test_BoxCellInfoDetector(
+        const std::string& image,
+        std::vector<std::string> words
+    )
+        : ImageUnitTest("PokemonPLZA::BoxCellInfoDetector - " + image, {image})
+        , m_words(std::move(words))
+    {
+        //  Plus the PaddleOCR (ONNX) recognition session and its working set, for the
+        //  dex-number read.
+        m_memory += PADDLE_OCR_SINGLE_LINE_MEMORY_ESTIMATE;
+    }
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        // Expected filename format: <...>_<row>_<col>_<status>_<dex_info>.png
+    // Where status is one of: Empty, Shiny, Alpha, ShinyAlpha and can be followed by "Held"
+    // Where dex_info is one of: "None", "L<number>" (Lumiose dex), or "H<number>" (Hyperspace dex)
+    // Examples:
+    //   test_2_3_Empty_None.png -> row 2, col 3, empty cell, no dex number
+    //   test_2_3_Regular_L25.png -> row 2, col 3, non-shiny, non-alpha pokemon, Lumiose dex #25
+    //   test_2_3_Shiny_H100.png -> row 2, col 3, shiny (non-alpha), Hyperspace dex #100
+    //   test_2_3_Alpha_L50.png -> row 2, col 3, alpha (non-shiny), Lumiose dex #50
+    //   test_2_3_ShinyAlphaHeld_H75.png -> row 2, col 3, shiny alpha and holding a pokemon, Hyperspace dex #75
+
+        if (m_words.size() < 4){
+            std::stringstream ss;
+            ss << "Error: filename must have at least 4 words (row, col, status, dex_info)." << endl;
+            return ss.str();
+        }
+
+        // Parse row from fourth-to-last word
+        int expected_row;
+        if (parse_int(m_words[m_words.size() - 4], expected_row) == false){
+            std::stringstream ss;
+            ss << "Error: fourth-to-last word in filename should be row number (0-5)." << endl;
+            return ss.str();
+        }
+        if (expected_row < 0 || expected_row > 5){
+            std::stringstream ss;
+            ss << "Error: row must be between 0 and 5, got " << expected_row << "." << endl;
+            return ss.str();
+        }
+
+        // Parse col from third-to-last word
+        int expected_col;
+        if (parse_int(m_words[m_words.size() - 3], expected_col) == false){
+            std::stringstream ss;
+            ss << "Error: third-to-last word in filename should be col number (0-5)." << endl;
+            return ss.str();
+        }
+        if (expected_col < 0 || expected_col > 5){
+            std::stringstream ss;
+            ss << "Error: col must be between 0 and 5, got " << expected_col << "." << endl;
+            return ss.str();
+        }
+
+        // Parse status from second-to-last word
+        std::string status_word = m_words[m_words.size() - 2];
+        bool holding_pokemon = false;
+        if (status_word.ends_with("Held")){
+            holding_pokemon = true;
+            status_word = status_word.substr(0, status_word.size() - 4);
+        }
+        bool expected_something_in_cell;
+        bool expected_shiny;
+        bool expected_alpha;
+
+        if (status_word == "Empty"){
+            expected_something_in_cell = false;
+            expected_shiny = false;
+            expected_alpha = false;
+        }else if (status_word == "Regular"){
+            expected_something_in_cell = true;
+            expected_shiny = false;
+            expected_alpha = false;
+        }else if (status_word == "Shiny"){
+            expected_something_in_cell = true;
+            expected_shiny = true;
+            expected_alpha = false;
+        }else if (status_word == "Alpha"){
+            expected_something_in_cell = true;
+            expected_shiny = false;
+            expected_alpha = true;
+        }else if (status_word == "ShinyAlpha"){
+            expected_something_in_cell = true;
+            expected_shiny = true;
+            expected_alpha = true;
+        }else{
+            std::stringstream ss;
+            ss << "Error: second-to-last word must be 'Empty', 'Shiny', 'Alpha', or 'ShinyAlpha', got '" << status_word << "'." << endl;
+            return ss.str();
+        }
+
+        // Parse dex info from last word
+        std::string dex_info_word = m_words[m_words.size() - 1];
+        bool expect_dex_detection = false;
+        DexType expected_dex_type = DexType::LUMIOSE;
+        uint16_t expected_dex_number = 0;
+
+        if (dex_info_word == "None"){
+            expect_dex_detection = false;
+        }else if (dex_info_word.size() >= 2 && (dex_info_word[0] == 'L' || dex_info_word[0] == 'H')){
+            expect_dex_detection = true;
+            expected_dex_type = (dex_info_word[0] == 'L') ? DexType::LUMIOSE : DexType::HYPERSPACE;
+
+            std::string number_str = dex_info_word.substr(1);
+            int dex_num_int;
+            if (parse_int(number_str, dex_num_int) == false || dex_num_int <= 0){
+                std::stringstream ss;
+                ss << "Error: invalid dex number in '" << dex_info_word << "'. Expected format: L<number> or H<number>." << endl;
+                return ss.str();
+            }
+            expected_dex_number = static_cast<uint16_t>(dex_num_int);
+        }else{
+            std::stringstream ss;
+            ss << "Error: last word must be 'None', 'L<number>', or 'H<number>', got '" << dex_info_word << "'." << endl;
+            return ss.str();
+        }
+
+        // Run detectors
+        auto overlay = DummyVideoOverlay();
+        const ImageRGB32& image = images[0];
+
+        // Test BoxDetector for row and col
+        BoxDetector box_detector(COLOR_RED, &overlay);
+        box_detector.set_debug_mode(true);
+        box_detector.holding_pokemon(holding_pokemon);
+
+        // #define PROFILE_BOX_DETECTION
+#ifdef PROFILE_BOX_DETECTION
+    // Profile the template matching performance
+        const int num_iterations = 100;
+        auto time_start = current_time();
+        bool in_box_system = false;
+        for (int i = 0; i < num_iterations; i++){
+            in_box_system = box_detector.detect(image);
+        }
+        auto time_end = current_time();
+
+        const auto ns = std::chrono::duration_cast<std::chrono::nanoseconds>(time_end - time_start).count();
+        const double ms_total = ns / 1000000.0;
+        const double ms_per_iteration = ms_total / num_iterations;
+
+        cout << "BoxDetector::detect() performance:" << endl;
+        cout << "  Total time for " << num_iterations << " iterations: " << ms_total << " ms" << endl;
+        cout << "  Average time per iteration: " << ms_per_iteration << " ms" << endl;
+        cout << "  Throughput: " << (1000.0 / ms_per_iteration) << " detections/second" << endl;
+#else
+        bool in_box_system = box_detector.detect(image);
+#endif
+
+        if (!in_box_system){
+            std::stringstream ss;
+            ss << "Error: BoxDetector did not detect box system view." << endl;
+            return ss.str();
+        }
+
+        BoxCursorCoordinates coords = box_detector.detected_location();
+        if (coords.row == BoxCursorCoordinates::INVALID || coords.col == BoxCursorCoordinates::INVALID){
+            std::stringstream ss;
+            ss << "Error: detect_location() returned INVALID coordinates." << endl;
+            return ss.str();
+        }
+
+        TEST_RESULT_COMPONENT_EQUAL_STR((int)coords.row, expected_row, "row");
+        TEST_RESULT_COMPONENT_EQUAL_STR((int)coords.col, expected_col, "col");
+
+        // Test SomethingInBoxCellDetector
+        SomethingInBoxCellDetector something_detector(COLOR_RED, &overlay);
+        bool detected_something = something_detector.detect(image);
+        TEST_RESULT_COMPONENT_EQUAL_STR(detected_something, expected_something_in_cell, "something_in_cell");
+
+        // Test BoxShinyDetector
+        BoxShinyDetector shiny_detector(COLOR_RED, &overlay);
+        bool detected_shiny = shiny_detector.detect(image);
+        TEST_RESULT_COMPONENT_EQUAL_STR(detected_shiny, expected_shiny, "shiny");
+
+        // Test BoxAlphaDetector
+        BoxAlphaDetector alpha_detector(COLOR_RED, &overlay);
+        bool detected_alpha = alpha_detector.detect(image);
+        TEST_RESULT_COMPONENT_EQUAL_STR(detected_alpha, expected_alpha, "alpha");
+
+        // Test BoxDexNumberDetector
+        if (expect_dex_detection){
+            BoxDexNumberDetector dex_detector(logger);
+            bool detected_dex = dex_detector.detect(image);
+
+            if (!detected_dex){
+                std::stringstream ss;
+                ss << "Error: BoxDexNumberDetector failed to detect dex number." << endl;
+                return ss.str();
+            }
+
+            DexType detected_dex_type = dex_detector.dex_type();
+            uint16_t detected_dex_number = dex_detector.dex_number();
+
+            std::string expected_dex_type_str = (expected_dex_type == DexType::LUMIOSE) ? "Lumiose" : "Hyperspace";
+            std::string detected_dex_type_str = (detected_dex_type == DexType::LUMIOSE) ? "Lumiose" : "Hyperspace";
+
+            if (detected_dex_type != expected_dex_type){
+                std::stringstream ss;
+                ss << "Error: dex type mismatch. Expected " << expected_dex_type_str
+                    << " but detected " << detected_dex_type_str << "." << endl;
+                return ss.str();
+            }
+
+            TEST_RESULT_COMPONENT_EQUAL_STR((int)detected_dex_number, (int)expected_dex_number, "dex_number");
+        }
+
+        return true;
+    };
+
+private:
+    std::vector<std::string> m_words;
+
+};
+
+
+void add_tests_BoxCellInfoDetector(UnitTestDatabase& database){
+    database.add<Test_BoxCellInfoDetector>("PokemonLZA/BoxCellInfoDetector/french_box_gyarados_2_1_Regular_L033.jpg", std::vector<std::string>{"2", "1", "Regular", "L033"});
+    database.add<Test_BoxCellInfoDetector>("PokemonLZA/BoxCellInfoDetector/french_box_haunter_1_4_Shiny_L066.jpg", std::vector<std::string>{"1", "4", "Shiny", "L066"});
+    database.add<Test_BoxCellInfoDetector>("PokemonLZA/BoxCellInfoDetector/french_box_lopunny_1_1_Alpha_L110.jpg", std::vector<std::string>{"1", "1", "Alpha", "L110"});
+    database.add<Test_BoxCellInfoDetector>("PokemonLZA/BoxCellInfoDetector/french_box_ralts_1_0_ShinyAlpha_L087.jpg", std::vector<std::string>{"1", "0", "ShinyAlpha", "L087"});
+    database.add<Test_BoxCellInfoDetector>("PokemonLZA/BoxCellInfoDetector/mac_box_0_0_Empty_None.jpg", std::vector<std::string>{"0", "0", "Empty", "None"});
+    database.add<Test_BoxCellInfoDetector>("PokemonLZA/BoxCellInfoDetector/mac_box_0_4_Empty_None.jpg", std::vector<std::string>{"0", "4", "Empty", "None"});
+    database.add<Test_BoxCellInfoDetector>("PokemonLZA/BoxCellInfoDetector/mac_box_1_0_Empty_None.jpg", std::vector<std::string>{"1", "0", "Empty", "None"});
+    database.add<Test_BoxCellInfoDetector>("PokemonLZA/BoxCellInfoDetector/mac_box_1_0_Regular_H014.jpg", std::vector<std::string>{"1", "0", "Regular", "H014"});
+    database.add<Test_BoxCellInfoDetector>("PokemonLZA/BoxCellInfoDetector/mac_box_2_5_Empty_None.jpg", std::vector<std::string>{"2", "5", "Empty", "None"});
+    database.add<Test_BoxCellInfoDetector>("PokemonLZA/BoxCellInfoDetector/mac_box_4_4_Empty_None.jpg", std::vector<std::string>{"4", "4", "Empty", "None"});
+    database.add<Test_BoxCellInfoDetector>("PokemonLZA/BoxCellInfoDetector/mac_box_clauncher_3_2_Shiny_L163.jpg", std::vector<std::string>{"3", "2", "Shiny", "L163"});
+    database.add<Test_BoxCellInfoDetector>("PokemonLZA/BoxCellInfoDetector/mac_box_dragonite_0_5_Regular_L147.jpg", std::vector<std::string>{"0", "5", "Regular", "L147"});
+    database.add<Test_BoxCellInfoDetector>("PokemonLZA/BoxCellInfoDetector/mac_box_flabebe_1_0_Alpha_L038.jpg", std::vector<std::string>{"1", "0", "Alpha", "L038"});
+    database.add<Test_BoxCellInfoDetector>("PokemonLZA/BoxCellInfoDetector/mac_box_fletchling_1_5_ShinyAlpha_L010.jpg", std::vector<std::string>{"1", "5", "ShinyAlpha", "L010"});
+    database.add<Test_BoxCellInfoDetector>("PokemonLZA/BoxCellInfoDetector/mac_box_florges_5_5_Regular_L040.jpg", std::vector<std::string>{"5", "5", "Regular", "L040"});
+    database.add<Test_BoxCellInfoDetector>("PokemonLZA/BoxCellInfoDetector/mac_box_furfrou_4_2_Regular_L158.jpg", std::vector<std::string>{"4", "2", "Regular", "L158"});
+    database.add<Test_BoxCellInfoDetector>("PokemonLZA/BoxCellInfoDetector/mac_box_gardevoir_0_0_Regular_L089.jpg", std::vector<std::string>{"0", "0", "Regular", "L089"});
+    database.add<Test_BoxCellInfoDetector>("PokemonLZA/BoxCellInfoDetector/mac_box_greninja_1_5_ShinyAlpha_L211.jpg", std::vector<std::string>{"1", "5", "ShinyAlpha", "L211"});
+    database.add<Test_BoxCellInfoDetector>("PokemonLZA/BoxCellInfoDetector/mac_box_hippopotas_3_3_Alpha_L118.jpg", std::vector<std::string>{"3", "3", "Alpha", "L118"});
+    database.add<Test_BoxCellInfoDetector>("PokemonLZA/BoxCellInfoDetector/mac_box_igglybuff_2_3_Regular_H076.jpg", std::vector<std::string>{"2", "3", "Regular", "H076"});
+    database.add<Test_BoxCellInfoDetector>("PokemonLZA/BoxCellInfoDetector/mac_box_magikarp_2_0_Regular_L032.jpg", std::vector<std::string>{"2", "0", "Regular", "L032"});
+    database.add<Test_BoxCellInfoDetector>("PokemonLZA/BoxCellInfoDetector/mac_box_mareep_3_4_Shiny_L024.jpg", std::vector<std::string>{"3", "4", "Shiny", "L024"});
+    database.add<Test_BoxCellInfoDetector>("PokemonLZA/BoxCellInfoDetector/mac_box_pyroar_0_5_ShinyAlpha_L046.jpg", std::vector<std::string>{"0", "5", "ShinyAlpha", "L046"});
+    database.add<Test_BoxCellInfoDetector>("PokemonLZA/BoxCellInfoDetector/mac_box_pyroar_1_0_ShinyAlpha_L046.jpg", std::vector<std::string>{"1", "0", "ShinyAlpha", "L046"});
+    database.add<Test_BoxCellInfoDetector>("PokemonLZA/BoxCellInfoDetector/mac_box_tyrunt_1_0_Regular_L193.jpg", std::vector<std::string>{"1", "0", "Regular", "L193"});
+    database.add<Test_BoxCellInfoDetector>("PokemonLZA/BoxCellInfoDetector/mac_box_victreebel_1_3_Alpha_L076.jpg", std::vector<std::string>{"1", "3", "Alpha", "L076"});
+    database.add<Test_BoxCellInfoDetector>("PokemonLZA/BoxCellInfoDetector/Bug/box_dragalge_0_5_Alpha_L162.jpg", std::vector<std::string>{"0", "5", "Alpha", "L162"});
+    database.add<Test_BoxCellInfoDetector>("PokemonLZA/BoxCellInfoDetector/Bug/box_greninja_0_4_ShinyAlpha_L211.jpg", std::vector<std::string>{"0", "4", "ShinyAlpha", "L211"});
+    database.add<Test_BoxCellInfoDetector>("PokemonLZA/BoxCellInfoDetector/Bug/box_scolipede_0_3_Shiny_L070.jpg", std::vector<std::string>{"0", "3", "Shiny", "L070"});
+    database.add<Test_BoxCellInfoDetector>("PokemonLZA/BoxCellInfoDetector/dhruv/box_2_2_ShinyHeld_H067.jpg", std::vector<std::string>{"2", "2", "ShinyHeld", "H067"});
+    database.add<Test_BoxCellInfoDetector>("PokemonLZA/BoxCellInfoDetector/dhruv/box_tinkatonAbove_2_2_ShinyHeld_H067.jpg", std::vector<std::string>{"2", "2", "ShinyHeld", "H067"});
+    database.add<Test_BoxCellInfoDetector>("PokemonLZA/BoxCellInfoDetector/dolphincurry/box_tyrunt_no1_1_0_Regular_L193.jpg", std::vector<std::string>{"1", "0", "Regular", "L193"});
+    database.add<Test_BoxCellInfoDetector>("PokemonLZA/BoxCellInfoDetector/dolphincurry/box_tyrunt_no2_1_0_Regular_L193.jpg", std::vector<std::string>{"1", "0", "Regular", "L193"});
+    database.add<Test_BoxCellInfoDetector>("PokemonLZA/BoxCellInfoDetector/dolphincurry/box_tyrunt_no3_1_0_Regular_L193.jpg", std::vector<std::string>{"1", "0", "Regular", "L193"});
+    database.add<Test_BoxCellInfoDetector>("PokemonLZA/BoxCellInfoDetector/held/mac_box_0_0_AlphaHeld_L227.jpg", std::vector<std::string>{"0", "0", "AlphaHeld", "L227"});
+    database.add<Test_BoxCellInfoDetector>("PokemonLZA/BoxCellInfoDetector/held/mac_box_1_5_RegularHeld_H050.jpg", std::vector<std::string>{"1", "5", "RegularHeld", "H050"});
+    database.add<Test_BoxCellInfoDetector>("PokemonLZA/BoxCellInfoDetector/held/mac_box_2_1_ShinyHeld_L111.jpg", std::vector<std::string>{"2", "1", "ShinyHeld", "L111"});
+    database.add<Test_BoxCellInfoDetector>("PokemonLZA/BoxCellInfoDetector/held/mac_box_2_4_EmptyHeld_None.jpg", std::vector<std::string>{"2", "4", "EmptyHeld", "None"});
+    database.add<Test_BoxCellInfoDetector>("PokemonLZA/BoxCellInfoDetector/held/mac_box_5_5_EmptyHeld_None.jpg", std::vector<std::string>{"5", "5", "EmptyHeld", "None"});
+    database.add<Test_BoxCellInfoDetector>("PokemonLZA/BoxCellInfoDetector/k3lpoke/bright_box_gourgeist_4_2_ShinyAlpha_L205.jpg", std::vector<std::string>{"4", "2", "ShinyAlpha", "L205"});
+    database.add<Test_BoxCellInfoDetector>("PokemonLZA/BoxCellInfoDetector/k3lpoke/bright_box_pangoro_1_2_Alpha_L048.jpg", std::vector<std::string>{"1", "2", "Alpha", "L048"});
+    database.add<Test_BoxCellInfoDetector>("PokemonLZA/BoxCellInfoDetector/k3lpoke/bright_box_pumpkaboo_4_3_Shiny_L204.jpg", std::vector<std::string>{"4", "3", "Shiny", "L204"});
+    database.add<Test_BoxCellInfoDetector>("PokemonLZA/BoxCellInfoDetector/Quantum/box_2_3_ShinyHeld_L172.jpg", std::vector<std::string>{"2", "3", "ShinyHeld", "L172"});
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Boxes/PokemonLZA_BoxDetection.h b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Boxes/PokemonLZA_BoxDetection.h
new file mode 100644
index 0000000000..a2ea492662
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Boxes/PokemonLZA_BoxDetection.h
@@ -0,0 +1,121 @@
+/*  Box Detection
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLZA_BoxDetection_H
+#define PokemonAutomation_PokemonLZA_BoxDetection_H
+
+#include <vector>
+#include "Common/Cpp/Color.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonTools/VisualDetector.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+
+#include "VideoGames/PokemonLZA/Inference/PokemonLZA_ButtonDetector.h"
+
+namespace PokemonAutomation{
+    struct ProgramInfo;
+    class VideoStream;
+    template <typename Type> class ControllerContext;
+    class VideoOverlay;
+    class VideoOverlaySet;
+namespace NintendoSwitch{
+    class ProController;
+    using ProControllerContext = ControllerContext<ProController>;
+namespace PokemonLZA{
+
+
+// The box view has one row for current player party of 6 pokemon and 5 row x 6 col box below it.
+// row == 0 means the cursor is at player party while row >= 1 means the cursor is at current box
+struct BoxCursorCoordinates{
+    uint8_t row;
+    uint8_t col;
+    const static uint8_t INVALID = 255;
+};
+
+
+// Detect if the game is in box system view.
+// Also handle moving cursor to target slot in box system view
+class BoxDetector : public StaticScreenDetector{
+public:
+    BoxDetector(Color color = COLOR_RED, VideoOverlay* overlay = nullptr);
+
+    // Set whether the game is currently holding a pokemon to move around in box view.
+    // The box cursor detection functionality inside BoxDetector needs to know this info.
+    void holding_pokemon(bool holding_pokemon){ m_holding_pokemon = holding_pokemon; }
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+    // return detected location fround by calling `detect()`
+    BoxCursorCoordinates detected_location() const;
+
+    // While in the box system view, move the cursor to the desired slot.
+    // - holding_pokemon: whether the movement is with a held pokemon
+    // This function will call `holding_pokemon()` to change internal detection based on
+    // whether the cursor is holding a pokemon or not.
+    void move_cursor(
+        const ProgramInfo& info, VideoStream& stream, ProControllerContext& context,
+        uint8_t row, uint8_t col, bool holding_pokemon = false
+    );
+
+    // Under debug mode, will throw FatalProgramException when more than one box cell
+    // detects a cursor. This is used for debugging.
+    void set_debug_mode(bool debug_mode){ m_debug_mode = debug_mode; }
+
+private:
+    // called for each box cell to check if the selection arrow is above that cell
+    bool detect_at_cell(uint8_t cell_idx, const ImageViewRGB32& screen);
+
+    bool m_holding_pokemon = false;
+    Color m_color;
+
+    ButtonDetector m_plus_button;
+    // all 6 x 6 potential locations of the arrow interiors on box view
+    std::vector<ImageFloatBox> m_arrow_boxes;
+    // all 6 x 6 potential locations of the arrow interiors on box view when lifting/holding a pokemon
+    // std::vector<ImageFloatBox> m_lifted_arrow_boxes;
+    // all 6 x 6 gaps between box rows to detect when lifting/holding a pokemon
+    std::vector<ImageFloatBox> m_gaps_for_lifted;
+    uint8_t m_found_row = 0;
+    uint8_t m_found_col = 0;
+    bool m_debug_mode = false;
+};
+
+class BoxWatcher : public DetectorToFinder<BoxDetector>{
+public:
+    BoxWatcher(Color color = COLOR_RED, VideoOverlay* overlay = nullptr)
+         : DetectorToFinder("BoxWatcher", std::chrono::milliseconds(250), color, overlay)
+    {}
+};
+
+
+//  Detect whether the cursor is over a Pokemon or an empty cell in the box.
+//  It detects the right stick up and down icon on the right edge of the screen
+class SomethingInBoxCellDetector : public StaticScreenDetector{
+public:
+    SomethingInBoxCellDetector(Color color, VideoOverlay* overlay = nullptr);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    ButtonDetector m_right_stick_up_down_detector;
+    ImageFloatBox m_left_white_space_box, m_right_white_space_box;
+};
+class SomethingInBoxCellWatcher : public DetectorToFinder<SomethingInBoxCellDetector>{
+public:
+    SomethingInBoxCellWatcher(Color color, VideoOverlay* overlay = nullptr)
+         : DetectorToFinder("SomethingInBoxCell", FinderType::CONSISTENT, std::chrono::milliseconds(250), color, overlay)
+    {}
+};
+
+void add_tests_BoxCellInfoDetector(UnitTestDatabase& database);
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Boxes/PokemonLZA_BoxInfoDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Boxes/PokemonLZA_BoxInfoDetector.cpp
new file mode 100644
index 0000000000..7da1bf511b
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Boxes/PokemonLZA_BoxInfoDetector.cpp
@@ -0,0 +1,261 @@
+/*  Box Info Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Kernels/Waterfill/Kernels_Waterfill_Types.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/ImageTypes/ImageRGB32.h"
+#include "CommonFramework/ImageTools/ImageStats.h"
+#include "CommonFramework/VideoPipeline/VideoOverlay.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonFramework/Tools/GlobalThreadPools.h"
+#include "CommonTools/Images/ImageFilter.h"
+#include "CommonTools/OCR/OCR_NumberReader.h"
+#include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h"
+#include "CommonTools/Images/WaterfillUtilities.h"
+#include "VideoGames/PokemonLZA/Resources/PokemonLZA_AvailablePokemon.h"
+#include "PokemonLZA_BoxInfoDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+
+class BoxShinySymbolMatcher : public ImageMatch::WaterfillTemplateMatcher{
+public:
+    BoxShinySymbolMatcher(const char* path)
+        : WaterfillTemplateMatcher(
+            path,
+            Color(0xff000000), Color(0xffb4b4b4), 40
+        )
+    {
+        m_aspect_ratio_lower = 0.9;
+        m_aspect_ratio_upper = 1.1;
+        m_area_ratio_lower = 0.85;
+        m_area_ratio_upper = 1.3;
+    }
+
+    static const BoxShinySymbolMatcher& matcher(){
+        const static BoxShinySymbolMatcher matcher("PokemonLZA/BoxShiny-Template.png");
+        return matcher;
+    }
+};
+
+BoxShinyDetector::BoxShinyDetector(Color color, VideoOverlay* overlay)
+    : m_color(color)
+    , m_box{0.809, 0.109, 0.095, 0.039}
+    , m_overlay(overlay)
+{}
+
+void BoxShinyDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_box);
+}
+
+bool BoxShinyDetector::detect(const ImageViewRGB32& screen){
+    double screen_rel_size = (screen.height() / 1080.0);
+    double screen_rel_size_2 = screen_rel_size * screen_rel_size;
+
+    double min_area_1080p = 100.0;
+//    double rmsd_threshold = 120.0;
+    size_t min_area = size_t(screen_rel_size_2 * min_area_1080p);
+
+    const std::vector<std::pair<uint32_t, uint32_t>> FILTERS = {
+        {0xff000000, 0xff3c3c3c}, // 60
+        {0xff000000, 0xff646464}, // 100
+        {0xff000000, 0xff8c8c8c}, // 140
+        {0xff000000, 0xffb4b4b4}, // 180
+        {0xff000000, 0xffc8c8c8}, // 200
+    };
+
+    const double max_rsmd = 100.0;
+    bool found = match_template_by_waterfill(
+        screen.size(),
+        extract_box_reference(screen, m_box),
+        BoxShinySymbolMatcher::matcher(),
+        FILTERS,
+        {min_area, SIZE_MAX},
+        max_rsmd,
+        [&](Kernels::Waterfill::WaterfillObject& object) -> bool {
+//            cout << "width = " << object.width() << ", height = " << object.height() << endl;
+            m_last_detected = translate_to_parent(screen, m_box, object);
+            return true;
+        }
+    );
+
+    if (m_overlay){
+        if (found){
+            m_last_detected_box.emplace(*m_overlay, m_last_detected, COLOR_GREEN);
+        }else{
+            m_last_detected_box.reset();
+        }
+    }
+
+    return found;
+}
+
+
+class BoxAlphaSymbolMatcher : public ImageMatch::WaterfillTemplateMatcher{
+public:
+    BoxAlphaSymbolMatcher(const char* path)
+        : WaterfillTemplateMatcher(
+            path,
+            Color(combine_rgb(200, 50, 50)), Color(combine_rgb(255, 100, 100)), 200
+        )
+    {
+        m_aspect_ratio_lower = 0.9;
+        m_aspect_ratio_upper = 1.1;
+        m_area_ratio_lower = 0.85;
+        m_area_ratio_upper = 1.1;
+    }
+
+    static const BoxAlphaSymbolMatcher& matcher(){
+        const static BoxAlphaSymbolMatcher matcher("PokemonLZA/AlphaSymbol-Template.png");
+        return matcher;
+    }
+};
+
+BoxAlphaDetector::BoxAlphaDetector(Color color, VideoOverlay* overlay)
+    : m_color(color)
+    , m_box{0.820, 0.107, 0.085, 0.042}
+    , m_overlay(overlay)
+{}
+
+void BoxAlphaDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_box);
+}
+
+bool BoxAlphaDetector::detect(const ImageViewRGB32& screen){
+    double screen_rel_size = (screen.height() / 1080.0);
+    double screen_rel_size_2 = screen_rel_size * screen_rel_size;
+
+    double min_area_1080p = 300.0;
+    size_t min_area = size_t(screen_rel_size_2 * min_area_1080p);
+
+    const std::vector<std::pair<uint32_t, uint32_t>> FILTERS = {
+        {combine_rgb(200, 50, 50), combine_rgb(255, 150, 150)},
+        {combine_rgb(200, 50, 50), combine_rgb(255, 100, 100)},
+        {combine_rgb(150, 0, 0), combine_rgb(255, 100, 100)},
+        {combine_rgb(100, 0, 0), combine_rgb(255, 100, 100)},
+    };
+
+    const double max_rsmd = 100.0;
+    bool found = match_template_by_waterfill(
+        screen.size(),
+        extract_box_reference(screen, m_box),
+        BoxAlphaSymbolMatcher::matcher(),
+        FILTERS,
+        {min_area, SIZE_MAX},
+        max_rsmd,
+        [&](Kernels::Waterfill::WaterfillObject& object) -> bool {
+//            cout << "width = " << object.width() << ", height = " << object.height() << endl;
+            m_last_detected = translate_to_parent(screen, m_box, object);
+            return true;
+        }
+    );
+
+    if (m_overlay){
+        if (found){
+            m_last_detected_box.emplace(*m_overlay, m_last_detected, COLOR_GREEN);
+        }else{
+            m_last_detected_box.reset();
+        }
+    }
+
+    return found;
+}
+
+BoxPageInfoWatcher::BoxPageInfoWatcher(VideoOverlay* overlay)
+: VisualInferenceCallback("BoxPageInfoWatcher")
+, m_shiny_watcher(COLOR_BLACK, overlay)
+, m_alpha_watcher(COLOR_RED, overlay)
+{}
+
+void BoxPageInfoWatcher::make_overlays(VideoOverlaySet& items) const{
+    m_shiny_watcher.make_overlays(items);
+    m_alpha_watcher.make_overlays(items);
+}
+
+bool BoxPageInfoWatcher::process_frame(const ImageViewRGB32& frame, WallClock timestamp){
+    bool shiny_determined = m_shiny_watcher.process_frame(frame, timestamp);
+    bool alpha_determined = m_alpha_watcher.process_frame(frame, timestamp);
+    return shiny_determined && alpha_determined;
+}
+
+std::string BoxPageInfoWatcher::info_str() const{
+    const bool is_shiny = m_shiny_watcher.consistent_result();
+    const bool is_alpha = m_alpha_watcher.consistent_result();
+
+    if (is_shiny && is_alpha){
+        return "Shiny Alpha";
+    }else if (is_shiny){
+        return "Shiny";
+    }else if (is_alpha){
+        return "Alpha";
+    }
+    return "Regular";
+}
+
+BoxDexNumberDetector::BoxDexNumberDetector(Logger& logger) : m_logger(logger), m_dex_number_box{0.510, 0.203, 0.039, 0.031}, m_dex_type_box{0.472, 0.204, 0.018, 0.030}{}
+
+void BoxDexNumberDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(COLOR_GRAY, m_dex_number_box);
+    items.add(COLOR_GRAY, m_dex_type_box);
+}
+
+bool BoxDexNumberDetector::detect(const ImageViewRGB32& screen){
+    const size_t max_dex_number = std::max(LUMIOSE_DEX_SLUGS().size(), HYPERSPACE_DEX_SLUGS().size());
+
+    const int dex_number = [&](){
+        const ImageViewRGB32 dex_image_crop = extract_box_reference(screen, m_dex_number_box);
+#if 0
+        return OCR::read_number(m_logger, dex_image_crop);
+#else
+        const bool text_inside_range = true;
+        const bool prioritize_numeric_only_results = true;
+        const size_t width_max = SIZE_MAX;
+        // To accomodate the dex number "No. xxx" for all language, we have to make the dex number crop to cover the "dot" character
+        // for some languages. We have to use `min_digit_area` to filter out the dot when doing OCR.
+        // The min digit area computation is that any dot with size smaller than image_crop.height()/5 is filtered out when OCR.
+        const size_t min_digit_area = dex_image_crop.height()*dex_image_crop.height() / 25;
+        return OCR::read_number_waterfill_multifilter(
+            m_logger,
+            GlobalThreadPools::computation_normal(),
+            dex_image_crop,
+            {
+                {0x0, 0xff808080},
+                {0x0, 0xff909090},
+                {0x0, 0xffA0A0A0},
+            },
+            text_inside_range, prioritize_numeric_only_results, width_max, min_digit_area
+        );
+#endif
+    }();
+    if (dex_number <= 0 || dex_number > static_cast<int>(max_dex_number)){
+        m_dex_number = 0;
+        m_dex_number_when_error = dex_number;
+        return false;
+    }
+    m_dex_number = static_cast<uint16_t>(dex_number);
+    m_dex_number_when_error = 0;
+
+    // Replacing white background with zero-alpha color so that they won't be counted in
+    // the following image_stats()
+    // The white background is defined as the color between 0xffa0a0a0 and 0xffffffff.
+    const bool replace_color_within_range = true;
+    ImageRGB32 region = filter_rgb32_range(
+        extract_box_reference(screen, m_dex_type_box),
+        0xffa0a0a0, 0xffffffff, Color(0), replace_color_within_range
+    );
+
+    ImageStats stats = image_stats(region);
+    m_dex_type_color_ratio = stats.count / ((double)region.width() * region.height());
+    m_dex_type = (m_dex_type_color_ratio > 0.2) ? DexType::LUMIOSE : DexType::HYPERSPACE;
+
+    return true;
+}
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Boxes/PokemonLZA_BoxInfoDetector.h b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Boxes/PokemonLZA_BoxInfoDetector.h
new file mode 100644
index 0000000000..ab725c1d42
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Boxes/PokemonLZA_BoxInfoDetector.h
@@ -0,0 +1,165 @@
+/*  Detectors for various pokemon info on box view
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLZA_BoxInfoDetector_H
+#define PokemonAutomation_PokemonLZA_BoxInfoDetector_H
+
+#include <optional>
+#include "Common/Cpp/Color.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/VisualDetector.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+
+namespace PokemonAutomation{
+    class Logger;
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+// Detect shiny sparkles when viewing a Pokemon in the box system
+class BoxShinyDetector : public StaticScreenDetector{
+public:
+    BoxShinyDetector(Color color = COLOR_RED, VideoOverlay* overlay = nullptr);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+
+    //  This is not const so that detectors can save/cache state.
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    friend class BoxShinyWatcher;
+
+    Color m_color;
+    ImageFloatBox m_box;
+    VideoOverlay* m_overlay;
+
+    ImageFloatBox m_last_detected;
+    std::optional<OverlayBoxScope> m_last_detected_box;
+};
+
+// Detect whether there is a shiny symbol on the current pokemon in the box system.
+// Call BoxShinyWatcher::consistent_result() to know if the pokemon is shiny or not.
+class BoxShinyWatcher : public DetectorToFinder<BoxShinyDetector>{
+public:
+    BoxShinyWatcher(
+        Color color = COLOR_RED,
+        VideoOverlay* overlay = nullptr,
+        std::chrono::milliseconds hold_duration = std::chrono::milliseconds(250)
+    )
+         : DetectorToFinder("BoxShinyWatcher", FinderType::CONSISTENT, hold_duration, color, overlay)
+    {}
+};
+
+// Detect alpha symbol when viewing a Pokemon in the box system
+class BoxAlphaDetector : public StaticScreenDetector{
+public:
+    BoxAlphaDetector(Color color = COLOR_RED, VideoOverlay* overlay = nullptr);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+
+    //  This is not const so that detectors can save/cache state.
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    friend class BoxAlphaWatcher;
+
+    Color m_color;
+    ImageFloatBox m_box;
+    VideoOverlay* m_overlay;
+
+    ImageFloatBox m_last_detected;
+    std::optional<OverlayBoxScope> m_last_detected_box;
+};
+
+// Detect whether there is an alpha symbol on the current pokemon in the box system.
+// Call BoxAlphaWatcher::consistent_result() to know if the pokemon is alpha or not.
+class BoxAlphaWatcher : public DetectorToFinder<BoxAlphaDetector>{
+public:
+    BoxAlphaWatcher(
+        Color color = COLOR_RED,
+        VideoOverlay* overlay = nullptr,
+        std::chrono::milliseconds hold_duration = std::chrono::milliseconds(250)
+    )
+         : DetectorToFinder("BoxAlphaWatcher", FinderType::CONSISTENT, hold_duration, color, overlay)
+    {}
+};
+
+// Check both shiny and alpha-ness of the current pokemon in the box view
+class BoxPageInfoWatcher : public VisualInferenceCallback{
+public:
+    BoxPageInfoWatcher(VideoOverlay* overlay);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+
+    // return true when the watcher determines the shiny and alpha-ness of the pokemon
+    virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override;
+
+    // reset internal state so the watcher is ready for detect another pokemon's info
+    void reset_state(){
+        m_shiny_watcher.reset_state();
+        m_alpha_watcher.reset_state();
+    }
+
+    // After detection is done, call this to check shiny-ness
+    bool is_shiny() const { return m_shiny_watcher.consistent_result(); }
+    // After detection is done, call this to check alpha-ness
+    bool is_alpha() const { return m_alpha_watcher.consistent_result(); }
+    // Return string of detected shiny and alpha-ness for logging. It can be:
+    // - "Regular"
+    // - "Shiny"
+    // - "Alpha"
+    // - "Shiny Alpha"
+    std::string info_str() const;
+
+private:
+    BoxShinyWatcher m_shiny_watcher;
+    BoxAlphaWatcher m_alpha_watcher;
+};
+
+
+enum class DexType{
+    LUMIOSE,
+    HYPERSPACE,
+};
+
+
+class BoxDexNumberDetector : public StaticScreenDetector{
+public:
+    BoxDexNumberDetector(Logger& logger);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+    // Return either DexType::LUMIOSE or DexType::HYPERSPACE.
+    DexType dex_type() const { return m_dex_type; }
+    // Return dex number (1-indexed).
+    uint16_t dex_number() const { return m_dex_number; }
+
+
+    // Debugging value, used to compute whether the pokemon origin symbol is Lumiose or Hyperspace.
+    double dex_type_color_ratio() const { return m_dex_type_color_ratio; }
+    // Debugging value, if the detected dex number value is not a correct dex number, what number it is.
+    int dex_number_when_error() const { return m_dex_number_when_error; }
+
+private:
+    friend class BoxShinyWatcher;
+
+    Logger& m_logger;
+    ImageFloatBox m_dex_number_box;
+    ImageFloatBox m_dex_type_box;
+
+    uint16_t m_dex_number = 0;
+    DexType m_dex_type = DexType::LUMIOSE;
+    double m_dex_type_color_ratio = 0.0;
+    int m_dex_number_when_error = 0;
+};
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Boxes/PokemonLZA_IvJudgeReader.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Boxes/PokemonLZA_IvJudgeReader.cpp
new file mode 100644
index 0000000000..137be02a06
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Boxes/PokemonLZA_IvJudgeReader.cpp
@@ -0,0 +1,77 @@
+/*  IV Judge Reader
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "PokemonLZA_IvJudgeReader.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+
+const IvJudgeReader& IV_READER(){
+    const static Pokemon::IvJudgeReader reader("PokemonLZA/IVCheckerOCR.json");
+    return reader;
+}
+
+
+
+
+IvJudgeReaderScope::IvJudgeReaderScope(VideoOverlay& overlay, Language language)
+    : m_language(language)
+    , m_box0(overlay, {0.765000, 0.255000, 0.085000, 0.045000})
+    , m_box1(overlay, {0.850000, 0.335000, 0.085000, 0.045000})
+    , m_box2(overlay, {0.855000, 0.435000, 0.085000, 0.045000})
+    , m_box3(overlay, {0.675000, 0.335000, 0.085000, 0.045000})
+    , m_box4(overlay, {0.675000, 0.435000, 0.085000, 0.045000})
+    , m_box5(overlay, {0.765000, 0.510000, 0.085000, 0.045000})
+{}
+
+
+
+
+IvJudgeValue IvJudgeReaderScope::read(Logger& logger, const ImageViewRGB32& frame, const OverlayBoxScope& box){
+    ImageViewRGB32 image = extract_box_reference(frame, box);
+    OCR::StringMatchResult result = IV_READER().read_substring(
+        logger, m_language, image,
+        OCR::LIME_TEXT_FILTERS()
+        );
+    result.clear_beyond_log10p(IvJudgeReader::MAX_LOG10P);
+    if (result.results.size() != 1){
+        return IvJudgeValue::UnableToDetect;
+    }
+    return IV_JUDGE_VALUE_STRINGS().get_enum(result.results.begin()->second.token);
+}
+IvJudgeReader::Results IvJudgeReaderScope::read(Logger& logger, const ImageViewRGB32& frame){
+    IvJudgeReader::Results results;
+    if (m_language != Language::None){
+        results.hp      = read(logger, frame, m_box0);
+        results.attack  = read(logger, frame, m_box1);
+        results.defense = read(logger, frame, m_box2);
+        results.spatk   = read(logger, frame, m_box3);
+        results.spdef   = read(logger, frame, m_box4);
+        results.speed   = read(logger, frame, m_box5);
+    }
+    return results;
+}
+
+std::vector<ImageViewRGB32> IvJudgeReaderScope::dump_images(const ImageViewRGB32& frame){
+    std::vector<ImageViewRGB32> images;
+    images.emplace_back(extract_box_reference(frame, m_box0));
+    images.emplace_back(extract_box_reference(frame, m_box1));
+    images.emplace_back(extract_box_reference(frame, m_box2));
+    images.emplace_back(extract_box_reference(frame, m_box3));
+    images.emplace_back(extract_box_reference(frame, m_box4));
+    images.emplace_back(extract_box_reference(frame, m_box5));
+    return images;
+}
+
+
+
+}
+}
+}
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Boxes/PokemonLZA_IvJudgeReader.h b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Boxes/PokemonLZA_IvJudgeReader.h
new file mode 100644
index 0000000000..1a351341da
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Boxes/PokemonLZA_IvJudgeReader.h
@@ -0,0 +1,48 @@
+/*  IV Judge Reader
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLZA_IvJudgeReader_H
+#define PokemonAutomation_PokemonLZA_IvJudgeReader_H
+
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "Pokemon/Inference/Pokemon_IvJudgeReader.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+using namespace Pokemon;
+
+
+const IvJudgeReader& IV_READER();
+
+
+class IvJudgeReaderScope{
+public:
+    IvJudgeReaderScope(VideoOverlay& overlay, Language language);
+
+    IvJudgeReader::Results read(Logger& logger, const ImageViewRGB32& frame);
+
+    std::vector<ImageViewRGB32> dump_images(const ImageViewRGB32& frame);
+
+private:
+    IvJudgeValue read(Logger& logger, const ImageViewRGB32& frame, const OverlayBoxScope& box);
+
+private:
+    Language m_language;
+    OverlayBoxScope m_box0;
+    OverlayBoxScope m_box1;
+    OverlayBoxScope m_box2;
+    OverlayBoxScope m_box3;
+    OverlayBoxScope m_box4;
+    OverlayBoxScope m_box5;
+};
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Donuts/PokemonLZA_DonutBerriesDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Donuts/PokemonLZA_DonutBerriesDetector.cpp
new file mode 100644
index 0000000000..d88134abb2
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Donuts/PokemonLZA_DonutBerriesDetector.cpp
@@ -0,0 +1,279 @@
+/*  Donut Berries Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <fstream>
+#include "Common/Cpp/Filesystem/FilePath.h"
+#include "CommonFramework/GlobalAutoPaths.h"
+#include "CommonFramework/ImageTools/ImageStats.h"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/StaticGlobals.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Images/WaterfillUtilities.h"
+//#include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h"
+#include "CommonTools/ImageMatch/ImageCropper.h"
+#include "CommonTools/Images/ImageFilter.h"
+#include "CommonTools/OCR/OCR_Routines.h"
+#include "CommonTools/Images/SolidColorTest.h"
+#include "Tests/ImageUnitTest.h"
+#include "Tests/TestUtils.h"
+#include "VideoGames/PokemonLZA/Resources/PokemonLZA_DonutBerries.h"
+
+#include "PokemonLZA_DonutBerriesDetector.h"
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+
+DonutBerriesSelectionDetector::DonutBerriesSelectionDetector(size_t menu_index)
+    : m_symbol_box({0.001, menu_index*0.087 + 0.245, 0.006, 0.070}){}
+
+void DonutBerriesSelectionDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(COLOR_RED, m_symbol_box);
+}
+
+bool DonutBerriesSelectionDetector::detect(const ImageViewRGB32& screen){
+    // Match the pink bar:
+    ImageViewRGB32 symbol = extract_box_reference(screen, m_symbol_box);
+    return is_solid(symbol, { 0.4375, 0.268, 0.295 }, 0.05, 15);
+}
+
+
+const DonutBerriesMatcher& DONUT_BERRIES_MATCHER(){
+    static DonutBerriesMatcher matcher;
+    return matcher;
+}
+
+
+DonutBerriesMatcher::DonutBerriesMatcher(const std::vector<double>& min_euclidean_distance)
+    : CroppedImageDictionaryMatcher({0, 1})
+{
+    for (double x : min_euclidean_distance){
+        m_min_euclidean_distance_squared.emplace_back(x * x);
+    }
+    for (const auto& item : DONUT_BERRIES_DATABASE()){
+        add(item.first, item.second.sprite);
+    }
+}
+auto DonutBerriesMatcher::get_crop_candidates(const ImageViewRGB32& image) const -> std::vector<ImageViewRGB32>{
+    ImageStats border = image_border_stats(image);
+//    cout << "border = " << border.average << endl;
+//    image.save("image.png");
+    std::vector<ImageViewRGB32> ret;
+    for (double min_euclidean_distance_squared : m_min_euclidean_distance_squared){
+        ImagePixelBox box = ImageMatch::enclosing_rectangle_with_pixel_filter(
+            image,
+            [&](Color pixel){
+                double r = (double)pixel.red() - border.average.r;
+                double g = (double)pixel.green() - border.average.g;
+                double b = (double)pixel.blue() - border.average.b;
+                bool stop = r * r + g * g + b * b >= min_euclidean_distance_squared;
+                return stop;
+            }
+        );
+        ret.emplace_back(extract_box_reference(image, box));
+    }
+    return ret;
+}
+
+
+const DonutBerriesOCR& DonutBerriesOCR::instance(){
+    static DonutBerriesOCR reader;
+    return reader;
+}
+DonutBerriesOCR::DonutBerriesOCR()
+    : SmallDictionaryMatcher("PokemonLZA/Donuts/donut_berry_ocr.json")
+{}
+OCR::StringMatchResult DonutBerriesOCR::read_substring(
+    Logger& logger,
+    Language language,
+    const ImageViewRGB32& image,
+    double min_text_ratio, double max_text_ratio
+) const{
+    return match_substring_from_image_multifiltered(
+        &logger, language, image,
+        OCR::BLACK_OR_WHITE_TEXT_FILTERS(),
+        MAX_LOG10P, MAX_LOG10P_SPREAD,
+        0.01, 0.50,
+        OCR::PageSegMode::SINGLE_LINE
+    );
+}
+
+
+DonutBerriesReader::DonutBerriesReader(Color color)
+    : m_color(color)
+    , m_box_berry_text(berry_list_boxes(ImageFloatBox(0.065, 0.250, 0.173, 0.037)))
+    , m_box_berry_icon(berry_list_boxes(ImageFloatBox(0.029, 0.254, 0.030, 0.047)))
+{}
+
+void DonutBerriesReader::make_overlays(VideoOverlaySet& items) const{
+    for (size_t c = 0; c < BERRY_PAGE_LINES; c++){
+        items.add(m_color, m_box_berry_text[c]);
+        items.add(m_color, m_box_berry_icon[c]);
+    }
+}
+
+std::array<ImageFloatBox, 8> DonutBerriesReader::berry_list_boxes(ImageFloatBox initial_box){
+    std::array<ImageFloatBox, 8> material_boxes;
+    double x = initial_box.x;
+    double width = initial_box.width;
+    double height = initial_box.height;
+    double initial_y = initial_box.y;
+    double y_spacing = 0.086;
+    for (size_t i = 0; i < 8; i++){
+        double y = initial_y + i*y_spacing;
+        material_boxes[i] = ImageFloatBox(x, y, width, height);
+    }
+    return material_boxes;
+}
+
+
+ImageMatch::ImageMatchResult DonutBerriesReader::read_berry_page_with_icon_matcher(const ImageViewRGB32& screen, size_t index) const{
+    return read_with_icon_matcher(screen, m_box_berry_icon[index]);
+}
+
+ImageMatch::ImageMatchResult DonutBerriesReader::read_with_icon_matcher(const ImageViewRGB32& screen, const ImageFloatBox icon_box) const{
+    // Get a crop of the berry icon
+    ImageViewRGB32 image = extract_box_reference(screen, icon_box);
+    //ImageRGB32 filtered_image = filter_rgb32_range(image, 0xffdfaf00, 0xffffef20, Color(0x00000000), true);
+    //image.save("image" + std::to_string(icon_box.x) + ".png");
+
+    ImageMatch::ImageMatchResult results;
+    results = DONUT_BERRIES_MATCHER().match(image, ALPHA_SPREAD);
+    //results.clear_beyond_alpha(MAX_ALPHA);
+
+    return results;
+}
+
+OCR::StringMatchResult DonutBerriesReader::read_berry_page_with_ocr(
+    const ImageViewRGB32& screen, 
+    Logger& logger, 
+    Language language, 
+    size_t index
+) const{
+    return read_with_ocr(screen, logger, language, m_box_berry_text[index]);
+}
+
+OCR::StringMatchResult DonutBerriesReader::read_with_ocr(
+    const ImageViewRGB32& screen, 
+    Logger& logger, 
+    Language language, 
+    const ImageFloatBox icon_box
+) const{
+
+    // Get a crop of the berry text
+    ImageViewRGB32 image = extract_box_reference(screen, icon_box);
+    //image.save("image.png");
+
+    OCR::StringMatchResult results;
+    results = DonutBerriesOCR::instance().read_substring(logger, language, image);
+
+    return results;
+}
+
+
+class Test_DonutBerriesReader : public ImageUnitTest{
+public:
+    Test_DonutBerriesReader(const std::string& image)
+        : ImageUnitTest("PokemonPLZA::DonutBerriesReader - " + image, {image})
+    {
+        //  Plus the PaddleOCR (ONNX) recognition session and its working set.
+        m_memory += PADDLE_OCR_SINGLE_LINE_MEMORY_ESTIMATE;
+    }
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        Filesystem::Path file_path(UNIT_TEST_RESOURCE_PATH() + image_paths()[0]);
+        Filesystem::Path parent_dir = file_path.parent_path();
+        std::string base_name = file_path.stem().string();
+
+        const std::vector<std::string> words = parse_words(base_name);
+        if (words.size() < 2){
+            return "Error: not enough number of words in the filename.";
+        }
+
+        std::string code = words[words.size() - 2];
+        if (code == "chiSim"){
+            code = "chi_sim";
+        }else if (code == "chiTra"){
+            code = "chi_tra";
+        }
+        Language language = language_code_to_enum(code);
+        if (language == Language::None || language == Language::EndOfList){
+            return "Error: invalid language word in filename.";
+        }
+
+        size_t selected_berry = 0;
+        if (!parse_size_t(words.back(), selected_berry)){
+            return "Error: selected berry word must be int of range [0, 7].";
+        }
+        if (selected_berry >= DonutBerriesReader::BERRY_PAGE_LINES){
+            return "Error: selected_berry must be in range [0, 7].";
+        }
+
+        const ImageRGB32& image = images[0];
+        Filesystem::Path target_berries_path = parent_dir / ("_" + base_name + ".txt");
+
+        if (STATIC_GLOBALS.GENERATE_TEST_GOLDEN_FILES){
+            std::ofstream output_file(target_berries_path.stdpath());
+            if (!output_file.is_open()){
+                return "Error: cannot open output file " + target_berries_path.string() + " for writing";
+            }
+
+            DonutBerriesReader reader;
+            for (size_t i = 0; i < DonutBerriesReader::BERRY_PAGE_LINES; ++i){
+                OCR::StringMatchResult results = reader.read_berry_page_with_ocr(image, logger, language, i);
+                output_file << (results.results.empty() ? "unknown-berry" : results.results.begin()->second.token) << std::endl;
+            }
+            return true;
+        }
+
+        std::vector<std::string> target_berries;
+        if (!load_slug_list(target_berries_path.string(), target_berries)){
+            return "Cannot load slug list from " + target_berries_path.string();
+        }
+        if (target_berries.size() != DonutBerriesReader::BERRY_PAGE_LINES){
+            return "Error: need to have exactly 8 berries in " + target_berries_path.string();
+        }
+
+        DonutBerriesReader reader;
+        for (size_t i = 0; i < DonutBerriesReader::BERRY_PAGE_LINES; ++i){
+            DonutBerriesSelectionDetector selection_detector(i);
+            TEST_RESULT_COMPONENT_EQUAL_STR(selection_detector.detect(image), i == selected_berry, "selection detector : berry slot " + std::to_string(i));
+
+            OCR::StringMatchResult results = reader.read_berry_page_with_ocr(image, logger, language, i);
+            if (results.results.empty()){
+                return "No berry detected via OCR";
+            }
+            TEST_RESULT_COMPONENT_EQUAL_STR(results.results.begin()->second.token, target_berries[i], "ocr : berry slot " + std::to_string(i));
+        }
+
+        return true;
+    }
+};
+
+
+void add_tests_DonutBerriesReader(UnitTestDatabase& database){
+    database.add<Test_DonutBerriesReader>("PokemonLZA/DonutBerriesReader/20260102_01_chiSim_7.jpg");
+    database.add<Test_DonutBerriesReader>("PokemonLZA/DonutBerriesReader/20260102_01_eng_6.jpg");
+    database.add<Test_DonutBerriesReader>("PokemonLZA/DonutBerriesReader/20260102_02_chiSim_5.jpg");
+    database.add<Test_DonutBerriesReader>("PokemonLZA/DonutBerriesReader/20260102_02_eng_6.jpg");
+    database.add<Test_DonutBerriesReader>("PokemonLZA/DonutBerriesReader/20260102_03_eng_0.jpg");
+    database.add<Test_DonutBerriesReader>("PokemonLZA/DonutBerriesReader/20260102_04_eng_7.jpg");
+    database.add<Test_DonutBerriesReader>("PokemonLZA/DonutBerriesReader/20260102_05_eng_3.jpg");
+    database.add<Test_DonutBerriesReader>("PokemonLZA/DonutBerriesReader/20260120_01_kor_0.jpg");
+    database.add<Test_DonutBerriesReader>("PokemonLZA/DonutBerriesReader/20260120_02_kor_0.jpg");
+    database.add<Test_DonutBerriesReader>("PokemonLZA/DonutBerriesReader/20260122_01_eng_0.jpg");
+}
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Donuts/PokemonLZA_DonutBerriesDetector.h b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Donuts/PokemonLZA_DonutBerriesDetector.h
new file mode 100644
index 0000000000..3e5e7914b9
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Donuts/PokemonLZA_DonutBerriesDetector.h
@@ -0,0 +1,122 @@
+/*  Donut Berries Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLZA_DonutBerriesDetector_H
+#define PokemonAutomation_PokemonLZA_DonutBerriesDetector_H
+
+#include <array>
+#include "Common/Cpp/Color.h"
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonTools/ImageMatch/ImageMatchResult.h"
+#include "CommonTools/ImageMatch/CroppedImageDictionaryMatcher.h"
+#include "CommonTools/OCR/OCR_SmallDictionaryMatcher.h"
+#include "CommonTools/VisualDetector.h"
+
+namespace PokemonAutomation{
+    struct ProgramInfo;
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+
+// Detect the vertical pink bar on the left of the selected berry's row in the donut maker.
+class DonutBerriesSelectionDetector : public StaticScreenDetector{
+public:
+    // Index of the last row of the berry page when making a donut
+    static constexpr size_t LAST_BERRY_PAGE_ROW = 7;
+    
+    // menu_index: which row of the selection arrow should be on. Range: [0, LAST_BERRY_PAGE_ROW]:
+    // there are at most 8 rows on screen.
+    DonutBerriesSelectionDetector(size_t menu_index);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    ImageFloatBox m_symbol_box;
+};
+class DonutBerriesSelectionWatcher : public DetectorToFinder<DonutBerriesSelectionDetector>{
+public:
+    DonutBerriesSelectionWatcher(size_t menu_index)
+         : DetectorToFinder("DonutBerriesSelectionWatcher", std::chrono::milliseconds(250), menu_index)
+    {}
+};
+
+
+// Call `ImageMatchResult match(image, alpha_spread)` to find which berry is the input image.
+// The berry sprites and their slugs are defined in `DONUT_BERRIES_DATABASE()`
+class DonutBerriesMatcher : public ImageMatch::CroppedImageDictionaryMatcher{
+public:
+    DonutBerriesMatcher(const std::vector<double>& min_euclidean_distance = {100, 150, 200});
+
+private:
+    virtual std::vector<ImageViewRGB32> get_crop_candidates(const ImageViewRGB32& image) const override;
+    std::vector<double> m_min_euclidean_distance_squared;
+};
+
+
+class DonutBerriesOCR : public OCR::SmallDictionaryMatcher{
+public:
+    static constexpr double MAX_LOG10P = -1.5;
+    static constexpr double MAX_LOG10P_SPREAD = 0.5;
+
+public:
+    static const DonutBerriesOCR& instance();
+
+    OCR::StringMatchResult read_substring(
+        Logger& logger,
+        Language language,
+        const ImageViewRGB32& image,
+        double min_text_ratio = 0.01, double max_text_ratio = 0.50
+    ) const;
+
+private:
+    DonutBerriesOCR();
+};
+
+
+class DonutBerriesReader{
+public:
+    static constexpr double MAX_ALPHA = 180;
+    static constexpr double ALPHA_SPREAD = 10;
+    static constexpr size_t BERRY_PAGE_LINES = 8;
+
+public:
+    DonutBerriesReader(Color color = COLOR_RED);
+
+    void make_overlays(VideoOverlaySet& items) const;
+
+    std::array<ImageFloatBox, 8> berry_list_boxes(ImageFloatBox initial_box);
+    ImageMatch::ImageMatchResult read_berry_page_with_icon_matcher(const ImageViewRGB32& screen, size_t index) const;
+    ImageMatch::ImageMatchResult read_with_icon_matcher(const ImageViewRGB32& screen, const ImageFloatBox icon_box) const;
+
+    OCR::StringMatchResult read_berry_page_with_ocr(
+        const ImageViewRGB32& screen, 
+        Logger& logger, 
+        Language language, 
+        size_t index
+    ) const;
+
+    // The OCR works on any ingredient, selected or not
+    OCR::StringMatchResult read_with_ocr(
+        const ImageViewRGB32& screen, 
+        Logger& logger, 
+        Language language, 
+        const ImageFloatBox icon_box
+    ) const;
+
+    Color m_color;
+    std::array<ImageFloatBox, BERRY_PAGE_LINES> m_box_berry_text;
+    std::array<ImageFloatBox, BERRY_PAGE_LINES> m_box_berry_icon;
+};
+
+
+void add_tests_DonutBerriesReader(UnitTestDatabase& database);
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Donuts/PokemonLZA_FlavorPowerDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Donuts/PokemonLZA_FlavorPowerDetector.cpp
new file mode 100644
index 0000000000..b7faf4ddad
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Donuts/PokemonLZA_FlavorPowerDetector.cpp
@@ -0,0 +1,282 @@
+/*  Donut Powers Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <format>
+#include "Common/Cpp/Exceptions.h"
+#include "CommonFramework/Exceptions/OperationFailedException.h"
+#include "CommonFramework/ImageTools/ImageStats.h"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonFramework/Tools/GlobalThreadPools.h"
+#include "CommonTools/Images/ImageFilter.h"
+#include "CommonTools/Images/WaterfillUtilities.h"
+#include "CommonTools/OCR/OCR_Routines.h"
+#include "CommonTools/OCR/OCR_NumberReader.h"
+#include "CommonTools/OCR/OCR_SmallDictionaryMatcher.h"
+#include "CommonTools/Images/SolidColorTest.h"
+#include "PokemonLZA_FlavorPowerDetector.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+
+// OCR flavor power texts
+class FlavorPowerReader : public OCR::SmallDictionaryMatcher{
+public:
+    static constexpr double MAX_LOG10P = -1.40;
+    static constexpr double MAX_LOG10P_SPREAD = 0.50;
+
+public:
+    static FlavorPowerReader& instance();
+
+    OCR::StringMatchResult read_substring(
+        Logger& logger,
+        Language language,
+        const ImageViewRGB32& image,
+        double min_text_ratio = 0.01, double max_text_ratio = 0.50
+    ) const;
+
+private:
+    FlavorPowerReader();
+};
+
+
+FlavorPowerReader& FlavorPowerReader::instance(){
+    static FlavorPowerReader reader;
+    return reader;
+}
+
+FlavorPowerReader::FlavorPowerReader()
+    : SmallDictionaryMatcher("PokemonLZA/Donuts/flavor_powers.json")
+{}
+
+OCR::StringMatchResult FlavorPowerReader::read_substring(
+    Logger& logger,
+    Language language,
+    const ImageViewRGB32& image,
+    double min_text_ratio, double max_text_ratio
+) const{
+    OCR::StringMatchResult result = match_substring_from_image_multifiltered(
+        &logger, language, image, OCR::BLACK_TEXT_FILTERS(),
+        MAX_LOG10P, MAX_LOG10P_SPREAD,
+        min_text_ratio, max_text_ratio,
+        OCR::PageSegMode::SINGLE_LINE
+    );
+    if (result.results.size() == 1){
+        return result;
+    }
+    logger.log("Multiple results from match_substring_from_image_multifiltered. Try direct OCR read without filtering:");
+    return match_substring_from_image(
+        &logger, language, image, MAX_LOG10P, MAX_LOG10P_SPREAD,
+        OCR::PageSegMode::SINGLE_LINE
+    );
+}
+
+
+FlavorPowerIconDetector::FlavorPowerIconDetector(Logger& logger, int position)
+    : m_logger(logger)
+    , m_icon_box(0.081, 0.764 + 0.045*position, 0.043, 0.034)
+    , m_empty_space_after_number(0.1125, 0.7745 + 0.045*position, 0.005, 0.013)
+    , m_subtype_free_number_box(0.102, 0.77 + 0.046*position, 0.011, 0.02)
+    , m_subtype_number_box(0.108, 0.77 + 0.046*position, 0.011, 0.02)
+{}
+
+
+void FlavorPowerIconDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(COLOR_WHITE, m_empty_space_after_number);
+}
+
+
+int FlavorPowerIconDetector::detect(const ImageViewRGB32& screen){
+    const ImageStats icon_box_stats = image_stats(extract_box_reference(screen, m_icon_box));
+    if (is_solid(icon_box_stats, {0.342,0.339,0.319})){
+        // this flavor power is empty
+        return -1;
+    }
+
+    const ImageStats empty_space_stats = image_stats(extract_box_reference(screen, m_empty_space_after_number));
+
+    auto ocr_number = [&](const ImageViewRGB32 image_crop) -> int{
+        const bool text_inside_range = false;
+        const bool prioritize_numeric_only_results = true;
+        const size_t width_max = SIZE_MAX;
+        const size_t min_digit_area = image_crop.height()*image_crop.height() / 10;
+        int number = OCR::read_number_waterfill_multifilter(
+            m_logger,
+            GlobalThreadPools::computation_normal(),
+            image_crop,
+            {
+                {0xff000000, 0xff707070},
+                {0xff000000, 0xff808080},
+                {0xff000000, 0xff909090},
+                {0xff000000, 0xffa0a0a0},
+            },
+            text_inside_range, prioritize_numeric_only_results, width_max, min_digit_area
+        );
+        if (number < 1 || number > 3){
+            throw_and_log<OperationFailedException>(
+                m_logger, ErrorReportMode::SEND_ERROR_REPORT,
+                "DontPowerSpriteDetector::detect(): Unable to OCR power level. Got: " + std::to_string(number)
+            );
+        }
+        return number;
+    };
+
+    if (is_black(empty_space_stats, 250, 50)){
+        // the power has no sub-types
+        const ImageViewRGB32 image_crop = extract_box_reference(screen, m_subtype_free_number_box);
+        int number = ocr_number(image_crop);
+        return number;
+    }else{
+        // we have sub-types
+        const ImageViewRGB32 image_crop = extract_box_reference(screen, m_subtype_number_box);
+        int number = ocr_number(image_crop);
+        return number;
+    }
+}
+
+
+FlavorPowerDetector::FlavorPowerDetector(Logger& logger, Color color, Language language, int position)
+    : m_logger(logger), m_color(color), m_language(language)
+    , m_position(position), m_ocr_box(0.131, 0.761 + 0.045*position, 0.260, 0.041)
+    , m_icon_detector(logger, position)
+{}
+
+void FlavorPowerDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_ocr_box);
+    m_icon_detector.make_overlays(items);
+}
+
+bool FlavorPowerDetector::detect(const ImageViewRGB32& screen){
+    return !detect_power(screen).empty();
+}
+
+std::string FlavorPowerDetector::detect_power(const ImageViewRGB32& screen){
+    const int detected_power_level = m_icon_detector.detect(screen);
+    if (detected_power_level < 0){ // empty flavor power text
+        return "";
+    }
+    std::multimap<double, std::string> results;
+    /*
+    ImageRGB32 quest_label = to_blackwhite_rgb32_range(
+        extract_box_reference(screen, m_ocr_box),
+        true,
+        combine_rgb(198, 198, 198), combine_rgb(255, 255, 255)
+    );*/
+    ImageViewRGB32 quest_label = extract_box_reference(screen, m_ocr_box);
+    // quest_label.save("quest_label.png");
+
+    OCR::StringMatchResult ocr_result = FlavorPowerReader::instance().read_substring(
+        m_logger, m_language, quest_label
+    );
+    ocr_result.clear_beyond_log10p(FlavorPowerReader::MAX_LOG10P);
+    ocr_result.clear_beyond_spread(FlavorPowerReader::MAX_LOG10P_SPREAD);
+    if (!ocr_result.results.empty()){
+        for (const auto& result : ocr_result.results){
+            if (result.second.token.size() <= 1){
+                throw InternalProgramError(
+                    &m_logger, PA_CURRENT_FUNCTION,
+                    "FlavorPowerDetector::detect_power(): OCR match result has near empty output. Got " + result.second.original_text
+                );
+            }
+            results.emplace(result.first, result.second.token);
+        }
+            
+    }
+
+    if (results.empty()){
+        return "";
+    }
+    else if (results.size() == 1){
+        return results.begin()->second;
+    }
+
+    auto get_all_results = [&]() -> std::string{
+        std::string ret = "";
+        for (const auto& result : results){
+            ret += std::format("({}: {}), ", result.first, result.second);
+        }
+        return ret.substr(0, ret.size() - 2); // -2 to remove the last ", "
+    };
+
+    // More than one match result. Use Flavor Power Icon detector to disambiguate
+
+    // Check if all results are the same except for the last character
+    std::string base_string;
+    bool all_same_except_last = true;
+
+    for (const auto& result : results){
+        const std::string& slug = result.second;
+        // Get the base string (all except last character)
+        std::string current_base = slug.substr(0, slug.length() - 1);
+
+        if (base_string.empty()){
+            base_string = current_base;
+        }else if (base_string != current_base){
+            all_same_except_last = false;
+            break;
+        }
+    }
+
+    if (!all_same_except_last){
+        throw_and_log<OperationFailedException>(
+            m_logger, ErrorReportMode::SEND_ERROR_REPORT,
+            "FlavorPowerDetector::detect_power(): Unable to read selected item. "
+            "Ambiguous or multiple results: " + get_all_results() + "\n" + 
+            language_warning(m_language)
+        );
+    }
+
+    // All results differ only in last character, use icon detector to disambiguate
+    
+    // Convert power level (1, 2, 3) to character ('1', '2', '3')
+    char expected_last_char = (char)('0' + detected_power_level);
+    // Find the result with matching last character
+    for (const auto& result : results){
+        const std::string& slug = result.second;
+        if (!slug.empty() && slug.back() == expected_last_char){
+            return slug;
+        }
+    }
+    throw_and_log<OperationFailedException>(
+        m_logger, ErrorReportMode::SEND_ERROR_REPORT,
+        "FlavorPowerDetector::detect_power(): Detected power level icon is "
+        + std::to_string(detected_power_level)
+        + " while getting mismatched power OCR: " + get_all_results() + 
+        ".\n" + language_warning(m_language)
+    );
+}
+
+
+FlavorPowerWatcher::~FlavorPowerWatcher() = default;
+
+FlavorPowerWatcher::FlavorPowerWatcher(Logger& logger, Color color, Language language, int position)
+    : VisualInferenceCallback("FlavorPowerWatcher")
+    , m_detector(logger, color, language, position)
+{}
+
+void FlavorPowerWatcher::make_overlays(VideoOverlaySet& items) const{
+    m_detector.make_overlays(items);
+}
+
+bool FlavorPowerWatcher::process_frame(const ImageViewRGB32& screen, WallClock timestamp){
+    m_quest_name = m_detector.detect_power(screen);
+    if (m_quest_name.empty()){
+        return false;
+    }
+
+    return true;
+}
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Donuts/PokemonLZA_FlavorPowerDetector.h b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Donuts/PokemonLZA_FlavorPowerDetector.h
new file mode 100644
index 0000000000..bbcd231776
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Donuts/PokemonLZA_FlavorPowerDetector.h
@@ -0,0 +1,87 @@
+/*  Flavor Power Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLZA_FlavorPowerDetector_H
+#define PokemonAutomation_PokemonLZA_FlavorPowerDetector_H
+
+#include <array>
+#include "Common/Cpp/Color.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/Language.h"
+#include "CommonFramework/VideoPipeline/VideoOverlay.h"
+#include "CommonTools/VisualDetector.h"
+
+namespace PokemonAutomation{
+    struct ProgramInfo;
+    class Logger;
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+
+// Detect donut power icons
+class FlavorPowerIconDetector{
+public:
+    FlavorPowerIconDetector(Logger& logger, int position);
+
+    void make_overlays(VideoOverlaySet& items) const;
+
+    // Currently the only implementation is to detect the flavor power level (1-3)
+    // If no such power at this row, return -1.
+    int detect(const ImageViewRGB32& screen);
+
+private:
+    Logger& m_logger;
+    ImageFloatBox m_icon_box;
+    ImageFloatBox m_empty_space_after_number;
+    ImageFloatBox m_subtype_free_number_box;
+    ImageFloatBox m_subtype_number_box;
+};
+
+
+// Use OCR to detect donut flavor power texts
+class FlavorPowerDetector : public StaticScreenDetector{
+public:
+    // position: 0, 1 or 2. We have at most three powers on one donut.
+    FlavorPowerDetector(Logger& logger, Color color, Language language, int position);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+    // Return detected power string. Return empty string if not detected.
+    // Return empty string if no power text found.
+    std::string detect_power(const ImageViewRGB32& screen);
+
+protected:
+    Logger& m_logger;
+    Color m_color;
+    Language m_language;
+    int m_position;
+    ImageFloatBox m_ocr_box;
+
+    FlavorPowerIconDetector m_icon_detector;
+};
+
+// Detect the quest in a given position
+class FlavorPowerWatcher : public VisualInferenceCallback{
+public:
+    ~FlavorPowerWatcher();
+    FlavorPowerWatcher(Logger& logger, Color color, Language language, int position);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override;
+
+    const std::string& quest_name() const { return m_quest_name; }
+
+
+protected:
+    FlavorPowerDetector m_detector;
+    std::string m_quest_name;
+};
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Donuts/PokemonLZA_FlavorPowerScreenDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Donuts/PokemonLZA_FlavorPowerScreenDetector.cpp
new file mode 100644
index 0000000000..fe405cc706
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Donuts/PokemonLZA_FlavorPowerScreenDetector.cpp
@@ -0,0 +1,186 @@
+/*  Flavor Power Screen Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <fstream>
+#include <sstream>
+#include "Common/Cpp/Filesystem/FilePath.h"
+#include "CommonFramework/GlobalAutoPaths.h"
+#include "CommonFramework/ImageTools/ImageStats.h"
+#include "CommonFramework/Logging/Logger.h"
+//#include "CommonFramework/VideoPipeline/VideoOverlay.h"
+#include "CommonFramework/StaticGlobals.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Images/SolidColorTest.h"
+#include "Tests/ImageUnitTest.h"
+#include "Tests/TestUtils.h"
+#include "PokemonLZA_FlavorPowerDetector.h"
+#include "PokemonLZA_FlavorPowerScreenDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+
+FlavorPowerScreenDetector::FlavorPowerScreenDetector()
+    : m_left_white_area(0.044, 0.238, 0.021, 0.143)
+    , m_bottom_white_area(0.105, 0.459, 0.090, 0.036)
+    , m_donut_area(0.077, 0.182, 0.149, 0.252)
+{}
+
+void FlavorPowerScreenDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(COLOR_WHITE, m_left_white_area);
+    items.add(COLOR_WHITE, m_bottom_white_area);
+}
+
+bool FlavorPowerScreenDetector::detect(const ImageViewRGB32& screen){
+    const ImageStats stats2 = image_stats(extract_box_reference(screen, m_left_white_area));
+    if (!is_solid(stats2, {0.341, 0.340, 0.319})){
+        return false;
+    }
+
+    const ImageStats stats3 = image_stats(extract_box_reference(screen, m_bottom_white_area));
+    if (!is_solid(stats3, {0.341, 0.340, 0.319})){
+        return false;
+    }
+
+    const ImageStats stats4 = image_stats(extract_box_reference(screen, m_donut_area));
+    if (stats4.stddev.sum() < 50.0){
+        return false;
+    }
+
+    return true;
+}
+
+
+class Test_FlavorPowerScreenDetector : public ImageUnitTest{
+public:
+    Test_FlavorPowerScreenDetector(const std::string& image)
+        : ImageUnitTest("PokemonPLZA::FlavorPowerScreenDetector - " + image, {image})
+    {
+        //  Plus the PaddleOCR (ONNX) recognition session and its working set.
+        m_memory += PADDLE_OCR_SINGLE_LINE_MEMORY_ESTIMATE;
+    }
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        Filesystem::Path file_path(UNIT_TEST_RESOURCE_PATH() + image_paths()[0]);
+        Filesystem::Path parent_dir = file_path.parent_path();
+        std::string base_name = file_path.stem().string();
+
+        const std::vector<std::string> words = parse_words(base_name);
+        if (words.empty()){
+            return "Error: not enough number of words in the filename.";
+        }
+
+        std::string code = words.back();
+        if (code == "chiSim"){
+            code = "chi_sim";
+        }else if (code == "chiTra"){
+            code = "chi_tra";
+        }
+        Language language = language_code_to_enum(code);
+        if (language == Language::None || language == Language::EndOfList){
+            return "Error: invalid language word in filename.";
+        }
+
+        const ImageRGB32& image = images[0];
+        FlavorPowerScreenDetector screen_detector;
+        if (!screen_detector.detect(image)){
+            return "Error: FlavorPowerScreenDetector did not detect flavor power screen.";
+        }
+
+        if (STATIC_GLOBALS.GENERATE_TEST_GOLDEN_FILES){
+            Filesystem::Path target_powers_path = parent_dir / ("_" + base_name + ".txt");
+            std::ofstream output_file(target_powers_path.stdpath());
+            if (!output_file.is_open()){
+                return "Error: cannot open output file " + target_powers_path.string() + " for writing";
+            }
+
+            for (int i = 0; i < 3; i++){
+                FlavorPowerDetector power_detector(global_logger_command_line(), COLOR_RED, language, i);
+                std::string power_slug = power_detector.detect_power(image);
+                output_file << (power_slug.empty() ? "empty" : power_slug) << std::endl;
+            }
+            return true;
+        }
+
+        Filesystem::Path target_powers_path = parent_dir / ("_" + base_name + ".txt");
+        std::vector<std::string> expected_powers;
+        if (!load_slug_list(target_powers_path.string(), expected_powers)){
+            return "Loading slug list " + target_powers_path.string() + " failed.";
+        }
+        if (expected_powers.size() != 3){
+            return "Error: need to have exactly 3 power slots in " + target_powers_path.string();
+        }
+
+        for (int i = 0; i < 3; i++){
+            FlavorPowerIconDetector power_icon_detector(global_logger_command_line(), i);
+            FlavorPowerDetector power_detector(global_logger_command_line(), COLOR_RED, language, i);
+
+            std::string detected_power_slug = power_detector.detect_power(image);
+            int detected_power_level = power_icon_detector.detect(image);
+            const std::string& expected_power = expected_powers[i];
+
+            if (expected_power == "empty"){
+                if (!detected_power_slug.empty()){
+                    return "Error: expected empty power slot but OCR detected a power.";
+                }
+                if (detected_power_level > 0){
+                    return "Error: expected empty power slot but icon detector detected a level.";
+                }
+                continue;
+            }
+
+            TEST_RESULT_COMPONENT_EQUAL_STR(detected_power_slug, expected_power, "power slug for slot " + std::to_string(i));
+            if (detected_power_slug.empty()){
+                return "Error: OCR detected empty but expected a power.";
+            }
+            int expected_level = detected_power_slug.back() - '1' + 1;
+            if (detected_power_level != expected_level){
+                std::ostringstream ss;
+                ss << "Error: Slot " << i << " - OCR reads power " << detected_power_slug
+                   << " but power icon detector gets power level " << detected_power_level;
+                return ss.str();
+            }
+        }
+
+        return true;
+    }
+};
+
+
+void add_tests_FlavorPowerScreenDetector(UnitTestDatabase& database){
+    database.add<Test_FlavorPowerScreenDetector>("PokemonLZA/FlavorPowerScreenDetector/gin_01_eng.jpg");
+    database.add<Test_FlavorPowerScreenDetector>("PokemonLZA/FlavorPowerScreenDetector/gin_02_eng.jpg");
+    database.add<Test_FlavorPowerScreenDetector>("PokemonLZA/FlavorPowerScreenDetector/jimin_01_kor.jpg");
+    database.add<Test_FlavorPowerScreenDetector>("PokemonLZA/FlavorPowerScreenDetector/jimin_02_kor.jpg");
+    database.add<Test_FlavorPowerScreenDetector>("PokemonLZA/FlavorPowerScreenDetector/jojoaman_01_chiTra.jpg");
+    database.add<Test_FlavorPowerScreenDetector>("PokemonLZA/FlavorPowerScreenDetector/jojoaman_02_chiTra.jpg");
+    database.add<Test_FlavorPowerScreenDetector>("PokemonLZA/FlavorPowerScreenDetector/jojoaman_03_chiTra.jpg");
+    database.add<Test_FlavorPowerScreenDetector>("PokemonLZA/FlavorPowerScreenDetector/jojoaman_04_chiTra.jpg");
+    database.add<Test_FlavorPowerScreenDetector>("PokemonLZA/FlavorPowerScreenDetector/jojoaman_05_chiTra.jpg");
+    database.add<Test_FlavorPowerScreenDetector>("PokemonLZA/FlavorPowerScreenDetector/jojoaman_06_chiTra.jpg");
+    database.add<Test_FlavorPowerScreenDetector>("PokemonLZA/FlavorPowerScreenDetector/jojoaman_07_chiTra.jpg");
+    database.add<Test_FlavorPowerScreenDetector>("PokemonLZA/FlavorPowerScreenDetector/jojoaman_08_chiTra.jpg");
+    database.add<Test_FlavorPowerScreenDetector>("PokemonLZA/FlavorPowerScreenDetector/jojoaman_09_chiTra.jpg");
+    database.add<Test_FlavorPowerScreenDetector>("PokemonLZA/FlavorPowerScreenDetector/kichi_01_eng.jpg");
+    database.add<Test_FlavorPowerScreenDetector>("PokemonLZA/FlavorPowerScreenDetector/kuro_01_normal_eng.jpg");
+    database.add<Test_FlavorPowerScreenDetector>("PokemonLZA/FlavorPowerScreenDetector/kuro_02_dark_eng.jpg");
+    database.add<Test_FlavorPowerScreenDetector>("PokemonLZA/FlavorPowerScreenDetector/ougi_01_chiSim.jpg");
+    database.add<Test_FlavorPowerScreenDetector>("PokemonLZA/FlavorPowerScreenDetector/ougi_02_chiSim.jpg");
+    database.add<Test_FlavorPowerScreenDetector>("PokemonLZA/FlavorPowerScreenDetector/pif_01_fra.jpg");
+    database.add<Test_FlavorPowerScreenDetector>("PokemonLZA/FlavorPowerScreenDetector/pif_02_fra.jpg");
+    database.add<Test_FlavorPowerScreenDetector>("PokemonLZA/FlavorPowerScreenDetector/pif_03_fra.jpg");
+    database.add<Test_FlavorPowerScreenDetector>("PokemonLZA/FlavorPowerScreenDetector/turboV_01_eng.jpg");
+    database.add<Test_FlavorPowerScreenDetector>("PokemonLZA/FlavorPowerScreenDetector/turboV_02_eng.jpg");
+}
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Donuts/PokemonLZA_FlavorPowerScreenDetector.h b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Donuts/PokemonLZA_FlavorPowerScreenDetector.h
new file mode 100644
index 0000000000..057f9ea4c4
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Donuts/PokemonLZA_FlavorPowerScreenDetector.h
@@ -0,0 +1,53 @@
+/*  Flavor Power Screen Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLZA_FlavorPowerScreenDetector_H
+#define PokemonAutomation_PokemonLZA_FlavorPowerScreenDetector_H
+
+#include <optional>
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/VisualDetector.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+
+// Detector for the flavor power screen showing donut effects
+class FlavorPowerScreenDetector : public StaticScreenDetector{
+public:
+    FlavorPowerScreenDetector();
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    const ImageFloatBox m_left_white_area;
+    const ImageFloatBox m_bottom_white_area;
+    const ImageFloatBox m_donut_area;
+};
+
+class FlavorPowerScreenWatcher : public DetectorToFinder<FlavorPowerScreenDetector>{
+public:
+    FlavorPowerScreenWatcher(
+        std::chrono::milliseconds hold_duration = std::chrono::milliseconds(100)
+    )
+         : DetectorToFinder("FlavorPowerScreenWatcher", hold_duration)
+    {}
+};
+
+
+void add_tests_FlavorPowerScreenDetector(UnitTestDatabase& database);
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Map/PokemonLZA_DirectionArrowDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Map/PokemonLZA_DirectionArrowDetector.cpp
new file mode 100644
index 0000000000..a362f69d63
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Map/PokemonLZA_DirectionArrowDetector.cpp
@@ -0,0 +1,392 @@
+/* Direction Arrow Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <cmath>
+#include <sstream>
+#include <opencv2/opencv.hpp>
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+//#include "Tests/TestUtils.h"
+#include "CommonFramework/ImageTypes/ImageRGB32_OpenCV.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "Tests/ImageUnitTest.h"
+#include "PokemonLZA_DirectionArrowDetector.h"
+
+// #define DEBUG_DIRECTION_ARROW
+
+#ifdef DEBUG_DIRECTION_ARROW
+#include <iostream>
+using std::cout, std::endl;
+#endif
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+
+
+DirectionArrowDetector::DirectionArrowDetector(Color color)
+    : m_color(color)
+    , m_search_box(0.076, 0.138, 0.031, 0.062)  // Default: search entire image
+    , m_detected_angle(-1.0)
+{
+}
+
+void DirectionArrowDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_search_box);
+}
+
+bool DirectionArrowDetector::detect(const ImageViewRGB32& screen){
+    m_detected_angle = -1.0;
+
+    ImageViewRGB32 image_crop = extract_box_reference(screen, m_search_box);
+
+    // Convert to OpenCV Mat (BGRA format)
+    cv::Mat image = to_OpenCV_ref(image_crop);
+    if (image.empty()){
+        return false;
+    }
+
+    // Convert BGRA to BGR (remove alpha channel)
+    cv::Mat bgr;
+    cv::cvtColor(image, bgr, cv::COLOR_BGRA2BGR);
+
+    // Convert BGR to HSV for color thresholding
+    cv::Mat hsv;
+    cv::cvtColor(bgr, hsv, cv::COLOR_BGR2HSV);
+
+    // Define cyan/turquoise color range in HSV
+    // Cyan is approximately 180° in hue (90 in OpenCV's 0-180 range)
+    cv::Scalar lower_cyan(90, 200, 200);
+    cv::Scalar upper_cyan(110, 255, 255);
+
+    // Threshold the image to get cyan pixels
+    cv::Mat mask;
+    cv::inRange(hsv, lower_cyan, upper_cyan, mask);
+
+#ifdef DEBUG_DIRECTION_ARROW
+    // Save the cyan-filtered mask to verify color thresholding
+    // white color in the debugging image should be the arrow pixels while the black color should be
+    // background.
+    cv::imwrite("./cyan_filter.png", mask);
+    cout << "Saved cyan-filtered mask to ./cyan_filter.png" << endl;
+#endif
+
+    // Find connected components and select the largest one
+    cv::Mat labels, stats, centroids;
+    int num_components = cv::connectedComponentsWithStats(mask, labels, stats, centroids, 4, CV_32S);
+
+    if (num_components <= 1){
+        // No components found (component 0 is background)
+#ifdef DEBUG_DIRECTION_ARROW
+        cout << "No connected components found in cyan mask" << endl;
+#endif
+        return false;
+    }
+
+    // Find the largest connected component (excluding background at index 0)
+    int largest_component = 1;
+    int largest_area = stats.at<int>(1, cv::CC_STAT_AREA);
+
+    for (int i = 2; i < num_components; ++i){
+        int area = stats.at<int>(i, cv::CC_STAT_AREA);
+        if (area > largest_area){
+            largest_area = area;
+            largest_component = i;
+        }
+    }
+
+#ifdef DEBUG_DIRECTION_ARROW
+    cout << "Found " << num_components - 1 << " connected components" << endl;
+    cout << "Largest component: " << largest_component << " with " << largest_area << " pixels" << endl;
+
+    // Save mask with only the largest component for debugging
+    cv::Mat largest_comp_mask = cv::Mat::zeros(labels.size(), CV_8U);
+    for (int y = 0; y < labels.rows; ++y){
+        for (int x = 0; x < labels.cols; ++x){
+            if (labels.at<int>(y, x) == largest_component){
+                largest_comp_mask.at<uint8_t>(y, x) = 255;
+            }
+        }
+    }
+    cv::imwrite("./cyan_filter_largest_comp.png", largest_comp_mask);
+    cout << "Saved largest component mask to ./cyan_filter_largest_comp.png" << endl;
+#endif
+
+    // Extract all pixels from the largest connected component for PCA
+    std::vector<cv::Point2f> points;
+    for (int y = 0; y < labels.rows; ++y){
+        for (int x = 0; x < labels.cols; ++x){
+            if (labels.at<int>(y, x) == largest_component){
+                points.push_back(cv::Point2f(static_cast<float>(x), static_cast<float>(y)));
+            }
+        }
+    }
+
+    // Check if the largest component is the right size to be an arrow
+    double screen_rel_size = (screen.height() / 1080.0);
+    double screen_rel_size_2 = screen_rel_size * screen_rel_size;
+
+    // For 1080P screenshots, the arrow takes about 300 pixels
+    double min_area_1080p = 250.0, max_area_1080p = 350.0;
+    const size_t min_area = size_t(screen_rel_size_2 * min_area_1080p);
+    const size_t max_area = size_t(screen_rel_size_2 * max_area_1080p);
+
+    if (static_cast<size_t>(largest_area) < min_area || static_cast<size_t>(largest_area) > max_area){
+#ifdef DEBUG_DIRECTION_ARROW
+        cout << "Largest component size out of range: " << largest_area << " (" << min_area << "," << max_area << ")" << endl;
+#endif
+        return false;
+    }
+
+#ifdef DEBUG_DIRECTION_ARROW
+    cout << "Using " << points.size() << " pixels from largest component" << endl;
+#endif
+
+    // Find convex hull to get the arrow outline
+    std::vector<cv::Point> points_int;
+    points_int.reserve(points.size());
+    for (const auto& pt : points){
+        points_int.push_back(cv::Point(static_cast<int>(pt.x), static_cast<int>(pt.y)));
+    }
+
+    std::vector<cv::Point> hull;
+    cv::convexHull(points_int, hull);
+
+    // Calculate centroid of arrow pixels
+    cv::Point2f arrow_center(0, 0);
+    for (const auto& pt : points){
+        arrow_center.x += pt.x;
+        arrow_center.y += pt.y;
+    }
+    arrow_center.x /= points.size();
+    arrow_center.y /= points.size();
+
+#ifdef DEBUG_DIRECTION_ARROW
+    cout << "Arrow center: (" << arrow_center.x << ", " << arrow_center.y << ")" << endl;
+    cout << "Convex hull has " << hull.size() << " points" << endl;
+#endif
+
+    // Create a mask for the convex hull
+    cv::Mat hull_mask = cv::Mat::zeros(labels.size(), CV_8U);
+    std::vector<std::vector<cv::Point>> hull_contours;
+    hull_contours.push_back(hull);
+    cv::fillPoly(hull_mask, hull_contours, cv::Scalar(255));
+
+    // Find background pixels inside the convex hull
+    std::vector<cv::Point2f> background_pixels_in_hull;
+    for (int y = 0; y < labels.rows; ++y){
+        for (int x = 0; x < labels.cols; ++x){
+            // Check if pixel is inside hull but not part of the arrow
+            if (hull_mask.at<uint8_t>(y, x) > 0 && labels.at<int>(y, x) != largest_component){
+                background_pixels_in_hull.push_back(cv::Point2f(static_cast<float>(x), static_cast<float>(y)));
+            }
+        }
+    }
+
+#ifdef DEBUG_DIRECTION_ARROW
+    cout << "Found " << background_pixels_in_hull.size() << " background pixels inside convex hull" << endl;
+
+    // Save convex hull visualization
+    cv::Mat hull_image = cv::Mat::zeros(labels.size(), CV_8UC3);
+    // Draw the filled arrow region in white
+    for (int y = 0; y < labels.rows; ++y){
+        for (int x = 0; x < labels.cols; ++x){
+            if (labels.at<int>(y, x) == largest_component){
+                hull_image.at<cv::Vec3b>(y, x) = cv::Vec3b(255, 255, 255);
+            }
+        }
+    }
+    // Draw convex hull in green
+    cv::drawContours(hull_image, hull_contours, 0, cv::Scalar(0, 255, 0), 2);
+
+    // Draw background pixels inside hull in blue
+    for (const auto& bg_pt : background_pixels_in_hull){
+        int x = static_cast<int>(bg_pt.x);
+        int y = static_cast<int>(bg_pt.y);
+        if (x >= 0 && x < hull_image.cols && y >= 0 && y < hull_image.rows){
+            hull_image.at<cv::Vec3b>(y, x) = cv::Vec3b(255, 0, 0); // Blue
+        }
+    }
+
+    // Draw arrow center in red
+    cv::circle(hull_image, cv::Point(static_cast<int>(arrow_center.x), static_cast<int>(arrow_center.y)),
+               3, cv::Scalar(0, 0, 255), -1);
+
+    cv::imwrite("./convex_hull.png", hull_image);
+    cout << "Saved convex hull visualization to ./convex_hull.png (before finding furthest pixel)" << endl;
+#endif
+
+    if (background_pixels_in_hull.empty()){
+#ifdef DEBUG_DIRECTION_ARROW
+        cout << "No background pixels found inside convex hull" << endl;
+#endif
+        return false;
+    }
+
+    // Compute average vector from arrow center to background pixels
+    cv::Point2f avg_vector(0, 0);
+    for (const auto& bg_pt : background_pixels_in_hull){
+        cv::Point2f vec = bg_pt - arrow_center;
+        avg_vector.x += vec.x;
+        avg_vector.y += vec.y;
+    }
+    avg_vector.x /= background_pixels_in_hull.size();
+    avg_vector.y /= background_pixels_in_hull.size();
+
+#ifdef DEBUG_DIRECTION_ARROW
+    cout << "Average vector to background pixels: (" << avg_vector.x << ", " << avg_vector.y << ")" << endl;
+#endif
+
+    // Negate the average vector to get arrow direction
+    // (background pixels are at the base/notch, opposite to arrow direction)
+    cv::Point2f direction = -avg_vector;
+
+#ifdef DEBUG_DIRECTION_ARROW
+    cout << "Initial arrow direction vector (negated): (" << direction.x << ", " << direction.y << ")" << endl;
+#endif
+
+    // Normalize the direction vector
+    float dir_length = std::sqrt(direction.x * direction.x + direction.y * direction.y);
+    if (dir_length < 0.001f){
+#ifdef DEBUG_DIRECTION_ARROW
+        cout << "Direction vector too small to normalize" << endl;
+#endif
+        return false;
+    }
+    cv::Point2f normalized_direction(direction.x / dir_length, direction.y / dir_length);
+
+    // Find the arrow pixel that is furthest along this direction
+    float max_projection = -std::numeric_limits<float>::max();
+    cv::Point2f furthest_pixel;
+
+    for (const auto& pt : points){
+        cv::Point2f vec = pt - arrow_center;
+        float projection = vec.dot(normalized_direction);
+
+        if (projection > max_projection){
+            max_projection = projection;
+            furthest_pixel = pt;
+        }
+    }
+
+#ifdef DEBUG_DIRECTION_ARROW
+    cout << "Furthest pixel along direction: (" << furthest_pixel.x << ", " << furthest_pixel.y << ")" << endl;
+    cout << "Projection distance: " << max_projection << endl;
+#endif
+
+    // Refine the direction by using vector from arrow center to furthest pixel
+    cv::Point2f refined_direction = furthest_pixel - arrow_center;
+
+#ifdef DEBUG_DIRECTION_ARROW
+    cout << "Refined arrow direction vector: (" << refined_direction.x << ", " << refined_direction.y << ")" << endl;
+
+    // Create final visualization with arrow direction
+    cv::Mat final_image = cv::Mat::zeros(labels.size(), CV_8UC3);
+    // Draw the filled arrow region in white
+    for (int y = 0; y < labels.rows; ++y){
+        for (int x = 0; x < labels.cols; ++x){
+            if (labels.at<int>(y, x) == largest_component){
+                final_image.at<cv::Vec3b>(y, x) = cv::Vec3b(255, 255, 255);
+            }
+        }
+    }
+    // Draw convex hull in green
+    std::vector<std::vector<cv::Point>> hull_viz;
+    hull_viz.push_back(hull);
+    cv::drawContours(final_image, hull_viz, 0, cv::Scalar(0, 255, 0), 1);
+
+    // Draw arrow center in red
+    cv::circle(final_image, cv::Point(static_cast<int>(arrow_center.x), static_cast<int>(arrow_center.y)),
+               3, cv::Scalar(0, 0, 255), -1);
+
+    // Draw furthest pixel in cyan
+    cv::circle(final_image, cv::Point(static_cast<int>(furthest_pixel.x), static_cast<int>(furthest_pixel.y)),
+               3, cv::Scalar(255, 255, 0), -1);
+
+    // Draw arrow direction line from center to furthest pixel in yellow
+    cv::line(final_image,
+             cv::Point(static_cast<int>(arrow_center.x), static_cast<int>(arrow_center.y)),
+             cv::Point(static_cast<int>(furthest_pixel.x), static_cast<int>(furthest_pixel.y)),
+             cv::Scalar(0, 255, 255), 2);
+
+    cv::imwrite("./arrow_direction.png", final_image);
+    cout << "Saved arrow direction visualization to ./arrow_direction.png" << endl;
+#endif
+
+    // Calculate angle from refined direction vector
+    double eigenvec_angle_deg = std::atan2(refined_direction.y, refined_direction.x) * 180.0 / CV_PI + 90.0;
+    while (eigenvec_angle_deg < 0.0){
+        eigenvec_angle_deg += 360.0;
+    }
+    while (eigenvec_angle_deg >= 360.0){
+        eigenvec_angle_deg -= 360.0;
+    }
+
+    // eigen vector angle is based on the x,y coord system of the image matrix
+    // but human intuition of the angle is the clock angle. 
+    // so: 0 -> 90, 270 -> 0
+    // old angle a -> a + 90 % 360
+#ifdef DEBUG_DIRECTION_ARROW
+    cout << "Found angle: " << eigenvec_angle_deg << " degrees." << endl;
+#endif
+    // Store result
+    m_detected_angle = eigenvec_angle_deg;
+
+    return true;
+}
+
+
+class Test_DirectionArrowDetector : public ImageUnitTest{
+public:
+    Test_DirectionArrowDetector(const std::string& image, int target_angle)
+        : ImageUnitTest("PokemonPLZA::DirectionArrowDetector - " + image, {image})
+        , m_target_angle(target_angle)
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        if (m_target_angle < 0 || m_target_angle >= 360){
+            return "Error: target angle must be in range [0, 360).";
+        }
+
+        DirectionArrowDetector detector(COLOR_RED);
+        const ImageRGB32& image = images[0];
+        if (!detector.detect(image)){
+            return "Error: detector failed to detect arrow in image.";
+        }
+
+        double diff = std::abs(detector.detected_angle_deg() - m_target_angle);
+        if (diff > 180.0){
+            diff = 360.0 - diff;
+        }
+        if (diff > 10.0){
+            std::ostringstream ss;
+            ss << "Error: detected angle " << detector.detected_angle_deg()
+               << " differs from target angle " << m_target_angle
+               << " by " << diff << " degrees.";
+            return ss.str();
+        }
+
+        return true;
+    }
+
+private:
+    int m_target_angle;
+};
+
+
+void add_tests_DirectionArrowDetector(UnitTestDatabase& database){
+    //todo: Gather test images for the direction arrow detector
+}
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Map/PokemonLZA_DirectionArrowDetector.h b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Map/PokemonLZA_DirectionArrowDetector.h
new file mode 100644
index 0000000000..d5e0c12d41
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Map/PokemonLZA_DirectionArrowDetector.h
@@ -0,0 +1,63 @@
+/* Direction Arrow Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLZA_DirectionArrowDetector_H
+#define PokemonAutomation_PokemonLZA_DirectionArrowDetector_H
+
+#include <chrono>
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "Common/Cpp/Color.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/VisualDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+
+// Detect the direction arrow on the map that shows where the device is facing
+class DirectionArrowDetector : public StaticScreenDetector{
+public:
+    DirectionArrowDetector(Color color = COLOR_RED);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+
+    //  This is not const so that detectors can save/cache state.
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+    // Get the last detected angle in degrees [0, 360)
+    // Returns -1 if no arrow was detected
+    double detected_angle_deg() const { return m_detected_angle; }
+
+private:
+    Color m_color;
+    ImageFloatBox m_search_box;
+
+    // Detection results
+    double m_detected_angle;  // in degrees [0, 360), or -1 if not detected
+};
+
+class DirectionArrowWatcher : public DetectorToFinder<DirectionArrowDetector>{
+public:
+    DirectionArrowWatcher(
+        Color color = COLOR_RED,
+        std::chrono::milliseconds hold_duration = std::chrono::milliseconds(100)
+    )
+         : DetectorToFinder("DirectionArrowWatcher", hold_duration, color)
+    {}
+};
+
+
+void add_tests_DirectionArrowDetector(UnitTestDatabase& database);
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Map/PokemonLZA_LocationNameReader.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Map/PokemonLZA_LocationNameReader.cpp
new file mode 100644
index 0000000000..4077333317
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Map/PokemonLZA_LocationNameReader.cpp
@@ -0,0 +1,82 @@
+/*  Location Name Reader
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <array>
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/OCR/OCR_Routines.h"
+#include "PokemonLZA_LocationNameReader.h"
+
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+
+LocationNameOCR& LocationNameOCR::instance(){
+    static LocationNameOCR reader;
+    return reader;
+}
+
+
+LocationNameOCR::LocationNameOCR()
+    : SmallDictionaryMatcher("PokemonLZA/LocationName.json")
+{}
+
+OCR::StringMatchResult LocationNameOCR::read_substring(
+    Logger& logger,
+    Language language,
+    const ImageViewRGB32& image,
+    const std::vector<OCR::TextColorRange>& text_color_ranges,
+    double min_text_ratio, double max_text_ratio
+    ) const{
+    return match_substring_from_image_multifiltered(
+        &logger, language, image, text_color_ranges,
+        MAX_LOG10P, MAX_LOG10P_SPREAD, min_text_ratio, max_text_ratio
+        );
+}
+
+LocationNameReader::LocationNameReader(Color color)
+    : m_color(color)
+    , m_box_location_name(get_all_box_locations(ImageFloatBox(0.035, 0.254, 0.287, 0.050)))
+{}
+
+void LocationNameReader::make_overlays(VideoOverlaySet& items) const{
+    for (size_t c = 0; c < PAGE_SIZE; c++){
+        items.add(m_color, m_box_location_name[c]);
+    }
+}
+
+std::array<ImageFloatBox, LocationNameReader::PAGE_SIZE> LocationNameReader::get_all_box_locations(ImageFloatBox initial_box){
+    std::array<ImageFloatBox, LocationNameReader::PAGE_SIZE> material_boxes;
+    double x = initial_box.x;
+    double width = initial_box.width;
+    double height = initial_box.height;
+    double initial_y = initial_box.y;
+    double y_spacing = 0.078;
+    for (size_t i = 0; i < LocationNameReader::PAGE_SIZE; i++){
+        double y = initial_y + i*y_spacing;
+        material_boxes[i] = ImageFloatBox(x, y, width, height);
+    }
+    return material_boxes;
+}
+
+OCR::StringMatchResult LocationNameReader::read_location_name(
+    const ImageViewRGB32& screen, 
+    Logger& logger, 
+    Language language, 
+    size_t index
+) const{
+    ImageViewRGB32 image = extract_box_reference(screen, m_box_location_name[index]);
+
+    OCR::StringMatchResult results;
+    results = LocationNameOCR::instance().read_substring(logger, language, image, OCR::BLACK_OR_WHITE_TEXT_FILTERS());
+
+    return results;
+}
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Map/PokemonLZA_LocationNameReader.h b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Map/PokemonLZA_LocationNameReader.h
new file mode 100644
index 0000000000..ab64826fc8
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Map/PokemonLZA_LocationNameReader.h
@@ -0,0 +1,65 @@
+/*  Location Name Reader
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_Pokemon_LocationNameReader_H
+#define PokemonAutomation_Pokemon_LocationNameReader_H
+
+#include <array>
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonTools/OCR/OCR_SmallDictionaryMatcher.h"
+#include "CommonTools/VisualDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+
+class LocationNameOCR : public OCR::SmallDictionaryMatcher{
+public:
+    static constexpr double MAX_LOG10P = -1.40;
+    static constexpr double MAX_LOG10P_SPREAD = 0.50;
+
+public:
+    LocationNameOCR();
+
+    static LocationNameOCR& instance();
+
+    OCR::StringMatchResult read_substring(
+        Logger& logger,
+        Language language,
+        const ImageViewRGB32& image,
+        const std::vector<OCR::TextColorRange>& text_color_ranges,
+        double min_text_ratio = 0.01, double max_text_ratio = 0.50
+        ) const;
+};
+
+class LocationNameReader{
+public:
+    LocationNameReader(Color color = COLOR_WHITE);
+    static constexpr size_t PAGE_SIZE = 7;
+
+    void make_overlays(VideoOverlaySet& items) const;
+
+    // Read a single location display name via OCR given by the index
+    OCR::StringMatchResult read_location_name(
+        const ImageViewRGB32& screen, 
+        Logger& logger, 
+        Language language, 
+        size_t index
+    ) const;
+
+private:
+    Color m_color;
+    // Store the boxes that contain each location name in the fast travel menu
+    std::array<ImageFloatBox, PAGE_SIZE> m_box_location_name;
+    // Get the location of all location boxes based on the initial box location
+    std::array<ImageFloatBox, PAGE_SIZE> get_all_box_locations(ImageFloatBox initial_box);
+};
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Map/PokemonLZA_MapDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Map/PokemonLZA_MapDetector.cpp
new file mode 100644
index 0000000000..f1284d538c
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Map/PokemonLZA_MapDetector.cpp
@@ -0,0 +1,168 @@
+/* Map Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Kernels/Waterfill/Kernels_Waterfill_Types.h"
+#include "CommonTools/Images/WaterfillUtilities.h"
+#include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h"
+#include "Tests/ImageUnitTest.h"
+#include "Tests/TestUtils.h"
+#include "PokemonLZA_MapDetector.h"
+#include "PokemonLZA_MapIconDetector.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+namespace{
+
+// Matches the cyan "Travel Spots" feather icon shown next to the Y button on the map screen.
+class TravelSpotMatcher : public ImageMatch::WaterfillTemplateMatcher{
+public:
+    TravelSpotMatcher()
+        : WaterfillTemplateMatcher(
+            "PokemonLZA/MapIcons/TravelSpotIcon.png",
+            Color(0xff004080),
+            Color(0xff80ffff),
+            50
+        )
+    {}
+
+    static const TravelSpotMatcher& instance(){
+        static TravelSpotMatcher matcher;
+        return matcher;
+    }
+
+    virtual bool check_image(Resolution input_resolution, const ImageViewRGB32& image) const override{
+        size_t min_w = 8 * input_resolution.width  / 3840;
+        size_t min_h = 8 * input_resolution.height / 2160;
+        return image.width() >= min_w && image.height() >= min_h;
+    }
+};
+
+
+
+} // anonymous namespace
+
+
+
+MapDetector::MapDetector(Color color, VideoOverlay* overlay)
+    : m_color(color)
+    , m_travel_icon(0.040000, 0.235000, 0.030000, 0.100000)
+    , m_x_button(
+        color,
+        ButtonType::ButtonX,
+        {0.005000, 0.150000, 0.025000, 0.110000},
+        overlay
+    )
+    , m_y_button(
+        color,
+        ButtonType::ButtonY,
+        {0.005000, 0.210000, 0.025000, 0.110000},
+        overlay
+    )
+{}
+
+void MapDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_travel_icon);
+    m_x_button.make_overlays(items);
+    m_y_button.make_overlays(items);
+}
+
+bool MapDetector::detect(const ImageViewRGB32& screen){
+//    cout << "MapDetector::detect()" << endl;
+    const bool detected = detect_travel_spot(screen)
+        && m_x_button.detect(screen)
+        && m_y_button.detect(screen);
+
+    if (detected){
+        for (MapIconDetector* detector : m_map_icon_detectors){
+            detector->detect(screen);
+        }
+    }
+    return detected;
+}
+
+
+bool MapDetector::detect_travel_spot(const ImageViewRGB32& screen){
+    // Progressive cyan filters to handle capture-card color variance.
+    static const std::vector<std::pair<uint32_t, uint32_t>> CYAN_FILTERS{
+        // Brighter cyan/teal.
+        {0xff004898, 0xff70ffff},
+        {0xff003878, 0xff80ffff},
+        // Darker/desaturated cyan seen in some captures (e.g. 1080p hyperspace_True).
+        {0xff002860, 0xff90ffff},
+        {0xff001c50, 0xffa0ffff},
+    };
+
+    double rel = screen.height() / 2160.0;
+    size_t min_area = size_t(50.0 * rel * rel);
+
+    return match_template_by_waterfill(
+        screen.size(),
+        extract_box_reference(screen, m_travel_icon),
+        TravelSpotMatcher::instance(),
+        CYAN_FILTERS,
+        {min_area, SIZE_MAX},
+        100.0,
+        [](Kernels::Waterfill::WaterfillObject&) -> bool{ return true; }
+    );
+}
+std::vector<DetectedBox> MapDetector::detected_map_icons() const{
+    std::vector<DetectedBox> ret;
+    for (MapIconDetector* detector : m_map_icon_detectors){
+        const auto& detected_boxes = detector->last_detected();
+        for (const auto& box: detected_boxes){
+            ret.emplace_back(box.name, box.box);
+        }
+    }
+    return ret;
+}
+
+void MapDetector::reset_state(){
+    m_x_button.reset_state();
+    m_y_button.reset_state();
+    for (MapIconDetector* detector : m_map_icon_detectors){
+        detector->reset_state();
+    }
+}
+
+
+class Test_MapDetector : public ImageUnitTest{
+public:
+    Test_MapDetector(const std::string& image, bool expected)
+        : ImageUnitTest("PokemonPLZA::MapDetector - " + image, {image})
+        , m_expected(expected)
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        DummyVideoOverlay overlay;
+        MapDetector detector(COLOR_RED, &overlay);
+        const ImageRGB32& image = images[0];
+        return detector.detect(image) == m_expected;
+    }
+
+private:
+    bool m_expected;
+};
+
+
+void add_tests_MapDetector(UnitTestDatabase& database){
+    database.add<Test_MapDetector>("PokemonLZA/MapDetector/hyperspace_2_True.png", true);
+    database.add<Test_MapDetector>("PokemonLZA/MapDetector/hyperspace_True.png", true);
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Map/PokemonLZA_MapDetector.h b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Map/PokemonLZA_MapDetector.h
new file mode 100644
index 0000000000..c52dea944c
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Map/PokemonLZA_MapDetector.h
@@ -0,0 +1,89 @@
+/* Map Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLZA_MapDetector_H
+#define PokemonAutomation_PokemonLZA_MapDetector_H
+
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "CommonTools/VisualDetector.h"
+#include "CommonTools/DetectedBoxes.h"
+#include "VideoGames/PokemonLZA/Inference/PokemonLZA_ButtonDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+
+class MapIconDetector;
+
+
+// Detect whether the map view is opened or not
+class MapDetector : public StaticScreenDetector{
+public:
+    MapDetector(Color color = COLOR_RED, VideoOverlay* overlay = nullptr);
+
+    //  Attach MapIconDetector. Those will be called if a map is detected to detect map icons.
+    //  After detection session is done, call `detected_map_icons()` to get last detected map icons.
+    void attach_map_icon_detector(MapIconDetector& detector){
+        m_map_icon_detectors.push_back(&detector);
+    }
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+
+    //  This is not const so that detectors can save/cache state.
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+    //  Return last detected map icons from attached MapIconDetectors.
+    std::vector<DetectedBox> detected_map_icons() const;
+
+    void reset_state() override;
+
+private:
+    bool detect_travel_spot(const ImageViewRGB32& screen);
+
+private:
+    Color m_color;
+    ImageFloatBox m_travel_icon;
+    ButtonDetector m_x_button;
+    ButtonDetector m_y_button;
+    std::vector<MapIconDetector*> m_map_icon_detectors;
+};
+
+class MapWatcher : public DetectorToFinder<MapDetector>{
+public:
+    MapWatcher(
+        Color color = COLOR_RED,
+        VideoOverlay* overlay = nullptr,
+        std::chrono::milliseconds hold_duration = std::chrono::milliseconds(250)
+    )
+         : DetectorToFinder("MapWatcher", hold_duration, color, overlay)
+    {}
+};
+class MapOverWatcher : public DetectorToFinder<MapDetector>{
+public:
+    MapOverWatcher(
+        Color color = COLOR_RED,
+        VideoOverlay* overlay = nullptr,
+        std::chrono::milliseconds hold_duration = std::chrono::milliseconds(200)
+    )
+         : DetectorToFinder("MapWatcher", FinderType::GONE, hold_duration, color, overlay)
+    {}
+};
+
+
+void add_tests_MapDetector(UnitTestDatabase& database);
+
+
+
+
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Map/PokemonLZA_MapIconDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Map/PokemonLZA_MapIconDetector.cpp
new file mode 100644
index 0000000000..ea6248e48f
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Map/PokemonLZA_MapIconDetector.cpp
@@ -0,0 +1,507 @@
+/*  Map Icon Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <vector>
+#include <fstream>
+#include <map>
+#include "Common/Cpp/Exceptions.h"
+#include "Common/Cpp/Filesystem/Filesystem.h"
+//#include "Kernels/Waterfill/Kernels_Waterfill_Types.h"
+#include "CommonFramework/GlobalAutoPaths.h"
+#include "CommonTools/Images/WaterfillUtilities.h"
+#include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h"
+#include "Tests/ImageUnitTest.h"
+#include "Tests/TestUtils.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "PokemonLZA_MapIconDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+using ImageMatch::WaterfillTemplateMatcher;
+
+
+
+class MapIconMatcher : public ImageMatch::WaterfillTemplateMatcher{
+public:
+    MapIconMatcher(
+        const char* path,
+        std::string name,
+        Color min_color, Color max_color,
+        size_t min_area,
+        double max_rmsd,
+        std::vector<std::pair<uint32_t, uint32_t>> filters,
+        double area_ratio_override = 0
+    )
+        : WaterfillTemplateMatcher(path, min_color, max_color, min_area)
+        , m_name(std::move(name))
+        , m_max_rmsd(max_rmsd)
+        , m_filters(std::move(filters))
+    {
+        if (area_ratio_override != 0){
+            m_area_ratio = area_ratio_override;
+        }
+    }
+
+    const std::string& name() const{
+        return m_name;
+    }
+    double max_rmsd() const{
+        return m_max_rmsd;
+    }
+    const std::vector<std::pair<uint32_t, uint32_t>>& filters() const{
+        return m_filters;
+    }
+
+private:
+    std::string m_name;
+    double m_max_rmsd;
+    std::vector<std::pair<uint32_t, uint32_t>> m_filters;
+};
+
+
+
+const MapIconMatcher& MapIcon_PokemonCenter(){
+    static MapIconMatcher ret(
+        "PokemonLZA/MapIcons/PokemonCenter.png",
+        Pokemon::STRING_POKEMON + " Center",
+        Color(0xffc04030),
+        Color(0xffff8f6f),
+        100,
+        80.0,
+        {
+            {0xffc04030, 0xffff8f6f},
+            {0xffc05040, 0xffffaf8f},
+        }
+    );
+    return ret;
+}
+const MapIconMatcher& MapIcon_Building(){
+    static MapIconMatcher ret(
+        "PokemonLZA/MapIcons/Building.png",
+        "Building",
+        Color(0xff000000),
+        Color(0xff7f7f7f),
+        100,
+        100.0,
+        {
+            {0xff000000, 0xff7f7f7f},
+        }
+    );
+    return ret;
+}
+const MapIconMatcher& MapIcon_BuildingFlyable(){
+    static MapIconMatcher ret(
+        "PokemonLZA/MapIcons/BuildingFlyable.png",
+        "Building (Flyable)",
+        Color(0xff000000),
+        Color(0xff7f7f7f),
+        100,
+        100.0,
+        {
+            {0xff000000, 0xff7f7f7f},
+        }
+    );
+    return ret;
+}
+const MapIconMatcher& MapIcon_CafeFlyable(){
+    static MapIconMatcher ret(
+        "PokemonLZA/MapIcons/CafeFlyable.png",
+        "Cafe (Flyable)",
+        Color(0xff000000),
+        Color(0xff7f7f7f),
+        100,
+        100.0,
+        {
+            {0xff000000, 0xff7f7f7f},
+        }
+    );
+    return ret;
+}
+const MapIconMatcher& MapIcon_WildZone(){
+    static MapIconMatcher ret(
+        "PokemonLZA/MapIcons/WildZone.png",
+        "Wild Zone",
+        Color(0xff000000),
+        Color(0xff7f7f7f),
+        50,
+        50.0,
+        {
+            {0xff000000, 0xff7f7f7f},
+        },
+        0.646802
+    );
+    return ret;
+}
+const MapIconMatcher& MapIcon_WildZoneFlyable(){
+    static MapIconMatcher ret(
+        "PokemonLZA/MapIcons/WildZoneFlyable.png",
+        "Wild Zone (Flyable)",
+        Color(0xff000000),
+        Color(0xff7f7f7f),
+        50,
+        50.0,
+        {
+            {0xff000000, 0xff7f7f7f},
+        },
+        0.680978
+    );
+    return ret;
+}
+const MapIconMatcher& MapIcon_BattleZone(){
+    static MapIconMatcher ret(
+        "PokemonLZA/MapIcons/BattleZone.png",
+        "Battle Zone",
+        Color(0xff000000),
+        Color(0xff7f7f7f),
+        100,
+        50.0,
+        {
+            {0xff000000, 0xff7f7f7f},
+        }
+    );
+    return ret;
+}
+
+const MapIconMatcher& MapIcon_HyperspaceBattleZone(){
+    static MapIconMatcher ret(
+        "PokemonLZA/MapIcons/HyperspaceBattleZone.png",
+        "HyperspaceBattleZone",
+        Color(0xff000000),
+        Color(0xffFB257D),
+        100,
+        100.0,
+        {
+            {0xff000000, 0xffFB257D},
+        }
+    );
+    return ret;
+}
+
+const MapIconMatcher& MapIcon_HyperspaceWildZone(){
+    static MapIconMatcher ret(
+        "PokemonLZA/MapIcons/HyperspaceWildZone.png",
+        "HyperspaceWildZone",
+        Color(0xff000000),
+        Color(0xffAED635),
+        100,
+        100.0,
+        {
+            {0xff000000, 0xffAED635},
+        }
+    );
+    return ret;
+}
+
+/*
+const MapIconMatcher& MapIcon_HyperspaceEntryQuest(){
+    static MapIconMatcher ret(
+        "PokemonLZA/MapIcons/HyperspaceEntryQuest.png",
+        "HyperspaceEntryWild",
+        Color(0xff000000),
+        Color(0xffFFFFDD),
+        100,
+        100.0,
+        {
+            {0xff000000, 0xffFFFFDD},
+        }
+    );
+    return ret;
+}
+*/
+
+const MapIconMatcher& MapIcon_HyperspaceEntryWild(){
+    static MapIconMatcher ret(
+        "PokemonLZA/MapIcons/HyperspaceEntryWild.png",
+        "HyperspaceEntryWild",
+        Color(0xff000000),
+        Color(0xffAED635),
+        100,
+        100.0,
+        {
+            {0xff000000, 0xffAED635},
+        }
+    );
+    return ret;
+}
+
+const MapIconMatcher& MapIcon_HyperspaceEntryBattle(){
+    static MapIconMatcher ret(
+        "PokemonLZA/MapIcons/HyperspaceEntryBattle.png",
+        "HyperspaceEntryWild",
+        Color(0xff000000),
+        Color(0xffFB257D),
+        100,
+        100.0,
+        {
+            {0xff000000, 0xffFB257D},
+        }
+    );
+    return ret;
+}
+
+const MapIconMatcher& get_map_icon_matcher(MapIconType icon){
+    switch (icon){
+    case MapIconType::PokemonCenter:
+        return MapIcon_PokemonCenter();
+    case MapIconType::Building:
+        return MapIcon_Building();
+    case MapIconType::BuildingFlyable:
+        return MapIcon_BuildingFlyable();
+    case MapIconType::CafeFlyable:
+        return MapIcon_CafeFlyable();
+    case MapIconType::WildZone:
+        return MapIcon_WildZone();
+    case MapIconType::WildZoneFlyable:
+        return MapIcon_WildZoneFlyable();
+    case MapIconType::BattleZone:
+        return MapIcon_BattleZone();
+    case MapIconType::HyperspaceBattleZone:
+        return MapIcon_HyperspaceBattleZone();
+    case MapIconType::HyperspaceWildZone:
+        return MapIcon_HyperspaceWildZone();
+    case MapIconType::HyperspaceEntryWild:
+        return MapIcon_HyperspaceEntryWild();
+    case MapIconType::HyperspaceEntryBattle:
+        return MapIcon_HyperspaceEntryBattle();
+    default:
+        throw InternalProgramError(
+            nullptr, PA_CURRENT_FUNCTION,
+            "Unsupported Icon Type: " + std::to_string((int)icon)
+        );
+    }
+}
+
+const char* map_icon_type_to_string(MapIconType type){
+    switch (type){
+    case MapIconType::PokemonCenter:
+        return "PokemonCenter";
+    case MapIconType::Building:
+        return "Building";
+    case MapIconType::BuildingFlyable:
+        return "BuildingFlyable";
+    case MapIconType::CafeFlyable:
+        return "CafeFlyable";
+    case MapIconType::Clothing:
+        return "Clothing";
+    case MapIconType::Haircut:
+        return "Haircut";
+    case MapIconType::Shopping:
+        return "Shopping";
+    case MapIconType::WildZone:
+        return "WildZone";
+    case MapIconType::WildZoneFlyable:
+        return "WildZoneFlyable";
+    case MapIconType::BattleZone:
+        return "BattleZone";
+    case MapIconType::HyperspaceBattleZone:
+        return "HyperspaceBattleZone";
+    case MapIconType::HyperspaceWildZone:
+        return "HyperspaceWildZone";
+    case MapIconType::HyperspaceEntryWild:
+        return "HyperspaceEntryWild";
+    case MapIconType::HyperspaceEntryBattle:
+        return "HyperspaceEntryBattle";
+    default:
+        throw InternalProgramError(
+            nullptr, PA_CURRENT_FUNCTION,
+            "Unknown MapIconType: " + std::to_string((int)type)
+        );
+    }
+}
+
+MapIconType string_to_map_icon_type(const std::string& str){
+    if (str == "PokemonCenter") return MapIconType::PokemonCenter;
+    if (str == "Building") return MapIconType::Building;
+    if (str == "BuildingFlyable") return MapIconType::BuildingFlyable;
+    if (str == "CafeFlyable") return MapIconType::CafeFlyable;
+    if (str == "Clothing") return MapIconType::Clothing;
+    if (str == "Haircut") return MapIconType::Haircut;
+    if (str == "Shopping") return MapIconType::Shopping;
+    if (str == "WildZone") return MapIconType::WildZone;
+    if (str == "WildZoneFlyable") return MapIconType::WildZoneFlyable;
+    if (str == "BattleZone") return MapIconType::BattleZone;
+    if (str == "HyperspaceBattleZone") return MapIconType::HyperspaceBattleZone;
+    if (str == "HyperspaceWildZone") return MapIconType::HyperspaceWildZone;
+    if (str == "HyperspaceEntryWild") return MapIconType::HyperspaceEntryWild;
+    if (str == "HyperspaceEntryBattle") return MapIconType::HyperspaceEntryBattle;
+    throw InternalProgramError(
+        nullptr, PA_CURRENT_FUNCTION,
+        "Unknown MapIconType string: " + str
+    );
+}
+
+
+
+
+
+
+MapIconDetector::MapIconDetector(
+    Color color,
+    MapIconType button_type,
+    const ImageFloatBox& box,
+    VideoOverlay* overlay
+)
+    : m_color(color)
+    , m_matcher(get_map_icon_matcher(button_type))
+    , m_box(box)
+    , m_overlay(overlay)
+{}
+void MapIconDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_box);
+}
+bool MapIconDetector::detect(const ImageViewRGB32& screen){
+    double screen_rel_size = (screen.height() / 2160.0);
+    double screen_rel_size_2 = screen_rel_size * screen_rel_size;
+
+    double min_area_3840p = 1000.0;
+//    double rmsd_threshold = 120.0;
+    size_t min_area = size_t(screen_rel_size_2 * min_area_3840p);
+
+    m_last_detected.clear();
+
+    match_template_by_waterfill(
+        screen.size(),
+        extract_box_reference(screen, m_box),
+        m_matcher,
+        m_matcher.filters(),
+        {min_area, SIZE_MAX},
+        m_matcher.max_rmsd(),
+        [&](Kernels::Waterfill::WaterfillObject& object) -> bool {
+//            cout << "width = " << object.width() << ", height = " << object.height() << endl;
+            m_last_detected.emplace_back(
+                DetectedBox{
+                    m_matcher.name(),
+                    translate_to_parent(screen, m_box, object)
+                }
+            );
+            return false;
+        }
+    );
+
+    if (m_overlay){
+        m_last_detected_box.clear();
+        for (const DetectedBox& detection : m_last_detected){
+            m_last_detected_box.emplace_back(
+                *m_overlay,
+                COLOR_GREEN,
+                detection.box,
+                detection.name
+            );
+        }
+    }
+
+    return !m_last_detected_box.empty();
+}
+
+
+const std::vector<DetectedBox>& MapIconDetector::last_detected(){
+    merge_overlapping_boxes(m_last_detected);
+    return m_last_detected;
+}
+
+
+
+class Test_MapIconDetector : public ImageUnitTest{
+public:
+    Test_MapIconDetector(const std::string& image)
+        : ImageUnitTest("PokemonPLZA::MapIconDetector - " + image, {image})
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        Filesystem::Path file_path(UNIT_TEST_RESOURCE_PATH() + image_paths()[0]);
+        Filesystem::Path parent_dir = file_path.parent_path();
+        std::string base_name = file_path.stem().string();
+        Filesystem::Path target_detections_path = parent_dir / ("_" + base_name + ".txt");
+
+        std::map<MapIconType, int> expected_counts;
+        std::ifstream file(target_detections_path.stdpath());
+        if (!file.is_open()){
+            return "Error: cannot open target detection file " + target_detections_path.string();
+        }
+
+        std::string line;
+        while (std::getline(file, line)){
+            if (line.empty()){
+                continue;
+            }
+
+            size_t space_pos = line.find(' ');
+            if (space_pos == std::string::npos){
+                return "Error: invalid line format in " + target_detections_path.string() + ": " + line;
+            }
+
+            std::string type_str = line.substr(0, space_pos);
+            std::string count_str = line.substr(space_pos + 1);
+
+            int count = 0;
+            if (!parse_int(count_str, count)){
+                return "Error: invalid count in " + target_detections_path.string() + ": " + count_str;
+            }
+
+            try{
+                expected_counts[string_to_map_icon_type(type_str)] = count;
+            }catch (const std::exception&){
+                return "Error: unknown MapIconType in " + target_detections_path.string() + ": " + type_str;
+            }
+        }
+
+        const ImageRGB32& image = images[0];
+        std::map<MapIconType, std::vector<DetectedBox>> detected_boxes;
+        for (const auto& pair : expected_counts){
+            MapIconDetector detector(COLOR_RED, pair.first, ImageFloatBox(0.0, 0.0, 1.0, 1.0));
+            detector.detect(image);
+            detected_boxes[pair.first] = detector.last_detected();
+        }
+
+        for (const auto& pair : expected_counts){
+            const auto& detections = detected_boxes[pair.first];
+            TEST_RESULT_COMPONENT_EQUAL_STR((int)detections.size(), pair.second, map_icon_type_to_string(pair.first));
+        }
+
+        return true;
+    }
+};
+
+
+void add_tests_MapIconDetector(UnitTestDatabase& database){
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Map/PokemonLZA_MapIconDetector.h b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Map/PokemonLZA_MapIconDetector.h
new file mode 100644
index 0000000000..6021987d5f
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/Map/PokemonLZA_MapIconDetector.h
@@ -0,0 +1,85 @@
+/*  Map Icon Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLZA_MapIconDetector_H
+#define PokemonAutomation_PokemonLZA_MapIconDetector_H
+
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/DetectedBoxes.h"
+#include "CommonTools/VisualDetector.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+
+namespace PokemonAutomation{
+    class Logger;
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+class MapIconMatcher;
+
+
+enum class MapIconType{
+    PokemonCenter,
+    Building,
+    BuildingFlyable,
+    CafeFlyable,
+    Clothing,
+    Haircut,
+    Shopping,
+    WildZone,
+    WildZoneFlyable,
+    BattleZone,
+    HyperspaceBattleZone, //Icon in Lumiose
+    HyperspaceWildZone, //Icon in Lumiose
+    HyperspaceEntryWild, //Icon while in Hyperspace
+    HyperspaceEntryBattle, //Icon while in Hyperspace
+};
+
+const char* map_icon_type_to_string(MapIconType type);
+MapIconType string_to_map_icon_type(const std::string& str);
+
+
+
+
+class MapIconDetector : public StaticScreenDetector{
+public:
+    MapIconDetector(
+        Color color,
+        MapIconType button_type,
+        const ImageFloatBox& box,
+        VideoOverlay* overlay = nullptr
+    );
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+    const std::vector<DetectedBox>& last_detected();
+
+    virtual void reset_state() override {
+        m_last_detected.clear();
+        m_last_detected_box.clear();
+    }
+
+private:
+    Color m_color;
+    const MapIconMatcher& m_matcher;
+    ImageFloatBox m_box;
+    VideoOverlay* m_overlay;
+
+    std::vector<DetectedBox> m_last_detected;
+    std::deque<OverlayBoxScope> m_last_detected_box;
+};
+
+
+void add_tests_MapIconDetector(UnitTestDatabase& database);
+
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_AlertEyeDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_AlertEyeDetector.cpp
new file mode 100644
index 0000000000..83855a96c3
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_AlertEyeDetector.cpp
@@ -0,0 +1,202 @@
+/*  Alert Eye Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+//#include "Common/Cpp/Exceptions.h"
+#include "Kernels/Waterfill/Kernels_Waterfill_Types.h"
+#include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h"
+#include "CommonTools/Images/WaterfillUtilities.h"
+#include "Tests/ImageUnitTest.h"
+#include "Tests/TestUtils.h"
+#include "PokemonLZA_AlertEyeDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+
+
+class AlertEyeMatcher : public ImageMatch::WaterfillTemplateMatcher{
+public:
+    AlertEyeMatcher()
+        : WaterfillTemplateMatcher(
+            "PokemonLZA/AlertEye-Template.png",
+            Color(200, 100, 100), Color(255, 255, 255), 100
+        )
+    {
+        m_aspect_ratio_lower = 0.5;
+        m_aspect_ratio_upper = 1.1;
+        m_area_ratio_lower = 0.75;
+        m_area_ratio_upper = 1.1;
+    }
+
+    static const AlertEyeMatcher& instance(){
+        static AlertEyeMatcher matcher;
+        return matcher;
+    }
+};
+
+
+
+AlertEyeDetector::AlertEyeDetector(
+    Color color,
+    VideoOverlay* overlay
+)
+    : m_color(color)
+    , m_overlay(overlay)
+    , m_alert_eye_box(0.485, 0.088, 0.029, 0.034)
+    , m_initial_alert_eye_box(0.464, 0.142, 0.071, 0.074)
+{}
+
+void AlertEyeDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_alert_eye_box);
+    items.add(m_color, m_initial_alert_eye_box);
+}
+
+bool AlertEyeDetector::detect(const ImageViewRGB32& screen){
+    const double screen_rel_size = (screen.height() / 1080.0);
+    const double screen_rel_size_2 = screen_rel_size * screen_rel_size;
+
+    const double min_area_1080p = 300;
+    const double rmsd_threshold = 60;
+    const size_t min_area = size_t(screen_rel_size_2 * min_area_1080p);
+
+    const std::vector<std::pair<uint32_t, uint32_t>> FILTERS = {
+        { 0xff808080, 0xffffffff },
+        { 0xff909090, 0xffffffff },
+        { 0xffa0a0a0, 0xffffffff },
+        { 0xffb0b0b0, 0xffffffff },
+        { 0xffc0c0c0, 0xffffffff },
+        // { 0xffd0d0d0, 0xffffffff },
+        // { 0xffe0e0e0, 0xffffffff },
+        // { 0xfff0f0f0, 0xffffffff },
+    };
+
+    auto match_callback = [&](Kernels::Waterfill::WaterfillObject& object) -> bool {
+        m_last_detected = translate_to_parent(screen, m_alert_eye_box, object);
+        return true;
+    };
+
+    bool found = match_template_by_waterfill(
+        screen.size(),
+        extract_box_reference(screen, m_alert_eye_box),
+        AlertEyeMatcher::instance(),
+        FILTERS,
+        {min_area, SIZE_MAX},
+        rmsd_threshold,
+        match_callback
+    );
+
+    if (!found){
+        found = match_template_by_waterfill(
+            screen.size(),
+            extract_box_reference(screen, m_initial_alert_eye_box),
+            AlertEyeMatcher::instance(),
+            FILTERS,
+            {min_area, SIZE_MAX},
+            rmsd_threshold,
+            match_callback
+        );
+    }
+
+    if (m_overlay){
+        if (found){
+            m_last_detected_box.emplace(*m_overlay, m_last_detected, COLOR_GREEN);
+        }else{
+            m_last_detected_box.reset();
+        }
+    }
+
+    return found;
+}
+
+
+
+
+AlertEyeTracker::AlertEyeTracker(Color color, VideoOverlay* overlay, WallDuration min_duration)
+    : AlertEyeDetector(color, overlay)
+    , VisualInferenceCallback("AlertEyeTracker")
+    , m_min_duration(min_duration)
+    , m_first_detection(WallClock::max())
+{}
+
+bool AlertEyeTracker::currently_active() const{
+    ReadSpinLock lg(m_lock, PA_CURRENT_FUNCTION);
+    return m_first_detection <= current_time() - m_min_duration;
+}
+
+void AlertEyeTracker::make_overlays(VideoOverlaySet& items) const{
+    AlertEyeDetector::make_overlays(items);
+}
+
+bool AlertEyeTracker::process_frame(const ImageViewRGB32& frame, WallClock timestamp){
+    if (!detect(frame)){
+        WriteSpinLock lg(m_lock, PA_CURRENT_FUNCTION);
+        m_first_detection = WallClock::max();
+        return false;
+    }
+
+    WriteSpinLock lg(m_lock, PA_CURRENT_FUNCTION);
+    m_first_detection = std::min(m_first_detection, timestamp);
+
+    return false;
+}
+
+
+
+
+class Test_AlertEyeDetector : public ImageUnitTest{
+public:
+    Test_AlertEyeDetector(
+        const std::string& image,
+        bool expected
+    )
+        : ImageUnitTest("PokemonPLZA::AlertEyeDetector - " + image, {image})
+        , m_expected(expected)
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        DummyVideoOverlay overlay;
+        AlertEyeDetector detector(COLOR_RED, &overlay);
+        const ImageRGB32& image = images[0];
+        return detector.detect(image) == m_expected;
+    };
+
+private:
+    bool m_expected;
+};
+
+
+void add_tests_AlertEyeDetector(UnitTestDatabase& database){
+    database.add<Test_AlertEyeDetector>("PokemonLZA/AlertEyeDetector/lab_beldum_alpha_alert_True.png", true);
+    database.add<Test_AlertEyeDetector>("PokemonLZA/AlertEyeDetector/lab_beldum_x2_alpha_alert_True.png", true);
+    database.add<Test_AlertEyeDetector>("PokemonLZA/AlertEyeDetector/zone_15_gourgeist_alert_True.png", true);
+    database.add<Test_AlertEyeDetector>("PokemonLZA/AlertEyeDetector/zone_15_gourgeist_pumpkaboo_alert_True.png", true);
+    database.add<Test_AlertEyeDetector>("PokemonLZA/AlertEyeDetector/zone_15_green_gate_alert_True.png", true);
+    database.add<Test_AlertEyeDetector>("PokemonLZA/AlertEyeDetector/zone_15_pumpkaboo_alpha_alert_True.png", true);
+    database.add<Test_AlertEyeDetector>("PokemonLZA/AlertEyeDetector/zone_15_pumpkaboo_alpha_x2_alert_True.png", true);
+    database.add<Test_AlertEyeDetector>("PokemonLZA/AlertEyeDetector/zone_17_burrow_alert_True.png", true);
+    database.add<Test_AlertEyeDetector>("PokemonLZA/AlertEyeDetector/zone_17_burrow_chespin_alert_True.png", true);
+    database.add<Test_AlertEyeDetector>("PokemonLZA/AlertEyeDetector/zone_17_chespin_alert_True.png", true);
+    database.add<Test_AlertEyeDetector>("PokemonLZA/AlertEyeDetector/zone_20_carbink_barbaracle_alert_True.png", true);
+    database.add<Test_AlertEyeDetector>("PokemonLZA/AlertEyeDetector/zone_20_chandelure_drampa_True.png", true);
+    database.add<Test_AlertEyeDetector>("PokemonLZA/AlertEyeDetector/zone_20_dedenne_alakazam_alert_True.png", true);
+    database.add<Test_AlertEyeDetector>("PokemonLZA/AlertEyeDetector/zone_20_gallade_simipour_alert_True.png", true);
+    database.add<Test_AlertEyeDetector>("PokemonLZA/AlertEyeDetector/zone_6_alpha_houndour_1_True.png", true);
+    database.add<Test_AlertEyeDetector>("PokemonLZA/AlertEyeDetector/zone_6_alpha_houndour_2_True.png", true);
+    database.add<Test_AlertEyeDetector>("PokemonLZA/AlertEyeDetector/zone_6_houndour_1_True.png", true);
+    database.add<Test_AlertEyeDetector>("PokemonLZA/AlertEyeDetector/zone_6_houndour_2_True.png", true);
+    database.add<Test_AlertEyeDetector>("PokemonLZA/AlertEyeDetector/zone_6_houndour_3_True.png", true);
+    database.add<Test_AlertEyeDetector>("PokemonLZA/AlertEyeDetector/zone_6_houndour_4_True.png", true);
+    database.add<Test_AlertEyeDetector>("PokemonLZA/AlertEyeDetector/zone_6_houndour_5_True.png", true);
+}
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_AlertEyeDetector.h b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_AlertEyeDetector.h
new file mode 100644
index 0000000000..7df4179eaa
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_AlertEyeDetector.h
@@ -0,0 +1,87 @@
+/*  Alert Eye Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLZA_AlertEyeDetector_H
+#define PokemonAutomation_PokemonLZA_AlertEyeDetector_H
+
+#include "Common/Cpp/Concurrency/SpinLock.h"
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/VisualDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+
+// Detect the red warning symbol when you are under attack by wild pokemon
+class AlertEyeDetector : public StaticScreenDetector{
+public:
+    AlertEyeDetector(Color color, VideoOverlay* overlay);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+
+    //  This is not const so that detectors can save/cache state.
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    friend class AlertEyeWatcher;
+
+    const Color m_color;
+    VideoOverlay* m_overlay;
+    const ImageFloatBox m_alert_eye_box;
+    const ImageFloatBox m_initial_alert_eye_box;
+
+    ImageFloatBox m_last_detected;
+    std::optional<OverlayBoxScope> m_last_detected_box;
+};
+
+class AlertEyeWatcher : public DetectorToFinder<AlertEyeDetector>{
+public:
+    AlertEyeWatcher(
+        Color color,
+        VideoOverlay* overlay,
+        std::chrono::milliseconds hold_duration = std::chrono::milliseconds(250)
+    )
+         : DetectorToFinder("AlertEyeWatcher", hold_duration, color, overlay)
+    {}
+};
+
+class AlertEyeOverWatcher : public DetectorToFinder<AlertEyeDetector>{
+public:
+    AlertEyeOverWatcher(
+        Color color,
+        VideoOverlay* overlay,
+        std::chrono::milliseconds hold_duration = std::chrono::milliseconds(250)
+    )
+         : DetectorToFinder("AlertEyeOverWatcher", FinderType::GONE, hold_duration, color, overlay)
+    {}
+};
+
+class AlertEyeTracker final : public AlertEyeDetector, public VisualInferenceCallback{
+public:
+    AlertEyeTracker(Color color, VideoOverlay* overlay, WallDuration min_duration);
+
+    bool currently_active() const;
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override;
+
+private:
+    mutable SpinLock m_lock;
+    WallDuration m_min_duration;
+    WallClock m_first_detection;
+};
+
+
+void add_tests_AlertEyeDetector(UnitTestDatabase& database);
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_ButtonDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_ButtonDetector.cpp
new file mode 100644
index 0000000000..a1893bb3fe
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_ButtonDetector.cpp
@@ -0,0 +1,338 @@
+/*  Button Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <iostream>
+#include "Kernels/Waterfill/Kernels_Waterfill_Types.h"
+#include "CommonFramework/StaticGlobals.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Images/WaterfillUtilities.h"
+#include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h"
+#include "Tests/ImageUnitTest.h"
+#include "Tests/TestUtils.h"
+#include "PokemonLZA_ButtonDetector.h"
+
+// using std::cout;
+// using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+
+
+class ButtonMatcher : public ImageMatch::WaterfillTemplateMatcher{
+public:
+    // image template matcher for buttons
+    // - min_width: candidate image min width if video stream is 4k
+    // - min_height: candidate image min height if video stream is 4k
+    ButtonMatcher(ButtonType type, size_t min_width, size_t min_height, double max_rmsd, bool match_black_interior = false);
+    static const ButtonMatcher& A(){
+        static ButtonMatcher matcher(ButtonType::ButtonA, 50, 50, 70);
+        return matcher;
+    }
+    static const ButtonMatcher& B(){
+        static ButtonMatcher matcher(ButtonType::ButtonB, 50, 50, 80);
+        return matcher;
+    }
+    static const ButtonMatcher& X(){
+        static ButtonMatcher matcher(ButtonType::ButtonX, 50, 50, 70);
+        return matcher;
+    }
+    static const ButtonMatcher& Y(){
+        static ButtonMatcher matcher(ButtonType::ButtonY, 50, 50, 70);
+        return matcher;
+    }
+    static const ButtonMatcher& L(){
+        static ButtonMatcher matcher(ButtonType::ButtonL, 50, 50, 70);
+        return matcher;
+    }
+    static const ButtonMatcher& R(){
+        static ButtonMatcher matcher(ButtonType::ButtonR, 50, 50, 70);
+        return matcher;
+    }
+    static const ButtonMatcher& Plus(){
+        static ButtonMatcher matcher(ButtonType::ButtonPlus, 30, 30, 80);
+        return matcher;
+    }
+    static const ButtonMatcher& Minus(){
+        static ButtonMatcher matcher(ButtonType::ButtonMinus, 30, 30, 80);
+        return matcher;
+    }
+    static const ButtonMatcher& Right(){
+        static ButtonMatcher matcher(ButtonType::ButtonRight, 50, 50, 70);
+        return matcher;
+    }
+    static const ButtonMatcher& RightStickUpDown(){
+        static ButtonMatcher matcher(ButtonType::RightStickUpDown, 20, 20, 120);
+        return matcher;
+    }
+    static const ButtonMatcher& DpadUp(){
+        static ButtonMatcher matcher(ButtonType::ButtonDpadUp, 30, 30, 80);
+        return matcher;
+    }
+    static const ButtonMatcher& DpadDown(){
+        static ButtonMatcher matcher(ButtonType::ButtonDpadDown, 30, 30, 80);
+        return matcher;
+    }
+    static const ButtonMatcher& DpadUpInterior(){
+        const bool match_black_interior = true;
+        static ButtonMatcher matcher(ButtonType::ButtonDpadUpInterior, 10, 10, 120, match_black_interior);
+        return matcher;
+    }
+    static const ButtonMatcher& DpadDownInterior(){
+        const bool match_black_interior = true;
+        static ButtonMatcher matcher(ButtonType::ButtonDpadDownInterior, 10, 10, 120, match_black_interior);
+        return matcher;
+    }
+
+    virtual bool check_image(Resolution input_resolution, const ImageViewRGB32& image) const override{
+        size_t min_width = m_min_width * input_resolution.width / 3840;
+        size_t min_height = m_min_height * input_resolution.height / 2160;
+
+        if (STATIC_GLOBALS.IMAGE_TEMPLATE_MATCHING){
+            const double stddev_sum = image_stats(image).stddev.sum();
+            std::cout << "???? ButtonMatcher::check_image() ???? min size " << min_width << " x " << min_height
+                 << " got " << image.width() << " x " << image.height() << " stddev_sum: " << stddev_sum << std::endl;
+        }
+        return image.width() >= min_width && image.height() >= min_height;
+    };
+
+    size_t m_min_width;
+    size_t m_min_height;
+    double m_max_rmsd;
+};
+
+
+const char* template_path(ButtonType type){
+    switch (type){
+    case ButtonType::ButtonA:
+        return "PokemonLZA/Buttons/ButtonA.png";
+    case ButtonType::ButtonB:
+        return "PokemonLZA/Buttons/ButtonB.png";
+    case ButtonType::ButtonX:
+        return "PokemonLZA/Buttons/ButtonX.png";
+    case ButtonType::ButtonY:
+        return "PokemonLZA/Buttons/ButtonY.png";
+    case ButtonType::ButtonL:
+        return "PokemonLZA/Buttons/ButtonL.png";
+    case ButtonType::ButtonR:
+        return "PokemonLZA/Buttons/ButtonR.png";
+    case ButtonType::ButtonPlus:
+        return "PokemonLZA/Buttons/ButtonPlus.png";
+    case ButtonType::ButtonMinus:
+        return "PokemonLZA/Buttons/ButtonMinus.png";
+    case ButtonType::ButtonRight:
+        return "PokemonLZA/Buttons/ButtonRight.png";
+    case ButtonType::RightStickUpDown:
+        return "PokemonLZA/Buttons/RightStickUpDown.png";
+    case ButtonType::ButtonDpadUp:
+    case ButtonType::ButtonDpadUpInterior:
+        return "PokemonLZA/Buttons/ButtonDpadUp.png";
+    case ButtonType::ButtonDpadDown:
+    case ButtonType::ButtonDpadDownInterior:
+        return "PokemonLZA/Buttons/ButtonDpadDown.png";
+    default:
+        return "";
+    }
+}
+
+const ButtonMatcher& get_button_matcher(ButtonType type){
+    switch (type){
+    case ButtonType::ButtonA:
+        return ButtonMatcher::A();
+    case ButtonType::ButtonB:
+        return ButtonMatcher::B();
+    case ButtonType::ButtonX:
+        return ButtonMatcher::X();
+    case ButtonType::ButtonY:
+        return ButtonMatcher::Y();
+    case ButtonType::ButtonL:
+        return ButtonMatcher::L();
+    case ButtonType::ButtonR:
+        return ButtonMatcher::R();
+    case ButtonType::ButtonPlus:
+        return ButtonMatcher::Plus();
+    case ButtonType::ButtonMinus:
+        return ButtonMatcher::Minus();
+    case ButtonType::ButtonRight:
+        return ButtonMatcher::Right();
+    case ButtonType::RightStickUpDown:
+        return ButtonMatcher::RightStickUpDown();
+    case ButtonType::ButtonDpadUp:
+        return ButtonMatcher::DpadUp();
+    case ButtonType::ButtonDpadDown:
+        return ButtonMatcher::DpadDown();
+    case ButtonType::ButtonDpadUpInterior:
+        return ButtonMatcher::DpadUpInterior();
+    case ButtonType::ButtonDpadDownInterior:
+        return ButtonMatcher::DpadDownInterior();
+    default:
+        throw std::runtime_error("No corresponding ButtonMatcher for ButtonType");
+    }
+}
+
+bool match_button_black_interior(ButtonType button_type){
+    return button_type == ButtonType::ButtonDpadUpInterior || button_type == ButtonType::ButtonDpadDownInterior;
+}
+
+ButtonMatcher::ButtonMatcher(ButtonType type, size_t min_width, size_t min_height, double max_rmsd, bool match_black_interior)
+    : WaterfillTemplateMatcher(
+        template_path(type),
+        match_black_interior ? Color(0xff000000) : Color(0xff808008),
+        match_black_interior ? Color(0xff404040) : Color(0xffffffff),
+        match_black_interior ? 50 : 100
+    )
+    , m_min_width(min_width)
+    , m_min_height(min_height)
+    , m_max_rmsd(max_rmsd)
+{}
+
+
+
+ButtonDetector::ButtonDetector(
+    Color color,
+    ButtonType button_type,
+    const ImageFloatBox& box,
+    VideoOverlay* overlay
+)
+    : m_button_type(button_type)
+    , m_color(color)
+    , m_matcher(get_button_matcher(button_type))
+    , m_box(box)
+    , m_overlay(overlay)
+{
+
+}
+void ButtonDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_box);
+}
+bool ButtonDetector::detect(const ImageViewRGB32& screen){
+
+    double screen_rel_size = (screen.height() / 2160.0);
+    double screen_rel_size_2 = screen_rel_size * screen_rel_size;
+
+    double min_area_3840p = match_button_black_interior(m_button_type) ? 100.0 : 1000.0;
+//    double rmsd_threshold = 120.0;
+    size_t min_area = size_t(screen_rel_size_2 * min_area_3840p);
+
+    const std::vector<std::pair<uint32_t, uint32_t>> FILTERS = [&]() -> std::vector<std::pair<uint32_t, uint32_t>>{
+        if (match_button_black_interior(m_button_type)){
+            return {
+                {0xff000000, 0xff404040},
+                {0xff000000, 0xff505050},
+                {0xff000000, 0xff606060},
+                {0xff000000, 0xff707070},
+            };
+        }
+        return {
+            {0xff808080, 0xffffffff},
+            {0xff909090, 0xffffffff},
+            {0xffa0a0a0, 0xffffffff},
+            {0xffb0b0b0, 0xffffffff},
+            {0xffc0c0c0, 0xffffffff},
+            {0xffd0d0d0, 0xffffffff},
+            {0xffe0e0e0, 0xffffffff},
+            {0xfff0f0f0, 0xffffffff},
+        };
+    }();
+
+    // if (m_button_type == ButtonType::ButtonDpadUpInterior){
+    //     cout << "Start debugging ButtonDpadUpInterior" << endl;
+    //     STATIC_GLOBALS.IMAGE_TEMPLATE_MATCHING = true;
+    // }
+
+    bool found = match_template_by_waterfill(
+        screen.size(),
+        extract_box_reference(screen, m_box),
+        m_matcher,
+        FILTERS,
+        {min_area, SIZE_MAX},
+        m_matcher.m_max_rmsd,
+        [&](Kernels::Waterfill::WaterfillObject& object) -> bool {
+//            cout << "width = " << object.width() << ", height = " << object.height() << endl;
+            m_last_detected = translate_to_parent(screen, m_box, object);
+            return true;
+        }
+    );
+
+    if (m_overlay){
+        if (found){
+            m_last_detected_box.emplace(*m_overlay, m_last_detected, COLOR_GREEN);
+        }else{
+            m_last_detected_box.reset();
+        }
+    }
+
+    // if (m_button_type == ButtonType::ButtonDpadUpInterior){
+    //     cout << "End debugging ButtonDpadUpInterior" << endl;
+    //     STATIC_GLOBALS.IMAGE_TEMPLATE_MATCHING = false;
+    // }
+
+    return found;
+}
+
+
+
+
+
+
+
+
+
+
+class Test_ButtonDetector : public ImageUnitTest{
+public:
+    Test_ButtonDetector(
+        const std::string& image,
+        ButtonType expected_button,
+        bool expected
+    )
+        : ImageUnitTest("PokemonPLZA::ButtonDetector - " + image, {image})
+        , m_expected_button(expected_button)
+        , m_expected(expected)
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        DummyVideoOverlay overlay;
+        ButtonDetector detector(COLOR_RED, m_expected_button, ImageFloatBox(0.0, 0.0, 1.0, 1.0), &overlay);
+        const ImageRGB32& image = images[0];
+        return detector.detect(image) == m_expected;
+    };
+
+private:
+    ButtonType m_expected_button;
+    bool m_expected;
+};
+
+
+void add_tests_ButtonDetector(UnitTestDatabase& database){
+    database.add<Test_ButtonDetector>("PokemonLZA/ButtonDetector/french_fossil_1_ButtonA_True.png", ButtonType::ButtonA, true);
+    database.add<Test_ButtonDetector>("PokemonLZA/ButtonDetector/french_fossil_2_ButtonA_True.png", ButtonType::ButtonA, true);
+    database.add<Test_ButtonDetector>("PokemonLZA/ButtonDetector/french_fossil_3_ButtonA_True.png", ButtonType::ButtonA, true);
+    database.add<Test_ButtonDetector>("PokemonLZA/ButtonDetector/french_fossil_4_ButtonA_True.png", ButtonType::ButtonA, true);
+    database.add<Test_ButtonDetector>("PokemonLZA/ButtonDetector/french_fossil_5_ButtonA_True.png", ButtonType::ButtonA, true);
+    database.add<Test_ButtonDetector>("PokemonLZA/ButtonDetector/mac_fossil_1_ButtonA_True.png", ButtonType::ButtonA, true);
+    database.add<Test_ButtonDetector>("PokemonLZA/ButtonDetector/mac_fossil_2_ButtonA_True.png", ButtonType::ButtonA, true);
+    database.add<Test_ButtonDetector>("PokemonLZA/ButtonDetector/mac_fossil_3_ButtonA_True.png", ButtonType::ButtonA, true);
+    database.add<Test_ButtonDetector>("PokemonLZA/ButtonDetector/mac_fossil_4_ButtonA_True.png", ButtonType::ButtonA, true);
+    database.add<Test_ButtonDetector>("PokemonLZA/ButtonDetector/mac_fossil_5_ButtonA_True.png", ButtonType::ButtonA, true);
+    database.add<Test_ButtonDetector>("PokemonLZA/ButtonDetector/mac_fossil_6_ButtonA_True.png", ButtonType::ButtonA, true);
+}
+
+
+
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_ButtonDetector.h b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_ButtonDetector.h
new file mode 100644
index 0000000000..ee20f974be
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_ButtonDetector.h
@@ -0,0 +1,101 @@
+/*  Button Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLZA_ButtonDetector_H
+#define PokemonAutomation_PokemonLZA_ButtonDetector_H
+
+#include <optional>
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/VisualDetector.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+
+namespace PokemonAutomation{
+    class Logger;
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+
+enum class ButtonType{
+    ButtonA,
+    ButtonB,
+    ButtonX,
+    ButtonY,
+    ButtonL,
+    ButtonR,
+    ButtonPlus,
+    ButtonMinus,
+    ButtonRight,
+    RightStickUpDown,
+    ButtonDpadUp,
+    ButtonDpadDown,
+    ButtonDpadUpInterior,   // Used to create button detector that detects the black triangle inside the DPAD_UP button
+    ButtonDpadDownInterior, // Used to create button detector that detects the black triangle inside the DPAD_DOWN button
+};
+
+class ButtonMatcher;
+
+
+
+
+class ButtonDetector : public StaticScreenDetector{
+public:
+    ButtonDetector(
+        Color color,
+        ButtonType button_type,
+        const ImageFloatBox& box,
+        VideoOverlay* overlay = nullptr
+    );
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+    virtual void reset_state() override { m_last_detected_box.reset(); }
+
+    ButtonType button_type() const { return m_button_type; }
+
+private:
+    ButtonType m_button_type;
+    Color m_color;
+    const ButtonMatcher& m_matcher;
+    ImageFloatBox m_box;
+    VideoOverlay* m_overlay;
+
+    ImageFloatBox m_last_detected;
+    std::optional<OverlayBoxScope> m_last_detected_box;
+};
+class ButtonWatcher : public DetectorToFinder<ButtonDetector>{
+public:
+    ButtonWatcher(
+        Color color,
+        ButtonType button_type,
+        const ImageFloatBox& box,
+        VideoOverlay* overlay = nullptr,
+        std::chrono::milliseconds hold_duration = std::chrono::milliseconds(250)
+    )
+         : DetectorToFinder("ButtonWatcher", hold_duration, color, button_type, box, overlay)
+    {}
+};
+class ButtonGoneWatcher : public DetectorToFinder<ButtonDetector>{
+public:
+    ButtonGoneWatcher(
+        Color color,
+        ButtonType button_type,
+        const ImageFloatBox& box,
+        VideoOverlay* overlay = nullptr,
+        std::chrono::milliseconds hold_duration = std::chrono::milliseconds(250)
+    )
+         : DetectorToFinder("ButtonGoneWatcher", FinderType::GONE, hold_duration, color, button_type, box, overlay)
+    {}
+};
+
+
+void add_tests_ButtonDetector(UnitTestDatabase& database);
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_DayNightChangeDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_DayNightChangeDetector.cpp
new file mode 100644
index 0000000000..b07dc7d787
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_DayNightChangeDetector.cpp
@@ -0,0 +1,32 @@
+/*  Day Night Change Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Exceptions.h"
+#include "CommonTools/Images/WaterfillUtilities.h"
+#include "PokemonLZA_DayNightChangeDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+
+DayNightChangeWatcher::DayNightChangeWatcher(Color color)
+    : VisualInferenceCallback("DayNighChangeWatcher")
+    , m_black_screen(color)
+{}
+
+void DayNightChangeWatcher::make_overlays(VideoOverlaySet& items) const{
+    m_black_screen.make_overlays(items);
+}
+
+bool DayNightChangeWatcher::process_frame(const ImageViewRGB32& frame, WallClock timestamp){
+    return m_black_screen.process_frame(frame, timestamp);
+}
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_DayNightChangeDetector.h b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_DayNightChangeDetector.h
new file mode 100644
index 0000000000..11f0155a78
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_DayNightChangeDetector.h
@@ -0,0 +1,40 @@
+/*  Day Night Change Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLZA_DayNightChangeDetector_H
+#define PokemonAutomation_PokemonLZA_DayNightChangeDetector_H
+
+#include <optional>
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/VisualDetector.h"
+#include "CommonTools/VisualDetectors/BlackScreenDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+
+// Detect day/night change
+class DayNightChangeWatcher : public VisualInferenceCallback{
+public:
+    DayNightChangeWatcher(Color color);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+
+    virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override;
+
+private:
+    BlackScreenWatcher m_black_screen;
+};
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_DayNightStateDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_DayNightStateDetector.cpp
new file mode 100644
index 0000000000..e9f93a5ba8
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_DayNightStateDetector.cpp
@@ -0,0 +1,65 @@
+#include "CommonFramework/ImageTools/ImageStats.h"
+
+#include "PokemonLZA_DayNightStateDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+
+DayNightStateDetector::DayNightStateDetector(VideoOverlay* overlay)
+    :
+    // sample terrain area after zooming map fully in and hiding icons
+    // screen-relative coordinates (0–1)
+    m_box(0.30, 0.55, 0.15, 0.18),
+    m_state(DayNightState::DAY)
+{}
+
+
+void DayNightStateDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(COLOR_GREEN, m_box);
+}
+
+
+bool DayNightStateDetector::detect(const ImageViewRGB32& screen){
+
+    ImageStats stats =
+        image_stats(extract_box_reference(screen, m_box));
+
+
+    // robust against brightness differences between capture cards
+    const double blue_ratio =
+        stats.average.b /
+        (stats.average.r + stats.average.g + stats.average.b);
+
+
+    /*
+        Empirically stable separation:
+
+        DAY   ≈ 0.32 – 0.35
+        NIGHT ≈ 0.40 – 0.46
+
+        Threshold chosen conservatively to survive:
+        - HDMI color variance
+        - OBS color space changes
+        - capture card gamma shifts
+    */
+
+    if (blue_ratio > 0.36){
+        m_state = DayNightState::NIGHT;
+    }
+    else{
+        m_state = DayNightState::DAY;
+    }
+
+    return true;
+}
+
+
+DayNightState DayNightStateDetector::state() const{
+    return m_state;
+}
+
+}
+}
+}
\ No newline at end of file
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_DayNightStateDetector.h b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_DayNightStateDetector.h
new file mode 100644
index 0000000000..61a3b44b92
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_DayNightStateDetector.h
@@ -0,0 +1,42 @@
+#pragma once
+
+#include "Common/Cpp/Color.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/VisualDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+
+enum class DayNightState{
+    DAY,
+    NIGHT
+};
+
+
+class DayNightStateDetector : public StaticScreenDetector{
+public:
+
+    DayNightStateDetector(VideoOverlay* overlay = nullptr);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+    DayNightState state() const;
+
+private:
+
+    ImageFloatBox m_box;
+
+    DayNightState m_state;
+
+
+};
+
+
+}
+}
+}
\ No newline at end of file
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_DialogDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_DialogDetector.cpp
new file mode 100644
index 0000000000..3f350a27a0
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_DialogDetector.cpp
@@ -0,0 +1,596 @@
+/*  Dialog Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "Kernels/Waterfill/Kernels_Waterfill_Types.h"
+#include "CommonFramework/ImageTools/ImageStats.h"
+#include "CommonFramework/VideoPipeline/VideoOverlay.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Images/SolidColorTest.h"
+#include "CommonTools/Images/WaterfillUtilities.h"
+#include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h"
+#include "Tests/ImageUnitTest.h"
+#include "Tests/TestUtils.h"
+#include "PokemonLZA_DialogDetector.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+
+class DialogTitleGreenLineMatcher : public ImageMatch::WaterfillTemplateMatcher{
+public:
+    // The white background for the template file is of color range [r=240, g=255, b=230] to [255, 255, 255]
+    // the green line is of color range [r=180,g=200,b=75] to [190, 214, 110]
+    DialogTitleGreenLineMatcher()
+        : WaterfillTemplateMatcher(
+            "PokemonLZA/DialogBox/DialogBoxTitleGreenLine-Template.png",
+            Color(180,200,70), Color(200, 220, 115), 50
+        )
+    {
+        m_aspect_ratio_lower = 0.9;
+        m_aspect_ratio_upper = 1.1;
+        m_area_ratio_lower = 0.8;
+        m_area_ratio_upper = 1.1;
+    }
+
+    static const ImageMatch::WaterfillTemplateMatcher& instance(){
+        static DialogTitleGreenLineMatcher matcher;
+        return matcher;
+    }
+};
+
+class DialogBlackArrowMatcher : public ImageMatch::WaterfillTemplateMatcher{
+public:
+    DialogBlackArrowMatcher()
+        : WaterfillTemplateMatcher(
+            "PokemonLZA/DialogBox/DialogBoxBlackArrow-Template.png",
+            Color(0,0,0), Color(90, 90, 90), 50
+        )
+    {
+        m_aspect_ratio_lower = 0.9;
+        m_aspect_ratio_upper = 1.2;
+        m_area_ratio_lower = 0.83;
+        m_area_ratio_upper = 1.1;
+    }
+
+    static const ImageMatch::WaterfillTemplateMatcher& instance(){
+        static DialogBlackArrowMatcher matcher;
+        return matcher;
+    }
+};
+
+class DialogWhiteArrowMatcher : public ImageMatch::WaterfillTemplateMatcher{
+public:
+    DialogWhiteArrowMatcher()
+        : WaterfillTemplateMatcher(
+            "PokemonLZA/DialogBox/DialogBoxWhiteArrow-Template.png",
+            Color(0xffc0c0c0), Color(0xffffffff), 50
+        )
+    {
+        m_aspect_ratio_lower = 0.9;
+        m_aspect_ratio_upper = 1.1;
+        m_area_ratio_lower = 0.85;
+        m_area_ratio_upper = 1.1;
+    }
+
+    static const ImageMatch::WaterfillTemplateMatcher& instance(){
+        static DialogWhiteArrowMatcher matcher;
+        return matcher;
+    }
+};
+
+class DialogTealArrowMatcher : public ImageMatch::WaterfillTemplateMatcher{
+public:
+    DialogTealArrowMatcher()
+        : WaterfillTemplateMatcher(
+            "PokemonLZA/DialogBox/DialogBoxTealArrow-Template.png",
+            Color(0xff00c080), Color(0xff3fffff), 50
+        )
+    {
+        m_aspect_ratio_lower = 0.9;
+        m_aspect_ratio_upper = 1.1;
+        m_area_ratio_lower = 0.8;
+        m_area_ratio_upper = 1.1;
+    }
+
+    static const ImageMatch::WaterfillTemplateMatcher& instance(){
+        static DialogTealArrowMatcher matcher;
+        return matcher;
+    }
+};
+
+class DialogBlueArrowMatcher : public ImageMatch::WaterfillTemplateMatcher{
+public:
+    DialogBlueArrowMatcher()
+        : WaterfillTemplateMatcher(
+            "PokemonLZA/DialogBox/DialogBoxBlueArrow-Template.png",
+            Color(0xff005460), Color(0xff6BBEC9), 50
+        )
+    {
+        m_aspect_ratio_lower = 0.9;
+        m_aspect_ratio_upper = 1.1;
+        m_area_ratio_lower = 0.8;
+        m_area_ratio_upper = 1.1;
+    }
+
+    static const ImageMatch::WaterfillTemplateMatcher& instance(){
+        static DialogBlueArrowMatcher matcher;
+        return matcher;
+    }
+};
+
+
+namespace {
+
+const static ImageFloatBox DIALOG_ARROW_BOX{0.727, 0.868, 0.037, 0.086};
+
+
+// detect the white arrow in blue dialog box and transparent battle dialog box
+bool detect_white_arrow(const ImageViewRGB32& screen, PokemonAutomation::ImageFloatBox& found_box){
+    const double screen_rel_size = (screen.height() / 1080.0);
+    const double screen_rel_size_2 = screen_rel_size * screen_rel_size;
+
+    const double min_area_1080p = 150.0;
+    const double rmsd_threshold = 120.0;
+    const size_t min_area = size_t(screen_rel_size_2 * min_area_1080p);
+
+    const std::vector<std::pair<uint32_t, uint32_t>> FILTERS = {
+        {0xffc0c0c0, 0xffffffff},
+        {0xffb0b0b0, 0xffffffff},
+        {0xffa0a0a0, 0xffffffff},
+        {0xff909090, 0xffffffff},
+        {0xff808080, 0xffffffff},
+    };
+
+    bool found = match_template_by_waterfill(
+        screen.size(),
+        extract_box_reference(screen, DIALOG_ARROW_BOX),
+        DialogWhiteArrowMatcher::instance(),
+        FILTERS,
+        {min_area, SIZE_MAX},
+        rmsd_threshold,
+        [&](Kernels::Waterfill::WaterfillObject& object) -> bool {
+            found_box = translate_to_parent(screen, DIALOG_ARROW_BOX, object);
+            return true;
+        }
+    );
+    return found;
+}
+
+bool detect_blue_arrow(const ImageViewRGB32& screen, PokemonAutomation::ImageFloatBox& found_box){
+    double screen_rel_size = (screen.height() / 1080.0);
+    double screen_rel_size_2 = screen_rel_size * screen_rel_size;
+
+    double min_area_1080p = 150.0;
+    double rmsd_threshold = 120.0;
+    size_t min_area = size_t(screen_rel_size_2 * min_area_1080p);
+
+    const std::vector<std::pair<uint32_t, uint32_t>> FILTERS = {
+        {0x005460, 0xff7FC0C9},
+    };
+
+    bool found = match_template_by_waterfill(
+        screen.size(),
+        extract_box_reference(screen, DIALOG_ARROW_BOX),
+        DialogBlueArrowMatcher::instance(),
+        FILTERS,
+        {min_area, SIZE_MAX},
+        rmsd_threshold,
+        [&](Kernels::Waterfill::WaterfillObject& object) -> bool {
+            found_box = translate_to_parent(screen, DIALOG_ARROW_BOX, object);
+            return true;
+        }
+    );
+    return found;
+}
+
+} // end anonymous namespace
+
+
+
+FlatWhiteDialogDetector::FlatWhiteDialogDetector(Color color, VideoOverlay* overlay)
+    : m_color(color)
+    , m_overlay(overlay)
+    , m_bottom(0.265, 0.931, 0.465, 0.020)
+{}
+void FlatWhiteDialogDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_bottom);
+    items.add(m_color, DIALOG_ARROW_BOX);
+}
+bool FlatWhiteDialogDetector::detect(const ImageViewRGB32& screen){
+    if (!is_white(extract_box_reference(screen, m_bottom), 500.0, 20.0)){
+        m_last_detected_box_scope.reset();
+        return false;
+    }
+
+    double screen_rel_size = (screen.height() / 1080.0);
+    double screen_rel_size_2 = screen_rel_size * screen_rel_size;
+
+    double min_area_1080p = 150.0;
+    double rmsd_threshold = 120.0;
+    size_t min_area = size_t(screen_rel_size_2 * min_area_1080p);
+
+    const std::vector<std::pair<uint32_t, uint32_t>> FILTERS = {
+        {combine_rgb(0,0,0), combine_rgb(100, 100, 100)},
+        {combine_rgb(0,0,0), combine_rgb(130, 130, 130)},
+    };
+
+    bool found = match_template_by_waterfill(
+        screen.size(),
+        extract_box_reference(screen, DIALOG_ARROW_BOX),
+        DialogBlackArrowMatcher::instance(),
+        FILTERS,
+        {min_area, SIZE_MAX},
+        rmsd_threshold,
+        [&](Kernels::Waterfill::WaterfillObject& object) -> bool {
+            m_last_detected_box = translate_to_parent(screen, DIALOG_ARROW_BOX, object);
+            return true;
+        }
+    );
+
+    if (m_overlay){
+        if (found){
+            m_last_detected_box_scope.emplace(*m_overlay, m_last_detected_box, COLOR_GREEN);
+        }else{
+            m_last_detected_box_scope.reset();
+        }
+    }
+
+    return found;
+}
+
+
+
+BlueDialogDetector::BlueDialogDetector(Color color, VideoOverlay* overlay)
+    : m_color(color)
+    , m_overlay(overlay)
+    , m_corner(0.765093, 0.933594, 0.006586, 0.013672)
+{}
+void BlueDialogDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_corner);
+    items.add(m_color, DIALOG_ARROW_BOX);
+}
+bool BlueDialogDetector::detect(const ImageViewRGB32& screen){
+    do{
+        //  Check 2 shades of blue.
+        if (is_solid(
+            extract_box_reference(screen, m_corner),
+            {0.0869318, 0.255479, 0.65759},
+            0.25
+        )){
+            break;
+        }
+        if (is_solid(
+            extract_box_reference(screen, m_corner),
+            {0, 0.134207, 0.865793},
+            0.25
+        )){
+            break;
+        }
+
+        m_last_detected_box_scope.reset();
+//        cout << "not solid" << endl;
+        return false;
+    }while (false);
+
+    const bool found = detect_white_arrow(screen, m_last_detected_box);
+
+    if (m_overlay){
+        if (found){
+            m_last_detected_box_scope.emplace(*m_overlay, m_last_detected_box, COLOR_GREEN);
+        }else{
+            m_last_detected_box_scope.reset();
+        }
+    }
+
+    return found;
+}
+
+
+
+ItemReceiveDetector::ItemReceiveDetector(Color color, VideoOverlay* overlay)
+    : m_color(color)
+    , m_overlay(overlay)
+    , m_top(0.309013, 0.719466, 0.418455, 0.015267)
+    , m_arrow_box(0.718648, 0.875728, 0.034896, 0.056311)
+{}
+void ItemReceiveDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_top);
+    items.add(m_color, m_arrow_box);
+}
+bool ItemReceiveDetector::detect(const ImageViewRGB32& screen){
+    ImageStats top = image_stats(extract_box_reference(screen, m_top));
+//    cout << top.average << top.stddev << endl;
+    if (top.average.sum() > 250){
+        return false;
+    }
+
+    do{
+        //  We will probably need to add more color ratios here later.
+        if (is_solid(top, {0.153583, 0.245751, 0.600666}, 0.25, 40)){
+            break;
+        }
+        if (is_solid(top, {0.00228537, 0.070115, 0.9276}, 0.25, 40)){
+            break;
+        }
+
+        m_last_detected_box_scope.reset();
+//        cout << "not solid" << endl;
+        return false;
+    }while (false);
+
+    double screen_rel_size = (screen.height() / 1080.0);
+    double screen_rel_size_2 = screen_rel_size * screen_rel_size;
+
+    double min_area_1080p = 150.0;
+    double rmsd_threshold = 120.0;
+    size_t min_area = size_t(screen_rel_size_2 * min_area_1080p);
+
+    const std::vector<std::pair<uint32_t, uint32_t>> FILTERS = {
+        {0xffc0c0c0, 0xffffffff},
+        {0xffb0b0b0, 0xffffffff},
+        {0xffa0a0a0, 0xffffffff},
+        {0xff909090, 0xffffffff},
+        {0xff808080, 0xffffffff},
+    };
+
+    bool found = match_template_by_waterfill(
+        screen.size(),
+        extract_box_reference(screen, m_arrow_box),
+        DialogWhiteArrowMatcher::instance(),
+        FILTERS,
+        {min_area, SIZE_MAX},
+        rmsd_threshold,
+        [&](Kernels::Waterfill::WaterfillObject& object) -> bool {
+            m_last_detected_box = translate_to_parent(screen, m_arrow_box, object);
+            return true;
+        }
+    );
+
+    if (m_overlay){
+        if (found){
+            m_last_detected_box_scope.emplace(*m_overlay, m_last_detected_box, COLOR_GREEN);
+        }else{
+            m_last_detected_box_scope.reset();
+        }
+    }
+
+    return found;
+}
+
+
+
+TealDialogDetector::TealDialogDetector(Color color, VideoOverlay* overlay)
+    : m_color(color)
+    , m_overlay(overlay)
+{}
+void TealDialogDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, DIALOG_ARROW_BOX);
+}
+bool TealDialogDetector::detect(const ImageViewRGB32& screen){
+    double screen_rel_size = (screen.height() / 1080.0);
+    double screen_rel_size_2 = screen_rel_size * screen_rel_size;
+
+    double min_area_1080p = 150.0;
+    double rmsd_threshold = 120.0;
+    size_t min_area = size_t(screen_rel_size_2 * min_area_1080p);
+
+    const std::vector<std::pair<uint32_t, uint32_t>> FILTERS = {
+        {0xff00c080, 0xff3fffff},
+    };
+
+    bool found = match_template_by_waterfill(
+        screen.size(),
+        extract_box_reference(screen, DIALOG_ARROW_BOX),
+        DialogTealArrowMatcher::instance(),
+        FILTERS,
+        {min_area, SIZE_MAX},
+        rmsd_threshold,
+        [&](Kernels::Waterfill::WaterfillObject& object) -> bool {
+            m_last_detected_box = translate_to_parent(screen, DIALOG_ARROW_BOX, object);
+            return true;
+        }
+    );
+
+    if (m_overlay){
+        if (found){
+            m_last_detected_box_scope.emplace(*m_overlay, m_last_detected_box, COLOR_GREEN);
+        }else{
+            m_last_detected_box_scope.reset();
+        }
+    }
+
+    return found;
+}
+
+
+
+TransparentBattleDialogDetector::TransparentBattleDialogDetector(Color color, VideoOverlay* overlay)
+    : m_color(color)
+    , m_overlay(overlay)
+{}
+void TransparentBattleDialogDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, DIALOG_ARROW_BOX);
+}
+bool TransparentBattleDialogDetector::detect(const ImageViewRGB32& screen){
+    const bool found = detect_white_arrow(screen, m_last_detected_box);
+
+    if (m_overlay){
+        if (found){
+            m_last_detected_box_scope.emplace(*m_overlay, m_last_detected_box, COLOR_GREEN);
+        }else{
+            m_last_detected_box_scope.reset();
+        }
+    }
+
+    return found;
+}
+
+
+LightBlueDialogDetector::LightBlueDialogDetector(Color color, VideoOverlay* overlay)
+    : m_color(color)
+    , m_overlay(overlay)
+    , m_corner(0.765093, 0.933594, 0.006586, 0.013672)
+{}
+void LightBlueDialogDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_corner);
+    items.add(m_color, DIALOG_ARROW_BOX);
+}
+bool LightBlueDialogDetector::detect(const ImageViewRGB32& screen){
+    do{
+        if (is_solid(
+            extract_box_reference(screen, m_corner),
+            {0.108317, 0.462282, 0.429400},
+            0.25
+        )){
+            break;
+        }
+        m_last_detected_box_scope.reset();
+//        cout << "not solid" << endl;
+        return false;
+    }while (false);
+
+    const bool found = detect_blue_arrow(screen, m_last_detected_box);
+
+    if (m_overlay){
+        if (found){
+            m_last_detected_box_scope.emplace(*m_overlay, m_last_detected_box, COLOR_GREEN);
+        }else{
+            m_last_detected_box_scope.reset();
+        }
+    }
+
+    return found;
+}
+
+
+
+
+
+class Test_BlueDialogDetector : public ImageUnitTest{
+public:
+    Test_BlueDialogDetector(
+        const std::string& image,
+        bool expected
+    )
+        : ImageUnitTest("PokemonPLZA::BlueDialogDetector - " + image, {image})
+        , m_expected(expected)
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        DummyVideoOverlay overlay;
+        BlueDialogDetector detector(COLOR_RED, &overlay);
+        const ImageRGB32& image = images[0];
+        return detector.detect(image) == m_expected;
+    };
+
+private:
+    bool m_expected;
+};
+
+
+class Test_FlatWhiteDialogDetector : public ImageUnitTest{
+public:
+    Test_FlatWhiteDialogDetector(
+        const std::string& image,
+        bool expected
+    )
+        : ImageUnitTest("PokemonPLZA::FlatWhiteDialogDetector - " + image, {image})
+        , m_expected(expected)
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        DummyVideoOverlay overlay;
+        FlatWhiteDialogDetector detector(COLOR_RED, &overlay);
+        const ImageRGB32& image = images[0];
+        return detector.detect(image) == m_expected;
+    };
+
+private:
+    bool m_expected;
+};
+
+class Test_TransparentBattleDialogDetector : public ImageUnitTest{
+public:
+    Test_TransparentBattleDialogDetector(
+        const std::string& image,
+        bool expected
+    )
+        : ImageUnitTest("PokemonPLZA::TransparentBattleDialogDetector - " + image, {image})
+        , m_expected(expected)
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        DummyVideoOverlay overlay;
+        TransparentBattleDialogDetector detector(COLOR_RED, &overlay);
+        const ImageRGB32& image = images[0];
+        return detector.detect(image) == m_expected;
+    };
+
+private:
+    bool m_expected;
+};
+
+
+void add_tests_DialogDetector(UnitTestDatabase& database){
+    database.add<Test_BlueDialogDetector>("PokemonLZA/BlueDialogDetector/mac_canFastTravel_False.png", false);
+    database.add<Test_BlueDialogDetector>("PokemonLZA/BlueDialogDetector/mac_cannotFastTravel_True.png", true);
+    database.add<Test_BlueDialogDetector>("PokemonLZA/BlueDialogDetector/mac_receive_tyrunt_True.png", true);
+    database.add<Test_FlatWhiteDialogDetector>("PokemonLZA/FlatWhiteDialogDetector/ansha_donuts_welcome_True.png", true);
+    database.add<Test_FlatWhiteDialogDetector>("PokemonLZA/FlatWhiteDialogDetector/chao_fossil_True.png", true);
+    database.add<Test_FlatWhiteDialogDetector>("PokemonLZA/FlatWhiteDialogDetector/french_fossil_1_True.png", true);
+    database.add<Test_FlatWhiteDialogDetector>("PokemonLZA/FlatWhiteDialogDetector/french_fossil_2_True.png", true);
+    database.add<Test_FlatWhiteDialogDetector>("PokemonLZA/FlatWhiteDialogDetector/french_fossil_3_True.png", true);
+    database.add<Test_FlatWhiteDialogDetector>("PokemonLZA/FlatWhiteDialogDetector/french_fossil_4_True.png", true);
+    database.add<Test_FlatWhiteDialogDetector>("PokemonLZA/FlatWhiteDialogDetector/french_fossil_5_True.png", true);
+    database.add<Test_FlatWhiteDialogDetector>("PokemonLZA/FlatWhiteDialogDetector/french_fossil_6_True.png", true);
+    database.add<Test_FlatWhiteDialogDetector>("PokemonLZA/FlatWhiteDialogDetector/french_jacinthe_2_True.png", true);
+    database.add<Test_FlatWhiteDialogDetector>("PokemonLZA/FlatWhiteDialogDetector/french_jacinthe_3_True.png", true);
+    database.add<Test_FlatWhiteDialogDetector>("PokemonLZA/FlatWhiteDialogDetector/french_jacinthe_True.png", true);
+    database.add<Test_FlatWhiteDialogDetector>("PokemonLZA/FlatWhiteDialogDetector/mac_fossil_True.png", true);
+    database.add<Test_FlatWhiteDialogDetector>("PokemonLZA/FlatWhiteDialogDetector/mac_jacinthe_excited_True.png", true);
+    database.add<Test_FlatWhiteDialogDetector>("PokemonLZA/FlatWhiteDialogDetector/mac_jacinthe_pre_battle_transparent_False.png", false);
+    database.add<Test_FlatWhiteDialogDetector>("PokemonLZA/FlatWhiteDialogDetector/mac_restaurant_True.png", true);
+    database.add<Test_FlatWhiteDialogDetector>("PokemonLZA/FlatWhiteDialogDetector/mac_seven_wonder_leftout_True.png", true);
+    database.add<Test_TransparentBattleDialogDetector>("PokemonLZA/TransparentBattleDialogDetector/french_jacinthe_True.png", true);
+    database.add<Test_TransparentBattleDialogDetector>("PokemonLZA/TransparentBattleDialogDetector/mac_jacinthe_False.png", false);
+    database.add<Test_TransparentBattleDialogDetector>("PokemonLZA/TransparentBattleDialogDetector/mac_jacinthe_overworld_False.png", false);
+    database.add<Test_TransparentBattleDialogDetector>("PokemonLZA/TransparentBattleDialogDetector/mac_jacinthe_True.png", true);
+}
+
+
+
+
+
+}
+}
+}
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_DialogDetector.h b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_DialogDetector.h
new file mode 100644
index 0000000000..b459a15596
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_DialogDetector.h
@@ -0,0 +1,231 @@
+/*  Dialog Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLZA_DialogDetector_H
+#define PokemonAutomation_PokemonLZA_DialogDetector_H
+
+#include <optional>
+//#include <atomic>
+#include "Common/Cpp/Color.h"
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/VisualDetector.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+
+// Common white dialog box
+class FlatWhiteDialogDetector : public StaticScreenDetector{
+public:
+    FlatWhiteDialogDetector(Color color = COLOR_RED, VideoOverlay* overlay = nullptr);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+
+    //  This is not const so that detectors can save/cache state.
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    friend class FlatWhiteDialogWatcher;
+
+    const Color m_color;
+    VideoOverlay* m_overlay;
+    const ImageFloatBox m_bottom;
+
+    ImageFloatBox m_last_detected_box;
+    std::optional<OverlayBoxScope> m_last_detected_box_scope;
+};
+class FlatWhiteDialogWatcher : public DetectorToFinder<FlatWhiteDialogDetector>{
+public:
+    FlatWhiteDialogWatcher(
+        Color color = COLOR_RED,
+        VideoOverlay* overlay = nullptr,
+        std::chrono::milliseconds hold_duration = std::chrono::milliseconds(250)
+    )
+         : DetectorToFinder("FlatWhiteDialogWatcher", hold_duration, color, overlay)
+    {}
+};
+
+
+// Blue dialog box for when receiving an item
+class BlueDialogDetector : public StaticScreenDetector{
+public:
+    BlueDialogDetector(Color color = COLOR_RED, VideoOverlay* overlay = nullptr);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+
+    //  This is not const so that detectors can save/cache state.
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    friend class BlueDialogWatcher;
+
+    const Color m_color;
+    VideoOverlay* m_overlay;
+    const ImageFloatBox m_corner;
+
+    ImageFloatBox m_last_detected_box;
+    std::optional<OverlayBoxScope> m_last_detected_box_scope;
+};
+class BlueDialogWatcher : public DetectorToFinder<BlueDialogDetector>{
+public:
+    BlueDialogWatcher(
+        Color color = COLOR_RED,
+        VideoOverlay* overlay = nullptr,
+        std::chrono::milliseconds hold_duration = std::chrono::milliseconds(250)
+    )
+         : DetectorToFinder("BlueDialogWatcher", hold_duration, color, overlay)
+    {}
+};
+
+
+// A blue dialog box slightly bigger than BlueDialogDetector with item profile picture
+// that appears after BlueDialogDetector to show the item description.
+class ItemReceiveDetector : public StaticScreenDetector{
+public:
+    ItemReceiveDetector(Color color = COLOR_RED, VideoOverlay* overlay = nullptr);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+
+    //  This is not const so that detectors can save/cache state.
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    friend class BlueDialogWatcher;
+
+    const Color m_color;
+    VideoOverlay* m_overlay;
+    const ImageFloatBox m_top;
+    const ImageFloatBox m_arrow_box;
+
+    ImageFloatBox m_last_detected_box;
+    std::optional<OverlayBoxScope> m_last_detected_box_scope;
+};
+class ItemReceiveWatcher : public DetectorToFinder<ItemReceiveDetector>{
+public:
+    ItemReceiveWatcher(
+        Color color = COLOR_RED,
+        VideoOverlay* overlay = nullptr,
+        std::chrono::milliseconds hold_duration = std::chrono::milliseconds(250)
+    )
+         : DetectorToFinder("ItemReceiveWatcher", hold_duration, color, overlay)
+    {}
+};
+
+
+
+class TealDialogDetector : public StaticScreenDetector{
+public:
+    TealDialogDetector(Color color = COLOR_RED, VideoOverlay* overlay = nullptr);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+
+    //  This is not const so that detectors can save/cache state.
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    friend class TealDialogWatcher;
+
+    const Color m_color;
+    VideoOverlay* m_overlay;
+
+    ImageFloatBox m_last_detected_box;
+    std::optional<OverlayBoxScope> m_last_detected_box_scope;
+};
+class TealDialogWatcher : public DetectorToFinder<TealDialogDetector>{
+public:
+    TealDialogWatcher(
+        Color color = COLOR_RED,
+        VideoOverlay* overlay = nullptr,
+        std::chrono::milliseconds hold_duration = std::chrono::milliseconds(250)
+    )
+         : DetectorToFinder("TealDialogWatcher", hold_duration, color, overlay)
+    {}
+};
+
+
+// Transparent dialog box shows when entering a trainer battle 
+class TransparentBattleDialogDetector : public StaticScreenDetector{
+public:
+    TransparentBattleDialogDetector(Color color = COLOR_RED, VideoOverlay* overlay = nullptr);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+
+    //  This is not const so that detectors can save/cache state.
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    friend class TransparentBattleDialogWatcher;
+
+    const Color m_color;
+    VideoOverlay* m_overlay;
+
+    ImageFloatBox m_last_detected_box;
+    std::optional<OverlayBoxScope> m_last_detected_box_scope;
+};
+class TransparentBattleDialogWatcher : public DetectorToFinder<TransparentBattleDialogDetector>{
+public:
+    TransparentBattleDialogWatcher(
+        Color color = COLOR_RED,
+        VideoOverlay* overlay = nullptr,
+        std::chrono::milliseconds hold_duration = std::chrono::milliseconds(250)
+    )
+         : DetectorToFinder("TransparentBattleDialogWatcher", hold_duration, color, overlay)
+    {}
+};
+
+
+// Light blue dialog box for holograms
+class LightBlueDialogDetector : public StaticScreenDetector{
+public:
+    LightBlueDialogDetector(Color color = COLOR_RED, VideoOverlay* overlay = nullptr);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+
+    //  This is not const so that detectors can save/cache state.
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    friend class LightBlueDialogWatcher;
+
+    const Color m_color;
+    VideoOverlay* m_overlay;
+    const ImageFloatBox m_corner;
+
+    ImageFloatBox m_last_detected_box;
+    std::optional<OverlayBoxScope> m_last_detected_box_scope;
+};
+class LightBlueDialogWatcher : public DetectorToFinder<LightBlueDialogDetector>{
+public:
+    LightBlueDialogWatcher(
+        Color color = COLOR_RED,
+        VideoOverlay* overlay = nullptr,
+        std::chrono::milliseconds hold_duration = std::chrono::milliseconds(250)
+    )
+         : DetectorToFinder("BlueDialogWatcher", hold_duration, color, overlay)
+    {}
+};
+
+
+
+
+
+
+
+
+void add_tests_DialogDetector(UnitTestDatabase& database);
+
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_HyperspaceCalorieDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_HyperspaceCalorieDetector.cpp
new file mode 100644
index 0000000000..24a35d269d
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_HyperspaceCalorieDetector.cpp
@@ -0,0 +1,180 @@
+/*  Hyperspace Calorie Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/GlobalAutoPaths.h"
+#include "CommonFramework/ImageTools/ImageStats.h"
+#include "CommonFramework/Language.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonFramework/Tools/GlobalThreadPools.h"
+#include "CommonTools/OCR/OCR_NumberReader.h"
+#include "CommonTools/OCR/OCR_Routines.h"
+#include "Tests/ImageUnitTest.h"
+#include "Tests/TestUtils.h"
+#include "PokemonLZA_HyperspaceCalorieDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+
+HyperspaceCalorieDetector::HyperspaceCalorieDetector(Logger& logger)
+: m_logger(logger)
+, m_calorie_number_box{0.036, 0.118, 0.119, 0.059}
+{}
+
+void HyperspaceCalorieDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(COLOR_WHITE, m_calorie_number_box);
+}
+
+void HyperspaceCalorieDetector::warm_ocr(){
+    // Ensure the number used here matches the actual filter size used in detect()
+    OCR::ensure_ocr_instances(Language::English, 5);
+}
+
+bool HyperspaceCalorieDetector::detect(const ImageViewRGB32& screen){
+    const ImageViewRGB32 calorie_image_crop = extract_box_reference(screen, m_calorie_number_box);
+
+    const bool text_inside_range = true;
+    const bool prioritize_numeric_only_results = true;
+    const size_t width_max = SIZE_MAX;
+    // The calorie crop includes the "," in Calorie numbers like "1,000".
+    // We have to use `min_digit_area` to filter out "," when doing OCR.
+    // The min digit area computation is that any dot with size smaller than calorie_image_crop.height()/5 is filtered out when OCR.
+    const size_t min_digit_area = calorie_image_crop.height()*calorie_image_crop.height() / 25;
+    m_calorie_number = 0;
+    // Ensure the `filters.size()` equals to the value used to warm up OCR object cache in warm_ocr()
+    const std::vector<std::pair<uint32_t, uint32_t>> filters = {
+        {0xff808080, 0xffffffff},
+        {0xffa0a0a0, 0xffffffff},
+        {0xffc0c0c0, 0xffffffff},
+        {0xffe0e0e0, 0xffffffff},
+        {0xfff0f0f0, 0xffffffff},
+    };
+    int number = OCR::read_number_waterfill_multifilter(
+        m_logger,
+        GlobalThreadPools::computation_realtime(),
+        calorie_image_crop, filters,
+        text_inside_range, prioritize_numeric_only_results, width_max, min_digit_area
+    );
+    if (number <= 0 || number > 9999){
+        return false;
+    }
+    m_calorie_number = static_cast<uint16_t>(number);
+    return true;
+}
+
+HyperspaceCalorieWatcher::HyperspaceCalorieWatcher(Logger& logger)
+: HyperspaceCalorieDetector(logger), VisualInferenceCallback("HyperspaceCalorieWatcher")
+{}
+
+void HyperspaceCalorieWatcher::make_overlays(VideoOverlaySet& items) const{
+    HyperspaceCalorieDetector::make_overlays(items);
+}
+
+bool HyperspaceCalorieWatcher::process_frame(const ImageViewRGB32& frame, WallClock timestamp){
+    return detect(frame);
+}
+
+HyperspaceCalorieLimitWatcher::HyperspaceCalorieLimitWatcher(Logger& logger, uint16_t calorie_limit)
+: HyperspaceCalorieDetector(logger), VisualInferenceCallback("HyperspaceCalorieLimitWatcher")
+, m_calorie_limit(calorie_limit)
+{}
+
+void HyperspaceCalorieLimitWatcher::make_overlays(VideoOverlaySet& items) const{
+    HyperspaceCalorieDetector::make_overlays(items);
+}
+
+bool HyperspaceCalorieLimitWatcher::process_frame(const ImageViewRGB32& frame, WallClock timestamp){
+    bool detected = detect(frame);
+    if (!detected){
+        m_start_of_detection = WallClock::min();
+        return false;
+    }
+    const uint16_t calorie = calorie_number();
+    if (calorie > m_calorie_limit){
+        m_start_of_detection = WallClock::min();
+        return false;
+    }
+
+    // Debug possible Calorie number reading failure:
+    if (m_last_calorie_images.size() == 0){
+        m_last_calorie_images.emplace_front(calorie, frame.copy());
+    }else{
+        uint16_t last_calorie = m_last_calorie_images.front().first;
+        if (calorie > last_calorie){
+            // calorie shouldn't go up!
+            for (const auto& p : m_last_calorie_images){
+                p.second.save(DEBUG_PATH() + "/HyperspaceCalorieLimitWatcher/PossibleWrongCalorie_" + std::to_string(p.first) + ".png");
+            }
+        }
+        else if (calorie < last_calorie){
+            m_last_calorie_images.emplace_front(calorie, frame.copy());
+            if (m_last_calorie_images.size() > 3){
+                m_last_calorie_images.pop_back();
+            }
+        }
+    }
+
+    if (m_start_of_detection == WallClock::min()){
+        m_start_of_detection = timestamp;
+    }
+
+    if (timestamp - m_start_of_detection >= Milliseconds(300) && calorie <= m_calorie_limit){
+        return true;
+    }
+
+    return false;
+}
+
+
+class Test_HyperspaceCalorieDetector : public ImageUnitTest{
+public:
+    Test_HyperspaceCalorieDetector(const std::string& image, int expected_calorie)
+        : ImageUnitTest("PokemonPLZA::HyperspaceCalorieDetector - " + image, {image})
+        , m_expected_calorie(expected_calorie)
+    {
+        //  Plus the PaddleOCR (ONNX) recognition session and its working set.
+        m_memory += PADDLE_OCR_SINGLE_LINE_MEMORY_ESTIMATE;
+    }
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        if (m_expected_calorie <= 0 || m_expected_calorie > 9999){
+            return "Error: expected calorie must be in range [1, 9999].";
+        }
+
+        HyperspaceCalorieDetector detector(logger);
+        const ImageRGB32& image = images[0];
+        if (!detector.detect(image)){
+            return "Error: detector failed to detect calorie number in image.";
+        }
+
+        TEST_RESULT_EQUAL_STR((int)detector.calorie_number(), m_expected_calorie);
+        return true;
+    }
+
+private:
+    int m_expected_calorie;
+};
+
+
+void add_tests_HyperspaceCalorieDetector(UnitTestDatabase& database){
+    database.add<Test_HyperspaceCalorieDetector>("PokemonLZA/HyperspaceCalorieDetector/dhruv_1000.jpg", 1000);
+    database.add<Test_HyperspaceCalorieDetector>("PokemonLZA/HyperspaceCalorieDetector/dhruv_874.jpg", 874);
+    database.add<Test_HyperspaceCalorieDetector>("PokemonLZA/HyperspaceCalorieDetector/dhruv_902.jpg", 902);
+    database.add<Test_HyperspaceCalorieDetector>("PokemonLZA/HyperspaceCalorieDetector/dhruv_915.jpg", 915);
+    database.add<Test_HyperspaceCalorieDetector>("PokemonLZA/HyperspaceCalorieDetector/dhruv_923.jpg", 923);
+    database.add<Test_HyperspaceCalorieDetector>("PokemonLZA/HyperspaceCalorieDetector/dhruv_956.jpg", 956);
+    database.add<Test_HyperspaceCalorieDetector>("PokemonLZA/HyperspaceCalorieDetector/dhruv_999.jpg", 999);
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_HyperspaceCalorieDetector.h b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_HyperspaceCalorieDetector.h
new file mode 100644
index 0000000000..794332ea14
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_HyperspaceCalorieDetector.h
@@ -0,0 +1,92 @@
+/*  Hyperspace Calorie Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLZA_HyperspaceCalorieDetector_H
+#define PokemonAutomation_PokemonLZA_HyperspaceCalorieDetector_H
+
+
+#include <list>
+#include <utility>
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/ImageTypes/ImageRGB32.h"
+
+#include "CommonTools/VisualDetector.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+
+namespace PokemonAutomation{
+    class Logger;
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+
+// Detects Calorie number in Hyperspace using number OCR.
+class HyperspaceCalorieDetector : public StaticScreenDetector{
+public:
+    HyperspaceCalorieDetector(Logger& logger);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+
+    //  This is not const so that detectors can save/cache state.
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+    uint16_t calorie_number() const { return m_calorie_number; }
+
+    // How many filters this detector uses to read Calorie numbers in parallel.
+    // Call OCR::ensure_ocr_instances() in SerialPrograms/Source/CommonTools/OCR/OCR_Routines.h
+    // to warm OCR object cache so it won't be slow the first time running the detector.
+    static void warm_ocr();
+
+private:
+    Logger& m_logger;
+    ImageFloatBox m_calorie_number_box;
+
+    uint16_t m_calorie_number = 0;
+};
+
+// A watcher to run until it reads a valid OCR number.
+class HyperspaceCalorieWatcher : public HyperspaceCalorieDetector, public VisualInferenceCallback{
+public:
+    HyperspaceCalorieWatcher(Logger& logger);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+
+    virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override;
+
+private:
+};
+
+
+// A watcher to stop the inference session when a target Calorie limit is OCRed.
+// It has some robustness logic to ensure occasional wrong number OCR won't
+// lead to an early stop of the inference session and also saves potential
+// screenshots of wrong OCR to debug folder.
+class HyperspaceCalorieLimitWatcher : public HyperspaceCalorieDetector, public VisualInferenceCallback{
+public:
+    HyperspaceCalorieLimitWatcher(Logger& logger, uint16_t calorie_limit);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+
+    // Return true in `process_frame()` when the calorie limit is reached.
+    virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override;
+
+private:
+    uint16_t m_calorie_limit;
+    WallClock m_start_of_detection = WallClock::min();
+    
+    std::list<std::pair<uint16_t, ImageRGB32>> m_last_calorie_images;
+};
+
+
+void add_tests_HyperspaceCalorieDetector(UnitTestDatabase& database);
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_HyperspaceRewardNameReader.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_HyperspaceRewardNameReader.cpp
new file mode 100644
index 0000000000..bcf27d1594
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_HyperspaceRewardNameReader.cpp
@@ -0,0 +1,38 @@
+/*  Hyperspace Reward Name Reader
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "PokemonLZA_HyperspaceRewardNameReader.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+HyperspaceRewardNameReader& HyperspaceRewardNameReader::instance(){
+    static HyperspaceRewardNameReader reader;
+    return reader;
+}
+
+
+HyperspaceRewardNameReader::HyperspaceRewardNameReader()
+    : SmallDictionaryMatcher("PokemonLZA/HyperBattle/HyperspaceRewardNameOCR.json")
+{}
+
+OCR::StringMatchResult HyperspaceRewardNameReader::read_substring(
+    Logger& logger,
+    Language language,
+    const ImageViewRGB32& image,
+    const std::vector<OCR::TextColorRange>& text_color_ranges,
+    double min_text_ratio, double max_text_ratio
+) const{
+    return match_substring_from_image_multifiltered(
+        &logger, language, image, text_color_ranges,
+        MAX_LOG10P, MAX_LOG10P_SPREAD, min_text_ratio, max_text_ratio
+    );
+}
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_HyperspaceRewardNameReader.h b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_HyperspaceRewardNameReader.h
new file mode 100644
index 0000000000..53a8041e17
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_HyperspaceRewardNameReader.h
@@ -0,0 +1,38 @@
+/*  Hyperspace Reward Name Reader
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLZA_HyperspaceRewardNameReader_H
+#define PokemonAutomation_PokemonLZA_HyperspaceRewardNameReader_H
+
+#include "CommonTools/OCR/OCR_SmallDictionaryMatcher.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+class HyperspaceRewardNameReader : public OCR::SmallDictionaryMatcher{
+public:
+    static constexpr double MAX_LOG10P = -1.40;
+    static constexpr double MAX_LOG10P_SPREAD = 0.50;
+
+public:
+    HyperspaceRewardNameReader();
+
+    static HyperspaceRewardNameReader& instance();
+
+    OCR::StringMatchResult read_substring(
+        Logger& logger,
+        Language language,
+        const ImageViewRGB32& image,
+        const std::vector<OCR::TextColorRange>& text_color_ranges,
+        double min_text_ratio = 0.01, double max_text_ratio = 0.50
+    ) const;
+
+};
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_MainMenuDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_MainMenuDetector.cpp
new file mode 100644
index 0000000000..d575b562c4
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_MainMenuDetector.cpp
@@ -0,0 +1,66 @@
+/*  Main Menu Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/ImageTools/ImageStats.h"
+#include "CommonFramework/VideoPipeline/VideoOverlay.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "Tests/ImageUnitTest.h"
+#include "Tests/TestUtils.h"
+#include "PokemonLZA_MainMenuDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+
+MainMenuDetector::MainMenuDetector(Color color, VideoOverlay* overlay)
+    : m_right_arrow_button(color, ButtonType::ButtonRight, {0.382, 0.081, 0.029, 0.056}, overlay)
+    , m_b_button(color, ButtonType::ButtonB, {0.87, 0.940, 0.077, 0.044}, overlay)
+{}
+
+void MainMenuDetector::make_overlays(VideoOverlaySet& items) const{
+    m_right_arrow_button.make_overlays(items);
+    m_b_button.make_overlays(items);
+}
+
+bool MainMenuDetector::detect(const ImageViewRGB32& screen){
+    return m_right_arrow_button.detect(screen) && m_b_button.detect(screen);
+}
+
+class Test_MainMenuDetector : public ImageUnitTest{
+public:
+    Test_MainMenuDetector(
+        const std::string& image,
+        bool expected
+    )
+        : ImageUnitTest("PokemonPLZA::MainMenuDetector - " + image, {image})
+        , m_expected(expected)
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        DummyVideoOverlay overlay;
+        MainMenuDetector detector(COLOR_RED, &overlay);
+        const ImageRGB32& image = images[0];
+        return detector.detect(image) == m_expected;
+    };
+
+private:
+    bool m_expected;
+};
+
+
+void add_tests_MainMenuDetector(UnitTestDatabase& database){
+    database.add<Test_MainMenuDetector>("PokemonLZA/MainMenuDetector/french_main_menu_True.png", true);
+    database.add<Test_MainMenuDetector>("PokemonLZA/MainMenuDetector/mac_main_menu_True.png", true);
+}
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_MainMenuDetector.h b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_MainMenuDetector.h
new file mode 100644
index 0000000000..ba08f15cf8
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_MainMenuDetector.h
@@ -0,0 +1,56 @@
+/*  Main Menu Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLZA_MainMenuDetector_H
+#define PokemonAutomation_PokemonLZA_MainMenuDetector_H
+
+//#include <optional>
+#include "Common/Cpp/Color.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/VisualDetector.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+#include "VideoGames/PokemonLZA/Inference/PokemonLZA_ButtonDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+// Detect game main menu, which has menu entry "Boxes", "Satchel", "Pokedex", "Mable's Research",
+// "Z-A Royale", "Link Play" on the left and the current party pokemon status on the right.
+class MainMenuDetector : public StaticScreenDetector{
+public:
+    MainMenuDetector(Color color = COLOR_RED, VideoOverlay* overlay = nullptr);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+
+    //  This is not const so that detectors can save/cache state.
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    ButtonDetector m_right_arrow_button;
+    ButtonDetector m_b_button;
+};
+
+class MainMenuWatcher : public DetectorToFinder<MainMenuDetector>{
+public:
+    MainMenuWatcher(
+        Color color = COLOR_RED,
+        VideoOverlay* overlay = nullptr,
+        std::chrono::milliseconds hold_duration = std::chrono::milliseconds(250)
+    )
+         : DetectorToFinder("MainMenuWatcher", hold_duration, color, overlay)
+    {}
+};
+
+
+void add_tests_MainMenuDetector(UnitTestDatabase& database);
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_OverworldPartySelectionDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_OverworldPartySelectionDetector.cpp
new file mode 100644
index 0000000000..6ce244a67f
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_OverworldPartySelectionDetector.cpp
@@ -0,0 +1,199 @@
+/*  Overworld Party Selection Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <iostream>
+#include "CommonFramework/StaticGlobals.h"
+#include "CommonFramework/Exceptions/FatalProgramException.h"
+#include "CommonFramework/ImageTools/ImageStats.h"
+#include "CommonFramework/VideoPipeline/VideoOverlay.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "Tests/ImageUnitTest.h"
+#include "Tests/TestUtils.h"
+#include "PokemonLZA_OverworldPartySelectionDetector.h"
+
+using std::cout;
+using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+namespace {
+
+std::array<ImageFloatBox, 6> get_boxes(){
+    std::array<ImageFloatBox, 6> boxes;
+    for (size_t i = 0; i < 6; i++){
+        boxes[i] = {0.048 + 0.0398*i, 0.926, 0.017, 0.058};
+    }
+    return boxes;
+}
+
+const std::array<ImageFloatBox, 6>& BOXES(){
+    static const std::array<ImageFloatBox, 6> boxes = get_boxes();
+    return boxes;
+}
+
+}
+
+
+OverworldPartySelectionDetector::OverworldPartySelectionDetector(Color color, VideoOverlay* overlay)
+    : m_dpad_ups{
+        ButtonDetector(color, ButtonType::ButtonDpadUp, BOXES()[0], overlay),
+        ButtonDetector(color, ButtonType::ButtonDpadUp, BOXES()[1], overlay),
+        ButtonDetector(color, ButtonType::ButtonDpadUp, BOXES()[2], overlay),
+        ButtonDetector(color, ButtonType::ButtonDpadUp, BOXES()[3], overlay),
+        ButtonDetector(color, ButtonType::ButtonDpadUp, BOXES()[4], overlay),
+        ButtonDetector(color, ButtonType::ButtonDpadUp, BOXES()[5], overlay)
+    }
+    , m_dpad_downs{
+        ButtonDetector(color, ButtonType::ButtonDpadDown, BOXES()[0], overlay),
+        ButtonDetector(color, ButtonType::ButtonDpadDown, BOXES()[1], overlay),
+        ButtonDetector(color, ButtonType::ButtonDpadDown, BOXES()[2], overlay),
+        ButtonDetector(color, ButtonType::ButtonDpadDown, BOXES()[3], overlay),
+        ButtonDetector(color, ButtonType::ButtonDpadDown, BOXES()[4], overlay),
+        ButtonDetector(color, ButtonType::ButtonDpadDown, BOXES()[5], overlay)
+    }
+    , m_dpad_up_interiors{
+        ButtonDetector(color, ButtonType::ButtonDpadUpInterior, BOXES()[0]),
+        ButtonDetector(color, ButtonType::ButtonDpadUpInterior, BOXES()[1]),
+        ButtonDetector(color, ButtonType::ButtonDpadUpInterior, BOXES()[2]),
+        ButtonDetector(color, ButtonType::ButtonDpadUpInterior, BOXES()[3]),
+        ButtonDetector(color, ButtonType::ButtonDpadUpInterior, BOXES()[4]),
+        ButtonDetector(color, ButtonType::ButtonDpadUpInterior, BOXES()[5])
+    }
+    , m_dpad_down_interiors{
+        ButtonDetector(color, ButtonType::ButtonDpadDownInterior, BOXES()[0]),
+        ButtonDetector(color, ButtonType::ButtonDpadDownInterior, BOXES()[1]),
+        ButtonDetector(color, ButtonType::ButtonDpadDownInterior, BOXES()[2]),
+        ButtonDetector(color, ButtonType::ButtonDpadDownInterior, BOXES()[3]),
+        ButtonDetector(color, ButtonType::ButtonDpadDownInterior, BOXES()[4]),
+        ButtonDetector(color, ButtonType::ButtonDpadDownInterior, BOXES()[5])
+    }
+{}
+
+void OverworldPartySelectionDetector::make_overlays(VideoOverlaySet& items) const{
+    for (size_t i = 0; i < 6; i++){
+        m_dpad_ups[i].make_overlays(items);
+        m_dpad_downs[i].make_overlays(items);
+    }
+}
+
+bool OverworldPartySelectionDetector::detect(const ImageViewRGB32& screen){
+    m_detected_up_idx = INVALID_PARTY_IDX, m_detected_down_idx = INVALID_PARTY_IDX;
+    for (uint8_t i = 0; i < 6; i++){
+        if (i == STATIC_GLOBALS.BOX_SYSTEM_CELL_COL){
+            STATIC_GLOBALS.IMAGE_TEMPLATE_MATCHING = true;
+        }
+        if (m_debug_mode || m_detected_up_idx == INVALID_PARTY_IDX){
+            if (m_dpad_ups[i].detect(screen) || m_dpad_up_interiors[i].detect(screen)){
+                if (m_debug_mode && m_dpad_up_interiors[i].detect(screen)){
+                    cout << "DPAD UP Interior detected at index " << i << endl;
+                }
+                if (m_debug_mode && m_detected_up_idx != INVALID_PARTY_IDX){
+                    cout << "Multiple dpad up buttons detected! First detection " << int(m_detected_up_idx)
+                         << " second detection (" << int(i) << endl;
+                    throw FatalProgramException(ErrorReportMode::NO_ERROR_REPORT,
+                        "Multiple dpad up buttons detected!", nullptr, screen.copy());
+                }
+                m_detected_up_idx = i;
+            }
+        }
+        if (m_debug_mode || m_detected_down_idx == INVALID_PARTY_IDX){
+            if (m_dpad_downs[i].detect(screen) || m_dpad_down_interiors[i].detect(screen)){
+                if (m_debug_mode && m_dpad_down_interiors[i].detect(screen)){
+                    cout << "DPAD DOWN Interior detected at index " << i << endl;
+                }
+                if (m_debug_mode && m_detected_down_idx != INVALID_PARTY_IDX){
+                    cout << "Multiple dpad down buttons detected! First detection " << int(m_detected_down_idx)
+                         << " second detection (" << int(i) << endl;
+                    throw FatalProgramException(ErrorReportMode::NO_ERROR_REPORT,
+                        "Multiple dpad down buttons detected!", nullptr, screen.copy());
+                }
+                m_detected_down_idx = i;
+            }
+        }
+        if (i == STATIC_GLOBALS.BOX_SYSTEM_CELL_COL){
+            STATIC_GLOBALS.IMAGE_TEMPLATE_MATCHING = false;
+        }
+    }
+
+    return m_detected_down_idx != INVALID_PARTY_IDX || m_detected_up_idx != INVALID_PARTY_IDX;
+}
+
+uint8_t OverworldPartySelectionDetector::selected_party_idx() const{
+    return m_detected_up_idx != INVALID_PARTY_IDX ? m_detected_up_idx : m_detected_down_idx;
+}
+
+
+bool OverworldPartySelectionWatcher::process_frame(const VideoSnapshot& frame){
+    const bool detected = process_frame(*frame.frame, frame.timestamp);
+    if (detected){
+        m_last_detected_frame = frame.frame;
+    }
+    return detected;
+}
+
+
+class Test_OverworldPartySelectionDetector : public ImageUnitTest{
+public:
+    Test_OverworldPartySelectionDetector(
+        const std::string& image,
+        int expected_up_idx,
+        int expected_down_idx
+    )
+        : ImageUnitTest("PokemonPLZA::OverworldPartySelectionDetector - " + image, {image})
+        , m_expected_up_idx(expected_up_idx)
+        , m_expected_down_idx(expected_down_idx)
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        if (m_expected_up_idx < 0 || m_expected_up_idx > 6){
+            return "Error: dpad_up_idx must be between 0 and 6.";
+        }
+        if (m_expected_down_idx < 0 || m_expected_down_idx > 6){
+            return "Error: dpad_down_idx must be between 0 and 6.";
+        }
+
+        DummyVideoOverlay overlay;
+        OverworldPartySelectionDetector detector(COLOR_RED, &overlay);
+        detector.set_debug_mode(true);
+        const ImageRGB32& image = images[0];
+        bool detected = detector.detect(image);
+
+        if (m_expected_up_idx == 6 && m_expected_down_idx == 6){
+            return detected == false;
+        }
+
+        if (!detected){
+            return "Error: detector failed to detect party selection screen.";
+        }
+
+        TEST_RESULT_COMPONENT_EQUAL_STR((int)detector.dpad_up_idx(), m_expected_up_idx, "dpad_up_idx");
+        TEST_RESULT_COMPONENT_EQUAL_STR((int)detector.dpad_down_idx(), m_expected_down_idx, "dpad_down_idx");
+        return true;
+    }
+
+private:
+    int m_expected_up_idx;
+    int m_expected_down_idx;
+};
+
+
+void add_tests_OverworldPartySelectionDetector(UnitTestDatabase& database){
+    database.add<Test_OverworldPartySelectionDetector>("PokemonLZA/OverworldPartySelectionDetector/mac_zone_10_0_5.png", 0, 5);
+    database.add<Test_OverworldPartySelectionDetector>("PokemonLZA/OverworldPartySelectionDetector/mac_zone_10_1_3.png", 1, 3);
+    database.add<Test_OverworldPartySelectionDetector>("PokemonLZA/OverworldPartySelectionDetector/mac_zone_10_2_6.png", 2, 6);
+    database.add<Test_OverworldPartySelectionDetector>("PokemonLZA/OverworldPartySelectionDetector/mac_zone_10_6_2.png", 6, 2);
+    database.add<Test_OverworldPartySelectionDetector>("PokemonLZA/OverworldPartySelectionDetector/mac_zone_10_6_5.png", 6, 5);
+}
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_OverworldPartySelectionDetector.h b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_OverworldPartySelectionDetector.h
new file mode 100644
index 0000000000..2515968c7e
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_OverworldPartySelectionDetector.h
@@ -0,0 +1,132 @@
+/*  Overworld Party Selection Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLZA_OverworldPartySelectionDetector_H
+#define PokemonAutomation_PokemonLZA_OverworldPartySelectionDetector_H
+
+#include <array>
+#include <memory>
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "Common/Cpp/Color.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/ImageTypes/ImageRGB32.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/VisualDetector.h"
+
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+#include "VideoGames/PokemonLZA/Inference/PokemonLZA_ButtonDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+// Detect the dpad up and down button shown on the party list when in the overworld.
+// This can determine whether we are at the overworld, which pokemon we will send
+// into next battle first, and whether the current selected pokemon is out of pokeball.
+// we have three modes when party is visible in the overworld:
+// - Visible dpad up. No dpad down: No pokemon sent out. All party pokemon in balls.
+// - No dpad up. Visible dpad down: Current selected pokemon is sent out.
+// - Visible dpad up and dpad down: Pokemon pointed by dpad down is sent out while current selected pokemon,
+//   (selected by dpad up) can be sent out next.
+class OverworldPartySelectionDetector : public StaticScreenDetector{
+public:
+    OverworldPartySelectionDetector(Color color = COLOR_RED, VideoOverlay* overlay = nullptr);
+
+    const uint8_t INVALID_PARTY_IDX = 6;
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+
+    //  This is not const so that detectors can save/cache state.
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+    virtual void reset_state() override {
+        m_detected_up_idx = INVALID_PARTY_IDX;
+        m_detected_down_idx = INVALID_PARTY_IDX;
+    }
+
+    // Return detected the pokemon idx in the party where the current selected pokemon is.
+    // Return INVALID_PARTY_IDX if no overworld party selection screen detected.
+    uint8_t selected_party_idx() const;
+    // Return detected dpad up button idx in the party.
+    // Return INVALID_PARTY_IDX if no overworld party selection screen detected.
+    uint8_t dpad_up_idx() const { return m_detected_up_idx; }
+    // Return detected dpad down button idx in the party.
+    // Return INVALID_PARTY_IDX if no overworld party selection screen detected.
+    uint8_t dpad_down_idx() const { return m_detected_down_idx; }
+
+
+    // Under debug mode, will throw FatalProgramException when more than one box cell
+    // detects a cursor. This is used for debugging.
+    void set_debug_mode(bool debug_mode){ m_debug_mode = debug_mode; }
+
+private:
+    // 6 regions, one for each party pokemon, to detect dpad buttons
+    std::array<ButtonDetector, 6> m_dpad_ups;
+    std::array<ButtonDetector, 6> m_dpad_downs;
+
+    // 6 regions, one for each party pokemon, to detect the black triangles inside dpad buttons
+    std::array<ButtonDetector, 6> m_dpad_up_interiors;
+    std::array<ButtonDetector, 6> m_dpad_down_interiors;
+
+    uint8_t m_detected_up_idx = INVALID_PARTY_IDX;
+    uint8_t m_detected_down_idx = INVALID_PARTY_IDX;
+
+    bool m_debug_mode = false;
+};
+
+class OverworldPartySelectionWatcher : public DetectorToFinder<OverworldPartySelectionDetector>{
+public:
+    OverworldPartySelectionWatcher(
+        Color color = COLOR_WHITE,
+        VideoOverlay* overlay = nullptr,
+        std::chrono::milliseconds hold_duration = std::chrono::milliseconds(150)
+    )
+         : DetectorToFinder("OverworldPartySelectionWatcher", hold_duration, color, overlay)
+    {}
+
+    using DetectorToFinder<OverworldPartySelectionDetector>::process_frame;
+
+    // Override this function so that we can record the last frame where the detection is
+    // positive.
+    // This is useful for doing additional visual detection on the overworld screen.
+    virtual bool process_frame(const VideoSnapshot& frame) override;
+
+    // Return the last frame where the detection is positive.
+    // This is useful for doing additional visual detection on the overworld screen.
+    const std::shared_ptr<const ImageRGB32>& last_detected_frame() const { return m_last_detected_frame; }
+
+    virtual void reset_state() override {
+        DetectorToFinder<OverworldPartySelectionDetector>::reset_state();
+        m_last_detected_frame = nullptr;
+    }
+
+private:
+    // Record the last frame where the detection is positive.
+    // This is useful for doing additional visual detection on the overworld screen.
+    std::shared_ptr<const ImageRGB32> m_last_detected_frame;
+};
+
+class OverworldPartySelectionOverWatcher : public DetectorToFinder<OverworldPartySelectionDetector>{
+public:
+    OverworldPartySelectionOverWatcher(
+        Color color = COLOR_WHITE,
+        VideoOverlay* overlay = nullptr,
+        std::chrono::milliseconds hold_duration = std::chrono::milliseconds(150)
+    )
+         : DetectorToFinder("OverworldPartySelectionOverWatcher", FinderType::GONE, hold_duration, color, overlay)
+    {}
+};
+
+
+void add_tests_OverworldPartySelectionDetector(UnitTestDatabase& database);
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_SelectionArrowDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_SelectionArrowDetector.cpp
new file mode 100644
index 0000000000..5c350b4897
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_SelectionArrowDetector.cpp
@@ -0,0 +1,161 @@
+/*  Selection Arrow Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Exceptions.h"
+#include "Kernels/Waterfill/Kernels_Waterfill_Types.h"
+#include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h"
+#include "CommonTools/Images/WaterfillUtilities.h"
+#include "Tests/ImageUnitTest.h"
+#include "Tests/TestUtils.h"
+#include "PokemonLZA_SelectionArrowDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+
+
+class SelectionArrowMatcher : public ImageMatch::WaterfillTemplateMatcher{
+public:
+    // The white background for the template file is of color range [r=240, g=255, b=230] to [255, 255, 255]
+    // the black arrow color is about [r=36,g=38,b=51]
+    SelectionArrowMatcher(const char* path)
+        : WaterfillTemplateMatcher(
+            path,
+            Color(0xff80c000), Color(0xffffff7f), 100
+        )
+    {
+        m_aspect_ratio_lower = 0.9;
+        m_aspect_ratio_upper = 1.1;
+        m_area_ratio_lower = 0.85;
+        m_area_ratio_upper = 1.1;
+    }
+
+    static const SelectionArrowMatcher& matcher(SelectionArrowType type){
+        switch (type){
+        case SelectionArrowType::RIGHT:
+            return RIGHT_ARROW();
+        case SelectionArrowType::DOWN:
+            return DOWN_ARROW();
+        default:
+            throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Invalid enum.");
+        }
+    }
+    static const SelectionArrowMatcher& RIGHT_ARROW(){
+        static SelectionArrowMatcher matcher("PokemonLZA/SelectionArrowRight.png");
+        return matcher;
+    }
+    static const SelectionArrowMatcher& DOWN_ARROW(){
+        static SelectionArrowMatcher matcher("PokemonLZA/SelectionArrowDown.png");
+        return matcher;
+    }
+};
+
+
+
+SelectionArrowDetector::SelectionArrowDetector(
+    Color color,
+    VideoOverlay* overlay,
+    SelectionArrowType type,
+    const ImageFloatBox& box
+)
+    : m_color(color)
+    , m_overlay(overlay)
+    , m_type(type)
+    , m_arrow_box(box)
+{}
+void SelectionArrowDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_arrow_box);
+}
+bool SelectionArrowDetector::detect(const ImageViewRGB32& screen){
+    double screen_rel_size = (screen.height() / 1080.0);
+    double screen_rel_size_2 = screen_rel_size * screen_rel_size;
+
+    double min_area_1080p = 700;
+    double rmsd_threshold = 80;
+    size_t min_area = size_t(screen_rel_size_2 * min_area_1080p);
+
+    const std::vector<std::pair<uint32_t, uint32_t>> FILTERS = {
+        {0xff808000, 0xffffff7f},
+        {0xff808000, 0xffdfff7f},
+        {0xff80a000, 0xffffff7f},
+        {0xff80a000, 0xffdfff7f},
+        {0xff80c000, 0xffffff7f},
+        {0xff80c000, 0xffdfff7f},
+    };
+
+    bool found = match_template_by_waterfill(
+        screen.size(),
+        extract_box_reference(screen, m_arrow_box),
+        SelectionArrowMatcher::matcher(m_type),
+        FILTERS,
+        {min_area, SIZE_MAX},
+        rmsd_threshold,
+        [&](Kernels::Waterfill::WaterfillObject& object) -> bool {
+            m_last_detected = translate_to_parent(screen, m_arrow_box, object);
+            return true;
+        }
+    );
+
+    if (m_overlay){
+        if (found){
+            m_last_detected_box.emplace(*m_overlay, m_last_detected, COLOR_GREEN);
+        }else{
+            m_last_detected_box.reset();
+        }
+    }
+
+    return found;
+}
+
+
+
+
+
+class Test_SelectionArrowDetector : public ImageUnitTest{
+public:
+    Test_SelectionArrowDetector(
+        const std::string& image,
+        SelectionArrowType expected_arrow,
+        bool expected
+    )
+        : ImageUnitTest("PokemonPLZA::SelectionArrowDetector - " + image, {image})
+        , m_expected_arrow(expected_arrow)
+        , m_expected(expected)
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        DummyVideoOverlay overlay;
+        SelectionArrowDetector detector(COLOR_RED, &overlay, m_expected_arrow, ImageFloatBox(0, 0, 1, 1));
+        const ImageRGB32& image = images[0];
+        return detector.detect(image) == m_expected;
+    };
+
+private:
+    SelectionArrowType m_expected_arrow;
+    bool m_expected;
+};
+
+
+void add_tests_SelectionArrowDetector(UnitTestDatabase& database){
+    database.add<Test_SelectionArrowDetector>("PokemonLZA/SelectionArrowDetector/french_1_Fossil_True.png", SelectionArrowType::RIGHT, true);
+    database.add<Test_SelectionArrowDetector>("PokemonLZA/SelectionArrowDetector/french_2_Fossil_True.png", SelectionArrowType::RIGHT, true);
+    database.add<Test_SelectionArrowDetector>("PokemonLZA/SelectionArrowDetector/french_3_Fossil_True.png", SelectionArrowType::RIGHT, true);
+    database.add<Test_SelectionArrowDetector>("PokemonLZA/SelectionArrowDetector/french_4_Fossil_True.png", SelectionArrowType::RIGHT, true);
+    database.add<Test_SelectionArrowDetector>("PokemonLZA/SelectionArrowDetector/french_5_Fossil_True.png", SelectionArrowType::RIGHT, true);
+    database.add<Test_SelectionArrowDetector>("PokemonLZA/SelectionArrowDetector/french_6_Fossil_True.png", SelectionArrowType::RIGHT, true);
+    database.add<Test_SelectionArrowDetector>("PokemonLZA/SelectionArrowDetector/french_7_Fossil_True.png", SelectionArrowType::RIGHT, true);
+    database.add<Test_SelectionArrowDetector>("PokemonLZA/SelectionArrowDetector/french_8_Fossil_True.png", SelectionArrowType::RIGHT, true);
+    database.add<Test_SelectionArrowDetector>("PokemonLZA/SelectionArrowDetector/french_9_Fossil_True.png", SelectionArrowType::RIGHT, true);
+}
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_SelectionArrowDetector.h b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_SelectionArrowDetector.h
new file mode 100644
index 0000000000..c9a56102e1
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_SelectionArrowDetector.h
@@ -0,0 +1,76 @@
+/*  Selection Arrow Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLZA_SelectionArrowDetector_H
+#define PokemonAutomation_PokemonLZA_SelectionArrowDetector_H
+
+#include <optional>
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/VisualDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+
+enum class SelectionArrowType{
+    RIGHT,
+    DOWN,
+};
+
+
+
+class SelectionArrowDetector : public StaticScreenDetector{
+public:
+    SelectionArrowDetector(
+        Color color,
+        VideoOverlay* overlay,
+        SelectionArrowType type,
+        const ImageFloatBox& box
+    );
+
+    const ImageFloatBox& last_detected() const { return m_last_detected; }
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+
+    //  This is not const so that detectors can save/cache state.
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    friend class SelectionArrowWatcher;
+
+    const Color m_color;
+    VideoOverlay* m_overlay;
+    const SelectionArrowType m_type;
+    const ImageFloatBox m_arrow_box;
+
+    ImageFloatBox m_last_detected;
+    std::optional<OverlayBoxScope> m_last_detected_box;
+};
+class SelectionArrowWatcher : public DetectorToFinder<SelectionArrowDetector>{
+public:
+    SelectionArrowWatcher(
+        Color color,
+        VideoOverlay* overlay,
+        SelectionArrowType type,
+        const ImageFloatBox& box,
+        std::chrono::milliseconds hold_duration = std::chrono::milliseconds(250)
+    )
+         : DetectorToFinder("SelectionArrowWatcher", hold_duration, color, overlay, type, box)
+    {}
+};
+
+
+
+void add_tests_SelectionArrowDetector(UnitTestDatabase& database);
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_WeatherDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_WeatherDetector.cpp
new file mode 100644
index 0000000000..964bf73abc
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_WeatherDetector.cpp
@@ -0,0 +1,499 @@
+/*  Weather Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <array>
+#include <algorithm>
+#include <cctype>
+#include <limits>
+#include <sstream>
+#include <stdexcept>
+#include <string>
+#include <utility>
+#include <vector>
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "CommonFramework/GlobalAutoPaths.h"
+#include "CommonFramework/ImageTools/ImageDiff.h"
+#include "CommonFramework/VideoPipeline/VideoOverlay.h"
+#include "CommonTools/Images/WaterfillUtilities.h"
+#include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h"
+#include "Tests/ImageUnitTest.h"
+#include "Tests/TestUtils.h"
+#include "PokemonLZA_WeatherDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+namespace{
+
+struct SupplementalTemplateCheck{
+    const char* path;
+    ImageFloatBox box;
+    Color color;
+    double rmsd_threshold;
+};
+
+const std::vector<SupplementalTemplateCheck>& supplemental_template_checks(WeatherIconType type){
+    static const std::vector<SupplementalTemplateCheck> NONE = {};
+
+    static const std::vector<SupplementalTemplateCheck> RAIN = {
+        {"PokemonLZA/Weather/rain_cloud.png", ImageFloatBox(0.8865, 0.0265, 0.0210, 0.0270), COLOR_GREEN, 90.0},
+        {"PokemonLZA/Weather/rain_drop.png",  ImageFloatBox(0.8885, 0.0525, 0.0050, 0.0150), COLOR_BLUE,  90.0},
+    };
+    static const std::vector<SupplementalTemplateCheck> CLOUDY = {
+        {"PokemonLZA/Weather/cloudy_cloud.png", ImageFloatBox(0.8895, 0.0430, 0.0210, 0.0265), COLOR_GREEN, 100.0},
+        {"PokemonLZA/Weather/cloudy_drop.png",  ImageFloatBox(0.8915, 0.0255, 0.0050, 0.0100), COLOR_BLUE,  100.0},
+    };
+    static const std::vector<SupplementalTemplateCheck> RAINBOW = {
+        {"PokemonLZA/Weather/rainbow_cloud.png", ImageFloatBox(0.8840, 0.0465, 0.0140, 0.0165), COLOR_GREEN, 90.0},
+        {"PokemonLZA/Weather/rainbow_arch.png",  ImageFloatBox(0.8930, 0.0420, 0.0120, 0.0100), COLOR_BLUE,  90.0},
+    };
+    static const std::vector<SupplementalTemplateCheck> CLEAR = {
+        {"PokemonLZA/Weather/clear_full.png", ImageFloatBox(0.880000, 0.010000, 0.035800, 0.068000), COLOR_GREEN, 115.0},
+        {"PokemonLZA/Weather/clear_core.png", ImageFloatBox(0.89115, 0.03611, 0.01094, 0.02130), COLOR_BLUE, 90.0},
+    };
+    static const std::vector<SupplementalTemplateCheck> SUNNY = {
+        {"PokemonLZA/Weather/sunny_full.png", ImageFloatBox(0.880000, 0.010000, 0.035800, 0.068000), COLOR_GREEN, 120.0},
+        {"PokemonLZA/Weather/sunny_core.png", ImageFloatBox(0.89115, 0.03611, 0.01094, 0.02130), COLOR_BLUE, 90.0},
+    };
+    static const std::vector<SupplementalTemplateCheck> FOGGY = {
+        {"PokemonLZA/Weather/foggy_tray_1.png", ImageFloatBox(0.8893, 0.0487, 0.0218, 0.0080), COLOR_GREEN, 90.0},
+        {"PokemonLZA/Weather/foggy_tray_2.png", ImageFloatBox(0.8880, 0.0555, 0.0225, 0.0080), COLOR_BLUE,  90.0},
+    };
+
+    switch (type){
+    case WeatherIconType::Clear:
+        return CLEAR;
+    case WeatherIconType::Sunny:
+        return SUNNY;
+    case WeatherIconType::Rain:
+        return RAIN;
+    case WeatherIconType::Cloudy:
+        return CLOUDY;
+    case WeatherIconType::Rainbow:
+        return RAINBOW;
+    case WeatherIconType::Foggy:
+        return FOGGY;
+    default:
+        return NONE;
+    }
+}
+
+const char* weather_full_template_path(WeatherIconType type){
+    switch (type){
+    case WeatherIconType::Clear:   return "PokemonLZA/Weather/clear_full.png";
+    case WeatherIconType::Sunny:   return "PokemonLZA/Weather/sunny_full.png";
+    case WeatherIconType::Rain:    return "PokemonLZA/Weather/rain_full.png";
+    case WeatherIconType::Cloudy:  return "PokemonLZA/Weather/cloudy_full.png";
+    case WeatherIconType::Foggy:   return "PokemonLZA/Weather/foggy_full.png";
+    case WeatherIconType::Rainbow: return "PokemonLZA/Weather/rainbow_full.png";
+    default:                       return nullptr;
+    }
+}
+
+const ImageRGB32& weather_full_template_image(WeatherIconType type){
+    static const ImageRGB32 CLEAR(RESOURCE_PATH() + std::string(weather_full_template_path(WeatherIconType::Clear)));
+    static const ImageRGB32 SUNNY(RESOURCE_PATH() + std::string(weather_full_template_path(WeatherIconType::Sunny)));
+    static const ImageRGB32 RAIN(RESOURCE_PATH() + std::string(weather_full_template_path(WeatherIconType::Rain)));
+    static const ImageRGB32 CLOUDY(RESOURCE_PATH() + std::string(weather_full_template_path(WeatherIconType::Cloudy)));
+    static const ImageRGB32 FOGGY(RESOURCE_PATH() + std::string(weather_full_template_path(WeatherIconType::Foggy)));
+    static const ImageRGB32 RAINBOW(RESOURCE_PATH() + std::string(weather_full_template_path(WeatherIconType::Rainbow)));
+
+    switch (type){
+    case WeatherIconType::Clear:   return CLEAR;
+    case WeatherIconType::Sunny:   return SUNNY;
+    case WeatherIconType::Rain:    return RAIN;
+    case WeatherIconType::Cloudy:  return CLOUDY;
+    case WeatherIconType::Foggy:   return FOGGY;
+    case WeatherIconType::Rainbow: return RAINBOW;
+    default:                       return CLEAR;
+    }
+}
+
+double full_template_rmsd(const ImageViewRGB32& image, WeatherIconType type){
+    const ImageRGB32& templ = weather_full_template_image(type);
+    if (templ.width() == 0 || templ.height() == 0 || image.width() == 0 || image.height() == 0){
+        return std::numeric_limits<double>::infinity();
+    }
+    return image.width() == templ.width() && image.height() == templ.height()
+        ? ImageMatch::pixel_RMSD(image, templ)
+        : ImageMatch::pixel_RMSD(image, templ.scale_to(image.width(), image.height()));
+}
+}
+
+const std::array<WeatherIconType, 6>& weather_test_types(){
+    static const std::array<WeatherIconType, 6> TYPES = {
+        WeatherIconType::Clear,
+        WeatherIconType::Sunny,
+        WeatherIconType::Rain,
+        WeatherIconType::Cloudy,
+        WeatherIconType::Foggy,
+        WeatherIconType::Rainbow,
+    };
+    return TYPES;
+}
+
+std::string weather_name(WeatherIconType type){
+    switch (type){
+    case WeatherIconType::Clear:   return "Clear";
+    case WeatherIconType::Sunny:   return "Sunny";
+    case WeatherIconType::Rain:    return "Rain";
+    case WeatherIconType::Cloudy:  return "Cloudy";
+    case WeatherIconType::Foggy:   return "Foggy";
+    case WeatherIconType::Rainbow: return "Rainbow";
+    default:                       return "Unknown";
+    }
+}
+
+std::string weather_detection_status_string(const std::vector<std::pair<WeatherIconType, bool>>& statuses){
+    std::ostringstream ss;
+    ss << "Detection map: ";
+    for (size_t c = 0; c < statuses.size(); c++){
+        if (c > 0){
+            ss << ", ";
+        }
+        ss << weather_name(statuses[c].first) << "=" << (statuses[c].second ? "true" : "false");
+    }
+    return ss.str();
+}
+
+WeatherIconType weather_from_filename(const std::string& image){
+    std::string lower = image;
+    std::transform(lower.begin(), lower.end(), lower.begin(), [](unsigned char c){ return (char)std::tolower(c); });
+
+    if (lower.find("rainbow") != std::string::npos){
+        return WeatherIconType::Rainbow;
+    }
+    if (lower.find("sunny") != std::string::npos){
+        return WeatherIconType::Sunny;
+    }
+    if (lower.find("cloud") != std::string::npos){
+        return WeatherIconType::Cloudy;
+    }
+    if (lower.find("clear") != std::string::npos){
+        return WeatherIconType::Clear;
+    }
+    if (lower.find("fog") != std::string::npos){
+        return WeatherIconType::Foggy;
+    }
+    if (lower.find("rain") != std::string::npos){
+        return WeatherIconType::Rain;
+    }
+    return WeatherIconType::Unknown;
+}
+
+bool expected_result_from_filename(const std::string& image){
+    std::string lower = image;
+    std::transform(lower.begin(), lower.end(), lower.begin(), [](unsigned char c){ return (char)std::tolower(c); });
+
+    if (lower.find("_false") != std::string::npos){
+        return false;
+    }
+    return true;
+}
+
+std::string weather_list_string(const std::vector<WeatherIconType>& weathers){
+    std::ostringstream ss;
+    for (size_t c = 0; c < weathers.size(); c++){
+        if (c > 0){
+            ss << ", ";
+        }
+        ss << weather_name(weathers[c]);
+    }
+    return ss.str();
+}
+
+class WeatherFullMatcher : public ImageMatch::WaterfillTemplateMatcher{
+public:
+    WeatherFullMatcher(const char* path, double max_rmsd, bool use_blue_filter = false)
+        : WaterfillTemplateMatcher(path, use_blue_filter ? Color(0xff143769) : Color(0xff707070), use_blue_filter ? Color(0xff6991be) : Color(0xffffffff), 50)
+        , m_max_rmsd(max_rmsd)
+    {
+        m_aspect_ratio_lower = 0.60;
+        m_aspect_ratio_upper = 1.40;
+        m_area_ratio_lower = 0.55;
+        m_area_ratio_upper = 1.45;
+    }
+
+    static const WeatherFullMatcher& clear(){
+        static const WeatherFullMatcher matcher("PokemonLZA/Weather/clear_full.png", 115.0, true);
+        return matcher;
+    }
+    static const WeatherFullMatcher& sunny(){
+        static const WeatherFullMatcher matcher("PokemonLZA/Weather/sunny_full.png", 120.0, true);
+        return matcher;
+    }
+    static const WeatherFullMatcher& rain(){
+        static const WeatherFullMatcher matcher("PokemonLZA/Weather/rain_full.png", 100.0);
+        return matcher;
+    }
+    static const WeatherFullMatcher& cloudy(){
+        static const WeatherFullMatcher matcher("PokemonLZA/Weather/cloudy_full.png", 110.0);
+        return matcher;
+    }
+    static const WeatherFullMatcher& foggy(){
+        static const WeatherFullMatcher matcher("PokemonLZA/Weather/foggy_full.png", 100.0);
+        return matcher;
+    }
+    static const WeatherFullMatcher& rainbow(){
+        static const WeatherFullMatcher matcher("PokemonLZA/Weather/rainbow_full.png", 100.0);
+        return matcher;
+    }
+
+    double m_max_rmsd;
+};
+
+const WeatherFullMatcher& weather_full_matcher(WeatherIconType type){
+    switch (type){
+    case WeatherIconType::Clear:
+        return WeatherFullMatcher::clear();
+    case WeatherIconType::Sunny:
+        return WeatherFullMatcher::sunny();
+    case WeatherIconType::Rain:
+        return WeatherFullMatcher::rain();
+    case WeatherIconType::Cloudy:
+        return WeatherFullMatcher::cloudy();
+    case WeatherIconType::Foggy:
+        return WeatherFullMatcher::foggy();
+    case WeatherIconType::Rainbow:
+        return WeatherFullMatcher::rainbow();
+    default:
+        throw std::runtime_error("No weather full matcher for requested WeatherIconType");
+    }
+}
+
+
+
+WeatherIconDetector::WeatherIconDetector(WeatherIconType type, VideoOverlay* overlay)
+    : m_box(0.880000, 0.010000, 0.035800, 0.068000)
+{
+    m_type = type;
+    if (overlay){
+        m_overlay1.emplace(*overlay, m_box, COLOR_RED);
+    }
+}
+
+void WeatherIconDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(COLOR_RED, m_box);
+    for (const auto& check : supplemental_template_checks(m_type)){
+        items.add(check.color, check.box);
+    }
+}
+
+bool WeatherIconDetector::detect(const ImageViewRGB32& screen){
+    const WeatherFullMatcher& matcher = weather_full_matcher(m_type);
+
+    const double scale = screen.height() / 1080.0;
+    const size_t min_area = (size_t)(scale * scale * 120.0);
+
+    static const std::vector<std::pair<uint32_t, uint32_t>> LIGHT_FILTERS = {
+        {0xff707070, 0xffffffff},
+    };
+    static const std::vector<std::pair<uint32_t, uint32_t>> BLUE_FILTERS = {
+        {0xff143769, 0xff6991be},
+    };
+    const auto& filters =
+        m_type == WeatherIconType::Clear || m_type == WeatherIconType::Sunny
+        ? BLUE_FILTERS : LIGHT_FILTERS;
+
+    ImageViewRGB32 cropped = extract_box_reference(screen, m_box);
+    const bool full_match = match_template_by_waterfill(
+        screen.size(),
+        cropped,
+        matcher,
+        filters,
+        {min_area, SIZE_MAX},
+        matcher.m_max_rmsd,
+        [](Kernels::Waterfill::WaterfillObject& object) -> bool {
+            (void)object;
+            return true;
+        }
+    );
+
+    if (!full_match){
+        return false;
+    }
+
+    for (const auto& check : supplemental_template_checks(m_type)){
+        ImageViewRGB32 candidate = extract_box_reference(screen, check.box);
+        ImageRGB32 templ(RESOURCE_PATH() + check.path);
+        if (templ.width() == 0 || templ.height() == 0){
+            return false;
+        }
+
+        auto compute_rmsd = [&](const ImageViewRGB32& image) -> double{
+            return image.width() == templ.width() && image.height() == templ.height()
+                ? ImageMatch::pixel_RMSD(image, templ)
+                : ImageMatch::pixel_RMSD(image, templ.scale_to(image.width(), image.height()));
+        };
+        double rmsd = compute_rmsd(candidate);
+        const int search_radius =
+            m_type == WeatherIconType::Rain ||
+            std::min(candidate.width(), candidate.height()) <= 12
+            ? 2 : 1;
+
+        for (int dy = -search_radius; dy <= search_radius; dy++){
+            for (int dx = -search_radius; dx <= search_radius; dx++){
+                if (dx == 0 && dy == 0){
+                    continue;
+                }
+
+                ImageViewRGB32 shifted = extract_box_reference(screen, check.box, dx, dy);
+                if (shifted.width() != candidate.width() ||
+                    shifted.height() != candidate.height()){
+                    continue;
+                }
+
+                rmsd = std::min(rmsd, compute_rmsd(shifted));
+            }
+        }
+        if (rmsd >= check.rmsd_threshold){
+            return false;
+        }
+    }
+
+    return true;
+}
+
+
+
+class Test_WeatherIconDetector : public ImageUnitTest{
+public:
+    Test_WeatherIconDetector(
+        const std::string& image,
+        WeatherIconType expected_weather,
+        bool expected_result
+    )
+        : ImageUnitTest("PokemonPLZA::WeatherIconDetector - " + image + " [" + weather_name(expected_weather) + "]", {image})
+        , m_expected_weather(expected_weather)
+        , m_expected_result(expected_result)
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        (void)scope;
+
+        DummyVideoOverlay overlay;
+        const ImageRGB32& image = images[0];
+        if (image.width() == 0 || image.height() == 0){
+            return "Failed to load test image: " + image_paths()[0];
+        }
+
+        std::vector<WeatherIconType> detected_weathers;
+        std::vector<std::pair<WeatherIconType, bool>> statuses;
+        for (WeatherIconType type : weather_test_types()){
+            WeatherIconDetector detector(type, &overlay);
+            const bool matched = detector.detect(image);
+            statuses.emplace_back(type, matched);
+            if (matched){
+                detected_weathers.push_back(type);
+            }
+        }
+        const std::string status_string = weather_detection_status_string(statuses);
+        logger.log(status_string, COLOR_BLUE);
+
+        if (!m_expected_result){
+            bool expected_found = false;
+            for (WeatherIconType weather : detected_weathers){
+                if (weather == m_expected_weather){
+                    expected_found = true;
+                    break;
+                }
+            }
+            TEST_RESULT_COMPONENT_EQUAL_STR(expected_found, false, "expected weather present");
+            if (expected_found){
+                return "Expected weather should be absent, but " + weather_name(m_expected_weather) + " was detected. " + status_string;
+            }
+            return !expected_found;
+        }
+
+        TEST_RESULT_COMPONENT_EQUAL_STR(detected_weathers.size(), (size_t)1, "num detected weather types");
+
+        if (detected_weathers.empty()){
+            if (m_expected_weather != WeatherIconType::Unknown){
+                return "Expected " + weather_name(m_expected_weather) + ", but detected no weather. " + status_string;
+            }
+            return "Detected no weather. " + status_string;
+        }
+
+        if (detected_weathers.size() > 1){
+            return "Detected multiple weather types: " + weather_list_string(detected_weathers) + ". " + status_string;
+        }
+
+        const WeatherIconType detected = detected_weathers[0];
+
+        if (m_expected_weather != WeatherIconType::Unknown){
+            if (detected != m_expected_weather){
+                return "Expected " + weather_name(m_expected_weather) + ", but detected " + weather_name(detected) + ". " + status_string;
+            }
+            TEST_RESULT_COMPONENT_EQUAL_STR(weather_name(detected), weather_name(m_expected_weather), "weather type");
+            return true;
+        }
+
+        return true;
+    }
+
+private:
+    WeatherIconType m_expected_weather;
+    bool m_expected_result;
+};
+
+
+
+void add_tests_WeatherDetector(UnitTestDatabase& database){
+    auto add = [&](const char* filename){
+        const std::string image = "PokemonLZA/WeatherDetector/" + std::string(filename);
+        database.add<Test_WeatherIconDetector>(
+            image,
+            weather_from_filename(filename),
+            expected_result_from_filename(filename)
+        );
+    };
+
+    add("clear_1_True.png");
+    add("clear_2_True.png");
+    add("clear_dark_1_True.png");
+    add("clear_dark_2_True.png");
+    add("clear_dark_map_True.png");
+    add("clear_overview_True.png");
+    add("clear_wild_zone_1_2_True.png");
+    add("clear_wild_zone_20_1_True.png");
+    add("cloudy_1_True.png");
+    add("cloudy_hyperspace_rogue_mega_arena_True.png");
+    add("cloudy_zoomed_1_True.png");
+    add("cloudy_zoomed_2_True.png");
+    add("fog_1_True.png");
+    add("fog_wild_zone_1_True.png");
+    add("fog_wild_zone_20_True.png");
+    add("french_clear_place_centrale_True.png");
+    add("french_clear_wild_zone_20_2_True.png");
+    add("french_cloudy_wild_zone_20_True.png");
+    add("french_rainbow_wild_zone_20_True.png");
+    add("french_rain_wild_zone_20_True.png");
+    add("french_sunny_wild_zone_20_1_True.png");
+    add("japanese_clear_1_True.jpg");
+    add("japanese_clear_2_True.jpg");
+    add("japanese_sunny_True.png");
+    add("japanese_sunny_wild_zone_17_True.png");
+    add("rainbow_1_True.png");
+    add("rainbow_True.png");
+    add("rain_1_True.png");
+    add("rain_hyperspace_wild_zone_True.png");
+    add("rain_wild_zone_1_True.png");
+    add("rain_wild_zone_6_True.png");
+    add("sunny_3_True.png");
+    add("sunny_wild_zone_1_True.png");
+    add("sunny_wild_zone_8_True.png");
+    add("sunny_zoomed_1_True.jpg");
+    add("sunny_zoomed_2_True.jpg");
+}
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_WeatherDetector.h b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_WeatherDetector.h
new file mode 100644
index 0000000000..65534db7e9
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Inference/PokemonLZA_WeatherDetector.h
@@ -0,0 +1,54 @@
+/*  Weather Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLZA_WeatherDetector_H
+#define PokemonAutomation_PokemonLZA_WeatherDetector_H
+
+#include <optional>
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/VisualDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+
+enum class WeatherIconType{
+    Clear,
+    Sunny,
+    Rain,
+    Cloudy,
+    Foggy,
+    Rainbow,
+    Unknown,
+};
+
+
+
+class WeatherIconDetector : public StaticScreenDetector{
+public:
+    WeatherIconDetector(WeatherIconType type, VideoOverlay* overlay = nullptr);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    ImageFloatBox m_box;
+    WeatherIconType m_type;
+
+    std::optional<OverlayBoxScope> m_overlay1;
+};
+
+
+void add_tests_WeatherDetector(UnitTestDatabase& database);
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/InferenceTraining/PokemonLZA_GenerateLocationNameOCR.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/InferenceTraining/PokemonLZA_GenerateLocationNameOCR.cpp
new file mode 100644
index 0000000000..c2b67948c4
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/InferenceTraining/PokemonLZA_GenerateLocationNameOCR.cpp
@@ -0,0 +1,185 @@
+/*  Generate Location Name OCR Data
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Filesystem/Filesystem.h"
+#include "Common/Cpp/PrettyPrint.h"
+#include "Common/Cpp/Json/JsonValue.h"
+#include "Common/Cpp/Json/JsonArray.h"
+#include "CommonFramework/GlobalAutoPaths.h"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonLZA/Inference/Map/PokemonLZA_LocationNameReader.h"
+#include "PokemonLZA_GenerateLocationNameOCR.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+using namespace Pokemon;
+
+
+GenerateLocationNameOCR_Descriptor::GenerateLocationNameOCR_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonLZA:GenerateLocationNameOCR",
+        STRING_POKEMON + " LZA", "Generate Location Name OCR Data",
+        "",
+        "Generate Location Name OCR data by iterating the fly spot list.",
+        PanelQualityStanding::DEVELOPER,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+
+
+GenerateLocationNameOCR::GenerateLocationNameOCR()
+    : LANGUAGE(
+        "<b>Game Language:</b>",
+        LocationNameOCR::instance().languages(),
+        LockMode::LOCK_WHILE_RUNNING
+    )
+    , MODE(
+        "<b>Mode:</b>",
+        {
+            {Mode::SaveToJson, "save-to-json", "Read names and save to JSON."},
+            {Mode::GenerateTrainingData, "generate-training-data", "Generate training data."},
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        Mode::GenerateTrainingData
+    )
+{
+    PA_ADD_OPTION(LANGUAGE);
+    PA_ADD_OPTION(MODE);
+}
+
+void GenerateLocationNameOCR::read(
+    JsonArray& output,
+    Logger& logger,
+    const ImageViewRGB32& image
+) const{
+    OCR::StringMatchResult result = LocationNameOCR::instance().read_substring(
+        logger, LANGUAGE, image,
+        OCR::BLACK_OR_WHITE_TEXT_FILTERS()
+    );
+    if (result.results.empty()){
+        output.push_back("");
+    }else{
+        output.push_back(result.results.begin()->second.token);
+    }
+}
+
+void GenerateLocationNameOCR::dump_images(
+    const std::vector<std::string>& expected,
+    size_t index,
+    const ImageViewRGB32& image
+) const{
+    if (index >= expected.size()){
+        return;
+    }
+
+    std::string path = "LocationNameOCR/";
+    path += language_data(LANGUAGE).code;
+
+    if (!Filesystem::exists(Filesystem::Path(path))){
+        Filesystem::create_directories(Filesystem::Path(path));
+    }
+
+    path += "/";
+    path += expected[index];
+    path += "-";
+    path += now_to_filestring();
+    path += ".png";
+    image.save(path);
+
+//    OCR::make_OCR_filter(image).apply(image);
+}
+
+void GenerateLocationNameOCR::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+
+    size_t location_num = 67;
+
+    OverlayBoxScope box0(env.console, {0.035000, 0.254000 + 0 * 0.078000, 0.287000, 0.050000}, COLOR_BLUE);
+    OverlayBoxScope box1(env.console, {0.035000, 0.254000 + 1 * 0.078000, 0.287000, 0.050000}, COLOR_BLUE);
+    OverlayBoxScope box2(env.console, {0.035000, 0.254000 + 2 * 0.078000, 0.287000, 0.050000}, COLOR_BLUE);
+    OverlayBoxScope box3(env.console, {0.035000, 0.254000 + 3 * 0.078000, 0.287000, 0.050000}, COLOR_BLUE);
+    OverlayBoxScope box4(env.console, {0.035000, 0.254000 + 4 * 0.078000, 0.287000, 0.050000}, COLOR_BLUE);
+    OverlayBoxScope box5(env.console, {0.035000, 0.254000 + 5 * 0.078000, 0.287000, 0.050000}, COLOR_BLUE);
+    OverlayBoxScope box6(env.console, {0.035000, 0.254000 + 6 * 0.078000, 0.287000, 0.050000}, COLOR_BLUE);
+
+    std::vector<std::string> expected;
+    JsonArray actual;
+//    OCR::DictionaryOCR& dictionary = m_reader.dictionary(LANGUAGE);
+
+    if (MODE == Mode::GenerateTrainingData){
+        std::string path = RESOURCE_PATH() + "PokemonLZA/LocationName.json";
+        JsonValue json = load_json_file(path);
+        JsonArray& array = json.to_array_throw(path);
+        for (const auto& item : array){
+            expected.emplace_back(item.to_string_throw(path));
+        }
+    }
+
+    for (size_t c = 1; c <= location_num; c += 7){
+        context.wait_for_all_requests();
+
+        if (c + 6 > location_num){
+            c = location_num - 6;
+        }
+//        cout << "dex: " << c << endl;
+
+        VideoSnapshot frame = env.console.video().snapshot();
+        ImageViewRGB32 image0 = extract_box_reference(frame, box0);
+        ImageViewRGB32 image1 = extract_box_reference(frame, box1);
+        ImageViewRGB32 image2 = extract_box_reference(frame, box2);
+        ImageViewRGB32 image3 = extract_box_reference(frame, box3);
+        ImageViewRGB32 image4 = extract_box_reference(frame, box4);
+        ImageViewRGB32 image5 = extract_box_reference(frame, box5);
+        ImageViewRGB32 image6 = extract_box_reference(frame, box6);
+
+//        image1.save("test.png");
+
+        switch (MODE){
+        case Mode::SaveToJson:
+            read(actual, env.console, image0);
+            read(actual, env.console, image1);
+            read(actual, env.console, image2);
+            read(actual, env.console, image3);
+            read(actual, env.console, image4);
+            read(actual, env.console, image5);
+            read(actual, env.console, image6);
+            break;
+        case Mode::GenerateTrainingData:
+            dump_images(expected, c - 1 + 0, image0);
+            dump_images(expected, c - 1 + 1, image1);
+            dump_images(expected, c - 1 + 2, image2);
+            dump_images(expected, c - 1 + 3, image3);
+            dump_images(expected, c - 1 + 4, image4);
+            dump_images(expected, c - 1 + 5, image5);
+            dump_images(expected, c - 1 + 6, image6);
+            break;
+        }
+
+        pbf_press_dpad(context, DPAD_RIGHT, 160ms, 80ms);
+    }
+
+    if (MODE == Mode::SaveToJson){
+        actual.dump("LocationName.json");
+    }
+
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/InferenceTraining/PokemonLZA_GenerateLocationNameOCR.h b/SerialPrograms/Source/VideoGames/PokemonLZA/InferenceTraining/PokemonLZA_GenerateLocationNameOCR.h
new file mode 100644
index 0000000000..480bb88cb9
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/InferenceTraining/PokemonLZA_GenerateLocationNameOCR.h
@@ -0,0 +1,63 @@
+/*  Generate Location Name OCR Data
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLZA_GenerateNameOCRData_H
+#define PokemonAutomation_PokemonLZA_GenerateNameOCRData_H
+
+#include "Common/Cpp/Options/EnumDropdownOption.h"
+#include "CommonTools/Options/LanguageOCROption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+
+
+namespace PokemonAutomation{
+    class JsonArray;
+    class ImageViewRGB32;
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+
+class GenerateLocationNameOCR_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    GenerateLocationNameOCR_Descriptor();
+};
+
+
+
+class GenerateLocationNameOCR : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = GenerateLocationNameOCR_Descriptor;
+    GenerateLocationNameOCR();
+
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    void read(
+        JsonArray& output,
+        Logger& logger,
+        const ImageViewRGB32& image
+    ) const;
+    void dump_images(
+        const std::vector<std::string>& expected,
+        size_t index,
+        const ImageViewRGB32& image
+    ) const;
+
+private:
+    OCR::LanguageOCROption LANGUAGE;
+
+    enum class Mode{
+        SaveToJson,
+        GenerateTrainingData,
+    };
+    EnumDropdownOption<Mode> MODE;
+};
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Options/PokemonLZA_BattleAIOption.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Options/PokemonLZA_BattleAIOption.cpp
new file mode 100644
index 0000000000..bec03d0003
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Options/PokemonLZA_BattleAIOption.cpp
@@ -0,0 +1,45 @@
+/*  Battle AI Option
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "PokemonLZA_BattleAIOption.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+
+BattleAIOption::BattleAIOption()
+    : GroupOption(
+        "Battle AI",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        EnableMode::ALWAYS_ENABLED
+    )
+    , MODE(
+        "<b>Mode:</b>",
+        {
+            {BattleAIMode::BlindMash,           "blind-mash",           "Blind Mash"},
+            {BattleAIMode::TypeEffectiveness,   "type-effectiveness",   "Use most type-effective move."},
+        },
+        LockMode::UNLOCK_WHILE_RUNNING,
+        BattleAIMode::TypeEffectiveness
+    )
+    , USE_PLUS_MOVES(
+        "<b>Use Plus Moves:</b><br>"
+        "If enabled, it will attempt to use plus moves.<br>"
+        "However, this adds a 320ms delay which may cause opponent attacks to land first.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        false
+    )
+{
+    PA_ADD_OPTION(MODE);
+    PA_ADD_OPTION(USE_PLUS_MOVES);
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Options/PokemonLZA_BattleAIOption.h b/SerialPrograms/Source/VideoGames/PokemonLZA/Options/PokemonLZA_BattleAIOption.h
new file mode 100644
index 0000000000..49f9d60319
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Options/PokemonLZA_BattleAIOption.h
@@ -0,0 +1,39 @@
+/*  Battle AI Option
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLZA_BattleAIOption_H
+#define PokemonAutomation_PokemonLZA_BattleAIOption_H
+
+#include "Common/Cpp/Options/GroupOption.h"
+#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "Common/Cpp/Options/EnumDropdownOption.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+
+enum class BattleAIMode{
+    BlindMash,
+    TypeEffectiveness,
+};
+
+
+class BattleAIOption : public GroupOption{
+public:
+    BattleAIOption();
+
+public:
+    EnumDropdownOption<BattleAIMode> MODE;
+    BooleanCheckBoxOption USE_PLUS_MOVES;
+};
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Options/PokemonLZA_DonutBerriesOption.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Options/PokemonLZA_DonutBerriesOption.cpp
new file mode 100644
index 0000000000..a5e3b2c957
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Options/PokemonLZA_DonutBerriesOption.cpp
@@ -0,0 +1,652 @@
+/*  Donut Berries Option
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Logging/Logger.h"
+#include "VideoGames/PokemonLZA/Resources/PokemonLZA_DonutBerries.h"
+#include "PokemonLZA_DonutBerriesOption.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+const EnumDropdownDatabase<Flavor_Powers>& flavor_power_enum_database(){
+    static EnumDropdownDatabase<Flavor_Powers> database{
+        {Flavor_Powers::any,                "any",                  "Any Power"},
+
+        {Flavor_Powers::sparkling_any,      "sparkling-any",        "Sparkling: *"},
+        {Flavor_Powers::sparkling_all,      "sparkling-all",        "Sparkling: All Types"},
+        {Flavor_Powers::sparkling_normal,   "sparkling-normal",     "Sparkling: Normal"},
+        {Flavor_Powers::sparkling_fire,     "sparkling-fire",       "Sparkling: Fire"},
+        {Flavor_Powers::sparkling_water,    "sparkling-water",      "Sparkling: Water"},
+        {Flavor_Powers::sparkling_electric, "sparkling-electric",   "Sparkling: Electric"},
+        {Flavor_Powers::sparkling_grass,    "sparkling-grass",      "Sparkling: Grass"},
+        {Flavor_Powers::sparkling_ice,      "sparkling-ice",        "Sparkling: Ice"},
+        {Flavor_Powers::sparkling_fighting, "sparkling-fighting",   "Sparkling: Fighting"},
+        {Flavor_Powers::sparkling_poison,   "sparkling-poison",     "Sparkling: Poison"},
+        {Flavor_Powers::sparkling_ground,   "sparkling-ground",     "Sparkling: Ground"},
+        {Flavor_Powers::sparkling_flying,   "sparkling-flying",     "Sparkling: Flying"},
+        {Flavor_Powers::sparkling_psychic,  "sparkling-psychic",    "Sparkling: Psychic"},
+        {Flavor_Powers::sparkling_bug,      "sparkling-bug",        "Sparkling: Bug"},
+        {Flavor_Powers::sparkling_rock,     "sparkling-rock",       "Sparkling: Rock"},
+        {Flavor_Powers::sparkling_ghost,    "sparkling-ghost",      "Sparkling: Ghost"},
+        {Flavor_Powers::sparkling_dragon,   "sparkling-dragon",     "Sparkling: Dragon"},
+        {Flavor_Powers::sparkling_dark,     "sparkling-dark",       "Sparkling: Dark"},
+        {Flavor_Powers::sparkling_steel,    "sparkling-steel",      "Sparkling: Steel"},
+        {Flavor_Powers::sparkling_fairy,    "sparkling-fairy",      "Sparkling: Fairy"},
+
+        {Flavor_Powers::alpha,      "alpha",        "Alpha"},
+        {Flavor_Powers::humungo,    "humungo",      "Humungo"},
+        {Flavor_Powers::teensy,     "teensy",       "Teensy"},
+
+        {Flavor_Powers::item_any,       "item-any",         "Item: *"},
+        {Flavor_Powers::item_berries,   "item-berries",     "Item: Berries"},
+        {Flavor_Powers::item_candies,   "item-candies",     "Item: Candies"},
+        {Flavor_Powers::item_treasure,  "item-treasure",    "Item: Treasure"},
+        {Flavor_Powers::item_pokeballs, "item-pokeballs",   "Item: Poké Balls"},
+        {Flavor_Powers::item_special,   "item-special",     "Item: Special"},
+        {Flavor_Powers::item_coins,     "item-coins",       "Item: Coins"},
+        {Flavor_Powers::bighaul,        "big-haul",          "Big Haul"},
+        {Flavor_Powers::megacharge,     "mega-charge",      "Mega Charge"},
+        {Flavor_Powers::megaconserve,   "mega-conserve",    "Mega Conserve"},
+
+        {Flavor_Powers::catching_any,      "catching-any",        "Catching: *"},
+        {Flavor_Powers::catching_all,      "catching-all",        "Catching: All Types"},
+        {Flavor_Powers::catching_normal,   "catching-normal",     "Catching: Normal"},
+        {Flavor_Powers::catching_fire,     "catching-fire",       "Catching: Fire"},
+        {Flavor_Powers::catching_water,    "catching-water",      "Catching: Water"},
+        {Flavor_Powers::catching_electric, "catching-electric",   "Catching: Electric"},
+        {Flavor_Powers::catching_grass,    "catching-grass",      "Catching: Grass"},
+        {Flavor_Powers::catching_ice,      "catching-ice",        "Catching: Ice"},
+        {Flavor_Powers::catching_fighting, "catching-fighting",   "Catching: Fighting"},
+        {Flavor_Powers::catching_poison,   "catching-poison",     "Catching: Poison"},
+        {Flavor_Powers::catching_ground,   "catching-ground",     "Catching: Ground"},
+        {Flavor_Powers::catching_flying,   "catching-flying",     "Catching: Flying"},
+        {Flavor_Powers::catching_psychic,  "catching-psychic",    "Catching: Psychic"},
+        {Flavor_Powers::catching_bug,      "catching-bug",        "Catching: Bug"},
+        {Flavor_Powers::catching_rock,     "catching-rock",       "Catching: Rock"},
+        {Flavor_Powers::catching_ghost,    "catching-ghost",      "Catching: Ghost"},
+        {Flavor_Powers::catching_dragon,   "catching-dragon",     "Catching: Dragon"},
+        {Flavor_Powers::catching_dark,     "catching-dark",       "Catching: Dark"},
+        {Flavor_Powers::catching_steel,    "catching-steel",      "Catching: Steel"},
+        {Flavor_Powers::catching_fairy,    "catching-fairy",      "Catching: Fairy"},
+        {Flavor_Powers::encounter,        "encounter",          "Encounter"},
+
+        {Flavor_Powers::move_any,      "move-any",        "Move: *"},
+        {Flavor_Powers::move_normal,   "move-normal",     "Move: Normal"},
+        {Flavor_Powers::move_fire,     "move-fire",       "Move: Fire"},
+        {Flavor_Powers::move_water,    "move-water",      "Move: Water"},
+        {Flavor_Powers::move_electric, "move-electric",   "Move: Electric"},
+        {Flavor_Powers::move_grass,    "move-grass",      "Move: Grass"},
+        {Flavor_Powers::move_ice,      "move-ice",        "Move: Ice"},
+        {Flavor_Powers::move_fighting, "move-fighting",   "Move: Fighting"},
+        {Flavor_Powers::move_poison,   "move-poison",     "Move: Poison"},
+        {Flavor_Powers::move_ground,   "move-ground",     "Move: Ground"},
+        {Flavor_Powers::move_flying,   "move-flying",     "Move: Flying"},
+        {Flavor_Powers::move_psychic,  "move-psychic",    "Move: Psychic"},
+        {Flavor_Powers::move_bug,      "move-bug",        "Move: Bug"},
+        {Flavor_Powers::move_rock,     "move-rock",       "Move: Rock"},
+        {Flavor_Powers::move_ghost,    "move-ghost",      "Move: Ghost"},
+        {Flavor_Powers::move_dragon,   "move-dragon",     "Move: Dragon"},
+        {Flavor_Powers::move_dark,     "move-dark",       "Move: Dark"},
+        {Flavor_Powers::move_steel,    "move-steel",      "Move: Steel"},
+        {Flavor_Powers::move_fairy,    "move-fairy",      "Move: Fairy"},
+        {Flavor_Powers::atk,           "atk",             "Attack"},
+        {Flavor_Powers::spatk,         "spatk",           "Sp. Atk"},
+        {Flavor_Powers::speed,         "speed",           "Speed"},
+
+        {Flavor_Powers::resistance_any,      "resistance-any",        "Resistance: *"},
+        {Flavor_Powers::resistance_normal,   "resistance-normal",     "Resistance: Normal"},
+        {Flavor_Powers::resistance_fire,     "resistance-fire",       "Resistance: Fire"},
+        {Flavor_Powers::resistance_water,    "resistance-water",      "Resistance: Water"},
+        {Flavor_Powers::resistance_electric, "resistance-electric",   "Resistance: Electric"},
+        {Flavor_Powers::resistance_grass,    "resistance-grass",      "Resistance: Grass"},
+        {Flavor_Powers::resistance_ice,      "resistance-ice",        "Resistance: Ice"},
+        {Flavor_Powers::resistance_fighting, "resistance-fighting",   "Resistance: Fighting"},
+        {Flavor_Powers::resistance_poison,   "resistance-poison",     "Resistance: Poison"},
+        {Flavor_Powers::resistance_ground,   "resistance-ground",     "Resistance: Ground"},
+        {Flavor_Powers::resistance_flying,   "resistance-flying",     "Resistance: Flying"},
+        {Flavor_Powers::resistance_psychic,  "resistance-psychic",    "Resistance: Psychic"},
+        {Flavor_Powers::resistance_bug,      "resistance-bug",        "Resistance: Bug"},
+        {Flavor_Powers::resistance_rock,     "resistance-rock",       "Resistance: Rock"},
+        {Flavor_Powers::resistance_ghost,    "resistance-ghost",      "Resistance: Ghost"},
+        {Flavor_Powers::resistance_dragon,   "resistance-dragon",     "Resistance: Dragon"},
+        {Flavor_Powers::resistance_dark,     "resistance-dark",       "Resistance: Dark"},
+        {Flavor_Powers::resistance_steel,    "resistance-steel",      "Resistance: Steel"},
+        {Flavor_Powers::resistance_fairy,    "resistance-fairy",      "Resistance: Fairy"},
+        {Flavor_Powers::def,           "def",             "Defense"},
+        {Flavor_Powers::spdef,         "spdef",           "Sp. Def"},
+    };
+    return database;
+};
+
+const EnumDropdownDatabase<Power_Level>& power_level_enum_database(){
+    static EnumDropdownDatabase<Power_Level> database{
+        {Power_Level::any,          "any",          "Any Level"},
+        {Power_Level::one,          "one",          "Lv. 1"},
+        {Power_Level::two,          "two",          "Lv. 2"},
+        {Power_Level::three,        "three",        "Lv. 3"},
+        {Power_Level::one_two,      "one_two",      "Lv. 1 or 2"},
+        {Power_Level::two_three,    "two_three",    "Lv. 2 or 3"},
+    };
+    return database;
+}
+
+std::string FlavorPowerTableEntry::to_str() const{
+    std::string result;
+    result += "Limit: " + std::to_string(limit) + ", ";
+    result += get_single_flavor_power_string(1) + ", ";
+    result += get_single_flavor_power_string(2) + ", ";
+    result += get_single_flavor_power_string(3);
+    return result;
+}
+
+std::vector<std::string> FlavorPowerTableEntry::get_entry_flavor_power_strings() const{
+    std::vector<std::string> powers;
+    for (int c = 1; c <= 3; c++){
+        std::string power_string = get_single_flavor_power_string(c);
+        powers.push_back(power_string);
+    }
+    return powers;
+}
+
+std::string FlavorPowerTableEntry::get_single_flavor_power_string(int power_index) const{
+    std::string selected_power;
+    Flavor_Powers power;
+    Power_Level level;
+
+    switch (power_index){
+    case 1:
+        power = power_1;
+        level = level_1;
+        break;
+    case 2:
+        power = power_2;
+        level = level_2;
+        break;
+    case 3:
+        power = power_3;
+        level = level_3;
+        break;
+    default:
+        throw InternalProgramError(
+            nullptr, PA_CURRENT_FUNCTION, 
+            "Invalid power index: " + std::to_string(power_index)
+        );
+    }
+
+    switch (power){
+    case Flavor_Powers::any:
+        selected_power += "any-power-";
+        break;
+
+    case Flavor_Powers::sparkling_any:
+        selected_power += "sparkling-power-any-";
+        break;
+    case Flavor_Powers::sparkling_all:
+        selected_power += "sparkling-power-all-types-";
+        break;
+    case Flavor_Powers::sparkling_normal:
+        selected_power += "sparkling-power-normal-";
+        break;
+    case Flavor_Powers::sparkling_fire:
+        selected_power += "sparkling-power-fire-";
+        break;
+    case Flavor_Powers::sparkling_water:
+        selected_power += "sparkling-power-water-";
+        break;
+    case Flavor_Powers::sparkling_electric:
+        selected_power += "sparkling-power-electric-";
+        break;
+    case Flavor_Powers::sparkling_grass:
+        selected_power += "sparkling-power-grass-";
+        break;
+    case Flavor_Powers::sparkling_ice:
+        selected_power += "sparkling-power-ice-";
+        break;
+    case Flavor_Powers::sparkling_fighting:
+        selected_power += "sparkling-power-fighting-";
+        break;
+    case Flavor_Powers::sparkling_poison:
+        selected_power += "sparkling-power-poison-";
+        break;
+    case Flavor_Powers::sparkling_ground:
+        selected_power += "sparkling-power-ground-";
+        break;
+    case Flavor_Powers::sparkling_flying:
+        selected_power += "sparkling-power-flying-";
+        break;
+    case Flavor_Powers::sparkling_psychic:
+        selected_power += "sparkling-power-psychic-";
+        break;
+    case Flavor_Powers::sparkling_bug:
+        selected_power += "sparkling-power-bug-";
+        break;
+    case Flavor_Powers::sparkling_rock:
+        selected_power += "sparkling-power-rock-";
+        break;
+    case Flavor_Powers::sparkling_ghost:
+        selected_power += "sparkling-power-ghost-";
+        break;
+    case Flavor_Powers::sparkling_dragon:
+        selected_power += "sparkling-power-dragon-";
+        break;
+    case Flavor_Powers::sparkling_dark:
+        selected_power += "sparkling-power-dark-";
+        break;
+    case Flavor_Powers::sparkling_steel:
+        selected_power += "sparkling-power-steel-";
+        break;
+    case Flavor_Powers::sparkling_fairy:
+        selected_power += "sparkling-power-fairy-";
+        break;
+
+    case Flavor_Powers::alpha:
+        selected_power += "alpha-power-";
+        break;
+    case Flavor_Powers::humungo:
+        selected_power += "humungo-power-";
+        break;
+    case Flavor_Powers::teensy:
+        selected_power += "teensy-power-";
+        break;
+
+    case Flavor_Powers::item_any:
+        selected_power += "item-power-any-";
+        break;
+    case Flavor_Powers::item_berries:
+        selected_power += "item-power-berries-";
+        break;
+    case Flavor_Powers::item_candies:
+        selected_power += "item-power-candies-";
+        break;
+    case Flavor_Powers::item_treasure:
+        selected_power += "item-power-treasure-";
+        break;
+    case Flavor_Powers::item_pokeballs:
+        selected_power += "item-power-pokeballs-";
+        break;
+    case Flavor_Powers::item_special:
+        selected_power += "item-power-special-";
+        break;
+    case Flavor_Powers::item_coins:
+        selected_power += "item-power-coins-";
+        break;
+    case Flavor_Powers::bighaul:
+        selected_power += "big-haul-power-";
+        break;
+    case Flavor_Powers::megacharge:
+        selected_power += "mega-charge-power-";
+        break;
+    case Flavor_Powers::megaconserve:
+        selected_power += "mega-conserve-power-";
+        break;
+
+    case Flavor_Powers::catching_any:
+        selected_power += "catching-power-any-";
+        break;
+    case Flavor_Powers::catching_all:
+        selected_power += "catching-power-all-";
+        break;
+    case Flavor_Powers::catching_normal:
+        selected_power += "catching-power-normal-";
+        break;
+    case Flavor_Powers::catching_fire:
+        selected_power += "catching-power-fire-";
+        break;
+    case Flavor_Powers::catching_water:
+        selected_power += "catching-power-water-";
+        break;
+    case Flavor_Powers::catching_electric:
+        selected_power += "catching-power-electric-";
+        break;
+    case Flavor_Powers::catching_grass:
+        selected_power += "catching-power-grass-";
+        break;
+    case Flavor_Powers::catching_ice:
+        selected_power += "catching-power-ice-";
+        break;
+    case Flavor_Powers::catching_fighting:
+        selected_power += "catching-power-fighting-";
+        break;
+    case Flavor_Powers::catching_poison:
+        selected_power += "catching-power-poison-";
+        break;
+    case Flavor_Powers::catching_ground:
+        selected_power += "catching-power-ground-";
+        break;
+    case Flavor_Powers::catching_flying:
+        selected_power += "catching-power-flying-";
+        break;
+    case Flavor_Powers::catching_psychic:
+        selected_power += "catching-power-psychic-";
+        break;
+    case Flavor_Powers::catching_bug:
+        selected_power += "catching-power-bug-";
+        break;
+    case Flavor_Powers::catching_rock:
+        selected_power += "catching-power-rock-";
+        break;
+    case Flavor_Powers::catching_ghost:
+        selected_power += "catching-power-ghost-";
+        break;
+    case Flavor_Powers::catching_dragon:
+        selected_power += "catching-power-dragon-";
+        break;
+    case Flavor_Powers::catching_dark:
+        selected_power += "catching-power-dark-";
+        break;
+    case Flavor_Powers::catching_steel:
+        selected_power += "catching-power-steel-";
+        break;
+    case Flavor_Powers::catching_fairy:
+        selected_power += "catching-power-fairy-";
+        break;
+    case Flavor_Powers::encounter:
+        selected_power += "encounter-power-";
+        break;
+
+    case Flavor_Powers::move_any:
+        selected_power += "move-power-any-";
+        break;
+    case Flavor_Powers::move_normal:
+        selected_power += "move-power-normal-";
+        break;
+    case Flavor_Powers::move_fire:
+        selected_power += "move-power-fire-";
+        break;
+    case Flavor_Powers::move_water:
+        selected_power += "move-power-water-";
+        break;
+    case Flavor_Powers::move_electric:
+        selected_power += "move-power-electric-";
+        break;
+    case Flavor_Powers::move_grass:
+        selected_power += "move-power-grass-";
+        break;
+    case Flavor_Powers::move_ice:
+        selected_power += "move-power-ice-";
+        break;
+    case Flavor_Powers::move_fighting:
+        selected_power += "move-power-fighting-";
+        break;
+    case Flavor_Powers::move_poison:
+        selected_power += "move-power-poison-";
+        break;
+    case Flavor_Powers::move_ground:
+        selected_power += "move-power-ground-";
+        break;
+    case Flavor_Powers::move_flying:
+        selected_power += "move-power-flying-";
+        break;
+    case Flavor_Powers::move_psychic:
+        selected_power += "move-power-psychic-";
+        break;
+    case Flavor_Powers::move_bug:
+        selected_power += "move-power-bug-";
+        break;
+    case Flavor_Powers::move_rock:
+        selected_power += "move-power-rock-";
+        break;
+    case Flavor_Powers::move_ghost:
+        selected_power += "move-power-ghost-";
+        break;
+    case Flavor_Powers::move_dragon:
+        selected_power += "move-power-dragon-";
+        break;
+    case Flavor_Powers::move_dark:
+        selected_power += "move-power-dark-";
+        break;
+    case Flavor_Powers::move_steel:
+        selected_power += "move-power-steel-";
+        break;
+    case Flavor_Powers::move_fairy:
+        selected_power += "move-power-fairy-";
+        break;
+    case Flavor_Powers::atk:
+        selected_power += "attack-power-";
+        break;
+    case Flavor_Powers::spatk:
+        selected_power += "sp-atk-power-";
+        break;
+    case Flavor_Powers::speed:
+        selected_power += "speed-power-";
+        break;
+
+    case Flavor_Powers::resistance_any:
+        selected_power += "resistance-power-any-";
+        break;
+    case Flavor_Powers::resistance_normal:
+        selected_power += "resistance-power-normal-";
+        break;
+    case Flavor_Powers::resistance_fire:
+        selected_power += "resistance-power-fire-";
+        break;
+    case Flavor_Powers::resistance_water:
+        selected_power += "resistance-power-water-";
+        break;
+    case Flavor_Powers::resistance_electric:
+        selected_power += "resistance-power-electric-";
+        break;
+    case Flavor_Powers::resistance_grass:
+        selected_power += "resistance-power-grass-";
+        break;
+    case Flavor_Powers::resistance_ice:
+        selected_power += "resistance-power-ice-";
+        break;
+    case Flavor_Powers::resistance_fighting:
+        selected_power += "resistance-power-fighting-";
+        break;
+    case Flavor_Powers::resistance_poison:
+        selected_power += "resistance-power-poison-";
+        break;
+    case Flavor_Powers::resistance_ground:
+        selected_power += "resistance-power-ground-";
+        break;
+    case Flavor_Powers::resistance_flying:
+        selected_power += "resistance-power-flying-";
+        break;
+    case Flavor_Powers::resistance_psychic:
+        selected_power += "resistance-power-psychic-";
+        break;
+    case Flavor_Powers::resistance_bug:
+        selected_power += "resistance-power-bug-";
+        break;
+    case Flavor_Powers::resistance_rock:
+        selected_power += "resistance-power-rock-";
+        break;
+    case Flavor_Powers::resistance_ghost:
+        selected_power += "resistance-power-ghost-";
+        break;
+    case Flavor_Powers::resistance_dragon:
+        selected_power += "resistance-power-dragon-";
+        break;
+    case Flavor_Powers::resistance_dark:
+        selected_power += "resistance-power-dark-";
+        break;
+    case Flavor_Powers::resistance_steel:
+        selected_power += "resistance-power-steel-";
+        break;
+    case Flavor_Powers::resistance_fairy:
+        selected_power += "resistance-power-fairy-";
+        break;
+    case Flavor_Powers::def:
+        selected_power += "defense-power-";
+        break;
+    case Flavor_Powers::spdef:
+        selected_power += "sp-def-power-";
+        break;
+    default:
+        throw InternalProgramError(
+            nullptr, PA_CURRENT_FUNCTION, 
+            "Invalid flavor power: " + std::to_string(static_cast<int>(power))
+        );
+    }
+
+    switch (level){
+    case Power_Level::any:
+        selected_power += "any";
+        break;
+    case Power_Level::one:
+        selected_power += "1";
+        break;
+    case Power_Level::two:
+        selected_power += "2";
+        break;
+    case Power_Level::three:
+        selected_power += "3";
+        break;
+    case Power_Level::one_two:
+        selected_power += "12";
+        break;
+    case Power_Level::two_three:
+        selected_power += "23";
+        break;
+    default:
+        throw InternalProgramError(
+            nullptr, PA_CURRENT_FUNCTION, 
+            "Invalid power level: " + std::to_string(static_cast<int>(level))
+        );
+    }
+    return selected_power;
+}
+
+StringSelectDatabase make_donut_berries_database(){
+    StringSelectDatabase ret;
+    for (const auto& slug : DONUT_BERRIES_SLUGS()){
+        const DonutBerries& data = get_berry_name(slug);
+        const SpriteDatabase::Sprite* sprite = DONUT_BERRIES_DATABASE().get_nothrow(slug);
+        if (sprite == nullptr){
+            ret.add_entry(StringSelectEntry(slug, data.display_name()));
+            global_logger_tagged().log("Missing sprite for: " + slug, COLOR_RED);
+        }else{
+            ret.add_entry(StringSelectEntry(slug, data.display_name(), sprite->icon));
+        }
+    }
+    return ret;
+}
+const StringSelectDatabase& DONUT_BERRY_DATABASE(){
+    static StringSelectDatabase database = make_donut_berries_database();
+    return database;
+}
+
+
+DonutBerriesTableCell::DonutBerriesTableCell(
+    const std::string& default_slug
+)
+    : StringSelectCell(
+        DONUT_BERRY_DATABASE(),
+        LockMode::LOCK_WHILE_RUNNING,
+        default_slug
+    )
+{}
+
+DonutBerriesTableRow::DonutBerriesTableRow(EditableTableOption& parent_table)
+    : EditableTableRow(parent_table)
+    , berry("hyper-cheri-berry")
+{
+    PA_ADD_OPTION(berry);
+}
+std::unique_ptr<EditableTableRow> DonutBerriesTableRow::clone() const{
+    std::unique_ptr<DonutBerriesTableRow> ret(new DonutBerriesTableRow(parent()));
+    ret->berry.set_by_index(berry.index());
+    return ret;
+}
+
+DonutBerriesTable::DonutBerriesTable(std::string label)
+    : EditableTableOption_t<DonutBerriesTableRow>(
+        std::move(label),
+        LockMode::LOCK_WHILE_RUNNING,
+        make_defaults()
+        )
+{}
+
+
+std::vector<std::string> DonutBerriesTable::make_header() const{
+    return std::vector<std::string>{
+        "Berry",
+    };
+}
+
+std::vector<std::unique_ptr<EditableTableRow>> DonutBerriesTable::make_defaults(){
+    std::vector<std::unique_ptr<EditableTableRow>> ret;
+    ret.emplace_back(std::make_unique<DonutBerriesTableRow>(*this));
+    return ret;
+}
+
+
+
+
+FlavorPowerTableRow::FlavorPowerTableRow(EditableTableOption& parent_table)
+    : EditableTableRow(parent_table)
+    , limit(LockMode::LOCK_WHILE_RUNNING, 1, 0, 999)
+    , power_1(flavor_power_enum_database(), LockMode::LOCK_WHILE_RUNNING, Flavor_Powers::alpha)
+    , level_1(power_level_enum_database(), LockMode::LOCK_WHILE_RUNNING, Power_Level::three)
+    , power_2(flavor_power_enum_database(), LockMode::LOCK_WHILE_RUNNING, Flavor_Powers::any)
+    , level_2(power_level_enum_database(), LockMode::LOCK_WHILE_RUNNING, Power_Level::any)
+    , power_3(flavor_power_enum_database(), LockMode::LOCK_WHILE_RUNNING, Flavor_Powers::any)
+    , level_3(power_level_enum_database(), LockMode::LOCK_WHILE_RUNNING, Power_Level::any)
+{
+    PA_ADD_OPTION(limit);
+    PA_ADD_OPTION(power_1);
+    PA_ADD_OPTION(level_1);
+    PA_ADD_OPTION(power_2);
+    PA_ADD_OPTION(level_2);
+    PA_ADD_OPTION(power_3);
+    PA_ADD_OPTION(level_3);
+}
+std::unique_ptr<EditableTableRow> FlavorPowerTableRow::clone() const{
+    std::unique_ptr<FlavorPowerTableRow> ret(new FlavorPowerTableRow(parent()));
+    ret->limit.set(limit);
+    ret->power_1.set(power_1);
+    ret->level_1.set(level_1);
+    ret->power_2.set(power_2);
+    ret->level_2.set(level_2);
+    ret->power_3.set(power_3);
+    ret->level_3.set(level_3);
+    return ret;
+}
+FlavorPowerTableEntry FlavorPowerTableRow::snapshot() const{
+    return FlavorPowerTableEntry{limit, power_1, level_1, power_2, level_2, power_3, level_3};
+}
+
+FlavorPowerTable::FlavorPowerTable()
+    : EditableTableOption_t<FlavorPowerTableRow>(
+        "<b>Donuts Table:</b><br>"
+        "Add all desired donuts to this table. "
+        "The program will check the powers of a made donut and compare the powers to each row in the table."
+        "<br>A keep limit can be set for each donut. Make sure you have enough berries to make this many donuts!"
+        "<br>A single donut can match and count towards the limit of multiple entries in the table."
+        "<br>The order in which you list Flavor Powers 1, 2, and 3 does not matter."
+        "<br>Note: \"All Types\" means the All Types Power in-game. \"*\" means match any type for the specified power",
+        LockMode::LOCK_WHILE_RUNNING,
+        make_defaults()
+    )
+{}
+std::vector<FlavorPowerTableEntry> FlavorPowerTable::snapshot(){
+    return EditableTableOption_t<FlavorPowerTableRow>::snapshot<FlavorPowerTableEntry>();
+}
+std::vector<std::string> FlavorPowerTable::make_header() const{
+    return {
+        "Keep Limit",
+        "Flavor Power 1   ",
+        "Level 1  ",
+        "Flavor Power 2   ",
+        "Level 2  ",
+        "Flavor Power 3   ",
+        "Level 3  ",
+    };
+}
+std::vector<std::unique_ptr<EditableTableRow>> FlavorPowerTable::make_defaults(){
+    std::vector<std::unique_ptr<EditableTableRow>> ret;
+    ret.emplace_back(new FlavorPowerTableRow(*this));
+    return ret;
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Options/PokemonLZA_DonutBerriesOption.h b/SerialPrograms/Source/VideoGames/PokemonLZA/Options/PokemonLZA_DonutBerriesOption.h
new file mode 100644
index 0000000000..2789a2d54b
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Options/PokemonLZA_DonutBerriesOption.h
@@ -0,0 +1,213 @@
+/*  Donut Berries Option
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLZA_DonutBerriesOption_H
+#define PokemonAutomation_PokemonLZA_DonutBerriesOption_H
+
+#include "Common/Cpp/Options/EditableTableOption.h"
+#include "Common/Cpp/Options/EnumDropdownOption.h"
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "CommonTools/Options/StringSelectOption.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+enum class Flavor_Powers {
+    // Subjective ordering by group
+    any,
+
+    sparkling_any,
+    sparkling_all,
+    sparkling_normal,
+    sparkling_fire,
+    sparkling_water,
+    sparkling_electric,
+    sparkling_grass,
+    sparkling_ice,
+    sparkling_fighting,
+    sparkling_poison,
+    sparkling_ground,
+    sparkling_flying,
+    sparkling_psychic,
+    sparkling_bug,
+    sparkling_rock,
+    sparkling_ghost,
+    sparkling_dragon,
+    sparkling_dark,
+    sparkling_steel,
+    sparkling_fairy,
+
+    alpha,
+    humungo,
+    teensy,
+
+    item_any,
+    item_berries,
+    item_candies,
+    item_treasure,
+    item_pokeballs,
+    item_special,
+    item_coins,
+    bighaul,
+    megacharge,
+    megaconserve,
+
+    catching_any,
+    catching_all,
+    catching_normal,
+    catching_fire,
+    catching_water,
+    catching_electric,
+    catching_grass,
+    catching_ice,
+    catching_fighting,
+    catching_poison,
+    catching_ground,
+    catching_flying,
+    catching_psychic,
+    catching_bug,
+    catching_rock,
+    catching_ghost,
+    catching_dragon,
+    catching_dark,
+    catching_steel,
+    catching_fairy,
+    encounter,
+
+    move_any,
+    move_normal,
+    move_fire,
+    move_water,
+    move_electric,
+    move_grass,
+    move_ice,
+    move_fighting,
+    move_poison,
+    move_ground,
+    move_flying,
+    move_psychic,
+    move_bug,
+    move_rock,
+    move_ghost,
+    move_dragon,
+    move_dark,
+    move_steel,
+    move_fairy,
+    atk,
+    spatk,
+    speed,
+
+    resistance_any,
+    resistance_normal,
+    resistance_fire,
+    resistance_water,
+    resistance_electric,
+    resistance_grass,
+    resistance_ice,
+    resistance_fighting,
+    resistance_poison,
+    resistance_ground,
+    resistance_flying,
+    resistance_psychic,
+    resistance_bug,
+    resistance_rock,
+    resistance_ghost,
+    resistance_dragon,
+    resistance_dark,
+    resistance_steel,
+    resistance_fairy,
+    def,
+    spdef,
+};
+
+enum class Power_Level{
+    any,
+    one,
+    two,
+    three,
+    one_two,
+    two_three,
+};
+
+struct FlavorPowerTableEntry{
+    uint16_t limit;
+    Flavor_Powers power_1;
+    Power_Level level_1;
+    Flavor_Powers power_2;
+    Power_Level level_2;
+    Flavor_Powers power_3;
+    Power_Level level_3;
+
+    std::string to_str() const;
+    std::vector<std::string> get_entry_flavor_power_strings() const;
+    std::string get_single_flavor_power_string(int power_index) const;
+};
+
+
+//Berry + Hyperspace Berry selection
+class DonutBerriesTableCell : public StringSelectCell{
+public:
+    DonutBerriesTableCell(const std::string& default_slug);
+};
+
+class DonutBerriesTableRow : public EditableTableRow{
+public:
+    DonutBerriesTableRow(EditableTableOption& parent_table);
+    virtual std::unique_ptr<EditableTableRow> clone() const override;
+
+public:
+    DonutBerriesTableCell berry;
+};
+
+
+class DonutBerriesTable : public EditableTableOption_t<DonutBerriesTableRow>{
+public:
+    DonutBerriesTable(std::string label);
+
+    virtual std::vector<std::string> make_header() const override;
+
+    std::vector<std::unique_ptr<EditableTableRow>> make_defaults();
+};
+
+
+
+//Donut Flavor Power selection
+class FlavorPowerTableRow : public EditableTableRow, public ConfigOption::Listener{
+public:
+    FlavorPowerTableRow(EditableTableOption& parent_table);
+    virtual std::unique_ptr<EditableTableRow> clone() const override;
+
+    FlavorPowerTableEntry snapshot() const;
+
+private:
+    SimpleIntegerCell<uint16_t> limit;
+    EnumDropdownCell<Flavor_Powers> power_1;
+    EnumDropdownCell<Power_Level> level_1;
+    EnumDropdownCell<Flavor_Powers> power_2;
+    EnumDropdownCell<Power_Level> level_2;
+    EnumDropdownCell<Flavor_Powers> power_3;
+    EnumDropdownCell<Power_Level> level_3;
+};
+
+
+class FlavorPowerTable : public EditableTableOption_t<FlavorPowerTableRow>{
+public:
+    FlavorPowerTable();
+
+    std::vector<FlavorPowerTableEntry> snapshot();
+
+    virtual std::vector<std::string> make_header() const;
+
+    std::vector<std::unique_ptr<EditableTableRow>> make_defaults();
+
+};
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Options/PokemonLZA_HyperspaceRewardOption.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Options/PokemonLZA_HyperspaceRewardOption.cpp
new file mode 100644
index 0000000000..5901bce22c
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Options/PokemonLZA_HyperspaceRewardOption.cpp
@@ -0,0 +1,41 @@
+/*  Hyperspace Reward Option
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "VideoGames/PokemonLZA/Resources/PokemonLZA_HyperspaceRewardNames.h"
+#include "PokemonLZA_HyperspaceRewardOption.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+StringSelectDatabase make_hyperspace_reward_database(){
+    StringSelectDatabase ret;
+    for (const auto& slug : HYPERSPACE_REWARD_SLUGS()){
+        const HyperspaceRewardNames& data = get_hyperspace_reward_name(slug);
+        ret.add_entry(StringSelectEntry(slug, data.display_name()));
+    }
+    return ret;
+}
+const StringSelectDatabase& HYPERSPACE_REWARD_DATABASE(){
+    static StringSelectDatabase database = make_hyperspace_reward_database();
+    return database;
+}
+
+
+HyperspaceRewardCell::HyperspaceRewardCell(
+    const std::string& default_slug
+)
+    : StringSelectCell(
+        HYPERSPACE_REWARD_DATABASE(),
+        LockMode::LOCK_WHILE_RUNNING,
+        default_slug
+    )
+{}
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Options/PokemonLZA_HyperspaceRewardOption.h b/SerialPrograms/Source/VideoGames/PokemonLZA/Options/PokemonLZA_HyperspaceRewardOption.h
new file mode 100644
index 0000000000..5fa7ff5bd8
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Options/PokemonLZA_HyperspaceRewardOption.h
@@ -0,0 +1,24 @@
+/*  Hyperspace Reward Option
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLZA_HyperspaceRewardOption_H
+#define PokemonAutomation_PokemonLZA_HyperspaceRewardOption_H
+
+#include "CommonTools/Options/StringSelectOption.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+class HyperspaceRewardCell : public StringSelectCell{
+public:
+    HyperspaceRewardCell(const std::string& default_slug);
+};
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Options/PokemonLZA_HyperspaceRewardTable.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Options/PokemonLZA_HyperspaceRewardTable.cpp
new file mode 100644
index 0000000000..769c68206d
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Options/PokemonLZA_HyperspaceRewardTable.cpp
@@ -0,0 +1,72 @@
+/*  Hyperspace Reward Table
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "PokemonLZA_HyperspaceRewardTable.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+HyperspaceRewardRow::HyperspaceRewardRow(EditableTableOption& parent_table)
+    : EditableTableRow(parent_table)
+    , item("bottle-cap")
+{
+    PA_ADD_OPTION(item);
+}
+std::unique_ptr<EditableTableRow> HyperspaceRewardRow::clone() const{
+    std::unique_ptr<HyperspaceRewardRow> ret(new HyperspaceRewardRow(parent()));
+    ret->item.set_by_index(item.index());
+    return ret;
+}
+
+HyperspaceRewardTable::HyperspaceRewardTable(std::string label)
+    : EditableTableOption_t<HyperspaceRewardRow>(
+        std::move(label),
+        LockMode::LOCK_WHILE_RUNNING,
+        make_defaults()
+    )
+{}
+
+bool HyperspaceRewardTable::find_item(const std::string& item_slug) const{
+    std::vector<std::unique_ptr<HyperspaceRewardRow>> table = copy_snapshot();
+    for (const std::unique_ptr<HyperspaceRewardRow>& row : table){
+        if (row->item.slug() == item_slug){
+            return true;
+        }
+    }
+    return false;
+}
+
+std::vector<std::string> HyperspaceRewardTable::selected_items() const{
+    std::vector<std::unique_ptr<HyperspaceRewardRow>> table = copy_snapshot();
+    std::vector<std::string> slugs;
+    for (const std::unique_ptr<HyperspaceRewardRow>& row : table){
+        slugs.emplace_back(row->item.slug());
+    }
+    return slugs;
+}
+
+
+std::vector<std::string> HyperspaceRewardTable::make_header() const{
+    return std::vector<std::string>{
+        "Item",
+    };
+}
+
+std::vector<std::unique_ptr<EditableTableRow>> HyperspaceRewardTable::make_defaults(){
+    std::vector<std::unique_ptr<EditableTableRow>> ret;
+    ret.emplace_back(std::make_unique<HyperspaceRewardRow>(*this));
+    return ret;
+}
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Options/PokemonLZA_HyperspaceRewardTable.h b/SerialPrograms/Source/VideoGames/PokemonLZA/Options/PokemonLZA_HyperspaceRewardTable.h
new file mode 100644
index 0000000000..72e4ba7f67
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Options/PokemonLZA_HyperspaceRewardTable.h
@@ -0,0 +1,51 @@
+/* Hyperspace Reward Table
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLZA_HyperspaceRewardTable_H
+#define PokemonAutomation_PokemonLZA_HyperspaceRewardTable_H
+
+#include "Common/Cpp/Options/EditableTableOption.h"
+#include "PokemonLZA_HyperspaceRewardOption.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+
+
+class HyperspaceRewardRow : public EditableTableRow{
+public:
+    HyperspaceRewardRow(EditableTableOption& parent_table);
+    virtual std::unique_ptr<EditableTableRow> clone() const override;
+
+public:
+    HyperspaceRewardCell item;
+};
+
+
+
+class HyperspaceRewardTable : public EditableTableOption_t<HyperspaceRewardRow>{
+public:
+    HyperspaceRewardTable(std::string label);
+
+
+    // Whether item_slug is among the selected items.
+    bool find_item(const std::string& item_slug) const;
+    std::vector<std::string> selected_items() const;
+
+    virtual std::vector<std::string> make_header() const override;
+
+    std::vector<std::unique_ptr<EditableTableRow>> make_defaults();
+};
+
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Options/PokemonLZA_ShinyDetectedAction.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Options/PokemonLZA_ShinyDetectedAction.cpp
new file mode 100644
index 0000000000..2688b47b62
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Options/PokemonLZA_ShinyDetectedAction.cpp
@@ -0,0 +1,271 @@
+/*  Shiny Detected Action
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <sstream>
+//#include "Common/Cpp/Exceptions.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "Pokemon/Pokemon_Notification.h"
+#include "PokemonLZA_ShinyDetectedAction.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+
+
+ShinySoundDetectedActionOption::ShinySoundDetectedActionOption(
+    std::string label, std::string description,
+    std::string default_delay,
+    ShinySoundDetectedAction default_action
+)
+    : GroupOption(std::move(label), LockMode::UNLOCK_WHILE_RUNNING)
+    , DESCRIPTION(std::move(description))
+    , ACTION(
+        "<b>Action:</b>",
+        {
+            {ShinySoundDetectedAction::STOP_PROGRAM,            "stop",             "Stop program and go Home. Send notification."},
+            {ShinySoundDetectedAction::NOTIFY_ON_FIRST_ONLY,    "notify-first",     "Keep running. Notify on first shiny sound only."},
+            {ShinySoundDetectedAction::NO_NOTIFICATIONS,        "no-notifications", "Keep running. Track shiny sounds without sending notifications."},
+//            {ShinySoundDetectedAction::NOTIFY_ON_ALL,           "notify-all",       "Keep running. Notify on all shiny sounds."},
+        },
+        LockMode::UNLOCK_WHILE_RUNNING,
+        default_action
+    )
+    , TAKE_VIDEO(
+        "<b>Take Video:</b><br>"
+        "Records the first shiny sound using the switch capture button.<br>",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        true
+    )
+    , SCREENSHOT_DELAY(
+        "<b>Video Delay:</b><br>"
+        "Wait this long before taking a video of the shiny.<br>"
+        "Don't set this too large or the shiny may run away!",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        std::move(default_delay)
+    )
+    , NOTIFICATIONS(
+        this->label(),
+        true, true,
+        ImageAttachmentMode::JPG,
+        {"Notifs", "Showcase"}
+    )
+    , NOTES(
+        "<font color=\"red\">"
+        "The shiny sound is not a reliable measure of shinies encountered:<br>"
+        "1. The sound only plays on a smaller radius than the spawn radius, so the vast majority of shinies are inaudible. "
+        "You will still need to manually run around to see if any shinies spawned out-of-range. "
+        "<br>"
+        "2. Secondly, it may play multiple times for the same shiny, so it may overcount. "
+        "If a shiny spawns next to you, it may play the sound on every reset afterwards. <\font>"
+    )
+{
+    if (!DESCRIPTION.text().empty()){
+        PA_ADD_STATIC(DESCRIPTION);
+    }
+    PA_ADD_OPTION(ACTION);
+    PA_ADD_OPTION(TAKE_VIDEO);
+    PA_ADD_OPTION(SCREENSHOT_DELAY);
+
+    PA_ADD_STATIC(NOTES);
+}
+
+bool ShinySoundDetectedActionOption::on_shiny_sighted(
+    ProgramEnvironment& env, VideoStream& stream, ProControllerContext& context,
+    size_t current_count
+){
+    ShinySoundDetectedAction action = ACTION;
+
+    if (action == ShinySoundDetectedAction::NOTIFY_ON_FIRST_ONLY && current_count > 1){
+        return false;
+    }
+
+    if (action == ShinySoundDetectedAction::NO_NOTIFICATIONS && current_count > 1){
+        return false;
+    }
+
+    if (TAKE_VIDEO){
+        context.wait_for(SCREENSHOT_DELAY);
+        pbf_press_button(context, BUTTON_CAPTURE, 2000ms, 0ms);
+    }
+
+    if (action != ShinySoundDetectedAction::NO_NOTIFICATIONS){
+        send_shiny_sighted_notification(env, stream);
+    }
+
+    return action == ShinySoundDetectedAction::STOP_PROGRAM;
+}
+
+
+void ShinySoundDetectedActionOption::send_shiny_sighted_notification(
+    ProgramEnvironment& env, VideoStream& stream
+){
+    {
+        std::ostringstream ss;
+        ss << "Sighted Shiny!";
+        stream.log(ss.str(), COLOR_BLUE);
+    }
+
+    std::vector<std::pair<std::string, std::string>> embeds;
+
+    send_program_notification(
+        env, NOTIFICATIONS,
+        Pokemon::COLOR_STAR_SHINY,
+        "Sighted Shiny",
+        embeds, "",
+        stream.video().snapshot(), true
+    );
+}
+
+
+bool ShinySoundDetectedActionOption::on_shiny_sound(
+    ProgramEnvironment& env, VideoStream& stream, ProControllerContext& context,
+    size_t current_count,
+    float error_coefficient
+){
+    ShinySoundDetectedAction action = ACTION;
+
+    if (action == ShinySoundDetectedAction::NOTIFY_ON_FIRST_ONLY && current_count > 1){
+        return false;
+    }
+
+    if (action == ShinySoundDetectedAction::NO_NOTIFICATIONS && current_count > 1){
+        return false;
+    }
+
+    if (TAKE_VIDEO){
+        context.wait_for(SCREENSHOT_DELAY);
+        pbf_press_button(context, BUTTON_CAPTURE, 2000ms, 0ms);
+    }
+
+    if (action != ShinySoundDetectedAction::NO_NOTIFICATIONS){
+        send_shiny_sound_notification(env, stream, error_coefficient);
+    }
+
+    return action == ShinySoundDetectedAction::STOP_PROGRAM;
+}
+
+
+void ShinySoundDetectedActionOption::send_shiny_sound_notification(
+    ProgramEnvironment& env, VideoStream& stream, float error_coefficient
+){
+    {
+        std::ostringstream ss;
+        ss << "Detected Shiny Sound! (error coefficient = " << error_coefficient << ")";
+        stream.log(ss.str(), COLOR_BLUE);
+    }
+
+    std::vector<std::pair<std::string, std::string>> embeds;
+    {
+        std::ostringstream ss;
+        ss << "Error Coefficient: ";
+        ss << error_coefficient;
+        ss << "\n(Shiny may not be visible on the screen.)";
+        embeds.emplace_back("Detection Results:", ss.str());
+    }
+
+    send_program_notification(
+        env, NOTIFICATIONS,
+        Pokemon::COLOR_STAR_SHINY,
+        "Detected Shiny Sound",
+        embeds, "",
+        stream.video().snapshot(), true
+    );
+}
+
+
+
+
+
+
+bool ShinySoundHandler::on_shiny_sound(
+    ProgramEnvironment& env,
+    VideoStream& stream,
+    size_t current_count,
+    float error_coefficient
+){
+    WallClock now = current_time();
+
+    ShinySoundDetectedAction action = m_option.ACTION;
+
+    if (action == ShinySoundDetectedAction::NOTIFY_ON_FIRST_ONLY && current_count > 1){
+        return false;
+    }
+
+    if (action == ShinySoundDetectedAction::NO_NOTIFICATIONS && current_count > 1){
+        return false;
+    }
+
+    if (action != ShinySoundDetectedAction::NO_NOTIFICATIONS){
+        m_option.send_shiny_sound_notification(env, stream, error_coefficient);
+    }
+
+    if (m_pending_video.load(std::memory_order_acquire)){
+        stream.log("Back-to-back shiny sounds. Suppressing video.", COLOR_RED);
+    }else{
+        // Write timestamp to be read by process_pending() to determine whether
+        // to delay video recording
+        m_detected_time = now;
+        // Signals to process_pending() to record video
+        m_pending_video.store(true, std::memory_order_release);
+    }
+
+    return action == ShinySoundDetectedAction::STOP_PROGRAM;
+}
+
+void ShinySoundHandler::process_pending(ProControllerContext& context){
+    if (!m_pending_video.load(std::memory_order_acquire)){
+        // No pending video to record
+        return;
+    }
+    // Need to process video recording request
+    if (!m_option.TAKE_VIDEO){
+        // User does not ask to take a video
+        // Unlock: set m_pending_video to false to be done with video recording request
+        m_pending_video.store(false, std::memory_order_release);
+        return;
+    }
+
+    //  Calculate elapsed time since shiny detection.
+    WallDuration elapsed = current_time() - m_detected_time;
+    auto elapsed_ms = std::chrono::duration_cast<Milliseconds>(elapsed);
+
+    //  Calculate remaining time to wait.
+    Milliseconds requested_delay = m_option.SCREENSHOT_DELAY.get();
+    if (requested_delay > elapsed_ms){
+        context.wait_for(requested_delay - elapsed_ms);
+    }
+    //  Otherwise, take screenshot immediately (no additional wait needed)
+    pbf_press_button(context, BUTTON_CAPTURE, 2000ms, 0ms);
+
+    context.wait_for_all_requests();
+
+    // Unlock: set m_pending_video to false to be done with video recording
+    m_pending_video.store(false, std::memory_order_release);
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Options/PokemonLZA_ShinyDetectedAction.h b/SerialPrograms/Source/VideoGames/PokemonLZA/Options/PokemonLZA_ShinyDetectedAction.h
new file mode 100644
index 0000000000..8bbdc8c223
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Options/PokemonLZA_ShinyDetectedAction.h
@@ -0,0 +1,164 @@
+/*  Shiny Detected Action
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLZA_ShinyDetectedAction_H
+#define PokemonAutomation_PokemonLZA_ShinyDetectedAction_H
+
+#include <atomic>
+#include "Common/Cpp/Options/GroupOption.h"
+#include "Common/Cpp/Options/StaticTextOption.h"
+#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+//#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "Common/Cpp/Options//TimeDurationOption.h"
+#include "CommonFramework/Notifications/EventNotificationOption.h"
+#include "CommonFramework/Tools/VideoStream.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+
+namespace PokemonAutomation{
+    class ProgramEnvironment;
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+
+enum class ShinySoundDetectedAction{
+    STOP_PROGRAM,         // stop program at first detected shiny sound
+    NOTIFY_ON_FIRST_ONLY, // notify user only on the first shiny sound, keep running the program
+    NOTIFY_ON_ALL,        // notify on all shiny sounds, keep running the program
+    NO_NOTIFICATIONS      // no notifications, still track shiny sounds
+};
+
+
+class ShinySoundDetectedActionOption : public GroupOption, public ConfigOption::Listener{
+public:
+    ShinySoundDetectedActionOption(
+        std::string label, std::string description,
+        std::string default_delay,
+        ShinySoundDetectedAction default_action
+    );
+
+    // Handle shiny sighting according to ACTION.
+    // May log the sighting, take a video on Switch and send notification.
+    // Return whether to stop the program according to ACTION.
+    // Since this function may file button presses to record a video on Switch, it must be
+    // in the program thread that allows sending button presses.
+    bool on_shiny_sighted(
+        ProgramEnvironment& env, VideoStream& stream, ProControllerContext& context,
+        size_t current_count
+    );
+
+    // Assuming a shiny is sighted, this function logs and sends a notification.
+    // This function is called by `on_shiny_sighted()`.
+    void send_shiny_sighted_notification(
+        ProgramEnvironment& env, VideoStream& stream
+    );
+
+    // Handle shiny sound according to ACTION.
+    // May log the sound, take a video on Switch and send notification.
+    // Return whether to stop the program according to ACTION.
+    // NOTE:
+    // Since this function may file button presses to record a video on Switch, it must be
+    // in the program thread that allows sending button presses. Don't call this function on
+    // audio callback thread!
+    bool on_shiny_sound(
+        ProgramEnvironment& env, VideoStream& stream, ProControllerContext& context,
+        size_t current_count,
+        float error_coefficient
+    );
+
+    // Assuming a shiny sound is detected, this function logs and sends a notification.
+    // This function is called by `on_shiny_sound()`.
+    void send_shiny_sound_notification(
+        ProgramEnvironment& env, VideoStream& stream,
+        float error_coefficient
+    );
+
+    StaticTextOption DESCRIPTION;
+    EnumDropdownOption<ShinySoundDetectedAction> ACTION;
+    BooleanCheckBoxOption TAKE_VIDEO;
+    MillisecondsOption SCREENSHOT_DELAY;
+    EventNotificationOption NOTIFICATIONS;
+
+    StaticTextOption NOTES;
+};
+
+
+
+
+
+// Thread-safe handler for shiny sound detection and video capture.
+//
+// THREADING MODEL:
+// - on_shiny_sound() is called from the shiny inference thread (audio detector callback)
+// - process_pending() is called from the program thread (sending button presses)
+class ShinySoundHandler{
+public:
+    ShinySoundHandler(ShinySoundDetectedActionOption& option)
+        : m_option(option)
+        , m_pending_video(false)
+    {}
+
+    // Must be called by shiny inference thread (audio detector callback).
+    // Records detection time and sets pending flag using memory_order_release.
+    // Returns true if the program should exit (ACTION == STOP_PROGRAM).
+    bool on_shiny_sound(
+        ProgramEnvironment& env,
+        VideoStream& stream,
+        size_t current_count,
+        float error_coefficient
+    );
+
+    // Must be called from program thread (sending button presses).
+    // According to option, takes video after waiting for the appropriate delay
+    // based on elapsed time.
+    void process_pending(ProControllerContext& context);
+
+private:
+    ShinySoundDetectedActionOption& m_option;
+
+    // SYNCHRONIZATION STRATEGY:
+    // Uses the atomic flag m_pending_video with release-acquire memory ordering to synchronize
+    // access to the non-atomic m_detected_time:
+    //
+    //   Inference Thread:                      Program Thread:
+    //   on_shiny_sound()                       process_pending()
+    //   ─────────────────                      ───────────────
+    //   m_detected_time = now;
+    //   m_pending_video.store(true, RELEASE) ──────┐
+    //                                              │ Synchronizes-with
+    //                                              ↓
+    //                                   m_pending_video.load(ACQUIRE)
+    //                                   read m_detected_time safely and process video recording
+    //                                   m_pending_video.store(false, RELEASE)
+    //
+    // m_pending_video:
+    // - Set to true with memory_order_release by inference thread (signals need for recording a
+    //   video and publishes timestamp)
+    // - Read with memory_order_acquire by program thread (reads whether to record a video and
+    //   gets published timestamp)
+    // - Set to false with memory_order_release by program thread after processing
+    std::atomic<bool> m_pending_video;
+
+    // Time when shiny was detected (non-atomic, protected by m_pending_video flag).
+    // THREAD SAFETY: Only written by inference thread before setting m_pending_video=true.
+    // Only read by program thread after observing m_pending_video=true.
+    WallClock m_detected_time;
+};
+
+
+
+
+
+
+
+
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/PokemonLZA_Panels.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/PokemonLZA_Panels.cpp
new file mode 100644
index 0000000000..bd5e98adae
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/PokemonLZA_Panels.cpp
@@ -0,0 +1,139 @@
+/*  Pokemon LZA Panels
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/StaticGlobals.h"
+#include "CommonFramework/GlobalAutoPaths.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "PokemonLZA_Panels.h"
+
+#include "PokemonLZA_Settings.h"
+
+//  General
+#include "Programs/PokemonLZA_ClothingBuyer.h"
+#include "Programs/PokemonLZA_StallBuyer.h"
+#include "Programs/Trading/PokemonLZA_SelfBoxTrade.h"
+#include "Programs/PokemonLZA_PostKillCatcher.h"
+#include "Programs/PokemonLZA_BoxSorter.h"
+#include "Programs/NonShinyHunting/PokemonLZA_WeatherFinder.h"
+#include "Programs/Farming/PokemonLZA_HyperspaceRewardReset.h"
+#include "Programs/Farming/PokemonLZA_DonutMaker.h"
+
+//  Trading
+
+//  Farming
+#include "Programs/PokemonLZA_TurboMacro.h"
+#include "Programs/Farming/PokemonLZA_RestaurantFarmer.h"
+#include "Programs/Farming/PokemonLZA_MegaShardFarmer.h"
+#include "Programs/Farming/PokemonLZA_JacintheInfiniteFarmer.h"
+#include "Programs/Farming/PokemonLZA_FriendshipFarmer.h"
+#include "Programs/Farming/PokemonLZA_InPlaceCatcher.h"
+#include "Programs/Farming/PokemonLZA_WigglytuffFarmer.h"
+
+//  Shiny Hunting
+#include "Programs/ShinyHunting/PokemonLZA_AutoFossil.h"
+#include "Programs/ShinyHunting/PokemonLZA_ShinyHunt_BenchSit.h"
+#include "Programs/ShinyHunting/PokemonLZA_ShinyHunt_OverworldReset.h"
+#include "Programs/ShinyHunting/PokemonLZA_BeldumHunter.h"
+#include "Programs/ShinyHunting/PokemonLZA_WildZoneEntrance.h"
+#include "Programs/ShinyHunting/PokemonLZA_WildZoneCafe.h"
+#include "Programs/ShinyHunting/PokemonLZA_ShinyHunt_FlySpotReset.h"
+#include "Programs/ShinyHunting/PokemonLZA_ShinyHunt_HyperspaceHunter.h"
+#include "Programs/ShinyHunting/PokemonLZA_ShinyHunt_HyperspaceLegendary.h"
+#include "Programs/ShinyHunting/PokemonLZA_ShuttleRun.h"
+#include "Programs/ShinyHunting/PokemonLZA_SewerHunter.h"
+#include "Programs/ShinyHunting/PokemonLZA_ShinyHunt_HelioptileHunter.h"
+
+//  Non-Shiny Hunting
+#include "Programs/NonShinyHunting/PokemonLZA_StatsReset.h"
+
+//  Developer
+#include "Programs/TestPrograms/PokemonLZA_OverworldWatcher.h"
+#include "Programs/TestPrograms/PokemonLZA_MoveBoxArrow.h"
+#include "Programs/TestPrograms/PokemonLZA_TestBoxCellInfo.h"
+#include "InferenceTraining/PokemonLZA_GenerateLocationNameOCR.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+
+
+PanelListFactory::PanelListFactory()
+    : PanelListDescriptor(
+        Pokemon::STRING_POKEMON + " Legends: Z-A",
+        RESOURCE_PATH() + "CategoryIcons/PokemonLZA.png"
+    )
+{}
+
+std::vector<PanelEntry> PanelListFactory::make_panels() const{
+    std::vector<PanelEntry> ret;
+
+    ret.emplace_back("---- Settings ----");
+    ret.emplace_back(make_OptionsPanel<GameSettingsPanel>());
+
+    ret.emplace_back("---- General ----");
+    ret.emplace_back(make_SingleSwitchProgram<ClothingBuyer>());
+    ret.emplace_back(make_SingleSwitchProgram<StallBuyer>());
+    ret.emplace_back(make_MultiSwitchProgram<SelfBoxTrade>());
+    ret.emplace_back(make_SingleSwitchProgram<PostKillCatcher>());
+    ret.emplace_back(make_SingleSwitchProgram<BoxSorter>());
+    ret.emplace_back(make_SingleSwitchProgram<WeatherFinder>());
+    ret.emplace_back(make_SingleSwitchProgram<HyperspaceRewardReset>());
+    ret.emplace_back(make_SingleSwitchProgram<DonutMaker>());
+    if (IS_BETA_VERSION){
+    }
+
+    ret.emplace_back("---- Farming ----");
+    ret.emplace_back(make_SingleSwitchProgram<RestaurantFarmer>());
+    ret.emplace_back(make_SingleSwitchProgram<MegaShardFarmer>());
+    ret.emplace_back(make_SingleSwitchProgram<JacintheInfiniteFarmer>());
+    ret.emplace_back(make_SingleSwitchProgram<FriendshipFarmer>());
+    ret.emplace_back(make_SingleSwitchProgram<InPlaceCatcher>());
+    ret.emplace_back(make_SingleSwitchProgram<WigglytuffFarmer>());
+    if (IS_BETA_VERSION){
+    }
+
+    ret.emplace_back("---- Shiny Hunting ----");
+    ret.emplace_back(make_SingleSwitchProgram<AutoFossil>());
+    ret.emplace_back(make_SingleSwitchProgram<ShinyHunt_BenchSit>());
+    ret.emplace_back(make_SingleSwitchProgram<ShinyHunt_OverworldReset>());
+    ret.emplace_back(make_SingleSwitchProgram<ShinyHunt_WildZoneEntrance>());
+    ret.emplace_back(make_SingleSwitchProgram<ShinyHunt_WildZoneCafe>());
+    ret.emplace_back(make_SingleSwitchProgram<ShinyHunt_FlySpotReset>());
+    ret.emplace_back(make_SingleSwitchProgram<ShinyHunt_SewerHunter>());
+    ret.emplace_back(make_SingleSwitchProgram<ShinyHunt_HelioptileHunter>());
+    ret.emplace_back(make_SingleSwitchProgram<ShinyHunt_HyperspaceLegendary>());
+    ret.emplace_back(make_SingleSwitchProgram<LZA_TurboMacro>());
+    if (IS_BETA_VERSION){
+        ret.emplace_back(make_SingleSwitchProgram<ShinyHunt_ShuttleRun>());
+    }
+    if (STATIC_GLOBALS.DEVELOPER_MODE){
+        ret.emplace_back(make_SingleSwitchProgram<ShinyHunt_HyperspaceHunter>());
+        ret.emplace_back(make_SingleSwitchProgram<BeldumHunter>());
+    }
+
+//    ret.emplace_back("---- Non-Shiny Hunting ----");
+    if (IS_BETA_VERSION){
+    }
+
+    ret.emplace_back("---- Public Betas ----");
+    ret.emplace_back(make_SingleSwitchProgram<StatsReset>());
+
+    if (STATIC_GLOBALS.DEVELOPER_MODE){
+        ret.emplace_back("---- Developer Tools ----");
+        ret.emplace_back(make_SingleSwitchProgram<OverworldWatcher>());
+        ret.emplace_back(make_SingleSwitchProgram<MoveBoxArrow>());
+        ret.emplace_back(make_SingleSwitchProgram<TestBoxCellInfo>());
+        ret.emplace_back(make_SingleSwitchProgram<GenerateLocationNameOCR>());
+    }
+    return ret;
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/PokemonLZA_Panels.h b/SerialPrograms/Source/VideoGames/PokemonLZA/PokemonLZA_Panels.h
new file mode 100644
index 0000000000..1cd83b4753
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/PokemonLZA_Panels.h
@@ -0,0 +1,30 @@
+/*  Pokemon Legends ZA
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLZA_Panels_H
+#define PokemonAutomation_PokemonLZA_Panels_H
+
+#include "CommonFramework/Panels/PanelList.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+
+
+class PanelListFactory : public PanelListDescriptor{
+public:
+    PanelListFactory();
+private:
+    virtual std::vector<PanelEntry> make_panels() const override;
+};
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/PokemonLZA_Settings.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/PokemonLZA_Settings.cpp
new file mode 100644
index 0000000000..83cecab435
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/PokemonLZA_Settings.cpp
@@ -0,0 +1,81 @@
+/*  Pokemon Legends ZA
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Pokemon/Pokemon_Strings.h"
+#include "PokemonLZA_Settings.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+using namespace Pokemon;
+
+
+
+GameSettings& GameSettings::instance(){
+    static GameSettings settings;
+    return settings;
+}
+GameSettings::GameSettings()
+    : BatchOption(LockMode::LOCK_WHILE_RUNNING)
+    , m_general("<font size=4><b>General Settings:</b></font>")
+    , m_start_game_timings("<font size=4><b>Start Game Timings:</b></font>")
+    , START_GAME_WAIT(
+        "<b>Start Game Wait:</b><br>Wait this long for the game to load.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "40 s"
+    )
+    , ENTER_GAME_WAIT0(
+        "<b>Enter Game Wait:</b><br>Wait this long for the game to enter the overworld.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "60 s"
+    )
+    , m_advanced_options(
+        "<font size=4><b>Advanced Options:</b> You should not need to touch anything below here.</font>"
+    )
+{
+    PA_ADD_STATIC(m_general);
+
+    PA_ADD_STATIC(m_start_game_timings);
+    PA_ADD_OPTION(START_GAME_WAIT);
+    PA_ADD_OPTION(ENTER_GAME_WAIT0);
+
+    PA_ADD_STATIC(m_advanced_options);
+}
+
+
+
+
+GameSettings_Descriptor::GameSettings_Descriptor()
+    : OptionsPanelDescriptor(
+        "PokemonLZA:GlobalSettings",
+        STRING_POKEMON + " LZA", "Game Settings",
+        "Programs/PokemonLZA/PokemonSettings.html",
+        "Global " + STRING_POKEMON + " Legends ZA Settings",
+        PanelQualityStanding::OFFICIAL
+    )
+{}
+
+
+
+GameSettingsPanel::GameSettingsPanel()
+    : settings(GameSettings::instance())
+{
+    PA_ADD_OPTION(settings);
+}
+
+
+
+
+}
+}
+}
+
+
+
+
+
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/PokemonLZA_Settings.h b/SerialPrograms/Source/VideoGames/PokemonLZA/PokemonLZA_Settings.h
new file mode 100644
index 0000000000..8f67fe75c3
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/PokemonLZA_Settings.h
@@ -0,0 +1,58 @@
+/*  Pokemon Legends ZA
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLZA_Settings_H
+#define PokemonAutomation_PokemonLZA_Settings_H
+
+#include "Common/Cpp/Options/StaticTextOption.h"
+#include "Common/Cpp/Options/TimeDurationOption.h"
+#include "CommonFramework/Panels/OptionsPanel.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+
+class GameSettings : public BatchOption{
+    GameSettings();
+public:
+    static GameSettings& instance();
+
+    SectionDividerOption m_general;
+
+    SectionDividerOption m_start_game_timings;
+    MillisecondsOption START_GAME_WAIT;
+    MillisecondsOption ENTER_GAME_WAIT0;
+
+    SectionDividerOption m_advanced_options;
+
+
+};
+
+
+
+
+class GameSettings_Descriptor : public OptionsPanelDescriptor{
+public:
+    GameSettings_Descriptor();
+};
+
+
+class GameSettingsPanel : public OptionsPanelInstance{
+public:
+    using Descriptor = GameSettings_Descriptor;
+    GameSettingsPanel();
+private:
+    GameSettings& settings;
+};
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/PokemonLZA_Tests.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/PokemonLZA_Tests.cpp
new file mode 100644
index 0000000000..ead2ea2d67
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/PokemonLZA_Tests.cpp
@@ -0,0 +1,51 @@
+/*  Pokemon LZA Tests
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "Inference/Donuts/PokemonLZA_DonutBerriesDetector.h"
+#include "Inference/Donuts/PokemonLZA_FlavorPowerScreenDetector.h"
+#include "Inference/PokemonLZA_AlertEyeDetector.h"
+#include "Inference/Boxes/PokemonLZA_BoxDetection.h"
+#include "Inference/PokemonLZA_ButtonDetector.h"
+#include "Inference/Map/PokemonLZA_DirectionArrowDetector.h"
+#include "Inference/PokemonLZA_DialogDetector.h"
+#include "Inference/PokemonLZA_WeatherDetector.h"
+#include "Inference/PokemonLZA_HyperspaceCalorieDetector.h"
+#include "Inference/PokemonLZA_MainMenuDetector.h"
+#include "Inference/Map/PokemonLZA_MapDetector.h"
+#include "Inference/Map/PokemonLZA_MapIconDetector.h"
+#include "Inference/PokemonLZA_OverworldPartySelectionDetector.h"
+#include "Inference/PokemonLZA_SelectionArrowDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+
+
+void add_tests(UnitTestDatabase& database){
+    add_tests_AlertEyeDetector(database);
+    add_tests_BoxCellInfoDetector(database);
+    add_tests_ButtonDetector(database);
+    add_tests_DirectionArrowDetector(database);
+    add_tests_DialogDetector(database);
+    add_tests_WeatherDetector(database);
+    add_tests_DonutBerriesReader(database);
+    add_tests_FlavorPowerScreenDetector(database);
+    add_tests_HyperspaceCalorieDetector(database);
+    add_tests_MainMenuDetector(database);
+    add_tests_MapDetector(database);
+    add_tests_MapIconDetector(database);
+    add_tests_OverworldPartySelectionDetector(database);
+    add_tests_SelectionArrowDetector(database);
+
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/PokemonLZA_Tests.h b/SerialPrograms/Source/VideoGames/PokemonLZA/PokemonLZA_Tests.h
new file mode 100644
index 0000000000..1aaba6ceef
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/PokemonLZA_Tests.h
@@ -0,0 +1,25 @@
+/*  Pokemon LZA Tests
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLZA_Tests_H
+#define PokemonAutomation_PokemonLZA_Tests_H
+
+#include "Common/Cpp/TestRunners/UnitTest.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+
+
+void add_tests(UnitTestDatabase& database);
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_DonutMaker.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_DonutMaker.cpp
new file mode 100644
index 0000000000..2b0b2ac499
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_DonutMaker.cpp
@@ -0,0 +1,687 @@
+/*  Donut Maker
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <format>
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "CommonTools/StartupChecks/VideoResolutionCheck.h"
+#include "CommonTools/VisualDetectors/BlackScreenDetector.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_IvJudgeReader.h"
+#include "VideoGames/PokemonLZA/Inference/Donuts/PokemonLZA_DonutBerriesDetector.h"
+#include "VideoGames/PokemonLZA/Inference/Donuts/PokemonLZA_FlavorPowerDetector.h"
+#include "VideoGames/PokemonLZA/Inference/Donuts/PokemonLZA_FlavorPowerScreenDetector.h"
+#include "VideoGames/PokemonLZA/Inference/PokemonLZA_DialogDetector.h"
+#include "VideoGames/PokemonLZA/Inference/PokemonLZA_OverworldPartySelectionDetector.h"
+#include "VideoGames/PokemonLZA/Inference/PokemonLZA_SelectionArrowDetector.h"
+#include "VideoGames/PokemonLZA/Programs/PokemonLZA_GameEntry.h"
+#include "VideoGames/PokemonLZA/Programs/PokemonLZA_BasicNavigation.h"
+#include "VideoGames/PokemonLZA/Programs/PokemonLZA_FastTravelNavigation.h"
+#include "VideoGames/PokemonLZA/Programs/PokemonLZA_DonutBerrySession.h"
+#include "PokemonLZA_DonutMaker.h"
+
+// After pressing + to send the berries to Ansha:
+// - A white button dialog window, pressing A to clear
+// - An animation of Ansha making donut with Hoopa. End with her showing the donut. pressing A during
+//   the animatino clears the animation. Press A to end the fully played animation
+// - Ansha claps while the donut presenatation animation plays. Flavor power shows after a coupld of seconds
+
+
+namespace PokemonAutomation {
+namespace NintendoSwitch {
+namespace PokemonLZA {
+
+using namespace Pokemon;
+
+
+DonutMaker_Descriptor::DonutMaker_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonLZA:DonutMaker", STRING_POKEMON + " LZA",
+        "Donut Maker",
+        "Programs/PokemonLZA/DonutMaker.html",
+        "Make donuts and reset until desired flavor powers are found.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+class DonutMaker_Descriptor::Stats : public StatsTracker{
+public:
+    Stats()
+        : matched(m_stats["Donuts Matched"])
+        , kept(m_stats["Donuts Kept"])
+        , resets(m_stats["Resets"])
+        , errors(m_stats["Errors"])
+    {
+        // TODO: Add more stats here
+        m_display_order.emplace_back("Donuts Matched");
+        m_display_order.emplace_back("Donuts Kept");
+        m_display_order.emplace_back("Resets");
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+    }
+
+    std::atomic<uint64_t>& matched;
+    std::atomic<uint64_t>& kept;
+    std::atomic<uint64_t>& resets;
+    std::atomic<uint64_t>& errors;
+};
+
+std::unique_ptr<StatsTracker> DonutMaker_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+
+DonutMaker::DonutMaker()
+    : LANGUAGE(
+        "<b>Game Language:</b>",
+        PokemonSwSh::IV_READER().languages(),
+        LockMode::LOCK_WHILE_RUNNING,
+        true
+    )
+    , BERRIES("<b>Berries:</b><br>The berries used to make the donut. Minimum 3 berries, maximum 8 berries.")
+    , MAX_KEEPERS(
+        "<b>Maximum Number of Donuts to Keep:</b><br>"
+        "The program will stop when this many donuts are kept or all limits in the table are reached, whichever happens first."
+        "<br>Make sure you have enough berries to make this many donuts. The program will fail when not given enough berries.",
+        LockMode::LOCK_WHILE_RUNNING,
+        5, 1, 999
+    )
+    , GO_HOME_WHEN_DONE(false)
+    , NOTIFICATION_DONUT_FOUND(
+        "Donut Found",
+        true, true, ImageAttachmentMode::JPG,
+        {"Notifs"}
+    )
+    , NOTIFICATION_STATUS("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_DONUT_FOUND,
+        &NOTIFICATION_STATUS,
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_RECOVERABLE,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+{
+    PA_ADD_OPTION(LANGUAGE);
+    PA_ADD_OPTION(BERRIES);
+    PA_ADD_OPTION(MAX_KEEPERS);
+    PA_ADD_OPTION(FLAVOR_POWERS);
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+// Split flavor power notation into its individual tokens
+std::vector<std::string> get_flavor_power_tokens(const std::string& power_string){
+    std::vector<std::string> tokens;
+    size_t start = 0;
+    size_t end = power_string.find('-');
+    while (end != std::string::npos){
+        tokens.push_back(power_string.substr(start, end - start));
+        start = end + 1;
+        end = power_string.find('-', start);
+    }
+    tokens.push_back(power_string.substr(start));
+    return tokens;
+}
+
+// Check if all flavor tokens are in the donut flavor tokens
+// Apply some extra logic for "any" token and the special level tokens
+bool flavor_tokens_are_subset(const std::vector<std::string>& subset, const std::vector<std::string>& superset){
+    for (const std::string& token : subset){
+        if (token == "any"){
+            continue;
+        }
+        else if (token == "12"){
+            if (std::find(superset.begin(), superset.end(), "1") == superset.end() && std::find(superset.begin(), superset.end(), "2") == superset.end()){
+                return false;
+            }
+        }
+        else if (token == "23"){
+            if (std::find(superset.begin(), superset.end(), "2") == superset.end() && std::find(superset.begin(), superset.end(), "3") == superset.end()){
+                return false;
+            }
+        }
+        else if (std::find(superset.begin(), superset.end(), token) == superset.end()){
+            return false;
+        }
+    }
+    return true;
+}
+
+// Check if a donut matches an individual table entry. Each table entry has three target powers.
+bool donut_matches_powers(
+    SingleSwitchProgramEnvironment& env,
+    std::vector<std::string>& donut_powers,
+    const std::vector<std::string>& target_powers
+){
+    for (const std::string& target_power : target_powers){
+        // `target_power` can be a specific power like "item-power-berries-3" or a slug to match
+        // any possible power (or no power): "any-power-any".
+        std::vector<std::string> target_tokens = get_flavor_power_tokens(target_power);
+        bool matched = false;
+        for (const std::string& donut_power : donut_powers){
+            env.log("Comparing target power " + target_power + " with donut power " + donut_power);
+            std::vector<std::string> donut_tokens = get_flavor_power_tokens(donut_power);
+            if (flavor_tokens_are_subset(target_tokens, donut_tokens)){
+                env.log("Power matched!");
+                matched = true;
+                break;
+            }
+        }
+        if (!matched){
+            return false;
+        }
+    }
+    return true;
+}
+
+// Read flavor power and check if they match user requirement.
+// Keep or discard the donut depending on the user defined limit.
+// Return true if the user requirement is fulfilled.
+bool DonutMaker::match_powers(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    std::vector<uint16_t>& kept_counts
+){
+    DonutMaker_Descriptor::Stats& stats = env.current_stats<DonutMaker_Descriptor::Stats>();
+
+    env.log("Reading in table of desired powers.");
+
+    std::vector<std::vector<std::string>> powers_table;
+    std::vector<std::unique_ptr<FlavorPowerTableRow>> wanted_powers_table = FLAVOR_POWERS.copy_snapshot();
+    for (const std::unique_ptr<FlavorPowerTableRow>& row : wanted_powers_table){
+        FlavorPowerTableEntry table_line = row->snapshot();
+        powers_table.push_back(table_line.get_entry_flavor_power_strings());
+        env.log(table_line.to_str());
+    }
+    //TODO: Validate powers? The "All Types" type only applies to catching and sparkling powers. Move and resist do not have "All Types"
+    //Are people even going to target move and resist power? Big Haul/Item Berry/Alpha/Sparkling seems more likely.
+
+    env.log("Checking donut powers against table.");
+    VideoSnapshot screen = env.console.video().snapshot();
+    std::vector<std::string> donut_results;
+    for (int i = 0; i < 3; i++){
+        FlavorPowerDetector read_power(env.logger(), COLOR_GREEN, LANGUAGE, i);
+        const std::string power = read_power.detect_power(screen);
+        if (power.empty()){
+            env.log_to_ui(std::format("{}: Empty", i+1));
+            continue;
+        }
+        env.log_to_ui(std::format("{}: {}", i+1, power));
+        donut_results.push_back(power);
+    }
+
+    bool match_found = false;
+    bool should_keep = false;
+    // Each power table row:
+    for (size_t i = 0; i < powers_table.size(); i++){
+        if (donut_matches_powers(env, donut_results, powers_table[i])){
+            match_found = true;
+            if (kept_counts[i] < FLAVOR_POWERS.snapshot()[i].limit){
+                kept_counts[i]++;
+                env.log(
+                    "Keeping donut: " + std::to_string(kept_counts[i]) + " / " +
+                    std::to_string(FLAVOR_POWERS.snapshot()[i].limit) +
+                    " for table entry " + std::to_string(i+1)
+                );
+                should_keep = true;
+            }
+        }
+    }
+    if (match_found){
+        env.log("Match found!");
+        stats.matched++;
+        env.update_stats();
+        if (should_keep){
+            stats.kept++;
+            env.update_stats();
+            send_program_status_notification(env, NOTIFICATION_DONUT_FOUND, "Match found! Keeping donut.", screen, true);
+            return true;
+        }else{
+            env.log("Matched donut exceeds all keep limits.");
+        }
+    }
+    env.log("Discarding donut.");
+    return false;
+}
+
+void DonutMaker::animation_to_donut(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    DonutMaker_Descriptor::Stats& stats = env.current_stats<DonutMaker_Descriptor::Stats>();
+
+#if 0
+    WhiteScreenOverWatcher animation_skip(COLOR_BLUE);
+    int ret = run_until<ProControllerContext>(
+        env.console, context,
+        [&](ProControllerContext& context){
+            pbf_mash_button(context, BUTTON_A, Seconds(3));
+            pbf_wait(context, Seconds(30));
+        },
+        {animation_skip}
+    );
+    context.wait_for_all_requests();
+    if (ret != 0){
+        stats.errors++;
+        env.update_stats();
+        OperationFailedExceptionWithScreenshot::fire(
+           ErrorReportMode::SEND_ERROR_REPORT,
+            "donut_maker(): Unable to skip donut making animation.",
+            env.console
+        );
+    }
+
+    //Press A and wait a bit for powers to appear
+    pbf_wait(context, Seconds(3));
+    pbf_press_button(context, BUTTON_A, 100ms, 200ms);
+    pbf_wait(context, Seconds(3));
+    context.wait_for_all_requests();
+#else
+    // Safe initial mashing to clear dialogs
+    pbf_mash_button(context, BUTTON_A, Seconds(3));
+    context.wait_for_all_requests();
+
+    env.log_to_ui("Waiting for Flavor Power Screen...");
+
+    FlavorPowerScreenWatcher flavor_power_screen_watcher;
+    int ret = run_until<ProControllerContext>(
+        env.console, context,
+        [](ProControllerContext& context){
+            for (int i = 0; i < 20; i++){
+                pbf_press_button(context, BUTTON_A, 100ms, 400ms);
+            }
+        },
+        {{flavor_power_screen_watcher}}
+    );
+    if (ret != 0){
+        stats.errors++;
+        env.update_stats();
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "donut_maker(): Unable to find the donut flavor power screen.",
+            env.console
+        );
+    }
+    env.log("Found donut flavor power screen");
+    env.log_to_ui("Detected Flavor Power Screen");
+
+    // Wait for the UI animation for revealing flavor powers to play out
+    pbf_wait(context, Seconds(3));
+    context.wait_for_all_requests();
+    env.log_to_ui("Read Flavor Powers");
+#endif
+}
+
+void DonutMaker::add_berries_and_make_donut(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    //DonutMaker_Descriptor::Stats& stats = env.current_stats<DonutMaker_Descriptor::Stats>();
+
+    env.log("Checking berry count.");
+    std::vector<std::unique_ptr<DonutBerriesTableRow>> berries_table = BERRIES.copy_snapshot();
+    env.log("Number of berries validated.", COLOR_BLACK);
+
+    //Berries map for selection
+    std::map<std::string, uint8_t> processed_berries;
+    for (const std::unique_ptr<DonutBerriesTableRow>& row : berries_table){
+        const std::string& table_item = row->berry.slug();
+        processed_berries[table_item]++;
+    }
+
+    add_donut_berries(env.console, context, LANGUAGE, std::move(processed_berries));
+    animation_to_donut(env, context);
+}
+
+// Press A to talk to Ansha and keep pressing A until reach the berry selection menu
+void DonutMaker::open_berry_menu_from_ansha(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    DonutMaker_Descriptor::Stats& stats = env.current_stats<DonutMaker_Descriptor::Stats>();
+
+    // press button A to start talking to Ansha
+    pbf_press_button(context, BUTTON_A, 100ms, 200ms);
+    context.wait_for_all_requests();
+    
+    WallClock start = current_time();
+    while(current_time() - start <= Seconds(120)){
+        FlatWhiteDialogWatcher white_dialog(COLOR_WHITE, &env.console.overlay());
+        SelectionArrowWatcher arrow(
+            COLOR_GREEN, &env.console.overlay(),
+            SelectionArrowType::RIGHT,
+            {0.591, 0.579, 0.231, 0.105}
+        );
+        SelectionArrowWatcher dreams_alpha_delta(
+            COLOR_GREEN, &env.console.overlay(),
+            SelectionArrowType::RIGHT,
+            {0.591, 0.517, 0.231, 0.105}
+        );
+        SelectionArrowWatcher omega(
+            COLOR_GREEN, &env.console.overlay(),
+            SelectionArrowType::RIGHT,
+            {0.591, 0.450, 0.231, 0.105}
+        );
+        DonutBerriesSelectionWatcher berry_selection(0);
+
+        int ret = wait_until(
+            env.console, context,
+            std::chrono::seconds(30),
+            {
+                white_dialog,
+                arrow,
+                berry_selection,
+                dreams_alpha_delta,
+                omega,
+            }
+        );
+        switch (ret){
+        case 0:
+            env.log("Detected white dialog. Go to next dialog");
+            pbf_press_button(context, BUTTON_A, 100ms, 200ms);
+            break;
+        case 1:
+            env.log("Detected selection arrow. Go to next dialog");
+            pbf_press_button(context, BUTTON_A, 100ms, 200ms);
+            break;
+        case 2:
+            env.log("Berry selection menu shown.");
+            env.log_to_ui("Found Berry Selection Menu");
+            return;
+        case 3: case 4:
+            env.log("Detected selection arrow for Bad Dreams/Alpha/Omega/Delta recipe.");
+            pbf_press_dpad(context, DPAD_DOWN, 100ms, 200ms);
+            break;
+        default:
+            stats.errors++;
+            env.update_stats();
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "donut_maker(): Unable to detect white dialog, selection arrow or berry menu after talking to Ansha.",
+                env.console
+            );
+        } // end switch(ret)
+        context.wait_for_all_requests();
+    } // end while(true)
+
+    stats.errors++;
+    env.update_stats();
+    OperationFailedExceptionWithScreenshot::fire(
+        ErrorReportMode::SEND_ERROR_REPORT,
+        "donut_maker(): 2 minutes passed yet unable to reach berry menu after taking to Ansha.",
+        env.console
+    );
+}
+
+// Exit the game and load the backup save
+void load_backup_save(
+    SingleSwitchProgramEnvironment& env,
+    EventNotificationOption& recoverable_error,
+    ProControllerContext& context
+){
+    DonutMaker_Descriptor::Stats& stats = env.current_stats<DonutMaker_Descriptor::Stats>();
+
+    env.log("Loading backup save.");
+
+    while (true){
+        go_home(env.console, context);
+        if (reset_game_from_home(env, env.console, context, true)){
+            break;
+        }
+        stats.errors++;
+        env.update_stats();
+        send_program_recoverable_error_notification(
+            env,
+            recoverable_error,
+            "Failed to reset game from home.",
+            env.console.video().snapshot_latest_blocking()
+        );
+    }
+}
+
+void exit_menu_to_overworld(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    DonutMaker_Descriptor::Stats& stats = env.current_stats<DonutMaker_Descriptor::Stats>();
+
+    env.log("Exiting menu to overworld.");
+
+    OverworldPartySelectionWatcher overworld(COLOR_WHITE, &env.console.overlay());
+    int ret = run_until<ProControllerContext>(
+        env.console, context,
+        [&](ProControllerContext& context){
+            pbf_mash_button(context, BUTTON_B, Seconds(10));
+            pbf_wait(context, Seconds(30)); // 30 sec to wait out potential day night change
+        },
+        {overworld}
+    );
+    if (ret != 0){
+        stats.errors++;
+        env.update_stats();
+        OperationFailedExceptionWithScreenshot::fire(
+           ErrorReportMode::SEND_ERROR_REPORT,
+            "donut_maker(): Unable to find overworld after exiting menu.",
+            env.console
+        );
+    }
+}
+
+void reset_map_filter_state(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    env.log("Resetting fast travel map filters.");
+
+    open_map(env.console, context, true, false);
+    open_fast_travel_menu(env.console, context);
+    set_fast_travel_menu_filter(env.console, context, FAST_TRAVEL_FILTER::ALL_TRAVEL_SPOTS);
+
+    // Close out of map
+    exit_menu_to_overworld(env, context);
+    context.wait_for_all_requests();
+
+    // The filters should now be set to "Facilities" and hovering over Centrico Plaza
+    env.log("Fast travel map filters reset.");
+}
+
+// Move to in front of Ansha with button A shown
+void DonutMaker::move_to_ansha(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    DonutMaker_Descriptor::Stats& stats = env.current_stats<DonutMaker_Descriptor::Stats>();
+
+    FastTravelState travel_status = open_map_and_fly_to(env.console, context, LANGUAGE, Location::HOTEL_Z);
+    if (travel_status != FastTravelState::SUCCESS){
+        stats.errors++;
+        env.update_stats();
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "donut_maker(): Cannot fast travel to Hotel Z.",
+            env.console
+        );
+    }
+    context.wait_for(100ms); // Wait for player control to return
+    env.log("Detected overworld. Fast traveled to Hotel Zone");
+
+    int ret = run_towards_gate_with_A_button(env.console, context, 0, +1, Seconds(5));
+    if (ret == 1){  // day night change happens during running
+        // As day night change has ended, try running towards door again
+        if (run_towards_gate_with_A_button(env.console, context, 0, +1, Seconds(5)) != 0){
+            stats.errors++;
+            env.update_stats();
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "donut_maker(): Cannot reach Hotel Z gate after day/night change.",
+                env.console
+            );
+            // overworld.last_detected_frame()->save("debug_overworld_detection.png");
+        }
+    }else if (ret != 0){
+        stats.errors++;
+        env.update_stats();
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "donut_maker(): Cannot reach Hotel Z gate after fast travel.",
+            env.console
+        );
+        // overworld.last_detected_frame()->save("debug_overworld_detection.png");
+    }
+
+    // Mash button A to enter the hotel.
+    pbf_mash_button(context, BUTTON_A, Seconds(2));
+    context.wait_for_all_requests();
+    WallClock start_time = current_time();
+    // We use 50s here to account for day night change
+    wait_until_overworld(env.console, context, 50s);
+    env.console.log("Detected overworld after entering zone.");
+    WallClock end_time = current_time();
+    const auto duration = end_time - start_time;
+    // Due to day/night change may eating the mashing button A sequence, we may still be outside the hotel!
+    if (duration >= 10s){
+        // mash A again to make sure we are inside the hotel
+        pbf_mash_button(context, BUTTON_A, Seconds(2));
+        context.wait_for_all_requests();
+        wait_until_overworld(env.console, context, 50s);
+    }
+
+    
+    // we are now inside the hotel
+
+    // Roll forward twice
+    pbf_press_button(context, BUTTON_Y, 100ms, 1s);
+    pbf_press_button(context, BUTTON_Y, 100ms, 1s);
+    pbf_move_left_joystick(context, {-1, 0}, 500ms, 100ms);
+    context.wait_for_all_requests();
+}
+
+// Create a new backup save after making a donut to keep
+void DonutMaker::save_donut(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    // DonutMaker_Descriptor::Stats& stats = env.current_stats<DonutMaker_Descriptor::Stats>();
+
+    env.log("Creating new backup save to keep the last made donut.");
+
+    // Stop talking to Ansha
+    exit_menu_to_overworld(env, context);
+    context.wait_for_all_requests();
+}
+
+// Check if all user defined limits are reached or the global max keepers limit is reached
+bool DonutMaker::should_stop(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    const std::vector<uint16_t>& kept_counts,
+    uint16_t total_kept
+){
+    bool limit_reached = true;
+    for (size_t i = 0; i < kept_counts.size(); i++){
+        if (kept_counts[i] < FLAVOR_POWERS.snapshot()[i].limit){
+            limit_reached = false;
+        }
+    }
+    if (total_kept >= MAX_KEEPERS){
+        return true;
+    }
+    return limit_reached;
+}
+
+// Return true if a donut match is found
+bool DonutMaker::donut_iteration(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    std::vector<uint16_t>& kept_counts,
+    size_t& consecutive_ingredient_fails
+){
+    DonutMaker_Descriptor::Stats& stats = env.current_stats<DonutMaker_Descriptor::Stats>();
+
+    try{
+        move_to_ansha(env, context);
+
+        const ImageFloatBox button_A_box{0.3, 0.2, 0.4, 0.7};
+        ButtonWatcher buttonA(COLOR_RED, ButtonType::ButtonA, button_A_box, &env.console.overlay());
+        int ret = wait_until(env.console, context, std::chrono::seconds(3), {buttonA});
+        if (ret != 0){
+            env.log("donut_maker(): Unable to find button A facing Ansha.", COLOR_RED);
+        }
+
+        open_berry_menu_from_ansha(env, context);
+        // Add berries from menu and make a donut. Stop at flavor power screen.
+        add_berries_and_make_donut(env, context);
+        consecutive_ingredient_fails = 0;
+
+        // Read flavor power and check if they match user requirement and should be kept:
+        if (match_powers(env, context, kept_counts)){
+            return true;
+        }
+    }catch (BerryNotFoundException& e){
+        stats.errors++;
+        env.update_stats();
+        consecutive_ingredient_fails++;
+        if (consecutive_ingredient_fails >= 3){
+            throw;
+        }
+        send_program_recoverable_error_notification(
+            env,
+            NOTIFICATION_ERROR_RECOVERABLE,
+            e.message(),
+            env.console.video().snapshot_latest_blocking()
+        );
+
+    }catch (OperationFailedException& e){
+        stats.errors++;
+        env.update_stats();
+        send_program_recoverable_error_notification(
+            env,
+            NOTIFICATION_ERROR_RECOVERABLE,
+            e.message(),
+            env.console.video().snapshot_latest_blocking()
+        );
+    }
+
+
+    load_backup_save(env, NOTIFICATION_ERROR_RECOVERABLE, context);
+    return false;
+}
+
+
+void DonutMaker::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    DonutMaker_Descriptor::Stats& stats = env.current_stats<DonutMaker_Descriptor::Stats>();
+
+    assert_16_9_1080p_min(env.logger(), env.console);
+
+    if (LANGUAGE == Language::None){
+        throw UserSetupError(env.console, "Must set game language option to read berries and flavor powers.");
+    }
+
+    {
+        const std::vector<std::unique_ptr<DonutBerriesTableRow>> berries_table = BERRIES.copy_snapshot();
+        const size_t num_berries = berries_table.size();
+        if (num_berries < 3 || num_berries > 8){
+            throw UserSetupError(env.console, "Must have at least 3 berries and no more than 8 berries.");
+        }
+    }
+
+    //  Connect the controller.
+    require_player(env.console, context, BUTTON_B);
+
+    reset_map_filter_state(env, context);
+
+    std::vector<uint16_t> kept_counts(FLAVOR_POWERS.snapshot().size(), 0);
+    size_t consecutive_ingredient_fails = 0;
+    uint16_t total_kept = 0;
+    while (true){
+        const bool should_keep = donut_iteration(env, context, kept_counts, consecutive_ingredient_fails);
+        stats.resets++;
+        env.update_stats();
+        send_program_status_notification(env, NOTIFICATION_STATUS);
+
+        if (should_keep){
+            total_kept++;
+            if (should_stop(env, context, kept_counts, total_kept)){
+                break;
+            }
+            save_donut(env, context);
+        }
+    }
+
+    GO_HOME_WHEN_DONE.run_end_of_program(context);
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+}
+
+
+}  // namespace PokemonLZA
+}  // namespace NintendoSwitch
+}  // namespace PokemonAutomation
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_DonutMaker.h b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_DonutMaker.h
new file mode 100644
index 0000000000..699ccaa026
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_DonutMaker.h
@@ -0,0 +1,79 @@
+/*  Donut Maker
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLZA_DonutMaker_H
+#define PokemonAutomation_PokemonLZA_DonutMaker_H
+
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "CommonTools/Options/LanguageOCROption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+#include "VideoGames/PokemonLZA/Options/PokemonLZA_DonutBerriesOption.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+
+class DonutMaker_Descriptor : public SingleSwitchProgramDescriptor {
+public:
+    DonutMaker_Descriptor();
+
+    class Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+
+class DonutMaker : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = DonutMaker_Descriptor;
+    DonutMaker();
+
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    bool match_powers(
+        SingleSwitchProgramEnvironment& env,
+        ProControllerContext& context,
+        std::vector<uint16_t>& kept_counts
+    );
+    bool should_stop(
+        SingleSwitchProgramEnvironment& env,
+        ProControllerContext& context,
+        const std::vector<uint16_t>& kept_counts,
+        uint16_t total_kept
+    );
+    void animation_to_donut(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+    void add_berries_and_make_donut(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+    void open_berry_menu_from_ansha(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+    void move_to_ansha(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+    void save_donut(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+    bool donut_iteration(
+        SingleSwitchProgramEnvironment& env,
+        ProControllerContext& context,
+        std::vector<uint16_t>& kept_counts,
+        size_t& consecutive_ingredient_fails
+    );
+
+private:
+
+    OCR::LanguageOCROption LANGUAGE;
+    DonutBerriesTable BERRIES;
+    SimpleIntegerOption<uint16_t> MAX_KEEPERS;
+    FlavorPowerTable FLAVOR_POWERS;
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
+
+    EventNotificationOption NOTIFICATION_DONUT_FOUND;
+    EventNotificationOption NOTIFICATION_STATUS;
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_FriendshipFarmer.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_FriendshipFarmer.cpp
new file mode 100644
index 0000000000..76a3fdf8a5
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_FriendshipFarmer.cpp
@@ -0,0 +1,569 @@
+/*  Friendship Farmer
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "CommonTools/VisualDetectors/BlackScreenDetector.h"
+#include "CommonTools/StartupChecks/VideoResolutionCheck.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonLZA/Inference/PokemonLZA_ButtonDetector.h"
+#include "VideoGames/PokemonLZA/Inference/PokemonLZA_DialogDetector.h"
+#include "VideoGames/PokemonLZA/Inference/PokemonLZA_OverworldPartySelectionDetector.h"
+#include "VideoGames/PokemonLZA/Inference/PokemonLZA_SelectionArrowDetector.h"
+#include "PokemonLZA_FriendshipFarmer.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+FriendshipFarmer_Descriptor::FriendshipFarmer_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonLZA:FriendshipFarmer",
+        Pokemon::STRING_POKEMON + " LZA", "Friendship Farmer",
+        "Programs/PokemonLZA/FriendshipFarmer.html",
+        "Farm friendship for pokemon in your party using either the cafe or bench method.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{
+}
+
+class FriendshipFarmer_Descriptor::Stats : public StatsTracker{
+public:
+    Stats()
+        : drinks_shared(m_stats["Drinks Shared"])
+        , hang_out_sessions(m_stats["Hang Out Sessions"])
+        , errors(m_stats["Errors"])
+    {
+        m_display_order.emplace_back("Drinks Shared");
+        m_display_order.emplace_back("Hang Out Sessions");
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+    }
+
+    std::atomic<uint64_t>& drinks_shared;
+    std::atomic<uint64_t>& hang_out_sessions;
+    std::atomic<uint64_t>& errors;
+};
+
+std::unique_ptr<StatsTracker> FriendshipFarmer_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+FriendshipFarmer::~FriendshipFarmer(){
+    FARMING_OPTION.remove_listener(*this);
+}
+
+FriendshipFarmer::FriendshipFarmer()
+    : FARMING_OPTION(
+        "<b>Farming Method</b>",
+        {
+            { FarmingOption::Cafe, "Cafe", "Share drinks at a Cafe" },
+            { FarmingOption::Bench, "Bench", "Hangout on a bench" }
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        FarmingOption::Cafe
+    )
+    , FRIENDSHIP_AMOUNT(
+        "<b>Friendship Amount</b>",
+        {
+            { FriendshipAmount::Evolve, "Evolve", "Increase friendship until pokemon can evolve." },
+            { FriendshipAmount::Max, "Max", "Increase friendship to maximum." }
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        FriendshipAmount::Evolve
+    )
+    , NUM_PARTY_MEMBERS(
+        "<b>Number of Party Members:</b><br><i>Only used for Cafe Method</i>",
+        LockMode::LOCK_WHILE_RUNNING,
+        6, 1, 6
+    )
+    , GO_HOME_WHEN_DONE(false)
+    , NOTIFICATION_STATUS_OPTION("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_STATUS_OPTION,
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+{
+    PA_ADD_OPTION(FARMING_OPTION);
+    PA_ADD_OPTION(FRIENDSHIP_AMOUNT);
+    PA_ADD_OPTION(NUM_PARTY_MEMBERS);
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+    PA_ADD_OPTION(NOTIFICATIONS);
+
+    FriendshipFarmer::on_config_value_changed(this);
+
+    FARMING_OPTION.add_listener(*this);
+}
+
+void FriendshipFarmer::on_config_value_changed(void* object){
+    if (FARMING_OPTION == FarmingOption::Cafe){
+        NUM_PARTY_MEMBERS.set_visibility(ConfigOptionState::ENABLED);
+    }else{
+        NUM_PARTY_MEMBERS.set_visibility(ConfigOptionState::HIDDEN);
+    }
+}
+
+void FriendshipFarmer::enter_cafe(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    FriendshipFarmer_Descriptor::Stats& stats = env.current_stats<FriendshipFarmer_Descriptor::Stats>();
+
+    bool seen_selection_arrow = false;
+
+    while (true)
+    {
+        ButtonWatcher buttonA_watcher(
+            COLOR_WHITE,
+            ButtonType::ButtonA,
+            { 0.1, 0.1, 0.8, 0.8 },
+            &env.console.overlay()
+        );
+        ButtonWatcher buttonB_watcher(
+            COLOR_WHITE,
+            ButtonType::ButtonB,
+            { 0.911, 0.939, 0.019, 0.033 },
+            &env.console.overlay()
+        );
+        SelectionArrowWatcher selection_arrow_watcher(
+            COLOR_GREEN, &env.console.overlay(),
+            SelectionArrowType::RIGHT,
+            { 0.6300, 0.153, 0.2260, 0.627 }
+        );
+        FlatWhiteDialogWatcher white_dialog_watcher(COLOR_WHITE, &env.console.overlay());
+        BlueDialogWatcher blue_dialog_watcher(COLOR_BLUE, &env.console.overlay());
+        BlackScreenOverWatcher black_screen(COLOR_BLUE);
+
+        int ret = wait_until(
+            env.console, context,
+            10000ms,
+            {
+                buttonA_watcher,
+                buttonB_watcher,
+                selection_arrow_watcher,
+                white_dialog_watcher,
+                blue_dialog_watcher,
+                black_screen
+            }
+        );
+        context.wait_for(100ms);
+
+        OverworldPartySelectionWatcher overworld(COLOR_WHITE, &env.console.overlay());
+        int ret2 = 0;
+
+        switch (ret){
+        case 0:
+            env.log("Detected A button.");
+            pbf_press_button(context, BUTTON_A, 80ms, 40ms);
+            continue;
+        case 1:
+            env.log("Detected B button.");
+            pbf_press_button(context, BUTTON_B, 80ms, 40ms);
+            return;
+        case 2:
+            env.log("Detected selection arrow.");
+            seen_selection_arrow = true;
+            pbf_press_button(context, BUTTON_A, 80ms, 40ms);
+            continue;
+        case 3:
+            env.log("Detected white dialog.");
+            pbf_press_button(context, BUTTON_A, 80ms, 40ms);
+            continue;
+        case 4:
+            env.log("Detected blue dialog.");
+            pbf_press_button(context, BUTTON_A, 80ms, 40ms);
+            continue;
+        case 5:
+            if (seen_selection_arrow){
+                env.log("Detected loading screen. Entering cafe.");
+                continue;
+            }
+
+            env.log("Detected day change.");
+            ret2 = wait_until(
+                env.console, context,
+                30s,
+                { overworld }
+            );
+
+            if (ret2 == 0){
+                env.log("Returned to overworld.");
+                continue;
+            }
+
+            ++stats.errors;
+            env.update_stats();
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "enter_cafe(): Unable to detect overworld after day/night change.",
+                env.console
+            );
+        default:
+            ++stats.errors;
+            env.update_stats();
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "enter_cafe(): No recognized state after 10 seconds.",
+                env.console
+            );
+        }
+    }
+}
+
+void FriendshipFarmer::exit_bench(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    FriendshipFarmer_Descriptor::Stats& stats = env.current_stats<FriendshipFarmer_Descriptor::Stats>();
+
+    int reset_attempt = 0;
+    bool seen_selection_arrow = false;
+
+    while (true)
+    {
+        ButtonWatcher buttonA_watcher(
+            COLOR_WHITE,
+            ButtonType::ButtonA,
+            { 0.1, 0.1, 0.8, 0.8 },
+            &env.console.overlay()
+        );
+        SelectionArrowWatcher selection_arrow_watcher(
+            COLOR_GREEN, &env.console.overlay(),
+            SelectionArrowType::RIGHT,
+            { 0.6300, 0.4440, 0.2260, 0.3190 }
+        );
+        FlatWhiteDialogWatcher white_dialog_watcher(COLOR_WHITE, &env.console.overlay());
+        BlueDialogWatcher blue_dialog_watcher(COLOR_RED, &env.console.overlay());
+        BlackScreenOverWatcher black_screen(COLOR_BLUE);
+
+        int ret = wait_until(
+            env.console, context,
+            10000ms,
+            {
+                buttonA_watcher,
+                selection_arrow_watcher,
+                white_dialog_watcher,
+                blue_dialog_watcher,
+                black_screen
+            }
+        );
+        context.wait_for(100ms);
+
+        OverworldPartySelectionWatcher overworld(COLOR_WHITE, &env.console.overlay());
+        int ret2 = 0;
+
+        switch (ret){
+        case 0:
+            env.log("Detected A button.");
+            return;
+        case 1:
+            env.log("Detected selection arrow.");
+            seen_selection_arrow = true;
+            pbf_press_button(context, BUTTON_A, 80ms, 40ms);
+            continue;
+        case 3:
+            env.log("Detected white dialog.");
+            pbf_press_button(context, BUTTON_A, 80ms, 40ms);
+            continue;
+        case 4:
+            env.log("Detected blue dialog.");
+            pbf_press_button(context, BUTTON_A, 80ms, 40ms);
+            continue;
+        case 5:
+            env.log("Detected day change.");
+            ret2 = wait_until(
+                env.console, context,
+                30s,
+                {overworld}
+            );
+
+            if (ret2 == 0){
+                env.log("Returned to overworld.");
+                continue;
+            }
+
+            ++stats.errors;
+            env.update_stats();
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "exit_bench(): Unable to detect overworld after day/night change.",
+                env.console
+            );
+        default:
+            if (seen_selection_arrow && ++reset_attempt <= 10){
+                env.log("Attempting to face the bench.");
+                pbf_move_left_joystick(context, {0, +1}, 250ms, 0ms);
+                continue;
+            }
+
+            ++stats.errors;
+            env.update_stats();
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "exit_bench(): No recognized state after 10 seconds.",
+                env.console
+            );
+        }
+    }
+}
+
+void FriendshipFarmer::exit_cafe(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    FriendshipFarmer_Descriptor::Stats& stats = env.current_stats<FriendshipFarmer_Descriptor::Stats>();
+
+    while (true){
+        ButtonWatcher buttonA_watcher(
+            COLOR_WHITE,
+            ButtonType::ButtonA,
+            { 0.1, 0.1, 0.8, 0.8 },
+            &env.console.overlay()
+        );
+        SelectionArrowWatcher selection_arrow_watcher(
+            COLOR_GREEN, &env.console.overlay(),
+            SelectionArrowType::RIGHT,
+            { 0.6300, 0.4440, 0.2260, 0.3190 }
+        );
+        FlatWhiteDialogWatcher white_dialog_watcher(COLOR_WHITE, &env.console.overlay());
+        BlueDialogWatcher blue_dialog_watcher(COLOR_RED, &env.console.overlay());
+        BlackScreenOverWatcher black_screen(COLOR_BLUE);
+
+        int ret = wait_until(
+            env.console, context,
+            10000ms,
+            {
+                buttonA_watcher,
+                selection_arrow_watcher,
+                white_dialog_watcher,
+                blue_dialog_watcher,
+                black_screen
+            }
+        );
+        context.wait_for(100ms);
+
+        OverworldPartySelectionWatcher overworld(COLOR_WHITE, &env.console.overlay());
+        int ret2 = 0;
+
+        switch (ret){
+        case 0:
+            env.log("Detected A button.");
+            return;
+        case 1:
+            env.log("Detected selection arrow.");
+            pbf_press_button(context, BUTTON_A, 80ms, 40ms);
+            continue;
+        case 3:
+            env.log("Detected white dialog.");
+            pbf_press_button(context, BUTTON_A, 80ms, 40ms);
+            continue;
+        case 4:
+            env.log("Detected blue dialog.");
+            pbf_press_button(context, BUTTON_A, 80ms, 40ms);
+            continue;
+        case 5:
+            env.log("Detected loading screen while leaving cafe caused by day/night change. Waiting..");
+            ret2 = wait_until(
+                env.console, context,
+                30s,
+                { overworld }
+            );
+
+            if (ret2 == 0){
+                env.log("Returned to overworld.");
+                continue;
+            }
+
+            ++stats.errors;
+            env.update_stats();
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "exit_cafe(): Unable to detect overworld after day/night change.",
+                env.console
+            );
+        default:
+            ++stats.errors;
+            env.update_stats();
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "exit_cafe(): No recognized state after 10 seconds.",
+                env.console
+            );
+        }
+    }
+}
+
+void FriendshipFarmer::hang_out_bench(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    FriendshipFarmer_Descriptor::Stats& stats = env.current_stats<FriendshipFarmer_Descriptor::Stats>();
+
+    bool seen_selection_arrow = false;
+    while (true){
+        ButtonWatcher buttonA_watcher(
+            COLOR_WHITE,
+            ButtonType::ButtonA,
+            { 0.1, 0.1, 0.8, 0.8 },
+            &env.console.overlay()
+        );
+        ButtonWatcher buttonB_watcher(
+            COLOR_WHITE,
+            ButtonType::ButtonB,
+            { 0.902, 0.937, 0.022, 0.038 },
+            &env.console.overlay()
+        );
+        SelectionArrowWatcher selection_arrow_watcher(
+            COLOR_GREEN, &env.console.overlay(),
+            SelectionArrowType::RIGHT,
+            { 0.6300, 0.4440, 0.2260, 0.3190 }
+        );
+        FlatWhiteDialogWatcher white_dialog_watcher(COLOR_WHITE, &env.console.overlay());
+        BlueDialogWatcher blue_dialog_watcher(COLOR_BLUE, &env.console.overlay());
+        BlackScreenOverWatcher black_screen(COLOR_BLUE);
+
+        int ret = wait_until(
+            env.console, context,
+            10000ms,
+            {
+                buttonA_watcher,
+                buttonB_watcher,
+                selection_arrow_watcher,
+                white_dialog_watcher,
+                blue_dialog_watcher,
+                black_screen
+            }
+        );
+        context.wait_for(100ms);
+
+        OverworldPartySelectionWatcher overworld(COLOR_WHITE, &env.console.overlay());
+        int ret2 = 0;
+
+        switch (ret){
+        case 0:
+            env.log("Detected A button.");
+            pbf_press_button(context, BUTTON_A, 80ms, 40ms);
+            continue;
+        case 1:
+            env.log("Detected B button. Waiting 10 Seconds."); //Wait 10 seconds to gain friendship points.
+            context.wait_for(10000ms);
+            pbf_press_button(context, BUTTON_B, 80ms, 40ms);
+            return;
+        case 2:
+            env.log("Detected selection arrow.");
+            seen_selection_arrow = true;
+            //Select second option to hang out on bench.
+            pbf_press_dpad(context, DPAD_DOWN, 40ms, 40ms);
+            pbf_press_button(context, BUTTON_A, 80ms, 40ms);
+            continue;
+        case 3:
+            env.log("Detected white dialog.");
+            pbf_press_button(context, BUTTON_A, 80ms, 40ms);
+            continue;
+        case 4:
+            env.log("Detected blue dialog.");
+            pbf_press_button(context, BUTTON_A, 80ms, 40ms);
+            continue;
+        case 5:
+            if (seen_selection_arrow){
+                env.log("Detected loading screen. Hanging out on bench.");
+                continue;
+            }
+
+            env.log("Detected day change.");
+            ret2 = wait_until(
+                env.console, context,
+                30s,
+                { overworld }
+            );
+
+            if (ret2 == 0){
+                env.log("Returned to overworld.");
+                continue;
+            }
+
+            ++stats.errors;
+            env.update_stats();
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "hang_out_bench(): Unable to detect overworld after day/night change.",
+                env.console
+            );
+        default:
+            ++stats.errors;
+            env.update_stats();
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "hang_out_bench(): No recognized state after 10 seconds.",
+                env.console
+            );
+        }
+    }
+}
+
+void FriendshipFarmer::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    assert_16_9_720p_min(env.logger(), env.console);
+
+    //  Connect the controller.
+    require_player(env.console, context, BUTTON_L);
+
+    FriendshipFarmer_Descriptor::Stats& stats = env.current_stats<FriendshipFarmer_Descriptor::Stats>();
+
+    if (FARMING_OPTION.get() == FarmingOption::Cafe){
+        env.log("Cafe Method Started");
+
+        for (int i = 0; i < NUM_PARTY_MEMBERS; ++i){
+            int drinks_needed;
+
+            //Each drink at cafe gives 30 friendship points.
+            //Evolve = 160 points = 5.33 drinks
+            //Max = 255 points = 8.5 drinks
+            if (FRIENDSHIP_AMOUNT.get() == FriendshipAmount::Evolve){
+                drinks_needed = 6;
+            }else{
+                drinks_needed = 9;
+            }
+
+            for (int d = 0; d < drinks_needed; ++d){
+                enter_cafe(env, context);
+                exit_cafe(env, context);
+
+                ++stats.drinks_shared;
+                env.update_stats();
+            }
+
+            env.log("Switching to next Party Member");
+            pbf_press_dpad(context, DPAD_RIGHT, 40ms, 40ms);
+            context.wait_for(100ms);
+        }
+
+        env.log("Cafe Method Finished");
+    }else{
+        env.log("Bench Method Started");
+        int hang_outs_needed;
+
+        //Each hangout on bench gives 10 friendship points.
+        // Evolve = 160 points = 16 hangouts
+        // Max = 255 points = 26 hangouts
+        if (FRIENDSHIP_AMOUNT.get() == FriendshipAmount::Evolve){
+            hang_outs_needed = 16;
+        }else{
+            hang_outs_needed = 26;
+        }
+
+        for (int i = 0; i < hang_outs_needed; ++i){
+            hang_out_bench(env, context);
+            exit_bench(env, context);
+
+            ++stats.hang_out_sessions;
+            env.update_stats();
+        }
+    }
+
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+    GO_HOME_WHEN_DONE.run_end_of_program(context);
+}
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_FriendshipFarmer.h b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_FriendshipFarmer.h
new file mode 100644
index 0000000000..0d9c0eb308
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_FriendshipFarmer.h
@@ -0,0 +1,63 @@
+/*  Friendship Farmer
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLZA_FriendshipFarmer_H
+#define PokemonAutomation_PokemonLZA_FriendshipFarmer_H
+
+#include <memory>
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+class FriendshipFarmer_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    FriendshipFarmer_Descriptor();
+
+    class Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+class FriendshipFarmer : public SingleSwitchProgramInstance, public ConfigOption::Listener{
+public:
+    using Descriptor = FriendshipFarmer_Descriptor;
+    ~FriendshipFarmer();
+    FriendshipFarmer();
+
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    void enter_cafe(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+    void exit_bench(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+    void exit_cafe(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+    void hang_out_bench(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+
+    virtual void on_config_value_changed(void* object) override;
+
+    enum class FarmingOption{
+        Cafe,
+        Bench
+    };
+    enum class FriendshipAmount{
+        Evolve,
+        Max
+    };
+    EnumDropdownOption<FarmingOption> FARMING_OPTION;
+    EnumDropdownOption<FriendshipAmount> FRIENDSHIP_AMOUNT;
+    SimpleIntegerOption<uint8_t> NUM_PARTY_MEMBERS;
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
+    EventNotificationOption NOTIFICATION_STATUS_OPTION;
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_HyperspaceRewardReset.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_HyperspaceRewardReset.cpp
new file mode 100644
index 0000000000..30963acac4
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_HyperspaceRewardReset.cpp
@@ -0,0 +1,234 @@
+/*  Hyperspace Reward Reset
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonTools/Images/ImageFilter.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "CommonTools/StartupChecks/VideoResolutionCheck.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonLZA/Programs/PokemonLZA_GameEntry.h"
+#include "VideoGames/PokemonLZA/Inference/PokemonLZA_ButtonDetector.h"
+#include "VideoGames/PokemonLZA/Inference/PokemonLZA_DialogDetector.h"
+#include "VideoGames/PokemonLZA/Inference/PokemonLZA_HyperspaceRewardNameReader.h"
+#include "VideoGames/PokemonLZA/Resources/PokemonLZA_HyperspaceRewardNames.h"
+#include "PokemonLZA_HyperspaceRewardReset.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+using namespace Pokemon;
+
+HyperspaceRewardReset_Descriptor::HyperspaceRewardReset_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonLZA:HyperspaceRewardReset",
+        STRING_POKEMON + " LZA", "Hyperspace Reward Reset",
+        "Programs/PokemonLZA/HyperspaceRewardReset.html",
+        "Reset in front of a Hyperspace Battle Zone trainer to receive a specific reward.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+struct HyperspaceRewardReset_Descriptor::Stats : public StatsTracker{
+    Stats()
+        : matches(m_stats["Items matched"])
+        , resets(m_stats["Resets"])
+        , errors(m_stats["Errors"])
+    {
+        m_display_order.emplace_back("Items matched");
+        m_display_order.emplace_back("Resets");
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+    }
+    std::atomic<uint64_t>& matches;
+    std::atomic<uint64_t>& resets;
+    std::atomic<uint64_t>& errors;
+};
+std::unique_ptr<StatsTracker> HyperspaceRewardReset_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+HyperspaceRewardReset::HyperspaceRewardReset()
+    : LANGUAGE(
+        "<b>Game Language:</b><br>The language is needed to read the rewards.",
+        HyperspaceRewardNameReader::instance().languages(),
+        LockMode::LOCK_WHILE_RUNNING,
+        true
+    )
+    , TARGET_ITEMS("<b>Items:</b>")
+    , NOTIFICATION_REWARD_MATCH("Matching Reward", true, false, ImageAttachmentMode::JPG, { "Notifs" })
+    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_REWARD_MATCH,
+        &NOTIFICATION_STATUS_UPDATE,
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+{
+    PA_ADD_OPTION(LANGUAGE);
+    PA_ADD_OPTION(TARGET_ITEMS);
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+void HyperspaceRewardReset::talk_to_trainer(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    HyperspaceRewardReset_Descriptor::Stats& stats = env.current_stats<HyperspaceRewardReset_Descriptor::Stats>();
+
+    bool exit = false;
+    while (!exit){
+        context.wait_for_all_requests();
+
+        ButtonWatcher buttonA_watcher(
+            COLOR_WHITE,
+            ButtonType::ButtonA,
+            {0.1, 0.1, 0.8, 0.8},
+            &env.console.overlay()
+        );
+        //First dialog box varies by trainer (hologram, regular, etc.)
+        BlueDialogWatcher blue_dialog_watcher(COLOR_BLUE, &env.console.overlay()); //Item received (not the big box)
+        FlatWhiteDialogWatcher white_dialog_watcher(COLOR_WHITE, &env.console.overlay()); //Non-hologram
+        LightBlueDialogWatcher light_blue_dialog_watcher(COLOR_WHITE, &env.console.overlay()); //hologram
+        
+        int ret = wait_until(
+            env.console, context,
+            10s,
+            {
+                buttonA_watcher,
+                blue_dialog_watcher,
+                white_dialog_watcher,
+                light_blue_dialog_watcher,
+            }
+        );
+        context.wait_for(100ms);
+
+        switch (ret){
+        case 0:
+            env.log("Detected A button.");
+            pbf_press_button(context, BUTTON_A, 80ms, 40ms);
+            continue;
+        case 1:
+            env.log("Detected item received dialog.");
+            exit = true;
+            break;
+        case 2:
+            env.log("Detected white dialog.");
+            pbf_press_button(context, BUTTON_A, 80ms, 40ms);
+            continue;
+        case 3:
+            env.log("Detected light blue dialog.");
+            pbf_press_button(context, BUTTON_A, 80ms, 40ms);
+            continue;
+        default:
+            stats.errors++;
+            env.update_stats();
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "talk_to_trainer(): Failed to detect blue item received dialog.",
+                env.console
+            );
+        }
+    }
+}
+
+//Check reward and notify if it matches filters
+bool HyperspaceRewardReset::check_reward(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    HyperspaceRewardReset_Descriptor::Stats& stats = env.current_stats<HyperspaceRewardReset_Descriptor::Stats>();
+
+    VideoSnapshot screen = env.console.video().snapshot();
+    ImageFloatBox dialog_box(0.248, 0.792, 0.483, 0.147);
+    ImageViewRGB32 dialog_image = extract_box_reference(screen, dialog_box);
+
+    /*
+    bool replace_color_within_range = false;
+    ImageRGB32 dialog_filtered = filter_rgb32_range(
+        extract_box_reference(screen, dialog_box),
+        combine_rgb(50, 135, 162), combine_rgb(167, 244, 255), Color(0), replace_color_within_range
+    );
+    dialog_filtered.save("./dialog_image.png");
+    */
+
+    const double LOG10P_THRESHOLD = -1.5;
+    OCR::StringMatchResult result = PokemonLZA::HyperspaceRewardNameReader::instance().read_substring(
+        env.console, LANGUAGE, dialog_image,
+        OCR::BLUE_TEXT_FILTERS()
+    );
+    result.clear_beyond_log10p(LOG10P_THRESHOLD);
+    if (result.results.empty()){
+        env.log("No matching reward name found in dialog box.");
+        send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
+    }
+    for (const auto& r : result.results){
+        env.console.log("Found reward: " + r.second.token);
+        if (TARGET_ITEMS.find_item(r.second.token)){
+            env.log("Reward Matched");
+
+            stats.matches++;
+            env.update_stats();
+
+            send_program_notification(
+                env, NOTIFICATION_REWARD_MATCH,
+                COLOR_GREEN, "Reward Matched",
+                {
+                    { "Item:", get_hyperspace_reward_name(r.second.token).display_name() },
+                }
+            , "", screen);
+            return true;
+            break;
+        }
+    }
+    return false;
+}
+
+void HyperspaceRewardReset::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    assert_16_9_720p_min(env.logger(), env.console);
+
+    //  Connect the controller.
+    require_player(env.console, context, BUTTON_L);
+
+    HyperspaceRewardReset_Descriptor::Stats& stats = env.current_stats<HyperspaceRewardReset_Descriptor::Stats>();
+
+    /*
+    * In a Hyperspace Battle Zone:
+    * Win a battle with a trainer that gives a prize.
+    * Save the game and reset. Do not talk to the trainer.
+    * (Reset is required because trainer position will move.)
+    * Re-enter the game and then save again, this time in front of the trainer.
+    * Start the program.
+    * 
+    * Make sure you won't be spotted by another trainer.
+    */
+
+    bool item_found = false;
+    while (!item_found){
+        send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
+
+        talk_to_trainer(env, context);
+        item_found = check_reward(env, context);
+
+        if (item_found){
+            break;
+        }
+
+        go_home(env.console, context);
+        reset_game_from_home(env, env.console, context);
+        stats.resets++;
+        env.update_stats();
+    }
+
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+    go_home(env.console, context);
+}
+
+}
+}
+}
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_HyperspaceRewardReset.h b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_HyperspaceRewardReset.h
new file mode 100644
index 0000000000..9926cc5963
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_HyperspaceRewardReset.h
@@ -0,0 +1,50 @@
+/*  Hyperspace Reward Reset
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLZA_HyperspaceRewardReset_H
+#define PokemonAutomation_PokemonLZA_HyperspaceRewardReset_H
+
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "CommonTools/Options/LanguageOCROption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "VideoGames/PokemonLZA/Options/PokemonLZA_HyperspaceRewardTable.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+class HyperspaceRewardReset_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    HyperspaceRewardReset_Descriptor();
+    struct Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+class HyperspaceRewardReset : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = HyperspaceRewardReset_Descriptor;
+    HyperspaceRewardReset();
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    OCR::LanguageOCROption LANGUAGE;
+    HyperspaceRewardTable TARGET_ITEMS;
+
+    EventNotificationOption NOTIFICATION_REWARD_MATCH;
+    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
+    EventNotificationsOption NOTIFICATIONS;
+
+    void talk_to_trainer(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+    bool check_reward(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+};
+
+}
+}
+}
+#endif
+
+
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_InPlaceCatcher.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_InPlaceCatcher.cpp
new file mode 100644
index 0000000000..4d6f3a1097
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_InPlaceCatcher.cpp
@@ -0,0 +1,279 @@
+/*  In-Place Catcher
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+//#include "CommonTools/Async/InferenceSession.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonLA/Inference/Sounds/PokemonLA_ShinySoundDetector.h"
+#include "VideoGames/PokemonLZA/Inference/PokemonLZA_DialogDetector.h"
+#include "VideoGames/PokemonLZA/Inference/PokemonLZA_DayNightChangeDetector.h"
+#include "VideoGames/PokemonLZA/Inference/PokemonLZA_AlertEyeDetector.h"
+#include "VideoGames/PokemonLZA/Inference/PokemonLZA_OverworldPartySelectionDetector.h"
+#include "VideoGames/PokemonLZA/Inference/Battles/PokemonLZA_MoveEffectivenessSymbol.h"
+#include "VideoGames/PokemonLZA/Programs/PokemonLZA_GameEntry.h"
+#include "VideoGames/PokemonLZA/Programs/PokemonLZA_TrainerBattle.h"
+#include "PokemonLZA_InPlaceCatcher.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+using namespace std::chrono;
+
+
+
+InPlaceCatcher_Descriptor::InPlaceCatcher_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonLZA:InPlaceCatcher",
+        Pokemon::STRING_POKEMON + " LZA", "In-Place Catcher",
+        "Programs/PokemonLZA/InPlaceCatcher.html",
+        "Stand in one spot and catch everything that spawns nearby. "
+        "Useful for filling up your boxes for the purpose of running Floette "
+        "stats reset or to mass transfer " + Pokemon::STRING_POKEMON + " between saves via Box Trade.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{
+}
+
+class InPlaceCatcher_Descriptor::Stats : public StatsTracker{
+public:
+    Stats()
+        : balls_thrown(m_stats["Balls Thrown"])
+        , attacks_fired(m_stats["Attacks Launched"])
+        , day_changes(m_stats["Day/Night Changes"])
+        , deaths(m_stats["Day/Night Changes"])
+        , shinies(m_stats["Shinies"])
+        , errors(m_stats["Errors"])
+    {
+        m_display_order.emplace_back("Balls Thrown");
+        m_display_order.emplace_back("Attacks Launched");
+        m_display_order.emplace_back("Day/Night Changes");
+        m_display_order.emplace_back("Deaths", HIDDEN_IF_ZERO);
+        m_display_order.emplace_back("Shinies", HIDDEN_IF_ZERO);
+        m_display_order.emplace_back("Deaths", HIDDEN_IF_ZERO);
+    }
+
+    std::atomic<uint64_t>& balls_thrown;
+    std::atomic<uint64_t>& attacks_fired;
+    std::atomic<uint64_t>& day_changes;
+    std::atomic<uint64_t>& deaths;
+    std::atomic<uint64_t>& shinies;
+    std::atomic<uint64_t>& errors;
+};
+std::unique_ptr<StatsTracker> InPlaceCatcher_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+
+
+InPlaceCatcher::InPlaceCatcher()
+    : MAX_BALLS(
+        "<b>Max Balls:</b><br>Maximum number of balls to throw before stopping.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        100, 1, 999
+    )
+    , SHINY_DETECTED(
+        "Shiny Detected", "",
+        "2000 ms",
+        ShinySoundDetectedAction::STOP_PROGRAM
+    )
+    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_STATUS_UPDATE,
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+{
+    PA_ADD_OPTION(MAX_BALLS);
+    PA_ADD_STATIC(SHINY_REQUIRES_AUDIO);
+    PA_ADD_OPTION(SHINY_DETECTED);
+    PA_ADD_OPTION(BATTLE_AI);
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+
+void InPlaceCatcher::day_night_handler(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    InPlaceCatcher_Descriptor::Stats& stats = env.current_stats<InPlaceCatcher_Descriptor::Stats>();
+
+    env.log("Detected day/night change.", COLOR_BLUE);
+    stats.day_changes++;
+    env.update_stats();
+
+    OverworldPartySelectionWatcher overworld(COLOR_RED, &env.console.overlay());
+    BlueDialogWatcher dialog(COLOR_BLUE, &env.console.overlay());
+    int ret = wait_until(
+        env.console, context,
+        120s,
+        {
+            overworld,
+            dialog,
+        }
+    );
+    switch (ret){
+    case 0:
+        return;
+
+    case 1:
+        env.log("You died... Resetting game.", COLOR_RED);
+        stats.deaths++;
+        env.update_stats();
+        go_home(env.console, context);
+        reset_game_from_home(env, env.console, context);
+        return;
+
+    default:
+        stats.errors++;
+        env.update_stats();
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "Unable to detect end of day/night change after 2 minutes.",
+            env.console
+        );
+    }
+
+}
+void InPlaceCatcher::run(
+    SingleSwitchProgramEnvironment& env, ProControllerContext& context,
+    AlertEyeTracker& attack_tracker,
+    ShinySoundHandler& shiny_sound_handler
+){
+    InPlaceCatcher_Descriptor::Stats& stats = env.current_stats<InPlaceCatcher_Descriptor::Stats>();
+
+    WallClock last_attack = WallClock::min();
+    while (stats.balls_thrown.load(std::memory_order_relaxed) < MAX_BALLS){
+        env.update_stats();
+        send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
+
+        MoveEffectivenessSymbolWatcher battle_menu(COLOR_RED, &env.console.overlay(), 100ms);
+        DayNightChangeWatcher day_night(COLOR_RED);
+        BlueDialogWatcher dialog(COLOR_BLUE, &env.console.overlay());
+
+        context.wait_for_all_requests();
+        shiny_sound_handler.process_pending(context);
+
+        int ret = run_until<ProControllerContext>(
+            env.console, context,
+            [](ProControllerContext& context){
+                while (true){
+                    for (int c = 0; c < 10; c++){
+                        ssf_press_right_joystick(context, {-0.5, 0}, 0ms, 1000ms, 0ms);
+                        ssf_press_dpad(context, DpadPosition::DPAD_UP, 0ms, 160ms, 160ms);
+                        pbf_mash_button(context, BUTTON_ZL, 1000ms);
+                        pbf_press_button(context, BUTTON_ZL, 500ms, 0ms);
+                    }
+                    pbf_press_button(context, BUTTON_L, 160ms, 160ms);
+                }
+            },
+            {
+                battle_menu,
+                day_night,
+                dialog,
+            }
+        );
+        context.wait_for(100ms);
+
+        switch (ret){
+        case 0:
+            break;
+
+        case 1:
+            day_night_handler(env, context);
+            continue;
+
+        case 2:
+            env.log("You died... Resetting game.", COLOR_RED);
+            stats.deaths++;
+            env.update_stats();
+            go_home(env.console, context);
+            reset_game_from_home(env, env.console, context);
+            continue;
+        }
+
+        if (!attack_tracker.currently_active() || last_attack + 5000ms > current_time()){
+            env.log("Detected battle menu. Throwing ball...", COLOR_BLUE);
+            pbf_press_button(
+                context,
+                BUTTON_ZL | BUTTON_ZR,
+                500ms, 3500ms
+            );
+            pbf_press_button(context, BUTTON_L, 160ms, 160ms);
+            stats.balls_thrown++;
+            env.update_stats();
+            continue;
+        }
+
+        env.log("Detected battle menu while under attack! Launching attack...", COLOR_ORANGE);
+        context.wait_for(500ms);
+
+        TrainerBattleState state(BATTLE_AI);
+        if (state.attempt_one_attack(env, env.console, context)){
+            last_attack = current_time();
+            stats.attacks_fired++;
+            env.update_stats();
+            pbf_wait(context, 2000ms);
+        }else{
+            env.log("Unable to lock-on for attack.", COLOR_RED);
+        }
+    }
+}
+
+void InPlaceCatcher::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    InPlaceCatcher_Descriptor::Stats& stats = env.current_stats<InPlaceCatcher_Descriptor::Stats>();
+
+    //  Connect the controller.
+    require_player(env.console, context, BUTTON_L);
+
+    AlertEyeTracker attack_tracker(COLOR_BLUE, &env.console.overlay(), 5000ms);
+
+    ShinySoundHandler shiny_sound_handler(SHINY_DETECTED);
+
+    PokemonLA::ShinySoundDetector shiny_detector(env.console, [&](float error_coefficient) -> bool{
+        //  Warning: This callback will be run from a different thread than this function.
+        stats.shinies++;
+        env.update_stats();
+        env.console.overlay().add_log("Shiny Sound Detected!", COLOR_YELLOW);
+        return shiny_sound_handler.on_shiny_sound(
+            env, env.console,
+            stats.shinies,
+            error_coefficient
+        );
+    });
+
+    run_until<ProControllerContext>(
+        env.console, context,
+        [&](ProControllerContext& context){
+            run(env, context, attack_tracker, shiny_sound_handler);
+        },
+        {
+            attack_tracker,
+            shiny_detector,
+        }
+    );
+
+    pbf_wait(context, 5000ms);
+    go_home(env.console, context);
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+}
+
+
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_InPlaceCatcher.h b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_InPlaceCatcher.h
new file mode 100644
index 0000000000..9d227d9692
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_InPlaceCatcher.h
@@ -0,0 +1,70 @@
+/*  In-Place Catcher
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLZA_InPlaceCatcher_H
+#define PokemonAutomation_PokemonLZA_InPlaceCatcher_H
+
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "VideoGames/PokemonLA/Options/PokemonLA_ShinyDetectedAction.h"
+#include "VideoGames/PokemonLZA/Options/PokemonLZA_ShinyDetectedAction.h"
+#include "VideoGames/PokemonLZA/Options/PokemonLZA_BattleAIOption.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+class AlertEyeTracker;
+
+
+class InPlaceCatcher_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    InPlaceCatcher_Descriptor();
+
+    class Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+
+
+class InPlaceCatcher : public SingleSwitchProgramInstance, public ConfigOption::Listener{
+public:
+    using Descriptor = InPlaceCatcher_Descriptor;
+    InPlaceCatcher();
+
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    void day_night_handler(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+    void run(
+        SingleSwitchProgramEnvironment& env, ProControllerContext& context,
+        AlertEyeTracker& attack_tracker,
+        ShinySoundHandler& shiny_sound_handler
+    );
+
+
+private:
+    SimpleIntegerOption<uint16_t> MAX_BALLS;
+
+    PokemonLA::ShinyRequiresAudioText SHINY_REQUIRES_AUDIO;
+    ShinySoundDetectedActionOption SHINY_DETECTED;
+
+    BattleAIOption BATTLE_AI;
+
+    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_JacintheInfiniteFarmer.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_JacintheInfiniteFarmer.cpp
new file mode 100644
index 0000000000..d1bc788076
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_JacintheInfiniteFarmer.cpp
@@ -0,0 +1,317 @@
+/*  Jacinthe Infinite Farmer
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "CommonTools/VisualDetectors/BlackScreenDetector.h"
+#include "CommonTools/StartupChecks/VideoResolutionCheck.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonLZA/Inference/Battles/PokemonLZA_RunFromBattleDetector.h"
+#include "VideoGames/PokemonLZA/Inference/PokemonLZA_SelectionArrowDetector.h"
+#include "VideoGames/PokemonLZA/Inference/PokemonLZA_DialogDetector.h"
+#include "VideoGames/PokemonLZA/Inference/PokemonLZA_ButtonDetector.h"
+#include "VideoGames/PokemonLZA/Programs/PokemonLZA_TrainerBattle.h"
+#include "PokemonLZA_JacintheInfiniteFarmer.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+using namespace Pokemon;
+
+
+// Jacinthe infinite battle flow:
+// - Button A overworld
+// - Flat white dialog x 2
+// - Selection arrow for three menuitem: "give a try", "can you give me spiel again", "I'll pass"
+// - Flat white excited dialog
+// - Flat white dialog
+// - Black screen
+// - Enter pre-battle animation
+// - Pre-battle dialog (no background, white arrow)
+// - Battle
+//   - Aurorus uses protect first turn
+//   - Mega evolve Clefable
+//   - Clefable uses protect first turn
+// - Given +8100 poke dollar
+// - Flat white dialog
+// - Black screen
+// - Flat white dialog
+// - Selection arrow for two item: "let's start", "no thanks"
+// - If choose let's start:
+//   - Flat white dialog
+//   - Pre-battle dialog
+//   - <loop> ...
+// - If choose no thanks:
+//  - Flat white dialg
+//  - Selection arrow for two item: "let's keep going", "I'm done"
+//  - choose 2nd
+//  - Flat white dialog x3
+//  - Button A overworld <finish battle>
+
+
+JacintheInfiniteFarmer_Descriptor::JacintheInfiniteFarmer_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonLZA:JacintheInfiniteFarmer",
+        STRING_POKEMON + " LZA", "Jacinthe Infinite Farmer",
+        "Programs/PokemonLZA/JacintheInfiniteFarmer.html",
+        "Farm Jacinthe Infinite for exp and money.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+class JacintheInfiniteFarmer_Descriptor::Stats : public StatsTracker{
+public:
+    Stats()
+        : rounds(m_stats["Rounds"])
+        , defeats(m_stats["Defeats"])
+        , errors(m_stats["Errors"])
+    {
+        m_display_order.emplace_back("Rounds");
+        m_display_order.emplace_back("Defeats", HIDDEN_IF_ZERO);
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+
+        m_aliases["Battles"] = "Rounds";
+    }
+
+    std::atomic<uint64_t>& rounds;
+    std::atomic<uint64_t>& defeats;
+    std::atomic<uint64_t>& errors;
+};
+std::unique_ptr<StatsTracker> JacintheInfiniteFarmer_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+
+JacintheInfiniteFarmer::JacintheInfiniteFarmer()
+    : STOP_AFTER_CURRENT("Round")
+    , NUM_ROUNDS(
+        "<b>Number of Rounds to Run:</b><br>"
+        "Zero will run until 'Stop after Current Round' is pressed or the program is manually stopped.</b>",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        100,
+        0
+    )
+    , GO_HOME_WHEN_DONE(false)
+    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_STATUS_UPDATE,
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+{
+    PA_ADD_OPTION(STOP_AFTER_CURRENT);
+    PA_ADD_OPTION(BATTLE_AI);
+
+    PA_ADD_OPTION(NUM_ROUNDS);
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+
+bool JacintheInfiniteFarmer::talk_to_jacinthe(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    JacintheInfiniteFarmer_Descriptor::Stats& stats = env.current_stats<JacintheInfiniteFarmer_Descriptor::Stats>();
+
+    bool seen_selection_arrow = false;
+    bool confirm_entering_battle = false;
+    bool seen_flat_white_dialog = false;
+
+    TransparentBattleDialogWatcher transparent_battle_dialog(COLOR_WHITE, &env.console.overlay());
+    while (true){
+        context.wait_for_all_requests();
+
+        ButtonWatcher buttonA(
+            COLOR_RED,
+            ButtonType::ButtonA,
+            {0.1, 0.1, 0.8, 0.8},
+            &env.console.overlay()
+        );
+        SelectionArrowWatcher arrow(
+            COLOR_YELLOW, &env.console.overlay(),
+            SelectionArrowType::RIGHT,
+            {0.543, 0.508, 0.365, 0.253}
+        );
+        FlatWhiteDialogWatcher dialog(COLOR_RED, &env.console.overlay());
+        BlackScreenWatcher black_screen(COLOR_BLACK);
+
+        std::vector<PeriodicInferenceCallback> callbacks = {
+            buttonA,
+            arrow,
+            dialog
+        };
+        if (seen_selection_arrow && confirm_entering_battle){
+            // seen selection arrow means we may now enter battle, which transitions with a black screen
+            callbacks.push_back(black_screen);
+        }
+
+        int ret = wait_until(
+            env.console, context,
+            10000ms,
+            callbacks
+        );
+        context.wait_for(100ms);
+
+        switch (ret){
+        case 0:
+            // There cases where the function detects A button:
+            // - At start of the program, press A to start talking to Jacinthe
+            // - When stopping the battle, the program fininshes all the dialog with Jacinethe and returns
+            //   to the overworld, where button A appears.
+            // - When we lose to Jacinthe, we have some dialog after the battle and returns to the overworld.
+            env.log("Detected A button.");
+            env.console.overlay().add_log("Button A Detected");
+            if (STOP_AFTER_CURRENT.should_stop()){
+                return true; // true means the program should stop
+            }
+            
+            if (seen_flat_white_dialog){
+                // we shouldn't stop the program but we find A button. This means we lost.
+                stats.defeats++;
+                env.update_stats();
+            }
+            pbf_press_button(context, BUTTON_A, 160ms, 80ms);
+            continue;
+
+        case 1:
+            env.log("Detected selection arrow.");
+            seen_selection_arrow = true;
+            // This is when Jacinthe is asking whether you want
+            // to start the battle or continue the battle
+            if (STOP_AFTER_CURRENT.should_stop()){
+                env.console.overlay().add_log("Dialog Choice: Cancel");
+                pbf_press_button(context, BUTTON_B, 160ms, 80ms);
+            }else{
+                confirm_entering_battle = true;
+                // confirm entering battle
+                env.console.overlay().add_log("Dialog Choice: Confirm");
+                pbf_press_button(context, BUTTON_A, 160ms, 80ms);
+            }
+            continue;
+        case 2:
+            env.log("Detected white dialog.");
+            // env.console.overlay().add_log("Advance Dialog");
+            seen_flat_white_dialog = true;
+            pbf_press_button(context, BUTTON_B, 160ms, 80ms);
+            continue;
+        
+        case 3:
+            env.log("Detected black screen.");
+            env.console.overlay().add_log("Transition to Battle");
+
+            ret = wait_until(
+                env.console, context, 20s, {transparent_battle_dialog}
+            );
+            if (ret != 0){
+                stats.errors++;
+                env.update_stats();
+                OperationFailedExceptionWithScreenshot::fire(
+                    ErrorReportMode::SEND_ERROR_REPORT,
+                    "talk_to_jacinthe(): Does not detect transparent battle dialog 20 sec after black screen.",
+                    env.console
+                );
+            }
+            // mash B to clear up pre-battle transparency dialog
+            env.log("Clearing transparent battle dialog");
+            env.console.overlay().add_log("Clear Battle Dialog");
+            pbf_mash_button(context, BUTTON_B, 6s);
+            context.wait_for_all_requests();
+            // battle starts
+            return false;
+
+        default:
+            stats.errors++;
+            env.update_stats();
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "talk_to_jacinthe(): No recognized state after 60 seconds.",
+                env.console
+            );
+        }
+    }
+}
+void JacintheInfiniteFarmer::run_round(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    JacintheInfiniteFarmer_Descriptor::Stats& stats = env.current_stats<JacintheInfiniteFarmer_Descriptor::Stats>();
+
+    TrainerBattleState battle_state(BATTLE_AI);
+
+    while (true){
+        context.wait_for_all_requests();
+
+        FlatWhiteDialogWatcher dialog(COLOR_RED, &env.console.overlay(), 250ms);
+        RunFromBattleWatcher in_battle_state(COLOR_GREEN, &env.console.overlay(), 10ms);
+
+        int ret = wait_until(
+            env.console, context,
+            50s,
+            {
+                dialog,
+                in_battle_state,
+            }
+        );
+        switch (ret){
+        case 0:
+            env.log("Detected white dialog.");
+            env.console.overlay().add_log("Post-Battle Dialog");
+            pbf_press_button(context, BUTTON_B, 160ms, 80ms);
+            stats.rounds++;
+            env.update_stats();
+            return;
+        case 1:
+            env.log("In battle state");
+            battle_state.attempt_one_attack(env, env.console, context);
+            continue;
+
+        default:
+            stats.errors++;
+            env.update_stats();
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "run_round(): no battle state or dialog window detected after 50 sec.",
+                env.console
+            );
+        }
+    }
+}
+
+
+void JacintheInfiniteFarmer::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    assert_16_9_720p_min(env.logger(), env.console);
+
+    JacintheInfiniteFarmer_Descriptor::Stats& stats = env.current_stats<JacintheInfiniteFarmer_Descriptor::Stats>();
+
+    DeferredStopButtonOption::ResetOnExit reset_on_exit(STOP_AFTER_CURRENT);
+
+    //  Connect the controller.
+    require_player(env.console, context, BUTTON_B);
+
+//    auto lobby = env.console.video().snapshot();
+
+    while (true){
+        send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
+        if (NUM_ROUNDS != 0 && stats.rounds >= NUM_ROUNDS){
+            break;
+        }
+        if (talk_to_jacinthe(env, context)){
+            break;
+        }
+        run_round(env, context);
+    }
+
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+    GO_HOME_WHEN_DONE.run_end_of_program(context);
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_JacintheInfiniteFarmer.h b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_JacintheInfiniteFarmer.h
new file mode 100644
index 0000000000..b354ec34d9
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_JacintheInfiniteFarmer.h
@@ -0,0 +1,70 @@
+/*  Jacinthe Infinite Farmer
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLZA_JacintheInfiniteFarmer_H
+#define PokemonAutomation_PokemonLZA_JacintheInfiniteFarmer_H
+
+//#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "Common/Cpp/Options/ButtonOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+#include "VideoGames/PokemonLZA/Options/PokemonLZA_BattleAIOption.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+
+class JacintheInfiniteFarmer_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    JacintheInfiniteFarmer_Descriptor();
+
+    class Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+
+class JacintheInfiniteFarmer : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = JacintheInfiniteFarmer_Descriptor;
+    JacintheInfiniteFarmer();
+
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    // Advance dialog windows and select dialog menuitems when talking to the Jacinthe in overworld.
+    // This function can be called in two cases:
+    // - When starting the proram, player is in overworld with Button A floating in front of Jacinthe.
+    // - When a battle finishes, player is in dialog with Jacinthe, where the program can choose to continue
+    //   battling or exit.
+    // Return true when the user clicks the button STOP_AFTER_CURRENT to stop or the required amount of rounds is
+    // reached. Return false when it finishes the dialog menuitem selection to confirm entering the battle.
+    bool talk_to_jacinthe(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+    // Handle all round logic. Return when it detects the blue dialog box meaning the player character is at
+    // the receptionist receiving reward items.
+    void run_round(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+
+private:
+    DeferredStopButtonOption STOP_AFTER_CURRENT;
+    SimpleIntegerOption<uint32_t> NUM_ROUNDS;
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
+
+    BattleAIOption BATTLE_AI;
+
+    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_MegaShardFarmer.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_MegaShardFarmer.cpp
new file mode 100644
index 0000000000..f74bf51a42
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_MegaShardFarmer.cpp
@@ -0,0 +1,179 @@
+/*  Mega Shard Farmer
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/StaticGlobals.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "CommonTools/VisualDetectors/BlackScreenDetector.h"
+#include "CommonTools/StartupChecks/VideoResolutionCheck.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonLZA/Programs/PokemonLZA_BasicNavigation.h"
+#include "PokemonLZA_MegaShardFarmer.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+using namespace Pokemon;
+
+
+MegaShardFarmer_Descriptor::MegaShardFarmer_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonLZA:MegaShardFarmer",
+        STRING_POKEMON + " LZA", "Mega Shard Farmer",
+        "Programs/PokemonLZA/MegaShardFarmer.html",
+        "Farm the mega shards behind Restaurant Le Yeah.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+class MegaShardFarmer_Descriptor::Stats : public StatsTracker{
+public:
+    Stats()
+        : rounds(m_stats["Rounds"])
+        , day_changes(m_stats["Day/Night Changes"])
+        , errors(m_stats["Errors"])
+    {
+        m_display_order.emplace_back("Rounds");
+        m_display_order.emplace_back("Day/Night Changes");
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+    }
+
+    std::atomic<uint64_t>& rounds;
+    std::atomic<uint64_t>& day_changes;
+    std::atomic<uint64_t>& errors;
+};
+std::unique_ptr<StatsTracker> MegaShardFarmer_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+
+
+MegaShardFarmer::MegaShardFarmer()
+    : SKIP_SHARDS(
+        "<b>Skip getting Shards (for testing purposes):</b>",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        false
+    )
+{
+    if (STATIC_GLOBALS.DEVELOPER_MODE){
+        PA_ADD_OPTION(SKIP_SHARDS);
+    }
+}
+
+void MegaShardFarmer::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    assert_16_9_720p_min(env.logger(), env.console);
+
+    //  Connect the controller.
+    require_player(env.console, context, BUTTON_L);
+
+    MegaShardFarmer_Descriptor::Stats& stats = env.current_stats<MegaShardFarmer_Descriptor::Stats>();
+
+
+    while (true){
+        env.update_stats();
+
+        fly_back(env, context);
+        context.wait_for_all_requests();
+
+        BlackScreenOverWatcher black_screen(
+            COLOR_BLUE,
+            {0.1, 0.1, 0.8, 0.8},
+            100, 10,
+            500ms
+        );
+
+        int ret = run_until<ProControllerContext>(
+            env.console, context,
+            [&](ProControllerContext& context){
+                //  Travel to alley with logs of mega shards.
+                pbf_move_left_joystick(context, {-1, +0.25}, 400ms, 400ms);
+                pbf_press_button(context, BUTTON_L, 160ms, 440ms);
+                pbf_move_left_joystick(context, {0, +1}, 3000ms, 400ms);
+                pbf_move_left_joystick(context, {+1, 0}, 400ms, 400ms);
+                pbf_press_button(context, BUTTON_L, 160ms, 440ms);
+                pbf_move_left_joystick(context, {0, +1}, 2500ms, 400ms);
+                pbf_move_left_joystick(context, {+1, +0.5}, 400ms, 400ms);
+                pbf_press_button(context, BUTTON_L, 160ms, 440ms);
+                pbf_move_left_joystick(context, {0, +1}, 2000ms, 0ms);
+                pbf_move_left_joystick(context, {+0.252, +1}, 1000ms, 0ms);
+                pbf_move_left_joystick(context, {0, +1}, 2000ms, 0ms);
+                pbf_move_left_joystick(context, {+0.252, +1}, 1500ms, 1000ms);
+
+                //  Move camera up.
+                pbf_move_right_joystick(context, {0, +1}, 800ms, 0ms);
+
+                //  Bring out a Pokemon.
+                pbf_press_dpad(context, DPAD_UP, 1000ms, 0ms);
+
+                if (!SKIP_SHARDS){
+                    //  Break all the shards.
+                    double x = stats.rounds % 2 == 0 ? -0.25 : 0.25;
+                    ssf_press_right_joystick(context, {x, 0}, 0ms, 40000ms, 0ms);
+                    for (int c = 0; c < 40; c++){
+                        ssf_press_button(context, BUTTON_ZL, 240ms, 400ms, 80ms);
+                        pbf_press_button(context, BUTTON_B, 160ms, 520ms);
+                    }
+                }
+            },
+            {{black_screen}}
+        );
+
+        if (ret == 0){
+            env.log("Detected day/night change.");
+            stats.day_changes++;
+            context.wait_for(15000ms);
+        }
+
+        stats.rounds++;
+    }
+
+}
+void MegaShardFarmer::fly_back(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    for (int failed = 0; failed < 3; failed++){
+        const bool zoom_to_max = false;
+        open_map(env.console, context, zoom_to_max, false);
+
+        //  Middle Zoom
+        pbf_move_right_joystick(context, {0, +1}, 80ms, 80ms);
+        pbf_move_right_joystick(context, {0, +1}, 80ms, 80ms);
+        pbf_move_right_joystick(context, {0, -1}, 80ms, 80ms);
+
+        //  Tap the stick to lock on to Le Yeah if you're already on top of it.
+        if (failed == 0){
+            pbf_move_left_joystick(context, {0, -0.5}, 40ms, 120ms);
+            pbf_move_left_joystick(context, {0, +0.5}, 40ms, 500ms);
+        }else{
+            pbf_move_left_joystick(context, {-0.5, -0.5}, 80ms, 500ms);
+        }
+
+        if (fly_from_map(env.console, context) == FastTravelState::SUCCESS){
+            return;
+        }else{
+            pbf_mash_button(context, BUTTON_B, 5000ms);
+        }
+    }
+
+    MegaShardFarmer_Descriptor::Stats& stats = env.current_stats<MegaShardFarmer_Descriptor::Stats>();
+    stats.errors++;
+    env.update_stats();
+    OperationFailedExceptionWithScreenshot::fire(
+        ErrorReportMode::SEND_ERROR_REPORT,
+        "Failed to fly 3 times in the row.",
+        env.console
+    );
+}
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_MegaShardFarmer.h b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_MegaShardFarmer.h
new file mode 100644
index 0000000000..954c0bbd84
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_MegaShardFarmer.h
@@ -0,0 +1,47 @@
+/*  Mega Shard Farmer
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLZA_MegaShardFarmer_H
+#define PokemonAutomation_PokemonLZA_MegaShardFarmer_H
+
+#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+
+class MegaShardFarmer_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    MegaShardFarmer_Descriptor();
+
+    class Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+
+class MegaShardFarmer : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = MegaShardFarmer_Descriptor;
+    MegaShardFarmer();
+
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    void fly_back(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+
+    BooleanCheckBoxOption SKIP_SHARDS;
+};
+
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_RestaurantFarmer.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_RestaurantFarmer.cpp
new file mode 100644
index 0000000000..1a5f7c5da0
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_RestaurantFarmer.cpp
@@ -0,0 +1,330 @@
+/*  Restaurant Farmer
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+//#include "CommonFramework/Logging/Logger.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/Tools/ErrorDumper.h"
+//#include "CommonFramework/VideoPipeline/VideoFeed.h"
+//#include "CommonTools/Async/InterruptableCommands.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+//#include "CommonTools/VisualDetectors/BlackScreenDetector.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "CommonTools/StartupChecks/VideoResolutionCheck.h"
+//#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonLZA/Inference/PokemonLZA_SelectionArrowDetector.h"
+#include "VideoGames/PokemonLZA/Inference/PokemonLZA_DialogDetector.h"
+#include "VideoGames/PokemonLZA/Inference/PokemonLZA_ButtonDetector.h"
+#include "VideoGames/PokemonLZA/Inference/Battles/PokemonLZA_RunFromBattleDetector.h"
+#include "VideoGames/PokemonLZA/Programs/PokemonLZA_BasicNavigation.h"
+#include "VideoGames/PokemonLZA/Programs/PokemonLZA_TrainerBattle.h"
+#include "PokemonLZA_RestaurantFarmer.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+using namespace Pokemon;
+
+
+RestaurantFarmer_Descriptor::RestaurantFarmer_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonLZA:RestaurantFarmer",
+        STRING_POKEMON + " LZA", "Restaurant Farmer",
+        "Programs/PokemonLZA/RestaurantFarmer.html",
+        "Farm the restaurants for exp, items, and money.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+class RestaurantFarmer_Descriptor::Stats : public StatsTracker{
+public:
+    Stats()
+        : rounds(m_stats["Rounds"])
+        , wins(m_stats["Wins"])
+        , losses(m_stats["Losses"])
+        , errors(m_stats["Errors"])
+    {
+        m_display_order.emplace_back("Rounds");
+        m_display_order.emplace_back("Wins");
+        m_display_order.emplace_back("Losses");
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+
+        m_aliases["Battles"] = "Rounds";
+    }
+
+    std::atomic<uint64_t>& rounds;
+    std::atomic<uint64_t>& wins;
+    std::atomic<uint64_t>& losses;
+    std::atomic<uint64_t>& errors;
+};
+std::unique_ptr<StatsTracker> RestaurantFarmer_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+
+RestaurantFarmer::RestaurantFarmer()
+    : STOP_AFTER_CURRENT("Round")
+    , NUM_ROUNDS(
+        "<b>Number of Rounds to Run:</b><br>"
+        "Zero will run until 'Stop after Current Round' is pressed or the program is manually stopped.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        500,
+        0
+    )
+    , GO_HOME_WHEN_DONE(false)
+    , PERIODIC_SAVE(
+        "<b>Periodically Save:</b><br>"
+        "Save the game every this many rounds. This reduces the loss to game crashes. Set to zero to disable.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        10,
+        0
+    )
+    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_STATUS_UPDATE,
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+{
+    PA_ADD_OPTION(STOP_AFTER_CURRENT);
+    PA_ADD_OPTION(BATTLE_AI);
+
+    PA_ADD_OPTION(NUM_ROUNDS);
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+    PA_ADD_OPTION(PERIODIC_SAVE);
+
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+
+bool RestaurantFarmer::run_lobby(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    RestaurantFarmer_Descriptor::Stats& stats = env.current_stats<RestaurantFarmer_Descriptor::Stats>();
+
+    while (true){
+        context.wait_for_all_requests();
+
+        ButtonWatcher buttonA(
+            COLOR_RED,
+            ButtonType::ButtonA,
+            {0.4, 0.3, 0.2, 0.7},
+            &env.console.overlay()
+        );
+        SelectionArrowWatcher arrow(
+            COLOR_YELLOW, &env.console.overlay(),
+            SelectionArrowType::RIGHT,
+            {0.654308, 0.481553, 0.295529, 0.312621}
+        );
+        FlatWhiteDialogWatcher dialog0(COLOR_RED, &env.console.overlay());
+        BlueDialogWatcher dialog1(COLOR_RED, &env.console.overlay());
+        ItemReceiveWatcher item_receive(COLOR_RED, &env.console.overlay());
+        RunFromBattleWatcher battle_menu(COLOR_GREEN, &env.console.overlay(), 250ms);
+
+        int ret = wait_until(
+            env.console, context,
+            10000ms,
+            {
+                buttonA, // 0
+                arrow,   // 1
+                dialog0, // 2
+                dialog1, // 3 
+                item_receive, // 4
+                battle_menu,  // 5
+            }
+        );
+        context.wait_for(100ms);
+
+        switch (ret){
+        case 0:
+            env.log("Detected A button.");
+            if (STOP_AFTER_CURRENT.should_stop()){
+                return true;
+            }
+            pbf_press_button(context, BUTTON_A, 160ms, 80ms);
+            continue;
+
+        case 1:
+            env.log("Detected selection arrow.");
+            // This is when the restaurant receptionist is asking whether you want
+            // to start the round
+            // Mash A for 5 sec to clear rest of the dialog and enter battle
+            pbf_mash_button(context, BUTTON_A, 5000ms);
+            return false;
+
+        case 2:
+            env.log("Detected white dialog.");
+            pbf_press_button(context, BUTTON_B, 160ms, 80ms);
+            continue;
+
+        case 3:
+            env.log("Detected blue dialog.");
+            pbf_press_button(context, BUTTON_B, 160ms, 80ms);
+            continue;
+
+        case 4:
+            env.log("Detected item receive.");
+            pbf_press_button(context, BUTTON_A, 160ms, 80ms);
+            continue;
+
+        case 5:
+            env.log("Detected battle menu. (unexpected)", COLOR_RED);
+            stats.errors++;
+            return false;
+
+        default:
+            stats.errors++;
+            env.update_stats();
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "run_lobby(): No recognized state after 10 seconds.",
+                env.console
+            );
+        }
+    }
+}
+void RestaurantFarmer::run_round(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    RestaurantFarmer_Descriptor::Stats& stats = env.current_stats<RestaurantFarmer_Descriptor::Stats>();
+
+//    WallClock start = current_time();
+
+    bool won = false;
+    TrainerBattleState battle_state(BATTLE_AI);
+
+    while (true){
+        ButtonWatcher buttonA(
+            COLOR_RED,
+            ButtonType::ButtonA,
+            {0.4, 0.3, 0.2, 0.7},
+            &env.console.overlay(),
+            1000ms
+        );
+        SelectionArrowWatcher arrow(
+            COLOR_YELLOW, &env.console.overlay(),
+            SelectionArrowType::RIGHT,
+            {0.654308, 0.481553, 0.295529, 0.312621},
+            1000ms
+        );
+        ItemReceiveWatcher item_receive(COLOR_RED, &env.console.overlay(), 1000ms);
+        FlatWhiteDialogWatcher dialog0(COLOR_RED, &env.console.overlay(), 1000ms);
+        BlueDialogWatcher dialog1(COLOR_RED, &env.console.overlay(), 1000ms);
+        RunFromBattleWatcher battle_menu(COLOR_GREEN, &env.console.overlay(), 10ms);
+
+        context.wait_for_all_requests();
+
+        int ret = run_until<ProControllerContext>(
+            env.console, context,
+            [](ProControllerContext& context){
+                pbf_mash_button(context, BUTTON_B, 120s);
+            },
+            {
+                buttonA,      // 0
+                arrow,        // 1
+                item_receive, // 2
+                dialog0,      // 3
+                dialog1,      // 4
+                battle_menu,  // 5
+            }
+        );
+
+        switch (ret){
+        case 0:
+            env.log("Detected Lobby.");
+            stats.rounds++;
+            if (won){
+                stats.wins++;
+            }else{
+                stats.losses++;
+            }
+            env.update_stats();
+            return;
+
+        case 1:
+            env.log("Detected selection arrow. (unexpected)", COLOR_RED);
+            dump_image(env.console.logger(), env.program_info(), env.console.video(), "UnexpectedSelectionArrow");
+            stats.errors++;
+            env.update_stats();
+            continue;
+
+        case 2:
+            env.log("Detected item receive.");
+            won = true;
+            pbf_press_button(context, BUTTON_A, 160ms, 80ms);
+            continue;
+
+        case 3:
+            env.log("Detected white dialog.");
+            pbf_press_button(context, BUTTON_B, 160ms, 80ms);
+            continue;
+
+        case 4:
+            env.log("Detected blue dialog.");
+            pbf_press_button(context, BUTTON_B, 160ms, 80ms);
+            continue;
+
+        case 5:
+            env.log("Detected battle menu.");
+            battle_state.attempt_one_attack(env, env.console, context);
+            continue;
+
+        default:
+            stats.errors++;
+            env.update_stats();
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "run_round(): No state detected for 2 minutes.",
+                env.console
+            );
+        }
+
+    }
+}
+
+
+void RestaurantFarmer::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    assert_16_9_720p_min(env.logger(), env.console);
+
+    RestaurantFarmer_Descriptor::Stats& stats = env.current_stats<RestaurantFarmer_Descriptor::Stats>();
+
+    DeferredStopButtonOption::ResetOnExit reset_on_exit(STOP_AFTER_CURRENT);
+
+    //  Connect the controller.
+    require_player(env.console, context, BUTTON_B);
+
+//    auto lobby = env.console.video().snapshot();
+
+    for (uint32_t rounds_since_last_save = 0;; rounds_since_last_save++){
+        send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
+        if (NUM_ROUNDS != 0 && stats.rounds >= NUM_ROUNDS){
+            break;
+        }
+
+        uint32_t periodic_save = PERIODIC_SAVE;
+        if (periodic_save != 0 && rounds_since_last_save >= periodic_save){
+            save_game_to_menu(env.console, context);
+            pbf_mash_button(context, BUTTON_B, 2000ms);
+            rounds_since_last_save = 0;
+        }
+
+        if (run_lobby(env, context)){
+            break;
+        }
+        run_round(env, context);
+    }
+
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+    GO_HOME_WHEN_DONE.run_end_of_program(context);
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_RestaurantFarmer.h b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_RestaurantFarmer.h
new file mode 100644
index 0000000000..97d9108d70
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_RestaurantFarmer.h
@@ -0,0 +1,68 @@
+/*  Restaurant Farmer
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLZA_RestaurantFarmer_H
+#define PokemonAutomation_PokemonLZA_RestaurantFarmer_H
+
+//#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "Common/Cpp/Options/ButtonOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+#include "VideoGames/PokemonLZA/Options/PokemonLZA_BattleAIOption.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+
+class RestaurantFarmer_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    RestaurantFarmer_Descriptor();
+
+    class Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+
+class RestaurantFarmer : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = RestaurantFarmer_Descriptor;
+    RestaurantFarmer();
+
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    // Handle all the logic of talking to the restaurant receptionist.
+    // Return true when the user clicks the button STOP_AFTER_CURRENT to stop or the required amount of rounds is
+    // reached. Return false when it enters battle.
+    bool run_lobby(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+    // Handle all battle logic. Return when it detects the blue dialog box meaning the player character is at
+    // the receptionist receiving reward items.
+    void run_round(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+
+private:
+    DeferredStopButtonOption STOP_AFTER_CURRENT;
+    SimpleIntegerOption<uint32_t> NUM_ROUNDS;
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
+
+    SimpleIntegerOption<uint32_t> PERIODIC_SAVE;
+
+    BattleAIOption BATTLE_AI;
+
+    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_WigglytuffFarmer.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_WigglytuffFarmer.cpp
new file mode 100644
index 0000000000..1d1224b4b7
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_WigglytuffFarmer.cpp
@@ -0,0 +1,257 @@
+/*  Wigglytuff Farmer
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "CommonTools/StartupChecks/VideoResolutionCheck.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonLZA/Inference/PokemonLZA_SelectionArrowDetector.h"
+#include "VideoGames/PokemonLZA/Inference/PokemonLZA_DialogDetector.h"
+#include "VideoGames/PokemonLZA/Inference/PokemonLZA_ButtonDetector.h"
+#include "VideoGames/PokemonLZA/Inference/Battles/PokemonLZA_RunFromBattleDetector.h"
+#include "VideoGames/PokemonLZA/Programs/PokemonLZA_BasicNavigation.h"
+#include "VideoGames/PokemonLZA/Programs/PokemonLZA_TrainerBattle.h"
+#include "PokemonLZA_WigglytuffFarmer.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+using namespace Pokemon;
+
+
+WigglytuffFarmer_Descriptor::WigglytuffFarmer_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonLZA:WigglytuffFarmer",
+        STRING_POKEMON + " LZA", "Wigglytuff Farmer",
+        "Programs/PokemonLZA/WigglytuffFarmer.html",
+        "Farm the Side Mission 157 (DLC) for money.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+class WigglytuffFarmer_Descriptor::Stats : public StatsTracker{
+public:
+    Stats()
+        : rounds(m_stats["Rounds"])
+        , errors(m_stats["Errors"])
+    {
+        m_display_order.emplace_back("Rounds");
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+        m_aliases["Battles"] = "Rounds";
+    }
+
+    std::atomic<uint64_t>& rounds;
+    std::atomic<uint64_t>& errors;
+};
+std::unique_ptr<StatsTracker> WigglytuffFarmer_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+
+WigglytuffFarmer::WigglytuffFarmer()
+    : STOP_AFTER_CURRENT("Round")
+    , NUM_ROUNDS(
+        "<b>Number of Rounds to Run:</b><br>"
+        "Zero will run until 'Stop after Current Round' is pressed or the program is manually stopped.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        500,
+        0
+    )
+    , GO_HOME_WHEN_DONE(false)
+    , PERIODIC_SAVE(
+        "<b>Periodically Save:</b><br>"
+        "Save the game every this many rounds. This reduces the loss to game crashes. Set to zero to disable.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        10,
+        0
+    )
+    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_STATUS_UPDATE,
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+{
+    PA_ADD_OPTION(STOP_AFTER_CURRENT);
+    PA_ADD_OPTION(BATTLE_AI);
+
+    PA_ADD_OPTION(NUM_ROUNDS);
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+    PA_ADD_OPTION(PERIODIC_SAVE);
+
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+
+bool WigglytuffFarmer::run_lobby(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    WigglytuffFarmer_Descriptor::Stats& stats = env.current_stats<WigglytuffFarmer_Descriptor::Stats>();
+
+    while (true){
+        context.wait_for_all_requests();
+
+        ButtonWatcher buttonA(
+            COLOR_RED,
+            ButtonType::ButtonA,
+            {0.4, 0.3, 0.2, 0.7},
+            &env.console.overlay()
+        );
+        SelectionArrowWatcher arrow(
+            COLOR_YELLOW, &env.console.overlay(),
+            SelectionArrowType::RIGHT,
+            {0.654308, 0.481553, 0.295529, 0.312621}
+        );
+        FlatWhiteDialogWatcher dialog(COLOR_RED, &env.console.overlay());
+        RunFromBattleWatcher battle_menu(COLOR_GREEN, &env.console.overlay(), 250ms);
+
+        int ret = wait_until(
+            env.console, context,
+            30000ms,
+            {
+                buttonA, // 0
+                arrow,   // 1
+                dialog, // 2
+                battle_menu,  // 3
+            }
+        );
+        context.wait_for(100ms);
+
+        switch (ret){
+        case 0:
+            env.log("lobby: Detected A button.");
+            if (STOP_AFTER_CURRENT.should_stop()){
+                return true;
+            }
+            pbf_press_button(context, BUTTON_A, 160ms, 80ms);
+            continue;
+
+        case 1:
+            env.log("lobby: Detected selection arrow.");
+            // This is when the rich boy asking whether you want
+            // to start the round
+            // Mash A for 5 sec to clear rest of the dialog and enter battle
+            pbf_mash_button(context, BUTTON_A, 5000ms);
+            return false;
+
+        case 2:
+            env.log("lobby: Detected white dialog.");
+            pbf_press_button(context, BUTTON_B, 160ms, 80ms);
+            continue;
+
+        case 3:
+            env.log("lobby: Detected battle menu. (unexpected)", COLOR_RED);
+            stats.errors++;
+            return false;
+
+        default:
+            stats.errors++;
+            env.update_stats();
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "run_lobby(): No recognized state after 30 seconds.",
+                env.console
+            );
+        }
+    }
+}
+void WigglytuffFarmer::run_round(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    WigglytuffFarmer_Descriptor::Stats& stats = env.current_stats<WigglytuffFarmer_Descriptor::Stats>();
+
+    TrainerBattleState battle_state(BATTLE_AI);
+
+    while (true){
+        ButtonWatcher buttonA(
+            COLOR_RED,
+            ButtonType::ButtonA,
+            {0.4, 0.3, 0.2, 0.7},
+            &env.console.overlay(),
+            1000ms
+        );
+        RunFromBattleWatcher battle_menu(COLOR_GREEN, &env.console.overlay(), 10ms);
+
+        context.wait_for_all_requests();
+
+        int ret = run_until<ProControllerContext>(
+            env.console, context,
+            [](ProControllerContext& context){
+                pbf_mash_button(context, BUTTON_B, 120s);
+            },
+            {
+                buttonA,      // 0
+                battle_menu,  // 1
+            }
+        );
+
+        switch (ret){
+        case 0:
+            env.log("battle: Detected Lobby.");
+            stats.rounds++;
+            env.update_stats();
+            return;
+
+        case 1:
+            env.log("battle: Detected battle menu.");
+            battle_state.attempt_one_attack(env, env.console, context);
+            continue;
+
+        default:
+            stats.errors++;
+            env.update_stats();
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "run_round(): No state detected for 2 minutes.",
+                env.console
+            );
+        }
+
+    }
+}
+
+
+void WigglytuffFarmer::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    assert_16_9_720p_min(env.logger(), env.console);
+
+    WigglytuffFarmer_Descriptor::Stats& stats = env.current_stats<WigglytuffFarmer_Descriptor::Stats>();
+
+    DeferredStopButtonOption::ResetOnExit reset_on_exit(STOP_AFTER_CURRENT);
+
+    //  Connect the controller.
+    require_player(env.console, context, BUTTON_B);
+
+    for (uint32_t rounds_since_last_save = 0;; rounds_since_last_save++){
+        send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
+        if (NUM_ROUNDS != 0 && stats.rounds >= NUM_ROUNDS){
+            break;
+        }
+
+        uint32_t periodic_save = PERIODIC_SAVE;
+        if (periodic_save != 0 && rounds_since_last_save >= periodic_save){
+            save_game_to_menu(env.console, context);
+            pbf_mash_button(context, BUTTON_B, 2000ms);
+            rounds_since_last_save = 0;
+        }
+
+        if (run_lobby(env, context)){
+            break;
+        }
+        run_round(env, context);
+    }
+
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+    GO_HOME_WHEN_DONE.run_end_of_program(context);
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_WigglytuffFarmer.h b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_WigglytuffFarmer.h
new file mode 100644
index 0000000000..004978a479
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_WigglytuffFarmer.h
@@ -0,0 +1,66 @@
+/*  Wigglytuff Farmer
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLZA_WigglytuffFarmer_H
+#define PokemonAutomation_PokemonLZA_WigglytuffFarmer_H
+
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "Common/Cpp/Options/ButtonOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+#include "VideoGames/PokemonLZA/Options/PokemonLZA_BattleAIOption.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+
+class WigglytuffFarmer_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    WigglytuffFarmer_Descriptor();
+
+    class Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+
+class WigglytuffFarmer : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = WigglytuffFarmer_Descriptor;
+    WigglytuffFarmer();
+
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    // Handle all the logic of talking to Bain the rich boy.
+    // Return true when the user clicks the button STOP_AFTER_CURRENT to stop or the required amount of rounds is
+    // reached. Return false when it enters battle.
+    bool run_lobby(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+    // Handle all battle logic.
+    void run_round(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+
+private:
+    DeferredStopButtonOption STOP_AFTER_CURRENT;
+    SimpleIntegerOption<uint32_t> NUM_ROUNDS;
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
+
+    SimpleIntegerOption<uint32_t> PERIODIC_SAVE;
+
+    BattleAIOption BATTLE_AI;
+
+    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/NonShinyHunting/PokemonLZA_StatsReset.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/NonShinyHunting/PokemonLZA_StatsReset.cpp
new file mode 100644
index 0000000000..ddfbec45ba
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/NonShinyHunting/PokemonLZA_StatsReset.cpp
@@ -0,0 +1,691 @@
+/*  Stats Reset
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "CommonTools/VisualDetectors/BlackScreenDetector.h"
+#include "CommonTools/StartupChecks/VideoResolutionCheck.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonLZA/Inference/Battles/PokemonLZA_RunFromBattleDetector.h"
+#include "VideoGames/PokemonLZA/Inference/Boxes/PokemonLZA_IvJudgeReader.h"
+#include "VideoGames/PokemonLZA/Inference/PokemonLZA_OverworldPartySelectionDetector.h"
+#include "VideoGames/PokemonLZA/Programs/PokemonLZA_GameEntry.h"
+#include "VideoGames/PokemonLZA/Programs/PokemonLZA_BasicNavigation.h"
+#include "VideoGames/PokemonLZA/Programs/PokemonLZA_FastTravelNavigation.h"
+#include "VideoGames/PokemonLZA/Programs/PokemonLZA_MenuNavigation.h"
+#include "VideoGames/PokemonLZA/Programs/PokemonLZA_TrainerBattle.h"
+#include "PokemonLZA_StatsReset.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+
+StatsReset_Descriptor::StatsReset_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonLZA:StatsReset",
+        STRING_POKEMON + " LZA", "Stats Reset",
+        "Programs/PokemonLZA/StatsReset.html",
+        "Repeatedly catch/receive " + STRING_POKEMON + " until you get the stats you want.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+struct StatsReset_Descriptor::Stats : public StatsTracker{
+    Stats()
+        : attempts(m_stats["Attempts"])
+        , catch_fail(m_stats["Catch Fails"])
+        , errors(m_stats["Errors"])
+        , matches(m_stats["Matches"])
+    {
+        m_display_order.emplace_back(Stat("Attempts"));
+        m_display_order.emplace_back(Stat("Catch Fails"));
+        m_display_order.emplace_back(Stat("Errors"));
+        m_display_order.emplace_back(Stat("Matches"));
+    }
+
+    std::atomic<uint64_t>& attempts;
+    std::atomic<uint64_t>& catch_fail;
+    std::atomic<uint64_t>& errors;
+    std::atomic<uint64_t>& matches;
+};
+std::unique_ptr<StatsTracker> StatsReset_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+
+
+StatsReset::StatsReset()
+    : GO_HOME_WHEN_DONE(true)
+    , LANGUAGE(
+        "<b>Game Language:</b>",
+        IV_READER().languages(),
+        LockMode::LOCK_WHILE_RUNNING
+    )
+    , POKEMON(
+        "<b>Gift " + STRING_POKEMON + ":</b>",
+        {
+            {GiftPokemon::FLOETTE,      "floette",      "Floette" },
+            {GiftPokemon::GENESECT,     "genesect",     "Genesect" },
+            {GiftPokemon::MAGEARNA,     "magearna",     "Magearna"},
+            {GiftPokemon::MARSHADOW,    "marshadow",    "Marshadow"},
+            {GiftPokemon::MELTAN,       "meltan",       "Meltan"  },
+            {GiftPokemon::MELMETAL,     "melmetal",     "Melmetal"},
+            {GiftPokemon::VOLCANION,    "volcanion",    "Volcanion"},
+            {GiftPokemon::HOOPA,        "hoopa",        "Hoopa"},
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        GiftPokemon::FLOETTE
+    )
+    , RIGHT_SCROLLS(
+        "<b>" + STRING_POKEBALL + " Right-Scrolls:</b><br>"
+                                  "Scroll this many balls to the right. Negative will scroll to the left.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        0, -15, 15
+    )
+    , SCROLL_HOLD(
+        "<b>Scroll Hold:</b><br>"
+        "When scrolling to the desired ball, hold the dpad button for this long.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        "120 ms"
+    )
+    , SCROLL_RELEASE(
+        "<b>Scroll Release:</b><br>"
+        "When scrolling to the desired ball, release dpad button for this long before the next scroll.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        "80 ms"
+    )
+    , POST_THROW_WAIT(
+        "<b>Post-Throw Wait:</b><br>Wait this long after throwing a ball before resetting.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        "6000 ms"
+    )
+    , DOWN_SCROLLS(
+        "<b>Donut Down-Scrolls:</b><br>"
+        "Scroll this many donuts down. Input a negative number to scroll up instead.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        0, -50, 50
+    )
+    , HP("<b>HP:</b>")
+    , ATTACK("<b>Attack:</b>", IvJudgeFilter::NoGood)
+    , DEFENSE("<b>Defense:</b>")
+    , SPATK("<b>Sp. Atk:</b>")
+    , SPDEF("<b>Sp. Def:</b>")
+    , SPEED("<b>Speed:</b>")
+    , NOTIFICATION_PROGRAM_FINISH("Program Finished", true, true, ImageAttachmentMode::JPG)
+    , NOTIFICATIONS({
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+{
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+
+    PA_ADD_OPTION(LANGUAGE);
+    PA_ADD_OPTION(POKEMON);
+    PA_ADD_OPTION(RIGHT_SCROLLS);
+    PA_ADD_OPTION(SCROLL_HOLD);
+    PA_ADD_OPTION(SCROLL_RELEASE);
+    PA_ADD_OPTION(POST_THROW_WAIT);
+    PA_ADD_OPTION(DOWN_SCROLLS);
+    PA_ADD_OPTION(BATTLE_AI);
+    PA_ADD_OPTION(HP);
+    PA_ADD_OPTION(ATTACK);
+    PA_ADD_OPTION(DEFENSE);
+    PA_ADD_OPTION(SPATK);
+    PA_ADD_OPTION(SPDEF);
+    PA_ADD_OPTION(SPEED);
+
+    PA_ADD_OPTION(NOTIFICATIONS);
+
+    StatsReset::on_config_value_changed(this);
+    POKEMON.add_listener(*this);
+}
+
+StatsReset::~StatsReset(){
+    POKEMON.remove_listener(*this);
+}
+
+void StatsReset::on_config_value_changed(void* object){
+    ConfigOptionState state_ball = (
+        POKEMON == GiftPokemon::GENESECT ||
+        POKEMON == GiftPokemon::MARSHADOW ||
+        POKEMON == GiftPokemon::MELTAN ||
+        POKEMON == GiftPokemon::VOLCANION
+    )
+        ? ConfigOptionState::ENABLED
+        : ConfigOptionState::HIDDEN;
+    ConfigOptionState state_donut = (
+        POKEMON == GiftPokemon::GENESECT ||
+        POKEMON == GiftPokemon::MELMETAL ||
+        POKEMON == GiftPokemon::HOOPA
+    )
+        ? ConfigOptionState::ENABLED
+        : ConfigOptionState::HIDDEN;
+    ConfigOptionState state_battle = (POKEMON == GiftPokemon::HOOPA)
+        ? ConfigOptionState::ENABLED
+        : ConfigOptionState::HIDDEN;
+    RIGHT_SCROLLS.set_visibility(state_ball);
+    SCROLL_HOLD.set_visibility(state_ball);
+    SCROLL_RELEASE.set_visibility(state_ball);
+    POST_THROW_WAIT.set_visibility(state_ball);
+    DOWN_SCROLLS.set_visibility(state_donut);
+    BATTLE_AI.set_visibility(state_battle);
+}
+
+void StatsReset::enter_portal(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    pbf_press_button(context, BUTTON_A, 50ms, 1s);
+    int8_t scrolls = DOWN_SCROLLS;
+    DpadPosition direction;
+    if (scrolls >= 0){
+        direction = DPAD_DOWN;
+    }else{
+        direction = DPAD_UP;
+        scrolls = -scrolls;
+    }
+    while (scrolls != 0){
+        pbf_press_dpad(context, direction, 50ms, 500ms);
+        scrolls--;
+    }
+    pbf_mash_button(context, BUTTON_A, 5s);
+    pbf_press_button(context, BUTTON_PLUS, 5s, 500ms);
+
+    OverworldPartySelectionWatcher overworld(COLOR_WHITE, &env.console.overlay());
+
+    context.wait_for_all_requests();
+
+    int ret = run_until<ProControllerContext>(
+        env.console, context,
+        [](ProControllerContext& context){
+            pbf_mash_button(context, BUTTON_B, 30s);
+        },
+        {
+            overworld,
+        }
+    );
+
+    if (ret == 0){
+        env.log("Detected overworld");
+        context.wait_for_all_requests();
+    }
+}
+
+void StatsReset::run_battle(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    bool attempt_move,
+    bool use_plus_move,
+    bool use_mega
+){
+    RunFromBattleWatcher battle_menu(COLOR_GREEN, &env.console.overlay(), 10ms);
+
+    context.wait_for_all_requests();
+    int ret = run_until<ProControllerContext>(
+        env.console, context,
+        [](ProControllerContext& context){
+            pbf_mash_button(context, BUTTON_B, 120s);
+        },
+        {
+            battle_menu,
+        }
+    );
+
+    if (ret == 0){
+        env.log("Detected battle menu");
+        if (use_mega){
+            pbf_press_button(context, BUTTON_RCLICK, 50ms, 500ms);
+            pbf_wait(context, 12s);
+        }
+        if (attempt_move){
+            pbf_press_button(context, BUTTON_Y, 50ms, 500ms);
+            ssf_press_button(context, BUTTON_ZL, 0ms, 4s, 200ms);
+            if (use_plus_move){
+                pbf_wait(context, 500ms);
+                pbf_press_button(context, BUTTON_PLUS, 50ms, 500ms);
+            }
+            pbf_mash_button(context, BUTTON_A, 4s);
+        }
+        context.wait_for_all_requests();
+    }
+}
+
+void StatsReset::run_catch(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    int8_t scrolls = RIGHT_SCROLLS;
+    DpadPosition direction;
+    if (scrolls >= 0){
+        direction = DPAD_RIGHT;
+    }else{
+        direction = DPAD_LEFT;
+        scrolls = -scrolls;
+    }
+
+    Milliseconds hold = SCROLL_HOLD;
+    Milliseconds cool = SCROLL_RELEASE;
+
+    ssf_press_button(
+        context,
+        BUTTON_ZL | BUTTON_ZR,
+        500ms, 500ms + (hold + cool) * scrolls,
+        0ms
+    );
+
+    while (scrolls != 0){
+        pbf_press_dpad(context, direction, hold, cool);
+        scrolls--;
+    }
+
+    pbf_wait(context, POST_THROW_WAIT);
+}
+
+void StatsReset::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    assert_16_9_720p_min(env.logger(), env.console);
+
+    //  Connect the controller.
+    require_player(env.console, context, BUTTON_L);
+
+    StatsReset_Descriptor::Stats& stats = env.current_stats<StatsReset_Descriptor::Stats>();
+
+    VideoSnapshot screen;
+    while (true){
+        env.update_stats();
+        context.wait_for_all_requests();
+
+        if (POKEMON == GiftPokemon::FLOETTE || POKEMON == GiftPokemon::MAGEARNA){
+            // fly to Quasartico Inc.
+            FastTravelState travel_status = open_map_and_fly_to(env.console, context, LANGUAGE, Location::QUASARTICO_INC);
+            if (travel_status != FastTravelState::SUCCESS){
+                stats.errors++;
+                env.update_stats();
+                OperationFailedExceptionWithScreenshot::fire(
+                    ErrorReportMode::SEND_ERROR_REPORT,
+                    "Failed to travel to Quasartico Inc.",
+                    env.console
+                );
+            }
+            context.wait_for(100ms);
+            env.log("Detected overworld. Fast traveled to Quasartico Inc.");
+
+            // move to the door
+            for (int i = 0; i < 4; ++i){
+                pbf_press_button(context, BUTTON_Y, 100ms, 1s);
+            }
+            context.wait_for_all_requests();
+            run_towards_gate_with_A_button(env.console, context, 0, +1, Seconds(2));
+            if (POKEMON == GiftPokemon::FLOETTE){
+                pbf_mash_button(context, BUTTON_A, 30s);
+            }
+            if (POKEMON == GiftPokemon::MAGEARNA){
+                pbf_mash_button(context, BUTTON_A, Seconds(2));
+                context.wait_for_all_requests();
+                wait_until_overworld(env.console, context, Seconds(10));
+                run_towards_gate_with_A_button(env.console, context, +0.15, +1, Seconds(3));
+                pbf_mash_button(context, BUTTON_A, 30s);
+            }
+        }
+
+        if (POKEMON == GiftPokemon::MELTAN || POKEMON == GiftPokemon::MELMETAL){
+            // fly to Lysandre Café, replace with OCR in the future
+            FastTravelState travel_status = open_map_and_fly_to(
+                env.console,
+                context,
+                LANGUAGE,
+                Location::LYSANDRE_CAFE
+            );
+            if (travel_status != FastTravelState::SUCCESS){
+                stats.errors++;
+                env.update_stats();
+                OperationFailedExceptionWithScreenshot::fire(
+                    ErrorReportMode::SEND_ERROR_REPORT,
+                    "Failed to travel to Lysandre Café",
+                    env.console
+                );
+            }
+            context.wait_for(100ms);
+            env.log("Detected overworld. Fast traveled to Lysandre Café");
+
+            // move to the staircase
+            pbf_move_left_joystick(context, {-1, -0.05}, 200ms, 500ms);
+            pbf_press_button(context, BUTTON_L, 50ms, 500ms);
+            ssf_press_button(context, BUTTON_B, 0ms, 1000ms, 0ms);
+            pbf_move_left_joystick(context, {0, +1}, 6s, 500ms);
+            pbf_move_left_joystick(context, {1, 0.45}, 200ms, 500ms);
+            pbf_press_button(context, BUTTON_L, 50ms, 500ms);
+            ssf_press_button(context, BUTTON_B, 0ms, 1000ms, 0ms);
+            pbf_move_left_joystick(context, {0, +1}, 8s, 500ms);
+            if (POKEMON == GiftPokemon::MELTAN){
+                // start battle, knock out in one move
+                run_battle(env, context, true);
+
+                // expected knock out, throw ball
+                run_catch(env, context);
+
+                pbf_mash_button(context, BUTTON_A, 10s);
+            }
+            if (POKEMON == GiftPokemon::MELMETAL){
+                enter_portal(env, context);
+
+                pbf_press_button(context, BUTTON_L, 50ms, 500ms);
+                ssf_press_button(context, BUTTON_B, 0ms, 1000ms, 0ms);
+                pbf_move_left_joystick(context, {0, +1}, 2s, 1s);
+                pbf_move_left_joystick(context, {+1, 0}, 200ms, 500ms);
+                pbf_press_button(context, BUTTON_L, 50ms, 500ms);
+                ssf_press_button(context, BUTTON_B, 0ms, 1000ms, 0ms);
+                pbf_move_left_joystick(context, {0, +1}, 1s, 1s);
+                pbf_move_left_joystick(context, {-1, +1}, 200ms, 500ms);
+                pbf_press_button(context, BUTTON_L, 50ms, 500ms);
+                ssf_press_button(context, BUTTON_B, 0ms, 1000ms, 0ms);
+                pbf_move_left_joystick(context, {+0.05, +1}, 3s, 1s);
+
+                pbf_mash_button(context, BUTTON_A, 4s);
+            }
+        }
+
+        if (POKEMON == GiftPokemon::GENESECT){
+            // fly to wild zone 13
+            FastTravelState travel_status = open_map_and_fly_to(
+                env.console,
+                context,
+                LANGUAGE,
+                Location::WILD_ZONE_13
+            );
+            if (travel_status != FastTravelState::SUCCESS){
+                stats.errors++;
+                env.update_stats();
+                OperationFailedExceptionWithScreenshot::fire(
+                    ErrorReportMode::SEND_ERROR_REPORT,
+                    "Failed to travel to Wild Zone 13",
+                    env.console
+                );
+            }
+            context.wait_for(100ms);
+            env.log("Detected overworld. Fast traveled to Wild Zone 13");
+
+            // move to the portal
+            run_towards_gate_with_A_button(env.console, context, 0, +1, Seconds(5));
+            pbf_mash_button(context, BUTTON_A, 4s);
+
+            ssf_press_button(context, BUTTON_B, 0ms, 1000ms, 0ms);
+            pbf_move_left_joystick(context, {0.6, +1}, 2500ms, 500ms);
+
+            enter_portal(env, context);
+            pbf_wait(context, 5s);
+
+            // initiate battle
+            pbf_press_button(context, BUTTON_L, 50ms, 500ms);
+            ssf_press_button(context, BUTTON_B, 0ms, 1000ms, 0ms);
+            pbf_move_left_joystick(context, {0, +1}, 15s, 1s);
+            pbf_move_left_joystick(context, {-1, 0}, 200ms, 500ms);
+            pbf_press_button(context, BUTTON_L, 50ms, 500ms);
+            ssf_press_button(context, BUTTON_B, 0ms, 1000ms, 0ms);
+            pbf_move_left_joystick(context, {0.2, +1}, 15s, 1s);
+
+            run_battle(env, context);
+
+            run_catch(env, context);
+            pbf_mash_button(context, BUTTON_A, 5s);
+        }
+
+        if (POKEMON == GiftPokemon::VOLCANION){
+            // fly to research lab
+            FastTravelState travel_status = open_map_and_fly_to(env.console, context, LANGUAGE, Location::POKEMON_RESEARCH_LAB);
+            if (travel_status != FastTravelState::SUCCESS){
+                stats.errors++;
+                env.update_stats();
+                OperationFailedExceptionWithScreenshot::fire(
+                    ErrorReportMode::SEND_ERROR_REPORT,
+                    "Failed to travel to Research Lab",
+                    env.console
+                );
+            }
+            context.wait_for(100ms);
+            env.log("Detected overworld. Fast traveled to Research Lab");
+
+            run_towards_gate_with_A_button(env.console, context, 0, +1, Seconds(5));
+            pbf_mash_button(context, BUTTON_A, 10s);
+
+            // elevator sequence
+            run_towards_gate_with_A_button(env.console, context, 0, +1, Seconds(5));
+            pbf_press_button(context, BUTTON_A, 50ms, 1s);
+            pbf_press_button(context, BUTTON_A, 50ms, 1s);
+            pbf_press_dpad(context, DPAD_DOWN, 50ms, 1s);
+            pbf_mash_button(context, BUTTON_A, 10s);
+
+            pbf_move_left_joystick(context, {+0.7, +1}, 1s, 500ms);
+            pbf_move_left_joystick(context, {+0.6, -1}, 1s, 500ms);
+
+            pbf_mash_button(context, BUTTON_A, 30s);
+
+            run_battle(env, context, true, true);
+            // additional delay because Fissure takes longer to launch
+            pbf_wait(context, 4s);
+
+            run_catch(env, context);
+            pbf_mash_button(context, BUTTON_A, 20s);
+        }
+
+        if (POKEMON == GiftPokemon::MARSHADOW){
+            // assume user is already at the nearest Pokémon Center, run towards the shadow
+            // no additional flying since this is time sensitive
+            pbf_move_left_joystick(context, {-0.3, -1}, 4500ms, 500ms);
+            pbf_press_button(context, BUTTON_L, 50ms, 500ms);
+            pbf_move_left_joystick(context, {-0.5, 1}, 100ms, 500ms);
+            pbf_press_button(context, BUTTON_L, 50ms, 500ms);
+            context.wait_for_all_requests();
+            run_towards_gate_with_A_button(env.console, context, 0, +1, Seconds(10));
+
+            pbf_mash_button(context, BUTTON_A, 20s);
+            run_battle(env, context, true, true, true);
+            // additional delay because Dragon Ascent takes longer to launch
+            pbf_wait(context, 1s);
+
+            run_catch(env, context);
+            pbf_mash_button(context, BUTTON_A, 7s);
+        }
+
+        if (POKEMON == GiftPokemon::HOOPA){
+            // run to holovator from bleu pokemon center
+            pbf_move_left_joystick(context, {1, -0.5}, 200ms, 500ms);
+            pbf_press_button(context, BUTTON_Y, 100ms, 1s);
+            pbf_move_left_joystick(context, {-0.14, -1}, 200ms, 500ms);
+            pbf_press_button(context, BUTTON_L, 50ms, 500ms);
+            ssf_press_button(context, BUTTON_B, 0ms, 1s, 0ms);
+            pbf_move_left_joystick(context, {0, 1}, 6s, 0ms);
+            pbf_move_left_joystick(context, {0.05, 1}, 4800ms, 0ms);
+            pbf_mash_button(context, BUTTON_A, 1s);
+            context.wait_for_all_requests();
+            wait_until_overworld(env.console, context, 10s);
+
+            // run to the right of roof
+            pbf_press_button(context, BUTTON_Y, 100ms, 1s);
+            pbf_move_left_joystick(context, {1, 0.12}, 200ms, 500ms);
+            for (int i = 0; i < 6; ++i){
+                pbf_press_button(context, BUTTON_Y, 100ms, 1s);
+            }
+
+            ssf_press_button(context, BUTTON_B, 0ms, 1s, 0ms);
+            pbf_move_left_joystick(context, {1, 0.12}, 1s, 500ms);
+
+            // run forward to the ladder
+            pbf_move_left_joystick(context, {0, 1}, 200ms, 500ms);
+            for (int i = 0; i < 5; ++i){
+                pbf_press_button(context, BUTTON_Y, 100ms, 1s);
+            }
+
+            ssf_press_button(context, BUTTON_B, 0ms, 1s, 0ms);
+            pbf_move_left_joystick(context, {0, 1}, 1s, 500ms);
+
+            pbf_press_button(context, BUTTON_Y, 100ms, 1s);
+            pbf_press_button(context, BUTTON_Y, 100ms, 1s);
+
+            ssf_press_button(context, BUTTON_B, 0ms, 1s, 0ms);
+            pbf_move_left_joystick(context, {-0.2, 1}, 4s, 0ms);
+            ssf_press_button(context, BUTTON_B, 0ms, 1s, 0ms);
+            pbf_move_left_joystick(context, {-0.8, 1}, 1500ms, 0ms);
+
+            // climb ladder
+            pbf_mash_button(context, BUTTON_A, 500ms);
+            pbf_move_left_joystick(context, {0, 1}, 8s, 1500ms);
+
+            ssf_press_button(context, BUTTON_B, 0ms, 1s, 0ms);
+            pbf_move_left_joystick(context, {-1, 0}, 2s, 0ms);
+
+            enter_portal(env, context);
+            context.wait_for(100ms);
+
+            // run toward hoopa to start battle
+            ssf_press_button(context, BUTTON_B, 0ms, 1s, 0ms);
+            pbf_move_left_joystick(context, {0, 1}, 8s, 0ms);
+
+            RunFromBattleWatcher battle_menu(COLOR_GREEN, &env.console.overlay(), 10ms);
+            OverworldPartySelectionWatcher overworld(COLOR_WHITE, &env.console.overlay(), 100ms);
+            TrainerBattleState battle_state(BATTLE_AI);
+            context.wait_for_all_requests();
+            bool has_error = false;
+            while (true){
+                int ret = run_until<ProControllerContext>(
+                    env.console, context,
+                    [](ProControllerContext& context){
+                        pbf_mash_button(context, BUTTON_B, 120s);
+                    },
+                    {
+                        battle_menu,
+                        overworld,
+                    }
+                );
+
+                switch (ret){
+                case 0:
+                    env.log("Detected battle menu.");
+                    if (!battle_state.attempt_one_attack(env, env.console, context)){
+                        pbf_press_button(context, BUTTON_UP, 500ms, 1s);
+                    }
+                    continue;
+                case 1:
+                    env.log("Detected overworld.");
+                    break;
+                default:
+                    has_error = true;
+                    break;
+                }
+                break;
+            }
+            if (has_error){
+                stats.errors++;
+                env.log("Error during battle.", COLOR_RED);
+                // fail safely and start over
+                go_home(env.console, context);
+                reset_game_from_home(env, env.console, context, true);
+                continue;
+            }
+            context.wait_for(100ms);
+            // run toward hoopa to catch
+            run_towards_gate_with_A_button(env.console, context, 0.063, 1, 2s);
+            pbf_mash_button(context, BUTTON_A, 1s);
+        }
+
+        context.wait_for_all_requests();
+        {
+            BlackScreenOverWatcher detector;
+            OverworldPartySelectionWatcher overworld(COLOR_WHITE, &env.console.overlay());
+            RunFromBattleWatcher battle_menu(COLOR_GREEN, &env.console.overlay(), 10ms);
+            int result = run_until<ProControllerContext>(
+                env.console, context,
+                [this](ProControllerContext& context){
+                    if (POKEMON == GiftPokemon::FLOETTE || POKEMON == GiftPokemon::MELMETAL){
+                        pbf_mash_button(context, BUTTON_A, 60s);
+                    }else if (POKEMON == GiftPokemon::MAGEARNA){
+                        pbf_mash_button(context, BUTTON_A, 60s);
+                    }else if (POKEMON == GiftPokemon::HOOPA){
+                        pbf_mash_button(context, BUTTON_A, 120s);
+                    }else{
+                        pbf_mash_button(context, BUTTON_A, 30s);
+                    }
+                },
+                {
+                    detector,
+                    overworld,
+                    battle_menu
+                }
+            );
+            switch (result){
+            case 0:
+                env.log(STRING_POKEMON + " dialog finished.", COLOR_PURPLE);
+                break;
+            case 1:
+                env.log("Early overworld, catch failed", COLOR_PURPLE);
+                stats.catch_fail++;
+                go_home(env.console, context);
+                reset_game_from_home(env, env.console, context, true);
+                continue;
+            case 2:
+                env.log("Still in battle, catch failed", COLOR_PURPLE);
+                stats.catch_fail++;
+                go_home(env.console, context);
+                reset_game_from_home(env, env.console, context, true);
+                continue;
+            default:
+                stats.errors++;
+                env.log(STRING_POKEMON + " dialog timed out.", COLOR_RED);
+                // fail safely and start over
+                go_home(env.console, context);
+                reset_game_from_home(env, env.console, context, true);
+                continue;
+            }
+        }
+
+        overworld_to_box_system(env.console, context);
+        pbf_press_button(context, BUTTON_RCLICK, 500ms, 500ms);
+        stats.attempts++;
+        context.wait_for_all_requests();
+
+        {
+            IvJudgeReaderScope reader(env.console, LANGUAGE);
+            screen = env.console.video().snapshot();
+            IvJudgeReader::Results results = reader.read(env.console, screen);
+            bool ok = true;
+            ok &= HP.matches(stats.errors, results.hp);
+            ok &= ATTACK.matches(stats.errors, results.attack);
+            ok &= DEFENSE.matches(stats.errors, results.defense);
+            ok &= SPATK.matches(stats.errors, results.spatk);
+            ok &= SPDEF.matches(stats.errors, results.spdef);
+            ok &= SPEED.matches(stats.errors, results.speed);
+            if (ok){
+                break;
+            }
+        }
+
+        pbf_mash_button(context, BUTTON_B, 3s);
+        go_home(env.console, context);
+        reset_game_from_home(env, env.console, context, true);
+    }
+
+    stats.matches++;
+    env.update_stats();
+    env.log("Result Found!", COLOR_BLUE);
+
+    pbf_wait(context, 5000ms);
+    pbf_press_button(context, BUTTON_CAPTURE, 2000ms, 5000ms);
+
+    send_program_finished_notification(
+        env, NOTIFICATION_PROGRAM_FINISH,
+        "Found a match!",
+        screen, false
+    );
+    GO_HOME_WHEN_DONE.run_end_of_program(context);
+}
+
+
+}
+}
+}
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/NonShinyHunting/PokemonLZA_StatsReset.h b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/NonShinyHunting/PokemonLZA_StatsReset.h
new file mode 100644
index 0000000000..8fa63c07b9
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/NonShinyHunting/PokemonLZA_StatsReset.h
@@ -0,0 +1,97 @@
+/*  Stats Reset
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLZA_StatsReset_H
+#define PokemonAutomation_PokemonLZA_StatsReset_H
+
+#include "Common/Cpp/Options/EnumDropdownOption.h"
+#include "Common/Cpp/Options/TimeDurationOption.h"
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "CommonTools/Options/LanguageOCROption.h"
+#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+#include "NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "Pokemon/Options/Pokemon_IvJudgeOption.h"
+#include "VideoGames/PokemonLZA/Options/PokemonLZA_BattleAIOption.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+using namespace Pokemon;
+
+
+class StatsReset_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    StatsReset_Descriptor();
+
+    struct Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+
+
+class StatsReset : public SingleSwitchProgramInstance, public ConfigOption::Listener{
+public:
+    using Descriptor = StatsReset_Descriptor;
+    ~StatsReset();
+    StatsReset();
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    virtual void enter_portal(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+    virtual void run_battle(
+        SingleSwitchProgramEnvironment& env,
+        ProControllerContext& context,
+        bool attempt_move = false,
+        bool use_plus_move = false,
+        bool use_mega = false
+    );
+    virtual void run_catch(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+    virtual void on_config_value_changed(void* object) override;
+    StartInGripOrGameOption START_LOCATION;
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
+
+    OCR::LanguageOCROption LANGUAGE;
+
+    enum class GiftPokemon{
+        FLOETTE,
+        GENESECT,
+        MAGEARNA,
+        MARSHADOW,
+        MELTAN,
+        MELMETAL,
+        VOLCANION,
+        HOOPA,
+    };
+    EnumDropdownOption<GiftPokemon> POKEMON;
+
+    SimpleIntegerOption<int8_t> RIGHT_SCROLLS;
+    MillisecondsOption SCROLL_HOLD;
+    MillisecondsOption SCROLL_RELEASE;
+    MillisecondsOption POST_THROW_WAIT;
+
+    SimpleIntegerOption<int8_t> DOWN_SCROLLS;
+
+    BattleAIOption BATTLE_AI;
+
+    IVJudgeFilterOption HP;
+    IVJudgeFilterOption ATTACK;
+    IVJudgeFilterOption DEFENSE;
+    IVJudgeFilterOption SPATK;
+    IVJudgeFilterOption SPDEF;
+    IVJudgeFilterOption SPEED;
+
+    EventNotificationOption NOTIFICATION_PROGRAM_FINISH;
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/NonShinyHunting/PokemonLZA_WeatherFinder.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/NonShinyHunting/PokemonLZA_WeatherFinder.cpp
new file mode 100644
index 0000000000..9ee5898c42
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/NonShinyHunting/PokemonLZA_WeatherFinder.cpp
@@ -0,0 +1,247 @@
+/*  Weather Finder
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <cstdint>
+#include <string>
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonTools/StartupChecks/VideoResolutionCheck.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonLZA/Inference/Boxes/PokemonLZA_BoxDetection.h"
+#include "VideoGames/PokemonLZA/Programs/PokemonLZA_BasicNavigation.h"
+#include "VideoGames/PokemonLZA/Programs/PokemonLZA_MenuNavigation.h"
+#include "VideoGames/PokemonLZA/Inference/PokemonLZA_WeatherDetector.h"
+#include "PokemonLZA_WeatherFinder.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+using namespace Pokemon;
+
+WeatherFinder_Descriptor::WeatherFinder_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonLZA:WeatherFinder",
+        STRING_POKEMON + " LZA", "Weather Finder",
+        "Programs/PokemonLZA/WeatherFinder.html",
+        "Reset the weather by siting on a bench until reach the desired value",
+        PanelQualityStanding::OFFICIAL_BETA,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{
+}
+
+class WeatherFinder_Descriptor::Stats : public StatsTracker {
+public:
+    Stats()
+        : loops(m_stats["Loops"])
+        , errors(m_stats["Errors"])
+    {
+        m_display_order.emplace_back("Loops");
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+    }
+
+    std::atomic<uint64_t>& loops;
+    std::atomic<uint64_t>& errors;
+};
+
+std::unique_ptr<StatsTracker> WeatherFinder_Descriptor::make_stats() const {
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+
+WeatherFinder::WeatherFinder()
+    : START_POSITION(
+        "<b>Starting from day or night:</b>",
+        {
+            {0, "day", "DAY"},
+            {1, "night", "NIGHT"},
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        0
+        )
+    , DESIRED_WEATHER(
+        "<b>Stop on:</b>",
+        {
+            {0, "day-clear", "Clear Day"},
+            {1, "day-cloudy", "Cloudy Day"},
+            {2, "day-rainy", "Rainy Day"},
+            {3, "day-sunny", "Sunny Day"},
+            {4, "day-foggy", "Foggy Day"},
+            {5, "day-rainbow", "Rainbow Day"},
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        0
+        )
+    , GO_HOME_WHEN_DONE(true)
+    , NOTIFICATION_STATUS("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_STATUS,
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_RECOVERABLE,
+        &NOTIFICATION_ERROR_FATAL,
+        })
+{
+    PA_ADD_OPTION(START_POSITION);
+    PA_ADD_OPTION(DESIRED_WEATHER);
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+// //Test Method
+// void WeatherFinder::validate_weather(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+//     VideoSnapshot screen = env.console.video().snapshot();
+    
+//     WeatherIconDetector clearDetector(
+//         WeatherIconType::Clear,
+//         &env.console.overlay()
+//     );
+//     bool clearResult = clearDetector.detect(screen);
+//     env.log("Clear is " + std::to_string(clearResult));
+//     // context.wait_for_all_requests();
+
+//     WeatherIconDetector sunnyDetector(
+//         WeatherIconType::Sunny,
+//         &env.console.overlay()
+//     );
+//     bool sunnyResult = sunnyDetector.detect(screen);
+//     env.log("Sunny is " + std::to_string(sunnyResult));
+
+//     WeatherIconDetector rainyDetector(
+//         WeatherIconType::Rain,
+//         &env.console.overlay()
+//     );
+//     bool rainyResult = rainyDetector.detect(screen);
+//     env.log("Rainy is " + std::to_string(rainyResult));
+
+//     WeatherIconDetector cloudyDetector(
+//         WeatherIconType::Cloudy,
+//         &env.console.overlay()
+//     );
+//     bool cloudyResult = cloudyDetector.detect(screen);
+//     env.log("Cloudy is " + std::to_string(cloudyResult));
+    
+//     WeatherIconDetector foggyDetector(
+//         WeatherIconType::Foggy,
+//         &env.console.overlay()
+//     );
+//     bool foggyResult = foggyDetector.detect(screen);
+//     env.log("Foggy is " + std::to_string(foggyResult));
+
+//     WeatherIconDetector rainbowDetector(
+//         WeatherIconType::Rainbow,
+//         &env.console.overlay()
+//     );
+//     bool rainbowResult = rainbowDetector.detect(screen);
+//     env.log("Rainbow is " + std::to_string(rainbowResult));
+// }
+
+WeatherIconType get_weather_type(size_t option){
+    switch (option){
+        case 0:
+            return WeatherIconType::Clear;
+        case 1:
+            return WeatherIconType::Cloudy;
+        case 2:
+            return WeatherIconType::Rain;
+        case 3:
+            return WeatherIconType::Sunny;
+        case 4:
+            return WeatherIconType::Foggy;
+        case 5:
+            return WeatherIconType::Rainbow;
+        default:
+            return WeatherIconType::Clear;
+    }
+}
+
+std::string get_weather_name(size_t option){
+    switch (option){
+        case 0:
+            return "Clear";
+        case 1:
+            return "Cloudy";
+        case 2:
+            return "Rainy";
+        case 3:
+            return "Sunny";
+        case 4:
+            return "Foggy";
+        case 5:
+            return "Rainbow";
+        default:
+            return "Clear";
+    }
+}
+
+void bench_it(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    sit_on_bench(env.console, context);
+    pbf_move_left_joystick(context, {0, -1}, 500ms, 500ms);
+    context.wait_for_all_requests();
+}
+
+void WeatherFinder::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    WeatherFinder_Descriptor::Stats& stats = env.current_stats<WeatherFinder_Descriptor::Stats>();
+    assert_16_9_720p_min(env.logger(), env.console);
+
+    //  Connect the controller.
+    require_player(env.console, context, BUTTON_L);
+    
+    bool isDay = !START_POSITION.current_value();
+
+    //Reset to day time
+    if (!isDay){
+        env.log("Resetting to Day");
+        bench_it(env, context);
+        isDay = true;
+    }
+
+    WeatherIconType weatherType = get_weather_type(DESIRED_WEATHER.current_value());
+    std::string weatherName = get_weather_name(DESIRED_WEATHER.current_value());
+
+    WeatherIconDetector detector(
+            weatherType,
+            &env.console.overlay()
+        );
+
+    while (true){
+        env.log("Looking for " + weatherName + " " + std::string(isDay ? "day" : "night"));
+        
+        open_map(env.console, context, false, true);
+        VideoSnapshot screen = env.console.video().snapshot();
+        
+        bool result = detector.detect(screen);
+        context.wait_for_all_requests();
+        
+        if (result == 1){
+            env.log("Desired weather found.");
+            GO_HOME_WHEN_DONE.run_end_of_program(context);
+            send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+            break;
+        }else{
+            env.log("Desired weather not found. Continuing");
+            pbf_press_button(context, BUTTON_PLUS, 500ms, 500ms);
+            for (uint8_t c = 0; c < 2; c++){
+                bench_it(env, context);
+                isDay = !isDay;
+                env.log("Current time of day: " + std::string(isDay ? "DAY" : "NIGHT"));
+            }
+            stats.loops++;
+            context.wait_for_all_requests();
+        }
+        env.update_stats();
+        context.wait_for_all_requests();
+        send_program_status_notification(env, NOTIFICATION_STATUS);
+    }
+}
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/NonShinyHunting/PokemonLZA_WeatherFinder.h b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/NonShinyHunting/PokemonLZA_WeatherFinder.h
new file mode 100644
index 0000000000..33f986aa19
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/NonShinyHunting/PokemonLZA_WeatherFinder.h
@@ -0,0 +1,48 @@
+/*  Weather Finder
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  Reset the weather by siting on a bench until reach the desired value
+ */
+
+#ifndef PokemonAutomation_PokemonLZA_WeatherFinder_H
+#define PokemonAutomation_PokemonLZA_WeatherFinder_H
+
+#include "Common/Cpp/Options/EnumDropdownOption.h"
+#include "CommonFramework/Notifications/EventNotificationOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+
+namespace PokemonAutomation {
+namespace NintendoSwitch {
+namespace PokemonLZA {
+
+class WeatherFinder_Descriptor : public SingleSwitchProgramDescriptor {
+public:
+    WeatherFinder_Descriptor();
+
+    class Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+
+class WeatherFinder : public SingleSwitchProgramInstance {
+public:
+    using Descriptor = WeatherFinder_Descriptor;
+    WeatherFinder();
+
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    IntegerEnumDropdownOption START_POSITION;
+    IntegerEnumDropdownOption DESIRED_WEATHER;
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
+
+    EventNotificationOption NOTIFICATION_STATUS;
+    EventNotificationsOption NOTIFICATIONS;
+};
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_BasicNavigation.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_BasicNavigation.cpp
new file mode 100644
index 0000000000..64e5856828
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_BasicNavigation.cpp
@@ -0,0 +1,559 @@
+/*  Basic Navigation
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <cmath>
+#include "Common/Cpp/PrettyPrint.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "CommonTools/VisualDetectors/BlackScreenDetector.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+#include "NintendoSwitch/NintendoSwitch_ConsoleHandle.h"
+#include "VideoGames/PokemonLZA/Inference/Map/PokemonLZA_DirectionArrowDetector.h"
+#include "VideoGames/PokemonLZA/Inference/Map/PokemonLZA_MapIconDetector.h"
+#include "VideoGames/PokemonLZA/Inference/Map/PokemonLZA_MapDetector.h"
+#include "VideoGames/PokemonLZA/Inference/PokemonLZA_DialogDetector.h"
+#include "VideoGames/PokemonLZA/Inference/PokemonLZA_MainMenuDetector.h"
+#include "VideoGames/PokemonLZA/Inference/PokemonLZA_OverworldPartySelectionDetector.h"
+#include "VideoGames/PokemonLZA/Inference/PokemonLZA_SelectionArrowDetector.h"
+
+#include "PokemonLZA_BasicNavigation.h"
+
+namespace PokemonAutomation::NintendoSwitch::PokemonLZA{
+
+bool save_game_to_menu(ConsoleHandle& console, ProControllerContext& context){
+
+    bool seen_save_button = false;
+    bool seen_saved_dialog = false;
+
+    WallClock start = current_time();
+    while (true){
+        context.wait_for_all_requests();
+
+        if (current_time() - start > std::chrono::seconds(120)){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "save_game_to_menu(): Unable to save game after 2 minutes.",
+                console
+            );
+        }
+
+        OverworldPartySelectionWatcher overworld(COLOR_WHITE, &console.overlay());
+        MainMenuWatcher main_menu(COLOR_YELLOW, &console.overlay());
+        SelectionArrowWatcher save_button(
+            COLOR_GREEN,
+            &console.overlay(),
+            SelectionArrowType::RIGHT,
+            {0.287118, 0.638835, 0.064410, 0.108738}
+        );
+        BlueDialogWatcher dialog(COLOR_YELLOW, &console.overlay());
+
+        int ret = wait_until(
+            console, context,
+            std::chrono::seconds(30),
+            {
+                overworld,
+                dialog,
+                main_menu,
+                save_button,
+            }
+        );
+        context.wait_for(100ms);
+        switch (ret){
+        case 0:
+            console.log("Detected overworld...");
+            pbf_press_button(context, BUTTON_X, 160ms, 240ms);
+            continue;
+        case 1:
+            if (!seen_save_button){
+                console.log("Detected dialog before save prompt. Unable to save.", COLOR_RED);
+                pbf_press_button(context, BUTTON_B, 160ms, 240ms);
+                return false;
+            }
+
+            console.log("Detected dialog...");
+            seen_saved_dialog = true;
+            pbf_press_button(context, BUTTON_B, 160ms, 240ms);
+            continue;
+        case 2:
+            console.log("Detected main menu...");
+            if (seen_save_button && seen_saved_dialog){
+                return true;
+            }
+            pbf_press_button(context, BUTTON_R, 160ms, 240ms);
+            continue;
+        case 3:
+            console.log("Detected save button...");
+            seen_save_button = true;
+            pbf_press_button(context, BUTTON_A, 160ms, 240ms);
+            continue;
+        }
+    }
+}
+
+
+
+
+
+bool open_map(
+    ConsoleHandle& console,
+    ProControllerContext& context,
+    bool zoom_to_max,
+    bool require_icons
+){
+    pbf_press_button(context, BUTTON_PLUS, 240ms, 40ms);
+    context.wait_for_all_requests();
+    console.log("Opening Map...");
+    console.overlay().add_log("Open Map");
+    
+    WallClock deadline = current_time() + 30s;
+
+    const ImageFloatBox icon_region{0.0, 0.089, 1.0, 0.911};
+    MapIconDetector pokecenter_icon(COLOR_RED, MapIconType::PokemonCenter, icon_region, &console.overlay());
+    MapIconDetector flyable_building_icon(COLOR_BLACK, MapIconType::BuildingFlyable, icon_region, &console.overlay());
+    MapIconDetector flayble_cafe_icon(COLOR_ORANGE, MapIconType::CafeFlyable, icon_region, &console.overlay());
+
+    MapWatcher map_detector(COLOR_RED, &console.overlay());
+    map_detector.attach_map_icon_detector(pokecenter_icon);
+    map_detector.attach_map_icon_detector(flyable_building_icon);
+    map_detector.attach_map_icon_detector(flayble_cafe_icon);
+
+    do{
+        map_detector.reset_state();
+
+        int ret = wait_until(
+            console, context,
+            5000ms,
+            {map_detector}
+        );
+        switch (ret){
+        case 0:
+            console.log("Detected map!", COLOR_BLUE);
+            console.overlay().add_log("Map Detected");
+
+            if (zoom_to_max){
+                map_detector.reset_state();
+                // move right joystick to zoom out the map
+                for (int i = 0; i < 3; i++){
+                    pbf_move_right_joystick(context, {0, -1}, 100ms, 300ms);
+                }
+                context.wait_for_all_requests();
+                console.log("Set to fully zoomed out");
+                console.overlay().add_log("Zoom to Max");
+                // Re-run the map icon detectors to find flyable icons on the now fully
+                // zoomed out map.
+                wait_until(
+                    console, context,
+                    5000ms,
+                    {map_detector}
+                );
+            }
+
+            return !require_icons || map_detector.detected_map_icons().size() > 0;
+        default:
+            console.log("Map not found. Press + again", COLOR_ORANGE);
+            pbf_press_button(context, BUTTON_PLUS, 240ms, 80ms);
+            console.overlay().add_log("Map not Found. Press + Again");
+            context.wait_for_all_requests();
+        }
+
+    }while (current_time() < deadline);
+
+    console.overlay().add_log("Failed to Open Map After 30 sec", COLOR_RED);
+    OperationFailedExceptionWithScreenshot::fire(
+        ErrorReportMode::SEND_ERROR_REPORT,
+        "open_map(): Unable to find map after 30 seconds.",
+        console
+    );
+}
+
+FastTravelState fly_from_map(
+    ConsoleHandle& console, ProControllerContext& context,
+    std::shared_ptr<const ImageRGB32>* overworld_screen
+){
+    console.log("Flying from map...");
+    context.wait_for_all_requests();
+    {
+        BlackScreenWatcher start_flying(COLOR_RED);
+        MapOverWatcher map_over(COLOR_RED, &console.overlay());
+        BlueDialogWatcher blue_dialog(COLOR_BLUE, &console.overlay(), 50ms);
+        int ret = run_until<ProControllerContext>(
+            console, context,
+            [&](ProControllerContext& context){
+                for (int i = 0; i < 4; i++){
+                    pbf_mash_button(context, BUTTON_A, 1000ms);
+                }
+            },
+            {start_flying, map_over, blue_dialog,}
+        );
+        switch (ret){
+        case 0:
+        case 1:
+            console.log("Flying from map... Started!");
+            console.overlay().add_log("Fast Traveling");
+            break;
+        case 2:
+            console.log("Spotted by wild pokemon, cannot fly");
+            console.overlay().add_log("Spotted by Wild Pokemon");
+            return FastTravelState::PURSUED;
+        default:
+            console.log("Map cursor not on fast travel location");
+            console.overlay().add_log("Not On Fast Travel Location");
+            return FastTravelState::NOT_AT_FLY_SPOT;
+#if 0
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "fly_from_map(): Unable to fly.",
+                console
+            );
+#endif
+        }
+    }
+
+    OverworldPartySelectionWatcher overworld(COLOR_WHITE, &console.overlay());
+    BlueDialogWatcher blue_dialog(COLOR_BLUE, &console.overlay());
+    int ret = wait_until(
+        console, context, 30s,  // set 30sec to be long enough for Switch 1 to load the overworld
+        {overworld, blue_dialog}
+    );
+    switch (ret){
+    case 0:
+        console.log("Flying from map... Done!");
+        console.overlay().add_log("Fast Travel Done");
+        break;
+    case 1:
+        console.log("Detected blue dialog. Rare by probably too many button A mashing to trigger return to Lumiose dialog while teleporting to Hyperspace portal");
+        ret = run_until<ProControllerContext>(
+            console, context,
+            [](ProControllerContext& context){
+                pbf_mash_button(context, BUTTON_B, 5s);
+            },
+            {{overworld}}
+        );
+        if (ret != 0){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "fly_from_map(): Does not detect overworld after encountering blue dialog.",
+                console
+            );
+        }
+        console.log("Flying from map... Done!");
+        console.overlay().add_log("Fast Travel Done");
+        break;
+    default:
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "fly_from_map(): Does not detect overworld after fast travel.",
+            console
+        );
+    }
+
+    if (overworld_screen != nullptr){
+        *overworld_screen = overworld.last_detected_frame();
+    }
+
+    return FastTravelState::SUCCESS;
+}
+
+FastTravelState open_map_and_fly_in_place(ConsoleHandle& console, ProControllerContext& context, bool zoom_to_max){
+    bool can_fast_travel = open_map(console, context, zoom_to_max, true);
+    if (!can_fast_travel){
+        return FastTravelState::PURSUED;
+    }
+    return fly_from_map(console, context);
+}
+
+
+void move_map_cursor_from_entrance_to_zone(ConsoleHandle& console, ProControllerContext& context, Location zone){
+    pbf_wait(context, 300ms);
+    switch(zone){
+    case Location::WILD_ZONE_1:
+        pbf_move_left_joystick(context, {-1, -0.173}, 120ms, 0ms);
+        break;
+    case Location::WILD_ZONE_2:
+        pbf_move_left_joystick(context, {-0.062, +1}, 100ms, 0ms);
+        break;
+    case Location::WILD_ZONE_3:
+        pbf_move_left_joystick(context, {0, +1}, 100ms, 0ms);
+        break;
+    case Location::WILD_ZONE_4:
+        pbf_move_left_joystick(context, {+1, 0}, 100ms, 0ms);
+        break;
+    case Location::WILD_ZONE_5:
+        pbf_move_left_joystick(context, {+0.331, +1}, 100ms, 0ms);
+        break;
+    case Location::WILD_ZONE_6:
+        pbf_move_left_joystick(context, {-0.375, +1}, 100ms, 0ms);
+        break;
+    case Location::WILD_ZONE_7:
+        pbf_move_left_joystick(context, {-1, +0.219}, 100ms, 0ms);
+        break;
+    case Location::WILD_ZONE_8:
+        pbf_move_left_joystick(context, {-1, -0.252}, 100ms, 0ms);
+        break;
+    case Location::WILD_ZONE_9:
+        pbf_move_left_joystick(context, {-0.453, +1}, 100ms, 0ms);
+        break;
+    case Location::WILD_ZONE_10:
+        pbf_move_left_joystick(context, {+1, +0.297}, 100ms, 0ms);
+        break;
+    case Location::WILD_ZONE_11:
+        pbf_move_left_joystick(context, {-1, +0.688}, 100ms, 0ms);
+        break;
+    case Location::WILD_ZONE_12:
+        pbf_move_left_joystick(context, {-0.844, +1}, 150ms, 0ms);
+        break;
+    case Location::WILD_ZONE_13:
+        pbf_move_left_joystick(context, {-1, -0.252}, 100ms, 0ms);
+        break;
+    case Location::WILD_ZONE_14:
+        pbf_move_left_joystick(context, {-0.141, -1}, 100ms, 0ms);
+        break;
+    case Location::WILD_ZONE_15:
+        pbf_move_left_joystick(context, {-1, +1}, 100ms, 0ms);
+        break;
+    case Location::WILD_ZONE_16:
+        pbf_move_left_joystick(context, {+0.724, +1}, 100ms, 0ms);
+        break;
+    case Location::WILD_ZONE_17:
+        pbf_move_left_joystick(context, {+0.646, +1}, 100ms, 0ms);
+        break;
+    case Location::WILD_ZONE_18:
+        pbf_move_left_joystick(context, {-0.844, -1}, 100ms, 0ms);
+        break;
+    case Location::WILD_ZONE_19:
+        pbf_move_left_joystick(context, {-0.375, -1}, 100ms, 0ms);
+        break;
+    case Location::WILD_ZONE_20_NO_DISTORTION:
+        pbf_move_left_joystick(context, {-1, +0.297}, 140ms, 0ms);
+        break;
+    case Location::WILD_ZONE_20_WITH_DISTORTION:
+        // During the distortion happening on top of Lumiose Tower as part
+        // of the Mega Dimension DLC story, the wild zone 20 fast travel
+        // symbol on the map is moved to the entrance gate. So we only
+        // need a tiny left joystick push.
+        pbf_move_left_joystick(context, {-0.219, +0.219}, 100ms, 0ms);
+        break;
+    default:
+        throw InternalProgramError(
+            nullptr, PA_CURRENT_FUNCTION,
+            "move_map_cursor_from_entrance_to_zone(): Unsupported zone location."
+        );
+    }
+    pbf_wait(context, 300ms);
+}
+
+
+void map_to_overworld(ConsoleHandle& console, ProControllerContext& context){
+    OverworldPartySelectionWatcher overworld_watcher(COLOR_WHITE, &console.overlay());
+    run_until<ProControllerContext>(
+        console, context,
+        [](ProControllerContext& context){
+            pbf_mash_button(context, BUTTON_B, 2s);
+            pbf_wait(context, 40s); // wait a long time in case day/night change immidiately happens
+        },
+        {{overworld_watcher}}
+    );
+    pbf_wait(context, 100ms); // wait 100ms for the game to give back control to player
+    context.wait_for_all_requests();
+}
+
+
+void sit_on_bench(ConsoleHandle& console, ProControllerContext& context){
+    context.wait_for_all_requests();
+    console.overlay().add_log("Sitting on Bench");
+    {
+        BlackScreenOverWatcher black_screen(COLOR_BLUE);
+
+        int ret = run_until<ProControllerContext>(
+            console, context,
+            [](ProControllerContext& context){
+                // mash A to start day/night change and into the transition animation
+                pbf_mash_button(context, BUTTON_A, 26s);
+            },
+            {black_screen}
+        );
+
+        switch (ret){
+        case 0:
+            console.log("Detected day change.");
+            break;
+        default:
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "sit_on_bench(): No day/night transition detected after mashing A.",
+                console
+            );
+        }
+    }
+
+    console.overlay().add_log("Waiting for New Day/Night");
+    OverworldPartySelectionWatcher overworld(COLOR_WHITE, &console.overlay());
+    int ret = wait_until(
+        console, context,
+        30s,
+        {overworld}
+    );
+    if (ret < 0){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "sit_on_bench(): Unable to go back to overworld after day/night change on bench after 30 seconds.",
+            console
+        );
+    }
+}
+
+
+void wait_until_overworld(
+    ConsoleHandle& console, ProControllerContext& context,
+    std::chrono::milliseconds max_wait_time
+){
+    OverworldPartySelectionWatcher overworld(COLOR_WHITE, &console.overlay(), Milliseconds(100));
+    DirectionArrowWatcher map_arrow(COLOR_BLUE, std::chrono::milliseconds(50));
+    int ret = wait_until(
+        console, context,
+        max_wait_time,
+        {overworld, map_arrow}
+    );
+    if (ret < 0){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "wait_until_overworld(): Unable to detect overworld after " + 
+                std::to_string(max_wait_time.count()) + " milliseconds.",
+            console
+        );
+    }
+    console.log("Detected overworld within " + std::to_string(max_wait_time.count()) + " milliseconds");
+    context.wait_for(100ms); // extra 0.1 sec to let game give player control
+}
+
+
+double get_facing_direction(
+    ConsoleHandle& console,
+    ProControllerContext& context
+){
+    DirectionArrowWatcher arrow_watcher(COLOR_YELLOW, std::chrono::milliseconds(50));
+    int ret = wait_until(
+        console, context,
+        std::chrono::seconds(40), // 40 sec to account for possible day/night change
+        {arrow_watcher}
+    );
+    if (ret != 0){
+        console.log("Direction arrow not detected within 1 second");
+        console.overlay().add_log("No Minimap Arrow Found", COLOR_RED);
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "get_facing_direction(): Direction arrow on minimap not detected within 40 second",
+            console
+        );
+    }
+    double angle = arrow_watcher.detected_angle_deg();
+    console.log("Direction arrow detected! Angle: " + tostr_fixed(angle, 0) + " degrees");
+    console.overlay().add_log("Minimap Arrow: " + tostr_fixed(angle, 0) + " deg", COLOR_YELLOW);
+    return angle;
+}
+
+double get_angle_between_facing_directions(double dir1, double dir2){
+    double angle = std::fabs(dir1 - dir2);
+    if (angle > 180.0){
+        angle = 360.0 - angle;
+    }
+    return angle;
+}
+
+bool leave_zone_gate(ConsoleHandle& console, ProControllerContext& context){
+    console.log("Leaving zone gate");
+
+    WallClock start_time = current_time();
+    OverworldPartySelectionWatcher overworld_watcher(COLOR_WHITE, &console.overlay());
+    pbf_mash_button(context, BUTTON_A, 1s);
+    context.wait_for_all_requests();
+    wait_until(
+        console, context,
+        std::chrono::seconds(40), // wait this long in case day/night change happens
+        {overworld_watcher}
+    );
+    pbf_wait(context, 100ms); // after leaving the gate, the game needs this long time to give back control
+    context.wait_for_all_requests();
+    WallClock end_time = current_time();
+
+    const auto duration = end_time - start_time;
+    const auto second_count = std::chrono::duration_cast<std::chrono::seconds>(duration).count();
+    // Due to day/night change may eating the mashing button A sequence, we may still be inside the zone!
+    // We need to check if we can fast travel 
+    if (duration < 16s){
+        console.log("Leaving zone function took " + std::to_string(second_count) + " sec. No day/night change");
+        console.overlay().add_log("Left Gate");
+
+        // The animation of leaving the gate does not take more than 15 sec.
+        // In this case, there is no day/night change. We are sure we are outside the wild zone
+        // (unless some angry Garchomp or Drilbur used Dig and escaped wild zone containment... We don't
+        // consider this case for now)
+        return true;
+    }
+
+    console.log("Leaving zone function took " + std::to_string(second_count) + " sec. Day/night change happened");
+    return false;
+}
+
+
+int run_towards_gate_with_A_button(
+    ConsoleHandle& console, ProControllerContext& context,
+    double run_direction_x, double run_direction_y,
+    PokemonAutomation::Milliseconds run_time
+){
+    const ImageFloatBox button_A_box{0.3, 0.2, 0.4, 0.7};
+    ButtonWatcher buttonA(COLOR_RED, ButtonType::ButtonA, button_A_box, &console.overlay(), Milliseconds(200));
+    OverworldPartySelectionOverWatcher overworld_gone(COLOR_WHITE, &console.overlay(), std::chrono::milliseconds(400));
+    const int ret = run_until<ProControllerContext>(
+        console, context,
+        [&](ProControllerContext& context){
+            // running back
+            ssf_press_button(context, BUTTON_B, 0ms, run_time, 0ms);
+            pbf_move_left_joystick(context, {run_direction_x, run_direction_y}, run_time, 0ms);
+        },
+        {{buttonA, overworld_gone}}
+    );
+    switch (ret){
+    case 0:
+        console.log("Detected button A. Reached gate.");
+        console.overlay().add_log("Reach Gate");
+        return 0;
+    case 1:
+        console.log("Day/night change happened while escaping");
+        console.overlay().add_log("Day/Night Change Detected");
+        wait_until_overworld(console, context);
+        return 1;
+    default:
+        console.log("Did not reach gate");
+        return ret;
+    }
+}
+
+int run_a_straight_path_in_overworld(
+    ConsoleHandle& console, ProControllerContext& context,
+    double direction_x, double direction_y,
+    PokemonAutomation::Milliseconds duration
+){
+    OverworldPartySelectionOverWatcher overworld_gone(COLOR_WHITE, &console.overlay(), std::chrono::milliseconds(400));
+    int ret = run_until<ProControllerContext>(
+        console, context,
+        [&](ProControllerContext& context){
+            ssf_press_button(context, BUTTON_B, 0ms, 500ms, 0ms);
+            pbf_move_left_joystick(context, {direction_x, direction_y}, duration, 0ms);
+        },
+        {{overworld_gone}}
+    );
+    if (ret == 0){
+        console.overlay().add_log("Day/Night Change Detected");
+        wait_until_overworld(console, context);
+    }
+    return ret;
+}
+
+
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_BasicNavigation.h b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_BasicNavigation.h
new file mode 100644
index 0000000000..623254328d
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_BasicNavigation.h
@@ -0,0 +1,160 @@
+/*  Basic Navigation
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLZA_BasicNavigation_H
+#define PokemonAutomation_PokemonLZA_BasicNavigation_H
+
+#include "Common/Cpp/Time.h"
+#include "VideoGames/PokemonLZA/Resources/PokemonLZA_Locations.h"
+
+namespace PokemonAutomation{
+
+class ImageRGB32;
+
+template <typename Type> class ControllerContext;
+struct ImageFloatBox;
+
+namespace NintendoSwitch{
+
+class ConsoleHandle;
+class ProController;
+using ProControllerContext = ControllerContext<ProController>;
+
+namespace PokemonLZA{
+
+
+//  Starting from either the overworld or the main menu, save the game.
+//  This function returns in the main menu.
+//  Return true if the game is saved successfully, false otherwise.
+bool save_game_to_menu(ConsoleHandle& console, ProControllerContext& context);
+
+
+
+// retrun type of the function fly_from_map()
+enum class FastTravelState{
+    SUCCESS,      // Successfully did a fast travel
+    PURSUED,      // Being spotted and pursued by wild pokemon
+    NOT_AT_FLY_SPOT,  // the current map cursor is not on a fly spot
+    NOT_FOUND     // Unable to find fast travel point, possibly not unlocked yet
+    // Future work: in some main story session the fast travel is disabled. We will implement
+    // that state if we need
+};
+
+// Press button + to open the normal Lumiose map.
+// Will repeatedly pressing button + to ensure the map is opened.
+// Robust against day/night changes: if there is a day/night chane before opening the map,
+// it will keep trying to open the map until day/night change finishes.
+// - zoom_to_max: whether to go to max zoom level after opening the map
+// - require_icons: will detect flyable fast travel icons on map to find out if you are being
+//   chased by wild pokemon. If being chased, return false. For more reliable detection of icons,
+//   set zoom_to_max to True.
+// Return false when `require_icons` is true and no flyable icons are detected on map. Return
+// true otherwise.
+bool open_map(
+    ConsoleHandle& console,
+    ProControllerContext& context,
+    bool zoom_to_max,
+    bool require_icons
+);
+
+// Starting at map view, press A to fast travel to the current selected fast travel location
+// overworld_screen: if not nullptr, return the overworld screen when the fly is over.
+//   This is useful for doing additional visual detection on the overworld screen. If fast travel
+//   failed, no change will be made to `overworld_screen`.
+// Return FastTravelState:
+// - SUCCESS: fast travel successful. After the function returns, the player character is on the overworld
+// - PURSUED: spotted and pursued by wild pokemon, cannot fast travel. After the function returns, the game
+//   is in fly map with the spotted dialog.
+// - NOT_AT_FLY_SPOT: the current map cursor is not on a fly spot, cannot fast travel. After the function
+//   returns, the game is in fly map.
+FastTravelState fly_from_map(
+    ConsoleHandle& console,
+    ProControllerContext& context,
+    std::shared_ptr<const ImageRGB32>* overworld_screen = nullptr
+);
+
+// Fast travel without moving map cursor.
+// This is useful to fast travel back to the wild zone gate while in the zone.
+// This function basically just calls `open_map()` and `fly_from_map()`. See the comments of those two
+// functions for details.
+FastTravelState open_map_and_fly_in_place(
+    ConsoleHandle& console,
+    ProControllerContext& context,
+    bool zoom_to_max = false
+);
+
+// Blind movement of map cursor from zone entrance to that zone fast travel icon on map
+// this blind movement only works on max zoom level (fully zoomed out)!
+void move_map_cursor_from_entrance_to_zone(ConsoleHandle& console, ProControllerContext& context, Location zone);
+
+// Mash button B to leave map view and back to overworld
+// If there is a day/night change, this function will wait for day/night change to finish.
+void map_to_overworld(ConsoleHandle& console, ProControllerContext& context);
+
+
+// Assuming the player character is facing the bench with buton A available, this function
+// presses button A repeated to initiate day/night change and returns when the game finishes
+// day/night change transition animation and is back to overworld.
+void sit_on_bench(ConsoleHandle& console, ProControllerContext& context);
+
+// default wait time is long enough to wait for day/night change to end
+void wait_until_overworld(
+    ConsoleHandle& console, ProControllerContext& context,
+    std::chrono::milliseconds max_wait_time = std::chrono::seconds(40)
+);
+
+// Read the minimap to get the direction the blue directional arrow is facing. The arrow
+// represents which direction the player character is facing.
+// If day/night change happens to appear during reading the minimap, it will wait until
+// the day/night hange finishes.
+// Return a float of [0.0, 360.0), the angle of the arrow using the clock setting, i.e.
+// - Pointing upwards is 0.0 degree.
+// - Pointing to the right is 90.0 degrees.
+double get_facing_direction(ConsoleHandle& console, ProControllerContext& context);
+
+// Given two facing directions, find the angle between them. The angle range is [0, 180).
+double get_angle_between_facing_directions(double dir1, double dir2);
+
+// While at the gate in the zone, mash A to leave the zone. If day/night changes while
+// leaving, it will wait until the change is done.
+// Return true if there is no day/night change.
+// Return false if day/night change happens. In this case, we don't know if the player
+// character is still inside the zone or not.
+// Note:
+// We don't want to mash A after a day/night change to ensure we leave the zone because
+// at Wild Zone 4 there are talkable npcs outside the gate. Button A appears on them.
+// If the program mashes A after leaving the zone, it will stuck talking to the npcs.
+bool leave_zone_gate(ConsoleHandle& console, ProControllerContext& context);
+
+// Run towards a gate until either button A is detected at specified box region,
+// or day/night change happens. If day/night changes, it will wait until the transition
+// animation is done.
+// Return
+// -  0 if button A is detected
+// -  1 if day/night change happens
+// - -1 if it does not reach the gate in the end. Possible reasons are wrong run direction
+//   or get stuck by terrain or obstacle on the way
+int run_towards_gate_with_A_button(
+    ConsoleHandle& console, ProControllerContext& context,
+    double run_direction_x, double run_direction_y,
+    Milliseconds run_time
+);
+
+// Run a straight line in the overworld, for *duration* long or until a day/night change happens.
+// If day/night changes, it will wait until the transition animation is done.
+// Return
+// -  0 if a day/night change detected
+// - -1 it ran for full *duration* without a day/night change
+int run_a_straight_path_in_overworld(
+    ConsoleHandle& console, ProControllerContext& context,
+    double direction_x, double direction_y,
+    PokemonAutomation::Milliseconds duration
+);
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_BoxSorter.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_BoxSorter.cpp
new file mode 100644
index 0000000000..b97569e37f
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_BoxSorter.cpp
@@ -0,0 +1,371 @@
+/*  LZA Box Sorter
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+#include <map>
+#include <optional>
+#include <sstream>
+#include <algorithm>
+#include "Common/Cpp/Exceptions.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/Tools/ErrorDumper.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonTools/StartupChecks/StartProgramChecks.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "Pokemon/Inference/Pokemon_TypeReader.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "Pokemon/Resources/Pokemon_PokemonNames.h"
+#include "Pokemon/Pokemon_BoxCursor.h"
+#include "Pokemon/Pokemon_CollectedPokemonInfo.h"
+#include "VideoGames/PokemonHome/Inference/PokemonHome_BoxGenderDetector.h"
+#include "VideoGames/PokemonLZA/Inference/Boxes/PokemonLZA_BoxDetection.h"
+#include "VideoGames/PokemonLZA/Inference/Boxes/PokemonLZA_BoxInfoDetector.h"
+#include "VideoGames/PokemonLZA/Resources/PokemonLZA_AvailablePokemon.h"
+#include "PokemonLZA_BoxSorter.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+using namespace Pokemon;
+
+
+
+const size_t MAX_BOXES = 32;
+
+BoxSorter_Descriptor::BoxSorter_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonLZA:BoxSorter",
+        STRING_POKEMON + " Legends: Z-A", "Box Sorter",
+        "Programs/PokemonLZA/BoxSorter.html",
+        "Order boxes of " + STRING_POKEMON + ".",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+struct BoxSorter_Descriptor::Stats : public StatsTracker{
+    Stats()
+        : pkmn(m_stats["Pokemon"])
+        , empty(m_stats["Empty Slots"])
+        , compare(m_stats["Compares"])
+        , swaps(m_stats["Swaps"])
+    {
+        m_display_order.emplace_back(Stat("Pokemon"));
+        m_display_order.emplace_back(Stat("Empty Slots"));
+        m_display_order.emplace_back(Stat("Compares"));
+        m_display_order.emplace_back(Stat("Swaps"));
+    }
+    std::atomic<uint64_t>& pkmn;
+    std::atomic<uint64_t>& empty;
+    std::atomic<uint64_t>& compare;
+    std::atomic<uint64_t>& swaps;
+};
+std::unique_ptr<StatsTracker> BoxSorter_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+BoxSorter::BoxSorter()
+    : NUM_BOXES(
+        "<b>Number of Boxes to Sort:</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        1, 1, MAX_BOXES
+        )
+    , SORT_TABLE(
+          "<b>Sort Order Rules:</b><br>Sort order rules will be applied top to bottom.",
+          {SortingRuleType::DexNo, SortingRuleType::Shiny, SortingRuleType::Alpha}
+          )
+    , OUTPUT_FILE(
+          false,
+          "<b>Output File:</b><br>JSON file basename to catalogue box info found by the program.",
+          LockMode::LOCK_WHILE_RUNNING,
+          "box_order",
+          "box_order"
+          )
+    , DRY_RUN(
+          "<b>Dry Run:</b><br>Catalogue and make sorting plan without execution. Check output at <output_file>.json and <output_file>-sorted.json)",
+          LockMode::LOCK_WHILE_RUNNING,
+          false
+          )
+    , NOTIFICATIONS({
+          &NOTIFICATION_PROGRAM_FINISH
+      })
+{
+    PA_ADD_OPTION(NUM_BOXES); //number of boxes to check and sort
+    PA_ADD_OPTION(SORT_TABLE);
+    PA_ADD_OPTION(OUTPUT_FILE);
+    PA_ADD_OPTION(DRY_RUN);
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+
+//Move the cursor to the given coordinates, knowing current pos via the cursor struct
+[[nodiscard]] BoxCursor move_cursor_to(SingleSwitchProgramEnvironment& env, ProControllerContext& context, const BoxCursor& cur_cursor, const BoxCursor& dest_cursor, bool holding_pokemon = false){
+
+    std::ostringstream ss;
+    ss << "Moving cursor from " << cur_cursor << " to " << dest_cursor;
+    env.console.log(ss.str());
+
+    Milliseconds GAME_DELAY = 240ms;
+    // TODO: shortest path movement though pages, boxes
+    for (size_t i = cur_cursor.box; i < dest_cursor.box; ++i){
+        pbf_press_button(context, BUTTON_R, 80ms, GAME_DELAY + 240ms);
+    }
+    for (size_t i = dest_cursor.box; i < cur_cursor.box; ++i){
+        pbf_press_button(context, BUTTON_L, 80ms, GAME_DELAY + 240ms);
+    }
+
+    BoxDetector box_detector(COLOR_RED, &env.console.overlay());
+    box_detector.move_cursor(
+        env.program_info(),
+        env.console,
+        context,
+        (uint8_t)dest_cursor.row + 1,
+        (uint8_t)dest_cursor.column,
+        holding_pokemon
+    );
+
+    return dest_cursor;
+}
+
+void print_boxes_data(const std::vector<std::optional<CollectedPokemonInfo>>& boxes_data, SingleSwitchProgramEnvironment& env){
+    std::ostringstream ss;
+    for (const std::optional<CollectedPokemonInfo>& pokemon : boxes_data){
+        ss << pokemon << "\n";
+    }
+    env.console.log(ss.str());
+}
+
+std::string create_overlay_info(const CollectedPokemonInfo& pokemon, const BoxDexNumberDetector& dex_number_detector){
+    const std::string& display_name = get_pokemon_name(pokemon.name_slug).display_name();
+    
+    std::string overlay_log = dex_number_detector.dex_type() == DexType::HYPERSPACE ? "H" : "L";
+    
+    char dex_str[6];
+    snprintf(dex_str, sizeof(dex_str), "%03d", dex_number_detector.dex_number());
+    overlay_log += std::string(dex_str) + " " + display_name;
+    if(pokemon.gender == StatsHuntGenderFilter::Male){
+        overlay_log += " " + UNICODE_MALE;
+    }else if (pokemon.gender == StatsHuntGenderFilter::Female){
+        overlay_log += " " + UNICODE_FEMALE;
+    }
+    if (pokemon.shiny){
+        overlay_log += " *";
+    }
+    if (pokemon.alpha){
+        overlay_log += " " + UNICODE_ALPHA;
+    }
+    return overlay_log;
+}
+
+void sort(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    std::vector<std::optional<CollectedPokemonInfo>> boxes_data,
+    std::vector<std::optional<CollectedPokemonInfo>> boxes_sorted,
+    BoxSorter_Descriptor::Stats& stats,
+    BoxCursor& cur_cursor
+){
+    env.log("Start sorting...");
+    env.log_to_ui("Start Sorting...");
+
+    std::ostringstream ss;
+    // this need to be separated into functions when I will redo the whole thing but I just wanted it to work
+
+    // going thru the sorted list one by one and for each one go through the current pokemon layout to find the closest possible match to fill the slot
+    for (size_t poke_nb_s = 0; poke_nb_s < boxes_sorted.size(); poke_nb_s++){
+        if (boxes_sorted[poke_nb_s] == std::nullopt){ // we've hit the end of the sorted list.
+            break;
+        }
+        for (size_t poke_nb = poke_nb_s; poke_nb < boxes_data.size(); poke_nb++){
+            BoxCursor cursor_s(poke_nb_s);
+            BoxCursor cursor(poke_nb);
+
+            // ss << "Comparing " << boxes_data[poke_nb] << " at " << cursor << " to " << boxes_sorted[poke_nb_s] << " at " << cursor_s;
+            // env.console.log(ss.str());
+            // ss.str("");
+
+            //check for a match and also check if the pokemon is not already in the slot
+            stats.compare++;
+            env.update_stats();
+            if(boxes_sorted[poke_nb_s] == boxes_data[poke_nb] && poke_nb_s == poke_nb){ // Same spot no need to move.
+                break;
+            }
+            if(boxes_sorted[poke_nb_s] == boxes_data[poke_nb]){
+                ss << "Swapping " << boxes_data[poke_nb] << " at " << cursor << " and " << boxes_sorted[poke_nb_s] << " at " << cursor_s;
+                env.console.log(ss.str());
+                ss.str("");
+
+                //moving cursor to the pokemon to pick it up
+                bool holding_pokemon = false;
+                cur_cursor = move_cursor_to(env, context, cur_cursor, cursor, holding_pokemon);
+                pbf_press_button(context, BUTTON_Y, 80ms, 480ms);
+                context.wait_for_all_requests();
+
+                //moving to destination to place it or swap it
+                holding_pokemon = true;
+                cur_cursor = move_cursor_to(env, context, cur_cursor, cursor_s, holding_pokemon);
+                pbf_press_button(context, BUTTON_Y, 80ms, 480ms);
+                context.wait_for_all_requests();
+
+                std::swap(boxes_data[poke_nb_s], boxes_data[poke_nb]);
+                stats.swaps++;
+                env.update_stats();
+
+                break;
+            }
+        }
+    }
+}
+
+void BoxSorter::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    StartProgramChecks::check_performance_class_wired_or_wireless(context);
+
+    std::vector<SortingRule> sort_preferences = SORT_TABLE.preferences();
+    if (sort_preferences.empty()){
+        throw UserSetupError(env.console, "At least one sorting method selection needs to be made!");
+    }
+
+    BoxSorter_Descriptor::Stats& stats = env.current_stats<BoxSorter_Descriptor::Stats>();
+
+    // vector that will store data for each slot
+    std::vector<std::optional<CollectedPokemonInfo>> boxes_data;
+
+    BoxCursor cur_cursor{static_cast<uint16_t>(NUM_BOXES-1), 0, 0};
+
+    VideoOverlaySet video_overlay_set(env.console);
+
+    std::ostringstream ss;
+
+    Milliseconds VIDEO_DELAY = 400ms;
+
+    BoxDetector box_detector(COLOR_RED, &env.console.overlay());
+    // BoxPageInfoWatcher info_watcher(&env.console.overlay());
+    // SomethingInBoxCellWatcher non_empty_watcher(COLOR_BLUE, &env.console.overlay());
+    BoxShinyDetector shiny_detector(COLOR_RED, &env.console.overlay());
+    BoxAlphaDetector alpha_detector(COLOR_RED, &env.console.overlay());
+    SomethingInBoxCellDetector non_empty_detector(COLOR_BLUE, &env.console.overlay());
+    BoxDexNumberDetector dex_number_detector(env.console);
+
+    box_detector.make_overlays(video_overlay_set);
+    shiny_detector.make_overlays(video_overlay_set);
+    alpha_detector.make_overlays(video_overlay_set);
+    non_empty_detector.make_overlays(video_overlay_set);
+    dex_number_detector.make_overlays(video_overlay_set);
+
+    //cycle through each box
+    for (size_t box_idx = 0; box_idx < NUM_BOXES; box_idx++){
+        if(box_idx != 0){
+            // Press button R to move to next box
+            pbf_press_button(context, BUTTON_R, 80ms, VIDEO_DELAY + 800ms);
+        }else{
+            // Moving the cursor to the first slot in the box
+            box_detector.move_cursor(env.program_info(), env.console, context, 1, 0);
+        }
+
+        context.wait_for_all_requests();
+        const std::string log_msg = "Checking box " + std::to_string(box_idx+1) + "/" + std::to_string(NUM_BOXES);
+        env.log(log_msg);
+        env.console.overlay().add_log(log_msg);
+
+        // Box grid to find empty slots (red boxes) and fill boxes_data with value to check or not for pokemon dex number
+
+        ss << "\n";
+
+        int num_empty_slots = 0;
+        for (size_t row = 0; row < BOX_ROWS; row++){
+            for (size_t column = 0; column < BOX_COLS; column++){
+                box_detector.move_cursor(
+                    env.program_info(),
+                    env.console,
+                    context,
+                    (uint8_t)row + 1,
+                    (uint8_t)column
+                );
+                
+                pbf_wait(context, 100ms); // wait some time for the pokemon info to be updated
+                VideoSnapshot screen = env.console.video().snapshot();
+                
+                if(non_empty_detector.detect(screen)){
+                    stats.pkmn++;
+                    env.update_stats();
+
+                    bool dex_number_detected = dex_number_detector.detect(screen);
+                    if (!dex_number_detected){
+                        OperationFailedExceptionWithScreenshot::fire(
+                            ErrorReportMode::SEND_ERROR_REPORT,
+                            "BoxSorting Check Summary: Unable to read a correct dex number, found: " + std::to_string(dex_number_detector.dex_number_when_error()),
+                            env.console
+                        );
+                    }
+
+                    // XXX TODO: change code to use regional dex, both Lumiose and Hyperspace
+                    uint16_t dex_number = dex_number_detector.dex_number();
+                    std::string name_slug;
+                    // env.log_to_ui(std::to_string(dex_number_detector.dex_type_color_ratio()));
+                    if (dex_number_detector.dex_type() == DexType::HYPERSPACE){
+                        name_slug = HYPERSPACE_DEX_SLUGS()[dex_number-1];
+                        dex_number += (uint16_t)LUMIOSE_DEX_SLUGS().size();
+                    }else{
+                        name_slug = LUMIOSE_DEX_SLUGS()[dex_number-1];
+                    }
+                    
+                    auto [primary_type, secondary_type] = read_pokemon_types(screen, ImageFloatBox(0.467, 0.256, 0.110, 0.041), PokemonTypeGeneration::GEN9);
+                    boxes_data.push_back(
+                        CollectedPokemonInfo{
+                            .preferences = &sort_preferences,
+                            .dex_number = static_cast<uint16_t>(dex_number),
+                            .name_slug = name_slug,
+                            .shiny = shiny_detector.detect(screen),
+                            .alpha = alpha_detector.detect(screen),
+                            .primary_type = primary_type,
+                            .secondary_type = secondary_type,
+                        }
+                        );
+                    ss << "\u2705 " ;    //  checkbox
+                    env.log_to_ui(create_overlay_info(*boxes_data.back(), dex_number_detector));
+                }else{
+                    stats.empty++;
+                    num_empty_slots++;
+                    env.log_to_ui("Empty Slot");
+                    env.update_stats();
+                    boxes_data.push_back(std::nullopt); //empty optional to make sorting easier later
+                    ss << "\u274c " ;    //  "X"
+                }
+            }
+            ss << "\n";
+        }
+        env.console.log(ss.str());
+        env.log_to_ui("Empty: " + std::to_string(num_empty_slots) + "/30");
+        ss.str("");
+    } // end box_idx
+        
+    // copy boxes data to sort
+    std::vector<std::optional<CollectedPokemonInfo>> boxes_sorted = boxes_data;
+
+    // sorting copy of boxes_data
+    std::sort(boxes_sorted.begin(), boxes_sorted.end());
+
+    env.console.log("Current boxes data :");
+    const std::string json_path_basename = OUTPUT_FILE;
+    save_boxes_data_to_json(boxes_data, json_path_basename + ".json");
+
+    env.log("Sorted boxes data :");
+    print_boxes_data(boxes_sorted, env);
+    save_boxes_data_to_json(boxes_sorted, json_path_basename + "-sorted.json");
+
+    if (!DRY_RUN){
+        sort(env, context, boxes_data, boxes_sorted, stats, cur_cursor);
+    }
+
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+
+}
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_BoxSorter.h b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_BoxSorter.h
new file mode 100644
index 0000000000..0eba9f6c52
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_BoxSorter.h
@@ -0,0 +1,51 @@
+/*  Box Sorter
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLZA_BoxSorter_H
+#define PokemonAutomation_PokemonLZA_BoxSorter_H
+
+#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "Common/Cpp/Options/StringOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "Pokemon/Options/Pokemon_BoxSortingTable.h"
+
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+class BoxSorter_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    BoxSorter_Descriptor();
+
+    struct Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+class BoxSorter : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = BoxSorter_Descriptor;
+    BoxSorter();
+
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    SimpleIntegerOption<uint16_t> NUM_BOXES;
+    // SimpleIntegerOption<uint16_t> VIDEO_DELAY;
+    // SimpleIntegerOption<uint16_t> GAME_DELAY;
+    Pokemon::BoxSortingTable SORT_TABLE;
+    StringOption OUTPUT_FILE;
+    BooleanCheckBoxOption DRY_RUN;
+    EventNotificationsOption NOTIFICATIONS;
+
+};
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_ClothingBuyer.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_ClothingBuyer.cpp
new file mode 100644
index 0000000000..3ce1682203
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_ClothingBuyer.cpp
@@ -0,0 +1,194 @@
+/*  Clothing Buyer
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "CommonTools/StartupChecks/VideoResolutionCheck.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonLZA/Inference/PokemonLZA_SelectionArrowDetector.h"
+#include "VideoGames/PokemonLZA/Inference/PokemonLZA_DialogDetector.h"
+#include "PokemonLZA_ClothingBuyer.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+using namespace Pokemon;
+
+ClothingBuyer_Descriptor::ClothingBuyer_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonLZA:ClothingBuyer",
+        STRING_POKEMON + " LZA", "Clothing Buyer",
+        "Programs/PokemonLZA/ClothingBuyer.html",
+        "Buy all the clothing in a store.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+ClothingBuyer::ClothingBuyer()
+    : NUM_CATEGORY(
+        "<b>Number of Categories:</b><br>The number of categories of clothing the shop has.",
+        LockMode::LOCK_WHILE_RUNNING,
+        1, 1, 9
+    )
+    , GO_HOME_WHEN_DONE(false)
+    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_STATUS_UPDATE,
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+{
+    PA_ADD_OPTION(NUM_CATEGORY);
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+void ClothingBuyer::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    assert_16_9_720p_min(env.logger(), env.console);
+
+    //  Connect the controller.
+    require_player(env.console, context, BUTTON_LCLICK);
+
+    /*
+    * Similar to SV clothing buyer.
+    * Start at the top of the first category in clothing shop menu.
+    * Buy everything in num of categories, can set num category, will wrap around.
+    * Stop conditions: hit category count
+    * Can't detect out of money, same dialog box as already bought.
+    * Hairstyles all seem to be hat compatible in this game. Tried w/pigtails, which wasn't compatible in SV.
+    */
+
+    uint8_t category_rotation_count = 0;
+    //bool finish_program = false;
+    while (category_rotation_count < NUM_CATEGORY){
+        pbf_press_button(context, BUTTON_A, 160ms, 80ms);
+
+        //In sub-menu for item.
+        while (true){
+            pbf_press_button(context, BUTTON_A, 160ms, 180ms);
+
+            SelectionArrowWatcher buy_yes_no(
+                COLOR_YELLOW, &env.console.overlay(),
+                SelectionArrowType::RIGHT,
+                { 0.714, 0.599, 0.033, 0.066 }
+            );
+            FlatWhiteDialogWatcher already_bought(COLOR_RED, &env.console.overlay());
+            int ret = wait_until(
+                env.console, context,
+                std::chrono::seconds(30),
+                { buy_yes_no, already_bought }
+            );
+            switch (ret){
+            case 0:
+                env.log("Purchase item.");
+                //Purchase Y/N detected.
+                pbf_press_button(context, BUTTON_A, 160ms, 500ms);
+                pbf_wait(context, 1000ms);
+                context.wait_for_all_requests();
+
+                //Would you like to wear this out today? (No.)
+                pbf_press_button(context, BUTTON_B, 160ms, 500ms);
+                pbf_wait(context, 1000ms);
+                context.wait_for_all_requests();
+
+                send_program_status_notification(
+                    env, NOTIFICATION_STATUS_UPDATE,
+                    "Clothing purchased. Selecting next item."
+                );
+                break;
+            case 1:
+                //Item already bought or out of money. Close dialog.
+                env.log("Item already bought or out of money.");
+                send_program_status_notification(
+                    env, NOTIFICATION_STATUS_UPDATE,
+                    "Item already bought or out of money."
+                );
+                pbf_press_button(context, BUTTON_A, 160ms, 180ms);
+                break;
+            default:
+                env.log("Error looking for purchase prompt.");
+                OperationFailedExceptionWithScreenshot::fire(
+                    ErrorReportMode::SEND_ERROR_REPORT,
+                    "Error looking for purchase prompt.",
+                    env.console
+                );
+                break;
+            }
+            context.wait_for_all_requests();
+
+            env.log("Moving on to next item.");
+            pbf_press_dpad(context, DPAD_DOWN, 80ms, 180ms);
+            context.wait_for_all_requests();
+
+            //Check if we are back at the top of the sub-menu
+            SelectionArrowWatcher top_category_item(
+                COLOR_YELLOW, &env.console.overlay(),
+                SelectionArrowType::RIGHT,
+                { 0.034, 0.465, 0.033, 0.071 }
+            );
+            int retCatTop = wait_until(
+                env.console, context,
+                1000ms,
+                { top_category_item }
+            );
+            context.wait_for_all_requests();
+            if (retCatTop == 0){
+                env.log("Reached top of the item sub-menu.");
+                break;
+            }
+        }
+
+        //Exit sub-menu
+        pbf_press_button(context, BUTTON_B, 160ms, 200ms);
+        context.wait_for_all_requests();
+        
+        //Next item on top menu
+        env.log("Moving on to next item.");
+        pbf_press_dpad(context, DPAD_DOWN, 80ms, 80ms);
+        context.wait_for_all_requests();
+
+
+        //Check if category complete
+        SelectionArrowWatcher top_item(
+            COLOR_YELLOW, &env.console.overlay(),
+            SelectionArrowType::RIGHT,
+            {0.033, 0.350, 0.033, 0.070}
+        );
+        int retTop = wait_until(
+            env.console, context,
+            std::chrono::seconds(1),
+            { top_item }
+        );
+        if (retTop == 0){
+            env.log("Reached top of category.");
+            if (NUM_CATEGORY > 1){
+                env.log("Category rotation set. Moving to next category.");
+                pbf_press_button(context, BUTTON_R, 80ms, 100ms);
+                context.wait_for_all_requests();
+                category_rotation_count++;
+            }else{
+                env.log("No category rotation. Ending program.");
+                break;
+            }
+        }
+    }
+    env.log("Category num hit. Ending program.");
+    GO_HOME_WHEN_DONE.run_end_of_program(context);
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+}
+
+
+}
+}
+}
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_ClothingBuyer.h b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_ClothingBuyer.h
new file mode 100644
index 0000000000..3683049f7c
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_ClothingBuyer.h
@@ -0,0 +1,47 @@
+/*  Clothing Buyer
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLZA_ClothingBuyer_H
+#define PokemonAutomation_PokemonLZA_ClothingBuyer_H
+
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+
+
+class ClothingBuyer_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    ClothingBuyer_Descriptor();
+};
+
+class ClothingBuyer : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = ClothingBuyer_Descriptor;
+    ClothingBuyer();
+
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    SimpleIntegerOption<uint8_t> NUM_CATEGORY;
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
+    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_DonutBerrySession.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_DonutBerrySession.cpp
new file mode 100644
index 0000000000..a45dca330c
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_DonutBerrySession.cpp
@@ -0,0 +1,380 @@
+/*  Donut Berry Session
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <algorithm>
+#include "Common/Cpp/Containers/FixedLimitVector.tpp"
+#include "CommonFramework/Tools/GlobalThreadPools.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "VideoGames/PokemonLZA/Resources/PokemonLZA_DonutBerries.h"
+#include "PokemonLZA_DonutBerrySession.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+BerrySession::~BerrySession() = default;
+
+BerrySession::BerrySession(
+    VideoStream& stream, ProControllerContext& context,
+    Language language
+)
+    : m_stream(stream)
+    , m_context(context)
+    , m_language(language)
+    , m_overlays(stream.overlay())
+    //, m_num_confirmed(0)
+{
+    DonutBerriesReader reader(COLOR_CYAN);
+    reader.make_overlays(m_overlays);
+}
+
+
+
+PageIngredients BerrySession::read_screen(std::shared_ptr<const ImageRGB32> screen) const{
+    PageIngredients ret;
+    
+    int slot = 0;
+    for (int i = 0; i < 8; i++){
+        DonutBerriesSelectionWatcher arrow(i);
+        //cout << "menu index: " << i << endl;
+        if (arrow.detect(*screen)){
+            //cout << "detected in slot: " << i << endl;
+            slot = i;
+            break;
+        }
+    }
+    ret.selected = (int8_t)slot;
+    //cout << "selected slot = " << (int)ret.selected << endl;
+    if (ret.selected < 0 || ret.selected >= 8){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "BerrySession::read_current_page(): Invalid cursor slot.",
+            m_stream,
+            screen
+        );
+    }
+    
+    //  Read the names of every line and the sprite of the selected line.
+    ImageMatch::ImageMatchResult image_result;
+    DonutBerriesReader reader;
+    GlobalThreadPools::computation_normal().run_in_parallel(
+        [&](size_t index){
+            if (index < DonutBerriesReader::BERRY_PAGE_LINES){
+                // Read text at line `index`
+                OCR::StringMatchResult result = reader.read_berry_page_with_ocr(*screen, m_stream.logger(), m_language, index);
+                result.clear_beyond_log10p(DonutBerriesOCR::MAX_LOG10P);
+                result.clear_beyond_spread(DonutBerriesOCR::MAX_LOG10P_SPREAD);
+                for (auto& item : result.results){
+                    ret.item[index].insert(item.second.token);
+                }
+            }else{
+                // Read current selected icon
+                image_result = reader.read_berry_page_with_icon_matcher(*screen, ret.selected);
+                image_result.clear_beyond_spread(DonutBerriesReader::ALPHA_SPREAD);
+                image_result.log(m_stream.logger(), DonutBerriesReader::MAX_ALPHA);
+                image_result.clear_beyond_alpha(DonutBerriesReader::MAX_ALPHA);
+            }
+        },
+        0, DonutBerriesReader::BERRY_PAGE_LINES + 1,
+        OCR::allow_parallel_ocr() ? 1 : (size_t)-1
+    );
+
+#if 0 //Todo: Image match isn't the best since quantity covers it
+    do{
+        std::set<std::string>& ocr_result = ret.item[ret.selected];
+
+        //  Special case where OCR fails and image result returns 1 item.
+        if (ocr_result.empty() || image_result.results.size() == 1){
+            ocr_result.insert(image_result.results.begin()->second);
+            break;
+        }
+
+        //  Find the items in common between the two detection methods.
+        std::set<std::string> common;
+        for (auto& item : image_result.results){
+            auto iter = ocr_result.find(item.second);
+            if (iter != ocr_result.end()){
+                common.insert(item.second);
+            }
+        }
+
+        if (common.empty()){
+            std::set<std::string> sprite_result;
+            for (const auto& p : image_result.results){
+                sprite_result.insert(p.second);
+            }
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "BerrySession::read_current_page(): Unable to read selected item. OCR and sprite do not agree on any match: ocr "
+                + set_to_str(ocr_result) + ", sprite " + set_to_str(sprite_result),
+                m_stream,
+                screen
+            );
+        }
+        if (common.size() > 1){
+            std::set<std::string> sprite_result;
+            for (const auto& p : image_result.results){
+                sprite_result.insert(p.second);
+            }
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "BerrySession::read_current_page(): Unable to read selected item. Ambiguous result: "
+                + set_to_str(ocr_result) + ", " + set_to_str(sprite_result) + "\n" + language_warning(m_language),
+                m_stream,
+                screen
+            );
+        }
+
+        ocr_result = std::move(common);
+    }while (false);
+#endif
+
+    return ret;
+
+}
+PageIngredients BerrySession::read_current_page() const{
+    return read_screen(m_stream.video().snapshot());
+}
+
+//  Returns true if the target berry is found somewhere on the page.
+//  "slug" is set the target berry if the cursor is already on it.
+bool BerrySession::run_move_iteration(
+    std::string& slug, const std::string& berry,
+    const PageIngredients& page
+) const{
+    size_t current_index = page.selected;
+    size_t found_location = SIZE_MAX;
+    for (size_t c = 0; c < DonutBerriesReader::BERRY_PAGE_LINES; c++){
+        for (const std::string& item : page.item[c]){
+            if (berry == item){
+                found_location = c;
+                break;
+            }
+        }
+        if (found_location != SIZE_MAX){
+            break;
+        }
+    }
+
+    if (found_location == SIZE_MAX){
+        return false;
+    }
+    
+    //  Cursor is already on matching ingredient.
+    if (current_index == found_location){
+        m_stream.log("Desired " + berry + " is selected!", COLOR_BLUE);
+        slug = berry;
+        return true;
+    }
+
+    m_stream.log("Found desired " + berry + " on current page. Moving towards it...", COLOR_BLUE);
+
+    //  Move to it.
+    while (current_index < found_location){
+        pbf_press_dpad(m_context, DPAD_DOWN, 80ms, 200ms);
+        current_index++;
+    }
+    while (current_index > found_location){
+        pbf_press_dpad(m_context, DPAD_UP, 80ms, 200ms);
+        current_index--;
+    }
+    m_context.wait_for_all_requests();
+    m_context.wait_for(Milliseconds(500));
+    return true;
+}
+
+
+std::string BerrySession::move_to_ingredient(const std::string& berry, bool move_topdown) const{
+    size_t not_found_count = 0;
+    while (true){
+        m_context.wait_for_all_requests();
+        PageIngredients page = read_current_page();
+        std::string found_ingredient;
+        if (run_move_iteration(found_ingredient, berry, page)){
+            if (found_ingredient.empty()){
+                m_context.wait_for(std::chrono::milliseconds(100));
+                continue;
+            }
+            return found_ingredient;
+        }
+
+        size_t current = page.selected;
+        if ((move_topdown && current == DonutBerriesReader::BERRY_PAGE_LINES - 1) || 
+            (!move_topdown && current == 0)){
+            not_found_count++;
+            if (not_found_count >= 2){
+                m_stream.log("Berry not found anywhere.", COLOR_RED);
+                return "";
+            }
+            m_stream.log("End of page reached without finding " + berry + ". Wrapping back.", COLOR_ORANGE);
+        }
+
+        m_stream.log("Ingredient not found on current page. Jump to next page.", COLOR_ORANGE);
+
+        //  Not found on page. Jump to next screen
+        pbf_press_dpad(m_context, move_topdown ? DPAD_RIGHT : DPAD_LEFT, 80ms, 240ms);
+        m_context.wait_for_all_requests();
+        m_context.wait_for(std::chrono::milliseconds(100));
+    }
+    return "";
+}
+
+
+void BerrySession::add_berries(
+    VideoStream& stream, ProControllerContext& context,
+    const std::map<std::string, uint8_t>& berries
+){
+    std::map<std::string, size_t> BERRY_ORDER;
+    for (size_t i = 0; i < DONUT_BERRIES_SLUGS().size(); i++){
+        BERRY_ORDER.emplace(DONUT_BERRIES_SLUGS()[i], i);
+    }
+    const size_t NUM_NORMAL_BERRIES = DONUT_BERRIES_SLUGS().size() / 2;
+    const size_t NUM_HYPER_BERRIES = NUM_NORMAL_BERRIES;
+
+    bool all_hyper_berries = true;
+    bool all_normal_berries = true;
+    std::string log_msg = "Berries to add: ";
+    for (const auto& p : berries){
+        log_msg += p.first + ": " + std::to_string(p.second) + ", ";
+        if (BERRY_ORDER.find(p.first) == BERRY_ORDER.end()){
+            throw InternalProgramError(&stream.logger(), 
+                PA_CURRENT_FUNCTION, "unknown berry slug " + p.first);
+        }
+        if (p.first.starts_with("hyper-")){
+            all_normal_berries = false;
+        }else{
+            all_hyper_berries = false;
+        }
+    }
+    stream.log(log_msg.substr(0, log_msg.size() - 2)); // -2 to remove the trailing ", "
+
+    // Compute whether we should go from top to bottom or bottom to top to search for berries:
+    
+    std::vector<std::pair<std::string, uint8_t>> ordered_berries;
+
+    for (size_t i = 0; i < DONUT_BERRIES_SLUGS().size(); i++){
+        const auto& berry_slug = DONUT_BERRIES_SLUGS()[i];
+        auto it = berries.find(berry_slug);
+        if (it != berries.end()){
+            ordered_berries.emplace_back(berry_slug, it->second);
+        }
+    }
+    const size_t total_movement_topdown = BERRY_ORDER[ordered_berries.back().first] - (all_hyper_berries ? NUM_NORMAL_BERRIES : 0);
+    const size_t total_movment_bottomup = BERRY_ORDER.size() - BERRY_ORDER[ordered_berries.front().first] - (all_normal_berries ? NUM_HYPER_BERRIES : 0);
+    bool move_topdown = total_movement_topdown <= total_movment_bottomup;
+    if (all_hyper_berries && move_topdown){
+        // Press minus button twice to change to Hyperspace berry-only menu
+        pbf_press_button(context, BUTTON_MINUS, 100ms, 500ms);
+        pbf_press_button(context, BUTTON_MINUS, 100ms, 700ms);
+        context.wait_for_all_requests();
+    }else if (all_normal_berries && !move_topdown){
+        // Press minus button once to change to normal berry-only menu
+        pbf_press_button(context, BUTTON_MINUS, 100ms, 700ms);
+        context.wait_for_all_requests();
+    }
+    
+    if (move_topdown){
+        // reverse the order so that we can pop back
+        std::reverse(ordered_berries.begin(), ordered_berries.end());
+    }else{
+        // Move cursr to bottom of the list
+        pbf_press_dpad(context, DPAD_UP, 100ms, 500ms);
+        context.wait_for_all_requests();
+
+        // A controller bug could appear here:
+        // In normal cases, we call pbf_press_dpad(...DPAD_UP...); context.wait_for_all_requests();
+        // then start searching berries from bottom up. But sometimes the controller will ignore the "wait" command
+        // and read the current berry page before DPAD_UP has taken effect. This will break the program as it cannot
+        // find the berries on the last page.
+        // The code has a fail-safe: if it fails to find the berry, it will go through the entire list again. But
+        // this takes a lot of time.
+        // So instead, here we just wait until the berry selection moves to the bottom of the page:
+        DonutBerriesSelectionWatcher bottom_berry_selection(DonutBerriesSelectionDetector::LAST_BERRY_PAGE_ROW);
+        wait_until(stream, context, std::chrono::seconds(5), {bottom_berry_selection});
+    }
+
+    while (!ordered_berries.empty()){
+        const auto& back = ordered_berries.back();
+        std::string found = this->move_to_ingredient(back.first, move_topdown);
+        if (found.empty()){
+            const DonutBerries& name = get_berry_name(back.first);
+            throw_and_log<BerryNotFoundException>(
+                stream.logger(),
+                ErrorReportMode::NO_ERROR_REPORT,
+                "Unable to find Berry: \"" + name.display_name() + "\" - Did you run out?",
+                stream
+            );
+        }
+
+        const DonutBerries& name = get_berry_name(found);
+        stream.log("Adding " + name.display_name() + " x " + std::to_string(back.second), COLOR_BLUE);
+
+        DonutBerriesReader reader;
+        for (size_t i = 0; i < back.second; i++){
+            pbf_press_button(context, BUTTON_A, 160ms, 400ms);
+            context.wait_for_all_requests();
+            stream.overlay().add_log("Add " + name.display_name());
+
+            /* Todo: Image match isn't the best since B button covers it
+            bool ingredient_added = false;
+            for (int attempt = 0; attempt < 5; attempt++){
+                pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+                context.wait_for_all_requests();
+                VideoSnapshot image = stream.video().snapshot();
+                ImageMatch::ImageMatchResult image_result = 
+                    reader.read_confirmed_list_with_icon_matcher(image, m_num_confirmed);
+                image_result.clear_beyond_spread(DonutBerriesReader::ALPHA_SPREAD);
+                image_result.clear_beyond_alpha(DonutBerriesReader::MAX_ALPHA);
+                image_result.log(stream.logger(), DonutBerriesReader::MAX_ALPHA);
+                if (image_result.results.size() > 0){ // confirmed that the ingredient was added
+                    stream.overlay().add_log("Added " + name.display_name());
+                    m_num_confirmed++;
+                    ingredient_added = true;
+                    iter->second--;
+                    break;
+                }
+            }
+
+            if (!ingredient_added){
+                OperationFailedExceptionWithScreenshot::fire(
+                    ErrorReportMode::NO_ERROR_REPORT,
+                    "Unable to add ingredient: \"" + name.display_name() + "\" - Did you run out?",
+                    stream
+                );
+            }
+            */
+        }
+        ordered_berries.pop_back();
+    } // end while (!ordered_berries.empty())
+}
+
+
+
+void add_donut_berries(
+    VideoStream& stream, ProControllerContext& context,
+    Language language,
+    const std::map<std::string, uint8_t>& berries
+){
+    BerrySession session(stream, context, language);
+    session.add_berries(stream, context, berries);
+    pbf_press_button(context, BUTTON_PLUS, 160ms, 1840ms);
+    context.wait_for_all_requests();
+}
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_DonutBerrySession.h b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_DonutBerrySession.h
new file mode 100644
index 0000000000..5103082e7d
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_DonutBerrySession.h
@@ -0,0 +1,91 @@
+/*  Donut Berry Session
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLZA_BerrySession_H
+#define PokemonAutomation_PokemonLZA_BerrySession_H
+
+#include <map>
+#include <memory>
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/Language.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonFramework/Tools/VideoStream.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+#include "VideoGames/PokemonLZA/Inference/Donuts/PokemonLZA_DonutBerriesDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+class DonutBerriesReader;
+
+struct PageIngredients{
+    // the line index of the current selected berry, < BERRY_PAGE_LINES
+    int8_t selected = -1;
+    std::set<std::string> item[DonutBerriesReader::BERRY_PAGE_LINES];
+};
+
+
+class BerryNotFoundException : public OperationFailedExceptionWithScreenshot{
+public:
+    using OperationFailedExceptionWithScreenshot::OperationFailedExceptionWithScreenshot;
+};
+
+
+class BerrySession{
+public:
+    ~BerrySession();
+    BerrySession(
+        VideoStream& stream, ProControllerContext& context,
+        Language language
+    );
+
+    void add_berries(
+        VideoStream& stream, ProControllerContext& context,
+        const std::map<std::string, uint8_t>& berries
+    );
+
+
+public:
+    PageIngredients read_screen(std::shared_ptr<const ImageRGB32> screenshot) const;
+    PageIngredients read_current_page() const;
+
+    
+    //  Move to any berry in the set. Returns the berry it moved to.
+    //  Returns empty string if not found.
+    std::string move_to_ingredient(const std::string& berry, bool move_topdown) const;
+
+    bool run_move_iteration(
+        std::string& slug, const std::string& berry,
+        const PageIngredients& page
+    ) const;
+
+
+private:
+    VideoStream& m_stream;
+    ProControllerContext& m_context;
+    Language m_language;
+    VideoOverlaySet m_overlays;
+    //int8_t m_num_confirmed;
+};
+
+
+
+//  Read string to move to each target berry and add them to make donut.
+//  When this function returns, the berries are all confirmed with button plus.
+void add_donut_berries(
+    VideoStream& stream, ProControllerContext& context,
+    Language language,
+    const std::map<std::string, uint8_t>& berries  //  {slug, quantity}
+);
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_FastTravelNavigation.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_FastTravelNavigation.cpp
new file mode 100644
index 0000000000..e937f2cc13
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_FastTravelNavigation.cpp
@@ -0,0 +1,570 @@
+/*  Fast Travel Navigation
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <cmath>
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/Tools/GlobalThreadPools.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/NintendoSwitch_ConsoleHandle.h"
+#include "PokemonLZA_FastTravelNavigation.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+    
+
+const ImageFloatBox& FAST_TRAVEL_ARROW_BOX(){
+    static const ImageFloatBox box(0.014000, 0.237500, 0.033000, 0.544400);
+    return box;
+}
+
+const ImageFloatBox& FAST_TRAVEL_FILTER_ARROW_BOX(){
+    static const ImageFloatBox box(0.013000, 0.388800, 0.033000, 0.432400);
+    return box;
+}
+
+const double FAST_TRAVEL_SPACING = 0.025;
+const double FAST_TRAVEL_FILTER_SPACING = 0.0185;
+
+int get_current_selector_index(
+    ConsoleHandle& console,
+    const ImageFloatBox& box,
+    double spacing
+){
+    VideoSnapshot screen = console.video().snapshot();
+    SelectionArrowWatcher arrow(
+        COLOR_GREEN,
+        &console.overlay(),
+        SelectionArrowType::RIGHT,
+        box
+    );
+    if (arrow.detect(screen)){
+        ImageFloatBox detected = arrow.last_detected();
+        double arrow_height = detected.height;
+        double stride = arrow_height + spacing;
+        double relative_y = detected.y - box.y - (spacing / 2.0);
+        int index = static_cast<int>(std::round(relative_y / stride));
+        console.log("Current selector index: " + std::to_string(index));        
+        return index;
+    }
+    return -1;
+}
+
+bool should_navigate_down(
+    const LocationItem& current_selection,
+    const LocationItem& target_destination
+){
+    const size_t total_locations = LOCATION_ENUM_MAPPINGS().size();
+    size_t down_distance = (target_destination.index + total_locations - current_selection.index) % total_locations;
+    size_t up_distance = (current_selection.index + total_locations - target_destination.index) % total_locations;
+    return down_distance <= up_distance;
+}
+
+bool navigate_to_destination_page_in_fast_travel_menu_routine(
+    ConsoleHandle& console,
+    ProControllerContext& context,
+    Language language,
+    const LocationItem& target_destination
+){
+    WallClock deadline = current_time() + 30s;
+
+    do{
+        LocationNameReader location_name_reader;
+        std::vector<LocationItem> first_and_last_locations_on_page(2);
+        GlobalThreadPools::computation_normal().run_in_parallel(
+            [&](size_t index){
+                OCR::StringMatchResult result = location_name_reader.read_location_name(console.video().snapshot(), console.logger(), language, index * (LocationNameReader::PAGE_SIZE - 1));
+                result.clear_beyond_log10p(LocationNameOCR::MAX_LOG10P);
+                result.clear_beyond_spread(LocationNameOCR::MAX_LOG10P_SPREAD);
+                for (auto& item : result.results){
+                    first_and_last_locations_on_page[index] = get_location_item_from_slug(item.second.token);
+                }
+            },
+            0, 2
+        );
+        LocationItem top_location = first_and_last_locations_on_page[0];
+        LocationItem bottom_location = first_and_last_locations_on_page[1];
+
+        // Workaround: lumiouse-sewers-1 and lumiouse-sewers-2 have the same OCR result, dont use them for paging
+        if (top_location.location == Location::LUMIOSE_SEWERS_1 || top_location.location == Location::LUMIOSE_SEWERS_2){
+            OCR::StringMatchResult result = location_name_reader.read_location_name(console.video().snapshot(), console.logger(), language, 1);
+            result.clear_beyond_log10p(LocationNameOCR::MAX_LOG10P);
+            result.clear_beyond_spread(LocationNameOCR::MAX_LOG10P_SPREAD);
+            for (auto& item : result.results){
+                top_location = get_location_item_from_slug(item.second.token);
+            }
+        }
+        if (bottom_location.location == Location::LUMIOSE_SEWERS_1 || bottom_location.location == Location::LUMIOSE_SEWERS_2){
+            OCR::StringMatchResult result = location_name_reader.read_location_name(console.video().snapshot(), console.logger(), language, LocationNameReader::PAGE_SIZE - 2);
+            result.clear_beyond_log10p(LocationNameOCR::MAX_LOG10P);
+            result.clear_beyond_spread(LocationNameOCR::MAX_LOG10P_SPREAD);
+            for (auto& item : result.results){
+                bottom_location = get_location_item_from_slug(item.second.token);
+            }
+        }
+
+        if (target_destination.index >= top_location.index && target_destination.index <= bottom_location.index){
+            console.log("Stopping at destination page between " + top_location.slug + " and " + bottom_location.slug);
+            return true;
+        }
+        bool navigate_down = should_navigate_down(top_location, target_destination);
+        if (navigate_down){
+            pbf_press_button(context, BUTTON_RIGHT, 100ms, 500ms);
+        }else{
+            pbf_press_button(context, BUTTON_LEFT, 100ms, 500ms);
+        }
+        context.wait_for_all_requests();
+    } while (current_time() < deadline);
+    return false;
+}
+
+bool navigate_to_destination_page_in_fast_travel_menu(
+    ConsoleHandle& console,
+    ProControllerContext& context,
+    Language language,
+    const LocationItem& target_destination
+){
+    console.log("Navigating to destination page for: " + target_destination.slug);
+    console.overlay().add_log("Navigating to " + target_destination.slug + " page");
+    WallClock deadline = current_time() + 30s;
+    do{
+        navigate_to_destination_page_in_fast_travel_menu_routine(console, context, language, target_destination);
+
+        pbf_wait(context, 1s); // Account for video lag by making confirmation
+        context.wait_for_all_requests();
+
+        bool found = navigate_to_destination_page_in_fast_travel_menu_routine(console, context, language, target_destination);
+        if (found){
+            return true;
+        }
+    } while (current_time() < deadline);
+    return false;
+}
+
+int get_target_location_index_within_page(
+    const LocationItem& target_destination,
+    const std::vector<LocationItem>& current_page_locations
+){
+    for (size_t index = 0; index < current_page_locations.size(); index++){
+        if (current_page_locations[index].slug == target_destination.slug){
+            return static_cast<int>(index);
+        }
+    }
+    return -1;
+}
+
+bool navigate_to_destination_within_page_routine(
+    ConsoleHandle& console,
+    ProControllerContext& context,
+    Language language,
+    const LocationItem& target_destination
+){
+    WallClock deadline = current_time() + 30s;
+    do{
+        std::vector<LocationItem> current_page_locations = read_current_page_location_items(console, language);
+        int target_index = get_target_location_index_within_page(target_destination, current_page_locations);
+        if (target_index == -1){
+            return false;
+        }
+        int selector_index = get_current_selector_index(console, FAST_TRAVEL_ARROW_BOX(), FAST_TRAVEL_SPACING);
+        if (selector_index == -1){
+            return false;
+        }
+        // The target location can move due to how the game scrolls the list
+        if (selector_index == target_index){
+            console.log("Found destination: " + target_destination.slug);
+            return true;
+        }else{
+            int delta = target_index - selector_index;
+            for (; delta > 0; delta--){
+                pbf_press_dpad(context, DPAD_DOWN, 100ms, 200ms);
+            }
+            for (; delta < 0; delta++){
+                pbf_press_dpad(context, DPAD_UP, 100ms, 200ms);
+            }   
+            context.wait_for_all_requests();
+        }
+    } while (current_time() < deadline);
+    console.log("Timeout navigating to destination: " + target_destination.slug);
+    return false;
+}
+
+bool navigate_to_destination_within_page(
+    ConsoleHandle& console,
+    ProControllerContext& context,
+    Language language,
+    const LocationItem& target_destination
+){
+    console.log("Navigating to destination within page for: " + target_destination.slug);
+    console.overlay().add_log("Navigating to " + target_destination.slug + " in page");
+    WallClock deadline = current_time() + 30s;
+    do{
+        navigate_to_destination_within_page_routine(console, context, language, target_destination);
+
+        pbf_wait(context, 1s); // Account for video lag by making confirmation
+        context.wait_for_all_requests();
+
+        bool found = navigate_to_destination_within_page_routine(console, context, language, target_destination);
+        if (found){
+            return true;
+        }
+    } while (current_time() < deadline);
+    return false;
+}
+
+bool navigate_to_lumiose_sewers_location(
+    ConsoleHandle& console,
+    ProControllerContext& context,
+    Language language,
+    const LocationItem& target_destination
+){
+    console.log("Navigating to lumiose sewers location for: " + target_destination.slug);
+    console.overlay().add_log("Navigating to " + target_destination.slug);
+    LocationNameReader location_name_reader;
+    // Use this box to detect cafe woof icon to differentiate between lumiose-sewers-1 and lumiose-sewers-2
+    const ImageFloatBox& cafe_woof_box = {0.537000, 0.783000, 0.043000, 0.077000};
+    // Zoom in for detection
+    for (int i = 0; i < 5; i++){
+        pbf_move_right_joystick(context, {0, +1}, 100ms, 300ms); // Zoom in
+    }
+    // Set filter to facilities to reduce number of locations on the list
+    set_fast_travel_menu_filter(console, context, FAST_TRAVEL_FILTER::FACILITIES);
+    context.wait_for_all_requests();
+
+    WallClock deadline = current_time() + 60s;
+    do{
+        // Set selector to second to last spot
+        do{
+            int current_selector_index = get_current_selector_index(console, FAST_TRAVEL_ARROW_BOX(), FAST_TRAVEL_SPACING);
+            if (current_selector_index == -1){
+                return false;
+            }
+            if (current_selector_index == (LocationNameReader::PAGE_SIZE - 2)){
+                pbf_wait(context, 1s); // Account for video lag by making confirmation
+                context.wait_for_all_requests();
+                if (current_selector_index == (LocationNameReader::PAGE_SIZE - 2)){
+                    break;
+                }
+            }
+            // Only move down
+            int delta = (LocationNameReader::PAGE_SIZE - 2) - current_selector_index;
+            for (; delta > 0; delta--){
+                pbf_press_dpad(context, DPAD_DOWN, 100ms, 200ms);
+            }
+            context.wait_for_all_requests();
+        } while (current_time() < deadline);
+
+        // Read second to last spot only
+        LocationItem second_to_last_location;
+        OCR::StringMatchResult result = location_name_reader.read_location_name(
+            console.video().snapshot(),
+            console.logger(),
+            language,
+            LocationNameReader::PAGE_SIZE - 2
+        );
+        result.clear_beyond_log10p(LocationNameOCR::MAX_LOG10P);
+        result.clear_beyond_spread(LocationNameOCR::MAX_LOG10P_SPREAD);
+        for (auto& item : result.results){
+            second_to_last_location = get_location_item_from_slug(item.second.token);
+        }
+        
+        // lumiose-sewers-# in position
+        if (second_to_last_location.location == Location::LUMIOSE_SEWERS_1 || second_to_last_location.location == Location::LUMIOSE_SEWERS_2){
+            console.log("Hovering over sewer location");
+            MapIconDetector cafe_woof_icon(COLOR_ORANGE, MapIconType::CafeFlyable, cafe_woof_box, &console.overlay());
+            // cafe woof icon detected means lumiose-sewers-1
+            if (cafe_woof_icon.detect(console.video().snapshot()) && target_destination.location == Location::LUMIOSE_SEWERS_1){
+                pbf_wait(context, 1s); // Account for video lag by making confirmation
+                context.wait_for_all_requests();
+                if (cafe_woof_icon.detect(console.video().snapshot())){
+                    console.log("Lumiose Sewers 1 detected");
+                    for (int i = 0; i < 5; i++){
+                        pbf_move_right_joystick(context, {0, -1}, 100ms, 300ms); // Zoom out
+                    }
+                    context.wait_for_all_requests();
+                    return true;
+                }
+            }
+            // cafe woof icon not detected means lumiose-sewers-2
+            // there are no unobstructable icons near lumiose-sewers-2 to use for detection
+            else if (!cafe_woof_icon.detect(console.video().snapshot()) && target_destination.location == Location::LUMIOSE_SEWERS_2){
+                pbf_wait(context, 1s); // Account for video lag by making confirmation
+                context.wait_for_all_requests();
+                if (!cafe_woof_icon.detect(console.video().snapshot())){
+                    console.log("Lumiose Sewers 2 detected");
+                    for (int i = 0; i < 5; i++){
+                        pbf_move_right_joystick(context, {0, -1}, 100ms, 300ms); // Zoom out
+                    }
+                    context.wait_for_all_requests();
+                    return true;
+                }
+            }
+        }
+        pbf_press_dpad(context, DPAD_DOWN, 100ms, 200ms);
+        context.wait_for_all_requests();
+    }while (current_time() < deadline);
+    console.log("Timeout navigating to sewers location: " + target_destination.slug);
+    return false;
+}
+
+bool navigate_to_destination_in_fast_travel_menu(
+    ConsoleHandle& console,
+    ProControllerContext& context,
+    Language language,
+    const LocationItem& target_destination
+){
+    console.log("Navigating to destination in fast travel menu: " + target_destination.slug);
+    console.overlay().add_log("Navigating to " + target_destination.slug);
+    // lumiose-sewers-1 and lumiose-sewers-2 have the same OCR result, handle that case separately here
+    if (target_destination.location == Location::LUMIOSE_SEWERS_1 || target_destination.location == Location::LUMIOSE_SEWERS_2){
+        return navigate_to_lumiose_sewers_location(console, context, language, target_destination);
+    }
+    bool reached_destination_page = navigate_to_destination_page_in_fast_travel_menu(console, context, language, target_destination);
+    if (!reached_destination_page){
+        console.log("Unable to reach destination page for: " + target_destination.slug);
+        return false;
+    }
+    bool found_destination = navigate_to_destination_within_page(console, context, language, target_destination);
+    if (!found_destination){
+        console.log("Unable to find destination on current page: " + target_destination.slug);
+        return false;
+    }
+    return true;
+}
+
+bool open_fast_travel_filters_menu(
+    ConsoleHandle& console,
+    ProControllerContext& context
+){
+    console.log("Opening fast travel filters menu");
+    console.overlay().add_log("Opening filters menu");
+    ButtonGoneWatcher filters_not_open(
+        COLOR_RED,
+        ButtonType::ButtonMinus,
+        {0.026000, 0.787000, 0.022000, 0.038000},
+        &console.overlay()
+    );
+
+    int ret = run_until<ProControllerContext>(
+        console, context,
+        [&](ProControllerContext& context){
+            pbf_mash_button(context, BUTTON_MINUS, 4s);
+        },
+        {filters_not_open}
+    );
+    switch (ret){
+    case 0:
+        console.log("Fast travel filter menu opened.");
+        return true;
+    default:
+        return false;
+    }
+}
+
+bool set_fast_travel_menu_filter_routine(
+    ConsoleHandle& console,
+    ProControllerContext& context,
+    FAST_TRAVEL_FILTER filter
+){
+    int target_filter_index = static_cast<int>(filter);
+    WallClock deadline = current_time() + 30s;
+    do {
+        int selected_filter_index = get_current_selector_index(
+            console,
+            FAST_TRAVEL_FILTER_ARROW_BOX(),
+            FAST_TRAVEL_FILTER_SPACING
+        );
+        if (selected_filter_index == -1){
+            return false;
+        }
+        if (selected_filter_index == target_filter_index){
+            return true;
+        }
+
+        int delta = target_filter_index - selected_filter_index;
+        for (; delta > 0; delta--){
+            pbf_press_dpad(context, DPAD_DOWN, 100ms, 200ms);
+        }
+        for (; delta < 0; delta++){
+            pbf_press_dpad(context, DPAD_UP, 100ms, 200ms);
+        }
+        context.wait_for_all_requests();
+    } while (current_time() < deadline);
+    return false;
+}
+
+void set_fast_travel_menu_filter(
+    ConsoleHandle& console,
+    ProControllerContext& context,
+    FAST_TRAVEL_FILTER filter
+){
+    console.log("Setting fast travel menu filter to #" + std::to_string(static_cast<int>(filter)));
+    console.overlay().add_log("Setting filter to #" + std::to_string(static_cast<int>(filter)));
+    WallClock deadline = current_time() + 30s;
+
+    bool filters_menu_opened = open_fast_travel_filters_menu(console, context);
+    if (!filters_menu_opened){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "set_fast_travel_menu_filter(): Unable to open fast travel filter menu.",
+            console
+        );
+    }
+    do{
+        set_fast_travel_menu_filter_routine(console, context, filter);
+
+        pbf_wait(context, 1s); // Account for video lag by making confirmation
+        context.wait_for_all_requests();
+
+        bool found = set_fast_travel_menu_filter_routine(console, context, filter);
+        if (found){
+            // int target_arrow_index = static_cast<int>(filter);
+            ButtonWatcher filters_button(
+                COLOR_RED,
+                ButtonType::ButtonMinus,
+                {0.026000, 0.787000, 0.022000, 0.038000},
+                &console.overlay()
+            );
+            int ret = run_until<ProControllerContext>(
+                console, context,
+                [&](ProControllerContext& context){
+                    for (size_t i = 0; i < 4; i++){
+                        pbf_press_button(context, BUTTON_A, 100ms, 1000ms);
+                    }
+                },
+                {filters_button}
+            );
+            switch (ret){
+            case 0:
+                console.log("Fast travel filter set.");
+                return;
+            default:
+                break;
+            }
+        }
+    } while (current_time() < deadline);
+    OperationFailedExceptionWithScreenshot::fire(
+        ErrorReportMode::SEND_ERROR_REPORT,
+        "set_fast_travel_menu_filter(): Unable to set fast travel filter.",
+        console
+    );
+}
+
+void open_fast_travel_menu(
+    ConsoleHandle& console,
+    ProControllerContext& context
+){
+    console.log("Opening fast travel menu");
+    console.overlay().add_log("Opening fast travel menu");
+    MapOverWatcher map_over(COLOR_RED, &console.overlay());
+    int ret = run_until<ProControllerContext>(
+        console, context,
+        [&](ProControllerContext& context){
+            pbf_press_button(context, BUTTON_Y, 160ms, 10s);
+        },
+        {map_over}
+    );
+    switch (ret){
+    case 0:
+        console.log("Fast travel menu opened.");
+        return;
+    default:
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "open_fast_travel_menu(): Unable to open fast travel menu.",
+            console
+        );
+    }
+}
+
+std::vector<LocationItem> read_current_page_location_items(ConsoleHandle& console, Language language){
+    std::vector<LocationItem> locations(LocationNameReader::PAGE_SIZE);
+    LocationNameReader location_name_reader;
+    GlobalThreadPools::computation_normal().run_in_parallel(
+        [&](size_t index){
+            OCR::StringMatchResult result = location_name_reader.read_location_name(console.video().snapshot(), console.logger(), language, index);
+            result.clear_beyond_log10p(LocationNameOCR::MAX_LOG10P);
+            result.clear_beyond_spread(LocationNameOCR::MAX_LOG10P_SPREAD);
+            for (auto& item : result.results){
+                locations[index] = get_location_item_from_slug(item.second.token);
+                console.log("Fast Travel Menu Item " + std::to_string(index) + ": " + item.second.token);
+            }
+        },
+        0, LocationNameReader::PAGE_SIZE,
+        OCR::allow_parallel_ocr() ? 1 : (size_t)-1
+    );
+    if (locations.size() != LocationNameReader::PAGE_SIZE){
+        console.log("Unable to read all location names in fast travel menu.");
+    }
+    return locations;
+}
+
+FastTravelState open_map_and_fly_to(ConsoleHandle& console, ProControllerContext& context, Language language, Location location, bool zoom_to_max, bool clear_filters){
+    bool can_fast_travel = open_map(console, context, zoom_to_max, true);
+    if (!can_fast_travel){
+        return FastTravelState::PURSUED;
+    }
+    open_fast_travel_menu(console, context);
+    if (clear_filters){
+        set_fast_travel_menu_filter(console, context, FAST_TRAVEL_FILTER::ALL_TRAVEL_SPOTS);
+    }
+
+    LocationItem location_item = get_location_item_from_enum(location);
+    std::string target_slug = location_item.slug;
+    
+    console.log("Fast traveling to " + target_slug);
+
+    bool success = navigate_to_destination_in_fast_travel_menu(console, context, language, location_item);
+    if (!success){
+        return FastTravelState::NOT_FOUND;
+    }
+
+    BlackScreenWatcher fly_confirmed(COLOR_RED);
+    BlueDialogWatcher pursued_warning(COLOR_BLUE, &console.overlay(), 50ms);
+    OverworldPartySelectionWatcher overworld(COLOR_WHITE, &console.overlay());
+    int ret = run_until<ProControllerContext>(
+        console, context,
+        [&](ProControllerContext& context){
+            pbf_mash_button(context, BUTTON_A, 4s);
+        },
+        {fly_confirmed, pursued_warning}
+    );
+    switch (ret){
+    case 0:
+        console.log("Fly confirmed to " + target_slug);
+        break;
+    case 1:
+        console.log("Pursued by wild pokemon while flying to " + target_slug);
+        return FastTravelState::PURSUED;
+    default:
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "open_map_and_fly_to(): Unable to fast travel to " + target_slug,
+            console
+        );
+    }
+    ret = wait_until(
+        console, context, 30s, // 30s to load overworld on Switch 1
+        {overworld}
+    );
+    switch(ret){
+    case 0:
+        console.log("Arrived at " + target_slug);
+        return FastTravelState::SUCCESS;
+    default:
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "open_map_and_fly_to(): Overworld not detected",
+            console
+        );
+    }
+    return FastTravelState::NOT_FOUND;
+}
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_FastTravelNavigation.h b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_FastTravelNavigation.h
new file mode 100644
index 0000000000..efd91540e8
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_FastTravelNavigation.h
@@ -0,0 +1,171 @@
+/*  Fast Travel Navigation
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLZA_FastTravelNavigation_H
+#define PokemonAutomation_PokemonLZA_FastTravelNavigation_H
+
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "CommonTools/VisualDetectors/BlackScreenDetector.h"
+#include "VideoGames/PokemonLZA/Inference/Map/PokemonLZA_MapIconDetector.h"
+#include "VideoGames/PokemonLZA/Inference/Map/PokemonLZA_MapDetector.h"
+#include "VideoGames/PokemonLZA/Inference/Map/PokemonLZA_LocationNameReader.h"
+#include "VideoGames/PokemonLZA/Inference/PokemonLZA_DialogDetector.h"
+#include "VideoGames/PokemonLZA/Inference/PokemonLZA_OverworldPartySelectionDetector.h"
+#include "VideoGames/PokemonLZA/Inference/PokemonLZA_SelectionArrowDetector.h"
+#include "VideoGames/PokemonLZA/Resources/PokemonLZA_Locations.h"
+#include "PokemonLZA_BasicNavigation.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+// The arrow box position for all fast travel menu items
+const ImageFloatBox& FAST_TRAVEL_ARROW_BOX();
+
+// The arrow box position for the fast travel menu filter
+const ImageFloatBox& FAST_TRAVEL_FILTER_ARROW_BOX();
+
+// The spacing between each item in the fast travel menu
+extern const double FAST_TRAVEL_SPACING;
+// The spacing between each item in the fast travel menu filter
+extern const double FAST_TRAVEL_FILTER_SPACING;
+
+// Get the index of the currently selected item in arrow_boxes using the SelectionArrowDetector
+// Return -1 if unable to determine the current selector index
+int get_current_selector_index(
+    ConsoleHandle& console,
+    const ImageFloatBox& box,
+    double spacing
+);
+
+// Determine whether it's better to navigate up or down in the fast travel menu
+bool should_navigate_down(
+    const LocationItem& current_selection,
+    const LocationItem& target_destination
+);
+
+// Navigate pages in the fast travel menu via dpad left and right to find the page containing the target destination
+// What locations are on a page can depend on filters and if a location is unlocked or not
+// Return true when the page should contain the target destination based on indexes
+// Return false if no pages contain the target index in their range after checking all pages
+// This function does not own the validation of whether the target destination exists or not
+bool navigate_to_destination_page_in_fast_travel_menu_routine(
+    ConsoleHandle& console,
+    ProControllerContext& context,
+    Language language,
+    LocationItem& target_destination
+);
+
+bool navigate_to_destination_page_in_fast_travel_menu(
+    ConsoleHandle& console,
+    ProControllerContext& context,
+    Language language,
+    LocationItem& target_destination
+);
+
+// Get the index of the target destination in the current page's location items
+// Return -1 if not found
+int get_target_location_index_within_page(
+    const LocationItem& target_destination,
+    const std::vector<LocationItem>& current_page_locations
+);
+
+// Navigate to the target destination assuming we are on the correct page already
+// Return true if the target destination is found, hover over the option
+// Return false if the target destination is not found
+bool navigate_to_destination_within_page_routine(
+    ConsoleHandle& console,
+    ProControllerContext& context,
+    Language language,
+    const LocationItem& target_destination
+);
+
+bool navigate_to_destination_within_page(
+    ConsoleHandle& console,
+    ProControllerContext& context,
+    Language language,
+    const LocationItem& target_destination
+);
+
+// Special handling for lumiouse-sewers-1 and lumiouse-sewers-2 since they have the same OCR result
+// Disambiguate using a detector on the background map
+// Return true if the target destination is found, hover over the option
+// Return false if the target destination is not found
+bool navigate_to_lumiose_sewers_location(
+    ConsoleHandle& console,
+    ProControllerContext& context,
+    Language language,
+    const LocationItem& target_destination
+);
+
+// Navigate to the target destination in the fast travel menu
+// Find the correct page first with navigate_to_destination_page_in_fast_travel_menu_routine()
+// Then validate whether the target destination exists on the current page
+// Return true if the target destination is found on the current page, hover over the option
+// Return false if the target destination is not found on the current page
+bool navigate_to_destination_in_fast_travel_menu(
+    ConsoleHandle& console,
+    ProControllerContext& context,
+    Language language,
+    const LocationItem& target_destination
+);
+
+// Open the fast travel filters menu
+bool open_fast_travel_filters_menu(
+    ConsoleHandle& console,
+    ProControllerContext& context
+);
+
+// From the fast travel menu, set the fast travel menu filter to the specified option
+bool set_fast_travel_menu_filter_routine(
+    ConsoleHandle& console,
+    ProControllerContext& context,
+    FAST_TRAVEL_FILTER filter
+);
+
+void set_fast_travel_menu_filter(
+    ConsoleHandle& console,
+    ProControllerContext& context,
+    FAST_TRAVEL_FILTER filter
+);
+
+// From the map screen, open the fast travel menu
+void open_fast_travel_menu(
+    ConsoleHandle& console,
+    ProControllerContext& context
+);
+
+// With the fast travel menu opened, read all visible locations in the menu
+// Use parallelized OCR to read the 7 items
+// Use the dictionary to get the information for each given display name
+// Returns a list of LocationItem in the order that they appear
+std::vector<LocationItem> read_current_page_location_items(
+    ConsoleHandle& console,
+    Language language
+);
+
+// Open map and fast travel to a specified location.
+// This function calls `open_map()`, and uses the fast travel menu to fast travel to the location.
+// Assumes the filter is set to show all available fast travel locations.
+// Return FastTravelState:
+// - SUCCESS: fast travel successful. After the function returns, the player character is on the overworld
+// - PURSUED: spotted and pursued by wild pokemon, cannot fast travel. After the function returns, the game
+//   is in fly map with the spotted dialog.
+// - NOT_FOUND: unable to find the specified location on map, possibly not unlocked yet. After the function
+//   returns, the game is in fly map.
+FastTravelState open_map_and_fly_to(
+    ConsoleHandle& console,
+    ProControllerContext& context,
+    Language language,
+    Location location,
+    bool zoom_to_max = false,
+    bool clear_filters = false
+);
+    
+}
+}
+}
+#endif
\ No newline at end of file
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_GameEntry.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_GameEntry.cpp
new file mode 100644
index 0000000000..0e3d06242b
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_GameEntry.cpp
@@ -0,0 +1,154 @@
+/*  Game Entry
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Tools/ErrorDumper.h"
+#include "CommonFramework/Tools/ProgramEnvironment.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "CommonTools/VisualDetectors/BlackScreenDetector.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "VideoGames/PokemonLZA/PokemonLZA_Settings.h"
+#include "VideoGames/PokemonLZA/Inference/PokemonLZA_SelectionArrowDetector.h"
+#include "VideoGames/PokemonLZA/Inference/PokemonLZA_DialogDetector.h"
+#include "PokemonLZA_GameEntry.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+bool reset_game_to_gamemenu(
+    ConsoleHandle& console, ProControllerContext& context
+){
+    from_home_close_and_reopen_game(console, context, true);
+
+    // Now the game has opened:
+    return openedgame_to_gamemenu(console, context, GameSettings::instance().START_GAME_WAIT);
+}
+
+//  From the game menu screen (where "Press A" is displayed to enter the game),
+//  mash A to enter the game and wait until the black screen is gone.
+bool gamemenu_to_ingame(
+    VideoStream& stream, ProControllerContext& context,
+    Milliseconds enter_game_timeout
+){
+    stream.log("Mashing A to enter game...");
+    while (true){
+        BlackScreenWatcher black_screen(COLOR_RED, {0.1, 0.04, 0.8, 0.3});
+        BlueDialogWatcher dialog(COLOR_YELLOW);
+        SelectionArrowWatcher arrow(
+            COLOR_BLUE,
+            &stream.overlay(),
+            SelectionArrowType::RIGHT,
+            {0.2, 0.5, 0.6, 0.3}
+        );
+        context.wait_for_all_requests();
+//        stream.log("Waiting to enter game...");
+        int ret = run_until<ProControllerContext>(
+            stream, context,
+            [=](ProControllerContext& context){
+                pbf_mash_button(context, BUTTON_A, 2s);
+                pbf_wait(context, enter_game_timeout);
+            },
+            {
+                black_screen,
+                dialog,
+                arrow,
+            }
+        );
+        switch (ret){
+        case 0:
+            stream.log("Detected black screen.", COLOR_BLUE);
+            break;
+        case 1:
+            stream.log("Detected dialog.", COLOR_BLUE);
+            pbf_press_button(context, BUTTON_B, 160ms, 240ms);
+            continue;
+        case 2:
+            stream.log("Detected backup save arrow.", COLOR_BLUE);
+            pbf_press_button(context, BUTTON_A, 160ms, 240ms);
+            continue;
+        default:
+            stream.log("Timed out waiting for black screen.", COLOR_RED);
+            return false;
+        }
+        break;
+    }
+
+    stream.log("Black screen detected");
+
+    {
+        BlackScreenWatcher detector(
+            COLOR_RED,
+            {0.1, 0.04, 0.8, 0.3},
+            100, 10,
+            BlackScreenWatcher::FinderType::GONE
+        );
+        int ret = wait_until(
+            stream, context,
+            std::chrono::milliseconds(enter_game_timeout),
+            {{detector}}
+        );
+        if (ret == 0){
+            stream.log("Entered game!");
+            return true;
+        }else{
+            stream.log("Timed out waiting to enter game.", COLOR_RED);
+            return false;
+        }
+    }
+}
+
+bool reset_game_from_home(
+    ProgramEnvironment& env,
+    ConsoleHandle& console, ProControllerContext& context,
+    bool backup_save,
+    Milliseconds enter_game_timeout,
+    Milliseconds post_wait_time
+){
+    console.log("Resetting game from Home...");
+    console.overlay().add_log("Resetting game...");
+    bool ok = true;
+    ok &= reset_game_to_gamemenu(console, context);
+
+    if (backup_save){
+        console.log("Loading backup save!");
+        console.overlay().add_log("Use Backup Save");
+        pbf_wait(context, 1000ms);
+        ssf_press_dpad(context, DPAD_UP, 0ms, 200ms);
+        ssf_press_button(context, BUTTON_B | BUTTON_X, 1000ms, 200ms);
+    }
+
+    ok &= gamemenu_to_ingame(
+        console, context,
+        enter_game_timeout
+    );
+    if (!ok){
+        dump_image(console.logger(), env.program_info(), console.video(), "StartGame");
+    }
+    console.log("Entered game! Waiting out grace period.");
+    pbf_wait(context, post_wait_time);
+    context.wait_for_all_requests();
+    return ok;
+}
+bool reset_game_from_home(
+    ProgramEnvironment& env,
+    ConsoleHandle& console, ProControllerContext& context,
+    bool backup_save,
+    Milliseconds post_wait_time
+){
+    return reset_game_from_home(
+        env, console, context,
+        backup_save,
+        GameSettings::instance().ENTER_GAME_WAIT0,
+        post_wait_time
+    );
+}
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_GameEntry.h b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_GameEntry.h
new file mode 100644
index 0000000000..34a85d5547
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_GameEntry.h
@@ -0,0 +1,58 @@
+/*  Game Entry
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLZA_GameEntry_H
+#define PokemonAutomation_PokemonLZA_GameEntry_H
+
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+#include "NintendoSwitch/NintendoSwitch_ConsoleHandle.h"
+
+namespace PokemonAutomation{
+    class ProgramEnvironment;
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+using namespace std::chrono_literals;
+
+
+
+//  From Switch Home menu, reset game and wait until the game menu screen (where
+//  "Press A" is displayed to enter the game) is shown.
+bool reset_game_to_gamemenu(
+    ConsoleHandle& console, ProControllerContext& context
+);
+
+//  From Switch Home menu, start game and wait until the player character
+//  appears in game.
+//  post_wait_time: how many ticks to wait after the black screen
+//  (shown when loading the map) is over.
+bool reset_game_from_home(
+    ProgramEnvironment& env,
+    ConsoleHandle& console, ProControllerContext& context,
+    bool backup_save,
+    Milliseconds enter_game_mash,
+    Milliseconds enter_game_timeout,
+    Milliseconds post_wait_time
+);
+
+//  From Switch Home menu, start game and wait until the player character
+//  appears in game.
+//  post_wait_time: how many ticks to wait after the black screen
+//  (shown when loading the map) is over.
+bool reset_game_from_home(
+    ProgramEnvironment& env,
+    ConsoleHandle& console, ProControllerContext& context,
+    bool backup_save = false,
+    Milliseconds post_wait_time = 1000ms
+);
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_HyperspaceNavigation.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_HyperspaceNavigation.cpp
new file mode 100644
index 0000000000..d486d4708f
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_HyperspaceNavigation.cpp
@@ -0,0 +1,86 @@
+/*  Hyperspace Navigation
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <format>
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/NintendoSwitch_ConsoleHandle.h"
+#include "VideoGames/PokemonLZA/Inference/PokemonLZA_HyperspaceCalorieDetector.h"
+#include "VideoGames/PokemonLZA/Inference/PokemonLZA_ButtonDetector.h"
+#include "PokemonLZA_HyperspaceNavigation.h"
+
+namespace PokemonAutomation {
+namespace NintendoSwitch {
+namespace PokemonLZA {
+
+
+bool check_calorie(
+    ConsoleHandle& console,
+    ProControllerContext& context,
+    uint16_t min_calorie,
+    uint16_t additional_calorie_buffer
+){
+    HyperspaceCalorieWatcher calorie_watcher(console.logger());
+    int ret = wait_until(
+        console, context, std::chrono::seconds(5), {calorie_watcher}
+    );
+    if (ret < 0){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "check_calorie(): does not detect Calorie number after waiting for five seconds",
+            console
+        );
+    }
+
+    const uint16_t calorie_number = calorie_watcher.calorie_number();
+    const std::string log_msg = std::format("Calorie: {}/{}", calorie_number, min_calorie);
+    console.overlay().add_log(log_msg);
+    console.log(log_msg);
+    if (calorie_number <= min_calorie + additional_calorie_buffer){
+        if (additional_calorie_buffer == 0){
+            console.log("min calorie reached");
+            console.overlay().add_log("Min Calorie Reached");
+        }else{
+            console.log("Close to min Calorie");
+            console.overlay().add_log("Close to Min Calorie");
+        }
+        return true;
+    }
+    return false;
+}
+
+// Wait until the warp pad is detected
+void detect_interactable(
+    ConsoleHandle& console,
+    ProControllerContext& context
+){
+    ButtonWatcher ButtonA(
+        COLOR_RED,
+        ButtonType::ButtonA,
+        {0.4, 0.1, 0.2, 0.8},
+        &console.overlay(),
+        Milliseconds(100)
+    );
+
+    int ret = wait_until(
+        console, context, std::chrono::seconds(5),
+        {ButtonA}
+    );
+    if (ret < 0){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "detect_interactable_pad(): Cannot detect interactable after 5 seconds",
+            console
+        );
+    }else{
+        console.log("Detected warp pad.");
+    }
+}
+
+
+}  // namespace PokemonLZA
+}  // namespace NintendoSwitch
+}  // namespace PokemonAutomation
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_HyperspaceNavigation.h b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_HyperspaceNavigation.h
new file mode 100644
index 0000000000..6781cd8480
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_HyperspaceNavigation.h
@@ -0,0 +1,44 @@
+/*  Hyperspace Navigation
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  Helper functions for navigating in Hyperspace zones
+ */
+
+#ifndef PokemonAutomation_PokemonLZA_HyperspaceNavigation_H
+#define PokemonAutomation_PokemonLZA_HyperspaceNavigation_H
+
+#include <cstdint>
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+class ConsoleHandle;
+class ProController;
+using ProControllerContext = ControllerContext<ProController>;
+
+namespace PokemonLZA{
+
+// Check if the current Calorie number on screen is <= min_calorie + additional_calorie_buffer
+// Returns true if the condition is met, false otherwise
+// Throws OperationFailedException if calorie cannot be detected
+bool check_calorie(
+    ConsoleHandle& console,
+    ProControllerContext& context,
+    uint16_t min_calorie,
+    uint16_t additional_calorie_buffer = 0
+);
+
+// Wait until the warp pad is detected on screen
+// Throws OperationFailedException if warp pad is not detected within 5 seconds
+void detect_interactable(
+    ConsoleHandle& console,
+    ProControllerContext& context
+);
+
+
+}  // namespace PokemonLZA
+}  // namespace NintendoSwitch
+}  // namespace PokemonAutomation
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_MenuNavigation.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_MenuNavigation.cpp
new file mode 100644
index 0000000000..11d0c91b90
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_MenuNavigation.cpp
@@ -0,0 +1,166 @@
+/*  Menu Navigation
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  Functions to navigate main menu
+ */
+
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+// #include "CommonTools/VisualDetectors/BlackScreenDetector.h"
+// #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+// #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+// #include "VideoGames/PokemonLZA/Inference/PokemonLZA_ButtonDetector.h"
+// #include "VideoGames/PokemonLZA/Inference/PokemonLZA_SelectionArrowDetector.h"
+// #include "VideoGames/PokemonLZA/Inference/PokemonLZA_DialogDetector.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+#include "NintendoSwitch/NintendoSwitch_ConsoleHandle.h"
+#include "VideoGames/PokemonLZA/Inference/Boxes/PokemonLZA_BoxDetection.h"
+#include "VideoGames/PokemonLZA/Inference/PokemonLZA_MainMenuDetector.h"
+#include "VideoGames/PokemonLZA/Inference/PokemonLZA_OverworldPartySelectionDetector.h"
+#include "PokemonLZA_MenuNavigation.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+void overworld_to_main_menu(ConsoleHandle& console, ProControllerContext& context){
+    WallClock deadline = current_time() + std::chrono::seconds(120);
+    while (current_time() < deadline){
+        OverworldPartySelectionWatcher overworld(COLOR_RED, &console.overlay());
+        MainMenuWatcher main_menu(COLOR_GREEN, &console.overlay());
+        BoxWatcher box(COLOR_BLUE, &console.overlay());
+        context.wait_for_all_requests();
+        int ret = wait_until(
+            console, context,
+            std::chrono::seconds(30),
+            {
+                overworld,
+                main_menu,
+                box,
+            }
+        );
+        context.wait_for(std::chrono::milliseconds(100));
+        switch (ret){
+        case 0:
+            console.log("Detected Overworld...");
+            pbf_press_button(context, BUTTON_X, 160ms, 240ms);
+            continue;
+        case 1:
+            console.log("Detected Main Menu...");
+            return;
+        case 2:
+            console.log("Detected Box System...");
+            pbf_press_button(context, BUTTON_B, 160ms, 240ms);
+            continue;
+        default:
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "overworld_to_main_menu(): No state detected after 30 seconds.",
+                console
+            );
+        }
+    }
+
+    OperationFailedExceptionWithScreenshot::fire(
+        ErrorReportMode::SEND_ERROR_REPORT,
+        "overworld_to_main_menu(): Failed to enter box system after 2 minutes.",
+        console
+    );
+}
+
+void overworld_to_box_system(ConsoleHandle& console, ProControllerContext& context){
+    WallClock deadline = current_time() + std::chrono::seconds(120);
+    while (current_time() < deadline){
+        OverworldPartySelectionWatcher overworld(COLOR_RED, &console.overlay());
+        MainMenuWatcher main_menu(COLOR_GREEN, &console.overlay());
+        BoxWatcher box(COLOR_BLUE, &console.overlay());
+        context.wait_for_all_requests();
+        int ret = wait_until(
+            console, context,
+            std::chrono::seconds(30),
+            {
+                overworld,
+                main_menu,
+                box,
+            }
+        );
+        context.wait_for(std::chrono::milliseconds(100));
+        switch (ret){
+        case 0:
+            console.log("Detected Overworld...");
+            pbf_press_button(context, BUTTON_X, 160ms, 240ms);
+            continue;
+        case 1:
+            console.log("Detected Main Menu...");
+            pbf_press_button(context, BUTTON_A, 160ms, 240ms);
+            continue;
+        case 2:
+            console.log("Detected Box System...");
+            return;
+        default:
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "overworld_to_box_system(): No state detected after 30 seconds.",
+                console
+            );
+        }
+    }
+
+    OperationFailedExceptionWithScreenshot::fire(
+        ErrorReportMode::SEND_ERROR_REPORT,
+        "overworld_to_box_system(): Failed to enter box system after 2 minutes.",
+        console
+    );
+}
+
+void box_system_to_overworld(ConsoleHandle& console, ProControllerContext& context){
+    WallClock deadline = current_time() + std::chrono::seconds(120);
+    while (current_time() < deadline){
+        OverworldPartySelectionWatcher overworld(COLOR_RED, &console.overlay());
+        MainMenuWatcher main_menu(COLOR_GREEN, &console.overlay());
+        BoxWatcher box(COLOR_BLUE, &console.overlay());
+        context.wait_for_all_requests();
+        int ret = wait_until(
+            console, context,
+            std::chrono::seconds(30),
+            {
+                overworld,
+                main_menu,
+                box,
+            }
+            );
+        context.wait_for(std::chrono::milliseconds(100));
+        switch (ret){
+        case 0:
+            console.log("Detected Overworld...");
+            return;
+        case 1:
+            console.log("Detected Main Menu...");
+            pbf_press_button(context, BUTTON_B, 160ms, 240ms);
+            continue;
+        case 2:
+            console.log("Detected Box System...");
+            pbf_press_button(context, BUTTON_B, 160ms, 240ms);
+            continue;
+        default:
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "overworld_to_box_system(): No state detected after 30 seconds.",
+                console
+            );
+        }
+    }
+
+    OperationFailedExceptionWithScreenshot::fire(
+        ErrorReportMode::SEND_ERROR_REPORT,
+        "overworld_to_box_system(): Failed to exit box system after 2 minutes.",
+        console
+    );
+}
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_MenuNavigation.h b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_MenuNavigation.h
new file mode 100644
index 0000000000..36656c0f65
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_MenuNavigation.h
@@ -0,0 +1,42 @@
+/*  Menu Navigation
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLZA_MenuNavigation_H
+#define PokemonAutomation_PokemonLZA_MenuNavigation_H
+
+namespace PokemonAutomation{
+
+template <typename Type> class ControllerContext;
+
+namespace NintendoSwitch{
+
+class ConsoleHandle;
+class ProController;
+using ProControllerContext = ControllerContext<ProController>;
+
+namespace PokemonLZA{
+
+// From overworld, press X to enter main menu
+void overworld_to_main_menu(
+    ConsoleHandle& console, ProControllerContext& context
+);
+
+// From overworld, press X to enter main menu, then A to enter box system
+void overworld_to_box_system(
+    ConsoleHandle& console, ProControllerContext& context
+);
+
+// From box system, press B until overworld is reached
+void box_system_to_overworld(
+    ConsoleHandle& console, ProControllerContext& context
+);
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_PostKillCatcher.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_PostKillCatcher.cpp
new file mode 100644
index 0000000000..71b5699843
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_PostKillCatcher.cpp
@@ -0,0 +1,110 @@
+/*  Post-Kill Catcher
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonTools/StartupChecks/VideoResolutionCheck.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonLZA/Programs/PokemonLZA_GameEntry.h"
+#include "PokemonLZA_PostKillCatcher.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+using namespace Pokemon;
+
+PostKillCatcher_Descriptor::PostKillCatcher_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonLZA:PostKillCatcher",
+        STRING_POKEMON + " LZA", "Post-Kill Catcher",
+        "Programs/PokemonLZA/PostKillCatcher.html",
+        "Save the game immediately after knocking out a " + STRING_POKEMON + ". "
+        "Then use this program to repeatedly try to catch it by throwing a ball and resetting.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+PostKillCatcher::PostKillCatcher()
+    : RIGHT_SCROLLS(
+        "<b>" + STRING_POKEBALL + " Right-Scrolls:</b><br>"
+        "Scroll this many balls to the right. Negative will scroll to the left.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        0, -15, 15
+    )
+    , SCROLL_HOLD(
+        "<b>Scroll Hold:</b><br>"
+        "When scrolling to the desired ball, hold the dpad button for this long.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        "120 ms"
+    )
+    , SCROLL_RELEASE(
+        "<b>Scroll Release:</b><br>"
+        "When scrolling to the desired ball, release dpad button for this long before the next scroll.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        "80 ms"
+    )
+    , POST_THROW_WAIT(
+        "<b>Post-Throw Wait:</b><br>Wait this long after throwing a ball before resetting.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        "6000 ms"
+    )
+{
+    PA_ADD_OPTION(RIGHT_SCROLLS);
+    PA_ADD_OPTION(SCROLL_HOLD);
+    PA_ADD_OPTION(SCROLL_RELEASE);
+    PA_ADD_OPTION(POST_THROW_WAIT);
+}
+
+void PostKillCatcher::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    assert_16_9_720p_min(env.logger(), env.console);
+
+    //  Connect the controller.
+    require_player(env.console, context, BUTTON_L);
+
+    while (true){
+        int8_t scrolls = RIGHT_SCROLLS;
+        DpadPosition direction;
+        if (scrolls >= 0){
+            direction = DPAD_RIGHT;
+        }else{
+            direction = DPAD_LEFT;
+            scrolls = -scrolls;
+        }
+
+        Milliseconds hold = SCROLL_HOLD;
+        Milliseconds cool = SCROLL_RELEASE;
+
+        ssf_press_button(
+            context,
+            BUTTON_ZL | BUTTON_ZR,
+            500ms, 500ms + (hold + cool) * scrolls,
+            0ms
+        );
+
+        while (scrolls != 0){
+            pbf_press_dpad(context, direction, hold, cool);
+            scrolls--;
+        }
+
+        pbf_wait(context, POST_THROW_WAIT);
+
+        go_home(env.console, context);
+        reset_game_from_home(env, env.console, context);
+
+    }
+
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_PostKillCatcher.h b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_PostKillCatcher.h
new file mode 100644
index 0000000000..14846643c8
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_PostKillCatcher.h
@@ -0,0 +1,46 @@
+/*  Post-Kill Catcher
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLZA_PostKillCatcher_H
+#define PokemonAutomation_PokemonLZA_PostKillCatcher_H
+
+#include "Common/Cpp/Options/TimeDurationOption.h"
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+
+
+class PostKillCatcher_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    PostKillCatcher_Descriptor();
+};
+
+class PostKillCatcher : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = PostKillCatcher_Descriptor;
+    PostKillCatcher();
+
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    SimpleIntegerOption<int8_t> RIGHT_SCROLLS;
+    MillisecondsOption SCROLL_HOLD;
+    MillisecondsOption SCROLL_RELEASE;
+    MillisecondsOption POST_THROW_WAIT;
+};
+
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_StallBuyer.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_StallBuyer.cpp
new file mode 100644
index 0000000000..69ade3d13b
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_StallBuyer.cpp
@@ -0,0 +1,289 @@
+/*  Stall Buyer
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <array>
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "CommonTools/StartupChecks/VideoResolutionCheck.h"
+#include "CommonTools/VisualDetectors/BlackScreenDetector.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonLZA/Inference/PokemonLZA_ButtonDetector.h"
+#include "VideoGames/PokemonLZA/Inference/PokemonLZA_SelectionArrowDetector.h"
+#include "VideoGames/PokemonLZA/Inference/PokemonLZA_DialogDetector.h"
+#include "PokemonLZA_StallBuyer.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+using namespace Pokemon;
+
+StallBuyerRow::StallBuyerRow(int index, std::string&& ordinal)
+    : StaticTableRow(ordinal)
+    , item(LockMode::LOCK_WHILE_RUNNING, "The number of the " + ordinal + " item you want to purchase.")
+    , quantity(LockMode::LOCK_WHILE_RUNNING, 0, 0, 999)
+    , ordinal(std::move(ordinal))
+    , index(index)
+{
+    PA_ADD_STATIC(item);
+    PA_ADD_OPTION(quantity);
+}
+
+StallBuyerTable::StallBuyerTable()
+    : StaticTableOption("<b>Number to Purchase:</b><br>The number of items you want to purchase.", LockMode::LOCK_WHILE_RUNNING)
+{
+    add_row(std::make_unique<StallBuyerRow>(0, "first"));
+    add_row(std::make_unique<StallBuyerRow>(1, "second"));
+    add_row(std::make_unique<StallBuyerRow>(2, "third"));
+    add_row(std::make_unique<StallBuyerRow>(3, "fourth"));
+    add_row(std::make_unique<StallBuyerRow>(4, "fifth"));
+    add_row(std::make_unique<StallBuyerRow>(5, "sixth"));
+    add_row(std::make_unique<StallBuyerRow>(6, "seventh"));
+
+    finish_construction();
+}
+std::vector<std::string> StallBuyerTable::make_header() const{
+    std::vector<std::string> ret{
+        "Item",
+        "Quantity"
+    };
+    return ret;
+}
+
+
+StallBuyer_Descriptor::StallBuyer_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonLZA:StallBuyer",
+        STRING_POKEMON + " LZA", "Stall Buyer",
+        "Programs/PokemonLZA/StallBuyer.html",
+        "Buy berries or mints from stall.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+class StallBuyer_Descriptor::Stats : public StatsTracker{
+public:
+    Stats()
+        : purchases(m_stats["Purchases"])
+        , errors(m_stats["Errors"])
+    {
+        m_display_order.emplace_back("Purchases");
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+    }
+
+    std::atomic<uint64_t>& purchases;
+    std::atomic<uint64_t>& errors;
+};
+std::unique_ptr<StatsTracker> StallBuyer_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+
+StallBuyer::StallBuyer()
+    : GO_HOME_WHEN_DONE(false)
+    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_STATUS_UPDATE,
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+{
+    PA_ADD_OPTION(NUM_PURCHASE);
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+int detect_stall_amount_item(SingleSwitchProgramEnvironment& env, StallBuyer_Descriptor::Stats& stats){
+    // When buying from a stall, the first item is always selected.
+    // Detect which one is currently selected (with white background)
+    // 0.700 as y is the bottom option, then each one is shifted by 0.072
+    ImageFloatBox seven_item_stall_box  (0.858, 0.700 - 7 * 0.072, 0.024, 0.019);
+    ImageFloatBox six_item_stall_box    (0.858, 0.700 - 6 * 0.072, 0.024, 0.019);
+    ImageFloatBox five_item_stall_box   (0.858, 0.700 - 5 * 0.072, 0.024, 0.019);
+    ImageFloatBox two_item_stall_box    (0.858, 0.700 - 2 * 0.072, 0.024, 0.019);
+
+    WhiteScreenDetector seven_item_stall_detector(COLOR_BLUE, seven_item_stall_box);
+    WhiteScreenDetector six_item_stall_detector(COLOR_BLUE, six_item_stall_box);
+    WhiteScreenDetector five_item_stall_detector(COLOR_BLUE, five_item_stall_box);
+    WhiteScreenDetector two_item_stall_detector(COLOR_BLUE, two_item_stall_box);
+
+    VideoSnapshot snapshot = env.console.video().snapshot();
+    bool is_seven_item_stall = seven_item_stall_detector.detect(snapshot);
+    bool is_six_item_stall = six_item_stall_detector.detect(snapshot);
+    bool is_five_item_stall = five_item_stall_detector.detect(snapshot);
+    bool is_two_item_stall = two_item_stall_detector.detect(snapshot);
+
+    std::array<bool, 4> array = {is_seven_item_stall, is_six_item_stall, is_five_item_stall, is_two_item_stall};
+    auto count = std::count(array.begin(), array.end(), true);
+    if (count == 1){
+        // Exactly one kind of stall detected
+        if (is_seven_item_stall){
+            return 7;
+        }else if (is_six_item_stall){
+            return 6;
+        }else if (is_five_item_stall){
+            return 5;
+        }else{
+            return 2;
+        }
+    }else{
+        stats.errors++;
+        env.update_stats();
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "No recognized stall size.",
+            env.console
+        );
+    }
+}
+
+std::pair<DpadPosition, int> compute_needed_inputs(int item_position, int stall_amount_item){
+    int down_presses = item_position;
+    int up_presses = stall_amount_item - item_position + 1;
+
+    if (down_presses <= up_presses){
+        return { DPAD_DOWN, down_presses };
+    }else{
+        return { DPAD_UP, up_presses };
+    }
+}
+
+void StallBuyer::make_purchase(
+    SingleSwitchProgramEnvironment& env, ProControllerContext& context,
+    StallBuyerRow& stall_buyer_row,
+    uint16_t& purchases
+){
+    StallBuyer_Descriptor::Stats& stats = env.current_stats<StallBuyer_Descriptor::Stats>();
+    context.wait_for_all_requests();
+
+    ButtonWatcher buttonA(
+        COLOR_RED,
+        ButtonType::ButtonA,
+        {0.1, 0.1, 0.8, 0.8},
+        &env.console.overlay()
+    );
+    SelectionArrowWatcher select(
+        COLOR_YELLOW, &env.console.overlay(),
+        SelectionArrowType::RIGHT,
+        {0.715, 0.165, 0.045, 0.440}
+    );
+    SelectionArrowWatcher confirm(
+        COLOR_YELLOW, &env.console.overlay(),
+        SelectionArrowType::RIGHT,
+        {0.665, 0.600, 0.145, 0.080}
+    );
+    FlatWhiteDialogWatcher dialog(COLOR_RED, &env.console.overlay());
+
+    int ret = wait_until(
+        env.console, context,
+        30000ms,
+        {
+            buttonA,
+            select,
+            confirm,
+            dialog,
+        }
+    );
+    context.wait_for(100ms);
+
+    switch (ret){
+    case 0:
+        env.log("Detected A button.");
+        pbf_press_button(context, BUTTON_A, 160ms, 80ms);
+        return;
+
+    case 1:{
+        std::optional<int> stall_amount_item;
+
+        env.log("Detected item selection screen.");
+        if (!stall_amount_item.has_value()){
+            stall_amount_item = detect_stall_amount_item(env, stats);
+            env.log("Detected stall with " + std::to_string(stall_amount_item.value()) + " items to sell.");
+            for (StaticTableRow* item : NUM_PURCHASE.table()){
+                StallBuyerRow& casted_item = static_cast<StallBuyerRow&>(*item);
+                if (casted_item.index >= stall_amount_item.value() && casted_item.quantity > 0){
+                    throw UserSetupError(
+                        env.logger(),
+                        "Stall is of size " + std::to_string(stall_amount_item.value()) + " and Number to Purchase for " +
+                        casted_item.ordinal + " item is " + std::to_string(casted_item.quantity) + "."
+                    );
+                }
+            }
+        }
+        auto [direction, presses] = compute_needed_inputs(stall_buyer_row.index, stall_amount_item.value());
+        for (int i = 0; i < presses; i++){
+            pbf_press_dpad(context, direction, 160ms, 80ms);
+        }
+        pbf_press_button(context, BUTTON_A, 160ms, 80ms);
+        return;
+    }
+    case 2:
+        env.log("Detected purchase confirm screen.");
+        pbf_press_button(context, BUTTON_A, 160ms, 80ms);
+        stats.purchases++;
+        purchases++;
+        env.update_stats();
+
+        if (purchases == stall_buyer_row.quantity){
+            std::stringstream ss;
+            ss << "Purchased " << stall_buyer_row.quantity << " of " << stall_buyer_row.ordinal << " item.";
+            send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE, ss.str());
+            break;
+        }
+
+        return;
+
+    case 3:
+        env.log("Detected white dialog.");
+        pbf_press_button(context, BUTTON_A, 160ms, 80ms);
+        return;
+
+    default:
+        stats.errors++;
+        env.update_stats();
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "No recognized state after 30 seconds.",
+            env.console
+        );
+    }
+
+}
+
+void StallBuyer::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+//    StallBuyer_Descriptor::Stats& stats = env.current_stats<StallBuyer_Descriptor::Stats>();
+    assert_16_9_720p_min(env.logger(), env.console);
+
+    //  Connect the controller.
+    require_player(env.console, context, BUTTON_L);
+
+//    std::optional<int> stall_amount_item;
+
+    for (StaticTableRow* row : NUM_PURCHASE.table()){
+        StallBuyerRow& stall_buyer_row = static_cast<StallBuyerRow&>(*row);
+
+        for (uint16_t purchases = 0; purchases < stall_buyer_row.quantity; /*Do not increment, it will be done in the loop*/){
+            make_purchase(env, context, stall_buyer_row, purchases);
+        }
+    }
+    // intentionally don't leave the purchase menu to not get attacked
+    GO_HOME_WHEN_DONE.run_end_of_program(context);
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+}
+
+
+}
+}
+}
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_StallBuyer.h b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_StallBuyer.h
new file mode 100644
index 0000000000..ed489f4984
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_StallBuyer.h
@@ -0,0 +1,78 @@
+/*  Stall Buyer
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLZA_StallBuyer_H
+#define PokemonAutomation_PokemonLZA_StallBuyer_H
+
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "CommonFramework/Options/LabelCellOption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+
+
+class StallBuyerRow : public StaticTableRow{
+public:
+    StallBuyerRow(int index, std::string&& ordinal);
+
+    LabelCellOption item;
+    SimpleIntegerCell<uint16_t> quantity;
+    std::string ordinal;
+    int index;
+};
+
+class StallBuyerTable : public StaticTableOption {
+public:
+    StallBuyerTable();
+    virtual std::vector<std::string> make_header() const;
+};
+
+
+
+class StallBuyer_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    StallBuyer_Descriptor();
+
+    class Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+
+
+class StallBuyer : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = StallBuyer_Descriptor;
+    StallBuyer();
+
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    void make_purchase(
+        SingleSwitchProgramEnvironment& env, ProControllerContext& context,
+        StallBuyerRow& stall_buyer_row,
+        uint16_t& purchases
+    );
+
+private:
+    StallBuyerTable NUM_PURCHASE;
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
+    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_TrainerBattle.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_TrainerBattle.cpp
new file mode 100644
index 0000000000..3439e6ab17
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_TrainerBattle.cpp
@@ -0,0 +1,161 @@
+/*  Trainer Battle
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+// #include "CommonFramework/Exceptions/OperationFailedException.h"
+#include "CommonFramework/Tools/ProgramEnvironment.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "CommonTools/Async/InterruptableCommands.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+#include "VideoGames/PokemonLZA/Inference/Battles/PokemonLZA_MoveEffectivenessSymbol.h"
+#include "PokemonLZA_TrainerBattle.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+
+TrainerBattleState::TrainerBattleState(BattleAIOption& settings)
+    : m_settings(settings)
+    , m_consecutive_failures(0)
+{}
+
+
+std::string move_effectiveness_detection(MoveEffectivenessSymbol symbol){
+    const char* str = to_string(symbol);
+    if (str){
+        return str;
+    }
+    return "(Unable to Detect)";
+}
+
+
+bool TrainerBattleState::attempt_one_attack(
+    ProgramEnvironment& env,
+    ConsoleHandle& console,
+    ProControllerContext& context
+){
+    AsyncCommandSession<ProController> command(
+        context,
+        console.logger(),
+        context
+    );
+
+    MoveEffectivenessSymbolWatcher move_watcher(COLOR_RED, &console.overlay(), 20ms);
+    command.dispatch([](ProControllerContext& context){
+        pbf_press_button(context, BUTTON_ZL, 5000ms, 0ms);
+    });
+
+    console.log("Begin looking for type symbols.");
+
+    int ret = wait_until(
+        console, context, 1000ms,
+        {move_watcher}
+    );
+    if (ret < 0){
+        command.stop_session_and_rethrow();
+        context.wait_for(250ms);
+        // No move effectiveness symbol found
+        m_consecutive_failures++;
+        if (m_consecutive_failures >= 3){
+            run_lock_recovery(console, context);
+        }
+        return false;
+    }
+
+    std::string move_results = "Move Effectiveness:";
+    move_results += "\n- Top: " + move_effectiveness_detection(move_watcher[0]);
+    move_results += "\n- Left: " + move_effectiveness_detection(move_watcher[1]);
+    move_results += "\n- Right: " + move_effectiveness_detection(move_watcher[2]);
+    move_results += "\n- Bottom: " + move_effectiveness_detection(move_watcher[3]);
+    console.log(move_results);
+
+    static const Button BUTTON_INDEX[] = {
+        BUTTON_X,
+        BUTTON_Y,
+        BUTTON_A,
+        BUTTON_B,
+        BUTTON_NONE,
+    };
+    static const char* STRING_INDEX[] = {
+        "Picking Move: Top",
+        "Picking Move: Left",
+        "Picking Move: Right",
+        "Picking Move: Bottom",
+        "No moves available.",
+    };
+
+    int best_index = 4;
+    for (int index = 0; index < 4; index++){
+//        cout << "index: " << index << endl;
+        if (move_watcher[index] == MoveEffectivenessSymbol::None){
+//            cout << "skip due to none" << endl;
+            continue;
+        }
+        if (m_settings.MODE == BattleAIMode::BlindMash){
+            best_index = index;
+            break;
+        }
+        if (best_index == 4 || move_watcher[best_index] < move_watcher[index]){
+//            cout << "better move found: " << index << endl;
+            best_index = index;
+        }
+    }
+
+    console.log(STRING_INDEX[best_index], COLOR_BLUE);
+    console.overlay().add_log(STRING_INDEX[best_index]);
+
+    command.dispatch([&](ProControllerContext& context){
+        ssf_press_button(context, BUTTON_ZL, 0ms, 800ms, 200ms);
+        if (m_settings.USE_PLUS_MOVES){
+            ssf_press_button(context, BUTTON_PLUS, 320ms, 840ms);
+//            pbf_wait(context, 104ms);
+        }
+        pbf_press_button(context, BUTTON_INDEX[best_index], 160ms, 320ms);
+    });
+
+    command.wait();
+    command.stop_session_and_rethrow();
+    m_consecutive_failures = 0;
+    return true;
+}
+
+
+
+
+void TrainerBattleState::run_lock_recovery(ConsoleHandle& console, ProControllerContext& context){
+    console.log("Failed to lock on. Rotating camera...", COLOR_RED);
+
+    ssf_press_right_joystick(context, {-1, 0},  0ms, 1000ms, 0ms);
+    pbf_mash_button(context, BUTTON_ZL, 1000ms);
+    context.wait_for_all_requests();
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_TrainerBattle.h b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_TrainerBattle.h
new file mode 100644
index 0000000000..cfc1c3e2a6
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_TrainerBattle.h
@@ -0,0 +1,63 @@
+/*  Trainer Battle Functions
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLZA_TrainerBattle_H
+#define PokemonAutomation_PokemonLZA_TrainerBattle_H
+
+//#include "Common/Cpp/Time.h"
+#include "NintendoSwitch/NintendoSwitch_ConsoleHandle.h"
+#include "VideoGames/PokemonLZA/Options/PokemonLZA_BattleAIOption.h"
+
+namespace PokemonAutomation{
+
+template <typename Type> class ControllerContext;
+class ProgramEnvironment;
+
+namespace NintendoSwitch{
+
+class ProController;
+using ProControllerContext = ControllerContext<ProController>;
+
+namespace PokemonLZA{
+
+
+
+
+class TrainerBattleState{
+public:
+    TrainerBattleState(BattleAIOption& settings);
+
+    // Try to lock onto an opponent pokemon and launch an attack.
+    // - use_move_ai: if True, select available moves based on type effectiveness. Otherwise, select first
+    //   available move in the order of top, left right and bottom.
+    // - use_plus_moves: if True, press + to launch plus moves.
+    // - allow_button_B_press: if true, press button B if it cannot detect move effectiveness symbols.
+    //   This lets the function clear any pre-battle transparent dialog window it encounters.
+    //   If false, it will be external code's responsibility to clear those transparent dialog windows.
+    bool attempt_one_attack(
+        ProgramEnvironment& env,
+        ConsoleHandle& console,
+        ProControllerContext& context
+    );
+
+
+private:
+    void run_lock_recovery(ConsoleHandle& console, ProControllerContext& context);
+
+
+private:
+    BattleAIOption& m_settings;
+
+    size_t m_consecutive_failures;
+};
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_TurboMacro.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_TurboMacro.cpp
new file mode 100644
index 0000000000..27b47ba963
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_TurboMacro.cpp
@@ -0,0 +1,163 @@
+/*  Turbo Macro
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+
+#include "Common/Cpp/Exceptions.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonLA/Inference/Sounds/PokemonLA_ShinySoundDetector.h"
+#include "VideoGames/PokemonLZA/Options/PokemonLZA_ShinyDetectedAction.h"
+#include "PokemonLZA_TurboMacro.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+using namespace Pokemon;
+
+LZA_TurboMacro_Descriptor::LZA_TurboMacro_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonLZA:TurboMacro", STRING_POKEMON + " LZA",
+        "Turbo Macro",
+        "Programs/NintendoSwitch/TurboMacro.html",
+        "Create macros. Stops with specific trigger (e.g. shiny sound).",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::NONE,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+class LZA_TurboMacro_Descriptor::Stats : public StatsTracker{
+public:
+    Stats()
+        : loops(m_stats["Loops"])
+        , shinies(m_stats["Shiny Sounds"])
+        , errors(m_stats["Errors"])
+    {
+        m_display_order.emplace_back("Loops");
+        m_display_order.emplace_back("Shiny Sounds");
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+    }
+
+    std::atomic<uint64_t>& loops;
+    std::atomic<uint64_t>& shinies;
+    std::atomic<uint64_t>& errors;
+};
+std::unique_ptr<StatsTracker> LZA_TurboMacro_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+LZA_TurboMacro::LZA_TurboMacro()
+    : LOOP(
+        "<b>Number of times to loop:</b><br>(Set to zero to loop forever.)",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        100, 0
+    )
+    , TABLE(
+        "Command Schedule:",
+        {
+            ControllerClass::NintendoSwitch_ProController,
+            ControllerClass::NintendoSwitch_LeftJoycon,
+            ControllerClass::NintendoSwitch_RightJoycon,
+        }
+    )
+    , GO_HOME_WHEN_DONE(true)
+    , RUN_UNTIL_CALLBACK(
+        "Trigger to stop program:",
+        {
+            {RunUntilCallback::NONE,         "none",           "None (stop when done all loops)"},
+            {RunUntilCallback::SHINY_SOUND,            "shiny-sound",              "Shiny Sound Detected"},
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        RunUntilCallback::NONE
+    )
+{
+    PA_ADD_OPTION(LOOP);
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+    PA_ADD_OPTION(RUN_UNTIL_CALLBACK);
+    PA_ADD_OPTION(TABLE);
+}
+
+
+void LZA_TurboMacro::program(SingleSwitchProgramEnvironment& env, CancellableScope& scope){
+    ProControllerContext context(scope, env.console.controller<ProController>());
+
+    //  Connect the controller.
+    require_player(env.console, context, BUTTON_NONE);
+
+    switch (RUN_UNTIL_CALLBACK){
+    case RunUntilCallback::NONE:
+        run_table(env, scope);
+        break;
+    case RunUntilCallback::SHINY_SOUND:
+        run_table_stop_when_shiny_sound(env, scope);
+        break;
+    default:
+        throw InternalProgramError(
+            &env.logger(), PA_CURRENT_FUNCTION,
+            "TurboMacro::program(): Unknown RunUntilCallback"
+        );
+        
+    }
+
+    if (GO_HOME_WHEN_DONE){
+        go_home(env.console, context);
+    }
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+}
+
+
+void LZA_TurboMacro::run_table(SingleSwitchProgramEnvironment& env, CancellableScope& scope){
+    LZA_TurboMacro_Descriptor::Stats& stats =
+        env.current_stats<LZA_TurboMacro_Descriptor::Stats>();
+    for (uint32_t c = 0; c < LOOP || LOOP == 0; c++){
+        TABLE.run(scope, env.console.controller());
+        stats.loops++;
+        env.update_stats();
+    }
+}
+
+void LZA_TurboMacro::run_table_stop_when_shiny_sound(SingleSwitchProgramEnvironment& env, CancellableScope& scope){
+    LZA_TurboMacro_Descriptor::Stats& stats =
+        env.current_stats<LZA_TurboMacro_Descriptor::Stats>();
+    ShinySoundDetectedActionOption shiny_detected_option("Shiny Detected", "", "1000 ms", ShinySoundDetectedAction::NOTIFY_ON_FIRST_ONLY);
+    ShinySoundHandler shiny_sound_handler(shiny_detected_option);
+    PokemonLA::ShinySoundDetector shiny_detector(env.console, [&](float error_coefficient) -> bool {
+        //  Warning: This callback will be run from a different thread than this function.
+        // env.console.overlay().add_log("Shiny Sound Detected!", COLOR_YELLOW);
+        return shiny_sound_handler.on_shiny_sound(
+            env, env.console,
+            0,
+            error_coefficient
+        );
+    });
+
+    int ret = run_until(
+        env.console, scope,
+        [&](CancellableScope& scope){
+            run_table(env, scope);
+        },
+        {shiny_detector}
+    );
+
+    if (ret == 0){
+        stats.shinies++;
+        env.update_stats();
+        return;
+    }
+}
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_TurboMacro.h b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_TurboMacro.h
new file mode 100644
index 0000000000..a94bad5295
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/PokemonLZA_TurboMacro.h
@@ -0,0 +1,58 @@
+/*  Turbo Macro
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLZA_TurboMacro_H
+#define PokemonAutomation_PokemonLZA_TurboMacro_H
+
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "Controllers/ControllerStateTable.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+
+class LZA_TurboMacro_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    LZA_TurboMacro_Descriptor();
+
+    class Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+
+class LZA_TurboMacro : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = LZA_TurboMacro_Descriptor;
+    LZA_TurboMacro();
+
+    virtual void program(SingleSwitchProgramEnvironment& env, CancellableScope& scope) override;
+
+    void run_table(SingleSwitchProgramEnvironment& env, CancellableScope& scope);
+
+    void run_table_stop_when_shiny_sound(SingleSwitchProgramEnvironment& env, CancellableScope& scope);
+
+
+private:
+    SimpleIntegerOption<uint32_t> LOOP;
+    ControllerCommandTables TABLE;
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
+
+    enum class RunUntilCallback{
+        NONE,
+        SHINY_SOUND,
+    };
+    EnumDropdownOption<RunUntilCallback> RUN_UNTIL_CALLBACK;
+};
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_AutoFossil.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_AutoFossil.cpp
new file mode 100644
index 0000000000..5606625c3e
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_AutoFossil.cpp
@@ -0,0 +1,376 @@
+/*  Auto Fossil
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <sstream>
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "CommonTools/StartupChecks/VideoResolutionCheck.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "Pokemon/Pokemon_Notification.h"
+#include "VideoGames/PokemonLZA/Inference/Boxes/PokemonLZA_BoxDetection.h"
+#include "VideoGames/PokemonLZA/Inference/Boxes/PokemonLZA_BoxInfoDetector.h"
+#include "VideoGames/PokemonLZA/Inference/PokemonLZA_ButtonDetector.h"
+#include "VideoGames/PokemonLZA/Inference/PokemonLZA_SelectionArrowDetector.h"
+#include "VideoGames/PokemonLZA/Inference/PokemonLZA_DialogDetector.h"
+#include "VideoGames/PokemonLZA/Programs/PokemonLZA_BasicNavigation.h"
+#include "VideoGames/PokemonLZA/Programs/PokemonLZA_GameEntry.h"
+#include "VideoGames/PokemonLZA/Programs/PokemonLZA_MenuNavigation.h"
+
+#include "PokemonLZA_AutoFossil.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+using namespace Pokemon;
+
+// event sequence:
+// Button "A" on top of researcher Reg when in overworld 
+// Flat white dialog box(?) with name Reg x 3
+// Flat white dialog box(?) with name Reg + fossil selection menu, green right arrow
+// Flat white dialog box(?) with name Reg x 2
+// Flash of white screen
+// Flat white dialog box (?) with name Reg x 1
+// Blue dialog of "You received <fossil pokemon>". This dialog can be cleared by button B as well.
+// Flat white dialog box (?) with name Reg x 2
+// Back to overworld, A button shown
+
+AutoFossil_Descriptor::AutoFossil_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonLZA:AutoFossil",
+        STRING_POKEMON + " LZA", "Auto Fossil",
+        "Programs/PokemonLZA/AutoFossil.html",
+        "Automatically revive fossils.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+class AutoFossil_Descriptor::Stats : public StatsTracker{
+public:
+    Stats()
+        : fossils(m_stats["Fossils"])
+        , alphas(m_stats["Alphas"])
+        , shinies(m_stats["Shinies"])
+        , errors(m_stats["Errors"])
+    {
+        m_display_order.emplace_back("Fossils");
+        m_display_order.emplace_back("Alphas");
+        m_display_order.emplace_back("Shinies");
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+    }
+
+    std::atomic<uint64_t>& fossils;
+    std::atomic<uint64_t>& alphas;
+    std::atomic<uint64_t>& shinies;
+    std::atomic<uint64_t>& errors;
+};
+
+std::unique_ptr<StatsTracker> AutoFossil_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+
+AutoFossil::AutoFossil()
+    : STOP_AFTER_CURRENT("Batch")
+    , NUM_FOSSILS("<b>How Many Fossils to Revive Before Checking Them in Box:</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        30, 1, 32*30
+    )
+    , WHICH_FOSSIL(
+        "<b>Which Fossil to Choose in the Dialog Menu:</b>",
+        {
+            {0, "1st-fossil", "1st Fossil"},
+            {1, "2nd-fossil", "2nd Fossil"},
+            {2, "3rd-fossil", "3rd Fossil"},
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        0
+    )
+    , CONTINUE_AFTER_FIND(
+        "<b>Continue after finding a match:</b><br>"
+        "After finding a match, the program will go to the next box, save and continue hunting. Beware, it will use a lot of fossils so start the program with a lot of them and enough empty boxes.",
+        LockMode::LOCK_WHILE_RUNNING,
+        false
+    )
+    , TAKE_VIDEO(
+        "Take a video When Found:",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        true
+    )
+    , GO_HOME_WHEN_DONE(true)
+    , FOUND_SHINY_OR_ALPHA(
+        "Found Shiny or Alpha",
+        true, true,
+        ImageAttachmentMode::JPG,
+        {"Notifs", "Showcase"}
+    )
+    , NOTIFICATION_STATUS("Status Update", true, false, Seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_STATUS,
+        &FOUND_SHINY_OR_ALPHA,
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_RECOVERABLE,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+{
+    PA_ADD_OPTION(STOP_AFTER_CURRENT);
+    PA_ADD_OPTION(NUM_FOSSILS);
+    PA_ADD_OPTION(WHICH_FOSSIL);
+    PA_ADD_OPTION(STOP_ON);
+    PA_ADD_OPTION(CONTINUE_AFTER_FIND);
+    PA_ADD_OPTION(TAKE_VIDEO);
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+
+void AutoFossil::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    assert_16_9_720p_min(env.logger(), env.console);
+
+    //  Connect the controller.
+    require_player(env.console, context, BUTTON_L);
+
+    DeferredStopButtonOption::ResetOnExit reset_on_exit(STOP_AFTER_CURRENT);
+
+    const size_t num_fossils_to_revive = NUM_FOSSILS; // at least 1
+    const size_t num_boxes = (num_fossils_to_revive+29) / 30;  // at least 1
+    while(true){
+        if (STOP_AFTER_CURRENT.should_stop()){
+            break;
+        }
+        for (size_t i = 0; i < num_fossils_to_revive; i++){
+            revive_one_fossil(env, context);
+            std::ostringstream os;
+            os << "Got Fossil " << i + 1 << "/" << num_fossils_to_revive;
+            std::string log_str = os.str();
+            env.log(log_str);
+            env.console.overlay().add_log(log_str);
+        }
+
+        overworld_to_box_system(env.console, context);
+        bool found_match = false;
+        for (uint8_t i = 0; i < num_boxes; i++){
+            size_t num_fossils_in_box = (i == num_boxes - 1 ? num_fossils_to_revive - i*30 : 30);
+            found_match = check_fossils_in_one_box(env, context, i*30, num_fossils_in_box);
+            if (found_match && !CONTINUE_AFTER_FIND){
+                send_program_finished_notification(env, NOTIFICATION_STATUS);
+                return;
+            }
+            // go to next page
+            pbf_press_button(context, BUTTON_R, 200ms, 200ms);
+        }
+        if (found_match){
+            // We didn't return early so we must be continuing after finding a match
+            box_system_to_overworld(env.console, context);
+            save_game_to_menu(env.console, context);
+            pbf_mash_button(context, BUTTON_B, 2000ms);
+        }else{
+            // checked all boxes, no match
+            go_home(env.console, context);
+            reset_game_from_home(env, env.console, context);
+        }
+
+        send_program_status_notification(env, NOTIFICATION_STATUS);
+    }
+}
+
+void AutoFossil::revive_one_fossil(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    AutoFossil_Descriptor::Stats& stats = env.current_stats<AutoFossil_Descriptor::Stats>();
+    bool seen_selection_arrow = false;
+    while (true){
+        context.wait_for_all_requests();
+
+        ButtonWatcher buttonA_watcher(
+            COLOR_WHITE,
+            ButtonType::ButtonA,
+            {0.1, 0.1, 0.8, 0.8},
+            &env.console.overlay()
+        );
+        SelectionArrowWatcher selection_arrow_watcher(
+            COLOR_GREEN, &env.console.overlay(),
+            SelectionArrowType::RIGHT,
+            {0.6300, 0.4440, 0.2260, 0.3190}
+        );
+
+        FlatWhiteDialogWatcher white_dialog_watcher(COLOR_WHITE, &env.console.overlay());
+        BlueDialogWatcher blue_dialog_watcher(COLOR_BLUE, &env.console.overlay());
+        
+        int ret = wait_until(
+            env.console, context,
+            10s,
+            {
+                buttonA_watcher,
+                selection_arrow_watcher,
+                white_dialog_watcher,
+                blue_dialog_watcher,
+            }
+        );
+        context.wait_for(100ms);
+
+        switch (ret){
+        case 0:
+            env.log("Detected A button.");
+            if (seen_selection_arrow){
+                // we finish one round of fossil reviving
+                stats.fossils++;
+                env.update_stats();
+                return;
+            }
+            // press A to start dialog with researcher Reg to start reviving a new fossil
+            pbf_press_button(context, BUTTON_A, 80ms, 40ms);
+            continue;
+        case 1:
+            env.log("Detected selection arrow.");
+            // This is when the Reg asks you which fossil to revive
+            for (size_t i = 0; i < WHICH_FOSSIL.current_value(); i++){
+                pbf_press_dpad(context, DPAD_DOWN, 40ms, 40ms);
+            }
+            pbf_press_button(context, BUTTON_A, 80ms, 40ms);
+            seen_selection_arrow = true;
+            continue;
+        case 2:
+        {
+            env.log("Detected white dialog.");
+            auto button = seen_selection_arrow ? BUTTON_B : BUTTON_A;
+            pbf_press_button(context, button, 80ms, 40ms);
+            continue;
+        }
+        case 3:
+            env.log("Detected blue dialog.");
+            pbf_press_button(context, BUTTON_B, 80ms, 40ms);
+            // in normal cases when blue dialog box is detected, we already seen the selection
+            // arrow. But just in case somehow the program misses the selection arrow detection,
+            // we can still set it to true here to ensure subsequent program execution is smooth.
+            seen_selection_arrow = true;
+            continue;
+
+        default:
+            stats.errors++;
+            env.update_stats();
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "revive_one_fossil(): No recognized state after 10 seconds.",
+                env.console
+            );
+        }
+    }
+}
+
+// start at box system, check fossils one by one
+bool AutoFossil::check_fossils_in_one_box(
+    SingleSwitchProgramEnvironment& env, ProControllerContext& context,
+    size_t num_checked_fossils_in_previous_boxes, size_t num_fossils_in_box)
+{
+    AutoFossil_Descriptor::Stats& stats = env.current_stats<AutoFossil_Descriptor::Stats>();
+
+    uint8_t box_row = 1, box_col = 0;
+    bool next_cell_right = true;
+    bool found_match = false;
+    BoxDetector box_detector(COLOR_RED, &env.console.overlay());
+    BoxPageInfoWatcher info_watcher(&env.console.overlay());
+    for (size_t i = 0; i < num_fossils_in_box; i++){
+        env.console.overlay().add_log("To cell: (" + std::to_string(box_row) + ", " + std::to_string(box_col) + ")");
+        box_detector.move_cursor(env.program_info(), env.console, context, box_row, box_col);
+
+        info_watcher.reset_state();
+        const int ret = wait_until(env.console, context, Seconds(5), {info_watcher});
+        if (ret < 0){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "Failed to detect box info at cell idx " + std::to_string(i) + " after 5 seconds",
+                env.console
+            );
+        }
+
+        
+        std::ostringstream os;
+        os << num_checked_fossils_in_previous_boxes + i + 1 << "/" << NUM_FOSSILS << ": " << info_watcher.info_str();
+        std::string log_str = os.str();
+        env.log(log_str);
+        env.console.overlay().add_log(log_str);
+        if (info_watcher.is_alpha()){
+            stats.alphas++;
+            env.update_stats();
+        }
+        if (info_watcher.is_shiny()){
+            stats.shinies++;
+            env.update_stats();
+        }
+
+        bool is_match = false;
+        switch (STOP_ON){
+        case PokemonLA::StopOn::Shiny:
+            is_match = info_watcher.is_shiny();
+            break;
+        case PokemonLA::StopOn::Alpha:
+            is_match = info_watcher.is_alpha();
+            break;
+        case PokemonLA::StopOn::ShinyOrAlpha:
+            is_match = info_watcher.is_shiny() || info_watcher.is_alpha();
+            break;
+        case PokemonLA::StopOn::ShinyAndAlpha:
+            is_match = info_watcher.is_shiny() && info_watcher.is_alpha();
+            break;
+        }
+        if (is_match){
+            send_program_notification(
+                env, FOUND_SHINY_OR_ALPHA,
+                Pokemon::COLOR_STAR_SHINY,
+                "Found " + info_watcher.info_str() + "!",
+                {}, "",
+                env.console.video().snapshot(), true
+            );
+
+            if (TAKE_VIDEO){
+                pbf_press_button(context, BUTTON_CAPTURE, 2000ms, 0ms);
+                context.wait_for_all_requests();
+            }
+            if (CONTINUE_AFTER_FIND){
+                found_match = true;
+            }else{
+                GO_HOME_WHEN_DONE.run_end_of_program(context);
+                return true;
+            }
+        }
+
+        if (next_cell_right){
+            if (box_col == 5){
+                box_row++;
+                size_t remaining_fossils = num_fossils_in_box - 1 - i;
+                if (remaining_fossils < 6){
+                    // we don't have enough fossils in this last row, so we move
+                    // from left to right
+                    box_col = 0;
+                    next_cell_right = true;
+                }else{
+                    next_cell_right = false;
+                }
+            }else{
+                box_col++;
+            }
+        }else{
+            if (box_col == 0){
+                box_row++;
+                next_cell_right = true;
+            }else{
+                box_col--;
+            }
+        }
+    }
+    return found_match;
+}
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_AutoFossil.h b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_AutoFossil.h
new file mode 100644
index 0000000000..c819b97def
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_AutoFossil.h
@@ -0,0 +1,70 @@
+/*  Auto Fossil
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  Hunt shiny and/or alpha fossils by repeated reviving fossils and check them in box
+ */
+
+#ifndef PokemonAutomation_PokemonLZA_AutoFossil_H
+#define PokemonAutomation_PokemonLZA_AutoFossil_H
+
+#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "Common/Cpp/Options/ButtonOption.h"
+#include "Common/Cpp/Options/EnumDropdownOption.h"
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "CommonFramework/Notifications/EventNotificationOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+#include "VideoGames/PokemonLA/Options/PokemonLA_MiscOptions.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+
+class AutoFossil_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    AutoFossil_Descriptor();
+
+    class Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+
+class AutoFossil : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = AutoFossil_Descriptor;
+    AutoFossil();
+
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    void revive_one_fossil(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+
+    // return true if found a match
+    bool check_fossils_in_one_box(SingleSwitchProgramEnvironment& env, ProControllerContext& context,
+        size_t num_checked_fossils_in_previous_boxes, size_t num_fossils_in_box);
+
+private:
+    DeferredStopButtonOption STOP_AFTER_CURRENT;
+    SimpleIntegerOption<uint32_t> NUM_FOSSILS;
+    IntegerEnumDropdownOption WHICH_FOSSIL;
+    PokemonLA::StopOnOption STOP_ON;
+    BooleanCheckBoxOption CONTINUE_AFTER_FIND;
+
+    BooleanCheckBoxOption TAKE_VIDEO;
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
+
+    EventNotificationOption FOUND_SHINY_OR_ALPHA;
+    EventNotificationOption NOTIFICATION_STATUS;
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_BeldumHunter.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_BeldumHunter.cpp
new file mode 100644
index 0000000000..9d6022371b
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_BeldumHunter.cpp
@@ -0,0 +1,218 @@
+/*  Beldum Hunter
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "CommonTools/VisualDetectors/BlackScreenDetector.h"
+#include "CommonTools/StartupChecks/VideoResolutionCheck.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+//#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+//#include "VideoGames/PokemonLZA/PokemonLZA_Settings.h"
+//#include "VideoGames/PokemonLZA/Inference/PokemonLZA_SelectionArrowDetector.h"
+//#include "VideoGames/PokemonLZA/Inference/PokemonLZA_DialogDetector.h"
+#include "VideoGames/PokemonLA/Inference/Sounds/PokemonLA_ShinySoundDetector.h"
+#include "VideoGames/PokemonLZA/Programs/PokemonLZA_GameEntry.h"
+#include "PokemonLZA_BeldumHunter.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+using namespace Pokemon;
+
+BeldumHunter_Descriptor::BeldumHunter_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonLZA:ShinyHunt-Beldum",
+        STRING_POKEMON + " LZA", "Shiny Hunt - Beldum",
+        "Programs/PokemonLZA/BeldumHunter.html",
+        "Repeatedly enter Lysandre Labs to shiny hunt Beldum.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::VIDEO_AUDIO,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+class BeldumHunter_Descriptor::Stats : public StatsTracker, public PokemonLA::ShinyStatIncrementer{
+public:
+    Stats()
+        : attempts(m_stats["Attempts"])
+        , errors(m_stats["Errors"])
+        , shinies(m_stats["Shinies"])
+    {
+        m_display_order.emplace_back("Attempts");
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+        m_display_order.emplace_back("Shinies");
+    }
+    virtual void add_shiny() override{
+        shinies++;
+    }
+
+    std::atomic<uint64_t>& attempts;
+    std::atomic<uint64_t>& errors;
+    std::atomic<uint64_t>& shinies;
+};
+std::unique_ptr<StatsTracker> BeldumHunter_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+
+BeldumHunter::BeldumHunter()
+    : TAKE_VIDEO("<b>Take Video:</b>", LockMode::UNLOCK_WHILE_RUNNING, true)
+    , NOTIFICATION_SHINY(
+        "Shiny Found",
+        true, true, ImageAttachmentMode::JPG,
+        {"Notifs", "Showcase"}
+    )
+    , NOTIFICATION_STATUS("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_SHINY,
+        &NOTIFICATION_STATUS,
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_RECOVERABLE,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+{
+    PA_ADD_STATIC(SHINY_REQUIRES_AUDIO);
+    PA_ADD_OPTION(TAKE_VIDEO);
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+bool BeldumHunter::run_iteration(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    BeldumHunter_Descriptor::Stats& stats = env.current_stats<BeldumHunter_Descriptor::Stats>();
+    stats.attempts++;
+    {
+        float shiny_coefficient = 1.0;
+        PokemonLA::ShinySoundDetector shiny_detector(env.logger(), [&](float error_coefficient) -> bool {
+            shiny_coefficient = error_coefficient;
+            return true;
+            });
+
+        BlackScreenOverWatcher entered(COLOR_RED, { 0.074, 0.044, 0.826, 0.278 });
+
+        env.log("Entering the lab.");
+        context.wait_for_all_requests();
+        int ret = run_until<ProControllerContext>(
+            env.console, context,
+            [&](ProControllerContext& context){
+                pbf_controller_state(context, BUTTON_B, DPAD_NONE, {0, +1}, {0, 0}, 800ms);
+                pbf_wait(context, 5000ms);
+            },
+            { {entered} }
+            );
+        if (ret == 0){
+            env.log("Entered the lab.");
+        }else{
+            env.log("Failed to enter the lab.");
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "Failed to warp.",
+                env.console
+            );
+        }
+        pbf_wait(context, 1000ms);
+        context.wait_for_all_requests();
+
+        int res = run_until<ProControllerContext>(
+            env.console, context,
+            [&](ProControllerContext& context){
+
+                env.log("Go straight toward the elevator.");
+                pbf_controller_state(context, BUTTON_B, DPAD_NONE, {0, +1}, {0, 0}, 3680ms);
+
+                env.log("Go left to where the Noivern spawns, then forward and then left.");
+                pbf_controller_state(context, BUTTON_B, DPAD_NONE, {-1, 0}, {0, 0}, 2400ms);
+                pbf_controller_state(context, BUTTON_B, DPAD_NONE, {0, +1}, {0, 0}, 640ms);
+                pbf_controller_state(context, BUTTON_B, DPAD_NONE, {-1, 0}, {0, 0}, 1440ms);
+
+                env.log("Through the Houndoom room and down the hallway.");
+                pbf_controller_state(context, BUTTON_B, DPAD_NONE, {0, -1}, {0, 0}, 1120ms);
+                pbf_controller_state(context, BUTTON_B, DPAD_NONE, {-1, 0}, {0, 0}, 1600ms);
+                pbf_controller_state(context, BUTTON_B, DPAD_NONE, {0, +1}, {0, 0}, 2720ms);
+
+                env.log("Final hallway to Beldum room.");
+                pbf_controller_state(context, BUTTON_B, DPAD_NONE, {-1, 0}, {0, 0}, 3200ms);
+                pbf_press_button(context, BUTTON_L, 40ms, 40ms);
+                context.wait_for_all_requests();
+            },
+            { {shiny_detector} }
+            );
+        shiny_detector.throw_if_no_sound();
+
+        if (res == 0){
+            env.log("Shiny detected!");
+            if (TAKE_VIDEO){
+                pbf_press_button(context, BUTTON_CAPTURE, 2000ms, 0ms);
+            }
+
+            return true;
+        }
+    }
+    env.console.log("No shiny detected. Resetting.");
+
+    pbf_press_button(context, BUTTON_HOME, 160ms, 3000ms);
+    reset_game_from_home(env, env.console, context, false);
+
+    return false;
+}
+
+
+void BeldumHunter::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    assert_16_9_720p_min(env.logger(), env.console);
+
+    //  Connect the controller.
+    require_player(env.console, context, BUTTON_L);
+
+    BeldumHunter_Descriptor::Stats& stats = env.current_stats<BeldumHunter_Descriptor::Stats>();
+
+    /*
+    * Setup: Face the opening to the labs. Save the game.
+    * 
+    * Program will enter the Labs and then run to the Beldum room.
+    * No shiny, reset the game. Repeat.
+    * Every time we enter the Beldum will reroll. We reset the game instead of running back
+    * due to the wild Pokemon spawns.
+    * This can also hunt Noivern, Houndour, and Houndoom.
+    */
+
+    while (true){
+        env.update_stats();
+        send_program_status_notification(env, NOTIFICATION_STATUS);
+        try{
+            bool shiny_found = run_iteration(env, context);
+            if (shiny_found){
+                stats.shinies++;
+                env.update_stats();
+
+                pbf_press_button(context, BUTTON_HOME, 160ms, 3000ms);
+
+                send_program_notification(env, NOTIFICATION_SHINY,
+                    COLOR_YELLOW, "Shiny sound detected!", {},
+                    "", env.console.video().snapshot(), true);
+                break;
+            }
+        }catch (OperationFailedExceptionWithScreenshot& e){
+            stats.errors++;
+            e.send_recoverable_error_notif_and_telemetry_report(env, NOTIFICATION_ERROR_RECOVERABLE);
+
+            pbf_press_button(context, BUTTON_HOME, 160ms, 3000ms);
+            reset_game_from_home(env, env.console, context, false);
+        }
+    }
+
+    env.update_stats();
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_BeldumHunter.h b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_BeldumHunter.h
new file mode 100644
index 0000000000..77425dee64
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_BeldumHunter.h
@@ -0,0 +1,52 @@
+/*  Beldum Hunter
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLZA_BeldumHunter_H
+#define PokemonAutomation_PokemonLZA_BeldumHunter_H
+
+#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "VideoGames/PokemonLA/Options/PokemonLA_ShinyDetectedAction.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+
+class BeldumHunter_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    BeldumHunter_Descriptor();
+
+    class Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+
+class BeldumHunter : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = BeldumHunter_Descriptor;
+    BeldumHunter();
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    bool run_iteration(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+
+private:
+    PokemonLA::ShinyRequiresAudioText SHINY_REQUIRES_AUDIO;
+
+    BooleanCheckBoxOption TAKE_VIDEO;
+
+    EventNotificationOption NOTIFICATION_SHINY;
+    EventNotificationOption NOTIFICATION_STATUS;
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_SewerHunter.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_SewerHunter.cpp
new file mode 100644
index 0000000000..6704f9e895
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_SewerHunter.cpp
@@ -0,0 +1,239 @@
+/*  Shiny Hunt - Sewer Hunter
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/VideoPipeline/VideoOverlay.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "CommonTools/VisualDetectors/BlackScreenDetector.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonLA/Inference/Sounds/PokemonLA_ShinySoundDetector.h"
+#include "VideoGames/PokemonLZA/Programs/PokemonLZA_BasicNavigation.h"
+#include "PokemonLZA_SewerHunter.h"
+
+namespace PokemonAutomation::NintendoSwitch::PokemonLZA {
+
+using namespace Pokemon;
+
+
+ShinyHunt_SewerHunter_Descriptor::ShinyHunt_SewerHunter_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonLZA:ShinyHunt-SewerHunter", STRING_POKEMON + " LZA",
+        "Sewer Hunter",
+        "Programs/PokemonLZA/ShinyHunt-SewerHunter.html",
+        "Shiny hunt in two sewer subzones",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions, FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+class ShinyHunt_SewerHunter_Descriptor::Stats : public StatsTracker{
+public:
+    Stats()
+        : resets(m_stats["Rounds"])
+        , shinies(m_stats["Shiny Sounds"])
+        , errors(m_stats["Errors"])
+    {
+        m_display_order.emplace_back("Rounds");
+        m_display_order.emplace_back("Shiny Sounds");
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+    }
+
+    std::atomic<uint64_t>& resets;
+    std::atomic<uint64_t>& shinies;
+    std::atomic<uint64_t>& errors;
+};
+std::unique_ptr<StatsTracker> ShinyHunt_SewerHunter_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+
+ShinyHunt_SewerHunter::ShinyHunt_SewerHunter()
+    : DURATION("<b>Duration:</b><br>Run the program this long.", LockMode::UNLOCK_WHILE_RUNNING, "5 h")
+    , ROUTE("<b>Hunt Route:</b>",
+        {
+            {Route::KLEFKI,  "klefki",  "Klefki"},
+            {Route::KLEFKI_INKAY_GOOMY,  "klefki_inkay_goomy",  "Klefki+Inkay+Goomy"},
+            {Route::LITWICK,  "litwick",  "Litwick"},
+            {Route::LITWICK_SKRELP,  "litwick_skrelp",  "Litwick+Skrelp+Haunter"},
+            {Route::SKRELP,  "skrelp",  "Skrelp"},
+            {Route::SKRELP_INKAY,  "skrelp_inkay",  "Skrelp+Inkay"},
+            {Route::ARIADOS,  "ariados",  "Ariados"},
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        Route::KLEFKI
+    )
+    , SHINY_DETECTED("Shiny Detected", "", "1000 ms", ShinySoundDetectedAction::NOTIFY_ON_FIRST_ONLY)
+    , NOTIFICATION_STATUS("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_STATUS,
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_RECOVERABLE,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+{
+    PA_ADD_STATIC(SHINY_REQUIRES_AUDIO);
+    PA_ADD_OPTION(DURATION);
+    PA_ADD_OPTION(ROUTE);
+    PA_ADD_OPTION(SHINY_DETECTED);
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+namespace {
+
+void fly_back_to_sewers_entrance(ConsoleHandle& console, ProControllerContext& context){
+    pbf_press_button(context, BUTTON_PLUS, 240ms, 80ms); // open map
+    context.wait_for_all_requests();
+    pbf_wait(context, 500ms);
+    pbf_press_button(context, BUTTON_Y, 100ms, 100ms); // select fly point
+    {
+        BlackScreenOverWatcher black_screen(COLOR_BLUE);
+        int ret = run_until<ProControllerContext>(
+            console, context,
+            [](ProControllerContext& context){
+                pbf_mash_button(context, BUTTON_A, 10000ms);
+            },
+            {black_screen}
+        );
+        if (ret != 0){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "fly_back_to_sewers_entrance(): cannot detect black screen after mashing A.",
+                console
+            );
+        }
+    }
+    wait_until_overworld(console, context);
+}
+
+void run_forward_backward_to_wall(
+    SingleSwitchProgramEnvironment& env, ProControllerContext& context,
+    PokemonAutomation::Milliseconds duration
+){
+    ssf_press_button(context, BUTTON_B, 0ms, 500ms, 0ms);
+    pbf_move_left_joystick(context, {0, +1}, duration, 0ms);
+    pbf_move_left_joystick(context, {0, -1}, duration + 500ms, 0ms);
+    pbf_wait(context, 500ms);
+}
+
+void route_klefki(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    ssf_press_button(context, BUTTON_B, 0ms, 500ms, 0ms);
+    pbf_move_left_joystick(context, {0, +1}, 4900ms, 0ms);
+    pbf_move_left_joystick(context, {-1, 0},  1000ms, 0ms);
+    pbf_press_button(context, BUTTON_L, 100ms, 500ms);
+    fly_back_to_sewers_entrance(env.console, context);
+}
+
+void route_klefki_inkay_goomy(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    ssf_press_button(context, BUTTON_B, 0ms, 500ms, 0ms);
+    pbf_move_left_joystick(context, {0, +1}, 8500ms, 0ms);
+    pbf_move_left_joystick(context, {+1, 0}, 1300ms, 0ms);
+    pbf_press_button(context, BUTTON_L, 100ms, 500ms);
+    fly_back_to_sewers_entrance(env.console, context);
+}
+
+void route_litwick(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    run_forward_backward_to_wall(env, context, 5s);
+}
+
+void route_litwick_skrelp(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    run_forward_backward_to_wall(env, context, 9000ms);
+}
+
+void route_skrelp(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    fly_back_to_sewers_entrance(env.console, context);
+    pbf_wait(context, 1000ms);
+}
+
+void route_skrelp_inkay(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    ssf_press_button(context, BUTTON_B, 0ms, 500ms, 0ms);
+    pbf_move_left_joystick(context, {0, +1}, 3900ms, 0ms);
+    fly_back_to_sewers_entrance(env.console, context);
+}
+
+void route_ariados(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    run_forward_backward_to_wall(env, context, 6s);
+}
+
+} // namespace
+
+
+void ShinyHunt_SewerHunter::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    ShinyHunt_SewerHunter_Descriptor::Stats& stats =
+        env.current_stats<ShinyHunt_SewerHunter_Descriptor::Stats>();
+    ShinySoundHandler shiny_sound_handler(SHINY_DETECTED);
+    PokemonLA::ShinySoundDetector shiny_detector(env.console, [&](float error_coefficient) -> bool {
+        //  Warning: This callback will be run from a different thread than this function.
+        stats.shinies++;
+        env.update_stats();
+        env.console.overlay().add_log("Shiny Sound Detected!", COLOR_YELLOW);
+        return shiny_sound_handler.on_shiny_sound(
+            env, env.console,
+            stats.shinies,
+            error_coefficient
+        );
+    });
+    std::function<void(SingleSwitchProgramEnvironment&, ProControllerContext&)> route;
+    switch (ROUTE){
+    case Route::KLEFKI:
+        route = route_klefki;
+        break;
+    case Route::KLEFKI_INKAY_GOOMY:
+        route = route_klefki_inkay_goomy;
+        break;
+    case Route::LITWICK:
+        route = route_litwick;
+        break;
+    case Route::LITWICK_SKRELP:
+        route = route_litwick_skrelp;
+        break;
+    case Route::SKRELP:
+        route = route_skrelp;
+        break;
+    case Route::SKRELP_INKAY:
+        route = route_skrelp_inkay;
+        break;
+    case Route::ARIADOS:
+        route = route_ariados;
+        break;
+    default:
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "route not implemented",
+            env.console
+        );
+    }
+    WallClock start_time = current_time();
+
+    //  Connect the controller.
+    require_player(env.console, context, BUTTON_L);
+
+    run_until<ProControllerContext>(
+        env.console, context,
+        [&](ProControllerContext& context){
+            do{
+                shiny_sound_handler.process_pending(context);
+                send_program_status_notification(env, NOTIFICATION_STATUS);
+                route(env, context);
+                context.wait_for_all_requests();
+                stats.resets++;
+                env.update_stats();
+            }while (current_time() < start_time + DURATION.get());
+        },
+        {{shiny_detector}}
+    );
+
+    shiny_sound_handler.process_pending(context);
+    go_home(env.console, context);
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+}
+
+
+}  // namespace PokemonAutomation::NintendoSwitch::PokemonLZA
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_SewerHunter.h b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_SewerHunter.h
new file mode 100644
index 0000000000..fdfd93d834
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_SewerHunter.h
@@ -0,0 +1,61 @@
+/*  Shiny Hunt - Sewer Hunter
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLZA_Sewer_Hunter_H
+#define PokemonAutomation_PokemonLZA_Sewer_Hunter_H
+
+#include "Common/Cpp/Options/EnumDropdownOption.h"
+#include "Common/Cpp/Options/TimeDurationOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "VideoGames/PokemonLA/Options/PokemonLA_ShinyDetectedAction.h"
+#include "VideoGames/PokemonLZA/Options/PokemonLZA_ShinyDetectedAction.h"
+
+namespace PokemonAutomation {
+namespace NintendoSwitch {
+namespace PokemonLZA {
+
+
+class ShinyHunt_SewerHunter_Descriptor : public SingleSwitchProgramDescriptor {
+public:
+    ShinyHunt_SewerHunter_Descriptor();
+
+    class Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+
+class ShinyHunt_SewerHunter : public SingleSwitchProgramInstance {
+public:
+    using Descriptor = ShinyHunt_SewerHunter_Descriptor;
+    ShinyHunt_SewerHunter();
+
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+    enum class Route{
+        KLEFKI,
+        KLEFKI_INKAY_GOOMY,
+        LITWICK,
+        LITWICK_SKRELP,
+        SKRELP,
+        SKRELP_INKAY,
+        ARIADOS
+    };
+
+private:
+    PokemonLA::ShinyRequiresAudioText SHINY_REQUIRES_AUDIO;
+    MillisecondsOption DURATION;
+    EnumDropdownOption<Route> ROUTE;
+    ShinySoundDetectedActionOption SHINY_DETECTED;
+    EventNotificationOption NOTIFICATION_STATUS;
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+
+}  // namespace PokemonLZA
+}  // namespace NintendoSwitch
+}  // namespace PokemonAutomation
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_BenchSit.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_BenchSit.cpp
new file mode 100644
index 0000000000..3c93118ed6
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_BenchSit.cpp
@@ -0,0 +1,413 @@
+/*  Shiny Hunt - Bench Sit
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/StaticGlobals.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "CommonTools/StartupChecks/VideoResolutionCheck.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonLA/Inference/Sounds/PokemonLA_ShinySoundDetector.h"
+#include "VideoGames/PokemonLZA/Inference/PokemonLZA_DayNightStateDetector.h"
+#include "VideoGames/PokemonLZA/Inference/PokemonLZA_ButtonDetector.h"
+#include "VideoGames/PokemonLZA/Programs/PokemonLZA_BasicNavigation.h"
+#include "PokemonLZA_ShinyHunt_BenchSit.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+using namespace Pokemon;
+
+
+
+
+
+ShinyHunt_BenchSit_Descriptor::ShinyHunt_BenchSit_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonLZA:ShinyHunt-BenchSit",
+        STRING_POKEMON + " LZA", "Bench Sit",
+        "Programs/PokemonLZA/ShinyHunt-BenchSit.html",
+        "Shiny hunt by repeatedly sitting on a bench to reset spawns.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+class ShinyHunt_BenchSit_Descriptor::Stats : public StatsTracker{
+public:
+    Stats()
+        : resets(m_stats["Bench Sits"])
+        , shinies(m_stats["Shiny Sounds"])
+        , errors(m_stats["Errors"])
+    {
+        m_display_order.emplace_back("Bench Sits");
+        m_display_order.emplace_back("Shiny Sounds");
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+
+        m_aliases["Shinies"] = "Shiny Sounds";
+        m_aliases["Shinies Detected"] = "Shiny Sounds";
+    }
+
+    std::atomic<uint64_t>& resets;
+    std::atomic<uint64_t>& shinies;
+    std::atomic<uint64_t>& errors;
+};
+std::unique_ptr<StatsTracker> ShinyHunt_BenchSit_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+
+
+
+
+ShinyHunt_BenchSit::ShinyHunt_BenchSit()
+    : WALK_DIRECTION(
+        "<b>Run Direction:</b><br>The direction of running after each day change to increase the spawn radius.",
+        {
+            {0, "forward", "Forward"},
+            {1, "left", "Turn Left"},
+            {2, "right", "Turn Right"},
+        },
+        LockMode::UNLOCK_WHILE_RUNNING,
+        0
+    )
+    , WALK_FORWARD_DURATION(
+        "<b>Run Forward Duration</b><br>"
+        "Run forward and backward for this long after each day change to "
+        "increase the spawn radius. Set to zero to disable this.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        "2000 ms"
+    )
+    , PERIODIC_SAVE(
+        "<b>Periodically Save:</b><br>"
+        "Save the game every this many bench sits. This reduces the loss to game crashes. Set to zero to disable. Saving will be unsuccessful if you are under attack",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        100,
+        0
+    )
+    , DAY_NIGHT_FILTER(
+        "Run Forward Only During Day/Night:",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        GroupOption::EnableMode::DEFAULT_DISABLED
+    )
+    , DAY_FILTER_MODE(
+        "<b>Time filter:</b>",
+        {
+            {0, "day", "Day"},
+            {1, "night", "Night"},
+        },
+        LockMode::UNLOCK_WHILE_RUNNING,
+        0
+    )
+    , PERIODIC_TIME_CHECK(
+          "<b>Periodically Check Time:</b><br>"
+          "How often the program re-checks the actual time of day from the map.<br>"
+          "0 = check every cycle.<br>"
+          "Higher values run faster but assume time alternates each bench sit.",
+          LockMode::UNLOCK_WHILE_RUNNING,
+          100,
+          0
+    )
+    , SHINY_DETECTED(
+        "Shiny Detected", "",
+        "2000 ms",
+        ShinySoundDetectedAction::NOTIFY_ON_FIRST_ONLY
+    )
+    , NOTIFICATION_STATUS("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_STATUS,
+        &SHINY_DETECTED.NOTIFICATIONS,
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_RECOVERABLE,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+{
+    PA_ADD_STATIC(SHINY_REQUIRES_AUDIO);
+    if (STATIC_GLOBALS.DEVELOPER_MODE){
+        PA_ADD_OPTION(WALK_DIRECTION);
+    }
+    PA_ADD_OPTION(WALK_FORWARD_DURATION);
+    PA_ADD_OPTION(PERIODIC_SAVE);
+    PA_ADD_OPTION(DAY_NIGHT_FILTER);
+    DAY_NIGHT_FILTER.add_option(DAY_FILTER_MODE, "FilterMode");
+    DAY_NIGHT_FILTER.add_option(PERIODIC_TIME_CHECK,"PeriodicTimeCheck");
+    PA_ADD_OPTION(SHINY_DETECTED);
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+
+void run_back_until_found_bench(
+    SingleSwitchProgramEnvironment& env, ProControllerContext& context
+){
+    ButtonWatcher buttonA(
+        COLOR_RED,
+        ButtonType::ButtonA,
+        {0.486, 0.477, 0.115, 0.5},
+        &env.console.overlay()
+    );
+
+    int ret = run_until<ProControllerContext>(
+        env.console, context,
+        [](ProControllerContext& context){
+            ssf_press_button(context, BUTTON_B, 0ms, 800ms, 0ms);
+            pbf_move_left_joystick(context, {0, -1}, 800ms, 200ms);
+            pbf_press_button(context, BUTTON_L, 160ms, 160ms);
+
+            //  Can't just hold it down since sometimes it doesn't register.
+            for (int c = 0; c < 10; c++){
+                pbf_move_right_joystick(context, {-1, 0}, 800ms, 200ms);
+                pbf_press_button(context, BUTTON_L, 160ms, 0ms);
+                pbf_move_left_joystick(context, {0, +1}, 840ms, 800ms);
+            }
+        },
+        {buttonA}
+    );
+
+    switch (ret){
+    case 0:
+        env.console.log("Detected floating A button...");
+        break;
+    default:
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "run_back_until_found_bench(): Unable to detect bench after multiple attempts.",
+            env.console
+        );
+    }
+}
+bool ShinyHunt_BenchSit::should_run_based_on_day_night(
+    const ImageViewRGB32& frame, VideoOverlay& overlay
+){
+
+    if ((Milliseconds)WALK_FORWARD_DURATION == Milliseconds::zero()){
+        return true;
+    }
+    if (!DAY_NIGHT_FILTER.enabled()){
+        return true;
+    }
+    if (!m_day_night_detector){
+        m_day_night_detector = std::make_unique<DayNightStateDetector>(&overlay);
+    }
+    if (!m_day_night_detector->detect(frame)){
+        return true;
+    }
+    DayNightState current_state = m_day_night_detector->state();
+    if (current_state == DayNightState::NIGHT){
+        overlay.add_log("Day/Night Detector: NIGHT", COLOR_CYAN);
+    }else{
+        overlay.add_log("Day/Night Detector: DAY", COLOR_YELLOW);
+    }
+    size_t filter_mode = DAY_FILTER_MODE.current_value();
+    if (filter_mode == 0){
+        return current_state == DayNightState::DAY;
+    }
+    else if (filter_mode == 1){
+        return current_state == DayNightState::NIGHT;
+    }
+    return true;
+}
+void ShinyHunt_BenchSit::check_daynight(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context
+){
+    open_map(env.console, context, false, true);
+    context.wait_for_all_requests();
+    pbf_wait(context, 180ms);
+    // zoom fully in
+    pbf_move_right_joystick(context, {0, 1}, 900ms, 120ms);
+    context.wait_for_all_requests();
+    pbf_wait(context, 120ms);
+    // hide icons
+    pbf_press_button(context, BUTTON_MINUS, 80ms, 120ms);
+    context.wait_for_all_requests();
+    pbf_wait(context, 160ms);
+    // double snapshot
+    VideoSnapshot frame1 = env.console.video().snapshot();
+    pbf_wait(context, 120ms);
+    VideoSnapshot frame2 = env.console.video().snapshot();
+    should_run_based_on_day_night(frame1, env.console.overlay());
+    should_run_based_on_day_night(frame2, env.console.overlay());
+    if (m_day_night_detector){
+        m_cached_time = m_day_night_detector->state();
+        m_cached_time_initialized = true;
+        m_rounds_since_time_check = 0;
+        std::string time_string = m_cached_time == DayNightState::DAY
+            ? "Cached Day"
+            : "Cached Night";
+        env.console.overlay().add_log(time_string, COLOR_GREEN);
+        env.log(time_string);
+    }
+
+    // close map
+    pbf_wait(context, 120ms);
+    pbf_press_button(context, BUTTON_PLUS, 500ms, 120ms);
+    context.wait_for_all_requests();
+    pbf_wait(context, 150ms);
+}
+void ShinyHunt_BenchSit::run_rounds(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    ShinySoundHandler& shiny_sound_handler
+){
+    ShinyHunt_BenchSit_Descriptor::Stats& stats = env.current_stats<ShinyHunt_BenchSit_Descriptor::Stats>();
+
+    for (uint32_t rounds_since_last_save = 0;; rounds_since_last_save++){
+        send_program_status_notification(env, NOTIFICATION_STATUS);
+        sit_on_bench(env.console, context);
+        shiny_sound_handler.process_pending(context);
+        stats.resets++;
+        env.update_stats();
+        if (m_cached_time_initialized){
+            m_cached_time = m_cached_time == DayNightState::DAY
+                ? DayNightState::NIGHT
+                : DayNightState::DAY;
+            m_rounds_since_time_check++;
+        }
+        uint32_t periodic_save = PERIODIC_SAVE;
+        if (periodic_save != 0 && rounds_since_last_save >= periodic_save){
+            bool save_successful = save_game_to_menu(env.console, context);
+            pbf_mash_button(context, BUTTON_B, 2000ms);
+            if (save_successful){
+                env.console.overlay().add_log("Game Saved Successfully", COLOR_BLUE);
+                rounds_since_last_save = 0;
+            }else{
+                env.console.overlay().add_log("Game Save Failed. Will attempt to save after the next reset.", COLOR_RED);
+            }
+        }
+
+        Milliseconds duration = WALK_FORWARD_DURATION;
+
+        // Only open map when movement enabled AND day/night filter requires verification
+        bool need_time_check = true;
+
+        uint32_t periodic_time_check = PERIODIC_TIME_CHECK;
+
+        if (periodic_time_check > 0 && m_cached_time_initialized){
+            need_time_check = m_rounds_since_time_check >= periodic_time_check;
+        }
+
+        if (duration > Milliseconds::zero() &&
+            DAY_NIGHT_FILTER.enabled() &&
+            (!m_cached_time_initialized || need_time_check)
+        ){
+            check_daynight(env, context);
+        }
+        // filtering
+        if (DAY_NIGHT_FILTER.enabled()){
+            size_t filter_mode = DAY_FILTER_MODE.current_value();
+            bool predicted_ok = filter_mode == 0
+                ? m_cached_time == DayNightState::DAY
+                : m_cached_time == DayNightState::NIGHT;
+
+            if (!predicted_ok){
+                env.console.overlay().add_log(
+                    "Skipping move (predicted wrong time of day)",
+                    COLOR_ORANGE
+                );
+                run_back_until_found_bench(env, context);
+                shiny_sound_handler.process_pending(context);
+                continue;
+            }
+        }
+
+        // movement
+        if (duration > Milliseconds::zero()){
+            if (WALK_DIRECTION.current_value() == 0){ // forward
+                env.console.overlay().add_log("Move Forward");
+                ssf_press_button(context, BUTTON_B, 0ms, 2*duration, 0ms);
+                pbf_move_left_joystick(context, {0, +1}, duration, 0ms);
+                // run back
+                pbf_move_left_joystick(context, {0, -1}, duration + 750ms, 0ms);
+                run_back_until_found_bench(env, context);
+            }else if (WALK_DIRECTION.current_value() == 1){ // left
+                env.console.overlay().add_log("Move Left");
+                ssf_press_button(context, BUTTON_B, 0ms, duration, 0ms);
+                pbf_move_left_joystick(context, {-1, 0},  duration, 0ms);
+                pbf_press_button(context, BUTTON_L, 100ms, 400ms);
+                ssf_press_button(context, BUTTON_B, 0ms, duration, 0ms);
+                pbf_move_left_joystick(context, {0, -1}, duration, 0ms);
+                pbf_move_left_joystick(context, {-1, 0},  100ms, 0ms);
+            }else if (WALK_DIRECTION.current_value() == 2){ // right
+                env.console.overlay().add_log("Move Right");
+                ssf_press_button(context, BUTTON_B, 0ms, duration, 0ms);
+                pbf_move_left_joystick(context, {+1, 0}, duration, 0ms);
+                pbf_press_button(context, BUTTON_L, 100ms, 400ms);
+                ssf_press_button(context, BUTTON_B, 0ms, duration, 0ms);
+                pbf_move_left_joystick(context, {0, -1}, duration, 0ms);
+                pbf_move_left_joystick(context, {+1, 0}, 100ms, 0ms);
+            }
+        }else{
+            run_back_until_found_bench(env, context);
+        }
+
+        shiny_sound_handler.process_pending(context);
+    }
+}
+void ShinyHunt_BenchSit::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    assert_16_9_720p_min(env.logger(), env.console);
+
+    //  Connect the controller.
+    require_player(env.console, context, BUTTON_L);
+
+    ShinyHunt_BenchSit_Descriptor::Stats& stats = env.current_stats<ShinyHunt_BenchSit_Descriptor::Stats>();
+
+    ShinySoundHandler shiny_sound_handler(SHINY_DETECTED);
+
+    m_cached_time = DayNightState::DAY;
+    m_cached_time_initialized = false;
+    m_rounds_since_time_check = 0;
+
+    PokemonLA::ShinySoundDetector shiny_detector(env.console, [&](float error_coefficient) -> bool{
+        //  Warning: This callback will be run from a different thread than this function.
+        stats.shinies++;
+        env.update_stats();
+        env.console.overlay().add_log("Shiny Sound Detected!", COLOR_YELLOW);
+        return shiny_sound_handler.on_shiny_sound(
+            env, env.console,
+            stats.shinies,
+            error_coefficient
+        );
+    });
+
+    run_until<ProControllerContext>(
+        env.console, context,
+        [&](ProControllerContext& context){
+            run_rounds(env, context, shiny_sound_handler);
+        },
+        {shiny_detector}
+    );
+
+    //  Shiny sound detected and user requested stopping the program when
+    //  detected shiny sound.
+    shiny_sound_handler.process_pending(context);
+
+    go_home(env.console, context);
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_BenchSit.h b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_BenchSit.h
new file mode 100644
index 0000000000..3134475f11
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_BenchSit.h
@@ -0,0 +1,86 @@
+/*  Shiny Hunt - Bench Sit
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLZA_ShinyHunt_BenchSit_H
+#define PokemonAutomation_PokemonLZA_ShinyHunt_BenchSit_H
+
+#include "Common/Cpp/Options/EnumDropdownOption.h"
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "Common/Cpp/Options/TimeDurationOption.h"
+#include "Common/Cpp/Options/GroupOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "VideoGames/PokemonLA/Options/PokemonLA_ShinyDetectedAction.h"
+#include "VideoGames/PokemonLZA/Options/PokemonLZA_ShinyDetectedAction.h"
+#include "VideoGames/PokemonLZA/Inference/PokemonLZA_DayNightStateDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+
+
+
+class ShinyHunt_BenchSit_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    ShinyHunt_BenchSit_Descriptor();
+
+    class Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+
+class ShinyHunt_BenchSit : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = ShinyHunt_BenchSit_Descriptor;
+    ShinyHunt_BenchSit();
+
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    void check_daynight(
+        SingleSwitchProgramEnvironment& env,
+        ProControllerContext& context
+    );
+    void run_rounds(
+        SingleSwitchProgramEnvironment& env,
+        ProControllerContext& context,
+        ShinySoundHandler& shiny_sound_handler
+    );
+
+private:
+    PokemonLA::ShinyRequiresAudioText SHINY_REQUIRES_AUDIO;
+
+    IntegerEnumDropdownOption WALK_DIRECTION;
+    MillisecondsOption WALK_FORWARD_DURATION;
+    SimpleIntegerOption<uint32_t> PERIODIC_SAVE;
+
+    GroupOption DAY_NIGHT_FILTER;
+    IntegerEnumDropdownOption DAY_FILTER_MODE;
+    SimpleIntegerOption<uint32_t> PERIODIC_TIME_CHECK;
+
+    ShinySoundDetectedActionOption SHINY_DETECTED;
+
+    EventNotificationOption NOTIFICATION_STATUS;
+    EventNotificationsOption NOTIFICATIONS;
+
+    std::unique_ptr<DayNightStateDetector> m_day_night_detector;
+    bool should_run_based_on_day_night(const ImageViewRGB32& frame, VideoOverlay& overlay);
+
+    DayNightState m_cached_time = DayNightState::DAY;
+    bool m_cached_time_initialized = false;
+    uint32_t m_rounds_since_time_check = 0;
+};
+
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_FlySpotReset.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_FlySpotReset.cpp
new file mode 100644
index 0000000000..8d3f1ebfce
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_FlySpotReset.cpp
@@ -0,0 +1,399 @@
+/*  Shiny Hunt - Fly Spot Reset
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/VideoPipeline/VideoOverlay.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "CommonTools/VisualDetectors/BlackScreenDetector.h"
+#include "CommonTools/StartupChecks/VideoResolutionCheck.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonLA/Inference/Sounds/PokemonLA_ShinySoundDetector.h"
+#include "VideoGames/PokemonLZA/Inference/PokemonLZA_HyperspaceCalorieDetector.h"
+#include "VideoGames/PokemonLZA/Programs/PokemonLZA_BasicNavigation.h"
+#include "PokemonLZA_ShinyHunt_FlySpotReset.h"
+
+namespace PokemonAutomation {
+namespace NintendoSwitch {
+namespace PokemonLZA {
+
+using namespace Pokemon;
+
+
+ShinyHunt_FlySpotReset_Descriptor::ShinyHunt_FlySpotReset_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonLZA:ShinyHunt-FlySpotReset", STRING_POKEMON + " LZA",
+        "Fly Spot Reset",
+        "Programs/PokemonLZA/ShinyHunt-FlySpotReset.html",
+        "Shiny hunt by repeatedly fast traveling to a location to reset nearby " + STRING_POKEMON + " spawns.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions, FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+class ShinyHunt_FlySpotReset_Descriptor::Stats : public StatsTracker{
+public:
+    Stats()
+        : resets(m_stats["Resets"])
+        , shinies(m_stats["Shiny Sounds"])
+        , errors(m_stats["Errors"])
+    {
+        m_display_order.emplace_back("Resets");
+        m_display_order.emplace_back("Shiny Sounds");
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+    }
+
+    std::atomic<uint64_t>& resets;
+    std::atomic<uint64_t>& shinies;
+    std::atomic<uint64_t>& errors;
+};
+
+std::unique_ptr<StatsTracker> ShinyHunt_FlySpotReset_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+
+ShinyHunt_FlySpotReset::ShinyHunt_FlySpotReset()
+    : SHINY_DETECTED("Shiny Detected", "", "2000 ms", ShinySoundDetectedAction::NOTIFY_ON_FIRST_ONLY)
+    , ROUTE("<b>Hunt Route:</b>",
+        {
+            {Route::NO_MOVEMENT,  "no_movement",  "No Movement in Lumiose"},
+            {Route::HYPERSPACE_WILD_ZONE, "hyperspace_wild_zone", "Hyperspace Wild Zone"},
+            {Route::WILD_ZONE_19, "wild_zone_19", "Wild Zone 19"},
+            {Route::ALPHA_PIDGEY, "alpha_pidgey", "Alpha Pidgey (Wild Zone 1)"},
+            // {Route::ALPHA_PIKACHU, "alpha_pikachu", "Alpha Pikachu (Wild Zone 6)"},
+            // {Route::CUSTOMISED_MACRO, "customised_macro", "Customised Macro"},
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        Route::NO_MOVEMENT
+    )
+    , NUM_RESETS(
+        "<b>Max Hyperspace Resets:</b><br>Max number of resets when in Hyperspace. Set to zero to have no max reset limit. "
+        "Make sure to leave enough time to catch found shinies."
+        "<br>Cal. per sec: 1 Star: 1 Cal./s, 2 Star: 1.6 Cal./s, 3 Star: 3.5 Cal./s, 4 Star: 7.5 Cal./s, 5 Star: 10 Cal./s. "
+        "Each reset takes between 0.6-1.0 sec of the timer.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        100, 0 // default, min
+    )
+    , MIN_CALORIE_REMAINING(
+        "<b>Minimum Cal. allowed While Resetting in Hyperspace:</b><br>The program will stop if the Calorie number is at or below this value."
+        "<br>NOTE: the more star the hyperspace has the faster Calorie burns! Pick a minimum Calorie value that gives you enough time to catch shinies."
+        "<br>Cal. per sec: 1 Star: 1 Cal./s, 2 Star: 1.6 Cal./s, 3 Star: 3.5 Cal./s, 4 Star: 7.5 Cal./s, 5 Star: 10 Cal./s. "
+        "Each reset takes between 0.6-1.0 sec of the timer."
+        "<br>Use a donut with AT LEAST ONE flavor power for the program to read Calorie number correctly.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        120, 0, 9999 // default, min, max
+    )
+    , NOTIFICATION_STATUS("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_STATUS,
+        &SHINY_DETECTED.NOTIFICATIONS,
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_RECOVERABLE,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+{
+    PA_ADD_STATIC(SHINY_REQUIRES_AUDIO);
+    PA_ADD_OPTION(ROUTE);
+    PA_ADD_OPTION(NUM_RESETS);
+    PA_ADD_OPTION(MIN_CALORIE_REMAINING);
+    PA_ADD_OPTION(SHINY_DETECTED);
+    PA_ADD_OPTION(NOTIFICATIONS);
+
+    ROUTE.add_listener(*this);
+}
+
+ShinyHunt_FlySpotReset::~ShinyHunt_FlySpotReset(){
+    ROUTE.remove_listener(*this);
+}
+
+
+void ShinyHunt_FlySpotReset::on_config_value_changed(void* object){
+    if (object == &ROUTE){
+        if (ROUTE == Route::HYPERSPACE_WILD_ZONE){
+            NUM_RESETS.set_visibility(ConfigOptionState::ENABLED);
+            MIN_CALORIE_REMAINING.set_visibility(ConfigOptionState::ENABLED);
+        }else{
+            NUM_RESETS.set_visibility(ConfigOptionState::HIDDEN);
+            MIN_CALORIE_REMAINING.set_visibility(ConfigOptionState::HIDDEN);
+        }
+    }
+}
+
+namespace {
+
+// Return if the loop should stop
+using route_func = std::function<
+    void(
+        SingleSwitchProgramEnvironment&,
+        ProControllerContext&,
+        ShinyHunt_FlySpotReset_Descriptor::Stats&,
+        bool
+    )
+>;
+
+void route_default(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    ShinyHunt_FlySpotReset_Descriptor::Stats& stats,
+    bool to_zoom_to_max
+){
+    // Open map
+    bool can_fast_travel = open_map(env.console, context, to_zoom_to_max, false);
+    if (!can_fast_travel){
+        stats.errors++;
+        env.update_stats();
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "route_default(): Cannot open map for fast travel.",
+            env.console
+        );
+    }
+
+    // Move map cursor upwards a little bit
+    pbf_move_left_joystick(context, {0, +0.5}, 100ms, 200ms);
+
+    // Fly from map to reset spawns
+    FastTravelState travel_status = fly_from_map(env.console, context);
+    if (travel_status != FastTravelState::SUCCESS){
+        stats.errors++;
+        env.update_stats();
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "route_default(): Cannot fast travel after moving map cursor.",
+            env.console
+        );
+    }
+}
+
+void route_wild_zone_19(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    ShinyHunt_FlySpotReset_Descriptor::Stats& stats,
+    bool to_zoom_to_max){
+    if (run_a_straight_path_in_overworld(env.console, context, -1, 0.375, 6500ms) == 0){
+        open_map(env.console, context, to_zoom_to_max, true);
+        pbf_move_left_joystick(context, {-0.375, -1}, 100ms, 100ms);
+        if (fly_from_map(env.console, context) == FastTravelState::NOT_AT_FLY_SPOT){
+            pbf_move_left_joystick(context, {-0.375, 0.75}, 100ms, 100ms);
+            fly_from_map(env.console, context);
+        }
+    }else{
+        open_map(env.console, context, to_zoom_to_max, true);
+        pbf_move_left_joystick(context, {-0.5, 0}, 100ms, 100ms);
+        fly_from_map(env.console, context);
+    }
+    wait_until_overworld(env.console, context, 50s);
+}
+
+void route_alpha_pidgey(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    ShinyHunt_FlySpotReset_Descriptor::Stats& stats,
+    bool to_zoom_to_max){
+    int ret = -1;
+    {
+        BlackScreenOverWatcher black_screen(COLOR_BLUE);
+        ret = run_until<ProControllerContext>(
+            env.console, context,
+            [&](ProControllerContext& context){
+                ssf_press_button(context, BUTTON_B, 0ms, 500ms, 0ms);
+                pbf_move_left_joystick(context, {+1, 0}, 4000ms, 0ms);
+                pbf_move_left_joystick(context, {0, -1}, 7400ms, 0ms);
+                pbf_move_left_joystick(context, {-1, 0},  3000ms, 0ms);
+                pbf_press_button(context, BUTTON_A, 500ms, 2500ms); // elevator up
+                pbf_move_left_joystick(context, {+1, 0}, 100ms, 0ms);
+                pbf_press_button(context, BUTTON_L, 100ms, 1000ms);
+            },
+            {black_screen}
+        );
+    }
+    if (ret == 0){
+        wait_until_overworld(env.console, context, 50s);
+    }
+    open_map(env.console, context, to_zoom_to_max, true);
+    pbf_move_left_joystick(context, {0, -1}, 200ms, 100ms);
+    if (fly_from_map(env.console, context) == FastTravelState::NOT_AT_FLY_SPOT){
+        pbf_move_left_joystick(context, {+1, 0}, 100ms, 100ms);
+        fly_from_map(env.console, context);
+    }
+    wait_until_overworld(env.console, context);
+}
+
+bool route_hyperspace_wild_zone(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    ShinyHunt_FlySpotReset_Descriptor::Stats& stats,
+    bool to_zoom_to_max,
+    SimpleIntegerOption<uint16_t>& MIN_CALORIE_REMAINING,
+    uint8_t& ready_to_stop_counter
+){
+    {
+        const bool zoom_map_to_max = false;
+        const bool require_map_icons = false;
+        open_map(env.console, context, zoom_map_to_max, require_map_icons);
+    }
+    
+    // Fly from map to reset spawns
+    std::shared_ptr<const ImageRGB32> overworld_screen;
+    FastTravelState travel_status = fly_from_map(env.console, context, &overworld_screen);
+    if (travel_status != FastTravelState::SUCCESS){
+        throw UserSetupError(
+            env.logger(),
+            "Cannot fast travel in Hyperspace Wild Zone due to aggressive " + STRING_POKEMON + " at portal. "
+            "Pick a Hyperspace that does not have " + STRING_POKEMON + " at portal when running Fly Spot Reset."
+        );
+    }
+
+    if (overworld_screen == nullptr){
+        throw InternalProgramError(&env.logger(), PA_CURRENT_FUNCTION, "overworld_screen is nullptr but FastTravelState is successful.");
+    }
+
+    HyperspaceCalorieDetector hyperspace_calorie_detector(env.logger());
+    if (!hyperspace_calorie_detector.detect(*overworld_screen)){
+        stats.errors++;
+        env.update_stats();
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "route_hyperspace_wild_zone(): Cannot read Calorie number on screen.",
+            env.console
+        );
+    }
+
+    const uint16_t calorie_number = hyperspace_calorie_detector.calorie_number();
+    const uint16_t min_calorie = MIN_CALORIE_REMAINING;
+    const std::string log_msg = std::format("Calorie: {}/{}", calorie_number, min_calorie);
+    env.log_to_ui(log_msg);
+    env.log(log_msg);
+    // `ready_to_stop_counter` serves as a "buffer zone" to ensure one wrong calorie detection won't stop
+    // the program early.
+    // Here we require the code to build up this `ready_to_stop_counter` counter when calorie is approaching
+    // the limit.
+    if (ready_to_stop_counter < 2 && calorie_number <= min_calorie + 12){
+        // We use "+12" because the 5-star Hyperspace burns about 6 Cal per sec and per reset. So we want
+        // to have enough time to build up `ready_to_stop_counter` to have value 2 when we reach min_calorie.
+        ready_to_stop_counter++;
+    }else if (ready_to_stop_counter >= 2 && calorie_number <= min_calorie){
+        // We've built up the ready_to_stop_counter so we can stop immidiately when detected calorie is lower
+        // than the threshodl.
+        return true;
+    }else if (ready_to_stop_counter > 0 && calorie_number > min_calorie + 12){
+        ready_to_stop_counter--;
+    }
+    return false;
+}
+
+
+} // namespace
+
+void ShinyHunt_FlySpotReset::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    assert_16_9_720p_min(env.logger(), env.console);
+
+    //  Connect the controller.
+    require_player(env.console, context, BUTTON_B);
+
+    ShinyHunt_FlySpotReset_Descriptor::Stats& stats = env.current_stats<ShinyHunt_FlySpotReset_Descriptor::Stats>();
+
+    ShinySoundHandler shiny_sound_handler(SHINY_DETECTED);
+
+    PokemonLA::ShinySoundDetector shiny_detector(env.console, [&](float error_coefficient) -> bool {
+        //  Warning: This callback will be run from a different thread than this function.
+        stats.shinies++;
+        env.update_stats();
+        env.console.overlay().add_log("Shiny Sound Detected!", COLOR_YELLOW);
+
+        return shiny_sound_handler.on_shiny_sound(
+            env, env.console,
+            stats.shinies,
+            error_coefficient
+        );
+    });
+
+    route_func route;
+    switch (ROUTE){
+    case Route::NO_MOVEMENT:
+        route = route_default;
+        break;
+    case Route::HYPERSPACE_WILD_ZONE:
+        // Need special handling
+        break;
+    case Route::WILD_ZONE_19:
+        route = route_wild_zone_19;
+        break;
+    case Route::ALPHA_PIDGEY:
+        route = route_alpha_pidgey;
+        break;
+    default:
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "route not implemented",
+            env.console
+        );
+    }
+    
+    uint64_t num_resets = 0;
+    bool to_zoom_to_max = true;
+    uint8_t ready_to_stop_counter = 0;
+    run_until<ProControllerContext>(
+        env.console, context,
+        [&](ProControllerContext& context){
+            while (true){
+                context.wait_for_all_requests();
+                shiny_sound_handler.process_pending(context);
+
+                bool should_stop = false;
+                if (ROUTE == Route::HYPERSPACE_WILD_ZONE){
+                    should_stop = route_hyperspace_wild_zone(
+                        env, context, stats,
+                        to_zoom_to_max,
+                        MIN_CALORIE_REMAINING,
+                        ready_to_stop_counter
+                    );
+                }else{
+                    route(env, context, stats, to_zoom_to_max);
+                }
+                to_zoom_to_max = false;
+                num_resets++;
+                stats.resets++;
+                env.update_stats();
+                if (stats.resets.load(std::memory_order_relaxed) % 10 == 0){
+                    send_program_status_notification(env, NOTIFICATION_STATUS);
+                }
+
+                if (should_stop){
+                    break;
+                }
+                if (ROUTE == Route::HYPERSPACE_WILD_ZONE && NUM_RESETS > 0 && num_resets >= NUM_RESETS){
+                    env.log(std::format("Reached reset limit {}", static_cast<uint64_t>(NUM_RESETS)));
+                    break;
+                }
+
+            } // end while
+        },
+        {{shiny_detector}}
+    );
+
+    //  Shiny sound detected and user requested stopping the program when
+    //  detected shiny sound.
+    shiny_sound_handler.process_pending(context);
+
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+
+    if (ROUTE == Route::HYPERSPACE_WILD_ZONE){
+        go_home(env.console, context);
+    }
+}
+
+
+}  // namespace PokemonLZA
+}  // namespace NintendoSwitch
+}  // namespace PokemonAutomation
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_FlySpotReset.h b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_FlySpotReset.h
new file mode 100644
index 0000000000..03bd635fe6
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_FlySpotReset.h
@@ -0,0 +1,67 @@
+/*  Shiny Hunt - Fly Spot Reset
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  Repeatedly fast travel to the same location to shiny hunt surrounding pokemon.
+ *  This is mostly for a single spawner: alpha Swirlix near Nouveau Cafe (Truck No. 3).
+ */
+
+#ifndef PokemonAutomation_PokemonLZA_ShinyHunt_FlySpotReset_H
+#define PokemonAutomation_PokemonLZA_ShinyHunt_FlySpotReset_H
+
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "VideoGames/PokemonLA/Options/PokemonLA_ShinyDetectedAction.h"
+#include "VideoGames/PokemonLZA/Options/PokemonLZA_ShinyDetectedAction.h"
+
+namespace PokemonAutomation {
+namespace NintendoSwitch {
+namespace PokemonLZA {
+
+
+class ShinyHunt_FlySpotReset_Descriptor : public SingleSwitchProgramDescriptor {
+public:
+    ShinyHunt_FlySpotReset_Descriptor();
+
+    class Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+
+class ShinyHunt_FlySpotReset : public SingleSwitchProgramInstance, public ConfigOption::Listener{
+public:
+    using Descriptor = ShinyHunt_FlySpotReset_Descriptor;
+    ShinyHunt_FlySpotReset();
+
+    virtual ~ShinyHunt_FlySpotReset();
+
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+    enum class Route{
+        NO_MOVEMENT,
+        HYPERSPACE_WILD_ZONE,
+        WILD_ZONE_19,
+        ALPHA_PIDGEY,
+        ALPHA_PIKACHU,
+        CUSTOMISED_MACRO = 255,
+    };
+
+private:
+    void on_config_value_changed(void* object) override;
+
+    PokemonLA::ShinyRequiresAudioText SHINY_REQUIRES_AUDIO;
+    ShinySoundDetectedActionOption SHINY_DETECTED;
+    EnumDropdownOption<Route> ROUTE;
+    SimpleIntegerOption<uint64_t> NUM_RESETS;
+    SimpleIntegerOption<uint16_t> MIN_CALORIE_REMAINING;
+
+    EventNotificationOption NOTIFICATION_STATUS;
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+
+}  // namespace PokemonLZA
+}  // namespace NintendoSwitch
+}  // namespace PokemonAutomation
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_HelioptileHunter.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_HelioptileHunter.cpp
new file mode 100644
index 0000000000..c5d78dcc20
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_HelioptileHunter.cpp
@@ -0,0 +1,384 @@
+/*  Shiny Hunt - Helioptile Hunter
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <array>
+#include <cstddef>
+#include <string>
+#include "Common/Cpp/Options/ConfigOption.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonFramework/ImageTools/ImageStats.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "CommonTools/StartupChecks/VideoResolutionCheck.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "NintendoSwitch/Controllers/NintendoSwitch_ControllerButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonLZA/Inference/PokemonLZA_ButtonDetector.h"
+#include "VideoGames/PokemonLZA/Inference/PokemonLZA_DayNightStateDetector.h"
+#include "VideoGames/PokemonLZA/Inference/PokemonLZA_WeatherDetector.h"
+#include "VideoGames/PokemonLZA/Programs/PokemonLZA_BasicNavigation.h"
+#include "VideoGames/PokemonLZA/Programs/PokemonLZA_FastTravelNavigation.h"
+#include "PokemonLZA_ShinyHunt_HelioptileHunter.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+using namespace Pokemon;
+
+
+
+
+
+ShinyHunt_HelioptileHunter_Descriptor::ShinyHunt_HelioptileHunter_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonLZA:ShinyHunt-HelioptileHunter",
+        STRING_POKEMON + " LZA", "Helioptile Hunter",
+        "Programs/PokemonLZA/ShinyHunt-HelioptileHunter.html",
+        "Hunts for Helioptile in Wild Zone by entering and resetting, checking for the right weather.",
+        PanelQualityStanding::OFFICIAL_BETA,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+class ShinyHunt_HelioptileHunter_Descriptor::Stats : public StatsTracker{
+public:
+    Stats()
+        : cycles(m_stats["Cycles"])
+        , loops(m_stats["Loops"])
+        , errors(m_stats["Errors"])
+    {
+        m_display_order.emplace_back("Cycles");
+        m_display_order.emplace_back("Loops");
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+    }
+
+    std::atomic<uint64_t>& cycles;
+    std::atomic<uint64_t>& loops;
+    std::atomic<uint64_t>& errors;
+};
+
+std::unique_ptr<StatsTracker> ShinyHunt_HelioptileHunter_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+ShinyHunt_HelioptileHunter::ShinyHunt_HelioptileHunter()
+    : END_AFTER_CYCLE(
+        "<b>How many day/night cycles before stopping. 0 for never stop.</b><br>"
+        "<br>"
+        "Each day/night cycle is roughly 65 tries.",
+        LockMode::LOCK_WHILE_RUNNING,
+        0, 0
+    )
+    , NOTIFICATION_STATUS("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_STATUS,
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_RECOVERABLE,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+{
+    PA_ADD_OPTION(END_AFTER_CYCLE);
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+void bench_loop(SingleSwitchProgramEnvironment& env, ProControllerContext& context, size_t quantity){
+    for (size_t i = 0; i < quantity; i++){
+        sit_on_bench(env.console, context);
+        pbf_move_left_joystick(context, {0, -1}, 500ms, 200ms);
+    }
+}
+
+struct WeatherTimeState{
+    bool correct_weather;
+    bool daytime;
+};
+
+WeatherTimeState get_weather_time_state(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    bool close_map
+){
+    open_map(env.console, context, false, true);
+    context.wait_for_all_requests();
+
+    // zoom fully in
+    pbf_move_right_joystick(context, {0, 1}, 900ms, 120ms);
+    context.wait_for_all_requests();
+    // hide icons
+    pbf_press_button(context, BUTTON_MINUS, 80ms, 120ms);
+    context.wait_for_all_requests();
+
+    VideoSnapshot screen = env.console.video().snapshot();
+    // Log every weather type so uploaded user logs distinguish unsuitable
+    // weather from missed or ambiguous detections. These small-region checks
+    // run between controller sequences; retain them for support troubleshooting.
+    // Keep the Sunny-or-Clear acceptance rule, including multiple matches.
+    const std::array<WeatherIconType, 6> types = {
+        WeatherIconType::Sunny, WeatherIconType::Clear, WeatherIconType::Rain,
+        WeatherIconType::Cloudy, WeatherIconType::Foggy, WeatherIconType::Rainbow,
+    };
+    const std::array<const char*, 6> names = {
+        "Sunny", "Clear", "Rain", "Cloudy", "Foggy", "Rainbow",
+    };
+    std::array<bool, 6> matches{};
+    std::string detected;
+    std::string detection_map;
+    size_t match_count = 0;
+    for (size_t i = 0; i < types.size(); i++){
+        WeatherIconDetector detector(types[i], &env.console.overlay());
+        matches[i] = detector.detect(screen);
+        if (i > 0){
+            detection_map += ",";
+        }
+        detection_map += std::string(names[i]) + "=" + (matches[i] ? "1" : "0");
+        if (matches[i]){
+            if (match_count++ > 0){
+                detected += ",";
+            }
+            detected += names[i];
+        }
+    }
+    if (match_count == 0){
+        detected = "Unknown";
+    }
+
+    DayNightStateDetector dayNightDetector(&env.console.overlay());
+    dayNightDetector.detect(screen);
+    bool daytime = dayNightDetector.state() != DayNightState::NIGHT;
+    bool correct_weather = matches[0] || matches[1];
+
+    // Mirror the detector's terrain sample so the day/night threshold can be
+    // checked against capture brightness without changing the detector itself.
+    const ImageStats terrain = image_stats(
+        extract_box_reference(screen, ImageFloatBox(0.30, 0.55, 0.15, 0.18))
+    );
+    const double blue_ratio = terrain.average.b /
+        (terrain.average.r + terrain.average.g + terrain.average.b);
+    auto& stats = env.current_stats<ShinyHunt_HelioptileHunter_Descriptor::Stats>();
+    env.log("[Helioptile][Weather] cycle=" + std::to_string(stats.cycles.load() + 1)
+        + " completed_loops=" + std::to_string(stats.loops.load())
+        + " phase=" + (close_map ? "bench" : "hunt")
+        + " detected=" + detected
+        + " ambiguous=" + (match_count > 1 ? "1" : "0")
+        + " matches={" + detection_map + "}"
+        + " time=" + (daytime ? "Day" : "Night")
+        + " blue_ratio=" + std::to_string(blue_ratio)
+        + " night_threshold=0.36"
+        + " eligible=" + (correct_weather && daytime ? "1" : "0")
+        + " frame=" + std::to_string(screen->width()) + "x" + std::to_string(screen->height())
+    );
+
+    if (close_map){
+        context.wait_for_all_requests();
+        pbf_press_button(context, BUTTON_PLUS, 500ms, 500ms);
+        context.wait_for_all_requests();
+    }
+
+    return {correct_weather, daytime};
+}
+
+void find_weather(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    WeatherTimeState state = get_weather_time_state(env, context, true);
+    context.wait_for_all_requests();
+    env.log("[Helioptile][Decision] action=initial_bench_reroll sits="
+        + std::to_string(state.daytime ? 2 : 1));
+    bench_loop(env, context, (state.daytime) ? 2 : 1);
+
+    size_t weather_attempt = 0;
+    while (true){
+        env.log("[Helioptile][Bench] attempt=" + std::to_string(++weather_attempt));
+        state = get_weather_time_state(env, context, true);
+        if (state.correct_weather && state.daytime){
+            break;
+        }
+        env.log("[Helioptile][Decision] action=bench_reroll sits=2 reason="
+            + std::string(!state.correct_weather ? "weather" : "night"));
+        bench_loop(env, context, 2);
+    }
+    env.log("[Helioptile][Decision] action=weather_found destination=WildZone14");
+    context.wait_for_all_requests();
+}
+
+void reach_bench(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    //Go to poke center
+    FastTravelState result = open_map_and_fly_to(
+        env.console, context, Language::English,
+        Location::MAGENTA_POKEMON_CENTER, false, true
+    );
+
+    if (result != FastTravelState::SUCCESS){
+        env.log(
+            "Fast travel to Magenta failed. State = "
+            + std::to_string((int)result)
+        );
+
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "Failed to fast travel to Magenta Pokemon Center.",
+            env.console
+        );
+    }
+    context.wait_for_all_requests();
+    //Go to bench
+    pbf_move_left_joystick(context, {-1, 0},  700ms, 200ms);
+    pbf_move_left_joystick(context, {0, +1}, 500ms, 200ms);
+}
+
+void reach_gate(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context
+){
+    ButtonWatcher buttonA(COLOR_RED, ButtonType::ButtonA, {0.3, 0.2, 0.4, 0.7}, &env.console.overlay());
+    run_until<ProControllerContext>(
+        env.console, context,
+        [](ProControllerContext& context){
+            for (int c = 0; c < 30; c++){
+                ssf_press_button(context, BUTTON_B, 0ms, 2s, 0ms);
+                pbf_move_left_joystick(context, {0, +1}, 2s, 200ms);
+            }
+        },
+        {{buttonA}}
+    );
+    env.log("Detected button A. At Wild Zone gate.");
+    env.console.overlay().add_log("Detect Entrance");
+}
+
+void warp_wild_zone_14(SingleSwitchProgramEnvironment& env, ProControllerContext& context
+){
+    FastTravelState result = open_map_and_fly_to(
+        env.console, context, Language::English,
+        Location::WILD_ZONE_14, false, true
+    );
+
+    if (result != FastTravelState::SUCCESS){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "Failed to fast travel to Wild Zone 14.",
+            env.console
+        );
+    }
+}
+
+void execute_fixed_routine(SingleSwitchProgramEnvironment& env, ConsoleHandle& console, ProControllerContext& context, EventNotificationOption& settings){
+    context.wait_for_all_requests();
+    console.overlay().add_log("Starting routine");
+
+    reach_gate(env, context);
+    context.wait_for_all_requests();
+    pbf_press_button(context, BUTTON_A, 500ms, 1500ms);
+
+    //moving forward
+    ssf_press_button(context, BUTTON_B, 0ms, 2000ms, 0ms);
+    pbf_move_left_joystick(context, {0, +1}, 2000ms, 700ms);
+    context.wait_for_all_requests();
+    send_program_status_notification(env, settings, "", env.console.video().snapshot());
+    ssf_press_button(context, BUTTON_B, 0ms, 2500ms, 0ms);
+    pbf_move_left_joystick(context, {0, +1}, 2500ms, 500ms);
+
+    //moving back
+    ssf_press_button(context, BUTTON_B, 0ms, 5s, 0ms);
+    pbf_move_left_joystick(context, {0, -1}, 5s, 500ms);
+
+    //leave WZ
+    pbf_press_button(context, BUTTON_A, 500ms, 1500ms);
+    context.wait_for_all_requests();
+}
+
+void ShinyHunt_HelioptileHunter::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    assert_16_9_720p_min(env.logger(), env.console);
+
+    //  Connect the controller.
+    require_player(env.console, context, BUTTON_L);
+
+    ShinyHunt_HelioptileHunter_Descriptor::Stats& stats = env.current_stats<ShinyHunt_HelioptileHunter_Descriptor::Stats>();
+
+    while(true){
+
+        if (END_AFTER_CYCLE.current_value() > 0 &&
+            END_AFTER_CYCLE.current_value() == stats.cycles.load(std::memory_order_relaxed)
+        ){
+            go_home(env.console, context);
+            send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+            break;
+        }
+
+        int hunt_loops = 0;
+        std::string cycle_end_reason = "loop_limit";
+        while (hunt_loops < 65){
+            // Begin each cycle by re-rolling weather at the bench. A cycle ends
+            // after 65 completed hunt loops or when the weather/time check fails.
+            if (hunt_loops == 0){
+                env.log("[Helioptile][Decision] action=reach_bench reason=cycle_start");
+                reach_bench(env, context);
+                find_weather(env, context);
+                warp_wild_zone_14(env, context);
+                hunt_loops = 0;
+            }else{
+                WeatherTimeState state = get_weather_time_state(env, context, false);
+                if (state.correct_weather && state.daytime){
+                    env.log("[Helioptile][Decision] action=continue_hunt");
+                    // Zoom fully out before moving map cursor for fast travel.
+                    pbf_move_right_joystick(context, {0, -1}, 900ms, 120ms);
+                    // Re-show icons before moving the map cursor to the destination.
+                    pbf_press_button(context, BUTTON_MINUS, 80ms, 120ms);
+                    //these extra waits help prevent early execution of the map move which sometimes fired early during testing
+                    context.wait_for_all_requests();
+                    pbf_wait(context, 100ms);
+                    move_map_cursor_from_entrance_to_zone(env.console, context, Location::WILD_ZONE_14);
+                    FastTravelState result = fly_from_map(env.console, context);
+
+                    switch (result){
+                    case FastTravelState::SUCCESS:
+                        wait_until_overworld(env.console, context);
+                        break;
+
+                    default:
+                        OperationFailedExceptionWithScreenshot::fire(
+                            ErrorReportMode::SEND_ERROR_REPORT,
+                            "Failed to fast travel back to Wild Zone 14 after weather check.",
+                            env.console
+                        );
+                    }
+                }else{
+                    cycle_end_reason = !state.correct_weather ? "weather" : "night";
+                    env.log("[Helioptile][Decision] action=end_cycle reason=" + cycle_end_reason);
+                    pbf_press_button(context, BUTTON_PLUS, 500ms, 500ms);
+                    context.wait_for_all_requests();
+                    break;
+                }
+            }
+
+            env.log(
+                "[Helioptile][Loop] cycle=" + std::to_string(stats.cycles.load(std::memory_order_relaxed) + 1)
+                + " cycle_loop=" + std::to_string(hunt_loops + 1)
+                + " total_loop=" + std::to_string(stats.loops.load() + 1)
+            );
+            execute_fixed_routine(env,env.console, context, NOTIFICATION_STATUS);
+
+            stats.loops++;
+            hunt_loops++;
+            env.update_stats();
+        }
+        env.log(
+            "[Helioptile][Decision] action=cycle_complete cycle="
+            + std::to_string(stats.cycles.load(std::memory_order_relaxed) + 1)
+            + " completed_loops=" + std::to_string(hunt_loops)
+            + " reason=" + cycle_end_reason
+        );
+        stats.cycles++;
+        env.update_stats();
+    }
+}
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_HelioptileHunter.h b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_HelioptileHunter.h
new file mode 100644
index 0000000000..94eb3bf331
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_HelioptileHunter.h
@@ -0,0 +1,48 @@
+/*  Shiny Hunt - Helioptile Hunter
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLZA_ShinyHunt_HelioptileHunter_H
+#define PokemonAutomation_PokemonLZA_ShinyHunt_HelioptileHunter_H
+
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "VideoGames/PokemonLA/Options/PokemonLA_ShinyDetectedAction.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+
+
+
+class ShinyHunt_HelioptileHunter_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    ShinyHunt_HelioptileHunter_Descriptor();
+
+    class Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+
+class ShinyHunt_HelioptileHunter : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = ShinyHunt_HelioptileHunter_Descriptor;
+    ShinyHunt_HelioptileHunter();
+
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    SimpleIntegerOption<uint32_t> END_AFTER_CYCLE;
+    EventNotificationOption NOTIFICATION_STATUS;
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_HyperspaceHunter.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_HyperspaceHunter.cpp
new file mode 100644
index 0000000000..1e9cdbb0c9
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_HyperspaceHunter.cpp
@@ -0,0 +1,374 @@
+/*  Shiny Hunt - Hyperspace Hunter
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/VideoPipeline/VideoOverlay.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "CommonTools/StartupChecks/VideoResolutionCheck.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonLA/Inference/Sounds/PokemonLA_ShinySoundDetector.h"
+#include "VideoGames/PokemonLZA/Inference/PokemonLZA_HyperspaceCalorieDetector.h"
+#include "VideoGames/PokemonLZA/Programs/PokemonLZA_BasicNavigation.h"
+#include "VideoGames/PokemonLZA/Programs/PokemonLZA_GameEntry.h"
+#include "VideoGames/PokemonLZA/Programs/PokemonLZA_HyperspaceNavigation.h"
+#include "PokemonLZA_ShinyHunt_HyperspaceHunter.h"
+
+namespace PokemonAutomation {
+namespace NintendoSwitch {
+namespace PokemonLZA {
+
+using namespace Pokemon;
+
+
+ShinyHunt_HyperspaceHunter_Descriptor::ShinyHunt_HyperspaceHunter_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonLZA:ShinyHunt-HyperspaceHunter", STRING_POKEMON + " LZA",
+        "Hyperspace Hunter",
+        "Programs/PokemonLZA/ShinyHunt-HyperspaceHunter.html",
+        "Shiny hunt in Hyperspace Wild Zone using fly spot reset or shuttle run methods.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions, FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+class ShinyHunt_HyperspaceHunter_Descriptor::Stats : public StatsTracker{
+public:
+    Stats()
+        : resets(m_stats["Resets"])
+        , shinies(m_stats["Shiny Sounds"])
+        , errors(m_stats["Errors"])
+    {
+        m_display_order.emplace_back("Resets");
+        m_display_order.emplace_back("Shiny Sounds");
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+    }
+
+    std::atomic<uint64_t>& resets;
+    std::atomic<uint64_t>& shinies;
+    std::atomic<uint64_t>& errors;
+};
+
+std::unique_ptr<StatsTracker> ShinyHunt_HyperspaceHunter_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+
+ShinyHunt_HyperspaceHunter::ShinyHunt_HyperspaceHunter()
+    : SHINY_DETECTED("Shiny Detected", "", "2000 ms", ShinySoundDetectedAction::NOTIFY_ON_FIRST_ONLY)
+    , HUNT_METHOD("<b>Hunt Method:</b>",
+        {
+            {HuntMethod::FLY_SPOT_RESET, "fly_spot_reset", "Fly Spot Reset"},
+            {HuntMethod::SHUTTLE_RUN, "shuttle_run", "Shuttle Run"},
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        HuntMethod::FLY_SPOT_RESET
+    )
+    , NUM_RESETS(
+        "<b>Max Hyperspace Resets:</b><br>Max number of resets when in Hyperspace. Set to zero to have no max reset limit. "
+        "Make sure to leave enough time to catch found shinies."
+        "<br>Cal. per sec: 1 Star: 1 Cal./s, 2 Star: 1.6 Cal./s, 3 Star: 3.5 Cal./s, 4 Star: 7.5 Cal./s, 5 Star: 10 Cal./s. "
+        "Each reset takes between 0.6-1.0 sec of the timer.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        100, 0 // default, min
+    )
+    , MIN_CALORIE_REMAINING(
+        "<b>Minimum Cal. allowed While Resetting in Hyperspace:</b><br>The program will stop if the Calorie number is at or below this value."
+        "<br>NOTE: the more star the hyperspace has the faster Calorie burns! Pick a minimum Calorie value that gives you enough time to catch shinies."
+        "<br>Cal. per sec: 1 Star: 1 Cal./s, 2 Star: 1.6 Cal./s, 3 Star: 3.5 Cal./s, 4 Star: 7.5 Cal./s, 5 Star: 10 Cal./s. "
+        "Each reset takes between 0.6-1.0 sec of the timer."
+        "<br>Use a donut with AT LEAST ONE flavor power for the program to read Calorie number correctly.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        120, 0, 9999 // default, min, max
+    )
+    // , PER_SPAWN_TABLE(
+    //     "Custom Per Spawn Reset Command Table:",
+    //     {
+    //         ControllerClass::NintendoSwitch_ProController,
+    //         ControllerClass::NintendoSwitch_LeftJoycon,
+    //         ControllerClass::NintendoSwitch_RightJoycon,
+    //     }
+    // )
+    // , PER_CHECK_TABLE(
+    //     "Per Shiny Check Command Table:",
+    //     {
+    //         ControllerClass::NintendoSwitch_ProController,
+    //         ControllerClass::NintendoSwitch_LeftJoycon,
+    //         ControllerClass::NintendoSwitch_RightJoycon,
+    //     }
+    // )
+    , FORWARD_RUN_TIME(
+        "<b>Forward Run Time (Shuttle Run):</b><br>Duration to run forward in milliseconds.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        "5000 ms"
+    )
+    , BACKWARD_RUN_TIME(
+        "<b>Backward Run Time (Shuttle Run):</b><br>Duration to run backward in milliseconds.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        "5500 ms"
+    )
+    , FORWARD_RUN_ROLL_TIME(
+        "<b>Forward Run Roll Start (Shuttle Run):</b><br>Do a roll during forward running to cross a rooftop slope without losing speed. Set to 0 if no slope.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        "0 ms"
+    )
+    , BACKWARD_RUN_ROLL_TIME(
+        "<b>Backward Run Roll Start (Shuttle Run):</b><br>Do a roll during backward running to cross a rooftop slope without losing speed. Set to 0 if no slope.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        "0 ms"
+    )
+    , SHINY_CHECK_RUN_TIME(
+        "<b>Shiny Check Run Time (Shuttle Run):</b><br>After reaching reset limit (by Max Reset or Calorie Limit), "
+        "run this long forward to listen for shiny sound.<br>If not detected, reset the game to do shuttle run again. Set to 0 to disable.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        "5000 ms"
+    )
+    , NOTIFICATION_STATUS("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_STATUS,
+        &SHINY_DETECTED.NOTIFICATIONS,
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_RECOVERABLE,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+{
+    PA_ADD_STATIC(SHINY_REQUIRES_AUDIO);
+    PA_ADD_OPTION(SHINY_DETECTED);
+    PA_ADD_OPTION(HUNT_METHOD);
+    PA_ADD_OPTION(NUM_RESETS);
+    PA_ADD_OPTION(MIN_CALORIE_REMAINING);
+    PA_ADD_OPTION(FORWARD_RUN_TIME);
+    PA_ADD_OPTION(BACKWARD_RUN_TIME);
+    PA_ADD_OPTION(FORWARD_RUN_ROLL_TIME);
+    PA_ADD_OPTION(BACKWARD_RUN_ROLL_TIME);
+    PA_ADD_OPTION(SHINY_CHECK_RUN_TIME);
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+// Fly Spot Reset method - same as hyperspace_wild_zone route in FlySpotReset
+void ShinyHunt_HyperspaceHunter::use_fly_spot_reset(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context)
+{
+    ShinyHunt_HyperspaceHunter_Descriptor::Stats& stats = env.current_stats<ShinyHunt_HyperspaceHunter_Descriptor::Stats>();
+
+    ShinySoundHandler shiny_sound_handler(SHINY_DETECTED);
+    PokemonLA::ShinySoundDetector shiny_detector(env.console, [&](float error_coefficient) -> bool {
+        //  Warning: This callback will be run from a different thread than this function.
+        stats.shinies++;
+        env.update_stats();
+        env.console.overlay().add_log("Shiny Sound Detected!", COLOR_YELLOW);
+
+        return shiny_sound_handler.on_shiny_sound(
+            env, env.console,
+            stats.shinies,
+            error_coefficient
+        );
+    });
+
+    run_until<ProControllerContext>(
+        env.console, context,
+        [&](ProControllerContext& context){
+            
+            // Fly reset loop
+            while (true){
+                const bool zoom_to_max = false;
+                const bool require_icons = false;
+                if (!open_map(env.console, context, zoom_to_max, require_icons)){
+                    stats.errors++;
+                    env.update_stats();
+                    OperationFailedExceptionWithScreenshot::fire(
+                        ErrorReportMode::SEND_ERROR_REPORT,
+                        "use_fly_spot_reset(): Cannot fast travel after being chased by wild pokemon.",
+                        env.console
+                    );
+                }
+
+                // Fly from map to reset spawns
+                std::shared_ptr<const ImageRGB32> overworld_screen;
+                FastTravelState travel_status = fly_from_map(env.console, context, &overworld_screen);
+                if (travel_status != FastTravelState::SUCCESS){
+                    stats.errors++;
+                    env.update_stats();
+                    OperationFailedExceptionWithScreenshot::fire(
+                        ErrorReportMode::SEND_ERROR_REPORT,
+                        "use_fly_spot_reset(): Cannot fast travel after moving map cursor.",
+                        env.console
+                    );
+                }
+                if (overworld_screen == nullptr){
+                    throw InternalProgramError(&env.logger(), PA_CURRENT_FUNCTION, "overworld_screen is nullptr but FastTravelState is successful.");
+                }
+
+                HyperspaceCalorieDetector hyperspace_calorie_detector(env.logger());
+                if (!hyperspace_calorie_detector.detect(*overworld_screen)){
+                    stats.errors++;
+                    env.update_stats();
+                    OperationFailedExceptionWithScreenshot::fire(
+                        ErrorReportMode::SEND_ERROR_REPORT,
+                        "use_fly_spot_reset(): Cannot read Calorie number on screen.",
+                        env.console
+                    );
+                }
+
+                const uint16_t calorie_number = hyperspace_calorie_detector.calorie_number();
+                const uint16_t min_calorie = MIN_CALORIE_REMAINING;
+                const std::string log_msg = std::format("Calorie: {}/{}", calorie_number, min_calorie);
+                env.log_to_ui(log_msg);
+                env.log(log_msg);
+
+                stats.resets++;
+                env.update_stats();
+                if (stats.resets % 10 == 0){
+                    send_program_status_notification(env, NOTIFICATION_STATUS);
+                }
+
+                shiny_sound_handler.process_pending(context);
+
+                if (calorie_number <= min_calorie){
+                    env.log("min calorie reached");
+                    env.log_to_ui("Min Calorie Reached");
+                    break;
+                }
+                if (NUM_RESETS > 0 && stats.resets >= NUM_RESETS){
+                    env.log(std::format("Reached reset limit {}", static_cast<uint64_t>(NUM_RESETS)));
+                    break;
+                }
+            } // end fly reset loop
+        },
+        {{shiny_detector}}
+    );
+
+    shiny_sound_handler.process_pending(context);
+}
+
+
+// Shuttle Run method - 
+void ShinyHunt_HyperspaceHunter::use_shuttle_run(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context)
+{
+
+    ShinyHunt_HyperspaceHunter_Descriptor::Stats& stats = env.current_stats<ShinyHunt_HyperspaceHunter_Descriptor::Stats>();
+
+    // game reset loop
+    while(true){
+        size_t num_resets = 0;
+        ShinySoundHandler shiny_sound_handler(SHINY_DETECTED);
+        PokemonLA::ShinySoundDetector shiny_detector(env.console, [&](float error_coefficient) -> bool {
+            //  Warning: This callback will be run from a different thread than this function.
+            stats.shinies++;
+            env.update_stats();
+            env.console.overlay().add_log("Shiny Sound Detected!", COLOR_YELLOW);
+
+            return shiny_sound_handler.on_shiny_sound(
+                env, env.console,
+                stats.shinies,
+                error_coefficient
+            );
+        });
+
+        int ret = run_until<ProControllerContext>(
+            env.console, context,
+            [&](ProControllerContext& context){
+                // Shuttle run loop
+                while(true){
+                    ssf_press_button(context, BUTTON_B, 0ms, 500ms, 0ms);
+                    if (FORWARD_RUN_ROLL_TIME.get() == Milliseconds(0)){
+                        pbf_move_left_joystick(context, {0, +1}, FORWARD_RUN_TIME, 0ms);
+                    }else{
+                        pbf_controller_state(context, BUTTON_NONE, DPAD_NONE, {0, +1}, {0, 0}, FORWARD_RUN_ROLL_TIME);
+                        pbf_controller_state(context, BUTTON_Y, DPAD_NONE, {0, +1}, {0, 0}, FORWARD_RUN_TIME.get() - FORWARD_RUN_ROLL_TIME.get());
+                    }
+                    if (BACKWARD_RUN_ROLL_TIME.get() == Milliseconds(0)){
+                        pbf_move_left_joystick(context, {0, -1}, BACKWARD_RUN_TIME, 0ms);
+                    }else{
+                        pbf_controller_state(context, BUTTON_NONE, DPAD_NONE, {0, -1}, {0, 0}, BACKWARD_RUN_ROLL_TIME);
+                        pbf_controller_state(context, BUTTON_Y, DPAD_NONE, {0, -1}, {0, 0}, BACKWARD_RUN_TIME.get() - BACKWARD_RUN_ROLL_TIME.get());
+                    }
+                    pbf_wait(context, 200ms);
+                    context.wait_for_all_requests();
+
+                    num_resets++;
+                    stats.resets++;
+                    env.update_stats();
+                    if (num_resets % 10 == 0){
+                        send_program_status_notification(env, NOTIFICATION_STATUS);
+                    }
+                    if (check_calorie(env.console, context, MIN_CALORIE_REMAINING)){
+                        break;
+                    }
+                    if(NUM_RESETS > 0 && num_resets >= NUM_RESETS){
+                        env.log(std::format("Reached reset limit {}", static_cast<uint64_t>(NUM_RESETS)));
+                        break;
+                    }
+                } // end shuttle run
+
+                // Run forward to check shiny
+                if (SHINY_CHECK_RUN_TIME.get() > Milliseconds(0)){
+                    ssf_press_button(context, BUTTON_B, 0ms, 500ms, 0ms);
+                    if (FORWARD_RUN_ROLL_TIME.get() == Milliseconds(0)){
+                        pbf_move_left_joystick(context, {0, +1}, FORWARD_RUN_TIME.get() + SHINY_CHECK_RUN_TIME.get(), 0ms);
+                    }else{
+                        pbf_controller_state(context, BUTTON_NONE, DPAD_NONE, {0, +1}, {0, 0}, FORWARD_RUN_ROLL_TIME);
+                        const auto hold_time = FORWARD_RUN_TIME.get() + SHINY_CHECK_RUN_TIME.get() - FORWARD_RUN_ROLL_TIME.get();
+                        pbf_controller_state(context, BUTTON_Y, DPAD_NONE, {0, +1}, {0, 0}, hold_time);
+                    }
+                    // wait some time to listen to shiny sound
+                    pbf_wait(context, 2000ms);
+                    context.wait_for_all_requests();
+                }
+            },
+            {{shiny_detector}}
+        );
+
+        shiny_sound_handler.process_pending(context);
+        if (ret == 0){
+            // there is shiny sound and user requested to stop program when shiny sound:
+            return;
+        }
+        
+        // Reset game
+        go_home(env.console, context);
+        reset_game_from_home(env, env.console, context);
+    } // end game reset loop
+}
+
+
+void ShinyHunt_HyperspaceHunter::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    if (HUNT_METHOD == HuntMethod::SHUTTLE_RUN){
+        if (FORWARD_RUN_ROLL_TIME.get() > Milliseconds(0) && FORWARD_RUN_ROLL_TIME.get() > FORWARD_RUN_TIME.get()){
+            throw UserSetupError(env.console, "Forward Run Roll Start time must not be greater than Forward Run time.");
+        }
+        if (BACKWARD_RUN_ROLL_TIME.get() > Milliseconds(0) && BACKWARD_RUN_ROLL_TIME.get() > BACKWARD_RUN_TIME.get()){
+            throw UserSetupError(env.console, "Backward Run Roll Start time must not be greater than Backward Run time.");
+        }
+    }
+    assert_16_9_720p_min(env.logger(), env.console);
+    HyperspaceCalorieDetector::warm_ocr();
+
+    //  Connect the controller.
+    require_player(env.console, context, BUTTON_B);
+
+    if (HUNT_METHOD == HuntMethod::FLY_SPOT_RESET){
+        use_fly_spot_reset(env, context);
+    }else if (HUNT_METHOD == HuntMethod::SHUTTLE_RUN){
+        use_shuttle_run(env, context);
+    }
+    
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+    go_home(env.console, context);
+}
+
+
+}  // namespace PokemonLZA
+}  // namespace NintendoSwitch
+}  // namespace PokemonAutomation
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_HyperspaceHunter.h b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_HyperspaceHunter.h
new file mode 100644
index 0000000000..6f730501c8
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_HyperspaceHunter.h
@@ -0,0 +1,77 @@
+/*  Shiny Hunt - Hyperspace Hunter
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  Hunt for shinies in Hyperspace Wild Zone using two methods:
+ *  1. Fly Spot Reset - Repeatedly fast travel to reset spawns
+ *  2. Shuttle Run - Run forward and backward with customizable times
+ */
+
+#ifndef PokemonAutomation_PokemonLZA_ShinyHunt_HyperspaceHunter_H
+#define PokemonAutomation_PokemonLZA_ShinyHunt_HyperspaceHunter_H
+
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "Common/Cpp/Options/EnumDropdownOption.h"
+#include "Common/Cpp/Options/TimeDurationOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "VideoGames/PokemonLA/Options/PokemonLA_ShinyDetectedAction.h"
+#include "VideoGames/PokemonLZA/Options/PokemonLZA_ShinyDetectedAction.h"
+
+namespace PokemonAutomation {
+namespace NintendoSwitch {
+namespace PokemonLZA {
+
+
+class ShinyHunt_HyperspaceHunter_Descriptor : public SingleSwitchProgramDescriptor {
+public:
+    ShinyHunt_HyperspaceHunter_Descriptor();
+
+    class Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+
+class ShinyHunt_HyperspaceHunter : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = ShinyHunt_HyperspaceHunter_Descriptor;
+    ShinyHunt_HyperspaceHunter();
+
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+    enum class HuntMethod{
+        FLY_SPOT_RESET,
+        SHUTTLE_RUN,
+    };
+
+private:
+    void use_fly_spot_reset(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+
+    void use_shuttle_run(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+
+    PokemonLA::ShinyRequiresAudioText SHINY_REQUIRES_AUDIO;
+    ShinySoundDetectedActionOption SHINY_DETECTED;
+    EnumDropdownOption<HuntMethod> HUNT_METHOD;
+
+    SimpleIntegerOption<uint64_t> NUM_RESETS;
+    SimpleIntegerOption<uint16_t> MIN_CALORIE_REMAINING;
+
+    // ControllerCommandTables PER_SPAWN_TABLE;
+    // ControllerCommandTables PER_CHECK_TABLE;
+
+    // Shuttle Run only options
+    MillisecondsOption FORWARD_RUN_TIME;
+    MillisecondsOption BACKWARD_RUN_TIME;
+    MillisecondsOption FORWARD_RUN_ROLL_TIME;
+    MillisecondsOption BACKWARD_RUN_ROLL_TIME;
+    MillisecondsOption SHINY_CHECK_RUN_TIME;
+
+    EventNotificationOption NOTIFICATION_STATUS;
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+
+}  // namespace PokemonLZA
+}  // namespace NintendoSwitch
+}  // namespace PokemonAutomation
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_HyperspaceLegendary.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_HyperspaceLegendary.cpp
new file mode 100644
index 0000000000..e87f4f425a
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_HyperspaceLegendary.cpp
@@ -0,0 +1,782 @@
+/*  Shiny Hunt - Hyperspace Legendary
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <format>
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/ImageTools/ImageStats.h"
+#include "CommonFramework/ImageTypes/ImageHSV32.h"
+#include "CommonFramework/ImageTypes/ImageRGB32.h"
+#include "CommonFramework/ImageTypes/ImageViewHSV32.h"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "CommonTools/Images/ImageFilter.h"
+#include "CommonTools/StartupChecks/VideoResolutionCheck.h"
+#include "ML/Inference/ML_YOLOv5Detector.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "NintendoSwitch/Inference/NintendoSwitch_ConsoleTypeDetector.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonLA/Inference/Sounds/PokemonLA_ShinySoundDetector.h"
+#include "VideoGames/PokemonLZA/Inference/PokemonLZA_ButtonDetector.h"
+#include "VideoGames/PokemonLZA/Inference/PokemonLZA_HyperspaceCalorieDetector.h"
+#include "VideoGames/PokemonLZA/Programs/PokemonLZA_BasicNavigation.h"
+#include "VideoGames/PokemonLZA/Programs/PokemonLZA_GameEntry.h"
+#include "VideoGames/PokemonLZA/Programs/PokemonLZA_HyperspaceNavigation.h"
+
+#include "PokemonLZA_ShinyHunt_HyperspaceLegendary.h"
+
+namespace PokemonAutomation {
+namespace NintendoSwitch {
+namespace PokemonLZA {
+
+using namespace Pokemon;
+using ML::YOLOv5Watcher;
+using DetectionBox = ML::YOLOv5Session::DetectionBox;
+
+
+ShinyHunt_HyperspaceLegendary_Descriptor::ShinyHunt_HyperspaceLegendary_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonLZA:ShinyHunt-HyperspaceLegendary", STRING_POKEMON + " LZA",
+        "Hyperspace Legendary",
+        "Programs/PokemonLZA/ShinyHunt-HyperspaceLegendary.html",
+        "Shiny hunt legendary " + STRING_POKEMON + " in Hyperspace.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions, FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+class ShinyHunt_HyperspaceLegendary_Descriptor::Stats : public StatsTracker{
+public:
+    Stats()
+        : spawns(m_stats["Spawns"])
+        , game_resets(m_stats["Game Resets"])
+        , shinies(m_stats["Shiny Sounds"])
+        , errors(m_stats["Errors"])
+    {
+        m_display_order.emplace_back("Spawns");
+        m_display_order.emplace_back("Game Resets");
+        m_display_order.emplace_back("Shiny Sounds");
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+    }
+
+    std::atomic<uint64_t>& spawns;
+    std::atomic<uint64_t>& game_resets;
+    std::atomic<uint64_t>& shinies;
+    std::atomic<uint64_t>& errors;
+};
+
+std::unique_ptr<StatsTracker> ShinyHunt_HyperspaceLegendary_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+
+ShinyHunt_HyperspaceLegendary::ShinyHunt_HyperspaceLegendary()
+    : SHINY_DETECTED("Shiny Detected", "", "2000 ms", ShinySoundDetectedAction::STOP_PROGRAM)
+    , LEGENDARY("<b>Legendary " + STRING_POKEMON + ":</b>",
+        {
+            {Legendary::LATIAS, "latias", "Latias: Shuttle Run"},
+            {Legendary::LATIAS_ALT, "latias-game-reset", "Latias: Game Reset"},
+            {Legendary::LATIOS, "latios", "Latios: Game Reset"},
+            {Legendary::COBALION, "cobalion", "Cobalion: Shuttle Run"},
+            {Legendary::TERRAKION, "terrakion", "Terrakion: Shuttle Run"},
+            {Legendary::VIRIZION,  "virizion",  "Virizion: Shuttle Run"},
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        Legendary::LATIAS
+    )
+    , MIN_CALORIE_TO_CATCH(
+        "<b>Minimum Cal. Reserved to Catch Legendary:</b><br>If applicable, the program will stop refreshing the Legendary spawn to give this amount of Calorie left for catching the Legendary."
+        "<br>NOTE: use 5-star donut for best catch chance and enough time in the Legendary hyperspace."
+        "<br>NOTE: not required for Game Reset programs."
+        "<br>Cal. per sec: 1 Star: 1 Cal./s, 2 Star: 1.6 Cal./s, 3 Star: 3.5 Cal./s, 4 Star: 7.5 Cal./s, 5 Star: 10 Cal./s",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        600, 0, 9999 // default, min, max
+    )
+    , LATIAS_VISUAL_SHINY_THRESHOLD(
+        "<b>Latias Visual Shiny Threshold Value:</b><br>Applies only to the Latias Game Reset program. This value is used to evaluate whether a shiny or regular Latias is detected."
+        "<br>NOTE: Increase this threshold to decrease the sensitivity of the detector (decreasing the false negative rate and true positive rate)."
+        "<br>NOTE: The default value of 18 typically works fine. However, some setups/capture cards may result in occasional false positives. If this issue occurs, try increasing the value in increments of 5.",
+        LockMode::LOCK_WHILE_RUNNING,
+        18, 0, 100 // default, min, max
+    )
+    , NOTIFICATION_STATUS("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_STATUS,
+        &SHINY_DETECTED.NOTIFICATIONS,
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_RECOVERABLE,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+{
+    PA_ADD_STATIC(SHINY_REQUIRES_AUDIO);
+    PA_ADD_OPTION(LEGENDARY);
+    PA_ADD_OPTION(MIN_CALORIE_TO_CATCH);
+    PA_ADD_OPTION(LATIAS_VISUAL_SHINY_THRESHOLD);
+    PA_ADD_OPTION(SHINY_DETECTED);
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+namespace {
+
+// Save on the rooftop, facing the Latias spawning platform, but without having it spawned
+// Note that this program is different from other PLZA legendary programs in that it uses image analysis to identify the shiny.
+// Additionally, respawning is accomplished by resetting the game, so there is no need to track calories.
+bool hunt_latias_alt(SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    ShinyHunt_HyperspaceLegendary_Descriptor::Stats& stats,
+    SimpleIntegerOption<uint16_t>& LATIAS_VISUAL_SHINY_THRESHOLD)
+{
+    stats.spawns++;
+    pbf_press_button(context, BUTTON_Y, 160ms, 2000ms);
+    context.wait_for_all_requests();
+
+    // Capture an image of the screen region that Latias should spawn in and visually assess whether it's shiny.
+    VideoSnapshot full_image = env.console.video().snapshot();
+    ImagePixelBox latias_search_zone = ImagePixelBox(
+        static_cast<size_t>(full_image->width() * 0.4),
+        static_cast<size_t>(full_image->height() * 0.2),
+        static_cast<size_t>(full_image->width() * 0.6),
+        static_cast<size_t>(full_image->height() * 0.4)
+    );
+    ImageViewRGB32 cropped_image = extract_box_reference(full_image, latias_search_zone);
+    ImageHSV32 cropped_hsv_image = ImageHSV32(cropped_image);
+    ImageViewHSV32 cropped_hsv_image_view = ImageViewHSV32(
+        cropped_hsv_image.data(),
+        cropped_hsv_image.bytes_per_row(),
+        cropped_hsv_image.width(),
+        cropped_hsv_image.height()
+    );
+    ImageRGB32 filtered_image_nonshiny = to_blackwhite_hsv32_range(
+        cropped_hsv_image_view, false,
+        0xffe76051, 0xffffffd2
+    );
+    ImageRGB32 filtered_image_shiny = to_blackwhite_hsv32_range(
+        cropped_hsv_image_view, false,
+        0xff0d3d51, 0xff37ffd2
+    );
+    double nonshiny_result = 100 * image_average(filtered_image_nonshiny).r;
+    double shiny_result = 100 * image_average(filtered_image_shiny).r;
+    
+    /*filtered_image_nonshiny.save("filtered_nonshiny.png");
+    filtered_image_shiny.save("filtered_shiny.png");
+    cropped_image.save("cropped.png");
+    env.console.log("Saved images for Latias reset", COLOR_MAGENTA);*/
+    env.console.log(std::format("Score for non-shiny Latias: {} (considered non-shiny if over 18)", nonshiny_result), COLOR_MAGENTA);
+    env.console.log(std::format("Score for shiny Latias: {0} (considered shiny if over {1})", shiny_result, 0+LATIAS_VISUAL_SHINY_THRESHOLD), COLOR_MAGENTA);
+
+    env.update_stats();
+
+    // For now, return true (triggering program stop) if a shiny is detected or a non-shiny is not detected
+    if (nonshiny_result < 18 || shiny_result > LATIAS_VISUAL_SHINY_THRESHOLD){
+        env.console.log("Shiny Latias identified or regular Latias not identified. Stopping program.", COLOR_MAGENTA);
+        return true;
+    }else{
+        env.console.log("Non-shiny Latias identified. Resetting the game.", COLOR_MAGENTA);
+        return false;
+    }
+}
+
+
+// Start at the ladder up to Latias and use it to fix the position and camera angle
+// Run a route to the other side of the roof and begin a shuttle run to respawn Latias repeatedly
+// Route back to the ladder when calories are low
+void hunt_latias_route(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    ShinyHunt_HyperspaceLegendary_Descriptor::Stats& stats,
+    SimpleIntegerOption<uint16_t>& MIN_CALORIE_TO_CATCH)
+{
+    // Start at the ladder and use it to fix the position and camera angle
+    detect_interactable(env.console, context);
+    pbf_press_button(context, BUTTON_A, 160ms, 1200ms);
+    pbf_move_left_joystick(context, {0, -0.5}, 80ms, 1200ms);
+
+    // Roll backwards to align against the edge of the Munna roof
+    pbf_press_button(context, BUTTON_Y, 100ms, 1000ms);
+    pbf_press_button(context, BUTTON_Y, 100ms, 1000ms);
+    pbf_press_button(context, BUTTON_Y, 100ms, 1000ms);
+
+    // Roll left on the overhang to get to the far corner
+    ssf_press_left_joystick(context, {-0.5, 0}, 0ms, 500ms, 0ms);
+    pbf_press_button(context, BUTTON_Y, 100ms, 1000ms);
+    // Slightly longer due to falling off a ledge
+    pbf_press_button(context, BUTTON_Y, 100ms, 1200ms);
+    pbf_press_button(context, BUTTON_Y, 100ms, 1000ms);
+    pbf_press_button(context, BUTTON_Y, 100ms, 1000ms);
+    pbf_press_button(context, BUTTON_Y, 100ms, 1000ms);
+    // Roll to align against the bulkhead
+    pbf_press_button(context, BUTTON_Y, 100ms, 1000ms);
+
+    // Roll down the corridor next to the bulkhead
+    ssf_press_left_joystick(context, {0, -0.5}, 0ms, 500ms, 0ms);
+    pbf_press_button(context, BUTTON_Y, 100ms, 1000ms);
+
+    // Roll towards the corner of the Kirlia rooftop
+    ssf_press_left_joystick(context, {-0.5, 0}, 0ms, 500ms, 0ms);
+    pbf_press_button(context, BUTTON_Y, 100ms, 1000ms);
+    pbf_press_button(context, BUTTON_Y, 100ms, 1000ms);
+
+    // Rolling at this angle puts you at the very edge of the lower corner roof, at the start of the reset path
+    ssf_press_left_joystick(context, {-0.20, +0.5}, 0ms, 500ms, 0ms);
+    pbf_press_button(context, BUTTON_Y, 100ms, 1000ms);
+    // Fall down 2 roof levels
+    pbf_press_button(context, BUTTON_Y, 100ms, 1200ms);
+
+    // Adjust the camera angle to face the direction of the reset path
+    pbf_move_left_joystick(context, {+0.357, +0.5}, 500ms, 500ms);
+    pbf_press_button(context, BUTTON_L, 80ms, 160ms);
+
+    // Climb up from the overhang to the lower corner rooftop
+    pbf_move_left_joystick(context, {0, +1}, 500ms, 1200ms);
+
+    // Start of actual reset cycle
+    while (true){
+        // Roll to the edge of the lower corner rooftop
+        pbf_press_button(context, BUTTON_Y, 100ms, 1000ms);
+
+        // Climb onto the upper rooftop
+        pbf_move_left_joystick(context, {0, +1}, 500ms, 1200ms);
+
+        // Roll forward and align against the far chimney
+        pbf_press_button(context, BUTTON_Y, 100ms, 1000ms);
+        pbf_press_button(context, BUTTON_Y, 100ms, 1000ms);
+        pbf_press_button(context, BUTTON_Y, 100ms, 1000ms);
+        // Latias spawns here
+
+        context.wait_for_all_requests();
+        stats.spawns++;
+        env.update_stats();
+
+        // Roll back to the start on the lower corner rooftop
+        ssf_press_left_joystick(context, {0, -0.5}, 0ms, 500ms, 0ms);
+        pbf_press_button(context, BUTTON_Y, 100ms, 1000ms);
+        pbf_press_button(context, BUTTON_Y, 100ms, 1000ms);
+        pbf_press_button(context, BUTTON_Y, 100ms, 1000ms);
+        pbf_press_button(context, BUTTON_Y, 100ms, 1200ms);
+        // Latias despawns here
+
+        // Turn back around to face the chimney
+        ssf_press_left_joystick(context, {0, +0.5}, 0ms, 500ms, 0ms);
+
+        const uint16_t min_calorie = MIN_CALORIE_TO_CATCH + 55 * 10;
+        if (check_calorie(env.console, context, min_calorie)){
+            break;
+        }
+    }
+
+    // Roll and climb onto the upper rooftop
+    pbf_move_left_joystick(context, {0, +1}, 500ms, 1200ms);
+    pbf_press_button(context, BUTTON_Y, 100ms, 1000ms);
+    pbf_move_left_joystick(context, {0, +1}, 500ms, 1200ms);
+
+    // Roll to the right, next to the Kirlia rooftop
+    ssf_press_left_joystick(context, {+0.5, 0}, 0ms, 500ms, 0ms);
+    pbf_press_button(context, BUTTON_Y, 100ms, 1000ms);
+
+    // Climb onto the Kirlia rooftop
+    pbf_move_left_joystick(context, {0, -1}, 500ms, 1200ms);
+    pbf_press_button(context, BUTTON_Y, 100ms, 1000ms);
+
+    // Roll right towards the bulkhead
+    ssf_press_left_joystick(context, {+0.5, 0}, 0ms, 500ms, 0ms);
+    pbf_press_button(context, BUTTON_Y, 100ms, 1000ms);
+    pbf_press_button(context, BUTTON_Y, 100ms, 1000ms);
+
+    // Adjust the camera angle back to the original angle
+    pbf_move_left_joystick(context, {-0.357, +0.5}, 80ms, 160ms);
+    pbf_press_button(context, BUTTON_L, 80ms, 160ms);
+
+    // Climb onto the next rooftop
+    ssf_press_left_joystick(context, {+0.5, 0}, 0ms, 500ms, 0ms);
+    pbf_press_button(context, BUTTON_Y, 100ms, 1000ms);
+
+    // Roll towards the Munna rooftop
+    pbf_move_left_joystick(context, {+1, 0}, 500ms, 1200ms);
+    pbf_press_button(context, BUTTON_Y, 100ms, 1000ms);
+    pbf_press_button(context, BUTTON_Y, 100ms, 1000ms);
+    pbf_press_button(context, BUTTON_Y, 100ms, 1000ms);
+    pbf_press_button(context, BUTTON_Y, 100ms, 1000ms);
+
+    // Climb onto the Munna rooftop and roll
+    pbf_move_left_joystick(context, {+1, 0}, 500ms, 1200ms);
+    pbf_press_button(context, BUTTON_Y, 100ms, 1000ms);
+
+    // Roll back towards the ladder
+    ssf_press_left_joystick(context, {0, +0.5}, 0ms, 500ms, 0ms);
+    pbf_press_button(context, BUTTON_Y, 100ms, 1000ms);
+    pbf_press_button(context, BUTTON_Y, 100ms, 1000ms);
+    pbf_press_button(context, BUTTON_Y, 100ms, 1000ms);
+
+    context.wait_for_all_requests();
+    // The route back to the ladder also counts as a spawn attempt
+    stats.spawns++;
+    env.update_stats();
+}
+
+// Route back up to Latias to trigger a potential shiny sound
+void hunt_latias_check(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    ShinyHunt_HyperspaceLegendary_Descriptor::Stats& stats)
+{
+    // Snap to the ladder by moving and watching for the A button prompt
+    ButtonWatcher ButtonA(
+        COLOR_RED,
+        ButtonType::ButtonA,
+        {0.4, 0.1, 0.2, 0.8},
+        &env.console.overlay(),
+        Milliseconds(100)
+    );
+    const int ret = run_until<ProControllerContext>(
+        env.console, context,
+        [&](ProControllerContext& context){
+            pbf_move_left_joystick(context, {+0.5, +1}, 5000ms, 0ms);
+        },
+        {{ButtonA}}
+    );
+    if (ret < 0){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "hunt_latias(): Cannot detect ladder after 5 seconds",
+            env.console
+        );
+    }else{
+        env.console.log("Detected ladder.");
+    }
+
+    // Run to Latias to trigger a potential shiny sound
+    env.log("Move to check Latias.");
+    env.log_to_ui("To Check Latias");
+    pbf_press_button(context, BUTTON_A, 160ms, 80ms);
+    ssf_press_left_joystick(context, {0, +1}, 0ms, 4000ms, 0ms);
+    pbf_mash_button(context, BUTTON_Y, 4000ms);
+    context.wait_for_all_requests();
+}
+
+
+// We save at warp pad and spawn Latios only once per game reset
+void hunt_latios(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    ShinyHunt_HyperspaceLegendary_Descriptor::Stats& stats,
+    SimpleIntegerOption<uint16_t>& MIN_CALORIE_TO_CATCH)
+{
+    detect_interactable(env.console, context);
+    // Warp to rooftop to see Latios
+    pbf_press_button(context, BUTTON_A, 160ms, 80ms);
+    context.wait_for_all_requests();
+    detect_interactable(env.console, context);
+
+    stats.spawns++;
+    env.update_stats();
+    // Roll to Latios to trigger potential shiny sound
+
+
+    pbf_press_button(context, BUTTON_Y, 100ms, 900ms);
+    pbf_wait(context, 500ms); // wait for falling down
+    pbf_press_button(context, BUTTON_Y, 100ms, 900ms);
+    pbf_press_button(context, BUTTON_Y, 100ms, 900ms);
+    pbf_wait(context, 500ms);
+    context.wait_for_all_requests();
+}
+
+
+void hunt_cobalion(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    ShinyHunt_HyperspaceLegendary_Descriptor::Stats& stats,
+    SimpleIntegerOption<uint16_t>& MIN_CALORIE_TO_CATCH)
+{
+    while(true){
+        // run to the right to spawn in Cobalion
+        ssf_press_button(context, BUTTON_B, 0ms, 6000ms, 0ms);
+        pbf_move_left_joystick(context, {+1, 0}, 7000ms, 0ms);
+        pbf_wait(context, 100ms);
+        // run to the left to despawn
+        // add 20ms to try to ensure drift never prevents despawning
+        ssf_press_button(context, BUTTON_B, 0ms, 6000ms, 0ms);
+        pbf_move_left_joystick(context, {-1, 0}, 7020ms, 0ms);
+        pbf_wait(context, 100ms);
+
+        context.wait_for_all_requests();
+
+        stats.spawns++;
+        env.update_stats();
+        // Spawn refreshing loop takes 14 sec. Going to check Cobalion takes 13 sec.
+        // 10 for 10 cal per sec
+        const uint16_t min_calorie = MIN_CALORIE_TO_CATCH + (14 + 13) * 10;
+
+        if (check_calorie(env.console, context, min_calorie)){
+            break;
+        }
+    }
+
+    // Run to Cobalion to trigger potential shiny sound
+    env.log("Move to check Cobalion.");
+    env.log_to_ui("To Check Cobalion");
+
+    // run right to line up with Cobalion
+    ssf_press_button(context, BUTTON_B, 0ms, 6000ms, 0ms);
+    pbf_move_left_joystick(context, {+1, 0}, 8200ms, 0ms);
+    context.wait_for_all_requests();
+    stats.spawns++;
+    env.update_stats();
+    // run forward to trigger potential shiny sound
+    pbf_wait(context, 100ms);
+    ssf_press_button(context, BUTTON_B, 0ms, 3000ms, 0ms);
+    pbf_move_left_joystick(context, {0, +1}, 4800ms, 0ms);
+    pbf_wait(context, 500ms);
+
+    context.wait_for_all_requests();
+}
+
+// Use teleport pad to refresh Terrakion spawns until MIN_CALORIE is reached.
+// Then move close to Terrakion so the shiny sound detector (from the caller level)
+// can detect shiny and stop program.
+// This function always returns false to mean it will not require the program to
+// stop, as it relies on the shiny sound detector from the caller level.
+void hunt_terrakion(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    ShinyHunt_HyperspaceLegendary_Descriptor::Stats& stats,
+    SimpleIntegerOption<uint16_t>& MIN_CALORIE_TO_CATCH)
+{
+    while(true){
+        // Warp away from Terrakion to despawn
+        detect_interactable(env.console, context);
+        pbf_press_button(context, BUTTON_A, 160ms, 80ms);
+        context.wait_for_all_requests();
+
+        // Warp towards Terrakion
+        detect_interactable(env.console, context);
+        pbf_press_button(context, BUTTON_A, 160ms, 80ms);
+        context.wait_for_all_requests();
+
+        // Roll and roll back on Terrakion's roof to respawn
+        detect_interactable(env.console, context);
+        pbf_press_button(context, BUTTON_Y, 100ms, 1000ms);
+        pbf_move_left_joystick(context, {0, -1}, 80ms, 160ms);
+        pbf_press_button(context, BUTTON_Y, 100ms, 1000ms);
+
+        context.wait_for_all_requests();
+
+        stats.spawns++;
+        env.update_stats();
+
+        // Spawn refreshing loop takes 3 sec. Going to check Virizion takes 8 sec.
+        // 10 for 10 cal per sec
+        if (check_calorie(env.console, context, MIN_CALORIE_TO_CATCH, (3 + 8) * 10)){
+            break;
+        }
+    }
+
+    // Use warp pads to reset position
+    detect_interactable(env.console, context);
+    pbf_press_button(context, BUTTON_A, 160ms, 80ms);
+    context.wait_for_all_requests();
+
+    detect_interactable(env.console, context);
+    pbf_press_button(context, BUTTON_A, 160ms, 80ms);
+    context.wait_for_all_requests();
+    detect_interactable(env.console, context);
+
+    // Roll to Terrakion to trigger potential shiny sound
+    env.log("Move to check Terrakion.");
+    env.log_to_ui("To Check Terrakion");
+
+    ssf_press_left_joystick(context, {-0.15, +0.5}, 0ms, 500ms, 0ms);
+    pbf_press_button(context, BUTTON_Y, 100ms, 1000ms);
+    pbf_press_button(context, BUTTON_Y, 100ms, 1000ms);
+    stats.spawns++;
+    env.update_stats();
+
+    ssf_press_left_joystick(context, {0, +0.5}, 0ms, 500ms, 0ms);
+    pbf_press_button(context, BUTTON_Y, 100ms, 1000ms);
+    pbf_press_button(context, BUTTON_Y, 100ms, 1000ms);
+
+    ssf_press_left_joystick(context, {+0.45, +0.5}, 0ms, 500ms, 0ms);
+    pbf_press_button(context, BUTTON_Y, 100ms, 1000ms);
+    pbf_press_button(context, BUTTON_Y, 100ms, 1000ms);
+    pbf_press_button(context, BUTTON_Y, 100ms, 1000ms);
+    pbf_press_button(context, BUTTON_Y, 100ms, 1000ms);
+
+    context.wait_for_all_requests();
+}
+
+#if 0
+// TODO: WIP: use OpenCV to traverse the alley to move to check
+// Virizion.
+void hunt_virizion_balcony(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    ShinyHunt_HyperspaceLegendary_Descriptor::Stats& stats,
+    SimpleIntegerOption<uint16_t>& MIN_CALORIE_TO_CATCH)
+{
+
+    std::string model_path = "PokemonLZA/YOLO/Virizion.onnx";
+    YOLOv5Watcher yolo_watcher(env.console.overlay(), model_path);
+
+    const uint16_t min_calorie = MIN_CALORIE_TO_CATCH;
+
+    // running forward
+    const Milliseconds run_duration(4400);
+
+    while(true){
+        // running forward
+        ssf_press_button(context, BUTTON_B, 0ms, 2*run_duration, 0ms);
+        // Add 30 ms to avoid any drift using the balustrade
+        pbf_move_left_joystick(context, {0, +1}, run_duration + 30ms, 0ms);
+        // run back
+        pbf_move_left_joystick(context, {0, -1}, run_duration, 0ms);
+        // Wait for a short time to allow the game to register the next button B press
+        pbf_wait(context, 100ms);
+        context.wait_for_all_requests();
+
+        stats.spawns++;
+        env.update_stats();
+
+        if (check_calorie(env.console, context, min_calorie)){
+            break;
+        }
+    }
+
+    env.log("Move to check Virizion");
+    env.log_to_ui("To Check Virision");
+    // We have done enough shuttle runs to refresh Virizion spawns.
+    // Now run towards it to check shiny!
+
+    // Push left joystick rightward to let the character face right
+    pbf_move_left_joystick(context, {+1, 0}, 100ms, 0ms);
+    // Roll once to leave the balcony area
+    pbf_press_button(context, BUTTON_Y, 100ms, 1s);
+    context.wait_for_all_requests();
+
+    size_t trash_bin_idx = yolo_watcher.label_index("trash-bin");
+
+    run_until<ProControllerContext>(
+        env.console, context,
+        [&](ProControllerContext& context){
+            // Run downstairs towards the trash bin
+            ssf_press_button(context, BUTTON_B, 0ms, Seconds(1), 0ms);
+            pbf_move_left_joystick(context, {0, +1}, Seconds(5), 0ms);
+            context.wait_for_all_requests();
+
+            while(true){
+                const std::vector<DetectionBox>& detections = yolo_watcher.detected_boxes();
+                const DetectionBox* detection = find_detection(detections, trash_bin_idx);
+                if (detection == nullptr){
+                    context.wait_for(100ms);
+                    continue;
+                }
+
+                double center_x = detection->box.x + detection->box.width/2;
+
+                env.log("Found trash bin");
+                env.log_to_ui(std::format("Found Trash Bin at {:.2f}", center_x));
+                if (0.45 <= center_x && center_x <= 0.55){
+                    // We are facing the trash bin, stop
+                    env.log_to_ui("Facing Trash Bin");
+                    break;
+                }
+                double dir_x = (center_x < 0.5 ? -0.5 : 0.5);
+                int duration = static_cast<int>(std::fabs(center_x - 0.5) * 1000);
+                pbf_move_right_joystick(context, {dir_x, 0.0}, Milliseconds(duration), 0ms);
+                context.wait_for_all_requests();
+            }
+        },
+        {{yolo_watcher}}
+    );
+}
+#endif
+
+
+// Use shuttle run on rooftop to refresh Virizion spawns until MIN_CALORIE is reached.
+// Then move close to Virizion so the shiny sound detector (from the caller level)
+// can detect shiny and stop program
+void hunt_virizion_rooftop(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    ShinyHunt_HyperspaceLegendary_Descriptor::Stats& stats,
+    SimpleIntegerOption<uint16_t>& MIN_CALORIE_TO_CATCH,
+    bool& use_switch1_only_timings
+)
+{
+    auto climb_ladder = [&](Milliseconds hold){
+        pbf_move_left_joystick(context, {0.0, 1.0}, hold, 0ms);
+    };
+    auto run_forward = [&](Milliseconds hold){
+        pbf_controller_state(context, BUTTON_B, DPAD_NONE, {0.0, 1.0}, {0.0, 0.0}, hold);
+    };
+    auto run_backward = [&](Milliseconds hold){
+        pbf_controller_state(context, BUTTON_B, DPAD_NONE, {0.0, -1.0}, {0.0, 0.0}, hold);
+    };
+    auto change_character_facing_direction = [&](double left_joystick_x, double left_joystick_y){
+        pbf_move_left_joystick(context, {left_joystick_x, left_joystick_y}, 500ms, 0ms);
+    };
+    auto run_changing_direction = [&](Milliseconds hold, double right_joystick_x){
+        ssf_press_button(context, BUTTON_B, 0ms, hold, 0ms);
+        ssf_press_left_joystick(context, {0, +1}, 0ms, hold, 0ms);
+        ssf_press_right_joystick(context, {right_joystick_x, 0}, 0ms, hold, 0ms);
+        ssf_mash1_button(context, BUTTON_A, hold);
+    };
+    auto rotom_glide = [&](Milliseconds hold){
+        ssf_press_left_joystick(context, {0, +1}, 0ms, hold, 0ms);
+        ssf_mash1_button(context, BUTTON_A, hold);
+    };
+
+    // Starting facing the ladder
+    // This loop takes about 15 sec
+    while(true){
+        pbf_press_button(context, BUTTON_A, 100ms, 500ms); // hop on ladder
+        climb_ladder(2800ms);
+        run_forward(2500ms);
+        run_backward(use_switch1_only_timings ? 3050ms : 3000ms);
+        pbf_wait(context, use_switch1_only_timings ? 1100ms : 1s); // wait for drop to lower level
+        run_backward(2000ms);
+        run_forward(2500ms);
+        context.wait_for_all_requests();
+        stats.spawns++;
+        env.update_stats();
+        // Spawn refreshing loop takes 15 sec. Going to check Virizion takes 22 sec.
+        // 10 for 10 cal per sec
+        if (check_calorie(env.console, context, MIN_CALORIE_TO_CATCH, (15 + 22) * 10)){
+            break;
+        }
+    }
+
+    // This movement to Virizion takes about 22 sec
+    pbf_press_button(context, BUTTON_A, 100ms, 500ms);
+    climb_ladder(2800ms);
+    run_forward(2500ms);
+    change_character_facing_direction(0.0, -1.0); // face backwards
+    // align camera to face what character is facing
+    pbf_press_button(context, BUTTON_L, 200ms, 800ms);
+
+    context.wait_for_all_requests();
+    env.log("Move to check Virizion");
+    env.log_to_ui("To Check Virizion");
+
+    run_forward(use_switch1_only_timings ? 2700ms : 2600ms);
+    pbf_wait(context, use_switch1_only_timings ? 1100ms : 1s); // wait for drop to lower level
+    run_changing_direction(3000ms, -0.15);
+    rotom_glide(use_switch1_only_timings ? 2600ms : 2500ms);
+    stats.spawns++;
+    env.update_stats();
+    run_forward(5s);
+    context.wait_for_all_requests();
+}
+
+
+} // namespace
+
+void ShinyHunt_HyperspaceLegendary::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    assert_16_9_720p_min(env.logger(), env.console);
+    HyperspaceCalorieDetector::warm_ocr();
+
+    //  Connect the controller.
+    require_player(env.console, context, BUTTON_B);
+
+    ShinyHunt_HyperspaceLegendary_Descriptor::Stats& stats = env.current_stats<ShinyHunt_HyperspaceLegendary_Descriptor::Stats>();
+
+    uint8_t shiny_count = 0;
+    float shiny_coefficient = 1.0;
+    PokemonLA::ShinySoundDetector shiny_detector(env.console, [&](float error_coefficient) -> bool {
+        //  Warning: This callback will be run from a different thread than this function.
+        shiny_count++;
+        stats.shinies++;
+        env.update_stats();
+        env.console.overlay().add_log("Shiny Sound Detected!", COLOR_YELLOW);
+        shiny_coefficient = error_coefficient;
+        return true;
+    });
+
+    bool use_switch1_only_timings = false;
+    // VIRIZION huntig requires different timings between Switch 1 and 2
+    if (LEGENDARY == Legendary::VIRIZION){
+        // check whether this is Switch 1 or 2.
+        ConsoleType console_type = env.console.state().console_type();
+        if (console_type == ConsoleType::Unknown){
+            env.log_to_ui("Detecting Console Type");
+            env.console.log("Unknown Switch type. Try to detect.");
+            console_type = detect_console_type_from_in_game(env.console, context);
+        }
+        use_switch1_only_timings = is_switch1(console_type);
+    }
+
+    while (true){
+        if (LEGENDARY == Legendary::LATIAS_ALT){
+            if (hunt_latias_alt(env, context, stats, LATIAS_VISUAL_SHINY_THRESHOLD)){
+                // shiny found
+                SHINY_DETECTED.on_shiny_sighted(
+                    env, env.console, context,
+                    shiny_count
+                );
+                break;
+            }
+        }else{
+            if (LEGENDARY == Legendary::LATIAS){
+                hunt_latias_route(env, context, stats, MIN_CALORIE_TO_CATCH);
+            }
+            const int ret = run_until<ProControllerContext>(
+                env.console, context,
+                [&](ProControllerContext& context){
+                    if (LEGENDARY == Legendary::LATIAS){
+                        hunt_latias_check(env, context, stats);
+                    }else if (LEGENDARY == Legendary::LATIOS){
+                        hunt_latios(env, context, stats, MIN_CALORIE_TO_CATCH);
+                    }else if (LEGENDARY == Legendary::VIRIZION){
+                        hunt_virizion_rooftop(env, context, stats, MIN_CALORIE_TO_CATCH, use_switch1_only_timings);
+                    }else if (LEGENDARY == Legendary::TERRAKION){
+                        hunt_terrakion(env, context, stats, MIN_CALORIE_TO_CATCH);
+                    }else if (LEGENDARY == Legendary::COBALION){
+                        hunt_cobalion(env, context, stats, MIN_CALORIE_TO_CATCH);
+                    }else{
+                        OperationFailedExceptionWithScreenshot::fire(
+                            ErrorReportMode::SEND_ERROR_REPORT,
+                            "legendary hunt not implemented",
+                            env.console
+                        );
+                    }
+                },
+                { {shiny_detector} }
+            );
+
+            shiny_detector.throw_if_no_sound();
+            shiny_detector.clear();
+
+            if (ret == 0 && SHINY_DETECTED.on_shiny_sound(
+                env, env.console, context,
+                shiny_count,
+                shiny_coefficient
+            )){
+                break;
+            }
+        }
+
+        // no shiny sound detected or no shiny legendary detected. Reset game
+        go_home(env.console, context);
+        reset_game_from_home(env, env.console, context);
+        stats.game_resets++;
+        env.update_stats();
+        if (stats.game_resets % 10 == 0){
+            send_program_status_notification(env, NOTIFICATION_STATUS);
+        }
+    } // end while (true)
+
+    go_home(env.console, context);
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+}
+
+
+}  // namespace PokemonLZA
+}  // namespace NintendoSwitch
+}  // namespace PokemonAutomation
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_HyperspaceLegendary.h b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_HyperspaceLegendary.h
new file mode 100644
index 0000000000..2dbbdeaac9
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_HyperspaceLegendary.h
@@ -0,0 +1,62 @@
+/*  Shiny Hunt - Hyperspace Legendary
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  Shiny hunt legendary pokemon in Hyperspace.
+ */
+
+#ifndef PokemonAutomation_PokemonLZA_ShinyHunt_HyperspaceLegendary_H
+#define PokemonAutomation_PokemonLZA_ShinyHunt_HyperspaceLegendary_H
+
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "VideoGames/PokemonLA/Options/PokemonLA_ShinyDetectedAction.h"
+#include "VideoGames/PokemonLZA/Options/PokemonLZA_ShinyDetectedAction.h"
+
+namespace PokemonAutomation {
+namespace NintendoSwitch {
+namespace PokemonLZA {
+
+
+class ShinyHunt_HyperspaceLegendary_Descriptor : public SingleSwitchProgramDescriptor {
+public:
+    ShinyHunt_HyperspaceLegendary_Descriptor();
+
+    class Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+
+class ShinyHunt_HyperspaceLegendary : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = ShinyHunt_HyperspaceLegendary_Descriptor;
+    ShinyHunt_HyperspaceLegendary();
+
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+    enum class Legendary{
+        LATIAS,
+        LATIAS_ALT,
+        LATIOS,
+        COBALION,
+        TERRAKION,
+        VIRIZION,
+    };
+
+private:
+    PokemonLA::ShinyRequiresAudioText SHINY_REQUIRES_AUDIO;
+    ShinySoundDetectedActionOption SHINY_DETECTED;
+    EnumDropdownOption<Legendary> LEGENDARY;
+    SimpleIntegerOption<uint16_t> MIN_CALORIE_TO_CATCH;
+    SimpleIntegerOption<uint16_t> LATIAS_VISUAL_SHINY_THRESHOLD;
+
+    EventNotificationOption NOTIFICATION_STATUS;
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+
+}  // namespace PokemonLZA
+}  // namespace NintendoSwitch
+}  // namespace PokemonAutomation
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_OverworldReset.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_OverworldReset.cpp
new file mode 100644
index 0000000000..1d39c39edd
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_OverworldReset.cpp
@@ -0,0 +1,272 @@
+/*  Shiny Hunt - Overworld Reset
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "CommonTools/StartupChecks/VideoResolutionCheck.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonLA/Inference/Sounds/PokemonLA_ShinySoundDetector.h"
+#include "VideoGames/PokemonLZA/Programs/PokemonLZA_GameEntry.h"
+#include "PokemonLZA_ShinyHunt_OverworldReset.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+using namespace Pokemon;
+
+
+
+
+
+ShinyHunt_OverworldReset_Descriptor::ShinyHunt_OverworldReset_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonLZA:ShinyHunt-OverworldReset",
+        STRING_POKEMON + " LZA", "Overworld Reset",
+        "Programs/PokemonLZA/ShinyHunt-OverworldReset.html",
+        "Shiny hunt by soft-resetting a " + STRING_POKEMON + " that spawns next to you.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+class ShinyHunt_OverworldReset_Descriptor::Stats : public StatsTracker{
+public:
+    Stats()
+        : resets(m_stats["Resets"])
+        , shinies(m_stats["Shinies"])
+        , errors(m_stats["Errors"])
+    {
+        m_display_order.emplace_back("Resets");
+        m_display_order.emplace_back("Shinies");
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+    }
+
+    std::atomic<uint64_t>& resets;
+    std::atomic<uint64_t>& shinies;
+    std::atomic<uint64_t>& errors;
+};
+std::unique_ptr<StatsTracker> ShinyHunt_OverworldReset_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+
+
+
+
+ShinyHunt_OverworldReset::ShinyHunt_OverworldReset()
+    : RESET_DELAY(
+        "<b>Reset Delay:</b><br>Wait this long after the game loads and player character moves before resetting.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        "5000 ms"
+    )
+    , ROTATE_CAMERA(
+        "<b>Rotate Camera:</b><br>Rotate camera during waiting.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        false
+    )
+    , MOVEMENT_GROUP(
+        "Movement After Loading",
+        LockMode::UNLOCK_WHILE_RUNNING
+    )
+    , MOVEMENT(
+        "<b>Movement:</b><br>"
+        "Move the player after entering the game to close gap. ",
+        {
+            {Movement::NONE, "none", "No Movement"},
+            {Movement::RUN, "run", "Run (Hold B)"},
+            {Movement::ROLL, "roll", "Roll (Press Y)"},
+        },
+        LockMode::UNLOCK_WHILE_RUNNING,
+        Movement::NONE
+    )
+    , RUN_DIRECTION(
+        "<b>Run Direction:</b><br>Run in this direction, relative to the camera.",
+        {
+            {RunDirection::FORWARD, "forward", "Forward"},
+            {RunDirection::BACKWARD, "backward", "Backward"},
+            {RunDirection::LEFT, "left", "Left"},
+            {RunDirection::RIGHT, "right", "Right"},
+        },
+        LockMode::UNLOCK_WHILE_RUNNING,
+        RunDirection::FORWARD
+    )
+    , RUN_DURATION(
+        "<b>Run Duration:</b><br>Run for this long.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        "2000 ms"
+    )
+    , ROLLS(
+        "<b>Rolls:</b><br>Roll this many times in the direction the player is facing.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        1, 1
+    )
+    , SHINY_DETECTED(
+        "Shiny Detected", "",
+        "5000 ms",
+        ShinySoundDetectedAction::STOP_PROGRAM
+    )
+    , NOTIFICATION_STATUS("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_STATUS,
+        &SHINY_DETECTED.NOTIFICATIONS,
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_RECOVERABLE,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+{
+    PA_ADD_STATIC(SHINY_REQUIRES_AUDIO);
+    PA_ADD_OPTION(RESET_DELAY);
+    PA_ADD_OPTION(MOVEMENT_GROUP);
+    MOVEMENT_GROUP.PA_ADD_OPTION(MOVEMENT);
+    MOVEMENT_GROUP.PA_ADD_OPTION(RUN_DIRECTION);
+    MOVEMENT_GROUP.PA_ADD_OPTION(RUN_DURATION);
+    MOVEMENT_GROUP.PA_ADD_OPTION(ROLLS);
+    PA_ADD_OPTION(ROTATE_CAMERA);
+    PA_ADD_OPTION(SHINY_DETECTED);
+    PA_ADD_OPTION(NOTIFICATIONS);
+
+    ShinyHunt_OverworldReset::on_config_value_changed(this);
+    MOVEMENT.add_listener(*this);
+}
+ShinyHunt_OverworldReset::~ShinyHunt_OverworldReset(){
+    MOVEMENT.remove_listener(*this);
+}
+void ShinyHunt_OverworldReset::on_config_value_changed(void* object){
+    switch (MOVEMENT){
+    case Movement::NONE:
+        RUN_DIRECTION.set_visibility(ConfigOptionState::HIDDEN);
+        RUN_DURATION.set_visibility(ConfigOptionState::HIDDEN);
+        ROLLS.set_visibility(ConfigOptionState::HIDDEN);
+        break;
+    case Movement::RUN:
+        RUN_DIRECTION.set_visibility(ConfigOptionState::ENABLED);
+        RUN_DURATION.set_visibility(ConfigOptionState::ENABLED);
+        ROLLS.set_visibility(ConfigOptionState::HIDDEN);
+        break;
+    case Movement::ROLL:
+        RUN_DIRECTION.set_visibility(ConfigOptionState::HIDDEN);
+        RUN_DURATION.set_visibility(ConfigOptionState::HIDDEN);
+        ROLLS.set_visibility(ConfigOptionState::ENABLED);
+        break;
+    }
+}
+
+
+void ShinyHunt_OverworldReset::move_after_loading(ProControllerContext& context){
+    switch (MOVEMENT){
+    case Movement::NONE:
+        return;
+    case Movement::RUN:{
+        JoystickPosition direction;
+        switch (RUN_DIRECTION){
+        case RunDirection::FORWARD:
+            direction = {0, +1};
+            break;
+        case RunDirection::BACKWARD:
+            direction = {0, -1};
+            break;
+        case RunDirection::LEFT:
+            direction = {-1, 0};
+            break;
+        case RunDirection::RIGHT:
+            direction = {+1, 0};
+            break;
+        }
+        //  Hold B alongside the joystick for the whole duration so the player
+        //  runs instead of walks.
+        Milliseconds duration = RUN_DURATION;
+        ssf_press_button(context, BUTTON_B, 0ms, duration, 0ms);
+        pbf_move_left_joystick(context, direction, duration, 0ms);
+        return;
+    }
+    case Movement::ROLL:
+        //  Each roll takes about a second to finish before the next one can start.
+        for (uint8_t c = 0; c < ROLLS; c++){
+            pbf_press_button(context, BUTTON_Y, 100ms, 1000ms);
+        }
+        return;
+    }
+}
+
+void ShinyHunt_OverworldReset::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    assert_16_9_720p_min(env.logger(), env.console);
+
+    //  Connect the controller.
+    require_player(env.console, context, BUTTON_L);
+
+    ShinyHunt_OverworldReset_Descriptor::Stats& stats = env.current_stats<ShinyHunt_OverworldReset_Descriptor::Stats>();
+
+    uint8_t shiny_count = 0;
+
+    while (true){
+        go_home(env.console, context);
+        send_program_status_notification(env, NOTIFICATION_STATUS);
+
+
+        float shiny_coefficient = 1.0;
+        PokemonLA::ShinySoundDetector shiny_detector(env.console, [&](float error_coefficient) -> bool{
+            //  Warning: This callback will be run from a different thread than this function.
+            shiny_count++;
+            stats.shinies++;
+            env.update_stats();
+            shiny_coefficient = error_coefficient;
+            return true;
+        });
+
+        int ret = run_until<ProControllerContext>(
+            env.console, context,
+            [&](ProControllerContext& context){
+                reset_game_from_home(env, env.console, context);
+
+                move_after_loading(context);
+                if (ROTATE_CAMERA){
+                    pbf_move_right_joystick(context, {+1, 0}, RESET_DELAY, 0ms);
+                }else{
+                    pbf_wait(context, RESET_DELAY);
+                }
+
+                stats.resets++;
+                env.update_stats();
+            },
+            {{shiny_detector}}
+        );
+        shiny_detector.throw_if_no_sound();
+
+        if (ret < 0){
+            continue;
+        }
+
+        if (SHINY_DETECTED.on_shiny_sound(
+            env, env.console, context,
+            shiny_count,
+            shiny_coefficient
+        )){
+            break;
+        }
+    }
+
+    go_home(env.console, context);
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+}
+
+
+
+
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_OverworldReset.h b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_OverworldReset.h
new file mode 100644
index 0000000000..d7ef27d6e2
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_OverworldReset.h
@@ -0,0 +1,93 @@
+/*  Shiny Hunt - Overworld Reset
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLZA_ShinyHunt_OverworldReset_H
+#define PokemonAutomation_PokemonLZA_ShinyHunt_OverworldReset_H
+
+#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "Common/Cpp/Options/EnumDropdownOption.h"
+#include "Common/Cpp/Options/GroupOption.h"
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "Common/Cpp/Options/TimeDurationOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "VideoGames/PokemonLA/Options/PokemonLA_ShinyDetectedAction.h"
+#include "VideoGames/PokemonLZA/Options/PokemonLZA_ShinyDetectedAction.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+
+
+
+class ShinyHunt_OverworldReset_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    ShinyHunt_OverworldReset_Descriptor();
+
+    class Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+
+class ShinyHunt_OverworldReset : public SingleSwitchProgramInstance, ConfigOption::Listener{
+public:
+    using Descriptor = ShinyHunt_OverworldReset_Descriptor;
+    ShinyHunt_OverworldReset();
+    virtual ~ShinyHunt_OverworldReset();
+
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    //  How the player moves after entering the game to close any
+    //  gap to target spawns.
+    enum class Movement{
+        NONE,
+        RUN,
+        ROLL,
+    };
+
+    //  Direction to run, relative to the camera.
+    enum class RunDirection{
+        FORWARD,
+        BACKWARD,
+        LEFT,
+        RIGHT,
+    };
+
+    //  Show only the movement options that apply to the selected `MOVEMENT`.
+    //  Controls the visibility of RUN_DIRECTION, RUN_DURATION and ROLLS.
+    virtual void on_config_value_changed(void* object) override;
+
+    //  Perform the movement selected by `MOVEMENT` after the game loads.
+    void move_after_loading(ProControllerContext& context);
+
+    PokemonLA::ShinyRequiresAudioText SHINY_REQUIRES_AUDIO;
+
+    MillisecondsOption RESET_DELAY;
+    BooleanCheckBoxOption ROTATE_CAMERA;
+
+    //  Holds MOVEMENT, RUN_DIRECTION, RUN_DURATION and ROLLS in one box in the UI.
+    GroupOption MOVEMENT_GROUP;
+    EnumDropdownOption<Movement> MOVEMENT;
+    EnumDropdownOption<RunDirection> RUN_DIRECTION;
+    MillisecondsOption RUN_DURATION;
+    SimpleIntegerOption<uint8_t> ROLLS;
+
+    ShinySoundDetectedActionOption SHINY_DETECTED;
+
+    EventNotificationOption NOTIFICATION_STATUS;
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShuttleRun.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShuttleRun.cpp
new file mode 100644
index 0000000000..b5fcfc7d40
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShuttleRun.cpp
@@ -0,0 +1,234 @@
+/*  Shiny Hunt - Shuttle Run
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/PrettyPrint.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/VideoPipeline/VideoOverlay.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "CommonTools/VisualDetectors/BlackScreenDetector.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonLA/Inference/Sounds/PokemonLA_ShinySoundDetector.h"
+#include "VideoGames/PokemonLZA/Programs/PokemonLZA_BasicNavigation.h"
+#include "PokemonLZA_ShuttleRun.h"
+
+namespace PokemonAutomation {
+namespace NintendoSwitch {
+namespace PokemonLZA {
+
+using namespace Pokemon;
+
+
+ShinyHunt_ShuttleRun_Descriptor::ShinyHunt_ShuttleRun_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonLZA:ShinyHunt-ShuttleRun", STRING_POKEMON + " LZA",
+        "Shuttle Run",
+        "Programs/PokemonLZA/ShinyHunt-ShuttleRun.html",
+        "Shiny hunt by repeatedly running back and forth between two points",
+        PanelQualityStanding::THIRD_PARTY_UNVETTED,
+        ProgramControllerClass::StandardController_NoRestrictions, FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+class ShinyHunt_ShuttleRun_Descriptor::Stats : public StatsTracker{
+public:
+    Stats()
+        : resets(m_stats["Rounds"])
+        , shinies(m_stats["Shiny Sounds"])
+        , errors(m_stats["Errors"])
+    {
+        m_display_order.emplace_back("Rounds");
+        m_display_order.emplace_back("Shiny Sounds");
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+    }
+
+    std::atomic<uint64_t>& resets;
+    std::atomic<uint64_t>& shinies;
+    std::atomic<uint64_t>& errors;
+};
+std::unique_ptr<StatsTracker> ShinyHunt_ShuttleRun_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+
+ShinyHunt_ShuttleRun::ShinyHunt_ShuttleRun()
+    : DURATION("<b>Duration:</b><br>Run the program this long.", LockMode::UNLOCK_WHILE_RUNNING, "5 h")
+    , ROUTE("<b>Hunt Route:</b>",
+        {
+            {Route::WILD_ZONE_3_TOWER, "wild_zone_3_tower", "Wild Zone 3 Tower"},
+            {Route::ALPHA_PIDGEOT, "alpha_pidgeot", "Alpha Pidgeot (Jaune Sector 4)"},
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        Route::WILD_ZONE_3_TOWER
+    )
+    , SHINY_DETECTED("Shiny Detected", "", "1000 ms", ShinySoundDetectedAction::NOTIFY_ON_FIRST_ONLY)
+    , NOTIFICATION_STATUS("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_STATUS,
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_RECOVERABLE,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+{
+    PA_ADD_STATIC(SHINY_REQUIRES_AUDIO);
+    PA_ADD_OPTION(DURATION);
+    PA_ADD_OPTION(ROUTE);
+    PA_ADD_OPTION(SHINY_DETECTED);
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+namespace {
+
+
+void route_alpha_pidgeot(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    int ret = -1;
+    {
+        BlackScreenOverWatcher black_screen(COLOR_BLUE);
+        ret = run_until<ProControllerContext>(
+            env.console, context,
+            [](ProControllerContext& context){
+                ssf_press_button(context, BUTTON_B, 0ms, 500ms, 0ms);
+                pbf_move_left_joystick(context, {0, +1}, 4000ms, 0ms);
+                pbf_move_left_joystick(context, {0, -1}, 4500ms, 0ms);
+                pbf_wait(context, 500ms);
+            },
+            {black_screen}
+        );
+    }
+    if (ret == 0){
+        wait_until_overworld(env.console, context, 50s);
+        open_map(env.console, context, false, true);
+        pbf_move_left_joystick(context, {+0.157, +0.156}, 100ms, 200ms);
+        if (fly_from_map(env.console, context) == FastTravelState::NOT_AT_FLY_SPOT){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "fly_from_map(): Unable to fast travel",
+                env.console);
+        }
+        wait_until_overworld(env.console, context);
+        ssf_press_button(context, BUTTON_B, 0ms, 500ms, 0ms);
+        pbf_move_left_joystick(context, {+1, 0}, 800ms, 0ms);
+        pbf_move_left_joystick(context, {0, +1}, 4400ms, 0ms);
+        pbf_move_left_joystick(context, {-1, 0},  300ms, 0ms);
+        pbf_press_button(context, BUTTON_A, 500ms, 2500ms); // elevator up
+        ssf_press_button(context, BUTTON_B, 0ms, 500ms, 0ms);
+        pbf_move_left_joystick(context, {0, +1}, 900ms, 0ms);
+        pbf_move_left_joystick(context, {-1, 0},  2000ms, 0ms);
+        pbf_move_left_joystick(context, {+1, 0}, 200ms, 200ms);
+        pbf_press_button(context, BUTTON_L, 100ms, 200ms);
+    }
+}
+
+void route_wild_zone_3_tower(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    bool been_at_downstairs = false;
+    bool been_at_upstairs_after_downstairs = false;
+
+    for (int i = 0; i < 6; i++){
+        // if there is no day/night change and no button drop, this loop should only have three iterations
+        const double direction = get_facing_direction(env.console, context);
+        const bool face_east = get_angle_between_facing_directions(direction, 90.0) < 10.0;
+        const bool face_west = get_angle_between_facing_directions(direction, 270.0) < 10.0;
+        const bool face_south = get_angle_between_facing_directions(direction, 180.0) < 10.0;
+        const bool face_north = get_angle_between_facing_directions(direction, 0.0) < 10.0;
+        if (face_east || face_west){ // we are at downstars
+            been_at_downstairs = true;
+        }
+        else if (been_at_downstairs){
+            // we are not at downstairs right now, but we've been to the downstairs, so we 
+            // must be at upstairs
+            been_at_upstairs_after_downstairs = true;
+        }
+        if (face_east || face_south){
+            // if facing east or south, run backward
+            pbf_move_left_joystick(context, {0, -1}, 500ms, 200ms);
+        }else if (face_west || face_north){
+            // if facing west or north, run forward
+            pbf_move_left_joystick(context, {0, +1}, 500ms, 200ms);
+        }else{
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "route_wild_zone_3_tower: unexpected facing direction: " + PokemonAutomation::tostr_fixed(direction, 0) + " deg",
+                env.console
+            );
+        }
+        context.wait_for_all_requests();
+        wait_until_overworld(env.console, context, 50s);
+
+        if (been_at_upstairs_after_downstairs){
+            // we've finished one run of the tower
+            return;
+        }
+    }
+}
+
+} // namespace
+
+void ShinyHunt_ShuttleRun::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    ShinyHunt_ShuttleRun_Descriptor::Stats& stats =
+        env.current_stats<ShinyHunt_ShuttleRun_Descriptor::Stats>();
+    ShinySoundHandler shiny_sound_handler(SHINY_DETECTED);
+    PokemonLA::ShinySoundDetector shiny_detector(env.console, [&](float error_coefficient) -> bool {
+        //  Warning: This callback will be run from a different thread than this function.
+        stats.shinies++;
+        env.update_stats();
+        env.console.overlay().add_log("Shiny Sound Detected!", COLOR_YELLOW);
+        return shiny_sound_handler.on_shiny_sound(
+            env, env.console,
+            stats.shinies,
+            error_coefficient
+        );
+    });
+    std::function<void(SingleSwitchProgramEnvironment&, ProControllerContext&)> route;
+    switch (ROUTE){
+    case Route::ALPHA_PIDGEOT:
+        route = route_alpha_pidgeot;
+        break;
+    case Route:: WILD_ZONE_3_TOWER:
+        route = route_wild_zone_3_tower;
+        break;
+    default:
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "route not implemented",
+            env.console
+        );
+    }
+    WallClock start_time = current_time();
+
+    //  Connect the controller.
+    require_player(env.console, context, BUTTON_L);
+
+    run_until<ProControllerContext>(
+        env.console, context,
+        [&](ProControllerContext& context){
+            do{
+                const std::string log_msg = "Round " + std::to_string(stats.resets + 1);
+                env.log(log_msg);
+                env.console.overlay().add_log(log_msg);
+                shiny_sound_handler.process_pending(context);
+                send_program_status_notification(env, NOTIFICATION_STATUS);
+                route(env, context);
+                context.wait_for_all_requests();
+                stats.resets++;
+                env.update_stats();
+            }while (current_time() < start_time + DURATION.get());
+        },
+        {{shiny_detector}}
+    );
+
+    shiny_sound_handler.process_pending(context);
+    go_home(env.console, context);
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+}
+
+
+}  // namespace PokemonLZA
+}  // namespace NintendoSwitch
+}  // namespace PokemonAutomation
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShuttleRun.h b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShuttleRun.h
new file mode 100644
index 0000000000..286cef2713
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShuttleRun.h
@@ -0,0 +1,57 @@
+/*  Shiny Hunt - Shuttle Run
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLZA_Shuttle_Run_H
+#define PokemonAutomation_PokemonLZA_Shuttle_Run_H
+
+#include "Common/Cpp/Options/EnumDropdownOption.h"
+#include "Common/Cpp/Options/TimeDurationOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "VideoGames/PokemonLA/Options/PokemonLA_ShinyDetectedAction.h"
+#include "VideoGames/PokemonLZA/Options/PokemonLZA_ShinyDetectedAction.h"
+
+namespace PokemonAutomation {
+namespace NintendoSwitch {
+namespace PokemonLZA {
+
+
+class ShinyHunt_ShuttleRun_Descriptor : public SingleSwitchProgramDescriptor {
+public:
+    ShinyHunt_ShuttleRun_Descriptor();
+
+    class Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+
+class ShinyHunt_ShuttleRun : public SingleSwitchProgramInstance {
+public:
+    using Descriptor = ShinyHunt_ShuttleRun_Descriptor;
+    ShinyHunt_ShuttleRun();
+
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+    enum class Route{
+        WILD_ZONE_3_TOWER,
+        ALPHA_PIDGEOT,
+        CUSTOMISED_MACRO = 255,
+    };
+
+private:
+    PokemonLA::ShinyRequiresAudioText SHINY_REQUIRES_AUDIO;
+    MillisecondsOption DURATION;
+    EnumDropdownOption<Route> ROUTE;
+    ShinySoundDetectedActionOption SHINY_DETECTED;
+    EventNotificationOption NOTIFICATION_STATUS;
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+
+}  // namespace PokemonLZA
+}  // namespace NintendoSwitch
+}  // namespace PokemonAutomation
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_WildZoneCafe.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_WildZoneCafe.cpp
new file mode 100644
index 0000000000..ee1f5ce5e1
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_WildZoneCafe.cpp
@@ -0,0 +1,367 @@
+/*  Shiny Hunt - Wild Zone Cafe
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/PrettyPrint.h"
+#include "Common/Cpp/Time.h"
+#include "CommonFramework/StaticGlobals.h"
+#include "CommonFramework/GlobalSettingsPanel.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/Globals.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "CommonTools/StartupChecks/VideoResolutionCheck.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonLA/Inference/Sounds/PokemonLA_ShinySoundDetector.h"
+#include "VideoGames/PokemonLZA/Inference/PokemonLZA_AlertEyeDetector.h"
+#include "VideoGames/PokemonLZA/Programs/PokemonLZA_BasicNavigation.h"
+#include "VideoGames/PokemonLZA/Programs/PokemonLZA_GameEntry.h"
+#include "PokemonLZA_WildZoneCafe.h"
+
+namespace PokemonAutomation::NintendoSwitch::PokemonLZA {
+
+using namespace Pokemon;
+
+
+ShinyHunt_WildZoneCafe_Descriptor::ShinyHunt_WildZoneCafe_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonLZA:ShinyHunt-WildZoneCafe", STRING_POKEMON + " LZA",
+        "Wild Zone Cafe",
+        "Programs/PokemonLZA/ShinyHunt-WildZoneCafe.html",
+        "Shiny hunt by repeatedly entering Wild Zone cafe.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions, FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+class ShinyHunt_WildZoneCafe_Descriptor::Stats : public StatsTracker{
+public:
+    Stats()
+        : visits(m_stats["Visits"])
+        , chased(m_stats["Chased"])
+        , shinies(m_stats["Shiny Sounds"])
+        , game_resets(m_stats["Game Resets"])
+        , errors(m_stats["Errors"])
+    {
+        m_display_order.emplace_back("Visits");
+        m_display_order.emplace_back("Chased");
+        m_display_order.emplace_back("Shiny Sounds");
+        m_display_order.emplace_back("Game Resets");
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+    }
+
+    std::atomic<uint64_t>& visits;
+    std::atomic<uint64_t>& chased;
+    std::atomic<uint64_t>& shinies;
+    std::atomic<uint64_t>& game_resets;
+    std::atomic<uint64_t>& errors;
+};
+
+std::unique_ptr<StatsTracker> ShinyHunt_WildZoneCafe_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+
+ShinyHunt_WildZoneCafe::ShinyHunt_WildZoneCafe()
+    : CAFE(
+        "<b>Caf\u00e9:</b>",
+        {
+            {Location::CAFE_BATAILLE, "cafe-bataille", "Wild Zone 6 - Caf\u00e9 Bataille"},
+            {Location::CAFE_ULTIMO, "cafe-ultimo", "Wild Zone 15 - Caf\u00e9 Ultimo"},
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        Location::CAFE_BATAILLE
+    )
+    , NUM_VISITS("<b>Number of Visits:</b><br>Stop after this many visits. 0 means no limit.", LockMode::UNLOCK_WHILE_RUNNING, 0)
+    , SHINY_DETECTED("Shiny Detected", "", "2000 ms", ShinySoundDetectedAction::NOTIFY_ON_FIRST_ONLY)
+    , NOTIFICATION_STATUS("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_STATUS,
+        &SHINY_DETECTED.NOTIFICATIONS,
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_RECOVERABLE,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+{
+    PA_ADD_STATIC(SHINY_REQUIRES_AUDIO);
+    PA_ADD_OPTION(CAFE);
+    PA_ADD_OPTION(NUM_VISITS);
+    PA_ADD_OPTION(SHINY_DETECTED);
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+
+void do_one_cafe_trip(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    Location cafe,
+    ShinySoundHandler& shiny_sound_handler,
+    bool to_zoom_to_max
+){
+    env.log("Starting one cafe trip");
+    ShinyHunt_WildZoneCafe_Descriptor::Stats& stats = env.current_stats<ShinyHunt_WildZoneCafe_Descriptor::Stats>();
+    context.wait_for_all_requests();
+    shiny_sound_handler.process_pending(context);
+
+    AlertEyeDetector alert_eye_detector(COLOR_WHITE, &env.console.overlay());
+    auto latest_frame = env.console.video().snapshot_latest_blocking();
+    // if there is the alert symbol of a white eye telling player they are being chased by wild pokmeon
+    const bool has_alert_eye = latest_frame ? alert_eye_detector.detect(latest_frame): false;
+
+    if (!has_alert_eye){
+        // we are not being chased by wild pokemon. Try to fast travel back to entrance.
+
+        // Open map is robust against day/night change. So after open_map()
+        // we are sure we are in map view
+        bool can_fast_travel = open_map(env.console, context, to_zoom_to_max, true);
+        to_zoom_to_max = false;
+
+        if (can_fast_travel){
+            pbf_wait(context, 300ms);
+            switch(cafe){
+            case Location::CAFE_BATAILLE:
+                env.log("Move to Cafe Bataille icon");
+                pbf_move_left_joystick(context, {+0.157, +0.844}, 100ms, 0ms);
+                break;
+            case Location::CAFE_ULTIMO:
+                env.log("Move to Cafe Ultimo icon");
+                pbf_move_left_joystick(context, {-0.609, +0.219}, 100ms, 0ms);
+                break;
+            default:
+                throw InternalProgramError(
+                    nullptr, PA_CURRENT_FUNCTION,
+                    "do_one_cafe_trip(): Unsupported cafe location."
+                );
+            }
+            pbf_wait(context, 300ms);
+            FastTravelState travel_status = fly_from_map(env.console, context);
+            if (travel_status == FastTravelState::SUCCESS){
+                env.log("Fast travel back to cafe");
+                return;
+            }else if (travel_status == FastTravelState::NOT_AT_FLY_SPOT){
+                stats.errors++;
+                env.update_stats();
+                OperationFailedExceptionWithScreenshot::fire(
+                    ErrorReportMode::SEND_ERROR_REPORT,
+                    "do_one_cafe_trip: Cannot fast travel after moving map cursor.",
+                    env.console
+                );
+            }
+            // else: travel_status == FastTravelState::PURSUED
+        }
+
+        // if (STATIC_GLOBALS.DEVELOPER_MODE){
+        //     dump_debug_image(env.console, "AlertEyeDetector", "FalseNegative", latest_frame);
+        // }
+    }
+    // we are being chased by wild pokemon
+
+    stats.chased++;
+    env.update_stats();
+    env.log("Escaping");
+    env.console.overlay().add_log("Escaping to Entrance");
+    const double starting_direction = get_facing_direction(env.console, context);
+
+    double move_x = -1, move_y = +1;
+    switch(cafe){
+    case Location::CAFE_BATAILLE:
+        env.log("Move to zone gate from Cafe Bataille");
+        move_x = +1; move_y = -0.25;
+        break;
+    case Location::CAFE_ULTIMO:
+        env.log("Move to zone gate from Cafe Ultimo");
+        move_x = 0; move_y = -1;
+        break;
+    default:
+        throw InternalProgramError(
+            nullptr, PA_CURRENT_FUNCTION,
+            "do_one_cafe_trip(): Unsupported cafe location."
+        );
+    }
+
+    int ret = run_towards_gate_with_A_button(env.console, context, move_x, move_y, Seconds(10));
+    switch (ret){
+    case 0: // Found button A. Reached the gate.
+        break;
+    case 1: // day night change happend
+        {
+            const double cur_direction = get_facing_direction(env.console, context);
+            const double direction_change = get_angle_between_facing_directions(starting_direction, cur_direction);
+            env.log("Facing direction difference after day/night change: " + tostr_fixed(direction_change, 0) + " deg, from "
+                + tostr_fixed(starting_direction, 0) + " to " + tostr_fixed(cur_direction, 0) + " deg");
+
+            if (direction_change > 30){
+                // we are already facing the gate
+                move_x = 0; move_y = +1;
+                env.log("Running forward");
+                env.console.overlay().add_log("Running Forward");
+            }
+            // Running forward or backward depends on character facing to go back to zone entrance
+            ret = run_towards_gate_with_A_button(env.console, context, move_x, move_y, Seconds(10));
+            if (ret != 0){
+                stats.errors++;
+                env.update_stats();
+                OperationFailedExceptionWithScreenshot::fire(
+                    ErrorReportMode::SEND_ERROR_REPORT,
+                    "do_one_cafe_trip: Cannot reach wild zone gate after day/night change.",
+                    env.console
+                );
+            }
+        }
+        break;
+    default:
+        stats.errors++;
+        env.update_stats();
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "do_one_cafe_trip: Cannot reach wild zone gate after being chased by wild pokemon.",
+            env.console
+        );
+    }
+    shiny_sound_handler.process_pending(context);
+
+    // Found button A, so we are at the entrance.
+    // Mash A to leave Zone.
+    if (!leave_zone_gate(env.console, context)){
+        // day/night change happens while leaving
+        // Try leave again
+        leave_zone_gate(env.console, context);
+    }
+    shiny_sound_handler.process_pending(context);
+
+    // do a fast travel back to cafe
+    bool can_fast_travel = open_map(env.console, context, to_zoom_to_max, true);
+    if (!can_fast_travel){
+        // cannot fast travel outside zone. Chased by wild pokemon that used Dig?
+        stats.errors++;
+        env.update_stats();
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "do_one_cafe_trip: Cannot fast travel outside gate.",
+            env.console
+        );
+    }
+    
+    // move map cursor to cafe:
+    pbf_wait(context, 300ms);
+    switch(cafe){
+    case Location::CAFE_BATAILLE:
+        env.log("Move to Cafe Bataille icon from zone gate");
+        pbf_move_left_joystick(context, {-0.25, -0.252}, 100ms, 0ms);
+        break;
+    case Location::CAFE_ULTIMO:
+        env.log("Move to Cafe Ultimo icon from zone gate");
+        pbf_move_left_joystick(context, {+0.488, -0.126}, 100ms, 0ms);
+        break;
+    default:
+        throw InternalProgramError(
+            nullptr, PA_CURRENT_FUNCTION,
+            "do_one_cafe_trip(): Unsupported cafe location."
+        );
+    }
+    pbf_wait(context, 300ms);
+
+    FastTravelState travel_status = fly_from_map(env.console, context);
+    if (travel_status != FastTravelState::SUCCESS){
+        stats.errors++;
+        env.update_stats();
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "do_one_cafe_trip: Cannot fast travel to cafe.",
+            env.console
+        );
+    }
+}
+
+
+void ShinyHunt_WildZoneCafe::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    assert_16_9_720p_min(env.logger(), env.console);
+
+    //  Record when we should zoom out the map for flyable fast travel icon
+    //  detection on map during fast traveling.
+    bool to_max_zoom_level_on_map = true;
+
+    //  Connect the controller.
+    require_player(env.console, context, BUTTON_B);
+
+    ShinyHunt_WildZoneCafe_Descriptor::Stats& stats = env.current_stats<ShinyHunt_WildZoneCafe_Descriptor::Stats>();
+
+    ShinySoundHandler shiny_sound_handler(SHINY_DETECTED);
+
+    PokemonLA::ShinySoundDetector shiny_detector(env.console, [&](float error_coefficient) -> bool {
+        // Warning: This callback will be run from a different thread than this function.
+        stats.shinies++;
+        env.update_stats();
+        env.console.overlay().add_log("Shiny Sound Detected!", COLOR_YELLOW);
+
+        return shiny_sound_handler.on_shiny_sound(
+            env, env.console,
+            stats.shinies,
+            error_coefficient
+        );
+    });
+
+    int consecutive_failures = 0;
+    run_until<ProControllerContext>(
+        env.console, context,
+        [&](ProControllerContext& context){
+            while (true){
+                try{
+                    do_one_cafe_trip(
+                        env, context,
+                        CAFE, shiny_sound_handler, to_max_zoom_level_on_map
+                    );
+                    // Fast travel auto saves the game. So now the map is fixed at max zoom level.
+                    // We no longer needs to zoom in future.
+                    to_max_zoom_level_on_map = false;
+                    stats.visits++;
+                    env.update_stats();
+                    if (NUM_VISITS > 0 && stats.visits >= NUM_VISITS){
+                        break;
+                    }
+                    // No failure. Reset consecutive failure counter.
+                    consecutive_failures = 0;
+                }catch (OperationFailedException&){
+                    consecutive_failures++;
+                    env.log("Consecutive failures: " + std::to_string(consecutive_failures), COLOR_RED);
+                    if (consecutive_failures >= 3){
+                        if (STATIC_GLOBALS.DEVELOPER_MODE && GlobalSettings::instance().SAVE_DEBUG_VIDEOS_ON_SWITCH){
+                            env.log("Saving debug video on Switch...");
+                            env.console.overlay().add_log("Save Debug Video on Switch");
+                            pbf_press_button(context, BUTTON_CAPTURE, 2000ms, 0ms);
+                            context.wait_for_all_requests();
+                        }
+                        go_home(env.console, context); // go Home to preserve game state for debugging
+                        throw;
+                    }
+                    env.log("Error encountered. Resetting...", COLOR_RED);
+                    stats.game_resets++;
+                    stats.errors++;
+                    env.update_stats();
+                    env.console.overlay().add_log("Error Found. Reset Game", COLOR_RED);
+                    go_home(env.console, context);
+                    reset_game_from_home(env, env.console, context);
+                }
+                send_program_status_notification(env, NOTIFICATION_STATUS);
+            }
+        },
+        {{shiny_detector}}
+    );
+
+    // Shiny sound detected and user requested stopping the program when
+    // detected shiny sound.
+    shiny_sound_handler.process_pending(context);
+
+    go_home(env.console, context);
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+}
+
+
+}  // namespace PokemonAutomation::NintendoSwitch::PokemonLZA
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_WildZoneCafe.h b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_WildZoneCafe.h
new file mode 100644
index 0000000000..c32accbd5f
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_WildZoneCafe.h
@@ -0,0 +1,49 @@
+/*  Shiny Hunt - Wild Zone Cafe
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLZA_WildZoneCafe_H
+#define PokemonAutomation_PokemonLZA_WildZoneCafe_H
+
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "VideoGames/PokemonLA/Options/PokemonLA_ShinyDetectedAction.h"
+#include "VideoGames/PokemonLZA/Options/PokemonLZA_ShinyDetectedAction.h"
+
+namespace PokemonAutomation::NintendoSwitch::PokemonLZA {
+
+
+class ShinyHunt_WildZoneCafe_Descriptor : public SingleSwitchProgramDescriptor {
+public:
+    ShinyHunt_WildZoneCafe_Descriptor();
+
+    class Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+
+class ShinyHunt_WildZoneCafe : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = ShinyHunt_WildZoneCafe_Descriptor;
+    ShinyHunt_WildZoneCafe();
+
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    EnumDropdownOption<Location> CAFE;
+    PokemonLA::ShinyRequiresAudioText SHINY_REQUIRES_AUDIO;
+
+    SimpleIntegerOption<uint64_t> NUM_VISITS;
+
+    ShinySoundDetectedActionOption SHINY_DETECTED;
+
+    EventNotificationOption NOTIFICATION_STATUS;
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+
+}  // namespace PokemonAutomation::NintendoSwitch::PokemonLZA
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_WildZoneEntrance.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_WildZoneEntrance.cpp
new file mode 100644
index 0000000000..479f904e1b
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_WildZoneEntrance.cpp
@@ -0,0 +1,588 @@
+/*  Shiny Hunt - Wild Zone Entrance
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/PrettyPrint.h"
+#include "Common/Cpp/Time.h"
+#include "CommonFramework/StaticGlobals.h"
+#include "CommonFramework/GlobalSettingsPanel.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/Globals.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "CommonTools/StartupChecks/VideoResolutionCheck.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonLA/Inference/Sounds/PokemonLA_ShinySoundDetector.h"
+#include "VideoGames/PokemonLZA/Inference/PokemonLZA_AlertEyeDetector.h"
+#include "VideoGames/PokemonLZA/Programs/PokemonLZA_BasicNavigation.h"
+#include "VideoGames/PokemonLZA/Programs/PokemonLZA_GameEntry.h"
+#include "PokemonLZA_WildZoneEntrance.h"
+
+// #include <iostream>
+// using std::cout, std::endl;
+
+namespace PokemonAutomation::NintendoSwitch::PokemonLZA {
+
+using namespace Pokemon;
+
+WildZoneOption::WildZoneOption()
+    : EnumDropdownOption<Location>(
+            "<b>Wild Zone:</b>",
+            {
+                {Location::WILD_ZONE_1,  "wild-zone-1",  "Wild Zone 1"},
+                {Location::WILD_ZONE_2,  "wild-zone-2",  "Wild Zone 2"},
+                {Location::WILD_ZONE_3,  "wild-zone-3",  "Wild Zone 3"},
+                {Location::WILD_ZONE_4,  "wild-zone-4",  "Wild Zone 4"},
+                {Location::WILD_ZONE_5,  "wild-zone-5",  "Wild Zone 5"},
+                {Location::WILD_ZONE_6,  "wild-zone-6",  "Wild Zone 6"},
+                {Location::WILD_ZONE_7,  "wild-zone-7",  "Wild Zone 7"},
+                {Location::WILD_ZONE_8,  "wild-zone-8",  "Wild Zone 8"},
+                {Location::WILD_ZONE_9,  "wild-zone-9",  "Wild Zone 9"},
+                {Location::WILD_ZONE_10, "wild-zone-10", "Wild Zone 10"},
+                {Location::WILD_ZONE_11, "wild-zone-11", "Wild Zone 11"},
+                {Location::WILD_ZONE_12, "wild-zone-12", "Wild Zone 12"},
+                {Location::WILD_ZONE_13, "wild-zone-13", "Wild Zone 13"},
+                {Location::WILD_ZONE_14, "wild-zone-14", "Wild Zone 14"},
+                {Location::WILD_ZONE_15, "wild-zone-15", "Wild Zone 15"},
+                {Location::WILD_ZONE_16, "wild-zone-16", "Wild Zone 16"},
+                {Location::WILD_ZONE_17, "wild-zone-17", "Wild Zone 17"},
+                {Location::WILD_ZONE_18, "wild-zone-18", "Wild Zone 18"},
+                {Location::WILD_ZONE_19, "wild-zone-19", "Wild Zone 19"},
+                {Location::WILD_ZONE_20_NO_DISTORTION, "wild-zone-20", "Wild Zone 20 Without Distortion"},
+                {Location::WILD_ZONE_20_WITH_DISTORTION, "wild-zone-20-distortion", "Wild Zone 20 With Distortion"},
+            },
+            LockMode::LOCK_WHILE_RUNNING,
+            Location::WILD_ZONE_1
+        )
+    {}
+        
+
+
+ShinyHunt_WildZoneEntrance_Descriptor::ShinyHunt_WildZoneEntrance_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonLZA:ShinyHunt-WildZoneEntrance", STRING_POKEMON + " LZA",
+        "Wild Zone Entrance",
+        "Programs/PokemonLZA/ShinyHunt-WildZoneEntrance.html",
+        "Shiny hunt by repeatedly entering Wild Zone from its entrance.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions, FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+class ShinyHunt_WildZoneEntrance_Descriptor::Stats : public StatsTracker{
+public:
+    Stats()
+        : visits(m_stats["Visits"])
+        , chased(m_stats["Chased"])
+        , shinies(m_stats["Shiny Sounds"])
+        , game_resets(m_stats["Game Resets"])
+        , errors(m_stats["Errors"])
+        , day_changes(m_stats["Day/Night Changes"])
+    {
+        m_display_order.emplace_back("Visits");
+        m_display_order.emplace_back("Chased");
+        m_display_order.emplace_back("Shiny Sounds");
+        m_display_order.emplace_back("Game Resets");
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+        m_display_order.emplace_back("Day/Night Changes", ALWAYS_HIDDEN);
+        m_aliases["Wild Zone"] = "Visits";
+    }
+
+    std::atomic<uint64_t>& visits;
+    std::atomic<uint64_t>& chased;
+    std::atomic<uint64_t>& shinies;
+    std::atomic<uint64_t>& game_resets;
+    std::atomic<uint64_t>& errors;
+    std::atomic<uint64_t>& day_changes;
+};
+std::unique_ptr<StatsTracker> ShinyHunt_WildZoneEntrance_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+
+ShinyHunt_WildZoneEntrance::ShinyHunt_WildZoneEntrance()
+    : MOVEMENT(
+        "<b>Movement:</b>",
+        {
+            {0, "no-movement", "No Movement"},
+            {1, "approach-gate", "Approach Gate But Don't Enter"},
+            {2, "enter-zone", "Enter Zone (Don't Go Too Far or May Get Stuck by Obstacles When Running Back)"},
+        },
+        LockMode::UNLOCK_WHILE_RUNNING,
+        2
+    )
+    , WALK_TIME_IN_ZONE(
+        "<b>Walk Time in Zone:</b><br>Walk this long in the zone after passing through the gate.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        0ms, 10s,
+        "500 ms"
+    )
+    , RUNNING(
+        "<b>Running:</b><br>Running instead of walking while in the zone",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        true
+    )
+    , SHINY_DETECTED("Shiny Detected", "", "2000 ms", ShinySoundDetectedAction::NOTIFY_ON_FIRST_ONLY)
+    , NOTIFICATION_STATUS("Status Update", true, false, Seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_STATUS,
+        &SHINY_DETECTED.NOTIFICATIONS,
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_RECOVERABLE,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+{
+    PA_ADD_STATIC(SHINY_REQUIRES_AUDIO);
+    PA_ADD_OPTION(WILD_ZONE);
+    PA_ADD_OPTION(MOVEMENT);
+    PA_ADD_OPTION(WALK_TIME_IN_ZONE);
+    PA_ADD_OPTION(RUNNING);
+    PA_ADD_OPTION(SHINY_DETECTED);
+    PA_ADD_OPTION(NOTIFICATIONS);
+
+    MOVEMENT.add_listener(*this);
+}
+
+void ShinyHunt_WildZoneEntrance::on_config_value_changed(void* object){
+    if (MOVEMENT.current_value() <= 1){
+        // no entering zone, disable related options
+        WALK_TIME_IN_ZONE.set_visibility(ConfigOptionState::DISABLED);
+        RUNNING.set_visibility(ConfigOptionState::DISABLED);
+    }else{
+        // entering zone
+        WALK_TIME_IN_ZONE.set_visibility(ConfigOptionState::ENABLED);
+        RUNNING.set_visibility(ConfigOptionState::ENABLED);
+    }
+}
+
+
+
+// After fast travel, move forward to enter wild zone.
+// This function is robust against day/night changes.
+void go_to_entrance(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    Location wildzone
+){
+    double starting_direction = 0;
+    double joystick_x = 0;
+    if (wildzone == Location::WILD_ZONE_1){
+        // The fast travel point of Wild Zone 1 does not face the zone entrance directly. We need
+        // to turn a little bit to the right
+        starting_direction = get_facing_direction(env.console, context);
+        joystick_x = 0.133;
+    }
+    int ret = run_towards_gate_with_A_button(env.console, context, joystick_x, +1, 10s);
+    switch(ret){
+    case 0: // detected button A. Reached gate
+        break;
+    case 1: // day/night change happened.
+        if (wildzone == Location::WILD_ZONE_1 && 
+            get_angle_between_facing_directions(starting_direction, get_facing_direction(env.console, context)) > 2.5){
+            joystick_x = 0; // we've already turned. Just need to go forward to enter the zone
+        }
+        ret = run_towards_gate_with_A_button(env.console, context, joystick_x, +1, 10s);
+        if (ret != 0){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "go_to_entrance(): Cannot reach gate from outside after day/night change.",
+                env.console
+            );
+        }
+        break;
+    default:
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "go_to_entrance(): Cannot reach gate from outside.",
+            env.console
+        );
+    }
+}
+
+
+void fast_travel_outside_zone(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    Location wild_zone,
+    bool to_max_zoom_level_on_map,
+    std::string extra_error_msg = "",
+    bool map_already_opened = false
+){
+    if (!map_already_opened){
+        if (!open_map(env.console, context, to_max_zoom_level_on_map, true)){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "fast_travel_outside_zone(): Fast travel disabled from supposedly outside the entrance." + extra_error_msg,
+                env.console
+            );
+        }
+    }
+
+    move_map_cursor_from_entrance_to_zone(env.console, context, wild_zone);
+
+    FastTravelState travel_status = fly_from_map(env.console, context);
+    if (travel_status != FastTravelState::SUCCESS){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "fast_travel_outside_zone(): After moving map cursor, cannot fast travel to the zone." + extra_error_msg,
+            env.console
+        );
+    }
+}
+
+
+// Go back to zone entrance by fast travel if possible or by running backwards
+// if under attack by wild pokemon.
+// After leaving the gate, do a fast travel to the current zone to reset spawns.
+//
+// This is called by do_one_wild_zone_trip() at end of a trip, or by
+// program() when a shiny sound is detected.
+//
+// The function handles day/night changes on its own.
+// TODO: day/night change handling is still under development
+//
+// Note: day/night change can happen at any time, including when the player
+// character is pressing A to enter the zone. When this happens, the button
+// press is eaten and the character will be still outside the zone.
+// leave_zone_and_reset_spawns() also handles this case.
+void leave_zone_and_reset_spawns(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    Milliseconds walk_time_in_zone,
+    Location wild_zone,
+    ShinySoundHandler& shiny_sound_handler,
+    bool to_max_zoom_level_on_map
+){
+    ShinyHunt_WildZoneEntrance_Descriptor::Stats& stats = env.current_stats<ShinyHunt_WildZoneEntrance_Descriptor::Stats>();
+
+    AlertEyeDetector alert_eye_detector(COLOR_WHITE, &env.console.overlay());
+    auto latest_frame = env.console.video().snapshot_latest_blocking();
+    // if there is the alert symbol of a white eye telling player they are being chased by wild pokmeon
+    const bool has_alert_eye = latest_frame ? alert_eye_detector.detect(latest_frame): false;
+
+    if (!has_alert_eye){
+        // we are not being chased by wild pokemon. Try to fast travel back to entrance.
+
+        // Open map is robust against day/night change. So after open_map()
+        // we are sure we are in map view
+        FastTravelState travel_status = open_map_and_fly_in_place(env.console, context, to_max_zoom_level_on_map);
+        // since we have set up max zoom now, we don't need to do that again when calling fast_travel_outside_zone() later
+        to_max_zoom_level_on_map = false;
+        if (travel_status == FastTravelState::SUCCESS){
+            // we were in the zone and now successfully travel back to entrance
+            env.log("Leave zone successfully by fast travel");
+            return;
+        }else if (travel_status == FastTravelState::NOT_AT_FLY_SPOT){
+            // we cannot fast travel at current location. This means we are actually outside
+            // the wild zone!
+            // Assume we are still outside the entrance, probably due to the mashing A to enter
+            // zone button press was eaten by a day/night change.
+            
+            env.log("Not at fly spot now, probably still outside zone at entrance.");
+            env.console.overlay().add_log("Still at Entrance");
+
+            // From zone entrance, fast travel back to the zone entrance
+            // to reset player character orientation
+            move_map_cursor_from_entrance_to_zone(env.console, context, wild_zone);
+
+            travel_status = fly_from_map(env.console, context);
+            if (travel_status != FastTravelState::SUCCESS){
+                OperationFailedExceptionWithScreenshot::fire(
+                    ErrorReportMode::SEND_ERROR_REPORT,
+                    "leave_zone_and_reset_spawns(): Cannot fast travel to zone from outside the entrance.",
+                    env.console
+                );
+            }
+            env.log("Fast travel after failed to enter zone by day/night change");
+            return;
+        }
+
+        // travel_status == FastTravelState::PURSUED, we are being attacked by wild pokemon.
+        // mash B to close map and return to overworld
+        map_to_overworld(env.console, context);
+        // if (STATIC_GLOBALS.DEVELOPER_MODE){
+        //     dump_debug_image(env.console, "AlertEyeDetector", "FalseNegative", latest_frame);
+        // }
+    }
+   
+    stats.chased++;
+    env.update_stats();
+
+    walk_time_in_zone += 2s; // give some extra time
+    env.log("Escaping");
+    env.console.overlay().add_log("Escaping Back to Entrance");
+    
+    const double starting_direction = get_facing_direction(env.console, context);
+
+    int ret = run_towards_gate_with_A_button(env.console, context, 0, -1, walk_time_in_zone);
+    switch (ret){
+    case 0: // Found button A. Reached the gate.
+        break;
+    case 1: // Day/night change happened.
+        {
+            const double cur_direction = get_facing_direction(env.console, context);
+            const double direction_change = get_angle_between_facing_directions(starting_direction, cur_direction);
+            env.log("Facing direction difference after day/night change: " + tostr_fixed(direction_change, 0) + " deg, from "
+                + tostr_fixed(starting_direction, 0) + " to " + tostr_fixed(cur_direction, 0) + " deg");
+            
+            double joystick_y = +1;
+            if (direction_change > 150.0){
+                // we are facing towards the gate
+                env.log("Running forward");
+                env.console.overlay().add_log("Running Forward");
+                joystick_y = +1;
+            }else if(direction_change < 30.0){
+                // we are facing away from the gate
+                env.log("Running back");
+                env.console.overlay().add_log("Running Back");
+                joystick_y = -1;
+            }else{
+                OperationFailedExceptionWithScreenshot::fire(
+                    ErrorReportMode::SEND_ERROR_REPORT,
+                    "leave_zone_and_reset_spawns(): Facing direction after day/night change is wrong: " + tostr_fixed(direction_change, 0) + " deg",
+                    env.console
+                );
+            }
+
+            // Running forward or backward depends on character facing to go back to zone entrance
+            ret = run_towards_gate_with_A_button(env.console, context, 0, joystick_y, walk_time_in_zone);
+            if (ret != 0){
+                stats.errors++;
+                env.update_stats();
+                throw UserSetupError(
+                    env.logger(),
+                    "Program stuck in the zone while escaping from wild pokemon. "
+                    "Pick a path that won't get you stuck by terrain or obstacles."
+                );
+            }
+        }
+        break;
+    default:
+        stats.errors++;
+        env.update_stats();
+        throw UserSetupError(
+            env.logger(),
+            "Program stuck in the zone while escaping from wild pokemon. "
+            "Pick a path that won't get you stuck by terrain or obstacles."
+        );
+    }
+    shiny_sound_handler.process_pending(context);
+
+    // Found button A, so we are at the entrance.
+    // Mash A to leave Zone.
+
+    std::string extra_eror_msg = " This is after leaving zone.";
+
+    // Due to day/night change may eating the mashing button A sequence, we may still be inside the zone!
+    // We need to check if we can fast travel 
+    if (leave_zone_gate(env.console, context)){
+        shiny_sound_handler.process_pending(context);
+        // Do a fast travel outside the gate to reset spawns
+        fast_travel_outside_zone(env, context, wild_zone, to_max_zoom_level_on_map, std::move(extra_eror_msg));
+        return;
+    }
+
+    // there is a day/night change while leaving the zone. We don't know if we are still inside the zone.
+    //
+    // We can't call leave_zone_gate() again because at Wild Zone 4 there are npcs outside the gate that can
+    // press A to talk to. If the program can get stuck into talking to the npc.
+
+    FastTravelState travel_status = open_map_and_fly_in_place(env.console, context, to_max_zoom_level_on_map);
+    if (travel_status == FastTravelState::SUCCESS){
+        // We can fast travel and we fast traveled. This means we were inside the gate but now safe.
+        env.log("We fast traveled. We were inside the gate but now safe for next trip");
+        return;
+    }else if(travel_status == FastTravelState::NOT_AT_FLY_SPOT){
+        env.log("We cannot fast travel in place. We left zone successfully");
+        // we cannot fast travel at current location. So we have left the zone!
+        // Fast travel to the zone gate to reset spawn
+        const bool map_already_opened = true;
+        fast_travel_outside_zone(env, context, wild_zone, to_max_zoom_level_on_map,
+            std::move(extra_eror_msg), map_already_opened);
+        return;
+    }
+    // We cannot fast travel: we are still being chased by wild pokemon
+    env.log("We cannot fast travel. Still chased by pokemon");
+    
+    // Mash B to close map and return to overworld
+    map_to_overworld(env.console, context);
+    // Mash A to leave zone gate
+    env.log("Mashing A again to leave zone");
+    leave_zone_gate(env.console, context);
+    shiny_sound_handler.process_pending(context);
+    // Do a fast travel outside the gate to reset spawns
+    env.log("Finally, we should have left the zone");
+    fast_travel_outside_zone(env, context, wild_zone, to_max_zoom_level_on_map, std::move(extra_eror_msg));
+}
+
+// After fast travel back to a wild zone, go through entrance and move forward.
+// Then call `leave_zone_and_reset_spawns()` to leave zone and reset the spawns
+//
+// The part of moving into zone is robust against day/night change while
+// `leave_zone_and_reset_spawns()` will handle the day/night change there.
+//
+// movement_mode:
+// 0: No movement between fast travel. Always outside gate. Safe from wild pokemon
+// 1: Approach the gate but don't enter. Always outside gate. Safe from wild pokemon
+// 2: Enter gate and may go deep based on `walk_time_in_zone` and `running`. Not safe.
+void do_one_wild_zone_trip(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    size_t movement_mode,
+    Milliseconds walk_time_in_zone,
+    bool running,
+    Location wild_zone,
+    ShinySoundHandler& shiny_sound_handler,
+    bool to_max_zoom_level_on_map
+){
+    env.log("Starting one wild zone trip");
+    ShinyHunt_WildZoneEntrance_Descriptor::Stats& stats = env.current_stats<ShinyHunt_WildZoneEntrance_Descriptor::Stats>();
+    context.wait_for_all_requests();
+    shiny_sound_handler.process_pending(context);
+
+    if (movement_mode >= 1){
+        go_to_entrance(env, context, wild_zone);
+        context.wait_for_all_requests();
+        shiny_sound_handler.process_pending(context);
+    }
+    if (movement_mode == 2){
+        // Mash button A to enter the zone.
+        pbf_mash_button(context, BUTTON_A, 2000ms);
+        context.wait_for_all_requests();
+
+        // Wait for the overworld party view to be back. That is when
+        // the player is given control again after the entering gate animation.
+        // We use 50s here to account for day night change
+        wait_until_overworld(env.console, context, 50s);
+        env.console.log("Detected overworld after entering zone.");
+
+        shiny_sound_handler.process_pending(context);
+        // Day/night change can happen before or after the button A mash, so we are not
+        // sure if we are in the zone or not! But at end of the travel we will fast
+        // travel back to entrance and have a way to work on both cases.
+        // move forward
+        if (walk_time_in_zone > Milliseconds::zero()){
+            if (running){
+                env.console.overlay().add_log("Running");
+                ssf_press_button(context, BUTTON_B, 0ms, walk_time_in_zone, 0ms);
+            }else{
+                env.console.overlay().add_log("Walking");
+            }
+            pbf_move_left_joystick(context, {0, +1}, walk_time_in_zone, 200ms);
+        }
+        context.wait_for_all_requests();
+        shiny_sound_handler.process_pending(context);
+    }
+
+    if (movement_mode <= 1){
+        // we are not in the zone. so no wild pokemon handling!
+        fast_travel_outside_zone(env, context, wild_zone, to_max_zoom_level_on_map);
+    }else{
+        leave_zone_and_reset_spawns(
+            env, context,
+            walk_time_in_zone, wild_zone,
+            shiny_sound_handler,
+            to_max_zoom_level_on_map
+        );
+    }
+
+    // Now if everything works fine, we are back at the entrance via a fast travel
+
+    stats.visits++;
+    env.update_stats();
+}
+
+
+void ShinyHunt_WildZoneEntrance::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    assert_16_9_720p_min(env.logger(), env.console);
+
+    //  Record when we should zoom out the map for flyable fast travel icon
+    //  detection on map during fast traveling.
+    bool to_max_zoom_level_on_map = true;
+
+    //  Connect the controller.
+    require_player(env.console, context, BUTTON_B);
+
+    //  Detect direction arrow to test the detector
+    //  m_starting_angle = get_current_facing_angle(env, context);
+
+    ShinyHunt_WildZoneEntrance_Descriptor::Stats& stats = env.current_stats<ShinyHunt_WildZoneEntrance_Descriptor::Stats>();
+
+    ShinySoundHandler shiny_sound_handler(SHINY_DETECTED);
+
+    PokemonLA::ShinySoundDetector shiny_detector(env.console, [&](float error_coefficient) -> bool {
+        //  Warning: This callback will be run from a different thread than this function.
+        stats.shinies++;
+        env.update_stats();
+        env.console.overlay().add_log("Shiny Sound Detected!", COLOR_YELLOW);
+       
+        return shiny_sound_handler.on_shiny_sound(
+            env, env.console,
+            stats.shinies,
+            error_coefficient
+        );
+    });
+
+    int consecutive_failures = 0;
+    run_until<ProControllerContext>(
+        env.console, context,
+        [&](ProControllerContext& context){
+            while (true){
+                try{
+                    do_one_wild_zone_trip(
+                        env, context, 
+                        MOVEMENT.current_value(), WALK_TIME_IN_ZONE, RUNNING, WILD_ZONE,
+                        shiny_sound_handler,
+                        to_max_zoom_level_on_map
+                    );
+                    // Fast travel auto saves the game. So now the map is fixed at max zoom level.
+                    // We no longer needs to zoom in future.
+                    to_max_zoom_level_on_map = false;
+
+                    // No failure. Reset consecutive failure counter.
+                    consecutive_failures = 0;
+                }catch (OperationFailedException&){
+                    consecutive_failures++;
+                    env.log("Consecutive failures: " + std::to_string(consecutive_failures), COLOR_RED);
+                    if (consecutive_failures >= 3){
+                        if (STATIC_GLOBALS.DEVELOPER_MODE && GlobalSettings::instance().SAVE_DEBUG_VIDEOS_ON_SWITCH){
+                            env.log("Saving debug video on Switch...");
+                            env.console.overlay().add_log("Save Debug Video on Switch");
+                            pbf_press_button(context, BUTTON_CAPTURE, 2000ms, 0ms);
+                            context.wait_for_all_requests();
+                        }
+                        go_home(env.console, context); // go Home to preserve game state for debugging
+                        throw;
+                    }
+                    env.log("Error encountered. Resetting...", COLOR_RED);
+                    stats.game_resets++;
+                    stats.errors++;
+                    env.update_stats();
+                    env.console.overlay().add_log("Error Found. Reset Game", COLOR_RED);
+                    go_home(env.console, context);
+                    reset_game_from_home(env, env.console, context);
+                    to_max_zoom_level_on_map = true; // map zoom level reset after game reset
+                }
+                send_program_status_notification(env, NOTIFICATION_STATUS);
+            }
+        },
+        {{shiny_detector}}
+    );
+    
+    //  Shiny sound detected and user requested stopping the program when
+    //  detected shiny sound.
+    shiny_sound_handler.process_pending(context);
+
+    go_home(env.console, context);
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+}
+
+
+}  // namespace PokemonAutomation::NintendoSwitch::PokemonLZA
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_WildZoneEntrance.h b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_WildZoneEntrance.h
new file mode 100644
index 0000000000..1ee0fe4f43
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_WildZoneEntrance.h
@@ -0,0 +1,61 @@
+/*  Shiny Hunt - Wild Zone Entrance
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLZA_WildZoneEntrance_H
+#define PokemonAutomation_PokemonLZA_WildZoneEntrance_H
+
+#include "Common/Cpp/Options/EnumDropdownOption.h"
+//#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "VideoGames/PokemonLA/Options/PokemonLA_ShinyDetectedAction.h"
+#include "VideoGames/PokemonLZA/Options/PokemonLZA_ShinyDetectedAction.h"
+#include "VideoGames/PokemonLZA/Resources/PokemonLZA_Locations.h"
+
+namespace PokemonAutomation::NintendoSwitch::PokemonLZA {
+
+
+class WildZoneOption : public EnumDropdownOption<Location>{
+public:
+    WildZoneOption();
+};
+
+
+class ShinyHunt_WildZoneEntrance_Descriptor : public SingleSwitchProgramDescriptor {
+public:
+    ShinyHunt_WildZoneEntrance_Descriptor();
+
+    class Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+
+class ShinyHunt_WildZoneEntrance : public SingleSwitchProgramInstance, public ConfigOption::Listener{
+public:
+    using Descriptor = ShinyHunt_WildZoneEntrance_Descriptor;
+    ShinyHunt_WildZoneEntrance();
+
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    virtual void on_config_value_changed(void* object) override;
+
+    WildZoneOption WILD_ZONE;
+    IntegerEnumDropdownOption MOVEMENT;
+
+    PokemonLA::ShinyRequiresAudioText SHINY_REQUIRES_AUDIO;
+    MillisecondsOption WALK_TIME_IN_ZONE;
+    BooleanCheckBoxOption RUNNING;
+
+    ShinySoundDetectedActionOption SHINY_DETECTED;
+
+    EventNotificationOption NOTIFICATION_STATUS;
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+
+}  // namespace PokemonAutomation::NintendoSwitch::PokemonLZA
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/TestPrograms/PokemonLZA_MoveBoxArrow.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/TestPrograms/PokemonLZA_MoveBoxArrow.cpp
new file mode 100644
index 0000000000..c1e96bc484
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/TestPrograms/PokemonLZA_MoveBoxArrow.cpp
@@ -0,0 +1,86 @@
+/*  Move Box Arrow
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonTools/StartupChecks/VideoResolutionCheck.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonLZA/Inference/Boxes/PokemonLZA_BoxDetection.h"
+#include "PokemonLZA_MoveBoxArrow.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+using namespace Pokemon;
+
+
+MoveBoxArrow_Descriptor::MoveBoxArrow_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonLZA:MoveBoxArrow",
+        STRING_POKEMON + " LZA", "Move Box Arrow",
+        "",
+        "Test program to move the box cursor to a specified location. "
+        "Used for debugging box cursor movement. "
+        "Start this program while in the box system view.",
+        PanelQualityStanding::DEVELOPER,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::ENABLE_COMMANDS
+    )
+{}
+
+
+MoveBoxArrow::MoveBoxArrow()
+    : TARGET_ROW(
+        "<b>Target Row:</b><br>Row to move cursor to (0 = party row, 1-5 = box rows).",
+        LockMode::LOCK_WHILE_RUNNING,
+        0, 0, 5
+    )
+    , TARGET_COL(
+        "<b>Target Column:</b><br>Column to move cursor to (0-5).",
+        LockMode::LOCK_WHILE_RUNNING,
+        0, 0, 5
+    )
+{
+    PA_ADD_OPTION(TARGET_ROW);
+    PA_ADD_OPTION(TARGET_COL);
+}
+
+
+void MoveBoxArrow::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    assert_16_9_720p_min(env.logger(), env.console);
+
+    env.log("Starting Move Box Arrow test program...");
+    env.log("Target position: Row " + std::to_string(TARGET_ROW) + ", Col " + std::to_string(TARGET_COL));
+
+    // Create box detector
+    BoxDetector detector(COLOR_RED, &env.console.overlay());
+
+    // Detect current position
+    VideoSnapshot screen = env.console.video().snapshot();
+    detector.detect(screen);
+    BoxCursorCoordinates current = detector.detected_location();
+
+    if (current.row == BoxCursorCoordinates::INVALID || current.col == BoxCursorCoordinates::INVALID){
+        env.log("Failed to detect box cursor. Make sure you are in the box system view!", COLOR_RED);
+        return;
+    }
+
+    env.log("Current position: Row " + std::to_string(current.row) + ", Col " + std::to_string(current.col), COLOR_BLUE);
+
+    // Move cursor to target position
+    env.log("Moving cursor to target position...", COLOR_PURPLE);
+    detector.move_cursor(env.program_info(), env.console, context, TARGET_ROW, TARGET_COL);
+
+    env.log("Cursor movement complete!", COLOR_GREEN);
+}
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/TestPrograms/PokemonLZA_MoveBoxArrow.h b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/TestPrograms/PokemonLZA_MoveBoxArrow.h
new file mode 100644
index 0000000000..c2c71350bc
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/TestPrograms/PokemonLZA_MoveBoxArrow.h
@@ -0,0 +1,42 @@
+/*  Move Box Arrow
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLZA_MoveBoxArrow_H
+#define PokemonAutomation_PokemonLZA_MoveBoxArrow_H
+
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+
+class MoveBoxArrow_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    MoveBoxArrow_Descriptor();
+};
+
+
+class MoveBoxArrow : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = MoveBoxArrow_Descriptor;
+    MoveBoxArrow();
+
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    SimpleIntegerOption<uint8_t> TARGET_ROW;
+    SimpleIntegerOption<uint8_t> TARGET_COL;
+};
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/TestPrograms/PokemonLZA_OverworldWatcher.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/TestPrograms/PokemonLZA_OverworldWatcher.cpp
new file mode 100644
index 0000000000..64ecb4da17
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/TestPrograms/PokemonLZA_OverworldWatcher.cpp
@@ -0,0 +1,73 @@
+/*  Shiny Hunt - Overworld Watcher
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonTools/Async/InferenceSession.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonLZA/Inference/PokemonLZA_SelectionArrowDetector.h"
+#include "VideoGames/PokemonLZA/Inference/PokemonLZA_DialogDetector.h"
+#include "VideoGames/PokemonLZA/Inference/PokemonLZA_ButtonDetector.h"
+#include "VideoGames/PokemonLZA/Inference/Battles/PokemonLZA_MoveEffectivenessSymbol.h"
+#include "PokemonLZA_OverworldWatcher.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+using namespace Pokemon;
+
+
+OverworldWatcher_Descriptor::OverworldWatcher_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonLZA:OverworldWatcher",
+        STRING_POKEMON + " LZA", "Overworld Watcher",
+        "",
+        "This is a test program that simply observes the game and labels things of interest. "
+        "This program doesn't really do anything.",
+        PanelQualityStanding::DEVELOPER,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::ENABLE_COMMANDS
+    )
+{}
+
+
+OverworldWatcher::OverworldWatcher(){}
+
+
+void OverworldWatcher::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+
+    VideoOverlay& overlay = env.console.overlay();
+
+    FlatWhiteDialogWatcher dialog_white(COLOR_RED, &overlay);
+    BlueDialogWatcher dialog_blue(COLOR_RED, &overlay);
+    TealDialogWatcher dialog_teal(COLOR_RED, &overlay);
+    SelectionArrowWatcher selection_arrow_right(COLOR_RED, &overlay, SelectionArrowType::RIGHT, {0, 0, 1, 1});
+    SelectionArrowWatcher selection_arrow_down(COLOR_RED, &overlay, SelectionArrowType::DOWN, {0, 0, 1, 1});
+    ButtonWatcher buttonA(COLOR_RED, ButtonType::ButtonA, {0, 0, 1, 1}, &overlay);
+    MoveEffectivenessSymbolWatcher battle_menu(COLOR_RED, &overlay);
+
+    CancellableHolder<CancellableScope> scope(*context.scope());
+    InferenceSession session(
+        scope, env.console,
+        {
+            dialog_white,
+            dialog_blue,
+            dialog_teal,
+            selection_arrow_right,
+            selection_arrow_down,
+            buttonA,
+            battle_menu,
+        }
+    );
+    context.wait_until_cancel();
+}
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/TestPrograms/PokemonLZA_OverworldWatcher.h b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/TestPrograms/PokemonLZA_OverworldWatcher.h
new file mode 100644
index 0000000000..69a21d5160
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/TestPrograms/PokemonLZA_OverworldWatcher.h
@@ -0,0 +1,38 @@
+/*  Overworld Watcher
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLZA_OverworldWatcher_H
+#define PokemonAutomation_PokemonLZA_OverworldWatcher_H
+
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+
+class OverworldWatcher_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    OverworldWatcher_Descriptor();
+};
+
+
+class OverworldWatcher : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = OverworldWatcher_Descriptor;
+    OverworldWatcher();
+
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+};
+
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/TestPrograms/PokemonLZA_TestBoxCellInfo.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/TestPrograms/PokemonLZA_TestBoxCellInfo.cpp
new file mode 100644
index 0000000000..5816b2ccb8
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/TestPrograms/PokemonLZA_TestBoxCellInfo.cpp
@@ -0,0 +1,139 @@
+/*  Test Box Cell Info
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+//#include <iostream>
+#include <sstream>
+#include "CommonTools/StartupChecks/VideoResolutionCheck.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonLZA/Inference/Boxes/PokemonLZA_BoxDetection.h"
+#include "VideoGames/PokemonLZA/Inference/Boxes/PokemonLZA_BoxInfoDetector.h"
+#include "PokemonLZA_TestBoxCellInfo.h"
+
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+using namespace Pokemon;
+
+
+TestBoxCellInfo_Descriptor::TestBoxCellInfo_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonLZA:TestBoxCellInfo",
+        STRING_POKEMON + " LZA", "Test Box Cell Info",
+        "",
+        "Test program to check inference on pokemon info in box system. "
+        "Move around on box cells while running the pokemon. Log overlay will show current selected cell and pokemon info of the cell.",
+        PanelQualityStanding::DEVELOPER,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::ENABLE_COMMANDS
+    )
+{}
+
+
+TestBoxCellInfo::TestBoxCellInfo(){}
+
+
+// A watcher that keeps shows current box cell info
+class TestBoxCellInfoWatcher : public VisualInferenceCallback{
+public:
+    TestBoxCellInfoWatcher(SingleSwitchProgramEnvironment& env, Color color = COLOR_RED, VideoOverlay* overlay = nullptr)
+    : VisualInferenceCallback("TestBoxCellInfoWatcher")
+    , m_box_detector(color, overlay)
+    , m_sth_in_cell_detector(color, overlay)
+    , m_info_watcher(overlay)
+    , m_env(env)
+    {}
+
+    virtual ~TestBoxCellInfoWatcher(){}
+
+    virtual void make_overlays(VideoOverlaySet& items) const override{
+        m_box_detector.make_overlays(items);
+        m_sth_in_cell_detector.make_overlays(items);
+        m_info_watcher.make_overlays(items);
+    }
+    virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override{
+        bool box_cursor_found = m_box_detector.process_frame(frame, timestamp);
+        if (!box_cursor_found){
+            return false; // not in box view
+        }
+
+        auto coord = m_box_detector.detected_location();
+        if (coord.row != m_last_row || coord.col != m_last_col){
+            // cout << "selected cell location moved: (" << int(m_last_row) << ", " << int(m_last_col)
+            //      << ") -> (" << int(coord.row) << ", " << int(coord.col) << ")"
+            //      << " need to update log" << endl;
+            m_last_row = coord.row;
+            m_last_col = coord.col;
+
+            // we are in a new cell, reset detectors. Prepare to update log once determined info on the new cell
+            m_sth_in_cell_detector.reset_state();
+            m_info_watcher.reset_state();
+            m_need_to_update_log_once_determined = true;
+        }
+
+        bool sth_in_cell_determined = m_sth_in_cell_detector.process_frame(frame, timestamp);
+        bool is_info_determined = m_info_watcher.process_frame(frame, timestamp);
+
+        
+
+        // detector is not determined, this means sth may have changed, we need to update the log
+        if (!sth_in_cell_determined || !is_info_determined){
+            // cout << "sth not determined! need to update log" << endl;
+            // cout << "box cursor found? " << box_cursor_found << " sth in cell determined? " << sth_in_cell_determined
+            //      << " shiny determined? " << is_shiny_determined << " alpha determined? " << is_alpha_determined << endl;
+            m_need_to_update_log_once_determined = true;
+        }
+
+        if (m_need_to_update_log_once_determined && sth_in_cell_determined && is_info_determined){
+            bool sth_in_cell = m_sth_in_cell_detector.consistent_result();
+
+            std::ostringstream os;
+            os << "Cell (" << int(m_last_row) << ", " << int(m_last_col) << ") ";
+            if (!sth_in_cell){
+                os << "Empty";
+            }else{
+                os << m_info_watcher.info_str() << " Pokemon"; 
+            }
+            m_env.console.overlay().add_log(os.str());
+            m_need_to_update_log_once_determined = false;
+        }
+
+        return false;
+    }
+
+
+protected:
+    uint8_t m_last_row = BoxCursorCoordinates::INVALID;
+    uint8_t m_last_col = BoxCursorCoordinates::INVALID;
+    BoxWatcher m_box_detector;
+    SomethingInBoxCellWatcher m_sth_in_cell_detector;
+    BoxPageInfoWatcher m_info_watcher;
+    SingleSwitchProgramEnvironment& m_env;
+    bool m_need_to_update_log_once_determined = true;
+};
+
+
+void TestBoxCellInfo::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    assert_16_9_720p_min(env.logger(), env.console);
+
+    env.log("Starting Test Box Cell Info test program...");
+
+    TestBoxCellInfoWatcher watcher(env);
+
+    wait_until(env.console, context, WallClock::max(), {watcher});
+}
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/TestPrograms/PokemonLZA_TestBoxCellInfo.h b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/TestPrograms/PokemonLZA_TestBoxCellInfo.h
new file mode 100644
index 0000000000..7367be88b5
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/TestPrograms/PokemonLZA_TestBoxCellInfo.h
@@ -0,0 +1,37 @@
+/*  Test Box Cell Info
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLZA_TestBoxCellInfo_H
+#define PokemonAutomation_PokemonLZA_TestBoxCellInfo_H
+
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+
+class TestBoxCellInfo_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    TestBoxCellInfo_Descriptor();
+};
+
+
+class TestBoxCellInfo : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = TestBoxCellInfo_Descriptor;
+    TestBoxCellInfo();
+
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+};
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Trading/PokemonLZA_SelfBoxTrade.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Trading/PokemonLZA_SelfBoxTrade.cpp
new file mode 100644
index 0000000000..1a00d6c9a4
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Trading/PokemonLZA_SelfBoxTrade.cpp
@@ -0,0 +1,138 @@
+/*  Self Box Trade
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonTools/StartupChecks/VideoResolutionCheck.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+//#include "Pokemon/Inference/Pokemon_NameReader.h"
+#include "PokemonLZA_TradeRoutines.h"
+#include "PokemonLZA_SelfBoxTrade.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+using namespace Pokemon;
+
+
+
+
+SelfBoxTrade_Descriptor::SelfBoxTrade_Descriptor()
+    : MultiSwitchProgramDescriptor(
+        "PokemonLZA:SelfBoxTrade",
+        STRING_POKEMON + " LZA", "Self Box Trade",
+        "Programs/PokemonLZA/SelfBoxTrade.html",
+        "Trade boxes across two Switches.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS,
+        2, 2, 2
+    )
+{}
+
+std::unique_ptr<StatsTracker> SelfBoxTrade_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new TradeStats());
+}
+
+
+
+SelfBoxTrade::SelfBoxTrade()
+#if 0
+    : LANGUAGE_LEFT(
+        "<b>Game Language of Left Switch:</b>",
+        Pokemon::PokemonNameReader::instance().languages(),
+        LockMode::LOCK_WHILE_RUNNING,
+        true
+    )
+    , LANGUAGE_RIGHT(
+        "<b>Game Language of Right Switch:</b>",
+        Pokemon::PokemonNameReader::instance().languages(),
+        LockMode::LOCK_WHILE_RUNNING,
+        true
+#endif
+    : BOXES_TO_TRADE(
+        "<b>Number of Boxes to Trade:</b>",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        2, 0, 32
+    )
+    , START_ROW(
+        "<b>Starting Row of 1st Box:</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        1, 1, 5
+    )
+    , START_COL(
+        "<b>Starting Column of 1st Box:</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        1, 1, 6
+    )
+#if 0
+    , SKIP_TRADE_EVOLUTIONS(
+        "<b>Skip Trade Evolutions:</b>",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        true
+#endif
+    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_STATUS_UPDATE,
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+{
+//    PA_ADD_OPTION(LANGUAGE_LEFT);
+//    PA_ADD_OPTION(LANGUAGE_RIGHT);
+    PA_ADD_OPTION(BOXES_TO_TRADE);
+    PA_ADD_OPTION(START_ROW);
+    PA_ADD_OPTION(START_COL);
+//    PA_ADD_OPTION(SKIP_TRADE_EVOLUTIONS);
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+void SelfBoxTrade::program(MultiSwitchProgramEnvironment& env, CancellableScope& scope){
+    env.run_in_parallel<ProController>(
+        scope,
+        [](ConsoleHandle& console, ProControllerContext& context){
+            assert_16_9_720p_min(console, console);
+
+            //  Connect the controller.
+            require_player(console, context, BUTTON_LCLICK);
+        }
+    );
+
+    TradeStats& stats = env.current_stats<TradeStats>();
+    env.update_stats();
+
+    uint8_t start_row = START_ROW - 1;
+    uint8_t start_col = START_COL - 1;
+
+    for (uint8_t box = 0; box < BOXES_TO_TRADE; box++){
+        if (box != 0){
+            env.run_in_parallel<ProController>(scope, [](ConsoleHandle& console, ProControllerContext& context){
+                pbf_press_button(context, BUTTON_R, 480ms, 800ms);
+            });
+        }
+        trade_current_box(env, scope, NOTIFICATION_STATUS_UPDATE, stats, start_row, start_col);
+        start_row = 0;
+        start_col = 0;
+    }
+
+    env.update_stats();
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+}
+
+
+
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Trading/PokemonLZA_SelfBoxTrade.h b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Trading/PokemonLZA_SelfBoxTrade.h
new file mode 100644
index 0000000000..bd04469f80
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Trading/PokemonLZA_SelfBoxTrade.h
@@ -0,0 +1,70 @@
+/*  Self Box Trade
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLZA_SelfBoxTrade_H
+#define PokemonAutomation_PokemonLZA_SelfBoxTrade_H
+
+//#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+//#include "CommonTools/Options/LanguageOCROption.h"
+#include "NintendoSwitch/NintendoSwitch_MultiSwitchProgram.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+
+
+class SelfBoxTrade_Descriptor : public MultiSwitchProgramDescriptor{
+public:
+    SelfBoxTrade_Descriptor();
+
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+
+
+
+
+
+
+class SelfBoxTrade : public MultiSwitchProgramInstance{
+public:
+    using Descriptor = SelfBoxTrade_Descriptor;
+    SelfBoxTrade();
+
+    virtual void program(MultiSwitchProgramEnvironment& env, CancellableScope& scope) override;
+
+private:
+    bool move_to_next(
+        MultiSwitchProgramEnvironment& env, CancellableScope& scope,
+        uint8_t& row, uint8_t& col
+    );
+
+private:
+//    OCR::LanguageOCROption LANGUAGE_LEFT;
+//    OCR::LanguageOCROption LANGUAGE_RIGHT;
+
+    SimpleIntegerOption<uint8_t> BOXES_TO_TRADE;
+
+    SimpleIntegerOption<uint8_t> START_ROW;
+    SimpleIntegerOption<uint8_t> START_COL;
+
+//    BooleanCheckBoxOption SKIP_TRADE_EVOLUTIONS;
+
+    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Trading/PokemonLZA_TradeRoutines.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Trading/PokemonLZA_TradeRoutines.cpp
new file mode 100644
index 0000000000..ebc7d96ca7
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Trading/PokemonLZA_TradeRoutines.cpp
@@ -0,0 +1,185 @@
+/*  Trade Routines
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+//#include "CommonFramework/Exceptions/OperationFailedException.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "VideoGames/PokemonLZA/Inference/PokemonLZA_SelectionArrowDetector.h"
+#include "VideoGames/PokemonLZA/Inference/PokemonLZA_DialogDetector.h"
+#include "VideoGames/PokemonLZA/Inference/Boxes/PokemonLZA_BoxDetection.h"
+#include "PokemonLZA_TradeRoutines.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+
+
+
+TradeStats::TradeStats()
+    : trades(m_stats["Trades"])
+    , skipped(m_stats["Skipped"])
+    , errors(m_stats["Errors"])
+{
+    m_display_order.emplace_back("Trades");
+    m_display_order.emplace_back("Skipped", HIDDEN_IF_ZERO);
+    m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+}
+
+
+
+#if 0
+class SelectedDetector : public StaticScreenDetector{
+public:
+    virtual void make_overlays(VideoOverlaySet& items) const override{
+        m_cursor.make_overlays(items);
+        m_slot.make_overlays(items);
+    }
+    virtual bool detect(const ImageViewRGB32& screen) override{
+        bool cursor_ok = m_cursor.detect(screen);
+        bool slot_ok = m_slot.detect(screen);
+//        cout << "cursor = " << cursor_ok << ", slot_ok = " << slot_ok << endl;
+        return cursor_ok && slot_ok;
+    }
+
+private:
+
+    Selection
+};
+#endif
+
+
+
+
+
+bool trade_current_pokemon(
+    VideoStream& stream, ProControllerContext& context,
+    MultiConsoleErrorState& tracker,
+    TradeStats& stats
+){
+    tracker.check_unrecoverable_error(stream.logger());
+    context.wait_for_all_requests();
+
+    //  Make sure there is something to trade.
+    {
+        SomethingInBoxCellDetector detector(COLOR_CYAN, &stream.overlay());
+        if (!detector.detect(stream.video().snapshot())){
+            stats.errors++;
+            tracker.report_unrecoverable_error(stream, "Box slot is empty.");
+        }
+    }
+
+
+    bool traded = false;
+
+    while (true){
+        BoxWatcher box(COLOR_RED, &stream.overlay());
+        SelectionArrowWatcher selection(
+            COLOR_GREEN,
+            &stream.overlay(),
+            SelectionArrowType::RIGHT,
+            {0.052894, 0.315615, 0.246422, 0.522702}
+        );
+        SelectionArrowWatcher confirm(
+            COLOR_BLUE,
+            &stream.overlay(),
+            SelectionArrowType::RIGHT,
+            {0.586808, 0.568106, 0.401369, 0.231451}
+        );
+        BlueDialogWatcher blue_dialog(COLOR_YELLOW, &stream.overlay());
+
+        context.wait_for_all_requests();
+        int ret = wait_until(
+            stream, context,
+            120s,
+            {
+                box,
+                selection,
+                confirm,
+                blue_dialog,
+            }
+        );
+        tracker.check_unrecoverable_error(stream.logger());
+        context.wait_for(100ms);
+        switch (ret){
+        case 0:
+            stream.log("Detected box!");
+            if (traded){
+                return true;
+            }else{
+                pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+                pbf_press_button(context, BUTTON_A, 160ms, 80ms);
+            }
+            continue;
+
+        case 1:
+            stream.log("Detected selection.");
+            pbf_press_button(context, BUTTON_A, 160ms, 80ms);
+            continue;
+
+        case 2:
+            stream.log("Detected confirmation.");
+            pbf_press_button(context, BUTTON_A, 160ms, 80ms);
+            traded = true;
+            continue;
+
+        case 3:
+            stream.log("Detected dialog.");
+            pbf_press_button(context, BUTTON_B, 160ms, 80ms);
+            continue;
+
+        default:
+            stats.errors++;
+            tracker.report_unrecoverable_error(stream, "Failed to return to box after 2 minutes after a trade.");
+        }
+    }
+}
+
+
+void trade_current_box(
+    MultiSwitchProgramEnvironment& env, CancellableScope& scope,
+    EventNotificationOption& notifications,
+    TradeStats& stats,
+    uint8_t start_row, uint8_t start_col
+){
+    for (uint8_t row = start_row; row < 5; row++){
+        for (uint8_t col = start_col; col < 6; col++){
+            env.update_stats();
+            send_program_status_notification(env, notifications);
+
+            bool ok[2] = {false, false};
+
+            MultiConsoleErrorState error_state;
+            env.run_in_parallel<ProController>(scope, [&](ConsoleHandle& console, ProControllerContext& context){
+                VideoOverlaySet overlays(console.overlay());
+
+                BoxDetector detector(COLOR_RED, &console.overlay());
+                detector.make_overlays(overlays);
+                detector.move_cursor(env.program_info(), console, context, row + 1, col);
+
+                ok[console.index()] = trade_current_pokemon(console, context, error_state, stats);
+            });
+            if (ok[0] && ok[1]){
+                stats.trades++;
+            }else{
+                stats.skipped++;
+            }
+        }
+        start_col = 0;
+    }
+}
+
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Trading/PokemonLZA_TradeRoutines.h b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Trading/PokemonLZA_TradeRoutines.h
new file mode 100644
index 0000000000..195c982152
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Programs/Trading/PokemonLZA_TradeRoutines.h
@@ -0,0 +1,49 @@
+/*  Trade Routines
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLZA_TradeRoutines_H
+#define PokemonAutomation_PokemonLZA_TradeRoutines_H
+
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/Tools/VideoStream.h"
+#include "CommonTools/MultiConsoleErrors.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+#include "NintendoSwitch/NintendoSwitch_MultiSwitchProgram.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+
+
+struct TradeStats : public StatsTracker{
+    TradeStats();
+    std::atomic<uint64_t>& trades;
+    std::atomic<uint64_t>& skipped;
+    std::atomic<uint64_t>& errors;
+};
+
+
+
+bool trade_current_pokemon(
+    VideoStream& stream, ProControllerContext& context,
+    MultiConsoleErrorState& tracker,
+    TradeStats& stats
+);
+void trade_current_box(
+    MultiSwitchProgramEnvironment& env, CancellableScope& scope,
+    EventNotificationOption& notifications,
+    TradeStats& stats,
+    uint8_t start_row, uint8_t start_col
+);
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Resources/PokemonLZA_AvailablePokemon.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Resources/PokemonLZA_AvailablePokemon.cpp
new file mode 100644
index 0000000000..76151f8cc4
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Resources/PokemonLZA_AvailablePokemon.cpp
@@ -0,0 +1,31 @@
+/*  Available Pokemon
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Exceptions.h"
+#include "Pokemon/Resources/Pokemon_PokemonNames.h"
+#include "PokemonLZA_AvailablePokemon.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+
+
+const std::vector<std::string>& LUMIOSE_DEX_SLUGS(){
+    static const std::vector<std::string> database = Pokemon::load_pokemon_slug_json_list("Pokemon/Pokedex/Pokedex-Lumiose.json");
+    return database;
+}
+
+const std::vector<std::string>& HYPERSPACE_DEX_SLUGS(){
+    static const std::vector<std::string> database = Pokemon::load_pokemon_slug_json_list("Pokemon/Pokedex/Pokedex-Hyperspace.json");
+    return database;
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Resources/PokemonLZA_AvailablePokemon.h b/SerialPrograms/Source/VideoGames/PokemonLZA/Resources/PokemonLZA_AvailablePokemon.h
new file mode 100644
index 0000000000..d495e110e1
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Resources/PokemonLZA_AvailablePokemon.h
@@ -0,0 +1,26 @@
+/*  Available Pokemon
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLZA_AvailablePokemon_H
+#define PokemonAutomation_PokemonLZA_AvailablePokemon_H
+
+#include <string>
+#include <vector>
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+
+const std::vector<std::string>& LUMIOSE_DEX_SLUGS();
+
+const std::vector<std::string>& HYPERSPACE_DEX_SLUGS();
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Resources/PokemonLZA_DonutBerries.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Resources/PokemonLZA_DonutBerries.cpp
new file mode 100644
index 0000000000..1722abf9d1
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Resources/PokemonLZA_DonutBerries.cpp
@@ -0,0 +1,112 @@
+/*  Donut Berries
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Json/JsonValue.h"
+#include "Common/Cpp/Json/JsonArray.h"
+#include "Common/Cpp/Json/JsonObject.h"
+#include "CommonFramework/GlobalAutoPaths.h"
+#include "PokemonLZA_DonutBerries.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+
+
+std::vector<std::string> make_DONUT_BERRIES_SLUGS(){
+    std::vector<std::string> ret;
+    std::string path = RESOURCE_PATH() + "PokemonLZA/Donuts/donut_berry_list.json";
+    JsonValue json = load_json_file(path);
+    JsonArray& berry_array = json.to_array_throw(path);
+    for (const auto& obj : berry_array){
+        ret.push_back(obj.to_string_throw());
+    }
+    return ret;
+}
+const std::vector<std::string>& DONUT_BERRIES_SLUGS(){
+    static std::vector<std::string> database = make_DONUT_BERRIES_SLUGS();
+    return database;
+}
+
+
+
+struct BerryNameDatabase{
+    BerryNameDatabase();
+
+    static const BerryNameDatabase& instance(){
+        static BerryNameDatabase database;
+        return database;
+    }
+
+    std::map<std::string, DonutBerries> database;
+    std::map<std::string, std::string> m_display_name_to_slug;
+};
+BerryNameDatabase::BerryNameDatabase(){
+    {
+        std::string path = RESOURCE_PATH() + "PokemonLZA/Donuts/donut_berry_ocr.json";
+        JsonValue json = load_json_file(path);
+        JsonObject& object = json.to_object_throw(path);
+        for (const auto& language_block : object){
+            Language language = language_code_to_enum(language_block.first);
+            const JsonObject& per_language = language_block.second.to_object_throw(path);
+            for (const auto& slug : per_language){
+                const JsonArray& names = slug.second.to_array_throw(path);
+                if (names.empty()){
+                    throw JsonParseException(path, "Expected at least one name for: " + language_block.first + " : " + slug.first);
+                }
+                database[slug.first].m_display_names[language] = names[0].to_string_throw();
+            }
+        }
+        for (auto& item : database){
+            auto iter = item.second.m_display_names.find(Language::English);
+            if (iter == item.second.m_display_names.end()){
+                throw JsonParseException(path, "English not found for: " + item.first);
+            }
+            item.second.m_display_name = iter->second;
+            m_display_name_to_slug[iter->second] = item.first;
+        }
+    }
+}
+
+const DonutBerries& get_berry_name(const std::string& slug){
+    const std::map<std::string, DonutBerries>& database = BerryNameDatabase::instance().database;
+    auto iter = database.find(slug);
+    if (iter == database.end()){
+        throw InternalProgramError(
+            nullptr, PA_CURRENT_FUNCTION,
+            "Berry slug not found in database: " + slug
+        );
+    }
+    return iter->second;
+}
+
+const std::string& parse_berry_name(const std::string& display_name){
+    const std::map<std::string, std::string>& database = BerryNameDatabase::instance().m_display_name_to_slug;
+    auto iter = database.find(display_name);
+    if (iter == database.end()){
+        throw InternalProgramError(
+            nullptr, PA_CURRENT_FUNCTION,
+            "Berry name not found in database: " + display_name
+        );
+    }
+    return iter->second;
+}
+
+
+
+
+
+
+const SpriteDatabase& DONUT_BERRIES_DATABASE(){
+    static const SpriteDatabase database("PokemonLZA/Donuts/donut_berry_sheetSpritesheet.png", "PokemonLZA/Donuts/donut_berry_sheetSpritesheetData.json");
+    return database;
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Resources/PokemonLZA_DonutBerries.h b/SerialPrograms/Source/VideoGames/PokemonLZA/Resources/PokemonLZA_DonutBerries.h
new file mode 100644
index 0000000000..f362d55d64
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Resources/PokemonLZA_DonutBerries.h
@@ -0,0 +1,45 @@
+/*  Donut Berries
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLZA_Berries_H
+#define PokemonAutomation_PokemonLZA_Berries_H
+
+#include <vector>
+#include <map>
+#include "CommonFramework/Language.h"
+#include "CommonTools/Resources/SpriteDatabase.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+
+// Vector of donut berry slugs in the order as shown in-game when making donuts
+const std::vector<std::string>& DONUT_BERRIES_SLUGS();
+
+class DonutBerries{
+public:
+    const std::string& display_name() const{ return m_display_name; }
+
+private:
+    friend struct BerryNameDatabase;
+
+    std::string m_display_name;
+    std::map<Language, std::string> m_display_names;
+};
+
+const DonutBerries& get_berry_name(const std::string& slug);
+const std::string& parse_berry_name(const std::string& display_name);
+
+
+
+const SpriteDatabase& DONUT_BERRIES_DATABASE();
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Resources/PokemonLZA_DonutPowers.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Resources/PokemonLZA_DonutPowers.cpp
new file mode 100644
index 0000000000..488f25ab5f
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Resources/PokemonLZA_DonutPowers.cpp
@@ -0,0 +1,108 @@
+/*  Donut Powers
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Json/JsonValue.h"
+#include "Common/Cpp/Json/JsonArray.h"
+#include "Common/Cpp/Json/JsonObject.h"
+#include "PokemonLZA_DonutPowers.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+
+
+std::vector<std::string> make_DONUT_POWERS_SLUGS(){
+    std::vector<std::string> ret;
+    for (const auto& item : DONUT_POWERS_DATABASE()){
+        ret.emplace_back(item.first);
+    }
+    return ret;
+}
+const std::vector<std::string>& DONUT_POWERS_SLUGS(){
+    static std::vector<std::string> database = make_DONUT_POWERS_SLUGS();
+    return database;
+}
+
+
+
+struct PowerNameDatabase{
+    PowerNameDatabase();
+
+    static const PowerNameDatabase& instance(){
+        static PowerNameDatabase database;
+        return database;
+    }
+
+    std::map<std::string, DonutPowers> database;
+    std::map<std::string, std::string> m_display_name_to_slug;
+};
+PowerNameDatabase::PowerNameDatabase(){
+    {
+        std::string path = RESOURCE_PATH() + "PokemonLZA/Donuts/flavor_powers.json";
+        JsonValue json = load_json_file(path);
+        JsonObject& object = json.to_object_throw(path);
+        for (const auto& language_block : object){
+            Language language = language_code_to_enum(language_block.first);
+            const JsonObject& per_language = language_block.second.to_object_throw(path);
+            for (const auto& slug : per_language){
+                const JsonArray& names = slug.second.to_array_throw(path);
+                if (names.empty()){
+                    throw JsonParseException(path, "Expected at least one name for: " + language_block.first + " : " + slug.first);
+                }
+                database[slug.first].m_display_names[language] = names[0].to_string_throw();
+            }
+        }
+        for (auto& item : database){
+            auto iter = item.second.m_display_names.find(Language::English);
+            if (iter == item.second.m_display_names.end()){
+                throw JsonParseException(path, "English not found for: " + item.first);
+            }
+            item.second.m_display_name = iter->second;
+            m_display_name_to_slug[iter->second] = item.first;
+        }
+    }
+}
+
+const DonutPowers& get_power_name(const std::string& slug){
+    const std::map<std::string, DonutPowers>& database = PowerNameDatabase::instance().database;
+    auto iter = database.find(slug);
+    if (iter == database.end()){
+        throw InternalProgramError(
+            nullptr, PA_CURRENT_FUNCTION,
+            "Donut power slug not found in database: " + slug
+        );
+    }
+    return iter->second;
+}
+
+const std::string& parse_power_name(const std::string& display_name){
+    const std::map<std::string, std::string>& database = PowerNameDatabase::instance().m_display_name_to_slug;
+    auto iter = database.find(display_name);
+    if (iter == database.end()){
+        throw InternalProgramError(
+            nullptr, PA_CURRENT_FUNCTION,
+            "Donut power name not found in database: " + display_name
+        );
+    }
+    return iter->second;
+}
+
+
+
+
+
+//TODO: Make spritesheet for flavor powers
+const SpriteDatabase& DONUT_POWERS_DATABASE(){
+    static const SpriteDatabase database("PokemonLZA/Donuts/donut_berry_sheetSpritesheet.png", "PokemonLZA/Donuts/donut_berry_sheetSpritesheetData.json");
+    return database;
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Resources/PokemonLZA_DonutPowers.h b/SerialPrograms/Source/VideoGames/PokemonLZA/Resources/PokemonLZA_DonutPowers.h
new file mode 100644
index 0000000000..f14849250e
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Resources/PokemonLZA_DonutPowers.h
@@ -0,0 +1,44 @@
+/*  Donut Powers
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLZA_DonutPowers_H
+#define PokemonAutomation_PokemonLZA_DonutPowers_H
+
+#include <vector>
+#include <map>
+#include "CommonFramework/Language.h"
+#include "CommonTools/Resources/SpriteDatabase.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+
+const std::vector<std::string>& DONUT_POWERS_SLUGS();
+
+class DonutPowers{
+public:
+    const std::string& display_name() const{ return m_display_name; }
+
+private:
+    friend struct PowerNameDatabase;
+
+    std::string m_display_name;
+    std::map<Language, std::string> m_display_names;
+};
+
+const DonutPowers& get_power_name(const std::string& slug);
+const std::string& parse_power_name(const std::string& display_name);
+
+
+
+const SpriteDatabase& DONUT_POWERS_DATABASE();
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Resources/PokemonLZA_HyperspaceRewardNames.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Resources/PokemonLZA_HyperspaceRewardNames.cpp
new file mode 100644
index 0000000000..2176bc2483
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Resources/PokemonLZA_HyperspaceRewardNames.cpp
@@ -0,0 +1,109 @@
+/*  Hyperspace Reward Names
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <map>
+#include "Common/Cpp/Json/JsonValue.h"
+#include "Common/Cpp/Json/JsonArray.h"
+#include "Common/Cpp/Json/JsonObject.h"
+#include "CommonFramework/GlobalAutoPaths.h"
+#include "PokemonLZA_HyperspaceRewardNames.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+
+struct HyperspaceRewardNamesDatabase{
+    HyperspaceRewardNamesDatabase();
+
+    static const HyperspaceRewardNamesDatabase& instance(){
+        static HyperspaceRewardNamesDatabase database;
+        return database;
+    }
+
+    static const std::string NULL_SLUG;
+    std::vector<std::string> ordered_list;
+    std::map<std::string, HyperspaceRewardNames> database;
+    std::map<std::string, std::string> reverse_lookup;
+};
+const std::string HyperspaceRewardNamesDatabase::NULL_SLUG;
+
+HyperspaceRewardNamesDatabase::HyperspaceRewardNamesDatabase()
+{
+    // Load a list of tournament prize slugs in the desired order:
+    // ["potion", "fresh-water", ... ]
+    std::string path_slugs = RESOURCE_PATH() + "PokemonLZA/HyperBattle/HyperspaceRewardList.json";
+    JsonValue json_slugs = load_json_file(path_slugs);
+    JsonArray& slugs = json_slugs.to_array_throw(path_slugs);
+
+    // Load a map of tournament prize slugs to item names in all languages, e.g.:
+    // {
+    //      "potion": {
+    //          "eng": "Potion",
+    //          "deu": "Trank",
+    //          ...
+    //      },
+    //      ....
+    // }
+    std::string path_disp = RESOURCE_PATH() + "PokemonLZA/HyperBattle/HyperspaceRewardNameDisplay.json";
+    JsonValue json_disp = load_json_file(path_disp);
+    JsonObject& item_disp = json_disp.to_object_throw(path_disp);
+
+    for (auto& item : slugs){
+        std::string& slug = item.to_string_throw(path_slugs);
+
+        JsonObject& auction_item_name_dict = item_disp.get_object_throw(slug, path_disp);
+        std::string& display_name = auction_item_name_dict.get_string_throw("eng", path_disp);
+
+        ordered_list.push_back(slug);
+        database[std::move(slug)].m_display_name = std::move(display_name);
+    }
+
+    for (const auto& item : database){
+        reverse_lookup[item.second.m_display_name] = item.first;
+    }
+}
+
+const HyperspaceRewardNames& get_hyperspace_reward_name(const std::string& slug){
+    const std::map<std::string, HyperspaceRewardNames>& database = HyperspaceRewardNamesDatabase::instance().database;
+    auto iter = database.find(slug);
+    if (iter == database.end()){
+        throw InternalProgramError(
+            nullptr, PA_CURRENT_FUNCTION,
+            "Hyperspace reward slug not found in database: " + slug
+        );
+    }
+    return iter->second;
+}
+const std::string& parse_hyperspace_reward_name(const std::string& display_name){
+    const std::map<std::string, std::string>& database = HyperspaceRewardNamesDatabase::instance().reverse_lookup;
+    auto iter = database.find(display_name);
+    if (iter == database.end()){
+        throw InternalProgramError(
+            nullptr, PA_CURRENT_FUNCTION,
+            "Hyperspace reward name not found in database: " + display_name
+        );
+    }
+    return iter->second;
+}
+const std::string& parse_hyperspace_reward_name_nothrow(const std::string& display_name){
+    const std::map<std::string, std::string>& database = HyperspaceRewardNamesDatabase::instance().reverse_lookup;
+    auto iter = database.find(display_name);
+    if (iter == database.end()){
+        return HyperspaceRewardNamesDatabase::NULL_SLUG;
+    }
+    return iter->second;
+}
+
+
+const std::vector<std::string>& HYPERSPACE_REWARD_SLUGS(){
+    return HyperspaceRewardNamesDatabase::instance().ordered_list;
+}
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Resources/PokemonLZA_HyperspaceRewardNames.h b/SerialPrograms/Source/VideoGames/PokemonLZA/Resources/PokemonLZA_HyperspaceRewardNames.h
new file mode 100644
index 0000000000..107f44c942
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Resources/PokemonLZA_HyperspaceRewardNames.h
@@ -0,0 +1,39 @@
+/*  Hyperspace Reward Names
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLZA_HyperspaceRewardNames_H
+#define PokemonAutomation_PokemonLZA_HyperspaceRewardNames_H
+
+#include <string>
+#include <vector>
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+
+class HyperspaceRewardNames{
+public:
+    const std::string& display_name() const { return m_display_name; }
+
+private:
+    friend struct HyperspaceRewardNamesDatabase;
+
+    std::string m_display_name;
+};
+
+
+const HyperspaceRewardNames& get_hyperspace_reward_name(const std::string& slug);
+const std::string& parse_hyperspace_reward_name(const std::string& display_name);
+const std::string& parse_hyperspace_reward_name_nothrow(const std::string& display_name);
+
+const std::vector<std::string>& HYPERSPACE_REWARD_SLUGS();
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Resources/PokemonLZA_Locations.cpp b/SerialPrograms/Source/VideoGames/PokemonLZA/Resources/PokemonLZA_Locations.cpp
new file mode 100644
index 0000000000..7642ad83a9
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Resources/PokemonLZA_Locations.cpp
@@ -0,0 +1,243 @@
+/*  Locations
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <unordered_map>
+#include "Common/Cpp/Json/JsonValue.h"
+#include "Common/Cpp/Json/JsonArray.h"
+#include "Common/Cpp/Json/JsonObject.h"
+#include "CommonFramework/GlobalAutoPaths.h"
+#include "PokemonLZA_Locations.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+struct LocationNameDatabase{
+public:
+    LocationNameDatabase();
+
+    static const LocationNameDatabase& instance(){
+        static LocationNameDatabase database;
+        return database;
+    }
+
+    std::map<std::string, Locations> database;
+    std::map<std::string, std::string> reverse_lookup;
+    std::vector<std::string> slugs;
+private:
+    void create_database(const std::string& path);
+    void create_reverse_lookup(const std::string& path);
+};
+
+// Form the location name database with all languages, mapping slugs to display names by parsing the JSON
+// The JSON resembles the following:
+// "eng": {
+//   "location-1-slug": [ "Location 1 Display Name" ],
+//   ...
+// },
+// ...
+LocationNameDatabase::LocationNameDatabase(){
+    std::string path = RESOURCE_PATH() + "PokemonLZA/LocationName.json";
+    create_database(path);
+    create_reverse_lookup(path);
+}
+
+// Create the database that maps slugs to display names in various languages
+void LocationNameDatabase::create_database(const std::string& path){
+    // Load the JSON file containing location names in all languages from Resources area
+    JsonValue json = load_json_file(path);
+    JsonObject& object = json.to_object_throw(path); // Whole JSON object
+    // Iterate through each language in the whole JSON
+    for (const auto& language_block : object){
+        Language language = language_code_to_enum(language_block.first);
+        const JsonObject& language_object = language_block.second.to_object_throw(path);
+        // For each language, iterate through each slug in the respective language block
+        for (const auto& slug : language_object){
+            // Each display name is wrapped in an array, so the display name is extracted from the array
+            const JsonArray& names = slug.second.to_array_throw(path);
+            if (names.empty()){
+                throw JsonParseException(path, "Expected at least one name for: " + language_block.first + " : " + slug.first);
+            }
+            database[slug.first].m_display_names[language] = names[0].to_string_throw(path);
+        }
+    }
+}
+
+// Create the reverse lookup table that allows for getting slugs from display names
+// Also register each slug into a vector
+void LocationNameDatabase::create_reverse_lookup(const std::string& path){
+    // Set the English display name as the default display name for each location
+    // Build a reverse lookup table using the English display name
+    for (auto& item : database){
+        auto iter = item.second.m_display_names.find(Language::English);
+        if (iter == item.second.m_display_names.end()){
+            throw JsonParseException(path, "Expected English name for location slug: " + item.first);
+        }
+        item.second.m_display_name = iter->second;
+        // reverse_lookup[iter->second] = item.first;
+        slugs.push_back(item.first);
+    }
+}
+
+// Get the Locations object given its slug using the database
+const Locations& get_location_name(const std::string& slug){
+    const std::map<std::string, Locations>& database = LocationNameDatabase::instance().database;
+    auto iter = database.find(slug);
+    if (iter == database.end()){
+        throw InternalProgramError(
+            nullptr, PA_CURRENT_FUNCTION,
+            "Location slug not found in database: " + slug
+        );
+    }
+    return iter->second;
+}
+
+// Using the reverse lookup table, get the slug given the English display name
+const std::string& parse_location_name(const std::string& display_name){
+    const std::map<std::string, std::string>& database = LocationNameDatabase::instance().reverse_lookup;
+    auto iter = database.find(display_name);
+    if (iter == database.end()){
+        throw InternalProgramError(
+            nullptr, PA_CURRENT_FUNCTION,
+            "Location name not found in database: " + display_name
+        );
+    }
+    return iter->second;
+}
+
+// Mapping between location enum, slug, and index in menu
+const std::vector<LocationItem>& LOCATION_ENUM_MAPPINGS(){
+    static const std::vector<LocationItem> database{
+        {Location::HYPERSPACE_ENTRY_POINT,        "hyperspace-entry-point",         0}, // Not a valid slug currently
+        {Location::CENTRICO_PLAZA,                "centrico-plaza",                  0},
+        {Location::GARE_DE_LUMIOSE,               "gare-de-lumiose",                 1},
+        {Location::POKEMON_RESEARCH_LAB,          "pokemon-research-lab",            2},
+        {Location::HOTEL_Z,                       "hotel-z",                         3},
+        {Location::VERT_POKEMON_CENTER,           "vert-pokemon-center",             4},
+        {Location::RACINE_CONSTRUCTION,           "racine-construction",             5},
+        {Location::RESTAURANT_LE_NAH,             "restaurant-le-nah",               6},
+        {Location::CAFE_CYCLONE,                  "cafe-cyclone",                    7},
+        {Location::CAFE_CLASSE,                   "cafe-classe",                     8},
+        {Location::CAFE_INTROVERSION,             "cafe-introversion",               9},
+        {Location::NOUVEAU_CAFE,                  "nouveau-cafe",                   10},
+        {Location::RUST_SYNDICATE_OFFICE,         "rust-syndicate-office",          11},
+        {Location::LUMIOSE_SEWERS_1,              "lumiose-sewers-1",               12},
+        {Location::BLEU_POKEMON_CENTER,           "bleu-pokemon-center",            13},
+        {Location::VERNAL_POKEMON_CENTER,         "vernal-pokemon-center",          14},
+        {Location::CAFE_WOOF,                     "cafe-woof",                      15},
+        {Location::CAFE_SOLEIL,                   "cafe-soleil",                    16},
+        {Location::SHUTTERBUG_CAFE,               "shutterbug-cafe",                17},
+        {Location::NOUVEAU_CAFE_TRUCK_NO_2,       "nouveau-cafe-truck-no-2",        18},
+        {Location::QUASARTICO_INC,                "quasartico-inc",                 19},
+        {Location::LYSANDRE_CAFE,                 "lysandre-cafe",                  20},
+        {Location::LUMIOSE_SEWERS_2,              "lumiose-sewers-2",               21},
+        {Location::MAGENTA_POKEMON_CENTER,        "magenta-pokemon-center",         22},
+        {Location::MAGENTA_PLAZA_POKEMON_CENTER,  "magenta-plaza-pokemon-center",   23},
+        {Location::CAFE_POKEMON_AMIE,             "cafe-pokemon-amie",              24},
+        {Location::CAFE_ROULEAU,                  "cafe-rouleau",                   25},
+        {Location::CAFE_GALLANT,                  "cafe-gallant",                   26},
+        {Location::CAFE_TRISTE,                   "cafe-triste",                    27},
+        {Location::NOUVEAU_CAFE_TRUCK_NO_3,       "nouveau-cafe-truck-no-3",        28},
+        {Location::HOTEL_RICHISSIME,              "hotel-richissime",               29},
+        {Location::LOOKER_BUREAU,                 "looker-bureau",                  30},
+        {Location::LUMIOSE_MUSEUM,                "lumiose-museum",                 31},
+        {Location::ROUGE_POKEMON_CENTER,          "rouge-pokemon-center",           32},
+        {Location::CENTRICO_POKEMON_CENTER,       "centrico-pokemon-center",        33},
+        {Location::RESTAURANT_LE_YEAH,            "restaurant-le-yeah",             34},
+        {Location::SUSHI_HIGH_ROLLER,             "sushi-high-roller",              35},
+        {Location::RESTAURANT_LE_WOW,             "restaurant-le-wow",              36},
+        {Location::JUSTICE_DOJO,                  "justice-dojo",                   37},
+        {Location::JAUNE_POKEMON_CENTER,          "jaune-pokemon-center",           38},
+        {Location::HIBERNAL_POKEMON_CENTER,       "hibernal-pokemon-center",        39},
+        {Location::CAFE_ULTIMO,                   "cafe-ultimo",                    40},
+        {Location::CAFE_ACTION,                   "cafe-action",                    41},
+        {Location::CAFE_KIZUNA,                   "cafe-kizuna",                    42},
+        {Location::CAFE_BATAILLE,                 "cafe-bataille",                  43},
+        {Location::WILD_ZONE_1,                   "wild-zone-1",                    44},
+        {Location::WILD_ZONE_2,                   "wild-zone-2",                    45},
+        {Location::WILD_ZONE_3,                   "wild-zone-3",                    46},
+        {Location::WILD_ZONE_4,                   "wild-zone-4",                    47},
+        {Location::WILD_ZONE_5,                   "wild-zone-5",                    48},
+        {Location::WILD_ZONE_6,                   "wild-zone-6",                    49},
+        {Location::WILD_ZONE_7,                   "wild-zone-7",                    50},
+        {Location::WILD_ZONE_8,                   "wild-zone-8",                    51},
+        {Location::WILD_ZONE_9,                   "wild-zone-9",                    52},
+        {Location::WILD_ZONE_10,                  "wild-zone-10",                   53},
+        {Location::WILD_ZONE_11,                  "wild-zone-11",                   54},
+        {Location::WILD_ZONE_12,                  "wild-zone-12",                   55},
+        {Location::WILD_ZONE_13,                  "wild-zone-13",                   56},
+        {Location::WILD_ZONE_14,                  "wild-zone-14",                   57},
+        {Location::WILD_ZONE_15,                  "wild-zone-15",                   58},
+        {Location::WILD_ZONE_16,                  "wild-zone-16",                   59},
+        {Location::WILD_ZONE_17,                  "wild-zone-17",                   60},
+        {Location::WILD_ZONE_18,                  "wild-zone-18",                   61},
+        {Location::WILD_ZONE_19,                  "wild-zone-19",                   62},
+        {Location::WILD_ZONE_20_NO_DISTORTION,    "wild-zone-20",                   63},
+        {Location::WILD_ZONE_20_WITH_DISTORTION,  "wild-zone-20",                   63},
+        {Location::BATTLE_ZONE_1,                 "battle-zone-1",                  64},
+        {Location::BATTLE_ZONE_2,                 "battle-zone-2",                  65},
+        {Location::BATTLE_ZONE_3,                 "battle-zone-3",                  66},
+    };
+    return database;
+}
+
+// Create a hash map for fast lookup from Location enum to LocationItem
+std::unordered_map<Location, LocationItem> make_LOCATION_ITEM_HASH_MAP_BY_ENUM(){
+    std::unordered_map<Location, LocationItem> hash_map;
+    const std::vector<LocationItem>& database = LOCATION_ENUM_MAPPINGS();
+    for (const LocationItem& item : database){
+        hash_map[item.location] = item;
+    }
+    return hash_map;
+};
+const std::unordered_map<Location, LocationItem>& LOCATION_ITEM_HASH_MAP_BY_ENUM(){
+    static const std::unordered_map<Location, LocationItem> ret = make_LOCATION_ITEM_HASH_MAP_BY_ENUM();
+    return ret;
+}
+
+// Create a hash map for fast lookup from slug to LocationItem
+std::unordered_map<std::string, LocationItem> make_LOCATION_ITEM_HASH_MAP_BY_SLUG(){
+    std::unordered_map<std::string, LocationItem> hash_map;
+    const std::vector<LocationItem>& database = LOCATION_ENUM_MAPPINGS();
+    for (const LocationItem& item : database){
+        // insert() will not overwrite the existing first entry
+        hash_map.insert({item.slug, item});
+    }
+    return hash_map;
+};
+const std::unordered_map<std::string, LocationItem>& LOCATION_ITEM_HASH_MAP_BY_SLUG(){
+    static const std::unordered_map<std::string, LocationItem> ret = make_LOCATION_ITEM_HASH_MAP_BY_SLUG();
+    return ret;
+}
+
+// Get the whole LocationItem given a Location enum
+const LocationItem& get_location_item_from_enum(const Location location){
+    auto iter = LOCATION_ITEM_HASH_MAP_BY_ENUM().find(location);
+    if (iter == LOCATION_ITEM_HASH_MAP_BY_ENUM().end()){
+        throw InternalProgramError(
+            nullptr, PA_CURRENT_FUNCTION,
+            "Location enum not found in database: Enum #" + std::to_string((int)location)
+        );
+    }
+    return iter->second;
+}
+
+// Get the whole LocationItem given a slug
+// WARNING: slugs can be shared for multiple entries, grab the first occurence
+const LocationItem& get_location_item_from_slug(const std::string& slug){
+    auto iter = LOCATION_ITEM_HASH_MAP_BY_SLUG().find(slug);
+    if (iter == LOCATION_ITEM_HASH_MAP_BY_SLUG().end()){
+        throw InternalProgramError(
+            nullptr, PA_CURRENT_FUNCTION,
+            "Location slug not found in database: " + slug
+        );
+    }
+    return iter->second;
+}
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonLZA/Resources/PokemonLZA_Locations.h b/SerialPrograms/Source/VideoGames/PokemonLZA/Resources/PokemonLZA_Locations.h
new file mode 100644
index 0000000000..6398b2937a
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonLZA/Resources/PokemonLZA_Locations.h
@@ -0,0 +1,131 @@
+/*  Locations
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLZA_Locations_H
+#define PokemonAutomation_PokemonLZA_Locations_H
+
+#include <vector>
+#include <map>
+#include "Common/Cpp/EnumStringMap.h"
+#include "CommonFramework/Language.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonLZA{
+
+enum class Location{
+    HYPERSPACE_ENTRY_POINT,
+    CENTRICO_PLAZA,
+    GARE_DE_LUMIOSE,
+    POKEMON_RESEARCH_LAB,
+    HOTEL_Z,
+    VERT_POKEMON_CENTER,
+    RACINE_CONSTRUCTION,
+    RESTAURANT_LE_NAH,
+    CAFE_CYCLONE,
+    CAFE_CLASSE,
+    CAFE_INTROVERSION,
+    NOUVEAU_CAFE,
+    RUST_SYNDICATE_OFFICE,
+    LUMIOSE_SEWERS_1,
+    BLEU_POKEMON_CENTER,
+    VERNAL_POKEMON_CENTER,
+    CAFE_WOOF,
+    CAFE_SOLEIL,
+    SHUTTERBUG_CAFE,
+    NOUVEAU_CAFE_TRUCK_NO_2,
+    QUASARTICO_INC,
+    LYSANDRE_CAFE,
+    LUMIOSE_SEWERS_2,
+    MAGENTA_POKEMON_CENTER,
+    MAGENTA_PLAZA_POKEMON_CENTER,
+    CAFE_POKEMON_AMIE,
+    CAFE_ROULEAU,
+    CAFE_GALLANT,
+    CAFE_TRISTE,
+    NOUVEAU_CAFE_TRUCK_NO_3,
+    HOTEL_RICHISSIME,
+    LOOKER_BUREAU,
+    LUMIOSE_MUSEUM,
+    ROUGE_POKEMON_CENTER,
+    CENTRICO_POKEMON_CENTER,
+    RESTAURANT_LE_YEAH,
+    SUSHI_HIGH_ROLLER,
+    RESTAURANT_LE_WOW,
+    JUSTICE_DOJO,
+    JAUNE_POKEMON_CENTER,
+    HIBERNAL_POKEMON_CENTER,
+    CAFE_ULTIMO,
+    CAFE_ACTION,
+    CAFE_KIZUNA,
+    CAFE_BATAILLE,
+    WILD_ZONE_1,
+    WILD_ZONE_2,
+    WILD_ZONE_3,
+    WILD_ZONE_4,
+    WILD_ZONE_5,
+    WILD_ZONE_6,
+    WILD_ZONE_7,
+    WILD_ZONE_8,
+    WILD_ZONE_9,
+    WILD_ZONE_10,
+    WILD_ZONE_11,
+    WILD_ZONE_12,
+    WILD_ZONE_13,
+    WILD_ZONE_14,
+    WILD_ZONE_15,
+    WILD_ZONE_16,
+    WILD_ZONE_17,
+    WILD_ZONE_18,
+    WILD_ZONE_19,
+    WILD_ZONE_20_NO_DISTORTION,
+    WILD_ZONE_20_WITH_DISTORTION,
+    BATTLE_ZONE_1,
+    BATTLE_ZONE_2,
+    BATTLE_ZONE_3,
+};
+
+enum class FAST_TRAVEL_FILTER{
+    ALL_TRAVEL_SPOTS,
+    FACILITIES,
+    POKEMON_CENTERS,
+    CAFES,
+    ZONES
+};
+
+struct LocationItem{
+    Location location;
+    std::string slug;
+    uint8_t index;
+};
+
+class Locations{
+public:
+    const std::string& display_name() const { return m_display_name; }
+private:
+    friend struct LocationNameDatabase;
+
+    // The english in-game name of a location
+    std::string m_display_name;
+    // A map between a language and the location in-game name in that language
+    std::map<Language, std::string> m_display_names;
+};
+
+// Search the LocationNameDatabase for a Locations object using its slug
+const Locations& get_location_name(const std::string& slug);
+
+// Search for the slug of a location given its English display name
+const std::string& parse_location_name(const std::string& display_name);
+
+// Map between Location enums and the slug for ease-of-use elsewhere
+const std::vector<LocationItem>& LOCATION_ENUM_MAPPINGS();
+const LocationItem& get_location_item_from_enum(const Location location);
+const LocationItem& get_location_item_from_slug(const std::string& slug);
+
+}
+}
+}
+#endif
\ No newline at end of file
diff --git a/SerialPrograms/Source/VideoGames/PokemonPokopia/Inference/PokemonPokopia_ButtonDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonPokopia/Inference/PokemonPokopia_ButtonDetector.cpp
new file mode 100644
index 0000000000..d653bc1d33
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonPokopia/Inference/PokemonPokopia_ButtonDetector.cpp
@@ -0,0 +1,152 @@
+/*  Button Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <iostream>
+#include "Kernels/Waterfill/Kernels_Waterfill_Types.h"
+#include "CommonFramework/StaticGlobals.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Images/WaterfillUtilities.h"
+#include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h"
+#include "PokemonPokopia_ButtonDetector.h"
+
+
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonPokopia{
+
+
+
+class ButtonMatcher : public ImageMatch::WaterfillTemplateMatcher{
+public:
+    // image template matcher for buttons
+    // - min_width: candidate image min width if video stream is 1080p
+    // - min_height: candidate image min height if video stream is 1080p
+    ButtonMatcher(ButtonType type, size_t min_width, size_t min_height, double max_rmsd);
+    static const ButtonMatcher& A(){
+        static ButtonMatcher matcher(ButtonType::ButtonA, 40, 40, 100);
+        return matcher;
+    }
+    static const ButtonMatcher& DpadLeft(){
+        static ButtonMatcher matcher(ButtonType::ButtonDpadLeft, 25, 25, 120);
+        return matcher;
+    }
+    static const ButtonMatcher& DpadRight(){
+        static ButtonMatcher matcher(ButtonType::ButtonDpadRight, 25, 25, 120);
+        return matcher;
+    }
+
+    virtual bool check_image(Resolution input_resolution, const ImageViewRGB32& image) const override{
+        size_t min_width = m_min_width * input_resolution.width / 1920;
+        size_t min_height = m_min_height * input_resolution.height / 1080;
+
+        if (STATIC_GLOBALS.IMAGE_TEMPLATE_MATCHING){
+            const double stddev_sum = image_stats(image).stddev.sum();
+            std::cout << "???? ButtonMatcher::check_image() ???? min size " << min_width << " x " << min_height
+                 << " got " << image.width() << " x " << image.height() << " stddev_sum: " << stddev_sum << std::endl;
+        }
+        return image.width() >= min_width && image.height() >= min_height;
+    };
+
+    size_t m_min_width;
+    size_t m_min_height;
+    double m_max_rmsd;
+};
+
+
+const char* template_path(ButtonType type){
+    switch (type){
+    case ButtonType::ButtonA:
+        return "PokemonPokopia/ButtonA.png";
+    case ButtonType::ButtonDpadLeft:
+        return "PokemonPokopia/ButtonDpadLeft.png";
+    case ButtonType::ButtonDpadRight:
+        return "PokemonPokopia/ButtonDpadRight.png";
+    default:
+        return "";
+    }
+}
+
+const ButtonMatcher& get_button_matcher(ButtonType type){
+    switch (type){
+    case ButtonType::ButtonA:
+        return ButtonMatcher::A();
+    case ButtonType::ButtonDpadLeft:
+        return ButtonMatcher::DpadLeft();
+    case ButtonType::ButtonDpadRight:
+        return ButtonMatcher::DpadRight();
+    default:
+        throw std::runtime_error("No corresponding ButtonMatcher for ButtonType");
+    }
+}
+
+ButtonMatcher::ButtonMatcher(ButtonType type, size_t min_width, size_t min_height, double max_rmsd)
+    : WaterfillTemplateMatcher(template_path(type), Color(0xffc0c0c0), Color(0xffffffff), 500)
+    , m_min_width(min_width)
+    , m_min_height(min_height)
+    , m_max_rmsd(max_rmsd)
+{}
+
+
+
+ButtonDetector::ButtonDetector(
+    Color color,
+    ButtonType button_type,
+    const ImageFloatBox& box,
+    VideoOverlay* overlay
+)
+    : m_button_type(button_type)
+    , m_color(color)
+    , m_matcher(get_button_matcher(button_type))
+    , m_box(box)
+    , m_overlay(overlay)
+{
+
+}
+void ButtonDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_box);
+}
+bool ButtonDetector::detect(const ImageViewRGB32& screen){
+
+    double screen_rel_size = (screen.height() / 1080.0);
+    double screen_rel_size_2 = screen_rel_size * screen_rel_size;
+
+    double min_area_1080p = 500;
+    size_t min_area = size_t(screen_rel_size_2 * min_area_1080p);
+
+    const std::vector<std::pair<uint32_t, uint32_t>> FILTERS = {
+        {0xffc0c0c0, 0xffffffff} // RGB(192, 192, 192), RGB(255, 255, 255)
+    };
+
+    bool found = match_template_by_waterfill(
+        screen.size(),
+        extract_box_reference(screen, m_box),
+        m_matcher,
+        FILTERS,
+        {min_area, SIZE_MAX},
+        m_matcher.m_max_rmsd,
+        [&](Kernels::Waterfill::WaterfillObject& object) -> bool {
+            m_last_detected = translate_to_parent(screen, m_box, object);
+            return true;
+        }
+    );
+
+    if (m_overlay){
+        if (found){
+            m_last_detected_box.emplace(*m_overlay, m_last_detected, COLOR_GREEN);
+        }else{
+            m_last_detected_box.reset();
+        }
+    }
+
+    return found;
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonPokopia/Inference/PokemonPokopia_ButtonDetector.h b/SerialPrograms/Source/VideoGames/PokemonPokopia/Inference/PokemonPokopia_ButtonDetector.h
new file mode 100644
index 0000000000..0b82444fae
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonPokopia/Inference/PokemonPokopia_ButtonDetector.h
@@ -0,0 +1,98 @@
+/*  Button Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonPokopia_ButtonDetector_H
+#define PokemonAutomation_PokemonPokopia_ButtonDetector_H
+
+#include <optional>
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/VisualDetector.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+
+namespace PokemonAutomation{
+    class Logger;
+namespace NintendoSwitch{
+namespace PokemonPokopia{
+
+
+enum class ButtonType{
+    ButtonA,
+    // ButtonB,
+    // ButtonX,
+    // ButtonY,
+    // ButtonL,
+    // ButtonR,
+    // ButtonPlus,
+    // ButtonMinus,
+    // ButtonRight,
+    // RightStickUpDown,
+    ButtonDpadLeft,
+    ButtonDpadRight
+    // ButtonDpadUp,
+    // ButtonDpadDown,
+    // ButtonDpadUpInterior,   // Used to create button detector that detects the black triangle inside the DPAD_UP button
+    // ButtonDpadDownInterior, // Used to create button detector that detects the black triangle inside the DPAD_DOWN button
+};
+
+class ButtonMatcher;
+
+class ButtonDetector : public StaticScreenDetector{
+public:
+    ButtonDetector(
+        Color color,
+        ButtonType button_type,
+        const ImageFloatBox& box,
+        VideoOverlay* overlay = nullptr
+    );
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+    virtual void reset_state() override { m_last_detected_box.reset(); }
+
+    ButtonType button_type() const { return m_button_type; }
+
+private:
+    ButtonType m_button_type;
+    Color m_color;
+    const ButtonMatcher& m_matcher;
+    ImageFloatBox m_box;
+    VideoOverlay* m_overlay;
+
+    ImageFloatBox m_last_detected;
+    std::optional<OverlayBoxScope> m_last_detected_box;
+};
+class ButtonWatcher : public DetectorToFinder<ButtonDetector>{
+public:
+    ButtonWatcher(
+        Color color,
+        ButtonType button_type,
+        const ImageFloatBox& box,
+        VideoOverlay* overlay = nullptr,
+        std::chrono::milliseconds hold_duration = std::chrono::milliseconds(250)
+    )
+         : DetectorToFinder("ButtonWatcher", hold_duration, color, button_type, box, overlay)
+    {}
+};
+class ButtonGoneWatcher : public DetectorToFinder<ButtonDetector>{
+public:
+    ButtonGoneWatcher(
+        Color color,
+        ButtonType button_type,
+        const ImageFloatBox& box,
+        VideoOverlay* overlay = nullptr,
+        std::chrono::milliseconds hold_duration = std::chrono::milliseconds(250)
+    )
+         : DetectorToFinder("ButtonGoneWatcher", FinderType::GONE, hold_duration, color, button_type, box, overlay)
+    {}
+};
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonPokopia/Inference/PokemonPokopia_MovesDetection.cpp b/SerialPrograms/Source/VideoGames/PokemonPokopia/Inference/PokemonPokopia_MovesDetection.cpp
new file mode 100644
index 0000000000..1a2e189186
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonPokopia/Inference/PokemonPokopia_MovesDetection.cpp
@@ -0,0 +1,41 @@
+/*  Moves Detection
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Exceptions.h"
+#include "CommonTools/Images/WaterfillUtilities.h"
+#include "PokemonPokopia_MovesDetection.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonPokopia{
+
+
+
+OverworldDetector::OverworldDetector(
+    Color color,
+    VideoOverlay* overlay
+)
+    : m_color(color)
+    , m_overlay(overlay)
+{}
+void OverworldDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, MOVES_LEFT_ARROW_BOX);
+    items.add(m_color, MOVES_RIGHT_ARROW_BOX);
+}
+bool OverworldDetector::detect(const ImageViewRGB32& screen){
+    ButtonDetector moves_left_detector(m_color, ButtonType::ButtonDpadLeft, MOVES_LEFT_ARROW_BOX, m_overlay);
+    ButtonDetector moves_right_detector(m_color, ButtonType::ButtonDpadRight, MOVES_RIGHT_ARROW_BOX, m_overlay);
+
+    bool found = moves_left_detector.detect(screen) && moves_right_detector.detect(screen);
+
+    return found;
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonPokopia/Inference/PokemonPokopia_MovesDetection.h b/SerialPrograms/Source/VideoGames/PokemonPokopia/Inference/PokemonPokopia_MovesDetection.h
new file mode 100644
index 0000000000..a9c107a232
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonPokopia/Inference/PokemonPokopia_MovesDetection.h
@@ -0,0 +1,69 @@
+/*  Moves Detection
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonPokopia_MovesDetection_H
+#define PokemonAutomation_PokemonPokopia_MovesDetection_H
+
+#include <optional>
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/VisualDetector.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+#include "VideoGames/PokemonPokopia/Inference/PokemonPokopia_ButtonDetector.h"
+
+namespace PokemonAutomation{
+    class Logger;
+namespace NintendoSwitch{
+namespace PokemonPokopia{
+
+const ImageFloatBox MOVES_LEFT_ARROW_BOX{0.806500, 0.935000, 0.025000, 0.045000};
+const ImageFloatBox MOVES_RIGHT_ARROW_BOX{0.960600, 0.935000, 0.025000, 0.045000};
+
+
+class OverworldDetector : public StaticScreenDetector{
+public:
+    OverworldDetector(
+        Color color,
+        VideoOverlay* overlay = nullptr
+    );
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+    virtual void reset_state() override { m_last_detected_box.reset(); }
+
+private:
+    Color m_color;
+    VideoOverlay* m_overlay;
+
+    ImageFloatBox m_last_detected;
+    std::optional<OverlayBoxScope> m_last_detected_box;
+};
+class OverworldWatcher : public DetectorToFinder<OverworldDetector>{
+public:
+    OverworldWatcher(
+        Color color,
+        VideoOverlay* overlay = nullptr,
+        std::chrono::milliseconds hold_duration = std::chrono::milliseconds(250)
+    )
+         : DetectorToFinder("OverworldWatcher", hold_duration, color, overlay)
+    {}
+};
+class OverworldGoneWatcher : public DetectorToFinder<OverworldDetector>{
+public:
+    OverworldGoneWatcher(
+        Color color,
+        VideoOverlay* overlay = nullptr,
+        std::chrono::milliseconds hold_duration = std::chrono::milliseconds(250)
+    )
+         : DetectorToFinder("OverworldGoneWatcher", FinderType::GONE, hold_duration, color, overlay)
+    {}
+};
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonPokopia/Inference/PokemonPokopia_PCDetection.cpp b/SerialPrograms/Source/VideoGames/PokemonPokopia/Inference/PokemonPokopia_PCDetection.cpp
new file mode 100644
index 0000000000..7aa74e712e
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonPokopia/Inference/PokemonPokopia_PCDetection.cpp
@@ -0,0 +1,446 @@
+/*  PC Detection
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <iostream>
+#include "Common/Cpp/Exceptions.h"
+#include "Kernels/Waterfill/Kernels_Waterfill_Types.h"
+#include "CommonFramework/StaticGlobals.h"
+#include "CommonFramework/Tools/GlobalThreadPools.h"
+#include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h"
+#include "CommonTools/Images/WaterfillUtilities.h"
+#include "CommonTools/Images/SolidColorTest.h"
+#include "CommonTools/OCR/OCR_NumberReader.h"
+#include "PokemonPokopia_PCDetection.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonPokopia{
+
+
+
+class InfoIconMatcher : public ImageMatch::WaterfillTemplateMatcher{
+public:
+    InfoIconMatcher(const char* path)
+        : WaterfillTemplateMatcher(
+            path,
+            Color(210, 120, 0), Color(255, 190, 100), 700
+        )
+    {
+        m_aspect_ratio_lower = 0.9;
+        m_aspect_ratio_upper = 1.1;
+        m_area_ratio_lower = 0.85;
+        m_area_ratio_upper = 1.1;
+    }
+
+    static const InfoIconMatcher& matcher(){
+        static InfoIconMatcher matcher("PokemonPokopia/InfoIcon.png");
+        return matcher;
+    }
+};
+
+InfoIconDetector::InfoIconDetector(
+    Color color,
+    VideoOverlay* overlay,
+    const ImageFloatBox& box
+)
+    : m_color(color)
+    , m_overlay(overlay)
+    , m_arrow_box(box)
+{}
+void InfoIconDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_arrow_box);
+}
+bool InfoIconDetector::detect(const ImageViewRGB32& screen){
+    double screen_rel_size = (screen.height() / 1080.0);
+    double screen_rel_size_2 = screen_rel_size * screen_rel_size;
+
+    double min_area_1080p = 700;
+    double rmsd_threshold = 80;
+    size_t min_area = size_t(screen_rel_size_2 * min_area_1080p);
+
+    const std::vector<std::pair<uint32_t, uint32_t>> FILTERS = {
+        {0xffd26e00, 0xffffbe64} // RGB(210, 120, 0), RGB(255, 190, 100)
+    };
+
+    bool found = match_template_by_waterfill(
+        screen.size(),
+        extract_box_reference(screen, m_arrow_box),
+        InfoIconMatcher::matcher(),
+        FILTERS,
+        {min_area, SIZE_MAX},
+        rmsd_threshold,
+        [&](Kernels::Waterfill::WaterfillObject& object) -> bool {
+            m_last_detected = translate_to_parent(screen, m_arrow_box, object);
+            return true;
+        }
+    );
+
+    if (m_overlay){
+        if (found){
+            m_last_detected_box.emplace(*m_overlay, m_last_detected, COLOR_GREEN);
+        }else{
+            m_last_detected_box.reset();
+        }
+    }
+
+    return found;
+}
+
+BlueDialogDetector::BlueDialogDetector(Color color)
+    : m_color(color)
+    , m_box(0.195000, 0.830000, 0.022500, 0.130000)
+{}
+void BlueDialogDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_box);
+}
+bool BlueDialogDetector::detect(const ImageViewRGB32& screen){
+    const bool found = is_solid(
+        extract_box_reference(screen, m_box),
+        {0, 0.333333, 0.666667},
+        0.25
+    );
+    return found;
+}
+
+class StampMatcher : public ImageMatch::WaterfillTemplateMatcher{
+public:
+    // image template matcher for stamps
+    // - min_width: candidate image min width if video stream is 1080p
+    // - min_height: candidate image min height if video stream is 1080p
+    StampMatcher(Stamp stamp, size_t min_width, size_t min_height, double max_rmsd);
+    static const StampMatcher& mew(){
+        static StampMatcher matcher(Stamp::MEW, 40, 40, 100);
+        return matcher;
+    }
+
+    virtual bool check_image(Resolution input_resolution, const ImageViewRGB32& image) const override{
+        size_t min_width = m_min_width * input_resolution.width / 1920;
+        size_t min_height = m_min_height * input_resolution.height / 1080;
+
+        if (STATIC_GLOBALS.IMAGE_TEMPLATE_MATCHING){
+            const double stddev_sum = image_stats(image).stddev.sum();
+            std::cout << "???? ButtonMatcher::check_image() ???? min size " << min_width << " x " << min_height
+                 << " got " << image.width() << " x " << image.height() << " stddev_sum: " << stddev_sum << std::endl;
+        }
+        return image.width() >= min_width && image.height() >= min_height;
+    };
+
+    size_t m_min_width;
+    size_t m_min_height;
+    double m_max_rmsd;
+};
+
+
+const char* template_path(Stamp stamp){
+    switch (stamp){
+    case Stamp::MEW:
+        return "PokemonPokopia/MewStamp.png";
+    default:
+        throw InternalProgramError(
+            nullptr, PA_CURRENT_FUNCTION, "No corresponding template path for Stamp"
+        );
+    }
+}
+
+// Using same filter for template and detect for now
+std::pair<uint32_t, uint32_t> filter(Stamp stamp){
+    switch (stamp){
+    case Stamp::MEW:
+        return {0xff5a50aa, 0xffd2beff}; // RGB(90, 80, 170), RGB(210, 190, 255)
+    default:
+        throw InternalProgramError(
+            nullptr, PA_CURRENT_FUNCTION, "No corresponding filter for Stamp"
+        );
+    }
+}
+
+const StampMatcher& get_stamp_matcher(Stamp stamp){
+    switch (stamp){
+    case Stamp::MEW:
+        return StampMatcher::mew();
+    default:
+        throw InternalProgramError(
+            nullptr, PA_CURRENT_FUNCTION, "No corresponding StampMatcher for Stamp"
+        );
+    }
+}
+
+StampMatcher::StampMatcher(Stamp stamp, size_t min_width, size_t min_height, double max_rmsd)
+    : WaterfillTemplateMatcher(template_path(stamp), Color(filter(stamp).first), Color(filter(stamp).second), 100)
+    , m_min_width(min_width)
+    , m_min_height(min_height)
+    , m_max_rmsd(max_rmsd)
+{}
+
+
+
+StampDetector::StampDetector(
+    Color color,
+    Stamp stamp,
+    const ImageFloatBox& box,
+    VideoOverlay* overlay
+)
+    : m_stamp(stamp)
+    , m_color(color)
+    , m_matcher(get_stamp_matcher(stamp))
+    , m_box(box)
+    , m_overlay(overlay)
+{
+
+}
+void StampDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_box);
+}
+bool StampDetector::detect(const ImageViewRGB32& screen){
+
+    double screen_rel_size = (screen.height() / 1080.0);
+    double screen_rel_size_2 = screen_rel_size * screen_rel_size;
+
+    double min_area_1080p = 800;
+    size_t min_area = size_t(screen_rel_size_2 * min_area_1080p);
+
+    bool found = match_template_by_waterfill(
+        screen.size(),
+        extract_box_reference(screen, m_box),
+        m_matcher,
+        {filter(m_stamp)},
+        {min_area, SIZE_MAX},
+        m_matcher.m_max_rmsd,
+        [&](Kernels::Waterfill::WaterfillObject& object) -> bool {
+            m_last_detected = translate_to_parent(screen, m_box, object);
+            return true;
+        }
+    );
+
+    if (m_overlay){
+        if (found){
+            m_last_detected_box.emplace(*m_overlay, m_last_detected, COLOR_GREEN);
+        }else{
+            m_last_detected_box.reset();
+        }
+    }
+
+    return found;
+}
+
+class RecipeIconMatcher : public ImageMatch::WaterfillTemplateMatcher{
+public:
+    // Match the yellow negative space for the recipe icon
+    RecipeIconMatcher(const char* path)
+        : WaterfillTemplateMatcher(
+            path,
+            Color(210, 180, 0), Color(255, 250, 160), 2100
+        )
+    {
+        m_aspect_ratio_lower = 0.9;
+        m_aspect_ratio_upper = 1.1;
+        m_area_ratio_lower = 0.85;
+        m_area_ratio_upper = 1.1;
+    }
+
+    static const RecipeIconMatcher& single_matcher(){
+        static RecipeIconMatcher matcher("PokemonPokopia/Recipe.png");
+        return matcher;
+    }
+    static const RecipeIconMatcher& double_matcher(){
+        static RecipeIconMatcher matcher("PokemonPokopia/DoubleRecipe.png");
+        return matcher;
+    }
+    static const RecipeIconMatcher& triple_matcher(){
+        static RecipeIconMatcher matcher("PokemonPokopia/TripleRecipe.png");
+        return matcher;
+    }
+    static const RecipeIconMatcher& quad_matcher(){
+        static RecipeIconMatcher matcher("PokemonPokopia/QuadRecipe.png");
+        return matcher;
+    }
+};
+
+RecipeIconDetector::RecipeIconDetector(
+    Color color,
+    VideoOverlay* overlay,
+    const ImageFloatBox& box
+)
+    : m_color(color)
+    , m_overlay(overlay)
+    , m_arrow_box(box)
+{}
+void RecipeIconDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_arrow_box);
+}
+bool RecipeIconDetector::detect(const ImageViewRGB32& screen){
+    double screen_rel_size = (screen.height() / 1080.0);
+    double screen_rel_size_2 = screen_rel_size * screen_rel_size;
+
+    double min_area_1080p = 500;
+    double rmsd_threshold = 100;
+    size_t min_area = size_t(screen_rel_size_2 * min_area_1080p);
+
+    const std::vector<std::pair<uint32_t, uint32_t>> FILTERS = {
+        {0xffd2b400, 0xfffffaa0} // RGB(210, 180, 0), RGB(255, 250, 160)
+    };
+
+    const std::vector<std::pair<const RecipeIconMatcher&, RecipeType>> matchers = {
+        {RecipeIconMatcher::single_matcher(), RecipeType::SINGLE},
+        {RecipeIconMatcher::double_matcher(), RecipeType::DOUBLE},
+        {RecipeIconMatcher::triple_matcher(), RecipeType::TRIPLE},
+        {RecipeIconMatcher::quad_matcher(), RecipeType::QUAD},
+    };
+
+    bool found = false;
+    m_recipe_type = RecipeType::NOT_RECIPE;
+
+    for (const auto& matcher_info : matchers){
+        found = match_template_by_waterfill(
+            screen.size(),
+            extract_box_reference(screen, m_arrow_box),
+            matcher_info.first,
+            FILTERS,
+            {min_area, SIZE_MAX},
+            rmsd_threshold,
+            [&](Kernels::Waterfill::WaterfillObject& object) -> bool {
+                m_last_detected = translate_to_parent(screen, m_arrow_box, object);
+                return true;
+            }
+        );
+        if (found){
+            m_recipe_type = matcher_info.second;
+            break;
+        }
+    }
+
+    if (m_overlay){
+        if (found){
+            m_last_detected_box.emplace(*m_overlay, m_last_detected, COLOR_GREEN);
+        }else{
+            m_last_detected_box.reset();
+        }
+    }
+
+    return found;
+}
+
+CoinCountDetector::CoinCountDetector(Logger& logger)
+: m_logger(logger)
+// location in the shop menu
+, m_coin_count_box{0.900000, 0.053000, 0.075000, 0.035000}
+{}
+
+void CoinCountDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(COLOR_WHITE, m_coin_count_box);
+}
+
+bool CoinCountDetector::detect(const ImageViewRGB32& screen){
+    const ImageViewRGB32 coin_image_crop = extract_box_reference(screen, m_coin_count_box);
+
+    const bool text_inside_range = true;
+    const bool prioritize_numeric_only_results = true;
+    const size_t width_max = SIZE_MAX;
+    // The coin crop includes the "," in coin numbers like "1,000".
+    // We have to use `min_digit_area` to filter out "," when doing OCR.
+    // The min digit area computation is that any dot with size smaller than coin_image_crop.height()/5 is filtered out when OCR.
+    const size_t min_digit_area = coin_image_crop.height()*coin_image_crop.height() / 25;
+    m_coin_count = 0;
+    const std::vector<std::pair<uint32_t, uint32_t>> filters = {
+        {0xff808080, 0xffffffff},
+        {0xffa0a0a0, 0xffffffff},
+        {0xffc0c0c0, 0xffffffff},
+        {0xffe0e0e0, 0xffffffff},
+        {0xfff0f0f0, 0xffffffff},
+    };
+    int number = OCR::read_number_waterfill_multifilter(
+        m_logger,
+        GlobalThreadPools::computation_realtime(),
+        coin_image_crop, filters,
+        text_inside_range, prioritize_numeric_only_results, width_max, min_digit_area
+    );
+    if (number <= 0 || number > 999999){
+        return false;
+    }
+    m_coin_count = static_cast<uint32_t>(number);
+    return true;
+}
+
+CoinCountWatcher::CoinCountWatcher(Logger& logger)
+: CoinCountDetector(logger), VisualInferenceCallback("CoinCountWatcher")
+{}
+
+void CoinCountWatcher::make_overlays(VideoOverlaySet& items) const{
+    CoinCountDetector::make_overlays(items);
+}
+
+bool CoinCountWatcher::process_frame(const ImageViewRGB32& frame, WallClock timestamp){
+    return detect(frame);
+}
+
+class CoinIconMatcher : public ImageMatch::WaterfillTemplateMatcher{
+public:
+    CoinIconMatcher()
+        : WaterfillTemplateMatcher(
+            "PokemonPokopia/Coin.png",
+            Color(210, 150, 30), Color(255, 240, 140), 900
+        )
+    {
+        m_aspect_ratio_lower = 0.9;
+        m_aspect_ratio_upper = 1.1;
+        m_area_ratio_lower = 0.85;
+        m_area_ratio_upper = 1.1;
+    }
+};
+
+CoinIconDetector::CoinIconDetector(
+    Color color,
+    VideoOverlay* overlay,
+    const ImageFloatBox& box
+)
+    : m_color(color)
+    , m_overlay(overlay)
+    , m_arrow_box(box)
+{}
+void CoinIconDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_arrow_box);
+}
+bool CoinIconDetector::detect(const ImageViewRGB32& screen){
+    double screen_rel_size = (screen.height() / 1080.0);
+    double screen_rel_size_2 = screen_rel_size * screen_rel_size;
+
+    double min_area_1080p = 200;
+    double rmsd_threshold = 100;
+    size_t min_area = size_t(screen_rel_size_2 * min_area_1080p);
+
+    const std::vector<std::pair<uint32_t, uint32_t>> FILTERS = {
+        {0xffd2961e, 0xfffff08c} // RGB(210, 150, 30), RGB(255, 240, 140)
+    };
+
+    bool found = match_template_by_waterfill(
+        screen.size(),
+        extract_box_reference(screen, m_arrow_box),
+        CoinIconMatcher(),
+        FILTERS,
+        {min_area, SIZE_MAX},
+        rmsd_threshold,
+        [&](Kernels::Waterfill::WaterfillObject& object) -> bool {
+            m_last_detected = translate_to_parent(screen, m_arrow_box, object);
+            return true;
+        }
+    );
+
+    if (m_overlay){
+        if (found){
+            m_last_detected_box.emplace(*m_overlay, m_last_detected, COLOR_GREEN);
+        }else{
+            m_last_detected_box.reset();
+        }
+    }
+
+    return found;
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonPokopia/Inference/PokemonPokopia_PCDetection.h b/SerialPrograms/Source/VideoGames/PokemonPokopia/Inference/PokemonPokopia_PCDetection.h
new file mode 100644
index 0000000000..04d8225711
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonPokopia/Inference/PokemonPokopia_PCDetection.h
@@ -0,0 +1,251 @@
+/*  PC Detection
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonPokopia_PCDetection_H
+#define PokemonAutomation_PokemonPokopia_PCDetection_H
+
+#include <optional>
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/VisualDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonPokopia{
+
+// The stamp locations actually move week to week, get the locations dynamically
+// const ImageFloatBox STAMP1_BOX{0.057000, 0.162500, 0.167000, 0.300000};
+// const ImageFloatBox STAMP2_BOX{0.109000, 0.568000, 0.167000, 0.300000};
+// const ImageFloatBox STAMP3_BOX{0.257000, 0.291000, 0.167000, 0.300000};
+// const ImageFloatBox STAMP4_BOX{0.396500, 0.570000, 0.167000, 0.300000};
+// const ImageFloatBox STAMP5_BOX{0.496000, 0.206000, 0.167000, 0.300000};
+const ImageFloatBox TODAYS_STAMP_BOX{0.759000, 0.322000, 0.167000, 0.300000};
+
+// TODO: Add Mewtwo and legendary bird stamps
+enum class Stamp{
+    MEW,
+    OTHER // Other includes no stamp for now
+};
+
+class InfoIconDetector : public StaticScreenDetector{
+public:
+    InfoIconDetector(
+        Color color,
+        VideoOverlay* overlay,
+        const ImageFloatBox& box
+    );
+
+    const ImageFloatBox& last_detected() const { return m_last_detected; }
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+
+    //  This is not const so that detectors can save/cache state.
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    friend class InfoIconWatcher;
+
+    const Color m_color;
+    VideoOverlay* m_overlay;
+    const ImageFloatBox m_arrow_box;
+
+    ImageFloatBox m_last_detected;
+    std::optional<OverlayBoxScope> m_last_detected_box;
+};
+class InfoIconWatcher : public DetectorToFinder<InfoIconDetector>{
+public:
+    InfoIconWatcher(
+        Color color,
+        VideoOverlay* overlay,
+        const ImageFloatBox& box,
+        std::chrono::milliseconds hold_duration = std::chrono::milliseconds(250)
+    )
+         : DetectorToFinder("InfoIconWatcher", hold_duration, color, overlay, box)
+    {}
+};
+
+class BlueDialogDetector : public StaticScreenDetector{
+public:
+    BlueDialogDetector(Color color = COLOR_RED);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+
+    //  This is not const so that detectors can save/cache state.
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    friend class BlueDialogWatcher;
+
+    const Color m_color;
+    const ImageFloatBox m_box;
+};
+class BlueDialogWatcher : public DetectorToFinder<BlueDialogDetector>{
+public:
+    BlueDialogWatcher(
+        Color color = COLOR_RED,
+        std::chrono::milliseconds hold_duration = std::chrono::milliseconds(250)
+    )
+         : DetectorToFinder("BlueDialogWatcher", hold_duration, color)
+    {}
+};
+
+class StampMatcher;
+
+class StampDetector : public StaticScreenDetector{
+public:
+    StampDetector(
+        Color color,
+        Stamp stamp,
+        const ImageFloatBox& box,
+        VideoOverlay* overlay = nullptr
+    );
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+    virtual void reset_state() override { m_last_detected_box.reset(); }
+
+    Stamp stamp() const { return m_stamp; }
+
+private:
+    Stamp m_stamp;
+    Color m_color;
+    const StampMatcher& m_matcher;
+    ImageFloatBox m_box;
+    VideoOverlay* m_overlay;
+
+    ImageFloatBox m_last_detected;
+    std::optional<OverlayBoxScope> m_last_detected_box;
+};
+class StampWatcher : public DetectorToFinder<StampDetector>{
+public:
+    StampWatcher(
+        Color color,
+        Stamp stamp,
+        const ImageFloatBox& box,
+        VideoOverlay* overlay = nullptr,
+        std::chrono::milliseconds hold_duration = std::chrono::milliseconds(250)
+    )
+         : DetectorToFinder("StampWatcher", hold_duration, color, stamp, box, overlay)
+    {}
+};
+
+enum class RecipeType{
+    SINGLE,
+    DOUBLE,
+    TRIPLE,
+    QUAD,
+    NOT_RECIPE
+};
+
+class RecipeIconDetector : public StaticScreenDetector{
+public:
+    RecipeIconDetector(
+        Color color,
+        VideoOverlay* overlay,
+        const ImageFloatBox& box
+    );
+
+    const ImageFloatBox& last_detected() const { return m_last_detected; }
+    const RecipeType& recipe_type() const { return m_recipe_type; }
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+
+    //  This is not const so that detectors can save/cache state.
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    friend class RecipeWatcher;
+
+    const Color m_color;
+    VideoOverlay* m_overlay;
+    const ImageFloatBox m_arrow_box;
+
+    RecipeType m_recipe_type;
+    ImageFloatBox m_last_detected;
+    std::optional<OverlayBoxScope> m_last_detected_box;
+};
+class RecipeIconWatcher : public DetectorToFinder<RecipeIconDetector>{
+public:
+    RecipeIconWatcher(
+        Color color,
+        VideoOverlay* overlay,
+        const ImageFloatBox& box,
+        std::chrono::milliseconds hold_duration = std::chrono::milliseconds(250)
+    )
+         : DetectorToFinder("RecipeIconWatcher", hold_duration, color, overlay, box)
+    {}
+};
+
+class CoinCountDetector : public StaticScreenDetector{
+public:
+    CoinCountDetector(Logger& logger);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+
+    //  This is not const so that detectors can save/cache state.
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+    uint32_t coin_count() const { return m_coin_count; }
+
+private:
+    Logger& m_logger;
+    ImageFloatBox m_coin_count_box;
+
+    uint32_t m_coin_count = 0;
+};
+
+class CoinCountWatcher : public CoinCountDetector, public VisualInferenceCallback{
+public:
+    CoinCountWatcher(Logger& logger);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+
+    virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override;
+};
+
+class CoinIconDetector : public StaticScreenDetector{
+public:
+    CoinIconDetector(
+        Color color,
+        VideoOverlay* overlay,
+        const ImageFloatBox& box
+    );
+
+    const ImageFloatBox& last_detected() const { return m_last_detected; }
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+
+    //  This is not const so that detectors can save/cache state.
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    friend class CoinIconWatcher;
+
+    const Color m_color;
+    VideoOverlay* m_overlay;
+    const ImageFloatBox m_arrow_box;
+
+    ImageFloatBox m_last_detected;
+    std::optional<OverlayBoxScope> m_last_detected_box;
+};
+class CoinIconWatcher : public DetectorToFinder<CoinIconDetector>{
+public:
+    CoinIconWatcher(
+        Color color,
+        VideoOverlay* overlay,
+        const ImageFloatBox& box,
+        std::chrono::milliseconds hold_duration = std::chrono::milliseconds(250)
+    )
+         : DetectorToFinder("CoinIconWatcher", hold_duration, color, overlay, box)
+    {}
+};
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonPokopia/Inference/PokemonPokopia_SelectionArrowDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonPokopia/Inference/PokemonPokopia_SelectionArrowDetector.cpp
new file mode 100644
index 0000000000..4ac6ee767f
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonPokopia/Inference/PokemonPokopia_SelectionArrowDetector.cpp
@@ -0,0 +1,110 @@
+/*  Selection Arrow Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Exceptions.h"
+#include "Kernels/Waterfill/Kernels_Waterfill_Types.h"
+#include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h"
+#include "CommonTools/Images/WaterfillUtilities.h"
+#include "PokemonPokopia_SelectionArrowDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonPokopia{
+
+
+
+class SelectionArrowMatcher : public ImageMatch::WaterfillTemplateMatcher{
+public:
+    SelectionArrowMatcher(const char* path)
+        : WaterfillTemplateMatcher(
+            path, 
+            Color(240, 170, 0), Color(255, 255, 200),
+            100
+        )
+    {
+        m_aspect_ratio_lower = 0.9;
+        m_aspect_ratio_upper = 1.1;
+        m_area_ratio_lower = 0.85;
+        m_area_ratio_upper = 1.1;
+    }
+
+    static const SelectionArrowMatcher& matcher(SelectionArrowType type){
+        switch (type){
+        case SelectionArrowType::RIGHT:
+            return RIGHT_ARROW();
+        case SelectionArrowType::DOWN:
+            return DOWN_ARROW();
+        default:
+            throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Invalid enum.");
+        }
+    }
+    static const SelectionArrowMatcher& RIGHT_ARROW(){
+        static SelectionArrowMatcher matcher("PokemonPokopia/SelectionArrowRight.png");
+        return matcher;
+    }
+    static const SelectionArrowMatcher& DOWN_ARROW(){
+        static SelectionArrowMatcher matcher("PokemonPokopia/SelectionArrowDown.png");
+        return matcher;
+    }
+};
+
+
+
+SelectionArrowDetector::SelectionArrowDetector(
+    Color color,
+    VideoOverlay* overlay,
+    SelectionArrowType type,
+    const ImageFloatBox& box
+)
+    : m_color(color)
+    , m_overlay(overlay)
+    , m_type(type)
+    , m_arrow_box(box)
+{}
+void SelectionArrowDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_arrow_box);
+}
+bool SelectionArrowDetector::detect(const ImageViewRGB32& screen){
+    double screen_rel_size = (screen.height() / 1080.0);
+    double screen_rel_size_2 = screen_rel_size * screen_rel_size;
+
+    double min_area_1080p = 400;
+    double rmsd_threshold = 100;
+    size_t min_area = size_t(screen_rel_size_2 * min_area_1080p);
+
+    const std::vector<std::pair<uint32_t, uint32_t>> FILTERS = {
+        {0xfff0aa00, 0xffffffc8} // RGB(240, 170, 0), RGB(255, 255, 200)
+    };
+
+    bool found = match_template_by_waterfill(
+        screen.size(),
+        extract_box_reference(screen, m_arrow_box),
+        SelectionArrowMatcher::matcher(m_type),
+        FILTERS,
+        {min_area, SIZE_MAX},
+        rmsd_threshold,
+        [&](Kernels::Waterfill::WaterfillObject& object) -> bool {
+            m_last_detected = translate_to_parent(screen, m_arrow_box, object);
+            return true;
+        }
+    );
+
+    if (m_overlay){
+        if (found){
+            m_last_detected_box.emplace(*m_overlay, m_last_detected, COLOR_GREEN);
+        }else{
+            m_last_detected_box.reset();
+        }
+    }
+
+    return found;
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonPokopia/Inference/PokemonPokopia_SelectionArrowDetector.h b/SerialPrograms/Source/VideoGames/PokemonPokopia/Inference/PokemonPokopia_SelectionArrowDetector.h
new file mode 100644
index 0000000000..b5122e87cb
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonPokopia/Inference/PokemonPokopia_SelectionArrowDetector.h
@@ -0,0 +1,74 @@
+/*  Selection Arrow Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonPokopia_SelectionArrowDetector_H
+#define PokemonAutomation_PokemonPokopia_SelectionArrowDetector_H
+
+#include <optional>
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/VisualDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonPokopia{
+
+
+enum class SelectionArrowType{
+    RIGHT,
+    DOWN,
+};
+
+
+// Note: there are two slightly different colored arrows
+// A single filter currently is capturing both and using the same template
+// If there are issues, then use both templates
+class SelectionArrowDetector : public StaticScreenDetector{
+public:
+    SelectionArrowDetector(
+        Color color,
+        VideoOverlay* overlay,
+        SelectionArrowType type,
+        const ImageFloatBox& box
+    );
+
+    const ImageFloatBox& last_detected() const { return m_last_detected; }
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+
+    //  This is not const so that detectors can save/cache state.
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    friend class SelectionArrowWatcher;
+
+    const Color m_color;
+    VideoOverlay* m_overlay;
+    const SelectionArrowType m_type;
+    const ImageFloatBox m_arrow_box;
+
+    ImageFloatBox m_last_detected;
+    std::optional<OverlayBoxScope> m_last_detected_box;
+};
+class SelectionArrowWatcher : public DetectorToFinder<SelectionArrowDetector>{
+public:
+    SelectionArrowWatcher(
+        Color color,
+        VideoOverlay* overlay,
+        SelectionArrowType type,
+        const ImageFloatBox& box,
+        std::chrono::milliseconds hold_duration = std::chrono::milliseconds(250)
+    )
+         : DetectorToFinder("SelectionArrowWatcher", hold_duration, color, overlay, type, box)
+    {}
+};
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonPokopia/Inference/PokemonPokopia_SettingsScreenDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonPokopia/Inference/PokemonPokopia_SettingsScreenDetector.cpp
new file mode 100644
index 0000000000..3607592b99
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonPokopia/Inference/PokemonPokopia_SettingsScreenDetector.cpp
@@ -0,0 +1,37 @@
+/*  Settings Screen Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/ImageTools/ImageStats.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Images/SolidColorTest.h"
+#include "PokemonPokopia_SettingsScreenDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonPokopia{
+
+
+SettingsScreenDetector::SettingsScreenDetector(ImageFloatBox box)
+    : m_box(box)
+{}
+
+void SettingsScreenDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(COLOR_WHITE, m_box);
+}
+
+bool SettingsScreenDetector::detect(const ImageViewRGB32& screen){
+    const ImageStats stats = image_stats(extract_box_reference(screen, m_box));
+    if (!is_solid(stats, {0.427, 0.397, 0.176})){
+        return false;
+    }
+    return true;
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonPokopia/Inference/PokemonPokopia_SettingsScreenDetector.h b/SerialPrograms/Source/VideoGames/PokemonPokopia/Inference/PokemonPokopia_SettingsScreenDetector.h
new file mode 100644
index 0000000000..6073605b7a
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonPokopia/Inference/PokemonPokopia_SettingsScreenDetector.h
@@ -0,0 +1,50 @@
+/*  Settings Screen Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonPokopia_SettingsScreenDetector_H
+#define PokemonAutomation_PokemonPokopia_SettingsScreenDetector_H
+
+#include <optional>
+#include "Common/Cpp/Color.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/VisualDetector.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonPokopia{
+
+
+// Detector the solid boxes on the settings screen
+class SettingsScreenDetector : public StaticScreenDetector{
+public:
+    SettingsScreenDetector(ImageFloatBox box);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    const ImageFloatBox m_box;
+};
+
+class SettingsScreenWatcher : public DetectorToFinder<SettingsScreenDetector>{
+public:
+    SettingsScreenWatcher(
+        ImageFloatBox box,
+        std::chrono::milliseconds hold_duration = std::chrono::milliseconds(100)
+    )
+         : DetectorToFinder("SettingsScreenWatcher", hold_duration, box)
+    {}
+};
+
+
+
+}
+}
+}
+#endif
\ No newline at end of file
diff --git a/SerialPrograms/Source/VideoGames/PokemonPokopia/PokemonPokopia_Panels.cpp b/SerialPrograms/Source/VideoGames/PokemonPokopia/PokemonPokopia_Panels.cpp
new file mode 100644
index 0000000000..024d780ed2
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonPokopia/PokemonPokopia_Panels.cpp
@@ -0,0 +1,59 @@
+/*  Pokemon FRLG Panels
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/StaticGlobals.h"
+#include "CommonFramework/GlobalAutoPaths.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "PokemonPokopia_Panels.h"
+
+#include "PokemonPokopia_Settings.h"
+
+// General
+#include "Programs/PokemonPokopia_CloudIslandReset.h"
+#include "Programs/PokemonPokopia_DailyFarmer.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonPokopia{
+
+
+
+PanelListFactory::PanelListFactory()
+    : PanelListDescriptor(
+        Pokemon::STRING_POKEMON + " Pokopia",
+        RESOURCE_PATH() + "CategoryIcons/PokemonPokopia.png"
+    )
+{}
+
+std::vector<PanelEntry> PanelListFactory::make_panels() const{
+    std::vector<PanelEntry> ret;
+    
+    ret.emplace_back("---- Settings ----");
+    ret.emplace_back(make_OptionsPanel<GameSettingsPanel>());
+
+    // ret.emplace_back("---- Farming ----");
+
+    ret.emplace_back("---- General ----");
+    if (IS_BETA_VERSION || STATIC_GLOBALS.DEVELOPER_MODE){
+        // Locking behind dev mode for now since this program is destructive and deletes your cloud island
+    }
+
+    ret.emplace_back("---- Untested/Beta/WIP ----");
+    ret.emplace_back(make_SingleSwitchProgram<CloudIslandReset>());
+    ret.emplace_back(make_SingleSwitchProgram<DailyFarmer>());
+
+    // if (STATIC_GLOBALS.DEVELOPER_MODE){
+    //     ret.emplace_back("---- Developer Tools ----");
+    // }
+
+    return ret;
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonPokopia/PokemonPokopia_Panels.h b/SerialPrograms/Source/VideoGames/PokemonPokopia/PokemonPokopia_Panels.h
new file mode 100644
index 0000000000..8fd7815ec2
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonPokopia/PokemonPokopia_Panels.h
@@ -0,0 +1,30 @@
+/*  Pokemon Pokopia
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonPokopia_Panels_H
+#define PokemonAutomation_PokemonPokopia_Panels_H
+
+#include "CommonFramework/Panels/PanelList.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonPokopia{
+
+
+
+class PanelListFactory : public PanelListDescriptor{
+public:
+    PanelListFactory();
+private:
+    virtual std::vector<PanelEntry> make_panels() const override;
+};
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonPokopia/PokemonPokopia_Settings.cpp b/SerialPrograms/Source/VideoGames/PokemonPokopia/PokemonPokopia_Settings.cpp
new file mode 100644
index 0000000000..bc8b05dd64
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonPokopia/PokemonPokopia_Settings.cpp
@@ -0,0 +1,64 @@
+/*  Pokemon Pokopia
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Pokemon/Pokemon_Strings.h"
+#include "PokemonPokopia_Settings.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonPokopia{
+
+using namespace Pokemon;
+
+
+
+GameSettings& GameSettings::instance(){
+    static GameSettings settings;
+    return settings;
+}
+GameSettings::GameSettings()
+    : BatchOption(LockMode::LOCK_WHILE_RUNNING)
+    , m_general("<font size=4><b>General Settings:</b></font>")
+    , m_advanced_options(
+        "<font size=4><b>Advanced Options:</b> You should not need to touch anything below here.</font>"
+    )
+{
+    PA_ADD_STATIC(m_general);
+    PA_ADD_STATIC(m_advanced_options);
+}
+
+
+
+
+GameSettings_Descriptor::GameSettings_Descriptor()
+    : OptionsPanelDescriptor(
+        "PokemonPokopia:GlobalSettings",
+        STRING_POKEMON + " Pokopia", "Game Settings",
+        "Programs/PokemonPokopia/PokemonSettings.html",
+        "Global " + STRING_POKEMON + " Pokopia Settings",
+        PanelQualityStanding::OFFICIAL
+    )
+{}
+
+
+
+GameSettingsPanel::GameSettingsPanel()
+    : settings(GameSettings::instance())
+{
+    PA_ADD_OPTION(settings);
+}
+
+
+
+}
+}
+}
+
+
+
+
+
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonPokopia/PokemonPokopia_Settings.h b/SerialPrograms/Source/VideoGames/PokemonPokopia/PokemonPokopia_Settings.h
new file mode 100644
index 0000000000..1e3983873b
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonPokopia/PokemonPokopia_Settings.h
@@ -0,0 +1,51 @@
+/*  Pokemon Pokopia
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonPokopia_Settings_H
+#define PokemonAutomation_PokemonPokopia_Settings_H
+
+#include "Common/Cpp/Options/StaticTextOption.h"
+#include "CommonFramework/Panels/OptionsPanel.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonPokopia{
+
+
+class GameSettings : public BatchOption{
+    GameSettings();
+public:
+    static GameSettings& instance();
+
+    SectionDividerOption m_general;
+    SectionDividerOption m_advanced_options;
+
+
+};
+
+
+
+
+class GameSettings_Descriptor : public OptionsPanelDescriptor{
+public:
+    GameSettings_Descriptor();
+};
+
+
+class GameSettingsPanel : public OptionsPanelInstance{
+public:
+    using Descriptor = GameSettings_Descriptor;
+    GameSettingsPanel();
+private:
+    GameSettings& settings;
+};
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonPokopia/Programs/PokemonPokopia_CloudIslandReset.cpp b/SerialPrograms/Source/VideoGames/PokemonPokopia/Programs/PokemonPokopia_CloudIslandReset.cpp
new file mode 100644
index 0000000000..6fccc39675
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonPokopia/Programs/PokemonPokopia_CloudIslandReset.cpp
@@ -0,0 +1,457 @@
+/*  Cloud Island Reset
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+//#include "CommonFramework/Logging/Logger.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/Tools/ErrorDumper.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "CommonTools/VisualDetectors/BlackScreenDetector.h"
+#include "CommonTools/StartupChecks/VideoResolutionCheck.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonPokopia/Inference/PokemonPokopia_ButtonDetector.h"
+#include "VideoGames/PokemonPokopia/Inference/PokemonPokopia_PCDetection.h"
+#include "VideoGames/PokemonPokopia/Inference/PokemonPokopia_SettingsScreenDetector.h"
+
+#include "VideoGames/PokemonPokopia/Programs/PokemonPokopia_PCNavigation.h"
+#include "VideoGames/PokemonPokopia/Programs/PokemonPokopia_CloudIslandReset.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonPokopia{
+
+using namespace Pokemon;
+
+
+CloudIslandReset_Descriptor::CloudIslandReset_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonPokopia:CloudIslandReset",
+        STRING_POKEMON + " Pokopia", "Cloud Island Reset",
+        "Programs/PokemonPokopia/CloudIslandReset.html",
+        "Reset the Cloud Island for Mew stamps and recipes.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+class CloudIslandReset_Descriptor::Stats : public StatsTracker{
+public:
+    Stats()
+        : resets(m_stats["Resets"])
+        , mew_stamps(m_stats["Mew Stamps"])
+        , recipes_purchased(m_stats["Recipes Purchased"])
+        , errors(m_stats["Errors"])
+    {
+        m_display_order.emplace_back("Resets");
+        m_display_order.emplace_back("Mew Stamps");
+        m_display_order.emplace_back("Recipes Purchased");
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+    }
+
+    std::atomic<uint64_t>& resets;
+    std::atomic<uint64_t>& mew_stamps;
+    std::atomic<uint64_t>& recipes_purchased;
+    std::atomic<uint64_t>& errors;
+};
+std::unique_ptr<StatsTracker> CloudIslandReset_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+
+CloudIslandReset::CloudIslandReset()
+    : STOP_AFTER_CURRENT("Reset")
+    , NUM_RESETS(
+        "<b>Number of Resets to Run:</b><br>"
+        "Zero will run until 'Stop after Current Reset' is pressed or the program is manually stopped.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        500,
+        0
+    )
+    , COLLECT_MEW_STAMPS(
+        "<b>Collect Mew Stamps:</b><br>"
+        "Whether to collect Mew stamps from the Cloud Islands",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        true
+    )
+    , BUY_RECIPES(
+        "<b>Buy Recipes:</b><br>"
+        "Whether to buy recipes from the Cloud Island shop.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        false
+    )
+    , SPEND_LIMIT(
+        "<b>Spend Limit:</b><br>"
+        "The limit for how many Life Coins should remain after buying recipes.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        5000,
+        0
+    )
+    , GO_HOME_WHEN_DONE(false)
+    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_STATUS_UPDATE,
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+{
+    PA_ADD_OPTION(STOP_AFTER_CURRENT);
+    PA_ADD_OPTION(NUM_RESETS);
+    PA_ADD_OPTION(COLLECT_MEW_STAMPS);
+    PA_ADD_OPTION(BUY_RECIPES);
+    PA_ADD_OPTION(SPEND_LIMIT);
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+void CloudIslandReset::delete_cloud_island_save(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    CloudIslandReset_Descriptor::Stats& stats = env.current_stats<CloudIslandReset_Descriptor::Stats>();
+
+    access_pc_from_overworld(env.console, context);
+    env.console.log("Opened PC menu");
+
+    open_menu_option(env.console, context, PCMenuOption::LINK_PLAY);
+    env.console.log("Opened Link Play menu");
+
+    // Navigate top level Link Play menu and enter settings [invite, visit, play, settings])
+    generic_select_and_open(env.console, context, LINK_PLAY_MENU, 3, SelectionArrowType::RIGHT);
+    env.console.log("Opened Link Play Settings menu");
+
+    // Navigate Link Play Settings menu and enter Cloud Island Settings [Palette Town, Cloud Island]
+    std::vector<ImageFloatBox> settings_menu_boxes = get_generic_options_boxes(2);
+    generic_select_and_open(env.console, context, settings_menu_boxes, 1, SelectionArrowType::RIGHT);
+    env.console.log("Opened Cloud Island Settings menu");
+
+    // Navigate to the delete option in settings
+    SettingsScreenWatcher settings_loaded_watcher({0.342500, 0.170000, 0.050000, 0.143000}); // Top setting, used to detect page is loaded
+    SettingsScreenWatcher delete_button_watcher({0.342500, 0.521500, 0.050000, 0.143000}); // Bottom setting
+    int ret = wait_until(
+        env.console, context,
+        30s,
+        {
+            settings_loaded_watcher
+        }
+    );
+    if (ret != 0){
+        env.console.log("Failed to detect settings menu loaded");
+        stats.errors++;
+        env.update_stats();
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "delete_cloud_island_save() failed to detect settings menu loaded",
+            env.console
+        );
+    }
+    ret = run_until<ProControllerContext>(
+        env.console, context,
+        [&](ProControllerContext& context){
+            for (int i = 0; i < 5; i++){
+                pbf_press_dpad(context, DPAD_UP, 160ms, 1500ms);
+            }
+        },
+        {delete_button_watcher}
+    );
+    if (ret != 0){
+        env.console.log("Failed to navigate to delete save option");
+        stats.errors++;
+        env.update_stats();
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "delete_cloud_island_save() failed to navigate to delete save option",
+            env.console
+         );
+    }
+    env.console.log("Navigated to delete save option");
+
+    // Select delete
+    continue_until_prompt(env.console, context, CONFIRM_NO_BOX);
+    env.console.log("Navigated through delete confirmation");
+
+    yes_no_select_and_confirm(env.console, context, true);
+    env.console.log("Confirmed delete");
+
+    exit_pc(env.console, context);
+    env.console.log("Exited PC menu");
+}
+
+void CloudIslandReset::create_cloud_island_after_delete(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    CloudIslandReset_Descriptor::Stats& stats = env.current_stats<CloudIslandReset_Descriptor::Stats>();
+
+    access_pc_from_overworld(env.console, context);
+    env.console.log("Opened PC menu");
+
+    open_menu_option(env.console, context, PCMenuOption::LINK_PLAY);
+    env.console.log("Opened Link Play menu");
+
+    // Navigate top level Link Play menu and enter play Cloud Island menu [invite, visit, play, settings])
+    generic_select_and_open(env.console, context, LINK_PLAY_MENU, 2, SelectionArrowType::RIGHT);
+    env.console.log("Opened Link Play Settings menu");
+
+    // Navigate Cloud Island menu and create new Cloud Island [go to, search, create]
+    std::vector<ImageFloatBox> cloud_island_menu_boxes = get_generic_options_boxes(3);
+    generic_select_and_open(env.console, context, cloud_island_menu_boxes, 2, SelectionArrowType::RIGHT);
+    env.console.log("Opened Cloud Island Settings menu");
+
+    // Navigate Create Cloud Island menu and generate random [random, magic number]
+    std::vector<ImageFloatBox> create_cloud_island_menu_boxes = get_generic_options_boxes(2);
+    generic_select_and_open(env.console, context, create_cloud_island_menu_boxes, 0, SelectionArrowType::RIGHT);
+    env.console.log("Opened Create Cloud Island Settings menu");
+
+    // A hacky way to get through name entry and island settings, wait at final confirmation
+    ImageFloatBox final_confirm_box{0.202000, 0.722000, 0.027500, 0.057500};
+    SelectionArrowWatcher create_island_confirm_watcher(
+        COLOR_YELLOW, &env.console.overlay(),
+        SelectionArrowType::RIGHT,
+        final_confirm_box
+    );
+    int ret = run_until<ProControllerContext>(
+        env.console, context,
+        [&](ProControllerContext& context){
+            for (int i = 0; i < 20; i++){
+                pbf_press_button(context, BUTTON_A, 160ms, 1000ms);
+                pbf_press_button(context, BUTTON_PLUS, 160ms, 500ms);
+                pbf_press_button(context, BUTTON_PLUS, 160ms, 500ms);
+                pbf_press_button(context, BUTTON_PLUS, 160ms, 500ms);
+            }
+        },
+        {create_island_confirm_watcher}
+    );
+    if (ret != 0){
+        env.console.log("Failed to navigate through create island menu");
+        stats.errors++;
+        env.update_stats();
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "create_cloud_island_after_delete() failed to navigate through create island menu",
+            env.console
+         );
+    }
+    env.console.log("Waiting at create island confirmation");
+
+    generic_select_and_open(env.console, context, {final_confirm_box}, 0, SelectionArrowType::RIGHT);
+    env.console.log("Confirmed create island");
+
+    // Nearby Pokemon can randomly ask to tag along so mash B until black screen
+    BlackScreenWatcher black_screen_watcher;
+    ret = run_until<ProControllerContext>(
+        env.console, context,
+        [&](ProControllerContext& context){
+            pbf_mash_button(context, BUTTON_B, 15s);
+        },
+        {black_screen_watcher}
+    );
+    if (ret != 0){
+        env.console.log("Failed to detect travelling to new cloud island");
+        stats.errors++;
+        env.update_stats();
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "create_cloud_island_after_delete() failed to detect travelling to new cloud island",
+            env.console
+        );
+    }
+    env.console.log("Travelling to new cloud island");
+}
+
+void CloudIslandReset::open_cloud_island_pc(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    wait_for_overworld(env.console, context);
+    
+    access_pc_from_overworld(env.console, context, true);
+    env.console.log("Opened Cloud Island PC menu");
+}
+
+bool CloudIslandReset::add_todays_stamp(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    CloudIslandReset_Descriptor::Stats& stats = env.current_stats<CloudIslandReset_Descriptor::Stats>();
+    SelectionArrowWatcher replace_stamp_selection_watcher(
+        COLOR_YELLOW, &env.console.overlay(),
+        SelectionArrowType::DOWN,
+        STAMP_CARD_BOX
+    );
+
+    Stamp todays_stamp = get_stamp(env.console, context, TODAYS_STAMP_BOX);
+    if (todays_stamp != Stamp::MEW){
+        env.console.log("Today's stamp is not Mew, skipping adding to collection");
+        exit_pc(env.console, context);
+        return false;
+    }
+    env.console.log("Today's stamp is Mew, attempting to add to collection");
+    bool stamp_added = add_stamp(env.console, context, replace_stamp_selection_watcher);
+    if (stamp_added){
+        env.console.log("Added today's stamp to collection");
+        if (todays_stamp == Stamp::MEW){
+            stats.mew_stamps++;
+            env.update_stats();
+        }
+        exit_pc(env.console, context);
+        return false;
+    }
+
+    for (int i = 0; i < 5; i++){
+        env.console.log("Check stamp " + std::to_string(i + 1) + " / 5");
+        // last_detected set in navigation routines
+        ImageFloatBox selection_arrow = replace_stamp_selection_watcher.last_detected();
+        Stamp slot_stamp = get_stamp_from_selection(env.console, context, selection_arrow);
+        if (slot_stamp != Stamp::MEW){
+            env.console.log("Stamp in slot " + std::to_string(i + 1) + " is not Mew, replacing with today's stamp");
+            replace_stamp(env.console, context, replace_stamp_selection_watcher);
+            if (todays_stamp == Stamp::MEW){
+                stats.mew_stamps++;
+                env.update_stats();
+            }
+            exit_pc(env.console, context);
+            if (i == 4){ // replaced the last slot, so all stamps should be mew
+                return true;
+            }
+            return false;
+        }
+        move_to_next_stamp(env.console, context, replace_stamp_selection_watcher);
+    }
+    env.console.log("All stamps in collection are Mew, failed to add today's stamp");
+    return true;
+}
+
+bool CloudIslandReset::buy_recipes(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    CloudIslandReset_Descriptor::Stats& stats = env.current_stats<CloudIslandReset_Descriptor::Stats>();
+    CoinCountWatcher coin_watcher(env.console);
+    int ret;
+
+    open_menu_option(env.console, context, PCMenuOption::SHOP);
+    env.console.log("Opened shop menu");
+
+    for (int i = 0; i < 5; i++){
+        if (!item_is_available(env.console, context, i)){
+            env.console.log("Recipe in index " + std::to_string(i) + " is not available for purchase, skipping");
+            continue;
+        }
+        RecipeType recipe_type = item_is_recipe(env.console, context, i);
+        // recipe_type = RecipeType::SINGLE; // Bypass for testing
+        // if (i != 1) { continue; } // Bypass for testing
+        switch (recipe_type){
+        // For now, treat all recipes types with the same priority
+        // TODO: Recipes costs are assumed to be 400 here but recipes can be on sale and cheaper ones can be prioritized
+        case RecipeType::SINGLE:
+        case RecipeType::DOUBLE:
+        case RecipeType::TRIPLE:
+        case RecipeType::QUAD:
+            env.console.log("Recipe is available in index " + std::to_string(i));
+            ret = wait_until(
+                env.console, context,
+                30s,
+                {coin_watcher}
+            );
+            if (ret != 0){
+                env.console.log("Failed to read coin count in shop menu");
+                OperationFailedExceptionWithScreenshot::fire(
+                    ErrorReportMode::SEND_ERROR_REPORT,
+                    "buy_recipes() failed to read coin count in shop menu",
+                    env.console
+                );
+            }
+            env.console.log("Detected coin count: " + std::to_string(coin_watcher.coin_count()));
+            // For now, assume all recipes are the full 400 coins
+            if (coin_watcher.coin_count() - 400 < SPEND_LIMIT){
+                env.console.log("Spend limit reached, not buying more recipes");
+                return true;
+            }
+            buy_item(env.console, context, i);
+            stats.recipes_purchased++;
+            env.update_stats();
+            break;
+        case RecipeType::NOT_RECIPE:
+            env.console.log("Index " + std::to_string(i) + " does not contain a recipe, skipping");
+            continue;
+        default:
+            throw InternalProgramError(
+                nullptr, PA_CURRENT_FUNCTION,
+                "Unexpected recipe type detected in buy_recipes(): " + std::to_string((int)recipe_type)
+            );
+        }
+    }
+    exit_pc(env.console, context);
+    return false;
+}
+
+void CloudIslandReset::leave_cloud_island(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    CloudIslandReset_Descriptor::Stats& stats = env.current_stats<CloudIslandReset_Descriptor::Stats>();
+
+    access_pc_from_overworld(env.console, context);
+    env.console.log("Opened PC menu");
+
+    open_menu_option(env.console, context, PCMenuOption::LINK_PLAY);
+    env.console.log("Opened Link Play menu");
+
+    continue_until_prompt(env.console, context, CONFIRM_NO_BOX);
+    env.console.log("Navigated to leave cloud island confirmation");
+
+    yes_no_select_and_confirm(env.console, context, true);
+    env.console.log("Leaving cloud island");
+
+    BlackScreenWatcher black_screen_watcher;
+    int ret = wait_until(
+        env.console, context,
+        60s,
+        {black_screen_watcher}
+    );
+    if (ret != 0){
+        env.console.log("Failed to detect leaving cloud island");
+        stats.errors++;
+        env.update_stats();
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "leave_cloud_island() failed to detect leaving cloud island",
+            env.console
+        );
+    }
+}
+
+void CloudIslandReset::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    assert_16_9_720p_min(env.logger(), env.console);
+
+    CloudIslandReset_Descriptor::Stats& stats = env.current_stats<CloudIslandReset_Descriptor::Stats>();
+
+    DeferredStopButtonOption::ResetOnExit reset_on_exit(STOP_AFTER_CURRENT);
+
+    bool all_stamps_mew = false;
+    bool spend_limit_reached = false;
+
+    while (NUM_RESETS == 0 || stats.resets < NUM_RESETS){
+        delete_cloud_island_save(env, context);
+        create_cloud_island_after_delete(env, context);
+        stats.resets++;
+
+        open_cloud_island_pc(env, context);
+        if (COLLECT_MEW_STAMPS && !all_stamps_mew){
+            all_stamps_mew = add_todays_stamp(env, context);
+        }
+        else {
+            exit_pc(env.console, context); // Exit PC since first access always force opens stamp card
+        }
+
+        if (BUY_RECIPES && !spend_limit_reached){
+            open_cloud_island_pc(env, context);
+            spend_limit_reached = buy_recipes(env, context);
+        }
+
+        leave_cloud_island(env, context);
+        bool collect_mew_stamps_done = !COLLECT_MEW_STAMPS || (COLLECT_MEW_STAMPS && all_stamps_mew);
+        bool buy_recipes_done = !BUY_RECIPES || (BUY_RECIPES && spend_limit_reached);
+
+        if (STOP_AFTER_CURRENT.should_stop() || (collect_mew_stamps_done && buy_recipes_done)){
+            break;
+        }
+    }
+
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+    GO_HOME_WHEN_DONE.run_end_of_program(context);
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonPokopia/Programs/PokemonPokopia_CloudIslandReset.h b/SerialPrograms/Source/VideoGames/PokemonPokopia/Programs/PokemonPokopia_CloudIslandReset.h
new file mode 100644
index 0000000000..452ef908f6
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonPokopia/Programs/PokemonPokopia_CloudIslandReset.h
@@ -0,0 +1,84 @@
+/*  Cloud Island Reset
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonPokopia_CloudIslandReset_H
+#define PokemonAutomation_PokemonPokopia_CloudIslandReset_H
+
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "Common/Cpp/Options/ButtonOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+
+namespace PokemonAutomation{
+
+template <typename Type> class ControllerContext;
+
+namespace NintendoSwitch{
+
+class ProController;
+using ProControllerContext = ControllerContext<ProController>;
+
+namespace PokemonPokopia{
+
+
+class CloudIslandReset_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    CloudIslandReset_Descriptor();
+
+    class Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+
+class CloudIslandReset : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = CloudIslandReset_Descriptor;
+    CloudIslandReset();
+
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    // Starting from the overworld, navigate through the PC menu to delete the existing cloud island save and return to overworld
+    void delete_cloud_island_save(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+
+    // Starting from the overworld, create a new cloud island assuming none exists
+    void create_cloud_island_after_delete(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+
+    // Open the PC of a fresh cloud island and stop at the stamp card menu
+    void open_cloud_island_pc(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+
+    // Add today's stamp to the stamp collection. If full, replace a lower value one
+    // Exit the PC when done
+    // Return true if all stamps are Mew
+    bool add_todays_stamp(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+
+    // Open the shop menu from the main PC menu and buy all available recipes until the spend limit reached
+    // Exit the PC when done
+    // Return true if the spend limit is reached and the program should stop buying recipes
+    bool buy_recipes(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+
+    // Starting from the overworld on a cloud Island, return home
+    void leave_cloud_island(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+
+private:
+    DeferredStopButtonOption STOP_AFTER_CURRENT;
+    SimpleIntegerOption<uint32_t> NUM_RESETS;
+    BooleanCheckBoxOption COLLECT_MEW_STAMPS;
+    BooleanCheckBoxOption BUY_RECIPES;
+    SimpleIntegerOption<uint32_t> SPEND_LIMIT;
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
+
+    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonPokopia/Programs/PokemonPokopia_DailyFarmer.cpp b/SerialPrograms/Source/VideoGames/PokemonPokopia/Programs/PokemonPokopia_DailyFarmer.cpp
new file mode 100644
index 0000000000..04bbeb0f4f
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonPokopia/Programs/PokemonPokopia_DailyFarmer.cpp
@@ -0,0 +1,244 @@
+/*  Daily Farmer
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+//#include "CommonFramework/Logging/Logger.h"
+#include <chrono>
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/Tools/ErrorDumper.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "CommonTools/StartupChecks/VideoResolutionCheck.h"
+#include "NintendoSwitch/NintendoSwitch_Settings.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "NintendoSwitch/Programs/DateSpam/NintendoSwitch_HomeToDateTime.h"
+#include "NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManip.h"
+// #include "VideoGames/PokemonPokopia/Inference/PokemonPokopia_ButtonDetector.h"
+// #include "VideoGames/PokemonPokopia/Inference/PokemonPokopia_MovesDetection.h"
+// #include "VideoGames/PokemonPokopia/Inference/PokemonPokopia_PCDetection.h"
+// #include "VideoGames/PokemonPokopia/Inference/PokemonPokopia_SettingsScreenDetector.h"
+#include "Pokemon/Pokemon_Strings.h"
+
+#include "VideoGames/PokemonPokopia/Programs/PokemonPokopia_PCNavigation.h"
+#include "VideoGames/PokemonPokopia/Programs/PokemonPokopia_DailyFarmer.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonPokopia{
+
+using namespace Pokemon;
+
+
+DailyFarmer_Descriptor::DailyFarmer_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonPokopia:DailyFarmer",
+        STRING_POKEMON + " Pokopia", "Daily Farmer",
+        "Programs/PokemonPokopia/DailyFarmer.html",
+        "Farm Stamps, Coins, and Recipes by time skipping",
+        PanelQualityStanding::THIRD_PARTY_UNVETTED,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+class DailyFarmer_Descriptor::Stats : public StatsTracker{
+public:
+    Stats()
+        : skips(m_stats["Skips"])
+        , stamps(m_stats["Stamps"])
+        , recipes_purchased(m_stats["Recipes Purchased"])
+        , errors(m_stats["Errors"])
+    {
+        m_display_order.emplace_back("Skips");
+        m_display_order.emplace_back("Stamps");
+        m_display_order.emplace_back("Recipes Purchased");
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+    }
+
+    std::atomic<uint64_t>& skips;
+    std::atomic<uint64_t>& stamps;
+    std::atomic<uint64_t>& recipes_purchased;
+    std::atomic<uint64_t>& errors;
+};
+std::unique_ptr<StatsTracker> DailyFarmer_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+
+DailyFarmer::DailyFarmer()
+    : STOP_AFTER_CURRENT("Reset")
+    , NUM_SKIPS(
+        "<b>Number of Day Skips to Run:</b><br>"
+        "Zero will run until 'Stop after Current Reset' is pressed or the program is manually stopped.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        500,
+        0
+    )
+    , COLLECT_STAMPS(
+        "<b>Collect Stamps:</b><br>"
+        "Whether or not to collect stamps to farm coins",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        true
+    )
+    // , BUY_RECIPES(
+    //     "<b>Buy Recipes:</b><br>"
+    //     "Whether to buy recipes from the Cloud Island shop.",
+    //     LockMode::UNLOCK_WHILE_RUNNING,
+    //     false
+    // )
+    // , SPEND_LIMIT(
+    //     "<b>Spend Limit:</b><br>"
+    //     "The limit for how many Life Coins should remain after buying recipes.",
+    //     LockMode::UNLOCK_WHILE_RUNNING,
+    //     5000,
+    //     0
+    // )
+    , GO_HOME_WHEN_DONE(false)
+    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_STATUS_UPDATE,
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+{
+    PA_ADD_OPTION(STOP_AFTER_CURRENT);
+    PA_ADD_OPTION(NUM_SKIPS);
+    PA_ADD_OPTION(COLLECT_STAMPS);
+    // PA_ADD_OPTION(BUY_RECIPES);
+    // PA_ADD_OPTION(SPEND_LIMIT);
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+void DailyFarmer::go_to_date_menu(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    DateChangeWatcher date_change_watcher(env.console);
+
+    go_home(env.console, context);
+    home_to_date_time(env.console, context, true);
+
+    int ret = run_until<ProControllerContext>(
+        env.console, context,
+        [&](ProControllerContext& context){
+            pbf_press_button(context, BUTTON_A, 80ms, 1000ms);
+        },
+        { date_change_watcher }
+    );
+    if (ret == 0){
+        env.console.log("Successfully navigated to date change menu");
+        context.wait_for(250ms);    //  Wait for it to finish loading.
+        return;
+    }
+
+    OperationFailedExceptionWithScreenshot::fire(
+        ErrorReportMode::SEND_ERROR_REPORT,
+        "Failed to navigate to date change menu",
+        env.console
+    );
+}
+
+void DailyFarmer::date_skip(SingleSwitchProgramEnvironment& env, ProControllerContext& context, DateSkipMode mode){
+    go_to_date_menu(env, context);
+
+    DateReader date_reader(env.console);
+
+    VideoSnapshot date_time_snapshot = env.console.video().snapshot();
+    std::pair<DateFormat, DateTime> current_date = date_reader.read_date(env.logger(), date_time_snapshot);
+
+    const std::chrono::year_month_day current_ymd{
+        std::chrono::year(current_date.second.year), 
+        std::chrono::month(current_date.second.month), 
+        std::chrono::day(current_date.second.day)
+    };
+    const std::chrono::sys_days current_sys_days{current_ymd};
+    const std::chrono::weekday current_weekday{current_sys_days};
+    env.console.log("Current weekday: " + std::format("{:%A}", current_weekday));
+
+    const int days_to_next_friday = current_weekday == std::chrono::Friday ? 7 : (std::chrono::Friday - current_weekday).count();
+    const int days_to_increment = (mode == DateSkipMode::NEXT_FRIDAY) ? days_to_next_friday : 1;
+
+    const std::chrono::year_month_day next_ymd{current_sys_days + std::chrono::days(days_to_increment)};
+    env.console.log("Next date: " + std::format("{:%Y-%m-%d}", next_ymd));
+
+    DateTime next_date(
+        static_cast<uint16_t>(static_cast<int>(next_ymd.year())),
+        static_cast<uint8_t>(static_cast<unsigned>(next_ymd.month())),
+        static_cast<uint8_t>(static_cast<unsigned>(next_ymd.day())),
+        current_date.second.hour,
+        current_date.second.minute,
+        current_date.second.second
+    );
+    date_reader.set_date(env.program_info(), env.console, context, next_date);
+    pbf_press_button(context, BUTTON_A, 160ms, 240ms);
+    context.wait_for_all_requests();
+
+    pbf_press_button(context, BUTTON_HOME, 160ms, ConsoleSettings::instance().SETTINGS_TO_HOME_DELAY0);
+    resume_game_from_home(env.console, context, false);
+}
+
+void DailyFarmer::add_todays_stamp(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    DailyFarmer_Descriptor::Stats& stats = env.current_stats<DailyFarmer_Descriptor::Stats>();
+    // Technically this replacement shouldn't ever happen since the program should skip to Friday and redeem after 5 stamps
+    SelectionArrowWatcher replace_stamp_selection_watcher(
+        COLOR_YELLOW, &env.console.overlay(),
+        SelectionArrowType::DOWN,
+        STAMP_CARD_BOX
+    );
+    bool stamp_added = add_stamp(env.console, context, replace_stamp_selection_watcher);
+    if (stamp_added){
+        stats.stamps++;
+        env.update_stats();
+        env.console.log("Added today's stamp");
+    }
+    else {
+        // If this is reached something went wrong but should be recoverable
+        env.console.log("Failed to add today's stamp, exiting PC. Please report this as a bug");
+    }
+    exit_pc(env.console, context);
+}
+
+void DailyFarmer::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    assert_16_9_720p_min(env.logger(), env.console);
+
+    DailyFarmer_Descriptor::Stats& stats = env.current_stats<DailyFarmer_Descriptor::Stats>();
+
+    DeferredStopButtonOption::ResetOnExit reset_on_exit(STOP_AFTER_CURRENT);
+
+    while (NUM_SKIPS == 0 || stats.skips < NUM_SKIPS){
+        date_skip(env, context, DateSkipMode::NEXT_FRIDAY);
+        env.console.log("Date skipped to the next Friday");
+
+        // If stamps are to be collected, check the PC Friday to Tuesday and claim the stamp
+        // Skip to next Friday after Tuesday to claim the stamp card with the full card bonus
+        // Maximizing the number of full card bonuses is more efficient than resetting for Mews
+        if (COLLECT_STAMPS){
+            for (int i = 0; i < 5; i++){
+                // Account for loading or event dialogs
+                mash_until_overworld(env.console, context);
+                stats.skips++;
+                env.update_stats();
+                if (stats.skips >= NUM_SKIPS){
+                    break;
+                }
+                access_pc_from_overworld(env.console, context, true);
+                add_todays_stamp(env, context);
+                if (i < 4){
+                    date_skip(env, context, DateSkipMode::TOMMORROW);
+                }
+            }
+        }
+    }
+
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+    GO_HOME_WHEN_DONE.run_end_of_program(context);
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonPokopia/Programs/PokemonPokopia_DailyFarmer.h b/SerialPrograms/Source/VideoGames/PokemonPokopia/Programs/PokemonPokopia_DailyFarmer.h
new file mode 100644
index 0000000000..8379321b42
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonPokopia/Programs/PokemonPokopia_DailyFarmer.h
@@ -0,0 +1,83 @@
+/*  Daily Farmer
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonPokopia_DailyFarmer_H
+#define PokemonAutomation_PokemonPokopia_DailyFarmer_H
+
+#include "Common/Cpp/DateTime.h"
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "Common/Cpp/Options/ButtonOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+
+namespace PokemonAutomation{
+
+template <typename Type> class ControllerContext;
+
+namespace NintendoSwitch{
+
+class ProController;
+using ProControllerContext = ControllerContext<ProController>;
+
+namespace PokemonPokopia{
+
+
+class DailyFarmer_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    DailyFarmer_Descriptor();
+
+    class Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+enum class DateSkipMode{
+    NEXT_FRIDAY,
+    TOMMORROW
+};
+
+class DailyFarmer : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = DailyFarmer_Descriptor;
+    DailyFarmer();
+
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    // Go from in game to the date change menu
+    void go_to_date_menu(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+
+    // Go to date menu and change the switch date and return to the game
+    // Either skip to the next Friday or skip to the next day depending on the DateSkipMode
+    void date_skip(SingleSwitchProgramEnvironment& env, ProControllerContext& context, DateSkipMode mode);
+
+    // Add today's stamp to the stamp collection
+    // Exit the PC when done
+    void add_todays_stamp(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+
+    // // Open the shop menu from the main PC menu and buy all available recipes until the spend limit reached
+    // // Exit the PC when done
+    // // Return true if the spend limit is reached and the program should stop buying recipes
+    // bool buy_recipes(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+
+private:
+    DeferredStopButtonOption STOP_AFTER_CURRENT;
+    SimpleIntegerOption<uint32_t> NUM_SKIPS;
+    BooleanCheckBoxOption COLLECT_STAMPS;
+    // BooleanCheckBoxOption BUY_RECIPES;
+    // SimpleIntegerOption<uint32_t> SPEND_LIMIT;
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
+
+    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonPokopia/Programs/PokemonPokopia_PCNavigation.cpp b/SerialPrograms/Source/VideoGames/PokemonPokopia/Programs/PokemonPokopia_PCNavigation.cpp
new file mode 100644
index 0000000000..3bcd66622b
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonPokopia/Programs/PokemonPokopia_PCNavigation.cpp
@@ -0,0 +1,907 @@
+/*  PC Navigation
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+#include "NintendoSwitch/NintendoSwitch_ConsoleHandle.h"
+#include "VideoGames/PokemonPokopia/Inference/PokemonPokopia_ButtonDetector.h"
+#include "VideoGames/PokemonPokopia/Inference/PokemonPokopia_SelectionArrowDetector.h"
+#include "VideoGames/PokemonPokopia/Programs/PokemonPokopia_PCNavigation.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonPokopia{
+
+
+namespace{
+
+// Get the box for each PC menu item
+// Palette Town has an extra "Appraise" box which skews the layout of the bottom row
+ImageFloatBox get_pc_menu_option_box(PCMenuOption option, bool is_palette_town=false){
+    switch (option){
+    case PCMenuOption::CHALLENGES:
+        return PC_CHALLENGES_BOX;
+    case PCMenuOption::SHOP:
+        return PC_SHOP_BOX;
+    case PCMenuOption::LINK_PLAY:
+        return is_palette_town ? PC_PALETTE_LINK_PLAY_BOX : PC_LINK_PLAY_BOX;
+    case PCMenuOption::GET_ITEMS:
+        return is_palette_town ? PC_PALETTE_GET_ITEMS_BOX : PC_GET_ITEMS_BOX;
+    case PCMenuOption::STAMP_CARD:
+        return is_palette_town ? PC_PALETTE_STAMP_CARD_BOX : PC_STAMP_CARD_BOX;
+    case PCMenuOption::APPRAISE:
+        if (!is_palette_town){
+            throw InternalProgramError(
+                nullptr, PA_CURRENT_FUNCTION,
+                "APPRAISE option is only present in Palette Town"
+            );
+        }
+        return PC_PALETTE_APPRAISE_BOX;
+    }
+    throw InternalProgramError(
+        nullptr, PA_CURRENT_FUNCTION,
+        "Invalid PCMenuOption enum value"
+    );
+}
+
+// Get the box location for the daily item type (paintable, recipe, none) in the shop menu based on the index (0-4)
+ImageFloatBox get_shop_daily_item_type_box(int item_index){
+    return ImageFloatBox(
+        SHOP_DAILY_ITEM_TYPE_BOX_1.x + item_index * SHOP_DAILY_ITEM_OFFSET.first,
+        SHOP_DAILY_ITEM_TYPE_BOX_1.y + item_index * SHOP_DAILY_ITEM_OFFSET.second,
+        SHOP_DAILY_ITEM_TYPE_BOX_1.width,
+        SHOP_DAILY_ITEM_TYPE_BOX_1.height
+    );
+}
+
+// Get the box location for the daily item coin icon in the shop menu based on the index (0-4)
+ImageFloatBox get_shop_daily_item_coin_icon_box(int item_index){
+    return ImageFloatBox(
+        SHOP_DAILY_ITEM_COIN_ICON_BOX_1.x + item_index * SHOP_DAILY_ITEM_OFFSET.first,
+        SHOP_DAILY_ITEM_COIN_ICON_BOX_1.y + item_index * SHOP_DAILY_ITEM_OFFSET.second,
+        SHOP_DAILY_ITEM_COIN_ICON_BOX_1.width,
+        SHOP_DAILY_ITEM_COIN_ICON_BOX_1.height
+    );
+}
+
+std::vector<ImageFloatBox> get_shop_daily_item_selection_boxes(){
+    std::vector<ImageFloatBox> boxes;
+    for (size_t i = 0; i < 5; i++){
+        boxes.emplace_back(
+            SHOP_DAILY_ITEM_SELECTOR_BOX_1.x + i * SHOP_DAILY_ITEM_OFFSET.first,
+            SHOP_DAILY_ITEM_SELECTOR_BOX_1.y + i * SHOP_DAILY_ITEM_OFFSET.second,
+            SHOP_DAILY_ITEM_SELECTOR_BOX_1.width,
+            SHOP_DAILY_ITEM_SELECTOR_BOX_1.height
+        );
+    }
+    return boxes;
+}
+
+// Interact when the A button prompt appears
+// Watches for the A button prompt and wait for it to clear
+bool interact_button_a_prompt(ConsoleHandle& console, ProControllerContext& context){
+    ButtonWatcher button_a(
+        COLOR_GREEN, ButtonType::ButtonA,
+        {0.250000, 0.000000, 0.500000, 1.000000},
+        &console.overlay()
+    );
+    int ret = wait_until(
+        console, context,
+        30s,
+        {
+            button_a,
+        }
+    );
+    if (ret != 0){
+        return false;
+    }
+
+    WallClock deadline = current_time() + 60s;
+    while (current_time() < deadline){
+        context.wait_for_all_requests();
+        pbf_press_button(context, BUTTON_A, 160ms, 240ms);
+        context.wait_for(500ms);
+
+        VideoSnapshot screen = console.video().snapshot();
+        if (!button_a.detect(screen)){
+            console.log("Detected interaction complete");
+            return true;
+        }
+    }
+    console.log("Failed to detect interaction complete");
+    return false;
+}
+
+// Wait for PC to be open by watching for selectors
+// Return status depending on what menu is first opened
+PCOpenStatus wait_for_pc_open(ConsoleHandle& console, ProControllerContext& context){
+    SelectionArrowWatcher challenges_selector(
+        COLOR_YELLOW, &console.overlay(),
+        SelectionArrowType::DOWN,
+        get_pc_menu_option_box(PCMenuOption::CHALLENGES)
+    );
+    SelectionArrowWatcher add_stamp_selector(
+        COLOR_YELLOW, &console.overlay(),
+        SelectionArrowType::RIGHT,
+        ADD_STAMP_BOX
+    );
+    BlueDialogWatcher stamp_redeem_dialog(COLOR_YELLOW);
+    // TODO: Handle environment change menu
+
+    int ret = wait_until(
+        console, context,
+        30s,
+        {
+            challenges_selector,
+            add_stamp_selector,
+            stamp_redeem_dialog,
+        }
+    );
+    switch (ret){
+        case 0:
+            console.log("Detected main PC menu");
+            return PCOpenStatus::MAIN;
+        case 1:
+            console.log("Detected stamp card open");
+            return PCOpenStatus::STAMP_CARD;
+        case 2:
+            console.log("Detected stamp redeem dialog open");
+            return PCOpenStatus::STAMP_REDEEM;
+        default:
+            console.log("Failed to detect PC menu open");
+            return PCOpenStatus::FAILURE;
+    }
+}
+
+// Check if the row the selector is currently on is the same as the target row
+// The Challenges and Shop menu options are fixed on the top row so check those
+bool is_current_selector_on_target_row(ConsoleHandle& console, bool target_is_on_top_row){
+    SelectionArrowDetector challenges_selector(
+        COLOR_YELLOW, &console.overlay(),
+        SelectionArrowType::DOWN,
+        get_pc_menu_option_box(PCMenuOption::CHALLENGES)
+    );
+    SelectionArrowDetector shop_selector(
+        COLOR_YELLOW, &console.overlay(),
+        SelectionArrowType::DOWN,
+        get_pc_menu_option_box(PCMenuOption::SHOP)
+    );
+
+    VideoSnapshot screen = console.video().snapshot();
+    bool current_is_on_top_row = challenges_selector.detect(screen) || shop_selector.detect(screen);
+    if ((target_is_on_top_row && current_is_on_top_row) || (!target_is_on_top_row && !current_is_on_top_row)){
+        console.log("current selector is on target row");
+        return true;
+    }
+    return false;
+}
+
+// Move the selector to the right row if it isn't already there
+bool set_selector_on_target_row(ConsoleHandle& console, ProControllerContext& context, bool target_is_on_top_row){
+    WallClock deadline = current_time() + 30s;
+    while (current_time() < deadline){
+        context.wait_for_all_requests();
+        if (is_current_selector_on_target_row(console, target_is_on_top_row)){
+            // context.wait_for(1000ms); // Confirmation in case video lags
+            // if (is_current_selector_on_target_row(console, target_is_on_top_row)){
+                console.log("Selector set on target row");
+                return true;
+            // }
+        }
+        pbf_press_dpad(context, DPAD_DOWN, 160ms, 240ms);
+    }
+    console.log("Failed to set selector on target row");
+    return false;
+}
+
+// Helper to move the selector within the current row until the target is hovered
+// Check for both possible locations for palette town and everywhere else
+bool set_selector_on_target_within_row_routine(ConsoleHandle& console, ProControllerContext& context, PCMenuOption target){
+    SelectionArrowWatcher target_selector(
+        COLOR_YELLOW, &console.overlay(),
+        SelectionArrowType::DOWN,
+        get_pc_menu_option_box(target)
+    );
+    SelectionArrowWatcher target_selector_pallete(
+        COLOR_YELLOW, &console.overlay(),
+        SelectionArrowType::DOWN,
+        get_pc_menu_option_box(target, true)
+    );
+
+    WallClock deadline = current_time() + 30s;
+    while (current_time() < deadline){
+        context.wait_for_all_requests();
+        int ret = wait_until(
+            console, context,
+            1s,
+            {
+                target_selector,
+                target_selector_pallete
+            }
+        );
+        if (ret == 0 || ret == 1){
+            console.log("Selector on target");
+            return true;
+        }
+        pbf_press_dpad(context, DPAD_RIGHT, 160ms, 240ms);
+    }
+    console.log("Failed to navigate to the correct menu option within row");
+    return false;
+}
+
+// Move the selector within the current row until the target is hovered
+bool set_selector_on_target_within_row(ConsoleHandle& console, ProControllerContext& context, PCMenuOption target){
+    WallClock deadline = current_time() + 30s;
+    while (current_time() < deadline){
+        if (set_selector_on_target_within_row_routine(console, context, target)){
+            // context.wait_for(1000ms); // Confirmation in case video lags
+            // if (set_selector_on_target_within_row_routine(console, context, target_selector)){
+                console.log("Selector confirmed on target");
+                return true;
+            // }
+        }
+    }
+    console.log("Failed to navigate and confirm the correct menu option within row");
+    return false;
+}
+
+// Move the selector to hover the menu option specified by the target_selector
+// Move vertically to the right row, then horizontally to the right option within the row
+bool set_menu_option(ConsoleHandle& console, ProControllerContext& context, PCMenuOption option){
+    bool target_is_on_top_row = (option == PCMenuOption::CHALLENGES || option == PCMenuOption::SHOP);
+
+    if (!set_selector_on_target_row(console, context, target_is_on_top_row)){
+        console.log("Failed to navigate to the correct row");
+        return false;
+    }
+    if (set_selector_on_target_within_row(console, context, option)){
+        console.log("Successfully navigated to the correct menu option");
+        return true;
+    }
+    console.log("Failed to navigate to the correct menu option");
+    return false;
+}
+
+// Get the index of the selector in a list of image box locations
+int get_current_selector_index(ConsoleHandle& console, const std::vector<ImageFloatBox>& option_boxes, SelectionArrowType arrow_type){
+    std::vector<std::unique_ptr<SelectionArrowDetector>> selectors;
+    for (const ImageFloatBox& box : option_boxes){
+        selectors.emplace_back(
+            new SelectionArrowDetector(
+                COLOR_YELLOW, &console.overlay(),
+                arrow_type,
+                box
+            )
+        );
+    }
+    WallClock deadline = current_time() + 30s;
+    while (current_time() < deadline){
+        VideoSnapshot screen = console.video().snapshot();
+        for (size_t i = 0; i < selectors.size(); i++){
+            if (selectors[i]->detect(screen)){
+                return int(i);
+            }
+        }
+    }
+    return -1;
+}
+
+// Move the selector to the target index in a list of options
+bool generic_navigate_to_target_routine(
+    ConsoleHandle& console, 
+    ProControllerContext& context, 
+    const std::vector<ImageFloatBox>& option_boxes,
+    int target_index,
+    SelectionArrowType arrow_type
+){
+    WallClock deadline = current_time() + 30s;
+    while (current_time() < deadline){
+        int current_index = get_current_selector_index(console, option_boxes, arrow_type);
+        if (current_index == -1){
+            return false;
+        }
+        if (current_index == target_index){
+            console.log("Selector on target");
+            return true;
+        }else{
+            int item_count = int(option_boxes.size());
+            int delta = target_index - current_index;
+            if (std::abs(delta) > item_count / 2){
+                if (delta > 0){
+                    delta = delta - item_count;
+                }else{
+                    delta = delta + item_count;
+                }
+            }
+            if (delta > 0){
+                for (int i = 0; i < delta; i++){
+                    pbf_press_dpad(context, (arrow_type == SelectionArrowType::DOWN) ? DPAD_RIGHT : DPAD_DOWN, 160ms, 240ms);
+                }
+            }else{
+                for (int i = 0; i < -delta; i++){
+                    pbf_press_dpad(context, (arrow_type == SelectionArrowType::DOWN) ? DPAD_LEFT : DPAD_UP, 160ms, 240ms);
+                }
+            }
+            context.wait_for_all_requests();
+        }
+    }
+    console.log("Failed to detect selector position");
+    return false;
+}
+
+// Move the selector to the target index in a list of options and confirm it is there
+bool generic_navigate_to_target(
+    ConsoleHandle& console, 
+    ProControllerContext& context, 
+    const std::vector<ImageFloatBox>& option_boxes,
+    int target_index,
+    SelectionArrowType arrow_type
+){
+    WallClock deadline = current_time() + 30s;
+    while (current_time() < deadline){
+        if (generic_navigate_to_target_routine(console, context, option_boxes, target_index, arrow_type)){
+            context.wait_for_all_requests();
+            context.wait_for(1s);
+            int current_index = get_current_selector_index(console, option_boxes, arrow_type);
+            if (current_index == target_index){
+                console.log("Successfully navigated and confirmed the target");
+                return true;
+            }
+        }
+    }
+    console.log("Failed to navigate and confirm the target");
+    return false;
+}
+
+} // Namespace
+
+// Top-level functions
+
+void wait_for_overworld(ConsoleHandle& console, ProControllerContext& context){
+    OverworldWatcher overworld_watcher(
+        COLOR_GREEN, &console.overlay()
+    );
+    int ret = wait_until(
+        console, context,
+        120s,
+        {overworld_watcher}
+    );
+    if (ret != 0){
+        console.log("Failed to detect overworld");
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "wait_for_overworld() failed to detect overworld",
+            console
+        );
+    }
+    console.log("Detected overworld");
+}
+
+void mash_until_overworld(ConsoleHandle& console, ProControllerContext& context){
+    OverworldWatcher overworld_watcher(
+        COLOR_GREEN, &console.overlay()
+    );
+    int ret = run_until<ProControllerContext>(
+        console, context,
+        [&](ProControllerContext& context){
+            pbf_mash_button(context, BUTTON_B, 120s);
+        },
+        {overworld_watcher}
+    );
+    if (ret != 0){
+        console.log("Failed to detect overworld");
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "mash_until_overworld() failed to detect overworld",
+            console
+        );
+    }
+    console.log("Detected overworld");
+}
+
+std::vector<ImageFloatBox> get_generic_options_boxes(size_t option_count){
+    std::vector<ImageFloatBox> boxes;
+    for (size_t i = 0; i < option_count; i++){
+        boxes.emplace_back(
+            ImageFloatBox(
+                PC_GENERIC_TOP_BOX.x,
+                PC_GENERIC_TOP_BOX.y + i * 0.100000,
+                PC_GENERIC_TOP_BOX.width,
+                PC_GENERIC_TOP_BOX.height
+            )
+        );
+    }
+    return boxes;
+}
+
+void access_pc_from_overworld(ConsoleHandle& console, ProControllerContext& context, bool stop_on_stamp_card){
+    // Mash out of any possible event dialogs
+    mash_until_overworld(console, context);
+
+    // Need to physically face PC for PC open prompt
+    ButtonWatcher button_a_watcher(
+        COLOR_RED, ButtonType::ButtonA, 
+        {0.250000, 0.000000, 0.500000, 1.000000}, // Button A can fall in a fairly large area
+        &console.overlay()
+    );
+    SelectionArrowWatcher challenges_watcher(
+        COLOR_YELLOW, &console.overlay(),
+        SelectionArrowType::DOWN,
+        get_pc_menu_option_box(PCMenuOption::CHALLENGES)
+    );
+    SelectionArrowWatcher add_stamp_selector(
+        COLOR_YELLOW, &console.overlay(),
+        SelectionArrowType::RIGHT,
+        ADD_STAMP_BOX
+    );
+    WallClock deadline;
+
+    // Wandering Pokemon can trigger the same prompt, retry a few times
+    for (int i = 0; i < 5; i++){
+        int ret = run_until<ProControllerContext>(
+            console, context,
+            [&](ProControllerContext& context){
+                pbf_move_left_joystick(context, {0, +0.8}, 25ms, 1000ms);
+                pbf_move_left_joystick(context, {0, -0.8}, 25ms, 240ms); // return position
+                pbf_move_left_joystick(context, {+0.8, 0}, 25ms, 1000ms);
+                pbf_move_left_joystick(context, {-0.8, 0}, 25ms, 240ms); // return position
+                pbf_move_left_joystick(context, {-0.8, 0}, 25ms, 1000ms);
+                pbf_move_left_joystick(context, {+0.8, 0}, 25ms, 240ms); // return position
+            },
+            {button_a_watcher}
+        );
+        switch (ret){
+        case 0:
+            console.log("Detected A button prompt");
+            if (interact_button_a_prompt(console, context)){
+                PCOpenStatus status = wait_for_pc_open(console, context);
+                switch (status){
+                case PCOpenStatus::MAIN:
+                    console.log("Successfully opened PC main menu");
+                    return;
+                case PCOpenStatus::STAMP_CARD:
+                    console.log("Opened stamp card instead of main PC menu");
+                    if (stop_on_stamp_card){
+                        return;
+                    }
+                    // Go one level up until challenges menu on main menu is seen
+                    ret = run_until<ProControllerContext>(
+                        console, context,
+                        [&](ProControllerContext& context){
+                            for (int i = 0; i < 5; i++){
+                                pbf_press_button(context, BUTTON_B, 160ms, 2000ms);
+                            }
+                        },
+                        {challenges_watcher}
+                    );
+                    if (ret == 0){
+                        console.log("Successfully navigated up to main PC menu from stamp card");
+                        return;
+                    }else{
+                        console.log("Failed to navigate up to main PC menu from stamp card");
+                        pbf_mash_button(context, BUTTON_B, 10s);
+                        break;
+                    }
+                case PCOpenStatus::STAMP_REDEEM:
+                    console.log("Opened stamp redeem prompt instead of main PC menu");
+                    // Redeem stamps
+                    deadline = current_time() + 60s;
+                    while (current_time() < deadline){
+                        context.wait_for_all_requests();
+                        ret = wait_until(
+                            console, context,
+                            1s,
+                            {
+                                challenges_watcher,
+                                add_stamp_selector
+                            }
+                        );
+                        if (ret == 0){
+                            console.log("Successfully navigated up to main PC menu from stamp redeem prompt");
+                            if (stop_on_stamp_card){
+                                OperationFailedExceptionWithScreenshot::fire(
+                                    ErrorReportMode::SEND_ERROR_REPORT,
+                                    "access_pc_from_overworld() failed to find stamp card menu after redeeming stamps",
+                                    console
+                                );
+                            }
+                            return;
+                        }else if (ret == 1){
+                            console.log("Successfully redeemed stamps and navigated up to stamp card menu");
+                            if (stop_on_stamp_card){
+                                return;
+                            }
+                        }
+                        pbf_press_button(context, BUTTON_B, 160ms, 240ms);
+                    }
+                    break;
+                // Not sure how to handle this case, can't test it. Attempt to back out and try again for now
+                // Currently not being detected
+                case PCOpenStatus::ENVIRONMENT_CHANGE:
+                    console.log("Environment change detected");
+                    pbf_mash_button(context, BUTTON_B, 15s);
+                    break;
+                case PCOpenStatus::FAILURE:
+                    console.log("Failed to open PC"); // Likely stuck talking to a wandering Pokemon
+                    pbf_mash_button(context, BUTTON_B, 15s);
+                    continue;
+                default:
+                    throw InternalProgramError(
+                        nullptr, PA_CURRENT_FUNCTION,
+                        "Invalid PCOpenStatus enum value"
+                    );
+                }
+            }
+        default:
+            console.log("Failed to detect A button prompt, attempting to reposition and retry... (attempt " + std::to_string(i+1) + ")");
+        }
+    }
+    throw OperationFailedExceptionWithScreenshot(
+        ErrorReportMode::SEND_ERROR_REPORT,
+        "access_pc_from_overworld() failed to open PC",
+        console
+    );
+}
+
+void exit_pc(ConsoleHandle& console, ProControllerContext& context){
+    ButtonWatcher button_a(
+        COLOR_GREEN, ButtonType::ButtonA,
+        {0.250000, 0.000000, 0.500000, 1.000000},
+        &console.overlay()
+    );
+    int ret = run_until<ProControllerContext>(
+        console, context,
+        [&](ProControllerContext& context){
+            for (int i = 0; i < 20; i++){
+                pbf_press_button(context, BUTTON_B, 160ms, 1000ms);
+            }
+        },
+        {button_a}
+    );
+    if (ret != 0){
+        console.log("Failed to detect return to overworld");
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "exit_pc() failed to detect return to overworld",
+            console
+        );
+    }
+    console.log("Exited PC and returned to overworld");
+}
+
+void open_menu_option(ConsoleHandle& console, ProControllerContext& context, PCMenuOption option){
+    SelectionArrowDetector target_selector(
+        COLOR_YELLOW, &console.overlay(),
+        SelectionArrowType::DOWN,
+        {0.150000, 0.200000, 0.700000, 0.500000}
+    );
+    if (!set_menu_option(console, context, option)){
+        console.log("Failed to set menu option");
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "open_menu_option() failed to set menu option",
+            console
+        );
+    }
+    WallClock deadline = current_time() + 30s;
+    while (current_time() < deadline){
+        context.wait_for_all_requests();
+        VideoSnapshot screen = console.video().snapshot();
+        ImageFloatBox last_detected_box;
+        if (target_selector.detect(screen)){
+            last_detected_box = target_selector.last_detected();
+        }
+        else {
+            context.wait_for(500ms);
+            continue;
+        }
+        pbf_press_button(context, BUTTON_A, 160ms, 240ms);
+        context.wait_for(500ms);
+        screen = console.video().snapshot();
+        ImageFloatBox current_detected_box;
+        if (target_selector.detect(screen)){
+            current_detected_box = target_selector.last_detected();
+            if (std::abs(current_detected_box.x - last_detected_box.x) > 0.01 && std::abs(current_detected_box.y - last_detected_box.y) > 0.01){
+                console.log("PC Menu option opened");
+                return;
+            }
+        }
+        else {
+            console.log("PC Menu option opened"); // For subsequent menus without selectors
+            return;
+        }
+    }
+    console.log("Failed to open PC menu option");
+    OperationFailedExceptionWithScreenshot::fire(
+        ErrorReportMode::SEND_ERROR_REPORT,
+        "open_menu_option() failed to open PC menu option",
+        console
+    );
+}
+
+void generic_select_and_open(
+    ConsoleHandle& console, 
+    ProControllerContext& context, 
+    const std::vector<ImageFloatBox>& option_boxes,
+    int target_index,
+    SelectionArrowType arrow_type,
+    bool move_parallel
+){
+    SelectionArrowWatcher target_selector(
+        COLOR_YELLOW, &console.overlay(),
+        arrow_type,
+        option_boxes[target_index]
+    );
+
+    if (!generic_navigate_to_target(console, context, option_boxes, target_index, arrow_type)){
+        console.log("Failed to navigate and confirm the target");
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "generic_select_and_open() failed to navigate and confirm the target",
+            console
+        );
+    }
+    WallClock deadline = current_time() + 30s;
+    while (current_time() < deadline){
+        context.wait_for_all_requests();
+        pbf_press_button(context, BUTTON_A, 160ms, 240ms);
+        context.wait_for(500ms);
+        VideoSnapshot screen = console.video().snapshot();
+        if (!target_selector.detect(screen)){
+            console.log("Target option opened");
+            return;
+        }
+    }
+    console.log("Failed to open target option");
+    OperationFailedExceptionWithScreenshot::fire(
+        ErrorReportMode::SEND_ERROR_REPORT,
+        "generic_select_and_open() failed to open target option",
+        console
+    );
+}
+
+void yes_no_select_and_confirm(
+    ConsoleHandle& console, 
+    ProControllerContext& context, 
+    bool select_yes
+){
+    generic_select_and_open(console, context, CONFIRM_YES_NO, (select_yes) ? 0 : 1, SelectionArrowType::RIGHT);
+}
+
+void continue_until_prompt(
+    ConsoleHandle& console, 
+    ProControllerContext& context, 
+    const ImageFloatBox prompt_box
+){
+    SelectionArrowWatcher prompt_watcher(
+        COLOR_YELLOW, &console.overlay(),
+        SelectionArrowType::RIGHT,
+        prompt_box
+    );
+    int ret = run_until<ProControllerContext>(
+        console, context,
+        [&](ProControllerContext& context){
+            for (int i = 0; i < 20; i++){
+                pbf_press_button(context, BUTTON_A, 160ms, 2000ms);
+            }
+        },
+        {prompt_watcher}
+    );
+    if (ret != 0){
+        console.log("Failed to detect prompt");
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "continue_until_prompt() failed to detect prompt",
+            console
+        );
+    }
+}
+
+RecipeType item_is_recipe(ConsoleHandle& console, ProControllerContext& context, int item_index){
+    RecipeIconDetector recipe_icon_detector(
+        COLOR_YELLOW,
+        &console.overlay(),
+        get_shop_daily_item_type_box(item_index)
+    );
+    VideoSnapshot screen = console.video().snapshot();
+    if (recipe_icon_detector.detect(screen)){
+        console.log("Detected recipe icon for item " + std::to_string(item_index));
+        return recipe_icon_detector.recipe_type();
+    }
+    else{
+        console.log("No recipe icon detected for item " + std::to_string(item_index));
+        return RecipeType::NOT_RECIPE;
+    }
+}
+
+bool item_is_available(ConsoleHandle& console, ProControllerContext& context, int item_index){
+    CoinIconDetector coin_icon_detector(
+        COLOR_YELLOW,
+        &console.overlay(),
+        get_shop_daily_item_coin_icon_box(item_index)
+    );
+    VideoSnapshot screen = console.video().snapshot();
+    if (coin_icon_detector.detect(screen)){
+        console.log("Detected coin icon for item " + std::to_string(item_index) + ", item is available");
+        return true;
+    }
+    else{
+        console.log("No coin icon detected for item " + std::to_string(item_index) + ", item is not available");
+        return false;
+    }
+}
+
+void buy_item(ConsoleHandle& console, ProControllerContext& context, int item_index){
+    std::vector<ImageFloatBox> selection_boxes = get_shop_daily_item_selection_boxes();
+    SelectionArrowWatcher item_selector(
+        COLOR_YELLOW, &console.overlay(),
+        SelectionArrowType::DOWN,
+        selection_boxes[item_index]
+    );
+    generic_select_and_open(console, context, selection_boxes, item_index, SelectionArrowType::DOWN);
+
+    int ret = run_until<ProControllerContext>(
+        console, context,
+        [&](ProControllerContext& context){
+            for (int i = 0; i < 20; i++){
+                pbf_press_button(context, BUTTON_A, 160ms, 1500ms);
+            }
+        },
+        {item_selector}
+    );
+    if (ret != 0){
+        console.log("Failed to detect shop after purchase");
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "buy_item() failed to detect shop after purchase",
+            console
+        );
+    }
+}
+
+Stamp get_stamp(
+    ConsoleHandle& console, 
+    ProControllerContext& context, 
+    ImageFloatBox stamp_box
+){
+    StampDetector mew_stamp_detector(
+        COLOR_YELLOW,
+        Stamp::MEW,
+        stamp_box,
+        &console.overlay()
+    );
+    for (int i = 0; i < 5; i++){ // Take 5 samples to account for glint
+        VideoSnapshot screen = console.video().snapshot();
+        if (mew_stamp_detector.detect(screen)){
+            console.log("Detected Mew Stamp");
+            return Stamp::MEW;
+        }
+        context.wait_for(500ms);
+    }
+    console.log("Detected other stamp or no stamp");
+    return Stamp::OTHER;
+}
+
+Stamp get_stamp_from_selection(
+    ConsoleHandle& console, 
+    ProControllerContext& context, 
+    ImageFloatBox selection_arrow_box
+){
+    ImageFloatBox stamp_box = {
+        selection_arrow_box.x + SELECTION_BOX_TO_STAMP_BOX_OFFSET.first,
+        selection_arrow_box.y + SELECTION_BOX_TO_STAMP_BOX_OFFSET.second,
+        TODAYS_STAMP_BOX.width, TODAYS_STAMP_BOX.height
+    };
+    return get_stamp(console, context, stamp_box);
+}
+
+bool add_stamp(ConsoleHandle& console, ProControllerContext& context, SelectionArrowWatcher& replace_stamp_selection_watcher){
+    SelectionArrowWatcher add_stamp_selector(
+        COLOR_YELLOW, &console.overlay(),
+        SelectionArrowType::RIGHT,
+        ADD_STAMP_BOX
+    );
+    WallClock deadline = current_time() + 30s;
+    while(current_time() < deadline){
+        context.wait_for_all_requests();
+        pbf_press_button(context, BUTTON_A, 160ms, 240ms);
+        context.wait_for(1000ms);
+
+        int ret = wait_until(
+            console, context,
+            2s,
+            {replace_stamp_selection_watcher}
+        );
+        if (ret == 0){
+            console.log("Stamp replacement needed");
+            return false;
+        }
+        ret = wait_until(
+            console, context,
+            2s,
+            {add_stamp_selector}
+        );
+        if (ret != 0){
+            console.log("Stamp added without replacement");
+            return true;
+        }
+    }
+    throw OperationFailedExceptionWithScreenshot(
+        ErrorReportMode::SEND_ERROR_REPORT,
+        "add_stamp() failed to add stamp",
+        console
+    );
+    return false;
+}
+
+void replace_stamp(
+    ConsoleHandle& console, 
+    ProControllerContext& context, 
+    SelectionArrowWatcher& replace_stamp_selection_watcher
+){
+    WallClock deadline = current_time() + 30s;
+    while (current_time() < deadline){
+        pbf_press_button(context, BUTTON_A, 160ms, 240ms);
+        int ret = wait_until(
+            console, context,
+            2s,
+            {replace_stamp_selection_watcher}
+        );
+        if (ret != 0){
+            console.log("Detected stamp replaced");
+            return;
+        }
+    }
+    console.log("Failed to replace stamp");
+    OperationFailedExceptionWithScreenshot::fire(
+        ErrorReportMode::SEND_ERROR_REPORT,
+        "replace_stamp() failed to replace stamp",
+        console
+    );
+}
+
+void move_to_next_stamp(ConsoleHandle& console, ProControllerContext& context, SelectionArrowWatcher& replace_stamp_selection_watcher){
+    ImageFloatBox current_selector_location = replace_stamp_selection_watcher.last_detected();
+
+    WallClock deadline = current_time() + 30s;
+    while (current_time() < deadline){
+        pbf_press_button(context, BUTTON_DOWN, 160ms, 240ms);
+        context.wait_for(500ms);
+        int ret = wait_until(
+            console, context,
+            2s,
+            {replace_stamp_selection_watcher}
+        );
+        if (ret != 0){
+            console.log("Failed to detect selector after moving to next stamp");
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "move_to_next_stamp() failed to detect selector after moving to next stamp",
+                console
+            );
+        }
+        ImageFloatBox new_selector_location = replace_stamp_selection_watcher.last_detected();
+        if (std::abs(new_selector_location.x - current_selector_location.x) > 0.01 && std::abs(new_selector_location.y - current_selector_location.y) > 0.01){
+            console.log("Selector moved to next stamp");
+            return;
+        }
+    }
+    console.log("Failed to move selector to next stamp");
+    OperationFailedExceptionWithScreenshot::fire(
+        ErrorReportMode::SEND_ERROR_REPORT,
+        "move_to_next_stamp() failed to move selector to next stamp",
+        console
+    );
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonPokopia/Programs/PokemonPokopia_PCNavigation.h b/SerialPrograms/Source/VideoGames/PokemonPokopia/Programs/PokemonPokopia_PCNavigation.h
new file mode 100644
index 0000000000..3d52c1d9aa
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonPokopia/Programs/PokemonPokopia_PCNavigation.h
@@ -0,0 +1,208 @@
+/*  PC Navigation
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonLZA_PCNavigation_H
+#define PokemonAutomation_PokemonLZA_PCNavigation_H
+
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "VideoGames/PokemonPokopia/Inference/PokemonPokopia_MovesDetection.h"
+#include "VideoGames/PokemonPokopia/Inference/PokemonPokopia_PCDetection.h"
+#include "VideoGames/PokemonPokopia/Inference/PokemonPokopia_SelectionArrowDetector.h"
+
+namespace PokemonAutomation{
+
+template <typename Type> class ControllerContext;
+
+namespace NintendoSwitch{
+
+class ConsoleHandle;
+class ProController;
+using ProControllerContext = ControllerContext<ProController>;
+
+namespace PokemonPokopia{
+
+// Locations of the PC menu option boxes
+// Challenges and Shop are in the top row and do not move
+// The rest are on the bottom row and change positions depending on whether the player is in Palette Town or not
+const ImageFloatBox PC_CHALLENGES_BOX{0.312500, 0.205000, 0.034000, 0.052500};
+const ImageFloatBox PC_SHOP_BOX{0.650500, 0.205000, 0.034000, 0.052500};
+// Non-Palette Town
+const ImageFloatBox PC_LINK_PLAY_BOX{0.256000, 0.648500, 0.034000, 0.052500};
+const ImageFloatBox PC_GET_ITEMS_BOX{0.482500, 0.648500, 0.034000, 0.052500};
+const ImageFloatBox PC_STAMP_CARD_BOX{0.709000, 0.648500, 0.034000, 0.052500};
+// Palette Town
+const ImageFloatBox PC_PALETTE_LINK_PLAY_BOX{0.162000, 0.648500, 0.034000, 0.052500};
+const ImageFloatBox PC_PALETTE_GET_ITEMS_BOX{0.376000, 0.648500, 0.034000, 0.052500};
+const ImageFloatBox PC_PALETTE_STAMP_CARD_BOX{0.590000, 0.648500, 0.034000, 0.052500};
+const ImageFloatBox PC_PALETTE_APPRAISE_BOX{0.802500, 0.648500, 0.034000, 0.052500};
+
+// Shop Menu items. Apply the offset to get boxes for items 2-5
+const ImageFloatBox SHOP_DAILY_ITEM_TYPE_BOX_1{0.125000, 0.300000, 0.034000, 0.064000};
+const ImageFloatBox SHOP_DAILY_ITEM_SELECTOR_BOX_1{0.165000, 0.170000, 0.034000, 0.052500}; // Issue when detecting orange arrow on orange label in shop menu
+const ImageFloatBox SHOP_DAILY_ITEM_COIN_ICON_BOX_1(0.133000, 0.377000, 0.025000, 0.045000);
+const std::pair<double, double> SHOP_DAILY_ITEM_OFFSET(0.158000, 0);
+
+// Link Play menu options
+const ImageFloatBox LINK_PLAY_INVITE_BOX{0.048500, 0.249000, 0.027500, 0.057500};
+const ImageFloatBox LINK_PLAY_VISIT_BOX{0.048500, 0.443000, 0.027500, 0.057500};
+const ImageFloatBox LINK_PLAY_PLAY_BOX{0.048500, 0.637000, 0.027500, 0.057500};
+const ImageFloatBox LINK_PLAY_SETTINGS_BOX{0.048500, 0.786000, 0.027500, 0.057500};
+const std::vector<ImageFloatBox> LINK_PLAY_MENU{LINK_PLAY_INVITE_BOX, LINK_PLAY_VISIT_BOX, LINK_PLAY_PLAY_BOX, LINK_PLAY_SETTINGS_BOX};
+
+// Cloud Island menu options
+const ImageFloatBox CLOUD_ISLAND_GO_TO_BOX{0.048500, 0.249000, 0.027500, 0.057500};
+const ImageFloatBox CLOUD_ISLAND_SEARCH_BOX{0.048500, 0.443000, 0.027500, 0.057500};
+const ImageFloatBox CLOUD_ISLAND_CREATE_BOX{0.048500, 0.637000, 0.027500, 0.057500};
+const std::vector<ImageFloatBox> CLOUD_ISLAND_MENU{CLOUD_ISLAND_GO_TO_BOX, CLOUD_ISLAND_SEARCH_BOX, CLOUD_ISLAND_CREATE_BOX};
+
+// The top box of a generic PC menu item with unit height. Each subsequent item is exactly .1 Y units below
+const ImageFloatBox PC_GENERIC_TOP_BOX(0.048500, 0.200000, 0.027500, 0.057500);
+
+// Yes and No locations for standard confirmation prompts
+const ImageFloatBox CONFIRM_YES_BOX{0.657000, 0.592000, 0.027500, 0.057500};
+const ImageFloatBox CONFIRM_NO_BOX{0.657000, 0.677000, 0.027500, 0.057500};
+const std::vector<ImageFloatBox> CONFIRM_YES_NO{CONFIRM_YES_BOX, CONFIRM_NO_BOX};
+
+const ImageFloatBox STAMP_CARD_BOX{0.045000, 0.040000, 0.600000, 0.750000};
+const ImageFloatBox ADD_STAMP_BOX{0.705000, 0.790000, 0.027500, 0.057500};
+const std::pair<double, double> SELECTION_BOX_TO_STAMP_BOX_OFFSET(-0.071, .033);
+// The stamp locations actually move week to week, get the locations dynamically
+// const ImageFloatBox STAMP1_SELECT_BOX{0.124000, 0.120000, 0.034000, 0.052500};
+// const ImageFloatBox STAMP2_SELECT_BOX{0.176000, 0.525500, 0.034000, 0.052500};
+// const ImageFloatBox STAMP3_SELECT_BOX{0.323500, 0.248500, 0.034000, 0.052500};
+// const ImageFloatBox STAMP4_SELECT_BOX{0.463000, 0.527500, 0.034000, 0.052500};
+// const ImageFloatBox STAMP5_SELECT_BOX{0.562000, 0.163500, 0.034000, 0.052500};
+// const std::vector<ImageFloatBox> STAMP_SELECT_BOXES{STAMP1_SELECT_BOX, STAMP2_SELECT_BOX, STAMP3_SELECT_BOX, STAMP4_SELECT_BOX, STAMP5_SELECT_BOX};
+
+enum class PCOpenStatus{
+    MAIN,
+    STAMP_CARD,
+    STAMP_REDEEM,
+    ENVIRONMENT_CHANGE,
+    FAILURE
+};
+
+enum class PCMenuOption{
+    CHALLENGES,
+    SHOP,
+    LINK_PLAY,
+    GET_ITEMS,
+    STAMP_CARD,
+    APPRAISE // Only present in Palette Town
+};
+
+// Wait until the overworld is fully loaded
+void wait_for_overworld(ConsoleHandle& console, ProControllerContext& context);
+
+// Mash to exit dialog until overworld is fully loaded and actionable
+void mash_until_overworld(ConsoleHandle& console, ProControllerContext& context);
+
+// Get locations of generic PC menu options for menus with "option_count" number of equal and minimal height boxes
+std::vector<ImageFloatBox> get_generic_options_boxes(size_t option_count);
+
+// From the overworld in front of a PC, attempt to access the PC
+void access_pc_from_overworld(ConsoleHandle& console, ProControllerContext& context, bool stop_on_stamp_card=false);
+
+// Close out of all PC menus and return to overworld
+void exit_pc(ConsoleHandle& console, ProControllerContext& context);
+
+// With the PC menu open and actionable, open the specified menu option
+void open_menu_option(ConsoleHandle& console, ProControllerContext& context, PCMenuOption option);
+
+// A generic function to open and select an option for a vertical or horizontal list
+// Takes in a vector of ImageBoxes for the selection arrow locations for each item
+// Specify the index of the target option
+// Specify whether the selection arrow is right or down which determines if it is a vertical or horizontal list
+// If the movement in the list matches the arrow direction, set move_parallel. False for most cases
+void generic_select_and_open(
+    ConsoleHandle& console, 
+    ProControllerContext& context, 
+    const std::vector<ImageFloatBox>& option_boxes,
+    int target_index,
+    SelectionArrowType arrow_type,
+    bool move_parallel = false
+);
+
+// A wrapper for generic_select_and_open() for the common yes/no confirmation prompt with the locations pre-populated
+void yes_no_select_and_confirm(
+    ConsoleHandle& console, 
+    ProControllerContext& context, 
+    bool select_yes
+);
+
+// Keep pressing A to progress though dialog until a prompt appears
+void continue_until_prompt(
+    ConsoleHandle& console, 
+    ProControllerContext& context, 
+    const ImageFloatBox prompt_box
+);
+
+// Check if the daily shop item at the specified index is a recipe
+// Return single, double, triple, or not a recipe
+RecipeType item_is_recipe(
+    ConsoleHandle& console,
+    ProControllerContext& context,
+    int item_index
+);
+
+// Check if the daily shop item at the specified index is available for purchase
+bool item_is_available(
+    ConsoleHandle& console,
+    ProControllerContext& context,
+    int item_index
+);
+
+// Buy the daily shop item at the specified index
+// TODO: Handle the case where you cannot afford the item. This is usually gated elsewhere to ensure this case is never reached
+void buy_item(
+    ConsoleHandle& console,
+    ProControllerContext& context,
+    int item_index
+);
+
+// Get the stamp in the specified area
+Stamp get_stamp(
+    ConsoleHandle& console, 
+    ProControllerContext& context, 
+    ImageFloatBox stamp_box
+);
+
+// Get the stamp based on the location of the selection arrow for the corresponding stamp slot
+Stamp get_stamp_from_selection(
+    ConsoleHandle& console, 
+    ProControllerContext& context, 
+    ImageFloatBox selection_arrow_box
+);
+
+// Add today's stamp to the stamp collection
+// Return true if the stamp was added, false if a replacement is needed
+bool add_stamp(
+    ConsoleHandle& console,
+    ProControllerContext& context,
+    SelectionArrowWatcher& replace_stamp_selection_watcher
+);
+
+// Replace the specified stamp slot with today's stamp by pressing "Add Stamp!" and navigating to the target
+// Stamp indicies follow the path from left to right
+void replace_stamp(
+    ConsoleHandle& console, 
+    ProControllerContext& context, 
+    SelectionArrowWatcher& replace_stamp_selection_watcher
+);
+
+// navigate to the next stamp
+void move_to_next_stamp(
+    ConsoleHandle& console, 
+    ProControllerContext& context, 
+    SelectionArrowWatcher& replace_stamp_selection_watcher
+);
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/Dialogs/PokemonRSE_BattleDialogs.cpp b/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/Dialogs/PokemonRSE_BattleDialogs.cpp
new file mode 100644
index 0000000000..58eb9f2770
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/Dialogs/PokemonRSE_BattleDialogs.cpp
@@ -0,0 +1,181 @@
+/*  Battle Dialog Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/ImageTypes/ImageRGB32.h"
+#include "CommonFramework/ImageTools/ImageStats.h"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Images/SolidColorTest.h"
+#include "CommonTools/Images/ImageFilter.h"
+#include "VideoGames/PokemonRSE/PokemonRSE_Settings.h"
+#include "PokemonRSE_BattleDialogs.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonRSE{
+
+/*
+BattleDialogDetector::BattleDialogDetector(Color color)
+    : m_dialog_top_box(0.049224, 0.738530, 0.901359, 0.008023)
+    , m_dialog_right_box(0.943471, 0.746553, 0.007111, 0.212602)
+    , m_dialog_top_jpn_box(0.068780, 0.738530, 0.856913, 0.012034)
+    , m_dialog_right_jpn_box(0.918582, 0.747890, 0.007111, 0.208590)
+{}
+void BattleDialogDetector::make_overlays(VideoOverlaySet& items) const{
+    const BoxOption& GAME_BOX = GameSettings::instance().GAME_BOX;
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_dialog_top_box));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_dialog_right_box));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_dialog_top_jpn_box));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_dialog_right_jpn_box));
+}
+bool BattleDialogDetector::detect(const ImageViewRGB32& screen){
+    ImageViewRGB32 game_screen = extract_box_reference(screen, GameSettings::instance().GAME_BOX);
+
+    ImageViewRGB32 dialog_top_image = extract_box_reference(game_screen, m_dialog_top_box);
+    ImageViewRGB32 dialog_right_image = extract_box_reference(game_screen, m_dialog_right_box);
+    ImageViewRGB32 dialog_top_jpn_image = extract_box_reference(game_screen, m_dialog_top_jpn_box);
+    ImageViewRGB32 dialog_right_jpn_image = extract_box_reference(game_screen, m_dialog_right_jpn_box);
+
+    if ((is_solid(dialog_top_image, { 0.176, 0.357, 0.467 }, 0.25, 20)
+        && is_solid(dialog_right_image, { 0.176, 0.357, 0.467 }, 0.25, 20))
+        ||
+        (is_solid(dialog_top_jpn_image, { 0.176, 0.357, 0.467 }, 0.25, 20)
+        && is_solid(dialog_right_jpn_image, { 0.176, 0.357, 0.467 }, 0.25, 20))
+    ){
+        return true;
+    }
+    return false;
+}
+*/
+
+BattleMenuDetector::BattleMenuDetector(Color color)
+    : m_menu_top_box(0.599462, 0.738530, 0.366233, 0.004011) //top of the white box
+    , m_menu_bottom_box(0.602128, 0.947120, 0.368010, 0.006686)
+    , m_dialog_top_box(0.068780, 0.739867, 0.488903, 0.008023) //teal boxes
+    , m_dialog_right_box(0.553238, 0.739867, 0.006222, 0.215276)
+
+    , m_menu_top_eme_box(0.534571, 0.746553, 0.434679, 0.008023)
+    , m_menu_right_eme_box(0.962138, 0.747890, 0.007111, 0.205916)
+    , m_dialog_top_eme_box(0.046557, 0.741204, 0.442679, 0.008023)
+    , m_dialog_right_eme_box(0.487458, 0.742541, 0.004445, 0.216613)
+{}
+void BattleMenuDetector::make_overlays(VideoOverlaySet& items) const{
+    const BoxOption& GAME_BOX = GameSettings::instance().GAME_BOX;
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_menu_top_box));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_menu_bottom_box));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_dialog_top_box));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_dialog_right_box));
+
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_menu_top_eme_box));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_menu_right_eme_box));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_dialog_top_eme_box));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_dialog_right_eme_box));
+}
+bool BattleMenuDetector::detect(const ImageViewRGB32& screen){
+    ImageViewRGB32 game_screen = extract_box_reference(screen, GameSettings::instance().GAME_BOX);
+
+    //Menu is white
+    ImageViewRGB32 menu_top_image = extract_box_reference(game_screen, m_menu_top_box);
+    ImageViewRGB32 menu_bottom_image = extract_box_reference(game_screen, m_menu_bottom_box);
+    ImageViewRGB32 menu_top_jpn_image = extract_box_reference(game_screen, m_menu_top_eme_box);
+    ImageViewRGB32 menu_right_jpn_image = extract_box_reference(game_screen, m_menu_right_eme_box);
+
+    //Background dialog is teal
+    ImageViewRGB32 dialog_top_image = extract_box_reference(game_screen, m_dialog_top_box);
+    ImageViewRGB32 dialog_right_image = extract_box_reference(game_screen, m_dialog_right_box);
+    ImageViewRGB32 dialog_top_jpn_image = extract_box_reference(game_screen, m_dialog_top_eme_box);
+    ImageViewRGB32 dialog_right_jpn_image = extract_box_reference(game_screen, m_dialog_right_eme_box);
+
+    if ((is_white(menu_top_image) //Ruby/Sapphire, all languages. Emerald Japan.
+        && is_white(menu_bottom_image)
+        && is_solid(dialog_top_image, { 0.176, 0.357, 0.467 }, 0.25, 20)
+        && is_solid(dialog_right_image, { 0.176, 0.357, 0.467 }, 0.25, 20))
+        ||
+        (is_white(menu_top_jpn_image) //Emerald, all languages except Japan.
+        && is_white(menu_right_jpn_image)
+        && is_solid(dialog_top_jpn_image, { 0.176, 0.357, 0.467 }, 0.25, 20)
+        && is_solid(dialog_right_jpn_image, { 0.176, 0.357, 0.467 }, 0.25, 20))
+    ){
+        return true;
+    }
+    return false;
+}
+
+
+AdvanceBattleDialogDetector::AdvanceBattleDialogDetector(Color color)
+    : m_dialog_box(0.043890, 0.737193, 0.913804, 0.227310)
+    , m_dialog_top_box(0.049224, 0.738530, 0.901359, 0.008023)
+    , m_dialog_right_box(0.943471, 0.746553, 0.007111, 0.212602)
+    , m_dialog_jpn_box(0.059891, 0.742541, 0.872914, 0.216613)
+    , m_dialog_top_jpn_box(0.068780, 0.738530, 0.856913, 0.012034)
+    , m_dialog_right_jpn_box(0.918582, 0.747890, 0.007111, 0.208590)
+{}
+void AdvanceBattleDialogDetector::make_overlays(VideoOverlaySet& items) const{
+    const BoxOption& GAME_BOX = GameSettings::instance().GAME_BOX;
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_dialog_box));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_dialog_top_box));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_dialog_right_box));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_dialog_jpn_box));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_dialog_top_jpn_box));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_dialog_right_jpn_box));
+}
+bool AdvanceBattleDialogDetector::detect(const ImageViewRGB32& screen){
+    ImageViewRGB32 game_screen = extract_box_reference(screen, GameSettings::instance().GAME_BOX);
+
+    const bool replace_color_within_range = false;
+
+    //Filter out background
+    ImageRGB32 filtered_region = filter_rgb32_range(
+        extract_box_reference(game_screen, m_dialog_box),
+        combine_rgb(164, 0, 0), combine_rgb(255, 114, 87), Color(0), replace_color_within_range
+    );
+    ImageStats stats = image_stats(filtered_region);
+
+    /*
+    filtered_region.save("./filtered_only.png");
+    cout << stats.average.r << endl;
+    cout << stats.average.g << endl;
+    cout << stats.average.b << endl;
+    */
+
+    //japanese
+    ImageRGB32 filtered_region_jpn = filter_rgb32_range(
+        extract_box_reference(game_screen, m_dialog_jpn_box),
+        combine_rgb(164, 0, 0), combine_rgb(255, 114, 87), Color(0), replace_color_within_range
+    );
+    ImageStats stats2 = image_stats(filtered_region_jpn);
+
+    ImageViewRGB32 dialog_top_image = extract_box_reference(game_screen, m_dialog_top_box);
+    ImageViewRGB32 dialog_right_image = extract_box_reference(game_screen, m_dialog_right_box);
+    ImageViewRGB32 dialog_top_jpn_image = extract_box_reference(game_screen, m_dialog_top_jpn_box);
+    ImageViewRGB32 dialog_right_jpn_image = extract_box_reference(game_screen, m_dialog_right_jpn_box);
+
+    if ((is_solid(dialog_top_image, { 0.176, 0.357, 0.467 }, 0.25, 20)
+        && is_solid(dialog_right_image, { 0.176, 0.357, 0.467 }, 0.25, 20)
+        && (stats.average.r > stats.average.b + 180)
+        && (stats.average.r > stats.average.g + 180))
+        ||
+        (is_solid(dialog_top_jpn_image, { 0.176, 0.357, 0.467 }, 0.25, 20)
+        && is_solid(dialog_right_jpn_image, { 0.176, 0.357, 0.467 }, 0.25, 20)
+        && (stats2.average.r > stats2.average.b + 180)
+        && (stats2.average.r > stats2.average.g + 180))
+    ){
+        return true;
+    }
+    return false;
+}
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/Dialogs/PokemonRSE_BattleDialogs.h b/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/Dialogs/PokemonRSE_BattleDialogs.h
new file mode 100644
index 0000000000..ee8076ec48
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/Dialogs/PokemonRSE_BattleDialogs.h
@@ -0,0 +1,115 @@
+/*  Battle Dialog Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonRSE_BattleDialogs_H
+#define PokemonAutomation_PokemonRSE_BattleDialogs_H
+
+#include <chrono>
+#include <atomic>
+#include "Common/Cpp/Color.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonTools/VisualDetector.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+
+namespace PokemonAutomation{
+    class CancellableScope;
+    class VideoFeed;
+namespace NintendoSwitch{
+namespace PokemonRSE{
+
+// Battle dialog boxes are teal
+// This is unused right now so isn't tested well
+/*
+class BattleDialogDetector : public StaticScreenDetector{
+public:
+    BattleDialogDetector(Color color);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    ImageFloatBox m_dialog_top_box;
+    ImageFloatBox m_dialog_right_box;
+
+    ImageFloatBox m_dialog_top_jpn_box;
+    ImageFloatBox m_dialog_right_jpn_box;
+};
+class BattleDialogWatcher : public DetectorToFinder<BattleDialogDetector>{
+public:
+    BattleDialogWatcher(Color color)
+        : DetectorToFinder("BattleDialogWatcher", std::chrono::milliseconds(250), color)
+    {}
+};
+*/
+
+// Battle menu is a white box on the right
+// Teal dialog box remains on the left
+// For R/S, the selection arrow is only in JPN ver, other languages use a box
+// Positions slightly different on non-JPN Emerald but all langs use an arrow
+class BattleMenuDetector : public StaticScreenDetector{
+public:
+    BattleMenuDetector(Color color);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    //R/S both JPN and ENG, E for JPN
+    ImageFloatBox m_menu_top_box;
+    ImageFloatBox m_menu_bottom_box;
+    ImageFloatBox m_dialog_top_box;
+    ImageFloatBox m_dialog_right_box;
+
+    //Emerald for non-JPN
+    ImageFloatBox m_menu_top_eme_box;
+    ImageFloatBox m_menu_right_eme_box;
+    ImageFloatBox m_dialog_top_eme_box;
+    ImageFloatBox m_dialog_right_eme_box;
+};
+class BattleMenuWatcher : public DetectorToFinder<BattleMenuDetector>{
+public:
+    BattleMenuWatcher(Color color)
+        : DetectorToFinder("BattleMenuWatcher", std::chrono::milliseconds(250), color)
+    {}
+};
+
+
+
+// Detect the red advancement arrow by filtering for red.
+// This is the same as BattleDialogDetector apart from the arrow
+class AdvanceBattleDialogDetector : public StaticScreenDetector{
+public:
+    AdvanceBattleDialogDetector(Color color);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    ImageFloatBox m_dialog_box;
+    ImageFloatBox m_dialog_top_box;
+    ImageFloatBox m_dialog_right_box;
+
+    ImageFloatBox m_dialog_jpn_box;
+    ImageFloatBox m_dialog_top_jpn_box;
+    ImageFloatBox m_dialog_right_jpn_box;
+};
+class AdvanceBattleDialogWatcher : public DetectorToFinder<AdvanceBattleDialogDetector>{
+public:
+    AdvanceBattleDialogWatcher(Color color)
+        : DetectorToFinder("AdvanceBattleDialogWatcher", std::chrono::milliseconds(250), color)
+    {}
+};
+
+
+
+
+
+}
+}
+}
+
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/Dialogs/PokemonRSE_DialogDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/Dialogs/PokemonRSE_DialogDetector.cpp
new file mode 100644
index 0000000000..de42df7765
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/Dialogs/PokemonRSE_DialogDetector.cpp
@@ -0,0 +1,379 @@
+/*  Dialog Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/ImageTypes/ImageRGB32.h"
+#include "CommonFramework/ImageTools/ImageStats.h"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Images/SolidColorTest.h"
+#include "CommonTools/Images/ImageFilter.h"
+#include "Tests/ImageUnitTest.h"
+#include "VideoGames/PokemonRSE/PokemonRSE_Settings.h"
+#include "PokemonRSE_DialogDetector.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonRSE{
+
+
+
+PokenavDialogDetector::PokenavDialogDetector(Color color)
+    : m_dialog_border_box(0.04, 0.717, 0.926425, 0.002033) //Very narrow, not many places to detect
+    , m_dialog_main_box(0.039784, 0.759311, 0.039008, 0.010672)
+{}
+void PokenavDialogDetector::make_overlays(VideoOverlaySet& items) const{
+    const BoxOption& GAME_BOX = GameSettings::instance().GAME_BOX;
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_dialog_border_box));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_dialog_main_box));
+}
+bool PokenavDialogDetector::detect(const ImageViewRGB32& screen){
+    ImageViewRGB32 game_screen = extract_box_reference(screen, GameSettings::instance().GAME_BOX);
+
+    ImageViewRGB32 dialog_border_image = extract_box_reference(game_screen, m_dialog_border_box);
+    ImageViewRGB32 dialog_main_image = extract_box_reference(game_screen, m_dialog_main_box);
+
+    if (is_solid(dialog_border_image, { 0.20498, 0.45, 0.3448 }, 0.25, 20) //mint green 107, 235, 180
+        && is_white(dialog_main_image)
+    ){
+        return true;
+    }
+    return false;
+}
+
+
+DialogDetector::DialogDetector(Color color)
+    : m_top_box(0.13, 0.745, 0.7, 0.005)
+    , m_inner_box(0.044217, 0.756643, 0.007092, 0.17875)
+
+    , m_side_box_jpn(0.067267, 0.763312, 0.018618, 0.170746)
+    , m_inner_box_jpn(0.114254, 0.771316, 0.007092, 0.161409) //white
+{}
+void DialogDetector::make_overlays(VideoOverlaySet& items) const{
+    const BoxOption& GAME_BOX = GameSettings::instance().GAME_BOX;
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_top_box));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_inner_box));
+
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_side_box_jpn));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_inner_box_jpn));
+}
+bool DialogDetector::detect(const ImageViewRGB32& screen){
+    ImageViewRGB32 game_screen = extract_box_reference(screen, GameSettings::instance().GAME_BOX);
+
+    ImageViewRGB32 dialog_top_image = extract_box_reference(game_screen, m_top_box);
+    ImageViewRGB32 dialog_inner_image = extract_box_reference(game_screen, m_inner_box);
+
+    ImageViewRGB32 dialog_side_image_jpn = extract_box_reference(game_screen, m_side_box_jpn);
+    ImageViewRGB32 dialog_inner_image_jpn = extract_box_reference(game_screen, m_inner_box_jpn);
+
+    if ((is_white(dialog_inner_image)
+        && is_white(dialog_top_image))
+        ||
+        (is_white(dialog_inner_image_jpn)
+        && (is_solid(dialog_side_image_jpn, { 0.2300556, 0.34508, 0.42486 }, 0.25, 20) //RS - blue - 124 186 229
+            || is_solid(dialog_side_image_jpn, { 0.0025575, 0.516624, 0.4808184 }, 0.25, 20))) //E - green - 1 202 188
+    ){
+        return true;
+    }
+    return false;
+}
+
+
+
+AdvanceDialogDetector::AdvanceDialogDetector(Color color)
+    : m_top_box(0.13, 0.745, 0.7, 0.005)
+    , m_inner_box(0.044217, 0.756643, 0.007092, 0.17875)
+    , m_dialog_box(0.041557, 0.748639, 0.918467, 0.205429)
+
+    , m_side_box_jpn(0.067267, 0.763312, 0.018618, 0.170746)
+    , m_inner_box_jpn(0.114254, 0.771316, 0.007092, 0.161409)
+    , m_dialog_jpn_box(0.116914, 0.747305, 0.765094, 0.209431)
+{}
+void AdvanceDialogDetector::make_overlays(VideoOverlaySet& items) const{
+    const BoxOption& GAME_BOX = GameSettings::instance().GAME_BOX;
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_top_box));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_inner_box));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_dialog_box));
+
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_side_box_jpn));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_inner_box_jpn));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_dialog_jpn_box));
+}
+bool AdvanceDialogDetector::detect(const ImageViewRGB32& screen){
+    ImageViewRGB32 game_screen = extract_box_reference(screen, GameSettings::instance().GAME_BOX);
+
+    ImageViewRGB32 dialog_top_image = extract_box_reference(game_screen, m_top_box);
+    ImageViewRGB32 dialog_inner_image = extract_box_reference(game_screen, m_inner_box);
+
+    ImageViewRGB32 dialog_side_image_jpn = extract_box_reference(game_screen, m_side_box_jpn);
+    ImageViewRGB32 dialog_inner_image_jpn = extract_box_reference(game_screen, m_inner_box_jpn);
+
+    const bool replace_color_within_range = false;
+
+    //Filter out background
+    ImageRGB32 filtered_region = filter_rgb32_range(
+        extract_box_reference(game_screen, m_dialog_box),
+        combine_rgb(164, 0, 0), combine_rgb(255, 114, 87), Color(0), replace_color_within_range
+    );
+    ImageStats stats = image_stats(filtered_region);
+
+    /*
+    filtered_region.save("./filtered_only.png");
+    cout << stats.average.r << endl;
+    cout << stats.average.g << endl;
+    cout << stats.average.b << endl;
+    */
+
+    //japanese
+    ImageRGB32 filtered_region_jpn = filter_rgb32_range(
+        extract_box_reference(game_screen, m_dialog_jpn_box),
+        combine_rgb(164, 0, 0), combine_rgb(255, 114, 87), Color(0), replace_color_within_range
+    );
+    ImageStats stats2 = image_stats(filtered_region_jpn);
+
+    if ((is_white(dialog_inner_image)
+        && is_white(dialog_top_image)
+        && (stats.average.r > stats.average.b + 180)
+        && (stats.average.r > stats.average.g + 180))
+        ||
+        (is_white(dialog_inner_image_jpn)
+        && (is_solid(dialog_side_image_jpn, { 0.2300556, 0.34508, 0.42486 }, 0.25, 20) //RS - blue - 124 186 229
+            || is_solid(dialog_side_image_jpn, { 0.0025575, 0.516624, 0.4808184 }, 0.25, 20)) //E - green - 1 202 188
+        && (stats2.average.r > stats2.average.b + 180)
+        && (stats2.average.r > stats2.average.g + 180))
+    ){
+        return true;
+    }
+    return false;
+}
+
+
+
+SelectionDialogDetector::SelectionDialogDetector(Color color)
+    : m_top_box(0.13, 0.745, 0.7, 0.005)
+    , m_inner_box(0.044217, 0.756643, 0.007092, 0.17875)
+
+    , m_side_box_jpn(0.067267, 0.763312, 0.018618, 0.170746)
+    , m_inner_box_jpn(0.114254, 0.771316, 0.007092, 0.161409) //white
+
+    , m_yes_box(0.85, 0.46, 0.007, 0.069)
+    , m_no_box(0.85, 0.57, 0.007, 0.069)
+{}
+void SelectionDialogDetector::make_overlays(VideoOverlaySet& items) const{
+    const BoxOption& GAME_BOX = GameSettings::instance().GAME_BOX;
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_top_box));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_inner_box));
+
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_side_box_jpn));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_inner_box_jpn));
+
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_yes_box));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_no_box));
+}
+bool SelectionDialogDetector::detect(const ImageViewRGB32& screen){
+    ImageViewRGB32 game_screen = extract_box_reference(screen, GameSettings::instance().GAME_BOX);
+
+    ImageViewRGB32 dialog_top_image = extract_box_reference(game_screen, m_top_box);
+    ImageViewRGB32 dialog_inner_image = extract_box_reference(game_screen, m_inner_box);
+
+    ImageViewRGB32 dialog_side_image_jpn = extract_box_reference(game_screen, m_side_box_jpn);
+    ImageViewRGB32 dialog_inner_image_jpn = extract_box_reference(game_screen, m_inner_box_jpn);
+
+    ImageViewRGB32 dialog_yes_image = extract_box_reference(game_screen, m_yes_box);
+    ImageViewRGB32 dialog_no_image = extract_box_reference(game_screen, m_no_box);
+
+    if ((is_white(dialog_yes_image) && is_white(dialog_no_image))
+        && ((is_white(dialog_inner_image) && is_white(dialog_top_image))
+            ||
+            (is_white(dialog_inner_image_jpn)
+            && (is_solid(dialog_side_image_jpn, { 0.2300556, 0.34508, 0.42486 }, 0.25, 20) //RS - blue - 124 186 229
+                || is_solid(dialog_side_image_jpn, { 0.0025575, 0.516624, 0.4808184 }, 0.25, 20)))) //E - green - 1 202 188
+    ){
+        return true;
+    }
+    return false;
+}
+
+
+static std::vector<SlotCandidate> confirm_candidates(ConfirmSlot slot, ConfirmPosition position){
+    double offset = SELECTION_SLOT_OFFSETS[(int)slot];
+
+    switch (position){
+    case ConfirmPosition::STANDARD:
+        return {
+            { 0.69, 0.45 + offset, SelectionIndicator::ARROW  },
+            { 0.685, 0.458 + offset, SelectionIndicator::BORDER }
+        };
+    case ConfirmPosition::SPECIAL:
+        return {
+            { 0.79, 0.45 + offset, SelectionIndicator::ARROW  },
+            { 0.785, 0.458 + offset, SelectionIndicator::BORDER }
+        };
+    case ConfirmPosition::STARTER:
+        return {
+            { 0.79, 0.45 + offset, SelectionIndicator::ARROW  },
+            { 0.725, 0.397 + offset, SelectionIndicator::ARROW  }, // jpn rs
+            { 0.72, 0.405 + offset, SelectionIndicator::BORDER }
+        };
+    case ConfirmPosition::MART:
+        return {
+            { 0.69, 0.45 + offset, SelectionIndicator::ARROW  },
+            { 0.255, 0.45 + offset, SelectionIndicator::ARROW  }, // jpn rs
+            { 0.25, 0.458 + offset, SelectionIndicator::BORDER }
+        };
+    case ConfirmPosition::TOP_LEFT:
+        return {
+            { 0.094, 0.115 + offset, SelectionIndicator::ARROW  },
+            { 0.089, 0.123 + offset, SelectionIndicator::BORDER }
+        };
+    default:
+        return {
+            { 0.69, 0.45 + offset, SelectionIndicator::ARROW  },
+            { 0.685, 0.458 + offset, SelectionIndicator::BORDER }
+        };
+    }
+}
+
+ConfirmSlotDetector::ConfirmSlotDetector(Color color, ConfirmSlot slot, ConfirmPosition position)
+    : SelectionSlotDetector(color
+    , confirm_candidates(slot, position))
+{}
+
+
+
+class Test_SelectionDialogDetector : public ImageUnitTest {
+public:
+
+    Test_SelectionDialogDetector(
+        const std::string& image,
+        bool expected
+    )
+        : ImageUnitTest("PokemonRSE::SelectionDialogDetector - " + image, {image})
+        , m_expected(expected)
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override {
+        SelectionDialogDetector detector(COLOR_RED);
+        const ImageRGB32& image = images[0];
+        return detector.detect(image) == m_expected;
+    };
+
+private:
+    bool m_expected;
+};
+
+void add_tests_SelectionDialogDetector(UnitTestDatabase& database){
+    // Switch 1/2
+    
+    /*
+    // Original GBA resolution; {0.0, 0.0, 1.0, 1.0}
+    database.add<Test_SelectionDialogDetector>("PokemonRSE/SelectionDialogDetector/GBA-Eng-Ruby_true.png", true);
+    database.add<Test_SelectionDialogDetector>("PokemonRSE/SelectionDialogDetector/GBA-Ger-Emerald_true.png", true);
+    
+    // Game Boy Player; {0.064217, 0.107667, 0.86413, 0.787928}
+    database.add<Test_SelectionDialogDetector>("PokemonRSE/SelectionDialogDetector/GBP-Ger-Emerald_true.png", true);
+    database.add<Test_SelectionDialogDetector>("PokemonRSE/SelectionDialogDetector/GBP-Ger-Ruby_true.png", true);
+    */
+}
+
+
+class Test_ConfirmSlotDetector : public ImageUnitTest {
+public:
+
+    Test_ConfirmSlotDetector(
+        const std::string& image,
+        ConfirmSlot slot,
+        ConfirmPosition position,
+        bool expected
+    )
+        : ImageUnitTest("PokemonRSE::ConfirmSlotDetector - " + std::to_string((int)slot) + " - " + image, {image})
+        , m_slot(slot)
+        , m_position(position)
+        , m_expected(expected)
+    {
+    }
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override {
+        ConfirmSlotDetector detector(COLOR_RED, m_slot, m_position);
+        const ImageRGB32& image = images[0];
+        return detector.detect(image) == m_expected;
+    };
+
+private:
+    ConfirmSlot m_slot;
+    ConfirmPosition m_position;
+    bool m_expected;
+};
+
+void add_tests_ConfirmSlotDetector(UnitTestDatabase& database){
+    // Switch 1/2
+
+    /*
+    // Original GBA resolution {0.0, 0.0, 1.0, 1.0}
+    database.add<Test_ConfirmSlotDetector>("PokemonRSE/ConfirmSlotDetector/GBA-Eng-Ruby_yes.png", ConfirmSlot::YES, ConfirmPosition::STANDARD, true);
+    //database.add<Test_ConfirmSlotDetector>("PokemonRSE/ConfirmSlotDetector/GBA-Eng-Ruby_yes.png", ConfirmSlot::NO, ConfirmPosition::STANDARD, false);
+    database.add<Test_ConfirmSlotDetector>("PokemonRSE/ConfirmSlotDetector/GBA-Ger-Emerald_yes.png", ConfirmSlot::YES, ConfirmPosition::STANDARD, true);
+    //database.add<Test_ConfirmSlotDetector>("PokemonRSE/ConfirmSlotDetector/GBA-Ger-Emerald_yes.png", ConfirmSlot::NO, ConfirmPosition::STANDARD, false);
+    database.add<Test_ConfirmSlotDetector>("PokemonRSE/ConfirmSlotDetector/GBA-Ger-Ruby_yes.png", ConfirmSlot::YES, ConfirmPosition::STANDARD, true);
+    //database.add<Test_ConfirmSlotDetector>("PokemonRSE/ConfirmSlotDetector/GBA-Ger-Ruby_yes.png", ConfirmSlot::NO, ConfirmPosition::STANDARD, false);
+
+    // GBA SPECIAL
+    database.add<Test_ConfirmSlotDetector>("PokemonRSE/ConfirmSlotDetector/GBA-Eng-Emerald-Special_no.png", ConfirmSlot::NO, ConfirmPosition::SPECIAL, true);
+    database.add<Test_ConfirmSlotDetector>("PokemonRSE/ConfirmSlotDetector/GBA-Eng-Ruby-Special_yes.png", ConfirmSlot::YES, ConfirmPosition::SPECIAL, true);
+
+    // GBA TOP_LEFT
+    database.add<Test_ConfirmSlotDetector>("PokemonRSE/ConfirmSlotDetector/GBA-Eng-Emerald-Top_no.png", ConfirmSlot::NO, ConfirmPosition::TOP_LEFT, true);
+    database.add<Test_ConfirmSlotDetector>("PokemonRSE/ConfirmSlotDetector/GBA-Eng-Ruby-Top_no.png", ConfirmSlot::NO, ConfirmPosition::TOP_LEFT, true);
+
+    // GBA MART
+    database.add<Test_ConfirmSlotDetector>("PokemonRSE/ConfirmSlotDetector/GBA-Ger-Emerald-Mart_yes.png", ConfirmSlot::YES, ConfirmPosition::MART, true);
+    database.add<Test_ConfirmSlotDetector>("PokemonRSE/ConfirmSlotDetector/GBA-Ger-Ruby-Mart_no.png", ConfirmSlot::NO, ConfirmPosition::MART, true);
+    database.add<Test_ConfirmSlotDetector>("PokemonRSE/ConfirmSlotDetector/GBA-Jpn-Ruby-Mart_yes.png", ConfirmSlot::YES, ConfirmPosition::MART, true);
+
+    // GBA STARTER
+    database.add<Test_ConfirmSlotDetector>("PokemonRSE/ConfirmSlotDetector/GBA-Ger-Emerald-Starter_yes.png", ConfirmSlot::YES, ConfirmPosition::STARTER, true);
+    database.add<Test_ConfirmSlotDetector>("PokemonRSE/ConfirmSlotDetector/GBA-Ger-Ruby-Starter_no.png", ConfirmSlot::NO, ConfirmPosition::STARTER, true);
+    database.add<Test_ConfirmSlotDetector>("PokemonRSE/ConfirmSlotDetector/GBA-Jpn-Ruby-Starter_yes.png", ConfirmSlot::YES, ConfirmPosition::STARTER, true);
+
+    // Game Boy Player {0.064217, 0.107667, 0.86413, 0.787928}
+    database.add<Test_ConfirmSlotDetector>("PokemonRSE/ConfirmSlotDetector/GBP-Ger-Emerald_no.png", ConfirmSlot::NO, ConfirmPosition::STANDARD, true);
+    //database.add<Test_ConfirmSlotDetector>("PokemonRSE/ConfirmSlotDetector/GBP-Ger-Emerald_no.png", ConfirmSlot::YES, ConfirmPosition::STANDARD, false);
+    database.add<Test_ConfirmSlotDetector>("PokemonRSE/ConfirmSlotDetector/GBP-Ger-Emerald_yes.png", ConfirmSlot::YES, ConfirmPosition::STANDARD, true);
+    //database.add<Test_ConfirmSlotDetector>("PokemonRSE/ConfirmSlotDetector/GBP-Ger-Emerald_yes.png", ConfirmSlot::NO, ConfirmPosition::STANDARD, false);
+    database.add<Test_ConfirmSlotDetector>("PokemonRSE/ConfirmSlotDetector/GBP-Ger-Ruby_no.png", ConfirmSlot::NO, ConfirmPosition::STANDARD, true);
+    //database.add<Test_ConfirmSlotDetector>("PokemonRSE/ConfirmSlotDetector/GBP-Ger-Ruby_no.png", ConfirmSlot::YES, ConfirmPosition::STANDARD, false);
+    database.add<Test_ConfirmSlotDetector>("PokemonRSE/ConfirmSlotDetector/GBP-Ger-Ruby_yes.png", ConfirmSlot::YES, ConfirmPosition::STANDARD, true);
+    //database.add<Test_ConfirmSlotDetector>("PokemonRSE/ConfirmSlotDetector/GBP-Ger-Ruby_yes.png", ConfirmSlot::NO, ConfirmPosition::STANDARD, false);
+
+    // GBP SPECIAL
+    database.add<Test_ConfirmSlotDetector>("PokemonRSE/ConfirmSlotDetector/GBP-Ger-Emerald-Special_yes.png", ConfirmSlot::YES, ConfirmPosition::SPECIAL, true);
+    database.add<Test_ConfirmSlotDetector>("PokemonRSE/ConfirmSlotDetector/GBP-Ger-Ruby-Special_no.png", ConfirmSlot::NO, ConfirmPosition::SPECIAL, true);
+
+    // GBP MART
+    database.add<Test_ConfirmSlotDetector>("PokemonRSE/ConfirmSlotDetector/GBP-Ger-Emerald-Mart_yes.png", ConfirmSlot::YES, ConfirmPosition::MART, true);
+    database.add<Test_ConfirmSlotDetector>("PokemonRSE/ConfirmSlotDetector/GBP-Ger-Ruby-Mart_yes.png", ConfirmSlot::YES, ConfirmPosition::MART, true);
+
+    // GBP STARTER
+    database.add<Test_ConfirmSlotDetector>("PokemonRSE/ConfirmSlotDetector/GBP-Ger-Emerald-Starter_yes.png", ConfirmSlot::YES, ConfirmPosition::STARTER, true);
+    */
+}
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/Dialogs/PokemonRSE_DialogDetector.h b/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/Dialogs/PokemonRSE_DialogDetector.h
new file mode 100644
index 0000000000..81170335a5
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/Dialogs/PokemonRSE_DialogDetector.h
@@ -0,0 +1,199 @@
+/*  Dialog Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonRSE_DialogDetector_H
+#define PokemonAutomation_PokemonRSE_DialogDetector_H
+
+#include <chrono>
+#include <atomic>
+#include "Common/Cpp/Color.h"
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/VisualDetector.h"
+#include "CommonTools/VisualDetectors/BlackScreenDetector.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+#include "VideoGames/PokemonRSE/Inference/PokemonRSE_SelectionDetector.h"
+#include "VideoGames/PokemonRSE/PokemonRSE_Settings.h"
+
+namespace PokemonAutomation{
+    class CancellableScope;
+    class VideoFeed;
+namespace NintendoSwitch{
+namespace PokemonRSE{
+
+
+class WhiteScreenOverWatcher : public PokemonAutomation::WhiteScreenOverWatcher{
+public:
+    WhiteScreenOverWatcher(Color color = COLOR_RED)
+        : PokemonAutomation::WhiteScreenOverWatcher(
+            color,
+            GameSettings::instance().GAME_BOX.inner_to_outer({0.231692, 0.0616538, 0.551385, 0.9045})
+        )
+    {}
+};
+class BlackScreenWatcher : public PokemonAutomation::BlackScreenWatcher{
+public:
+    BlackScreenWatcher(Color color = COLOR_RED)
+        : PokemonAutomation::BlackScreenWatcher(
+            color,
+            GameSettings::instance().GAME_BOX.inner_to_outer({0.231692, 0.0616538, 0.551385, 0.9045})
+        )
+    {}
+};
+class BlackScreenOverWatcher : public PokemonAutomation::BlackScreenOverWatcher{
+public:
+    BlackScreenOverWatcher(Color color = COLOR_RED)
+        : PokemonAutomation::BlackScreenOverWatcher(
+            color,
+            GameSettings::instance().GAME_BOX.inner_to_outer({0.231692, 0.0616538, 0.551385, 0.9045})
+        )
+    {}
+};
+
+
+// Detect the Pokenav dialog box that appears when being called on the overworld
+// This does not work for calls from the Pokenav menu itself, as the position is different
+// Emerald only, Ruby and Sapphire don't have to worry about randomly being interrupted.
+// Advance arrow appears on all but the last box of dialog. No detection for this since
+// most interaction will be to mash B to get rid of the call.
+class PokenavDialogDetector : public StaticScreenDetector{
+public:
+    PokenavDialogDetector(Color color);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    ImageFloatBox m_dialog_border_box;
+    ImageFloatBox m_dialog_main_box;
+};
+class PokenavDialogWatcher : public DetectorToFinder<PokenavDialogDetector>{
+public:
+    PokenavDialogWatcher(Color color)
+        : DetectorToFinder("PokenavDialogWatcher", std::chrono::milliseconds(250), color)
+    {}
+};
+
+
+// Dialog box without advance arrow.
+// Positions are different between japan and ROW, but are the same across games.
+class DialogDetector : public StaticScreenDetector{
+public:
+    DialogDetector(Color color);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    //Position for non-JPN
+    ImageFloatBox m_top_box;
+    ImageFloatBox m_inner_box;
+
+    //Position for JPN
+    ImageFloatBox m_side_box_jpn;
+    ImageFloatBox m_inner_box_jpn;
+};
+class DialogWatcher : public DetectorToFinder<DialogDetector>{
+public:
+    DialogWatcher(Color color)
+        : DetectorToFinder("DialogWatcher", std::chrono::milliseconds(250), color)
+    {}
+};
+
+
+
+// Dialog box, now with arrow!
+class AdvanceDialogDetector : public StaticScreenDetector{
+public:
+    AdvanceDialogDetector(Color color);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    //Position for non-JPN
+    ImageFloatBox m_top_box;
+    ImageFloatBox m_inner_box;
+    ImageFloatBox m_dialog_box;
+
+    //Position for JPN
+    ImageFloatBox m_side_box_jpn;
+    ImageFloatBox m_inner_box_jpn;
+    ImageFloatBox m_dialog_jpn_box;
+};
+class AdvanceDialogWatcher : public DetectorToFinder<AdvanceDialogDetector>{
+public:
+    AdvanceDialogWatcher(Color color)
+        : DetectorToFinder("AdvanceDialogWatcher", std::chrono::milliseconds(250), color)
+    {}
+};
+
+
+
+// Detection for the Yes/No prompt. (Poke Center, Move Deleter)
+// Does not work for starter selection, dialog box and prompt are different.
+class SelectionDialogDetector : public StaticScreenDetector{
+public:
+    SelectionDialogDetector(Color color);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    //Position for non-JPN
+    ImageFloatBox m_top_box;
+    ImageFloatBox m_inner_box;
+
+    //Position for JPN
+    ImageFloatBox m_side_box_jpn;
+    ImageFloatBox m_inner_box_jpn;
+
+    ImageFloatBox m_yes_box;
+    ImageFloatBox m_no_box;
+};
+class SelectionDialogWatcher : public DetectorToFinder<SelectionDialogDetector>{
+public:
+    SelectionDialogWatcher(Color color)
+        : DetectorToFinder("SelectionDialogWatcher", std::chrono::milliseconds(250), color)
+    {}
+};
+
+
+enum class ConfirmSlot {
+    YES,
+    NO
+};
+
+enum class ConfirmPosition {
+    STANDARD, // e.g. save menu
+    SPECIAL, // e.g. clock in your room, replace move; not starter selection: ruby/sapphire is different
+    STARTER, // starter selection
+    MART, // confirm purchase
+    TOP_LEFT // e.g. player name
+};
+
+class ConfirmSlotDetector : public SelectionSlotDetector {
+public:
+    ConfirmSlotDetector(Color color, ConfirmSlot slot, ConfirmPosition position = ConfirmPosition::STANDARD);
+};
+class ConfirmSlotWatcher : public DetectorToFinder<ConfirmSlotDetector> {
+public:
+    ConfirmSlotWatcher(Color color, ConfirmSlot slot, ConfirmPosition position = ConfirmPosition::STANDARD, Milliseconds hold_duration = Milliseconds(250))
+        : DetectorToFinder("ConfirmSlotWatcher", hold_duration , color, slot, position)
+    {}
+};
+
+
+
+void add_tests_SelectionDialogDetector(UnitTestDatabase& database);
+void add_tests_ConfirmSlotDetector(UnitTestDatabase& database);
+
+}
+}
+}
+
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/Menus/PokemonRSE_LoadMenuDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/Menus/PokemonRSE_LoadMenuDetector.cpp
new file mode 100644
index 0000000000..0536ede11a
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/Menus/PokemonRSE_LoadMenuDetector.cpp
@@ -0,0 +1,57 @@
+/*  Load Menu Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/ImageTools/ImageStats.h"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Images/SolidColorTest.h"
+#include "CommonTools/Images/ImageFilter.h"
+#include "CommonTools/Images/WaterfillUtilities.h"
+#include "VideoGames/PokemonRSE/PokemonRSE_Settings.h"
+#include "PokemonRSE_LoadMenuDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonRSE{
+
+LoadMenuDetector::LoadMenuDetector(Color color)
+    : m_right_box(0.975, 0.02, 0.015, 0.96)
+    , m_left_box(0.01, 0.02, 0.015, 0.96)
+    , m_save_box(0.751685, 0.053648, 0.167558, 0.05736)
+{}
+void LoadMenuDetector::make_overlays(VideoOverlaySet& items) const{
+    const BoxOption& GAME_BOX = GameSettings::instance().GAME_BOX;
+    items.add(COLOR_BLUE, GAME_BOX.inner_to_outer(m_right_box));
+    items.add(COLOR_BLUE, GAME_BOX.inner_to_outer(m_left_box));
+    items.add(COLOR_BLUE, GAME_BOX.inner_to_outer(m_save_box));
+}
+bool LoadMenuDetector::detect(const ImageViewRGB32& screen){
+    ImageViewRGB32 game_screen = extract_box_reference(screen, GameSettings::instance().GAME_BOX);
+
+    ImageViewRGB32 right_image = extract_box_reference(game_screen, m_right_box);
+    ImageViewRGB32 left_image = extract_box_reference(game_screen, m_left_box);
+    ImageViewRGB32 save_image = extract_box_reference(game_screen, m_save_box);
+
+    //Ruby and Sapphire
+    if ((is_solid(right_image, { 0.254, 0.274576, 0.471186 }, 0.25, 2) //75, 81, 139
+        && is_solid(left_image, { 0.254, 0.274576, 0.471186 }, 0.25, 2)
+        && is_white(save_image)) //white
+        ||
+        (is_solid(right_image, { 0.259259, 0.27037, 0.47037 }, 0.25, 2) //Emerald
+         && is_solid(right_image, { 0.259259, 0.27037, 0.47037 }, 0.25, 2) //140, 146, 254
+         && is_white(save_image)
+        )
+    ){
+        return true;
+    }
+    return false;
+}
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/Menus/PokemonRSE_LoadMenuDetector.h b/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/Menus/PokemonRSE_LoadMenuDetector.h
new file mode 100644
index 0000000000..362dc05203
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/Menus/PokemonRSE_LoadMenuDetector.h
@@ -0,0 +1,50 @@
+/*  Load Menu Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonRSE_LoadMenuDetector_H
+#define PokemonAutomation_PokemonRSE_LoadMenuDetector_H
+
+#include <chrono>
+#include <atomic>
+#include "Common/Cpp/Color.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonTools/VisualDetector.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+
+namespace PokemonAutomation{
+    class CancellableScope;
+    class VideoFeed;
+namespace NintendoSwitch{
+namespace PokemonRSE{
+
+// Detect save load menu by looking for the blue on the sides and the white of the save file
+// Untested on new game, assumes there's a save.
+class LoadMenuDetector : public StaticScreenDetector{
+public:
+    LoadMenuDetector(Color color);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    ImageFloatBox m_right_box;
+    ImageFloatBox m_left_box;
+    ImageFloatBox m_save_box;
+};
+class LoadMenuWatcher : public DetectorToFinder<LoadMenuDetector>{
+public:
+    LoadMenuWatcher(Color color)
+        : DetectorToFinder("LoadMenuWatcher", std::chrono::milliseconds(250), color)
+    {}
+};
+
+
+}
+}
+}
+
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/Menus/PokemonRSE_PartyMenuDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/Menus/PokemonRSE_PartyMenuDetector.cpp
new file mode 100644
index 0000000000..b4a57c68f2
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/Menus/PokemonRSE_PartyMenuDetector.cpp
@@ -0,0 +1,116 @@
+/*  Party Menu Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Exceptions.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/ImageTools/ImageStats.h"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Images/SolidColorTest.h"
+#include "CommonTools/Images/ImageFilter.h"
+#include "CommonTools/Images/WaterfillUtilities.h"
+#include "PokemonRSE_PartyMenuDetector.h"
+
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonRSE{
+
+
+PartyMenuDetector::PartyMenuDetector(Color color)
+    : m_dialog_box(0.706471, 0.85002, 0.023937, 0.096045) //Choose a Pokemon - position works for all games
+    , m_background_box_e(0.015847, 0.591232, 0.038122, 0.133396) //solid color in the background for emerald, similar to FRLG
+    , m_top_bar_rs(0.028666, 0.035895, 0.942495, 0.004067) //both rs have a red bar on top (was this intended for s?)
+{}
+void PartyMenuDetector::make_overlays(VideoOverlaySet& items) const{
+    const BoxOption& GAME_BOX = GameSettings::instance().GAME_BOX;
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_dialog_box));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_background_box_e));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_top_bar_rs));
+}
+bool PartyMenuDetector::detect(const ImageViewRGB32& screen){
+    ImageViewRGB32 game_screen = extract_box_reference(screen, GameSettings::instance().GAME_BOX);
+
+    //Dialog is white
+    ImageViewRGB32 dialog_image = extract_box_reference(game_screen, m_dialog_box);
+
+    //Menu background is dark yellow/gold-ish
+    ImageViewRGB32 background_image = extract_box_reference(game_screen, m_background_box_e);
+
+    //The top bar is red
+    ImageViewRGB32 top_bar_image = extract_box_reference(game_screen, m_top_bar_rs);
+
+    if ((is_white(dialog_image) //Ruby and Sapphire, all languages
+        && is_solid(top_bar_image, { 0.71282, 0.16923, 0.1179487 }, 0.25, 20)) //139, 33, 23
+        ||
+        (is_white(dialog_image) //Emerald, all languages
+        && is_solid(background_image, { 0.41566, 0.46084, 0.12349 }, 0.25, 20)) //138, 153, 41
+    ){
+        return true;
+    }
+    return false;
+}
+
+
+
+ImageFloatBox PartySlotDetector::party_slot_boxes(PartySlot position){
+    //These positions should work for RSE all languages
+    switch (position){
+    case PartySlot::ONE:
+        return ImageFloatBox(0.35185, 0.271083, 0.003546, 0.138731);
+    case PartySlot::TWO:
+        return ImageFloatBox(0.987, 0.085, 0.003, 0.09966);
+    case PartySlot::THREE:
+        return ImageFloatBox(0.987, 0.235, 0.003, 0.09966);
+    case PartySlot::FOUR:
+        return ImageFloatBox(0.987, 0.385, 0.003, 0.09966);
+    case PartySlot::FIVE:
+        return ImageFloatBox(0.987, 0.535, 0.003, 0.09966);
+    case PartySlot::SIX:
+        return ImageFloatBox(0.987, 0.685, 0.003, 0.09966);
+    default:
+        break;
+    }
+    throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Invalid RSE Party Slot Position");
+}
+PartySlotDetector::PartySlotDetector(
+    Color color,
+    const ImageFloatBox& box
+)
+    : m_color(color)
+    , m_party_box(box)
+{}
+PartySlotDetector::PartySlotDetector(
+    Color color, 
+    PartySlot position
+)
+    : m_color(color)
+    , m_party_box(party_slot_boxes(position))
+{}
+void PartySlotDetector::make_overlays(VideoOverlaySet& items) const{
+    const BoxOption& GAME_BOX = GameSettings::instance().GAME_BOX;
+    items.add(m_color, GAME_BOX.inner_to_outer(m_party_box));
+}
+bool PartySlotDetector::detect(const ImageViewRGB32& screen){
+    ImageViewRGB32 game_screen = extract_box_reference(screen, GameSettings::instance().GAME_BOX);
+
+    ImageViewRGB32 target_box_party = extract_box_reference(game_screen, m_party_box);
+
+    //orange border FD7132 for emerald
+    //FD7132 AND EB712D for rs, the background is faintly striped, so it requires a wider range
+    //FD7132 - 253, 113, 50
+    if (is_solid(target_box_party, { 0.608173, 0.2716346, 0.1201923 }, 0.25, 50)
+    ){
+        return true;
+    }
+    return false;
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/Menus/PokemonRSE_PartyMenuDetector.h b/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/Menus/PokemonRSE_PartyMenuDetector.h
new file mode 100644
index 0000000000..48dabaab32
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/Menus/PokemonRSE_PartyMenuDetector.h
@@ -0,0 +1,98 @@
+/*  Party Menu Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonRSE_PartyMenuDetector_H
+#define PokemonAutomation_PokemonRSE_PartyMenuDetector_H
+
+#include <chrono>
+#include "Common/Cpp/Color.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/VisualDetector.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+#include "VideoGames/PokemonRSE/PokemonRSE_Settings.h"
+//#include "PokemonFRLG_PartySlot.h"
+
+namespace PokemonAutomation{
+    class CancellableScope;
+    class VideoFeed;
+namespace NintendoSwitch{
+namespace PokemonRSE{
+
+
+enum class PartySlot{
+    ONE,
+    TWO,
+    THREE,
+    FOUR,
+    FIVE,
+    SIX
+    //CXL
+};
+
+
+// Detect the Party Menu (Start Menu -> Pokemon).
+class PartyMenuDetector : public StaticScreenDetector{
+public:
+    PartyMenuDetector(Color color);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    ImageFloatBox m_dialog_box;
+    ImageFloatBox m_background_box_e;
+    ImageFloatBox m_top_bar_rs; //red, dark red, black bar on top
+};
+class PartyMenuWatcher : public DetectorToFinder<PartyMenuDetector>{
+public:
+    PartyMenuWatcher(Color color)
+        : DetectorToFinder("PartyMenuWatcher", std::chrono::milliseconds(250), color)
+    {}
+};
+
+
+//Detect the highlighted slot.
+//Looks for the red outline
+class PartySlotDetector : public StaticScreenDetector{
+public:
+    PartySlotDetector(
+        Color color,
+        const ImageFloatBox& box
+    );
+
+    PartySlotDetector(
+        Color color,
+        PartySlot position
+    );
+
+    static ImageFloatBox party_slot_boxes(PartySlot position);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    const Color m_color;
+    const ImageFloatBox m_party_box;
+};
+class PartySlotWatcher : public DetectorToFinder<PartySlotDetector>{
+public:
+    PartySlotWatcher(
+        Color color,
+        PartySlot position,
+        std::chrono::milliseconds hold_duration = std::chrono::milliseconds(250)
+    )
+        : DetectorToFinder("PartySlotWatcher", hold_duration, color, party_slot_boxes(position))
+    {
+    }
+};
+
+
+}
+}
+}
+
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/Menus/PokemonRSE_StartMenuDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/Menus/PokemonRSE_StartMenuDetector.cpp
new file mode 100644
index 0000000000..725a1af398
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/Menus/PokemonRSE_StartMenuDetector.cpp
@@ -0,0 +1,198 @@
+/*  Start Menu Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Color.h"
+#include "Common/Cpp/Exceptions.h"
+#include "CommonFramework/ImageTypes/ImageRGB32.h"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Images/SolidColorTest.h"
+#include "Tests/ImageUnitTest.h"
+#include "VideoGames/PokemonRSE/PokemonRSE_Settings.h"
+#include "PokemonRSE_StartMenuDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonRSE{
+
+
+static double menu_bottom_box_y(StartMenuState state){
+    switch (state){
+    case StartMenuState::FULL:
+        return 0.94;
+    case StartMenuState::PRE_POKENAV:
+    case StartMenuState::SAFARI:
+        return 0.84;
+    case StartMenuState::PRE_POKEDEX:
+        return 0.74;
+    case StartMenuState::PRE_POKEMON:
+        return 0.64;
+    default:
+        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Invalid StartMenuState");
+    }
+}
+
+StartMenuDetector::StartMenuDetector(Color color, StartMenuState state)
+    : m_menu_top_box(0.766756, 0.046978, 0.197701, 0.01334)
+    , m_menu_bottom_box(0.766756, menu_bottom_box_y(state), 0.197701, 0.01334)
+{}
+void StartMenuDetector::make_overlays(VideoOverlaySet& items) const{
+    const BoxOption& GAME_BOX = GameSettings::instance().GAME_BOX;
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_menu_top_box));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_menu_bottom_box));
+}
+bool StartMenuDetector::detect(const ImageViewRGB32& screen){
+    ImageViewRGB32 game_screen = extract_box_reference(screen, GameSettings::instance().GAME_BOX);
+
+    ImageViewRGB32 menu_top_image = extract_box_reference(game_screen, m_menu_top_box);
+    ImageViewRGB32 menu_bottom_image = extract_box_reference(game_screen, m_menu_bottom_box);
+
+    return (is_white(menu_top_image)
+        && is_white(menu_bottom_image)
+    );
+}
+
+
+// Row of each option from the top of the menu, per state; -1 = not shown
+// column = (int)StartMenuSlot, row = (int)StartMenuState.
+//                       DEX  MON  BAG  NAV  TRN  SAV  OPT  EXT  RET
+constexpr int8_t START_MENU_ROWS[5][9] = {
+    /* PRE_POKEMON */ {  -1,  -1,   0,  -1,   1,   2,   3,   4,  -1 },
+    /* PRE_POKEDEX */ {  -1,   0,   1,  -1,   2,   3,   4,   5,  -1 },
+    /* PRE_POKENAV */ {   0,   1,   2,  -1,   3,   4,   5,   6,  -1 },
+    /* FULL        */ {   0,   1,   2,   3,   4,   5,   6,   7,  -1 },
+    /* SAFARI      */ {   1,   2,   3,  -1,   4,  -1,   5,   6,   0 },
+};
+
+static std::vector<SlotCandidate> start_menu_slot_candidates(StartMenuSlot slot, StartMenuState state){
+    int8_t row = START_MENU_ROWS[(int)state][(int)slot];
+    if (row == -1){
+        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Invalid StartMenuSlot for StartMenuState");
+    }
+    double offset = SELECTION_SLOT_OFFSETS[row];
+    return {
+        { 0.725, 0.098 + offset, SelectionIndicator::ARROW  },
+        { 0.759, 0.098 + offset, SelectionIndicator::ARROW  }, // jpn rse
+        { 0.754, 0.106 + offset, SelectionIndicator::BORDER }
+    };
+}
+
+
+StartMenuSlotDetector::StartMenuSlotDetector(Color color, StartMenuSlot slot, StartMenuState state)
+    : SelectionSlotDetector(color, start_menu_slot_candidates(slot, state))
+{}
+
+
+
+class Test_StartMenuDetector : public ImageUnitTest {
+public:
+
+    Test_StartMenuDetector(
+        const std::string& image,
+        StartMenuState state,
+        bool expected
+    )
+        : ImageUnitTest("PokemonRSE::StartMenuDetector - " + image, {image})
+        , m_state(state)
+        , m_expected(expected)
+    {
+    }
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override {
+        StartMenuDetector detector(COLOR_RED, m_state);
+        const ImageRGB32& image = images[0];
+        return detector.detect(image) == m_expected;
+    };
+
+private:
+    StartMenuState m_state;
+    bool m_expected;
+};
+
+void add_tests_StartMenuDetector(UnitTestDatabase & database){
+    // Switch 1/2
+
+    /*
+    // Original GBA resolution; {0.0, 0.0, 1.0, 1.0}
+    database.add<Test_StartMenuDetector>("PokemonRSE/StartMenuDetector/GBA-Ger-Emerald-Full-Pokedex_true.png", StartMenuState::FULL, true);
+    database.add<Test_StartMenuDetector>("PokemonRSE/StartMenuDetector/GBA-Ger-Emerald-PrePokenav-Exit_true.png", StartMenuState::PRE_POKENAV, true);
+    database.add<Test_StartMenuDetector>("PokemonRSE/StartMenuDetector/GBA-Ger-Emerald-PrePokedex-Option_true.png", StartMenuState::PRE_POKEDEX, true);
+    database.add<Test_StartMenuDetector>("PokemonRSE/StartMenuDetector/GBA-Ger-Emerald-PrePokemon-Bag_true.png", StartMenuState::PRE_POKEMON, true);
+
+    database.add<Test_StartMenuDetector>("PokemonRSE/StartMenuDetector/GBA-Ger-Ruby-Full-Exit_true.png", StartMenuState::FULL, true);
+    database.add<Test_StartMenuDetector>("PokemonRSE/StartMenuDetector/GBA-Ger-Ruby-PrePokenav-Bag_true.png", StartMenuState::PRE_POKENAV, true);
+    database.add<Test_StartMenuDetector>("PokemonRSE/StartMenuDetector/GBA-Ger-Ruby-PrePokedex-Exit_true.png", StartMenuState::PRE_POKEDEX, true);
+    database.add<Test_StartMenuDetector>("PokemonRSE/StartMenuDetector/GBA-Ger-Ruby-PrePokemon-Bag_true.png", StartMenuState::PRE_POKEMON, true);
+
+    // Game Boy Player; {0.064217, 0.107667, 0.86413, 0.787928}
+    database.add<Test_StartMenuDetector>("PokemonRSE/StartMenuDetector/GBP-Ger-Emerald-Full-Pokemon_true.png", StartMenuState::FULL, true);
+    database.add<Test_StartMenuDetector>("PokemonRSE/StartMenuDetector/GBP-Ger-Ruby-Full-Pokemon_true.png", StartMenuState::FULL, true);
+    */
+}
+
+
+class Test_StartMenuSlotDetector : public ImageUnitTest {
+public:
+
+    Test_StartMenuSlotDetector(
+        const std::string& image,
+        StartMenuSlot slot,
+        StartMenuState state,
+        bool expected
+    )
+        : ImageUnitTest("PokemonRSE::StartMenuSlotDetector - " + std::to_string((int)slot) + " - " + image, {image})
+        , m_slot(slot)
+        , m_state(state)
+        , m_expected(expected)
+    {
+    }
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override {
+        StartMenuSlotDetector detector(COLOR_RED, m_slot, m_state);
+        const ImageRGB32& image = images[0];
+        return detector.detect(image) == m_expected;
+    };
+
+private:
+    StartMenuSlot m_slot;
+    StartMenuState m_state;
+    bool m_expected;
+};
+
+void add_tests_StartMenuSlotDetector(UnitTestDatabase & database){
+    // Switch 1/2
+
+    /*
+    // Original GBA resolution; {0.0, 0.0, 1.0, 1.0}
+    database.add<Test_StartMenuSlotDetector>("PokemonRSE/StartMenuDetector/GBA-Ger-Emerald-Full-Pokedex_true.png", StartMenuSlot::POKEDEX, StartMenuState::FULL, true);
+    database.add<Test_StartMenuSlotDetector>("PokemonRSE/StartMenuDetector/GBA-Ger-Emerald-PrePokenav-Exit_true.png", StartMenuSlot::EXIT, StartMenuState::PRE_POKENAV, true);
+    database.add<Test_StartMenuSlotDetector>("PokemonRSE/StartMenuDetector/GBA-Ger-Emerald-PrePokedex-Option_true.png", StartMenuSlot::OPTION, StartMenuState::PRE_POKEDEX, true);
+    database.add<Test_StartMenuSlotDetector>("PokemonRSE/StartMenuDetector/GBA-Ger-Emerald-PrePokemon-Bag_true.png", StartMenuSlot::BAG, StartMenuState::PRE_POKEMON, true);
+
+    database.add<Test_StartMenuSlotDetector>("PokemonRSE/StartMenuDetector/GBA-Ger-Ruby-Full-Exit_true.png", StartMenuSlot::EXIT, StartMenuState::FULL, true);
+    database.add<Test_StartMenuSlotDetector>("PokemonRSE/StartMenuDetector/GBA-Ger-Ruby-PrePokenav-Bag_true.png", StartMenuSlot::BAG, StartMenuState::PRE_POKENAV, true);
+    database.add<Test_StartMenuSlotDetector>("PokemonRSE/StartMenuDetector/GBA-Ger-Ruby-PrePokedex-Exit_true.png", StartMenuSlot::EXIT, StartMenuState::PRE_POKEDEX, true);
+    database.add<Test_StartMenuSlotDetector>("PokemonRSE/StartMenuDetector/GBA-Ger-Ruby-PrePokemon-Bag_true.png", StartMenuSlot::BAG, StartMenuState::PRE_POKEMON, true);
+
+    // Game Boy Player; {0.064217, 0.107667, 0.86413, 0.787928}
+    database.add<Test_StartMenuSlotDetector>("PokemonRSE/StartMenuDetector/GBP-Ger-Emerald-Full-Pokemon_true.png", StartMenuSlot::POKEMON, StartMenuState::FULL, true);
+    database.add<Test_StartMenuSlotDetector>("PokemonRSE/StartMenuDetector/GBP-Ger-Ruby-Full-Pokemon_true.png", StartMenuSlot::POKEMON, StartMenuState::FULL, true);
+    */
+}
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/Menus/PokemonRSE_StartMenuDetector.h b/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/Menus/PokemonRSE_StartMenuDetector.h
new file mode 100644
index 0000000000..643f70eecf
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/Menus/PokemonRSE_StartMenuDetector.h
@@ -0,0 +1,85 @@
+/*  Start Menu Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonRSE_StartMenuDetector_H
+#define PokemonAutomation_PokemonRSE_StartMenuDetector_H
+
+#include <chrono>
+#include "Common/Cpp/Color.h"
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/VisualDetector.h"
+#include "VideoGames/PokemonRSE/Inference/PokemonRSE_SelectionDetector.h"
+
+namespace PokemonAutomation{
+    class CancellableScope;
+    class VideoFeed;
+namespace NintendoSwitch{
+namespace PokemonRSE{
+
+enum class StartMenuState {
+    PRE_POKEMON = 0,
+    PRE_POKEDEX = 1,
+    PRE_POKENAV = 2,
+    FULL = 3,
+    SAFARI = 4,
+};
+
+enum class StartMenuSlot {
+    POKEDEX = 0,
+    POKEMON = 1,
+    BAG = 2,
+    POKENAV = 3,
+    TRAINER = 4,
+    SAVE = 5,
+    OPTION = 6,
+    EXIT = 7,
+    RETIRE = 8,
+};
+
+// Detect the full start menu by looking for empty white sections on the top and bottom
+// Works for all RSE, all languages.
+// No arrow detection, RS japan and all emerald languages have an arrow,
+// but RS for all non-japan languages use a red box for selection.
+class StartMenuDetector : public StaticScreenDetector{
+public:
+    StartMenuDetector(Color color, StartMenuState state = StartMenuState::FULL);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    ImageFloatBox m_menu_top_box;
+    ImageFloatBox m_menu_bottom_box;
+};
+class StartMenuWatcher : public DetectorToFinder<StartMenuDetector>{
+public:
+    StartMenuWatcher(Color color = COLOR_RED, StartMenuState state = StartMenuState::FULL)
+        : DetectorToFinder("StartMenuWatcher", std::chrono::milliseconds(250), color, state)
+    {}
+};
+
+// Detect whether a specified slot is selected
+class StartMenuSlotDetector : public SelectionSlotDetector {
+public:
+    StartMenuSlotDetector(Color color, StartMenuSlot slot, StartMenuState state = StartMenuState::FULL);
+};
+class StartMenuSlotWatcher : public DetectorToFinder<StartMenuSlotDetector> {
+public:
+    StartMenuSlotWatcher(Color color, StartMenuSlot slot, StartMenuState state = StartMenuState::FULL)
+        : DetectorToFinder("StartMenuSlotWatcher", std::chrono::milliseconds(250), color, slot, state)
+    {}
+};
+
+
+void add_tests_StartMenuDetector(UnitTestDatabase& database);
+void add_tests_StartMenuSlotDetector(UnitTestDatabase& database);
+
+}
+}
+}
+
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/Menus/PokemonRSE_SummaryDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/Menus/PokemonRSE_SummaryDetector.cpp
new file mode 100644
index 0000000000..b13a7a6df2
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/Menus/PokemonRSE_SummaryDetector.cpp
@@ -0,0 +1,60 @@
+/*  Summary Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Images/SolidColorTest.h"
+#include "CommonTools/Images/ImageFilter.h"
+#include "CommonTools/Images/SolidColorTest.h"
+#include "CommonTools/Images/WaterfillUtilities.h"
+#include "VideoGames/PokemonRSE/PokemonRSE_Settings.h"
+#include "PokemonRSE_SummaryDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonRSE{
+
+SummaryDetector::SummaryDetector(Color color)
+    : m_top_bar_box(0.639093, 0.014963, 0.014185, 0.058694)
+    , m_page_1_box(0.389085, 0.03764, 0.007979, 0.014674) //white
+    , m_page_2_box(0.456, 0.03764, 0.007979, 0.014674)
+    , m_page_3_box(0.523, 0.03764, 0.007979, 0.014674)
+    , m_page_4_box(0.589, 0.03764, 0.007979, 0.014674)
+{}
+void SummaryDetector::make_overlays(VideoOverlaySet& items) const{
+    const BoxOption& GAME_BOX = GameSettings::instance().GAME_BOX;
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_page_1_box));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_page_2_box));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_page_3_box));
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_page_4_box));
+}
+bool SummaryDetector::detect(const ImageViewRGB32& screen){
+    ImageViewRGB32 game_screen = extract_box_reference(screen, GameSettings::instance().GAME_BOX);
+
+    ImageViewRGB32 top_bar_image = extract_box_reference(game_screen, m_top_bar_box);
+
+    ImageViewRGB32 page_1_image = extract_box_reference(game_screen, m_page_1_box);
+    ImageViewRGB32 page_2_image = extract_box_reference(game_screen, m_page_2_box);
+    ImageViewRGB32 page_3_image = extract_box_reference(game_screen, m_page_3_box);
+    ImageViewRGB32 page_4_image = extract_box_reference(game_screen, m_page_4_box);
+
+    if ((is_solid(top_bar_image, { 0.3798, 0.37674, 0.24341 }, 0.25, 20) //RS light yellow 245, 243, 157
+        ||is_solid(top_bar_image, { 0.34652, 0.3083, 0.345156889495 }, 0.25, 20)) //E light purple 254, 226, 253
+        && is_white(page_1_image)
+        && !is_white(page_2_image)
+        && !is_white(page_3_image)
+        && !is_white(page_4_image)
+    ){
+        return true;
+    }
+    return false;
+}
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/Menus/PokemonRSE_SummaryDetector.h b/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/Menus/PokemonRSE_SummaryDetector.h
new file mode 100644
index 0000000000..f97d795e30
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/Menus/PokemonRSE_SummaryDetector.h
@@ -0,0 +1,53 @@
+/*  Summary Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonRSE_SummaryDetector_H
+#define PokemonAutomation_PokemonRSE_SummaryDetector_H
+
+#include <chrono>
+#include "Common/Cpp/Color.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonTools/VisualDetector.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+
+namespace PokemonAutomation{
+    class CancellableScope;
+    class VideoFeed;
+namespace NintendoSwitch{
+namespace PokemonRSE{
+
+// Detect the default (first) Pokemon Summary page
+// This has nature and OT, but no stats
+// This will work with all languages, as the page indicators are in the same positions
+// pg 2 stats, pg 3 moves, pg4 contest
+class SummaryDetector : public StaticScreenDetector{
+public:
+    SummaryDetector(Color color);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    ImageFloatBox m_top_bar_box;
+
+    ImageFloatBox m_page_1_box;
+    ImageFloatBox m_page_2_box;
+    ImageFloatBox m_page_3_box;
+    ImageFloatBox m_page_4_box;
+};
+class SummaryWatcher : public DetectorToFinder<SummaryDetector>{
+public:
+    SummaryWatcher(Color color)
+        : DetectorToFinder("SummaryWatcher", std::chrono::milliseconds(250), color)
+    {}
+};
+
+}
+}
+}
+
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/PokemonRSE_SelectionDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/PokemonRSE_SelectionDetector.cpp
new file mode 100644
index 0000000000..60122476d4
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/PokemonRSE_SelectionDetector.cpp
@@ -0,0 +1,169 @@
+/*  Selection Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Kernels/Waterfill/Kernels_Waterfill_Types.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h"
+#include "CommonTools/Images/ImageFilter.h"
+#include "CommonTools/Images/WaterfillUtilities.h"
+#include "VideoGames/PokemonRSE/PokemonRSE_Settings.h"
+#include "PokemonRSE_SelectionDetector.h"
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonRSE{
+
+
+class SelectionArrowMatcher : public ImageMatch::WaterfillTemplateMatcher {
+public:
+    SelectionArrowMatcher(const char* path)
+        : WaterfillTemplateMatcher(
+            path,
+            Color(50, 50, 50), Color(115, 115, 115), 24
+        )
+    {
+        m_aspect_ratio_lower = 0.8;
+        m_aspect_ratio_upper = 1.2;
+        m_area_ratio_lower = 0.8;
+        m_area_ratio_upper = 1.2;
+    }
+
+
+    static const SelectionArrowMatcher& emerald_matcher(){
+        static SelectionArrowMatcher matcher("PokemonRSE/SelectionArrowEmerald.png");
+        return matcher;
+    }
+    static const SelectionArrowMatcher& ruby_sapphire_jpn_matcher(){
+        static SelectionArrowMatcher matcher("PokemonRSE/SelectionArrowRubySapphireJpn.png");
+        return matcher;
+    }
+    static const SelectionArrowMatcher& emerald_jpn_matcher(){
+        static SelectionArrowMatcher matcher("PokemonRSE/SelectionArrowEmeraldJpn.png");
+        return matcher;
+    }
+};
+
+SelectionArrowDetector::SelectionArrowDetector(Color color, const ImageFloatBox& box)
+    : m_color(color)
+    , m_box(box)
+{}
+void SelectionArrowDetector::make_overlays(VideoOverlaySet& items) const {
+    const BoxOption& GAME_BOX = GameSettings::instance().GAME_BOX;
+    items.add(m_color, GAME_BOX.inner_to_outer(m_box));
+}
+bool SelectionArrowDetector::detect(const ImageViewRGB32& screen){
+    const BoxOption& GAME_BOX = GameSettings::instance().GAME_BOX;
+    ImageViewRGB32 game_screen = extract_box_reference(screen, GAME_BOX);
+    ImageViewRGB32 image = extract_box_reference(game_screen, m_box);
+
+    double screen_rel_height = game_screen.height() / 160.0;
+    double screen_rel_width = game_screen.width() / 240.0;
+    double screen_rel_size = screen_rel_height * screen_rel_width;
+
+    const double MIN_AREA_240 = 10;
+    const double RMSD_THRESHOLD = 80;
+    size_t min_area = size_t(screen_rel_size * MIN_AREA_240);
+
+    const std::vector<std::pair<uint32_t, uint32_t>> FILTERS = {
+        {0xff4f4f4f, 0xff777777}, // Emerald
+        {0xff2f2f2f, 0xff5c5c5c}, // Emerald
+        {0xff363636, 0xff5e5e5e} // Ruby/Sapphire
+    };
+
+    auto try_match = [&](const SelectionArrowMatcher& matcher) -> bool {
+        return match_template_by_waterfill(
+            game_screen.size(),
+            image,
+            matcher,
+            FILTERS,
+            { min_area, SIZE_MAX },
+            RMSD_THRESHOLD,
+            [&](Kernels::Waterfill::WaterfillObject& object) -> bool {
+                //std::cout << "area: " << object.area << std::endl;
+                return true;
+            }
+        );
+    };
+
+    return try_match(SelectionArrowMatcher::emerald_matcher())
+        || try_match(SelectionArrowMatcher::emerald_jpn_matcher())
+        || try_match(SelectionArrowMatcher::ruby_sapphire_jpn_matcher());
+}
+
+
+SelectionBorderDetector::SelectionBorderDetector(Color color, const ImageFloatBox& box)
+    : m_color(color)
+    , m_box(box)
+{}
+void SelectionBorderDetector::make_overlays(VideoOverlaySet& items) const {
+    const BoxOption& GAME_BOX = GameSettings::instance().GAME_BOX;
+    items.add(m_color, GAME_BOX.inner_to_outer(m_box));
+}
+bool SelectionBorderDetector::detect(const ImageViewRGB32& screen){
+    const BoxOption& GAME_BOX = GameSettings::instance().GAME_BOX;
+    ImageViewRGB32 game_screen = extract_box_reference(screen, GAME_BOX);
+    ImageViewRGB32 image = extract_box_reference(game_screen, m_box);
+
+    double screen_rel_height = game_screen.height() / 160.0;
+    double screen_rel_width = game_screen.width() / 240.0;
+    double screen_rel_size = screen_rel_height * screen_rel_width;
+
+    const double MIN_AREA_240 = 5; // the left/right side of the border is 12-13 pixels high
+    size_t min_area = size_t(screen_rel_size * MIN_AREA_240);
+
+    size_t pixels_in_range;
+    filter_rgb32_range(
+        pixels_in_range,
+        image,
+        0xffc82c23,
+        0xffff9a91,
+        Color(0),
+        false
+    );
+
+    return pixels_in_range > min_area;
+}
+
+
+SelectionSlotDetector::SelectionSlotDetector(Color color, const std::vector<SlotCandidate>& candidates) 
+    : m_color(color)
+{
+    for (const auto& candidate : candidates){
+        double slot_y = candidate.y;
+        double width = (candidate.indicator == SelectionIndicator::ARROW) ? SELECTION_ARROW_BOX_WIDTH : SELECTION_BORDER_BOX_WIDTH;
+        double height = (candidate.indicator == SelectionIndicator::BORDER) ? SELECTION_BORDER_BOX_HEIGHT : SELECTION_ARROW_BOX_HEIGHT;
+        ImageFloatBox box(candidate.x, slot_y, width, height);
+
+        if (candidate.indicator == SelectionIndicator::ARROW){
+            m_detectors.emplace_back(std::make_unique<SelectionArrowDetector>(color, box));
+        }else if (candidate.indicator == SelectionIndicator::BORDER){
+            m_detectors.emplace_back(std::make_unique<SelectionBorderDetector>(color, box));
+        }
+    }
+}
+void SelectionSlotDetector::make_overlays(VideoOverlaySet& items) const {
+    for (const auto& detector : m_detectors){
+        detector->make_overlays(items);
+    }
+}
+bool SelectionSlotDetector::detect(const ImageViewRGB32& screen){
+    for (auto& detector : m_detectors){
+        if (detector->detect(screen)){
+            return true;
+        }
+    }
+    return false;
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/PokemonRSE_SelectionDetector.h b/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/PokemonRSE_SelectionDetector.h
new file mode 100644
index 0000000000..39a9f052c7
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/PokemonRSE_SelectionDetector.h
@@ -0,0 +1,135 @@
+/*  Selection Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonRSE_SelectionDetector_H
+#define PokemonAutomation_PokemonRSE_SelectionDetector_H
+
+#include <vector>
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+
+#include "CommonTools/VisualDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonRSE{
+
+
+constexpr double SELECTION_ARROW_BOX_WIDTH = 0.039;
+constexpr double SELECTION_ARROW_BOX_HEIGHT = 0.10;
+constexpr double SELECTION_BORDER_BOX_WIDTH = 0.02;
+constexpr double SELECTION_BORDER_BOX_HEIGHT = 0.084;
+
+constexpr double SELECTION_SLOT_OFFSETS[] = {
+    0.0,    // slot 0
+    0.10,   // slot 1
+    0.20,   // slot 2
+    0.30,   // slot 3
+    0.40,   // slot 4
+    0.50,   // slot 5
+    0.60,   // slot 6
+    0.70,   // slot 7
+};
+
+enum class SelectionIndicator {
+    ARROW,
+    BORDER,
+};
+
+struct SlotCandidate {
+    double x;
+    double y;
+    SelectionIndicator indicator;
+};
+
+
+// international Emerald, japanese Ruby/Sapphire/Emerald
+class SelectionArrowDetector : public StaticScreenDetector{
+public:
+    SelectionArrowDetector(
+        Color color,
+        const ImageFloatBox& box
+    );
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    const Color m_color;
+    const ImageFloatBox m_box;
+};
+class SelectionArrowWatcher : public DetectorToFinder<SelectionArrowDetector>{
+public:
+    SelectionArrowWatcher(
+        Color color,
+        VideoOverlay* overlay,
+        const ImageFloatBox& box,
+        std::chrono::milliseconds hold_duration = std::chrono::milliseconds(250)
+    )
+         : DetectorToFinder("SelectionArrowWatcher", hold_duration, color, box)
+    {}
+};
+
+
+// international Ruby/Sapphire
+class SelectionBorderDetector : public StaticScreenDetector {
+public:
+    SelectionBorderDetector(
+        Color color,
+        const ImageFloatBox& box
+    );
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    Color m_color;
+    const ImageFloatBox m_box;
+};
+class SelectionBorderWatcher : public DetectorToFinder<SelectionBorderDetector> {
+public:
+    SelectionBorderWatcher(
+        Color color,
+        const ImageFloatBox& box,
+        std::chrono::milliseconds hold_duration = std::chrono::milliseconds(250)
+    )
+        : DetectorToFinder("SelectionBorderWatcher", hold_duration, color, box)
+    {}
+};
+
+
+// checks for one selection slot
+// In most cases uses at least one arrow and one border detector
+class SelectionSlotDetector : public StaticScreenDetector {
+public: 
+    SelectionSlotDetector(
+        Color color,
+        const std::vector<SlotCandidate>& candidates
+        );
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    Color m_color;
+    std::vector<std::unique_ptr<StaticScreenDetector>> m_detectors;
+};
+class SelectionWatcher : public DetectorToFinder<SelectionSlotDetector> {
+public:
+    SelectionWatcher(
+        Color color,
+        VideoOverlay* overlay,
+        const std::vector<SlotCandidate>& candidates,
+        std::chrono::milliseconds hold_duration = std::chrono::milliseconds(250)
+    )
+        : DetectorToFinder("SelectionWatcher", hold_duration, color, candidates)
+    {
+    }
+};
+
+
+}
+}
+}
+
+#endif
\ No newline at end of file
diff --git a/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/PokemonRSE_ShinyNumberDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/PokemonRSE_ShinyNumberDetector.cpp
new file mode 100644
index 0000000000..192aef5e24
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/PokemonRSE_ShinyNumberDetector.cpp
@@ -0,0 +1,72 @@
+/*  Shiny Number Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Color.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/ImageTools/ImageStats.h"
+#include "CommonFramework/ImageTypes/ImageRGB32.h"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Images/ImageFilter.h"
+#include "PokemonRSE_ShinyNumberDetector.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonRSE{
+
+ShinyNumberDetector::ShinyNumberDetector(Color color)
+    : m_box_number(0.025599, 0.103004, 0.125004, 0.093377)
+{}
+void ShinyNumberDetector::make_overlays(VideoOverlaySet& items) const{
+    const BoxOption& GAME_BOX = GameSettings::instance().GAME_BOX;
+    items.add(COLOR_RED, GAME_BOX.inner_to_outer(m_box_number));
+}
+bool ShinyNumberDetector::read(Logger& logger, const ImageViewRGB32& frame){
+    ImageViewRGB32 game_screen = extract_box_reference(frame, GameSettings::instance().GAME_BOX);
+
+    const bool replace_color_within_range = true;
+
+    //Filter out background (R/S, purple)
+    ImageRGB32 filtered_region = filter_rgb32_range(
+        extract_box_reference(game_screen, m_box_number),
+        combine_rgb(120, 100, 185), combine_rgb(254, 251, 255), Color(0), replace_color_within_range
+    );
+    //Filter out background (E, green)
+    ImageRGB32 filtered_region2 = filter_rgb32_range(
+        filtered_region,
+        combine_rgb(86, 162, 99), combine_rgb(236, 255, 240), Color(0), replace_color_within_range
+    );
+    ImageStats stats = image_stats(filtered_region2);
+
+    /*
+    filtered_region2.save("./filtered_only.png");
+    cout << stats.average.r << endl;
+    cout << stats.average.g << endl;
+    cout << stats.average.b << endl;
+    */
+
+    /*
+    Shiny:
+    R: 196.632, G: 196.771, B: 145.863
+    Not shiny:
+    R: 181.862, G: 180.686, B: 193.999
+    */
+
+    if (stats.average.b + 20 < stats.average.r){
+        return true;
+    }
+    return false;
+}
+
+
+}
+}
+}
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/PokemonRSE_ShinyNumberDetector.h b/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/PokemonRSE_ShinyNumberDetector.h
new file mode 100644
index 0000000000..a995cf19b4
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/PokemonRSE_ShinyNumberDetector.h
@@ -0,0 +1,39 @@
+/*  Shiny Number Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonRSE_ShinyNumberDetector_H
+#define PokemonAutomation_PokemonRSE_ShinyNumberDetector_H
+
+#include "Common/Cpp/Logging/AbstractLogger.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "VideoGames/PokemonRSE/PokemonRSE_Settings.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonRSE{
+
+// In the summary screen, the dex number will be yellow if a shiny, white if not.
+// Additionally, the background behind the sprite will be white if shiny, grey if not.
+// Number is easier to check as the background is scan lines.
+// Number might be cut off a bit for japan, but as long as most of it is in its fine
+// Warning: In Emerald, the moving sprite may cover the number!
+class ShinyNumberDetector{
+public:
+    ShinyNumberDetector(Color color);
+
+    virtual void make_overlays(VideoOverlaySet& items) const;
+    bool read(Logger& logger, const ImageViewRGB32& frame);
+
+private:
+    ImageFloatBox m_box_number;
+};
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/Sounds/PokemonRSE_ShinySoundDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/Sounds/PokemonRSE_ShinySoundDetector.cpp
new file mode 100644
index 0000000000..391bde6760
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/Sounds/PokemonRSE_ShinySoundDetector.cpp
@@ -0,0 +1,46 @@
+/*  Shiny Sound Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonTools/Audio/AudioTemplateCache.h"
+#include "CommonTools/Audio/SpectrogramMatcher.h"
+#include "VideoGames/PokemonRSE/PokemonRSE_Settings.h"
+#include "PokemonRSE_ShinySoundDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonRSE{
+
+
+ShinySoundDetector::ShinySoundDetector(Logger& logger, DetectedCallback detected_callback)
+    // Use a yellow as the detection color because the shiny animation is yellow.
+    : AudioPerSpectrumDetectorBase(
+        logger,
+        "ShinySoundDetector",
+        "Shiny sound",
+        COLOR_YELLOW,
+        detected_callback
+    )
+{}
+
+
+float ShinySoundDetector::get_score_threshold() const{
+    return (float)GameSettings::instance().SHINY_SOUND_THRESHOLD;
+}
+
+std::unique_ptr<SpectrogramMatcher> ShinySoundDetector::build_spectrogram_matcher(size_t sample_rate){
+    return std::make_unique<SpectrogramMatcher>(
+        "Shiny Sound",
+        AudioTemplateCache::instance().get_throw("PokemonFRLG/ShinySound", sample_rate),
+        SpectrogramMatcher::Mode::SPIKE_CONV, sample_rate,
+        GameSettings::instance().SHINY_SOUND_LOW_FREQUENCY
+    );
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/Sounds/PokemonRSE_ShinySoundDetector.h b/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/Sounds/PokemonRSE_ShinySoundDetector.h
new file mode 100644
index 0000000000..662612cd58
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonRSE/Inference/Sounds/PokemonRSE_ShinySoundDetector.h
@@ -0,0 +1,36 @@
+/*  Shiny Sound Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonRSE_ShinySoundDetector_H
+#define PokemonAutomation_PokemonRSE_ShinySoundDetector_H
+
+#include "CommonTools/Audio/AudioPerSpectrumDetectorBase.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonRSE{
+
+
+class ShinySoundDetector : public AudioPerSpectrumDetectorBase{
+public:
+    //  Warning: The callback will be called from the audio inference thread.
+    ShinySoundDetector(Logger& logger, DetectedCallback detected_callback);
+
+    // Implement AudioPerSpectrumDetectorBase::get_score_threshold()
+    virtual float get_score_threshold() const override;
+
+protected:
+    // Implement AudioPerSpectrumDetectorBase::build_spectrogram_matcher()
+    virtual std::unique_ptr<SpectrogramMatcher> build_spectrogram_matcher(size_t sample_rate) override;
+};
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonRSE/PokemonRSE_Navigation.cpp b/SerialPrograms/Source/VideoGames/PokemonRSE/PokemonRSE_Navigation.cpp
new file mode 100644
index 0000000000..1424b783d7
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonRSE/PokemonRSE_Navigation.cpp
@@ -0,0 +1,274 @@
+/*  Pokemon RSE Navigation
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  Soft reset, menus, etc.
+ *
+ */
+
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonTools/Random.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "CommonTools/StartupChecks/StartProgramChecks.h"
+#include "CommonTools/StartupChecks/VideoResolutionCheck.h"
+#include "CommonTools/VisualDetectors/BlackScreenDetector.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+#include "NintendoSwitch/NintendoSwitch_ConsoleHandle.h"
+#include "VideoGames/PokemonRSE/Inference/Dialogs/PokemonRSE_BattleDialogs.h"
+#include "VideoGames/PokemonRSE/Inference/Dialogs/PokemonRSE_DialogDetector.h"
+#include "VideoGames/PokemonRSE/Inference/Menus/PokemonRSE_LoadMenuDetector.h"
+#include "VideoGames/PokemonRSE/Inference/Sounds/PokemonRSE_ShinySoundDetector.h"
+#include "VideoGames/PokemonRSE/PokemonRSE_Settings.h"
+#include "PokemonRSE_Navigation.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonRSE{
+
+
+
+void home_black_border_check(ConsoleHandle& console, ProControllerContext& context){
+    if (GameSettings::instance().DEVICE == GameSettings::Device::switch_1_2){
+        console.log("Switch 1 or 2 selected in Settings.");
+
+        console.log("Checking for min 720p and 16:9.");
+        assert_16_9_720p_min(console, console);
+
+        console.log("Going to home to check for black border.");
+
+        //  Connect the controller.
+        require_player(console, context, BUTTON_ZL);
+
+        pbf_press_button(context, BUTTON_HOME, 120ms, 880ms);
+        try{
+            ensure_at_home(console, context, 2);
+        }catch (OperationFailedException&){
+            ControllerPlayerNumber current = context->get_player_number(context);
+            if (current == ControllerPlayerNumber::UNKNOWN){
+                throw UserSetupError(
+                    console,
+                    "Unable to find Home menu.\n\n"
+                    "Either your controller isn't connected or your screen size to not "
+                    "set to 100% in the TV Settings on your Nintendo Switch.\n\n"
+                    "If your Switch entered the Home screen and re-entered the game, then your "
+                    "controller is connected but your screen size is not set to 100%.\n\n"
+                    "If nothing happened at all, then your controller is not connected. "
+                    "Please disconnect all other controllers and try again.\n\n"
+                    "We recommend changing the controller to \"NS1: Wired Pro Controller\" "
+                    "as that will be able self-diagnose controller connection issues."
+                );
+            }else{
+                throw UserSetupError(
+                    console,
+                    "Unable to find Home menu.\n\n"
+                    "It is likely your screen size to not set to 100% in the TV Settings on your Nintendo Switch."
+                );
+            }
+        }
+
+//        context.wait_for_all_requests();
+        StartProgramChecks::check_border(console);
+        console.log("Returning to game.");
+        resume_game_from_home(console, context);
+        context.wait_for_all_requests();
+        console.log("Entered game.");
+    }else{
+        console.log("Non-Switch device selected in Settings.");
+        console.log("Skipping black border check.", COLOR_BLUE);
+    }
+}
+
+
+
+
+bool try_soft_reset(ConsoleHandle& console, ProControllerContext& context){
+    // A + B + Select + Start
+    pbf_press_button(context, BUTTON_B | BUTTON_A | BUTTON_MINUS | BUTTON_PLUS, 360ms, 1440ms);
+
+    //Mash select to get to "Push Start Button" with Kyogre/Groudon/Rayquaza background
+    pbf_mash_button(context, BUTTON_MINUS, GameSettings::instance().SELECT_BUTTON_MASH0);
+    context.wait_for_all_requests();
+
+    //Wait for save file select screen
+    //WhiteScreenOverWatcher whitescreen(COLOR_RED);
+    LoadMenuWatcher load_menu(COLOR_RED);
+
+    int ls = run_until<ProControllerContext>(
+        console, context,
+        [](ProControllerContext& context){
+            pbf_mash_button(context, BUTTON_PLUS, 1000ms);
+            pbf_wait(context, 5000ms);
+            context.wait_for_all_requests();
+        },
+        { load_menu }
+    );
+    context.wait_for_all_requests();
+    if (ls == 0){
+        //console.log("Entered load menu. (WhiteScreenOver)");
+        console.log("Entered load menu. (LoadMenu)");
+    }else{
+        console.log("soft_reset(): Unable to enter load menu.", COLOR_RED);
+        return false;
+    }
+    //Let the animations finish
+    pbf_wait(context, 500ms);
+    context.wait_for_all_requests();
+
+    //Load game
+    pbf_press_button(context, BUTTON_A, 160ms, 320ms);
+
+    //Wait for game to load in
+    BlackScreenOverWatcher detector2(COLOR_RED);
+    int ret = wait_until(
+        console, context,
+        GameSettings::instance().ENTER_GAME_WAIT0,
+        {detector2}
+    );
+    if (ret == 0){
+        console.log("Entered game!");
+    }else{
+        console.log("soft_reset(): Timed out waiting to enter game.", COLOR_RED);
+        return false;
+    }
+
+    //Random wait
+    console.log("Randomly waiting to avoid duplicate hits.");
+    Milliseconds rng_wait2 = std::chrono::milliseconds(random_u32(0, 5000));
+    pbf_wait(context, rng_wait2);
+    context.wait_for_all_requests();
+
+    return true;
+}
+
+uint64_t soft_reset(ConsoleHandle& console, ProControllerContext& context){
+    uint64_t errors = 0;
+    for (; errors < 5; errors++){
+        if (try_soft_reset(console, context)){
+            console.log("Soft reset completed.");
+            return errors;
+        }
+    }
+    OperationFailedExceptionWithScreenshot::fire(
+        ErrorReportMode::SEND_ERROR_REPORT,
+        "soft_reset(): Failed to reset after 5 attempts.",
+        console
+    );
+}
+
+void flee_battle(VideoStream& stream, ProControllerContext& context){
+    AdvanceBattleDialogWatcher ran_away(COLOR_YELLOW);
+    int ret2 = run_until<ProControllerContext>(
+        stream, context,
+        [&](ProControllerContext& context){
+            stream.log("Navigate to Run.");
+            pbf_press_dpad(context, DPAD_RIGHT, 160ms, 160ms);
+            pbf_press_dpad(context, DPAD_DOWN, 160ms, 160ms);
+            pbf_press_button(context, BUTTON_A, 160ms, 320ms);
+            pbf_wait(context, 5000ms);
+            context.wait_for_all_requests();
+        },
+        { ran_away }
+    );
+    context.wait_for_all_requests();
+    if (ret2 == 0){
+        stream.log("Running away...");
+    }else{
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "handle_encounter(): Unable to navigate to flee button.",
+            stream
+        );
+    }
+
+    BlackScreenOverWatcher battle_over(COLOR_RED);
+    int ret3 = run_until<ProControllerContext>(
+        stream, context,
+        [&](ProControllerContext& context){
+            pbf_press_button(context, BUTTON_A, 320ms, 320ms);
+            pbf_wait(context, 5000ms);
+            context.wait_for_all_requests();
+        },
+        { battle_over }
+    );
+    context.wait_for_all_requests();
+    if (ret3 == 0){
+        stream.log("Successfully ran from battle.");
+    }else{
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "handle_encounter(): Unable to flee from battle.",
+            stream
+        );
+    }
+}
+
+bool handle_encounter(ConsoleHandle& console, ProControllerContext& context, bool send_out_lead){
+    float shiny_coefficient = 1.0;
+    ShinySoundDetector shiny_detector(console.logger(), [&](float error_coefficient) -> bool{
+        shiny_coefficient = error_coefficient;
+        return true;
+    });
+    AdvanceBattleDialogWatcher legendary_appeared(COLOR_YELLOW);
+
+    int res = run_until<ProControllerContext>(
+        console, context,
+        [&](ProControllerContext& context){
+            int ret = wait_until(
+                console, context,
+                std::chrono::seconds(30),
+                {{legendary_appeared}}
+            );
+            if (ret == 0){
+                console.log("Advance arrow detected.");
+            }else{
+                OperationFailedExceptionWithScreenshot::fire(
+                    ErrorReportMode::SEND_ERROR_REPORT,
+                    "handle_encounter(): Did not detect battle start.",
+                    console
+                );
+            }
+            pbf_wait(context, 1000ms);
+            context.wait_for_all_requests();
+        },
+        {{shiny_detector}}
+    );
+    shiny_detector.throw_if_no_sound(std::chrono::milliseconds(1000));
+    if (res == 0){
+        console.log("Shiny detected!");
+        return true;
+    }
+    console.log("Shiny not found.");
+
+    if (send_out_lead){
+        //Send out lead, no shiny detection needed.
+        BattleMenuWatcher battle_menu(COLOR_RED);
+        console.log("Sending out lead Pokemon.");
+        pbf_press_button(context, BUTTON_A, 320ms, 320ms);
+
+        int ret = wait_until(
+            console, context,
+            std::chrono::seconds(15),
+            { {battle_menu} }
+        );
+        if (ret == 0){
+            console.log("Battle menu detecteed!");
+        }else{
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "handle_encounter(): Did not detect battle menu.",
+                console
+            );
+        }
+        pbf_wait(context, 1000ms);
+        context.wait_for_all_requests();
+    }
+
+    return false;
+}
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonRSE/PokemonRSE_Navigation.h b/SerialPrograms/Source/VideoGames/PokemonRSE/PokemonRSE_Navigation.h
new file mode 100644
index 0000000000..fff62173b9
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonRSE/PokemonRSE_Navigation.h
@@ -0,0 +1,44 @@
+/*  Pokemon RSE Navigation
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  Soft reset, menus, etc.
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonRSE_Navigation_H
+#define PokemonAutomation_PokemonRSE_Navigation_H
+
+#include "CommonFramework/Tools/VideoStream.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+    class ConsoleHandle;
+    class ProController;
+    using ProControllerContext = ControllerContext<ProController>;
+namespace PokemonRSE{
+
+// Press A+B+Select+Start at the same time to soft reset, then re-enter the game.
+// This is intended for R/S (E's RNG is broken) and assumes that there is no dry battery.
+// For R/S, the initial seed is based on the real time clock and changes every minute
+// A randomized wait is used after loading in to avoid hitting the same frame
+uint64_t soft_reset(ConsoleHandle& console, ProControllerContext& context);
+
+// Run from battle. Cursor must start on the FIGHT button. Assumes fleeing will always work. (Smoke Ball)
+void flee_battle(VideoStream& stream, ProControllerContext& context);
+
+// After press A/walking up to enter a battle, run this handle the battle start and to check if opponent is shiny.
+// Set send_out_lead to true and then use flee_battle() after if game is Emerald.
+// For R/S, send_out_lead as false and then soft_reset() to save time.
+bool handle_encounter(ConsoleHandle& console, ProControllerContext& context, bool send_out_lead);
+
+// Go to home to check that scaling is 100%. Then resume game.
+// Skips checks if not Switch.
+void home_black_border_check(ConsoleHandle& console, ProControllerContext& context);
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonRSE/PokemonRSE_Panels.cpp b/SerialPrograms/Source/VideoGames/PokemonRSE/PokemonRSE_Panels.cpp
new file mode 100644
index 0000000000..988e1bfccf
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonRSE/PokemonRSE_Panels.cpp
@@ -0,0 +1,72 @@
+/*  Pokemon RSE Panels
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/StaticGlobals.h"
+#include "CommonFramework/GlobalAutoPaths.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "PokemonRSE_Panels.h"
+
+#include "PokemonRSE_Settings.h"
+
+#include "Programs/ShinyHunting/PokemonRSE_AudioStarterReset.h"
+#include "Programs/ShinyHunting/PokemonRSE_GiftReset.h"
+#include "Programs/ShinyHunting/PokemonRSE_LegendaryReset.h"
+#include "Programs/ShinyHunting/PokemonRSE_LegendaryRunAway-Emerald.h"
+#include "Programs/ShinyHunting/PokemonRSE_ShinyHunt-Deoxys.h"
+#include "Programs/ShinyHunting/PokemonRSE_ShinyHunt-Mew.h"
+#include "Programs/ShinyHunting/PokemonRSE_StarterReset.h"
+
+#include "Programs/TestPrograms/PokemonRSE_SoundListener.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonRSE{
+
+
+
+PanelListFactory::PanelListFactory()
+    : PanelListDescriptor(
+        Pokemon::STRING_POKEMON + " Ruby, Sapphire, and Emerald",
+        RESOURCE_PATH() + "CategoryIcons/PokemonRS.png"
+    )
+{}
+
+std::vector<PanelEntry> PanelListFactory::make_panels() const{
+    std::vector<PanelEntry> ret;
+    
+    ret.emplace_back("---- Settings ----");
+    ret.emplace_back(make_OptionsPanel<GameSettingsPanel>());
+
+    //ret.emplace_back("---- General ----");
+
+    ret.emplace_back("---- Shiny Hunting (Ruby/Sapphire) ----"); //Remove RS only if E is fixed
+    ret.emplace_back(make_SingleSwitchProgram<AudioStarterReset>());
+    ret.emplace_back(make_SingleSwitchProgram<LegendaryReset>());
+    ret.emplace_back(make_SingleSwitchProgram<GiftReset>());
+
+    ret.emplace_back("---- Shiny Hunting (Emerald only) ----");
+    ret.emplace_back(make_SingleSwitchProgram<LegendaryRunAwayEmerald>());
+    ret.emplace_back(make_SingleSwitchProgram<ShinyHuntDeoxys>());
+    ret.emplace_back(make_SingleSwitchProgram<ShinyHuntMew>());
+    
+
+    if (STATIC_GLOBALS.DEVELOPER_MODE){
+        ret.emplace_back("---- Test ----");
+        ret.emplace_back(make_SingleSwitchProgram<StarterReset>()); //outdated early test program
+
+        ret.emplace_back("---- Developer Tools ----");
+        ret.emplace_back(make_SingleSwitchProgram<SoundListener>());
+    }
+
+    return ret;
+}
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonRSE/PokemonRSE_Panels.h b/SerialPrograms/Source/VideoGames/PokemonRSE/PokemonRSE_Panels.h
new file mode 100644
index 0000000000..6d28f52e32
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonRSE/PokemonRSE_Panels.h
@@ -0,0 +1,30 @@
+/*  Pokemon RSE Panels
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonRSE_Panels_H
+#define PokemonAutomation_PokemonRSE_Panels_H
+
+#include "CommonFramework/Panels/PanelList.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonRSE{
+
+
+
+class PanelListFactory : public PanelListDescriptor{
+public:
+    PanelListFactory();
+private:
+    virtual std::vector<PanelEntry> make_panels() const override;
+};
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonRSE/PokemonRSE_Settings.cpp b/SerialPrograms/Source/VideoGames/PokemonRSE/PokemonRSE_Settings.cpp
new file mode 100644
index 0000000000..f57f6644c9
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonRSE/PokemonRSE_Settings.cpp
@@ -0,0 +1,171 @@
+/*  Pokemon RSE Settings
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Pokemon/Pokemon_Strings.h"
+
+#include "PokemonRSE_Settings.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonRSE{
+
+using namespace Pokemon;
+
+
+
+GameSettings& GameSettings::instance(){
+    static GameSettings settings;
+    return settings;
+}
+GameSettings::~GameSettings(){
+    DEVICE.remove_listener(*this);
+    GAME_BOX.remove_listener(*this);
+    GAME_BOX.X.remove_listener(*this);
+    GAME_BOX.Y.remove_listener(*this);
+    GAME_BOX.WIDTH.remove_listener(*this);
+    GAME_BOX.HEIGHT.remove_listener(*this);
+}
+GameSettings::GameSettings()
+    : BatchOption(LockMode::LOCK_WHILE_RUNNING)
+    , m_game_device_settings("<font size=4><b>Game Device settings:</b></font>")
+    , DEVICE(
+        "<b>Device:</b><br>Select the device the game is running on. "
+        "Refer to the documentation for specific setups.",
+        {
+            {Device::switch_1_2,            "switch_1_2",           "Nintendo Switch 1 and 2"},
+            {Device::rg35xx,                "rg35xx",               "RG35XX"},
+            {Device::tablet,                "tablet",               "tablet"},
+            {Device::gameboyplayer,         "gameboyplayer",        "GameBoyPlayer"},
+            {Device::custom,                "custom",               "Custom"},
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        Device::switch_1_2
+    )
+    , GAME_BOX(
+        "Game Box: The part of the screen containing the actual video feed.",
+        LockMode::LOCK_WHILE_RUNNING,
+        GroupOption::EnableMode::ALWAYS_ENABLED,
+        true,
+        {0.09375, 0.00462963, 0.8125, 0.962963}
+    )
+    , m_soft_reset_timings("<font size=4><b>Soft Reset Timings:</b></font>")
+    , SELECT_BUTTON_MASH0(
+        "<b>Select Button Mash:</b><br>Mash select for this long after a soft reset to get to Press Start.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "3200 ms"
+    )
+    , ENTER_GAME_WAIT0(
+        "<b>Enter Game Wait:</b><br>Wait this long for the game to load.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "3000 ms"
+    )
+    , m_shiny_audio_settings("<font size=4><b>Shiny Audio Settings:</b></font>")
+    , SHINY_SOUND_THRESHOLD(
+        "<b>Shiny Sound Threshold:</b><br>Maximum error coefficient to trigger a shiny detection.",
+        LockMode::LOCK_WHILE_RUNNING,
+        0.80, 0, 1.0
+    )
+    , SHINY_SOUND_LOW_FREQUENCY(
+        "<b>Shiny Sound Low Frequency (Hz):</b><br>High pass filter frequency for shiny sound.",
+        LockMode::LOCK_WHILE_RUNNING,
+        3000, 0, 48000
+    )
+{
+    PA_ADD_STATIC(m_game_device_settings);
+    PA_ADD_OPTION(DEVICE);
+    PA_ADD_OPTION(GAME_BOX);
+    PA_ADD_STATIC(m_soft_reset_timings);
+    PA_ADD_OPTION(SELECT_BUTTON_MASH0);
+    PA_ADD_OPTION(ENTER_GAME_WAIT0);
+    PA_ADD_STATIC(m_shiny_audio_settings);
+    PA_ADD_OPTION(SHINY_SOUND_THRESHOLD);
+    PA_ADD_OPTION(SHINY_SOUND_LOW_FREQUENCY);
+
+    GameSettings::on_config_value_changed(this);
+    DEVICE.add_listener(*this);
+    GAME_BOX.add_listener(*this);
+    GAME_BOX.X.add_listener(*this);
+    GAME_BOX.Y.add_listener(*this);
+    GAME_BOX.WIDTH.add_listener(*this);
+    GAME_BOX.HEIGHT.add_listener(*this);
+}
+
+void GameSettings::on_config_value_changed(void* object){
+    switch (DEVICE){
+    case Device::switch_1_2:
+        GAME_BOX.X.set(0.09375);
+        GAME_BOX.Y.set(0.00462963);
+        GAME_BOX.WIDTH.set(0.8125);
+        GAME_BOX.HEIGHT.set(0.962963);
+        GAME_BOX.set_visibility(ConfigOptionState::DISABLED);
+        break;
+    case Device::rg35xx:
+        GAME_BOX.X.set(0.125);
+        GAME_BOX.Y.set(0.0564814814814815);
+        GAME_BOX.WIDTH.set(0.7494791666666667);
+        GAME_BOX.HEIGHT.set(0.8861111111111111);
+        GAME_BOX.set_visibility(ConfigOptionState::DISABLED);
+        break;
+    case Device::tablet:
+        GAME_BOX.X.set(0.227907);
+        GAME_BOX.Y.set(0.003546);
+        GAME_BOX.WIDTH.set(0.544186);
+        GAME_BOX.HEIGHT.set(0.643026);
+        GAME_BOX.set_visibility(ConfigOptionState::DISABLED);
+        break;
+    case Device::gameboyplayer:
+        GAME_BOX.X.set(0.064217);
+        GAME_BOX.Y.set(0.107667);
+        GAME_BOX.WIDTH.set(0.86413);
+        GAME_BOX.HEIGHT.set(0.787928);
+        GAME_BOX.set_visibility(ConfigOptionState::DISABLED);
+        break;
+    case Device::custom:
+        GAME_BOX.set_visibility(ConfigOptionState::ENABLED);
+        break;
+    default:
+        GAME_BOX.X.set(0.09375);
+        GAME_BOX.Y.set(0.00462963);
+        GAME_BOX.WIDTH.set(0.8125);
+        GAME_BOX.HEIGHT.set(0.962963);
+        GAME_BOX.set_visibility(ConfigOptionState::ENABLED);
+        break;
+    }
+}
+
+
+
+GameSettings_Descriptor::GameSettings_Descriptor()
+    : OptionsPanelDescriptor(
+        "PokemonRSE:GlobalSettings",
+        STRING_POKEMON + " RSE", "Game Settings",
+        "Programs/PokemonRSE/RSESettings.html",
+        "Global " + STRING_POKEMON + " Ruby, Sapphire, and Emerald Settings",
+        PanelQualityStanding::OFFICIAL
+    )
+{}
+
+
+
+GameSettingsPanel::GameSettingsPanel()
+    : settings(GameSettings::instance())
+{
+    PA_ADD_OPTION(settings);
+}
+
+
+
+
+
+}
+}
+}
+
+
+
+
+
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonRSE/PokemonRSE_Settings.h b/SerialPrograms/Source/VideoGames/PokemonRSE/PokemonRSE_Settings.h
new file mode 100644
index 0000000000..e7ce842d5f
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonRSE/PokemonRSE_Settings.h
@@ -0,0 +1,74 @@
+/*  Pokemon RSE Settings
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonRSE_Settings_H
+#define PokemonAutomation_PokemonRSE_Settings_H
+
+#include "Common/Cpp/Options/EnumDropdownOption.h"
+#include "Common/Cpp/Options/StaticTextOption.h"
+#include "Common/Cpp/Options/FloatingPointOption.h"
+#include "Common/Cpp/Options/TimeDurationOption.h"
+#include "CommonFramework/Options/BoxOption.h"
+#include "CommonFramework/Panels/OptionsPanel.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonRSE{
+
+
+class GameSettings : public BatchOption, private ConfigOption::Listener{
+    ~GameSettings();
+    GameSettings();
+public:
+    static GameSettings& instance();
+
+    enum class Device{
+        switch_1_2,
+        rg35xx,
+        tablet,
+        gameboyplayer,
+        custom,
+    };
+
+    SectionDividerOption m_game_device_settings;
+    EnumDropdownOption<Device> DEVICE;
+
+    BoxOption GAME_BOX;
+
+    SectionDividerOption m_soft_reset_timings;
+    MillisecondsOption SELECT_BUTTON_MASH0;
+    MillisecondsOption ENTER_GAME_WAIT0;
+
+    SectionDividerOption m_shiny_audio_settings;
+    FloatingPointOption SHINY_SOUND_THRESHOLD;
+    FloatingPointOption SHINY_SOUND_LOW_FREQUENCY;
+
+private:
+    virtual void on_config_value_changed(void* object) override;
+};
+
+
+
+
+class GameSettings_Descriptor : public OptionsPanelDescriptor{
+public:
+    GameSettings_Descriptor();
+};
+
+
+class GameSettingsPanel : public OptionsPanelInstance{
+public:
+    using Descriptor = GameSettings_Descriptor;
+    GameSettingsPanel();
+private:
+    GameSettings& settings;
+};
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonRSE/PokemonRSE_Tests.cpp b/SerialPrograms/Source/VideoGames/PokemonRSE/PokemonRSE_Tests.cpp
new file mode 100644
index 0000000000..5f47f387c2
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonRSE/PokemonRSE_Tests.cpp
@@ -0,0 +1,27 @@
+/*  Pokemon RSE Tests
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "VideoGames/PokemonRSE/Inference/Dialogs/PokemonRSE_DialogDetector.h"
+#include "VideoGames/PokemonRSE/Inference/Menus/PokemonRSE_StartMenuDetector.h"
+#include "PokemonRSE_Tests.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonRSE{
+
+
+void add_tests(UnitTestDatabase& database){
+    add_tests_SelectionDialogDetector(database);
+    add_tests_ConfirmSlotDetector(database);
+    add_tests_StartMenuDetector(database);
+    add_tests_StartMenuSlotDetector(database);
+}
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonRSE/PokemonRSE_Tests.h b/SerialPrograms/Source/VideoGames/PokemonRSE/PokemonRSE_Tests.h
new file mode 100644
index 0000000000..8873ff84d7
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonRSE/PokemonRSE_Tests.h
@@ -0,0 +1,25 @@
+/*  Pokemon RSE Tests
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonRSE_Tests_H
+#define PokemonAutomation_PokemonRSE_Tests_H
+
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonRSE{
+
+
+
+void add_tests(UnitTestDatabase& database);
+
+
+
+}
+}
+}
+#endif
\ No newline at end of file
diff --git a/SerialPrograms/Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_AudioStarterReset.cpp b/SerialPrograms/Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_AudioStarterReset.cpp
new file mode 100644
index 0000000000..ec51e95ac8
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_AudioStarterReset.cpp
@@ -0,0 +1,325 @@
+/*  RS Starter Reset
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonRSE/Inference/Dialogs/PokemonRSE_BattleDialogs.h"
+#include "VideoGames/PokemonRSE/Inference/Dialogs/PokemonRSE_DialogDetector.h"
+#include "VideoGames/PokemonRSE/Inference/Sounds/PokemonRSE_ShinySoundDetector.h"
+#include "VideoGames/PokemonRSE/PokemonRSE_Navigation.h"
+#include "PokemonRSE_AudioStarterReset.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonRSE{
+
+AudioStarterReset_Descriptor::AudioStarterReset_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonRSE:AudioStarterReset",
+        Pokemon::STRING_POKEMON + " RSE", "Starter Reset",
+        "Programs/PokemonRSE/AudioStarterReset.html",
+        "Soft reset for a shiny starter. Ruby and Sapphire only.",
+        PanelQualityStanding::OFFICIAL_BETA,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::VIDEO_AUDIO,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+struct AudioStarterReset_Descriptor::Stats : public StatsTracker{
+    Stats()
+        : resets(m_stats["Resets"])
+        , poochyena(m_stats["Shiny Poochyena"])
+        , shinystarter(m_stats["Shiny Starter"])
+        , errors(m_stats["Errors"])
+    {
+        m_display_order.emplace_back("Resets");
+        m_display_order.emplace_back("Shiny Poochyena");
+        m_display_order.emplace_back("Shiny Starter");
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+    }
+    std::atomic<uint64_t>& resets;
+    std::atomic<uint64_t>& poochyena;
+    std::atomic<uint64_t>& shinystarter;
+    std::atomic<uint64_t>& errors;
+};
+std::unique_ptr<StatsTracker> AudioStarterReset_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+AudioStarterReset::AudioStarterReset()
+    : TARGET(
+        "<b>Starter:</b><br>",
+        {
+            {Target::treecko, "treecko", "Treecko"},
+            {Target::torchic, "torchic", "Torchic"},
+            {Target::mudkip, "mudkip", "Mudkip"},
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        Target::treecko
+    )
+    , TAKE_VIDEO("<b>Take Video:</b><br>Record a video when the shiny starter is found.", LockMode::UNLOCK_WHILE_RUNNING, true)
+    , GO_HOME_WHEN_DONE(true)
+    , NOTIFICATION_SHINY_POOCH(
+        "Shiny Poochyena",
+        false, false, ImageAttachmentMode::JPG,
+        {"Notifs"}
+    )
+    , NOTIFICATION_SHINY_STARTER(
+        "Shiny Starter",
+        true, true, ImageAttachmentMode::JPG,
+        {"Notifs", "Showcase"}
+    )
+    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_SHINY_POOCH,
+        &NOTIFICATION_SHINY_STARTER,
+        &NOTIFICATION_STATUS_UPDATE,
+        &NOTIFICATION_PROGRAM_FINISH,
+        })
+{
+    PA_ADD_STATIC(SHINY_REQUIRES_AUDIO);
+    PA_ADD_OPTION(TARGET);
+    PA_ADD_OPTION(TAKE_VIDEO);
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+void AudioStarterReset::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    AudioStarterReset_Descriptor::Stats& stats = env.current_stats<AudioStarterReset_Descriptor::Stats>();
+
+    home_black_border_check(env.console, context);
+
+    /*
+    * Settings: Text Speed fast.
+    * Setup: Stand in front of the Professor's bag and save the game.
+    * 
+    * Required to fight, so have to do the SR method instead of run away
+    * Soft reset programs are only for Ruby/Sapphire, as Emerald always has the same starting seed.
+    * 
+    * This also assumes no dry battery.
+    */
+
+    bool shiny_starter = false;
+    while (!shiny_starter){
+        float shiny_coefficient = 1.0;
+        ShinySoundDetector pooch_detector(env.console, [&](float error_coefficient) -> bool{
+            shiny_coefficient = error_coefficient;
+            return true;
+        });
+
+        //Pressing A opens the bag so the screen goes black
+        env.log("Opening bag and selecting starter.");
+        BlackScreenOverWatcher bag_opened(COLOR_RED);
+        int ret = run_until<ProControllerContext>(
+            env.console, context,
+            [](ProControllerContext& context){
+                for (int i = 0; i < 10; i++){
+                    pbf_press_button(context, BUTTON_A, 320ms, 640ms);
+                    pbf_wait(context, 2000ms);
+                    context.wait_for_all_requests();
+                }
+            },
+            {bag_opened}
+        );
+        context.wait_for_all_requests();
+        if (ret != 0){
+            env.log("Failed to open bag after 10 attempts.", COLOR_RED);
+            stats.errors++;
+            env.update_stats();
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "Failed to open bag after 10 attempts.",
+                env.console
+            );
+        }else{
+            env.log("Opened professor's bag.");
+        }
+
+        switch (TARGET){
+        case Target::treecko:
+            env.log("Treecko selected. Moving left.");
+            pbf_press_dpad(context, DPAD_LEFT, 120ms, 100ms); //Double up in case
+            pbf_press_dpad(context, DPAD_LEFT, 120ms, 100ms); //of dropped press
+            break;
+        case Target::torchic:
+            //Default cursor position, do nothing.
+            env.log("Torchic selected. Do not move cursor.");
+            break;
+        case Target::mudkip:
+            env.log("Mudkip selected. Moving right.");
+            pbf_press_dpad(context, DPAD_RIGHT, 120ms, 100ms);
+            pbf_press_dpad(context, DPAD_RIGHT, 120ms, 100ms);
+            break;
+        default:
+            env.log("Invalid target selected.");
+            stats.errors++;
+            env.update_stats();
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "AudioStarterReset: Invalid target.",
+                env.console
+            );
+            break;
+        }
+
+        //Mash A to select starter. Stop once black screen is detected to start listening for shiny pooch.
+        BlackScreenWatcher starter_battle_start(COLOR_RED);
+        int ret3 = run_until<ProControllerContext>(
+            env.console, context,
+            [](ProControllerContext& context){
+                for (int i = 0; i < 10; i++){
+                    pbf_mash_button(context, BUTTON_A, 5000ms);
+                    pbf_wait(context, 2000ms);
+                    context.wait_for_all_requests();
+                }
+            },
+            {starter_battle_start}
+        );
+        context.wait_for_all_requests();
+        if (ret3 != 0){
+            env.log("Failed to start battle after 10 attempts.", COLOR_RED);
+            stats.errors++;
+            env.update_stats();
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "Failed to start battle after 10 attempts.",
+                env.console
+            );
+        }else{
+            env.log("Pooch battle started.");
+        }
+        context.wait_for_all_requests();
+
+        env.log("Checking for shiny Poochyena.");
+        AdvanceBattleDialogWatcher pooch_appeared(COLOR_YELLOW);
+
+        int res = run_until<ProControllerContext>(
+            env.console, context,
+            [&](ProControllerContext& context){
+                int ret = wait_until(
+                    env.console, context,
+                    std::chrono::seconds(20),
+                    {{pooch_appeared}}
+                );
+                if (ret == 0){
+                    env.log("Advance arrow detected.");
+                }else{
+                    env.log("Battle Advance arrow was not detected.");
+                    stats.errors++;
+                    env.update_stats();
+                    OperationFailedExceptionWithScreenshot::fire(
+                        ErrorReportMode::SEND_ERROR_REPORT,
+                        "Battle Advance arrow was not detected.",
+                        env.console
+                    );
+                }
+                pbf_wait(context, 1000ms);
+                context.wait_for_all_requests();
+            },
+            {{pooch_detector}}
+        );
+        pooch_detector.throw_if_no_sound(std::chrono::milliseconds(1000));
+        if (res == 0){
+            env.log("Shiny Poochyena detected!");
+            stats.poochyena++;
+            env.update_stats();
+            send_program_notification(env,
+                NOTIFICATION_SHINY_POOCH,
+                COLOR_YELLOW,
+                "Shiny Poochyena found",
+                {}, "",
+                env.console.video().snapshot(),
+                true
+            );
+        }else{
+            env.log("Poochyena is not shiny.");
+        }
+        context.wait_for_all_requests();
+
+        float shiny_coefficient2 = 1.0;
+        ShinySoundDetector starter_detector(env.console, [&](float error_coefficient) -> bool{
+            shiny_coefficient2 = error_coefficient;
+            return true;
+        });
+
+        BattleMenuWatcher battle_menu(COLOR_RED);
+        int res2 = run_until<ProControllerContext>(
+            env.console, context,
+            [&](ProControllerContext& context){
+                env.log("Sending out selected starter.");
+                pbf_press_button(context, BUTTON_A, 320ms, 320ms);
+
+                int ret = wait_until(
+                    env.console, context,
+                    std::chrono::seconds(20),
+                    {{battle_menu}}
+                );
+                if (ret == 0){
+                    env.log("Battle menu detecteed!");
+                }else{
+                    env.log("Battle menu was not detected.");
+                    stats.errors++;
+                    env.update_stats();
+                    OperationFailedExceptionWithScreenshot::fire(
+                        ErrorReportMode::SEND_ERROR_REPORT,
+                        "Battle menu was not detected.",
+                        env.console
+                    );
+                }
+                pbf_wait(context, 1000ms);
+                context.wait_for_all_requests();
+            },
+            {{starter_detector}}
+        );
+        starter_detector.throw_if_no_sound(std::chrono::milliseconds(1000));
+        context.wait_for_all_requests();
+        if (res2 == 0){
+            env.log("Shiny starter detected!");
+            stats.shinystarter++;
+            env.update_stats();
+            send_program_notification(
+                env,
+                NOTIFICATION_SHINY_STARTER,
+                COLOR_YELLOW,
+                "Shiny starter found!",
+                {}, "",
+                env.console.video().snapshot(),
+                true
+            );
+            shiny_starter = true;
+            if (TAKE_VIDEO){
+                pbf_press_button(context, BUTTON_CAPTURE, 2000ms, 0ms);
+            }
+        }else{
+            env.log("Starter is not shiny.");
+            env.log("Soft resetting.");
+            send_program_status_notification(
+                env, NOTIFICATION_STATUS_UPDATE,
+                "Soft resetting."
+            );
+            stats.errors += soft_reset(env.console, context);
+            stats.resets++;
+            env.update_stats();
+            context.wait_for_all_requests();
+        }
+    }
+
+    if (GO_HOME_WHEN_DONE){
+        pbf_press_button(context, BUTTON_HOME, 200ms, 1000ms);
+    }
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+}
+
+}
+}
+}
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_AudioStarterReset.h b/SerialPrograms/Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_AudioStarterReset.h
new file mode 100644
index 0000000000..f986101c52
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_AudioStarterReset.h
@@ -0,0 +1,63 @@
+/*  RS Starter Reset
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonRSE_AudioStarterReset_H
+#define PokemonAutomation_PokemonRSE_AudioStarterReset_H
+
+#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+#include "VideoGames/PokemonLA/Options/PokemonLA_ShinyDetectedAction.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonRSE{
+
+class AudioStarterReset_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    AudioStarterReset_Descriptor();
+    struct Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+class AudioStarterReset : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = AudioStarterReset_Descriptor;
+    AudioStarterReset();
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+    virtual void start_program_border_check(
+        VideoStream& stream,
+        FeedbackType feedback_type
+    ) override{}
+
+private:
+    PokemonLA::ShinyRequiresAudioText SHINY_REQUIRES_AUDIO;
+
+    enum class Target{
+        treecko,
+        torchic,
+        mudkip,
+    };
+    EnumDropdownOption<Target> TARGET;
+
+    BooleanCheckBoxOption TAKE_VIDEO;
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
+
+    EventNotificationOption NOTIFICATION_SHINY_POOCH;
+    EventNotificationOption NOTIFICATION_SHINY_STARTER;
+    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+}
+}
+}
+#endif
+
+
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_GiftReset.cpp b/SerialPrograms/Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_GiftReset.cpp
new file mode 100644
index 0000000000..5316d7cd3d
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_GiftReset.cpp
@@ -0,0 +1,443 @@
+/*  Gift Reset
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonRSE/Inference/Dialogs/PokemonRSE_DialogDetector.h"
+#include "VideoGames/PokemonRSE/Inference/Menus/PokemonRSE_PartyMenuDetector.h"
+#include "VideoGames/PokemonRSE/Inference/Menus/PokemonRSE_StartMenuDetector.h"
+#include "VideoGames/PokemonRSE/Inference/Menus/PokemonRSE_SummaryDetector.h"
+#include "VideoGames/PokemonRSE/Inference/PokemonRSE_ShinyNumberDetector.h"
+#include "VideoGames/PokemonRSE/PokemonRSE_Navigation.h"
+#include "PokemonRSE_GiftReset.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonRSE{
+
+GiftReset_Descriptor::GiftReset_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonRSE:GiftReset",
+        Pokemon::STRING_POKEMON + " RSE", "Gift Reset",
+        "Programs/PokemonRSE/GiftReset.html",
+        "Soft reset for a shiny gift Pokemon.",
+        PanelQualityStanding::OFFICIAL_BETA,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+struct GiftReset_Descriptor::Stats : public StatsTracker{
+    Stats()
+        : resets(m_stats["Resets"])
+        , shinies(m_stats["Shinies"])
+        , errors(m_stats["Errors"])
+    {
+        m_display_order.emplace_back("Resets");
+        m_display_order.emplace_back("Shinies");
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+    }
+    std::atomic<uint64_t>& resets;
+    std::atomic<uint64_t>& shinies;
+    std::atomic<uint64_t>& errors;
+};
+std::unique_ptr<StatsTracker> GiftReset_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+GiftReset::GiftReset()
+    : TARGET(
+        "<b>Target:</b><br>",
+        {
+            {Target::fossils,   "fossils",  "Lileep / Anorith"},
+            {Target::castform,  "castform", "Castform"},
+            {Target::beldum,    "beldum",   "Beldum"},
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        Target::beldum
+    )
+    , TAKE_VIDEO("<b>Take Video:</b><br>Record a video when the shiny is found.", LockMode::UNLOCK_WHILE_RUNNING, true)
+    , GO_HOME_WHEN_DONE(true)
+    , NOTIFICATION_SHINY(
+        "Shiny found",
+        true, true, ImageAttachmentMode::JPG,
+        {"Notifs", "Showcase"}
+    )
+    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_SHINY,
+        &NOTIFICATION_STATUS_UPDATE,
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_RECOVERABLE,
+    })
+{
+    PA_ADD_OPTION(TARGET);
+    PA_ADD_OPTION(TAKE_VIDEO);
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+void GiftReset::obtain_pokemon(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    GiftReset_Descriptor::Stats& stats = env.current_stats<GiftReset_Descriptor::Stats>();
+
+    env.log("Obtaining Pokemon.");
+
+    AdvanceDialogWatcher adv_white_start(COLOR_RED);
+    int rets = run_until<ProControllerContext>(
+        env.console, context,
+        [](ProControllerContext& context){
+            for (int i = 0; i < 10; i++){
+                pbf_press_button(context, BUTTON_A, 320ms, 640ms);
+                pbf_wait(context, 2000ms);
+                context.wait_for_all_requests();
+            }
+        },
+        { adv_white_start }
+        );
+    context.wait_for_all_requests();
+    if (rets < 0){
+        stats.errors++;
+        env.update_stats();
+        env.log("obtain_pokemon(): Unable to start starter dialog after 10 attempts.", COLOR_RED);
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "obtain_pokemon(): Unable to start starter dialog after 10 attempts.",
+            env.console
+        );
+    }
+    env.log("Initial A press completed.");
+
+    bool seen_selection_arrow = false;
+
+    while (true){
+        context.wait_for_all_requests();
+
+        AdvanceDialogWatcher adv_white(COLOR_RED);
+        SelectionDialogWatcher selection_dialog(COLOR_RED);
+        
+        int ret = wait_until(
+            env.console, context,
+            10s,
+            {
+                adv_white,
+                selection_dialog,
+            }
+        );
+        context.wait_for(500ms);
+
+        switch (ret){
+        case 0:
+            env.log("Detected Advance Dialog. Pressing B.");
+            pbf_press_button(context, BUTTON_B, 320ms, 640ms);
+            continue;
+        case 1:
+            env.log("Detected Selection Dialog. Pressing A.");
+            if (!seen_selection_arrow){
+
+                if (TARGET == Target::beldum){ //two yes/no boxes, castform and fossils???
+                    env.log("First selection box detected. YES to obtain.");
+                    seen_selection_arrow = true;
+                    pbf_press_button(context, BUTTON_A, 320ms, 640ms);
+                }else{ //fossils
+                    env.log("Selection box detected. NO to nickname.");
+                    pbf_press_button(context, BUTTON_B, 320ms, 640ms);
+                    context.wait_for_all_requests();
+                    return;
+                }
+                pbf_press_button(context, BUTTON_B, 320ms, 640ms);
+
+            }else{
+                env.log("Second selection box detected. NO to nickname.");
+                pbf_press_button(context, BUTTON_B, 320ms, 640ms);
+                context.wait_for_all_requests();
+                return;
+            }
+            continue;
+        default:
+            stats.errors++;
+            env.update_stats();
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "obtain_starter(): No recognized state after 10 seconds.",
+                env.console
+            );
+        }
+        //Small wait for dialog boxes
+        //pbf_wait(context, 500ms);
+        //context.wait_for_all_requests();
+    }
+    context.wait_for_all_requests();
+}
+
+void GiftReset::obtain_fossils(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    env.log("Obtaining Fossil.");
+    pbf_press_button(context, BUTTON_A, 320ms, 640ms);
+
+    //At least 6 lines of dialog/No to nickname for fossils
+    //This takes care of the entire conversion+nickname+exit dialog
+    int limit = 10;
+    for (int i = 0; i < limit; i++){
+        pbf_press_button(context, BUTTON_B, 320ms, 640ms);
+        pbf_wait(context, 100ms);
+        context.wait_for_all_requests();
+    }
+    context.wait_for_all_requests();
+}
+
+bool GiftReset::try_open_summary(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    StartMenuWatcher start_menu(COLOR_RED);
+
+    int ret = run_until<ProControllerContext>(
+        env.console, context,
+        [](ProControllerContext& context){
+            for (int i = 0; i < 10; i++){
+                pbf_press_button(context, BUTTON_B, 320ms, 640ms);
+                pbf_wait(context, 100ms);
+                context.wait_for_all_requests();
+                pbf_press_button(context, BUTTON_PLUS, 320ms, 640ms);
+                pbf_wait(context, 100ms);
+                context.wait_for_all_requests();
+            }
+        },
+        { start_menu }
+    );
+    context.wait_for_all_requests();
+    if (ret < 0){
+        env.update_stats();
+        env.log("open_summary(): Unable to open Start menu after 10 attempts.", COLOR_RED);
+        send_program_recoverable_error_notification(
+            env, NOTIFICATION_ERROR_RECOVERABLE,
+            "open_summary(): Unable to open Start menu after 10 attempts."
+        );
+        return false;
+    }
+
+    env.log("Navigating to party menu.");
+    pbf_wait(context, 200ms);
+    context.wait_for_all_requests();
+    
+    pbf_press_dpad(context, DPAD_DOWN, 320ms, 320ms);
+
+    /*
+    if (!move_cursor_to_position(env.console, context, SelectionArrowPositionStartMenu::POKEMON)){
+        std::string str = "open_summary(): Unable to move menu cursor to: " + Pokemon::STRING_POKEMON;
+        env.log(str, COLOR_RED);
+        send_program_recoverable_error_notification(
+            env, NOTIFICATION_ERROR_RECOVERABLE,
+            str
+        );
+        return false;
+    }
+    */
+
+    //Open party menu
+    PartyMenuWatcher blk1(COLOR_RED);
+
+    int pm = run_until<ProControllerContext>(
+        env.console, context,
+        [](ProControllerContext& context){
+            pbf_press_button(context, BUTTON_A, 320ms, 640ms);
+            pbf_wait(context, 5000ms);
+            context.wait_for_all_requests();
+        },
+        { blk1 }
+    );
+    context.wait_for_all_requests();
+    if (pm == 0){
+        env.log("Entered party menu.");
+    }else{
+        env.log("open_summary(): Unable to enter party menu.", COLOR_RED);
+        send_program_recoverable_error_notification(
+            env, NOTIFICATION_ERROR_RECOVERABLE,
+            "open_summary(): Unable to enter party menu."
+        );
+        return false;
+    }
+
+    //Press up twice to get to the last slot
+    PartySlotWatcher last_slot(COLOR_RED, PartySlot::SIX);
+    int ps = run_until<ProControllerContext>(
+        env.console, context,
+        [](ProControllerContext& context){
+            for (int i = 0; i < 15; i++){ //Enough to cycle through 6pty+cxl twice
+                pbf_wait(context, 320ms);
+                context.wait_for_all_requests();
+                pbf_press_dpad(context, DPAD_UP, 320ms, 320ms);
+            }
+        },
+        { last_slot }
+        );
+    context.wait_for_all_requests();
+    if (ps == 0){
+        env.log("Moved selection to slot six.");
+    }else{
+        env.log("open_summary(): Unable to move selection to slot six.", COLOR_RED);
+        send_program_recoverable_error_notification(
+            env, NOTIFICATION_ERROR_RECOVERABLE,
+            "open_summary(): Unable to move selection to slot six."
+        );
+        return false;
+    }
+
+    //Two presses to open summary
+    BlackScreenOverWatcher blk2(COLOR_RED);
+    int sm = run_until<ProControllerContext>(
+        env.console, context,
+        [](ProControllerContext& context){
+            pbf_press_button(context, BUTTON_A, 320ms, 320ms);
+            pbf_press_button(context, BUTTON_A, 320ms, 320ms);
+            pbf_wait(context, 5000ms);
+            context.wait_for_all_requests();
+        },
+        { blk2 }
+    );
+    if (sm == 0){
+        env.log("Entered summary.");
+    }else{
+        env.log("open_summary(): Unable to enter summary.", COLOR_RED);
+        send_program_recoverable_error_notification(
+            env, NOTIFICATION_ERROR_RECOVERABLE,
+            "open_summary(): Unable to enter summary."
+        );
+        return false;
+    }
+
+    //Double check that we are on summary
+    SummaryWatcher sum1(COLOR_RED);
+    int sm1 = wait_until(
+        env.console, context,
+        std::chrono::seconds(5),
+        {{ sum1 }}
+    );
+    if (sm1 == 0){
+        env.log("Summary page dots detected.");
+    }else{
+        env.log("open_summary(): Unable to detect summary screen.", COLOR_RED);
+        send_program_recoverable_error_notification(
+            env, NOTIFICATION_ERROR_RECOVERABLE,
+            "open_summary(): Unable to detect summary screen."
+        );
+        return false;
+    }
+
+    pbf_wait(context, 1000ms);
+    context.wait_for_all_requests();
+    return true;
+}
+uint64_t GiftReset::open_summary(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    uint64_t errors = 0;
+    for (; errors < 5; errors++){
+        if (try_open_summary(env, context)){
+            return errors;
+        }else{
+            env.log("Mashing B to return to overworld and retry...");
+            pbf_mash_button(context, BUTTON_B, 10000ms);
+        }
+    }
+    OperationFailedExceptionWithScreenshot::fire(
+        ErrorReportMode::SEND_ERROR_REPORT,
+        "open_summary(): Failed to open party summary after 5 attempts.",
+        env.console
+    );
+}
+
+
+void GiftReset::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    //StartProgramChecks::check_performance_class_wired_or_wireless(context);
+
+    GiftReset_Descriptor::Stats& stats = env.current_stats<GiftReset_Descriptor::Stats>();
+
+    home_black_border_check(env.console, context);
+
+    /*
+    * Settings: Text Speed fast.
+    * Setup: 5 pokemon in your party. Stand in front of the pokemon. Save the game.
+    * Move menu cursor back to the top (POKEDEX)
+    */
+
+    switch (TARGET){
+    case Target::fossils:
+        env.log("Target: Fossils");
+        break;
+    case Target::castform:
+        env.log("Target: Castform");
+        break;
+    case Target::beldum:
+        env.log("Target: Beldum");
+        break;
+    default:
+        stats.errors++;
+        env.update_stats();
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "GiftReset: Invalid target selection.",
+            env.console
+        );
+        break;
+    }
+
+    bool shiny_found = false;
+
+    while (!shiny_found){
+        if (TARGET != Target::fossils && TARGET != Target::castform){
+            obtain_pokemon(env, context);
+        }else{
+            obtain_fossils(env, context);
+        }
+        stats.errors += open_summary(env, context);
+
+        VideoSnapshot screen = env.console.video().snapshot();
+
+        ShinyNumberDetector shiny_checker(COLOR_YELLOW);
+        shiny_found = shiny_checker.read(env.console.logger(), screen);
+
+        if (shiny_found){
+            env.log("Shiny found!");
+            stats.shinies++;
+            send_program_notification(
+                env,
+                NOTIFICATION_SHINY,
+                COLOR_YELLOW,
+                "Shiny found!",
+                {}, "",
+                screen,
+                true
+            );
+            if (TAKE_VIDEO){
+                pbf_press_button(context, BUTTON_CAPTURE, 2000ms, 0ms);
+            }
+            break;
+        }else{
+            env.log("Pokemon is not shiny.");
+            env.log("Soft resetting.");
+            send_program_status_notification(
+                env, NOTIFICATION_STATUS_UPDATE,
+                "Soft resetting."
+            );
+            stats.errors += soft_reset(env.console, context);
+            stats.resets++;
+            env.update_stats();
+            context.wait_for_all_requests();
+        }
+    }
+
+    if (GO_HOME_WHEN_DONE){
+        pbf_press_button(context, BUTTON_HOME, 200ms, 1000ms);
+    }
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+}
+
+}
+}
+}
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_GiftReset.h b/SerialPrograms/Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_GiftReset.h
new file mode 100644
index 0000000000..d118243d3c
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_GiftReset.h
@@ -0,0 +1,66 @@
+/*  Gift Reset
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonRSE_GiftReset_H
+#define PokemonAutomation_PokemonRSE_GiftReset_H
+
+#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonRSE{
+
+class GiftReset_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    GiftReset_Descriptor();
+    struct Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+class GiftReset : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = GiftReset_Descriptor;
+    GiftReset();
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext &context) override;
+
+    virtual void start_program_border_check(
+        VideoStream& stream,
+        FeedbackType feedback_type
+    ) override{}
+
+private:
+    void obtain_pokemon(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+    void obtain_fossils(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+    bool try_open_summary(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+    uint64_t open_summary(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+
+    enum class Target{
+        fossils,
+        castform,
+        beldum,
+        //gen_2_starters, //only if emerald rng is fixed
+    };
+    EnumDropdownOption<Target> TARGET;
+
+    BooleanCheckBoxOption TAKE_VIDEO;
+
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
+
+    EventNotificationOption NOTIFICATION_SHINY;
+    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+}
+}
+}
+#endif
+
+
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_LegendaryReset.cpp b/SerialPrograms/Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_LegendaryReset.cpp
new file mode 100644
index 0000000000..8ef4c8ea02
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_LegendaryReset.cpp
@@ -0,0 +1,175 @@
+/*  Legendary Reset
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonRSE/Inference/Dialogs/PokemonRSE_DialogDetector.h"
+#include "VideoGames/PokemonRSE/PokemonRSE_Navigation.h"
+#include "PokemonRSE_LegendaryReset.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonRSE{
+
+LegendaryReset_Descriptor::LegendaryReset_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonRSE:LegendaryReset",
+        Pokemon::STRING_POKEMON + " RSE", "Legendary Reset",
+        "Programs/PokemonRSE/LegendaryReset.html",
+        "Shiny hunt legendary Pokemon using soft resets.",
+        PanelQualityStanding::OFFICIAL_BETA,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+struct LegendaryReset_Descriptor::Stats : public StatsTracker{
+    Stats()
+        : resets(m_stats["Resets"])
+        , shinies(m_stats["Shinies"])
+        , errors(m_stats["Errors"])
+    {
+        m_display_order.emplace_back("Resets");
+        m_display_order.emplace_back("Shinies");
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+    }
+    std::atomic<uint64_t>& resets;
+    std::atomic<uint64_t>& shinies;
+    std::atomic<uint64_t>& errors;
+};
+std::unique_ptr<StatsTracker> LegendaryReset_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+LegendaryReset::LegendaryReset()
+    : TARGET(
+        "<b>Target:</b><br>",
+        {
+            {Target::press_a,       "press_a",      "Press A: Rayquaza, Regis, Latios/Latias (Southern Island), Voltorb, Electrode, Kecleon"},
+            {Target::walk_left,     "walk_left",    "Walk Left: Kyogre, Groudon"}, //if emerald is fixed, +deoxys hooh lugia
+            {Target::walk_right,    "walk_right",   "Walk Right: Kyogre, Groudon"},//tested groudon, regi, ray, kecleon
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        Target::press_a
+    )
+    , TAKE_VIDEO("<b>Take Video:</b><br>Record a video when the shiny is found.", LockMode::UNLOCK_WHILE_RUNNING, true)
+    , GO_HOME_WHEN_DONE(true)
+    , NOTIFICATION_SHINY(
+        "Shiny found",
+        true, true, ImageAttachmentMode::JPG,
+        {"Notifs", "Showcase"}
+    )
+    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_SHINY,
+        &NOTIFICATION_STATUS_UPDATE,
+        &NOTIFICATION_PROGRAM_FINISH,
+    })
+{
+    PA_ADD_STATIC(SHINY_REQUIRES_AUDIO);
+    PA_ADD_OPTION(TARGET);
+    PA_ADD_OPTION(TAKE_VIDEO);
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+void LegendaryReset::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    LegendaryReset_Descriptor::Stats& stats = env.current_stats<LegendaryReset_Descriptor::Stats>();
+
+    home_black_border_check(env.console, context);
+
+    while (true){
+        //Mash B until black screen detected but not over (entered battle)
+        BlackScreenWatcher battle_entered(COLOR_RED);
+        int ret = run_until<ProControllerContext>(
+            env.console, context,
+            [&](ProControllerContext& context){
+                switch (TARGET){
+                case Target::press_a:
+                    env.log("Target: Press A.");
+                    //Mash A as Kecleon has a Yes/No dialog
+                    pbf_mash_button(context, BUTTON_A, 3000ms);
+                    break;
+                case Target::walk_left:
+                    env.log("Target: Walk Left.");
+                    //Step forward to start the encounter.
+                    pbf_press_dpad(context, DPAD_LEFT, 320ms, 100ms);
+                    pbf_press_dpad(context, DPAD_LEFT, 320ms, 100ms);
+                    break;
+                case Target::walk_right:
+                    env.log("Target: Walk Right.");
+                    pbf_press_dpad(context, DPAD_RIGHT, 320ms, 100ms);
+                    pbf_press_dpad(context, DPAD_RIGHT, 320ms, 100ms);
+                    break;
+                }
+                context.wait_for_all_requests();
+
+                //Long mash to clear dialog+wait for those long animations
+                env.log("Mashing B through animation.");
+                pbf_mash_button(context, BUTTON_B, 120s);
+                context.wait_for_all_requests();
+            },
+            {battle_entered}
+        );
+        context.wait_for_all_requests();
+        if (ret != 0){
+            stats.errors++;
+            env.update_stats();
+            env.log("Failed to enter battle.", COLOR_RED);
+            stats.errors += soft_reset(env.console, context);
+            continue;
+        }else{
+            env.log("Battle started.");
+        }
+
+        bool legendary_shiny = handle_encounter(env.console, context, false);
+        if (legendary_shiny){
+            stats.shinies++;
+            env.update_stats();
+            send_program_notification(
+                env,
+                NOTIFICATION_SHINY,
+                COLOR_YELLOW,
+                "Shiny found!",
+                {}, "",
+                env.console.video().snapshot(),
+                true
+            );
+            if (TAKE_VIDEO){
+                pbf_press_button(context, BUTTON_CAPTURE, 2000ms, 0ms);
+            }
+            break;
+        }
+
+        //No shiny found
+        env.log("Soft resetting.");
+        send_program_status_notification(
+            env, NOTIFICATION_STATUS_UPDATE,
+            "Soft resetting."
+        );
+
+        stats.errors += soft_reset(env.console, context);
+        stats.resets++;
+        env.update_stats();
+        context.wait_for_all_requests();
+    }
+
+    if (GO_HOME_WHEN_DONE){
+        pbf_press_button(context, BUTTON_HOME, 200ms, 1000ms);
+    }
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+}
+
+}
+}
+}
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_LegendaryReset.h b/SerialPrograms/Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_LegendaryReset.h
new file mode 100644
index 0000000000..10c3c1f54a
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_LegendaryReset.h
@@ -0,0 +1,63 @@
+/*  Legendary Reset
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonRSE_LegendaryReset_H
+#define PokemonAutomation_PokemonRSE_LegendaryReset_H
+
+#include "Common/Cpp/Options/EnumDropdownOption.h"
+#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+#include "VideoGames/PokemonLA/Options/PokemonLA_ShinyDetectedAction.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonRSE{
+
+class LegendaryReset_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    LegendaryReset_Descriptor();
+    struct Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+class LegendaryReset : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = LegendaryReset_Descriptor;
+    LegendaryReset();
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext &context) override;
+
+    virtual void start_program_border_check(
+        VideoStream& stream,
+        FeedbackType feedback_type
+    ) override{}
+
+private:
+    PokemonLA::ShinyRequiresAudioText SHINY_REQUIRES_AUDIO;
+
+    enum class Target{
+        press_a,
+        walk_left,
+        walk_right,
+    };
+    EnumDropdownOption<Target> TARGET;
+
+    BooleanCheckBoxOption TAKE_VIDEO;
+
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
+
+    EventNotificationOption NOTIFICATION_SHINY;
+    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+}
+}
+}
+#endif
+
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_LegendaryRunAway-Emerald.cpp b/SerialPrograms/Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_LegendaryRunAway-Emerald.cpp
new file mode 100644
index 0000000000..340eafea6f
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_LegendaryRunAway-Emerald.cpp
@@ -0,0 +1,705 @@
+/*  Legendary Run Away - Emerald
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+//#include "Common/Cpp/PrettyPrint.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonRSE/Inference/Dialogs/PokemonRSE_BattleDialogs.h"
+#include "VideoGames/PokemonRSE/Inference/Dialogs/PokemonRSE_DialogDetector.h"
+#include "VideoGames/PokemonRSE/PokemonRSE_Navigation.h"
+#include "PokemonRSE_LegendaryRunAway-Emerald.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonRSE{
+
+LegendaryRunAwayEmerald_Descriptor::LegendaryRunAwayEmerald_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonRSE:LegendaryRunAwayEmerald",
+        Pokemon::STRING_POKEMON + " RSE", "Legendary Run Away (Emerald)",
+        "Programs/PokemonRSE/LegendaryRunAwayEmerald.html",
+        "Use the Run Away method to shiny hunt legendaries in Emerald.",
+        PanelQualityStanding::OFFICIAL_BETA,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::VIDEO_AUDIO,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+struct LegendaryRunAwayEmerald_Descriptor::Stats : public StatsTracker{
+    Stats()
+        : resets(m_stats["Resets"])
+        , shinies(m_stats["Shinies"])
+        , errors(m_stats["Errors"])
+    {
+        m_display_order.emplace_back("Resets");
+        m_display_order.emplace_back("Shinies");
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+    }
+    std::atomic<uint64_t>& resets;
+    std::atomic<uint64_t>& shinies;
+    std::atomic<uint64_t>& errors;
+};
+std::unique_ptr<StatsTracker> LegendaryRunAwayEmerald_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+LegendaryRunAwayEmerald::LegendaryRunAwayEmerald()
+    : TARGET(
+        "<b>Target:</b><br>",
+        {
+            {Target::regis, "regis", "Regirock/Regice/Registeel"},
+            {Target::groudon, "groudon", "Groudon"},
+            {Target::kyogre, "kyogre", "Kyogre"},
+            {Target::hooh, "hooh", "Ho-Oh"},
+            {Target::lugia, "lugia", "Lugia"},
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        Target::regis
+    )
+    , TAKE_VIDEO("<b>Take Video:</b><br>Record a video when the shiny is found.", LockMode::UNLOCK_WHILE_RUNNING, true)
+    , GO_HOME_WHEN_DONE(true)
+    , NOTIFICATION_SHINY(
+        "Shiny Found",
+        true, true, ImageAttachmentMode::JPG,
+        {"Notifs", "Showcase"}
+    )
+    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_SHINY,
+        &NOTIFICATION_STATUS_UPDATE,
+        &NOTIFICATION_PROGRAM_FINISH,
+        })
+    , m_advanced_options(
+        "<font size=4><b>Advanced Options:</b> You should not need to touch anything below here.</font>"
+    )
+    , GROUDON_LEFT_FIRST(
+        "<b>Groudon first left/right time:</b><br>Time it takes to turn and run 10 steps left/right after/before the encounter.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "1440 ms"
+    )
+    , GROUDON_RIGHT_FIRST(
+        "<b>Groudon second right/left time:</b><br>Time it takes to turn and run 2 steps right/left after/before the encounter.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "280 ms"
+    )
+    , GROUDON_LEFT_SECOND(
+        "<b>Groudon third left/right time:</b><br>Time it takes to turn and run 4 steps left/right after/before the encounter.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "600 ms"
+    )
+    , KYOGRE_RIGHT_FIRST(
+        "<b>Kyogre first left/right time:</b><br>Time it takes to turn and run 9 steps right/left after/before the encounter.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "1180 ms"
+    )
+    , KYOGRE_UP_FIRST(
+        "<b>Kyogre up/down time:</b><br>Time it takes to turn and run 10 steps up/down after/before the encounter.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "1400 ms"
+    )
+    , KYOGRE_RIGHT_SECOND(
+        "<b>Kyogre second left/right time:</b><br>Time it takes to turn and run 6 steps right/left after/before the encounter.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "830 ms"
+    )
+    , HOOH_UP_DOWN(
+        "<b>Ho-Oh up/down time:</b><br>Time it takes to run up to Ho-Oh or down away to reset.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "1440 ms"
+    )
+    , HOOH_LEFT_RIGHT(
+        "<b>Ho-Oh left/right time:</b><br>Time it takes when facing the same direction to take one step left or right.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "240 ms"
+    )
+    , LUGIA_UP_DOWN0(
+        "<b>Lugia up/down time:</b><br>Time it takes to run up to Lugia or down away to reset.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "720 ms"
+    )
+    , LUGIA_LEFT_RIGHT0(
+        "<b>Lugia left time:</b><br>Time it takes walk three steps left after entering Lugia's room.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "520 ms"
+    )
+{
+    PA_ADD_STATIC(SHINY_REQUIRES_AUDIO);
+    PA_ADD_OPTION(TARGET);
+    PA_ADD_OPTION(TAKE_VIDEO);
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+    PA_ADD_OPTION(NOTIFICATIONS);
+    PA_ADD_STATIC(m_advanced_options);
+    PA_ADD_OPTION(GROUDON_LEFT_FIRST);
+    PA_ADD_OPTION(GROUDON_RIGHT_FIRST);
+    PA_ADD_OPTION(GROUDON_LEFT_SECOND);
+    PA_ADD_OPTION(KYOGRE_RIGHT_FIRST);
+    PA_ADD_OPTION(KYOGRE_UP_FIRST);
+    PA_ADD_OPTION(KYOGRE_RIGHT_SECOND);
+    PA_ADD_OPTION(HOOH_UP_DOWN);
+    PA_ADD_OPTION(HOOH_LEFT_RIGHT);
+    PA_ADD_OPTION(LUGIA_UP_DOWN0);
+    PA_ADD_OPTION(LUGIA_LEFT_RIGHT0);
+}
+
+void LegendaryRunAwayEmerald::reset_regi(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    LegendaryRunAwayEmerald_Descriptor::Stats& stats = env.current_stats<LegendaryRunAwayEmerald_Descriptor::Stats>();
+
+    //turn around, walk down 4/until black screen over
+    BlackScreenOverWatcher exit_area(COLOR_RED);
+    BlackScreenOverWatcher enter_area(COLOR_RED);
+    int ret = run_until<ProControllerContext>(
+        env.console, context,
+        [](ProControllerContext& context){
+            ssf_press_button(context, BUTTON_B, 0ms, 960ms);
+            pbf_press_dpad(context, DPAD_DOWN, 960ms, 160ms);
+            pbf_wait(context, 2400ms);
+        },
+        {exit_area}
+    );
+    context.wait_for_all_requests();
+    if (ret != 0){
+        env.log("Failed to exit area.", COLOR_RED);
+        stats.errors++;
+        env.update_stats();
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "Failed to exit area.",
+            env.console
+        );
+    }else{
+        env.log("Left area.");
+    }
+    pbf_wait(context, 500ms);
+    context.wait_for_all_requests();
+
+    //turn around, up one/black screen over
+    int ret2 = run_until<ProControllerContext>(
+        env.console, context,
+        [](ProControllerContext& context){
+            pbf_press_dpad(context, DPAD_UP, 960ms, 160ms);
+            pbf_wait(context, 2400ms);
+        },
+        {enter_area}
+    );
+    context.wait_for_all_requests();
+    if (ret2 != 0){
+        env.log("Failed to enter area.", COLOR_RED);
+        stats.errors++;
+        env.update_stats();
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "Failed to enter area.",
+            env.console
+        );
+    }else{
+        env.log("Entered area.");
+    }
+    pbf_wait(context, 500ms);
+    context.wait_for_all_requests();
+
+    //walk back up to the regi
+    ssf_press_button(context, BUTTON_B, 0ms, 480ms);
+    pbf_press_dpad(context, DPAD_UP, 480ms, 160ms);
+
+    context.wait_for_all_requests();
+}
+
+void LegendaryRunAwayEmerald::reset_groudon(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    LegendaryRunAwayEmerald_Descriptor::Stats& stats = env.current_stats<LegendaryRunAwayEmerald_Descriptor::Stats>();
+
+    //Turn left. Take 10 steps.
+    ssf_press_button(context, BUTTON_B, 0ms, GROUDON_LEFT_FIRST);
+    pbf_press_dpad(context, DPAD_LEFT, GROUDON_LEFT_FIRST, 0ms);
+    context.wait_for_all_requests();
+
+    //Turn up. Take 14 steps. (Bump into wall.)
+    ssf_press_button(context, BUTTON_B, 0ms, 1920ms);
+    pbf_press_dpad(context, DPAD_UP, 1920ms, 0ms);
+    context.wait_for_all_requests();
+
+    //Turn right. Take 2 steps.
+    ssf_press_button(context, BUTTON_B, 0ms, GROUDON_RIGHT_FIRST);
+    pbf_press_dpad(context, DPAD_RIGHT, GROUDON_RIGHT_FIRST, 0ms);
+    context.wait_for_all_requests();
+
+    //Turn up. Take 8 steps (Bump into wall.)
+    ssf_press_button(context, BUTTON_B, 0ms, 1120ms);
+    pbf_press_dpad(context, DPAD_UP, 1120ms, 0ms);
+    context.wait_for_all_requests();
+
+    //Turn left. Take 4 steps.
+    ssf_press_button(context, BUTTON_B, 0ms, GROUDON_LEFT_SECOND);
+    pbf_press_dpad(context, DPAD_LEFT, GROUDON_LEFT_SECOND, 0ms);
+    context.wait_for_all_requests();
+
+    //Turn down. Exit. Black screen over.
+    BlackScreenOverWatcher exit_area(COLOR_RED);
+    int ret = run_until<ProControllerContext>(
+        env.console, context,
+        [](ProControllerContext& context){
+            ssf_press_button(context, BUTTON_B, 0ms, 720ms);
+            pbf_press_dpad(context, DPAD_DOWN, 720ms, 0ms);
+            pbf_wait(context, 2400ms);
+        },
+        {exit_area}
+    );
+    context.wait_for_all_requests();
+    if (ret != 0){
+        env.log("Failed to exit area.", COLOR_RED);
+        stats.errors++;
+        env.update_stats();
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "Failed to exit area.",
+            env.console
+        );
+    }else{
+        env.log("Left area.");
+    }
+    pbf_wait(context, 1000ms);
+    context.wait_for_all_requests();
+
+    //Reverse above steps.
+    BlackScreenOverWatcher enter_area(COLOR_RED);
+    int ret2 = run_until<ProControllerContext>(
+        env.console, context,
+        [](ProControllerContext& context){
+            ssf_press_button(context, BUTTON_B, 0ms, 720ms);
+            pbf_press_dpad(context, DPAD_UP, 720ms, 0ms);
+            pbf_wait(context, 2400ms);
+        },
+        {enter_area}
+    );
+    context.wait_for_all_requests();
+    if (ret2 != 0){
+        stats.errors++;
+        env.update_stats();
+        env.log("Failed to enter area.", COLOR_RED);
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "Failed to enter area.",
+            env.console
+        );
+    }else{
+        env.log("Entered area.");
+    }
+    pbf_wait(context, 500ms);
+    context.wait_for_all_requests();
+
+    ssf_press_button(context, BUTTON_B, 0ms, GROUDON_LEFT_SECOND);
+    pbf_press_dpad(context, DPAD_RIGHT, GROUDON_LEFT_SECOND, 160ms);
+    context.wait_for_all_requests();
+
+    ssf_press_button(context, BUTTON_B, 0ms, 1120ms);
+    pbf_press_dpad(context, DPAD_DOWN, 1120ms, 160ms);
+    context.wait_for_all_requests();
+
+    ssf_press_button(context, BUTTON_B, 0ms, GROUDON_RIGHT_FIRST);
+    pbf_press_dpad(context, DPAD_LEFT, GROUDON_RIGHT_FIRST, 160ms);
+    context.wait_for_all_requests();
+
+    ssf_press_button(context, BUTTON_B, 0ms, 1920ms);
+    pbf_press_dpad(context, DPAD_DOWN, 1920ms, 160ms);
+    context.wait_for_all_requests();
+
+    ssf_press_button(context, BUTTON_B, 0ms, GROUDON_LEFT_FIRST);
+    pbf_press_dpad(context, DPAD_RIGHT, GROUDON_LEFT_FIRST, 160ms);
+    context.wait_for_all_requests();
+}
+
+void LegendaryRunAwayEmerald::reset_kyogre(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    LegendaryRunAwayEmerald_Descriptor::Stats& stats = env.current_stats<LegendaryRunAwayEmerald_Descriptor::Stats>();
+
+    //Turn down. Take 1 step and hit the wall. No config needed.
+    ssf_press_button(context, BUTTON_B, 0ms, 200ms);
+    pbf_press_dpad(context, DPAD_DOWN, 200ms, 0ms);
+    context.wait_for_all_requests();
+
+    //Turn right. Take 9 steps.
+    ssf_press_button(context, BUTTON_B, 0ms, KYOGRE_RIGHT_FIRST);
+    pbf_press_dpad(context, DPAD_RIGHT, KYOGRE_RIGHT_FIRST, 0ms);
+    context.wait_for_all_requests();
+
+    //Turn up. 13 steps. Wall. No config needed.
+    ssf_press_button(context, BUTTON_B, 0ms, 1800ms);
+    pbf_press_dpad(context, DPAD_UP, 1800ms, 0ms);
+    context.wait_for_all_requests();
+
+    //Turn left. 4 steps. Wall. No config needed.
+    ssf_press_button(context, BUTTON_B, 0ms, 680ms);
+    pbf_press_dpad(context, DPAD_LEFT, 680ms, 0ms);
+    context.wait_for_all_requests();
+
+    //Turn up. 10 steps.
+    ssf_press_button(context, BUTTON_B, 0ms, KYOGRE_UP_FIRST);
+    pbf_press_dpad(context, DPAD_UP, KYOGRE_UP_FIRST, 0ms);
+    context.wait_for_all_requests();
+
+    //Turn right. 6 steps.
+    ssf_press_button(context, BUTTON_B, 0ms, KYOGRE_RIGHT_SECOND);
+    pbf_press_dpad(context, DPAD_RIGHT, KYOGRE_RIGHT_SECOND, 0ms);
+    context.wait_for_all_requests();
+
+    //Turn down. Exit. Black screen over.
+    BlackScreenOverWatcher exit_area(COLOR_RED);
+    int ret = run_until<ProControllerContext>(
+        env.console, context,
+        [](ProControllerContext& context){
+            ssf_press_button(context, BUTTON_B, 0ms, 720ms);
+            pbf_press_dpad(context, DPAD_DOWN, 720ms, 160ms);
+            pbf_wait(context, 2400ms);
+        },
+        {exit_area}
+    );
+    context.wait_for_all_requests();
+    if (ret != 0){
+        env.log("Failed to exit area.", COLOR_RED);
+        stats.errors++;
+        env.update_stats();
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "Failed to exit area.",
+            env.console
+        );
+    }else{
+        env.log("Left area.");
+    }
+    pbf_wait(context, 1000ms);
+    context.wait_for_all_requests();
+
+    BlackScreenOverWatcher enter_area(COLOR_RED);
+    int ret2 = run_until<ProControllerContext>(
+        env.console, context,
+        [](ProControllerContext& context){
+            ssf_press_button(context, BUTTON_B, 0ms, 720ms);
+            pbf_press_dpad(context, DPAD_UP, 720ms, 0ms);
+            pbf_wait(context, 2400ms);
+        },
+        {enter_area}
+    );
+    pbf_wait(context, 500ms);
+    context.wait_for_all_requests();
+    if (ret2 != 0){
+        env.log("Failed to enter area.", COLOR_RED);
+        stats.errors++;
+        env.update_stats();
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "Failed to enter area.",
+            env.console
+        );
+    }else{
+        env.log("Entered area.");
+    }
+    pbf_wait(context, 500ms);
+    context.wait_for_all_requests();
+
+    ssf_press_button(context, BUTTON_B, 0ms, KYOGRE_RIGHT_SECOND);
+    pbf_press_dpad(context, DPAD_LEFT, KYOGRE_RIGHT_SECOND, 0ms);
+    context.wait_for_all_requests();
+
+    ssf_press_button(context, BUTTON_B, 0ms, KYOGRE_UP_FIRST);
+    pbf_press_dpad(context, DPAD_DOWN, KYOGRE_UP_FIRST, 0ms);
+    context.wait_for_all_requests();
+
+    ssf_press_button(context, BUTTON_B, 0ms, 680ms);
+    pbf_press_dpad(context, DPAD_RIGHT, 680ms, 0ms);
+    context.wait_for_all_requests();
+
+    ssf_press_button(context, BUTTON_B, 0ms, 1800ms);
+    pbf_press_dpad(context, DPAD_DOWN, 1800ms, 0ms);
+    context.wait_for_all_requests();
+
+    ssf_press_button(context, BUTTON_B, 0ms, KYOGRE_RIGHT_FIRST);
+    pbf_press_dpad(context, DPAD_LEFT, KYOGRE_RIGHT_FIRST, 0ms);
+    context.wait_for_all_requests();
+
+    ssf_press_button(context, BUTTON_B, 0ms, 200ms);
+    pbf_press_dpad(context, DPAD_UP, 200ms, 0ms);
+    context.wait_for_all_requests();
+}
+
+void LegendaryRunAwayEmerald::reset_hooh(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    LegendaryRunAwayEmerald_Descriptor::Stats& stats = env.current_stats<LegendaryRunAwayEmerald_Descriptor::Stats>();
+
+    BlackScreenOverWatcher exit_area(COLOR_RED);
+    //Turn around, 10 steps down
+    ssf_press_button(context, BUTTON_B, 0ms, HOOH_UP_DOWN);
+    pbf_press_dpad(context, DPAD_DOWN, HOOH_UP_DOWN, 0ms);
+    context.wait_for_all_requests();
+
+    //Turn right, take 1 step. Wait for black screen over.
+    int ret = run_until<ProControllerContext>(
+        env.console, context,
+        [](ProControllerContext& context){
+            ssf_press_button(context, BUTTON_B, 0ms, 500ms);
+            pbf_press_dpad(context, DPAD_RIGHT, 500ms, 0ms);
+            pbf_wait(context, 2400ms);
+        },
+        {exit_area}
+    );
+    context.wait_for_all_requests();
+    if (ret != 0){
+        env.log("Failed to exit area.", COLOR_RED);
+        stats.errors++;
+        env.update_stats();
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "Failed to exit area.",
+            env.console
+        );
+    }else{
+        env.log("Left area.");
+    }
+    pbf_wait(context, 500ms);
+    context.wait_for_all_requests();
+
+    BlackScreenOverWatcher enter_area(COLOR_RED);
+    //turn left, take one step. now turn back right and take a step. wait for black screen over.
+    int ret2 = run_until<ProControllerContext>(
+        env.console, context,
+        [](ProControllerContext& context){
+            ssf_press_button(context, BUTTON_B, 0ms, 500ms);
+            pbf_press_dpad(context, DPAD_LEFT, 500ms, 0ms);
+
+            ssf_press_button(context, BUTTON_B, 0ms, 500ms);
+            pbf_press_dpad(context, DPAD_RIGHT, 500ms, 0ms);
+            pbf_wait(context, 2400ms);
+        },
+        {enter_area}
+    );
+    context.wait_for_all_requests();
+    if (ret2 != 0){
+        env.log("Failed to enter area.", COLOR_RED);
+        stats.errors++;
+        env.update_stats();
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "Failed to enter area.",
+            env.console
+        );
+    }else{
+        env.log("Entered area.");
+    }
+    pbf_wait(context, 500ms);
+    context.wait_for_all_requests();
+
+    //reverse above steps, but only take 9 steps up
+    //doesn't really matter since we want to trigger the encounter anyway
+    pbf_press_dpad(context, DPAD_LEFT, HOOH_LEFT_RIGHT, 160ms);
+
+    ssf_press_button(context, BUTTON_B, 0ms, HOOH_UP_DOWN);
+    pbf_press_dpad(context, DPAD_UP, HOOH_UP_DOWN, 160ms);
+
+    context.wait_for_all_requests();
+}
+
+void LegendaryRunAwayEmerald::reset_lugia(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    LegendaryRunAwayEmerald_Descriptor::Stats& stats = env.current_stats<LegendaryRunAwayEmerald_Descriptor::Stats>();
+
+    BlackScreenOverWatcher exit_area(COLOR_RED);
+    //Turn around, 5 steps down
+    ssf_press_button(context, BUTTON_B, 0ms, LUGIA_UP_DOWN0);
+    pbf_press_dpad(context, DPAD_DOWN, LUGIA_UP_DOWN0, 0ms);
+    context.wait_for_all_requests();
+
+    //Turn right, 3 steps right. Wait for black screen over.
+    int ret = run_until<ProControllerContext>(
+        env.console, context,
+        [](ProControllerContext& context){
+            ssf_press_button(context, BUTTON_B, 0ms, 720ms);
+            pbf_press_dpad(context, DPAD_RIGHT, 720ms, 0ms);
+            pbf_wait(context, 2400ms);
+        },
+        {exit_area}
+    );
+    context.wait_for_all_requests();
+    if (ret != 0){
+        env.log("Failed to exit area.", COLOR_RED);
+        stats.errors++;
+        env.update_stats();
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "Failed to exit area.",
+            env.console
+        );
+    }else{
+        env.log("Left area.");
+    }
+    pbf_wait(context, 500ms);
+    context.wait_for_all_requests();
+
+    BlackScreenOverWatcher enter_area(COLOR_RED);
+    //turn up, take one step. then turn back down and take a step. wait for black screen over.
+    int ret2 = run_until<ProControllerContext>(
+        env.console, context,
+        [](ProControllerContext& context){
+            ssf_press_button(context, BUTTON_B, 0ms, 500ms);
+            pbf_press_dpad(context, DPAD_UP, 500ms, 0ms);
+
+            ssf_press_button(context, BUTTON_B, 0ms, 500ms);
+            pbf_press_dpad(context, DPAD_DOWN, 500ms, 0ms);
+            pbf_wait(context, 2400ms);
+        },
+        {enter_area}
+    );
+    context.wait_for_all_requests();
+    if (ret2 != 0){
+        env.log("Failed to enter area.", COLOR_RED);
+        stats.errors++;
+        env.update_stats();
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "Failed to enter area.",
+            env.console
+        );
+    }else{
+        env.log("Entered area.");
+    }
+    pbf_wait(context, 500ms);
+    context.wait_for_all_requests();
+
+    //reverse above steps
+    ssf_press_button(context, BUTTON_B, 0ms, LUGIA_LEFT_RIGHT0);
+    pbf_press_dpad(context, DPAD_LEFT, LUGIA_LEFT_RIGHT0, 0ms);
+
+    ssf_press_button(context, BUTTON_B, 0ms, LUGIA_UP_DOWN0);
+    pbf_press_dpad(context, DPAD_UP, LUGIA_UP_DOWN0, 0ms);
+
+    context.wait_for_all_requests();
+}
+
+void LegendaryRunAwayEmerald::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    LegendaryRunAwayEmerald_Descriptor::Stats& stats = env.current_stats<LegendaryRunAwayEmerald_Descriptor::Stats>();
+
+    home_black_border_check(env.console, context);
+
+    /*
+    * Text speed fast, battle animations off
+    * smoke ball or fast pokemon req. no entry effects.
+    * 
+    * Don't need to worry about PokeNav or random encounters for any of these targets.
+    * 
+    * Stand in front of Regis/Ho-Oh/Lugia. Save the game.
+    */
+
+    while (true){
+        BlackScreenWatcher legendary_battle_start(COLOR_RED);
+        int ret3 = run_until<ProControllerContext>(
+            env.console, context,
+            [&](ProControllerContext& context){
+                for (int i = 0; i < 5; i++){
+                    switch (TARGET){
+                    case Target::hooh:
+                    case Target::kyogre:
+                    case Target::groudon:
+                        //Step forward to start the encounter.
+                        pbf_press_dpad(context, DPAD_UP, 160ms, 400ms);
+                        break;
+                    //case Target::groudon: //Step up is easier.
+                    //    pbf_press_dpad(context, DPAD_RIGHT, 160ms, 400ms);
+                    //    break;
+                    //case Target::kyogre:
+                    //    pbf_press_dpad(context, DPAD_LEFT, 160ms, 400ms);
+                    //    break;
+                    case Target::lugia:
+                    case Target::regis:
+                        pbf_mash_button(context, BUTTON_A, 5000ms);
+                        context.wait_for_all_requests();
+                    default:;
+                    }
+                    pbf_wait(context, 2000ms);
+                    context.wait_for_all_requests();
+                }
+            },
+            {legendary_battle_start}
+        );
+        context.wait_for_all_requests();
+        if (ret3 != 0){
+            env.log("Failed to start battle after 5 attempts.", COLOR_RED);
+            stats.errors++;
+            env.update_stats();
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "Failed to start battle after 5 attempts.",
+                env.console
+            );
+        }else{
+            env.log("Legendary battle started.");
+        }
+        context.wait_for_all_requests();
+        
+        bool legendary_shiny = handle_encounter(env.console, context, true);
+        if (legendary_shiny){
+            stats.shinies++;
+            env.update_stats();
+
+            if (TAKE_VIDEO){
+                pbf_press_button(context, BUTTON_CAPTURE, 2000ms, 0ms);
+            }
+
+            send_program_notification(env,
+                NOTIFICATION_SHINY,
+                COLOR_YELLOW,
+                "Shiny found!",
+                {}, "",
+                env.console.video().snapshot(),
+                true
+            );
+            break;
+        }
+        env.log("No shiny found.");
+        flee_battle(env.console, context);
+        
+        //Close out dialog box
+        pbf_mash_button(context, BUTTON_B, 2000ms);
+        context.wait_for_all_requests();
+        
+        //Exit and re-enter the room
+        switch (TARGET){
+        case Target::regis:
+            reset_regi(env, context);
+            break;
+        case Target::groudon:
+            reset_groudon(env, context);
+            break;
+        case Target::kyogre:
+            reset_kyogre(env, context);
+            break;
+        case Target::hooh:
+            reset_hooh(env, context);
+            break;
+        case Target::lugia:
+            reset_lugia(env, context);
+            break;
+        default:
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "Invalid target!",
+                env.console
+            );
+            break;
+        }
+
+        stats.resets++;
+        env.update_stats();
+    }
+    if (GO_HOME_WHEN_DONE){
+        pbf_press_button(context, BUTTON_HOME, 200ms, 1000ms);
+    }
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+}
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_LegendaryRunAway-Emerald.h b/SerialPrograms/Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_LegendaryRunAway-Emerald.h
new file mode 100644
index 0000000000..6939ac03b3
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_LegendaryRunAway-Emerald.h
@@ -0,0 +1,82 @@
+/*  Legendary Hunt - Emerald
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonRSE_LegendaryRunAwayEmerald_H
+#define PokemonAutomation_PokemonRSE_LegendaryRunAwayEmerald_H
+
+#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+#include "VideoGames/PokemonLA/Options/PokemonLA_ShinyDetectedAction.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonRSE{
+
+class LegendaryRunAwayEmerald_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    LegendaryRunAwayEmerald_Descriptor();
+    struct Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+class LegendaryRunAwayEmerald : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = LegendaryRunAwayEmerald_Descriptor;
+    LegendaryRunAwayEmerald();
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+    virtual void start_program_border_check(
+        VideoStream& stream,
+        FeedbackType feedback_type
+    ) override{}
+
+private:
+    PokemonLA::ShinyRequiresAudioText SHINY_REQUIRES_AUDIO;
+
+    enum class Target{
+        regis,
+        groudon,
+        kyogre,
+        hooh,
+        lugia,
+    };
+    EnumDropdownOption<Target> TARGET;
+
+    BooleanCheckBoxOption TAKE_VIDEO;
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
+
+    EventNotificationOption NOTIFICATION_SHINY;
+    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
+    EventNotificationsOption NOTIFICATIONS;
+
+    //For easier testing after release
+    //regis are up/down only and don't really need
+    SectionDividerOption m_advanced_options;
+    MillisecondsOption GROUDON_LEFT_FIRST;
+    MillisecondsOption GROUDON_RIGHT_FIRST;
+    MillisecondsOption GROUDON_LEFT_SECOND;
+    MillisecondsOption KYOGRE_RIGHT_FIRST;
+    MillisecondsOption KYOGRE_UP_FIRST;
+    MillisecondsOption KYOGRE_RIGHT_SECOND;
+    MillisecondsOption HOOH_UP_DOWN;
+    MillisecondsOption HOOH_LEFT_RIGHT;
+    MillisecondsOption LUGIA_UP_DOWN0;
+    MillisecondsOption LUGIA_LEFT_RIGHT0;
+
+    void reset_regi(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+    void reset_groudon(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+    void reset_kyogre(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+    void reset_hooh(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+    void reset_lugia(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+};
+
+}
+}
+}
+#endif
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_ShinyHunt-Deoxys.cpp b/SerialPrograms/Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_ShinyHunt-Deoxys.cpp
new file mode 100644
index 0000000000..3fa82e118b
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_ShinyHunt-Deoxys.cpp
@@ -0,0 +1,332 @@
+/*  E Shiny Deoxys
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+//#include "Common/Cpp/PrettyPrint.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonRSE/Inference/Dialogs/PokemonRSE_BattleDialogs.h"
+#include "VideoGames/PokemonRSE/Inference/Dialogs/PokemonRSE_DialogDetector.h"
+#include "VideoGames/PokemonRSE/PokemonRSE_Navigation.h"
+#include "PokemonRSE_ShinyHunt-Deoxys.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonRSE{
+
+ShinyHuntDeoxys_Descriptor::ShinyHuntDeoxys_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonRSE:ShinyHuntDeoxys",
+        Pokemon::STRING_POKEMON + " RSE", "Shiny Hunt - Deoxys",
+        "Programs/PokemonRSE/ShinyHuntDeoxys.html",
+        "Use the Run Away method to shiny hunt Deoxys in Emerald.",
+        PanelQualityStanding::OFFICIAL_BETA,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::VIDEO_AUDIO,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+struct ShinyHuntDeoxys_Descriptor::Stats : public StatsTracker{
+    Stats()
+        : resets(m_stats["Resets"])
+        , shinies(m_stats["Shinies"])
+        , errors(m_stats["Errors"])
+    {
+        m_display_order.emplace_back("Resets");
+        m_display_order.emplace_back("Shinies");
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+    }
+    std::atomic<uint64_t>& resets;
+    std::atomic<uint64_t>& shinies;
+    std::atomic<uint64_t>& errors;
+};
+std::unique_ptr<StatsTracker> ShinyHuntDeoxys_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+ShinyHuntDeoxys::ShinyHuntDeoxys()
+    : STARTPOS(
+        "<b>Starting Position:</b><br>",
+        {
+            {StartPos::boat, "boat", "Boat/Walk up"},
+            {StartPos::rock_unsolved, "rock_unsolved", "Triangle rock, puzzle is unsolved"},
+            {StartPos::rock_solved, "rock_solved", "Triangle rock, puzzle is already solved"},
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        StartPos::rock_unsolved
+    )
+    , TAKE_VIDEO("<b>Take Video:</b><br>Record a video when the shiny starter is found.", LockMode::UNLOCK_WHILE_RUNNING, true)
+    , GO_HOME_WHEN_DONE(true)
+    , WALK_UP_DOWN_TIME0(
+        "<b>Walk up/down time</b><br>Spend this long to run up to the triangle rock.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "3520 ms"
+    )
+    , NOTIFICATION_SHINY(
+        "Shiny Found",
+        true, true, ImageAttachmentMode::JPG,
+        {"Notifs", "Showcase"}
+    )
+    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_SHINY,
+        &NOTIFICATION_STATUS_UPDATE,
+        &NOTIFICATION_PROGRAM_FINISH,
+        })
+{
+    PA_ADD_STATIC(SHINY_REQUIRES_AUDIO);
+    PA_ADD_OPTION(STARTPOS);
+    PA_ADD_OPTION(TAKE_VIDEO);
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+    PA_ADD_OPTION(WALK_UP_DOWN_TIME0);
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+void ShinyHuntDeoxys::solve_puzzle(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    env.log("Step 1: Press A from below.");
+    pbf_press_button(context, BUTTON_A, 160ms, 320ms);
+
+    env.log("Step 2: 5 Left, 1 Down.");
+    pbf_press_dpad(context, DPAD_LEFT, 80ms, 400ms);
+    pbf_press_dpad(context, DPAD_LEFT, 80ms, 400ms);
+    pbf_press_dpad(context, DPAD_LEFT, 80ms, 400ms);
+    pbf_press_dpad(context, DPAD_LEFT, 80ms, 400ms);
+    pbf_press_dpad(context, DPAD_LEFT, 80ms, 400ms);
+
+    pbf_press_dpad(context, DPAD_DOWN, 80ms, 640ms);
+
+    pbf_press_button(context, BUTTON_A, 160ms, 320ms);
+    context.wait_for_all_requests();
+
+    env.log("Step 3: 5 Right, 5 Up.");
+    pbf_press_dpad(context, DPAD_RIGHT, 80ms, 400ms);
+    pbf_press_dpad(context, DPAD_RIGHT, 80ms, 400ms);
+    pbf_press_dpad(context, DPAD_RIGHT, 80ms, 400ms);
+    pbf_press_dpad(context, DPAD_RIGHT, 80ms, 400ms);
+    pbf_press_dpad(context, DPAD_RIGHT, 80ms, 400ms);
+
+    ssf_press_button(context, BUTTON_B, 0ms, 720ms);
+    pbf_press_dpad(context, DPAD_UP, 720ms, 400ms);
+
+    pbf_press_button(context, BUTTON_A, 160ms, 320ms);
+    context.wait_for_all_requests();
+
+    env.log("Step 4: 5 Right, 5 Down");
+    pbf_press_dpad(context, DPAD_RIGHT, 80ms, 400ms);
+    pbf_press_dpad(context, DPAD_RIGHT, 80ms, 400ms);
+    pbf_press_dpad(context, DPAD_RIGHT, 80ms, 400ms);
+    pbf_press_dpad(context, DPAD_RIGHT, 80ms, 400ms);
+    pbf_press_dpad(context, DPAD_RIGHT, 80ms, 400ms);
+
+    ssf_press_button(context, BUTTON_B, 0ms, 720ms);
+    pbf_press_dpad(context, DPAD_DOWN, 720ms, 400ms);
+
+    pbf_press_button(context, BUTTON_A, 160ms, 320ms);
+    context.wait_for_all_requests();
+
+    env.log("Step 5: 3 Up, 7 Left");
+    pbf_press_dpad(context, DPAD_UP, 80ms, 400ms);
+    pbf_press_dpad(context, DPAD_UP, 80ms, 400ms);
+    pbf_press_dpad(context, DPAD_UP, 80ms, 400ms);
+
+    ssf_press_button(context, BUTTON_B, 0ms, 920ms);
+    pbf_press_dpad(context, DPAD_LEFT, 920ms, 400ms);
+
+    pbf_press_button(context, BUTTON_A, 160ms, 320ms);
+    context.wait_for_all_requests();
+
+    env.log("Step 6: 5 Right.");
+    ssf_press_button(context, BUTTON_B, 0ms, 800ms);
+    pbf_press_dpad(context, DPAD_RIGHT, 800ms, 400ms);
+
+    pbf_press_button(context, BUTTON_A, 160ms, 320ms);
+    context.wait_for_all_requests();
+
+    env.log("Step 7: 3 Left, 2 Down.");
+    pbf_press_dpad(context, DPAD_LEFT, 80ms, 400ms);
+    pbf_press_dpad(context, DPAD_LEFT, 80ms, 400ms);
+    pbf_press_dpad(context, DPAD_LEFT, 80ms, 400ms);
+
+    ssf_press_button(context, BUTTON_B, 0ms, 480ms);
+    pbf_press_dpad(context, DPAD_DOWN, 480ms, 400ms);
+
+    pbf_press_button(context, BUTTON_A, 160ms, 320ms);
+    context.wait_for_all_requests();
+
+    env.log("Step 8: 1 Down, 4 Left.");
+    pbf_press_dpad(context, DPAD_DOWN, 80ms, 400ms);
+
+    ssf_press_button(context, BUTTON_B, 0ms, 640ms);
+    pbf_press_dpad(context, DPAD_LEFT, 640ms, 400ms);
+
+    pbf_press_button(context, BUTTON_A, 160ms, 320ms);
+    context.wait_for_all_requests();
+
+    env.log("Step 8: 7 Right.");
+    ssf_press_button(context, BUTTON_B, 0ms, 920ms);
+    pbf_press_dpad(context, DPAD_RIGHT, 920ms, 400ms);
+
+    pbf_press_button(context, BUTTON_A, 160ms, 320ms);
+    context.wait_for_all_requests();
+
+    env.log("Step 9: 4 Left, Down 1.");
+    pbf_press_dpad(context, DPAD_LEFT, 80ms, 400ms);
+    pbf_press_dpad(context, DPAD_LEFT, 80ms, 400ms);
+    pbf_press_dpad(context, DPAD_LEFT, 80ms, 400ms);
+    pbf_press_dpad(context, DPAD_LEFT, 80ms, 400ms);
+
+    pbf_press_dpad(context, DPAD_DOWN, 80ms, 400ms);
+
+    pbf_press_button(context, BUTTON_A, 160ms, 320ms);
+    context.wait_for_all_requests();
+
+    env.log("Step 10: 4 Up.");
+    ssf_press_button(context, BUTTON_B, 0ms, 640ms);
+    pbf_press_dpad(context, DPAD_UP, 640ms, 640ms);
+    context.wait_for_all_requests();
+}
+
+void ShinyHuntDeoxys::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    ShinyHuntDeoxys_Descriptor::Stats& stats = env.current_stats<ShinyHuntDeoxys_Descriptor::Stats>();
+
+    home_black_border_check(env.console, context);
+
+    /*
+    * Settings: Text Speed fast. Turn off animations.
+    * Full screen, no filter.
+    * If on a retro handheld, make sure the screen matches that of NSO+.
+    * 
+    * Setup: Lead is faster or has a Smoke Ball.
+    * No abilities or items that activate on entry.
+    * Lead cannot be shiny.
+    * Stand enter Birth Island and stay at the door. Save the game.
+    * 
+    * Emerald only. This uses the Run Away method due to the game's RNG issues.
+    * If powering off your game/resetting, try to start with different timing to avoid repeated frames.
+    * 
+    * Do not have to handle random PokeNav calls for deoxys/mew.
+    * Would have to handle both PokeNav and random encounters for ray/others? Why is PokeNav a thing???
+    */
+
+    bool first_run = true;
+
+    while (true){
+        if (first_run){
+            switch (STARTPOS){
+            case StartPos::rock_solved:
+                env.log("StartPos: Already in position.");
+                break;
+            case StartPos::boat:
+                env.log("StartPos: Walking up to Deoxys.");
+                //Walk up to the triangle rock from the ship. No bike allowed.
+                ssf_press_button(context, BUTTON_B, 0ms, WALK_UP_DOWN_TIME0);
+                pbf_press_dpad(context, DPAD_UP, WALK_UP_DOWN_TIME0, 160ms);
+                context.wait_for_all_requests();
+            case StartPos::rock_unsolved:
+                env.log("StartPos: Solving puzzle.");
+                solve_puzzle(env, context);
+                break;
+            default:
+                stats.errors++;
+                env.update_stats();
+                OperationFailedExceptionWithScreenshot::fire(
+                    ErrorReportMode::SEND_ERROR_REPORT,
+                    "Invalid starting position selected.",
+                    env.console
+                );
+                break;
+            }
+            first_run = false;
+        }
+
+        //Start battle
+        BlackScreenWatcher legendary_battle_start(COLOR_RED);
+        int ret3 = run_until<ProControllerContext>(
+            env.console, context,
+            [&](ProControllerContext& context){
+                for (int i = 0; i < 5; i++){
+                    pbf_mash_button(context, BUTTON_A, 3000ms);
+                    pbf_wait(context, 10000ms);
+                    context.wait_for_all_requests();
+                }
+            },
+            {legendary_battle_start}
+        );
+        context.wait_for_all_requests();
+        if (ret3 != 0){
+            env.log("Failed to start battle after 5 attempts.", COLOR_RED);
+            stats.errors++;
+            env.update_stats();
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "Failed to start battle after 5 attempts.",
+                env.console
+            );
+        }else{
+            env.log("Legendary battle started.");
+        }
+        context.wait_for_all_requests();
+
+        bool legendary_shiny = handle_encounter(env.console, context, true);
+        if (legendary_shiny){
+            stats.shinies++;
+            env.update_stats();
+
+            if (TAKE_VIDEO){
+                pbf_press_button(context, BUTTON_CAPTURE, 2000ms, 0ms);
+            }
+
+            send_program_notification(env,
+                NOTIFICATION_SHINY,
+                COLOR_YELLOW,
+                "Shiny found!",
+                {}, "",
+                env.console.video().snapshot(),
+                true
+            );
+            break;
+        }
+        env.log("No shiny found.");
+        flee_battle(env.console, context);
+
+        //After pressing the flee button, additional dialog box pops up for Deoxys
+        pbf_mash_button(context, BUTTON_B, 2000ms);
+        context.wait_for_all_requests();
+        
+        //Walk down from the triangle rock to the ship.
+        env.log("Walking down to ship.");
+        ssf_press_button(context, BUTTON_B, 0ms, WALK_UP_DOWN_TIME0);
+        pbf_press_dpad(context, DPAD_DOWN, WALK_UP_DOWN_TIME0, 160ms);
+        context.wait_for_all_requests();
+
+        env.log("Walking up to Deoxys rock.");
+        //Walk up to the triangle rock from the ship. Bike is not allowed on Birth Island.
+        ssf_press_button(context, BUTTON_B, 0ms, WALK_UP_DOWN_TIME0);
+        pbf_press_dpad(context, DPAD_UP, WALK_UP_DOWN_TIME0, 160ms);
+        context.wait_for_all_requests();
+
+        env.log("Solving puzzle.");
+        solve_puzzle(env, context);
+
+        stats.resets++;
+        env.update_stats();
+    }
+
+    if (GO_HOME_WHEN_DONE){
+        pbf_press_button(context, BUTTON_HOME, 200ms, 1000ms);
+    }
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+}
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_ShinyHunt-Deoxys.h b/SerialPrograms/Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_ShinyHunt-Deoxys.h
new file mode 100644
index 0000000000..f6282c70c0
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_ShinyHunt-Deoxys.h
@@ -0,0 +1,64 @@
+/*  E Shiny Deoxys
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonRSE_ShinyHuntDeoxys_H
+#define PokemonAutomation_PokemonRSE_ShinyHuntDeoxys_H
+
+#include "Common/Cpp/Options/TimeDurationOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+#include "VideoGames/PokemonLA/Options/PokemonLA_ShinyDetectedAction.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonRSE{
+
+class ShinyHuntDeoxys_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    ShinyHuntDeoxys_Descriptor();
+    struct Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+class ShinyHuntDeoxys : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = ShinyHuntDeoxys_Descriptor;
+    ShinyHuntDeoxys();
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+    virtual void start_program_border_check(
+        VideoStream& stream,
+        FeedbackType feedback_type
+    ) override{}
+
+private:
+    PokemonLA::ShinyRequiresAudioText SHINY_REQUIRES_AUDIO;
+
+    enum class StartPos{
+        boat,
+        rock_unsolved,
+        rock_solved,
+    };
+    EnumDropdownOption<StartPos> STARTPOS;
+
+    BooleanCheckBoxOption TAKE_VIDEO;
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
+
+    MillisecondsOption WALK_UP_DOWN_TIME0;
+
+    EventNotificationOption NOTIFICATION_SHINY;
+    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
+    EventNotificationsOption NOTIFICATIONS;
+
+    void solve_puzzle(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+};
+
+}
+}
+}
+#endif
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_ShinyHunt-Mew.cpp b/SerialPrograms/Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_ShinyHunt-Mew.cpp
new file mode 100644
index 0000000000..3eb6cdb7e5
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_ShinyHunt-Mew.cpp
@@ -0,0 +1,291 @@
+/*  E Shiny Mew
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+//#include "Common/Cpp/PrettyPrint.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonRSE/Inference/Dialogs/PokemonRSE_BattleDialogs.h"
+#include "VideoGames/PokemonRSE/Inference/Dialogs/PokemonRSE_DialogDetector.h"
+#include "VideoGames/PokemonRSE/PokemonRSE_Navigation.h"
+#include "PokemonRSE_ShinyHunt-Mew.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonRSE{
+
+ShinyHuntMew_Descriptor::ShinyHuntMew_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonRSE:ShinyHuntMew",
+        Pokemon::STRING_POKEMON + " RSE", "Shiny Hunt - Mew",
+        "Programs/PokemonRSE/ShinyHuntMew.html",
+        "Use the Run Away method to shiny hunt Mew in Emerald.",
+        PanelQualityStanding::OFFICIAL_BETA,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::VIDEO_AUDIO,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+struct ShinyHuntMew_Descriptor::Stats : public StatsTracker{
+    Stats()
+        : resets(m_stats["Resets"])
+        , shinies(m_stats["Shinies"])
+        , errors(m_stats["Errors"])
+    {
+        m_display_order.emplace_back("Resets");
+        m_display_order.emplace_back("Shinies");
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+    }
+    std::atomic<uint64_t>& resets;
+    std::atomic<uint64_t>& shinies;
+    std::atomic<uint64_t>& errors;
+};
+std::unique_ptr<StatsTracker> ShinyHuntMew_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+ShinyHuntMew::ShinyHuntMew()
+    : TAKE_VIDEO("<b>Take Video:</b><br>Record a video when the shiny starter is found.", LockMode::UNLOCK_WHILE_RUNNING, true)
+    , GO_HOME_WHEN_DONE(true)
+    , NOTIFICATION_SHINY(
+        "Shiny Found",
+        true, true, ImageAttachmentMode::JPG,
+        {"Notifs", "Showcase"}
+    )
+    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_SHINY,
+        &NOTIFICATION_STATUS_UPDATE,
+        &NOTIFICATION_PROGRAM_FINISH,
+        })
+    , m_advanced_options(
+        "<font size=4><b>Advanced Options:</b> You should not need to touch anything below here.</font>"
+    )
+    , MEW_WAIT_TIME0(
+        "<b>Mew wait time:</b><br>Wait this long after entering for Mew to hide in the grass.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "2000 ms"
+    )
+    , DOOR_TO_GRASS_TIME0(
+        "<b>Door to grass time:</b><br>Time it takes to run from the door to the edge of the tall grass. Three steps up.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "400 ms"
+    )
+    , RIGHT_GRASS_1_TIME0(
+        "<b>First Right time:</b><br>Time it takes to turn right and take three steps. This follows the edge of the grass.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "400 ms"
+    )
+    , UP_GRASS_1_TIME0(
+        "<b>Move Up time:</b><br>Time it takes turn up and take one step.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "150 ms"
+    )
+    , RIGHT_GRASS_2_TIME0(
+        "<b>Second Right time:</b><br>Time it takes to turn right and take two steps.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "260 ms"
+    )
+    , FACE_UP_TIME0(
+        "<b>Face Up time:</b><br>Time it takes to tap the up button and face up, without taking a step.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "150 ms"
+    )
+{
+    PA_ADD_STATIC(SHINY_REQUIRES_AUDIO);
+    PA_ADD_OPTION(TAKE_VIDEO);
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+    PA_ADD_OPTION(NOTIFICATIONS);
+    //PA_ADD_STATIC(m_advanced_options);
+    //PA_ADD_OPTION(MEW_WAIT_TIME);
+    //PA_ADD_OPTION(DOOR_TO_GRASS_TIME);
+    //PA_ADD_OPTION(RIGHT_GRASS_1_TIME);
+    //PA_ADD_OPTION(UP_GRASS_1_TIME);
+    //PA_ADD_OPTION(RIGHT_GRASS_2_TIME);
+    //PA_ADD_OPTION(FACE_UP_TIME);
+}
+
+void ShinyHuntMew::enter_mew(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    ShinyHuntMew_Descriptor::Stats& stats = env.current_stats<ShinyHuntMew_Descriptor::Stats>();
+
+    BlackScreenOverWatcher enter_area(COLOR_RED);
+    int ret = run_until<ProControllerContext>(
+        env.console, context,
+        [](ProControllerContext& context){
+            pbf_press_dpad(context, DPAD_UP, 2000ms, 160ms);
+            pbf_wait(context, 2400ms);
+        },
+        {enter_area}
+    );
+    context.wait_for_all_requests();
+    if (ret != 0){
+        env.log("Failed to enter area.", COLOR_RED);
+        stats.errors++;
+        env.update_stats();
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "Failed to enter area.",
+            env.console
+        );
+    }else{
+        env.log("Entered area.");
+    }
+
+    //Wait for Mew ! animation to finish
+    pbf_wait(context, MEW_WAIT_TIME0);
+    context.wait_for_all_requests();
+
+    //DO NOT pause while running!
+    //Run up toward the extra tall grass - 3 steps
+    ssf_press_button(context, BUTTON_B, 0ms, 1220ms); //+10ms
+    //ssf_press_button(context, BUTTON_B, 0ms, DOOR_TO_GRASS_TIME);
+    pbf_press_dpad(context, DPAD_UP, DOOR_TO_GRASS_TIME0, 0ms);
+
+    //Turn right, take 3 steps
+    //ssf_press_button(context, BUTTON_B, 0ms, RIGHT_GRASS_1_TIME);
+    pbf_press_dpad(context, DPAD_RIGHT, RIGHT_GRASS_1_TIME0, 0ms);
+
+    //Turn up, take 1 step
+    //ssf_press_button(context, BUTTON_B, 0ms, UP_GRASS_1_TIME);
+    pbf_press_dpad(context, DPAD_UP, UP_GRASS_1_TIME0, 0ms);
+
+    //Turn right, take 2 steps
+    //ssf_press_button(context, BUTTON_B, 0ms, RIGHT_GRASS_2_TIME);
+    pbf_press_dpad(context, DPAD_RIGHT, RIGHT_GRASS_2_TIME0, 0ms);
+
+    //Turn up.
+    pbf_press_dpad(context, DPAD_UP, FACE_UP_TIME0, 0ms);
+    context.wait_for_all_requests();
+
+    //Start battle.
+    BlackScreenWatcher legendary_battle_start(COLOR_RED);
+    int ret3 = run_until<ProControllerContext>(
+        env.console, context,
+        [&](ProControllerContext& context){
+            for (int i = 0; i < 5; i++){
+                pbf_mash_button(context, BUTTON_A, 3000ms);
+                pbf_wait(context, 10000ms);
+                context.wait_for_all_requests();
+            }
+        },
+        {legendary_battle_start}
+    );
+    context.wait_for_all_requests();
+    if (ret3 != 0){
+        env.log("Failed to start battle after 5 attempts.", COLOR_RED);
+        stats.errors++;
+        env.update_stats();
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "Failed to start battle after 5 attempts.",
+            env.console
+        );
+    }else{
+        env.log("Legendary battle started.");
+    }
+    context.wait_for_all_requests();
+}
+
+void ShinyHuntMew::exit_mew(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    ShinyHuntMew_Descriptor::Stats& stats = env.current_stats<ShinyHuntMew_Descriptor::Stats>();
+
+    ssf_press_button(context, BUTTON_B, 0ms, 1920ms);
+    //ssf_press_button(context, BUTTON_B, 0ms, 400ms);
+    pbf_press_dpad(context, DPAD_DOWN, 400ms, 0ms);
+
+    //ssf_press_button(context, BUTTON_B, 0ms, 720ms);
+    pbf_press_dpad(context, DPAD_LEFT, 650ms, 0ms);
+
+    //ssf_press_button(context, BUTTON_B, 0ms, 800ms);
+    pbf_press_dpad(context, DPAD_DOWN, 800ms, 0ms);
+
+    BlackScreenOverWatcher exit_area(COLOR_RED);
+    int ret = run_until<ProControllerContext>(
+        env.console, context,
+        [](ProControllerContext& context){
+            pbf_press_dpad(context, DPAD_DOWN, 2000ms, 160ms);
+            pbf_wait(context, 2400ms);
+        },
+        {exit_area}
+    );
+    context.wait_for_all_requests();
+    if (ret != 0){
+        env.log("Failed to exit area.", COLOR_RED);
+        stats.errors++;
+        env.update_stats();
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "Failed to exit area.",
+            env.console
+        );
+    }else{
+        env.log("Exited area.");
+    }
+}
+
+void ShinyHuntMew::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    ShinyHuntMew_Descriptor::Stats& stats = env.current_stats<ShinyHuntMew_Descriptor::Stats>();
+
+    home_black_border_check(env.console, context);
+
+    /*
+    * Requires more precision to ensure a Mew encounter every time.
+    * Movement is very configurable due to this.
+    * Enter on the left side, run up and hug the grass to the edge just after the flower on the right
+    * This but without the bike:
+    * https://old.reddit.com/r/ShinyPokemon/comments/1c773oi/gen3_discuss_is_this_the_fastest_way_to_encounter/
+    */
+
+    while (true){
+        enter_mew(env, context);
+
+        bool legendary_shiny = handle_encounter(env.console, context, true);
+        if (legendary_shiny){
+            stats.shinies++;
+            env.update_stats();
+
+            if (TAKE_VIDEO){
+                pbf_press_button(context, BUTTON_CAPTURE, 2000ms, 0ms);
+            }
+
+            send_program_notification(env,
+                NOTIFICATION_SHINY,
+                COLOR_YELLOW,
+                "Shiny found!",
+                {}, "",
+                env.console.video().snapshot(),
+                true
+            );
+            break;
+        }
+        env.log("No shiny found.");
+        flee_battle(env.console, context);
+
+        //Close dialog
+        pbf_mash_button(context, BUTTON_B, 2000ms);
+        context.wait_for_all_requests();
+
+        exit_mew(env, context);
+
+        stats.resets++;
+        env.update_stats();
+    }
+
+    if (GO_HOME_WHEN_DONE){
+        pbf_press_button(context, BUTTON_HOME, 200ms, 1000ms);
+    }
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+}
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_ShinyHunt-Mew.h b/SerialPrograms/Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_ShinyHunt-Mew.h
new file mode 100644
index 0000000000..9d969bc98b
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_ShinyHunt-Mew.h
@@ -0,0 +1,66 @@
+/*  E Shiny Mew
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonRSE_ShinyHuntMew_H
+#define PokemonAutomation_PokemonRSE_ShinyHuntMew_H
+
+#include "Common/Cpp/Options/StaticTextOption.h"
+#include "Common/Cpp/Options/TimeDurationOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+#include "VideoGames/PokemonLA/Options/PokemonLA_ShinyDetectedAction.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonRSE{
+
+class ShinyHuntMew_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    ShinyHuntMew_Descriptor();
+    struct Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+class ShinyHuntMew : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = ShinyHuntMew_Descriptor;
+    ShinyHuntMew();
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+    virtual void start_program_border_check(
+        VideoStream& stream,
+        FeedbackType feedback_type
+    ) override{}
+
+private:
+    PokemonLA::ShinyRequiresAudioText SHINY_REQUIRES_AUDIO;
+    BooleanCheckBoxOption TAKE_VIDEO;
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
+
+    EventNotificationOption NOTIFICATION_SHINY;
+    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
+    EventNotificationsOption NOTIFICATIONS;
+
+    SectionDividerOption m_advanced_options;
+
+    MillisecondsOption MEW_WAIT_TIME0;
+    MillisecondsOption DOOR_TO_GRASS_TIME0;
+    MillisecondsOption RIGHT_GRASS_1_TIME0;
+    MillisecondsOption UP_GRASS_1_TIME0;
+    MillisecondsOption RIGHT_GRASS_2_TIME0;
+    MillisecondsOption FACE_UP_TIME0;
+
+    void enter_mew(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+    void exit_mew(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+
+};
+
+}
+}
+}
+#endif
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_StarterReset.cpp b/SerialPrograms/Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_StarterReset.cpp
new file mode 100644
index 0000000000..7c8e00c137
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_StarterReset.cpp
@@ -0,0 +1,214 @@
+/*  RS Starter Reset
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "CommonTools/StartupChecks/StartProgramChecks.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonRSE/Inference/Dialogs/PokemonRSE_BattleDialogs.h"
+#include "VideoGames/PokemonRSE/Inference/Dialogs/PokemonRSE_DialogDetector.h"
+#include "VideoGames/PokemonRSE/Inference/PokemonRSE_ShinyNumberDetector.h"
+#include "VideoGames/PokemonRSE/PokemonRSE_Navigation.h"
+#include "PokemonRSE_StarterReset.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonRSE{
+
+StarterReset_Descriptor::StarterReset_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonRSE:StarterReset",
+        Pokemon::STRING_POKEMON + " RSE", "[RS]Starter Reset - Video",
+        "Programs/PokemonRSE/StarterReset.html",
+        "Soft reset for a shiny starter. Ruby and Sapphire only.",
+        PanelQualityStanding::OFFICIAL_BETA,
+        ProgramControllerClass::StandardController_RequiresPrecision,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+struct StarterReset_Descriptor::Stats : public StatsTracker{
+    Stats()
+        : resets(m_stats["Resets"])
+        , shinystarter(m_stats["Shiny Starter"])
+        , errors(m_stats["Errors"])
+    {
+        m_display_order.emplace_back("Resets");
+        m_display_order.emplace_back("Shiny Starter");
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+    }
+    std::atomic<uint64_t>& resets;
+    std::atomic<uint64_t>& shinystarter;
+    std::atomic<uint64_t>& errors;
+};
+std::unique_ptr<StatsTracker> StarterReset_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+StarterReset::StarterReset()
+    : TARGET(
+        "<b>Starter:</b><br>",
+        {
+            {Target::treecko, "treecko", "Treecko"},
+            {Target::torchic, "torchic", "Torchic"},
+            {Target::mudkip, "mudkip", "Mudkip"},
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        Target::treecko
+    )
+//    , STARTER_WAIT0(
+//        "<b>Send out starter wait:</b><br>After pressing A to send out your selected starter, wait this long for the animation. Make sure to add extra time in case it is shiny.",
+//        LockMode::LOCK_WHILE_RUNNING,
+//        "6000 ms"
+//    )
+    , NOTIFICATION_SHINY_STARTER(
+        "Shiny Starter",
+        true, true, ImageAttachmentMode::JPG,
+        {"Notifs", "Showcase"}
+    )
+    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_SHINY_STARTER,
+        &NOTIFICATION_STATUS_UPDATE,
+        &NOTIFICATION_PROGRAM_FINISH,
+    })
+{
+    PA_ADD_OPTION(TARGET);
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+void StarterReset::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    StartProgramChecks::check_performance_class_wired_or_wireless(context);
+
+    StarterReset_Descriptor::Stats& stats = env.current_stats<StarterReset_Descriptor::Stats>();
+
+    /*
+    * Settings: Text Speed fast.
+    * Full screen, no filter? The device I'm using to test has similar looking output, but I don't have switch online+.
+    * If on a retro handheld, make sure the screen matches that of NSO+.
+    * 
+    * Setup: Stand in front of the Professor's bag and save the game.
+    * 
+    * Required to fight, so have to do the SR method instead of run away
+    * Soft reset programs are only for Ruby/Sapphire, as Emerald has the 0 seed issue.
+    * 
+    * This also assumes no dry battery.
+    * 
+    * WARNING: Timings in Emerald for the battle menu are slightly different. This won't work with Emerald at all.
+    */
+
+    bool shiny_starter = false;
+    while (!shiny_starter){
+        env.log("Opening bag and selecting starter.");
+        pbf_press_button(context, BUTTON_A, 320ms, 1440ms);
+
+        switch (TARGET){
+        case Target::treecko:
+            pbf_press_dpad(context, DPAD_LEFT, 320ms, 800ms);
+            break;
+        case Target::torchic:
+            //Default cursor position, do nothing.
+            break;
+        case Target::mudkip:
+            pbf_press_dpad(context, DPAD_RIGHT, 320ms, 800ms);
+            break;
+        default:
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "StarterReset: Invalid target.",
+                env.console
+            );
+            break;
+        }
+        pbf_mash_button(context, BUTTON_A, 4320ms);
+        context.wait_for_all_requests();
+
+        env.log("Starting battle.");
+
+        //Now mash B until the battle menu appears
+        BattleMenuWatcher battle_menu(COLOR_RED);
+        int ret = run_until<ProControllerContext>(
+            env.console, context,
+            [](ProControllerContext& context){
+                pbf_mash_button(context, BUTTON_B, 8000ms);
+            },
+            {battle_menu}
+        );
+        context.wait_for_all_requests();
+        if (ret != 0){
+            env.console.log("Failed to detect battle menu.", COLOR_RED);
+        }else{
+            env.log("Battle menu detected.");
+        }
+
+        //Open the summary and check the color of the number
+        pbf_press_dpad(context, DPAD_DOWN, 320ms, 640ms);
+        pbf_press_button(context, BUTTON_A, 320ms, 640ms);
+
+        BlackScreenOverWatcher detector(COLOR_RED);
+        int ret2 = wait_until(
+            env.console, context,
+            std::chrono::milliseconds(3000),
+            {{detector}}
+        );
+        if (ret2 == 0){
+            env.log("Entered party menu.");
+        }else{
+            env.log("Timed out waiting to enter party menu.", COLOR_RED);
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "StarterReset: Timed out waiting to enter party menu.",
+                env.console
+            );
+        }
+
+        pbf_press_button(context, BUTTON_A, 160ms, 1440ms);
+        pbf_press_dpad(context, DPAD_DOWN, 320ms, 640ms);
+        pbf_press_button(context, BUTTON_A, 320ms, 640ms);
+
+        //Check second party member - used for testing with hacked in shiny starter
+        //pbf_press_dpad(context, DPAD_DOWN, 320ms, 640ms);
+
+        pbf_wait(context, 1000ms);
+        context.wait_for_all_requests();
+
+        VideoSnapshot screen = env.console.video().snapshot();
+        ShinyNumberDetector shiny_checker(COLOR_YELLOW);
+        shiny_starter = shiny_checker.read(env.console.logger(), screen);
+
+        if (shiny_starter){
+            env.log("Shiny starter detected!");
+            stats.shinystarter++;
+            send_program_status_notification(env, NOTIFICATION_SHINY_STARTER, "Shiny starter found!", screen, true);
+        }else{
+            env.log("Starter is not shiny.");
+            env.log("Soft resetting.");
+            send_program_status_notification(
+                env, NOTIFICATION_STATUS_UPDATE,
+                "Soft resetting."
+            );
+            stats.errors += soft_reset(env.console, context);
+            stats.resets++;
+            env.update_stats();
+            context.wait_for_all_requests();
+        }
+    }
+
+    //if system set to nintendo switch, have go home when done option?
+
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+}
+
+}
+}
+}
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_StarterReset.h b/SerialPrograms/Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_StarterReset.h
new file mode 100644
index 0000000000..cc4fc2ba86
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_StarterReset.h
@@ -0,0 +1,57 @@
+/*  RS Starter Reset
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonRSE_StarterReset_H
+#define PokemonAutomation_PokemonRSE_StarterReset_H
+
+//#include "Common/Cpp/Options/TimeDurationOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonRSE{
+
+class StarterReset_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    StarterReset_Descriptor();
+    struct Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+class StarterReset : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = StarterReset_Descriptor;
+    StarterReset();
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext &context) override;
+
+    virtual void start_program_border_check(
+        VideoStream& stream,
+        FeedbackType feedback_type
+    ) override{}
+
+private:
+    enum class Target{
+        treecko,
+        torchic,
+        mudkip,
+    };
+    EnumDropdownOption<Target> TARGET;
+
+//    MillisecondsOption STARTER_WAIT0;
+
+    EventNotificationOption NOTIFICATION_SHINY_STARTER;
+    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+}
+}
+}
+#endif
+
+
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonRSE/Programs/TestPrograms/PokemonRSE_SoundListener.cpp b/SerialPrograms/Source/VideoGames/PokemonRSE/Programs/TestPrograms/PokemonRSE_SoundListener.cpp
new file mode 100644
index 0000000000..a3110bf699
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonRSE/Programs/TestPrograms/PokemonRSE_SoundListener.cpp
@@ -0,0 +1,93 @@
+/*  Sound Listener
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <chrono>
+#include <iostream>
+#include "Common/Cpp/Exceptions.h"
+#include "CommonTools/Async/InferenceSession.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonRSE/Inference/Sounds/PokemonRSE_ShinySoundDetector.h"
+#include "PokemonRSE_SoundListener.h"
+
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonRSE{
+    using namespace Pokemon;
+
+
+SoundListener_Descriptor::SoundListener_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonRSE:SoundListener",
+        STRING_POKEMON + " RSE", "Sound Listener",
+        "",
+        "Test sound detectors listening to audio stream.",
+        PanelQualityStanding::DEVELOPER,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::ENABLE_COMMANDS
+    )
+{}
+
+
+SoundListener::SoundListener()
+    : SOUND_TYPE("<b>Which Sound to Detect</b>",
+        {
+            {SoundType::SHINY, "shiny", "Shiny Sound"},
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        SoundType::SHINY
+    )
+    , STOP_ON_DETECTED_SOUND(
+        "<b>Stop on the detected sound</b><br>Stop program when the sound is detected.",
+        LockMode::LOCK_WHILE_RUNNING,
+        false
+    )
+{
+    PA_ADD_OPTION(SOUND_TYPE);
+    PA_ADD_OPTION(STOP_ON_DETECTED_SOUND);
+}
+
+void SoundListener::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    // search_alpha_roar_from_audio_dump();
+    // return;
+
+    std::cout << "Running audio test program." << std::endl;
+
+    std::shared_ptr<AudioInferenceCallback> detector;
+    auto action = [&](float error_coefficient) -> bool{
+        // This lambda function will be called when the sound is detected.
+        // Its return will determine whether to stop the program:
+        return STOP_ON_DETECTED_SOUND;
+    };
+
+    SoundType type = SOUND_TYPE;
+    switch (type){
+    case SoundType::SHINY:
+        detector = std::make_shared<ShinySoundDetector>(env.console, action);
+        break;
+    default:
+        throw InternalProgramError(
+            &env.logger(), PA_CURRENT_FUNCTION,
+            "Not such sound detector as sound type " + std::to_string((size_t)type)
+        );
+        return;
+    }
+
+    InferenceSession session(
+        context, env.console,
+        {{*detector, std::chrono::milliseconds(20)}}
+    );
+    context.wait_until_cancel();
+
+    std::cout << "Audio test program Sound listener finished." << std::endl;
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonRSE/Programs/TestPrograms/PokemonRSE_SoundListener.h b/SerialPrograms/Source/VideoGames/PokemonRSE/Programs/TestPrograms/PokemonRSE_SoundListener.h
new file mode 100644
index 0000000000..77ee318b31
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonRSE/Programs/TestPrograms/PokemonRSE_SoundListener.h
@@ -0,0 +1,54 @@
+/*  Sound Listener
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *  
+ *  Debug program to test all kinds of sound detectors.
+ */
+
+#ifndef PokemonAutomation_PokemonRSE_SoundListener_H
+#define PokemonAutomation_PokemonRSE_SoundListener_H
+
+#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "Common/Cpp/Options/EnumDropdownOption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+//#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+
+namespace PokemonAutomation{ 
+namespace NintendoSwitch{
+namespace PokemonRSE{
+
+
+class SoundListener_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    SoundListener_Descriptor();
+};
+
+
+class SoundListener : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = SoundListener_Descriptor;
+    SoundListener();
+
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+    virtual void start_program_border_check(
+        VideoStream& stream,
+        FeedbackType feedback_type
+    ) override{}
+
+private:
+    enum class SoundType{
+        SHINY,
+    };
+
+    EnumDropdownOption<SoundType> SOUND_TYPE;
+    BooleanCheckBoxOption STOP_ON_DETECTED_SOUND;
+};
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Battles/PokemonSV_BattleBallReader.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Battles/PokemonSV_BattleBallReader.cpp
new file mode 100644
index 0000000000..63c1162cbb
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Battles/PokemonSV_BattleBallReader.cpp
@@ -0,0 +1,76 @@
+/*  Battle Ball Reader
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Tools/ErrorDumper.h"
+#include "CommonTools/Images/ImageFilter.h"
+#include "CommonTools/OCR/OCR_NumberReader.h"
+#include "PokemonSV_BattleBallReader.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+BattleBallReader::BattleBallReader(VideoStream& stream, Language language, Color color)
+    : m_name_reader(PokeballNameReader::instance())
+    , m_language(language)
+    , m_logger(stream.logger())
+    , m_name(stream.overlay(), {0.380, 0.687, 0.240, 0.050}, color)
+    , m_sprite(stream.overlay(), {0.480, 0.764, 0.040, 0.060}, color)
+    , m_quantity(stream.overlay(), {0.480, 0.830, 0.040, 0.035}, color)
+{}
+
+
+std::string BattleBallReader::read_ball(const ImageViewRGB32& screen) const{
+    if (!screen){
+        return "";
+    }
+
+    //  TODO: Use the sprite as well.
+
+    OCR::StringMatchResult name_result;
+    {
+        ImageViewRGB32 cropped = extract_box_reference(screen, m_name);
+        name_result = m_name_reader.read_substring(
+            m_logger, m_language, cropped,
+            {
+                {0xffe0e0e0, 0xffffffff},
+                {0xffc0c0c0, 0xffffffff},
+                {0xffa0a0a0, 0xffffffff},
+                {0xff808080, 0xffffffff},
+            }
+        );
+    }
+    if (name_result.results.size() != 1){
+//        dump_image(m_console, ProgramInfo(), "BattleBallReader-Name", screen);
+        return "";
+    }
+
+    return name_result.results.begin()->second.token;
+}
+
+uint16_t BattleBallReader::read_quantity(const ImageViewRGB32& screen) const{
+#if 0
+    ImageRGB32 image = to_blackwhite_rgb32_range(
+        extract_box_reference(screen, m_quantity),
+        0xff000000, 0xff7f7f7f, true
+    );
+    int qty = OCR::read_number(m_logger, image);
+#else
+    int qty = OCR::read_number_waterfill(
+        m_logger,
+        extract_box_reference(screen, m_quantity),
+        0xff000000, 0xff7f7f7f
+    );
+    #endif
+    return (uint16_t)std::max(qty, 0);
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Battles/PokemonSV_BattleBallReader.h b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Battles/PokemonSV_BattleBallReader.h
new file mode 100644
index 0000000000..91e5be2a04
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Battles/PokemonSV_BattleBallReader.h
@@ -0,0 +1,47 @@
+/*  Battle Ball Reader
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_BattleBallReader_H
+#define PokemonAutomation_PokemonSV_BattleBallReader_H
+
+#include "Common/Cpp/Color.h"
+#include "CommonFramework/Language.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonFramework/Tools/VideoStream.h"
+#include "CommonTools/VisualDetector.h"
+#include "Pokemon/Inference/Pokemon_PokeballNameReader.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+using namespace Pokemon;
+
+
+
+//  Detect dialog that has the small arrow at bottom to show the next dialog.
+class BattleBallReader{
+public:
+    BattleBallReader(VideoStream& stream, Language language, Color color = COLOR_RED);
+
+    std::string read_ball(const ImageViewRGB32& screen) const;
+    uint16_t read_quantity(const ImageViewRGB32& screen) const;
+
+protected:
+    const PokeballNameReader& m_name_reader;
+    Language m_language;
+    Logger& m_logger;
+    OverlayBoxScope m_name;
+    OverlayBoxScope m_sprite;
+    OverlayBoxScope m_quantity;
+};
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/PokemonSV/Inference/Battles/PokemonSV_EncounterWatcher.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Battles/PokemonSV_EncounterWatcher.cpp
similarity index 81%
rename from SerialPrograms/Source/PokemonSV/Inference/Battles/PokemonSV_EncounterWatcher.cpp
rename to SerialPrograms/Source/VideoGames/PokemonSV/Inference/Battles/PokemonSV_EncounterWatcher.cpp
index a858948315..b907d42fd9 100644
--- a/SerialPrograms/Source/PokemonSV/Inference/Battles/PokemonSV_EncounterWatcher.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Battles/PokemonSV_EncounterWatcher.cpp
@@ -1,10 +1,10 @@
 /*  Encounter Watcher
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include "CommonFramework/ImageTools/ImageFilter.h"
+#include "CommonTools/Images/ImageFilter.h"
 #include "PokemonSV_EncounterWatcher.h"
 
 namespace PokemonAutomation{
@@ -12,11 +12,11 @@ namespace NintendoSwitch{
 namespace PokemonSV{
 
 
-EncounterWatcher::EncounterWatcher(ConsoleHandle& console, Color color)
+EncounterWatcher::EncounterWatcher(VideoStream& stream, Color color)
     : VisualInferenceCallback("EncounterWatcher (video)")
     , AudioInferenceCallback("EncounterWatcher (audio)")
     , m_battle_menu(color)
-    , m_shiny_sound(console, [](float){ return true; })
+    , m_shiny_sound(stream.logger(), [](float){ return true; })
 {}
 void EncounterWatcher::make_overlays(VideoOverlaySet& items) const{
     m_battle_menu.make_overlays(items);
@@ -27,7 +27,7 @@ bool EncounterWatcher::process_frame(const VideoSnapshot& frame){
     }
 
     {
-        std::lock_guard<std::mutex> lg(m_lock);
+        std::lock_guard<Mutex> lg(m_lock);
         //  Clear old history.
         while (!m_history.empty() && m_history.front().timestamp + std::chrono::milliseconds(2000) < frame.timestamp){
             m_history.pop_front();
@@ -53,8 +53,8 @@ bool EncounterWatcher::process_spectrums(
 
     WallClock threshold = current_time() - std::chrono::seconds(1);
 
-    //  Find the brighest frame.
-    std::lock_guard<std::mutex> lg(m_lock);
+    //  Find the brightest frame.
+    std::lock_guard<Mutex> lg(m_lock);
 
     double best_bright_portion = 0;
     for (const VideoSnapshot& frame : m_history){
diff --git a/SerialPrograms/Source/PokemonSV/Inference/Battles/PokemonSV_EncounterWatcher.h b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Battles/PokemonSV_EncounterWatcher.h
similarity index 82%
rename from SerialPrograms/Source/PokemonSV/Inference/Battles/PokemonSV_EncounterWatcher.h
rename to SerialPrograms/Source/VideoGames/PokemonSV/Inference/Battles/PokemonSV_EncounterWatcher.h
index acdf210b2c..26fb8e6160 100644
--- a/SerialPrograms/Source/PokemonSV/Inference/Battles/PokemonSV_EncounterWatcher.h
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Battles/PokemonSV_EncounterWatcher.h
@@ -1,6 +1,6 @@
 /*  Encounter Watcher
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -8,21 +8,22 @@
 #define PokemonAutomation_PokemonSV_EncounterWatcher_H
 
 #include <deque>
-#include <mutex>
 #include "Common/Cpp/Color.h"
+#include "Common/Cpp/Concurrency/Mutex.h"
 #include "CommonFramework/VideoPipeline/VideoFeed.h"
 #include "PokemonSV_NormalBattleMenus.h"
 #include "PokemonSV_ShinySoundDetector.h"
 
 namespace PokemonAutomation{
-    class ConsoleHandle;
 namespace NintendoSwitch{
 namespace PokemonSV{
 
-
+//
+//  This class is now deprecated.
+//
 class EncounterWatcher : public VisualInferenceCallback, public AudioInferenceCallback{
 public:
-    EncounterWatcher(ConsoleHandle& console, Color color = COLOR_RED);
+    EncounterWatcher(VideoStream& stream, Color color = COLOR_RED);
 
     const NormalBattleMenuDetector& battle_menu_detector() const{ return m_battle_menu; }
 
@@ -47,7 +48,7 @@ class EncounterWatcher : public VisualInferenceCallback, public AudioInferenceCa
     NormalBattleMenuWatcher m_battle_menu;
     ShinySoundDetector m_shiny_sound;
 
-    std::mutex m_lock;
+    Mutex m_lock;
     std::deque<VideoSnapshot> m_history;
     VideoSnapshot m_best_snapshot;
 };
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Battles/PokemonSV_NormalBattleMenus.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Battles/PokemonSV_NormalBattleMenus.cpp
new file mode 100644
index 0000000000..5dcdfd8404
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Battles/PokemonSV_NormalBattleMenus.cpp
@@ -0,0 +1,448 @@
+/*  Normal Battle Menus
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonFramework/Tools/ErrorDumper.h"
+#include "CommonFramework/Tools/DebugDumper.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "Tests/ImageUnitTest.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "Pokemon/Inference/Pokemon_NameReader.h"
+#include "PokemonSV_NormalBattleMenus.h"
+
+
+// #include <iostream>
+// using std::cout;
+// using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+NormalBattleMenuDetector::NormalBattleMenuDetector(Color color)
+    : m_status_button(color, WhiteButton::ButtonY, {0.35, 0.90, 0.30, 0.08})
+    , m_arrow(color, GradientArrowType::RIGHT, {0.75, 0.62, 0.05, 0.35})
+{}
+void NormalBattleMenuDetector::make_overlays(VideoOverlaySet& items) const{
+    m_status_button.make_overlays(items);
+    m_arrow.make_overlays(items);
+}
+bool NormalBattleMenuDetector::detect(const ImageViewRGB32& screen){
+    if (!m_status_button.detect(screen)){
+//        cout << "status button" << endl;
+        return false;
+    }
+    if (!m_arrow.detect(screen)){
+        return false;
+    }
+    return true;
+}
+int8_t NormalBattleMenuDetector::detect_slot(const ImageViewRGB32& screen){
+    if (!m_status_button.detect(screen)){
+//        cout << "status button" << endl;
+        return -1;
+    }
+
+    ImageFloatBox box;
+    if (!m_arrow.detect(box, screen)){
+        return -1;
+    }
+
+    double y = box.y + box.height * 0.5;
+    double slot = (y - 0.67963) / 0.0814815;
+//    cout << "slot = " << slot << endl;
+    return (int8_t)(slot + 0.5);
+}
+bool NormalBattleMenuDetector::move_to_slot(VideoStream& stream, ProControllerContext& context, uint8_t slot){
+    if (slot > 3){
+        return false;
+    }
+    for (size_t attempts = 0;; attempts++){
+        if (attempts > 10){
+            stream.log("NormalBattleMenuDetector::move_to_slot(): Failed to move slot after 10 attempts.", COLOR_RED);
+            return false;
+        }
+
+        context.wait_for_all_requests();
+
+        VideoSnapshot screen = stream.video().snapshot();
+        int8_t current_slot = detect_slot(screen);
+        if (current_slot < 0 || current_slot > 3){
+            stream.log("NormalBattleMenuDetector::move_to_slot(): Unable to detect slot.", COLOR_RED);
+            context.wait_for(std::chrono::milliseconds(500));
+            continue;
+//            static int c = 0;
+//            screen->save("bad-" + std::to_string(c++) + ".png");
+//            return false;
+        }
+
+        uint8_t diff = (4 + slot - (uint8_t)current_slot) % 4;
+        switch (diff){
+        case 0:{
+//            static int c = 0;
+//            screen->save("good-" + std::to_string(c++) + ".png");
+            return true;
+        }
+        case 1:
+            pbf_press_dpad(context, DPAD_DOWN, 160ms, 240ms);
+            continue;
+        case 2:
+            pbf_press_dpad(context, DPAD_DOWN, 160ms, 240ms);
+            continue;
+        case 3:
+            pbf_press_dpad(context, DPAD_UP, 160ms, 240ms);
+            continue;
+        }
+    }
+}
+
+
+
+std::set<std::string> read_singles_opponent(
+    const ProgramInfo& info, VideoStream& stream, ProControllerContext& context,
+    Language language
+){
+    VideoOverlaySet overlay = stream.overlay();
+
+    ImageFloatBox name(0.422, 0.131, 0.120, 0.050);
+    overlay.add(COLOR_RED, name);
+
+    std::set<std::string> slugs;
+
+    bool status_opened = false;
+    bool battle_menu_seen = false;
+    for (size_t c = 0; c < 10; c++){
+        NormalBattleMenuWatcher battle_menu(COLOR_YELLOW);
+        GradientArrowWatcher arrow(COLOR_BLUE, GradientArrowType::DOWN, {0.4, 0.1, 0.2, 0.5});
+        context.wait_for_all_requests();
+        int ret = wait_until(
+            stream, context, std::chrono::seconds(5),
+            {battle_menu, arrow}
+        );
+        context.wait_for(std::chrono::milliseconds(500));
+
+        switch (ret){
+        case 0:
+            if (status_opened){
+                stream.log("Detected battle menu...");
+                return slugs;
+            }
+            stream.log("Detected battle menu. Opening status...");
+            battle_menu_seen = true;
+            pbf_press_button(context, BUTTON_Y, 160ms, 840ms);
+            continue;
+
+        case 1:
+            if (!battle_menu_seen){
+                stream.log("Detected status menu before pressing Y...", COLOR_RED);
+//                dump_image(stream, info, "BattleMenuNotSeen", arrow.last_detected());
+                continue;
+            }
+            if (status_opened){
+                stream.log("Detected status menu (again)...", COLOR_RED);
+            }else{
+                stream.log("Detected status menu. Reading name...");
+                status_opened = true;
+                VideoSnapshot screen = stream.video().snapshot();
+                OCR::StringMatchResult result = Pokemon::PokemonNameReader::instance().read_substring(
+                    stream.logger(), language,
+                    extract_box_reference(screen, name),
+                    OCR::WHITE_TEXT_FILTERS()
+                );
+                for (auto& item : result.results){
+                    slugs.insert(std::move(item.second.token));
+                }
+                if (slugs.empty()){
+                    dump_image(stream.logger(), info, "UnableToReadName", screen);
+                }
+            }
+
+            pbf_mash_button(context, BUTTON_B, 1000ms);
+            continue;
+
+        default:
+            stream.log("No recognized state. Mashing B...", COLOR_RED);
+            pbf_mash_button(context, BUTTON_B, 2000ms);
+        }
+    }
+
+    OperationFailedExceptionWithScreenshot::fire(
+        ErrorReportMode::SEND_ERROR_REPORT,
+        "Unable to open status menu to read opponent name.",
+        stream
+    );
+}
+
+
+
+
+
+MoveSelectDetector::MoveSelectDetector(Color color)
+    : m_info_button(color, WhiteButton::ButtonY, {0.35, 0.90, 0.30, 0.08})
+    , m_arrow(color, GradientArrowType::RIGHT, {0.705, 0.550, 0.050, 0.410})
+{}
+void MoveSelectDetector::make_overlays(VideoOverlaySet& items) const{
+    m_info_button.make_overlays(items);
+    m_arrow.make_overlays(items);
+}
+bool MoveSelectDetector::detect(const ImageViewRGB32& screen){
+    if (!m_info_button.detect(screen)){
+//        cout << "status" << endl;
+        return false;
+    }
+    if (!m_arrow.detect(screen)){
+//        cout << "arrow" << endl;
+        return false;
+    }
+    return true;
+}
+int8_t MoveSelectDetector::detect_slot(const ImageViewRGB32& screen){
+    if (!m_info_button.detect(screen)){
+//        cout << "status" << endl;
+        return false;
+    }
+
+    ImageFloatBox box;
+    if (!m_arrow.detect(box, screen)){
+//        cout << "arrow" << endl;
+        return false;
+    }
+
+    double y = box.y + box.height * 0.5;
+    y = (y - 0.602778) / 0.103549;
+//    cout << "y = " << y << endl;
+
+    return (int8_t)(y + 0.5);
+}
+bool MoveSelectDetector::move_to_slot(VideoStream& stream, ProControllerContext& context, uint8_t slot){
+    if (slot > 3){
+        return false;
+    }
+    for (size_t attempts = 0;; attempts++){
+        context.wait_for_all_requests();
+        VideoSnapshot screen = stream.video().snapshot();
+        int8_t current_slot = detect_slot(screen);
+        if (current_slot < 0 || current_slot > 3){
+            stream.log("MoveSelectDetector::move_to_slot(): Unable to detect slot.", COLOR_RED);
+            return false;
+        }
+        if (attempts > 10){
+            stream.log("MoveSelectDetector::move_to_slot(): Failed to move slot after 10 attempts.", COLOR_RED);
+            return false;
+        }
+
+        uint8_t diff = (4 + slot - (uint8_t)current_slot) % 4;
+        switch (diff){
+        case 0:
+            return true;
+        case 1:
+            pbf_press_dpad(context, DPAD_DOWN, 160ms, 240ms);
+            continue;
+        case 2:
+            pbf_press_dpad(context, DPAD_DOWN, 160ms, 240ms);
+            pbf_press_dpad(context, DPAD_DOWN, 160ms, 240ms);
+            continue;
+        case 3:
+            pbf_press_dpad(context, DPAD_UP, 160ms, 240ms);
+            continue;
+        }
+    }
+}
+
+
+
+
+TerastallizingDetector::TerastallizingDetector(Color color)
+    : m_color(color)
+    , m_box(0.62, 0.75, 0.03, 0.06)
+{}
+void TerastallizingDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_box);
+}
+bool TerastallizingDetector::detect(const ImageViewRGB32& screen){
+    ImageStats box = image_stats(extract_box_reference(screen, m_box));
+    // dump_debug_image(
+    //             global_logger_command_line(), 
+    //             "Test/TeraDetector", 
+    //             "box", 
+    //             extract_box_reference(screen, m_box));
+    // cout << box.average.sum() << endl;
+
+    return box.average.sum() > 600;
+}
+
+
+
+
+SwapMenuDetector::SwapMenuDetector(Color color)
+    : m_arrow(color, GradientArrowType::RIGHT, { 0.02, 0.10, 0.05, 0.90 })
+{}
+void SwapMenuDetector::make_overlays(VideoOverlaySet& items) const{
+    m_arrow.make_overlays(items);
+}
+bool SwapMenuDetector::detect(const ImageViewRGB32& screen){
+    if (!m_arrow.detect(screen)){
+        return false;
+    }
+    return true;
+}
+int8_t SwapMenuDetector::detect_slot(const ImageViewRGB32& screen) const{
+    ImageFloatBox box;
+    if (!m_arrow.detect(box, screen)){
+        return -1;
+    }
+
+    int slot = (int)((box.y - 0.172222) / 0.116482 + 0.5);
+    if (slot < 0){
+        slot = 0;
+    }
+    //cout << "slot = " << slot << endl;
+    return (int8_t)slot;
+}
+bool SwapMenuDetector::move_to_slot(VideoStream& stream, ProControllerContext& context, uint8_t slot) const{
+    if (slot > 5){
+        return false;
+    }
+    for (size_t attempts = 0;; attempts++){
+        context.wait_for_all_requests();
+        VideoSnapshot screen = stream.video().snapshot();
+        int8_t current_slot = detect_slot(screen);
+        if (current_slot < 0 || current_slot > 5){
+            stream.log("SwapMenuDetector::move_to_slot(): Unable to detect slot.", COLOR_RED);
+            return false;
+        }
+        if (attempts > 20){
+            stream.log("SwapMenuDetector::move_to_slot(): Failed to move slot after 20 attempts.", COLOR_RED);
+            return false;
+        }
+
+        uint8_t diff = (6 + slot - (uint8_t)current_slot) % 6;
+        switch (diff){
+        case 0:
+            return true;
+        case 1:
+            pbf_press_dpad(context, DPAD_DOWN, 160ms, 240ms);
+            continue;
+        case 2:
+            pbf_press_dpad(context, DPAD_DOWN, 160ms, 240ms);
+            continue;
+        case 3:
+            pbf_press_dpad(context, DPAD_DOWN, 160ms, 240ms);
+            continue;
+        case 4:
+            pbf_press_dpad(context, DPAD_DOWN, 160ms, 240ms);
+            continue;
+        case 5:
+            pbf_press_dpad(context, DPAD_DOWN, 160ms, 240ms);
+            continue;
+        }
+    }
+}
+
+WipeoutDetector::WipeoutDetector(Color color)
+    : m_blackscreen(COLOR_RED, {0.1, 0.1, 0.8, 0.6})
+    , m_dialog(color, true, DialogType::DIALOG_WHITE)
+    , m_arrow_detector(COLOR_BLUE, {0.710, 0.850, 0.030, 0.042})
+{}
+void WipeoutDetector::make_overlays(VideoOverlaySet& items) const{
+    m_blackscreen.make_overlays(items);
+    m_dialog.make_overlays(items);
+    m_arrow_detector.make_overlays(items);
+}
+bool WipeoutDetector::detect(const ImageViewRGB32& screen){
+    if (!m_blackscreen.detect(screen)){
+        return false;
+    }
+    
+    if(!m_dialog.detect(screen)){
+        return false;
+    }
+
+    return m_arrow_detector.detect(screen);
+}
+
+
+
+
+
+
+
+
+
+
+class Test_SwapMenuDetector : public ImageUnitTest{
+public:
+    Test_SwapMenuDetector(
+        const std::string& image,
+        bool expected
+    )
+        : ImageUnitTest("PokemonSV::SwapMenuDetector - " + image, {image})
+        , m_expected(expected)
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        SwapMenuDetector detector(COLOR_RED);
+        const ImageRGB32& image = images[0];
+        return detector.detect(image) == m_expected;
+    };
+
+private:
+    bool m_expected;
+};
+
+class Test_TerastallizingDetector : public ImageUnitTest{
+public:
+    Test_TerastallizingDetector(
+        const std::string& image,
+        bool expected
+    )
+        : ImageUnitTest("PokemonSV::TerastallizingDetector - " + image, {image})
+        , m_expected(expected)
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        TerastallizingDetector detector(COLOR_RED);
+        const ImageRGB32& image = images[0];
+        return detector.detect(image) == m_expected;
+    };
+
+private:
+    bool m_expected;
+};
+
+
+
+
+void add_tests_NormalBattleMenus(UnitTestDatabase& database){
+    database.add<Test_TerastallizingDetector>("PokemonSV/TerastallizingDetector/720p_tera_eleTerrainOverlap2_True.png", true);
+    database.add<Test_TerastallizingDetector>("PokemonSV/TerastallizingDetector/French_Already_Did_False.jpg", false);
+    database.add<Test_TerastallizingDetector>("PokemonSV/TerastallizingDetector/French_Not_Ready_False.jpg", false);
+    database.add<Test_TerastallizingDetector>("PokemonSV/TerastallizingDetector/French_True.jpg", true);
+    database.add<Test_TerastallizingDetector>("PokemonSV/TerastallizingDetector/tera_eleTerrainOverlap_Sandstorm_True.png", true);
+    database.add<Test_TerastallizingDetector>("PokemonSV/TerastallizingDetector/tera_eleTerrainOverlap1_False.png", false);
+    database.add<Test_TerastallizingDetector>("PokemonSV/TerastallizingDetector/tera_eleTerrainOverlap2_False.png", false);
+}
+
+
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Battles/PokemonSV_NormalBattleMenus.h b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Battles/PokemonSV_NormalBattleMenus.h
new file mode 100644
index 0000000000..b7806106fa
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Battles/PokemonSV_NormalBattleMenus.h
@@ -0,0 +1,150 @@
+/*  Normal Battle Menus
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_NormalBattleMenus_H
+#define PokemonAutomation_PokemonSV_NormalBattleMenus_H
+
+#include "Common/Cpp/TestRunners/UnitTest.h"
+#include "CommonFramework/Language.h"
+#include "CommonFramework/Tools/VideoStream.h"
+#include "CommonTools/VisualDetector.h"
+#include "CommonTools/VisualDetectors/BlackScreenDetector.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+#include "VideoGames/PokemonSV/Inference/PokemonSV_WhiteButtonDetector.h"
+#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_GradientArrowDetector.h"
+#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h"
+#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogArrowDetector.h"
+
+
+namespace PokemonAutomation{
+    struct ProgramInfo;
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+class NormalBattleMenuDetector : public StaticScreenDetector{
+public:
+    NormalBattleMenuDetector(Color color);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+    //  Returns -1 if not found.
+    int8_t detect_slot(const ImageViewRGB32& screen);
+    bool move_to_slot(VideoStream& stream, ProControllerContext& context, uint8_t slot);
+
+private:
+    WhiteButtonDetector m_status_button;
+    GradientArrowDetector m_arrow;
+};
+class NormalBattleMenuWatcher : public DetectorToFinder<NormalBattleMenuDetector>{
+public:
+    NormalBattleMenuWatcher(Color color)
+        : DetectorToFinder("NormalBattleMenuWatcher", std::chrono::milliseconds(250), color)
+    {}
+};
+
+std::set<std::string> read_singles_opponent(
+    const ProgramInfo& info, VideoStream& stream, ProControllerContext& context,
+    Language language
+);
+
+
+
+class MoveSelectDetector : public StaticScreenDetector{
+public:
+    MoveSelectDetector(Color color);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+    //  Returns -1 if not found.
+    int8_t detect_slot(const ImageViewRGB32& screen);
+    bool move_to_slot(VideoStream& stream, ProControllerContext& context, uint8_t slot);
+
+private:
+    WhiteButtonDetector m_info_button;
+    GradientArrowDetector m_arrow;
+};
+class MoveSelectWatcher : public DetectorToFinder<MoveSelectDetector>{
+public:
+    MoveSelectWatcher(Color color)
+        : DetectorToFinder("MoveSelectWatcher", std::chrono::milliseconds(250), color)
+    {}
+};
+
+
+
+class TerastallizingDetector : public StaticScreenDetector{
+public:
+    TerastallizingDetector(Color color);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    Color m_color;
+    ImageFloatBox m_box;
+};
+
+
+
+class SwapMenuDetector : public StaticScreenDetector{
+public:
+    SwapMenuDetector(Color color);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+    //  Returns -1 if not found.
+    int8_t detect_slot(const ImageViewRGB32& screen) const;
+    bool move_to_slot(VideoStream& stream, ProControllerContext& context, uint8_t slot) const;
+
+private:
+    GradientArrowDetector m_arrow;
+};
+class SwapMenuWatcher : public DetectorToFinder<SwapMenuDetector>{
+public:
+    SwapMenuWatcher(Color color)
+        : DetectorToFinder("SwapMenuWatcher", std::chrono::milliseconds(250), color)
+    {}
+};
+
+class WipeoutDetector : public StaticScreenDetector{
+public:
+    WipeoutDetector(Color color = COLOR_CYAN);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+
+    // return true if detects a black screen, black dialog box, and dialog arrow.
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    BlackScreenDetector m_blackscreen;
+    DialogBoxDetector m_dialog;
+    DialogArrowDetector m_arrow_detector;
+};
+class WipeoutWatcher : public DetectorToFinder<WipeoutDetector>{
+public:
+    WipeoutWatcher(Color color = COLOR_CYAN)
+        : DetectorToFinder("WipeoutWatcher", std::chrono::milliseconds(250), color)
+    {}
+};
+
+
+
+
+
+
+void add_tests_NormalBattleMenus(UnitTestDatabase& database);
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/PokemonSV/Inference/Battles/PokemonSV_PostCatchDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Battles/PokemonSV_PostCatchDetector.cpp
similarity index 86%
rename from SerialPrograms/Source/PokemonSV/Inference/Battles/PokemonSV_PostCatchDetector.cpp
rename to SerialPrograms/Source/VideoGames/PokemonSV/Inference/Battles/PokemonSV_PostCatchDetector.cpp
index 4cd9c85660..5c4d6d89f6 100644
--- a/SerialPrograms/Source/PokemonSV/Inference/Battles/PokemonSV_PostCatchDetector.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Battles/PokemonSV_PostCatchDetector.cpp
@@ -1,11 +1,11 @@
 /*  Post-Catch Detector
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include "CommonFramework/ImageTools/SolidColorTest.h"
 #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Images/SolidColorTest.h"
 #include "PokemonSV_PostCatchDetector.h"
 
 namespace PokemonAutomation{
@@ -29,7 +29,7 @@ void AddToPartyDetector::make_overlays(VideoOverlaySet& items) const{
     items.add(m_color, m_bottom_right);
     m_dialog.make_overlays(items);
 }
-bool AddToPartyDetector::detect(const ImageViewRGB32& screen) const{
+bool AddToPartyDetector::detect(const ImageViewRGB32& screen){
     ImageStats top_left = image_stats(extract_box_reference(screen, m_top_left));
 //    cout << top_left.average << top_left.stddev << endl;
     if (!is_white(top_left)){
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Battles/PokemonSV_PostCatchDetector.h b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Battles/PokemonSV_PostCatchDetector.h
new file mode 100644
index 0000000000..124bacf0ca
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Battles/PokemonSV_PostCatchDetector.h
@@ -0,0 +1,51 @@
+/*  Post-Catch Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_PostCatchDetector_H
+#define PokemonAutomation_PokemonSV_PostCatchDetector_H
+
+#include "Common/Cpp/Color.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+class AddToPartyDetector : public StaticScreenDetector{
+public:
+    AddToPartyDetector(Color color = COLOR_RED);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+protected:
+    Color m_color;
+    ImageFloatBox m_top_left;
+    ImageFloatBox m_top_right;
+    ImageFloatBox m_bottom_left;
+    ImageFloatBox m_bottom_right;
+    PromptDialogDetector m_dialog;
+};
+class AddToPartyWatcher : public DetectorToFinder<AddToPartyDetector>{
+public:
+    AddToPartyWatcher(Color color = COLOR_RED)
+         : DetectorToFinder("AddToPartyFinder", std::chrono::milliseconds(250), color)
+    {}
+};
+
+
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Battles/PokemonSV_ShinySoundDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Battles/PokemonSV_ShinySoundDetector.cpp
new file mode 100644
index 0000000000..d09365a3d6
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Battles/PokemonSV_ShinySoundDetector.cpp
@@ -0,0 +1,43 @@
+/*  Shiny Sound Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonTools/Audio/SpectrogramMatcher.h"
+#include "CommonTools/Audio/AudioTemplateCache.h"
+#include "VideoGames/PokemonSV/PokemonSV_Settings.h"
+#include "PokemonSV_ShinySoundDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+ShinySoundDetector::ShinySoundDetector(Logger& logger, DetectedCallback detected_callback)
+    // Use a yellow as the detection color because the shiny animation is yellow.
+    : AudioPerSpectrumDetectorBase(
+        logger,
+        "ShinySoundDetector",
+        "Shiny sound",
+        COLOR_YELLOW,
+        detected_callback
+    )
+{}
+float ShinySoundDetector::get_score_threshold() const{
+    return (float)GameSettings::instance().SHINY_SOUND_THRESHOLD2;
+}
+std::unique_ptr<SpectrogramMatcher> ShinySoundDetector::build_spectrogram_matcher(size_t sample_rate){
+    return std::make_unique<SpectrogramMatcher>(
+        "Shiny Sound",
+        AudioTemplateCache::instance().get_throw("PokemonSV/ShinySound", sample_rate),
+        SpectrogramMatcher::Mode::SPIKE_CONV, sample_rate,
+        GameSettings::instance().SHINY_SOUND_LOW_FREQUENCY
+    );
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Battles/PokemonSV_ShinySoundDetector.h b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Battles/PokemonSV_ShinySoundDetector.h
new file mode 100644
index 0000000000..8edbf1a9e0
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Battles/PokemonSV_ShinySoundDetector.h
@@ -0,0 +1,33 @@
+/*  Shiny Sound Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_ShinySoundDetector_H
+#define PokemonAutomation_PokemonSV_ShinySoundDetector_H
+
+#include "CommonTools/Audio/AudioPerSpectrumDetectorBase.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+class ShinySoundDetector : public AudioPerSpectrumDetectorBase{
+public:
+    ShinySoundDetector(Logger& logger, DetectedCallback detected_callback);
+
+    virtual float get_score_threshold() const override;
+
+protected:
+    virtual std::unique_ptr<SpectrogramMatcher> build_spectrogram_matcher(size_t sample_rate) override;
+};
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Battles/PokemonSV_StartBattleYellowBar.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Battles/PokemonSV_StartBattleYellowBar.cpp
new file mode 100644
index 0000000000..5415e39a4b
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Battles/PokemonSV_StartBattleYellowBar.cpp
@@ -0,0 +1,84 @@
+/*  Start Battle Yellow Bar
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Images/SolidColorTest.h"
+#include "PokemonSV_StartBattleYellowBar.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+StartBattleYellowBarDetector::StartBattleYellowBarDetector(Color color)
+    : m_color(color)
+    , m_top(0.100000, 0.001000, 0.800000, 0.004000)
+    , m_bot(0.100000, 0.995000, 0.800000, 0.004000)
+    , m_mid(0.1, 0.1, 0.8, 0.8)
+{}
+void StartBattleYellowBarDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_top);
+    items.add(m_color, m_bot);
+}
+
+bool StartBattleYellowBarDetector::detect(const ImageViewRGB32& screen){
+    ImageStats top = image_stats(extract_box_reference(screen, m_top));
+    ImageStats bot = image_stats(extract_box_reference(screen, m_bot));
+//    cout << "top = " << top.average << top.stddev << endl;
+//    cout << "bot = " << bot.average << top.stddev << endl;
+    if (!is_solid(top, {0.554825, 0.445175, 0.})){
+        return false;
+    }
+    if (!is_solid(bot, {0.554825, 0.445175, 0.})){
+        return false;
+    }
+
+    if (euclidean_distance(top.average, bot.average) > 10){
+        return false;
+    }
+
+    ImageStats mid = image_stats(extract_box_reference(screen, m_mid));
+//    cout << "mid = " << mid.average << mid.stddev << endl;
+    if (mid.stddev.sum() < 10){
+        return false;
+    }
+
+    return true;
+}
+
+
+
+
+void StartBattleYellowBarWatcher::make_overlays(VideoOverlaySet& items) const{
+    StartBattleYellowBarDetector::make_overlays(items);
+}
+bool StartBattleYellowBarWatcher::process_frame(const ImageViewRGB32& frame, WallClock timestamp){
+    if (!detect(frame)){
+        m_start_detection = WallClock::min();
+        return false;
+    }
+
+    //  Not long enough.
+    if (m_start_detection + std::chrono::milliseconds(100) > timestamp){
+        return false;
+    }
+
+    m_last_detected = timestamp;
+//    cout << "Detected yellow bar." << endl;
+    return false;
+}
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Battles/PokemonSV_StartBattleYellowBar.h b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Battles/PokemonSV_StartBattleYellowBar.h
new file mode 100644
index 0000000000..82f9a77cd1
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Battles/PokemonSV_StartBattleYellowBar.h
@@ -0,0 +1,61 @@
+/*  Start Battle Yellow Bar
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_StartBattleYellowBar_H
+#define PokemonAutomation_PokemonSV_StartBattleYellowBar_H
+
+#include <atomic>
+#include "Common/Cpp/Color.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonTools/VisualDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+class StartBattleYellowBarDetector : public StaticScreenDetector{
+public:
+    StartBattleYellowBarDetector(Color color);
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    Color m_color;
+    ImageFloatBox m_top;
+    ImageFloatBox m_bot;
+    ImageFloatBox m_mid;
+};
+class StartBattleYellowBarWatcher : public StartBattleYellowBarDetector, public VisualInferenceCallback{
+public:
+    StartBattleYellowBarWatcher(Color color)
+        : StartBattleYellowBarDetector(color)
+        , VisualInferenceCallback("StartBattleYellowBarWatcher")
+        , m_start_detection(WallClock::min())
+        , m_last_detected(WallClock::min())
+    {}
+
+    WallClock last_detected() const{
+        return m_last_detected.load(std::memory_order_relaxed);
+    }
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override;
+
+private:
+    WallClock m_start_detection;
+    std::atomic<WallClock> m_last_detected;
+};
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Battles/PokemonSV_TeraBattleMenus.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Battles/PokemonSV_TeraBattleMenus.cpp
new file mode 100644
index 0000000000..4495c7c44a
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Battles/PokemonSV_TeraBattleMenus.cpp
@@ -0,0 +1,354 @@
+/*  Tera Battle Menus
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonTools/Images/SolidColorTest.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "PokemonSV_TeraBattleMenus.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+TeraBattleMenuDetector::TeraBattleMenuDetector(Color color)
+    : m_callouts_button(color, WhiteButton::ButtonMinus, {0.35, 0.87, 0.30, 0.05})
+    , m_arrow(color, GradientArrowType::RIGHT, {0.75, 0.62, 0.05, 0.35})
+{}
+void TeraBattleMenuDetector::make_overlays(VideoOverlaySet& items) const{
+    m_callouts_button.make_overlays(items);
+    m_arrow.make_overlays(items);
+}
+bool TeraBattleMenuDetector::detect(const ImageViewRGB32& screen){
+    if (!m_callouts_button.detect(screen)){
+//        cout << "status button" << endl;
+        return false;
+    }
+    if (!m_arrow.detect(screen)){
+//        cout << "arrow" << endl;
+        return false;
+    }
+    return true;
+}
+int8_t TeraBattleMenuDetector::detect_slot(const ImageViewRGB32& screen){
+    if (!m_callouts_button.detect(screen)){
+//        cout << "status button" << endl;
+        return -1;
+    }
+
+    ImageFloatBox box;
+    if (!m_arrow.detect(box, screen)){
+//        cout << "arrow" << endl;
+//        screen.save("test.png");
+        return -1;
+    }
+
+    double y = box.y + box.height * 0.5;
+    double slot = (y - 0.761111) / 0.0814815;
+//    cout << "slot = " << slot << endl;
+    return (int8_t)(slot + 0.5);
+}
+bool TeraBattleMenuDetector::move_to_slot(VideoStream& stream, ProControllerContext& context, uint8_t slot){
+    if (slot > 2){
+        return false;
+    }
+    for (size_t attempts = 0;; attempts++){
+        context.wait_for_all_requests();
+        VideoSnapshot screen = stream.video().snapshot();
+        int8_t current_slot = detect_slot(screen);
+        if (current_slot < 0 || current_slot > 2){
+            stream.log("TeraBattleMenuDetector::move_to_slot(): Unable to detect slot.", COLOR_RED);
+            return false;
+        }
+        if (attempts > 10){
+            stream.log("TeraBattleMenuDetector::move_to_slot(): Failed to move slot after 10 attempts.", COLOR_RED);
+            return false;
+        }
+
+        uint8_t diff = (3 + slot - (uint8_t)current_slot) % 3;
+        switch (diff){
+        case 0:
+            return true;
+        case 1:
+            pbf_press_dpad(context, DPAD_DOWN, 160ms, 240ms);
+            continue;
+        case 2:
+            pbf_press_dpad(context, DPAD_UP, 160ms, 240ms);
+            continue;
+        }
+    }
+}
+
+
+
+
+
+CheerSelectDetector::CheerSelectDetector(Color color)
+    : m_info_button(color, WhiteButton::ButtonY, {0.35, 0.90, 0.30, 0.08})
+    , m_arrow(color, GradientArrowType::RIGHT, {0.705, 0.710, 0.050, 0.260})
+{}
+void CheerSelectDetector::make_overlays(VideoOverlaySet& items) const{
+    m_info_button.make_overlays(items);
+    m_arrow.make_overlays(items);
+}
+bool CheerSelectDetector::detect(const ImageViewRGB32& screen){
+    if (m_info_button.detect(screen)){
+//        cout << "status" << endl;
+        return false;
+    }
+    if (!m_arrow.detect(screen)){
+//        cout << "arrow" << endl;
+        return false;
+    }
+    return true;
+}
+int8_t CheerSelectDetector::detect_slot(const ImageViewRGB32& screen){
+    if (m_info_button.detect(screen)){
+//        cout << "status" << endl;
+        return false;
+    }
+
+    ImageFloatBox box;
+    if (!m_arrow.detect(box, screen)){
+//        cout << "arrow" << endl;
+        return false;
+    }
+
+    double y = box.y + box.height * 0.5;
+    y = (y - 0.758333) / 0.082639;
+//    cout << "y = " << y << endl;
+
+    return (int8_t)(y + 0.5);
+}
+bool CheerSelectDetector::move_to_slot(VideoStream& stream, ProControllerContext& context, uint8_t slot){
+    if (slot > 2){
+        return false;
+    }
+    for (size_t attempts = 0;; attempts++){
+        context.wait_for_all_requests();
+        VideoSnapshot screen = stream.video().snapshot();
+        int8_t current_slot = detect_slot(screen);
+        if (current_slot < 0 || current_slot > 2){
+            stream.log("CheerSelectDetector::move_to_slot(): Unable to detect slot.", COLOR_RED);
+            return false;
+        }
+        if (attempts > 10){
+            stream.log("CheerSelectDetector::move_to_slot(): Failed to move slot after 10 attempts.", COLOR_RED);
+            return false;
+        }
+
+        uint8_t diff = (3 + slot - (uint8_t)current_slot) % 3;
+        switch (diff){
+        case 0:
+            return true;
+        case 1:
+            pbf_press_dpad(context, DPAD_DOWN, 160ms, 240ms);
+            continue;
+        case 2:
+            pbf_press_dpad(context, DPAD_UP, 160ms, 240ms);
+            continue;
+        }
+    }
+}
+
+
+
+
+
+TeraTargetSelectDetector::TeraTargetSelectDetector(Color color)
+    : m_opponent(color, GradientArrowType::DOWN, {0.45, 0.07, 0.10, 0.10})
+    , m_player0(color, GradientArrowType::DOWN, {0.20, 0.46, 0.10, 0.10})
+    , m_player1(color, GradientArrowType::DOWN, {0.37, 0.46, 0.10, 0.10})
+    , m_player2(color, GradientArrowType::DOWN, {0.53, 0.46, 0.10, 0.10})
+    , m_player3(color, GradientArrowType::DOWN, {0.70, 0.46, 0.10, 0.10})
+{}
+void TeraTargetSelectDetector::make_overlays(VideoOverlaySet& items) const{
+    m_opponent.make_overlays(items);
+    m_player0.make_overlays(items);
+    m_player1.make_overlays(items);
+    m_player2.make_overlays(items);
+    m_player3.make_overlays(items);
+}
+bool TeraTargetSelectDetector::detect(const ImageViewRGB32& screen){
+    if (m_opponent.detect(screen)){
+        return true;
+    }
+    if (m_player0.detect(screen)){
+        return true;
+    }
+    if (m_player1.detect(screen)){
+        return true;
+    }
+    if (m_player2.detect(screen)){
+        return true;
+    }
+    if (m_player3.detect(screen)){
+        return true;
+    }
+    return false;
+}
+int8_t TeraTargetSelectDetector::detect_slot(const ImageViewRGB32& screen){
+    if (m_opponent.detect(screen)){
+        return 0;
+    }
+    if (m_player0.detect(screen)){
+        return 1;
+    }
+    if (m_player1.detect(screen)){
+        return 2;
+    }
+    if (m_player2.detect(screen)){
+        return 3;
+    }
+    if (m_player3.detect(screen)){
+        return 4;
+    }
+    return -1;
+}
+bool TeraTargetSelectDetector::move_to_slot(VideoStream& stream, ProControllerContext& context, uint8_t slot){
+    if (slot > 4){
+        return false;
+    }
+    for (size_t attempts = 0;; attempts++){
+        context.wait_for_all_requests();
+        VideoSnapshot screen = stream.video().snapshot();
+        int8_t current_slot = detect_slot(screen);
+        if (current_slot < 0 || current_slot > 4){
+            stream.log("TargetSelectDetector::move_to_slot(): Unable to detect slot.", COLOR_RED);
+            return false;
+        }
+        if (attempts > 10){
+            stream.log("TargetSelectDetector::move_to_slot(): Failed to move slot after 10 attempts.", COLOR_RED);
+            return false;
+        }
+
+        if (current_slot == 0 && slot != 0){
+            pbf_press_dpad(context, DPAD_DOWN, 160ms, 240ms);
+            continue;
+        }
+        if (current_slot != 0 && slot == 0){
+            pbf_press_dpad(context, DPAD_UP, 160ms, 240ms);
+            continue;
+        }
+
+        uint8_t diff = (4 + slot - (uint8_t)current_slot) % 4;
+        switch (diff){
+        case 0:
+            return true;
+        case 1:
+            pbf_press_dpad(context, DPAD_RIGHT, 160ms, 240ms);
+            continue;
+        case 2:
+            pbf_press_dpad(context, DPAD_RIGHT, 160ms, 240ms);
+            pbf_press_dpad(context, DPAD_RIGHT, 160ms, 240ms);
+            continue;
+        case 3:
+            pbf_press_dpad(context, DPAD_LEFT, 160ms, 240ms);
+            continue;
+        }
+    }
+}
+
+
+
+
+
+TeraCatchDetector::TeraCatchDetector(Color color)
+    : m_color(color)
+    , m_callouts_button(color, WhiteButton::ButtonMinus, {0.35, 0.87, 0.30, 0.05})
+{
+    m_button[0] = {0.801, 0.818, 0.005, 0.047};
+    m_button[1] = {0.801, 0.900, 0.005, 0.047};
+    m_box_right[0] = {0.95, 0.810, 0.02, 0.06};
+    m_box_right[1] = {0.95, 0.892, 0.02, 0.06};
+    m_arrow.emplace_back(color, GradientArrowType::RIGHT, ImageFloatBox(0.75, 0.800, 0.08, 0.09));
+    m_arrow.emplace_back(color, GradientArrowType::RIGHT, ImageFloatBox(0.75, 0.878, 0.08, 0.09));
+}
+void TeraCatchDetector::make_overlays(VideoOverlaySet& items) const{
+    for (int c = 0; c < 2; c++){
+        items.add(m_color, m_button[c]);
+        items.add(m_color, m_box_right[c]);
+        m_arrow[c].make_overlays(items);
+    }
+}
+
+bool TeraCatchDetector::detect_slot(const ImageViewRGB32& screen, size_t index){
+    ImageStats button = image_stats(extract_box_reference(screen, m_button[index]));
+//    cout << button.average << button.stddev << endl;
+//    extract_box_reference(screen, m_button).save("button.png");
+
+    ImageStats yellow = image_stats(extract_box_reference(screen, m_box_right[index]));
+//    cout << yellow.average << yellow.stddev << endl;
+//    extract_box_reference(screen, m_slot0_box_right).save("yellow.png");
+
+    bool button_ok = is_solid(button, {0.117281, 0.311767, 0.570951}, 0.20, 20) || is_black(button, 100, 20);
+    bool yellow_ok = is_solid(yellow, {0.554348, 0.445652, 0.}, 0.15, 20);
+    if (!button_ok && !yellow_ok){
+//        cout << "button and yellow bad" << endl;
+        return false;
+    }
+
+    if (!m_arrow[index].detect(screen)){
+//        cout << "arrow bad" << endl;
+        return false;
+    }
+
+    return true;
+}
+bool TeraCatchDetector::detect(const ImageViewRGB32& screen){
+    if (m_callouts_button.detect(screen)){
+        return false;
+    }
+
+    return detect_slot(screen, 0) || detect_slot(screen, 1);
+}
+
+bool TeraCatchDetector::move_to_slot(VideoStream& stream, ProControllerContext& context, uint8_t slot){
+    if (slot > 1){
+        return false;
+    }
+
+    for (size_t attempts = 0; attempts < 10; attempts++){
+        context.wait_for_all_requests();
+        VideoSnapshot screen = stream.video().snapshot();
+
+        if (m_callouts_button.detect(screen)){
+            stream.log("TeraCatchDetector::move_to_slot(): Unable to detect catch buttons.", COLOR_RED);
+            return false;
+        }
+
+        bool slot0 = detect_slot(screen, 0);
+        bool slot1 = detect_slot(screen, 1);
+        if (slot0 == slot1){
+            stream.log("TeraCatchDetector::move_to_slot(): Unable to detect catch buttons.", COLOR_RED);
+            return false;
+        }
+
+        uint8_t current_slot = slot1 ? 1 : 0;
+
+        if (current_slot == slot){
+            return true;
+        }
+
+        pbf_press_dpad(context, DPAD_DOWN, 160ms, 240ms);
+    }
+
+    stream.log("TeraCatchDetector::move_to_slot(): Failed to move slot after 10 attempts.", COLOR_RED);
+    return false;
+}
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Battles/PokemonSV_TeraBattleMenus.h b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Battles/PokemonSV_TeraBattleMenus.h
new file mode 100644
index 0000000000..e8a2d4b33f
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Battles/PokemonSV_TeraBattleMenus.h
@@ -0,0 +1,136 @@
+/*  Tera Battle Menus
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_TeraBattleMenus_H
+#define PokemonAutomation_PokemonSV_TeraBattleMenus_H
+
+#include "CommonFramework/Tools/VideoStream.h"
+#include "CommonTools/VisualDetector.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+#include "VideoGames/PokemonSV/Inference/PokemonSV_WhiteButtonDetector.h"
+#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_GradientArrowDetector.h"
+
+namespace PokemonAutomation{
+    struct ProgramInfo;
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+class TeraBattleMenuDetector : public StaticScreenDetector{
+public:
+    TeraBattleMenuDetector(Color color);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+    //  Returns -1 if not found.
+    int8_t detect_slot(const ImageViewRGB32& screen);
+    bool move_to_slot(VideoStream& stream, ProControllerContext& context, uint8_t slot);
+
+private:
+    WhiteButtonDetector m_callouts_button;
+    GradientArrowDetector m_arrow;
+};
+class TeraBattleMenuWatcher : public DetectorToFinder<TeraBattleMenuDetector>{
+public:
+    TeraBattleMenuWatcher(Color color)
+        : DetectorToFinder("TeraBattleMenuWatcher", std::chrono::milliseconds(250), color)
+    {}
+};
+
+
+
+
+class CheerSelectDetector : public StaticScreenDetector{
+public:
+    CheerSelectDetector(Color color);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+    //  Returns -1 if not found.
+    int8_t detect_slot(const ImageViewRGB32& screen);
+    bool move_to_slot(VideoStream& stream, ProControllerContext& context, uint8_t slot);
+
+private:
+    WhiteButtonDetector m_info_button;
+    GradientArrowDetector m_arrow;
+};
+class CheerSelectWatcher : public DetectorToFinder<CheerSelectDetector>{
+public:
+    CheerSelectWatcher(Color color)
+        : DetectorToFinder("CheerSelectWatcher", std::chrono::milliseconds(250), color)
+    {}
+};
+
+
+
+class TeraTargetSelectDetector : public StaticScreenDetector{
+public:
+    TeraTargetSelectDetector(Color color);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+    //  Returns -1 if not found.
+    //  Returns 0 if opponent.
+    //  Returns 1 if left-most player.
+    //  Returns 4 if right-most player.
+    int8_t detect_slot(const ImageViewRGB32& screen);
+    bool move_to_slot(VideoStream& stream, ProControllerContext& context, uint8_t slot);
+
+private:
+    GradientArrowDetector m_opponent;
+    GradientArrowDetector m_player0;
+    GradientArrowDetector m_player1;
+    GradientArrowDetector m_player2;
+    GradientArrowDetector m_player3;
+};
+class TargetSelectWatcher : public DetectorToFinder<TeraTargetSelectDetector>{
+public:
+    TargetSelectWatcher(Color color)
+        : DetectorToFinder("TargetSelectWatcher", std::chrono::milliseconds(250), color)
+    {}
+};
+
+
+
+class TeraCatchDetector : public StaticScreenDetector{
+public:
+    TeraCatchDetector(Color color);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+    bool move_to_slot(VideoStream& stream, ProControllerContext& context, uint8_t slot);
+
+private:
+    bool detect_slot(const ImageViewRGB32& screen, size_t index);
+
+private:
+    Color m_color;
+    WhiteButtonDetector m_callouts_button;
+
+    ImageFloatBox m_button[2];
+    ImageFloatBox m_box_right[2];
+    std::vector<GradientArrowDetector> m_arrow;
+};
+class TeraCatchWatcher : public DetectorToFinder<TeraCatchDetector>{
+public:
+    TeraCatchWatcher(Color color)
+        : DetectorToFinder("TeraCatchWatcher", std::chrono::milliseconds(1000), color)
+    {}
+};
+
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Battles/PokemonSV_TeraRewardsMenu.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Battles/PokemonSV_TeraRewardsMenu.cpp
new file mode 100644
index 0000000000..2734b7a452
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Battles/PokemonSV_TeraRewardsMenu.cpp
@@ -0,0 +1,43 @@
+/*  Tera Rewards Menu
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "PokemonSV_TeraRewardsMenu.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+TeraRewardsMenuDetector::TeraRewardsMenuDetector(Color color)
+    : m_color(color)
+    , m_next_button(
+        COLOR_CYAN,
+        WhiteButton::ButtonA,
+        {0.8, 0.93, 0.2, 0.07}
+    )
+    , m_arrow(color, GradientArrowType::RIGHT, {0, 0, 1, 1})
+{}
+void TeraRewardsMenuDetector::make_overlays(VideoOverlaySet& items) const{
+    m_next_button.make_overlays(items);
+    m_arrow.make_overlays(items);
+}
+bool TeraRewardsMenuDetector::detect(const ImageViewRGB32& screen){
+    if (!m_next_button.detect(screen)){
+        return false;
+    }
+    if (m_arrow.detect(screen)){
+        return false;
+    }
+    return true;
+}
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Battles/PokemonSV_TeraRewardsMenu.h b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Battles/PokemonSV_TeraRewardsMenu.h
new file mode 100644
index 0000000000..2050b40283
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Battles/PokemonSV_TeraRewardsMenu.h
@@ -0,0 +1,43 @@
+/*  Tera Rewards Menu
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_TeraRewardsMenu_H
+#define PokemonAutomation_PokemonSV_TeraRewardsMenu_H
+
+#include "CommonTools/VisualDetector.h"
+#include "VideoGames/PokemonSV/Inference/PokemonSV_WhiteButtonDetector.h"
+#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_GradientArrowDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+class TeraRewardsMenuDetector : public StaticScreenDetector{
+public:
+    TeraRewardsMenuDetector(Color color = COLOR_RED);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+protected:
+    Color m_color;
+    WhiteButtonDetector m_next_button;
+    GradientArrowDetector m_arrow;
+};
+class TeraRewardsMenuWatcher : public DetectorToFinder<TeraRewardsMenuDetector>{
+public:
+    TeraRewardsMenuWatcher(Color color, std::chrono::milliseconds duration)
+         : DetectorToFinder("TeraRewardsMenuWatcher", duration, color)
+    {}
+};
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxDetection.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxDetection.cpp
new file mode 100644
index 0000000000..aee1c931f4
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxDetection.cpp
@@ -0,0 +1,592 @@
+/*  Box Detection
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Containers/FixedLimitVector.tpp"
+#include "Common/Cpp/Exceptions.h"
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "CommonFramework/Tools/ErrorDumper.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonTools/Images/SolidColorTest.h"
+#include "Tests/ImageUnitTest.h"
+#include "Tests/TestUtils.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "PokemonSV_BoxGenderDetector.h"
+#include "PokemonSV_BoxShinyDetector.h"
+#include "PokemonSV_BoxDetection.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+std::string BOX_CURSOR_LOCATION_NAMES(BoxCursorLocation location){
+    switch(location){
+    case BoxCursorLocation::NONE:
+        return "NONE";
+    case BoxCursorLocation::PARTY:
+        return "PARTY";
+    case BoxCursorLocation::BOX_CHANGE:
+        return "BOX_CHANGE";
+    case BoxCursorLocation::ALL_BOXES:
+        return "ALL_BOXES";
+    case BoxCursorLocation::SEARCH:
+        return "SEARCH";
+    case BoxCursorLocation::SLOTS:
+        return "SLOTS";
+    default:
+        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Unknown BoxCursorLocation");
+    }
+}
+
+std::string BOX_LOCATION_STRING(BoxCursorLocation location, uint8_t row, uint8_t col){
+    return "(" + BOX_CURSOR_LOCATION_NAMES(location) + " row " + std::to_string(row) + " col " + std::to_string(col) + ")";
+}
+
+
+SomethingInBoxSlotDetector::SomethingInBoxSlotDetector(Color color, bool true_if_exists)
+    : m_true_if_exists(true_if_exists)
+    , m_color(color)
+    , m_right(0.985, 0.010, 0.010, 0.050)
+    , m_top(0.660, 0.005, 0.330, 0.006)
+    , m_bottom(0.660, 0.064, 0.330, 0.005)
+    , m_body(0.670, 0.010, 0.060, 0.050)
+{}
+void SomethingInBoxSlotDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_right);
+    items.add(m_color, m_top);
+    items.add(m_color, m_bottom);
+    items.add(m_color, m_body);
+}
+bool SomethingInBoxSlotDetector::detect(const ImageViewRGB32& screen){
+    ImageStats right = image_stats(extract_box_reference(screen, m_right));
+//    extract_box_reference(screen, m_right).save("test.png");
+//    cout << right.average << right.stddev << endl;
+    if (!is_solid(right, {0.533473, 0.466527, 0.0}, 0.15, 20)){
+//        cout << "asdf" << endl;
+        return !m_true_if_exists;
+    }
+    ImageStats top = image_stats(extract_box_reference(screen, m_top));
+//    cout << top.average << top.stddev << endl;
+    if (!is_solid(top, {0.533473, 0.466527, 0.0})){
+//        cout << "qwer" << endl;
+        return !m_true_if_exists;
+    }
+    ImageStats bottom = image_stats(extract_box_reference(screen, m_bottom));
+//     cout << bottom.average << bottom.stddev << endl;
+//    extract_box_reference(screen, m_bottom).save("./tmp_bottom.png");
+    if (!is_solid(bottom, {0.533473, 0.466527, 0.0}, 0.15, 15.0)){
+//        cout << "zxcv" << endl;
+        return !m_true_if_exists;
+    }
+    ImageStats body = image_stats(extract_box_reference(screen, m_body));
+//    cout << body.average << body.stddev << endl;
+    if (body.stddev.sum() < 100){
+        return !m_true_if_exists;
+    }
+
+    return m_true_if_exists;
+}
+
+
+
+
+BoxSelectDetector::BoxSelectDetector(Color color)
+    : m_color(color)
+    , m_exists(color, true)
+    , m_dialog(color)
+    , m_gradient(color, GradientArrowType::RIGHT, {0.20, 0.17, 0.50, 0.10})
+{}
+void BoxSelectDetector::make_overlays(VideoOverlaySet& items) const{
+    m_exists.make_overlays(items);
+    m_dialog.make_overlays(items);
+    m_gradient.make_overlays(items);
+}
+bool BoxSelectDetector::exists(const ImageViewRGB32& screen){
+    return m_exists.detect(screen);
+}
+bool BoxSelectDetector::detect(const ImageViewRGB32& screen){
+    if (!exists(screen)){
+        return false;
+    }
+    if (!m_dialog.detect(screen)){
+        return false;
+    }
+    if (!m_gradient.detect(screen)){
+        return false;
+    }
+    return true;
+}
+
+
+BoxDetector::BoxDetector(Color color)
+    : m_color(color)
+    , m_party(color, GradientArrowType::DOWN, {0.140, 0.150, 0.050, 0.700})
+    , m_box_change(color, GradientArrowType::DOWN, {0.405, 0.070, 0.050, 0.090})
+    , m_all_boxes(color, GradientArrowType::DOWN, {0.295, 0.780, 0.050, 0.090})
+    , m_search(color, GradientArrowType::DOWN, {0.510, 0.780, 0.050, 0.090})
+    , m_slots(color, GradientArrowType::DOWN, {0.240, 0.160, 0.380, 0.550})
+{}
+void BoxDetector::make_overlays(VideoOverlaySet& items) const{
+    m_party.make_overlays(items);
+    m_box_change.make_overlays(items);
+    m_all_boxes.make_overlays(items);
+    m_search.make_overlays(items);
+    m_slots.make_overlays(items);
+}
+bool BoxDetector::detect(const ImageViewRGB32& screen){
+    if (m_party.detect(screen)){
+        return true;
+    }
+    if (m_box_change.detect(screen)){
+        return true;
+    }
+    if (m_all_boxes.detect(screen)){
+        return true;
+    }
+    if (m_search.detect(screen)){
+        return true;
+    }
+    if (m_slots.detect(screen)){
+        return true;
+    }
+    return false;
+}
+std::pair<BoxCursorLocation, BoxCursorCoordinates> BoxDetector::detect_location(const ImageViewRGB32& screen){
+    if (m_box_change.detect(screen)){
+        return {BoxCursorLocation::BOX_CHANGE, {0, 0}};
+    }
+    if (m_all_boxes.detect(screen)){
+        return {BoxCursorLocation::ALL_BOXES, {0, 0}};
+    }
+    if (m_search.detect(screen)){
+        return {BoxCursorLocation::SEARCH, {0, 0}};
+    }
+
+    ImageFloatBox box;
+    if (m_party.detect(box, screen)){
+//        cout << box.y << endl;
+        int slot = (int)((box.y - 0.175926) / 0.116296 + 0.5);
+        if (slot < 0){
+            return {BoxCursorLocation::NONE, {0, 0}};
+        }
+        return {BoxCursorLocation::PARTY, {(uint8_t)slot, 0}};
+    }
+    if (m_slots.detect(box, screen)){
+//        cout << box.x << " " << box.y << endl;
+        int x = (int)((box.x - 0.247917) / 0.065625 + 0.5);
+        if (x < 0){
+            return {BoxCursorLocation::NONE, {0, 0}};
+        }
+        int y = (int)((box.y - 0.175926) / 0.11713 + 0.5);
+        if (x < 0){
+            return {BoxCursorLocation::NONE, {0, 0}};
+        }
+        return {BoxCursorLocation::SLOTS, {(uint8_t)y, (uint8_t)x}};
+    }
+
+    return {BoxCursorLocation::NONE, {0, 0}};
+}
+
+
+bool BoxDetector::to_coordinates(int& x, int& y, BoxCursorLocation side, uint8_t row, uint8_t col) const{
+    switch (side){
+    case BoxCursorLocation::NONE:
+        return false;
+    case BoxCursorLocation::PARTY:
+        x = -1;
+        y = row;
+        break;
+    case BoxCursorLocation::BOX_CHANGE:
+        x = 2;
+        y = -1;
+        break;
+    case BoxCursorLocation::ALL_BOXES:
+        x = 1;
+        y = 5;
+        break;
+    case BoxCursorLocation::SEARCH:
+        x = 4;
+        y = 5;
+        break;
+    case BoxCursorLocation::SLOTS:
+        x = col;
+        y = row;
+        break;
+    default:
+        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Unknown BoxCursorLocation");
+    }
+    return true;
+}
+void BoxDetector::move_vertical(ProControllerContext& context, int current, int desired) const{
+    int diff = (current - desired + 7) % 7;
+//    cout << "diff = " << diff << endl;
+    if (diff <= 3){
+        for (int c = 0; c < diff; c++){
+            pbf_press_dpad(context, DPAD_UP, 160ms, 240ms);
+        }
+    }else{
+        for (int c = diff; c < 7; c++){
+            pbf_press_dpad(context, DPAD_DOWN, 160ms, 240ms);
+        }
+    }
+}
+void BoxDetector::move_horizontal(ProControllerContext& context, int current, int desired) const{
+    int diff = (current - desired + 7) % 7;
+    if (diff <= 3){
+        for (int c = 0; c < diff; c++){
+            pbf_press_dpad(context, DPAD_LEFT, 160ms, 240ms);
+        }
+    }else{
+        for (int c = diff; c < 7; c++){
+            pbf_press_dpad(context, DPAD_RIGHT, 160ms, 240ms);
+        }
+    }
+}
+
+
+void BoxDetector::move_cursor(
+    const ProgramInfo& info, VideoStream& stream, ProControllerContext& context,
+    BoxCursorLocation side, uint8_t row, uint8_t col
+){
+    int desired_x = 0, desired_y = 0;
+    if (!to_coordinates(desired_x, desired_y, side, row, col)){
+        throw InternalProgramError(
+            &stream.logger(), PA_CURRENT_FUNCTION,
+            "BoxDetector::move_cursor() called with BoxCursorLocation::NONE."
+        );
+    }
+//    cout << "desired_x = " << desired_x << ", desired_y = " << desired_y << endl;
+
+    size_t consecutive_fails = 0;
+    WallClock start = current_time();
+    while (true){
+        if (current_time() - start > std::chrono::seconds(60)){
+            dump_image_and_throw_recoverable_exception(
+                info, stream, "BoxMoveCursor",
+                "Failed to move cursor to desired location after 1 minute."
+            );
+        }
+
+        context.wait_for_all_requests();
+        VideoSnapshot screen = stream.video().snapshot();
+        std::pair<BoxCursorLocation, BoxCursorCoordinates> current = this->detect_location(screen);
+
+        int current_x = 0, current_y = 0;
+        if (!to_coordinates(current_x, current_y, current.first, current.second.row, current.second.col)){
+            consecutive_fails++;
+            if (consecutive_fails > 100){
+                dump_image_and_throw_recoverable_exception(info, stream, "BoxSystemNotDetected", "move_cursor(): Unable to detect box system.");
+            }
+            context.wait_for(std::chrono::milliseconds(100));
+            continue;
+        }
+//        cout << "current_x = " << current_x << ", current_y = " << current_y << endl;
+
+        if (current_x == desired_x && current_y == desired_y){
+//            cout << "done!" << endl;
+            return;
+        }
+
+        //  If we're on the party, always move horizontally first.
+        if (current_x == -1){
+            if (desired_x == -1){
+                if (row < current.second.row){
+                    for (uint8_t r = row; r < current.second.row; r++){
+                        pbf_press_dpad(context, DPAD_UP, 160ms, 240ms);
+                    }
+                }else{ // row >= current.second.row
+                    for (uint8_t r = current.second.row; r < row; r++){
+                        pbf_press_dpad(context, DPAD_DOWN, 160ms, 240ms);
+                    }
+                }
+                continue;
+            }else if (desired_x < 3){
+                pbf_press_dpad(context, DPAD_RIGHT, 160ms, 240ms);
+            }else{
+                pbf_press_dpad(context, DPAD_LEFT, 160ms, 240ms);
+            }
+            continue;
+        }
+
+        //  Otherwise, always move vertically first.
+        if (current_y != desired_y){
+            move_vertical(context, current_y, desired_y);
+            continue;
+        }
+
+        //  Special case for bottom row.
+        if (current_y == 5){
+            int diff = (current_x - desired_x + 7) % 7;
+            if (diff <= 3){
+                pbf_press_dpad(context, DPAD_LEFT, 160ms, 240ms);
+            }else{
+                pbf_press_dpad(context, DPAD_RIGHT, 160ms, 240ms);
+            }
+            continue;
+        }
+
+        //  Now handle horizontals.
+        move_horizontal(context, current_x, desired_x);
+    }
+}
+
+BoxEmptySlotDetector::BoxEmptySlotDetector(BoxCursorLocation side, uint8_t row, uint8_t col, Color color)
+    : m_color(color)
+{
+    if (side == BoxCursorLocation::PARTY){
+        m_box = ImageFloatBox(0.142, 0.1165 * row + 0.201, 0.048, 0.082);
+    }else if (side == BoxCursorLocation::SLOTS){
+        m_box = ImageFloatBox(0.0656 * col + 0.242, 0.1165 * row + 0.201, 0.048, 0.082);
+    }else{
+        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "INVALID BoxCursorLocation for BoxEmptySlotDetector");
+    }
+}
+
+void BoxEmptySlotDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_box);
+}
+
+bool BoxEmptySlotDetector::detect(const ImageViewRGB32& frame){
+    const auto stats = image_stats(extract_box_reference(frame, m_box));
+    return stats.stddev.sum() < 20.0;
+}
+
+
+
+BoxEmptyPartyWatcher::BoxEmptyPartyWatcher(Color color) : VisualInferenceCallback("BoxEmptyPartyWatcher"), m_empty_watchers(5){
+    for (uint8_t i = 0; i < 5; i++){
+        m_empty_watchers.emplace_back(
+            BoxCursorLocation::PARTY,
+            (uint8_t)(i + 1), (uint8_t)0,
+            BoxEmptySlotWatcher::FinderType::CONSISTENT,
+            color
+        );
+    }
+}
+
+void BoxEmptyPartyWatcher::make_overlays(VideoOverlaySet& items) const{
+    for (int i = 0; i < 5; i++){
+        m_empty_watchers[i].make_overlays(items);
+    }
+}
+
+bool BoxEmptyPartyWatcher::process_frame(const ImageViewRGB32& frame, WallClock timestamp){
+    bool all_certain = true;
+    for (int i = 0; i < 5; i++){
+        // Return true if it is sure that the slot is empty or not
+        const bool empty_certain = m_empty_watchers[i].process_frame(frame, timestamp);
+
+        if (!empty_certain){
+            all_certain = false;
+        }
+    }
+    return all_certain;
+}
+
+uint8_t BoxEmptyPartyWatcher::num_empty_slots_found() const{
+    uint8_t num_empty = 0;
+    for (int i = 0; i < 5; i++){
+        if (m_empty_watchers[i].consistent_result()){
+            num_empty++;
+        }
+    }
+    return num_empty;
+}
+
+namespace{
+    ImageFloatBox BOTTOM_BUTTON_Y_BOX{0.391, 0.939, 0.400, 0.047};
+} // anonymous namespace
+
+BoxBottomButtonYDetector::BoxBottomButtonYDetector(Color color)
+    : WhiteButtonDetector(color, WhiteButton::ButtonY, BOTTOM_BUTTON_Y_BOX)
+{}
+BoxBottomButtonBDetector::BoxBottomButtonBDetector(Color color)
+    : WhiteButtonDetector(color, WhiteButton::ButtonB, {0.842, 0.939, 0.139, 0.047})
+{}
+
+
+BoxSelectionBoxModeWatcher::BoxSelectionBoxModeWatcher(Color color)
+    : VisualInferenceCallback("BoxSelectionBoxModeWatcher")
+    , button_y_watcher(color, WhiteButton::ButtonY, BOTTOM_BUTTON_Y_BOX, WhiteButtonWatcher::FinderType::CONSISTENT)
+{}
+
+void BoxSelectionBoxModeWatcher::make_overlays(VideoOverlaySet& items) const{
+    button_y_watcher.make_overlays(items);
+}
+
+bool BoxSelectionBoxModeWatcher::process_frame(const ImageViewRGB32& frame, WallClock timestamp){
+    return button_y_watcher.process_frame(frame, timestamp);
+}
+
+bool BoxSelectionBoxModeWatcher::in_box_selection_mode() const{
+    // If we have button Y detected, then we are NOT in box selection mode
+    return !button_y_watcher.consistent_result();
+}
+
+
+
+
+
+
+
+class Test_BoxInfoDetector : public ImageUnitTest{
+public:
+    Test_BoxInfoDetector(
+        const std::string& image,
+        std::vector<std::string> words
+    )
+        : ImageUnitTest("PokemonSV::BoxInfoDetector - " + image, {image})
+        , m_words(std::move(words))
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        // two words: <shiny or not> <gender (1: male, 2: female, 3: genderless)
+        if (m_words.size() < 2){
+            std::stringstream ss;
+            ss << "Error: not enough number of words in the filename. Found only " << m_words.size() << "." << std::endl;
+            return ss.str();
+        }
+
+        bool target_shiny = false;
+        int target_gender = 0;
+        if (parse_bool(m_words[m_words.size()-2], target_shiny) == false){
+            std::stringstream ss;
+            ss << "Error: word " << m_words[m_words.size()-2] << " is wrong. Must be True or False. " << std::endl;
+            return ss.str();
+        }
+        if (parse_int(m_words[m_words.size()-1], target_gender) == false){
+            std::stringstream ss;
+            ss << "Error: word " << m_words[m_words.size()-1] << " is wrong. Must be int (1: male, 2: female, 3: genderless). " << std::endl;
+            return ss.str();
+        }
+
+        SomethingInBoxSlotDetector sth_detector(COLOR_RED);
+        const ImageRGB32& image = images[0];
+        bool sth = sth_detector.detect(image);
+        TEST_RESULT_EQUAL_STR(sth, true);
+
+        BoxShinyDetector shiny_detector;
+        bool shiny_result = shiny_detector.detect(image);
+
+        TEST_RESULT_EQUAL_STR(shiny_result, target_shiny);
+
+        BoxGenderDetector gender_detector;
+        int gender_result = (int)gender_detector.detect(image);
+        TEST_RESULT_EQUAL_STR(gender_result, target_gender);
+
+        return true;
+    };
+
+private:
+    const std::vector<std::string> m_words;
+};
+
+class Test_SomethingInBoxSlotDetector : public ImageUnitTest{
+public:
+    Test_SomethingInBoxSlotDetector(const std::string& image, bool expected)
+        : ImageUnitTest("PokemonSV::SomethingInBoxSlotDetector - " + image, {image})
+        , m_expected(expected)
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        SomethingInBoxSlotDetector detector(COLOR_RED);
+        const ImageRGB32& image = images[0];
+        return detector.detect(image) == m_expected;
+    }
+
+private:
+    bool m_expected;
+};
+
+class Test_BoxBottomButtonDetector : public ImageUnitTest{
+public:
+    Test_BoxBottomButtonDetector(const std::string& image, bool target_y, bool target_b)
+        : ImageUnitTest("PokemonSV::BoxBottomButtonDetector - " + image, {image})
+        , m_target_y(target_y)
+        , m_target_b(target_b)
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        const ImageRGB32& image = images[0];
+        BoxBottomButtonYDetector y_detector;
+        TEST_RESULT_COMPONENT_EQUAL_STR(y_detector.detect(image), m_target_y, "button Y");
+
+        BoxBottomButtonBDetector b_detector;
+        TEST_RESULT_COMPONENT_EQUAL_STR(b_detector.detect(image), m_target_b, "button B");
+        return true;
+    }
+
+private:
+    bool m_target_y;
+    bool m_target_b;
+};
+
+
+
+void add_tests_BoxInfoDetector(UnitTestDatabase& database){
+    database.add<Test_BoxInfoDetector>(
+        "PokemonSV/BoxPokemonInfoDetector/Deerling_True_1.png",
+        std::vector<std::string>{"Deerling", "True", "1"}
+    );
+    database.add<Test_BoxInfoDetector>(
+        "PokemonSV/BoxPokemonInfoDetector/Dragapult_2_False_2.png",
+        std::vector<std::string>{"Dragapult", "2", "False", "2"}
+    );
+    database.add<Test_BoxInfoDetector>(
+        "PokemonSV/BoxPokemonInfoDetector/Dragapult_False_2.png",
+        std::vector<std::string>{"Dragapult", "False", "2"}
+    );
+    database.add<Test_BoxInfoDetector>(
+        "PokemonSV/BoxPokemonInfoDetector/Egg_False_3.png",
+        std::vector<std::string>{"Egg", "False", "3"}
+    );
+    database.add<Test_BoxInfoDetector>(
+        "PokemonSV/BoxPokemonInfoDetector/Lachonk_Korean_True_2.png",
+        std::vector<std::string>{"Lachonk", "Korean", "True", "2"}
+    );
+    database.add<Test_BoxInfoDetector>(
+        "PokemonSV/BoxPokemonInfoDetector/Magnemite_False_3.png",
+        std::vector<std::string>{"Magnemite", "False", "3"}
+    );
+    database.add<Test_BoxInfoDetector>(
+        "PokemonSV/BoxPokemonInfoDetector/Salamence_False_2.png",
+        std::vector<std::string>{"Salamence", "False", "2"}
+    );
+    database.add<Test_BoxInfoDetector>(
+        "PokemonSV/BoxPokemonInfoDetector/Tauros_False_1.png",
+        std::vector<std::string>{"Tauros", "False", "1"}
+    );
+    database.add<Test_SomethingInBoxSlotDetector>("PokemonSV/SomethingInBoxSlotDetector/Yellow_Background_2_False.png", false);
+    database.add<Test_SomethingInBoxSlotDetector>("PokemonSV/SomethingInBoxSlotDetector/Yellow_Background_False.png", false);
+    database.add<Test_BoxBottomButtonDetector>("PokemonSV/BoxBottomButtonDetector/Empty_True_True.png", true, true);
+    database.add<Test_BoxBottomButtonDetector>("PokemonSV/BoxBottomButtonDetector/Korean_Flamingo_False_True.png", false, true);
+    database.add<Test_BoxBottomButtonDetector>("PokemonSV/BoxBottomButtonDetector/Korean_Flamingo_True_True.png", true, true);
+    database.add<Test_BoxBottomButtonDetector>("PokemonSV/BoxBottomButtonDetector/Talonflame_box_selection_2_False_True.png", false, true);
+    database.add<Test_BoxBottomButtonDetector>("PokemonSV/BoxBottomButtonDetector/Talonflame_box_selection_False_True.png", false, true);
+    database.add<Test_BoxBottomButtonDetector>("PokemonSV/BoxBottomButtonDetector/Talonflame_True_True.png", true, true);
+    database.add<Test_BoxBottomButtonDetector>("PokemonSV/BoxBottomButtonDetector/Volcarona_False_True.png", false, true);
+    database.add<Test_BoxBottomButtonDetector>("PokemonSV/BoxBottomButtonDetector/Volcarona_True_True.png", true, true);
+}
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/PokemonSV/Inference/Boxes/PokemonSV_BoxDetection.h b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxDetection.h
similarity index 76%
rename from SerialPrograms/Source/PokemonSV/Inference/Boxes/PokemonSV_BoxDetection.h
rename to SerialPrograms/Source/VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxDetection.h
index c223674a4e..914007177a 100644
--- a/SerialPrograms/Source/PokemonSV/Inference/Boxes/PokemonSV_BoxDetection.h
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxDetection.h
@@ -1,6 +1,6 @@
 /*  Box Detection
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -8,14 +8,16 @@
 #define PokemonAutomation_PokemonSV_BoxDetection_H
 
 #include "Common/Cpp/Containers/FixedLimitVector.h"
-#include "PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h"
-#include "PokemonSV/Inference/Dialogs/PokemonSV_GradientArrowDetector.h"
-#include "PokemonSV/Inference/PokemonSV_WhiteButtonDetector.h"
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "CommonFramework/Tools/VideoStream.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h"
+#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_GradientArrowDetector.h"
+#include "VideoGames/PokemonSV/Inference/PokemonSV_WhiteButtonDetector.h"
 
 namespace PokemonAutomation{
-    class ConsoleHandle;
-    class BotBaseContext;
     struct ProgramInfo;
+    class VideoStream;
 namespace NintendoSwitch{
 namespace PokemonSV{
 
@@ -27,7 +29,7 @@ class SomethingInBoxSlotDetector : public StaticScreenDetector{
     SomethingInBoxSlotDetector(Color color, bool true_if_exists = true);
 
     virtual void make_overlays(VideoOverlaySet& items) const override;
-    virtual bool detect(const ImageViewRGB32& screen) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
 
 private:
     bool m_true_if_exists;
@@ -52,10 +54,10 @@ class BoxSelectDetector : public StaticScreenDetector{
     BoxSelectDetector(Color color);
 
     // If there is a pokemon/egg in the current slot in box or party, while in box system view
-    bool exists(const ImageViewRGB32& screen) const;
+    bool exists(const ImageViewRGB32& screen);
 
     virtual void make_overlays(VideoOverlaySet& items) const override;
-    virtual bool detect(const ImageViewRGB32& screen) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
 
 private:
     Color m_color;
@@ -99,19 +101,19 @@ class BoxDetector : public StaticScreenDetector{
     BoxDetector(Color color = COLOR_RED);
 
     virtual void make_overlays(VideoOverlaySet& items) const override;
-    virtual bool detect(const ImageViewRGB32& screen) const override;
-    std::pair<BoxCursorLocation, BoxCursorCoordinates> detect_location(const ImageViewRGB32& screen) const;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+    std::pair<BoxCursorLocation, BoxCursorCoordinates> detect_location(const ImageViewRGB32& screen);
 
     //  While in the box system view, move the cursor to the desired slot.
     void move_cursor(
-        const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context,
+        const ProgramInfo& info, VideoStream& stream, ProControllerContext& context,
         BoxCursorLocation side, uint8_t row, uint8_t col
-    ) const;
+    );
 
 private:
     bool to_coordinates(int& x, int& y, BoxCursorLocation side, uint8_t row, uint8_t col) const;
-    void move_vertical(BotBaseContext& context, int current, int desired) const;
-    void move_horizontal(BotBaseContext& context, int current, int desired) const;
+    void move_vertical(ProControllerContext& context, int current, int desired) const;
+    void move_horizontal(ProControllerContext& context, int current, int desired) const;
 
 private:
     Color m_color;
@@ -133,17 +135,26 @@ class BoxWatcher : public DetectorToFinder<BoxDetector>{
 // are fully loaded before calling this detector.
 class BoxEmptySlotDetector : public StaticScreenDetector{
 public:
-    BoxEmptySlotDetector(BoxCursorLocation side, uint8_t row, uint8_t col, Color color = COLOR_RED);
+    BoxEmptySlotDetector(
+        BoxCursorLocation side,
+        uint8_t row, uint8_t col,
+        Color color = COLOR_RED
+    );
 
     virtual void make_overlays(VideoOverlaySet& items) const override;
-    virtual bool detect(const ImageViewRGB32& screen) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
 private:
     Color m_color;
     ImageFloatBox m_box;
 };
 class BoxEmptySlotWatcher : public DetectorToFinder<BoxEmptySlotDetector>{
 public:
-    BoxEmptySlotWatcher(BoxCursorLocation side, uint8_t row, uint8_t col, FinderType finder_type = FinderType::PRESENT, Color color = COLOR_RED)
+    BoxEmptySlotWatcher(
+        BoxCursorLocation side,
+        uint8_t row, uint8_t col,
+        FinderType finder_type = FinderType::PRESENT,
+        Color color = COLOR_RED
+    )
          : DetectorToFinder("BoxEmptySlotWatcher", finder_type, std::chrono::milliseconds(100), side, row, col, color)
     {}
 };
@@ -198,6 +209,11 @@ class BoxSelectionBoxModeWatcher : public VisualInferenceCallback{
 
 
 
+void add_tests_BoxInfoDetector(UnitTestDatabase& database);
+
+
+
+
 }
 }
 }
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxEggDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxEggDetector.cpp
new file mode 100644
index 0000000000..0b19fefa85
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxEggDetector.cpp
@@ -0,0 +1,220 @@
+/*  Box Eggs Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Containers/FixedLimitVector.tpp"
+#include "Common/Cpp/Exceptions.h"
+#include "Kernels/Waterfill/Kernels_Waterfill_Types.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonFramework/ImageTools/ImageStats.h"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonTools/Images/WaterfillUtilities.h"
+#include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h"
+#include "Tests/ImageUnitTest.h"
+#include "VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxDetection.h"
+#include "PokemonSV_BoxEggDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+namespace{
+
+class EggMatcher : public ImageMatch::WaterfillTemplateMatcher{
+public:
+    EggMatcher() : WaterfillTemplateMatcher(
+        "PokemonSV/Egg-Template.png", Color(100,100,100), Color(255, 255, 255), 50
+    ){
+        m_aspect_ratio_lower = 0.9;
+        m_aspect_ratio_upper = 1.2;
+        m_area_ratio_lower = 0.9;
+        m_area_ratio_upper = 1.2;
+    }
+
+    static const ImageMatch::WaterfillTemplateMatcher& instance(){
+        static EggMatcher matcher;
+        return matcher;
+    }
+};
+
+} // end anonymous namespace
+
+
+
+
+BoxCurrentEggDetector::BoxCurrentEggDetector(Color color)
+: m_color(color), m_box{0.659, 0.082, 0.329, 0.043} {}
+
+void BoxCurrentEggDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_box);
+}
+
+bool BoxCurrentEggDetector::detect(const ImageViewRGB32& frame){
+    const auto stats = image_stats(extract_box_reference(frame, m_box));
+    return stats.stddev.sum() < 20;
+}
+
+
+BoxEggDetector::BoxEggDetector(BoxCursorLocation side, uint8_t row, uint8_t col, Color color)
+: m_color(color){
+    if (side == BoxCursorLocation::PARTY){
+        m_box = ImageFloatBox(0.149, 0.1165 * row + 0.235, 0.033, 0.066);
+    }else if (side == BoxCursorLocation::SLOTS){
+        m_box = ImageFloatBox(0.0656 * col + 0.249, 0.1165 * row + 0.235, 0.033, 0.066);
+    }else{
+        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "INVALID BoxCursorLocation for BoxEggDetector");
+    }
+}
+
+void BoxEggDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_box);
+}
+
+bool BoxEggDetector::detect(const ImageViewRGB32& frame){
+    const std::vector<std::pair<uint32_t, uint32_t>> filters = {
+        {combine_rgb(200, 200, 200), combine_rgb(255, 255, 255)},
+        {combine_rgb(180, 180, 180), combine_rgb(255, 255, 255)} // for darker capture cards
+
+    };
+
+    const double screen_rel_size = (frame.height() / 1080.0);
+
+    const size_t min_size = size_t(screen_rel_size * screen_rel_size * 700);
+    
+    return match_template_by_waterfill(
+        frame.size(),
+        extract_box_reference(frame, m_box), 
+        EggMatcher::instance(),
+        filters,
+        {min_size, SIZE_MAX},
+        75,
+        [&](Kernels::Waterfill::WaterfillObject& object) -> bool { return true; }
+    );
+}
+
+
+BoxEggPartyColumnWatcher::BoxEggPartyColumnWatcher(Color color)
+    : VisualInferenceCallback("BoxEggPartyColumnWatcher")
+    , m_egg_watchers(5), m_empty_watchers(5)
+{
+    for (uint8_t i = 0; i < 5; i++){
+        m_egg_watchers.emplace_back(
+            BoxCursorLocation::PARTY,
+            (uint8_t)(i + 1), (uint8_t)0,
+            BoxEggWatcher::FinderType::CONSISTENT,
+            color
+        );
+        m_empty_watchers.emplace_back(
+            BoxCursorLocation::PARTY,
+            (uint8_t)(i + 1), (uint8_t)0,
+            BoxEmptySlotWatcher::FinderType::CONSISTENT,
+            color
+        );
+    }
+}
+
+void BoxEggPartyColumnWatcher::make_overlays(VideoOverlaySet& items) const{
+    for (int i = 0; i < 5; i++){
+        m_egg_watchers[i].make_overlays(items);
+        m_empty_watchers[i].make_overlays(items);
+    }
+}
+
+bool BoxEggPartyColumnWatcher::process_frame(const ImageViewRGB32& frame, WallClock timestamp){
+    bool all_certain = true;
+    for (int i = 0; i < 5; i++){
+        // Return true if an egg is detected
+        const bool egg_certain =  m_egg_watchers[i].process_frame(frame, timestamp);
+        // Return true if it is sure that the slot is empty or not
+        const bool empty_certain = m_empty_watchers[i].process_frame(frame, timestamp);
+
+        if (!egg_certain || !empty_certain){
+            all_certain = false;
+        }
+    }
+    return all_certain;
+}
+
+uint8_t BoxEggPartyColumnWatcher::num_eggs_found() const{
+    uint8_t num_eggs = 0;
+    for (int i = 0; i < 5; i++){
+        if (m_egg_watchers[i].consistent_result()){
+            num_eggs++;
+        }
+    }
+    return num_eggs;
+}
+
+uint8_t BoxEggPartyColumnWatcher::num_non_egg_pokemon_found() const{
+    uint8_t num_pokemon = 0;
+    for (int i = 0; i < 5; i++){
+        if (m_empty_watchers[i].consistent_result() == false && m_egg_watchers[i].consistent_result() == false){
+            num_pokemon++;
+        }
+    }
+    return num_pokemon;
+}
+
+
+class Test_BoxCurrentEggDetector : public ImageUnitTest{
+public:
+    Test_BoxCurrentEggDetector(const std::string& image, bool expected)
+        : ImageUnitTest("PokemonSV::BoxCurrentEggDetector - " + image, {image})
+        , m_expected(expected)
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        BoxCurrentEggDetector detector(COLOR_RED);
+        const ImageRGB32& image = images[0];
+        return detector.detect(image) == m_expected;
+    }
+
+private:
+    bool m_expected;
+};
+
+class Test_BoxPartyEggDetector : public ImageUnitTest{
+public:
+    Test_BoxPartyEggDetector(const std::string& image, int target)
+        : ImageUnitTest("PokemonSV::BoxPartyEggDetector - " + image, {image})
+        , m_target(target)
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        uint8_t num_eggs = 0;
+        const ImageRGB32& image = images[0];
+        for (uint8_t i = 0; i < 5; i++){
+            BoxEggDetector detector(BoxCursorLocation::PARTY, i + 1, 0);
+            if (detector.detect(image)){
+                num_eggs++;
+            }
+        }
+        return (int)num_eggs == m_target;
+    }
+
+private:
+    int m_target;
+};
+
+
+void add_tests_BoxEggDetector(UnitTestDatabase& database){
+    database.add<Test_BoxCurrentEggDetector>("PokemonSV/BoxEggDetector/default_False.png", false);
+    database.add<Test_BoxCurrentEggDetector>("PokemonSV/BoxEggDetector/default_True.png", true);
+    database.add<Test_BoxPartyEggDetector>("PokemonSV/BoxPartyEggDetector/Cursor_1_Eggs_5.png", 5);
+    database.add<Test_BoxPartyEggDetector>("PokemonSV/BoxPartyEggDetector/Dark_screen_5.png", 5);
+    database.add<Test_BoxPartyEggDetector>("PokemonSV/BoxPartyEggDetector/Ditto_Sprigatito_Egg_1.png", 1);
+    database.add<Test_BoxPartyEggDetector>("PokemonSV/BoxPartyEggDetector/Talonflame_egg_5.png", 5);
+}
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxEggDetector.h b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxEggDetector.h
new file mode 100644
index 0000000000..68cee2366e
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxEggDetector.h
@@ -0,0 +1,92 @@
+/*  Box Egg Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_BoxEggDetector_H
+#define PokemonAutomation_PokemonSV_BoxEggDetector_H
+
+#include "Common/Cpp/Color.h"
+#include "Common/Cpp/Containers/FixedLimitVector.h"
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+#include "CommonTools/VisualDetector.h"
+#include "VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxDetection.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+// Detect if the currently selected pokemon is an egg or not, assuming the current
+// selected slot is not empty and the box view is stats or judege mode.
+class BoxCurrentEggDetector : public StaticScreenDetector{
+public:
+    BoxCurrentEggDetector(Color color = COLOR_BLUE);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    Color m_color;
+    ImageFloatBox m_box;
+};
+
+
+// Detect if a slot in the box system is an egg.
+class BoxEggDetector : public StaticScreenDetector{
+public:
+    BoxEggDetector(
+        BoxCursorLocation side,
+        uint8_t row, uint8_t col,
+        Color color = COLOR_YELLOW
+    );
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    Color m_color;
+    ImageFloatBox m_box;
+};
+
+class BoxEggWatcher : public DetectorToFinder<BoxEggDetector>{
+public:
+    BoxEggWatcher(
+        BoxCursorLocation side,
+        uint8_t row, uint8_t col,
+        FinderType finder_type = FinderType::PRESENT,
+        Color color = COLOR_YELLOW
+    )
+         : DetectorToFinder("BoxEggWatcher", finder_type, std::chrono::milliseconds(100), side, row, col, color)
+    {}
+};
+
+// Detect eggs in a party column (five slots after the party lead). Used for egg hatching.
+// It also detects empty spaces and non-empty spaces, so that we know whether we have non-egg pokemon in the party.
+class BoxEggPartyColumnWatcher : public VisualInferenceCallback{
+public:
+    BoxEggPartyColumnWatcher(Color color = COLOR_YELLOW);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    
+    // Return true when the watcher is sure that each of the five slots is either egg, non-egg pokemon or empty.
+    virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override;
+
+    uint8_t num_eggs_found() const;
+    
+    uint8_t num_non_egg_pokemon_found() const;
+
+private:
+    FixedLimitVector<BoxEggWatcher> m_egg_watchers;
+    FixedLimitVector<BoxEmptySlotWatcher> m_empty_watchers;
+};
+
+
+void add_tests_BoxEggDetector(UnitTestDatabase& database);
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxGenderDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxGenderDetector.cpp
new file mode 100644
index 0000000000..ea92ed436d
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxGenderDetector.cpp
@@ -0,0 +1,21 @@
+/*  IV Checker Reader
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "PokemonSV_BoxGenderDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+BoxGenderDetector::BoxGenderDetector(Color color)
+    : Pokemon::BoxGenderDetector({0.965, 0.019, 0.019, 0.034}, 0.2, color)
+{}
+
+
+}
+}
+}
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxGenderDetector.h b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxGenderDetector.h
new file mode 100644
index 0000000000..c05574b67c
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxGenderDetector.h
@@ -0,0 +1,29 @@
+/*  Box Gender Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_BoxGenderDetector_H
+#define PokemonAutomation_PokemonSV_BoxGenderDetector_H
+
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "Pokemon/Inference/Pokemon_BoxGenderDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+class BoxGenderDetector : public Pokemon::BoxGenderDetector{
+
+public:
+    BoxGenderDetector(Color color = COLOR_RED);
+
+};
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/PokemonSV/Inference/Boxes/PokemonSV_BoxNatureDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxNatureDetector.cpp
similarity index 87%
rename from SerialPrograms/Source/PokemonSV/Inference/Boxes/PokemonSV_BoxNatureDetector.cpp
rename to SerialPrograms/Source/VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxNatureDetector.cpp
index 837807b585..ffb871dc23 100644
--- a/SerialPrograms/Source/PokemonSV/Inference/Boxes/PokemonSV_BoxNatureDetector.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxNatureDetector.cpp
@@ -1,48 +1,48 @@
-/*  Box Nature Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
-#include "PokemonSV_BoxNatureDetector.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-const NatureReader& NATURE_READER(){
-    const static Pokemon::NatureReader reader("Pokemon/NatureCheckerOCR.json");
-    return reader;
-}
-
-BoxNatureDetector::BoxNatureDetector(VideoOverlay& overlay, Language language)
-    : m_language(language)
-    , m_box_nature(overlay, {0.757, 0.529, 0.141, 0.050})
-{}
-
-NatureCheckerValue BoxNatureDetector::read(Logger& logger, const ImageViewRGB32& frame, const OverlayBoxScope& box){
-    ImageViewRGB32 image = extract_box_reference(frame, box);
-    OCR::StringMatchResult result = NATURE_READER().read_substring(
-        logger, m_language, image,
-        OCR::WHITE_TEXT_FILTERS()
-    );
-    result.clear_beyond_log10p(NatureReader::MAX_LOG10P);
-    if (result.results.size() != 1){
-        return NatureCheckerValue::UnableToDetect;
-    }
-    return NatureCheckerValue_string_to_enum(result.results.begin()->second.token);
-}
-NatureReader::Results BoxNatureDetector::read(Logger& logger, const ImageViewRGB32& frame){
-    NatureReader::Results results;
-    if (m_language != Language::None){
-        results.nature = read(logger, frame, m_box_nature);
-    }
-    return results;
-}
-
-
-
-}
-}
-}
+/*  Box Nature Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "PokemonSV_BoxNatureDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+const NatureReader& NATURE_READER(){
+    const static Pokemon::NatureReader reader("Pokemon/NatureCheckerOCR.json");
+    return reader;
+}
+
+BoxNatureDetector::BoxNatureDetector(VideoOverlay& overlay, Language language)
+    : m_language(language)
+    , m_box_nature(overlay, {0.757, 0.529, 0.141, 0.050})
+{}
+
+NatureCheckerValue BoxNatureDetector::read(Logger& logger, const ImageViewRGB32& frame, const OverlayBoxScope& box){
+    ImageViewRGB32 image = extract_box_reference(frame, box);
+    OCR::StringMatchResult result = NATURE_READER().read_substring(
+        logger, m_language, image,
+        OCR::WHITE_TEXT_FILTERS()
+    );
+    result.clear_beyond_log10p(NatureReader::MAX_LOG10P);
+    if (result.results.size() != 1){
+        return NatureCheckerValue::UnableToDetect;
+    }
+    return NATURE_CHECKER_VALUE_STRINGS().get_enum(result.results.begin()->second.token);
+}
+NatureReader::Results BoxNatureDetector::read(Logger& logger, const ImageViewRGB32& frame){
+    NatureReader::Results results;
+    if (m_language != Language::None){
+        results.nature = read(logger, frame, m_box_nature);
+    }
+    return results;
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/PokemonSV/Inference/Boxes/PokemonSV_BoxNatureDetector.h b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxNatureDetector.h
similarity index 87%
rename from SerialPrograms/Source/PokemonSV/Inference/Boxes/PokemonSV_BoxNatureDetector.h
rename to SerialPrograms/Source/VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxNatureDetector.h
index ab47368f5b..7cea85de2b 100644
--- a/SerialPrograms/Source/PokemonSV/Inference/Boxes/PokemonSV_BoxNatureDetector.h
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxNatureDetector.h
@@ -1,39 +1,39 @@
-/*  Box Nature Detector
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSV_BoxNatureDetector_H
-#define PokemonAutomation_PokemonSV_BoxNatureDetector_H
-
-#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
-#include "Pokemon/Inference/Pokemon_NatureReader.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-using namespace Pokemon;
-
-const NatureReader& NATURE_READER();
-
-class BoxNatureDetector {
-public:
-    BoxNatureDetector(VideoOverlay& overlay, Language language);
-
-    NatureReader::Results read(Logger& logger, const ImageViewRGB32& frame);
-
-private:
-    NatureCheckerValue read(Logger& logger, const ImageViewRGB32& frame, const OverlayBoxScope& box);
-
-private:
-    Language m_language;
-    OverlayBoxScope m_box_nature;
-};
-
-
-
-}
-}
-}
-#endif
+/*  Box Nature Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_BoxNatureDetector_H
+#define PokemonAutomation_PokemonSV_BoxNatureDetector_H
+
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "Pokemon/Inference/Pokemon_NatureReader.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+using namespace Pokemon;
+
+const NatureReader& NATURE_READER();
+
+class BoxNatureDetector{
+public:
+    BoxNatureDetector(VideoOverlay& overlay, Language language);
+
+    NatureReader::Results read(Logger& logger, const ImageViewRGB32& frame);
+
+private:
+    NatureCheckerValue read(Logger& logger, const ImageViewRGB32& frame, const OverlayBoxScope& box);
+
+private:
+    Language m_language;
+    OverlayBoxScope m_box_nature;
+};
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxShinyDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxShinyDetector.cpp
new file mode 100644
index 0000000000..b005bcf7fe
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxShinyDetector.cpp
@@ -0,0 +1,41 @@
+/*  Box Shiny Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonFramework/ImageTools/ImageStats.h"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+
+#include "PokemonSV_BoxShinyDetector.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+BoxShinyDetector::BoxShinyDetector(Color color, const ImageFloatBox& box)
+    : m_color(color), m_box(box)
+{}
+
+void BoxShinyDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_box);
+}
+
+bool BoxShinyDetector::detect(const ImageViewRGB32& frame){
+    const auto stats = image_stats(extract_box_reference(frame, m_box));
+    // cout << "stats.stddev.sum() " << stats.stddev.sum() << endl;
+    // On screenshots collected from macOS-Mirabox, non-shiny has stddev of at most 3.0, while
+    // shiny has stdddev of 160.
+    return stats.stddev.sum() > 100;
+}
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxShinyDetector.h b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxShinyDetector.h
new file mode 100644
index 0000000000..3ea7667bf2
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxShinyDetector.h
@@ -0,0 +1,48 @@
+/*  Box Shiny Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_BoxShinyDetector_H
+#define PokemonAutomation_PokemonSV_BoxShinyDetector_H
+
+#include "Common/Cpp/Color.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+#include "CommonTools/VisualDetector.h"
+//#include "VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxDetection.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+// Detect the shiny symbol on a pokemon in box system
+class BoxShinyDetector : public StaticScreenDetector{
+public:
+    BoxShinyDetector(Color color = COLOR_YELLOW, const ImageFloatBox& box = {0.878, 0.081, 0.028, 0.046});
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    Color m_color;
+    ImageFloatBox m_box;
+};
+
+class BoxShinyWatcher : public DetectorToFinder<BoxShinyDetector>{
+public:
+    BoxShinyWatcher(
+            Color color = COLOR_YELLOW,
+            const ImageFloatBox& box = {0.878, 0.081, 0.028, 0.046},
+            FinderType finder_type = FinderType::PRESENT
+        )
+            : DetectorToFinder("BoxShinyWatcher", finder_type, std::chrono::milliseconds(100), color, box)
+    {}
+};
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Boxes/PokemonSV_IvJudgeReader.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Boxes/PokemonSV_IvJudgeReader.cpp
new file mode 100644
index 0000000000..1d500bfeef
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Boxes/PokemonSV_IvJudgeReader.cpp
@@ -0,0 +1,74 @@
+/*  IV Judge Reader
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "PokemonSV_IvJudgeReader.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+const IvJudgeReader& IV_READER(){
+    const static Pokemon::IvJudgeReader reader("PokemonSV/IVCheckerOCR.json");
+    return reader;
+}
+
+
+
+IvJudgeReaderScope::IvJudgeReaderScope(VideoOverlay& overlay, Language language)
+    : m_language(language)
+    , m_box_hp      (overlay, {0.825, 0.192, 0.110, 0.052})
+    , m_box_attack  (overlay, {0.886, 0.302, 0.110, 0.052})
+    , m_box_defense (overlay, {0.886, 0.406, 0.110, 0.052})
+    , m_box_spatk   (overlay, {0.660, 0.302, 0.110, 0.052})
+    , m_box_spdef   (overlay, {0.660, 0.406, 0.110, 0.052})
+    , m_box_speed   (overlay, {0.825, 0.470, 0.110, 0.052})
+{}
+
+
+IvJudgeValue IvJudgeReaderScope::read(Logger& logger, const ImageViewRGB32& frame, const OverlayBoxScope& box){
+    ImageViewRGB32 image = extract_box_reference(frame, box);
+    OCR::StringMatchResult result = IV_READER().read_substring(
+        logger, m_language, image,
+        OCR::WHITE_TEXT_FILTERS()
+    );
+    result.clear_beyond_log10p(IvJudgeReader::MAX_LOG10P);
+    if (result.results.size() != 1){
+        return IvJudgeValue::UnableToDetect;
+    }
+    return IV_JUDGE_VALUE_STRINGS().get_enum(result.results.begin()->second.token);
+}
+IvJudgeReader::Results IvJudgeReaderScope::read(Logger& logger, const ImageViewRGB32& frame){
+    IvJudgeReader::Results results;
+    if (m_language != Language::None){
+        results.hp      = read(logger, frame, m_box_hp);
+        results.attack  = read(logger, frame, m_box_attack);
+        results.defense = read(logger, frame, m_box_defense);
+        results.spatk   = read(logger, frame, m_box_spatk);
+        results.spdef   = read(logger, frame, m_box_spdef);
+        results.speed   = read(logger, frame, m_box_speed);
+    }
+    return results;
+}
+
+std::vector<ImageViewRGB32> IvJudgeReaderScope::dump_images(const ImageViewRGB32& frame){
+    std::vector<ImageViewRGB32> images;
+    images.emplace_back(extract_box_reference(frame, m_box_hp));
+    images.emplace_back(extract_box_reference(frame, m_box_attack));
+    images.emplace_back(extract_box_reference(frame, m_box_defense));
+    images.emplace_back(extract_box_reference(frame, m_box_spatk));
+    images.emplace_back(extract_box_reference(frame, m_box_spdef));
+    images.emplace_back(extract_box_reference(frame, m_box_speed));
+    return images;
+}
+
+
+
+}
+}
+}
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Boxes/PokemonSV_IvJudgeReader.h b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Boxes/PokemonSV_IvJudgeReader.h
new file mode 100644
index 0000000000..17728b323f
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Boxes/PokemonSV_IvJudgeReader.h
@@ -0,0 +1,48 @@
+/*  IV Judge Reader
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_IvJudgeReader_H
+#define PokemonAutomation_PokemonSV_IvJudgeReader_H
+
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "Pokemon/Inference/Pokemon_IvJudgeReader.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+using namespace Pokemon;
+
+
+const IvJudgeReader& IV_READER();
+
+
+class IvJudgeReaderScope{
+public:
+    IvJudgeReaderScope(VideoOverlay& overlay, Language language);
+
+    IvJudgeReader::Results read(Logger& logger, const ImageViewRGB32& frame);
+
+    std::vector<ImageViewRGB32> dump_images(const ImageViewRGB32& frame);
+
+private:
+    IvJudgeValue read(Logger& logger, const ImageViewRGB32& frame, const OverlayBoxScope& box);
+
+private:
+    Language m_language;
+    OverlayBoxScope m_box_hp;
+    OverlayBoxScope m_box_attack;
+    OverlayBoxScope m_box_defense;
+    OverlayBoxScope m_box_spatk;
+    OverlayBoxScope m_box_spdef;
+    OverlayBoxScope m_box_speed;
+};
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Boxes/PokemonSV_StatsResetChecker.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Boxes/PokemonSV_StatsResetChecker.cpp
new file mode 100644
index 0000000000..19bea16f74
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Boxes/PokemonSV_StatsResetChecker.cpp
@@ -0,0 +1,49 @@
+/*  Egg Routines
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonTools/Options/LanguageOCROption.h"
+#include "Pokemon/Options/Pokemon_StatsHuntFilter.h"
+#include "VideoGames/PokemonSV/Inference/Boxes/PokemonSV_IvJudgeReader.h"
+#include "VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxNatureDetector.h"
+#include "VideoGames/PokemonSV/Programs/Boxes/PokemonSV_BoxRoutines.h"
+#include "PokemonSV_StatsResetChecker.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+bool check_stats_reset_info(
+    VideoStream& stream, ProControllerContext& context,
+    OCR::LanguageOCROption& LANGUAGE, Pokemon::StatsHuntIvJudgeFilterTable& FILTERS,
+    Pokemon::StatsHuntAction& action
+){
+    context.wait_for_all_requests();
+
+    Language language = LANGUAGE;
+
+    change_view_to_judge(stream, context, language);
+
+    VideoOverlaySet overlay_set(stream.overlay());
+    IvJudgeReaderScope iv_reader_scope(stream.overlay(), language);
+    VideoSnapshot screen = stream.video().snapshot();
+    IvJudgeReader::Results IVs = iv_reader_scope.read(stream.logger(), screen);
+    BoxNatureDetector nature_detector(stream.overlay(), LANGUAGE);
+    NatureReader::Results nature = nature_detector.read(stream.logger(), screen);
+    bool shiny = false;
+
+    stream.log(IVs.to_string(), COLOR_GREEN);
+    action = FILTERS.get_action(shiny, StatsHuntGenderFilter::Any, nature.nature, IVs);
+
+    return shiny;
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Boxes/PokemonSV_StatsResetChecker.h b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Boxes/PokemonSV_StatsResetChecker.h
new file mode 100644
index 0000000000..0c25389468
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Boxes/PokemonSV_StatsResetChecker.h
@@ -0,0 +1,43 @@
+/*  Stats Reset Checker
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_StatsResetChecker_H
+#define PokemonAutomation_PokemonSV_StatsResetChecker_H
+
+#include "CommonFramework/Tools/VideoStream.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+
+namespace PokemonAutomation{
+    struct ProgramInfo;
+    class ImageViewRGB32;
+
+namespace OCR{
+    class LanguageOCROption;
+}
+namespace Pokemon{
+    enum class StatsHuntAction;
+class StatsHuntIvJudgeFilterTable;
+}
+
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+//This is a similar to check_baby_info, except for Stats Reset
+bool check_stats_reset_info(
+    VideoStream& stream, ProControllerContext& context,
+    OCR::LanguageOCROption& LANGUAGE, Pokemon::StatsHuntIvJudgeFilterTable& FILTERS,
+    Pokemon::StatsHuntAction& action
+);
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogArrowDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogArrowDetector.cpp
new file mode 100644
index 0000000000..b9c221bc42
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogArrowDetector.cpp
@@ -0,0 +1,239 @@
+/*  Dialog Arrow Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Kernels/Waterfill/Kernels_Waterfill_Session.h"
+#include "CommonFramework/GlobalAutoPaths.h"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/ImageTypes/BinaryImage.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Images/BinaryImage_FilterRgb32.h"
+#include "CommonTools/Images/WaterfillUtilities.h"
+#include "CommonTools/ImageMatch/ExactImageMatcher.h"
+#include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h"
+#include "PokemonSV_DialogArrowDetector.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+using namespace Kernels;
+using namespace Kernels::Waterfill;
+
+class DialogArrowMatcher : public ImageMatch::WaterfillTemplateMatcher{
+public:
+    
+    DialogArrowMatcher() : WaterfillTemplateMatcher(
+        // "PokemonSV/DialogArrow-White-BlackBackground.png", Color(140, 140, 140), Color(255, 255, 255), 50
+        "PokemonSV/DialogArrow-White-NoBackground.png", Color(140, 140, 140), Color(255, 255, 255), 50
+    ){
+        m_aspect_ratio_lower = 0.8;
+        m_aspect_ratio_upper = 1.2;
+        m_area_ratio_lower = 0.8;
+        m_area_ratio_upper = 1.3;
+
+    }
+
+    static const ImageMatch::WaterfillTemplateMatcher& instance(){
+        static DialogArrowMatcher matcher;
+        return matcher;
+    }
+};
+
+const ImageMatch::ExactImageMatcher& DIALOG_ARROW_BLACK(){
+    static ImageMatch::ExactImageMatcher matcher(RESOURCE_PATH() + "PokemonSV/DialogArrow-Black.png");
+    return matcher;
+}
+const ImageMatch::ExactImageMatcher& DIALOG_ARROW_WHITE(){
+    static ImageMatch::ExactImageMatcher matcher(RESOURCE_PATH() + "PokemonSV/DialogArrow-White.png");
+    return matcher;
+}
+
+bool is_dialog_arrow(const ImageViewRGB32& image, const WaterfillObject& object, bool black_arrow){
+    double aspect_ratio = object.aspect_ratio();
+//    cout << "aspect_ratio = " << aspect_ratio << endl;
+    if (aspect_ratio < 1.1 || aspect_ratio > 1.4){
+        return false;
+    }
+//    double area = (double)object.area_ratio();
+//    if (area < 0.4 || area > 0.5){
+//        return false;
+//    }
+
+    ImageViewRGB32 cropped = extract_box_reference(image, object);
+//    cropped.save("test.png");
+
+    double rmsd = black_arrow
+        ? DIALOG_ARROW_BLACK().rmsd(cropped)
+        : DIALOG_ARROW_WHITE().rmsd(cropped);
+    return rmsd <= 120;
+}
+
+
+
+DialogArrowDetector::DialogArrowDetector(Color color, const ImageFloatBox& box)
+    : m_color(color)
+    , m_box(box)
+{}
+void DialogArrowDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_box);
+}
+bool DialogArrowDetector::detect(const ImageViewRGB32& screen){
+    std::vector<ImageFloatBox> hits = detect_all(screen);
+    return !hits.empty();
+}
+
+std::vector<ImageFloatBox> DialogArrowDetector::detect_all(const ImageViewRGB32& screen) const{
+    using namespace Kernels::Waterfill;
+
+    ImageViewRGB32 region = extract_box_reference(screen, m_box);
+
+    std::vector<ImageFloatBox> hits;
+
+    {
+        PackedBinaryMatrix matrix = compress_rgb32_to_binary_range(region, 0xff000000, 0xff7f7fbf);
+        std::unique_ptr<WaterfillSession> session = make_WaterfillSession(matrix);
+        auto iter = session->make_iterator(20);
+        WaterfillObject object;
+        while (iter->find_next(object, false)){
+            if (is_dialog_arrow(region, object, true)){
+                hits.emplace_back(translate_to_parent(screen, m_box, object));
+            }
+        }
+    }
+    {
+        PackedBinaryMatrix matrix = compress_rgb32_to_binary_range(region, 0xff808080, 0xffffffff);
+        std::unique_ptr<WaterfillSession> session = make_WaterfillSession(matrix);
+        auto iter = session->make_iterator(20);
+        WaterfillObject object;
+        while (iter->find_next(object, false)){
+            if (is_dialog_arrow(region, object, false)){
+                hits.emplace_back(translate_to_parent(screen, m_box, object));
+            }
+        }
+    }
+
+    return hits;
+}
+
+
+std::pair<double, double> DialogArrowDetector::locate_dialog_arrow(const ImageViewRGB32& screen) const{
+    const std::vector<std::pair<uint32_t, uint32_t>> filters = {
+        {combine_rgb(200, 200, 200), combine_rgb(255, 255, 255)},
+
+    };
+
+    ImageViewRGB32 cropped = extract_box_reference(screen, m_box);
+    // ImageRGB32 binaryImage = cropped.copy();
+    // PackedBinaryMatrix matrix = compress_rgb32_to_binary_range(cropped, 0xffC8C8C8, 0xffffffff);
+    // filter_by_mask(matrix, binaryImage, Color(COLOR_BLACK), true);
+
+    const double min_object_size = 50.0;
+    const double rmsd_threshold = 80.0;
+
+    const double screen_rel_size = (screen.height() / 1080.0);
+    const size_t min_size = size_t(screen_rel_size * screen_rel_size * min_object_size);
+
+    std::pair<double, double> arrow_location(-1.0, -1.0);
+
+    ImagePixelBox pixel_search_area = floatbox_to_pixelbox(screen.width(), screen.height(), m_box);
+    match_template_by_waterfill(
+        screen.size(),
+        cropped, 
+        DialogArrowMatcher::instance(),
+        filters,
+        {min_size, SIZE_MAX},
+        rmsd_threshold,
+        [&](Kernels::Waterfill::WaterfillObject& object) -> bool {
+            
+            arrow_location = std::make_pair(
+                (object.center_of_gravity_x() + pixel_search_area.min_x) / (double)screen.width(),
+                (object.center_of_gravity_y() + pixel_search_area.min_y) / (double)screen.height()
+            );
+
+            return true;
+        }
+    );
+
+    // std::cout << "north location: " << std::to_string(north_location.first) << ", " << std::to_string(north_location.second) << std::endl;
+
+    return arrow_location;
+}
+
+
+
+DialogArrowWatcher::~DialogArrowWatcher() = default;
+DialogArrowWatcher::DialogArrowWatcher(Color color, VideoOverlay& overlay, const ImageFloatBox& box, const double top_line, const double bottom_line)
+    : VisualInferenceCallback("GradientArrowFinder")
+    , m_overlay(overlay)
+    , m_detector(color, box)
+    , m_top_line(top_line)
+    , m_bottom_line(bottom_line)
+    , m_num_oscillation_above_top_line(0)
+    , m_num_oscillation_below_bottom_line(0)
+{}
+
+void DialogArrowWatcher::make_overlays(VideoOverlaySet& items) const{
+    m_detector.make_overlays(items);
+}
+
+// - return true if detects the arrow for 5 up and down oscillations
+// - every time the arrow is above top_line, increment m_num_oscillation_above_top_line. 
+// - likewise for m_num_oscillation_below_bottom_line
+// - we alternate between looking for the arrow being above top_line vs below bottom_line
+// - reset counts whenever the dialog arrow has not been detected for 10 frames consecutively
+bool DialogArrowWatcher::process_frame(const ImageViewRGB32& frame, WallClock timestamp){
+    std::pair<double, double> arrow_location = m_detector.locate_dialog_arrow(frame);
+    double y_location = arrow_location.second;
+    // cout << std::to_string(y_location) << endl;
+
+    if (y_location < 0){ // dialog arrow not detected
+        m_num_no_detection++;
+        if (m_num_no_detection > 10){
+            // reset oscillation counts
+            m_num_oscillation_above_top_line = 0;
+            m_num_oscillation_below_bottom_line = 0;
+        }
+        return false;        
+    }else{
+        m_num_no_detection = 0;
+    }
+    
+    if (m_num_oscillation_above_top_line >= 5 && m_num_oscillation_below_bottom_line >= 5){
+        // we have had 5 oscillations above and below the top and bottom line respectively
+        return true;
+    }
+
+    if (m_num_oscillation_above_top_line < m_num_oscillation_below_bottom_line){
+        // watch for the arrow above the top_line
+        if (y_location < m_top_line){ // remember that 0,0 is the top left corner. so being above a line, means less-than
+            // cout << "above top line." << endl;
+            m_num_oscillation_above_top_line++;
+        }
+    }else{
+        // watch for the arrow below the bottom_line
+        if (y_location > m_bottom_line){
+            // cout << "below bottom line." << endl;
+            m_num_oscillation_below_bottom_line++;
+        }        
+    }
+
+    return false;
+}
+
+
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogArrowDetector.h b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogArrowDetector.h
new file mode 100644
index 0000000000..4205290976
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogArrowDetector.h
@@ -0,0 +1,67 @@
+/*  Dialog Arrow Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_DialogArrowDetector_H
+#define PokemonAutomation_PokemonSV_DialogArrowDetector_H
+
+#include <vector>
+#include "Common/Cpp/Color.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+#include "CommonTools/VisualDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+class DialogArrowDetector : public StaticScreenDetector{
+public:
+    DialogArrowDetector(Color color, const ImageFloatBox& box);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+    std::vector<ImageFloatBox> detect_all(const ImageViewRGB32& screen) const;
+
+    std::pair<double, double> locate_dialog_arrow(const ImageViewRGB32& screen) const;
+
+protected:
+    Color m_color;
+    ImageFloatBox m_box;
+};
+
+
+
+class DialogArrowWatcher : public VisualInferenceCallback{
+public:
+    ~DialogArrowWatcher();
+    DialogArrowWatcher(Color color, VideoOverlay& overlay, const ImageFloatBox& box, const double top_line, const double bottom_line);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override;
+
+
+protected:
+    VideoOverlay& m_overlay;
+    DialogArrowDetector m_detector;
+    double m_top_line;
+    double m_bottom_line;
+    uint16_t m_num_oscillation_above_top_line;
+    uint16_t m_num_oscillation_below_bottom_line;
+    uint16_t m_num_no_detection;
+    // FixedLimitVector<OverlayBoxScope> m_arrows;
+
+};
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.cpp
new file mode 100644
index 0000000000..6d8ad2e147
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.cpp
@@ -0,0 +1,183 @@
+/*  Dialog Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonTools/Images/SolidColorTest.h"
+#include "Tests/ImageUnitTest.h"
+#include "PokemonSV_DialogArrowDetector.h"
+#include "PokemonSV_GradientArrowDetector.h"
+#include "PokemonSV_DialogDetector.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+DialogBoxDetector::DialogBoxDetector(Color color, bool true_if_detected, DialogType type)
+    : m_color(color)
+    , m_true_if_detected(true_if_detected)
+    , m_box_top(0.50, 0.74, 0.20, 0.01)
+    , m_box_bot(0.30, 0.88, 0.40, 0.01)
+    , m_border_top(0.24, 0.71, 0.52, 0.04)
+    , m_border_bot(0.24, 0.88, 0.52, 0.04)
+    , m_dialog_type(type)
+{}
+void DialogBoxDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_box_top);
+    items.add(m_color, m_box_bot);
+    items.add(m_color, m_border_top);
+    items.add(m_color, m_border_bot);
+}
+bool DialogBoxDetector::detect(const ImageViewRGB32& screen){
+    ImageStats stats_box_top = image_stats(extract_box_reference(screen, m_box_top));
+//    cout << stats_box_top.average << stats_box_top.stddev << endl;
+    bool white;
+    if (is_white(stats_box_top)){
+        white = true;
+        if (m_dialog_type == DialogType::DIALOG_BLACK){
+            return !m_true_if_detected;
+        }
+    }else if (is_black(stats_box_top, 150)){
+        white = false;
+        if (m_dialog_type == DialogType::DIALOG_WHITE){
+            return !m_true_if_detected;
+        }
+    }else{
+        return !m_true_if_detected;
+    }
+
+//    cout << "white = " << white << endl;
+
+    ImageStats stats_box_bot = image_stats(extract_box_reference(screen, m_box_bot));
+//    cout << stats_box_bot.average << stats_box_bot.stddev << endl;
+    if (white){
+        if (!is_white(stats_box_bot)){
+            return !m_true_if_detected;
+        }
+    }else{
+        if (!is_black(stats_box_bot, 150)){
+            return !m_true_if_detected;
+        }
+    }
+
+    ImageStats stats_border_top = image_stats(extract_box_reference(screen, m_border_top));
+//    cout << stats_border_top.average << stats_border_top.stddev << endl;
+    if (stats_border_top.stddev.sum() < 50){
+        return !m_true_if_detected;
+    }
+
+    ImageStats stats_border_bot = image_stats(extract_box_reference(screen, m_border_bot));
+//    cout << stats_border_bot.average << stats_border_bot.stddev << endl;
+    if (stats_border_bot.stddev.sum() < 20){
+        return !m_true_if_detected;
+    }
+
+    return m_true_if_detected;
+}
+
+
+
+
+AdvanceDialogDetector::AdvanceDialogDetector(Color color, DialogType type)
+    : m_box(color, true, type)
+    , m_arrow(0.710, 0.850, 0.030, 0.045)
+{}
+void AdvanceDialogDetector::make_overlays(VideoOverlaySet& items) const{
+    m_box.make_overlays(items);
+    items.add(m_box.color(), m_arrow);
+}
+bool AdvanceDialogDetector::detect(const ImageViewRGB32& screen){
+    if (!m_box.detect(screen)){
+        return false;
+    }
+
+    DialogArrowDetector arrow_detector(COLOR_RED, m_arrow);
+    return arrow_detector.detect(screen);
+}
+
+
+
+
+PromptDialogDetector::PromptDialogDetector(Color color)
+    : PromptDialogDetector(color, {0.50, 0.40, 0.40, 0.50})
+{}
+PromptDialogDetector::PromptDialogDetector(Color color, const ImageFloatBox& arrow_box)
+    : m_box(color)
+    , m_gradient(arrow_box)
+{}
+void PromptDialogDetector::make_overlays(VideoOverlaySet& items) const{
+    m_box.make_overlays(items);
+    items.add(m_box.color(), m_gradient);
+}
+bool PromptDialogDetector::detect(const ImageViewRGB32& screen){
+    if (!m_box.detect(screen)){
+        return false;
+    }
+
+    GradientArrowDetector gradiant_detector(COLOR_RED, GradientArrowType::RIGHT, m_gradient);
+    return gradiant_detector.detect(screen);
+}
+
+
+class Test_AdvanceDialogDetector : public ImageUnitTest{
+public:
+    Test_AdvanceDialogDetector(const std::string& image, bool expected)
+        : ImageUnitTest("PokemonSV::AdvanceDialogDetector - " + image, {image})
+        , m_expected(expected)
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        AdvanceDialogDetector detector(COLOR_RED);
+        const ImageRGB32& image = images[0];
+        return detector.detect(image) == m_expected;
+    }
+
+private:
+    bool m_expected;
+};
+
+class Test_DialogBoxDetector : public ImageUnitTest{
+public:
+    Test_DialogBoxDetector(const std::string& image, bool expected)
+        : ImageUnitTest("PokemonSV::DialogBoxDetector - " + image, {image})
+        , m_expected(expected)
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        DialogBoxDetector detector(COLOR_RED);
+        const ImageRGB32& image = images[0];
+        return detector.detect(image) == m_expected;
+    }
+
+private:
+    bool m_expected;
+};
+
+
+void add_tests_DialogDetector(UnitTestDatabase& database){
+    database.add<Test_DialogBoxDetector>("PokemonSV/DialogBoxDetector/French_True.png", true);
+}
+
+
+
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h
new file mode 100644
index 0000000000..51da16b4a7
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h
@@ -0,0 +1,125 @@
+/*  Dialog Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_DialogDetector_H
+#define PokemonAutomation_PokemonSV_DialogDetector_H
+
+#include "Common/Cpp/Color.h"
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+#include "CommonTools/VisualDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+enum class DialogType{
+    DIALOG_WHITE,
+    DIALOG_BLACK,
+    DIALOG_ALL
+};
+
+//  Detect any dialog box.
+class DialogBoxDetector : public StaticScreenDetector{
+public:
+    DialogBoxDetector(Color color = COLOR_RED, bool true_if_detected = true, DialogType type = DialogType::DIALOG_ALL);
+
+    Color color() const{ return m_color; }
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    Color m_color;
+    bool m_true_if_detected;
+    ImageFloatBox m_box_top;
+    ImageFloatBox m_box_bot;
+    ImageFloatBox m_border_top;
+    ImageFloatBox m_border_bot;
+    DialogType m_dialog_type;
+};
+class DialogBoxWatcher : public DetectorToFinder<DialogBoxDetector>{
+public:
+    DialogBoxWatcher(
+        Color color,
+        bool trigger_if_detected,
+        std::chrono::milliseconds duration = std::chrono::milliseconds(250),
+        DialogType type = DialogType::DIALOG_ALL
+    )
+         : DetectorToFinder("DialogBoxWatcher", duration, color, trigger_if_detected, type)
+    {}
+};
+
+
+
+
+//  Detect dialog that has the small arrow at bottom to show the next dialog.
+//  It should be able to detect both the white background dialog and black background dialog.
+class AdvanceDialogDetector : public StaticScreenDetector{
+public:
+    AdvanceDialogDetector(Color color = COLOR_RED, DialogType type = DialogType::DIALOG_ALL);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    DialogBoxDetector m_box;
+    ImageFloatBox m_arrow;
+};
+class AdvanceDialogWatcher : public DetectorToFinder<AdvanceDialogDetector>{
+public:
+    AdvanceDialogWatcher(Color color, DialogType type = DialogType::DIALOG_ALL, std::chrono::milliseconds duration = std::chrono::milliseconds(250))
+         : DetectorToFinder("AdvanceDialogWatcher", duration, color, type)
+    {}
+};
+
+
+
+//  Detect dialog that prompts the player to make a choice.
+//  i.e. detects that Dialog box and Gradient arrow are present
+class PromptDialogDetector : public StaticScreenDetector{
+public:
+    //  Will catch any prompt.
+    PromptDialogDetector(Color color);
+
+    //  Will only look for prompts with the cursor in this box.
+    PromptDialogDetector(Color color, const ImageFloatBox& arrow_box);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    DialogBoxDetector m_box;
+    ImageFloatBox m_gradient;
+};
+class PromptDialogWatcher : public DetectorToFinder<PromptDialogDetector>{
+public:
+    PromptDialogWatcher(
+        Color color,
+        std::chrono::milliseconds duration = std::chrono::milliseconds(250)
+    )
+         : DetectorToFinder("PromptDialogWatcher", duration, color)
+    {}
+    PromptDialogWatcher(
+        Color color,
+        const ImageFloatBox& arrow_box,
+        std::chrono::milliseconds duration = std::chrono::milliseconds(250)
+    )
+         : DetectorToFinder("PromptDialogWatcher", duration, color, arrow_box)
+    {}
+};
+
+
+void add_tests_DialogDetector(UnitTestDatabase& database);
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/PokemonSV/Inference/Dialogs/PokemonSV_GradientArrowDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_GradientArrowDetector.cpp
similarity index 83%
rename from SerialPrograms/Source/PokemonSV/Inference/Dialogs/PokemonSV_GradientArrowDetector.cpp
rename to SerialPrograms/Source/VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_GradientArrowDetector.cpp
index 9cb1311c22..9d67331ecf 100644
--- a/SerialPrograms/Source/PokemonSV/Inference/Dialogs/PokemonSV_GradientArrowDetector.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_GradientArrowDetector.cpp
@@ -1,18 +1,16 @@
 /*  Gradient Arrow Detector
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include <array>
-#include "Common/Cpp/Containers/FixedLimitVector.tpp"
 #include "Kernels/Waterfill/Kernels_Waterfill_Session.h"
-#include "CommonFramework/Globals.h"
+#include "CommonFramework/GlobalAutoPaths.h"
 #include "CommonFramework/ImageTypes/ImageViewRGB32.h"
 #include "CommonFramework/ImageTypes/BinaryImage.h"
-#include "CommonFramework/ImageTools/BinaryImage_FilterRgb32.h"
-//#include "CommonFramework/VideoPipeline/VideoOverlay.h"
-#include "CommonFramework/ImageMatch/ExactImageMatcher.h"
+#include "CommonTools/Images/BinaryImage_FilterRgb32.h"
+#include "CommonTools/ImageMatch/ExactImageMatcher.h"
 #include "PokemonSV_GradientArrowDetector.h"
 
 //#include <iostream>
@@ -39,6 +37,7 @@ const ImageMatch::ExactImageMatcher& GRADIENT_ARROW_VERTICAL(){
 
 bool is_gradient_arrow(
     GradientArrowType type,
+    const ImageViewRGB32& original_screen,
     const ImageViewRGB32& image,
     WaterfillObject& object,
     const WaterfillObject& yellow, const WaterfillObject& blue
@@ -46,7 +45,9 @@ bool is_gradient_arrow(
     object = yellow;
     object.merge_assume_no_overlap(blue);
 
-    if (object.width() < 20){
+    size_t object_box_area = object.width() * object.height();
+    double min_area = original_screen.total_pixels() * (2000. / (1920*1080));
+    if (object_box_area < min_area){
         return false;
     }
 
@@ -68,6 +69,9 @@ bool is_gradient_arrow(
         }
         double rmsd = GRADIENT_ARROW_HORIZONTAL().rmsd(cropped);
 //        cout << "rmsd = " << rmsd << endl;
+//        if (rmsd <= THRESHOLD){
+//            cout << "object_box_area = " << object_box_area << endl;
+//        }
         return rmsd <= THRESHOLD;
     }
     case GradientArrowType::DOWN:{
@@ -102,7 +106,7 @@ GradientArrowDetector::GradientArrowDetector(
 void GradientArrowDetector::make_overlays(VideoOverlaySet& items) const{
     items.add(m_color, m_box);
 }
-bool GradientArrowDetector::detect(const ImageViewRGB32& screen) const{
+bool GradientArrowDetector::detect(const ImageViewRGB32& screen){
     ImageFloatBox box;
     return detect(box, screen);
 }
@@ -225,7 +229,7 @@ bool GradientArrowDetector::detect(ImageFloatBox& box, const ImageViewRGB32& scr
     for (WaterfillObject& yellow : yellows){
         for (WaterfillObject& blue : blues){
             WaterfillObject object;
-            if (is_gradient_arrow(m_type, region, object, yellow, blue)){
+            if (is_gradient_arrow(m_type, screen, region, object, yellow, blue)){
 //                hits.emplace_back(translate_to_parent(screen, m_box, object));
 //                extract_box_reference(region, object).save("object.png");
                 box = translate_to_parent(screen, m_box, object);
@@ -243,32 +247,6 @@ bool GradientArrowDetector::detect(ImageFloatBox& box, const ImageViewRGB32& scr
 
 
 
-#if 0
-GradientArrowWatcher::~GradientArrowWatcher() = default;
-GradientArrowWatcher::GradientArrowWatcher(
-    Color color,
-    GradientArrowType type,
-    const ImageFloatBox& box
-)
-    : VisualInferenceCallback("GradientArrowWatcher")
-    , m_detector(color, type, box)
-{}
-
-void GradientArrowWatcher::make_overlays(VideoOverlaySet& items) const{
-    m_detector.make_overlays(items);
-}
-bool GradientArrowWatcher::process_frame(const VideoSnapshot& frame){
-    bool detected = m_detector.detect(frame);
-    if (detected){
-//        m_last_detected = frame;
-    }
-    return detected;
-}
-//bool GradientArrowWatcher::process_frame(const ImageViewRGB32& frame, WallClock timestamp){
-//    return m_detector.detect(frame);
-//}
-#endif
-
 
 
 
diff --git a/SerialPrograms/Source/PokemonSV/Inference/Dialogs/PokemonSV_GradientArrowDetector.h b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_GradientArrowDetector.h
similarity index 81%
rename from SerialPrograms/Source/PokemonSV/Inference/Dialogs/PokemonSV_GradientArrowDetector.h
rename to SerialPrograms/Source/VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_GradientArrowDetector.h
index da0b162d72..6076094496 100644
--- a/SerialPrograms/Source/PokemonSV/Inference/Dialogs/PokemonSV_GradientArrowDetector.h
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_GradientArrowDetector.h
@@ -1,20 +1,16 @@
 /*  Gradient Arrow Detector
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifndef PokemonAutomation_PokemonSV_GradientArrowDetector_H
 #define PokemonAutomation_PokemonSV_GradientArrowDetector_H
 
-#include <vector>
 #include "Common/Cpp/Color.h"
-//#include "Common/Cpp/Containers/FixedLimitVector.h"
 #include "CommonFramework/ImageTools/ImageBoxes.h"
-//#include "CommonFramework/VideoPipeline/VideoFeed.h"
 #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
-//#include "CommonFramework/InferenceInfra/VisualInferenceCallback.h"
-#include "CommonFramework/Inference/VisualDetector.h"
+#include "CommonTools/VisualDetector.h"
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
@@ -35,7 +31,7 @@ class GradientArrowDetector : public StaticScreenDetector{
     );
 
     virtual void make_overlays(VideoOverlaySet& items) const override;
-    virtual bool detect(const ImageViewRGB32& screen) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
 
     //  If arrow is found, returns true and "box" contains the box for the arrow.
     //  Otherwise, returns false and "box" is undefined.
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/ItemPrinter/PokemonSV_ItemPrinterJobsDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/ItemPrinter/PokemonSV_ItemPrinterJobsDetector.cpp
new file mode 100644
index 0000000000..3dacb1b548
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/ItemPrinter/PokemonSV_ItemPrinterJobsDetector.cpp
@@ -0,0 +1,156 @@
+/*  Tournament Prize Jobs Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <map>
+#include "Common/Cpp/Concurrency/SpinLock.h"
+#include "Common/Cpp/Concurrency/AsyncTask.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/ImageTypes/ImageRGB32.h"
+#include "CommonFramework/Tools/GlobalThreadPools.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Images/ImageFilter.h"
+#include "CommonTools/OCR/OCR_NumberReader.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "PokemonSV_ItemPrinterJobsDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+ItemPrinterJobsDetector::ItemPrinterJobsDetector(Color color)
+    : m_color(color)
+    , m_box_normal(0.86, 0.34, 0.045, 0.050)
+    , m_box_bonus(0.86, 0.423, 0.045, 0.050)
+{}
+
+void ItemPrinterJobsDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_box_normal);
+    items.add(m_color, m_box_bonus);
+}
+std::pair<uint8_t, uint8_t> ItemPrinterJobsDetector::read_box(
+    Logger& logger,
+    const ImageViewRGB32& screen, const ImageFloatBox& box
+) const{
+    ImageViewRGB32 cropped = extract_box_reference(screen, box);
+
+    std::vector<std::pair<ImageRGB32, size_t>> filtered = to_blackwhite_rgb32_range(
+        cropped,
+        {
+            {true, 0xff808080, 0xffffffff},
+            {true, 0xff909090, 0xffffffff},
+            {true, 0xffa0a0a0, 0xffffffff},
+            {true, 0xffb0b0b0, 0xffffffff},
+            {true, 0xffc0c0c0, 0xffffffff},
+            {true, 0xffd0d0d0, 0xffffffff},
+            {true, 0xffe0e0e0, 0xffffffff},
+            {true, 0xfff0f0f0, 0xffffffff},
+        }
+    );
+
+    SpinLock lock;
+    std::map<uint8_t, uint8_t> candidates;
+
+    GlobalThreadPools::computation_normal().run_in_parallel(
+        [&](size_t index){
+            int num = OCR::read_number(logger, filtered[index].first);
+            std::string str = std::to_string(num);
+            WriteSpinLock lg(lock);
+            if (str == "1"){
+                candidates[1]++;
+            }else if (str == "5"){
+                candidates[5]++;
+            }else if (str == "10"){
+                candidates[10]++;
+            }else if (str[0] == '5'){
+                candidates[5]++;
+            }else if (str[0] == '1' && str[1] == '0'){
+                candidates[10]++;
+            }else if (str[0] == '1' && str[1] == '5'){
+            }else if (str[0] == '1'){
+                candidates[1]++;
+            }
+        },
+        0, filtered.size(), 1
+    );
+
+    std::pair<uint8_t, uint8_t> best;
+    for (const auto& item : candidates){
+        if (item.second > best.second){
+            best = item;
+        }
+    }
+
+    return best;
+
+
+#if 0
+    ImageRGB32 filtered = to_blackwhite_rgb32_range(cropped, 0xffc0c0c0, 0xffffffff, true);
+
+    static int c = 0;
+    filtered.save("test-" + std::to_string(c++) + ".png");
+
+    int num = OCR::read_number(logger, filtered, m_language);
+    std::string str = std::to_string(num);
+    if (str[0] == '5'){
+        return 5;
+    }
+    if (str[0] == '1' && str[1] == '0'){
+        return 10;
+    }
+    if (str[0] == '1'){
+        return 1;
+    }
+    return 0;
+#endif
+}
+uint8_t ItemPrinterJobsDetector::detect_jobs(Logger& logger, const ImageViewRGB32& screen) const{
+    std::pair<uint8_t, uint8_t> normal = read_box(logger, screen, m_box_normal);
+    if (normal.second > 6){
+        return normal.first;
+    }
+    std::pair<uint8_t, uint8_t> bonus = read_box(logger, screen, m_box_bonus);
+    if (normal.second + 2 > bonus.second){
+        return normal.first;
+    }else{
+        return bonus.first;
+    }
+}
+
+
+void ItemPrinterJobsDetector::set_print_jobs(
+    VideoStream& stream, ProControllerContext& context, uint8_t jobs
+) const{
+    VideoSnapshot snapshot;
+    for (size_t c = 0; c < 10; c++){
+        context.wait_for_all_requests();
+        snapshot = stream.video().snapshot();
+        uint8_t current_jobs = detect_jobs(stream.logger(), snapshot);
+        if (current_jobs == jobs){
+            return;
+        }
+        pbf_press_button(context, BUTTON_R, 160ms, 240ms);
+    }
+
+    throw_and_log<OperationFailedExceptionWithScreenshot>(
+        stream.logger(), ErrorReportMode::SEND_ERROR_REPORT,
+        "Failed to set jobs after 10 tries.",
+        &stream,
+        std::move(snapshot.frame)
+    );
+}
+
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/ItemPrinter/PokemonSV_ItemPrinterJobsDetector.h b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/ItemPrinter/PokemonSV_ItemPrinterJobsDetector.h
new file mode 100644
index 0000000000..c9c4a36885
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/ItemPrinter/PokemonSV_ItemPrinterJobsDetector.h
@@ -0,0 +1,52 @@
+/*  Item Printer Jobs Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_ItemPrinterJobsDetector_H
+#define PokemonAutomation_PokemonSV_ItemPrinterJobsDetector_H
+
+#include "Common/Cpp/Color.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/Tools/VideoStream.h"
+#include "CommonTools/VisualDetector.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+
+namespace PokemonAutomation{
+    class Logger;
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+class ItemPrinterJobsDetector{
+public:
+    ItemPrinterJobsDetector(Color color);
+
+    void make_overlays(VideoOverlaySet& items) const;
+    uint8_t detect_jobs(Logger& logger, const ImageViewRGB32& screen) const;
+
+    //  "jobs" jobs must be 1, 5, or 10.
+    void set_print_jobs(
+        VideoStream& stream, ProControllerContext& context, uint8_t jobs
+    ) const;
+
+
+private:
+    std::pair<uint8_t, uint8_t> read_box(
+        Logger& logger,
+        const ImageViewRGB32& screen, const ImageFloatBox& box
+    ) const;
+
+private:
+    Color m_color;
+    ImageFloatBox m_box_normal;
+    ImageFloatBox m_box_bonus;
+
+};
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/ItemPrinter/PokemonSV_ItemPrinterMaterialDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/ItemPrinter/PokemonSV_ItemPrinterMaterialDetector.cpp
new file mode 100644
index 0000000000..9c88b938a6
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/ItemPrinter/PokemonSV_ItemPrinterMaterialDetector.cpp
@@ -0,0 +1,315 @@
+/*  Tournament Prize Jobs Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <map>
+#include "Common/Cpp/Concurrency/SpinLock.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/ImageTypes/ImageRGB32.h"
+#include "CommonFramework/ImageTools/ImageStats.h"
+#include "CommonFramework/Tools/GlobalThreadPools.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Images/ImageFilter.h"
+#include "CommonTools/OCR/OCR_NumberReader.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "PokemonSV_ItemPrinterMaterialDetector.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+MaterialNameReader& MaterialNameReader::instance(){
+    static MaterialNameReader reader;
+    return reader;
+}
+
+// MaterialNameReader has a very limited dictionary,
+// so it can only reliably read the material names with 68% value
+// (i.e. Ditto Goo, Happiny Dust, Magby Hair, Beldum Claw)
+MaterialNameReader::MaterialNameReader()
+    : SmallDictionaryMatcher("PokemonSV/ItemPrinterMaterialOCR.json")
+{}
+
+OCR::StringMatchResult MaterialNameReader::read_substring(
+    Logger& logger,
+    Language language,
+    const ImageViewRGB32& image,
+    const std::vector<OCR::TextColorRange>& text_color_ranges,
+    double min_text_ratio, double max_text_ratio
+) const{
+    return match_substring_from_image_multifiltered(
+        &logger, language, image, text_color_ranges,
+        MAX_LOG10P, MAX_LOG10P_SPREAD, min_text_ratio, max_text_ratio
+    );
+}
+
+
+ItemPrinterMaterialDetector::ItemPrinterMaterialDetector(Color color, Language language)
+    : m_color(color)
+    , m_language(language)
+    , m_box_mat_value(Material_Boxes(ImageFloatBox(0.39, 0.176758, 0.025, 0.050)))
+    , m_box_mat_quantity(Material_Boxes(ImageFloatBox(0.485, 0.176758, 0.037, 0.050)))
+    , m_box_mat_name(Material_Boxes(ImageFloatBox(0.090, 0.176758, 0.275, 0.050)))
+{}
+
+std::array<ImageFloatBox, 10> ItemPrinterMaterialDetector::Material_Boxes(ImageFloatBox initial_box){
+    std::array<ImageFloatBox, 10> material_boxes;
+    double x = initial_box.x;
+    double width = initial_box.width;
+    double height = initial_box.height;
+    double initial_y = initial_box.y;
+    double y_spacing = 0.074219;
+    for (size_t i = 0; i < 10; i++){
+        double y = initial_y + i*y_spacing;
+        material_boxes[i] = ImageFloatBox(x, y, width, height);
+        // std::cout << "{" << x << "," << y << "," << width << "," << height << "}, ";
+    }
+    // std::cout << std::endl;
+    return material_boxes;
+}
+
+void ItemPrinterMaterialDetector::make_overlays(VideoOverlaySet& items) const{
+    for (size_t i = 0; i < 10; i++){
+        items.add(m_color, m_box_mat_value[i]);
+        items.add(m_color, m_box_mat_quantity[i]);
+        items.add(m_color, m_box_mat_name[i]);
+    }
+}
+
+int16_t ItemPrinterMaterialDetector::read_number(
+    Logger& logger,
+    const ImageViewRGB32& screen, const ImageFloatBox& box,
+    int8_t row_index
+) const{
+
+    ImageViewRGB32 cropped = extract_box_reference(screen, box);
+    ImageRGB32 filtered = to_blackwhite_rgb32_range(
+        cropped,
+        true,
+        0xff000000, 0xff808080
+    );
+    // filtered.save("DebugDumps/test-one-filter-1.png");
+    bool is_dark_text_light_background = image_stats(filtered).average.sum() > 400;
+    // std::cout << "Average sum of filtered: "<< std::to_string(image_stats(filtered).average.sum()) << std::endl;
+
+    const std::vector<std::pair<uint32_t, uint32_t>> filters = 
+        [&](){
+            if (is_dark_text_light_background){
+                return std::vector<std::pair<uint32_t, uint32_t>>{
+                    // {0xff000000, 0xffb0b0b0},
+                    {0xff000000, 0xffa0a0a0},
+                    {0xff000000, 0xff959595},
+                    {0xff000000, 0xff909090},
+                    {0xff000000, 0xff858585},
+                    {0xff000000, 0xff808080},
+                    // {0xff000000, 0xff707070},
+                    // {0xff000000, 0xff606060},
+                    // {0xff000000, 0xff505050},
+                    // {0xff000000, 0xff404040},
+                    // {0xff000000, 0xff303030},
+                    // {0xff000000, 0xff202020},
+                    // {0xff000000, 0xff101010},
+                };
+            }else{
+                return std::vector<std::pair<uint32_t, uint32_t>>{
+                    {0xff808080, 0xffffffff},
+                    {0xff858585, 0xffffffff},
+                    {0xff909090, 0xffffffff},
+                    {0xff959595, 0xffffffff},
+                    {0xffa0a0a0, 0xffffffff},
+                    // {0xffb0b0b0, 0xffffffff},
+                    // {0xffc0c0c0, 0xffffffff},
+                    // {0xffd0d0d0, 0xffffffff},
+                    // {0xffe0e0e0, 0xffffffff},
+                    // {0xfff0f0f0, 0xffffffff},
+                };
+            }
+        }();
+    
+    const bool text_inside_range = true;
+    const bool prioritize_numeric_only_results = true;
+    const size_t max_width = (size_t)((double)24 * screen.width() / 1080);
+    const size_t min_digit_area = 20;
+    int16_t number = (int16_t)OCR::read_number_waterfill_multifilter(
+        logger,
+        GlobalThreadPools::computation_normal(),
+        cropped, filters,
+        text_inside_range, prioritize_numeric_only_results,
+        max_width,
+        min_digit_area,
+        row_index
+    );
+
+    if (number < 1 || number > 999){
+        number = -1;
+    }
+    return (int16_t)number;
+}
+
+
+// return row number where Happiny dust is located on screen
+// keep pressing DPAD_RIGHT until Happiny dust is on screen
+// check each row on the screen for Happiny Dust
+int8_t ItemPrinterMaterialDetector::find_happiny_dust_row_index(
+    VideoStream& stream, ProControllerContext& context
+) const{
+    int8_t happiny_dust_row_index = -1;
+    for (size_t c = 0; c < 30; c++){
+        context.wait_for_all_requests();
+        VideoSnapshot snapshot = stream.video().snapshot();
+        int8_t total_rows = 10;
+        
+        SpinLock lock;
+        GlobalThreadPools::computation_normal().run_in_parallel(
+            [&](size_t index){
+                std::string material_name = detect_material_name(stream, snapshot, context, (int8_t)index);
+                if ("happiny-dust" == material_name){
+                    WriteSpinLock lg(lock);
+                    happiny_dust_row_index = (int8_t)index;
+                }
+            },
+            0, total_rows, 1
+        );
+
+        if (happiny_dust_row_index != -1){
+            // found screen and row number with Happiny dust.
+            // std::cout << "Happiny dust found. Row number: " << std::to_string(value_68_row_index) << std::endl;
+            return happiny_dust_row_index;
+        }
+
+        // keep searching for Happiny dust
+        pbf_press_dpad(context, DPAD_RIGHT, 160ms, 240ms);
+    }
+
+    OperationFailedExceptionWithScreenshot::fire(
+        ErrorReportMode::SEND_ERROR_REPORT,
+        "Failed to find Happiny dust after multiple attempts.",
+        stream
+    );
+
+}
+
+
+int16_t ItemPrinterMaterialDetector::find_highest_quantity_of_value_68(VideoStream& stream, ProControllerContext& context) const{
+    int16_t highest_quantity_of_value_68 = 0;
+    bool seen_material_value_68 = false;
+    for (size_t c = 0; c < 30; c++){
+        context.wait_for_all_requests();
+        VideoSnapshot snapshot = stream.video().snapshot();
+
+        std::vector<int8_t> value_68_row_indexes = find_material_value_row_index(stream, context, 68);
+        if (!value_68_row_indexes.empty()){
+            seen_material_value_68 = true;
+        }
+
+        for (int8_t row_index : value_68_row_indexes){            
+            int16_t quantity = detect_material_quantity(stream, snapshot, context, row_index);
+            if (quantity > highest_quantity_of_value_68){
+                highest_quantity_of_value_68 = quantity;
+            }
+        }
+
+        // keep searching for highest quantity of value 68.
+        pbf_press_dpad(context, DPAD_RIGHT, 160ms, 240ms);
+    }
+
+    if (!seen_material_value_68){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "find_highest_quantity_of_value_68: Failed to find any material with value of 68, after multiple attempts.",
+            stream
+        );
+    }
+
+    return highest_quantity_of_value_68;
+
+}
+
+std::string ItemPrinterMaterialDetector::detect_material_name(
+    VideoStream& stream,
+    const ImageViewRGB32& screen,
+    ProControllerContext& context,
+    int8_t row_index
+) const{
+    
+    ImageFloatBox material_name_box = m_box_mat_name[row_index];
+    ImageViewRGB32 material_name_image = extract_box_reference(screen, material_name_box);
+    const auto ocr_result = MaterialNameReader::instance().read_substring(
+        stream.logger(), m_language,
+        material_name_image, OCR::BLACK_OR_WHITE_TEXT_FILTERS()
+    );
+
+    std::multimap<double, OCR::StringMatchData> results;
+    if (!ocr_result.results.empty()){
+        for (const auto& result : ocr_result.results){
+            results.emplace(result.first, result.second);
+        }
+    }
+
+    if (results.empty()){
+        return "";
+    }
+
+    if (results.size() > 1){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "ItemPrinterMaterialDetector::detect_material_name(): Unable to read selected item. Ambiguous or multiple results.\n" + language_warning(m_language),
+            stream
+        );
+    }
+
+    return results.begin()->second.token;
+}
+
+// return vector of row index(es) that matches given material_value.
+std::vector<int8_t> ItemPrinterMaterialDetector::find_material_value_row_index(
+    VideoStream& stream,
+    ProControllerContext& context,
+    int16_t material_value
+) const{
+    context.wait_for_all_requests();
+    VideoSnapshot snapshot = stream.video().snapshot();
+    int8_t total_rows = 10;
+    std::vector<int8_t> row_indexes;
+    SpinLock lock;
+
+    GlobalThreadPools::computation_normal().run_in_parallel(
+        [&](size_t index){
+            int16_t value = read_number(stream.logger(), snapshot, m_box_mat_value[index], (int8_t)index);
+            if (value == material_value){
+                WriteSpinLock lg(lock);
+                row_indexes.push_back((int8_t)index);
+            }
+        },
+        0, total_rows, 1
+    );
+
+    return row_indexes;    
+
+}
+
+int16_t ItemPrinterMaterialDetector::detect_material_quantity(
+    VideoStream& stream,
+    const ImageViewRGB32& screen,
+    ProControllerContext& context,
+    int8_t row_index
+) const{
+    int16_t value = read_number(stream.logger(), screen, m_box_mat_quantity[row_index], row_index);
+    return value;
+}
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/ItemPrinter/PokemonSV_ItemPrinterMaterialDetector.h b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/ItemPrinter/PokemonSV_ItemPrinterMaterialDetector.h
new file mode 100644
index 0000000000..83138e0b8f
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/ItemPrinter/PokemonSV_ItemPrinterMaterialDetector.h
@@ -0,0 +1,102 @@
+/*  Item Printer Jobs Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_ItemPrinterMaterialDetector_H
+#define PokemonAutomation_PokemonSV_ItemPrinterMaterialDetector_H
+
+#include <array>
+#include "Common/Cpp/Color.h"
+#include "CommonFramework/Language.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/Tools/VideoStream.h"
+#include "CommonTools/OCR/OCR_SmallDictionaryMatcher.h"
+#include "CommonTools/VisualDetector.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+
+namespace PokemonAutomation{
+    class Logger;
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+class MaterialNameReader : public OCR::SmallDictionaryMatcher{
+    static constexpr double MAX_LOG10P = -1.40;
+    static constexpr double MAX_LOG10P_SPREAD = 0.50;
+
+public:
+    MaterialNameReader();
+
+    static MaterialNameReader& instance();
+
+    OCR::StringMatchResult read_substring(
+        Logger& logger,
+        Language language,
+        const ImageViewRGB32& image,
+        const std::vector<OCR::TextColorRange>& text_color_ranges,
+        double min_text_ratio = 0.01, double max_text_ratio = 0.50
+    ) const;
+};    
+
+class ItemPrinterMaterialDetector{
+public:
+    ItemPrinterMaterialDetector(Color color, Language language);
+
+    void make_overlays(VideoOverlaySet& items) const;
+
+    std::array<ImageFloatBox, 10> Material_Boxes(ImageFloatBox initial_box);
+
+    int8_t find_happiny_dust_row_index(
+        VideoStream& stream, ProControllerContext& context
+    ) const;
+
+    // find the quantity of all materials with a value of 68. return the highest quantity.
+    int16_t find_highest_quantity_of_value_68(VideoStream& stream, ProControllerContext& context) const;
+
+    std::vector<int8_t> find_material_value_row_index(
+        VideoStream& stream,
+        ProControllerContext& context,
+        int16_t material_value
+    ) const;
+
+    // detect the quantity of material at the given row number
+    int16_t detect_material_quantity(
+        VideoStream& stream,
+        const ImageViewRGB32& screen,
+        ProControllerContext& context,
+        int8_t row_index
+    ) const;
+
+    // detects the material name at the given row_index, given the screen
+    std::string detect_material_name(
+        VideoStream& stream,
+        const ImageViewRGB32& screen,
+        ProControllerContext& context,
+        int8_t row_index
+    ) const;    
+
+    int16_t read_number(
+        Logger& logger,
+        const ImageViewRGB32& screen, const ImageFloatBox& box,
+        int8_t row_index
+    ) const;
+
+
+private:
+    Color m_color;
+    Language m_language;
+    std::array<ImageFloatBox, 10> m_box_mat_value;    // {0.39,0.176758,0.025,0.05}, {0.39,0.250977,0.025,0.05}, {0.39,0.325196,0.025,0.05}, {0.39,0.399415,0.025,0.05}, {0.39,0.473634,0.025,0.05}, {0.39,0.547853,0.025,0.05}, {0.39,0.622072,0.025,0.05}, {0.39,0.696291,0.025,0.05}, {0.39,0.77051,0.025,0.05}, {0.39,0.844729,0.025,0.05}, 
+    std::array<ImageFloatBox, 10> m_box_mat_quantity; // {0.485,0.176758,0.037,0.05}, {0.485,0.250977,0.037,0.05}, {0.485,0.325196,0.037,0.05}, {0.485,0.399415,0.037,0.05}, {0.485,0.473634,0.037,0.05}, {0.485,0.547853,0.037,0.05}, {0.485,0.622072,0.037,0.05}, {0.485,0.696291,0.037,0.05}, {0.485,0.77051,0.037,0.05}, {0.485,0.844729,0.037,0.05}, 
+    std::array<ImageFloatBox, 10> m_box_mat_name;     // {0.09,0.176758,0.275,0.05}, {0.09,0.250977,0.275,0.05}, {0.09,0.325196,0.275,0.05}, {0.09,0.399415,0.275,0.05}, {0.09,0.473634,0.275,0.05}, {0.09,0.547853,0.275,0.05}, {0.09,0.622072,0.275,0.05}, {0.09,0.696291,0.275,0.05}, {0.09,0.77051,0.275,0.05}, {0.09,0.844729,0.275,0.05}, 
+
+    
+};
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/ItemPrinter/PokemonSV_ItemPrinterMenuDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/ItemPrinter/PokemonSV_ItemPrinterMenuDetector.cpp
new file mode 100644
index 0000000000..1621083f88
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/ItemPrinter/PokemonSV_ItemPrinterMenuDetector.cpp
@@ -0,0 +1,40 @@
+/*  Main Menu Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonTools/Images/SolidColorTest.h"
+#include "PokemonSV_ItemPrinterMenuDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+ItemPrinterMenuDetector::ItemPrinterMenuDetector(Color color)
+    : m_color(color)
+    , m_bottom(0.05, 0.945, 0.50, 0.04)
+    , m_buttons(color, WhiteButton::ButtonX, {0.63, 0.93, 0.17, 0.06})
+{}
+
+void ItemPrinterMenuDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_bottom);
+    m_buttons.make_overlays(items);
+}
+bool ItemPrinterMenuDetector::detect(const ImageViewRGB32& screen){
+    ImageViewRGB32 bottom = extract_box_reference(screen, m_bottom);
+    ImageStats bottom_stats = image_stats(bottom);
+    if (!is_solid(bottom_stats, {0, 0.318898, 0.681102})){
+        return false;
+    }
+    if (!m_buttons.detect(screen)){
+        return false;
+    }
+    return true;
+}
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/ItemPrinter/PokemonSV_ItemPrinterMenuDetector.h b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/ItemPrinter/PokemonSV_ItemPrinterMenuDetector.h
new file mode 100644
index 0000000000..c8a13162c5
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/ItemPrinter/PokemonSV_ItemPrinterMenuDetector.h
@@ -0,0 +1,45 @@
+/*  Main Menu Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_ItemPrinterMenuDetector_H
+#define PokemonAutomation_PokemonSV_ItemPrinterMenuDetector_H
+
+#include "CommonTools/VisualDetector.h"
+#include "VideoGames/PokemonSV/Inference/PokemonSV_WhiteButtonDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+class ItemPrinterMenuDetector : public StaticScreenDetector{
+public:
+    ItemPrinterMenuDetector(Color color);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+
+private:
+    Color m_color;
+    ImageFloatBox m_bottom;
+    WhiteButtonWatcher m_buttons;
+};
+class ItemPrinterMenuWatcher : public DetectorToFinder<ItemPrinterMenuDetector>{
+public:
+    ItemPrinterMenuWatcher(Color color)
+         : DetectorToFinder("ItemPrinterMenuWatcher", std::chrono::milliseconds(250), color)
+    {}
+};
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/ItemPrinter/PokemonSV_ItemPrinterPrizeReader.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/ItemPrinter/PokemonSV_ItemPrinterPrizeReader.cpp
new file mode 100644
index 0000000000..313f1bdcee
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/ItemPrinter/PokemonSV_ItemPrinterPrizeReader.cpp
@@ -0,0 +1,192 @@
+/*  Item Printer - Prize Reader
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Concurrency/AsyncTask.h"
+#include "CommonFramework/ImageTypes/ImageRGB32.h"
+#include "CommonFramework/ImageTools/ImageStats.h"
+#include "CommonFramework/Tools/GlobalThreadPools.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Images/ImageFilter.h"
+#include "CommonTools/OCR/OCR_SmallDictionaryMatcher.h"
+#include "CommonTools/OCR/OCR_NumberReader.h"
+#include "PokemonSV_ItemPrinterPrizeReader.h"
+
+// #include <iostream>
+// using std::cout;
+// using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+
+class ItemPrinterPrizeOCR : public OCR::SmallDictionaryMatcher{
+public:
+    static constexpr double MAX_LOG10P = -1.40;
+    static constexpr double MAX_LOG10P_SPREAD = 0.50;
+
+public:
+    ItemPrinterPrizeOCR()
+        : SmallDictionaryMatcher("PokemonSV/ItemPrinterPrizeOCR.json")
+    {}
+
+    static ItemPrinterPrizeOCR& instance(){
+        static ItemPrinterPrizeOCR reader;
+        return reader;
+    }
+
+    OCR::StringMatchResult read_substring(
+        Logger* logger,
+        Language language,
+        const ImageViewRGB32& image,
+        const std::vector<OCR::TextColorRange>& text_color_ranges,
+        double min_text_ratio = 0.01, double max_text_ratio = 0.50
+    ) const{
+        return match_substring_from_image_multifiltered(
+            logger, language, image, text_color_ranges,
+            MAX_LOG10P, MAX_LOG10P_SPREAD, min_text_ratio, max_text_ratio
+        );
+    }
+
+};
+
+
+
+
+ItemPrinterPrizeReader::ItemPrinterPrizeReader(Language language)
+    : m_language(language)
+{
+    for (size_t c = 0; c < 10; c++){
+        m_boxes_normal[c] = ImageFloatBox(0.361, 0.175 + c * 0.0764444, 0.240, 0.060);
+        m_boxes_bonus[c] = ImageFloatBox(0.361, 0.204 + c * 0.0764444, 0.240, 0.060);
+        m_boxes_normal_quantity[c] = ImageFloatBox(0.649, 0.175 + c * 0.0764444, 0.034000, 0.060);
+        m_boxes_bonus_quantity[c] = ImageFloatBox(0.649, 0.204 + c * 0.0764444, 0.034000, 0.060);
+    }
+}
+
+void ItemPrinterPrizeReader::make_overlays(VideoOverlaySet& items) const{
+    for (size_t c = 0; c < 10; c++){
+        items.add(COLOR_GREEN, m_boxes_normal[c]);
+        items.add(COLOR_BLUE, m_boxes_bonus[c]);
+        items.add(COLOR_GREEN, m_boxes_normal_quantity[c]);
+        items.add(COLOR_BLUE, m_boxes_bonus_quantity[c]);
+    }
+}
+std::array<std::string, 10> ItemPrinterPrizeReader::read_prizes(
+    Logger& logger, const ImageViewRGB32& screen
+) const{
+    //  OCR 20 things in parallel.
+    OCR::StringMatchResult results[20];
+
+    GlobalThreadPools::computation_normal().run_in_parallel(
+        [&](size_t index){
+            if (index < 10){
+                results[index] = ItemPrinterPrizeOCR::instance().read_substring(
+                    nullptr, m_language,
+                    extract_box_reference(screen, m_boxes_normal[index]),
+                    OCR::WHITE_TEXT_FILTERS()
+                );
+            }else{
+                results[index] = ItemPrinterPrizeOCR::instance().read_substring(
+                    nullptr, m_language,
+                    extract_box_reference(screen, m_boxes_bonus[index - 10]),
+                    OCR::WHITE_TEXT_FILTERS()
+                );
+            }
+        },
+        0, 20, 1
+    );
+
+    std::array<std::string, 10> ret;
+    for (size_t c = 0; c < 10; c++){
+        OCR::StringMatchResult& result = results[c];
+        result.clear_beyond_log10p(MAX_LOG10P);
+        result.clear_beyond_spread(MAX_LOG10P_SPREAD);
+        result += results[10 + c];
+        result.clear_beyond_log10p(MAX_LOG10P);
+        result.clear_beyond_spread(MAX_LOG10P_SPREAD);
+        result.log(logger, MAX_LOG10P);
+        if (result.results.size() != 1){
+            continue;
+        }
+        ret[c] = std::move(result.results.begin()->second.token);
+    }
+    return ret;
+}
+
+
+std::array<int16_t, 10> ItemPrinterPrizeReader::read_quantity(
+    Logger& logger, const ImageViewRGB32& screen
+) const{
+    size_t total_rows = 10;
+
+    // determine whether to use normal or bonus boxes for OCR
+    double total_average_sum_normal = 0;
+    double total_average_sum_bonus = 0;
+    for (size_t i = 0; i < total_rows; i++){
+        total_average_sum_normal += average_sum_filtered(screen, m_boxes_normal[i]);
+        total_average_sum_bonus += average_sum_filtered(screen, m_boxes_bonus[i]);
+    }
+
+    logger.log("total_average_sum_normal: " + std::to_string(total_average_sum_normal));
+    logger.log("total_average_sum_bonus: " + std::to_string(total_average_sum_bonus));
+
+    if (total_average_sum_bonus > total_average_sum_normal){
+        logger.log("Read quantity with bonus mode.");
+    }else{
+        logger.log("Read quantity with normal mode.");
+    }
+
+    const std::array<ImageFloatBox, 10>& boxes = (total_average_sum_bonus > total_average_sum_normal) 
+                                                    ? m_boxes_bonus_quantity 
+                                                    : m_boxes_normal_quantity;
+
+    std::array<int16_t, 10> results;
+
+    GlobalThreadPools::computation_normal().run_in_parallel(
+        [&](size_t index){
+            results[index] = read_number(logger, screen, boxes[index], (int8_t)index);
+        },
+        0, total_rows, 1
+    );
+
+    return results;
+}
+
+
+int16_t ItemPrinterPrizeReader::read_number(
+    Logger& logger, 
+    const ImageViewRGB32& screen, 
+    const ImageFloatBox& box,
+    int8_t line_index
+) const{
+
+    ImageViewRGB32 cropped = extract_box_reference(screen, box);
+    int16_t number = (int16_t)OCR::read_number_waterfill(logger, cropped, 0xff808000, 0xffffffff, true, line_index);
+
+    if (number < 1 || number > 40){
+        number = 1; // default to 1 if we can't read the prize quantity
+    }
+    return (int16_t)number;
+}
+
+double ItemPrinterPrizeReader::average_sum_filtered(const ImageViewRGB32& screen, const ImageFloatBox& box) const{
+    ImageViewRGB32 cropped = extract_box_reference(screen, box);
+    ImageRGB32 filtered = to_blackwhite_rgb32_range(
+        cropped,
+        false,
+        0xff808000, 0xffffffff
+    );    
+
+    return image_stats(filtered).average.sum();
+}
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/ItemPrinter/PokemonSV_ItemPrinterPrizeReader.h b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/ItemPrinter/PokemonSV_ItemPrinterPrizeReader.h
new file mode 100644
index 0000000000..99334ede8e
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/ItemPrinter/PokemonSV_ItemPrinterPrizeReader.h
@@ -0,0 +1,63 @@
+/*  Item Printer - Prize Reader
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_ItemPrinterPrizeReader_H
+#define PokemonAutomation_PokemonSV_ItemPrinterPrizeReader_H
+
+#include <array>
+#include "CommonFramework/Language.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonTools/VisualDetector.h"
+
+namespace PokemonAutomation{
+    class Logger;
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+
+class ItemPrinterPrizeReader{
+    static constexpr double MAX_LOG10P = -1.40;
+    static constexpr double MAX_LOG10P_SPREAD = 0.50;
+
+public:
+    ItemPrinterPrizeReader(Language language);
+
+    void make_overlays(VideoOverlaySet& items) const;
+
+    std::array<std::string, 10> read_prizes(
+        Logger& logger, const ImageViewRGB32& screen
+    ) const;
+
+    std::array<int16_t, 10> read_quantity(
+        Logger& logger, const ImageViewRGB32& screen
+    ) const;
+
+    int16_t read_number(
+        Logger& logger,
+        const ImageViewRGB32& screen, 
+        const ImageFloatBox& box,
+        int8_t line_index = -1
+    ) const;
+
+    double average_sum_filtered(const ImageViewRGB32& screen, const ImageFloatBox& box) const;
+
+private:
+    Language m_language;
+    std::array<ImageFloatBox, 10> m_boxes_normal;
+    std::array<ImageFloatBox, 10> m_boxes_bonus;
+    std::array<ImageFloatBox, 10> m_boxes_normal_quantity;
+    std::array<ImageFloatBox, 10> m_boxes_bonus_quantity;
+};
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Map/PokemonSV_DestinationMarkerDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Map/PokemonSV_DestinationMarkerDetector.cpp
new file mode 100644
index 0000000000..599052e4e0
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Map/PokemonSV_DestinationMarkerDetector.cpp
@@ -0,0 +1,165 @@
+/*  Destination Marker Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Kernels/Waterfill/Kernels_Waterfill_Types.h"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Images/WaterfillUtilities.h"
+#include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h"
+#include "PokemonSV_DestinationMarkerDetector.h"
+
+// #include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+class DestinationMarkerMatcher : public ImageMatch::WaterfillTemplateMatcher{
+public:
+    
+    DestinationMarkerMatcher() : WaterfillTemplateMatcher(
+        "PokemonSV/Map/DestinationMarkerIcon-Template.png", Color(180,80,0), Color(255, 130, 70), 50
+    ){
+        m_aspect_ratio_lower = 0.8;
+        m_aspect_ratio_upper = 1.2;
+        m_area_ratio_lower = 0.8;
+        m_area_ratio_upper = 1.2;
+
+    }
+
+    static const ImageMatch::WaterfillTemplateMatcher& instance(){
+        static DestinationMarkerMatcher matcher;
+        return matcher;
+    }
+};
+
+class DestinationMarkerYellowMatcher : public ImageMatch::WaterfillTemplateMatcher{
+public:
+    
+    DestinationMarkerYellowMatcher() : WaterfillTemplateMatcher(
+        "PokemonSV/Map/DestinationMarkerIcon-Yellow.png", Color(180,80,0), Color(255, 200, 70), 50
+    ){
+        m_aspect_ratio_lower = 0.8;
+        m_aspect_ratio_upper = 1.2;
+        m_area_ratio_lower = 0.8;
+        m_area_ratio_upper = 1.2;
+
+    }
+
+    static const ImageMatch::WaterfillTemplateMatcher& instance(){
+        static DestinationMarkerYellowMatcher matcher;
+        return matcher;
+    }
+};
+
+
+DestinationMarkerDetector::~DestinationMarkerDetector() = default;
+
+DestinationMarkerDetector::DestinationMarkerDetector(Color color, const ImageFloatBox& box, bool check_yellow)
+    : m_color(color)
+    , m_box(box)
+    , m_check_yellow(check_yellow)
+{}
+
+void DestinationMarkerDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_box);
+}
+
+bool DestinationMarkerDetector::detect(const ImageViewRGB32& screen){
+    std::vector<ImageFloatBox> hits = detect_all(screen);
+    if (!m_check_yellow){
+        return !hits.empty();
+    }else{
+        std::vector<ImageFloatBox> hits_yellow = detect_all_yellow(screen);
+        return !hits.empty() || !hits_yellow.empty();
+    }
+}
+
+std::vector<ImageFloatBox> DestinationMarkerDetector::detect_all(const ImageViewRGB32& screen) const{
+    const std::vector<std::pair<uint32_t, uint32_t>> filters = {
+        {combine_rgb(180, 80, 0), combine_rgb(255, 130, 70)},
+
+    };
+
+
+    const double rmsd_threshold = 65.0;  // from my testing: RMSD is 15 at 1080p, 60 at 720p
+    const double min_object_size = 150.0;
+
+    const double screen_rel_size = (screen.height() / 1080.0);
+    const size_t min_size = size_t(screen_rel_size * screen_rel_size * min_object_size);
+
+    std::vector<ImageFloatBox> found_locations;
+
+    ImagePixelBox pixel_search_area = floatbox_to_pixelbox(screen.width(), screen.height(), m_box);    
+    match_template_by_waterfill(
+        screen.size(),
+        extract_box_reference(screen, m_box), 
+        DestinationMarkerMatcher::instance(),
+        filters,
+        {min_size, SIZE_MAX},
+        rmsd_threshold,
+        [&](Kernels::Waterfill::WaterfillObject& object) -> bool {
+            ImagePixelBox found_box(
+                object.min_x + pixel_search_area.min_x, object.min_y + pixel_search_area.min_y,
+                object.max_x + pixel_search_area.min_x, object.max_y + pixel_search_area.min_y);
+            found_locations.emplace_back(pixelbox_to_floatbox(screen.width(), screen.height(), found_box));
+            return true;
+        }
+    );
+
+    return found_locations;
+}
+
+
+
+std::vector<ImageFloatBox> DestinationMarkerDetector::detect_all_yellow(const ImageViewRGB32& screen) const{
+    const std::vector<std::pair<uint32_t, uint32_t>> filters = {
+        {combine_rgb(180, 100, 0), combine_rgb(255, 190, 70)},  // to detect the marker within the minimap, when the radar beam is covering the marker
+    };
+
+
+    const double rmsd_threshold = 60.0;  // from my testing, RMSD ranges from 15-50, even at 720p
+    /* 
+    - min object size restrictions also helps to filter out false positives
+    at pokemon centers
+    */
+    const double min_object_size = 150.0;
+
+    const double screen_rel_size = (screen.height() / 1080.0);
+    const size_t min_size = size_t(screen_rel_size * screen_rel_size * min_object_size);
+
+    std::vector<ImageFloatBox> found_locations;
+
+    ImagePixelBox pixel_search_area = floatbox_to_pixelbox(screen.width(), screen.height(), m_box);    
+    match_template_by_waterfill(
+        screen.size(),
+        extract_box_reference(screen, m_box), 
+        DestinationMarkerYellowMatcher::instance(),
+        filters,
+        {min_size, SIZE_MAX},
+        rmsd_threshold,
+        [&](Kernels::Waterfill::WaterfillObject& object) -> bool {
+            ImagePixelBox found_box(
+                object.min_x + pixel_search_area.min_x, object.min_y + pixel_search_area.min_y,
+                object.max_x + pixel_search_area.min_x, object.max_y + pixel_search_area.min_y);
+            found_locations.emplace_back(pixelbox_to_floatbox(screen.width(), screen.height(), found_box));
+            return true;
+        }
+    );
+
+    return found_locations;
+}
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Map/PokemonSV_DestinationMarkerDetector.h b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Map/PokemonSV_DestinationMarkerDetector.h
new file mode 100644
index 0000000000..107cf3bc61
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Map/PokemonSV_DestinationMarkerDetector.h
@@ -0,0 +1,65 @@
+/*  Destination Marker Detector
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_DestinationMarkerDetector_H
+#define PokemonAutomation_PokemonSV_DestinationMarkerDetector_H
+
+#include <vector>
+#include "Common/Cpp/Color.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+#include "CommonTools/VisualDetector.h"
+
+namespace PokemonAutomation{
+
+class VideoOverlaySet;
+class VideoOverlay;
+class OverlayBoxScope;
+
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+class DestinationMarkerDetector : public StaticScreenDetector{
+public:
+    DestinationMarkerDetector(Color color, const ImageFloatBox& box, bool check_yellow);
+    virtual ~DestinationMarkerDetector();
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+    std::vector<ImageFloatBox> detect_all(const ImageViewRGB32& screen) const;
+
+    // for detecting the marker within the minimap
+    // ImageFloatBox for detecting within the minimap {0.815, 0.645, 0.180, 0.320}. needs to be slightly higher up than the minimap since the marker will stick up past the minimap
+    std::vector<ImageFloatBox> detect_all_yellow(const ImageViewRGB32& screen) const;
+
+protected:
+    Color m_color;
+    ImageFloatBox m_box;
+    bool m_check_yellow;
+};
+
+
+
+class DestinationMarkerWatcher : public DetectorToFinder<DestinationMarkerDetector>{
+    public:
+    DestinationMarkerWatcher(
+        Color color,
+        const ImageFloatBox& box,
+        bool check_yellow = false,
+        std::chrono::milliseconds duration = std::chrono::milliseconds(250)
+    )
+         : DetectorToFinder("DestinationMarkerWatcher", std::chrono::milliseconds(250), color, box, check_yellow)
+    {}
+};
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Map/PokemonSV_FastTravelDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Map/PokemonSV_FastTravelDetector.cpp
new file mode 100644
index 0000000000..75848239b0
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Map/PokemonSV_FastTravelDetector.cpp
@@ -0,0 +1,178 @@
+/*  Fast Travel Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Containers/FixedLimitVector.tpp"
+#include "Kernels/Waterfill/Kernels_Waterfill_Types.h"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Images/WaterfillUtilities.h"
+#include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h"
+#include "Tests/ImageUnitTest.h"
+#include "PokemonSV_FastTravelDetector.h"
+
+// #include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+ImageFloatBox MINIMAP_AREA(0.815, 0.680, 0.180, 0.310);
+
+
+class FastTravelMatcher : public ImageMatch::WaterfillTemplateMatcher{
+public:
+    
+    /* 
+    - selects for the white, wing-shaped component of the fast travel icon
+    - Use Waterfilltemplate matcher to get your template so you get the correct area ratio
+    along with the blue background. You need the blue backgroun so you don't false positive
+    against the fly icon in Pokemon centers.
+
+     */
+    FastTravelMatcher() : WaterfillTemplateMatcher(
+        "PokemonSV/Map/FastTravelIcon-Template.png", Color(200,200,200), Color(255, 255, 255), 50
+    ){
+        m_aspect_ratio_lower = 0.8;
+        m_aspect_ratio_upper = 1.2;
+        m_area_ratio_lower = 0.9;
+        m_area_ratio_upper = 1.4;
+
+    }
+
+    static const ImageMatch::WaterfillTemplateMatcher& instance(){
+        static FastTravelMatcher matcher;
+        return matcher;
+    }
+};
+
+
+FastTravelDetector::~FastTravelDetector() = default;
+
+FastTravelDetector::FastTravelDetector(Color color, const ImageFloatBox& box)
+    : m_color(color)
+    , m_box(box)
+{}
+
+void FastTravelDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_box);
+}
+
+bool FastTravelDetector::detect(const ImageViewRGB32& screen){
+    std::vector<ImageFloatBox> hits = detect_all(screen);
+    return !hits.empty();
+}
+
+std::vector<ImageFloatBox> FastTravelDetector::detect_all(const ImageViewRGB32& screen) const{
+    const std::vector<std::pair<uint32_t, uint32_t>> filters = {
+        {combine_rgb(180, 180, 180), combine_rgb(255, 255, 255)},
+
+    };
+
+    /* 
+    - need to keep RMSD threshold below 100, 
+    else will false positive the fly icon at pokemon centers
+    */ 
+    const double rmsd_threshold = 80.0;
+    /* 
+    - min object size restrictions also helps to filter out false positives
+    at pokemon centers
+    */
+    const double min_object_size = 150.0;
+
+    const double screen_rel_size = (screen.height() / 1080.0);
+    const size_t min_size = size_t(screen_rel_size * screen_rel_size * min_object_size);
+
+    std::vector<ImageFloatBox> found_locations;
+
+    ImagePixelBox pixel_search_area = floatbox_to_pixelbox(screen.width(), screen.height(), m_box);    
+    match_template_by_waterfill(
+        screen.size(),
+        extract_box_reference(screen, m_box), 
+        FastTravelMatcher::instance(),
+        filters,
+        {min_size, SIZE_MAX},
+        rmsd_threshold,
+        [&](Kernels::Waterfill::WaterfillObject& object) -> bool {
+            ImagePixelBox found_box(
+                object.min_x + pixel_search_area.min_x, object.min_y + pixel_search_area.min_y,
+                object.max_x + pixel_search_area.min_x, object.max_y + pixel_search_area.min_y);
+            found_locations.emplace_back(pixelbox_to_floatbox(screen.width(), screen.height(), found_box));
+            return false;
+        }
+    );
+
+    return found_locations;
+}
+
+
+
+FastTravelWatcher::~FastTravelWatcher() = default;
+
+FastTravelWatcher::FastTravelWatcher(Color color, VideoOverlay& overlay, const ImageFloatBox& box)
+    : VisualInferenceCallback("FastTravelWatcher")
+    , m_overlay(overlay)
+    , m_detector(color, box)
+{}
+
+void FastTravelWatcher::make_overlays(VideoOverlaySet& items) const{
+    m_detector.make_overlays(items);
+}
+
+bool FastTravelWatcher::process_frame(const ImageViewRGB32& screen, WallClock timestamp){
+    m_hits = m_detector.detect_all(screen);
+
+    m_hit_boxes.reset(m_hits.size());
+    for (const ImageFloatBox& hit : m_hits){
+        m_hit_boxes.emplace_back(m_overlay, hit, COLOR_MAGENTA);
+    }
+    return !m_hits.empty();
+}
+
+
+class Test_FastTravelDetector : public ImageUnitTest{
+public:
+    Test_FastTravelDetector(const std::string& image, bool expected)
+        : ImageUnitTest("PokemonSV::FastTravelDetector - " + image, {image})
+        , m_expected(expected)
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        FastTravelDetector detector(COLOR_RED, MINIMAP_AREA);
+        const ImageRGB32& image = images[0];
+        return detector.detect(image) == m_expected;
+    }
+
+private:
+    bool m_expected;
+};
+
+
+void add_tests_FastTravelDetector(UnitTestDatabase& database){
+    database.add<Test_FastTravelDetector>("PokemonSV/FastTravelDetector/720p_fastTravel_NorthDown_True.jpg", true);
+    database.add<Test_FastTravelDetector>("PokemonSV/FastTravelDetector/720p_radarbeam_fastTravel_NorthDown_False.jpg", false);
+    database.add<Test_FastTravelDetector>("PokemonSV/FastTravelDetector/fastTravel_blueberry1_True.png", true);
+    database.add<Test_FastTravelDetector>("PokemonSV/FastTravelDetector/fastTravel_blueberry2_True.png", true);
+    database.add<Test_FastTravelDetector>("PokemonSV/FastTravelDetector/fastTravel_map1_blueberry_False.png", false);
+    database.add<Test_FastTravelDetector>("PokemonSV/FastTravelDetector/fastTravel_map2_blueberry_True.png", true);
+    database.add<Test_FastTravelDetector>("PokemonSV/FastTravelDetector/fasttravel_northLeft_True.png", true);
+    database.add<Test_FastTravelDetector>("PokemonSV/FastTravelDetector/fastTravel_partialRadarBeam1_False.png", false);
+    database.add<Test_FastTravelDetector>("PokemonSV/FastTravelDetector/pokeCenter1_False.png", false);
+    database.add<Test_FastTravelDetector>("PokemonSV/FastTravelDetector/pokeCenter2_False.png", false);
+}
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Map/PokemonSV_FastTravelDetector.h b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Map/PokemonSV_FastTravelDetector.h
new file mode 100644
index 0000000000..52b9da96e5
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Map/PokemonSV_FastTravelDetector.h
@@ -0,0 +1,78 @@
+/*  Fast Travel Detector
+
+ Detects the Fast Travel symbol on the screen. 
+
+ Limitations:
+ - Does not work if obstructed by the radar beam (while outdoors), 
+ or if obstructed by the radar dot
+
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_FastTravelDetector_H
+#define PokemonAutomation_PokemonSV_FastTravelDetector_H
+
+#include <vector>
+#include "Common/Cpp/Color.h"
+#include "Common/Cpp/Containers/FixedLimitVector.h"
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+#include "CommonTools/VisualDetector.h"
+
+namespace PokemonAutomation{
+
+class VideoOverlaySet;
+class VideoOverlay;
+class OverlayBoxScope;
+
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+// The area on the screen with the minimap
+extern ImageFloatBox MINIMAP_AREA;
+
+class FastTravelDetector : public StaticScreenDetector{
+public:
+    FastTravelDetector(Color color, const ImageFloatBox& box);
+    virtual ~FastTravelDetector();
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+    std::vector<ImageFloatBox> detect_all(const ImageViewRGB32& screen) const;
+
+protected:
+    Color m_color;
+    ImageFloatBox m_box;
+};
+
+
+
+class FastTravelWatcher : public VisualInferenceCallback{
+public:
+    FastTravelWatcher(Color color, VideoOverlay& overlay, const ImageFloatBox& box);
+    virtual ~FastTravelWatcher();
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override;
+
+    const std::vector<ImageFloatBox>& found_locations() const { return m_hits; }
+
+protected:
+    VideoOverlay& m_overlay;
+    FastTravelDetector m_detector;
+    std::vector<ImageFloatBox> m_hits;
+    FixedLimitVector<OverlayBoxScope> m_hit_boxes;
+};
+
+
+void add_tests_FastTravelDetector(UnitTestDatabase& database);
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Map/PokemonSV_MapDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Map/PokemonSV_MapDetector.cpp
new file mode 100644
index 0000000000..5ca00a3706
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Map/PokemonSV_MapDetector.cpp
@@ -0,0 +1,283 @@
+/*  Map Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Images/WaterfillUtilities.h"
+#include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h"
+#include "Tests/ImageUnitTest.h"
+#include "Tests/TestUtils.h"
+#include "PokemonSV_MapDetector.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+namespace{
+
+class MapOrangleFixedViewArrowMatcher : public ImageMatch::WaterfillTemplateMatcher{
+public:
+    MapOrangleFixedViewArrowMatcher() : WaterfillTemplateMatcher(
+        "PokemonSV/Map/OrangleFixedView-Template.png", Color(50,50,0), Color(255, 255, 255), 50
+    ){
+        m_aspect_ratio_lower = 0.8;
+        m_aspect_ratio_upper = 1.2;
+        m_area_ratio_lower = 0.8;
+        m_area_ratio_upper = 1.2;
+    }
+
+    static const MapOrangleFixedViewArrowMatcher& instance(){
+        static MapOrangleFixedViewArrowMatcher matcher;
+        return matcher;
+    }
+};
+
+
+class MapOrangleRotatedViewArrowMatcher : public ImageMatch::WaterfillTemplateMatcher{
+public:
+    MapOrangleRotatedViewArrowMatcher() : WaterfillTemplateMatcher(
+        "PokemonSV/Map/OrangleRotatedView-Template.png", Color(50,50,0), Color(255, 255, 255), 50
+    ){
+        m_aspect_ratio_lower = 0.8;
+        m_aspect_ratio_upper = 1.2;
+        m_area_ratio_lower = 0.8;
+        m_area_ratio_upper = 1.2;
+    }
+
+    static const MapOrangleRotatedViewArrowMatcher& instance(){
+        static MapOrangleRotatedViewArrowMatcher matcher;
+        return matcher;
+    }
+};
+
+
+} // end anonymous namespace
+
+
+ImageFloatBox MAP_READABLE_AREA{0.197, 0.182, 0.678, 0.632};
+
+MapFixedViewDetector::MapFixedViewDetector(Color color)
+    : m_color(color)
+    , m_arrow_box(0.165, 0.712, 0.014, 0.040)
+{}
+void MapFixedViewDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_arrow_box);
+}
+bool MapFixedViewDetector::detect(const ImageViewRGB32& frame){
+     const std::vector<std::pair<uint32_t, uint32_t>> filters = {
+        {combine_rgb(100, 100, 0), combine_rgb(255, 255, 200)}
+    };
+
+    const double screen_rel_size = (frame.height() / 1080.0);
+    const size_t min_size = size_t(screen_rel_size * screen_rel_size * 150.0);
+    
+    const bool detected = match_template_by_waterfill(
+        frame.size(),
+        extract_box_reference(frame, m_arrow_box), 
+        MapOrangleFixedViewArrowMatcher::instance(),
+        filters,
+        {min_size, SIZE_MAX},
+        120,
+        [](Kernels::Waterfill::WaterfillObject& object) -> bool { return true; }
+    );
+    
+    return detected;
+}
+
+
+MapRotatedViewDetector::MapRotatedViewDetector(Color color)
+    : m_color(color)
+    , m_arrow_box(0.157, 0.720, 0.029, 0.039)
+{}
+void MapRotatedViewDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_arrow_box);
+}
+bool MapRotatedViewDetector::detect(const ImageViewRGB32& frame){
+     const std::vector<std::pair<uint32_t, uint32_t>> filters = {
+        {combine_rgb(100, 100, 0), combine_rgb(255, 255, 200)}
+    };
+
+    const double screen_rel_size = (frame.height() / 1080.0);
+    const size_t min_size = size_t(screen_rel_size * screen_rel_size * 450.0);
+    
+    const bool detected = match_template_by_waterfill(
+        frame.size(),
+        extract_box_reference(frame, m_arrow_box), 
+        MapOrangleRotatedViewArrowMatcher::instance(),
+        filters,
+        {min_size, SIZE_MAX},
+        120,
+        [](Kernels::Waterfill::WaterfillObject& object) -> bool { return true; }
+    );
+    
+    return detected;
+}
+
+
+MapWatcher::MapWatcher(Color color)
+: VisualInferenceCallback("MapWatcher")
+, m_exit_watcher(COLOR_RED, WhiteButton::ButtonY, {0.800, 0.118, 0.030, 0.060}), m_fixed_view_watcher(color), m_rotated_view_watcher(color){}
+
+void MapWatcher::make_overlays(VideoOverlaySet& items) const{
+    m_exit_watcher.make_overlays(items);
+    m_fixed_view_watcher.make_overlays(items);
+    m_rotated_view_watcher.make_overlays(items);
+}
+
+bool MapWatcher::process_frame(const ImageViewRGB32& frame, WallClock timestamp){
+    const bool exit_found = m_exit_watcher.process_frame(frame, timestamp);
+    if (!exit_found){
+        return false;
+    }
+
+    const bool fixed_found = m_fixed_view_watcher.process_frame(frame, timestamp);
+    const bool rotated_found = m_rotated_view_watcher.process_frame(frame, timestamp);
+
+    if (fixed_found && !rotated_found){
+        m_in_fixed_view = true;
+        return true;
+    }else if (!fixed_found && rotated_found){
+        m_in_fixed_view = false;
+        return true;
+    }
+
+    return false;
+}
+
+
+
+
+
+
+
+class Test_MapDetector : public ImageUnitTest{
+public:
+    Test_MapDetector(
+        const std::string& image,
+        std::vector<std::string> words
+    )
+        : ImageUnitTest("PokemonSV::MapDetector - " + image, {image})
+        , m_words(std::move(words))
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        // two words: <Map ready to exit> <In fixed view (instead of the rotated view)>
+        if (m_words.size() < 2){
+            std::stringstream ss;
+            ss << "Error: not enough number of words in the filename. Found only " << m_words.size() << "." << std::endl;
+            return ss.str();
+        }
+
+        bool target_map_existence = false;
+        if (parse_bool(m_words[m_words.size()-2], target_map_existence) == false){
+            std::stringstream ss;
+            ss << "Error: True/False word " << m_words[m_words.size()-2] << " is wrong. Must be \"True\" or \"False\"." << std::endl;
+            return ss.str();
+        }
+
+        bool target_is_fixed_view = false;
+        if (parse_bool(m_words[m_words.size()-1], target_is_fixed_view) == false){
+            std::stringstream ss;
+            ss << "Error: True/False word " << m_words[m_words.size()-1] << " is wrong. Must be \"True\" or \"False\"." << std::endl;
+            return ss.str();
+        }
+
+        WhiteButtonDetector map_exit_detector(COLOR_RED, WhiteButton::ButtonY, {0.800, 0.118, 0.030, 0.060});
+        const ImageRGB32& image = images[0];
+        bool result_map = map_exit_detector.detect(image);
+
+        TEST_RESULT_EQUAL_STR(result_map, target_map_existence);
+
+        if (result_map){
+
+            MapFixedViewDetector map_fixed_view_detector;
+            MapRotatedViewDetector map_rotated_view_detected;
+
+            bool result_fixed = map_fixed_view_detector.detect(image);
+            bool result_rotated = map_rotated_view_detected.detect(image);
+
+            TEST_RESULT_EQUAL_STR(result_fixed, target_is_fixed_view);
+            TEST_RESULT_EQUAL_STR(result_rotated, !target_is_fixed_view);
+        }
+
+        return true;
+    };
+
+private:
+    const std::vector<std::string> m_words;
+};
+
+
+
+void add_tests_MapDetector(UnitTestDatabase& database){
+    database.add<Test_MapDetector>(
+        "PokemonSV/MapDetector/BugTypeCase_False_False.png",
+        std::vector<std::string>{"BugTypeCase", "False", "False"}
+    );
+    database.add<Test_MapDetector>(
+        "PokemonSV/MapDetector/EastAreaWatchTowerAfterDLC1_True_True.png",
+        std::vector<std::string>{"EastAreaWatchTowerAfterDLC1", "True", "True"}
+    );
+    database.add<Test_MapDetector>(
+        "PokemonSV/MapDetector/EeveeCase_True_True.png",
+        std::vector<std::string>{"EeveeCase", "True", "True"}
+    );
+    database.add<Test_MapDetector>(
+        "PokemonSV/MapDetector/FuecocoCase_True_True.png",
+        std::vector<std::string>{"FuecocoCase", "True", "True"}
+    );
+    database.add<Test_MapDetector>(
+        "PokemonSV/MapDetector/GlitteratiCase_True_True.png",
+        std::vector<std::string>{"GlitteratiCase", "True", "True"}
+    );
+    database.add<Test_MapDetector>(
+        "PokemonSV/MapDetector/PoketchCase_False_True.png",
+        std::vector<std::string>{"PoketchCase", "False", "True"}
+    );
+    database.add<Test_MapDetector>(
+        "PokemonSV/MapDetector/PortoMarinada_True_False.png",
+        std::vector<std::string>{"PortoMarinada", "True", "False"}
+    );
+    database.add<Test_MapDetector>(
+        "PokemonSV/MapDetector/ZeroGate_True_True.png",
+        std::vector<std::string>{"ZeroGate", "True", "True"}
+    );
+    database.add<Test_MapDetector>(
+        "PokemonSV/MapDetector/macOS/Cascarraf_Restaurant_True_True.png",
+        std::vector<std::string>{"Cascarraf_Restaurant", "True", "True"}
+    );
+    database.add<Test_MapDetector>(
+        "PokemonSV/MapDetector/macOS/cascarrafa_True_True.png",
+        std::vector<std::string>{"cascarrafa", "True", "True"}
+    );
+    database.add<Test_MapDetector>(
+        "PokemonSV/MapDetector/macOS/cascarrafa_Zooming_False_False.png",
+        std::vector<std::string>{"cascarrafa", "Zooming", "False", "False"}
+    );
+    database.add<Test_MapDetector>(
+        "PokemonSV/MapDetector/macOS/KitakamiOniMountain_True_False.png",
+        std::vector<std::string>{"KitakamiOniMountain", "True", "False"}
+    );
+}
+
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Map/PokemonSV_MapDetector.h b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Map/PokemonSV_MapDetector.h
new file mode 100644
index 0000000000..04067ac320
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Map/PokemonSV_MapDetector.h
@@ -0,0 +1,99 @@
+/*  Map Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_MapDetector_H
+#define PokemonAutomation_PokemonSV_MapDetector_H
+
+#include "Common/Cpp/Color.h"
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+#include "CommonTools/VisualDetector.h"
+#include "VideoGames/PokemonSV/Inference/PokemonSV_WhiteButtonDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+// The area on the screen that the program can clearly read map info, when the map is opened.
+extern ImageFloatBox MAP_READABLE_AREA;
+
+// Detect the orange arrow pointing up on the lower left corner of the map, when the map is in the fixed view mode.
+// This arrow is used to differentate the rotation view mode.
+class MapFixedViewDetector : public StaticScreenDetector{
+public:
+    MapFixedViewDetector(Color color = COLOR_RED);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    Color m_color;
+    ImageFloatBox m_arrow_box;
+};
+class MapFixedViewWatcher : public DetectorToFinder<MapFixedViewDetector>{
+public:
+    MapFixedViewWatcher(Color color = COLOR_RED)
+         : DetectorToFinder("MapFixedViewWatcher", std::chrono::milliseconds(1000), color)
+    {}
+};
+
+
+// Detect the orange double-direction arrows pointing sideways on the lower left corner of the map, when the map is
+// in the rotated view mode.
+// This arrow is used to differentate the fixed view mode.
+class MapRotatedViewDetector : public StaticScreenDetector{
+public:
+    MapRotatedViewDetector(Color color = COLOR_RED);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    Color m_color;
+    ImageFloatBox m_arrow_box;
+};
+class MapRotatedViewWatcher : public DetectorToFinder<MapRotatedViewDetector>{
+public:
+    MapRotatedViewWatcher(Color color = COLOR_RED)
+         : DetectorToFinder("MapRotatedViewWatcher", std::chrono::milliseconds(1000), color)
+    {}
+};
+
+// Detect whether map is opened and ready to be closed.
+// Can also detect whether the map is in the fixed view or rotated view mode.
+class MapWatcher : public VisualInferenceCallback{
+public:
+    MapWatcher(Color color = COLOR_RED);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override;
+
+    // Whether the map is in the fixed view instead of rotated view.
+    bool map_in_fixed_view() const { return m_in_fixed_view; }
+
+private:
+    WhiteButtonWatcher  m_exit_watcher;
+    MapFixedViewWatcher m_fixed_view_watcher;
+    MapRotatedViewWatcher m_rotated_view_watcher;
+
+    bool m_in_fixed_view = false;
+};
+
+
+
+
+
+void add_tests_MapDetector(UnitTestDatabase& database);
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Map/PokemonSV_MapMenuDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Map/PokemonSV_MapMenuDetector.cpp
new file mode 100644
index 0000000000..d84b51467c
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Map/PokemonSV_MapMenuDetector.cpp
@@ -0,0 +1,146 @@
+/*  Map Menu Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonFramework/ImageTools/ImageStats.h"
+#include "CommonTools/Images/SolidColorTest.h"
+#include "Tests/ImageUnitTest.h"
+#include "Tests/TestUtils.h"
+#include "PokemonSV_MapMenuDetector.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+MapFlyMenuDetector::~MapFlyMenuDetector() = default;
+
+MapFlyMenuDetector::MapFlyMenuDetector(Color color)
+    : m_color(color)
+    , m_middle_box(0.523, 0.680, 0.080, 0.010)
+    , m_bottom_box(0.523, 0.744, 0.080, 0.020)
+{}
+
+void MapFlyMenuDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_middle_box);
+    items.add(m_color, m_bottom_box);
+}
+
+bool MapFlyMenuDetector::detect(const ImageViewRGB32& screen){
+    const ImageStats stats0 = image_stats(extract_box_reference(screen, m_middle_box));
+    // The white menu background is actually a bit translucent. So we have to relax the `is_white()` condition.
+    const double min_rgb_sum = 500.0;
+    const double min_stddev_sum = 25.0;
+    if (!is_white(stats0, min_rgb_sum, min_stddev_sum)){
+        return false;
+    }
+    const ImageStats stats1 = image_stats(extract_box_reference(screen, m_bottom_box));
+    return is_white(stats1, min_rgb_sum, min_stddev_sum);
+}
+
+
+MapFlyMenuWatcher::~MapFlyMenuWatcher() = default;
+
+MapFlyMenuWatcher::MapFlyMenuWatcher(Color color)
+    : VisualInferenceCallback("MapFlyMenuWatcher")
+    , m_detector(color)
+{}
+
+void MapFlyMenuWatcher::make_overlays(VideoOverlaySet& items) const{
+    m_detector.make_overlays(items);
+}
+
+bool MapFlyMenuWatcher::process_frame(const ImageViewRGB32& screen, WallClock timestamp){
+    return m_detector.detect(screen);
+}
+
+
+MapDestinationMenuDetector::MapDestinationMenuDetector(Color color)
+    : m_color(color)
+    , m_bottom_box(0.523, 0.670, 0.080, 0.020)
+    , m_fly_menu_box(0.523, 0.744, 0.080, 0.020)
+{}
+
+void MapDestinationMenuDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_bottom_box);
+    items.add(m_color, m_fly_menu_box);
+}
+
+bool MapDestinationMenuDetector::detect(const ImageViewRGB32& screen){
+    const ImageStats stats0 = image_stats(extract_box_reference(screen, m_bottom_box));
+    // The white menu background is actually a bit translucent. So we have to relax the `is_white()` condition.
+    const double min_rgb_sum = 500.0;
+    const double min_stddev_sum = 25.0;
+    if (!is_white(stats0, min_rgb_sum, min_stddev_sum)){
+        return false;
+    }
+    const ImageStats stats1 = image_stats(extract_box_reference(screen, m_fly_menu_box));
+    return !is_white(stats1, min_rgb_sum, min_stddev_sum);
+}
+
+
+MapDestinationMenuWatcher::~MapDestinationMenuWatcher() = default;
+
+MapDestinationMenuWatcher::MapDestinationMenuWatcher(Color color)
+    : VisualInferenceCallback("MapDestinationMenuWatcher")
+    , m_detector(color)
+{}
+
+void MapDestinationMenuWatcher::make_overlays(VideoOverlaySet& items) const{
+    m_detector.make_overlays(items);
+}
+
+bool MapDestinationMenuWatcher::process_frame(const ImageViewRGB32& screen, WallClock timestamp){
+    return m_detector.detect(screen);
+}
+
+
+class Test_MapFlyMenuDetector : public ImageUnitTest{
+public:
+    Test_MapFlyMenuDetector(const std::string& image, bool expected)
+        : ImageUnitTest("PokemonSV::MapFlyMenuDetector - " + image, {image})
+        , m_expected(expected)
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        MapFlyMenuDetector fly_menu(COLOR_RED);
+        MapDestinationMenuDetector dest_menu(COLOR_RED);
+        const ImageRGB32& image = images[0];
+        TEST_RESULT_EQUAL_STR(fly_menu.detect(image), m_expected);
+        TEST_RESULT_EQUAL_STR(dest_menu.detect(image), !m_expected);
+        return true;
+    }
+
+private:
+    bool m_expected;
+};
+
+
+void add_tests_MapMenuDetector(UnitTestDatabase& database){
+    database.add<Test_MapFlyMenuDetector>("PokemonSV/MapFlyMenuDetector/ABitOutsideSouthGate_True.png", true);
+    database.add<Test_MapFlyMenuDetector>("PokemonSV/MapFlyMenuDetector/AtSouthGate_True.png", true);
+    database.add<Test_MapFlyMenuDetector>("PokemonSV/MapFlyMenuDetector/FraKitakamiForest_False.png", false);
+    database.add<Test_MapFlyMenuDetector>("PokemonSV/MapFlyMenuDetector/FraKitakamiTown_True.png", true);
+    database.add<Test_MapFlyMenuDetector>("PokemonSV/MapFlyMenuDetector/SouthGate_False.png", false);
+    database.add<Test_MapFlyMenuDetector>("PokemonSV/MapFlyMenuDetector/SouthGate_True.png", true);
+    database.add<Test_MapFlyMenuDetector>("PokemonSV/MapFlyMenuDetector/WestOfSouthGate_False.png", false);
+}
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Map/PokemonSV_MapMenuDetector.h b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Map/PokemonSV_MapMenuDetector.h
new file mode 100644
index 0000000000..9a7afc91ee
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Map/PokemonSV_MapMenuDetector.h
@@ -0,0 +1,93 @@
+/*  Map Menu Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_MapMenuDetector_H
+#define PokemonAutomation_PokemonSV_MapMenuDetector_H
+
+#include "Common/Cpp/Color.h"
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+#include "CommonTools/VisualDetector.h"
+
+namespace PokemonAutomation{
+
+class VideoOverlaySet;
+class VideoOverlay;
+class OverlayBoxScope;
+
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+// Detect whether the "Fly here" menu is opened on map
+// Note: it detects the white background of the menu. So if the underlying map is pure white, it will have false positives.
+class MapFlyMenuDetector : public StaticScreenDetector{
+public:
+    MapFlyMenuDetector(Color color);
+    virtual ~MapFlyMenuDetector();
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+protected:
+    Color m_color;
+    ImageFloatBox m_middle_box, m_bottom_box;
+};
+
+
+// Watch for the "Fly here" menu to open on map
+class MapFlyMenuWatcher : public VisualInferenceCallback{
+public:
+    MapFlyMenuWatcher(Color color);
+    virtual ~MapFlyMenuWatcher();
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override;
+
+protected:
+    MapFlyMenuDetector m_detector;
+};
+
+
+// Detect whether the "Set as destination" menu is opened on map.
+// This menu has no "Fly here" menuitem.
+// Note: it detects the white background of the menu. So if the underlying map is pure white, it will have false positives.
+class MapDestinationMenuDetector : public StaticScreenDetector{
+public:
+    MapDestinationMenuDetector(Color color);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+protected:
+    Color m_color;
+    ImageFloatBox m_bottom_box;
+    ImageFloatBox m_fly_menu_box;
+};
+
+
+// Watch for the "Set as destination" menu to open on map.
+// This menu has no "Fly here" menuitem.
+class MapDestinationMenuWatcher : public VisualInferenceCallback{
+public:
+    ~MapDestinationMenuWatcher();
+    MapDestinationMenuWatcher(Color color);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override;
+
+protected:
+    MapDestinationMenuDetector m_detector;
+};
+
+
+void add_tests_MapMenuDetector(UnitTestDatabase& database);
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Map/PokemonSV_MapPokeCenterIconDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Map/PokemonSV_MapPokeCenterIconDetector.cpp
new file mode 100644
index 0000000000..8ff8a7d63b
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Map/PokemonSV_MapPokeCenterIconDetector.cpp
@@ -0,0 +1,159 @@
+/*  Map PokeCenter Icon Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Containers/FixedLimitVector.tpp"
+#include "Kernels/Waterfill/Kernels_Waterfill_Types.h"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Images/WaterfillUtilities.h"
+#include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h"
+#include "Tests/ImageUnitTest.h"
+#include "PokemonSV_MapDetector.h"
+#include "PokemonSV_MapPokeCenterIconDetector.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+class MapPokeCenterIconMatcher : public ImageMatch::WaterfillTemplateMatcher{
+public:
+    MapPokeCenterIconMatcher() : WaterfillTemplateMatcher(
+        "PokemonSV/Map/PokeCenterIcon-Template.png", Color(150,0,0), Color(255, 100, 100), 50
+    ){
+        m_aspect_ratio_lower = 0.9;
+        m_aspect_ratio_upper = 1.1;
+        m_area_ratio_lower = 0.6;
+        m_area_ratio_upper = 1.2;
+    }
+
+    static const ImageMatch::WaterfillTemplateMatcher& instance(){
+        static MapPokeCenterIconMatcher matcher;
+        return matcher;
+    }
+};
+
+
+
+MapPokeCenterIconDetector::MapPokeCenterIconDetector(Color color, const ImageFloatBox& box)
+    : m_color(color)
+    , m_box(box)
+{}
+
+void MapPokeCenterIconDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_box);
+}
+
+bool MapPokeCenterIconDetector::detect(const ImageViewRGB32& screen){
+    std::vector<ImageFloatBox> hits = detect_all(screen);
+    return !hits.empty();
+}
+
+std::vector<ImageFloatBox> MapPokeCenterIconDetector::detect_all(const ImageViewRGB32& screen) const{
+    const std::vector<std::pair<uint32_t, uint32_t>> filters = {
+        // {combine_rgb(150, 0, 0), combine_rgb(255, 120, 120)},
+        {combine_rgb(100, 0, 0), combine_rgb(255, 100, 100)}
+    };
+
+    const double min_object_size = 350.0;
+    const double rmsd_threshold = 100.0;
+
+    const double screen_rel_size = (screen.height() / 1080.0);
+    const size_t min_size = size_t(screen_rel_size * screen_rel_size * min_object_size);
+
+    std::vector<ImageFloatBox> found_locations;
+
+    ImagePixelBox pixel_search_area = floatbox_to_pixelbox(screen.width(), screen.height(), m_box);    
+    match_template_by_waterfill(
+        screen.size(),
+        extract_box_reference(screen, m_box), 
+        MapPokeCenterIconMatcher::instance(),
+        filters,
+        {min_size, SIZE_MAX},
+        rmsd_threshold,
+        [&](Kernels::Waterfill::WaterfillObject& object) -> bool {
+            ImagePixelBox found_box(
+                object.min_x + pixel_search_area.min_x, object.min_y + pixel_search_area.min_y,
+                object.max_x + pixel_search_area.min_x, object.max_y + pixel_search_area.min_y);
+            found_locations.emplace_back(pixelbox_to_floatbox(screen.width(), screen.height(), found_box));
+            return false;
+        }
+    );
+
+    return found_locations;
+}
+
+
+
+MapPokeCenterIconWatcher::~MapPokeCenterIconWatcher() = default;
+
+MapPokeCenterIconWatcher::MapPokeCenterIconWatcher(Color color, VideoOverlay& overlay, const ImageFloatBox& box)
+    : VisualInferenceCallback("MapPokeCenterIconWatcher")
+    , m_overlay(overlay)
+    , m_detector(color, box)
+{}
+
+void MapPokeCenterIconWatcher::make_overlays(VideoOverlaySet& items) const{
+    m_detector.make_overlays(items);
+}
+
+bool MapPokeCenterIconWatcher::process_frame(const ImageViewRGB32& screen, WallClock timestamp){
+    m_hits = m_detector.detect_all(screen);
+
+    m_hit_boxes.reset(m_hits.size());
+    for (const ImageFloatBox& hit : m_hits){
+        m_hit_boxes.emplace_back(m_overlay, hit, COLOR_MAGENTA);
+    }
+    return !m_hits.empty();
+}
+
+
+class Test_MapPokeCenterIconDetector : public ImageUnitTest{
+public:
+    Test_MapPokeCenterIconDetector(const std::string& image, int target)
+        : ImageUnitTest("PokemonSV::MapPokeCenterIconDetector - " + image, {image})
+        , m_target(target)
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        MapPokeCenterIconDetector detector(COLOR_RED, MAP_READABLE_AREA);
+        const ImageRGB32& image = images[0];
+        const auto result = detector.detect_all(image);
+        return (int)result.size() == m_target;
+    }
+
+private:
+    int m_target;
+};
+
+
+void add_tests_MapPokeCenterIconDetector(UnitTestDatabase& database){
+    database.add<Test_MapPokeCenterIconDetector>("PokemonSV/MapPokeCenterIconDetector/CursorOnMesagoza_7.png", 7);
+    database.add<Test_MapPokeCenterIconDetector>("PokemonSV/MapPokeCenterIconDetector/dark-capture-card_1.png", 1);
+    database.add<Test_MapPokeCenterIconDetector>("PokemonSV/MapPokeCenterIconDetector/FraMesagozaSouthGate_7.png", 7);
+    database.add<Test_MapPokeCenterIconDetector>("PokemonSV/MapPokeCenterIconDetector/PortoMarinada_1.png", 1);
+    database.add<Test_MapPokeCenterIconDetector>("PokemonSV/MapPokeCenterIconDetector/ZeroGate_2.png", 2);
+    database.add<Test_MapPokeCenterIconDetector>("PokemonSV/MapPokeCenterIconDetector/macOS_bright/Cascarraf_1.png", 1);
+    database.add<Test_MapPokeCenterIconDetector>("PokemonSV/MapPokeCenterIconDetector/macOS_bright/MesagozaSouthGate_5.png", 5);
+    database.add<Test_MapPokeCenterIconDetector>("PokemonSV/MapPokeCenterIconDetector/macOS_bright/SouthEastOfSouthGate_1.png", 1);
+    database.add<Test_MapPokeCenterIconDetector>("PokemonSV/MapPokeCenterIconDetector/macOS_bright/West2OfSouthGate_1.png", 1);
+    database.add<Test_MapPokeCenterIconDetector>("PokemonSV/MapPokeCenterIconDetector/macOS_bright/WestOfSouthGate_1.png", 1);
+}
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Map/PokemonSV_MapPokeCenterIconDetector.h b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Map/PokemonSV_MapPokeCenterIconDetector.h
new file mode 100644
index 0000000000..69c3913844
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Map/PokemonSV_MapPokeCenterIconDetector.h
@@ -0,0 +1,72 @@
+/*  Map PokeCenter Icon Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_MapPokeCenterIconDetector_H
+#define PokemonAutomation_PokemonSV_MapPokeCenterIconDetector_H
+
+#include <vector>
+#include "Common/Cpp/Color.h"
+#include "Common/Cpp/Containers/FixedLimitVector.h"
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+#include "CommonTools/VisualDetector.h"
+
+namespace PokemonAutomation{
+
+class VideoOverlaySet;
+class VideoOverlay;
+class OverlayBoxScope;
+
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+// Detect one or more pokecenter icons on map
+class MapPokeCenterIconDetector : public StaticScreenDetector{
+public:
+    MapPokeCenterIconDetector(Color color, const ImageFloatBox& box);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+    std::vector<ImageFloatBox> detect_all(const ImageViewRGB32& screen) const;
+
+protected:
+    Color m_color;
+    ImageFloatBox m_box;
+};
+
+
+// Watch for at least one pokecenter icon appearing on map
+class MapPokeCenterIconWatcher : public VisualInferenceCallback{
+public:
+    ~MapPokeCenterIconWatcher();
+    MapPokeCenterIconWatcher(Color color, VideoOverlay& overlay, const ImageFloatBox& box);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override;
+
+    const std::vector<ImageFloatBox>& found_locations() const { return m_hits; }
+
+
+protected:
+    VideoOverlay& m_overlay;
+    MapPokeCenterIconDetector m_detector;
+    std::vector<ImageFloatBox> m_hits;
+    FixedLimitVector<OverlayBoxScope> m_hit_boxes;
+    
+};
+
+
+void add_tests_MapPokeCenterIconDetector(UnitTestDatabase& database);
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_AreaZeroSkyDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_AreaZeroSkyDetector.cpp
new file mode 100644
index 0000000000..2666c355e7
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_AreaZeroSkyDetector.cpp
@@ -0,0 +1,197 @@
+/*  Area Zero Sky Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Kernels/Waterfill/Kernels_Waterfill_Session.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/Tools/ProgramEnvironment.h"
+#include "CommonTools/Images/BinaryImage_FilterRgb32.h"
+#include "CommonTools/Async/InterruptableCommands.h"
+#include "CommonTools/Async/InferenceSession.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "PokemonSV_AreaZeroSkyDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+bool AreaZeroSkyDetector::detect(Kernels::Waterfill::WaterfillObject& object, const ImageViewRGB32& screen) const{
+    using namespace Kernels::Waterfill;
+
+    PackedBinaryMatrix matrix = compress_rgb32_to_binary_range(screen, 0xffc0c0c0, 0xffffffff);
+
+    size_t min_width = screen.width() / 4;
+    size_t min_height = screen.height() / 4;
+
+    std::unique_ptr<WaterfillSession> session = make_WaterfillSession(matrix);
+    auto iter = session->make_iterator(10000);
+    while (iter->find_next(object, false)){
+//        if (object.min_y != 0){
+//            continue;
+//        }
+        if (object.width() < min_width || object.height() < min_height){
+            continue;
+        }
+        return true;
+    }
+    return false;
+}
+bool AreaZeroSkyDetector::detect(const ImageViewRGB32& screen){
+    using namespace Kernels::Waterfill;
+
+    WaterfillObject object;
+    return detect(object, screen);
+}
+
+
+
+
+AreaZeroSkyTracker::AreaZeroSkyTracker(VideoOverlay& overlay)
+    : VisualInferenceCallback("AreaZeroSkyTracker")
+    , m_overlay(overlay)
+{}
+
+bool AreaZeroSkyTracker::sky_location(double& x, double& y) const{
+    ReadSpinLock lg(m_lock, PA_CURRENT_FUNCTION);
+    if (!m_box){
+        return false;
+    }
+    x = m_center_x;
+    y = m_center_y;
+    return true;
+}
+
+void AreaZeroSkyTracker::make_overlays(VideoOverlaySet& items) const{}
+bool AreaZeroSkyTracker::process_frame(const ImageViewRGB32& frame, WallClock timestamp){
+    using namespace Kernels::Waterfill;
+
+    WaterfillObject object;
+    bool detected = this->detect(object, frame);
+    WriteSpinLock lg(m_lock, PA_CURRENT_FUNCTION);
+    if (detected){
+        m_box.reset(new OverlayBoxScope(
+            m_overlay,
+            COLOR_GREEN,
+            translate_to_parent(frame, {0, 0, 1, 1}, object),
+            "Area Zero Sky"
+        ));
+        m_center_x = object.center_of_gravity_x() / frame.width();
+        m_center_y = object.center_of_gravity_y() / frame.height();
+    }else{
+        m_box.reset();
+    }
+    return false;
+}
+
+
+
+
+
+enum class OverworldState{
+    None,
+    FindingSky,
+    TurningLeft,
+    TurningRight,
+};
+void find_and_center_on_sky(
+    ProgramEnvironment& env, VideoStream& stream, ProControllerContext& context
+){
+    context.wait_for_all_requests();
+    stream.log("Looking for the sky...");
+
+    AreaZeroSkyTracker sky_tracker(stream.overlay());
+    InferenceSession inference_session(
+        context, stream,
+        {sky_tracker}
+    );
+
+    AsyncCommandSession<ProController> session(
+        context, stream.logger(),
+        context.controller()
+    );
+    OverworldState state = OverworldState::None;
+    WallClock start = current_time();
+    while (true){
+        if (current_time() - start > std::chrono::minutes(1)){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::NO_ERROR_REPORT,
+                "Failed to find the sky after 1 minute. (state = " + std::to_string((int)state) + ")",
+                stream
+            );
+        }
+
+        context.wait_for(std::chrono::milliseconds(200));
+
+        if (!session.command_is_running()){
+            state = OverworldState::None;
+        }
+
+        double sky_x, sky_y;
+        bool sky = sky_tracker.sky_location(sky_x, sky_y);
+
+        if (!sky){
+            if (state != OverworldState::FindingSky){
+                stream.log("Sky not detected. Attempting to find the sky...", COLOR_ORANGE);
+                session.dispatch([](ProControllerContext& context){
+                    pbf_move_right_joystick(context, {0, +1}, 2000ms, 0ms);
+                    pbf_move_right_joystick(context, {-1, +1}, 10 * 1000ms, 0ms);
+                });
+                state = OverworldState::FindingSky;
+            }
+            continue;
+        }
+
+//        cout << sky_x << " - " << sky_y << endl;
+
+        if (sky_x < 0.45){
+            if (state != OverworldState::TurningLeft){
+                stream.log("Centering the sky... Moving left.");
+                double x_float = (sky_x - 0.5) * 0.75 - 0.25;
+                Milliseconds duration((int64_t)((0.5 - sky_x) * 1000 + 160));
+                session.dispatch([=](ProControllerContext& context){
+                    pbf_move_right_joystick(context, {x_float, 0}, duration, 0ms);
+                });
+                state = OverworldState::TurningLeft;
+            }
+            continue;
+        }
+        if (sky_x > 0.55){
+            if (state != OverworldState::TurningRight){
+                stream.log("Centering the sky... Moving Right.");
+                double x_float = (sky_x - 0.5) * 0.75 + 0.25;
+                Milliseconds duration((int64_t)((sky_x - 0.5) * 1000 + 160));
+                session.dispatch([=](ProControllerContext& context){
+                    pbf_move_right_joystick(context, {x_float, 0}, duration, 0ms);
+                });
+                state = OverworldState::TurningRight;
+            }
+            continue;
+        }
+
+        stream.log("Found the sky!", COLOR_ORANGE);
+        break;
+    }
+
+    session.stop_session_and_rethrow();
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_AreaZeroSkyDetector.h b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_AreaZeroSkyDetector.h
new file mode 100644
index 0000000000..d024ec8ee5
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_AreaZeroSkyDetector.h
@@ -0,0 +1,65 @@
+/*  Area Zero Sky Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_AreaZeroSkyDetector_H
+#define PokemonAutomation_PokemonSV_AreaZeroSkyDetector_H
+
+#include "Common/Cpp/Concurrency/SpinLock.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonFramework/Tools/VideoStream.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+#include "CommonTools/VisualDetector.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+
+namespace PokemonAutomation{
+namespace Kernels{
+namespace Waterfill{
+    class WaterfillObject;
+}
+}
+class ProgramEnvironment;
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+class AreaZeroSkyDetector : public StaticScreenDetector{
+public:
+    virtual void make_overlays(VideoOverlaySet& items) const override{}
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+    bool detect(Kernels::Waterfill::WaterfillObject& object, const ImageViewRGB32& screen) const;
+};
+
+
+class AreaZeroSkyTracker : public AreaZeroSkyDetector, public VisualInferenceCallback{
+public:
+    AreaZeroSkyTracker(VideoOverlay& overlay);
+
+    bool sky_location(double& x, double& y) const;
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override;
+
+private:
+    VideoOverlay& m_overlay;
+    mutable SpinLock m_lock;
+    double m_center_x;
+    double m_center_y;
+    std::unique_ptr<OverlayBoxScope> m_box;
+};
+
+
+void find_and_center_on_sky(
+    ProgramEnvironment& env, VideoStream& stream, ProControllerContext& context
+);
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.cpp
new file mode 100644
index 0000000000..e805f3c28f
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.cpp
@@ -0,0 +1,258 @@
+/*  Direction Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <cmath>
+#include "Kernels/Waterfill/Kernels_Waterfill_Types.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/Tools/DebugDumper.h"
+#include "CommonTools/Images/WaterfillUtilities.h"
+#include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h"
+#include "CommonTools/StartupChecks/VideoResolutionCheck.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h"
+#include "PokemonSV_DirectionDetector.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+class DirectionMatcher : public ImageMatch::WaterfillTemplateMatcher{
+public:
+    
+    DirectionMatcher() : WaterfillTemplateMatcher(
+        "PokemonSV/Map/DirectionIcon-Template.png", Color(0, 100, 30), Color(50, 230, 85), 50
+    ){
+        m_aspect_ratio_lower = 0.8;
+        m_aspect_ratio_upper = 1.2;
+        m_area_ratio_lower = 0.8;
+        m_area_ratio_upper = 1.2;
+
+    }
+
+    static const ImageMatch::WaterfillTemplateMatcher& instance(){
+        static DirectionMatcher matcher;
+        return matcher;
+    }
+};
+
+
+DirectionDetector::~DirectionDetector() = default;
+
+DirectionDetector::DirectionDetector(Color color, const ImageFloatBox& box)
+    : m_color(color)
+    , m_minimap_box(box)
+{}
+
+
+bool DirectionDetector::detect_north(Logger& logger, const ImageViewRGB32& screen) const{
+    std::pair<double, double> north_location = locate_north(logger, screen);
+
+    return !(north_location.first == 0 && north_location.second == 0);
+}
+
+
+std::pair<double, double> DirectionDetector::locate_north(Logger& logger, const ImageViewRGB32& screen) const{
+    assert_16_9_720p_min(logger, screen);
+
+    const std::vector<std::pair<uint32_t, uint32_t>> filters = {
+        {combine_rgb(0, 100, 0), combine_rgb(50, 230, 80)},
+
+    };
+
+    const double min_object_size = 50.0;
+    const double rmsd_threshold = 60.0;
+
+    const double screen_rel_size = (screen.height() / 1080.0);
+    const size_t min_size = size_t(screen_rel_size * screen_rel_size * min_object_size);
+
+    std::pair<double, double> north_location(0, 0);
+    OverworldDetector detector;
+    std::pair<double, double> zero_coord = detector.locate_ball(screen, true); // 0.9061, 0.8328
+    if (zero_coord.first > 0.91 || zero_coord.first < 0.90 || 
+        zero_coord.second > 0.84 || zero_coord.second < 0.82)
+    {
+        logger.log("Unable to locate the overworld radar ball, falling back on hard coded location.", COLOR_ORANGE);
+        zero_coord.first = 0.9061;
+        zero_coord.second = 0.8328;
+        // throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Unable to locate the overworld radar ball.");
+    }
+
+    ImagePixelBox pixel_search_area = floatbox_to_pixelbox(screen.width(), screen.height(), m_minimap_box);
+    match_template_by_waterfill(
+        screen.size(),
+        extract_box_reference(screen, m_minimap_box), 
+        DirectionMatcher::instance(),
+        filters,
+        {min_size, SIZE_MAX},
+        rmsd_threshold,
+        [&](Kernels::Waterfill::WaterfillObject& object) -> bool {
+            
+            // relative coord wrt upper left corner
+            double x1 = (object.center_of_gravity_x() + pixel_search_area.min_x) / (double)screen.width();
+            double y1 = (object.center_of_gravity_y() + pixel_search_area.min_y) / (double)screen.height();
+            // relative coord wrt minimap radar
+            double x2 = x1 - zero_coord.first;
+            double y2 = zero_coord.second - y1; // subtract y from zero_coord since I want north to be positive
+            // absolute coord wrt minimap radar, scaled to screen size
+            double x3 = x2 * (double)screen.width() / screen_rel_size;
+            double y3 = y2 * (double)screen.height() / screen_rel_size;
+
+            double hypotenuse = std::hypot(x3, y3);
+            // std::cout << "hypotenuse: " << std::to_string(hypotenuse) << std::endl;
+            if (hypotenuse < 135 || hypotenuse > 155){
+                return false;
+            }
+            north_location = std::make_pair(x3, y3);
+            return true;
+        }
+    );
+
+    // std::cout << "north location: " << std::to_string(north_location.first) << ", " << std::to_string(north_location.second) << std::endl;
+
+    return north_location;
+}
+
+
+double DirectionDetector::get_current_direction(VideoStream& stream, const ImageViewRGB32& screen) const{
+    std::pair<double, double> north_location = locate_north(stream.logger(), screen);
+    if (north_location.first == 0 && north_location.second == 0){ // unable to locate north
+        return -1;
+    }
+    double direction = std::atan2(north_location.first, north_location.second);  // swap x and y to use north-clockwise convention
+    // std::cout << std::to_string(direction) << std::endl;
+    direction = (direction < 0) ? (direction + 2 * PI) : direction; // change (-pi, pi] to [0, 2pi)
+    // std::cout << "current_direction: " << std::to_string(direction) << std::endl;
+    return direction;
+}
+
+// return true if the given direction is pointing north
+bool is_pointing_north(double direction){
+    return (direction < 0.1 && direction >= 0.0) || (direction <= 2 * PI && direction > 2 * PI - 0.1);
+}
+
+// return true if current_direction is pointing north
+// if the above applies, the minimap might be locked. but we will need is_minimap_definitely_locked() to confirm.
+bool DirectionDetector::is_minimap_possibly_locked(double current_direction) const{
+    return is_pointing_north(current_direction);
+}
+
+// - push the joystick to change its position. if still pointing North, then we know it's locked.
+bool DirectionDetector::is_minimap_definitely_locked(VideoStream& stream, ProControllerContext& context, double current_direction) const {
+    bool pointing_north = is_pointing_north(current_direction);
+    if (!pointing_north){
+        return false;
+    }
+    pbf_move_right_joystick(context, {-1, 0}, 800ms, 160ms);
+    context.wait_for_all_requests();
+    double new_direction = get_current_direction(stream, stream.video().snapshot());
+
+    return is_pointing_north(new_direction);
+}
+
+void DirectionDetector::change_direction(
+    const ProgramInfo& info,
+    VideoStream& stream,
+    ProControllerContext& context,
+    double direction,
+    bool throw_if_fail
+) const{
+    size_t i = 0;
+    size_t MAX_ATTEMPTS = 20;
+    bool is_minimap_definitely_unlocked = false;
+    double scale_factor = 640;
+    double push_magnitude_scale_factor = 1;
+    while (i < MAX_ATTEMPTS){ // 10 attempts to move the direction to the target
+        context.wait_for_all_requests();
+        VideoSnapshot screen = stream.video().snapshot();
+        double current = get_current_direction(stream, screen);
+        if (current < 0){
+            if (throw_if_fail){
+                OperationFailedExceptionWithScreenshot::fire(
+                    ErrorReportMode::SEND_ERROR_REPORT,
+                    "change_direction(): Unable to detect current direction.",
+                    stream
+                );
+            }else{
+                stream.log("change_direction(): Unable to detect current direction.");
+            }
+        }
+        double target = std::fmod(direction, (2 * PI));
+
+        // try to find the shortest path around the circle
+        double diff = target - current;
+        if(diff > PI){
+            diff -= (2 * PI);
+        }
+        if(diff <= -PI){
+            diff += (2 * PI);
+        }
+        double abs_diff = std::abs(diff);
+        stream.log("current direction: " +  std::to_string(current));
+        stream.log("target: " +  std::to_string(target) + ", diff: " + std::to_string(diff));
+
+        if (!is_minimap_definitely_unlocked && is_minimap_possibly_locked(current)){
+            stream.log("Minimap may be locked. Check if definitely locked.");
+            if (is_minimap_definitely_locked(stream, context, current)){
+                stream.log("Minimap locked. Try to unlock the minimap. Then try again.");
+                open_map_from_overworld(info, stream, context);
+                pbf_press_button(context, BUTTON_RCLICK, 160ms, 160ms);
+                pbf_press_button(context, BUTTON_RCLICK, 160ms, 160ms);
+                pbf_press_button(context, BUTTON_B, 160ms, 800ms);
+                press_Bs_to_back_to_overworld(info, stream, context, 7);
+            }else{
+                stream.log("Minimap not locked. Try again");
+            }
+            
+            is_minimap_definitely_unlocked = true;
+            i = 0; // even if not locked, we reset the attempt counter since the first attempt is most impactful in terms of cursor movement
+            continue;            
+        }
+        is_minimap_definitely_unlocked = true;
+
+        if (abs_diff < 0.0105){
+            // return when we're close enough to the target
+            return;
+        }        
+
+        
+        if (scale_factor > 320 && abs_diff < 0.05){
+            scale_factor = 320;
+        }
+
+        if (abs_diff < 0.05){
+            push_magnitude_scale_factor = 0.5;
+        }
+
+        Milliseconds push_duration = std::max(
+            Milliseconds((int64_t)std::abs(diff * scale_factor)),
+            64ms
+        );
+        int16_t push_direction = (diff > 0) ? -1 : 1;
+        double push_magnitude = std::max(push_magnitude_scale_factor / (i + 1), 0.117); // push less with each iteration/attempt
+        double push_x_float = std::max(std::min(push_direction * push_magnitude, +1.0), -1.0);
+        stream.log(
+            "push magnitude: " + std::to_string(push_x_float) +
+            ", push duration: " +  std::to_string(push_duration.count()) + "ms"
+        );
+        pbf_move_right_joystick(context, {push_x_float, 0}, push_duration, 800ms);
+        i++;
+    }
+    
+}
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h
new file mode 100644
index 0000000000..cbc3041020
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h
@@ -0,0 +1,69 @@
+/*  Direction Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_DirectionDetector_H
+#define PokemonAutomation_PokemonSV_DirectionDetector_H
+
+#include "Common/Cpp/Color.h"
+#include "CommonFramework/Notifications/ProgramInfo.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/Tools/VideoStream.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+#include "CommonTools/VisualDetector.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+
+namespace PokemonAutomation{
+
+class VideoOverlaySet;
+class VideoOverlay;
+class OverlayBoxScope;
+
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+static constexpr double PI = 3.14159265358979323846;
+
+class DirectionDetector {
+public:
+    DirectionDetector(Color color = COLOR_RED, const ImageFloatBox& box = ImageFloatBox(0.815, 0.680, 0.180, 0.310));
+    virtual ~DirectionDetector();
+
+    bool detect_north(Logger& logger, const ImageViewRGB32& screen) const;
+
+    // return the coordinates of the N symbol, where the coordinates are measured in absolute pixels (scaled to 1080/height)
+    // with respect to the radar ball
+    // return 0,0 if unable to locate the N symbol
+    std::pair<double, double> locate_north(Logger& logger, const ImageViewRGB32& screen) const;
+
+    // return the direction of the N symbol, in radians, using North-clockwise convention. [0, 2pi)
+    // return -1 if unable to locate the N symbol
+    double get_current_direction(VideoStream& stream, const ImageViewRGB32& screen) const;
+
+    bool is_minimap_possibly_locked(double current_direction) const;
+
+    bool is_minimap_definitely_locked(VideoStream& stream, ProControllerContext& context, double current_direction) const;
+
+    // given direction in radians (North-clockwise), rotate the camera so N is pointing in the desired direction.
+    // mini-map must be unlocked.
+    void change_direction(
+        const ProgramInfo& info,
+        VideoStream& stream,
+        ProControllerContext& context,
+        double direction,
+        bool throw_if_fail = true
+    ) const;
+
+protected:
+    Color m_color;
+    ImageFloatBox m_minimap_box;
+};
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/PokemonSV/Inference/Overworld/PokemonSV_LetsGoHpReader.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_LetsGoHpReader.cpp
similarity index 86%
rename from SerialPrograms/Source/PokemonSV/Inference/Overworld/PokemonSV_LetsGoHpReader.cpp
rename to SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_LetsGoHpReader.cpp
index 2852775185..4ac2f36c9e 100644
--- a/SerialPrograms/Source/PokemonSV/Inference/Overworld/PokemonSV_LetsGoHpReader.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_LetsGoHpReader.cpp
@@ -1,6 +1,6 @@
 /*  Let's Go HP Reader
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -23,7 +23,7 @@ using namespace Pokemon;
 LetsGoHpWatcher::LetsGoHpWatcher(Color color)
     : VisualInferenceCallback("LetsGoHpWatcher")
     , m_color(color)
-    , m_box(0.055, 0.928, 0.067, 0.012)
+    , m_box(0.057, 0.930, 0.065, 0.010)
 //    , m_last_known_value(-1)
 {}
 
@@ -34,13 +34,13 @@ void LetsGoHpWatcher::make_overlays(VideoOverlaySet& items) const{
 
 void LetsGoHpWatcher::clear(){
 //    m_last_known_value.store(-1, std::memory_order_relaxed);
-    SpinLockGuard lg(m_lock);
+    WriteSpinLock lg(m_lock, PA_CURRENT_FUNCTION);
     m_history.clear();
 }
 double LetsGoHpWatcher::last_known_value() const{
     std::vector<double> sorted;
     {
-        SpinLockGuard lg(m_lock);
+        ReadSpinLock lg(m_lock, PA_CURRENT_FUNCTION);
 
         //  No history.
         if (m_history.empty()){
@@ -76,7 +76,7 @@ bool LetsGoHpWatcher::process_frame(const ImageViewRGB32& frame, WallClock times
     }
 //    m_last_known_value.store(hp, std::memory_order_relaxed);
 
-    SpinLockGuard lg(m_lock);
+    WriteSpinLock lg(m_lock, PA_CURRENT_FUNCTION);
     if (m_history.empty()){
         m_history.emplace_back(timestamp, hp);
         return false;
diff --git a/SerialPrograms/Source/PokemonSV/Inference/Overworld/PokemonSV_LetsGoHpReader.h b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_LetsGoHpReader.h
similarity index 83%
rename from SerialPrograms/Source/PokemonSV/Inference/Overworld/PokemonSV_LetsGoHpReader.h
rename to SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_LetsGoHpReader.h
index 72f613659b..63d97cff12 100644
--- a/SerialPrograms/Source/PokemonSV/Inference/Overworld/PokemonSV_LetsGoHpReader.h
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_LetsGoHpReader.h
@@ -1,6 +1,6 @@
 /*  Let's Go HP Reader
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -11,7 +11,7 @@
 #include "Common/Cpp/Color.h"
 #include "Common/Cpp/Concurrency/SpinLock.h"
 #include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "CommonFramework/InferenceInfra/VisualInferenceCallback.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
 
 namespace PokemonAutomation{
     class Logger;
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_LetsGoKillDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_LetsGoKillDetector.cpp
new file mode 100644
index 0000000000..2ca84ccb49
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_LetsGoKillDetector.cpp
@@ -0,0 +1,286 @@
+/*  Let's Go Kill Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Logging/AbstractLogger.h"
+#include "Kernels/Waterfill/Kernels_Waterfill_Session.h"
+#include "CommonFramework/GlobalAutoPaths.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Images/BinaryImage_FilterRgb32.h"
+#include "CommonTools/ImageMatch/ExactImageMatcher.h"
+#include "CommonTools/Audio/SpectrogramMatcher.h"
+#include "CommonTools/Audio/AudioTemplateCache.h"
+#include "Tests/ImageUnitTest.h"
+#include "VideoGames/PokemonSV/PokemonSV_Settings.h"
+#include "PokemonSV_LetsGoKillDetector.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+using namespace Kernels::Waterfill;
+
+
+const ImageMatch::ExactImageMatcher& LETS_GO_KILL_CROPPED(){
+    static ImageMatch::ExactImageMatcher matcher(RESOURCE_PATH() + "PokemonSV/LetsGoKill-Cropped.png");
+    return matcher;
+}
+
+
+bool is_kill_icon(
+    const ImageViewRGB32& image,
+    WaterfillObject& object,
+    const WaterfillObject& red, const WaterfillObject& white
+){
+//    cout << "is_kill_icon" << endl;
+//    cout << red.min_x << "-" << red.max_x << ", " << white.min_y << "-" << white.max_y << endl;
+
+#if 0
+    static int c = 0;
+    object = red;
+    object.merge_assume_no_overlap(white);
+    extract_box_reference(image, object).save("test-" + std::to_string(c++) + ".png");
+#endif
+
+    if (red.max_y >= white.min_y){
+//        cout << "bad y" << endl;
+        return false;
+    }
+    if (red.min_x < white.min_x){
+//        cout << "bad min_x" << endl;
+        return false;
+    }
+    if (red.max_x < white.max_x){
+//        cout << "bad max_x" << endl;
+        return false;
+    }
+
+    object = red;
+    object.merge_assume_no_overlap(white);
+
+    if (object.width() < 18 || object.height() < 18){
+//        cout << "too small: " << object.width() << endl;
+        return false;
+    }
+    double aspect_ratio = object.aspect_ratio();
+    if (aspect_ratio < 0.8 || aspect_ratio > 1.2){
+//        cout << aspect_ratio << endl;
+        return false;
+    }
+
+    ImageViewRGB32 cropped = extract_box_reference(image, object);
+//    cropped.save("test.png");
+    double rmsd = LETS_GO_KILL_CROPPED().rmsd(cropped);
+//    cout << rmsd << endl;
+    return rmsd < 120;
+}
+
+
+
+
+LetsGoKillDetector::LetsGoKillDetector(
+    Color color,
+    const ImageFloatBox& box
+)
+    : m_color(color)
+    , m_box(box)
+{}
+void LetsGoKillDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_box);
+}
+bool LetsGoKillDetector::detect(const ImageViewRGB32& screen){
+    using namespace Kernels::Waterfill;
+
+    size_t size_threshold = (size_t)(10. * screen.total_pixels() / 2073600);
+
+    ImageViewRGB32 region = extract_box_reference(screen, m_box);
+    std::vector<WaterfillObject> reds;
+    std::vector<WaterfillObject> whites;
+    std::unique_ptr<WaterfillSession> session = make_WaterfillSession();
+    {
+        std::vector<PackedBinaryMatrix> matrices = compress_rgb32_to_binary_range(
+            region,
+            {
+                {0xff801e1e, 0xffff5f5f},
+                {0xff901e1e, 0xffff5f5f},
+                {0xffa01e1e, 0xffff5f5f},
+                {0xffb01e1e, 0xffff5f5f},
+                {0xffc01e1e, 0xffff5f5f},
+                {0xffd01e1e, 0xffff5f5f},
+                {0xff801e1e, 0xffff7f7f},
+                {0xff901e1e, 0xffff7f7f},
+                {0xffa01e1e, 0xffff7f7f},
+                {0xffb01e1e, 0xffff7f7f},
+                {0xffc01e1e, 0xffff7f7f},
+                {0xffd01e1e, 0xffff7f7f},
+            }
+        );
+//        size_t c = 0;
+        for (PackedBinaryMatrix& matrix : matrices){
+            session->set_source(matrix);
+            auto iter = session->make_iterator(size_threshold);
+            WaterfillObject object;
+            while (iter->find_next(object, false)){
+                double aspect_ratio = object.aspect_ratio();
+                if (aspect_ratio < 1.5 || aspect_ratio > 2.5){
+                    continue;
+                }
+//                cout << object.area << endl;
+//                extract_box_reference(region, object).save("red-" + std::to_string(c++) + ".png");
+                reds.emplace_back(std::move(object));
+            }
+        }
+    }
+    {
+        std::vector<PackedBinaryMatrix> matrices = compress_rgb32_to_binary_range(
+            region,
+            {
+                {0xffb0b0b0, 0xffffffff},
+                {0xffc0c0c0, 0xffffffff},
+                {0xffd0d0d0, 0xffffffff},
+                {0xffe0e0e0, 0xffffffff},
+            }
+        );
+//        size_t c = 0;
+        for (PackedBinaryMatrix& matrix : matrices){
+            session->set_source(matrix);
+            auto iter = session->make_iterator(size_threshold);
+            WaterfillObject object;
+            while (iter->find_next(object, false)){
+                double aspect_ratio = object.aspect_ratio();
+                if (aspect_ratio < 1.5 || aspect_ratio > 2.7){
+                    continue;
+                }
+//                cout << object.area << endl;
+//                extract_box_reference(region, object).save("white-" + std::to_string(c++) + ".png");
+                whites.emplace_back(std::move(object));
+            }
+        }
+    }
+    for (WaterfillObject& red : reds){
+        for (WaterfillObject& white : whites){
+            WaterfillObject object;
+            if (is_kill_icon(region, object, red, white)){
+                return true;
+            }
+        }
+    }
+
+    return false;
+}
+
+
+
+LetsGoKillWatcher::LetsGoKillWatcher(
+    Logger& logger,
+    Color color, bool trigger_if_detected,
+    const ImageFloatBox& box,
+    std::function<void()> on_kill_callback,
+    std::chrono::milliseconds duration
+)
+     : DetectorToFinder("LetsGoKillWatcher", duration, color, box)
+     , m_logger(logger)
+     , m_trigger_if_detected(trigger_if_detected)
+     , m_on_kill_callback(on_kill_callback)
+     , m_last_detection(false)
+     , m_last_detected(WallClock::min())
+{}
+bool LetsGoKillWatcher::process_frame(const ImageViewRGB32& frame, WallClock timestamp){
+    bool result = DetectorToFinder::process_frame(frame, timestamp);
+    if (!result){
+        m_last_detection = false;
+        return false;
+    }
+
+    if (m_last_detected.load(std::memory_order_relaxed) == WallClock::min()){
+        m_logger.log("Detected Let's Go kill icon.");
+    }
+    m_last_detected.store(timestamp, std::memory_order_release);
+
+    if (!m_last_detection && m_on_kill_callback){
+        m_on_kill_callback();
+    }
+    m_last_detection = true;
+    return m_trigger_if_detected;
+}
+
+
+class Test_LetsGoKillDetector : public ImageUnitTest{
+public:
+    Test_LetsGoKillDetector(const std::string& image, bool expected)
+        : ImageUnitTest("PokemonSV::LetsGoKillDetector - " + image, {image})
+        , m_expected(expected)
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        LetsGoKillDetector detector(COLOR_RED, {0.23, 0.23, 0.04, 0.20});
+        const ImageRGB32& image = images[0];
+        return detector.detect(image) == m_expected;
+    }
+
+private:
+    bool m_expected;
+};
+
+
+void add_tests_LetsGoKillDetector(UnitTestDatabase& database){
+    database.add<Test_LetsGoKillDetector>("PokemonSV/RecentlyBattledDetector/Complete_True.png", true);
+    database.add<Test_LetsGoKillDetector>("PokemonSV/RecentlyBattledDetector/Error_Report_231017_True.png", true);
+    database.add<Test_LetsGoKillDetector>("PokemonSV/RecentlyBattledDetector/Error_Report_240811_True.png", true);
+    database.add<Test_LetsGoKillDetector>("PokemonSV/RecentlyBattledDetector/Error_Report_240819_True.png", true);
+    database.add<Test_LetsGoKillDetector>("PokemonSV/RecentlyBattledDetector/Incomplete_Bottom_False.png", false);
+    database.add<Test_LetsGoKillDetector>("PokemonSV/RecentlyBattledDetector/Incomplete_False.png", false);
+    database.add<Test_LetsGoKillDetector>("PokemonSV/RecentlyBattledDetector/Incomplete_True.png", true);
+}
+
+
+
+
+LetsGoKillSoundDetector::LetsGoKillSoundDetector(Logger& logger, DetectedCallback detected_callback)
+    : AudioPerSpectrumDetectorBase(
+        logger,
+        "LetsGoKillSoundDetector",
+        "Let's Go Kill Sound",
+        COLOR_RED,
+        [this](float error_coefficient){
+            m_last_detected = current_time();
+            return m_detected_callback != nullptr ? m_detected_callback(error_coefficient) : false;
+        }
+    )
+    , m_detected_callback(std::move(detected_callback))
+    , m_last_detected(WallClock::min())
+{}
+void LetsGoKillSoundDetector::set_detected_callback(DetectedCallback detected_callback){
+    m_detected_callback = std::move(detected_callback);
+}
+float LetsGoKillSoundDetector::get_score_threshold() const{
+    return (float)GameSettings::instance().LETS_GO_KILL_SOUND_THRESHOLD;
+}
+std::unique_ptr<SpectrogramMatcher> LetsGoKillSoundDetector::build_spectrogram_matcher(size_t sample_rate){
+    return std::make_unique<SpectrogramMatcher>(
+        "Let's Go Kill",
+        AudioTemplateCache::instance().get_throw("PokemonSV/LetsGoKill", sample_rate),
+        SpectrogramMatcher::Mode::SPIKE_CONV, sample_rate,
+        GameSettings::instance().LETS_GO_KILL_SOUND_LOW_FREQUENCY
+    );
+}
+
+
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_LetsGoKillDetector.h b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_LetsGoKillDetector.h
new file mode 100644
index 0000000000..dde7152198
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_LetsGoKillDetector.h
@@ -0,0 +1,92 @@
+/*  Let's Go Kill Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_LetsGoKillDetector_H
+#define PokemonAutomation_PokemonSV_LetsGoKillDetector_H
+
+#include <functional>
+#include <atomic>
+#include "Common/Cpp/Color.h"
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonTools/Audio/AudioPerSpectrumDetectorBase.h"
+#include "CommonTools/VisualDetector.h"
+
+namespace PokemonAutomation{
+    class Logger;
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+class LetsGoKillDetector : public StaticScreenDetector{
+public:
+    LetsGoKillDetector(Color color, const ImageFloatBox& box = {0.71, 0.15, 0.04, 0.08});
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    Color m_color;
+    ImageFloatBox m_box;
+};
+class LetsGoKillWatcher : public DetectorToFinder<LetsGoKillDetector>{
+public:
+    LetsGoKillWatcher(
+        Logger& logger,
+        Color color, bool trigger_if_detected = true,
+        const ImageFloatBox& box = {0.71, 0.15, 0.04, 0.08},
+        std::function<void()> on_kill_callback = nullptr,
+        std::chrono::milliseconds duration = std::chrono::milliseconds(250)
+    );
+
+    WallClock last_kill() const{
+        return m_last_detected.load(std::memory_order_relaxed);
+    }
+
+    virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override;
+
+private:
+    Logger& m_logger;
+    bool m_trigger_if_detected;
+    std::function<void()> m_on_kill_callback;
+
+    bool m_last_detection;
+    std::atomic<WallClock> m_last_detected;
+};
+
+
+
+
+class LetsGoKillSoundDetector : public AudioPerSpectrumDetectorBase{
+public:
+    LetsGoKillSoundDetector(Logger& logger, DetectedCallback detected_callback = nullptr);
+
+    virtual void set_detected_callback(DetectedCallback detected_callback) override;
+
+    virtual float get_score_threshold() const override;
+
+    WallClock last_kill() const{
+        return m_last_detected.load(std::memory_order_relaxed);
+    }
+
+private:
+    virtual std::unique_ptr<SpectrogramMatcher> build_spectrogram_matcher(size_t sample_rate) override;
+
+private:
+    DetectedCallback m_detected_callback;
+    std::atomic<WallClock> m_last_detected;
+};
+
+
+void add_tests_LetsGoKillDetector(UnitTestDatabase& database);
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_NoMinimapDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_NoMinimapDetector.cpp
new file mode 100644
index 0000000000..3a581ce7b3
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_NoMinimapDetector.cpp
@@ -0,0 +1,37 @@
+/*  No Minimap Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "PokemonSV_NoMinimapDetector.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+NoMinimapDetector::NoMinimapDetector(Logger& logger, Color color)
+    : m_color(color)
+    , m_ball(0.890, 0.800, 0.030, 0.060)
+    , m_overworld(color)
+{}
+void NoMinimapDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_ball);
+}
+bool NoMinimapDetector::detect(const ImageViewRGB32& screen){
+    return !m_overworld.detect(screen);
+}
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_NoMinimapDetector.h b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_NoMinimapDetector.h
new file mode 100644
index 0000000000..ba0c88a055
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_NoMinimapDetector.h
@@ -0,0 +1,52 @@
+/*  No Minimap Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_NoMinimapDetector_H
+#define PokemonAutomation_PokemonSV_NoMinimapDetector_H
+
+#include "Common/Cpp/Color.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+#include "CommonTools/VisualDetector.h"
+#include "PokemonSV_OverworldDetector.h"
+
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+// Detect that the minimap is not visible
+class NoMinimapDetector : public StaticScreenDetector{
+public:
+    NoMinimapDetector(Logger& logger, Color color = COLOR_RED);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+
+protected:
+    const Color m_color;
+    const ImageFloatBox m_ball;
+    OverworldDetector m_overworld;
+};
+
+class NoMinimapWatcher : public DetectorToFinder<NoMinimapDetector>{
+public:
+    NoMinimapWatcher(
+        Logger& logger, 
+        Color color = COLOR_RED, 
+        std::chrono::milliseconds hold_duration = std::chrono::milliseconds(5000)
+    )
+        : DetectorToFinder("GradientArrowWatcher", hold_duration, logger, color)
+    {}
+
+};
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OliveDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OliveDetector.cpp
new file mode 100644
index 0000000000..57c44f345b
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OliveDetector.cpp
@@ -0,0 +1,401 @@
+/*  Olive Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Kernels/Waterfill/Kernels_Waterfill_Types.h"
+#include "CommonFramework/ImageTools/ImageDiff.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Images/ImageFilter.h"
+#include "CommonTools/Images/WaterfillUtilities.h"
+#include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h"
+#include "VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_OliveActionFailedException.h"
+#include "PokemonSV_OliveDetector.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+class OliveMatcher : public ImageMatch::WaterfillTemplateMatcher{
+public:
+    OliveMatcher() : WaterfillTemplateMatcher(
+        "PokemonSV/Olive.png", Color(0,0,0), Color(255, 255, 255), 5
+    ){
+        m_aspect_ratio_lower = 0.35;
+        m_aspect_ratio_upper = 3;
+        m_area_ratio_lower = 0.5;
+        m_area_ratio_upper = 1.5;
+    }
+
+    static const ImageMatch::WaterfillTemplateMatcher& instance(){
+        static OliveMatcher matcher;
+        return matcher;
+    }
+};
+
+
+OliveDetector::OliveDetector(VideoStream& stream, Color color)
+    : m_overlays(stream.overlay())
+    , m_color(color)
+{}
+void OliveDetector::make_overlays(VideoOverlaySet& items) const{
+}
+
+
+std::pair<double, double> OliveDetector::olive_location(VideoStream& stream, ProControllerContext& context, ImageFloatBox box){
+    context.wait_for_all_requests();
+    ImageFloatBox location = get_olive_floatbox(stream, context, 30, box);
+    double x = location.x + (location.width / 2);
+    double y = location.y + (location.height / 2);
+
+    return std::make_pair(x, y);
+}
+
+std::pair<double, double> box_center(ImageFloatBox& box){
+    double x = box.x + (box.width / 2);
+    double y = box.y + (box.height / 2);
+
+    return std::make_pair(x, y);
+}
+
+ImageFloatBox OliveDetector::get_olive_floatbox(
+    const ImageViewRGB32& screen,
+    ProControllerContext& context,
+    uint8_t rgb_gap,
+    ImageFloatBox box
+){
+    const std::vector<std::pair<uint32_t, uint32_t>> filters = {
+        {combine_rgb(0, 10, 0), combine_rgb(255, 255, 255)},
+    };
+
+    ImageRGB32 green_only = filter_green(screen, Color(0xff000000), rgb_gap);
+
+    const double min_object_size = 1000;
+    const double rmsd_threshold = 100;
+
+    const double screen_rel_size = (screen.height() / 1080.0);
+    const size_t min_size = size_t(screen_rel_size * screen_rel_size * min_object_size);
+
+    size_t largest_size = 0;
+    ImageFloatBox largest_green(0, 0, 0, 0);
+    ImageViewRGB32 cropped = extract_box_reference(green_only, box);
+    ImagePixelBox pixel_search_area = floatbox_to_pixelbox(screen.width(), screen.height(), box);
+    match_template_by_waterfill(
+        screen.size(),
+        cropped, 
+        OliveMatcher::instance(),
+        filters,
+        {min_size, SIZE_MAX},
+        rmsd_threshold,
+        [&](Kernels::Waterfill::WaterfillObject& object) -> bool {
+            size_t object_area = object.area;
+            if (object_area > largest_size){
+                largest_size = object_area;
+                // cout << largest_size << endl;
+                ImagePixelBox found_box(
+                    object.min_x + pixel_search_area.min_x, object.min_y + pixel_search_area.min_y,
+                    object.max_x + pixel_search_area.min_x, object.max_y + pixel_search_area.min_y);
+                largest_green = pixelbox_to_floatbox(screen.width(), screen.height(), found_box);
+            }
+
+            return false;
+        }
+    );
+
+    m_overlays.clear();
+    m_overlays.add(m_color, largest_green);
+    
+    return largest_green;
+}
+
+ImageFloatBox OliveDetector::get_olive_floatbox(VideoStream& stream, ProControllerContext& context, uint8_t rgb_gap, ImageFloatBox box){
+    size_t MAX_ATTEMPTS = 2;
+    for (size_t i = 0; i < MAX_ATTEMPTS; i++){
+        context.wait_for_all_requests();
+        auto snapshot = stream.video().snapshot();
+        ImageFloatBox olive_box = get_olive_floatbox(snapshot, context, rgb_gap, box);
+        if (olive_box.x == 0 && olive_box.y == 0){
+            // Olive not detected. try again. may have been obscured by the player's head/hat
+            context.wait_for(Milliseconds(2000));
+            continue;
+        }
+        return olive_box;        
+    }
+
+    // dump_snapshot(stream);
+    throw_and_log<OliveActionFailedException>(
+        stream.logger(), ErrorReportMode::SEND_ERROR_REPORT,
+        "get_olive_floatbox(): Olive not detected.",
+        stream,
+        OliveFail::NO_OLIVE_DETECTED
+    );
+}
+
+ImageFloatBox OliveDetector::align_to_olive(
+    const ProgramInfo& info, 
+    VideoStream& stream,
+    ProControllerContext& context, 
+    double direction_facing, 
+    uint8_t rgb_gap,
+    ImageFloatBox area_to_check,
+    bool throw_if_fail_change_dir
+){
+    size_t MAX_ATTEMPTS = 10;
+    // size_t olive_unchanged_count = 0;
+    ImageFloatBox olive_box;
+    DirectionDetector direction;
+    uint16_t scale_factor = 130;
+    int16_t prev_push_direction = 0;
+    for (size_t i = 0; i < MAX_ATTEMPTS; i++){
+        direction.change_direction(info, stream, context, direction_facing, throw_if_fail_change_dir);
+        pbf_move_left_joystick(context, {0, +1}, 40ms, 160ms);
+    
+        olive_box = get_olive_floatbox(stream, context, rgb_gap, area_to_check);
+
+        std::pair<double, double> olive = box_center(olive_box);
+        double olive_x = olive.first;
+        double olive_y = olive.second;
+        double olive_area = olive_box.width * olive_box.height;
+
+        double diff_from_center = olive_x - 0.5;
+        stream.log("olive_x: " +  std::to_string(olive_x) + ", olive_y: " +  std::to_string(olive_y) + ", olive_area: " +  std::to_string(olive_area));
+        if (std::abs(diff_from_center) < 0.01){
+            return olive_box;
+        }
+
+
+        int16_t push_direction = (diff_from_center > 0) ? 1 : -1;
+        if (olive_y > 0.50 && scale_factor > 100){
+            scale_factor = 100;
+        }
+        if (olive_box.height > 0.35 && scale_factor > 50){
+            scale_factor = 50;
+        }
+        if (push_direction * -1 == prev_push_direction){  
+            // if you overshot the olive, and are now pushing in the opposite direction
+            // then reduce the push_duration.
+            scale_factor = int16_t(scale_factor * 0.5);
+        }
+        
+        // cout << "olive_height" << olive_box.height << endl;
+        // if (olive_box.height > 0.4){
+        //     scale_factor = 50;
+        // }
+
+
+        uint16_t push_duration_ticks = std::max(uint16_t((std::abs(diff_from_center) + 0.02) * scale_factor / (olive_y)), uint16_t(15));
+        Milliseconds push_duration = push_duration_ticks * 8ms;
+        double push_magnitude = 1; // std::max(double(128 / (i + 1)), double(20)); // push less with each iteration/attempt
+        double push_x = std::max(std::min(push_direction * push_magnitude, 1.0), -1.0);
+        stream.log("scale_factor: " + std::to_string(scale_factor));
+        stream.log("push x: " + std::to_string(push_x) + ", push duration: " +  std::to_string(push_duration.count()) + "ms");
+        // pbf_wait(context, 800ms);
+        uint16_t wait_ticks = 50;
+        if (std::abs(diff_from_center) < 0.05){
+            wait_ticks = 100;
+        }
+        Milliseconds wait_duration = wait_ticks * 8ms;
+        pbf_move_left_joystick(context, {push_x, 0}, push_duration, wait_duration);
+        prev_push_direction = push_direction;
+        
+
+        // // check if we're making progress towards centering on the olive.
+        // ImageFloatBox olive_box_2 = get_olive_floatbox(console, context, rgb_gap, area_to_check);
+        // double box_1_area = olive_box.width * olive_box.height;
+        // double box_2_area = olive_box_2.width * olive_box_2.height;
+        // double area_diff = std::abs(box_1_area - box_2_area);
+        // double x_diff = std::abs(olive_box.x - olive_box_2.x);
+        // double y_diff = std::abs(olive_box.y - olive_box_2.y);
+
+        // if (area_diff < 0.02 && x_diff < 0.01 && y_diff < 0.01){ 
+        //     olive_unchanged_count++;
+        //     // not moving closer to the olive. either wall/fence is in the way, or we are right next the olive.
+        //     console.log("Can't align to Olive. Try moving backwards and try again.");
+        //     pbf_move_left_joystick(context, {0, -1}, 600ms, 800ms);  // walk backwards
+        //     if (olive_unchanged_count == 2){
+        //         throw OliveActionFailedException(
+        //             console, ErrorReportMode::SEND_ERROR_REPORT,
+        //             "align_to_olive(): Failed to align to olive.",
+        //             true,
+        //             OliveFail::FAILED_ALIGN_TO_OLIVE
+        //         );                    
+        //     }
+        // }else{
+        //     olive_unchanged_count = 0;
+        // }
+    }
+    return olive_box;
+
+    // don't throw an exception, since sometimes the program has trouble detecting the olive's exact location with the white logo on the olive.
+    // so we rely on maxing out the attempts to move on.
+    // throw OliveActionFailedException(
+    //     console, ErrorReportMode::SEND_ERROR_REPORT,
+    //     "align_to_olive(): Failed to align to olive.",
+    //     true,
+    //     OliveFail::FAILED_ALIGN_TO_OLIVE
+    // );  
+}
+
+
+// todo: detect and handle case where olive is stuck.
+// todo: detect and handle case where olive is slightly to the left, and so we need to move on to the next phase
+Milliseconds OliveDetector::push_olive_forward(
+    const ProgramInfo& info, 
+    VideoStream& stream,
+    ProControllerContext& context, 
+    double direction_facing, 
+    Milliseconds total_forward_distance,
+    Milliseconds push_olive,
+    uint8_t rgb_gap,
+    ImageFloatBox area_to_check, 
+    bool throw_if_fail_change_dir
+){
+    stream.log("push_olive_forward(): Total distance: " + std::to_string(total_forward_distance.count()) + "ms");
+    // uint16_t initial_push_olive = push_olive;
+    Milliseconds walked = 0ms;
+    size_t MAX_ATTEMPTS = 10;
+    for (size_t i = 0; i < MAX_ATTEMPTS; i++){
+        align_to_olive(info, stream, context, direction_facing, rgb_gap, area_to_check, throw_if_fail_change_dir);
+        walked += walk_up_to_olive(info, stream, context, direction_facing, rgb_gap, area_to_check);
+        
+
+        if (walked >= total_forward_distance){
+            stream.log("Distance walked: " + std::to_string(walked.count()) + "/" + std::to_string(total_forward_distance.count()) + " ms");
+            return walked;
+        }
+
+        align_to_olive(info, stream, context, direction_facing, rgb_gap, area_to_check, throw_if_fail_change_dir);
+        // check location of olive before and after push
+        // if olive is approximately in the same location, then the olive is stuck. try moving backward and running forward again.
+        ImageFloatBox olive_box_1 = get_olive_floatbox(stream, context, rgb_gap, area_to_check);
+        for (size_t j = 0; j < 3; j++){
+            stream.log(
+                "Distance walked: " + std::to_string(walked.count()) +
+                "/" + std::to_string(total_forward_distance.count()) + " ms"
+            );
+            stream.log("Push the olive.");
+            pbf_move_left_joystick(context, {0, +1}, push_olive, 7000ms);
+            
+            walked += push_olive;
+            ImageFloatBox olive_box_2 = get_olive_floatbox(stream, context, rgb_gap, area_to_check);
+            double box_1_area = olive_box_1.width * olive_box_1.height;
+            double box_2_area = olive_box_2.width * olive_box_2.height;
+            double area_diff = std::abs(box_1_area - box_2_area);
+            double x_diff = std::abs(olive_box_1.x - olive_box_2.x);
+            double y_diff = std::abs(olive_box_1.y - olive_box_2.y);
+
+            if (area_diff < 0.02 && x_diff < 0.05 && y_diff < 0.05){
+                stream.log("Olive is stuck? Move backwards and try pushing again.");
+                stream.log("Olive 1: area: " + std::to_string(box_1_area) + ", x: " + std::to_string(olive_box_1.x) + ", y: " + std::to_string(olive_box_1.y));
+                stream.log("Olive 2: area: " + std::to_string(box_2_area) + ", x: " + std::to_string(olive_box_2.x) + ", y: " + std::to_string(olive_box_2.y));
+                pbf_move_left_joystick(context, {0, -1}, 600ms, 800ms);  // walk backwards
+                walked -= push_olive;
+                push_olive = 1600ms; // run forward more on the next push
+
+                if (j == 2){
+                    throw_and_log<OliveActionFailedException>(
+                        stream.logger(), ErrorReportMode::SEND_ERROR_REPORT,
+                        "push_olive_forward(): Olive stuck.",
+                        stream,
+                        OliveFail::OLIVE_STUCK
+                    );                    
+                }
+            }else{
+                break;
+            }
+        }
+        
+        if (walked > total_forward_distance){
+            stream.log(
+                "Distance walked: " + std::to_string(walked.count()) +
+                "/" + std::to_string(total_forward_distance.count()) + " ms"
+            );
+            return walked;
+        }
+
+        stream.log(
+            "Distance walked: " + std::to_string(walked.count()) +
+            "/" + std::to_string(total_forward_distance.count()) + " ms"
+        );
+        
+    }
+
+    throw_and_log<OliveActionFailedException>(
+        stream.logger(), ErrorReportMode::SEND_ERROR_REPORT,
+        "push_olive_forward(): Something went wrong. Failed to walk the Olive forward as expected.",
+        stream,
+        OliveFail::FAILED_PUSH_OLIVE_TOTAL_DISTANCE
+    );
+
+}
+
+Milliseconds OliveDetector::walk_up_to_olive(
+    const ProgramInfo& info, 
+    VideoStream& stream,
+    ProControllerContext& context, 
+    double direction_facing, 
+    uint8_t rgb_gap,
+    ImageFloatBox area_to_check
+){
+    Milliseconds walked = 0ms;
+    size_t MAX_ATTEMPTS = 20;
+    for (size_t i = 0; i < MAX_ATTEMPTS; i++){
+        ImageFloatBox olive_box = get_olive_floatbox(stream, context, rgb_gap, area_to_check);
+        std::pair<double, double> olive = box_center(olive_box);
+        // double olive_x = olive.first;
+        double olive_y = olive.second;
+
+        double scale_factor = 16000;
+        Milliseconds push_duration((int64_t)((0.57 - olive_y) * (0.57 - olive_y) * scale_factor));
+        push_duration = std::max(push_duration, 160ms);
+        stream.log("walk_up_to_olive(): olive_y: " + std::to_string(olive_y));
+        if (olive_y > 0.515){
+            return walked;
+        }        
+        stream.log("push duration: " +  std::to_string(push_duration.count()) + " ms");
+        // when push durations are low, the player moves less than expected
+        // once above 45, you walk about as much as expected
+        double walking_factor = 1;
+        if (push_duration <= 160ms){
+            walking_factor = 0.40;
+        }else if (push_duration <= 200ms){
+            walking_factor = 0.53;
+        }else if (push_duration <= 240ms){
+            walking_factor = 0.69;
+        }else if (push_duration <= 280ms){
+            walking_factor = 0.83;
+        }else if (push_duration <= 320ms){
+            walking_factor = 0.91;
+        }
+        walked += Milliseconds((int64_t)(push_duration.count() * walking_factor));
+
+        Milliseconds wait = 400ms;
+        if (olive_y > 0.4){
+            wait = 800ms;
+        }        
+        pbf_move_left_joystick(context, {0, +1}, push_duration, wait);
+    }    
+
+    throw_and_log<OliveActionFailedException>(
+        stream.logger(), ErrorReportMode::SEND_ERROR_REPORT,
+        "walk_up_to_olive(): Something went wrong. Failed to walk up to the Olive",
+        stream,
+        OliveFail::FAILED_WALK_TO_OLIVE
+    );
+
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OliveDetector.h b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OliveDetector.h
new file mode 100644
index 0000000000..ff2233f48b
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OliveDetector.h
@@ -0,0 +1,90 @@
+/*  Olive Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_OliveDetector_H
+#define PokemonAutomation_PokemonSV_OliveDetector_H
+
+#include "Common/Cpp/Color.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/Notifications/ProgramInfo.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonFramework/Tools/VideoStream.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+class OliveDetector {
+public:
+    OliveDetector(VideoStream& stream, Color color = COLOR_RED);
+
+    void make_overlays(VideoOverlaySet& items) const;
+
+    std::pair<double, double> olive_location(VideoStream& stream, ProControllerContext& context, ImageFloatBox box = {0, 0.15, 1, 0.7});
+
+    ImageFloatBox get_olive_floatbox(
+        const ImageViewRGB32& screen, 
+        ProControllerContext& context, 
+        uint8_t rgb_gap,
+        ImageFloatBox box
+    );
+
+    // return ImageFloatBox of the of the Olive, based on the largest blob of green
+    ImageFloatBox get_olive_floatbox(
+        VideoStream& stream,
+        ProControllerContext& context, 
+        uint8_t rgb_gap,
+        ImageFloatBox box
+    );
+
+    ImageFloatBox align_to_olive(
+        const ProgramInfo& info, 
+        VideoStream& stream,
+        ProControllerContext& context, 
+        double direction_facing, 
+        uint8_t rgb_gap = 20,
+        ImageFloatBox area_to_check = {0, 0.3, 1.0, 0.40},
+        bool throw_if_fail_change_dir = true
+    );
+
+    // push the olive forward. 
+    // move forward a certain number of ticks, as per total_forward_distance
+    // always face a certain direction, as per direction_facing
+    // return number of ticks walked
+    Milliseconds push_olive_forward(
+        const ProgramInfo& info, 
+        VideoStream& stream,
+        ProControllerContext& context, 
+        double direction_facing,
+        Milliseconds total_forward_distance,
+        Milliseconds push_olive = Milliseconds(600),
+        uint8_t rgb_gap = 20,
+        ImageFloatBox area_to_check = {0, 0.3, 1.0, 0.40},  // {0, 0.15, 1, 0.7}
+        bool throw_if_fail_change_dir = true
+    );
+
+    Milliseconds walk_up_to_olive(
+        const ProgramInfo& info, 
+        VideoStream& stream,
+        ProControllerContext& context, 
+        double direction_facing, 
+        uint8_t rgb_gap = 20,
+        ImageFloatBox area_to_check = {0, 0.3, 1.0, 0.40}
+    );
+    
+
+protected:
+    VideoOverlaySet m_overlays;
+    const Color m_color;
+};
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.cpp
new file mode 100644
index 0000000000..e1c7fbce44
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.cpp
@@ -0,0 +1,256 @@
+/*  Overworld Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Kernels/Waterfill/Kernels_Waterfill_Types.h"
+#include "CommonFramework/GlobalAutoPaths.h"
+#include "CommonFramework/ImageTools/ImageDiff.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Images/WaterfillUtilities.h"
+#include "CommonTools/ImageMatch/ExactImageMatcher.h"
+#include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h"
+#include "Tests/ImageUnitTest.h"
+#include "PokemonSV_OverworldDetector.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+const ImageMatch::ExactImageMatcher& RADAR_BALL(){
+    static ImageMatch::ExactImageMatcher matcher(RESOURCE_PATH() + "PokemonSV/RadarBall.png");
+    return matcher;
+}
+
+class RadarBallMatcher : public ImageMatch::WaterfillTemplateMatcher{
+public:
+    RadarBallMatcher() : WaterfillTemplateMatcher(
+        "PokemonSV/RadarBall.png", Color(192,192,0), Color(255, 255, 127), 5
+    ){
+        m_aspect_ratio_lower = 0.8;
+        m_aspect_ratio_upper = 1.2;
+        m_area_ratio_lower = 0.01;
+        m_area_ratio_upper = 1.2;
+    }
+
+    static const ImageMatch::WaterfillTemplateMatcher& instance(){
+        static RadarBallMatcher matcher;
+        return matcher;
+    }
+};
+
+
+
+OverworldDetector::OverworldDetector(Color color)
+    : m_color(color)
+    , m_ball(0.890, 0.800, 0.030, 0.060)
+    , m_radar(0.815, 0.680, 0.180, 0.310)
+    , m_radar_inside(0.865, 0.750, 0.080, 0.170)
+{}
+void OverworldDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_ball);
+    items.add(m_color, m_radar);
+    items.add(m_color, m_radar_inside);
+}
+bool OverworldDetector::detect(const ImageViewRGB32& screen){
+    return locate_ball(screen, false).first > 0;
+}
+
+std::pair<double, double> OverworldDetector::locate_ball(const ImageViewRGB32& screen, bool strict_requirements) const{
+    const std::vector<std::pair<uint32_t, uint32_t>> filters = {
+        {0xffa0a000, 0xffffff1f},
+        {0xffb0b000, 0xffffff1f},
+        {0xffc0c000, 0xffffff1f},
+        {0xffd0d000, 0xffffff1f},
+        {0xffe0e000, 0xffffff1f},
+        {0xfff0f000, 0xffffff1f},
+        {0xfff8f800, 0xffffff1f},
+
+        {0xffc0c000, 0xffffff3f},
+        {0xffd0d000, 0xffffff3f},
+        {0xffe0e000, 0xffffff3f},
+        {0xfff0f000, 0xffffff3f},
+        {0xfff8f800, 0xffffff3f},
+
+        {0xffc0c000, 0xffffff5f},
+        {0xffd0d000, 0xffffff5f},
+        {0xffe0e000, 0xffffff5f},
+        {0xfff0f000, 0xffffff5f},
+        {0xfff8f800, 0xffffff5f},
+
+        {0xffc0c000, 0xffffff7f},
+        {0xffd0d000, 0xffffff7f},
+        {0xffe0e000, 0xffffff7f},
+        {0xfff0f000, 0xffffff7f},
+        {0xfff8f800, 0xffffff7f},
+    };
+
+    // yellow arrow has area of 70-80. the yellow ball, when only partially filled (i.e. only the outer ring is waterfilled), has an area of 200. 
+    // when the ball is fully filled in, it has an area of 550
+    const double min_object_size = strict_requirements ? 150.0 : 50;
+    const double rmsd_threshold = strict_requirements ? 35.0 : 50.0;
+
+    const double screen_rel_size = (screen.height() / 1080.0);
+    const size_t min_size = size_t(screen_rel_size * screen_rel_size * min_object_size);
+
+    std::pair<double, double> ball_location(-1.0, -1.0);
+    ImageViewRGB32 cropped = extract_box_reference(screen, m_ball);
+    ImagePixelBox pixel_box = floatbox_to_pixelbox(screen.width(), screen.height(), m_ball);
+    match_template_by_waterfill(
+        screen.size(),
+        cropped, 
+        RadarBallMatcher::instance(),
+        filters,
+        {min_size, SIZE_MAX},
+        rmsd_threshold,
+        [&](Kernels::Waterfill::WaterfillObject& object) -> bool {
+            //  Exclude if it touches the borders of the box
+            if (object.min_x == 0 || object.min_y == 0 ||
+                object.max_x == cropped.width() || object.max_y == cropped.height()
+            ){
+                return false;
+            }
+
+            ball_location = std::make_pair(
+                (object.center_of_gravity_x() + pixel_box.min_x) / (double)screen.width(),
+                (object.center_of_gravity_y() + pixel_box.min_y) / (double)screen.height()
+            );
+            return true;
+        }
+    );
+
+    return ball_location;
+}
+
+
+
+OverworldWatcher::OverworldWatcher(Logger& logger, Color color)
+     : OverworldDetector(color)
+     , VisualInferenceCallback("OverworldWatcher")
+     , m_logger(logger)
+     , m_ball_hold_duration(std::chrono::milliseconds(5000))
+     , m_map_hold_duration(std::chrono::milliseconds(1000))
+     , m_north_hold_duration(std::chrono::milliseconds(1000))
+     , m_last_ball(WallClock::min())
+     , m_last_north(WallClock::min())
+{
+    m_direction_detector = DirectionDetector(COLOR_RED);
+}
+
+void OverworldWatcher::make_overlays(VideoOverlaySet& items) const{
+    OverworldDetector::make_overlays(items);
+}
+bool OverworldWatcher::process_frame(const VideoSnapshot& frame){
+    //  Return true if either of the following is true:
+    //    - Ball is held and radar map stays still for 1 second.
+    //    - Ball is held for 1 second and N symbol is held for 1 second
+    //    - Ball is held for 5 seconds.
+
+    //  The map is not static when there is an event raid in it as it will
+    //  sparkle. So instead, we revert to the ball being held for 5 seconds.
+
+    // Using Ball detection alone can false positive on the slow moving lights after a tera raid.
+    // To reduce false positives, we also require: either the map staying still for 1 second, or detecting the N symbol.
+
+    //  No detection.
+    if (!detect(frame)){
+        m_last_ball = WallClock::min();
+        m_start_of_detection.clear();
+        return false;
+    }
+
+    //  First detection of ball
+    if (m_last_ball == WallClock::min()){
+        m_last_ball = frame.timestamp;
+    }
+    if (!m_start_of_detection){
+        m_start_of_detection = frame;
+        return false;
+    }
+
+    //  Ball held for long enough. (5 seconds)
+    if (frame.timestamp - m_last_ball >= m_ball_hold_duration){
+        return true;
+    }
+
+
+    // check for North symbol
+    if (!m_direction_detector.detect_north(m_logger, frame)){ 
+        m_last_north = WallClock::min(); // not detecting north
+    }else{
+        if (m_last_north == WallClock::min()){ // first detection of north
+            m_last_north = frame.timestamp;  
+        }
+        if (frame.timestamp - m_last_north >= m_north_hold_duration){
+            return true;
+        }        
+    }
+
+
+    // Check if radar map stays still for 1 second.
+
+    //  Mismatching image sizes.
+    ImageViewRGB32 start = extract_box_reference(m_start_of_detection, m_radar_inside);
+    ImageViewRGB32 current = extract_box_reference(frame, m_radar_inside);
+    if (start.width() != current.width() || start.height() != current.height()){
+        m_start_of_detection = frame;
+        return false;
+    }
+
+    
+    double rmsd = ImageMatch::pixel_RMSD(start, current);
+//    cout << "rmsd = " << rmsd << endl;
+    if (rmsd > 2.0){ //  Image of radar map has changed too much.
+        m_start_of_detection = frame;
+        return false;
+    }
+
+    //  Make sure radar map held for long enough.
+    return frame.timestamp - m_start_of_detection.timestamp >= m_map_hold_duration;
+}
+
+
+class Test_OverworldDetector : public ImageUnitTest{
+public:
+    Test_OverworldDetector(const std::string& image, bool expected)
+        : ImageUnitTest("PokemonSV::OverworldDetector - " + image, {image})
+        , m_expected(expected)
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        OverworldDetector detector;
+        const ImageRGB32& image = images[0];
+        return detector.detect(image) == m_expected;
+    }
+
+private:
+    bool m_expected;
+};
+
+
+void add_tests_OverworldDetector(UnitTestDatabase& database){
+    database.add<Test_OverworldDetector>("PokemonSV/OverworldDetector/ZeroGateDay_2_True.png", true);
+    database.add<Test_OverworldDetector>("PokemonSV/OverworldDetector/ZeroGateDay_True.png", true);
+    database.add<Test_OverworldDetector>("PokemonSV/OverworldDetector/ZeroGateNight_True.png", true);
+    database.add<Test_OverworldDetector>("PokemonSV/OverworldDetector/ZeroGateNightBike_1_True.png", true);
+    database.add<Test_OverworldDetector>("PokemonSV/OverworldDetector/ZeroGateNightBike_2_True.png", true);
+}
+
+
+
+
+
+}
+}
+}
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h
new file mode 100644
index 0000000000..c3239f4495
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h
@@ -0,0 +1,68 @@
+/*  Overworld Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_OverworldDetector_H
+#define PokemonAutomation_PokemonSV_OverworldDetector_H
+
+#include "Common/Cpp/Color.h"
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+#include "CommonTools/VisualDetector.h"
+#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+// Detect the player character is on overworld.
+// It detects the center circle of the minimap.
+class OverworldDetector : public StaticScreenDetector{
+public:
+    OverworldDetector(Color color = COLOR_RED);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+    // return coordinates of the radar ball. return -1, -1 if unable to find the radar ball.
+    // set strict_requirements to true for more accurate detection of radar ball,
+    std::pair<double, double> locate_ball(const ImageViewRGB32& screen, bool strict_requirements) const;
+
+protected:
+    const Color m_color;
+    const ImageFloatBox m_ball;
+    const ImageFloatBox m_radar;
+    const ImageFloatBox m_radar_inside;
+};
+
+class OverworldWatcher : public OverworldDetector, public VisualInferenceCallback{
+public:
+    OverworldWatcher(Logger& logger, Color color = COLOR_RED);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool process_frame(const VideoSnapshot& frame) override;
+
+
+private:
+    Logger& m_logger;
+    std::chrono::milliseconds m_ball_hold_duration;
+    std::chrono::milliseconds m_map_hold_duration;
+    std::chrono::milliseconds m_north_hold_duration;
+    WallClock m_last_ball;
+    WallClock m_last_north;
+    VideoSnapshot m_start_of_detection;
+    DirectionDetector m_direction_detector;
+};
+
+
+void add_tests_OverworldDetector(UnitTestDatabase& database);
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldSensors.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldSensors.cpp
new file mode 100644
index 0000000000..7fee6b266d
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldSensors.cpp
@@ -0,0 +1,177 @@
+/*  Overworld Sensors
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Logging/AbstractLogger.h"
+#include "CommonTools/Images/ImageFilter.h"
+#include "PokemonSV_OverworldSensors.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+ShinySoundTracker::ShinySoundTracker(Logger& logger)
+    : ShinySoundDetector(logger, [this](float error){
+//        cout << "New: Shiny Sound" << endl;
+        on_shiny_detected(error);
+        return false;
+    })
+    , VisualInferenceCallback("ShinyScreenshotTracker")
+    , m_last_detection(WallClock::min())
+    , m_last_error(1.0)
+{}
+bool ShinySoundTracker::last_detection(
+    WallClock& timestamp, float& error,
+    VideoSnapshot& screenshot
+) const{
+    ReadSpinLock lg(m_lock, PA_CURRENT_FUNCTION);
+    if (m_last_detection == WallClock::min()){
+        return false;
+    }
+    timestamp = m_last_detection;
+    error = m_last_error;
+    screenshot = m_last_screenshot;
+    return true;
+}
+void ShinySoundTracker::on_shiny_detected(float error){
+    WallClock now = current_time();
+    WallClock threshold = now - std::chrono::seconds(1);
+
+    //  Find the brightest frame.
+    ReadSpinLock lg(m_lock, PA_CURRENT_FUNCTION);
+
+    VideoSnapshot best_snapshot;
+    double best_bright_portion = 0;
+
+    for (const VideoSnapshot& frame : m_history){
+        if (frame.timestamp >= threshold){
+            break;
+        }
+        size_t bright_pixels;
+        filter_rgb32_range(bright_pixels, frame, 0xffe0e000, 0xffffffff, Color(0xff000000), false);
+        double bright_portion = bright_pixels / (double)(frame->width() * frame->height());
+        if (best_bright_portion < bright_portion){
+            best_bright_portion = bright_portion;
+            best_snapshot = frame;
+        }
+    }
+
+    m_last_screenshot = std::move(best_snapshot);
+    m_last_detection = now;
+    m_last_error = error;
+}
+bool ShinySoundTracker::process_frame(const VideoSnapshot& frame){
+    if (!frame){
+        return false;
+    }
+
+    WriteSpinLock lg(m_lock, PA_CURRENT_FUNCTION);
+
+    //  Clear old history.
+    while (!m_history.empty() && m_history.front().timestamp + std::chrono::milliseconds(2000) < frame.timestamp){
+        m_history.pop_front();
+    }
+
+    //  Add current frame if it has been long enough since the previous.
+    if (m_history.empty() || m_history.back().timestamp + std::chrono::milliseconds(250) < frame.timestamp){
+        m_history.push_back(frame);
+    }
+
+    return false;
+}
+
+
+
+
+
+
+
+
+
+
+
+OverworldBattleTracker::OverworldBattleTracker(Logger& logger, OverworldSensors& sensors)
+    : m_logger(logger)
+    , m_sensors(sensors)
+    , m_start_time(current_time())
+    , m_last_known_in_battle(false)
+{}
+auto OverworldBattleTracker::report_battle_menu_detected() -> Detection{
+    bool is_shiny = false;
+    WallClock last_shiny_sound;
+    float last_shiny_error;
+    VideoSnapshot last_shiny_screenshot;
+    if (m_sensors.shiny_sound.last_detection(last_shiny_sound, last_shiny_error, last_shiny_screenshot)){
+        is_shiny = m_start_time < last_shiny_sound;
+    }
+
+    bool start_battle = m_start_time < m_sensors.start_battle.last_detected();
+
+    if (is_shiny && !start_battle){
+        m_logger.log("Detected a shiny without a start of battle.", COLOR_RED);
+    }
+    if (!m_last_known_in_battle && !start_battle){
+        m_logger.log("Detected a battle menu without a start of battle.", COLOR_RED);
+    }
+
+    if (is_shiny){
+        return Detection::NEW_SHINY_BATTLE;
+    }
+    if (start_battle){
+        return Detection::NEW_BATTLE;
+    }
+    return Detection::CONTINUE_BATTLE;
+}
+auto OverworldBattleTracker::report_battle_menu_detected(VideoSnapshot& shiny_screenshot, float& shiny_error) -> Detection{
+    bool is_shiny = false;
+    WallClock last_shiny_sound;
+    if (m_sensors.shiny_sound.last_detection(last_shiny_sound, shiny_error, shiny_screenshot)){
+        is_shiny = m_start_time < last_shiny_sound;
+    }
+
+    bool start_battle = m_start_time < m_sensors.start_battle.last_detected();
+
+    if (is_shiny && !start_battle){
+        m_logger.log("Detected a shiny without a start of battle.", COLOR_RED);
+    }
+    if (!m_last_known_in_battle && !start_battle){
+        m_logger.log("Detected a battle menu without a start of battle.", COLOR_RED);
+    }
+
+    if (is_shiny){
+        return Detection::NEW_SHINY_BATTLE;
+    }
+    if (start_battle){
+        return Detection::NEW_BATTLE;
+    }
+    return Detection::CONTINUE_BATTLE;
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldSensors.h b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldSensors.h
new file mode 100644
index 0000000000..f5ffe2961f
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldSensors.h
@@ -0,0 +1,164 @@
+/*  Overworld Sensors
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_OverworldSensors_H
+#define PokemonAutomation_PokemonSV_OverworldSensors_H
+
+#include "Common/Cpp/CancellableScope.h"
+#include "Common/Cpp/Concurrency/SpinLock.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonTools/Async/InferenceSession.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+#include "VideoGames/PokemonSV/Inference/Battles/PokemonSV_StartBattleYellowBar.h"
+#include "VideoGames/PokemonSV/Inference/Battles/PokemonSV_ShinySoundDetector.h"
+#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_LetsGoHpReader.h"
+#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_LetsGoKillDetector.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+class ShinySoundTracker : public ShinySoundDetector, public VisualInferenceCallback{
+public:
+    ShinySoundTracker(Logger& logger);
+
+    bool last_detection(
+        WallClock& timestamp, float& error,
+        VideoSnapshot& screenshot
+    ) const;
+
+    virtual void make_overlays(VideoOverlaySet& items) const override{}
+    virtual bool process_frame(const VideoSnapshot& frame) override;
+
+private:
+    void on_shiny_detected(float error);
+
+private:
+    mutable SpinLock m_lock;
+
+    WallClock m_last_detection;
+    float m_last_error;
+    VideoSnapshot m_last_screenshot;
+
+    std::deque<VideoSnapshot> m_history;
+};
+
+
+
+
+
+
+class OverworldSensors{
+public:
+    using DetectedCallback = AudioPerSpectrumDetectorBase::DetectedCallback;
+
+    OverworldSensors(
+        Logger& logger, VideoStream& stream, CancellableScope& scope
+    )
+        : lets_go_hp(COLOR_RED)
+        , lets_go_kill(logger)
+        , start_battle(COLOR_RED)
+        , shiny_sound(logger)
+        , m_session(
+            scope, stream,
+            {
+                lets_go_hp,
+                lets_go_kill,
+                start_battle,
+                static_cast<AudioInferenceCallback&>(shiny_sound),
+                static_cast<VisualInferenceCallback&>(shiny_sound),
+//                shiny_screenshot,
+            }
+        )
+    {
+    }
+
+    void throw_if_no_sound(Milliseconds min_duration = Milliseconds(10000)) const{
+        lets_go_kill.throw_if_no_sound(min_duration);
+        shiny_sound.throw_if_no_sound(min_duration);
+    }
+
+public:
+    LetsGoHpWatcher lets_go_hp;
+    LetsGoKillSoundDetector lets_go_kill;
+    StartBattleYellowBarWatcher start_battle;
+    ShinySoundTracker shiny_sound;
+//    ShinyScreenshotTracker shiny_screenshot;
+
+
+private:
+    InferenceSession m_session;
+};
+
+
+
+
+
+
+
+
+
+
+class OverworldBattleTracker{
+public:
+    enum class Detection{
+        CONTINUE_BATTLE,
+        NEW_BATTLE,
+        NEW_SHINY_BATTLE,
+    };
+
+public:
+    OverworldBattleTracker(Logger& logger, OverworldSensors& sensors);
+
+    void report_in_battle(){
+        m_start_time = current_time();
+        m_last_known_in_battle = true;
+    }
+    void report_out_of_battle(){
+        m_start_time = current_time();
+        m_last_known_in_battle = false;
+    }
+
+    Detection report_battle_menu_detected();
+    Detection report_battle_menu_detected(VideoSnapshot& shiny_screenshot, float& shiny_error);
+
+private:
+    Logger& m_logger;
+    OverworldSensors& m_sensors;
+    WallClock m_start_time;
+    bool m_last_known_in_battle;
+};
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_StationaryOverworldWatcher.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_StationaryOverworldWatcher.cpp
new file mode 100644
index 0000000000..c5344bef91
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_StationaryOverworldWatcher.cpp
@@ -0,0 +1,72 @@
+/*  Stationary Overworld Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/ImageTools/ImageDiff.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Images/WaterfillUtilities.h"
+#include "PokemonSV_StationaryOverworldWatcher.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+
+
+StationaryOverworldWatcher::StationaryOverworldWatcher(Color color, ImageFloatBox box, size_t seconds_stationary)
+     : VisualInferenceCallback("StationaryOverworldWatcher")
+     , m_color(color)
+     , m_box(box)
+     , m_overworld_detector(color)
+     , m_map_hold_duration(std::chrono::milliseconds(seconds_stationary * 1000))
+{}
+
+void StationaryOverworldWatcher::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_box);
+}
+
+bool StationaryOverworldWatcher::process_frame(const VideoSnapshot& frame){
+    if (!m_overworld_detector.detect(frame)){
+        m_snapshot_start.clear();
+        return false;
+    }
+
+    if (!m_snapshot_start){
+        m_snapshot_start = frame;
+        return false;
+    }
+
+    // Check if radar map stays still for `m_map_hold_duration`
+
+    //  Mismatching image sizes.
+    ImageViewRGB32 start = extract_box_reference(m_snapshot_start, m_box);
+    ImageViewRGB32 current = extract_box_reference(frame, m_box);
+    if (start.width() != current.width() || start.height() != current.height()){
+        m_snapshot_start = frame;
+        return false;
+    }
+    
+    double rmsd = ImageMatch::pixel_RMSD(start, current);
+//    cout << "rmsd = " << rmsd << endl;
+    if (rmsd > 2.0){ //  Image of radar map has changed too much.
+        m_snapshot_start = frame;
+        return false;
+    }
+
+    //  Make sure radar map held for long enough.
+    return frame.timestamp - m_snapshot_start.timestamp >= m_map_hold_duration;    
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_StationaryOverworldWatcher.h b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_StationaryOverworldWatcher.h
new file mode 100644
index 0000000000..188723db43
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_StationaryOverworldWatcher.h
@@ -0,0 +1,45 @@
+/*  Stationary Overworld Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_StationaryOverworldWatcher_H
+#define PokemonAutomation_PokemonSV_StationaryOverworldWatcher_H
+
+#include "Common/Cpp/Color.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h"
+
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+class StationaryOverworldWatcher : public VisualInferenceCallback{
+public:
+    StationaryOverworldWatcher(Color color = COLOR_RED, ImageFloatBox box = {0.865, 0.82, 0.08, 0.1}, size_t seconds_stationary = 5);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    // return true if the screen within `m_box` doesn't change for am amount of time as per `seconds_stationary`
+    // the overworld must be detected throughout this.
+    virtual bool process_frame(const VideoSnapshot& frame) override;
+
+
+private:
+    const Color m_color;
+    const ImageFloatBox m_box;
+    OverworldDetector m_overworld_detector;
+    const std::chrono::milliseconds m_map_hold_duration;
+    VideoSnapshot m_snapshot_start;
+};
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Picnics/PokemonSV_PicnicDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Picnics/PokemonSV_PicnicDetector.cpp
new file mode 100644
index 0000000000..9a66a48f93
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Picnics/PokemonSV_PicnicDetector.cpp
@@ -0,0 +1,82 @@
+/*  Picnic Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "Tests/ImageUnitTest.h"
+#include "PokemonSV_PicnicDetector.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+PicnicDetector::PicnicDetector(Color color)
+    : m_color(color)
+    , m_button_b(color, WhiteButton::ButtonB, {0.024, 0.702, 0.024, 0.045})
+    , m_button_minus(color, WhiteButton::ButtonMinus, {0.024, 0.866, 0.024, 0.045})
+    , m_button_y(color, WhiteButton::ButtonY, {0.024, 0.917, 0.024, 0.045})
+{}
+
+void PicnicDetector::make_overlays(VideoOverlaySet& items) const{
+    m_button_b.make_overlays(items);
+    m_button_minus.make_overlays(items);
+    m_button_y.make_overlays(items);
+}
+
+bool PicnicDetector::detect(const ImageViewRGB32& frame){
+    return m_button_b.detect(frame)
+        && m_button_minus.detect(frame)
+        && m_button_y.detect(frame);
+}
+
+
+
+
+
+
+class Test_PicnicDetector : public ImageUnitTest{
+public:
+    Test_PicnicDetector(
+        const std::string& image,
+        bool expected
+    )
+        : ImageUnitTest("PokemonSV::PicnicDetector - " + image, {image})
+        , m_expected(expected)
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        PicnicDetector detector;
+        const ImageRGB32& image = images[0];
+        return detector.detect(image) == m_expected;
+    };
+
+private:
+    bool m_expected;
+};
+
+
+
+
+void add_tests_PicnicDetector(UnitTestDatabase& database){
+    database.add<Test_PicnicDetector>("PokemonSV/PicnicDetector/macOS/Picinic_1_True.png", true);
+    database.add<Test_PicnicDetector>("PokemonSV/PicnicDetector/macOS/Picnic_0_True.png", true);
+}
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Picnics/PokemonSV_PicnicDetector.h b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Picnics/PokemonSV_PicnicDetector.h
new file mode 100644
index 0000000000..11ef07cdf0
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Picnics/PokemonSV_PicnicDetector.h
@@ -0,0 +1,56 @@
+/*  Picnic Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_PicnicDetector_H
+#define PokemonAutomation_PokemonSV_PicnicDetector_H
+
+#include "Common/Cpp/Color.h"
+#include "Common/Cpp/TestRunners/UnitTest.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+#include "CommonTools/VisualDetector.h"
+#include "VideoGames/PokemonSV/Inference/PokemonSV_WhiteButtonDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+// Detect the player character is in a picnic
+class PicnicDetector : public StaticScreenDetector{
+public:
+    PicnicDetector(Color color = COLOR_YELLOW);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    Color m_color;
+    WhiteButtonDetector m_button_b;
+    WhiteButtonDetector m_button_minus;
+    WhiteButtonDetector m_button_y;
+};
+
+class PicnicWatcher : public DetectorToFinder<PicnicDetector>{
+public:
+    PicnicWatcher(Color color = COLOR_YELLOW)
+         : DetectorToFinder("PicnicWatcher", std::chrono::milliseconds(1000), color)
+    {}
+};
+
+
+
+
+
+
+void add_tests_PicnicDetector(UnitTestDatabase& database);
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Picnics/PokemonSV_SandwichHandDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Picnics/PokemonSV_SandwichHandDetector.cpp
new file mode 100644
index 0000000000..e96dbb0dff
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Picnics/PokemonSV_SandwichHandDetector.cpp
@@ -0,0 +1,288 @@
+/*  Sandwich Hand Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Exceptions.h"
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "Kernels/Waterfill/Kernels_Waterfill_Types.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Images/WaterfillUtilities.h"
+#include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h"
+#include "Tests/ImageUnitTest.h"
+#include "Tests/TestUtils.h"
+#include "PokemonSV_SandwichHandDetector.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+namespace{
+
+class SandwichFreeHandMatcher : public ImageMatch::WaterfillTemplateMatcher{
+public:
+    SandwichFreeHandMatcher() : WaterfillTemplateMatcher(
+        "PokemonSV/Picnic/SandwichHand-Template.png", Color(100,100,100), Color(255, 255, 255), 50
+    ){
+        m_aspect_ratio_lower = 0.9;
+        m_aspect_ratio_upper = 1.1;
+        m_area_ratio_lower = 0.9;
+        m_area_ratio_upper = 1.1;
+    }
+
+    static const ImageMatch::WaterfillTemplateMatcher& instance(){
+        static SandwichFreeHandMatcher matcher;
+        return matcher;
+    }
+};
+
+
+class SandwichGrabbingHandMatcher : public ImageMatch::WaterfillTemplateMatcher{
+public:
+    SandwichGrabbingHandMatcher() : WaterfillTemplateMatcher(
+        "PokemonSV/Picnic/SandwichGrab-Template.png", Color(100,100,100), Color(255, 255, 255), 50
+    ){
+        m_aspect_ratio_lower = 0.9;
+        m_aspect_ratio_upper = 1.1;
+        m_area_ratio_lower = 0.9;
+        m_area_ratio_upper = 1.1;
+    }
+
+    static const ImageMatch::WaterfillTemplateMatcher& instance(){
+        static SandwichGrabbingHandMatcher matcher;
+        return matcher;
+    }
+};
+
+} // anonymous namespace
+
+std::string SANDWICH_HAND_TYPE_NAMES(SandwichHandType type){
+    switch (type)
+    {
+    case SandwichHandType::FREE:
+        return "FREE";
+    case SandwichHandType::GRABBING:
+        return "GRABBING";
+    default:
+        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Unknown SandwichHandType");
+    }
+}
+
+SandwichHandLocator::SandwichHandLocator(HandType hand_type, const ImageFloatBox& box, Color color)
+    : m_type(hand_type), m_box(box), m_color(color)
+{}
+
+void SandwichHandLocator::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_box);
+}
+
+std::pair<double, double> SandwichHandLocator::detect(const ImageViewRGB32& frame) const{
+    ImageFloatBox entire_screen(0.0, 0.0, 1.0, 1.0);
+    std::pair<double, double> location = locate_sandwich_hand(frame, m_box);
+    if (location.first >= 0.0){
+        return location;
+    }else{
+        return locate_sandwich_hand(frame, entire_screen);
+    }
+    
+}
+
+
+std::pair<double, double> SandwichHandLocator::locate_sandwich_hand(const ImageViewRGB32& frame, ImageFloatBox area_to_search) const{
+    const std::vector<std::pair<uint32_t, uint32_t>> filters = {
+        {combine_rgb(150, 150, 150), combine_rgb(255, 255, 255)}
+    };
+
+    const double screen_rel_size = (frame.height() / 1080.0);
+
+    double min_hand_size = ((m_type == HandType::FREE) ? 5000.0 : 4500.0);
+    const size_t min_size = size_t(screen_rel_size * screen_rel_size * min_hand_size);
+
+    std::pair<double, double> hand_location(-1.0, -1.0);
+
+    ImagePixelBox pixel_box = floatbox_to_pixelbox(frame.width(), frame.height(), area_to_search);
+    match_template_by_waterfill(
+        frame.size(),
+        extract_box_reference(frame, area_to_search), 
+        ((m_type == HandType::FREE) ? SandwichFreeHandMatcher::instance() : SandwichGrabbingHandMatcher::instance()),
+        filters,
+        {min_size, SIZE_MAX},
+        80,
+        [&](Kernels::Waterfill::WaterfillObject& object) -> bool {
+            hand_location = std::make_pair(
+                (object.center_of_gravity_x() + pixel_box.min_x) / (double)frame.width(),
+                (object.center_of_gravity_y() + pixel_box.min_y) / (double)frame.height()
+            );
+            return true;
+        }
+    );
+
+    return hand_location;
+}
+
+
+SandwichHandWatcher::SandwichHandWatcher(
+    HandType hand_type,
+    const ImageFloatBox& box,
+    Color color
+)
+    : VisualInferenceCallback("SandwichHandWatcher")
+    , m_locator(hand_type, box, color)
+    , m_location(-1.0, -1.0)
+{}
+
+void SandwichHandWatcher::make_overlays(VideoOverlaySet& items) const{
+    m_locator.make_overlays(items);
+}
+
+bool SandwichHandWatcher::process_frame(const VideoSnapshot& frame){
+    m_last_snapshot = frame;
+    m_location = m_locator.detect(frame);
+    return m_location.first >= 0.0;
+}
+
+bool SandwichHandWatcher::recover_sandwich_hand_position(const ImageViewRGB32& frame){
+    ImageFloatBox entire_screen(0.0, 0.0, 1.0, 1.0);
+    m_location = m_locator.locate_sandwich_hand(frame, entire_screen);
+    return m_location.first >= 0.0;
+}
+
+
+
+
+
+
+
+
+class Test_SandwichHandWatcher : public ImageUnitTest{
+public:
+    Test_SandwichHandWatcher(
+        const std::string& image,
+        std::vector<std::string> words
+    )
+        : ImageUnitTest("PokemonSV::SandwichHandWatcher - " + image, {image})
+        , m_words(std::move(words))
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        // five words: hand_type("Free"/"Grabbing"), <image float box (four words total)>
+        if (m_words.size() < 5){
+            std::stringstream ss;
+            ss << "Error: not enough number of words in the filename. Found only " << m_words.size() << "." << std::endl;
+            return ss.str();
+        }
+
+        const auto& hand_type_word = m_words[m_words.size() - 5];
+        SandwichHandLocator::HandType hand_type = SandwichHandLocator::HandType::FREE;
+        if (hand_type_word == "Free"){
+            hand_type = SandwichHandLocator::HandType::FREE;
+        }else if (hand_type_word == "Grabbing"){
+            hand_type = SandwichHandLocator::HandType::GRABBING;
+        }else{
+            std::stringstream ss;
+            ss << "Error: word " << hand_type_word << " should be \"Free\" or \"Grabbing\"." << std::endl;
+            return ss.str();
+        }
+
+        float box_values[4] = {0.0f};
+        for (int i = 0; i < 4; i++){
+            if (parse_float(m_words[m_words.size() - 4 + i], box_values[i]) == false){
+                std::stringstream ss;
+                ss << "Error: word " << m_words[m_words.size() - 4 + i] << " should be a float, range [0.0, 1.0]" << std::endl;
+                return ss.str();
+            }
+        }
+
+        ImageFloatBox box(box_values[0], box_values[1], box_values[2], box_values[3]);
+
+        SandwichHandLocator detector(hand_type, box);
+
+        bool hand_expected = true;
+        if (m_words.size() >= 6){
+            auto hand_expected_word = m_words[m_words.size() - 6];
+            if(hand_expected_word == "False"){
+                hand_expected = false;
+            }
+        }
+
+        const ImageRGB32& image = images[0];
+        auto result = detector.detect(image);
+        bool has_hand = result.first >= 0.0;
+
+        TEST_RESULT_EQUAL_STR(has_hand, hand_expected);
+
+        return true;
+    };
+
+private:
+    std::vector<std::string> m_words;
+};
+
+
+
+
+void add_tests_SandwichHandDetector(UnitTestDatabase& database){
+    database.add<Test_SandwichHandWatcher>(
+        "PokemonSV/SandwichHandDetector/2_False_Grabbing_0.0_0.0_1.0_1.0.png",
+        std::vector<std::string>{"2", "False", "Grabbing", "0.0", "0.1", "1.0", "1.0"}
+    );
+    database.add<Test_SandwichHandWatcher>(
+        "PokemonSV/SandwichHandDetector/720p_Free_0.0_0.0_1.0_1.0.png",
+        std::vector<std::string>{"720p", "Free", "0.0", "0.0", "1.0", "1.0"}
+    );
+    database.add<Test_SandwichHandWatcher>(
+        "PokemonSV/SandwichHandDetector/720p_Grabbing_0.0_0.0_1.0_1.0.png",
+        std::vector<std::string>{"720p", "Grabbing", "0.0", "0.0", "1.0", "1.0"}
+    );
+    database.add<Test_SandwichHandWatcher>(
+        "PokemonSV/SandwichHandDetector/False_Grabbing_0.01_0.0_1.0_1.0.png",
+        std::vector<std::string>{"False", "Grabbing", "0.01", "0.0", "1.0", "1.0"}
+    );
+    database.add<Test_SandwichHandWatcher>(
+        "PokemonSV/SandwichHandDetector/Free_0.376_0.176_0.261_0.372.png",
+        std::vector<std::string>{"Free", "0.376", "0.176", "0.261", "0.372"}
+    );
+    database.add<Test_SandwichHandWatcher>(
+        "PokemonSV/SandwichHandDetector/macOS/Free_0.419_0.449_0.174_0.204.png",
+        std::vector<std::string>{"Free", "0.419", "0.449", "0.174", "0.204"}
+    );
+    database.add<Test_SandwichHandWatcher>(
+        "PokemonSV/SandwichHandDetector/macOS/Free_0.421_0.024_0.163_0.174.png",
+        std::vector<std::string>{"Free", "0.421", "0.024", "0.163", "0.174"}
+    );
+    database.add<Test_SandwichHandWatcher>(
+        "PokemonSV/SandwichHandDetector/macOS/Free_0.455_0.319_0.090_0.133.png",
+        std::vector<std::string>{"Free", "0.455", "0.319", "0.090", "0.133"}
+    );
+    database.add<Test_SandwichHandWatcher>(
+        "PokemonSV/SandwichHandDetector/macOS/Grabbing_0.401_0.313_0.239_0.383.png",
+        std::vector<std::string>{"Grabbing", "0.401", "0.313", "0.239", "0.383"}
+    );
+    database.add<Test_SandwichHandWatcher>(
+        "PokemonSV/SandwichHandDetector/macOS/Grabbing_0.448_0.295_0.110_0.164.png",
+        std::vector<std::string>{"Grabbing", "0.448", "0.295", "0.110", "0.164"}
+    );
+    database.add<Test_SandwichHandWatcher>(
+        "PokemonSV/SandwichHandDetector/macOS/Grabbing_0.454_0.037_0.099_0.160.png",
+        std::vector<std::string>{"Grabbing", "0.454", "0.037", "0.099", "0.160"}
+    );
+
+}
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Picnics/PokemonSV_SandwichHandDetector.h b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Picnics/PokemonSV_SandwichHandDetector.h
new file mode 100644
index 0000000000..0922924d3a
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Picnics/PokemonSV_SandwichHandDetector.h
@@ -0,0 +1,94 @@
+/*  Sandwich Hand Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_SandwichHandLocator_H
+#define PokemonAutomation_PokemonSV_SandwichHandLocator_H
+
+#include "Common/Cpp/Color.h"
+#include "Common/Cpp/TestRunners/UnitTest.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+#include "CommonTools/VisualDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+enum class SandwichHandType{
+    FREE,
+    GRABBING,
+};
+
+// Type enum to string
+std::string SANDWICH_HAND_TYPE_NAMES(SandwichHandType type);
+
+// Detect the hand used to make sandwich in the sandwich minigame.
+class SandwichHandLocator{
+public:
+    using HandType = SandwichHandType;
+
+    SandwichHandLocator(HandType hand_type, const ImageFloatBox& box, Color color = COLOR_RED);
+
+    void make_overlays(VideoOverlaySet& items) const;
+    
+    // - return detected hand cetner location on screen, (x, y) where
+    // x: [0, 1), 0 left-most, 1 right-most, y: [0, 1), 0 top-most 1 bottom-most
+    // - first search m_box, then search the entire screen
+    // - If hand not detected, return (-1, -1).
+    std::pair<double, double> detect(const ImageViewRGB32& screen) const;
+
+    void change_box(const ImageFloatBox& new_box){ m_box = new_box; }
+
+    // return the coordinates of the sandwich hand.
+    // search within the confines of the box area_to_search.
+    std::pair<double, double> locate_sandwich_hand(const ImageViewRGB32& frame, ImageFloatBox area_to_search) const;
+
+private:
+    HandType m_type;
+    ImageFloatBox m_box;
+    Color m_color;
+};
+
+class SandwichHandWatcher : public VisualInferenceCallback{
+public:
+    using HandType = SandwichHandType;
+
+    SandwichHandWatcher(HandType hand_type, const ImageFloatBox& box, Color color = COLOR_RED);
+
+    const VideoSnapshot& last_snapshot() const{ return m_last_snapshot; }
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool process_frame(const VideoSnapshot& frame) override;
+
+    const std::pair<double, double>& location() const { return m_location; }
+
+    void change_box(const ImageFloatBox& new_box){ m_locator.change_box(new_box); }
+
+    // - searches the whole screen for the sandwich hand,
+    // - then updates its location
+    // - return true if hand successfully found
+    bool recover_sandwich_hand_position(const ImageViewRGB32& frame);
+
+
+private:
+    SandwichHandLocator m_locator;
+    std::pair<double, double> m_location;
+    VideoSnapshot m_last_snapshot;
+};
+
+
+
+
+
+void add_tests_SandwichHandDetector(UnitTestDatabase& database);
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Picnics/PokemonSV_SandwichIngredientDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Picnics/PokemonSV_SandwichIngredientDetector.cpp
new file mode 100644
index 0000000000..e91dfdb565
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Picnics/PokemonSV_SandwichIngredientDetector.cpp
@@ -0,0 +1,568 @@
+/*  Sandwich Ingredient Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Filesystem/Filesystem.h"
+#include "CommonFramework/GlobalAutoPaths.h"
+#include "CommonFramework/Logging/Logger.h"
+#include "CommonFramework/ImageTools/ImageStats.h"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Images/WaterfillUtilities.h"
+#include "CommonTools/ImageMatch/ImageCropper.h"
+#include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h"
+#include "CommonTools/OCR/OCR_Routines.h"
+#include "Tests/ImageUnitTest.h"
+#include "Tests/TestUtils.h"
+#include "VideoGames/PokemonSV/Resources/PokemonSV_Ingredients.h"
+
+#include "PokemonSV_SandwichIngredientDetector.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+namespace{
+
+class SandwichCondimentsPageMatcher : public ImageMatch::WaterfillTemplateMatcher{
+public:
+    SandwichCondimentsPageMatcher() : WaterfillTemplateMatcher(
+        "PokemonSV/Picnic/Condiments-Template.png", Color(100,100,100), Color(255, 255, 255), 50
+    ){
+        m_aspect_ratio_lower = 0.9;
+        m_aspect_ratio_upper = 1.1;
+        m_area_ratio_lower = 0.9;
+        m_area_ratio_upper = 1.1;
+    }
+
+    static const ImageMatch::WaterfillTemplateMatcher& instance(){
+        static SandwichCondimentsPageMatcher matcher;
+        return matcher;
+    }
+};
+
+class SandwichPicksPageMatcher : public ImageMatch::WaterfillTemplateMatcher{
+public:
+    SandwichPicksPageMatcher() : WaterfillTemplateMatcher(
+        "PokemonSV/Picnic/Picks-Template.png", Color(100,100,100), Color(255, 255, 255), 50
+    ){
+        m_aspect_ratio_lower = 0.8;
+        m_aspect_ratio_upper = 1.2;
+        m_area_ratio_lower = 0.8;
+        m_area_ratio_upper = 1.2;
+    }
+
+    static const ImageMatch::WaterfillTemplateMatcher& instance(){
+        static SandwichPicksPageMatcher matcher;
+        return matcher;
+    }
+};
+
+
+} // anonymous namespace
+
+
+SandwichIngredientArrowDetector::SandwichIngredientArrowDetector(size_t menu_index, Color color)
+    : m_arrow(
+        color,
+        GradientArrowType::RIGHT,
+        {0.013, menu_index*0.074 + 0.167, 0.056, 0.084}
+    )
+{}
+
+void SandwichIngredientArrowDetector::make_overlays(VideoOverlaySet& items) const{
+    m_arrow.make_overlays(items);
+}
+
+bool SandwichIngredientArrowDetector::detect(const ImageViewRGB32& screen){
+    return m_arrow.detect(screen);
+}
+
+
+DeterminedSandwichIngredientDetector::DeterminedSandwichIngredientDetector(
+    SandwichIngredientType ingredient_type, size_t index, Color color
+) : m_color(color){
+    float offset = (ingredient_type == SandwichIngredientType::FILLING ? 0.0f : 0.2885f) + index * 0.047f;
+    m_edges[0] = ImageFloatBox(offset + 0.509, 0.807, 0.033, 0.012);
+    m_edges[1] = ImageFloatBox(offset + 0.501, 0.821, 0.008, 0.057);
+    m_edges[2] = ImageFloatBox(offset + 0.509, 0.879, 0.033, 0.012);
+    m_edges[3] = ImageFloatBox(offset + 0.541, 0.821, 0.008, 0.057);
+}
+
+void DeterminedSandwichIngredientDetector::make_overlays(VideoOverlaySet& items) const{
+    for (int i = 0; i < 4; i++){
+        items.add(m_color, m_edges[i]);
+    }
+}
+
+bool DeterminedSandwichIngredientDetector::detect(const ImageViewRGB32& screen){
+    int yellow_count = 0;
+    for (int i = 0; i < 4; i++){
+        FloatPixel avg = image_stats(extract_box_reference(screen, m_edges[i])).average;
+        if (avg.r > avg.b * 1.25 && avg.g > avg.b * 1.15){
+            yellow_count++;
+        }
+    }
+    return yellow_count >= 3;
+}
+
+
+SandwichCondimentsPageDetector::SandwichCondimentsPageDetector(Color color)
+    : m_color(color)
+    , m_box(0.046, 0.100, 0.021, 0.052)
+{}
+
+void SandwichCondimentsPageDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_box);
+}
+
+bool SandwichCondimentsPageDetector::detect(const ImageViewRGB32& screen){
+    const std::vector<std::pair<uint32_t, uint32_t>> filters = {
+        {combine_rgb(150, 150, 150), combine_rgb(255, 255, 255)}
+    };
+
+    const double screen_rel_size = (screen.height() / 1080.0);
+
+    const size_t min_size = size_t(screen_rel_size * screen_rel_size * 700);
+    return match_template_by_waterfill(
+        screen.size(),
+        extract_box_reference(screen, m_box), 
+        SandwichCondimentsPageMatcher::instance(),
+        filters,
+        {min_size, SIZE_MAX},
+        70,
+        [&](Kernels::Waterfill::WaterfillObject& object) -> bool{ return true; }
+    );
+}
+
+
+
+SandwichPicksPageDetector::SandwichPicksPageDetector(Color color)
+    : m_color(color)
+    , m_box(0.046, 0.100, 0.021, 0.052)
+{}
+
+void SandwichPicksPageDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_box);
+}
+
+bool SandwichPicksPageDetector::detect(const ImageViewRGB32& screen){
+    const std::vector<std::pair<uint32_t, uint32_t>> filters = {
+        {combine_rgb(150, 150, 150), combine_rgb(255, 255, 255)}
+    };
+
+    const double screen_rel_size = (screen.height() / 1080.0);
+
+    const size_t min_size = size_t(screen_rel_size * screen_rel_size * 300);
+    return match_template_by_waterfill(
+        screen.size(),
+        extract_box_reference(screen, m_box), 
+        SandwichPicksPageMatcher::instance(),
+        filters,
+        {min_size, SIZE_MAX},
+        70,
+        [&](Kernels::Waterfill::WaterfillObject& object) -> bool { return true; }
+    );
+}
+
+
+
+
+const SandwichFillingMatcher& SANDWICH_FILLING_MATCHER(){
+    static SandwichFillingMatcher matcher;
+    return matcher;
+}
+SandwichFillingMatcher::SandwichFillingMatcher(const std::vector<double>& min_euclidean_distance)
+    : CroppedImageDictionaryMatcher({0, 1})
+{
+    for (double x : min_euclidean_distance){
+        m_min_euclidean_distance_squared.emplace_back(x * x);
+    }
+    for (const auto& item : SANDWICH_FILLINGS_DATABASE()){
+        add(item.first, item.second.sprite);
+    }
+}
+auto SandwichFillingMatcher::get_crop_candidates(const ImageViewRGB32& image) const -> std::vector<ImageViewRGB32>{
+    ImageStats border = image_border_stats(image);
+//    cout << "border = " << border.average << endl;
+//    image.save("image.png");
+    std::vector<ImageViewRGB32> ret;
+    for (double min_euclidean_distance_squared : m_min_euclidean_distance_squared){
+        ImagePixelBox box = ImageMatch::enclosing_rectangle_with_pixel_filter(
+            image,
+            [&](Color pixel){
+                double r = (double)pixel.red() - border.average.r;
+                double g = (double)pixel.green() - border.average.g;
+                double b = (double)pixel.blue() - border.average.b;
+                bool stop = r * r + g * g + b * b >= min_euclidean_distance_squared;
+                return stop;
+            }
+        );
+        ret.emplace_back(extract_box_reference(image, box));
+    }
+    return ret;
+}
+
+
+const SandwichCondimentMatcher& SANDWICH_CONDIMENT_MATCHER(){
+    static SandwichCondimentMatcher matcher;
+    return matcher;
+}
+SandwichCondimentMatcher::SandwichCondimentMatcher(const std::vector<double>& min_euclidean_distance)
+    : CroppedImageDictionaryMatcher({0, 1})
+{
+    for (double x : min_euclidean_distance){
+        m_min_euclidean_distance_squared.emplace_back(x * x);
+    }
+    for (const auto& item : SANDWICH_CONDIMENTS_DATABASE()){
+        add(item.first, item.second.sprite);
+    }
+}
+auto SandwichCondimentMatcher::get_crop_candidates(const ImageViewRGB32& image) const -> std::vector<ImageViewRGB32>{
+    ImageStats border = image_border_stats(image);
+    std::vector<ImageViewRGB32> ret;
+    for (double min_euclidean_distance_squared : m_min_euclidean_distance_squared){
+        ImagePixelBox box = ImageMatch::enclosing_rectangle_with_pixel_filter(
+            image,
+            [&](Color pixel){
+                double r = (double)pixel.red() - border.average.r;
+                double g = (double)pixel.green() - border.average.g;
+                double b = (double)pixel.blue() - border.average.b;
+                bool stop = r * r + g * g + b * b >= min_euclidean_distance_squared;
+                return stop;
+            }
+        );
+        ret.emplace_back(extract_box_reference(image, box));
+    }
+    return ret;
+}
+
+const SandwichFillingOCR& SandwichFillingOCR::instance(){
+    static SandwichFillingOCR reader;
+    return reader;
+}
+SandwichFillingOCR::SandwichFillingOCR()
+    : SmallDictionaryMatcher("PokemonSV/Picnic/SandwichFillingOCR.json")
+{}
+OCR::StringMatchResult SandwichFillingOCR::read_substring(
+    Logger& logger,
+    Language language,
+    const ImageViewRGB32& image,
+    const std::vector<OCR::TextColorRange>& text_color_ranges,
+    double min_text_ratio, double max_text_ratio
+) const{
+    return match_substring_from_image_multifiltered(
+        &logger, language, image, text_color_ranges,
+        MAX_LOG10P, MAX_LOG10P_SPREAD,
+        min_text_ratio, max_text_ratio
+    );
+}
+
+const SandwichCondimentOCR& SandwichCondimentOCR::instance(){
+    static SandwichCondimentOCR reader;
+    return reader;
+}
+SandwichCondimentOCR::SandwichCondimentOCR()
+    : SmallDictionaryMatcher("PokemonSV/Picnic/SandwichCondimentOCR.json")
+{}
+OCR::StringMatchResult SandwichCondimentOCR::read_substring(
+    Logger& logger,
+    Language language,
+    const ImageViewRGB32& image,
+    const std::vector<OCR::TextColorRange>& text_color_ranges,
+    double min_text_ratio, double max_text_ratio
+) const{
+    return match_substring_from_image_multifiltered(
+        &logger, language, image, text_color_ranges,
+        MAX_LOG10P, MAX_LOG10P_SPREAD,
+        min_text_ratio, max_text_ratio
+    );
+}
+
+SandwichIngredientReader::SandwichIngredientReader(SandwichIngredientType ingredient_type, Color color)
+    : m_color(color)
+    , m_ingredient_type(ingredient_type)
+    , m_box_ingred_text(ingredient_list_boxes(ImageFloatBox(0.100, 0.179, 0.273, 0.057)))
+    , m_box_ingred_icon(ingredient_list_boxes(ImageFloatBox(0.064, 0.179, 0.032, 0.057)))
+    , m_box_confirmed(confirmed_ingredient_boxes(ingredient_type))
+{}
+
+void SandwichIngredientReader::make_overlays(VideoOverlaySet& items) const{
+    for (size_t c = 0; c < INGREDIENT_PAGE_LINES; c++){
+        items.add(m_color, m_box_ingred_text[c]);
+        items.add(m_color, m_box_ingred_icon[c]);
+    }
+
+    for (size_t i = 0; i < m_box_confirmed.size(); i++){
+        items.add(m_color, m_box_confirmed[i]);
+    }
+}
+
+
+std::array<ImageFloatBox, 6> SandwichIngredientReader::confirmed_ingredient_boxes(SandwichIngredientType type){
+    std::array<ImageFloatBox, 6> boxes;
+    ImageFloatBox initial_box;
+    size_t total_count = 0;
+    switch (type){
+    case SandwichIngredientType::FILLING:
+        initial_box = ImageFloatBox(0.508781, 0.820, 0.032, 0.057);
+        total_count = 6;
+        break;
+    case SandwichIngredientType::CONDIMENT:
+        initial_box = ImageFloatBox(0.797474, 0.820, 0.032, 0.057);
+        total_count = 4;
+        break;
+    }
+    
+    double initial_x = initial_box.x;
+    double width = initial_box.width;
+    double height = initial_box.height;
+    double y = initial_box.y;
+    double x_spacing = 0.0468;
+    for (size_t i = 0; i < total_count; i++){
+        double x = initial_x + i*x_spacing;
+        boxes[i] = ImageFloatBox(x, y, width, height);
+    }
+    return boxes;
+}
+
+
+std::array<ImageFloatBox, 10> SandwichIngredientReader::ingredient_list_boxes(ImageFloatBox initial_box){
+    std::array<ImageFloatBox, 10> material_boxes;
+    double x = initial_box.x;
+    double width = initial_box.width;
+    double height = initial_box.height;
+    double initial_y = initial_box.y;
+    double y_spacing = 0.074;
+    for (size_t i = 0; i < 10; i++){
+        double y = initial_y + i*y_spacing;
+        material_boxes[i] = ImageFloatBox(x, y, width, height);
+    }
+    return material_boxes;
+}
+
+
+ImageMatch::ImageMatchResult SandwichIngredientReader::read_ingredient_page_with_icon_matcher(const ImageViewRGB32& screen, size_t index) const{
+    return read_with_icon_matcher(screen, m_box_ingred_icon[index]);
+}
+
+ImageMatch::ImageMatchResult SandwichIngredientReader::read_confirmed_list_with_icon_matcher(const ImageViewRGB32& screen, size_t index) const{
+    return read_with_icon_matcher(screen, m_box_confirmed[index]);
+}
+
+ImageMatch::ImageMatchResult SandwichIngredientReader::read_with_icon_matcher(const ImageViewRGB32& screen, const ImageFloatBox icon_box) const{
+    // Get a crop of the sandwich ingredient icon
+    ImageViewRGB32 image = extract_box_reference(screen, icon_box);
+//    image.save("image" + std::to_string(icon_box.x) + ".png");
+
+//    // Remove the orange / yellow background when the ingredient is selected
+//    ImageRGB32 filtered_image = filter_rgb32_range(image, 0xffdfaf00, 0xffffef20, Color(0x00000000), true);
+//    filtered_image.save("filtered_image.png");
+
+    ImageMatch::ImageMatchResult results;
+    switch (m_ingredient_type){
+    case SandwichIngredientType::FILLING:
+//        cout << "Filling" << endl;
+        results = SANDWICH_FILLING_MATCHER().match(image, ALPHA_SPREAD);
+        break;
+    case SandwichIngredientType::CONDIMENT:
+//        cout << "Condiment" << endl;
+        results = SANDWICH_CONDIMENT_MATCHER().match(image, ALPHA_SPREAD);
+        break;
+    }
+//    results.clear_beyond_alpha(MAX_ALPHA);
+
+    return results;
+}
+
+OCR::StringMatchResult SandwichIngredientReader::read_ingredient_page_with_ocr(
+    const ImageViewRGB32& screen, 
+    Logger& logger, 
+    Language language, 
+    size_t index
+) const{
+    return read_with_ocr(screen, logger, language, m_box_ingred_text[index]);
+}
+
+OCR::StringMatchResult SandwichIngredientReader::read_with_ocr(
+    const ImageViewRGB32& screen, 
+    Logger& logger, 
+    Language language, 
+    const ImageFloatBox icon_box
+) const{
+
+    // Get a crop of the sandwich ingredient text
+    ImageViewRGB32 image = extract_box_reference(screen, icon_box);
+    //image.save("image.png");
+
+    OCR::StringMatchResult results;
+    switch (m_ingredient_type){
+    case SandwichIngredientType::FILLING:
+        results = SandwichFillingOCR::instance().read_substring(logger, language, image, OCR::BLACK_OR_WHITE_TEXT_FILTERS());
+        break;
+    case SandwichIngredientType::CONDIMENT:
+        results = SandwichCondimentOCR::instance().read_substring(logger, language, image, OCR::BLACK_OR_WHITE_TEXT_FILTERS());
+        break;
+    }
+
+    return results;
+}
+
+
+class Test_SandwichIngredientsDetector : public ImageUnitTest{
+public:
+    Test_SandwichIngredientsDetector(const std::string& image, std::vector<std::string> words)
+        : ImageUnitTest("PokemonSV::SandwichIngredientsDetector - " + image, {image})
+        , m_words(std::move(words))
+    {
+        //  Plus the PaddleOCR (ONNX) recognition session and its working set.
+        m_memory += PADDLE_OCR_SINGLE_LINE_MEMORY_ESTIMATE;
+    }
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        if (m_words.size() < 3){
+            return "Error: not enough number of words in the filename.";
+        }
+
+        std::string target_type = m_words[m_words.size() - 3];
+        bool is_condiments = target_type == "Condiments";
+        bool is_picks = target_type == "Picks";
+        if (!is_condiments && !is_picks && target_type != "Fillings"){
+            return "Error: invalid ingredient page type.";
+        }
+
+        int num_fillings = 0;
+        int num_condiments = 0;
+        if (!parse_int(m_words[m_words.size() - 2], num_fillings)){
+            return "Error: invalid fillings count.";
+        }
+        if (!parse_int(m_words[m_words.size() - 1], num_condiments)){
+            return "Error: invalid condiments count.";
+        }
+
+        const ImageRGB32& image = images[0];
+        SandwichCondimentsPageDetector condiments_detector;
+        SandwichPicksPageDetector picks_detector;
+
+        TEST_RESULT_COMPONENT_EQUAL_STR(condiments_detector.detect(image), is_condiments, "condiments Page");
+        TEST_RESULT_COMPONENT_EQUAL_STR(picks_detector.detect(image), is_picks, "picks Page");
+
+        for (int i = 0; i < 10; i++){
+            auto type = (i < 6 ? SandwichIngredientType::FILLING : SandwichIngredientType::CONDIMENT);
+            size_t index = (i < 6 ? i : i - 6);
+            DeterminedSandwichIngredientDetector determined_detector(type, index);
+            bool target = (i < 6 ? i < num_fillings : i - 6 < num_condiments);
+            TEST_RESULT_COMPONENT_EQUAL_STR(determined_detector.detect(image), target, "ingredient slot " + std::to_string(i));
+        }
+        return true;
+    }
+
+private:
+    std::vector<std::string> m_words;
+};
+
+class Test_SandwichIngredientReader : public ImageUnitTest{
+public:
+    Test_SandwichIngredientReader(const std::string& image)
+        : ImageUnitTest("PokemonSV::SandwichIngredientReader - " + image, {image})
+    {
+        //  Plus the PaddleOCR (ONNX) recognition session and its working set.
+        m_memory += PADDLE_OCR_SINGLE_LINE_MEMORY_ESTIMATE;
+    }
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        Filesystem::Path file_path(UNIT_TEST_RESOURCE_PATH() + image_paths()[0]);
+        Filesystem::Path parent_dir = file_path.parent_path();
+        std::string base_name = file_path.stem().string();
+        const std::vector<std::string> words = parse_words(base_name);
+
+        if (words.size() < 3){
+            return "Error: not enough number of words in the filename.";
+        }
+
+        SandwichIngredientType sandwich_type;
+        if (words[words.size() - 3] == "Fillings"){
+            sandwich_type = SandwichIngredientType::FILLING;
+        }else if (words[words.size() - 3] == "Condiments"){
+            sandwich_type = SandwichIngredientType::CONDIMENT;
+        }else{
+            return "Error: invalid sandwich type in filename.";
+        }
+
+        Language language = language_code_to_enum(words[words.size() - 2]);
+        if (language == Language::None || language == Language::EndOfList){
+            return "Error: invalid language word in filename.";
+        }
+
+        size_t selected_ingredient = 0;
+        if (!parse_size_t(words[words.size() - 1], selected_ingredient)){
+            return "Error: invalid selected ingredient index.";
+        }
+
+        Filesystem::Path target_ingredients_path = parent_dir / ("_" + base_name + ".txt");
+        std::vector<std::string> target_ingredients;
+        if (!load_slug_list(target_ingredients_path.string(), target_ingredients)){
+            return "Error: failed to load target ingredients.";
+        }
+        if (target_ingredients.size() != 10){
+            return "Error: need exactly 10 ingredients in golden file.";
+        }
+
+        const ImageRGB32& image = images[0];
+        SandwichIngredientReader reader(sandwich_type);
+        for (size_t i = 0; i < 10; ++i){
+            if (selected_ingredient == i){
+                ImageMatch::ImageMatchResult results = reader.read_ingredient_page_with_icon_matcher(image, i);
+                if (results.results.empty()){
+                    return "No ingredient detected via icon matcher";
+                }
+                TEST_RESULT_COMPONENT_EQUAL_STR(results.results.begin()->second, target_ingredients[i], "image matcher : ingredient slot " + std::to_string(i));
+            }
+
+            OCR::StringMatchResult results = reader.read_ingredient_page_with_ocr(image, global_logger_command_line(), language, i);
+            if (results.results.empty()){
+                return "No ingredient detected via text";
+            }
+            TEST_RESULT_COMPONENT_EQUAL_STR(results.results.begin()->second.token, target_ingredients[i], "ocr : ingredient slot " + std::to_string(i));
+        }
+
+        return true;
+    }
+};
+
+
+void add_tests_SandwichIngredientDetector(UnitTestDatabase& database){
+    database.add<Test_SandwichIngredientsDetector>("PokemonSV/SandwichIngredientsDetector/Scarlet_Lettuce_Fillings_0_0.png", std::vector<std::string>{"Scarlet", "Lettuce", "Fillings", "0", "0"});
+    database.add<Test_SandwichIngredientsDetector>("PokemonSV/SandwichIngredientsDetector/Scarlet_Silver_Picks_1_1.png", std::vector<std::string>{"Scarlet", "Silver", "Picks", "1", "1"});
+    database.add<Test_SandwichIngredientsDetector>("PokemonSV/SandwichIngredientsDetector/Scarlet_Sweet_Herb_Condiments_1_0.png", std::vector<std::string>{"Scarlet", "Sweet", "Herb", "Condiments", "1", "0"});
+    database.add<Test_SandwichIngredientsDetector>("PokemonSV/SandwichIngredientsDetector/Scarlet_Vinegar_Condiments_1_0.png", std::vector<std::string>{"Scarlet", "Vinegar", "Condiments", "1", "0"});
+    database.add<Test_SandwichIngredientsDetector>("PokemonSV/SandwichIngredientsDetector/Scarlet_Vinegar_Condiments_1_1.png", std::vector<std::string>{"Scarlet", "Vinegar", "Condiments", "1", "1"});
+    database.add<Test_SandwichIngredientsDetector>("PokemonSV/SandwichIngredientsDetector/Violet_Silver_Picks_1_1.png", std::vector<std::string>{"Violet", "Silver", "Picks", "1", "1"});
+    database.add<Test_SandwichIngredientsDetector>("PokemonSV/SandwichIngredientsDetector/Violet_Silver_Picks_6_4.png", std::vector<std::string>{"Violet", "Silver", "Picks", "6", "4"});
+    database.add<Test_SandwichIngredientsDetector>("PokemonSV/SandwichIngredientsDetector/Violet_Sweet_Herb_Condiments_1_2.png", std::vector<std::string>{"Violet", "Sweet", "Herb", "Condiments", "1", "2"});
+    database.add<Test_SandwichIngredientsDetector>("PokemonSV/SandwichIngredientsDetector/Violet_Sweet_Herb_Condiments_1_3.png", std::vector<std::string>{"Violet", "Sweet", "Herb", "Condiments", "1", "3"});
+
+    database.add<Test_SandwichIngredientReader>("PokemonSV/SandwichIngredientReader/Brighter_Condiments_eng_5.png");
+    database.add<Test_SandwichIngredientReader>("PokemonSV/SandwichIngredientReader/Condiments_eng_9.png");
+    database.add<Test_SandwichIngredientReader>("PokemonSV/SandwichIngredientReader/Condiments_fra_0.png");
+    database.add<Test_SandwichIngredientReader>("PokemonSV/SandwichIngredientReader/Darker_Condiments_eng_5.png");
+    database.add<Test_SandwichIngredientReader>("PokemonSV/SandwichIngredientReader/Fillings_eng_8.png");
+    database.add<Test_SandwichIngredientReader>("PokemonSV/SandwichIngredientReader/Fillings_fra_0.png");
+}
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Picnics/PokemonSV_SandwichIngredientDetector.h b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Picnics/PokemonSV_SandwichIngredientDetector.h
new file mode 100644
index 0000000000..a9c6ead251
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Picnics/PokemonSV_SandwichIngredientDetector.h
@@ -0,0 +1,225 @@
+/*  Sandwich Ingredient Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_SandwichIngredientDetector_H
+#define PokemonAutomation_PokemonSV_SandwichIngredientDetector_H
+
+#include <array>
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "Common/Cpp/Color.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonTools/ImageMatch/ImageMatchResult.h"
+#include "CommonTools/ImageMatch/CroppedImageDictionaryMatcher.h"
+#include "CommonTools/OCR/OCR_SmallDictionaryMatcher.h"
+#include "CommonTools/VisualDetector.h"
+#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_GradientArrowDetector.h"
+
+namespace PokemonAutomation{
+    struct ProgramInfo;
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+//  Detect the selection arrow in the sandwich ingredient list (the list of fillings, condiments and picks).
+class SandwichIngredientArrowDetector : public StaticScreenDetector{
+public:
+    // menu_index: which row of the selection arrow should be on. Range: [0, 9]:
+    // there are at most 10 rows on screen.
+    SandwichIngredientArrowDetector(size_t menu_index, Color color = COLOR_RED);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    GradientArrowDetector m_arrow;
+};
+
+class SandwichIngredientArrowWatcher : public DetectorToFinder<SandwichIngredientArrowDetector>{
+public:
+    SandwichIngredientArrowWatcher(size_t menu_index, Color color = COLOR_RED)
+         : DetectorToFinder("SandwichIngredientArrowWatcher", std::chrono::milliseconds(250), menu_index, color)
+    {}
+};
+
+
+
+enum class SandwichIngredientType{
+    FILLING,
+    CONDIMENT,
+};
+
+//  Detect one determined sandwich ingredient, displayed in the lower right corner, inside a highlighted yellow box
+//  The detector detects this yellow box.
+class DeterminedSandwichIngredientDetector : public StaticScreenDetector{
+public:
+    // index: the `index`-th ingredient to detect.
+    // For single player, there are at most 6 fillings, so if `ingredient_type` == FILLING, `index` range is [0, 5].
+    // For single player, there are at most 4 condiments, so if `ingredient_type` == CONDIMENT, `index` range is [0, 3].
+    DeterminedSandwichIngredientDetector(SandwichIngredientType ingredient_type, size_t index, Color color = COLOR_RED);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    Color m_color;
+    std::array<ImageFloatBox, 4> m_edges;
+};
+
+class DeterminedSandwichIngredientWatcher : public DetectorToFinder<DeterminedSandwichIngredientDetector>{
+public:
+    DeterminedSandwichIngredientWatcher(SandwichIngredientType ingredient_type, size_t index, Color color = COLOR_RED)
+         : DetectorToFinder("DeterminedSandwichIngredientWatcher", std::chrono::milliseconds(100), ingredient_type, index, color)
+    {}
+};
+
+// Detect the white condiments page at upper left corner of the screen, during custom sandwich mode.
+class SandwichCondimentsPageDetector : public StaticScreenDetector{
+public:
+    SandwichCondimentsPageDetector(Color color = COLOR_RED);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    Color m_color;
+    ImageFloatBox m_box;
+};
+class SandwichCondimentsPageWatcher : public DetectorToFinder<SandwichCondimentsPageDetector>{
+public:
+    SandwichCondimentsPageWatcher(Color color = COLOR_RED)
+         : DetectorToFinder("SandwichCondimentsPageWatcher", std::chrono::milliseconds(250), color)
+    {}
+};
+
+// Detect the white picks page at upper left corner of the screen, during custom sandwich mode.
+class SandwichPicksPageDetector : public StaticScreenDetector{
+public:
+    SandwichPicksPageDetector(Color color = COLOR_RED);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    Color m_color;
+    ImageFloatBox m_box;
+};
+class SandwichPicksPageWatcher : public DetectorToFinder<SandwichPicksPageDetector>{
+public:
+    SandwichPicksPageWatcher(Color color = COLOR_RED)
+         : DetectorToFinder("SandwichPicksPageWatcher", std::chrono::milliseconds(250), color)
+    {}
+};
+
+
+
+class SandwichFillingMatcher : public ImageMatch::CroppedImageDictionaryMatcher{
+public:
+    SandwichFillingMatcher(const std::vector<double>& min_euclidean_distance = {100, 150, 200});
+
+private:
+    virtual std::vector<ImageViewRGB32> get_crop_candidates(const ImageViewRGB32& image) const override;
+    std::vector<double> m_min_euclidean_distance_squared;
+};
+
+class SandwichCondimentMatcher : public ImageMatch::CroppedImageDictionaryMatcher{
+public:
+    SandwichCondimentMatcher(const std::vector<double>& min_euclidean_distance = {100, 150, 200});
+
+private:
+    virtual std::vector<ImageViewRGB32> get_crop_candidates(const ImageViewRGB32& image) const override;
+    std::vector<double> m_min_euclidean_distance_squared;
+};
+
+class SandwichFillingOCR : public OCR::SmallDictionaryMatcher{
+public:
+    static constexpr double MAX_LOG10P = -1.5;
+    static constexpr double MAX_LOG10P_SPREAD = 0.5;
+
+public:
+    static const SandwichFillingOCR& instance();
+
+    OCR::StringMatchResult read_substring(
+        Logger& logger,
+        Language language,
+        const ImageViewRGB32& image,
+        const std::vector<OCR::TextColorRange>& text_color_ranges,
+        double min_text_ratio = 0.01, double max_text_ratio = 0.50
+    ) const;
+
+private:
+    SandwichFillingOCR();
+};
+class SandwichCondimentOCR : public OCR::SmallDictionaryMatcher{
+public:
+    static constexpr double MAX_LOG10P = -1.5;
+    static constexpr double MAX_LOG10P_SPREAD = 0.5;
+
+public:
+    static const SandwichCondimentOCR& instance();
+
+    OCR::StringMatchResult read_substring(
+        Logger& logger,
+        Language language,
+        const ImageViewRGB32& image,
+        const std::vector<OCR::TextColorRange>& text_color_ranges,
+        double min_text_ratio = 0.01, double max_text_ratio = 0.50
+    ) const;
+
+private:
+    SandwichCondimentOCR();
+};
+
+class SandwichIngredientReader{
+public:
+    static constexpr double MAX_ALPHA = 180;
+    static constexpr double ALPHA_SPREAD = 10;
+    static constexpr size_t INGREDIENT_PAGE_LINES = 10;
+
+public:
+    SandwichIngredientReader(SandwichIngredientType ingredient_type, Color color = COLOR_RED);
+
+    void make_overlays(VideoOverlaySet& items) const;
+
+    std::array<ImageFloatBox, 6> confirmed_ingredient_boxes(SandwichIngredientType type);
+
+    std::array<ImageFloatBox, 10> ingredient_list_boxes(ImageFloatBox initial_box);
+
+    ImageMatch::ImageMatchResult read_ingredient_page_with_icon_matcher(const ImageViewRGB32& screen, size_t index) const;
+
+    ImageMatch::ImageMatchResult read_confirmed_list_with_icon_matcher(const ImageViewRGB32& screen, size_t index) const;
+
+    // The icon matcher only works on the selected item, because we want to remove the yellow / orange background
+    ImageMatch::ImageMatchResult read_with_icon_matcher(const ImageViewRGB32& screen, const ImageFloatBox icon_box) const;
+
+    OCR::StringMatchResult read_ingredient_page_with_ocr(
+        const ImageViewRGB32& screen, 
+        Logger& logger, 
+        Language language, 
+        size_t index
+    ) const;
+
+    // The OCR works on any ingredient, selected or not
+    OCR::StringMatchResult read_with_ocr(
+        const ImageViewRGB32& screen, 
+        Logger& logger, 
+        Language language, 
+        const ImageFloatBox icon_box
+    ) const;
+
+// private:
+    Color m_color;
+    SandwichIngredientType m_ingredient_type;
+    std::array<ImageFloatBox, INGREDIENT_PAGE_LINES> m_box_ingred_text;
+    std::array<ImageFloatBox, INGREDIENT_PAGE_LINES> m_box_ingred_icon;
+    std::array<ImageFloatBox, 6> m_box_confirmed;
+};
+
+
+void add_tests_SandwichIngredientDetector(UnitTestDatabase& database);
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Picnics/PokemonSV_SandwichPlateDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Picnics/PokemonSV_SandwichPlateDetector.cpp
new file mode 100644
index 0000000000..f6b949150a
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Picnics/PokemonSV_SandwichPlateDetector.cpp
@@ -0,0 +1,201 @@
+/*  Sandwich Plate Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+
+#include "Common/Cpp/Containers/FixedLimitVector.h"
+#include "Common/Cpp/Containers/FixedLimitVector.tpp"
+#include "Common/Cpp/Exceptions.h"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Images/ImageFilter.h"
+#include "Tests/ImageUnitTest.h"
+#include "Tests/TestUtils.h"
+#include "VideoGames/PokemonSV/Inference/Picnics/PokemonSV_SandwichIngredientDetector.h"
+#include "PokemonSV_SandwichPlateDetector.h"
+// #include "CommonFramework/Tools/DebugDumper.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+SandwichPlateDetector::~SandwichPlateDetector() = default;
+
+SandwichPlateDetector::SandwichPlateDetector(Logger& logger, Color color, Language language, Side side)
+    : m_logger(logger), m_color(color), m_language(language), m_side(side)
+{
+    switch(side){
+    case Side::LEFT:
+        m_box = ImageFloatBox(0.099, 0.270, 0.205, 0.041);
+        break;
+    case Side::MIDDLE:
+        m_box = ImageFloatBox(0.397, 0.268, 0.203, 0.044);
+        break;
+    case Side::RIGHT:
+        m_box = ImageFloatBox(0.699, 0.269, 0.201, 0.044);
+        break;
+    default:
+        throw InternalProgramError(&logger, PA_CURRENT_FUNCTION,
+            "Invalid Side for SandwichPlateDetector()");
+    }
+}
+
+void SandwichPlateDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_box);
+}
+
+bool SandwichPlateDetector::detect(const ImageViewRGB32& screen){
+    return !detect_filling_name(screen).empty();
+}
+
+std::string SandwichPlateDetector::detect_filling_name(const ImageViewRGB32& screen) const{
+    std::multimap<double, OCR::StringMatchData> results;
+
+    const uint32_t image_filter_low_bounds[2] = {
+        combine_rgb(215, 215, 215),
+        combine_rgb(200, 200, 200)
+    };
+    const uint32_t image_filter_high_bound = combine_rgb(255, 255, 255);
+
+    for (uint32_t image_filter_low_bound : image_filter_low_bounds){
+        ImageRGB32 plate_label = to_blackwhite_rgb32_range(
+            extract_box_reference(screen, m_box),
+            true,
+            image_filter_low_bound, image_filter_high_bound
+        );
+
+        // dump_debug_image(m_logger, "PokemonSV/SandwichPlateDetector", "blackwhite_input", plate_label);
+        
+        OCR::StringMatchResult ocr_result = PokemonSV::SandwichFillingOCR::instance().read_substring(
+            m_logger, m_language, plate_label,
+            OCR::BLACK_TEXT_FILTERS()
+        );
+        ocr_result.clear_beyond_log10p(SandwichFillingOCR::MAX_LOG10P);
+        ocr_result.clear_beyond_spread(SandwichFillingOCR::MAX_LOG10P_SPREAD);
+        if (!ocr_result.results.empty()){
+            for (const auto& result : ocr_result.results){
+                results.emplace(result.first, result.second);
+            }
+            
+        }
+    }
+
+    if (results.empty()){
+        return "";
+    }
+    
+    return results.begin()->second.token;
+}
+
+
+bool SandwichPlateDetector::is_label_yellow(const ImageViewRGB32& screen) const{
+    ImageRGB32 yellow_region = filter_rgb32_range(
+        extract_box_reference(screen, m_box),
+        combine_rgb(180, 161, 0), combine_rgb(255, 255, 100), Color(0), false
+    );
+    ImageStats stats = image_stats(yellow_region);
+
+    const double screen_rel_size = (screen.height() / 1080.0);
+    const size_t min_size = size_t(screen_rel_size * screen_rel_size * 200);
+
+    return stats.count >= min_size;
+}
+
+
+
+SandwichPlateWatcher::~SandwichPlateWatcher() = default;
+
+SandwichPlateWatcher::SandwichPlateWatcher(Logger& logger, Color color, VideoOverlay& overlay, Language language, Side side)
+    : VisualInferenceCallback("SandwichPlateWatcher")
+    , m_overlay(overlay)
+    , m_detector(logger, color, language, side)
+{}
+
+void SandwichPlateWatcher::make_overlays(VideoOverlaySet& items) const{
+    m_detector.make_overlays(items);
+}
+
+bool SandwichPlateWatcher::process_frame(const ImageViewRGB32& screen, WallClock timestamp){
+    m_filling_name = m_detector.detect_filling_name(screen);
+    if (m_filling_name.empty()){
+        return false;
+    }
+
+    return true;
+}
+
+
+class Test_SandwichPlateDetector : public ImageUnitTest{
+public:
+    Test_SandwichPlateDetector(const std::string& image, std::vector<std::string> words)
+        : ImageUnitTest("PokemonSV::SandwichPlateDetector - " + image, {image})
+        , m_words(std::move(words))
+    {
+        //  Plus the PaddleOCR (ONNX) recognition session and its working set.
+        m_memory += PADDLE_OCR_SINGLE_LINE_MEMORY_ESTIMATE;
+    }
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        if (m_words.size() < 4){
+            return "Error: not enough number of words in the filename.";
+        }
+
+        Language language = language_code_to_enum(m_words[m_words.size() - 4]);
+        if (language == Language::None || language == Language::EndOfList){
+            return "Error: invalid language word in filename.";
+        }
+
+        FixedLimitVector<SandwichPlateDetector> detectors(3);
+        detectors.emplace_back(logger, COLOR_RED, language, SandwichPlateDetector::Side::LEFT);
+        detectors.emplace_back(logger, COLOR_RED, language, SandwichPlateDetector::Side::MIDDLE);
+        detectors.emplace_back(logger, COLOR_RED, language, SandwichPlateDetector::Side::RIGHT);
+
+        std::string sides[3] = {"left", "middle", "right"};
+        const ImageRGB32& image = images[0];
+        for (int i = 0; i < 3; i++){
+            bool is_yellow = detectors[i].is_label_yellow(image);
+            std::string target = m_words[m_words.size() - 3 + i];
+            if (target == "Yellow"){
+                TEST_RESULT_COMPONENT_EQUAL_STR(is_yellow, true, "yellow label detection at side: " + sides[i]);
+            }else{
+                std::string filling = detectors[i].detect_filling_name(image);
+                if (target == "none"){
+                    target.clear();
+                }
+                TEST_RESULT_COMPONENT_EQUAL_STR(filling, target, "side: " + sides[i]);
+            }
+        }
+
+        return true;
+    }
+
+private:
+    std::vector<std::string> m_words;
+};
+
+
+void add_tests_SandwichPlateDetector(UnitTestDatabase& database){
+    database.add<Test_SandwichPlateDetector>("PokemonSV/SandwichPlateDetector/Violet_eng_cucumber_cherry-tomatoes_pickle.png", std::vector<std::string>{"Violet", "eng", "cucumber", "cherry-tomatoes", "pickle"});
+    database.add<Test_SandwichPlateDetector>("PokemonSV/SandwichPlateDetector/Violet_eng_Yellow_lettuce_lettuce.png", std::vector<std::string>{"Violet", "eng", "Yellow", "lettuce", "lettuce"});
+}
+
+
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Picnics/PokemonSV_SandwichPlateDetector.h b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Picnics/PokemonSV_SandwichPlateDetector.h
new file mode 100644
index 0000000000..8c50652f14
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Picnics/PokemonSV_SandwichPlateDetector.h
@@ -0,0 +1,90 @@
+/*  Sandwich Plate Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_SandwichPlateDetector_H
+#define PokemonAutomation_PokemonSV_SandwichPlateDetector_H
+
+#include "Common/Cpp/Logging/AbstractLogger.h"
+#include "Common/Cpp/Color.h"
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonFramework/Language.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+#include "CommonTools/VisualDetector.h"
+
+namespace PokemonAutomation{
+
+class VideoOverlaySet;
+class VideoOverlay;
+class OverlayBoxScope;
+
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+// Detect the left, middle or right plate that hold sandwich fillings during the making sandwich minigame,
+// using OCR to find the filling name tag under the plate.
+class SandwichPlateDetector : public StaticScreenDetector{
+public:
+    enum class Side{
+        LEFT,
+        MIDDLE,
+        RIGHT,
+        NOT_APPLICABLE,
+    };
+    SandwichPlateDetector(Logger& logger, Color color, Language language, Side side);
+    virtual ~SandwichPlateDetector();
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+    // Return detected sandwich filling name slug. Return empty string if not detected
+    std::string detect_filling_name(const ImageViewRGB32& screen) const;
+
+    // check if the filling name label is yellow.
+    // It is yellow when a filling is grabbed by the sandwich hand in the minigame.
+    bool is_label_yellow(const ImageViewRGB32& screen) const;
+
+protected:
+    Logger& m_logger;
+    Color m_color;
+    Language m_language;
+    Side m_side;
+    ImageFloatBox m_box;
+};
+
+
+// Detect the left, middle or right plate that hold sandwich fillings during the making sandwich minigame,
+// using OCR to find the filling name tag under the plate.
+class SandwichPlateWatcher : public VisualInferenceCallback{
+public:
+    using Side = SandwichPlateDetector::Side;
+    ~SandwichPlateWatcher();
+    SandwichPlateWatcher(Logger& logger, Color color, VideoOverlay& overlay,  Language language, Side side);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override;
+
+    const std::string& filling_name() const { return m_filling_name; }
+
+
+protected:
+    VideoOverlay& m_overlay;
+    SandwichPlateDetector m_detector;
+    std::string m_filling_name;
+};
+
+
+void add_tests_SandwichPlateDetector(UnitTestDatabase& database);
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Picnics/PokemonSV_SandwichRecipeDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Picnics/PokemonSV_SandwichRecipeDetector.cpp
new file mode 100644
index 0000000000..c3f28d217d
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Picnics/PokemonSV_SandwichRecipeDetector.cpp
@@ -0,0 +1,329 @@
+/*  Sandwich Recipe Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <opencv2/imgproc.hpp>
+#include "Common/Cpp/Logging/AbstractLogger.h"
+#include "Common/Cpp/Containers/FixedLimitVector.tpp"
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "CommonFramework/ImageTypes/ImageRGB32.h"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Images/ImageFilter.h"
+#include "CommonTools/OCR/OCR_NumberReader.h"
+#include "Tests/ImageUnitTest.h"
+#include "Tests/TestUtils.h"
+#include "PokemonSV_SandwichRecipeDetector.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+SandwichRecipeNumberDetector::SandwichRecipeNumberDetector(Logger& logger, Color color): m_logger(logger), m_color(color){
+    for (int y = 0; y < 3; y++){
+        for (int x = 0; x < 2; x++){
+            // m_arrow_boxes[y*2+x] = ImageFloatBox(x * 0.26 + 0.103, y * 0.275 + 0.074, 0.068, 0.085);
+            m_id_boxes[y*2+x] = ImageFloatBox(x * 0.26 + 0.015, y * 0.277 + 0.240, 0.042, 0.048);
+        }
+    }
+}
+
+void SandwichRecipeNumberDetector::make_overlays(VideoOverlaySet& items) const{
+    for (int i = 0; i < 6; i++){
+        // items.add(m_color, m_arrow_boxes[i]);
+        items.add(m_color, m_id_boxes[i]);
+    }   
+}
+
+void SandwichRecipeNumberDetector::detect_recipes(const ImageViewRGB32& screen, size_t recipe_IDs[6]) const{
+    for (int i = 0; i < 6; i++){
+        auto cropped_image = extract_box_reference(screen, m_id_boxes[i]);
+
+        const bool invert_blackwhite = true;
+        ImageRGB32 filterd_image = to_blackwhite_rgb32_range(
+            cropped_image,
+            invert_blackwhite,
+            combine_rgb(180, 180, 180), combine_rgb(255, 255, 255)
+        );
+
+        // filterd_image.save("./tmp_fil_" + std::to_string(i) + ".png");
+
+        ImageRGB32 dilated_image(filterd_image.width(), filterd_image.height());
+
+        if (screen.width() >= 1280){
+            const int dilation_type = cv::MORPH_ELLIPSE;
+            const int dilation_size = 1;
+
+            cv::Mat element = cv::getStructuringElement(dilation_type,
+                cv::Size(2*dilation_size + 1, 2*dilation_size+1),
+                cv::Point(dilation_size, dilation_size));
+
+            // filterd_image.save("./tmp_" + std::to_string(i) + ".png");
+            
+            cv::Mat filtered_image_mat(
+                static_cast<int>(filterd_image.height()),
+                static_cast<int>(filterd_image.width()),
+                CV_8UC4,
+                (void*)filterd_image.data(),
+                filterd_image.bytes_per_row()
+            );
+            
+            cv::Mat dilated_image_mat(
+                static_cast<int>(dilated_image.height()),
+                static_cast<int>(dilated_image.width()),
+                CV_8UC4,
+                (void*)dilated_image.data(),
+                dilated_image.bytes_per_row()
+            );
+            cv::dilate(filtered_image_mat, dilated_image_mat, element);
+        }else{
+            dilated_image = filterd_image.copy();
+        }
+
+        // dilated_image.save("./tmp_dil_" + std::to_string(i) + ".png");
+
+        const int number = OCR::read_number(m_logger, dilated_image);
+        if (number <= 0 || number > 151){
+            recipe_IDs[i] = 0;
+        }else{
+            recipe_IDs[i] = number;
+        }
+    }
+
+    // Fix any broken OCR reads:
+    for (int i = 1; i < 5; i++){
+        if (recipe_IDs[i+1] > 0 && recipe_IDs[i-1] > 0 && recipe_IDs[i-1] + 2 == recipe_IDs[i+1]){
+            if (recipe_IDs[i] != recipe_IDs[i-1] + 1){
+                recipe_IDs[i] = recipe_IDs[i-1] + 1;
+                m_logger.log("Fix recipe number at cell " + std::to_string(i) + " to be " + std::to_string(recipe_IDs[i]));
+            }
+        }
+    }
+    if (recipe_IDs[1] == 2 && recipe_IDs[2] == 3){
+        if (recipe_IDs[0] != 1){
+            recipe_IDs[0] = 1;
+            m_logger.log("Fix recipe number at cell 0 to be 1");
+        }
+    }
+}
+
+
+SandwichRecipeSelectionWatcher::SandwichRecipeSelectionWatcher(Color color)
+: VisualInferenceCallback("SandwichRecipeSelectionWatcher"), m_arrow_watchers(6){
+    for (int y = 0; y < 3; y++){
+        for (int x = 0; x < 2; x++){
+            ImageFloatBox box(x * 0.26 + 0.103, y * 0.275 + 0.074, 0.068, 0.085);
+            m_arrow_watchers.emplace_back(color, GradientArrowType::DOWN, box);
+        }
+    }
+}
+
+void SandwichRecipeSelectionWatcher::make_overlays(VideoOverlaySet& items) const{
+    for (int i = 0; i < 6; i++){
+        m_arrow_watchers[i].make_overlays(items);
+    }
+}
+
+bool SandwichRecipeSelectionWatcher::process_frame(const VideoSnapshot& frame){
+    int num_arrows_found = 0;
+    for (int i = 0; i < 6; i++){
+        const bool found_arrow = m_arrow_watchers[i].process_frame(frame);
+        if (found_arrow){
+            m_selected_recipe = i;
+            num_arrows_found++;
+        }
+    }
+    return num_arrows_found == 1;
+}
+
+bool SandwichRecipeSelectionWatcher::detect(const ImageViewRGB32& frame){
+    int num_arrows_found = 0;
+    for (int i = 0; i < 6; i++){
+        const bool found_arrow = m_arrow_watchers[i].detect(frame);
+        if (found_arrow){
+            m_selected_recipe = i;
+            num_arrows_found++;
+        }
+    }
+    return num_arrows_found == 1;
+}
+
+
+
+
+
+
+
+class Test_SandwichRecipeDetector : public ImageUnitTest{
+public:
+    Test_SandwichRecipeDetector(
+        const std::string& image,
+        std::vector<std::string> words
+    )
+        : ImageUnitTest("PokemonSV::Test_SandwichRecipeDetector - " + image, {image})
+        , m_words(std::move(words))
+    {
+        //  Plus the PaddleOCR (ONNX) recognition session and its working set.
+        m_memory += PADDLE_OCR_SINGLE_LINE_MEMORY_ESTIMATE;
+    }
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        // seven words: the sandwich recipe IDs on the screen. Order:
+        // --------------------------------------
+        // recipe_IDs[0]  |   recipe_IDs[1]
+        // recipe_IDs[2]  |   recipe_IDs[3]
+        // recipe_IDs[4]  |   recipe_IDs[5]
+        // --------------------------------------
+        // plus the current selected cell ID (range [0, 5]).
+        if (m_words.size() < 7){
+            std::stringstream ss;
+            ss << "Error: not enough number of words in the filename. Found only " << m_words.size() << "." << std::endl;
+            return ss.str();
+        }
+
+        int target_IDs[6] = {0, 0, 0, 0, 0, 0};
+        for (int i = 0; i < 6; i++){
+            const auto& word = m_words[m_words.size() + i - 7];
+            if (parse_int(word, target_IDs[i]) == false || target_IDs[i] > 151){
+                std::stringstream ss;
+                ss << "Error: word " << m_words[m_words.size() + i - 7] << " is wrong. Must be an integer < 151. " << std::endl;
+                return ss.str();
+            }
+        }
+
+        SandwichRecipeNumberDetector detector(logger);
+
+        size_t detected_IDs[6] = {0, 0, 0, 0, 0, 0};
+        const ImageRGB32& image = images[0];
+        detector.detect_recipes(image, detected_IDs);
+
+        for (int i = 0; i < 6; i++){
+            if (target_IDs[i] < 0){
+                continue;
+            }
+            TEST_RESULT_COMPONENT_EQUAL_STR(detected_IDs[i], (size_t)target_IDs[i], "recipe at cell " + std::to_string(i));
+        }
+
+        int target_selection = 0;
+        if (parse_int(m_words[m_words.size()-1], target_selection) == false || target_selection < 0 || target_selection >= 6){
+            std::stringstream ss;
+            ss << "Error: word " << m_words[m_words.size()-1] << " is wrong. Must be an integer in range [0, 6). " << std::endl;
+            return ss.str();
+        }
+        SandwichRecipeSelectionWatcher selection_watcher;
+        bool result = selection_watcher.detect(image);
+
+        TEST_RESULT_COMPONENT_EQUAL_STR(result, true, "SandwichRecipeSelectionWatcher::process_frame() result");
+
+        int selected_cell = selection_watcher.selected_recipe_cell();
+
+        TEST_RESULT_COMPONENT_EQUAL_STR(selected_cell, target_selection, "selected cell");
+
+        return true;
+    };
+
+private:
+    std::vector<std::string> m_words;
+};
+
+
+
+void add_tests_SandwichRecipeDetector(UnitTestDatabase& database){
+    database.add<Test_SandwichRecipeDetector>(
+        "PokemonSV/SandwichRecipeDetector/Korean_NewAccount_1_0_0_0_0_0_0.png",
+        std::vector<std::string>{"1", "0", "0", "0", "0", "0", "0"}
+    );
+    database.add<Test_SandwichRecipeDetector>(
+        "PokemonSV/SandwichRecipeDetector/NewAccount_1_12_20_0_84_0_0.png",
+        std::vector<std::string>{"1", "12", "20", "0", "84", "0", "0"}
+    );
+    database.add<Test_SandwichRecipeDetector>(
+        "PokemonSV/SandwichRecipeDetector/Nix_Sandwich_15_16_17_18_19_20_2.png",
+        std::vector<std::string>{"15", "16", "17", "18", "19", "20", "2"}
+    );
+    database.add<Test_SandwichRecipeDetector>(
+        "PokemonSV/SandwichRecipeDetector/Sandwich_1_4_8_12_13_14_0.png",
+        std::vector<std::string>{"1", "4", "8", "12", "13", "14", "0"}
+    );
+    database.add<Test_SandwichRecipeDetector>(
+        "PokemonSV/SandwichRecipeDetector/Sandwich_-1_16_17_-1_-1_20_2.png",
+        std::vector<std::string>{"-1", "16", "17", "-1", "-1", "20", "2"}
+    );
+//    database.add<Test_SandwichRecipeDetector>(
+//        "PokemonSV/SandwichRecipeDetector/macOS/_Recipe_No_Ingredient_1_2_3_4_5_6_0.png",
+//        std::vector<std::string>{"1", "2", "3", "4", "5", "6", "0"}
+//    );
+    database.add<Test_SandwichRecipeDetector>(
+        "PokemonSV/SandwichRecipeDetector/macOS/Recipe_1_2_3_4_5_6_0.png",
+        std::vector<std::string>{"1", "2", "3", "4", "5", "6", "0"}
+    );
+    database.add<Test_SandwichRecipeDetector>(
+        "PokemonSV/SandwichRecipeDetector/macOS/Recipe_1_2_3_4_5_6_1.png",
+        std::vector<std::string>{"1", "2", "3", "4", "5", "6", "1"}
+    );
+    database.add<Test_SandwichRecipeDetector>(
+        "PokemonSV/SandwichRecipeDetector/macOS/Recipe_1_2_3_4_5_6_2.png",
+        std::vector<std::string>{"1", "2", "3", "4", "5", "6", "2"}
+    );
+    database.add<Test_SandwichRecipeDetector>(
+        "PokemonSV/SandwichRecipeDetector/macOS/Recipe_1_2_3_4_5_6_3.png",
+        std::vector<std::string>{"1", "2", "3", "4", "5", "6", "3"}
+    );
+    database.add<Test_SandwichRecipeDetector>(
+        "PokemonSV/SandwichRecipeDetector/macOS/Recipe_3_4_5_6_7_8_2.png",
+        std::vector<std::string>{"3", "4", "5", "6", "7", "8", "2"}
+    );
+    database.add<Test_SandwichRecipeDetector>(
+        "PokemonSV/SandwichRecipeDetector/macOS/Recipe_7_8_9_10_11_12_2.png",
+        std::vector<std::string>{"7", "8", "9", "10", "11", "12", "2"}
+    );
+    database.add<Test_SandwichRecipeDetector>(
+        "PokemonSV/SandwichRecipeDetector/macOS/Recipe_15_16_17_18_19_20_2.png",
+        std::vector<std::string>{"15", "16", "17", "18", "19", "20", "2"}
+    );
+    database.add<Test_SandwichRecipeDetector>(
+        "PokemonSV/SandwichRecipeDetector/macOS/Recipe_41_42_43_44_45_46_2.png",
+        std::vector<std::string>{"41", "42", "43", "44", "45", "46", "2"}
+    );
+    database.add<Test_SandwichRecipeDetector>(
+        "PokemonSV/SandwichRecipeDetector/macOS/Recipe_75_76_77_78_79_80_2.png",
+        std::vector<std::string>{"75", "76", "77", "78", "79", "80", "2"}
+    );
+    database.add<Test_SandwichRecipeDetector>(
+        "PokemonSV/SandwichRecipeDetector/macOS/Recipe_147_148_149_150_151_0_0.png",
+        std::vector<std::string>{"147", "148", "149", "150", "151", "0", "0"}
+    );
+    database.add<Test_SandwichRecipeDetector>(
+        "PokemonSV/SandwichRecipeDetector/macOS/Recipe_147_148_149_150_151_0_2.png",
+        std::vector<std::string>{"147", "148", "149", "150", "151", "0", "2"}
+    );
+    database.add<Test_SandwichRecipeDetector>(
+        "PokemonSV/SandwichRecipeDetector/macOS/Recipe_147_148_149_150_151_0_3.png",
+        std::vector<std::string>{"147", "148", "149", "150", "151", "0", "3"}
+    );
+    database.add<Test_SandwichRecipeDetector>(
+        "PokemonSV/SandwichRecipeDetector/macOS/Recipe_149_150_151_0_0_0_1.png",
+        std::vector<std::string>{"149", "150", "151", "0", "0", "0", "1"}
+    );
+    database.add<Test_SandwichRecipeDetector>(
+        "PokemonSV/SandwichRecipeDetector/macOS/Recipe_149_150_151_0_0_0_2.png",
+        std::vector<std::string>{"149", "150", "151", "0", "0", "0", "2"}
+    );
+
+}
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Picnics/PokemonSV_SandwichRecipeDetector.h b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Picnics/PokemonSV_SandwichRecipeDetector.h
new file mode 100644
index 0000000000..342f272d80
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Picnics/PokemonSV_SandwichRecipeDetector.h
@@ -0,0 +1,86 @@
+/*  Sandwich Recipe Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_SandwichRecipeDetector_H
+#define PokemonAutomation_PokemonSV_SandwichRecipeDetector_H
+
+#include "Common/Cpp/Color.h"
+#include "Common/Cpp/Containers/FixedLimitVector.h"
+#include "Common/Cpp/TestRunners/UnitTest.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+#include "CommonTools/VisualDetector.h"
+#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_GradientArrowDetector.h"
+
+namespace PokemonAutomation{
+    class Logger;
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+// Detect the sandwich recipe IDs
+class SandwichRecipeNumberDetector{
+public:
+    SandwichRecipeNumberDetector(Logger& logger, Color color = COLOR_YELLOW);
+
+    void make_overlays(VideoOverlaySet& items) const;
+
+    // Detect the IDs of the displayed sandwich recipes.
+    // The order is from top to bottom, left to right:
+    // --------------------------------------
+    // recipe_IDs[0]  |   recipe_IDs[1]
+    // recipe_IDs[2]  |   recipe_IDs[3]
+    // recipe_IDs[4]  |   recipe_IDs[5]
+    // --------------------------------------
+    // recipe ID range: [1, 151]
+    // If there is no recipe at one cell, its value is 0.
+    // If a recipe has not enough ingredient to make (displayed as semi-transparent), it value is 0.
+    void detect_recipes(const ImageViewRGB32& screen, size_t recipe_IDs[6]) const;
+
+private:
+    Logger& m_logger;
+    Color m_color;
+    ImageFloatBox m_id_boxes[6];
+};
+
+// Find which recipe cell is selected by the gradient arrow when choosing a sandwich recipe.
+// Run `process_frame()` until it returns true, meaning arrow detected, then call `selected_recipe_cell()`
+// to get the detected cell.
+class SandwichRecipeSelectionWatcher : public VisualInferenceCallback{
+public: 
+    SandwichRecipeSelectionWatcher(Color color = COLOR_RED);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool process_frame(const VideoSnapshot& frame) override;
+
+    // Whether it can detect the recipe selection on this frame.
+    // Unlike `process_frame()` which relies on consecutive frames to give robust result,
+    // this function uses only one frame.
+    bool detect(const ImageViewRGB32& frame);
+
+    // Return which recipe cell is currented selected.
+    // For cell order, see `SandwichRecipeNumberDetector`.
+    // If no cell selection detected, return -1.
+    int selected_recipe_cell() const { return m_selected_recipe; }
+
+private:
+    FixedLimitVector<GradientArrowWatcher> m_arrow_watchers;
+    int m_selected_recipe = -1;
+};
+
+
+
+
+
+
+
+void add_tests_SandwichRecipeDetector(UnitTestDatabase& database);
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_AuctionItemNameReader.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_AuctionItemNameReader.cpp
new file mode 100644
index 0000000000..745e794e02
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_AuctionItemNameReader.cpp
@@ -0,0 +1,41 @@
+/*  Auction Item Name Reader
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "PokemonSV_AuctionItemNameReader.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+AuctionItemNameReader& AuctionItemNameReader::instance(){
+    static AuctionItemNameReader reader;
+    return reader;
+}
+
+
+AuctionItemNameReader::AuctionItemNameReader()
+    : SmallDictionaryMatcher("PokemonSV/Auction/AuctionItemNameOCR.json")
+{}
+
+OCR::StringMatchResult AuctionItemNameReader::read_substring(
+    Logger& logger,
+    Language language,
+    const ImageViewRGB32& image,
+    const std::vector<OCR::TextColorRange>& text_color_ranges,
+    double min_text_ratio, double max_text_ratio
+) const{
+    return match_substring_from_image_multifiltered(
+        &logger, language, image, text_color_ranges,
+        MAX_LOG10P, MAX_LOG10P_SPREAD, min_text_ratio, max_text_ratio
+    );
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_AuctionItemNameReader.h b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_AuctionItemNameReader.h
new file mode 100644
index 0000000000..19db747d36
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_AuctionItemNameReader.h
@@ -0,0 +1,41 @@
+/*  Auction Item Name Reader
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_AuctionItemNameReader_H
+#define PokemonAutomation_PokemonSV_AuctionItemNameReader_H
+
+#include "CommonTools/OCR/OCR_SmallDictionaryMatcher.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+class AuctionItemNameReader : public OCR::SmallDictionaryMatcher{
+public:
+    static constexpr double MAX_LOG10P = -1.40;
+    static constexpr double MAX_LOG10P_SPREAD = 0.50;
+
+public:
+    AuctionItemNameReader();
+
+    static AuctionItemNameReader& instance();
+
+    OCR::StringMatchResult read_substring(
+        Logger& logger,
+        Language language,
+        const ImageViewRGB32& image,
+        const std::vector<OCR::TextColorRange>& text_color_ranges,
+        double min_text_ratio = 0.01, double max_text_ratio = 0.50
+    ) const;
+
+};
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_BagDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_BagDetector.cpp
new file mode 100644
index 0000000000..47c1a8e0aa
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_BagDetector.cpp
@@ -0,0 +1,70 @@
+/*  Bag Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Images/SolidColorTest.h"
+#include "PokemonSV_PokemonSummaryReader.h"
+#include "PokemonSV_BagDetector.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+BagDetector::BagDetector(Color color)
+    : m_color(color)
+    , m_top_blue_left(0.24, 0.09, 0.05, 0.05)
+    , m_top_blue_right(0.71, 0.09, 0.05, 0.05)
+    , m_bottom(0.03, 0.94, 0.40, 0.04)
+{}
+void BagDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_top_blue_left);
+    items.add(m_color, m_top_blue_right);
+    items.add(m_color, m_bottom);
+}
+bool BagDetector::detect(const ImageViewRGB32& screen){
+    ImageStats top_blue_left = image_stats(extract_box_reference(screen, m_top_blue_left));
+//    cout << top_blue_left.average << top_blue_left.stddev << endl;
+    if (!is_solid(top_blue_left, {0.0745162, 0.311321, 0.614163}, 0.30, 10)){
+        return false;
+    }
+
+    ImageStats top_blue_right = image_stats(extract_box_reference(screen, m_top_blue_right));
+//    cout << top_blue_right.average << top_blue_right.stddev << endl;
+    if (!is_solid(top_blue_right, {0.0745162, 0.311321, 0.614163}, 0.30, 10)){
+        return false;
+    }
+
+    ImageStats bottom = image_stats(extract_box_reference(screen, m_bottom));
+//    cout << bottom.average << bottom.stddev << endl;
+#if 0
+    if (bottom.stddev.sum() > 20){
+        return false;
+    }
+#else
+    if (!is_summary_color(bottom)){
+        return false;
+    }
+#endif
+
+//    ImageStats shiny_symbol = image_stats(extract_box_reference(screen, m_shiny_symbol));
+//    cout << shiny_symbol.average << shiny_symbol.stddev << endl;
+
+    return true;
+}
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_BagDetector.h b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_BagDetector.h
new file mode 100644
index 0000000000..3b6085d4bf
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_BagDetector.h
@@ -0,0 +1,48 @@
+/*  Bag Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_BagDetector_H
+#define PokemonAutomation_PokemonSV_BagDetector_H
+
+#include "Common/Cpp/Color.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonTools/VisualDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+class BagDetector : public StaticScreenDetector{
+public:
+    BagDetector(Color color = COLOR_RED);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+    bool is_shiny(const ImageViewRGB32& screen) const;
+
+
+protected:
+    Color m_color;
+    ImageFloatBox m_top_blue_left;
+    ImageFloatBox m_top_blue_right;
+    ImageFloatBox m_bottom;
+};
+class BagWatcher : public DetectorToFinder<BagDetector>{
+public:
+    BagWatcher(FinderType type, Color color = COLOR_RED)
+         : DetectorToFinder("PokemonSummaryWatcher", type, std::chrono::milliseconds(250), color)
+    {}
+};
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_BlueberryPointsReader.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_BlueberryPointsReader.cpp
new file mode 100644
index 0000000000..4d5f5fc4ba
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_BlueberryPointsReader.cpp
@@ -0,0 +1,39 @@
+/*  Blueberry Points Reader
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Color.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/ImageTypes/ImageRGB32.h"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonTools/Images/ImageFilter.h"
+#include "CommonTools/OCR/OCR_NumberReader.h"
+#include "PokemonSV_BlueberryPointsReader.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+int read_BP_from_image(Logger& logger, const ImageViewRGB32& screen){
+    // Normalized coordinates for the upper-right balance on a 16:9 quest panel.
+    // Keep the right edge at 0.954: the old 0.957 edge included the left stroke
+    // of the B in "BP", making 6750 read as 67501. See the full-frame reference
+    // UnitTestResources/PokemonSV/BlueberryPoints/6750.png and its README.
+    const ImageFloatBox BP_NUMBER_BOX(0.866, 0.019, 0.088, 0.041);
+    // Isolate the near-white digits from the blue panel background. These are
+    // the existing quest-panel text thresholds, inclusive on all RGB channels.
+    const uint32_t BP_TEXT_MIN = combine_rgb(198, 198, 198);
+    const uint32_t BP_TEXT_MAX = combine_rgb(255, 255, 255);
+    ImageRGB32 number = to_blackwhite_rgb32_range(
+        extract_box_reference(screen, BP_NUMBER_BOX), true, BP_TEXT_MIN, BP_TEXT_MAX
+    );
+    return OCR::read_number(logger, number);
+}
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_BlueberryPointsReader.h b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_BlueberryPointsReader.h
new file mode 100644
index 0000000000..d11517de2a
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_BlueberryPointsReader.h
@@ -0,0 +1,25 @@
+/*  Blueberry Points Reader
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_BlueberryPointsReader_H
+#define PokemonAutomation_PokemonSV_BlueberryPointsReader_H
+
+#include "Common/Cpp/Logging/AbstractLogger.h"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+// Read the numeric balance from a captured 16:9 quest panel; -1 on OCR failure.
+int read_BP_from_image(Logger& logger, const ImageViewRGB32& screen);
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_BlueberryQuestDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_BlueberryQuestDetector.cpp
new file mode 100644
index 0000000000..378cb5236f
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_BlueberryQuestDetector.cpp
@@ -0,0 +1,119 @@
+/*  Blueberry Quest Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Exceptions/OperationFailedException.h"
+#include "CommonFramework/ImageTypes/ImageRGB32.h"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Images/ImageFilter.h"
+#include "VideoGames/PokemonSV/Inference/PokemonSV_BlueberryQuestReader.h"
+#include "PokemonSV_BlueberryQuestDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+//BlueberryQuestDetector::~BlueberryQuestDetector() = default;
+
+BlueberryQuestDetector::BlueberryQuestDetector(Logger& logger, Color color, Language language, QuestPosition position)
+    : m_logger(logger), m_color(color), m_language(language), m_position(position)
+{
+    switch(position){
+    case QuestPosition::FIRST:
+        m_box = ImageFloatBox(0.604, 0.218, 0.282, 0.095);
+        break;
+    case QuestPosition::SECOND:
+        m_box = ImageFloatBox(0.604, 0.395, 0.282, 0.095);
+        break;
+    case QuestPosition::THIRD:
+        m_box = ImageFloatBox(0.604, 0.572, 0.282, 0.095);
+        break;
+    case QuestPosition::FOURTH:
+        m_box = ImageFloatBox(0.604, 0.749, 0.282, 0.095);
+        break;
+    }
+}
+
+void BlueberryQuestDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_box);
+}
+
+bool BlueberryQuestDetector::detect(const ImageViewRGB32& screen){
+    return !detect_quest(screen).empty();
+}
+
+std::string BlueberryQuestDetector::detect_quest(const ImageViewRGB32& screen) const{
+    std::multimap<double, OCR::StringMatchData> results;
+
+    ImageRGB32 quest_label = to_blackwhite_rgb32_range(
+        extract_box_reference(screen, m_box),
+        true,
+        combine_rgb(198, 198, 198), combine_rgb(255, 255, 255)
+    );
+
+    //quest_label.save("quest_label.png");
+
+    OCR::StringMatchResult ocr_result = PokemonSV::BlueberryQuestReader::instance().read_substring(
+        m_logger, m_language, quest_label,
+        OCR::BLACK_TEXT_FILTERS()
+    );
+    ocr_result.clear_beyond_log10p(BlueberryQuestReader::MAX_LOG10P);
+    ocr_result.clear_beyond_spread(BlueberryQuestReader::MAX_LOG10P_SPREAD);
+    if (!ocr_result.results.empty()){
+        for (const auto& result : ocr_result.results){
+            results.emplace(result.first, result.second);
+        }
+            
+    }
+
+    if (results.empty()){
+        return "";
+    }
+
+    if (results.size() > 1){
+        throw_and_log<OperationFailedException>(
+            m_logger, ErrorReportMode::SEND_ERROR_REPORT,
+            "BlueberryQuestDetector::detect_quest(): Unable to read selected item. Ambiguous or multiple results.\n" + language_warning(m_language)
+        );
+    }
+
+    return results.begin()->second.token;
+}
+
+
+
+BlueberryQuestWatcher::~BlueberryQuestWatcher() = default;
+
+BlueberryQuestWatcher::BlueberryQuestWatcher(Logger& logger, Color color, VideoOverlay& overlay, Language language, BlueberryQuestDetector::QuestPosition position)
+    : VisualInferenceCallback("BlueberryQuestWatcher")
+    , m_overlay(overlay)
+    , m_detector(logger, color, language, position)
+{}
+
+void BlueberryQuestWatcher::make_overlays(VideoOverlaySet& items) const{
+    m_detector.make_overlays(items);
+}
+
+bool BlueberryQuestWatcher::process_frame(const ImageViewRGB32& screen, WallClock timestamp){
+    m_quest_name = m_detector.detect_quest(screen);
+    if (m_quest_name.empty()){
+        return false;
+    }
+
+    return true;
+}
+
+
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_BlueberryQuestDetector.h b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_BlueberryQuestDetector.h
new file mode 100644
index 0000000000..2dcb501a2c
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_BlueberryQuestDetector.h
@@ -0,0 +1,83 @@
+/*  Blueberry Quest Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_BlueberryQuestDetector_H
+#define PokemonAutomation_PokemonSV_BlueberryQuestDetector_H
+
+#include "Common/Cpp/Logging/AbstractLogger.h"
+#include "Common/Cpp/Color.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonFramework/Language.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+#include "CommonTools/VisualDetector.h"
+
+namespace PokemonAutomation{
+
+class VideoOverlaySet;
+class VideoOverlay;
+class OverlayBoxScope;
+
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+// Detect the quest in a given position (four positions before having to scroll)
+class BlueberryQuestDetector : public StaticScreenDetector{
+public:
+    //Max quests: 4 in singleplayer (1 red, 3 blue). 17 in multiplayer (with 4 players: 1 gold, 4 red, 12 blue).
+    //For multiplayer, never read other player's quests. So 1 gold, 4 red, 3 blue.
+    //Only 4 quests are visible at a time. Need to scroll down.
+    enum class QuestPosition{
+        FIRST,
+        SECOND,
+        THIRD,
+        FOURTH
+    };
+    BlueberryQuestDetector(Logger& logger, Color color, Language language, QuestPosition position);
+//    virtual ~BlueberryQuestDetector();
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+    // Return detected quest slug. Return empty string if not detected
+    std::string detect_quest(const ImageViewRGB32& screen) const;
+
+protected:
+    Logger& m_logger;
+    Color m_color;
+    Language m_language;
+    QuestPosition m_position;
+    ImageFloatBox m_box;
+};
+
+
+// Detect the quest in a given position (four positions before having to scroll)
+class BlueberryQuestWatcher : public VisualInferenceCallback{
+public:
+    using Side = BlueberryQuestDetector::QuestPosition;
+    ~BlueberryQuestWatcher();
+    BlueberryQuestWatcher(Logger& logger, Color color, VideoOverlay& overlay,  Language language, BlueberryQuestDetector::QuestPosition position);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override;
+
+    const std::string& quest_name() const { return m_quest_name; }
+
+
+protected:
+    VideoOverlay& m_overlay;
+    BlueberryQuestDetector m_detector;
+    std::string m_quest_name;
+};
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_BlueberryQuestReader.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_BlueberryQuestReader.cpp
new file mode 100644
index 0000000000..c252b6e202
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_BlueberryQuestReader.cpp
@@ -0,0 +1,41 @@
+/*  Blueberry Quest Reader
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "PokemonSV_BlueberryQuestReader.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+BlueberryQuestReader& BlueberryQuestReader::instance(){
+    static BlueberryQuestReader reader;
+    return reader;
+}
+
+BlueberryQuestReader::BlueberryQuestReader()
+    : SmallDictionaryMatcher("PokemonSV/BlueberryQuestsOCR.json")
+{}
+
+OCR::StringMatchResult BlueberryQuestReader::read_substring(
+    Logger& logger,
+    Language language,
+    const ImageViewRGB32& image,
+    const std::vector<OCR::TextColorRange>& text_color_ranges,
+    double min_text_ratio, double max_text_ratio
+) const{
+    return match_substring_from_image_multifiltered(
+        &logger, language, image, text_color_ranges,
+        MAX_LOG10P, MAX_LOG10P_SPREAD, min_text_ratio, max_text_ratio,
+        OCR::PageSegMode::SINGLE_BLOCK
+    );
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_BlueberryQuestReader.h b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_BlueberryQuestReader.h
new file mode 100644
index 0000000000..2b86718345
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_BlueberryQuestReader.h
@@ -0,0 +1,41 @@
+/*  Blueberry Quest Reader
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_BlueberryQuestReader_H
+#define PokemonAutomation_PokemonSV_BlueberryQuestReader_H
+
+#include "CommonTools/OCR/OCR_SmallDictionaryMatcher.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+class BlueberryQuestReader : public OCR::SmallDictionaryMatcher{
+public:
+    static constexpr double MAX_LOG10P = -1.40;
+    static constexpr double MAX_LOG10P_SPREAD = 0.50;
+
+public:
+    BlueberryQuestReader();
+
+    static BlueberryQuestReader& instance();
+
+    OCR::StringMatchResult read_substring(
+        Logger& logger,
+        Language language,
+        const ImageViewRGB32& image,
+        const std::vector<OCR::TextColorRange>& text_color_ranges,
+        double min_text_ratio = 0.01, double max_text_ratio = 0.50
+    ) const;
+
+};
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_ClothingTopDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_ClothingTopDetector.cpp
new file mode 100644
index 0000000000..1be66a13be
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_ClothingTopDetector.cpp
@@ -0,0 +1,35 @@
+/*  Clothing Top Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Tools/ErrorDumper.h"
+#include "PokemonSV_ClothingTopDetector.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+//This detects that the gradient arrow is in the top slot of a clothing store menu
+ClothingTopDetector::ClothingTopDetector(Color color)
+    : m_arrow(color, GradientArrowType::RIGHT, { 0.009, 0.158, 0.061, 0.153 })
+{}
+void ClothingTopDetector::make_overlays(VideoOverlaySet& items) const{
+    m_arrow.make_overlays(items);
+}
+bool ClothingTopDetector::detect(const ImageViewRGB32& screen){
+    if (!m_arrow.detect(screen)){
+        return false;
+    }
+    return true;
+}
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_ClothingTopDetector.h b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_ClothingTopDetector.h
new file mode 100644
index 0000000000..2382a2200b
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_ClothingTopDetector.h
@@ -0,0 +1,42 @@
+/*  Clothing Top Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_ClothingTop_H
+#define PokemonAutomation_PokemonSV_ClothingTop_H
+
+#include "CommonTools/VisualDetector.h"
+#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_GradientArrowDetector.h"
+
+namespace PokemonAutomation{
+    struct ProgramInfo;
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+class ClothingTopDetector : public StaticScreenDetector{
+public:
+    ClothingTopDetector(Color color);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    GradientArrowDetector m_arrow;
+};
+class ClothingTopWatcher : public DetectorToFinder<ClothingTopDetector>{
+public:
+    ClothingTopWatcher(Color color)
+        : DetectorToFinder("ClothingTopWatcher", std::chrono::milliseconds(250), color)
+    {}
+};
+
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_ESPEmotionDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_ESPEmotionDetector.cpp
new file mode 100644
index 0000000000..fdd59422a6
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_ESPEmotionDetector.cpp
@@ -0,0 +1,158 @@
+/*  ESP Emotion Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Images/SolidColorTest.h"
+#include "Tests/ImageUnitTest.h"
+#include "PokemonSV_ESPEmotionDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+ESPEmotionReader::ESPEmotionReader()
+    : m_symbol_box(0.297, 0.137, 0.010, 0.016)
+{}
+
+void ESPEmotionReader::make_overlays(VideoOverlaySet& items) const{
+    items.add(COLOR_RED, m_symbol_box);
+}
+Detection ESPEmotionReader::detect(const ImageViewRGB32& screen) const{
+    ImageViewRGB32 symbol = extract_box_reference(screen, m_symbol_box);
+
+    //Color ratio: R/(R+G+B), G/(R+G+B), B/(R+G+B)
+    if (is_solid(symbol, { 0.567, 0.2, 0.232 }, 0.2, 40)){
+        return Detection::RED;
+    }
+    if (is_solid(symbol, { 0.529, 0.447, 0.0258 }, 0.2, 40)){
+        return Detection::YELLOW;
+    }
+    if (is_solid(symbol, { 0.132, 0.332, 0.536 }, 0.2, 40)){
+        return Detection::BLUE; //Sometimes picks up the grey as well but that works
+    }
+    if (is_solid(symbol, { 0.323, 0.491, 0.184 }, 0.2, 40)){
+        return Detection::GREEN;
+    }
+    if (is_solid(symbol, { 0.219, 0.355, 0.426 }, 0.2, 40)){
+        return Detection::GREY;
+    }
+    return Detection::NO_DETECTION;
+}
+
+ESPEmotionDetector::ESPEmotionDetector()
+    : VisualInferenceCallback("ESPEmotionDetector")
+    , m_last(Detection::NO_DETECTION)
+{}
+
+void ESPEmotionDetector::make_overlays(VideoOverlaySet& items) const{
+    m_reader.make_overlays(items);
+}
+bool ESPEmotionDetector::process_frame(const ImageViewRGB32& frame, WallClock timestamp){
+    Detection result = m_reader.detect(frame);
+    m_last.store(result, std::memory_order_release);
+    return result != Detection::NO_DETECTION;
+}
+
+ESPStartDetector::ESPStartDetector()
+    : VisualInferenceCallback("ESPStartDetector")
+    , m_left_box(0.337, 0.144, 0.007, 0.064)
+    , m_right_box(0.716, 0.140, 0.008, 0.069)
+{}
+void ESPStartDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(COLOR_RED, m_left_box);
+    items.add(COLOR_RED, m_right_box);
+}
+bool ESPStartDetector::detect(const ImageViewRGB32& frame){
+    ImageViewRGB32 left_image = extract_box_reference(frame, m_left_box);
+    ImageViewRGB32 right_image = extract_box_reference(frame, m_right_box);
+    if (is_solid(left_image, { 0.332, 0.335, 0.332 }) && is_solid(right_image, { 0.332, 0.335, 0.332 })){
+        return true;
+    }
+    return false;
+}
+bool ESPStartDetector::process_frame(const ImageViewRGB32& frame, WallClock timestamp){
+    return detect(frame);
+}
+
+ESPShowNewEmotionDetector::ESPShowNewEmotionDetector()
+    : VisualInferenceCallback("ESPShowNewEmotionDetector")
+    , m_left_box(0.337, 0.144, 0.007, 0.064)
+    , m_right_box(0.716, 0.140, 0.008, 0.069)
+{}
+void ESPShowNewEmotionDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(COLOR_RED, m_left_box);
+    items.add(COLOR_RED, m_right_box);
+}
+bool ESPShowNewEmotionDetector::detect(const ImageViewRGB32& frame){
+    ImageViewRGB32 left_image = extract_box_reference(frame, m_left_box);
+    ImageViewRGB32 right_image = extract_box_reference(frame, m_right_box);
+    if (is_solid(left_image, { 0.332, 0.335, 0.332 }) && is_solid(right_image, { 0.332, 0.335, 0.332 })){
+        return false;
+    }
+    return true;
+}
+bool ESPShowNewEmotionDetector::process_frame(const ImageViewRGB32& frame, WallClock timestamp){
+    return detect(frame);
+}
+
+ESPPressedEmotionDetector::ESPPressedEmotionDetector()
+    : VisualInferenceCallback("ESPPressedEmotionDetector")
+    , m_left_box(0.851, 0.753, 0.015, 0.026)
+    , m_right_box(0.943, 0.850, 0.021, 0.022)
+    , m_top_box(0.874, 0.712, 0.014, 0.035)
+    , m_bottom_box(0.924, 0.884, 0.016, 0.027)
+{}
+void ESPPressedEmotionDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(COLOR_RED, m_left_box);
+    items.add(COLOR_RED, m_right_box);
+    items.add(COLOR_RED, m_top_box);
+    items.add(COLOR_RED, m_bottom_box);
+}
+bool ESPPressedEmotionDetector::detect(const ImageViewRGB32& frame){
+    ImageViewRGB32 left_image = extract_box_reference(frame, m_left_box);
+    ImageViewRGB32 right_image = extract_box_reference(frame, m_right_box);
+    ImageViewRGB32 top_image = extract_box_reference(frame, m_top_box);
+    ImageViewRGB32 bottom_image = extract_box_reference(frame, m_bottom_box);
+    if (is_solid(left_image, { 0.506, 0.439, 0.054 }, 0.2, 15) || is_solid(right_image, { 0.506, 0.439, 0.054 }, 0.2, 15)
+        || is_solid(top_image, { 0.506, 0.439, 0.054 }, 0.2, 15) || is_solid(bottom_image, { 0.506, 0.439, 0.054 }, 0.2, 15)){
+        return true;
+    }
+    return false;
+}
+bool ESPPressedEmotionDetector::process_frame(const ImageViewRGB32& frame, WallClock timestamp){
+    return detect(frame);
+}
+
+
+class Test_ESPPressedEmotionDetector : public ImageUnitTest{
+public:
+    Test_ESPPressedEmotionDetector(const std::string& image, bool expected)
+        : ImageUnitTest("PokemonSV::ESPPressedEmotionDetector - " + image, {image})
+        , m_expected(expected)
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        ESPPressedEmotionDetector detector;
+        const ImageRGB32& image = images[0];
+        return detector.detect(image) == m_expected;
+    }
+
+private:
+    bool m_expected;
+};
+
+
+void add_tests_ESPEmotionDetector(UnitTestDatabase& database){
+    database.add<Test_ESPPressedEmotionDetector>("PokemonSV/ESPPressedEmotionDetector/ESPPressedEmotionDetector_False.png", false);
+    database.add<Test_ESPPressedEmotionDetector>("PokemonSV/ESPPressedEmotionDetector/ESPPressedEmotionDetector_True.png", true);
+}
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_ESPEmotionDetector.h b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_ESPEmotionDetector.h
new file mode 100644
index 0000000000..2051fe2cce
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_ESPEmotionDetector.h
@@ -0,0 +1,113 @@
+/*  ESP Emotion Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_ESPEmotionDetector_H
+#define PokemonAutomation_PokemonSV_ESPEmotionDetector_H
+
+#include <atomic>
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+#include "CommonTools/VisualDetector.h"
+
+namespace PokemonAutomation{
+    class CancellableScope;
+    class VideoFeed;
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+enum class Detection{
+    NO_DETECTION,
+    RED,
+    YELLOW,
+    BLUE,
+    GREEN,
+    GREY,
+};
+class ESPEmotionReader{
+public:
+    ESPEmotionReader();
+
+    void make_overlays(VideoOverlaySet& items) const;
+    Detection detect(const ImageViewRGB32& screen) const;
+
+private:
+    ImageFloatBox m_symbol_box;
+};
+
+class ESPEmotionDetector : public VisualInferenceCallback{
+public:
+    ESPEmotionDetector();
+
+    Detection result() const{
+        return m_last.load(std::memory_order_acquire);
+    }
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override;
+
+private:
+    ESPEmotionReader m_reader;
+    std::atomic<Detection> m_last;
+};
+
+//This checks for the Dendra's dialog box
+class ESPStartDetector : public VisualInferenceCallback{
+public:
+    ESPStartDetector();
+
+    bool detect(const ImageViewRGB32& frame);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override;
+
+private:
+    ImageFloatBox m_left_box;
+    ImageFloatBox m_right_box;
+};
+
+// This checks that Dendra's box vanished to shout the next emotion
+class ESPShowNewEmotionDetector : public VisualInferenceCallback{
+public:
+    ESPShowNewEmotionDetector();
+
+    bool detect(const ImageViewRGB32& frame);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override;
+
+private:
+    ImageFloatBox m_left_box;
+    ImageFloatBox m_right_box;
+};
+
+// Check that an emotion is pressed by looking for yellow in the lower right interface
+class ESPPressedEmotionDetector : public VisualInferenceCallback{
+public:
+    ESPPressedEmotionDetector();
+
+    bool detect(const ImageViewRGB32& frame);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override;
+
+private:
+    ImageFloatBox m_left_box;
+    ImageFloatBox m_right_box;
+    ImageFloatBox m_top_box;
+    ImageFloatBox m_bottom_box;
+};
+
+
+void add_tests_ESPEmotionDetector(UnitTestDatabase& database);
+
+
+}
+}
+}
+
+#endif
diff --git a/SerialPrograms/Source/PokemonSV/Inference/PokemonSV_MainMenuDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_MainMenuDetector.cpp
similarity index 79%
rename from SerialPrograms/Source/PokemonSV/Inference/PokemonSV_MainMenuDetector.cpp
rename to SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_MainMenuDetector.cpp
index 48fb5a0c6d..48d0a47461 100644
--- a/SerialPrograms/Source/PokemonSV/Inference/PokemonSV_MainMenuDetector.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_MainMenuDetector.cpp
@@ -1,15 +1,14 @@
 /*  Main Menu Detector
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include "Common/Cpp/Exceptions.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "CommonFramework/Exceptions/OperationFailedException.h"
-#include "CommonFramework/ImageTools/SolidColorTest.h"
-#include "CommonFramework/Tools/ConsoleHandle.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
 #include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonTools/Images/SolidColorTest.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
 #include "PokemonSV_MainMenuDetector.h"
 
 //#include <iostream>
@@ -34,7 +33,7 @@ void MainMenuDetector::make_overlays(VideoOverlaySet& items) const{
     m_arrow_right.make_overlays(items);
     m_dlc_icon.make_overlays(items);
 }
-bool MainMenuDetector::detect(const ImageViewRGB32& screen) const{
+bool MainMenuDetector::detect(const ImageViewRGB32& screen){
     //  Disambiguate against the Poke Portal.
     ImageStats bottom = image_stats(extract_box_reference(screen, m_bottom));
 //    cout << bottom.average << bottom.stddev << endl;
@@ -56,7 +55,7 @@ bool MainMenuDetector::detect(const ImageViewRGB32& screen) const{
     return false;
 }
 
-std::pair<MenuSide, int> MainMenuDetector::detect_location(const ImageViewRGB32& screen) const{
+std::pair<MenuSide, int> MainMenuDetector::detect_location(const ImageViewRGB32& screen){
     //  Disambiguate against the Poke Portal.
     ImageStats bottom = image_stats(extract_box_reference(screen, m_bottom));
     if (is_solid(bottom, {0.582218, 0.417782, 0.})){
@@ -92,12 +91,13 @@ std::pair<MenuSide, int> MainMenuDetector::detect_location(const ImageViewRGB32&
 
 
 bool MainMenuDetector::move_cursor(
-    const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context,
+    const ProgramInfo& info,
+    VideoStream& stream, ProControllerContext& context,
     MenuSide side, int row, bool fast
-) const{
+){
     if (side == MenuSide::NONE){
         throw InternalProgramError(
-            &console.logger(), PA_CURRENT_FUNCTION,
+            &stream.logger(), PA_CURRENT_FUNCTION,
             "MainMenuDetector::move_cursor() called with MenuSide::NONE."
         );
     }
@@ -107,7 +107,7 @@ bool MainMenuDetector::move_cursor(
     bool target_reached = false;
     while (true){
         context.wait_for_all_requests();
-        VideoSnapshot screen = console.video().snapshot();
+        VideoSnapshot screen = stream.video().snapshot();
         std::pair<MenuSide, int> current = this->detect_location(screen);
 
         {
@@ -124,16 +124,17 @@ bool MainMenuDetector::move_cursor(
                 break;
             }
             text += " " + std::to_string(current.second);
-            console.log(text);
+            stream.log(text);
         }
 
         //  Failed to detect menu.
         if (current.first == MenuSide::NONE){
             consecutive_detection_fails++;
             if (consecutive_detection_fails > 10){
-                throw OperationFailedException(
-                    ErrorReport::SEND_ERROR_REPORT, console,
+                OperationFailedExceptionWithScreenshot::fire(
+                    ErrorReportMode::SEND_ERROR_REPORT,
                     "MainMenuDetector::move_cursor(): Unable to detect menu.",
+                    stream,
                     screen
                 );
             }
@@ -142,8 +143,8 @@ bool MainMenuDetector::move_cursor(
         }
         consecutive_detection_fails = 0;
 
-        if (moves >= 10){
-            console.log("Unable to move to target after 10 moves.", COLOR_RED);
+        if (moves >= 20){
+            stream.log("Unable to move to target after 20 moves.", COLOR_RED);
             return false;
         }
 
@@ -166,9 +167,9 @@ bool MainMenuDetector::move_cursor(
         //  Wrong side.
         if (current.first != side){
             if (current.first == MenuSide::LEFT){
-                pbf_press_dpad(context, DPAD_RIGHT, 20, 10);
+                pbf_press_dpad(context, DPAD_RIGHT, 160ms, 80ms);
             }else{
-                pbf_press_dpad(context, DPAD_LEFT, 20, 10);
+                pbf_press_dpad(context, DPAD_LEFT, 160ms, 80ms);
             }
             continue;
         }
@@ -183,18 +184,18 @@ bool MainMenuDetector::move_cursor(
         if (diff < 4){
             if (fast){
                 for (int c = 0; c < diff - 1; c++){
-                    pbf_press_dpad(context, DPAD_UP, 10, 10);
+                    pbf_press_dpad(context, DPAD_UP, 80ms, 80ms);
                 }
             }
-            pbf_press_dpad(context, DPAD_UP, 20, 10);
+            pbf_press_dpad(context, DPAD_UP, 160ms, 80ms);
         }else{
             if (fast){
                 diff = rows - diff;
                 for (int c = 0; c < diff - 1; c++){
-                    pbf_press_dpad(context, DPAD_DOWN, 10, 10);
+                    pbf_press_dpad(context, DPAD_DOWN, 80ms, 80ms);
                 }
             }
-            pbf_press_dpad(context, DPAD_DOWN, 20, 10);
+            pbf_press_dpad(context, DPAD_DOWN, 160ms, 80ms);
         }
     }
 }
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_MainMenuDetector.h b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_MainMenuDetector.h
new file mode 100644
index 0000000000..c0f2b58987
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_MainMenuDetector.h
@@ -0,0 +1,78 @@
+/*  Main Menu Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_MainMenuDetector_H
+#define PokemonAutomation_PokemonSV_MainMenuDetector_H
+
+#include "Common/Cpp/Color.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/Tools/VideoStream.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+#include "CommonTools/VisualDetector.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_GradientArrowDetector.h"
+
+namespace PokemonAutomation{
+    struct ProgramInfo;
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+enum class MenuSide{
+    NONE,
+    LEFT,
+    RIGHT,
+};
+
+
+//  Detect the menu where your party is on the right while your main menu is on
+//  the right.
+class MainMenuDetector : public StaticScreenDetector{
+public:
+    MainMenuDetector(Color color = COLOR_RED);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+    //  Read where the cursor is.
+    //  The 2nd return value is the index. 0 is the top row. 6 is only valid on
+    //  the left side and is Koraidon/Miraidon.
+    std::pair<MenuSide, int> detect_location(const ImageViewRGB32& screen);
+
+    //  While sitting on the menu, move the cursor to the desired slot.
+    //  Returns true if success.
+    //  If (fast = true) it will be faster, but may be unreliable. It may not
+    //  actually land on the desired slot if the capture card is slow.
+    bool move_cursor(
+        const ProgramInfo& info,
+        VideoStream& stream, ProControllerContext& context,
+        MenuSide side, int row, bool fast = false
+    );
+
+
+protected:
+    Color m_color;
+    ImageFloatBox m_bottom;
+    GradientArrowDetector m_arrow_left;
+    GradientArrowDetector m_arrow_right;
+    GradientArrowDetector m_dlc_icon;
+};
+class MainMenuWatcher : public DetectorToFinder<MainMenuDetector>{
+public:
+    MainMenuWatcher(Color color = COLOR_RED)
+         : DetectorToFinder("MainMenuWatcher", std::chrono::milliseconds(250), color)
+    {}
+};
+
+
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_MenuOptionReader.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_MenuOptionReader.cpp
new file mode 100644
index 0000000000..1ff5983ee9
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_MenuOptionReader.cpp
@@ -0,0 +1,45 @@
+/*  Menu Option Reader
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "PokemonSV_MenuOptionReader.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+MenuOptionReader& MenuOptionReader::instance(){
+    static MenuOptionReader reader;
+    return reader;
+}
+
+MenuOptionReader::MenuOptionReader()
+    : SmallDictionaryMatcher("PokemonSV/MenuOptionsOCR.json")
+{}
+
+OCR::StringMatchResult MenuOptionReader::read_substring(
+    Logger& logger,
+    Language language,
+    const ImageViewRGB32& image,
+    const std::vector<OCR::TextColorRange>& text_color_ranges,
+    double min_text_ratio, double max_text_ratio
+) const{
+    return match_substring_from_image_multifiltered(
+        &logger, language, image, text_color_ranges,
+        MAX_LOG10P, MAX_LOG10P_SPREAD, min_text_ratio, max_text_ratio
+    );
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_MenuOptionReader.h b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_MenuOptionReader.h
new file mode 100644
index 0000000000..e2307af9b9
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_MenuOptionReader.h
@@ -0,0 +1,40 @@
+/*  Menu Option Reader
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_MenuOptionReader_H
+#define PokemonAutomation_PokemonSV_MenuOptionReader_H
+
+#include "CommonFramework/Language.h"
+#include "CommonTools/OCR/OCR_SmallDictionaryMatcher.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+class MenuOptionReader : public OCR::SmallDictionaryMatcher{
+    static constexpr double MAX_LOG10P = -1.30;
+    static constexpr double MAX_LOG10P_SPREAD = 0.50;
+
+public:
+    MenuOptionReader();
+
+    static MenuOptionReader& instance();
+
+    OCR::StringMatchResult read_substring(
+        Logger& logger,
+        Language language,
+        const ImageViewRGB32& image,
+        const std::vector<OCR::TextColorRange>& text_color_ranges,
+        double min_text_ratio = 0.01, double max_text_ratio = 0.50
+    ) const;
+};    
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/PokemonSV/Inference/PokemonSV_MoneyReader.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_MoneyReader.cpp
similarity index 75%
rename from SerialPrograms/Source/PokemonSV/Inference/PokemonSV_MoneyReader.cpp
rename to SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_MoneyReader.cpp
index 5a8b5f52a5..2411710731 100644
--- a/SerialPrograms/Source/PokemonSV/Inference/PokemonSV_MoneyReader.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_MoneyReader.cpp
@@ -1,73 +1,75 @@
-/*  Money Reader
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <regex>
-#include "Common/Cpp/AbstractLogger.h"
-#include "CommonFramework/Language.h"
-#include "CommonFramework/OCR/OCR_RawOCR.h"
-#include "PokemonSV_MoneyReader.h"
-
-//#include <iostream>
-//using std::cout;
-//using std::endl;
-
-namespace PokemonAutomation{
-namespace OCR{
-
-
-
-int read_money(Logger& logger, const ImageViewRGB32& image){
-    std::string ocr_text = OCR::ocr_read(Language::English, image);
-    std::string normalized;
-
-    //Clean up the string because regex search does not like accented characters
-    std::regex regg("[^a-zA-Z0-9\xA3, .]+");
-    ocr_text = std::regex_replace(ocr_text, regg, "");
-
-    //Find pound sign and amount, we want to prevent cases like the following:
-    //OCR Text: "Al IRt 1N} . !You got 27,200 in prize money!" -> "4127200" -> 4127200
-    //OCR Text: "You got 26,400 in prize money!AR -" -> "264004" -> 264004
-    //OCR Text: "v N r 1 .You got 26,400 in prize money!" -> "126400" -> 126400
-    std::regex reg{ "\xA3[a-zA-Z0-9,.]+| [0-9,. ]+\xA3" };
-    std::smatch match;
-    std::regex_search(ocr_text, match, reg);
-    std::ssub_match sub_match = match[0];
-
-    bool has_digit = false;
-    for (char ch : sub_match.str()) {
-        //  4 is commonly misread as A.
-        if (ch == 'a' || ch == 'A') {
-            normalized += '4';
-            has_digit = true;
-        }
-        if ('0' <= ch && ch <= '9') {
-            normalized += ch;
-            has_digit = true;
-        }
-    }
-
-    if (!has_digit) {
-        return -1;
-    }
-
-    int number = std::atoi(normalized.c_str());
-
-    std::string str;
-    for (char ch : ocr_text){
-        if (ch != '\r' && ch != '\n'){
-            str += ch;
-        }
-    }
-
-    logger.log("OCR Text: \"" + str + "\" -> \"" + sub_match.str() + "\" -> " + normalized + "\" -> " + std::to_string(number));
-
-    return number;
-}
-
-
-
-}
-}
+/*  Money Reader
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <regex>
+#include "Common/Cpp/Logging/AbstractLogger.h"
+#include "CommonFramework/Language.h"
+#include "CommonTools/OCR/OCR_Routines.h"
+#include "PokemonSV_MoneyReader.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace OCR{
+
+
+
+int read_money(Logger& logger, const ImageViewRGB32& image){
+    std::string ocr_text = OCR::ocr_read(Language::English, image);
+    std::string normalized;
+
+    //logger.log("OCR Text: " + ocr_text);
+
+    //Clean up the string because regex search does not like accented characters
+    std::regex regg("[^a-zA-Z0-9\xA3, .#]+");
+    ocr_text = std::regex_replace(ocr_text, regg, "");
+
+    //Find pound sign and amount, we want to prevent cases like the following:
+    //OCR Text: "Al IRt 1N} . !You got 27,200 in prize money!" -> "4127200" -> 4127200
+    //OCR Text: "You got 26,400 in prize money!AR -" -> "264004" -> 264004
+    //OCR Text: "v N r 1 .You got 26,400 in prize money!" -> "126400" -> 126400
+    std::regex reg{ "\xA3[a-zA-Z0-9,.]+| [0-9,. ]+(\xA3|#)" };
+    std::smatch match;
+    std::regex_search(ocr_text, match, reg);
+    std::ssub_match sub_match = match[0];
+
+    bool has_digit = false;
+    for (char ch : sub_match.str()){
+        //  4 is commonly misread as A.
+        if (ch == 'a' || ch == 'A'){
+            normalized += '4';
+            has_digit = true;
+        }
+        if ('0' <= ch && ch <= '9'){
+            normalized += ch;
+            has_digit = true;
+        }
+    }
+
+    if (!has_digit){
+        return -1;
+    }
+
+    int number = std::atoi(normalized.c_str());
+
+    std::string str;
+    for (char ch : ocr_text){
+        if (ch != '\r' && ch != '\n'){
+            str += ch;
+        }
+    }
+
+    logger.log("OCR Text: \"" + str + "\" -> \"" + sub_match.str() + "\" -> " + normalized + "\" -> " + std::to_string(number));
+
+    return number;
+}
+
+
+
+}
+}
diff --git a/SerialPrograms/Source/PokemonSV/Inference/PokemonSV_MoneyReader.h b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_MoneyReader.h
similarity index 82%
rename from SerialPrograms/Source/PokemonSV/Inference/PokemonSV_MoneyReader.h
rename to SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_MoneyReader.h
index 9415c52bec..d7989b8f71 100644
--- a/SerialPrograms/Source/PokemonSV/Inference/PokemonSV_MoneyReader.h
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_MoneyReader.h
@@ -1,22 +1,22 @@
-/*  Money Reader
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSV_MoneyReader_H
-#define PokemonAutomation_PokemonSV_MoneyReader_H
-
-namespace PokemonAutomation{
-    class Logger;
-    class ImageViewRGB32;
-namespace OCR{
-
-
-//  Returns -1 if no number is found.
-int read_money(Logger& logger, const ImageViewRGB32& image);
-
-
-}
-}
-#endif
+/*  Money Reader
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_MoneyReader_H
+#define PokemonAutomation_PokemonSV_MoneyReader_H
+
+namespace PokemonAutomation{
+    class Logger;
+    class ImageViewRGB32;
+namespace OCR{
+
+
+//  Returns -1 if no number is found.
+int read_money(Logger& logger, const ImageViewRGB32& image);
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/PokemonSV/Inference/PokemonSV_PokePortalDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_PokePortalDetector.cpp
similarity index 80%
rename from SerialPrograms/Source/PokemonSV/Inference/PokemonSV_PokePortalDetector.cpp
rename to SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_PokePortalDetector.cpp
index 6837fda82e..a2debc21da 100644
--- a/SerialPrograms/Source/PokemonSV/Inference/PokemonSV_PokePortalDetector.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_PokePortalDetector.cpp
@@ -1,15 +1,14 @@
 /*  Poke Portal Detector
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include "Common/Cpp/Exceptions.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "CommonFramework/ImageTools/SolidColorTest.h"
-#include "CommonFramework/Tools/ConsoleHandle.h"
 #include "CommonFramework/Tools/ErrorDumper.h"
 #include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonTools/Images/SolidColorTest.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
 #include "PokemonSV_PokePortalDetector.h"
 
 namespace PokemonAutomation{
@@ -30,7 +29,7 @@ void PokePortalDetector::make_overlays(VideoOverlaySet& items) const{
     m_arrow_tera.make_overlays(items);
     m_arrow_bottom.make_overlays(items);
 }
-bool PokePortalDetector::detect(const ImageViewRGB32& screen) const{
+bool PokePortalDetector::detect(const ImageViewRGB32& screen){
     ImageStats bottom = image_stats(extract_box_reference(screen, m_bottom));
     if (!is_solid(bottom, {0.582218, 0.417782, 0.})){
         return false;
@@ -48,7 +47,7 @@ bool PokePortalDetector::detect(const ImageViewRGB32& screen) const{
 
     return false;
 }
-int PokePortalDetector::detect_location(const ImageViewRGB32& screen) const{
+int PokePortalDetector::detect_location(const ImageViewRGB32& screen){
     ImageStats bottom = image_stats(extract_box_reference(screen, m_bottom));
     if (!is_solid(bottom, {0.582218, 0.417782, 0.})){
         return -1;
@@ -77,12 +76,12 @@ int PokePortalDetector::detect_location(const ImageViewRGB32& screen) const{
 
 
 bool PokePortalDetector::move_cursor(
-    const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context,
+    const ProgramInfo& info, VideoStream& stream, ProControllerContext& context,
     int row
-) const{
+){
     if (row < 0 || row >= 7){
         throw InternalProgramError(
-            &console.logger(), PA_CURRENT_FUNCTION,
+            &stream.logger(), PA_CURRENT_FUNCTION,
             "PokePortalDetector::move_cursor() called with invalid row."
         );
     }
@@ -92,7 +91,7 @@ bool PokePortalDetector::move_cursor(
     bool target_reached = false;
     while (true){
         context.wait_for_all_requests();
-        VideoSnapshot screen = console.video().snapshot();
+        VideoSnapshot screen = stream.video().snapshot();
         int current = this->detect_location(screen);
 
         //  Failed to detect menu.
@@ -100,7 +99,7 @@ bool PokePortalDetector::move_cursor(
             consecutive_detection_fails++;
             if (consecutive_detection_fails > 10){
                 dump_image_and_throw_recoverable_exception(
-                    info, console, "UnableToDetectPokePortal",
+                    info, stream, "UnableToDetectPokePortal",
                     "Unable to detect Poke Portal."
                 );
             }
@@ -110,7 +109,7 @@ bool PokePortalDetector::move_cursor(
         consecutive_detection_fails = 0;
 
         if (moves >= 10){
-            console.log("Unable to move to target after 10 moves.", COLOR_RED);
+            stream.log("Unable to move to target after 10 moves.", COLOR_RED);
             return false;
         }
 
@@ -132,9 +131,9 @@ bool PokePortalDetector::move_cursor(
 
         int diff = (7 + current - row) % 7;
         if (diff < 4){
-            pbf_press_dpad(context, DPAD_UP, 20, 10);
+            pbf_press_dpad(context, DPAD_UP, 160ms, 80ms);
         }else{
-            pbf_press_dpad(context, DPAD_DOWN, 20, 10);
+            pbf_press_dpad(context, DPAD_DOWN, 160ms, 80ms);
         }
     }
 }
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_PokePortalDetector.h b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_PokePortalDetector.h
new file mode 100644
index 0000000000..a65b66a47f
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_PokePortalDetector.h
@@ -0,0 +1,61 @@
+/*  Poke Portal Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_PokePortalDetector_H
+#define PokemonAutomation_PokemonSV_PokePortalDetector_H
+
+#include "Common/Cpp/Color.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/Tools/VideoStream.h"
+#include "CommonTools/VisualDetector.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_GradientArrowDetector.h"
+
+namespace PokemonAutomation{
+    struct ProgramInfo;
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+class PokePortalDetector : public StaticScreenDetector{
+public:
+    PokePortalDetector(Color color = COLOR_RED);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+    //  Read where the cursor is. Returns -1 on failure.
+    int detect_location(const ImageViewRGB32& screen);
+
+    //  While sitting on the menu, move the cursor to the desired slot.
+    //  Returns true if success.
+    bool move_cursor(
+        const ProgramInfo& info, VideoStream& stream, ProControllerContext& context,
+        int row
+    );
+
+
+private:
+    Color m_color;
+    ImageFloatBox m_bottom;
+    GradientArrowDetector m_arrow_union;
+    GradientArrowDetector m_arrow_tera;
+    GradientArrowDetector m_arrow_bottom;
+};
+class PokePortalWatcher : public DetectorToFinder<PokePortalDetector>{
+public:
+    PokePortalWatcher(Color color = COLOR_RED)
+         : DetectorToFinder("PokePortalWatcher", std::chrono::milliseconds(250), color)
+    {}
+};
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_PokemonMovesReader.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_PokemonMovesReader.cpp
new file mode 100644
index 0000000000..0ef47c255d
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_PokemonMovesReader.cpp
@@ -0,0 +1,90 @@
+/*  Pokemon Moves Reader
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Exceptions/OperationFailedException.h"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "PokemonSV_PokemonMovesReader.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+PokemonMovesOCR& PokemonMovesOCR::instance(){
+    static PokemonMovesOCR reader;
+    return reader;
+}
+
+PokemonMovesOCR::PokemonMovesOCR()
+    : SmallDictionaryMatcher("PokemonSV/PokemonMovesOCR.json")
+{}
+
+OCR::StringMatchResult PokemonMovesOCR::read_substring(
+    Logger& logger,
+    Language language,
+    const ImageViewRGB32& image,
+    const std::vector<OCR::TextColorRange>& text_color_ranges,
+    double min_text_ratio, double max_text_ratio
+) const{
+    return match_substring_from_image_multifiltered(
+        &logger, language, image, text_color_ranges,
+        MAX_LOG10P, MAX_LOG10P_SPREAD, min_text_ratio, max_text_ratio
+    );
+}
+
+PokemonMovesReader::PokemonMovesReader(Language language)
+    : m_language(language)
+{
+    for (size_t c = 0; c < 4; c++){
+        m_boxes_rearrange[c] = ImageFloatBox(0.345, 0.245 + c * 0.074, 0.250, 0.065); 
+    }
+}
+
+void PokemonMovesReader::make_overlays(VideoOverlaySet& items) const{
+    for (size_t c = 0; c < 4; c++){
+        items.add(COLOR_GREEN, m_boxes_rearrange[c]);
+    }
+}
+
+std::string PokemonMovesReader::read_move(Logger& logger, const ImageViewRGB32& screen, int8_t index) const{
+    ImageViewRGB32 cropped = extract_box_reference(screen, m_boxes_rearrange[index]);
+    const auto ocr_result = PokemonMovesOCR::instance().read_substring(
+        logger, m_language, 
+        cropped, OCR::BLACK_OR_WHITE_TEXT_FILTERS()
+    );
+
+    std::multimap<double, OCR::StringMatchData> results;
+    if (!ocr_result.results.empty()){
+        for (const auto& result : ocr_result.results){
+            results.emplace(result.first, result.second);
+        }
+    }
+
+    if (results.empty()){
+        return "";
+    }
+
+    if (results.size() > 1){
+        throw_and_log<OperationFailedException>(
+            logger, ErrorReportMode::SEND_ERROR_REPORT,
+            "MenuOption::read_option(): Unable to read item. Ambiguous or multiple results.\n" + language_warning(m_language)
+        );
+    }
+
+    return results.begin()->second.token;
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_PokemonMovesReader.h b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_PokemonMovesReader.h
new file mode 100644
index 0000000000..3df38bbf2d
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_PokemonMovesReader.h
@@ -0,0 +1,58 @@
+/*  Pokemon Moves Reader
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_PokemonMovesReader_H
+#define PokemonAutomation_PokemonSV_PokemonMovesReader_H
+
+#include <array>
+#include "CommonFramework/Language.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/OCR/OCR_SmallDictionaryMatcher.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+class PokemonMovesOCR : public OCR::SmallDictionaryMatcher{
+    static constexpr double MAX_LOG10P = -1.30;
+    static constexpr double MAX_LOG10P_SPREAD = 0.50;
+
+public:
+    PokemonMovesOCR();
+
+    static PokemonMovesOCR& instance();
+
+    OCR::StringMatchResult read_substring(
+        Logger& logger,
+        Language language,
+        const ImageViewRGB32& image,
+        const std::vector<OCR::TextColorRange>& text_color_ranges,
+        double min_text_ratio = 0.01, double max_text_ratio = 0.50
+    ) const;
+
+    
+};    
+
+class PokemonMovesReader{
+
+public:
+    PokemonMovesReader(Language language);
+
+    void make_overlays(VideoOverlaySet& items) const;
+
+    std::string read_move(Logger& logger, const ImageViewRGB32& screen, int8_t index) const;
+
+private:
+    Language m_language;
+    std::array<ImageFloatBox, 4> m_boxes_rearrange;
+};
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_PokemonSummaryReader.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_PokemonSummaryReader.cpp
new file mode 100644
index 0000000000..7f7f791082
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_PokemonSummaryReader.cpp
@@ -0,0 +1,102 @@
+/*  Pokemon Summary Reader
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Images/SolidColorTest.h"
+#include "PokemonSV_PokemonSummaryReader.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+bool is_summary_color(const ImageStats& stats){
+    return is_solid(stats, {0.648549, 0.2861580, 0.0652928}, 0.15, 25)  //  Scarlet
+        || is_solid(stats, {0.367816, 0.0746615, 0.5575230}, 0.15, 25)  //  Violet
+        || is_solid(stats, {0.196536, 0.5933000, 0.2101630}, 0.18, 25)  //  DLC1 Green
+        || is_solid(stats, {0.169492, 0.330508 , 0.5      }, 0.18, 25)  //  DLC2 Dark Blue
+        || (stats.average.g / stats.average.sum()) > 0.5;
+}
+
+
+
+PokemonSummaryDetector::PokemonSummaryDetector(Color color)
+    : m_color(color)
+    , m_top_blue_left(0.30, 0.09, 0.10, 0.05)
+    , m_top_blue_right(0.60, 0.09, 0.35, 0.05)
+    , m_bottom(0.03, 0.94, 0.40, 0.04)
+    , m_arrow_left(color, WhiteButton::ButtonLeft, {0.415, 0.085, 0.035, 0.057})
+    , m_arrow_right(color, WhiteButton::ButtonRight, {0.553, 0.085, 0.035, 0.057})
+    , m_shiny_symbol(0.575, 0.865, 0.017, 0.030)
+{}
+void PokemonSummaryDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_top_blue_left);
+    items.add(m_color, m_top_blue_right);
+    items.add(m_color, m_bottom);
+    m_arrow_left.make_overlays(items);
+    m_arrow_right.make_overlays(items);
+    items.add(m_color, m_shiny_symbol);
+}
+bool PokemonSummaryDetector::detect(const ImageViewRGB32& screen){
+    ImageStats top_blue_left = image_stats(extract_box_reference(screen, m_top_blue_left));
+//    cout << top_blue_left.average << top_blue_left.stddev << endl;
+    if (!is_solid(top_blue_left, {0.0745162, 0.311321, 0.614163}, 0.30, 10)){
+//        cout << "bad: blue left" << endl;
+        return false;
+    }
+
+    ImageStats top_blue_right = image_stats(extract_box_reference(screen, m_top_blue_right));
+//    cout << top_blue_right.average << top_blue_right.stddev << endl;
+    if (!is_solid(top_blue_right, {0.0745162, 0.311321, 0.614163}, 0.30, 10)){
+//        cout << "bad: blue right" << endl;
+        return false;
+    }
+
+    ImageStats bottom = image_stats(extract_box_reference(screen, m_bottom));
+//    cout << bottom.average << bottom.stddev << endl;
+#if 0
+    if (bottom.stddev.sum() > 20){
+        return false;
+    }
+#else
+    if (!is_summary_color(bottom)){
+//        cout << "bad summary color" << endl;
+        return false;
+    }
+#endif
+
+    if (!m_arrow_left.detect(screen)){
+//        cout << "bad arrow left" << endl;
+        return false;
+    }
+    if (!m_arrow_right.detect(screen)){
+//        cout << "bad arrow right" << endl;
+        return false;
+    }
+
+//    ImageStats shiny_symbol = image_stats(extract_box_reference(screen, m_shiny_symbol));
+//    cout << shiny_symbol.average << shiny_symbol.stddev << endl;
+
+    return true;
+}
+bool PokemonSummaryDetector::is_shiny(const ImageViewRGB32& screen) const{
+    ImageStats shiny = image_stats(extract_box_reference(screen, m_shiny_symbol));
+    return shiny.stddev.sum() > 100;
+}
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_PokemonSummaryReader.h b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_PokemonSummaryReader.h
new file mode 100644
index 0000000000..880941ace6
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_PokemonSummaryReader.h
@@ -0,0 +1,58 @@
+/*  Pokemon Summary Reader
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_PokemonSummaryReader_H
+#define PokemonAutomation_PokemonSV_PokemonSummaryReader_H
+
+#include "Common/Cpp/Color.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonTools/VisualDetector.h"
+#include "PokemonSV_WhiteButtonDetector.h"
+
+namespace PokemonAutomation{
+    struct ImageStats;
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+bool is_summary_color(const ImageStats& stats);
+
+
+// Detect pokemon status summary page
+class PokemonSummaryDetector : public StaticScreenDetector{
+public:
+    PokemonSummaryDetector(Color color = COLOR_RED);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+    bool is_shiny(const ImageViewRGB32& screen) const;
+
+
+protected:
+    Color m_color;
+    ImageFloatBox m_top_blue_left;
+    ImageFloatBox m_top_blue_right;
+    ImageFloatBox m_bottom;
+
+    WhiteButtonDetector m_arrow_left;
+    WhiteButtonDetector m_arrow_right;
+
+    ImageFloatBox m_shiny_symbol;
+};
+class PokemonSummaryWatcher : public DetectorToFinder<PokemonSummaryDetector>{
+public:
+    PokemonSummaryWatcher(Color color = COLOR_RED)
+         : DetectorToFinder("PokemonSummaryWatcher", std::chrono::milliseconds(250), color)
+    {}
+};
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_StatHexagonReader.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_StatHexagonReader.cpp
new file mode 100644
index 0000000000..2806843d40
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_StatHexagonReader.cpp
@@ -0,0 +1,278 @@
+/*  Stat Hexagon Reader
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Kernels/Waterfill/Kernels_Waterfill_Session.h"
+#include "CommonFramework/Exceptions/OperationFailedException.h"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/ImageTools/ImageStats.h"
+#include "CommonTools/Images/ImageFilter.h"
+#include "CommonTools/Images/BinaryImage_FilterRgb32.h"
+#include "CommonTools/OCR/OCR_NumberReader.h"
+#include "PokemonSV_StatHexagonReader.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+StatHexagonReader::StatHexagonReader(
+    Color color,
+    const ImageFloatBox& level,
+    const ImageFloatBox& ball_attack,
+    const ImageFloatBox& ball_defense,
+    const ImageFloatBox& ball_spatk,
+    const ImageFloatBox& ball_spdef,
+    const ImageFloatBox& ball_speed,
+    const ImageFloatBox& stat_hp,
+    const ImageFloatBox& stat_attack,
+    const ImageFloatBox& stat_defense,
+    const ImageFloatBox& stat_spatk,
+    const ImageFloatBox& stat_spdef,
+    const ImageFloatBox& stat_speed
+)
+    : m_color(color)
+    , m_level(level)
+    , m_ball_attack(ball_attack)
+    , m_ball_defense(ball_defense)
+    , m_ball_spatk(ball_spatk)
+    , m_ball_spdef(ball_spdef)
+    , m_ball_speed(ball_speed)
+    , m_stat_hp(stat_hp)
+    , m_stat_attack(stat_attack)
+    , m_stat_defense(stat_defense)
+    , m_stat_spatk(stat_spatk)
+    , m_stat_spdef(stat_spdef)
+    , m_stat_speed(stat_speed)
+{}
+void StatHexagonReader::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_level);
+    items.add(m_color, m_ball_attack);
+    items.add(m_color, m_ball_defense);
+    items.add(m_color, m_ball_spatk);
+    items.add(m_color, m_ball_spdef);
+    items.add(m_color, m_ball_speed);
+    items.add(m_color, m_stat_hp);
+    items.add(m_color, m_stat_attack);
+    items.add(m_color, m_stat_defense);
+    items.add(m_color, m_stat_spatk);
+    items.add(m_color, m_stat_spdef);
+    items.add(m_color, m_stat_speed);
+}
+NatureAdjustment StatHexagonReader::read_stat_adjustment(ImageStats& stats, const ImageFloatBox& box, const ImageViewRGB32& screen) const{
+    using namespace Kernels::Waterfill;
+
+    ImageViewRGB32 region = extract_box_reference(screen, box);
+
+//    cout << "--------------" << endl;
+    {
+        auto matrix = compress_rgb32_to_binary_range(region, 0xffc0c0c0, 0xffffffff);
+        auto session = make_WaterfillSession(matrix);
+        auto iter = session->make_iterator(20);
+
+        WaterfillObject object;
+        while (iter->find_next(object, false)){
+//            cout << object.area << " : " << object.width() << " x " << object.height()
+//                 << ", aspect = " << object.aspect_ratio() << ", area ratio = " << object.area_ratio() << endl;
+
+            double aspect_ratio = object.aspect_ratio();
+            if (!(0.8 < aspect_ratio && aspect_ratio < 1.2)){
+                continue;
+            }
+            if (object.area_ratio() < 0.65){
+                continue;
+            }
+
+            return NatureAdjustment::NEUTRAL;
+        }
+    }
+
+    stats = image_stats(region);
+//    cout << stats.average << "," << stats.stddev << endl;
+
+    return stats.average.r > stats.average.b
+        ? NatureAdjustment::POSITIVE
+        : NatureAdjustment::NEGATIVE;
+}
+NatureAdjustments StatHexagonReader::read_nature(Logger& logger, const ImageViewRGB32& screen) const{
+    NatureAdjustments ret;
+
+    std::vector<std::pair<NatureAdjustment*, ImageStats>> non_neutral;
+
+    ImageStats stats;
+
+    ret.attack  = read_stat_adjustment(stats, m_ball_attack, screen);
+    if (ret.attack != NatureAdjustment::NEUTRAL){
+        non_neutral.emplace_back(&ret.attack, stats);
+    }
+
+    ret.defense = read_stat_adjustment(stats, m_ball_defense, screen);
+    if (ret.defense != NatureAdjustment::NEUTRAL){
+        non_neutral.emplace_back(&ret.defense, stats);
+    }
+
+    ret.spatk   = read_stat_adjustment(stats, m_ball_spatk, screen);
+    if (ret.spatk != NatureAdjustment::NEUTRAL){
+        non_neutral.emplace_back(&ret.spatk, stats);
+    }
+
+    ret.spdef   = read_stat_adjustment(stats, m_ball_spdef, screen);
+    if (ret.spdef != NatureAdjustment::NEUTRAL){
+        non_neutral.emplace_back(&ret.spdef, stats);
+    }
+
+    ret.speed   = read_stat_adjustment(stats, m_ball_speed, screen);
+    if (ret.speed != NatureAdjustment::NEUTRAL){
+        non_neutral.emplace_back(&ret.speed, stats);
+    }
+
+    if (non_neutral.size() == 0){
+        return ret;
+    }
+    if (non_neutral.size() != 2){
+        throw_and_log<OperationFailedException>(
+            logger, ErrorReportMode::SEND_ERROR_REPORT,
+            "Unable to read nature."
+        );
+    }
+
+    if (*non_neutral[0].first != *non_neutral[1].first){
+        return ret;
+    }
+
+//    cout << non_neutral[0].second.average << non_neutral[1].second.average << endl;
+
+    if (non_neutral[0].second.average.r > non_neutral[1].second.average.r &&
+        non_neutral[0].second.average.b < non_neutral[1].second.average.b
+    ){
+        *non_neutral[0].first = NatureAdjustment::POSITIVE;
+        *non_neutral[1].first = NatureAdjustment::NEGATIVE;
+        return ret;
+    }
+    if (non_neutral[0].second.average.r < non_neutral[1].second.average.r &&
+        non_neutral[0].second.average.b > non_neutral[1].second.average.b
+    ){
+        *non_neutral[0].first = NatureAdjustment::NEGATIVE;
+        *non_neutral[1].first = NatureAdjustment::POSITIVE;
+        return ret;
+    }
+
+    throw_and_log<OperationFailedException>(
+        logger, ErrorReportMode::SEND_ERROR_REPORT,
+        "Unable to read nature."
+    );
+}
+
+
+int8_t StatHexagonReader::read_level(Logger& logger, const ImageViewRGB32& screen) const{
+    ImageViewRGB32 region = extract_box_reference(screen, m_level);
+#if 0
+    ImageRGB32 filtered = to_blackwhite_rgb32_range(region, 0xff808080, 0xffffffff, true);
+    filtered = pad_image(filtered, filtered.height() / 2, 0xffffffff);
+
+    int number = OCR::read_number(logger, filtered);
+#else
+    int number = OCR::read_number_waterfill(logger, region, 0xff808080, 0xffffffff);
+#endif
+    if (number < 0 || number > 100){
+        number = -1;
+    }
+    return (int8_t)number;
+}
+int16_t StatHexagonReader::read_stat(Logger& logger, const ImageFloatBox& box, const ImageViewRGB32& screen) const{
+    ImageViewRGB32 region = extract_box_reference(screen, box);
+#if 0
+    ImageRGB32 filtered = to_blackwhite_rgb32_range(region, 0xff808080, 0xffffffff, true);
+    filtered = pad_image(filtered, filtered.height() / 2, 0xffffffff);
+
+//    static int c = 0;
+//    filtered.save("test-" + std::to_string(c++) + ".png");
+
+    int number = OCR::read_number_waterfill(logger, filtered);
+#else
+    int number = OCR::read_number_waterfill(logger, region, 0xff808080, 0xffffffff);
+#endif
+    if (number < 5 || number > 999){
+        number = -1;
+    }
+    return (int16_t)number;
+}
+StatReads StatHexagonReader::read_stats(Logger& logger, const ImageViewRGB32& screen) const{
+    StatReads ret;
+
+    //  TODO: Handle the slash. (99 / 100)
+    ret.hp      = read_stat(logger, m_stat_hp, screen);
+
+    ret.attack  = read_stat(logger, m_stat_attack, screen);
+    ret.defense = read_stat(logger, m_stat_defense, screen);
+    ret.spatk   = read_stat(logger, m_stat_spatk, screen);
+    ret.spdef   = read_stat(logger, m_stat_spdef, screen);
+    ret.speed   = read_stat(logger, m_stat_speed, screen);
+    return ret;
+}
+IvRanges StatHexagonReader::calc_ivs(
+    Logger& logger, const ImageViewRGB32& screen,
+    const BaseStats& base_stats, const EVs& evs
+) const{
+    int16_t level = read_level(logger, screen);
+    NatureAdjustments nature = read_nature(logger, screen);
+    StatReads stats = read_stats(logger, screen);
+    return calc_iv_ranges(base_stats, (uint8_t)level, evs, stats, nature);
+}
+
+
+
+#if 0
+BoxStatsReader::BoxStatsReader(Color color)
+    : StatHexagonReader(
+        color,
+//        {0.823, 0.244, 0.012, 0.022},
+        {0.875, 0.294, 0.012, 0.022},
+        {0.875, 0.402, 0.012, 0.022},
+        {0.771, 0.294, 0.012, 0.022},
+        {0.771, 0.402, 0.012, 0.022},
+        {0.823, 0.453, 0.012, 0.022},
+        {0.828, 0.198, 0.080, 0.045},
+        {0.890, 0.408, 0.050, 0.045},
+        {0.890, 0.198, 0.050, 0.045},
+        {0.720, 0.408, 0.050, 0.045},
+        {0.720, 0.198, 0.050, 0.045},
+        {0.828, 0.475, 0.050, 0.045}
+    )
+{}
+#endif
+
+SummaryStatsReader::SummaryStatsReader(Color color)
+    : StatHexagonReader(
+        color,
+        {0.125, 0.860, 0.050, 0.044},
+//        {0.755, 0.253, 0.012, 0.022},
+        {0.834, 0.335, 0.012, 0.022},
+        {0.834, 0.483, 0.012, 0.022},
+        {0.677, 0.335, 0.012, 0.022},
+        {0.677, 0.483, 0.012, 0.022},
+        {0.755, 0.565, 0.012, 0.022},
+        {0.767, 0.205, 0.040, 0.050},
+        {0.848, 0.340, 0.040, 0.050},
+        {0.848, 0.520, 0.040, 0.050},
+        {0.637, 0.340, 0.040, 0.050},
+        {0.637, 0.520, 0.040, 0.050},
+        {0.742, 0.620, 0.040, 0.050}
+    )
+{}
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_StatHexagonReader.h b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_StatHexagonReader.h
new file mode 100644
index 0000000000..d37a27a252
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_StatHexagonReader.h
@@ -0,0 +1,98 @@
+/*  Stat Hexagon Reader
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_StatHexagonReader_H
+#define PokemonAutomation_PokemonSV_StatHexagonReader_H
+
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "Pokemon/Pokemon_StatsCalculation.h"
+#include "Pokemon/Pokemon_NatureChecker.h"
+
+namespace PokemonAutomation{
+
+class Logger;
+struct ImageStats;
+
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+using namespace Pokemon;
+
+
+
+class StatHexagonReader{
+public:
+    StatHexagonReader(
+        Color color,
+        const ImageFloatBox& level,
+        const ImageFloatBox& ball_attack,
+        const ImageFloatBox& ball_defense,
+        const ImageFloatBox& ball_spatk,
+        const ImageFloatBox& ball_spdef,
+        const ImageFloatBox& ball_speed,
+        const ImageFloatBox& stat_hp,
+        const ImageFloatBox& stat_attack,
+        const ImageFloatBox& stat_defense,
+        const ImageFloatBox& stat_spatk,
+        const ImageFloatBox& stat_spdef,
+        const ImageFloatBox& stat_speed
+    );
+
+    void make_overlays(VideoOverlaySet& items) const;
+
+    NatureAdjustments read_nature(Logger& logger, const ImageViewRGB32& screen) const;
+    int8_t read_level(Logger& logger, const ImageViewRGB32& screen) const;
+    StatReads read_stats(Logger& logger, const ImageViewRGB32& screen) const;
+    IvRanges calc_ivs(
+        Logger& logger, const ImageViewRGB32& screen,
+        const BaseStats& base_stats, const EVs& evs = EVs()
+    ) const;
+
+
+private:
+    NatureAdjustment read_stat_adjustment(ImageStats& stats, const ImageFloatBox& box, const ImageViewRGB32& screen) const;
+    int16_t read_stat(Logger& logger, const ImageFloatBox& box, const ImageViewRGB32& screen) const;
+
+
+private:
+    Color m_color;
+
+    ImageFloatBox m_level;
+
+//    ImageFloatBox m_ball_hp;
+    ImageFloatBox m_ball_attack;
+    ImageFloatBox m_ball_defense;
+    ImageFloatBox m_ball_spatk;
+    ImageFloatBox m_ball_spdef;
+    ImageFloatBox m_ball_speed;
+
+    ImageFloatBox m_stat_hp;
+    ImageFloatBox m_stat_attack;
+    ImageFloatBox m_stat_defense;
+    ImageFloatBox m_stat_spatk;
+    ImageFloatBox m_stat_spdef;
+    ImageFloatBox m_stat_speed;
+};
+
+
+#if 0   //  This doesn't work due to HP and level reads being variable position.
+class BoxStatsReader : public StatHexagonReader{
+public:
+    BoxStatsReader(Color color = COLOR_RED);
+};
+#endif
+
+class SummaryStatsReader : public StatHexagonReader{
+public:
+    SummaryStatsReader(Color color = COLOR_RED);
+};
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/PokemonSV/Inference/PokemonSV_SweatBubbleDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_SweatBubbleDetector.cpp
similarity index 80%
rename from SerialPrograms/Source/PokemonSV/Inference/PokemonSV_SweatBubbleDetector.cpp
rename to SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_SweatBubbleDetector.cpp
index fbda33ee53..db46c330f2 100644
--- a/SerialPrograms/Source/PokemonSV/Inference/PokemonSV_SweatBubbleDetector.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_SweatBubbleDetector.cpp
@@ -1,16 +1,15 @@
 /*  Sweat Bubble Detector
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include "Kernels/Waterfill/Kernels_Waterfill_Session.h"
-#include "CommonFramework/Globals.h"
+#include "CommonFramework/GlobalAutoPaths.h"
 #include "CommonFramework/ImageTypes/ImageViewRGB32.h"
-#include "CommonFramework/ImageTypes/BinaryImage.h"
-#include "CommonFramework/ImageTools/BinaryImage_FilterRgb32.h"
 #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
-#include "CommonFramework/ImageMatch/ExactImageMatcher.h"
+#include "CommonTools/Images/BinaryImage_FilterRgb32.h"
+#include "CommonTools/ImageMatch/ExactImageMatcher.h"
 #include "PokemonSV_SweatBubbleDetector.h"
 
 //#include <iostream>
@@ -36,7 +35,7 @@ SweatBubbleDetector::SweatBubbleDetector(Color color, const ImageFloatBox& box)
 void SweatBubbleDetector::make_overlays(VideoOverlaySet& items) const{
     items.add(m_color, m_box);
 }
-bool SweatBubbleDetector::detect(const ImageViewRGB32& screen) const{
+bool SweatBubbleDetector::detect(const ImageViewRGB32& screen){
     using namespace Kernels::Waterfill;
 
     ImageViewRGB32 region = extract_box_reference(screen, m_box);
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_SweatBubbleDetector.h b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_SweatBubbleDetector.h
new file mode 100644
index 0000000000..6a2e1a40a5
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_SweatBubbleDetector.h
@@ -0,0 +1,45 @@
+/*  Sweat Bubble Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_SweatBubbleDetector_H
+#define PokemonAutomation_PokemonSV_SweatBubbleDetector_H
+
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+#include "CommonTools/VisualDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+class SweatBubbleDetector : public StaticScreenDetector{
+public:
+    SweatBubbleDetector(Color color, const ImageFloatBox& box = {0.11, 0.81, 0.06, 0.10});
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+protected:
+    Color m_color;
+    ImageFloatBox m_box;
+};
+class SweatBubbleWatcher : public DetectorToFinder<SweatBubbleDetector>{
+public:
+    SweatBubbleWatcher(Color color = COLOR_RED)
+         : DetectorToFinder("SweatBubbleWatcher", std::chrono::milliseconds(100), color)
+    {}
+};
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/PokemonSV/Inference/PokemonSV_TournamentPrizeNameReader.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_TournamentPrizeNameReader.cpp
similarity index 80%
rename from SerialPrograms/Source/PokemonSV/Inference/PokemonSV_TournamentPrizeNameReader.cpp
rename to SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_TournamentPrizeNameReader.cpp
index b629296e3d..9ac374bc17 100644
--- a/SerialPrograms/Source/PokemonSV/Inference/PokemonSV_TournamentPrizeNameReader.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_TournamentPrizeNameReader.cpp
@@ -1,39 +1,38 @@
-/*  Tournament Prize Name Reader
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/OCR/OCR_RawOCR.h"
-#include "PokemonSV_TournamentPrizeNameReader.h"
-
-namespace PokemonAutomation {
-namespace NintendoSwitch {
-namespace PokemonSV {
-
-TournamentPrizeNameReader& TournamentPrizeNameReader::instance() {
-    static TournamentPrizeNameReader reader;
-    return reader;
-}
-
-
-TournamentPrizeNameReader::TournamentPrizeNameReader()
-    : SmallDictionaryMatcher("PokemonSV/AAT/TournamentPrizeNameOCR.json")
-{}
-
-OCR::StringMatchResult TournamentPrizeNameReader::read_substring(
-    Logger& logger,
-    Language language,
-    const ImageViewRGB32& image,
-    const std::vector<OCR::TextColorRange>& text_color_ranges,
-    double min_text_ratio, double max_text_ratio
-) const {
-    return match_substring_from_image_multifiltered(
-        &logger, language, image, text_color_ranges,
-        MAX_LOG10P, MAX_LOG10P_SPREAD, min_text_ratio, max_text_ratio
-    );
-}
-
-}
-}
-}
+/*  Tournament Prize Name Reader
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "PokemonSV_TournamentPrizeNameReader.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+TournamentPrizeNameReader& TournamentPrizeNameReader::instance(){
+    static TournamentPrizeNameReader reader;
+    return reader;
+}
+
+
+TournamentPrizeNameReader::TournamentPrizeNameReader()
+    : SmallDictionaryMatcher("PokemonSV/AAT/TournamentPrizeNameOCR.json")
+{}
+
+OCR::StringMatchResult TournamentPrizeNameReader::read_substring(
+    Logger& logger,
+    Language language,
+    const ImageViewRGB32& image,
+    const std::vector<OCR::TextColorRange>& text_color_ranges,
+    double min_text_ratio, double max_text_ratio
+) const{
+    return match_substring_from_image_multifiltered(
+        &logger, language, image, text_color_ranges,
+        MAX_LOG10P, MAX_LOG10P_SPREAD, min_text_ratio, max_text_ratio
+    );
+}
+
+}
+}
+}
diff --git a/SerialPrograms/Source/PokemonSV/Inference/PokemonSV_TournamentPrizeNameReader.h b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_TournamentPrizeNameReader.h
similarity index 76%
rename from SerialPrograms/Source/PokemonSV/Inference/PokemonSV_TournamentPrizeNameReader.h
rename to SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_TournamentPrizeNameReader.h
index eb98d14b84..eeb6557694 100644
--- a/SerialPrograms/Source/PokemonSV/Inference/PokemonSV_TournamentPrizeNameReader.h
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_TournamentPrizeNameReader.h
@@ -1,38 +1,38 @@
-/*  Tournament Prize Name Reader
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSV_TournamentPrizeNameReader_H
-#define PokemonAutomation_PokemonSV_TournamentPrizeNameReader_H
-
-#include "CommonFramework/OCR/OCR_SmallDictionaryMatcher.h"
-
-namespace PokemonAutomation {
-namespace NintendoSwitch {
-namespace PokemonSV {
-
-class TournamentPrizeNameReader : public OCR::SmallDictionaryMatcher {
-public:
-    static constexpr double MAX_LOG10P = -1.40;
-    static constexpr double MAX_LOG10P_SPREAD = 0.50;
-
-public:
-    TournamentPrizeNameReader();
-
-    static TournamentPrizeNameReader& instance();
-
-    OCR::StringMatchResult read_substring(
-        Logger& logger,
-        Language language,
-        const ImageViewRGB32& image,
-        const std::vector<OCR::TextColorRange>& text_color_ranges,
-        double min_text_ratio = 0.01, double max_text_ratio = 0.50
-    ) const;
-
-};
-}
-}
-}
-#endif
+/*  Tournament Prize Name Reader
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_TournamentPrizeNameReader_H
+#define PokemonAutomation_PokemonSV_TournamentPrizeNameReader_H
+
+#include "CommonTools/OCR/OCR_SmallDictionaryMatcher.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+class TournamentPrizeNameReader : public OCR::SmallDictionaryMatcher{
+public:
+    static constexpr double MAX_LOG10P = -1.40;
+    static constexpr double MAX_LOG10P_SPREAD = 0.50;
+
+public:
+    TournamentPrizeNameReader();
+
+    static TournamentPrizeNameReader& instance();
+
+    OCR::StringMatchResult read_substring(
+        Logger& logger,
+        Language language,
+        const ImageViewRGB32& image,
+        const std::vector<OCR::TextColorRange>& text_color_ranges,
+        double min_text_ratio = 0.01, double max_text_ratio = 0.50
+    ) const;
+
+};
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_TutorialDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_TutorialDetector.cpp
new file mode 100644
index 0000000000..dd56a61922
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_TutorialDetector.cpp
@@ -0,0 +1,48 @@
+/*  Tutorial Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Images/SolidColorTest.h"
+#include "PokemonSV_TutorialDetector.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+TutorialDetector::TutorialDetector(Color color)
+    : m_color(color)
+    , m_bottom(0.235, 0.87, 0.10, 0.035)
+    , m_left(0.230, 0.18, 0.02, 0.72)
+{}
+void TutorialDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_bottom);
+    items.add(m_color, m_left);
+}
+
+// detect solid beige color along the side and bottom of the tutorial
+bool TutorialDetector::detect(const ImageViewRGB32& screen){
+    ImageStats bottom = image_stats(extract_box_reference(screen, m_bottom));
+    ImageStats left = image_stats(extract_box_reference(screen, m_left));
+    // cout << "bottom.average.sum(): " << bottom.average.sum() << endl;
+    // cout << "left.average.sum(): " << left.average.sum() << endl;
+
+    // expected color is {255, 255, 235}
+    return is_solid(bottom, {0.342282, 0.342282, 0.315436}) 
+            && bottom.average.sum() > 500
+            && is_solid(left, {0.342282, 0.342282, 0.315436})
+            && left.average.sum() > 500;
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_TutorialDetector.h b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_TutorialDetector.h
new file mode 100644
index 0000000000..3f36b37feb
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_TutorialDetector.h
@@ -0,0 +1,49 @@
+/*  Tutorial Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_TutorialDetector_H
+#define PokemonAutomation_PokemonSV_TutorialDetector_H
+
+#include "Common/Cpp/Color.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+#include "CommonTools/VisualDetector.h"
+
+namespace PokemonAutomation{
+    struct ProgramInfo;
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+class TutorialDetector : public StaticScreenDetector{
+public:
+    TutorialDetector(Color color = COLOR_RED);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+
+protected:
+    Color m_color;
+    ImageFloatBox m_bottom;
+    ImageFloatBox m_left;
+};
+class TutorialWatcher : public DetectorToFinder<TutorialDetector>{
+public:
+    TutorialWatcher(Color color = COLOR_RED)
+         : DetectorToFinder("TutorialWatcher", std::chrono::milliseconds(250), color)
+    {}
+};
+
+
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_WhiteButtonDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_WhiteButtonDetector.cpp
new file mode 100644
index 0000000000..ce6572f8f5
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_WhiteButtonDetector.cpp
@@ -0,0 +1,222 @@
+/*  White Button Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "Kernels/Waterfill/Kernels_Waterfill_Session.h"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/ImageTypes/BinaryImage.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Images/BinaryImage_FilterRgb32.h"
+//#include "Tests/TestUtils.h"
+#include "Tests/ImageUnitTest.h"
+#include "PokemonSV_WhiteButtonDetector.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+using namespace Kernels;
+using namespace Kernels::Waterfill;
+
+
+
+
+const char* white_button_template_path(WhiteButton type){
+    switch (type){
+    case WhiteButton::ButtonA:
+        return "PokemonSV/Buttons/WhiteButtonA.png";
+    case WhiteButton::ButtonA_DarkBackground:
+        return "PokemonSV/Buttons/WhiteButtonA-dark.png";        
+    case WhiteButton::ButtonB:
+        return "PokemonSV/Buttons/WhiteButtonB.png";
+    case WhiteButton::ButtonX:
+        return "PokemonSV/Buttons/WhiteButtonX.png";
+    case WhiteButton::ButtonY:
+        return "PokemonSV/Buttons/WhiteButtonY.png";
+    case WhiteButton::ButtonMinus:
+        return "PokemonSV/Buttons/WhiteButtonMinus.png";
+    case WhiteButton::ButtonLeft:
+        return "PokemonSV/Buttons/ArrowLeft.png";
+    case WhiteButton::ButtonRight:
+        return "PokemonSV/Buttons/ArrowRight.png";
+    case WhiteButton::ButtonLStick:
+        return "PokemonSV/Buttons/LStick.png";
+    default:
+        return "";
+    }
+}
+
+const WhiteButtonMatcher& get_button_matcher(WhiteButton type){
+    switch (type){
+    case WhiteButton::ButtonA:
+        return WhiteButtonMatcher::A();
+    case WhiteButton::ButtonA_DarkBackground:
+        return WhiteButtonMatcher::A_DarkBackground();        
+    case WhiteButton::ButtonB:
+        return WhiteButtonMatcher::B();
+    case WhiteButton::ButtonX:
+        return WhiteButtonMatcher::X();
+    case WhiteButton::ButtonY:
+        return WhiteButtonMatcher::Y();
+    case WhiteButton::ButtonMinus:
+        return WhiteButtonMatcher::Minus();
+    case WhiteButton::ButtonLeft:
+        return WhiteButtonMatcher::ArrowLeft();
+    case WhiteButton::ButtonRight:
+        return WhiteButtonMatcher::ArrowRight();
+    case WhiteButton::ButtonLStick:
+        return WhiteButtonMatcher::LStick();
+    default:
+        throw std::runtime_error("No corresponding ButtonMatcher for WhiteButton");
+    }
+}
+
+
+
+
+WhiteButtonMatcher::WhiteButtonMatcher(WhiteButton type, size_t min_width, size_t max_width, double max_rmsd)
+    : WaterfillTemplateMatcher(
+        white_button_template_path(type), Color(0xff808008), Color(0xffffffff), 100
+    )
+    , m_min_width(min_width)
+    , m_min_height(max_width)
+    , m_max_rmsd(max_rmsd)
+{}
+const WhiteButtonMatcher& WhiteButtonMatcher::A(){
+    static WhiteButtonMatcher matcher(WhiteButton::ButtonA, 15, 15, 100);
+    return matcher;
+}
+const WhiteButtonMatcher& WhiteButtonMatcher::A_DarkBackground(){
+    static WhiteButtonMatcher matcher(WhiteButton::ButtonA_DarkBackground, 15, 15, 100);
+    return matcher;
+}
+const WhiteButtonMatcher& WhiteButtonMatcher::B(){
+    static WhiteButtonMatcher matcher(WhiteButton::ButtonB, 15, 15, 90);
+    return matcher;
+}
+const WhiteButtonMatcher& WhiteButtonMatcher::X(){
+    static WhiteButtonMatcher matcher(WhiteButton::ButtonX, 15, 15, 90);
+    return matcher;
+}
+const WhiteButtonMatcher& WhiteButtonMatcher::Y(){
+    static WhiteButtonMatcher matcher(WhiteButton::ButtonY, 15, 15, 90);
+    return matcher;
+}
+const WhiteButtonMatcher& WhiteButtonMatcher::Minus(){
+    static WhiteButtonMatcher matcher(WhiteButton::ButtonMinus, 15, 15, 90);
+    return matcher;
+}
+const WhiteButtonMatcher& WhiteButtonMatcher::ArrowLeft(){
+    static WhiteButtonMatcher matcher(WhiteButton::ButtonLeft, 15, 15, 90);
+    return matcher;
+}
+const WhiteButtonMatcher& WhiteButtonMatcher::ArrowRight(){
+    static WhiteButtonMatcher matcher(WhiteButton::ButtonRight, 15, 15, 90);
+    return matcher;
+}
+const WhiteButtonMatcher& WhiteButtonMatcher::LStick(){
+    static WhiteButtonMatcher matcher(WhiteButton::ButtonLStick, 15, 15, 90);
+    return matcher;
+}
+
+
+
+
+
+
+
+WhiteButtonDetector::WhiteButtonDetector(
+    Color color,
+    WhiteButton button,
+    const ImageFloatBox& box
+)
+    : m_matcher(get_button_matcher(button))
+    , m_color(color)
+    , m_box(box)
+{}
+void WhiteButtonDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_box);
+}
+bool WhiteButtonDetector::detect(const ImageViewRGB32& screen){
+    std::vector<ImageFloatBox> hits = detect_all(screen);
+    return !hits.empty();
+}
+
+std::vector<ImageFloatBox> WhiteButtonDetector::detect_all(const ImageViewRGB32& screen) const{
+    ImageViewRGB32 region = extract_box_reference(screen, m_box);
+    PackedBinaryMatrix matrix = compress_rgb32_to_binary_range(region, 0xff808080, 0xffffffff);
+
+    std::vector<ImageFloatBox> hits;
+
+    std::unique_ptr<WaterfillSession> session = make_WaterfillSession(matrix);
+    auto iter = session->make_iterator(50);
+    WaterfillObject object;
+    while (iter->find_next(object, false)){
+        if (object.min_x == 0 || object.min_y == 0 ||
+            object.max_x == region.width() || object.max_y == region.height()
+        ){
+            continue;
+        }
+        double rmsd = m_matcher.rmsd_original(screen.size(), region, object);
+//        cout << "rmsd = " << rmsd << endl;
+        if (rmsd < m_matcher.m_max_rmsd){
+            hits.emplace_back(translate_to_parent(screen, m_box, object));
+        }
+    }
+    return hits;
+}
+
+
+
+
+
+
+class Test_WhiteButtonDetector : public ImageUnitTest{
+public:
+    Test_WhiteButtonDetector(
+        const std::string& image,
+        WhiteButton button,
+        const ImageFloatBox& box,
+        bool expected
+    )
+        : ImageUnitTest("PokemonSV::WhiteButtonDetector - " + image, {image})
+        , m_button(button)
+        , m_box(box)
+        , m_expected(expected)
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        WhiteButtonDetector detector(COLOR_RED, m_button, m_box);
+        const ImageRGB32& image = images[0];
+        return detector.detect(image) == m_expected;
+    };
+
+private:
+    WhiteButton m_button;
+    ImageFloatBox m_box;
+    bool m_expected;
+};
+
+
+
+void add_tests_WhiteButtonDetector(UnitTestDatabase& database){
+
+}
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_WhiteButtonDetector.h b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_WhiteButtonDetector.h
new file mode 100644
index 0000000000..339680d11f
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_WhiteButtonDetector.h
@@ -0,0 +1,106 @@
+/*  White Button Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  Warning: This detector is currently very prone to false positives.
+ *  It is much worse than the PLA buttons because these one have transparent
+ *  text which must be stored as zero alpha.
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_WhiteButtonDetector_H
+#define PokemonAutomation_PokemonSV_WhiteButtonDetector_H
+
+#include <vector>
+#include "Common/Cpp/Color.h"
+#include "Common/Cpp/TestRunners/UnitTest.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+#include "CommonTools/VisualDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+enum class WhiteButton{
+    ButtonA,
+    ButtonA_DarkBackground,
+    ButtonB,
+    ButtonX,
+    ButtonY,
+    ButtonMinus,
+    ButtonLeft,
+    ButtonRight,
+    ButtonLStick,
+};
+
+
+class WhiteButtonMatcher : public ImageMatch::WaterfillTemplateMatcher{
+public:
+    WhiteButtonMatcher(WhiteButton type, size_t min_width, size_t max_width, double max_rmsd);
+    static const WhiteButtonMatcher& A();
+    static const WhiteButtonMatcher& A_DarkBackground();
+    static const WhiteButtonMatcher& B();
+    static const WhiteButtonMatcher& X();
+    static const WhiteButtonMatcher& Y();
+    static const WhiteButtonMatcher& Minus();
+    static const WhiteButtonMatcher& ArrowLeft();
+    static const WhiteButtonMatcher& ArrowRight();
+    static const WhiteButtonMatcher& LStick();
+
+    virtual bool check_image(Resolution input_resolution, const ImageViewRGB32& image) const override{
+        return image.width() >= m_min_width && image.height() >= m_min_height;
+    };
+
+    size_t m_min_width;
+    size_t m_min_height;
+    double m_max_rmsd;
+};
+
+
+class WhiteButtonDetector : public StaticScreenDetector{
+public:
+    WhiteButtonDetector(
+        Color color,
+        WhiteButton button,
+        const ImageFloatBox& box
+    );
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+    std::vector<ImageFloatBox> detect_all(const ImageViewRGB32& screen) const;
+
+protected:
+    const WhiteButtonMatcher& m_matcher;
+    Color m_color;
+    ImageFloatBox m_box;
+};
+class WhiteButtonWatcher : public DetectorToFinder<WhiteButtonDetector>{
+public:
+    WhiteButtonWatcher(
+        Color color,
+        WhiteButton button,
+        const ImageFloatBox& box,
+        FinderType finder_type = FinderType::PRESENT,
+        std::chrono::milliseconds duration = std::chrono::milliseconds(250)
+    )
+         : DetectorToFinder("WhiteButtonWatcher", finder_type, duration, color, button, box)
+    {}
+};
+
+
+
+
+void add_tests_WhiteButtonDetector(UnitTestDatabase& database);
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_WhiteTriangleDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_WhiteTriangleDetector.cpp
new file mode 100644
index 0000000000..28d18e5447
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_WhiteTriangleDetector.cpp
@@ -0,0 +1,115 @@
+/*  White Triangle Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Containers/FixedLimitVector.tpp"
+#include "Kernels/Waterfill/Kernels_Waterfill_Types.h"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Images/WaterfillUtilities.h"
+#include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h"
+#include "PokemonSV_WhiteTriangleDetector.h"
+
+// #include <iostream>
+// using std::cout;
+// using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+class WhiteTriangleMatcher : public ImageMatch::WaterfillTemplateMatcher{
+public:
+    
+    WhiteTriangleMatcher() : WaterfillTemplateMatcher(
+        "PokemonSV/WhiteTriangleIcon-Template.png", Color(200,200,200), Color(255, 255, 255), 50
+    ){
+        m_aspect_ratio_lower = 0.8;
+        m_aspect_ratio_upper = 1.2;
+        m_area_ratio_lower = 0.8;
+        m_area_ratio_upper = 1.4;
+
+    }
+
+    static const ImageMatch::WaterfillTemplateMatcher& instance(){
+        static WhiteTriangleMatcher matcher;
+        return matcher;
+    }
+};
+
+
+WhiteTriangleDetector::~WhiteTriangleDetector() = default;
+
+WhiteTriangleDetector::WhiteTriangleDetector(Color color, const ImageFloatBox& box)
+    : m_color(color)
+    , m_box(box)
+{}
+
+void WhiteTriangleDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_box);
+}
+
+
+bool WhiteTriangleDetector::detect(const ImageViewRGB32& screen){
+    const std::vector<std::pair<uint32_t, uint32_t>> filters = {
+        {combine_rgb(240, 240, 240), combine_rgb(255, 255, 255)},
+        {combine_rgb(220, 220, 220), combine_rgb(240, 240, 240)},
+        {combine_rgb(200, 200, 200), combine_rgb(220, 220, 220)},
+        {combine_rgb(190, 190, 190), combine_rgb(210, 210, 210)},
+
+    };
+
+    const double rmsd_threshold = 50.0;
+
+    const double min_object_size = 100.0;
+
+    const double screen_rel_size = (screen.height() / 1080.0);
+    const size_t min_size = size_t(screen_rel_size * screen_rel_size * min_object_size);
+
+    bool is_found = false;
+    match_template_by_waterfill(
+        screen.size(),
+        extract_box_reference(screen, m_box), 
+        WhiteTriangleMatcher::instance(),
+        filters,
+        {min_size, SIZE_MAX},
+        rmsd_threshold,
+        [&](Kernels::Waterfill::WaterfillObject& object) -> bool {
+            is_found = true;
+            return true;
+        }
+    );
+
+    return is_found;
+}
+
+
+
+// WhiteTriangleWatcher::~WhiteTriangleWatcher() = default;
+
+// WhiteTriangleWatcher::WhiteTriangleWatcher(Color color, const ImageFloatBox& box)
+//     : VisualInferenceCallback("WhiteTriangleWatcher")
+//     , m_detector(color, box)
+// {}
+
+// void WhiteTriangleWatcher::make_overlays(VideoOverlaySet& items) const{
+//     m_detector.make_overlays(items);
+// }
+
+// bool WhiteTriangleWatcher::process_frame(const ImageViewRGB32& screen, WallClock timestamp){
+//     return m_detector.detect(screen);
+// }
+
+
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_WhiteTriangleDetector.h b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_WhiteTriangleDetector.h
new file mode 100644
index 0000000000..011316411c
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_WhiteTriangleDetector.h
@@ -0,0 +1,59 @@
+/*  White Triangle Detector
+
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_WhiteTriangleDetector_H
+#define PokemonAutomation_PokemonSV_WhiteTriangleDetector_H
+
+#include <vector>
+#include "Common/Cpp/Color.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+#include "CommonTools/VisualDetector.h"
+
+namespace PokemonAutomation{
+
+class VideoOverlaySet;
+class VideoOverlay;
+class OverlayBoxScope;
+
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+class WhiteTriangleDetector : public StaticScreenDetector{
+public:
+    WhiteTriangleDetector(Color color, const ImageFloatBox& box);
+    virtual ~WhiteTriangleDetector();
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+protected:
+    Color m_color;
+    ImageFloatBox m_box;
+};
+
+
+
+class WhiteTriangleWatcher : public DetectorToFinder<WhiteTriangleDetector>{
+public:
+    WhiteTriangleWatcher(
+        Color color,
+        const ImageFloatBox& box,
+        std::chrono::milliseconds hold_duration = std::chrono::milliseconds(250)
+    )
+        : DetectorToFinder("WhiteTriangleDetector", hold_duration, color, box)
+    {}
+};
+
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_ZeroGateWarpPromptDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_ZeroGateWarpPromptDetector.cpp
new file mode 100644
index 0000000000..4dee30df59
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_ZeroGateWarpPromptDetector.cpp
@@ -0,0 +1,123 @@
+/*  Zero Gate Warp Prompt Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "PokemonSV_ZeroGateWarpPromptDetector.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+ZeroGateWarpPromptDetector::ZeroGateWarpPromptDetector(Color color)
+    : m_arrow(color, GradientArrowType::RIGHT, {0.5, 0.32, 0.40, 0.39})
+{}
+
+void ZeroGateWarpPromptDetector::make_overlays(VideoOverlaySet& items) const{
+    m_arrow.make_overlays(items);
+}
+bool ZeroGateWarpPromptDetector::detect(const ImageViewRGB32& screen){
+    return detect_location(screen) >= 0;
+}
+int ZeroGateWarpPromptDetector::detect_location(const ImageViewRGB32& screen) const{
+    ImageFloatBox box;
+    if (!m_arrow.detect(box, screen)){
+        return -1;
+    }
+
+    int index = (int)((box.y - 0.337037) / 0.074074 + 0.5);
+
+//    cout << index << endl;
+
+    return index;
+}
+bool ZeroGateWarpPromptDetector::move_cursor(
+    const ProgramInfo& info, VideoStream& stream, ProControllerContext& context,
+    int row
+) const{
+    VideoOverlaySet overlays(stream.overlay());
+    make_overlays(overlays);
+
+    size_t consecutive_detection_fails = 0;
+    size_t moves = 0;
+    bool target_reached = false;
+    while (true){
+        context.wait_for_all_requests();
+        VideoSnapshot screen = stream.video().snapshot();
+        int current = this->detect_location(screen);
+
+        stream.log("Current Location: " + std::to_string(current));
+
+        if (current < 0){
+            consecutive_detection_fails++;
+            if (consecutive_detection_fails > 10){
+                OperationFailedExceptionWithScreenshot::fire(
+                    ErrorReportMode::SEND_ERROR_REPORT,
+                    "ZeroGateWarpPromptDetector::move_cursor(): Unable to detect cursor.",
+                    stream,
+                    screen
+                );
+            }
+            context.wait_for(std::chrono::milliseconds(50));
+            continue;
+        }
+        consecutive_detection_fails = 0;
+
+        if (moves >= 10){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "Unable to move to target after 10 moves.",
+                stream,
+                screen
+            );
+        }
+
+        //  We're done!
+        if (current == row){
+            if (target_reached){
+                return true;
+            }else{
+                //  Don't return yet. Wait a second to make sure the video is
+                //  in steady state before we return.
+                target_reached = true;
+                context.wait_for(std::chrono::seconds(1));
+                continue;
+            }
+        }
+        target_reached = false;
+
+        moves++;
+
+        const int rows = 5;
+        int diff = (rows + current - row) % rows;
+        if (diff < 3){
+            for (int c = 0; c < diff - 1; c++){
+                pbf_press_dpad(context, DPAD_UP, 80ms, 80ms);
+            }
+            pbf_press_dpad(context, DPAD_UP, 160ms, 240ms);
+        }else{
+            diff = rows - diff;
+            for (int c = 0; c < diff - 1; c++){
+                pbf_press_dpad(context, DPAD_DOWN, 80ms, 80ms);
+            }
+            pbf_press_dpad(context, DPAD_DOWN, 160ms, 240ms);
+        }
+    }
+}
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_ZeroGateWarpPromptDetector.h b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_ZeroGateWarpPromptDetector.h
new file mode 100644
index 0000000000..373faa1426
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/PokemonSV_ZeroGateWarpPromptDetector.h
@@ -0,0 +1,51 @@
+/*  Zero Gate Warp Prompt Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_ZeroGateWarpPromptDetector_H
+#define PokemonAutomation_PokemonSV_ZeroGateWarpPromptDetector_H
+
+#include "Common/Cpp/Color.h"
+#include "CommonFramework/Tools/VideoStream.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_GradientArrowDetector.h"
+
+namespace PokemonAutomation{
+    struct ProgramInfo;
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+class ZeroGateWarpPromptDetector : public StaticScreenDetector{
+public:
+    ZeroGateWarpPromptDetector(Color color = COLOR_RED);
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+    int detect_location(const ImageViewRGB32& screen) const;
+
+    bool move_cursor(
+        const ProgramInfo& info, VideoStream& stream, ProControllerContext& context,
+        int row
+    ) const;
+
+private:
+    GradientArrowDetector m_arrow;
+};
+class ZeroGateWarpPromptWatcher : public DetectorToFinder<ZeroGateWarpPromptDetector>{
+public:
+    ZeroGateWarpPromptWatcher(Color color = COLOR_RED)
+         : DetectorToFinder("ZeroGateWarpPromptWatcher", std::chrono::milliseconds(250), color)
+    {}
+};
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Tera/PokemonSV_TeraCardDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Tera/PokemonSV_TeraCardDetector.cpp
new file mode 100644
index 0000000000..68a211be40
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Tera/PokemonSV_TeraCardDetector.cpp
@@ -0,0 +1,503 @@
+/*  Tera Card Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <array>
+#include <list>
+#include <map>
+#include "Common/Cpp/PrettyPrint.h"
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "Kernels/Waterfill/Kernels_Waterfill_Session.h"
+#include "CommonFramework/StaticGlobals.h"
+#include "CommonFramework/ImageTypes/ImageRGB32.h"
+#include "CommonFramework/ImageTypes/BinaryImage.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonFramework/Tools/DebugDumper.h"
+#include "CommonFramework/Tools/ErrorDumper.h"
+#include "CommonTools/Images/SolidColorTest.h"
+#include "CommonTools/Images/BinaryImage_FilterRgb32.h"
+#include "CommonTools/OCR/OCR_Routines.h"
+#include "Tests/ImageUnitTest.h"
+#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_GradientArrowDetector.h"
+#include "PokemonSV_TeraCodeReader.h"
+#include "PokemonSV_TeraCardDetector.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+
+
+
+TeraCardReader::TeraCardReader(Color color)
+    : m_color(color)
+    , m_top(0.15, 0.13, 0.40, 0.03)
+    , m_bottom_left(0.15, 0.80, 0.10, 0.06)
+    , m_bottom_right(0.73, 0.85, 0.12, 0.02)
+    , m_label(CARD_LABEL_BOX())
+    , m_cursor(0.135, 0.25, 0.05, 0.25)
+    , m_stars(0.500, 0.555, 0.310, 0.070)
+    , m_tera_type(color)
+    , m_silhouette(color)
+{}
+void TeraCardReader::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_top);
+    items.add(m_color, m_bottom_left);
+    items.add(m_color, m_bottom_right);
+    items.add(m_color, m_label);
+    items.add(m_color, m_cursor);
+    items.add(m_color, m_stars);
+    m_tera_type.make_overlays(items);
+    m_silhouette.make_overlays(items);
+}
+
+const ImageFloatBox& TeraCardReader::CARD_LABEL_BOX(){
+    static ImageFloatBox box(0.75, 0.67, 0.10, 0.05);
+    return box;
+}
+bool TeraCardReader::is_card_label(const ImageViewRGB32& screen){
+    ImageStats label = image_stats(extract_box_reference(screen, CARD_LABEL_BOX()));
+    return is_solid(label, {0.370075, 0.369063, 0.260862})              //  Paldea Card
+        || is_solid(label, {0.258888, 0.369491, 0.371621}, 0.15, 15);   //  Kitakami Card
+}
+
+bool TeraCardReader::detect(const ImageViewRGB32& screen){
+    ImageStats top = image_stats(extract_box_reference(screen, m_top));
+//    cout << top.average << top.stddev << endl;
+    if (!is_solid(top, {0.354167, 0.345833, 0.3})){
+//        cout << "bad 1" << endl;
+        return false;
+    }
+
+    ImageStats bottom_left = image_stats(extract_box_reference(screen, m_bottom_left));
+//    cout << bottom_left.average << bottom_left.stddev << endl;
+    if (!is_solid(bottom_left, {0.354167, 0.345833, 0.3})){
+//        cout << "bad 2" << endl;
+        return false;
+    }
+    ImageStats bottom_right = image_stats(extract_box_reference(screen, m_bottom_right));
+//    cout << bottom_right.average << bottom_right.stddev << endl;
+    if (!is_solid(bottom_right, {0.354167, 0.345833, 0.3})){
+//        cout << "bad 3" << endl;
+        return false;
+    }
+
+    if (euclidean_distance(top.average, bottom_left.average) > 20){
+//        cout << "euclidean_distance 0" << endl;
+        return false;
+    }
+    if (euclidean_distance(top.average, bottom_right.average) > 20){
+//        cout << "euclidean_distance 1" << endl;
+        return false;
+    }
+    if (euclidean_distance(bottom_left.average, bottom_right.average) > 20){
+//        cout << "euclidean_distance 2" << endl;
+        return false;
+    }
+
+//    ImageStats label = image_stats(extract_box_reference(screen, m_label));
+//    extract_box_reference(screen, m_label).save("test.png");
+//    cout << label.average << label.stddev << endl;
+    if (!is_card_label(screen)){
+        return false;
+    }
+
+    GradientArrowDetector arrow_detector(COLOR_RED, GradientArrowType::RIGHT, m_cursor);
+    if (!arrow_detector.detect(screen)){
+        return false;
+    }
+
+    return true;
+}
+uint8_t TeraCardReader::stars(
+    Logger& logger, const ProgramInfo& info, const ImageViewRGB32& screen
+) const{
+    using namespace Kernels::Waterfill;
+
+    ImageViewRGB32 cropped = extract_box_reference(screen, m_stars);
+
+    ImageViewRGB32 background = extract_box_reference(screen, ImageFloatBox{0.55, 0.62, 0.20, 0.03});
+//        background.save("background.png");
+    ImageStats background_stats = image_stats(background);
+    Color background_average = background_stats.average.round();
+
+    //  Iterate through multiple distance filters and find how many
+    //  possible stars are in each one. Then do a majority vote.
+    const std::vector<double> DISTANCES{70, 80, 90, 100, 110, 120, 130};
+
+    std::map<size_t, size_t> count_map;
+
+    for (double distance : DISTANCES){
+        PackedBinaryMatrix matrix = compress_rgb32_to_binary_euclidean(cropped, (uint32_t)background_average, distance);
+
+        matrix.invert();
+//        cout << matrix.dump() << endl;
+        std::unique_ptr<WaterfillSession> session = make_WaterfillSession(matrix);
+        auto iter = session->make_iterator(100);
+        WaterfillObject object;
+
+        std::list<ImagePixelBox> objects;
+        while (iter->find_next(object, false)){
+            //  Attempt to merge with existing objects.
+            ImagePixelBox current(object);
+            bool changed;
+            do{
+                changed = false;
+                for (auto iter1 = objects.begin(); iter1 != objects.end();){
+                    if (current.overlaps_with(*iter1)){
+                        changed = true;
+                        current.merge_with(*iter1);
+                        objects.erase(iter1);
+                        break;
+                    }else{
+                        ++iter1;
+                    }
+                }
+            }while (changed);
+            objects.emplace_back(std::move(current));
+        }
+
+#if 0
+        static size_t count = 0;
+        for (const ImagePixelBox& obj : objects){
+            extract_box_reference(cropped, obj).save("test-" + std::to_string(count++) + ".png");
+        }
+        cout << "objects.size() = " << objects.size() << endl;
+#endif
+
+
+        count_map[objects.size()]++;
+    }
+
+    count_map.erase(0);
+
+    if (count_map.empty()){
+        dump_image(logger, info, "ReadStarsFailed", screen);
+        return 0;
+    }
+
+    auto best = count_map.begin();
+    for (auto iter = count_map.begin(); iter != count_map.end(); ++iter){
+        if (iter->first == 0){
+            continue;
+        }
+        if (iter->second > best->second){
+            best = iter;
+        }
+    }
+
+    size_t stars = best->first;
+
+    if (1 <= stars && stars <= 7){
+        return (uint8_t)stars;
+    }
+
+    dump_image(logger, info, "ReadStarsFailed", screen);
+    return 0;
+}
+std::string TeraCardReader::tera_type(
+    Logger& logger, const ProgramInfo& info, const ImageViewRGB32& screen
+) const{
+    ImageMatch::ImageMatchResult type = m_tera_type.read(screen);
+    type.log(logger, 100);
+    std::string best_type;
+    if (!type.results.empty()){
+        best_type = type.results.begin()->second;
+    }
+    if (best_type.empty()){
+        dump_image(logger, info, "ReadTypeFailed", screen);
+    }else if (STATIC_GLOBALS.IMAGE_TEMPLATE_MATCHING){
+        dump_debug_image(logger, "PokemonSV/TeraRoller/" + best_type, "", screen);
+    }
+
+    return best_type;
+}
+std::set<std::string> TeraCardReader::pokemon_slug(
+    Logger& logger, const ProgramInfo& info, const ImageViewRGB32& screen
+) const{
+    ImageMatch::ImageMatchResult silhouette = m_silhouette.read(screen);
+    silhouette.log(logger, 110);
+//    std::string best_silhouette;
+//    if (!silhouette.results.empty()){
+//        best_silhouette = silhouette.results.begin()->second;
+//    }
+    if (silhouette.results.empty()){
+        dump_image(logger, info, "ReadSilhouetteFailed", screen);
+    }
+//    else if (STATIC_GLOBALS.IMAGE_TEMPLATE_MATCHING){
+//        dump_debug_image(logger, "PokemonSV/TeraRoller/" + best_silhouette, "", screen);
+//    }
+
+    std::set<std::string> results;
+    for (const auto& item : silhouette.results){
+        results.insert(std::move(item.second));
+    }
+
+    return results;
+}
+
+
+
+
+
+
+std::string TeraLobbyNameMatchResult::to_str() const{
+    std::string ret;
+    ret += "\"" + raw_ocr;
+    if (ret.back() == '\n'){
+        ret.pop_back();
+    }
+//    ret += "\" -> \"" + normalized_ocr + "\" == \"";
+    ret += "\" -> \"";
+    ret += entry.name;
+    ret += "\" (";
+    if (exact_match){
+        ret += "exact match, ";
+    }else{
+        ret += "partial match, ";
+    }
+    ret += "log10p = " + tostr_default(log10p) + ")";
+    return ret;
+}
+
+
+
+TeraLobbyReader::TeraLobbyReader(Logger& logger, Color color)
+    : m_logger(logger)
+    , m_color(color)
+    , m_bottom_right(0.73, 0.85, 0.12, 0.02)
+    , m_label(TeraCardReader::CARD_LABEL_BOX())
+    , m_cursor(0.135, 0.25, 0.05, 0.25)
+//    , m_stars(0.500, 0.555, 0.310, 0.070)
+    , m_timer(0.175, 0.180, 0.100, 0.080)
+    , m_code(0.310, 0.180, 0.200, 0.080)
+{
+    for (size_t c = 0; c < 4; c++){
+        m_player_spinner[c] = ImageFloatBox{0.157, 0.575 + 0.070*c, 0.037, 0.060};
+        m_player_name[c] = ImageFloatBox{0.200, 0.575 + 0.070*c, 0.095, 0.060};
+        m_player_mon[c] = ImageFloatBox{0.425, 0.575 + 0.070*c, 0.037, 0.060};
+        m_player_ready[c] = ImageFloatBox{0.465, 0.575 + 0.070*c, 0.037, 0.060};
+    }
+}
+void TeraLobbyReader::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_bottom_right);
+    items.add(m_color, m_label);
+    items.add(m_color, m_cursor);
+    items.add(m_color, m_timer);
+    items.add(m_color, m_code);
+    for (size_t c = 0; c < 4; c++){
+        items.add(m_color, m_player_spinner[c]);
+        items.add(m_color, m_player_name[c]);
+        items.add(m_color, m_player_mon[c]);
+        items.add(m_color, m_player_ready[c]);
+    }
+}
+bool TeraLobbyReader::detect(const ImageViewRGB32& screen){
+    ImageStats bottom_right = image_stats(extract_box_reference(screen, m_bottom_right));
+//    cout << bottom_right.average << bottom_right.stddev << endl;
+    if (!is_solid(bottom_right, {0.354167, 0.345833, 0.3})){
+        return false;
+    }
+
+//    ImageStats label = image_stats(extract_box_reference(screen, m_label));
+//    cout << label.average << label.stddev << endl;
+    if (!TeraCardReader::is_card_label(screen)){
+        return false;
+    }
+
+    GradientArrowDetector arrow_detector(COLOR_RED, GradientArrowType::RIGHT, m_cursor);
+    if (!arrow_detector.detect(screen)){
+        return false;
+    }
+
+    if (seconds_left(m_logger, screen) < 0){
+        return false;
+    }
+
+    return true;
+}
+
+uint8_t TeraLobbyReader::total_players(const ImageViewRGB32& screen) const{
+    uint8_t total = 0;
+    for (size_t c = 0; c < 4; c++){
+        ImageStats player = image_stats(extract_box_reference(screen, m_player_mon[c]));
+        if (player.stddev.sum() > 80){
+            total++;
+        }
+    }
+    return std::max(total, (uint8_t)1);
+}
+#if 0
+uint8_t TeraLobbyReader::ready_players(const ImageViewRGB32& screen) const{
+    uint8_t total = 0;
+    for (size_t c = 0; c < 4; c++){
+        ImageStats player = image_stats(extract_box_reference(screen, m_player_ready[c]));
+//        cout << "Player " << c << ": " << player.average << player.stddev << endl;
+        if (player.stddev.sum() > 80){
+            total++;
+        }
+    }
+    return total;
+}
+#endif
+uint8_t TeraLobbyReader::ready_joiners(const ImageViewRGB32& screen, uint8_t host_players){
+    uint8_t total = 0;
+    for (size_t c = host_players; c < 4; c++){
+        ImageStats player = image_stats(extract_box_reference(screen, m_player_ready[c]));
+//        cout << "Player " << c << ": " << player.average << player.stddev << endl;
+        if (player.stddev.sum() > 80){
+            total++;
+        }
+    }
+    return total;
+}
+
+int16_t TeraLobbyReader::seconds_left(Logger& logger, const ImageViewRGB32& screen) const{
+    ImageViewRGB32 image = extract_box_reference(screen, m_timer);
+    return read_raid_timer(logger, image);
+}
+std::string TeraLobbyReader::raid_code(Logger& logger, const ImageViewRGB32& screen) const{
+    ImageViewRGB32 image = extract_box_reference(screen, m_code);
+    return read_raid_code(logger, image);
+}
+
+ImageRGB32 filter_name_image(const ImageViewRGB32& image){
+    using namespace Kernels::Waterfill;
+
+    const uint32_t COLOR_THRESHOLD = 0xff8f8f8f;
+
+    //  Waterfill the image and throw out everything that touches the border.
+
+    ImageRGB32 filtered(image.width(), image.height());
+    filtered.fill(0xffffffff);
+//    cout << image.width() << " x " << image.height() << endl;
+
+    PackedBinaryMatrix matrix = compress_rgb32_to_binary_range(image, 0xff000000, COLOR_THRESHOLD);
+    {
+        std::unique_ptr<WaterfillSession> session = make_WaterfillSession(matrix);
+        auto iter = session->make_iterator(4);
+        WaterfillObject object;
+        while (iter->find_next(object, true)){
+            auto packed = object.packed_matrix();
+//            cout << packed->width() << " x " << packed->height() << " : " << object.min_x << " x " << object.min_y << endl;
+
+            //  Touches border.
+            if (object.min_x == 0 ||
+                object.min_y == 0 ||
+                object.max_x == filtered.width() ||
+                object.max_y == filtered.height()
+            ){
+                continue;
+            }
+            filter_by_mask(
+                std::move(packed),
+                filtered, object.min_x, object.min_y,
+                Color(0xff000000),
+                false
+            );
+        }
+    }
+
+//    static int c = 0;
+//    filtered.save("filtered" + std::to_string(c++) + ".png");
+
+    return filtered;
+
+//    size_t pixels;
+//    return to_blackwhite_rgb32_range(pixels, image, 0xff000000, COLOR_THRESHOLD, true);
+}
+
+
+std::array<std::map<Language, std::string>, 4> TeraLobbyReader::read_names(
+    Logger& logger,
+    const std::set<Language>& languages,
+    const ImageViewRGB32& screen
+) const{
+    std::array<std::map<Language, std::string>, 4> ret;
+    for (size_t c = 0; c < 4; c++){
+        ImageStats sprite = image_stats(extract_box_reference(screen, m_player_mon[c]));
+        if (sprite.stddev.sum() <= 80){
+            continue;
+        }
+//        logger.log("Reading player " + std::to_string(c) + "'s name...");
+        std::string str = "Player " + std::to_string(c) + ": ";
+        bool first = true;
+        for (Language language : languages){
+            ImageViewRGB32 box = extract_box_reference(screen, m_player_name[c]);
+            ImageRGB32 filtered = filter_name_image(box);
+//            filtered.save("name" + std::to_string(c) + ".png");
+
+            std::string raw;
+            for (char ch : OCR::ocr_read(language, filtered)){
+                if ((unsigned)ch < 32){
+                    continue;
+                }
+                raw += ch;
+            }
+            if (!first){
+                str += ", ";
+            }
+            first = false;
+            str += language_data(language).code + "=\"" + raw + "\"";
+            ret[c][language] = std::move(raw);
+        }
+        logger.log(str);
+    }
+    return ret;
+}
+
+
+
+
+
+
+class Test_TeraCardDetector : public ImageUnitTest{
+public:
+    Test_TeraCardDetector(
+        const std::string& image,
+        bool expected
+    )
+        : ImageUnitTest("PokemonSV::TeraCardDetector - " + image, {image})
+        , m_expected(expected)
+    {
+        //  Plus the PaddleOCR (ONNX) recognition session and its working set.
+        m_memory += PADDLE_OCR_SINGLE_LINE_MEMORY_ESTIMATE;
+    }
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        TeraCardReader detector;
+        const ImageRGB32& image = images[0];
+        return detector.detect(image) == m_expected;
+    };
+
+private:
+    bool m_expected;
+};
+
+
+
+
+
+void add_tests_TeraCardDetector(UnitTestDatabase& database){
+    database.add<Test_TeraCardDetector>("PokemonSV/TeraCardFinder/Violet_French_True.png", true);
+
+}
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Tera/PokemonSV_TeraCardDetector.h b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Tera/PokemonSV_TeraCardDetector.h
new file mode 100644
index 0000000000..2e2de067d2
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Tera/PokemonSV_TeraCardDetector.h
@@ -0,0 +1,150 @@
+/*  Tera Card Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_TeraCardDetector_H
+#define PokemonAutomation_PokemonSV_TeraCardDetector_H
+
+#include "Common/Cpp/Color.h"
+#include "Common/Cpp/Logging/AbstractLogger.h"
+#include "Common/Cpp/TestRunners/UnitTest.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonTools/VisualDetector.h"
+#include "VideoGames/PokemonSV/Options/PokemonSV_PlayerList.h"
+#include "PokemonSV_TeraTypeReader.h"
+#include "PokemonSV_TeraSilhouetteReader.h"
+
+namespace PokemonAutomation{
+    struct ProgramInfo;
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+ImageRGB32 filter_name_image(const ImageViewRGB32& image);
+
+
+
+class TeraCardReader : public StaticScreenDetector{
+public:
+    TeraCardReader(Color color = COLOR_RED);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+    uint8_t stars(
+        Logger& logger, const ProgramInfo& info, const ImageViewRGB32& screen
+    ) const;
+    std::string tera_type(
+        Logger& logger, const ProgramInfo& info, const ImageViewRGB32& screen
+    ) const;
+    std::set<std::string> pokemon_slug(
+        Logger& logger, const ProgramInfo& info, const ImageViewRGB32& screen
+    ) const;
+
+    static const ImageFloatBox& CARD_LABEL_BOX();
+    static bool is_card_label(const ImageViewRGB32& screen);
+
+private:
+    Color m_color;
+    ImageFloatBox m_top;
+    ImageFloatBox m_bottom_left;
+    ImageFloatBox m_bottom_right;
+    ImageFloatBox m_label;
+    ImageFloatBox m_cursor;
+
+    ImageFloatBox m_stars;
+    TeraTypeReader m_tera_type;
+    TeraSilhouetteReader m_silhouette;
+};
+class TeraCardWatcher : public DetectorToFinder<TeraCardReader>{
+public:
+    TeraCardWatcher(Color color = COLOR_RED, std::chrono::milliseconds duration = std::chrono::milliseconds(250))
+         : DetectorToFinder("TeraCardFinder", duration, color)
+    {}
+};
+
+
+
+
+struct TeraLobbyNameMatchResult{
+    PlayerListRowSnapshot entry;
+    std::string banlist_source;
+
+    std::string raw_ocr;
+    std::string normalized_ocr;
+    double log10p;
+    bool exact_match;
+    std::string notes;
+
+    std::string to_str() const;
+};
+
+
+
+class TeraLobbyReader : public StaticScreenDetector{
+public:
+    TeraLobbyReader(Logger& logger, Color color = COLOR_RED);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+
+    //  Returns true if we are on an active lobby.
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+    uint8_t total_players(const ImageViewRGB32& screen) const;
+//    uint8_t ready_players(const ImageViewRGB32& screen) const;
+    uint8_t ready_joiners(const ImageViewRGB32& screen, uint8_t host_players);
+
+    int16_t seconds_left(Logger& logger, const ImageViewRGB32& screen) const;
+    std::string raid_code(Logger& logger, const ImageViewRGB32& screen) const;
+
+    //  OCR the player names in all the specified languages.
+    //  The returned strings are raw OCR output and are unprocessed.
+    std::array<std::map<Language, std::string>, 4> read_names(
+        Logger& logger,
+        const std::set<Language>& languages,
+        const ImageViewRGB32& screen
+    ) const;
+
+
+private:
+    Logger& m_logger;
+    Color m_color;
+    ImageFloatBox m_bottom_right;
+    ImageFloatBox m_label;
+    ImageFloatBox m_cursor;
+//    ImageFloatBox m_stars;
+
+    ImageFloatBox m_timer;
+    ImageFloatBox m_code;
+
+    ImageFloatBox m_player_spinner[4];
+    ImageFloatBox m_player_name[4];
+    ImageFloatBox m_player_mon[4];
+    ImageFloatBox m_player_ready[4];
+};
+class TeraLobbyWatcher : public DetectorToFinder<TeraLobbyReader>{
+public:
+    TeraLobbyWatcher(
+        Logger& logger,
+        Color color = COLOR_RED,
+        std::chrono::milliseconds duration = std::chrono::milliseconds(250)
+    )
+         : DetectorToFinder("TeraLobbyFinder", duration, logger, color)
+    {}
+};
+
+
+
+
+
+void add_tests_TeraCardDetector(UnitTestDatabase& database);
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/PokemonSV/Inference/Tera/PokemonSV_TeraCodeReader.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Tera/PokemonSV_TeraCodeReader.cpp
similarity index 86%
rename from SerialPrograms/Source/PokemonSV/Inference/Tera/PokemonSV_TeraCodeReader.cpp
rename to SerialPrograms/Source/VideoGames/PokemonSV/Inference/Tera/PokemonSV_TeraCodeReader.cpp
index e45507fbd7..cd4696fdf9 100644
--- a/SerialPrograms/Source/PokemonSV/Inference/Tera/PokemonSV_TeraCodeReader.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Tera/PokemonSV_TeraCodeReader.cpp
@@ -1,21 +1,21 @@
 /*  Tera Code Reader
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include <map>
-#include "Common/Cpp/AbstractLogger.h"
-#include "Common/Cpp/Concurrency/AsyncDispatcher.h"
+#include "Common/Cpp/Logging/AbstractLogger.h"
 #include "Kernels/Waterfill/Kernels_Waterfill_Session.h"
-#include "CommonFramework/Globals.h"
+#include "CommonFramework/GlobalAutoPaths.h"
 #include "CommonFramework/ImageTypes/ImageRGB32.h"
 #include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "CommonFramework/ImageTools/ImageFilter.h"
-#include "CommonFramework/ImageTools/ImageManip.h"
-#include "CommonFramework/ImageTools/BinaryImage_FilterRgb32.h"
-#include "CommonFramework/ImageMatch/ExactImageMatcher.h"
-#include "CommonFramework/OCR/OCR_RawOCR.h"
+#include "CommonFramework/Tools/GlobalThreadPools.h"
+#include "CommonTools/Images/ImageManip.h"
+#include "CommonTools/Images/ImageFilter.h"
+#include "CommonTools/Images/BinaryImage_FilterRgb32.h"
+#include "CommonTools/ImageMatch/ExactImageMatcher.h"
+#include "CommonTools/OCR/OCR_Routines.h"
 #include "PokemonSV_TeraCodeReader.h"
 
 //#define PA_ENABLE_CODE_DEBUG
@@ -146,7 +146,6 @@ struct WaterfillOCRResult{
 
 
 std::vector<WaterfillOCRResult> waterfill_OCR(
-    AsyncDispatcher& dispatcher,
     const ImageViewRGB32& image,
     uint32_t threshold
 ){
@@ -155,7 +154,7 @@ std::vector<WaterfillOCRResult> waterfill_OCR(
     //  Direct OCR is unreliable. Instead, we will waterfill each character
     //  to isolate them, then OCR them individually.
 
-    ImageRGB32 filtered = to_blackwhite_rgb32_range(image, 0xff000000, threshold, true);
+    ImageRGB32 filtered = to_blackwhite_rgb32_range(image, true, 0xff000000, threshold);
     PackedBinaryMatrix matrix = compress_rgb32_to_binary_range(image, 0xff000000, threshold);
 
     std::map<size_t, WaterfillObject> map;
@@ -173,8 +172,7 @@ std::vector<WaterfillOCRResult> waterfill_OCR(
         ret.emplace_back(WaterfillOCRResult{std::move(item.second), ""});
     }
 
-    dispatcher.run_in_parallel(
-        0, ret.size(),
+    GlobalThreadPools::computation_realtime().run_in_parallel(
         [&](size_t index){
             WaterfillObject& object = ret[index].object;
             ImageRGB32 cropped = extract_box_reference(filtered, object).copy();
@@ -182,7 +180,8 @@ std::vector<WaterfillOCRResult> waterfill_OCR(
             filter_by_mask(tmp, cropped, Color(0xffffffff), true);
             ImageRGB32 padded = pad_image(cropped, cropped.width(), 0xffffffff);
             ret[index].ocr = OCR::ocr_read(Language::English, padded);
-        }
+        },
+        0, ret.size()
     );
 
 #ifdef PA_ENABLE_CODE_DEBUG
@@ -201,8 +200,8 @@ std::vector<WaterfillOCRResult> waterfill_OCR(
 }
 
 
-int16_t read_raid_timer(Logger& logger, AsyncDispatcher& dispatcher, const ImageViewRGB32& image){
-    std::vector<WaterfillOCRResult> characters = waterfill_OCR(dispatcher, image, 0xff7f7f7f);
+int16_t read_raid_timer(Logger& logger, const ImageViewRGB32& image){
+    std::vector<WaterfillOCRResult> characters = waterfill_OCR(image, 0xff7f7f7f);
 
 //    cout << "map.size() = " << map.size() << endl;
 //    for (auto& item : map){
@@ -262,14 +261,14 @@ int16_t read_raid_timer(Logger& logger, AsyncDispatcher& dispatcher, const Image
 }
 
 
-std::string read_raid_code(Logger& logger, AsyncDispatcher& dispatcher, const ImageViewRGB32& image){
+std::string read_raid_code(Logger& logger, const ImageViewRGB32& image){
     std::vector<uint32_t> filters{
         0xff5f5f5f,
         0xff7f7f7f,
     };
 
     for (uint32_t filter : filters){
-        std::vector<WaterfillOCRResult> characters = waterfill_OCR(dispatcher, image, filter);
+        std::vector<WaterfillOCRResult> characters = waterfill_OCR(image, filter);
 
         static const std::map<char, char> SUBSTITUTIONS{
             {'I', '1'},
@@ -282,6 +281,7 @@ std::string read_raid_code(Logger& logger, AsyncDispatcher& dispatcher, const Im
             {']', '1'},
             {')', 'J'},
             {'(', 'K'},
+            {'[', 'C'},
         };
 
         bool contains_letters = false;
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Tera/PokemonSV_TeraCodeReader.h b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Tera/PokemonSV_TeraCodeReader.h
new file mode 100644
index 0000000000..e0441039f5
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Tera/PokemonSV_TeraCodeReader.h
@@ -0,0 +1,32 @@
+/*  Tera Code Reader
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_TeraCodeReader_H
+#define PokemonAutomation_PokemonSV_TeraCodeReader_H
+
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+
+namespace PokemonAutomation{
+    class Logger;
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+void preload_code_templates();
+
+
+//  Returns # of seconds left. Returns -1 if unable to read.
+int16_t read_raid_timer(Logger& logger, const ImageViewRGB32& image);
+
+//  Returns empty string if unable to read.
+std::string read_raid_code(Logger& logger, const ImageViewRGB32& image);
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/PokemonSV/Inference/Tera/PokemonSV_TeraRaidSearchDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Tera/PokemonSV_TeraRaidSearchDetector.cpp
similarity index 77%
rename from SerialPrograms/Source/PokemonSV/Inference/Tera/PokemonSV_TeraRaidSearchDetector.cpp
rename to SerialPrograms/Source/VideoGames/PokemonSV/Inference/Tera/PokemonSV_TeraRaidSearchDetector.cpp
index 85b54eea1f..a2fa8a514b 100644
--- a/SerialPrograms/Source/PokemonSV/Inference/Tera/PokemonSV_TeraRaidSearchDetector.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Tera/PokemonSV_TeraRaidSearchDetector.cpp
@@ -1,23 +1,22 @@
 /*  Tera Raid Search Detector
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include "Kernels/Waterfill/Kernels_Waterfill_Session.h"
-#include "CommonFramework/ImageTools/BinaryImage_FilterRgb32.h"
-#include "CommonFramework/ImageTools/SolidColorTest.h"
-#include "CommonFramework/ImageMatch/WaterfillTemplateMatcher.h"
 #include "CommonFramework/VideoPipeline/VideoFeed.h"
 #include "CommonFramework/Tools/ErrorDumper.h"
-#include "CommonFramework/Tools/ConsoleHandle.h"
+#include "CommonTools/Images/SolidColorTest.h"
+#include "CommonTools/Images/BinaryImage_FilterRgb32.h"
+#include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h"
 #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "PokemonSV/Inference/Dialogs/PokemonSV_GradientArrowDetector.h"
+#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_GradientArrowDetector.h"
 #include "PokemonSV_TeraRaidSearchDetector.h"
 
-#include <iostream>
-using std::cout;
-using std::endl;
+//#include <iostream>
+//using std::cout;
+//using std::endl;
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
@@ -47,7 +46,7 @@ void TeraRaidSearchDetector::make_overlays(VideoOverlaySet& items) const{
     items.add(m_color, {0, 0, 1, 1});
 //    m_arrow_offline.make_overlays(items);
 }
-bool TeraRaidSearchDetector::detect(const ImageViewRGB32& screen) const{
+bool TeraRaidSearchDetector::detect(const ImageViewRGB32& screen){
     ImageFloatBox box;
     return detect_search_location(box, screen);
 }
@@ -59,15 +58,19 @@ bool TeraRaidSearchDetector::detect_search_location(ImageFloatBox& box, const Im
     auto iter = session->make_iterator(100);
     WaterfillObject object;
 
-//    size_t c = 0;
+//    static size_t c = 0;
     const TeraSearchGlassMatcher& MATCHER = TeraSearchGlassMatcher::instance();
     while (iter->find_next(object, false)){
 //        cout << "yellow = " << object.area << endl;
 //        extract_box_reference(screen, object).save("object-" + std::to_string(c++) + ".png");
 //        yellows.emplace_back(std::move(object));
-        double rmsd = MATCHER.rmsd(extract_box_reference(screen, object));
+        double rmsd = MATCHER.rmsd(screen.size(), extract_box_reference(screen, object));
 //        cout << "rmsd = " << rmsd << endl;
         if (rmsd < 100){
+
+//            cout << "rmsd = " << rmsd << endl;
+//            extract_box_reference(screen, object).save("object-" + std::to_string(c++) + ".png");
+
             box = translate_to_parent(screen, {0, 0, 1, 1}, object);
             return true;
         }
@@ -75,7 +78,10 @@ bool TeraRaidSearchDetector::detect_search_location(ImageFloatBox& box, const Im
 
     return false;
 }
-bool TeraRaidSearchDetector::move_cursor_to_search(const ProgramInfo& info, ConsoleHandle& console, BotBaseContext& context) const{
+bool TeraRaidSearchDetector::move_cursor_to_search(
+    const ProgramInfo& info,
+    VideoStream& stream, ProControllerContext& context
+) const{
     GradientArrowDetector arrow(m_color, GradientArrowType::DOWN, {0, 0, 1, 1});
 
     size_t consecutive_detection_fails = 0;
@@ -83,7 +89,7 @@ bool TeraRaidSearchDetector::move_cursor_to_search(const ProgramInfo& info, Cons
     bool target_reached = false;
     while (true){
         context.wait_for_all_requests();
-        VideoSnapshot screen = console.video().snapshot();
+        VideoSnapshot screen = stream.video().snapshot();
 
         ImageFloatBox search_location;
         ImageFloatBox arrow_location;
@@ -95,8 +101,10 @@ bool TeraRaidSearchDetector::move_cursor_to_search(const ProgramInfo& info, Cons
         ok &= arrow.detect(arrow_location, screen);
         if (!ok){
             consecutive_detection_fails++;
-            if (consecutive_detection_fails > 10){
-                dump_image_and_throw_recoverable_exception(info, console, "UnableToDetectTeraSearch", "Unable to detect Tera Raid Search menu.");
+            if (consecutive_detection_fails > 3){
+//                dump_image_and_throw_recoverable_exception(info, stream, "UnableToDetectTeraSearch", "Unable to detect Tera Raid Search menu.");
+                stream.log("Unable to detect Tera Raid Search menu.", COLOR_RED);
+                return false;
             }
             context.wait_for(std::chrono::milliseconds(1000));
             continue;
@@ -104,7 +112,7 @@ bool TeraRaidSearchDetector::move_cursor_to_search(const ProgramInfo& info, Cons
 
 
         if (moves >= 10){
-            console.log("Unable to move to target after 10 moves.", COLOR_RED);
+            stream.log("Unable to move to target after 10 moves.", COLOR_RED);
             return false;
         }
         moves++;
@@ -118,12 +126,12 @@ bool TeraRaidSearchDetector::move_cursor_to_search(const ProgramInfo& info, Cons
 //        cout << "diff_x = " << diff_x << endl;
         if (diff_x < -0.1 || diff_x > 0.5){
             target_reached = false;
-            pbf_press_dpad(context, DPAD_LEFT, 20, 10);
+            pbf_press_dpad(context, DPAD_LEFT, 160ms, 80ms);
             continue;
         }
         if (diff_x > 0.1 || diff_x < -0.5){
             target_reached = false;
-            pbf_press_dpad(context, DPAD_RIGHT, 20, 10);
+            pbf_press_dpad(context, DPAD_RIGHT, 160ms, 80ms);
             continue;
         }
 
@@ -131,7 +139,7 @@ bool TeraRaidSearchDetector::move_cursor_to_search(const ProgramInfo& info, Cons
 //        cout << "diff_y = " << diff_y << endl;
         if (std::abs(diff_y) > 0.3){
             target_reached = false;
-            pbf_press_dpad(context, DPAD_DOWN, 20, 10);
+            pbf_press_dpad(context, DPAD_DOWN, 160ms, 80ms);
             continue;
         }
 
@@ -161,7 +169,7 @@ void CodeEntryDetector::make_overlays(VideoOverlaySet& items) const{
     items.add(m_color, m_right);
     items.add(m_color, m_center);
 }
-bool CodeEntryDetector::detect(const ImageViewRGB32& screen) const{
+bool CodeEntryDetector::detect(const ImageViewRGB32& screen){
     ImageStats bottom = image_stats(extract_box_reference(screen, m_bottom));
 //    cout << bottom.average << bottom.stddev << endl;
 
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Tera/PokemonSV_TeraRaidSearchDetector.h b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Tera/PokemonSV_TeraRaidSearchDetector.h
new file mode 100644
index 0000000000..0094284ce3
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Tera/PokemonSV_TeraRaidSearchDetector.h
@@ -0,0 +1,79 @@
+/*  Tera Raid Search Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_TeraRaidSearchDetector_H
+#define PokemonAutomation_PokemonSV_TeraRaidSearchDetector_H
+
+#include "Common/Cpp/Color.h"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/Tools/VideoStream.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+#include "CommonTools/VisualDetector.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+
+namespace PokemonAutomation{
+    struct ProgramInfo;
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+class TeraRaidSearchDetector : public StaticScreenDetector{
+public:
+    TeraRaidSearchDetector(Color color = COLOR_RED);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+    bool detect_search_location(ImageFloatBox& box, const ImageViewRGB32& screen) const;
+    bool move_cursor_to_search(
+        const ProgramInfo& info,
+        VideoStream& stream, ProControllerContext& context
+    ) const;
+
+private:
+    Color m_color;
+};
+class TeraRaidSearchWatcher : public DetectorToFinder<TeraRaidSearchDetector>{
+public:
+    TeraRaidSearchWatcher(
+        Color color = COLOR_RED,
+        std::chrono::milliseconds duration = std::chrono::milliseconds(250)
+    )
+         : DetectorToFinder("TeraRaidSearchWatcher", duration, color)
+    {}
+};
+
+
+
+class CodeEntryDetector : public StaticScreenDetector{
+public:
+    CodeEntryDetector(Color color = COLOR_RED);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    Color m_color;
+    ImageFloatBox m_bottom;
+    ImageFloatBox m_left;
+    ImageFloatBox m_right;
+    ImageFloatBox m_center;
+};
+class CodeEntryWatcher : public DetectorToFinder<CodeEntryDetector>{
+public:
+    CodeEntryWatcher(Color color = COLOR_RED)
+         : DetectorToFinder("CodeEntryWatcher", std::chrono::milliseconds(250), color)
+    {}
+};
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/PokemonSV/Inference/Tera/PokemonSV_TeraRewardsReader.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Tera/PokemonSV_TeraRewardsReader.cpp
similarity index 81%
rename from SerialPrograms/Source/PokemonSV/Inference/Tera/PokemonSV_TeraRewardsReader.cpp
rename to SerialPrograms/Source/VideoGames/PokemonSV/Inference/Tera/PokemonSV_TeraRewardsReader.cpp
index 7416dde587..ce7672c302 100644
--- a/SerialPrograms/Source/PokemonSV/Inference/Tera/PokemonSV_TeraRewardsReader.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Tera/PokemonSV_TeraRewardsReader.cpp
@@ -1,13 +1,13 @@
 /*  Tera Rewards Detector
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include "CommonFramework/ImageTools/ImageFilter.h"
-#include "CommonFramework/ImageMatch/ImageDiff.h"
+#include "CommonFramework/ImageTools/ImageDiff.h"
 #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
+#include "CommonTools/Images/ImageFilter.h"
+#include "CommonTools/Async/InferenceRoutines.h"
 #include "PokemonSV_TeraRewardsReader.h"
 
 namespace PokemonAutomation{
@@ -75,10 +75,10 @@ bool SparklyItemDetector::process_frame(const ImageViewRGB32& frame, WallClock t
 }
 
 
-size_t SparklyItemDetector::count_sparkly_items(ConsoleHandle& console, CancellableScope& scope){
+size_t SparklyItemDetector::count_sparkly_items(VideoStream& stream, CancellableScope& scope){
     SparklyItemDetector detector;
     wait_until(
-        console, scope, std::chrono::seconds(2),
+        stream, scope, std::chrono::seconds(2),
         {detector}
     );
 //    cout << detector.sparkly_items() << endl;
diff --git a/SerialPrograms/Source/PokemonSV/Inference/Tera/PokemonSV_TeraRewardsReader.h b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Tera/PokemonSV_TeraRewardsReader.h
similarity index 76%
rename from SerialPrograms/Source/PokemonSV/Inference/Tera/PokemonSV_TeraRewardsReader.h
rename to SerialPrograms/Source/VideoGames/PokemonSV/Inference/Tera/PokemonSV_TeraRewardsReader.h
index eeb93b5e1e..28a6722a23 100644
--- a/SerialPrograms/Source/PokemonSV/Inference/Tera/PokemonSV_TeraRewardsReader.h
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Tera/PokemonSV_TeraRewardsReader.h
@@ -1,6 +1,6 @@
 /*  Tera Rewards Detector
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -10,11 +10,10 @@
 #include "Common/Cpp/Color.h"
 #include "CommonFramework/ImageTypes/ImageRGB32.h"
 #include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "CommonFramework/InferenceInfra/VisualInferenceCallback.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
 
 namespace PokemonAutomation{
     class CancellableScope;
-    class ConsoleHandle;
 namespace NintendoSwitch{
 namespace PokemonSV{
 
@@ -26,7 +25,7 @@ class SparklyItemDetector : public VisualInferenceCallback{
 public:
     SparklyItemDetector(Color color = COLOR_RED);
 
-    static size_t count_sparkly_items(ConsoleHandle& console, CancellableScope& scope);
+    static size_t count_sparkly_items(VideoStream& stream, CancellableScope& scope);
 
     size_t sparkly_items() const;
 
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Tera/PokemonSV_TeraSilhouetteReader.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Tera/PokemonSV_TeraSilhouetteReader.cpp
new file mode 100644
index 0000000000..fffd9e5ae2
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Tera/PokemonSV_TeraSilhouetteReader.cpp
@@ -0,0 +1,195 @@
+/*  Tera Silhouette Reader
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <opencv2/imgproc.hpp>
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "CommonFramework/ImageTypes/ImageRGB32_OpenCV.h"
+#include "CommonTools/Images/ImageFilter.h"
+#include "CommonTools/ImageMatch/ImageCropper.h"
+#include "Tests/ImageUnitTest.h"
+#include "Tests/TestUtils.h"
+#include "VideoGames/PokemonSV/Resources/PokemonSV_PokemonSprites.h"
+#include "PokemonSV_TeraSilhouetteReader.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+ImageMatch::SilhouetteDictionaryMatcher make_TERA_RAID_SILHOUETTE_MATCHER(){
+    ImageMatch::SilhouetteDictionaryMatcher matcher;
+    for (const auto& item : ALL_POKEMON_SILHOUETTES()){
+        if (item.first == "pm1084_00_00_00_big" ||
+            item.first == "pm1091_00_00_00_big" ||
+            item.first == "error"){
+            continue;
+        }
+        ImageRGB32 filtered_image = to_blackwhite_rgb32_range(
+            item.second.icon,
+            true,
+            0xff000000, 0xff5f5f5f
+        );
+        matcher.add(item.first, filtered_image);
+    }
+    return matcher;
+}
+const ImageMatch::SilhouetteDictionaryMatcher& TERA_RAID_SILHOUETTE_MATCHER(){
+    static ImageMatch::SilhouetteDictionaryMatcher matcher = make_TERA_RAID_SILHOUETTE_MATCHER();
+    return matcher;
+}
+
+TeraSilhouetteReader::TeraSilhouetteReader(Color color)
+    : m_color(color)
+    , m_box(0.536, 0.122, 0.252, 0.430)
+{}
+
+void TeraSilhouetteReader::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_box);
+}
+
+ImageMatch::ImageMatchResult TeraSilhouetteReader::read(const ImageViewRGB32& screen) const{
+    static constexpr double MAX_ALPHA = 120;
+    static constexpr double ALPHA_SPREAD = 20;
+
+    const std::vector<uint32_t> BRIGHTNESS_THRESHOLDS{
+        200,
+        150,
+        100,
+        125,
+        175,
+        225,
+    };
+
+//    static int c = 0;
+
+    ImageMatch::ImageMatchResult slugs;
+    for (uint32_t threshold : BRIGHTNESS_THRESHOLDS){
+//        cout << "check0" << endl;
+        //  Get a loose crop of the silhouette icon
+        ImageViewRGB32 cropped_image = extract_box_reference(screen, m_box);
+//        cropped_image.save("tera_cropped_image-" + std::to_string(c++) + ".png");
+
+//        cout << "check1" << endl;
+        ImageRGB32 preprocessed_image(cropped_image.width(), cropped_image.height());
+        cv::medianBlur(to_OpenCV_ref(cropped_image), to_OpenCV_ref(preprocessed_image), 5);
+//        preprocessed_image.save("tera_blurred_image.png");
+
+        //  Get a tight crop
+//        cout << "check2" << endl;
+        const ImagePixelBox tight_box = ImageMatch::enclosing_rectangle_with_pixel_filter(
+            preprocessed_image,
+            // The filter is a lambda function that returns true on black silhouette pixels.
+            [=](Color pixel){
+                return (uint32_t)pixel.red() + pixel.green() + pixel.blue() <= threshold;
+            }
+        );
+
+        if (tight_box.area() == 0){
+//            global_logger_tagged().log("TeraSilhouetteReader::read(): Cropped image is empty.", COLOR_RED);
+            continue;
+        }
+
+//        cout << "check3" << endl;
+        ImageRGB32 processed_image = extract_box_reference(preprocessed_image, tight_box).copy();
+//        processed_image.save("tera_processed_image-" + std::to_string(c++) + ".png");
+
+//        cout << "check4" << endl;
+//        ImageRGB32 filtered_image = to_blackwhite_rgb32_range(processed_image, true, 0xff000000, 0xff5f5f5f);
+        ImageRGB32 filtered_image = to_blackwhite_rgb32_brightness(
+            processed_image, true,
+            0x00010101, 0, threshold
+        );
+//        filtered_image.save("tera_filtered_image-" + std::to_string(c++) + ".png");
+
+//        cout << "check5" << endl;
+        slugs = TERA_RAID_SILHOUETTE_MATCHER().match(filtered_image, ALPHA_SPREAD);
+
+        slugs.clear_beyond_alpha(MAX_ALPHA);
+
+//        slugs.log(global_logger_tagged(), MAX_ALPHA);
+
+        if (slugs.results.size() == 1){
+            return slugs;
+        }
+    }
+
+    return slugs;
+}
+
+
+
+
+
+
+
+
+
+class Test_TeraSilhouetteReader : public ImageUnitTest{
+public:
+    Test_TeraSilhouetteReader(
+        const std::string& image,
+        std::string expected
+    )
+        : ImageUnitTest("PokemonSV::TeraSilhouetteReader - " + image, {image})
+        , m_expected(std::move(expected))
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        TeraSilhouetteReader reader(COLOR_RED);
+
+        const ImageRGB32& image = images[0];
+        ImageMatch::ImageMatchResult slugs = reader.read(image);
+        if (slugs.results.empty()){
+            std::stringstream ss;
+            ss << "No silhouette detected" << std::endl;
+            return ss.str();
+        }
+        std::string best_match = slugs.results.begin()->second;
+
+        TEST_RESULT_EQUAL_STR(best_match, m_expected);
+
+        return true;
+    };
+
+private:
+    std::string m_expected;
+};
+
+
+
+
+void add_tests_TeraSilhouetteReader(UnitTestDatabase& database){
+    database.add<Test_TeraSilhouetteReader>("PokemonSV/TeraSilhouetteReader/applin.png", "applin");
+    database.add<Test_TeraSilhouetteReader>("PokemonSV/TeraSilhouetteReader/arboliva.png", "arboliva");
+    database.add<Test_TeraSilhouetteReader>("PokemonSV/TeraSilhouetteReader/axew.jpg", "axew");
+    database.add<Test_TeraSilhouetteReader>("PokemonSV/TeraSilhouetteReader/clodsire.jpg", "clodsire");
+    database.add<Test_TeraSilhouetteReader>("PokemonSV/TeraSilhouetteReader/donphan.jpg", "donphan");
+    database.add<Test_TeraSilhouetteReader>("PokemonSV/TeraSilhouetteReader/girafarig.jpg", "girafarig");
+    database.add<Test_TeraSilhouetteReader>("PokemonSV/TeraSilhouetteReader/lurantis.jpg", "lurantis");
+    database.add<Test_TeraSilhouetteReader>("PokemonSV/TeraSilhouetteReader/mimikyu-disguised.jpg", "mimikyu-disguised");
+    database.add<Test_TeraSilhouetteReader>("PokemonSV/TeraSilhouetteReader/noivern.jpg", "noivern");
+    database.add<Test_TeraSilhouetteReader>("PokemonSV/TeraSilhouetteReader/pineco.png", "pineco");
+    database.add<Test_TeraSilhouetteReader>("PokemonSV/TeraSilhouetteReader/raichu.jpg", "raichu");
+    database.add<Test_TeraSilhouetteReader>("PokemonSV/TeraSilhouetteReader/Scarlet_1star_applin.png", "applin");
+    database.add<Test_TeraSilhouetteReader>("PokemonSV/TeraSilhouetteReader/seviper.jpg", "seviper");
+    database.add<Test_TeraSilhouetteReader>("PokemonSV/TeraSilhouetteReader/staraptor.jpg", "staraptor");
+}
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Tera/PokemonSV_TeraSilhouetteReader.h b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Tera/PokemonSV_TeraSilhouetteReader.h
new file mode 100644
index 0000000000..1d84057608
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Tera/PokemonSV_TeraSilhouetteReader.h
@@ -0,0 +1,45 @@
+/*  Tera Silhouette Reader
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_TeraSilhouetteReader_H
+#define PokemonAutomation_PokemonSV_TeraSilhouetteReader_H
+
+#include "Common/Cpp/Color.h"
+#include "Common/Cpp/TestRunners/UnitTest.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/ImageMatch/ImageMatchResult.h"
+#include "CommonTools/ImageMatch/SilhouetteDictionaryMatcher.h"
+
+namespace PokemonAutomation{
+    struct ProgramInfo;
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+class TeraSilhouetteReader{
+public:
+    TeraSilhouetteReader(Color color = COLOR_GREEN);
+
+    void make_overlays(VideoOverlaySet& items) const;
+    ImageMatch::ImageMatchResult read(const ImageViewRGB32& screen) const;
+
+private:
+    Color m_color;
+    ImageFloatBox m_box;
+};
+
+
+
+void add_tests_TeraSilhouetteReader(UnitTestDatabase& database);
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Tera/PokemonSV_TeraTypeReader.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Tera/PokemonSV_TeraTypeReader.cpp
new file mode 100644
index 0000000000..5954454940
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Tera/PokemonSV_TeraTypeReader.cpp
@@ -0,0 +1,172 @@
+/*  Tera Type Reader
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "CommonTools/Images/ImageFilter.h"
+#include "CommonTools/ImageMatch/ImageCropper.h"
+#include "Tests/ImageUnitTest.h"
+#include "Tests/TestUtils.h"
+#include "VideoGames/PokemonSV/Resources/PokemonSV_PokemonSprites.h"
+#include "PokemonSV_TeraTypeReader.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+ImageMatch::SilhouetteDictionaryMatcher make_TERA_RAID_TYPE_MATCHER(){
+    ImageMatch::SilhouetteDictionaryMatcher matcher;
+    for (size_t i = 0; i < NUM_TERA_TYPE; i++){
+        matcher.add(TERA_TYPE_NAMES[i], ALL_TERA_TYPE_ICONS()[i]);
+    }
+    return matcher;
+}
+const ImageMatch::SilhouetteDictionaryMatcher& TERA_RAID_TYPE_MATCHER(){
+    static ImageMatch::SilhouetteDictionaryMatcher matcher = make_TERA_RAID_TYPE_MATCHER();
+    return matcher;
+}
+
+TeraTypeReader::TeraTypeReader(Color color)
+    : m_matcher(TERA_RAID_TYPE_MATCHER())
+    , m_color(color)
+    , m_box(0.787, 0.139, 0.073, 0.136)
+{}
+void TeraTypeReader::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_box);
+}
+
+ImageMatch::ImageMatchResult TeraTypeReader::read(const ImageViewRGB32& screen) const{
+    static constexpr double MAX_ALPHA = 100;
+    static constexpr double ALPHA_SPREAD = 20;
+
+    const std::vector<uint32_t> BRIGHTNESS_THRESHOLDS{
+        200,
+        150,
+        100,
+        125,
+        175,
+        225,
+    };
+
+//    static int c = 0;
+    for (uint32_t threshold : BRIGHTNESS_THRESHOLDS){
+
+        // Get a loose crop of the tera type icon
+        ImageViewRGB32 cropped_image = extract_box_reference(screen, m_box);
+        //cropped_image.save("cropped_image.png");
+
+        // Get a tight crop
+        const ImagePixelBox tight_box = ImageMatch::enclosing_rectangle_with_pixel_filter(
+            cropped_image,
+            // The filter is a lambda function that returns true on black tera type pixels.
+            [=](Color pixel){
+                return (uint32_t)pixel.red() + pixel.green() + pixel.blue() <= threshold;
+            }
+        );
+
+        if (tight_box.area() == 0){
+            continue;
+        }
+
+        ImageRGB32 processed_image = extract_box_reference(cropped_image, tight_box).copy();
+//        processed_image.save("processed_image-" + std::to_string(threshold) + ".png");
+
+        ImageRGB32 filtered_image = to_blackwhite_rgb32_brightness(
+            processed_image, true,
+            0x00010101, 0, threshold
+        );
+//        filtered_image.save("filtered_image-" + std::to_string(threshold) + ".png");
+
+        ImageMatch::ImageMatchResult types = m_matcher.match(filtered_image, ALPHA_SPREAD);
+//        types.log(global_logger_tagged(), MAX_ALPHA);
+        types.clear_beyond_alpha(MAX_ALPHA);
+
+        if (types.results.size() == 1){
+            return types;
+        }
+    }
+
+    return ImageMatch::ImageMatchResult();
+}
+
+
+
+
+
+
+
+
+class Test_TeraTypeReader : public ImageUnitTest{
+public:
+    Test_TeraTypeReader(
+        const std::string& image,
+        std::string expected
+    )
+        : ImageUnitTest("PokemonSV::TeraTypeReader - " + image, {image})
+        , m_expected(std::move(expected))
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        TeraTypeReader reader(COLOR_RED);
+
+        const ImageRGB32& image = images[0];
+        ImageMatch::ImageMatchResult types = reader.read(image);
+        if (types.results.empty()){
+            return false;
+        }
+        std::string best_match = types.results.begin()->second;
+
+        TEST_RESULT_EQUAL_STR(best_match, m_expected);
+
+        return true;
+    };
+
+private:
+    std::string m_expected;
+};
+
+
+
+
+void add_tests_TeraTypeReader(UnitTestDatabase& database){
+    database.add<Test_TeraTypeReader>("PokemonSV/TeraTypeReader/Bug.jpg", "Bug");
+    database.add<Test_TeraTypeReader>("PokemonSV/TeraTypeReader/Dark.jpg", "Dark");
+    database.add<Test_TeraTypeReader>("PokemonSV/TeraTypeReader/Dragon.jpg", "Dragon");
+    database.add<Test_TeraTypeReader>("PokemonSV/TeraTypeReader/Electric.jpg", "Electric");
+    database.add<Test_TeraTypeReader>("PokemonSV/TeraTypeReader/Fairy.jpg", "Fairy");
+    database.add<Test_TeraTypeReader>("PokemonSV/TeraTypeReader/Fighting.jpg", "Fighting");
+    database.add<Test_TeraTypeReader>("PokemonSV/TeraTypeReader/Fire.jpg", "Fire");
+    database.add<Test_TeraTypeReader>("PokemonSV/TeraTypeReader/Flying.jpg", "Flying");
+    database.add<Test_TeraTypeReader>("PokemonSV/TeraTypeReader/Ghost.jpg", "Ghost");
+    database.add<Test_TeraTypeReader>("PokemonSV/TeraTypeReader/Grass.jpg", "Grass");
+    database.add<Test_TeraTypeReader>("PokemonSV/TeraTypeReader/Ground.jpg", "Ground");
+    database.add<Test_TeraTypeReader>("PokemonSV/TeraTypeReader/Ice.jpg", "Ice");
+    database.add<Test_TeraTypeReader>("PokemonSV/TeraTypeReader/Normal.jpg", "Normal");
+    database.add<Test_TeraTypeReader>("PokemonSV/TeraTypeReader/Poison.jpg", "Poison");
+    database.add<Test_TeraTypeReader>("PokemonSV/TeraTypeReader/Psychic.jpg", "Psychic");
+    database.add<Test_TeraTypeReader>("PokemonSV/TeraTypeReader/Rock.jpg", "Rock");
+    database.add<Test_TeraTypeReader>("PokemonSV/TeraTypeReader/Steel.jpg", "Steel");
+    database.add<Test_TeraTypeReader>("PokemonSV/TeraTypeReader/Water.jpg", "Water");
+    database.add<Test_TeraTypeReader>("PokemonSV/TeraTypeReader/Kuro_Bug.png", "Bug");
+    database.add<Test_TeraTypeReader>("PokemonSV/TeraTypeReader/Kuro2_Bug.png", "Bug");
+}
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Tera/PokemonSV_TeraTypeReader.h b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Tera/PokemonSV_TeraTypeReader.h
new file mode 100644
index 0000000000..d73187304b
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Tera/PokemonSV_TeraTypeReader.h
@@ -0,0 +1,49 @@
+/*  Tera Type Reader
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_TeraTypeReader_H
+#define PokemonAutomation_PokemonSV_TeraTypeReader_H
+
+#include "Common/Cpp/Color.h"
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/ImageMatch/ImageMatchResult.h"
+#include "CommonTools/ImageMatch/SilhouetteDictionaryMatcher.h"
+
+namespace PokemonAutomation{
+    struct ProgramInfo;
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+class TeraTypeReader{
+public:
+    TeraTypeReader(Color color = COLOR_BLUE);
+
+    void make_overlays(VideoOverlaySet& items) const;
+    ImageMatch::ImageMatchResult read(const ImageViewRGB32& screen) const;
+
+private:
+    const ImageMatch::SilhouetteDictionaryMatcher& m_matcher;
+    Color m_color;
+    ImageFloatBox m_box;
+};
+
+
+
+
+
+void add_tests_TeraTypeReader(UnitTestDatabase& database);
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/PokemonSV/Options/PokemonSV_AuctionItemSelectOption.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_AuctionItemSelectOption.cpp
similarity index 81%
rename from SerialPrograms/Source/PokemonSV/Options/PokemonSV_AuctionItemSelectOption.cpp
rename to SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_AuctionItemSelectOption.cpp
index affa23435b..31e3133cfd 100644
--- a/SerialPrograms/Source/PokemonSV/Options/PokemonSV_AuctionItemSelectOption.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_AuctionItemSelectOption.cpp
@@ -1,12 +1,12 @@
 /*  Auction Item Selector, UI component to select multiple items from auctions
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include "CommonFramework/Logging/Logger.h"
-#include "PokemonSV/Resources/PokemonSV_AuctionItemNames.h"
-#include "PokemonSV/Resources/PokemonSV_ItemSprites.h"
+#include "VideoGames/PokemonSV/Resources/PokemonSV_AuctionItemNames.h"
+#include "VideoGames/PokemonSV/Resources/PokemonSV_ItemSprites.h"
 #include "PokemonSV_AuctionItemSelectOption.h"
 
 namespace PokemonAutomation{
@@ -41,7 +41,7 @@ AuctionItemSelectCell::AuctionItemSelectCell(
 )
     : StringSelectCell(
         AUCTION_ITEM_SELECT_DATABASE(),
-        LockWhileRunning::LOCKED,
+        LockMode::LOCK_WHILE_RUNNING,
         default_slug
     )
 {}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_AuctionItemSelectOption.h b/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_AuctionItemSelectOption.h
new file mode 100644
index 0000000000..d488ad413b
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_AuctionItemSelectOption.h
@@ -0,0 +1,29 @@
+/*  Auction Item Selector, UI component to select multiple items from auctions
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_AuctionItemSelectOption_H
+#define PokemonAutomation_PokemonSV_AuctionItemSelectOption_H
+
+#include "CommonTools/Options/StringSelectOption.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+class AuctionItemSelectCell : public StringSelectCell{
+public:
+    AuctionItemSelectCell(const std::string& default_slug);
+};
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/PokemonSV/Options/PokemonSV_AuctionItemTable.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_AuctionItemTable.cpp
similarity index 76%
rename from SerialPrograms/Source/PokemonSV/Options/PokemonSV_AuctionItemTable.cpp
rename to SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_AuctionItemTable.cpp
index e96849c987..2227893367 100644
--- a/SerialPrograms/Source/PokemonSV/Options/PokemonSV_AuctionItemTable.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_AuctionItemTable.cpp
@@ -1,10 +1,9 @@
 /*  Auction item selector
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include "PokemonSV/Resources/PokemonSV_AuctionItemNames.h"
 #include "PokemonSV_AuctionItemTable.h"
 
 namespace PokemonAutomation{
@@ -13,13 +12,14 @@ namespace PokemonSV{
 
 
 
-AuctionItemSelectorRow::AuctionItemSelectorRow()
-    : item("level-ball")
+AuctionItemSelectorRow::AuctionItemSelectorRow(EditableTableOption& parent_table)
+    : EditableTableRow(parent_table)
+    , item("level-ball")
 {
     PA_ADD_OPTION(item);
 }
 std::unique_ptr<EditableTableRow> AuctionItemSelectorRow::clone() const{
-    std::unique_ptr<AuctionItemSelectorRow> ret(new AuctionItemSelectorRow());
+    std::unique_ptr<AuctionItemSelectorRow> ret(new AuctionItemSelectorRow(parent()));
     ret->item.set_by_index(item.index());
     return ret;
 }
@@ -29,7 +29,7 @@ std::unique_ptr<EditableTableRow> AuctionItemSelectorRow::clone() const{
 AuctionItemTable::AuctionItemTable(std::string label)
     : EditableTableOption_t<AuctionItemSelectorRow>(
         std::move(label),
-        LockWhileRunning::LOCKED,
+        LockMode::LOCK_WHILE_RUNNING,
         make_defaults()
     )
 {}
@@ -39,7 +39,7 @@ AuctionItemTable::AuctionItemTable(std::string label)
 bool AuctionItemTable::find_item(const std::string& item_slug) const{
     std::vector<std::unique_ptr<AuctionItemSelectorRow>> table = copy_snapshot();
     for (const std::unique_ptr<AuctionItemSelectorRow>& row : table){
-        if (row->item.slug() == item_slug) {
+        if (row->item.slug() == item_slug){
             return true;
         }
     }
@@ -66,7 +66,7 @@ std::vector<std::string> AuctionItemTable::make_header() const{
 
 std::vector<std::unique_ptr<EditableTableRow>> AuctionItemTable::make_defaults(){
     std::vector<std::unique_ptr<EditableTableRow>> ret;
-    ret.emplace_back(std::make_unique<AuctionItemSelectorRow>());
+    ret.emplace_back(std::make_unique<AuctionItemSelectorRow>(*this));
     return ret;
 }
 
diff --git a/SerialPrograms/Source/PokemonSV/Options/PokemonSV_AuctionItemTable.h b/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_AuctionItemTable.h
similarity index 81%
rename from SerialPrograms/Source/PokemonSV/Options/PokemonSV_AuctionItemTable.h
rename to SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_AuctionItemTable.h
index ae4ca74d1a..1c951b5522 100644
--- a/SerialPrograms/Source/PokemonSV/Options/PokemonSV_AuctionItemTable.h
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_AuctionItemTable.h
@@ -1,6 +1,6 @@
 /*  Auction item selector, UI component to select multiple items from auctions
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -18,7 +18,7 @@ namespace PokemonSV{
 
 class AuctionItemSelectorRow : public EditableTableRow{
 public:
-    AuctionItemSelectorRow();
+    AuctionItemSelectorRow(EditableTableOption& parent_table);
     virtual std::unique_ptr<EditableTableRow> clone() const override;
 
 public:
@@ -39,7 +39,7 @@ class AuctionItemTable : public EditableTableOption_t<AuctionItemSelectorRow>{
 
     virtual std::vector<std::string> make_header() const override;
 
-    static std::vector<std::unique_ptr<EditableTableRow>> make_defaults();
+    std::vector<std::unique_ptr<EditableTableRow>> make_defaults();
 };
 
 
diff --git a/SerialPrograms/Source/PokemonSV/Options/PokemonSV_AutoHostOptions.h b/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_AutoHostOptions.h
similarity index 88%
rename from SerialPrograms/Source/PokemonSV/Options/PokemonSV_AutoHostOptions.h
rename to SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_AutoHostOptions.h
index 9cd4a2c607..2d9a0d2be2 100644
--- a/SerialPrograms/Source/PokemonSV/Options/PokemonSV_AutoHostOptions.h
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_AutoHostOptions.h
@@ -1,6 +1,6 @@
 /*  Auto Host Options
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -24,7 +24,7 @@ class LobbyWaitDelay : public SimpleIntegerOption<uint16_t>{
     LobbyWaitDelay()
         : SimpleIntegerOption<uint16_t>(
             "<b>Lobby Wait Delay (in seconds):</b><br>Wait this long before starting raid. Start time is 3 minutes minus this number.",
-            LockWhileRunning::UNLOCKED,
+            LockMode::UNLOCK_WHILE_RUNNING,
             60, 15, 180
         )
     {}
@@ -40,7 +40,7 @@ class StartRaidPlayers : public IntegerEnumDropdownOption{
                 {3, "3", "3 players including the host(s)"},
                 {4, "4", "4 players including the host(s)"},
             },
-            LockWhileRunning::UNLOCKED,
+            LockMode::UNLOCK_WHILE_RUNNING,
             4
         )
     {}
@@ -51,7 +51,7 @@ class ShowRaidCode : public BooleanCheckBoxOption{
     ShowRaidCode()
         : BooleanCheckBoxOption(
             "<b>Show Raid Code:</b><br>Include the raid code in the post notifications. This allows FCE users to copy-paste the code.",
-            LockWhileRunning::UNLOCKED,
+            LockMode::UNLOCK_WHILE_RUNNING,
             true
         )
     {}
@@ -63,7 +63,7 @@ class AutoHostDescription : public TextEditOption{
     AutoHostDescription()
         : TextEditOption(
             "<b>Description:</b>",
-            LockWhileRunning::UNLOCKED,
+            LockMode::UNLOCK_WHILE_RUNNING,
             "",
             "Auto-Hosting Shiny Eevee"
         )
@@ -77,7 +77,7 @@ class RemoteKillSwitch : public StringOption{
             false,
             "<b>Remote Kill Switch:</b><br>Stop the auto-host if the session crosses the date/time specified in this URL. "
             "The default URL is maintained by the PA/SHA staff which updates this with the event change dates.",
-            LockWhileRunning::UNLOCKED,
+            LockMode::UNLOCK_WHILE_RUNNING,
             "https://raw.githubusercontent.com/PokemonAutomation/ServerConfigs-PA-SHA/main/PokemonScarletViolet/TeraAutoHost-KillSwitch.json",
             "https://raw.githubusercontent.com/PokemonAutomation/ServerConfigs-PA-SHA/main/PokemonScarletViolet/TeraAutoHost-KillSwitch.json"
         )
@@ -90,7 +90,7 @@ class ConsecutiveFailurePause : public SimpleIntegerOption<uint8_t>{
         : SimpleIntegerOption<uint8_t>(
             "<b>Consecutive Failure Stop/Pause:</b><br>Pause or stop the program if this many consecutive raids fail.<br>"
             "It is not recommended to set this higher than 3 since soft bans start after 3 disconnects.",
-            LockWhileRunning::UNLOCKED,
+            LockMode::UNLOCK_WHILE_RUNNING,
             3, 1
         )
     {}
@@ -102,7 +102,7 @@ class FailurePauseMinutes : public SimpleIntegerOption<uint8_t>{
         : SimpleIntegerOption<uint8_t>(
             "<b>Failure Pause Time (in minutes):</b><br>If you trigger the above by failing too many times, "
             "pause for this many minutes before resuming the program. (Zero stops the program.)",
-            LockWhileRunning::UNLOCKED,
+            LockMode::UNLOCK_WHILE_RUNNING,
             0, 0
         )
     {}
@@ -113,7 +113,7 @@ class RolloverPrevention : public BooleanCheckBoxOption{
     RolloverPrevention()
         : BooleanCheckBoxOption(
             "<b>Rollover Prevention:</b><br>Periodically set the time back to 12AM to prevent the date from rolling over and losing the raid.",
-            LockWhileRunning::UNLOCKED,
+            LockMode::UNLOCK_WHILE_RUNNING,
             true
         )
     {}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_BBQOption.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_BBQOption.cpp
new file mode 100644
index 0000000000..431763d87c
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_BBQOption.cpp
@@ -0,0 +1,219 @@
+/*  BBQ Option
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+#include "VideoGames/PokemonSV/Inference/Boxes/PokemonSV_IvJudgeReader.h"
+#include "PokemonSV_BBQOption.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+//Does not include multiplayer quests
+const EnumDropdownDatabase<BBQuests>& BBQuests_database(){
+    static EnumDropdownDatabase<BBQuests> database{
+        {BBQuests::auto_10,         "auto-10",          "Defeat 10 wild Pokemon using Auto Battle!"},
+        {BBQuests::make_tm,         "make-tm",          "Make yourself a TM!"},
+        //{BBQuests::pickup_10,       "pickup-10",        "Pick up items on the ground 10 times!"},
+        {BBQuests::sneak_up,        "sneak-up",         "Successfully sneak up on 1 Pokemon and surprise them with a battle!"},
+        {BBQuests::photo_fly,       "photo-fly",        "Take a photo of a wild Pokemon in flight!"},
+        {BBQuests::photo_swim,      "photo-swim",       "Take a photo of a wild Pokemon that is swimming!"},
+        {BBQuests::photo_canyon,    "photo-canyon",     "Take a photo of a wild Pokemon in the Canyon Biome!"},
+        {BBQuests::photo_coastal,   "photo-coastal",    "Take a photo of a wild Pokemon in the Coastal Biome!"},
+        {BBQuests::photo_polar,     "photo-polar",      "Take a photo of a wild Pokemon in the Polar Biome!"},
+        {BBQuests::photo_savanna,   "photo-savanna",    "Take a photo of a wild Pokemon in the Savanna Biome!"},
+        {BBQuests::tera_self_defeat,"tera-self-defeat", "Terastallize your Pokemon to defeat a wild Pokemon!"},
+        {BBQuests::travel_500,      "travel-500",       "Travel over 500 yards!"},
+        {BBQuests::catch_any,       "catch-any",        "Catch 1 Pokemon!"},
+        {BBQuests::catch_normal,    "catch-normal",     "Catch 1 Normal-type Pokemon!"},
+        {BBQuests::catch_fighting,   "catch-fighting",   "Catch 1 Fighting-type Pokemon!"},
+        {BBQuests::catch_flying,    "catch-flying",     "Catch 1 Flying-type Pokemon!"},
+        {BBQuests::catch_poison,    "catch-poison",     "Catch 1 Poison-type Pokemon!"},
+        {BBQuests::catch_ground,    "catch-ground",     "Catch 1 Ground-type Pokemon!"},
+        {BBQuests::catch_rock,      "catch-rock",       "Catch 1 Rock-type Pokemon!"},
+        {BBQuests::catch_bug,       "catch-bug",        "Catch 1 Bug-type Pokemon!"},
+        {BBQuests::catch_ghost,     "catch-ghost",      "Catch 1 Ghost-type Pokemon!"},
+        {BBQuests::catch_steel,     "catch-steel",      "Catch 1 Steel-type Pokemon!"},
+        {BBQuests::catch_fire,      "catch-fire",       "Catch 1 Fire-type Pokemon!"},
+        {BBQuests::catch_water,     "catch-water",      "Catch 1 Water-type Pokemon!"},
+        {BBQuests::catch_grass,     "catch-grass",      "Catch 1 Grass-type Pokemon!"},
+        {BBQuests::catch_electric,  "catch-electric",   "Catch 1 Electric-type Pokemon!"},
+        {BBQuests::catch_psychic,   "catch-psychic",    "Catch 1 Psychic-type Pokemon!"},
+        {BBQuests::catch_ice,       "catch-ice",        "Catch 1 Ice-type Pokemon!"},
+        {BBQuests::catch_dragon,    "catch-dragon",     "Catch 1 Dragon-type Pokemon!"},
+        {BBQuests::catch_dark,      "catch-dark",       "Catch 1 Dark-type Pokemon!"},
+        {BBQuests::catch_fairy,     "catch-fairy",      "Catch 1 Fairy-type Pokemon!"},
+        {BBQuests::wash_pokemon,    "wash-pokemon",     "Give your Pokemon a nice washing!"},
+        {BBQuests::wild_tera,       "wild-tera",        "Battle a wild Tera Pokemon!"},
+        {BBQuests::auto_30,         "auto-30",          "Defeat 30 wild Pokemon using Auto Battle!"},
+        {BBQuests::tera_raid,       "tera-raid",        "Claim victory in a Tera Raid Battle!"},
+        {BBQuests::sandwich_three,  "sandwich-three",   "Make a sandwich that uses at least 3 ingredients!"},
+        {BBQuests::bitter_sandwich, "bitter-sandwich",  "Make a bitter sandwich!"},
+        {BBQuests::sweet_sandwich,  "sweet-sandwich",   "Make a sweet sandwich!"},
+        {BBQuests::salty_sandwich,  "salty-sandwich",   "Make a salty sandwich!"},
+        {BBQuests::sour_sandwich,   "sour-sandwich",    "Make a sour sandwich!"},
+        {BBQuests::spicy_sandwich,  "spicy-sandwich",   "Make a spicy sandwich!"},
+        //{BBQuests::hatch_egg,       "hatch-egg",        "Hatch a Pokemon Egg!"},
+        {BBQuests::photo_normal,    "photo-normal",     "Take a photo of a wild Normal-type Pokemon!"},
+        {BBQuests::photo_fighting,  "photo-fighting",   "Take a photo of a wild Fighting-type Pokemon!"},
+        {BBQuests::photo_flying,    "photo-flying",     "Take a photo of a wild Flying-type Pokemon!"},
+        {BBQuests::photo_poison,    "photo-poison",     "Take a photo of a wild Poison-type Pokemon!"},
+        {BBQuests::photo_ground,    "photo-ground",     "Take a photo of a wild Ground-type Pokemon!"},
+        {BBQuests::photo_rock,      "photo-rock",       "Take a photo of a wild Rock-type Pokemon!"},
+        {BBQuests::photo_bug,       "photo-bug",        "Take a photo of a wild Bug-type Pokemon!"},
+        {BBQuests::photo_ghost,     "photo-ghost",      "Take a photo of a wild Ghost-type Pokemon!"},
+        {BBQuests::photo_steel,     "photo-steel",      "Take a photo of a wild Steel-type Pokemon!"},
+        {BBQuests::photo_fire,      "photo-fire",       "Take a photo of a wild Fire-type Pokemon!"},
+        {BBQuests::photo_water,     "photo-water",      "Take a photo of a wild Water-type Pokemon!"},
+        {BBQuests::photo_grass,     "photo-grass",      "Take a photo of a wild Grass-type Pokemon!"},
+        {BBQuests::photo_electric,  "photo-electric",   "Take a photo of a wild Electric-type Pokemon!"},
+        {BBQuests::photo_psychic,   "photo-psychic",    "Take a photo of a wild Psychic-type Pokemon!"},
+        {BBQuests::photo_ice,       "photo-ice",        "Take a photo of a wild Ice-type Pokemon!"},
+        {BBQuests::photo_dragon,    "photo-dragon",     "Take a photo of a wild Dragon-type Pokemon!"},
+        {BBQuests::photo_dark,      "photo-dark",       "Take a photo of a wild Dark-type Pokemon!"},
+        {BBQuests::photo_fairy,     "photo-fairy",      "Take a photo of a wild Fairy-type Pokemon!"},
+    };
+    return database;
+}
+
+const EnumDropdownDatabase<BBQAction>& BBQAction_database(){
+    static EnumDropdownDatabase<BBQAction> database{
+        {BBQAction::run,    "run",      "Run Quest"},
+        {BBQAction::skip,   "skip",     "Skip"},
+        {BBQAction::reroll, "reroll",   "Reroll"},
+    };
+    return database;
+}
+
+BBQuestTableRow::BBQuestTableRow(EditableTableOption& parent_table)
+    : EditableTableRow(parent_table)
+    , quest(BBQuests_database(), LockMode::UNLOCK_WHILE_RUNNING, BBQuests::auto_10)
+    , action(BBQAction_database(), LockMode::UNLOCK_WHILE_RUNNING, BBQAction::skip)
+{
+    PA_ADD_OPTION(quest);
+    PA_ADD_OPTION(action);
+}
+std::unique_ptr<EditableTableRow> BBQuestTableRow::clone() const{
+    std::unique_ptr<BBQuestTableRow> ret(new BBQuestTableRow(parent()));
+    ret->quest.set(quest);
+    ret->action.set(action);
+    return ret;
+}
+
+BBQuestTable::BBQuestTable()
+    : EditableTableOption_t<BBQuestTableRow>(
+        "<b>Quest Exclusions:</b><br>"
+        "<b>Warning: Skipping Bonus quests will block the bonus slot.</b><br>"
+        "Exclude the quests in the table. If you want to skip a quest, select it below. "
+        "(Quests can be explicitly included, but this is not necessary.) "
+        "Do not exclude too many quests, as rerolling costs BP. "
+        "The program will automatically reroll all quests if none are possible, but will not handle being out of BP. "
+        "Does not include egg hatching or pickup quests, as eggs are handled in other options and pickup is not possible. ",
+        //"Duplicates of the same quest",
+        //duplicates will work in table order. might lead to weird behavior like rerolling and then marking a quest as complete.
+        //won't break the program though.
+        LockMode::LOCK_WHILE_RUNNING,
+        make_defaults()
+    )
+{}
+
+std::vector<std::string> BBQuestTable::make_header() const{
+    return {
+        "Quest",
+        "Action",
+    };
+}
+std::vector<std::unique_ptr<EditableTableRow>> BBQuestTable::make_defaults(){
+    std::vector<std::unique_ptr<EditableTableRow>> ret;
+    ret.emplace_back(new BBQuestTableRow(*this));
+    return ret;
+}
+
+
+BBQOption::BBQOption(OCR::LanguageOCROption* language_option)
+    : GroupOption("Blueberry Quests", LockMode::UNLOCK_WHILE_RUNNING)
+    , m_language_owner(language_option == nullptr
+        ? new OCR::LanguageOCROption(
+            "<b>Game Language:</b><br>This is required to read quests.",
+            IV_READER().languages(),
+            LockMode::LOCK_WHILE_RUNNING,
+            true
+        )
+        : nullptr
+    )
+    , LANGUAGE(language_option == nullptr ? *m_language_owner : *language_option)
+    , NUM_QUESTS(
+        "<b>Number of Quests to run:</b>",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        1000
+    )
+    , SAVE_NUM_QUESTS(
+        "<b>Save and reset the game after attempting this many quests:</b><br>This preserves progress and prevents potential game lags from long runs.<br>0 disables this option.",
+        LockMode::UNLOCK_WHILE_RUNNING, 50
+    )
+    , INVERTED_FLIGHT(
+        "<b>Inverted Flight:</b><br>Check this box if inverted flight controls are set.",
+        LockMode::LOCK_WHILE_RUNNING,
+        false
+    )
+    , QUICKBALL(
+        "<b>Catch Quest - Throw Quick Ball:</b><br>When attempting to catch a non-tera Pokemon, use a Quick Ball on the first turn.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        true
+    )
+    , BALL_SELECT(
+        "<b>Catch Quest - Ball Select:</b><br>What ball to use when performing a catch quest.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        "ultra-ball"
+    )
+    , NUM_EGGS(
+        "<b>Hatch Quest - Number of Eggs:</b><br>Amount of eggs located in your current box.",
+        LockMode::UNLOCK_WHILE_RUNNING, 30, 0, 30
+    )
+    , OUT_OF_EGGS(
+        "<b>Hatch Quest - Zero Eggs:</b><br>When out of eggs to hatch, do the selected option.",
+        {
+            {OOEggs::Stop,      "stop",         "Stop Program"},
+            {OOEggs::Reroll,    "reroll",       "Reroll Quest - Costs 50BP"},
+            {OOEggs::KeepGoing, "keep-going",   "Keep Going - Warning: Bonus(Red) quests will be blocked!"},
+        },
+        LockMode::UNLOCK_WHILE_RUNNING,
+        OOEggs::Stop
+    )
+    , FIX_TIME_FOR_HATCH(
+        "<b>Hatch Quest - Fix time for eggs:</b><br>Fix the time before doing a hatch egg quest.",
+        LockMode::UNLOCK_WHILE_RUNNING, false
+    )
+    , CATCH_ON_WIN(true)
+    , NUM_RETRIES(
+        "<b>Number of Retries:</b><br>Reattempt a quest this many times if it fails.",
+        LockMode::UNLOCK_WHILE_RUNNING, 1, 0, 5
+    )
+    , FIX_TIME_WHEN_DONE(
+        "<b>Fix Time when Done:</b><br>Fix the time after the program finishes.",
+        LockMode::UNLOCK_WHILE_RUNNING, false
+    )
+{
+    if (m_language_owner){
+        PA_ADD_OPTION(LANGUAGE);
+    }
+    PA_ADD_OPTION(NUM_QUESTS);
+    PA_ADD_OPTION(SAVE_NUM_QUESTS);
+    PA_ADD_OPTION(QUEST_EXCLUSIONS);
+    PA_ADD_OPTION(INVERTED_FLIGHT);
+    PA_ADD_OPTION(QUICKBALL);
+    PA_ADD_OPTION(BALL_SELECT);
+    PA_ADD_OPTION(NUM_EGGS);
+    PA_ADD_OPTION(OUT_OF_EGGS);
+    PA_ADD_OPTION(FIX_TIME_FOR_HATCH);
+    PA_ADD_OPTION(BATTLE_AI);
+    PA_ADD_OPTION(CATCH_ON_WIN);
+    PA_ADD_OPTION(NUM_RETRIES);
+    PA_ADD_OPTION(FIX_TIME_WHEN_DONE);
+}
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_BBQOption.h b/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_BBQOption.h
new file mode 100644
index 0000000000..f5715a10c7
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_BBQOption.h
@@ -0,0 +1,111 @@
+/*  BBQ Option
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_BBQOption_H
+#define PokemonAutomation_PokemonSV_BBQOption_H
+
+#include "Common/Cpp/Options/GroupOption.h"
+#include "Common/Cpp/Options/EnumDropdownOption.h"
+#include "Common/Cpp/Options/EditableTableOption.h"
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "CommonTools/Options/LanguageOCROption.h"
+#include "VideoGames/PokemonSwSh/Options/PokemonSwSh_BallSelectOption.h"
+#include "VideoGames/PokemonSV/Options/PokemonSV_TeraAIOption.h"
+#include "VideoGames/PokemonSV/Options/PokemonSV_TeraCatchOnWinOption.h"
+#include "VideoGames/PokemonSV/Options/PokemonSV_BBQuests.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+enum class BBQAction{
+    run,
+    skip,
+    reroll
+};
+
+//Quest exclusion table
+const EnumDropdownDatabase<BBQuests>& BBQuests_database();
+
+class BBQuestTableRow : public EditableTableRow{
+public:
+    BBQuestTableRow(EditableTableOption& parent_table);
+    virtual std::unique_ptr<EditableTableRow> clone() const override;
+
+public:
+    EnumDropdownCell<BBQuests> quest;
+    EnumDropdownCell<BBQAction> action;
+};
+
+class BBQuestTable : public EditableTableOption_t<BBQuestTableRow>{
+public:
+    BBQuestTable();
+
+    virtual std::vector<std::string> make_header() const;
+    std::vector<std::unique_ptr<EditableTableRow>> make_defaults();
+};
+
+
+//BBQ Options
+class BBQOption : public GroupOption{
+
+public:
+    //  Include the language option in the box.
+    BBQOption()
+        : BBQOption(nullptr)
+    {}
+
+    //  Don't include language option. Give it one instead.
+    BBQOption(OCR::LanguageOCROption& language_option)
+        : BBQOption(&language_option)
+    {}
+
+private:
+    std::unique_ptr<OCR::LanguageOCROption> m_language_owner;
+
+public:
+    enum class OOEggs {
+        Stop,
+        Reroll,
+        KeepGoing,
+    };
+
+    OCR::LanguageOCROption& LANGUAGE;
+
+    SimpleIntegerOption<uint64_t> NUM_QUESTS;
+    SimpleIntegerOption<uint64_t> SAVE_NUM_QUESTS;
+
+    BBQuestTable QUEST_EXCLUSIONS;
+
+    BooleanCheckBoxOption INVERTED_FLIGHT;
+
+    //For catching pokemon quests
+    BooleanCheckBoxOption QUICKBALL;
+    PokemonSwSh::PokemonBallSelectOption BALL_SELECT;
+    //BattleMoveTable BATTLE_MOVES; No need, not catching legendaries.
+
+    //For egg hatching quest
+    SimpleIntegerOption<uint8_t> NUM_EGGS;
+    EnumDropdownOption<OOEggs> OUT_OF_EGGS;
+    BooleanCheckBoxOption FIX_TIME_FOR_HATCH;
+
+    //Tera raid
+    TeraAIOption BATTLE_AI;
+    TeraFarmerCatchOnWin CATCH_ON_WIN;
+
+    SimpleIntegerOption<uint8_t> NUM_RETRIES;
+
+    BooleanCheckBoxOption FIX_TIME_WHEN_DONE;
+
+private:
+    BBQOption(OCR::LanguageOCROption* language_option);
+};
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_BBQuests.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_BBQuests.cpp
new file mode 100644
index 0000000000..9e90e5702d
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_BBQuests.cpp
@@ -0,0 +1,131 @@
+/*  Blueberry Quests
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <map>
+#include "PokemonSV_BBQuests.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+namespace{
+
+const std::map<std::string, BBQuests>& BBQuests_TOKEN_TO_ENUM(){
+    static std::map<std::string, BBQuests> data{
+        {"auto-10",             BBQuests::auto_10},
+        {"make-tm",             BBQuests::make_tm },
+        {"pickup-10",           BBQuests::pickup_10},
+        {"sneak-up",            BBQuests::sneak_up},
+        {"photo-fly",           BBQuests::photo_fly},
+        {"photo-swim",          BBQuests::photo_swim},
+        {"photo-canyon",        BBQuests::photo_canyon},
+        {"photo-coastal",       BBQuests::photo_coastal},
+        {"photo-polar",         BBQuests::photo_polar},
+        {"photo-savanna",       BBQuests::photo_savanna},
+        {"tera-self-defeat",    BBQuests::tera_self_defeat},
+        {"travel-500",          BBQuests::travel_500},
+        {"catch-any",           BBQuests::catch_any},
+        {"catch-normal",        BBQuests::catch_normal},
+        {"catch-fighting",      BBQuests::catch_fighting},
+        {"catch-flying",        BBQuests::catch_flying},
+        {"catch-poison",        BBQuests::catch_poison},
+        {"catch-ground",        BBQuests::catch_ground},
+        {"catch-rock",          BBQuests::catch_rock},
+        {"catch-bug",           BBQuests::catch_bug},
+        {"catch-ghost",         BBQuests::catch_ghost},
+        {"catch-steel",         BBQuests::catch_steel},
+        {"catch-fire",          BBQuests::catch_fire},
+        {"catch-water",         BBQuests::catch_water},
+        {"catch-grass",         BBQuests::catch_grass},
+        {"catch-electric",      BBQuests::catch_electric},
+        {"catch-psychic",       BBQuests::catch_psychic},
+        {"catch-ice",           BBQuests::catch_ice},
+        {"catch-dragon",        BBQuests::catch_dragon},
+        {"catch-dark",          BBQuests::catch_dark},
+        {"catch-fairy",         BBQuests::catch_fairy},
+        {"wash-pokemon",        BBQuests::wash_pokemon},
+        {"wild-tera",           BBQuests::wild_tera},
+        {"auto-30",             BBQuests::auto_30},
+        {"tera-raid",           BBQuests::tera_raid},
+        {"sandwich-three",      BBQuests::sandwich_three},
+        {"bitter-sandwich",     BBQuests::bitter_sandwich},
+        {"sweet-sandwich",      BBQuests::sweet_sandwich},
+        {"salty-sandwich",      BBQuests::salty_sandwich},
+        {"sour-sandwich",       BBQuests::sour_sandwich},
+        {"spicy-sandwich",      BBQuests::spicy_sandwich},
+        {"hatch-egg",           BBQuests::hatch_egg},
+        {"photo-normal",        BBQuests::photo_normal},
+        {"photo-fighting",      BBQuests::photo_fighting},
+        {"photo-flying",        BBQuests::photo_flying},
+        {"photo-poison",        BBQuests::photo_poison},
+        {"photo-ground",        BBQuests::photo_ground},
+        {"photo-rock",          BBQuests::photo_rock},
+        {"photo-bug",           BBQuests::photo_bug},
+        {"photo-ghost",         BBQuests::photo_ghost},
+        {"photo-steel",         BBQuests::photo_steel},
+        {"photo-fire",          BBQuests::photo_fire},
+        {"photo-water",         BBQuests::photo_water},
+        {"photo-grass",         BBQuests::photo_grass},
+        {"photo-electric",      BBQuests::photo_electric},
+        {"photo-psychic",       BBQuests::photo_psychic},
+        {"photo-ice",           BBQuests::photo_ice},
+        {"photo-dragon",        BBQuests::photo_dragon},
+        {"photo-dark",          BBQuests::photo_dark},
+        {"photo-fairy",         BBQuests::photo_fairy},
+        {"ditto-central",       BBQuests::ditto_central},
+        {"ditto-canyon",        BBQuests::ditto_canyon},
+        {"ditto-coastal",       BBQuests::ditto_coastal},
+        {"ditto-polar",         BBQuests::ditto_polar},
+        {"ditto-savanna",       BBQuests::ditto_savanna},
+        {"group-canyon",        BBQuests::group_canyon},
+        {"group-coastal",       BBQuests::group_coastal},
+        {"group-polar",         BBQuests::group_polar},
+        {"group-savanna",       BBQuests::group_savanna},
+        {"group-eyewear",       BBQuests::group_eyewear},
+        {"group-nonuniform",    BBQuests::group_nonuniform},
+        {"group-masks",         BBQuests::group_masks},
+        {"sandwich-four",       BBQuests::sandwich_four},
+        {"catch-hint",          BBQuests::catch_hint},
+        {"catch-hint2",         BBQuests::catch_hint2},
+        {"",                    BBQuests::UnableToDetect},
+    };
+    return data;
+}
+
+const std::map<BBQuests, std::string>& BBQuests_ENUM_TO_TOKEN(){
+    static std::map<BBQuests, std::string> data = []{
+        std::map<BBQuests, std::string> ret;
+        for (const auto& [token, quest] : BBQuests_TOKEN_TO_ENUM()){
+            ret.emplace(quest, token);
+        }
+        return ret;
+    }();
+    return data;
+}
+
+}
+
+BBQuests BBQuests_string_to_enum(const std::string& token){
+    auto iter = BBQuests_TOKEN_TO_ENUM().find(token);
+    if (iter == BBQuests_TOKEN_TO_ENUM().end()){
+        return BBQuests::UnableToDetect;
+    }
+    return iter->second;
+}
+
+const std::string& BBQuests_enum_to_string(BBQuests quest){
+    static const std::string EMPTY;
+    auto iter = BBQuests_ENUM_TO_TOKEN().find(quest);
+    if (iter == BBQuests_ENUM_TO_TOKEN().end()){
+        return EMPTY;
+    }
+    return iter->second;
+}
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_BBQuests.h b/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_BBQuests.h
new file mode 100644
index 0000000000..2f37ade6bf
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_BBQuests.h
@@ -0,0 +1,39 @@
+/*  Blueberry Quests
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_BBQuests_H
+#define PokemonAutomation_PokemonSV_BBQuests_H
+
+#include <string>
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+enum class BBQuests{
+    auto_10, make_tm, pickup_10, sneak_up, photo_fly, photo_swim, photo_canyon, photo_coastal, photo_polar, photo_savanna, tera_self_defeat,
+    travel_500, catch_any, catch_normal, catch_fighting, catch_flying, catch_poison, catch_ground, catch_rock, catch_bug, catch_ghost, catch_steel,
+    catch_fire, catch_water, catch_grass, catch_electric, catch_psychic, catch_ice, catch_dragon, catch_dark, catch_fairy,
+    wash_pokemon, wild_tera, auto_30, tera_raid, sandwich_three, bitter_sandwich, sweet_sandwich, salty_sandwich, sour_sandwich, spicy_sandwich, hatch_egg,
+    photo_normal, photo_fighting, photo_flying, photo_poison, photo_ground, photo_rock, photo_bug, photo_ghost, photo_steel, photo_fire, photo_water,
+    photo_grass, photo_electric, photo_psychic, photo_ice, photo_dragon, photo_dark, photo_fairy,
+    ditto_central, ditto_canyon, ditto_coastal, ditto_polar, ditto_savanna, group_canyon, group_coastal, group_polar, group_savanna, group_eyewear, group_nonuniform,
+    group_masks, sandwich_four, catch_hint, catch_hint2,
+    UnableToDetect
+};
+
+// Map a quest slug (as returned by BlueberryQuestDetector) to its enum.
+// Unrecognized slugs return UnableToDetect.
+BBQuests BBQuests_string_to_enum(const std::string& token);
+
+// Map a quest to its slug. UnableToDetect maps to the empty string.
+const std::string& BBQuests_enum_to_string(BBQuests quest);
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_BattleMoveTable.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_BattleMoveTable.cpp
new file mode 100644
index 0000000000..f7535ad7e6
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_BattleMoveTable.cpp
@@ -0,0 +1,64 @@
+/*  Battle Move Table
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "PokemonSV_BattleMoveTable.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+const EnumDropdownDatabase<BattleMoveType>& Battle_move_enum_database(){
+    static EnumDropdownDatabase<BattleMoveType> database{
+        {BattleMoveType::Move1,           "move1",            "Move 1"},
+        {BattleMoveType::Move2,           "move2",            "Move 2"},
+        {BattleMoveType::Move3,           "move3",            "Move 3"},
+        {BattleMoveType::Move4,           "move4",            "Move 4"},
+        //{BattleMoveType::tera,           "tera",            "Tera"},
+    };
+    return database;
+}
+
+BattleMoveTableRow::BattleMoveTableRow(EditableTableOption& parent_table)
+    : EditableTableRow(parent_table)
+    , type(Battle_move_enum_database(), LockMode::UNLOCK_WHILE_RUNNING, BattleMoveType::Move1)
+    , notes(false, LockMode::UNLOCK_WHILE_RUNNING, "", "(e.g. False Swipe, Thunder Wave)")
+{
+    PA_ADD_OPTION(type);
+    PA_ADD_OPTION(notes);
+}
+std::unique_ptr<EditableTableRow> BattleMoveTableRow::clone() const{
+    std::unique_ptr<BattleMoveTableRow> ret(new BattleMoveTableRow(parent()));
+    ret->type.set(type);
+    ret->notes.set(notes);
+    return ret;
+}
+
+BattleMoveTable::BattleMoveTable()
+    : EditableTableOption_t<BattleMoveTableRow>(
+        "<b>Move Table:</b><br>"
+        "Run this sequence of moves for your lead Pokemon only. "
+        "If your lead faints or the end of the table is reached, the program will switch to throwing the selected ball. ",
+        LockMode::LOCK_WHILE_RUNNING,
+        make_defaults()
+    )
+{}
+
+std::vector<std::string> BattleMoveTable::make_header() const{
+    return {
+        "Move",
+        "Notes",
+    };
+}
+std::vector<std::unique_ptr<EditableTableRow>> BattleMoveTable::make_defaults(){
+    std::vector<std::unique_ptr<EditableTableRow>> ret;
+    ret.emplace_back(new BattleMoveTableRow(*this));
+    return ret;
+}
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_BattleMoveTable.h b/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_BattleMoveTable.h
new file mode 100644
index 0000000000..76e8358bef
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_BattleMoveTable.h
@@ -0,0 +1,50 @@
+/*  Battle Move Table
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_BattleMoveTable_H
+#define PokemonAutomation_PokemonSV_BattleMoveTable_H
+
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "Common/Cpp/Options/StringOption.h"
+#include "Common/Cpp/Options/EnumDropdownOption.h"
+#include "Common/Cpp/Options/EditableTableOption.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+enum class BattleMoveType{
+    Move1,
+    Move2,
+    Move3,
+    Move4,
+};
+const EnumDropdownDatabase<BattleMoveType>& Battle_move_enum_database();
+
+class BattleMoveTableRow : public EditableTableRow{
+public:
+    BattleMoveTableRow(EditableTableOption& parent_table);
+    virtual std::unique_ptr<EditableTableRow> clone() const override;
+
+public:
+    EnumDropdownCell<BattleMoveType> type;
+    StringCell notes;
+};
+
+class BattleMoveTable : public EditableTableOption_t<BattleMoveTableRow>{
+public:
+    BattleMoveTable();
+
+    virtual std::vector<std::string> make_header() const;
+    std::vector<std::unique_ptr<EditableTableRow>> make_defaults();
+};
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/PokemonSV/Options/PokemonSV_EggPowerSandwichOption.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_EggPowerSandwichOption.cpp
similarity index 82%
rename from SerialPrograms/Source/PokemonSV/Options/PokemonSV_EggPowerSandwichOption.cpp
rename to SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_EggPowerSandwichOption.cpp
index 86224df0b7..70886ca553 100644
--- a/SerialPrograms/Source/PokemonSV/Options/PokemonSV_EggPowerSandwichOption.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_EggPowerSandwichOption.cpp
@@ -1,6 +1,6 @@
 /*  Egg Power Sandwich Option
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -13,14 +13,10 @@ namespace PokemonSV{
 
 
 EggPowerSandwichOption::EggPowerSandwichOption()
-    : GroupOption(
-        "Egg Power Sandwich",
-        LockWhileRunning::UNLOCKED,
-        false, true
-    )
+    : GroupOption("Egg Power Sandwich", LockMode::UNLOCK_WHILE_RUNNING)
     , MAX_NUM_SANDWICHES(
         "<b>Max Sandwiches:</b><br>How many sandwiches you can make before running out of ingredients.",
-        LockWhileRunning::UNLOCKED,
+        LockMode::UNLOCK_WHILE_RUNNING,
         100, 0, 999
     )
     , EGG_SANDWICH_TYPE(
@@ -33,7 +29,7 @@ EggPowerSandwichOption::EggPowerSandwichOption()
             {EggSandwichType::SALTY_SWEET_HERBS, "salty-sweet-herbs", "Sweet and Salty Herbs and Lettuce"},
             {EggSandwichType::BITTER_SWEET_HERBS, "bitter-sweet-herbs", "Sweet and Bitter Herbs and Lettuce"},
         },
-        LockWhileRunning::UNLOCKED,
+        LockMode::UNLOCK_WHILE_RUNNING,
         EggSandwichType::GREAT_PEANUT_BUTTER
     )
 {
@@ -42,6 +38,9 @@ EggPowerSandwichOption::EggPowerSandwichOption()
 }
 
 
+
+
+
 }
 }
 }
diff --git a/SerialPrograms/Source/PokemonSV/Options/PokemonSV_EggPowerSandwichOption.h b/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_EggPowerSandwichOption.h
similarity index 81%
rename from SerialPrograms/Source/PokemonSV/Options/PokemonSV_EggPowerSandwichOption.h
rename to SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_EggPowerSandwichOption.h
index 6ca0f2a498..b16619995a 100644
--- a/SerialPrograms/Source/PokemonSV/Options/PokemonSV_EggPowerSandwichOption.h
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_EggPowerSandwichOption.h
@@ -1,6 +1,6 @@
 /*  Egg Power Sandwich Option
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -10,7 +10,7 @@
 #include "Common/Cpp/Options/EnumDropdownOption.h"
 #include "Common/Cpp/Options/GroupOption.h"
 #include "Common/Cpp/Options/SimpleIntegerOption.h"
-#include "PokemonSV/Programs/Sandwiches/PokemonSV_SandwichRoutines.h"
+#include "VideoGames/PokemonSV/Programs/Sandwiches/PokemonSV_SandwichRoutines.h"
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_EncounterActionsTable.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_EncounterActionsTable.cpp
new file mode 100644
index 0000000000..1d1228376b
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_EncounterActionsTable.cpp
@@ -0,0 +1,146 @@
+/*  Encounter Filter Table
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonSV/Resources/PokemonSV_NameDatabase.h"
+#include "PokemonSV_EncounterActionsTable.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+using namespace Pokemon;
+
+
+
+
+const EnumDropdownDatabase<EncounterActionsAction>& EncounterFilterAction_database(){
+    static EnumDropdownDatabase<EncounterActionsAction> database{
+        {EncounterActionsAction::RUN_AWAY,              "run-away",     "Run Away"},
+        {EncounterActionsAction::STOP_PROGRAM,          "stop-program", "Stop Program"},
+        {EncounterActionsAction::THROW_BALLS,           "throw-balls",  "Throw Balls"},
+        {EncounterActionsAction::THROW_BALLS_AND_SAVE,  "throw-balls-and-save",  "Throw Balls. Save if caught."},
+    };
+    return database;
+}
+const EnumDropdownDatabase<EncounterActionsShininess>& EncounterFilterShininess_database(){
+    static EnumDropdownDatabase<EncounterActionsShininess> database{
+        {EncounterActionsShininess::ANYTHING,   "anything",     "Anything"},
+        {EncounterActionsShininess::NOT_SHINY,  "not-shiny",    "Not Shiny"},
+        {EncounterActionsShininess::SHINY,      "shiny",        "Shiny"},
+    };
+    return database;
+}
+
+
+
+
+EncounterActionsRow::~EncounterActionsRow(){
+    action.remove_listener(*this);
+}
+EncounterActionsRow::EncounterActionsRow(EditableTableOption& parent_table)
+    : EditableTableRow(parent_table)
+    , pokemon(
+        ALL_POKEMON_NAMES(),
+        LockMode::UNLOCK_WHILE_RUNNING,
+        "glimmora"
+    )
+    , shininess(
+        EncounterFilterShininess_database(),
+        LockMode::UNLOCK_WHILE_RUNNING,
+        EncounterActionsShininess::SHINY
+    )
+    , action(
+        EncounterFilterAction_database(),
+        LockMode::UNLOCK_WHILE_RUNNING,
+        EncounterActionsAction::STOP_PROGRAM
+    )
+    , pokeball(LockMode::UNLOCK_WHILE_RUNNING, "poke-ball")
+    , ball_limit(LockMode::UNLOCK_WHILE_RUNNING, 40, 1, 999)
+{
+    PA_ADD_OPTION(pokemon);
+    PA_ADD_OPTION(shininess);
+    PA_ADD_OPTION(action);
+    PA_ADD_OPTION(pokeball);
+    PA_ADD_OPTION(ball_limit);
+
+    EncounterActionsRow::on_config_value_changed(this);
+
+    action.add_listener(*this);
+}
+std::unique_ptr<EditableTableRow> EncounterActionsRow::clone() const{
+    std::unique_ptr<EncounterActionsRow> ret(new EncounterActionsRow(parent()));
+    ret->action.set(action);
+    ret->pokeball.set_by_index(pokeball.index());
+    ret->pokemon.set_by_index(pokemon.index());
+    ret->shininess.set(shininess);
+    ret->ball_limit.set(ball_limit);
+    return ret;
+}
+EncounterActionsEntry EncounterActionsRow::snapshot() const{
+    return {
+        pokemon.slug(),
+        shininess,
+        action,
+        pokeball.slug(),
+        ball_limit,
+    };
+}
+void EncounterActionsRow::on_config_value_changed(void* object){
+    switch (action){
+    case EncounterActionsAction::STOP_PROGRAM:
+    case EncounterActionsAction::RUN_AWAY:
+        pokeball.set_visibility(ConfigOptionState::HIDDEN);
+        ball_limit.set_visibility(ConfigOptionState::HIDDEN);
+        break;
+    case EncounterActionsAction::THROW_BALLS:
+    case EncounterActionsAction::THROW_BALLS_AND_SAVE:
+        pokeball.set_visibility(ConfigOptionState::ENABLED);
+        ball_limit.set_visibility(ConfigOptionState::ENABLED);
+        break;
+    }
+}
+
+
+
+EncounterActionsTable::EncounterActionsTable()
+    : EditableTableOption_t<EncounterActionsRow>(
+        "<b>Actions Table:</b><br>"
+        "By default, the program will run from non-shinies and stop on shinies. "
+        "This table lets you override this default behavior for specific " +
+        STRING_POKEMON + " and their shininess. "
+        "If multiple entries match, the last one will be chosen. Note that running from "
+        "shinies will not despawn them since they cannot be killed via Let's Go.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        make_defaults()
+    )
+{}
+
+std::vector<EncounterActionsEntry> EncounterActionsTable::snapshot(){
+    return EditableTableOption_t<EncounterActionsRow>::snapshot<EncounterActionsEntry>();
+}
+std::vector<std::string> EncounterActionsTable::make_header() const{
+    return {
+        "Species",
+        "Shininess",
+        "Action",
+        Pokemon::STRING_POKEBALL,
+        "Ball Limit"
+    };
+}
+std::vector<std::unique_ptr<EditableTableRow>> EncounterActionsTable::make_defaults(){
+    std::vector<std::unique_ptr<EditableTableRow>> ret;
+    return ret;
+}
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_EncounterActionsTable.h b/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_EncounterActionsTable.h
new file mode 100644
index 0000000000..0c6f5f5e2c
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_EncounterActionsTable.h
@@ -0,0 +1,86 @@
+/*  Encounter Filter Table
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_EncounterFilterTable_H
+#define PokemonAutomation_PokemonSV_EncounterFilterTable_H
+
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "Common/Cpp/Options/EnumDropdownOption.h"
+#include "Common/Cpp/Options/EditableTableOption.h"
+#include "CommonTools/Options/StringSelectOption.h"
+#include "VideoGames/PokemonSwSh/Options/PokemonSwSh_BallSelectOption.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+enum class EncounterActionsAction{
+    STOP_PROGRAM,
+    RUN_AWAY,
+    THROW_BALLS,
+    THROW_BALLS_AND_SAVE,
+};
+
+enum class EncounterActionsShininess{
+    ANYTHING,
+    NOT_SHINY,
+    SHINY,
+};
+
+
+
+struct EncounterActionsEntry{
+    std::string pokemon;
+    EncounterActionsShininess shininess;
+    EncounterActionsAction action;
+    std::string ball;
+    uint16_t ball_limit;
+};
+
+
+class EncounterActionsRow : public EditableTableRow, private ConfigOption::Listener{
+public:
+    ~EncounterActionsRow();
+    EncounterActionsRow(EditableTableOption& parent_table);
+
+    virtual std::unique_ptr<EditableTableRow> clone() const override;
+
+    EncounterActionsEntry snapshot() const;
+
+private:
+    virtual void on_config_value_changed(void* object) override;
+
+private:
+    StringSelectCell pokemon;
+    EnumDropdownCell<EncounterActionsShininess> shininess;
+    EnumDropdownCell<EncounterActionsAction> action;
+    PokemonSwSh::PokemonBallSelectCell pokeball;
+    SimpleIntegerCell<uint16_t> ball_limit;
+};
+
+
+class EncounterActionsTable : public EditableTableOption_t<EncounterActionsRow>{
+public:
+    EncounterActionsTable();
+
+    std::vector<EncounterActionsEntry> snapshot();
+
+    virtual std::vector<std::string> make_header() const;
+
+    std::vector<std::unique_ptr<EditableTableRow>> make_defaults();
+
+};
+
+
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/PokemonSV/Options/PokemonSV_EncounterBotCommon.h b/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_EncounterBotCommon.h
similarity index 88%
rename from SerialPrograms/Source/PokemonSV/Options/PokemonSV_EncounterBotCommon.h
rename to SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_EncounterBotCommon.h
index 1cb23234f3..2bd93d9f15 100644
--- a/SerialPrograms/Source/PokemonSV/Options/PokemonSV_EncounterBotCommon.h
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_EncounterBotCommon.h
@@ -1,6 +1,6 @@
 /*  Encounter Bot Common
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -23,17 +23,17 @@ using namespace Pokemon;
 class EncounterBotCommonOptions : public BatchOption{
 public:
     EncounterBotCommonOptions()
-        : BatchOption(LockWhileRunning::UNLOCKED)
+        : BatchOption(LockMode::UNLOCK_WHILE_RUNNING)
         , USE_FIRST_MOVE_IF_CANNOT_THROW_BALL(
             "<b>Use 1st Move if Cannot Throw Ball:</b><br>"
             "If you can't throw a ball because the opponent is semi-invulnerable, use the 1st move instead. "
             "Therefore, your first move should be non-damaging to avoid killing the wild " + STRING_POKEMON + ".",
-            LockWhileRunning::UNLOCKED,
+            LockMode::UNLOCK_WHILE_RUNNING,
             true
         )
         , VIDEO_ON_SHINY(
             "<b>Video Capture:</b><br>Take a video of the encounter if it is shiny.",
-            LockWhileRunning::UNLOCKED,
+            LockMode::UNLOCK_WHILE_RUNNING,
             true
         )
         , NOTIFICATION_NONSHINY(
diff --git a/SerialPrograms/Source/PokemonSV/Options/PokemonSV_PlayerList.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_PlayerList.cpp
similarity index 81%
rename from SerialPrograms/Source/PokemonSV/Options/PokemonSV_PlayerList.cpp
rename to SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_PlayerList.cpp
index 3ef756dfd3..580438ec90 100644
--- a/SerialPrograms/Source/PokemonSV/Options/PokemonSV_PlayerList.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_PlayerList.cpp
@@ -1,12 +1,12 @@
 /*  Player List
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include "Common/Cpp/Json/JsonValue.h"
 #include "Common/Cpp/Json/JsonArray.h"
-#include "CommonFramework/GlobalSettingsPanel.h"
+#include "CommonFramework/StaticGlobals.h"
 #include "CommonFramework/Exceptions/OperationFailedException.h"
 #include "CommonFramework/Tools/FileDownloader.h"
 #include "Pokemon/Inference/Pokemon_NameReader.h"
@@ -17,15 +17,16 @@ namespace NintendoSwitch{
 namespace PokemonSV{
 
 
-PlayerListRow::PlayerListRow()
-    : enabled(LockWhileRunning::UNLOCKED, true)
+PlayerListRow::PlayerListRow(EditableTableOption& parent_table)
+    : EditableTableRow(parent_table)
+    , enabled(LockMode::UNLOCK_WHILE_RUNNING, true)
     , language(
         Pokemon::PokemonNameReader::instance().languages(),
-        LockWhileRunning::UNLOCKED
+        LockMode::UNLOCK_WHILE_RUNNING
     )
-    , name(false, LockWhileRunning::UNLOCKED, "", "Ash")
-    , log10p(LockWhileRunning::UNLOCKED, -2.5, -10, 0)
-    , notes(false, LockWhileRunning::UNLOCKED, "", "")
+    , name(false, LockMode::UNLOCK_WHILE_RUNNING, "", "Ash")
+    , log10p(LockMode::UNLOCK_WHILE_RUNNING, -2.5, -10, 0)
+    , notes(false, LockMode::UNLOCK_WHILE_RUNNING, "", "")
 {
     PA_ADD_OPTION(enabled);
     PA_ADD_OPTION(language);
@@ -34,7 +35,7 @@ PlayerListRow::PlayerListRow()
     PA_ADD_OPTION(notes);
 }
 std::unique_ptr<EditableTableRow> PlayerListRow::clone() const{
-    std::unique_ptr<PlayerListRow> ret(new PlayerListRow());
+    std::unique_ptr<PlayerListRow> ret(new PlayerListRow(parent()));
     ret->enabled = enabled.current_value();
     ret->language.set(language);
     ret->name.set(name);
@@ -57,7 +58,7 @@ PlayerListRowSnapshot PlayerListRow::snapshot() const{
 
 PlayerListTable::PlayerListTable(
     std::string label,
-    LockWhileRunning lock_while_running,
+    LockMode lock_while_running,
     std::string notes_label
 )
     : EditableTableOption_t<PlayerListRow>(
@@ -89,7 +90,11 @@ std::vector<PlayerListRowSnapshot> PlayerListTable::snapshot() const{
 
 
 RaidPlayerBanList::RaidPlayerBanList()
-    : GroupOption("Bans:", LockWhileRunning::UNLOCKED, true, true)
+    : GroupOption(
+        "Bans:",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        GroupOption::EnableMode::DEFAULT_ENABLED
+    )
     , text("Ban users from this raid. If a banned person tries to join, the raid will be reset.")
     , local_table(
         "<b>Ban Table:</b><br>A table of users to ban by IGN. "
@@ -99,7 +104,7 @@ RaidPlayerBanList::RaidPlayerBanList()
         "It is always negative. Lower value means the match needs to be more perfect to be a match.<br><br>"
         "If you are getting false positive hits, decrease this value. (make it more negative)<br>"
         "If it is failing to match, increase this value. (make it less negative)",
-        LockWhileRunning::UNLOCKED,
+        LockMode::UNLOCK_WHILE_RUNNING,
         "Ban Reason (shown publicly)"
     )
     , online_table_url(
@@ -107,21 +112,21 @@ RaidPlayerBanList::RaidPlayerBanList()
         "<b>Online Ban Table:</b><br> In addition to the above table, download a ban list from this URL.<br>"
         "Thus the list of banned players is the combination of both your local table above and the downloaded one.<br>"
         "This online ban list is automatically refreshed every raid - thus allowing the maintainer of the online list to manage bans for you.",
-        LockWhileRunning::UNLOCKED,
+        LockMode::UNLOCK_WHILE_RUNNING,
         "https://raw.githubusercontent.com/PokemonAutomation/ServerConfigs-PA-SHA/main/PokemonScarletViolet/TeraAutoHost-BanList.json",
         "https://raw.githubusercontent.com/PokemonAutomation/ServerConfigs-PA-SHA/main/PokemonScarletViolet/TeraAutoHost-BanList.json"
     )
     , ignore_whitelist(
         "<b>Ignore Whitelist:</b><br>Ignore the developer whitelist.",
-        LockWhileRunning::UNLOCKED,
+        LockMode::UNLOCK_WHILE_RUNNING,
         false
     )
-    , online_table("", LockWhileRunning::UNLOCKED, "")
+    , online_table("", LockMode::UNLOCK_WHILE_RUNNING, "")
 {
     PA_ADD_OPTION(text);
     PA_ADD_OPTION(local_table);
     PA_ADD_OPTION(online_table_url);
-    if (PreloadSettings::instance().DEVELOPER_MODE){
+    if (STATIC_GLOBALS.DEVELOPER_MODE){
         PA_ADD_OPTION(ignore_whitelist);
     }
 }
@@ -156,7 +161,7 @@ void RaidPlayerBanList::refresh_online_table(Logger& logger){
             logger.log("Downloaded ban table is empty or invalid.", COLOR_RED);
             return;
         }
-        size_t items = json.get_array()->size();
+        size_t items = json.to_array()->size();
         logger.log("Downloaded table has " + std::to_string(items) + " row(s).");
         online_table.load_json(json);
     }catch (OperationFailedException&){}
diff --git a/SerialPrograms/Source/PokemonSV/Options/PokemonSV_PlayerList.h b/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_PlayerList.h
similarity index 83%
rename from SerialPrograms/Source/PokemonSV/Options/PokemonSV_PlayerList.h
rename to SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_PlayerList.h
index 8f7fadf296..cdce1a5bb5 100644
--- a/SerialPrograms/Source/PokemonSV/Options/PokemonSV_PlayerList.h
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_PlayerList.h
@@ -1,6 +1,6 @@
 /*  Player List
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -13,7 +13,7 @@
 #include "Common/Cpp/Options/StringOption.h"
 #include "Common/Cpp/Options/GroupOption.h"
 #include "Common/Cpp/Options/EditableTableOption.h"
-#include "CommonFramework/Options/LanguageOCROption.h"
+#include "CommonTools/Options/LanguageOCROption.h"
 
 namespace PokemonAutomation{
     class Logger;
@@ -34,7 +34,7 @@ struct PlayerListRowSnapshot{
 
 class PlayerListRow : public EditableTableRow{
 public:
-    PlayerListRow();
+    PlayerListRow(EditableTableOption& parent_table);
     virtual std::unique_ptr<EditableTableRow> clone() const;
 
     PlayerListRowSnapshot snapshot() const;
@@ -50,12 +50,12 @@ class PlayerListTable : public EditableTableOption_t<PlayerListRow>{
 public:
     PlayerListTable(
         std::string label,
-        LockWhileRunning lock_while_running,
+        LockMode lock_while_running,
         std::string notes_label
     );
 
     virtual std::vector<std::string> make_header() const;
-    static std::vector<std::unique_ptr<EditableTableRow>> make_defaults();
+    std::vector<std::unique_ptr<EditableTableRow>> make_defaults();
 
     std::vector<PlayerListRowSnapshot> snapshot() const;
 
diff --git a/SerialPrograms/Source/PokemonSV/Options/PokemonSV_SandwichIngredientsOption.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_SandwichIngredientsOption.cpp
similarity index 77%
rename from SerialPrograms/Source/PokemonSV/Options/PokemonSV_SandwichIngredientsOption.cpp
rename to SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_SandwichIngredientsOption.cpp
index 76cfa12956..c19f5fc174 100644
--- a/SerialPrograms/Source/PokemonSV/Options/PokemonSV_SandwichIngredientsOption.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_SandwichIngredientsOption.cpp
@@ -1,60 +1,60 @@
-/*  Sandwich Ingredients Option
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/Logging/Logger.h"
-#include "PokemonSV/Resources/PokemonSV_Ingredients.h"
-#include "PokemonSV_SandwichIngredientsOption.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-StringSelectDatabase make_sandwich_ingredient_database() {
-    StringSelectDatabase ret;
-    for (const auto& slug : ALL_SANDWICH_FILLINGS_SLUGS()) {
-        const SandwichIngredientNames& data = get_ingredient_name(slug);
-        const SpriteDatabase::Sprite* sprite = SANDWICH_FILLINGS_DATABASE().get_nothrow(slug);
-        if (sprite == nullptr){
-            ret.add_entry(StringSelectEntry(slug, data.display_name()));
-            global_logger_tagged().log("Missing sprite for: " + slug, COLOR_RED);
-        }else{
-            ret.add_entry(StringSelectEntry(slug, data.display_name(), sprite->icon));
-        }
-    }
-    for (const auto& slug : ALL_SANDWICH_CONDIMENTS_SLUGS()) {
-        const SandwichIngredientNames& data = get_ingredient_name(slug);
-        const SpriteDatabase::Sprite* sprite = SANDWICH_CONDIMENTS_DATABASE().get_nothrow(slug);
-        if (sprite == nullptr){
-            ret.add_entry(StringSelectEntry(slug, data.display_name()));
-            global_logger_tagged().log("Missing sprite for: " + slug, COLOR_RED);
-        }else{
-            ret.add_entry(StringSelectEntry(slug, data.display_name(), sprite->icon));
-        }
-    }
-    
-    return ret;
-}
-const StringSelectDatabase& SANDWICH_INGREDIENT_DATABASE() {
-    static StringSelectDatabase database = make_sandwich_ingredient_database();
-    return database;
-}
-
-
-SandwichIngredientsTableCell::SandwichIngredientsTableCell(
-    const std::string& default_slug
-)
-    : StringSelectCell(
-        SANDWICH_INGREDIENT_DATABASE(),
-        LockWhileRunning::LOCKED,
-        default_slug
-    )
-{}
-
-
-
-}
-}
-}
+/*  Sandwich Ingredients Option
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Logging/Logger.h"
+#include "VideoGames/PokemonSV/Resources/PokemonSV_Ingredients.h"
+#include "PokemonSV_SandwichIngredientsOption.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+StringSelectDatabase make_sandwich_ingredient_database(){
+    StringSelectDatabase ret;
+    for (const auto& slug : ALL_SANDWICH_FILLINGS_SLUGS()){
+        const SandwichIngredientNames& data = get_ingredient_name(slug);
+        const SpriteDatabase::Sprite* sprite = SANDWICH_FILLINGS_DATABASE().get_nothrow(slug);
+        if (sprite == nullptr){
+            ret.add_entry(StringSelectEntry(slug, data.display_name()));
+            global_logger_tagged().log("Missing sprite for: " + slug, COLOR_RED);
+        }else{
+            ret.add_entry(StringSelectEntry(slug, data.display_name(), sprite->icon));
+        }
+    }
+    for (const auto& slug : ALL_SANDWICH_CONDIMENTS_SLUGS()){
+        const SandwichIngredientNames& data = get_ingredient_name(slug);
+        const SpriteDatabase::Sprite* sprite = SANDWICH_CONDIMENTS_DATABASE().get_nothrow(slug);
+        if (sprite == nullptr){
+            ret.add_entry(StringSelectEntry(slug, data.display_name()));
+            global_logger_tagged().log("Missing sprite for: " + slug, COLOR_RED);
+        }else{
+            ret.add_entry(StringSelectEntry(slug, data.display_name(), sprite->icon));
+        }
+    }
+    
+    return ret;
+}
+const StringSelectDatabase& SANDWICH_INGREDIENT_DATABASE(){
+    static StringSelectDatabase database = make_sandwich_ingredient_database();
+    return database;
+}
+
+
+SandwichIngredientsTableCell::SandwichIngredientsTableCell(
+    const std::string& default_slug
+)
+    : StringSelectCell(
+        SANDWICH_INGREDIENT_DATABASE(),
+        LockMode::LOCK_WHILE_RUNNING,
+        default_slug
+    )
+{}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_SandwichIngredientsOption.h b/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_SandwichIngredientsOption.h
new file mode 100644
index 0000000000..a80f97e066
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_SandwichIngredientsOption.h
@@ -0,0 +1,27 @@
+/*  Sandwich Ingredients Option
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_SandwichIngredientsOption_H
+#define PokemonAutomation_PokemonSV_SandwichIngredientsOption_H
+
+#include "CommonTools/Options/StringSelectOption.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+class SandwichIngredientsTableCell : public StringSelectCell{
+public:
+    SandwichIngredientsTableCell(const std::string& default_slug);
+};
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_SandwichIngredientsTable.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_SandwichIngredientsTable.cpp
new file mode 100644
index 0000000000..71a52f2224
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_SandwichIngredientsTable.cpp
@@ -0,0 +1,53 @@
+/*  Sandwich Ingredients Table
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "VideoGames/PokemonSV/Resources/PokemonSV_Ingredients.h"
+#include "PokemonSV_SandwichIngredientsTable.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+SandwichIngredientsTableRow::SandwichIngredientsTableRow(EditableTableOption& parent_table)
+    : EditableTableRow(parent_table)
+    , item("lettuce")
+{
+    PA_ADD_OPTION(item);
+}
+std::unique_ptr<EditableTableRow> SandwichIngredientsTableRow::clone() const{
+    std::unique_ptr<SandwichIngredientsTableRow> ret(new SandwichIngredientsTableRow(parent()));
+    ret->item.set_by_index(item.index());
+    return ret;
+}
+
+SandwichIngredientsTable::SandwichIngredientsTable(std::string label)
+    : EditableTableOption_t<SandwichIngredientsTableRow>(
+        std::move(label),
+        LockMode::LOCK_WHILE_RUNNING,
+        make_defaults()
+        )
+{}
+
+
+std::vector<std::string> SandwichIngredientsTable::make_header() const{
+    return std::vector<std::string>{
+        "Ingredient/Condiment",
+    };
+}
+
+std::vector<std::unique_ptr<EditableTableRow>> SandwichIngredientsTable::make_defaults(){
+    std::vector<std::unique_ptr<EditableTableRow>> ret;
+    ret.emplace_back(std::make_unique<SandwichIngredientsTableRow>(*this));
+    return ret;
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_SandwichIngredientsTable.h b/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_SandwichIngredientsTable.h
new file mode 100644
index 0000000000..076e46bfd2
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_SandwichIngredientsTable.h
@@ -0,0 +1,41 @@
+/*  Sandwich Ingredients Table
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_SandwichIngredientsTable_H
+#define PokemonAutomation_PokemonSV_SandwichIngredientsTable_H
+
+#include "Common/Cpp/Options/EditableTableOption.h"
+#include "PokemonSV_SandwichIngredientsOption.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+class SandwichIngredientsTableRow : public EditableTableRow{
+public:
+    SandwichIngredientsTableRow(EditableTableOption& parent_table);
+    virtual std::unique_ptr<EditableTableRow> clone() const override;
+
+public:
+    SandwichIngredientsTableCell item;
+};
+
+
+class SandwichIngredientsTable : public EditableTableOption_t<SandwichIngredientsTableRow>{
+public:
+    SandwichIngredientsTable(std::string label);
+
+    virtual std::vector<std::string> make_header() const override;
+
+    std::vector<std::unique_ptr<EditableTableRow>> make_defaults();
+};
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/PokemonSV/Options/PokemonSV_SandwichMakerOption.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_SandwichMakerOption.cpp
similarity index 82%
rename from SerialPrograms/Source/PokemonSV/Options/PokemonSV_SandwichMakerOption.cpp
rename to SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_SandwichMakerOption.cpp
index 57a88036c2..1b4dc66f73 100644
--- a/SerialPrograms/Source/PokemonSV/Options/PokemonSV_SandwichMakerOption.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_SandwichMakerOption.cpp
@@ -1,466 +1,567 @@
-/*  Sandwich Maker Option
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <map>
-//#include "PokemonSV/Resources/PokemonSV_Ingredients.h"
-#include "PokemonSV/Inference/Boxes/PokemonSV_IVCheckerReader.h"
-#include "PokemonSV_SandwichMakerOption.h"
-//#include "PokemonSV_SandwichIngredientsOption.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-
-//  Map for standard+type recipes taking Base + Type to find SandwichRecipe
-const std::map<std::pair<BaseRecipe, PokemonType>, SandwichRecipe>& PREMADE_SANDWICH_TYPE(){
-    static const std::map<std::pair<BaseRecipe, PokemonType>, SandwichRecipe> map{
-        {{BaseRecipe::shiny, PokemonType::normal},  SandwichRecipe::shiny_normal},
-        {{BaseRecipe::shiny, PokemonType::fire},    SandwichRecipe::shiny_fire},
-        {{BaseRecipe::shiny, PokemonType::water},   SandwichRecipe::shiny_water},
-        {{BaseRecipe::shiny, PokemonType::electric},SandwichRecipe::shiny_electric},
-        {{BaseRecipe::shiny, PokemonType::grass},   SandwichRecipe::shiny_grass},
-        {{BaseRecipe::shiny, PokemonType::ice},     SandwichRecipe::shiny_ice},
-        {{BaseRecipe::shiny, PokemonType::fighting},SandwichRecipe::shiny_fighting},
-        {{BaseRecipe::shiny, PokemonType::poison},  SandwichRecipe::shiny_poison},
-        {{BaseRecipe::shiny, PokemonType::ground},  SandwichRecipe::shiny_ground},
-        {{BaseRecipe::shiny, PokemonType::flying},  SandwichRecipe::shiny_flying},
-        {{BaseRecipe::shiny, PokemonType::psychic}, SandwichRecipe::shiny_psychic},
-        {{BaseRecipe::shiny, PokemonType::bug},     SandwichRecipe::shiny_bug},
-        {{BaseRecipe::shiny, PokemonType::rock},    SandwichRecipe::shiny_rock},
-        {{BaseRecipe::shiny, PokemonType::ghost},   SandwichRecipe::shiny_ghost},
-        {{BaseRecipe::shiny, PokemonType::dragon},  SandwichRecipe::shiny_dragon},
-        {{BaseRecipe::shiny, PokemonType::dark},    SandwichRecipe::shiny_dark},
-        {{BaseRecipe::shiny, PokemonType::steel},   SandwichRecipe::shiny_steel},
-        {{BaseRecipe::shiny, PokemonType::fairy},   SandwichRecipe::shiny_fairy},
-        {{BaseRecipe::huge,  PokemonType::normal},  SandwichRecipe::huge_normal},
-        {{BaseRecipe::huge,  PokemonType::fire},    SandwichRecipe::huge_fire},
-        {{BaseRecipe::huge,  PokemonType::water},   SandwichRecipe::huge_water},
-        {{BaseRecipe::huge,  PokemonType::electric},SandwichRecipe::huge_electric},
-        {{BaseRecipe::huge,  PokemonType::grass},   SandwichRecipe::huge_grass},
-        {{BaseRecipe::huge,  PokemonType::ice},     SandwichRecipe::huge_ice},
-        {{BaseRecipe::huge,  PokemonType::fighting},SandwichRecipe::huge_fighting},
-        {{BaseRecipe::huge,  PokemonType::poison},  SandwichRecipe::huge_poison},
-        {{BaseRecipe::huge,  PokemonType::ground},  SandwichRecipe::huge_ground},
-        {{BaseRecipe::huge,  PokemonType::flying},  SandwichRecipe::huge_flying},
-        {{BaseRecipe::huge,  PokemonType::psychic}, SandwichRecipe::huge_psychic},
-        {{BaseRecipe::huge,  PokemonType::bug},     SandwichRecipe::huge_bug},
-        {{BaseRecipe::huge,  PokemonType::rock},    SandwichRecipe::huge_rock},
-        {{BaseRecipe::huge,  PokemonType::ghost},   SandwichRecipe::huge_ghost},
-        {{BaseRecipe::huge,  PokemonType::dragon},  SandwichRecipe::huge_dragon},
-        {{BaseRecipe::huge,  PokemonType::dark},    SandwichRecipe::huge_dark},
-        {{BaseRecipe::huge,  PokemonType::steel},   SandwichRecipe::huge_steel},
-        {{BaseRecipe::huge,  PokemonType::fairy},   SandwichRecipe::huge_fairy},
-        {{BaseRecipe::tiny,  PokemonType::normal},  SandwichRecipe::tiny_normal},
-        {{BaseRecipe::tiny,  PokemonType::fire},    SandwichRecipe::tiny_fire},
-        {{BaseRecipe::tiny,  PokemonType::water},   SandwichRecipe::tiny_water},
-        {{BaseRecipe::tiny,  PokemonType::electric},SandwichRecipe::tiny_electric},
-        {{BaseRecipe::tiny,  PokemonType::grass},   SandwichRecipe::tiny_grass},
-        {{BaseRecipe::tiny,  PokemonType::ice},     SandwichRecipe::tiny_ice},
-        {{BaseRecipe::tiny,  PokemonType::fighting},SandwichRecipe::tiny_fighting},
-        {{BaseRecipe::tiny,  PokemonType::poison},  SandwichRecipe::tiny_poison},
-        {{BaseRecipe::tiny,  PokemonType::ground},  SandwichRecipe::tiny_ground},
-        {{BaseRecipe::tiny,  PokemonType::flying},  SandwichRecipe::tiny_flying},
-        {{BaseRecipe::tiny,  PokemonType::psychic}, SandwichRecipe::tiny_psychic},
-        {{BaseRecipe::tiny,  PokemonType::bug},     SandwichRecipe::tiny_bug},
-        {{BaseRecipe::tiny,  PokemonType::rock},    SandwichRecipe::tiny_rock},
-        {{BaseRecipe::tiny,  PokemonType::ghost},   SandwichRecipe::tiny_ghost},
-        {{BaseRecipe::tiny,  PokemonType::dragon},  SandwichRecipe::tiny_dragon},
-        {{BaseRecipe::tiny,  PokemonType::dark},    SandwichRecipe::tiny_dark},
-        {{BaseRecipe::tiny,  PokemonType::steel},   SandwichRecipe::tiny_steel},
-        {{BaseRecipe::tiny,  PokemonType::fairy},   SandwichRecipe::tiny_fairy},
-    };
-    return map;
-}
-
-//  Map for Other recipes
-const std::map<ParadoxRecipe, SandwichRecipe>& PREMADE_SANDWICH_OTHER(){
-    static const std::map<ParadoxRecipe, SandwichRecipe> map{
-        {ParadoxRecipe::humungo3_greattusk_1,     SandwichRecipe::humungo3_greattusk_1},
-        {ParadoxRecipe::humungo2_screamtail_1,    SandwichRecipe::humungo2_screamtail_1},
-        {ParadoxRecipe::humungo2_screamtail_2,    SandwichRecipe::humungo2_screamtail_2},
-        {ParadoxRecipe::humungo2_brutebonnet_1,   SandwichRecipe::humungo2_brutebonnet_1},
-        {ParadoxRecipe::humungo2_brutebonnet_2,   SandwichRecipe::humungo2_brutebonnet_2},
-        {ParadoxRecipe::humungo3_fluttermane_1,   SandwichRecipe::humungo3_fluttermane_1},
-        {ParadoxRecipe::humungo3_fluttermane_2,   SandwichRecipe::humungo3_fluttermane_2},
-        {ParadoxRecipe::humungo2_slitherwing_1,   SandwichRecipe::humungo2_slitherwing_1},
-        {ParadoxRecipe::humungo2_slitherwing_2,   SandwichRecipe::humungo2_slitherwing_2},
-        {ParadoxRecipe::humungo3_sandyshocks_1,   SandwichRecipe::humungo3_sandyshocks_1},
-        {ParadoxRecipe::humungo3_sandyshocks_2,   SandwichRecipe::humungo3_sandyshocks_2},
-        {ParadoxRecipe::humungo3_roaringmoon_1,   SandwichRecipe::humungo3_roaringmoon_1},
-        {ParadoxRecipe::humungo3_roaringmoon_2,   SandwichRecipe::humungo3_roaringmoon_2},
-        {ParadoxRecipe::humungo2_irontreads_1,    SandwichRecipe::humungo2_irontreads_1},
-        {ParadoxRecipe::humungo2_irontreads_2,    SandwichRecipe::humungo2_irontreads_2},
-        {ParadoxRecipe::humungo2_ironbundle_1,    SandwichRecipe::humungo2_ironbundle_1},
-        {ParadoxRecipe::humungo2_ironbundle_2,    SandwichRecipe::humungo2_ironbundle_2},
-        {ParadoxRecipe::humungo2_ironhands_1,     SandwichRecipe::humungo2_ironhands_1},
-        {ParadoxRecipe::humungo2_ironhands_2,     SandwichRecipe::humungo2_ironhands_2},
-        {ParadoxRecipe::humungo2_ironjugulis_1,   SandwichRecipe::humungo2_ironjugulis_1},
-        {ParadoxRecipe::humungo2_ironjugulis_2,   SandwichRecipe::humungo2_ironjugulis_2},
-        {ParadoxRecipe::humungo3_ironmoth_1,      SandwichRecipe::humungo3_ironmoth_1},
-        {ParadoxRecipe::humungo3_ironmoth_2,      SandwichRecipe::humungo3_ironmoth_2},
-        {ParadoxRecipe::humungo3_ironthorns_1,    SandwichRecipe::humungo3_ironthorns_1},
-        {ParadoxRecipe::humungo3_ironthorns_2,    SandwichRecipe::humungo3_ironthorns_2},
-        {ParadoxRecipe::humungo2_ironvaliant_1,   SandwichRecipe::humungo2_ironvaliant_1},
-        {ParadoxRecipe::humungo2_ironvaliant_2,   SandwichRecipe::humungo2_ironvaliant_2},
-        {ParadoxRecipe::teensy3_greattusk_1,      SandwichRecipe::teensy3_greattusk_1},
-        {ParadoxRecipe::teensy2_screamtail_1,     SandwichRecipe::teensy2_screamtail_1},
-        {ParadoxRecipe::teensy2_screamtail_2,     SandwichRecipe::teensy2_screamtail_2},
-        {ParadoxRecipe::teensy2_brutebonnet_1,    SandwichRecipe::teensy2_brutebonnet_1},
-        {ParadoxRecipe::teensy3_fluttermane_1,    SandwichRecipe::teensy3_fluttermane_1},
-        {ParadoxRecipe::teensy2_sliterwing_1,     SandwichRecipe::teensy2_sliterwing_1},
-        {ParadoxRecipe::teensy2_sliterwing_2,     SandwichRecipe::teensy2_sliterwing_2},
-        {ParadoxRecipe::teensy3_sandyshocks_1,    SandwichRecipe::teensy3_sandyshocks_1},
-        {ParadoxRecipe::teensy3_sandyshocks_2,    SandwichRecipe::teensy3_sandyshocks_2},
-        {ParadoxRecipe::teensy3_roaringmoon_1,    SandwichRecipe::teensy3_roaringmoon_1},
-        {ParadoxRecipe::teensy2_irontreads_1,     SandwichRecipe::teensy2_irontreads_1},
-        {ParadoxRecipe::teensy2_irontreads_2,     SandwichRecipe::teensy2_irontreads_2},
-        {ParadoxRecipe::teensy2_ironbundle_1,     SandwichRecipe::teensy2_ironbundle_1},
-        {ParadoxRecipe::teensy2_ironbundle_2,     SandwichRecipe::teensy2_ironbundle_2},
-        {ParadoxRecipe::teensy2_ironhands_1,      SandwichRecipe::teensy2_ironhands_1},
-        {ParadoxRecipe::teensy2_ironjugulis_1,    SandwichRecipe::teensy2_ironjugulis_1},
-        {ParadoxRecipe::teensy3_ironmoth_1,       SandwichRecipe::teensy3_ironmoth_1},
-        {ParadoxRecipe::teensy3_ironthorns_1,     SandwichRecipe::teensy3_ironthorns_1},
-        {ParadoxRecipe::teensy2_ironvaliant_1,    SandwichRecipe::teensy2_ironvaliant_1},
-        {ParadoxRecipe::teensy2_ironvaliant_2,    SandwichRecipe::teensy2_ironvaliant_2},
-    };
-    return map;
-}
-
-//  Leave the herba out, the user selects them as HERBA_ONE and HERBA_TWO.
-//  Remember the ingredient limits: Six fillings, four condiments. Two condiment slots will be taken by the Herba.
-const std::map<SandwichRecipe, std::vector<std::string>>& PREMADE_SANDWICH_INGREDIENTS(){
-    static const std::map<SandwichRecipe, std::vector<std::string>> map{
-        {SandwichRecipe::shiny_normal,          {"cucumber", "pickle", "tofu", "tofu", "tofu", "curry-powder", "curry-powder"}},
-        {SandwichRecipe::shiny_fire,            {"cucumber", "pickle", "red-bell-pepper", "red-bell-pepper","curry-powder","curry-powder", "red-bell-pepper"}},
-        {SandwichRecipe::shiny_water,           {"cucumber", "pickle", "cucumber", "cucumber", "cucumber","curry-powder","curry-powder"}},
-        {SandwichRecipe::shiny_electric,        {"cucumber", "pickle", "yellow-bell-pepper", "yellow-bell-pepper", "yellow-bell-pepper", "curry-powder", "curry-powder"}},
-        {SandwichRecipe::shiny_grass,           {"cucumber", "pickle", "lettuce", "lettuce", "lettuce", "curry-powder", "curry-powder"}},
-        {SandwichRecipe::shiny_ice,             {"cucumber", "pickle", "klawf-stick", "klawf-stick", "klawf-stick", "curry-powder", "curry-powder"}},
-        {SandwichRecipe::shiny_fighting,        {"cucumber", "pickle", "pickle", "pickle", "pickle", "curry-powder", "curry-powder"}},
-        {SandwichRecipe::shiny_poison,          {"cucumber", "pickle", "green-bell-pepper", "green-bell-pepper", "green-bell-pepper", "curry-powder", "curry-powder"}},
-        {SandwichRecipe::shiny_ground,          {"cucumber", "pickle", "ham", "ham", "ham", "curry-powder", "curry-powder"}},
-        {SandwichRecipe::shiny_flying,          {"cucumber", "pickle", "prosciutto", "prosciutto", "prosciutto", "curry-powder", "curry-powder"}},
-        {SandwichRecipe::shiny_psychic,         {"cucumber", "pickle", "onion", "onion", "onion", "curry-powder", "curry-powder"}},
-        {SandwichRecipe::shiny_bug,             {"cucumber", "pickle", "cherry-tomatoes", "cherry-tomatoes", "cherry-tomatoes", "curry-powder", "curry-powder"}},
-        {SandwichRecipe::shiny_rock,            {"cucumber", "pickle", "bacon", "bacon", "bacon", "curry-powder", "curry-powder"}},
-        {SandwichRecipe::shiny_ghost,           {"cucumber", "pickle", "red-onion", "red-onion", "red-onion", "curry-powder", "curry-powder"}},
-        {SandwichRecipe::shiny_dragon,          {"cucumber", "pickle", "avocado", "avocado", "avocado", "curry-powder", "curry-powder"}},
-        {SandwichRecipe::shiny_dark,            {"cucumber", "pickle", "smoked-fillet", "smoked-fillet", "smoked-fillet", "curry-powder", "curry-powder"}},
-        {SandwichRecipe::shiny_steel,           {"cucumber", "pickle", "hamburger", "hamburger", "hamburger", "curry-powder", "curry-powder"}},
-        {SandwichRecipe::shiny_fairy,           {"cucumber", "pickle", "tomato", "tomato", "tomato", "curry-powder", "curry-powder"}},
-        {SandwichRecipe::huge_normal,           {"tofu", "mustard", "mustard"}},
-        {SandwichRecipe::huge_fire,             {"red-bell-pepper", "mustard", "mustard"}},
-        {SandwichRecipe::huge_water,            {"cucumber", "mustard", "mustard"}},
-        {SandwichRecipe::huge_electric,         {"yellow-bell-pepper", "mustard", "mustard"}},
-        {SandwichRecipe::huge_grass,            {"lettuce", "mustard", "mustard"}},
-        {SandwichRecipe::huge_ice,              {"klawf-stick", "mustard", "mustard"}},
-        {SandwichRecipe::huge_fighting,         {"pickle", "mustard", "mustard"}},
-        {SandwichRecipe::huge_poison,           {"green-bell-pepper", "mustard", "mustard"}},
-        {SandwichRecipe::huge_ground,           {"ham", "mustard", "mustard"}},
-        {SandwichRecipe::huge_flying,           {"prosciutto", "mustard", "mustard"}},
-        {SandwichRecipe::huge_psychic,          {"onion", "mustard", "mustard"}},
-        {SandwichRecipe::huge_bug,              {"cherry-tomatoes", "mustard", "mustard"}},
-        {SandwichRecipe::huge_rock,             {"bacon", "mustard", "mustard"}},
-        {SandwichRecipe::huge_ghost,            {"red-onion", "mustard", "mustard"}},
-        {SandwichRecipe::huge_dragon,           {"avocado", "mustard", "mustard"}},
-        {SandwichRecipe::huge_dark,             {"smoked-fillet", "mustard", "mustard"}},
-        {SandwichRecipe::huge_steel,            {"hamburger", "mustard", "mustard"}},
-        {SandwichRecipe::huge_fairy,            {"tomato", "mustard", "mustard"}},
-        {SandwichRecipe::tiny_normal,           {"tofu", "mayonnaise", "mayonnaise"}},
-        {SandwichRecipe::tiny_fire,             {"red-bell-pepper", "mayonnaise", "mayonnaise"}},
-        {SandwichRecipe::tiny_water,            {"cucumber", "mayonnaise", "mayonnaise"}},
-        {SandwichRecipe::tiny_electric,         {"yellow-bell-pepper", "mayonnaise", "mayonnaise"}},
-        {SandwichRecipe::tiny_grass,            {"lettuce", "mayonnaise", "mayonnaise"}},
-        {SandwichRecipe::tiny_ice,              {"klawf-stick", "mayonnaise", "mayonnaise"}},
-        {SandwichRecipe::tiny_fighting,         {"pickle", "mayonnaise", "mayonnaise"}},
-        {SandwichRecipe::tiny_poison,           {"green-bell-pepper", "mayonnaise", "mayonnaise"}},
-        {SandwichRecipe::tiny_ground,           {"ham", "mayonnaise", "mayonnaise"}},
-        {SandwichRecipe::tiny_flying,           {"prosciutto", "mayonnaise", "mayonnaise"}},
-        {SandwichRecipe::tiny_psychic,          {"onion", "mayonnaise", "mayonnaise"}},
-        {SandwichRecipe::tiny_bug,              {"cherry-tomatoes", "mayonnaise", "mayonnaise"}},
-        {SandwichRecipe::tiny_rock,             {"bacon", "mayonnaise", "mayonnaise"}},
-        {SandwichRecipe::tiny_ghost,            {"red-onion", "mayonnaise", "mayonnaise"}},
-        {SandwichRecipe::tiny_dragon,           {"avocado", "mayonnaise", "mayonnaise"}},
-        {SandwichRecipe::tiny_dark,             {"smoked-fillet", "mayonnaise", "mayonnaise"}},
-        {SandwichRecipe::tiny_steel,            {"hamburger", "mayonnaise", "mayonnaise"}},
-        {SandwichRecipe::tiny_fairy,            {"tomato", "mayonnaise", "mayonnaise"}},
-        {SandwichRecipe::humungo3_greattusk_1,   {"herbed-sausage", "herbed-sausage", "herbed-sausage", "herbed-sausage", "ham", "horseradish", "jam", "wasabi", "spicy-herba-mystica"}},
-        {SandwichRecipe::humungo2_screamtail_1,  {"noodles", "tomato", "tomato", "wasabi", "spicy-herba-mystica"}},
-        {SandwichRecipe::humungo2_screamtail_2,  {"noodles", "potato-salad", "vinegar", "salty-herba-mystica"}},
-        {SandwichRecipe::humungo2_brutebonnet_1, {"potato-salad", "lettuce", "lettuce", "wasabi", "spicy-herba-mystica"}},
-        {SandwichRecipe::humungo2_brutebonnet_2, {"potato-salad", "rice", "jam", "chili-sauce", "salty-herba-mystica"}},
-        {SandwichRecipe::humungo3_fluttermane_1, {"potato-salad", "potato-salad", "potato-salad", "potato-salad", "potato-salad", "tomato", "spicy-herba-mystica"}},
-        {SandwichRecipe::humungo3_fluttermane_2, {"potato-salad", "potato-salad", "potato-salad", "potato-salad", "potato-salad", "olive-oil", "yogurt", "yogurt", "salty-herba-mystica"}},
-        {SandwichRecipe::humungo2_slitherwing_1, {"cherry-tomatoes", "cherry-tomatoes", "spicy-herba-mystica"}},
-        {SandwichRecipe::humungo2_slitherwing_2, {"pickle", "potato-salad", "rice", "chili-sauce", "cream-cheese", "salty-herba-mystica"}},
-        {SandwichRecipe::humungo3_sandyshocks_1, {"noodles", "noodles", "noodles", "noodles", "noodles", "mustard", "wasabi", "spicy-herba-mystica"}},
-        {SandwichRecipe::humungo3_sandyshocks_2, {"noodles", "noodles", "noodles", "noodles", "noodles", "mustard", "jam", "salty-herba-mystica"}},
-        {SandwichRecipe::humungo3_roaringmoon_1, {"potato-salad", "potato-salad", "potato-salad", "potato-salad", "potato-salad", "wasabi", "yogurt", "spicy-herba-mystica"}},
-        {SandwichRecipe::humungo3_roaringmoon_2, {"potato-salad", "potato-salad", "potato-salad", "potato-salad", "potato-salad", "wasabi", "vinegar", "salty-herba-mystica"}},
-        {SandwichRecipe::humungo2_irontreads_1,  {"ham", "ham", "egg", "mustard", "curry-powder", "spicy-herba-mystica"}},
-        {SandwichRecipe::humungo2_irontreads_2,  {"noodles", "potato-salad", "peanut-butter", "salty-herba-mystica"}},
-        {SandwichRecipe::humungo2_ironbundle_1,  {"cucumber", "cucumber", "noodles", "jam", "spicy-herba-mystica"}},
-        {SandwichRecipe::humungo2_ironbundle_2,  {"noodles", "rice", "wasabi", "curry-powder", "pepper", "salty-herba-mystica"}},
-        {SandwichRecipe::humungo2_ironhands_1,   {"yellow-bell-pepper", "yellow-bell-pepper", "spicy-herba-mystica"}},
-        {SandwichRecipe::humungo2_ironhands_2,   {"noodles", "pickle", "rice", "jam", "pepper", "salty-herba-mystica"}},
-        {SandwichRecipe::humungo2_ironjugulis_1, {"egg", "smoked-fillet", "smoked-fillet", "yogurt", "spicy-herba-mystica"}},
-        {SandwichRecipe::humungo2_ironjugulis_2, {"potato-salad", "rice", "ketchup", "wasabi", "salty-herba-mystica"}},
-        {SandwichRecipe::humungo3_ironmoth_1,    {"chorizo", "chorizo", "chorizo", "noodles", "red-bell-pepper", "olive-oil", "spicy-herba-mystica"}},
-        {SandwichRecipe::humungo3_ironmoth_2,    {"chorizo", "chorizo", "noodles", "noodles", "rice", "rice", "curry-powder", "salty-herba-mystica"}},
-        {SandwichRecipe::humungo3_ironthorns_1,  {"noodles", "noodles", "noodles", "noodles", "noodles", "marmalade", "mustard", "jam", "spicy-herba-mystica"}},
-        {SandwichRecipe::humungo3_ironthorns_2,  {"noodles", "noodles", "noodles", "noodles", "noodles", "yellow-bell-pepper", "mustard", "mustard", "salty-herba-mystica"}},
-        {SandwichRecipe::humungo2_ironvaliant_1, {"herbed-sausage", "tomato", "tomato", "marmalade", "wasabi", "yogurt", "spicy-herba-mystica"}},
-        {SandwichRecipe::humungo2_ironvaliant_2, {"potato-salad", "rice", "tomato", "salty-herba-mystica"}},
-        {SandwichRecipe::teensy3_greattusk_1,    {"herbed-sausage", "herbed-sausage", "herbed-sausage", "noodles", "pickle", "horseradish", "horseradish", "sour-herba-mystica"}},
-        {SandwichRecipe::teensy2_screamtail_1,   {"egg", "onion", "onion", "chili-sauce", "wasabi", "yogurt", "sour-herba-mystica"}},
-        {SandwichRecipe::teensy2_screamtail_2,   {"herbed-sausage", "tomato", "tomato", "wasabi", "wasabi", "salty-herba-mystica"}},
-        {SandwichRecipe::teensy2_brutebonnet_1,  {"egg", "smoked-fillet", "smoked-fillet", "chili-sauce", "curry-powder", "jam", "sour-herba-mystica"}},
-        {SandwichRecipe::teensy3_fluttermane_1,  {"cheese", "potato-salad", "potato-salad", "potato-salad", "potato-salad", "tomato", "curry-powder", "curry-powder", "sour-herba-mystica"}},
-        {SandwichRecipe::teensy2_sliterwing_1,   {"chorizo", "pickle", "pickle", "butter", "sour-herba-mystica"}},
-        {SandwichRecipe::teensy2_sliterwing_2,   {"chorizo", "pickle", "pickle", "curry-powder", "marmalade", "wasabi", "salty-herba-mystica"}},
-        {SandwichRecipe::teensy3_sandyshocks_1,  {"noodles", "noodles", "noodles", "noodles", "yellow-bell-pepper", "herbed-sausage", "horseradish", "sour-herba-mystica"}},
-        {SandwichRecipe::teensy3_sandyshocks_2,  {"fried-fillet", "fried-fillet", "noodles", "noodles", "noodles", "banana", "wasabi", "wasabi", "wasabi", "salty-herba-mystica"}},
-        {SandwichRecipe::teensy3_roaringmoon_1,  {"potato-salad", "potato-salad", "potato-salad", "potato-salad", "potato-salad", "herbed-sausage", "wasabi", "wasabi", "wasabi", "sour-herba-mystica"}},
-        {SandwichRecipe::teensy2_irontreads_1,   {"hamburger", "hamburger", "herbed-sausage", "curry-powder", "whipped-cream", "sour-herba-mystica"}},
-        {SandwichRecipe::teensy2_irontreads_2,   {"hamburger", "hamburger", "herbed-sausage", "curry-powder", "horseradish", "peanut-butter", "salty-herba-mystica"}},
-        {SandwichRecipe::teensy2_ironbundle_1,   {"herbed-sausage", "klawf-stick", "klawf-stick", "cream-cheese", "wasabi", "sour-herba-mystica"}},
-        {SandwichRecipe::teensy2_ironbundle_2,   {"herbed-sausage", "klawf-stick", "klawf-stick", "curry-powder", "pepper", "wasabi", "salty-herba-mystica"}},
-        {SandwichRecipe::teensy2_ironhands_1,    {"yellow-bell-pepper", "yellow-bell-pepper", "sour-herba-mystica"}},
-        {SandwichRecipe::teensy2_ironjugulis_1,  {"egg", "smoked-fillet", "smoked-fillet", "yogurt", "salt", "sour-herba-mystica"}},
-        {SandwichRecipe::teensy3_ironmoth_1,     {"chorizo", "chorizo", "chorizo", "noodles", "red-bell-pepper", "olive-oil", "sour-herba-mystica"}},
-        {SandwichRecipe::teensy3_ironthorns_1,   {"noodles", "noodles", "noodles", "noodles", "egg", "yellow-bell-pepper", "horseradish", "sour-herba-mystica"}},
-        {SandwichRecipe::teensy2_ironvaliant_1,  {"pickle", "pickle", "egg", "salt", "yogurt", "marmalade", "sour-herba-mystica"}},
-        {SandwichRecipe::teensy2_ironvaliant_2,  {"pickle", "pickle", "egg", "wasabi", "wasabi", "yogurt", "salty-herba-mystica"}},
-    };
-    return map;
-}
-
-
-
-
-
-std::string SandwichMakerOption::herba_to_string(HerbaSelection value) {
-    switch (value) {
-    case HerbaSelection::bitter_herba_mystica:
-        return "bitter-herba-mystica";
-    case HerbaSelection::salty_herba_mystica:
-        return "salty-herba-mystica";
-    case HerbaSelection::sour_herba_mystica:
-        return "sour-herba-mystica";
-    case HerbaSelection::spicy_herba_mystica:
-        return "spicy-herba-mystica";
-    case HerbaSelection::sweet_herba_mystica:
-        return "sweet-herba-mystica";
-    }
-    return "ERROR";
-}
-
-std::vector<std::string> SandwichMakerOption::get_premade_ingredients(SandwichRecipe value) {
-    auto iter = PREMADE_SANDWICH_INGREDIENTS().find(value);
-    return iter->second;
-}
-
-bool SandwichMakerOption::two_herba_required(BaseRecipe value) {
-    if (value == BaseRecipe::shiny || value == BaseRecipe::huge || value == BaseRecipe::tiny) {
-        return true;
-    }
-    return false;
-}
-
-SandwichRecipe SandwichMakerOption::get_premade_sandwich_recipe(BaseRecipe base, PokemonType type, ParadoxRecipe paradox) {
-    if (base == BaseRecipe::paradox)
-    {
-        auto iter = PREMADE_SANDWICH_OTHER().find(paradox);
-        return iter->second;
-    }
-    else {
-        auto iter = PREMADE_SANDWICH_TYPE().find(std::make_pair(base, type));
-        return iter->second;
-    }
-}
-
-SandwichMakerOption::~SandwichMakerOption() {
-    BASE_RECIPE.remove_listener(*this);
-}
-
-SandwichMakerOption::SandwichMakerOption(OCR::LanguageOCROption* language_option)
-    : GroupOption(
-        "Sandwich Maker",
-        LockWhileRunning::LOCKED,
-        false, true
-    )
-    , m_language_owner(language_option == nullptr
-        ? new OCR::LanguageOCROption(
-            "<b>Game Language:</b><br>Required to read ingredients.",
-            IV_READER().languages(),
-            LockWhileRunning::LOCKED,
-            true
-        )
-        : nullptr
-    )
-    , LANGUAGE(language_option == nullptr ? *m_language_owner : *language_option)
-    , BASE_RECIPE(
-        "<b>Sandwich Recipe:</b><br>Select a recipe to make a sandwich with preset ingredients, or select Custom Sandwich to make a sandwich using the table below. "
-        "Refer to the documentation for recipe ingredients and valid Herba Mystica combinations.",
-        {
-            {BaseRecipe::shiny,     "shiny",    "Sparkling + Title + Encounter"},
-            {BaseRecipe::huge,      "huge",     "Sparkling + Title + Humungo"},
-            {BaseRecipe::tiny,      "tiny",     "Sparkling + Title + Teensy"},
-            {BaseRecipe::paradox,   "paradox",  "Title + Encounter + Humungo/Teensy: Paradox-specific"},
-            {BaseRecipe::custom,    "custom",   "Custom Sandwich"},
-        },
-        LockWhileRunning::LOCKED,
-        BaseRecipe::shiny
-        )
-    , TYPE(
-        "",
-        {
-            {PokemonType::normal,   "normal",   "Normal"},
-            {PokemonType::fire,     "fire",     "Fire"},
-            {PokemonType::water,    "water",    "Water"},
-            {PokemonType::electric, "electric", "Electric"},
-            {PokemonType::grass,    "grass",    "Grass"},
-            {PokemonType::ice,      "ice",      "Ice"},
-            {PokemonType::fighting, "fighting", "Fighting"},
-            {PokemonType::poison,   "poison",   "Poison"},
-            {PokemonType::ground,   "ground",   "Ground"},
-            {PokemonType::flying,   "flying",   "Flying"},
-            {PokemonType::psychic,  "psychic",  "Psychic"},
-            {PokemonType::bug,      "bug",      "Bug"},
-            {PokemonType::rock,     "rock",     "Rock"},
-            {PokemonType::ghost,    "ghost",    "Ghost"},
-            {PokemonType::dragon,   "dragon",   "Dragon"},
-            {PokemonType::dark,     "dark",     "Dark"},
-            {PokemonType::steel,    "steel",    "Steel"},
-            {PokemonType::fairy,    "fairy",    "Fairy"},
-        },
-        LockWhileRunning::LOCKED,
-        PokemonType::normal
-    )
-    , PARADOX(
-        "",
-        {
-            {ParadoxRecipe::humungo3_greattusk_1,     "humungo3_greattusk_1",     "Great Tusk - Humungo #1"},
-            {ParadoxRecipe::humungo2_screamtail_1,    "humungo2_screamtail_1",    "Scream Tail - Humungo #1"},
-            {ParadoxRecipe::humungo2_screamtail_2,    "humungo2_screamtail_2",    "Scream Tail - Humungo #2"},
-            {ParadoxRecipe::humungo2_brutebonnet_1,   "humungo2_brutebonnet_1",   "Brute Bonnet - Humungo #1"},
-            {ParadoxRecipe::humungo2_brutebonnet_2,   "humungo2_brutebonnet_2",   "Brute Bonnet - Humungo #2"},
-            {ParadoxRecipe::humungo3_fluttermane_1,   "humungo3_fluttermane_1",   "Flutter Mane - Humungo #1"},
-            {ParadoxRecipe::humungo3_fluttermane_2,   "humungo3_fluttermane_2",   "Flutter Mane - Humungo #2"},
-            {ParadoxRecipe::humungo2_slitherwing_1,   "humungo2_slitherwing_1",   "Slither Wing - Humungo #1"},
-            {ParadoxRecipe::humungo2_slitherwing_2,   "humungo2_slitherwing_2",   "Slither Wing - Humungo #2"},
-            {ParadoxRecipe::humungo3_sandyshocks_1,   "humungo3_sandyshocks_1",   "Sandy Shocks - Humungo #1"},
-            {ParadoxRecipe::humungo3_sandyshocks_2,   "humungo3_sandyshocks_2",   "Sandy Shocks - Humungo #2"},
-            {ParadoxRecipe::humungo3_roaringmoon_1,   "humungo3_roaringmoon_1",   "Roaring Moon - Humungo #1"},
-            {ParadoxRecipe::humungo3_roaringmoon_2,   "humungo3_roaringmoon_2",   "Roaring Moon - Humungo #2"},
-            {ParadoxRecipe::humungo2_irontreads_1,    "humungo2_irontreads_1",    "Iron Treads - Humungo #1"},
-            {ParadoxRecipe::humungo2_irontreads_2,    "humungo2_irontreads_2",    "Iron Treads - Humungo #2"},
-            {ParadoxRecipe::humungo2_ironbundle_1,    "humungo2_ironbundle_1",    "Iron Bundle - Humungo #1"},
-            {ParadoxRecipe::humungo2_ironbundle_2,    "humungo2_ironbundle_2",    "Iron Bundle - Humungo #2"},
-            {ParadoxRecipe::humungo2_ironhands_1,     "humungo2_ironhands_1",     "Iron Hands - Humungo #1"},
-            {ParadoxRecipe::humungo2_ironhands_2,     "humungo2_ironhands_2",     "Iron Hands - Humungo #2"},
-            {ParadoxRecipe::humungo2_ironjugulis_1,   "humungo2_ironjugulis_1",   "Iron Jugulis - Humungo #1"},
-            {ParadoxRecipe::humungo2_ironjugulis_2,   "humungo2_ironjugulis_2",   "Iron Jugulis - Humungo #2"},
-            {ParadoxRecipe::humungo3_ironmoth_1,      "humungo3_ironmoth_1",      "Iron Moth - Humungo #1"},
-            {ParadoxRecipe::humungo3_ironmoth_2,      "humungo3_ironmoth_2",      "Iron Moth - Humungo #2"},
-            {ParadoxRecipe::humungo3_ironthorns_1,    "humungo3_ironthorns_1",    "Iron Thorns - Humungo #1"},
-            {ParadoxRecipe::humungo3_ironthorns_2,    "humungo3_ironthorns_2",    "Iron Thorns - Humungo #2"},
-            {ParadoxRecipe::humungo2_ironvaliant_1,   "humungo2_ironvaliant_1",   "Iron Valiant - Humungo #1"},
-            {ParadoxRecipe::humungo2_ironvaliant_2,   "humungo2_ironvaliant_2",   "Iron Valiant - Humungo #2"},
-            {ParadoxRecipe::teensy3_greattusk_1,      "teensy3_greattusk_1",      "Great Tusk - Teensy #1"},
-            {ParadoxRecipe::teensy2_screamtail_1,     "teensy2_screamtail_1",     "Scream Tail - Teensy #1"},
-            {ParadoxRecipe::teensy2_screamtail_2,     "teensy2_screamtail_2",     "Scream Tail - Teensy #2"},
-            {ParadoxRecipe::teensy2_brutebonnet_1,    "teensy2_brutebonnet_1",    "Brute Bonnet - Teensy #1"},
-            {ParadoxRecipe::teensy3_fluttermane_1,    "teensy3_fluttermane_1",    "Flutter Mane - Teensy #1"},
-            {ParadoxRecipe::teensy2_sliterwing_1,     "teensy2_sliterwing_1",     "Slither Wing - Teensy #1"},
-            {ParadoxRecipe::teensy2_sliterwing_2,     "teensy2_sliterwing_2",     "Slither Wing - Teensy #2"},
-            {ParadoxRecipe::teensy3_sandyshocks_1,    "teensy3_sandyshocks_1",    "Sandy Shocks - Teensy #1"},
-            {ParadoxRecipe::teensy3_sandyshocks_2,    "teensy3_sandyshocks_2",    "Sandy Shocks - Teensy #2"},
-            {ParadoxRecipe::teensy3_roaringmoon_1,    "teensy3_roaringmoon_1",    "Roaring Moon - Teensy #1"},
-            {ParadoxRecipe::teensy2_irontreads_1,     "teensy2_irontreads_1",     "Iron Treads - Teensy #1"},
-            {ParadoxRecipe::teensy2_irontreads_2,     "teensy2_irontreads_2",     "Iron Treads - Teensy #2"},
-            {ParadoxRecipe::teensy2_ironbundle_1,     "teensy2_ironbundle_1",     "Iron Bundle - Teensy #1"},
-            {ParadoxRecipe::teensy2_ironbundle_2,     "teensy2_ironbundle_2",     "Iron Bundle - Teensy #2"},
-            {ParadoxRecipe::teensy2_ironhands_1,      "teensy2_ironhands_1",      "Iron Hands - Teensy #1"},
-            {ParadoxRecipe::teensy2_ironjugulis_1,    "teensy2_ironjugulis_1",    "Iron Jugulis - Teensy #1"},
-            {ParadoxRecipe::teensy3_ironmoth_1,       "teensy3_ironmoth_1",       "Iron Moth - Teensy #1"},
-            {ParadoxRecipe::teensy3_ironthorns_1,     "teensy3_ironthorns_1",     "Iron Thorns - Teensy #1"},
-            {ParadoxRecipe::teensy2_ironvaliant_1,    "teensy2_ironvaliant_1",    "Iron Valiant - Teensy #1"},
-            {ParadoxRecipe::teensy2_ironvaliant_2,    "teensy2_ironvaliant_2",    "Iron Vailant - Teensy #2"},
-        },
-        LockWhileRunning::LOCKED,
-        ParadoxRecipe::humungo3_greattusk_1
-    )
-    , HERBA_ONE(
-        "<b>Herba Mystica:</b><br>Select the Herba Mystica to use in the preset recipe. Keep in mind which herb combinations are valid for the selected recipe.",
-        {
-            {HerbaSelection::sweet_herba_mystica,   "sweet-herba-mystica",  "Sweet Herba Mystica"},
-            {HerbaSelection::salty_herba_mystica,   "salty-herba-mystica",  "Salty Herba Mystica"},
-            {HerbaSelection::sour_herba_mystica,    "sour-herba-mystica",   "Sour Herba Mystica"},
-            {HerbaSelection::bitter_herba_mystica,  "bitter-herba-mystica", "Bitter Herba Mystica"},
-            {HerbaSelection::spicy_herba_mystica,   "spicy-herba-mystica",  "Spicy Herba Mystica"},
-        },
-        LockWhileRunning::LOCKED,
-        HerbaSelection::salty_herba_mystica
-    )
-    , HERBA_TWO(
-        "",
-        {
-            {HerbaSelection::sweet_herba_mystica,   "sweet-herba-mystica",  "Sweet Herba Mystica"},
-            {HerbaSelection::salty_herba_mystica,   "salty-herba-mystica",  "Salty Herba Mystica"},
-            {HerbaSelection::sour_herba_mystica,    "sour-herba-mystica",   "Sour Herba Mystica"},
-            {HerbaSelection::bitter_herba_mystica,  "bitter-herba-mystica", "Bitter Herba Mystica"},
-            {HerbaSelection::spicy_herba_mystica,   "spicy-herba-mystica",  "Spicy Herba Mystica"},
-        },
-        LockWhileRunning::LOCKED,
-        HerbaSelection::salty_herba_mystica
-    )
-    , SANDWICH_INGREDIENTS("<b>Custom Sandwich:</b><br>Make a sandwich from the selected ingredients.<br>You must have at least one ingredient and one condiment, and no more than six ingredients and four condiments.")
-{
-    if (m_language_owner){
-        PA_ADD_OPTION(LANGUAGE);
-    }
-    PA_ADD_OPTION(BASE_RECIPE);
-    PA_ADD_OPTION(TYPE);
-    PA_ADD_OPTION(PARADOX);
-    PA_ADD_OPTION(HERBA_ONE);
-    PA_ADD_OPTION(HERBA_TWO);
-    PA_ADD_OPTION(SANDWICH_INGREDIENTS);
-
-    SandwichMakerOption::value_changed();
-    BASE_RECIPE.add_listener(*this);
-
-}
-
-void SandwichMakerOption::value_changed() {
-    if (BASE_RECIPE == BaseRecipe::custom) {
-        SANDWICH_INGREDIENTS.set_visibility(ConfigOptionState::ENABLED);
-        HERBA_ONE.set_visibility(ConfigOptionState::DISABLED);
-        HERBA_TWO.set_visibility(ConfigOptionState::DISABLED);
-        TYPE.set_visibility(ConfigOptionState::DISABLED); //to prevent the options moving around
-        PARADOX.set_visibility(ConfigOptionState::HIDDEN);
-    }
-    else if (two_herba_required(BASE_RECIPE)) { //shiny, huge, tiny
-        SANDWICH_INGREDIENTS.set_visibility(ConfigOptionState::DISABLED);
-        HERBA_ONE.set_visibility(ConfigOptionState::ENABLED);
-        HERBA_TWO.set_visibility(ConfigOptionState::ENABLED);
-        TYPE.set_visibility(ConfigOptionState::ENABLED);
-        PARADOX.set_visibility(ConfigOptionState::HIDDEN);
-    }
-    else { //other
-        SANDWICH_INGREDIENTS.set_visibility(ConfigOptionState::DISABLED);
-        HERBA_ONE.set_visibility(ConfigOptionState::DISABLED);
-        HERBA_TWO.set_visibility(ConfigOptionState::DISABLED);
-        TYPE.set_visibility(ConfigOptionState::HIDDEN);
-        PARADOX.set_visibility(ConfigOptionState::ENABLED);
-    }
-}
-
-
-}
-}
-}
+/*  Sandwich Maker Option
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <map>
+//#include "VideoGames/PokemonSV/Resources/PokemonSV_Ingredients.h"
+#include "VideoGames/PokemonSV/Inference/Boxes/PokemonSV_IvJudgeReader.h"
+#include "PokemonSV_SandwichMakerOption.h"
+//#include "PokemonSV_SandwichIngredientsOption.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+//  Map for standard+type recipes taking Base + Type to find SandwichRecipe
+const std::map<std::pair<BaseRecipe, PokemonType>, SandwichRecipe>& PREMADE_SANDWICH_TYPE(){
+    static const std::map<std::pair<BaseRecipe, PokemonType>, SandwichRecipe> map{
+        {{BaseRecipe::non_shiny, PokemonType::normal},  SandwichRecipe::non_shiny_normal},
+        {{BaseRecipe::shiny, PokemonType::normal},  SandwichRecipe::shiny_normal},
+        {{BaseRecipe::shiny, PokemonType::fire},    SandwichRecipe::shiny_fire},
+        {{BaseRecipe::shiny, PokemonType::water},   SandwichRecipe::shiny_water},
+        {{BaseRecipe::shiny, PokemonType::electric},SandwichRecipe::shiny_electric},
+        {{BaseRecipe::shiny, PokemonType::grass},   SandwichRecipe::shiny_grass},
+        {{BaseRecipe::shiny, PokemonType::ice},     SandwichRecipe::shiny_ice},
+        {{BaseRecipe::shiny, PokemonType::fighting},SandwichRecipe::shiny_fighting},
+        {{BaseRecipe::shiny, PokemonType::poison},  SandwichRecipe::shiny_poison},
+        {{BaseRecipe::shiny, PokemonType::ground},  SandwichRecipe::shiny_ground},
+        {{BaseRecipe::shiny, PokemonType::flying},  SandwichRecipe::shiny_flying},
+        {{BaseRecipe::shiny, PokemonType::psychic}, SandwichRecipe::shiny_psychic},
+        {{BaseRecipe::shiny, PokemonType::bug},     SandwichRecipe::shiny_bug},
+        {{BaseRecipe::shiny, PokemonType::rock},    SandwichRecipe::shiny_rock},
+        {{BaseRecipe::shiny, PokemonType::ghost},   SandwichRecipe::shiny_ghost},
+        {{BaseRecipe::shiny, PokemonType::dragon},  SandwichRecipe::shiny_dragon},
+        {{BaseRecipe::shiny, PokemonType::dark},    SandwichRecipe::shiny_dark},
+        {{BaseRecipe::shiny, PokemonType::steel},   SandwichRecipe::shiny_steel},
+        {{BaseRecipe::shiny, PokemonType::fairy},   SandwichRecipe::shiny_fairy},
+        {{BaseRecipe::huge,  PokemonType::normal},  SandwichRecipe::huge_normal},
+        {{BaseRecipe::huge,  PokemonType::fire},    SandwichRecipe::huge_fire},
+        {{BaseRecipe::huge,  PokemonType::water},   SandwichRecipe::huge_water},
+        {{BaseRecipe::huge,  PokemonType::electric},SandwichRecipe::huge_electric},
+        {{BaseRecipe::huge,  PokemonType::grass},   SandwichRecipe::huge_grass},
+        {{BaseRecipe::huge,  PokemonType::ice},     SandwichRecipe::huge_ice},
+        {{BaseRecipe::huge,  PokemonType::fighting},SandwichRecipe::huge_fighting},
+        {{BaseRecipe::huge,  PokemonType::poison},  SandwichRecipe::huge_poison},
+        {{BaseRecipe::huge,  PokemonType::ground},  SandwichRecipe::huge_ground},
+        {{BaseRecipe::huge,  PokemonType::flying},  SandwichRecipe::huge_flying},
+        {{BaseRecipe::huge,  PokemonType::psychic}, SandwichRecipe::huge_psychic},
+        {{BaseRecipe::huge,  PokemonType::bug},     SandwichRecipe::huge_bug},
+        {{BaseRecipe::huge,  PokemonType::rock},    SandwichRecipe::huge_rock},
+        {{BaseRecipe::huge,  PokemonType::ghost},   SandwichRecipe::huge_ghost},
+        {{BaseRecipe::huge,  PokemonType::dragon},  SandwichRecipe::huge_dragon},
+        {{BaseRecipe::huge,  PokemonType::dark},    SandwichRecipe::huge_dark},
+        {{BaseRecipe::huge,  PokemonType::steel},   SandwichRecipe::huge_steel},
+        {{BaseRecipe::huge,  PokemonType::fairy},   SandwichRecipe::huge_fairy},
+        {{BaseRecipe::tiny,  PokemonType::normal},  SandwichRecipe::tiny_normal},
+        {{BaseRecipe::tiny,  PokemonType::fire},    SandwichRecipe::tiny_fire},
+        {{BaseRecipe::tiny,  PokemonType::water},   SandwichRecipe::tiny_water},
+        {{BaseRecipe::tiny,  PokemonType::electric},SandwichRecipe::tiny_electric},
+        {{BaseRecipe::tiny,  PokemonType::grass},   SandwichRecipe::tiny_grass},
+        {{BaseRecipe::tiny,  PokemonType::ice},     SandwichRecipe::tiny_ice},
+        {{BaseRecipe::tiny,  PokemonType::fighting},SandwichRecipe::tiny_fighting},
+        {{BaseRecipe::tiny,  PokemonType::poison},  SandwichRecipe::tiny_poison},
+        {{BaseRecipe::tiny,  PokemonType::ground},  SandwichRecipe::tiny_ground},
+        {{BaseRecipe::tiny,  PokemonType::flying},  SandwichRecipe::tiny_flying},
+        {{BaseRecipe::tiny,  PokemonType::psychic}, SandwichRecipe::tiny_psychic},
+        {{BaseRecipe::tiny,  PokemonType::bug},     SandwichRecipe::tiny_bug},
+        {{BaseRecipe::tiny,  PokemonType::rock},    SandwichRecipe::tiny_rock},
+        {{BaseRecipe::tiny,  PokemonType::ghost},   SandwichRecipe::tiny_ghost},
+        {{BaseRecipe::tiny,  PokemonType::dragon},  SandwichRecipe::tiny_dragon},
+        {{BaseRecipe::tiny,  PokemonType::dark},    SandwichRecipe::tiny_dark},
+        {{BaseRecipe::tiny,  PokemonType::steel},   SandwichRecipe::tiny_steel},
+        {{BaseRecipe::tiny,  PokemonType::fairy},   SandwichRecipe::tiny_fairy},
+    };
+    return map;
+}
+
+//  Map for Other recipes
+const std::map<ParadoxRecipe, SandwichRecipe>& PREMADE_SANDWICH_OTHER(){
+    static const std::map<ParadoxRecipe, SandwichRecipe> map{
+        {ParadoxRecipe::humungo3_greattusk_1,     SandwichRecipe::humungo3_greattusk_1},
+        {ParadoxRecipe::humungo2_screamtail_1,    SandwichRecipe::humungo2_screamtail_1},
+        {ParadoxRecipe::humungo2_screamtail_2,    SandwichRecipe::humungo2_screamtail_2},
+        {ParadoxRecipe::humungo2_brutebonnet_1,   SandwichRecipe::humungo2_brutebonnet_1},
+        {ParadoxRecipe::humungo2_brutebonnet_2,   SandwichRecipe::humungo2_brutebonnet_2},
+        {ParadoxRecipe::humungo3_fluttermane_1,   SandwichRecipe::humungo3_fluttermane_1},
+        {ParadoxRecipe::humungo3_fluttermane_2,   SandwichRecipe::humungo3_fluttermane_2},
+        {ParadoxRecipe::humungo2_slitherwing_1,   SandwichRecipe::humungo2_slitherwing_1},
+        {ParadoxRecipe::humungo2_slitherwing_2,   SandwichRecipe::humungo2_slitherwing_2},
+        {ParadoxRecipe::humungo3_sandyshocks_1,   SandwichRecipe::humungo3_sandyshocks_1},
+        {ParadoxRecipe::humungo3_sandyshocks_2,   SandwichRecipe::humungo3_sandyshocks_2},
+        {ParadoxRecipe::humungo3_roaringmoon_1,   SandwichRecipe::humungo3_roaringmoon_1},
+        {ParadoxRecipe::humungo3_roaringmoon_2,   SandwichRecipe::humungo3_roaringmoon_2},
+        {ParadoxRecipe::humungo2_irontreads_1,    SandwichRecipe::humungo2_irontreads_1},
+        {ParadoxRecipe::humungo2_irontreads_2,    SandwichRecipe::humungo2_irontreads_2},
+        {ParadoxRecipe::humungo2_ironbundle_1,    SandwichRecipe::humungo2_ironbundle_1},
+        {ParadoxRecipe::humungo2_ironbundle_2,    SandwichRecipe::humungo2_ironbundle_2},
+        {ParadoxRecipe::humungo2_ironhands_1,     SandwichRecipe::humungo2_ironhands_1},
+        {ParadoxRecipe::humungo2_ironhands_2,     SandwichRecipe::humungo2_ironhands_2},
+        {ParadoxRecipe::humungo2_ironjugulis_1,   SandwichRecipe::humungo2_ironjugulis_1},
+        {ParadoxRecipe::humungo2_ironjugulis_2,   SandwichRecipe::humungo2_ironjugulis_2},
+        {ParadoxRecipe::humungo3_ironmoth_1,      SandwichRecipe::humungo3_ironmoth_1},
+        {ParadoxRecipe::humungo3_ironmoth_2,      SandwichRecipe::humungo3_ironmoth_2},
+        {ParadoxRecipe::humungo3_ironthorns_1,    SandwichRecipe::humungo3_ironthorns_1},
+        {ParadoxRecipe::humungo3_ironthorns_2,    SandwichRecipe::humungo3_ironthorns_2},
+        {ParadoxRecipe::humungo2_ironvaliant_1,   SandwichRecipe::humungo2_ironvaliant_1},
+        {ParadoxRecipe::humungo2_ironvaliant_2,   SandwichRecipe::humungo2_ironvaliant_2},
+        {ParadoxRecipe::teensy3_greattusk_1,      SandwichRecipe::teensy3_greattusk_1},
+        {ParadoxRecipe::teensy2_screamtail_1,     SandwichRecipe::teensy2_screamtail_1},
+        {ParadoxRecipe::teensy2_screamtail_2,     SandwichRecipe::teensy2_screamtail_2},
+        {ParadoxRecipe::teensy2_brutebonnet_1,    SandwichRecipe::teensy2_brutebonnet_1},
+        {ParadoxRecipe::teensy3_fluttermane_1,    SandwichRecipe::teensy3_fluttermane_1},
+        {ParadoxRecipe::teensy2_sliterwing_1,     SandwichRecipe::teensy2_sliterwing_1},
+        {ParadoxRecipe::teensy2_sliterwing_2,     SandwichRecipe::teensy2_sliterwing_2},
+        {ParadoxRecipe::teensy3_sandyshocks_1,    SandwichRecipe::teensy3_sandyshocks_1},
+        {ParadoxRecipe::teensy3_sandyshocks_2,    SandwichRecipe::teensy3_sandyshocks_2},
+        {ParadoxRecipe::teensy3_roaringmoon_1,    SandwichRecipe::teensy3_roaringmoon_1},
+        {ParadoxRecipe::teensy2_irontreads_1,     SandwichRecipe::teensy2_irontreads_1},
+        {ParadoxRecipe::teensy2_irontreads_2,     SandwichRecipe::teensy2_irontreads_2},
+        {ParadoxRecipe::teensy2_ironbundle_1,     SandwichRecipe::teensy2_ironbundle_1},
+        {ParadoxRecipe::teensy2_ironbundle_2,     SandwichRecipe::teensy2_ironbundle_2},
+        {ParadoxRecipe::teensy2_ironhands_1,      SandwichRecipe::teensy2_ironhands_1},
+        {ParadoxRecipe::teensy2_ironjugulis_1,    SandwichRecipe::teensy2_ironjugulis_1},
+        {ParadoxRecipe::teensy3_ironmoth_1,       SandwichRecipe::teensy3_ironmoth_1},
+        {ParadoxRecipe::teensy3_ironthorns_1,     SandwichRecipe::teensy3_ironthorns_1},
+        {ParadoxRecipe::teensy2_ironvaliant_1,    SandwichRecipe::teensy2_ironvaliant_1},
+        {ParadoxRecipe::teensy2_ironvaliant_2,    SandwichRecipe::teensy2_ironvaliant_2},
+    };
+    return map;
+}
+
+//  Leave the herba out, the user selects them as HERBA_ONE and HERBA_TWO.
+//  Remember the ingredient limits: Six fillings, four condiments. Two condiment slots will be taken by the Herba.
+const std::map<SandwichRecipe, std::vector<std::string>>& PREMADE_SANDWICH_INGREDIENTS(){
+    static const std::map<SandwichRecipe, std::vector<std::string>> map{
+        {SandwichRecipe::non_shiny_normal,      {"chorizo", "chorizo", "chorizo", "chorizo", "banana", "banana", "mayonnaise", "mayonnaise", "mayonnaise", "whipped-cream"}},
+        {SandwichRecipe::shiny_normal,          {"cucumber", "pickle", "tofu", "tofu", "tofu", "curry-powder", "curry-powder"}},
+        {SandwichRecipe::shiny_fire,            {"cucumber", "pickle", "red-bell-pepper", "red-bell-pepper","curry-powder","curry-powder", "red-bell-pepper"}},
+        {SandwichRecipe::shiny_water,           {"cucumber", "pickle", "cucumber", "cucumber", "cucumber","curry-powder","curry-powder"}},
+        {SandwichRecipe::shiny_electric,        {"cucumber", "pickle", "yellow-bell-pepper", "yellow-bell-pepper", "yellow-bell-pepper", "curry-powder", "curry-powder"}},
+        {SandwichRecipe::shiny_grass,           {"cucumber", "pickle", "lettuce", "lettuce", "lettuce", "curry-powder", "curry-powder"}},
+        {SandwichRecipe::shiny_ice,             {"cucumber", "pickle", "klawf-stick", "klawf-stick", "klawf-stick", "curry-powder", "curry-powder"}},
+        {SandwichRecipe::shiny_fighting,        {"cucumber", "pickle", "pickle", "pickle", "pickle", "curry-powder", "curry-powder"}},
+        {SandwichRecipe::shiny_poison,          {"cucumber", "pickle", "green-bell-pepper", "green-bell-pepper", "green-bell-pepper", "curry-powder", "curry-powder"}},
+        {SandwichRecipe::shiny_ground,          {"cucumber", "pickle", "ham", "ham", "ham", "curry-powder", "curry-powder"}},
+        {SandwichRecipe::shiny_flying,          {"cucumber", "pickle", "prosciutto", "prosciutto", "prosciutto", "curry-powder", "curry-powder"}},
+        {SandwichRecipe::shiny_psychic,         {"cucumber", "pickle", "onion", "onion", "onion", "curry-powder", "curry-powder"}},
+        {SandwichRecipe::shiny_bug,             {"cucumber", "pickle", "cherry-tomatoes", "cherry-tomatoes", "cherry-tomatoes", "curry-powder", "curry-powder"}},
+        {SandwichRecipe::shiny_rock,            {"cucumber", "pickle", "bacon", "bacon", "bacon", "curry-powder", "curry-powder"}},
+        {SandwichRecipe::shiny_ghost,           {"cucumber", "pickle", "red-onion", "red-onion", "red-onion", "curry-powder", "curry-powder"}},
+        {SandwichRecipe::shiny_dragon,          {"cucumber", "pickle", "avocado", "avocado", "avocado", "curry-powder", "curry-powder"}},
+        {SandwichRecipe::shiny_dark,            {"cucumber", "pickle", "smoked-fillet", "smoked-fillet", "smoked-fillet", "curry-powder", "curry-powder"}},
+        {SandwichRecipe::shiny_steel,           {"cucumber", "pickle", "hamburger", "hamburger", "hamburger", "curry-powder", "curry-powder"}},
+        {SandwichRecipe::shiny_fairy,           {"cucumber", "pickle", "tomato", "tomato", "tomato", "curry-powder", "curry-powder"}},
+        {SandwichRecipe::huge_normal,           {"tofu", "mustard", "mustard"}},
+        {SandwichRecipe::huge_fire,             {"red-bell-pepper", "mustard", "mustard"}},
+        {SandwichRecipe::huge_water,            {"cucumber", "mustard", "mustard"}},
+        {SandwichRecipe::huge_electric,         {"yellow-bell-pepper", "mustard", "mustard"}},
+        {SandwichRecipe::huge_grass,            {"lettuce", "mustard", "mustard"}},
+        {SandwichRecipe::huge_ice,              {"klawf-stick", "mustard", "mustard"}},
+        {SandwichRecipe::huge_fighting,         {"pickle", "mustard", "mustard"}},
+        {SandwichRecipe::huge_poison,           {"green-bell-pepper", "mustard", "mustard"}},
+        {SandwichRecipe::huge_ground,           {"ham", "mustard", "mustard"}},
+        {SandwichRecipe::huge_flying,           {"prosciutto", "mustard", "mustard"}},
+        {SandwichRecipe::huge_psychic,          {"onion", "mustard", "mustard"}},
+        {SandwichRecipe::huge_bug,              {"cherry-tomatoes", "mustard", "mustard"}},
+        {SandwichRecipe::huge_rock,             {"bacon", "mustard", "mustard"}},
+        {SandwichRecipe::huge_ghost,            {"red-onion", "mustard", "mustard"}},
+        {SandwichRecipe::huge_dragon,           {"avocado", "mustard", "mustard"}},
+        {SandwichRecipe::huge_dark,             {"smoked-fillet", "mustard", "mustard"}},
+        {SandwichRecipe::huge_steel,            {"hamburger", "mustard", "mustard"}},
+        {SandwichRecipe::huge_fairy,            {"tomato", "mustard", "mustard"}},
+        {SandwichRecipe::tiny_normal,           {"tofu", "mayonnaise", "mayonnaise"}},
+        {SandwichRecipe::tiny_fire,             {"red-bell-pepper", "mayonnaise", "mayonnaise"}},
+        {SandwichRecipe::tiny_water,            {"cucumber", "mayonnaise", "mayonnaise"}},
+        {SandwichRecipe::tiny_electric,         {"yellow-bell-pepper", "mayonnaise", "mayonnaise"}},
+        {SandwichRecipe::tiny_grass,            {"lettuce", "mayonnaise", "mayonnaise"}},
+        {SandwichRecipe::tiny_ice,              {"klawf-stick", "mayonnaise", "mayonnaise"}},
+        {SandwichRecipe::tiny_fighting,         {"pickle", "mayonnaise", "mayonnaise"}},
+        {SandwichRecipe::tiny_poison,           {"green-bell-pepper", "mayonnaise", "mayonnaise"}},
+        {SandwichRecipe::tiny_ground,           {"ham", "mayonnaise", "mayonnaise"}},
+        {SandwichRecipe::tiny_flying,           {"prosciutto", "mayonnaise", "mayonnaise"}},
+        {SandwichRecipe::tiny_psychic,          {"onion", "mayonnaise", "mayonnaise"}},
+        {SandwichRecipe::tiny_bug,              {"cherry-tomatoes", "mayonnaise", "mayonnaise"}},
+        {SandwichRecipe::tiny_rock,             {"bacon", "mayonnaise", "mayonnaise"}},
+        {SandwichRecipe::tiny_ghost,            {"red-onion", "mayonnaise", "mayonnaise"}},
+        {SandwichRecipe::tiny_dragon,           {"avocado", "mayonnaise", "mayonnaise"}},
+        {SandwichRecipe::tiny_dark,             {"smoked-fillet", "mayonnaise", "mayonnaise"}},
+        {SandwichRecipe::tiny_steel,            {"hamburger", "mayonnaise", "mayonnaise"}},
+        {SandwichRecipe::tiny_fairy,            {"tomato", "mayonnaise", "mayonnaise"}},
+        {SandwichRecipe::humungo3_greattusk_1,   {"herbed-sausage", "herbed-sausage", "herbed-sausage", "herbed-sausage", "ham", "horseradish", "jam", "wasabi", "spicy-herba-mystica"}},
+        {SandwichRecipe::humungo2_screamtail_1,  {"noodles", "tomato", "tomato", "wasabi", "spicy-herba-mystica"}},
+        {SandwichRecipe::humungo2_screamtail_2,  {"noodles", "potato-salad", "vinegar", "salty-herba-mystica"}},
+        {SandwichRecipe::humungo2_brutebonnet_1, {"potato-salad", "lettuce", "lettuce", "wasabi", "spicy-herba-mystica"}},
+        {SandwichRecipe::humungo2_brutebonnet_2, {"potato-salad", "rice", "jam", "chili-sauce", "salty-herba-mystica"}},
+        {SandwichRecipe::humungo3_fluttermane_1, {"potato-salad", "potato-salad", "potato-salad", "potato-salad", "potato-salad", "tomato", "spicy-herba-mystica"}},
+        {SandwichRecipe::humungo3_fluttermane_2, {"potato-salad", "potato-salad", "potato-salad", "potato-salad", "potato-salad", "olive-oil", "yogurt", "yogurt", "salty-herba-mystica"}},
+        {SandwichRecipe::humungo2_slitherwing_1, {"cherry-tomatoes", "cherry-tomatoes", "spicy-herba-mystica"}},
+        {SandwichRecipe::humungo2_slitherwing_2, {"pickle", "potato-salad", "rice", "chili-sauce", "cream-cheese", "salty-herba-mystica"}},
+        {SandwichRecipe::humungo3_sandyshocks_1, {"noodles", "noodles", "noodles", "noodles", "noodles", "mustard", "wasabi", "spicy-herba-mystica"}},
+        {SandwichRecipe::humungo3_sandyshocks_2, {"noodles", "noodles", "noodles", "noodles", "noodles", "mustard", "jam", "salty-herba-mystica"}},
+        {SandwichRecipe::humungo3_roaringmoon_1, {"potato-salad", "potato-salad", "potato-salad", "potato-salad", "potato-salad", "wasabi", "yogurt", "spicy-herba-mystica"}},
+        {SandwichRecipe::humungo3_roaringmoon_2, {"potato-salad", "potato-salad", "potato-salad", "potato-salad", "potato-salad", "wasabi", "vinegar", "salty-herba-mystica"}},
+        {SandwichRecipe::humungo2_irontreads_1,  {"ham", "ham", "egg", "mustard", "curry-powder", "spicy-herba-mystica"}},
+        {SandwichRecipe::humungo2_irontreads_2,  {"noodles", "potato-salad", "peanut-butter", "salty-herba-mystica"}},
+        {SandwichRecipe::humungo2_ironbundle_1,  {"cucumber", "cucumber", "noodles", "jam", "spicy-herba-mystica"}},
+        {SandwichRecipe::humungo2_ironbundle_2,  {"noodles", "rice", "wasabi", "curry-powder", "pepper", "salty-herba-mystica"}},
+        {SandwichRecipe::humungo2_ironhands_1,   {"yellow-bell-pepper", "yellow-bell-pepper", "spicy-herba-mystica"}},
+        {SandwichRecipe::humungo2_ironhands_2,   {"noodles", "pickle", "rice", "jam", "pepper", "salty-herba-mystica"}},
+        {SandwichRecipe::humungo2_ironjugulis_1, {"egg", "smoked-fillet", "smoked-fillet", "yogurt", "spicy-herba-mystica"}},
+        {SandwichRecipe::humungo2_ironjugulis_2, {"potato-salad", "rice", "ketchup", "wasabi", "salty-herba-mystica"}},
+        {SandwichRecipe::humungo3_ironmoth_1,    {"chorizo", "chorizo", "chorizo", "noodles", "red-bell-pepper", "olive-oil", "spicy-herba-mystica"}},
+        {SandwichRecipe::humungo3_ironmoth_2,    {"chorizo", "chorizo", "noodles", "noodles", "rice", "rice", "curry-powder", "salty-herba-mystica"}},
+        {SandwichRecipe::humungo3_ironthorns_1,  {"noodles", "noodles", "noodles", "noodles", "noodles", "marmalade", "mustard", "jam", "spicy-herba-mystica"}},
+        {SandwichRecipe::humungo3_ironthorns_2,  {"noodles", "noodles", "noodles", "noodles", "noodles", "yellow-bell-pepper", "mustard", "mustard", "salty-herba-mystica"}},
+        {SandwichRecipe::humungo2_ironvaliant_1, {"herbed-sausage", "tomato", "tomato", "marmalade", "wasabi", "yogurt", "spicy-herba-mystica"}},
+        {SandwichRecipe::humungo2_ironvaliant_2, {"potato-salad", "rice", "tomato", "salty-herba-mystica"}},
+        {SandwichRecipe::teensy3_greattusk_1,    {"herbed-sausage", "herbed-sausage", "herbed-sausage", "noodles", "pickle", "horseradish", "horseradish", "sour-herba-mystica"}},
+        {SandwichRecipe::teensy2_screamtail_1,   {"egg", "onion", "onion", "chili-sauce", "wasabi", "yogurt", "sour-herba-mystica"}},
+        {SandwichRecipe::teensy2_screamtail_2,   {"herbed-sausage", "tomato", "tomato", "wasabi", "wasabi", "salty-herba-mystica"}},
+        {SandwichRecipe::teensy2_brutebonnet_1,  {"egg", "smoked-fillet", "smoked-fillet", "chili-sauce", "curry-powder", "jam", "sour-herba-mystica"}},
+        {SandwichRecipe::teensy3_fluttermane_1,  {"cheese", "potato-salad", "potato-salad", "potato-salad", "potato-salad", "tomato", "curry-powder", "curry-powder", "sour-herba-mystica"}},
+        {SandwichRecipe::teensy2_sliterwing_1,   {"chorizo", "pickle", "pickle", "butter", "sour-herba-mystica"}},
+        {SandwichRecipe::teensy2_sliterwing_2,   {"chorizo", "pickle", "pickle", "curry-powder", "marmalade", "wasabi", "salty-herba-mystica"}},
+        {SandwichRecipe::teensy3_sandyshocks_1,  {"noodles", "noodles", "noodles", "noodles", "yellow-bell-pepper", "herbed-sausage", "horseradish", "sour-herba-mystica"}},
+        {SandwichRecipe::teensy3_sandyshocks_2,  {"fried-fillet", "fried-fillet", "noodles", "noodles", "noodles", "banana", "wasabi", "wasabi", "wasabi", "salty-herba-mystica"}},
+        {SandwichRecipe::teensy3_roaringmoon_1,  {"potato-salad", "potato-salad", "potato-salad", "potato-salad", "potato-salad", "herbed-sausage", "wasabi", "wasabi", "wasabi", "sour-herba-mystica"}},
+        {SandwichRecipe::teensy2_irontreads_1,   {"hamburger", "hamburger", "herbed-sausage", "curry-powder", "whipped-cream", "sour-herba-mystica"}},
+        {SandwichRecipe::teensy2_irontreads_2,   {"hamburger", "hamburger", "herbed-sausage", "curry-powder", "horseradish", "peanut-butter", "salty-herba-mystica"}},
+        {SandwichRecipe::teensy2_ironbundle_1,   {"herbed-sausage", "klawf-stick", "klawf-stick", "cream-cheese", "wasabi", "sour-herba-mystica"}},
+        {SandwichRecipe::teensy2_ironbundle_2,   {"herbed-sausage", "klawf-stick", "klawf-stick", "curry-powder", "pepper", "wasabi", "salty-herba-mystica"}},
+        {SandwichRecipe::teensy2_ironhands_1,    {"yellow-bell-pepper", "yellow-bell-pepper", "sour-herba-mystica"}},
+        {SandwichRecipe::teensy2_ironjugulis_1,  {"egg", "smoked-fillet", "smoked-fillet", "yogurt", "salt", "sour-herba-mystica"}},
+        {SandwichRecipe::teensy3_ironmoth_1,     {"chorizo", "chorizo", "chorizo", "noodles", "red-bell-pepper", "olive-oil", "sour-herba-mystica"}},
+        {SandwichRecipe::teensy3_ironthorns_1,   {"noodles", "noodles", "noodles", "noodles", "egg", "yellow-bell-pepper", "horseradish", "sour-herba-mystica"}},
+        {SandwichRecipe::teensy2_ironvaliant_1,  {"pickle", "pickle", "egg", "salt", "yogurt", "marmalade", "sour-herba-mystica"}},
+        {SandwichRecipe::teensy2_ironvaliant_2,  {"pickle", "pickle", "egg", "wasabi", "wasabi", "yogurt", "salty-herba-mystica"}},
+    };
+    return map;
+}
+
+
+
+
+
+std::string SandwichMakerOption::herba_to_string(HerbaSelection value){
+    switch (value){
+    case HerbaSelection::bitter_herba_mystica:
+        return "bitter-herba-mystica";
+    case HerbaSelection::salty_herba_mystica:
+        return "salty-herba-mystica";
+    case HerbaSelection::sour_herba_mystica:
+        return "sour-herba-mystica";
+    case HerbaSelection::spicy_herba_mystica:
+        return "spicy-herba-mystica";
+    case HerbaSelection::sweet_herba_mystica:
+        return "sweet-herba-mystica";
+    }
+    return "ERROR";
+}
+
+std::vector<std::string> SandwichMakerOption::get_premade_ingredients(SandwichRecipe value){
+    auto iter = PREMADE_SANDWICH_INGREDIENTS().find(value);
+    return iter->second;
+}
+
+bool SandwichMakerOption::two_herba_required(BaseRecipe value){
+    if (value == BaseRecipe::shiny || value == BaseRecipe::huge || value == BaseRecipe::tiny){
+        return true;
+    }
+    return false;
+}
+
+SandwichRecipe SandwichMakerOption::get_premade_sandwich_recipe(BaseRecipe base, PokemonType type, ParadoxRecipe paradox){
+    if (base == BaseRecipe::paradox)
+    {
+        auto iter = PREMADE_SANDWICH_OTHER().find(paradox);
+        return iter->second;
+    }else{
+        auto iter = PREMADE_SANDWICH_TYPE().find(std::make_pair(base, type));
+        return iter->second;
+    }
+}
+
+SandwichMakerOption::~SandwichMakerOption(){
+    HERBA_TWO.remove_listener(*this);
+    HERBA_ONE.remove_listener(*this);
+    TYPE.remove_listener(*this);
+    BASE_RECIPE.remove_listener(*this);
+}
+
+SandwichMakerOption::SandwichMakerOption(
+    std::string label,
+    OCR::LanguageOCROption* language_option,
+    BaseRecipe base_recipe,
+    bool show_save_option,
+    GroupOption::EnableMode enable_mode
+)
+    : GroupOption(
+        std::move(label),
+        LockMode::UNLOCK_WHILE_RUNNING,
+        enable_mode
+    )
+    , m_language_owner(language_option == nullptr
+        ? new OCR::LanguageOCROption(
+            "<b>Game Language:</b><br>Required to read ingredients.",
+            IV_READER().languages(),
+            LockMode::LOCK_WHILE_RUNNING,
+            true
+        )
+        : nullptr
+    )
+    , LANGUAGE(language_option == nullptr ? *m_language_owner : *language_option)
+    , SAVE_GAME_BEFORE_SANDWICH(
+        "<b>Save game before making sandwich:</b><br>Sandwich making can be unreliable. "
+        "Save the game before each sandwich to prevent loss of progress.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        true
+    )
+    , BASE_RECIPE(
+        "<b>Sandwich Recipe:</b><br>Select a recipe to make a sandwich with preset ingredients, or select Custom Sandwich to make a sandwich using the table below. "
+        "Refer to the documentation for recipe ingredients and valid Herba Mystica combinations.",
+        {
+            {BaseRecipe::non_shiny, "non-shiny", "Normal Encounter (non-shiny)"},
+            {BaseRecipe::shiny,     "shiny",     "Sparkling + Title + Encounter"},
+            {BaseRecipe::huge,      "huge",      "Sparkling + Title + Humungo"},
+            {BaseRecipe::tiny,      "tiny",      "Sparkling + Title + Teensy"},
+            {BaseRecipe::paradox,   "paradox",   "Title + Encounter + Humungo/Teensy: Paradox-specific"},
+            {BaseRecipe::custom,    "custom",    "Custom Sandwich"},
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        base_recipe
+        )
+    , TYPE(
+        "",
+        {
+            {PokemonType::normal,   "normal",   "Normal"},
+            {PokemonType::fire,     "fire",     "Fire"},
+            {PokemonType::water,    "water",    "Water"},
+            {PokemonType::electric, "electric", "Electric"},
+            {PokemonType::grass,    "grass",    "Grass"},
+            {PokemonType::ice,      "ice",      "Ice"},
+            {PokemonType::fighting, "fighting", "Fighting"},
+            {PokemonType::poison,   "poison",   "Poison"},
+            {PokemonType::ground,   "ground",   "Ground"},
+            {PokemonType::flying,   "flying",   "Flying"},
+            {PokemonType::psychic,  "psychic",  "Psychic"},
+            {PokemonType::bug,      "bug",      "Bug"},
+            {PokemonType::rock,     "rock",     "Rock"},
+            {PokemonType::ghost,    "ghost",    "Ghost"},
+            {PokemonType::dragon,   "dragon",   "Dragon"},
+            {PokemonType::dark,     "dark",     "Dark"},
+            {PokemonType::steel,    "steel",    "Steel"},
+            {PokemonType::fairy,    "fairy",    "Fairy"},
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        PokemonType::normal
+    )
+    , PARADOX(
+        "",
+        {
+            {ParadoxRecipe::humungo3_greattusk_1,     "humungo3_greattusk_1",     "Great Tusk - Humungo #1"},
+            {ParadoxRecipe::humungo2_screamtail_1,    "humungo2_screamtail_1",    "Scream Tail - Humungo #1"},
+            {ParadoxRecipe::humungo2_screamtail_2,    "humungo2_screamtail_2",    "Scream Tail - Humungo #2"},
+            {ParadoxRecipe::humungo2_brutebonnet_1,   "humungo2_brutebonnet_1",   "Brute Bonnet - Humungo #1"},
+            {ParadoxRecipe::humungo2_brutebonnet_2,   "humungo2_brutebonnet_2",   "Brute Bonnet - Humungo #2"},
+            {ParadoxRecipe::humungo3_fluttermane_1,   "humungo3_fluttermane_1",   "Flutter Mane - Humungo #1"},
+            {ParadoxRecipe::humungo3_fluttermane_2,   "humungo3_fluttermane_2",   "Flutter Mane - Humungo #2"},
+            {ParadoxRecipe::humungo2_slitherwing_1,   "humungo2_slitherwing_1",   "Slither Wing - Humungo #1"},
+            {ParadoxRecipe::humungo2_slitherwing_2,   "humungo2_slitherwing_2",   "Slither Wing - Humungo #2"},
+            {ParadoxRecipe::humungo3_sandyshocks_1,   "humungo3_sandyshocks_1",   "Sandy Shocks - Humungo #1"},
+            {ParadoxRecipe::humungo3_sandyshocks_2,   "humungo3_sandyshocks_2",   "Sandy Shocks - Humungo #2"},
+            {ParadoxRecipe::humungo3_roaringmoon_1,   "humungo3_roaringmoon_1",   "Roaring Moon - Humungo #1"},
+            {ParadoxRecipe::humungo3_roaringmoon_2,   "humungo3_roaringmoon_2",   "Roaring Moon - Humungo #2"},
+            {ParadoxRecipe::humungo2_irontreads_1,    "humungo2_irontreads_1",    "Iron Treads - Humungo #1"},
+            {ParadoxRecipe::humungo2_irontreads_2,    "humungo2_irontreads_2",    "Iron Treads - Humungo #2"},
+            {ParadoxRecipe::humungo2_ironbundle_1,    "humungo2_ironbundle_1",    "Iron Bundle - Humungo #1"},
+            {ParadoxRecipe::humungo2_ironbundle_2,    "humungo2_ironbundle_2",    "Iron Bundle - Humungo #2"},
+            {ParadoxRecipe::humungo2_ironhands_1,     "humungo2_ironhands_1",     "Iron Hands - Humungo #1"},
+            {ParadoxRecipe::humungo2_ironhands_2,     "humungo2_ironhands_2",     "Iron Hands - Humungo #2"},
+            {ParadoxRecipe::humungo2_ironjugulis_1,   "humungo2_ironjugulis_1",   "Iron Jugulis - Humungo #1"},
+            {ParadoxRecipe::humungo2_ironjugulis_2,   "humungo2_ironjugulis_2",   "Iron Jugulis - Humungo #2"},
+            {ParadoxRecipe::humungo3_ironmoth_1,      "humungo3_ironmoth_1",      "Iron Moth - Humungo #1"},
+            {ParadoxRecipe::humungo3_ironmoth_2,      "humungo3_ironmoth_2",      "Iron Moth - Humungo #2"},
+            {ParadoxRecipe::humungo3_ironthorns_1,    "humungo3_ironthorns_1",    "Iron Thorns - Humungo #1"},
+            {ParadoxRecipe::humungo3_ironthorns_2,    "humungo3_ironthorns_2",    "Iron Thorns - Humungo #2"},
+            {ParadoxRecipe::humungo2_ironvaliant_1,   "humungo2_ironvaliant_1",   "Iron Valiant - Humungo #1"},
+            {ParadoxRecipe::humungo2_ironvaliant_2,   "humungo2_ironvaliant_2",   "Iron Valiant - Humungo #2"},
+            {ParadoxRecipe::teensy3_greattusk_1,      "teensy3_greattusk_1",      "Great Tusk - Teensy #1"},
+            {ParadoxRecipe::teensy2_screamtail_1,     "teensy2_screamtail_1",     "Scream Tail - Teensy #1"},
+            {ParadoxRecipe::teensy2_screamtail_2,     "teensy2_screamtail_2",     "Scream Tail - Teensy #2"},
+            {ParadoxRecipe::teensy2_brutebonnet_1,    "teensy2_brutebonnet_1",    "Brute Bonnet - Teensy #1"},
+            {ParadoxRecipe::teensy3_fluttermane_1,    "teensy3_fluttermane_1",    "Flutter Mane - Teensy #1"},
+            {ParadoxRecipe::teensy2_sliterwing_1,     "teensy2_sliterwing_1",     "Slither Wing - Teensy #1"},
+            {ParadoxRecipe::teensy2_sliterwing_2,     "teensy2_sliterwing_2",     "Slither Wing - Teensy #2"},
+            {ParadoxRecipe::teensy3_sandyshocks_1,    "teensy3_sandyshocks_1",    "Sandy Shocks - Teensy #1"},
+            {ParadoxRecipe::teensy3_sandyshocks_2,    "teensy3_sandyshocks_2",    "Sandy Shocks - Teensy #2"},
+            {ParadoxRecipe::teensy3_roaringmoon_1,    "teensy3_roaringmoon_1",    "Roaring Moon - Teensy #1"},
+            {ParadoxRecipe::teensy2_irontreads_1,     "teensy2_irontreads_1",     "Iron Treads - Teensy #1"},
+            {ParadoxRecipe::teensy2_irontreads_2,     "teensy2_irontreads_2",     "Iron Treads - Teensy #2"},
+            {ParadoxRecipe::teensy2_ironbundle_1,     "teensy2_ironbundle_1",     "Iron Bundle - Teensy #1"},
+            {ParadoxRecipe::teensy2_ironbundle_2,     "teensy2_ironbundle_2",     "Iron Bundle - Teensy #2"},
+            {ParadoxRecipe::teensy2_ironhands_1,      "teensy2_ironhands_1",      "Iron Hands - Teensy #1"},
+            {ParadoxRecipe::teensy2_ironjugulis_1,    "teensy2_ironjugulis_1",    "Iron Jugulis - Teensy #1"},
+            {ParadoxRecipe::teensy3_ironmoth_1,       "teensy3_ironmoth_1",       "Iron Moth - Teensy #1"},
+            {ParadoxRecipe::teensy3_ironthorns_1,     "teensy3_ironthorns_1",     "Iron Thorns - Teensy #1"},
+            {ParadoxRecipe::teensy2_ironvaliant_1,    "teensy2_ironvaliant_1",    "Iron Valiant - Teensy #1"},
+            {ParadoxRecipe::teensy2_ironvaliant_2,    "teensy2_ironvaliant_2",    "Iron Vailant - Teensy #2"},
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        ParadoxRecipe::humungo3_greattusk_1
+    )
+    , HERBA_ONE(
+        "<b>Herba Mystica:</b><br>Select the Herba Mystica to use in the preset recipe. Keep in mind which herb combinations are valid for the selected recipe.",
+        {
+            {HerbaSelection::sweet_herba_mystica,   "sweet-herba-mystica",  "Sweet Herba Mystica"},
+            {HerbaSelection::salty_herba_mystica,   "salty-herba-mystica",  "Salty Herba Mystica"},
+            {HerbaSelection::sour_herba_mystica,    "sour-herba-mystica",   "Sour Herba Mystica"},
+            {HerbaSelection::bitter_herba_mystica,  "bitter-herba-mystica", "Bitter Herba Mystica"},
+            {HerbaSelection::spicy_herba_mystica,   "spicy-herba-mystica",  "Spicy Herba Mystica"},
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        HerbaSelection::salty_herba_mystica
+    )
+    , HERBA_TWO(
+        "",
+        {
+            {HerbaSelection::sweet_herba_mystica,   "sweet-herba-mystica",  "Sweet Herba Mystica"},
+            {HerbaSelection::salty_herba_mystica,   "salty-herba-mystica",  "Salty Herba Mystica"},
+            {HerbaSelection::sour_herba_mystica,    "sour-herba-mystica",   "Sour Herba Mystica"},
+            {HerbaSelection::bitter_herba_mystica,  "bitter-herba-mystica", "Bitter Herba Mystica"},
+            {HerbaSelection::spicy_herba_mystica,   "spicy-herba-mystica",  "Spicy Herba Mystica"},
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        HerbaSelection::salty_herba_mystica
+    )
+    , HERB_INCOMPATIBILITY_WARNING("")
+    , SANDWICH_INGREDIENTS("<b>Custom Sandwich:</b><br>Make a sandwich from the selected ingredients.<br>You must have at least one ingredient and one condiment, and no more than six ingredients and four condiments.")
+{
+    if (m_language_owner){
+        PA_ADD_OPTION(LANGUAGE);
+    }
+    if (show_save_option){
+        PA_ADD_OPTION(SAVE_GAME_BEFORE_SANDWICH);
+    }
+    PA_ADD_OPTION(BASE_RECIPE);
+    PA_ADD_OPTION(TYPE);
+    PA_ADD_OPTION(PARADOX);
+    PA_ADD_OPTION(HERBA_ONE);
+    PA_ADD_OPTION(HERBA_TWO);
+    PA_ADD_OPTION(HERB_INCOMPATIBILITY_WARNING);
+    PA_ADD_OPTION(SANDWICH_INGREDIENTS);
+
+    HERB_INCOMPATIBILITY_WARNING.set_visibility(ConfigOptionState::HIDDEN);
+
+    SandwichMakerOption::on_config_value_changed(this);
+    BASE_RECIPE.add_listener(*this);
+    TYPE.add_listener(*this);
+    HERBA_ONE.add_listener(*this);
+    HERBA_TWO.add_listener(*this);
+}
+
+void SandwichMakerOption::on_config_value_changed(void* object){
+    if (BASE_RECIPE == BaseRecipe::custom){
+        HERBA_ONE.set_visibility(ConfigOptionState::HIDDEN);
+        HERBA_TWO.set_visibility(ConfigOptionState::HIDDEN);
+        HERB_INCOMPATIBILITY_WARNING.set_visibility(ConfigOptionState::HIDDEN);
+        TYPE.set_visibility(ConfigOptionState::HIDDEN); //to prevent the options moving around
+        PARADOX.set_visibility(ConfigOptionState::HIDDEN);
+        SANDWICH_INGREDIENTS.set_visibility(ConfigOptionState::ENABLED);
+    }else if (BASE_RECIPE == BaseRecipe::non_shiny){
+        HERBA_ONE.set_visibility(ConfigOptionState::HIDDEN);
+        HERBA_TWO.set_visibility(ConfigOptionState::HIDDEN);
+        HERB_INCOMPATIBILITY_WARNING.set_visibility(ConfigOptionState::HIDDEN);
+        TYPE.set_visibility(ConfigOptionState::HIDDEN); //to prevent the options moving around
+        PARADOX.set_visibility(ConfigOptionState::HIDDEN);
+        SANDWICH_INGREDIENTS.set_visibility(ConfigOptionState::HIDDEN);
+    }else if (two_herba_required(BASE_RECIPE)){ //shiny, huge, tiny
+        HERBA_ONE.set_visibility(ConfigOptionState::ENABLED);
+        HERBA_TWO.set_visibility(ConfigOptionState::ENABLED);
+        SANDWICH_INGREDIENTS.set_visibility(ConfigOptionState::HIDDEN);
+
+        std::string herb_error;
+        do{
+            if (BASE_RECIPE != BaseRecipe::shiny){
+                break;
+            }
+            herb_error = check_herb_compatibility(HERBA_ONE, HERBA_TWO, TYPE);
+        }while (false);
+
+        if (herb_error.empty()){
+            HERB_INCOMPATIBILITY_WARNING.set_visibility(ConfigOptionState::HIDDEN);
+        }else{
+            HERB_INCOMPATIBILITY_WARNING.set_text("<font color=\"red\">" + herb_error + "</font>");
+            HERB_INCOMPATIBILITY_WARNING.set_visibility(ConfigOptionState::ENABLED);
+        }
+        TYPE.set_visibility(ConfigOptionState::ENABLED);
+        PARADOX.set_visibility(ConfigOptionState::HIDDEN);
+    }else{ //other
+        HERBA_ONE.set_visibility(ConfigOptionState::HIDDEN);
+        HERBA_TWO.set_visibility(ConfigOptionState::HIDDEN);
+        TYPE.set_visibility(ConfigOptionState::HIDDEN);
+        HERB_INCOMPATIBILITY_WARNING.set_visibility(ConfigOptionState::HIDDEN);
+        PARADOX.set_visibility(ConfigOptionState::ENABLED);
+        SANDWICH_INGREDIENTS.set_visibility(ConfigOptionState::HIDDEN);
+    }
+}
+std::string SandwichMakerOption::check_validity() const{
+    if (!two_herba_required(BASE_RECIPE)){
+        return "";
+    }
+    if (BASE_RECIPE != BaseRecipe::shiny){
+        return "";
+    }
+    return check_herb_compatibility(HERBA_ONE, HERBA_TWO, TYPE);
+}
+
+std::string SandwichMakerOption::check_herb_compatibility(HerbaSelection herb1, HerbaSelection herb2, PokemonType type) const{
+    if ((herb1 == HerbaSelection::sweet_herba_mystica && herb2 == HerbaSelection::sour_herba_mystica) ||
+        (herb1 == HerbaSelection::sour_herba_mystica && herb2 == HerbaSelection::sweet_herba_mystica)
+    ){
+        return "1x Sweet and 1x Sour herb are incompatible for all types.";
+    }
+    if (herb1 == HerbaSelection::sour_herba_mystica && herb2 == HerbaSelection::sour_herba_mystica){
+        return "2x Sour herbs are incompatible for all types.";
+    }
+    if (herb1 == HerbaSelection::sweet_herba_mystica && herb2 == HerbaSelection::sweet_herba_mystica &&
+        type == PokemonType::bug
+    ){
+        return "2x Sweet herbs are incompatible with bug type.";
+    }
+    if ((herb1 == HerbaSelection::salty_herba_mystica && herb2 == HerbaSelection::sour_herba_mystica) ||
+        (herb1 == HerbaSelection::sour_herba_mystica && herb2 == HerbaSelection::salty_herba_mystica)
+    ){
+        static const std::set<PokemonType> TYPES{
+            PokemonType::flying,
+            PokemonType::ground,
+            PokemonType::rock,
+            PokemonType::ice,
+        };
+        if (!TYPES.contains(type)){
+            return "1x Salty and 1x Sour herb are only compatible with flying, ground, rock, and ice.";
+        }
+    }
+    if ((herb1 == HerbaSelection::bitter_herba_mystica && herb2 == HerbaSelection::sour_herba_mystica) ||
+        (herb1 == HerbaSelection::sour_herba_mystica && herb2 == HerbaSelection::bitter_herba_mystica)
+    ){
+        static const std::set<PokemonType> TYPES{
+            PokemonType::fighting,
+            PokemonType::bug,
+            PokemonType::fairy,
+        };
+        if (TYPES.contains(type)){
+            return "1x Sour and 1x Bitter herb are incompatible with fighting, bug, and fairy.";
+        }
+    }
+
+    return "";
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/PokemonSV/Options/PokemonSV_SandwichMakerOption.h b/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_SandwichMakerOption.h
similarity index 80%
rename from SerialPrograms/Source/PokemonSV/Options/PokemonSV_SandwichMakerOption.h
rename to SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_SandwichMakerOption.h
index bbd0027ae6..d05e84548a 100644
--- a/SerialPrograms/Source/PokemonSV/Options/PokemonSV_SandwichMakerOption.h
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_SandwichMakerOption.h
@@ -1,259 +1,263 @@
-/*  Sandwich Makter Option
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSV_SandwichMakerOption_H
-#define PokemonAutomation_PokemonSV_SandwichMakerOption_H
-
-#include "Common/Cpp/Options/GroupOption.h"
-#include "Common/Cpp/Options/EnumDropdownOption.h"
-//#include "PokemonSV/Resources/PokemonSV_Ingredients.h"
-#include "CommonFramework/Options/LanguageOCROption.h"
-//#include "PokemonSV_SandwichIngredientsOption.h"
-#include "PokemonSV_SandwichIngredientsTable.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-
-
-enum class HerbaSelection {
-    sweet_herba_mystica,
-    salty_herba_mystica,
-    sour_herba_mystica,
-    bitter_herba_mystica,
-    spicy_herba_mystica,
-};
-
-enum class BaseRecipe {
-    shiny,
-    huge,
-    tiny,
-    paradox,
-    custom,
-};
-
-enum class PokemonType {
-    normal,
-    fire,
-    water,
-    electric,
-    grass,
-    ice,
-    fighting,
-    poison,
-    ground,
-    flying,
-    psychic,
-    bug,
-    rock,
-    ghost,
-    dragon,
-    dark,
-    steel,
-    fairy,
-};
-
-enum class ParadoxRecipe {
-    humungo3_greattusk_1,
-    humungo2_screamtail_1,
-    humungo2_screamtail_2,
-    humungo2_brutebonnet_1,
-    humungo2_brutebonnet_2,
-    humungo3_fluttermane_1,
-    humungo3_fluttermane_2,
-    humungo2_slitherwing_1,
-    humungo2_slitherwing_2,
-    humungo3_sandyshocks_1,
-    humungo3_sandyshocks_2,
-    humungo3_roaringmoon_1,
-    humungo3_roaringmoon_2,
-    humungo2_irontreads_1,
-    humungo2_irontreads_2,
-    humungo2_ironbundle_1,
-    humungo2_ironbundle_2,
-    humungo2_ironhands_1,
-    humungo2_ironhands_2,
-    humungo2_ironjugulis_1,
-    humungo2_ironjugulis_2,
-    humungo3_ironmoth_1,
-    humungo3_ironmoth_2,
-    humungo3_ironthorns_1,
-    humungo3_ironthorns_2,
-    humungo2_ironvaliant_1,
-    humungo2_ironvaliant_2,
-    teensy3_greattusk_1,
-    teensy2_screamtail_1,
-    teensy2_screamtail_2,
-    teensy2_brutebonnet_1,
-    teensy3_fluttermane_1,
-    teensy2_sliterwing_1,
-    teensy2_sliterwing_2,
-    teensy3_sandyshocks_1,
-    teensy3_sandyshocks_2,
-    teensy3_roaringmoon_1,
-    teensy2_irontreads_1,
-    teensy2_irontreads_2,
-    teensy2_ironbundle_1,
-    teensy2_ironbundle_2,
-    teensy2_ironhands_1,
-    teensy2_ironjugulis_1,
-    teensy3_ironmoth_1,
-    teensy3_ironthorns_1,
-    teensy2_ironvaliant_1,
-    teensy2_ironvaliant_2,
-};
-
-enum class SandwichRecipe {
-    shiny_normal,
-    shiny_fire,
-    shiny_water,
-    shiny_electric,
-    shiny_grass,
-    shiny_ice,
-    shiny_fighting,
-    shiny_poison,
-    shiny_ground,
-    shiny_flying,
-    shiny_psychic,
-    shiny_bug,
-    shiny_rock,
-    shiny_ghost,
-    shiny_dragon,
-    shiny_dark,
-    shiny_steel,
-    shiny_fairy,
-    huge_normal,
-    huge_fire,
-    huge_water,
-    huge_electric,
-    huge_grass,
-    huge_ice,
-    huge_fighting,
-    huge_poison,
-    huge_ground,
-    huge_flying,
-    huge_psychic,
-    huge_bug,
-    huge_rock,
-    huge_ghost,
-    huge_dragon,
-    huge_dark,
-    huge_steel,
-    huge_fairy,
-    tiny_normal,
-    tiny_fire,
-    tiny_water,
-    tiny_electric,
-    tiny_grass,
-    tiny_ice,
-    tiny_fighting,
-    tiny_poison,
-    tiny_ground,
-    tiny_flying,
-    tiny_psychic,
-    tiny_bug,
-    tiny_rock,
-    tiny_ghost,
-    tiny_dragon,
-    tiny_dark,
-    tiny_steel,
-    tiny_fairy,
-    humungo3_greattusk_1,
-    humungo2_screamtail_1,
-    humungo2_screamtail_2,
-    humungo2_brutebonnet_1,
-    humungo2_brutebonnet_2,
-    humungo3_fluttermane_1,
-    humungo3_fluttermane_2,
-    humungo2_slitherwing_1,
-    humungo2_slitherwing_2,
-    humungo3_sandyshocks_1,
-    humungo3_sandyshocks_2,
-    humungo3_roaringmoon_1,
-    humungo3_roaringmoon_2,
-    humungo2_irontreads_1,
-    humungo2_irontreads_2,
-    humungo2_ironbundle_1,
-    humungo2_ironbundle_2,
-    humungo2_ironhands_1,
-    humungo2_ironhands_2,
-    humungo2_ironjugulis_1,
-    humungo2_ironjugulis_2,
-    humungo3_ironmoth_1,
-    humungo3_ironmoth_2,
-    humungo3_ironthorns_1,
-    humungo3_ironthorns_2,
-    humungo2_ironvaliant_1,
-    humungo2_ironvaliant_2,
-    teensy3_greattusk_1,
-    teensy2_screamtail_1,
-    teensy2_screamtail_2,
-    teensy2_brutebonnet_1,
-    teensy3_fluttermane_1,
-    teensy2_sliterwing_1,
-    teensy2_sliterwing_2,
-    teensy3_sandyshocks_1,
-    teensy3_sandyshocks_2,
-    teensy3_roaringmoon_1,
-    teensy2_irontreads_1,
-    teensy2_irontreads_2,
-    teensy2_ironbundle_1,
-    teensy2_ironbundle_2,
-    teensy2_ironhands_1,
-    teensy2_ironjugulis_1,
-    teensy3_ironmoth_1,
-    teensy3_ironthorns_1,
-    teensy2_ironvaliant_1,
-    teensy2_ironvaliant_2,
-};
-
-
-
-
-class SandwichMakerOption : public GroupOption, private ConfigOption::Listener {
-
-public:
-    ~SandwichMakerOption();
-
-    //  Include the language option in the box.
-    SandwichMakerOption()
-        : SandwichMakerOption(nullptr)
-    {}
-
-    //  Don't include language option. Give it one instead.
-    SandwichMakerOption(OCR::LanguageOCROption& language_option)
-        : SandwichMakerOption(&language_option)
-    {}
-
-public:
-    std::string herba_to_string(HerbaSelection value);
-    std::vector<std::string> get_premade_ingredients(SandwichRecipe value);
-    static bool two_herba_required(BaseRecipe value);
-    SandwichRecipe get_premade_sandwich_recipe(BaseRecipe base, PokemonType type, ParadoxRecipe other);
-
-private:
-    std::unique_ptr<OCR::LanguageOCROption> m_language_owner;
-public:
-    OCR::LanguageOCROption& LANGUAGE;
-
-    EnumDropdownOption<BaseRecipe> BASE_RECIPE;
-    EnumDropdownOption<PokemonType> TYPE;
-    EnumDropdownOption<ParadoxRecipe> PARADOX;
-    EnumDropdownOption<HerbaSelection> HERBA_ONE;
-    EnumDropdownOption<HerbaSelection> HERBA_TWO;
-    SandwichIngredientsTable SANDWICH_INGREDIENTS;
-
-private:
-    SandwichMakerOption(OCR::LanguageOCROption* language_option);
-    virtual void value_changed();
-
-};
-
-}
-}
-}
-#endif
+/*  Sandwich Makter Option
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_SandwichMakerOption_H
+#define PokemonAutomation_PokemonSV_SandwichMakerOption_H
+
+#include "Common/Cpp/Options/StaticTextOption.h"
+#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "Common/Cpp/Options/GroupOption.h"
+#include "Common/Cpp/Options/EnumDropdownOption.h"
+#include "CommonTools/Options/LanguageOCROption.h"
+#include "PokemonSV_SandwichIngredientsTable.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+enum class HerbaSelection{
+    sweet_herba_mystica,
+    salty_herba_mystica,
+    sour_herba_mystica,
+    bitter_herba_mystica,
+    spicy_herba_mystica,
+};
+
+enum class BaseRecipe{
+    non_shiny,
+    shiny,
+    huge,
+    tiny,
+    paradox,
+    custom,
+};
+
+enum class PokemonType{
+    normal,
+    fire,
+    water,
+    electric,
+    grass,
+    ice,
+    fighting,
+    poison,
+    ground,
+    flying,
+    psychic,
+    bug,
+    rock,
+    ghost,
+    dragon,
+    dark,
+    steel,
+    fairy,
+};
+
+enum class ParadoxRecipe{
+    humungo3_greattusk_1,
+    humungo2_screamtail_1,
+    humungo2_screamtail_2,
+    humungo2_brutebonnet_1,
+    humungo2_brutebonnet_2,
+    humungo3_fluttermane_1,
+    humungo3_fluttermane_2,
+    humungo2_slitherwing_1,
+    humungo2_slitherwing_2,
+    humungo3_sandyshocks_1,
+    humungo3_sandyshocks_2,
+    humungo3_roaringmoon_1,
+    humungo3_roaringmoon_2,
+    humungo2_irontreads_1,
+    humungo2_irontreads_2,
+    humungo2_ironbundle_1,
+    humungo2_ironbundle_2,
+    humungo2_ironhands_1,
+    humungo2_ironhands_2,
+    humungo2_ironjugulis_1,
+    humungo2_ironjugulis_2,
+    humungo3_ironmoth_1,
+    humungo3_ironmoth_2,
+    humungo3_ironthorns_1,
+    humungo3_ironthorns_2,
+    humungo2_ironvaliant_1,
+    humungo2_ironvaliant_2,
+    teensy3_greattusk_1,
+    teensy2_screamtail_1,
+    teensy2_screamtail_2,
+    teensy2_brutebonnet_1,
+    teensy3_fluttermane_1,
+    teensy2_sliterwing_1,
+    teensy2_sliterwing_2,
+    teensy3_sandyshocks_1,
+    teensy3_sandyshocks_2,
+    teensy3_roaringmoon_1,
+    teensy2_irontreads_1,
+    teensy2_irontreads_2,
+    teensy2_ironbundle_1,
+    teensy2_ironbundle_2,
+    teensy2_ironhands_1,
+    teensy2_ironjugulis_1,
+    teensy3_ironmoth_1,
+    teensy3_ironthorns_1,
+    teensy2_ironvaliant_1,
+    teensy2_ironvaliant_2,
+};
+
+enum class SandwichRecipe{
+    non_shiny_normal,
+    shiny_normal,
+    shiny_fire,
+    shiny_water,
+    shiny_electric,
+    shiny_grass,
+    shiny_ice,
+    shiny_fighting,
+    shiny_poison,
+    shiny_ground,
+    shiny_flying,
+    shiny_psychic,
+    shiny_bug,
+    shiny_rock,
+    shiny_ghost,
+    shiny_dragon,
+    shiny_dark,
+    shiny_steel,
+    shiny_fairy,
+    huge_normal,
+    huge_fire,
+    huge_water,
+    huge_electric,
+    huge_grass,
+    huge_ice,
+    huge_fighting,
+    huge_poison,
+    huge_ground,
+    huge_flying,
+    huge_psychic,
+    huge_bug,
+    huge_rock,
+    huge_ghost,
+    huge_dragon,
+    huge_dark,
+    huge_steel,
+    huge_fairy,
+    tiny_normal,
+    tiny_fire,
+    tiny_water,
+    tiny_electric,
+    tiny_grass,
+    tiny_ice,
+    tiny_fighting,
+    tiny_poison,
+    tiny_ground,
+    tiny_flying,
+    tiny_psychic,
+    tiny_bug,
+    tiny_rock,
+    tiny_ghost,
+    tiny_dragon,
+    tiny_dark,
+    tiny_steel,
+    tiny_fairy,
+    humungo3_greattusk_1,
+    humungo2_screamtail_1,
+    humungo2_screamtail_2,
+    humungo2_brutebonnet_1,
+    humungo2_brutebonnet_2,
+    humungo3_fluttermane_1,
+    humungo3_fluttermane_2,
+    humungo2_slitherwing_1,
+    humungo2_slitherwing_2,
+    humungo3_sandyshocks_1,
+    humungo3_sandyshocks_2,
+    humungo3_roaringmoon_1,
+    humungo3_roaringmoon_2,
+    humungo2_irontreads_1,
+    humungo2_irontreads_2,
+    humungo2_ironbundle_1,
+    humungo2_ironbundle_2,
+    humungo2_ironhands_1,
+    humungo2_ironhands_2,
+    humungo2_ironjugulis_1,
+    humungo2_ironjugulis_2,
+    humungo3_ironmoth_1,
+    humungo3_ironmoth_2,
+    humungo3_ironthorns_1,
+    humungo3_ironthorns_2,
+    humungo2_ironvaliant_1,
+    humungo2_ironvaliant_2,
+    teensy3_greattusk_1,
+    teensy2_screamtail_1,
+    teensy2_screamtail_2,
+    teensy2_brutebonnet_1,
+    teensy3_fluttermane_1,
+    teensy2_sliterwing_1,
+    teensy2_sliterwing_2,
+    teensy3_sandyshocks_1,
+    teensy3_sandyshocks_2,
+    teensy3_roaringmoon_1,
+    teensy2_irontreads_1,
+    teensy2_irontreads_2,
+    teensy2_ironbundle_1,
+    teensy2_ironbundle_2,
+    teensy2_ironhands_1,
+    teensy2_ironjugulis_1,
+    teensy3_ironmoth_1,
+    teensy3_ironthorns_1,
+    teensy2_ironvaliant_1,
+    teensy2_ironvaliant_2,
+};
+
+
+
+
+class SandwichMakerOption : public GroupOption, private ConfigOption::Listener{
+
+public:
+    ~SandwichMakerOption();
+
+    SandwichMakerOption(
+        std::string label,
+        OCR::LanguageOCROption* language_option,
+        BaseRecipe base_recipe,
+        bool show_save_option,
+        GroupOption::EnableMode enable_mode
+    );
+
+public:
+    std::string herba_to_string(HerbaSelection value);
+    std::vector<std::string> get_premade_ingredients(SandwichRecipe value);
+    static bool two_herba_required(BaseRecipe value);
+    SandwichRecipe get_premade_sandwich_recipe(BaseRecipe base, PokemonType type, ParadoxRecipe other);
+
+private:
+    std::unique_ptr<OCR::LanguageOCROption> m_language_owner;
+public:
+    OCR::LanguageOCROption& LANGUAGE;
+
+    BooleanCheckBoxOption SAVE_GAME_BEFORE_SANDWICH;
+
+    EnumDropdownOption<BaseRecipe> BASE_RECIPE;
+    EnumDropdownOption<PokemonType> TYPE;
+    EnumDropdownOption<ParadoxRecipe> PARADOX;
+    EnumDropdownOption<HerbaSelection> HERBA_ONE;
+    EnumDropdownOption<HerbaSelection> HERBA_TWO;
+    StaticTextOption HERB_INCOMPATIBILITY_WARNING;
+    SandwichIngredientsTable SANDWICH_INGREDIENTS;
+
+private:
+    virtual void on_config_value_changed(void* object) override;
+    virtual std::string check_validity() const override;
+
+    std::string check_herb_compatibility(HerbaSelection herb1, HerbaSelection herb2, PokemonType type) const;
+};
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_SinglesAIOption.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_SinglesAIOption.cpp
new file mode 100644
index 0000000000..49583e080f
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_SinglesAIOption.cpp
@@ -0,0 +1,72 @@
+/*  Singles AI Option
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Containers/FixedLimitVector.tpp"
+#include "Pokemon/Pokemon_Strings.h"
+#include "PokemonSV_SinglesAIOption.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+using namespace Pokemon;
+
+
+
+SinglesAIOption::~SinglesAIOption() = default;
+SinglesAIOption::SinglesAIOption(
+    bool trainer_battle,
+    EnableMode enable_mode,
+    int max_pokemon
+)
+    : GroupOption(
+        "Battle AI",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        enable_mode
+    )
+    , description(
+        "Move Tables: Run these sequence of moves for the corresponding " + STRING_POKEMON + " in your party. "
+        "When the end of the table is reached, the last entry will be repeated "
+        "until the battle is won or the " + STRING_POKEMON +" faints. "
+        "If your " + STRING_POKEMON + " faints, the program will switch to the "
+        "next available " + STRING_POKEMON + " and run its table. "
+        "Changes to these tables take effect the next time the " + STRING_POKEMON + " is sent out."
+    )
+    , MOVE_TABLES(max_pokemon)
+{
+    if (max_pokemon >= 1){
+        MOVE_TABLES.emplace_back("<b>1st " + STRING_POKEMON + " Move Table:</b>", trainer_battle);
+    }
+    if (max_pokemon >= 2){
+        MOVE_TABLES.emplace_back("<b>2nd " + STRING_POKEMON + " Move Table:</b>", trainer_battle);
+    }
+    if (max_pokemon >= 3){
+        MOVE_TABLES.emplace_back("<b>3rd " + STRING_POKEMON + " Move Table:</b>", trainer_battle);
+    }
+    if (max_pokemon >= 4){
+        MOVE_TABLES.emplace_back("<b>4th " + STRING_POKEMON + " Move Table:</b>", trainer_battle);
+    }
+    if (max_pokemon >= 5){
+        MOVE_TABLES.emplace_back("<b>5th " + STRING_POKEMON + " Move Table:</b>", trainer_battle);
+    }
+    if (max_pokemon >= 6){
+        MOVE_TABLES.emplace_back("<b>6th " + STRING_POKEMON + " Move Table:</b>", trainer_battle);
+    }
+
+    PA_ADD_STATIC(description);
+    size_t c = 0;
+    for (SinglesMoveTable& table : MOVE_TABLES){
+        add_option(table, "MOVE_TABLE" + std::to_string(++c));
+    }
+}
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_SinglesAIOption.h b/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_SinglesAIOption.h
new file mode 100644
index 0000000000..4891a3c821
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_SinglesAIOption.h
@@ -0,0 +1,43 @@
+/*  Singles AI Option
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_SinglesAIOption_H
+#define PokemonAutomation_PokemonSV_SinglesAIOption_H
+
+#include "Common/Cpp/Containers/FixedLimitVector.h"
+#include "Common/Cpp/Options/StaticTextOption.h"
+//#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "Common/Cpp/Options/GroupOption.h"
+#include "PokemonSV_SinglesMoveTable.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+class SinglesAIOption : public GroupOption{
+public:
+    ~SinglesAIOption();
+    SinglesAIOption(
+        bool trainer_battle,
+        EnableMode enable_mode,
+        int max_pokemon = 6
+    );
+
+public:
+    StaticTextOption description;
+    FixedLimitVector<SinglesMoveTable> MOVE_TABLES;
+
+};
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_SinglesMoveTable.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_SinglesMoveTable.cpp
new file mode 100644
index 0000000000..b2f0a87339
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_SinglesMoveTable.cpp
@@ -0,0 +1,135 @@
+/*  Single Battle Move Table
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "PokemonSV_SinglesMoveTable.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+const EnumDropdownDatabase<SinglesMoveType>& singles_move_enum_database_wild(){
+    static EnumDropdownDatabase<SinglesMoveType> database{
+        {SinglesMoveType::Move1,    "move1",    "Move 1"},
+        {SinglesMoveType::Move2,    "move2",    "Move 2"},
+        {SinglesMoveType::Move3,    "move3",    "Move 3"},
+        {SinglesMoveType::Move4,    "move4",    "Move 4"},
+        {SinglesMoveType::Run,      "run",      "Run"},
+    };
+    return database;
+}
+const EnumDropdownDatabase<SinglesMoveType>& singles_move_enum_database_trainer(){
+    static EnumDropdownDatabase<SinglesMoveType> database{
+        {SinglesMoveType::Move1,    "move1",    "Move 1"},
+        {SinglesMoveType::Move2,    "move2",    "Move 2"},
+        {SinglesMoveType::Move3,    "move3",    "Move 3"},
+        {SinglesMoveType::Move4,    "move4",    "Move 4"},
+    };
+    return database;
+}
+
+std::string SinglesMoveEntry::to_str() const{
+    switch (type){
+    case SinglesMoveType::Move1:
+    case SinglesMoveType::Move2:
+    case SinglesMoveType::Move3:
+    case SinglesMoveType::Move4:{
+        int slot = (int)type - (int)SinglesMoveType::Move1;
+        std::string str = "Move " + std::to_string(slot + 1);
+        if (terastallize){
+            str += " (terastallize)";
+        }
+        str += ".";
+        return str;
+    }
+    case SinglesMoveType::Run:
+        return "Run Away";
+    }
+    return "(Invalid Move)";
+}
+
+
+
+SinglesMoveTableRow::~SinglesMoveTableRow(){
+    type.remove_listener(*this);
+}
+SinglesMoveTableRow::SinglesMoveTableRow(EditableTableOption& parent_table)
+    : EditableTableRow(parent_table)
+    , type(
+        static_cast<const SinglesMoveTable&>(parent_table).m_trainer_battle
+            ? singles_move_enum_database_trainer()
+            : singles_move_enum_database_wild(),
+        LockMode::UNLOCK_WHILE_RUNNING,
+        SinglesMoveType::Move1
+    )
+    , terastallize(LockMode::UNLOCK_WHILE_RUNNING, false)
+    , notes(false, LockMode::UNLOCK_WHILE_RUNNING, "", "(e.g. Screech, Belly Drum)")
+{
+    PA_ADD_OPTION(type);
+    PA_ADD_OPTION(terastallize);
+    PA_ADD_OPTION(notes);
+
+    SinglesMoveTableRow::on_config_value_changed(this);
+    type.add_listener(*this);
+}
+std::unique_ptr<EditableTableRow> SinglesMoveTableRow::clone() const{
+    std::unique_ptr<SinglesMoveTableRow> ret(new SinglesMoveTableRow(parent()));
+    ret->type.set(type);
+    ret->terastallize = (bool)terastallize;
+    ret->notes.set(notes);
+    return ret;
+}
+SinglesMoveEntry SinglesMoveTableRow::snapshot() const{
+    return SinglesMoveEntry{type, terastallize};
+}
+void SinglesMoveTableRow::on_config_value_changed(void* object){
+
+}
+
+
+
+
+
+SinglesMoveTable::SinglesMoveTable(std::string label, bool trainer_battle)
+    : EditableTableOption_t<SinglesMoveTableRow>(
+        std::move(label),
+#if 0
+        "<b>Move Table:</b><br>"
+        "Run this sequence of moves. When the end of the table is reached, "
+        "the last entry will be repeated until the battle is won or your " + Pokemon::STRING_POKEMON +" faints."
+        "Changes to this table take effect on the next battle.",
+#endif
+        LockMode::UNLOCK_WHILE_RUNNING,
+        make_defaults()
+    )
+{}
+
+std::vector<SinglesMoveEntry> SinglesMoveTable::snapshot() const{
+    return EditableTableOption_t<SinglesMoveTableRow>::snapshot<SinglesMoveEntry>();
+}
+std::vector<std::string> SinglesMoveTable::make_header() const{
+    return {
+        "Move",
+        "Terastallize",
+        "Notes",
+    };
+}
+std::vector<std::unique_ptr<EditableTableRow>> SinglesMoveTable::make_defaults(){
+    std::vector<std::unique_ptr<EditableTableRow>> ret;
+    ret.emplace_back(new SinglesMoveTableRow(*this));
+    return ret;
+}
+
+
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_SinglesMoveTable.h b/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_SinglesMoveTable.h
new file mode 100644
index 0000000000..6522220143
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_SinglesMoveTable.h
@@ -0,0 +1,79 @@
+/*  Singles Move Table
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_SinglesMoveTable_H
+#define PokemonAutomation_PokemonSV_SinglesMoveTable_H
+
+#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "Common/Cpp/Options/StringOption.h"
+#include "Common/Cpp/Options/EnumDropdownOption.h"
+#include "Common/Cpp/Options/EditableTableOption.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+enum class SinglesMoveType{
+    Move1,
+    Move2,
+    Move3,
+    Move4,
+    Run,
+};
+const EnumDropdownDatabase<SinglesMoveType>& singles_move_enum_database_wild();
+const EnumDropdownDatabase<SinglesMoveType>& singles_move_enum_database_trainer();
+
+
+struct SinglesMoveEntry{
+    SinglesMoveType type;
+    bool terastallize;
+
+    std::string to_str() const;
+};
+
+
+
+class SinglesMoveTableRow : public EditableTableRow, public ConfigOption::Listener{
+public:
+    ~SinglesMoveTableRow();
+    SinglesMoveTableRow(EditableTableOption& parent_table);
+    virtual std::unique_ptr<EditableTableRow> clone() const override;
+
+    SinglesMoveEntry snapshot() const;
+
+private:
+    virtual void on_config_value_changed(void* object) override;
+
+private:
+    EnumDropdownCell<SinglesMoveType> type;
+    BooleanCheckBoxCell terastallize;
+    StringCell notes;
+};
+
+
+class SinglesMoveTable : public EditableTableOption_t<SinglesMoveTableRow>{
+public:
+    SinglesMoveTable(std::string label, bool trainer_battle);
+
+    std::vector<SinglesMoveEntry> snapshot() const;
+
+    virtual std::vector<std::string> make_header() const;
+
+    std::vector<std::unique_ptr<EditableTableRow>> make_defaults();
+
+private:
+    friend class SinglesMoveTableRow;
+
+    bool m_trainer_battle;
+};
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_TeraAIOption.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_TeraAIOption.cpp
new file mode 100644
index 0000000000..cd2ca34cea
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_TeraAIOption.cpp
@@ -0,0 +1,36 @@
+/*  Tera AI Option
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "PokemonSV_TeraAIOption.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+TeraAIOption::TeraAIOption()
+    : GroupOption("Battle AI", LockMode::UNLOCK_WHILE_RUNNING)
+    , description(
+        "There is no battle AI yet. It will always select the 1st move unless it is blocked by taunt, disable, torment, etc..."
+    )
+    , TRY_TO_TERASTILLIZE(
+        "<b>Try to Terastillize:</b><br>Try to terastillize if available. Add 4s per try but greatly increase win rate.",
+        LockMode::UNLOCK_WHILE_RUNNING, true
+    )
+{
+//    PA_ADD_STATIC(description);
+    PA_ADD_OPTION(TRY_TO_TERASTILLIZE);
+    PA_ADD_OPTION(MOVE_TABLE);
+}
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/PokemonSV/Options/PokemonSV_TeraAIOption.h b/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_TeraAIOption.h
similarity index 85%
rename from SerialPrograms/Source/PokemonSV/Options/PokemonSV_TeraAIOption.h
rename to SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_TeraAIOption.h
index 2a3a0bbe2b..95d08003d8 100644
--- a/SerialPrograms/Source/PokemonSV/Options/PokemonSV_TeraAIOption.h
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_TeraAIOption.h
@@ -1,6 +1,6 @@
 /*  Tera AI Option
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_TeraCatchOnWinOption.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_TeraCatchOnWinOption.cpp
new file mode 100644
index 0000000000..03534f3217
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_TeraCatchOnWinOption.cpp
@@ -0,0 +1,42 @@
+/*  Tera Catch On Win Option
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "PokemonSV_TeraCatchOnWinOption.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+TeraFarmerCatchOnWin::TeraFarmerCatchOnWin(bool enabled)
+    : GroupOption(
+        "Catch on Win",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        enabled
+            ? GroupOption::EnableMode::DEFAULT_ENABLED
+            : GroupOption::EnableMode::DEFAULT_DISABLED
+    )
+    , BALL_SELECT(
+        "<b>Ball Select:</b>",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        "poke-ball"
+    )
+    , FIX_TIME_ON_CATCH(
+        "<b>Fix Clock:</b><br>Fix the time when catching so the caught date will be correct.",
+        LockMode::UNLOCK_WHILE_RUNNING, false
+    )
+{
+    PA_ADD_OPTION(BALL_SELECT);
+    PA_ADD_OPTION(FIX_TIME_ON_CATCH);
+}
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_TeraCatchOnWinOption.h b/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_TeraCatchOnWinOption.h
new file mode 100644
index 0000000000..3673e27d03
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_TeraCatchOnWinOption.h
@@ -0,0 +1,35 @@
+/*  Tera Catch On Win Option
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_TeraCatchOnWinOption_H
+#define PokemonAutomation_PokemonSV_TeraCatchOnWinOption_H
+
+#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "Common/Cpp/Options/GroupOption.h"
+#include "VideoGames/PokemonSwSh/Options/PokemonSwSh_BallSelectOption.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+class TeraFarmerCatchOnWin : public GroupOption{
+public:
+    TeraFarmerCatchOnWin(bool enabled);
+
+public:
+    PokemonSwSh::PokemonBallSelectOption BALL_SELECT;
+    BooleanCheckBoxOption FIX_TIME_ON_CATCH;
+};
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_TeraMoveTable.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_TeraMoveTable.cpp
new file mode 100644
index 0000000000..ca0f87de3c
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_TeraMoveTable.cpp
@@ -0,0 +1,171 @@
+/*  Tera Move Table
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Time.h"
+#include "Common/Cpp/PrettyPrint.h"
+#include "PokemonSV_TeraMoveTable.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+const EnumDropdownDatabase<TeraMoveType>& tera_move_enum_database(){
+    static EnumDropdownDatabase<TeraMoveType> database{
+        {TeraMoveType::Wait,            "wait",             "Wait for X seconds."},
+        {TeraMoveType::Move1,           "move1",            "Move 1"},
+        {TeraMoveType::Move2,           "move2",            "Move 2"},
+        {TeraMoveType::Move3,           "move3",            "Move 3"},
+        {TeraMoveType::Move4,           "move4",            "Move 4"},
+        {TeraMoveType::Cheer_AllOut,    "cheer-allout",     "Cheer - All Out"},
+        {TeraMoveType::Cheer_HangTough, "cheer-hangtough",  "Cheer - Hang Tough"},
+        {TeraMoveType::Cheer_HealUp,    "cheer-healup",     "Cheer - Heal Up"},
+    };
+    return database;
+}
+const EnumDropdownDatabase<TeraTarget>& tera_target_enum_database(){
+    static EnumDropdownDatabase<TeraTarget> database{
+        {TeraTarget::Opponent,  "opponent", "Opponent"},
+        {TeraTarget::Player0,   "player0",  "Player 0 (yourself)"},
+        {TeraTarget::Player1,   "player1",  "Player 1 (right of yourself)"},
+        {TeraTarget::Player2,   "player2",  "Player 2 (2nd from the right)"},
+        {TeraTarget::Player3,   "player3",  "Player 3 (rightmost player)"},
+    };
+    return database;
+}
+
+
+std::string TeraMoveEntry::to_str() const{
+    switch (type){
+    case TeraMoveType::Wait:
+        return "Wait for " + tostr_u_commas(duration.count()) + " milliseconds.";
+    case TeraMoveType::Move1:
+    case TeraMoveType::Move2:
+    case TeraMoveType::Move3:
+    case TeraMoveType::Move4:{
+        int slot = (int)type - (int)TeraMoveType::Move1;
+        std::string str = "Move " + std::to_string(slot + 1) + " on ";
+        if (target == TeraTarget::Opponent){
+            return str + "opponent.";
+        }else{
+            slot = (int)target - (int)TeraTarget::Player0;
+            return "player " + std::to_string(slot) + ".";
+        }
+    }
+    case TeraMoveType::Cheer_AllOut:
+        return "Cheer - All Out";
+    case TeraMoveType::Cheer_HangTough:
+        return "Cheer - Hang Tough";
+    case TeraMoveType::Cheer_HealUp:
+        return "Cheer - Heal Up";
+    }
+    return "(Invalid Move)";
+}
+
+
+
+
+TeraMoveTableRow::~TeraMoveTableRow(){
+    type.remove_listener(*this);
+}
+TeraMoveTableRow::TeraMoveTableRow(EditableTableOption& parent_table)
+    : EditableTableRow(parent_table)
+    , type(tera_move_enum_database(), LockMode::UNLOCK_WHILE_RUNNING, TeraMoveType::Move1)
+    , duration(LockMode::UNLOCK_WHILE_RUNNING, "5000 ms")
+    , target(tera_target_enum_database(), LockMode::UNLOCK_WHILE_RUNNING, TeraTarget::Opponent)
+    , notes(false, LockMode::UNLOCK_WHILE_RUNNING, "", "(e.g. Screech, Belly Drum)")
+{
+    PA_ADD_OPTION(type);
+    PA_ADD_OPTION(duration);
+    PA_ADD_OPTION(target);
+    PA_ADD_OPTION(notes);
+
+    TeraMoveTableRow::on_config_value_changed(this);
+    type.add_listener(*this);
+}
+std::unique_ptr<EditableTableRow> TeraMoveTableRow::clone() const{
+    std::unique_ptr<TeraMoveTableRow> ret(new TeraMoveTableRow(parent()));
+    ret->type.set(type);
+    ret->duration.set(duration.current_text());
+    ret->target.set(target);
+    ret->notes.set(notes);
+    return ret;
+}
+TeraMoveEntry TeraMoveTableRow::snapshot() const{
+    return TeraMoveEntry{type, duration, target};
+}
+void TeraMoveTableRow::on_config_value_changed(void* object){
+    TeraMoveType type = this->type;
+//    cout << "Enter: type = " << (int)type << endl;
+
+    duration.set_visibility(
+        type == TeraMoveType::Wait
+        ? ConfigOptionState::ENABLED
+        : ConfigOptionState::HIDDEN
+    );
+
+    bool is_move =
+        type == TeraMoveType::Move1 ||
+        type == TeraMoveType::Move2 ||
+        type == TeraMoveType::Move3 ||
+        type == TeraMoveType::Move4;
+
+    target.set_visibility(
+        is_move
+        ? ConfigOptionState::ENABLED
+        : ConfigOptionState::HIDDEN
+    );
+
+//    cout << "Exit: type = " << (int)type << endl;
+
+}
+
+
+
+
+
+TeraMoveTable::TeraMoveTable()
+    : EditableTableOption_t<TeraMoveTableRow>(
+        "<b>Move Table:</b><br>"
+        "Run this sequence of moves. When the end of the table is reached, "
+        "the last entry will be repeated until the battle is won or lost. "
+        "Changes to this table take effect on the next battle.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        make_defaults()
+    )
+{}
+
+std::vector<TeraMoveEntry> TeraMoveTable::snapshot(){
+    return EditableTableOption_t<TeraMoveTableRow>::snapshot<TeraMoveEntry>();
+}
+std::vector<std::string> TeraMoveTable::make_header() const{
+    return {
+        "Move",
+        "Wait (ms)",
+        "Target",
+        "Notes",
+    };
+}
+std::vector<std::unique_ptr<EditableTableRow>> TeraMoveTable::make_defaults(){
+    std::vector<std::unique_ptr<EditableTableRow>> ret;
+    ret.emplace_back(new TeraMoveTableRow(*this));
+    return ret;
+}
+
+
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_TeraMoveTable.h b/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_TeraMoveTable.h
new file mode 100644
index 0000000000..b8b2c39a1f
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_TeraMoveTable.h
@@ -0,0 +1,91 @@
+/*  Tera Move Table
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_TeraMoveTable_H
+#define PokemonAutomation_PokemonSV_TeraMoveTable_H
+
+#include "Common/Cpp/Options/TimeDurationOption.h"
+#include "Common/Cpp/Options/StringOption.h"
+#include "Common/Cpp/Options/EnumDropdownOption.h"
+#include "Common/Cpp/Options/EditableTableOption.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+enum class TeraMoveType{
+    Wait,
+    Move1,
+    Move2,
+    Move3,
+    Move4,
+    Cheer_AllOut,
+    Cheer_HangTough,
+    Cheer_HealUp,
+};
+const EnumDropdownDatabase<TeraMoveType>& tera_move_enum_database();
+
+enum class TeraTarget{
+    Opponent,
+    Player0,    //  Yourself
+    Player1,
+    Player2,
+    Player3,
+};
+const EnumDropdownDatabase<TeraTarget>& tera_target_enum_database();
+
+
+
+
+struct TeraMoveEntry{
+    TeraMoveType type;
+    Milliseconds duration;
+    TeraTarget target;
+
+    std::string to_str() const;
+};
+
+
+class TeraMoveTableRow : public EditableTableRow, public ConfigOption::Listener{
+public:
+    ~TeraMoveTableRow();
+    TeraMoveTableRow(EditableTableOption& parent_table);
+    virtual std::unique_ptr<EditableTableRow> clone() const override;
+
+    TeraMoveEntry snapshot() const;
+
+private:
+    virtual void on_config_value_changed(void* object) override;
+
+private:
+    EnumDropdownCell<TeraMoveType> type;
+    MillisecondsCell duration;
+    EnumDropdownCell<TeraTarget> target;
+    StringCell notes;
+};
+
+
+class TeraMoveTable : public EditableTableOption_t<TeraMoveTableRow>{
+public:
+    TeraMoveTable();
+
+    std::vector<TeraMoveEntry> snapshot();
+
+    virtual std::vector<std::string> make_header() const;
+
+    std::vector<std::unique_ptr<EditableTableRow>> make_defaults();
+
+};
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_TeraRollFilter.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_TeraRollFilter.cpp
new file mode 100644
index 0000000000..98fab4984d
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_TeraRollFilter.cpp
@@ -0,0 +1,234 @@
+/*  Tera Roll Filter
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <iterator>
+#include <algorithm>
+#include "Common/Cpp/PrettyPrint.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonFramework/Tools/ErrorDumper.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonSV/Inference/Tera/PokemonSV_TeraCardDetector.h"
+#include "VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_TeraRoutines.h"
+#include "PokemonSV_TeraRollFilter.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+TeraRollFilter::TeraRollFilter(uint8_t default_max_stars, bool enable_herb_filter)
+    : GroupOption("Opponent Filter", LockMode::UNLOCK_WHILE_RUNNING)
+    , EVENT_CHECK_MODE(
+        "<b>Event Tera Raid Action:</b><br>Choose how the program interacts with event/non-event raids."
+        "<br>Check only non-event can be further sped up if you exclude 6 star from your filters.",
+        {
+            {EventCheckMode::CHECK_ALL,             "check_all",        "Check everything. Don't filter by event."},
+            {EventCheckMode::CHECK_ONLY_EVENT,      "check_event",      "Check only event raids."},
+            {EventCheckMode::CHECK_ONLY_NONEVENT,   "check_nonevent",   "Check only non-event raids."},
+        },
+        LockMode::UNLOCK_WHILE_RUNNING,
+        EventCheckMode::CHECK_ALL
+    )
+    , MIN_STARS(
+        "<b>Min Stars:</b><br>Skip raids with less than this many stars.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        1, 1, 7
+    )
+    , MAX_STARS(
+        "<b>Max Stars:</b><br>Skip raids with more than this many stars.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        default_max_stars, 1, 7
+    )
+    , SKIP_NON_HERBA(
+        "<b>Skip Non-Herba Raids:</b><br>"
+        "Skip raids that don't have the possibility to reward all types of Herba Mystica. Enable this if you are searching for an herba raid.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        false
+    )
+{
+    PA_ADD_OPTION(EVENT_CHECK_MODE);
+    PA_ADD_OPTION(MIN_STARS);
+    PA_ADD_OPTION(MAX_STARS);
+    if (enable_herb_filter){
+        PA_ADD_OPTION(SKIP_NON_HERBA);
+    }
+}
+
+std::string TeraRollFilter::check_validity() const{
+    if (MIN_STARS > MAX_STARS){
+        return "\"Min Stars\" is bigger than \"Max Stars\".";
+    }
+    if (SKIP_NON_HERBA && MAX_STARS < 5){
+        return
+            "Setting \"Max Stars\" below 5 and \"Skip Herba\" to "
+            "true will never yield results because all herb raids are 5-star or higher.";
+    }
+    if (SKIP_NON_HERBA && EVENT_CHECK_MODE == EventCheckMode::CHECK_ONLY_EVENT){
+        return "\"Check only event raids\" and \"Skip Non-Herba Raids\" is incompatible because only non-event raids can have all herbs.";
+    }
+    return "";
+}
+
+TeraRollFilter::FilterResult TeraRollFilter::run_filter(
+    const ProgramInfo& info, VideoStream& stream, ProControllerContext& context,
+    TeraRaidData& data
+) const{
+    uint8_t min_stars = MIN_STARS;
+    uint8_t max_stars = MAX_STARS;
+    EventCheckMode event_check_mode = EVENT_CHECK_MODE;
+
+    bool sparkling_raid = false;
+
+    switch (event_check_mode){
+    case EventCheckMode::CHECK_ALL:
+        break;
+    case EventCheckMode::CHECK_ONLY_EVENT:
+        // this makes sure that we only check sparkling raids
+        // and that includes event & 6 star raids
+        // a later star check will be performed to exclude 6 star raids
+        if (!is_sparkling_raid(stream, context)){
+            stream.log("No sparkling raid detected, skipping...", COLOR_ORANGE);
+//            data.event_type = TeraRaidData::EventType::NORMAL;
+            return FilterResult::NO_RAID;
+        }
+        break;
+    case EventCheckMode::CHECK_ONLY_NONEVENT:
+        if (is_sparkling_raid(stream, context)){
+            // if the user excluded 6 star raids, skip sparkling raids
+            if (min_stars > 6 || max_stars < 6){
+                stream.log("Sparkling raid detected, skipping...", COLOR_ORANGE);
+                return FilterResult::FAILED;
+            }
+            // if the user included 6 star raids, defer skip decision
+            sparkling_raid = true;
+        }
+        break;
+    }
+
+    if (!open_raid(stream, context)){
+        return FilterResult::NO_RAID;
+    }
+    context.wait_for(std::chrono::milliseconds(500));
+
+    VideoSnapshot screen = stream.video().snapshot();
+    TeraCardReader reader(COLOR_RED);
+
+    read_card(info, stream, screen, reader, data);
+
+    switch (event_check_mode){
+    case EventCheckMode::CHECK_ALL:
+        break;
+    case EventCheckMode::CHECK_ONLY_EVENT:
+        // only sparkling raids at this point
+        // skip 6 star raids
+        if (data.stars == 6){
+            stream.log("Detected non-event 6 star raid, skipping...", COLOR_ORANGE);
+            close_raid(info, stream, context);
+            return FilterResult::NO_RAID;
+        }
+        break;
+    case EventCheckMode::CHECK_ONLY_NONEVENT:
+        // skip sparkling raids unless 6 stars
+        if (sparkling_raid && data.stars != 6){
+            stream.log("Detected event raid, skipping...", COLOR_ORANGE);
+            close_raid(info, stream, context);
+            return FilterResult::NO_RAID;
+        }
+        break;
+    }
+
+    if (data.stars < min_stars || data.stars > max_stars){
+        stream.log("Raid stars is out of range. Skipping...");
+        close_raid(info, stream, context);
+        return FilterResult::FAILED;
+    }
+
+    // TODO: Add species filter
+
+    if (!check_herba(data.species)){
+        stream.log("Raid cannot have all herbas. Skipping...");
+        close_raid(info, stream, context);
+        return FilterResult::FAILED;
+    }
+
+    return FilterResult::PASSED;
+}
+
+
+void TeraRollFilter::read_card(
+    const ProgramInfo& info, VideoStream& stream, const ImageViewRGB32& screen,
+    TeraCardReader& reader, TeraRaidData& data
+) const{
+    data.stars = reader.stars(stream.logger(), info, screen);
+    data.tera_type = reader.tera_type(stream.logger(), info, screen);
+    data.species = reader.pokemon_slug(stream.logger(), info, screen);
+
+    std::string stars = data.stars == 0
+        ? "?"
+        : std::to_string(data.stars);
+    std::string tera_type = data.tera_type.empty()
+        ? "? tera"
+        : data.tera_type;
+
+    std::string pokemon;
+    if (data.species.empty()){
+        pokemon = "unknown " + Pokemon::STRING_POKEMON;
+    }else if (data.species.size() == 1){
+        pokemon = *data.species.begin();
+    }else{
+        pokemon = set_to_str(data.species);
+    }
+
+    stream.overlay().add_log(
+        stars + "* " + tera_type + " " + pokemon,
+        COLOR_GREEN
+    );
+    std::string log = "Detected a " + stars + "* " + tera_type + " " + pokemon;
+    stream.log(log);
+}
+bool TeraRollFilter::check_herba(const std::set<std::string>& pokemon_slugs) const{
+    if (!SKIP_NON_HERBA){
+        return true;
+    }
+
+    static const std::set<std::string> fivestar{
+        "gengar", "glalie", "amoonguss", "dondozo", "palafin-zero", "finizen", "blissey", "eelektross", "drifblim", "cetitan",
+        "snorlax", "dusknoir", "mandibuzz", "basculegion"
+    };
+    static const std::set<std::string> sixstar{
+        "blissey", "vaporeon", "amoonguss", "farigiraf", "cetitan", "dondozo",
+        "poliwrath", "snorlax", "basculegion"
+    };
+
+    std::set<std::string> fivestar_compatible;
+    std::set_intersection(
+        fivestar_compatible.begin(), fivestar_compatible.end(),
+        pokemon_slugs.begin(), pokemon_slugs.end(),
+        std::inserter(fivestar_compatible, fivestar_compatible.begin())
+    );
+    if (!fivestar_compatible.empty()){
+        return true;
+    }
+
+    std::set<std::string> sixstar_compatible;
+    std::set_intersection(
+        sixstar_compatible.begin(), sixstar_compatible.end(),
+        pokemon_slugs.begin(), pokemon_slugs.end(),
+        std::inserter(sixstar_compatible, sixstar_compatible.begin())
+    );
+    if (!sixstar_compatible.empty()){
+        return true;
+    }
+
+    return false;
+}
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_TeraRollFilter.h b/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_TeraRollFilter.h
new file mode 100644
index 0000000000..51d1576edd
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_TeraRollFilter.h
@@ -0,0 +1,90 @@
+/*  Tera Roll Filter
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_TeraRollFilter_H
+#define PokemonAutomation_PokemonSV_TeraRollFilter_H
+
+#include <set>
+#include "Common/Cpp/Options/GroupOption.h"
+#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "Common/Cpp/Options/EnumDropdownOption.h"
+#include "CommonFramework/Tools/VideoStream.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+
+namespace PokemonAutomation{
+    class Logger;
+    class ImageViewRGB32;
+    struct ProgramInfo;
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+class TeraCardReader;
+
+
+struct TeraRaidData{
+
+#if 0
+    enum class EventType{
+        UNKNOWN,
+        NORMAL,
+        EVENT,
+    };
+    EventType event_type = EventType::UNKNOWN;
+#endif
+
+    uint8_t stars = 0;
+    std::string tera_type;
+    std::set<std::string> species;
+};
+
+
+
+class TeraRollFilter : public GroupOption{
+public:
+    TeraRollFilter(uint8_t default_max_stars, bool enable_herb_filter);
+
+    virtual std::string check_validity() const override;
+
+    enum class FilterResult{
+        NO_RAID,
+        FAILED,
+        PASSED,
+    };
+
+    FilterResult run_filter(
+        const ProgramInfo& info, VideoStream& stream, ProControllerContext& context,
+        TeraRaidData& data
+    ) const;
+
+
+private:
+    void read_card(
+        const ProgramInfo& info, VideoStream& stream, const ImageViewRGB32& screen,
+        TeraCardReader& reader, TeraRaidData& data
+    ) const;
+    bool check_herba(const std::set<std::string>& pokemon_slugs) const;
+
+public:
+    enum class EventCheckMode{
+        CHECK_ALL,
+        CHECK_ONLY_EVENT,
+        CHECK_ONLY_NONEVENT,
+    };
+    EnumDropdownOption<EventCheckMode> EVENT_CHECK_MODE;
+
+    SimpleIntegerOption<uint8_t> MIN_STARS;
+    SimpleIntegerOption<uint8_t> MAX_STARS;
+
+    BooleanCheckBoxOption SKIP_NON_HERBA;
+};
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/PokemonSV/Options/PokemonSV_TournamentPrizeSelectOption.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_TournamentPrizeSelectOption.cpp
similarity index 85%
rename from SerialPrograms/Source/PokemonSV/Options/PokemonSV_TournamentPrizeSelectOption.cpp
rename to SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_TournamentPrizeSelectOption.cpp
index 91e0328f09..90919f1625 100644
--- a/SerialPrograms/Source/PokemonSV/Options/PokemonSV_TournamentPrizeSelectOption.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_TournamentPrizeSelectOption.cpp
@@ -1,52 +1,51 @@
-/*  Tournament Prize Select Option
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "CommonFramework/Logging/Logger.h"
-#include "PokemonSV/Resources/PokemonSV_TournamentPrizeNames.h"
-#include "PokemonSV/Resources/PokemonSV_ItemSprites.h"
-#include "PokemonSV_TournamentPrizeSelectOption.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-StringSelectDatabase make_tournament_prize_database(){
-    StringSelectDatabase ret;
-    for (const auto& slug : TOURNAMENT_PRIZE_SLUGS()){
-        const TournamentPrizeNames& data = get_tournament_prize_name(slug);
-        /*
-        const SpriteDatabase::Sprite* sprite = TOURNAMENT_PRIZE_SPRITES().get_nothrow(slug);
-        if (sprite == nullptr){
-            ret.add_entry(StringSelectEntry(slug, data.display_name()));
-            global_logger_tagged().log("Missing sprite for: " + slug, COLOR_RED);
-        }else{
-            ret.add_entry(StringSelectEntry(slug, data.display_name(), sprite->icon));
-        }
-        */
-        ret.add_entry(StringSelectEntry(slug, data.display_name()));
-    }
-    return ret;
-}
-const StringSelectDatabase& TOURNAMENT_PRIZE_SELECT_DATABASE(){
-    static StringSelectDatabase database = make_tournament_prize_database();
-    return database;
-}
-
-
-TournamentPrizeSelectCell::TournamentPrizeSelectCell(
-    const std::string& default_slug
-)
-    : StringSelectCell(
-        TOURNAMENT_PRIZE_SELECT_DATABASE(),
-        LockWhileRunning::LOCKED,
-        default_slug
-    )
-{}
-
-
-}
-}
-}
+/*  Tournament Prize Select Option
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Logging/Logger.h"
+#include "VideoGames/PokemonSV/Resources/PokemonSV_TournamentPrizeNames.h"
+#include "PokemonSV_TournamentPrizeSelectOption.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+StringSelectDatabase make_tournament_prize_database(){
+    StringSelectDatabase ret;
+    for (const auto& slug : TOURNAMENT_PRIZE_SLUGS()){
+        const TournamentPrizeNames& data = get_tournament_prize_name(slug);
+        /*
+        const SpriteDatabase::Sprite* sprite = TOURNAMENT_PRIZE_SPRITES().get_nothrow(slug);
+        if (sprite == nullptr){
+            ret.add_entry(StringSelectEntry(slug, data.display_name()));
+            global_logger_tagged().log("Missing sprite for: " + slug, COLOR_RED);
+        }else{
+            ret.add_entry(StringSelectEntry(slug, data.display_name(), sprite->icon));
+        }
+        */
+        ret.add_entry(StringSelectEntry(slug, data.display_name()));
+    }
+    return ret;
+}
+const StringSelectDatabase& TOURNAMENT_PRIZE_SELECT_DATABASE(){
+    static StringSelectDatabase database = make_tournament_prize_database();
+    return database;
+}
+
+
+TournamentPrizeSelectCell::TournamentPrizeSelectCell(
+    const std::string& default_slug
+)
+    : StringSelectCell(
+        TOURNAMENT_PRIZE_SELECT_DATABASE(),
+        LockMode::LOCK_WHILE_RUNNING,
+        default_slug
+    )
+{}
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/PokemonSV/Options/PokemonSV_TournamentPrizeSelectOption.h b/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_TournamentPrizeSelectOption.h
similarity index 76%
rename from SerialPrograms/Source/PokemonSV/Options/PokemonSV_TournamentPrizeSelectOption.h
rename to SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_TournamentPrizeSelectOption.h
index d69629c7df..ed106496cd 100644
--- a/SerialPrograms/Source/PokemonSV/Options/PokemonSV_TournamentPrizeSelectOption.h
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_TournamentPrizeSelectOption.h
@@ -1,24 +1,24 @@
-/*  Tournament Prize Select Option
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSV_TournamentPrizeSelectOption_H
-#define PokemonAutomation_PokemonSV_TournamentPrizeSelectOption_H
-
-#include "CommonFramework/Options/StringSelectOption.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-class TournamentPrizeSelectCell : public StringSelectCell{
-public:
-    TournamentPrizeSelectCell(const std::string& default_slug);
-};
-
-}
-}
-}
-#endif
+/*  Tournament Prize Select Option
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_TournamentPrizeSelectOption_H
+#define PokemonAutomation_PokemonSV_TournamentPrizeSelectOption_H
+
+#include "CommonTools/Options/StringSelectOption.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+class TournamentPrizeSelectCell : public StringSelectCell{
+public:
+    TournamentPrizeSelectCell(const std::string& default_slug);
+};
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/PokemonSV/Options/PokemonSV_TournamentPrizeTable.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_TournamentPrizeTable.cpp
similarity index 79%
rename from SerialPrograms/Source/PokemonSV/Options/PokemonSV_TournamentPrizeTable.cpp
rename to SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_TournamentPrizeTable.cpp
index a8fac612e4..2296e02bef 100644
--- a/SerialPrograms/Source/PokemonSV/Options/PokemonSV_TournamentPrizeTable.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_TournamentPrizeTable.cpp
@@ -1,72 +1,72 @@
-/*  Tournament Prize Table
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "PokemonSV/Resources/PokemonSV_TournamentPrizeNames.h"
-#include "PokemonSV_TournamentPrizeTable.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-TournamentPrizeSelectorRow::TournamentPrizeSelectorRow()
-    : item("beast-ball")
-{
-    PA_ADD_OPTION(item);
-}
-std::unique_ptr<EditableTableRow> TournamentPrizeSelectorRow::clone() const{
-    std::unique_ptr<TournamentPrizeSelectorRow> ret(new TournamentPrizeSelectorRow());
-    ret->item.set_by_index(item.index());
-    return ret;
-}
-
-TournamentPrizeTable::TournamentPrizeTable(std::string label)
-    : EditableTableOption_t<TournamentPrizeSelectorRow>(
-        std::move(label),
-        LockWhileRunning::LOCKED,
-        make_defaults()
-    )
-{}
-
-bool TournamentPrizeTable::find_item(const std::string& item_slug) const{
-    std::vector<std::unique_ptr<TournamentPrizeSelectorRow>> table = copy_snapshot();
-    for (const std::unique_ptr<TournamentPrizeSelectorRow>& row : table){
-        if (row->item.slug() == item_slug) {
-            return true;
-        }
-    }
-    return false;
-}
-
-std::vector<std::string> TournamentPrizeTable::selected_items() const{
-    std::vector<std::unique_ptr<TournamentPrizeSelectorRow>> table = copy_snapshot();
-    std::vector<std::string> slugs;
-    for (const std::unique_ptr<TournamentPrizeSelectorRow>& row : table){
-        slugs.emplace_back(row->item.slug());
-    }
-    return slugs;
-}
-
-
-std::vector<std::string> TournamentPrizeTable::make_header() const{
-    return std::vector<std::string>{
-        "Item",
-    };
-}
-
-std::vector<std::unique_ptr<EditableTableRow>> TournamentPrizeTable::make_defaults(){
-    std::vector<std::unique_ptr<EditableTableRow>> ret;
-    ret.emplace_back(std::make_unique<TournamentPrizeSelectorRow>());
-    return ret;
-}
-
-
-
-
-
-
-}
-}
-}
+/*  Tournament Prize Table
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "PokemonSV_TournamentPrizeTable.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+TournamentPrizeSelectorRow::TournamentPrizeSelectorRow(EditableTableOption& parent_table)
+    : EditableTableRow(parent_table)
+    , item("beast-ball")
+{
+    PA_ADD_OPTION(item);
+}
+std::unique_ptr<EditableTableRow> TournamentPrizeSelectorRow::clone() const{
+    std::unique_ptr<TournamentPrizeSelectorRow> ret(new TournamentPrizeSelectorRow(parent()));
+    ret->item.set_by_index(item.index());
+    return ret;
+}
+
+TournamentPrizeTable::TournamentPrizeTable(std::string label)
+    : EditableTableOption_t<TournamentPrizeSelectorRow>(
+        std::move(label),
+        LockMode::LOCK_WHILE_RUNNING,
+        make_defaults()
+    )
+{}
+
+bool TournamentPrizeTable::find_item(const std::string& item_slug) const{
+    std::vector<std::unique_ptr<TournamentPrizeSelectorRow>> table = copy_snapshot();
+    for (const std::unique_ptr<TournamentPrizeSelectorRow>& row : table){
+        if (row->item.slug() == item_slug){
+            return true;
+        }
+    }
+    return false;
+}
+
+std::vector<std::string> TournamentPrizeTable::selected_items() const{
+    std::vector<std::unique_ptr<TournamentPrizeSelectorRow>> table = copy_snapshot();
+    std::vector<std::string> slugs;
+    for (const std::unique_ptr<TournamentPrizeSelectorRow>& row : table){
+        slugs.emplace_back(row->item.slug());
+    }
+    return slugs;
+}
+
+
+std::vector<std::string> TournamentPrizeTable::make_header() const{
+    return std::vector<std::string>{
+        "Item",
+    };
+}
+
+std::vector<std::unique_ptr<EditableTableRow>> TournamentPrizeTable::make_defaults(){
+    std::vector<std::unique_ptr<EditableTableRow>> ret;
+    ret.emplace_back(std::make_unique<TournamentPrizeSelectorRow>(*this));
+    return ret;
+}
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/PokemonSV/Options/PokemonSV_TournamentPrizeTable.h b/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_TournamentPrizeTable.h
similarity index 79%
rename from SerialPrograms/Source/PokemonSV/Options/PokemonSV_TournamentPrizeTable.h
rename to SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_TournamentPrizeTable.h
index 3e5b48ce66..5afd11a651 100644
--- a/SerialPrograms/Source/PokemonSV/Options/PokemonSV_TournamentPrizeTable.h
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Options/PokemonSV_TournamentPrizeTable.h
@@ -1,51 +1,51 @@
-/* Tournament Prize Table
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSV_TournamentPrizeTable_H
-#define PokemonAutomation_PokemonSV_TournamentPrizeTable_H
-
-#include "Common/Cpp/Options/EditableTableOption.h"
-#include "PokemonSV_TournamentPrizeSelectOption.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-
-
-class TournamentPrizeSelectorRow : public EditableTableRow{
-public:
-    TournamentPrizeSelectorRow();
-    virtual std::unique_ptr<EditableTableRow> clone() const override;
-
-public:
-    TournamentPrizeSelectCell item;
-};
-
-
-
-class TournamentPrizeTable : public EditableTableOption_t<TournamentPrizeSelectorRow>{
-public:
-    TournamentPrizeTable(std::string label);
-
-
-    // Whether item_slug is among the selected items.
-    bool find_item(const std::string& item_slug) const;
-    std::vector<std::string> selected_items() const;
-
-    virtual std::vector<std::string> make_header() const override;
-
-    static std::vector<std::unique_ptr<EditableTableRow>> make_defaults();
-};
-
-
-
-
-
-}
-}
-}
-#endif
+/* Tournament Prize Table
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_TournamentPrizeTable_H
+#define PokemonAutomation_PokemonSV_TournamentPrizeTable_H
+
+#include "Common/Cpp/Options/EditableTableOption.h"
+#include "PokemonSV_TournamentPrizeSelectOption.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+class TournamentPrizeSelectorRow : public EditableTableRow{
+public:
+    TournamentPrizeSelectorRow(EditableTableOption& parent_table);
+    virtual std::unique_ptr<EditableTableRow> clone() const override;
+
+public:
+    TournamentPrizeSelectCell item;
+};
+
+
+
+class TournamentPrizeTable : public EditableTableOption_t<TournamentPrizeSelectorRow>{
+public:
+    TournamentPrizeTable(std::string label);
+
+
+    // Whether item_slug is among the selected items.
+    bool find_item(const std::string& item_slug) const;
+    std::vector<std::string> selected_items() const;
+
+    virtual std::vector<std::string> make_header() const override;
+
+    std::vector<std::unique_ptr<EditableTableRow>> make_defaults();
+};
+
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/PokemonSV_Panels.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/PokemonSV_Panels.cpp
new file mode 100644
index 0000000000..62706f9f83
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/PokemonSV_Panels.cpp
@@ -0,0 +1,187 @@
+/*  Pokemon SV Panels
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/StaticGlobals.h"
+#include "CommonFramework/GlobalAutoPaths.h"
+#include "PokemonSV_Panels.h"
+
+#include "PokemonSV_Settings.h"
+
+#include "Programs/General/PokemonSV_MassPurchase.h"
+#include "Programs/General/PokemonSV_ClothingBuyer.h"
+#include "Programs/General/PokemonSV_AutonomousBallThrower.h"
+#include "Programs/General/PokemonSV_SizeChecker.h"
+
+#include "Programs/Boxes/PokemonSV_MassRelease.h"
+#include "Programs/Boxes/PokemonSV_MassAttachItems.h"
+
+#include "Programs/Trading/PokemonSV_SelfBoxTrade.h"
+#include "Programs/Sandwiches/PokemonSV_SandwichMaker.h"
+
+#include "Programs/Farming/PokemonSV_LPFarmer.h"
+#include "Programs/Farming/PokemonSV_GimmighoulChestFarmer.h"
+#include "Programs/Farming/PokemonSV_GimmighoulRoamingFarmer.h"
+#include "Programs/Farming/PokemonSV_AuctionFarmer.h"
+#include "Programs/Farming/PokemonSV_ESPTraining.h"
+#include "Programs/Farming/PokemonSV_TournamentFarmer.h"
+#include "Programs/Farming/PokemonSV_TournamentFarmer2.h"
+#include "Programs/Farming/PokemonSV_FlyingTrialFarmer.h"
+#include "Programs/Farming/PokemonSV_BBQSoloFarmer.h"
+#include "Programs/Farming/PokemonSV_MaterialFarmer.h"
+#include "Programs/ItemPrinter/PokemonSV_ItemPrinterRNG.h"
+
+#include "Programs/Eggs/PokemonSV_EggFetcher.h"
+#include "Programs/Eggs/PokemonSV_EggHatcher.h"
+#include "Programs/Eggs/PokemonSV_EggAutonomous.h"
+
+#include "Programs/TeraRaids/PokemonSV_AutoHost.h"
+#include "Programs/TeraRaids/PokemonSV_TeraRoller.h"
+#include "Programs/TeraRaids/PokemonSV_TeraSelfFarmer.h"
+#include "Programs/TeraRaids/PokemonSV_TeraMultiFarmer.h"
+
+#include "Programs/FastCodeEntry/PokemonSV_FastCodeEntry.h"
+#include "Programs/FastCodeEntry/PokemonSV_ClipboardFastCodeEntry.h"
+#include "Programs/FastCodeEntry/PokemonSV_VideoFastCodeEntry.h"
+
+#include "Programs/General/PokemonSV_StatsReset.h"
+#include "Programs/General/PokemonSV_StatsResetEventBattle.h"
+
+#include "Programs/ShinyHunting/PokemonSV_ShinyHunt-AreaZeroPlatform.h"
+#include "Programs/ShinyHunting/PokemonSV_ShinyHunt-Scatterbug.h"
+
+#include "Programs/AutoStory/PokemonSV_AutoStory.h"
+#include "Programs/Farming/PokemonSV_ClaimMysteryGift.h"
+
+#include "Programs/Glitches/PokemonSV_WildItemFarmer.h"
+#include "Programs/Glitches/PokemonSV_RideCloner-1.0.1.h"
+#include "Programs/Glitches/PokemonSV_CloneItems-1.0.1.h"
+
+//  Deprecated
+#include "Programs/ItemPrinter/PokemonSV_AutoItemPrinter.h"
+
+#include "Programs/TestPrograms/PokemonSV_SoundListener.h"
+#include "Programs/FormHunting/PokemonSV_ThreeSegmentDudunsparceFinder.h"
+
+#ifdef PA_OFFICIAL
+#include "../../Internal/SerialPrograms/NintendoSwitch_TestPrograms.h"
+#endif
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+PanelListFactory::PanelListFactory()
+    : PanelListDescriptor(
+        Pokemon::STRING_POKEMON + " Scarlet and Violet",
+        RESOURCE_PATH() + "CategoryIcons/PokemonSV.png"
+    )
+{}
+
+std::vector<PanelEntry> PanelListFactory::make_panels() const{
+    std::vector<PanelEntry> ret;
+
+    ret.emplace_back("---- Settings ----");
+    ret.emplace_back(make_OptionsPanel<GameSettingsPanel>());
+
+    ret.emplace_back("---- General ----");
+    ret.emplace_back(make_SingleSwitchProgram<MassPurchase>());
+    ret.emplace_back(make_SingleSwitchProgram<ClothingBuyer>());
+    ret.emplace_back(make_SingleSwitchProgram<AutonomousBallThrower>());
+    ret.emplace_back(make_SingleSwitchProgram<SizeChecker>());
+
+//    ret.emplace_back("---- Trading ----");
+    ret.emplace_back(make_MultiSwitchProgram<SelfBoxTrade>());
+
+//    ret.emplace_back("---- Sandwiches ----");
+    ret.emplace_back(make_SingleSwitchProgram<SandwichMaker>());
+
+    ret.emplace_back("---- Boxes ----");
+    ret.emplace_back(make_SingleSwitchProgram<MassRelease>());
+    ret.emplace_back(make_SingleSwitchProgram<MassAttachItems>());
+
+    ret.emplace_back("---- Farming ----");
+    ret.emplace_back(make_SingleSwitchProgram<LPFarmer>());
+    ret.emplace_back(make_SingleSwitchProgram<GimmighoulRoamingFarmer>());
+    ret.emplace_back(make_SingleSwitchProgram<GimmighoulChestFarmer>());
+    ret.emplace_back(make_SingleSwitchProgram<AuctionFarmer>());
+    ret.emplace_back(make_SingleSwitchProgram<ESPTraining>());
+    ret.emplace_back(make_SingleSwitchProgram<TournamentFarmer>());
+    ret.emplace_back(make_SingleSwitchProgram<TournamentFarmer2>());
+    ret.emplace_back(make_SingleSwitchProgram<FlyingTrialFarmer>());
+    ret.emplace_back(make_SingleSwitchProgram<BBQSoloFarmer>());
+    ret.emplace_back(make_SingleSwitchProgram<MaterialFarmer>());
+    ret.emplace_back(make_SingleSwitchProgram<ItemPrinterRNG>());
+
+    ret.emplace_back("---- Eggs ----");
+    ret.emplace_back(make_SingleSwitchProgram<EggFetcher>());
+    ret.emplace_back(make_SingleSwitchProgram<EggHatcher>());
+    ret.emplace_back(make_SingleSwitchProgram<EggAutonomous>());
+
+    ret.emplace_back("---- Tera Raids ----");
+    ret.emplace_back(make_SingleSwitchProgram<AutoHost>());
+    ret.emplace_back(make_SingleSwitchProgram<TeraRoller>());
+    ret.emplace_back(make_SingleSwitchProgram<TeraSelfFarmer>());
+    ret.emplace_back(make_MultiSwitchProgram<TeraMultiFarmer>());
+
+    ret.emplace_back("---- Fast Code Entry ----");
+    ret.emplace_back(make_MultiSwitchProgram<FastCodeEntry>());
+    ret.emplace_back(make_MultiSwitchProgram<ClipboardFastCodeEntry>());
+    ret.emplace_back(make_MultiSwitchProgram<VideoFastCodeEntry>());
+
+    ret.emplace_back("---- Stats Hunting ----");
+    ret.emplace_back(make_SingleSwitchProgram<StatsReset>());
+    ret.emplace_back(make_SingleSwitchProgram<StatsResetEventBattle>());
+
+    ret.emplace_back("---- Shiny Hunting ----");
+    ret.emplace_back(make_SingleSwitchProgram<ShinyHuntAreaZeroPlatform>());
+    ret.emplace_back(make_SingleSwitchProgram< ShinyHuntScatterbug>());
+
+    ret.emplace_back("---- Story Automation ----");
+    ret.emplace_back(make_SingleSwitchProgram<AutoStory>());
+    ret.emplace_back(make_SingleSwitchProgram<ClaimMysteryGift>());
+
+    ret.emplace_back("---- Glitches (v3.0.0) ----");
+    ret.emplace_back(make_SingleSwitchProgram<WildItemFarmer>());
+
+    ret.emplace_back("---- Glitches (v1.0.1) ----");
+    ret.emplace_back(make_SingleSwitchProgram<RideCloner101>());
+    ret.emplace_back(make_SingleSwitchProgram< CloneItems101>());
+
+//    ret.emplace_back("---- Public Betas ----");
+
+    ret.emplace_back("---- Deprecated Programs ----");
+    ret.emplace_back(make_SingleSwitchProgram<AutoItemPrinter>());
+
+//    if (STATIC_GLOBALS.DEVELOPER_MODE || IS_BETA_VERSION){
+//        ret.emplace_back("---- Untested/Beta/WIP ----");
+//    }
+//    if (IS_BETA_VERSION){
+//        ret.emplace_back("---- Story Automation ----");
+//    }
+    if (STATIC_GLOBALS.DEVELOPER_MODE){
+        ret.emplace_back("---- Developer Tools ----");
+        ret.emplace_back(make_SingleSwitchProgram<SoundListener>());
+        ret.emplace_back(make_SingleSwitchProgram<ThreeSegmentDudunsparceFinder>());
+    }
+
+#ifdef PA_OFFICIAL
+    if (STATIC_GLOBALS.INTERNAL_DEVELOPER_MODE){
+        ret.emplace_back("---- Research ----");
+        add_panels(ret);
+    }
+#endif
+
+    return ret;
+}
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/PokemonSV_Panels.h b/SerialPrograms/Source/VideoGames/PokemonSV/PokemonSV_Panels.h
new file mode 100644
index 0000000000..b8f0c660fe
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/PokemonSV_Panels.h
@@ -0,0 +1,30 @@
+/*  Pokemon Scarlet/Violet Panels
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_Panels_H
+#define PokemonAutomation_PokemonSV_Panels_H
+
+#include "CommonFramework/Panels/PanelList.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+class PanelListFactory : public PanelListDescriptor{
+public:
+    PanelListFactory();
+private:
+    virtual std::vector<PanelEntry> make_panels() const override;
+};
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/PokemonSV_Settings.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/PokemonSV_Settings.cpp
new file mode 100644
index 0000000000..f281e9b9c3
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/PokemonSV_Settings.cpp
@@ -0,0 +1,123 @@
+/*  Pokemon SV Settings
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+//#include "CommonFramework/Globals.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "PokemonSV_Settings.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+using namespace Pokemon;
+
+
+
+GameSettings& GameSettings::instance(){
+    static GameSettings settings;
+    return settings;
+}
+GameSettings::GameSettings()
+    : BatchOption(LockMode::LOCK_WHILE_RUNNING)
+    , m_menu_navigation("<font size=4><b>Menu Navigation Timings:</b></font>")
+    , GAME_TO_HOME_DELAY1(
+        "<b>Game to Home Delay:</b><br>Delay from pressing home to entering the the Switch home menu.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "1000 ms"
+    )
+    , m_start_game_timings("<font size=4><b>Start Game Timings:</b></font>")
+    , START_GAME_WAIT0(
+        "<b>Start Game Wait:</b><br>Wait this long for the game to load.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "60 s"
+    )
+    , ENTER_GAME_MASH0(
+        "<b>Enter Game Mash:</b><br>Mash A for this long to enter the game.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "5000 ms"
+    )
+    , ENTER_GAME_WAIT0(
+        "<b>Enter Game Wait:</b><br>Wait this long for the game to enter the overworld.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "60 s"
+    )
+    , m_advanced_options(
+        "<font size=4><b>Advanced Options:</b> You should not need to touch anything below here.</font>"
+    )
+    , RAID_SPAWN_DELAY0(
+        "<b>Raid Spawn Delay</b>",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        "3000 ms"
+    )
+    , SHINY_SOUND_THRESHOLD2(
+        "<b>Shiny Sound Threshold:</b><br>Maximum error coefficient to trigger a shiny detection.",
+        LockMode::LOCK_WHILE_RUNNING,
+        0.96, 0, 1.0
+    )
+    , SHINY_SOUND_LOW_FREQUENCY(
+        "<b>Shiny Sound Low Frequency (Hz):</b><br>High pass filter frequency for shiny sound.",
+        LockMode::LOCK_WHILE_RUNNING,
+        1000, 0, 48000
+    )
+    , LETS_GO_KILL_SOUND_THRESHOLD(
+        "<b>Let's Go Kill Sound Threshold:</b><br>Maximum error coefficient to trigger a Let's Go Kill detection.",
+        LockMode::LOCK_WHILE_RUNNING,
+        0.93, 0, 1.0
+    )
+    , LETS_GO_KILL_SOUND_LOW_FREQUENCY(
+        "<b>Let's Go Kill Sound Low Frequency (Hz):</b><br>High pass filter frequency for Let's Go Kill sound.",
+        LockMode::LOCK_WHILE_RUNNING,
+        1000, 0, 48000
+    )
+{
+    PA_ADD_OPTION(GAME_TO_HOME_DELAY1);
+    PA_ADD_STATIC(m_start_game_timings);
+    PA_ADD_OPTION(START_GAME_WAIT0);
+    PA_ADD_OPTION(ENTER_GAME_MASH0);
+    PA_ADD_OPTION(ENTER_GAME_WAIT0);
+    PA_ADD_OPTION(m_advanced_options);
+    PA_ADD_OPTION(RAID_SPAWN_DELAY0);
+    PA_ADD_OPTION(SHINY_SOUND_THRESHOLD2);
+    PA_ADD_OPTION(SHINY_SOUND_LOW_FREQUENCY);
+    PA_ADD_OPTION(LETS_GO_KILL_SOUND_THRESHOLD);
+    PA_ADD_OPTION(LETS_GO_KILL_SOUND_LOW_FREQUENCY);
+}
+
+
+
+
+
+GameSettings_Descriptor::GameSettings_Descriptor()
+    : OptionsPanelDescriptor(
+        "PokemonSV:GlobalSettings",
+        STRING_POKEMON + " SV", "Game Settings",
+        "Programs/PokemonSV/PokemonSettings.html",
+        "Global " + STRING_POKEMON + " Scarlet and Violet Settings",
+        PanelQualityStanding::OFFICIAL
+    )
+{}
+
+
+
+GameSettingsPanel::GameSettingsPanel()
+    : settings(GameSettings::instance())
+{
+    PA_ADD_OPTION(settings);
+}
+
+
+
+
+
+}
+}
+}
+
+
+
+
+
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/PokemonSV_Settings.h b/SerialPrograms/Source/VideoGames/PokemonSV/PokemonSV_Settings.h
new file mode 100644
index 0000000000..dde756f0ac
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/PokemonSV_Settings.h
@@ -0,0 +1,62 @@
+/*  Pokemon SV Settings
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_Settings_H
+#define PokemonAutomation_PokemonSV_Settings_H
+
+#include "Common/Cpp/Options/StaticTextOption.h"
+#include "Common/Cpp/Options/FloatingPointOption.h"
+#include "Common/Cpp/Options/TimeDurationOption.h"
+#include "CommonFramework/Panels/OptionsPanel.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+class GameSettings : public BatchOption{
+    GameSettings();
+public:
+    static GameSettings& instance();
+
+    SectionDividerOption m_menu_navigation;
+    MillisecondsOption GAME_TO_HOME_DELAY1;
+
+    SectionDividerOption m_start_game_timings;
+    MillisecondsOption START_GAME_WAIT0;
+    MillisecondsOption ENTER_GAME_MASH0;
+    MillisecondsOption ENTER_GAME_WAIT0;
+
+    SectionDividerOption m_advanced_options;
+    MillisecondsOption RAID_SPAWN_DELAY0;
+    FloatingPointOption SHINY_SOUND_THRESHOLD2;
+    FloatingPointOption SHINY_SOUND_LOW_FREQUENCY;
+    FloatingPointOption LETS_GO_KILL_SOUND_THRESHOLD;
+    FloatingPointOption LETS_GO_KILL_SOUND_LOW_FREQUENCY;
+};
+
+
+
+
+class GameSettings_Descriptor : public OptionsPanelDescriptor{
+public:
+    GameSettings_Descriptor();
+};
+
+
+class GameSettingsPanel : public OptionsPanelInstance{
+public:
+    using Descriptor = GameSettings_Descriptor;
+    GameSettingsPanel();
+private:
+    GameSettings& settings;
+};
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/PokemonSV_Tests.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/PokemonSV_Tests.cpp
new file mode 100644
index 0000000000..ca43d5a46c
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/PokemonSV_Tests.cpp
@@ -0,0 +1,63 @@
+/*  Pokemon SV Tests
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "Inference/PokemonSV_WhiteButtonDetector.h"
+#include "Inference/Boxes/PokemonSV_BoxDetection.h"
+#include "Inference/Boxes/PokemonSV_BoxEggDetector.h"
+#include "Inference/Map/PokemonSV_MapDetector.h"
+#include "Inference/Overworld/PokemonSV_OverworldDetector.h"
+#include "Inference/Picnics/PokemonSV_PicnicDetector.h"
+#include "Inference/Battles/PokemonSV_NormalBattleMenus.h"
+#include "Inference/Tera/PokemonSV_TeraCardDetector.h"
+#include "Inference/Tera/PokemonSV_TeraSilhouetteReader.h"
+#include "Inference/Tera/PokemonSV_TeraTypeReader.h"
+#include "Inference/Dialogs/PokemonSV_DialogDetector.h"
+#include "Inference/Map/PokemonSV_FastTravelDetector.h"
+#include "Inference/Map/PokemonSV_MapMenuDetector.h"
+#include "Inference/Map/PokemonSV_MapPokeCenterIconDetector.h"
+#include "Inference/PokemonSV_ESPEmotionDetector.h"
+#include "Inference/Picnics/PokemonSV_SandwichIngredientDetector.h"
+#include "Inference/Picnics/PokemonSV_SandwichPlateDetector.h"
+#include "Inference/Overworld/PokemonSV_LetsGoKillDetector.h"
+#include "Inference/Picnics/PokemonSV_SandwichRecipeDetector.h"
+#include "Inference/Picnics/PokemonSV_SandwichHandDetector.h"
+#include "Programs/Farming/PokemonSV_BBQTests.h"
+#include "PokemonSV_Tests.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+void add_tests(UnitTestDatabase& database){
+    add_tests_WhiteButtonDetector(database);
+    add_tests_BoxInfoDetector(database);
+    add_tests_BoxEggDetector(database);
+    add_tests_DialogDetector(database);
+    add_tests_ESPEmotionDetector(database);
+    add_tests_FastTravelDetector(database);
+    add_tests_MapDetector(database);
+    add_tests_MapMenuDetector(database);
+    add_tests_MapPokeCenterIconDetector(database);
+    add_tests_OverworldDetector(database);
+    add_tests_PicnicDetector(database);
+    add_tests_SandwichIngredientDetector(database);
+    add_tests_SandwichPlateDetector(database);
+    add_tests_SandwichRecipeDetector(database);
+    add_tests_SandwichHandDetector(database);
+    add_tests_TeraCardDetector(database);
+    add_tests_TeraSilhouetteReader(database);
+    add_tests_TeraTypeReader(database);
+    add_tests_NormalBattleMenus(database);
+    add_tests_LetsGoKillDetector(database);
+    add_tests_BBQ(database);
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/PokemonSV_Tests.h b/SerialPrograms/Source/VideoGames/PokemonSV/PokemonSV_Tests.h
new file mode 100644
index 0000000000..010de34a12
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/PokemonSV_Tests.h
@@ -0,0 +1,25 @@
+/*  Pokemon SV Tests
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_Tests_H
+#define PokemonAutomation_PokemonSV_Tests_H
+
+#include "Common/Cpp/TestRunners/UnitTest.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+void add_tests(UnitTestDatabase& database);
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory.cpp
new file mode 100644
index 0000000000..8167660fcb
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory.cpp
@@ -0,0 +1,1414 @@
+/*  AutoStory
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+
+
+#if 0
+#include "CommonFramework/Exceptions/UnexpectedBattleException.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "CommonTools/VisualDetectors/BlackScreenDetector.h"
+#endif
+
+
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/StaticGlobals.h"
+#include "CommonFramework/GlobalAutoPaths.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonTools/StartupChecks/StartProgramChecks.h"
+#include "CommonTools/StartupChecks/VideoResolutionCheck.h"
+#include "ML/Inference/ML_YOLOv5Detector.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManip.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_IvJudgeReader.h"
+#include "VideoGames/PokemonSV/PokemonSV_Settings.h"
+#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h"
+
+#include "PokemonSV_AutoStory_Segment_00.h"
+#include "PokemonSV_AutoStory_Segment_01.h"
+#include "PokemonSV_AutoStory_Segment_02.h"
+#include "PokemonSV_AutoStory_Segment_03.h"
+#include "PokemonSV_AutoStory_Segment_04.h"
+#include "PokemonSV_AutoStory_Segment_05.h"
+#include "PokemonSV_AutoStory_Segment_06.h"
+#include "PokemonSV_AutoStory_Segment_07.h"
+#include "PokemonSV_AutoStory_Segment_08.h"
+#include "PokemonSV_AutoStory_Segment_09.h"
+#include "PokemonSV_AutoStory_Segment_10.h"
+#include "PokemonSV_AutoStory_Segment_11.h"
+#include "PokemonSV_AutoStory_Segment_12.h"
+#include "PokemonSV_AutoStory_Segment_13.h"
+#include "PokemonSV_AutoStory_Segment_14.h"
+#include "PokemonSV_AutoStory_Segment_15.h"
+#include "PokemonSV_AutoStory_Segment_16.h"
+#include "PokemonSV_AutoStory_Segment_17.h"
+#include "PokemonSV_AutoStory_Segment_18.h"
+#include "PokemonSV_AutoStory_Segment_19.h"
+#include "PokemonSV_AutoStory_Segment_20.h"
+#include "PokemonSV_AutoStory_Segment_21.h"
+#include "PokemonSV_AutoStory_Segment_22.h"
+#include "PokemonSV_AutoStory_Segment_23.h"
+#include "PokemonSV_AutoStory_Segment_24.h"
+#include "PokemonSV_AutoStory_Segment_25.h"
+#include "PokemonSV_AutoStory_Segment_26.h"
+#include "PokemonSV_AutoStory_Segment_27.h"
+#include "PokemonSV_AutoStory_Segment_28.h"
+#include "PokemonSV_AutoStory_Segment_29.h"
+#include "PokemonSV_AutoStory_Segment_30.h"
+#include "PokemonSV_AutoStory_Segment_31.h"
+#include "PokemonSV_AutoStory_Segment_32.h"
+#include "PokemonSV_AutoStory_Segment_33.h"
+#include "PokemonSV_AutoStory_Segment_34.h"
+#include "PokemonSV_AutoStory_Segment_35.h"
+#include "PokemonSV_AutoStory_Segment_36.h"
+#include "PokemonSV_AutoStory_Segment_37.h"
+#include "PokemonSV_AutoStory_Segment_38.h"
+#include "PokemonSV_AutoStory_Segment_39.h"
+#include "PokemonSV_AutoStory_Segment_40.h"
+
+#include "PokemonSV_AutoStory.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+//#include <unordered_map>
+//#include <algorithm>
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+using namespace Pokemon;
+using namespace ML;
+
+static constexpr size_t INDEX_OF_LAST_TUTORIAL_SEGMENT = 9;
+static constexpr size_t INDEX_OF_LAST_TUTORIAL_CHECKPOINT = 20;
+
+
+std::vector<std::unique_ptr<AutoStory_Segment>> make_autoStory_segment_list(){
+    std::vector<std::unique_ptr<AutoStory_Segment>> segment_list;
+    segment_list.emplace_back(std::make_unique<AutoStory_Segment_00>());
+    segment_list.emplace_back(std::make_unique<AutoStory_Segment_01>());
+    segment_list.emplace_back(std::make_unique<AutoStory_Segment_02>());
+    segment_list.emplace_back(std::make_unique<AutoStory_Segment_03>());
+    segment_list.emplace_back(std::make_unique<AutoStory_Segment_04>());
+    segment_list.emplace_back(std::make_unique<AutoStory_Segment_05>());
+    segment_list.emplace_back(std::make_unique<AutoStory_Segment_06>());
+    segment_list.emplace_back(std::make_unique<AutoStory_Segment_07>());
+    segment_list.emplace_back(std::make_unique<AutoStory_Segment_08>());
+    segment_list.emplace_back(std::make_unique<AutoStory_Segment_09>());
+    segment_list.emplace_back(std::make_unique<AutoStory_Segment_10>());
+    segment_list.emplace_back(std::make_unique<AutoStory_Segment_11>());
+    segment_list.emplace_back(std::make_unique<AutoStory_Segment_12>());
+    segment_list.emplace_back(std::make_unique<AutoStory_Segment_13>());
+    segment_list.emplace_back(std::make_unique<AutoStory_Segment_14>());
+    segment_list.emplace_back(std::make_unique<AutoStory_Segment_15>());
+    segment_list.emplace_back(std::make_unique<AutoStory_Segment_16>());
+    segment_list.emplace_back(std::make_unique<AutoStory_Segment_17>());
+    segment_list.emplace_back(std::make_unique<AutoStory_Segment_18>());
+    segment_list.emplace_back(std::make_unique<AutoStory_Segment_19>());
+    segment_list.emplace_back(std::make_unique<AutoStory_Segment_20>());
+    segment_list.emplace_back(std::make_unique<AutoStory_Segment_21>());
+    segment_list.emplace_back(std::make_unique<AutoStory_Segment_22>());
+    segment_list.emplace_back(std::make_unique<AutoStory_Segment_23>());
+    segment_list.emplace_back(std::make_unique<AutoStory_Segment_24>());
+    segment_list.emplace_back(std::make_unique<AutoStory_Segment_25>());
+    segment_list.emplace_back(std::make_unique<AutoStory_Segment_26>());
+    segment_list.emplace_back(std::make_unique<AutoStory_Segment_27>());
+    segment_list.emplace_back(std::make_unique<AutoStory_Segment_28>());
+    segment_list.emplace_back(std::make_unique<AutoStory_Segment_29>());
+    segment_list.emplace_back(std::make_unique<AutoStory_Segment_30>());
+    segment_list.emplace_back(std::make_unique<AutoStory_Segment_31>());
+    segment_list.emplace_back(std::make_unique<AutoStory_Segment_32>());
+    segment_list.emplace_back(std::make_unique<AutoStory_Segment_33>());
+    segment_list.emplace_back(std::make_unique<AutoStory_Segment_34>());
+
+    segment_list.emplace_back(std::make_unique<AutoStory_Segment_35>());
+    segment_list.emplace_back(std::make_unique<AutoStory_Segment_36>());
+    segment_list.emplace_back(std::make_unique<AutoStory_Segment_37>());
+    segment_list.emplace_back(std::make_unique<AutoStory_Segment_38>());
+    segment_list.emplace_back(std::make_unique<AutoStory_Segment_39>());
+    segment_list.emplace_back(std::make_unique<AutoStory_Segment_40>());
+
+    
+    return segment_list;
+};
+
+const std::vector<std::unique_ptr<AutoStory_Segment>>& ALL_AUTO_STORY_SEGMENT_LIST(){
+    static std::vector<std::unique_ptr<AutoStory_Segment>> segment_list = make_autoStory_segment_list();
+    return segment_list;
+}
+
+
+StringSelectDatabase make_all_segments_database(){
+    StringSelectDatabase ret;
+    int index_num = 0;
+    for (const auto& segment : ALL_AUTO_STORY_SEGMENT_LIST()){
+        ret.add_entry(StringSelectEntry(std::to_string(index_num), segment->name()));
+        index_num++;
+    }
+    return ret;
+}
+const StringSelectDatabase& ALL_SEGMENTS_SELECT_DATABASE(){
+    static StringSelectDatabase database = make_all_segments_database();
+    return database;
+}
+
+StringSelectDatabase make_tutorial_segments_database(){
+    StringSelectDatabase ret;
+    const StringSelectDatabase& all_segments = ALL_SEGMENTS_SELECT_DATABASE();
+    size_t start = 0;
+    size_t end = INDEX_OF_LAST_TUTORIAL_SEGMENT + 1;
+    for (size_t i = start; i < end; i++){
+        const auto& segment = all_segments[i];
+        ret.add_entry(segment);
+    }
+    return ret;
+}
+
+const StringSelectDatabase& TUTORIAL_SEGMENTS_SELECT_DATABASE(){
+    static StringSelectDatabase database = make_tutorial_segments_database();
+    return database;
+}
+
+StringSelectDatabase make_mainstory_segments_database(){
+    StringSelectDatabase ret;
+    const StringSelectDatabase& all_segments = ALL_SEGMENTS_SELECT_DATABASE();
+    size_t start = INDEX_OF_LAST_TUTORIAL_SEGMENT + 1;
+    size_t end = all_segments.case_list().size();
+    for (size_t i = start; i < end; i++){
+        const auto& segment = all_segments[i];
+        ret.add_entry(segment);
+    }
+    return ret;
+}
+
+const StringSelectDatabase& MAINSTORY_SEGMENTS_SELECT_DATABASE(){
+    static StringSelectDatabase database = make_mainstory_segments_database();
+    return database;
+}
+
+std::vector<std::unique_ptr<AutoStory_Checkpoint>> make_autoStory_checkpoint_list(){
+    std::vector<std::unique_ptr<AutoStory_Checkpoint>> checkpoint_list;
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_00>());
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_01>());
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_02>());
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_03>());
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_04>());
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_05>());
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_06>());
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_07>());
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_08>());
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_09>());
+
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_10>());
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_11>());
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_12>());
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_13>());
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_14>());
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_15>());
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_16>());
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_17>());
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_18>());
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_19>());
+
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_20>());
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_21>());
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_22>());
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_23>());
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_24>());
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_25>());
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_26>());
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_27>());
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_28>());
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_29>());
+
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_30>());
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_31>());
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_32>());
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_33>());
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_34>());
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_35>());
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_36>());
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_37>());
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_38>());
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_39>());
+
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_40>());
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_41>());
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_42>());
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_43>());
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_44>());
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_45>());
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_46>());
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_47>());
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_48>());
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_49>());
+
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_50>());
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_51>());
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_52>());
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_53>());
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_54>());
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_55>());
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_56>());
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_57>());
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_58>());
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_59>());
+
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_60>());
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_61>());
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_62>());
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_63>());
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_64>());
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_65>());
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_66>());
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_67>());
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_68>());
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_69>());
+
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_70>());
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_71>());
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_72>());
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_73>());
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_74>());
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_75>());
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_76>());
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_77>());
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_78>());
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_79>());
+
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_80>());
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_81>());
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_82>());
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_83>());
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_84>());
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_85>());
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_86>());
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_87>());
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_88>());
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_89>());
+
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_90>());
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_91>());
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_92>());
+
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_93>());
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_94>());
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_95>());
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_96>());
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_97>());
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_98>());
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_99>());
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_100>());
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_101>());
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_102>());
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_103>());
+    checkpoint_list.emplace_back(std::make_unique<AutoStory_Checkpoint_104>());
+
+    return checkpoint_list;
+};
+
+const std::vector<std::unique_ptr<AutoStory_Checkpoint>>& ALL_AUTO_STORY_CHECKPOINT_LIST(){
+    static std::vector<std::unique_ptr<AutoStory_Checkpoint>> checkpoint_list = make_autoStory_checkpoint_list();
+    return checkpoint_list;
+}
+
+StringSelectDatabase make_all_checkpoints_database(){
+    StringSelectDatabase ret;
+    int index_num = 0;
+    for (const auto& segment : ALL_AUTO_STORY_CHECKPOINT_LIST()){
+        ret.add_entry(StringSelectEntry(std::to_string(index_num), segment->name()));
+        index_num++;
+    }
+    return ret;
+}
+const StringSelectDatabase& ALL_CHECKPOINTS_SELECT_DATABASE(){
+    static StringSelectDatabase database = make_all_checkpoints_database();
+    return database;
+}
+
+StringSelectDatabase make_tutorial_checkpoints_database(){
+    StringSelectDatabase ret;
+    const StringSelectDatabase& all_checkpoints = ALL_CHECKPOINTS_SELECT_DATABASE();
+    size_t start = 0;
+    size_t end = INDEX_OF_LAST_TUTORIAL_CHECKPOINT + 1;
+    for (size_t i = start; i < end; i++){
+        const auto& segment = all_checkpoints[i];
+        ret.add_entry(segment);
+    }
+    return ret;
+}
+
+const StringSelectDatabase& TUTORIAL_CHECKPOINTS_SELECT_DATABASE(){
+    static StringSelectDatabase database = make_tutorial_checkpoints_database();
+    return database;
+}
+
+StringSelectDatabase make_mainstory_checkpoints_database(){
+    StringSelectDatabase ret;
+    const StringSelectDatabase& all_checkpoints = ALL_CHECKPOINTS_SELECT_DATABASE();
+    size_t start = INDEX_OF_LAST_TUTORIAL_CHECKPOINT + 1;
+    size_t end = all_checkpoints.case_list().size();
+    for (size_t i = start; i < end; i++){
+        const auto& segment = all_checkpoints[i];
+        ret.add_entry(segment);
+    }
+    return ret;
+}
+
+const StringSelectDatabase& MAINSTORY_CHECKPOINTS_SELECT_DATABASE(){
+    static StringSelectDatabase database = make_mainstory_checkpoints_database();
+    return database;
+}
+
+AutoStory_Descriptor::AutoStory_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonSV:AutoStory",
+        STRING_POKEMON + " SV", "Auto Story",
+        "Programs/PokemonSV/AutoStory.html",
+        "Progress through the mainstory of SV.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_RequiresPrecision,
+        FeedbackType::VIDEO_AUDIO,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS,
+        {
+            "PokemonSV/AreaZero",
+        }
+    )
+{}
+
+std::unique_ptr<StatsTracker> AutoStory_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new AutoStoryStats());
+}
+
+
+
+AutoStory::~AutoStory(){
+    STORY_SECTION.remove_listener(*this);
+    STARTPOINT_TUTORIAL.remove_listener(*this);
+    ENDPOINT_TUTORIAL.remove_listener(*this);
+    STARTPOINT_MAINSTORY.remove_listener(*this);
+    ENDPOINT_MAINSTORY.remove_listener(*this);    
+    ENABLE_TEST_CHECKPOINTS.remove_listener(*this);
+    ENABLE_MISC_TEST.remove_listener(*this);
+    TEST_PBF_LEFT_JOYSTICK.remove_listener(*this);
+    TEST_PBF_JOYSTICK2.remove_listener(*this);
+    TEST_CURRENT_DIRECTION.remove_listener(*this);
+    TEST_CHANGE_DIRECTION.remove_listener(*this);    
+}
+
+AutoStory::AutoStory()
+    : LANGUAGE(
+        "<b>Game Language:</b>",
+        PokemonSwSh::IV_READER().languages(),
+        LockMode::UNLOCK_WHILE_RUNNING,
+        true
+    )
+    , STORY_SECTION(
+        "<b>Story Section:",
+        {
+            {StorySection::TUTORIAL,    "tutorial",           "Tutorial"},
+            {StorySection::MAIN_STORY,  "main-story",              "Main Story"},
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        StorySection::TUTORIAL
+    )    
+    , STARTPOINT_TUTORIAL(
+        "<b>Start Segment:</b>", //<br>Program will start with this segment.
+        TUTORIAL_SEGMENTS_SELECT_DATABASE(),
+        LockMode::LOCK_WHILE_RUNNING,
+        "0"
+    )
+    , ENDPOINT_TUTORIAL(
+        "<b>End Segment:</b>", //<br>Program will stop after completing this segment.
+        TUTORIAL_SEGMENTS_SELECT_DATABASE(),
+        LockMode::UNLOCK_WHILE_RUNNING,
+        std::to_string(INDEX_OF_LAST_TUTORIAL_SEGMENT)
+    )   
+    , STARTPOINT_MAINSTORY(
+        "<b>Start Segment:</b>", //<br>Program will start with this segment.
+        MAINSTORY_SEGMENTS_SELECT_DATABASE(),
+        LockMode::UNLOCK_WHILE_RUNNING,
+        std::to_string(INDEX_OF_LAST_TUTORIAL_SEGMENT+1)
+    )
+    , ENDPOINT_MAINSTORY(
+        "<b>End Segment:</b>", //<br>Program will stop after completing this segment.
+        MAINSTORY_SEGMENTS_SELECT_DATABASE(),
+        LockMode::UNLOCK_WHILE_RUNNING,
+        std::to_string(ALL_SEGMENTS_SELECT_DATABASE().case_list().size()-1)
+    )       
+    , START_CHECKPOINT_TUTORIAL(
+        "<b>Start Checkpoint:</b>", //<br>Program will start with this checkpoint.
+        TUTORIAL_CHECKPOINTS_SELECT_DATABASE(),
+        LockMode::LOCK_WHILE_RUNNING,
+        "0"
+    )
+    , END_CHECKPOINT_TUTORIAL(
+        "<b>End Checkpoint:</b>", //<br>Program will stop after completing this checkpoint.
+        TUTORIAL_CHECKPOINTS_SELECT_DATABASE(),
+        LockMode::UNLOCK_WHILE_RUNNING,
+        std::to_string(INDEX_OF_LAST_TUTORIAL_CHECKPOINT)
+    ) 
+    , START_CHECKPOINT_MAINSTORY(
+        "<b>Start Checkpoint:</b>", //<br>Program will start with this checkpoint.
+        MAINSTORY_CHECKPOINTS_SELECT_DATABASE(),
+        LockMode::LOCK_WHILE_RUNNING,
+        std::to_string(INDEX_OF_LAST_TUTORIAL_CHECKPOINT+1)
+    )
+    , END_CHECKPOINT_MAINSTORY(
+        "<b>End Checkpoint:</b>", //<br>Program will stop after completing this checkpoint.
+        MAINSTORY_CHECKPOINTS_SELECT_DATABASE(),
+        LockMode::UNLOCK_WHILE_RUNNING,
+        std::to_string(ALL_CHECKPOINTS_SELECT_DATABASE().case_list().size()-1)
+    ) 
+    , SETUP_NOTE{
+        "NOTE: Make sure you have selected the correct Start Point. "
+        "Make sure your player character is in the exact correct start position for that Start Point, "
+        "especially if your start point is NOT at the beginning of the Tutorial/Main Story. "
+        "Read the Start Point's description to help with finding the correct start position. "
+        "For Start Points that are at Pokecenters, ensure that you fly there so that your character is in the exactly correct start position."
+    }    
+    , MAINSTORY_NOTE{
+        "Ensure you have a level 100 Gardevoir with the moves in the following order: Moonblast, Mystical Fire, Psychic, Misty Terrain."
+        "Ensure PP is maxed out (Moonblast should have 24 PP). Ensure Modest nature with max Special Attack and Speed EVs, with max IVs. "
+        "After vitamins, mint and hypertraining, the stats should be as follows: HP 277, Attack [doesn't matter], Defense 167, Speed 259, Sp. Def 266, Sp. Atk 383.<br>"
+        "Also, make sure you have two other strong pokemon (e.g. level 100 Talonflames), ideally with a strong first move (e.g. Acrobatics for Talonflame).<br>"
+        "Refer to the documentation on github for more details."
+    }
+    , START_DESCRIPTION(
+        ""
+    )
+    , END_DESCRIPTION(
+        ""
+    ) 
+    , START_CHECKPOINT_DESCRIPTION(
+        ""
+    )
+    , END_CHECKPOINT_DESCRIPTION(
+        ""
+    )    
+    , STARTERCHOICE(
+        "<b>Starter " + STRING_POKEMON + ":",
+        {
+            {StarterChoice::SPRIGATITO,         "sprigatito",           "Sprigatito (Grass)"},
+            {StarterChoice::FUECOCO,            "fuecoco",              "Fuecoco (Fire)"},
+            {StarterChoice::QUAXLY,             "quaxly",               "Quaxly (Water)"},
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        StarterChoice::FUECOCO
+    )
+    , ENABLE_ADVANCED_MODE(
+        "<b>Advanced mode:</b><br>"
+        "Select the start/end checkpoints instead of segments. i.e. finer control over start/end points.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        false
+    ) 
+    , CHANGE_SETTINGS(
+        "<b>Pre-check: Update game settings:</b><br>"
+        "This is to ensure the game has the correct settings, particularly with Autosave turned off, and Camera Support off.<br>"
+        "WARNING: if you disable this, make sure you manually set the in-game settings as laid out in the wiki.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        true
+    )
+    , ENSURE_TIME_UNSYNCED(
+        "<b>Pre-check: Ensure time unsynced:</b><br>"
+        "This is to ensure the Switch has time unsynced from the internet, so it can be changed. This is run prior to the main story.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        true
+    )
+    , ENSURE_CORRECT_MOVES(
+        "<b>Pre-check: Ensure correct moves:</b><br>"
+        "This is to ensure the lead Gardevoir has the correct moves in the correct order: Moonblast, Mystical Fire, Psychic, Misty Terrain. This is run prior to the main story.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        true
+    )
+    , ENSURE_MINIMAP_UNLOCKED(
+        "<b>Pre-check: Ensure the minimap is unlocked:</b><br>"
+        "This is to ensure the minimap is unlocked. We use it to detect our direction.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        true
+    )
+    , GO_HOME_WHEN_DONE(true)
+    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(30))
+    , NOTIFICATIONS({
+        &NOTIFICATION_STATUS_UPDATE,
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_RECOVERABLE,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+    , m_advanced_options(
+        "<font size=4><b>Advanced Options: (developer only)</b></font>"
+    )
+    , m_advanced_options_end(
+        ""
+    )    
+    , ENABLE_TEST_CHECKPOINTS(
+        "<b>TEST: test_checkpoints():</b>",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        false
+    )   
+    , START_CHECKPOINT(
+        "--Start checkpoint:<br>Start testing with this checkpoint number.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        0
+    )    
+    , END_CHECKPOINT(
+        "--End checkpoint:<br>Stop testing when done this checkpoint number.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        11
+    )     
+    , LOOP_CHECKPOINT(
+        "--Loop checkpoints:<br>Loop the checkpoints from \"Start loop\" to \"End loop\", inclusive. Loop these checkpoints this number of times.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        1, 1
+    )
+    , START_LOOP(
+        "--Start loop:<br>Start looping with this checkpoint number.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        0
+    )    
+    , END_LOOP(
+        "--End loop:<br>Stop looping when done this checkpoint number.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        11
+    )      
+    , ENABLE_MISC_TEST(
+        "<b>TEST: Miscellaneous test code:</b>",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        false
+    )       
+    , FORWARD_TICKS(
+        "--FORWARD_TICKS:",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        0
+    )   
+    , TEST_PBF_LEFT_JOYSTICK(
+        "<b>TEST: pbf_move_left_joystick():</b>",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        false
+    )     
+    , X_MOVE(
+        "--X_MOVE:<br>x = -1 : left, x = 0 : neutral, x = +1 : right.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        0
+    )     
+    , Y_MOVE(
+        "--Y_MOVE:<br>y = -1 : down, y = 0 : neutral, y = +1 : up.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        0
+    )   
+    , HOLD(
+        "--HOLD (ms):",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        0
+    )    
+    , RELEASE(
+        "--RELEASE (ms):",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        0
+    )
+    , TEST_PBF_JOYSTICK2(
+        "<b>TEST2: pbf_move_joystick():</b>",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        false
+    )     
+    , X_MOVE2(
+        "--X_MOVE:<br>x = -1 : left, x = 0 : neutral, x = +1 : right.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        0
+    )     
+    , Y_MOVE2(
+        "--Y_MOVE:<br>y = -1 : down, y = 0 : neutral, y = +1 : up.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        0
+    )   
+    , HOLD2(
+        "--HOLD (ms):",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        0
+    )    
+    , RELEASE2(
+        "--RELEASE (ms):",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        0
+    )    
+    , TEST_CURRENT_DIRECTION(
+        "<b>TEST: get_current_direction():</b>",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        false
+    ) 
+    , TEST_CHANGE_DIRECTION(
+        "<b>TEST: change_direction():</b>",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        false
+    )         
+    , DIR_RADIANS(
+        "direction in radians",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        0
+    )   
+    , FLYPOINT_TYPE(
+        "<b>Flypoint type:</b><br>"
+        "For print_flypoint_location() and move_cursor_to_position_offset_from_flypoint()",
+        {
+            {FlyPoint::POKECENTER,         "pokecenter",           "Pokecenter"},
+            {FlyPoint::FAST_TRAVEL,            "fast-travel",              "Fast Travel"},
+        },
+        LockMode::UNLOCK_WHILE_RUNNING,
+        FlyPoint::POKECENTER
+    )   
+    , TEST_FLYPOINT_LOCATIONS(
+        "<b>TEST: print_flypoint_location():</b>",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        false
+    ) 
+    , TEST_MOVE_CURSOR_OFFSET_FROM_FLYPOINT(
+        "<b>TEST: move_cursor_to_position_offset_from_flypoint():</b>",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        false
+    )
+    , X_OFFSET(
+        "X offset from flypoint",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        0
+    )
+    , Y_OFFSET(
+        "Y offset from flypoint",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        0
+    )
+    , TEST_YOLO_BOX(
+        "<b>TEST: get_yolo_box():</b>",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        false
+    )
+    , YOLO_PATH(
+        false,
+        "<b>YOLO Path:</b>", 
+        LockMode::LOCK_WHILE_RUNNING, 
+        "PokemonSV/AreaZero/A0-station-2.onnx",
+        "<.onnx file>"
+    )
+    , TARGET_LABEL(
+        false,
+        "<b>YOLO Object Label:</b>", 
+        LockMode::LOCK_WHILE_RUNNING, 
+        "rock-1",
+        "<target label>"
+    )
+{
+
+    if (STATIC_GLOBALS.DEVELOPER_MODE){
+        PA_ADD_OPTION(m_advanced_options);
+
+        PA_ADD_OPTION(TEST_YOLO_BOX);
+        PA_ADD_OPTION(YOLO_PATH);
+        PA_ADD_OPTION(TARGET_LABEL);
+
+        PA_ADD_OPTION(FLYPOINT_TYPE);
+        PA_ADD_OPTION(TEST_FLYPOINT_LOCATIONS);
+        PA_ADD_OPTION(TEST_MOVE_CURSOR_OFFSET_FROM_FLYPOINT);
+        PA_ADD_OPTION(X_OFFSET);
+        PA_ADD_OPTION(Y_OFFSET);
+
+        PA_ADD_OPTION(TEST_CURRENT_DIRECTION);
+        PA_ADD_OPTION(TEST_CHANGE_DIRECTION);
+        PA_ADD_OPTION(DIR_RADIANS);    
+
+        PA_ADD_OPTION(TEST_PBF_LEFT_JOYSTICK);
+        PA_ADD_OPTION(X_MOVE);
+        PA_ADD_OPTION(Y_MOVE);
+        PA_ADD_OPTION(HOLD);
+        PA_ADD_OPTION(RELEASE);  
+
+        PA_ADD_OPTION(TEST_PBF_JOYSTICK2);
+        PA_ADD_OPTION(X_MOVE2);
+        PA_ADD_OPTION(Y_MOVE2);
+        PA_ADD_OPTION(HOLD2);
+        PA_ADD_OPTION(RELEASE2);              
+
+        PA_ADD_OPTION(ENABLE_TEST_CHECKPOINTS);
+        PA_ADD_OPTION(START_CHECKPOINT);
+        PA_ADD_OPTION(END_CHECKPOINT);
+        PA_ADD_OPTION(LOOP_CHECKPOINT);
+        PA_ADD_OPTION(START_LOOP);
+        PA_ADD_OPTION(END_LOOP);
+
+
+        PA_ADD_OPTION(ENABLE_MISC_TEST);
+        PA_ADD_OPTION(m_advanced_options_end);
+    }
+
+
+    PA_ADD_OPTION(LANGUAGE);
+    PA_ADD_OPTION(SETUP_NOTE);
+    PA_ADD_OPTION(STORY_SECTION);
+
+    PA_ADD_OPTION(STARTPOINT_TUTORIAL);
+    PA_ADD_OPTION(MAINSTORY_NOTE);
+    PA_ADD_OPTION(STARTPOINT_MAINSTORY);
+    PA_ADD_OPTION(START_DESCRIPTION);
+    PA_ADD_OPTION(ENDPOINT_TUTORIAL);
+    PA_ADD_OPTION(ENDPOINT_MAINSTORY);
+    PA_ADD_OPTION(END_DESCRIPTION);    
+
+    PA_ADD_OPTION(START_CHECKPOINT_TUTORIAL);
+    PA_ADD_OPTION(START_CHECKPOINT_MAINSTORY);
+    PA_ADD_OPTION(START_CHECKPOINT_DESCRIPTION);
+    PA_ADD_OPTION(END_CHECKPOINT_TUTORIAL);
+    PA_ADD_OPTION(END_CHECKPOINT_MAINSTORY);
+    PA_ADD_OPTION(END_CHECKPOINT_DESCRIPTION);
+
+    PA_ADD_OPTION(STARTERCHOICE);
+
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+
+    PA_ADD_OPTION(ENABLE_ADVANCED_MODE);
+    PA_ADD_OPTION(CHANGE_SETTINGS);
+    PA_ADD_OPTION(ENSURE_TIME_UNSYNCED);
+    PA_ADD_OPTION(ENSURE_CORRECT_MOVES);
+    PA_ADD_OPTION(ENSURE_MINIMAP_UNLOCKED);
+    
+    PA_ADD_OPTION(NOTIFICATIONS);
+
+
+    AutoStory::on_config_value_changed(this);
+
+    STORY_SECTION.add_listener(*this);
+    STARTPOINT_TUTORIAL.add_listener(*this);
+    ENDPOINT_TUTORIAL.add_listener(*this);
+    STARTPOINT_MAINSTORY.add_listener(*this);
+    ENDPOINT_MAINSTORY.add_listener(*this);    
+
+    START_CHECKPOINT_TUTORIAL.add_listener(*this);
+    END_CHECKPOINT_TUTORIAL.add_listener(*this);
+    START_CHECKPOINT_MAINSTORY.add_listener(*this);
+    END_CHECKPOINT_MAINSTORY.add_listener(*this);  
+
+    ENABLE_ADVANCED_MODE.add_listener(*this); 
+
+    ENABLE_TEST_CHECKPOINTS.add_listener(*this);
+    ENABLE_MISC_TEST.add_listener(*this);
+    TEST_PBF_LEFT_JOYSTICK.add_listener(*this);
+    TEST_PBF_JOYSTICK2.add_listener(*this);
+    TEST_CURRENT_DIRECTION.add_listener(*this);
+    TEST_CHANGE_DIRECTION.add_listener(*this);
+}
+
+void AutoStory::on_config_value_changed(void* object){
+    // ConfigOptionState state = (STARTPOINT_TUTORIAL.index() <= 1 && STORY_SECTION == StorySection::TUTORIAL)
+    //     ? ConfigOptionState::ENABLED
+    //     : ConfigOptionState::HIDDEN;
+    // STARTERCHOICE.set_visibility(state);
+
+    bool tutorial_segments = STORY_SECTION == StorySection::TUTORIAL && !ENABLE_ADVANCED_MODE;
+    bool tutorial_checkpoints = STORY_SECTION == StorySection::TUTORIAL && ENABLE_ADVANCED_MODE;
+    bool mainstory_segments = STORY_SECTION == StorySection::MAIN_STORY && !ENABLE_ADVANCED_MODE;
+    bool mainstory_checkpoints = STORY_SECTION == StorySection::MAIN_STORY && ENABLE_ADVANCED_MODE;
+
+    STARTPOINT_TUTORIAL.set_visibility(tutorial_segments ? ConfigOptionState::ENABLED : ConfigOptionState::HIDDEN);
+    ENDPOINT_TUTORIAL.set_visibility(tutorial_segments ? ConfigOptionState::ENABLED : ConfigOptionState::HIDDEN);
+    STARTPOINT_MAINSTORY.set_visibility(mainstory_segments ? ConfigOptionState::ENABLED : ConfigOptionState::HIDDEN);
+    ENDPOINT_MAINSTORY.set_visibility(mainstory_segments ? ConfigOptionState::ENABLED : ConfigOptionState::HIDDEN);
+
+    START_CHECKPOINT_TUTORIAL.set_visibility(tutorial_checkpoints ? ConfigOptionState::ENABLED : ConfigOptionState::HIDDEN);
+    END_CHECKPOINT_TUTORIAL.set_visibility(tutorial_checkpoints ? ConfigOptionState::ENABLED : ConfigOptionState::HIDDEN);
+    START_CHECKPOINT_MAINSTORY.set_visibility(mainstory_checkpoints ? ConfigOptionState::ENABLED : ConfigOptionState::HIDDEN);
+    END_CHECKPOINT_MAINSTORY.set_visibility(mainstory_checkpoints ? ConfigOptionState::ENABLED : ConfigOptionState::HIDDEN);
+
+    MAINSTORY_NOTE.set_visibility(STORY_SECTION == StorySection::TUTORIAL ? ConfigOptionState::HIDDEN : ConfigOptionState::ENABLED);
+    START_DESCRIPTION.set_text(start_segment_description());
+    END_DESCRIPTION.set_text(end_segment_description());
+    START_CHECKPOINT_DESCRIPTION.set_text(start_checkpoint_description());
+    END_CHECKPOINT_DESCRIPTION.set_text(end_checkpoint_description());
+
+    START_DESCRIPTION.set_visibility(!ENABLE_ADVANCED_MODE ? ConfigOptionState::ENABLED : ConfigOptionState::HIDDEN);
+    END_DESCRIPTION.set_visibility(!ENABLE_ADVANCED_MODE ? ConfigOptionState::ENABLED : ConfigOptionState::HIDDEN);
+    START_CHECKPOINT_DESCRIPTION.set_visibility(ENABLE_ADVANCED_MODE ? ConfigOptionState::ENABLED : ConfigOptionState::HIDDEN);
+    END_CHECKPOINT_DESCRIPTION.set_visibility(ENABLE_ADVANCED_MODE ? ConfigOptionState::ENABLED : ConfigOptionState::HIDDEN);
+    // CHANGE_SETTINGS.set_visibility(ENABLE_ADVANCED_MODE ? ConfigOptionState::ENABLED : ConfigOptionState::HIDDEN);
+
+    if (ENABLE_TEST_CHECKPOINTS){
+        START_CHECKPOINT.set_visibility(ConfigOptionState::ENABLED);
+        END_CHECKPOINT.set_visibility(ConfigOptionState::ENABLED);
+        LOOP_CHECKPOINT.set_visibility(ConfigOptionState::ENABLED);
+        START_LOOP.set_visibility(ConfigOptionState::ENABLED);
+        END_LOOP.set_visibility(ConfigOptionState::ENABLED);
+    }else{
+        START_CHECKPOINT.set_visibility(ConfigOptionState::DISABLED);
+        END_CHECKPOINT.set_visibility(ConfigOptionState::DISABLED);
+        LOOP_CHECKPOINT.set_visibility(ConfigOptionState::DISABLED);
+        START_LOOP.set_visibility(ConfigOptionState::DISABLED);
+        END_LOOP.set_visibility(ConfigOptionState::DISABLED);
+    }
+
+
+    if (ENABLE_MISC_TEST){
+        FORWARD_TICKS.set_visibility(ConfigOptionState::ENABLED);
+    }else{
+        FORWARD_TICKS.set_visibility(ConfigOptionState::DISABLED);
+    }
+
+    if (TEST_PBF_LEFT_JOYSTICK){
+        X_MOVE.set_visibility(ConfigOptionState::ENABLED);
+        Y_MOVE.set_visibility(ConfigOptionState::ENABLED);
+        HOLD.set_visibility(ConfigOptionState::ENABLED);
+        RELEASE.set_visibility(ConfigOptionState::ENABLED);
+    }else{
+        X_MOVE.set_visibility(ConfigOptionState::DISABLED);
+        Y_MOVE.set_visibility(ConfigOptionState::DISABLED);
+        HOLD.set_visibility(ConfigOptionState::DISABLED);
+        RELEASE.set_visibility(ConfigOptionState::DISABLED);      
+    }   
+
+    if (TEST_PBF_JOYSTICK2){
+        X_MOVE2.set_visibility(ConfigOptionState::ENABLED);
+        Y_MOVE2.set_visibility(ConfigOptionState::ENABLED);
+        HOLD2.set_visibility(ConfigOptionState::ENABLED);
+        RELEASE2.set_visibility(ConfigOptionState::ENABLED);
+    }else{
+        X_MOVE2.set_visibility(ConfigOptionState::DISABLED);
+        Y_MOVE2.set_visibility(ConfigOptionState::DISABLED);
+        HOLD2.set_visibility(ConfigOptionState::DISABLED);
+        RELEASE2.set_visibility(ConfigOptionState::DISABLED);      
+    }     
+
+
+    if (TEST_CHANGE_DIRECTION){
+        DIR_RADIANS.set_visibility(ConfigOptionState::ENABLED);
+    }else{
+        DIR_RADIANS.set_visibility(ConfigOptionState::DISABLED);  
+    }        
+
+
+}
+
+
+
+
+
+
+void AutoStory::test_checkpoints(
+    SingleSwitchProgramEnvironment& env,
+    VideoStream& stream,
+    ProControllerContext& context,
+    int start, int end, 
+    int loop, int start_loop, int end_loop
+){
+    AutoStoryStats& stats = env.current_stats<AutoStoryStats>();
+    // EventNotificationOption& notif_status_update = NOTIFICATION_STATUS_UPDATE;
+    // Language language = LANGUAGE;
+    // StarterChoice starter_choice = STARTERCHOICE;
+    AutoStoryOptions options{
+        LANGUAGE,
+        STARTERCHOICE,
+        NOTIFICATION_STATUS_UPDATE,
+        NOTIFICATION_ERROR_RECOVERABLE
+    };
+
+    // std::vector<std::function<void()>> checkpoint_list;
+    // checkpoint_list.push_back([&](){checkpoint_00(env, context);});
+    // checkpoint_list.push_back([&](){checkpoint_01(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text, language);});
+    // checkpoint_list.push_back([&](){checkpoint_02(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_03(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text, language, starter_choice);});
+    // checkpoint_list.push_back([&](){checkpoint_04(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_05(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_06(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_07(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_08(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_09(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_10(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_11(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_12(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_13(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_14(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_15(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_16(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_17(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_18(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_19(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_20(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_21(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_22(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_23(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_24(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_25(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_26(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_27(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_28(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_29(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_30(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_31(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_32(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_33(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_34(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_35(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_36(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_37(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_38(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_39(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_40(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_41(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_42(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_43(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_44(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_45(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_46(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_47(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_48(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_49(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_50(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_51(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_52(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_53(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_54(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_55(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_56(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_57(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_58(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_59(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_60(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_61(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_62(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_63(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_64(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_65(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_66(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_67(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_68(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_69(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_70(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_71(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_72(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_73(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_74(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_75(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_76(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_77(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_78(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_79(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_80(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_81(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_82(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_83(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_84(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_85(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_86(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_87(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text, language, starter_choice);});
+    // checkpoint_list.push_back([&](){checkpoint_88(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_89(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_90(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_91(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_92(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_93(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_94(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_95(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_96(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_97(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_98(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_99(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_100(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_101(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_102(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_103(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // checkpoint_list.push_back([&](){checkpoint_104(env, context, notif_status_update, notif_error_recoverable, stats);});
+    // // checkpoint_list.push_back([&](){checkpoint_105(env, context, notif_status_update, notif_error_recoverable, stats);});
+    
+    
+    if (end == 0){
+        end = start;
+    }
+    stream.log("test_checkpoints: start: " + std::to_string(start) + ", end:" + std::to_string(end));
+    for (int checkpoint = start; checkpoint <= end; checkpoint++){
+        if (checkpoint == 0){
+            stream.log("checkpoint_0");
+            ALL_AUTO_STORY_CHECKPOINT_LIST()[checkpoint]->run_checkpoint(env, context, options, stats);
+            // checkpoint_list[checkpoint]();
+            continue;
+        }
+        bool has_minimap = true;
+        if (checkpoint < 3){
+            has_minimap = false;
+        }
+        
+        const size_t DIGITS = 3;
+        std::string number = std::to_string(checkpoint);
+        if (number.size() < DIGITS){
+            number = std::string(DIGITS - number.size(), '0') + number;
+        }        
+        if (checkpoint >= start_loop && checkpoint <= end_loop){
+            for (int i = 0; i < loop; i++){
+                if (i > 0){
+                    try{
+                        reset_game(env.program_info(), env.console, context);
+                        enter_menu_from_overworld(env.program_info(), env.console, context, -1, MenuSide::NONE, has_minimap);
+                        // we wait 5 seconds then save, so that the initial conditions are slightly different on each reset.
+                        env.log("Wait 5 seconds.");
+                        context.wait_for(Milliseconds(5 * 1000));
+                    }catch (...){
+                        // try one more time
+                        reset_game(env.program_info(), env.console, context);
+                        enter_menu_from_overworld(env.program_info(), env.console, context, -1, MenuSide::NONE, has_minimap);
+                        // we wait 5 seconds then save, so that the initial conditions are slightly different on each reset.
+                        env.log("Wait 5 seconds.");
+                        context.wait_for(Milliseconds(5 * 1000));                        
+
+                    }
+                }
+                stream.log("checkpoint_" + number + ": loop " + std::to_string(i));
+                // checkpoint_list[checkpoint]();
+                ALL_AUTO_STORY_CHECKPOINT_LIST()[checkpoint]->run_checkpoint(env, context, options, stats);
+            } 
+        }else{
+            stream.log("checkpoint_" + number + ".");
+            ALL_AUTO_STORY_CHECKPOINT_LIST()[checkpoint]->run_checkpoint(env, context, options, stats);
+            // checkpoint_list[checkpoint]();            
+        }
+       
+    }
+    
+}
+
+std::string AutoStory::start_segment_description(){
+    size_t segment_index = 0;
+    if (STORY_SECTION == StorySection::TUTORIAL){
+        segment_index = STARTPOINT_TUTORIAL.index();
+    }else if (STORY_SECTION == StorySection::MAIN_STORY){
+        segment_index = STARTPOINT_MAINSTORY.index() + (INDEX_OF_LAST_TUTORIAL_SEGMENT + 1);
+    }
+    return "    " + ALL_AUTO_STORY_SEGMENT_LIST()[segment_index]->start_text();
+}
+
+std::string AutoStory::end_segment_description(){
+    size_t segment_index = 0;
+    if (STORY_SECTION == StorySection::TUTORIAL){
+        segment_index = ENDPOINT_TUTORIAL.index();
+    }else if (STORY_SECTION == StorySection::MAIN_STORY){
+        segment_index = ENDPOINT_MAINSTORY.index() + (INDEX_OF_LAST_TUTORIAL_SEGMENT + 1);
+    }    
+    return "    " + ALL_AUTO_STORY_SEGMENT_LIST()[segment_index]->end_text();
+}
+
+size_t AutoStory::get_start_segment_index(){
+    size_t start = 0;
+
+    if (STORY_SECTION == StorySection::TUTORIAL){
+        start = STARTPOINT_TUTORIAL.index();
+    }else if (STORY_SECTION == StorySection::MAIN_STORY){
+        start = (INDEX_OF_LAST_TUTORIAL_SEGMENT + 1) + STARTPOINT_MAINSTORY.index();
+    }
+    
+    return start;
+}
+
+size_t AutoStory::get_end_segment_index(){
+    size_t end = 0;
+
+    if (STORY_SECTION == StorySection::TUTORIAL){
+        end = ENDPOINT_TUTORIAL.index();
+    }else if (STORY_SECTION == StorySection::MAIN_STORY){
+        end = (INDEX_OF_LAST_TUTORIAL_SEGMENT + 1) + ENDPOINT_MAINSTORY.index();     
+    }
+    
+    return end;
+}
+
+std::string AutoStory::start_checkpoint_description(){
+    size_t checkpoint_index = 0;
+    if (STORY_SECTION == StorySection::TUTORIAL){
+        checkpoint_index = START_CHECKPOINT_TUTORIAL.index();
+    }else if (STORY_SECTION == StorySection::MAIN_STORY){
+        checkpoint_index = START_CHECKPOINT_MAINSTORY.index() + (INDEX_OF_LAST_TUTORIAL_CHECKPOINT + 1);
+    }
+    return "    Start: " + ALL_AUTO_STORY_CHECKPOINT_LIST()[checkpoint_index]->start_text();
+}
+
+std::string AutoStory::end_checkpoint_description(){
+    size_t checkpoint_index = 0;
+    if (STORY_SECTION == StorySection::TUTORIAL){
+        checkpoint_index = END_CHECKPOINT_TUTORIAL.index();
+    }else if (STORY_SECTION == StorySection::MAIN_STORY){
+        checkpoint_index = END_CHECKPOINT_MAINSTORY.index() + (INDEX_OF_LAST_TUTORIAL_CHECKPOINT + 1);
+    }    
+    return "    End: " + ALL_AUTO_STORY_CHECKPOINT_LIST()[checkpoint_index]->end_text();
+}
+
+size_t AutoStory::get_start_checkpoint_index(){
+    size_t start = 0;
+
+    if (STORY_SECTION == StorySection::TUTORIAL){
+        start = START_CHECKPOINT_TUTORIAL.index();
+    }else if (STORY_SECTION == StorySection::MAIN_STORY){
+        start = (INDEX_OF_LAST_TUTORIAL_CHECKPOINT + 1) + START_CHECKPOINT_MAINSTORY.index();
+    }
+    
+    return start;
+}
+
+size_t AutoStory::get_end_checkpoint_index(){
+    size_t end = 0;
+
+    if (STORY_SECTION == StorySection::TUTORIAL){
+        end = END_CHECKPOINT_TUTORIAL.index();
+    }else if (STORY_SECTION == StorySection::MAIN_STORY){
+        end = (INDEX_OF_LAST_TUTORIAL_CHECKPOINT + 1) + END_CHECKPOINT_MAINSTORY.index();     
+    }
+    
+    return end;
+}
+
+
+void AutoStory::run_autostory(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    AutoStoryOptions options{
+        LANGUAGE,
+        STARTERCHOICE,
+        NOTIFICATION_STATUS_UPDATE,
+        NOTIFICATION_ERROR_RECOVERABLE
+    };    
+
+    AutoStoryStats& stats = env.current_stats<AutoStoryStats>();
+    context.wait_for_all_requests();
+
+    if (ENABLE_ADVANCED_MODE){
+        for (size_t checkpoint_index = get_start_checkpoint_index(); checkpoint_index <= get_end_checkpoint_index(); checkpoint_index++){
+            // env.console.log("Start Checkpoint " + ALL_AUTO_STORY_CHECKPOINT_LIST()[checkpoint_index]->name(), COLOR_ORANGE);
+            ALL_AUTO_STORY_CHECKPOINT_LIST()[checkpoint_index]->run_checkpoint(env, context, options, stats);
+        }
+
+    }else{
+        for (size_t segment_index = get_start_segment_index(); segment_index <= get_end_segment_index(); segment_index++){
+            ALL_AUTO_STORY_SEGMENT_LIST()[segment_index]->run_segment(env, context, options, stats);
+        }
+
+    }
+}
+
+void AutoStory::test_code(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+
+
+    if (TEST_YOLO_BOX){
+        VideoOverlaySet overlays(env.console.overlay());
+        YOLOv5Detector yolo_detector(RESOURCE_PATH() + std::string(YOLO_PATH));
+        
+        // ImageFloatBox target_box =
+        get_highest_confident_yolo_box(env, context, overlays, yolo_detector, TARGET_LABEL);
+
+        context.wait_for(Milliseconds(1000));
+        return;
+    }
+
+
+    if (TEST_FLYPOINT_LOCATIONS){
+        print_flypoint_location(env.program_info(), env.console, context, FLYPOINT_TYPE);
+        // print_flypoint_location(env.program_info(), env.console, context, FlyPoint::FAST_TRAVEL);
+        return;
+    }
+
+    if (TEST_MOVE_CURSOR_OFFSET_FROM_FLYPOINT){
+        move_cursor_to_position_offset_from_flypoint(env.program_info(), env.console, context, FLYPOINT_TYPE, {X_OFFSET, Y_OFFSET});
+
+        return;
+    }
+
+    if (TEST_CURRENT_DIRECTION){
+        DirectionDetector direction;
+        // direction.change_direction(env.program_info(), env.console, context, DIR_RADIANS);
+        VideoSnapshot snapshot = env.console.video().snapshot();
+        env.console.log("current direction: " + std::to_string(direction.get_current_direction(env.console, snapshot)));
+        return;
+    }
+
+    if (TEST_CHANGE_DIRECTION){
+        DirectionDetector direction;
+        direction.change_direction(env.program_info(), env.console, context, DIR_RADIANS);
+        // VideoSnapshot snapshot = env.console.video().snapshot();
+        // env.console.log("current direction: " + std::to_string(direction.get_current_direction(env.console, snapshot)));
+        return;
+    }    
+
+    if (TEST_PBF_LEFT_JOYSTICK){
+        pbf_move_left_joystick(context, {X_MOVE, Y_MOVE}, Milliseconds(HOLD), Milliseconds(RELEASE));
+        return;
+    } 
+
+    if (TEST_PBF_JOYSTICK2){
+        pbf_move_left_joystick(context, {X_MOVE2, Y_MOVE2}, Milliseconds(HOLD2), Milliseconds(RELEASE2));
+        return;
+    }            
+
+    if (ENABLE_TEST_CHECKPOINTS){
+        // test individual checkpoints
+        test_checkpoints(env, env.console, context, START_CHECKPOINT, END_CHECKPOINT, LOOP_CHECKPOINT, START_LOOP, END_LOOP);
+        GO_HOME_WHEN_DONE.run_end_of_program(context);
+        return;
+    }
+
+
+    if (ENABLE_MISC_TEST){
+        // walk_forward_while_clear_front_path(env.program_info(), env.console, context, FORWARD_TICKS);
+
+        // overworld_navigation(env.program_info(), env.console, context, 
+        //     NavigationStopCondition::STOP_MARKER, NavigationMovementMode::CLEAR_WITH_LETS_GO, 
+        //     128, 0, 60, 10, false);
+
+        DirectionDetector direction;
+
+        
+
+
+        // YOLOv5Detector yolo_detector(DOWNLOADED_RESOURCE_PATH() + "PokemonSV/AreaZero/A0-station-2.onnx");
+        // move_camera_yolo(env, context, CameraAxis::Y, yolo_detector, "tree-tera", 0.294444);
+        // move_camera_yolo(env, context, CameraAxis::X, yolo_detector, "tree-tera", 0.604688);
+        direction.change_direction(env.program_info(), env.console, context, 3.855289);
+        pbf_move_left_joystick(context, {0, +1}, 1600ms, 400ms);
+
+        direction.change_direction(env.program_info(), env.console, context, 3.056395);
+        pbf_move_left_joystick(context, {0, +1}, 2000ms, 400ms);
+
+        direction.change_direction(env.program_info(), env.console, context, 3.749788);
+        pbf_move_left_joystick(context, {0, +1}, 5440ms, 400ms);
+
+        direction.change_direction(env.program_info(), env.console, context, 1.589021);
+        pbf_move_left_joystick(context, {0, +1}, 9600ms, 400ms);
+        
+
+        return;
+    }
+
+    // context.wait_for(Milliseconds(1000000));
+
+
+}
+
+void AutoStory::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    StartProgramChecks::check_performance_class_wired_or_wireless(context);
+    assert_16_9_720p_min(env.logger(), env.console);
+
+
+    // test code
+    if (TEST_FLYPOINT_LOCATIONS || TEST_MOVE_CURSOR_OFFSET_FROM_FLYPOINT || ENABLE_TEST_CHECKPOINTS || ENABLE_MISC_TEST || TEST_PBF_LEFT_JOYSTICK || TEST_PBF_JOYSTICK2 || TEST_CHANGE_DIRECTION || TEST_CURRENT_DIRECTION){
+        test_code(env, context);
+        return;
+    }
+
+    if (ENABLE_ADVANCED_MODE){
+        if (get_start_checkpoint_index() > get_end_checkpoint_index()){
+            throw UserSetupError(env.logger(), "The start checkpoint cannot be later than the end segment.");
+        }
+
+    }else{
+        if (get_start_segment_index() > get_end_segment_index()){
+            throw UserSetupError(env.logger(), "The start segment cannot be later than the end segment.");
+        }
+    }
+
+    //  Connect the controller.
+    require_player(env.console, context, BUTTON_L);
+
+    if (ENABLE_ADVANCED_MODE){
+        env.console.log("Start Checkpoint " + ALL_AUTO_STORY_CHECKPOINT_LIST()[get_start_checkpoint_index()]->name(), COLOR_ORANGE);        
+    }else{
+        env.console.log("Start Segment " + ALL_AUTO_STORY_SEGMENT_LIST()[get_start_segment_index()]->name(), COLOR_ORANGE);
+    }
+
+    // Set settings. to ensure autosave is off.
+    if (CHANGE_SETTINGS){
+        if (ENABLE_ADVANCED_MODE){
+            change_settings_prior_to_autostory_checkpoint_mode(env, context, get_start_checkpoint_index(), LANGUAGE);
+        }else{
+            change_settings_prior_to_autostory_segment_mode(env, context, get_start_segment_index(), LANGUAGE);
+        }
+    }
+
+    if (ENSURE_TIME_UNSYNCED && STORY_SECTION == StorySection::MAIN_STORY){
+        env.console.log("Ensure time is not synchronized to the internet.");
+        pbf_press_button(context, BUTTON_HOME, 160ms, GameSettings::instance().GAME_TO_HOME_DELAY1);
+        ensure_time_unsynced(env, context);
+        go_home(env.console, context);
+        resume_game_from_home(env.console, context, true);
+    }
+
+    if (ENSURE_CORRECT_MOVES && STORY_SECTION == StorySection::MAIN_STORY){
+        env.console.log("Ensure lead Gardevoir has the correct moves.");
+        confirm_lead_pokemon_moves(env, context, LANGUAGE);
+    }
+
+    if (ENSURE_MINIMAP_UNLOCKED && STORY_SECTION == StorySection::MAIN_STORY){
+        env.console.log("Ensure the N symbol on minimap is visible.");
+        context.wait_for_all_requests();
+        
+        DirectionDetector direction;
+        double current = direction.get_current_direction(env.console, env.console.video().snapshot());
+        if (current < 0){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "change_direction(): Unable to detect current direction. Something (e.g. a marker) is covering the N symbol on the minimap. "
+                "Try moving the marker on the map.",
+                env.console
+            );
+        }
+
+        if (is_main_story_start_point_indoors()){
+            env.console.log("Can't confirm if minimap unlocked while indoors.");
+        }else{
+            env.console.log("Ensure the minimap is unlocked.");
+            confirm_minimap_unlocked(env, context);
+        }
+
+    }
+
+    run_autostory(env, context);
+    
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+    GO_HOME_WHEN_DONE.run_end_of_program(context);
+}
+
+bool AutoStory::is_main_story_start_point_indoors(){
+
+    bool start_indoors = false;
+    if (ENABLE_ADVANCED_MODE){  // checkpoint mode
+        size_t checkpoint_index = get_start_checkpoint_index();
+
+        start_indoors = 
+            checkpoint_index == 44 ||
+            checkpoint_index == 46 ||
+            checkpoint_index == 52 ||
+            checkpoint_index == 62 ||
+            checkpoint_index == 63 ||
+            checkpoint_index == 72 ||
+            checkpoint_index == 74 ||
+            checkpoint_index == 76 ||
+            checkpoint_index == 77 ||
+            checkpoint_index == 88 ||
+            checkpoint_index == 89 ||
+            checkpoint_index == 91 ||
+            checkpoint_index >= 94;  // all of area zero is considered indoors
+    }else{  // segment mode
+        size_t segment_index = get_start_segment_index();
+
+        start_indoors = segment_index >= 35; // all of area zero is considered indoors
+        // all previous main story segments start outdoors
+    }
+
+    return start_indoors;
+
+}
+
+
+
+
+}
+}
+}
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory.h
new file mode 100644
index 0000000000..d62d9b2ad2
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory.h
@@ -0,0 +1,167 @@
+/*  Autostory
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_AutoStory_H
+#define PokemonAutomation_PokemonSV_AutoStory_H
+
+#include "Common/Cpp/Options/StaticTextOption.h"
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "Common/Cpp/Options/FloatingPointOption.h"
+#include "Common/Cpp/Options/EnumDropdownOption.h"
+#include "Common/Cpp/Options/StringOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "CommonTools/Options/StringSelectOption.h"
+#include "CommonTools/Options/LanguageOCROption.h"
+#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+#include "PokemonSV_AutoStoryTools.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+class AutoStory_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    AutoStory_Descriptor();
+
+    struct Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+class AutoStory : public SingleSwitchProgramInstance, public ConfigOption::Listener{
+public:
+    using Descriptor = AutoStory_Descriptor;
+    ~AutoStory();
+    AutoStory();
+
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+    void test_code(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+
+    // test the checkpoints from start to end, inclusive
+    // test each checkpoints "loop" number of times
+    void test_checkpoints(
+        SingleSwitchProgramEnvironment& env,
+        VideoStream& stream,
+        ProControllerContext& context,
+        int start, int end, 
+        int loop, int start_loop, int end_loop
+    );
+
+    size_t get_start_segment_index();
+    size_t get_end_segment_index();
+    size_t get_start_checkpoint_index();
+    size_t get_end_checkpoint_index();
+
+    void run_autostory(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+
+    bool is_main_story_start_point_indoors();
+
+private:
+    virtual void on_config_value_changed(void* object) override;
+
+    std::string start_segment_description();
+    std::string end_segment_description();
+    std::string start_checkpoint_description();
+    std::string end_checkpoint_description();
+
+private:
+    OCR::LanguageOCROption LANGUAGE;
+    
+    enum class StorySection{
+        TUTORIAL,
+        MAIN_STORY,
+    };
+
+    EnumDropdownOption<StorySection> STORY_SECTION;
+
+    StringSelectOption STARTPOINT_TUTORIAL;
+    StringSelectOption ENDPOINT_TUTORIAL;
+
+    StringSelectOption STARTPOINT_MAINSTORY;
+    StringSelectOption ENDPOINT_MAINSTORY;
+
+    StringSelectOption START_CHECKPOINT_TUTORIAL;
+    StringSelectOption END_CHECKPOINT_TUTORIAL;
+
+    StringSelectOption START_CHECKPOINT_MAINSTORY;
+    StringSelectOption END_CHECKPOINT_MAINSTORY;
+
+    StaticTextOption SETUP_NOTE;
+    StaticTextOption MAINSTORY_NOTE;
+
+    StaticTextOption START_DESCRIPTION;
+    StaticTextOption END_DESCRIPTION;
+
+    StaticTextOption START_CHECKPOINT_DESCRIPTION;
+    StaticTextOption END_CHECKPOINT_DESCRIPTION;
+
+
+    EnumDropdownOption<StarterChoice> STARTERCHOICE;
+
+    BooleanCheckBoxOption ENABLE_ADVANCED_MODE;
+    BooleanCheckBoxOption CHANGE_SETTINGS;    
+    BooleanCheckBoxOption ENSURE_TIME_UNSYNCED;
+    BooleanCheckBoxOption ENSURE_CORRECT_MOVES;
+    BooleanCheckBoxOption ENSURE_MINIMAP_UNLOCKED;
+
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
+
+    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
+    EventNotificationsOption NOTIFICATIONS;
+    
+    SectionDividerOption m_advanced_options;
+    SectionDividerOption m_advanced_options_end;
+
+    BooleanCheckBoxOption ENABLE_TEST_CHECKPOINTS;    
+    SimpleIntegerOption<uint16_t> START_CHECKPOINT;
+    SimpleIntegerOption<uint16_t> END_CHECKPOINT;
+    SimpleIntegerOption<uint16_t> LOOP_CHECKPOINT;
+    SimpleIntegerOption<uint16_t> START_LOOP;
+    SimpleIntegerOption<uint16_t> END_LOOP;
+
+
+    BooleanCheckBoxOption ENABLE_MISC_TEST;    
+    SimpleIntegerOption<uint16_t> FORWARD_TICKS;
+
+    BooleanCheckBoxOption TEST_PBF_LEFT_JOYSTICK;
+    FloatingPointOption X_MOVE;
+    FloatingPointOption Y_MOVE;
+    SimpleIntegerOption<uint64_t> HOLD;
+    SimpleIntegerOption<uint64_t> RELEASE;
+
+    BooleanCheckBoxOption TEST_PBF_JOYSTICK2;
+    FloatingPointOption X_MOVE2;
+    FloatingPointOption Y_MOVE2;
+    SimpleIntegerOption<uint64_t> HOLD2;
+    SimpleIntegerOption<uint64_t> RELEASE2;    
+
+    BooleanCheckBoxOption TEST_CURRENT_DIRECTION;
+    BooleanCheckBoxOption TEST_CHANGE_DIRECTION;
+    FloatingPointOption DIR_RADIANS;
+
+    EnumDropdownOption<FlyPoint> FLYPOINT_TYPE;
+    BooleanCheckBoxOption TEST_FLYPOINT_LOCATIONS;
+    BooleanCheckBoxOption TEST_MOVE_CURSOR_OFFSET_FROM_FLYPOINT;
+    FloatingPointOption X_OFFSET;
+    FloatingPointOption Y_OFFSET;
+
+    BooleanCheckBoxOption TEST_YOLO_BOX;
+    StringOption YOLO_PATH;
+    StringOption TARGET_LABEL;
+    
+
+};
+
+const std::vector<std::unique_ptr<AutoStory_Segment>>& ALL_AUTO_STORY_SEGMENT_LIST();
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStoryTools.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStoryTools.cpp
new file mode 100644
index 0000000000..c2d61152df
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStoryTools.cpp
@@ -0,0 +1,1981 @@
+/*  AutoStoryTools
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/PrettyPrint.h" 
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/Exceptions/UnexpectedBattleException.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonTools/Images/SolidColorTest.h"
+#include "CommonTools/OCR/OCR_NumberReader.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "VideoGames/PokemonSV/Inference/Battles/PokemonSV_NormalBattleMenus.h"
+#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h"
+#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h"
+#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_StationaryOverworldWatcher.h"
+#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_NoMinimapDetector.h"
+#include "VideoGames/PokemonSV/Inference/PokemonSV_MainMenuDetector.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h"
+#include "VideoGames/PokemonSV/Programs/Battles/PokemonSV_Battles.h"
+#include "VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_MenuOption.h"
+#include "VideoGames/PokemonSV/Inference/PokemonSV_TutorialDetector.h"
+#include "VideoGames/PokemonSV/Inference/PokemonSV_PokemonMovesReader.h"
+#include "VideoGames/PokemonSV/Inference/Map/PokemonSV_DestinationMarkerDetector.h"
+#include "VideoGames/PokemonSV/Inference/Map/PokemonSV_MapPokeCenterIconDetector.h"
+#include "PokemonSV_AutoStoryTools.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+
+
+
+void clear_tutorial(VideoStream& stream, ProControllerContext& context, uint16_t seconds_timeout){
+    bool seen_tutorial = false;
+    while (true){
+        TutorialWatcher tutorial;
+        context.wait_for_all_requests();
+
+        int ret = wait_until(
+            stream, context,
+            std::chrono::seconds(seconds_timeout),
+            {tutorial}
+        );
+        context.wait_for(std::chrono::milliseconds(100));
+
+        switch (ret){
+        case 0:
+            stream.log("clear_tutorial: Detected tutorial screen.");
+            seen_tutorial = true;
+            pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+            break;
+        default:
+            stream.log("clear_tutorial: Timed out.");
+            if(!seen_tutorial){
+                OperationFailedExceptionWithScreenshot::fire(
+                    ErrorReportMode::SEND_ERROR_REPORT,
+                    "clear_tutorial(): Tutorial screen never detected.",
+                    stream
+                );                
+            }
+            return;
+        }
+    }
+}
+
+void clear_dialog(VideoStream& stream, ProControllerContext& context,
+    ClearDialogMode mode, uint16_t seconds_timeout,
+    std::vector<CallbackEnum> enum_optional_callbacks,
+    bool press_A
+){
+    bool seen_dialog = false;
+    WallClock start = current_time();
+    while (true){
+        if (current_time() - start > std::chrono::minutes(5)){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "clear_dialog(): Failed to clear dialog after 5 minutes.",
+                stream
+            );
+        }
+
+        AdvanceDialogWatcher    advance_dialog(COLOR_RED);
+        OverworldWatcher    overworld(stream.logger(), COLOR_CYAN);
+        PromptDialogWatcher prompt(COLOR_YELLOW, {0.50, 0.25, 0.40, 0.65});
+        WhiteButtonWatcher  whitebutton(COLOR_GREEN, WhiteButton::ButtonA_DarkBackground, {0.725, 0.833, 0.024, 0.045}); // {0.650, 0.650, 0.140, 0.240}
+        DialogArrowWatcher dialog_arrow(COLOR_RED, stream.overlay(), {0.850, 0.820, 0.020, 0.050}, 0.8365, 0.846);
+        NormalBattleMenuWatcher battle(COLOR_ORANGE);
+        TutorialWatcher     tutorial(COLOR_BLUE);
+        DialogBoxWatcher black_dialog_box(COLOR_BLACK, true, std::chrono::milliseconds(250), DialogType::DIALOG_BLACK);
+        context.wait_for_all_requests();
+
+        std::vector<PeriodicInferenceCallback> callbacks; 
+        std::vector<CallbackEnum> enum_all_callbacks{CallbackEnum::ADVANCE_DIALOG}; // mandatory callbacks
+        enum_all_callbacks.insert(enum_all_callbacks.end(), enum_optional_callbacks.begin(), enum_optional_callbacks.end()); // append the mandatory and optional callback vectors together
+        for (const CallbackEnum& enum_callback : enum_all_callbacks){
+            switch(enum_callback){
+            case CallbackEnum::ADVANCE_DIALOG:
+                callbacks.emplace_back(advance_dialog);
+                break;                
+            case CallbackEnum::OVERWORLD:
+                callbacks.emplace_back(overworld);
+                break;
+            case CallbackEnum::PROMPT_DIALOG:
+                callbacks.emplace_back(prompt);
+                break;
+            case CallbackEnum::WHITE_A_BUTTON:
+                callbacks.emplace_back(whitebutton);
+                break;
+            case CallbackEnum::DIALOG_ARROW:
+                callbacks.emplace_back(dialog_arrow);
+                break;
+            case CallbackEnum::BATTLE:
+                callbacks.emplace_back(battle);
+                break;
+            case CallbackEnum::TUTORIAL:
+                callbacks.emplace_back(tutorial);
+                break;          
+            case CallbackEnum::BLACK_DIALOG_BOX:
+                callbacks.emplace_back(black_dialog_box);
+                break;              
+            default:
+                throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "clear_dialog: Unknown callback requested.");                
+            }
+        }
+
+
+        // int ret = wait_until(
+        //     stream, context,
+        //     std::chrono::seconds(seconds_timeout),
+        //     callbacks
+        // );
+
+        WallClock start_inference = current_time();
+        int ret = run_until<ProControllerContext>(
+            stream, context,
+            [&](ProControllerContext& context){
+
+                if (mode == ClearDialogMode::STOP_TIMEOUT || !press_A){
+                    context.wait_for(Seconds(seconds_timeout));
+                }else{ // press A every 25 seconds, until we time out.
+                    auto button_press_period = Seconds(25);
+                    while (true){
+                        if (current_time() - start_inference > Seconds(seconds_timeout)){
+                            break;
+                        }
+                        context.wait_for(button_press_period);
+                        pbf_press_button(context, BUTTON_A, 160ms, 0ms);
+                    }
+                }
+            },
+            callbacks
+        );
+        context.wait_for(std::chrono::milliseconds(100));
+        if (ret < 0){
+            stream.log("clear_dialog(): Timed out.");
+            if (seen_dialog && mode == ClearDialogMode::STOP_TIMEOUT){
+                return;
+            }
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "clear_dialog(): Timed out. Did not detect dialog or did not detect the expected stop condition.",
+                stream
+            );
+        }
+
+        CallbackEnum enum_callback = enum_all_callbacks[ret];
+        switch(enum_callback){
+        case CallbackEnum::ADVANCE_DIALOG:
+            stream.log("clear_dialog: Detected advance dialog.");
+            seen_dialog = true;
+            pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+            break;            
+        case CallbackEnum::OVERWORLD:
+            stream.log("clear_dialog: Detected overworld.");
+            if (seen_dialog && mode == ClearDialogMode::STOP_OVERWORLD){
+                return;
+            }
+            break;
+        case CallbackEnum::PROMPT_DIALOG:
+            stream.log("clear_dialog: Detected prompt.");
+            seen_dialog = true;
+            if (mode == ClearDialogMode::STOP_PROMPT){
+                return;
+            }
+            pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+            break;
+        case CallbackEnum::WHITE_A_BUTTON:
+            stream.log("clear_dialog: Detected white A button.");
+            seen_dialog = true;
+            if (mode == ClearDialogMode::STOP_WHITEBUTTON){
+                return;
+            }
+            pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+            break;
+        case CallbackEnum::DIALOG_ARROW:
+            stream.log("clear_dialog: Detected dialog arrow.");
+            seen_dialog = true;
+            if (mode == ClearDialogMode::STOP_BATTLE_DIALOG_ARROW){
+                return;
+            }
+            pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+            break;
+        case CallbackEnum::BATTLE:
+            stream.log("clear_dialog: Detected battle.");
+            if (mode == ClearDialogMode::STOP_BATTLE){
+                return;
+            }
+            break;
+        case CallbackEnum::TUTORIAL:    
+            stream.log("clear_dialog: Detected tutorial.");
+            if (mode == ClearDialogMode::STOP_TUTORIAL){
+                return;
+            }
+            pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+            break;
+        case CallbackEnum::BLACK_DIALOG_BOX:    
+            stream.log("clear_dialog: Detected black dialog box.");
+            seen_dialog = true;
+            pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+            break;            
+        default:
+            throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "clear_dialog: Unknown callback triggered.");
+
+        }        
+
+    }
+}
+
+bool confirm_marker_present(
+    const ProgramInfo& info, 
+    VideoStream& stream,
+    ProControllerContext& context
+){
+    while (true){
+        DestinationMarkerWatcher marker(COLOR_RED, {0.815, 0.645, 0.180, 0.320}, true);
+        NormalBattleMenuWatcher battle(COLOR_BLUE);
+
+        int ret = wait_until(
+            stream, context,
+            std::chrono::seconds(5),
+            {marker, battle}
+        );
+        switch (ret){
+        case 0: // marker
+            stream.log("Confirmed that marker is still present.");
+            return true;
+        case 1: // battle
+            throw_and_log<UnexpectedBattleException>(
+                stream.logger(), ErrorReportMode::SEND_ERROR_REPORT,
+                "confirm_marker_present(): Unexpectedly detected battle.",
+                stream
+            );
+        default:
+            stream.log("Destination marker not detected.");
+            return false;
+        }   
+    }
+
+}
+
+void realign_player(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context,
+    PlayerRealignMode realign_mode,
+    double move_x, double move_y, Milliseconds move_duration
+){
+    stream.log("Realigning player direction...");
+    switch (realign_mode){
+    case PlayerRealignMode::REALIGN_NEW_MARKER:
+        stream.log("Setting new map marker...");
+
+        handle_unexpected_battles(info, stream, context,
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            open_map_from_overworld(info, stream, context);
+        });
+
+        pbf_press_button(context, BUTTON_ZR, 160ms, 840ms);
+        pbf_move_left_joystick(context, {move_x, move_y}, move_duration, 1000ms);
+        pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+        pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+
+        handle_unexpected_battles(info, stream, context,
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){        
+            leave_phone_to_overworld(info, stream, context);
+        });
+        return;     
+    case PlayerRealignMode::REALIGN_OLD_MARKER:
+        handle_unexpected_battles(info, stream, context,
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            open_map_from_overworld(info, stream, context, false);
+        });
+
+        handle_unexpected_battles(info, stream, context,
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){        
+            leave_phone_to_overworld(info, stream, context);
+        });
+
+        pbf_press_button(context, BUTTON_L, 160ms, 840ms);
+        return;
+    case PlayerRealignMode::REALIGN_NO_MARKER:
+        pbf_move_left_joystick(context, {move_x, move_y}, move_duration, 1000ms);
+        pbf_press_button(context, BUTTON_L, 160ms, 840ms);
+        return;
+    }  
+
+}
+
+
+void overworld_navigation(
+    const ProgramInfo& info, 
+    VideoStream& stream,
+    ProControllerContext& context,
+    NavigationStopCondition stop_condition,
+    NavigationMovementMode movement_mode,
+    double x, double y,
+    uint16_t seconds_timeout, uint16_t seconds_realign, 
+    bool auto_heal,
+    bool detect_wipeout
+){
+    bool should_realign = true;
+    if (seconds_timeout <= seconds_realign){
+        seconds_realign = seconds_timeout;
+        should_realign = false;
+    }
+    Milliseconds forward_duration = seconds_realign * 1000ms;
+    // WallClock start = current_time();
+
+    if (stop_condition == NavigationStopCondition::STOP_MARKER){
+        context.wait_for(Milliseconds(2000)); // the "Destination arrived" notification can sometimes reappear if you opened the map too quickly after you reached the previous marker.
+    }
+
+
+    while (true){
+        NoMinimapWatcher no_minimap(stream.logger(), COLOR_RED, Milliseconds(250));
+        NormalBattleMenuWatcher battle(COLOR_BLUE);
+        AdvanceDialogWatcher        dialog(COLOR_RED);
+        DestinationMarkerWatcher marker(COLOR_CYAN, {0.717, 0.165, 0.03, 0.061});
+        context.wait_for_all_requests();
+        std::vector<PeriodicInferenceCallback> callbacks = {battle, dialog}; 
+        if (stop_condition == NavigationStopCondition::STOP_MARKER){
+            callbacks.emplace_back(marker);
+        }
+
+        int ret = run_until<ProControllerContext>(
+            stream, context,
+            [&](ProControllerContext& context){
+
+                for (int i = 0; i < seconds_timeout / seconds_realign; i++){
+                    // if detect no minimap, then stop moving or spamming A.
+                    int ret2 = run_until<ProControllerContext>(
+                        stream, context,
+                        [&](ProControllerContext& context){
+                            if (movement_mode == NavigationMovementMode::CLEAR_WITH_LETS_GO){
+                                walk_forward_while_clear_front_path(info, stream, context, forward_duration, y);
+                            }else{
+                                ssf_press_left_joystick(context, {x, y}, 0ms, Seconds(seconds_realign));
+                                if (movement_mode == NavigationMovementMode::DIRECTIONAL_ONLY){
+                                    pbf_wait(context, Seconds(seconds_realign));
+                                }else if (movement_mode == NavigationMovementMode::DIRECTIONAL_SPAM_A){
+                                    for (size_t j = 0; j < 5 * seconds_realign; j++){
+                                        pbf_press_button(context, BUTTON_A, 160ms, 40ms);
+                                    }
+                                }
+                            }
+                        },
+                        { no_minimap }
+                    );
+
+                    if (ret2 == 0){
+                        stream.log("overworld_navigation: No minimap detected. Wait for Battle or Dialog.");
+                        context.wait_for(Seconds(60));
+                    }
+
+                    context.wait_for_all_requests();
+                    if (should_realign){
+                        try{
+                            realign_player(info, stream, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+                   
+                        }catch (UnexpectedBattleException&){
+                            pbf_wait(context, 30000ms);  // catch exception to allow the battle callback to take over.
+                        }
+                        
+                    }
+                }
+            },
+            callbacks
+        );
+        context.wait_for(std::chrono::milliseconds(100));
+
+        switch (ret){
+        case 0: // battle
+            stream.log("overworld_navigation: Detected start of battle.");
+            if (stop_condition == NavigationStopCondition::STOP_BATTLE){
+                return;
+            }
+
+            run_wild_battle_press_A(stream, context, BattleStopCondition::STOP_OVERWORLD, {}, detect_wipeout);
+            if (auto_heal){
+                auto_heal_from_menu_or_overworld(info, stream, context, 0, true);
+            }
+            context.wait_for_all_requests();
+            try{
+                realign_player(info, stream, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+                if (stop_condition == NavigationStopCondition::STOP_MARKER && !confirm_marker_present(info, stream, context)){
+                    // if marker not present when using marker based navigation, don't keep walking forward.
+                    return;
+                }
+
+                break;
+            }catch (UnexpectedBattleException&){
+                break;
+            }
+        case 1: // dialog
+            stream.log("overworld_navigation: Detected dialog.");
+            if (stop_condition == NavigationStopCondition::STOP_DIALOG){
+                return;
+            }
+            if (stop_condition == NavigationStopCondition::STOP_MARKER){
+                OperationFailedExceptionWithScreenshot::fire(
+                    ErrorReportMode::SEND_ERROR_REPORT,
+                    "overworld_navigation(): Unexpectedly detected dialog.",
+                    stream
+                );
+            }
+            pbf_press_button(context, BUTTON_A, 160ms, 160ms);
+            break;
+        case 2: // marker
+            stream.log("overworld_navigation: Detected marker.");
+            if (stop_condition == NavigationStopCondition::STOP_MARKER){
+                return;
+            }
+            break;
+        default:
+            stream.log("overworld_navigation(): Timed out.");
+            if (stop_condition == NavigationStopCondition::STOP_TIME){
+                return;
+            }
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "overworld_navigation(): Timed out. Did not detect expected stop condition.",
+                stream
+            );
+        }
+    }
+}
+
+void config_option(ProControllerContext& context, int change_option_value){
+    for (int i = 0; i < change_option_value; i++){
+        pbf_press_dpad(context, DPAD_RIGHT, 104ms, 160ms);
+    }
+    pbf_press_dpad(context, DPAD_DOWN, 104ms, 160ms);
+}
+
+void swap_starter_moves(
+    SingleSwitchProgramEnvironment& env, 
+    ProControllerContext& context, 
+    Language language, 
+    EventNotificationOption& notif_error_recoverable)
+{
+    const ProgramInfo& info = env.program_info();
+    VideoStream& stream = env.console;
+
+    // start in the overworld
+    press_Bs_to_back_to_overworld(info, stream, context);
+
+    // open menu, select your starter
+    enter_menu_from_overworld(info, stream, context, 0, MenuSide::LEFT);
+
+    // enter Pokemon summary screen
+    pbf_press_button(context, BUTTON_A, 160ms, 5000ms);
+    pbf_press_dpad(context, DPAD_RIGHT, 120ms, 1000ms);
+    pbf_press_button(context, BUTTON_Y, 160ms, 320ms);
+
+    // select move 1
+    pbf_press_button(context, BUTTON_A, 160ms, 320ms);  
+    pbf_press_dpad(context, DPAD_DOWN, 120ms, 320ms);
+    pbf_press_dpad(context, DPAD_DOWN, 120ms, 320ms);
+    // extra button presses to avoid drops
+    pbf_press_dpad(context, DPAD_DOWN, 120ms, 320ms);
+    pbf_press_dpad(context, DPAD_DOWN, 120ms, 320ms);
+
+    // select move 3. swap move 1 and move 3.
+    pbf_press_button(context, BUTTON_A, 160ms, 320ms);    
+
+    // confirm that Ember/Leafage/Water Gun is in slot 1
+    context.wait_for_all_requests();
+    VideoSnapshot screen = stream.video().snapshot();
+    PokemonMovesReader reader(language);
+    std::string top_move = reader.read_move(stream.logger(), screen, 0);
+    stream.log("Current top move: " + top_move);
+    if (top_move != "ember" && top_move != "leafage" && top_move != "water-gun"){
+        stream.log("Unable to confirm that the moves actually swapped.");
+
+        auto snapshot = stream.video().snapshot().frame;
+        std::string message = "swap_starter_moves: Unable to confirm that the moves actually swapped.\n" + language_warning(language);
+        send_program_recoverable_error_notification_and_telemetry_report(
+            env, &env.logger(), env.program_info(), 
+            notif_error_recoverable, 
+            ErrorReportMode::SEND_ERROR_REPORT,
+            message,
+            "OperationFailedExceptionWithScreenshot",
+            *snapshot,
+            &stream.history()
+        );
+    }   
+
+}
+
+
+void confirm_lead_pokemon_moves(SingleSwitchProgramEnvironment& env, ProControllerContext& context, Language language){
+    const ProgramInfo& info = env.program_info();
+    VideoStream& stream = env.console;
+
+    // start in the overworld
+    press_Bs_to_back_to_overworld(info, stream, context);
+
+    // open menu, select your lead pokemon
+    enter_menu_from_overworld(info, stream, context, 0, MenuSide::LEFT);
+
+    // enter Pokemon summary screen
+    pbf_press_button(context, BUTTON_A, 160ms, 5000ms);
+    pbf_press_dpad(context, DPAD_RIGHT, 120ms, 1000ms);
+    pbf_press_button(context, BUTTON_Y, 160ms, 320ms);
+
+    // confirm that moves are: Moonblast, Mystical Fire, Psychic, Misty Terrain
+    context.wait_for_all_requests();
+    VideoSnapshot screen = stream.video().snapshot();
+    PokemonMovesReader reader(language);
+    std::string move_0 = reader.read_move(stream.logger(), screen, 0);
+    std::string move_1 = reader.read_move(stream.logger(), screen, 1);
+    std::string move_2 = reader.read_move(stream.logger(), screen, 2);
+    std::string move_3 = reader.read_move(stream.logger(), screen, 3);
+    stream.log("Current first move: " + move_0);
+    stream.log("Current second move: " + move_1);
+    stream.log("Current third move: " + move_2);
+    stream.log("Current fourth move: " + move_3);
+
+    if (move_0 != "moonblast" || move_1 != "mystical-fire" || move_2 != "psychic" || move_3 != "misty-terrain"){
+        stream.log("Lead Pokemon's moves are wrong. They are supposed to be: Moonblast, Mystical Fire, Psychic, Misty Terrain.");
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "We expect your lead Pokemon to be a Gardevoir with moves in this order: Moonblast, Mystical Fire, Psychic, Misty Terrain. "
+            "But we see something else instead. If you confirm that your lead Gardevoir does indeed have these moves in this order, "
+            "and are still getting this error, you can uncheck 'Pre-check: Ensure correct moves', under Advanced mode.\n" + language_warning(language),
+            stream
+        );
+    }   
+
+    press_Bs_to_back_to_overworld(info, stream, context);
+
+}
+
+void confirm_minimap_unlocked(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    DirectionDetector direction;
+    try{
+        direction.change_direction(env.program_info(), env.console, context, 3.02);
+        pbf_press_button(context, BUTTON_L, 200ms, 200ms);
+    }catch (OperationFailedException&){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "confirm_minimap_unlocked(): Unable to confirm that the minimap is unlocked. Likely because the direction cannot be detected. "
+            "If you manually confirm that the minimap is unlocked, you can disable this precheck in the program setting \"Pre-check: Ensure the minimap is unlocked\".",
+            env.console
+        );
+    }
+
+}
+
+void change_settings_prior_to_autostory_segment_mode(SingleSwitchProgramEnvironment& env, ProControllerContext& context, size_t current_segment_num, Language language){
+    // get index of `Options` in the Main Menu, which depends on where you are in Autostory
+    int8_t options_index;  
+    std::string assumption_text = "";
+    switch(current_segment_num){
+        case 0:
+            return; // can't change settings in the intro cutscene
+        case 1:
+        // after Intro cutscene done, in room
+            // Menu
+            // - Options
+            // - Save        
+            options_index = 0;
+            assumption_text = "We assume 'Bag' is not yet unlocked.";
+            break;
+        case 2:
+            // Menu
+            // - Bag  --> unlocked after picked up bag/hat in room. Segment 01, checkpoint 02
+            // - Options
+            // - Save
+            options_index = 1;
+            assumption_text = "We assume 'Boxes' is not yet unlocked.";
+            break;
+        case 3:
+        case 4:
+        case 5:
+        case 6:
+            // Menu
+            // - Bag
+            // - Boxes --> unlocked after battling Nemona and receiving Pokedex app. Segment 02, checkpoint 04
+            // - Options
+            // - Save        
+            options_index = 2;
+            assumption_text = "We assume 'Poke Portal' is not yet unlocked.";
+            break;
+        case 7:
+        case 8:
+        case 9:
+            // Menu
+            // - Bag
+            // - Boxes
+            // - Poke Portal --> unlocked after arriving at Los Platos and talking to Nemona. Segment 06, checkpoint 11
+            // - Options
+            // - Save  
+            options_index = 3;
+            assumption_text = "We assume 'Picnic' is not yet unlocked.";
+            break;                    
+        default:
+            // Menu
+            // - Bag
+            // - Boxes
+            // - Picnic --> unlocked after finishing tutorial. Segment 09, checkpoint 20
+            // - Poke Portal
+            // - Options
+            // - Save          
+            options_index = 4;
+            assumption_text = "We assume that the tutorial is done, and all menu items are unlocked.";
+            break;
+    }
+    
+    env.console.log("change_settings_prior_to_autostory: " + assumption_text + " The index of \"Options\" in the Menu is " + std::to_string(options_index) + ".");
+        
+    bool has_minimap = current_segment_num >= 2;  // the minimap only shows up in segment 2 and beyond
+    change_settings_prior_to_autostory(env, context, options_index, has_minimap, language);
+}
+
+void change_settings_prior_to_autostory_checkpoint_mode(SingleSwitchProgramEnvironment& env, ProControllerContext& context, size_t current_checkpoint_num, Language language){
+    // get index of `Options` in the Main Menu, which depends on where you are in Autostory
+    int8_t options_index;  
+    std::string assumption_text = "";
+    switch(current_checkpoint_num){
+        case 0:
+            return; // can't change settings in the intro cutscene
+        case 1:
+        case 2:
+        // after Intro cutscene done, in room
+            // Menu
+            // - Options
+            // - Save        
+            options_index = 0;
+            assumption_text = "We assume 'Bag' is not yet unlocked.";
+            break;
+        case 3:
+        case 4:
+            // Menu
+            // - Bag  --> unlocked after picked up bag/hat in room. Segment 01, checkpoint 02
+            // - Options
+            // - Save
+            options_index = 1;
+            assumption_text = "We assume 'Boxes' is not yet unlocked.";
+            break;
+        case 5:
+        case 6:
+        case 7:
+        case 8:
+        case 9:
+        case 10:
+        case 11:
+            // Menu
+            // - Bag
+            // - Boxes --> unlocked after battling Nemona and receiving Pokedex app. Segment 02, checkpoint 04
+            // - Options
+            // - Save        
+            options_index = 2;
+            assumption_text = "We assume 'Poke Portal' is not yet unlocked.";
+            break;
+        case 12:
+        case 13:
+        case 14:
+        case 15:
+        case 16:
+        case 17:
+        case 18:
+        case 19:
+        case 20:
+            // Menu
+            // - Bag
+            // - Boxes
+            // - Poke Portal --> unlocked after arriving at Los Platos and talking to Nemona. Segment 06, checkpoint 11
+            // - Options
+            // - Save  
+            options_index = 3;
+            assumption_text = "We assume 'Picnic' is not yet unlocked.";
+            break;                    
+        default:
+            if(current_checkpoint_num <= 20){
+                throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "change_settings_prior_to_autostory_checkpoint_mode: current_checkpoint_num should be greater than 20.");           
+            }
+
+            // Menu
+            // - Bag
+            // - Boxes
+            // - Picnic --> unlocked after finishing tutorial. Segment 09, checkpoint 20
+            // - Poke Portal
+            // - Options
+            // - Save          
+            options_index = 4;
+            assumption_text = "We assume that the tutorial is done, and all menu items are unlocked.";
+            break;
+    }
+    
+    env.console.log("change_settings_prior_to_autostory: " + assumption_text + " The index of \"Options\" in the Menu is " + std::to_string(options_index) + ".");
+        
+    bool has_minimap = current_checkpoint_num >= 3;  // the minimap only shows up in checkpoint 3 and beyond
+    change_settings_prior_to_autostory(env, context, options_index, has_minimap, language);
+}
+
+
+void change_settings_prior_to_autostory(
+    SingleSwitchProgramEnvironment& env, ProControllerContext& context,
+    int options_index,
+    bool has_minimap,
+    Language language
+){
+
+    enter_menu_from_overworld(env.program_info(), env.console, context, options_index, MenuSide::RIGHT, has_minimap);
+    change_settings(env, context, language);
+    if(!has_minimap){
+        pbf_mash_button(context, BUTTON_B, 2000ms);
+    }else{
+        press_Bs_to_back_to_overworld(env.program_info(), env.console, context);    
+    }
+}
+
+
+void change_settings(SingleSwitchProgramEnvironment& env, ProControllerContext& context,  Language language, bool use_inference){
+    env.console.log("Update settings.");
+    if (use_inference){
+        MenuOption session(env.console, context, language);
+
+        std::vector<std::pair<MenuOptionItemEnum, std::vector<MenuOptionToggleEnum>>> options = {
+            {MenuOptionItemEnum::TEXT_SPEED, {MenuOptionToggleEnum::FAST}},
+            {MenuOptionItemEnum::SKIP_MOVE_LEARNING, {MenuOptionToggleEnum::ON}},
+            {MenuOptionItemEnum::SEND_TO_BOXES, {MenuOptionToggleEnum::AUTOMATIC, MenuOptionToggleEnum::ON}},
+            {MenuOptionItemEnum::GIVE_NICKNAMES, {MenuOptionToggleEnum::OFF}},
+            {MenuOptionItemEnum::VERTICAL_CAMERA_CONTROLS, {MenuOptionToggleEnum::REGULAR, MenuOptionToggleEnum::NORMAL}},
+            {MenuOptionItemEnum::HORIZONTAL_CAMERA_CONTROLS, {MenuOptionToggleEnum::REGULAR, MenuOptionToggleEnum::NORMAL}},
+            {MenuOptionItemEnum::CAMERA_SUPPORT, {MenuOptionToggleEnum::OFF}},
+            {MenuOptionItemEnum::CAMERA_INTERPOLATION, {MenuOptionToggleEnum::NORMAL, MenuOptionToggleEnum::AVERAGE}},
+            {MenuOptionItemEnum::CAMERA_DISTANCE, {MenuOptionToggleEnum::CLOSE}},
+            {MenuOptionItemEnum::AUTOSAVE, {MenuOptionToggleEnum::OFF}},
+            {MenuOptionItemEnum::SHOW_NICKNAMES, {MenuOptionToggleEnum::OFF, MenuOptionToggleEnum::DONT_SHOW}},
+            {MenuOptionItemEnum::SKIP_CUTSCENES, {MenuOptionToggleEnum::ON}},
+            {MenuOptionItemEnum::CONTROLLER_RUMBLE, {MenuOptionToggleEnum::ON}},
+            {MenuOptionItemEnum::HELPING_FUNCTIONS, {MenuOptionToggleEnum::OFF}},
+
+        };
+        session.set_options(options);        
+    }else{
+        config_option(context, 1); // Text Speed: Fast
+        config_option(context, 1); // Skip Move Learning: On
+        config_option(context, 1); // Send to Boxes: Automatic
+        config_option(context, 1); // Give Nicknames: Off
+        config_option(context, 0); // Vertical Camera Controls: Regular
+        config_option(context, 0); // Horiztontal Camera Controls: Regular
+        config_option(context, 1); // Camera Support: Off
+        config_option(context, 0); // Camera Interpolation: Normal
+        config_option(context, 0); // Camera Distance: Close
+        config_option(context, 1); // Autosave: Off
+        config_option(context, 1); // Show Nicknames: Don't show
+        config_option(context, 1); // Skip Cutscenes: On
+        config_option(context, 0); // Background Music: 10
+        config_option(context, 0); // Sound Effects: 10
+        config_option(context, 0); // Pokemon Cries: 10
+        config_option(context, 0); // Controller Rumble: On
+        config_option(context, 1); // Helping Functions: Off
+    }
+
+    pbf_mash_button(context, BUTTON_A, 500ms);
+    env.console.log("Confirm that we want to save the settings.");
+    clear_dialog(env.console, context, ClearDialogMode::STOP_TIMEOUT, 5, {CallbackEnum::PROMPT_DIALOG});
+    env.console.log("Settings saved.");
+}
+
+void do_action_and_monitor_for_battles(
+    const ProgramInfo& info, 
+    VideoStream& stream,
+    ProControllerContext& context,
+    std::function<
+        void(const ProgramInfo& info, 
+        VideoStream& stream,
+        ProControllerContext& context)
+    >&& action
+){
+    NormalBattleMenuWatcher battle_menu(COLOR_RED);
+    int ret = run_until<ProControllerContext>(
+        stream, context,
+        [&](ProControllerContext& context){
+            context.wait_for_all_requests();
+            action(info, stream, context);
+        },
+        {battle_menu}
+    );
+    if (ret == 0){ // battle detected
+        throw_and_log<UnexpectedBattleException>(
+            stream.logger(), ErrorReportMode::SEND_ERROR_REPORT,
+            "do_action_and_monitor_for_battles(): Detected battle. Failed to complete action.",
+            stream
+        );
+
+    }
+}
+
+void do_action_and_monitor_for_battles_early(
+    const ProgramInfo& info, 
+    VideoStream& stream,
+    ProControllerContext& context,
+    std::function<
+        void(const ProgramInfo& info, 
+        VideoStream& stream,
+        ProControllerContext& context)
+    >&& action
+){
+    NoMinimapWatcher no_minimap(stream.logger(), COLOR_RED, Milliseconds(250));
+    int ret = run_until<ProControllerContext>(
+        stream, context,
+        [&](ProControllerContext& context){
+            context.wait_for_all_requests();
+            action(info, stream, context);
+        },
+        {no_minimap}
+    );
+    if (ret == 0){  // if see no minimap. stop and see if we detect a battle. if so, throw Battl exception
+        stream.log("do_action_and_monitor_for_battles_early: Detected no mini-map. Possibly caught in a battle.");
+        do_action_and_monitor_for_battles(info, stream, context,
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            // wait 30 seconds to see if we detect a battle. If so, this throws an UnexpectedBattleException.
+            pbf_wait(context, Seconds(30));
+        });
+
+        // if no battle seen, then throw Exception.
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "do_action_and_monitor_for_battles_early(): Expected to see a battle, but didn't. Possible false positive on NoMinimapWatcher.",
+            stream
+        ); 
+    }
+
+}
+
+
+void do_action_until_dialog(
+    const ProgramInfo& info, 
+    VideoStream& stream,
+    ProControllerContext& context,
+    std::function<
+        void(const ProgramInfo& info, 
+        VideoStream& stream,
+        ProControllerContext& context)
+    >&& action
+){
+    AdvanceDialogWatcher    dialog(COLOR_RED);
+    int ret = run_until<ProControllerContext>(
+        stream, context,
+        [&](ProControllerContext& context){
+            context.wait_for_all_requests();
+            action(info, stream, context);
+        },
+        {dialog}
+    );
+    context.wait_for(std::chrono::milliseconds(100));
+
+    switch (ret){
+    case 0: // dialog
+        stream.log("do_action_until_dialog(): Detected dialog.");
+        return;
+    default:
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "do_action_until_dialog(): Finished action. Did not detect dialog.",
+            stream
+        );
+    }
+
+}
+
+
+
+
+void handle_unexpected_battles(
+    const ProgramInfo& info, 
+    VideoStream& stream,
+    ProControllerContext& context,
+    std::function<
+        void(const ProgramInfo& info, 
+        VideoStream& stream,
+        ProControllerContext& context)
+    >&& action
+){
+    while (true){
+        try{
+            context.wait_for_all_requests();
+            action(info, stream, context);
+            return;
+        }catch (UnexpectedBattleException&){
+            run_wild_battle_press_A(stream, context, BattleStopCondition::STOP_OVERWORLD);
+        }
+    }
+}
+
+void do_action_and_monitor_for_overworld(
+    const ProgramInfo& info, 
+    VideoStream& stream,
+    ProControllerContext& context,
+    std::function<
+        void(const ProgramInfo& info, 
+        VideoStream& stream,
+        ProControllerContext& context)
+    >&& action
+){
+
+    OverworldWatcher overworld(stream.logger(), COLOR_CYAN);
+
+    int ret = run_until<ProControllerContext>(
+        stream, context,
+        [&](ProControllerContext& context){
+            context.wait_for_all_requests();
+            action(info, stream, context);
+        },
+        {overworld}        
+    );
+    if (ret < 0){
+        // successfully completed action detecting the overworld
+        return;
+    }else if (ret == 0){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "do_action_and_monitor_for_overworld(): Failed to complete action. Detected overworld.",
+            stream
+        );                
+    }
+
+}
+
+void handle_when_stationary_in_overworld(
+    const ProgramInfo& info, 
+    VideoStream& stream,
+    ProControllerContext& context,
+    std::function<
+        void(const ProgramInfo& info, 
+        VideoStream& stream,
+        ProControllerContext& context)
+    >&& action,
+    std::function<
+        void(const ProgramInfo& info, 
+        VideoStream& stream,
+        ProControllerContext& context)
+    >&& recovery_action,
+    size_t seconds_stationary,
+    uint16_t minutes_timeout, 
+    size_t max_failures
+){
+    
+    WallClock start = current_time();
+    size_t num_failures = 0;
+    while (true){
+        if (current_time() - start > std::chrono::minutes(minutes_timeout)){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "handle_when_stationary_in_overworld(): Failed to complete action after " + std::to_string(minutes_timeout) + " minutes.",
+                stream
+            );
+        }
+        StationaryOverworldWatcher stationary_overworld(COLOR_RED, {0.865, 0.825, 0.08, 0.1}, seconds_stationary);
+
+        int ret = run_until<ProControllerContext>(
+            stream, context,
+            [&](ProControllerContext& context){
+                context.wait_for_all_requests();
+                action(info, stream, context);
+            },
+            {stationary_overworld}        
+        );
+        if (ret < 0){
+            // successfully completed action without being stuck in a position where the overworld is stationary.
+            return;
+        }else if (ret == 0){
+            // if stationary in overworld, run recovery action then try action again
+            stream.log("Detected stationary overworld.");
+            num_failures++;
+            if (num_failures > max_failures){
+                OperationFailedExceptionWithScreenshot::fire(
+                    ErrorReportMode::SEND_ERROR_REPORT,
+                    "handle_when_stationary_in_overworld(): Failed to complete action within " + std::to_string(max_failures) + " attempts.",
+                    stream
+                );                
+            }
+            context.wait_for_all_requests();
+            recovery_action(info, stream, context);
+        }
+    }
+}
+
+
+void handle_failed_action(
+    const ProgramInfo& info, 
+    VideoStream& stream,
+    ProControllerContext& context,
+    std::function<
+        void(const ProgramInfo& info, 
+        VideoStream& stream,
+        ProControllerContext& context)
+    >&& action,
+    std::function<
+        void(const ProgramInfo& info, 
+        VideoStream& stream,
+        ProControllerContext& context)
+    >&& recovery_action,
+    size_t max_failures
+){
+    size_t num_failures = 0;
+    while (true){
+        try{
+            context.wait_for_all_requests();
+            action(info, stream, context);
+            return;
+        }catch (OperationFailedException&){
+            num_failures++;
+            if (num_failures > max_failures){
+                throw;
+            }
+            recovery_action(info, stream, context);
+        }
+    }
+}
+
+
+void wait_for_gradient_arrow(
+    const ProgramInfo& info, 
+    VideoStream& stream,
+    ProControllerContext& context, 
+    ImageFloatBox box_area_to_check,
+    uint16_t seconds_timeout
+){
+    context.wait_for_all_requests();
+    GradientArrowWatcher arrow(COLOR_RED, GradientArrowType::RIGHT, box_area_to_check);
+    int ret = wait_until(
+        stream, context,
+        Milliseconds(seconds_timeout * 1000),
+        { arrow }
+    );
+    if (ret == 0){
+        stream.log("Gradient arrow detected.");
+    }else{
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "Failed to detect gradient arrow.",
+            stream
+        );
+    }          
+}
+
+void wait_for_overworld(
+    const ProgramInfo& info, 
+    VideoStream& stream,
+    ProControllerContext& context, 
+    uint16_t seconds_timeout
+){
+    context.wait_for_all_requests();
+    OverworldWatcher        overworld(stream.logger(), COLOR_CYAN);
+    int ret = wait_until(
+        stream, context,
+        Milliseconds(seconds_timeout * 1000),
+        { overworld }
+    );
+    if (ret == 0){
+        stream.log("Overworld detected.");
+    }else{
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "Failed to detect overworld.",
+            stream
+        );
+    }     
+
+}
+
+void press_A_until_dialog(
+    const ProgramInfo& info,
+    VideoStream& stream, ProControllerContext& context,
+    uint16_t seconds_between_button_presses
+){
+    context.wait_for_all_requests();
+    AdvanceDialogWatcher advance_dialog(COLOR_RED);
+    int ret = run_until<ProControllerContext>(
+        stream, context,
+        [seconds_between_button_presses](ProControllerContext& context){
+            pbf_wait(context, Seconds(seconds_between_button_presses)); // avoiding pressing A if dialog already present
+            for (size_t c = 0; c < 10; c++){
+                pbf_press_button(context, BUTTON_A, 20*8ms, Seconds(seconds_between_button_presses));
+            }
+        },
+        {advance_dialog}
+    );
+    if (ret == 0){
+        stream.log("press_A_until_dialog: Detected dialog.");
+    }else{
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "press_A_until_dialog(): Unable to detect dialog after 10 button presses.",
+            stream
+        );
+    }
+}
+
+bool is_ride_active(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+    while (true){
+        try{
+            // open main menu
+            enter_menu_from_overworld(info, stream, context, -1, MenuSide::NONE, true);
+            context.wait_for_all_requests();
+            ImageStats ride_indicator = image_stats(
+                extract_box_reference(
+                    stream.video().snapshot(),
+                    ImageFloatBox(0.05, 0.995, 0.25, 0.003)
+                )
+            );
+
+            bool is_ride_active = !is_black(ride_indicator); // ride is active if the ride indicator isn't black.
+            pbf_press_button(context, BUTTON_B, 240ms, 800ms);
+            press_Bs_to_back_to_overworld(info, stream, context, 7);
+            if (is_ride_active){
+                stream.log("Ride is active.");
+            }else{
+                stream.log("Ride is not active.");
+            }
+            return is_ride_active;        
+
+        }catch (UnexpectedBattleException&){
+            run_wild_battle_press_A(stream, context, BattleStopCondition::STOP_OVERWORLD);
+        }
+    }
+
+}
+
+void get_on_ride(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+    get_on_or_off_ride(info, stream, context, true);
+}
+
+void get_off_ride(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+    get_on_or_off_ride(info, stream, context, false);
+}
+
+void get_on_or_off_ride(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context, bool get_on){
+    pbf_press_button(context, BUTTON_PLUS, 160ms, 160ms);
+
+    WallClock start = current_time();
+    while (get_on != is_ride_active(info, stream, context)){
+        if (current_time() - start > std::chrono::minutes(3)){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "get_on_or_off_ride(): Failed to get on/off ride after 3 minutes.",
+                stream
+            );
+        }        
+        pbf_press_button(context, BUTTON_PLUS, 240ms, 800ms);
+    }
+}
+
+void checkpoint_save(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, AutoStoryStats& stats){
+    save_game_from_overworld(env.program_info(), env.console, context);
+    stats.m_checkpoint++;
+    env.update_stats();
+    send_program_status_notification(env, notif_status_update, "Saved at checkpoint.");        
+}
+
+
+void realign_player_from_landmark(
+    const ProgramInfo& info, 
+    VideoStream& stream,
+    ProControllerContext& context,
+    MoveCursor move_cursor_near_landmark,
+    MoveCursor move_cursor_to_target
+){
+
+    stream.log("Realigning player direction, using a landmark...");
+    WallClock start = current_time();
+
+    const int MAX_TRY_COUNT = 17;
+    int try_count = 0;
+
+    // failures to fly to pokecenter are often when the Switch lags. from my testing, a 1.4-1.5 adjustment factor seems to work
+    const std::array<double, MAX_TRY_COUNT> adjustment_table =  {1, 1.4, 1, 1, 1.1, 1.2, 1.3, 1.4, 1.5, 1.6, 1.7, 1.8, 1.9, 2.0, 0.9, 0.8, 1.4}; // {1, 1.4, 1.5};
+
+    while (true){
+        if (current_time() - start > std::chrono::minutes(5)){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "realign_player_from_landmark(): Failed to realign player after 5 minutes.",
+                stream
+            );
+        }
+
+        try{
+            open_map_from_overworld(info, stream, context, false);
+
+            // move cursor near landmark (pokecenter)
+            switch(move_cursor_near_landmark.zoom_change){
+            case ZoomChange::ZOOM_IN:
+                pbf_press_button(context, BUTTON_ZR, 160ms, 840ms);
+                break;
+            case ZoomChange::ZOOM_IN_TWICE:
+                pbf_press_button(context, BUTTON_ZR, 160ms, 840ms);
+                pbf_press_button(context, BUTTON_ZR, 160ms, 840ms);
+                break;                
+            case ZoomChange::ZOOM_OUT:
+                pbf_press_button(context, BUTTON_ZL, 160ms, 840ms);
+                break;    
+            case ZoomChange::ZOOM_OUT_TWICE:
+                pbf_press_button(context, BUTTON_ZL, 160ms, 840ms);
+                pbf_press_button(context, BUTTON_ZL, 160ms, 840ms);
+                break;                  
+            case ZoomChange::KEEP_ZOOM:
+                break;
+            }
+            double move_x1 = move_cursor_near_landmark.move_x;
+            double move_y1 = move_cursor_near_landmark.move_y;
+            Milliseconds move_duration1 = move_cursor_near_landmark.move_duration;
+            pbf_move_left_joystick(context, {move_x1, move_y1}, move_duration1, 1000ms);
+
+            // move cursor to pokecenter
+            double push_scale = 0.29 * adjustment_table[try_count];
+            if (!detect_closest_flypoint_and_move_map_cursor_there(info, stream, context, FlyPoint::POKECENTER, push_scale)){
+                OperationFailedExceptionWithScreenshot::fire(
+                    ErrorReportMode::SEND_ERROR_REPORT,
+                    "realign_player_from_landmark(): No visible pokecenter found on map.",
+                    stream
+                );         
+            }
+
+            confirm_cursor_centered_on_pokecenter(info, stream, context); // throws exception if fails
+
+            // move cursor from landmark to target
+            switch(move_cursor_to_target.zoom_change){
+            case ZoomChange::ZOOM_IN:
+                pbf_press_button(context, BUTTON_ZR, 160ms, 840ms);
+                break;
+            case ZoomChange::ZOOM_IN_TWICE:
+                pbf_press_button(context, BUTTON_ZR, 160ms, 840ms);
+                pbf_press_button(context, BUTTON_ZR, 160ms, 840ms);
+                break;                
+            case ZoomChange::ZOOM_OUT:
+                pbf_press_button(context, BUTTON_ZL, 160ms, 840ms);
+                break;    
+            case ZoomChange::ZOOM_OUT_TWICE:
+                pbf_press_button(context, BUTTON_ZL, 160ms, 840ms);
+                pbf_press_button(context, BUTTON_ZL, 160ms, 840ms);
+                break;                  
+            case ZoomChange::KEEP_ZOOM:
+                break;
+            }
+            double move_x2 = move_cursor_to_target.move_x;
+            double move_y2 = move_cursor_to_target.move_y;
+            Milliseconds move_duration2 = move_cursor_to_target.move_duration;
+            pbf_move_left_joystick(context, {move_x2, move_y2}, move_duration2, 1000ms);
+
+            // place down marker
+            pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+            pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+            leave_phone_to_overworld(info, stream, context);
+
+            return;      
+
+        }catch (UnexpectedBattleException&){
+            run_wild_battle_press_A(stream, context, BattleStopCondition::STOP_OVERWORLD);
+        }catch (OperationFailedException&){
+            try_count++;
+            if (try_count >= MAX_TRY_COUNT){
+                OperationFailedExceptionWithScreenshot::fire(
+                    ErrorReportMode::SEND_ERROR_REPORT,
+                    "fly_to_closest_pokecenter_on_map(): At min warpable map level, pokecenter was detected, but failed to fly there.",
+                    stream
+                );                
+            }
+            stream.log("Failed to find the fly menu item. Restart the closest Pokecenter travel process.");
+            press_Bs_to_back_to_overworld(info, stream, context);
+        }
+    }
+    
+
+}
+
+
+void confirm_cursor_centered_on_pokecenter(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+    context.wait_for_all_requests();
+    context.wait_for(Milliseconds(500));
+    ImageFloatBox center_cursor{0.484, 0.472, 0.030, 0.053};
+    MapPokeCenterIconDetector pokecenter(COLOR_RED, center_cursor);
+    if (!pokecenter.detect(stream.video().snapshot())){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "confirm_cursor_centered_on_pokecenter(): Cursor is not centered on a pokecenter.",
+            stream
+        );            
+    }
+
+    stream.log("Confirmed that the cursor is centered on a pokecenter.");
+}
+
+void move_cursor_towards_flypoint_and_go_there(
+    const ProgramInfo& info, 
+    VideoStream& stream,
+    ProControllerContext& context,
+    MoveCursor move_cursor_near_flypoint,
+    FlyPoint fly_point
+){
+    WallClock start = current_time();
+
+    const int MAX_TRY_COUNT = 17;
+    int try_count = 0;
+    
+    // failures to fly to pokecenter are often when the Switch lags. from my testing, a 1.4-1.5 adjustment factor seems to work
+    const std::array<double, MAX_TRY_COUNT> adjustment_table =  {1, 1.4, 1, 1, 1.1, 1.2, 1.3, 1.4, 1.5, 1.6, 1.7, 1.8, 1.9, 2.0, 0.9, 0.8, 1.4}; // {1, 1.4, 1.5};
+
+    while (true){
+        if (current_time() - start > std::chrono::minutes(5)){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "move_cursor_towards_flypoint_and_go_there(): Failed to fly after 5 minutes.",
+                stream
+            );
+        }
+
+        try{
+            open_map_from_overworld(info, stream, context, false);
+
+            // move cursor near landmark (pokecenter)
+            switch(move_cursor_near_flypoint.zoom_change){
+            case ZoomChange::ZOOM_IN:
+                pbf_press_button(context, BUTTON_ZR, 160ms, 840ms);
+                break;
+            case ZoomChange::ZOOM_IN_TWICE:
+                pbf_press_button(context, BUTTON_ZR, 160ms, 840ms);
+                pbf_press_button(context, BUTTON_ZR, 160ms, 840ms);
+                break;                
+            case ZoomChange::ZOOM_OUT:
+                pbf_press_button(context, BUTTON_ZL, 160ms, 840ms);
+                break;    
+            case ZoomChange::ZOOM_OUT_TWICE:
+                pbf_press_button(context, BUTTON_ZL, 160ms, 840ms);
+                pbf_press_button(context, BUTTON_ZL, 160ms, 840ms);
+                break;                  
+            case ZoomChange::KEEP_ZOOM:
+                break;
+            }
+            double move_x1 = move_cursor_near_flypoint.move_x;
+            double move_y1 = move_cursor_near_flypoint.move_y;
+            Milliseconds move_duration1 = move_cursor_near_flypoint.move_duration;
+            pbf_move_left_joystick(context, {move_x1, move_y1}, move_duration1, 1000ms);
+
+            double push_scale = 0.29 * adjustment_table[try_count];
+            if (!fly_to_visible_closest_flypoint_cur_zoom_level(info, stream, context, fly_point, push_scale)){
+                OperationFailedExceptionWithScreenshot::fire(
+                    ErrorReportMode::SEND_ERROR_REPORT,
+                    "move_cursor_towards_flypoint_and_go_there(): No visible pokecenter found on map.",
+                    stream
+                );                  
+            }
+
+            return;      
+
+        }catch (UnexpectedBattleException&){
+            run_wild_battle_press_A(stream, context, BattleStopCondition::STOP_OVERWORLD);
+        }catch (OperationFailedException&){
+            try_count++;
+            if (try_count >= MAX_TRY_COUNT){
+                OperationFailedExceptionWithScreenshot::fire(
+                    ErrorReportMode::SEND_ERROR_REPORT,
+                    "move_cursor_towards_flypoint_and_go_there(): At given zoom level, pokecenter was detected, but failed to fly there.",
+                    stream
+                );                
+            }
+            stream.log("Failed to find the fly menu item. Restart the closest Pokecenter travel process.");
+            press_Bs_to_back_to_overworld(info, stream, context);
+        }
+    }
+    
+
+}
+
+
+
+void check_num_sunflora_found(SingleSwitchProgramEnvironment& env, ProControllerContext& context, int expected_number){
+    context.wait_for_all_requests();
+    VideoSnapshot screen = env.console.video().snapshot();
+    ImageFloatBox num_sunflora_box = {0.27, 0.02, 0.04, 0.055};
+    int number = OCR::read_number_waterfill(env.console, extract_box_reference(screen, num_sunflora_box), 0xff000000, 0xff808080);
+    std::string number_string = std::to_string(number);
+    std::string expected_number_string = std::to_string(expected_number);
+
+    // checks that expected_number is a prefix of number
+    // this is to handle the Asian languages that have extra characters after the number
+    if (number_string.compare(0, expected_number_string.size(), expected_number_string) == 0){
+        env.console.log("Number of sunflora found: " + expected_number_string);
+    }else{
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "The number of sunflora found is different than expected.",
+            env.console
+        );
+    }
+
+
+}
+
+void checkpoint_reattempt_loop(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text,
+    std::function<void(size_t attempt_number)>&& action,
+    bool day_skip
+){
+    size_t max_attempts = 100;
+    for (size_t i = 0;;i++){
+    try{
+        if (i==0){
+            checkpoint_save(env, context, notif_status_update, stats);
+        }
+
+        if (day_skip && (i > 0 || ENABLE_TEST)){
+            day_skip_from_overworld(env.console, context);
+            save_game_from_overworld(env.program_info(), env.console, context);
+        }
+
+        env.console.log(checkpoint_text + " Num attempts: " + std::to_string(i));
+
+        context.wait_for_all_requests();
+        action(i);
+
+        enter_menu_from_overworld(env.program_info(), env.console, context, -1);
+       
+        break;
+    }catch (OperationFailedException& e){
+        if (i == 10){  // send an error report for debugging if 10 failed attempts for a given checkpoint.
+            auto snapshot = env.console.video().snapshot().frame;
+            std::string message = "10 failed attempts. " + checkpoint_text;
+            send_program_recoverable_error_notification_and_telemetry_report(
+                env, &env.logger(), env.program_info(), 
+                notif_error_recoverable, 
+                ErrorReportMode::SEND_ERROR_REPORT,
+                message,
+                "OperationFailedExceptionWithScreenshot",
+                *snapshot,
+                &env.console.history()
+            );
+        }
+
+        if (i > max_attempts){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "Autostory checkpoint failed " + std::to_string(max_attempts) + " times.\n" +
+                checkpoint_text + "\n"
+                "Make sure you selected the correct Start Point, and your character is in the exactly correct starting position."
+                "Also, make sure you have set the correct Language.\n" + e.message(),
+                env.console
+            );
+        }
+        context.wait_for_all_requests();
+        env.console.log("Resetting from checkpoint.");
+        reset_game(env.program_info(), env.console, context);
+        stats.m_reset++;
+        env.update_stats();
+    }         
+    }
+
+}
+
+void checkpoint_reattempt_loop_tutorial(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text,
+    std::function<void(size_t attempt_number)>&& action
+){
+    size_t max_attempts = 100;
+    for (size_t i = 0;;i++){
+    try{
+        if(i==0){
+            save_game_tutorial(env.program_info(), env.console, context);
+            stats.m_checkpoint++;
+            env.update_stats();
+            send_program_status_notification(env, notif_status_update, "Saved at checkpoint.");     
+        }
+        
+        env.console.log(checkpoint_text + " Num attempts: " + std::to_string(i));
+
+        context.wait_for_all_requests();
+        action(i);
+
+        break;  
+    }catch (OperationFailedException& e){
+        if (i == 10){  // send an error report for debugging if 10 failed attempts for a given checkpoint.
+            auto snapshot = env.console.video().snapshot().frame;
+            std::string message = "10 failed attempts. " + checkpoint_text;
+            send_program_recoverable_error_notification_and_telemetry_report(
+                env, &env.logger(), env.program_info(), 
+                notif_error_recoverable, 
+                ErrorReportMode::SEND_ERROR_REPORT,
+                message,
+                "OperationFailedExceptionWithScreenshot",
+                *snapshot,
+                &env.console.history()
+            );
+        }
+
+        if (i > max_attempts){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "Autostory checkpoint failed " + std::to_string(max_attempts) + " times.\n"
+                "Make sure you selected the correct Start Point, and your character is in the exactly correct starting position."
+                "Also, make sure you have set the correct Language.\n" + e.message(),
+                env.console
+            );
+        }        
+        context.wait_for_all_requests();
+        env.console.log("Resetting from checkpoint.");
+        reset_game(env.program_info(), env.console, context);
+        stats.m_reset++;
+        env.update_stats();
+    }
+    }    
+}
+
+void move_player_forward(
+    SingleSwitchProgramEnvironment& env, 
+    ProControllerContext& context, 
+    uint8_t num_rounds, 
+    std::function<void()>&& recovery_action,
+    bool use_lets_go,
+    bool mash_A,
+    Milliseconds forward_duration, 
+    double y, 
+    Milliseconds delay_after_forward_move, 
+    Milliseconds delay_after_lets_go
+){
+
+    context.wait_for_all_requests();
+    for (size_t i = 0; i < num_rounds; i++){
+        try{
+            do_action_and_monitor_for_battles_early(env.program_info(), env.console, context,
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                if (!use_lets_go){
+                    // pbf_move_left_joystick(context, 128, y, forward_duration, 0);
+                    ssf_press_left_joystick(context, {0, +1}, 0ms, 800ms, 0ms);
+
+                    if (mash_A){ // mashing A and Let's go aren't compatible. you end up talking to your Let's go pokemon if you mash A.
+                        pbf_mash_button(context, BUTTON_A, forward_duration);
+                    }
+                }else{
+                    pbf_press_button(context, BUTTON_R, 160ms, delay_after_lets_go);
+                    pbf_move_left_joystick(context, {0, y}, forward_duration, delay_after_forward_move);
+                }
+            });
+        }catch (UnexpectedBattleException&){
+            recovery_action();
+            // run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+        }
+    }
+
+}
+
+void move_forward_until_yolo_object_above_min_size(
+    SingleSwitchProgramEnvironment& env, 
+    ProControllerContext& context, 
+    YOLOv5Detector& yolo_detector, 
+    const std::string& target_label,
+    double min_width, double min_height,
+    std::function<void()>&& recovery_action, 
+    Milliseconds forward_duration, 
+    double y, 
+    Milliseconds delay_after_forward_move, 
+    Milliseconds delay_after_lets_go
+){
+    context.wait_for_all_requests();
+    pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+
+    VideoOverlaySet overlays(env.console.overlay());
+    bool seen_object = false;
+    size_t not_detected_cont = 0;
+    size_t max_not_detected = 5;
+    size_t forward_move_count = 0;
+    bool reached_target = false;
+    bool exceed_times_not_detected = false;
+    while(!reached_target && !exceed_times_not_detected){  
+        forward_move_count++;
+        try{
+            do_action_and_monitor_for_battles_early(env.program_info(), env.console, context,
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                context.wait_for_all_requests();
+                ImageFloatBox target_box = get_highest_confident_yolo_box(env, context, overlays, yolo_detector, target_label);
+
+                bool not_found_target = target_box.x == -1;
+                if (not_found_target){
+                    not_detected_cont++;
+                    if (not_detected_cont > max_not_detected){
+                        exceed_times_not_detected = true;
+                        return;      // when too many failed attempts, just assume we're too close to the target to detect it.
+                    }
+                    context.wait_for(1000ms); // if we can't see the object, it might just be temporarily obscured. wait one second and reattempt.
+                    return;
+                }else{
+                    seen_object = true;
+                    not_detected_cont = 0;
+                }
+
+                if (target_box.width > min_width && target_box.height > min_height){
+                    reached_target = true;
+                    return; // stop when the target is above a certain size. i.e. we are close enough to the target.
+                }
+            
+                pbf_move_left_joystick(context, {0, y}, forward_duration, 0ms);
+                // pbf_press_button(context, BUTTON_R, 20, delay_after_lets_go);
+                // pbf_move_left_joystick(context, 128, y, forward_ticks, delay_after_forward_move);
+            });
+        }catch (UnexpectedBattleException&){
+            overlays.clear();
+            recovery_action();
+            // run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+            // move_camera_yolo();
+        }
+
+        if (forward_move_count > 50){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "move_forward_until_yolo_object_above_min_size(): Unable to reach target object after many attempts.",
+                env.console
+            );
+        }
+    }
+
+    if (!seen_object){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "move_forward_until_yolo_object_above_min_size(): Never detected the yolo object.",
+            env.console
+        );
+    }
+}
+
+
+
+void move_player_until_yolo_object_detected(
+    SingleSwitchProgramEnvironment& env, 
+    ProControllerContext& context, 
+    YOLOv5Detector& yolo_detector, 
+    const std::string& target_label,   
+    std::function<void()>&& recovery_action, 
+    uint16_t max_rounds, 
+    Milliseconds forward_duration, 
+    double x, 
+    double y, 
+    Milliseconds delay_after_forward_move, 
+    Milliseconds delay_after_lets_go
+){
+    context.wait_for_all_requests();
+    pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+
+    VideoOverlaySet overlays(env.console.overlay());
+    bool found_target = false;
+    size_t round_num = 0;
+    while(!found_target){
+        try{
+            do_action_and_monitor_for_battles_early(env.program_info(), env.console, context,
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                context.wait_for_all_requests();
+                ImageFloatBox target_box = get_highest_confident_yolo_box(env, context, overlays, yolo_detector, target_label);
+                found_target = target_box.x != -1;
+                if (found_target){
+                    return;
+                }
+
+                
+
+                pbf_move_left_joystick(context, {x, y}, forward_duration, 0ms);
+                // pbf_press_button(context, BUTTON_R, 20, delay_after_lets_go);
+                // pbf_move_left_joystick(context, 128, y, forward_ticks, delay_after_forward_move);
+            });
+            
+        }catch (UnexpectedBattleException&){
+            overlays.clear();
+            recovery_action();
+            // run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+            // move_camera_yolo();
+        }
+
+
+        round_num++;
+        if (round_num > max_rounds){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "move_player_until_yolo_object_detected(): Unable to detect target object.",
+                env.console
+            );  
+        }
+    }
+}
+
+void move_forward_until_yolo_object_not_detected(
+    SingleSwitchProgramEnvironment& env, 
+    ProControllerContext& context, 
+    YOLOv5Detector& yolo_detector, 
+    const std::string& target_label,   
+    size_t times_not_seen_threshold,
+    std::function<void()>&& recovery_action, 
+    Milliseconds forward_duration, 
+    double y, 
+    Milliseconds delay_after_forward_move, 
+    Milliseconds delay_after_lets_go
+){
+    VideoOverlaySet overlays(env.console.overlay());
+    bool target_visible = true;
+    size_t max_rounds = 50;
+    size_t times_not_seen = 0;
+    size_t round_num = 0;
+    while(times_not_seen < times_not_seen_threshold){
+    try{
+        do_action_and_monitor_for_battles_early(env.program_info(), env.console, context,
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            context.wait_for_all_requests();
+            ImageFloatBox target_box = get_highest_confident_yolo_box(env, context, overlays, yolo_detector, target_label);
+            target_visible = target_box.x != -1;
+            if (!target_visible){  // stop when target not visible
+                times_not_seen++;
+                if (times_not_seen >= times_not_seen_threshold){
+                    return;
+                }
+            }
+            
+            pbf_move_left_joystick(context, {0, y}, forward_duration, 0ms);
+            // pbf_press_button(context, BUTTON_R, 20, delay_after_lets_go);
+            // pbf_move_left_joystick(context, 128, y, forward_ticks, delay_after_forward_move);
+        });
+        
+    }catch (UnexpectedBattleException&){
+        overlays.clear();
+        recovery_action();
+        // run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+        // move_camera_yolo();
+    }
+    round_num++;
+
+    if (round_num > max_rounds){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "move_forward_until_yolo_object_not_detected(): Unable to walk away from target object.",
+            env.console
+        );  
+    }
+    }
+}
+
+
+bool move_player_to_realign_via_yolo(
+    SingleSwitchProgramEnvironment& env, 
+    ProControllerContext& context, 
+    YOLOv5Detector& yolo_detector, 
+    const std::string& target_label,
+    double x_target
+){
+
+    VideoOverlaySet overlays(env.console.overlay());
+    bool seen_object = false;
+    size_t max_attempts = 10;
+    size_t not_detected_count = 0;
+    size_t max_not_detected = 5;
+    bool reached_target_line = false;
+    bool exceed_max_not_detected = false;
+    for (size_t i = 0; i < max_attempts; i++){
+    try{
+        do_action_and_monitor_for_battles_early(env.program_info(), env.console, context,
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            context.wait_for_all_requests();
+            ImageFloatBox target_box = get_highest_confident_yolo_box(env, context, overlays, yolo_detector, target_label);
+
+            bool not_found_target = target_box.x == -1;
+            if (not_found_target){
+                not_detected_count++;
+                if (not_detected_count > max_not_detected){
+                    exceed_max_not_detected = true;
+                    return;      // when too many failed attempts, just assume we're too close to the target to detect it.
+                }
+                context.wait_for(1000ms); // if we can't see the object, it might just be temporarily obscured. wait one second and reattempt.
+                return;
+            }else{
+                seen_object = true;
+                not_detected_count = 0;
+            }
+       
+            double object_x_pos = target_box.x + target_box.width/2;
+            double diff =  x_target - object_x_pos;
+
+            env.console.log("x_target: " + std::to_string(x_target));
+            env.console.log("diff: " + std::to_string(diff));
+            if (std::abs(diff) < 0.05){
+                reached_target_line = true;
+                return;    // close enough to target_line. stop.
+            }
+            
+            double duration_scale_factor = 500 / std::sqrt(std::abs(diff));
+            // if (std::abs(diff) < 0.05){
+            //     duration_scale_factor /= 2;
+            // }
+            double push_magnitude_scale_factor = 0.46875 / std::sqrt(std::abs(diff));
+
+            uint16_t push_duration_ticks = std::max(uint16_t(std::abs(diff * duration_scale_factor)), uint16_t(8));
+            Milliseconds push_duration = push_duration_ticks * 8ms;
+            int16_t push_direction = (diff > 0) ? -1 : 1;
+            double push_magnitude = std::max(double(std::abs(diff * push_magnitude_scale_factor)), 0.117); 
+            double x_push = std::max(std::min(push_direction * push_magnitude, +1.0), -1.0);
+
+            // env.console.log("object_x: {" + std::to_string(target_box.x) + ", " + std::to_string(target_box.y) + ", " + std::to_string(target_box.width) + ", " + std::to_string(target_box.height) + "}");
+            // env.console.log("object_x_pos: " + std::to_string(object_x_pos));
+            env.console.log("x push: " + std::to_string(x_push) + ", push duration: " +  std::to_string(push_duration.count()) + "ms");
+            if (i == 0){
+                pbf_move_left_joystick(context, {x_push, 0}, 80ms, 400ms);
+                pbf_press_button(context, BUTTON_R, 160ms, 840ms);
+            }
+            
+            pbf_move_left_joystick(context, {x_push, 0}, push_duration, 0ms);
+            
+        });
+
+        if (exceed_max_not_detected){
+            return false;
+        }
+
+        if(reached_target_line){
+            return true;
+        }
+    
+    }catch (UnexpectedBattleException&){
+        overlays.clear();
+        run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+    }
+    }
+
+    if (!seen_object){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "move_player_to_realign_via_yolo(): Never detected the yolo object.",
+            env.console
+        );
+    }
+
+    return false;
+}
+
+
+void move_player_to_realign_via_yolo_with_recovery(
+    SingleSwitchProgramEnvironment& env, 
+    ProControllerContext& context, 
+    YOLOv5Detector& yolo_detector, 
+    const std::string& target_label,
+    double x_target,
+    std::function<void()>&& recovery_action
+){
+    bool succeed_realign_attempt_1 = move_player_to_realign_via_yolo(env, context, yolo_detector, target_label, x_target);
+    if (!succeed_realign_attempt_1){
+        recovery_action();
+        move_player_to_realign_via_yolo(env, context, yolo_detector, target_label, x_target); // second attempt.
+    }
+}
+
+
+void move_camera_until_yolo_object_detected(
+    SingleSwitchProgramEnvironment& env, 
+    ProControllerContext& context, 
+    YOLOv5Detector& yolo_detector, 
+    const std::string& target_label,
+    double initial_x_move, 
+    Milliseconds initial_hold,
+    uint16_t max_rounds
+){
+    VideoOverlaySet overlays(env.console.overlay());
+    bool found_target = false;
+    size_t round_num = 0;
+    double x_move = initial_x_move > 0 ? +1 : -1;
+    while(!found_target){
+        try{
+            do_action_and_monitor_for_battles_early(env.program_info(), env.console, context,
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+
+                if (round_num == 0){
+                    pbf_move_right_joystick(context, {initial_x_move, 0}, initial_hold, 400ms);
+                }
+                context.wait_for_all_requests();
+                ImageFloatBox target_box = get_highest_confident_yolo_box(env, context, overlays, yolo_detector, target_label);
+                found_target = target_box.x != -1;
+                if (found_target){
+                    return;
+                }
+
+                
+
+                pbf_move_right_joystick(context, {x_move, 0}, 80ms, 400ms);
+            });
+            
+        }catch (UnexpectedBattleException&){
+            overlays.clear();
+            run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+        }
+        round_num++;
+        if (round_num > max_rounds){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "move_camera_until_yolo_object_detected(): Unable to detect target object.",
+                env.console
+            );  
+        }
+    }
+}
+
+
+void confirm_titan_battle(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+
+    bool is_green_hp_bar = false;
+    size_t MAX_ATTEMPTS = 10;
+    for (size_t i = 0; i < MAX_ATTEMPTS; i++){
+        context.wait_for_all_requests();
+        VideoSnapshot screen = env.console.video().snapshot();
+        ImageFloatBox hp_bar_box{0.394805, 0.088991, 0.220779, 0.021000};
+
+
+        ImageStats hp_bar_stats = image_stats(extract_box_reference(screen, hp_bar_box));
+        // cout << "hp_bar_stats.average.sum(): " << hp_bar_stats.average.sum() << endl;    
+        // expected color is green: {R 25-32, G 255, B 32-76}  {30, 255, 55}. total = 30+255+55 = 340
+        // 30/340, 255/340, 55/340
+        is_green_hp_bar = is_solid(hp_bar_stats, {0.088235, 0.75, 0.161765}, 0.25, 30);
+        if (is_green_hp_bar){
+            break;
+        }
+
+        env.console.log("Unable to confirm Titan battle. Wait 2 seconds and re-try.");
+        context.wait_for(Seconds(2));
+    }
+
+
+    if (is_green_hp_bar){
+        env.console.log("Confirmed Titan battle.");
+        
+    }else{
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "confirm_titan_battle(): Unable to confirm Titan battle.",
+            env.console
+        );
+    }
+
+}
+
+
+
+}
+}
+}
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStoryTools.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStoryTools.h
new file mode 100644
index 0000000000..8d11831efe
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStoryTools.h
@@ -0,0 +1,517 @@
+/*  AutostoryTools
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_AutoStoryTools_H
+#define PokemonAutomation_PokemonSV_AutoStoryTools_H
+
+#include <functional>
+#include "CommonFramework/Language.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "ML/Inference/ML_YOLOv5Detector.h"
+#include "ML/Inference/ML_YOLONavigation.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+using namespace ML;
+
+static constexpr bool ENABLE_TEST  = false;
+
+struct AutoStoryStats : public StatsTracker{
+    AutoStoryStats()
+        : m_checkpoint(m_stats["Checkpoint"])
+        , m_segment(m_stats["Segment"])
+        , m_reset(m_stats["Reset"])
+    {
+        m_display_order.emplace_back("Checkpoint");
+        m_display_order.emplace_back("Segment");
+        m_display_order.emplace_back("Reset");
+    }
+    std::atomic<uint64_t>& m_checkpoint;
+    std::atomic<uint64_t>& m_segment;
+    std::atomic<uint64_t>& m_reset;
+};    
+
+
+
+enum class ClearDialogMode{
+    STOP_OVERWORLD,
+    STOP_PROMPT,
+    STOP_WHITEBUTTON,
+    STOP_TIMEOUT,
+    STOP_BATTLE,
+    STOP_TUTORIAL,
+    STOP_BATTLE_DIALOG_ARROW,
+};
+
+
+
+
+enum class StartPoint{
+    INTRO_CUTSCENE,
+    PICK_STARTER,
+    NEMONA_FIRST_BATTLE,
+    CATCH_TUTORIAL,
+    LEGENDARY_RESCUE,
+    ARVEN_FIRST_BATTLE,
+    LOS_PLATOS,
+    MESAGOZA_SOUTH,
+};
+
+enum class StarterChoice{
+    SPRIGATITO,
+    FUECOCO,
+    QUAXLY,
+};
+
+
+
+enum class NavigationStopCondition{
+    STOP_DIALOG,
+    STOP_MARKER,
+    STOP_TIME,
+    STOP_BATTLE,
+};
+
+// struct MinimumDetectedSize{
+//     double width;
+//     double height;
+// };
+
+
+struct AutoStoryOptions{
+    Language language;
+    StarterChoice starter_choice;
+    EventNotificationOption& notif_status_update;
+    EventNotificationOption& notif_error_recoverable;
+};
+
+class AutoStory_Segment {
+public:
+    virtual ~AutoStory_Segment() = default;
+    virtual std::string name() const = 0;
+    virtual std::string start_text() const = 0;
+    virtual std::string end_text() const = 0;
+    virtual void run_segment(
+        SingleSwitchProgramEnvironment& env, 
+        ProControllerContext& context,
+        AutoStoryOptions options,
+        AutoStoryStats& stats) const = 0;
+};
+
+class AutoStory_Checkpoint {
+public:
+    virtual ~AutoStory_Checkpoint() = default;
+    virtual std::string name() const = 0;
+    virtual std::string start_text() const = 0;
+    virtual std::string end_text() const = 0;
+    virtual void run_checkpoint(
+        SingleSwitchProgramEnvironment& env, 
+        ProControllerContext& context,
+        AutoStoryOptions options,
+        AutoStoryStats& stats) const = 0;
+
+    std::string checkpoint_text() const { 
+        return "Checkpoint:: " + name() + ". Start point: " + start_text(); 
+    }
+};
+
+
+// press A to clear tutorial screens
+// throw exception if tutorial screen never detected
+void clear_tutorial(VideoStream& stream, ProControllerContext& context, uint16_t seconds_timeout = 5);
+
+// spam the A button to clear dialog.
+// stop depending on ClearDialogMode: stop when detect overworld, or dialog prompt, or A button prompt. Or if times out
+// throw exception if times out, unless this is the intended stop condition.
+// also throw exception if dialog is never detected.
+// NOTE: seconds_timeout is rounded up to a multiple of 25, unless press_A is false or ClearDialogMode == STOP_TIMEOUT
+void clear_dialog(VideoStream& stream, ProControllerContext& context,
+    ClearDialogMode mode, uint16_t seconds_timeout = 75,
+    std::vector<CallbackEnum> optional_callbacks = {},
+    bool press_A = true
+);
+
+
+// return true if the destination marker is present within the minimap area
+bool confirm_marker_present(
+    const ProgramInfo& info, 
+    VideoStream& stream,
+    ProControllerContext& context
+);
+
+// align player orientation based on the alignment mode
+// The direction is specified by (x, y):
+// x = 0 : left
+// x = 128 : neutral
+// x = 255 : right
+// y = 0 : up
+// y = 128 : neutral
+// y = 255 : down
+// - REALIGN_NEW_MARKER: place down a map marker, which will align the player towards the marker
+// location of the marker is set with move_x, move_y, move_duration
+// - REALIGN_OLD_MARKER: assuming a marker is already set, open and close the map, 
+// which will align the player towards the marker
+// - REALIGN_NO_MARKER: move player towards in the direction set by move_x, move_y, move_duration
+// then re-align the camera
+void realign_player(
+    const ProgramInfo& info,
+    VideoStream& stream, ProControllerContext& context,
+    PlayerRealignMode realign_mode,
+    double move_x = 0, double move_y = 0, Milliseconds move_duration = Milliseconds(0)
+);
+
+
+// move character with ssf left joystick, as per given x, y, until 
+// stop_condition is met (e.g. Dialog detected). 
+// throw exception if reaches timeout before detecting stop condition
+void overworld_navigation(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context,
+    NavigationStopCondition stop_condition,
+    NavigationMovementMode movement_mode,
+    double x, double y,
+    uint16_t seconds_timeout = 60, uint16_t seconds_realign = 60,
+    bool auto_heal = false,
+    bool detect_wipeout = false
+);
+
+void config_option(ProControllerContext& context, int change_option_value);
+
+// enter menu and swap the first and third moves for your starter
+void swap_starter_moves(
+    SingleSwitchProgramEnvironment& env, 
+    ProControllerContext& context, 
+    Language language, 
+    EventNotificationOption& notif_error_recoverable
+);
+
+// confirm the moves for the Lead pokemon: Moonblast, Mystical Fire, Psychic, Misty Terrain
+// start and end in the overworld
+void confirm_lead_pokemon_moves(SingleSwitchProgramEnvironment& env, ProControllerContext& context, Language language);
+
+void confirm_minimap_unlocked(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+
+// run the given `action`. if detect a battle, stop the action, and throw exception
+void do_action_and_monitor_for_battles(
+    const ProgramInfo& info, 
+    VideoStream& stream,
+    ProControllerContext& context,
+    std::function<
+        void(const ProgramInfo& info, 
+        VideoStream& stream,
+        ProControllerContext& context)
+    >&& action
+);
+
+// run the given `action`. if detect no minimap, stop the action. 
+// wait 15 seconds and see if we find a battle. if so, throw Battle exception. if no battle, then throw OperationFailedException
+void do_action_and_monitor_for_battles_early(
+    const ProgramInfo& info, 
+    VideoStream& stream,
+    ProControllerContext& context,
+    std::function<
+        void(const ProgramInfo& info, 
+        VideoStream& stream,
+        ProControllerContext& context)
+    >&& action
+);
+
+void do_action_until_dialog(
+    const ProgramInfo& info, 
+    VideoStream& stream,
+    ProControllerContext& context,
+    std::function<
+        void(const ProgramInfo& info, 
+        VideoStream& stream,
+        ProControllerContext& context)
+    >&& action
+);
+
+
+// catch any UnexpectedBattle exceptions from `action`. then use run_battle_press_A until overworld, and re-try the `action`.
+void handle_unexpected_battles(
+    const ProgramInfo& info, 
+    VideoStream& stream,
+    ProControllerContext& context,
+    std::function<
+        void(const ProgramInfo& info, 
+        VideoStream& stream,
+        ProControllerContext& context)
+    >&& action
+);
+
+// run the given `action`. if detect the overworld, stop the action, and throw exception
+void do_action_and_monitor_for_overworld(
+    const ProgramInfo& info, 
+    VideoStream& stream,
+    ProControllerContext& context,
+    std::function<void(const ProgramInfo& info, 
+        VideoStream& stream,
+        ProControllerContext& context)>&& action
+);
+
+// if stationary in overworld for an amount of time (seconds_stationary), run `recovery_action` then try `action` again
+// return once successfully completed `action`
+// throw exception if fails to complete `action` within a certain amount of time (minutes_timeout).
+// NOTE: if using this function to wrap overworld_navigation(), keep in mind that 
+// confirm_marker_present() will keep the player still for 5 seconds before moving. Therefore, seconds_stationary should be greater than 5 seconds in this case.
+void handle_when_stationary_in_overworld(
+    const ProgramInfo& info, 
+    VideoStream& stream,
+    ProControllerContext& context,
+    std::function<
+        void(const ProgramInfo& info, 
+        VideoStream& stream,
+        ProControllerContext& context)
+    >&& action,
+    std::function<
+        void(const ProgramInfo& info, 
+        VideoStream& stream,
+        ProControllerContext& context)
+    >&& recovery_action,
+    size_t seconds_stationary = 6,
+    uint16_t minutes_timeout = 5,
+    size_t max_attempts = 2
+);
+
+// do action. if error is thrown, catch the error and try the recovery action
+void handle_failed_action(
+    const ProgramInfo& info, 
+    VideoStream& stream,
+    ProControllerContext& context,
+    std::function<
+        void(const ProgramInfo& info, 
+        VideoStream& stream,
+        ProControllerContext& context)
+    >&& action,
+    std::function<
+        void(const ProgramInfo& info, 
+        VideoStream& stream,
+        ProControllerContext& context)
+    >&& recovery_action,
+    size_t max_failures
+);
+
+void wait_for_gradient_arrow(
+    const ProgramInfo& info, 
+    VideoStream& stream,
+    ProControllerContext& context, 
+    ImageFloatBox box_area_to_check,
+    uint16_t seconds_timeout
+);
+
+void wait_for_overworld(
+    const ProgramInfo& info, 
+    VideoStream& stream,
+    ProControllerContext& context, 
+    uint16_t seconds_timeout = 30
+);
+
+void press_A_until_dialog(
+    const ProgramInfo& info,
+    VideoStream& stream, ProControllerContext& context,
+    uint16_t seconds_between_button_presses
+);
+
+// return true if ride is active. i.e. if you are on your ride
+bool is_ride_active(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context);
+
+void get_on_ride(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context);
+
+void get_off_ride(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context);
+
+void get_on_or_off_ride(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context, bool get_on);
+
+void change_settings_prior_to_autostory_segment_mode(SingleSwitchProgramEnvironment& env, ProControllerContext& context, size_t current_segment_num, Language language);
+void change_settings_prior_to_autostory_checkpoint_mode(SingleSwitchProgramEnvironment& env, ProControllerContext& context, size_t current_checkpoint_num, Language language);
+
+// change the settings prior to Autostory
+// Assumes that `current_segment` represents where we currently are in the story.
+void change_settings_prior_to_autostory(
+    SingleSwitchProgramEnvironment& env, ProControllerContext& context,
+    int options_index,
+    bool has_minimap,
+    Language language
+);
+
+// from within the Settings/Options menu, change the settings
+void change_settings(SingleSwitchProgramEnvironment& env, ProControllerContext& context, Language language, bool use_inference = true);
+
+
+void checkpoint_save(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, AutoStoryStats& stats);
+
+
+// place a marker on the map, not relative to the current player position, but based on a fixed landmark, such as a pokecenter
+// How this works:
+//  - cursor is moved to a point near the landmark, as per `move_cursor_near_landmark`
+//  - move the cursor onto the landmark using `detect_closest_flypoint_and_move_map_cursor_there`.
+//  - confirm that the pokecenter is centered within cursor. If not, close map app, and re-try.
+//  - cursor is moved to target location, as per `move_cursor_to_target`. A marker is placed down here.
+void realign_player_from_landmark(
+    const ProgramInfo& info, 
+    VideoStream& stream,
+    ProControllerContext& context,
+    MoveCursor move_cursor_near_landmark,
+    MoveCursor move_cursor_to_target
+);
+
+// confirm that the cursor is centered on the pokecenter, within the map app
+// else throw exception
+void confirm_cursor_centered_on_pokecenter(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context);
+
+// open map, then move cursor to a point near a flypoint as per `move_cursor_near_flypoint`
+// then fly to the closest pokecenter near the cursor
+void move_cursor_towards_flypoint_and_go_there(
+    const ProgramInfo& info, 
+    VideoStream& stream,
+    ProControllerContext& context,
+    MoveCursor move_cursor_near_flypoint, 
+    FlyPoint fly_point = FlyPoint::POKECENTER
+);
+
+
+void check_num_sunflora_found(SingleSwitchProgramEnvironment& env, ProControllerContext& context, int expected_number);
+
+// run given action, with max_attempts number of attempts
+// save prior to first attempt
+// throw exception if we try to exceed max_attempts.
+void checkpoint_reattempt_loop(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text,
+    std::function<void(size_t attempt_number)>&& action,
+    bool day_skip = true
+);
+
+void checkpoint_reattempt_loop_tutorial(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text,
+    std::function<void(size_t attempt_number)>&& action
+);
+
+
+// walk forward forward_ticks. repeat this for num_rounds.
+// if detect battle, kill the Pokemon. then continue. If we run into a battle, this round is considered to be done and will not be repeated.
+// NOTE: mashing A and Let's go aren't compatible. you end up talking to your Let's go pokemon if you mash A.
+void move_player_forward(
+    SingleSwitchProgramEnvironment& env, 
+    ProControllerContext& context, 
+    uint8_t num_rounds, 
+    std::function<void()>&& recovery_action,
+    bool use_lets_go = false,
+    bool mash_A = false,
+    Milliseconds forward_duration = Milliseconds(800), 
+    double y = +1, 
+    Milliseconds delay_after_forward_move = Milliseconds(400), 
+    Milliseconds delay_after_lets_go = Milliseconds(840)
+);
+
+// move forward until detected object is a certain width and height on screen (min_size)
+// walk forward forward_ticks each time
+// if caught in battle, run recovery_action
+// throw exception if forward_move_count is above 50.
+// throw exception if never detected yolo object
+void move_forward_until_yolo_object_above_min_size(
+    SingleSwitchProgramEnvironment& env, 
+    ProControllerContext& context, 
+    YOLOv5Detector& yolo_detector, 
+    const std::string& target_label,
+    double min_width, double min_height,
+    std::function<void()>&& recovery_action, 
+    Milliseconds forward_duration = Milliseconds(800), 
+    double y = +1, 
+    Milliseconds delay_after_forward_move = Milliseconds(400), 
+    Milliseconds delay_after_lets_go = Milliseconds(840)
+);
+
+// walk forward forward_ticks each time
+// walk until we find the target object.
+// if caught in battle, run recovery_action
+// throw exception if exceed max_rounds.
+void move_player_until_yolo_object_detected(
+    SingleSwitchProgramEnvironment& env, 
+    ProControllerContext& context, 
+    YOLOv5Detector& yolo_detector, 
+    const std::string& target_label,
+    std::function<void()>&& recovery_action, 
+    uint16_t max_rounds, 
+    Milliseconds forward_duration = Milliseconds(800),
+    double x = 0, 
+    double y = +1, 
+    Milliseconds delay_after_forward_move = Milliseconds(400), 
+    Milliseconds delay_after_lets_go = Milliseconds(840)
+);
+
+// walk forward forward_ticks each time
+// walk until we no longer see the target object. and haven't seen `it times_not_seen_threshold` times.
+// if caught in battle, run recovery_action
+// throw exception if exceed max_rounds.
+void move_forward_until_yolo_object_not_detected(
+    SingleSwitchProgramEnvironment& env, 
+    ProControllerContext& context, 
+    YOLOv5Detector& yolo_detector, 
+    const std::string& target_label,
+    size_t times_not_seen_threshold,
+    std::function<void()>&& recovery_action, 
+    Milliseconds forward_duration = Milliseconds(800), 
+    double y = +1, 
+    Milliseconds delay_after_forward_move = Milliseconds(400), 
+    Milliseconds delay_after_lets_go = Milliseconds(840)
+);
+
+
+// move the player sideways until the target object is aligned with x_target
+// throw exception if never detected yolo object
+bool move_player_to_realign_via_yolo(
+    SingleSwitchProgramEnvironment& env, 
+    ProControllerContext& context, 
+    YOLOv5Detector& yolo_detector, 
+    const std::string& target_label,
+    double x_target
+);
+
+
+// move the player sideways until the target object is aligned with x_target
+// if failed. try recovery action once, then re-try.
+void move_player_to_realign_via_yolo_with_recovery(
+    SingleSwitchProgramEnvironment& env, 
+    ProControllerContext& context, 
+    YOLOv5Detector& yolo_detector, 
+    const std::string& target_label,
+    double x_target,
+    std::function<void()>&& recovery_action
+);
+
+// move camera in X direction until we find the target object.
+// if caught in battle, run recovery_action
+// throw exception if exceed max_rounds.
+void move_camera_until_yolo_object_detected(
+    SingleSwitchProgramEnvironment& env, 
+    ProControllerContext& context, 
+    YOLOv5Detector& yolo_detector, 
+    const std::string& target_label,
+    double initial_x_move,
+    Milliseconds initial_hold,
+    uint16_t max_rounds = 50
+);
+
+
+void confirm_titan_battle(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_00.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_00.cpp
new file mode 100644
index 0000000000..67918894f2
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_00.cpp
@@ -0,0 +1,85 @@
+/*  AutoStory
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "VideoGames/PokemonSV/Inference/PokemonSV_WhiteButtonDetector.h"
+#include "PokemonSV_AutoStoryTools.h"
+#include "PokemonSV_AutoStory_Segment_00.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+//#include <unordered_map>
+//#include <algorithm>
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+std::string AutoStory_Segment_00::name() const{
+    return "00: Intro Cutscene";
+}
+
+
+std::string AutoStory_Segment_00::start_text() const{
+    return "Start: Intro cutscene.";
+}
+
+std::string AutoStory_Segment_00::end_text() const{
+    return "End: Finished cutscene.";
+}
+
+void AutoStory_Segment_00::run_segment(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    AutoStoryOptions options,
+    AutoStoryStats& stats
+) const{
+
+    context.wait_for_all_requests();
+    env.console.log("Start Segment " + name(), COLOR_ORANGE);
+
+    AutoStory_Checkpoint_00().run_checkpoint(env, context, options, stats);
+
+    context.wait_for_all_requests();
+    env.console.log("End Segment " + name(), COLOR_GREEN);
+}
+
+std::string AutoStory_Checkpoint_00::name() const{ return "000 - " + AutoStory_Segment_00().name(); }
+std::string AutoStory_Checkpoint_00::start_text() const{ return "After selecting character name, style and the cutscene has started.";}
+std::string AutoStory_Checkpoint_00::end_text() const{ return "Done cutscene. Stood up from chair. Walked to left side of room.";}
+void AutoStory_Checkpoint_00::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_00(env, context);
+}
+
+void checkpoint_00(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+
+
+    // Mash A through intro cutscene, until the L stick button is detected
+    WhiteButtonWatcher leftstick(COLOR_GREEN, WhiteButton::ButtonLStick, {0.435, 0.912, 0.046, 0.047});
+    context.wait_for_all_requests();
+    run_until<ProControllerContext>(
+        env.console, context,
+        [](ProControllerContext& context){
+            pbf_mash_button(context, BUTTON_A, 240000ms);
+        },
+        {leftstick}
+    );
+    
+    // Stand up from chair and walk to left side of room
+    pbf_move_left_joystick(context, {0, -1}, 3000ms, 5000ms);
+    pbf_move_left_joystick(context, {-1, 0}, 6000ms, 1000ms);
+
+}
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_00.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_00.h
new file mode 100644
index 0000000000..0f836063c6
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_00.h
@@ -0,0 +1,46 @@
+/*  Autostory
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_AutoStory_Segment_00_H
+#define PokemonAutomation_PokemonSV_AutoStory_Segment_00_H
+
+#include "PokemonSV_AutoStoryTools.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+class AutoStory_Segment_00 : public AutoStory_Segment{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_segment(
+        SingleSwitchProgramEnvironment& env, 
+        ProControllerContext& context,
+        AutoStoryOptions options,
+        AutoStoryStats& stats
+    ) const override;
+};
+
+class AutoStory_Checkpoint_00 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+
+// start: after selecting character name, style and the cutscene has started
+// end: stood up from chair. Walked to left side of room.
+void checkpoint_00(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_01.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_01.cpp
new file mode 100644
index 0000000000..e08134efae
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_01.cpp
@@ -0,0 +1,273 @@
+/*  AutoStory
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "VideoGames/PokemonSV/Inference/PokemonSV_TutorialDetector.h"
+#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h"
+#include "PokemonSV_AutoStoryTools.h"
+#include "PokemonSV_AutoStory_Segment_01.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+//#include <unordered_map>
+//#include <algorithm>
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+
+
+std::string AutoStory_Segment_01::name() const{
+    return "01: Pick Starter";
+}
+
+
+std::string AutoStory_Segment_01::start_text() const{
+    return "Start: Finished cutscene. Stood up from chair. Walked to left side of room.";
+}
+
+std::string AutoStory_Segment_01::end_text() const{
+    return "End: Picked the starter. Changed move order.";
+}
+
+void AutoStory_Segment_01::run_segment(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    AutoStoryOptions options,
+    AutoStoryStats& stats
+) const{
+
+    stats.m_segment++;
+    env.update_stats();
+    context.wait_for_all_requests();
+    env.console.log("Start Segment " + name(), COLOR_ORANGE);
+
+    AutoStory_Checkpoint_01().run_checkpoint(env, context, options, stats);
+    AutoStory_Checkpoint_02().run_checkpoint(env, context, options, stats);
+    AutoStory_Checkpoint_03().run_checkpoint(env, context, options, stats);
+    
+    context.wait_for_all_requests();
+    env.console.log("End Segment " + name(), COLOR_GREEN);
+
+}
+
+std::string AutoStory_Checkpoint_01::name() const{ return "001 - " + AutoStory_Segment_01().name(); }
+std::string AutoStory_Checkpoint_01::start_text() const{ return "Done cutscene. Stood up from chair. Walked to left side of room.";}
+std::string AutoStory_Checkpoint_01::end_text() const{ return "Standing in room. Updated settings";}
+void AutoStory_Checkpoint_01::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_01(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text(), options.language);
+}
+
+std::string AutoStory_Checkpoint_02::name() const{ return "002 - " + AutoStory_Segment_01().name(); }
+std::string AutoStory_Checkpoint_02::start_text() const{ return AutoStory_Checkpoint_01().end_text();}
+std::string AutoStory_Checkpoint_02::end_text() const{ return "Standing in front of the 'power of science' NPC. Cleared map tutorial.";}
+void AutoStory_Checkpoint_02::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_02(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+std::string AutoStory_Checkpoint_03::name() const{ return "003 - " + AutoStory_Segment_01().name(); }
+std::string AutoStory_Checkpoint_03::start_text() const{ return  AutoStory_Checkpoint_02().end_text();}
+std::string AutoStory_Checkpoint_03::end_text() const{ return "Received starter Pokemon. Changed move order. Cleared autoheal tutorial.";}
+void AutoStory_Checkpoint_03::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_03(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text(), options.language, options.starter_choice);
+}
+
+
+void checkpoint_01(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text, 
+    Language language
+){
+    checkpoint_reattempt_loop_tutorial(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){
+        
+        context.wait_for_all_requests();
+        // set settings
+        enter_menu_from_overworld(env.program_info(), env.console, context, 0, MenuSide::RIGHT, false);
+        change_settings(env, context, language, attempt_number==0);
+        pbf_mash_button(context, BUTTON_B, 2000ms);
+        context.wait_for_all_requests();
+
+    });
+}
+
+void checkpoint_02(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+){
+    checkpoint_reattempt_loop_tutorial(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){
+        
+        context.wait_for_all_requests();
+        env.console.log("Go downstairs, get stopped by Skwovet");
+        env.console.overlay().add_log("Go downstairs, get stopped by Skwovet", COLOR_WHITE);
+        pbf_move_left_joystick(context, {0, +1}, 3000ms, 160ms);
+        pbf_move_left_joystick(context, {-1, 0}, 3000ms, 160ms);
+        pbf_move_left_joystick(context, {0, -1}, 3000ms, 160ms);
+        pbf_wait(context, 5000ms);
+        // clear_dialog(env.console, context, ClearDialogMode::STOP_TIMEOUT, 5, {});
+
+        context.wait_for_all_requests();
+        env.console.log("Go to the kitchen, talk with mom");
+        env.console.overlay().add_log("Go to the kitchen, talk with mom", COLOR_WHITE);
+        pbf_move_left_joystick(context, {0, -1}, 2000ms, 160ms);
+        walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_ONLY, 60000ms, -1, 0);
+
+        env.console.log("clear_dialog: Talk with Mom.");
+        clear_dialog(env.console, context, ClearDialogMode::STOP_TIMEOUT, 5, {});
+
+        context.wait_for_all_requests();
+        env.console.log("Go to the front door, talk with Clavell");
+        env.console.overlay().add_log("Go to the front door, talk with Clavell", COLOR_WHITE);
+        pbf_move_left_joystick(context, {+0.803, -0.567}, 2000ms, 160ms);
+        walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_ONLY, 60000ms, +1, 0);
+        
+        env.console.log("clear_dialog: Talk with Clavell at front door.");
+        clear_dialog(env.console, context, ClearDialogMode::STOP_TIMEOUT, 5, {});
+
+        context.wait_for_all_requests();
+        env.console.log("Go upstairs, dress up");
+        env.console.overlay().add_log("Go upstairs, dress up", COLOR_WHITE);
+        pbf_move_left_joystick(context, {+1, 0}, 2000ms, 160ms);
+        pbf_move_left_joystick(context, {+0.449, +0.922}, 1000ms, 160ms);
+        pbf_move_left_joystick(context, {0, +1}, 4000ms, 160ms);
+        pbf_move_left_joystick(context, {+1, 0}, 4000ms, 160ms);
+        pbf_move_left_joystick(context, {-0.141, -0.567}, 3000ms, 160ms);
+        pbf_move_left_joystick(context, {+1, 0}, 2000ms, 160ms);
+        pbf_mash_button(context, BUTTON_A, 20000ms);
+
+        context.wait_for_all_requests();
+        env.console.log("Go to the living room, talk with Clavell");
+        env.console.overlay().add_log("Go to the living room, talk with Clavell", COLOR_WHITE);
+        pbf_move_left_joystick(context, {-1, +1}, 3000ms, 160ms);
+        pbf_move_left_joystick(context, {-1, 0}, 3000ms, 160ms);
+        pbf_move_left_joystick(context, {0, -1}, 4000ms, 160ms);
+        walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_ONLY, 60000ms, -1, 0);
+        
+        env.console.log("clear_dialog: Talk with Clavell at living room.");
+        clear_dialog(env.console, context, ClearDialogMode::STOP_TIMEOUT, 10, {});
+
+        context.wait_for_all_requests();
+        env.console.log("Go outside, receive Rotom Phone");
+        env.console.overlay().add_log("Go outside, receive Rotom Phone", COLOR_WHITE);
+        walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_ONLY, 60000ms, +0.921, -0.803);
+
+        env.console.log("clear_dialog: Talk with Clavell outside. Receive Rotom phone. Stop when detect overworld.");
+        clear_dialog(env.console, context, ClearDialogMode::STOP_OVERWORLD, 60, {CallbackEnum::OVERWORLD, CallbackEnum::WHITE_A_BUTTON});
+
+        context.wait_for_all_requests();
+        env.console.log("Clear map tutorial");
+        open_map_from_overworld(env.program_info(), env.console, context, true);
+        leave_phone_to_overworld(env.program_info(), env.console, context);
+
+    });
+}
+
+void checkpoint_03(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text,
+    Language language,
+    StarterChoice starter_choice
+){
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){
+        
+        context.wait_for_all_requests();
+        DirectionDetector direction;
+        direction.change_direction(env.program_info(), env.console, context, 4.62);
+        pbf_move_left_joystick(context, {0, +1}, 28800ms, 400ms);
+        pbf_move_left_joystick(context, {-1, 0}, 240ms, 400ms);
+
+        direction.change_direction(env.program_info(), env.console, context, 4.62);
+        walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_ONLY, 20000ms);
+        
+        context.wait_for_all_requests();
+        env.console.log("Entered Nemona's house");
+        mash_button_till_overworld(env.console, context);
+        context.wait_for_all_requests();
+        env.console.log("Picking a starter...");
+        switch(starter_choice){
+        case StarterChoice::SPRIGATITO:
+            env.console.log("Picking Sprigatito...");
+            pbf_move_left_joystick(context, {-0.414, +1}, 640ms, 160ms);
+            break;
+        case StarterChoice::FUECOCO:
+            env.console.log("Picking Fuecoco...");
+            pbf_move_left_joystick(context, {+0.409, +1}, 640ms, 160ms);
+            break;
+        case StarterChoice::QUAXLY:
+            env.console.log("Picking Quaxly...");
+            pbf_move_left_joystick(context, {0, +1}, 640ms, 160ms);
+            break;
+        }
+        pbf_press_button(context, BUTTON_A, 160ms, 840ms); // choose the starter
+        env.console.log("clear_dialog: Choose starter. Stop when detect prompt to receive starter.");
+        clear_dialog(env.console, context, ClearDialogMode::STOP_PROMPT, 20, {CallbackEnum::PROMPT_DIALOG});
+
+        pbf_press_button(context, BUTTON_A, 160ms, 840ms); // accept the pokemon
+        env.console.log("clear_dialog: Stop when detect prompt to give nickname to starter.");
+        clear_dialog(env.console, context, ClearDialogMode::STOP_PROMPT, 20, {CallbackEnum::PROMPT_DIALOG});
+
+        pbf_mash_button(context, BUTTON_B, 800ms);  // Don't give a nickname
+        env.console.log("clear_dialog: Talk to Nemona and Clavell. Stop when detect overworld.");
+        clear_dialog(env.console, context, ClearDialogMode::STOP_OVERWORLD, 20, {CallbackEnum::OVERWORLD});
+        
+        context.wait_for_all_requests();
+        env.console.log("Clear auto heal tutorial.");
+        // Press X until Auto heal tutorial shows up
+        TutorialWatcher tutorial;
+        int ret = run_until<ProControllerContext>(
+            env.console, context,
+            [](ProControllerContext& context){
+                for (int i = 0; i < 10; i++){
+                    pbf_press_button(context, BUTTON_X, 160ms, 2000ms);
+                }
+            },
+            {tutorial}
+        );
+        if (ret < 0){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "Stuck trying to clear auto heal tutorial.",
+                env.console
+            );  
+        }
+        clear_tutorial(env.console, context);
+
+        env.console.log("Change move order.");
+        swap_starter_moves(env, context, language, notif_error_recoverable);
+        press_Bs_to_back_to_overworld(env.program_info(), env.console, context);
+
+    }, false);
+     
+}
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_01.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_01.h
new file mode 100644
index 0000000000..7ce07cfb9e
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_01.h
@@ -0,0 +1,94 @@
+/*  Autostory
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_AutoStory_Segment_01_H
+#define PokemonAutomation_PokemonSV_AutoStory_Segment_01_H
+
+#include "PokemonSV_AutoStoryTools.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+class AutoStory_Segment_01 : public AutoStory_Segment{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_segment(
+        SingleSwitchProgramEnvironment& env, 
+        ProControllerContext& context,
+        AutoStoryOptions options,
+        AutoStoryStats& stats
+    ) const override;
+};
+
+class AutoStory_Checkpoint_01 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+class AutoStory_Checkpoint_02 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+
+class AutoStory_Checkpoint_03 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+// start: stood up from chair. Walked to left side of room.
+// end: standing in room. updated settings
+void checkpoint_01(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text,
+    Language language
+);
+
+// start: standing in room. updated settings
+// end: standing in front of power of science NPC. Cleared map tutorial.
+void checkpoint_02(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+);
+
+// start: standing in front of power of science NPC. Cleared map tutorial.
+// end: received starter, changed move order
+void checkpoint_03(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text,
+    Language language,
+    StarterChoice starter_choice
+);
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_02.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_02.cpp
new file mode 100644
index 0000000000..fffe2a61b2
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_02.cpp
@@ -0,0 +1,105 @@
+/*  AutoStory
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Exceptions/OperationFailedException.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h"
+#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h"
+#include "PokemonSV_AutoStoryTools.h"
+#include "PokemonSV_AutoStory_Segment_02.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+//#include <unordered_map>
+//#include <algorithm>
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+
+
+std::string AutoStory_Segment_02::name() const{
+    return "02: First Nemona Battle";
+}
+
+std::string AutoStory_Segment_02::start_text() const{
+    return "Start: Picked the starter. Changed move order.";
+}
+
+std::string AutoStory_Segment_02::end_text() const{
+    return "End: Battled Nemona on the beach.";
+}
+
+void AutoStory_Segment_02::run_segment(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    AutoStoryOptions options,
+    AutoStoryStats& stats
+) const{
+    stats.m_segment++;
+    env.update_stats();
+    context.wait_for_all_requests();
+    env.console.log("Start Segment " + name(), COLOR_ORANGE);
+
+    AutoStory_Checkpoint_04().run_checkpoint(env, context, options, stats);
+
+    context.wait_for_all_requests();
+    env.console.log("End Segment " + name(), COLOR_GREEN);         
+
+}
+
+
+std::string AutoStory_Checkpoint_04::name() const{ return "004 - " + AutoStory_Segment_02().name(); }
+std::string AutoStory_Checkpoint_04::start_text() const{ return "Received starter Pokemon. Changed move order. Cleared autoheal tutorial.";}
+std::string AutoStory_Checkpoint_04::end_text() const{ return "Battled Nemona on the beach.";}
+void AutoStory_Checkpoint_04::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_04(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+
+void checkpoint_04(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+){
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){        
+        context.wait_for_all_requests();
+
+        DirectionDetector direction;
+        direction.change_direction(env.program_info(), env.console, context, 3.72);
+        pbf_move_left_joystick(context, {0, +1}, 3200ms, 400ms);
+        direction.change_direction(env.program_info(), env.console, context, 4.55);
+        pbf_move_left_joystick(context, {0, +1}, 4800ms, 400ms);
+        direction.change_direction(env.program_info(), env.console, context, 5.27);
+        walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_SPAM_A, 20000ms);
+
+        context.wait_for_all_requests();
+        env.console.log("Starting battle...");
+        // TODO: Battle start prompt detection
+        // can lose this battle, and story will continue
+        mash_button_till_overworld(env.console, context);
+        context.wait_for_all_requests();
+        env.console.log("Finished battle.");
+
+    }, false);
+
+}
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_02.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_02.h
new file mode 100644
index 0000000000..40ff7ea511
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_02.h
@@ -0,0 +1,53 @@
+/*  Autostory
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_AutoStory_Segment_02_H
+#define PokemonAutomation_PokemonSV_AutoStory_Segment_02_H
+
+#include "PokemonSV_AutoStoryTools.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+class AutoStory_Segment_02 : public AutoStory_Segment{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_segment(
+        SingleSwitchProgramEnvironment& env, 
+        ProControllerContext& context,
+        AutoStoryOptions options,
+        AutoStoryStats& stats
+    ) const override;
+};
+
+class AutoStory_Checkpoint_04 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+
+// start: Received starter pokemon and changed move order. Cleared autoheal tutorial.
+// end: Battled Nemona on the beach.
+void checkpoint_04(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+);
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_03.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_03.cpp
new file mode 100644
index 0000000000..cf78e0439f
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_03.cpp
@@ -0,0 +1,196 @@
+/*  AutoStory
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Exceptions/OperationFailedException.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h"
+#include "PokemonSV_AutoStoryTools.h"
+#include "PokemonSV_AutoStory_Segment_03.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+//#include <unordered_map>
+//#include <algorithm>
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+
+
+std::string AutoStory_Segment_03::name() const{
+    return "03: Catch Tutorial";
+}
+
+std::string AutoStory_Segment_03::start_text() const{
+    return "Start: Battled Nemona on the beach.";
+}
+
+std::string AutoStory_Segment_03::end_text() const{
+    return "End: Finished catch tutorial. Walked to the cliff and heard mystery cry. Standing in front of Nemona near the cliff.";
+}
+
+void AutoStory_Segment_03::run_segment(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+
+    stats.m_segment++;
+    env.update_stats();
+    context.wait_for_all_requests();
+    env.console.log("Start Segment " + name(), COLOR_ORANGE);
+
+    AutoStory_Checkpoint_05().run_checkpoint(env, context, options, stats);
+    AutoStory_Checkpoint_06().run_checkpoint(env, context, options, stats);
+    AutoStory_Checkpoint_07().run_checkpoint(env, context, options, stats);
+
+    context.wait_for_all_requests();
+    env.console.log("End Segment " + name(), COLOR_GREEN);
+
+}
+
+std::string AutoStory_Checkpoint_05::name() const{ return "005 - " + AutoStory_Segment_03().name(); }
+std::string AutoStory_Checkpoint_05::start_text() const{ return "Battled Nemona on the beach.";}
+std::string AutoStory_Checkpoint_05::end_text() const{ return "Met mom at gate. Received mom's sandwich.";}
+void AutoStory_Checkpoint_05::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_05(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+std::string AutoStory_Checkpoint_06::name() const{ return "006 - " + AutoStory_Segment_03().name(); }
+std::string AutoStory_Checkpoint_06::start_text() const{ return AutoStory_Checkpoint_05().end_text();}
+std::string AutoStory_Checkpoint_06::end_text() const{ return "Cleared catch tutorial.";}
+void AutoStory_Checkpoint_06::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_06(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+std::string AutoStory_Checkpoint_07::name() const{ return "007 - " + AutoStory_Segment_03().name(); }
+std::string AutoStory_Checkpoint_07::start_text() const{ return AutoStory_Checkpoint_06().end_text();}
+std::string AutoStory_Checkpoint_07::end_text() const{ return "Moved to cliff. Heard mystery cry. Standing in front of Nemona near the cliff.";}
+void AutoStory_Checkpoint_07::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_07(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+void checkpoint_05(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+){
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){         
+        context.wait_for_all_requests();
+
+        DirectionDetector direction;
+        direction.change_direction(env.program_info(), env.console, context, 1.92);
+        pbf_move_left_joystick(context, {0, +1}, 7000ms, 400ms);
+        direction.change_direction(env.program_info(), env.console, context, 1.13);
+        walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_ONLY, 20000ms);
+        
+        context.wait_for_all_requests();
+        env.console.log("Get mom's sandwich");
+        env.console.overlay().add_log("Get mom's sandwich", COLOR_WHITE);
+        mash_button_till_overworld(env.console, context);
+    
+    }, false);   
+}
+
+void checkpoint_06(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+){
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){        
+
+        context.wait_for_all_requests();
+
+        realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_NEW_MARKER, -0.688, +0.359, 480ms);
+        pbf_move_left_joystick(context, {0, +1}, 6000ms, 160ms);
+        realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_NEW_MARKER, -0.141, +0.922, 480ms);
+        env.console.log("overworld_navigation: Go to Nemona.");
+        overworld_navigation(env.program_info(), env.console, context, NavigationStopCondition::STOP_DIALOG, NavigationMovementMode::DIRECTIONAL_ONLY, 0, +1, 20, 20, true, true);
+        
+        context.wait_for_all_requests();
+        env.console.log("clear_dialog: Talk with Nemona to start catch tutorial. Stop when detect battle.");
+        clear_dialog(env.console, context, ClearDialogMode::STOP_BATTLE, 60, 
+            {CallbackEnum::WHITE_A_BUTTON, CallbackEnum::TUTORIAL, CallbackEnum::BATTLE});
+        
+        // can die in catch tutorial, and the story will continue. so need to detect wipeout
+        env.console.log("Battle Lechonk in catch tutorial. Stop when detect dialog.");
+        run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_DIALOG);
+
+        env.console.log("clear_dialog: Talk with Nemona to finish catch tutorial. Stop when detect overworld.");
+        clear_dialog(env.console, context, ClearDialogMode::STOP_OVERWORLD, 60, 
+            {CallbackEnum::TUTORIAL, CallbackEnum::OVERWORLD});
+
+        context.wait_for_all_requests();
+        env.console.log("Finished catch tutorial");
+        env.console.overlay().add_log("Finished catch tutorial", COLOR_WHITE);
+
+    }, false);
+
+}
+
+void checkpoint_07(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+){
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){         
+
+        context.wait_for_all_requests();
+        env.console.log("Move to cliff");
+        env.console.overlay().add_log("Move to cliff", COLOR_WHITE);
+
+        realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_NEW_MARKER, +1, +0.453, 800ms);
+        env.console.log("overworld_navigation: Go to cliff.");
+        overworld_navigation(env.program_info(), env.console, context, 
+            NavigationStopCondition::STOP_TIME, NavigationMovementMode::DIRECTIONAL_ONLY, 
+            +0.055, +1, 24, 12, true, true);
+
+        realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_NEW_MARKER, 0, +1, 640ms);
+        handle_when_stationary_in_overworld(env.program_info(), env.console, context,
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                overworld_navigation(env.program_info(), env.console, context, 
+                    NavigationStopCondition::STOP_DIALOG, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                    0, +1, 24, 12, true, true);
+            }, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_move_left_joystick(context, {-1, 0}, 320ms, 400ms);
+                realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+            }
+        );               
+
+        clear_dialog(env.console, context, ClearDialogMode::STOP_OVERWORLD, 60, {CallbackEnum::OVERWORLD});
+
+        context.wait_for_all_requests();
+        env.console.log("Mystery cry");
+        env.console.overlay().add_log("Mystery cry", COLOR_WHITE);
+        
+    }, false);
+       
+
+}
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_03.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_03.h
new file mode 100644
index 0000000000..1001cbafea
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_03.h
@@ -0,0 +1,90 @@
+/*  Autostory
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_AutoStory_Segment_03_H
+#define PokemonAutomation_PokemonSV_AutoStory_Segment_03_H
+
+#include "PokemonSV_AutoStoryTools.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+class AutoStory_Segment_03 : public AutoStory_Segment{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_segment(
+        SingleSwitchProgramEnvironment& env, 
+        ProControllerContext& context,
+        AutoStoryOptions options,
+        AutoStoryStats& stats) const override;
+};
+
+class AutoStory_Checkpoint_05 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+class AutoStory_Checkpoint_06 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+class AutoStory_Checkpoint_07 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+
+// start: Battled Nemona on the beach.
+// end: Met mom at gate. Received mom's sandwich.
+void checkpoint_05(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+);
+
+// start: Met mom at gate. Received mom's sandwich.
+// end: Cleared catch tutorial.
+void checkpoint_06(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+);
+
+// start: Cleared catch tutorial.
+// end: Moved to cliff. Heard mystery cry. Standing in front of Nemona near the cliff.
+void checkpoint_07(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+);
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_04.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_04.cpp
new file mode 100644
index 0000000000..0b1cbba684
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_04.cpp
@@ -0,0 +1,208 @@
+/*  AutoStory
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "VideoGames/PokemonSV/Inference/PokemonSV_TutorialDetector.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h"
+#include "PokemonSV_AutoStoryTools.h"
+#include "PokemonSV_AutoStory_Segment_04.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+//#include <unordered_map>
+//#include <algorithm>
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+
+
+std::string AutoStory_Segment_04::name() const{
+    return "04: Rescue Legendary";
+}
+
+std::string AutoStory_Segment_04::start_text() const{
+    return "Start: Finished catch tutorial. Walked to the cliff and heard mystery cry. Standing in front of Nemona near the cliff.";
+}
+
+std::string AutoStory_Segment_04::end_text() const{
+    return "End: Saved the Legendary. Escaped from the Houndoom cave. Standing next to Koraidon/Miraidon just outside the cave exit.";
+}
+
+void AutoStory_Segment_04::run_segment(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    AutoStoryOptions options,
+    AutoStoryStats& stats
+) const{
+
+    stats.m_segment++;
+    env.update_stats();
+    context.wait_for_all_requests();
+    env.console.log("Start Segment " + name(), COLOR_ORANGE);
+
+    AutoStory_Checkpoint_08().run_checkpoint(env, context, options, stats);
+
+    context.wait_for_all_requests();
+    env.console.log("End Segment " + name(), COLOR_GREEN);
+
+}
+
+std::string AutoStory_Checkpoint_08::name() const{ return "008 - " + AutoStory_Segment_04().name(); }
+std::string AutoStory_Checkpoint_08::start_text() const{ return "Moved to cliff. Heard mystery cry. Standing in front of Nemona near the cliff.";}
+std::string AutoStory_Checkpoint_08::end_text() const{ return "Rescued Koraidon/Miraidon and escaped from the Houndoom Cave. Standing next to Koraidon/Miraidon just outside the cave exit.";}
+void AutoStory_Checkpoint_08::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_08(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+
+
+void checkpoint_08(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+){
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){
+
+        context.wait_for_all_requests();
+
+        realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_NEW_MARKER, +0.803, +0.453, 800ms);
+        env.console.log("overworld_navigation: Go to cliff.");
+        overworld_navigation(env.program_info(), env.console, context, NavigationStopCondition::STOP_DIALOG, NavigationMovementMode::DIRECTIONAL_ONLY, 0, +1, 30, 30, true, true);
+
+        env.console.log("Look over the injured Miraidon/Koraidon on the beach.");
+        clear_dialog(env.console, context, ClearDialogMode::STOP_TIMEOUT, 5, {});
+        env.console.log("Fall down the cliff.");
+        pbf_wait(context, 20000ms);  // long animation
+        context.wait_for_all_requests();
+        clear_dialog(env.console, context, ClearDialogMode::STOP_TIMEOUT, 10, {});
+        env.console.log("Go to Legendary pokemon laying on the beach.");
+        walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_SPAM_A, 30000ms);
+
+        env.console.log("clear_dialog: Offer Miraidon/Koraidon a sandwich.");
+        clear_dialog(env.console, context, ClearDialogMode::STOP_TIMEOUT, 10, {});
+
+        // TODO: Bag menu navigation
+        context.wait_for_all_requests();
+        env.console.log("Feed mom's sandwich");
+        env.console.overlay().add_log("Feed mom's sandwich", COLOR_WHITE);
+        
+        GradientArrowWatcher arrow(COLOR_RED, GradientArrowType::RIGHT, {0.104, 0.312, 0.043, 0.08});
+        context.wait_for_all_requests();
+
+        int ret = run_until<ProControllerContext>(
+            env.console, context,
+            [](ProControllerContext& context){
+                for (int i = 0; i < 10; i++){
+                    pbf_press_dpad(context, DPAD_UP, 160ms, 2000ms);
+                }
+            },
+            {arrow}
+        );
+        if (ret < 0){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "Failed to feed mom's sandwich.",
+                env.console
+            );  
+        }
+
+        // only press A when the sandwich is selected
+        pbf_mash_button(context, BUTTON_A, 800ms);
+
+        env.console.log("Miraidon/Koraidon eats the sandwich.");
+        clear_dialog(env.console, context, ClearDialogMode::STOP_TIMEOUT, 35, {});  // long animation
+        env.console.log("Miraidon/Koraidon is now up and at the cave entrance."); 
+
+        // First Nemona cave conversation
+        context.wait_for_all_requests();
+        env.console.log("Enter cave");
+        env.console.overlay().add_log("Enter cave", COLOR_WHITE);
+        do_action_and_monitor_for_battles(env.program_info(), env.console, context,
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_move_left_joystick(context, {0, +1}, 4800ms, 400ms);
+                realign_player(env.program_info(), stream, context, PlayerRealignMode::REALIGN_NO_MARKER, +0.173, +0.844, 160ms);
+                pbf_move_left_joystick(context, {0, +1}, 8000ms, 400ms);
+                realign_player(env.program_info(), stream, context, PlayerRealignMode::REALIGN_NO_MARKER, +0.252, +0.844, 160ms);
+                walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_ONLY, 60000ms, 0, +1);                
+            }
+        );  
+
+        env.console.log("clear_dialog: Talk to Nemona yelling down, while you're down in the cave.");
+        clear_dialog(env.console, context, ClearDialogMode::STOP_TIMEOUT, 10, {CallbackEnum::PROMPT_DIALOG});
+
+        do_action_and_monitor_for_battles(env.program_info(), env.console, context,
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                // Legendary rock break
+                context.wait_for_all_requests();
+                stream.log("Rock break");
+                stream.overlay().add_log("Rock break", COLOR_WHITE);
+                pbf_move_left_joystick(context, {0, +0.844}, 3000ms, 160ms);
+                realign_player(env.program_info(), stream, context, PlayerRealignMode::REALIGN_NO_MARKER, +0.803, +0.805, 240ms);
+                pbf_move_left_joystick(context, {0, +1}, 2000ms, 5000ms);
+
+                // Houndour wave
+                context.wait_for_all_requests();
+                stream.log("Houndour wave");
+                stream.overlay().add_log("Houndour wave", COLOR_WHITE);
+                // walk to room entrance
+                realign_player(env.program_info(), stream, context, PlayerRealignMode::REALIGN_NO_MARKER, +0.173, +0.883, 240ms);
+                pbf_move_left_joystick(context, {0, +0.844}, 4000ms, 2000ms);
+
+                realign_player(env.program_info(), stream, context, PlayerRealignMode::REALIGN_NO_MARKER, +0.646, +0.883, 240ms);
+                pbf_move_left_joystick(context, {0, +0.844}, 3000ms, 2000ms);
+                pbf_move_left_joystick(context, {0, +0.844}, 2000ms, 2000ms);
+                pbf_move_left_joystick(context, {0, +0.844}, 6000ms, 2000ms);
+
+                realign_player(env.program_info(), stream, context, PlayerRealignMode::REALIGN_NO_MARKER, +0.567, +0.805, 160ms);
+                pbf_move_left_joystick(context, {0, +0.844}, 4000ms, 2000ms);
+                pbf_move_left_joystick(context, {0, +0.844}, 4000ms, 2000ms);
+
+                realign_player(env.program_info(), stream, context, PlayerRealignMode::REALIGN_NO_MARKER, +0.646, +0.805, 200ms);
+                pbf_move_left_joystick(context, {0, +0.844}, 6000ms, 20000ms);
+
+                // Houndoom encounter
+                context.wait_for_all_requests();
+                stream.log("Houndoom encounter");
+                stream.overlay().add_log("Houndoom encounter", COLOR_WHITE);
+                pbf_move_left_joystick(context, {0, +0.844}, 4000ms, 160ms);
+                realign_player(env.program_info(), stream, context, PlayerRealignMode::REALIGN_NO_MARKER, +0.921, +0.844, 160ms);
+                pbf_move_left_joystick(context, {0, +0.844}, 2000ms, 160ms);
+                realign_player(env.program_info(), stream, context, PlayerRealignMode::REALIGN_NO_MARKER, +1, +0.297, 160ms);
+                pbf_move_left_joystick(context, {0, +0.844}, 8000ms, 8000ms);
+                pbf_press_button(context, BUTTON_L, 160ms, 160ms);
+            }
+        );
+        
+        env.console.log("overworld_navigation: Go to Houndoom.");
+        walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_ONLY, 60000ms, 0, +1);
+        
+        mash_button_till_overworld(env.console, context, BUTTON_A);
+
+    
+    }, false);
+
+
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_04.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_04.h
new file mode 100644
index 0000000000..66f74d29a9
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_04.h
@@ -0,0 +1,52 @@
+/*  Autostory
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_AutoStory_Segment_04_H
+#define PokemonAutomation_PokemonSV_AutoStory_Segment_04_H
+
+#include "PokemonSV_AutoStoryTools.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+class AutoStory_Segment_04 : public AutoStory_Segment{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_segment(
+        SingleSwitchProgramEnvironment& env, 
+        ProControllerContext& context,
+        AutoStoryOptions options,
+        AutoStoryStats& stats
+    ) const override;
+};
+
+class AutoStory_Checkpoint_08 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+// start: Moved to cliff. Heard mystery cry. Standing in front of Nemona near the cliff.
+// end: Rescued Koraidon/Miraidon and escaped from the Houndoom Cave. Standing next to Koraidon/Miraidon just outside the cave exit.
+void checkpoint_08(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+);
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_05.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_05.cpp
new file mode 100644
index 0000000000..7b0d3de553
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_05.cpp
@@ -0,0 +1,158 @@
+/*  AutoStory
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Exceptions/OperationFailedException.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h"
+#include "PokemonSV_AutoStoryTools.h"
+#include "PokemonSV_AutoStory_Segment_05.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+//#include <unordered_map>
+//#include <algorithm>
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+
+
+std::string AutoStory_Segment_05::name() const{
+    return "05: First Arven Battle";
+}
+
+std::string AutoStory_Segment_05::start_text() const{
+    return "Start: Saved the Legendary. Escaped from the Houndoom cave. Standing next to Koraidon/Miraidon just outside the cave exit.";
+}
+
+std::string AutoStory_Segment_05::end_text() const{
+    return "End: Battled Arven, received Legendary's Pokeball. Talked to Nemona at roof of Lighthouse.";
+}
+
+void AutoStory_Segment_05::run_segment(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    AutoStoryOptions options,
+    AutoStoryStats& stats
+) const{
+
+    stats.m_segment++;
+    env.update_stats();
+    context.wait_for_all_requests();
+    env.console.log("Start Segment " + name(), COLOR_ORANGE);
+
+    AutoStory_Checkpoint_09().run_checkpoint(env, context, options, stats);
+    AutoStory_Checkpoint_10().run_checkpoint(env, context, options, stats);
+
+    context.wait_for_all_requests();
+    env.console.log("End Segment " + name(), COLOR_GREEN);
+
+}
+
+std::string AutoStory_Checkpoint_09::name() const{ return "009 - " + AutoStory_Segment_05().name(); }
+std::string AutoStory_Checkpoint_09::start_text() const{ return "Rescued Koraidon/Miraidon and escaped from the Houndoom Cave. Standing next to Koraidon/Miraidon just outside the cave exit.";}
+std::string AutoStory_Checkpoint_09::end_text() const{ return "Battled Arven and received Legendary's Pokeball.";}
+void AutoStory_Checkpoint_09::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_09(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+
+std::string AutoStory_Checkpoint_10::name() const{ return "010 - " + AutoStory_Segment_05().name(); }
+std::string AutoStory_Checkpoint_10::start_text() const{ return AutoStory_Checkpoint_09().end_text();}
+std::string AutoStory_Checkpoint_10::end_text() const{ return "Talked to Nemona at roof of the Lighthouse.";}
+void AutoStory_Checkpoint_10::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_10(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+
+
+void checkpoint_09(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+){
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){
+
+        context.wait_for_all_requests();
+
+        realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_NEW_MARKER, +1, +0.141, 400ms);
+        env.console.log("overworld_navigation: Go to Arven at the tower.");
+        
+        handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                overworld_navigation(env.program_info(), env.console, context, 
+                    NavigationStopCondition::STOP_DIALOG, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                    0, +1, 60, 30, true, true);
+            }, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_move_left_joystick(context, {-1, 0}, 320ms, 400ms);
+                realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+            }
+        ); 
+            
+        context.wait_for_all_requests();
+        env.console.log("Found Arven");
+        env.console.overlay().add_log("Found Arven", COLOR_WHITE);
+        // can lose battle, and story will still continue
+        mash_button_till_overworld(env.console, context, BUTTON_A);
+        context.wait_for_all_requests();
+        env.console.log("Receive legendary ball");
+        env.console.overlay().add_log("Receive legendary ball", COLOR_WHITE);
+
+    }, false);
+
+}
+
+void checkpoint_10(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+){
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){
+
+        context.wait_for_all_requests();
+        env.console.log("Lighthouse view");
+        env.console.overlay().add_log("Lighthouse view", COLOR_WHITE);
+        do_action_and_monitor_for_battles(env.program_info(), env.console, context,
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                realign_player(env.program_info(), stream, context, PlayerRealignMode::REALIGN_NEW_MARKER, +0.803, +0.141, 800ms);
+                pbf_move_left_joystick(context, {0, +1}, 6000ms, 8000ms);
+                pbf_move_left_joystick(context, {0, +1}, 4000ms, 160ms);
+            }
+        );
+        DirectionDetector direction;
+        direction.change_direction(env.program_info(), env.console, context, 5.41);
+
+        env.console.log("overworld_navigation: Go to Nemona on the lighthouse.");
+        overworld_navigation(env.program_info(), env.console, context, NavigationStopCondition::STOP_DIALOG, NavigationMovementMode::DIRECTIONAL_SPAM_A, 0, +1, 20, 20, true, true);
+
+        mash_button_till_overworld(env.console, context, BUTTON_A);
+
+    }, false);
+}
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_05.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_05.h
new file mode 100644
index 0000000000..3bbaf7cffe
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_05.h
@@ -0,0 +1,70 @@
+/*  Autostory
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_AutoStory_Segment_05_H
+#define PokemonAutomation_PokemonSV_AutoStory_Segment_05_H
+
+#include "PokemonSV_AutoStoryTools.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+class AutoStory_Segment_05 : public AutoStory_Segment{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_segment(
+        SingleSwitchProgramEnvironment& env, 
+        ProControllerContext& context,
+        AutoStoryOptions options,
+        AutoStoryStats& stats
+    ) const override;
+};
+
+class AutoStory_Checkpoint_09 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+class AutoStory_Checkpoint_10 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+// start: Rescued Koraidon/Miraidon and escaped from the Houndoom Cave. Standing next to Koraidon/Miraidon just outside the cave exit.
+// end: Battled Arven and received Legendary's Pokeball.
+void checkpoint_09(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+);
+
+// start: Battled Arven and received Legendary's Pokeball.
+// end: Talked to Nemona at roof of the Lighthouse.
+void checkpoint_10(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+);
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_06.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_06.cpp
new file mode 100644
index 0000000000..1c9aeff3ee
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_06.cpp
@@ -0,0 +1,130 @@
+/*  AutoStory
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Exceptions/OperationFailedException.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "VideoGames/PokemonSV/Inference/PokemonSV_TutorialDetector.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h"
+#include "PokemonSV_AutoStoryTools.h"
+#include "PokemonSV_AutoStory_Segment_06.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+//#include <unordered_map>
+//#include <algorithm>
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+
+
+std::string AutoStory_Segment_06::name() const{
+    return "06: Go to Los Platos";
+}
+
+std::string AutoStory_Segment_06::start_text() const{
+    return "Start: Battled Arven, received Legendary's Pokeball. Talked to Nemona at roof of Lighthouse.";
+}
+
+std::string AutoStory_Segment_06::end_text() const{
+    return "End: At Los Platos Pokecenter. Cleared Let's go tutorial.";
+}
+
+void AutoStory_Segment_06::run_segment(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    AutoStoryOptions options,
+    AutoStoryStats& stats
+) const{
+
+    stats.m_segment++;
+    env.update_stats();
+    context.wait_for_all_requests();
+    env.console.log("Start Segment " + name(), COLOR_ORANGE);
+
+    AutoStory_Checkpoint_11().run_checkpoint(env, context, options, stats);
+
+    context.wait_for_all_requests();
+    env.console.log("End Segment " + name(), COLOR_GREEN);
+
+}
+
+std::string AutoStory_Checkpoint_11::name() const{ return "011 - " + AutoStory_Segment_06().name(); }
+std::string AutoStory_Checkpoint_11::start_text() const{ return "Talked to Nemona at roof of the Lighthouse.";}
+std::string AutoStory_Checkpoint_11::end_text() const{ return "Arrived at Los Platos pokecenter. Cleared Let's go tutorial.";}
+void AutoStory_Checkpoint_11::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_11(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+
+
+void checkpoint_11(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+){
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){ 
+
+        context.wait_for_all_requests();
+        do_action_and_monitor_for_battles(env.program_info(), env.console, context,
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                realign_player(info, stream, context, PlayerRealignMode::REALIGN_NEW_MARKER, -0.219, -0.646, 800ms);
+                pbf_move_left_joystick(context, {0, +1}, 1496ms, 160ms);
+                pbf_move_left_joystick(context, {-1, 0}, 240ms, 8000ms);
+                pbf_move_left_joystick(context, {0, +1}, 1000ms, 2000ms);
+
+                realign_player(info, stream, context, PlayerRealignMode::REALIGN_NEW_MARKER, -0.219, +0.531, 1600ms);
+            }
+        );     
+
+        env.console.log("overworld_navigation: Go to Los Platos.");
+        handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                overworld_navigation(env.program_info(), env.console, context, 
+                    NavigationStopCondition::STOP_DIALOG, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                    0, +1, 75, 75, true, true);
+            }, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_move_left_joystick(context, {-1, 0}, 320ms, 400ms);
+                realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+            }
+        );
+
+        // cover for case where you fall into water. 
+        // This will clear the dialog telling you that you fell into water, 
+        // therefore preventing false positives on clear_dialog() assuming we're talking to Nemona.
+        pbf_mash_button(context, BUTTON_A, 5000ms);
+        context.wait_for_all_requests();
+        
+
+        env.console.log("clear_dialog: Talk with Nemona at Los Platos. Clear Let's go tutorial. Stop when detect overworld.");
+        clear_dialog(env.console, context, ClearDialogMode::STOP_OVERWORLD, 60, {CallbackEnum::TUTORIAL, CallbackEnum::OVERWORLD});
+
+        context.wait_for_all_requests();
+
+        env.console.log("Reached Los Platos");
+        env.console.overlay().add_log("Reached Los Platos", COLOR_WHITE);
+
+    }, false);
+
+}
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_06.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_06.h
new file mode 100644
index 0000000000..d1767528d1
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_06.h
@@ -0,0 +1,52 @@
+/*  Autostory
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_AutoStory_Segment_06_H
+#define PokemonAutomation_PokemonSV_AutoStory_Segment_06_H
+
+#include "PokemonSV_AutoStoryTools.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+class AutoStory_Segment_06 : public AutoStory_Segment{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_segment(
+        SingleSwitchProgramEnvironment& env, 
+        ProControllerContext& context,
+        AutoStoryOptions options,
+        AutoStoryStats& stats
+    ) const override;
+};
+
+class AutoStory_Checkpoint_11 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+
+// start: Talked to Nemona at roof of the Lighthouse.
+// end: Arrived at Los Platos pokecenter. Cleared Let's go tutorial.
+void checkpoint_11(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+);
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_07.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_07.cpp
new file mode 100644
index 0000000000..b887ba7264
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_07.cpp
@@ -0,0 +1,128 @@
+/*  AutoStory
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Exceptions/OperationFailedException.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h"
+#include "PokemonSV_AutoStoryTools.h"
+#include "PokemonSV_AutoStory_Segment_07.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+//#include <unordered_map>
+//#include <algorithm>
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+
+std::string AutoStory_Segment_07::name() const{
+    return "07: Go to Mesagoza South";
+}
+
+std::string AutoStory_Segment_07::start_text() const{
+    return "Start: At Los Platos Pokecenter. Cleared Let's go tutorial.";
+}
+
+std::string AutoStory_Segment_07::end_text() const{
+    return "End: At Mesagoza South Pokecenter.";
+}
+
+void AutoStory_Segment_07::run_segment(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    AutoStoryOptions options,
+    AutoStoryStats& stats
+) const{
+    
+
+    stats.m_segment++;
+    env.update_stats();
+    context.wait_for_all_requests();
+    env.console.log("Start Segment " + name(), COLOR_ORANGE);
+
+    AutoStory_Checkpoint_12().run_checkpoint(env, context, options, stats);
+
+    context.wait_for_all_requests();
+    env.console.log("End Segment " + name(), COLOR_GREEN);
+
+}
+
+std::string AutoStory_Checkpoint_12::name() const{ return "012 - " + AutoStory_Segment_07().name(); }
+std::string AutoStory_Checkpoint_12::start_text() const{ return "Arrived at Los Platos pokecenter. Cleared Let's go tutorial.";}
+std::string AutoStory_Checkpoint_12::end_text() const{ return "Arrived at Mesagoza (South) Pokecenter.";}
+void AutoStory_Checkpoint_12::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_12(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+
+
+void checkpoint_12(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+){
+    // reset rate: ~25%. 12 resets out of 52. 
+    // resets due to: getting attacked by wild pokemon, either from behind, 
+    // or when lead pokemon not strong enough to clear them with Let's go
+    
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){
+
+        fly_to_overlapping_flypoint(env.program_info(), env.console, context);
+        context.wait_for_all_requests();
+
+        // re-orient camera
+        pbf_press_button(context, BUTTON_L, 160ms, 160ms);
+        do_action_and_monitor_for_battles(env.program_info(), env.console, context,
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                walk_forward_while_clear_front_path(env.program_info(), env.console, context, 280ms);
+
+                // place the marker elsewhere
+                realign_player(info, env.console, context, PlayerRealignMode::REALIGN_NEW_MARKER, +1, 0, 400ms);
+
+                DirectionDetector direction;
+                direction.change_direction(info, env.console, context, 0);
+                walk_forward_while_clear_front_path(info, env.console, context, 26400ms, +1, 1000ms, 1000ms);
+
+                // check we're not still at the Los Platos Pokecenter.
+                confirm_no_overlapping_flypoint(info, env.console, context);
+                // not stuck at Los Platos Pokecenter
+                pbf_press_button(context, BUTTON_B, 160ms, 1000ms);
+                pbf_press_button(context, BUTTON_B, 160ms, 1000ms);
+                press_Bs_to_back_to_overworld(info, env.console, context, 7);
+
+                direction.change_direction(info, env.console, context, 0.29);
+                walk_forward_while_clear_front_path(info, env.console, context, 9600ms, +1, 1000ms, 1000ms);
+                direction.change_direction(info, env.console, context, 0.61);
+                walk_forward_while_clear_front_path(info, env.console, context, 9600ms, +1, 1000ms, 1000ms);
+
+                fly_to_overlapping_flypoint(info, env.console, context);
+            }
+        );
+
+        env.console.log("Reached Mesagoza (South) Pokecenter.");
+
+    }, false);
+
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_07.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_07.h
new file mode 100644
index 0000000000..68a48c1d1d
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_07.h
@@ -0,0 +1,52 @@
+/*  Autostory
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_AutoStory_Segment_07_H
+#define PokemonAutomation_PokemonSV_AutoStory_Segment_07_H
+
+#include "PokemonSV_AutoStoryTools.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+class AutoStory_Segment_07 : public AutoStory_Segment{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_segment(
+        SingleSwitchProgramEnvironment& env, 
+        ProControllerContext& context,
+        AutoStoryOptions options,
+        AutoStoryStats& stats
+    ) const override;
+};
+
+class AutoStory_Checkpoint_12 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+
+// start: Arrived at Los Platos pokecenter. Cleared Let's go tutorial.
+// end: Arrived at Mesagoza (South) Pokecenter
+void checkpoint_12(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+);
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_08.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_08.cpp
new file mode 100644
index 0000000000..cd4d46dda5
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_08.cpp
@@ -0,0 +1,217 @@
+/*  AutoStory
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Exceptions/OperationFailedException.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "VideoGames/PokemonSV/Inference/PokemonSV_TutorialDetector.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h"
+#include "PokemonSV_AutoStoryTools.h"
+#include "PokemonSV_AutoStory_Segment_08.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+//#include <unordered_map>
+//#include <algorithm>
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+
+std::string AutoStory_Segment_08::name() const{
+    return "08: Beat Team Star and arrive at School";
+}
+
+std::string AutoStory_Segment_08::start_text() const{
+    return "Start: At Mesagoza South Pokecenter.";
+}
+
+std::string AutoStory_Segment_08::end_text() const{
+    return "End: Battled Team Star. Talked to Jacq, introduced self to class, standing in middle of classroom.";
+}
+
+void AutoStory_Segment_08::run_segment(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    AutoStoryOptions options,
+    AutoStoryStats& stats
+) const{
+    
+
+    stats.m_segment++;
+    env.update_stats();
+    context.wait_for_all_requests();
+    env.console.log("Start Segment " + name(), COLOR_ORANGE);
+
+    AutoStory_Checkpoint_13().run_checkpoint(env, context, options, stats);
+    AutoStory_Checkpoint_14().run_checkpoint(env, context, options, stats);
+    AutoStory_Checkpoint_15().run_checkpoint(env, context, options, stats);
+
+    context.wait_for_all_requests();
+    env.console.log("End Segment " + name(), COLOR_GREEN);
+
+}
+
+std::string AutoStory_Checkpoint_13::name() const{ return "013 - " + AutoStory_Segment_08().name(); }
+std::string AutoStory_Checkpoint_13::start_text() const{ return "Arrived at Mesagoza (South) Pokecenter.";}
+std::string AutoStory_Checkpoint_13::end_text() const{ return "Battled Nemona at Mesagoza gate. Entered Mesagoza.";}
+void AutoStory_Checkpoint_13::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_13(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+
+
+std::string AutoStory_Checkpoint_14::name() const{ return "014 - " + AutoStory_Segment_08().name(); }
+std::string AutoStory_Checkpoint_14::start_text() const{ return AutoStory_Checkpoint_13().end_text();}
+std::string AutoStory_Checkpoint_14::end_text() const{ return "Battled Team Star at school entrance.";}
+void AutoStory_Checkpoint_14::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_14(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+
+
+std::string AutoStory_Checkpoint_15::name() const{ return "015 - " + AutoStory_Segment_08().name(); }
+std::string AutoStory_Checkpoint_15::start_text() const{ return AutoStory_Checkpoint_14().end_text();}
+std::string AutoStory_Checkpoint_15::end_text() const{ return "Talked to Jacq in classroom. Standing in classroom.";}
+void AutoStory_Checkpoint_15::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_15(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+
+
+void checkpoint_13(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+){
+    // reset rate: 0%. 0 resets out of 70.
+    
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){
+        do_action_and_monitor_for_battles(env.program_info(), env.console, context,
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){                  
+
+            fly_to_overlapping_flypoint(info, env.console, context);
+
+            context.wait_for_all_requests();
+            realign_player(info, env.console, context, PlayerRealignMode::REALIGN_NEW_MARKER, -1, +0.375, 400ms);
+            walk_forward_while_clear_front_path(info, env.console, context, 4000ms);
+            walk_forward_until_dialog(info, env.console, context, NavigationMovementMode::DIRECTIONAL_ONLY, 30000ms);
+        });
+
+        env.console.log("clear_dialog: Talk with Nemona at Mesagoza gate. Stop when detect battle.");
+        clear_dialog(env.console, context, ClearDialogMode::STOP_BATTLE, 60,
+            {CallbackEnum::PROMPT_DIALOG, CallbackEnum::DIALOG_ARROW, CallbackEnum::BATTLE});
+        
+        env.console.log("Battle with Nemona at Mesagoza gate. Stop when detect dialog.");
+        // story continues even if you lose, no need to detect wipeout
+        run_trainer_battle_press_A(env.console, context, BattleStopCondition::STOP_DIALOG);
+        
+        env.console.log("clear_dialog: Talk with Nemona within Mesagoza. Stop when detect overworld.");
+        clear_dialog(env.console, context, ClearDialogMode::STOP_OVERWORLD, 60, 
+            {CallbackEnum::OVERWORLD, CallbackEnum::PROMPT_DIALOG, CallbackEnum::WHITE_A_BUTTON});
+        
+       
+    }, false);
+
+}
+
+void checkpoint_14(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+){
+    
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){
+
+        context.wait_for_all_requests();
+        // realign diagonally to the left
+        realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_NEW_MARKER, -0.375, +1, 800ms);
+        // walk forward so you're off center
+        pbf_move_left_joystick(context, {0, +1}, 800ms, 800ms);
+        // realign going straight
+        realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_NEW_MARKER, 0, +1, 800ms);
+        // walk forward, while still off center
+        pbf_move_left_joystick(context, {0, +1}, 16000ms, 800ms);
+        // realign diagonally to the right
+        realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_NEW_MARKER, +0.394, +1, 800ms);
+        // walk forward so you're closer to the center
+        pbf_move_left_joystick(context, {0, +1}, 1200ms, 800ms);
+        // realign going straight
+        realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_NEW_MARKER, 0, +1, 800ms);
+        // walk forward until hit dialog at top of stairs
+        walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_ONLY, 60000ms);
+        // clear dialog until battle. with prompt, battle
+        env.console.log("clear_dialog: Talk with Team Star at the top of the stairs. Stop when detect battle.");
+        clear_dialog(env.console, context, ClearDialogMode::STOP_BATTLE, 60, {CallbackEnum::PROMPT_DIALOG, CallbackEnum::BATTLE, CallbackEnum::DIALOG_ARROW});
+        // run battle until dialog
+        env.console.log("Battle with Team Star grunt 1. Stop when detect dialog.");
+        run_trainer_battle_press_A(env.console, context, BattleStopCondition::STOP_DIALOG, {}, true);  // need to detect wipeouts, since you need to win, and you likely only have 1 pokemon
+        // clear dialog until battle, with prompt, white button, tutorial, battle
+        env.console.log("clear_dialog: Talk with Team Star and Nemona. Receive Tera orb. Stop when detect battle.");
+        clear_dialog(env.console, context, ClearDialogMode::STOP_BATTLE, 60, 
+            {CallbackEnum::PROMPT_DIALOG, CallbackEnum::WHITE_A_BUTTON, CallbackEnum::TUTORIAL, CallbackEnum::BATTLE, CallbackEnum::DIALOG_ARROW});
+        // run battle until dialog
+        env.console.log("Battle with Team Star grunt 2. Stop when detect dialog.");
+        run_trainer_battle_press_A(env.console, context, BattleStopCondition::STOP_DIALOG, {}, true); // need to detect wipeouts, since you need to win, and you likely only have 1 pokemon
+        // clear dialog until overworld
+        clear_dialog(env.console, context, ClearDialogMode::STOP_OVERWORLD, 60, {CallbackEnum::OVERWORLD});
+       
+    }, false);
+
+}
+
+void checkpoint_15(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+){
+    
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){
+
+        context.wait_for_all_requests();
+        // realign diagonally to the right
+        realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_NEW_MARKER, +0.394, +1, 800ms);
+        // walk forward so you're closer to the center
+        pbf_move_left_joystick(context, {0, +1}, 800ms, 800ms);
+        // realign going straight
+        realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_NEW_MARKER, 0, +1, 800ms);
+        // walk forward up stairs
+        pbf_move_left_joystick(context, {0, +1}, 8000ms, 800ms);
+        // realign going straight
+        realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+        // walk forward until hit dialog inside the school
+        walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_ONLY, 60000ms);
+
+        env.console.log("clear_dialog: Talk with Nemona, Clavell, and Jacq inside the school. Stop when detect overworld.");
+        clear_dialog(env.console, context, ClearDialogMode::STOP_OVERWORLD, 60, 
+            {CallbackEnum::PROMPT_DIALOG, CallbackEnum::OVERWORLD});
+       
+    }, false);
+
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_08.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_08.h
new file mode 100644
index 0000000000..0a3086c72f
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_08.h
@@ -0,0 +1,91 @@
+/*  Autostory
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_AutoStory_Segment_08_H
+#define PokemonAutomation_PokemonSV_AutoStory_Segment_08_H
+
+#include "PokemonSV_AutoStoryTools.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+class AutoStory_Segment_08 : public AutoStory_Segment{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_segment(
+        SingleSwitchProgramEnvironment& env, 
+        ProControllerContext& context,
+        AutoStoryOptions options,
+        AutoStoryStats& stats
+    ) const override;
+};
+
+class AutoStory_Checkpoint_13 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+class AutoStory_Checkpoint_14 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+class AutoStory_Checkpoint_15 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+// start: Arrived at Mesagoza (South) Pokecenter
+// end: Battled Nemona at Mesagoza gate. Entered Mesagoza.
+void checkpoint_13(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+);
+
+// start: Battled Nemona at Mesagoza gate. Entered Mesagoza.
+// end: Battled Team Star at school entrance.
+void checkpoint_14(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+);
+
+// start: Battled Team Star at school entrance.
+// end: Talked to Jacq in classroom. Standing in classroom.
+void checkpoint_15(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+);
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_09.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_09.cpp
new file mode 100644
index 0000000000..4041c0fcd1
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_09.cpp
@@ -0,0 +1,316 @@
+/*  AutoStory
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Exceptions/OperationFailedException.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h"
+#include "PokemonSV_AutoStoryTools.h"
+#include "PokemonSV_AutoStory_Segment_09.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+
+std::string AutoStory_Segment_09::name() const{
+    return "09: Complete tutorial";
+}
+
+std::string AutoStory_Segment_09::start_text() const{
+    return "Start: Battled Team Star. Talked to Jacq, introduced self to class, standing in middle of classroom.";
+}
+
+std::string AutoStory_Segment_09::end_text() const{
+    return "End: Finished tutorial. Acquired all 3 questlines. Got on ride for first time.";
+}
+
+void AutoStory_Segment_09::run_segment(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    AutoStoryOptions options,
+    AutoStoryStats& stats
+) const{
+    
+
+    stats.m_segment++;
+    env.update_stats();
+    context.wait_for_all_requests();
+    env.console.log("Start Segment " + name(), COLOR_ORANGE);
+
+    AutoStory_Checkpoint_16().run_checkpoint(env, context, options, stats);
+    AutoStory_Checkpoint_17().run_checkpoint(env, context, options, stats);
+    AutoStory_Checkpoint_18().run_checkpoint(env, context, options, stats);
+    AutoStory_Checkpoint_19().run_checkpoint(env, context, options, stats);
+    AutoStory_Checkpoint_20().run_checkpoint(env, context, options, stats);
+
+    context.wait_for_all_requests();
+    env.console.log("End Segment " + name(), COLOR_GREEN);
+
+}
+
+std::string AutoStory_Checkpoint_16::name() const{ return "016 - " + AutoStory_Segment_09().name(); }
+std::string AutoStory_Checkpoint_16::start_text() const{ return "Talked to Jacq in classroom. Standing in classroom.";}
+std::string AutoStory_Checkpoint_16::end_text() const{ return "Talked to Arven. Received Titan questline (Path of Legends). Talked to Cassiopeia. Standing in main hall.";}
+void AutoStory_Checkpoint_16::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_16(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+
+std::string AutoStory_Checkpoint_17::name() const{ return "017 - " + AutoStory_Segment_09().name(); }
+std::string AutoStory_Checkpoint_17::start_text() const{ return AutoStory_Checkpoint_16().end_text();}
+std::string AutoStory_Checkpoint_17::end_text() const{ return "Talked to Cassiopeia. Saw Geeta. Talked to Nemona. Received Gym/Elite Four questline (Victory Road). Standing in staff room.";}
+void AutoStory_Checkpoint_17::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_17(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+std::string AutoStory_Checkpoint_18::name() const{ return "018 - " + AutoStory_Segment_09().name(); }
+std::string AutoStory_Checkpoint_18::start_text() const{ return AutoStory_Checkpoint_17().end_text();}
+std::string AutoStory_Checkpoint_18::end_text() const{ return "Talked to Clavell and the professor.";}
+void AutoStory_Checkpoint_18::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_18(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+std::string AutoStory_Checkpoint_19::name() const{ return "019 - " + AutoStory_Segment_09().name(); }
+std::string AutoStory_Checkpoint_19::start_text() const{ return AutoStory_Checkpoint_18().end_text();}
+std::string AutoStory_Checkpoint_19::end_text() const{ return "Talked to Nemona, visited dorm, time passed.";}
+void AutoStory_Checkpoint_19::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_19(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+std::string AutoStory_Checkpoint_20::name() const{ return "020 - " + AutoStory_Segment_09().name(); }
+std::string AutoStory_Checkpoint_20::start_text() const{ return AutoStory_Checkpoint_19().end_text();}
+std::string AutoStory_Checkpoint_20::end_text() const{ return "Get on ride for first time.";}
+void AutoStory_Checkpoint_20::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_20(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+
+
+
+void checkpoint_16(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+){
+    
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){
+
+        context.wait_for_all_requests();
+
+        // walk left
+        pbf_move_left_joystick(context, {-1, 0}, 3200ms, 800ms);
+        // walk down to classroom exit.
+        pbf_move_left_joystick(context, {0, -1}, 2400ms, 800ms);
+        env.console.log("clear_dialog: Leave classroom.");
+        clear_dialog(env.console, context, ClearDialogMode::STOP_TIMEOUT, 5);
+
+        // Wait for detection of school navigation menu
+        wait_for_gradient_arrow(env.program_info(), env.console, context, {0.031, 0.193, 0.047, 0.078}, 5);
+
+        // enter Cafeteria
+        pbf_mash_button(context, BUTTON_A, 3000ms);
+        pbf_wait(context, 3000ms);
+        context.wait_for_all_requests();
+
+        // walk forward
+        pbf_move_left_joystick(context, {0, +1}, 4800ms, 800ms);
+        // turn left 
+        pbf_move_left_joystick(context, {-1, 0}, 160ms, 800ms);
+
+        // talk to Arven. stop at overworld. need prompt, overworld, white button A. and book?
+        env.console.log("Talk with Arven. Receive Titan questline (Path of Legends).");
+        press_A_until_dialog(env.program_info(), env.console, context, 1);
+        mash_button_till_overworld(env.console, context, BUTTON_A, 360);
+        
+       
+    }, false);
+
+}
+
+void checkpoint_17(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+){
+    
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){
+
+        context.wait_for_all_requests();
+
+        // walk backwards until dialog
+        walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_ONLY, 20000ms, 0, -1);
+        env.console.log("Talk with Cassiopeia.");
+        mash_button_till_overworld(env.console, context, BUTTON_A, 360);
+
+        // re-orient camera
+        pbf_press_button(context, BUTTON_L, 160ms, 800ms);
+        // move backwards towards front desk
+        pbf_move_left_joystick(context, {0, -1}, 1600ms, 800ms);
+        // re-orient camera
+        pbf_press_button(context, BUTTON_L, 160ms, 800ms);
+        // move right towards navigation kiosk
+        pbf_move_left_joystick(context, {+1, 0}, 800ms, 800ms);
+        // open school navigation screen
+        press_button_until_gradient_arrow(env.program_info(), env.console, context, {0.031, 0.193, 0.047, 0.078});
+        // go to staff room
+        navigate_school_layout_menu(env.program_info(), env.console, context, {0.031, 0.193, 0.047, 0.078},
+            {0.031, 0.193 + 0.074219, 0.047, 0.078}, DPAD_DOWN, 1);
+        // enter staff room
+        pbf_mash_button(context, BUTTON_A, 3000ms);
+        pbf_wait(context, 3000ms);
+
+        env.console.log("clear_dialog: See Geeta. Talk to Nemona. Receive Gym/Elite Four questline (Victory Road).");
+        clear_dialog(env.console, context, ClearDialogMode::STOP_OVERWORLD, 60, 
+            {CallbackEnum::OVERWORLD, CallbackEnum::PROMPT_DIALOG});
+
+        
+       
+    }, false);
+
+}
+
+void checkpoint_18(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+){
+    
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){
+
+        context.wait_for_all_requests();
+
+        // walk down
+        pbf_move_left_joystick(context, {0, -1}, 1600ms, 800ms);
+        // walk left towards door
+        pbf_move_left_joystick(context, {-1, 0}, 800ms, 800ms);
+
+        // wait for school navigation menu
+        context.wait_for_all_requests();
+        wait_for_gradient_arrow(env.program_info(), env.console, context, {0.031, 0.193, 0.047, 0.078}, 10);
+        // enter Directors office
+        pbf_mash_button(context, BUTTON_A, 6000ms);
+
+        env.console.log("Talk to Clavell in his office, and the professor.");
+        clear_dialog(env.console, context, ClearDialogMode::STOP_TIMEOUT, 25, 
+            {CallbackEnum::PROMPT_DIALOG});  // max time between dialog: 17s. set timeout to 25 seconds for buffer.
+        // mash A to get through the Random A press that you need. when the professor shows you area zero.
+        pbf_mash_button(context, BUTTON_A, 3000ms);
+
+        clear_dialog(env.console, context, ClearDialogMode::STOP_OVERWORLD, 60, 
+            {CallbackEnum::OVERWORLD, CallbackEnum::PROMPT_DIALOG});
+       
+    }, false);
+
+}
+
+void checkpoint_19(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+){
+    
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){
+
+        context.wait_for_all_requests();
+
+        // walk right 
+        pbf_move_left_joystick(context, {+1, 0}, 400ms, 800ms);
+        // walk down towards door
+        pbf_move_left_joystick(context, {0, -1}, 1600ms, 800ms);
+
+        env.console.log("Talk to Nemona and go to dorm.");
+        mash_button_till_overworld(env.console, context, BUTTON_A, 360);
+
+        // walk forward
+        pbf_move_left_joystick(context, {0, +1}, 800ms, 800ms);
+        // walk left towards bed
+        pbf_move_left_joystick(context, {-1, 0}, 800ms, 800ms);
+
+        env.console.log("Go to bed. Time passes until treasure hunt.");
+        mash_button_till_overworld(env.console, context, BUTTON_A, 360);
+
+       
+    }, false);
+
+}
+
+
+void checkpoint_20(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+){
+    
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){
+
+        context.wait_for_all_requests();
+       
+        //walk right towards door
+        pbf_move_left_joystick(context, {+1, 0}, 1600ms, 800ms);
+
+        wait_for_gradient_arrow(env.program_info(), env.console, context, {0.031, 0.193, 0.047, 0.078}, 10);
+
+        env.console.log("Leave dorm for schoolyard.");
+        mash_button_till_overworld(env.console, context, BUTTON_A, 360);
+
+        walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_ONLY, 60000ms, 0, +1);
+
+        env.console.log("Talk to Nemona, Arven, Cassiopeia.");
+        clear_dialog(env.console, context, ClearDialogMode::STOP_TIMEOUT, 16, 
+            {CallbackEnum::PROMPT_DIALOG, CallbackEnum::BLACK_DIALOG_BOX}); // max time between dialog: 11
+        
+        // mash A to get through the Random A press that you need. when the Nemona shows you a Poke Gym.
+        pbf_mash_button(context, BUTTON_A, 2000ms);
+
+        clear_dialog(env.console, context, ClearDialogMode::STOP_TUTORIAL, 20, 
+            {CallbackEnum::TUTORIAL, CallbackEnum::PROMPT_DIALOG, CallbackEnum::BLACK_DIALOG_BOX});
+
+        clear_dialog(env.console, context, ClearDialogMode::STOP_TIMEOUT, 10, 
+            {CallbackEnum::TUTORIAL}); // max time between dialog: 3
+        
+        env.console.log("Get on ride.");
+        pbf_mash_button(context, BUTTON_PLUS, 1000ms);
+
+        mash_button_till_overworld(env.console, context, BUTTON_A, 360);
+
+    }, false);
+
+}
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_09.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_09.h
new file mode 100644
index 0000000000..986c701e0a
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_09.h
@@ -0,0 +1,130 @@
+/*  Autostory
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_AutoStory_Segment_09_H
+#define PokemonAutomation_PokemonSV_AutoStory_Segment_09_H
+
+#include "PokemonSV_AutoStoryTools.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+class AutoStory_Segment_09 : public AutoStory_Segment{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_segment(
+        SingleSwitchProgramEnvironment& env, 
+        ProControllerContext& context,
+        AutoStoryOptions options,
+        AutoStoryStats& stats
+    ) const override;
+};
+
+class AutoStory_Checkpoint_16 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+class AutoStory_Checkpoint_17 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+class AutoStory_Checkpoint_18 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+class AutoStory_Checkpoint_19 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+class AutoStory_Checkpoint_20 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+
+
+// start: Talked to Jacq in classroom. Standing in classroom.
+// end: Talked to Arven. Received Titan questline (Path of Legends). Talked to Cassiopeia. Standing in main hall.
+void checkpoint_16(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+);
+
+// start: Talked to Arven. Received Titan questline (Path of Legends).
+// end: Talked to Cassiopeia. Saw Geeta. Talked to Nemona. Received Gym/Elite Four questline (Victory Road). Standing in staff room.
+void checkpoint_17(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+);
+
+// start: Talked to Cassiopeia. Saw Geeta. Talked to Nemona. Received Gym/Elite Four questline (Victory Road). Standing in staff room.
+// end: Talked to Clavell and the professor.
+void checkpoint_18(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+);
+
+// start: Talked to Clavell and the professor.
+// end: Talked to Nemona, visited dorm, time passed.
+void checkpoint_19(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+);
+
+// start: Talked to Nemona, visited dorm, time passed.
+// end: Get on ride for first time.
+void checkpoint_20(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+);
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_10.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_10.cpp
new file mode 100644
index 0000000000..9502a89576
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_10.cpp
@@ -0,0 +1,321 @@
+/*  AutoStory
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "CommonTools/VisualDetectors/BlackScreenDetector.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "VideoGames/PokemonSV/Inference/PokemonSV_TutorialDetector.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h"
+#include "PokemonSV_AutoStoryTools.h"
+#include "PokemonSV_AutoStory_Segment_10.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+//#include <unordered_map>
+//#include <algorithm>
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+
+std::string AutoStory_Segment_10::name() const{
+    return "10: Cortondo Gym (Bug): Go to Cortondo city";
+}
+
+std::string AutoStory_Segment_10::start_text() const{
+    return "Start: After the break, with level 100 Gardevoir. At Mesagoza West pokecenter.";
+}
+
+std::string AutoStory_Segment_10::end_text() const{
+    return "End: At Cortondo East Pokecenter.";
+}
+
+void AutoStory_Segment_10::run_segment(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    AutoStoryOptions options,
+    AutoStoryStats& stats
+) const{
+    
+
+    stats.m_segment++;
+    env.update_stats();
+    context.wait_for_all_requests();
+    env.console.log("Start Segment " + name(), COLOR_ORANGE);
+
+    AutoStory_Checkpoint_21().run_checkpoint(env, context, options, stats);
+    AutoStory_Checkpoint_22().run_checkpoint(env, context, options, stats);
+    AutoStory_Checkpoint_23().run_checkpoint(env, context, options, stats);
+
+    context.wait_for_all_requests();
+    env.console.log("End Segment " + name(), COLOR_GREEN);
+
+}
+
+std::string AutoStory_Checkpoint_21::name() const{ return "021 - " + AutoStory_Segment_10().name(); }
+std::string AutoStory_Checkpoint_21::start_text() const{ return "After the break, with level 100 Gardevoir. At Mesagoza West pokecenter.";}
+std::string AutoStory_Checkpoint_21::end_text() const{ return "At Mesagoza West gate flypoint.";}
+void AutoStory_Checkpoint_21::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_21(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+std::string AutoStory_Checkpoint_22::name() const{ return "022 - " + AutoStory_Segment_10().name(); }
+std::string AutoStory_Checkpoint_22::start_text() const{ return AutoStory_Checkpoint_21().end_text();}
+std::string AutoStory_Checkpoint_22::end_text() const{ return "At South Province Area Two Pokecenter.";}
+void AutoStory_Checkpoint_22::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_22(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+std::string AutoStory_Checkpoint_23::name() const{ return "023 - " + AutoStory_Segment_10().name(); }
+std::string AutoStory_Checkpoint_23::start_text() const{ return AutoStory_Checkpoint_22().end_text();}
+std::string AutoStory_Checkpoint_23::end_text() const{ return "At Cortondo East Pokecenter";}
+void AutoStory_Checkpoint_23::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_23(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+
+
+void checkpoint_21(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+){
+    
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){         
+        fly_to_overlapping_flypoint(env.program_info(), env.console, context);
+
+        context.wait_for_all_requests();
+        pbf_press_button(context, BUTTON_L, 160ms, 160ms);
+        // move forward
+        pbf_move_left_joystick(context, {0, +1}, 240ms, 800ms);
+        // get on ride
+        get_on_ride(env.program_info(), env.console, context);
+        // turn left
+        realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_NO_MARKER, -1, 0, 400ms);
+        // move forward
+        pbf_move_left_joystick(context, {0, +1}, 800ms, 800ms);
+
+        realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_NEW_MARKER, -1, -0.567, 560ms);
+        pbf_move_left_joystick(context, {0, +1}, 3200ms, 800ms);
+
+        realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_NEW_MARKER, -1, 0, 560ms);
+        pbf_move_left_joystick(context, {0, +1}, 5600ms, 800ms);
+
+        // turn towards wall
+        realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_NEW_MARKER, 0, +1, 400ms);
+        pbf_move_left_joystick(context, {0, +1}, 1600ms, 800ms);
+        // run and jump over wall
+        pbf_controller_state(context, BUTTON_B, DPAD_NONE, {0, +1}, {0, 0}, 800ms);
+
+        BlackScreenOverWatcher black_screen(COLOR_RED, { 0.2, 0.2, 0.6, 0.6 });
+        int ret = wait_until(
+            env.console, context,
+            std::chrono::seconds(30),
+            { black_screen }
+        );
+        if (ret < 0){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "checkpoint_21(): Failed to jump the East Mesagoza wall.",
+                env.console
+            );
+        }
+        context.wait_for_all_requests();
+        fly_to_overlapping_flypoint(env.program_info(), env.console, context);
+       
+    });
+
+}
+
+void checkpoint_22(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+){
+    
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){         
+        context.wait_for_all_requests();
+
+        // the landmark Pokecenter is far enough away from current location, that the map Pokemon don't cover it.
+        // Mesagoza West Gate flypoint vs South Province (Area Two) Pokecenter
+        // minimap Pokemon are refreshed after first marker
+
+        // section 1
+        realign_player_from_landmark(
+            env.program_info(), env.console, context,
+            {ZoomChange::ZOOM_IN, -1, 0, 640ms},
+            {ZoomChange::KEEP_ZOOM, +1, +0.375, 296ms}
+        );
+        overworld_navigation(env.program_info(), env.console, context, 
+            NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+            0, +1, 40, 20);
+
+        // section 2
+        realign_player_from_landmark(
+            env.program_info(), env.console, context,
+            {ZoomChange::ZOOM_IN, -1, 0, 320ms},
+            {ZoomChange::KEEP_ZOOM, +1, -1, 216ms}
+        );        
+        overworld_navigation(env.program_info(), env.console, context, 
+            NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+            0, +1, 30, 15);
+        
+        // section 3. set marker to pokecenter
+        realign_player_from_landmark(
+            env.program_info(), env.console, context,
+            {ZoomChange::ZOOM_IN, 0, 0, 0ms},
+            {ZoomChange::KEEP_ZOOM, 0, 0, 0ms}
+        );         
+        overworld_navigation(env.program_info(), env.console, context, 
+            NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+            0, +1, 30, 15);
+
+        // section 3. set marker past pokecenter
+        handle_unexpected_battles(env.program_info(), env.console, context,
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_NEW_MARKER, -1, +0.453, 240ms);
+        });            
+        overworld_navigation(env.program_info(), env.console, context, 
+            NavigationStopCondition::STOP_TIME, NavigationMovementMode::DIRECTIONAL_ONLY, 
+            0, +0.844, 12, 12);        
+
+        fly_to_overlapping_flypoint(env.program_info(), env.console, context);
+       
+    });
+
+}
+
+
+
+void checkpoint_23(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+){
+    
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){         
+        context.wait_for_all_requests();
+
+        // the landmark Pokecenter is far enough away from startpoint, that the map Pokemon don't cover it.
+
+        // section 1
+        realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_NEW_MARKER, -0.141, +1, 240ms);
+
+        overworld_navigation(env.program_info(), env.console, context, 
+            NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY,
+            0, +1, 20, 10);
+
+        // section 2
+        realign_player_from_landmark(
+            env.program_info(), env.console, context,
+            {ZoomChange::ZOOM_IN, -1, 0, 640ms},
+            {ZoomChange::KEEP_ZOOM, +1, +0.258, 800ms}
+        );         
+        handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                overworld_navigation(env.program_info(), env.console, context, 
+                    NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                    0, +1, 20, 10);
+            }, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_move_left_joystick(context, {+1, 0}, 320ms, 400ms);
+                realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+            }
+        );                
+
+        // section 3
+        realign_player_from_landmark(
+            env.program_info(), env.console, context,
+            {ZoomChange::ZOOM_IN, -1, 0, 640ms},
+            {ZoomChange::KEEP_ZOOM, +1, +0.414, 520ms}
+        );              
+        handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                overworld_navigation(env.program_info(), env.console, context, 
+                    NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                    0, +1, 20, 10);
+            }, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_move_left_joystick(context, {+1, 0}, 320ms, 400ms);
+                realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+            }
+        );                     
+
+        // section 4
+        realign_player_from_landmark(
+            env.program_info(), env.console, context,
+            {ZoomChange::ZOOM_IN, -1, 0, 400ms},
+            {ZoomChange::KEEP_ZOOM, +1, -0.409, 136ms}
+        );              
+        handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                overworld_navigation(env.program_info(), env.console, context, 
+                    NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                    0, +1, 40, 10);
+            }, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_move_left_joystick(context, {+1, 0}, 320ms, 400ms);
+                realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+            }
+        );                
+
+        // section 5. set marker to pokecenter
+        realign_player_from_landmark(
+            env.program_info(), env.console, context,
+            {ZoomChange::ZOOM_IN, 0, 0, 0ms},
+            {ZoomChange::KEEP_ZOOM, 0, 0, 0ms}
+        );              
+        handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                overworld_navigation(env.program_info(), env.console, context, 
+                    NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                    0, +1, 20, 10);
+            }, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_move_left_joystick(context, {+1, 0}, 320ms, 400ms);
+                realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+            }
+        );                
+
+        // section 6. set marker past pokecenter
+        handle_unexpected_battles(env.program_info(), env.console, context,
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_NEW_MARKER, -1, +0.141, 400ms);
+        });   
+        overworld_navigation(env.program_info(), env.console, context, 
+            NavigationStopCondition::STOP_TIME, NavigationMovementMode::DIRECTIONAL_ONLY, 
+            0, +0.883, 12, 12);   
+
+        fly_to_overlapping_flypoint(env.program_info(), env.console, context);             
+       
+    });
+
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_10.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_10.h
new file mode 100644
index 0000000000..8435ecf939
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_10.h
@@ -0,0 +1,93 @@
+/*  Autostory
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_AutoStory_Segment_10_H
+#define PokemonAutomation_PokemonSV_AutoStory_Segment_10_H
+
+#include "PokemonSV_AutoStoryTools.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+class AutoStory_Segment_10 : public AutoStory_Segment{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_segment(
+        SingleSwitchProgramEnvironment& env, 
+        ProControllerContext& context,
+        AutoStoryOptions options,
+        AutoStoryStats& stats
+    ) const override;
+};
+
+class AutoStory_Checkpoint_21 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+class AutoStory_Checkpoint_22 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+class AutoStory_Checkpoint_23 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+
+
+
+// start: After the break, with level 100 Gardevoir. At Mesagoza West pokecenter.
+// end: At Mesagoza West gate flypoint
+void checkpoint_21(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+);
+
+// start: At Mesagoza West gate flypoint
+// end: At South Province Area Two Pokecenter.
+void checkpoint_22(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+);
+
+// start: At South Province Area Two Pokecenter.
+// end: At Cortondo East Pokecenter
+void checkpoint_23(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+);
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_11.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_11.cpp
new file mode 100644
index 0000000000..a45110d124
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_11.cpp
@@ -0,0 +1,640 @@
+/*  AutoStory
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/NintendoSwitch_Settings.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "NintendoSwitch/Programs/DateSpam/NintendoSwitch_HomeToDateTime.h"
+#include "NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManip.h"
+#include "VideoGames/PokemonSV/PokemonSV_Settings.h"
+#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h"
+#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OliveDetector.h"
+#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_NoMinimapDetector.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h"
+#include "PokemonSV_OliveActionFailedException.h"
+#include "PokemonSV_AutoStoryTools.h"
+#include "PokemonSV_AutoStory_Segment_11.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+//#include <unordered_map>
+//#include <algorithm>
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+
+
+std::string AutoStory_Segment_11::name() const{
+    return "11: Cortondo Gym (Bug): Gym challenge";
+}
+
+std::string AutoStory_Segment_11::start_text() const{
+    return "Start: At Cortondo East Pokecenter.";
+}
+
+std::string AutoStory_Segment_11::end_text() const{
+    return "End: Beat Cortondo Gym challenge. At Cortondo East Pokecenter.";
+}
+
+void AutoStory_Segment_11::run_segment(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    AutoStoryOptions options,
+    AutoStoryStats& stats
+) const{
+    
+
+    stats.m_segment++;
+    env.update_stats();
+    context.wait_for_all_requests();
+    env.console.log("Start Segment " + name(), COLOR_ORANGE);
+
+    AutoStory_Checkpoint_24().run_checkpoint(env, context, options, stats);
+    AutoStory_Checkpoint_25().run_checkpoint(env, context, options, stats);
+    AutoStory_Checkpoint_26().run_checkpoint(env, context, options, stats);
+    AutoStory_Checkpoint_27().run_checkpoint(env, context, options, stats);
+
+
+    context.wait_for_all_requests();
+    env.console.log("End Segment " + name(), COLOR_GREEN);
+
+}
+
+std::string AutoStory_Checkpoint_24::name() const{ return "024 - " + AutoStory_Segment_11().name(); }
+std::string AutoStory_Checkpoint_24::start_text() const{ return "At Cortondo East Pokecenter";}
+std::string AutoStory_Checkpoint_24::end_text() const{ return "Spoke to Cortondo Gym reception. At Cortondo West Pokecenter.";}
+void AutoStory_Checkpoint_24::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_24(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+std::string AutoStory_Checkpoint_25::name() const{ return "025 - " + AutoStory_Segment_11().name(); }
+std::string AutoStory_Checkpoint_25::start_text() const{ return AutoStory_Checkpoint_24().end_text();}
+std::string AutoStory_Checkpoint_25::end_text() const{ return "Defeated the trainers at Olive Roll, but left Olive unmoved. Then backed out, standing in front of the Olive Roll NPC.";}
+void AutoStory_Checkpoint_25::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_25(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+std::string AutoStory_Checkpoint_26::name() const{ return "026 - " + AutoStory_Segment_11().name(); }
+std::string AutoStory_Checkpoint_26::start_text() const{ return AutoStory_Checkpoint_25().end_text();}
+std::string AutoStory_Checkpoint_26::end_text() const{ return "Completed Olive roll gym challenge.";}
+void AutoStory_Checkpoint_26::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_26(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+std::string AutoStory_Checkpoint_27::name() const{ return "027 - " + AutoStory_Segment_11().name(); }
+std::string AutoStory_Checkpoint_27::start_text() const{ return AutoStory_Checkpoint_26().end_text();}
+std::string AutoStory_Checkpoint_27::end_text() const{ return "At Cortondo East Pokecenter.";}
+void AutoStory_Checkpoint_27::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_27(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+
+
+void checkpoint_24(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+){
+    
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){         
+        context.wait_for_all_requests();
+        DirectionDetector direction;
+        if (attempt_number > 0 || ENABLE_TEST){
+            env.console.log("Fly to neighbouring Pokecenter, then fly back, to clear any pokemon covering the minimap.");
+            move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::KEEP_ZOOM, -1, +1, 0ms});
+            move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::KEEP_ZOOM, -1, +1, 0ms});
+        }
+
+        do_action_and_monitor_for_battles(env.program_info(), env.console, context,
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                direction.change_direction(env.program_info(), env.console, context, 2.71);
+                pbf_move_left_joystick(context, {0, +1}, 3000ms, 800ms);
+                direction.change_direction(env.program_info(), env.console, context, 1.26);
+                pbf_move_left_joystick(context, {0, +1}, 14000ms, 800ms);
+        });        
+       
+        direction.change_direction(env.program_info(), env.console, context, 2.73);
+        pbf_move_left_joystick(context, {0, +1}, 1600ms, 800ms);
+        pbf_wait(context, 5000ms);
+        context.wait_for_all_requests();
+        handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_ONLY, 20000ms);
+            }, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_move_left_joystick(context, {-1, +1}, 800ms, 160ms);
+            },
+            5, 5
+        ); 
+        // enter gym building. talk go Nemona
+        mash_button_till_overworld(env.console, context, BUTTON_A, 360);
+        // talk to receptionist
+        walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_SPAM_A, 10000ms);
+        clear_dialog(env.console, context, ClearDialogMode::STOP_OVERWORLD, 60, {CallbackEnum::OVERWORLD});
+
+        pbf_move_left_joystick(context, {0, -1}, 2400ms, 800ms);
+        pbf_wait(context, 3000ms);
+        // wait for overworld after leaving gym
+        wait_for_overworld(env.program_info(), env.console, context, 30);
+
+        pbf_move_left_joystick(context, {0, +1}, 3600ms, 800ms);
+        direction.change_direction(env.program_info(), env.console, context, 1.26);
+        pbf_move_left_joystick(context, {0, +1}, 12800ms, 800ms);
+        fly_to_overlapping_flypoint(env.program_info(), env.console, context);
+        
+
+    });
+
+}
+
+
+void checkpoint_25(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+){
+    
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){         
+        context.wait_for_all_requests();
+
+        // section 1. align to Olive roll NPC
+        realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_NEW_MARKER, +0.228, +1, 320ms);
+        overworld_navigation(env.program_info(), env.console, context, 
+            NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+            0, +1, 40, 10);
+        
+        // section 1.1. keep walking forward and talk to Olive roll NPC
+        do_action_and_monitor_for_battles(env.program_info(), env.console, context,
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_SPAM_A, 10000ms);
+            }
+        );     
+        mash_button_till_overworld(env.console, context, BUTTON_A);
+
+        context.wait_for_all_requests();
+
+        // section 2
+        pbf_move_left_joystick(context, {0, +1}, 10400ms, 800ms);
+
+        // section 3
+        DirectionDetector direction;
+        // we just hope the minimap Direction isn't covered
+
+        direction.change_direction(env.program_info(), env.console, context, 6.0);
+        pbf_move_left_joystick(context, {0, +1}, 5600ms, 800ms);
+
+        // section 4. align to corner
+        direction.change_direction(env.program_info(), env.console, context,  4.69);
+        pbf_move_left_joystick(context, {0, +1}, 1200ms, 800ms);
+
+        // section 5. battle first NPC
+        direction.change_direction(env.program_info(), env.console, context,  1.485);
+        walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_SPAM_A, 10000ms, 0, +0.844);
+        clear_dialog(env.console, context, ClearDialogMode::STOP_BATTLE, 60, {CallbackEnum::BATTLE, CallbackEnum::DIALOG_ARROW});
+        env.console.log("Battle Olive Roll NPC 1.");
+        run_trainer_battle_press_A(env.console, context, BattleStopCondition::STOP_DIALOG);
+        mash_button_till_overworld(env.console, context, BUTTON_A);
+
+        // section 6
+        direction.change_direction(env.program_info(), env.console, context, 5.95);
+        pbf_move_left_joystick(context, {0, +1}, 8000ms, 800ms);
+
+        // section 7
+        direction.change_direction(env.program_info(), env.console, context,  1.327);
+        pbf_move_left_joystick(context, {0, +1}, 5600ms, 800ms);
+
+        // section 8
+        direction.change_direction(env.program_info(), env.console, context,  6.106);
+        pbf_move_left_joystick(context, {0, +1}, 1600ms, 800ms);
+
+        // section 9. battle second NPC
+        direction.change_direction(env.program_info(), env.console, context,  4.275);
+        walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_SPAM_A, 10000ms, 0, +0.844);
+        clear_dialog(env.console, context, ClearDialogMode::STOP_BATTLE, 60, {CallbackEnum::BATTLE, CallbackEnum::DIALOG_ARROW});
+        env.console.log("Battle Olive Roll NPC 2.");
+        run_trainer_battle_press_A(env.console, context, BattleStopCondition::STOP_DIALOG);
+        mash_button_till_overworld(env.console, context, BUTTON_A);
+
+        // section 10. leave Olive roll
+        pbf_mash_button(context, BUTTON_Y, 800ms);
+        clear_dialog(env.console, context, ClearDialogMode::STOP_PROMPT, 60, {CallbackEnum::PROMPT_DIALOG});
+        clear_dialog(env.console, context, ClearDialogMode::STOP_TIMEOUT, 15, {CallbackEnum::PROMPT_DIALOG});
+        wait_for_overworld(env.program_info(), env.console, context);
+        enter_menu_from_overworld(env.program_info(), env.console, context, -1);
+
+    });
+
+}
+
+void checkpoint_26(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+){
+    
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){         
+        context.wait_for_all_requests();
+
+        // change the time of day: close game, change time to 5:45 am.
+        pbf_press_button(context, BUTTON_HOME, 160ms, GameSettings::instance().GAME_TO_HOME_DELAY1);
+        change_date(env, context, {2025, 1, 1, 5, 45, 0});
+        reset_game_from_home(env.program_info(), env.console, context);
+
+        // talk to Olive roll NPC
+        walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_SPAM_A, 10000ms, 0, +0.844);
+        mash_button_till_overworld(env.console, context, BUTTON_A);
+
+        // section 1
+        pbf_move_left_joystick(context, {0, +1}, 3200ms, 400ms);
+        OliveDetector green(env.console);
+        size_t MAX_ATTEMPTS_SECTION_1 = 2;
+        Milliseconds duration_to_walk_for_section1 = 5200ms;
+        Milliseconds push_strength_section_1 = 600ms;
+        for (size_t i = 0; i < MAX_ATTEMPTS_SECTION_1; i++){
+            try{
+                green.push_olive_forward(env.program_info(), env.console, context, 4.38, duration_to_walk_for_section1, push_strength_section_1);
+                // green.align_to_olive(env.program_info(), env.console, context, 4.38);
+                green.walk_up_to_olive(env.program_info(), env.console, context, 4.38);
+                break;
+            }catch (OliveActionFailedException& e){
+                if (e.m_fail_reason == OliveFail::OLIVE_STUCK){
+                    // if olive is stuck, we might have pushed the olive all the way to the end. so we can try moving on.
+                    break;
+                }
+
+                if (i >= MAX_ATTEMPTS_SECTION_1-1){
+                    throw;
+                }                
+                if (e.m_fail_reason == OliveFail::NO_OLIVE_DETECTED || e.m_fail_reason == OliveFail::FAILED_WALK_TO_OLIVE){
+                    // may have walked past olive
+                    pbf_move_left_joystick(context, {0, -1}, 1600ms, 400ms);
+                    pbf_wait(context, 5000ms);
+                    context.wait_for_all_requests();
+                    duration_to_walk_for_section1 = 800ms;
+                    push_strength_section_1 = 400ms;
+                }else{ // FAILED_PUSH_OLIVE_TOTAL_DISTANCE
+                    throw;
+                }
+
+            }
+        }        
+
+
+        // section 1b. realign using fence corner
+        DirectionDetector direction;
+        // we just hope the minimap Direction isn't covered
+
+        direction.change_direction(env.program_info(), env.console, context,  2.74);
+        pbf_move_left_joystick(context, {0, +1}, 1600ms, 400ms);
+        direction.change_direction(env.program_info(), env.console, context,  4.328);
+        pbf_move_left_joystick(context, {0, +1}, 1600ms, 400ms);
+        direction.change_direction(env.program_info(), env.console, context,  1.22);
+        pbf_move_left_joystick(context, {0, +1}, 600ms, 400ms);
+
+        // section 2.1 nudge olive straight
+        size_t MAX_ATTEMPTS_SECTION_2_1 = 2;
+        for (size_t i = 0; i < MAX_ATTEMPTS_SECTION_2_1; i++){
+            try{
+                green.push_olive_forward(env.program_info(), env.console, context, 5.95, 400ms, 400ms);
+                break;
+            }catch (OliveActionFailedException& e){
+                if (i >= MAX_ATTEMPTS_SECTION_2_1-1){
+                    throw;
+                }
+
+                if (e.m_fail_reason == OliveFail::NO_OLIVE_DETECTED){
+                    pbf_move_left_joystick(context, {0, -1}, 2000ms, 400ms);
+                    pbf_move_left_joystick(context, {0, +1}, 400ms, 400ms);  // move forward slight in case the olive is undetectable since it's right in front of the character
+                    pbf_wait(context, 5000ms);
+                    context.wait_for_all_requests();
+                }else if (e.m_fail_reason == OliveFail::FAILED_WALK_TO_OLIVE || e.m_fail_reason == OliveFail::OLIVE_STUCK){
+                    // try moving back and then ramming forward
+                    pbf_move_left_joystick(context, {0, -1}, 400ms, 400ms);
+                    pbf_move_left_joystick(context, {0, +1}, 1200ms, 400ms);
+                    pbf_wait(context, 7000ms);
+                    context.wait_for_all_requests();
+                    break; // then move on to next section
+                }else{ // FAILED_PUSH_OLIVE_TOTAL_DISTANCE, 
+                    throw;
+                }                
+                
+            }
+        }
+
+        pbf_move_left_joystick(context, {0, -1}, 800ms, 400ms);
+        green.align_to_olive(env.program_info(), env.console, context, 5.95);
+        pbf_move_left_joystick(context, {0, -1}, 4000ms, 400ms);
+
+        // section 2.2 push at angle towards outer fence
+        size_t MAX_ATTEMPTS_SECTION_2_2 = 2;
+        // uint16_t ticks_walked_section2_2 = 0;
+        for (size_t i = 0; i < MAX_ATTEMPTS_SECTION_2_2; i++){
+            try{
+                green.push_olive_forward(env.program_info(), env.console, context, 5.8, 2000ms, 400ms);
+                break;
+            }catch (OliveActionFailedException& e){
+                if (i >= MAX_ATTEMPTS_SECTION_2_2-1){
+                    throw;
+                }
+
+                if (e.m_fail_reason == OliveFail::OLIVE_STUCK){  // olive possibly stuck on fence
+                    pbf_move_left_joystick(context, {0, -1}, 160ms, 400ms);
+                    pbf_move_left_joystick(context, {-1, 0}, 800ms, 400ms);
+                    pbf_move_left_joystick(context, {0, +1}, 1600ms, 400ms);
+                    // push olive parallel to fence
+                    green.align_to_olive(env.program_info(), env.console, context, 4.28, 20);
+                    green.walk_up_to_olive(env.program_info(), env.console, context, 4.28);
+                    green.push_olive_forward(env.program_info(), env.console, context, 4.28, 800ms);
+                    green.align_to_olive(env.program_info(), env.console, context, 4.28, 20);
+                    green.walk_up_to_olive(env.program_info(), env.console, context, 4.28);
+                    // back off
+                    pbf_move_left_joystick(context, {0, -1}, 400ms, 400ms);
+                    // realign using fence corner
+                    direction.change_direction(env.program_info(), env.console, context,  2.74);
+                    pbf_move_left_joystick(context, {0, +1}, 3200ms, 400ms);
+                    direction.change_direction(env.program_info(), env.console, context,  4.328);
+                    pbf_move_left_joystick(context, {0, +1}, 3200ms, 400ms);
+                    direction.change_direction(env.program_info(), env.console, context,  1.22);
+                    pbf_move_left_joystick(context, {0, +1}, 800ms, 400ms);
+                }else if (e.m_fail_reason == OliveFail::NO_OLIVE_DETECTED){
+                    pbf_move_left_joystick(context, {0, -1}, 1600ms, 400ms);
+                    pbf_wait(context, 5000ms);
+                    context.wait_for_all_requests();                    
+
+                }else if (e.m_fail_reason == OliveFail::FAILED_WALK_TO_OLIVE){
+                    // try moving back and then ramming forward
+                    pbf_move_left_joystick(context, {0, -1}, 400ms, 400ms);
+                    pbf_move_left_joystick(context, {0, +1}, 1200ms, 400ms);
+                    pbf_wait(context, 7000ms);
+                    context.wait_for_all_requests();
+                }else{ // FAILED_PUSH_OLIVE_TOTAL_DISTANCE, 
+                    // continue trying to push the olive. at a different angle
+                    break;
+                }
+            }
+        }
+        
+        pbf_move_left_joystick(context, {0, -1}, 800ms, 400ms);
+        green.align_to_olive(env.program_info(), env.console, context, 5.95);
+        pbf_move_left_joystick(context, {0, -1}, 4000ms, 400ms);
+
+        // section 2.3 push olive past first NPC
+        Milliseconds duration_to_walk_for_section2_3 = 7600ms;
+        size_t MAX_ATTEMPTS = 2;
+        for (size_t i = 0; i < MAX_ATTEMPTS; i++){
+            try{
+                green.push_olive_forward(env.program_info(), env.console, context, 5.95, duration_to_walk_for_section2_3, 600ms, 10);
+                // green.align_to_olive(env.program_info(), env.console, context, 5.95, 10);
+                green.walk_up_to_olive(env.program_info(), env.console, context, 5.95, 10);                
+                break;
+            }catch (OliveActionFailedException& e){
+                if (e.m_fail_reason == OliveFail::OLIVE_STUCK){
+                    // if olive is stuck, we might have pushed the olive all the way to the end. so we can try moving on.
+                    break;
+                }
+
+                if (i >= MAX_ATTEMPTS-1){
+                    throw;
+                }                
+                if (e.m_fail_reason == OliveFail::NO_OLIVE_DETECTED || e.m_fail_reason == OliveFail::FAILED_WALK_TO_OLIVE){
+                    // may have walked past olive
+                    pbf_move_left_joystick(context, {0, -1}, 1600ms, 400ms);
+                    pbf_wait(context, 5000ms);
+                    context.wait_for_all_requests();                    
+                    // ticks_to_walk_for_section2_3 = 500;                    
+                }else{ // FAILED_PUSH_OLIVE_TOTAL_DISTANCE
+                    throw;
+                }
+
+            }
+        }
+
+        // section 2b. realign using fence corner
+        direction.change_direction(env.program_info(), env.console, context,  4.5);
+        pbf_move_left_joystick(context, {0, +1}, 1600ms, 400ms);
+        direction.change_direction(env.program_info(), env.console, context, 5.86);
+        pbf_move_left_joystick(context, {0, +1}, 2400ms, 400ms);
+        direction.change_direction(env.program_info(), env.console, context,  2.76);
+        pbf_move_left_joystick(context, {0, +1}, 400ms, 400ms);
+
+        // section 3.1 push olive across the hump
+        Milliseconds duration_to_walk_for_section3_1 = 2800ms;
+        Milliseconds duration_walked_section3_1 = 0ms;
+        for (size_t i = 0; i < MAX_ATTEMPTS; i++){
+            try{
+                duration_walked_section3_1 = green.push_olive_forward(
+                    env.program_info(),
+                    env.console,
+                    context,
+                    1.27,
+                    duration_to_walk_for_section3_1,
+                    1000ms
+                );
+                break;
+            }catch (OliveActionFailedException& e){
+                // may have failed to push the olive past the hump. and walked past it
+                if (i >= MAX_ATTEMPTS-1){
+                    throw;
+                }
+
+                if (e.m_fail_reason == OliveFail::NO_OLIVE_DETECTED){
+                    pbf_move_left_joystick(context, {0, -1}, 2000ms, 400ms);
+                    pbf_move_left_joystick(context, {0, +1}, 400ms, 400ms);  // move forward slight in case the olive is undetectable since it's right in front of the character
+                    pbf_wait(context, 5000ms);
+                    context.wait_for_all_requests();                    
+                    duration_to_walk_for_section3_1 = 1600ms;
+                }else if (e.m_fail_reason == OliveFail::FAILED_WALK_TO_OLIVE || e.m_fail_reason == OliveFail::OLIVE_STUCK){
+                    // try moving back and then ramming forward
+                    pbf_move_left_joystick(context, {0, -1}, 400ms, 400ms);
+                    pbf_move_left_joystick(context, {0, +1}, 1200ms, 400ms);
+                    pbf_wait(context, 7000ms);
+                    context.wait_for_all_requests();
+                    duration_to_walk_for_section3_1 = 1600ms;
+                }else{ // FAILED_PUSH_OLIVE_TOTAL_DISTANCE, 
+                    throw;
+                }
+                
+            }
+        }
+
+        
+        // section 3.2 push olive across the hump and into fence
+        Milliseconds total_duration_to_walk_for_section3 = 4400ms;
+        Milliseconds duration_to_walk_for_section3_2 = 0ms;
+        if (duration_walked_section3_1 < total_duration_to_walk_for_section3){
+            duration_to_walk_for_section3_2 = (total_duration_to_walk_for_section3 - duration_walked_section3_1);
+        }
+        for (size_t i = 0; i < MAX_ATTEMPTS; i++){
+            try{
+                green.push_olive_forward(env.program_info(), env.console, context, 1.27, duration_to_walk_for_section3_2, 1000ms);
+                pbf_move_left_joystick(context, {0, -1}, 800ms, 400ms);
+                green.align_to_olive(env.program_info(), env.console, context, 1.27);
+                green.walk_up_to_olive(env.program_info(), env.console, context, 1.27);
+                break;
+            }catch (OliveActionFailedException& e){
+                // may have failed to push the olive past the hump. and walked past it
+                if (i >= MAX_ATTEMPTS-1){
+                    throw;
+                }
+                if (e.m_fail_reason == OliveFail::NO_OLIVE_DETECTED){
+                    pbf_move_left_joystick(context, {0, -1}, 1600ms, 400ms);
+                    pbf_wait(context, 7000ms);
+                    context.wait_for_all_requests();                    
+                    duration_to_walk_for_section3_2 += 1600ms;
+                }else if (e.m_fail_reason == OliveFail::FAILED_WALK_TO_OLIVE || e.m_fail_reason == OliveFail::OLIVE_STUCK){
+                    // try moving back and then ramming forward
+                    pbf_move_left_joystick(context, {0, -1}, 400ms, 400ms);
+                    pbf_move_left_joystick(context, {0, +1}, 1200ms, 400ms);
+                    pbf_wait(context, 7000ms);
+                    context.wait_for_all_requests();
+                }else{ // FAILED_PUSH_OLIVE_TOTAL_DISTANCE, 
+                    throw;
+                }
+
+            }
+        }
+        
+
+        // section 3b. realign using fence.
+        direction.change_direction(env.program_info(), env.console, context,  3.0);
+        pbf_move_left_joystick(context, {0, +1}, 600ms, 400ms);
+        direction.change_direction(env.program_info(), env.console, context,  1.17);
+        pbf_move_left_joystick(context, {0, +1}, 800ms, 400ms);
+
+        // section 4.1 last stretch. nudge the olive
+        for (size_t i = 0; i < MAX_ATTEMPTS; i++){
+            try{
+                green.align_to_olive(env.program_info(), env.console, context, 6.0);
+                green.walk_up_to_olive(env.program_info(), env.console, context, 6.0);                
+                green.push_olive_forward(env.program_info(), env.console, context, 6.0, 400ms, 400ms);
+                break;
+            }catch (OliveActionFailedException& e){
+                // may have failed to push the olive. and walked past it
+                if (e.m_fail_reason == OliveFail::NO_OLIVE_DETECTED){
+                    pbf_move_left_joystick(context, {0, -1}, 1600ms, 400ms);
+                    pbf_wait(context, 7000ms);
+                    context.wait_for_all_requests();                    
+                }else if (e.m_fail_reason == OliveFail::FAILED_WALK_TO_OLIVE || e.m_fail_reason == OliveFail::OLIVE_STUCK){
+                    // try moving back and then ramming forward
+                    pbf_move_left_joystick(context, {0, -1}, 400ms, 400ms);
+                    pbf_move_left_joystick(context, {0, +1}, 800ms, 400ms);
+                    pbf_wait(context, 7000ms);
+                    context.wait_for_all_requests();
+                }else{ // FAILED_PUSH_OLIVE_TOTAL_DISTANCE, 
+                    throw;
+                }
+            }
+        }
+
+        // section 4.2 past second NPC and into the finish line
+        NoMinimapWatcher no_minimap(env.console, COLOR_RED, Milliseconds(500));
+        size_t MAX_ATTEMPTS_SECTION_4 = 3;
+        int ret = run_until<ProControllerContext>(
+            env.console, context,
+            [&](ProControllerContext& context){
+                for (size_t i = 0; i < MAX_ATTEMPTS_SECTION_4; i++){
+                    try{
+                        green.push_olive_forward(env.program_info(), env.console, context, 6.0, 2000ms, 600ms, 20, {0, 0.3, 1.0, 0.40}, false);
+                        green.push_olive_forward(env.program_info(), env.console, context, 5.8, 800ms, 600ms, 20, {0, 0.3, 1.0, 0.40}, false);
+                        green.push_olive_forward(env.program_info(), env.console, context, 6.0, 1600ms, 600ms, 20, {0, 0.3, 1.0, 0.40}, false);
+                        green.push_olive_forward(env.program_info(), env.console, context, 6.1, 1600ms, 600ms, 20, {0, 0.3, 1.0, 0.40}, false);
+                        break;
+                    }catch (OliveActionFailedException& e){
+                        // may have failed to push the olive. and walked past it
+                        if (e.m_fail_reason == OliveFail::NO_OLIVE_DETECTED){
+                            pbf_move_left_joystick(context, {0, -1}, 1600ms, 400ms);
+                            pbf_wait(context, 7000ms);
+                            context.wait_for_all_requests();                            
+                        }else if (e.m_fail_reason == OliveFail::FAILED_WALK_TO_OLIVE || e.m_fail_reason == OliveFail::OLIVE_STUCK){
+                            // try moving back and then ramming forward
+                            pbf_move_left_joystick(context, {0, -1}, 400ms, 400ms);
+                            pbf_move_left_joystick(context, {0, +1}, 1200ms, 400ms);
+                            pbf_wait(context, 7000ms);
+                            context.wait_for_all_requests();
+                            // then push angled towards the right
+                            green.push_olive_forward(env.program_info(), env.console, context, 5.8, 800ms, 600ms, 20, {0, 0.3, 1.0, 0.40}, false);
+                        }else{ // FAILED_PUSH_OLIVE_TOTAL_DISTANCE, 
+                            throw;
+                        }
+                    }
+                }                
+            },
+            {no_minimap}
+        );
+        if (ret < 0){
+            throw_and_log<OliveActionFailedException>(
+                env.logger(), ErrorReportMode::SEND_ERROR_REPORT,
+                "Failed to finish Olive roll in the last stretch.",
+                env.console
+            );
+        }
+        env.log("No minimap seen. Likely finished the Olive roll.");
+
+        // section 8. finish olive roll
+        mash_button_till_overworld(env.console, context, BUTTON_A, 360);
+        
+        // fix the time
+        go_home(env.console, context);
+        home_to_date_time(env.console, context, false);
+        pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+        pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+        pbf_press_button(context, BUTTON_HOME, 160ms, ConsoleSettings::instance().SETTINGS_TO_HOME_DELAY0);
+        resume_game_from_home(env.console, context);        
+
+        enter_menu_from_overworld(env.program_info(), env.console, context, -1);
+
+    }, false);
+
+}
+
+void checkpoint_27(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+){
+    
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){         
+        context.wait_for_all_requests();
+        move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::KEEP_ZOOM, +1, 0, 320ms});
+
+    });
+
+}
+
+
+
+
+
+}
+}
+}
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_11.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_11.h
new file mode 100644
index 0000000000..7b4ba590d0
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_11.h
@@ -0,0 +1,112 @@
+/*  Autostory
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_AutoStory_Segment_11_H
+#define PokemonAutomation_PokemonSV_AutoStory_Segment_11_H
+
+#include "PokemonSV_AutoStoryTools.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+class AutoStory_Segment_11 : public AutoStory_Segment{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_segment(
+        SingleSwitchProgramEnvironment& env, 
+        ProControllerContext& context,
+        AutoStoryOptions options,
+        AutoStoryStats& stats
+    ) const override;
+};
+
+class AutoStory_Checkpoint_24 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+class AutoStory_Checkpoint_25 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+class AutoStory_Checkpoint_26 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+class AutoStory_Checkpoint_27 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+
+
+// start: At Cortondo East Pokecenter
+// end: Spoke to Cortondo Gym reception. At Cortondo West Pokecenter.
+void checkpoint_24(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+);
+
+// start: Spoke to Cortondo Gym reception. At Cortondo West Pokecenter.
+// end: Defeated the trainers at Olive Roll, but left Olive unmoved. Then backed out, standing in front of the Olive Roll NPC.
+void checkpoint_25(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+);
+
+// start: Defeated the trainers at Olive Roll, but left Olive unmoved. Then backed out, standing in front of the Olive Roll NPC.
+// end: Completed Olive roll gym challenge.
+void checkpoint_26(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+);
+
+// start: Completed Olive roll gym challenge. 
+// end: At Cortondo East Pokecenter.
+void checkpoint_27(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+);
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_12.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_12.cpp
new file mode 100644
index 0000000000..70920730bc
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_12.cpp
@@ -0,0 +1,159 @@
+/*  AutoStory
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "VideoGames/PokemonSV/Inference/PokemonSV_TutorialDetector.h"
+#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h"
+#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_NoMinimapDetector.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h"
+#include "PokemonSV_AutoStoryTools.h"
+#include "PokemonSV_AutoStory_Segment_12.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+//#include <unordered_map>
+//#include <algorithm>
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+
+std::string AutoStory_Segment_12::name() const{
+    return "12: Cortondo Gym (Bug): Gym battle";
+}
+
+std::string AutoStory_Segment_12::start_text() const{
+    return "Start: Beat Cortondo Gym challenge. At Cortondo East Pokecenter.";
+}
+
+std::string AutoStory_Segment_12::end_text() const{
+    return "End: Beat Cortondo Gym battle. At Cortondo West Pokecenter.";
+}
+
+
+void AutoStory_Segment_12::run_segment(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    AutoStoryOptions options,
+    AutoStoryStats& stats
+) const{
+    
+
+    stats.m_segment++;
+    env.update_stats();
+    context.wait_for_all_requests();
+    env.console.log("Start Segment " + name(), COLOR_ORANGE);
+
+    AutoStory_Checkpoint_28().run_checkpoint(env, context, options, stats);
+
+    context.wait_for_all_requests();
+    env.console.log("End Segment " + name(), COLOR_GREEN);
+
+}
+
+std::string AutoStory_Checkpoint_28::name() const{ return "028 - " + AutoStory_Segment_12().name(); }
+std::string AutoStory_Checkpoint_28::start_text() const{ return "At Cortondo East Pokecenter.";}
+std::string AutoStory_Checkpoint_28::end_text() const{ return "Beat Cortondo Gym. At Cortondo West Pokecenter.";}
+void AutoStory_Checkpoint_28::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_28(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+
+void checkpoint_28(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+){
+    
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){         
+        context.wait_for_all_requests();
+        DirectionDetector direction;
+        if (attempt_number > 0 || ENABLE_TEST){
+            env.console.log("Fly to neighbouring Pokecenter, then fly back, to clear any pokemon covering the minimap.");
+            move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::KEEP_ZOOM, -1, +1, 0ms});
+            move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::KEEP_ZOOM, -1, +1, 0ms});
+        }
+
+        do_action_and_monitor_for_battles(env.program_info(), env.console, context,
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                direction.change_direction(env.program_info(), env.console, context, 2.71);
+                pbf_move_left_joystick(context, {0, +1}, 3000ms, 800ms);
+                direction.change_direction(env.program_info(), env.console, context, 1.26);
+                pbf_move_left_joystick(context, {0, +1}, 14000ms, 800ms);
+        });        
+       
+        direction.change_direction(env.program_info(), env.console, context, 2.73);
+
+        NoMinimapWatcher no_minimap(env.console, COLOR_RED, Milliseconds(2000));
+        int ret = run_until<ProControllerContext>(
+            env.console, context,
+            [&](ProControllerContext& context){
+                handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+                    [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                        pbf_move_left_joystick(context, {0, +1}, 10000ms, 800ms);
+                    }, 
+                    [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                        pbf_move_left_joystick(context, {-1, +1}, 800ms, 160ms);
+                    },
+                    5, 3
+                );     
+            },
+            {no_minimap}
+        );
+        if (ret < 0){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "Failed to enter Cortondo Gym.",
+                env.console
+            );
+        }
+
+        wait_for_overworld(env.program_info(), env.console, context);
+
+        // talk to receptionist
+        walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_SPAM_A, 10000ms);
+        clear_dialog(env.console, context, ClearDialogMode::STOP_BATTLE, 60, {CallbackEnum::BATTLE, CallbackEnum::PROMPT_DIALOG, CallbackEnum::DIALOG_ARROW});
+
+        // battle Katy
+        env.console.log("Battle Grass Gym.");
+        run_trainer_battle_press_A(env.console, context, BattleStopCondition::STOP_DIALOG);
+        mash_button_till_overworld(env.console, context, BUTTON_A, 360);
+
+        // leave gym building
+        pbf_move_left_joystick(context, {0, -1}, 2400ms, 800ms);
+        pbf_wait(context, 3000ms);
+        // wait for overworld after leaving gym
+        wait_for_overworld(env.program_info(), env.console, context, 30);
+
+        pbf_move_left_joystick(context, {0, +1}, 3600ms, 800ms);
+        direction.change_direction(env.program_info(), env.console, context, 1.26);
+        pbf_move_left_joystick(context, {0, +1}, 12800ms, 800ms);
+        fly_to_overlapping_flypoint(env.program_info(), env.console, context);
+       
+    });
+
+}
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_12.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_12.h
new file mode 100644
index 0000000000..d71e3aea9b
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_12.h
@@ -0,0 +1,53 @@
+/*  Autostory
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_AutoStory_Segment_12_H
+#define PokemonAutomation_PokemonSV_AutoStory_Segment_12_H
+
+#include "PokemonSV_AutoStoryTools.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+class AutoStory_Segment_12 : public AutoStory_Segment{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_segment(
+        SingleSwitchProgramEnvironment& env, 
+        ProControllerContext& context,
+        AutoStoryOptions options,
+        AutoStoryStats& stats
+    ) const override;
+};
+
+class AutoStory_Checkpoint_28 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+
+
+// start: At Cortondo East Pokecenter.
+// end: Beat Cortondo Gym. At Cortondo West Pokecenter.
+void checkpoint_28(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+);
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_13.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_13.cpp
new file mode 100644
index 0000000000..17c8df9bdb
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_13.cpp
@@ -0,0 +1,465 @@
+/*  AutoStory
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h"
+#include "PokemonSV_AutoStoryTools.h"
+#include "PokemonSV_AutoStory_Segment_13.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+//#include <unordered_map>
+//#include <algorithm>
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+
+std::string AutoStory_Segment_13::name() const{
+    return "13: Bombirdier Titan: Go to West Province Area One Central Pokecenter";
+}
+
+std::string AutoStory_Segment_13::start_text() const{
+    return "Start: At Cortondo West Pokecenter";
+}
+
+std::string AutoStory_Segment_13::end_text() const{
+    return "End: At West Province Area One Central Pokecenter";
+}
+
+void AutoStory_Segment_13::run_segment(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    AutoStoryOptions options,
+    AutoStoryStats& stats
+) const{
+    
+
+    stats.m_segment++;
+    env.update_stats();
+    context.wait_for_all_requests();
+    env.console.log("Start Segment " + name(), COLOR_ORANGE);
+
+    AutoStory_Checkpoint_29().run_checkpoint(env, context, options, stats);
+
+    context.wait_for_all_requests();
+    env.console.log("End Segment " + name(), COLOR_GREEN);
+
+}
+
+std::string AutoStory_Checkpoint_29::name() const{ return "029 - " + AutoStory_Segment_13().name(); }
+std::string AutoStory_Checkpoint_29::start_text() const{ return "At Cortondo West Pokecenter.";}
+std::string AutoStory_Checkpoint_29::end_text() const{ return "At West Province Area One Central Pokecenter.";}
+void AutoStory_Checkpoint_29::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_29(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+void checkpoint_29(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+){
+    
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){         
+        context.wait_for_all_requests();
+
+        if (attempt_number > 0 || ENABLE_TEST){
+            env.console.log("Fly to neighbouring Pokecenter, then fly back, to clear any pokemon covering the minimap.");
+            move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::KEEP_ZOOM, -1, +1, 0ms});
+            move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::KEEP_ZOOM, -1, +1, 0ms});
+        }
+
+        // align for long stretch 1, part 1
+        realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_NEW_MARKER, -0.453, +1, 480ms);
+
+
+        handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                overworld_navigation(env.program_info(), env.console, context, 
+                    NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                    0, +1, 30, 15, false);
+            }, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_move_left_joystick(context, {+1, -1}, 320ms, 400ms);
+                realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+            }
+        );            
+
+        // align for long stretch 1, part 2
+        realign_player_from_landmark(
+            env.program_info(), env.console, context, 
+            {ZoomChange::ZOOM_IN, 0, -1, 320ms},
+            {ZoomChange::KEEP_ZOOM, -0.375, +1, 600ms}
+        );        
+        
+        handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                overworld_navigation(env.program_info(), env.console, context, 
+                    NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                    0, +1, 24, 12, false);
+            }, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_move_left_joystick(context, {+1, -1}, 320ms, 400ms);
+                realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+            }
+        );         
+
+        // align for long stretch 1, part 3
+ 
+        realign_player_from_landmark(
+            env.program_info(), env.console, context, 
+            {ZoomChange::ZOOM_IN, 0, -1, 480ms},
+            {ZoomChange::KEEP_ZOOM, -0.258, +1, 920ms}
+        );
+        
+        handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                overworld_navigation(env.program_info(), env.console, context, 
+                    NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                    0, +1, 36, 12, false);
+            }, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_move_left_joystick(context, {+1, -1}, 320ms, 400ms);
+                realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+            }
+        );  
+
+        // align for long stretch 2
+        realign_player_from_landmark(
+            env.program_info(), env.console, context, 
+            {ZoomChange::ZOOM_IN, 0, -1, 800ms},
+            {ZoomChange::KEEP_ZOOM, -1, +0.18, 520ms}
+        );              
+
+        handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                overworld_navigation(env.program_info(), env.console, context, 
+                    NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                    0, +1, 45, 15, false);
+            }, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_move_left_joystick(context, {+1, -1}, 320ms, 400ms);
+                realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+            }
+        );  
+
+        // align for long stretch 3, part 1
+        realign_player_from_landmark(
+            env.program_info(), env.console, context, 
+            {ZoomChange::ZOOM_IN, +1, 0, 520ms},
+            {ZoomChange::KEEP_ZOOM, -1, +0.609, 696ms}
+        ); 
+
+        
+        handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                overworld_navigation(env.program_info(), env.console, context, 
+                    NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                    0, +1, 20, 10, false);
+            }, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_move_left_joystick(context, {+1, -1}, 320ms, 400ms);
+                realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+            }
+        );  
+
+        // align for long stretch 3, part 2
+        realign_player_from_landmark(
+            env.program_info(), env.console, context, 
+            {ZoomChange::ZOOM_IN, +1, -0.252, 520ms},
+            {ZoomChange::KEEP_ZOOM, -0.844, +1, 880ms}
+        ); 
+
+        
+        handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                overworld_navigation(env.program_info(), env.console, context, 
+                    NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                    0, +1, 30, 10, false);
+            }, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_move_left_joystick(context, {+1, -1}, 320ms, 400ms);
+                realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+            }
+        );            
+
+        // align for long stretch 3, part 3
+        realign_player_from_landmark(
+            env.program_info(), env.console, context, 
+            {ZoomChange::ZOOM_IN, -1, +0.531, 880ms},
+            {ZoomChange::KEEP_ZOOM, +1, 0, 920ms}
+        );
+
+
+        handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                overworld_navigation(env.program_info(), env.console, context, 
+                    NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                    0, +1, 30, 10, false);
+            }, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_move_left_joystick(context, {+1, -1}, 320ms, 400ms);
+                realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+            }
+        );
+
+        // // align for long stretch 3, part 4
+        // realign_player_from_landmark(
+        //     env.program_info(), env.console, context, 
+        //     {ZoomChange::ZOOM_IN, 0, 128, 100},
+        //     {ZoomChange::KEEP_ZOOM, 255, 67, 85} //{ZoomChange::KEEP_ZOOM, 255, 70, 90}
+        // );
+
+        //align for long stretch 3, part 4.  just prior to bridge. {0.339062, 0.612037}
+        place_marker_offset_from_flypoint(env.program_info(), env.console, context, 
+            {ZoomChange::KEEP_ZOOM, -1, +1, 0ms},
+            FlyPoint::POKECENTER, 
+            {0.339062, 0.612037}
+        );
+
+
+        handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                overworld_navigation(env.program_info(), env.console, context, 
+                    NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                    0, +1, 36, 12, false);
+            }, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_move_left_joystick(context, {+1, -1}, 320ms, 400ms);
+                realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+            }
+        );        
+
+        // // align to cross bridge
+        // realign_player_from_landmark(
+        //     env.program_info(), env.console, context, 
+        //     {ZoomChange::ZOOM_IN, 0, 128, 90},
+        //     {ZoomChange::KEEP_ZOOM, 255, 35, 67}
+        // );
+
+        // align to cross bridge   {0.385937, 0.615741}
+        place_marker_offset_from_flypoint(env.program_info(), env.console, context, 
+            {ZoomChange::KEEP_ZOOM, -1, +1, 0ms},
+            FlyPoint::POKECENTER, 
+            {0.385937, 0.615741}
+        );
+
+
+        // attempt to cross bridge. If fall into water, go back to start position (just before bridge) and try again
+        WallClock start_to_cross_bridge = current_time();
+        while (true){
+            if (current_time() - start_to_cross_bridge > std::chrono::minutes(6)){
+                OperationFailedExceptionWithScreenshot::fire(
+                    ErrorReportMode::SEND_ERROR_REPORT,
+                    "checkpoint_26(): Failed to cross bridge after 6 minutes.",
+                    env.console
+                );
+            }        
+
+            try{
+                overworld_navigation(env.program_info(), env.console, context, 
+                    NavigationStopCondition::STOP_MARKER, NavigationMovementMode::CLEAR_WITH_LETS_GO, 
+                    0, +1, 20, 20, false);         
+
+                break;
+
+            }catch (OperationFailedException&){ // try again if fall into water
+                pbf_mash_button(context, BUTTON_A, 2000ms);
+
+                // // walk back to start position before bridge
+                // realign_player_from_landmark(
+                //     env.program_info(), env.console, context, 
+                //     {ZoomChange::ZOOM_IN, 255, 255, 180},
+                //     {ZoomChange::KEEP_ZOOM, 33, 0, 175}
+                // );
+
+                // walk back to start position before bridge
+                //  {0.310937, 0.580556}      {0.310937, 0.589815}      {0.310937, 0.584259}
+                place_marker_offset_from_flypoint(env.program_info(), env.console, context, 
+                    {ZoomChange::KEEP_ZOOM, -1, +1, 0ms},
+                    FlyPoint::POKECENTER, 
+                    {0.310937, 0.584259}
+                );
+
+                overworld_navigation(env.program_info(), env.console, context, 
+                    NavigationStopCondition::STOP_MARKER, NavigationMovementMode::CLEAR_WITH_LETS_GO, 
+                    0, +1, 20, 20, false);          
+
+
+                // // align to cross bridge
+                // realign_player_from_landmark(
+                //     env.program_info(), env.console, context, 
+                //     {ZoomChange::ZOOM_IN, 0, 128, 90},
+                //     {ZoomChange::KEEP_ZOOM, 255, 35, 67}
+                // );
+
+                // align to cross bridge   {0.385937, 0.615741}
+                place_marker_offset_from_flypoint(env.program_info(), env.console, context, 
+                    {ZoomChange::KEEP_ZOOM, -1, +1, 0ms},
+                    FlyPoint::POKECENTER, 
+                    {0.385937, 0.615741}
+                );
+
+
+            }
+        }
+
+        confirm_no_overlapping_flypoint(env.program_info(), env.console, context);
+        pbf_press_button(context, BUTTON_B, 160ms, 800ms);
+        handle_unexpected_battles(env.program_info(), env.console, context,
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            press_Bs_to_back_to_overworld(env.program_info(), env.console, context);
+        });
+
+        env.console.log("Successfully crossed the bridge.");
+        
+        // align for post-bridge section 1
+        realign_player_from_landmark(
+            env.program_info(), env.console, context, 
+            {ZoomChange::ZOOM_IN, -1, -0.173, 480ms},
+            {ZoomChange::KEEP_ZOOM, +1, +0.531, 400ms} // {ZoomChange::KEEP_ZOOM, 255, 60, 50}
+        );
+
+
+        handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                overworld_navigation(env.program_info(), env.console, context, 
+                    NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                    0, +1, 20, 10, false);
+            }, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_move_left_joystick(context, {+1, -1}, 320ms, 400ms);
+                realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+            }
+        );
+ 
+
+        // align for post-bridge section 2
+        realign_player_from_landmark(
+            env.program_info(), env.console, context, 
+            {ZoomChange::ZOOM_IN, -1, -0.173, 480ms},
+            {ZoomChange::KEEP_ZOOM, +1, +0.18, 400ms}
+        );
+
+
+        handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                overworld_navigation(env.program_info(), env.console, context, 
+                    NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                    0, +1, 20, 10, false);
+            }, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_move_left_joystick(context, {+1, -1}, 320ms, 400ms);
+                realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+            }
+        );       
+
+        // align for post-bridge section 3. move up towards tree
+        realign_player_from_landmark(
+            env.program_info(), env.console, context, 
+            {ZoomChange::ZOOM_IN, -1, 0, 400ms},
+            {ZoomChange::KEEP_ZOOM, +1, +0.297, 280ms}
+        );
+
+
+        handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                overworld_navigation(env.program_info(), env.console, context, 
+                    NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                    0, +1, 20, 10, false);
+            }, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_move_left_joystick(context, {+1, -1}, 320ms, 400ms);
+                realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+            }
+        );       
+
+        // align for post-bridge section 4
+        realign_player_from_landmark(
+            env.program_info(), env.console, context, 
+            {ZoomChange::ZOOM_IN, -1, 0, 400ms},
+            {ZoomChange::KEEP_ZOOM, +1, +0.57, 200ms}
+        );
+
+
+        handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                overworld_navigation(env.program_info(), env.console, context, 
+                    NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                    0, +1, 20, 10, false);
+            }, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_move_left_joystick(context, {+1, -1}, 320ms, 400ms);
+                realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+            }
+        );    
+
+
+
+        // align for post-bridge section 5. set marker to pokecenter.
+        realign_player_from_landmark(
+            env.program_info(), env.console, context, 
+            {ZoomChange::ZOOM_IN, -1, 0, 400ms},
+            {ZoomChange::KEEP_ZOOM, 0, 0, 0ms}
+        );
+
+
+        handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                overworld_navigation(env.program_info(), env.console, context, 
+                    NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                    0, +1, 30, 10, false);
+            }, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_move_left_joystick(context, {+1, -1}, 320ms, 400ms);
+                realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+            }
+        );   
+
+
+        // align for post-bridge section 6. set marker past pokecenter
+        handle_unexpected_battles(env.program_info(), env.console, context,
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_NEW_MARKER, -1, -0.567, 240ms);
+        });
+                // realign_player_from_landmark(
+                //     env.program_info(), env.console, context, 
+                //     {ZoomChange::ZOOM_IN, 128, 128, 0},
+                //     {ZoomChange::KEEP_ZOOM, 0, 180, 20}
+                // );   
+
+        overworld_navigation(env.program_info(), env.console, context, 
+            NavigationStopCondition::STOP_TIME, NavigationMovementMode::DIRECTIONAL_ONLY, 
+            0, +0.883, 12, 12, false);    
+
+
+
+        fly_to_overlapping_flypoint(env.program_info(), env.console, context);
+              
+       
+    });
+
+}
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_13.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_13.h
new file mode 100644
index 0000000000..df7a722de7
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_13.h
@@ -0,0 +1,56 @@
+/*  Autostory
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_AutoStory_Segment_13_H
+#define PokemonAutomation_PokemonSV_AutoStory_Segment_13_H
+
+#include "PokemonSV_AutoStoryTools.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+class AutoStory_Segment_13 : public AutoStory_Segment{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_segment(
+        SingleSwitchProgramEnvironment& env, 
+        ProControllerContext& context,
+        AutoStoryOptions options,
+        AutoStoryStats& stats
+    ) const override;
+};
+
+class AutoStory_Checkpoint_29 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+
+
+// start: At Cortondo West Pokecenter.
+// end: At West Province Area One Central Pokecenter
+void checkpoint_29(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+);
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_14.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_14.cpp
new file mode 100644
index 0000000000..23d12c84d2
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_14.cpp
@@ -0,0 +1,321 @@
+/*  AutoStory
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "VideoGames/PokemonSV/Inference/PokemonSV_TutorialDetector.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h"
+#include "PokemonSV_AutoStoryTools.h"
+#include "PokemonSV_AutoStory_Segment_14.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+//#include <unordered_map>
+//#include <algorithm>
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+
+std::string AutoStory_Segment_14::name() const{
+    return "14: Bombirdier Titan: Battle Bombirdier";
+}
+
+std::string AutoStory_Segment_14::start_text() const{
+    return "Start: At West Province Area One Central Pokecenter";
+}
+
+std::string AutoStory_Segment_14::end_text() const{
+    return "End: Defeated Bombirder. At West Province Area One North Pokecenter";
+}
+
+void AutoStory_Segment_14::run_segment(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    AutoStoryOptions options,
+    AutoStoryStats& stats
+) const{
+    
+
+    stats.m_segment++;
+    env.update_stats();
+    context.wait_for_all_requests();
+    env.console.log("Start Segment " + name(), COLOR_ORANGE);
+
+    AutoStory_Checkpoint_30().run_checkpoint(env, context, options, stats);
+    AutoStory_Checkpoint_31().run_checkpoint(env, context, options, stats);
+
+    context.wait_for_all_requests();
+    env.console.log("End Segment " + name(), COLOR_GREEN);
+
+}
+
+std::string AutoStory_Checkpoint_30::name() const{ return "030 - " + AutoStory_Segment_14().name(); }
+std::string AutoStory_Checkpoint_30::start_text() const{ return "At West Province Area One Central Pokecenter.";}
+std::string AutoStory_Checkpoint_30::end_text() const{ return "Defeated Bombirdier.";}
+void AutoStory_Checkpoint_30::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_30(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+std::string AutoStory_Checkpoint_31::name() const{ return "031 - " + AutoStory_Segment_14().name(); }
+std::string AutoStory_Checkpoint_31::start_text() const{ return AutoStory_Checkpoint_30().end_text();}
+std::string AutoStory_Checkpoint_31::end_text() const{ return "At West Province Area One North Pokecenter.";}
+void AutoStory_Checkpoint_31::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_31(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+void checkpoint_30(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+){
+    
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){         
+        
+        if (attempt_number > 0 || ENABLE_TEST){
+            env.console.log("Fly to neighbouring Pokecenter, then fly back, to clear any pokemon covering the minimap.");
+            move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::KEEP_ZOOM, +1, -1, 800ms});
+            move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::KEEP_ZOOM, -1, +1, 800ms});
+        }
+
+        heal_at_pokecenter(env.program_info(), env.console, context);
+
+        // section 1
+        realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_NEW_MARKER, +1, 0, 136ms);
+        overworld_navigation(env.program_info(), env.console, context, 
+            NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+            0, +1, 20, 10, false);    
+
+
+        // section 2
+        realign_player_from_landmark(
+            env.program_info(), env.console, context, 
+            {ZoomChange::ZOOM_IN, +1, -0.567, 1600ms},
+            {ZoomChange::KEEP_ZOOM, -1, +0.492, 1760ms}
+        );          
+        overworld_navigation(env.program_info(), env.console, context, 
+            NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+            0, +1, 20, 10, false);
+
+        // section 3
+        realign_player_from_landmark(
+            env.program_info(), env.console, context, 
+            {ZoomChange::ZOOM_IN, +1, -0.567, 1600ms},
+            {ZoomChange::KEEP_ZOOM, -1, +0.375, 1880ms}
+        );          
+        overworld_navigation(env.program_info(), env.console, context, 
+            NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+            0, +1, 20, 10, false);
+
+        // section 4. walk until Arven dialog
+        realign_player_from_landmark(
+            env.program_info(), env.console, context, 
+            {ZoomChange::ZOOM_IN, +1, -0.567, 1600ms},
+            {ZoomChange::KEEP_ZOOM, -1, +0.531, 2240ms}
+        );          
+        overworld_navigation(env.program_info(), env.console, context, 
+            NavigationStopCondition::STOP_DIALOG, NavigationMovementMode::DIRECTIONAL_ONLY, 
+            0, +1, 20, 10, false);
+
+        clear_dialog(env.console, context, ClearDialogMode::STOP_OVERWORLD, 30, {CallbackEnum::OVERWORLD, CallbackEnum::BLACK_DIALOG_BOX});
+
+        // after Arven dialog. section 5
+        realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+        overworld_navigation(env.program_info(), env.console, context, 
+            NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+            0, +1, 18, 6, false);        
+
+        // section 6
+        realign_player_from_landmark(
+            env.program_info(), env.console, context, 
+            {ZoomChange::ZOOM_IN, -1, +1, 0ms},
+            {ZoomChange::KEEP_ZOOM, -1, +0.844, 520ms}
+        );          
+        overworld_navigation(env.program_info(), env.console, context, 
+            NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+            0, +1, 20, 10, false);
+
+        get_on_ride(env.program_info(), env.console, context);
+
+        // section 7
+        realign_player_from_landmark(
+            env.program_info(), env.console, context, 
+            {ZoomChange::ZOOM_IN, -1, +1, 0ms},
+            {ZoomChange::KEEP_ZOOM, -1, +0.766, 640ms}
+        );          
+        overworld_navigation(env.program_info(), env.console, context, 
+            NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+            0, +1, 20, 10, false);
+
+        // section 8. enter left side of boulder field
+        realign_player_from_landmark(
+            env.program_info(), env.console, context, 
+            {ZoomChange::ZOOM_IN, +1, -1, 400ms},
+            {ZoomChange::KEEP_ZOOM, -1, +0.688, 760ms}
+        );          
+        overworld_navigation(env.program_info(), env.console, context, 
+            NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+            0, +1, 18, 6, false); 
+
+        // section 8.1. move up
+        realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_NEW_MARKER, -1, +1, 400ms);
+        pbf_move_left_joystick(context, {0, +1}, 800ms, 800ms);
+
+        // section 9. go to middle-right of boulder field
+        realign_player_from_landmark(
+            env.program_info(), env.console, context, 
+            {ZoomChange::ZOOM_IN, +1, -1, 400ms},
+            {ZoomChange::KEEP_ZOOM, -1, +0.883, 880ms}
+        );          
+        overworld_navigation(env.program_info(), env.console, context, 
+            NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+            0, +1, 40, 5, false);  
+
+        // // section 9.1. go to right edge of boulder field
+        // realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_NEW_MARKER, +0.094, +1, 400ms);        
+        // pbf_move_left_joystick(context, {0, +1}, 1600ms, 800ms);
+
+        // section 10. walk up right edge
+        realign_player_from_landmark(
+            env.program_info(), env.console, context, 
+            {ZoomChange::ZOOM_IN, +1, -1, 640ms},
+            {ZoomChange::KEEP_ZOOM, -1, +0.906, 1040ms}
+        );      
+        overworld_navigation(env.program_info(), env.console, context, 
+            NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+            0, +1, 40, 5, false);  
+
+        // section 10.1 walk up right edge. until hit rock
+        realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_NEW_MARKER, -1, +0.883, 400ms);          
+
+        overworld_navigation(env.program_info(), env.console, context, 
+            NavigationStopCondition::STOP_TIME, NavigationMovementMode::DIRECTIONAL_ONLY, 
+            +0.094, +1, 10, 5, false);        
+
+        // section 10.2. move away from rock.
+        realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_NEW_MARKER, -0.375, -1, 400ms);  
+        pbf_move_left_joystick(context, {0, +1}, 1600ms, 800ms);
+
+        // section 11
+        realign_player_from_landmark(
+            env.program_info(), env.console, context, 
+            {ZoomChange::ZOOM_IN, +1, -1, 800ms},
+            {ZoomChange::KEEP_ZOOM, -1, +0.961, 1200ms}
+        );      
+        overworld_navigation(env.program_info(), env.console, context, 
+            NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+            0, +1, 40, 5, false);  
+
+        // section 12. reach the top. battle Bombirdier
+        realign_player_from_landmark(
+            env.program_info(), env.console, context, 
+            {ZoomChange::ZOOM_IN, +1, -1, 800ms},
+            {ZoomChange::KEEP_ZOOM, -0.609, +1, 1360ms}
+        );
+        try{
+            overworld_navigation(env.program_info(), env.console, context, 
+                NavigationStopCondition::STOP_BATTLE, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                0, +1, 40, 5, false);   
+        }catch (OperationFailedException&){ 
+            // likely attempted to open/close phone to realign, but failed
+            // likely already reached cutscene to battle Bombirdeier.
+
+            // keep waiting until battle detected.
+            overworld_navigation(env.program_info(), env.console, context, 
+                NavigationStopCondition::STOP_BATTLE, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                0, 0, 30, 30, false);          
+
+        }       
+
+        confirm_titan_battle(env, context);
+
+        env.console.log("Battle Bombirdier Titan phase 1.");
+        run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_DIALOG);
+        clear_dialog(env.console, context, ClearDialogMode::STOP_BATTLE, 30, {CallbackEnum::BATTLE});
+        // round 2 of battle 
+        env.console.log("Battle Bombirdier Titan phase 2.");
+        run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_DIALOG, {CallbackEnum::DIALOG_ARROW});
+        // get ride upgrade
+        mash_button_till_overworld(env.console, context, BUTTON_A);
+
+       
+    });
+
+}
+
+
+void checkpoint_31(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+){
+    
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){         
+        context.wait_for_all_requests();
+        // section 1. fall down the mountain
+        realign_player_from_landmark(
+            env.program_info(), env.console, context, 
+            {ZoomChange::ZOOM_IN, +1, +0.375, 1440ms},
+            {ZoomChange::KEEP_ZOOM, -1, -0.331, 960ms}
+        );        
+        overworld_navigation(env.program_info(), env.console, context, 
+            NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+            0, +1, 50, 10, false); 
+        // section 2
+        realign_player_from_landmark(
+            env.program_info(), env.console, context, 
+            {ZoomChange::ZOOM_IN, +1, +0.375, 800ms},
+            {ZoomChange::KEEP_ZOOM, -1, -1, 440ms}
+        );  
+        overworld_navigation(env.program_info(), env.console, context, 
+            NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+            0, +1, 40, 10, false);         
+        // section 3. align to pokecenter
+        realign_player_from_landmark(
+            env.program_info(), env.console, context, 
+            {ZoomChange::ZOOM_IN, +1, +1, 320ms},
+            {ZoomChange::KEEP_ZOOM, -1, +1, 0ms}
+        );  
+        overworld_navigation(env.program_info(), env.console, context, 
+            NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+            0, +1, 40, 10, false);      
+
+        // section 4. set marker past pokecenter
+        handle_unexpected_battles(env.program_info(), env.console, context,
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_NEW_MARKER, +1, +0.531, 320ms);
+        });
+        overworld_navigation(env.program_info(), env.console, context, 
+            NavigationStopCondition::STOP_TIME, NavigationMovementMode::DIRECTIONAL_ONLY, 
+            0, +0.883, 12, 12, false);   
+
+        fly_to_overlapping_flypoint(env.program_info(), env.console, context);
+       
+    });
+
+}
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_14.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_14.h
new file mode 100644
index 0000000000..28de8ff19f
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_14.h
@@ -0,0 +1,75 @@
+/*  Autostory
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_AutoStory_Segment_14_H
+#define PokemonAutomation_PokemonSV_AutoStory_Segment_14_H
+
+#include "PokemonSV_AutoStoryTools.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+class AutoStory_Segment_14 : public AutoStory_Segment{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_segment(
+        SingleSwitchProgramEnvironment& env, 
+        ProControllerContext& context,
+        AutoStoryOptions options,
+        AutoStoryStats& stats
+    ) const override;
+};
+
+class AutoStory_Checkpoint_30 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+class AutoStory_Checkpoint_31 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+
+
+// start: At West Province Area One Central Pokecenter
+// end: Defeated Bombirdier
+void checkpoint_30(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+);
+
+// start: Defeated Bombirdier
+// end: At West Province Area One North Pokecenter
+void checkpoint_31(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+);
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_15.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_15.cpp
new file mode 100644
index 0000000000..7d538e17d8
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_15.cpp
@@ -0,0 +1,348 @@
+/*  AutoStory
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_NoMinimapDetector.h"
+#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h"
+#include "PokemonSV_AutoStoryTools.h"
+#include "PokemonSV_AutoStory_Segment_15.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+//#include <unordered_map>
+//#include <algorithm>
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+
+std::string AutoStory_Segment_15::name() const{
+    return "15: Team Star (Dark)";
+}
+
+std::string AutoStory_Segment_15::start_text() const{
+    return "Start: Defeated Bombirder. At West Province Area One North Pokecenter.";
+}
+
+std::string AutoStory_Segment_15::end_text() const{
+    return "End: Defeated Team Star (Dark). At Cascarrafa (West) Pokecenter.";
+}
+
+void AutoStory_Segment_15::run_segment(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    AutoStoryOptions options,
+    AutoStoryStats& stats
+) const{
+    
+
+    stats.m_segment++;
+    env.update_stats();
+    context.wait_for_all_requests();
+    env.console.log("Start Segment " + name(), COLOR_ORANGE);
+
+    AutoStory_Checkpoint_32().run_checkpoint(env, context, options, stats);
+    AutoStory_Checkpoint_33().run_checkpoint(env, context, options, stats);
+    AutoStory_Checkpoint_34().run_checkpoint(env, context, options, stats);
+
+    context.wait_for_all_requests();
+    env.console.log("End Segment " + name(), COLOR_GREEN);
+
+}
+
+std::string AutoStory_Checkpoint_32::name() const{ return "032 - " + AutoStory_Segment_15().name(); }
+std::string AutoStory_Checkpoint_32::start_text() const{ return "At West Province Area One North Pokecenter";}
+std::string AutoStory_Checkpoint_32::end_text() const{ return "At West Province Area One North Pokecenter";}
+void AutoStory_Checkpoint_32::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_32(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+std::string AutoStory_Checkpoint_33::name() const{ return "033 - " + AutoStory_Segment_15().name(); }
+std::string AutoStory_Checkpoint_33::start_text() const{ return AutoStory_Checkpoint_32().end_text();}
+std::string AutoStory_Checkpoint_33::end_text() const{ return "Defeated Team Star (Dark) boss";}
+void AutoStory_Checkpoint_33::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_33(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+std::string AutoStory_Checkpoint_34::name() const{ return "034 - " + AutoStory_Segment_15().name(); }
+std::string AutoStory_Checkpoint_34::start_text() const{ return AutoStory_Checkpoint_33().end_text();}
+std::string AutoStory_Checkpoint_34::end_text() const{ return "At Cascarrafa (West) Pokecenter.";}
+void AutoStory_Checkpoint_34::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_34(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+
+void checkpoint_32(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+){
+    
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){         
+        // empty checkpoint, to preserve ordering
+       
+    }, false);
+
+}
+
+void checkpoint_33(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+){
+    
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){         
+        context.wait_for_all_requests();
+
+        if (attempt_number > 0 || ENABLE_TEST){
+            env.console.log("Fly to neighbouring Pokecenter, then fly back, to clear any pokemon covering the minimap.");
+            move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::KEEP_ZOOM, -0.375, -1, 680ms});
+            move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::KEEP_ZOOM, +0.409, +1, 680ms});
+        }
+
+        // section 1
+        realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_NEW_MARKER, -0.609, +1, 200ms);
+        overworld_navigation(env.program_info(), env.console, context, 
+            NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+            0, +1, 20, 10, false);           
+
+        // section 2
+        realign_player_from_landmark(
+            env.program_info(), env.console, context, 
+            {ZoomChange::KEEP_ZOOM, +1, +1, 640ms},
+            {ZoomChange::ZOOM_IN, -0.961, -0.803, 1160ms}
+        );          
+        overworld_navigation(env.program_info(), env.console, context, 
+            NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+            0, +1, 20, 10, false);        
+
+        // section 3
+        realign_player_from_landmark(
+            env.program_info(), env.console, context, 
+            {ZoomChange::KEEP_ZOOM, +1, +1, 480ms},
+            {ZoomChange::ZOOM_IN, -0.961, -0.606, 800ms}
+        );          
+        overworld_navigation(env.program_info(), env.console, context, 
+            NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+            0, +1, 20, 10, false); 
+
+        // section 4
+        realign_player_from_landmark(
+            env.program_info(), env.console, context, 
+            {ZoomChange::ZOOM_IN, 0, -1, 320ms},
+            {ZoomChange::KEEP_ZOOM, +1, +1, 880ms}
+        );          
+        overworld_navigation(env.program_info(), env.console, context, 
+            NavigationStopCondition::STOP_DIALOG, NavigationMovementMode::DIRECTIONAL_ONLY, 
+            0, +1, 20, 10, false);        
+
+        mash_button_till_overworld(env.console, context, BUTTON_A, 360);
+
+        // section 5
+        realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_NEW_MARKER, +1, -1, 400ms);
+        overworld_navigation(env.program_info(), env.console, context, 
+            NavigationStopCondition::STOP_DIALOG, NavigationMovementMode::DIRECTIONAL_ONLY, 
+            0, +1, 30, 30, false);       
+
+        // battle team star grunts
+        clear_dialog(env.console, context, ClearDialogMode::STOP_BATTLE, 60, {CallbackEnum::BATTLE, CallbackEnum::PROMPT_DIALOG, CallbackEnum::DIALOG_ARROW});
+        env.console.log("Battle Team star grunt.");
+        run_trainer_battle_press_A(env.console, context, BattleStopCondition::STOP_DIALOG);
+        clear_dialog(env.console, context, ClearDialogMode::STOP_OVERWORLD, 60, {CallbackEnum::OVERWORLD, CallbackEnum::BLACK_DIALOG_BOX});
+
+
+        // enter the base
+        realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_NEW_MARKER, +1, -1, 400ms);
+        overworld_navigation(env.program_info(), env.console, context, 
+            NavigationStopCondition::STOP_DIALOG, NavigationMovementMode::DIRECTIONAL_SPAM_A, 
+            0, +1, 20, 20, false);       
+
+        clear_dialog(env.console, context, ClearDialogMode::STOP_OVERWORLD, 60, {CallbackEnum::OVERWORLD, CallbackEnum::PROMPT_DIALOG, CallbackEnum::TUTORIAL});
+        NoMinimapWatcher no_minimap(env.console.logger(), COLOR_RED, Milliseconds(250));
+        int ret = run_until<ProControllerContext>(
+            env.console, context,
+            [&](ProControllerContext& context){
+
+                DirectionDetector direction;
+                Milliseconds wait = 6000ms;
+
+                pbf_move_left_joystick(context, {0, +1}, 2000ms, 800ms);
+                direction.change_direction(env.program_info(), env.console, context, 3);
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 800ms);
+                pbf_press_button(context, BUTTON_R, 160ms, 160ms);
+                pbf_wait(context, wait);
+
+                direction.change_direction(env.program_info(), env.console, context, 4.1);
+                pbf_move_left_joystick(context, {0, +1}, 6000ms, 800ms);
+                pbf_press_button(context, BUTTON_R, 160ms, 160ms);
+                pbf_wait(context, wait);
+
+                direction.change_direction(env.program_info(), env.console, context, 5.04);
+                pbf_move_left_joystick(context, {0, +1}, 2000ms, 800ms);
+                pbf_press_button(context, BUTTON_R, 160ms, 160ms);
+                pbf_wait(context, wait);
+
+                pbf_move_left_joystick(context, {0, +1}, 4000ms, 800ms);
+                direction.change_direction(env.program_info(), env.console, context, 5.39);
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 800ms);
+                pbf_press_button(context, BUTTON_R, 160ms, 160ms);
+                pbf_wait(context, wait);
+
+                direction.change_direction(env.program_info(), env.console, context, 5.076);
+                pbf_move_left_joystick(context, {0, +1}, 4000ms, 800ms);
+                pbf_press_button(context, BUTTON_R, 160ms, 160ms);
+                pbf_wait(context, wait);
+
+                pbf_move_left_joystick(context, {0, +1}, 2000ms, 800ms);
+                direction.change_direction(env.program_info(), env.console, context, 4.800);
+                pbf_move_left_joystick(context, {0, +1}, 2000ms, 800ms);
+                pbf_press_button(context, BUTTON_R, 160ms, 160ms);
+                pbf_wait(context, wait);
+
+                pbf_move_left_joystick(context, {0, +1}, 4000ms, 800ms);
+                pbf_press_button(context, BUTTON_R, 160ms, 160ms);
+                pbf_wait(context, wait);
+
+                direction.change_direction(env.program_info(), env.console, context, 5.32);
+                pbf_move_left_joystick(context, {0, +1}, 2000ms, 800ms);
+                pbf_press_button(context, BUTTON_R, 160ms, 160ms);
+                pbf_wait(context, wait);
+
+                direction.change_direction(env.program_info(), env.console, context, 6.16);
+                pbf_move_left_joystick(context, {0, +1}, 2000ms, 800ms);
+                pbf_press_button(context, BUTTON_R, 160ms, 160ms);
+                pbf_wait(context, wait);
+
+                try{
+                    direction.change_direction(env.program_info(), env.console, context, 0.541);
+                    pbf_move_left_joystick(context, {0, +1}, 4000ms, 800ms);
+                    pbf_press_button(context, BUTTON_R, 160ms, 160ms);
+                    pbf_wait(context, wait);
+
+                    direction.change_direction(env.program_info(), env.console, context, 1.41);
+                    pbf_move_left_joystick(context, {0, +1}, 2800ms, 800ms);
+                    pbf_press_button(context, BUTTON_R, 160ms, 160ms);
+                    pbf_wait(context, wait);
+
+                    direction.change_direction(env.program_info(), env.console, context, 2.34);
+                    pbf_move_left_joystick(context, {0, +1}, 2000ms, 800ms);
+                    pbf_press_button(context, BUTTON_R, 160ms, 160ms);
+                    pbf_wait(context, wait);
+
+                    direction.change_direction(env.program_info(), env.console, context, 1.556);
+                    pbf_move_left_joystick(context, {0, +1}, 4000ms, 800ms);
+                    pbf_press_button(context, BUTTON_R, 160ms, 160ms);
+                    pbf_wait(context, wait);
+                    
+                    pbf_wait(context, 20000ms);
+                }catch (OperationFailedException&){
+                    env.console.log("Failed to change direction, but it's possibly due to clearing the challenge.");
+                    pbf_wait(context, 20000ms);
+                }
+
+            },
+            {no_minimap}
+        );
+        context.wait_for(std::chrono::milliseconds(100));
+        if (ret < 0){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "checkpoint_33(): Failed to kill 30 pokemon with Let's go.",
+                env.console
+            );            
+        }
+        clear_dialog(env.console, context, ClearDialogMode::STOP_BATTLE, 60, {CallbackEnum::BATTLE, CallbackEnum::DIALOG_ARROW});
+        env.console.log("Battle the Team Star (Dark) boss.");
+        run_trainer_battle_press_A(env.console, context, BattleStopCondition::STOP_DIALOG);
+        mash_button_till_overworld(env.console, context, BUTTON_A, 360);
+
+
+    });
+
+}
+
+void checkpoint_34(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+){
+    
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){         
+        context.wait_for_all_requests();
+
+        // the landmark Pokecenter is far enough away from current location, that the map Pokemon don't cover it.
+        // section 1
+        realign_player_from_landmark(
+            env.program_info(), env.console, context, 
+            {ZoomChange::KEEP_ZOOM, -1, 0, 320ms},
+            {ZoomChange::ZOOM_IN, +0.803, +1, 800ms}
+        );          
+        overworld_navigation(env.program_info(), env.console, context, 
+            NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+            0, +1, 40, 10, false);   
+        
+        // section 2
+        realign_player_from_landmark(
+            env.program_info(), env.console, context, 
+            {ZoomChange::KEEP_ZOOM, +1, +0.219, 240ms},
+            {ZoomChange::ZOOM_IN, -1, -0.882, 320ms}
+        );          
+        overworld_navigation(env.program_info(), env.console, context, 
+            NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+            0, +1, 20, 10, false);        
+
+        // section 3. set marker to pokecenter
+        realign_player_from_landmark(
+            env.program_info(), env.console, context, 
+            {ZoomChange::KEEP_ZOOM, -1, +1, 0ms},
+            {ZoomChange::ZOOM_IN, -1, +1, 0ms}
+        );          
+        overworld_navigation(env.program_info(), env.console, context, 
+            NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+            0, +1, 20, 10, false);    
+
+        // section 4. set marker past pokecenter
+        realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_NEW_MARKER, +1, +0.688, 800ms);
+        overworld_navigation(env.program_info(), env.console, context, 
+            NavigationStopCondition::STOP_TIME, NavigationMovementMode::DIRECTIONAL_ONLY, 
+            0, +0.883, 12, 12, false);     
+
+        fly_to_overlapping_flypoint(env.program_info(), env.console, context);
+       
+    });
+
+}
+
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_15.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_15.h
new file mode 100644
index 0000000000..76129d83b2
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_15.h
@@ -0,0 +1,93 @@
+/*  Autostory
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_AutoStory_Segment_15_H
+#define PokemonAutomation_PokemonSV_AutoStory_Segment_15_H
+
+#include "PokemonSV_AutoStoryTools.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+class AutoStory_Segment_15 : public AutoStory_Segment{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_segment(
+        SingleSwitchProgramEnvironment& env, 
+        ProControllerContext& context,
+        AutoStoryOptions options,
+        AutoStoryStats& stats
+    ) const override;
+};
+
+class AutoStory_Checkpoint_32 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+class AutoStory_Checkpoint_33 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+class AutoStory_Checkpoint_34 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+
+
+// start: At West Province Area One North Pokecenter
+// end: At West Province Area One North Pokecenter
+void checkpoint_32(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+);
+
+// start: At West Province Area One North Pokecenter
+// end: Defeated Team Star (Dark) boss
+void checkpoint_33(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+);
+
+// start: Defeated Team Star (Dark) boss
+// end: At Cascarrafa (West) Pokecenter.
+void checkpoint_34(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+);
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_16.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_16.cpp
new file mode 100644
index 0000000000..8bec9098fe
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_16.cpp
@@ -0,0 +1,203 @@
+/*  AutoStory
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+
+#include "CommonFramework/Exceptions/OperationFailedException.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h"
+#include "PokemonSV_AutoStoryTools.h"
+#include "PokemonSV_AutoStory_Segment_16.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+//#include <unordered_map>
+//#include <algorithm>
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+
+std::string AutoStory_Segment_16::name() const{
+    return "16: Cascarrafa Gym (Water): Get Kofu's wallet";
+}
+
+std::string AutoStory_Segment_16::start_text() const{
+    return "Start: Defeated Team Star (Dark). At Cascarrafa (West) Pokecenter.";
+}
+
+std::string AutoStory_Segment_16::end_text() const{
+    return "End: Received Kofu's wallet. At Porto Marinada Pokecenter.";
+}
+
+void AutoStory_Segment_16::run_segment(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    AutoStoryOptions options,
+    AutoStoryStats& stats
+) const{
+    
+
+    stats.m_segment++;
+    env.update_stats();
+    context.wait_for_all_requests();
+    env.console.log("Start Segment " + name(), COLOR_ORANGE);
+
+    AutoStory_Checkpoint_35().run_checkpoint(env, context, options, stats);
+    AutoStory_Checkpoint_36().run_checkpoint(env, context, options, stats);
+
+    context.wait_for_all_requests();
+    env.console.log("End Segment " + name(), COLOR_GREEN);
+
+}
+
+std::string AutoStory_Checkpoint_35::name() const{ return "035 - " + AutoStory_Segment_16().name(); }
+std::string AutoStory_Checkpoint_35::start_text() const{ return "At Cascarrafa (West) Pokecenter.";}
+std::string AutoStory_Checkpoint_35::end_text() const{ return "Outside Cascarrafa Gym. Received Kofu's wallet.";}
+void AutoStory_Checkpoint_35::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_35(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+std::string AutoStory_Checkpoint_36::name() const{ return "036 - " + AutoStory_Segment_16().name(); }
+std::string AutoStory_Checkpoint_36::start_text() const{ return AutoStory_Checkpoint_35().end_text();}
+std::string AutoStory_Checkpoint_36::end_text() const{ return "At Porto Marinada Pokecenter.";}
+void AutoStory_Checkpoint_36::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_36(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+void checkpoint_35(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+){
+    
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){         
+        context.wait_for_all_requests();
+        DirectionDetector direction;
+        
+        if (attempt_number > 0 || ENABLE_TEST){
+            env.console.log("Fly to neighbouring Pokecenter, then fly back, to clear any pokemon covering the minimap.");
+            move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::KEEP_ZOOM, -1, +1, 0ms});
+            move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::KEEP_ZOOM, -1, +1, 0ms});
+        }
+
+        do_action_and_monitor_for_battles(env.program_info(), env.console, context,
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                direction.change_direction(env.program_info(), env.console, context, 0.3491);
+                pbf_move_left_joystick(context, {0, +1}, 3200ms, 800ms);
+                direction.change_direction(env.program_info(), env.console, context, 5.075911);
+                pbf_move_left_joystick(context, {0, +1}, 4200ms, 800ms);
+        });
+
+        direction.change_direction(env.program_info(), env.console, context, 3.771252);
+        get_on_ride(env.program_info(), env.console, context);
+        // walk towards elevator
+        pbf_move_left_joystick(context, {0, +1}, 5600ms, 800ms);
+        // jump to ensure you get on elevator
+        pbf_controller_state(context, BUTTON_B, DPAD_NONE, {0, +1}, {0, 0}, 1600ms);
+        pbf_wait(context, 3000ms);
+        // wait for overworld to reappear after stepping off elevator
+        wait_for_overworld(env.program_info(), env.console, context, 30);
+
+        pbf_move_left_joystick(context, {0, +1}, 960ms, 800ms);
+        direction.change_direction(env.program_info(), env.console, context, 5.11);  
+        walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_ONLY, 20000ms);
+        mash_button_till_overworld(env.console, context, BUTTON_A);
+       
+    });
+
+}
+
+void checkpoint_36(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+){
+    
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){         
+        context.wait_for_all_requests();
+
+        // At this startpoint, no Pokemon show up on minimap/map
+
+        // fly from Cascaraffa Gym to Cascaraffa North Pokecenter
+        move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::ZOOM_IN, -0.219, +1, 640ms});
+
+        // section 1
+        // warning: can't reliably set the marker when in Cascarrafa, possibly due to too many NPCs. worse when sandstorm is up.
+        // what happens is that the program doesn't reliably push the cursor as much as it should
+        realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_NEW_MARKER, -1, -0.055, 3280ms);
+        overworld_navigation(env.program_info(), env.console, context, 
+            NavigationStopCondition::STOP_DIALOG, NavigationMovementMode::DIRECTIONAL_ONLY, 
+            0, +1, 60, 20, false);
+        // talk to Arven over phone
+        mash_button_till_overworld(env.console, context, BUTTON_A, 360);
+
+        // section 2
+        realign_player_from_landmark(
+            env.program_info(), env.console, context, 
+            {ZoomChange::KEEP_ZOOM, -1, +1, 640ms},
+            {ZoomChange::ZOOM_IN, +1, -1, 880ms}
+        );
+        overworld_navigation(env.program_info(), env.console, context, 
+            NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+            0, +1, 60, 20, false);
+
+        // section 3
+        realign_player_from_landmark(
+            env.program_info(), env.console, context, 
+            {ZoomChange::KEEP_ZOOM, -1, +1, 320ms},
+            {ZoomChange::ZOOM_IN, +1, 0, 360ms}
+        );
+        overworld_navigation(env.program_info(), env.console, context, 
+            NavigationStopCondition::STOP_DIALOG, NavigationMovementMode::DIRECTIONAL_ONLY, 
+            0, +1, 30, 10, false);
+        
+        // cutscene with Kofu looking at flowers
+        mash_button_till_overworld(env.console, context, BUTTON_A, 360);            
+
+        // section 4. set marker to pokecenter
+        realign_player_from_landmark(
+            env.program_info(), env.console, context, 
+            {ZoomChange::KEEP_ZOOM, -1, +1, 0ms},
+            {ZoomChange::ZOOM_IN, -1, +1, 0ms}
+        );      
+        overworld_navigation(env.program_info(), env.console, context, 
+            NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+            0, +1, 20, 10, false);   
+
+        // section 5. set marker past pokecenter
+        realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_NEW_MARKER, -1, +0.219, 240ms);
+        overworld_navigation(env.program_info(), env.console, context, 
+            NavigationStopCondition::STOP_TIME, NavigationMovementMode::DIRECTIONAL_ONLY, 
+            0, +0.883, 12, 12, false);     
+
+        fly_to_overlapping_flypoint(env.program_info(), env.console, context);           
+       
+    });
+
+}
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_16.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_16.h
new file mode 100644
index 0000000000..3879e72c57
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_16.h
@@ -0,0 +1,76 @@
+/*  Autostory
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_AutoStory_Segment_16_H
+#define PokemonAutomation_PokemonSV_AutoStory_Segment_16_H
+
+#include "PokemonSV_AutoStoryTools.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+class AutoStory_Segment_16 : public AutoStory_Segment{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_segment(
+        SingleSwitchProgramEnvironment& env, 
+        ProControllerContext& context,
+        AutoStoryOptions options,
+        AutoStoryStats& stats
+    ) const override;
+};
+
+class AutoStory_Checkpoint_35 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+class AutoStory_Checkpoint_36 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+
+
+// start: At Cascarrafa (West) Pokecenter.
+// end: Outside Cascarrafa Gym. Received Kofu's wallet.
+void checkpoint_35(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+);
+
+// start: Outside Cascarrafa Gym. Received Kofu's wallet.
+// end: At Porto Marinada Pokecenter.
+void checkpoint_36(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+);
+
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_17.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_17.cpp
new file mode 100644
index 0000000000..83c53c4e0c
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_17.cpp
@@ -0,0 +1,205 @@
+/*  AutoStory
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+
+#include "CommonFramework/Exceptions/OperationFailedException.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h"
+#include "PokemonSV_AutoStoryTools.h"
+#include "PokemonSV_AutoStory_Segment_17.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+//#include <unordered_map>
+//#include <algorithm>
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+
+std::string AutoStory_Segment_17::name() const{
+    return "17: Cascarrafa Gym (Water): Gym challenge and Gym battle";
+}
+
+std::string AutoStory_Segment_17::start_text() const{
+    return "Start: Received Kofu's wallet. At Porto Marinada Pokecenter.";
+}
+
+std::string AutoStory_Segment_17::end_text() const{
+    return "End: Defeated Cascarrafa Gym (Water). At Porto Marinada Pokecenter.";
+}
+
+void AutoStory_Segment_17::run_segment(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    AutoStoryOptions options,
+    AutoStoryStats& stats
+) const{
+    
+
+    stats.m_segment++;
+    env.update_stats();
+    context.wait_for_all_requests();
+    env.console.log("Start Segment " + name(), COLOR_ORANGE);
+
+    AutoStory_Checkpoint_37().run_checkpoint(env, context, options, stats);
+    AutoStory_Checkpoint_38().run_checkpoint(env, context, options, stats);
+
+    context.wait_for_all_requests();
+    env.console.log("End Segment " + name(), COLOR_GREEN);
+
+}
+
+std::string AutoStory_Checkpoint_37::name() const{ return "037 - " + AutoStory_Segment_17().name(); }
+std::string AutoStory_Checkpoint_37::start_text() const{ return "At Porto Marinada Pokecenter.";}
+std::string AutoStory_Checkpoint_37::end_text() const{ return "Won auction at Porto Marinada, passed Gym challenge.";}
+void AutoStory_Checkpoint_37::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_37(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+std::string AutoStory_Checkpoint_38::name() const{ return "038 - " + AutoStory_Segment_17().name(); }
+std::string AutoStory_Checkpoint_38::start_text() const{ return AutoStory_Checkpoint_37().end_text();}
+std::string AutoStory_Checkpoint_38::end_text() const{ return "Defeat Cascarrafa Gym. At Porto Marinada Pokecenter.";}
+void AutoStory_Checkpoint_38::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_38(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+void checkpoint_37(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+){
+    
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){         
+        context.wait_for_all_requests();
+        DirectionDetector direction;
+        if (attempt_number > 0 || ENABLE_TEST){
+            env.console.log("Fly to neighbouring Pokecenter, then fly back, to clear any pokemon covering the minimap.");
+            move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::ZOOM_OUT, +1, 0, 400ms});
+            move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::ZOOM_OUT, -1, 0, 640ms});
+        }
+
+        do_action_and_monitor_for_battles(env.program_info(), env.console, context,
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_NEW_MARKER, -1, -1, 400ms);
+
+                // section 1
+                direction.change_direction(env.program_info(), env.console, context, 1.606);
+                pbf_move_left_joystick(context, {0, +1}, 1600ms, 800ms);
+
+                get_on_ride(env.program_info(), env.console, context);
+
+                // section 2
+                realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+        });
+
+        overworld_navigation(env.program_info(), env.console, context, 
+            NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+            0, +1, 30, 10, false);          
+        // section 3. set marker to shop/Kofu
+        realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_NEW_MARKER, -1, -0.094, 216ms);
+        walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_ONLY, 20000ms);
+
+        clear_dialog(env.console, context, ClearDialogMode::STOP_BATTLE, 60, {CallbackEnum::BATTLE, CallbackEnum::PROMPT_DIALOG, CallbackEnum::DIALOG_ARROW});
+        env.console.log("Battle Kofu's assistant.");
+        run_trainer_battle_press_A(env.console, context, BattleStopCondition::STOP_DIALOG);
+        mash_button_till_overworld(env.console, context, BUTTON_A, 360);
+
+       
+    });
+
+}
+
+void checkpoint_38(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+){
+    
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){         
+        context.wait_for_all_requests();
+        move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::KEEP_ZOOM, +1, -0.409, 1360ms});
+        DirectionDetector direction;
+        // recently flew a significant distance, so minimap should be clear of Pokemon
+        
+        do_action_and_monitor_for_battles(env.program_info(), env.console, context,
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                direction.change_direction(env.program_info(), env.console, context, 0.3491);
+                pbf_move_left_joystick(context, {0, +1}, 3200ms, 800ms);
+                direction.change_direction(env.program_info(), env.console, context, 5.075911);
+                pbf_move_left_joystick(context, {0, +1}, 4200ms, 800ms);
+        });
+
+        direction.change_direction(env.program_info(), env.console, context, 3.771252);
+        get_on_ride(env.program_info(), env.console, context);
+        // walk towards elevator
+        pbf_move_left_joystick(context, {0, +1}, 5600ms, 800ms);
+        // jump to ensure you get on elevator
+        pbf_controller_state(context, BUTTON_B, DPAD_NONE, {0, +1}, {0, 0}, 1600ms);
+        pbf_wait(context, 3000ms);
+        // wait for overworld to reappear after stepping off elevator
+        wait_for_overworld(env.program_info(), env.console, context, 30);
+
+        pbf_move_left_joystick(context, {0, +1}, 960ms, 800ms);
+
+        direction.change_direction(env.program_info(), env.console, context, 5.11);  
+        pbf_move_left_joystick(context, {0, +1}, 12800ms, 800ms);
+        direction.change_direction(env.program_info(), env.console, context, 3.2245);          
+        
+        
+        handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_ONLY, 18000ms);
+            }, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_move_left_joystick(context, {+1, +1}, 800ms, 400ms);
+                pbf_move_left_joystick(context, {-1, +1}, 800ms, 400ms);
+            }
+        );         
+        // talk to Nemona
+        mash_button_till_overworld(env.console, context, BUTTON_A, 360);
+
+        // talk to reception. Battle Kofu
+        walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_SPAM_A, 10000ms);
+        clear_dialog(env.console, context, ClearDialogMode::STOP_BATTLE, 60, {CallbackEnum::BATTLE, CallbackEnum::PROMPT_DIALOG, CallbackEnum::DIALOG_ARROW});
+        env.console.log("Battle Water Gym.");
+        run_trainer_battle_press_A(env.console, context, BattleStopCondition::STOP_DIALOG);
+        mash_button_till_overworld(env.console, context, BUTTON_A, 360);
+        
+        // Gym now defeated. now in Cascaraffa gym building
+        context.wait_for_all_requests();
+        pbf_move_left_joystick(context, {0, -1}, 2400ms, 800ms);
+        pbf_wait(context, 3000ms);
+        // wait for overworld after leaving Gym
+        wait_for_overworld(env.program_info(), env.console, context, 30);
+
+        // fly to Porto Marinada pokecenter
+        move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::KEEP_ZOOM, -1, +0.375, 1200ms});
+
+    });
+
+}
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_17.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_17.h
new file mode 100644
index 0000000000..6016b2ebbd
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_17.h
@@ -0,0 +1,74 @@
+/*  Autostory
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_AutoStory_Segment_17_H
+#define PokemonAutomation_PokemonSV_AutoStory_Segment_17_H
+
+#include "PokemonSV_AutoStoryTools.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+class AutoStory_Segment_17 : public AutoStory_Segment{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_segment(
+        SingleSwitchProgramEnvironment& env, 
+        ProControllerContext& context,
+        AutoStoryOptions options,
+        AutoStoryStats& stats
+    ) const override;
+};
+
+class AutoStory_Checkpoint_37 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+class AutoStory_Checkpoint_38 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+
+
+// start: At Porto Marinada Pokecenter.
+// end: Won auction at Porto Marinada, passed Gym challenge.
+void checkpoint_37(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+);
+
+// start: Won auction at Porto Marinada, passed Gym challenge.
+// end: Defeat Cascarrafa Gym. At Porto Marinada Pokecenter.
+void checkpoint_38(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+);
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_18.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_18.cpp
new file mode 100644
index 0000000000..997665eaa8
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_18.cpp
@@ -0,0 +1,375 @@
+/*  AutoStory
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h"
+#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h"
+#include "PokemonSV_AutoStoryTools.h"
+#include "PokemonSV_AutoStory_Segment_18.h"
+
+// #include <iostream>
+//using std::cout;
+//using std::endl;
+//#include <unordered_map>
+//#include <algorithm>
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+
+std::string AutoStory_Segment_18::name() const{
+    return "18: Great Tusk/Iron Treads titan";
+}
+
+std::string AutoStory_Segment_18::start_text() const{
+    return "Start: Defeated Cascarrafa Gym (Water). At Porto Marinada Pokecenter.";
+}
+
+std::string AutoStory_Segment_18::end_text() const{
+    return "End: Defeated Great Tusk/Iron Treads. At South Province (Area Three) Pokecenter.";
+}
+
+void AutoStory_Segment_18::run_segment(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    AutoStoryOptions options,
+    AutoStoryStats& stats
+) const{
+    
+
+    stats.m_segment++;
+    env.update_stats();
+    context.wait_for_all_requests();
+    env.console.log("Start Segment " + name(), COLOR_ORANGE);
+
+    AutoStory_Checkpoint_39().run_checkpoint(env, context, options, stats);
+    AutoStory_Checkpoint_40().run_checkpoint(env, context, options, stats);
+
+    context.wait_for_all_requests();
+    env.console.log("End Segment " + name(), COLOR_GREEN);
+
+}
+
+std::string AutoStory_Checkpoint_39::name() const{ return "039 - " + AutoStory_Segment_18().name(); }
+std::string AutoStory_Checkpoint_39::start_text() const{ return "Defeated Cascarrafa Gym (Water). At Porto Marinada Pokecenter.";}
+std::string AutoStory_Checkpoint_39::end_text() const{ return "Defeated Great Tusk/Iron Treads.";}
+void AutoStory_Checkpoint_39::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_39(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+std::string AutoStory_Checkpoint_40::name() const{ return "040 - " + AutoStory_Segment_18().name(); }
+std::string AutoStory_Checkpoint_40::start_text() const{ return AutoStory_Checkpoint_39().end_text();}
+std::string AutoStory_Checkpoint_40::end_text() const{ return "At South Province (Area Three) Pokecenter.";}
+void AutoStory_Checkpoint_40::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_40(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+
+
+
+void checkpoint_39(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+){
+    
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){         
+        context.wait_for_all_requests();
+
+        DirectionDetector direction;
+        // recently flew a significant distance, so minimap should be clear of Pokemon
+        // flew from Cascaraffa gym building to Porto Marinada Pokecenter
+        
+        // section 1
+        do_action_and_monitor_for_battles(env.program_info(), env.console, context,
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                direction.change_direction(env.program_info(), env.console, context, 4.677921);
+                pbf_move_left_joystick(context, {0, +1}, 1200ms, 800ms);
+        });        
+
+        // section 2
+        realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_NEW_MARKER, +1, -0.803, 960ms);
+        overworld_navigation(env.program_info(), env.console, context, 
+            NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+            0, +1, 60, 10, false);         
+
+        // section 3. enter circle
+        realign_player_from_landmark(
+            env.program_info(), env.console, context,
+            {ZoomChange::KEEP_ZOOM, -1, +1, 400ms},
+            {ZoomChange::ZOOM_IN, +0.37, -1, 960ms}
+        );        
+
+        overworld_navigation(env.program_info(), env.console, context, 
+            NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+            0, +1, 60, 10, false);         
+
+        DialogBoxWatcher        dialog(COLOR_RED, true);
+
+        // section 4
+        int ret = run_until<ProControllerContext>(
+            env.console, context,
+            [&](ProControllerContext& context){
+                // run around in circles until you run into the titan
+                WallClock start = current_time();
+
+                while (true){
+                    if (current_time() - start > std::chrono::minutes(30)){
+                        break;
+                    }
+                    // std::cout << "1:00" << std::endl;
+                    realign_player_from_landmark(
+                        env.program_info(), env.console, context, 
+                        {ZoomChange::KEEP_ZOOM, 0, +1, 400ms},
+                        {ZoomChange::ZOOM_IN, +0.252, -1, 720ms}
+                    );           
+                    overworld_navigation(env.program_info(), env.console, context, 
+                        NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                        0, +1, 36, 12, false);  
+
+
+                    // std::cout << "11:00" << std::endl;
+                    realign_player_from_landmark(
+                        env.program_info(), env.console, context, 
+                        {ZoomChange::KEEP_ZOOM, 0, +1, 400ms},
+                        {ZoomChange::ZOOM_IN, +0.055, -1, 720ms}
+                    );           
+                    overworld_navigation(env.program_info(), env.console, context, 
+                        NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                        0, +1, 30, 10, false);       
+
+
+                    // std::cout << "10:00" << std::endl;
+                    realign_player_from_landmark(
+                        env.program_info(), env.console, context, 
+                        {ZoomChange::KEEP_ZOOM, 0, +1, 400ms},
+                        {ZoomChange::ZOOM_IN, -0.062, -1, 840ms}
+                    );           
+                    overworld_navigation(env.program_info(), env.console, context, 
+                        NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                        0, +1, 30, 10, false);            
+
+                    // std::cout << "7:00" << std::endl;
+                    realign_player_from_landmark(
+                        env.program_info(), env.console, context, 
+                        {ZoomChange::KEEP_ZOOM, 0, +1, 400ms},
+                        {ZoomChange::ZOOM_IN, -0.102, -1, 1016ms}
+                    );           
+                    overworld_navigation(env.program_info(), env.console, context, 
+                        NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                        0, +1, 48, 12, false);            
+
+                    // std::cout << "6:00" << std::endl;
+                    realign_player_from_landmark(
+                        env.program_info(), env.console, context, 
+                        {ZoomChange::KEEP_ZOOM, 0, +1, 400ms},
+                        {ZoomChange::ZOOM_IN, +0.055, -1, 1096ms}
+                    );           
+                    overworld_navigation(env.program_info(), env.console, context, 
+                        NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                        0, +1, 30, 10, false);    
+
+                    // std::cout << "2:00" << std::endl;
+                    realign_player_from_landmark(
+                        env.program_info(), env.console, context, 
+                        {ZoomChange::KEEP_ZOOM, 0, +1, 400ms},
+                        {ZoomChange::ZOOM_IN, +0.567, -1, 960ms}
+                    );           
+                    overworld_navigation(env.program_info(), env.console, context, 
+                        NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                        0, +1, 50, 10, false);    
+                }                 
+
+            },
+            {dialog}
+        );
+        if (ret < 0){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "checkpoint_39(): Failed to run into Great Tusk/Iron Treads.",
+                env.console
+            );            
+        }
+
+        // battle the titan phase 1
+        clear_dialog(env.console, context, ClearDialogMode::STOP_BATTLE, 60, {CallbackEnum::BATTLE, CallbackEnum::BLACK_DIALOG_BOX});
+
+        confirm_titan_battle(env, context);
+
+        env.console.log("Battle Great Tusk/Iron Treads Titan phase 1.");
+        run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+
+        // section 5
+        realign_player_from_landmark(
+            env.program_info(), env.console, context, 
+            {ZoomChange::KEEP_ZOOM, 0, +1, 320ms},
+            {ZoomChange::ZOOM_IN, -0.047, -1, 1040ms}
+        );           
+        overworld_navigation(env.program_info(), env.console, context, 
+            NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+            0, +1, 20, 10, false);  
+
+        // section 6
+        realign_player_from_landmark(
+            env.program_info(), env.console, context, 
+            {ZoomChange::KEEP_ZOOM, 0, +1, 400ms},
+            {ZoomChange::ZOOM_IN, -0.297, -1, 1360ms}
+        );       
+
+        overworld_navigation(env.program_info(), env.console, context, 
+            NavigationStopCondition::STOP_DIALOG, NavigationMovementMode::DIRECTIONAL_ONLY, 
+            0, +1, 40, 40, false);        
+
+        // battle the titan phase 2
+        clear_dialog(env.console, context, ClearDialogMode::STOP_BATTLE, 60, {CallbackEnum::BATTLE});  
+
+        confirm_titan_battle(env, context);
+        
+        env.console.log("Battle Great Tusk/Iron Treads Titan phase 2.");
+        run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_DIALOG, {CallbackEnum::DIALOG_ARROW});
+        mash_button_till_overworld(env.console, context, BUTTON_A, 360);
+       
+    });
+
+}
+
+void checkpoint_40(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+){
+    
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){         
+        context.wait_for_all_requests();
+        // fly to Mesagoza East from Great Tusk/Iron Treads
+        // this clears Pokemon in minimap
+        move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::KEEP_ZOOM, +1, -0.449, 3520ms});
+
+        // place down marker, for section 1
+        realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_NEW_MARKER, +1, -0.409, 720ms);
+
+        DirectionDetector direction;
+        // recently flew a significant distance, so minimap should be clear of Pokemon, or at least the Pokemon have been reset
+        
+        direction.change_direction(env.program_info(), env.console, context, 5.60);
+
+        get_on_ride(env.program_info(), env.console, context);
+
+        // jump over the fence to exit Mesagoza
+        pbf_move_left_joystick(context, {0, +1}, 1600ms, 400ms);
+        pbf_controller_state(context, BUTTON_B, DPAD_NONE, {0, +1}, {0, 0}, 1600ms);
+
+        wait_for_overworld(env.program_info(), env.console, context);
+
+        // section 1
+        realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+        handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                overworld_navigation(env.program_info(), env.console, context, 
+                    NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                    0, +1, 30, 10, false);
+            }, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_move_left_joystick(context, {+1, 0}, 320ms, 400ms);
+                realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+            }
+        ); 
+        
+        // section 2
+        realign_player_from_landmark(
+            env.program_info(), env.console, context, 
+            {ZoomChange::KEEP_ZOOM, -1, 0, 320ms},
+            {ZoomChange::ZOOM_IN, +1, -0.094, 800ms}
+        );  
+        handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                overworld_navigation(env.program_info(), env.console, context, 
+                    NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                    0, +1, 30, 10, false);
+            }, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_move_left_joystick(context, {+1, 0}, 320ms, 400ms);
+                realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+            }
+        );   
+
+        // section 3
+        realign_player_from_landmark(
+            env.program_info(), env.console, context, 
+            {ZoomChange::KEEP_ZOOM, -1, -0.173, 400ms},
+            {ZoomChange::ZOOM_IN, +1, +0.297, 960ms}
+        );  
+        handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                overworld_navigation(env.program_info(), env.console, context, 
+                    NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                    0, +1, 30, 10, false);
+            }, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_move_left_joystick(context, {-1, +1}, 320ms, 400ms);
+                realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+            }
+        );               
+
+        // section 4. set marker to pokecenter
+        realign_player_from_landmark(
+            env.program_info(), env.console, context, 
+            {ZoomChange::ZOOM_IN, +1, +0.609, 240ms},
+            {ZoomChange::KEEP_ZOOM, -1, +1, 0ms}
+        );  
+
+        handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                overworld_navigation(env.program_info(), env.console, context, 
+                    NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                    0, +1, 20, 10, false);
+            }, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_move_left_joystick(context, {+1, +1}, 320ms, 400ms);
+                realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+            }
+        );             
+
+        // section 5. set marker past pokecenter
+        handle_unexpected_battles(env.program_info(), env.console, context,
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_NEW_MARKER, +1, -0.252, 320ms);
+        });      
+        overworld_navigation(env.program_info(), env.console, context, 
+            NavigationStopCondition::STOP_TIME, NavigationMovementMode::DIRECTIONAL_ONLY, 
+            0, +0.883, 12, 12, false);           // can't wrap in handle_when_stationary_in_overworld(), since we expect to be stationary when walking into the pokecenter
+          
+
+        fly_to_overlapping_flypoint(env.program_info(), env.console, context); 
+
+    });
+
+}
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_18.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_18.h
new file mode 100644
index 0000000000..0d293da7c5
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_18.h
@@ -0,0 +1,75 @@
+/*  Autostory
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_AutoStory_Segment_18_H
+#define PokemonAutomation_PokemonSV_AutoStory_Segment_18_H
+
+#include "PokemonSV_AutoStoryTools.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+class AutoStory_Segment_18 : public AutoStory_Segment{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_segment(
+        SingleSwitchProgramEnvironment& env, 
+        ProControllerContext& context,
+        AutoStoryOptions options,
+        AutoStoryStats& stats
+    ) const override;
+};
+
+class AutoStory_Checkpoint_39 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+class AutoStory_Checkpoint_40 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+
+
+// start: Defeated Cascarrafa Gym (Water). At Porto Marinada Pokecenter.
+// end: Defeated Great Tusk/Iron Treads. 
+void checkpoint_39(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+);
+
+// start: Defeated Great Tusk/Iron Treads. 
+// end: At South Province (Area Three) Pokecenter.
+void checkpoint_40(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+);
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_19.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_19.cpp
new file mode 100644
index 0000000000..408d949a38
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_19.cpp
@@ -0,0 +1,402 @@
+/*  AutoStory
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+
+#include "CommonFramework/Exceptions/OperationFailedException.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h"
+#include "PokemonSV_AutoStoryTools.h"
+#include "PokemonSV_AutoStory_Segment_19.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+//#include <unordered_map>
+//#include <algorithm>
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+
+std::string AutoStory_Segment_19::name() const{
+    return "19: Klawf Titan: Battle Klawf";
+}
+
+std::string AutoStory_Segment_19::start_text() const{
+    return "Start: Defeated Great Tusk/Iron Treads. At South Province (Area Three) Pokecenter.";
+}
+
+std::string AutoStory_Segment_19::end_text() const{
+    return "End: Defeated Klawf. At Artazon (West) Pokecenter.";
+}
+
+void AutoStory_Segment_19::run_segment(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    AutoStoryOptions options,
+    AutoStoryStats& stats
+) const{
+    
+
+    stats.m_segment++;
+    env.update_stats();
+    context.wait_for_all_requests();
+    env.console.log("Start Segment " + name(), COLOR_ORANGE);
+
+    AutoStory_Checkpoint_41().run_checkpoint(env, context, options, stats);
+    AutoStory_Checkpoint_42().run_checkpoint(env, context, options, stats);
+
+    context.wait_for_all_requests();
+    env.console.log("End Segment " + name(), COLOR_GREEN);
+
+}
+
+std::string AutoStory_Checkpoint_41::name() const{ return "041 - " + AutoStory_Segment_19().name(); }
+std::string AutoStory_Checkpoint_41::start_text() const{ return "At South Province (Area Three) Pokecenter.";}
+std::string AutoStory_Checkpoint_41::end_text() const{ return "Defeated Klawf.";}
+void AutoStory_Checkpoint_41::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_41(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+std::string AutoStory_Checkpoint_42::name() const{ return "042 - " + AutoStory_Segment_19().name(); }
+std::string AutoStory_Checkpoint_42::start_text() const{ return AutoStory_Checkpoint_41().end_text();}
+std::string AutoStory_Checkpoint_42::end_text() const{ return "Defeated Klawf. At Artazon (West) Pokecenter.";}
+void AutoStory_Checkpoint_42::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_42(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+
+
+
+
+void checkpoint_41(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+){
+    
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){         
+        context.wait_for_all_requests();
+
+        // section 1
+        DirectionDetector direction;
+        if (attempt_number > 0 || ENABLE_TEST){
+            env.console.log("Fly to neighbouring Pokecenter, then fly back, to clear any pokemon covering the minimap.");
+            move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::KEEP_ZOOM, -1, 0, 480ms});
+            move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::KEEP_ZOOM, +1, 0, 480ms});
+        }
+
+        direction.change_direction(env.program_info(), env.console, context, 0.14);
+        do_action_and_monitor_for_battles(env.program_info(), env.console, context,
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_move_left_joystick(context, {0, +1}, 1600ms, 800ms);
+        });        
+
+        // section 2. walk until hit dialog
+        // realign_player_from_landmark(
+        //     env.program_info(), env.console, context, 
+        //     {ZoomChange::KEEP_ZOOM, 0, 128, 70},
+        //     {ZoomChange::ZOOM_IN, 255, 93, 170}
+        // );  
+
+        //{0.242708, 0.690741}
+        place_marker_offset_from_flypoint(env.program_info(), env.console, context, 
+            {ZoomChange::KEEP_ZOOM, 0, 0, 0ms},
+            FlyPoint::FAST_TRAVEL, 
+            {0.242708, 0.690741}
+        );
+        handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                overworld_navigation(env.program_info(), env.console, context, 
+                    NavigationStopCondition::STOP_DIALOG, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                    0, +1, 20, 10, false);
+            }, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_move_left_joystick(context, {-1, 0}, 320ms, 400ms);
+                realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+            }
+        );   
+        // clear_dialog(env.console, context, ClearDialogMode::STOP_OVERWORLD, 60, {CallbackEnum::BLACK_DIALOG_BOX});
+        mash_button_till_overworld(env.console, context, BUTTON_A);
+
+
+        // section 3. 
+        realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+        handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                overworld_navigation(env.program_info(), env.console, context, 
+                    NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                    0, +1, 30, 10, false);
+            }, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_move_left_joystick(context, {-1, 0}, 320ms, 400ms);
+                realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+            }
+        );          
+
+        // section 4
+        // {0.793229, 0.643519}
+        place_marker_offset_from_flypoint(env.program_info(), env.console, context, 
+            {ZoomChange::KEEP_ZOOM, +1, 0, 240ms},
+            FlyPoint::POKECENTER, 
+            {0.793229, 0.643519}
+        );
+        handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                overworld_navigation(env.program_info(), env.console, context, 
+                    NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                    0, +1, 40, 20, false);
+            }, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_move_left_joystick(context, {0, -1}, 400ms, 400ms);
+                pbf_move_left_joystick(context, {+1, 0}, 400ms, 400ms);
+                realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+            }
+        );   
+
+        // section 5
+        // {0.710938, 0.584259}
+        place_marker_offset_from_flypoint(env.program_info(), env.console, context, 
+            {ZoomChange::KEEP_ZOOM, +1, 0, 240ms},
+            FlyPoint::POKECENTER, 
+            {0.710938, 0.584259}
+        );
+        handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                overworld_navigation(env.program_info(), env.console, context, 
+                    NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                    0, +1, 40, 10, false);
+            }, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_move_left_joystick(context, {-1, 0}, 320ms, 400ms);
+                realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+            }
+        );   
+
+        // section 6
+        //{0.670312, 0.678704}
+        place_marker_offset_from_flypoint(env.program_info(), env.console, context, 
+            {ZoomChange::KEEP_ZOOM, 0, 0, 0ms},
+            FlyPoint::POKECENTER, 
+            {0.670312, 0.678704}
+        );
+        handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                overworld_navigation(env.program_info(), env.console, context, 
+                    NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                    0, +1, 24, 8, false);
+            }, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_move_left_joystick(context, {0, -1}, 400ms, 400ms);
+                pbf_move_left_joystick(context, {+1, 0}, 400ms, 400ms);
+                realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+            }
+        );   
+
+         // section 7. walk up to Klawf on the lower wall, so it moves to the high ground
+        realign_player_from_landmark(
+            env.program_info(), env.console, context, 
+            {ZoomChange::KEEP_ZOOM, +1, -0.173, 400ms},
+            {ZoomChange::ZOOM_IN, -1, +0.688, 880ms}
+        );  
+        handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                overworld_navigation(env.program_info(), env.console, context, 
+                    NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                    0, +1, 30, 10, false);
+            }, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_move_left_joystick(context, {+1, 0}, 320ms, 400ms);
+                realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+            }
+        );   
+
+        // section 8. walk up to Klawf on lower wall
+        //  {0.666667, 0.238889}
+        place_marker_offset_from_flypoint(env.program_info(), env.console, context, 
+            {ZoomChange::KEEP_ZOOM, 0, +1, 240ms},
+            FlyPoint::POKECENTER, 
+            {0.666667, 0.238889}
+        );
+        overworld_navigation(env.program_info(), env.console, context, 
+            NavigationStopCondition::STOP_TIME, NavigationMovementMode::DIRECTIONAL_ONLY, 
+            0, +1, 10, 10, false);        
+
+        // move the marker so it doesn't cover North in the minimap
+        realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_NEW_MARKER, +1, 0, 400ms);
+
+        // section 9
+        do_action_and_monitor_for_battles(env.program_info(), env.console, context,
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_move_right_joystick(context, {+1, 0}, 800ms, 400ms);
+                direction.change_direction(env.program_info(), env.console, context, 4.467);
+                pbf_move_left_joystick(context, {0, +1}, 5600ms, 400ms);
+                pbf_move_left_joystick(context, {-1, 0}, 800ms, 400ms);
+                pbf_move_left_joystick(context, {-1, +1}, 4000ms, 400ms);
+                direction.change_direction(env.program_info(), env.console, context, 2.795);
+                pbf_move_left_joystick(context, {0, +1}, 1600ms, 400ms);
+                direction.change_direction(env.program_info(), env.console, context, 4.747);
+                pbf_move_left_joystick(context, {0, +1}, 4800ms, 400ms);
+                direction.change_direction(env.program_info(), env.console, context, 5.479);
+                pbf_move_left_joystick(context, {0, +1}, 3200ms, 400ms);
+                direction.change_direction(env.program_info(), env.console, context, 0.33);                
+                pbf_move_left_joystick(context, {0, +1}, 7200ms, 400ms);
+                direction.change_direction(env.program_info(), env.console, context, 2.325);      
+        });        
+        overworld_navigation(env.program_info(), env.console, context, 
+            NavigationStopCondition::STOP_BATTLE, NavigationMovementMode::DIRECTIONAL_ONLY, 
+            0, +1, 25, 25, false);
+
+
+        // battle Klawf phase 1
+        confirm_titan_battle(env, context);
+
+        env.console.log("Battle Klawf Titan phase 1.");
+        run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+        do_action_and_monitor_for_battles(env.program_info(), env.console, context,
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                direction.change_direction(env.program_info(), env.console, context, 2.83);
+                // pbf_move_left_joystick(context, {0, +1}, 6400ms, 400ms);
+        });         
+        overworld_navigation(env.program_info(), env.console, context, 
+            NavigationStopCondition::STOP_DIALOG, NavigationMovementMode::DIRECTIONAL_ONLY, 
+            0, +1, 35, 35, false);
+
+        clear_dialog(env.console, context, ClearDialogMode::STOP_BATTLE, 30, {CallbackEnum::BATTLE});
+        // Klawf battle phase 2
+        confirm_titan_battle(env, context);
+        env.console.log("Battle Klawf Titan phase 2.");
+        run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_DIALOG, {CallbackEnum::DIALOG_ARROW});
+        // get ride upgrade
+        mash_button_till_overworld(env.console, context, BUTTON_A);        
+
+       
+    });
+
+}
+
+void checkpoint_42(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+){
+    
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){         
+        context.wait_for_all_requests();
+
+        // the landmark Pokecenter is far enough away from current location, that the map Pokemon don't cover it.
+        // Klawf vs Artazon (West) Pokecenter
+
+        // section 1
+        realign_player_from_landmark(
+            env.program_info(), env.console, context, 
+            {ZoomChange::KEEP_ZOOM, +1, -0.409, 400ms},
+            {ZoomChange::ZOOM_IN, -1, +0.375, 880ms}
+        );  
+        handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                overworld_navigation(env.program_info(), env.console, context, 
+                    NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                    0, +1, 24, 12, false);
+            }, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_move_left_joystick(context, {-1, 0}, 320ms, 400ms);
+                realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+            }
+        );
+
+        // section 2
+        realign_player_from_landmark(
+            env.program_info(), env.console, context, 
+            {ZoomChange::KEEP_ZOOM, +1, -0.173, 400ms},
+            {ZoomChange::ZOOM_IN, -1, +0.375, 304ms}
+        );  
+        handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                overworld_navigation(env.program_info(), env.console, context, 
+                    NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                    0, +1, 36, 12, false);
+            }, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_move_left_joystick(context, {+1, 0}, 320ms, 400ms);
+                realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+            }
+        );   
+
+        // section 3
+        realign_player_from_landmark(
+            env.program_info(), env.console, context, 
+            {ZoomChange::KEEP_ZOOM, -1, +1, 0ms},
+            {ZoomChange::ZOOM_IN, -0.492, +1, 360ms}
+        );  
+        handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                overworld_navigation(env.program_info(), env.console, context, 
+                    NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                    0, +1, 24, 12, false);
+            }, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_move_left_joystick(context, {+1, 0}, 320ms, 400ms);
+                realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+            }
+        );       
+
+        // section 4. set marker to pokecenter
+        realign_player_from_landmark(
+            env.program_info(), env.console, context, 
+            {ZoomChange::KEEP_ZOOM, -1, +1, 0ms},
+            {ZoomChange::ZOOM_IN, -1, +1, 0ms}
+        );  
+        handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                overworld_navigation(env.program_info(), env.console, context, 
+                    NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                    0, +1, 30, 10, false);
+            }, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_move_left_joystick(context, {-1, 0}, 320ms, 400ms);
+                realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+            }
+        );                  
+       
+        // section 5. set marker past pokecenter
+        handle_unexpected_battles(env.program_info(), env.console, context,
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_NEW_MARKER, +1, -1, 240ms);
+        });      
+        overworld_navigation(env.program_info(), env.console, context, 
+            NavigationStopCondition::STOP_TIME, NavigationMovementMode::DIRECTIONAL_ONLY, 
+            0, +0.883, 12, 12, false);           // can't wrap in handle_when_stationary_in_overworld(), since we expect to be stationary when walking into the pokecenter
+          
+
+        fly_to_overlapping_flypoint(env.program_info(), env.console, context);  
+
+    });
+
+}
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_19.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_19.h
new file mode 100644
index 0000000000..80bcad9f79
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_19.h
@@ -0,0 +1,74 @@
+/*  Autostory
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_AutoStory_Segment_19_H
+#define PokemonAutomation_PokemonSV_AutoStory_Segment_19_H
+
+#include "PokemonSV_AutoStoryTools.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+class AutoStory_Segment_19 : public AutoStory_Segment{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_segment(
+        SingleSwitchProgramEnvironment& env, 
+        ProControllerContext& context,
+        AutoStoryOptions options,
+        AutoStoryStats& stats
+    ) const override;
+};
+
+class AutoStory_Checkpoint_41 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+class AutoStory_Checkpoint_42 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+
+
+// start: At South Province (Area Three) Pokecenter.
+// end: Defeated Klawf.
+void checkpoint_41(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+);
+
+// start: Defeated Klawf.
+// end: Defeated Klawf. At Artazon (West) Pokecenter.
+void checkpoint_42(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+);
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_20.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_20.cpp
new file mode 100644
index 0000000000..0fe5bcea82
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_20.cpp
@@ -0,0 +1,601 @@
+/*  AutoStory
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h"
+#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_NoMinimapDetector.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h"
+#include "PokemonSV_AutoStoryTools.h"
+#include "PokemonSV_AutoStory_Segment_20.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+//#include <unordered_map>
+//#include <algorithm>
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+
+std::string AutoStory_Segment_20::name() const{
+    return "20: Artazon Gym (Grass)";
+}
+
+std::string AutoStory_Segment_20::start_text() const{
+    return "Start: Defeated Klawf. At Artazon (West) Pokecenter.";
+}
+
+std::string AutoStory_Segment_20::end_text() const{
+    return "End: Defeated Artazon Gym (Grass). At East Province (Area One) Pokecenter.";
+}
+
+void AutoStory_Segment_20::run_segment(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    AutoStoryOptions options,
+    AutoStoryStats& stats
+) const{
+    
+
+    stats.m_segment++;
+    env.update_stats();
+    context.wait_for_all_requests();
+    env.console.log("Start Segment " + name(), COLOR_ORANGE);
+
+    AutoStory_Checkpoint_43().run_checkpoint(env, context, options, stats);
+    AutoStory_Checkpoint_44().run_checkpoint(env, context, options, stats);
+    AutoStory_Checkpoint_45().run_checkpoint(env, context, options, stats);
+    AutoStory_Checkpoint_46().run_checkpoint(env, context, options, stats);
+
+    context.wait_for_all_requests();
+    env.console.log("End Segment " + name(), COLOR_GREEN);
+
+}
+
+std::string AutoStory_Checkpoint_43::name() const{ return "043 - " + AutoStory_Segment_20().name(); }
+std::string AutoStory_Checkpoint_43::start_text() const{ return "Defeated Klawf. At Artazon (West) Pokecenter.";}
+std::string AutoStory_Checkpoint_43::end_text() const{ return "Battled Nemona. Inside Artazon Gym building.";}
+void AutoStory_Checkpoint_43::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_43(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+std::string AutoStory_Checkpoint_44::name() const{ return "044 - " + AutoStory_Segment_20().name(); }
+std::string AutoStory_Checkpoint_44::start_text() const{ return AutoStory_Checkpoint_43().end_text();}
+std::string AutoStory_Checkpoint_44::end_text() const{ return "Finished Sunflora gym challenge.";}
+void AutoStory_Checkpoint_44::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_44(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+std::string AutoStory_Checkpoint_45::name() const{ return "045 - " + AutoStory_Segment_20().name(); }
+std::string AutoStory_Checkpoint_45::start_text() const{ return AutoStory_Checkpoint_44().end_text();}
+std::string AutoStory_Checkpoint_45::end_text() const{ return "Defeated Artazon Gym (Grass). Inside gym building.";}
+void AutoStory_Checkpoint_45::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_45(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+std::string AutoStory_Checkpoint_46::name() const{ return "046 - " + AutoStory_Segment_20().name(); }
+std::string AutoStory_Checkpoint_46::start_text() const{ return AutoStory_Checkpoint_45().end_text();}
+std::string AutoStory_Checkpoint_46::end_text() const{ return "At East Province (Area One) Pokecenter.";}
+void AutoStory_Checkpoint_46::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_46(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+
+
+
+void checkpoint_43(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+){
+    
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){
+        context.wait_for_all_requests();
+
+        // place the marker somewhere else. the current location disrupts the Stationary detector
+        realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_NEW_MARKER, -1, 0, 400ms);
+
+        DirectionDetector direction;
+        if (attempt_number > 0 || ENABLE_TEST){
+            env.console.log("Fly to neighbouring Pokecenter, then fly back, to clear any pokemon covering the minimap.");
+            move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::KEEP_ZOOM, -1, +1, 0ms});
+            move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::KEEP_ZOOM, -1, 0, 240ms});
+        }
+
+        do_action_and_monitor_for_battles(env.program_info(), env.console, context,
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                direction.change_direction(env.program_info(), env.console, context, 6.198);
+                pbf_move_left_joystick(context, {0, +1}, 3200ms, 800ms);
+                direction.change_direction(env.program_info(), env.console, context, 4.693);
+                pbf_move_left_joystick(context, {0, +1}, 8000ms, 800ms);
+        });
+        // walk up right set of stairs
+        direction.change_direction(env.program_info(), env.console, context, 4.276);
+        pbf_move_left_joystick(context, {0, +1}, 5600ms, 800ms);
+
+        // realign using lamp-post
+        direction.change_direction(env.program_info(), env.console, context, 2.34);
+        pbf_move_left_joystick(context, {0, +1}, 1600ms, 800ms);
+        direction.change_direction(env.program_info(), env.console, context, 1.81);
+        pbf_move_left_joystick(context, {+1, +1}, 4800ms, 800ms);
+
+        // move toward gym building
+        direction.change_direction(env.program_info(), env.console, context, 4.26);
+        pbf_move_left_joystick(context, {0, +1}, 7200ms, 800ms);
+        direction.change_direction(env.program_info(), env.console, context, 3.05);
+        pbf_move_left_joystick(context, {0, +1}, 1600ms, 800ms);
+        pbf_wait(context, 7000ms);
+        context.wait_for_all_requests();
+
+        handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_ONLY, 20000ms);
+            }, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_move_left_joystick(context, {-1, +1}, 800ms, 400ms);
+            },
+            5, 5
+        );          
+
+        // enter gym building. talk go Nemona and battle her.
+        clear_dialog(env.console, context, ClearDialogMode::STOP_BATTLE, 60, {CallbackEnum::BLACK_DIALOG_BOX, CallbackEnum::PROMPT_DIALOG, CallbackEnum::DIALOG_ARROW, CallbackEnum::BATTLE});        
+        env.console.log("Battle Nemona.");
+        run_trainer_battle_press_A(env.console, context, BattleStopCondition::STOP_DIALOG);
+        mash_button_till_overworld(env.console, context, BUTTON_A);
+
+       
+    });
+
+}
+
+void checkpoint_44(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+){
+    
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){
+
+        context.wait_for_all_requests();
+
+        // talk to receptionist
+        env.console.log("Talk to Artazon gym receptionist.");
+        walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_SPAM_A, 10000ms);
+        clear_dialog(env.console, context, ClearDialogMode::STOP_OVERWORLD, 60, {CallbackEnum::OVERWORLD});
+
+        pbf_move_left_joystick(context, {0, -1}, 2400ms, 800ms);
+        pbf_wait(context, 3000ms);
+        // wait for overworld after leaving gym
+        wait_for_overworld(env.program_info(), env.console, context, 30);      
+        
+        // talk to Sunflora NPC
+        DirectionDetector direction;
+        direction.change_direction(env.program_info(), env.console, context, 4.91);
+        walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_SPAM_A, 10000ms);
+        clear_dialog(env.console, context, ClearDialogMode::STOP_OVERWORLD, 60, {CallbackEnum::OVERWORLD, CallbackEnum::PROMPT_DIALOG});
+
+        // realign to wall
+        direction.change_direction(env.program_info(), env.console, context, 1.477);
+        pbf_move_left_joystick(context, {0, +1}, 4000ms, 800ms);
+        direction.change_direction(env.program_info(), env.console, context, 2.166);
+        pbf_move_left_joystick(context, {-1, +1}, 2400ms, 800ms);
+
+        // get sunflora 1
+        direction.change_direction(env.program_info(), env.console, context, 4.85);
+        pbf_move_left_joystick(context, {0, +1}, 2400ms, 800ms);
+        handle_failed_action(env.program_info(), env.console, context,
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_mash_button(context, BUTTON_A, 4000ms);
+                check_num_sunflora_found(env, context, 1);
+            },
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_move_left_joystick(context, {0, +1}, 240ms, 800ms);
+            },
+            3
+        );
+
+        // get sunflora 2
+        direction.change_direction(env.program_info(), env.console, context, 0.384);
+        pbf_move_left_joystick(context, {0, +1}, 960ms, 800ms);
+        handle_failed_action(env.program_info(), env.console, context,
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_mash_button(context, BUTTON_A, 4000ms);
+                check_num_sunflora_found(env, context, 2);
+            },
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_move_left_joystick(context, {0, +1}, 240ms, 800ms);
+            },
+            3
+        );        
+
+        // get sunflora 3
+        direction.change_direction(env.program_info(), env.console, context, 5.377);
+        pbf_move_left_joystick(context, {0, +1}, 960ms, 800ms);
+        handle_failed_action(env.program_info(), env.console, context,
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_mash_button(context, BUTTON_A, 4000ms);
+                check_num_sunflora_found(env, context, 3);
+            },
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_move_left_joystick(context, {0, +1}, 240ms, 800ms);
+            },
+            3
+        );              
+
+        get_on_ride(env.program_info(), env.console, context);
+
+        // get sunflora 4
+        // align to corner 4.1
+        direction.change_direction(env.program_info(), env.console, context, 1.90);
+        pbf_move_left_joystick(context, {0, +1}, 1600ms, 800ms);
+        direction.change_direction(env.program_info(), env.console, context, 2.166);
+        pbf_move_left_joystick(context, {-1, +1}, 2400ms, 800ms);
+
+        // align to corner 4.2
+        direction.change_direction(env.program_info(), env.console, context, 6.056);
+        pbf_move_left_joystick(context, {0, +1}, 5360ms, 800ms);
+        direction.change_direction(env.program_info(), env.console, context, 1.55);
+        pbf_move_left_joystick(context, {0, +1}, 1600ms, 800ms);
+        direction.change_direction(env.program_info(), env.console, context, 1.69);
+        pbf_move_left_joystick(context, {-1, +1}, 4000ms, 800ms);
+
+        direction.change_direction(env.program_info(), env.console, context, 5.85);
+        pbf_move_left_joystick(context, {0, +1}, 480ms, 800ms);
+        handle_failed_action(env.program_info(), env.console, context,
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_mash_button(context, BUTTON_A, 4000ms);
+                check_num_sunflora_found(env, context, 4);
+            },
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_move_left_joystick(context, {0, +1}, 240ms, 800ms);
+            },
+            3
+        );        
+
+        // get sunflora 5
+        // align to corner 5.1
+        direction.change_direction(env.program_info(), env.console, context, 1.59);
+        pbf_move_left_joystick(context, {0, +1}, 1600ms, 800ms);
+        direction.change_direction(env.program_info(), env.console, context, 1.79);
+        pbf_move_left_joystick(context, {-1, +1}, 4000ms, 800ms);
+        direction.change_direction(env.program_info(), env.console, context, 6.055);        
+        pbf_move_left_joystick(context, {0, +1}, 3200ms, 800ms);
+        direction.change_direction(env.program_info(), env.console, context, 5.06);   
+        pbf_move_left_joystick(context, {0, +1}, 4800ms, 800ms);
+        direction.change_direction(env.program_info(), env.console, context, 4.38);   
+        pbf_move_left_joystick(context, {-1, +1}, 5600ms, 800ms);
+
+        direction.change_direction(env.program_info(), env.console, context, 2.53);   
+        pbf_move_left_joystick(context, {0, +1}, 1280ms, 800ms);
+        direction.change_direction(env.program_info(), env.console, context, 0.78);   
+        pbf_move_left_joystick(context, {0, +1}, 720ms, 800ms);  // todo: adjust this. 80 -> 90?
+        handle_failed_action(env.program_info(), env.console, context,
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_mash_button(context, BUTTON_A, 4000ms);
+                check_num_sunflora_found(env, context, 5);
+            },
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_move_left_joystick(context, {0, +1}, 240ms, 800ms);
+            },
+            3
+        );        
+
+        // sunflora 6
+        // align to corner 6.1
+        direction.change_direction(env.program_info(), env.console, context, 4.2);
+        pbf_move_left_joystick(context, {0, +1}, 1600ms, 800ms);
+        direction.change_direction(env.program_info(), env.console, context, 4.38);   
+        pbf_move_left_joystick(context, {-1, +1}, 5600ms, 800ms);
+
+        direction.change_direction(env.program_info(), env.console, context, 0.96);
+        pbf_move_left_joystick(context, {0, +1}, 2000ms, 800ms);
+        direction.change_direction(env.program_info(), env.console, context, 5.17);        
+        pbf_move_left_joystick(context, {0, +1}, 400ms, 800ms);
+        direction.change_direction(env.program_info(), env.console, context, 3.86);
+        handle_failed_action(env.program_info(), env.console, context,
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_mash_button(context, BUTTON_A, 4000ms);
+                check_num_sunflora_found(env, context, 6);
+            },
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_move_left_joystick(context, {0, +1}, 240ms, 800ms);
+            },
+            3
+        );        
+
+        // sunflora 7
+        // align to corner 7.1
+        direction.change_direction(env.program_info(), env.console, context, 2.06);
+        pbf_move_left_joystick(context, {0, +1}, 640ms, 800ms);
+        direction.change_direction(env.program_info(), env.console, context, 4.7); 
+        pbf_move_left_joystick(context, {0, +1}, 800ms, 800ms);
+        direction.change_direction(env.program_info(), env.console, context, 5.01);               
+        pbf_move_left_joystick(context, {0, +1}, 12800ms, 800ms);
+
+        // align to corner 7.2. bush
+        direction.change_direction(env.program_info(), env.console, context, 2.34);
+        pbf_move_left_joystick(context, {0, +1}, 5600ms, 800ms);
+        direction.change_direction(env.program_info(), env.console, context, 3.42);
+        pbf_move_left_joystick(context, {0, +1}, 3200ms, 800ms);
+
+        // align to corner 7.3. lamp-post
+        // todo: adjust routine to get to lampost. go behind the sculpture and goat?
+        direction.change_direction(env.program_info(), env.console, context, 0);
+        pbf_move_left_joystick(context, {0, +1}, 960ms, 800ms);
+        direction.change_direction(env.program_info(), env.console, context, 1.75);
+        pbf_move_left_joystick(context, {0, +1}, 3200ms, 800ms);
+        direction.change_direction(env.program_info(), env.console, context, 2.95);
+        pbf_move_left_joystick(context, {0, +1}, 2400ms, 800ms);
+        direction.change_direction(env.program_info(), env.console, context, 2.22);
+        pbf_move_left_joystick(context, {0, +1}, 3200ms, 800ms);
+        direction.change_direction(env.program_info(), env.console, context, 1.01);
+        pbf_move_left_joystick(context, {0, +1}, 2400ms, 800ms);
+
+        // align to corner 7.4. wall corner
+        direction.change_direction(env.program_info(), env.console, context, 3.70);
+        pbf_move_left_joystick(context, {0, +1}, 3200ms, 800ms);
+        direction.change_direction(env.program_info(), env.console, context, 4.28);
+        pbf_move_left_joystick(context, {0, +1}, 3200ms, 800ms);
+        direction.change_direction(env.program_info(), env.console, context, 3.54);
+        pbf_move_left_joystick(context, {0, +1}, 4800ms, 800ms);
+
+        // align to corner 7.5. bush
+        direction.change_direction(env.program_info(), env.console, context, 3.11);
+        pbf_controller_state(context, BUTTON_B, DPAD_NONE, {0, +1}, {0, 0}, 1200ms);
+        pbf_move_left_joystick(context, {0, +1}, 480ms, 800ms);
+        direction.change_direction(env.program_info(), env.console, context, 4.28);
+        pbf_move_left_joystick(context, {0, +1}, 1600ms, 800ms);
+        direction.change_direction(env.program_info(), env.console, context, 3.60);
+        pbf_move_left_joystick(context, {0, +1}, 3200ms, 800ms);
+
+        direction.change_direction(env.program_info(), env.console, context, 1.17);
+        pbf_move_left_joystick(context, {0, +1}, 1040ms, 800ms);
+        handle_failed_action(env.program_info(), env.console, context,
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_mash_button(context, BUTTON_A, 4000ms);
+                check_num_sunflora_found(env, context, 7);
+            },
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_move_left_joystick(context, {0, +1}, 240ms, 800ms);
+            },
+            3
+        );           
+
+        // sunflora 8
+        // align to corner 8.1. bush
+        direction.change_direction(env.program_info(), env.console, context, 4.54);
+        pbf_move_left_joystick(context, {0, +1}, 1600ms, 800ms);
+        pbf_controller_state(context, BUTTON_B, DPAD_NONE, {0, +1}, {0, 0}, 1200ms);
+        pbf_move_left_joystick(context, {0, +1}, 1600ms, 800ms);
+        direction.change_direction(env.program_info(), env.console, context, 3.60);
+        pbf_move_left_joystick(context, {0, +1}, 3200ms, 800ms);
+
+        direction.change_direction(env.program_info(), env.console, context, 1.64);
+        pbf_move_left_joystick(context, {0, +1}, 2800ms, 800ms);
+        direction.change_direction(env.program_info(), env.console, context, 4.36);
+        pbf_move_left_joystick(context, {0, +1}, 800ms, 800ms);
+
+        handle_failed_action(env.program_info(), env.console, context,
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_press_button(context, BUTTON_A, 400ms, 400ms);
+                pbf_press_button(context, BUTTON_A, 400ms, 400ms); // extra press in case one is dropped
+                pbf_press_button(context, BUTTON_A, 400ms, 400ms);
+                pbf_wait(context, 2000ms);
+                press_Bs_to_back_to_overworld(env.program_info(), env.console, context);
+                check_num_sunflora_found(env, context, 8);  
+                pbf_wait(context, 3000ms);
+            },
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_move_left_joystick(context, {0, +1}, 240ms, 800ms);
+            },
+            3
+        );        
+
+        // // sunflora 9
+        // // align to corner 9.1. bush
+        pbf_move_left_joystick(context, {0, -1}, 1600ms, 800ms);
+        direction.change_direction(env.program_info(), env.console, context, 4.89);
+        pbf_move_left_joystick(context, {0, +1}, 2800ms, 800ms);
+        pbf_controller_state(context, BUTTON_B, DPAD_NONE, {0, +1}, {0, 0}, 1440ms);
+        get_off_ride(env.program_info(), env.console, context);
+        direction.change_direction(env.program_info(), env.console, context, 3.60);
+        pbf_move_left_joystick(context, {0, +1}, 4800ms, 800ms);
+
+
+        direction.change_direction(env.program_info(), env.console, context, 1.48);
+        pbf_move_left_joystick(context, {0, +1}, 400ms, 800ms);
+        direction.change_direction(env.program_info(), env.console, context, 3.11);
+        pbf_move_left_joystick(context, {0, +1}, 1440ms, 800ms);
+        direction.change_direction(env.program_info(), env.console, context, 4.75);
+        pbf_move_left_joystick(context, {0, +1}, 800ms, 800ms);
+        get_on_ride(env.program_info(), env.console, context);
+        direction.change_direction(env.program_info(), env.console, context, 5.53);
+        pbf_move_left_joystick(context, {0, +1}, 4800ms, 800ms);
+        handle_failed_action(env.program_info(), env.console, context,
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_mash_button(context, BUTTON_A, 4000ms);
+                check_num_sunflora_found(env, context, 9);
+            },
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_move_left_joystick(context, {0, +1}, 240ms, 800ms);
+            },
+            3
+        );
+
+        // sunflora 10
+        // align to corner 10.1. bush
+        pbf_move_left_joystick(context, {-1, 0}, 1600ms, 800ms);
+
+        direction.change_direction(env.program_info(), env.console, context, 4.02);
+        pbf_move_left_joystick(context, {0, +1}, 2000ms, 800ms);
+        handle_failed_action(env.program_info(), env.console, context,
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_mash_button(context, BUTTON_A, 4000ms);
+                check_num_sunflora_found(env, context, 10);
+            },
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_move_left_joystick(context, {0, +1}, 240ms, 800ms);
+            },
+            3
+        );
+
+        // go back to Sunflora NPC
+        // align to corner 11.1. bush
+        direction.change_direction(env.program_info(), env.console, context, 0.65);
+        pbf_move_left_joystick(context, {0, +1}, 1600ms, 800ms);
+        pbf_controller_state(context, BUTTON_B, DPAD_NONE, {0, +1}, {0, 0}, 1200ms);
+        pbf_move_left_joystick(context, {0, +1}, 6400ms, 800ms);
+
+        direction.change_direction(env.program_info(), env.console, context, 4.49);
+        pbf_move_left_joystick(context, {0, +1}, 800ms, 800ms);
+        direction.change_direction(env.program_info(), env.console, context, 5.53);
+
+        NoMinimapWatcher no_minimap(env.console, COLOR_RED, Milliseconds(5000));
+        int ret = run_until<ProControllerContext>(
+            env.console, context,
+            [&](ProControllerContext& context){
+                pbf_move_left_joystick(context, {0, +1}, 30000ms, 800ms);
+            },
+            {no_minimap}
+        );
+        if (ret < 0){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "Failed to finish reach the Sunflora NPC.",
+                env.console
+            );
+        }
+        env.log("No minimap seen. Likely finished the Artazon gym challenge.");
+
+        clear_dialog(env.console, context, ClearDialogMode::STOP_OVERWORLD, 60, {CallbackEnum::OVERWORLD});
+
+       
+    });
+
+}
+
+void checkpoint_45(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+){
+    
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){
+        
+        context.wait_for_all_requests();
+
+        get_on_ride(env.program_info(), env.console, context);
+
+        DirectionDetector direction;
+        direction.change_direction(env.program_info(), env.console, context, 1.52);
+        pbf_move_left_joystick(context, {0, +1}, 3200ms, 800ms);
+        direction.change_direction(env.program_info(), env.console, context, 2.62);
+        pbf_move_left_joystick(context, {0, +1}, 3200ms, 800ms);
+
+        direction.change_direction(env.program_info(), env.console, context, 2.18);
+        pbf_controller_state(context, BUTTON_B, DPAD_NONE, {0, +1}, {0, 0}, 1200ms);
+        pbf_move_left_joystick(context, {0, +1}, 3200ms, 800ms);
+        direction.change_direction(env.program_info(), env.console, context, 3.16);
+        pbf_move_left_joystick(context, {-1, +1}, 800ms, 400ms);
+
+        handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_SPAM_A, 20000ms);
+            }, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_move_left_joystick(context, {-1, +1}, 800ms, 400ms);
+                pbf_move_left_joystick(context, {+1, +1}, 800ms, 400ms);
+            },
+            5, 2, 2
+        ); 
+
+        clear_dialog(env.console, context, ClearDialogMode::STOP_BATTLE, 60, {CallbackEnum::PROMPT_DIALOG, CallbackEnum::BATTLE, CallbackEnum::DIALOG_ARROW});
+        env.console.log("Battle Grass Gym leader.");
+        run_trainer_battle_press_A(env.console, context, BattleStopCondition::STOP_DIALOG);
+        mash_button_till_overworld(env.console, context, BUTTON_A);
+       
+    });
+
+}
+
+
+
+void checkpoint_46(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+){
+    
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){
+        
+        context.wait_for_all_requests();
+
+        pbf_move_left_joystick(context, {0, -1}, 2400ms, 800ms);
+        pbf_wait(context, 3000ms);
+        // wait for overworld after leaving Gym
+        wait_for_overworld(env.program_info(), env.console, context, 30);
+
+        // At this startpoint, no Pokemon show up on minimap/map
+
+        // fly to Artazon east pokecenter
+        move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::ZOOM_IN, +1, 0, 400ms});
+
+        // section 1. set marker to pokecenter
+        realign_player_from_landmark(
+            env.program_info(), env.console, context, 
+            {ZoomChange::KEEP_ZOOM, +1, +1, 400ms},
+            {ZoomChange::ZOOM_IN, -1, +1, 0ms}
+        );        
+        overworld_navigation(env.program_info(), env.console, context, 
+            NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+            0, +1, 80, 20, false);  
+
+        // section 2. set marker past pokecenter
+        handle_unexpected_battles(env.program_info(), env.console, context,
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_NEW_MARKER, +0.409, +1, 240ms);
+        });      
+        overworld_navigation(env.program_info(), env.console, context, 
+            NavigationStopCondition::STOP_TIME, NavigationMovementMode::DIRECTIONAL_ONLY, 
+            0, +0.883, 12, 12, false);             
+       
+        fly_to_overlapping_flypoint(env.program_info(), env.console, context);
+
+    });
+
+
+
+}
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_20.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_20.h
new file mode 100644
index 0000000000..dcd18fdf21
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_20.h
@@ -0,0 +1,110 @@
+/*  Autostory
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_AutoStory_Segment_20_H
+#define PokemonAutomation_PokemonSV_AutoStory_Segment_20_H
+
+#include "PokemonSV_AutoStoryTools.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+class AutoStory_Segment_20 : public AutoStory_Segment{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_segment(
+        SingleSwitchProgramEnvironment& env, 
+        ProControllerContext& context,
+        AutoStoryOptions options,
+        AutoStoryStats& stats) const override;
+};
+
+class AutoStory_Checkpoint_43 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+class AutoStory_Checkpoint_44 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+class AutoStory_Checkpoint_45 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+class AutoStory_Checkpoint_46 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+
+
+// start: Defeated Klawf. At Artazon (West) Pokecenter.
+// end: Battled Nemona. Inside Artazon Gym building.
+void checkpoint_43(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+);
+
+// start: Battled Nemona. Inside Artazon Gym building.
+// end: Finished Sunflora gym challenge.
+void checkpoint_44(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+);
+
+// start: Finished Sunflora gym challenge.
+// end: Defeated Artazon Gym (Grass). Inside gym building.
+void checkpoint_45(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+);
+
+// start: Defeated Artazon Gym (Grass). Inside gym building.
+// end: At East Province (Area One) Pokecenter.
+void checkpoint_46(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+);
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_21.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_21.cpp
new file mode 100644
index 0000000000..b739a897fd
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_21.cpp
@@ -0,0 +1,416 @@
+/*  AutoStory
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+
+#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_NoMinimapDetector.h"
+#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h"
+#include "PokemonSV_AutoStoryTools.h"
+#include "PokemonSV_AutoStory_Segment_21.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+//#include <unordered_map>
+//#include <algorithm>
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+
+std::string AutoStory_Segment_21::name() const{
+    return "21: Team Star (Fire)";
+}
+
+std::string AutoStory_Segment_21::start_text() const{
+    return "Start: Defeated Artazon Gym (Grass). At East Province (Area One) Pokecenter.";
+}
+
+std::string AutoStory_Segment_21::end_text() const{
+    return "End: Defeated Team Star (Fire). At East Province (Area Two) Pokecenter.";
+}
+
+void AutoStory_Segment_21::run_segment(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    AutoStoryOptions options,
+    AutoStoryStats& stats
+) const{
+    
+
+    stats.m_segment++;
+    env.update_stats();
+    context.wait_for_all_requests();
+    env.console.log("Start Segment " + name(), COLOR_ORANGE);
+
+    AutoStory_Checkpoint_47().run_checkpoint(env, context, options, stats);
+    AutoStory_Checkpoint_48().run_checkpoint(env, context, options, stats);
+    AutoStory_Checkpoint_49().run_checkpoint(env, context, options, stats);
+
+    context.wait_for_all_requests();
+    env.console.log("End Segment " + name(), COLOR_GREEN);
+
+}
+
+std::string AutoStory_Checkpoint_47::name() const{ return "047 - " + AutoStory_Segment_21().name(); }
+std::string AutoStory_Checkpoint_47::start_text() const{ return "At East Province (Area One) Pokecenter.";}
+std::string AutoStory_Checkpoint_47::end_text() const{ return "At East Province (Area One) Pokecenter.";}
+void AutoStory_Checkpoint_47::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_47(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+std::string AutoStory_Checkpoint_48::name() const{ return "048 - " + AutoStory_Segment_21().name(); }
+std::string AutoStory_Checkpoint_48::start_text() const{ return AutoStory_Checkpoint_47().end_text();}
+std::string AutoStory_Checkpoint_48::end_text() const{ return "Beat Team Star (Fire)";}
+void AutoStory_Checkpoint_48::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_48(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+std::string AutoStory_Checkpoint_49::name() const{ return "049 - " + AutoStory_Segment_21().name(); }
+std::string AutoStory_Checkpoint_49::start_text() const{ return AutoStory_Checkpoint_48().end_text();}
+std::string AutoStory_Checkpoint_49::end_text() const{ return "At East Province (Area Two) Pokecenter.";}
+void AutoStory_Checkpoint_49::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_49(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+
+
+void checkpoint_47(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+){
+    
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){
+        // empty checkpoint, to preserve ordering
+       
+    }, false);
+
+}
+
+
+void checkpoint_48(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+){
+    
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){
+
+        context.wait_for_all_requests();
+        realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_NEW_MARKER, -1, +0.141, 800ms);
+
+        DirectionDetector direction;
+        if (attempt_number > 0 || ENABLE_TEST){
+            env.console.log("Fly to neighbouring Pokecenter, then fly back, to clear any pokemon covering the minimap.");
+            move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::KEEP_ZOOM, 0, -1, 400ms});
+            move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::KEEP_ZOOM, 0, +1, 400ms});
+        }
+
+        direction.change_direction(env.program_info(), env.console, context, 2.06);
+        pbf_move_left_joystick(context, {0, +1}, 1600ms, 800ms);
+
+        realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+        handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){           
+                overworld_navigation(env.program_info(), env.console, context, 
+                    NavigationStopCondition::STOP_DIALOG, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                    0, +1, 60, 20, false);
+            }, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_move_left_joystick(context, {-1, 0}, 320ms, 400ms);
+                realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+            }
+        );
+
+        // speak to Clive and Cassiopeia
+        mash_button_till_overworld(env.console, context, BUTTON_A);
+
+        // move towards Team Star base gate
+        realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_NEW_MARKER, -0.844, -1, 320ms);
+        overworld_navigation(env.program_info(), env.console, context, 
+            NavigationStopCondition::STOP_DIALOG, NavigationMovementMode::DIRECTIONAL_ONLY, 
+            0, +1, 40, 20, false);
+
+        // battle Team Star Grunt
+        clear_dialog(env.console, context, ClearDialogMode::STOP_BATTLE, 60, {CallbackEnum::PROMPT_DIALOG, CallbackEnum::DIALOG_ARROW, CallbackEnum::BATTLE});
+        env.console.log("Battle team star grunt.");
+        run_trainer_battle_press_A(env.console, context, BattleStopCondition::STOP_DIALOG);
+        mash_button_till_overworld(env.console, context, BUTTON_A);
+
+
+        context.wait_for_all_requests();
+        do_action_and_monitor_for_battles(env.program_info(), env.console, context,
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_NEW_MARKER, -1, -0.882, 400ms);
+                walk_forward_while_clear_front_path(env.program_info(), env.console, context, 2400ms);
+                walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_SPAM_A);
+            }
+        );
+        clear_dialog(env.console, context, ClearDialogMode::STOP_OVERWORLD, 60, {CallbackEnum::OVERWORLD, CallbackEnum::PROMPT_DIALOG, CallbackEnum::TUTORIAL});
+
+        NoMinimapWatcher no_minimap(env.console.logger(), COLOR_RED, Milliseconds(250));
+        int ret = run_until<ProControllerContext>(
+            env.console, context,
+            [&](ProControllerContext& context){
+
+                DirectionDetector direction;
+                Milliseconds wait = 8000ms;
+
+                direction.change_direction(env.program_info(), env.console, context, 2.50);
+                pbf_move_left_joystick(context, {0, +1}, 2400ms, 400ms);
+                pbf_press_button(context, BUTTON_R, 160ms, 160ms);
+                pbf_wait(context, wait);
+
+
+                direction.change_direction(env.program_info(), env.console, context, 3.54);
+                pbf_move_left_joystick(context, {0, +1}, 2400ms, 400ms);
+                pbf_press_button(context, BUTTON_R, 160ms, 160ms);
+                pbf_wait(context, wait);
+
+
+                direction.change_direction(env.program_info(), env.console, context, 1.76);
+                pbf_move_left_joystick(context, {0, +1}, 2400ms, 400ms);
+                pbf_press_button(context, BUTTON_R, 160ms, 160ms);
+                pbf_wait(context, wait);
+
+                pbf_move_left_joystick(context, {0, +1}, 3200ms, 400ms);
+
+
+                direction.change_direction(env.program_info(), env.console, context, 1.97);
+                pbf_move_left_joystick(context, {0, +1}, 2400ms, 400ms);
+                pbf_press_button(context, BUTTON_R, 160ms, 160ms);
+                pbf_wait(context, wait);
+
+                direction.change_direction(env.program_info(), env.console, context, 2.60);
+                pbf_move_left_joystick(context, {0, +1}, 3200ms, 400ms);
+                pbf_press_button(context, BUTTON_R, 160ms, 160ms);
+                pbf_wait(context, wait);
+
+
+                direction.change_direction(env.program_info(), env.console, context, 0.19);
+                pbf_move_left_joystick(context, {0, +1}, 3200ms, 400ms);
+
+
+                direction.change_direction(env.program_info(), env.console, context, 0.82);
+                pbf_move_left_joystick(context, {0, +1}, 3200ms, 400ms);
+                pbf_press_button(context, BUTTON_R, 160ms, 160ms);
+                pbf_wait(context, wait);
+
+                direction.change_direction(env.program_info(), env.console, context, 2.13);
+                pbf_move_left_joystick(context, {0, +1}, 3200ms, 400ms);
+                pbf_press_button(context, BUTTON_R, 160ms, 160ms);
+                pbf_wait(context, wait);
+
+
+                direction.change_direction(env.program_info(), env.console, context, 1.97);
+                pbf_move_left_joystick(context, {0, +1}, 4000ms, 400ms);
+                pbf_press_button(context, BUTTON_R, 160ms, 160ms);
+                pbf_wait(context, wait);
+
+                direction.change_direction(env.program_info(), env.console, context, 3.02);
+                pbf_move_left_joystick(context, {0, +1}, 3200ms, 400ms);
+
+
+                direction.change_direction(env.program_info(), env.console, context, 3.87);
+                pbf_move_left_joystick(context, {0, +1}, 1600ms, 400ms);
+                pbf_press_button(context, BUTTON_R, 160ms, 160ms);
+                pbf_wait(context, wait);
+
+                direction.change_direction(env.program_info(), env.console, context, 4.56);
+                pbf_move_left_joystick(context, {0, +1}, 2400ms, 400ms);
+                pbf_press_button(context, BUTTON_R, 160ms, 160ms);
+                pbf_wait(context, wait);
+
+                try{
+                    direction.change_direction(env.program_info(), env.console, context, 4.98);
+                    pbf_move_left_joystick(context, {0, +1}, 3200ms, 400ms);
+
+                    direction.change_direction(env.program_info(), env.console, context, 5.18);
+                    pbf_move_left_joystick(context, {0, +1}, 2400ms, 400ms);
+                    pbf_press_button(context, BUTTON_R, 160ms, 160ms);
+                    pbf_wait(context, wait);
+
+                    direction.change_direction(env.program_info(), env.console, context, 5.66);
+                    pbf_move_left_joystick(context, {0, +1}, 3200ms, 400ms);
+                    pbf_press_button(context, BUTTON_R, 160ms, 160ms);
+                    pbf_wait(context, wait);
+
+                    direction.change_direction(env.program_info(), env.console, context, 5.24);
+                    pbf_move_left_joystick(context, {0, +1}, 4800ms, 400ms);
+                    pbf_press_button(context, BUTTON_R, 160ms, 160ms);
+                    pbf_wait(context, wait);
+
+                    direction.change_direction(env.program_info(), env.console, context, 5.45);
+                    pbf_move_left_joystick(context, {0, +1}, 3200ms, 400ms);
+                    pbf_press_button(context, BUTTON_R, 160ms, 160ms);
+                    pbf_wait(context, wait);
+                    
+                    pbf_wait(context, 20000ms);
+                }catch (OperationFailedException&){
+                    env.console.log("Failed to change direction, but it's possibly due to clearing the challenge.");
+                    pbf_wait(context, 20000ms);
+                }
+                
+            },
+            {no_minimap}
+        );
+        context.wait_for(std::chrono::milliseconds(100));
+        if (ret < 0){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "checkpoint_48(): Failed to kill 30 pokemon with Let's go.",
+                env.console
+            );            
+        }
+        clear_dialog(env.console, context, ClearDialogMode::STOP_BATTLE, 60, {CallbackEnum::BATTLE, CallbackEnum::DIALOG_ARROW});
+        env.console.log("Battle the Team Star (Fire) boss.");
+        run_trainer_battle_press_A(env.console, context, BattleStopCondition::STOP_DIALOG);
+        mash_button_till_overworld(env.console, context, BUTTON_A, 360);
+
+    });
+
+}
+
+
+void checkpoint_49(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+){
+    
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){
+
+        // the landmark Pokecenter is far enough away from current location, that the map Pokemon don't cover it.
+        // Team Fire Base vs East Province (Area Two) Pokecenter
+
+        context.wait_for_all_requests();
+        // marker 1
+        realign_player_from_landmark(
+            env.program_info(), env.console, context, 
+            {ZoomChange::KEEP_ZOOM, +1, 0, 240ms},
+            {ZoomChange::ZOOM_IN, -1, +0.297, 720ms}
+        );  
+        handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                overworld_navigation(env.program_info(), env.console, context, 
+                    NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                    0, +1, 30, 10, false);
+            }, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_move_left_joystick(context, {-1, 0}, 320ms, 400ms);
+                realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+            }
+        );  
+
+        // marker 2
+        realign_player_from_landmark(
+            env.program_info(), env.console, context, 
+            {ZoomChange::KEEP_ZOOM, 0, +1, 240ms},
+            {ZoomChange::ZOOM_IN, 0, -1, 240ms}
+        );  
+        handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                overworld_navigation(env.program_info(), env.console, context, 
+                    NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                    0, +1, 30, 10, false);
+            }, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_move_left_joystick(context, {+1, 0}, 320ms, 400ms);
+                realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+            }
+        );   
+        
+        // marker 3
+        realign_player_from_landmark(
+            env.program_info(), env.console, context, 
+            {ZoomChange::KEEP_ZOOM, +1, -0.409, 400ms},
+            {ZoomChange::ZOOM_IN, -1, +0.453, 1400ms}
+        );  
+        handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                overworld_navigation(env.program_info(), env.console, context, 
+                    NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                    0, +1, 30, 10, false);
+            }, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_move_left_joystick(context, {+1, 0}, 320ms, 400ms);
+                realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+            }
+        );      
+        
+        // marker 4
+        realign_player_from_landmark(
+            env.program_info(), env.console, context, 
+            {ZoomChange::KEEP_ZOOM, +1, -0.409, 400ms},
+            {ZoomChange::ZOOM_IN, -1, +0.609, 1480ms}
+        );  
+        // walk until you run into the wall
+        overworld_navigation(env.program_info(), env.console, context, 
+            NavigationStopCondition::STOP_TIME, NavigationMovementMode::DIRECTIONAL_ONLY, 
+            0, +1, 10, 10, false);        
+  
+        
+        // marker 5. put marker on other side of bridge
+        realign_player_from_landmark(
+            env.program_info(), env.console, context, 
+            {ZoomChange::ZOOM_IN, 0, 0, 0ms},
+            {ZoomChange::ZOOM_IN, 0, +1, 80ms}
+        );  
+        handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                overworld_navigation(env.program_info(), env.console, context, 
+                    NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                    0, +1, 30, 10, false);
+            }, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_move_left_joystick(context, {-1, 0}, 320ms, 400ms);
+                realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+            }
+        );         
+        
+
+        // marker 6. set marker past pokecenter
+        handle_unexpected_battles(env.program_info(), env.console, context,
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_NEW_MARKER, +1, -1, 240ms);
+        });      
+        overworld_navigation(env.program_info(), env.console, context, 
+            NavigationStopCondition::STOP_TIME, NavigationMovementMode::DIRECTIONAL_ONLY, 
+            0, +0.883, 12, 12, false);           // can't wrap in handle_when_stationary_in_overworld(), since we expect to be stationary when walking into the pokecenter
+          
+
+        fly_to_overlapping_flypoint(env.program_info(), env.console, context);         
+
+
+       
+    });
+
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_21.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_21.h
new file mode 100644
index 0000000000..9c559510b1
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_21.h
@@ -0,0 +1,94 @@
+/*  Autostory
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_AutoStory_Segment_21_H
+#define PokemonAutomation_PokemonSV_AutoStory_Segment_21_H
+
+#include "PokemonSV_AutoStoryTools.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+class AutoStory_Segment_21 : public AutoStory_Segment{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_segment(
+        SingleSwitchProgramEnvironment& env, 
+        ProControllerContext& context,
+        AutoStoryOptions options,
+        AutoStoryStats& stats
+    ) const override;
+};
+
+class AutoStory_Checkpoint_47 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+class AutoStory_Checkpoint_48 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+class AutoStory_Checkpoint_49 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+
+
+// start: At East Province (Area One) Pokecenter.
+// end: At East Province (Area One) Pokecenter.
+void checkpoint_47(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+);
+
+// start: At East Province (Area One) Pokecenter.
+// end: Beat Team Star (Fire)
+void checkpoint_48(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+);
+
+// start: Beat Team Star (Fire)
+// end: At East Province (Area Two) Pokecenter.
+void checkpoint_49(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+);
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_22.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_22.cpp
new file mode 100644
index 0000000000..d974b440b9
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_22.cpp
@@ -0,0 +1,400 @@
+/*  AutoStory
+ *
+ *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *
+ */
+
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+
+#include "VideoGames/PokemonSV/Inference/PokemonSV_WhiteTriangleDetector.h"
+#include "VideoGames/PokemonSV/Inference/Battles/PokemonSV_NormalBattleMenus.h"
+#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h"
+#include "PokemonSV_AutoStoryTools.h"
+#include "PokemonSV_AutoStory_Segment_22.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+//#include <unordered_map>
+//#include <algorithm>
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+
+std::string AutoStory_Segment_22::name() const{
+    return "22: Levincia Gym (Electric)";
+}
+
+std::string AutoStory_Segment_22::start_text() const{
+    return "Start: Defeated Team Star (Fire). At East Province (Area Two) Pokecenter.";
+}
+
+std::string AutoStory_Segment_22::end_text() const{
+    return "End: Defeated Levincia Gym (Electric). At Levincia (North) Pokecenter.";
+}
+
+void AutoStory_Segment_22::run_segment(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    AutoStoryOptions options,
+    AutoStoryStats& stats
+) const{
+    
+
+    stats.m_segment++;
+    env.update_stats();
+    context.wait_for_all_requests();
+    env.console.log("Start Segment " + name(), COLOR_ORANGE);
+
+    AutoStory_Checkpoint_50().run_checkpoint(env, context, options, stats);
+    AutoStory_Checkpoint_51().run_checkpoint(env, context, options, stats);
+    AutoStory_Checkpoint_52().run_checkpoint(env, context, options, stats);
+    AutoStory_Checkpoint_53().run_checkpoint(env, context, options, stats);
+
+    context.wait_for_all_requests();
+    env.console.log("End Segment " + name(), COLOR_GREEN);
+
+}
+
+std::string AutoStory_Checkpoint_50::name() const{ return "050 - " + AutoStory_Segment_22().name(); }
+std::string AutoStory_Checkpoint_50::start_text() const{ return "Defeated Team Star (Fire). At East Province (Area Two) Pokecenter.";}
+std::string AutoStory_Checkpoint_50::end_text() const{ return "At Levincia (South) Pokecenter.";}
+void AutoStory_Checkpoint_50::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_50(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+std::string AutoStory_Checkpoint_51::name() const{ return "051 - " + AutoStory_Segment_22().name(); }
+std::string AutoStory_Checkpoint_51::start_text() const{ return AutoStory_Checkpoint_50().end_text();}
+std::string AutoStory_Checkpoint_51::end_text() const{ return "Inside Levincia gym building. Talked to Hassel, met Rika.";}
+void AutoStory_Checkpoint_51::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_51(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+
+std::string AutoStory_Checkpoint_52::name() const{ return "052 - " + AutoStory_Segment_22().name(); }
+std::string AutoStory_Checkpoint_52::start_text() const{ return AutoStory_Checkpoint_51().end_text();}
+std::string AutoStory_Checkpoint_52::end_text() const{ return "Finished Levincia gym challenge. Outside Levincia gym building.";}
+void AutoStory_Checkpoint_52::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_52(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+
+std::string AutoStory_Checkpoint_53::name() const{ return "053 - " + AutoStory_Segment_22().name(); }
+std::string AutoStory_Checkpoint_53::start_text() const{ return AutoStory_Checkpoint_52().end_text();}
+std::string AutoStory_Checkpoint_53::end_text() const{ return "Defeated Levincia Gym (Electric). At Levincia (North) Pokecenter.";}
+void AutoStory_Checkpoint_53::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_53(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+
+
+void checkpoint_50(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+){
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){
+        
+        context.wait_for_all_requests();
+        // set down marker 1
+        realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_NEW_MARKER, +1, +0.531, 400ms);
+
+        DirectionDetector direction;
+        if (attempt_number > 0 || ENABLE_TEST){
+            env.console.log("Fly to neighbouring Pokecenter, then fly back, to clear any pokemon covering the minimap.");
+            move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::KEEP_ZOOM, +1, -1, 560ms});
+            move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::KEEP_ZOOM, -1, +0.375, 640ms});
+        }
+
+        direction.change_direction(env.program_info(), env.console, context, 0);
+        pbf_move_left_joystick(context, {0, +1}, 1200ms, 800ms);
+
+        realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+        handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){           
+                overworld_navigation(env.program_info(), env.console, context, 
+                    NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                    0, +1, 60, 20, false);
+            }, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_move_left_joystick(context, {-1, 0}, 1024ms, 2040ms);
+                realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+            }
+        );
+        
+        get_off_ride(env.program_info(), env.console, context);
+
+        // marker 2
+        realign_player_from_landmark(
+            env.program_info(), env.console, context, 
+            {ZoomChange::KEEP_ZOOM, +1, +0.609, 400ms},
+            {ZoomChange::ZOOM_IN, -1, +0.219, 480ms}
+        );  
+        handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                overworld_navigation(env.program_info(), env.console, context, 
+                    NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                    0, +1, 40, 10, false);
+            }, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_move_left_joystick(context, {+1, 0}, 320ms, 400ms);
+                realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+            }
+        );      
+
+        get_on_ride(env.program_info(), env.console, context);
+        
+        // marker 3
+        realign_player_from_landmark(
+            env.program_info(), env.console, context, 
+            {ZoomChange::KEEP_ZOOM, +1, 0, 160ms},
+            {ZoomChange::ZOOM_IN, -1, +1, 0ms}
+        );  
+        handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                overworld_navigation(env.program_info(), env.console, context, 
+                    NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                    0, +1, 40, 10, false);
+            }, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                // jump over the fence when stationary
+                context.wait_for_all_requests();
+                pbf_controller_state(context, BUTTON_B, DPAD_NONE, {0, +1}, {0, 0}, 800ms);
+                realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+            }
+        );          
+
+        fly_to_overlapping_flypoint(env.program_info(), env.console, context);
+
+
+    });
+
+}
+
+
+void checkpoint_51(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+){
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){
+
+        context.wait_for_all_requests();
+        realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_NEW_MARKER, -1, 0, 400ms);
+        pbf_move_left_joystick(context, {0, +1}, 3200ms, 800ms);
+        realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_NEW_MARKER, +0.331, +1, 480ms);
+        pbf_move_left_joystick(context, {0, +1}, 14400ms, 800ms);
+        realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_NEW_MARKER, +1, +0.336, 480ms);
+        
+        handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_ONLY, 20000ms);
+            }, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_move_left_joystick(context, {-1, +1}, 800ms, 400ms);   // move forward/left
+            },
+            5, 5
+        );         
+
+        // enter gym building. talk to Hassel, meet Rika
+        clear_dialog(env.console, context, ClearDialogMode::STOP_OVERWORLD, 60, {CallbackEnum::PROMPT_DIALOG, CallbackEnum::OVERWORLD}); 
+
+
+    });    
+
+}
+
+void checkpoint_52(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+){
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){
+        // talk to receptionist
+        env.console.log("Talk to Levincia gym receptionist.");
+        walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_SPAM_A, 10000ms);
+        clear_dialog(env.console, context, ClearDialogMode::STOP_OVERWORLD, 60, {CallbackEnum::OVERWORLD});
+        
+        pbf_move_left_joystick(context, {0, -1}, 2400ms, 800ms);
+        pbf_wait(context, 3000ms);
+        // wait for dialog after leaving gym
+        walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_ONLY, 20000ms, 0, -1);
+        
+        WhiteTriangleWatcher white_triangle(COLOR_RED, ImageFloatBox(0.946, 0.029, 0.013874, 0.024668));
+        // mash A until detect top right white triangle 1
+        int ret = run_until<ProControllerContext>(
+            env.console, context,
+            [&](ProControllerContext& context){
+                pbf_mash_button(context, BUTTON_A, 200000ms);
+            },
+            {white_triangle}
+        );
+        if (ret < 0){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "Failed to detect white triangle in top right, which is an indicator of the Levincia Hide-and-Seek gym challenge.",
+                env.console
+            );
+        }
+        env.console.log("Detected white triangle in top right. Assume we are in the Levincia Hide-and-Seek gym challenge.");
+
+        // select Clavell 1
+        pbf_move_left_joystick(context, {+1, +1}, 2000ms, 480ms);
+        pbf_move_left_joystick(context, {-0.922, -1}, 800ms, 800ms);
+        pbf_mash_button(context, BUTTON_A, 1000ms);
+
+        // mash B until detect battle 1
+        NormalBattleMenuWatcher battle(COLOR_BLUE);
+        ret = run_until<ProControllerContext>(
+            env.console, context,
+            [&](ProControllerContext& context){
+                pbf_mash_button(context, BUTTON_B, 100000ms); // press B so we don't mash past the Battle menu
+            },
+            {battle}
+        );
+        if (ret < 0){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "Failed to detect white triangle in top right, which is an indicator of the Levincia Hide-and-Seek gym challenge.",
+                env.console
+            );
+        }        
+
+        run_trainer_battle_press_A(env.console, context, BattleStopCondition::STOP_DIALOG);
+
+        // mash B until detect top right white triangle 2
+        ret = run_until<ProControllerContext>(
+            env.console, context,
+            [&](ProControllerContext& context){
+                pbf_mash_button(context, BUTTON_B, 100000ms); // press B so we don't accidentally select random guy
+            },
+            {white_triangle}
+        );
+        if (ret < 0){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "Failed to detect white triangle in top right, which is an indicator of the Levincia Hide-and-Seek gym challenge.",
+                env.console
+            );
+        }        
+        env.console.log("Detected white triangle in top right. Assume we are in the Levincia Hide-and-Seek gym challenge.");
+
+        // select Clavell 2
+        pbf_move_left_joystick(context, {-1, +1}, 3000ms, 480ms);
+        pbf_move_left_joystick(context, {+1, -0.961}, 800ms, 800ms);
+        pbf_mash_button(context, BUTTON_A, 1000ms);
+
+        // mash B until detect battle 2
+        ret = run_until<ProControllerContext>(
+            env.console, context,
+            [&](ProControllerContext& context){
+                pbf_mash_button(context, BUTTON_B, 100000ms); // press B so we don't mash past the Battle menu
+                // for (size_t i = 0; i < 200; i++){
+                //     pbf_press_button(context, BUTTON_A, 800ms, 800ms);
+                // }
+            },
+            {battle}
+        );
+        if (ret < 0){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "Failed to detect white triangle in top right, which is an indicator of the Levincia Hide-and-Seek gym challenge.",
+                env.console
+            );
+        }        
+
+        run_trainer_battle_press_A(env.console, context, BattleStopCondition::STOP_DIALOG);        
+
+        // mash B until detect top right white triangle 3
+        ret = run_until<ProControllerContext>(
+            env.console, context,
+            [&](ProControllerContext& context){
+                pbf_mash_button(context, BUTTON_B, 100000ms);
+            },
+            {white_triangle}
+        );
+        if (ret < 0){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "Failed to detect white triangle in top right, which is an indicator of the Levincia Hide-and-Seek gym challenge.",
+                env.console
+            );
+        }        
+
+        env.console.log("Detected white triangle in top right. Assume we are in the Levincia Hide-and-Seek gym challenge.");
+
+        // select Clavell 3
+        pbf_move_left_joystick(context, {+1, +1}, 2000ms, 480ms);
+        pbf_move_left_joystick(context, {-0.336, -1}, 640ms, 800ms);
+
+        mash_button_till_overworld(env.console, context, BUTTON_A);
+
+
+
+    });
+
+}
+
+void checkpoint_53(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+){
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){
+
+        // realign camera. 
+        pbf_press_button(context, BUTTON_L, 240ms, 240ms);
+
+        // walk backwards into the Gym building
+        pbf_move_left_joystick(context, {0, -1}, 2400ms, 800ms);
+        pbf_wait(context, 3000ms);
+
+        // talk to Gym receptionist
+        walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_SPAM_A, 30000ms);
+
+        clear_dialog(env.console, context, ClearDialogMode::STOP_BATTLE, 60, {CallbackEnum::PROMPT_DIALOG, CallbackEnum::BATTLE, CallbackEnum::DIALOG_ARROW});
+        env.console.log("Battle Electric Gym leader.");
+        run_trainer_battle_press_A(env.console, context, BattleStopCondition::STOP_DIALOG);
+        mash_button_till_overworld(env.console, context, BUTTON_A);
+
+        // Gym leader defeated. Standing in Gym building
+        pbf_move_left_joystick(context, {0, -1}, 2400ms, 800ms);
+        pbf_wait(context, 3000ms);
+        // wait for overworld after leaving Gym
+        wait_for_overworld(env.program_info(), env.console, context, 30);
+
+        // fly to Levincia (North) Pokecenter
+        move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::KEEP_ZOOM, -0.219, +1, 400ms});
+
+    });
+
+}
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_22.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_22.h
new file mode 100644
index 0000000000..a5d254d7d8
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_22.h
@@ -0,0 +1,118 @@
+/*  Autostory
+ *
+ *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_AutoStory_Segment_22_H
+#define PokemonAutomation_PokemonSV_AutoStory_Segment_22_H
+
+#include "PokemonSV_AutoStoryTools.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+class AutoStory_Segment_22 : public AutoStory_Segment{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_segment(
+        SingleSwitchProgramEnvironment& env, 
+        ProControllerContext& context,
+        AutoStoryOptions options,
+        AutoStoryStats& stats
+    ) const override;
+};
+
+class AutoStory_Checkpoint_50 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+class AutoStory_Checkpoint_51 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+class AutoStory_Checkpoint_52 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+class AutoStory_Checkpoint_53 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+
+
+
+// start: Defeated Team Star (Fire). At East Province (Area Two) Pokecenter.
+// end: At Levincia (South) Pokecenter.
+void checkpoint_50(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+);
+
+// start: At Levincia (South) Pokecenter.
+// end: Inside Levincia gym building. Talked to Hassel, met Rika.
+void checkpoint_51(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+);
+
+
+// start: Inside Levincia gym building. Talked to Hassel, met Rika.
+// end: Finished Levincia gym challenge. Outside Levincia gym building.
+void checkpoint_52(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+);
+
+
+// start: Finished Levincia gym challenge. Outside Levincia gym building.
+// end: Defeated Levincia Gym (Electric). At Levincia (North) Pokecenter.
+void checkpoint_53(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+);
+
+
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_23.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_23.cpp
new file mode 100644
index 0000000000..887d63d554
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_23.cpp
@@ -0,0 +1,87 @@
+/*  AutoStory
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Exceptions/OperationFailedException.h"
+
+#include "PokemonSV_AutoStoryTools.h"
+#include "PokemonSV_AutoStory_Segment_23.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+//#include <unordered_map>
+//#include <algorithm>
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+
+std::string AutoStory_Segment_23::name() const{
+    return "23: Orthworm Titan";
+}
+
+std::string AutoStory_Segment_23::start_text() const{
+    return "Start: Defeated Levincia Gym (Electric). At Levincia (North) Pokecenter.";
+}
+
+std::string AutoStory_Segment_23::end_text() const{
+    return "End: Defeated Levincia Gym (Electric). At Levincia (North) Pokecenter.";
+}
+
+void AutoStory_Segment_23::run_segment(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    AutoStoryOptions options,
+    AutoStoryStats& stats
+) const{
+    
+
+    stats.m_segment++;
+    env.update_stats();
+    context.wait_for_all_requests();
+    env.console.log("Start Segment " + name(), COLOR_ORANGE);
+
+    AutoStory_Checkpoint_54().run_checkpoint(env, context, options, stats);
+
+    context.wait_for_all_requests();
+    env.console.log("End Segment " + name(), COLOR_GREEN);
+
+}
+
+std::string AutoStory_Checkpoint_54::name() const{ return "054 - " + AutoStory_Segment_23().name(); }
+std::string AutoStory_Checkpoint_54::start_text() const{ return "Defeated Levincia Gym (Electric). At Levincia (North) Pokecenter.";}
+std::string AutoStory_Checkpoint_54::end_text() const{ return "Defeated Levincia Gym (Electric). At Levincia (North) Pokecenter.";}
+void AutoStory_Checkpoint_54::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_54(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+
+void checkpoint_54(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+){
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){
+        // empty checkpoint
+
+
+    });
+
+            
+
+}
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_23.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_23.h
new file mode 100644
index 0000000000..f3e28c6fb3
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_23.h
@@ -0,0 +1,55 @@
+/*  Autostory
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_AutoStory_Segment_23_H
+#define PokemonAutomation_PokemonSV_AutoStory_Segment_23_H
+
+#include "PokemonSV_AutoStoryTools.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+class AutoStory_Segment_23 : public AutoStory_Segment{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_segment(
+        SingleSwitchProgramEnvironment& env, 
+        ProControllerContext& context,
+        AutoStoryOptions options,
+        AutoStoryStats& stats
+    ) const override;
+};
+
+class AutoStory_Checkpoint_54 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+
+
+// start: Defeated Levincia Gym (Electric). At Levincia (North) Pokecenter.
+// end: Defeated Levincia Gym (Electric). At Levincia (North) Pokecenter.
+void checkpoint_54(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+);
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_24.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_24.cpp
new file mode 100644
index 0000000000..100d42ef39
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_24.cpp
@@ -0,0 +1,616 @@
+/*  AutoStory
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+#include "CommonFramework/Exceptions/OperationFailedException.h"
+
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h"
+#include "PokemonSV_AutoStoryTools.h"
+#include "PokemonSV_AutoStory_Segment_24.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+//#include <unordered_map>
+//#include <algorithm>
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+
+std::string AutoStory_Segment_24::name() const{
+    return "24: Orthworm Titan";
+}
+
+std::string AutoStory_Segment_24::start_text() const{
+    return "Start: Defeated Levincia Gym (Electric). At Levincia (North) Pokecenter.";
+}
+
+std::string AutoStory_Segment_24::end_text() const{
+    return "End: Beat Orthworm Titan. At East Province (Area Three) Pokecenter.";
+}
+
+void AutoStory_Segment_24::run_segment(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    AutoStoryOptions options,
+    AutoStoryStats& stats
+) const{
+    
+
+    stats.m_segment++;
+    env.update_stats();
+    context.wait_for_all_requests();
+    env.console.log("Start Segment " + name(), COLOR_ORANGE);
+
+    AutoStory_Checkpoint_55().run_checkpoint(env, context, options, stats);
+    AutoStory_Checkpoint_56().run_checkpoint(env, context, options, stats);
+    AutoStory_Checkpoint_57().run_checkpoint(env, context, options, stats);
+
+    context.wait_for_all_requests();
+    env.console.log("End Segment " + name(), COLOR_GREEN);
+
+}
+
+
+std::string AutoStory_Checkpoint_55::name() const{ return "055 - " + AutoStory_Segment_24().name(); }
+std::string AutoStory_Checkpoint_55::start_text() const{ return "Defeated Levincia Gym (Electric). At Levincia (North) Pokecenter.";}
+std::string AutoStory_Checkpoint_55::end_text() const{ return "Beat Orthworm phase 1 and 2";}
+void AutoStory_Checkpoint_55::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_55(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+
+std::string AutoStory_Checkpoint_56::name() const{ return "056 - " + AutoStory_Segment_24().name(); }
+std::string AutoStory_Checkpoint_56::start_text() const{ return AutoStory_Checkpoint_55().end_text();}
+std::string AutoStory_Checkpoint_56::end_text() const{ return "At East Province (Area Three) Pokecenter.";}
+void AutoStory_Checkpoint_56::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_56(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+
+std::string AutoStory_Checkpoint_57::name() const{ return "057 - " + AutoStory_Segment_24().name(); }
+std::string AutoStory_Checkpoint_57::start_text() const{ return AutoStory_Checkpoint_56().end_text();}
+std::string AutoStory_Checkpoint_57::end_text() const{ return "At East Province (Area Three) Pokecenter.";}
+void AutoStory_Checkpoint_57::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_57(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+
+
+void checkpoint_55(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+){
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){
+
+        DirectionDetector direction;
+        // recently flew a significant distance, so minimap should be clear of Pokemon
+        // flew from Levincia Gym to Levincia North Pokecenter.
+        
+        direction.change_direction(env.program_info(), env.console, context, 1.341);
+        pbf_move_left_joystick(context, {0, +1}, 3600ms, 800ms);
+
+        // marker 1
+        realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_NEW_MARKER, +0.252, +1, 280ms);
+
+        handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                overworld_navigation(env.program_info(), env.console, context, 
+                    NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                    0, +1, 24, 8, false);
+            }, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_move_left_joystick(context, {-1, -1}, 320ms, 400ms);
+                realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+            }
+        );          
+
+        // marker 2. x=0.411979, y=0.730556
+        place_marker_offset_from_flypoint(env.program_info(), env.console, context, 
+            {ZoomChange::KEEP_ZOOM, -1, +1, 0ms}, 
+            FlyPoint::POKECENTER, 
+            {0.411979, 0.730556}
+        );        
+        handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                overworld_navigation(env.program_info(), env.console, context, 
+                    NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                    0, +1, 40, 10, false);
+            }, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_move_left_joystick(context, {-1, -1}, 320ms, 400ms);
+                realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+            }
+        );         
+        
+        // marker 3. x=0.444792, y=0.640741. zoom out
+        place_marker_offset_from_flypoint(env.program_info(), env.console, context, 
+            {ZoomChange::ZOOM_OUT, -1, +1, 0ms}, 
+            FlyPoint::POKECENTER, 
+            {0.444792, 0.640741}
+        ); 
+
+        handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                overworld_navigation(env.program_info(), env.console, context, 
+                    NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                    0, +1, 24, 8, false);
+            }, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_move_left_joystick(context, {-1, -1}, 320ms, 400ms);
+                realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+            }
+        );
+
+        // marker 4. blind marker placement
+        realign_player_from_landmark(
+            env.program_info(), env.console, context,
+            {ZoomChange::KEEP_ZOOM, 0, -1, 400ms},
+            {ZoomChange::ZOOM_IN, +0.173, +1, 896ms}
+        ); 
+        handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                overworld_navigation(env.program_info(), env.console, context, 
+                    NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                    0, +1, 20, 10, false);
+            }, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_move_left_joystick(context, {-1, -1}, 320ms, 400ms);
+                realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+            }
+        );
+
+        // marker 5. blind marker placement
+        realign_player_from_landmark(
+            env.program_info(), env.console, context, 
+            {ZoomChange::KEEP_ZOOM, 0, -1, 400ms},
+            {ZoomChange::ZOOM_IN, +0.055, +1, 856ms}
+        );  
+        handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                overworld_navigation(env.program_info(), env.console, context, 
+                    NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                    0, +1, 16, 8, false);
+            }, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_move_left_joystick(context, {-1, -1}, 320ms, 400ms);
+                realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+            }
+        );  
+        
+        // marker 6. blind marker placement
+        realign_player_from_landmark(
+            env.program_info(), env.console, context, 
+            {ZoomChange::KEEP_ZOOM, 0, -1, 400ms},
+            {ZoomChange::ZOOM_IN, -0.062, +1, 760ms}
+        ); 
+        
+
+        // walk forward until dialog
+        handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                overworld_navigation(env.program_info(), env.console, context, 
+                    NavigationStopCondition::STOP_DIALOG, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                    0, +1, 16, 8, false);
+            }, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_move_left_joystick(context, {+1, -1}, 320ms, 400ms);
+                realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+            }
+        );            
+
+        mash_button_till_overworld(env.console, context, BUTTON_A);
+
+        // resume marker 6
+        realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+        handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                overworld_navigation(env.program_info(), env.console, context, 
+                    NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                    0, +1, 16, 8, false);
+            }, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_move_left_joystick(context, {+1, -1}, 320ms, 400ms);
+                realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+            }
+        ); 
+
+
+        // marker 7. x=0.505729, y=0.675926
+        place_marker_offset_from_flypoint(env.program_info(), env.console, context, 
+            {ZoomChange::KEEP_ZOOM, 0, -1, 240ms},
+            FlyPoint::POKECENTER, 
+            {0.505729, 0.675926}
+        );
+        handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                overworld_navigation(env.program_info(), env.console, context, 
+                    NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                    0, +1, 20, 10, false);
+            }, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_move_left_joystick(context, {+1, -1}, 320ms, 400ms);
+                realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+            }
+        );
+
+        // marker 8.  x=0.591146, y=0.575926,
+        place_marker_offset_from_flypoint(env.program_info(), env.console, context, 
+            {ZoomChange::KEEP_ZOOM, -1, +1, 0ms}, 
+            FlyPoint::POKECENTER, 
+            {0.591146, 0.575926}
+        );
+        handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                overworld_navigation(env.program_info(), env.console, context, 
+                    NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                    0, +1, 30, 10, false);
+            }, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_move_left_joystick(context, {-1, -1}, 320ms, 400ms);
+                realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+            }
+        );
+
+        // marker 9. at crossroads. x=0.723958, y=0.55463
+        place_marker_offset_from_flypoint(env.program_info(), env.console, context, 
+            {ZoomChange::KEEP_ZOOM, -1, +1, 0ms}, 
+            FlyPoint::POKECENTER, 
+            {0.723958, 0.55463}
+        );
+        handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                overworld_navigation(env.program_info(), env.console, context, 
+                    NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                    0, +1, 40, 10, false);
+            }, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_move_left_joystick(context, {-1, -1}, 320ms, 400ms);
+                realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+            }
+        );
+
+        // marker 10. x=0.752604, y=0.643519
+        place_marker_offset_from_flypoint(env.program_info(), env.console, context, 
+            {ZoomChange::KEEP_ZOOM, -1, +1, 0ms}, 
+            FlyPoint::POKECENTER, 
+            {0.752604, 0.643519}
+        );
+
+        handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                overworld_navigation(env.program_info(), env.console, context, 
+                    NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                    0, +1, 20, 10, false);
+            }, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_move_left_joystick(context, {-1, -1}, 320ms, 400ms);
+                realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+            }
+        );
+
+
+        // marker 11. x=0.752083, y=0.702778
+        place_marker_offset_from_flypoint(env.program_info(), env.console, context, 
+            {ZoomChange::KEEP_ZOOM, -1, +1, 0ms}, 
+            FlyPoint::POKECENTER, 
+            {0.752083, 0.702778}
+        ); 
+
+        handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                overworld_navigation(env.program_info(), env.console, context, 
+                    NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                    0, +1, 16, 8, false);
+            }, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_move_left_joystick(context, {+1, -1}, 320ms, 400ms);
+                realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+            }
+        );
+
+        // marker 12. x=0.685417, y=0.748148
+        place_marker_offset_from_flypoint(env.program_info(), env.console, context, 
+            {ZoomChange::KEEP_ZOOM, -1, +1, 0ms}, 
+            FlyPoint::POKECENTER, 
+            {0.685417, 0.748148}
+        ); 
+
+        handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                overworld_navigation(env.program_info(), env.console, context, 
+                    NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                    0, +1, 16, 8, false);
+            }, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_move_left_joystick(context, {+1, -1}, 320ms, 400ms);
+                realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+            }
+        );
+
+        fly_to_overlapping_flypoint(env.program_info(), env.console, context);
+
+        do_action_and_monitor_for_battles(env.program_info(), env.console, context,
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+          
+            DirectionDetector direction;
+
+            direction.change_direction(env.program_info(), env.console, context, 3.909067);
+            pbf_move_left_joystick(context, {0, +1}, 8000ms, 800ms);
+
+            direction.change_direction(env.program_info(), env.console, context, 5.061720);
+            pbf_move_left_joystick(context, {0, +1}, 4000ms, 800ms);
+            pbf_move_left_joystick(context, {+1, +1}, 1600ms, 800ms);
+
+            // now aligned to the wall next to the hole/passage
+
+            // walk away from wall slightly
+            pbf_move_left_joystick(context, {0, -1}, 400ms, 800ms);
+            get_on_ride(env.program_info(), env.console, context);
+
+            direction.change_direction(env.program_info(), env.console, context, 0.366);
+            pbf_move_left_joystick(context, {0, +1}, 2000ms, 800ms);
+
+            direction.change_direction(env.program_info(), env.console, context, 2.565);
+            // run at Orthworm. run into its second position as well.
+            pbf_move_left_joystick(context, {0, +1}, 400ms, 0ms);
+            pbf_controller_state(context, BUTTON_LCLICK, DPAD_NONE, {0, +1}, {0, 0}, 4000ms);
+            pbf_move_left_joystick(context, {+1, +1}, 2400ms, 4000ms);
+
+            get_off_ride(env.program_info(), env.console, context);
+
+            direction.change_direction(env.program_info(), env.console, context, 0.261);
+            pbf_move_left_joystick(context, {0, +1}, 4000ms, 800ms);
+            pbf_move_left_joystick(context, {-1, +1}, 4000ms, 800ms);
+
+            // now aligned to corner.
+
+            direction.change_direction(env.program_info(), env.console, context, 3.736);
+            pbf_move_left_joystick(context, {0, +1}, 3200ms, 800ms);
+
+            direction.change_direction(env.program_info(), env.console, context, 5.306);
+            pbf_move_left_joystick(context, {0, +1}, 5600ms, 800ms);
+
+            
+            direction.change_direction(env.program_info(), env.console, context, 4.988);
+            pbf_move_left_joystick(context, {0, +1}, 6400ms, 800ms);
+            pbf_move_left_joystick(context, {+1, +1}, 4000ms, 800ms);
+
+            // now aligned to the wall next to the hole/passage   
+
+            // walk away from wall slightly
+            pbf_move_left_joystick(context, {0, -1}, 800ms, 800ms);
+
+            direction.change_direction(env.program_info(), env.console, context, 5.722795);
+            pbf_move_left_joystick(context, {0, +1}, 4800ms, 800ms);
+
+            direction.change_direction(env.program_info(), env.console, context, 0.625226);
+        });
+
+        walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_ONLY, 30000ms);
+
+        confirm_titan_battle(env, context);
+        env.console.log("Battle Orthworm Titan phase 1.");
+        run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+
+
+        do_action_and_monitor_for_battles(env.program_info(), env.console, context,
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            
+            DirectionDetector direction;
+            // we hope minimap is clear of Pokemon, after Orthworm phase 1
+
+            direction.change_direction(env.program_info(), env.console, context, 5.042435);
+            pbf_move_left_joystick(context, {0, +1}, 7200ms, 800ms);
+
+            direction.change_direction(env.program_info(), env.console, context, 5.360763);
+            pbf_move_left_joystick(context, {0, +1}, 4000ms, 800ms);
+
+            direction.change_direction(env.program_info(), env.console, context, 5.85);
+            pbf_move_left_joystick(context, {0, +1}, 5600ms, 800ms);
+
+            direction.change_direction(env.program_info(), env.console, context, 5.428);
+            pbf_move_left_joystick(context, {0, +1}, 4800ms, 800ms);
+
+            direction.change_direction(env.program_info(), env.console, context, 4.908646);
+            pbf_move_left_joystick(context, {0, +1}, 2400ms, 800ms);
+
+            direction.change_direction(env.program_info(), env.console, context, 1.169728);
+            pbf_move_left_joystick(context, {0, +1}, 1600ms, 800ms);
+            pbf_move_left_joystick(context, {+1, +1}, 1600ms, 800ms);
+            pbf_move_left_joystick(context, {-1, +1}, 1600ms, 800ms);
+
+            // now aligned to the wall next to the hole/passage   
+
+            // walk backwards
+            direction.change_direction(env.program_info(), env.console, context, 2.303077);
+            pbf_move_left_joystick(context, {0, -1}, 3200ms, 800ms);
+            direction.change_direction(env.program_info(), env.console, context, 3.908360);
+
+            get_on_ride(env.program_info(), env.console, context);
+
+            // charge at orthworm
+            pbf_move_left_joystick(context, {0, +1}, 408ms, 0ms);
+            pbf_controller_state(context, BUTTON_LCLICK, DPAD_NONE, {0, +1}, {0, 0}, 102ms);
+            pbf_move_left_joystick(context, {0, +1}, 1970ms, 0ms);
+            pbf_controller_state(context, BUTTON_NONE, DPAD_NONE, {0, +1}, {-1, 0}, 432ms);
+            pbf_move_left_joystick(context, {0, +1}, 1993ms, 0ms);
+            pbf_controller_state(context, BUTTON_NONE, DPAD_NONE, {0, +1}, {-1, 0}, 301ms);
+            pbf_move_left_joystick(context, {0, +1}, 307ms, 0ms);
+            pbf_controller_state(context, BUTTON_NONE, DPAD_NONE, {0, +1}, {-1, 0}, 194ms);
+            pbf_move_left_joystick(context, {0, +1}, 886ms, 0ms);
+            pbf_controller_state(context, BUTTON_NONE, DPAD_NONE, {0, +1}, {-1, 0}, 626ms);
+            pbf_move_left_joystick(context, {0, +1}, 2651ms, 0ms);
+        });
+
+        walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_ONLY, 30000ms);
+
+        // battle the titan phase 2
+        clear_dialog(env.console, context, ClearDialogMode::STOP_BATTLE, 60, {CallbackEnum::BATTLE});  
+        confirm_titan_battle(env, context);
+        env.console.log("Battle Orthworm Titan phase 2.");
+        run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_DIALOG, {CallbackEnum::DIALOG_ARROW});
+        mash_button_till_overworld(env.console, context, BUTTON_A, 360);
+
+    });    
+
+}
+
+void checkpoint_56(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+){
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){
+        // fly back to East Province (Area Three) Watchtower. from Orthworm
+        // this clears Pokemon in minimap
+        move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::KEEP_ZOOM, -1, +1, 0ms}, FlyPoint::FAST_TRAVEL);
+
+        // marker 1
+        place_marker_offset_from_flypoint(env.program_info(), env.console, context, 
+            {ZoomChange::KEEP_ZOOM, -1, +1, 0ms}, 
+            FlyPoint::POKECENTER, 
+            {0.769792, 0.725926}
+        );
+        handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                overworld_navigation(env.program_info(), env.console, context, 
+                    NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                    0, +1, 20, 10, false);
+            }, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_move_left_joystick(context, {+1, 0}, 320ms, 400ms);
+                realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+            }
+        );
+
+        // marker 2
+        place_marker_offset_from_flypoint(env.program_info(), env.console, context, 
+            {ZoomChange::KEEP_ZOOM, -1, +1, 0ms}, 
+            FlyPoint::POKECENTER, 
+            {0.280208, 0.447222}
+        );
+        handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                overworld_navigation(env.program_info(), env.console, context, 
+                    NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                    0, +1, 30, 10, false);
+            }, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_move_left_joystick(context, {+1, 0}, 320ms, 400ms);
+                realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+            }
+        );
+
+        // marker 3
+        place_marker_offset_from_flypoint(env.program_info(), env.console, context, 
+            {ZoomChange::ZOOM_IN, -1, 0, 480ms},
+            FlyPoint::POKECENTER, 
+            {0.354167, 0.375}
+        );
+        handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                overworld_navigation(env.program_info(), env.console, context, 
+                    NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                    0, +1, 40, 10, false);
+            }, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_move_left_joystick(context, {+1, 0}, 320ms, 400ms);
+                realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+            }
+        );
+
+        // marker 4
+        place_marker_offset_from_flypoint(env.program_info(), env.console, context, 
+            {ZoomChange::ZOOM_IN, -1, 0, 400ms},
+            FlyPoint::POKECENTER, 
+            {0.497917, 0.274074}
+        );
+        handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                overworld_navigation(env.program_info(), env.console, context, 
+                    NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                    0, +1, 30, 10, false);
+            }, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_move_left_joystick(context, {-1, 0}, 320ms, 400ms);
+                realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+            }
+        );
+
+        // marker 5. set marker to pokecenter
+        realign_player_from_landmark(
+            env.program_info(), env.console, context, 
+            {ZoomChange::ZOOM_IN, -1, +1, 0ms},
+            {ZoomChange::KEEP_ZOOM, -1, +1, 0ms}
+        );  
+
+        handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                overworld_navigation(env.program_info(), env.console, context, 
+                    NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                    0, +1, 20, 10, false);
+            }, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_move_left_joystick(context, {+1, +1}, 320ms, 400ms);
+                realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+            }
+        );             
+
+        // marker 6. set marker past pokecenter
+        handle_unexpected_battles(env.program_info(), env.console, context,
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_NEW_MARKER, 0, +1, 240ms);
+        });      
+        overworld_navigation(env.program_info(), env.console, context, 
+            NavigationStopCondition::STOP_TIME, NavigationMovementMode::DIRECTIONAL_ONLY, 
+            0, +0.883, 12, 12, false);           // can't wrap in handle_when_stationary_in_overworld(), since we expect to be stationary when walking into the pokecenter
+          
+
+        fly_to_overlapping_flypoint(env.program_info(), env.console, context); 
+
+        
+    });    
+
+}
+
+void checkpoint_57(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+){
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){
+        // empty checkpoint, to preserve ordering
+    }, false);
+}
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_24.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_24.h
new file mode 100644
index 0000000000..ed58795a08
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_24.h
@@ -0,0 +1,96 @@
+/*  Autostory
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_AutoStory_Segment_24_H
+#define PokemonAutomation_PokemonSV_AutoStory_Segment_24_H
+
+#include "PokemonSV_AutoStoryTools.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+class AutoStory_Segment_24 : public AutoStory_Segment{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_segment(
+        SingleSwitchProgramEnvironment& env, 
+        ProControllerContext& context,
+        AutoStoryOptions options,
+        AutoStoryStats& stats
+    ) const override;
+};
+
+class AutoStory_Checkpoint_55 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+class AutoStory_Checkpoint_56 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+class AutoStory_Checkpoint_57 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+
+
+// start: Defeated Levincia Gym (Electric). At Levincia (North) Pokecenter.
+// end: Beat Orthworm phase 1 and 2
+void checkpoint_55(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+);
+
+// start: Beat Orthworm phase 1 and 2
+// end: At East Province (Area Three) Pokecenter.
+void checkpoint_56(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+);
+
+// start: At East Province (Area Three) Pokecenter.
+// end: At East Province (Area Three) Pokecenter.
+void checkpoint_57(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+);
+
+
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_25.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_25.cpp
new file mode 100644
index 0000000000..bd496e9334
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_25.cpp
@@ -0,0 +1,536 @@
+/*  AutoStory
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+
+#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h"
+#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_NoMinimapDetector.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h"
+#include "PokemonSV_AutoStoryTools.h"
+#include "PokemonSV_AutoStory_Segment_25.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+//#include <unordered_map>
+//#include <algorithm>
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+
+std::string AutoStory_Segment_25::name() const{
+    return "25: Team Star (Poison)";
+}
+
+std::string AutoStory_Segment_25::start_text() const{
+    return "Start: Beat Orthworm Titan. At East Province (Area Three) Pokecenter.";
+}
+
+std::string AutoStory_Segment_25::end_text() const{
+    return "End: Beat Team Star (Poison). At Medali Pokecenter.";
+}
+
+void AutoStory_Segment_25::run_segment(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    AutoStoryOptions options,
+    AutoStoryStats& stats
+) const{
+    
+
+    stats.m_segment++;
+    env.update_stats();
+    context.wait_for_all_requests();
+    env.console.log("Start Segment " + name(), COLOR_ORANGE);
+
+    AutoStory_Checkpoint_58().run_checkpoint(env, context, options, stats);
+    AutoStory_Checkpoint_59().run_checkpoint(env, context, options, stats);
+    AutoStory_Checkpoint_60().run_checkpoint(env, context, options, stats);
+
+    context.wait_for_all_requests();
+    env.console.log("End Segment " + name(), COLOR_GREEN);
+
+}
+
+
+std::string AutoStory_Checkpoint_58::name() const{ return "058 - " + AutoStory_Segment_25().name(); }
+std::string AutoStory_Checkpoint_58::start_text() const{ return "Beat Orthworm. At East Province (Area Three) Pokecenter.";}
+std::string AutoStory_Checkpoint_58::end_text() const{ return "Beat Orthworm. At East Province (Area Three) Pokecenter.";}
+void AutoStory_Checkpoint_58::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_58(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+
+std::string AutoStory_Checkpoint_59::name() const{ return "059 - " + AutoStory_Segment_25().name(); }
+std::string AutoStory_Checkpoint_59::start_text() const{ return AutoStory_Checkpoint_58().end_text();}
+std::string AutoStory_Checkpoint_59::end_text() const{ return "Beat Team Star (Poison)";}
+void AutoStory_Checkpoint_59::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_59(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+std::string AutoStory_Checkpoint_60::name() const{ return "060 - " + AutoStory_Segment_25().name(); }
+std::string AutoStory_Checkpoint_60::start_text() const{ return AutoStory_Checkpoint_59().end_text();}
+std::string AutoStory_Checkpoint_60::end_text() const{ return "At Medali Pokecenter.";}
+void AutoStory_Checkpoint_60::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_60(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+void checkpoint_58(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+){
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){
+        // empty checkpoint, to preserve ordering
+
+    }, false);    
+
+}
+
+void checkpoint_59(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+){
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){
+        context.wait_for_all_requests();
+
+        // marker 1  {0.795312, 0.626852}
+        place_marker_offset_from_flypoint(env.program_info(), env.console, context, 
+            {ZoomChange::KEEP_ZOOM, -1, +1, 0ms}, 
+            FlyPoint::FAST_TRAVEL, 
+            {0.795312, 0.626852}
+        );
+
+        if (attempt_number > 0 || ENABLE_TEST){
+            env.console.log("Fly to neighbouring Pokecenter, then fly back, to clear any pokemon covering the minimap.");
+            move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::KEEP_ZOOM, +1, -0.409, 1040ms});
+            move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::KEEP_ZOOM, -1, +0.453, 1040ms});
+        }
+        
+
+        handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){           
+                overworld_navigation(env.program_info(), env.console, context, 
+                    NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                    0, +1, 20, 10, false);
+            }, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_move_left_joystick(context, {-1, 0}, 320ms, 400ms);
+                realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+            }
+        );
+
+        // marker 2   {0.672396, 0.532407}
+        place_marker_offset_from_flypoint(env.program_info(), env.console, context, 
+            {ZoomChange::ZOOM_IN, -1, +1, 0ms}, 
+            FlyPoint::POKECENTER, 
+            {0.672396, 0.532407}
+        );
+
+        handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){           
+                overworld_navigation(env.program_info(), env.console, context, 
+                    NavigationStopCondition::STOP_DIALOG, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                    0, +1, 40, 20, false);
+            }, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){           
+                pbf_move_left_joystick(context, {-1, 0}, 320ms, 400ms);
+                realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+            }
+        );
+
+        // speak to Clive
+        mash_button_till_overworld(env.console, context, BUTTON_A);
+
+        // marker 3   {0.685417, 0.571296}
+        place_marker_offset_from_flypoint(env.program_info(), env.console, context, 
+            {ZoomChange::KEEP_ZOOM, -1, +1, 0ms}, 
+            FlyPoint::POKECENTER, 
+            {0.685417, 0.571296}
+        );
+
+        handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){           
+                overworld_navigation(env.program_info(), env.console, context, 
+                    NavigationStopCondition::STOP_DIALOG, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                    0, +1, 20, 20, false);
+            }, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){           
+                pbf_move_left_joystick(context, {-1, 0}, 320ms, 400ms);
+                realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+            }
+        );
+
+        // battle Team Star Grunt
+        clear_dialog(env.console, context, ClearDialogMode::STOP_BATTLE, 60, {CallbackEnum::PROMPT_DIALOG, CallbackEnum::DIALOG_ARROW, CallbackEnum::BATTLE});
+        env.console.log("Battle team star grunt.");
+        run_trainer_battle_press_A(env.console, context, BattleStopCondition::STOP_DIALOG);
+        mash_button_till_overworld(env.console, context, BUTTON_A);
+
+
+        context.wait_for_all_requests();
+        do_action_and_monitor_for_battles(env.program_info(), env.console, context,
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_NEW_MARKER, -0.688, -1, 400ms);
+                walk_forward_while_clear_front_path(env.program_info(), env.console, context, 800ms);
+                walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_SPAM_A);
+            }
+        );
+        clear_dialog(env.console, context, ClearDialogMode::STOP_OVERWORLD, 60, {CallbackEnum::OVERWORLD, CallbackEnum::PROMPT_DIALOG});
+
+        NoMinimapWatcher no_minimap(env.console.logger(), COLOR_RED, Milliseconds(250));
+        int ret = run_until<ProControllerContext>(
+            env.console, context,
+            [&](ProControllerContext& context){
+
+                DirectionDetector direction;
+                Milliseconds wait = 8000ms;
+ 
+                direction.change_direction(env.program_info(), env.console, context, 2.618972);
+                pbf_move_left_joystick(context, {0, +1}, 800ms, 400ms);
+                pbf_press_button(context, BUTTON_R, 160ms, 160ms);
+                pbf_wait(context, wait);
+                pbf_move_left_joystick(context, {0, +1}, 1600ms, 400ms);
+                pbf_press_button(context, BUTTON_R, 160ms, 160ms);
+
+                direction.change_direction(env.program_info(), env.console, context, 3.265261);
+                pbf_move_left_joystick(context, {0, +1}, 2400ms, 400ms);
+                pbf_press_button(context, BUTTON_R, 160ms, 160ms);
+                pbf_wait(context, wait);
+
+                direction.change_direction(env.program_info(), env.console, context, 2.411131);
+                pbf_move_left_joystick(context, {0, +1}, 3200ms, 400ms);
+                pbf_press_button(context, BUTTON_R, 160ms, 160ms);
+                pbf_wait(context, wait);
+
+                pbf_move_left_joystick(context, {0, +1}, 2400ms, 400ms);
+
+                direction.change_direction(env.program_info(), env.console, context, 2.828856);
+                pbf_move_left_joystick(context, {0, +1}, 1600ms, 400ms);
+                pbf_press_button(context, BUTTON_R, 160ms, 160ms);
+                pbf_wait(context, wait);
+
+                direction.change_direction(env.program_info(), env.console, context, 2.306254);
+                pbf_move_left_joystick(context, {0, +1}, 4000ms, 400ms);
+                pbf_press_button(context, BUTTON_R, 160ms, 160ms);
+                pbf_wait(context, wait);
+
+                direction.change_direction(env.program_info(), env.console, context, 2.565727);
+                pbf_move_left_joystick(context, {0, +1}, 2400ms, 400ms);
+                pbf_press_button(context, BUTTON_R, 160ms, 160ms);
+                pbf_wait(context, wait);
+
+                direction.change_direction(env.program_info(), env.console, context, 3.036098);
+                pbf_move_left_joystick(context, {0, +1}, 3200ms, 400ms);
+
+                direction.change_direction(env.program_info(), env.console, context, 3.525225);
+                pbf_move_left_joystick(context, {0, +1}, 1600ms, 400ms);
+                pbf_press_button(context, BUTTON_R, 160ms, 160ms);
+                pbf_wait(context, wait);
+
+                direction.change_direction(env.program_info(), env.console, context, 4.051901);
+                pbf_move_left_joystick(context, {0, +1}, 5600ms, 400ms);
+                pbf_press_button(context, BUTTON_R, 160ms, 160ms);
+                pbf_wait(context, wait);
+
+                direction.change_direction(env.program_info(), env.console, context, 4.573712);
+                pbf_move_left_joystick(context, {0, +1}, 4000ms, 400ms);
+                pbf_press_button(context, BUTTON_R, 160ms, 160ms);
+                pbf_wait(context, wait);
+
+
+                // wait 30 seconds to let the trainers cooldown
+                pbf_wait(context, 30000ms);
+
+                direction.change_direction(env.program_info(), env.console, context, 1.310148);
+                pbf_move_left_joystick(context, {0, +1}, 6400ms, 400ms);
+                pbf_press_button(context, BUTTON_R, 160ms, 160ms);
+                pbf_wait(context, wait);
+                
+                try{
+                    direction.change_direction(env.program_info(), env.console, context, 0.572754);
+                    pbf_press_button(context, BUTTON_R, 160ms, 160ms);
+                    pbf_move_left_joystick(context, {0, +1}, 5600ms, 400ms);
+                    pbf_press_button(context, BUTTON_R, 160ms, 160ms);
+                    pbf_wait(context, wait);
+
+                    direction.change_direction(env.program_info(), env.console, context, 6.036137);
+                    pbf_move_left_joystick(context, {0, +1}, 1600ms, 400ms);
+                    pbf_press_button(context, BUTTON_R, 160ms, 160ms);
+                    pbf_wait(context, wait);
+
+                    direction.change_direction(env.program_info(), env.console, context, 5.779599);
+                    pbf_move_left_joystick(context, {0, +1}, 3200ms, 400ms);
+                    pbf_press_button(context, BUTTON_R, 160ms, 160ms);
+                    pbf_wait(context, wait);
+
+                    pbf_move_left_joystick(context, {0, +1}, 4800ms, 400ms);
+                    pbf_press_button(context, BUTTON_R, 160ms, 160ms);
+                    pbf_wait(context, wait);
+
+
+                    pbf_wait(context, 20000ms);
+                }catch (OperationFailedException&){
+                    env.console.log("Failed to change direction, but it's possibly due to clearing the challenge.");
+                    pbf_wait(context, 20000ms);
+                }
+                
+            },
+            {no_minimap}
+        );
+        context.wait_for(std::chrono::milliseconds(100));
+        if (ret < 0){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "Team Star Poison: Failed to kill 30 pokemon with Let's go.",
+                env.console
+            );            
+        }
+        clear_dialog(env.console, context, ClearDialogMode::STOP_BATTLE, 60, {CallbackEnum::BATTLE, CallbackEnum::DIALOG_ARROW});
+        env.console.log("Battle the Team Star (Poison) boss.");
+        run_trainer_battle_press_A(env.console, context, BattleStopCondition::STOP_DIALOG);
+        mash_button_till_overworld(env.console, context, BUTTON_A, 360);
+
+    });    
+
+}
+
+void checkpoint_60(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+){
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){
+        // fly back to Porto Marinada Pokecenter from Team Star Poison
+        // this clears Pokemon in minimap
+        move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::ZOOM_OUT, -1, 0, 4800ms}, FlyPoint::POKECENTER);
+
+
+        move_from_porto_marinada_to_medali(env, context);
+    });    
+
+}
+
+void move_from_porto_marinada_to_medali(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    context.wait_for_all_requests();
+
+    // marker 1
+    realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_NEW_MARKER, +1, +0.141, 600ms);
+
+    handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            overworld_navigation(env.program_info(), env.console, context, 
+                NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                0, +1, 40, 10, false);
+        }, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            pbf_move_left_joystick(context, {+1, -1}, 320ms, 400ms);
+            realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+        }
+    );          
+
+    // marker 2.   x=0.3875, y=0.60463
+    place_marker_offset_from_flypoint(env.program_info(), env.console, context, 
+        {ZoomChange::ZOOM_OUT, -1, +1, 0ms},
+        FlyPoint::POKECENTER, 
+        {0.3875, 0.60463}
+    );        
+    handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            overworld_navigation(env.program_info(), env.console, context, 
+                NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                0, +1, 40, 10, false);
+        }, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            pbf_move_left_joystick(context, {-1, -1}, 320ms, 400ms);
+            realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+        }
+    ); 
+
+    
+    // marker 3.  : x=0.316146, y=0.623148
+    place_marker_offset_from_flypoint(env.program_info(), env.console, context, 
+        {ZoomChange::ZOOM_OUT, -1, +1, 0ms},
+        FlyPoint::POKECENTER, 
+        {0.316146, 0.623148}
+    );        
+    handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            overworld_navigation(env.program_info(), env.console, context, 
+                NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                0, +1, 40, 10, false);
+        }, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            pbf_move_left_joystick(context, {-1, -1}, 320ms, 400ms);
+            realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+        }
+    );
+
+    get_on_ride(env.program_info(), env.console, context);
+
+    // marker 4. cross bridge 1  x=0.310417, y=0.712963. 
+    place_marker_offset_from_flypoint(env.program_info(), env.console, context, 
+        {ZoomChange::ZOOM_OUT, -1, +1, 0ms},
+        FlyPoint::POKECENTER, 
+        {0.310417, 0.712963}
+    );        
+    handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            overworld_navigation(env.program_info(), env.console, context, 
+                NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                0, +1, 40, 20, false);
+        }, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            pbf_move_left_joystick(context, {0, +1}, 500ms, 0ms);
+            pbf_controller_state(context, BUTTON_B, DPAD_NONE, {0, +1}, {0, 0}, 1000ms);
+            pbf_move_left_joystick(context, {0, +1}, 500ms, 0ms);
+            realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+        }
+    );
+
+    get_off_ride(env.program_info(), env.console, context);
+
+
+    // marker 5.  : x=0.582292, y=0.692593
+    place_marker_offset_from_flypoint(env.program_info(), env.console, context, 
+        {ZoomChange::ZOOM_OUT, -1, +1, 0ms},
+        FlyPoint::POKECENTER, 
+        {0.582292, 0.692593}
+    );        
+    handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            overworld_navigation(env.program_info(), env.console, context, 
+                NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                0, +1, 60, 10, false);
+        }, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            pbf_move_left_joystick(context, {-1, -1}, 320ms, 400ms);
+            realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+        }
+    );
+
+    get_on_ride(env.program_info(), env.console, context);
+
+    // marker 6. cross bridge 2 :   x=0.555208, y=0.627778
+    place_marker_offset_from_flypoint(env.program_info(), env.console, context, 
+        {ZoomChange::ZOOM_OUT, -1, +1, 0ms},
+        FlyPoint::POKECENTER, 
+        {0.555208, 0.627778}
+    );        
+    handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            overworld_navigation(env.program_info(), env.console, context, 
+                NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                0, +1, 20, 10, false);
+        }, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            pbf_move_left_joystick(context, {0, +1}, 500ms, 0ms);
+            pbf_controller_state(context, BUTTON_B, DPAD_NONE, {0, +1}, {0, 0}, 1000ms);
+            pbf_move_left_joystick(context, {0, +1}, 500ms, 0ms);
+            realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+        }
+    );
+
+    get_off_ride(env.program_info(), env.console, context);
+
+    // marker 7.  :  x=0.678646, y=0.669444
+    place_marker_offset_from_flypoint(env.program_info(), env.console, context,
+        {ZoomChange::KEEP_ZOOM, +1, -1, 240ms},
+        FlyPoint::POKECENTER, 
+        {0.678646, 0.669444}
+    );        
+    handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            overworld_navigation(env.program_info(), env.console, context, 
+                NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                0, +1, 40, 10, false);
+        }, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            pbf_move_left_joystick(context, {-1, -1}, 320ms, 400ms);
+            realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+        }
+    );
+
+    // marker 8.  :  x=0.533333, y=0.640741
+    place_marker_offset_from_flypoint(env.program_info(), env.console, context, 
+        {ZoomChange::KEEP_ZOOM, +1, -1, 400ms},
+        FlyPoint::POKECENTER, 
+        {0.533333, 0.640741}
+    );        
+    handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            overworld_navigation(env.program_info(), env.console, context, 
+                NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                0, +1, 40, 10, false);
+        }, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            pbf_move_left_joystick(context, {-1, -1}, 320ms, 400ms);
+            realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+        }
+    );
+
+
+    // marker 9. set marker to pokecenter
+    realign_player_from_landmark(
+        env.program_info(), env.console, context, 
+        {ZoomChange::ZOOM_IN, 0, -1, 400ms},
+        {ZoomChange::KEEP_ZOOM, -1, +1, 0ms}
+    );  
+    handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            overworld_navigation(env.program_info(), env.console, context, 
+                NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                0, +1, 30, 10, false);
+        }, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            pbf_move_left_joystick(context, {-1, -1}, 320ms, 400ms);
+            realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+        }
+    ); 
+
+    // marker 10. set marker past pokecenter
+    handle_unexpected_battles(env.program_info(), env.console, context,
+    [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+        realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_NEW_MARKER, +0.409, -1, 400ms);
+    });      
+    overworld_navigation(env.program_info(), env.console, context, 
+        NavigationStopCondition::STOP_TIME, NavigationMovementMode::DIRECTIONAL_ONLY, 
+        0, +0.883, 12, 12, false);           // can't wrap in handle_when_stationary_in_overworld(), since we expect to be stationary when walking into the pokecenter
+        
+
+    fly_to_overlapping_flypoint(env.program_info(), env.console, context); 
+
+}
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_25.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_25.h
new file mode 100644
index 0000000000..51721c8e87
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_25.h
@@ -0,0 +1,96 @@
+/*  Autostory
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_AutoStory_Segment_25_H
+#define PokemonAutomation_PokemonSV_AutoStory_Segment_25_H
+
+#include "PokemonSV_AutoStoryTools.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+class AutoStory_Segment_25 : public AutoStory_Segment{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_segment(
+        SingleSwitchProgramEnvironment& env, 
+        ProControllerContext& context,
+        AutoStoryOptions options,
+        AutoStoryStats& stats
+    ) const override;
+};
+
+class AutoStory_Checkpoint_58 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+class AutoStory_Checkpoint_59 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+class AutoStory_Checkpoint_60 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+
+
+// start: Beat Orthworm. At East Province (Area Three) Pokecenter.
+// end: Beat Orthworm. At East Province (Area Three) Pokecenter.
+void checkpoint_58(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+);
+
+// start: Beat Orthworm. At East Province (Area Three) Pokecenter.
+// end: Beat Team Star (Poison)
+void checkpoint_59(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+);
+
+// start: Beat Team Star (Poison)
+// end: At Medali Pokecenter.
+void checkpoint_60(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+);
+
+// moves player from Porto Marinada Pokecenter to Medali West Pokecenter
+void move_from_porto_marinada_to_medali(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_26.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_26.cpp
new file mode 100644
index 0000000000..34b83ce72d
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_26.cpp
@@ -0,0 +1,524 @@
+/*  AutoStory
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonTools/VisualDetectors/BlackScreenDetector.h"
+
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h"
+#include "PokemonSV_AutoStoryTools.h"
+#include "PokemonSV_AutoStory_Segment_26.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+//#include <unordered_map>
+//#include <algorithm>
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+
+std::string AutoStory_Segment_26::name() const{
+    return "26: Medali Gym (Normal)";
+}
+
+std::string AutoStory_Segment_26::start_text() const{
+    return "Start: Beat Team Star (Poison). At Medali Pokecenter.";
+}
+
+std::string AutoStory_Segment_26::end_text() const{
+    return "End: Beat Medali Gym (Normal). At Glaseado Mountain Pokecenter.";
+}
+
+void AutoStory_Segment_26::run_segment(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    AutoStoryOptions options,
+    AutoStoryStats& stats
+) const{
+    
+
+    stats.m_segment++;
+    env.update_stats();
+    context.wait_for_all_requests();
+    env.console.log("Start Segment " + name(), COLOR_ORANGE);
+
+    AutoStory_Checkpoint_61().run_checkpoint(env, context, options, stats);
+    AutoStory_Checkpoint_62().run_checkpoint(env, context, options, stats);
+    AutoStory_Checkpoint_63().run_checkpoint(env, context, options, stats);
+
+    context.wait_for_all_requests();
+    env.console.log("End Segment " + name(), COLOR_GREEN);
+
+}
+
+
+std::string AutoStory_Checkpoint_61::name() const{ return "061 - " + AutoStory_Segment_26().name(); }
+std::string AutoStory_Checkpoint_61::start_text() const{ return "At Medali Pokecenter.";}
+std::string AutoStory_Checkpoint_61::end_text() const{ return "Inside Medali Gym building.";}
+void AutoStory_Checkpoint_61::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_61(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+
+std::string AutoStory_Checkpoint_62::name() const{ return "062 - " + AutoStory_Segment_26().name(); }
+std::string AutoStory_Checkpoint_62::start_text() const{ return AutoStory_Checkpoint_61().end_text();}
+std::string AutoStory_Checkpoint_62::end_text() const{ return "Beat Medali Gym. Inside Medali Gym building.";}
+void AutoStory_Checkpoint_62::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_62(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+std::string AutoStory_Checkpoint_63::name() const{ return "063 - " + AutoStory_Segment_26().name(); }
+std::string AutoStory_Checkpoint_63::start_text() const{ return AutoStory_Checkpoint_62().end_text();}
+std::string AutoStory_Checkpoint_63::end_text() const{ return "At Glaseado Mountain Pokecenter.";}
+void AutoStory_Checkpoint_63::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_63(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+
+
+
+void checkpoint_61(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+){
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text, 
+    [&](size_t attempt_number){
+
+        // first, clear Pokemon in Minimap.
+        if (attempt_number > 0 || ENABLE_TEST){
+            env.console.log("Fly to neighbouring Pokecenter, then fly back, to clear any pokemon covering the minimap.");
+            move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::KEEP_ZOOM, -1, +1, 0ms});
+            move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::KEEP_ZOOM, -1, +1, 0ms});
+        }
+
+        // marker 1   keep{0.490625, 0.594444}  in{0.589583, 0.569444} 
+        place_marker_offset_from_flypoint(env.program_info(), env.console, context, 
+            {ZoomChange::ZOOM_IN, -1, +1, 0ms},
+            FlyPoint::POKECENTER, 
+            {0.589583, 0.569444}
+        );
+        
+        DirectionDetector direction;
+
+        direction.change_direction(env.program_info(), env.console, context, 0.278620);
+        pbf_move_left_joystick(context, {0, +1}, 3200ms, 400ms);
+
+        realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+
+        handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){           
+                overworld_navigation(env.program_info(), env.console, context, 
+                    NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                    0, +1, 60, 20, false);
+            }, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_move_left_joystick(context, {-1, 0}, 320ms, 400ms);
+                realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+            }
+        );
+
+        direction.change_direction(env.program_info(), env.console, context, 3.566068);
+
+        handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){           
+                walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_ONLY, 20000ms);
+            }, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_move_left_joystick(context, {+1, +1}, 800ms, 400ms); // if to the left of the door, will move right and enter
+                pbf_move_left_joystick(context, {-1, 0}, 2400ms, 400ms); // if to the right of the door, will move left
+                pbf_move_left_joystick(context, {+1, +1}, 800ms, 400ms); // then move right and enter
+            }
+        );
+
+        // speak to Nemona, inside the gym
+        mash_button_till_overworld(env.console, context, BUTTON_A);
+
+        // speak to gym receptionist
+        walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_SPAM_A, 20000ms);
+        clear_dialog(env.console, context, ClearDialogMode::STOP_OVERWORLD, 60, {CallbackEnum::OVERWORLD});
+
+    });    
+
+}
+
+void checkpoint_62(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+){
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){
+
+        pbf_move_left_joystick(context, {0, -1}, 2400ms, 800ms);
+        pbf_wait(context, 3000ms);
+        // wait for overworld after leaving gym
+        wait_for_overworld(env.program_info(), env.console, context, 30);
+
+
+        DirectionDetector direction;
+        env.console.log("Fly back to Medali East Pokecenter");
+        env.console.log("Fly to neighbouring Pokecenter, then fly back, to clear any pokemon covering the minimap.");
+        env.console.log("Fly to Cascaraffa north to clear minimap. Then Medali West. End up in Medal East Pokecenter.");
+        move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::KEEP_ZOOM, -1, -0.409, 800ms}, FlyPoint::POKECENTER);
+        move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::KEEP_ZOOM, +1, +0.375, 680ms});
+        move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::ZOOM_IN, -1, +1, 0ms});
+
+
+        pbf_press_button(context, BUTTON_L, 400ms, 400ms);
+
+        direction.change_direction(env.program_info(), env.console, context, 1.971173);
+        pbf_move_left_joystick(context, {0, +1}, 4800ms, 400ms);
+
+        direction.change_direction(env.program_info(), env.console, context, 3.191172);
+        pbf_move_left_joystick(context, {0, +1}, 2400ms, 400ms);
+
+         
+        direction.change_direction(env.program_info(), env.console, context, 5.114177);  // old 4.975295
+
+        
+        env.console.log("Attempt to enter Eatery.");
+        handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                BlackScreenWatcher black_screen(COLOR_RED);
+                int ret = run_until<ProControllerContext>(
+                    env.console, context,
+                    [](ProControllerContext& context){
+                        pbf_move_left_joystick(context, {0, +1}, 10000ms, 0ms);
+                    },
+                    { black_screen }
+                );
+                if (ret == 0){
+                    env.console.log("Detected black screen. Assume entered Eatery.");
+                }
+                if (ret < 0){
+                    OperationFailedExceptionWithScreenshot::fire(
+                        ErrorReportMode::SEND_ERROR_REPORT,
+                        "Never detected black screen. Failed to enter Eatery.",
+                        env.console
+                    );
+                }
+            }, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_move_left_joystick(context, {+1, +1}, 800ms, 400ms);
+            },
+            5, 5
+        ); 
+
+        pbf_wait(context, 3000ms);
+        // wait for overworld after entering Eatery
+        wait_for_overworld(env.program_info(), env.console, context, 30);
+
+        pbf_move_left_joystick(context, {+1, 0}, 400ms, 400ms);
+        
+        walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_SPAM_A);
+        clear_dialog(env.console, context, ClearDialogMode::STOP_PROMPT, 60, {CallbackEnum::PROMPT_DIALOG});
+
+        // grilled rice balls
+        pbf_press_button(context, BUTTON_A, 400ms, 400ms);
+        clear_dialog(env.console, context, ClearDialogMode::STOP_PROMPT, 60, {CallbackEnum::PROMPT_DIALOG});
+        // medium serving
+        pbf_press_dpad(context, DPAD_DOWN, 104ms, 160ms);
+        pbf_press_button(context, BUTTON_A, 400ms, 400ms);
+        clear_dialog(env.console, context, ClearDialogMode::STOP_PROMPT, 60, {CallbackEnum::PROMPT_DIALOG});
+        // extra crispy
+        pbf_press_dpad(context, DPAD_UP, 104ms, 160ms);
+        pbf_press_button(context, BUTTON_A, 400ms, 400ms);
+        clear_dialog(env.console, context, ClearDialogMode::STOP_PROMPT, 60, {CallbackEnum::PROMPT_DIALOG});
+        // lemon
+        pbf_press_dpad(context, DPAD_DOWN, 104ms, 160ms);
+        pbf_press_button(context, BUTTON_A, 400ms, 400ms);
+        clear_dialog(env.console, context, ClearDialogMode::STOP_OVERWORLD, 60, {CallbackEnum::OVERWORLD}, false);
+
+
+        pbf_mash_button(context, BUTTON_A, 1000ms);
+        clear_dialog(env.console, context, ClearDialogMode::STOP_BATTLE, 60, {CallbackEnum::PROMPT_DIALOG, CallbackEnum::BATTLE, CallbackEnum:: DIALOG_ARROW});
+
+        env.console.log("Battle Normal Gym leader.");
+        run_trainer_battle_press_A(env.console, context, BattleStopCondition::STOP_DIALOG);
+        // We see Dialog right before the final pokemon terastalizes, but after you select your move. So, technically, we see dialog before the battle officially ends.
+        // it's fine as long as you OHKO Larry's final Pokemon. If you can't OHKO the final Staraptor, they you probably won't be able to beat the Elite Four.
+        clear_dialog(env.console, context, ClearDialogMode::STOP_TIMEOUT, 60);
+        pbf_mash_button(context, BUTTON_A, 1000ms);
+
+        env.console.log("Finish up with Larry, then speak to Geeta and Nemona.");
+        clear_dialog(env.console, context, ClearDialogMode::STOP_BATTLE, 60, {CallbackEnum::WHITE_A_BUTTON, CallbackEnum::PROMPT_DIALOG, CallbackEnum::BATTLE, CallbackEnum:: DIALOG_ARROW});
+        env.console.log("Battle Nemona.");
+        run_trainer_battle_press_A(env.console, context, BattleStopCondition::STOP_DIALOG);
+        mash_button_till_overworld(env.console, context, BUTTON_A);
+        
+
+    });    
+
+}
+
+void checkpoint_63(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+){
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){
+
+        // Gym leader defeated. Standing in Gym building
+        pbf_move_left_joystick(context, {0, -1}, 2400ms, 800ms);
+        pbf_wait(context, 3000ms);
+        // wait for overworld after leaving Gym
+        wait_for_overworld(env.program_info(), env.console, context, 30);
+
+        // fly to Medali East Pokecenter
+        env.console.log("Fly back to Medali East Pokecenter");
+        env.console.log("Fly to neighbouring Pokecenter, then fly back, to clear any pokemon covering the minimap.");
+        env.console.log("Fly to Cascaraffa north to clear minimap. Then Medali West. End up in Medal East Pokecenter.");
+        move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::KEEP_ZOOM, -1, -0.409, 800ms}, FlyPoint::POKECENTER);
+        move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::KEEP_ZOOM, +1, +0.375, 680ms});
+        move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::ZOOM_IN, -1, +1, 0ms});
+
+        
+        move_from_medali_to_glaseado_mountain(env, context);
+
+    });    
+
+}
+
+
+void move_from_medali_to_glaseado_mountain(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    context.wait_for_all_requests();
+
+
+    // marker 1.    x=0.399479, y=0.713889
+    place_marker_offset_from_flypoint(env.program_info(), env.console, context, 
+        {ZoomChange::KEEP_ZOOM, -1, +1, 0ms},
+        FlyPoint::POKECENTER, 
+        {0.399479, 0.713889}
+    );        
+    handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            overworld_navigation(env.program_info(), env.console, context, 
+                NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                0, +1, 20, 10, false);
+        }, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            pbf_move_left_joystick(context, {-1, -1}, 320ms, 400ms);
+            realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+        }
+    );
+    
+
+    // marker 2.     x=0.410417, y=0.760185
+    place_marker_offset_from_flypoint(env.program_info(), env.console, context, 
+        {ZoomChange::KEEP_ZOOM, +1, +1, 240ms},
+        FlyPoint::POKECENTER, 
+        {0.410417, 0.760185}
+    );        
+    handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            overworld_navigation(env.program_info(), env.console, context, 
+                NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                0, +1, 30, 10, false);
+        }, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            pbf_move_left_joystick(context, {-1, -1}, 320ms, 400ms);
+            realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+        }
+    );
+
+
+    // marker 3.     : x=0.3875, y=0.712037
+    place_marker_offset_from_flypoint(env.program_info(), env.console, context, 
+        {ZoomChange::ZOOM_OUT, -1, +1, 0ms},
+        FlyPoint::POKECENTER, 
+        {0.3875, 0.712037}
+    );        
+    handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            overworld_navigation(env.program_info(), env.console, context, 
+                NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                0, +1, 40, 10, false);
+        }, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            pbf_move_left_joystick(context, {-1, -1}, 320ms, 400ms);
+            realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+        }
+    );
+
+
+    // marker 4. cross creek     x=0.502083, y=0.255556
+    place_marker_offset_from_flypoint(env.program_info(), env.console, context, 
+        {ZoomChange::ZOOM_OUT, 0, +1, 160ms},
+        FlyPoint::POKECENTER, 
+        {0.502083, 0.255556}
+    );        
+
+    get_on_ride(env.program_info(), env.console, context);
+
+    handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            overworld_navigation(env.program_info(), env.console, context, 
+                NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                0, +1, 40, 20, false);
+        }, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            pbf_move_left_joystick(context, {0, +1}, 500ms, 0ms);
+            pbf_controller_state(context, BUTTON_B, DPAD_NONE, {0, +1}, {0, 0}, 1000ms);
+            pbf_move_left_joystick(context, {0, +1}, 500ms, 0ms);
+            realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+        }
+    );
+
+    get_off_ride(env.program_info(), env.console, context);
+
+    
+
+    // marker 5.     x=0.461458, y=0.297222
+    place_marker_offset_from_flypoint(env.program_info(), env.console, context, 
+        {ZoomChange::ZOOM_OUT, -1, +1, 0ms},
+        FlyPoint::POKECENTER, 
+        {0.461458, 0.297222}
+    );        
+    handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            overworld_navigation(env.program_info(), env.console, context, 
+                NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                0, +1, 30, 10, false);
+        }, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            pbf_move_left_joystick(context, {+1, -1}, 320ms, 400ms);
+            realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+        }
+    );
+
+    // marker 6.     x=0.451562, y=0.288889
+    place_marker_offset_from_flypoint(env.program_info(), env.console, context, 
+        {ZoomChange::KEEP_ZOOM, 0, +1, 400ms},
+        FlyPoint::POKECENTER, 
+        {0.451562, 0.288889}
+    );        
+    handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            overworld_navigation(env.program_info(), env.console, context, 
+                NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                0, +1, 40, 10, false);
+        }, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            pbf_move_left_joystick(context, {-1, -1}, 320ms, 400ms);
+            realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+        }
+    );
+
+
+    // marker 7.    : x=0.623958, y=0.35463
+    place_marker_offset_from_flypoint(env.program_info(), env.console, context, 
+        {ZoomChange::ZOOM_IN, -1, +1, 400ms},
+        FlyPoint::POKECENTER, 
+        {0.623958, 0.35463}
+    );        
+    handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            overworld_navigation(env.program_info(), env.console, context, 
+                NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                0, +1, 30, 10, false);
+        }, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            pbf_move_left_joystick(context, {-1, -1}, 320ms, 400ms);
+            realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+        }
+    );
+
+    // marker 8.     x=0.544271, y=0.5
+    place_marker_offset_from_flypoint(env.program_info(), env.console, context, 
+        {ZoomChange::ZOOM_IN, -1, +1, 0ms},
+        FlyPoint::POKECENTER, 
+        {0.544271, 0.5}
+    );        
+    handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            overworld_navigation(env.program_info(), env.console, context, 
+                NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                0, +1, 20, 10, false);
+        }, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            pbf_move_left_joystick(context, {-1, -1}, 320ms, 400ms);
+            realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+        }
+    );
+
+    // marker 9.    : x=0.417708, y=0.388889
+    place_marker_offset_from_flypoint(env.program_info(), env.console, context, 
+        {ZoomChange::ZOOM_IN, -1, +1, 0ms},
+        FlyPoint::POKECENTER, 
+        {0.417708, 0.388889}
+    );        
+    handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            overworld_navigation(env.program_info(), env.console, context, 
+                NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                0, +1, 20, 10, false);
+        }, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            pbf_move_left_joystick(context, {+1, -1}, 320ms, 400ms);
+            realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+        }
+    );
+
+
+    // marker 10. set marker to pokecenter
+    realign_player_from_landmark(
+        env.program_info(), env.console, context, 
+        {ZoomChange::ZOOM_IN, -1, +1, 0ms},
+        {ZoomChange::KEEP_ZOOM, -1, +1, 0ms}
+    );  
+    handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            overworld_navigation(env.program_info(), env.console, context, 
+                NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                0, +1, 20, 10, false);
+        }, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            pbf_move_left_joystick(context, {+1, -1}, 320ms, 400ms);
+            realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+        }
+    ); 
+
+    // marker 11. set marker past pokecenter
+    handle_unexpected_battles(env.program_info(), env.console, context,
+    [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+        realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_NEW_MARKER, -0.844, +1, 320ms);
+    });      
+    overworld_navigation(env.program_info(), env.console, context, 
+        NavigationStopCondition::STOP_TIME, NavigationMovementMode::DIRECTIONAL_ONLY, 
+        0, +0.883, 12, 12, false);           // can't wrap in handle_when_stationary_in_overworld(), since we expect to be stationary when walking into the pokecenter
+        
+
+    fly_to_overlapping_flypoint(env.program_info(), env.console, context); 
+
+}
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_26.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_26.h
new file mode 100644
index 0000000000..cfefa6227c
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_26.h
@@ -0,0 +1,97 @@
+/*  Autostory
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_AutoStory_Segment_26_H
+#define PokemonAutomation_PokemonSV_AutoStory_Segment_26_H
+
+#include "PokemonSV_AutoStoryTools.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+class AutoStory_Segment_26 : public AutoStory_Segment{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_segment(
+        SingleSwitchProgramEnvironment& env, 
+        ProControllerContext& context,
+        AutoStoryOptions options,
+        AutoStoryStats& stats
+    ) const override;
+};
+
+class AutoStory_Checkpoint_61 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+class AutoStory_Checkpoint_62 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+class AutoStory_Checkpoint_63 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+
+
+
+// start: At Medali Pokecenter.
+// end: Inside Medali Gym building
+void checkpoint_61(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+);
+
+// start: Inside Medali Gym building
+// end: Beat Medali Gym. Inside Medali Gym building.
+void checkpoint_62(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+);
+
+
+// start: Beat Medali Gym. Inside Medali Gym building.
+// end: At Glaseado Mountain Pokecenter
+void checkpoint_63(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EventNotificationOption& notif_status_update,
+    EventNotificationOption& notif_error_recoverable,
+    AutoStoryStats& stats,
+    const std::string& checkpoint_text
+);
+
+// moves player from Medali East Pokecenter to Glaseado Mountain Pokecenter
+void move_from_medali_to_glaseado_mountain(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_27.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_27.cpp
new file mode 100644
index 0000000000..da6a535aa9
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_27.cpp
@@ -0,0 +1,363 @@
+/*  AutoStory
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Exceptions/OperationFailedException.h"
+
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h"
+#include "PokemonSV_AutoStoryTools.h"
+#include "PokemonSV_AutoStory_Segment_27.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+//#include <unordered_map>
+//#include <algorithm>
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+
+std::string AutoStory_Segment_27::name() const{
+    return "27: Dondozo/Tatsugiri Titan";
+}
+
+std::string AutoStory_Segment_27::start_text() const{
+    return "Start: Beat Medali Gym (Normal). At Glaseado Mountain Pokecenter.";
+}
+
+std::string AutoStory_Segment_27::end_text() const{
+    return "End: Beat Dondozo/Tatsugiri Titan. At North Province Area Three Pokecenter.";
+}
+
+void AutoStory_Segment_27::run_segment(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    AutoStoryOptions options,
+    AutoStoryStats& stats
+) const{
+    
+
+    stats.m_segment++;
+    env.update_stats();
+    context.wait_for_all_requests();
+    env.console.log("Start Segment " + name(), COLOR_ORANGE);
+
+    AutoStory_Checkpoint_64().run_checkpoint(env, context, options, stats);
+    AutoStory_Checkpoint_65().run_checkpoint(env, context, options, stats);
+    AutoStory_Checkpoint_66().run_checkpoint(env, context, options, stats);
+    AutoStory_Checkpoint_67().run_checkpoint(env, context, options, stats);
+
+    context.wait_for_all_requests();
+    env.console.log("End Segment " + name(), COLOR_GREEN);
+
+}
+
+
+std::string AutoStory_Checkpoint_64::name() const{ return "064 - " + AutoStory_Segment_27().name(); }
+std::string AutoStory_Checkpoint_64::start_text() const{ return "At Glaseado Mountain Pokecenter";}
+std::string AutoStory_Checkpoint_64::end_text() const{ return "At Glaseado Mountain Pokecenter";}
+void AutoStory_Checkpoint_64::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_64(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+
+std::string AutoStory_Checkpoint_65::name() const{ return "065 - " + AutoStory_Segment_27().name(); }
+std::string AutoStory_Checkpoint_65::start_text() const{ return AutoStory_Checkpoint_64().end_text();}
+std::string AutoStory_Checkpoint_65::end_text() const{ return "Defeat Dondozo Titan phase 1.";}
+void AutoStory_Checkpoint_65::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_65(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+
+std::string AutoStory_Checkpoint_66::name() const{ return "066 - " + AutoStory_Segment_27().name(); }
+std::string AutoStory_Checkpoint_66::start_text() const{ return AutoStory_Checkpoint_65().end_text();}
+std::string AutoStory_Checkpoint_66::end_text() const{ return "Defeat Dondozo Titan phase 2-3.";}
+void AutoStory_Checkpoint_66::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_66(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+
+std::string AutoStory_Checkpoint_67::name() const{ return "067 - " + AutoStory_Segment_27().name(); }
+std::string AutoStory_Checkpoint_67::start_text() const{ return AutoStory_Checkpoint_66().end_text();}
+std::string AutoStory_Checkpoint_67::end_text() const{ return "At North Province Area Three Pokecenter";}
+void AutoStory_Checkpoint_67::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_67(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+
+
+void checkpoint_64(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, EventNotificationOption& notif_error_recoverable, AutoStoryStats& stats, const std::string& checkpoint_text){
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){
+        context.wait_for_all_requests();
+
+        // empty checkpoint
+
+    });         
+}
+
+void checkpoint_65(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, EventNotificationOption& notif_error_recoverable, AutoStoryStats& stats, const std::string& checkpoint_text){
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){
+        context.wait_for_all_requests();
+
+        if (attempt_number > 0 || ENABLE_TEST){
+            env.console.log("Fly to neighbouring Pokecenter, then fly back, to clear any pokemon covering the minimap.");
+            move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::KEEP_ZOOM, 0, -1, 1440ms});
+            move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::KEEP_ZOOM, 0, +1, 1440ms});
+        }
+
+        move_from_glaseado_mountain_to_casseroya_watchtower3(env, context, attempt_number);
+
+        move_from_casseroya_watchtower3_to_dondozo_titan(env, context);
+        
+    }); 
+}
+
+void checkpoint_66(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, EventNotificationOption& notif_error_recoverable, AutoStoryStats& stats, const std::string& checkpoint_text){
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){
+        context.wait_for_all_requests();
+        move_from_dondozo_titan_phase1_to_phase2(env, context);
+        
+    }); 
+}
+
+void checkpoint_67(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, EventNotificationOption& notif_error_recoverable, AutoStoryStats& stats, const std::string& checkpoint_text){
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){
+        context.wait_for_all_requests();
+        // fly to Glaseado Mountain Pokecenter from Dondozo
+        // this clears Pokemon in minimap
+
+        move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::ZOOM_OUT, -1, +1, 0ms}, FlyPoint::POKECENTER);
+        move_from_glaseado_mountain_to_north_province_area_three(env, context);
+
+    }); 
+}
+
+
+
+
+void move_from_glaseado_mountain_to_casseroya_watchtower3(SingleSwitchProgramEnvironment& env, ProControllerContext& context, size_t attempt_number){
+    context.wait_for_all_requests();
+
+    heal_at_pokecenter(env.program_info(), env.console, context);
+
+    DirectionDetector direction;
+    if (attempt_number > 0 || ENABLE_TEST){
+        env.console.log("Fly to neighbouring Pokecenter, then fly back, to clear any pokemon covering the minimap.");
+        move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::ZOOM_OUT, -0.219, -1, 480ms});
+        move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::ZOOM_OUT, 0, +1, 480ms});
+    }
+
+    direction.change_direction(env.program_info(), env.console, context, 1.448679);
+
+    pbf_move_left_joystick(context, {0, +1}, 1600ms, 400ms);
+
+
+    // marker 1   x=0.548438, y=0.273148
+    place_marker_offset_from_flypoint(env.program_info(), env.console, context, 
+        {ZoomChange::ZOOM_OUT, -1, +1, 0ms}, 
+        FlyPoint::POKECENTER, 
+        {0.548438, 0.273148}
+    );
+
+    get_on_ride(env.program_info(), env.console, context);
+
+    handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            overworld_navigation(env.program_info(), env.console, context, 
+                NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                0, +1, 20, 10, false);
+        }, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            pbf_move_left_joystick(context, {+1, -1}, 320ms, 400ms);
+            realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+        }
+    );
+
+    // marker 2.    :  x=0.693229, y=0.459259
+    place_marker_offset_from_flypoint(env.program_info(), env.console, context, 
+        {ZoomChange::KEEP_ZOOM, -1, +1, 0ms}, 
+        FlyPoint::POKECENTER, 
+        {0.693229, 0.459259}
+    );        
+    handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            overworld_navigation(env.program_info(), env.console, context, 
+                NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                0, +1, 20, 10, false);
+        }, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            pbf_move_left_joystick(context, {+1, -1}, 320ms, 400ms);
+            realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+        }
+    );
+
+    fly_to_overlapping_flypoint(env.program_info(), env.console, context); 
+
+}
+
+
+void move_from_casseroya_watchtower3_to_dondozo_titan(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    context.wait_for_all_requests();
+    fly_to_overlapping_flypoint(env.program_info(), env.console, context); 
+    
+    // marker 1     x=0.779167, y=0.274074
+    place_marker_offset_from_flypoint(env.program_info(), env.console, context, 
+        {ZoomChange::KEEP_ZOOM, -1, +1, 0ms}, 
+        FlyPoint::POKECENTER, 
+        {0.779167, 0.274074}
+    );
+
+    // get_on_ride(env.program_info(), env.console, context);
+    overworld_navigation(env.program_info(), env.console, context, 
+        NavigationStopCondition::STOP_DIALOG, NavigationMovementMode::DIRECTIONAL_ONLY, 
+        0, +1, 20, 10, false);
+
+
+    mash_button_till_overworld(env.console, context, BUTTON_A);
+
+    // resume marker 1
+    realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+    overworld_navigation(env.program_info(), env.console, context, 
+        NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+        0, +1, 20, 10, false);    
+
+    // marker 2.    :   x=0.76875, y=0.298148
+    place_marker_offset_from_flypoint(env.program_info(), env.console, context, 
+        {ZoomChange::KEEP_ZOOM, -1, +1, 0ms}, 
+        FlyPoint::FAST_TRAVEL, 
+        {0.76875, 0.298148}
+    );        
+    overworld_navigation(env.program_info(), env.console, context, 
+        NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+        0, +1, 30, 10, false);
+
+
+    // marker 3.    :   x=0.752604, y=0.401852
+    place_marker_offset_from_flypoint(env.program_info(), env.console, context, 
+        {ZoomChange::KEEP_ZOOM, -1, +1, 0ms}, 
+        FlyPoint::FAST_TRAVEL, 
+        {0.752604, 0.401852}
+    );        
+    overworld_navigation(env.program_info(), env.console, context, 
+        NavigationStopCondition::STOP_DIALOG, NavigationMovementMode::DIRECTIONAL_SPAM_A, 
+        0, +1, 20, 10, false);
+
+    clear_dialog(env.console, context, ClearDialogMode::STOP_BATTLE, 60, {CallbackEnum::BATTLE});
+
+    confirm_titan_battle(env, context);
+
+    env.console.log("Battle Dondozo/Tatsugiri Titan phase 1.");
+    run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+
+
+}
+
+void move_from_dondozo_titan_phase1_to_phase2(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    context.wait_for_all_requests();
+    
+    // marker 1      x=0.832292, y=0.54537
+    place_marker_offset_from_flypoint(env.program_info(), env.console, context, 
+        {ZoomChange::KEEP_ZOOM, -1, +1, 0ms}, 
+        FlyPoint::FAST_TRAVEL, 
+        {0.832292, 0.54537}
+    );
+
+    get_on_ride(env.program_info(), env.console, context);
+
+    overworld_navigation(env.program_info(), env.console, context, 
+        NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+        0, +1, 40, 10, false);
+
+    // marker 2       x=0.393229, y=0.748148
+    place_marker_offset_from_flypoint(env.program_info(), env.console, context, 
+        {ZoomChange::ZOOM_IN, -1, +1, 0ms}, 
+        FlyPoint::FAST_TRAVEL, 
+        {0.393229, 0.748148}
+    );
+    overworld_navigation(env.program_info(), env.console, context, 
+        NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+        0, +1, 20, 10, false);
+
+
+    // marker 3. go to Dondozo/Tatsugiri part 2       x=0.55625, y=0.324074
+    place_marker_offset_from_flypoint(env.program_info(), env.console, context, 
+        {ZoomChange::KEEP_ZOOM, 0, -1, 320ms},
+        FlyPoint::FAST_TRAVEL, 
+        {0.55625, 0.324074}
+    );
+    overworld_navigation(env.program_info(), env.console, context, 
+        NavigationStopCondition::STOP_DIALOG, NavigationMovementMode::DIRECTIONAL_ONLY, 
+        0, +1, 80, 40, false);
+
+    clear_dialog(env.console, context, ClearDialogMode::STOP_BATTLE, 60, {CallbackEnum::BATTLE});
+
+    confirm_titan_battle(env, context);
+    
+    env.console.log("Battle Dondozo/Tatsugiri Titan phase 2.");
+    run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_DIALOG);
+    clear_dialog(env.console, context, ClearDialogMode::STOP_BATTLE, 60, {CallbackEnum::BATTLE});
+    
+    env.console.log("Battle Dondozo/Tatsugiri Titan phase 3.");
+    run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_DIALOG, {CallbackEnum::DIALOG_ARROW});
+    mash_button_till_overworld(env.console, context, BUTTON_A, 360);
+
+}
+
+
+void move_from_glaseado_mountain_to_north_province_area_three(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    
+    context.wait_for_all_requests();
+
+    // marker 1. set marker to pokecenter
+    realign_player_from_landmark(
+        env.program_info(), env.console, context, 
+        {ZoomChange::KEEP_ZOOM, 0, +1, 400ms},
+        {ZoomChange::KEEP_ZOOM, -1, +1, 0ms}
+    );  
+    handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            overworld_navigation(env.program_info(), env.console, context, 
+                NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                0, +1, 80, 10, false);
+        }, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            pbf_move_left_joystick(context, {+1, -1}, 320ms, 400ms);
+            realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+        }
+    ); 
+
+
+    // marker 2. set marker past pokecenter
+    handle_unexpected_battles(env.program_info(), env.console, context,
+    [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+        realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_NEW_MARKER, 0, +1, 400ms);
+    });      
+    overworld_navigation(env.program_info(), env.console, context, 
+        NavigationStopCondition::STOP_TIME, NavigationMovementMode::DIRECTIONAL_ONLY, 
+        0, +0.883, 12, 12, false);           // can't wrap in handle_when_stationary_in_overworld(), since we expect to be stationary when walking into the pokecenter
+        
+
+    fly_to_overlapping_flypoint(env.program_info(), env.console, context); 
+
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_27.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_27.h
new file mode 100644
index 0000000000..8bb256f6f6
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_27.h
@@ -0,0 +1,98 @@
+/*  Autostory
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_AutoStory_Segment_27_H
+#define PokemonAutomation_PokemonSV_AutoStory_Segment_27_H
+
+#include "PokemonSV_AutoStoryTools.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+class AutoStory_Segment_27 : public AutoStory_Segment{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_segment(
+        SingleSwitchProgramEnvironment& env, 
+        ProControllerContext& context,
+        AutoStoryOptions options,
+        AutoStoryStats& stats
+    ) const override;
+};
+
+class AutoStory_Checkpoint_64 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+class AutoStory_Checkpoint_65 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+class AutoStory_Checkpoint_66 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+class AutoStory_Checkpoint_67 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+
+
+// start: At Glaseado Mountain Pokecenter
+// end: At Glaseado Mountain Pokecenter
+void checkpoint_64(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, EventNotificationOption& notif_error_recoverable, AutoStoryStats& stats, const std::string& checkpoint_text);
+
+// start: At Glaseado Mountain Pokecenter
+// end: Defeat Dondozo Titan phase 1.
+void checkpoint_65(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, EventNotificationOption& notif_error_recoverable, AutoStoryStats& stats, const std::string& checkpoint_text);
+
+// start: Defeat Dondozo Titan phase 1.
+// end: Defeat Dondozo Titan phase 2-3.
+void checkpoint_66(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, EventNotificationOption& notif_error_recoverable, AutoStoryStats& stats, const std::string& checkpoint_text);
+
+// start: Defeat Dondozo Titan phase 2-3.
+// end: At North Province Area Three Pokecenter
+void checkpoint_67(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, EventNotificationOption& notif_error_recoverable, AutoStoryStats& stats, const std::string& checkpoint_text);
+
+
+
+
+// moves player from Glaseado Mountain Pokecenter to Casseroya Watchtower 3
+void move_from_glaseado_mountain_to_casseroya_watchtower3(SingleSwitchProgramEnvironment& env, ProControllerContext& context, size_t attempt_number);
+
+// moves player from Casseroya Watchtower 3 to Dondozo Titan. Defeat Dondozo Titan phase 1.
+void move_from_casseroya_watchtower3_to_dondozo_titan(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+
+// moves player from Dondozo Titan phase 1 to phase 2. Defeat Dondozo Titan phase 2-3.
+void move_from_dondozo_titan_phase1_to_phase2(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+
+// moves player from Glaseado Mountain Pokecenter to North Province Area Three Pokecenter
+void move_from_glaseado_mountain_to_north_province_area_three(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_28.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_28.cpp
new file mode 100644
index 0000000000..c5141fe910
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_28.cpp
@@ -0,0 +1,470 @@
+/*  AutoStory
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+
+#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h"
+#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_NoMinimapDetector.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h"
+#include "PokemonSV_AutoStoryTools.h"
+#include "PokemonSV_AutoStory_Segment_28.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+//#include <unordered_map>
+//#include <algorithm>
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+
+std::string AutoStory_Segment_28::name() const{
+    return "28: Team Star (Fairy)";
+}
+
+std::string AutoStory_Segment_28::start_text() const{
+    return "Start: Beat Dondozo/Tatsugiri Titan. At North Province Area Three Pokecenter.";
+}
+
+std::string AutoStory_Segment_28::end_text() const{
+    return "End: Beat Team Star (Fairy). At Montenevera Pokecenter.";
+}
+
+void AutoStory_Segment_28::run_segment(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    AutoStoryOptions options,
+    AutoStoryStats& stats
+) const{
+    
+
+    stats.m_segment++;
+    env.update_stats();
+    context.wait_for_all_requests();
+    env.console.log("Start Segment " + name(), COLOR_ORANGE);
+
+    AutoStory_Checkpoint_68().run_checkpoint(env, context, options, stats);
+    AutoStory_Checkpoint_69().run_checkpoint(env, context, options, stats);
+    AutoStory_Checkpoint_70().run_checkpoint(env, context, options, stats);    
+
+    context.wait_for_all_requests();
+    env.console.log("End Segment " + name(), COLOR_GREEN);
+
+}
+
+
+std::string AutoStory_Checkpoint_68::name() const{ return "068 - " + AutoStory_Segment_28().name(); }
+std::string AutoStory_Checkpoint_68::start_text() const{ return "At North Province Area Three Pokecenter";}
+std::string AutoStory_Checkpoint_68::end_text() const{ return "At North Province Area Three Pokecenter";}
+void AutoStory_Checkpoint_68::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_68(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+
+std::string AutoStory_Checkpoint_69::name() const{ return "069 - " + AutoStory_Segment_28().name(); }
+std::string AutoStory_Checkpoint_69::start_text() const{ return AutoStory_Checkpoint_68().end_text();}
+std::string AutoStory_Checkpoint_69::end_text() const{ return "Beat Team Star (Fairy)";}
+void AutoStory_Checkpoint_69::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_69(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+std::string AutoStory_Checkpoint_70::name() const{ return "070 - " + AutoStory_Segment_28().name(); }
+std::string AutoStory_Checkpoint_70::start_text() const{ return AutoStory_Checkpoint_69().end_text();}
+std::string AutoStory_Checkpoint_70::end_text() const{ return "At Montenevera Pokecenter";}
+void AutoStory_Checkpoint_70::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_70(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+
+
+void checkpoint_68(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, EventNotificationOption& notif_error_recoverable, AutoStoryStats& stats, const std::string& checkpoint_text){
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){
+        // empty checkpoint, to preserve ordering
+        
+    
+    }, false);
+    
+}
+
+void checkpoint_69(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, EventNotificationOption& notif_error_recoverable, AutoStoryStats& stats, const std::string& checkpoint_text){
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){
+
+        context.wait_for_all_requests();
+        // move the marker elsewhere, away from North
+        realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_NEW_MARKER, 0, -1, 400ms);
+
+        DirectionDetector direction;
+        if (attempt_number > 0 || ENABLE_TEST){
+            env.console.log("Fly to neighbouring Pokecenter, then fly back, to clear any pokemon covering the minimap.");
+            move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::KEEP_ZOOM, 0, -1, 400ms});
+            // fly_to_overworld_from_map() may fail since the snowy background on the map will false positive the destinationMenuItemWatcher (MapDestinationMenuDetector at box {0.523000, 0.680000, 0.080000, 0.010000}), which causes the fly to fail
+            // we can get around this by either placing down a marker, or by zooming out so that that section isn't white snow.
+            move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::ZOOM_OUT, 0, +1, 100ms});
+        }
+
+        direction.change_direction(env.program_info(), env.console, context, 0.696613);
+
+        pbf_move_left_joystick(context, {0, +1}, 1600ms, 400ms);
+
+        realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_NEW_MARKER, +0.173, +1, 960ms);
+        handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                overworld_navigation(env.program_info(), env.console, context, 
+                    NavigationStopCondition::STOP_DIALOG, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                    0, +1, 40, 20, false);
+            }, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_move_left_joystick(context, {+1, -1}, 320ms, 400ms);
+                realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+            }
+        ); 
+
+        // talk to Clavell
+        clear_dialog(env.console, context, ClearDialogMode::STOP_OVERWORLD, 60, {CallbackEnum::OVERWORLD, CallbackEnum::PROMPT_DIALOG});
+
+        realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_NEW_MARKER, -1, +1, 800ms);
+        handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                overworld_navigation(env.program_info(), env.console, context, 
+                    NavigationStopCondition::STOP_DIALOG, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                    0, +1, 40, 20, false);
+            }, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_move_left_joystick(context, {+1, -1}, 320ms, 400ms);
+                realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+            }
+        ); 
+
+
+        // battle Team Star Grunt
+        clear_dialog(env.console, context, ClearDialogMode::STOP_BATTLE, 60, {CallbackEnum::PROMPT_DIALOG, CallbackEnum::DIALOG_ARROW, CallbackEnum::BATTLE});
+        env.console.log("Battle Mr. Harrington.");
+        run_trainer_battle_press_A(env.console, context, BattleStopCondition::STOP_DIALOG);
+        mash_button_till_overworld(env.console, context, BUTTON_A);
+
+
+        context.wait_for_all_requests();
+        do_action_and_monitor_for_battles(env.program_info(), env.console, context,
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                // don't use marker since it covers up north
+                DirectionDetector direction;
+
+                direction.change_direction(env.program_info(), env.console, context, 0.261697);
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms);
+                
+                walk_forward_while_clear_front_path(env.program_info(), env.console, context, 800ms);
+                walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_SPAM_A);
+            }
+        );
+        clear_dialog(env.console, context, ClearDialogMode::STOP_OVERWORLD, 60, {CallbackEnum::OVERWORLD, CallbackEnum::PROMPT_DIALOG});
+
+        NoMinimapWatcher no_minimap(env.console.logger(), COLOR_RED, Milliseconds(250));
+        int ret = run_until<ProControllerContext>(
+            env.console, context,
+            [&](ProControllerContext& context){
+                
+                Milliseconds wait = 6000ms;
+ 
+                DirectionDetector direction;
+
+                direction.change_direction(env.program_info(), env.console, context, 0.611062);
+                pbf_move_left_joystick(context, {0, +1}, 1600ms, 400ms);
+                pbf_press_button(context, BUTTON_R, 160ms, 160ms);
+                pbf_wait(context, wait);
+
+
+                direction.change_direction(env.program_info(), env.console, context, 5.550472);
+                pbf_move_left_joystick(context, {0, +1}, 2400ms, 400ms);
+                pbf_press_button(context, BUTTON_R, 160ms, 160ms);
+                pbf_wait(context, wait);
+
+                direction.change_direction(env.program_info(), env.console, context, 5.860926);
+                pbf_move_left_joystick(context, {0, +1}, 3200ms, 400ms);
+
+                direction.change_direction(env.program_info(), env.console, context, 4.920249);
+                pbf_move_left_joystick(context, {0, +1}, 800ms, 400ms);
+                pbf_press_button(context, BUTTON_R, 160ms, 160ms);
+                pbf_wait(context, wait);
+
+                direction.change_direction(env.program_info(), env.console, context, 0.402877);
+                pbf_move_left_joystick(context, {0, +1}, 2400ms, 400ms);
+                pbf_press_button(context, BUTTON_R, 160ms, 160ms);
+                pbf_wait(context, wait);
+
+                direction.change_direction(env.program_info(), env.console, context, 5.707655);
+                pbf_move_left_joystick(context, {0, +1}, 3200ms, 400ms);
+                pbf_press_button(context, BUTTON_R, 160ms, 160ms);
+                pbf_wait(context, wait);
+
+                direction.change_direction(env.program_info(), env.console, context, 5.394366);
+                pbf_move_left_joystick(context, {0, +1}, 3200ms, 400ms);
+                pbf_press_button(context, BUTTON_R, 160ms, 160ms);
+                pbf_wait(context, wait);
+
+                direction.change_direction(env.program_info(), env.console, context, 0.979935);
+                pbf_move_left_joystick(context, {0, +1}, 4000ms, 400ms);
+                pbf_press_button(context, BUTTON_R, 160ms, 160ms);
+                pbf_wait(context, wait);
+
+                direction.change_direction(env.program_info(), env.console, context,  1.552260);
+                pbf_move_left_joystick(context, {0, +1}, 2400ms, 400ms);
+                pbf_press_button(context, BUTTON_R, 160ms, 160ms);
+                pbf_wait(context, wait);
+
+                direction.change_direction(env.program_info(), env.console, context, 1.869166);
+                pbf_move_left_joystick(context, {0, +1}, 1600ms, 400ms);
+                pbf_press_button(context, BUTTON_R, 160ms, 160ms);
+                pbf_wait(context, wait);
+
+
+                direction.change_direction(env.program_info(), env.console, context, 0.769966);
+                pbf_move_left_joystick(context, {0, +1}, 2400ms, 400ms);
+                pbf_press_button(context, BUTTON_R, 160ms, 160ms);
+                pbf_wait(context, wait);
+
+                
+
+                direction.change_direction(env.program_info(), env.console, context, 6.127338);
+                pbf_move_left_joystick(context, {0, +1}, 2400ms, 400ms);
+                pbf_press_button(context, BUTTON_R, 160ms, 160ms);
+                pbf_wait(context, wait);
+
+
+                try{
+                    direction.change_direction(env.program_info(), env.console, context, 1.451616);
+                    pbf_move_left_joystick(context, {0, +1}, 4000ms, 400ms);
+                    pbf_press_button(context, BUTTON_R, 160ms, 160ms);
+                    pbf_wait(context, wait);
+                    
+
+                    direction.change_direction(env.program_info(), env.console, context, 2.023052);
+                    pbf_move_left_joystick(context, {0, +1}, 4000ms, 400ms);
+                    pbf_press_button(context, BUTTON_R, 160ms, 160ms);
+                    pbf_wait(context, wait);
+                    
+
+                    direction.change_direction(env.program_info(), env.console, context, 1.13517);
+                    pbf_move_left_joystick(context, {0, +1}, 8000ms, 400ms);
+                    pbf_press_button(context, BUTTON_R, 160ms, 160ms);
+                    pbf_wait(context, wait);
+                    
+                    direction.change_direction(env.program_info(), env.console, context, 0.609735);
+                    pbf_move_left_joystick(context, {0, +1}, 1600ms, 400ms);
+                    pbf_press_button(context, BUTTON_R, 160ms, 160ms);
+                    pbf_wait(context, wait);
+                }catch (OperationFailedException&){
+                    env.console.log("Failed to change direction, but it's possibly due to clearing the challenge.");
+                    pbf_wait(context, 20000ms);
+                }
+
+                // ///////////////////////
+                
+
+                // direction.change_direction(env.program_info(), env.console, context, 0);
+                // pbf_move_left_joystick(context, 128, 0, 00, 50);
+                // pbf_press_button(context, BUTTON_R, 160ms, 160ms);
+                // pbf_wait(context, wait);
+
+
+                pbf_wait(context, 20000ms);
+                
+            },
+            {no_minimap}
+        );
+        context.wait_for(std::chrono::milliseconds(100));
+        if (ret < 0){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "Team Star Fairy: Failed to kill 30 pokemon with Let's go.",
+                env.console
+            );            
+        }
+        clear_dialog(env.console, context, ClearDialogMode::STOP_BATTLE, 60, {CallbackEnum::BATTLE, CallbackEnum::DIALOG_ARROW});
+        env.console.log("Battle the Team Star (Fairy) boss.");
+        run_trainer_battle_press_A(env.console, context, BattleStopCondition::STOP_DIALOG);
+        mash_button_till_overworld(env.console, context, BUTTON_A, 360);
+
+    });
+}
+
+void checkpoint_70(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, EventNotificationOption& notif_error_recoverable, AutoStoryStats& stats, const std::string& checkpoint_text){
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){
+        context.wait_for_all_requests();
+        // fly back to North Province Area Three
+        // fly_to_overworld_from_map() may fail since the snowy background on the map will false positive the destinationMenuItemWatcher (MapDestinationMenuDetector at box {0.523000, 0.680000, 0.080000, 0.010000}), which causes the fly to fail
+        // we can get around this by either placing down a marker, or by zooming out so that that section isn't white snow.
+        move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::ZOOM_OUT, -1, +1, 0ms}, FlyPoint::POKECENTER);
+
+        // fly back to Glaseado Mountain Pokecenter
+        // this clears Pokemon in minimap
+        move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::ZOOM_OUT, -1, +1, 0ms}, FlyPoint::POKECENTER);
+
+        move_from_glaseado_mountain_to_montenevera(env, context);
+
+    });
+}
+
+
+void move_from_glaseado_mountain_to_montenevera(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    context.wait_for_all_requests();
+
+
+    // marker 1         {0.745313, 0.637037}
+    place_marker_offset_from_flypoint(env.program_info(), env.console, context, 
+        {ZoomChange::KEEP_ZOOM, -1, +1, 0ms}, 
+        FlyPoint::POKECENTER, 
+        {0.745313, 0.637037}
+    );
+    handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            overworld_navigation(env.program_info(), env.console, context, 
+                NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                0, +1, 30, 10, false);
+        }, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            pbf_move_left_joystick(context, {-1, -1}, 320ms, 400ms);
+            realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+        }
+    );
+    
+    // marker 2       x=0.225521, y=0.380556. {0.229687, 0.37037}
+    place_marker_offset_from_flypoint(env.program_info(), env.console, context, 
+        {ZoomChange::KEEP_ZOOM, +1, +1, 400ms},
+        FlyPoint::POKECENTER, 
+        {0.229687, 0.37037}
+    );
+    handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            overworld_navigation(env.program_info(), env.console, context, 
+                NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                0, +1, 60, 10, false);
+        }, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            pbf_move_left_joystick(context, {-1, -1}, 320ms, 400ms);
+            realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+        }
+    );
+
+    // marker 3       x=0.396354, y=0.69537.  x=0.396875, y=0.725926
+    place_marker_offset_from_flypoint(env.program_info(), env.console, context, 
+        {ZoomChange::KEEP_ZOOM, +1, -0.567, 400ms},
+        FlyPoint::POKECENTER, 
+        {0.396875, 0.725926}
+    );
+    handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            overworld_navigation(env.program_info(), env.console, context, 
+                NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                0, +1, 50, 10, false);
+        }, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            pbf_move_left_joystick(context, {+1, -1}, 320ms, 400ms);
+            realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+        }
+    );
+
+    // marker 4       (0.409896, 0.65)
+    place_marker_offset_from_flypoint(env.program_info(), env.console, context, 
+        {ZoomChange::KEEP_ZOOM, -1, +1, 0ms}, 
+        FlyPoint::POKECENTER, 
+        {0.409896, 0.65}
+    );
+    handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            overworld_navigation(env.program_info(), env.console, context, 
+                NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                0, +1, 20, 10, false);
+        }, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            pbf_move_left_joystick(context, {+1, -1}, 320ms, 400ms);
+            realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+        }
+    );
+
+    
+    // marker 5        {0.509896, 0.639815}
+    place_marker_offset_from_flypoint(env.program_info(), env.console, context, 
+        {ZoomChange::KEEP_ZOOM, -1, +1, 0ms}, 
+        FlyPoint::POKECENTER, 
+        {0.509896, 0.639815}
+    );
+    handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            overworld_navigation(env.program_info(), env.console, context, 
+                NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                0, +1, 30, 10, false);
+        }, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            pbf_move_left_joystick(context, {+1, -1}, 320ms, 400ms);
+            realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+        }
+    );
+
+    // marker 6         {0.508333, 0.566667}   {0.521875, 0.483333}
+    place_marker_offset_from_flypoint(env.program_info(), env.console, context, 
+        {ZoomChange::ZOOM_IN, 0, -1, 160ms},
+        FlyPoint::POKECENTER, 
+        {0.508333, 0.566667}
+    );
+    handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            overworld_navigation(env.program_info(), env.console, context, 
+                NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                0, +1, 30, 10, false);
+        }, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            pbf_move_left_joystick(context, {+1, -1}, 320ms, 400ms);
+            realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+        }
+    );
+
+    // marker 7         {0.508333, 0.566667}   {0.521875, 0.483333}  {0.529687, 0.483333}
+    place_marker_offset_from_flypoint(env.program_info(), env.console, context, 
+        {ZoomChange::ZOOM_IN, -1, +1, 0ms}, 
+        FlyPoint::POKECENTER, 
+        {0.529687, 0.483333}
+    );
+
+    get_on_ride(env.program_info(), env.console, context);
+
+    handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            overworld_navigation(env.program_info(), env.console, context, 
+                NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                0, +1, 30, 10, false);
+        }, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            pbf_move_left_joystick(context, {0, +1}, 500ms, 0ms);
+            pbf_controller_state(context, BUTTON_B, DPAD_NONE, {0, +1}, {0, 0}, 1000ms);
+            pbf_move_left_joystick(context, {0, +1}, 500ms, 0ms);
+            realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+        }
+    );
+
+
+    fly_to_overlapping_flypoint(env.program_info(), env.console, context); 
+
+
+}
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_28.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_28.h
new file mode 100644
index 0000000000..b25fa0e156
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_28.h
@@ -0,0 +1,74 @@
+/*  Autostory
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_AutoStory_Segment_28_H
+#define PokemonAutomation_PokemonSV_AutoStory_Segment_28_H
+
+#include "PokemonSV_AutoStoryTools.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+class AutoStory_Segment_28 : public AutoStory_Segment{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_segment(
+        SingleSwitchProgramEnvironment& env, 
+        ProControllerContext& context,
+        AutoStoryOptions options,
+        AutoStoryStats& stats
+    ) const override;
+};
+
+class AutoStory_Checkpoint_68 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+class AutoStory_Checkpoint_69 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+class AutoStory_Checkpoint_70 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+
+
+// start: At North Province Area Three Pokecenter
+// end: At North Province Area Three Pokecenter
+void checkpoint_68(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, EventNotificationOption& notif_error_recoverable, AutoStoryStats& stats, const std::string& checkpoint_text);
+
+// start: At North Province Area Three Pokecenter
+// end: Beat Team Star (Fairy)
+void checkpoint_69(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, EventNotificationOption& notif_error_recoverable, AutoStoryStats& stats, const std::string& checkpoint_text);
+
+// start: Beat Team Star (Fairy)
+// end: At Montenevera Pokecenter
+void checkpoint_70(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, EventNotificationOption& notif_error_recoverable, AutoStoryStats& stats, const std::string& checkpoint_text);
+
+
+// moves player from Glaseado Mountain Pokecenter to Montenevera Pokecenter
+void move_from_glaseado_mountain_to_montenevera(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_29.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_29.cpp
new file mode 100644
index 0000000000..2b5e80da31
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_29.cpp
@@ -0,0 +1,468 @@
+/*  AutoStory
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Exceptions/OperationFailedException.h"
+
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h"
+#include "PokemonSV_AutoStoryTools.h"
+#include "PokemonSV_AutoStory_Segment_29.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+//#include <unordered_map>
+//#include <algorithm>
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+
+std::string AutoStory_Segment_29::name() const{
+    return "29: Montenevera Gym (Ghost)";
+}
+
+std::string AutoStory_Segment_29::start_text() const{
+    return "Start: Beat Team Star (Fairy). At Montenevera Pokecenter.";
+}
+
+std::string AutoStory_Segment_29::end_text() const{
+    return "End: Beat Montenevera Gym (Ghost). At Glaseado gym Pokecenter.";
+}
+
+void AutoStory_Segment_29::run_segment(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    AutoStoryOptions options,
+    AutoStoryStats& stats
+) const{
+    
+
+    stats.m_segment++;
+    env.update_stats();
+    context.wait_for_all_requests();
+    env.console.log("Start Segment " + name(), COLOR_ORANGE);
+
+    AutoStory_Checkpoint_71().run_checkpoint(env, context, options, stats);
+    AutoStory_Checkpoint_72().run_checkpoint(env, context, options, stats);
+    AutoStory_Checkpoint_73().run_checkpoint(env, context, options, stats);
+    AutoStory_Checkpoint_74().run_checkpoint(env, context, options, stats);
+
+    context.wait_for_all_requests();
+    env.console.log("End Segment " + name(), COLOR_GREEN);
+
+}
+
+
+std::string AutoStory_Checkpoint_71::name() const{ return "071 - " + AutoStory_Segment_29().name(); }
+std::string AutoStory_Checkpoint_71::start_text() const{ return "At Montenevera Pokecenter";}
+std::string AutoStory_Checkpoint_71::end_text() const{ return "Spoke to Montenevera gym receptionist. Inside Montenevera gym building.";}
+void AutoStory_Checkpoint_71::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_71(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+
+std::string AutoStory_Checkpoint_72::name() const{ return "072 - " + AutoStory_Segment_29().name(); }
+std::string AutoStory_Checkpoint_72::start_text() const{ return AutoStory_Checkpoint_71().end_text();}
+std::string AutoStory_Checkpoint_72::end_text() const{ return "Passed gym test with MC Sledge. Standing in front of MC Sledge, outside the Montenevera gym building.";}
+void AutoStory_Checkpoint_72::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_72(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+
+std::string AutoStory_Checkpoint_73::name() const{ return "073 - " + AutoStory_Segment_29().name(); }
+std::string AutoStory_Checkpoint_73::start_text() const{ return AutoStory_Checkpoint_72().end_text();}
+std::string AutoStory_Checkpoint_73::end_text() const{ return "Beat Montenevera Gym. Inside Montenevera gym building.";}
+void AutoStory_Checkpoint_73::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_73(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+
+std::string AutoStory_Checkpoint_74::name() const{ return "074 - " + AutoStory_Segment_29().name(); }
+std::string AutoStory_Checkpoint_74::start_text() const{ return AutoStory_Checkpoint_73().end_text();}
+std::string AutoStory_Checkpoint_74::end_text() const{ return "At Glaseado gym Pokecenter.";}
+void AutoStory_Checkpoint_74::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_74(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+
+
+void checkpoint_71(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, EventNotificationOption& notif_error_recoverable, AutoStoryStats& stats, const std::string& checkpoint_text){
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){
+        DirectionDetector direction;
+
+        env.console.log("Fly to neighbouring Pokecenter, then fly back, to clear any pokemon covering the minimap.");
+        // fly_to_overworld_from_map() may fail since the snowy background on the map will false positive the destinationMenuItemWatcher (MapDestinationMenuDetector at box {0.523000, 0.680000, 0.080000, 0.010000}), which causes the fly to fail
+        // we can get around this by either placing down a marker, or by zooming out so that that section isn't white snow.
+        place_marker_offset_from_flypoint(env.program_info(), env.console, context,
+            {ZoomChange::KEEP_ZOOM, 0, -1, 280ms},
+            FlyPoint::POKECENTER, 
+            {0.54375, 0.662037}
+        );
+
+        move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::KEEP_ZOOM, -1, 0, 600ms});
+        move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::KEEP_ZOOM, +1, 0, 600ms});
+
+
+        direction.change_direction(env.program_info(), env.console, context, 1.536225);
+        pbf_move_left_joystick(context, {0, +1}, 4000ms, 400ms);
+
+        direction.change_direction(env.program_info(), env.console, context, 3.786414);
+        pbf_move_left_joystick(context, {0, +1}, 8800ms, 400ms);
+
+        direction.change_direction(env.program_info(), env.console, context, 4.747153);
+        pbf_move_left_joystick(context, {0, +1}, 1600ms, 400ms);
+
+
+        direction.change_direction(env.program_info(), env.console, context, 4.222303);
+        pbf_move_left_joystick(context, {0, +1}, 4800ms, 400ms);
+
+        direction.change_direction(env.program_info(), env.console, context, 4.572071);
+
+        handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){           
+                walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_ONLY, 30000ms);
+            }, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_move_left_joystick(context, {+1, +1}, 800ms, 400ms); // if to the left of the door, will move right and enter
+                pbf_move_left_joystick(context, {-1, 0}, 2400ms, 400ms); // if to the right of the door, will move left
+                pbf_move_left_joystick(context, {+1, +1}, 800ms, 400ms); // then move right and enter
+            }
+        );
+        
+        // speak to Jacq, inside the gym
+        mash_button_till_overworld(env.console, context, BUTTON_A);
+
+        // speak to gym receptionist
+        walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_SPAM_A, 20000ms);
+        clear_dialog(env.console, context, ClearDialogMode::STOP_OVERWORLD, 60, {CallbackEnum::OVERWORLD});
+
+
+
+    });  
+}
+
+void checkpoint_72(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, EventNotificationOption& notif_error_recoverable, AutoStoryStats& stats, const std::string& checkpoint_text){
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){
+
+        pbf_move_left_joystick(context, {0, -1}, 2400ms, 800ms);
+        pbf_wait(context, 3000ms);
+        // wait for overworld after leaving gym
+        wait_for_overworld(env.program_info(), env.console, context, 30);
+
+        DirectionDetector direction;
+        // Minimap should be clear of Pokemon, since we haven't opened the map, since we cleared the Pokemon in checkpoint 71
+        direction.change_direction(env.program_info(), env.console, context, 2.462858);  // 2.496149  // 2.479418
+        walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_SPAM_A, 20000ms);
+
+        // speak to MC Sledge
+        clear_dialog(env.console, context, ClearDialogMode::STOP_BATTLE, 60, {CallbackEnum::PROMPT_DIALOG, CallbackEnum::BATTLE, CallbackEnum:: DIALOG_ARROW});
+
+        env.console.log("Battle trainer 1 in the Gym challenge.");
+        run_trainer_double_battle_press_A(env.console, context, BattleStopCondition::STOP_DIALOG);
+        clear_dialog(env.console, context, ClearDialogMode::STOP_BATTLE, 60, {CallbackEnum::PROMPT_DIALOG, CallbackEnum::BATTLE, CallbackEnum:: DIALOG_ARROW});
+        
+        env.console.log("Battle trainer 2 in the Gym challenge.");
+        run_trainer_double_battle_press_A(env.console, context, BattleStopCondition::STOP_DIALOG);
+        clear_dialog(env.console, context, ClearDialogMode::STOP_BATTLE, 60, {CallbackEnum::PROMPT_DIALOG, CallbackEnum::BATTLE, CallbackEnum:: DIALOG_ARROW});
+
+        env.console.log("Battle MC Sledge in the Gym challenge.");
+        run_trainer_double_battle_press_A(env.console, context, BattleStopCondition::STOP_DIALOG);
+        clear_dialog(env.console, context, ClearDialogMode::STOP_OVERWORLD, 60, {CallbackEnum::PROMPT_DIALOG, CallbackEnum::OVERWORLD});
+
+    });  
+}
+
+void checkpoint_73(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, EventNotificationOption& notif_error_recoverable, AutoStoryStats& stats, const std::string& checkpoint_text){
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){
+
+        DirectionDetector direction;
+        // Minimap should be clear of Pokemon, since we haven't opened the map, since we cleared the Pokemon in checkpoint 71
+        direction.change_direction(env.program_info(), env.console, context, 5.478851);
+
+        handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){           
+                walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_SPAM_A, 30000ms);
+            }, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){           
+                pbf_move_left_joystick(context, {+1, 0}, 1600ms, 400ms); // if to the left of the door, will move right
+                pbf_move_left_joystick(context, {0, +1}, 1600ms, 400ms);
+            }
+        );
+
+        mash_button_till_overworld(env.console, context, BUTTON_A, 420); // fight the Ghost Gym
+
+    });  
+}
+
+void checkpoint_74(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, EventNotificationOption& notif_error_recoverable, AutoStoryStats& stats, const std::string& checkpoint_text){
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){
+        pbf_move_left_joystick(context, {0, -1}, 2400ms, 800ms);
+        pbf_wait(context, 3000ms);
+        // wait for overworld after leaving gym
+        wait_for_overworld(env.program_info(), env.console, context, 30);
+
+        // fly_to_overworld_from_map() may fail since the snowy background on the map will false positive the destinationMenuItemWatcher (MapDestinationMenuDetector at box {0.523000, 0.680000, 0.080000, 0.010000}), which causes the fly to fail
+        // we can get around this by either placing down a marker, or by zooming out so that that section isn't white snow. 
+        // We place a marker in this case
+        env.console.log("fly somewhere else (Glaseado Mountain), then back to Montenevera Pokecenter");
+        env.console.log("Fly to neighbouring Pokecenter, then fly back, to clear any pokemon covering the minimap.");
+
+        // remove old marker, then place new one
+        realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_NEW_MARKER, -1, 0, 400ms);
+        place_marker_offset_from_flypoint(env.program_info(), env.console, context, 
+                {ZoomChange::KEEP_ZOOM, 0, -1, 280ms},
+                FlyPoint::POKECENTER, 
+                {0.54375, 0.662037}
+            );
+
+        move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::KEEP_ZOOM, -1, 0, 600ms});
+        move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::KEEP_ZOOM, +1, 0, 600ms});
+        
+
+        move_from_montenevera_to_glaseado_gym(env, context);
+
+
+    });  
+}
+
+
+
+void move_from_montenevera_to_glaseado_gym(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    DirectionDetector direction;
+    // minimap was cleared at the beginning of this checkpoint
+    direction.change_direction(env.program_info(), env.console, context, 1.255489);
+    pbf_move_left_joystick(context, {0, +1}, 3200ms, 400ms);
+
+    direction.change_direction(env.program_info(), env.console, context, 2.463760);
+    pbf_move_left_joystick(context, {0, +1}, 8800ms, 400ms);
+
+     
+    // marker 1 {0.585938, 0.236111}
+    place_marker_offset_from_flypoint(env.program_info(), env.console, context, 
+        {ZoomChange::KEEP_ZOOM, 0, -1, 160ms},
+        FlyPoint::POKECENTER, 
+        {0.585938, 0.236111}
+    );
+    handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            overworld_navigation(env.program_info(), env.console, context, 
+                NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                0, +1, 30, 10, false);
+        }, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            pbf_move_left_joystick(context, {+1, -1}, 320ms, 400ms);
+            realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+        }
+    );
+
+
+    // marker 2 cross bridge   {0.719271, 0.585185}
+    place_marker_offset_from_flypoint(env.program_info(), env.console, context, 
+        {ZoomChange::KEEP_ZOOM, 0, -1, 240ms},
+        FlyPoint::POKECENTER, 
+        {0.719271, 0.585185}
+    );
+
+    get_on_ride(env.program_info(), env.console, context);
+
+    handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            overworld_navigation(env.program_info(), env.console, context, 
+                NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                0, +1, 40, 20, false);
+        }, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            pbf_move_left_joystick(context, {0, +1}, 500ms, 0ms);
+            pbf_controller_state(context, BUTTON_B, DPAD_NONE, {0, +1}, {0, 0}, 1000ms);
+            pbf_move_left_joystick(context, {0, +1}, 500ms, 0ms);
+            realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+        }
+    );
+
+    get_off_ride(env.program_info(), env.console, context);
+
+    // marker 3           {0.73125, 0.481481}    {0.7375, 0.488889}
+    place_marker_offset_from_flypoint(env.program_info(), env.console, context, 
+        {ZoomChange::KEEP_ZOOM, 0, -1, 240ms},
+        FlyPoint::POKECENTER, 
+        {0.7375, 0.488889}
+    );
+    handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            overworld_navigation(env.program_info(), env.console, context, 
+                NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                0, +1, 30, 10, false);
+        }, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){ // todo: get on ride?
+            pbf_move_left_joystick(context, {+1, -1}, 320ms, 400ms);
+            realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+        }
+    );
+
+
+    // marker 4     {0.691146, 0.347222}
+    place_marker_offset_from_flypoint(env.program_info(), env.console, context, 
+        {ZoomChange::KEEP_ZOOM, -1, +1, 0ms}, 
+        FlyPoint::POKECENTER, 
+        {0.691146, 0.347222}
+    );
+    handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            overworld_navigation(env.program_info(), env.console, context, 
+                NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                0, +1, 30, 10, false);
+        }, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            pbf_move_left_joystick(context, {+1, -1}, 320ms, 400ms);
+            realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+        }
+    );
+
+    // marker 5      {0.632292, 0.376852}
+    place_marker_offset_from_flypoint(env.program_info(), env.console, context, 
+        {ZoomChange::KEEP_ZOOM, -1, +1, 0ms}, 
+        FlyPoint::POKECENTER, 
+        {0.632292, 0.376852}
+    );
+    handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            overworld_navigation(env.program_info(), env.console, context, 
+                NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                0, +1, 30, 10, false);
+        }, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            pbf_move_left_joystick(context, {+1, -1}, 320ms, 400ms);
+            realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+        }
+    );
+
+
+    // marker 6     {0.61875, 0.432407}       {0.610417, 0.42037}
+    place_marker_offset_from_flypoint(env.program_info(), env.console, context, 
+        {ZoomChange::KEEP_ZOOM, -1, +1, 0ms}, 
+        FlyPoint::POKECENTER, 
+        {0.610417, 0.42037}
+    );
+    handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            overworld_navigation(env.program_info(), env.console, context, 
+                NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                0, +1, 30, 10, false);
+        }, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            pbf_move_left_joystick(context, {+1, -1}, 320ms, 400ms);
+            realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+        }
+    );
+
+    // marker 7          {0.613542, 0.540741}
+    place_marker_offset_from_flypoint(env.program_info(), env.console, context, 
+        {ZoomChange::KEEP_ZOOM, -1, +1, 0ms}, 
+        FlyPoint::POKECENTER, 
+        {0.613542, 0.540741}
+    );
+    handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            overworld_navigation(env.program_info(), env.console, context, 
+                NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                0, +1, 30, 10, false);
+        }, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            pbf_move_left_joystick(context, {+1, -1}, 320ms, 400ms);
+            realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+        }
+    );
+
+    // marker 8          {0.588021, 0.578704}
+    place_marker_offset_from_flypoint(env.program_info(), env.console, context, 
+        {ZoomChange::KEEP_ZOOM, -1, +1, 0ms}, 
+        FlyPoint::POKECENTER, 
+        {0.588021, 0.578704}
+    );
+    handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            overworld_navigation(env.program_info(), env.console, context, 
+                NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                0, +1, 30, 10, false);
+        }, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            pbf_move_left_joystick(context, {+1, -1}, 320ms, 400ms);
+            realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+        }
+    );
+
+    // marker 9         {0.579167, 0.610185}
+    place_marker_offset_from_flypoint(env.program_info(), env.console, context, 
+        {ZoomChange::ZOOM_IN, -1, +1, 0ms}, 
+        FlyPoint::POKECENTER, 
+        {0.579167, 0.610185}
+    );
+    handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            overworld_navigation(env.program_info(), env.console, context, 
+                NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                0, +1, 24, 8, false);
+        }, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            pbf_move_left_joystick(context, {+1, -1}, 320ms, 400ms);
+            realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+        }
+    );
+
+    // marker 10. end up next to Pokecenter        {0.520833, 0.443519}     {0.490625, 0.4}
+    place_marker_offset_from_flypoint(env.program_info(), env.console, context, 
+        {ZoomChange::ZOOM_IN, -1, +1, 0ms}, 
+        FlyPoint::POKECENTER, 
+        {0.490625, 0.4}
+    );
+    handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            overworld_navigation(env.program_info(), env.console, context, 
+                NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                0, +1, 30, 10, false);
+        }, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            pbf_move_left_joystick(context, {+1, -1}, 320ms, 400ms);
+            realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+        }
+    );
+
+
+    // marker 11. set marker past pokecenter
+    handle_unexpected_battles(env.program_info(), env.console, context,
+    [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+        realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_NEW_MARKER, +0.646, +1, 400ms);
+    });      
+    overworld_navigation(env.program_info(), env.console, context, 
+        NavigationStopCondition::STOP_TIME, NavigationMovementMode::DIRECTIONAL_ONLY, 
+        0, +0.883, 12, 12, false);           // can't wrap in handle_when_stationary_in_overworld(), since we expect to be stationary when walking into the pokecenter
+        
+
+    fly_to_overlapping_flypoint(env.program_info(), env.console, context); 
+
+
+
+}
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_29.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_29.h
new file mode 100644
index 0000000000..c2a4e920b4
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_29.h
@@ -0,0 +1,88 @@
+/*  Autostory
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_AutoStory_Segment_29_H
+#define PokemonAutomation_PokemonSV_AutoStory_Segment_29_H
+
+#include "PokemonSV_AutoStoryTools.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+class AutoStory_Segment_29 : public AutoStory_Segment{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_segment(
+        SingleSwitchProgramEnvironment& env, 
+        ProControllerContext& context,
+        AutoStoryOptions options,
+        AutoStoryStats& stats
+    ) const override;
+};
+
+class AutoStory_Checkpoint_71 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+class AutoStory_Checkpoint_72 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+class AutoStory_Checkpoint_73 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+class AutoStory_Checkpoint_74 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+
+
+// start: At Montenevera Pokecenter
+// end: Spoke to Montenevera gym receptionist. Inside Montenevera gym building.
+void checkpoint_71(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, EventNotificationOption& notif_error_recoverable, AutoStoryStats& stats, const std::string& checkpoint_text);
+
+// start: Spoke to Montenevera gym receptionist. Inside Montenevera gym building.
+// end: Passed gym test with MC Sledge. Standing in front of MC Sledge, outside the Montenevera gym building.
+void checkpoint_72(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, EventNotificationOption& notif_error_recoverable, AutoStoryStats& stats, const std::string& checkpoint_text);
+
+// start: Passed gym test with MC Sledge. Standing in front of MC Sledge, outside the Montenevera gym building.
+// end: Beat Montenevera Gym. Inside Montenevera gym building.
+void checkpoint_73(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, EventNotificationOption& notif_error_recoverable, AutoStoryStats& stats, const std::string& checkpoint_text);
+
+// start: Beat Montenevera Gym. Inside Montenevera gym building.
+// end: At Glaseado gym Pokecenter.
+void checkpoint_74(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, EventNotificationOption& notif_error_recoverable, AutoStoryStats& stats, const std::string& checkpoint_text);
+
+// moves player from Montenevera Pokecenter to Glaseado Gym Pokecenter
+void move_from_montenevera_to_glaseado_gym(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_30.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_30.cpp
new file mode 100644
index 0000000000..607656259a
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_30.cpp
@@ -0,0 +1,443 @@
+/*  AutoStory
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h"
+#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_NoMinimapDetector.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h"
+#include "PokemonSV_AutoStoryTools.h"
+#include "PokemonSV_AutoStory_Segment_30.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+//#include <unordered_map>
+//#include <algorithm>
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+
+std::string AutoStory_Segment_30::name() const{
+    return "30: Glaseado Gym (Ice)";
+}
+
+std::string AutoStory_Segment_30::start_text() const{
+    return "Start: Beat Montenevera Gym (Ghost). At Glaseado gym Pokecenter.";
+}
+
+std::string AutoStory_Segment_30::end_text() const{
+    return "End: Beat Glaseado Gym (Ice). At North Province Area One Pokecenter.";
+}
+
+void AutoStory_Segment_30::run_segment(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    AutoStoryOptions options,
+    AutoStoryStats& stats
+) const{
+    
+
+    stats.m_segment++;
+    env.update_stats();
+    context.wait_for_all_requests();
+    env.console.log("Start Segment " + name(), COLOR_ORANGE);
+
+    AutoStory_Checkpoint_75().run_checkpoint(env, context, options, stats);
+    AutoStory_Checkpoint_76().run_checkpoint(env, context, options, stats);
+    AutoStory_Checkpoint_77().run_checkpoint(env, context, options, stats);
+
+    context.wait_for_all_requests();
+    env.console.log("End Segment " + name(), COLOR_GREEN);
+
+}
+
+
+std::string AutoStory_Checkpoint_75::name() const{ return "075 - " + AutoStory_Segment_30().name(); }
+std::string AutoStory_Checkpoint_75::start_text() const{ return "At Glaseado gym Pokecenter.";}
+std::string AutoStory_Checkpoint_75::end_text() const{ return "Battled Nemona. Spoke to Glaseado Gym receptionist. Inside Glaseado Gym building.";}
+void AutoStory_Checkpoint_75::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_75(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+
+std::string AutoStory_Checkpoint_76::name() const{ return "076 - " + AutoStory_Segment_30().name(); }
+std::string AutoStory_Checkpoint_76::start_text() const{ return AutoStory_Checkpoint_75().end_text();}
+std::string AutoStory_Checkpoint_76::end_text() const{ return "Beat Glaseado Gym Challenge. Beat Glaseado Gym (Ice). Inside Glaseado Gym building.";}
+void AutoStory_Checkpoint_76::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_76(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+
+std::string AutoStory_Checkpoint_77::name() const{ return "077 - " + AutoStory_Segment_30().name(); }
+std::string AutoStory_Checkpoint_77::start_text() const{ return AutoStory_Checkpoint_76().end_text();}
+std::string AutoStory_Checkpoint_77::end_text() const{ return "At North Province Area One Pokecenter";}
+void AutoStory_Checkpoint_77::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_77(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+
+
+void checkpoint_75(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, EventNotificationOption& notif_error_recoverable, AutoStoryStats& stats, const std::string& checkpoint_text){
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){
+
+        DirectionDetector direction;
+        if (attempt_number > 0 || ENABLE_TEST){
+            env.console.log("Fly to neighbouring Pokecenter, then fly back, to clear any pokemon covering the minimap.");
+            // fly_to_overworld_from_map() may fail since the snowy background on the map will false positive the destinationMenuItemWatcher (MapDestinationMenuDetector at box {0.523000, 0.680000, 0.080000, 0.010000}), which causes the fly to fail
+            // we can get around this by either placing down a marker, or by zooming out so that that section isn't white snow.
+            // place down marker in this case
+
+            realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_NEW_MARKER, +0.646, -1, 320ms);
+            // place_marker_offset_from_flypoint(env.program_info(), env.console, context, 
+            //     {ZoomChange::ZOOM_IN, 255, 200, 300}, 
+            //     FlyPoint::POKECENTER, 
+            //     {0.404687, 0.261111}
+            // );
+            move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::ZOOM_OUT, 0, +1, 240ms});
+            move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::ZOOM_IN, +0.567, -1, 880ms});
+        }
+        
+        do_action_and_monitor_for_battles(env.program_info(), env.console, context,
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+
+            direction.change_direction(env.program_info(), env.console, context, 3.855289);
+            pbf_move_left_joystick(context, {0, +1}, 1600ms, 400ms);
+
+            direction.change_direction(env.program_info(), env.console, context, 3.056395);
+            pbf_move_left_joystick(context, {0, +1}, 2000ms, 400ms);
+
+            direction.change_direction(env.program_info(), env.console, context, 3.749788);
+            pbf_move_left_joystick(context, {0, +1}, 5440ms, 400ms);
+
+            direction.change_direction(env.program_info(), env.console, context, 1.589021);
+            pbf_move_left_joystick(context, {0, +1}, 4800ms, 400ms);
+            
+            direction.change_direction(env.program_info(), env.console, context, 1.343606);   //1.327724
+
+            handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+                [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){           
+                    walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_ONLY, 30000ms);
+                }, 
+                [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                    pbf_move_left_joystick(context, {-1, +1}, 1200ms, 400ms); // move left
+                    pbf_move_left_joystick(context, {+1, +1}, 1200ms, 400ms);  // move right
+                }
+            );
+        });
+
+        // speak to Nemona, inside the gym
+        clear_dialog(env.console, context, ClearDialogMode::STOP_BATTLE, 60, {CallbackEnum::PROMPT_DIALOG, CallbackEnum::BATTLE, CallbackEnum:: DIALOG_ARROW});
+
+        env.console.log("Battle Nemona.");
+        run_trainer_battle_press_A(env.console, context, BattleStopCondition::STOP_DIALOG);
+        mash_button_till_overworld(env.console, context, BUTTON_A);
+
+        // speak to gym receptionist
+        walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_SPAM_A, 20000ms);
+        clear_dialog(env.console, context, ClearDialogMode::STOP_OVERWORLD, 60, {CallbackEnum::OVERWORLD});
+
+
+
+    });   
+}
+
+void checkpoint_76(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, EventNotificationOption& notif_error_recoverable, AutoStoryStats& stats, const std::string& checkpoint_text){
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){
+
+        pbf_move_left_joystick(context, {0, -1}, 2400ms, 800ms);
+        pbf_wait(context, 3000ms);
+        // wait for overworld after leaving gym
+        wait_for_overworld(env.program_info(), env.console, context, 30);
+
+
+        env.console.log("Fly back to Glaseado Gym Pokecenter");
+        env.console.log("Fly to neighbouring Pokecenter, then fly back, to clear any pokemon covering the minimap. End up in Glaseado Gym Pokecenter.");
+        // fly_to_overworld_from_map() may fail since the snowy background on the map will false positive the destinationMenuItemWatcher (MapDestinationMenuDetector at box {0.523000, 0.680000, 0.080000, 0.010000}), which causes the fly to fail
+        // we can get around this by either placing down a marker, or by zooming out so that that section isn't white snow.
+        // place down a marker in this case.
+
+        // remove old marker, then place new one
+        realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_NEW_MARKER, -1, +1, 0ms);
+        realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_NEW_MARKER, +1, -0.409, 360ms);
+
+        move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::ZOOM_OUT, 0, +1, 240ms});
+        move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::ZOOM_IN, +0.567, -1, 880ms});
+        
+        DirectionDetector direction;
+        
+        do_action_and_monitor_for_battles(env.program_info(), env.console, context,
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+
+            direction.change_direction(env.program_info(), env.console, context, 0.943392);
+            pbf_move_left_joystick(context, {0, +1}, 1600ms, 400ms);
+
+            direction.change_direction(env.program_info(), env.console, context, 2.513925);
+
+            // talk to 
+            walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_SPAM_A, 30000ms);
+
+        });
+
+        mash_button_till_overworld(env.console, context, BUTTON_A);
+
+        // start the Snow Slope Run
+        NoMinimapWatcher no_minimap(env.console, COLOR_RED, Milliseconds(5000));
+        int ret = run_until<ProControllerContext>(
+            env.console, context,
+            [&](ProControllerContext& context){
+                pbf_move_left_joystick(context, {0, +1}, 2412ms, 0ms);
+                pbf_wait(context, 3612ms);
+                pbf_move_left_joystick(context, {0, +1}, 16ms, 0ms);
+                pbf_move_left_joystick(context, {-1, +1}, 2861ms, 0ms);
+                pbf_move_left_joystick(context, {0, +1}, 309ms, 0ms);
+                pbf_wait(context, 6431ms);
+                pbf_move_left_joystick(context, {-1, 0}, 5081ms, 0ms);
+                pbf_wait(context, 239ms);
+                pbf_move_left_joystick(context, {0, -1}, 961ms, 0ms);
+                pbf_wait(context, 1615ms);
+                pbf_move_left_joystick(context, {0, +1}, 753ms, 0ms);
+                pbf_wait(context, 79ms);
+                pbf_move_left_joystick(context, {0, +1}, 75ms, 0ms);
+                pbf_wait(context, 10485ms);
+                pbf_move_left_joystick(context, {0, +1}, 7930ms, 0ms);
+                pbf_wait(context, 12000ms);
+            },
+            {no_minimap}
+        );
+        if (ret < 0){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "checkpoint_76(): Failed to Snow Slope Run.",
+                env.console
+            );
+        }
+        env.log("No minimap seen. Likely finished the Snow Slope Run. But no guarantee we did it within time.");
+
+        clear_dialog(env.console, context, ClearDialogMode::STOP_OVERWORLD, 60, {CallbackEnum::OVERWORLD});
+
+        // pokemon are cleared from minimap after the Snow Slope run
+
+        // fly back to Glaseado Gym Pokecenter
+        // the problem with the snowy background is still there. but the marker placed previously is also still there
+        move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::ZOOM_IN, -1, +1, 0ms}, FlyPoint::POKECENTER);
+
+
+        // walk back to gym building
+        do_action_and_monitor_for_battles(env.program_info(), env.console, context,
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+
+            direction.change_direction(env.program_info(), env.console, context, 3.855289);
+            pbf_move_left_joystick(context, {0, +1}, 1600ms, 400ms);
+
+            direction.change_direction(env.program_info(), env.console, context, 3.056395);
+            pbf_move_left_joystick(context, {0, +1}, 2000ms, 400ms);
+
+            direction.change_direction(env.program_info(), env.console, context, 3.749788);
+            pbf_move_left_joystick(context, {0, +1}, 5440ms, 400ms);
+
+            direction.change_direction(env.program_info(), env.console, context, 1.589021);
+            pbf_move_left_joystick(context, {0, +1}, 4800ms, 400ms);
+            
+            direction.change_direction(env.program_info(), env.console, context, 1.343606);   //1.327724
+
+            handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+                [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){           
+                    walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_SPAM_A, 30000ms);
+                }, 
+                [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){           
+                    pbf_move_left_joystick(context, {-1, +1}, 1200ms, 400ms); // move left
+                    pbf_move_left_joystick(context, {+1, +1}, 1200ms, 400ms);  // move right
+                }
+            );
+        });
+
+        // speak to receptionist. if we fail to detect a battle, then we know we failed the Gym test. we then reset.
+        clear_dialog(env.console, context, ClearDialogMode::STOP_BATTLE, 60, {CallbackEnum::PROMPT_DIALOG, CallbackEnum::BATTLE, CallbackEnum:: DIALOG_ARROW});
+        env.console.log("Battle Ice Gym leader.");
+        run_trainer_battle_press_A(env.console, context, BattleStopCondition::STOP_DIALOG);
+        mash_button_till_overworld(env.console, context, BUTTON_A);
+
+    });   
+}
+
+void checkpoint_77(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, EventNotificationOption& notif_error_recoverable, AutoStoryStats& stats, const std::string& checkpoint_text){
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){
+
+        pbf_move_left_joystick(context, {0, -1}, 2400ms, 800ms);
+        pbf_wait(context, 3000ms);
+        // wait for overworld after leaving gym
+        wait_for_overworld(env.program_info(), env.console, context, 30);
+
+        env.console.log("Go to Glaseado Gym Pokecenter");
+        env.console.log("Fly to neighbouring Pokecenter, then fly back, to clear any pokemon covering the minimap.");
+        // fly_to_overworld_from_map() may fail since the snowy background on the map will false positive the destinationMenuItemWatcher (MapDestinationMenuDetector at box {0.523000, 0.680000, 0.080000, 0.010000}), which causes the fly to fail
+        // we can get around this by either placing down a marker, or by zooming out so that that section isn't white snow.
+        // place down a marker in this case.
+
+        // remove old marker, then place new one
+        realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_NEW_MARKER, -1, +1, 0ms);
+        realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_NEW_MARKER, +1, -0.409, 360ms);
+
+        move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::ZOOM_OUT, 0, +1, 240ms});
+        move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::ZOOM_IN, +0.567, -1, 880ms});
+
+        DirectionDetector direction;
+
+        do_action_and_monitor_for_battles(env.program_info(), env.console, context,
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+
+            direction.change_direction(env.program_info(), env.console, context, 3.855289);
+            pbf_move_left_joystick(context, {0, +1}, 1600ms, 400ms);
+
+            direction.change_direction(env.program_info(), env.console, context, 3.056395);
+            pbf_move_left_joystick(context, {0, +1}, 2000ms, 400ms);
+
+            direction.change_direction(env.program_info(), env.console, context, 3.749788);
+            pbf_move_left_joystick(context, {0, +1}, 5440ms, 400ms);
+
+            direction.change_direction(env.program_info(), env.console, context, 1.589021);
+            pbf_move_left_joystick(context, {0, +1}, 9600ms, 400ms);
+            
+            // direction.change_direction(env.program_info(), env.console, context, 1.343606);   //1.327724
+           
+        });
+
+        move_from_glaseado_gym_to_north_province_area_one(env, context);
+
+    });   
+}
+
+
+
+
+void move_from_glaseado_gym_to_north_province_area_one(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    context.wait_for_all_requests();
+
+    // marker 0      {0.460938, 0.310185}
+    place_marker_offset_from_flypoint(env.program_info(), env.console, context, 
+        {ZoomChange::ZOOM_IN, -1, +1, 0ms}, 
+        FlyPoint::POKECENTER, 
+        {0.460938, 0.310185}
+    );
+    handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            overworld_navigation(env.program_info(), env.console, context, 
+                NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                0, +1, 20, 10, false);
+        }, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            pbf_move_left_joystick(context, {+1, -1}, 320ms, 400ms);
+            realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+        }
+    );
+
+
+    // marker 1     {0.33125, 0.314815}      {0.297396, 0.322222}        {0.313021, 0.322222}
+    place_marker_offset_from_flypoint(env.program_info(), env.console, context, 
+        {ZoomChange::ZOOM_IN, -1, +1, 0ms}, 
+        FlyPoint::POKECENTER, 
+        {0.313021, 0.322222}
+    );
+    handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            overworld_navigation(env.program_info(), env.console, context, 
+                NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                0, +1, 20, 10, false);
+        }, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            pbf_move_left_joystick(context, {+1, -1}, 320ms, 400ms);
+            realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+        }
+    );
+
+    // marker 2         {0.222396, 0.413889}         {0.253646, 0.386111}
+    place_marker_offset_from_flypoint(env.program_info(), env.console, context, 
+        {ZoomChange::ZOOM_IN, -1, +1, 0ms}, 
+        FlyPoint::POKECENTER, 
+        {0.253646, 0.386111}
+    );
+    handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            overworld_navigation(env.program_info(), env.console, context, 
+                NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                0, +1, 20, 10, false);
+        }, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            pbf_move_left_joystick(context, {-1, -1}, 320ms, 400ms);
+            realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+        }
+    );
+        
+ 
+
+    // marker 3   {0.80625, 0.574074}        {0.803125, 0.615741}       {0.794792, 0.614815}        (0.794792, 0.609259).
+    place_marker_offset_from_flypoint(env.program_info(), env.console, context, 
+        {ZoomChange::KEEP_ZOOM, +1, +1, 400ms},
+        FlyPoint::POKECENTER, 
+        {0.794792, 0.609259}
+    );
+    handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            overworld_navigation(env.program_info(), env.console, context, 
+                NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                0, +1, 50, 10, false);
+        }, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            pbf_move_left_joystick(context, {+1, -1}, 320ms, 400ms);
+            realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+        }
+    );
+
+    // marker 4. set marker to pokecenter
+    realign_player_from_landmark(
+        env.program_info(), env.console, context, 
+        {ZoomChange::KEEP_ZOOM, +1, 0, 640ms},
+        {ZoomChange::KEEP_ZOOM, -1, +1, 0ms}
+    );  
+    handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            overworld_navigation(env.program_info(), env.console, context, 
+                NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                0, +1, 110, 10, false);
+        }, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            pbf_move_left_joystick(context, {-1, -1}, 320ms, 400ms);
+            realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+        }
+    ); 
+
+    // marker 5. set marker past pokecenter
+    handle_unexpected_battles(env.program_info(), env.console, context,
+    [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+        realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_NEW_MARKER, +1, -1, 400ms);
+    });      
+    overworld_navigation(env.program_info(), env.console, context, 
+        NavigationStopCondition::STOP_TIME, NavigationMovementMode::DIRECTIONAL_ONLY, 
+        0, +0.883, 12, 12, false);           // can't wrap in handle_when_stationary_in_overworld(), since we expect to be stationary when walking into the pokecenter
+        
+
+    fly_to_overlapping_flypoint(env.program_info(), env.console, context); 
+
+
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_30.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_30.h
new file mode 100644
index 0000000000..44698f3350
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_30.h
@@ -0,0 +1,79 @@
+/*  Autostory
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_AutoStory_Segment_30_H
+#define PokemonAutomation_PokemonSV_AutoStory_Segment_30_H
+
+#include "PokemonSV_AutoStoryTools.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+class AutoStory_Segment_30 : public AutoStory_Segment{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_segment(
+        SingleSwitchProgramEnvironment& env, 
+        ProControllerContext& context,
+        AutoStoryOptions options,
+        AutoStoryStats& stats
+    ) const override;
+};
+
+class AutoStory_Checkpoint_75 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+class AutoStory_Checkpoint_76 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+class AutoStory_Checkpoint_77 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+
+
+
+// start: At Glaseado Gym Pokecenter
+// end: Battled Nemona. Spoke to Glaseado Gym receptionist. Inside Glaseado Gym building.
+void checkpoint_75(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, EventNotificationOption& notif_error_recoverable, AutoStoryStats& stats, const std::string& checkpoint_text);
+
+// start: Spoke to Glaseado Gym receptionist. Inside Glaseado Gym building.
+// end: Beat Glaseado Gym Challenge. Beat Glaseado Gym (Ice). Inside Glaseado Gym building.
+void checkpoint_76(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, EventNotificationOption& notif_error_recoverable, AutoStoryStats& stats, const std::string& checkpoint_text);
+
+// start: Beat Glaseado Gym Challenge. Beat Glaseado Gym (Ice). Inside Glaseado Gym building.
+// end: At North Province Area One Pokecenter
+void checkpoint_77(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, EventNotificationOption& notif_error_recoverable, AutoStoryStats& stats, const std::string& checkpoint_text);
+
+
+
+// moves player from Glaseado Gym Pokecenter to North Province Area One
+void move_from_glaseado_gym_to_north_province_area_one(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_31.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_31.cpp
new file mode 100644
index 0000000000..6dc3706a44
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_31.cpp
@@ -0,0 +1,844 @@
+/*  AutoStory
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+
+#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h"
+#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_NoMinimapDetector.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h"
+#include "PokemonSV_AutoStoryTools.h"
+#include "PokemonSV_AutoStory_Segment_31.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+//#include <unordered_map>
+//#include <algorithm>
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+
+std::string AutoStory_Segment_31::name() const{
+    return "31: Team Star (Fighting)";
+}
+
+std::string AutoStory_Segment_31::start_text() const{
+    return "Start: Beat Glaseado Gym (Ice). At North Province Area One Pokecenter.";
+}
+
+std::string AutoStory_Segment_31::end_text() const{
+    return "End: Beat Team Star (Fighting). At North Province Area Two Pokecenter.";
+}
+
+void AutoStory_Segment_31::run_segment(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    AutoStoryOptions options,
+    AutoStoryStats& stats
+) const{
+    
+
+    stats.m_segment++;
+    env.update_stats();
+    context.wait_for_all_requests();
+    env.console.log("Start Segment " + name(), COLOR_ORANGE);
+
+    AutoStory_Checkpoint_78().run_checkpoint(env, context, options, stats);
+    AutoStory_Checkpoint_79().run_checkpoint(env, context, options, stats);
+    AutoStory_Checkpoint_80().run_checkpoint(env, context, options, stats);
+    AutoStory_Checkpoint_81().run_checkpoint(env, context, options, stats);
+    AutoStory_Checkpoint_82().run_checkpoint(env, context, options, stats);
+
+    context.wait_for_all_requests();
+    env.console.log("End Segment " + name(), COLOR_GREEN);
+
+}
+
+std::string AutoStory_Checkpoint_78::name() const{ return "078 - " + AutoStory_Segment_31().name(); }
+std::string AutoStory_Checkpoint_78::start_text() const{ return "At North Province Area One Pokecenter";}
+std::string AutoStory_Checkpoint_78::end_text() const{ return "At North Province Area Two Pokecenter";}
+void AutoStory_Checkpoint_78::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_78(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+
+std::string AutoStory_Checkpoint_79::name() const{ return "079 - " + AutoStory_Segment_31().name(); }
+std::string AutoStory_Checkpoint_79::start_text() const{ return AutoStory_Checkpoint_78().end_text();}
+std::string AutoStory_Checkpoint_79::end_text() const{ return "At North Province Area Two Pokecenter";}
+void AutoStory_Checkpoint_79::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_79(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+std::string AutoStory_Checkpoint_80::name() const{ return "080 - " + AutoStory_Segment_31().name(); }
+std::string AutoStory_Checkpoint_80::start_text() const{ return AutoStory_Checkpoint_79().end_text();}
+std::string AutoStory_Checkpoint_80::end_text() const{ return "Beat Team Star (Fighting)";}
+void AutoStory_Checkpoint_80::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_80(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+std::string AutoStory_Checkpoint_81::name() const{ return "081 - " + AutoStory_Segment_31().name(); }
+std::string AutoStory_Checkpoint_81::start_text() const{ return AutoStory_Checkpoint_80().end_text();}
+std::string AutoStory_Checkpoint_81::end_text() const{ return "At Alfornada Pokecenter.";}
+void AutoStory_Checkpoint_81::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_81(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+std::string AutoStory_Checkpoint_82::name() const{ return "082 - " + AutoStory_Segment_31().name(); }
+std::string AutoStory_Checkpoint_82::start_text() const{ return AutoStory_Checkpoint_81().end_text();}
+std::string AutoStory_Checkpoint_82::end_text() const{ return "At Alfornada Pokecenter.";}
+void AutoStory_Checkpoint_82::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_82(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+
+
+void checkpoint_78(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, EventNotificationOption& notif_error_recoverable, AutoStoryStats& stats, const std::string& checkpoint_text){
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){
+
+        heal_at_pokecenter(env.program_info(), env.console, context);
+        
+        move_from_north_province_area_one_to_north_province_area_two(env, context, attempt_number);
+
+    });   
+}
+
+
+void checkpoint_79(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, EventNotificationOption& notif_error_recoverable, AutoStoryStats& stats, const std::string& checkpoint_text){
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){
+        // empty checkpoint
+
+    }, false);
+}
+
+void checkpoint_80(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, EventNotificationOption& notif_error_recoverable, AutoStoryStats& stats, const std::string& checkpoint_text){
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){
+        beat_team_star_fighting1(env, context, attempt_number);
+        beat_team_star_fighting2(env, context);
+    });
+}
+
+void checkpoint_81(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, EventNotificationOption& notif_error_recoverable, AutoStoryStats& stats, const std::string& checkpoint_text){
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){
+        move_cursor_towards_flypoint_and_go_there(
+            env.program_info(),
+            env.console,
+            context,
+            {ZoomChange::ZOOM_OUT, -1, -0.331, 4400ms},
+            FlyPoint::POKECENTER
+        );
+        move_from_west_province_area_one_north_to_alfornada(env, context);
+    });
+}
+
+void checkpoint_82(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, EventNotificationOption& notif_error_recoverable, AutoStoryStats& stats, const std::string& checkpoint_text){
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){
+        // empty checkpoint
+
+    }, false);  
+}
+
+
+
+void move_from_north_province_area_one_to_north_province_area_two(SingleSwitchProgramEnvironment& env, ProControllerContext& context, size_t attempt_number){
+    DirectionDetector direction;
+    if (attempt_number > 0 || ENABLE_TEST){
+        env.console.log("Fly to neighbouring Pokecenter, then fly back, to clear any pokemon covering the minimap.");
+        move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::KEEP_ZOOM, -1, 0, 800ms});
+        move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::KEEP_ZOOM, +1, 0, 800ms});
+    }
+
+    do_action_and_monitor_for_battles(env.program_info(), env.console, context,
+    [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+
+        direction.change_direction(env.program_info(), env.console, context, 1.798578);
+        pbf_move_left_joystick(context, {0, +1}, 1600ms, 400ms);
+
+        
+    });
+
+    // marker 1     {0.825, 0.361111}
+    place_marker_offset_from_flypoint(env.program_info(), env.console, context, 
+        {ZoomChange::KEEP_ZOOM, +1, -1, 240ms},
+        FlyPoint::POKECENTER, 
+        {0.825, 0.361111}
+    );
+    handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            overworld_navigation(env.program_info(), env.console, context, 
+                NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                0, +1, 20, 10, false);
+        }, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            pbf_move_left_joystick(context, {+1, -1}, 320ms, 400ms);
+            realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+        }
+    );
+
+    // marker 2             {0.839062, 0.267593}  {0.834896, 0.267593}
+    place_marker_offset_from_flypoint(env.program_info(), env.console, context, 
+        {ZoomChange::KEEP_ZOOM, -1, +1, 0ms},
+        FlyPoint::POKECENTER, 
+        {0.834896, 0.267593}
+    );
+    handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            overworld_navigation(env.program_info(), env.console, context, 
+                NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                0, +1, 20, 10, false);
+        }, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            pbf_move_left_joystick(context, {-1, -1}, 320ms, 400ms);
+            realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+        }
+    );
+
+ 
+
+    // marker 3             {0.764583, 0.244444}            (0.775000, 0.250000).
+    place_marker_offset_from_flypoint(env.program_info(), env.console, context, 
+        {ZoomChange::KEEP_ZOOM, -1, +1, 0ms},
+        FlyPoint::POKECENTER, 
+        {0.775000, 0.250000}
+    );
+    handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            overworld_navigation(env.program_info(), env.console, context, 
+                NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                0, +1, 20, 10, false);
+        }, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            pbf_move_left_joystick(context, {+1, -1}, 320ms, 400ms);
+            realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+        }
+    );
+
+    // marker 4    {0.604167, 0.326852}    {0.597396, 0.32037}    {0.600521, 0.325}    {0.589583, 0.319444}
+    place_marker_offset_from_flypoint(env.program_info(), env.console, context, 
+        {ZoomChange::ZOOM_OUT, -1, +1, 0ms},
+        FlyPoint::POKECENTER, 
+        {0.597396, 0.32037}
+    );
+    handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            overworld_navigation(env.program_info(), env.console, context, 
+                NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                0, +1, 30, 10, false);
+        }, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            pbf_move_left_joystick(context, {+1, -1}, 320ms, 400ms);
+            realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+        }
+    );
+
+    // marker 5    enter bamboo forest      keep zoom{0.679688, 0.19537}   zoom out  {0.571875, 0.360185}   
+    place_marker_offset_from_flypoint(env.program_info(), env.console, context, 
+        {ZoomChange::ZOOM_OUT, -1, +1, 0ms},
+        FlyPoint::POKECENTER, 
+        {0.571875, 0.360185}
+    );
+    handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            overworld_navigation(env.program_info(), env.console, context, 
+                NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                0, +1, 20, 10, false);
+        }, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            pbf_move_left_joystick(context, {+1, -1}, 320ms, 400ms);
+            realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+        }
+    );
+
+    // marker 6     {0.668229, 0.336111}
+    place_marker_offset_from_flypoint(env.program_info(), env.console, context, 
+        {ZoomChange::KEEP_ZOOM, 0, +1, 160ms},
+        FlyPoint::POKECENTER, 
+        {0.668229, 0.336111}
+    );
+    handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            overworld_navigation(env.program_info(), env.console, context, 
+                NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                0, +1, 20, 10, false);
+        }, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            pbf_move_left_joystick(context, {-1, -1}, 320ms, 400ms);
+            realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+        }
+    );
+
+    // marker 7      {0.496354, 0.20463}
+    place_marker_offset_from_flypoint(env.program_info(), env.console, context, 
+        {ZoomChange::ZOOM_IN, +1, +0.219, 640ms},
+        FlyPoint::POKECENTER, 
+        {0.496354, 0.20463}
+    );
+    handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            overworld_navigation(env.program_info(), env.console, context, 
+                NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                0, +1, 40, 10, false);
+        }, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            pbf_move_left_joystick(context, {+1, -1}, 320ms, 400ms);
+            realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+        }
+    );
+
+    // marker 8      {0.428125, 0.483333}
+    place_marker_offset_from_flypoint(env.program_info(), env.console, context, 
+        {ZoomChange::ZOOM_IN, +1, +1, 400ms},
+        FlyPoint::POKECENTER, 
+        {0.428125, 0.483333}
+    );
+    handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            overworld_navigation(env.program_info(), env.console, context, 
+                NavigationStopCondition::STOP_DIALOG, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                0, +1, 30, 30, false);
+        }, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            pbf_move_left_joystick(context, {+1, -1}, 320ms, 400ms);
+            realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+        }
+    );
+
+    // speak to Clavell at Fighting base
+    mash_button_till_overworld(env.console, context, BUTTON_A, 360);
+
+
+    // place marker past pokecenter   {0.25625, 0.566667}
+    place_marker_offset_from_flypoint(env.program_info(), env.console, context, 
+        {ZoomChange::KEEP_ZOOM, -1, +0.375, 400ms},
+        FlyPoint::POKECENTER, 
+        {0.25625, 0.566667}
+    );
+
+    overworld_navigation(env.program_info(), env.console, context, 
+        NavigationStopCondition::STOP_TIME, NavigationMovementMode::DIRECTIONAL_ONLY, 
+        0, +1, 20, 20, false); 
+
+    fly_to_overlapping_flypoint(env.program_info(), env.console, context); 
+
+
+}
+
+
+void beat_team_star_fighting1(SingleSwitchProgramEnvironment& env, ProControllerContext& context, size_t attempt_number){
+
+    if (attempt_number > 0 || ENABLE_TEST){
+        env.console.log("Fly to neighbouring Pokecenter, then fly back, to clear any pokemon covering the minimap.");
+        move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::KEEP_ZOOM, -1, 0, 640ms});
+        move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::KEEP_ZOOM, +1, 0, 640ms});
+    }
+
+    // marker 1
+    realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_NEW_MARKER, +1, -0.488, 240ms);
+
+    handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            overworld_navigation(env.program_info(), env.console, context, 
+                NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                0, +1, 40, 20, false);
+        }, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            pbf_move_left_joystick(context, {+1, -1}, 320ms, 400ms);
+            realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+        }
+    );
+
+    // marker 2. navigate to gate    {0.244792, 0.37037}     {0.244792, 0.359259}        {0.265625, 0.371296}
+    place_marker_offset_from_flypoint(env.program_info(), env.console, context, 
+        {ZoomChange::ZOOM_OUT, +1, 0, 0ms},
+        FlyPoint::POKECENTER, 
+        {0.265625, 0.371296}
+    );
+
+    handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            overworld_navigation(env.program_info(), env.console, context, 
+                NavigationStopCondition::STOP_DIALOG, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                0, +1, 40, 20, false);
+        }, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            pbf_move_left_joystick(context, {+1, -1}, 320ms, 400ms);
+            realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+        }
+    );
+
+    clear_dialog(env.console, context, ClearDialogMode::STOP_BATTLE, 60, {CallbackEnum::PROMPT_DIALOG, CallbackEnum::BATTLE, CallbackEnum::DIALOG_ARROW});
+    env.console.log("Battle team star grunt.");
+    run_trainer_battle_press_A(env.console, context, BattleStopCondition::STOP_DIALOG);
+    mash_button_till_overworld(env.console, context, BUTTON_A);
+
+
+}
+
+void beat_team_star_fighting2(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    context.wait_for_all_requests();
+    do_action_and_monitor_for_battles(env.program_info(), env.console, context,
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_NEW_MARKER, +0.724, -1, 400ms);
+            walk_forward_while_clear_front_path(env.program_info(), env.console, context, 800ms);
+            walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_SPAM_A);
+        }
+    );
+    clear_dialog(env.console, context, ClearDialogMode::STOP_OVERWORLD, 60, {CallbackEnum::OVERWORLD, CallbackEnum::PROMPT_DIALOG});
+
+
+    NoMinimapWatcher no_minimap(env.console.logger(), COLOR_RED, Milliseconds(250));
+    int ret = run_until<ProControllerContext>(
+        env.console, context,
+        [&](ProControllerContext& context){
+
+            DirectionDetector direction;
+            Milliseconds wait = 3000ms;
+
+            direction.change_direction(env.program_info(), env.console, context, 3.837821);
+            pbf_move_left_joystick(context, {0, +1}, 3200ms, 400ms);
+            pbf_press_button(context, BUTTON_R, 160ms, 160ms);
+            pbf_wait(context, wait);
+
+            pbf_move_left_joystick(context, {0, +1}, 800ms, 400ms);
+            pbf_press_button(context, BUTTON_R, 160ms, 160ms);
+            pbf_wait(context, wait);
+
+            pbf_move_left_joystick(context, {0, +1}, 1600ms, 400ms);
+
+            direction.change_direction(env.program_info(), env.console, context, 3.683419);
+            pbf_move_left_joystick(context, {0, +1}, 2400ms, 400ms);
+            pbf_press_button(context, BUTTON_R, 160ms, 160ms);
+            pbf_wait(context, wait);
+
+            pbf_move_left_joystick(context, {0, +1}, 3200ms, 400ms);
+            pbf_press_button(context, BUTTON_R, 160ms, 160ms);
+            pbf_wait(context, wait);
+
+            direction.change_direction(env.program_info(), env.console, context, 3.577637);
+            pbf_move_left_joystick(context, {0, +1}, 4000ms, 400ms);
+            pbf_press_button(context, BUTTON_R, 160ms, 160ms);
+            pbf_wait(context, wait);
+
+
+            pbf_move_left_joystick(context, {0, +1}, 3200ms, 400ms);
+            pbf_press_button(context, BUTTON_R, 160ms, 160ms);
+            pbf_wait(context, wait);
+
+            direction.change_direction(env.program_info(), env.console, context, 4.204571);
+            pbf_move_left_joystick(context, {0, +1}, 1600ms, 400ms);
+            pbf_press_button(context, BUTTON_R, 160ms, 160ms);
+            pbf_wait(context, wait);
+            
+            pbf_move_left_joystick(context, {0, +1}, 1600ms, 400ms);
+
+
+            direction.change_direction(env.program_info(), env.console, context, 3.737641);
+            pbf_move_left_joystick(context, {0, +1}, 1600ms, 400ms);
+            pbf_press_button(context, BUTTON_R, 160ms, 160ms);
+            pbf_wait(context, wait);
+
+            direction.change_direction(env.program_info(), env.console, context, 3.368991);
+            pbf_move_left_joystick(context, {0, +1}, 1600ms, 400ms);
+            pbf_press_button(context, BUTTON_R, 160ms, 160ms);
+            pbf_wait(context, wait);
+
+            direction.change_direction(env.program_info(), env.console, context, 3.473130);
+            pbf_move_left_joystick(context, {0, +1}, 5600ms, 400ms);
+            pbf_press_button(context, BUTTON_R, 160ms, 160ms);
+            pbf_wait(context, wait);
+
+            direction.change_direction(env.program_info(), env.console, context, 3.213118);
+            pbf_move_left_joystick(context, {0, +1}, 3200ms, 400ms);
+            pbf_press_button(context, BUTTON_R, 160ms, 160ms);
+            pbf_wait(context, wait);
+
+            direction.change_direction(env.program_info(), env.console, context, 3.787068);
+            pbf_move_left_joystick(context, {0, +1}, 4000ms, 400ms);
+            pbf_press_button(context, BUTTON_R, 160ms, 160ms);
+            pbf_wait(context, wait);
+
+
+            direction.change_direction(env.program_info(), env.console, context,  3.997072);
+            pbf_move_left_joystick(context, {0, +1}, 4000ms, 400ms);
+            pbf_press_button(context, BUTTON_R, 160ms, 160ms);
+            pbf_wait(context, wait);
+
+            pbf_move_left_joystick(context, {0, +1}, 2400ms, 400ms);
+            pbf_press_button(context, BUTTON_R, 160ms, 160ms);
+            pbf_wait(context, wait);
+
+            pbf_move_left_joystick(context, {0, +1}, 1600ms, 400ms);
+            pbf_press_button(context, BUTTON_R, 160ms, 160ms);
+            pbf_wait(context, wait);
+
+            direction.change_direction(env.program_info(), env.console, context, 5.200063);
+            pbf_move_left_joystick(context, {0, +1}, 3200ms, 400ms);
+            pbf_press_button(context, BUTTON_R, 160ms, 160ms);
+            pbf_wait(context, wait);
+
+            direction.change_direction(env.program_info(), env.console, context, 5.883155);
+            pbf_move_left_joystick(context, {0, +1}, 2400ms, 400ms);
+            pbf_press_button(context, BUTTON_R, 160ms, 160ms);
+            pbf_wait(context, wait);
+
+            pbf_move_left_joystick(context, {0, +1}, 3200ms, 400ms);
+            pbf_press_button(context, BUTTON_R, 160ms, 160ms);
+            pbf_wait(context, wait);
+
+            direction.change_direction(env.program_info(), env.console, context, 6.089752);
+            pbf_move_left_joystick(context, {0, +1}, 1600ms, 400ms);
+            pbf_press_button(context, BUTTON_R, 160ms, 160ms);
+            pbf_wait(context, wait);
+
+            pbf_move_left_joystick(context, {0, +1}, 2400ms, 400ms);
+            pbf_press_button(context, BUTTON_R, 160ms, 160ms);
+            pbf_wait(context, wait);
+
+            direction.change_direction(env.program_info(), env.console, context, 0.369203);
+            pbf_move_left_joystick(context, {0, +1}, 1600ms, 400ms);
+            pbf_press_button(context, BUTTON_R, 160ms, 160ms);
+            pbf_wait(context, wait);
+
+            direction.change_direction(env.program_info(), env.console, context, 5.515246);
+            pbf_move_left_joystick(context, {0, +1}, 1600ms, 400ms);
+            pbf_press_button(context, BUTTON_R, 160ms, 160ms);
+            pbf_wait(context, wait);
+
+            pbf_move_left_joystick(context, {0, +1}, 3200ms, 400ms);
+            pbf_press_button(context, BUTTON_R, 160ms, 160ms);
+            pbf_wait(context, wait);
+
+            try{
+                direction.change_direction(env.program_info(), env.console, context, 4.941664);
+                pbf_move_left_joystick(context, {0, +1}, 800ms, 400ms);
+                pbf_press_button(context, BUTTON_R, 160ms, 160ms);
+                pbf_wait(context, wait);
+
+                direction.change_direction(env.program_info(), env.console, context, 6.140720);
+                pbf_move_left_joystick(context, {0, +1}, 800ms, 400ms);
+                pbf_press_button(context, BUTTON_R, 160ms, 160ms);
+                pbf_wait(context, wait);
+
+                direction.change_direction(env.program_info(), env.console, context, 5.096584);
+                pbf_move_left_joystick(context, {0, +1}, 2400ms, 400ms);
+
+
+                direction.change_direction(env.program_info(), env.console, context, 5.201017);
+                pbf_move_left_joystick(context, {0, +1}, 9600ms, 400ms);
+                pbf_press_button(context, BUTTON_R, 160ms, 160ms);
+                pbf_wait(context, wait);
+
+                direction.change_direction(env.program_info(), env.console, context, 0);
+                pbf_move_left_joystick(context, {0, +1}, 0ms, 400ms);
+                pbf_press_button(context, BUTTON_R, 160ms, 160ms);
+                pbf_wait(context, wait);
+            }catch (OperationFailedException&){
+                env.console.log("Failed to change direction, but it's possibly due to clearing the challenge.");
+                pbf_wait(context, 20000ms);
+            }
+
+            // ///////////////
+            // direction.change_direction(env.program_info(), env.console, context, 0);
+            // pbf_move_left_joystick(context, 128, 0, 00, 50);
+            // pbf_press_button(context, BUTTON_R, 160ms, 160ms);
+            // pbf_wait(context, wait);
+
+            
+
+            pbf_wait(context, 20000ms);
+
+                
+            
+        },
+        {no_minimap}
+    );
+    context.wait_for(std::chrono::milliseconds(100));
+    if (ret < 0){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "checkpoint_48(): Failed to kill 30 pokemon with Let's go.",
+            env.console
+        );            
+    }
+    clear_dialog(env.console, context, ClearDialogMode::STOP_BATTLE, 60, {CallbackEnum::BATTLE, CallbackEnum::DIALOG_ARROW});
+    env.console.log("Battle the Team Star (Fighting) boss.");
+    run_trainer_battle_press_A(env.console, context, BattleStopCondition::STOP_DIALOG);
+    mash_button_till_overworld(env.console, context, BUTTON_A, 360);
+
+
+}
+
+// NOTE: This function isn't used
+void move_from_fighting_base_to_north_province_area_two(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    context.wait_for_all_requests();
+
+    // marker 1. set marker to pokecenter
+    realign_player_from_landmark(
+        env.program_info(), env.console, context, 
+        {ZoomChange::ZOOM_IN, -1, +1, 0ms},
+        {ZoomChange::KEEP_ZOOM, -1, +1, 0ms}
+    );  
+    handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            overworld_navigation(env.program_info(), env.console, context, 
+                NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                0, +1, 20, 10, false);
+        }, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            pbf_move_left_joystick(context, {+1, -1}, 320ms, 400ms);
+            realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+        }
+    ); 
+
+    // marker 2. set marker past pokecenter
+    handle_unexpected_battles(env.program_info(), env.console, context,
+    [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+        realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_NEW_MARKER, -1, +0.531, 400ms);
+    });      
+    overworld_navigation(env.program_info(), env.console, context, 
+        NavigationStopCondition::STOP_TIME, NavigationMovementMode::DIRECTIONAL_ONLY, 
+        0, +0.883, 12, 12, false);           // can't wrap in handle_when_stationary_in_overworld(), since we expect to be stationary when walking into the pokecenter
+        
+
+    fly_to_overlapping_flypoint(env.program_info(), env.console, context); 
+
+}
+
+
+
+void move_from_west_province_area_one_north_to_alfornada(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    context.wait_for_all_requests();
+    DirectionDetector direction;
+    // recently flew here, so Minimap should be clear of Pokemon. and we should have no issues detecting direction.
+    // from Team Star Fighting to West Province Area One Pokecenter
+
+    do_action_and_monitor_for_battles(env.program_info(), env.console, context,
+    [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+        // marker 1
+        realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_NEW_MARKER, +0.094, -1, 240ms);
+        direction.change_direction(env.program_info(), env.console, context, 4.047990);
+        pbf_move_left_joystick(context, {0, +1}, 1600ms, 400ms);
+        realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+    });
+
+    handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            overworld_navigation(env.program_info(), env.console, context, 
+                NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                0, +1, 20, 10, false);
+        }, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            pbf_move_left_joystick(context, {-1, -1}, 320ms, 400ms);
+            realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+        }
+    ); 
+
+    // marker 2      zoom in{0.605729, 0.30463}, zoom out{0.684375, 0.616667}
+    place_marker_offset_from_flypoint(env.program_info(), env.console, context, 
+        {ZoomChange::ZOOM_OUT, -1, -0.173, 120ms},
+        FlyPoint::POKECENTER, 
+        {0.684375, 0.616667}
+    );
+    handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            overworld_navigation(env.program_info(), env.console, context, 
+                NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                0, +1, 24, 8, false);
+        }, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            pbf_move_left_joystick(context, {-1, -1}, 320ms, 400ms);
+            realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+        }
+    );
+
+    // marker 3  {0.767708, 0.45}
+    place_marker_offset_from_flypoint(env.program_info(), env.console, context, 
+        {ZoomChange::KEEP_ZOOM, +1, -1, 480ms},
+        FlyPoint::POKECENTER, 
+        {0.767708, 0.45}
+    );
+    handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            overworld_navigation(env.program_info(), env.console, context, 
+                NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                0, +1, 60, 10, false);
+        }, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            pbf_move_left_joystick(context, {-1, -1}, 320ms, 400ms);
+            realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+        }
+    );
+
+
+    // marker 4   {0.763021, 0.253704}
+    place_marker_offset_from_flypoint(env.program_info(), env.console, context, 
+        {ZoomChange::KEEP_ZOOM, -1, +1, 0ms},
+        FlyPoint::POKECENTER, 
+        {0.763021, 0.253704}
+    );
+    handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            overworld_navigation(env.program_info(), env.console, context, 
+                NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                0, +1, 30, 10, false);
+        }, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            pbf_move_left_joystick(context, {-1, -1}, 320ms, 400ms);
+            realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+        }
+    );
+
+    // marker 5  {0.780729, 0.216667}, {0.775, 0.216667}
+    place_marker_offset_from_flypoint(env.program_info(), env.console, context, 
+        {ZoomChange::KEEP_ZOOM, -1, +1, 0ms},
+        FlyPoint::POKECENTER, 
+        {0.775, 0.216667}
+    );
+    handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            overworld_navigation(env.program_info(), env.console, context, 
+                NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                0, +1, 20, 10, false);
+        }, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            pbf_move_left_joystick(context, {-1, -1}, 320ms, 400ms);
+            realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+        }
+    );
+
+    // marker 6. place the marker at the top of the cliff. {0.633333, 0.304630}
+    place_marker_offset_from_flypoint(env.program_info(), env.console, context, 
+        {ZoomChange::ZOOM_OUT, -1, +1, 0ms},
+        FlyPoint::POKECENTER, 
+        {0.633333, 0.304630}
+    );
+    
+    do_action_and_monitor_for_battles(env.program_info(), env.console, context,
+    [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+        // walk towards wall
+        direction.change_direction(env.program_info(), env.console, context, 2.85);
+
+        walk_forward_while_clear_front_path(env.program_info(), env.console, context, 5600ms);
+
+        // back away from wall and get on ride
+        pbf_move_left_joystick(context, {0, -1}, 400ms, 400ms);
+        get_on_ride(env.program_info(), env.console, context);
+
+        // move back towards wall
+        pbf_move_left_joystick(context, {0, +1}, 800ms, 400ms);
+        pbf_move_left_joystick(context, {-1, 0}, 800ms, 400ms);
+        pbf_move_left_joystick(context, {-1, +1}, 3200ms, 400ms);
+
+        direction.change_direction(env.program_info(), env.console, context, 2.575); //2.566167
+
+        // climb the wall
+        pbf_press_button(context, BUTTON_B, 528ms, 0ms); // jump
+        pbf_controller_state(context, BUTTON_B, DPAD_NONE, {0, +1}, {0, 0}, 51ms);  // climb
+        pbf_move_left_joystick(context, {0, +1}, 5002ms, 0ms); // up
+        pbf_wait(context, 1551ms);
+        pbf_move_left_joystick(context, {-1, 0}, 4400ms, 0ms); // left
+        pbf_wait(context, 1000ms);
+        pbf_move_left_joystick(context, {0, +1}, 4000ms, 0ms); // up
+        pbf_wait(context, 1000ms);
+        pbf_move_left_joystick(context, {1, 0}, 1300ms, 0ms); // right
+        pbf_wait(context, 1000ms);
+        
+    });
+
+    // continue climbing wall
+    pbf_move_left_joystick(context, {0, +1}, 5000ms, 0ms);
+
+    get_off_ride(env.program_info(), env.console, context);
+
+    // realign to marker 6
+    realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+
+    handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            overworld_navigation(env.program_info(), env.console, context, 
+                NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                0, +1, 20, 10, false);
+        }, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            pbf_move_left_joystick(context, {-1, -1}, 320ms, 400ms);
+            realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+        }
+    );
+
+
+    // marker 7 {0.501042, 0.738889}
+    place_marker_offset_from_flypoint(env.program_info(), env.console, context, 
+        {ZoomChange::KEEP_ZOOM, -1, -0.567, 240ms},
+        FlyPoint::POKECENTER, 
+        {0.501042, 0.738889}
+    );
+    handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            overworld_navigation(env.program_info(), env.console, context, 
+                NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                0, +1, 30, 10, false);
+        }, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            pbf_move_left_joystick(context, {-1, -1}, 320ms, 400ms);
+            realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+        }
+    );
+
+    // marker 8. set marker to pokecenter
+    realign_player_from_landmark(
+        env.program_info(), env.console, context, 
+        {ZoomChange::KEEP_ZOOM, 0, -1, 240ms},
+        {ZoomChange::KEEP_ZOOM, -1, +1, 0ms}
+    ); 
+
+    handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            overworld_navigation(env.program_info(), env.console, context, 
+                NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                0, +1, 40, 10, false);
+        }, 
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            pbf_move_left_joystick(context, {-1, -1}, 320ms, 400ms);
+            realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+        }
+    );
+
+    // marker 9. set marker past pokecenter
+    handle_unexpected_battles(env.program_info(), env.console, context,
+    [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+        realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_NEW_MARKER, -0.062, -1, 400ms);
+    });      
+    overworld_navigation(env.program_info(), env.console, context, 
+        NavigationStopCondition::STOP_TIME, NavigationMovementMode::DIRECTIONAL_ONLY, 
+        0, +0.883, 12, 12, false);           // can't wrap in handle_when_stationary_in_overworld(), since we expect to be stationary when walking into the pokecenter
+        
+
+    fly_to_overlapping_flypoint(env.program_info(), env.console, context); 
+
+
+    
+
+}
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_31.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_31.h
new file mode 100644
index 0000000000..e379bc689c
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_31.h
@@ -0,0 +1,113 @@
+/*  Autostory
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_AutoStory_Segment_31_H
+#define PokemonAutomation_PokemonSV_AutoStory_Segment_31_H
+
+#include "PokemonSV_AutoStoryTools.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+class AutoStory_Segment_31 : public AutoStory_Segment{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_segment(
+        SingleSwitchProgramEnvironment& env, 
+        ProControllerContext& context,
+        AutoStoryOptions options,
+        AutoStoryStats& stats
+    ) const override;
+};
+
+class AutoStory_Checkpoint_78 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+class AutoStory_Checkpoint_79 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+class AutoStory_Checkpoint_80 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+class AutoStory_Checkpoint_81 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+class AutoStory_Checkpoint_82 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+
+
+// start: At North Province Area One Pokecenter.
+// end: At North Province Area Two Pokecenter
+void checkpoint_78(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, EventNotificationOption& notif_error_recoverable, AutoStoryStats& stats, const std::string& checkpoint_text);
+
+// start: At North Province Area Two Pokecenter
+// end: At North Province Area Two Pokecenter
+void checkpoint_79(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, EventNotificationOption& notif_error_recoverable, AutoStoryStats& stats, const std::string& checkpoint_text);
+
+
+// start: At North Province Area Two Pokecenter
+// end: Beat Team Star (Fighting)
+void checkpoint_80(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, EventNotificationOption& notif_error_recoverable, AutoStoryStats& stats, const std::string& checkpoint_text);
+
+// start: Beat Team Star (Fighting)
+// end: At Alfornada Pokecenter.
+void checkpoint_81(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, EventNotificationOption& notif_error_recoverable, AutoStoryStats& stats, const std::string& checkpoint_text);
+
+
+// start: At Alfornada Pokecenter.
+// end: At Alfornada Pokecenter.
+void checkpoint_82(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, EventNotificationOption& notif_error_recoverable, AutoStoryStats& stats, const std::string& checkpoint_text);
+
+
+
+// moves player from North Province Area One to Team Star Fighting base
+void move_from_north_province_area_one_to_north_province_area_two(SingleSwitchProgramEnvironment& env, ProControllerContext& context, size_t attempt_number);
+
+
+void beat_team_star_fighting1(SingleSwitchProgramEnvironment& env, ProControllerContext& context, size_t attempt_number);
+
+void beat_team_star_fighting2(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+
+void move_from_fighting_base_to_north_province_area_two(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+
+
+void move_from_west_province_area_one_north_to_alfornada(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_32.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_32.cpp
new file mode 100644
index 0000000000..a8f27b5786
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_32.cpp
@@ -0,0 +1,254 @@
+/*  AutoStory
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Exceptions/OperationFailedException.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+
+#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h"
+#include "VideoGames/PokemonSV/Programs/Farming/PokemonSV_ESPTraining.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h"
+#include "PokemonSV_AutoStoryTools.h"
+#include "PokemonSV_AutoStory_Segment_32.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+//#include <unordered_map>
+//#include <algorithm>
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+
+std::string AutoStory_Segment_32::name() const{
+    return "32: Alfornada Gym (Psychic)";
+}
+
+std::string AutoStory_Segment_32::start_text() const{
+    return "Start: Beat Team Star (Fighting). At North Province Area Two Pokecenter.";
+}
+
+std::string AutoStory_Segment_32::end_text() const{
+    return "End: Beat Alfornada Gym (Psychic). At Alfornada Pokecenter.";
+}
+
+void AutoStory_Segment_32::run_segment(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    AutoStoryOptions options,
+    AutoStoryStats& stats
+) const{
+    
+
+    stats.m_segment++;
+    env.update_stats();
+    context.wait_for_all_requests();
+    env.console.log("Start Segment " + name(), COLOR_ORANGE);
+
+    AutoStory_Checkpoint_83().run_checkpoint(env, context, options, stats);
+    AutoStory_Checkpoint_84().run_checkpoint(env, context, options, stats);
+
+    context.wait_for_all_requests();
+    env.console.log("End Segment " + name(), COLOR_GREEN);
+
+}
+
+
+
+std::string AutoStory_Checkpoint_83::name() const{ return "083 - " + AutoStory_Segment_32().name(); }
+std::string AutoStory_Checkpoint_83::start_text() const{ return "At Alfornada Pokecenter.";}
+std::string AutoStory_Checkpoint_83::end_text() const{ return "At Alfornada Pokecenter.";}
+void AutoStory_Checkpoint_83::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_83(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+
+std::string AutoStory_Checkpoint_84::name() const{ return "084 - " + AutoStory_Segment_32().name(); }
+std::string AutoStory_Checkpoint_84::start_text() const{ return AutoStory_Checkpoint_83().end_text();}
+std::string AutoStory_Checkpoint_84::end_text() const{ return "Beat Alfornada gym challenge. Beat Alfornada gym. At Alfronada Pokecenter.";}
+void AutoStory_Checkpoint_84::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_84(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+
+
+void checkpoint_83(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, EventNotificationOption& notif_error_recoverable, AutoStoryStats& stats, const std::string& checkpoint_text){
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){
+        // empty checkpoint
+
+
+    }, false);  
+}
+
+void checkpoint_84(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, EventNotificationOption& notif_error_recoverable, AutoStoryStats& stats, const std::string& checkpoint_text){
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){
+        DirectionDetector direction;
+
+        if (attempt_number > 0 || ENABLE_TEST){
+            env.console.log("Fly to neighbouring Pokecenter, then fly back, to clear any pokemon covering the minimap.");
+            move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::KEEP_ZOOM, 0, +1, 1200ms});
+            move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::KEEP_ZOOM, 0, -1, 1200ms});
+        }
+        
+        realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_NEW_MARKER, +1, -0.094, 560ms);
+
+        direction.change_direction(env.program_info(), env.console, context, 3.104878);
+        pbf_move_left_joystick(context, {0, +1}, 4160ms, 400ms);
+
+        realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+        handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                overworld_navigation(env.program_info(), env.console, context, 
+                    NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                    0, +1, 50, 10, false);
+            }, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_move_left_joystick(context, {-1, -1}, 320ms, 400ms);
+                realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+            }
+        );
+
+        // {0.326042, 0.438889}
+        place_marker_offset_from_flypoint(env.program_info(), env.console, context, 
+            {ZoomChange::ZOOM_IN, -1, +1, 0ms}, 
+            FlyPoint::POKECENTER, 
+            {0.326042, 0.438889}
+        );
+        handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                overworld_navigation(env.program_info(), env.console, context, 
+                    NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                    0, +1, 30, 10, false);
+            }, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_move_left_joystick(context, {-1, -1}, 320ms, 400ms);
+                realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+            }
+        );
+
+
+        direction.change_direction(env.program_info(), env.console, context, 0.225386); //  0.225386
+
+        handle_when_stationary_in_overworld(env.program_info(), env.console, context,
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_ONLY, 30000ms);
+            }, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){           
+                pbf_move_left_joystick(context, {-1, +1}, 2400ms, 400ms); // move left
+                pbf_move_left_joystick(context, {+1, 0}, 480ms, 400ms); // move right. center on door
+                pbf_move_left_joystick(context, {0, +1}, 2400ms, 400ms);  // move forward
+            }
+        );
+
+        // speak to Nemona
+        clear_dialog(env.console, context, ClearDialogMode::STOP_OVERWORLD, 60, {CallbackEnum::OVERWORLD});
+
+        walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_SPAM_A, 30000ms);
+        
+        // speak to receptionist
+        clear_dialog(env.console, context, ClearDialogMode::STOP_OVERWORLD, 60, {CallbackEnum::OVERWORLD});
+
+
+        pbf_move_left_joystick(context, {0, -1}, 2400ms, 800ms);
+        pbf_wait(context, 3000ms);
+        // wait for overworld after leaving gym
+        wait_for_overworld(env.program_info(), env.console, context, 30);
+
+
+        direction.change_direction(env.program_info(), env.console, context, 4.413989);
+        pbf_move_left_joystick(context, {0, +1}, 1440ms, 400ms);
+
+        direction.change_direction(env.program_info(), env.console, context, 5.516255);
+
+        walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_SPAM_A, 30000ms);
+        clear_dialog(env.console, context, ClearDialogMode::STOP_PROMPT, 60, {CallbackEnum::PROMPT_DIALOG});
+
+        //mash past other dialog
+        pbf_mash_button(context, BUTTON_A, 2880ms);
+            
+        //wait for start
+        context.wait_for(std::chrono::milliseconds(30000));
+        context.wait_for_all_requests();
+
+
+        // Run the ESP training mini game
+        ESPTrainingStats esp_training_stats; // dummy stats
+        run_esp_training(env, context, esp_training_stats);
+
+        clear_dialog(env.console, context, ClearDialogMode::STOP_BATTLE, 60, {CallbackEnum::BATTLE, CallbackEnum::DIALOG_ARROW});
+
+        env.console.log("Battle Gym Trainer 1.");
+        run_trainer_battle_press_A(env.console, context, BattleStopCondition::STOP_DIALOG);
+
+
+        clear_dialog(env.console, context, ClearDialogMode::STOP_TIMEOUT, 5);
+        pbf_wait(context, 10000ms);
+
+        //mash past other dialog
+        pbf_mash_button(context, BUTTON_A, 2880ms);
+            
+        //wait for start
+        context.wait_for(std::chrono::milliseconds(8000));
+        context.wait_for_all_requests();
+
+
+        // Run the ESP training mini game
+        run_esp_training(env, context, esp_training_stats);
+
+        clear_dialog(env.console, context, ClearDialogMode::STOP_BATTLE, 60, {CallbackEnum::BATTLE, CallbackEnum::DIALOG_ARROW});
+
+        env.console.log("Battle Gym Trainer 2.");
+        run_trainer_battle_press_A(env.console, context, BattleStopCondition::STOP_DIALOG);
+        clear_dialog(env.console, context, ClearDialogMode::STOP_OVERWORLD, 60, {CallbackEnum::OVERWORLD});
+
+        // Gym challenge now done
+
+        direction.change_direction(env.program_info(), env.console, context, 2.336990);
+        pbf_move_left_joystick(context, {0, +1}, 3200ms, 400ms);
+
+        direction.change_direction(env.program_info(), env.console, context, 0.156705);
+
+        handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){           
+                walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_SPAM_A, 30000ms);
+            }, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){           
+                pbf_move_left_joystick(context, {-1, +1}, 2400ms, 400ms); // move left
+                pbf_move_left_joystick(context, {+1, 0}, 480ms, 400ms); // move right. center on door
+                pbf_move_left_joystick(context, {0, +1}, 2400ms, 400ms);  // move forward
+            }
+        );
+
+
+        // speak to receptionist. if we fail to detect a battle, then we know we failed the Gym test. we then reset.
+        clear_dialog(env.console, context, ClearDialogMode::STOP_BATTLE, 60, {CallbackEnum::PROMPT_DIALOG, CallbackEnum::BATTLE, CallbackEnum:: DIALOG_ARROW});
+        env.console.log("Battle Psychic Gym leader.");
+        run_trainer_battle_press_A(env.console, context, BattleStopCondition::STOP_DIALOG);
+        mash_button_till_overworld(env.console, context, BUTTON_A);
+
+
+        pbf_move_left_joystick(context, {0, -1}, 2400ms, 800ms);
+        pbf_wait(context, 3000ms);
+        // wait for overworld after leaving gym
+        wait_for_overworld(env.program_info(), env.console, context, 30);
+        move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::KEEP_ZOOM, -1, +1, 0ms}, FlyPoint::POKECENTER);
+
+    });  
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_32.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_32.h
new file mode 100644
index 0000000000..84e8a217a2
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_32.h
@@ -0,0 +1,65 @@
+/*  Autostory
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_AutoStory_Segment_32_H
+#define PokemonAutomation_PokemonSV_AutoStory_Segment_32_H
+
+#include "PokemonSV_AutoStoryTools.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+class AutoStory_Segment_32 : public AutoStory_Segment{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_segment(
+        SingleSwitchProgramEnvironment& env, 
+        ProControllerContext& context,
+        AutoStoryOptions options,
+        AutoStoryStats& stats
+    ) const override;
+};
+
+
+class AutoStory_Checkpoint_83 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+class AutoStory_Checkpoint_84 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+
+
+// start: At Alfornada Pokecenter.
+// end: At Alfornada Pokecenter.
+void checkpoint_83(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, EventNotificationOption& notif_error_recoverable, AutoStoryStats& stats, const std::string& checkpoint_text);
+
+// start: At Alfornada Pokecenter.
+// end: Beat Alfornada gym challenge. Beat Alfornada gym. At Alfronada Pokecenter.
+void checkpoint_84(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, EventNotificationOption& notif_error_recoverable, AutoStoryStats& stats, const std::string& checkpoint_text);
+
+
+
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_33.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_33.cpp
new file mode 100644
index 0000000000..40d91c2d80
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_33.cpp
@@ -0,0 +1,541 @@
+/*  AutoStory
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonFramework/Notifications/ProgramInfo.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonTools/Images/SolidColorTest.h"
+#include "CommonTools/VisualDetectors/BlackScreenDetector.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "Pokemon/Inference/Pokemon_NameReader.h"
+
+#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h"
+#include "VideoGames/PokemonSV/Programs/Battles/PokemonSV_SinglesBattler.h"
+#include "VideoGames/PokemonSV/Programs/Battles/PokemonSV_Battles.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h"
+#include "PokemonSV_AutoStoryTools.h"
+#include "PokemonSV_AutoStory_Segment_33.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+//#include <unordered_map>
+//#include <algorithm>
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+
+std::string AutoStory_Segment_33::name() const{
+    return "33: Clavell battle, Elite Four";
+}
+
+std::string AutoStory_Segment_33::start_text() const{
+    return "Start: Beat Alfornada Gym (Psychic). At Alfornada Pokecenter.";
+}
+
+std::string AutoStory_Segment_33::end_text() const{
+    return "End: Beat Clavell. Beat Elite Four. At Pokemon League Pokecenter.";
+}
+
+void AutoStory_Segment_33::run_segment(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    AutoStoryOptions options,
+    AutoStoryStats& stats
+) const{
+    
+
+    stats.m_segment++;
+    env.update_stats();
+    context.wait_for_all_requests();
+    env.console.log("Start Segment " + name(), COLOR_ORANGE);
+
+    AutoStory_Checkpoint_85().run_checkpoint(env, context, options, stats);
+    AutoStory_Checkpoint_86().run_checkpoint(env, context, options, stats);
+    AutoStory_Checkpoint_87().run_checkpoint(env, context, options, stats);
+    AutoStory_Checkpoint_88().run_checkpoint(env, context, options, stats);
+    AutoStory_Checkpoint_89().run_checkpoint(env, context, options, stats);
+
+    context.wait_for_all_requests();
+    env.console.log("End Segment " + name(), COLOR_GREEN);
+
+}
+
+
+std::string AutoStory_Checkpoint_85::name() const{ return "085 - " + AutoStory_Segment_33().name(); }
+std::string AutoStory_Checkpoint_85::start_text() const{ return "Beat Alfornada gym challenge. Beat Alfornada gym. At Alfronada Pokecenter.";}
+std::string AutoStory_Checkpoint_85::end_text() const{ return "Beat Clavell. At Academy fly point.";}
+void AutoStory_Checkpoint_85::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_85(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+
+std::string AutoStory_Checkpoint_86::name() const{ return "086 - " + AutoStory_Segment_33().name(); }
+std::string AutoStory_Checkpoint_86::start_text() const{ return AutoStory_Checkpoint_85().end_text();}
+std::string AutoStory_Checkpoint_86::end_text() const{ return "At Pokemon League entrance.";}
+void AutoStory_Checkpoint_86::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_86(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+
+std::string AutoStory_Checkpoint_87::name() const{ return "087 - " + AutoStory_Segment_33().name(); }
+std::string AutoStory_Checkpoint_87::start_text() const{ return AutoStory_Checkpoint_86().end_text();}
+std::string AutoStory_Checkpoint_87::end_text() const{ return "Finished the Entrance quiz. Standing in front of Rika.";}
+void AutoStory_Checkpoint_87::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_87(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text(), options.language, options.starter_choice);
+}
+
+
+std::string AutoStory_Checkpoint_88::name() const{ return "088 - " + AutoStory_Segment_33().name(); }
+std::string AutoStory_Checkpoint_88::start_text() const{ return AutoStory_Checkpoint_87().end_text();}
+std::string AutoStory_Checkpoint_88::end_text() const{ return "Beat the Elite Four. Door to Geeta up ahead.";}
+void AutoStory_Checkpoint_88::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_88(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+
+std::string AutoStory_Checkpoint_89::name() const{ return "089 - " + AutoStory_Segment_33().name(); }
+std::string AutoStory_Checkpoint_89::start_text() const{ return AutoStory_Checkpoint_88().end_text();}
+std::string AutoStory_Checkpoint_89::end_text() const{ return "Beat Geeta. At Pokemon League Pokecenter.";}
+void AutoStory_Checkpoint_89::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_89(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+
+
+
+void checkpoint_85(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, EventNotificationOption& notif_error_recoverable, AutoStoryStats& stats, const std::string& checkpoint_text){
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){
+        move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::KEEP_ZOOM, +1, +0.609, 2560ms}, FlyPoint::FAST_TRAVEL);
+
+        realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_NEW_MARKER, 0, +1, 640ms);
+        walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_ONLY, 30000ms);
+
+        clear_dialog(env.console, context, ClearDialogMode::STOP_BATTLE, 60, {CallbackEnum::PROMPT_DIALOG, CallbackEnum::BATTLE, CallbackEnum:: DIALOG_ARROW});
+
+        env.console.log("Battle Clavell.");
+        run_trainer_battle_press_A(env.console, context, BattleStopCondition::STOP_DIALOG);
+        mash_button_till_overworld(env.console, context, BUTTON_A);
+
+        move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::ZOOM_IN, -1, +1, 0ms}, FlyPoint::FAST_TRAVEL);
+    });  
+}
+
+
+void checkpoint_86(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, EventNotificationOption& notif_error_recoverable, AutoStoryStats& stats, const std::string& checkpoint_text){
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){
+
+        realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_NEW_MARKER, -1, 0, 400ms);
+        DirectionDetector direction;
+        // minimap should be clear of Pokemon within Mesagoza
+        direction.change_direction(env.program_info(), env.console, context, 1.222127);
+        pbf_move_left_joystick(context, {0, +1}, 8800ms, 400ms);
+
+        get_on_ride(env.program_info(), env.console, context);
+        direction.change_direction(env.program_info(), env.console, context, 1.761373);
+
+        pbf_move_left_joystick(context, {0, +1}, 1300ms, 0ms);
+        pbf_controller_state(context, BUTTON_B, DPAD_NONE, {0, +1}, {0, 0}, 703ms);
+        pbf_move_left_joystick(context, {0, +1}, 233ms, 0ms);
+        pbf_controller_state(context, BUTTON_B, DPAD_NONE, {0, +1}, {0, 0}, 5098ms);
+
+        BlackScreenWatcher black_screen(COLOR_RED);
+        int ret = run_until<ProControllerContext>(
+            env.console, context,
+            [](ProControllerContext& context){
+                pbf_move_left_joystick(context, {0, +1}, 10000ms, 0ms);
+            },
+            { black_screen }
+        );
+        if (ret < 0){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "Never detected black screen. Failed to glide from the Academy to the route leading to the Pokemon League.",
+                env.console
+            );
+        }
+
+        env.console.log("Detected black screen. Likely successful glide from the Academy to the route leading to the Pokemon League.");
+
+        wait_for_overworld(env.program_info(), env.console, context);
+
+        // marker 1    {0.429688, 0.299074}
+        place_marker_offset_from_flypoint(env.program_info(), env.console, context, 
+            {ZoomChange::KEEP_ZOOM, -1, +1, 0ms}, 
+            FlyPoint::POKECENTER, 
+            {0.429688, 0.299074}
+        );
+        handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                overworld_navigation(env.program_info(), env.console, context, 
+                    NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                    0, +1, 30, 10, false);
+            }, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_move_left_joystick(context, {-1, -1}, 320ms, 400ms);
+                realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+            }
+        );
+
+
+        // marker 2    {0.482812, 0.378704}
+        place_marker_offset_from_flypoint(env.program_info(), env.console, context, 
+            {ZoomChange::ZOOM_IN, -1, +1, 400ms},
+            FlyPoint::POKECENTER, 
+            {0.482812, 0.378704}
+        );
+        handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                overworld_navigation(env.program_info(), env.console, context, 
+                    NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                    0, +1, 40, 10, false);
+            }, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_move_left_joystick(context, {-1, -1}, 320ms, 400ms);
+                realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+            }
+        );
+
+
+        // marker 3    {0.638021, 0.676852}
+        place_marker_offset_from_flypoint(env.program_info(), env.console, context, 
+            {ZoomChange::KEEP_ZOOM, -1, +1, 400ms},
+            FlyPoint::POKECENTER, 
+            {0.638021, 0.676852}
+        );
+        handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                overworld_navigation(env.program_info(), env.console, context, 
+                    NavigationStopCondition::STOP_DIALOG, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                    0, +1, 60, 30, false);
+            }, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_move_left_joystick(context, {-1, -1}, 320ms, 400ms);
+                realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+            }
+        );
+
+        // clear_dialog(env.console, context, ClearDialogMode::STOP_OVERWORLD, 60, {CallbackEnum::OVERWORLD});
+        mash_button_till_overworld(env.console, context, BUTTON_A);
+
+    });   
+}
+
+void checkpoint_87(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, EventNotificationOption& notif_error_recoverable, AutoStoryStats& stats, const std::string& checkpoint_text, Language language, StarterChoice starter_choice){
+    GameTitle game_title = GameTitle::UNKNOWN;
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){
+        if (game_title == GameTitle::UNKNOWN){
+            game_title = get_game_title(env, context);
+            press_Bs_to_back_to_overworld(env.program_info(), env.console, context);
+        }
+
+        realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+
+        do_action_and_monitor_for_battles(env.program_info(), env.console, context,
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                walk_forward_while_clear_front_path(env.program_info(), env.console, context, 800ms);
+                walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_SPAM_A);
+            }
+        );
+        // talk to door man
+        // clear_dialog(env.console, context, ClearDialogMode::STOP_OVERWORLD, 60, {CallbackEnum::OVERWORLD, CallbackEnum::PROMPT_DIALOG});
+        mash_button_till_overworld(env.console, context, BUTTON_A);
+        
+        do_action_and_monitor_for_overworld(env.program_info(), env.console, context,
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            // move left to sit down
+            pbf_move_left_joystick(context, {-1, 0}, 800ms, 400ms);
+
+            // talk to Rika 1. Choose first option. Walked here.
+            clear_dialog(env.console, context, ClearDialogMode::STOP_PROMPT, 60, {CallbackEnum::PROMPT_DIALOG});
+            pbf_mash_button(context, BUTTON_A, 1000ms);
+            
+            // talk to Rika 2. Choose option based on your game title
+            clear_dialog(env.console, context, ClearDialogMode::STOP_PROMPT, 60, {CallbackEnum::PROMPT_DIALOG});
+
+            switch(game_title){
+            case GameTitle::SCARLET:
+                pbf_press_dpad(context, DPAD_DOWN, 104ms, 160ms);
+                break;
+            case GameTitle::VIOLET:
+                pbf_press_dpad(context, DPAD_DOWN, 104ms, 160ms);
+                pbf_press_dpad(context, DPAD_DOWN, 104ms, 160ms);
+                break;
+            default:
+                throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "We don't know what game we are playing. We should know at this point.");
+                break;
+            }
+            pbf_mash_button(context, BUTTON_A, 1000ms);
+            
+            // talk to Rika 3. Came to become a Champion
+            clear_dialog(env.console, context, ClearDialogMode::STOP_PROMPT, 60, {CallbackEnum::PROMPT_DIALOG});
+            pbf_press_dpad(context, DPAD_DOWN, 104ms, 160ms);
+            pbf_mash_button(context, BUTTON_A, 1000ms);
+
+            // talk to Rika 4. Become stronger
+            clear_dialog(env.console, context, ClearDialogMode::STOP_PROMPT, 60, {CallbackEnum::PROMPT_DIALOG});
+            pbf_mash_button(context, BUTTON_A, 1000ms);
+
+            // talk to Rika 5. Difficult gym: Alfornada
+            clear_dialog(env.console, context, ClearDialogMode::STOP_PROMPT, 60, {CallbackEnum::PROMPT_DIALOG});
+            pbf_press_dpad(context, DPAD_UP, 104ms, 160ms);
+            pbf_mash_button(context, BUTTON_A, 1000ms);
+
+            // talk to Rika 6. Difficult gym leader name: Tulip
+            clear_dialog(env.console, context, ClearDialogMode::STOP_PROMPT, 60, {CallbackEnum::PROMPT_DIALOG});
+            pbf_press_dpad(context, DPAD_UP, 104ms, 160ms);
+            pbf_mash_button(context, BUTTON_A, 1000ms);
+
+            // talk to Rika 7. Difficult gym leader type: Psychic
+            clear_dialog(env.console, context, ClearDialogMode::STOP_PROMPT, 60, {CallbackEnum::PROMPT_DIALOG});
+            pbf_press_dpad(context, DPAD_UP, 104ms, 160ms);
+            pbf_press_dpad(context, DPAD_UP, 104ms, 160ms);
+            pbf_mash_button(context, BUTTON_A, 1000ms);
+
+            // talk to Rika 8. Starter pokemon: Grass/Fire/Water
+            clear_dialog(env.console, context, ClearDialogMode::STOP_PROMPT, 60, {CallbackEnum::PROMPT_DIALOG});
+            switch(starter_choice){
+            case StarterChoice::SPRIGATITO:
+                break;
+            case StarterChoice::FUECOCO:
+                pbf_press_dpad(context, DPAD_DOWN, 104ms, 160ms);
+                break;
+            case StarterChoice::QUAXLY:
+                pbf_press_dpad(context, DPAD_DOWN, 104ms, 160ms);
+                pbf_press_dpad(context, DPAD_DOWN, 104ms, 160ms);
+                break;
+            default:
+                throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Invalid starter pokemon type. This shouldn't happen.");
+                break;
+            }
+            size_t num_extra_clicks = attempt_number % 3;  // we add extra clicks when attempt_number > 0, to account for the fact that the user might not be enterint the correct starter.
+            for (size_t i = 0; i < num_extra_clicks; i++){
+                pbf_press_dpad(context, DPAD_DOWN, 104ms, 160ms);
+            }
+
+            pbf_mash_button(context, BUTTON_A, 1000ms);
+
+            // talk to Rika 9. Become stronger
+            // talk to Rika 10. do you like pokemon
+            clear_dialog(env.console, context, ClearDialogMode::STOP_TIMEOUT, 20, {CallbackEnum::PROMPT_DIALOG});
+
+        });
+
+        pbf_move_left_joystick(context, {0, +1}, 800ms, 400ms); // stand up
+
+
+    }); 
+}
+
+
+void checkpoint_88(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, EventNotificationOption& notif_error_recoverable, AutoStoryStats& stats, const std::string& checkpoint_text){
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){
+        // standing in front of Rika
+        // now done talking to Rika. walk around Rika's desk.
+
+        pbf_move_left_joystick(context, {-1, 0}, 400ms, 400ms); // go left
+        pbf_move_left_joystick(context, {0, +1}, 1600ms, 400ms); // straight
+        pbf_move_left_joystick(context, {+1, 0}, 400ms, 400ms); // right
+        
+        walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_ONLY, 60000ms);
+        clear_dialog(env.console, context, ClearDialogMode::STOP_BATTLE, 60, {CallbackEnum::BATTLE, CallbackEnum::DIALOG_ARROW});
+
+
+        env.console.log("Battle Elite Four 1.");
+        SinglesMoveEntry move1{SinglesMoveType::Move1, false};  // Moonblast
+        SinglesMoveEntry move2{SinglesMoveType::Move2, false}; // Mystical Fire
+        SinglesMoveEntry move4{SinglesMoveType::Move4, false}; // Misty Terrain
+        std::vector<SinglesMoveEntry> move_table1 = {move1, move4, move1};
+        bool terastallized = false;
+        // use Moonblast to KO the Whiscash. Then setup Misty Terrain on the second pokemon, Camerupt.
+        // Then spam Moonblast to finish off the rest of the team.
+        // We setup Misty Terrain to prevent getting poisoned by the Donphan's Poison Jab, since it survives with Sturdy.
+        // Getting poisoned will cause us to fail the Elite Four since we have no easy way to heal off poison.
+        // We don't setup Misty Terrain on the Whiscash since Muddy Water can lower our accuracy.
+        bool is_won = run_pokemon(env.console, context, move_table1, true, terastallized);
+        if (!is_won){// throw exception if we lose
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "Failed to beat the Ground trainer. Reset.",
+                env.console
+            );
+        }
+
+        // finished battle
+        mash_button_till_overworld(env.console, context, BUTTON_A);
+
+        // heal
+        auto_heal_from_menu_or_overworld(env.program_info(), env.console, context, 0, true);
+
+        // engage next battle
+        walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_ONLY, 60000ms);
+        clear_dialog(env.console, context, ClearDialogMode::STOP_BATTLE, 60, {CallbackEnum::BATTLE, CallbackEnum::DIALOG_ARROW, CallbackEnum::PROMPT_DIALOG});
+
+        env.console.log("Battle Elite Four 2.");  // select move 2, which should be a fire move. to battle the steel trainer
+        std::vector<SinglesMoveEntry> move_table2 = {move2};
+        is_won = run_pokemon(env.console, context, move_table2, true, terastallized);
+        if (!is_won){// throw exception if we lose
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "Failed to beat the Steel trainer. Reset.",
+                env.console
+            );
+        }
+
+        // finished battle
+        mash_button_till_overworld(env.console, context, BUTTON_A);
+
+        // heal
+        auto_heal_from_menu_or_overworld(env.program_info(), env.console, context, 0, true);
+
+        // engage next battle
+        walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_ONLY, 60000ms);
+        clear_dialog(env.console, context, ClearDialogMode::STOP_BATTLE, 60, {CallbackEnum::BATTLE, CallbackEnum::DIALOG_ARROW, CallbackEnum::PROMPT_DIALOG});
+
+        env.console.log("Battle Elite Four 3.");
+        run_trainer_battle_press_A(env.console, context, BattleStopCondition::STOP_DIALOG);
+
+        // finished battle
+        mash_button_till_overworld(env.console, context, BUTTON_A);
+
+        // engage next battle
+        walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_ONLY, 60000ms);
+        clear_dialog(env.console, context, ClearDialogMode::STOP_BATTLE, 60, {CallbackEnum::BATTLE, CallbackEnum::DIALOG_ARROW, CallbackEnum::PROMPT_DIALOG});
+
+        env.console.log("Battle Elite Four 4.");
+        run_trainer_battle_press_A(env.console, context, BattleStopCondition::STOP_DIALOG);
+
+        // finished battle
+        clear_dialog(env.console, context, ClearDialogMode::STOP_OVERWORLD, 60, {CallbackEnum::OVERWORLD});
+
+    });     
+}
+
+void checkpoint_89(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, EventNotificationOption& notif_error_recoverable, AutoStoryStats& stats, const std::string& checkpoint_text){
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){
+        walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_ONLY, 60000ms);
+        clear_dialog(env.console, context, ClearDialogMode::STOP_BATTLE, 60, {CallbackEnum::BATTLE, CallbackEnum::DIALOG_ARROW, CallbackEnum::PROMPT_DIALOG});
+
+        env.console.log("Battle Geeta.");
+        run_trainer_battle_press_A(env.console, context, BattleStopCondition::STOP_DIALOG);
+
+        // finished battle
+        mash_button_till_overworld(env.console, context, BUTTON_A);
+
+        // move to Pokecenter
+        handle_unexpected_battles(env.program_info(), env.console, context,
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_NEW_MARKER, +1, +0.609, 400ms);
+        });      
+        overworld_navigation(env.program_info(), env.console, context, 
+            NavigationStopCondition::STOP_TIME, NavigationMovementMode::DIRECTIONAL_ONLY, 
+            0, +0.883, 12, 12, false);           // can't wrap in handle_when_stationary_in_overworld(), since we expect to be stationary when walking into the pokecenter
+            
+
+        fly_to_overlapping_flypoint(env.program_info(), env.console, context); 
+
+    });     
+}
+
+
+
+GameTitle get_game_title(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    GameTitle game_title = GameTitle::UNKNOWN;
+    enter_menu_from_overworld(env.program_info(), env.console, context, 0, MenuSide::RIGHT);
+    context.wait_for_all_requests();
+
+    for (size_t i = 0; i < 10; i++){
+        VideoSnapshot screen = env.console.video().snapshot();
+        ImageFloatBox box = {0.03, 0.94, 0.40, 0.04};
+        ImageStats bottom_stats = image_stats(extract_box_reference(screen, box));
+
+        if (is_solid(bottom_stats, {0.648549, 0.2861580, 0.0652928}, 0.15, 25)){
+            game_title = GameTitle::SCARLET;
+            env.console.log("Game title detected: Scarlet");
+            break;
+        }else if (is_solid(bottom_stats, {0.367816, 0.0746615, 0.5575230}, 0.15, 25)){
+            game_title = GameTitle::VIOLET;
+            env.console.log("Game title detected: Violet");
+            break;
+        }
+
+        env.console.log("Unable to detect game title. Wait some time.");
+        context.wait_for(Seconds(2));
+    }
+
+    if (game_title == GameTitle::UNKNOWN){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "get_game_title(): Unable to determine what game we are playing. "
+            "The color of the bottom bar in the Pokemon Summary page doesn't match any of the expected colors.",
+            env.console
+        );  
+    }
+
+    return game_title;
+
+}
+
+
+std::string get_ride_pokemon_name(SingleSwitchProgramEnvironment& env, ProControllerContext& context, Language language){
+    enter_menu_from_overworld(env.program_info(), env.console, context, -1);
+
+    ImageFloatBox box = {0.116223, 0.895000, 0.194915, 0.051724};
+    ImageViewRGB32 image = extract_box_reference(env.console.video().snapshot(), box);
+
+    OCR::StringMatchResult ocr_result = Pokemon::PokemonNameReader::instance().read_substring(
+        env.console.logger(), language, image,
+        OCR::WHITE_TEXT_FILTERS()
+    );
+    std::multimap<double, OCR::StringMatchData> results;
+    if (!ocr_result.results.empty()){
+        for (const auto& result : ocr_result.results){
+            results.emplace(result.first, result.second);
+        }
+    }
+
+    if (results.empty()){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "AutoStory_Segment_34::checkpoint_86(): Unable to read selected item. No valid results.\n" + language_warning(language),
+            env.console
+        );
+    }
+
+    if (results.size() > 1){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "AutoStory_Segment_34::checkpoint_86(): Unable to read selected item. Ambiguous or multiple results.\n" + language_warning(language),
+            env.console
+        );
+    }
+
+    std::string ride_pokemon = results.begin()->second.token;
+
+    // cout << ride_pokemon << endl;
+    return ride_pokemon;
+}
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_33.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_33.h
new file mode 100644
index 0000000000..53f28e2578
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_33.h
@@ -0,0 +1,106 @@
+/*  Autostory
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_AutoStory_Segment_33_H
+#define PokemonAutomation_PokemonSV_AutoStory_Segment_33_H
+
+#include "PokemonSV_AutoStoryTools.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+class AutoStory_Segment_33 : public AutoStory_Segment{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_segment(
+        SingleSwitchProgramEnvironment& env, 
+        ProControllerContext& context,
+        AutoStoryOptions options,
+        AutoStoryStats& stats
+    ) const override;
+};
+
+enum class GameTitle{
+    UNKNOWN,
+    SCARLET,
+    VIOLET,
+};
+
+class AutoStory_Checkpoint_85 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+class AutoStory_Checkpoint_86 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+class AutoStory_Checkpoint_87 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+class AutoStory_Checkpoint_88 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+class AutoStory_Checkpoint_89 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+
+// start: Beat Alfornada gym challenge. Beat Alfornada gym. At Alfronada Pokecenter.
+// end: Beat Clavell. At Academy fly point.
+void checkpoint_85(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, EventNotificationOption& notif_error_recoverable, AutoStoryStats& stats, const std::string& checkpoint_text);
+
+// start: Beat Clavell. At Academy fly point.
+// end: At Pokemon League entrance.
+void checkpoint_86(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, EventNotificationOption& notif_error_recoverable, AutoStoryStats& stats, const std::string& checkpoint_text);
+
+// start: At Pokemon League entrance.
+// end: Finished the Entrance quiz. Standing in front of Rika.
+void checkpoint_87(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, EventNotificationOption& notif_error_recoverable, AutoStoryStats& stats, const std::string& checkpoint_text, Language language, StarterChoice starter_choice);
+
+// start: Finished the Entrance quiz. Standing in front of Rika.
+// end: Beat the Elite Four. Door to Geeta up ahead.
+void checkpoint_88(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, EventNotificationOption& notif_error_recoverable, AutoStoryStats& stats, const std::string& checkpoint_text);
+
+// start: Beat the Elite Four. Door to Geeta up ahead.
+// end: Beat Geeta. At Pokemon League Pokecenter.
+void checkpoint_89(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, EventNotificationOption& notif_error_recoverable, AutoStoryStats& stats, const std::string& checkpoint_text);
+
+
+GameTitle get_game_title(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+
+std::string get_ride_pokemon_name(SingleSwitchProgramEnvironment& env, ProControllerContext& context, Language language);
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_34.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_34.cpp
new file mode 100644
index 0000000000..aa49de6bb6
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_34.cpp
@@ -0,0 +1,252 @@
+/*  AutoStory
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "VideoGames/PokemonSV/Programs/Battles/PokemonSV_SinglesBattler.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h"
+#include "PokemonSV_AutoStoryTools.h"
+#include "PokemonSV_AutoStory_Segment_34.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+//#include <unordered_map>
+//#include <algorithm>
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+
+std::string AutoStory_Segment_34::name() const{
+    return "34: Battle Nemona, Penny, Arven";
+}
+
+std::string AutoStory_Segment_34::start_text() const{
+    return "Start: Beat Clavell. Beat Elite Four. At Pokemon League Pokecenter.";
+}
+
+std::string AutoStory_Segment_34::end_text() const{
+    return "End: Beat Nemona, Penny, and Arven. At Los Platos Pokecenter.";
+}
+
+void AutoStory_Segment_34::run_segment(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    AutoStoryOptions options,
+    AutoStoryStats& stats
+) const{
+    
+
+    stats.m_segment++;
+    env.update_stats();
+    context.wait_for_all_requests();
+    env.console.log("Start Segment " + name(), COLOR_ORANGE);
+
+    AutoStory_Checkpoint_90().run_checkpoint(env, context, options, stats);
+    AutoStory_Checkpoint_91().run_checkpoint(env, context, options, stats);
+    AutoStory_Checkpoint_92().run_checkpoint(env, context, options, stats);
+
+    context.wait_for_all_requests();
+    env.console.log("End Segment " + name(), COLOR_GREEN);
+
+}
+
+std::string AutoStory_Checkpoint_90::name() const{ return "090 - " + AutoStory_Segment_34().name(); }
+std::string AutoStory_Checkpoint_90::start_text() const{ return "Beat Geeta. At Pokemon League Pokecenter.";}
+std::string AutoStory_Checkpoint_90::end_text() const{ return "Beat Nemona. At dormitory room, next to bed.";}
+void AutoStory_Checkpoint_90::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_90(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+std::string AutoStory_Checkpoint_91::name() const{ return "091 - " + AutoStory_Segment_34().name(); }
+std::string AutoStory_Checkpoint_91::start_text() const{ return AutoStory_Checkpoint_90().end_text();}
+std::string AutoStory_Checkpoint_91::end_text() const{ return "Beat Penny. At Academy fly point.";}
+void AutoStory_Checkpoint_91::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_91(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+std::string AutoStory_Checkpoint_92::name() const{ return "092 - " + AutoStory_Segment_34().name(); }
+std::string AutoStory_Checkpoint_92::start_text() const{ return AutoStory_Checkpoint_91().end_text();}
+std::string AutoStory_Checkpoint_92::end_text() const{ return "Beat Arven. At Los Platos Pokecenter.";}
+void AutoStory_Checkpoint_92::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_92(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+
+
+void checkpoint_90(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, EventNotificationOption& notif_error_recoverable, AutoStoryStats& stats, const std::string& checkpoint_text){
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){
+        // Fly to Academy
+        move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::KEEP_ZOOM, +1, -0.803, 640ms}, FlyPoint::FAST_TRAVEL);
+
+        realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_NEW_MARKER, 0, -1, 800ms);
+
+        handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                overworld_navigation(env.program_info(), env.console, context, 
+                    NavigationStopCondition::STOP_TIME, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                    0, +1, 30, 30, false);
+            }, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_move_left_joystick(context, {-1, -1}, 320ms, 400ms);
+                realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+            }
+        );
+
+        clear_dialog(env.console, context, ClearDialogMode::STOP_BATTLE, 120, {CallbackEnum::BATTLE, CallbackEnum::DIALOG_ARROW});
+
+        env.console.log("Battle Nemona.");
+        run_trainer_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+
+
+    });   
+}
+
+void checkpoint_91(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, EventNotificationOption& notif_error_recoverable, AutoStoryStats& stats, const std::string& checkpoint_text){
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){
+        
+        // walk down
+        pbf_move_left_joystick(context, {0, -1}, 800ms, 800ms);
+        // walk right towards door
+        pbf_move_left_joystick(context, {+1, 0}, 1600ms, 800ms);
+
+        wait_for_gradient_arrow(env.program_info(), env.console, context, {0.031, 0.193, 0.047, 0.078}, 10);
+
+        env.console.log("Leave dorm for schoolyard.");
+        pbf_press_dpad(context, DPAD_UP, 104ms, 160ms);
+        pbf_press_dpad(context, DPAD_LEFT, 104ms, 160ms);
+        pbf_press_dpad(context, DPAD_DOWN, 104ms, 160ms);
+        wait_for_gradient_arrow(env.program_info(), env.console, context, {0.031, 0.790, 0.047, 0.078}, 10);
+        pbf_mash_button(context, BUTTON_A, 1000ms);
+
+        // clear_dialog(env.console, context, ClearDialogMode::STOP_TIMEOUT, 60, {CallbackEnum::PROMPT_DIALOG});
+        // pbf_mash_button(context, BUTTON_A, 1000ms);
+        clear_dialog(env.console, context, ClearDialogMode::STOP_BATTLE, 60, {CallbackEnum::BATTLE, CallbackEnum::DIALOG_ARROW, CallbackEnum::PROMPT_DIALOG});
+        env.console.log("Battle Penny.");
+        SinglesMoveEntry move1{SinglesMoveType::Move1, true};  // Moonblast
+        std::vector<SinglesMoveEntry> move_table1 = {move1};
+        bool terastallized = false;
+        bool is_won = run_pokemon(env.console, context, move_table1, true, terastallized);
+        if (!is_won){// throw exception if we lose
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "Failed to beat the Penny. Reset.",
+                env.console
+            );
+        }
+        
+        mash_button_till_overworld(env.console, context, BUTTON_A);
+
+        // now back in dorm room.
+
+        // walk right towards door
+        pbf_move_left_joystick(context, {+1, 0}, 1600ms, 800ms);
+
+        wait_for_gradient_arrow(env.program_info(), env.console, context, {0.031, 0.193, 0.047, 0.078}, 10);
+
+        env.console.log("Leave dorm for Director's office.");
+        pbf_press_dpad(context, DPAD_DOWN, 104ms, 160ms);
+        pbf_press_dpad(context, DPAD_RIGHT, 104ms, 160ms);
+        pbf_press_dpad(context, DPAD_DOWN, 104ms, 160ms);
+        wait_for_gradient_arrow(env.program_info(), env.console, context, {0.031, 0.345, 0.047, 0.078}, 10);
+        pbf_mash_button(context, BUTTON_A, 1000ms);
+
+        wait_for_overworld(env.program_info(), env.console, context);
+
+        walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_ONLY, 30000ms);
+
+        mash_button_till_overworld(env.console, context, BUTTON_A);
+
+         // walk right towards door
+        pbf_move_left_joystick(context, {+1, 0}, 1600ms, 800ms);
+
+        wait_for_gradient_arrow(env.program_info(), env.console, context, {0.031, 0.193, 0.047, 0.078}, 10);
+        mash_button_till_overworld(env.console, context, BUTTON_A);
+
+        // now in school lobby
+
+        context.wait_for_all_requests();
+        context.wait_for(1000ms);
+
+        pbf_move_left_joystick(context, {0, -1}, 8000ms, 800ms);
+        // wait for dialog when leaving school lobby
+        pbf_wait(context, 3000ms);
+        
+        mash_button_till_overworld(env.console, context, BUTTON_A);
+        
+        realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+        handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                overworld_navigation(env.program_info(), env.console, context, 
+                    NavigationStopCondition::STOP_DIALOG, NavigationMovementMode::DIRECTIONAL_SPAM_A, 
+                    0, +1, 60, 60, false);
+            }, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_move_left_joystick(context, {-1, -1}, 320ms, 400ms);
+                realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+            }
+        );
+
+        mash_button_till_overworld(env.console, context, BUTTON_A);
+
+        move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::ZOOM_IN, -1, +1, 0ms}, FlyPoint::FAST_TRAVEL);
+
+
+    });   
+}
+
+void checkpoint_92(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, EventNotificationOption& notif_error_recoverable, AutoStoryStats& stats, const std::string& checkpoint_text){
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){
+        move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::ZOOM_IN, +0.134, -1, 2800ms}, FlyPoint::FAST_TRAVEL);
+        handle_unexpected_battles(env.program_info(), env.console, context,
+        [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+            pbf_move_left_joystick(context, {-1, 0}, 1000ms, 100ms);
+        });
+        mash_button_till_overworld(env.console, context, BUTTON_A);
+        // clear_dialog(env.console, context, ClearDialogMode::STOP_OVERWORLD, 60, {CallbackEnum::OVERWORLD, CallbackEnum::PROMPT_DIALOG});
+
+        // leave the inside of the lighthouse and go outside
+        pbf_move_left_joystick(context, {0, -1}, 800ms, 400ms);
+        pbf_move_left_joystick(context, {-1, 0}, 2400ms, 400ms);
+        pbf_move_left_joystick(context, {+1, -1}, 800ms, 400ms);
+
+        pbf_wait(context, 3000ms);
+        // wait for overworld after building
+        wait_for_overworld(env.program_info(), env.console, context, 30);
+
+        realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_NEW_MARKER, -1, -0.488, 400ms);
+        overworld_navigation(env.program_info(), env.console, context, 
+            NavigationStopCondition::STOP_DIALOG, NavigationMovementMode::DIRECTIONAL_SPAM_A, 
+            0, +1, 30, 30, false);
+        
+
+        clear_dialog(env.console, context, ClearDialogMode::STOP_BATTLE, 60, {CallbackEnum::BATTLE, CallbackEnum::DIALOG_ARROW, CallbackEnum::PROMPT_DIALOG});
+        env.console.log("Battle Arven.");
+        run_trainer_battle_press_A(env.console, context, BattleStopCondition::STOP_DIALOG);
+
+        mash_button_till_overworld(env.console, context, BUTTON_A);
+
+        move_cursor_towards_flypoint_and_go_there(env.program_info(), env.console, context, {ZoomChange::KEEP_ZOOM, -1, +1, 0ms}, FlyPoint::POKECENTER);
+    });   
+}
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_34.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_34.h
new file mode 100644
index 0000000000..a0fca5b3a5
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_34.h
@@ -0,0 +1,76 @@
+/*  Autostory
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_AutoStory_Segment_34_H
+#define PokemonAutomation_PokemonSV_AutoStory_Segment_34_H
+
+#include "PokemonSV_AutoStoryTools.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+class AutoStory_Segment_34 : public AutoStory_Segment{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_segment(
+        SingleSwitchProgramEnvironment& env, 
+        ProControllerContext& context,
+        AutoStoryOptions options,
+        AutoStoryStats& stats
+    ) const override;
+};
+
+class AutoStory_Checkpoint_90 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+class AutoStory_Checkpoint_91 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+class AutoStory_Checkpoint_92 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+
+
+// start: Beat Geeta. At Pokemon League Pokecenter.
+// end: Beat Nemona. At dormitory room, next to bed.
+void checkpoint_90(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, EventNotificationOption& notif_error_recoverable, AutoStoryStats& stats, const std::string& checkpoint_text);
+
+// start: Beat Nemona. At dormitory room, next to bed.
+// end: Beat Penny. At Academy fly point.
+void checkpoint_91(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, EventNotificationOption& notif_error_recoverable, AutoStoryStats& stats, const std::string& checkpoint_text);
+
+// start: Beat Penny. At Academy fly point.
+// end: Beat Arven. At Los Platos Pokecenter.
+void checkpoint_92(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, EventNotificationOption& notif_error_recoverable, AutoStoryStats& stats, const std::string& checkpoint_text);
+
+
+
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_35.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_35.cpp
new file mode 100644
index 0000000000..16e6bba254
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_35.cpp
@@ -0,0 +1,653 @@
+/*  AutoStory
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/GlobalAutoPaths.h"
+//#include "CommonFramework/Exceptions/OperationFailedException.h"
+//#include "CommonFramework/VideoPipeline/VideoFeed.h"
+//#include "CommonTools/Async/InferenceRoutines.h"
+#include "ML/Inference/ML_YOLOv5Detector.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h"
+#include "PokemonSV_AutoStoryTools.h"
+#include "PokemonSV_AutoStory_Segment_35.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+using namespace ML;
+
+std::string AutoStory_Segment_35::name() const{
+    return "35: Area Zero Gate, Station 1";
+}
+
+std::string AutoStory_Segment_35::start_text() const{
+    return "Start: Beat Nemona, Penny, and Arven. At Los Platos Pokecenter.";
+}
+
+std::string AutoStory_Segment_35::end_text() const{
+    return "End: Inside Area Zero Station 1. Deactivated the locks.";
+}
+
+void AutoStory_Segment_35::run_segment(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    AutoStoryOptions options,
+    AutoStoryStats& stats
+) const{
+    
+
+    stats.m_segment++;
+    env.update_stats();
+    context.wait_for_all_requests();
+    env.console.log("Start Segment " + name(), COLOR_ORANGE);
+
+    AutoStory_Checkpoint_93().run_checkpoint(env, context, options, stats);
+    AutoStory_Checkpoint_94().run_checkpoint(env, context, options, stats);
+    AutoStory_Checkpoint_95().run_checkpoint(env, context, options, stats);
+
+
+    context.wait_for_all_requests();
+    env.console.log("End Segment " + name(), COLOR_GREEN);
+
+}
+
+std::string AutoStory_Checkpoint_93::name() const{ return "093 - " + AutoStory_Segment_35().name(); }
+std::string AutoStory_Checkpoint_93::start_text() const{ return "Beat Arven. At Los Platos Pokecenter.";}
+std::string AutoStory_Checkpoint_93::end_text() const{ return "Entered Area Zero Gate. Flew down to Area Zero from the platform.";}
+void AutoStory_Checkpoint_93::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_93(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+std::string AutoStory_Checkpoint_94::name() const{ return "094 - " + AutoStory_Segment_35().name(); }
+std::string AutoStory_Checkpoint_94::start_text() const{ return AutoStory_Checkpoint_93().end_text();}
+std::string AutoStory_Checkpoint_94::end_text() const{ return "Inside Area Zero Station 1. Deactivated the locks.";}
+void AutoStory_Checkpoint_94::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_94(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+std::string AutoStory_Checkpoint_95::name() const{ return "095 - " + AutoStory_Segment_35().name(); }
+std::string AutoStory_Checkpoint_95::start_text() const{ return AutoStory_Checkpoint_94().end_text();}
+std::string AutoStory_Checkpoint_95::end_text() const{ return "Inside Area Zero Station 1. Deactivated the locks.";}
+void AutoStory_Checkpoint_95::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_95(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+
+void checkpoint_93(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, EventNotificationOption& notif_error_recoverable, AutoStoryStats& stats, const std::string& checkpoint_text){
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){
+        // fly to Medali West from Los Platos Pokecenter
+        // this clears Pokemon in minimap
+        move_cursor_towards_flypoint_and_go_there(
+            env.program_info(),
+            env.console,
+            context,
+            {ZoomChange::ZOOM_OUT, -0.258, +1, 1360ms},
+            FlyPoint::POKECENTER
+        );
+
+        // marker 1     {0.580729, 0.286111}
+        place_marker_offset_from_flypoint(
+            env.program_info(),
+            env.console,
+            context,
+            {ZoomChange::KEEP_ZOOM, -1, +1, 0ms},
+            FlyPoint::POKECENTER, 
+            {0.580729, 0.286111}
+        );
+        handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                overworld_navigation(env.program_info(), env.console, context, 
+                    NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                    0, +1, 40, 20, false);
+            }, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_move_left_joystick(context, {+1, -1}, 320ms, 400ms);
+                realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+            }
+        );
+
+        // marker 2    {0.475, 0.4}
+        place_marker_offset_from_flypoint(
+            env.program_info(),
+            env.console,
+            context,
+            {ZoomChange::KEEP_ZOOM, -1, +1, 0ms},
+            FlyPoint::POKECENTER, 
+            {0.475, 0.4}
+        );
+        handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                overworld_navigation(env.program_info(), env.console, context, 
+                    NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                    0, +1, 40, 20, false);
+            }, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_move_left_joystick(context, {-1, -1}, 320ms, 400ms);
+                realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+            }
+        );
+
+        // marker 3    {0.473958, 0.260185}      {0.479687, 0.250926}
+        place_marker_offset_from_flypoint(
+            env.program_info(), env.console, context,
+            {ZoomChange::KEEP_ZOOM, -1, -1, 240ms},
+            FlyPoint::POKECENTER, 
+            {0.479687, 0.250926}
+        );
+        handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                overworld_navigation(env.program_info(), env.console, context, 
+                    NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                    0, +1, 40, 20, false);
+            }, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_move_left_joystick(context, {-1, -1}, 320ms, 400ms);
+                realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+            }
+        );
+
+        // marker 4     {0.425, 0.289815}
+        place_marker_offset_from_flypoint(
+            env.program_info(), env.console, context,
+            {ZoomChange::KEEP_ZOOM, -1, +1, 0ms},
+            FlyPoint::POKECENTER, 
+            {0.425, 0.289815}
+        );
+        handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                overworld_navigation(env.program_info(), env.console, context, 
+                    NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                    0, +1, 40, 20, false);
+            }, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_move_left_joystick(context, {-1, -1}, 320ms, 400ms);
+                realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+            }
+        );
+
+        // marker 5     {0.465104, 0.292593}
+        place_marker_offset_from_flypoint(
+            env.program_info(), env.console, context,
+            {ZoomChange::KEEP_ZOOM, +1, +1, 160ms},
+            FlyPoint::POKECENTER, 
+            {0.465104, 0.292593}
+        );
+        handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                overworld_navigation(env.program_info(), env.console, context, 
+                    NavigationStopCondition::STOP_MARKER, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                    0, +1, 40, 20, false);
+            }, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_move_left_joystick(context, {-1, -1}, 320ms, 400ms);
+                realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+            }
+        );
+
+        // marker 6     {0.439583, 0.274074}
+        place_marker_offset_from_flypoint(
+            env.program_info(), env.console, context,
+            {ZoomChange::ZOOM_OUT, +1, -1, 160ms},
+            FlyPoint::POKECENTER, 
+            {0.439583, 0.274074}
+        );
+        handle_when_stationary_in_overworld(env.program_info(), env.console, context, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                overworld_navigation(env.program_info(), env.console, context, 
+                    NavigationStopCondition::STOP_DIALOG, NavigationMovementMode::DIRECTIONAL_ONLY, 
+                    0, +1, 40, 20, false);
+            }, 
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_move_left_joystick(context, {+1, -1}, 320ms, 400ms);
+                realign_player(env.program_info(), env.console, context, PlayerRealignMode::REALIGN_OLD_MARKER);
+            }
+        );
+
+        clear_dialog(env.console, context, ClearDialogMode::STOP_OVERWORLD, 120, {CallbackEnum::OVERWORLD, CallbackEnum::BLACK_DIALOG_BOX});
+        pbf_move_left_joystick(context, {0, +1}, 800ms, 400ms);
+        pbf_move_left_joystick(context, {+1, +0.453}, 2400ms, 400ms);
+        mash_button_till_overworld(env.console, context, BUTTON_A);
+        // clear_dialog(env.console, context, ClearDialogMode::STOP_OVERWORLD, 120, {CallbackEnum::OVERWORLD, CallbackEnum::BLACK_DIALOG_BOX, CallbackEnum::PROMPT_DIALOG});
+
+        walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_ONLY, 30000ms);
+        mash_button_till_overworld(env.console, context, BUTTON_A); // prompt, black dialog. random A press
+
+    }); 
+
+}
+
+void checkpoint_94(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, EventNotificationOption& notif_error_recoverable, AutoStoryStats& stats, const std::string& checkpoint_text){
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){
+
+
+        YOLOv5Detector yolo_detector(DOWNLOADED_RESOURCE_PATH() + "PokemonSV/AreaZero/A0-station-1.onnx");
+
+
+        move_player_forward(env, context, 6,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+            }
+        );
+
+        // confirm we can see tree-tera
+        move_player_until_yolo_object_detected(env, context, yolo_detector, "tree-tera", 
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+            },
+            5
+        );
+        // align to tree-tera. center-y: 0.294444   center-x: 0.604688
+        move_camera_yolo(env, context, CameraAxis::Y, yolo_detector, "tree-tera", 0.294444, 
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                move_player_to_realign_via_yolo(env, context, yolo_detector, "tree-tera", 0.277344);  // x-position of tree-tera prior to camera move
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }
+        );
+        move_camera_yolo(env, context, CameraAxis::X, yolo_detector, "tree-tera", 0.604688,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                // move_player_to_realign_via_yolo(env, context, yolo_detector, "tree-tera", 0.6);  // 0.277344  // set close to target x-position of target object
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }
+        );
+        
+        // move towards tree-tera until {0.721875, 0.277778, 0.146875, 0.180556}
+        move_forward_until_yolo_object_above_min_size(env, context, yolo_detector, "tree-tera",
+            0.146, 0.180,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                move_player_to_realign_via_yolo(env, context, yolo_detector, "tree-tera", 0.604688);
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }
+        );
+
+        // align to rock-1. center-y: 0.191667   center-x: 0.583594
+        move_camera_yolo(env, context, CameraAxis::Y, yolo_detector, "rock-1", 0.191667,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                move_player_to_realign_via_yolo(env, context, yolo_detector, "rock-1", 0.578);  // x-position of target object prior to camera move
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }        
+        );
+        move_camera_yolo(env, context, CameraAxis::X, yolo_detector, "rock-1", 0.583594,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                // move_player_to_realign_via_yolo(env, context, yolo_detector, "rock-1", 0.58);  // 0.578  // set close to target x-position of target object
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }        
+        );
+
+        // move towards rock-1 until {0.626563, 0.113889, 0.279688, 0.230556}
+        move_forward_until_yolo_object_above_min_size(env, context, yolo_detector, "rock-1",
+            0.279, 0.230,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                move_player_to_realign_via_yolo(env, context, yolo_detector, "rock-1", 0.583594);
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }
+        );
+        
+
+        // align to rock-2. center-y: 0.194444   center-x: 0.508594
+        move_camera_yolo(env, context, CameraAxis::Y, yolo_detector, "rock-2", 0.194444,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                move_player_to_realign_via_yolo_with_recovery(env, context, yolo_detector, "rock-2", 0.25, 
+                    [&](){
+                        move_player_to_realign_via_yolo(env, context, yolo_detector, "rock-1", 0.7);
+                    }
+                );
+                // move_player_to_realign_via_yolo(env, context, yolo_detector, "rock-2", 0.5);  // x-position of target object prior to camera move
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }
+        );
+        move_camera_yolo(env, context, CameraAxis::X, yolo_detector, "rock-2", 0.508594,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                // move_player_to_realign_via_yolo_with_recovery(env, context, yolo_detector, "rock-2", 0.5, 
+                //     [&](){
+                //         move_player_to_realign_via_yolo(env, context, yolo_detector, "rock-1", 0.7);
+                //     }
+                // );
+                // move_player_to_realign_via_yolo(env, context, yolo_detector, "rock-2", 0.5);  // 0.223   // set close to target x-position of target object
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }        
+        );
+        
+
+        // move towards rock-2 until {0.471875, 0.244444, 0.103125, 0.266667}
+        move_forward_until_yolo_object_above_min_size(env, context, yolo_detector, "rock-2",
+            0.103, 0.266,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                move_player_to_realign_via_yolo(env, context, yolo_detector, "rock-2", 0.508594);
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }
+        );
+
+        // align to rock-3. center-y: 0.190278   center-x: 0.566406
+        move_camera_yolo(env, context, CameraAxis::Y, yolo_detector, "rock-3", 0.190278,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                move_player_to_realign_via_yolo(env, context, yolo_detector, "rock-3", 0.724);  // x-position of target object prior to camera move
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }        
+        );
+        move_camera_yolo(env, context, CameraAxis::X, yolo_detector, "rock-3", 0.566406,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                // move_player_to_realign_via_yolo(env, context, yolo_detector, "rock-3", 0.6);  // 0.724   // set close to target x-position of target object
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }        
+        );
+
+        // move towards rock-3 until   {0.598438, 0.186111, 0.121875, 0.136111}
+        move_forward_until_yolo_object_above_min_size(env, context, yolo_detector, "rock-3",
+            0.121, 0.1,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                move_player_to_realign_via_yolo(env, context, yolo_detector, "rock-3", 0.566406);
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }
+        );
+        
+
+        // align to stream.  center-y: 0.481944   center-x: 0.528906
+        move_camera_yolo(env, context, CameraAxis::Y, yolo_detector, "stream", 0.481944,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                move_player_to_realign_via_yolo(env, context, yolo_detector, "stream", 0.404);  // x-position of target object prior to camera move
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }        
+        );
+        move_camera_yolo(env, context, CameraAxis::X, yolo_detector, "stream", 0.528906,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                // move_player_to_realign_via_yolo(env, context, yolo_detector, "stream", 0.5);  // 0.404   // set close to target x-position of target object
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }        
+        );
+
+
+        // move forward until stream not detected
+        move_forward_until_yolo_object_not_detected(env, context, yolo_detector, "stream", 
+            3,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                move_player_to_realign_via_yolo(env, context, yolo_detector, "stream", 0.5);
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }
+        );
+
+        pbf_press_button(context, BUTTON_L, 160ms, 400ms);
+
+        move_camera_until_yolo_object_detected(env, context, yolo_detector, "rock-3", +1, 80ms);
+
+        // align to rock-3.  center-y: 0.291667   center-x: 0.501563
+        move_camera_yolo(env, context, CameraAxis::Y, yolo_detector, "rock-3", 0.291667,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                move_player_to_realign_via_yolo(env, context, yolo_detector, "rock-3", 0.8);  // x-position of target object prior to camera move
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }        
+        );
+        move_camera_yolo(env, context, CameraAxis::X, yolo_detector, "rock-3", 0.501563,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                // move_player_to_realign_via_yolo(env, context, yolo_detector, "rock-3", 0.5015);  // 0.8   // set close to target x-position of target object
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }        
+        );
+
+
+        // move towards rock-3 until {0.245313, 0.001000, 0.404688, 0.394444}
+        move_forward_until_yolo_object_above_min_size(env, context, yolo_detector, "rock-3",
+            0.404, 0.25,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                move_player_to_realign_via_yolo(env, context, yolo_detector, "rock-3", 0.501563);
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }
+        );
+
+        
+
+
+        // align to rock-4.  center-y: 0.200000   center-x: 0.550781
+        move_camera_yolo(env, context, CameraAxis::X, yolo_detector, "rock-4", 0.550781,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                // move_player_to_realign_via_yolo(env, context, yolo_detector, "rock-4", 0.55);  // 0.8   // set close to target x-position of target object
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }        
+        );
+        move_camera_yolo(env, context, CameraAxis::Y, yolo_detector, "rock-4", 0.200000,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                move_player_to_realign_via_yolo(env, context, yolo_detector, "rock-4", 0.55);  // set close to target x-position of target object
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }        
+        );
+
+        // move towards rock-4 until {0.621875, 0.202778, 0.262500, 0.177778}
+        move_forward_until_yolo_object_above_min_size(env, context, yolo_detector, "rock-4",
+            0.25, 0.177,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                move_player_to_realign_via_yolo(env, context, yolo_detector, "rock-4", 0.550781);
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }
+        );
+
+        move_camera_until_yolo_object_detected(env, context, yolo_detector, "tree-1", -1, 560ms);
+
+        // align to tree-1.   center-y: 0.390278   center-x: 0.5
+        move_camera_yolo(env, context, CameraAxis::Y, yolo_detector, "tree-1", 0.390278,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                move_player_to_realign_via_yolo(env, context, yolo_detector, "tree-1", 0.3);  // x-position of target object prior to camera move
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }        
+        );
+        move_camera_yolo(env, context, CameraAxis::X, yolo_detector, "tree-1", 0.5,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                // move_player_to_realign_via_yolo(env, context, yolo_detector, "tree-1", 0.5);  // 0.3  // set close to target x-position of target object
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }        
+        );
+
+        // move towards tree-1 until  {0.064063, 0.002778, 0.523438, 0.305556} 
+        move_forward_until_yolo_object_above_min_size(env, context, yolo_detector, "tree-1",
+            0.52, 0.27,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                move_player_to_realign_via_yolo(env, context, yolo_detector, "tree-1", 0.5);
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }
+        );
+
+
+        // align to tree-1.  center-y: 0.341667   center-x: 0.500000
+        move_camera_yolo(env, context, CameraAxis::Y, yolo_detector, "tree-1", 0.341667,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                move_player_to_realign_via_yolo(env, context, yolo_detector, "tree-1", 0.5);  // x-position of target object prior to camera move
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }        
+        );
+        move_camera_yolo(env, context, CameraAxis::X, yolo_detector, "tree-1", 0.500000,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                // move_player_to_realign_via_yolo(env, context, yolo_detector, "tree-1", 0.5);  // set close to target x-position of target object
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }        
+        );
+
+        // move towards tree-1 until   {-0.064063, -0.008333, 1.073438, 0.602778}
+        move_forward_until_yolo_object_above_min_size(env, context, yolo_detector, "tree-1",
+            0.8, 0.500,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                move_player_to_realign_via_yolo(env, context, yolo_detector, "tree-1", 0.500000);
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }
+        );
+
+        move_camera_until_yolo_object_detected(env, context, yolo_detector, "rock-5", +1, 400ms);
+
+        // align to rock-5.  center-y: 0.206944   center-x: 0.600000
+        move_camera_yolo(env, context, CameraAxis::Y, yolo_detector, "rock-5", 0.206944,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                move_player_to_realign_via_yolo(env, context, yolo_detector, "rock-5", 0.7);  // x-position of target object prior to camera move
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }        
+        );
+        move_camera_yolo(env, context, CameraAxis::X, yolo_detector, "rock-5", 0.600000,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                // move_player_to_realign_via_yolo(env, context, yolo_detector, "rock-5", 0.6);  // 0.7  // set close to target x-position of target object
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }        
+        );
+
+        // move towards rock-5 until   {0.548438, -0.002778, 0.271875, 0.327778}
+        move_forward_until_yolo_object_above_min_size(env, context, yolo_detector, "rock-5",
+            0.271875, 0.327778,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                move_player_to_realign_via_yolo(env, context, yolo_detector, "rock-5", 0.600000);
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }
+        );
+
+        move_camera_until_yolo_object_detected(env, context, yolo_detector, "rock-6", +1, 400ms);
+
+        
+
+        // align to rock-6.  center-y: 0.333333   center-x: 0.372656
+        move_camera_yolo(env, context, CameraAxis::Y, yolo_detector, "rock-6", 0.333333,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                move_player_to_realign_via_yolo(env, context, yolo_detector, "rock-6", 0.66);  // 0.7  // x-position of target object prior to camera move
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }        
+        );
+        move_camera_yolo(env, context, CameraAxis::X, yolo_detector, "rock-6", 0.372656,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                // move_player_to_realign_via_yolo(env, context, yolo_detector, "rock-6", 0.37);  // set close to target x-position of target object
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }        
+        );
+
+        // move towards rock-6 until   {0.148438, 0.313889, 0.225000, 0.119444}
+        move_forward_until_yolo_object_above_min_size(env, context, yolo_detector, "rock-6",
+            0.22, 0.119,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                move_player_to_realign_via_yolo(env, context, yolo_detector, "rock-6", 0.372656);
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }
+        );
+
+
+        // align to station-1.  center-y: 0.286111   center-x: 0.483594
+        move_camera_yolo(env, context, CameraAxis::Y, yolo_detector, "station-1", 0.286111,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                move_player_to_realign_via_yolo(env, context, yolo_detector, "station-1", 0.64);  // x-position of target object prior to camera move
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }        
+        );
+        move_camera_yolo(env, context, CameraAxis::X, yolo_detector, "station-1", 0.483594,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                // move_player_to_realign_via_yolo(env, context, yolo_detector, "station-1", 0.5);  // 0.64   // set close to target x-position of target object
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }        
+        );
+
+        do_action_until_dialog(env.program_info(), env.console, context,
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                move_player_forward(env, context, 10,
+                    [&](){
+                        run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                        move_camera_yolo(env, context, CameraAxis::X, yolo_detector, "station-1", 0.5,
+                            [&](){
+                                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+                            } 
+                        );
+                        pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+                    }
+                );
+            }
+        );
+
+        clear_dialog(env.console, context, ClearDialogMode::STOP_BATTLE, 60, {CallbackEnum::BATTLE});
+        run_trainer_double_battle_press_A(env.console, context, BattleStopCondition::STOP_DIALOG);
+        mash_button_till_overworld(env.console, context, BUTTON_A);
+
+
+        YOLOv5Detector yolo_detector2(DOWNLOADED_RESOURCE_PATH() + "PokemonSV/AreaZero/station-door-1.onnx");
+        move_player_forward(env, context, 4,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+            }, 
+            true
+        );
+        
+        move_camera_until_yolo_object_detected(env, context, yolo_detector2, "station-door-1", -1, 400ms);
+        move_camera_yolo(env, context, CameraAxis::X, yolo_detector2, "station-door-1", 0.5,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }        
+        );
+        
+
+        // enter Station 1
+        walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_ONLY, 20000ms);
+        mash_button_till_overworld(env.console, context, BUTTON_A);  // black dialog
+
+        // disable Lock at Station 1
+        walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_SPAM_A, 20000ms);
+        mash_button_till_overworld(env.console, context, BUTTON_A);     // prompt, black dialog, 
+
+
+    }, false);
+}
+
+void checkpoint_95(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, EventNotificationOption& notif_error_recoverable, AutoStoryStats& stats, const std::string& checkpoint_text){
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){
+        // empty checkpoint
+        
+        
+
+    }, false);     
+}
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_35.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_35.h
new file mode 100644
index 0000000000..31d34377ae
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_35.h
@@ -0,0 +1,69 @@
+/*  Autostory
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_AutoStory_Segment_35_H
+#define PokemonAutomation_PokemonSV_AutoStory_Segment_35_H
+
+#include "PokemonSV_AutoStoryTools.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+class AutoStory_Segment_35 : public AutoStory_Segment{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_segment(
+        SingleSwitchProgramEnvironment& env, 
+        ProControllerContext& context,
+        AutoStoryOptions options,
+        AutoStoryStats& stats
+    ) const override;
+};
+
+class AutoStory_Checkpoint_93 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+class AutoStory_Checkpoint_94 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+class AutoStory_Checkpoint_95 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+// start: Beat Arven. At Los Platos Pokecenter.
+// end: Entered Area Zero Gate. Flew down to Area Zero from the platform.
+void checkpoint_93(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, EventNotificationOption& notif_error_recoverable, AutoStoryStats& stats, const std::string& checkpoint_text);
+
+// start: Entered Area Zero Gate. Flew down to Area Zero from the platform.
+// end: Inside Area Zero Station 1. Deactivated the locks.
+void checkpoint_94(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, EventNotificationOption& notif_error_recoverable, AutoStoryStats& stats, const std::string& checkpoint_text);
+
+// start: Inside Area Zero Station 1. Deactivated the locks.
+// end: Inside Area Zero Station 1. Deactivated the locks.
+void checkpoint_95(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, EventNotificationOption& notif_error_recoverable, AutoStoryStats& stats, const std::string& checkpoint_text);
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_36.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_36.cpp
new file mode 100644
index 0000000000..92e3b12476
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_36.cpp
@@ -0,0 +1,324 @@
+/*  AutoStory
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/GlobalAutoPaths.h"
+//#include "CommonFramework/Exceptions/OperationFailedException.h"
+//#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h"
+#include "PokemonSV_AutoStoryTools.h"
+#include "PokemonSV_AutoStory_Segment_36.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+//#include <unordered_map>
+//#include <algorithm>
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+
+std::string AutoStory_Segment_36::name() const{
+    return "36: Area Zero Station 2";
+}
+
+std::string AutoStory_Segment_36::start_text() const{
+    return "Start: Inside Area Zero Station 1. Deactivated the locks.";
+}
+
+std::string AutoStory_Segment_36::end_text() const{
+    return "End: Inside Area Zero Station 2. Deactivated the locks.";
+}
+
+void AutoStory_Segment_36::run_segment(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    AutoStoryOptions options,
+    AutoStoryStats& stats
+) const{
+    
+
+    stats.m_segment++;
+    env.update_stats();
+    context.wait_for_all_requests();
+    env.console.log("Start Segment " + name(), COLOR_ORANGE);
+
+    AutoStory_Checkpoint_96().run_checkpoint(env, context, options, stats);
+    AutoStory_Checkpoint_97().run_checkpoint(env, context, options, stats);
+
+    context.wait_for_all_requests();
+    env.console.log("End Segment " + name(), COLOR_GREEN);
+
+}
+
+std::string AutoStory_Checkpoint_96::name() const{ return "096 - " + AutoStory_Segment_36().name(); }
+std::string AutoStory_Checkpoint_96::start_text() const{ return "Inside Area Zero Station 1. Deactivated the locks.";}
+std::string AutoStory_Checkpoint_96::end_text() const{ return "Inside Area Zero Station 2. Deactivated the locks.";}
+void AutoStory_Checkpoint_96::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_96(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+std::string AutoStory_Checkpoint_97::name() const{ return "097 - " + AutoStory_Segment_36().name(); }
+std::string AutoStory_Checkpoint_97::start_text() const{ return AutoStory_Checkpoint_96().end_text();}
+std::string AutoStory_Checkpoint_97::end_text() const{ return "Inside Area Zero Station 2. Deactivated the locks.";}
+void AutoStory_Checkpoint_97::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_97(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+
+
+
+void checkpoint_96(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, EventNotificationOption& notif_error_recoverable, AutoStoryStats& stats, const std::string& checkpoint_text){
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){
+
+        YOLOv5Detector yolo_detector(DOWNLOADED_RESOURCE_PATH() + "PokemonSV/AreaZero/A0-station-2.onnx");
+        
+
+        pbf_move_left_joystick(context, {0, -1}, 3200ms, 800ms);
+        pbf_wait(context, 3000ms);
+        // wait for overworld after leaving research station
+        wait_for_overworld(env.program_info(), env.console, context, 30);
+        
+
+        // direction
+        // center-y: 0.326389   center-x: 0.660156
+        // center-y: 0.177778   center-x: 0.765625
+        // 
+
+        // move towards tree-2-1 until box:   {0.721875, -0.005556, 0.087500, 0.366667}
+        move_forward_until_yolo_object_above_min_size(env, context, yolo_detector, "tree-2-1",
+            0.0900, 0.15,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                move_player_to_realign_via_yolo(env, context, yolo_detector, "tree-2-1", 0.7);
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }
+        );
+
+        move_camera_until_yolo_object_detected(env, context, yolo_detector, "rock-2-1", -1, 240ms);
+
+        // align to rock-2-1.  
+        // center before: center-y: 0.604167   center-x: 0.238281
+        // center after: center-y: 0.297222   center-x: 0.355469
+        move_camera_yolo(env, context, CameraAxis::Y, yolo_detector, "rock-2-1", 0.297222,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                move_player_to_realign_via_yolo(env, context, yolo_detector, "rock-2-1", 0.25);  // x-position of target object prior to camera move
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }        
+        );
+        move_camera_yolo(env, context, CameraAxis::X, yolo_detector, "rock-2-1", 0.355469,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }        
+        );
+
+        // move towards rock-2-1 until box:  {0.007812, 0.363889, 0.203125, 0.300000}. center-y: 0.513889   center-x: 0.109375
+        move_forward_until_yolo_object_above_min_size(env, context, yolo_detector, "rock-2-1",
+            0.15, 0.25,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                move_player_to_realign_via_yolo(env, context, yolo_detector, "rock-2-1", 0.15);  // realign to target X
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }
+        );
+
+
+        // align to rock-2-2.  
+        // center before:  center-y: 0.426   center-x: 0.239
+        // center after: center-y: 0.273611   center-x: 0.494531
+        move_camera_yolo(env, context, CameraAxis::Y, yolo_detector, "rock-2-2", 0.273611,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                move_player_to_realign_via_yolo(env, context, yolo_detector, "rock-2-2", 0.25);  // x-position of target object prior to camera move
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }        
+        );
+        move_camera_yolo(env, context, CameraAxis::X, yolo_detector, "rock-2-2", 0.5,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }        
+        );
+
+        // move towards rock-2-2 until box:  {0.385938, 0.175000, 0.223438, 0.355556}
+        move_forward_until_yolo_object_above_min_size(env, context, yolo_detector, "rock-2-2",
+            0.223438, 0.30,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                move_player_to_realign_via_yolo(env, context, yolo_detector, "rock-2-2", 0.5);  // realign to target X
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }
+        );
+
+
+        // align to tree-2-2.  
+        // center before: center-y: 0.35   center-x: 0.205
+        // center after: center-y: 0.315278   center-x: 0.498437
+        move_camera_yolo(env, context, CameraAxis::Y, yolo_detector, "tree-2-2", 0.315278,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                move_player_to_realign_via_yolo(env, context, yolo_detector, "tree-2-2", 0.25);  // x-position of target object prior to camera move
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }        
+        );
+        move_camera_yolo(env, context, CameraAxis::X, yolo_detector, "tree-2-2", 0.498437,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }        
+        );
+
+        // move towards tree-2-2 until box:  {0.446875, 0.025000, 0.081250, 0.319444}
+        move_forward_until_yolo_object_above_min_size(env, context, yolo_detector, "tree-2-2",
+            0.081250, 0.30,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                move_player_to_realign_via_yolo(env, context, yolo_detector, "tree-2-2", 0.5);  // realign to target X
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }
+        );
+
+        // align to dirt-ramp.  
+        // center before: center-y: 0.3472   center-x: 0.211
+        // center after: center-y: 0.354167   center-x: 0.507031
+        move_camera_yolo(env, context, CameraAxis::Y, yolo_detector, "dirt-ramp", 0.354167,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                move_player_to_realign_via_yolo(env, context, yolo_detector, "dirt-ramp", 0.3);  // x-position of target object prior to camera move
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }        
+        );
+        move_camera_yolo(env, context, CameraAxis::X, yolo_detector, "dirt-ramp", 0.507031,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }        
+        );
+
+        // move forward until dirt-ramp not detected
+        move_forward_until_yolo_object_not_detected(env, context, yolo_detector, "dirt-ramp", 
+            6,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                move_player_to_realign_via_yolo(env, context, yolo_detector, "dirt-ramp", 0.5);
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }
+        );
+
+        pbf_press_button(context, BUTTON_L, 240ms, 100ms);
+
+        // confirm we can see station-2
+        move_player_until_yolo_object_detected(env, context, yolo_detector, "station-2", 
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+            },
+            5
+        );
+
+        // align to station-2.  
+        // center before: 
+        // center after: center-y: 0.388889   center-x: 0.517969
+        move_camera_yolo(env, context, CameraAxis::Y, yolo_detector, "station-2", 0.388889,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                move_player_to_realign_via_yolo(env, context, yolo_detector, "station-2", 0.5);  // x-position of target object prior to camera move
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }        
+        );
+        move_camera_yolo(env, context, CameraAxis::X, yolo_detector, "station-2", 0.5,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }        
+        );
+
+        // move towards station-2 until box:   {0.364063, 0.219444, 0.209375, 0.127778}
+        move_forward_until_yolo_object_above_min_size(env, context, yolo_detector, "station-2",
+            0.209375, 0.127778,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                move_player_to_realign_via_yolo(env, context, yolo_detector, "station-2", 0.5);  // realign to target X
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }
+        );
+
+        do_action_until_dialog(env.program_info(), env.console, context,
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                move_player_forward(env, context, 20,
+                    [&](){
+                        run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                        move_camera_yolo(env, context, CameraAxis::X, yolo_detector, "station-2", 0.5,
+                            [&](){
+                                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+                            } 
+                        );
+                        pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+                    }
+                );
+            }
+        );
+
+        clear_dialog(env.console, context, ClearDialogMode::STOP_BATTLE, 60, {CallbackEnum::BATTLE});
+        run_trainer_double_battle_press_A(env.console, context, BattleStopCondition::STOP_DIALOG);
+        mash_button_till_overworld(env.console, context, BUTTON_A);
+
+        YOLOv5Detector yolo_detector2(DOWNLOADED_RESOURCE_PATH() + "PokemonSV/AreaZero/station-door-1.onnx");  // we can reuse the detector for station door 1.
+
+        do_action_until_dialog(env.program_info(), env.console, context,
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_press_button(context, BUTTON_R, 160ms, 0ms);
+                move_player_forward(env, context, 20,
+                    [&](){
+                        run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                        move_camera_yolo(env, context, CameraAxis::X, yolo_detector2, "station-door-1", 0.5,
+                            [&](){
+                                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+                            } 
+                        );
+                        pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+                    }
+                );
+            }
+        );
+
+        mash_button_till_overworld(env.console, context, BUTTON_A);  // black dialog
+
+        // disable Lock at Station 2
+        walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_SPAM_A, 20000ms);
+        clear_dialog(env.console, context, ClearDialogMode::STOP_OVERWORLD, 120, {CallbackEnum::OVERWORLD, CallbackEnum::BLACK_DIALOG_BOX, CallbackEnum::PROMPT_DIALOG, CallbackEnum::WHITE_A_BUTTON});
+
+
+    }, false);  
+}
+
+void checkpoint_97(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, EventNotificationOption& notif_error_recoverable, AutoStoryStats& stats, const std::string& checkpoint_text){
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){
+        // empty checkpoint
+
+        
+    }, false);     
+}
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_36.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_36.h
new file mode 100644
index 0000000000..1119d29fb1
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_36.h
@@ -0,0 +1,60 @@
+/*  Autostory
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_AutoStory_Segment_36_H
+#define PokemonAutomation_PokemonSV_AutoStory_Segment_36_H
+
+#include "PokemonSV_AutoStoryTools.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+class AutoStory_Segment_36 : public AutoStory_Segment{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_segment(
+        SingleSwitchProgramEnvironment& env, 
+        ProControllerContext& context,
+        AutoStoryOptions options,
+        AutoStoryStats& stats
+    ) const override;
+};
+
+class AutoStory_Checkpoint_96 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+class AutoStory_Checkpoint_97 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+
+// start: Inside Area Zero Station 1. Deactivated the locks.
+// end: Inside Area Zero Station 2. Deactivated the locks.
+void checkpoint_96(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, EventNotificationOption& notif_error_recoverable, AutoStoryStats& stats, const std::string& checkpoint_text);
+
+// start: Inside Area Zero Station 2. Deactivated the locks.
+// end: Inside Area Zero Station 2. Deactivated the locks.
+void checkpoint_97(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, EventNotificationOption& notif_error_recoverable, AutoStoryStats& stats, const std::string& checkpoint_text);
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_37.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_37.cpp
new file mode 100644
index 0000000000..fa23e10b24
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_37.cpp
@@ -0,0 +1,362 @@
+/*  AutoStory
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/GlobalAutoPaths.h"
+//#include "CommonFramework/Exceptions/OperationFailedException.h"
+//#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h"
+#include "PokemonSV_AutoStoryTools.h"
+#include "PokemonSV_AutoStory_Segment_37.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+//#include <unordered_map>
+//#include <algorithm>
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+
+std::string AutoStory_Segment_37::name() const{
+    return "37: Area Zero Station 3";
+}
+
+std::string AutoStory_Segment_37::start_text() const{
+    return "Start: Inside Area Zero Station 2. Deactivated the locks.";
+}
+
+std::string AutoStory_Segment_37::end_text() const{
+    return "End: Inside Area Zero Station 3. Deactivated the locks.";
+}
+
+void AutoStory_Segment_37::run_segment(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    AutoStoryOptions options,
+    AutoStoryStats& stats
+) const{
+    
+
+    stats.m_segment++;
+    env.update_stats();
+    context.wait_for_all_requests();
+    env.console.log("Start Segment " + name(), COLOR_ORANGE);
+
+    AutoStory_Checkpoint_98().run_checkpoint(env, context, options, stats);
+    AutoStory_Checkpoint_99().run_checkpoint(env, context, options, stats);
+
+    context.wait_for_all_requests();
+    env.console.log("End Segment " + name(), COLOR_GREEN);
+
+}
+
+std::string AutoStory_Checkpoint_98::name() const{ return "098 - " + AutoStory_Segment_37().name(); }
+std::string AutoStory_Checkpoint_98::start_text() const{ return "Inside Area Zero Station 2. Deactivated the locks.";}
+std::string AutoStory_Checkpoint_98::end_text() const{ return "Inside Area Zero Station 3. Deactivated the locks.";}
+void AutoStory_Checkpoint_98::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_98(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+std::string AutoStory_Checkpoint_99::name() const{ return "099 - " + AutoStory_Segment_37().name(); }
+std::string AutoStory_Checkpoint_99::start_text() const{ return AutoStory_Checkpoint_98().end_text();}
+std::string AutoStory_Checkpoint_99::end_text() const{ return "Inside Area Zero Station 3. Deactivated the locks.";}
+void AutoStory_Checkpoint_99::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_99(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+void checkpoint_98(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, EventNotificationOption& notif_error_recoverable, AutoStoryStats& stats, const std::string& checkpoint_text){
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){
+
+        YOLOv5Detector yolo_detector(DOWNLOADED_RESOURCE_PATH() + "PokemonSV/AreaZero/A0-station-3.onnx");
+
+        pbf_move_left_joystick(context, {0, -1}, 1600ms, 800ms);
+        walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_ONLY, 10000ms, +1, 0);
+        clear_dialog(env.console, context, ClearDialogMode::STOP_PROMPT, 60, {CallbackEnum::PROMPT_DIALOG});
+        pbf_press_dpad(context, DPAD_DOWN, 104ms, 160ms);
+
+        pbf_mash_button(context, BUTTON_A, 400ms);
+        wait_for_overworld(env.program_info(), env.console, context, 30);
+
+
+
+        // arrived at research station 1
+
+        pbf_move_left_joystick(context, {-1, -1}, 2400ms, 800ms);
+        pbf_wait(context, 3000ms);
+        // wait for overworld after leaving research station
+        wait_for_overworld(env.program_info(), env.console, context, 30);
+
+
+        // left research station 1
+
+
+        // align to rock-3-0.  
+        // center before: center-y: 0.618056   center-x: 0.260156
+        // center after: center-y: 0.248611   center-x: 0.452344
+        move_camera_yolo(env, context, CameraAxis::Y, yolo_detector, "rock-3-0", 0.248611,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                move_player_to_realign_via_yolo(env, context, yolo_detector, "rock-3-0", 0.260156);  // x-position of target object prior to camera move
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }        
+        );
+        move_camera_yolo(env, context, CameraAxis::X, yolo_detector, "rock-3-0", 0.452344,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }        
+        );
+
+        // move forward until rock-3-0 not detected
+        move_forward_until_yolo_object_not_detected(env, context, yolo_detector, "rock-3-0", 
+            2,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                move_player_to_realign_via_yolo(env, context, yolo_detector, "rock-3-0", 0.452344);
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }
+        );
+
+
+        pbf_press_button(context, BUTTON_L, 240ms, 100ms);
+
+        move_camera_until_yolo_object_detected(env, context, yolo_detector, "waterfall-3-1", -1, 800ms);
+
+
+
+        // align to waterfall-3-1.  
+        // center before: y:0.22         x: 0.31
+        // center after: center-y: 0.220833   center-x: 0.754687
+        move_camera_yolo(env, context, CameraAxis::Y, yolo_detector, "waterfall-3-1", 0.220833,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                move_player_to_realign_via_yolo(env, context, yolo_detector, "waterfall-3-1", 0.31);  // x-position of target object prior to camera move
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }        
+        );
+        move_camera_yolo(env, context, CameraAxis::X, yolo_detector, "waterfall-3-1", 0.754687,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }        
+        );
+
+        // walk off the cliff
+
+
+        // move forward until we see rock-3-1
+        move_player_until_yolo_object_detected(env, context, yolo_detector, "rock-3-1", 
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+                pbf_press_button(context, BUTTON_L, 240ms, 100ms);
+                move_camera_yolo(env, context, CameraAxis::X, yolo_detector, "waterfall-3-1", 0.754687,
+                    [&](){
+                        run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                        pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+                    }        
+                );
+            },
+            30
+        );
+
+
+
+        // align to rock-3-1.  
+        // center before:  center-y: 0.538889   center-x: 0.384375
+        // center after: center-y: 0.295833   center-x: 0.577344
+        move_camera_yolo(env, context, CameraAxis::Y, yolo_detector, "rock-3-1", 0.295833,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                move_player_to_realign_via_yolo(env, context, yolo_detector, "rock-3-1", 0.4);  // x-position of target object prior to camera move
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }        
+        );
+        move_camera_yolo(env, context, CameraAxis::X, yolo_detector, "rock-3-1", 0.577344,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }        
+        );
+
+        // move forward until rock-3-1 not detected
+        move_forward_until_yolo_object_not_detected(env, context, yolo_detector, "rock-3-1", 
+            1,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                move_player_to_realign_via_yolo(env, context, yolo_detector, "rock-3-1", 0.577344);
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }
+        );
+
+        // align to tree-3-1.  
+        // center before: center-y: 0.189   center-x: 0.21
+        // center after: center-y: 0.318056   center-x: 0.522656
+        move_camera_yolo(env, context, CameraAxis::Y, yolo_detector, "tree-3-1", 0.318056,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                move_player_to_realign_via_yolo(env, context, yolo_detector, "tree-3-1", 0.3);  // x-position of target object prior to camera move
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }        
+        );
+        move_camera_yolo(env, context, CameraAxis::X, yolo_detector, "tree-3-1", 0.5,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }        
+        );
+
+        // move towards tree-3-1 until box:   {0.428125, 0.000000, 0.118750, 0.305556}
+        move_forward_until_yolo_object_above_min_size(env, context, yolo_detector, "tree-3-1",
+            0.118, 0.2,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                move_player_to_realign_via_yolo(env, context, yolo_detector, "tree-3-1", 0.5);  // realign to target X
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }
+        );
+
+        // align to tree-3-1.  
+        // center before: center-y: 0.150000   center-x: 0.517969
+        // center after: center-y: 0.151389   center-x: 0.358594
+        move_camera_yolo(env, context, CameraAxis::Y, yolo_detector, "tree-3-1", 0.151389,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                move_player_to_realign_via_yolo(env, context, yolo_detector, "tree-3-1", 0.5);  // x-position of target object prior to camera move
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }        
+        );
+        move_camera_yolo(env, context, CameraAxis::X, yolo_detector, "tree-3-1", 0.358594,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }        
+        );
+
+        // move forward until tree-3-1 not detected
+        move_forward_until_yolo_object_not_detected(env, context, yolo_detector, "tree-3-1", 
+            1,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                move_player_to_realign_via_yolo(env, context, yolo_detector, "tree-3-1", 0.5);
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }
+        );
+
+
+
+        pbf_move_right_joystick(context, {0, -1}, 1600ms, 0ms);
+        move_camera_until_yolo_object_detected(env, context, yolo_detector, "beyond-cliff-3", +1, 240ms);
+
+        move_camera_yolo(env, context, CameraAxis::X, yolo_detector, "beyond-cliff-3", 0.5,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                pbf_move_right_joystick(context, {0, -1}, 1600ms, 0ms);
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }        
+        );
+
+        // move towards beyond-cliff-3 until it takes up most of screen
+        move_forward_until_yolo_object_above_min_size(env, context, yolo_detector, "beyond-cliff-3",
+            0.5, 0.9,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                pbf_move_right_joystick(context, {0, -1}, 1600ms, 0ms);
+                
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }
+        );
+
+        // walked off cliff. now move backwards
+
+        pbf_move_left_joystick(context, {0, -1}, 6400ms, 400ms); // move forward to align with camera
+
+        pbf_press_button(context, BUTTON_L, 240ms, 100ms);
+
+        move_camera_until_yolo_object_detected(env, context, yolo_detector, "station-3", -1, 800ms);
+
+
+        move_camera_yolo(env, context, CameraAxis::X, yolo_detector, "station-3", 0.5,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }        
+        );
+
+
+        do_action_until_dialog(env.program_info(), env.console, context,
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                move_player_forward(env, context, 20,
+                    [&](){
+                        run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                        move_camera_yolo(env, context, CameraAxis::X, yolo_detector, "station-3", 0.5,
+                            [&](){
+                                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+                            } 
+                        );
+                        pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+                    }
+                );
+            }
+        );
+
+
+        clear_dialog(env.console, context, ClearDialogMode::STOP_BATTLE, 60, {CallbackEnum::BATTLE});
+        run_trainer_double_battle_press_A(env.console, context, BattleStopCondition::STOP_DIALOG);
+        mash_button_till_overworld(env.console, context, BUTTON_A);
+
+
+        YOLOv5Detector yolo_detector2(DOWNLOADED_RESOURCE_PATH() + "PokemonSV/AreaZero/station-door-1.onnx");  // we can reuse the detector for station door 1.
+
+        do_action_until_dialog(env.program_info(), env.console, context,
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_press_button(context, BUTTON_R, 160ms, 0ms);
+                move_player_forward(env, context, 20,
+                    [&](){
+                        run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                        move_camera_yolo(env, context, CameraAxis::X, yolo_detector2, "station-door-1", 0.5,
+                            [&](){
+                                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+                            } 
+                        );
+                        pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+                    }
+                );
+            }
+        );
+
+        mash_button_till_overworld(env.console, context, BUTTON_A);  // black dialog
+
+        // disable Lock at Station 3
+        walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_SPAM_A, 20000ms);
+        mash_button_till_overworld(env.console, context, BUTTON_A);  // black dialog, prompt
+
+    }, false);   
+}
+
+void checkpoint_99(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, EventNotificationOption& notif_error_recoverable, AutoStoryStats& stats, const std::string& checkpoint_text){
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){
+        // empty checkpoint
+
+    }, false);     
+}
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_37.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_37.h
new file mode 100644
index 0000000000..5a52ed6ae6
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_37.h
@@ -0,0 +1,59 @@
+/*  Autostory
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_AutoStory_Segment_37_H
+#define PokemonAutomation_PokemonSV_AutoStory_Segment_37_H
+
+#include "PokemonSV_AutoStoryTools.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+class AutoStory_Segment_37 : public AutoStory_Segment{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_segment(
+        SingleSwitchProgramEnvironment& env, 
+        ProControllerContext& context,
+        AutoStoryOptions options,
+        AutoStoryStats& stats
+    ) const override;
+};
+
+class AutoStory_Checkpoint_98 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+class AutoStory_Checkpoint_99 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+
+// start: Inside Area Zero Station 2. Deactivated the locks.
+// end: Inside Area Zero Station 3. Deactivated the locks.
+void checkpoint_98(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, EventNotificationOption& notif_error_recoverable, AutoStoryStats& stats, const std::string& checkpoint_text);
+
+// start: Inside Area Zero Station 3. Deactivated the locks.
+// end: Inside Area Zero Station 3. Deactivated the locks.
+void checkpoint_99(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, EventNotificationOption& notif_error_recoverable, AutoStoryStats& stats, const std::string& checkpoint_text);
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_38.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_38.cpp
new file mode 100644
index 0000000000..e761695963
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_38.cpp
@@ -0,0 +1,573 @@
+/*  AutoStory
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/GlobalAutoPaths.h"
+//#include "CommonFramework/Exceptions/OperationFailedException.h"
+//#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h"
+#include "PokemonSV_AutoStoryTools.h"
+#include "PokemonSV_AutoStory_Segment_38.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+//#include <unordered_map>
+//#include <algorithm>
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+
+std::string AutoStory_Segment_38::name() const{
+    return "38: Area Zero Station 4";
+}
+
+std::string AutoStory_Segment_38::start_text() const{
+    return "Start: Inside Area Zero Station 2. Deactivated the locks.";
+}
+
+std::string AutoStory_Segment_38::end_text() const{
+    return "End: Inside Area Zero Station 3. Deactivated the locks.";
+}
+
+void AutoStory_Segment_38::run_segment(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    AutoStoryOptions options,
+    AutoStoryStats& stats
+) const{
+    
+
+    stats.m_segment++;
+    env.update_stats();
+    context.wait_for_all_requests();
+    env.console.log("Start Segment " + name(), COLOR_ORANGE);
+
+    AutoStory_Checkpoint_100().run_checkpoint(env, context, options, stats);
+    AutoStory_Checkpoint_101().run_checkpoint(env, context, options, stats);
+
+    context.wait_for_all_requests();
+    env.console.log("End Segment " + name(), COLOR_GREEN);
+
+}
+
+std::string AutoStory_Checkpoint_100::name() const{ return "100 - " + AutoStory_Segment_38().name(); }
+std::string AutoStory_Checkpoint_100::start_text() const{ return "Inside Area Zero Station 3. Deactivated the locks.";}
+std::string AutoStory_Checkpoint_100::end_text() const{ return "Entered inner cave. Finished cutscene, admiring the waterfall/large crystals.";}
+void AutoStory_Checkpoint_100::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_100(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+std::string AutoStory_Checkpoint_101::name() const{ return "101 - " + AutoStory_Segment_38().name(); }
+std::string AutoStory_Checkpoint_101::start_text() const{ return AutoStory_Checkpoint_100().end_text();}
+std::string AutoStory_Checkpoint_101::end_text() const{ return "Inside Area Zero Station 4. Deactivated the locks.";}
+void AutoStory_Checkpoint_101::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_101(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+
+void checkpoint_100(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, EventNotificationOption& notif_error_recoverable, AutoStoryStats& stats, const std::string& checkpoint_text){
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){
+
+        YOLOv5Detector yolo_detector(DOWNLOADED_RESOURCE_PATH() + "PokemonSV/AreaZero/A0-station-4a.onnx");
+
+        pbf_move_left_joystick(context, {0, -1}, 3200ms, 800ms);
+        pbf_wait(context, 3000ms);
+        // wait for overworld after leaving research station
+        wait_for_overworld(env.program_info(), env.console, context, 30);
+
+        pbf_move_right_joystick(context, {0, -0.252}, 240ms, 0ms);  // adjust camera so that head doesn't cover the rock.
+
+
+
+        // align to rock-4-1.  
+        // center before: 
+        // center after: center-y: 0.295833   center-x: 0.511719
+        move_camera_yolo(env, context, CameraAxis::Y, yolo_detector, "rock-4-1", 0.295833,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                move_player_to_realign_via_yolo(env, context, yolo_detector, "rock-4-1", 0.5);  // x-position of target object prior to camera move
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }        
+        );
+        move_camera_yolo(env, context, CameraAxis::X, yolo_detector, "rock-4-1", 0.5,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }        
+        );
+
+        // move towards rock-4-1 until box:  {0.404688, 0.091667, 0.246875, 0.400000}
+        move_forward_until_yolo_object_above_min_size(env, context, yolo_detector, "rock-4-1",
+            0.24, 0.3950,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                move_player_to_realign_via_yolo(env, context, yolo_detector, "rock-4-1", 0.5);  // realign to target X
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }
+        );
+
+        // align to cave-entrance.  
+        // center before: y: 0.35    x: 0.211719
+        // center after:  center-y: 0.329167   center-x: 0.517188
+        move_camera_yolo(env, context, CameraAxis::Y, yolo_detector, "cave-entrance", 0.329167,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                move_player_to_realign_via_yolo(env, context, yolo_detector, "cave-entrance", 0.25);  // x-position of target object prior to camera move
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }        
+        );
+        move_camera_yolo(env, context, CameraAxis::X, yolo_detector, "cave-entrance", 0.5,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }        
+        );
+
+        // move forward until we see rock-4-2
+        move_player_until_yolo_object_detected(env, context, yolo_detector, "rock-4-2", 
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                move_camera_yolo(env, context, CameraAxis::X, yolo_detector, "cave-entrance", 0.5,
+                    [&](){
+                        run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                        pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+                    }        
+                );
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            },
+            30
+        );
+
+        move_player_forward(env, context, 2,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+            }
+        );
+
+        // align to rock-4-2.  
+        // center before: y: 0.463     x: 0.6085
+        // center after:  center-y: 0.295833   center-x: 0.550781
+        move_camera_yolo(env, context, CameraAxis::Y, yolo_detector, "rock-4-2", 0.295833,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                move_player_to_realign_via_yolo(env, context, yolo_detector, "rock-4-2", 0.6);  // x-position of target object prior to camera move
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }        
+        );
+        move_camera_yolo(env, context, CameraAxis::X, yolo_detector, "rock-4-2", 0.550781,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }        
+        );
+
+        // move towards rock-4-2 until box:  {0.595313, 0.263889, 0.089063, 0.086111}
+        move_forward_until_yolo_object_above_min_size(env, context, yolo_detector, "rock-4-2",
+            0.08, 0.086,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                move_player_to_realign_via_yolo(env, context, yolo_detector, "rock-4-2", 0.55);  // realign to target X
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }
+        );
+
+        // align to rock-4-3.  
+        // center before: Y: 0.211  x: 0.789
+        // center after: 0.181944   center-x: 0.503125
+        move_camera_yolo(env, context, CameraAxis::Y, yolo_detector, "rock-4-3", 0.181944,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                move_player_to_realign_via_yolo(env, context, yolo_detector, "rock-4-3", 0.75);  // x-position of target object prior to camera move
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }        
+        );
+        move_camera_yolo(env, context, CameraAxis::X, yolo_detector, "rock-4-3", 0.5,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }        
+        );
+
+        // move towards rock-4-3 until box:   {0.396875, 0.047222, 0.142187, 0.211111}
+        move_forward_until_yolo_object_above_min_size(env, context, yolo_detector, "rock-4-3",
+            0.142, 0.211,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                move_player_to_realign_via_yolo(env, context, yolo_detector, "rock-4-3", 0.5);  // realign to target X
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }
+        );
+
+        move_camera_until_yolo_object_detected(env, context, yolo_detector, "cave-archway-1", +1, 480ms);
+
+        move_camera_yolo(env, context, CameraAxis::X, yolo_detector, "cave-archway-1", 0.5,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }        
+        );
+
+        do_action_until_dialog(env.program_info(), env.console, context,
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                move_player_forward(env, context, 20,
+                    [&](){
+                        run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                        move_camera_yolo(env, context, CameraAxis::X, yolo_detector, "cave-archway-1", 0.5,
+                            [&](){
+                                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+                            } 
+                        );
+                        pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+                    }
+                );
+            }
+        );
+
+
+        mash_button_till_overworld(env.console, context, BUTTON_A);
+
+
+    }, false);     
+}
+
+void checkpoint_101(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, EventNotificationOption& notif_error_recoverable, AutoStoryStats& stats, const std::string& checkpoint_text){
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){
+
+
+        YOLOv5Detector yolo_detector(DOWNLOADED_RESOURCE_PATH() + "PokemonSV/AreaZero/A0-station-4b.onnx");
+
+        // align to crystal-4-1.  
+        // center before: X: 0.84
+        // center after: center-y: 0.195833   center-x: 0.621875
+        move_camera_yolo(env, context, CameraAxis::Y, yolo_detector, "crystal-4-1", 0.195833,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                move_player_to_realign_via_yolo(env, context, yolo_detector, "crystal-4-1", 0.8);  // x-position of target object prior to camera move
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }        
+        );
+        move_camera_yolo(env, context, CameraAxis::X, yolo_detector, "crystal-4-1", 0.621875,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }        
+        );
+
+        // move towards crystal-4-1 until box:   {0.804688, 0.075000, 0.187500, 0.338889}
+        move_forward_until_yolo_object_above_min_size(env, context, yolo_detector, "crystal-4-1",
+            0.1, 0.338,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                move_player_to_realign_via_yolo(env, context, yolo_detector, "crystal-4-1", 0.7);  // realign to target X
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }
+        );
+
+        // confirm we can see cave-archway-2. move left
+        move_player_until_yolo_object_detected(env, context, yolo_detector, "cave-archway-2", 
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+            },
+            5,
+            800ms,
+            -1, 0
+        );
+
+
+        // align to cave-archway-2.  
+        // center before: x: 0.7
+        // center after:  center-y: 0.173611   center-x: 0.531250
+        move_camera_yolo(env, context, CameraAxis::Y, yolo_detector, "cave-archway-2", 0.173611,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                move_player_to_realign_via_yolo(env, context, yolo_detector, "cave-archway-2", 0.7);  // x-position of target object prior to camera move
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }        
+        );
+        move_camera_yolo(env, context, CameraAxis::X, yolo_detector, "cave-archway-2", 0.531250,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }        
+        );
+
+        // move forward until cave-archway-2 not detected
+        move_forward_until_yolo_object_not_detected(env, context, yolo_detector, "cave-archway-2", 
+            3,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                move_player_to_realign_via_yolo(env, context, yolo_detector, "cave-archway-2", 0.5);
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }
+        );
+
+        move_camera_until_yolo_object_detected(env, context, yolo_detector, "crystal-4-3", +1, 480ms);
+
+        
+
+        // align to crystal-4-3.  
+        // center before: y:   x: 0.59
+        // center after: center-y: 0.390278   center-x: 0.495313
+        move_camera_yolo(env, context, CameraAxis::Y, yolo_detector, "crystal-4-3", 0.390278,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                move_player_to_realign_via_yolo(env, context, yolo_detector, "crystal-4-3", 0.59);  // x-position of target object prior to camera move
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }        
+        );
+        move_camera_yolo(env, context, CameraAxis::X, yolo_detector, "crystal-4-3", 0.5,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }        
+        );
+
+        // move towards crystal-4-3 until box:  {0.420313, 0.052778, 0.118750, 0.263889}
+        move_forward_until_yolo_object_above_min_size(env, context, yolo_detector, "crystal-4-3",
+            0.118750, 0.2,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                move_player_to_realign_via_yolo(env, context, yolo_detector, "crystal-4-3", 0.5);  // realign to target X
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }
+        );
+
+
+
+        // align to crystal-4-4.  
+        // center before: y:  x: 0.9
+        // center after: center-y: 0.184722   center-x: 0.524219
+        move_camera_yolo(env, context, CameraAxis::Y, yolo_detector, "crystal-4-4", 0.184722,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                move_player_to_realign_via_yolo(env, context, yolo_detector, "crystal-4-4", 0.9);  // x-position of target object prior to camera move
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }        
+        );
+        move_camera_yolo(env, context, CameraAxis::X, yolo_detector, "crystal-4-4", 0.5,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }        
+        );
+
+        // move towards crystal-4-4 until box:   {0.468750, 0.052778, 0.046875, 0.102778}
+        move_forward_until_yolo_object_above_min_size(env, context, yolo_detector, "crystal-4-4",
+            0.046875, 0.102778,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                move_player_to_realign_via_yolo(env, context, yolo_detector, "crystal-4-4", 0.5);  // realign to target X
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }
+        );
+
+
+        // align to crystal-4-4.  
+        // center before: y:  x: 
+        // center after: center-y: 0.375000   center-x: 0.492188
+        move_camera_yolo(env, context, CameraAxis::Y, yolo_detector, "crystal-4-4", 0.375,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                move_player_to_realign_via_yolo(env, context, yolo_detector, "crystal-4-4", 0.5);  // x-position of target object prior to camera move
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }        
+        );
+
+
+        // move towards crystal-4-4 until box:   {0.420313, 0.013889, 0.118750, 0.283333}
+        move_forward_until_yolo_object_above_min_size(env, context, yolo_detector, "crystal-4-4",
+            0.118750, 0.25,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                move_player_to_realign_via_yolo(env, context, yolo_detector, "crystal-4-4", 0.5);  // realign to target X
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }
+        );
+
+        pbf_move_right_joystick(context, {0, -0.252}, 240ms, 0ms);  // adjust camera so that head doesn't cover the crystal.
+  
+        move_camera_until_yolo_object_detected(env, context, yolo_detector, "crystal-4-5", +1, 240ms);
+
+
+        // align to crystal-4-5.  
+        // center before: y:  x: 0.75
+        // center after: center-y: 0.288889   center-x: 0.564844
+        move_camera_yolo(env, context, CameraAxis::Y, yolo_detector, "crystal-4-5", 0.288889,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                move_player_to_realign_via_yolo(env, context, yolo_detector, "crystal-4-5", 0.75);  // x-position of target object prior to camera move
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }        
+        );
+        move_camera_yolo(env, context, CameraAxis::X, yolo_detector, "crystal-4-5", 0.5,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }        
+        );
+
+        // move towards crystal-4-5 until box:  {0.407813, 0.152778, 0.207813, 0.400000}
+        move_forward_until_yolo_object_above_min_size(env, context, yolo_detector, "crystal-4-5",
+            0.207813, 0.400000,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                move_player_to_realign_via_yolo(env, context, yolo_detector, "crystal-4-5", 0.5);  // realign to target X
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }
+        );
+
+        // confirm we can see station-crystal-4. move left
+        move_player_until_yolo_object_detected(env, context, yolo_detector, "station-crystal-4", 
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+            },
+            5,
+            800ms,
+            -1, 0
+        );
+
+        // align to station-crystal-4.  
+        // center before: y:    x: 0.67
+        // center after: center-y: 0.456944   center-x: 0.539844
+        move_camera_yolo(env, context, CameraAxis::Y, yolo_detector, "station-crystal-4", 0.45,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                move_player_to_realign_via_yolo(env, context, yolo_detector, "station-crystal-4", 0.67);  // x-position of target object prior to camera move
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }        
+        );
+        move_camera_yolo(env, context, CameraAxis::X, yolo_detector, "station-crystal-4", 0.539844,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }        
+        );
+
+        // move towards station-crystal-4 until box:  {0.423438, 0.144444, 0.393750, 0.211111}
+        move_forward_until_yolo_object_above_min_size(env, context, yolo_detector, "station-crystal-4",
+            0.393, 0.2111,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                move_player_to_realign_via_yolo(env, context, yolo_detector, "station-crystal-4", 0.58);  // realign to target X
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }
+        );
+
+        // align to station-4.  
+        // center before: y:   x: 0.87
+        // center after: center-y: 0.231944   center-x: 0.496875
+        move_camera_yolo(env, context, CameraAxis::Y, yolo_detector, "station-4", 0.231944,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                move_player_to_realign_via_yolo(env, context, yolo_detector, "station-4", 0.87);  // x-position of target object prior to camera move
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }        
+        );
+        move_camera_yolo(env, context, CameraAxis::X, yolo_detector, "station-4", 0.5,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }        
+        );
+
+        // move towards station-4 until box:  {0.339063, 0.002778, 0.284375, 0.277778}
+        move_forward_until_yolo_object_above_min_size(env, context, yolo_detector, "station-4",
+            0.284375, 0.2,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                move_player_to_realign_via_yolo(env, context, yolo_detector, "station-4", 0.5);  // realign to target X
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }
+        );
+
+        // align to station-door-4.  
+        // center before: y:   x: 0.53
+        // center after: center-y: 0.227778   center-x: 0.354688
+        move_camera_yolo(env, context, CameraAxis::Y, yolo_detector, "station-door-4", 0.227778,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                move_player_to_realign_via_yolo(env, context, yolo_detector, "station-door-4", 0.5);  // x-position of target object prior to camera move
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }        
+        );
+        move_camera_yolo(env, context, CameraAxis::X, yolo_detector, "station-door-4", 0.354688,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }        
+        );
+
+        // move towards station-door-4 until box:  {0.056250, 0.194444, 0.184375, 0.316667}
+        move_forward_until_yolo_object_above_min_size(env, context, yolo_detector, "station-door-4",
+            0.1, 0.316,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                move_player_to_realign_via_yolo(env, context, yolo_detector, "station-door-4", 0.3);  // realign to target X
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }
+        );
+
+        // align to station-door-4.  
+        // center before: 
+        // center after: center-y: 0.318056   center-x: 0.514844
+        move_camera_yolo(env, context, CameraAxis::X, yolo_detector, "station-door-4", 0.5,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }        
+        );
+        move_camera_yolo(env, context, CameraAxis::Y, yolo_detector, "station-door-4", 0.318056,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                move_player_to_realign_via_yolo(env, context, yolo_detector, "station-door-4", 0.5);
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }        
+        );
+
+
+        do_action_until_dialog(env.program_info(), env.console, context,
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                move_player_forward(env, context, 20,
+                    [&](){
+                        run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                        move_camera_yolo(env, context, CameraAxis::X, yolo_detector, "station-door-4", 0.5,
+                            [&](){
+                                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+                            } 
+                        );
+                        pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+                    }
+                );
+            }
+        );
+
+
+        clear_dialog(env.console, context, ClearDialogMode::STOP_OVERWORLD, 120, {CallbackEnum::OVERWORLD, CallbackEnum::BLACK_DIALOG_BOX});
+        pbf_move_left_joystick(context, {0, +1}, 800ms, 0ms);
+        // disable Lock at Station 4
+        walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_SPAM_A, 20000ms);
+        mash_button_till_overworld(env.console, context, BUTTON_A);  // black dialog, prompt
+
+        
+    }, false);
+}
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_38.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_38.h
new file mode 100644
index 0000000000..1ac6826492
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_38.h
@@ -0,0 +1,60 @@
+/*  Autostory
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_AutoStory_Segment_38_H
+#define PokemonAutomation_PokemonSV_AutoStory_Segment_38_H
+
+#include "PokemonSV_AutoStoryTools.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+class AutoStory_Segment_38 : public AutoStory_Segment{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_segment(
+        SingleSwitchProgramEnvironment& env, 
+        ProControllerContext& context,
+        AutoStoryOptions options,
+        AutoStoryStats& stats
+    ) const override;
+};
+
+
+class AutoStory_Checkpoint_100 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+class AutoStory_Checkpoint_101 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+
+// start: Inside Area Zero Station 3. Deactivated the locks.
+// end: Entered inner cave. Finished cutscene, admiring the waterfall/large crystals.
+void checkpoint_100(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, EventNotificationOption& notif_error_recoverable, AutoStoryStats& stats, const std::string& checkpoint_text);
+
+// start: Entered inner cave. Finished cutscene, admiring the waterfall/large crystals.
+// end: Inside Area Zero Station 4. Deactivated the locks.
+void checkpoint_101(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, EventNotificationOption& notif_error_recoverable, AutoStoryStats& stats, const std::string& checkpoint_text);
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_39.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_39.cpp
new file mode 100644
index 0000000000..21518003fc
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_39.cpp
@@ -0,0 +1,309 @@
+/*  AutoStory
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/GlobalAutoPaths.h"
+//#include "CommonFramework/Exceptions/OperationFailedException.h"
+//#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h"
+#include "PokemonSV_AutoStoryTools.h"
+#include "PokemonSV_AutoStory_Segment_39.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+//#include <unordered_map>
+//#include <algorithm>
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+
+std::string AutoStory_Segment_39::name() const{
+    return "39: Zero Lab";
+}
+
+std::string AutoStory_Segment_39::start_text() const{
+    return "Start: Inside Area Zero Station 4. Deactivated the locks.";
+}
+
+std::string AutoStory_Segment_39::end_text() const{
+    return "End: Entered Zero Lab. Spoke to AI Professor.";
+}
+
+void AutoStory_Segment_39::run_segment(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    AutoStoryOptions options,
+    AutoStoryStats& stats
+) const{
+    
+
+    stats.m_segment++;
+    env.update_stats();
+    context.wait_for_all_requests();
+    env.console.log("Start Segment " + name(), COLOR_ORANGE);
+
+    AutoStory_Checkpoint_102().run_checkpoint(env, context, options, stats);
+    AutoStory_Checkpoint_103().run_checkpoint(env, context, options, stats);
+
+    context.wait_for_all_requests();
+    env.console.log("End Segment " + name(), COLOR_GREEN);
+
+}
+
+std::string AutoStory_Checkpoint_102::name() const{ return "102 - " + AutoStory_Segment_39().name(); }
+std::string AutoStory_Checkpoint_102::start_text() const{ return "Inside Area Zero Station 4. Deactivated the locks.";}
+std::string AutoStory_Checkpoint_102::end_text() const{ return "Opened Zero lab. Defeated Paradox Pokemon.";}
+void AutoStory_Checkpoint_102::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_102(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+std::string AutoStory_Checkpoint_103::name() const{ return "103 - " + AutoStory_Segment_39().name(); }
+std::string AutoStory_Checkpoint_103::start_text() const{ return AutoStory_Checkpoint_102().end_text();}
+std::string AutoStory_Checkpoint_103::end_text() const{ return "";}
+void AutoStory_Checkpoint_103::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_103(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+
+void checkpoint_102(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, EventNotificationOption& notif_error_recoverable, AutoStoryStats& stats, const std::string& checkpoint_text){
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){
+
+        YOLOv5Detector yolo_detector(DOWNLOADED_RESOURCE_PATH() + "PokemonSV/AreaZero/A0-lab.onnx");
+
+        pbf_move_left_joystick(context, {0, -1}, 1600ms, 800ms);
+        walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_ONLY, 10000ms, +1, 0);
+        clear_dialog(env.console, context, ClearDialogMode::STOP_PROMPT, 60, {CallbackEnum::PROMPT_DIALOG});
+        pbf_press_dpad(context, DPAD_DOWN, 104ms, 160ms);
+        pbf_press_dpad(context, DPAD_DOWN, 104ms, 160ms);
+
+        // go to Station 2
+        pbf_mash_button(context, BUTTON_A, 400ms);
+        wait_for_overworld(env.program_info(), env.console, context, 30);
+
+        // heal at the bed
+        pbf_move_left_joystick(context, {0, +1}, 2400ms, 800ms);
+        walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_SPAM_A, 10000ms, +1, 0);
+        clear_dialog(env.console, context, ClearDialogMode::STOP_OVERWORLD, 60, {CallbackEnum::PROMPT_DIALOG, CallbackEnum::OVERWORLD});
+
+        // leave Station 2
+        pbf_move_left_joystick(context, {-0.609, -1}, 1040ms, 160ms);
+
+        pbf_move_left_joystick(context, {0, -1}, 3200ms, 800ms);
+        pbf_wait(context, 3000ms);
+        // wait for overworld after leaving research station
+        wait_for_overworld(env.program_info(), env.console, context, 30);
+
+        pbf_move_right_joystick(context, {+0.409, 0}, 240ms, 0ms);  // adjust camera so rock isn't at edge of screen.
+
+
+        // align to rock-5-1.  
+        // center before:   y:     x: 
+        // center after: center-y: 0.347222   center-x: 0.664844
+        move_camera_yolo(env, context, CameraAxis::Y, yolo_detector, "rock-5-1", 0.347222,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                move_player_to_realign_via_yolo(env, context, yolo_detector, "rock-5-1", 0.5000);  // x-position of target object prior to camera move
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }        
+        );
+        move_camera_yolo(env, context, CameraAxis::X, yolo_detector, "rock-5-1", 0.664844,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }        
+        );
+
+        // move forward until we see rock-5-2
+        move_player_until_yolo_object_detected(env, context, yolo_detector, "rock-5-2", 
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            },
+            30
+        );
+
+        // align to rock-5-2.  
+        // center before:   y:     x: 
+        // center after: center-y: 0.158333   center-x: 0.568750
+        move_camera_yolo(env, context, CameraAxis::Y, yolo_detector, "rock-5-2", 0.158333,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                move_player_to_realign_via_yolo(env, context, yolo_detector, "rock-5-2", 0.5000);  // x-position of target object prior to camera move
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }        
+        );
+        move_camera_yolo(env, context, CameraAxis::X, yolo_detector, "rock-5-2", 0.568750,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }        
+        );
+
+        // move towards rock-5-2 until box:  (0.2535, 0.25)  OR (0.34, 0.375)
+        move_forward_until_yolo_object_above_min_size(env, context, yolo_detector, "rock-5-2",
+            0.25, 0.3,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                move_player_to_realign_via_yolo(env, context, yolo_detector, "rock-5-2", 0.000);  // realign to target X
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }
+        );
+
+        pbf_move_right_joystick(context, {0, -1}, 1600ms, 0ms);
+        move_camera_until_yolo_object_detected(env, context, yolo_detector, "beyond-cliff-5", -1, 480ms);
+
+        move_camera_yolo(env, context, CameraAxis::X, yolo_detector, "beyond-cliff-5", 0.5,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                pbf_move_right_joystick(context, {0, -1}, 1600ms, 0ms);
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }        
+        );
+
+        // move towards beyond-cliff-5 until it takes up most of screen
+        move_forward_until_yolo_object_above_min_size(env, context, yolo_detector, "beyond-cliff-5",
+            0.5, 0.9,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                pbf_move_right_joystick(context, {0, -1}, 1600ms, 0ms);
+                
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }
+        );
+
+        // walked off cliff. now move backwards
+        walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_ONLY, 60000ms, 0, -1);  // move backwards until dialog detected
+
+
+        mash_button_till_overworld(env.console, context, BUTTON_A);
+
+        
+
+        // align to gate-panel.  
+        // center before:   y:     x: 
+        // center after: center-y: 0.295833   center-x: 0.517969
+        move_camera_yolo(env, context, CameraAxis::Y, yolo_detector, "gate-panel", 0.295833,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }        
+        );
+        move_camera_yolo(env, context, CameraAxis::X, yolo_detector, "gate-panel", 0.5,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }        
+        );
+        
+        do_action_until_dialog(env.program_info(), env.console, context,
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                move_player_forward(env, context, 10,
+                    [&](){
+                        run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                        move_camera_yolo(env, context, CameraAxis::X, yolo_detector, "gate-panel", 0.5,
+                            [&](){
+                                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+                            } 
+                        );
+                        pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+                    }, 
+                    false,
+                    true
+                );
+            }
+        );
+
+
+        clear_dialog(env.console, context, ClearDialogMode::STOP_BATTLE, 60, {CallbackEnum::BATTLE, CallbackEnum::PROMPT_DIALOG});
+
+        // battle Paradox 1
+        run_trainer_double_battle_press_A(env.console, context, BattleStopCondition::STOP_DIALOG);
+        clear_dialog(env.console, context, ClearDialogMode::STOP_BATTLE, 60, {CallbackEnum::BATTLE});
+
+        // battle Paradox 2
+        run_trainer_double_battle_press_A(env.console, context, BattleStopCondition::STOP_DIALOG);
+        clear_dialog(env.console, context, ClearDialogMode::STOP_BATTLE, 60, {CallbackEnum::BATTLE});
+
+        // battle Paradox 3
+        run_trainer_double_battle_press_A(env.console, context, BattleStopCondition::STOP_DIALOG);
+        clear_dialog(env.console, context, ClearDialogMode::STOP_OVERWORLD, 60, {CallbackEnum::OVERWORLD, CallbackEnum::PROMPT_DIALOG});
+
+
+        #if 0
+        // align to rock.  
+        // center before:   y:     x: 
+        // center after: 
+        move_camera_yolo(env, context, CameraAxis::Y, yolo_detector, "rock", 0.000,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                move_player_to_realign_via_yolo(env, context, yolo_detector, "rock", 0.5000);  // x-position of target object prior to camera move
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }        
+        );
+        move_camera_yolo(env, context, CameraAxis::X, yolo_detector, "rock", 0.000,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }        
+        );
+
+        // move towards rock until box:  
+        move_forward_until_yolo_object_above_min_size(env, context, yolo_detector, "rock",
+            0.000, 0.000,
+            [&](){
+                run_wild_battle_press_A(env.console, context, BattleStopCondition::STOP_OVERWORLD);
+                move_player_to_realign_via_yolo(env, context, yolo_detector, "rock", 0.000);  // realign to target X
+                pbf_move_left_joystick(context, {0, +1}, 80ms, 400ms); // move forward to align with camera
+            }
+        );
+
+        #endif  
+    }, false);
+}
+
+void checkpoint_103(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, EventNotificationOption& notif_error_recoverable, AutoStoryStats& stats, const std::string& checkpoint_text){
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){
+
+        do_action_and_monitor_for_battles(env.program_info(), env.console, context,
+            [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                pbf_press_button(context, BUTTON_L, 240ms, 80ms);
+                pbf_move_left_joystick(context, {+1, 0}, 560ms, 400ms);
+
+                pbf_move_left_joystick(context, {-0.141, +1}, 80ms, 400ms);
+                pbf_press_button(context, BUTTON_L, 240ms, 80ms);
+
+                pbf_move_left_joystick(context, {0, +1}, 4800ms, 400ms);
+                wait_for_overworld(env.program_info(), env.console, context, 30);
+                
+            }
+        ); 
+
+        pbf_move_left_joystick(context, {0, +1}, 2400ms, 400ms);
+        pbf_move_left_joystick(context, {+1, 0}, 1600ms, 400ms);
+
+        walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_ONLY, 10000ms);
+        mash_button_till_overworld(env.console, context, BUTTON_A);
+
+    }, false);
+}
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_39.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_39.h
new file mode 100644
index 0000000000..41dd383fa3
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_39.h
@@ -0,0 +1,60 @@
+/*  Autostory
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_AutoStory_Segment_39_H
+#define PokemonAutomation_PokemonSV_AutoStory_Segment_39_H
+
+#include "PokemonSV_AutoStoryTools.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+class AutoStory_Segment_39 : public AutoStory_Segment{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_segment(
+        SingleSwitchProgramEnvironment& env, 
+        ProControllerContext& context,
+        AutoStoryOptions options,
+        AutoStoryStats& stats
+    ) const override;
+};
+
+class AutoStory_Checkpoint_102 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+class AutoStory_Checkpoint_103 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+
+
+// start: Inside Area Zero Station 4. Deactivated the locks.
+// end: Opened Zero lab. Defeated Paradox Pokemon.
+void checkpoint_102(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, EventNotificationOption& notif_error_recoverable, AutoStoryStats& stats, const std::string& checkpoint_text);
+
+// start: Opened Zero lab. Defeated Paradox Pokemon.
+// end: Entered Zero Lab. Spoke to AI Professor.
+void checkpoint_103(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, EventNotificationOption& notif_error_recoverable, AutoStoryStats& stats, const std::string& checkpoint_text);
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_40.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_40.cpp
new file mode 100644
index 0000000000..0682ba3248
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_40.cpp
@@ -0,0 +1,182 @@
+/*  AutoStory
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "VideoGames/PokemonSV/Programs/Battles/PokemonSV_SinglesBattler.h"
+#include "VideoGames/PokemonSV/Inference/PokemonSV_TutorialDetector.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h"
+#include "PokemonSV_AutoStoryTools.h"
+#include "PokemonSV_AutoStory_Segment_40.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+//#include <unordered_map>
+//#include <algorithm>
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+
+std::string AutoStory_Segment_40::name() const{
+    return "40: Finish Main Story";
+}
+
+std::string AutoStory_Segment_40::start_text() const{
+    return "Start: Entered Zero Lab. Spoke to AI Professor.";
+}
+
+std::string AutoStory_Segment_40::end_text() const{
+    return "End: Battled the AI Professor. Completed the game.";
+}
+
+void AutoStory_Segment_40::run_segment(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    AutoStoryOptions options,
+    AutoStoryStats& stats
+) const{
+    
+
+    stats.m_segment++;
+    env.update_stats();
+    context.wait_for_all_requests();
+    env.console.log("Start Segment " + name(), COLOR_ORANGE);
+
+    AutoStory_Checkpoint_104().run_checkpoint(env, context, options, stats);
+
+    context.wait_for_all_requests();
+    env.console.log("End Segment " + name(), COLOR_GREEN);
+
+}
+
+std::string AutoStory_Checkpoint_104::name() const{ return "104 - " + AutoStory_Segment_40().name(); }
+std::string AutoStory_Checkpoint_104::start_text() const{ return "Entered Zero Lab. Spoke to AI Professor.";}
+std::string AutoStory_Checkpoint_104::end_text() const{ return "Battled the AI Professor. Completed the game.";}
+void AutoStory_Checkpoint_104::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+    checkpoint_104(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+}
+
+// std::string AutoStory_Checkpoint_105::name() const{ return "105 - " + AutoStory_Segment_40().name(); }
+// std::string AutoStory_Checkpoint_105::start_text() const{ return "";}
+// std::string AutoStory_Checkpoint_105::end_text() const{ return "";}
+// void AutoStory_Checkpoint_105::run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const{
+//     checkpoint_105(env, context, options.notif_status_update, options.notif_error_recoverable, stats, checkpoint_text());
+// }
+
+void checkpoint_104(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, EventNotificationOption& notif_error_recoverable, AutoStoryStats& stats, const std::string& checkpoint_text){
+    checkpoint_reattempt_loop(env, context, notif_status_update, notif_error_recoverable, stats, checkpoint_text,
+    [&](size_t attempt_number){
+
+        pbf_press_button(context, BUTTON_L, 240ms, 80ms);
+        pbf_move_left_joystick(context, {0, +1}, 3200ms, 400ms);
+        pbf_move_left_joystick(context, {-1, 0}, 1040ms, 400ms);
+        walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_SPAM_A, 10000ms);
+
+        // now in elevator
+        mash_button_till_overworld(env.console, context, BUTTON_A);
+
+        pbf_move_left_joystick(context, {+1, 0}, 560ms, 400ms);
+
+        // talk to the AI professor
+        walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_SPAM_A, 10000ms);
+        mash_button_till_overworld(env.console, context, BUTTON_A);
+
+        // put the book in the machine
+        pbf_press_button(context, BUTTON_L, 240ms, 80ms);
+        walk_forward_until_dialog(env.program_info(), env.console, context, NavigationMovementMode::DIRECTIONAL_SPAM_A, 10000ms);
+
+
+        clear_dialog(env.console, context, ClearDialogMode::STOP_BATTLE, 120, {CallbackEnum::BATTLE, CallbackEnum::PROMPT_DIALOG, CallbackEnum::DIALOG_ARROW});
+
+
+        env.console.log("Battle AI Professor.");
+        SinglesMoveEntry move1{SinglesMoveType::Move1, false};  // Moonblast
+        SinglesMoveEntry move3{SinglesMoveType::Move3, false}; // Psychic
+        
+
+        std::vector<SinglesMoveEntry> move_table1 = {move3, move1};
+        bool terastallized = false;
+        // start with Psychic to defeat Iron Moth for Violet, which quad resists Moonblast.
+        bool is_won = run_pokemon(env.console, context, move_table1, true, terastallized);
+        if (!is_won){// throw exception if we lose
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "Failed to beat the AI Professor. Reset.",
+                env.console
+            );
+        }
+
+        
+        clear_dialog(env.console, context, ClearDialogMode::STOP_BATTLE_DIALOG_ARROW, 120, {CallbackEnum::DIALOG_ARROW}, false);
+
+        pbf_mash_button(context, BUTTON_A, 400ms);
+
+
+        wait_for_gradient_arrow(env.program_info(), env.console, context, {0.75, 0.62, 0.05, 0.35}, 30);
+
+        pbf_press_dpad(context, DPAD_DOWN, 104ms, 160ms);
+        pbf_mash_button(context, BUTTON_A, 160ms);
+
+        pbf_wait(context, 1000ms);
+        pbf_press_dpad(context, DPAD_UP, 104ms, 160ms);
+        pbf_mash_button(context, BUTTON_A, 4000ms);
+
+        env.console.log("Battle AI Professor's Koraidon/Miraidon.");
+        SinglesMoveEntry move4{SinglesMoveType::Move4, false}; // Koraidon/Miraidon: Tera Blast
+        SinglesMoveEntry move4_tera{SinglesMoveType::Move4, true}; // Koraidon/Miraidon: Tera Blast
+        std::vector<SinglesMoveEntry> move_table2 = {move4, move4, move4, move4, move4, move4_tera};
+        is_won = run_pokemon(env.console, context, move_table2, true, terastallized);
+        if (!is_won){// throw exception if we lose
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "Failed to beat the AI Professor, round 2. This shouldn't be possible. Reset.",
+                env.console
+            );
+        }
+
+        mash_button_till_overworld(env.console, context, BUTTON_A, 800);
+
+        env.console.log("Clear Koraidon/Miraidon form change tutorial.");
+        // Press X until tutorial shows up
+        TutorialWatcher tutorial;
+        int ret = run_until<ProControllerContext>(
+            env.console, context,
+            [](ProControllerContext& context){
+                for (int i = 0; i < 10; i++){
+                    pbf_press_button(context, BUTTON_X, 160ms, 2000ms);
+                }
+            },
+            {tutorial}
+        );
+        if (ret < 0){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "Stuck trying to clear the Koraidon/Miraidon form change tutorial.",
+                env.console
+            );  
+        }
+        clear_tutorial(env.console, context);
+
+
+    }, false);
+}
+
+// void checkpoint_105(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, EventNotificationOption& notif_error_recoverable, AutoStoryStats& stats, const std::string& checkpoint_text){
+// }
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_40.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_40.h
new file mode 100644
index 0000000000..4439bb4a41
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_40.h
@@ -0,0 +1,62 @@
+/*  Autostory
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_AutoStory_Segment_40_H
+#define PokemonAutomation_PokemonSV_AutoStory_Segment_40_H
+
+#include "PokemonSV_AutoStoryTools.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+class AutoStory_Segment_40 : public AutoStory_Segment{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_segment(
+        SingleSwitchProgramEnvironment& env, 
+        ProControllerContext& context,
+        AutoStoryOptions options,
+        AutoStoryStats& stats
+    ) const override;
+};
+
+
+class AutoStory_Checkpoint_104 : public AutoStory_Checkpoint{
+public:
+    virtual std::string name() const override;
+    virtual std::string start_text() const override;
+    virtual std::string end_text() const override;
+    virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+};
+
+// class AutoStory_Checkpoint_105 : public AutoStory_Checkpoint{
+// public:
+//     virtual std::string name() const override;
+//     virtual std::string start_text() const override;
+//     virtual std::string end_text() const override;
+//     virtual void run_checkpoint(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AutoStoryOptions options, AutoStoryStats& stats) const override;
+// };
+
+
+// start: Entered Zero Lab. Spoke to AI Professor.
+// end: Battled the AI Professor. Completed the game.
+void checkpoint_104(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, EventNotificationOption& notif_error_recoverable, AutoStoryStats& stats, const std::string& checkpoint_text);
+
+// // start: 
+// // end: 
+// void checkpoint_105(SingleSwitchProgramEnvironment& env, ProControllerContext& context, EventNotificationOption& notif_status_update, EventNotificationOption& notif_error_recoverable, AutoStoryStats& stats, const std::string& checkpoint_text);
+
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_MenuOption.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_MenuOption.cpp
new file mode 100644
index 0000000000..b6ce0d5856
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_MenuOption.cpp
@@ -0,0 +1,219 @@
+/*  Menu Option Session
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <algorithm>
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonTools/OCR/OCR_NumberReader.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "VideoGames/PokemonSV/Inference/PokemonSV_MenuOptionReader.h"
+#include "PokemonSV_MenuOption.h"
+
+//#include <iostream>
+// using std::cout;
+// using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+MenuOption::~MenuOption() = default;
+
+MenuOption::MenuOption(
+    VideoStream& stream,
+    ProControllerContext& context,
+    Language language
+)
+    : m_stream(stream)
+    , m_context(context)
+    , m_language(language)
+    , m_overlays(stream.overlay())
+    , m_arrow(COLOR_CYAN, GradientArrowType::RIGHT, {0.02, 0.10, 0.05, 0.80})
+{
+    // reader.make_overlays(m_overlays);
+    for (size_t c = 0; c < 10; c++){
+        m_boxes_item[c] = ImageFloatBox(0.055, 0.135 + c * 0.0739, 0.260, 0.060);
+        m_boxes_toggle[c] = ImageFloatBox(0.345, 0.135 + c * 0.0739, 0.175, 0.060);
+        m_overlays.add(COLOR_BLUE, m_boxes_item[c]);
+        m_overlays.add(COLOR_BLUE, m_boxes_toggle[c]);
+    }
+}
+
+void MenuOption::set_options(
+    const std::vector<std::pair<MenuOptionItemEnum, std::vector<MenuOptionToggleEnum>>>& options
+) const{
+    for (std::pair<MenuOptionItemEnum, std::vector<MenuOptionToggleEnum>> option : options){
+        move_to_option(option.first);
+        set_target_option(option.second);
+    }
+}
+
+void MenuOption::set_target_option(const std::vector<MenuOptionToggleEnum>& target_option_toggle_list) const{
+
+    for (size_t attempt = 0; attempt < 10; attempt++){
+        std::string current_option_slug = read_option_toggle();
+        MenuOptionToggleEnum current_option_toggle_enum = menu_option_toggle_lookup_by_slug(current_option_slug).enum_value;
+        
+        if (std::find(target_option_toggle_list.begin(), target_option_toggle_list.end(), current_option_toggle_enum) != target_option_toggle_list.end()){
+            return;
+        }
+
+        pbf_press_dpad(m_context, DPAD_RIGHT, 80ms, 400ms);
+    }
+
+    OperationFailedExceptionWithScreenshot::fire(
+        ErrorReportMode::SEND_ERROR_REPORT,
+        "MenuOption::set_target_option(): Unable to set option to the correct toggle.",
+        m_stream
+    );
+
+}
+
+int8_t MenuOption::get_selected_index(const ImageViewRGB32& screen) const {
+    m_context.wait_for_all_requests();
+    ImageFloatBox box;
+    if (!m_arrow.detect(box, screen)){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "MenuOption::get_selected_index(): Unable to find cursor.\n"
+            "We expect to be in the Options screen. Ensure you selected the correct Autostory start segment.",
+            m_stream
+        );
+    }
+
+//    cout << box.y << endl;
+    double slot = (box.y - 0.135185) / 0.0739;
+    int8_t selected_index = (int8_t)(slot + 0.5);
+
+    if (selected_index < 0 || selected_index >= 10){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "MenuOption::get_selected_index(): Invalid cursor slot.",
+            m_stream
+        );
+    }
+    // cout << "selected index:" + std::to_string(selected_index) << endl;
+
+    return selected_index;
+}
+
+std::string MenuOption::read_option(const ImageViewRGB32& cropped) const{
+    // cropped.save("test.png");
+    const auto ocr_result = MenuOptionReader::instance().read_substring(
+        m_stream.logger(),
+        m_language,
+        cropped, OCR::BLACK_TEXT_FILTERS()
+    );
+
+    std::multimap<double, OCR::StringMatchData> results;
+    if (!ocr_result.results.empty()){
+        for (const auto& result : ocr_result.results){
+            results.emplace(result.first, result.second);
+        }
+    }
+
+    if (results.empty()){
+        if (m_language == Language::German){
+            // German Menu Option uses numbers for text speed settings, which string OCR has trouble with detecting.
+            int16_t number = read_number(m_stream.logger(), cropped);
+            switch (number){
+                case 1:
+                    return "slow";
+                case 2:
+                    return "normal";
+                case 3:
+                    return "fast";
+            }
+        }
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "MenuOption::read_option(): Unable to read item. No results returned.",
+            m_stream
+        );        
+    }
+
+    if (results.size() > 1){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "MenuOption::read_option(): Unable to read item. Ambiguous or multiple results.\n" + language_warning(m_language),
+            m_stream
+        );
+    }
+
+    return results.begin()->second.token;
+}
+
+int16_t MenuOption::read_number(
+    Logger& logger, 
+    const ImageViewRGB32& cropped
+) const{
+
+    int16_t number = (int16_t)OCR::read_number_waterfill(logger, cropped, 0xff000000, 0xff808080);
+
+    if (number < 1 || number > 3){
+        number = -1; 
+    }
+    return (int16_t)number;
+}
+
+std::string MenuOption::read_option_item() const{
+    m_context.wait_for_all_requests();
+    VideoSnapshot screen = m_stream.video().snapshot();
+    
+    ImageFloatBox selected_box = m_boxes_item[get_selected_index(screen)];
+    ImageViewRGB32 cropped = extract_box_reference(screen, selected_box);
+    return read_option(cropped);
+
+}
+
+std::string MenuOption::read_option_toggle() const{
+    m_context.wait_for_all_requests();
+    VideoSnapshot screen = m_stream.video().snapshot();
+
+    ImageFloatBox selected_box = m_boxes_toggle[get_selected_index(screen)];
+    ImageViewRGB32 cropped = extract_box_reference(screen, selected_box);
+
+    return read_option(cropped);
+}
+
+
+void MenuOption::move_to_option(const MenuOptionItemEnum target_option_enum) const{
+    std::string current_option_slug = read_option_item();
+    MenuOptionItem current_option = menu_option_item_lookup_by_slug(current_option_slug);
+
+    const MenuOptionItem& target_option = menu_option_item_lookup_by_enum(target_option_enum);
+    std::string target_option_slug = target_option.slug;
+    int diff = target_option.index - current_option.index;
+    // cout << "target_option diff: " << std::to_string(target_option.index) << endl;
+    // cout << "current_option diff: " << std::to_string(current_option.index) << endl;
+    // cout << "diff: " << std::to_string(diff) << endl;
+    while (diff != 0){
+        // move cursor in direction of target_option
+        if (diff > 0){
+            for (size_t i = 0; i < (size_t)diff; i++){
+                pbf_press_dpad(m_context, DPAD_DOWN, 80ms, 400ms);
+            }
+        }
+        if (diff < 0){
+            for (size_t i = 0; i < (size_t)-diff; i++){
+                pbf_press_dpad(m_context, DPAD_UP, 80ms, 400ms);
+            }
+        }
+        current_option_slug = read_option_item();
+        current_option = menu_option_item_lookup_by_slug(current_option_slug);
+        diff = target_option.index - current_option.index;
+        // cout << "diff: " << std::to_string(diff) << endl;
+    }
+}
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_MenuOption.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_MenuOption.h
new file mode 100644
index 0000000000..aefd3ddf37
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_MenuOption.h
@@ -0,0 +1,81 @@
+/*  Menu Option Session
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_MenuOption_H
+#define PokemonAutomation_PokemonSV_MenuOption_H
+
+#include <array>
+#include "CommonFramework/Language.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonFramework/Tools/VideoStream.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_GradientArrowDetector.h"
+#include "PokemonSV_MenuOptionDatabase.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+class MenuOption{
+public:
+    ~MenuOption();
+    MenuOption(
+        VideoStream& stream, ProControllerContext& context,
+        Language language
+    );
+
+    // change all settings as per options
+    void set_options(
+        const std::vector<std::pair<MenuOptionItemEnum, std::vector<MenuOptionToggleEnum>>>& options) const;
+
+    std::string read_option(const ImageViewRGB32& cropped) const;
+
+private:
+
+    // set the current selected option, to one of the option_toggle in the given list.
+    // We need a list of option_toggle since the mapping for the options in each language is slightly different.
+    //  - e.g. For "Send to Boxes", the options may be Manual/Automatic in English, but may be On/Off in other languages.
+    // the program keeps cycling the options, until it matches one of the option_toggles in the list.
+    void set_target_option(
+        const std::vector<MenuOptionToggleEnum>& target_option_toggle_list
+    ) const;
+
+    //  Move to the target_option. 
+    //  Returns empty string if not found.
+    void move_to_option(const MenuOptionItemEnum target_option) const;
+
+    int16_t read_number(Logger& logger, const ImageViewRGB32& cropped) const;
+
+    // return the slug for the selected menu option item
+    std::string read_option_item() const;
+
+    // return the slug for the selected menu option toggle
+    std::string read_option_toggle() const;
+
+    // return the index row of the currently selected item.
+    // this detects the gradient arrow.
+    int8_t get_selected_index(const ImageViewRGB32& screen) const;
+    
+
+private:
+    VideoStream& m_stream;
+    ProControllerContext& m_context;
+    Language m_language;
+    VideoOverlaySet m_overlays;
+    GradientArrowDetector m_arrow;
+    std::array<ImageFloatBox, 10> m_boxes_item;
+    std::array<ImageFloatBox, 10> m_boxes_toggle;
+};
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_MenuOptionDatabase.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_MenuOptionDatabase.cpp
new file mode 100644
index 0000000000..d5397f4a98
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_MenuOptionDatabase.cpp
@@ -0,0 +1,149 @@
+/*  Menu Option Database
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <vector>
+#include <map>
+#include "Common/Cpp/Exceptions.h"
+#include "PokemonSV_MenuOptionDatabase.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+static const std::vector<MenuOptionItem>& MenuOption_AllItems(){
+    static const std::vector<MenuOptionItem> database{
+        {MenuOptionItemEnum::TEXT_SPEED,                    "text-speed", 0},
+        {MenuOptionItemEnum::SKIP_MOVE_LEARNING,            "skip-move-learning", 1},
+        {MenuOptionItemEnum::SEND_TO_BOXES,                 "send-to-boxes", 2},
+        {MenuOptionItemEnum::GIVE_NICKNAMES,                "give-nicknames", 3},
+        {MenuOptionItemEnum::VERTICAL_CAMERA_CONTROLS,      "vertical-camera-controls", 4},
+        {MenuOptionItemEnum::HORIZONTAL_CAMERA_CONTROLS,    "horizontal-camera-controls", 5},
+        {MenuOptionItemEnum::CAMERA_SUPPORT,                "camera-support", 6},
+        {MenuOptionItemEnum::CAMERA_INTERPOLATION,          "camera-interpolation", 7},
+        {MenuOptionItemEnum::CAMERA_DISTANCE,               "camera-distance", 8},
+        {MenuOptionItemEnum::AUTOSAVE,                      "autosave", 9},
+        {MenuOptionItemEnum::SHOW_NICKNAMES,                "show-nicknames", 10},
+        {MenuOptionItemEnum::SKIP_CUTSCENES,                "skip-cutscenes", 11},
+        {MenuOptionItemEnum::BACKGROUN_MUSIC,               "background-music", 12},
+        {MenuOptionItemEnum::SOUND_EFFECTS,                 "sound-effects", 13},
+        {MenuOptionItemEnum::POKEMON_CRIES,                 "pokemon-cries", 14},
+        {MenuOptionItemEnum::CONTROLLER_RUMBLE,             "controller-rumble", 15},
+        {MenuOptionItemEnum::HELPING_FUNCTIONS,             "helping-functions", 16},
+        {MenuOptionItemEnum::CONTROLS_WHILE_FLYING,         "controls-while-flying", 17},
+    };
+
+    return database;
+
+}
+
+static const std::vector<MenuOptionToggle>& MenuOption_AllToggles(){
+    static const std::vector<MenuOptionToggle> database{
+        {MenuOptionToggleEnum::SLOW,        "slow"},
+        {MenuOptionToggleEnum::AVERAGE,        "average"},
+        {MenuOptionToggleEnum::NORMAL,      "normal"},
+        {MenuOptionToggleEnum::FAST,        "fast"},
+        {MenuOptionToggleEnum::ON,          "on"},
+        {MenuOptionToggleEnum::OFF,         "off"},
+        {MenuOptionToggleEnum::MANUAL,      "manual"},
+        {MenuOptionToggleEnum::AUTOMATIC,   "automatic"},
+        {MenuOptionToggleEnum::REGULAR,     "regular"},
+        {MenuOptionToggleEnum::INVERTED,    "inverted"},
+        {MenuOptionToggleEnum::CLOSE,       "close"},
+        {MenuOptionToggleEnum::FAR,         "far"},
+        {MenuOptionToggleEnum::DONT_SHOW,   "dont-show"},
+        {MenuOptionToggleEnum::SHOW,        "show"},
+    };
+
+    return database;
+
+}
+
+static std::map<MenuOptionItemEnum, const MenuOptionItem*> make_MenuOptionItem_lookup_by_enum(){
+    std::map<MenuOptionItemEnum, const MenuOptionItem*> ret;
+    for (const MenuOptionItem& item : MenuOption_AllItems()){
+        if (!ret.emplace(item.enum_value, &item).second){
+            throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Duplicate Enum: " + std::to_string((int)item.enum_value));
+        }
+    }
+    return ret;
+}
+const MenuOptionItem& menu_option_item_lookup_by_enum(MenuOptionItemEnum enum_value){
+    static const std::map<MenuOptionItemEnum, const MenuOptionItem*> database = make_MenuOptionItem_lookup_by_enum();
+    auto iter = database.find(enum_value);
+    if (iter != database.end()){
+        return *iter->second;
+    }else{
+        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Unknown Enum: " + std::to_string((int)enum_value));
+    }
+}
+static std::map<std::string, const MenuOptionItem*> make_MenuOptionItem_lookup_by_slug(){
+    std::map<std::string, const MenuOptionItem*> ret;
+    for (const MenuOptionItem& item : MenuOption_AllItems()){
+        if (!ret.emplace(item.slug, &item).second){
+            throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Duplicate Enum: " + item.slug);
+        }
+    }
+    return ret;
+}
+const MenuOptionItem& menu_option_item_lookup_by_slug(std::string& slug){
+    static const std::map<std::string, const MenuOptionItem*> database = make_MenuOptionItem_lookup_by_slug();
+    auto iter = database.find(slug);
+    if (iter != database.end()){
+        return *iter->second;
+    }else{
+        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Unknown Enum: " + slug);
+    }
+}
+
+static std::map<MenuOptionToggleEnum, const MenuOptionToggle*> make_MenuOptionToggle_lookup_by_enum(){
+    std::map<MenuOptionToggleEnum, const MenuOptionToggle*> ret;
+    for (const MenuOptionToggle& item : MenuOption_AllToggles()){
+        if (!ret.emplace(item.enum_value, &item).second){
+            throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Duplicate Enum: " + std::to_string((int)item.enum_value));
+        }
+    }
+    return ret;
+}
+const MenuOptionToggle& menu_option_toggle_lookup_by_enum(MenuOptionToggleEnum enum_value){
+    static const std::map<MenuOptionToggleEnum, const MenuOptionToggle*> database = make_MenuOptionToggle_lookup_by_enum();
+    auto iter = database.find(enum_value);
+    if (iter != database.end()){
+        return *iter->second;
+    }else{
+        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Unknown Enum: " + std::to_string((int)enum_value));
+    }
+}
+
+static std::map<std::string, const MenuOptionToggle*> make_MenuOptionToggle_lookup_by_slug(){
+    std::map<std::string, const MenuOptionToggle*> ret;
+    for (const MenuOptionToggle& item : MenuOption_AllToggles()){
+        if (!ret.emplace(item.slug, &item).second){
+            throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Duplicate Enum: " + item.slug);
+        }
+    }
+    return ret;
+}
+const MenuOptionToggle& menu_option_toggle_lookup_by_slug(std::string& slug){
+    static const std::map<std::string, const MenuOptionToggle*> database = make_MenuOptionToggle_lookup_by_slug();
+    auto iter = database.find(slug);
+    if (iter != database.end()){
+        return *iter->second;
+    }else{
+        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Unknown Enum: " + slug);
+    }
+}
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_MenuOptionDatabase.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_MenuOptionDatabase.h
new file mode 100644
index 0000000000..51e41dc881
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_MenuOptionDatabase.h
@@ -0,0 +1,79 @@
+/*  Menu Option Database
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_MenuOptionDatabase_H
+#define PokemonAutomation_PokemonSV_MenuOptionDatabase_H
+
+#include <string>
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+enum class MenuOptionItemEnum{
+    TEXT_SPEED,
+    SKIP_MOVE_LEARNING,
+    SEND_TO_BOXES,
+    GIVE_NICKNAMES,
+    VERTICAL_CAMERA_CONTROLS,
+    HORIZONTAL_CAMERA_CONTROLS,
+    CAMERA_SUPPORT,
+    CAMERA_INTERPOLATION,
+    CAMERA_DISTANCE,
+    AUTOSAVE,
+    SHOW_NICKNAMES,
+    SKIP_CUTSCENES,
+    BACKGROUN_MUSIC,
+    SOUND_EFFECTS,
+    POKEMON_CRIES,
+    CONTROLLER_RUMBLE,
+    HELPING_FUNCTIONS,
+    CONTROLS_WHILE_FLYING,
+};
+
+enum class MenuOptionToggleEnum{
+    SLOW,
+    AVERAGE,
+    NORMAL,
+    FAST,
+    ON,
+    OFF,
+    MANUAL,
+    AUTOMATIC,
+    REGULAR,
+    INVERTED,
+    CLOSE,
+    FAR,
+    DONT_SHOW,
+    SHOW,
+    
+};
+
+struct MenuOptionItem{
+    MenuOptionItemEnum enum_value;
+    std::string slug;
+    int8_t index;
+};
+
+struct MenuOptionToggle{
+    MenuOptionToggleEnum enum_value;
+    std::string slug;
+
+};
+
+const MenuOptionItem& menu_option_item_lookup_by_enum(MenuOptionItemEnum enum_value);
+
+const MenuOptionItem& menu_option_item_lookup_by_slug(std::string& slug);
+
+const MenuOptionToggle& menu_option_toggle_lookup_by_enum(MenuOptionToggleEnum enum_value);
+
+const MenuOptionToggle& menu_option_toggle_lookup_by_slug(std::string& slug);
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_OliveActionFailedException.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_OliveActionFailedException.h
new file mode 100644
index 0000000000..e738b3713c
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_OliveActionFailedException.h
@@ -0,0 +1,53 @@
+/*  Operation Failed Exception
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_OliveActionFailedException_H
+#define PokemonAutomation_OliveActionFailedException_H
+
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+class FatalProgramException;
+
+enum class OliveFail{
+    NONE,
+    FAILED_ALIGN_TO_OLIVE,
+    FAILED_PUSH_OLIVE_TOTAL_DISTANCE,
+    NO_OLIVE_DETECTED,
+    FAILED_WALK_TO_OLIVE,
+    OLIVE_STUCK,
+};
+
+//  Thrown by subroutines if they fail for an in-game reason.
+//  These include recoverable errors which can be consumed by the program.
+class OliveActionFailedException : public OperationFailedExceptionWithScreenshot{
+public:
+    OliveActionFailedException(
+        ErrorReportMode error_report_mode,
+        std::string message,
+        VideoStream& stream,
+        OliveFail fail_reason = OliveFail::NONE
+    )
+        : OperationFailedExceptionWithScreenshot(error_report_mode, std::move(message), stream)
+        , m_fail_reason(fail_reason)
+    {}
+    virtual const char* name() const override{ return "OliveActionFailedException"; }
+
+public:
+    OliveFail m_fail_reason;
+
+};
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Battles/PokemonSV_BasicCatcher.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Battles/PokemonSV_BasicCatcher.cpp
new file mode 100644
index 0000000000..04d8e5355b
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Battles/PokemonSV_BasicCatcher.cpp
@@ -0,0 +1,323 @@
+/*  Basic Catcher
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h"
+#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h"
+#include "VideoGames/PokemonSV/Inference/Battles/PokemonSV_NormalBattleMenus.h"
+#include "VideoGames/PokemonSV/Inference/Battles/PokemonSV_TeraBattleMenus.h"
+#include "PokemonSV_BasicCatcher.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+//  Most of this is copy-pasted from Sword/Shield.
+
+
+//  Returns the # of slots scrolled. Returns -1 if not found.
+int move_to_ball(
+    const BattleBallReader& reader,
+    VideoStream& stream, ProControllerContext& context,
+    const std::string& ball_slug,
+    bool forward, int attempts, Milliseconds delay
+){
+    VideoSnapshot frame = stream.video().snapshot();
+    std::string first_ball = reader.read_ball(frame);
+    if (first_ball == ball_slug){
+        return 0;
+    }
+
+    size_t repeat_counter = 0;
+    for (int c = 1; c < attempts; c++){
+        pbf_press_dpad(context, forward ? DPAD_RIGHT : DPAD_LEFT, 80ms, delay);
+        context.wait_for_all_requests();
+        frame = stream.video().snapshot();
+        std::string current_ball = reader.read_ball(frame);
+        if (current_ball == ball_slug){
+            return c;
+        }
+        if (current_ball == first_ball){
+            repeat_counter++;
+            if (repeat_counter == 10){
+                return -1;
+            }
+        }
+    }
+    return -1;
+}
+
+//  Returns the quantity of the ball.
+//  Returns -1 if unable to read.
+int16_t move_to_ball(
+    const BattleBallReader& reader, VideoStream& stream, ProControllerContext& context,
+    const std::string& ball_slug
+){
+    //  Search forward at high speed.
+    int ret = move_to_ball(reader, stream, context, ball_slug, true, 100, 320ms);
+    if (ret < 0){
+        return 0;
+    }
+    if (ret == 0){
+        uint16_t quantity = reader.read_quantity(stream.video().snapshot());
+        return quantity == 0 ? -1 : quantity;
+    }
+
+    //  Wait a second to let the video catch up.
+    pbf_wait(context, 1000ms);
+    context.wait_for_all_requests();
+
+    //  Now try again in reverse at a lower speed in case we overshot.
+    //  This will return immediately if we got it right the first time.
+    ret = move_to_ball(reader, stream, context, ball_slug, false, 5, 1000ms);
+    if (ret < 0){
+        return 0;
+    }
+    if (ret > 0){
+        stream.log("Fast ball scrolling overshot by " + std::to_string(ret) + " slot(s).", COLOR_RED);
+    }
+    uint16_t quantity = reader.read_quantity(stream.video().snapshot());
+    return quantity == 0 ? -1 : quantity;
+}
+
+
+//  Throw a ball. If error or not found, throw an exception.
+//  Returns the quantity prior to throwing the ball.
+int16_t throw_ball(
+    VideoStream& stream, ProControllerContext& context,
+    Language language, const std::string& ball_slug
+){
+    BattleBallReader reader(stream, language, COLOR_RED);
+    size_t attempts = 0;
+    while (true){
+        context.wait_for_all_requests();
+
+        NormalBattleMenuWatcher normal_battle_menu(COLOR_GREEN);
+        MoveSelectWatcher move_select_menu(COLOR_BLUE);
+        TeraCatchWatcher tera_catch_detector(COLOR_GREEN);
+        int16_t quantity = 0;
+        int ret = run_until<ProControllerContext>(
+            stream, context, [&](ProControllerContext& context){
+                quantity = move_to_ball(reader, stream, context, ball_slug);
+            },
+            {normal_battle_menu, move_select_menu, tera_catch_detector}
+        );
+        switch (ret){
+        case 0:
+            stream.log("Detected battle menu. Opening up ball selection...");
+            pbf_press_button(context, BUTTON_X, 160ms, 240ms);
+            break;
+        case 1:
+            stream.log("Detected move select. Backing out...");
+            pbf_mash_button(context, BUTTON_B, 1000ms);
+            break;
+        case 2:
+            stream.log("Tera catch menu. Opening up ball selection...");
+            tera_catch_detector.move_to_slot(stream, context, 0);
+            pbf_press_button(context, BUTTON_A, 160ms, 240ms);
+            break;
+        default:
+            if (quantity > 0){
+                stream.log("Throwing ball...", COLOR_BLUE);
+                pbf_mash_button(context, BUTTON_A, 240ms);
+                return quantity;
+            }
+            if (quantity == 0){
+                stream.log("Ball not found...", COLOR_RED);
+                //  This is dead code for now.
+                return 0;
+            }
+            if (attempts >= 3){
+                OperationFailedExceptionWithScreenshot::fire(
+                    ErrorReportMode::SEND_ERROR_REPORT,
+                    "Unable to find desired ball after multiple attempts. Did you run out?",
+                    stream
+                );
+            }
+            attempts++;
+            pbf_mash_button(context, BUTTON_B, 3000ms);
+        }
+    }
+}
+
+
+
+
+
+
+
+
+
+
+CatchResults basic_catcher(
+    VideoStream& stream, ProControllerContext& context,
+    Language language,
+    const std::string& ball_slug, uint16_t ball_limit,
+    bool use_first_move_if_cant_throw,
+    std::function<void()> on_throw_lambda
+){
+    uint16_t balls_used = 0;
+
+    bool caught = false;
+    bool overworld_seen = false;
+    bool last_move_attack = false;
+    int last_state = -1;
+    WallClock last_battle_menu = WallClock::min();
+    while (true){
+        NormalBattleMenuWatcher battle_menu(COLOR_RED);
+        OverworldWatcher overworld(stream.logger(), COLOR_YELLOW);
+        GradientArrowWatcher next_pokemon(COLOR_GREEN, GradientArrowType::RIGHT, {0.50, 0.51, 0.30, 0.10});
+        GradientArrowWatcher add_to_party(COLOR_BLUE, GradientArrowType::RIGHT, {0.50, 0.39, 0.30, 0.10});
+        AdvanceDialogWatcher dialog(COLOR_PURPLE);
+        context.wait_for_all_requests();
+        int ret = wait_until(
+            stream, context, std::chrono::seconds(120),
+            {
+                battle_menu,
+                overworld,
+                next_pokemon,
+                add_to_party,
+                dialog,
+            }
+        );
+        switch (ret){
+        case 0:{
+            stream.log("Detected Battle Menu...");
+            if (caught){
+                stream.log("Detected battle menu after catch. Did you get chain attacked?", COLOR_RED);
+                return CatchResults{CatchResult::POKEMON_CAUGHT, balls_used};
+            }
+            if (overworld_seen){
+                stream.log("Detected battle after overworld. Did you get chain attacked?", COLOR_RED);
+                return CatchResults{CatchResult::POKEMON_FAINTED, balls_used};
+            }
+            if (balls_used >= ball_limit){
+                stream.log("Reached the limit of " + std::to_string(ball_limit) + " balls.", COLOR_RED);
+                return CatchResults{CatchResult::BALL_LIMIT_REACHED, balls_used};
+            }
+
+            WallClock now = current_time();
+            WallClock previous = last_battle_menu;
+            last_battle_menu = now;
+//            cout << "last_state = " << last_state << endl;
+//            cout << "last_move_attack = " << last_move_attack << endl;
+//            cout << "last_move_attack = " << std::chrono::duration_cast<std::chrono::milliseconds>(now - previous).count() << endl;
+            if (last_state == 0 && !last_move_attack && now < previous + std::chrono::seconds(8)){
+                if (!use_first_move_if_cant_throw){
+                    stream.log("BasicCatcher: Unable to throw ball.", COLOR_RED);
+                    return {CatchResult::CANNOT_THROW_BALL, balls_used};
+                }
+
+                stream.log("BasicCatcher: Unable to throw ball. Attempting to use first move instead...", COLOR_RED);
+                battle_menu.move_to_slot(stream, context, 0);
+                pbf_mash_button(context, BUTTON_A, 3000ms);
+                pbf_mash_button(context, BUTTON_B, 3000ms);
+                last_move_attack = true;
+                break;
+            }
+
+            last_move_attack = false;
+            pbf_press_button(context, BUTTON_X, 160ms, 840ms);
+#if 0
+            context.wait_for_all_requests();
+            BattleBallReader reader(stream, language, COLOR_RED);
+            int16_t qty = move_to_ball(reader, stream, context, ball_slug);
+            if (qty <= 0){
+                return CatchResults{CatchResult::OUT_OF_BALLS, balls_used};
+            }
+            pbf_mash_button(context, BUTTON_A, 30);
+#else
+            int16_t qty = throw_ball(stream, context, language, ball_slug);
+            if (qty <= 0){
+                return CatchResults{CatchResult::OUT_OF_BALLS, balls_used};
+            }
+#endif
+            pbf_mash_button(context, BUTTON_B, 4000ms);
+            balls_used++;
+            if (on_throw_lambda){
+                on_throw_lambda();
+            }
+            break;
+        }
+        case 1:
+            if (!overworld_seen && !caught){
+                stream.log("Detected Overworld... Waiting 5 seconds to confirm.");
+                context.wait_for(std::chrono::seconds(5));
+                overworld_seen = true;
+                break;
+            }
+            stream.log("Detected Overworld...");
+            if (caught){
+                return CatchResults{CatchResult::POKEMON_CAUGHT, balls_used};
+            }else{
+                return CatchResults{CatchResult::POKEMON_FAINTED, balls_used};
+            }
+        case 2:
+            stream.log("Detected own " + STRING_POKEMON + " fainted...");
+            return CatchResults{CatchResult::OWN_FAINTED, balls_used};
+        case 3:
+            stream.log("Detected add to party...");
+            caught = true;
+            pbf_press_button(context, BUTTON_B, 160ms, 1840ms);
+            break;
+        case 4:
+            stream.log("Detected dialog...");
+            caught = true;
+            pbf_press_button(context, BUTTON_B, 160ms, 1840ms);
+            break;
+        default:
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "basic_catcher(): No state detected after 2 minutes.",
+                stream
+            );
+        }
+
+        last_state = ret;
+    }
+
+
+
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Battles/PokemonSV_BasicCatcher.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Battles/PokemonSV_BasicCatcher.h
new file mode 100644
index 0000000000..e1798b78bf
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Battles/PokemonSV_BasicCatcher.h
@@ -0,0 +1,59 @@
+/*  Basic Catcher
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_BasicCatcher_H
+#define PokemonAutomation_PokemonSV_BasicCatcher_H
+
+#include <functional>
+#include "CommonFramework/Tools/VideoStream.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+#include "Pokemon/Pokemon_Notification.h"
+#include "VideoGames/PokemonSV/Inference/Battles/PokemonSV_BattleBallReader.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+using namespace Pokemon;
+
+
+//  Returns the quantity of the ball.
+//  Returns -1 if unable to read.
+int16_t move_to_ball(
+    const BattleBallReader& reader,
+    VideoStream& stream, ProControllerContext& context,
+    const std::string& ball_slug
+);
+
+//  Throw a ball. If error, throw an exception.
+//  Returns the quantity prior to throwing the ball.
+//  If ball is not found, returns zero.
+int16_t throw_ball(
+    VideoStream& stream, ProControllerContext& context,
+    Language language, const std::string& ball_slug
+);
+
+
+
+struct CatchResults{
+    CatchResult result;
+    uint16_t balls_used;
+};
+CatchResults basic_catcher(
+    VideoStream& stream, ProControllerContext& context,
+    Language language,
+    const std::string& ball_slug, uint16_t ball_limit,
+    bool use_first_move_if_cant_throw,
+    std::function<void()> on_throw_lambda = nullptr
+);
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Battles/PokemonSV_Battles.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Battles/PokemonSV_Battles.cpp
new file mode 100644
index 0000000000..fa13e4de26
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Battles/PokemonSV_Battles.cpp
@@ -0,0 +1,378 @@
+/*  Battles
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <cmath>
+#include "CommonFramework/Exceptions/ProgramFinishedException.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/Exceptions/FatalProgramException.h"
+#include "CommonFramework/Tools/ProgramEnvironment.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "Pokemon/Pokemon_Notification.h"
+#include "VideoGames/PokemonSV/Options/PokemonSV_EncounterBotCommon.h"
+#include "VideoGames/PokemonSV/Inference/PokemonSV_MainMenuDetector.h"
+#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h"
+#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h"
+#include "VideoGames/PokemonSV/Inference/Battles/PokemonSV_NormalBattleMenus.h"
+#include "PokemonSV_BasicCatcher.h"
+#include "PokemonSV_Battles.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+using namespace Pokemon;
+
+
+void auto_heal_from_menu_or_overworld(
+    const ProgramInfo& info, VideoStream& stream, ProControllerContext& context,
+    uint8_t party_slot,
+    bool return_to_overworld
+){
+    stream.log("Auto-healing...");
+    WallClock start = current_time();
+    bool healed = false;
+    while (true){
+        if (current_time() - start > std::chrono::minutes(5)){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "auto_heal_from_menu(): Failed auto-heal after 5 minutes.",
+                stream
+            );
+        }
+
+        OverworldWatcher overworld(stream.logger(), COLOR_RED);
+        MainMenuWatcher main_menu(COLOR_CYAN);
+        AdvanceDialogWatcher dialog(COLOR_YELLOW);
+        context.wait_for_all_requests();
+        int ret = wait_until(
+            stream, context, std::chrono::seconds(60),
+            {overworld, main_menu, dialog}
+        );
+        switch (ret){
+        case 0:
+            stream.log("Detected overworld.");
+            if (healed && return_to_overworld){
+                return;
+            }
+            pbf_press_button(context, BUTTON_X, 160ms, 1840ms);
+            continue;
+        case 1:
+            stream.log("Detected main menu.");
+            if (!healed){
+                main_menu.move_cursor(info, stream, context, MenuSide::LEFT, party_slot, false);
+                pbf_press_button(context, BUTTON_MINUS, 160ms, 1840ms);
+                healed = true;
+                continue;
+            }
+            if (!return_to_overworld){
+                return;
+            }
+            pbf_press_button(context, BUTTON_B, 160ms, 840ms);
+            continue;
+        case 2:
+            stream.log("Detected dialog.");
+            healed = true;
+            pbf_press_button(context, BUTTON_B, 160ms, 840ms);
+            continue;
+        default:
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "auto_heal_from_menu(): No state detected after 60 seconds.",
+                stream
+            );
+        }
+    }
+}
+
+
+
+
+int run_from_battle(
+    VideoStream& stream, ProControllerContext& context
+){
+    stream.log("Attempting to run away...");
+
+    int attempts = 0;
+    for (size_t c = 0; c < 10; c++){
+        OverworldWatcher overworld(stream.logger(), COLOR_RED);
+        NormalBattleMenuWatcher battle_menu(COLOR_YELLOW);
+        GradientArrowWatcher next_pokemon(COLOR_GREEN, GradientArrowType::RIGHT, {0.50, 0.51, 0.30, 0.10});
+        context.wait_for_all_requests();
+        int ret = wait_until(
+            stream, context, std::chrono::seconds(60),
+            {
+                overworld,
+                battle_menu,
+                next_pokemon,
+            }
+        );
+
+        switch (ret){
+        case 0:
+            stream.log("Detected overworld...");
+            return attempts;
+        case 1:
+            stream.log("Detected battle menu...");
+            battle_menu.move_to_slot(stream, context, 3);
+//            pbf_press_dpad(context, DPAD_DOWN, 2000ms, 0ms);
+            pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+            pbf_press_button(context, BUTTON_B, 160ms, 1000ms);
+            attempts++;
+            continue;
+        case 2:
+            stream.log("Detected own " + STRING_POKEMON + " fainted...");
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "Your " + STRING_POKEMON + " fainted while attempting to run away.",
+                stream
+            );
+        default:
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "run_from_battle(): No state detected after 60 seconds.",
+                stream
+            );
+        }
+    }
+
+    OperationFailedExceptionWithScreenshot::fire(
+        ErrorReportMode::SEND_ERROR_REPORT,
+        "Failed to run away after 10 attempts.",
+        stream
+    );
+}
+
+
+int run_from_battle(
+    VideoStream& stream, ProControllerContext& context,
+    OverworldBattleTracker& tracker
+){
+    stream.log("Attempting to run away...");
+
+    int attempts = 0;
+    for (size_t c = 0; c < 10; c++){
+        OverworldWatcher overworld(stream.logger(), COLOR_RED);
+        NormalBattleMenuWatcher battle_menu(COLOR_YELLOW);
+        GradientArrowWatcher next_pokemon(COLOR_GREEN, GradientArrowType::RIGHT, {0.50, 0.51, 0.30, 0.10});
+        context.wait_for_all_requests();
+        int ret = wait_until(
+            stream, context, std::chrono::seconds(60),
+            {
+                overworld,
+                battle_menu,
+                next_pokemon,
+            }
+        );
+
+        switch (ret){
+        case 0:
+            stream.log("Detected overworld...");
+            tracker.report_out_of_battle();
+            return attempts;
+        case 1:{
+            stream.log("Detected battle menu...");
+            OverworldBattleTracker::Detection result = tracker.report_battle_menu_detected();
+            if (result != OverworldBattleTracker::Detection::CONTINUE_BATTLE){
+                stream.log("Successfully ran away, but were chain attacked.", COLOR_ORANGE);
+                return attempts;
+            }
+
+            battle_menu.move_to_slot(stream, context, 3);
+//            pbf_press_dpad(context, DPAD_DOWN, 2000ms, 0ms);
+            pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+            pbf_press_button(context, BUTTON_B, 160ms, 1000ms);
+            attempts++;
+            continue;
+        }
+        case 2:
+            stream.log("Detected own " + STRING_POKEMON + " fainted...");
+            tracker.report_in_battle();
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "Your " + STRING_POKEMON + " fainted while attempting to run away.",
+                stream
+            );
+        default:
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "run_from_battle(): No state detected after 60 seconds.",
+                stream
+            );
+        }
+    }
+
+    OperationFailedExceptionWithScreenshot::fire(
+        ErrorReportMode::SEND_ERROR_REPORT,
+        "Failed to run away after 10 attempts.",
+        stream
+    );
+}
+
+
+
+
+
+
+void process_battle(
+    bool& caught, bool& should_save,
+    ProgramEnvironment& env,
+    EncounterBotCommonOptions& settings,
+    VideoStream& stream, ProControllerContext& context,
+    OverworldBattleTracker& tracker,
+    EncounterFrequencies& encounter_frequencies,
+    std::atomic<uint64_t>& shiny_counter,
+    Language language
+){
+    std::set<std::string> slugs;
+    if (language != Language::None){
+        slugs = read_singles_opponent(env.program_info(), stream, context, language);
+        encounter_frequencies += slugs;
+        stream.log(encounter_frequencies.dump_sorted_map("Encounter Stats:\n"));
+    }
+
+    VideoSnapshot shiny_screenshot;
+    float shiny_error;
+    OverworldBattleTracker::Detection type = tracker.report_battle_menu_detected(shiny_screenshot, shiny_error);
+    bool is_shiny = type == OverworldBattleTracker::Detection::NEW_SHINY_BATTLE;
+    if (is_shiny){
+        shiny_counter++;
+        if (settings.VIDEO_ON_SHINY){
+            context.wait_for(std::chrono::seconds(3));
+            pbf_press_button(context, BUTTON_CAPTURE, 2000ms, 0ms);
+        }
+    }
+    env.update_stats();
+
+    send_encounter_notification(
+        env,
+        settings.NOTIFICATION_NONSHINY,
+        settings.NOTIFICATION_SHINY,
+        language != Language::None,
+        is_shiny,
+        {{slugs, is_shiny ? ShinyType::UNKNOWN_SHINY : ShinyType::NOT_SHINY}},
+        is_shiny ? shiny_error : std::nan(""),
+        shiny_screenshot,
+        &encounter_frequencies
+    );
+
+    tracker.report_in_battle();
+
+    //  Set default action: stop program if shiny, otherwise run away.
+    EncounterActionsEntry action;
+    action.action = is_shiny
+        ? EncounterActionsAction::STOP_PROGRAM
+        : EncounterActionsAction::RUN_AWAY;
+
+    //  Iterate the actions table. If found an entry matches the pokemon species,
+    //  set the action to be what specified in the entry.
+    for (EncounterActionsEntry& entry : settings.ACTIONS_TABLE.snapshot()){
+        if (language == Language::None){
+            throw UserSetupError(stream.logger(), "You must set the game language to use the actions table.");
+        }
+
+        //  See if Pokemon name matches.
+        auto iter = slugs.find(entry.pokemon);
+        if (iter == slugs.end()){
+            continue;
+        }
+
+        switch (entry.shininess){
+        case EncounterActionsShininess::ANYTHING:
+            break;
+        case EncounterActionsShininess::NOT_SHINY:
+            if (is_shiny){
+                continue;
+            }
+            break;
+        case EncounterActionsShininess::SHINY:
+            if (!is_shiny){
+                continue;
+            }
+            break;
+        }
+
+        action = std::move(entry);
+    }
+
+    //  Run the chosen action.
+    switch (action.action){
+    case EncounterActionsAction::RUN_AWAY:
+        try{
+            run_from_battle(stream, context, tracker);
+        }catch (OperationFailedExceptionWithScreenshot& e){
+            throw FatalProgramException(e.error_report_mode(), e.message(), e.video_stream(), e.screenshot());
+        }
+        caught = false;
+        should_save = false;
+        return;
+    case EncounterActionsAction::STOP_PROGRAM:
+        throw ProgramFinishedException();
+//        throw ProgramFinishedException(m_stream, "", true);
+    case EncounterActionsAction::THROW_BALLS:
+    case EncounterActionsAction::THROW_BALLS_AND_SAVE:
+        if (language == Language::None){
+            throw InternalProgramError(&stream.logger(), PA_CURRENT_FUNCTION, "Language is not set.");
+        }
+
+        CatchResults result = basic_catcher(
+            stream, context,
+            language,
+            action.ball, action.ball_limit,
+            settings.USE_FIRST_MOVE_IF_CANNOT_THROW_BALL
+        );
+        send_catch_notification(
+            env,
+            settings.NOTIFICATION_CATCH_SUCCESS,
+            settings.NOTIFICATION_CATCH_FAILED,
+            &slugs,
+            action.ball,
+            result.balls_used,
+            result.result
+        );
+
+        switch (result.result){
+        case CatchResult::POKEMON_CAUGHT:
+        case CatchResult::POKEMON_FAINTED:
+            break;
+        default:
+            throw_and_log<FatalProgramException>(
+                stream.logger(), ErrorReportMode::NO_ERROR_REPORT,
+                "Unable to recover from failed catch.",
+                stream
+            );
+        }
+
+        caught = result.result == CatchResult::POKEMON_CAUGHT;
+        should_save = caught && action.action == EncounterActionsAction::THROW_BALLS_AND_SAVE;
+        return;
+    }
+
+    caught = false;
+    should_save = false;
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Battles/PokemonSV_Battles.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Battles/PokemonSV_Battles.h
new file mode 100644
index 0000000000..47ae0520d2
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Battles/PokemonSV_Battles.h
@@ -0,0 +1,63 @@
+/*  Battles
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_Battles_H
+#define PokemonAutomation_PokemonSV_Battles_H
+
+#include <stdint.h>
+#include "CommonFramework/Tools/VideoStream.h"
+#include "CommonFramework/Language.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+#include "Pokemon/Pokemon_EncounterStats.h"
+#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldSensors.h"
+
+namespace PokemonAutomation{
+    struct ProgramInfo;
+    class ProgramEnvironment;
+namespace NintendoSwitch{
+    using namespace Pokemon;
+namespace PokemonSV{
+
+class EncounterBotCommonOptions;
+
+
+void auto_heal_from_menu_or_overworld(
+    const ProgramInfo& info, VideoStream& stream, ProControllerContext& context,
+    uint8_t party_slot, //  0 - 5
+    bool return_to_overworld
+);
+
+
+
+//  Returns the # of attempts it took to run.
+int run_from_battle(
+    VideoStream& stream, ProControllerContext& context
+);
+int run_from_battle(
+    VideoStream& stream, ProControllerContext& context,
+    OverworldBattleTracker& tracker
+);
+
+
+
+void process_battle(
+    bool& caught, bool& should_save,
+    ProgramEnvironment& env,
+    EncounterBotCommonOptions& settings,
+    VideoStream& stream, ProControllerContext& context,
+    OverworldBattleTracker& tracker,
+    EncounterFrequencies& encounter_frequencies,
+    std::atomic<uint64_t>& shiny_counter,
+    Language language
+);
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Battles/PokemonSV_SinglesBattler.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Battles/PokemonSV_SinglesBattler.cpp
new file mode 100644
index 0000000000..80cdb4b8df
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Battles/PokemonSV_SinglesBattler.cpp
@@ -0,0 +1,333 @@
+/*  Singles Battler
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h"
+#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h"
+#include "VideoGames/PokemonSV/Inference/Battles/PokemonSV_NormalBattleMenus.h"
+#include "PokemonSV_SinglesBattler.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+using namespace Pokemon;
+
+
+//  Run a single move for a single turn.
+//  Returns true if move is successfully selected.
+bool run_move_select(
+    VideoStream& stream, ProControllerContext& context,
+    MoveSelectWatcher& move_select_menu,
+    SinglesMoveEntry& move, size_t consecutive_move_select
+){
+    uint8_t index = 0;
+    switch (move.type){
+    case SinglesMoveType::Move1:
+        index = 0;
+        break;
+    case SinglesMoveType::Move2:
+        index = 1;
+        break;
+    case SinglesMoveType::Move3:
+        index = 2;
+        break;
+    case SinglesMoveType::Move4:
+        index = 3;
+        break;
+    default:
+        pbf_press_button(context, BUTTON_B, 160ms, 80ms);
+        return false;
+    }
+
+    //  If we end up here consecutively too many times, the move is
+    //  probably disabled. Select a different move.
+    if (consecutive_move_select > 3){
+        stream.log("Failed to select a move 3 times. Choosing a different move.", COLOR_RED);
+//        pbf_press_dpad(context, DPAD_DOWN, 160ms, 320ms);
+        index++;
+        if (index >= 4){
+            index = 0;
+        }
+        move.type = (SinglesMoveType)((uint8_t)SinglesMoveType::Move1 + index);
+    }
+
+    do{
+        if (!move.terastallize){
+            stream.log("Skipping Terastallization. Reason: Not requested.");
+            break;
+        }
+        if (consecutive_move_select > 1){
+            stream.log("Skipping Terastallization. Reason: Previously failed move select.");
+            break;
+        }
+
+        stream.log("Attempting to Terastallize...");
+        pbf_press_button(context, BUTTON_R, 160ms, 1000ms);
+    }while (false);
+
+    context.wait_for_all_requests();
+
+    if (move_select_menu.move_to_slot(stream, context, index)){
+        pbf_press_button(context, BUTTON_A, 160ms, 80ms);
+    }
+    return true;
+}
+
+
+bool run_battle_menu(
+    VideoStream& stream, ProControllerContext& context,
+    NormalBattleMenuWatcher& battle_menu,
+    const SinglesMoveEntry& move
+){
+    stream.log("Current Move Selection: " + move.to_str());
+    switch (move.type){
+    case SinglesMoveType::Move1:
+    case SinglesMoveType::Move2:
+    case SinglesMoveType::Move3:
+    case SinglesMoveType::Move4:
+        if (battle_menu.move_to_slot(stream, context, 0)){
+            pbf_press_button(context, BUTTON_A, 160ms, 80ms);
+            return true;
+        }else{
+            stream.log("Unable to move to battle slot.", COLOR_RED);
+            pbf_mash_button(context, BUTTON_B, 1000ms);
+            return false;
+        }
+    case SinglesMoveType::Run:
+        if (battle_menu.move_to_slot(stream, context, 3)){
+            pbf_press_button(context, BUTTON_A, 160ms, 80ms);
+            return true;
+        }else{
+            stream.log("Unable to move to run option.", COLOR_RED);
+            pbf_mash_button(context, BUTTON_B, 1000ms);
+            return false;
+        }
+    }
+    OperationFailedExceptionWithScreenshot::fire(
+        ErrorReportMode::SEND_ERROR_REPORT,
+        "Invalid SinglesMoveType: " + std::to_string((int)move.type),
+        stream
+    );
+}
+
+
+//  Run a battle using the current Pokemon. Returns false if it fainted.
+bool run_pokemon(
+    VideoStream& stream, ProControllerContext& context,
+    const std::vector<SinglesMoveEntry>& move_table,
+    bool trainer_battle, bool& terastallized
+){
+    stream.log("Starting singles battle routine for one " + STRING_POKEMON + "...");
+
+    size_t turn = 0;
+    SinglesMoveEntry current_move{SinglesMoveType::Move1, false};
+    if (!move_table.empty()){
+        current_move = move_table[0];
+    }
+
+    size_t consecutive_timeouts = 0;
+    size_t consecutive_move_select = 0;
+//    bool battle_menu_seen = false;
+    bool next_turn_on_battle_menu = false;
+    while (true){
+
+        NormalBattleMenuWatcher battle_menu(COLOR_RED);
+        MoveSelectWatcher move_select_menu(COLOR_YELLOW);
+        GradientArrowWatcher next_pokemon(COLOR_BLUE, GradientArrowType::RIGHT, {0.50, 0.51, 0.30, 0.10});
+        SwapMenuWatcher swap_menu(COLOR_BLUE);
+        AdvanceDialogWatcher dialog(COLOR_CYAN);
+        OverworldWatcher overworld(stream.logger(), COLOR_GREEN);
+        context.wait_for_all_requests();
+        int ret = run_until<ProControllerContext>(
+            stream, context,
+            [](ProControllerContext& context){
+                for (size_t c = 0; c < 4; c++){
+                    pbf_wait(context, 30000ms);
+                    pbf_press_button(context, BUTTON_B, 160ms, 0ms);
+                }
+            },
+            {
+                battle_menu,
+                move_select_menu,
+                next_pokemon,
+                swap_menu,
+                dialog,
+                overworld,
+            }
+        );
+        if (ret >= 0){
+            consecutive_timeouts = 0;
+        }
+        context.wait_for(std::chrono::milliseconds(100));
+        switch (ret){
+        case 0:{
+            stream.log("Detected battle menu.");
+            consecutive_move_select = 0;
+//            battle_menu_seen = true;
+
+            //  If we enter here, we advance to the next turn.
+            if (next_turn_on_battle_menu){
+                stream.log("Detected battle menu. Turn: " + std::to_string(turn));
+                turn++;
+                //  Reset the move to the table entry in case we were forced to
+                //  change moves due to move being unselectable.
+                if (move_table.empty()){
+                    current_move = SinglesMoveEntry{SinglesMoveType::Move1, false};
+                }else if (turn < move_table.size()){
+                    current_move = move_table[turn];
+                }else{
+                    current_move = move_table.back();
+                }
+//                next_turn_on_battle_menu = false;
+            }
+
+            if (terastallized){
+                stream.log("Already used terastallization. Cannot use again.", COLOR_ORANGE);
+                current_move.terastallize = false;
+            }
+            next_turn_on_battle_menu = run_battle_menu(stream, context, battle_menu, current_move);
+            if (current_move.terastallize){
+                terastallized = true;
+            }
+            continue;
+        }
+        case 1:{
+            stream.log("Detected move select. Turn: " + std::to_string(turn));
+            consecutive_move_select++;
+            run_move_select(
+                stream, context,
+                move_select_menu,
+                current_move,
+                consecutive_move_select
+            );
+            continue;
+        }
+        case 2:
+            if (trainer_battle){
+                stream.log("Detected switch prompt...", COLOR_BLUE);
+                pbf_press_button(context, BUTTON_B, 160ms, 80ms);
+            }else{
+                stream.log("Detected own " + STRING_POKEMON + " fainted...", COLOR_ORANGE);
+                pbf_press_button(context, BUTTON_A, 160ms, 80ms);
+            }
+            continue;
+        case 3:
+            stream.log("Detected switch " + STRING_POKEMON + " menu...", COLOR_ORANGE);
+            return false;
+        case 4:
+            stream.log("Detected advance dialog!", COLOR_ORANGE);
+            return true;
+        case 5:
+            stream.log("Detected overworld!", COLOR_ORANGE);
+            return true;
+        default:
+            consecutive_timeouts++;
+            if (consecutive_timeouts == 3){
+                OperationFailedExceptionWithScreenshot::fire(
+                    ErrorReportMode::SEND_ERROR_REPORT,
+                    "No state detected after 6 minutes.",
+                    stream
+                );
+            }
+            stream.log("Unable to detect any state for 2 minutes. Mashing B...", COLOR_RED);
+            pbf_mash_button(context, BUTTON_B, 2000ms);
+        }
+
+
+    }
+
+
+
+}
+
+
+
+
+
+
+
+bool run_singles_battle(
+    VideoStream& stream, ProControllerContext& context,
+    const SinglesAIOption& battle_AI,
+    bool trainer_battle
+){
+    stream.log("Starting singles battle routine...");
+
+    bool terastallized = false;
+    size_t faint_counter = 0;
+    while (true){
+        size_t index = std::min<size_t>(
+            faint_counter,
+            battle_AI.MOVE_TABLES.size() - 1
+        );
+        bool win = run_pokemon(
+            stream, context,
+            battle_AI.MOVE_TABLES[index].snapshot(),
+            trainer_battle, terastallized
+        );
+
+        if (win){
+            return true;
+        }
+
+        //  Find something to send out.
+        faint_counter++;
+
+        NormalBattleMenuWatcher battle_menu(COLOR_RED);
+        AdvanceDialogWatcher dialog(COLOR_CYAN);
+        SwapMenuWatcher swap_menu(COLOR_BLUE);
+        while (true){
+            context.wait_for_all_requests();
+            int ret = wait_until(
+                stream, context,
+                std::chrono::seconds(120),
+                {battle_menu, dialog, swap_menu}
+            );
+            context.wait_for(std::chrono::milliseconds(100));
+            switch (ret){
+            case 0:
+                stream.log("Detected battle menu. Calling battle routine...");
+                break;
+            case 1:
+                stream.log("Detected advance dialog. Battle has been expectedly won already.", COLOR_RED);
+                return true;
+            case 2:
+                stream.log("Attempting to send in next " + STRING_POKEMON + "...");
+                pbf_press_dpad(context, DPAD_DOWN, 160ms, 840ms);
+                pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+                pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+                pbf_mash_button(context, BUTTON_B, 2000ms);
+                pbf_wait(context, 400ms);
+                continue;
+            default:
+                OperationFailedExceptionWithScreenshot::fire(
+                    ErrorReportMode::SEND_ERROR_REPORT,
+                    "Unable to send in a " + STRING_POKEMON + ".",
+                    stream
+                );
+            }
+            break;
+        }
+    }
+}
+
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Battles/PokemonSV_SinglesBattler.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Battles/PokemonSV_SinglesBattler.h
new file mode 100644
index 0000000000..f137c64d3d
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Battles/PokemonSV_SinglesBattler.h
@@ -0,0 +1,45 @@
+/*  Singles Battler
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_SinglesBattler_H
+#define PokemonAutomation_PokemonSV_SinglesBattler_H
+
+#include "CommonFramework/Tools/ProgramEnvironment.h"
+#include "CommonFramework/Tools/VideoStream.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+#include "VideoGames/PokemonSV/Options/PokemonSV_SinglesMoveTable.h"
+#include "VideoGames/PokemonSV/Options/PokemonSV_SinglesAIOption.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+//enum RunPokemonResult{
+//    OWN_FAINTED,
+//    OVERWORLD,
+//};
+
+bool run_pokemon(
+    VideoStream& stream, ProControllerContext& context,
+    const std::vector<SinglesMoveEntry>& move_table,
+    bool trainer_battle, bool& terastallized
+);
+
+
+//  Run a singles battle until it is over (for whatever reason).
+bool run_singles_battle(
+    VideoStream& stream, ProControllerContext& context,
+    const SinglesAIOption& battle_AI,
+    bool trainer_battle
+);
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Boxes/PokemonSV_BoxAttach.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Boxes/PokemonSV_BoxAttach.cpp
new file mode 100644
index 0000000000..542270c234
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Boxes/PokemonSV_BoxAttach.cpp
@@ -0,0 +1,243 @@
+/*  Box Attach
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonFramework/Tools/ErrorDumper.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+//#include "Pokemon/Pokemon_Strings.h"
+//#include "PokemonSV_BoxRoutines.h"
+#include "VideoGames/PokemonSV/Inference/PokemonSV_BagDetector.h"
+#include "VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxDetection.h"
+#include "PokemonSV_BoxAttach.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+//  With the cursor over the item you want to attach, attach to the current
+//  Pokemon, replacing if necessary.
+void attach_item_from_bag(
+    const ProgramInfo& info,
+    VideoStream& stream, ProControllerContext& context,
+    size_t& errors
+){
+//    bool attach_attempted = false;
+    bool attach_completed = false;
+
+    WallClock start = current_time();
+    while (true){
+        if (current_time() - start > std::chrono::seconds(60)){
+            dump_image_and_throw_recoverable_exception(
+                info, stream, "AttachFailed",
+                "Failed to attach item after 1 minute."
+            );
+        }
+
+        BagWatcher bag_detector(BagWatcher::FinderType::GONE, COLOR_GREEN);
+        GradientArrowWatcher bag_neutral(COLOR_RED, GradientArrowType::RIGHT, {0.10, 0.15, 0.05, 0.77}, std::chrono::milliseconds(1000));
+        GradientArrowWatcher selected(COLOR_RED, GradientArrowType::RIGHT, {0.20, 0.20, 0.30, 0.60});
+        PromptDialogWatcher prompt(COLOR_CYAN, std::chrono::milliseconds(100));
+        AdvanceDialogWatcher advance_dialog(COLOR_YELLOW, DialogType::DIALOG_ALL, std::chrono::milliseconds(100));
+
+        context.wait_for_all_requests();
+        int ret = wait_until(
+            stream, context,
+            std::chrono::seconds(10),
+            {
+                bag_detector,
+                bag_neutral,
+                selected,
+                prompt,
+                advance_dialog,
+            }
+        );
+        context.wait_for(std::chrono::milliseconds(50));
+        if (ret == 4){
+            //  Make sure we're not mistakening this for the other dialogs.
+            auto screenshot = stream.video().snapshot();
+            if (prompt.detect(screenshot)){
+                ret = 3;
+            }
+        }
+
+
+        switch (ret){
+        case 0:
+            stream.log("No longer in bag...");
+            if (!attach_completed){
+                errors++;
+            }
+            return;
+        case 1:
+            stream.log("Detected bag neutral...");
+            if (attach_completed){
+                pbf_press_button(context, BUTTON_B, 160ms, 240ms);
+            }else{
+                pbf_press_button(context, BUTTON_A, 160ms, 240ms);
+            }
+            break;
+        case 2:
+            stream.log("Detected selection...");
+            pbf_press_button(context, BUTTON_A, 160ms, 240ms);
+//            attach_completed = true;
+            break;
+        case 3:
+            stream.log("Detected prompt...");
+            pbf_press_button(context, BUTTON_A, 160ms, 240ms);
+            break;
+        case 4:
+            stream.log("Detected dialog...");
+            pbf_press_button(context, BUTTON_B, 160ms, 240ms);
+            attach_completed = true;
+            break;
+        }
+    }
+}
+
+
+
+void attach_item_from_box(
+    const ProgramInfo& info,
+    VideoStream& stream, ProControllerContext& context,
+    size_t category_index,
+    size_t& errors
+){
+    bool attach_attempted = false;
+//    bool attach_completed = false;
+    int expected = 0;
+    WallClock start = current_time();
+    while (true){
+        if (current_time() - start > std::chrono::seconds(60)){
+            dump_image_and_throw_recoverable_exception(
+                info, stream, "AttachFailed",
+                "Failed to attach item after 1 minute."
+            );
+        }
+
+        SomethingInBoxSlotDetector exists(COLOR_BLUE);
+        BoxWatcher box_detector(COLOR_RED);
+        PromptDialogWatcher selected_empty(COLOR_CYAN, {0.60, 0.57, 0.30, 0.09}, std::chrono::milliseconds(100));
+        PromptDialogWatcher selected_held(COLOR_CYAN, {0.60, 0.46, 0.30, 0.09}, std::chrono::milliseconds(100));
+        BagWatcher bag_detector(BagWatcher::FinderType::PRESENT, COLOR_GREEN);
+//        AdvanceDialogWatcher advance_dialog(COLOR_YELLOW, std::chrono::milliseconds(250));
+
+        context.wait_for_all_requests();
+        int ret = wait_until(
+            stream, context,
+            std::chrono::seconds(10),
+            {
+                box_detector,
+                selected_empty,
+                selected_held,
+                bag_detector,
+//                advance_dialog,
+            }
+        );
+        context.wait_for(std::chrono::milliseconds(50));
+#if 0
+        if (ret == 4){
+            //  Make sure we're not mistakening this for the other dialogs.
+            auto screenshot = stream.video().snapshot();
+            if (selected_empty.detect(screenshot)){
+                ret = 1;
+            }else if (selected_held.detect(screenshot)){
+                ret = 2;
+            }
+        }
+#endif
+
+        switch (ret){
+        case 0:{
+            if (ret == expected){
+                stream.log("Detected box neutral.");
+            }else{
+                stream.log("Detected box neutral. (unexpected)", COLOR_RED);
+                errors++;
+            }
+
+            auto screenshot = stream.video().snapshot();
+            if (exists.detect(screenshot)){
+                if (attach_attempted){
+                    return;
+                }
+                attach_attempted = false;
+                pbf_press_button(context, BUTTON_A, 160ms, 160ms);
+                expected = 1;
+                continue;
+            }else{
+                stream.log("Slot is empty.");
+                return;
+            }
+        }
+        case 1:
+            if (ret == expected){
+                stream.log("Detected empty selection. Attaching...");
+            }else{
+                stream.log("Detected empty selection. Attaching... (unexpected)", COLOR_RED);
+                errors++;
+            }
+
+            pbf_press_button(context, BUTTON_A, 160ms, 240ms);
+
+            expected = 3;
+            continue;
+
+        case 2:
+            if (1 == expected){
+                stream.log("Detected held selection. Replacing...");
+            }else{
+                stream.log("Detected held selection. Replacing... (unexpected)", COLOR_RED);
+                errors++;
+            }
+
+            pbf_press_dpad(context, DPAD_DOWN, 160ms, 160ms);
+            pbf_press_button(context, BUTTON_A, 160ms, 240ms);
+
+            expected = 3;
+            continue;
+
+        case 3:
+            if (ret == expected){
+                stream.log("Detected bag.");
+            }else{
+                stream.log("Detected bag.(unexpected)", COLOR_RED);
+                errors++;
+            }
+
+            context.wait_for(std::chrono::milliseconds(200));
+            if (attach_attempted){
+                pbf_press_button(context, BUTTON_B, 160ms, 240ms);
+                expected = 0;
+                continue;
+            }
+
+            for (size_t c = 0; c < category_index; c++){
+                pbf_press_dpad(context, DPAD_RIGHT, 160ms, 840ms);
+            }
+
+            attach_item_from_bag(info, stream, context, errors);
+            attach_attempted = true;
+
+            expected = 0;
+            continue;
+
+        default:
+            dump_image_and_throw_recoverable_exception(
+                info, stream, "NoStateAttachingItem", "No recognized state while attaching item after 10 seconds."
+            );
+        }
+    }
+}
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Boxes/PokemonSV_BoxAttach.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Boxes/PokemonSV_BoxAttach.h
new file mode 100644
index 0000000000..882cc50833
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Boxes/PokemonSV_BoxAttach.h
@@ -0,0 +1,41 @@
+/*  Box Attach
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_BoxAttach_H
+#define PokemonAutomation_PokemonSV_BoxAttach_H
+
+#include "CommonFramework/Tools/VideoStream.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+
+namespace PokemonAutomation{
+    struct ProgramInfo;
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+//  With the cursor over the item you want to attach, attach to the current
+//  Pokemon, replacing if neccessary.
+void attach_item_from_bag(
+    const ProgramInfo& info,
+    VideoStream& stream, ProControllerContext& context,
+    size_t& errors
+);
+
+//  With the cursor over the pokemon you want to attach the item to.
+//  Make sure you are in the item view.
+void attach_item_from_box(
+    const ProgramInfo& info,
+    VideoStream& stream, ProControllerContext& context,
+    size_t category_index,
+    size_t& errors
+);
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Boxes/PokemonSV_BoxRelease.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Boxes/PokemonSV_BoxRelease.cpp
new file mode 100644
index 0000000000..9391b71cac
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Boxes/PokemonSV_BoxRelease.cpp
@@ -0,0 +1,196 @@
+/*  Box Release
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonFramework/Tools/ErrorDumper.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxDetection.h"
+#include "PokemonSV_BoxRoutines.h"
+#include "PokemonSV_BoxRelease.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+void release_one_pokemon(
+    const ProgramInfo& info,
+    VideoStream& stream, ProControllerContext& context,
+    size_t& errors
+){
+    bool release_attempted = false;
+    bool release_completed = false;
+    int expected = 0;
+    int consecutive_box_neutrals = 0;
+    WallClock start = current_time();
+    while (true){
+        if (current_time() - start > std::chrono::seconds(60)){
+            dump_image_and_throw_recoverable_exception(
+                info, stream, "ReleaseFailed",
+                "Failed to release " + Pokemon::STRING_POKEMON + " after 1 minute."
+            );
+        }
+
+        //  The advance dialog is ambiguous against 2 other states. Therefore,
+        //  if we see it, we do not decide that is the state unless it holds for
+        //  1 second without any of the other states firing.
+        SomethingInBoxSlotDetector exists(COLOR_BLUE);
+//        GradientArrowDetector change_marks(COLOR_MAGENTA, GradientArrowType::DOWN, {0.28, 0.38, 0.30, 0.10});
+        BoxWatcher box_detector(COLOR_RED);
+        BoxSelectWatcher selected(COLOR_YELLOW, std::chrono::milliseconds(100));
+        PromptDialogWatcher confirm(COLOR_CYAN, std::chrono::milliseconds(100));
+        AdvanceDialogWatcher advance_dialog(COLOR_GREEN, DialogType::DIALOG_ALL, std::chrono::milliseconds(1000));
+
+        context.wait_for_all_requests();
+        int ret = wait_until(
+            stream, context,
+            std::chrono::seconds(10),
+            {
+                box_detector,
+                selected,
+                confirm,
+                advance_dialog
+            }
+        );
+//        cout << "ret0 = " << ret << endl;
+        context.wait_for(std::chrono::milliseconds(100));
+        if (ret == 3){
+            //  Make sure we're not mistakening this for the other dialogs.
+            auto screenshot = stream.video().snapshot();
+            if (selected.detect(screenshot)){
+                ret = 1;
+            }else if (confirm.detect(screenshot)){
+                ret = 2;
+            }
+        }
+//        cout << "ret1 = " << ret << endl;
+//        cout << "consecutive_box_neutrals = " << consecutive_box_neutrals << endl;
+
+        switch (ret){
+        case 0:{
+            auto screenshot = stream.video().snapshot();
+#if 0
+            //  Disambiguate with mark change.
+            if (change_marks.detect(screenshot)){
+                stream.log("Detected mark change.", COLOR_RED);
+                pbf_press_button(context, BUTTON_B, 160ms, 160ms);
+                expected = 0;
+                continue;
+            }
+#endif
+
+            if (ret == expected){
+                stream.log("Detected box neutral.");
+                consecutive_box_neutrals = 0;
+            }else{
+                //  Disambiguate with mark change.
+                stream.log("Detected box neutral. (unexpected)", COLOR_RED);
+                errors++;
+                consecutive_box_neutrals++;
+//                cout << "consecutive_box_neutrals = " << consecutive_box_neutrals << endl;
+                if (consecutive_box_neutrals >= 5){
+                    pbf_press_button(context, BUTTON_B, 160ms, 160ms);
+                    expected = 0;
+                    continue;
+                }
+            }
+
+            if (exists.detect(screenshot)){
+                if (release_attempted && release_completed){
+//                    cout << "return 0" << endl;
+                    return;
+                }
+                release_attempted = false;
+                release_completed = false;
+                pbf_press_button(context, BUTTON_A, 160ms, 160ms);
+                expected = 1;
+                continue;
+            }else{
+                stream.log("Slot is empty.");
+//                cout << "return 1" << endl;
+                return;
+            }
+        }
+        case 1:
+            if (ret == expected){
+                stream.log("Detected selection. Releasing...");
+            }else{
+                stream.log("Detected selection. Releasing... (unexpected)", COLOR_RED);
+                errors++;
+            }
+            pbf_press_dpad(context, DPAD_UP, 80ms, 80ms);
+            pbf_press_dpad(context, DPAD_UP, 80ms, 80ms);
+
+            //  Double up this A press since dropping it currently isn't recoverable.
+            pbf_press_button(context, BUTTON_A, 40ms, 24ms);
+            pbf_press_button(context, BUTTON_A, 40ms, 216ms);
+
+            expected = 2;
+            continue;
+        case 2:
+            if (ret == expected){
+                stream.log("Detected release confirmation.");
+            }else{
+                stream.log("Detected release confirmation. (unexpected)", COLOR_RED);
+                errors++;
+            }
+            pbf_press_dpad(context, DPAD_UP, 80ms, 80ms);
+            pbf_press_button(context, BUTTON_A, 160ms, 160ms);
+            release_attempted = true;
+            expected = 3;
+            continue;
+        case 3:
+            if (ret == expected){
+                stream.log("Detected advance dialog.");
+            }else{
+                stream.log("Detected advance dialog. (unexpected)", COLOR_RED);
+                errors++;
+            }
+            pbf_press_dpad(context, DPAD_UP, 80ms, 80ms);
+            pbf_press_button(context, BUTTON_A, 160ms, 160ms);
+            release_completed = true;
+            expected = 0;
+            continue;
+        default:
+            dump_image_and_throw_recoverable_exception(
+                info, stream,
+                "NoStateReleasingPokemon",
+                "No recognized state while releasing a pokemon after 10 seconds."
+            );
+        }
+    }
+}
+
+void release_box(
+    const ProgramInfo& info,
+    VideoStream& stream, ProControllerContext& context,
+    size_t& errors, uint8_t start_row
+){
+    context.wait_for_all_requests();
+    stream.log("Release one box.");
+    stream.overlay().add_log("Release box", COLOR_WHITE);
+    for (uint8_t row = start_row; row < 5; row++){
+        for (uint8_t j_col = 0; j_col < 6; j_col++){
+            // Go through slots in a Z-shape pattern
+            uint8_t col = (row % 2 == 0 ? j_col : 5 - j_col);
+            move_box_cursor(info, stream, context, BoxCursorLocation::SLOTS, row, col);
+            release_one_pokemon(info, stream, context, errors);
+        }
+    }
+}
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Boxes/PokemonSV_BoxRelease.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Boxes/PokemonSV_BoxRelease.h
new file mode 100644
index 0000000000..cd1ccc9235
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Boxes/PokemonSV_BoxRelease.h
@@ -0,0 +1,46 @@
+/*  Box Release
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_BoxRelease_H
+#define PokemonAutomation_PokemonSV_BoxRelease_H
+
+#include "CommonFramework/Tools/VideoStream.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+
+namespace PokemonAutomation{
+    struct ProgramInfo;
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+//  Assuming the current slot in box system is not an egg
+//  release current selected pokemon in the box system.
+//  It will do nothing if the current slot is empty.
+//  Throws OperationFailedException, if it got stuck or timed out.
+//  The # of errors are stored into "errors". These are usually dropped button
+//  presses that the function recovered from.
+void release_one_pokemon(
+    const ProgramInfo& info,
+    VideoStream& stream, ProControllerContext& context,
+    size_t& errors
+);
+
+//  Release a box of pokemon. Can have empty spots or eggs. Eggs are not released.
+//  Throws OperationFailedException, if it got stuck or timed out.
+//  The # of errors are stored into "errors". These are usually dropped button
+//  presses that the function recovered from.
+void release_box(
+    const ProgramInfo& info,
+    VideoStream& stream, ProControllerContext& context,
+    size_t& errors,
+    uint8_t start_row = 0   //  Start from this row. (skip te first "start_row" rows)
+);
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Boxes/PokemonSV_BoxRoutines.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Boxes/PokemonSV_BoxRoutines.cpp
new file mode 100644
index 0000000000..c0913e9313
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Boxes/PokemonSV_BoxRoutines.cpp
@@ -0,0 +1,407 @@
+/*  Sandwich Routines
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+//#include <cmath>
+//#include <algorithm>
+//#include <sstream>
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/ImageTools/ImageStats.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonFramework/Tools/ErrorDumper.h"
+#include "CommonFramework/Tools/ProgramEnvironment.h"
+#include "CommonFramework/Notifications/ProgramInfo.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+//#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxDetection.h"
+#include "VideoGames/PokemonSV/Inference/Boxes/PokemonSV_IvJudgeReader.h"
+#include "PokemonSV_BoxRoutines.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+bool change_view_to_stats_or_judge(
+    VideoStream& stream, ProControllerContext& context,
+    bool throw_exception
+){
+    ImageFloatBox name_bar(0.66, 0.08, 0.52, 0.04);
+    OverlayBoxScope name_bar_overlay(stream.overlay(), name_bar);
+    for (size_t attempts = 0;; attempts++){
+        if (throw_exception){
+            if (attempts == 10){
+                OperationFailedExceptionWithScreenshot::fire(
+                    ErrorReportMode::SEND_ERROR_REPORT,
+                    "Unable to change Pokemon view after 10 tries.",
+                    stream
+                );
+            }
+        }else{
+            if (attempts == 3){
+                return false;
+            }
+        }
+
+        context.wait_for_all_requests();
+        VideoSnapshot screen = stream.video().snapshot();
+        ImageStats stats = image_stats(extract_box_reference(screen, name_bar));
+//        cout << stats.stddev << endl;
+        if (stats.stddev.sum() > 50){
+            break;
+        }
+
+        stream.log("Unable to detect stats menu. Attempting to correct.", COLOR_RED);
+
+//        //  Alternate one and two + presses. If IV checker is enabled, we should
+//        //  land on the IV checker. Otherwise, it will land us back to nothing.
+//        //  Then the next press will be a single which will put us on the stats
+//        //  with no IV checker.
+        pbf_press_button(context, BUTTON_PLUS, 160ms, 840ms);
+//        if (attempts % 2 == 0){
+//            pbf_press_button(context, BUTTON_PLUS, 160ms, 1840ms);
+//        }
+    }
+    return true;
+}
+
+
+void change_view_to_judge(
+    VideoStream& stream, ProControllerContext& context,
+    Language language
+){
+    if (language == Language::None){
+        throw InternalProgramError(
+            &stream.logger(), PA_CURRENT_FUNCTION,
+            "change_view_to_judge() called with no language."
+        );
+    }
+
+    ImageFloatBox name_bar(0.66, 0.08, 0.52, 0.04);
+    IvJudgeReaderScope iv_checker(stream.overlay(), language);
+    OverlayBoxScope name_bar_overlay(stream.overlay(), name_bar);
+    for (size_t attempts = 0;; attempts++){
+        if (attempts == 10){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "Unable to change Pokemon view to judge after 10 tries. Have you unlocked it?",
+                stream
+            );
+        }
+
+        context.wait_for_all_requests();
+        VideoSnapshot screen = stream.video().snapshot();
+        ImageStats stats = image_stats(extract_box_reference(screen, name_bar));
+//        cout << stats.stddev << endl;
+
+        //  Check if we're even on a stats screen.
+        if (stats.stddev.sum() < 50){
+            stream.log("Unable to detect stats menu. Attempting to correct.", COLOR_RED);
+            pbf_press_button(context, BUTTON_PLUS, 160ms, 840ms);
+            continue;
+        }
+
+        //  See if we're on the judge screen.
+        IvJudgeReader::Results ivs = iv_checker.read(stream.logger(), screen);
+
+        size_t detected = 0;
+        if (ivs.hp      != IvJudgeValue::UnableToDetect) detected++;
+        if (ivs.attack  != IvJudgeValue::UnableToDetect) detected++;
+        if (ivs.defense != IvJudgeValue::UnableToDetect) detected++;
+        if (ivs.spatk   != IvJudgeValue::UnableToDetect) detected++;
+        if (ivs.spdef   != IvJudgeValue::UnableToDetect) detected++;
+        if (ivs.speed   != IvJudgeValue::UnableToDetect) detected++;
+
+        //  If less than 4 of the IVs are read, assume we're not on the judge screen.
+        if (detected < 4){
+            pbf_press_button(context, BUTTON_PLUS, 160ms, 1840ms);
+        }else{
+            break;
+        }
+    }
+}
+
+
+
+// Moving to left/right box is blind sequence. To prevent game dropping button inputs,
+// press the button longer.
+void move_to_left_box(ProControllerContext& context){
+    pbf_press_button(context, BUTTON_L, 480ms, 800ms);
+}
+void move_to_right_box(ProControllerContext& context){
+    pbf_press_button(context, BUTTON_R, 480ms, 800ms);
+}
+
+namespace{
+
+// In box system, when using button Minus or button Y, it will enter a mode for box selection and holding pokemon.
+// The function detects the existence of button symbol in the bottom row of the screen to make
+// sure the mode is entered or left.
+// If `enter_mode` is true, the program will assume it is not in the mode, and enter the mode by calling
+// `button_operation()` repeatedly until the mode is observed.
+// If `enter_mode` is false, the program will assume it is in the mode, and leave the mode by calling
+// `button_operation()` repeatedly until it confirms to have left the mode.
+void change_held_mode(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context,
+    std::function<void()> button_operation, bool enter_mode,
+    const char* time_out_error_name, const char* time_out_error_message)
+{
+    // First attempt to change mode
+    button_operation();
+
+    WallClock start = current_time();
+    while (true){
+        if (current_time() - start > std::chrono::seconds(60)){
+            dump_image_and_throw_recoverable_exception(
+                info, stream, time_out_error_name, time_out_error_message
+            );
+        }
+        BoxSelectionBoxModeWatcher watcher;
+        context.wait_for_all_requests();
+        if (wait_until(stream, context, std::chrono::seconds(10), {watcher}) == 0){
+            if (watcher.in_box_selection_mode() == enter_mode){
+                break;
+            }
+            // else: not in the desired mode
+            button_operation();
+            continue;
+        }
+        // Cannot detect box selection mode after 10 secs
+        dump_image_and_throw_recoverable_exception(
+            info, stream, "NoStateBoxSelectionMode", "Cannot determine box selection mode for 10 seconds."
+        );
+    }
+}
+
+} // anonymous namespace
+
+// Use box selection mode to hold one column of pokemon.
+// Use visual feedback to ensure button Minus is pressed to turn on box selection mode/
+// But no feedback on the button A press to make sure the selection is complete.
+void hold_one_column(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+    context.wait_for_all_requests();
+    stream.log("Holding one column.");
+    // Press Minus to draw selection box
+    const bool to_enter_selection = true;
+    change_held_mode(
+        info, stream, context,
+        [&context](){ pbf_press_button(context, BUTTON_MINUS, 400ms, 320ms); },
+        to_enter_selection,
+        "TimeoutHoldingColumn", "Failed to enter box selection mode after 1 minute of Button Minus pressing."
+    );
+
+    // Select rest of the pary
+    // Press down multiple times to make sure we select full party in case the game drops some presses
+    for (int i = 0; i < 15; i++){
+        ssf_press_dpad(context, DPAD_DOWN, 32ms);
+        ssf_press_left_joystick(context, {0, -1}, 32ms, 40ms, 24ms);
+    }
+    // Hold rest of the party
+    pbf_wait(context, 480ms);
+    // We cannot detect whether this Button A will be dropped or not.
+    // So we have to go blind here.
+    pbf_press_button(context, BUTTON_A, 400ms, 320ms);
+    context.wait_for_all_requests();
+}
+
+// Assuming already holding one or more pokemon, press A to drop them.
+void drop_held_pokemon(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+    context.wait_for_all_requests();
+    stream.log("Drop held pokemon.");
+    const bool to_enter_selection = false;
+    change_held_mode(
+        info, stream, context,
+        [&context](){ pbf_press_button(context, BUTTON_A, 480ms, 480ms); },
+        to_enter_selection,
+        "TimeoutDroppingPokemon", "Failed to drop pokemon after 1 minute of Button A pressing."
+    );
+}
+
+// Assuming already holding one or more pokemon, press B to cancel the holding.
+void cancel_held_pokemon(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+    context.wait_for_all_requests();
+    stream.log("Cancel pokemon holding.");
+    const bool to_enter_selection = false;
+    change_held_mode(
+        info, stream, context,
+        [&context](){ pbf_press_button(context, BUTTON_B, 480ms, 480ms); },
+        to_enter_selection,
+        "TimeoutCancellingHolding", "Failed to cancel holding pokemon after 1 minute of Button B pressing."
+    );
+}
+
+// Assuming the current slot is not empy, press button Y to hold the current pokemon
+void press_y_to_hold_pokemon(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+    context.wait_for_all_requests();
+    stream.log("Press button Y to hold pokemon for swapping.");
+    const bool to_enter_selection = true;
+    change_held_mode(
+        info, stream, context,
+        [&context](){ pbf_press_button(context, BUTTON_Y, 480ms, 480ms); },
+        to_enter_selection,
+        "TimeoutHoldingPokemonByButtonY", "Failed to hold a pokemon by button Y after 1 minute of trying."
+    );
+}
+
+
+
+uint8_t check_empty_slots_in_party(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+    context.wait_for_all_requests();
+    BoxEmptyPartyWatcher watcher;
+    int ret = wait_until(
+        stream, context,
+        std::chrono::seconds(10),
+        {watcher}
+    );
+    if (ret < 0){
+        dump_image_and_throw_recoverable_exception(
+            info, stream, "ReadSlotEmptinessFailed", "check_empty_slots_in_party(): Cannot read party emptiness in box system."
+        );
+    }
+
+    return watcher.num_empty_slots_found();
+}
+
+void load_one_column_to_party(
+    ProgramEnvironment& env, VideoStream& stream, ProControllerContext& context,
+    EventNotificationOption& notification,
+    uint8_t column_index, bool has_clone_ride_pokemon
+){
+    context.wait_for_all_requests();
+    stream.log("Load column " + std::to_string(column_index) + " to party.");
+    stream.overlay().add_log("Load column " + std::to_string(column_index+1), COLOR_WHITE);
+
+    size_t fail_count = 0;
+    while (true){
+        // Move cursor to the target column
+        move_box_cursor(env.program_info(), stream, context, BoxCursorLocation::SLOTS, has_clone_ride_pokemon ? 1 : 0, column_index);
+        hold_one_column(env.program_info(), stream, context);
+        try{
+            // Move the held column to party
+            move_box_cursor(env.program_info(), stream, context, BoxCursorLocation::PARTY, has_clone_ride_pokemon ? 2 : 1, 0);
+        }catch (OperationFailedExceptionWithScreenshot& e){
+            e.send_recoverable_error_notif_and_telemetry_report(env, notification);
+
+            if (++fail_count == 10){
+                dump_image_and_throw_recoverable_exception(
+                    env.program_info(), stream, "ConsecutiveColumnMoveFailure",
+                    "load_one_column_to_party(): consecutive failure of moving column around."
+                );
+            }
+            stream.log("Failed to move column around. Cancelling box selection and try again.");
+            // Cannot move column to party. It could be that the game dropped the button A press that is expected to finish
+            // the column selection.
+            // We can press B to back out and try again.
+            cancel_held_pokemon(env.program_info(), stream, context);
+            continue;
+        }
+        break;
+    }
+
+    // Drop the column to party
+    drop_held_pokemon(env.program_info(), stream, context);
+
+    context.wait_for_all_requests();
+    stream.log("Loaded column " + std::to_string(column_index) + " to party.");
+}
+
+void unload_one_column_from_party(
+    ProgramEnvironment& env, VideoStream& stream, ProControllerContext& context,
+    EventNotificationOption& notification,
+    uint8_t column_index, bool has_clone_ride_pokemon
+){
+    context.wait_for_all_requests();
+    stream.log("Unload party to column " + std::to_string(column_index) + ".");
+    stream.overlay().add_log("Unload to column " + std::to_string(column_index+1), COLOR_WHITE);
+
+    size_t fail_count = 0;
+    while (true){
+        // Move cursor to party column
+        move_box_cursor(env.program_info(), stream, context, BoxCursorLocation::PARTY, has_clone_ride_pokemon ? 2 : 1, 0);
+        hold_one_column(env.program_info(), stream, context);
+
+        try{
+            // Move the held column to target
+            move_box_cursor(env.program_info(), stream, context, BoxCursorLocation::SLOTS, has_clone_ride_pokemon ? 1 : 0, column_index);
+        }catch (OperationFailedExceptionWithScreenshot& e){
+            e.send_recoverable_error_notif_and_telemetry_report(env, notification);
+
+            if (++fail_count == 10){
+                dump_image_and_throw_recoverable_exception(
+                    env.program_info(), stream, "ConsecutiveColumnMoveFailure",
+                    "unload_one_column_from_party(): consecutive failure of moving column around."
+                );
+            }
+            stream.log("Failed to move column around. Cancelling box selection and try again.");
+            // Cannot move column to party. It could be that the game dropped the button A press that is expected to finish
+            // the column selection.
+            // We can press B to back out and try again.
+            cancel_held_pokemon(env.program_info(), stream, context);
+            continue;
+        }
+        break;
+    }
+    // Drop the column
+    drop_held_pokemon(env.program_info(), stream, context);
+
+    context.wait_for_all_requests();
+    stream.log("Unloaded party to column " + std::to_string(column_index) + ".");
+}
+
+void move_box_cursor(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context,
+    const BoxCursorLocation& side, uint8_t row, uint8_t col)
+{
+    context.wait_for_all_requests();
+    stream.log("Move cursor to " + BOX_LOCATION_STRING(side, row, col) + ".");
+    BoxDetector detector;
+    VideoOverlaySet overlay_set(stream.overlay());
+    detector.make_overlays(overlay_set);
+    detector.move_cursor(info, stream, context, side, row, col);
+    stream.log("Cursor moved.");
+}
+
+void swap_two_box_slots(
+    const ProgramInfo& info, VideoStream& stream, ProControllerContext& context,
+    const BoxCursorLocation& source_side, uint8_t source_row, uint8_t source_col,
+    const BoxCursorLocation& target_side, uint8_t target_row, uint8_t target_col
+)
+{
+    context.wait_for_all_requests();
+    stream.log("Swap two slots " + BOX_LOCATION_STRING(source_side, source_row, source_col)
+        + " and " + BOX_LOCATION_STRING(target_side, target_row, target_col) + ".");
+    stream.overlay().add_log("Swap slots", COLOR_WHITE);
+
+    BoxDetector detector;
+    VideoOverlaySet overlay_set(stream.overlay());
+    detector.make_overlays(overlay_set);
+
+    detector.move_cursor(info, stream, context, source_side, source_row, source_col);
+
+    {
+        const bool stop_on_exists = true;
+        SomethingInBoxSlotWatcher exists(COLOR_BLUE, stop_on_exists);
+        if (wait_until(stream, context, std::chrono::seconds(3), {exists}) < 0){
+            dump_image_and_throw_recoverable_exception(info, stream, "EmptySourceSwap", "Swapping an empty slot.");
+        }
+    }
+
+    press_y_to_hold_pokemon(info, stream, context);
+
+    detector.move_cursor(info, stream, context, target_side, target_row, target_col);
+
+    drop_held_pokemon(info, stream, context);
+
+    stream.log("Swapped slots.");
+}
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Boxes/PokemonSV_BoxRoutines.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Boxes/PokemonSV_BoxRoutines.h
new file mode 100644
index 0000000000..6788c220e5
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Boxes/PokemonSV_BoxRoutines.h
@@ -0,0 +1,87 @@
+/*  Box Routines
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  Various functions to operate in box system.
+ */
+
+#ifndef PokemonAutomation_PokemonSV_BoxRoutines_H
+#define PokemonAutomation_PokemonSV_BoxRoutines_H
+
+#include <stdint.h>
+#include "CommonFramework/Language.h"
+#include "CommonFramework/Tools/VideoStream.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+
+namespace PokemonAutomation{
+    
+    struct ProgramInfo;
+    class ProgramEnvironment;
+    class EventNotificationOption;
+
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+enum class BoxCursorLocation;
+
+//  Assuming the current slot in box system is a pokemon, not egg or empty space,
+//  try to change the view to the judge. However, it may land on the stats instead.
+//  If it can't land on either stats or judge and `throw_exception` is true, it will throw an exception.
+//  Return true if it successfully changed view to judge (or stats if judege is not found)
+bool change_view_to_stats_or_judge(
+    VideoStream& stream, ProControllerContext& context,
+    bool throw_exception = true
+);
+
+
+//  Assuming the current slot in box system is a pokemon, not egg or empty space,
+//  change the view to the judge. If it fails, it will OperationFailedExceptionWithScreenshot::fire.
+void change_view_to_judge(
+    VideoStream& stream, ProControllerContext& context,
+    Language language
+);
+
+
+//  Press button L to move to the box on the left
+void move_to_left_box(ProControllerContext& context);
+
+//  Press button R to move to the box on the right
+void move_to_right_box(ProControllerContext& context);
+
+
+
+//  In box system, check how many slots in the party are empty
+uint8_t check_empty_slots_in_party(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context);
+
+//  In box system, assuming the party is empty, load one column in the current box onto party.
+//  if has_clone_ride_pokemon is true, skip loading the first row of the box.
+void load_one_column_to_party(
+    ProgramEnvironment& env, VideoStream& stream, ProControllerContext& context,
+    EventNotificationOption& notification,
+    uint8_t column_index, bool has_clone_ride_pokemon
+);
+
+//  In box system, assuming the target column is empty, unload party (after the lead) to the target column.
+//  if has_clone_ride_pokemon is true, skip unloading the second row of the party.
+void unload_one_column_from_party(
+    ProgramEnvironment& env, VideoStream& stream, ProControllerContext& context,
+    EventNotificationOption& notification,
+    uint8_t column_index, bool has_clone_ride_pokemon
+);
+
+//  In box system, move the cursor to the desired slot.
+void move_box_cursor(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context,
+    const BoxCursorLocation& side, uint8_t row, uint8_t col);
+
+//  In box system, use button Y to swap two slots.
+//  The source slot must not be empty, while the target slot can be empty.
+void swap_two_box_slots(
+    const ProgramInfo& info, VideoStream& stream, ProControllerContext& context,
+    const BoxCursorLocation& source_side, uint8_t source_row, uint8_t source_col,
+    const BoxCursorLocation& target_side, uint8_t target_row, uint8_t target_col
+);
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Boxes/PokemonSV_MassAttachItems.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Boxes/PokemonSV_MassAttachItems.cpp
new file mode 100644
index 0000000000..a6a37bcc49
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Boxes/PokemonSV_MassAttachItems.cpp
@@ -0,0 +1,185 @@
+/*  Mass Attach Items
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Exceptions/OperationFailedException.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonTools/StartupChecks/VideoResolutionCheck.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxDetection.h"
+#include "VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxEggDetector.h"
+#include "VideoGames/PokemonSV/Programs/Boxes/PokemonSV_BoxAttach.h"
+#include "VideoGames/PokemonSV/Programs/Boxes/PokemonSV_BoxRoutines.h"
+#include "PokemonSV_MassAttachItems.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+using namespace Pokemon;
+
+
+MassAttachItems_Descriptor::MassAttachItems_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonSV:MassAttachItems",
+        STRING_POKEMON + " SV", "Mass Attach Items",
+        "Programs/PokemonSV/MassAttachItems.html",
+        "Mass attach items to " + STRING_POKEMON + ".",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+struct MassAttachItems_Descriptor::Stats : public StatsTracker{
+    Stats()
+        : m_boxes(m_stats["Boxes"])
+        , m_attached(m_stats["Attached"])
+//        , m_replaced(m_stats["Replaced"])
+        , m_empty(m_stats["Empty Slots"])
+        , m_eggs(m_stats["Eggs"])
+        , m_errors(m_stats["Errors"])
+    {
+        m_display_order.emplace_back("Boxes");
+        m_display_order.emplace_back("Attached");
+//        m_display_order.emplace_back("Replaced");
+        m_display_order.emplace_back("Empty Slots");
+        m_display_order.emplace_back("Eggs");
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+    }
+    std::atomic<uint64_t>& m_boxes;
+    std::atomic<uint64_t>& m_attached;
+//    std::atomic<uint64_t>& m_replaced;
+    std::atomic<uint64_t>& m_empty;
+    std::atomic<uint64_t>& m_eggs;
+    std::atomic<uint64_t>& m_errors;
+};
+std::unique_ptr<StatsTracker> MassAttachItems_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+
+
+MassAttachItems::MassAttachItems()
+    : GO_HOME_WHEN_DONE(false)
+    , ITEM_CATEGORY(
+        "<b>Item Category:</b>",
+        {
+            {ItemCategory::Medicines,   "medicine",     "Medicines"},
+            {ItemCategory::PokeBalls,   "balls",        "Pok\u00e9 Balls"},
+            {ItemCategory::BattleItems, "battle",       "Battle Items"},
+            {ItemCategory::Berries,     "berries",      "Berries"},
+            {ItemCategory::OtherItems,  "other",        "Other Items"},
+            {ItemCategory::TMs,         "tms",          "TMs"},
+            {ItemCategory::Treasures,   "treasures",    "Treasures"},
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        ItemCategory::PokeBalls
+    )
+    , BOXES(
+        "<b>Number of Boxes to Attach:</b>",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        1, 0, 32
+    )
+    , NOTIFICATIONS({
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+{
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+    PA_ADD_OPTION(ITEM_CATEGORY);
+    PA_ADD_OPTION(BOXES);
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+
+
+
+void MassAttachItems::attach_one(BoxDetector& box_detector, SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    MassAttachItems_Descriptor::Stats& stats = env.current_stats<MassAttachItems_Descriptor::Stats>();
+
+    env.log("Selecting " + STRING_POKEMON + "...");
+
+    SomethingInBoxSlotDetector sth_in_box_detector(COLOR_RED);
+    BoxCurrentEggDetector egg_detector;
+    VideoOverlaySet overlays(env.console.overlay());
+    sth_in_box_detector.make_overlays(overlays);
+    egg_detector.make_overlays(overlays);
+    context.wait_for_all_requests();
+
+    VideoSnapshot screen = env.console.video().snapshot();
+
+    if (!sth_in_box_detector.detect(screen)){
+        stats.m_empty++;
+        return;
+    }
+
+    if (egg_detector.detect(screen)){
+        stats.m_eggs++;
+        return;
+    }
+
+    try{
+        size_t errors = 0;
+        attach_item_from_box(env.program_info(), env.console, context, (size_t)ITEM_CATEGORY.get(), errors);
+        stats.m_attached++;
+        stats.m_errors += errors;
+    }catch (OperationFailedException&){
+        stats.m_errors++;
+        throw;
+    }
+}
+void MassAttachItems::attach_box(BoxDetector& box_detector, SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    for (uint8_t row = 0; row < 5; row++){
+        for (uint8_t j_col = 0; j_col < 6; j_col++){
+            // Go through slots in a Z-shape pattern
+            uint8_t col = (row % 2 == 0 ? j_col : 5 - j_col);
+            move_box_cursor(env.program_info(), env.console, context, BoxCursorLocation::SLOTS, row, col);
+            attach_one(box_detector, env, context);
+            env.update_stats();
+        }
+    }
+}
+
+
+
+void MassAttachItems::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    assert_16_9_720p_min(env.logger(), env.console);
+
+    MassAttachItems_Descriptor::Stats& stats = env.current_stats<MassAttachItems_Descriptor::Stats>();
+
+    //  Connect the controller.
+    require_player(env.console, context, BUTTON_LCLICK);
+
+    BoxDetector box_detector;
+    VideoOverlaySet overlays(env.console.overlay());
+    box_detector.make_overlays(overlays);
+
+    for (uint8_t box = 0; box < BOXES; box++){
+        if (box > 0){
+            move_to_right_box(context);
+        }
+        context.wait_for_all_requests();
+
+        env.update_stats();
+
+        attach_box(box_detector, env, context);
+
+        stats.m_boxes++;
+    }
+
+    env.update_stats();
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+    GO_HOME_WHEN_DONE.run_end_of_program(context);
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Boxes/PokemonSV_MassAttachItems.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Boxes/PokemonSV_MassAttachItems.h
new file mode 100644
index 0000000000..2b609fcc88
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Boxes/PokemonSV_MassAttachItems.h
@@ -0,0 +1,67 @@
+/*  Mass Attach Items
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_MassAttachItems_H
+#define PokemonAutomation_PokemonSV_MassAttachItems_H
+
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "Common/Cpp/Options/EnumDropdownOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+class BoxDetector;
+
+
+class MassAttachItems_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    MassAttachItems_Descriptor();
+
+    struct Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+class MassAttachItems : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = MassAttachItems_Descriptor;
+    MassAttachItems();
+
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    void attach_one(BoxDetector& box_detector, SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+    void attach_box(BoxDetector& box_detector, SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+
+private:
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
+
+    enum class ItemCategory{
+        Medicines,
+        PokeBalls,
+        BattleItems,
+        Berries,
+        OtherItems,
+        TMs,
+        Treasures,
+    };
+    EnumDropdownOption<ItemCategory> ITEM_CATEGORY;
+
+    SimpleIntegerOption<uint8_t> BOXES;
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+
+}
+}
+}
+#endif
+
+
+
diff --git a/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_MassRelease.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Boxes/PokemonSV_MassRelease.cpp
similarity index 76%
rename from SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_MassRelease.cpp
rename to SerialPrograms/Source/VideoGames/PokemonSV/Programs/Boxes/PokemonSV_MassRelease.cpp
index 4275a6d4b1..41c43ee4ef 100644
--- a/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_MassRelease.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Boxes/PokemonSV_MassRelease.cpp
@@ -1,20 +1,21 @@
 /*  Mass Release
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include "CommonFramework/Exceptions/OperationFailedException.h"
 #include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
 #include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "CommonFramework/Tools/StatsTracking.h"
-#include "CommonFramework/Tools/VideoResolutionCheck.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "CommonTools/StartupChecks/VideoResolutionCheck.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
 #include "Pokemon/Pokemon_Strings.h"
-#include "PokemonSV/Inference/Boxes/PokemonSV_BoxDetection.h"
-#include "PokemonSV/Inference/Boxes/PokemonSV_BoxEggDetector.h"
-#include "PokemonSV/Inference/Boxes/PokemonSV_BoxShinyDetector.h"
-#include "PokemonSV/Programs/Boxes/PokemonSV_BoxRoutines.h"
+#include "VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxDetection.h"
+#include "VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxEggDetector.h"
+#include "VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxShinyDetector.h"
+#include "VideoGames/PokemonSV/Programs/Boxes/PokemonSV_BoxRoutines.h"
+#include "VideoGames/PokemonSV/Programs/Boxes/PokemonSV_BoxRelease.h"
 #include "PokemonSV_MassRelease.h"
 
 namespace PokemonAutomation{
@@ -28,11 +29,12 @@ MassRelease_Descriptor::MassRelease_Descriptor()
     : SingleSwitchProgramDescriptor(
         "PokemonSV:MassRelease",
         STRING_POKEMON + " SV", "Mass Release",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonSV/MassRelease.md",
-        "Mass release boxes of Pokémon.",
+        "Programs/PokemonSV/MassRelease.html",
+        "Mass release boxes of " + STRING_POKEMON + ".",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
         FeedbackType::REQUIRED,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
     )
 {}
 struct MassRelease_Descriptor::Stats : public StatsTracker{
@@ -49,7 +51,7 @@ struct MassRelease_Descriptor::Stats : public StatsTracker{
         m_display_order.emplace_back("Empty Slots");
         m_display_order.emplace_back("Shinies");
         m_display_order.emplace_back("Eggs");
-        m_display_order.emplace_back("Errors", true);
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
     }
     std::atomic<uint64_t>& m_boxes;
     std::atomic<uint64_t>& m_released;
@@ -68,12 +70,12 @@ MassRelease::MassRelease()
     : GO_HOME_WHEN_DONE(false)
     , BOXES_TO_RELEASE(
         "<b>Number of Boxes to Release:</b>",
-        LockWhileRunning::UNLOCKED,
+        LockMode::UNLOCK_WHILE_RUNNING,
         2, 0, 32
     )
     , SKIP_SHINIES(
         "<b>Skip Shinies:</b><br>Do not release shiny " + STRING_POKEMON + ".",
-        LockWhileRunning::UNLOCKED,
+        LockMode::UNLOCK_WHILE_RUNNING,
         true
     )
     , NOTIFICATIONS({
@@ -94,7 +96,7 @@ MassRelease::MassRelease()
 
 
 
-void MassRelease::release_one(BoxDetector& box_detector, SingleSwitchProgramEnvironment& env, BotBaseContext& context){
+void MassRelease::release_one(BoxDetector& box_detector, SingleSwitchProgramEnvironment& env, ProControllerContext& context){
     MassRelease_Descriptor::Stats& stats = env.current_stats<MassRelease_Descriptor::Stats>();
 
     env.log("Selecting " + STRING_POKEMON + "...");
@@ -120,11 +122,12 @@ void MassRelease::release_one(BoxDetector& box_detector, SingleSwitchProgramEnvi
         const bool throw_exception = false;
         if (change_view_to_stats_or_judge(env.console, context, throw_exception)){
             m_in_judge_view = true;
-        } else{
+        }else{
             // it is an egg
             stats.m_eggs++;
             return;
         }
+        screen = env.console.video().snapshot();
     }
 
     if (egg_detector.detect(screen)){
@@ -149,7 +152,7 @@ void MassRelease::release_one(BoxDetector& box_detector, SingleSwitchProgramEnvi
         throw;
     }
 }
-void MassRelease::release_box(BoxDetector& box_detector, SingleSwitchProgramEnvironment& env, BotBaseContext& context){
+void MassRelease::release_box(BoxDetector& box_detector, SingleSwitchProgramEnvironment& env, ProControllerContext& context){
     for (uint8_t row = 0; row < 5; row++){
         for (uint8_t j_col = 0; j_col < 6; j_col++){
             // Go through slots in a Z-shape pattern
@@ -163,13 +166,13 @@ void MassRelease::release_box(BoxDetector& box_detector, SingleSwitchProgramEnvi
 
 
 
-void MassRelease::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
+void MassRelease::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
     assert_16_9_720p_min(env.logger(), env.console);
 
     MassRelease_Descriptor::Stats& stats = env.current_stats<MassRelease_Descriptor::Stats>();
 
     //  Connect the controller.
-    pbf_press_button(context, BUTTON_LCLICK, 10, 0);
+    require_player(env.console, context, BUTTON_LCLICK);
 
     m_in_judge_view = false;
 
diff --git a/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_MassRelease.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Boxes/PokemonSV_MassRelease.h
similarity index 76%
rename from SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_MassRelease.h
rename to SerialPrograms/Source/VideoGames/PokemonSV/Programs/Boxes/PokemonSV_MassRelease.h
index c9833f9f3b..b3623bb9c8 100644
--- a/SerialPrograms/Source/PokemonSV/Programs/General/PokemonSV_MassRelease.h
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Boxes/PokemonSV_MassRelease.h
@@ -1,6 +1,6 @@
 /*  Mass Release
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -33,12 +33,13 @@ class MassRelease_Descriptor : public SingleSwitchProgramDescriptor{
 
 class MassRelease : public SingleSwitchProgramInstance{
 public:
+    using Descriptor = MassRelease_Descriptor;
     MassRelease();
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
 
 private:
-    void release_one(BoxDetector& box_detector, SingleSwitchProgramEnvironment& env, BotBaseContext& context);
-    void release_box(BoxDetector& box_detector, SingleSwitchProgramEnvironment& env, BotBaseContext& context);
+    void release_one(BoxDetector& box_detector, SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+    void release_box(BoxDetector& box_detector, SingleSwitchProgramEnvironment& env, ProControllerContext& context);
 
 private:
     GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Eggs/PokemonSV_EggAutonomous.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Eggs/PokemonSV_EggAutonomous.cpp
new file mode 100644
index 0000000000..d87c376abd
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Eggs/PokemonSV_EggAutonomous.cpp
@@ -0,0 +1,865 @@
+/*  Egg Autonomous
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <cmath>
+#include "Common/Cpp/ColoredText.h"
+#include "CommonFramework/StaticGlobals.h"
+#include "CommonFramework/Exceptions/ProgramFinishedException.h"
+#include "CommonFramework/Exceptions/FatalProgramException.h"
+//#include "CommonFramework/Exceptions/UnexpectedBattleException.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonTools/StartupChecks/VideoResolutionCheck.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "Pokemon/Pokemon_Notification.h"
+#include "VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxEggDetector.h"
+#include "VideoGames/PokemonSV/Inference/Boxes/PokemonSV_IvJudgeReader.h"
+//#include "VideoGames/PokemonSV/PokemonSV_Settings.h"
+#include "VideoGames/PokemonSV/Programs/Boxes/PokemonSV_BoxRoutines.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h"
+#include "VideoGames/PokemonSV/Programs/Eggs/PokemonSV_EggRoutines.h"
+#include "VideoGames/PokemonSV/Programs/Boxes/PokemonSV_BoxRelease.h"
+#include "VideoGames/PokemonSV/Programs/Sandwiches/PokemonSV_SandwichRoutines.h"
+#include "VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_MenuOption.h"
+#include "VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStoryTools.h"
+#include "PokemonSV_EggAutonomous.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+using namespace Pokemon;
+
+
+EggAutonomous_Descriptor::EggAutonomous_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonSV:EggAutonomous",
+        STRING_POKEMON + " SV", "Egg Autonomous",
+        "Programs/PokemonSV/EggAutonomous.html",
+        "Automatically get meal power, fetch eggs from a picnic and hatch them.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+struct EggAutonomous_Descriptor::Stats : public StatsTracker{
+    Stats()
+        : m_sandwiches(m_stats["Sandwiches"])
+        , m_fetch_attempts(m_stats["Fetches"])
+        , m_eggs(m_stats["Eggs"])
+        , m_hatched(m_stats["Hatched"])
+        , m_shinies(m_stats["Shinies"])
+        , m_kept(m_stats["Kept"])
+        , m_attacked(m_stats["Attacked"])
+        , m_errors(m_stats["Errors"])
+    {
+        m_display_order.emplace_back("Sandwiches");
+        m_display_order.emplace_back("Fetches", ALWAYS_HIDDEN);
+        m_display_order.emplace_back("Eggs");
+        m_display_order.emplace_back("Hatched");
+        m_display_order.emplace_back("Shinies");
+        m_display_order.emplace_back("Kept");
+        m_display_order.emplace_back("Attacked", HIDDEN_IF_ZERO);
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+
+        m_aliases.emplace(STRING_POKEMON + " Kept", "Kept");
+        m_aliases.emplace(STRING_POKEMON + "Fetch Attempts", "Fetches");
+    }
+
+    std::atomic<uint64_t>& m_sandwiches;
+    std::atomic<uint64_t>& m_fetch_attempts;
+    std::atomic<uint64_t>& m_eggs;
+    std::atomic<uint64_t>& m_hatched;
+    std::atomic<uint64_t>& m_shinies;
+    std::atomic<uint64_t>& m_kept;
+    std::atomic<uint64_t>& m_attacked;
+    std::atomic<uint64_t>& m_errors;
+};
+std::unique_ptr<StatsTracker> EggAutonomous_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+
+
+EggAutonomous::EggAutonomous()
+    : STOP_AFTER_CURRENT("Egg Box is Empty")
+    , GO_HOME_WHEN_DONE(false)
+    , LANGUAGE(
+        "<b>Game Language:</b>",
+        IV_READER().languages(),
+        LockMode::LOCK_WHILE_RUNNING,
+        true
+    )
+    , LOCATION(
+        "<b>Location:</b><br>The location to hatch eggs.",
+        {
+            {EggAutoLocation::ZeroGate,         "zero-gate",        "Zero Gate"},
+            {EggAutoLocation::NorthLighthouse,  "north-lighthouse", "North Province (Area Three) Lighthouse"}
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        EggAutoLocation::ZeroGate
+    )
+    , MAX_KEEPERS(
+        "<b>Max Keepers:</b><br>Stop the program after keeping this many " + STRING_POKEMON + ". "
+        "The program will put them into a box neighboring the current box.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        10, 1, 30
+    )
+    , AUTO_SAVING(
+        "<b>Auto-Saving:</b><br>Automatically save the game to recover from crashes and allow eggs to be unhatched.<br>" +
+        make_text_url(
+            ONLINE_DOC_URL_BASE + "Programs/PokemonSV/EggAutonomous.html#auto-saving-mode",
+            "See the wiki for the full explanations of each mode."
+        ),
+        {
+            {AutoSave::NoAutoSave, "none", "No auto-saving."},
+            {AutoSave::AfterStartAndKeep, "start-and-keep", "Save at beginning and after keeping a baby."},
+            {AutoSave::EveryBatch, "every-batch", "Save before every batch of 4 or 5 eggs."},
+            {AutoSave::AfterFetchComplete, "after-fetch", "Save after all eggs have been fetched from picnic."}
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        AutoSave::AfterStartAndKeep
+    )
+    , KEEP_BOX_LOCATION(
+        "<b>Location of the Keep Box:</b><br>Which box to keep the shiny " + STRING_POKEMON + " and others that match the filters.",
+        {
+            {0, "left", "Left Box"},
+            {1, "right", "Right Box"},
+        },
+        LockMode::UNLOCK_WHILE_RUNNING,
+        1
+    )
+    , FILTERS0(
+        StatsHuntIvJudgeFilterTable_Label_Eggs,
+        {
+            .action = true,
+            .shiny = true,
+            .gender = true,
+            .nature = true,
+        }
+    )
+    , m_battle_ai_description(
+        "<b>Battle AI if Attacked:</b><br>"
+        "Occasionally (especially on the Switch 2), you will get attacked by wild " + STRING_POKEMON + ". "
+        "If the following section is enabled, it attempts to recover by killing the wild " + STRING_POKEMON + ". "
+        "If disabled, the program will instead reset the game. "
+        "This table applies to the egg hatching " + STRING_POKEMON + " (the Flame Body one)."
+    )
+    , BATTLE_AI(false, GroupOption::EnableMode::DEFAULT_ENABLED, 1)
+    , HAS_CLONE_RIDE_POKEMON(
+        "<b>Cloned Ride Legendary 2nd in Party:</b><br>"
+        "Ride legendary cannot be cloned after patch 1.0.1. To preserve the existing clone while hatching eggs, "
+        "place it as second in party before starting the program. "
+        "The program will skip the first row of the current box when storing and hatching eggs, so you will need "
+        "to fill the first row with " + STRING_POKEMON + " before running this program.",
+        LockMode::LOCK_WHILE_RUNNING,
+        false
+    )
+    , SAVE_DEBUG_VIDEO(
+        "<b>Save debug videos to Switch:</b><br>"
+        "Set this on to save a Switch video everytime an error occurs. You can send the video to developers to help them debug later.",
+        LockMode::LOCK_WHILE_RUNNING,
+        false
+    )
+    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATION_NONSHINY_KEEP(
+        "Non-Shiny Keep",
+        true, true, ImageAttachmentMode::JPG,
+        {"Notifs"}
+    )
+    , NOTIFICATION_SHINY(
+        "Shiny Hatch",
+        true, true, ImageAttachmentMode::JPG,
+        {"Notifs", "Showcase"}
+    )
+    , m_notification_noop("", false, false)
+    , NOTIFICATIONS({
+        &NOTIFICATION_STATUS_UPDATE,
+        &NOTIFICATION_NONSHINY_KEEP,
+        &NOTIFICATION_SHINY,
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_RECOVERABLE,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+{
+    if (STATIC_GLOBALS.DEVELOPER_MODE){
+        PA_ADD_OPTION(SAVE_DEBUG_VIDEO);
+    }
+    PA_ADD_OPTION(STOP_AFTER_CURRENT);
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+    PA_ADD_OPTION(LANGUAGE);
+    PA_ADD_OPTION(EGG_SANDWICH);
+    PA_ADD_OPTION(LOCATION);
+    PA_ADD_OPTION(MAX_KEEPERS);
+    PA_ADD_OPTION(AUTO_SAVING);
+    PA_ADD_OPTION(KEEP_BOX_LOCATION);
+    PA_ADD_OPTION(FILTERS0);
+    PA_ADD_OPTION(m_battle_ai_description);
+    PA_ADD_OPTION(BATTLE_AI);
+    PA_ADD_OPTION(HAS_CLONE_RIDE_POKEMON);
+
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+
+void EggAutonomous::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    assert_16_9_720p_min(env.logger(), env.console);
+
+    DeferredStopButtonOption::ResetOnExit reset_on_exit(STOP_AFTER_CURRENT);
+
+    //  Connect the controller.
+    require_player(env.console, context, BUTTON_L);
+
+    {
+        // reset_position_to_flying_spot(env, context);
+        // picnic_party_to_hatch_party(env, context);
+        // hatch_eggs_full_routine(env, context, -1);
+
+        // enter_box_system_from_overworld(env.program_info(), env.console, context);
+        // for (int i = 0; i < 5; i++){
+        //     process_one_baby(env, context, i, 5);
+        // }
+
+        // eat_egg_sandwich_at_picnic(env.program_info(), env.normal_inference_dispatcher(), env.console, context,
+        //     EGG_SANDWICH_TYPE, SWEET_HERB_INDEX_BACKWARDS.current_value());
+        // return;
+    }
+
+    try{
+        if (AUTO_SAVING != AutoSave::NoAutoSave){
+            save_game(env, context, true);
+        }
+
+        const size_t max_num_sandwiches = EGG_SANDWICH.MAX_NUM_SANDWICHES;
+        m_num_sandwich_spent = 0;
+        m_num_kept = 0;
+        size_t consecutive_failures = 0;
+        while (true){
+            m_saved_after_fetched_eggs = false;
+            m_in_critical_to_save_stage = false;
+
+            // Do one iteration of the outmost loop of egg auto:
+            // - Start at Aera Zero flying spot
+            // - Go to front area of the observation station to start picnic
+            // - Make sandwich to gain egg power
+            // - Go to picnic basket to fetch eggs
+            // - Go on ride to hatch eggs
+
+            env.update_stats();
+            send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
+
+            // Recoverable loop to fetch eggs:
+            int num_party_eggs = -1;
+            while (true){
+                try{
+                    num_party_eggs = fetch_eggs_full_routine(env, context);
+                    break;
+                }catch (OperationFailedException& e){
+                    if (handle_recoverable_error(
+                        env, context,
+                        NOTIFICATION_ERROR_RECOVERABLE,
+                        e,
+                        consecutive_failures
+                    )){
+                        throw;
+                    }
+                } // end try catch
+            } // end recoverable loop to fetch eggs:
+
+            // Recoverable loop to hatch eggs
+            bool game_already_resetted = false;
+            while (true){
+                try{
+                    hatch_eggs_full_routine(env, context, num_party_eggs);
+                    consecutive_failures = 0;
+                    break;
+                }catch (OperationFailedException& e){
+                    if (handle_recoverable_error(
+                        env, context,
+                        NOTIFICATION_ERROR_RECOVERABLE,
+                        e, consecutive_failures
+                    )){
+                        throw;
+                    }
+                    // After resetting the game, we don't know how many eggs in party
+                    num_party_eggs = -1;
+
+                    // If there is no save during egg hatching, then the game is reset to before fetching eggs
+                    // So we need to break out of the recoverable hatch egg routine loop
+                    if (m_saved_after_fetched_eggs == false){
+                        env.log("No save during egg hatching routine. After this reset, we should start the egg fetching routine now.");
+                        game_already_resetted = true;
+                        break;
+                    }
+                } // end try catch
+            } // end recoverable loop to hatch eggs
+
+            // If the program can't save-reload, then we cannot reload spent sandwich ingredients
+            if (AUTO_SAVING == AutoSave::NoAutoSave){
+                m_num_sandwich_spent++;
+            }else if (m_saved_after_fetched_eggs){
+                env.log("Game already saved during egg hatching routine, so we cannot reset game to reset sandwich.");
+                // If we save after fetching eggs, then the save solidifies spent sandwich ingredients.
+                m_num_sandwich_spent++;
+
+                env.log("Saving game here so that we can reset sandwich later");
+                save_game(env, context, true);
+            }else if (game_already_resetted == false){
+                // Nothing found in this iteration
+                env.log("Resetting game since nothing found, saving sandwich ingredients.");
+                reset_game(env.program_info(), env.console, context);
+            }else{ // game_already_resetted == true
+                env.log("Game reset back to egg fetching routine.");
+            }
+
+            if (m_num_sandwich_spent >= max_num_sandwiches){
+                env.console.overlay().add_log("Max sandwich count: " + std::to_string(max_num_sandwiches), COLOR_PURPLE);
+                env.log("Max num sandwiches reached: " + std::to_string(max_num_sandwiches), COLOR_PURPLE);
+                break;
+            }
+
+            if (STOP_AFTER_CURRENT.should_stop()){
+                env.log("Round completed. Stopping program...");
+                env.console.overlay().add_log("Round complete", COLOR_WHITE);
+                throw ProgramFinishedException();
+            }
+            // end of one full picnic->hatch iteration
+        } // end the full egg autonomous loop
+    }catch (ProgramFinishedException&){
+        // Stopped early (stop button, stop after current egg box, no box space, or max keepers).
+        // Fall through to the shared end-of-program handling below.
+    }
+
+    env.update_stats();
+    GO_HOME_WHEN_DONE.run_end_of_program(context);
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+}
+
+// start at Area Zero flying spot, start picnic, make sandwich, then fetch eggs at basket.
+int EggAutonomous::fetch_eggs_full_routine(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    auto& stats = env.current_stats<EggAutonomous_Descriptor::Stats>();
+
+    if (LOCATION == EggAutoLocation::ZeroGate){
+        picnic_at_zero_gate(env.program_info(), env.console, context);
+    }else{
+        pbf_press_button(context, BUTTON_L, 400ms, 320ms);
+        picnic_from_overworld(env.program_info(), env.console, context);
+    }
+    // Now we are at picnic. We are at one end of picnic table while the egg basket is at the other end
+    bool can_make_sandwich = eat_egg_sandwich_at_picnic(env, env.console, context,
+        EGG_SANDWICH.EGG_SANDWICH_TYPE, LANGUAGE);
+    if (can_make_sandwich == false){
+        throw UserSetupError(env.console, "No sandwich recipe or ingredients. Cannot open and select the sandwich recipe.");
+    }
+    env.current_stats<EggAutonomous_Descriptor::Stats>().m_sandwiches++;
+    env.update_stats();
+
+    // move past the table and collect eggs
+    auto basket_check_callback = [&](size_t new_eggs){
+        stats.m_fetch_attempts++;
+        stats.m_eggs += new_eggs;
+        env.update_stats();
+    };
+
+    const size_t max_eggs = HAS_CLONE_RIDE_POKEMON ? 24 : 30;
+    size_t num_eggs_collected = 0;
+    const size_t basket_wait_seconds = (EGG_SANDWICH.EGG_SANDWICH_TYPE == EggSandwichType::GREAT_PEANUT_BUTTER ? 180 : 120);
+    collect_eggs_after_sandwich(env.program_info(), env.console, context, basket_wait_seconds, max_eggs,
+        num_eggs_collected, basket_check_callback);
+
+    leave_picnic(env.program_info(), env.console, context);
+
+    // Reset position to flying spot:
+    if (LOCATION == EggAutoLocation::ZeroGate){
+        reset_position_to_flying_spot(env, context);
+    }else{
+        //Lighthouse: We haven't moved much so just fly.
+        open_map_from_overworld(env.program_info(), env.console, context);
+        fly_to_overworld_from_map(env.program_info(), env.console, context);
+    }
+
+    return picnic_party_to_hatch_party(env, context);
+}
+
+// The routine to hatch a box of eggs after fetching.
+// When there is an error during hatching, it will throw an OperationFailedException.
+// The outmost program loop should catch this exception and recall this function to achieve error recovery, if needed.
+// When immediately called after fetching routine finishes, assumes the party is already loaded with the first column of
+// eggs and the number of eggs is provided by `num_eggs_in_party`.
+// When called after an error recovery, assumes the party is loaded with some unknown number of eggs, and `num_eggs_in_party` is -1.
+void EggAutonomous::hatch_eggs_full_routine(SingleSwitchProgramEnvironment& env, ProControllerContext& context, int num_eggs_in_party){
+    auto& stats = env.current_stats<EggAutonomous_Descriptor::Stats>();
+
+    // index of the egg column in box to be loaded next, 0-indexed
+    // starting at 1 because when hatch_eggs_full_routine() is called, the first column is already loaded to the party
+    uint8_t next_egg_column = 1;
+
+    // Find the next egg column in the current box.
+    // Note: the box columns can be:
+    // - empty. This is due to the column loaded to party, or released in the case of AutoSaving != AfterStartAndKeep.
+    // - egg column.
+    // - hatched pokemon. This only happens in the case of AutoSaving == AfterStartAndKeep.
+    // To handle all AutoSaving cases, we cannot only use `SomethingInBoxSlotDetector` to find the column, but also need
+    // `BoxCurrentEggDetector`. 
+    // This function is called in two cases:
+    // 1. When we recover from error and don't know which column is the next egg column.
+    //    In this case, `change_view_to_stats_or_judge()` is called as part of the error recovery code before this function,
+    //    so that `BoxCurrentEggDetector` in this function can function correctly to find that the egg column.
+    // 2. When we finish processing one hatched party and want to load the next egg column.
+    //    In this case, `next_egg_column` already point to the next possible column, that cannot be hatched pokemon.
+    //    So we don't need to call egg detector and don't need to worry about setting box views.
+    auto go_to_next_egg_column = [&](bool check_eggs = false){
+        SomethingInBoxSlotDetector sth_in_box_detector(COLOR_RED);
+        BoxCurrentEggDetector egg_detector;
+        for (; next_egg_column < 6; next_egg_column++){
+            move_box_cursor(env.program_info(), env.console, context, BoxCursorLocation::SLOTS, HAS_CLONE_RIDE_POKEMON ? 1 : 0, next_egg_column);
+            context.wait_for_all_requests();
+            auto snapshot = env.console.video().snapshot();
+            // If there is an egg in slot row 0 (or 1 if using clone ride pokemon), col `col`,
+            if (sth_in_box_detector.detect(snapshot) && (!check_eggs || egg_detector.detect(snapshot))){
+                env.log("Found next column of eggs at col " + std::to_string(next_egg_column) + ".");
+                break;
+            }
+        }
+    };
+
+    if (num_eggs_in_party < 0){
+        // detect how many eggs in party
+        enter_box_system_from_overworld(env.program_info(), env.console, context);
+
+        context.wait_for(std::chrono::milliseconds(400)); // wait until box UI is loaded
+
+        // Move box cursor to party lead
+        move_box_cursor(env.program_info(), env.console, context, BoxCursorLocation::PARTY, 0, 0);
+
+        // Change box view to stats or judge, so that `BoxCurrentEggDetector` in `go_to_next_egg_column()`
+        // works. Either view is fine here since no IVs are read, and the judge may not be unlocked in game.
+        change_view_to_stats_or_judge(env.console, context);
+
+        const uint8_t expected_non_eggs_count_in_party = HAS_CLONE_RIDE_POKEMON ? 1 : 0;
+        num_eggs_in_party = check_non_eggs_count_in_party(env.program_info(), env.console, context, expected_non_eggs_count_in_party);
+        env.log("Read " + std::to_string(num_eggs_in_party) + " eggs.");
+        env.console.overlay().add_log("Party eggs: " + std::to_string(num_eggs_in_party), COLOR_WHITE);
+
+        // Also detect what's the next egg column
+        context.wait_for(std::chrono::seconds(2)); // wait until box UI is definitely loaded
+        env.log("Checking next egg column.");
+        go_to_next_egg_column(true);
+
+        leave_box_system_to_overworld(env.program_info(), env.console, context);
+    }
+
+    auto save_game_if_needed = [&](){
+        if (AUTO_SAVING == AutoSave::EveryBatch ||
+            (AUTO_SAVING == AutoSave::AfterFetchComplete && m_saved_after_fetched_eggs == false) ||
+            (AUTO_SAVING == AutoSave::AfterStartAndKeep && m_in_critical_to_save_stage)){
+            env.log("Saving game during egg hatching routine.");
+            save_game(env, context, true);
+            m_saved_after_fetched_eggs = true;
+            m_in_critical_to_save_stage = false;
+        }
+    };
+
+    // The loop to hatch batches of eggs.
+    // Each batch consists of at most five eggs.
+    // There are at most six batches of eggs in a box.
+    while(true){
+        save_game_if_needed();
+
+        auto hatched_callback = [&](uint8_t){
+            stats.m_hatched++;
+            env.update_stats();
+        };
+        if (LOCATION == EggAutoLocation::ZeroGate){
+            hatch_eggs_at_zero_gate(
+                env,
+                env.console,
+                context,
+                &NOTIFICATION_ERROR_RECOVERABLE,
+                &BATTLE_AI,
+                &stats.m_attacked,
+                (uint8_t)num_eggs_in_party,
+                hatched_callback
+            );
+            reset_position_to_flying_spot(env, context);
+        }else{
+            hatch_eggs_at_area_three_lighthouse(
+                env,
+                env.console,
+                context,
+                &NOTIFICATION_ERROR_RECOVERABLE,
+                &BATTLE_AI,
+                &stats.m_attacked,
+                (uint8_t)num_eggs_in_party,
+                hatched_callback
+            );
+            reset_position_to_flying_spot(env, context);
+            //Clear spawns - over time floette/vivillon drift over past the fence (usually aroudn the 3rd batch)
+            picnic_from_overworld(env.program_info(), env.console, context);
+            leave_picnic(env.program_info(), env.console, context);
+        }
+
+        enter_box_system_from_overworld(env.program_info(), env.console, context);
+        
+        // Check each hatched baby whether they will be kept.
+        // If yes, move them to the keep box.
+        // Otherwise, release them or move them into box in case we will reset game later.
+        for (uint8_t i = 0; i < num_eggs_in_party; i++){
+            process_one_baby(env, context, i, (uint8_t)num_eggs_in_party);
+        }
+
+        // If the auto save mode is AfterStartAndKeep, which allows resetting the game in case no eggs in the box are kept,
+        // then we can save the time of releasing hatched pokemon in case we will reset the game later.
+        // So here we place the hatched pokemon back to the box
+        if (AUTO_SAVING == AutoSave::AfterStartAndKeep){
+            // move party back into the box
+            env.log("Unload party in case we will reset game later to save releasing time.");
+            unload_one_column_from_party(env, env.console, context, NOTIFICATION_ERROR_RECOVERABLE, next_egg_column-1, HAS_CLONE_RIDE_POKEMON);
+        }
+
+        // Get the next egg column
+        go_to_next_egg_column();
+
+        if (next_egg_column < 6){
+            load_one_column_to_party(env, env.console, context, NOTIFICATION_ERROR_RECOVERABLE, next_egg_column, HAS_CLONE_RIDE_POKEMON);
+            // Move cursor to party lead so that we can examine rest of party to detect eggs.
+            move_box_cursor(env.program_info(), env.console, context, BoxCursorLocation::PARTY, 0, 0);
+
+            uint8_t expected_non_eggs_count_in_party = HAS_CLONE_RIDE_POKEMON ? 1 : 0;
+            num_eggs_in_party = check_non_eggs_count_in_party(env.program_info(), env.console, context, expected_non_eggs_count_in_party);
+        }else{
+            // no more eggs to hatch in box
+
+            if (AUTO_SAVING == AutoSave::AfterStartAndKeep){
+                // Check if we will reset game:
+                // We reset game if the auto save mode is AfterStartAndKeep and we have no pokemon kept during hatching this box
+                // m_in_critical_to_save_stage: whether we need to save the game for the current batch of eggs
+                // m_saved_after_fetched_eggs: whether we have saved the game already for a past batch of eggs in this box
+                if (m_in_critical_to_save_stage == false && m_saved_after_fetched_eggs == false){
+                    // Yes, we will reset game
+                    // So exit this loop early here
+                    env.log("Early exit of egg hatching routine to reset game.");
+                    return;
+                }
+
+                // release the hatched pokemon in box
+                size_t local_errors = 0;
+                release_box(
+                    env.program_info(), env.console, context, local_errors,
+                    HAS_CLONE_RIDE_POKEMON ? 1 : 0
+                );
+            }
+
+            // change to fetching mode:
+            env.log("Replace party with picnic team");
+            env.console.overlay().add_log("Change to picnic pokemon", COLOR_WHITE);
+
+            // Move to left box
+            move_to_left_box(context);
+
+            // Swap the party lead, the flame body pokemon with the stored first fetching pokemon
+            swap_two_box_slots(env.program_info(), env.console, context,
+                BoxCursorLocation::PARTY, 0, 0,
+                BoxCursorLocation::SLOTS, 0, 0);
+
+            // Load rest of the fetching pokemon to party
+            load_one_column_to_party(env, env.console, context, NOTIFICATION_ERROR_RECOVERABLE, 1, HAS_CLONE_RIDE_POKEMON);
+
+            // Move back to middle box
+            move_to_right_box(context);
+        }
+
+        leave_box_system_to_overworld(env.program_info(), env.console, context);
+
+        if (next_egg_column == 6){ // no more eggs to hatch
+            break; // break egg batch loop. This is the only place to break out of the loop
+        }
+        next_egg_column++;
+    } // end egg batch loop
+
+    save_game_if_needed();
+}
+
+// While in box system and the current box is egg box, process one baby pokemon in party
+// Return true if the program finds a pokemon to keep
+void EggAutonomous::process_one_baby(SingleSwitchProgramEnvironment& env, ProControllerContext& context, uint8_t egg_index, uint8_t num_eggs_in_party){
+    auto& stats = env.current_stats<EggAutonomous_Descriptor::Stats>();
+
+    // Check each pokemon from bottom to top. In this way we can reliably detect end of releasing the pokemon.
+    uint8_t party_row = num_eggs_in_party - egg_index + (HAS_CLONE_RIDE_POKEMON ? 1 : 0);
+    context.wait_for_all_requests();
+    move_box_cursor(env.program_info(), env.console, context, BoxCursorLocation::PARTY, party_row, 0);
+
+    env.log("Check hatched pokemon at party slot " + std::to_string(party_row));
+
+    bool found_shiny = false;
+    StatsHuntAction action = StatsHuntAction::Discard;
+    if (check_baby_info(env.program_info(), env.console, context, LANGUAGE, FILTERS0, action)){
+        found_shiny = true;
+        env.console.log("Shiny found!");
+        env.console.overlay().add_log("Shiny " + std::to_string(egg_index+1) + "/" + std::to_string(num_eggs_in_party), COLOR_GREEN);
+        stats.m_shinies++;
+        env.update_stats();
+        send_encounter_notification(
+            env,
+            m_notification_noop,
+            NOTIFICATION_SHINY,
+            false, true, {{{}, ShinyType::UNKNOWN_SHINY}}, std::nan(""),
+            env.console.video().snapshot()
+        );
+    }else{
+        env.console.overlay().add_log("Not shiny " + std::to_string(egg_index+1) + "/" + std::to_string(num_eggs_in_party), COLOR_WHITE);
+    }
+
+    auto send_keep_notification = [&](){
+        if (!found_shiny){
+            send_encounter_notification(
+                env,
+                NOTIFICATION_NONSHINY_KEEP,
+                NOTIFICATION_SHINY,
+                false, false, {}, std::nan(""),
+                env.console.video().snapshot()
+            );
+        }
+    };
+
+    switch (action){
+    case StatsHuntAction::StopProgram:
+            env.log("Program stop requested...");
+            env.console.overlay().add_log("Request program stop", COLOR_WHITE);
+            send_keep_notification();
+            throw ProgramFinishedException();
+    case StatsHuntAction::Keep:
+            m_in_critical_to_save_stage = true;
+            env.log("Moving Pokemon to keep box...", COLOR_BLUE);
+            stats.m_kept++;
+            env.update_stats();
+            m_num_kept++;
+            env.console.overlay().add_log("Keep pokemon " + std::to_string(m_num_kept) + "/" + std::to_string(MAX_KEEPERS), COLOR_YELLOW);
+            send_keep_notification();
+
+            if (move_pokemon_to_keep(env, context, party_row) == false){
+                env.log("No empty slot available to place new pokemon.");
+                env.console.overlay().add_log("No box space", COLOR_RED);
+                throw ProgramFinishedException();
+            }
+
+            if (m_num_kept >= MAX_KEEPERS){
+                env.log("Max keepers reached. Stopping program...");
+                env.console.overlay().add_log("Max Keepers reached", COLOR_WHITE);
+                throw ProgramFinishedException();
+            }
+            break;
+
+    case StatsHuntAction::Discard:
+        default:
+            // If the auto save mode is AfterStartAndKeep, which allows resetting the game in case no eggs in the box are kept,
+            // then we can save the time of releasing hatched pokemon in case we will reset the game later.
+            // Otherwise, release the pokemon now.
+            if (AUTO_SAVING != AutoSave::AfterStartAndKeep){
+                size_t local_errors = 0;
+                release_one_pokemon(env.program_info(), env.console, context, local_errors);
+            }
+            break;
+    } // end switch EggHatchAction
+}
+
+// From the egg box, move to the kept box, drop the pokemon to an empty spot in the box, move back to the egg box.
+// Return false if it does not find an empty spot.
+bool EggAutonomous::move_pokemon_to_keep(SingleSwitchProgramEnvironment& env, ProControllerContext& context, uint8_t pokemon_row_in_party){
+    SomethingInBoxSlotDetector sth_in_box_detector(COLOR_RED);
+    const size_t keep_box_location = KEEP_BOX_LOCATION.current_value();
+    if (keep_box_location == 0){
+        move_to_left_box(context);
+    }else{
+        move_to_right_box(context);
+    }
+    
+    context.wait_for_all_requests();
+
+    const uint8_t col_start = (keep_box_location == 0 ? 2 : 0);
+    for (uint8_t row = 0; row < 5; row++){
+        for (uint8_t col = col_start; col < 6; col++){
+            move_box_cursor(env.program_info(), env.console, context, BoxCursorLocation::SLOTS, row, col);
+            context.wait_for_all_requests();
+            // If no pokemon in the slot:
+            if (!sth_in_box_detector.detect(env.console.video().snapshot())){
+
+                // Move the to-keep pokemon in party to the empty slot.
+                swap_two_box_slots(env.program_info(), env.console, context,
+                    BoxCursorLocation::PARTY, pokemon_row_in_party, 0,
+                    BoxCursorLocation::SLOTS, row, col);
+
+                // Move back to middle box
+                if (keep_box_location == 0){
+                    move_to_right_box(context);
+                }else{
+                    move_to_left_box(context);
+                }
+                context.wait_for_all_requests();
+                return true;
+            }
+        }
+    }
+    return false;
+}
+
+void EggAutonomous::reset_position_to_flying_spot(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    // Use map to fly back to the flying spot
+    open_map_from_overworld(env.program_info(), env.console, context);
+    if (LOCATION == EggAutoLocation::ZeroGate){
+        pbf_move_left_joystick(context, {0, -0.252}, 160ms, 400ms);
+    }else{ //lighthouse
+        pbf_move_left_joystick(context, {+0.016, +1}, 150ms, 50ms);
+        pbf_press_button(context, BUTTON_ZL, 320ms, 800ms);
+    }
+    fly_to_overworld_from_map(env.program_info(), env.console, context);
+}
+
+// From overworld, change pokemon party from the one used for getting eggs, to the one used for hatching
+// The new party will be one flame body pokemon as lead, and some eggs.
+// Function returns how many eggs are in the party
+int EggAutonomous::picnic_party_to_hatch_party(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    env.console.overlay().add_log("Change to hatching", COLOR_WHITE);
+    // change pokemon party from used for fetching eggs in picnic, to hatching on your ride.
+
+    enter_box_system_from_overworld(env.program_info(), env.console, context);
+
+    // Move to left box
+    move_to_left_box(context);
+
+    // Swap the stored the flame body pokemon with the stored first fetching pokemon
+    swap_two_box_slots(env.program_info(), env.console, context,
+        BoxCursorLocation::SLOTS, 0, 0,
+        BoxCursorLocation::PARTY, 0, 0);
+
+    // Unload rest of party to the 2nd column (col 1) in box
+    unload_one_column_from_party(env, env.console, context, NOTIFICATION_ERROR_RECOVERABLE, 1, HAS_CLONE_RIDE_POKEMON);
+
+    // Move to middle box
+    move_to_right_box(context);
+
+    // Load first egg column to party
+    load_one_column_to_party(env, env.console, context, NOTIFICATION_ERROR_RECOVERABLE, 0, HAS_CLONE_RIDE_POKEMON);
+    // Move cursor to party lead so that we can examine rest of party to detect eggs.
+    move_box_cursor(env.program_info(), env.console, context, BoxCursorLocation::PARTY, 0, 0);
+
+    uint8_t expected_non_eggs_count_in_party = HAS_CLONE_RIDE_POKEMON ? 1 : 0;
+    const uint8_t num_eggs_in_party = check_non_eggs_count_in_party(env.program_info(), env.console, context, expected_non_eggs_count_in_party);
+
+    leave_box_system_to_overworld(env.program_info(), env.console, context);
+
+    return num_eggs_in_party;
+}
+
+
+void EggAutonomous::save_game(SingleSwitchProgramEnvironment& env, ProControllerContext& context, bool from_overworld){
+    try{
+        if (from_overworld){
+            save_game_from_overworld(env.program_info(), env.console, context);
+        }else{
+            save_game_from_menu(env.program_info(), env.console, context);
+        }
+    }catch (OperationFailedExceptionWithScreenshot& e){
+        // To be safe: avoid interrupting or corrupting game saving,
+        // make game saving non error recoverable
+        throw FatalProgramException(e.error_report_mode(), e.message(), e.video_stream(), e.screenshot());
+    }
+}
+
+void change_settings_egg_program(SingleSwitchProgramEnvironment& env, ProControllerContext& context,  Language language){
+    int8_t options_index = 4;
+    enter_menu_from_overworld(env.program_info(), env.console, context, options_index, MenuSide::RIGHT);
+    MenuOption session(env.console, context, language);
+
+    std::vector<std::pair<MenuOptionItemEnum, std::vector<MenuOptionToggleEnum>>> options = {
+        {MenuOptionItemEnum::TEXT_SPEED, {MenuOptionToggleEnum::FAST}},
+        {MenuOptionItemEnum::SKIP_MOVE_LEARNING, {MenuOptionToggleEnum::ON}},
+        {MenuOptionItemEnum::GIVE_NICKNAMES, {MenuOptionToggleEnum::OFF}},
+        {MenuOptionItemEnum::CAMERA_SUPPORT, {MenuOptionToggleEnum::ON}},
+        {MenuOptionItemEnum::AUTOSAVE, {MenuOptionToggleEnum::OFF}},
+
+    };
+    session.set_options(options);
+
+    pbf_mash_button(context, BUTTON_A, 1000ms);
+    clear_dialog(env.console, context, ClearDialogMode::STOP_TIMEOUT, 5, {CallbackEnum::PROMPT_DIALOG});
+    press_Bs_to_back_to_overworld(env.program_info(), env.console, context);    
+}
+
+
+bool EggAutonomous::handle_recoverable_error(
+    SingleSwitchProgramEnvironment& env, ProControllerContext& context,
+    EventNotificationOption& notification,
+    const OperationFailedException& e,
+    size_t& consecutive_failures
+){
+    auto& stats = env.current_stats<EggAutonomous_Descriptor::Stats>();
+    stats.m_errors++;
+    env.update_stats();
+
+    if (SAVE_DEBUG_VIDEO){
+        // Take a video to give more context for debugging
+        pbf_press_button(context, BUTTON_CAPTURE, 2000ms, 2000ms);
+        context.wait_for_all_requests();
+    }
+    // if there is no auto save, then we shouldn't reset game to lose previous progress.
+    if (AUTO_SAVING == AutoSave::NoAutoSave){
+        return true;
+    }
+
+    if (AUTO_SAVING == AutoSave::AfterStartAndKeep && m_in_critical_to_save_stage){
+        // We have found a pokemon to keep, but before we can save the game to protect the pokemon, an error occurred.
+        // To not lose the pokemon, don't reset.
+        // Note: if AUTO_SAVING == AutoSave::EveryBatch, then we don't need to care about this critical stage, because
+        // in this auto saving mode, every batch of eggs have been saved beforehand.
+        env.log("Found an error before we can save the game to protect the newly kept pokemon.", COLOR_RED);
+        env.log("Don't reset game to protect it.", COLOR_RED);
+        return true;
+    }
+    std::string fail_message = e.message();
+    consecutive_failures++;
+    if (consecutive_failures >= 3){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "Failed 3 times in the row.\n" + fail_message,
+            env.console
+        );
+    }
+
+    auto snapshot = env.console.video().snapshot().frame;
+    std::string message = fail_message;
+    send_program_recoverable_error_notification_and_telemetry_report(
+        env, &env.logger(), env.program_info(), 
+        NOTIFICATION_ERROR_RECOVERABLE, 
+        ErrorReportMode::SEND_ERROR_REPORT,
+        message,
+        "OperationFailedExceptionWithScreenshot",
+        *snapshot,
+        &env.console.history()
+    );       
+
+    env.log("Reset game to handle recoverable error");
+    reset_game(env.program_info(), env.console, context);
+
+    if (e.message().find("check_basket_to_collect_eggs") != std::string::npos){
+        change_settings_egg_program(env, context, LANGUAGE);
+    }
+
+    return false;
+}
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Eggs/PokemonSV_EggAutonomous.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Eggs/PokemonSV_EggAutonomous.h
new file mode 100644
index 0000000000..e7583fec8d
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Eggs/PokemonSV_EggAutonomous.h
@@ -0,0 +1,141 @@
+/*  Egg Autonomous
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_EggAutonomous_H
+#define PokemonAutomation_PokemonSV_EggAutonomous_H
+
+#include "Common/Cpp/Options/EnumDropdownOption.h"
+#include "Common/Cpp/Options/ButtonOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "CommonTools/Options/LanguageOCROption.h"
+#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "Pokemon/Options/Pokemon_StatsHuntFilter.h"
+#include "VideoGames/PokemonSV/Options/PokemonSV_EggPowerSandwichOption.h"
+#include "VideoGames/PokemonSV/Options/PokemonSV_SinglesAIOption.h"
+
+// #include <functional>
+
+namespace PokemonAutomation{
+
+class OperationFailedException;
+
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+class EggAutonomous_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    EggAutonomous_Descriptor();
+
+    struct Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+
+};
+
+
+
+// Automatically hatch eggs to farm shiny
+class EggAutonomous : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = EggAutonomous_Descriptor;
+    EggAutonomous();
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    int fetch_eggs_full_routine(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+
+    void hatch_eggs_full_routine(SingleSwitchProgramEnvironment& env, ProControllerContext& context, int num_eggs_in_party);
+
+    void reset_position_to_flying_spot(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+
+    int picnic_party_to_hatch_party(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+
+    void process_one_baby(SingleSwitchProgramEnvironment& env, ProControllerContext& context, uint8_t egg_index, uint8_t num_eggs_in_party);
+
+    bool move_pokemon_to_keep(SingleSwitchProgramEnvironment& env, ProControllerContext& context, uint8_t pokemon_row_in_party);
+
+    void save_game(SingleSwitchProgramEnvironment& env, ProControllerContext& context, bool from_overworld);
+
+    //  Return true if you should rethrow.
+    bool handle_recoverable_error(
+        SingleSwitchProgramEnvironment& env, ProControllerContext& context,
+        EventNotificationOption& notification,
+        const OperationFailedException& e,
+        size_t& consecutive_failures
+    );
+
+    // void call_with_debug_dump(SingleSwitchProgramEnvironment& env, ProControllerContext& context, std::function<void())
+
+private:
+    // Will need this to preserve raid den
+    // TouchDateIntervalOption TOUCH_DATE_INTERVAL;
+    
+    DeferredStopButtonOption STOP_AFTER_CURRENT;
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
+
+    OCR::LanguageOCROption LANGUAGE;
+
+    enum class EggAutoLocation{
+        ZeroGate,
+        NorthLighthouse,
+    };
+    EnumDropdownOption<EggAutoLocation> LOCATION;
+
+    SimpleIntegerOption<uint8_t> MAX_KEEPERS;
+
+    enum class AutoSave{
+        NoAutoSave,
+        AfterStartAndKeep,
+        EveryBatch,
+        AfterFetchComplete,
+    };
+    EnumDropdownOption<AutoSave> AUTO_SAVING;
+
+    EggPowerSandwichOption EGG_SANDWICH;
+
+    IntegerEnumDropdownOption KEEP_BOX_LOCATION;
+    
+    Pokemon::StatsHuntIvJudgeFilterTable FILTERS0;
+
+    StaticTextOption m_battle_ai_description;
+    SinglesAIOption BATTLE_AI;
+
+    BooleanCheckBoxOption HAS_CLONE_RIDE_POKEMON;
+
+    BooleanCheckBoxOption SAVE_DEBUG_VIDEO;
+
+    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
+    EventNotificationOption NOTIFICATION_NONSHINY_KEEP;
+    EventNotificationOption NOTIFICATION_SHINY;
+    EventNotificationOption m_notification_noop;
+    EventNotificationsOption NOTIFICATIONS;
+
+    // How many pokemon have been kept so far
+    uint8_t m_num_kept = 0;
+    // How many sandwich spent so far
+    size_t m_num_sandwich_spent = 0;
+    // The program first fetchs some eggs, then hatches them.
+    // If user selects AUTO_SAVING to be on, then during hatching, when a recoverable error happens, we reset game.
+    // If we have saved the game after fetching phase, then when reloading the game, we may still have eggs in boxes
+    // that need hatching.
+    // If we haven't saved after fetching, then when reloading the game, there is no eggs in boxes. We can directly
+    // go to the next egg fetching phase.
+    // To tell apart the two cases, we need this bool var:
+    bool m_saved_after_fetched_eggs = false;
+    // When we find a pokemon to keep, we don't want the game to be reset if we haven't placed a save to protect the
+    // kept the pokemon. This flag is used to signal when we are in this "don't reset" stage.
+    bool m_in_critical_to_save_stage = false;
+};
+
+void change_settings_egg_program(SingleSwitchProgramEnvironment& env, ProControllerContext& context,  Language language);
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Eggs/PokemonSV_EggFetcher.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Eggs/PokemonSV_EggFetcher.cpp
new file mode 100644
index 0000000000..f86cb34d2f
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Eggs/PokemonSV_EggFetcher.cpp
@@ -0,0 +1,159 @@
+/*  Egg Fetcher
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Exceptions/OperationFailedException.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonTools/StartupChecks/VideoResolutionCheck.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonSV/Inference/Boxes/PokemonSV_IvJudgeReader.h"
+#include "VideoGames/PokemonSV/Programs/Eggs/PokemonSV_EggRoutines.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h"
+#include "PokemonSV_EggFetcher.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+using namespace Pokemon;
+
+
+EggFetcher_Descriptor::EggFetcher_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonSV:EggFetcher",
+        STRING_POKEMON + " SV", "Egg Fetcher",
+        "Programs/PokemonSV/EggFetcher.html",
+        "Automatically fetch eggs from a picnic.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+struct EggFetcher_Descriptor::Stats : public StatsTracker{
+    Stats()
+        : m_sandwiches(m_stats["Sandwiches"])
+        , m_attempts(m_stats["Fetch Attempts"])
+        , m_eggs(m_stats["Eggs"])
+        , m_errors(m_stats["Errors"])
+    {
+        m_display_order.emplace_back("Sandwiches");
+        m_display_order.emplace_back("Fetch Attempts");
+        m_display_order.emplace_back("Eggs");
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+    }
+    std::atomic<uint64_t>& m_sandwiches;
+    std::atomic<uint64_t>& m_attempts;
+    std::atomic<uint64_t>& m_eggs;
+    std::atomic<uint64_t>& m_errors;
+};
+std::unique_ptr<StatsTracker> EggFetcher_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+
+
+EggFetcher::EggFetcher()
+    : GO_HOME_WHEN_DONE(false)
+    , LANGUAGE(
+        "<b>Game Language:</b>",
+        IV_READER().languages(),
+        LockMode::LOCK_WHILE_RUNNING,
+        true
+    )
+    , EGGS_TO_FETCH(
+        "<b>Fetch this many eggs:</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        900
+    )
+    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_STATUS_UPDATE,
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+{
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+    PA_ADD_OPTION(LANGUAGE);
+    PA_ADD_OPTION(EGGS_TO_FETCH);
+    PA_ADD_OPTION(EGG_SANDWICH);
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+
+void EggFetcher::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    assert_16_9_720p_min(env.logger(), env.console);
+
+    EggFetcher_Descriptor::Stats& stats = env.current_stats<EggFetcher_Descriptor::Stats>();
+
+    //  Connect the controller.
+    require_player(env.console, context, BUTTON_L);
+
+    size_t num_eggs_collected = 0;
+
+    try{
+        for (uint16_t i = 0; i < EGG_SANDWICH.MAX_NUM_SANDWICHES; i++){
+            send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
+
+            picnic_at_zero_gate(env.program_info(), env.console, context);
+            // Now we are at picnic. We are at one end of picnic table while the egg basket is at the other end
+
+#if 1
+            bool can_make_sandwich = eat_egg_sandwich_at_picnic(env, env.console, context,
+                EGG_SANDWICH.EGG_SANDWICH_TYPE, LANGUAGE);
+            if (can_make_sandwich == false){
+                throw UserSetupError(env.console, "No sandwich recipe or ingredients. Cannot open and select the sandwich recipe.");
+            }
+#endif
+            stats.m_sandwiches++;
+            env.update_stats();
+
+            // move past the table and collect eggs
+            auto basket_check_callback = [&](size_t new_eggs){
+                stats.m_attempts++;
+                stats.m_eggs += new_eggs;
+                env.update_stats();
+            };
+
+            const size_t basket_wait_seconds = (EGG_SANDWICH.EGG_SANDWICH_TYPE == EggSandwichType::GREAT_PEANUT_BUTTER ? 180 : 120);
+            collect_eggs_after_sandwich(
+                env.program_info(),
+                env.console, context,
+                basket_wait_seconds,
+                EGGS_TO_FETCH,
+                num_eggs_collected,
+                basket_check_callback
+            );
+
+            leave_picnic(env.program_info(), env.console, context);
+            
+            // Reset position to flying spot:
+            reset_position_at_zero_gate(env.program_info(), env.console, context);
+
+            if (num_eggs_collected >= EGGS_TO_FETCH){
+                break;
+            }
+        }
+    }catch (OperationFailedException&){
+        stats.m_errors++;
+        env.update_stats();
+        throw;
+    }
+
+    env.update_stats();
+    GO_HOME_WHEN_DONE.run_end_of_program(context);
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+}
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Eggs/PokemonSV_EggFetcher.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Eggs/PokemonSV_EggFetcher.h
new file mode 100644
index 0000000000..cf60ccbcc2
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Eggs/PokemonSV_EggFetcher.h
@@ -0,0 +1,59 @@
+/*  Egg Fetcher
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_EggFetcher_H
+#define PokemonAutomation_PokemonSV_EggFetcher_H
+
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "CommonTools/Options/LanguageOCROption.h"
+#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "VideoGames/PokemonSV/Options/PokemonSV_EggPowerSandwichOption.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+class EggFetcher_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    EggFetcher_Descriptor();
+
+    struct Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+
+};
+
+
+
+
+class EggFetcher : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = EggFetcher_Descriptor;
+    EggFetcher();
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
+
+    OCR::LanguageOCROption LANGUAGE;
+
+    SimpleIntegerOption<uint16_t> EGGS_TO_FETCH;
+    EggPowerSandwichOption EGG_SANDWICH;
+
+    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Eggs/PokemonSV_EggHatcher.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Eggs/PokemonSV_EggHatcher.cpp
new file mode 100644
index 0000000000..daa85990cd
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Eggs/PokemonSV_EggHatcher.cpp
@@ -0,0 +1,250 @@
+/*  Egg Hatcher
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Exceptions/FatalProgramException.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonTools/StartupChecks/VideoResolutionCheck.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxDetection.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h"
+#include "VideoGames/PokemonSV/Programs/Eggs/PokemonSV_EggRoutines.h"
+#include "VideoGames/PokemonSV/Programs/Boxes/PokemonSV_BoxRoutines.h"
+#include "PokemonSV_EggHatcher.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+using namespace Pokemon;
+
+
+EggHatcher_Descriptor::EggHatcher_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonSV:EggHatcher",
+        STRING_POKEMON + " SV", "Egg Hatcher",
+        "Programs/PokemonSV/EggHatcher.html",
+        "Automatically hatch eggs from boxes.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+struct EggHatcher_Descriptor::Stats : public StatsTracker{
+    Stats()
+        : m_hatched(m_stats["Hatched"])
+        , m_attacked(m_stats["Attacked"])
+        , m_errors(m_stats["Errors"])
+    {
+        m_display_order.emplace_back("Hatched");
+        m_display_order.emplace_back("Attacked", HIDDEN_IF_ZERO);
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+    }
+    std::atomic<uint64_t>& m_hatched;
+    std::atomic<uint64_t>& m_attacked;
+    std::atomic<uint64_t>& m_errors;
+};
+std::unique_ptr<StatsTracker> EggHatcher_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+
+
+EggHatcher::EggHatcher()
+    : GO_HOME_WHEN_DONE(false)
+    , START_LOCATION(
+        "<b>Start location:</b><br>Where to start the hatcher program.<br>"
+        "Zero Gate Flying Spot: Stand at Zero Gate flying spot. The flying spot is already unlocked.<br>"
+        "Anywhere safe, on ride: You are in a safe location with no wild encounters or NPCs. You are on your ride legendary.<br>"
+        "Anywhere safe, on foot: You are in a safe location with no wild encounters or NPCs. You stand on foot.<br>",
+        {
+            {StartLocation::ZeroGateFlyingSpot, "zero-gate", "Zero Gate Flying Spot"},
+            {StartLocation::AnywhereOnRide, "anywhere-on-ride", "Anywhere safe, on ride."},
+            {StartLocation::AnywhereOffRide, "anywhere-off-ride", "Anywhere safe, on foot."},
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        StartLocation::ZeroGateFlyingSpot
+    )
+    , BOXES(
+        "<b>How many boxes of eggs to hatch:</b>",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        1, 1, 32
+    )
+    , m_battle_ai_description(
+        "<b>Battle AI if Attacked:</b><br>"
+        "Occasionally (especially on the Switch 2), you will get attacked by wild " + STRING_POKEMON + ". "
+        "If the following section is enabled, it attempts to recover by killing the wild " + STRING_POKEMON + ". "
+        "If disabled, the program will instead reset the game. "
+        "This table applies to the egg hatching " + STRING_POKEMON + " (the Flame Body one)."
+    )
+    , BATTLE_AI(false, GroupOption::EnableMode::DEFAULT_ENABLED, 1)
+    , HAS_CLONE_RIDE_POKEMON(
+        "<b>Cloned Ride Legendary 2nd in Party:</b><br>"
+        "Ride legendary cannot be cloned after patch 1.0.1. To preserve the existing clone while hatching eggs, "
+        "place it as second in party before starting the program. "
+        "The program will skip the first row of eggs in the box as a result.",
+        LockMode::LOCK_WHILE_RUNNING,
+        false
+    )
+    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_STATUS_UPDATE,
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_RECOVERABLE,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+{
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+    PA_ADD_OPTION(START_LOCATION);
+    PA_ADD_OPTION(BOXES);
+    PA_ADD_OPTION(m_battle_ai_description);
+    PA_ADD_OPTION(BATTLE_AI);
+    PA_ADD_OPTION(HAS_CLONE_RIDE_POKEMON);
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+void EggHatcher::hatch_one_box(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    EggHatcher_Descriptor::Stats& stats = env.current_stats<EggHatcher_Descriptor::Stats>();
+
+    for (uint8_t column_index = 0; column_index < 6; column_index++){
+        uint8_t num_eggs = 0, num_non_egg_pokemon = 0;
+        {
+            const uint8_t expected_empty_slots_in_party = HAS_CLONE_RIDE_POKEMON ? 4 : 5;
+            if (check_empty_slots_in_party(env.program_info(), env.console, context) != expected_empty_slots_in_party){
+                throw_and_log<FatalProgramException>(
+                    env.console, ErrorReportMode::SEND_ERROR_REPORT,
+                    "Your party should have " + std::to_string(6 - expected_empty_slots_in_party) + " " + STRING_POKEMON +
+                    " and " + std::to_string(expected_empty_slots_in_party) + " empty slots.",
+                    env.console
+                );
+            }
+        }
+
+        load_one_column_to_party(env, env.console, context, NOTIFICATION_ERROR_RECOVERABLE, column_index, HAS_CLONE_RIDE_POKEMON);
+        // Move cursor to party lead so that we can examine rest of party to detect eggs.
+        move_box_cursor(env.program_info(), env.console, context, BoxCursorLocation::PARTY, 0, 0);
+
+        std::tie(num_eggs, num_non_egg_pokemon) = check_egg_party_column(env.program_info(), env.console, context);
+        if (num_eggs == 0){
+            if (num_non_egg_pokemon == 0){
+                // nothing in this column
+                env.log("Nothing in column " + std::to_string(column_index+1) + ".");
+                env.console.overlay().add_log("Empty column");
+                continue;
+            }
+
+            // we have only non-egg pokemon in the column
+            // Move them back
+            env.log("Only non-egg pokemon in column, move them back.");
+            env.console.overlay().add_log("No egg in column");
+            unload_one_column_from_party(env, env.console, context, NOTIFICATION_ERROR_RECOVERABLE, column_index, HAS_CLONE_RIDE_POKEMON);
+            continue;
+        }
+        
+        env.log("Loaded " + std::to_string(num_eggs) + " eggs to party.");
+        env.console.overlay().add_log("Load " + std::to_string(num_eggs) + " eggs");
+        leave_box_system_to_overworld(env.program_info(), env.console, context);
+
+        auto hatched_callback = [&](uint8_t){  
+            stats.m_hatched++;
+            env.update_stats();
+        };
+
+        switch (START_LOCATION){
+        case StartLocation::ZeroGateFlyingSpot:
+            hatch_eggs_at_zero_gate(
+                env,
+                env.console,
+                context,
+                &NOTIFICATION_ERROR_RECOVERABLE,
+                &BATTLE_AI,
+                &stats.m_attacked,
+                num_eggs,
+                hatched_callback
+            );
+            reset_position_at_zero_gate(env.program_info(), env.console, context);
+            break;
+        case StartLocation::AnywhereOnRide:
+        case StartLocation::AnywhereOffRide: // the program already pressed + to get on ride at start
+        {
+            const bool on_ride = true;
+            hatch_eggs_anywhere(env, env.console, context, on_ride, num_eggs, hatched_callback);
+            break;
+        }
+        default:
+            throw InternalProgramError(&env.logger(), PA_CURRENT_FUNCTION, "Unknown StartLocation");
+        }
+
+        enter_box_system_from_overworld(env.program_info(), env.console, context);
+
+        num_eggs = check_egg_party_column(env.program_info(), env.console, context).first;
+        if (num_eggs > 0){
+            throw_and_log<FatalProgramException>(
+                env.console, ErrorReportMode::SEND_ERROR_REPORT,
+                "Detected egg in party after hatching.",
+                env.console
+            );
+        }
+
+        unload_one_column_from_party(env, env.console, context, NOTIFICATION_ERROR_RECOVERABLE, column_index, HAS_CLONE_RIDE_POKEMON);
+    }
+
+    context.wait_for_all_requests();
+}
+
+void EggHatcher::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    assert_16_9_720p_min(env.logger(), env.console);
+
+    EggHatcher_Descriptor::Stats& stats = env.current_stats<EggHatcher_Descriptor::Stats>();
+
+    //  Connect the controller.
+    require_player(env.console, context, BUTTON_L);
+
+    if (START_LOCATION == StartLocation::AnywhereOffRide){
+        // Get on ride:
+        pbf_press_button(context, BUTTON_PLUS, 400ms, 800ms);
+        context.wait_for_all_requests();
+    }
+
+    try{
+        enter_box_system_from_overworld(env.program_info(), env.console, context);
+        // // Wait one second to let game load box UI
+        // context.wait_for(std::chrono::seconds(1));
+
+        for (uint8_t i = 0; i < BOXES; i++){
+            if (i > 0){
+                env.log("Go to next box.");
+                env.console.overlay().add_log("Next box", COLOR_WHITE);
+                move_to_right_box(context);
+            }
+            context.wait_for_all_requests();
+
+            send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
+
+            hatch_one_box(env, context);
+        }
+    }catch (Exception&){
+        stats.m_errors++;
+        env.update_stats();
+        throw;
+    }
+
+    env.update_stats();
+    GO_HOME_WHEN_DONE.run_end_of_program(context);
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+}
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Eggs/PokemonSV_EggHatcher.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Eggs/PokemonSV_EggHatcher.h
new file mode 100644
index 0000000000..4acf5bee90
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Eggs/PokemonSV_EggHatcher.h
@@ -0,0 +1,75 @@
+/*  Egg Hatcher
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_EggHatcher_H
+#define PokemonAutomation_PokemonSV_EggHatcher_H
+
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "VideoGames/PokemonSV/Options/PokemonSV_SinglesAIOption.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+class EggHatcher_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    EggHatcher_Descriptor();
+
+    struct Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+
+};
+
+
+
+
+class EggHatcher : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = EggHatcher_Descriptor;
+    EggHatcher();
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    // Start at box system, where party is empty, the program will:
+    // - load one column to party
+    // - hatch
+    // - return to box system and offline paty
+    // Repeat for all six columns of a box
+    void hatch_one_box(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+
+private:
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
+
+    enum class StartLocation{
+        ZeroGateFlyingSpot,
+        AnywhereOnRide,
+        AnywhereOffRide,
+    };
+    EnumDropdownOption<StartLocation> START_LOCATION;
+
+    SimpleIntegerOption<uint8_t> BOXES;
+
+    StaticTextOption m_battle_ai_description;
+    SinglesAIOption BATTLE_AI;
+
+    BooleanCheckBoxOption HAS_CLONE_RIDE_POKEMON;
+
+    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Eggs/PokemonSV_EggRoutines.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Eggs/PokemonSV_EggRoutines.cpp
new file mode 100644
index 0000000000..d27ca61872
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Eggs/PokemonSV_EggRoutines.cpp
@@ -0,0 +1,930 @@
+/*  Egg Routines
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Exceptions.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonFramework/Tools/ErrorDumper.h"
+#include "CommonFramework/Tools/ProgramEnvironment.h"
+#include "CommonTools/Options/LanguageOCROption.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "Pokemon/Options/Pokemon_StatsHuntFilter.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonSV/Inference/PokemonSV_WhiteButtonDetector.h"
+#include "VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxEggDetector.h"
+#include "VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxGenderDetector.h"
+#include "VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxShinyDetector.h"
+#include "VideoGames/PokemonSV/Inference/Boxes/PokemonSV_IvJudgeReader.h"
+#include "VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxNatureDetector.h"
+#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h"
+#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_GradientArrowDetector.h"
+#include "VideoGames/PokemonSV/Inference/Battles/PokemonSV_NormalBattleMenus.h"
+#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h"
+#include "VideoGames/PokemonSV/Programs/Boxes/PokemonSV_BoxRoutines.h"
+#include "VideoGames/PokemonSV/Programs/Sandwiches/PokemonSV_SandwichRoutines.h"
+#include "VideoGames/PokemonSV/Programs/Battles/PokemonSV_SinglesBattler.h"
+#include "PokemonSV_EggRoutines.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+namespace{
+
+
+void clear_mons_in_front(
+    const ProgramInfo& info,
+    VideoStream& stream, ProControllerContext& context
+){
+    stream.log("Waiting for all " + STRING_POKEMON + " in front of you to get out of the way...");
+    WhiteButtonWatcher button(
+        COLOR_YELLOW, WhiteButton::ButtonA,
+        {0.020, 0.590, 0.035, 0.060},
+        WhiteButtonWatcher::FinderType::GONE
+    );
+    int ret = run_until<ProControllerContext>(
+        stream, context,
+        [&](ProControllerContext& context){
+            for (size_t c = 0; c < 40; c++){
+                context.wait_for_all_requests();
+                context.wait_for(std::chrono::seconds(30));
+                stream.log("A " + Pokemon::STRING_POKEMON + " is standing in the way. Whistling and waiting 30 seconds...", COLOR_RED);
+                pbf_press_button(context, BUTTON_R, 160ms, 0ms);
+            }
+        },
+        {button}
+    );
+    if (ret < 0){
+        dump_image_and_throw_recoverable_exception(
+            info, stream, "UnableToClearObstacle",
+            "Unable to clear " + STRING_POKEMON + " in front of you after 20 min."
+        );
+    }
+#if 0
+    WhiteButtonDetector detector(COLOR_RED, WhiteButton::ButtonA, {0.020, 0.590, 0.035, 0.060});
+    while (detector.detect(console.video().snapshot())){
+        pbf_press_button(context, BUTTON_R, 20, 30000ms);
+        context.wait_for_all_requests();
+    }
+#endif
+}
+
+
+
+
+// Call this function when an egg hatching dialog is detected.
+// This function presses A to finish the egg hatching dialogs and updates logs and calls callback functions.
+// egg_idx: currently which egg in the party is hatching. 0-indexed.
+void handle_egg_hatching(
+    const ProgramInfo& info,
+    VideoStream& stream, ProControllerContext& context,
+    uint8_t num_eggs_in_party,
+    uint8_t egg_idx,
+    std::function<void(uint8_t)> egg_hatched_callback
+){
+    stream.log("Detect hatching dialog: " + std::to_string(egg_idx+1) + "/" + std::to_string(num_eggs_in_party));
+    stream.overlay().add_log("Hatched " + std::to_string(egg_idx+1) + "/" + std::to_string(num_eggs_in_party), COLOR_GREEN);
+    OverworldWatcher overworld(stream.logger(), COLOR_CYAN);
+    int ret = run_until<ProControllerContext>(
+        stream, context,
+        [](ProControllerContext& context){
+            ssf_press_right_joystick(context, {-1, 0}, 0ms, 760ms);
+            for (int i = 0; i < 60; i++){
+                pbf_mash_button(context, BUTTON_A, 1000ms);
+            }
+        },
+        {overworld}
+    );
+    if (ret < 0){
+        dump_image_and_throw_recoverable_exception(
+            info, stream, "NoHatchingEnd",
+            "No end of egg hatching detected after one minute."
+        );
+    }
+    stream.log("Finished hatching animation and dialog.");
+
+    if (egg_hatched_callback){
+        egg_hatched_callback(egg_idx);
+    }
+}
+
+// Assuming on your legendary ride and camera facing the same direction as the player character,
+// Turning right to do circullar motion to hatch eggs.
+// Function returns when a dialog is detected, meaning an egg is hatching.
+// Throw exception when no egg hatching detected after 10 minutes.
+bool do_egg_cycle_motion(
+    ProgramEnvironment& env,
+    VideoStream& stream, ProControllerContext& context,
+    EventNotificationOption* attacked_notification,
+    const SinglesAIOption* battle_ai,
+    std::atomic<uint64_t>* attacked
+){
+    AdvanceDialogWatcher dialog(COLOR_RED);
+    NormalBattleMenuWatcher battle_menu(COLOR_GREEN);
+    int ret = run_until<ProControllerContext>(
+        stream, context,
+        [&](ProControllerContext& context){
+            // hatch circle:
+            // Left joystick forward, right joystick right
+            // click left joystick
+            ssf_press_left_joystick(context, {0, +1}, 0ms, std::chrono::minutes(10));
+            ssf_press_right_joystick(context, {+1, 0}, 0ms, std::chrono::minutes(10));
+            pbf_press_button(context, BUTTON_LCLICK, std::chrono::minutes(10), 0ms);
+        },
+        {
+            dialog,
+            battle_menu,
+        }
+    );
+    switch (ret){
+    case 0:
+        break;
+    case 1:
+        stream.log("You got attacked!", COLOR_RED);
+        if (attacked){
+            (*attacked)++;
+            env.update_stats();
+        }
+        if (attacked_notification){
+            send_program_recoverable_error_notification(
+                env, *attacked_notification,
+                "You got attacked!",
+                *stream.video().snapshot_latest_blocking().frame,
+                false
+            );
+        }
+        if (battle_ai != nullptr && battle_ai->enabled()){
+            run_singles_battle(stream, context, *battle_ai, false);
+            return true;
+        }
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::NO_ERROR_REPORT,
+            "Detected battle menu. You got attacked!",
+            stream
+        );
+    default:
+        dump_image_and_throw_recoverable_exception(
+            env.program_info(), stream, "NoEggToHatch",
+            "No more egg hatch after 10 minutes."
+        );
+    }
+
+    return false;
+}
+
+} // anonymous namespace
+
+void order_compote_du_fils(
+    const ProgramInfo& info,
+    VideoStream& stream, ProControllerContext& context
+){
+    // We start this function when we enter the restaurant without pressing any button.
+
+    // Se we first press A to clear a dialog:
+    pbf_press_button(context, BUTTON_A, 240ms, 800ms);
+
+    bool paid = false;
+    bool eating = false;
+    while(eating == false){
+        context.wait_for_all_requests();
+
+        AdvanceDialogWatcher dialog_watcher(COLOR_RED, DialogType::DIALOG_ALL, std::chrono::milliseconds(100));
+        GradientArrowWatcher menu_item_0_watcher(COLOR_BLUE, GradientArrowType::RIGHT, {0.037, 0.224, 0.074, 0.104});
+        GradientArrowWatcher menu_item_1_watcher(COLOR_BLUE, GradientArrowType::RIGHT, {0.037, 0.339, 0.074, 0.104});
+        PromptDialogWatcher prompt_watcher(COLOR_RED, {0.535, 0.450, 0.367, 0.124});
+        
+        int ret = wait_until(
+            stream, context,
+            std::chrono::seconds(60),
+            {dialog_watcher, menu_item_0_watcher, menu_item_1_watcher, prompt_watcher}
+        );
+
+        switch (ret){
+        case 0:
+            stream.log("Detected dialog advance.");
+            if (paid){
+                // This is a dialog box after we have paid the food.
+                // Mash A to clear any remaining dialog before a very long eating animation.
+                pbf_mash_button(context, BUTTON_A, 2400ms);
+                context.wait_for_all_requests();
+                eating = true;
+            }else{
+                pbf_press_button(context, BUTTON_A, 240ms, 800ms);
+            }
+            break;
+        case 1:
+            stream.log("Detected restaurant menu.");
+            stream.overlay().add_log("Restaurant menu", COLOR_WHITE);
+            pbf_press_dpad(context, DPAD_DOWN, 240ms, 480ms);
+            break;
+        case 2:
+            stream.log("Detected the dish we want.");
+            pbf_press_button(context, BUTTON_A, 240ms, 800ms);
+            break;
+        case 3:
+            stream.log("Detected the payment prompt.");
+            stream.overlay().add_log("Pay dish", COLOR_WHITE);
+            pbf_press_button(context, BUTTON_A, 240ms, 800ms);
+            paid = true;
+            break;
+        default:
+            dump_image_and_throw_recoverable_exception(
+                info, stream, "ErrorOrderFood",
+                "order_compote_du_fils(): No recognized state in restaurant menu after 60 seconds."
+            );
+        }
+    } // end state machine for restaurant menu
+
+    { // Now wait for eating animation to finish.
+        AdvanceDialogWatcher dialog_watcher(COLOR_RED, DialogType::DIALOG_ALL, std::chrono::milliseconds(100));
+        int ret = run_until<ProControllerContext>(
+            stream, context,
+            [](ProControllerContext& context){
+                for (int i = 0; i < 60; i++){
+                    pbf_press_button(context, BUTTON_A, 200ms, 800ms);
+                }
+            },
+            {{dialog_watcher}}
+        );
+        if (ret < 0){
+            dump_image_and_throw_recoverable_exception(
+                info, stream, "EndDiningNotDetected",
+                "order_compote_du_fils(): No end of eating after 60 seconds."
+            );
+        }
+    }
+
+    // Now leaving the restaurant
+    pbf_mash_button(context, BUTTON_B, 720ms);
+    pbf_wait(context, 800ms);
+    while(true){
+        context.wait_for_all_requests();
+
+        AdvanceDialogWatcher dialog_watcher(COLOR_RED, DialogType::DIALOG_ALL, std::chrono::milliseconds(100));
+        OverworldWatcher overworld(stream.logger(), COLOR_CYAN);
+        int ret = wait_until(
+            stream, context,
+            std::chrono::seconds(60),
+            {dialog_watcher, overworld}
+        );
+        if (ret == 0){
+            pbf_press_button(context, BUTTON_A, 240ms, 800ms);
+            continue;
+        }else if (ret == 1){
+            return; // outside restaurant
+        }else{
+            dump_image_and_throw_recoverable_exception(
+                info, stream, "EndLeavingRestaurantNotDetected",
+                "order_compote_du_fils(): No end of leaving restaurant after 60 seconds."
+            );
+        }
+    }
+}
+
+void picnic_at_zero_gate(
+    const ProgramInfo& info,
+    VideoStream& stream, ProControllerContext& context
+){
+    // Orient camera to look at same direction as player character
+    // This is needed because when save-load the game, the camera is reset
+    // to this location.
+    pbf_press_button(context, BUTTON_L, 400ms, 320ms);
+
+    // Move right to make player character facing away from Aera Zero observation station
+    pbf_move_left_joystick(context, {+1, +0.75}, 400ms, 400ms);
+    // Press L to move camera to face the same direction as the player character
+    pbf_press_button(context, BUTTON_L, 400ms, 320ms);
+    // Move forward
+    pbf_move_left_joystick(context, {0, +1}, 1000ms, 0ms);
+
+    picnic_from_overworld(info, stream, context);
+}
+
+bool eat_egg_sandwich_at_picnic(
+    ProgramEnvironment& env,
+    VideoStream& stream, ProControllerContext& context,
+    EggSandwichType sandwich_type,
+    Language language
+){
+    // Move forward to table to make sandwich
+    pbf_move_left_joystick(context, {0, +1}, 240ms, 320ms);
+    context.wait_for_all_requests();
+
+    clear_mons_in_front(env.program_info(), stream, context);
+    if (enter_sandwich_recipe_list(env.program_info(), stream, context) == false){
+        return false;
+    }
+    switch (sandwich_type){
+    case EggSandwichType::GREAT_PEANUT_BUTTER:
+    {
+        if (select_sandwich_recipe(env.program_info(), stream, context, 17) == false){
+            // cannot find the sandwich recipe, either user has not unlocked it or does not have enough ingredients:
+            return false;
+        }
+        std::map<std::string, uint8_t> fillings = { {"banana", (uint8_t)1} };
+        std::vector<std::string> fillings_sorted;
+        fillings_sorted.push_back("banana");
+        int plates = 1;
+        run_sandwich_maker(env, stream, context, language, fillings, fillings_sorted, plates);
+        break;
+    }
+    case EggSandwichType::TWO_SWEET_HERBS:
+    case EggSandwichType::SALTY_SWEET_HERBS:
+    case EggSandwichType::BITTER_SWEET_HERBS:
+        enter_custom_sandwich_mode(env.program_info(), stream, context);
+        if (language == Language::None){
+            throw UserSetupError(stream.logger(), "Must set game language option to read ingredient lists to make herb sandwich.");
+        }
+        make_two_herbs_sandwich(
+            env,
+            stream, context,
+            sandwich_type,
+            language
+        );
+        finish_sandwich_eating(env.program_info(), stream, context);
+        break;
+    default:
+        throw InternalProgramError(&stream.logger(), PA_CURRENT_FUNCTION, "Unknown EggSandwichType");
+    }
+
+    return true;
+}
+
+void collect_eggs_after_sandwich(
+    const ProgramInfo& info,
+    VideoStream& stream, ProControllerContext& context,
+    size_t basket_wait_seconds,
+    size_t max_eggs,
+    size_t& num_eggs_collected,
+    std::function<void(size_t new_eggs)> basket_check_callback
+){
+    context.wait_for_all_requests();
+    stream.log("Move past picnic table");
+    stream.overlay().add_log("Move past picnic table", COLOR_WHITE);
+
+    //  Recall your ride to reduce obstacles.
+    pbf_press_button(context, BUTTON_PLUS, 160ms, 840ms);
+
+#if 0
+    // this sequence will purposefully fail if Camera support is off. 
+    // If we fail to reach the egg basket, we can then check that Camera support is on.
+
+    //  Move forward to table
+    pbf_move_left_joystick(context, {0, +1}, 640ms, 320ms);
+    //  Move left
+    pbf_move_left_joystick(context, {-1, 0}, 320ms, 320ms);
+    //  Move forward to pass table
+    pbf_move_left_joystick(context, {0, +1}, 640ms, 320ms);
+    //  Move right
+    pbf_move_left_joystick(context, {+1, 0}, 320ms, 680ms);
+    //  Move back/right to align to basket
+    pbf_move_left_joystick(context, 240, 255, 320ms, 320ms);
+
+    //  Move closer to the basket, up to the table
+    pbf_press_button(context, BUTTON_L, 160ms, 840ms);
+    pbf_move_left_joystick(context, {0, +1}, 800ms, 320ms);
+
+    //  face away from the table
+    pbf_press_button(context, BUTTON_L, 160ms, 840ms);
+    pbf_move_left_joystick(context, {0, -1}, 80ms, 320ms);
+#endif
+
+#if 1
+    // this sequence will work with both Camera Support being Off and On
+
+    //  Move forward to table
+    pbf_move_left_joystick(context, {0, +1}, 320ms, 480ms);
+
+    //  Move left
+    pbf_move_left_joystick(context, {-1, 0}, 80ms, 480ms);
+    pbf_press_button(context, BUTTON_L, 120ms, 480ms);
+    pbf_move_left_joystick(context, {0, +1}, 320ms, 480ms);
+
+    //  Move forward to pass table
+    pbf_move_left_joystick(context, {+1, 0}, 80ms, 480ms);
+    pbf_press_button(context, BUTTON_L, 120ms, 480ms);
+    pbf_move_left_joystick(context, {0, +1}, 640ms, 480ms);
+
+    //  Move right
+    pbf_move_left_joystick(context, {+1, 0}, 80ms, 480ms);
+    pbf_press_button(context, BUTTON_L, 120ms, 480ms);
+    pbf_move_left_joystick(context, {0, +1}, 320ms, 480ms);
+
+    //  Turn right to face basket
+    pbf_move_left_joystick(context, {+1, 0}, 80ms, 480ms);
+    pbf_press_button(context, BUTTON_L, 120ms, 480ms);
+
+    //  Move closer to the basket, up to the table
+    pbf_move_left_joystick(context, {0, +1}, 800ms, 480ms);
+
+    //  back away from the table, then face forwards towards the basket again
+    pbf_move_left_joystick(context, {0, -1}, 200ms, 480ms);
+    pbf_move_left_joystick(context, {0, +1}, 80ms, 480ms);
+    pbf_press_button(context, BUTTON_L, 120ms, 480ms);   
+#endif
+
+#if 0
+    //  Move left
+    pbf_move_left_joystick(context, {-1, 0}, 320ms, 320ms);
+    //  Move forward to pass table
+    pbf_move_left_joystick(context, {0, +1}, 640ms, 320ms); // old value: 80
+    //  Move right
+    pbf_move_left_joystick(context, {+1, 0}, 400ms, 320ms);
+    //  Move back to face basket
+    pbf_move_left_joystick(context, {0, -1}, 80ms, 320ms);
+
+    //  Move closer to the basket.
+    pbf_press_button(context, BUTTON_L, 160ms, 840ms);
+    pbf_move_left_joystick(context, {0, +1}, 80ms, 320ms);
+#endif
+
+
+    context.wait_for_all_requests();
+    
+    const size_t default_collection_interval_seconds = basket_wait_seconds;
+    const auto max_egg_wait_time = std::chrono::minutes(30);
+
+    size_t num_checks = 0;
+    size_t eggs_collected_cur_session = 0;
+
+    WallClock start = current_time();
+    while(true){
+        const size_t last_num_eggs_collected = num_eggs_collected;
+
+        clear_mons_in_front(info, stream, context);
+        check_basket_to_collect_eggs(info, stream, context, max_eggs, num_eggs_collected);
+
+        const size_t new_eggs_added = num_eggs_collected - last_num_eggs_collected;
+        basket_check_callback(new_eggs_added);
+        eggs_collected_cur_session += new_eggs_added;
+        num_checks++;
+
+        if (num_eggs_collected == max_eggs){
+            stream.log("Collected enough eggs: " + std::to_string(max_eggs));
+            break;
+        }
+
+        if (current_time() - start > max_egg_wait_time){
+            stream.log("Picnic time up.");
+            stream.overlay().add_log("Picnic time up", COLOR_YELLOW);
+            break;
+        }
+        context.wait_for_all_requests();
+
+        const size_t remaining_eggs = max_eggs - num_eggs_collected;
+        const float average_eggs_per_check = eggs_collected_cur_session / (float)num_checks;
+
+        size_t wait_seconds = basket_wait_seconds;
+        if (remaining_eggs < average_eggs_per_check){
+            // If we have few remaining eggs to hatch, adjust wait time accordingly.
+            wait_seconds = size_t(remaining_eggs * default_collection_interval_seconds / average_eggs_per_check);
+            stream.log("Last remaining eggs: " + std::to_string(remaining_eggs) + ", avg eggs per check: " +
+                std::to_string(average_eggs_per_check) + ", wait secs: " + std::to_string(wait_seconds) + ".");
+            if (wait_seconds < 30){
+                // Minimum wait period is 30 sec.
+                stream.log("Clamp wait time to 30 secs.");
+                wait_seconds = 30;
+            }
+        }
+        
+        stream.log("Collected " + std::to_string(num_eggs_collected) + " eggs, avg eggs per check: " + std::to_string(average_eggs_per_check)
+            + ", wait " + std::to_string(wait_seconds) + " seconds.");
+        stream.overlay().add_log("Wait " + std::to_string(wait_seconds) + " secs", COLOR_WHITE);
+        
+        context.wait_for(std::chrono::seconds(wait_seconds));
+    }
+}
+
+void check_basket_to_collect_eggs(
+    const ProgramInfo& info,
+    VideoStream& stream, ProControllerContext& context,
+    size_t max_eggs, size_t& num_eggs_collected
+){
+    bool checked = false;
+    size_t consecutive_nothing = 0;
+    Button last_prompt = BUTTON_NONE;
+    bool pending_refuse = false;
+
+    WallClock start = current_time();
+    while (true){
+        if (current_time() - start > std::chrono::minutes(5)){
+            dump_image_and_throw_recoverable_exception(
+                info, stream, "CheckEggsTimedOut",
+                "check_basket_to_collect_eggs(): Still picking up eggs after 5 minutes."
+            );
+        }
+
+        DialogBoxWatcher picnic(COLOR_RED, false, std::chrono::milliseconds(500));
+        AdvanceDialogWatcher advance(COLOR_RED);
+        PromptDialogWatcher prompt(COLOR_RED, {0.623, 0.530, 0.243, 0.119});
+
+        context.wait_for_all_requests();
+        int ret = wait_until(
+            stream, context,
+            std::chrono::seconds(5),
+            {
+                picnic,
+                advance,
+                prompt,
+            }
+        );
+        context.wait_for(std::chrono::milliseconds(100));
+
+        if (ret != 0){
+            consecutive_nothing = 0;
+        }
+
+        switch (ret){
+        case 0:
+            stream.log("Detected no dialog.");
+            consecutive_nothing++;
+            last_prompt = BUTTON_NONE;
+            if (consecutive_nothing >= 10){
+                dump_image_and_throw_recoverable_exception(
+                    info, stream, "BasketNotFound",
+                    "check_basket_to_collect_eggs(): Basket not found after 10 attempts.\n"
+                    "Please make sure that the \"Camera Support\" option is set to \"On\"."
+                );
+            }
+            if (checked){
+                stream.log("Done talking to basket.");
+                return;
+            }
+            stream.log("Attempting to talk to basket...");
+            pbf_press_button(context, BUTTON_A, 160ms, 240ms);
+            continue;
+
+        case 1:
+            stream.log("Detected advanced dialog.");
+            last_prompt = BUTTON_NONE;
+            pbf_press_button(context, BUTTON_B, 160ms, 240ms);
+            checked = true;
+            continue;
+
+        case 2:
+            if (last_prompt != 0){
+                stream.log("Detected 2nd consecutive prompt. (unexpected)", COLOR_RED);
+                //  Repeat the previous button press.
+                pbf_press_button(context, last_prompt, 160ms, 640ms);
+                continue;
+            }
+
+            if (pending_refuse){
+                stream.log("Confirming refused egg...");
+                pbf_press_button(context, BUTTON_A, 160ms, 640ms);
+                pending_refuse = false;
+                continue;
+            }
+
+            if (num_eggs_collected < max_eggs){
+                num_eggs_collected++;
+                
+                std::string msg = std::to_string(num_eggs_collected) + "/" + std::to_string(max_eggs);
+                stream.log("Found an egg " + msg + ". Keeping...");
+                stream.overlay().add_log("Egg " + msg, COLOR_GREEN);
+                pbf_press_button(context, BUTTON_A, 160ms, 640ms);
+                
+                last_prompt = BUTTON_A;
+            }else{
+                stream.log("Found an egg! But we already have enough...");
+                stream.overlay().add_log("Full. Skip egg.", COLOR_WHITE);
+                pbf_press_button(context, BUTTON_B, 160ms, 640ms);
+                last_prompt = BUTTON_B;
+                pending_refuse = true;
+            }
+            continue;
+
+        default:
+//            dump_image_and_throw_recoverable_exception(
+//                info, console, "CheckEggsNoState",
+//                "check_basket_to_collect_eggs(): No state detected after 5 seconds."
+//            );
+            stream.log("Rotating view and trying again...", COLOR_RED);
+            pbf_move_right_joystick(context, {-1, 0}, 240ms, 0ms);
+        }
+
+    }
+}
+
+
+std::pair<uint8_t, uint8_t> check_egg_party_column(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+    context.wait_for_all_requests();
+    BoxEggPartyColumnWatcher egg_column_watcher;
+    int ret = wait_until(
+        stream, context,
+        std::chrono::seconds(10),
+        {egg_column_watcher}
+    );
+    if (ret < 0){
+        dump_image_and_throw_recoverable_exception(
+            info, stream, "CannotReadPartyEggs",
+            "check_egg_party_column(): Cannot read party eggs in box system."
+        );
+    }
+    return {egg_column_watcher.num_eggs_found(), egg_column_watcher.num_non_egg_pokemon_found()};
+}
+
+uint8_t check_non_eggs_count_in_party(
+    const ProgramInfo& info,
+    VideoStream& stream, ProControllerContext& context,
+    uint8_t expected_non_eggs_count_in_party
+){
+    auto counts = check_egg_party_column(info, stream, context);
+    if (counts.second != expected_non_eggs_count_in_party){
+        dump_image_and_throw_recoverable_exception(
+            info, stream, "NonEggPokemonInParty",
+            "check_non_eggs_count_in_party(): Found non-egg " + STRING_POKEMON + " in party"
+        );
+    }
+    return counts.first;
+}
+
+void hatch_eggs_at_zero_gate(
+    ProgramEnvironment& env,
+    VideoStream& stream, ProControllerContext& context,
+    EventNotificationOption* attacked_notification,
+    const SinglesAIOption* battle_ai,
+    std::atomic<uint64_t>* attacked,
+    uint8_t num_eggs_in_party,
+    std::function<void(uint8_t)> egg_hatched_callback)
+{
+    bool got_off_ramp = false;
+    for (uint8_t egg_idx = 0; egg_idx < num_eggs_in_party; egg_idx++){
+        stream.log("Hatching egg " + std::to_string(egg_idx+1) + "/" + std::to_string(num_eggs_in_party) + ".");
+        stream.overlay().add_log("Hatching egg " + std::to_string(egg_idx+1) + "/" + std::to_string(num_eggs_in_party), COLOR_BLUE);
+
+        // Orient camera to look at same direction as player character
+        // This is needed because when save-load the game, the camera is reset
+        // to this location.
+        pbf_press_button(context, BUTTON_L, 400ms, 320ms);
+
+        context.wait_for_all_requests();
+
+        if (got_off_ramp == false){
+            AdvanceDialogWatcher dialog(COLOR_RED);
+            // first, get off ramp to the empty field for circling motions
+            int ret = run_until<ProControllerContext>(
+                stream, context,
+                [&](ProControllerContext& context){
+                    if (egg_idx == 0){
+                        // At beginning, ride on Koraidon/Miradon and go off ramp:
+                        pbf_press_button(context, BUTTON_PLUS, 400ms, 800ms);
+                        // Move right to make player character facing away from Aera Zero observation station
+                        pbf_move_left_joystick(context, {+1, +1}, 400ms, 400ms);
+                        // Press L to move camera to face the same direction as the player character
+                        pbf_press_button(context, BUTTON_L, 400ms, 320ms);
+                        // Move forward
+                        pbf_move_left_joystick(context, {0, +1}, 1600ms, 0ms);
+                    }
+                },
+                {dialog}
+            );
+            if (ret == 0){
+                // egg hatching when going off ramp:
+                handle_egg_hatching(
+                    env.program_info(),
+                    stream,
+                    context,
+                    num_eggs_in_party,
+                    egg_idx,
+                    egg_hatched_callback
+                );
+                reset_position_at_zero_gate(env.program_info(), stream, context);
+                continue;
+            }
+
+            got_off_ramp = true;
+            stream.log("Got off ramp");
+        }
+
+        // Circular motions:
+        while (do_egg_cycle_motion(
+            env,
+            stream,
+            context,
+            attacked_notification,
+            battle_ai,
+            attacked
+        )){
+            reset_position_at_zero_gate(env.program_info(), stream, context);
+        }
+
+        handle_egg_hatching(
+            env.program_info(),
+            stream,
+            context,
+            num_eggs_in_party,
+            egg_idx,
+            egg_hatched_callback
+        );
+    } // end hatching each egg
+}
+
+void hatch_eggs_at_area_three_lighthouse(
+    ProgramEnvironment& env,
+    VideoStream& stream, ProControllerContext& context,
+    EventNotificationOption* attacked_notification,
+    const SinglesAIOption* battle_ai,
+    std::atomic<uint64_t>* attacked,
+    uint8_t num_eggs_in_party,
+    std::function<void(uint8_t)> egg_hatched_callback)
+{
+    bool got_off_ramp = false;
+    for (uint8_t egg_idx = 0; egg_idx < num_eggs_in_party; egg_idx++){
+        stream.log("Hatching egg " + std::to_string(egg_idx+1) + "/" + std::to_string(num_eggs_in_party) + ".");
+        stream.overlay().add_log("Hatching egg " + std::to_string(egg_idx+1) + "/" + std::to_string(num_eggs_in_party), COLOR_BLUE);
+
+        // Orient camera to look at same direction as player character
+        // This is needed because when save-load the game, the camera is reset
+        // to this location.
+        pbf_press_button(context, BUTTON_L, 400ms, 320ms);
+
+        context.wait_for_all_requests();
+
+        if (got_off_ramp == false){
+            AdvanceDialogWatcher dialog(COLOR_RED);
+            // first, navigate to a clear area in the team star base for circling motions
+            int ret = run_until<ProControllerContext>(
+                stream, context,
+                [&](ProControllerContext& context){
+                    if (egg_idx == 0){
+                        //Run forward a bit
+                        pbf_move_left_joystick(context, {0, +1}, 1200ms, 160ms);
+                        //Face at an angle, to avoid the tent to the left
+                        pbf_move_left_joystick(context, {-1, +1}, 400ms, 400ms);
+                        //Get on your mount
+                        pbf_press_button(context, BUTTON_L, 400ms, 320ms);
+                        pbf_press_button(context, BUTTON_PLUS, 400ms, 800ms);
+                        //Go in deep, spawns outside the fence like to come in otherwise
+                        pbf_move_left_joystick(context, {0, +1}, 6000ms, 0ms);
+                        pbf_move_left_joystick(context, {-1, +1}, 400ms, 400ms);
+                        pbf_press_button(context, BUTTON_L, 400ms, 320ms);
+                        pbf_move_left_joystick(context, {0, +1}, 4400ms, 0ms);
+                    }
+                },
+                {dialog}
+            );
+            if (ret == 0){
+                // egg hatching when going off ramp:
+                handle_egg_hatching(
+                    env.program_info(),
+                    stream,
+                    context,
+                    num_eggs_in_party,
+                    egg_idx,
+                    egg_hatched_callback
+                );
+
+                stream.log("Reset location by flying back to lighthouse.");
+                // Use map to fly back to the flying spot
+                open_map_from_overworld(env.program_info(), stream, context);
+                pbf_move_left_joystick(context, {+0.567, +1}, 160ms, 400ms);
+                fly_to_overworld_from_map(env.program_info(), stream, context);
+                continue;
+            }
+
+            got_off_ramp = true;
+            stream.log("Got off ramp");
+        }
+
+        // Circular motions:
+        while (do_egg_cycle_motion(
+            env,
+            stream,
+            context,
+            attacked_notification,
+            battle_ai,
+            attacked
+        )){
+            open_map_from_overworld(env.program_info(), stream, context);
+            pbf_move_left_joystick(context, {+0.567, +1}, 160ms, 400ms);
+            fly_to_overworld_from_map(env.program_info(), stream, context);
+        }
+
+        handle_egg_hatching(
+            env.program_info(),
+            stream,
+            context,
+            num_eggs_in_party,
+            egg_idx,
+            egg_hatched_callback
+        );
+    } // end hatching each egg
+}
+
+void hatch_eggs_anywhere(
+    ProgramEnvironment& env,
+    VideoStream& stream, ProControllerContext& context,
+    bool already_on_ride,
+    uint8_t num_eggs_in_party,
+    std::function<void(uint8_t)> egg_hatched_callback
+){
+    if (!already_on_ride){
+        // At beginning, ride on Koraidon/Miradon and go off ramp:
+        pbf_press_button(context, BUTTON_PLUS, 400ms, 800ms);
+        context.wait_for_all_requests();
+    }
+
+    for (uint8_t egg_idx = 0; egg_idx < num_eggs_in_party; egg_idx++){
+        stream.log("Hatching egg " + std::to_string(egg_idx+1) + "/" + std::to_string(num_eggs_in_party) + ".");
+        stream.overlay().add_log("Hatching egg " + std::to_string(egg_idx+1) + "/" + std::to_string(num_eggs_in_party), COLOR_BLUE);
+
+        // Orient camera to look at same direction as player character
+        // This is needed because when save-load the game, the camera is reset
+        // to this location.
+        pbf_press_button(context, BUTTON_L, 400ms, 320ms);
+
+        context.wait_for_all_requests();
+
+        // Circular motions:
+        do_egg_cycle_motion(env, stream, context, nullptr, nullptr, nullptr);
+
+        handle_egg_hatching(env.program_info(), stream, context, num_eggs_in_party, egg_idx, egg_hatched_callback);
+    } // end hatching each egg
+}
+
+
+void reset_position_at_zero_gate(
+    const ProgramInfo& info,
+    VideoStream& stream, ProControllerContext& context
+){
+    stream.log("Open map and reset location to Zero Gate.");
+    // Use map to fly back to the flying spot
+    open_map_from_overworld(info, stream, context);
+
+    pbf_move_left_joystick(context, {0, -0.252}, 160ms, 400ms);
+
+    fly_to_overworld_from_map(info, stream, context);
+}
+
+
+bool check_baby_info(
+    const ProgramInfo& info,
+    VideoStream& stream, ProControllerContext& context,
+    OCR::LanguageOCROption& LANGUAGE,
+    Pokemon::StatsHuntIvJudgeFilterTable& FILTERS,
+    Pokemon::StatsHuntAction& action
+){
+    context.wait_for_all_requests();
+
+    //  Only require the judge screen when a filter checks IVs. Players must unlock the
+    //  judge in the game, and those who don't filter on IVs may not have it. Shininess,
+    //  gender and nature can all be read from the plain stats screen.
+    Language language = LANGUAGE;
+    const bool read_ivs = language != Language::None && FILTERS.require_iv_judge();
+    if (read_ivs){
+        change_view_to_judge(stream, context, language);
+    }else{
+        change_view_to_stats_or_judge(stream, context);
+    }
+
+    VideoOverlaySet overlay_set(stream.overlay());
+
+    BoxShinyWatcher shiny_detector;
+    // BoxShinyDetector shiny_detector;
+    shiny_detector.make_overlays(overlay_set);
+
+    //  With `Language::None`, the reader skips OCR and reports every IV as unknown.
+    IvJudgeReaderScope iv_reader_scope(stream.overlay(), read_ivs ? language : Language::None);
+    BoxGenderDetector gender_detector;
+    gender_detector.make_overlays(overlay_set);
+    BoxNatureDetector nature_detector(stream.overlay(), LANGUAGE);
+
+    const int shiny_ret = wait_until(
+        stream, context,
+        std::chrono::milliseconds(500),
+        {shiny_detector}
+    );
+    const bool shiny = (shiny_ret == 0);
+    VideoSnapshot screen = stream.video().snapshot();
+    
+    IvJudgeReader::Results IVs = iv_reader_scope.read(stream.logger(), screen);
+    StatsHuntGenderFilter gender = gender_detector.detect(screen);
+    NatureReader::Results nature = nature_detector.read(stream.logger(), screen);
+
+    if (read_ivs){
+        stream.log(IVs.to_string(), COLOR_GREEN);
+    }else{
+        stream.log("IVs: not read (no filter checks IVs, or no game language set).", COLOR_GREEN);
+    }
+    stream.log("Gender: " + gender_to_string(gender), COLOR_GREEN);
+    stream.log(nature.to_string(), COLOR_GREEN);
+
+    action = FILTERS.get_action(shiny, gender, nature.nature, IVs);
+
+    return shiny;
+}
+
+}
+}
+}
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Eggs/PokemonSV_EggRoutines.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Eggs/PokemonSV_EggRoutines.h
new file mode 100644
index 0000000000..c9fdb2ef42
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Eggs/PokemonSV_EggRoutines.h
@@ -0,0 +1,158 @@
+/*  Egg Routines
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  Various functions to do egg related automation.
+ *  This file is used to prevent main function like EggAutonomous from becoming too long.
+ */
+
+#ifndef PokemonAutomation_PokemonSV_EggRoutines_H
+#define PokemonAutomation_PokemonSV_EggRoutines_H
+
+#include <functional>
+#include "CommonFramework/Notifications/EventNotificationOption.h"
+#include "CommonFramework/Tools/VideoStream.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+#include "VideoGames/PokemonSV/Options/PokemonSV_SinglesAIOption.h"
+#include "VideoGames/PokemonSV/Programs/Sandwiches/PokemonSV_SandwichRoutines.h"
+
+namespace PokemonAutomation{
+
+    struct ProgramInfo;
+    class ImageViewRGB32;
+
+    namespace OCR{
+        class LanguageOCROption;
+    }
+    namespace Pokemon{
+    enum class StatsHuntAction;
+    class StatsHuntIvJudgeFilterTable;
+    }
+
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+// While entering Gastronome En Famille, order the dish Compote du Fils.
+// This gives Egg Power Lv. 2 at price of 2800.
+void order_compote_du_fils(
+    const ProgramInfo& info,
+    VideoStream& stream, ProControllerContext& context
+);
+
+// Start at Zero Gate flying spot, go off ramp to start a picnic.
+void picnic_at_zero_gate(
+    const ProgramInfo& info,
+    VideoStream& stream, ProControllerContext& context
+);
+
+// Starting at the initial position of a picnic, go to picnic table to make a sandwich that gives egg power.
+// Can choose:
+// - Great Peanut Butter Sandwich to gain egg power Lv 2, must have unlocked its recipe and have enough ingredients to make all
+//   the sandwiches for all the unlocked recipes.
+// - Two-sweet-herbs, bitter-sweet-herbs or salty-sweet-herbs custom sandwich to gain egg power Lv 3, must have enough ingredinets and
+//   provide game language for OCR ingredient lists.
+// Return false if no needed sandwich ingredients or recipe.
+bool eat_egg_sandwich_at_picnic(
+    ProgramEnvironment& env,
+    VideoStream& stream, ProControllerContext& context,
+    EggSandwichType sandwich_type,
+    Language language
+);
+
+// After eating a sandwich, go around picnic table to wait at basket and collect eggs.
+// `num_eggs_collected` will be updated to add newly collected eggs.
+void collect_eggs_after_sandwich(
+    const ProgramInfo& info,
+    VideoStream& stream, ProControllerContext& context,
+    size_t basket_wait_seconds,
+    size_t max_eggs,
+    size_t& num_eggs_collected,
+    std::function<void(size_t new_eggs)> basket_check_callback);
+
+// Start at Zero Gate flying spot, go in circles in front of the lab to hatch eggs.
+// `egg_hatched_callback` will be called after each egg hatched, with egg index (0-indexed) 
+void hatch_eggs_at_zero_gate(
+    ProgramEnvironment& env,
+    VideoStream& stream, ProControllerContext& context,
+    EventNotificationOption* attacked_notification,
+    const SinglesAIOption* battle_ai,
+    std::atomic<uint64_t>* attacked,
+    uint8_t num_eggs_in_party,
+    std::function<void(uint8_t)> egg_hatched_callback = nullptr
+);
+
+// Start at North Province (Area Three) Lighthouse flying spot, go in circles in Ruchbah (fairy) Squad's base to hatch eggs.
+// Switch 2 only, this is an alternate egg hatch spot as Zero Gate now has spawns in the way.
+// Switch 1 is untested in this location but the area is extremely laggy.
+// This is a minor modification to hatch_eggs_at_zero_gate
+// `egg_hatched_callback` will be called after each egg hatched, with egg index (0-indexed)
+void hatch_eggs_at_area_three_lighthouse(
+    ProgramEnvironment& env,
+    VideoStream& stream, ProControllerContext& context,
+    EventNotificationOption* attacked_notification,
+    const SinglesAIOption* battle_ai,
+    std::atomic<uint64_t>* attacked,
+    uint8_t num_eggs_in_party,
+    std::function<void(uint8_t)> egg_hatched_callback = nullptr
+);
+
+// From overworld, go in circles to hatch eggs.
+// `egg_hatched_callback` will be called after each egg hatched, with egg index (0-indexed)
+// `already_on_ride`: whether the player character is on ride when starting the function.
+void hatch_eggs_anywhere(
+    ProgramEnvironment& env,
+    VideoStream& stream, ProControllerContext& context,
+    bool already_on_ride,
+    uint8_t num_eggs_in_party,
+    std::function<void(uint8_t)> egg_hatched_callback = nullptr
+);
+
+
+// Standing in front of basket during picnic, check basket and update egg count.
+void check_basket_to_collect_eggs(
+    const ProgramInfo& info,
+    VideoStream& stream, ProControllerContext& context,
+    size_t max_eggs, size_t& num_eggs_collected
+);
+
+// In box view, check the five slots in the party column, after party lead.
+// return how many eggs in the five slots, and how many non-egg pokemon in the five slots.
+// Note: make sure the current cursor does not float above the five slots, otherwise it may affect detection.
+std::pair<uint8_t, uint8_t> check_egg_party_column(
+    const ProgramInfo& info,
+    VideoStream& stream, ProControllerContext& context
+);
+
+// In box view, check whether there is the right amount of non-egg pokemon in the five slots in the party column, after party lead.
+// return how many eggs in the five slots.
+// Throw OperationFailedException if found unexpected non-egg pokemon count in the slots.
+// Note: make sure the current cursor does not float above the five slots, otherwise it may affect detection.
+uint8_t check_non_eggs_count_in_party(
+    const ProgramInfo& info,
+    VideoStream& stream, ProControllerContext& context,
+    uint8_t expected_non_eggs_count_in_party
+);
+
+
+// When hatching at Zero Gate, use this function to reset player character position back to Zero Gate flying spot
+void reset_position_at_zero_gate(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context);
+
+// Assuming the current selected slot in box system is a hatched pokemon, not empty space or egg,
+// check the hatched pokemon's info to determine what to do with it.
+// Return if the pokemon is shiny. The action to handle the pokemon is returned in `action`.
+// If any row in `FILTERS` checks an IV, the function switches to judge view to read IVs, and
+// throws OperationFailedException if the judge view can't be reached (e.g. it's not unlocked in game).
+// Otherwise it settles onto stats or judge view, whichever comes first, skips reading IVs and
+// regards them as unknown. So players who don't filter on IVs don't need the judge unlocked.
+bool check_baby_info(
+    const ProgramInfo& info,
+    VideoStream& stream, ProControllerContext& context,
+    OCR::LanguageOCROption& LANGUAGE,
+    Pokemon::StatsHuntIvJudgeFilterTable& FILTERS,
+    Pokemon::StatsHuntAction& action
+);
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_AuctionFarmer.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_AuctionFarmer.cpp
new file mode 100644
index 0000000000..ab4a2cd3cd
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_AuctionFarmer.cpp
@@ -0,0 +1,618 @@
+/*  Auction Farmer
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+//#include <iostream>
+#include <unordered_map>
+#include "Kernels/Waterfill/Kernels_Waterfill_Session.h"
+#include "CommonFramework/StaticGlobals.h"
+#include "CommonFramework/Exceptions/FatalProgramException.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/ImageTypes/BinaryImage.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/ImageMatch/ImageCropper.h"
+#include "CommonTools/Images/BinaryImage_FilterRgb32.h"
+#include "CommonTools/OCR/OCR_NumberReader.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "CommonTools/StartupChecks/VideoResolutionCheck.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+//#include "VideoGames/PokemonSV/PokemonSV_Settings.h"
+#include "VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.h"
+#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h"
+#include "VideoGames/PokemonSV/Inference/PokemonSV_AuctionItemNameReader.h"
+#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h"
+#include "VideoGames/PokemonSV/Resources/PokemonSV_AuctionItemNames.h"
+#include "PokemonSV_AuctionFarmer.h"
+
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+using namespace Pokemon;
+
+
+AuctionFarmer_Descriptor::AuctionFarmer_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonSV:AuctionFarmer",
+        STRING_POKEMON + " SV", "Auction Farmer",
+        "Programs/PokemonSV/AuctionFarmer.html",
+        "Check auctions and bid on items.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_PerformanceClassSensitive,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+struct AuctionFarmer_Descriptor::Stats : public StatsTracker{
+    Stats()
+        : m_resets(m_stats["Resets"])
+        , m_auctions(m_stats["Auctions"])
+        , m_money(m_stats["Spent Money"])
+        , m_errors(m_stats["Errors"])
+    {
+        m_display_order.emplace_back("Resets");
+        m_display_order.emplace_back("Auctions");
+        m_display_order.emplace_back("Spent Money");
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+    }
+    std::atomic<uint64_t>& m_resets;
+    std::atomic<uint64_t>& m_auctions;
+    std::atomic<uint64_t>& m_money;
+    std::atomic<uint64_t>& m_errors;
+};
+std::unique_ptr<StatsTracker> AuctionFarmer_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+
+AuctionFarmer::AuctionFarmer()
+    : LANGUAGE(
+        "<b>Game Language:</b><br>The language is needed to read which items are offered.",
+        AuctionItemNameReader::instance().languages(),
+        LockMode::LOCK_WHILE_RUNNING,
+        true
+    )
+    , TARGET_ITEMS("<b>Items:</b><br>Multiple Items can be selected. The program will bid on any selected item which is offered.")
+    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATION_AUCTION_WIN("Auction Win", true, false, ImageAttachmentMode::JPG, {"Notifs"})
+    , NOTIFICATIONS({
+        &NOTIFICATION_STATUS_UPDATE,
+        &NOTIFICATION_AUCTION_WIN,
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_RECOVERABLE,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+    , m_advanced_options("<font size=4><b>Advanced Options: (developer only)</b></font>")
+    , ONE_NPC("<b>One NPC:</b><br>Check only the NPC you're standing in front of. (Multiple NPCs in development)", LockMode::LOCK_WHILE_RUNNING, true)
+{
+    PA_ADD_OPTION(LANGUAGE);
+    PA_ADD_OPTION(TARGET_ITEMS);
+    PA_ADD_OPTION(NOTIFICATIONS);
+    if (STATIC_GLOBALS.DEVELOPER_MODE){
+        PA_ADD_STATIC(m_advanced_options);
+        PA_ADD_OPTION(ONE_NPC);
+    }
+}
+
+
+std::vector<ImagePixelBox> AuctionFarmer::detect_dialog_boxes(const ImageViewRGB32& screen){
+    using namespace Kernels::Waterfill;
+
+    uint32_t MIN_BORDER_THRESHOLD = 0xffc07000;
+    uint32_t MAX_BORDER_THRESHOLD = 0xffffc550;
+
+    uint32_t MIN_YELLOW_THRESHOLD = 0xffd0b000;
+    uint32_t MAX_YELLOW_THRESHOLD = 0xffffff30;
+
+    size_t width = screen.width();
+    size_t height = screen.height();
+
+
+    std::vector<ImagePixelBox> dialog_boxes;
+    {
+        PackedBinaryMatrix border_matrix = compress_rgb32_to_binary_range(screen, MIN_BORDER_THRESHOLD, MAX_BORDER_THRESHOLD);
+
+        std::unique_ptr<WaterfillSession> session = make_WaterfillSession(border_matrix);
+        auto iter = session->make_iterator(50);
+        WaterfillObject object;
+        while (iter->find_next(object, true)){
+            //  Discard objects touching the edge of the screen or bottom right corner where the map is located or if the object is too small
+            if (object.min_x == 0 || object.min_y == 0 // touching left or top edge
+                || object.max_x + 1 >= width || object.max_y + 1 >= height // touching right or bottom edge
+                || (object.max_x > width * 0.82 && object.max_y > height * 0.68) // touches mini map area
+                || object.width() < width * 0.0926 || object.height() < height * 0.0926 // object is too small
+            ){
+                continue;
+            }
+            dialog_boxes.emplace_back(object);
+
+//            static int c = 0;
+//            extract_box_reference(screen, object).save("image-" + std::to_string(c++) + ".png");
+
+#if 1
+            // check for yellow inside the orange border
+            ImagePixelBox border_pixel_box(object);
+//            ImageFloatBox border_float_box = pixelbox_to_floatbox(screen, border_pixel_box);
+            ImageViewRGB32 dialog = extract_box_reference(screen, border_pixel_box);
+            PackedBinaryMatrix yellow_matrix = compress_rgb32_to_binary_range(dialog, MIN_YELLOW_THRESHOLD, MAX_YELLOW_THRESHOLD);
+
+            std::unique_ptr<WaterfillSession> yellow_session = make_WaterfillSession(yellow_matrix);
+            auto yellow_iter = yellow_session->make_iterator(300);
+            WaterfillObject yellow_object;
+            while (yellow_iter->find_next(yellow_object, true)){
+                //  Discard small objects
+                if (object.width() < width * 0.0925 || object.height() < height * 0.0925){
+                    continue;
+                }
+
+//                extract_box_reference(dialog, yellow_object).save("yellow-" + std::to_string(c++) + ".png");
+
+//                ImagePixelBox dialog_pixel_box(yellow_object);
+                ImagePixelBox dialog_pixel_box;
+                dialog_pixel_box.min_x = border_pixel_box.min_x + yellow_object.min_x;
+                dialog_pixel_box.min_y = border_pixel_box.min_y + yellow_object.min_y;
+                dialog_pixel_box.max_x = dialog_pixel_box.min_x + yellow_object.width();
+                dialog_pixel_box.max_y = dialog_pixel_box.min_y + yellow_object.height();
+                
+//                ImageFloatBox translated_dialog_box = translate_to_parent(screen, border_float_box, dialog_pixel_box);
+//                dialog_boxes.emplace_back(translated_dialog_box);
+                dialog_boxes.emplace_back(dialog_pixel_box);
+            }
+#endif
+        }
+    }
+    return dialog_boxes;
+}
+
+
+void AuctionFarmer::reset_auctions(SingleSwitchProgramEnvironment& env, ProControllerContext& context, bool do_full_reset, uint8_t& year){
+    try{
+        if (do_full_reset){
+            if (year == MAX_YEAR){
+                go_home(env.console, context);
+                PokemonSwSh::home_roll_date_enter_game_autorollback(env.console, context, year);
+            }
+            save_game_from_overworld(env.program_info(), env.console, context);
+
+            go_home(env.console, context);
+            PokemonSwSh::home_roll_date_enter_game_autorollback(env.console, context, year);
+        }
+        pbf_wait(context, 1000ms);
+
+        go_home(env.console, context);
+        context.wait_for_all_requests();
+        reset_game_from_home(env.program_info(), env.console, context, 1000ms);
+    }catch (OperationFailedExceptionWithScreenshot& e){
+        AuctionFarmer_Descriptor::Stats& stats = env.current_stats<AuctionFarmer_Descriptor::Stats>();
+        stats.m_errors++;
+        env.update_stats();
+        throw FatalProgramException(e.error_report_mode(), e.message(), e.video_stream(), e.screenshot());
+    }
+}
+
+std::vector<std::pair<AuctionOffer, ImageFloatBox>> AuctionFarmer::check_offers(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    AuctionFarmer_Descriptor::Stats& stats = env.current_stats<AuctionFarmer_Descriptor::Stats>();
+
+    pbf_wait(context, 2000ms);
+    context.wait_for_all_requests();
+    
+    VideoSnapshot screen = env.console.video().snapshot();
+    std::vector<ImagePixelBox> dialog_boxes = detect_dialog_boxes(screen);
+    std::deque<OverlayBoxScope> bubbles_boxes;
+    std::deque<OverlayBoxScope> offer_overlay_boxes;
+    std::vector<std::pair<AuctionOffer, ImageFloatBox>> offers;
+
+    if (dialog_boxes.empty()){
+        stats.m_errors++;
+        send_program_recoverable_error_notification(env, NOTIFICATION_ERROR_RECOVERABLE, "Could not detect any offer dialogs.", screen);
+    }
+
+    // read dialog bubble
+    ImageFloatBox top_offer_box(0.05, 0.02, 0.90, 0.49);
+    ImageFloatBox bottom_offer_box(0.05, 0.49, 0.90, 0.49);
+    std::vector<ImageFloatBox> offer_boxes = {top_offer_box};
+    if (LANGUAGE == Language::Spanish || LANGUAGE == Language::ChineseTraditional){
+        offer_boxes.emplace_back(bottom_offer_box);
+    }
+
+    for (ImagePixelBox dialog_box : dialog_boxes){
+        for (ImageFloatBox offer_box : offer_boxes){
+            //        std::cout << "dialog_box: ["
+            //                << dialog_box.min_x << "," << dialog_box.min_y << "] - ["
+            //                << dialog_box.max_x << "," << dialog_box.max_y << "]" << std::endl;
+
+            ImageFloatBox dialog_float_box = pixelbox_to_floatbox(screen, dialog_box);
+            bubbles_boxes.emplace_back(env.console, dialog_float_box, COLOR_GREEN);
+
+
+            //        OverlayBoxScope dialog_overlay(env.console, dialog_box, COLOR_DARK_BLUE);
+            ImageFloatBox translated_offer_box = translate_to_parent(
+                screen,
+                dialog_float_box,
+                floatbox_to_pixelbox(dialog_box.width(), dialog_box.height(), offer_box)
+            );
+            //        std::cout << "translated_offer_box: ["
+            //                << translated_offer_box.x << "," << translated_offer_box.y << "] - ["
+            //                << translated_offer_box.width << "," << translated_offer_box.height << "]" << std::endl;
+
+            offer_overlay_boxes.emplace_back(env.console, translated_offer_box, COLOR_BLUE);
+
+            //        OverlayBoxScope offer_overlay(env.console, translated_offer_box, COLOR_BLUE);
+
+            ImageViewRGB32 dialog = extract_box_reference(screen, dialog_box);
+            ImageViewRGB32 offer_image = extract_box_reference(dialog, offer_box);
+
+            //        std::cout << offer_image.width() << " x " << offer_image.height() << std::endl;
+
+
+            const double LOG10P_THRESHOLD = -1.5;
+            std::string best_item;
+            OCR::StringMatchResult result = AuctionItemNameReader::instance().read_substring(
+                env.console, LANGUAGE,
+                offer_image,
+                OCR::BLACK_TEXT_FILTERS()
+            );
+
+            result.clear_beyond_log10p(LOG10P_THRESHOLD);
+            if (best_item.empty() && !result.results.empty()){
+                auto iter = result.results.begin();
+                if (iter->first < LOG10P_THRESHOLD){
+                    best_item = iter->second.token;
+
+                    AuctionOffer offer{ best_item };
+                    std::pair<AuctionOffer, ImageFloatBox> pair(offer, dialog_float_box);
+                    offers.emplace_back(pair);
+                }
+            }
+        }
+    }
+//  context.wait_for(std::chrono::seconds(100));
+    return offers;
+}
+
+bool AuctionFarmer::is_good_offer(AuctionOffer offer){
+    // Special handling for Japanese bottle cap items
+    bool any_bottle_cap = false;
+    if (LANGUAGE == Language::Japanese){
+        any_bottle_cap = (offer.item == "bottle-cap" || offer.item == "gold-bottle-cap") 
+            && (TARGET_ITEMS.find_item("bottle-cap") || TARGET_ITEMS.find_item("gold-bottle-cap"));
+    }
+
+    return TARGET_ITEMS.find_item(offer.item) || any_bottle_cap ;
+}
+
+// Move to auctioneer and interact
+void AuctionFarmer::move_to_auctioneer(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AuctionOffer offer){
+    AdvanceDialogWatcher advance_detector(COLOR_YELLOW);
+
+    size_t tries = 0;
+    while (tries < 10){
+        if (!ONE_NPC){
+            move_dialog_to_center(env, context, offer);
+            pbf_move_left_joystick(context, {0, +1}, 480ms, 80ms);
+        }
+
+        pbf_press_button(context, BUTTON_A, 160ms, 800ms);
+        int ret = wait_until(env.console, context, Milliseconds(4000), { advance_detector });
+
+        if (ret == 0){
+            return;
+        }
+        tries++;
+    }
+    OperationFailedExceptionWithScreenshot::fire(
+        ErrorReportMode::SEND_ERROR_REPORT,
+        "Too many attempts to talk to the NPC.",
+        env.console
+    );
+}
+
+// Dialog is the only piece of orientation we have, so the goal is to put it into the center of the screen so we know in which direction the character walks.
+// This is only used for multiple NPCs.
+void AuctionFarmer::move_dialog_to_center(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AuctionOffer wanted){
+    double center_x = 0.0f;
+    double center_y = 0.0f;
+    bool offer_visible = false;
+
+    while (center_x < 0.43 || center_x > 0.57){
+        context.wait_for_all_requests();
+        std::vector<std::pair<AuctionOffer, ImageFloatBox>> offers = check_offers(env, context);
+
+        for (const std::pair<AuctionOffer, ImageFloatBox>& offer : offers){
+            if (offer.first.item != wanted.item){
+                continue;
+            }
+            offer_visible = true;
+
+            center_x = offer.second.x + (0.5 * offer.second.width);
+            center_y = offer.second.y + (0.5 * offer.second.height);
+
+
+            // check whether the stop condition is fulfilled by now.
+            if (!(center_x < 0.43 || center_x > 0.57)){
+                break;
+            }
+
+            double distance_x_float = center_x * 2 - 1;
+            double distance_y_float = center_y * 2 - 1;
+            env.console.log(std::to_string(distance_x_float));
+            env.console.log(std::to_string(distance_y_float));
+
+            pbf_move_right_joystick(context, {distance_x_float, -distance_y_float}, 160ms, 160ms);
+
+            break;
+        }
+
+        if (!offer_visible){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "Lost offer dialog for wanted item.",
+                env.console
+            );
+        }
+    }
+}
+
+void AuctionFarmer::reset_position(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    if (ONE_NPC){
+        // No movement, player character should always be directly in front of an auctioneer.
+        return;
+    }
+
+    // move backwards, TODO: check position(?) and orientation
+    pbf_move_left_joystick(context, {0, -1}, 400ms, 160ms);
+    return;
+}
+
+
+uint64_t read_next_bid(VideoStream& stream, ProControllerContext& context, Language language, bool high){
+    // How much to cut off from the bid text in order to not read currencies and exclamation marks as numbers.
+    // Values are pixels for a 1920x1080 screen, negative values are padding
+    static const std::map<Language, std::pair<int, int>> cutoffs = {
+        { Language::English, {22, 6} },
+        { Language::Japanese, {-5, 54} },
+        { Language::Spanish, {6, 32} },
+        { Language::French, {-5, 45} },
+        { Language::German, {-5, 22} },
+        { Language::Italian, {-5, 35} },
+        { Language::Korean, {-5, 42} },
+        { Language::ChineseSimplified, {22, 7} },
+        { Language::ChineseTraditional, {22,7} }
+    };
+
+    static const std::map<Language, float> high_x = {
+        { Language::English, 0.75f },
+        { Language::Japanese, 0.75f },
+        { Language::Spanish, 0.73f },
+        { Language::French, 0.68f },
+        { Language::German, 0.73f },
+        { Language::Italian, 0.75f },
+        { Language::Korean, 0.75f },
+        { Language::ChineseSimplified, 0.75f },
+        { Language::ChineseTraditional, 0.75f }
+    };
+
+    static const std::map<Language, float> low_x = {
+        { Language::English, 0.75f },
+        { Language::Japanese, 0.75f },
+        { Language::Spanish, 0.75f },
+        { Language::French, 0.75f },
+        { Language::German, 0.73f },
+        { Language::Italian, 0.75f },
+        { Language::Korean, 0.75f },
+        { Language::ChineseSimplified, 0.75f },
+        { Language::ChineseTraditional, 0.75f }
+    };
+
+    float box_y = high ? 0.42f : 0.493f;
+    float box_x = high ? high_x.at(language) : low_x.at(language);
+    float width = 0.9f - box_x; // max_x is always the same for all languages
+    OverlayBoxScope box(stream.overlay(), { box_x, box_y, width, 0.048 });
+
+    std::unordered_map<uint64_t, size_t> read_bids;
+    size_t highest_read = 0;
+    uint64_t read_value = 0;
+
+    // read next bid multiple times since the selection arrow sometimes blocks the first digit
+    for (size_t i = 0; i < 10; i++){
+        VideoSnapshot screen = stream.video().snapshot();
+        double screen_scale = (double)screen->width() / 1920.0;
+        double vertical_padding = 5.0; // small amount of pixels so numbers do not touch the edge of the view when reading them
+
+        ImageViewRGB32 raw_bid_image = extract_box_reference(screen, box);
+        ImagePixelBox bid_bounding_box = ImageMatch::enclosing_rectangle_with_pixel_filter(
+            raw_bid_image,
+            [](Color pixel){
+                return (uint32_t)pixel.red() + pixel.green() + pixel.blue() < 250;
+            });
+
+        int32_t max_width = static_cast<int32_t>(raw_bid_image.width() - 1);
+        int32_t max_height = static_cast<int32_t>(raw_bid_image.height() - 1);
+        int32_t scaled_vertical_padding = static_cast<int32_t>(vertical_padding * screen_scale);
+        int32_t left_cutoff = static_cast<int32_t>(cutoffs.at(language).first * screen_scale);
+        int32_t right_cutoff = static_cast<int32_t>(cutoffs.at(language).second * screen_scale);
+
+        ImagePixelBox cut_bid_bounding_box(
+            std::max(0, std::min(max_width, static_cast<int32_t>(bid_bounding_box.min_x) + left_cutoff)),
+            std::max(0, std::min(max_height, static_cast<int32_t>(bid_bounding_box.min_y) - scaled_vertical_padding)),
+            std::max(0, std::min(max_width, static_cast<int32_t>(bid_bounding_box.max_x) - right_cutoff)),
+            std::max(0, std::min(max_height, static_cast<int32_t>(bid_bounding_box.max_y) + scaled_vertical_padding))
+            );
+
+        uint64_t read_bid = OCR::read_number(stream.logger(), extract_box_reference(raw_bid_image, cut_bid_bounding_box));
+
+        if (read_bids.find(read_bid) == read_bids.end()){
+            read_bids[read_bid] = 0;
+        }
+        read_bids[read_bid] += 1;
+
+        if (read_bids[read_bid] > highest_read){
+            highest_read = read_bids[read_bid];
+            read_value = read_bid;
+        }
+        context.wait_for(Milliseconds(20));
+    }
+
+    stream.log("Next bid: " + std::to_string(read_value));
+    return read_value;
+}
+
+void AuctionFarmer::bid_on_item(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AuctionOffer offer){
+    AuctionFarmer_Descriptor::Stats& stats = env.current_stats<AuctionFarmer_Descriptor::Stats>();
+
+    VideoSnapshot offer_screen = env.console.video().snapshot();
+
+    AdvanceDialogWatcher advance_detector(COLOR_YELLOW);
+    PromptDialogWatcher high_detector(COLOR_RED, { 0.50, 0.40, 0.40, 0.082 });
+    PromptDialogWatcher mid_detector(COLOR_PURPLE, { 0.50, 0.475, 0.40, 0.082 });
+    PromptDialogWatcher low_detector(COLOR_PURPLE, { 0.50, 0.55, 0.40, 0.082 });
+    OverworldWatcher overworld_detector(env.console, COLOR_BLUE);
+    bool won_auction = true;
+    bool auction_ongoing = true;
+    int64_t current_bid = 0;
+
+    context.wait_for_all_requests();
+    while (auction_ongoing){
+        int ret = wait_until(env.console, context, Milliseconds(5000), { advance_detector, high_detector, mid_detector, low_detector, overworld_detector });
+        context.wait_for(Milliseconds(100));
+
+        switch (ret){
+        case 0:
+            pbf_press_button(context, BUTTON_A, 160ms, 1000ms);
+            break;
+        case 1:
+            current_bid = read_next_bid(env.console, context, LANGUAGE, true);
+            pbf_press_button(context, BUTTON_A, 160ms, 1000ms);
+            break;
+        case 2:
+            current_bid = read_next_bid(env.console, context, LANGUAGE, false);
+            pbf_press_button(context, BUTTON_A, 160ms, 1000ms);
+            break;
+        case 3:
+            pbf_press_button(context, BUTTON_A, 160ms, 1000ms);
+            break;
+        case 4:
+            auction_ongoing = false;
+            break;
+        default:
+            break;
+        }
+        context.wait_for_all_requests();
+    }
+
+    if (won_auction){
+        stats.m_auctions++;
+        if (current_bid >= 0){
+            stats.m_money += current_bid;
+        }
+        env.update_stats();
+        send_program_notification(
+            env, NOTIFICATION_AUCTION_WIN,
+            COLOR_GREEN, "Auction won!",
+            {
+                { "Item:", get_auction_item_name(offer.item).display_name() },
+                { "Final Bid:", std::to_string(current_bid) },
+            }
+            , "", offer_screen);
+    }
+
+    return;
+}
+
+void AuctionFarmer::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    assert_16_9_720p_min(env.logger(), env.console);
+
+#if 0
+    check_offers(env, context);
+    return;
+
+#else
+    AuctionFarmer_Descriptor::Stats& stats = env.current_stats<AuctionFarmer_Descriptor::Stats>();
+
+    //  Connect the controller.
+    require_player(env.console, context, BUTTON_LCLICK);
+
+    pbf_wait(context, 1000ms);
+    context.wait_for_all_requests();
+
+    uint8_t year = MAX_YEAR;
+
+
+    while (true){
+        send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
+
+        reset_auctions(env, context, true, year);
+        stats.m_resets++;
+        env.update_stats();
+        
+        bool good_offer = false;
+        while (!good_offer){
+            size_t npc_tries = 0;
+            if (!ONE_NPC){
+                pbf_move_right_joystick(context, {0, -1}, 2000ms, 160ms);
+            }
+
+            std::vector<std::pair<AuctionOffer, ImageFloatBox>> offers = check_offers(env, context);
+            for (std::pair<AuctionOffer, ImageFloatBox>& offer_pair : offers){
+                AuctionOffer offer = offer_pair.first;
+                if (is_good_offer(offer)){
+                    try{
+                        move_to_auctioneer(env, context, offer);
+                    }catch (OperationFailedExceptionWithScreenshot& e){
+                        stats.m_errors++;
+                        e.send_recoverable_error_notif_and_telemetry_report(env, NOTIFICATION_ERROR_RECOVERABLE);
+
+                        npc_tries++;
+                        // if ONE_NPC the program already tries multiple times without change to compensate for dropped inputs
+                        // at this point it is more likely to be non-recoverable
+                        size_t max_npc_tries = ONE_NPC ? 1 : 3;
+
+                        if (npc_tries < max_npc_tries){
+                            VideoSnapshot screen = env.console.video().snapshot();
+                            send_program_recoverable_error_notification(env, NOTIFICATION_ERROR_RECOVERABLE, e.message(), screen);
+                        }else{
+                            OperationFailedExceptionWithScreenshot::fire(
+                                ErrorReportMode::SEND_ERROR_REPORT,
+                                "Failed to talk to the NPC!",
+                                env.console
+                            );
+                        }
+                        break;
+                    }
+
+                    bid_on_item(env, context, offer);
+                    reset_position(env, context);
+
+                    good_offer = true;
+                }
+            }
+            if (!good_offer){
+                reset_auctions(env, context, false, year);
+                stats.m_resets++;
+            }
+
+            env.update_stats();
+            pbf_wait(context, 1000ms);
+            context.wait_for_all_requests();
+        }
+    }
+#endif
+}
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_AuctionFarmer.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_AuctionFarmer.h
new file mode 100644
index 0000000000..8fdf7e4ab5
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_AuctionFarmer.h
@@ -0,0 +1,71 @@
+/*  Auction Farmer
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_AuctionFarmer_H
+#define PokemonAutomation_PokemonSV_AuctionFarmer_H
+
+#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "Common/Cpp/Options/StaticTextOption.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "CommonTools/Options/LanguageOCROption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "VideoGames/PokemonSV/Options/PokemonSV_AuctionItemTable.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+struct AuctionOffer{
+    std::string item;
+};
+
+class AuctionFarmer_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    AuctionFarmer_Descriptor();
+
+    struct Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+
+};
+
+
+
+
+class AuctionFarmer : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = AuctionFarmer_Descriptor;
+    AuctionFarmer();
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    OCR::LanguageOCROption LANGUAGE;
+    AuctionItemTable TARGET_ITEMS;
+    
+    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
+    EventNotificationOption NOTIFICATION_AUCTION_WIN;
+    EventNotificationsOption NOTIFICATIONS;
+
+    SectionDividerOption m_advanced_options;
+    BooleanCheckBoxOption ONE_NPC;
+
+    std::vector<ImagePixelBox> detect_dialog_boxes(const ImageViewRGB32& screen);
+    void reset_auctions(SingleSwitchProgramEnvironment& env, ProControllerContext& context, bool do_full_reset, uint8_t& year);
+    std::vector<std::pair<AuctionOffer, ImageFloatBox>> check_offers(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+    void move_to_auctioneer(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AuctionOffer wanted);
+    void move_dialog_to_center(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AuctionOffer offer);
+    void bid_on_item(SingleSwitchProgramEnvironment& env, ProControllerContext& context, AuctionOffer offer);
+    bool is_good_offer(AuctionOffer);
+    void reset_position(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+};
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_BBQSoloFarmer.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_BBQSoloFarmer.cpp
new file mode 100644
index 0000000000..fcfa3182fa
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_BBQSoloFarmer.cpp
@@ -0,0 +1,191 @@
+/*  BBQ Solo Farmer
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Exceptions.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonTools/StartupChecks/StartProgramChecks.h"
+#include "CommonTools/StartupChecks/VideoResolutionCheck.h"
+#include "NintendoSwitch/NintendoSwitch_Settings.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "NintendoSwitch/Programs/DateSpam/NintendoSwitch_HomeToDateTime.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h"
+//#include "VideoGames/PokemonSV/PokemonSV_Settings.h"
+#include "VideoGames/PokemonSV/Programs/Farming/PokemonSV_BlueberryQuests.h"
+#include "PokemonSV_BBQSoloFarmer.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+using namespace Pokemon;
+ 
+BBQSoloFarmer_Descriptor::BBQSoloFarmer_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonSV:BBQSoloFarmer",
+        STRING_POKEMON + " SV", "BBQ Farmer",
+        "Programs/PokemonSV/BBQSoloFarmer.html",
+        "Farm Blueberry Quests in the Terarium for BP.",
+        PanelQualityStanding::OFFICIAL_BETA,
+        ProgramControllerClass::StandardController_RequiresPrecision,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS,
+        {
+            "PaddleOCRDetection",
+        }
+    )
+{}
+struct BBQSoloFarmer_Descriptor::Stats : public StatsTracker{
+    Stats()
+        : questsCompleted(m_stats["Quests Completed"])
+        , saves(m_stats["Saves"])
+        , errors(m_stats["Errors"])
+    {
+        m_display_order.emplace_back("Quests Completed");
+        m_display_order.emplace_back("Saves");
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+    }
+    std::atomic<uint64_t>& questsCompleted;
+    std::atomic<uint64_t>& saves;
+    std::atomic<uint64_t>& errors;
+};
+std::unique_ptr<StatsTracker> BBQSoloFarmer_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+BBQSoloFarmer::BBQSoloFarmer()
+    : GO_HOME_WHEN_DONE(true)
+    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_STATUS_UPDATE,
+        & NOTIFICATION_PROGRAM_FINISH,
+        & NOTIFICATION_ERROR_FATAL,
+        })
+{
+    PA_ADD_OPTION(BBQ_OPTIONS);
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+void BBQSoloFarmer::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    StartProgramChecks::check_performance_class_wired_or_wireless(context);
+    assert_16_9_720p_min(env.logger(), env.console);
+
+    BBQSoloFarmer_Descriptor::Stats& stats = env.current_stats<BBQSoloFarmer_Descriptor::Stats>();
+
+    //Make sure console type is set
+    if (env.console.state().console_type() == ConsoleType::Unknown){
+        throw UserSetupError(env.console, "Console Type (Switch 1 or 2) must be specified.");
+    }
+
+    //  Connect the controller.
+    require_player(env.console, context, BUTTON_LCLICK);
+    
+    //Fly to plaza
+    open_map_from_overworld(env.program_info(), env.console, context);
+    fly_to_overworld_from_map(env.program_info(), env.console, context);
+
+    std::vector<BBQuests> quest_list; //all quests
+    std::vector<BBQuests> quests_to_do; //do-able quests
+    uint8_t eggs_hatched = 0; //Track eggs
+    uint64_t num_completed_quests = 0;
+
+    //Test a specific quest
+    /*
+    BBQuests test_quest = BBQuests::catch_water;
+    bool questTest = process_and_do_quest(env, env.console, context, BBQ_OPTIONS, test_quest, eggs_hatched);
+    if (questTest){
+        env.log("Finished quest.");
+    }
+    */
+
+    while (num_completed_quests < BBQ_OPTIONS.NUM_QUESTS){
+        if (BBQ_OPTIONS.OUT_OF_EGGS == BBQOption::OOEggs::Stop && eggs_hatched >= BBQ_OPTIONS.NUM_EGGS){
+            env.log("Stop when out of eggs selected. Stopping program.");
+            break;
+        }
+
+        //Get and reroll quests until we can at least one
+        while (quests_to_do.size() < 1){
+            quest_list = read_quests(env.program_info(), env.console, context, BBQ_OPTIONS);
+            quests_to_do = process_quest_list(env.program_info(), env.console, context, BBQ_OPTIONS, quest_list, eggs_hatched);
+
+            //Clear out the regular quest list.
+            quest_list.clear();
+        }
+
+        for (auto current_quest : quests_to_do){
+            //Check if quest was already completed (ex. 500 meters completed while navigating to take a photo)
+            quest_list = read_quests(env.program_info(), env.console, context, BBQ_OPTIONS);
+            if (std::find(quest_list.begin(), quest_list.end(), current_quest) != quest_list.end()){
+                env.log("Current quest exists on list. Doing quest.");
+                bool questSuccess = process_and_do_quest(env, env.console, context, BBQ_OPTIONS, current_quest, eggs_hatched);
+                if (questSuccess){
+                    env.log("Quest completed successfully.");
+                    stats.questsCompleted++;
+                    env.update_stats();
+                    num_completed_quests++;
+                }else{
+                    env.log("Quest did not complete successfully.");
+                }
+            }else{
+                //Note: This doesn't account for case such as "sneak up" being added and then completed alongside the next quest
+                env.log("Current quest does not exist on list. Quest completed at some point.");
+                stats.questsCompleted++;
+                env.update_stats();
+                num_completed_quests++;
+            }
+            quest_list.clear();
+        }
+        //Clear out the todo list
+        quests_to_do.clear();
+
+        //Fix the time to prevent running out of years
+        pbf_wait(context, 2000ms);
+        context.wait_for_all_requests();
+        go_home(env.console, context);
+        home_to_date_time(env.console, context, false);
+        pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+        pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+        pbf_press_button(context, BUTTON_HOME, 160ms, ConsoleSettings::instance().SETTINGS_TO_HOME_DELAY0);
+        resume_game_from_home(env.console, context);
+
+        uint64_t temp_save_num_option = BBQ_OPTIONS.SAVE_NUM_QUESTS;
+        if (temp_save_num_option != 0 && num_completed_quests % temp_save_num_option == 0){
+            env.log("Saving and resetting.");
+            save_game_from_overworld(env.program_info(), env.console, context);
+            reset_game(env.program_info(), env.console, context);
+            stats.saves++;
+        }
+
+        env.update_stats();
+        send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
+    }
+    env.update_stats();
+
+    if (BBQ_OPTIONS.FIX_TIME_WHEN_DONE){
+        go_home(env.console, context);
+        home_to_date_time(env.console, context, false);
+        pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+        pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+        pbf_press_button(context, BUTTON_HOME, 160ms, ConsoleSettings::instance().SETTINGS_TO_HOME_DELAY0);
+        resume_game_from_home(env.console, context);
+
+        open_map_from_overworld(env.program_info(), env.console, context);
+        fly_to_overworld_from_map(env.program_info(), env.console, context);
+    }
+
+    GO_HOME_WHEN_DONE.run_end_of_program(context);
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+}
+    
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_BBQSoloFarmer.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_BBQSoloFarmer.h
new file mode 100644
index 0000000000..9917606334
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_BBQSoloFarmer.h
@@ -0,0 +1,44 @@
+/*  BBQ Solo Farmer
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_BBQSoloFarmer_H
+#define PokemonAutomation_PokemonSV_BBQSoloFarmer_H
+
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+#include "VideoGames/PokemonSV/Options/PokemonSV_BBQOption.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+class BBQSoloFarmer_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    BBQSoloFarmer_Descriptor();
+
+    struct Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+class BBQSoloFarmer : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = BBQSoloFarmer_Descriptor;
+    BBQSoloFarmer();
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    BBQOption BBQ_OPTIONS;
+
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
+    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_BBQTests.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_BBQTests.cpp
new file mode 100644
index 0000000000..aa8ef76ecb
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_BBQTests.cpp
@@ -0,0 +1,143 @@
+/*  Pokemon SV BBQ Tests
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "CommonFramework/ImageTypes/ImageRGB32.h"
+#include "Tests/ImageUnitTest.h"
+#include "VideoGames/PokemonSV/Inference/PokemonSV_BlueberryPointsReader.h"
+#include "VideoGames/PokemonSV/Options/PokemonSV_BBQuests.h"
+#include "PokemonSV_BlueberryQuests.h"
+#include "PokemonSV_BBQTests.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+namespace{
+
+class Test_BBQuestsSlugs : public UnitTest{
+public:
+    Test_BBQuestsSlugs()
+        : UnitTest("PokemonSV::BBQuests - slug round trip")
+    {}
+
+    virtual UnitTestResult run(Logger&, CancellableScope&) const override{
+        for (int c = 0; c < (int)BBQuests::UnableToDetect; c++){
+            const BBQuests quest = (BBQuests)c;
+            const std::string& slug = BBQuests_enum_to_string(quest);
+            if (slug.empty()){
+                return "Quest " + std::to_string(c) + " has no slug.";
+            }
+            if (BBQuests_string_to_enum(slug) != quest){
+                return "Slug " + slug + " does not map back to quest " + std::to_string(c) + ".";
+            }
+        }
+        if (!BBQuests_enum_to_string(BBQuests::UnableToDetect).empty()){
+            return "UnableToDetect must map to the empty slug.";
+        }
+        if (BBQuests_string_to_enum("not-a-quest") != BBQuests::UnableToDetect){
+            return "An unrecognized slug must map to UnableToDetect.";
+        }
+        return true;
+    }
+};
+
+class Test_BlueberryPoints : public ImageUnitTest{
+public:
+    Test_BlueberryPoints(const std::string& image, int expected, size_t width, size_t height)
+        : ImageUnitTest("PokemonSV::BlueberryPoints - " + image + " - " + std::to_string(width), {image})
+        , m_expected(expected), m_width(width), m_height(height)
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope&,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        const ImageRGB32& reference = images[0];
+        ImageRGB32 image = reference.scale_to(m_width, m_height);
+        const int actual = read_BP_from_image(logger, image);
+        if (actual != m_expected){
+            return "Expected " + std::to_string(m_expected) + " BP, read " + std::to_string(actual);
+        }
+        return true;
+    }
+
+private:
+    const int m_expected;
+    const size_t m_width, m_height;
+};
+
+struct TeraEncounterScenario{
+    std::string name;
+    bool shiny = false;
+    int encounter_watcher_result;       //  0: battle menu, 1: audio, -1: route finished first
+    bool battle_menu_detected = false;  //  The route's own wait saw the battle menu.
+    TeraEncounterAction expected;
+};
+
+class Test_TeraEncounterAction : public UnitTest{
+public:
+    Test_TeraEncounterAction(TeraEncounterScenario scenario)
+        : UnitTest("PokemonSV::TeraEncounterAction - " + scenario.name)
+        , m_scenario(std::move(scenario))
+    {}
+
+    virtual UnitTestResult run(Logger&, CancellableScope&) const override{
+        const TeraEncounterAction actual = tera_encounter_action(
+            m_scenario.shiny, m_scenario.encounter_watcher_result, m_scenario.battle_menu_detected
+        );
+        if (actual != m_scenario.expected){
+            return "Expected action " + std::to_string((int)m_scenario.expected)
+                + ", got " + std::to_string((int)actual) + ".";
+        }
+        return true;
+    }
+
+private:
+    const TeraEncounterScenario m_scenario;
+};
+
+}
+
+static void add_tests_TeraEncounterAction(UnitTestDatabase& database){
+    using enum TeraEncounterAction;
+    const std::vector<TeraEncounterScenario> scenarios{
+        {.name = "timeout recovers without battle", .encounter_watcher_result = -1, .expected = Recover},
+        {.name = "audio alone is not entry", .encounter_watcher_result = 1, .expected = Recover},
+        {.name = "unknown callback is not entry", .encounter_watcher_result = 2, .expected = Recover},
+        {.name = "encounter watcher menu battles", .encounter_watcher_result = 0, .expected = Battle},
+        {.name = "route wait menu battles", .encounter_watcher_result = -1, .battle_menu_detected = true, .expected = Battle},
+        {.name = "audio then route wait menu battles", .encounter_watcher_result = 1, .battle_menu_detected = true, .expected = Battle},
+        {.name = "both menus battle", .encounter_watcher_result = 0, .battle_menu_detected = true, .expected = Battle},
+        {.name = "shiny stops without entry", .shiny = true, .encounter_watcher_result = -1, .expected = StopForShiny},
+        {.name = "shiny stops before battle", .shiny = true, .encounter_watcher_result = 0, .battle_menu_detected = true, .expected = StopForShiny},
+    };
+    for (const TeraEncounterScenario& scenario : scenarios){
+        database.add<Test_TeraEncounterAction>(scenario);
+    }
+}
+
+
+void add_tests_BBQ(UnitTestDatabase& database){
+    database.add<Test_BBQuestsSlugs>();
+
+    // Full-frame references, in the CommandLineTests repo: they exercise the production
+    // crop, filter and OCR together.
+    database.add<Test_BlueberryPoints>("PokemonSV/BlueberryPoints/6750.png", 6750, 1920, 1080);
+    database.add<Test_BlueberryPoints>("PokemonSV/BlueberryPoints/6750.png", 6750, 1280, 720);
+
+    database.add<Test_BlueberryPoints>("PokemonSV/BlueberryPoints/6740.png", 6740, 1920, 1080);
+    database.add<Test_BlueberryPoints>("PokemonSV/BlueberryPoints/6740.png", 6740, 1280, 720);
+
+    add_tests_TeraEncounterAction(database);
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_BBQTests.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_BBQTests.h
new file mode 100644
index 0000000000..64317f45aa
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_BBQTests.h
@@ -0,0 +1,26 @@
+/*  Pokemon SV BBQ Tests
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_BBQTests_H
+#define PokemonAutomation_PokemonSV_BBQTests_H
+
+#include "Common/Cpp/TestRunners/UnitTest.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+//  Blueberry Quest farmer tests: controller decisions run against scripted inputs.
+void add_tests_BBQ(UnitTestDatabase& database);
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_BlueberryCatchPhoto.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_BlueberryCatchPhoto.cpp
new file mode 100644
index 0000000000..3a24e1d187
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_BlueberryCatchPhoto.cpp
@@ -0,0 +1,1057 @@
+/*  Blueberry Catch Photo
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/Tools/ErrorDumper.h"
+#include "CommonFramework/Exceptions/ProgramFinishedException.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "NintendoSwitch/Programs/DateSpam/NintendoSwitch_HomeToDateTime.h"
+#include "NintendoSwitch/Programs/DateSpam/NintendoSwitch_RollDateForward1.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h"
+#include "VideoGames/PokemonSV/PokemonSV_Settings.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h"
+#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h"
+#include "VideoGames/PokemonSV/Inference/Battles/PokemonSV_NormalBattleMenus.h"
+#include "VideoGames/PokemonSV/Inference/Battles/PokemonSV_EncounterWatcher.h"
+#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h"
+#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h"
+#include "VideoGames/PokemonSV/Programs/Battles/PokemonSV_BasicCatcher.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_Terarium.h"
+#include "PokemonSV_BlueberryCatchPhoto.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+CameraAngle quest_photo_navi(
+    const ProgramInfo& info,
+    ConsoleHandle& console, ProControllerContext& context,
+    const BBQOption& BBQ_OPTIONS,
+    BBQuests current_quest
+){
+    CameraAngle angle = CameraAngle::none;
+
+    //Navigate to target
+    switch (current_quest){
+        case BBQuests::photo_fly: case BBQuests::photo_psychic:
+            console.log("Photo: In-flight/Psychic");
+
+            //Polar Rest Area - targeting Duosion fixed spawn
+            central_to_polar_rest(info, console, context);
+
+            pbf_press_button(context, BUTTON_L, 80ms, 400ms);
+            pbf_move_left_joystick(context, {0, +1}, 1840ms, 160ms);
+            pbf_move_left_joystick(context, {-1, 0}, 2000ms, 160ms);
+
+            break;
+        case BBQuests::photo_swim: case BBQuests::photo_water: case BBQuests::photo_polar:
+            console.log("Photo: Swimming/Water/Polar");
+
+            //Polar Outdoor Classroom 1 - fixed Horsea
+            central_to_polar_class1(info, console, context);
+
+            pbf_wait(context, 1600ms);
+            context.wait_for_all_requests();
+
+            pbf_press_button(context, BUTTON_L, 80ms, 400ms);
+            pbf_move_left_joystick(context, {+1, +0.609}, 1440ms, 160ms);
+
+            angle = CameraAngle::down;
+
+            break;
+        case BBQuests::photo_coastal: case BBQuests::photo_grass: case BBQuests::photo_dragon:
+            console.log("Photo: Coastal/Grass/Dragon");
+
+            //Coastal Plaza - Exeggutor-A
+            central_to_coastal_plaza(info, console, context);
+
+            pbf_move_left_joystick(context, {-1, +0.102}, 3200ms, 160ms);
+
+            //Jump down
+            pbf_press_button(context, BUTTON_L | BUTTON_PLUS, 160ms, 840ms);
+            ssf_press_button(context, BUTTON_B, 0ms, 800ms);
+            ssf_press_button(context, BUTTON_B, 0ms, 160ms, 80ms);
+            ssf_press_button(context, BUTTON_B, 0ms, 160ms);
+
+            pbf_wait(context, 800ms);
+            context.wait_for_all_requests();
+
+            pbf_move_left_joystick(context, {0, +1}, 1200ms, 160ms);
+            pbf_press_button(context, BUTTON_B, 160ms, 160ms);
+            pbf_wait(context, 1600ms);
+            pbf_press_button(context, BUTTON_L | BUTTON_PLUS, 160ms, 840ms);
+            context.wait_for_all_requests();
+
+            break;
+        case BBQuests::photo_canyon: case BBQuests::photo_ghost: case BBQuests::photo_ground:
+            console.log("Photo: Canyon/Ghost/Ground");
+
+            //Canyon Plaza - Golett
+            central_to_canyon_plaza(info, console, context);
+
+            pbf_move_left_joystick(context, {+0.646, 0}, 80ms, 160ms);
+            pbf_press_button(context, BUTTON_L | BUTTON_PLUS, 160ms, 840ms);
+
+            jump_glide_fly(console, context, BBQ_OPTIONS.INVERTED_FLIGHT, 4800ms, 2000ms, 3200ms);
+
+            pbf_press_button(context, BUTTON_L | BUTTON_PLUS, 160ms, 840ms);
+
+            break;
+        case BBQuests::photo_savanna: case BBQuests::photo_normal: case BBQuests::photo_fire:
+            console.log("Photo: Normal/Fire");
+
+            //Savanna Plaza - Pride Rock
+            central_to_savanna_plaza(info, console, context);
+
+            pbf_move_left_joystick(context, {+0.724, -1}, 80ms, 160ms);
+            pbf_press_button(context, BUTTON_L | BUTTON_PLUS, 160ms, 840ms);
+
+            jump_glide_fly(console, context, BBQ_OPTIONS.INVERTED_FLIGHT, 4800ms, 3200ms, 3200ms);
+
+            pbf_press_button(context, BUTTON_PLUS, 160ms, 840ms);
+            pbf_move_left_joystick(context, {+1, 0}, 160ms, 400ms);
+
+            pbf_press_button(context, BUTTON_L, 160ms, 400ms);
+            pbf_move_left_joystick(context, {0, +1}, 800ms, 400ms);
+
+            //Turn slightly for switch 1
+            if (console.state().console_type() == ConsoleType::Switch1){
+                pbf_move_left_joystick(context, {-1, +1}, 160ms, 400ms);
+            }
+
+            break;
+        case BBQuests::photo_bug: case BBQuests::photo_rock:
+            console.log("Photo: Bug/Rock");
+
+            //Kleavor
+            central_to_canyon_plaza(info, console, context);
+
+            pbf_move_left_joystick(context, {+0.606, +0.5}, 160ms, 840ms);
+            pbf_press_button(context, BUTTON_L | BUTTON_PLUS, 160ms, 840ms);
+
+            jump_glide_fly(console, context, BBQ_OPTIONS.INVERTED_FLIGHT, 8000ms, 12000ms, 2400ms);
+
+            pbf_press_button(context, BUTTON_L | BUTTON_PLUS, 160ms, 840ms);
+
+            break;
+        case BBQuests::photo_fairy:
+            console.log("Photo: Fairy");
+
+            //Snubbull - Central plaza
+            open_map_from_overworld(info, console, context);
+            fly_to_overworld_from_map(info, console, context);
+
+            pbf_move_left_joystick(context, {-1, +0.375}, 80ms, 160ms);
+            pbf_press_button(context, BUTTON_L | BUTTON_PLUS, 160ms, 840ms);
+
+            jump_glide_fly(console, context, BBQ_OPTIONS.INVERTED_FLIGHT, 16000ms, 12000ms, 1600ms);
+
+            pbf_press_button(context, BUTTON_PLUS, 160ms, 840ms);
+
+            pbf_move_left_joystick(context, {+1, +1}, 80ms, 160ms);
+            pbf_press_button(context, BUTTON_L, 160ms, 400ms);
+
+            angle = CameraAngle::down;
+            break;
+        case BBQuests::photo_ice:
+            console.log("Photo: Ice");
+
+            //Snover - Start at central plaza, fly north-ish
+            open_map_from_overworld(info, console, context);
+            fly_to_overworld_from_map(info, console, context);
+
+            pbf_move_left_joystick(context, {-1, +1}, 80ms, 160ms);
+            pbf_press_button(context, BUTTON_L | BUTTON_PLUS, 160ms, 840ms);
+
+            jump_glide_fly(console, context, BBQ_OPTIONS.INVERTED_FLIGHT, 8800ms, 13600ms, 1600ms);
+
+            pbf_press_button(context, BUTTON_PLUS, 160ms, 840ms);
+            pbf_move_left_joystick(context, {-1, 0}, 160ms, 400ms);
+            pbf_press_button(context, BUTTON_L, 160ms, 400ms);
+
+            break;
+        case BBQuests::photo_flying:
+            console.log("Photo: Flying");
+
+            //Vullaby/Mandibuzz
+            central_to_savanna_plaza(info, console, context);
+
+            pbf_move_left_joystick(context, {+1, +1}, 80ms, 160ms);
+            pbf_press_button(context, BUTTON_L | BUTTON_PLUS, 160ms, 840ms);
+
+            pbf_move_left_joystick(context, {0, +1}, 4400ms, 160ms);
+            pbf_press_button(context, BUTTON_L | BUTTON_PLUS, 160ms, 840ms);
+
+            pbf_move_left_joystick(context, {0, +1}, 1200ms, 160ms);
+
+            pbf_move_left_joystick(context, {+1, 0}, 80ms, 160ms);
+
+            angle = CameraAngle::down;
+            break;
+        case BBQuests::photo_electric:
+            console.log("Photo: Electric");
+
+            //Electabuzz
+            central_to_canyon_rest(info, console, context);
+
+            pbf_move_left_joystick(context, {+1, -1}, 80ms, 160ms);
+            pbf_press_button(context, BUTTON_L, 160ms, 400ms);
+            pbf_move_left_joystick(context, {0, +1}, 3200ms, 160ms);
+
+            break;
+        case BBQuests::photo_fighting:
+            console.log("Photo: Fighting");
+
+            //Hitmontop (TERA ICE) - Canyon Plaza or Classroom
+            central_to_canyon_plaza(info, console, context);
+            pbf_move_left_joystick(context, {-1, 0}, 3200ms, 160ms);
+            pbf_press_button(context, BUTTON_L, 80ms, 400ms);
+            pbf_move_left_joystick(context, {-1, +0.219}, 160ms, 400ms);
+            pbf_press_button(context, BUTTON_L | BUTTON_PLUS, 160ms, 840ms);
+
+            jump_glide_fly(console, context, BBQ_OPTIONS.INVERTED_FLIGHT, 1600ms, 4000ms, 6400ms);
+
+            pbf_press_button(context, BUTTON_PLUS, 160ms, 800ms);
+            context.wait_for_all_requests();
+
+            break;
+        case BBQuests::photo_poison: case BBQuests::photo_dark:
+            console.log("Photo: Poison/Dark");
+
+            //Muk-A - area a bit laggy but consistently so
+            central_to_coastal_plaza(info, console, context);
+            pbf_move_left_joystick(context, {-1, 0}, 160ms, 400ms);
+
+            pbf_press_button(context, BUTTON_L | BUTTON_PLUS, 160ms, 840ms);
+
+            if (console.state().console_type() == ConsoleType::Switch1){
+                jump_glide_fly(console, context, BBQ_OPTIONS.INVERTED_FLIGHT, 8000ms, 11200ms, 2400ms);
+            }else{ //Switch 2
+                jump_glide_fly(console, context, BBQ_OPTIONS.INVERTED_FLIGHT, 8000ms, 10400ms, 2400ms);
+            }
+            pbf_press_button(context, BUTTON_PLUS, 160ms, 840ms);
+            pbf_move_left_joystick(context, {0, +1}, 1200ms, 400ms);
+            pbf_move_left_joystick(context, {+0.409, +1}, 160ms, 400ms);
+            pbf_wait(context, 1600ms); //Give it time to spawn/load.
+            context.wait_for_all_requests();
+
+            angle = CameraAngle::down;
+
+            break;
+        case BBQuests::photo_steel:
+            console.log("Photo: Steel");
+
+            //Dugtrio-A - area a bit laggy but should work most of the time
+            central_to_coastal_plaza(info, console, context);
+            pbf_move_left_joystick(context, {-1, 0}, 160ms, 400ms);
+
+            pbf_press_button(context, BUTTON_L | BUTTON_PLUS, 160ms, 840ms);
+
+            if (console.state().console_type() == ConsoleType::Switch1){
+                jump_glide_fly(console, context, BBQ_OPTIONS.INVERTED_FLIGHT, 1600ms, 4600ms, 1600ms);
+            }else{ //Switch 2
+                jump_glide_fly(console, context, BBQ_OPTIONS.INVERTED_FLIGHT, 1600ms, 400ms, 1600ms);
+            }
+
+            pbf_press_button(context, BUTTON_PLUS, 160ms, 840ms);
+            pbf_move_left_joystick(context, {-1, 0}, 160ms, 400ms);
+            pbf_press_button(context, BUTTON_L, 160ms, 400ms);
+
+            break;
+        default:
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "Invalid photo quest.",
+                console
+            );
+            break;
+    }
+
+    return angle;
+}
+
+void quest_photo(
+    const ProgramInfo& info,
+    ConsoleHandle& console, ProControllerContext& context,
+    const BBQOption& BBQ_OPTIONS,
+    BBQuests current_quest
+){
+    bool took_photo = false;
+    CameraAngle move_camera = CameraAngle::none;
+
+    while(!took_photo){
+        EncounterWatcher encounter_watcher(console, COLOR_RED);
+        int ret = run_until<ProControllerContext>(
+            console, context,
+            [&](ProControllerContext& context){
+
+                move_camera = quest_photo_navi(info, console, context, BBQ_OPTIONS, current_quest);
+
+                //Take photo.
+                console.log("Taking photo.");
+                PromptDialogWatcher photo_prompt(COLOR_RED);
+                OverworldWatcher overworld(console.logger(), COLOR_BLUE);
+
+                pbf_press_dpad(context, DPAD_DOWN, 400ms, 160ms);
+                pbf_wait(context, 800ms);
+                context.wait_for_all_requests();
+
+                if (move_camera == CameraAngle::up){
+                    pbf_move_right_joystick(context, {0, +1}, 400ms, 160ms);
+                }else if (move_camera == CameraAngle::down){
+                    pbf_move_right_joystick(context, {0, -1}, 400ms, 160ms);
+                }
+                context.wait_for_all_requests();
+
+                pbf_press_button(context, BUTTON_A, 160ms, 400ms);
+
+                int ret = wait_until(
+                    console, context,
+                    std::chrono::seconds(10),
+                    { photo_prompt }
+                );
+                if (ret != 0){
+                    console.log("Photo not taken.");
+                }
+
+                //Mash B until overworld
+                int exit = run_until<ProControllerContext>(
+                    console, context,
+                    [&](ProControllerContext& context){
+                        pbf_mash_button(context, BUTTON_B, 16000ms);
+                    },
+                    {{ overworld }}
+                );
+                if (exit == 0){
+                    console.log("Overworld detected.");
+                }
+                took_photo = true;
+                context.wait_for_all_requests();
+            },
+            {
+                static_cast<VisualInferenceCallback&>(encounter_watcher),
+                static_cast<AudioInferenceCallback&>(encounter_watcher),
+            }
+        );
+        encounter_watcher.throw_if_no_sound();
+
+        if (ret >= 0){
+            console.log("Battle menu detected.");
+
+            bool is_shiny = (bool)encounter_watcher.shiny_screenshot();
+            if (is_shiny){
+                console.log("Shiny detected!");
+                pbf_press_button(context, BUTTON_CAPTURE, 2000ms, 5000ms);
+                throw ProgramFinishedException();
+            }else{
+                console.log("Detected battle. Running from battle and returning to plaza.");
+                try{
+                    //Smoke Ball or Flying type required due to Arena Trap/Magnet Pull
+                    NormalBattleMenuWatcher battle_menu(COLOR_YELLOW);
+                    battle_menu.move_to_slot(console, context, 3);
+                    pbf_press_button(context, BUTTON_A, 80ms, 400ms);
+                    press_Bs_to_back_to_overworld(info, console, context);
+                    return_to_plaza(info, console, context);
+                }catch (...){
+                    console.log("Unable to flee.");
+                    OperationFailedExceptionWithScreenshot::fire(
+                        ErrorReportMode::SEND_ERROR_REPORT,
+                        "Unable to flee!",
+                        console
+                    );
+                }
+            }
+        }
+    }
+    context.wait_for_all_requests();
+    return_to_plaza(info, console, context);
+}
+
+void quest_catch_navi(
+    const ProgramInfo& info,
+    ConsoleHandle& console, ProControllerContext& context,
+    const BBQOption& BBQ_OPTIONS,
+    BBQuests current_quest
+){
+    switch (current_quest){
+        case BBQuests::catch_any: case BBQuests::catch_normal: case BBQuests::catch_fire:
+            console.log("Catch: Any/Normal/Fire");
+
+            //Savanna Plaza - Pride Rock
+            central_to_savanna_plaza(info, console, context);
+
+            pbf_move_left_joystick(context, {+0.724, -1}, 80ms, 160ms);
+            pbf_press_button(context, BUTTON_L | BUTTON_PLUS, 160ms, 840ms);
+
+            jump_glide_fly(console, context, BBQ_OPTIONS.INVERTED_FLIGHT, 4800ms, 3200ms, 3200ms);
+
+            pbf_press_button(context, BUTTON_PLUS, 160ms, 840ms);
+            pbf_move_left_joystick(context, {+1, 0}, 160ms, 400ms);
+
+            pbf_press_button(context, BUTTON_L, 160ms, 400ms);
+            pbf_move_left_joystick(context, {0, +1}, 800ms, 400ms);
+
+            //Turn slightly for switch 1
+            if (console.state().console_type() == ConsoleType::Switch1){
+                pbf_move_left_joystick(context, {-1, +1}, 160ms, 400ms);
+                pbf_press_button(context, BUTTON_L, 160ms, 400ms);
+            }
+
+            break;
+
+        case BBQuests::catch_psychic:
+            console.log("Catch: Psychic");
+
+            //Polar Rest Area - targeting Duosion fixed spawn
+            central_to_polar_rest(info, console, context);
+
+            pbf_press_button(context, BUTTON_L, 80ms, 400ms);
+            pbf_move_left_joystick(context, {0, +1}, 1840ms, 160ms);
+            pbf_move_left_joystick(context, {-1, 0}, 2000ms, 160ms);
+
+            pbf_press_button(context, BUTTON_L, 160ms, 400ms);
+            pbf_move_left_joystick(context, {0, +1}, 1200ms, 160ms);
+
+            break;
+
+        case BBQuests::catch_grass: case BBQuests::catch_dragon:
+            console.log("Catch: Grass/Dragon");
+
+            //Coastal Plaza - Exeggutor-A
+            central_to_coastal_plaza(info, console, context);
+
+            pbf_move_left_joystick(context, {-1, +0.102}, 3200ms, 160ms);
+
+            //Jump down
+            pbf_press_button(context, BUTTON_L | BUTTON_PLUS, 160ms, 840ms);
+            ssf_press_button(context, BUTTON_B, 0ms, 800ms);
+            ssf_press_button(context, BUTTON_B, 0ms, 160ms, 80ms);
+            ssf_press_button(context, BUTTON_B, 0ms, 160ms);
+
+            pbf_wait(context, 800ms);
+            context.wait_for_all_requests();
+
+            pbf_move_left_joystick(context, {0, +1}, 2800ms, 160ms);
+            pbf_press_button(context, BUTTON_B, 160ms, 160ms);
+            pbf_wait(context, 1600ms);
+            pbf_press_button(context, BUTTON_L | BUTTON_PLUS, 160ms, 840ms);
+
+            break;
+        case BBQuests::catch_ghost: case BBQuests::catch_ground:
+            console.log("Catch: Ghost/Ground");
+
+            //Canyon Plaza - Golett
+            central_to_canyon_plaza(info, console, context);
+
+            pbf_move_left_joystick(context, {+0.646, 0}, 80ms, 160ms);
+            pbf_press_button(context, BUTTON_L | BUTTON_PLUS, 160ms, 840ms);
+
+            jump_glide_fly(console, context, BBQ_OPTIONS.INVERTED_FLIGHT, 4800ms, 2400ms, 3200ms);
+
+            pbf_press_button(context, BUTTON_L | BUTTON_PLUS, 160ms, 840ms);
+
+            pbf_move_left_joystick(context, {-1, +1}, 80ms, 160ms);
+            pbf_press_button(context, BUTTON_L, 160ms, 400ms);
+            pbf_move_left_joystick(context, {0, +1}, 400ms, 160ms);
+
+            break;
+        case BBQuests::catch_fairy:
+            console.log("Catch: Fairy");
+
+            //Snubbull - Central plaza
+            //Tested while snowing, seems fine?
+            open_map_from_overworld(info, console, context);
+            fly_to_overworld_from_map(info, console, context);
+
+            pbf_move_left_joystick(context, {-1, +0.375}, 80ms, 160ms);
+            pbf_press_button(context, BUTTON_L | BUTTON_PLUS, 160ms, 840ms);
+
+            jump_glide_fly(console, context, BBQ_OPTIONS.INVERTED_FLIGHT, 16000ms, 12000ms, 1600ms);
+
+            pbf_press_button(context, BUTTON_PLUS, 160ms, 840ms);
+
+            pbf_move_left_joystick(context, {+1, +1}, 80ms, 160ms);
+            pbf_press_button(context, BUTTON_L, 160ms, 400ms);
+
+            break;
+        case BBQuests::catch_fighting:
+            console.log("Catch: Fighting");
+
+            //Hitmontop (TERA ICE) - Canyon Plaza or Classroom
+            central_to_canyon_plaza(info, console, context);
+            pbf_move_left_joystick(context, {-1, 0}, 3200ms, 160ms);
+            pbf_press_button(context, BUTTON_L, 80ms, 400ms);
+            pbf_move_left_joystick(context, {-1, +0.219}, 160ms, 400ms);
+            pbf_press_button(context, BUTTON_L | BUTTON_PLUS, 160ms, 840ms);
+
+            jump_glide_fly(console, context, BBQ_OPTIONS.INVERTED_FLIGHT, 1600ms, 4000ms, 6400ms);
+
+            break;
+
+        case BBQuests::catch_bug:
+            console.log("Catch: Bug");
+
+            central_to_canyon_plaza(info, console, context);
+
+            pbf_move_left_joystick(context, {+0.606, +0.5}, 160ms, 840ms);
+            pbf_press_button(context, BUTTON_L | BUTTON_PLUS, 160ms, 840ms);
+
+            jump_glide_fly(console, context, BBQ_OPTIONS.INVERTED_FLIGHT, 8000ms, 13200ms, 4000ms);
+            break;
+        case BBQuests::catch_flying:
+            console.log("Catch: Flying");
+
+            //Vullaby/Mandibuzz
+            central_to_savanna_plaza(info, console, context);
+
+            pbf_move_left_joystick(context, {+1, +0.688}, 80ms, 160ms);
+            pbf_press_button(context, BUTTON_L | BUTTON_PLUS, 160ms, 840ms);
+
+            pbf_move_left_joystick(context, {0, +1}, 4000ms, 160ms);
+            pbf_press_button(context, BUTTON_L | BUTTON_PLUS, 160ms, 840ms);
+
+            pbf_move_left_joystick(context, {+1, +1}, 80ms, 160ms);
+            pbf_press_button(context, BUTTON_L, 160ms, 400ms);
+
+            if (console.state().console_type() == ConsoleType::Switch1){
+                pbf_move_left_joystick(context, {0, +1}, 1600ms, 160ms);
+            }else{
+                pbf_move_left_joystick(context, {0, +1}, 1360ms, 160ms);
+            }
+
+            pbf_press_button(context, BUTTON_L, 160ms, 400ms);
+
+            pbf_move_left_joystick(context, {-1, +1}, 80ms, 160ms);
+            pbf_press_button(context, BUTTON_L, 160ms, 400ms);
+
+            if (console.state().console_type() == ConsoleType::Switch1){
+                pbf_move_left_joystick(context, {0, +1}, 800ms, 160ms);
+            }else{
+                pbf_move_left_joystick(context, {0, +1}, 960ms, 160ms);
+            }
+            pbf_wait(context, 3200ms);
+            context.wait_for_all_requests();
+
+            break;
+        case BBQuests::catch_rock: case BBQuests::catch_electric:
+            console.log("Catch: Rock/Electric");
+
+            //Geodude-A
+            open_map_from_overworld(info, console, context);
+            fly_to_overworld_from_map(info, console, context);
+            pbf_press_button(context, BUTTON_L, 160ms, 400ms);
+            pbf_move_left_joystick(context, {-0.453, +1}, 80ms, 160ms);
+            pbf_press_button(context, BUTTON_L | BUTTON_PLUS, 160ms, 840ms);
+
+            jump_glide_fly(console, context, BBQ_OPTIONS.INVERTED_FLIGHT, 800ms, 4400ms, 2400ms);
+
+            pbf_press_button(context, BUTTON_PLUS, 160ms, 840ms);
+            pbf_wait(context, 2400ms);
+            context.wait_for_all_requests();
+
+            break;
+        case BBQuests::catch_steel:
+            console.log("Catch: Steel");
+
+            //Dugtrio-A - area a bit laggy but should work most of the time
+            central_to_coastal_plaza(info, console, context);
+            pbf_move_left_joystick(context, {-1, 0}, 160ms, 400ms);
+
+            pbf_press_button(context, BUTTON_L | BUTTON_PLUS, 160ms, 840ms);
+
+            if (console.state().console_type() == ConsoleType::Switch1){
+                jump_glide_fly(console, context, BBQ_OPTIONS.INVERTED_FLIGHT, 1600ms, 4600ms, 1600ms);
+            }else{ //Switch 2
+                jump_glide_fly(console, context, BBQ_OPTIONS.INVERTED_FLIGHT, 1600ms, 4000ms, 1600ms);
+            }
+
+            pbf_press_button(context, BUTTON_PLUS, 160ms, 840ms);
+            pbf_move_left_joystick(context, {-1, 0}, 160ms, 400ms);
+            pbf_press_button(context, BUTTON_L, 160ms, 400ms);
+            pbf_move_left_joystick(context, {0, +1}, 400ms, 400ms);
+
+            break;
+        case BBQuests::catch_poison: case BBQuests::catch_dark: 
+            console.log("Catch: Poison/Dark");
+
+            //Muk-A - area a bit laggy but consistently so
+            central_to_coastal_plaza(info, console, context);
+            pbf_move_left_joystick(context, {-1, 0}, 160ms, 400ms);
+
+            pbf_press_button(context, BUTTON_L | BUTTON_PLUS, 160ms, 840ms);
+
+            if (console.state().console_type() == ConsoleType::Switch1){
+                jump_glide_fly(console, context, BBQ_OPTIONS.INVERTED_FLIGHT, 8000ms, 14400ms, 2400ms);
+            }else{
+                jump_glide_fly(console, context, BBQ_OPTIONS.INVERTED_FLIGHT, 8000ms, 12800ms, 2400ms);
+            }
+
+            pbf_press_button(context, BUTTON_PLUS, 160ms, 840ms);
+
+            //Extra throws for this one
+            ssf_press_button(context, BUTTON_ZR, 0ms, 1600ms);
+            ssf_press_button(context, BUTTON_ZL, 800ms, 400ms);
+            ssf_press_button(context, BUTTON_ZL, 1200ms, 400ms);
+            pbf_wait(context, 1600ms);
+            context.wait_for_all_requests();
+            pbf_press_button(context, BUTTON_ZR, 160ms, 400ms); //Withdraw pokemon
+
+            pbf_move_left_joystick(context, {+1, 0}, 160ms, 400ms);
+            pbf_press_button(context, BUTTON_L, 160ms, 400ms);
+            ssf_press_button(context, BUTTON_ZR, 0ms, 1600ms);
+            ssf_press_button(context, BUTTON_ZL, 800ms, 400ms);
+            ssf_press_button(context, BUTTON_ZL, 1200ms, 400ms);
+            pbf_wait(context, 1600ms);
+            context.wait_for_all_requests();
+            pbf_press_button(context, BUTTON_ZR, 160ms, 400ms); //Withdraw pokemon
+
+            pbf_press_button(context, BUTTON_L, 160ms, 400ms);
+            pbf_move_left_joystick(context, {+1, 0}, 160ms, 400ms);
+            pbf_press_button(context, BUTTON_L, 160ms, 400ms);
+
+            break;
+        case BBQuests::catch_water: case BBQuests::catch_ice:
+            console.log("Catch: Water/Ice");
+
+            //Lapras - Tera Bug
+            central_to_polar_rest(info, console, context);
+            pbf_press_button(context, BUTTON_L, 80ms, 400ms);
+            pbf_move_left_joystick(context, {0, +1}, 1840ms, 160ms);
+            pbf_move_left_joystick(context, {-1, 0}, 2400ms, 160ms);
+            pbf_press_button(context, BUTTON_L, 160ms, 400ms);
+            pbf_move_left_joystick(context, {-0.844, +1}, 160ms, 400ms);
+            pbf_press_button(context, BUTTON_L | BUTTON_PLUS, 160ms, 840ms);
+
+            jump_glide_fly(console, context, BBQ_OPTIONS.INVERTED_FLIGHT, 5600ms, 13600ms, 2400ms);
+
+            break;
+        default:
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "Invalid catch quest.",
+                console
+            );
+            break;
+    }
+
+    //Lock on and throw ball
+    ssf_press_button(context, BUTTON_ZR, 0ms, 1600ms);
+    ssf_press_button(context, BUTTON_ZL, 800ms, 400ms);
+    ssf_press_button(context, BUTTON_ZL, 1200ms, 400ms);
+
+    pbf_wait(context, 2400ms);
+    context.wait_for_all_requests();
+
+}
+
+void quest_catch_throw_ball(
+    const ProgramInfo& info,
+    ConsoleHandle& console, ProControllerContext& context,
+    Language language,
+    const std::string& selected_ball
+){
+    BattleBallReader reader(console, language);
+    std::string ball_reader = "";
+    WallClock start = current_time();
+
+    console.log("Opening ball menu...");
+    while (ball_reader == ""){
+        if (current_time() - start > std::chrono::minutes(2)){
+            console.log("Timed out trying to read ball after 2 minutes.", COLOR_RED);
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "Timed out trying to read ball after 2 minutes.",
+                console
+            );
+        }
+
+        //Mash B to exit anything else
+        pbf_mash_button(context, BUTTON_B, 1000ms);
+        context.wait_for_all_requests();
+
+        //Press X to open Ball menu
+        pbf_press_button(context, BUTTON_X, 160ms, 800ms);
+        context.wait_for_all_requests();
+
+        VideoSnapshot screen = console.video().snapshot();
+        ball_reader = reader.read_ball(screen);
+    }
+
+    console.log("Selecting ball.");
+    int quantity = move_to_ball(reader, console, context, selected_ball);
+    if (quantity == 0){
+        console.log("Unable to find ball.");
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "Unable to find ball.",
+            console
+        );
+    }
+    if (quantity < 0){
+        console.log("Unable to read ball quantity.", COLOR_RED);
+    }
+
+    //Throw ball
+    console.log("Throwing ball.");
+    pbf_mash_button(context, BUTTON_A, 1200ms);
+    context.wait_for_all_requests();
+
+    pbf_mash_button(context, BUTTON_B, 7200ms);
+    context.wait_for_all_requests();
+}
+
+void quest_catch_handle_battle(
+    const ProgramInfo& info,
+    ConsoleHandle& console, ProControllerContext& context,
+    const BBQOption& BBQ_OPTIONS,
+    BBQuests current_quest
+){
+    console.log("Catching Pokemon.");
+    AdvanceDialogWatcher advance_dialog(COLOR_MAGENTA);
+    PromptDialogWatcher add_to_party(COLOR_PURPLE);
+    OverworldWatcher overworld(console.logger(), COLOR_RED);
+
+    uint8_t switch_party_slot = 1;
+    bool quickball_thrown = false;
+    bool tera_target = false;
+    bool use_quickball = BBQ_OPTIONS.QUICKBALL;
+
+    int ret2 = run_until<ProControllerContext>(
+        console, context,
+        [&](ProControllerContext& context){
+            while (true){
+                //Check that battle menu appears - this is in case of swapping pokemon
+                NormalBattleMenuWatcher menu_before_throw(COLOR_YELLOW);
+                int bMenu = wait_until(
+                    console, context,
+                    std::chrono::seconds(15),
+                    { menu_before_throw }
+                );
+                if (bMenu < 0){
+                    console.log("Unable to find menu_before_throw.");
+                    OperationFailedExceptionWithScreenshot::fire(
+                        ErrorReportMode::SEND_ERROR_REPORT,
+                        "Unable to find menu_before_throw.",
+                        console
+                    );
+                }
+                
+                //Check for catch menu - if none it is a tera pokemon
+                console.log("Checking for ball menu.");
+                BattleBallReader exists(console, BBQ_OPTIONS.LANGUAGE);
+                std::string ball_exists = "";
+
+                pbf_press_button(context, BUTTON_X, 160ms, 800ms);
+                context.wait_for_all_requests();
+
+                VideoSnapshot screen_ball = console.video().snapshot();
+                ball_exists = exists.read_ball(screen_ball);
+
+                if (ball_exists == ""){
+                    console.log("Could not find ball reader. Tera battle. Using first attack.");
+                    pbf_mash_button(context, BUTTON_B, 1000ms);
+                    context.wait_for_all_requests();
+
+                    pbf_mash_button(context, BUTTON_A, 2400ms);
+                    context.wait_for_all_requests();
+
+                    tera_target = true;
+                }else{
+                    //Quick ball occurs before anything else in battle.
+                    //Do not throw if target is a tera pokemon.
+                    if (use_quickball && !quickball_thrown && tera_target == false){
+                        console.log("Quick Ball option checked. Throwing Quick Ball.");
+                        quest_catch_throw_ball(info, console, context, BBQ_OPTIONS.LANGUAGE, "quick-ball");
+                        quickball_thrown = true;
+                    }else{
+                        console.log("Throwing selected ball.");
+                        quest_catch_throw_ball(info, console, context, BBQ_OPTIONS.LANGUAGE, BBQ_OPTIONS.BALL_SELECT.slug());
+                    }
+
+                    //Check for battle menu, if found use fourth attack this turn
+                    NormalBattleMenuWatcher battle_menu(COLOR_YELLOW);
+                    int ret = wait_until(
+                        console, context,
+                        std::chrono::seconds(4),
+                        { battle_menu }
+                    );
+                    if (ret == 0){
+                        console.log("Battle menu detected early. Using fourth attack.");
+                        MoveSelectWatcher move_watcher(COLOR_BLUE);
+                        MoveSelectDetector move_select(COLOR_BLUE);
+
+                        int ret_move_select = run_until<ProControllerContext>(
+                            console, context,
+                            [&](ProControllerContext& context){
+                                pbf_press_button(context, BUTTON_A, 80ms, 400ms);
+                                pbf_wait(context, 800ms);
+                                context.wait_for_all_requests();
+                            },
+                            { move_watcher }
+                        );
+                        if (ret_move_select != 0){
+                            console.log("Could not find move select.");
+                        }else{
+                            console.log("Move select found!");
+                        }
+
+                        context.wait_for_all_requests();
+                        move_select.move_to_slot(console, context, 3);
+                        pbf_mash_button(context, BUTTON_A, 1200ms);
+                        pbf_wait(context, 800ms);
+                        context.wait_for_all_requests();
+
+                        //Check for battle menu
+                        //If found after a second, assume out of PP and stop as this is a setup issue
+                        //None of the target pokemon for this program have disable, taunt, etc.
+                        NormalBattleMenuWatcher battle_menu2(COLOR_YELLOW);
+                        int ret3 = wait_until(
+                            console, context,
+                            std::chrono::seconds(4),
+                            { battle_menu2 }
+                        );
+                        if (ret3 == 0){
+                            console.log("Battle menu detected early. Out of PP/No move in slot, please check your setup.");
+                            OperationFailedExceptionWithScreenshot::fire(
+                                ErrorReportMode::SEND_ERROR_REPORT,
+                                "Battle menu detected early. Out of PP, please check your setup.",
+                                console
+                            );
+                        }
+                    }else{
+                        //Wild pokemon's turn/wait for catch animation
+                        pbf_mash_button(context, BUTTON_B, 7200ms);
+                        context.wait_for_all_requests();
+                    }
+                }
+
+                NormalBattleMenuWatcher battle_menu(COLOR_YELLOW);
+                GradientArrowWatcher fainted(COLOR_BLUE, GradientArrowType::RIGHT, {0.610, 0.523, 0.044, 0.079});
+                SwapMenuWatcher swap(COLOR_YELLOW);
+                int ret2_run = wait_until(
+                    console, context,
+                    std::chrono::seconds(60),
+                    { battle_menu, fainted }
+                );
+                switch (ret2_run){
+                case 0:
+                    console.log("Battle menu detected, continuing.");
+                    break;
+                case 1:
+                    console.log("Detected fainted Pokemon. Switching to next living Pokemon...");
+                    pbf_press_button(context, BUTTON_A, 160ms, 400ms);
+                    pbf_wait(context, 800ms);
+                    context.wait_for_all_requests();
+                    if (swap.move_to_slot(console, context, switch_party_slot)){
+                        pbf_mash_button(context, BUTTON_A, 3000ms);
+                        context.wait_for_all_requests();
+                        switch_party_slot++;
+                    }
+                    break;
+                default:
+                    console.log("Invalid state ret2_run. Out of moves?");
+                    OperationFailedExceptionWithScreenshot::fire(
+                        ErrorReportMode::SEND_ERROR_REPORT,
+                        "Invalid state ret2_run. Out of moves?",
+                        console
+                    );
+                }
+
+            }
+        },
+        { advance_dialog, add_to_party, overworld }
+        );
+
+    switch (ret2){
+    case 0:
+        console.log("Advance Dialog detected.");
+        press_Bs_to_back_to_overworld(info, console, context);
+        break;
+    case 1:
+        console.log("Prompt dialog detected.");
+        press_Bs_to_back_to_overworld(info, console, context);
+        break;
+    case 2:
+        console.log("Overworld detected.");
+        break;
+    default:
+        console.log("Invalid state in run_battle().");
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "Invalid state in run_battle().",
+            console
+        );
+    }
+}
+
+void quest_catch(
+    const ProgramInfo& info,
+    ConsoleHandle& console, ProControllerContext& context,
+    const BBQOption& BBQ_OPTIONS,
+    BBQuests current_quest
+){
+    EncounterWatcher encounter_watcher(console, COLOR_RED);
+
+    //Navigate to target and start battle
+    int ret = run_until<ProControllerContext>(
+        console, context,
+        [&](ProControllerContext& context){
+            
+            quest_catch_navi(info, console, context, BBQ_OPTIONS, current_quest);
+            context.wait_for_all_requests();
+
+            NormalBattleMenuWatcher battle_menu(COLOR_YELLOW);
+            int ret2 = wait_until(
+                console, context,
+                std::chrono::seconds(25),
+                { battle_menu }
+            );
+            if (ret2 != 0){
+                console.log("Did not enter battle. Did target spawn?");
+            }
+        },
+        {
+            static_cast<VisualInferenceCallback&>(encounter_watcher),
+            static_cast<AudioInferenceCallback&>(encounter_watcher),
+        }
+    );
+    encounter_watcher.throw_if_no_sound();
+
+    if (ret >= 0){
+        console.log("Battle menu detected.");
+
+        bool is_shiny = (bool)encounter_watcher.shiny_screenshot();
+        if (is_shiny){
+            console.log("Shiny detected!");
+            pbf_press_button(context, BUTTON_CAPTURE, 2000ms, 5000ms);
+            throw ProgramFinishedException();
+        }else{
+            quest_catch_handle_battle(info, console, context, BBQ_OPTIONS, current_quest);
+        }
+    }
+
+    return_to_plaza(info, console, context);
+
+    //Day skip and attempt to respawn fixed encounters
+    pbf_press_button(context, BUTTON_HOME, 160ms, GameSettings::instance().GAME_TO_HOME_DELAY1);
+    home_to_date_time(console, context, true);
+    roll_date_forward_1(console, context, true);
+    pbf_press_button(context, BUTTON_HOME, 160ms, ConsoleSettings::instance().SETTINGS_TO_HOME_DELAY0);
+    resume_game_from_home(console, context);
+
+    //Heal up and then reset position again.
+    OverworldWatcher done_healing(console.logger(), COLOR_BLUE);
+    pbf_move_left_joystick(context, {0, +1}, 800ms, 160ms);
+
+    pbf_mash_button(context, BUTTON_A, 2400ms);
+    context.wait_for_all_requests();
+
+    int exit = run_until<ProControllerContext>(
+        console, context,
+        [&](ProControllerContext& context){
+            pbf_mash_button(context, BUTTON_B, 16000ms);
+        },
+        {{ done_healing }}
+    );
+    if (exit == 0){
+        console.log("Overworld detected.");
+    }
+    open_map_from_overworld(info, console, context);
+    pbf_press_button(context, BUTTON_ZL, 320ms, 800ms);
+    fly_to_overworld_from_map(info, console, context);
+    context.wait_for_all_requests();
+}
+
+void wild_battle_tera(
+    const ProgramInfo& info,
+    ConsoleHandle& console, ProControllerContext& context,
+    bool& tera_self
+){
+    AdvanceDialogWatcher lost(COLOR_YELLOW);
+    OverworldWatcher overworld(console.logger(), COLOR_RED);
+    WallClock start = current_time();
+    uint8_t switch_party_slot = 1;
+    bool first_turn = true;
+
+    int ret2 = run_until<ProControllerContext>(
+        console, context,
+        [&](ProControllerContext& context){
+            while(true){
+                if (current_time() - start > std::chrono::minutes(5)){
+                    console.log("Timed out during battle after 5 minutes.", COLOR_RED);
+                    OperationFailedExceptionWithScreenshot::fire(
+                        ErrorReportMode::SEND_ERROR_REPORT,
+                        "Timed out during battle after 5 minutes.",
+                        console
+                    );
+                }
+
+                if (first_turn && tera_self){
+                    console.log("Turn 1: Tera.");
+                    //Open move menu
+                    pbf_press_button(context, BUTTON_A, 80ms, 400ms);
+                    pbf_wait(context, 800ms);
+                    context.wait_for_all_requests();
+
+                    pbf_press_button(context, BUTTON_R, 160ms, 400ms);
+                    pbf_press_button(context, BUTTON_A, 80ms, 400ms);
+
+                    first_turn = false;
+                }
+
+                NormalBattleMenuWatcher battle_menu(COLOR_MAGENTA);
+                GradientArrowWatcher fainted(COLOR_BLUE, GradientArrowType::RIGHT, {0.610, 0.523, 0.044, 0.079});
+                SwapMenuWatcher swap(COLOR_YELLOW);
+
+                context.wait_for_all_requests();
+
+                int ret3 = wait_until(
+                    console, context,
+                    std::chrono::seconds(90),
+                    { battle_menu, fainted }
+                );
+                switch (ret3){
+                case 0:
+                    console.log("Detected battle menu. Pressing A to attack...");
+                    pbf_mash_button(context, BUTTON_A, 3000ms);
+                    context.wait_for_all_requests();
+                    break;
+                case 1:
+                    console.log("Detected fainted Pokemon. Switching to next living Pokemon...");
+                    pbf_press_button(context, BUTTON_A, 160ms, 400ms);
+                    pbf_wait(context, 800ms);
+                    context.wait_for_all_requests();
+                    if (swap.move_to_slot(console, context, switch_party_slot)){
+                        pbf_mash_button(context, BUTTON_A, 3000ms);
+                        context.wait_for_all_requests();
+                        switch_party_slot++;
+                    }
+                    break;
+                default:
+                    OperationFailedExceptionWithScreenshot::fire(
+                        ErrorReportMode::SEND_ERROR_REPORT,
+                        "Timed out during battle. Stuck, crashed, or took more than 90 seconds for a turn.",
+                        console
+                    );
+                }
+            }
+        },
+        { lost, overworld }
+    );
+    if (ret2 == 0){
+        console.log("Lost battle. Mashing B.");
+    }
+}
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_BlueberryCatchPhoto.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_BlueberryCatchPhoto.h
new file mode 100644
index 0000000000..862285c3c3
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_BlueberryCatchPhoto.h
@@ -0,0 +1,88 @@
+/*  Blueberry Quests
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_BlueberryCatchPhoto_H
+#define PokemonAutomation_PokemonSV_BlueberryCatchPhoto_H
+
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+#include "NintendoSwitch/NintendoSwitch_Settings.h"
+#include "NintendoSwitch/NintendoSwitch_ConsoleHandle.h"
+#include "VideoGames/PokemonSV/Options/PokemonSV_BBQOption.h"
+
+using namespace std;
+
+namespace PokemonAutomation{
+    struct ProgramInfo;
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+enum class CameraAngle{
+    none,
+    up,
+    down
+};
+
+//Navigate to a photo target
+CameraAngle quest_photo_navi(
+    const ProgramInfo& info,
+    ConsoleHandle& console, ProControllerContext& context,
+    const BBQOption& BBQ_OPTIONS,
+    BBQuests current_quest
+);
+
+//Take picture of a pokemon/location
+void quest_photo(
+    const ProgramInfo& info,
+    ConsoleHandle& console, ProControllerContext& context,
+    const BBQOption& BBQ_OPTIONS,
+    BBQuests current_quest
+);
+
+
+//Navigate to a catch target
+void quest_catch_navi(
+    const ProgramInfo& info,
+    ConsoleHandle& console, ProControllerContext& context,
+    const BBQOption& BBQ_OPTIONS,
+    BBQuests current_quest
+);
+
+//Select and throw ball
+void quest_catch_throw_ball(
+    const ProgramInfo& info,
+    ConsoleHandle& console, ProControllerContext& context,
+    Language language,
+    const std::string& selected_ball
+);
+
+//Handle catching the target
+void quest_catch_handle_battle(
+    const ProgramInfo& info,
+    ConsoleHandle& console, ProControllerContext& context,
+    const BBQOption& BBQ_OPTIONS,
+    BBQuests current_quest
+);
+
+//Catch a pokemon
+void quest_catch(
+    const ProgramInfo& info,
+    ConsoleHandle& console, ProControllerContext& context,
+    const BBQOption& BBQ_OPTIONS,
+    BBQuests current_quest
+);
+
+
+//Handle battles for tera-self/defeat-wild-tera. Use first attack until victory.
+void wild_battle_tera(
+    const ProgramInfo& info,
+    ConsoleHandle& console, ProControllerContext& context,
+    bool& tera_self
+);
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_BlueberryQuests.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_BlueberryQuests.cpp
new file mode 100644
index 0000000000..c90bae7a04
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_BlueberryQuests.cpp
@@ -0,0 +1,1322 @@
+/*  Blueberry Quests
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include<vector>
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/Tools/ErrorDumper.h"
+#include "CommonFramework/Exceptions/ProgramFinishedException.h"
+#include "CommonTools/Images/ImageFilter.h"
+#include "CommonTools/OCR/OCR_NumberReader.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "NintendoSwitch/NintendoSwitch_Settings.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "NintendoSwitch/Programs/DateSpam/NintendoSwitch_HomeToDateTime.h"
+#include "NintendoSwitch/Programs/DateSpam/NintendoSwitch_RollDateForward1.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h"
+#include "VideoGames/PokemonSV/PokemonSV_Settings.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h"
+#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h"
+#include "VideoGames/PokemonSV/Inference/Battles/PokemonSV_NormalBattleMenus.h"
+#include "VideoGames/PokemonSV/Inference/Battles/PokemonSV_EncounterWatcher.h"
+#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h"
+#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h"
+#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldSensors.h"
+#include "VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxDetection.h"
+#include "VideoGames/PokemonSV/Programs/Boxes/PokemonSV_BoxRoutines.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h"
+#include "VideoGames/PokemonSV/Inference/PokemonSV_BlueberryQuestDetector.h"
+#include "VideoGames/PokemonSV/Inference/PokemonSV_BlueberryPointsReader.h"
+#include "VideoGames/PokemonSV/Programs/Eggs/PokemonSV_EggRoutines.h"
+#include "VideoGames/PokemonSV/Programs/Boxes/PokemonSV_BoxRelease.h"
+#include "VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxEggDetector.h"
+#include "VideoGames/PokemonSV/Programs/Sandwiches/PokemonSV_SandwichRoutines.h"
+#include "VideoGames/PokemonSV/Programs/ShinyHunting/PokemonSV_LetsGoTools.h"
+#include "VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_TeraRoutines.h"
+#include "VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_TeraBattler.h"
+#include "VideoGames/PokemonSV/Programs/Farming/PokemonSV_BlueberryCatchPhoto.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_Terarium.h"
+
+#include "PokemonSV_BlueberryQuests.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+int read_BP(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+    WhiteButtonWatcher right_panel(COLOR_BLUE, WhiteButton::ButtonB, {0.484, 0.117, 0.022, 0.037});
+    int result = run_until<ProControllerContext>(
+        stream, context,
+        [&](ProControllerContext& context){
+            for (int i = 0; i < 6; i++){ //try 6 times
+                pbf_press_dpad(context, DPAD_RIGHT, 400ms, 160ms);
+                pbf_wait(context, 1600ms);
+                context.wait_for_all_requests();
+            }
+        },
+        {{ right_panel }}
+    );
+    if (result == 0){
+        stream.log("Found quest panel.");
+    }
+    context.wait_for_all_requests();
+    
+    VideoSnapshot screen = stream.video().snapshot();
+
+    //Close panel
+    pbf_mash_button(context, BUTTON_B, 800ms);
+    context.wait_for_all_requests();
+
+    return read_BP_from_image(stream.logger(), screen);
+}
+
+std::vector<BBQuests> read_quests(
+    const ProgramInfo& info,
+    VideoStream& stream, ProControllerContext& context,
+    const BBQOption& BBQ_OPTIONS
+){
+    std::vector<BBQuests> quest_list;
+
+    //Open quest list. Wait for it to open.
+    WhiteButtonWatcher right_panel(COLOR_BLUE, WhiteButton::ButtonB, {0.484, 0.117, 0.022, 0.037});
+    int result = run_until<ProControllerContext>(
+        stream, context,
+        [&](ProControllerContext& context){
+            for (int i = 0; i < 6; i++){ //try 6 times
+                pbf_press_dpad(context, DPAD_RIGHT, 400ms, 160ms);
+                pbf_wait(context, 1600ms);
+                context.wait_for_all_requests();
+            }
+        },
+        {{ right_panel }}
+    );
+    if (result == 0){
+        stream.log("Found quest panel.");
+    }
+    context.wait_for_all_requests();
+
+    //Read in the initial 4 quests.
+    stream.log("Reading quests.");
+    VideoSnapshot screen = stream.video().snapshot();
+    BlueberryQuestDetector first_quest_detector(stream.logger(), COLOR_GREEN, BBQ_OPTIONS.LANGUAGE, BlueberryQuestDetector::QuestPosition::FIRST);
+    BlueberryQuestDetector second_quest_detector(stream.logger(), COLOR_GREEN, BBQ_OPTIONS.LANGUAGE, BlueberryQuestDetector::QuestPosition::SECOND);
+    BlueberryQuestDetector third_quest_detector(stream.logger(), COLOR_GREEN, BBQ_OPTIONS.LANGUAGE, BlueberryQuestDetector::QuestPosition::THIRD);
+    BlueberryQuestDetector fourth_quest_detector(stream.logger(), COLOR_GREEN, BBQ_OPTIONS.LANGUAGE, BlueberryQuestDetector::QuestPosition::FOURTH);
+
+    quest_list.push_back(BBQuests_string_to_enum(first_quest_detector.detect_quest(screen)));
+    quest_list.push_back(BBQuests_string_to_enum(second_quest_detector.detect_quest(screen)));
+    quest_list.push_back(BBQuests_string_to_enum(third_quest_detector.detect_quest(screen)));
+    
+    std::string fourth_quest = fourth_quest_detector.detect_quest(screen);
+    if (fourth_quest != ""){
+        quest_list.push_back(BBQuests_string_to_enum(fourth_quest));
+    }
+
+    //Close quest list
+    pbf_mash_button(context, BUTTON_B, 800ms);
+    context.wait_for_all_requests();
+
+    return quest_list;
+}
+
+std::vector<BBQuests> process_quest_list(
+    const ProgramInfo& info,
+    VideoStream& stream, ProControllerContext& context,
+    const BBQOption& BBQ_OPTIONS,
+    std::vector<BBQuests>& quest_list,
+    uint8_t& eggs_hatched
+){
+    std::vector<BBQuests> quests_to_do;
+    bool rerolled = false;
+    std::vector<std::unique_ptr<BBQuestTableRow>> exclusions_table = BBQ_OPTIONS.QUEST_EXCLUSIONS.copy_snapshot();
+    int questpos = 0;
+
+    stream.log("Processing quests.");
+    //Put all do-able quests into a different list
+    for (auto n : quest_list){
+        if (not_possible_quests.contains(n)){
+            stream.log("Quest not possible");
+        }else{
+            //Check eggs remaining.
+            if (n == BBQuests::hatch_egg && eggs_hatched >= BBQ_OPTIONS.NUM_EGGS){
+                stream.log("Out of eggs! Quest not possible.");
+
+                switch (BBQ_OPTIONS.OUT_OF_EGGS){
+                case BBQOption::OOEggs::Reroll:
+                {
+                    stream.log("Reroll selected. Rerolling Egg quest. New quest will be run in the next batch of quests.");
+                    //stream.log("Warning: This does not handle/check being out of BP!", COLOR_RED);
+
+                    WhiteButtonWatcher right_panel(COLOR_BLUE, WhiteButton::ButtonB, {0.484, 0.117, 0.022, 0.037});
+                    int result = run_until<ProControllerContext>(
+                        stream, context,
+                        [&](ProControllerContext& context){
+                            for (int i = 0; i < 6; i++){
+                                pbf_press_dpad(context, DPAD_RIGHT, 400ms, 160ms);
+                                pbf_wait(context, 1600ms);
+                                context.wait_for_all_requests();
+                            }
+                        },
+                        {{ right_panel }}
+                    );
+                    if (result == 0){
+                        stream.log("Found quest panel.");
+                    }
+                    context.wait_for_all_requests();
+                    
+                    pbf_press_button(context, BUTTON_A, 160ms, 400ms);
+                    pbf_press_button(context, BUTTON_A, 160ms, 400ms);
+                    pbf_wait(context, 800ms);
+                    context.wait_for_all_requests();
+
+                    rerolled = true;
+                    press_Bs_to_back_to_overworld(info, stream, context);
+
+                    break;
+                }
+                case BBQOption::OOEggs::KeepGoing:
+                    stream.log("Keep Going selected. Ignoring quest.");
+                    break;
+                default:
+                    //This case is handled in BBQSoloFarmer.
+                    stream.log("OOEggs is Stop in process_quest_list().");
+                    OperationFailedExceptionWithScreenshot::fire(
+                        ErrorReportMode::SEND_ERROR_REPORT,
+                        "OOEggs is Stop in process_quest_list().",
+                        stream
+                    );
+                    break;
+                }
+            }else{
+                bool quest_in_table = false;
+                for (const std::unique_ptr<BBQuestTableRow>& row : exclusions_table){
+                    if(n == row->quest){
+                        stream.log("Quest found in inclusions/exclusions table.");
+                        quest_in_table = true;
+
+                        WhiteButtonWatcher rp2(COLOR_BLUE, WhiteButton::ButtonB, {0.484, 0.117, 0.022, 0.037});
+                        int result2;
+                        switch (row->action){
+                        case BBQAction::run:
+                            stream.log("Run selected. Adding quest to list.");
+                            quests_to_do.push_back(n);
+                            break;
+                        case BBQAction::reroll:
+                            stream.log("Reroll selected. Rerolling quest. New quest will be run in the next batch of quests.");
+                            result2 = run_until<ProControllerContext>(
+                                stream, context,
+                                [&](ProControllerContext& context){
+                                    for (int i = 0; i < 6; i++){
+                                        pbf_press_dpad(context, DPAD_RIGHT, 400ms, 160ms);
+                                        pbf_wait(context, 1600ms);
+                                        context.wait_for_all_requests();
+                                    }
+                                },
+                                {{ rp2 }}
+                            );
+                            if (result2 == 0){
+                                stream.log("Found quest panel.");
+                            }
+                            context.wait_for_all_requests();
+                            
+                            //Move cursor down to quest
+                            for (int i = 0; i < questpos; i++){
+                                pbf_press_dpad(context, DPAD_DOWN, 160ms, 160ms);
+                                pbf_wait(context, 800ms);
+                                context.wait_for_all_requests();
+                            }
+                            
+                            //Reroll
+                            pbf_press_button(context, BUTTON_A, 160ms, 400ms);
+                            pbf_press_button(context, BUTTON_A, 160ms, 400ms);
+                            pbf_wait(context, 800ms);
+                            context.wait_for_all_requests();
+
+                            //Prevent error/rerolling again at the end (allows program to read the rerolled quests)
+                            rerolled = true;
+
+                            press_Bs_to_back_to_overworld(info, stream, context);
+                            break;
+                        case BBQAction::skip:
+                            stream.log("Skip selected. Skipping quest.");
+                            break;
+                        }
+                    }
+                }
+                if(!quest_in_table){
+                    stream.log("Quest not in inclusion/exclusions table. Adding to list.");
+                    quests_to_do.push_back(n);
+                }
+            }
+        }
+        questpos++;
+    }
+    
+    //Check that quests_to_do is not empty (after completing all quests on the list, be sure to erase it.
+    //Lag might be a problem in multi - look into making slots like menu-left navigation
+    if (!rerolled && quests_to_do.size() == 0){
+        stream.log("No possible quests! Rerolling all quests.");
+
+        //Open quest panel and reroll all quests.
+        //This does not handle out of BP.
+        WhiteButtonWatcher panel(COLOR_BLUE, WhiteButton::ButtonB, {0.484, 0.117, 0.022, 0.037});
+        int result = run_until<ProControllerContext>(
+            stream, context,
+            [&](ProControllerContext& context){
+                for (int i = 0; i < 6; i++){
+                    pbf_press_dpad(context, DPAD_RIGHT, 400ms, 160ms);
+                    pbf_wait(context, 1600ms);
+                    context.wait_for_all_requests();
+                }
+            },
+            {{ panel }}
+        );
+        if (result == 0){
+            stream.log("Found quest panel.");
+        }
+        context.wait_for_all_requests();
+
+        for (string::size_type i = 0; i < quest_list.size(); i++){
+            pbf_press_button(context, BUTTON_A, 160ms, 400ms);
+            pbf_press_button(context, BUTTON_A, 160ms, 400ms); //Yes.
+            pbf_wait(context, 800ms);
+            context.wait_for_all_requests();
+            pbf_press_dpad(context, DPAD_DOWN, 160ms, 160ms);
+            pbf_wait(context, 800ms);
+            context.wait_for_all_requests();
+        }
+        //Close quest panel - mash b
+        press_Bs_to_back_to_overworld(info, stream, context);
+    }
+    /*
+    if (!rerolled && quests_to_do.size() == 0){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "No possible quests! Check language selection.",
+            stream
+        );
+    }
+    */
+    return quests_to_do;
+}
+
+bool process_and_do_quest(
+    ProgramEnvironment& env,
+    ConsoleHandle& console, ProControllerContext& context,
+    BBQOption& BBQ_OPTIONS,
+    BBQuests current_quest,
+    uint8_t& eggs_hatched
+){
+    bool quest_completed = false;
+    int quest_attempts = 0;
+
+    while (!quest_completed){
+        switch (current_quest){
+        case BBQuests::make_tm:
+            quest_make_tm(env.program_info(), console, context);
+            break;
+        case BBQuests::travel_500:
+            quest_travel_500(env.program_info(), console, context);
+            break;
+        case BBQuests::tera_self_defeat:
+            quest_tera_self_defeat(env.program_info(), console, context, BBQ_OPTIONS);
+            break;
+        case BBQuests::sneak_up:
+            quest_sneak_up(env.program_info(), console, context, BBQ_OPTIONS);
+            break;
+        case BBQuests::wild_tera:
+            quest_wild_tera(env.program_info(), console, context, BBQ_OPTIONS);
+            break;
+        case BBQuests::wash_pokemon:
+            quest_wash_pokemon(env.program_info(), console, context);
+            break;
+        case BBQuests::hatch_egg:
+            quest_hatch_egg(env, console, context, BBQ_OPTIONS);
+            break;
+        case BBQuests::bitter_sandwich:
+        case BBQuests::salty_sandwich:
+        case BBQuests::sour_sandwich:
+        case BBQuests::spicy_sandwich:
+        case BBQuests::sweet_sandwich:
+        case BBQuests::sandwich_three:
+            quest_sandwich(env, console, context, BBQ_OPTIONS, current_quest);
+            break;
+        //case BBQuests::pickup_10:
+        //    quest_pickup(env, env.program_info(), console, context, BBQ_OPTIONS);
+        //    break;
+        case BBQuests::tera_raid:
+            quest_tera_raid(env, console, context, BBQ_OPTIONS);
+            break;
+        case BBQuests::auto_10:
+        case BBQuests::auto_30:
+            quest_auto_battle(env, console, context, BBQ_OPTIONS, current_quest);
+            break;
+        //All involve taking pictures
+        case BBQuests::photo_fly:
+        case BBQuests::photo_swim:
+        case BBQuests::photo_canyon:
+        case BBQuests::photo_coastal:
+        case BBQuests::photo_polar:
+        case BBQuests::photo_savanna:
+        case BBQuests::photo_normal:
+        case BBQuests::photo_fighting:
+        case BBQuests::photo_flying:
+        case BBQuests::photo_poison:
+        case BBQuests::photo_ground:
+        case BBQuests::photo_rock:
+        case BBQuests::photo_bug:
+        case BBQuests::photo_ghost:
+        case BBQuests::photo_steel:
+        case BBQuests::photo_fire:
+        case BBQuests::photo_water:
+        case BBQuests::photo_grass:
+        case BBQuests::photo_electric:
+        case BBQuests::photo_psychic:
+        case BBQuests::photo_ice:
+        case BBQuests::photo_dragon:
+        case BBQuests::photo_dark:
+        case BBQuests::photo_fairy:
+            quest_photo(env.program_info(), console, context, BBQ_OPTIONS, current_quest);
+            break;
+        //All involve catching a pokemon
+        case BBQuests::catch_any:
+        case BBQuests::catch_normal:
+        case BBQuests::catch_fighting:
+        case BBQuests::catch_flying:
+        case BBQuests::catch_poison:
+        case BBQuests::catch_ground:
+        case BBQuests::catch_rock:
+        case BBQuests::catch_bug:
+        case BBQuests::catch_ghost:
+        case BBQuests::catch_steel:
+        case BBQuests::catch_fire:
+        case BBQuests::catch_water:
+        case BBQuests::catch_grass:
+        case BBQuests::catch_electric:
+        case BBQuests::catch_psychic:
+        case BBQuests::catch_ice:
+        case BBQuests::catch_dragon:
+        case BBQuests::catch_dark:
+        case BBQuests::catch_fairy:
+            quest_catch(env.program_info(), console, context, BBQ_OPTIONS, current_quest);
+            break;
+        default:
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "Unknown quest selection.",
+                console
+            );
+            break;
+        }
+
+        //Validate quest was completed by checking list
+        std::vector<BBQuests> quest_list = read_quests(env.program_info(), console, context, BBQ_OPTIONS);
+        if (std::find(quest_list.begin(), quest_list.end(), current_quest) != quest_list.end()){
+            console.log("Current quest exists on list. Quest did not complete.");
+            quest_attempts++;
+        }else{
+            console.log("Current quest was not found. Quest completed!");
+            if (current_quest == BBQuests::hatch_egg){
+                eggs_hatched++;
+                console.log("Eggs hatched: " + std::to_string(eggs_hatched));
+            }
+
+            quest_completed = true;
+        }
+
+        if (quest_attempts > BBQ_OPTIONS.NUM_RETRIES){
+            console.log("Failed to complete a quest multiple times. Skipping it for now.", COLOR_RED);
+            break;
+        }
+    }
+    return quest_completed;
+}
+
+void quest_make_tm(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+    stream.log("Quest: Make TM");
+
+    //Mount and then dismount in case you're crouched
+    pbf_press_button(context, BUTTON_PLUS, 160ms, 840ms);
+    pbf_press_button(context, BUTTON_PLUS, 160ms, 840ms);
+    context.wait_for_all_requests();
+
+    GradientArrowWatcher machine(COLOR_BLUE, GradientArrowType::DOWN, {0.181, 0.127, 0.045, 0.070});
+    PromptDialogWatcher makeTM(COLOR_RED);
+    OverworldWatcher overworld(stream.logger(), COLOR_BLUE);
+
+    pbf_move_left_joystick(context, {+1, +1}, 800ms, 160ms);
+    pbf_press_button(context, BUTTON_L, 80ms, 400ms);
+
+    int enter_machine = run_until<ProControllerContext>(
+        stream, context,
+        [&](ProControllerContext& context){
+            for (int i = 0; i < 10; i++){
+                pbf_press_button(context, BUTTON_A, 160ms, 400ms);
+                pbf_wait(context, 1600ms);
+                context.wait_for_all_requests();
+            }
+        },
+        {{ machine }}
+    );
+    context.wait_for_all_requests();
+
+    if (enter_machine == 0){
+        stream.log("TM machine entered. Finding TM to make.");
+
+        int make_tm = run_until<ProControllerContext>(
+            stream, context,
+            [&](ProControllerContext& context){
+                for (int i = 0; i < 229; i++){ //229 is max number of TMs
+                    //click on tm
+                    pbf_press_button(context, BUTTON_A, 160ms, 400ms);
+                    pbf_wait(context, 800ms);
+                    context.wait_for_all_requests();
+
+                    //not craftable, close and move on to next
+                    pbf_press_button(context, BUTTON_A, 160ms, 400ms);
+                    pbf_press_dpad(context, DPAD_RIGHT, 160ms, 160ms);
+                    pbf_wait(context, 800ms);
+                    context.wait_for_all_requests();
+                }
+            },
+            {{ makeTM }}
+        );
+        context.wait_for_all_requests();
+
+        if (make_tm == 0){
+            stream.log("Craftable TM found. Making TM");
+
+            pbf_mash_button(context, BUTTON_A, 1760ms);
+            context.wait_for_all_requests();
+        }else{
+            stream.log("Failed to find craftable TM!");
+        }
+    }else{
+        stream.log("Failed to enter TM machine!");
+    }
+    
+    int exit = run_until<ProControllerContext>(
+        stream, context,
+        [&](ProControllerContext& context){
+            pbf_mash_button(context, BUTTON_B, 16000ms);
+        },
+        {{ overworld }}
+    );
+    if (exit == 0){
+        stream.log("Overworld detected.");
+    }
+    context.wait_for_all_requests();
+    
+    open_map_from_overworld(info, stream, context);
+    pbf_press_button(context, BUTTON_ZL, 320ms, 800ms);
+    fly_to_overworld_from_map(info, stream, context);
+    context.wait_for_all_requests();
+}
+
+void quest_travel_500(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+    stream.log("Quest: Travel 500 meters.");
+
+    //Mount and then dismount in case you're crouched
+    pbf_press_button(context, BUTTON_PLUS, 160ms, 840ms);
+    pbf_press_button(context, BUTTON_PLUS, 160ms, 840ms);
+    context.wait_for_all_requests();
+
+    pbf_move_left_joystick(context, {-1, +1}, 800ms, 160ms);
+    pbf_move_left_joystick(context, {0, +1}, 1200ms, 160ms);
+    pbf_move_left_joystick(context, {-1, 0}, 1120ms, 160ms);
+
+    pbf_press_button(context, BUTTON_L | BUTTON_PLUS, 160ms, 840ms);
+
+    for (int j = 0; j < 60; j++){ //One min just to be safe.
+        pbf_controller_state(
+            context, BUTTON_LCLICK, DPAD_NONE,
+            {0, +1}, {+1, 0}, 1000ms
+        );
+    }
+    context.wait_for_all_requests();
+
+    open_map_from_overworld(info, stream, context);
+    pbf_press_button(context, BUTTON_ZL, 320ms, 800ms);
+    fly_to_overworld_from_map(info, stream, context);
+    context.wait_for_all_requests();
+}
+
+TeraEncounterAction tera_encounter_action(
+    bool shiny, int encounter_watcher_result, bool battle_menu_detected
+){
+    if (shiny){
+        return TeraEncounterAction::StopForShiny;
+    }
+    //Callback 1 is the audio side of the encounter watcher. It does not see the battle menu.
+    if (encounter_watcher_result == 0 || battle_menu_detected){
+        return TeraEncounterAction::Battle;
+    }
+    return TeraEncounterAction::Recover;
+}
+
+void quest_tera_self_defeat(
+    const ProgramInfo& info,
+    ConsoleHandle& console, ProControllerContext& context,
+    const BBQOption& BBQ_OPTIONS
+){
+    EncounterWatcher encounter_watcher(console, COLOR_RED);
+    bool battle_menu_detected = false;
+    console.log("Quest: Tera-self and defeat any wild.");
+    //Navigate to target and start battle
+    int ret = run_until<ProControllerContext>(
+        console, context,
+        [&](ProControllerContext& context){
+            central_to_canyon_plaza(info, console, context);
+
+            pbf_move_left_joystick(context, {+0.606, +0.5}, 160ms, 840ms);
+            pbf_press_button(context, BUTTON_L | BUTTON_PLUS, 160ms, 840ms);
+
+            //Drop on top of Kleavor (plenty of Scyther in the area as well)
+            if (console.state().console_type() == ConsoleType::Switch1){
+                jump_glide_fly(console, context, BBQ_OPTIONS.INVERTED_FLIGHT, 8000ms, 13200ms, 2400ms);
+            }else{ //All switch 2s
+                jump_glide_fly(console, context, BBQ_OPTIONS.INVERTED_FLIGHT, 8000ms, 12800ms, 2400ms);
+            }
+
+            ssf_press_button(context, BUTTON_ZR, 0ms, 1600ms);
+            ssf_press_button(context, BUTTON_ZL, 800ms, 400ms);
+            ssf_press_button(context, BUTTON_ZL, 1200ms, 400ms);
+
+            pbf_wait(context, 2400ms);
+            context.wait_for_all_requests();
+
+            NormalBattleMenuWatcher battle_menu(COLOR_YELLOW);
+            int ret2 = wait_until(
+                console, context,
+                std::chrono::seconds(15),
+                { battle_menu }
+            );
+            battle_menu_detected = ret2 == 0;
+            if (!battle_menu_detected){
+                console.log("Did not enter battle. Did Kleavor spawn?");
+            }
+        },
+        {
+            static_cast<VisualInferenceCallback&>(encounter_watcher),
+            static_cast<AudioInferenceCallback&>(encounter_watcher),
+        }
+        );
+    encounter_watcher.throw_if_no_sound();
+
+    switch (tera_encounter_action((bool)encounter_watcher.shiny_screenshot(), ret, battle_menu_detected)){
+    case TeraEncounterAction::StopForShiny:
+        console.log("Shiny detected!");
+        pbf_press_button(context, BUTTON_CAPTURE, 2000ms, 5000ms);
+        throw ProgramFinishedException();
+    case TeraEncounterAction::Battle:{
+        console.log("Battle menu detected.");
+        bool tera_self = true;
+        wild_battle_tera(info, console, context, tera_self);
+        break;
+    }
+    case TeraEncounterAction::Recover:
+        console.log("Battle entry not confirmed. Skipping battle handling.");
+        break;
+    }
+    pbf_press_button(context, BUTTON_PLUS, 160ms, 840ms);
+    return_to_plaza(info, console, context);
+
+    //Day skip and attempt to respawn fixed encounters
+    pbf_press_button(context, BUTTON_HOME, 160ms, GameSettings::instance().GAME_TO_HOME_DELAY1);
+    home_to_date_time(console, context, true);
+    roll_date_forward_1(console, context, true);
+    pbf_press_button(context, BUTTON_HOME, 160ms, ConsoleSettings::instance().SETTINGS_TO_HOME_DELAY0);
+    resume_game_from_home(console, context);
+
+    //Heal up and then reset position again.
+    OverworldWatcher done_healing(console.logger(), COLOR_BLUE);
+    pbf_move_left_joystick(context, {0, +1}, 800ms, 160ms);
+
+    pbf_mash_button(context, BUTTON_A, 2400ms);
+    context.wait_for_all_requests();
+
+    int exit = run_until<ProControllerContext>(
+        console, context,
+        [&](ProControllerContext& context){
+            pbf_mash_button(context, BUTTON_B, 16000ms);
+        },
+        {{ done_healing }}
+    );
+    if (exit == 0){
+        console.log("Overworld detected.");
+    }
+    open_map_from_overworld(info, console, context);
+    pbf_press_button(context, BUTTON_ZL, 320ms, 800ms);
+    fly_to_overworld_from_map(info, console, context);
+}
+
+void quest_sneak_up(
+    const ProgramInfo& info,
+    ConsoleHandle& console, ProControllerContext& context,
+    const BBQOption& BBQ_OPTIONS
+){
+    EncounterWatcher encounter_watcher(console, COLOR_RED);
+    console.log("Quest: Sneak up.");
+    //Navigate to target and start battle
+    int ret = run_until<ProControllerContext>(
+        console, context,
+        [&](ProControllerContext& context){
+            //Savanna Plaza - Pride Rock
+            central_to_savanna_plaza(info, console, context);
+
+            pbf_move_left_joystick(context, {+0.724, -1}, 80ms, 160ms);
+            pbf_press_button(context, BUTTON_L | BUTTON_PLUS, 160ms, 840ms);
+
+            jump_glide_fly(console, context, BBQ_OPTIONS.INVERTED_FLIGHT, 4800ms, 3200ms, 3200ms);
+
+            pbf_press_button(context, BUTTON_PLUS, 160ms, 840ms);
+            pbf_move_left_joystick(context, {+1, 0}, 160ms, 400ms);
+
+            pbf_press_button(context, BUTTON_L, 160ms, 400ms);
+            pbf_move_left_joystick(context, {0, +1}, 800ms, 400ms);
+
+            //Turn slightly for switch 1
+            if (console.state().console_type() == ConsoleType::Switch1){
+                pbf_move_left_joystick(context, {-1, +1}, 160ms, 400ms);
+                pbf_press_button(context, BUTTON_L, 160ms, 400ms);
+            }
+
+            ssf_press_button(context, BUTTON_ZR, 0ms, 1600ms);
+            ssf_press_button(context, BUTTON_ZL, 800ms, 400ms);
+            ssf_press_button(context, BUTTON_ZL, 1200ms, 400ms);
+
+            pbf_wait(context, 2400ms);
+            context.wait_for_all_requests();
+
+            NormalBattleMenuWatcher battle_menu(COLOR_YELLOW);
+            int ret2 = wait_until(
+                console, context,
+                std::chrono::seconds(15),
+                { battle_menu }
+            );
+            if (ret2 != 0){
+                console.log("Did not enter battle. Did target spawn?");
+            }
+        },
+        {
+            static_cast<VisualInferenceCallback&>(encounter_watcher),
+            static_cast<AudioInferenceCallback&>(encounter_watcher),
+        }
+        );
+    encounter_watcher.throw_if_no_sound();
+
+    if (ret >= 0){
+        console.log("Battle menu detected.");
+
+        bool is_shiny = (bool)encounter_watcher.shiny_screenshot();
+        if (is_shiny){
+            console.log("Shiny detected!");
+            pbf_press_button(context, BUTTON_CAPTURE, 2000ms, 5000ms);
+            throw ProgramFinishedException();
+        }else{
+            OverworldWatcher overworld(console.logger(), COLOR_BLUE);
+
+            int ret2 = run_until<ProControllerContext>(
+                console, context,
+                [&](ProControllerContext& context){
+                    while (true){
+                        //Flee immediately. Keep trying to flee.
+                        NormalBattleMenuWatcher battle_menu(COLOR_YELLOW);
+                        int ret2 = wait_until(
+                            console, context,
+                            std::chrono::seconds(60),
+                            { battle_menu }
+                        );
+                        switch (ret2){
+                        case 0:
+                            battle_menu.move_to_slot(console, context, 3);
+                            pbf_press_button(context, BUTTON_A, 80ms, 400ms);
+                            break;
+                        default:
+                            console.log("Invalid state quest_sneak_up(). Smoke Ball equipped?");
+                            OperationFailedExceptionWithScreenshot::fire(
+                                ErrorReportMode::SEND_ERROR_REPORT,
+                                "Invalid state quest_sneak_up(). Smoke Ball equipped?",
+                                console
+                            );
+                        }
+                    }
+                },
+                { overworld }
+                );
+
+            switch (ret2){
+            case 0:
+                console.log("Overworld detected.");
+                break;
+            default:
+                console.log("Invalid state in run_battle().");
+                OperationFailedExceptionWithScreenshot::fire(
+                    ErrorReportMode::SEND_ERROR_REPORT,
+                    "Invalid state in run_battle().",
+                    console
+                );
+            }
+        }
+    }
+    return_to_plaza(info, console, context);
+
+    //Day skip and attempt to respawn fixed encounters - in case quest failed
+    pbf_press_button(context, BUTTON_HOME, 160ms, GameSettings::instance().GAME_TO_HOME_DELAY1);
+    home_to_date_time(console, context, true);
+    roll_date_forward_1(console, context, true);
+    pbf_press_button(context, BUTTON_HOME, 160ms, ConsoleSettings::instance().SETTINGS_TO_HOME_DELAY0);
+    resume_game_from_home(console, context);
+    context.wait_for_all_requests();
+}
+
+void quest_wild_tera(
+    const ProgramInfo& info,
+    ConsoleHandle& console, ProControllerContext& context,
+    const BBQOption& BBQ_OPTIONS
+){
+    EncounterWatcher encounter_watcher(console, COLOR_RED);
+    bool battle_menu_detected = false;
+    console.log("Quest: Defeat a wild tera.");
+    //Navigate to target and start battle
+    int ret = run_until<ProControllerContext>(
+        console, context,
+        [&](ProControllerContext& context){
+            //Canyon Rest Area
+            central_to_canyon_rest(info, console, context);
+
+            pbf_move_left_joystick(context, {+1, -0.409}, 160ms, 840ms);
+            pbf_press_button(context, BUTTON_L | BUTTON_PLUS, 160ms, 840ms);
+
+            jump_glide_fly(console, context, BBQ_OPTIONS.INVERTED_FLIGHT, 4000ms, 10400ms, 1200ms);
+
+            //Skarmory is likely to attack but sometimes there is a different pokemon
+            pbf_press_button(context, BUTTON_PLUS, 160ms, 840ms);
+
+            if (console.state().console_type() == ConsoleType::Switch1){
+                pbf_move_left_joystick(context, {-0.609, +1}, 160ms, 840ms);
+                pbf_press_button(context, BUTTON_L, 160ms, 400ms);
+                pbf_move_left_joystick(context, {0, +1}, 800ms, 400ms);
+            }else{ //Switch 2
+                pbf_move_left_joystick(context, {-0.844, +1}, 160ms, 840ms);
+                pbf_press_button(context, BUTTON_L, 160ms, 400ms);
+            }
+
+            ssf_press_button(context, BUTTON_ZR, 0ms, 1600ms);
+            ssf_press_button(context, BUTTON_ZL, 800ms, 400ms);
+            ssf_press_button(context, BUTTON_ZL, 1200ms, 400ms);
+
+            pbf_wait(context, 2400ms);
+            context.wait_for_all_requests();
+
+            NormalBattleMenuWatcher battle_menu(COLOR_YELLOW);
+            int ret2 = wait_until(
+                console, context,
+                std::chrono::seconds(15),
+                { battle_menu }
+            );
+            battle_menu_detected = ret2 == 0;
+            if (!battle_menu_detected){
+                console.log("Did not enter battle.");
+            }
+        },
+        {
+            static_cast<VisualInferenceCallback&>(encounter_watcher),
+            static_cast<AudioInferenceCallback&>(encounter_watcher),
+        }
+    );
+    encounter_watcher.throw_if_no_sound();
+
+    switch (tera_encounter_action((bool)encounter_watcher.shiny_screenshot(), ret, battle_menu_detected)){
+    case TeraEncounterAction::StopForShiny:
+        console.log("Shiny detected!");
+        pbf_press_button(context, BUTTON_CAPTURE, 2000ms, 5000ms);
+        throw ProgramFinishedException();
+    case TeraEncounterAction::Battle:{
+        console.log("Battle menu detected.");
+        bool tera_self = false;
+        wild_battle_tera(info, console, context, tera_self);
+        break;
+    }
+    case TeraEncounterAction::Recover:
+        console.log("Battle entry not confirmed. Skipping battle handling.");
+        break;
+    }
+    return_to_plaza(info, console, context);
+
+    //Day skip and attempt to respawn fixed encounters
+    pbf_press_button(context, BUTTON_HOME, 160ms, GameSettings::instance().GAME_TO_HOME_DELAY1);
+    home_to_date_time(console, context, true);
+    roll_date_forward_1(console, context, true);
+    pbf_press_button(context, BUTTON_HOME, 160ms, ConsoleSettings::instance().SETTINGS_TO_HOME_DELAY0);
+    resume_game_from_home(console, context);
+
+    //Heal up and then reset position again.
+    OverworldWatcher done_healing(console.logger(), COLOR_BLUE);
+    pbf_move_left_joystick(context, {0, +1}, 800ms, 160ms);
+
+    pbf_mash_button(context, BUTTON_A, 2400ms);
+    context.wait_for_all_requests();
+
+    int exit = run_until<ProControllerContext>(
+        console, context,
+        [&](ProControllerContext& context){
+            pbf_mash_button(context, BUTTON_B, 16000ms);
+        },
+        {{ done_healing }}
+    );
+    if (exit == 0){
+        console.log("Overworld detected.");
+    }
+    open_map_from_overworld(info, console, context);
+    pbf_press_button(context, BUTTON_ZL, 320ms, 800ms);
+    fly_to_overworld_from_map(info, console, context);
+}
+
+void quest_wash_pokemon(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+    stream.log("Quest: Give your pokemon a bath!");
+
+    //Fly to savanna plaza
+    central_to_savanna_plaza(info, stream, context);
+
+    //Turn around, open picnic
+    pbf_move_left_joystick(context, {0, -1}, 160ms, 400ms);
+    pbf_press_button(context, BUTTON_L, 400ms, 320ms);
+
+    picnic_from_overworld(info, stream, context);
+
+    WallClock start = current_time();
+    WhiteButtonWatcher wash_button(COLOR_BLUE, WhiteButton::ButtonX, {0.027, 0.548, 0.022, 0.032});
+    WhiteButtonWatcher wash_exit_button(COLOR_BLUE, WhiteButton::ButtonB, {0.027, 0.923, 0.021, 0.033});
+    WhiteButtonWatcher shower_switch(COLOR_BLUE, WhiteButton::ButtonY, {0.486, 0.870, 0.027, 0.045});
+    bool rinsed_once = false;
+    while (!rinsed_once){
+        context.wait_for_all_requests();
+        if (current_time() - start > std::chrono::minutes(3)){
+            stream.log("Failed to get to rinse after 3 minutes.", COLOR_RED);
+            break;
+        }
+        int ret = wait_until(
+            stream, context, std::chrono::seconds(60),
+            {
+                wash_button,
+                shower_switch,
+                wash_exit_button,
+            }
+        );
+        switch (ret){
+        case 0:
+            stream.log("Wash button found!");
+            pbf_mash_button(context, BUTTON_X, 1200ms);
+            pbf_wait(context, 1600ms);
+            context.wait_for_all_requests();
+            break;
+        case 1:
+            stream.log("Rinse button found. Switching to rinse.");
+            pbf_press_button(context, BUTTON_Y, 320ms, 400ms);
+            rinsed_once = true;
+            //Move slightly right, as the showerhead is at an angle
+            pbf_move_left_joystick(context, {+1, +1}, 240ms, 240ms);
+            context.wait_for_all_requests();
+            break;
+        case 2:
+            stream.log("In wash. Scrubbing.");
+
+            ssf_press_button(context, BUTTON_A, 0ms, 1600ms, 0ms);
+            ssf_press_left_joystick(context, {-1, 0}, 0ms, 400ms);
+            ssf_press_left_joystick(context, {+1, 0}, 400ms, 800ms);
+            ssf_press_left_joystick(context, {-1, 0}, 1200ms, 400ms);
+
+            ssf_press_button(context, BUTTON_A, 0ms, 1600ms, 0ms);
+            ssf_press_left_joystick(context, {0, +1}, 0ms, 400ms);
+            ssf_press_left_joystick(context, {0, -1}, 400ms, 800ms);
+            ssf_press_left_joystick(context, {0, +1}, 1200ms, 400ms);
+            pbf_wait(context, 3200ms);
+            context.wait_for_all_requests();
+            break;
+        }
+    }
+
+    WhiteButtonWatcher rinse_done(COLOR_BLUE, WhiteButton::ButtonY, {0.028, 0.923, 0.020, 0.034});
+    WallClock start2 = current_time();
+    int ret3 = run_until<ProControllerContext>(
+        stream, context,
+        [&](ProControllerContext& context){
+            while (true){
+                if (current_time() - start2 > std::chrono::minutes(1)){
+                    stream.log("Failed to finish rinse after 1 minute.", COLOR_RED);
+                    break;
+                }
+                ssf_press_button(context, BUTTON_A, 0ms, 1600ms, 0ms);
+                ssf_press_left_joystick(context, {-1, 0}, 0ms, 400ms);
+                ssf_press_left_joystick(context, {+1, 0}, 400ms, 800ms);
+                ssf_press_left_joystick(context, {-1, 0}, 1200ms, 400ms);
+
+                ssf_press_button(context, BUTTON_A, 0ms, 1600ms, 0ms);
+                ssf_press_left_joystick(context, {0, +1}, 0ms, 400ms);
+                ssf_press_left_joystick(context, {0, -1}, 400ms, 800ms);
+                ssf_press_left_joystick(context, {0, +1}, 1200ms, 400ms);
+                pbf_wait(context, 3200ms);
+                context.wait_for_all_requests();
+            }
+        },
+        { {rinse_done} }
+    );
+    if (ret3 == 0){
+        stream.log("Shower completed successfully.");
+    }else{
+        stream.log("Shower did not complete. Backing out.");
+        pbf_press_button(context, BUTTON_B, 320ms, 400ms);
+    }
+
+    leave_picnic(info, stream, context);
+
+    return_to_plaza(info, stream, context);
+    context.wait_for_all_requests();
+}
+
+void quest_hatch_egg(
+    ProgramEnvironment& env,
+    ConsoleHandle& console, ProControllerContext& context,
+    const BBQOption& BBQ_OPTIONS
+){
+    console.log("Quest: Hatch an Egg");
+
+    //Fix time before hatching
+    if (BBQ_OPTIONS.FIX_TIME_FOR_HATCH){
+        go_home(console, context);
+        home_to_date_time(console, context, false);
+        pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+        pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+        pbf_press_button(context, BUTTON_HOME, 160ms, ConsoleSettings::instance().SETTINGS_TO_HOME_DELAY0);
+        resume_game_from_home(console, context);
+    }
+
+    //Fly to Savanna Plaza and navigate to the battle court
+    central_to_savanna_plaza(env.program_info(), console, context);
+
+    pbf_press_button(context, BUTTON_L | BUTTON_PLUS, 160ms, 840ms);
+    pbf_move_left_joystick(context, {0, +1}, 4000ms, 400ms);
+
+    pbf_move_left_joystick(context, {-1, 0}, 160ms, 400ms);
+    pbf_press_button(context, BUTTON_L, 160ms, 400ms);
+
+    //Do this after navigating to prevent egg from hatchining enroute
+    //Enter box system, navigate to left box, find the first egg, swap it with first pokemon in party
+    enter_box_system_from_overworld(env.program_info(), console, context);
+    context.wait_for(std::chrono::milliseconds(400));
+    
+    //move_to_left_box(context);
+    BoxCurrentEggDetector egg_detector;
+    SomethingInBoxSlotDetector sth_in_box_detector(COLOR_RED);
+    bool egg_found = false;
+    uint8_t row = 0;
+    uint8_t col = 0;
+    for ( ; row < 5; row++){
+        for (uint8_t j_col = 0; j_col < 6; j_col++){
+            col = (row % 2 == 0 ? j_col : 5 - j_col);
+            move_box_cursor(env.program_info(), console, context, BoxCursorLocation::SLOTS, row, col);
+            context.wait_for_all_requests();
+            auto snapshot = console.video().snapshot();
+            if (sth_in_box_detector.detect(snapshot) && egg_detector.detect(snapshot)){
+                console.log("Found egg.");
+                egg_found = true;
+                break;
+            }
+        }
+        if (egg_found){
+            break;
+        }
+    }
+
+    if (!egg_found){
+        console.log("No egg found during egg hatching quest!", COLOR_RED);
+    }else{
+        swap_two_box_slots(env.program_info(), console, context,
+            BoxCursorLocation::SLOTS, row, col,
+            BoxCursorLocation::PARTY, 0, 0);
+
+        leave_box_system_to_overworld(env.program_info(), console, context);
+
+        hatch_eggs_anywhere(env, console, context, true, 1);
+
+        enter_box_system_from_overworld(env.program_info(), console, context);
+        context.wait_for(std::chrono::milliseconds(400));
+
+        swap_two_box_slots(env.program_info(), console, context,
+            BoxCursorLocation::PARTY, 0, 0,
+            BoxCursorLocation::SLOTS, row, col);
+
+        leave_box_system_to_overworld(env.program_info(), console, context);
+
+        pbf_press_button(context, BUTTON_PLUS, 160ms, 400ms);
+
+        return_to_plaza(env.program_info(), console, context);
+        context.wait_for_all_requests();
+    }
+}
+
+void quest_sandwich(
+    ProgramEnvironment& env,
+    VideoStream& stream, ProControllerContext& context,
+    const BBQOption& BBQ_OPTIONS,
+    BBQuests current_quest
+){
+    stream.log("Quest: Make a singleplayer sandwich");
+
+    //Polar Plaza - egg basket gets stuck under table in Savanna/Canyon Plaza
+    central_to_polar_plaza(env.program_info(), stream, context);
+
+    picnic_from_overworld(env.program_info(), stream, context);
+
+    pbf_move_left_joystick(context, {0, +1}, 240ms, 320ms);
+    context.wait_for_all_requests();
+
+    pbf_move_left_joystick(context, {0, +1}, 560ms, 0ms);
+    enter_sandwich_recipe_list(env.program_info(), stream, context);
+
+    std::map<std::string, uint8_t> fillings;
+    std::map<std::string, uint8_t> condiments;
+
+    //Avoiding Encounter Power
+    switch (current_quest){
+    case BBQuests::sour_sandwich:
+        //Apple, Marmalade: Catch Flying 1, Item Drop Ice 1, Egg 1
+        fillings = {{"apple", (uint8_t)1}};
+        condiments = {{"marmalade", (uint8_t)1}};
+        break;
+    case BBQuests::sweet_sandwich:
+        //Apple, Butter: Egg 1, Item Drop Ice 1, Raid Steel 1
+        fillings = {{"apple", (uint8_t)1}};
+        condiments = {{"butter", (uint8_t)1}};
+        break;
+    case BBQuests::spicy_sandwich:
+        //Apple, Curry Powder: Raid Steel 1, Item Drop Ice 1, Teensy Flying 1
+        fillings = {{"apple", (uint8_t)1}};
+        condiments = {{"curry-powder", (uint8_t)1}};
+        break;
+    case BBQuests::salty_sandwich:
+        //Cheese, Salt: Exp Point Electric 1, Raid Normal 1, Catching Psychic 1
+        fillings = {{"cheese", (uint8_t)1}};
+        condiments = {{"salt", (uint8_t)1}};
+        break;
+    case BBQuests::bitter_sandwich:
+        //Watercress, Pepper: Item Drop Normal 1, Raid Power Flying 1, Exp Point Fighting 1
+        fillings = {{"watercress", (uint8_t)1}};
+        condiments = {{"pepper", (uint8_t)1}};
+        break;
+    case BBQuests::sandwich_three:
+        //Fried Fillet, Noodles, Rice, Chili Sauce: Huge Water 1, Raid Flying 1, Catching Normal 1
+        fillings = { {"fried-fillet", (uint8_t)1}, {"noodles", (uint8_t)1}, {"rice", (uint8_t)1} };
+        condiments = {{"chili-sauce", (uint8_t)1}};
+        break;
+    default:
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "Invalid sandwich selection.",
+            stream
+        );
+        break;
+    }
+
+    make_sandwich_preset(env, stream, context, BBQ_OPTIONS.LANGUAGE, fillings, condiments);
+
+    leave_picnic(env.program_info(), stream, context);
+
+    return_to_plaza(env.program_info(), stream, context);
+    context.wait_for_all_requests();
+
+}
+
+void quest_tera_raid(
+    ProgramEnvironment& env,
+    ConsoleHandle& console, ProControllerContext& context,
+    BBQOption& BBQ_OPTIONS
+){
+    console.log("Quest: Tera Raid");
+
+    bool started_tera_raid = false;
+    while (!started_tera_raid){
+        EncounterWatcher encounter_watcher(console, COLOR_RED);
+        int ret = run_until<ProControllerContext>(
+            console, context,
+            [&](ProControllerContext& context){
+                //Target is a tera raid crystal near the canyon plaza
+                console.log("Navigating to tera crystal.");
+
+                central_to_canyon_plaza(env.program_info(), console, context);
+
+                pbf_move_left_joystick(context, {-1, 0}, 3000ms, 160ms);
+                pbf_press_button(context, BUTTON_L, 80ms, 400ms);
+                pbf_move_left_joystick(context, {-1, 0}, 720ms, 160ms);
+                pbf_press_button(context, BUTTON_L, 80ms, 400ms);
+
+                //Keep rolling until we get a raid
+                uint64_t rerolls = 0;
+                while (!open_raid(console, context) && rerolls < 150){
+                    env.log("No Tera raid found.", COLOR_ORANGE);
+                    day_skip_from_overworld(console, context);
+                    pbf_wait(context, GameSettings::instance().RAID_SPAWN_DELAY0);
+                    rerolls++;
+                }
+                started_tera_raid = true;
+            },
+            {
+                static_cast<VisualInferenceCallback&>(encounter_watcher),
+                static_cast<AudioInferenceCallback&>(encounter_watcher),
+            }
+        );
+        encounter_watcher.throw_if_no_sound();
+
+        if (ret >= 0){
+            console.log("Battle menu detected.");
+
+            bool is_shiny = (bool)encounter_watcher.shiny_screenshot();
+            if (is_shiny){
+                console.log("Shiny detected!");
+                pbf_press_button(context, BUTTON_CAPTURE, 2000ms, 5000ms);
+                throw ProgramFinishedException();
+            }else{
+                console.log("Detected battle. Running from battle.");
+                try{
+                    NormalBattleMenuWatcher battle_menu(COLOR_YELLOW);
+                    battle_menu.move_to_slot(console, context, 3);
+                    pbf_press_button(context, BUTTON_A, 80ms, 400ms);
+                    press_Bs_to_back_to_overworld(env.program_info(), console, context);
+                    return_to_plaza(env.program_info(), console, context);
+                }catch (...){
+                    console.log("Unable to flee.");
+                    OperationFailedExceptionWithScreenshot::fire(
+                        ErrorReportMode::SEND_ERROR_REPORT,
+                        "Unable to flee!",
+                        console
+                    );
+                }
+            }
+        }
+    }
+
+    //Swap to the second pokemon in your party
+    pbf_press_dpad(context, DPAD_DOWN, 80ms, 80ms);
+    pbf_press_dpad(context, DPAD_DOWN, 80ms, 80ms);
+    pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+    context.wait_for(std::chrono::milliseconds(400));
+    move_box_cursor(env.program_info(), console, context, BoxCursorLocation::PARTY, 1, 0);
+    pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+    pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+    pbf_press_dpad(context, DPAD_UP, 80ms, 80ms);
+    pbf_mash_button(context, BUTTON_A, 2000ms);
+
+    bool win = run_tera_battle(env, console, context, BBQ_OPTIONS.BATTLE_AI);
+    if (win){
+        env.log("Won tera raid.");
+        if (!BBQ_OPTIONS.CATCH_ON_WIN.enabled()){
+            exit_tera_win_without_catching(env.program_info(), console, context, 0);
+        }else{
+            if (BBQ_OPTIONS.CATCH_ON_WIN.FIX_TIME_ON_CATCH){
+                go_home(console, context);
+                home_to_date_time(console, context, false);
+                pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+                pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+                pbf_press_button(context, BUTTON_HOME, 160ms, ConsoleSettings::instance().SETTINGS_TO_HOME_DELAY0);
+                resume_game_from_home(console, context);
+            }
+            exit_tera_win_by_catching(
+                env, console, context,
+                BBQ_OPTIONS.LANGUAGE,
+                BBQ_OPTIONS.CATCH_ON_WIN.BALL_SELECT.slug(),
+                0
+            );
+        }
+    }else{
+        env.log("Lost tera raid.");
+        context.wait_for(std::chrono::seconds(3));
+    }
+
+    context.wait_for_all_requests();
+    return_to_plaza(env.program_info(), console, context);
+    day_skip_from_overworld(console, context);
+}
+
+void quest_auto_battle(
+    ProgramEnvironment& env,
+    VideoStream& stream, ProControllerContext& context,
+    const BBQOption& BBQ_OPTIONS,
+    BBQuests current_quest
+){
+    stream.log("Quest: Auto Battle 10/30");
+
+
+    OverworldSensors sensors(
+        env.logger(), stream, context
+    );
+
+    LetsGoEncounterBotStats stats;
+    LetsGoEncounterBotTracker tracker(
+        env, stream,
+        stats,
+        sensors.lets_go_kill
+    );
+
+    uint64_t target_number = 10;
+
+    if (current_quest == BBQuests::auto_30){
+        target_number = 30;
+    }
+
+    while (stats.m_kills < target_number){
+
+        central_to_chargestone(env.program_info(), stream, context);
+
+        //Wait for spawns
+        pbf_wait(context, 3000ms);
+        context.wait_for_all_requests();
+
+        //Forward and right, stay in the battle court - safe zone
+        pbf_press_button(context, BUTTON_L, 160ms, 400ms);
+        pbf_move_left_joystick(context, {0, +1}, 2000ms, 400ms);
+        pbf_move_left_joystick(context, {+1, 0}, 1440ms, 400ms);
+        pbf_press_button(context, BUTTON_L, 160ms, 400ms);
+
+        use_lets_go_to_clear_in_front(stream, context, tracker, false, [&](ProControllerContext& context){
+            pbf_move_left_joystick(context, {0, -1}, 1440ms, 400ms);
+            pbf_wait(context, 12000ms);
+            context.wait_for_all_requests();
+            });
+
+        context.wait_for_all_requests();
+        return_to_plaza(env.program_info(), stream, context);
+
+        OverworldWatcher done_healing(stream.logger(), COLOR_BLUE);
+        pbf_move_left_joystick(context, {0, +1}, 800ms, 160ms);
+
+        pbf_mash_button(context, BUTTON_A, 2400ms);
+        context.wait_for_all_requests();
+
+        int exit = run_until<ProControllerContext>(
+            stream, context,
+            [&](ProControllerContext& context){
+                pbf_mash_button(context, BUTTON_B, 16000ms);
+            },
+            { { done_healing } }
+            );
+        if (exit == 0){
+            stream.log("Overworld detected.");
+        }
+        open_map_from_overworld(env.program_info(), stream, context);
+        pbf_press_button(context, BUTTON_ZL, 320ms, 800ms);
+        fly_to_overworld_from_map(env.program_info(), stream, context);
+    }
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_BlueberryQuests.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_BlueberryQuests.h
new file mode 100644
index 0000000000..21ad16aa71
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_BlueberryQuests.h
@@ -0,0 +1,165 @@
+/*  Blueberry Quests
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_BlueberryQuests_H
+#define PokemonAutomation_PokemonSV_BlueberryQuests_H
+
+#include <vector>
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+#include "NintendoSwitch/NintendoSwitch_ConsoleHandle.h"
+#include "VideoGames/PokemonSV/Programs/ShinyHunting/PokemonSV_LetsGoTools.h"
+#include "VideoGames/PokemonSV/Options/PokemonSV_BBQOption.h"
+
+namespace PokemonAutomation{
+    struct ProgramInfo;
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+//Basic blue quests
+const std::set<BBQuests> blue_quests = {
+    BBQuests::auto_10, BBQuests::make_tm, BBQuests::pickup_10, BBQuests::sneak_up, BBQuests::photo_fly, BBQuests::photo_swim, BBQuests::photo_canyon, BBQuests::photo_coastal, BBQuests::photo_polar, BBQuests::photo_savanna, BBQuests::tera_self_defeat, 
+    BBQuests::travel_500, BBQuests::catch_any, BBQuests::catch_normal, BBQuests::catch_fighting, BBQuests::catch_flying, BBQuests::catch_poison, BBQuests::catch_ground, BBQuests::catch_rock, BBQuests::catch_bug, BBQuests::catch_ghost, BBQuests::catch_steel, 
+    BBQuests::catch_fire, BBQuests::catch_water, BBQuests::catch_grass, BBQuests::catch_electric, BBQuests::catch_psychic, BBQuests::catch_ice, BBQuests::catch_dragon, BBQuests::catch_dark, BBQuests::catch_fairy
+};
+
+//Red quests that appear at the top when a player completes 10 blues.
+//In multiplayer, check if picnic is active before attempting some as only one player can picnic at a time.
+const std::set<BBQuests> red_quests = {
+    BBQuests::wash_pokemon, BBQuests::wild_tera, BBQuests::auto_30, BBQuests::tera_raid, BBQuests::sandwich_three, BBQuests::bitter_sandwich, BBQuests::sweet_sandwich, BBQuests::salty_sandwich, BBQuests::sour_sandwich, BBQuests::spicy_sandwich, BBQuests::hatch_egg, 
+    BBQuests::photo_normal, BBQuests::photo_fighting, BBQuests::photo_flying, BBQuests::photo_poison, BBQuests::photo_ground, BBQuests::photo_rock, BBQuests::photo_bug, BBQuests::photo_ghost, BBQuests::photo_steel, BBQuests::photo_fire, BBQuests::photo_water, 
+    BBQuests::photo_grass, BBQuests::photo_electric, BBQuests::photo_psychic, BBQuests::photo_ice, BBQuests::photo_dragon, BBQuests::photo_dark, BBQuests::photo_fairy
+};
+
+//Multiplayer only. Appears at the top when 3 red quests are completed.
+const std::set<BBQuests> gold_quests = {
+    BBQuests::ditto_central, BBQuests::ditto_canyon, BBQuests::ditto_coastal, BBQuests::ditto_polar, BBQuests::ditto_savanna, BBQuests::group_canyon, BBQuests::group_coastal, BBQuests::group_polar, BBQuests::group_savanna, BBQuests::group_eyewear, BBQuests::group_nonuniform, 
+    BBQuests::group_masks, BBQuests::sandwich_four, BBQuests::catch_hint, BBQuests::catch_hint2
+};
+
+//Quests that are not currently supported. Gold quests currently excluded as this is singleplayer only right now.
+const std::set<BBQuests> not_possible_quests = {
+    BBQuests::UnableToDetect, BBQuests::pickup_10, BBQuests::photo_flying, BBQuests::catch_flying
+};
+
+
+// Open the BBQ panel and read the current amount of BP
+int read_BP(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context);
+
+//Open the quest panel and read in the current quests.
+//Currently only supports singleplayer.
+//For multiplayer, we will want keep track of which quest are gold/red and scroll cursor down until all of the current player's blue quests are in.
+std::vector<BBQuests> read_quests(
+    const ProgramInfo& info,
+    VideoStream& stream, ProControllerContext& context,
+    const BBQOption& BBQ_OPTIONS
+);
+
+//Determine which quests are possible and which quests are not. (ex. no eggs, reroll egg hatcher.)
+//Quests not possible are removed from the list. If the list is empty, then reroll all items.
+std::vector<BBQuests> process_quest_list(
+    const ProgramInfo& info,
+    VideoStream& stream, ProControllerContext& context,
+    const BBQOption& BBQ_OPTIONS,
+    std::vector<BBQuests>& quest_list,
+    uint8_t& eggs_hatched
+);
+
+//Take the current quest and calls the function to do it, then checks the quest was successful. Returns true if so.
+bool process_and_do_quest(
+    ProgramEnvironment& env,
+    ConsoleHandle& console, ProControllerContext& context,
+    BBQOption& BBQ_OPTIONS,
+    BBQuests current_quest,
+    uint8_t& eggs_hatched
+);
+
+//Iterate through TMs until a craftable one is found. Make the TM and return to position.
+void quest_make_tm(
+    const ProgramInfo& info,
+    VideoStream& stream, ProControllerContext& context
+);
+
+//Do laps in central plaza.
+void quest_travel_500(
+    const ProgramInfo& info,
+    VideoStream& stream, ProControllerContext& context
+);
+
+//Run around until you encounter a pokemon. Tera, then defeat it by spamming your first move.
+void quest_tera_self_defeat(
+    const ProgramInfo& info,
+    ConsoleHandle& console, ProControllerContext& context,
+    const BBQOption& BBQ_OPTIONS
+);
+
+//Sneak up on a pokemon
+void quest_sneak_up(
+    const ProgramInfo& info,
+    ConsoleHandle& console, ProControllerContext& context,
+    const BBQOption& BBQ_OPTIONS
+);
+
+//What a Tera route does once its encounter attempt has ended.
+enum class TeraEncounterAction{
+    StopForShiny,
+    Battle,
+    Recover,
+};
+//The route can run out of time without reaching a battle (e.g. the target did not spawn).
+//Battle commands sent outside a battle would wander the overworld, so only a battle menu seen
+//by the encounter watcher (callback 0) or by the route's own wait counts as entry.
+//A shiny always stops the program, even without entry, so it is never lost.
+TeraEncounterAction tera_encounter_action(
+    bool shiny, int encounter_watcher_result, bool battle_menu_detected
+);
+
+//Kill a tera pokemon
+void quest_wild_tera(
+    const ProgramInfo& info,
+    ConsoleHandle& console, ProControllerContext& context,
+    const BBQOption& BBQ_OPTIONS
+);
+
+//Give bath
+void quest_wash_pokemon(
+    const ProgramInfo& info,
+    VideoStream& stream, ProControllerContext& context
+);
+
+//Withdraw and hatch an egg
+void quest_hatch_egg(
+    ProgramEnvironment& env,
+    ConsoleHandle& console, ProControllerContext& context,
+    const BBQOption& BBQ_OPTIONS
+);
+
+//Make a sandwich of type flavor
+void quest_sandwich(
+    ProgramEnvironment& env,
+    VideoStream& stream, ProControllerContext& context,
+    const BBQOption& BBQ_OPTIONS,
+    BBQuests current_quest
+);
+
+//Complete a tera raid battle
+void quest_tera_raid(
+    ProgramEnvironment& env,
+    ConsoleHandle& console, ProControllerContext& context,
+    BBQOption& BBQ_OPTIONS
+);
+
+//Defeat 10/30 pokemon in autobattle
+void quest_auto_battle(
+    ProgramEnvironment& env,
+    VideoStream& stream, ProControllerContext& context,
+    const BBQOption& BBQ_OPTIONS,
+    BBQuests current_quest
+);
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_ClaimMysteryGift.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_ClaimMysteryGift.cpp
new file mode 100644
index 0000000000..3b98758e8b
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_ClaimMysteryGift.cpp
@@ -0,0 +1,443 @@
+/*  ClaimMysteryGift
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+//#include "CommonFramework/GlobalSettingsPanel.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+//#include "CommonFramework/VideoPipeline/VideoFeed.h"
+//#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonTools/VisualDetectors/BlackScreenDetector.h"
+#include "CommonTools/StartupChecks/StartProgramChecks.h"
+#include "CommonTools/StartupChecks/VideoResolutionCheck.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Inference/NintendoSwitch_SelectedSettingDetector.h"
+#include "NintendoSwitch/Inference/NintendoSwitch_ConsoleTypeDetector.h"
+#include "Pokemon/Pokemon_Strings.h"
+//#include "VideoGames/PokemonSV/Inference/PokemonSV_MainMenuDetector.h"
+//#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h"
+#include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_IvJudgeReader.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h"
+//#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h"
+#include "VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory.h"
+#include "VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStoryTools.h"
+#include "PokemonSV_ClaimMysteryGift.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+//#include <unordered_map>
+//#include <algorithm>
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+using namespace Pokemon;
+
+
+ClaimMysteryGift_Descriptor::ClaimMysteryGift_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonSV:ClaimMysteryGift",
+        STRING_POKEMON + " SV", "Claim Mystery Gift",
+        "Programs/PokemonSV/ClaimMysteryGift.html",
+        "Claim the Mystery Gift in SV.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_RequiresPrecision,
+        FeedbackType::VIDEO_AUDIO,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+// std::unique_ptr<StatsTracker> ClaimMysteryGift_Descriptor::make_stats() const{
+//     return std::unique_ptr<StatsTracker>(new ClaimMysteryGiftStats());
+// }
+
+
+
+ClaimMysteryGift::~ClaimMysteryGift(){
+    OBTAINING_METHOD.remove_listener(*this);
+    STARTING_POINT.remove_listener(*this);
+}
+
+ClaimMysteryGift::ClaimMysteryGift()
+    : LANGUAGE(
+        "<b>Game Language:</b>",
+        PokemonSwSh::IV_READER().languages(),
+        LockMode::UNLOCK_WHILE_RUNNING,
+        true
+    )
+    , STARTING_POINT(
+        "<b>Starting point:",
+        {
+            {StartingPoint::NEW_GAME,                "new-game",           "New Game: Start after you have selected your username and character appearance"},
+            {StartingPoint::IN_MYSTERY_GIFT_CODE_WINDOW,         "in-mystery-gift-code-window",    "Start in Mystery Gift code window, with cursor on the “1” key."},
+            // {StartingPoint::DONE_TUTORIAL,           "done-tutorial",      "Start in game. Tutorial must be completed. All menus closed. Disconnected from internet. You need to be outside, where you can use Pokeportal."},
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        StartingPoint::NEW_GAME
+    )
+    , OBTAINING_METHOD(
+        "<b>Method for obtaining mystery gift:",
+        {
+            {ObtainingMethod::VIA_INTERNET_ALL, "via-internet-all",  "Via Internet: Get all mystery gifts from the \"Get via Internet\" screen."},
+            {ObtainingMethod::VIA_INTERNET_NONE, "via-internet-one",  "Via Internet: Go to the Mystery Gift \"Get via Internet\" screen. Don't claim anything."},
+            {ObtainingMethod::VIA_CODE,         "via-code",      "Via Code: Get the mystery gift based on the code entered below."},
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        ObtainingMethod::VIA_INTERNET_ALL
+    )    
+    , MYSTERY_GIFT_NOTE{
+        "Ensure you are logged into a Nintendo account. This account does NOT need to have a subscription to Nintendo Switch Online."
+    }
+    , MULTISWITCH_NOTE{
+        "In the keyboard section below, you only need to adjust the option for Swtich 0. Ignore the options for the other Switches."
+    }    
+    , CODE(
+        "<b>Mystery Gift Code:</b><br>Mystery Gift code. (not case sensitive)<br>"
+        "(Box is big so it's easy to land your mouse on.)",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        "0123", "0123",
+        true
+    )
+    , GO_HOME_WHEN_DONE(true)
+    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(30))
+    , NOTIFICATIONS({
+        &NOTIFICATION_STATUS_UPDATE,
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_RECOVERABLE,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+{
+
+    PA_ADD_OPTION(LANGUAGE);
+    PA_ADD_OPTION(MYSTERY_GIFT_NOTE);
+    PA_ADD_OPTION(STARTING_POINT);
+    PA_ADD_OPTION(OBTAINING_METHOD);
+    PA_ADD_OPTION(MULTISWITCH_NOTE);
+    PA_ADD_OPTION(CODE);
+    PA_ADD_OPTION(SETTINGS);
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+    PA_ADD_OPTION(NOTIFICATIONS);
+
+
+    ClaimMysteryGift::on_config_value_changed(this);
+
+    OBTAINING_METHOD.add_listener(*this);
+    STARTING_POINT.add_listener(*this);
+}
+
+void ClaimMysteryGift::on_config_value_changed(void* object){
+    if (STARTING_POINT == StartingPoint::IN_MYSTERY_GIFT_CODE_WINDOW){
+        OBTAINING_METHOD.set_visibility(ConfigOptionState::HIDDEN);
+    }else{
+        OBTAINING_METHOD.set_visibility(ConfigOptionState::ENABLED);
+    }
+
+
+    if (OBTAINING_METHOD == ObtainingMethod::VIA_CODE){
+        MULTISWITCH_NOTE.set_visibility(ConfigOptionState::ENABLED);
+        CODE.set_visibility(ConfigOptionState::ENABLED);
+        SETTINGS.set_visibility(ConfigOptionState::ENABLED);
+    }else{
+        MULTISWITCH_NOTE.set_visibility(ConfigOptionState::HIDDEN);
+        CODE.set_visibility(ConfigOptionState::HIDDEN);
+        SETTINGS.set_visibility(ConfigOptionState::HIDDEN);
+    }
+
+}
+
+void ClaimMysteryGift::enter_mystery_gift_code(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    env.log("Enter mystery gift code.");
+
+    std::string normalized_code;
+    bool force_keyboard_mode = true;
+    bool connect_controller_press = false;
+    normalize_code(normalized_code, CODE, force_keyboard_mode);
+
+    const FastCodeEntrySettings& settings = SETTINGS;
+    enter_code(
+        env.console, context,
+        false,
+        settings.keyboard_layout[env.console.index()],
+        normalized_code, force_keyboard_mode,
+        !settings.skip_plus,
+        connect_controller_press
+    );    
+
+}
+
+void ClaimMysteryGift::enter_mystery_gift_via_internet_window(SingleSwitchProgramEnvironment& env, ProControllerContext& context, int menu_index){
+    env.console.log("Save game, then try to enter the mystery gift via internet window.", COLOR_YELLOW);
+    save_game_from_menu_or_overworld(env.program_info(), env.console, context, false);
+
+    size_t max_attempts = 5;
+    for (size_t i = 0; i < max_attempts; i++){
+        enter_menu_from_overworld(env.program_info(), env.console, context, menu_index);
+        pbf_press_button(context, BUTTON_A, 160ms, 4000ms);
+        pbf_press_dpad(context, DPAD_UP, 160ms, 840ms);
+        pbf_press_button(context, BUTTON_A, 160ms, 4000ms);
+        pbf_press_button(context, BUTTON_A, 160ms, 4000ms);
+        try{
+            clear_dialog(env.console, context, ClearDialogMode::STOP_TIMEOUT, 10, {CallbackEnum::PROMPT_DIALOG});
+        }catch (OperationFailedException&){
+            env.console.log("enter_mystery_gift_via_internet_window: Failed to detect the dialog that leads to the Mystery Gift code window. Reset game and re-try.", COLOR_YELLOW);
+            reset_game(env.program_info(), env.console, context);
+            continue;
+        }        
+        
+        return;
+    }
+
+    OperationFailedExceptionWithScreenshot::fire(
+        ErrorReportMode::SEND_ERROR_REPORT,
+        "enter_mystery_gift_code_window(): Failed to reach Mystery Gift code window after several attempts.",
+        env.console
+    );    
+}
+
+
+
+void ClaimMysteryGift::claim_internet_mystery_gift(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    env.log("Claim Mystery Gifts via Internet.");
+    context.wait_for_all_requests();
+    ImageFloatBox box{0.256326, 0.099804, 0.044004, 0.616438};
+    GradientArrowWatcher arrow(COLOR_RED, GradientArrowType::RIGHT, box);
+    int ret = wait_until(
+        env.console, context,
+        Milliseconds(10 * 1000),
+        { arrow }
+    );
+    if (ret == 0){
+        env.console.log("Gradient arrow detected.");
+    }else{
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "Failed to detect gradient arrow. We might not be in the Mystery Gift via Internet screen.",
+            env.console
+        );
+    }   
+
+    // std::vector<double> y_position_seen;
+    // double previous = -1;
+    size_t max_attempts = 30;
+    for (size_t i = 0; i < max_attempts; i++){
+        context.wait_for_all_requests();
+        // ImageFloatBox result_box;
+        // arrow.detect(result_box, env.console.video().snapshot());
+        // double current_y_pos = result_box.y;
+        // if (current_y_pos < previous - 0.02){
+        //     env.console.log("We have looped back around. Stop.");
+        //     break;
+        // }
+
+        // bool seen_before = false;
+        // // check if we have seen this position before
+        // for (double y_pos : y_position_seen){
+        //     // if difference is less than 0.02, then it's the same
+        //     env.console.log("current_y_pos: " + std::to_string(current_y_pos) + " y_pos: " + std::to_string(y_pos));
+        //     if (std::abs(current_y_pos - y_pos) < 0.02){
+        //         seen_before = true;
+        //         break;
+        //     }
+        // }
+        // if (seen_before){
+        //     env.console.log("We have seen this selection before, go down.");
+        //     previous = current_y_pos;
+        //     pbf_press_dpad(context, DPAD_DOWN, 160ms, 320ms);
+        //     continue;
+        // }
+        // env.console.log("We have NOT seen this selection before. Try to collect the Mystery Gift.");
+        // y_position_seen.emplace_back(current_y_pos);
+
+        pbf_press_button(context, BUTTON_A, 30ms, 30ms);
+        pbf_press_button(context, BUTTON_A, 160ms, 160ms);  // second button press in case first one drops
+        context.wait_for_all_requests();
+
+        BlackScreenWatcher detector(COLOR_RED, {0.286199, 0.221328, 0.453620, 0.205231});
+        ret = wait_until(
+            env.console, context,
+            Milliseconds(1 * 1000),
+            {detector}
+        );
+        if (ret == 0){
+            env.console.log("Already received gift. Assume we have run out of mystery gifts to collect.", COLOR_ORANGE);
+            break;
+        }
+        
+        // if Black screen not detected, it's likely an unclaimed gift.
+        // collect the mystery gift. Press A until you see the Gradient arrow again.
+        ret = run_until<ProControllerContext>(
+            env.console, context,
+            [&](ProControllerContext& context){
+                for (size_t i = 0; i < 60; i++){
+                    pbf_press_button(context, BUTTON_A, 160ms, 1000ms);
+                }
+            },
+            {arrow}
+        );
+        if (ret < 0){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "Failed to detect gradient arrow. We might not be in the Mystery Gift via Internet screen.",
+                env.console
+            );            
+        }
+
+    }
+}
+
+void ClaimMysteryGift::enter_mystery_gift_code_window(SingleSwitchProgramEnvironment& env, ProControllerContext& context, int menu_index){
+    env.console.log("Save game, then try to enter the mystery gift window.", COLOR_YELLOW);
+    save_game_from_menu_or_overworld(env.program_info(), env.console, context, false);
+
+    size_t max_attempts = 5;
+    for (size_t i = 0; i < max_attempts; i++){
+        enter_menu_from_overworld(env.program_info(), env.console, context, menu_index);
+        pbf_press_button(context, BUTTON_A, 160ms, 4000ms);
+        pbf_press_dpad(context, DPAD_UP, 160ms, 840ms);
+        pbf_press_button(context, BUTTON_A, 160ms, 4000ms);
+        pbf_press_dpad(context, DPAD_DOWN, 160ms, 840ms);
+        pbf_press_button(context, BUTTON_A, 160ms, 4000ms);
+        pbf_press_button(context, BUTTON_A, 160ms, 10000ms);
+        try{
+            clear_dialog(env.console, context, ClearDialogMode::STOP_TIMEOUT, 10, {CallbackEnum::PROMPT_DIALOG});
+        }catch (OperationFailedException&){
+            env.console.log("enter_mystery_gift_code_window: Failed to detect the dialog that leads to the Mystery Gift code window. Reset game and re-try.", COLOR_YELLOW);
+            reset_game(env.program_info(), env.console, context);
+            continue;
+        }
+
+        context.wait_for_all_requests();
+        context.wait_for(Milliseconds(300));
+        // we expect to be within Mystery Gift window, with the keyboard visible and "1" being highlighted
+        
+        // check whether this is Switch 1 or 2.
+        ConsoleType console_type = env.console.state().console_type();
+        if (console_type == ConsoleType::Unknown){
+            env.console.log("Unknown Switch type. Try to detect.");
+            console_type = detect_console_type_from_in_game(env.console, context);
+        }
+
+        ImageFloatBox key1_box; 
+        ImageFloatBox other_setting1; 
+        ImageFloatBox other_setting2; 
+        ImageFloatBox background; 
+
+        if (is_switch1(console_type)){
+            key1_box = {0.037322, 0.451172, 0.009879, 0.113281};
+            other_setting1 = {0.01, 0.451172, 0.009879, 0.113281};
+            other_setting2 = {0.02, 0.451172, 0.009879, 0.113281};
+            background = {0.0, 0.451172, 0.009879, 0.113281};
+        }else if (is_switch2(console_type)){
+            key1_box = {0.062706, 0.510763, 0.009901, 0.097847};
+            other_setting1 = {0.02, 0.510763, 0.009901, 0.097847};
+            other_setting2 = {0.04, 0.510763, 0.009901, 0.097847};   
+            background = {0.0, 0.510763, 0.009901, 0.097847};
+        }else{
+            throw UserSetupError(
+                env.console,
+                "Please select a valid Switch console type."
+            );
+        }        
+        
+        SelectedSettingWatcher key1_selected(key1_box, other_setting1, other_setting2, background);
+        int ret = wait_until(
+            env.console, context,
+            Milliseconds(5000),
+            {key1_selected}
+        );
+        if (ret < 0){  // failed to detect Key 1 being highlighted. Reset game and re-try
+            env.console.log("enter_mystery_gift_code_window: Failed to detect the Mystery Gift code window. Reset game and re-try.", COLOR_YELLOW);
+            reset_game(env.program_info(), env.console, context);
+            continue;
+        }       
+
+        
+        return;
+    }
+
+    OperationFailedExceptionWithScreenshot::fire(
+        ErrorReportMode::SEND_ERROR_REPORT,
+        "enter_mystery_gift_code_window(): Failed to reach Mystery Gift code window after several attempts.",
+        env.console
+    );    
+}
+
+void ClaimMysteryGift::run_autostory_until_pokeportal_unlocked(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    AutoStoryOptions options{
+        LANGUAGE,
+        StarterChoice::FUECOCO,
+        NOTIFICATION_STATUS_UPDATE,
+        NOTIFICATION_ERROR_RECOVERABLE
+    };    
+    AutoStoryStats stats;  // unused
+    for (size_t segment_index = 0; segment_index <= 6; segment_index++){
+        ALL_AUTO_STORY_SEGMENT_LIST()[segment_index]->run_segment(env, context, options, stats);
+    }
+}
+
+
+void ClaimMysteryGift::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    StartProgramChecks::check_performance_class_wired_or_wireless(context);
+    assert_16_9_720p_min(env.logger(), env.console);
+
+    // ClaimMysteryGiftStats& stats = env.current_stats<ClaimMysteryGiftStats>();
+
+
+    // Connect controller
+    pbf_press_button(context, BUTTON_L, 160ms, 160ms);
+
+
+    if (STARTING_POINT == StartingPoint::NEW_GAME){
+        run_autostory_until_pokeportal_unlocked(env, context);
+        env.console.log("Done Autostory portion. Pokeportal should now be unlocked.");
+        if (OBTAINING_METHOD == ObtainingMethod::VIA_CODE){
+            enter_mystery_gift_code_window(env, context, 2);
+            enter_mystery_gift_code(env, context);
+        }else if(OBTAINING_METHOD == ObtainingMethod::VIA_INTERNET_ALL){
+            enter_mystery_gift_via_internet_window(env, context, 2);
+            claim_internet_mystery_gift(env, context);
+
+        }else if(OBTAINING_METHOD == ObtainingMethod::VIA_INTERNET_NONE){
+            enter_mystery_gift_via_internet_window(env, context, 2);
+
+        }
+
+    }else if(STARTING_POINT == StartingPoint::IN_MYSTERY_GIFT_CODE_WINDOW){
+        // only claim the mystery gift via code. not via internet
+        enter_mystery_gift_code(env, context);
+
+    // }else if (STARTING_POINT == StartingPoint::DONE_TUTORIAL){
+
+    //     if (OBTAINING_METHOD == ObtainingMethod::VIA_CODE){
+    //         enter_mystery_gift_code_window(env, context, 3);
+    //         enter_mystery_gift_code(env, context);            
+    //     }else if(OBTAINING_METHOD == ObtainingMethod::VIA_INTERNET_ALL){
+    //         // enter_mystery_gift_via_internet_window(env, context, 3);
+
+    //     }else if(OBTAINING_METHOD == ObtainingMethod::VIA_INTERNET_NONE){
+    //         enter_mystery_gift_via_internet_window(env, context, 3);
+
+    //     }        
+    }else{
+        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Unknown STARTING_POINT.");
+    }
+    
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+    GO_HOME_WHEN_DONE.run_end_of_program(context);
+}
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_ClaimMysteryGift.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_ClaimMysteryGift.h
new file mode 100644
index 0000000000..3263eb0d16
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_ClaimMysteryGift.h
@@ -0,0 +1,90 @@
+/*  Claim Mystery Gift
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_ClaimMysteryGift_H
+#define PokemonAutomation_PokemonSV_ClaimMysteryGift_H
+
+#include "Common/Cpp/Options/StaticTextOption.h"
+#include "Common/Cpp/Options/TextEditOption.h"
+#include "Common/Cpp/Options/EnumDropdownOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "CommonTools/Options/LanguageOCROption.h"
+#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "VideoGames/PokemonSV/Programs/FastCodeEntry/PokemonSV_CodeEntry.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+class ClaimMysteryGift_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    ClaimMysteryGift_Descriptor();
+
+    struct Stats;
+    // virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+class ClaimMysteryGift : public SingleSwitchProgramInstance, public ConfigOption::Listener{
+public:
+    using Descriptor = ClaimMysteryGift_Descriptor;
+    ~ClaimMysteryGift();
+    ClaimMysteryGift();
+
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+    void run_autostory_until_pokeportal_unlocked(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+    void enter_mystery_gift_via_internet_window(SingleSwitchProgramEnvironment& env, ProControllerContext& context, int menu_index);
+    void claim_internet_mystery_gift(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+    void enter_mystery_gift_code_window(SingleSwitchProgramEnvironment& env, ProControllerContext& context, int menu_index);
+    void enter_mystery_gift_code(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+
+private:
+    virtual void on_config_value_changed(void* object) override;
+
+    std::string start_segment_description();
+    std::string end_segment_description();
+
+private:
+    OCR::LanguageOCROption LANGUAGE;
+    
+    enum class StartingPoint{
+        NEW_GAME,
+        IN_MYSTERY_GIFT_CODE_WINDOW,
+        DONE_TUTORIAL,
+    };
+
+        enum class ObtainingMethod{
+        VIA_INTERNET_ALL,
+        VIA_INTERNET_NONE,
+        VIA_CODE,
+    };
+
+    EnumDropdownOption<StartingPoint> STARTING_POINT;
+    EnumDropdownOption<ObtainingMethod> OBTAINING_METHOD;
+    StaticTextOption MYSTERY_GIFT_NOTE;
+    StaticTextOption MULTISWITCH_NOTE;
+    TextEditOption CODE;
+    FastCodeEntrySettingsOption SETTINGS;
+
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
+
+    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+
+
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_ESPTraining.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_ESPTraining.cpp
new file mode 100644
index 0000000000..7a25d572f4
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_ESPTraining.cpp
@@ -0,0 +1,241 @@
+/*  ESP Training
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/PrettyPrint.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "CommonTools/StartupChecks/VideoResolutionCheck.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h"
+#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h"
+#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h"
+#include "VideoGames/PokemonSV/Inference/PokemonSV_ESPEmotionDetector.h"
+#include "PokemonSV_ESPTraining.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+using namespace Pokemon;
+ 
+ESPTraining_Descriptor::ESPTraining_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonSV:ESPTraining",
+        STRING_POKEMON + " SV", "ESP Training",
+        "Programs/PokemonSV/ESPTraining.html",
+        "Clear the ESP Training to farm EV berries.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+std::unique_ptr<StatsTracker> ESPTraining_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new ESPTrainingStats());
+}
+ESPTraining::ESPTraining()
+    : ROUNDS(
+        "<b>Number of times to run:</b>",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        10
+    )
+    , SAVE(
+        "<b>Save game between rounds:</b><br>Save the game between ESP runs in case of crashes.",
+        LockMode::UNLOCK_WHILE_RUNNING, false
+    )
+    , GO_HOME_WHEN_DONE(false)
+    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_STATUS_UPDATE,
+        & NOTIFICATION_PROGRAM_FINISH,
+        & NOTIFICATION_ERROR_FATAL,
+        })
+{
+    PA_ADD_OPTION(ROUNDS);
+    PA_ADD_OPTION(SAVE);
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+void ESPTraining::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    assert_16_9_720p_min(env.logger(), env.console);
+    ESPTrainingStats& stats = env.current_stats<ESPTrainingStats>();
+
+    //  Connect the controller.
+    require_player(env.console, context, BUTTON_LCLICK);
+
+    for (uint32_t c = 0; c < ROUNDS; c++){
+        env.log("Round: " + tostr_u_commas(c));
+
+        //Initiate dialog with Dendra
+        //Dendra needs time to turn and face the player
+        AdvanceDialogWatcher advance_detector(COLOR_YELLOW);
+        pbf_press_button(context, BUTTON_A, 80ms, 400ms);
+        int retD = wait_until(env.console, context, Milliseconds(4000), { advance_detector });
+        if (retD < 0){
+            env.log("Dialog detected.");
+        }
+        pbf_press_button(context, BUTTON_A, 80ms, 400ms);
+
+        //Yes let's train
+        pbf_press_button(context, BUTTON_A, 80ms, 400ms);
+        pbf_wait(context, 800ms);
+        context.wait_for_all_requests();
+
+        //What mode? - Knockout
+        pbf_press_button(context, BUTTON_A, 80ms, 400ms);
+        pbf_press_dpad(context, DPAD_DOWN, 80ms, 400ms);
+        pbf_press_button(context, BUTTON_A, 80ms, 400ms);
+        context.wait_for_all_requests();
+
+        //mash past other dialog
+        pbf_mash_button(context, BUTTON_A, 2880ms);
+            
+        //wait for start
+        context.wait_for(std::chrono::milliseconds(13000));
+        context.wait_for_all_requests();
+
+
+
+        // Run the ESP training mini game
+        run_esp_training(env, context, stats);
+
+
+
+        //Program done, mash B until overworld detected
+        OverworldWatcher overworld(env.console, COLOR_CYAN);
+        int ret = run_until<ProControllerContext>(
+            env.console, context,
+            [](ProControllerContext& context){
+                pbf_mash_button(context, BUTTON_B, 5600ms);
+            },
+            {overworld}
+        );
+        if (ret != 0){
+            env.console.log("Failed to detect overworld after ending.", COLOR_RED);
+        }
+        context.wait_for_all_requests();
+
+        //Save the game if option checked, then loop again
+        if(SAVE){
+            save_game_from_overworld(env.program_info(), env.console, context);
+        }
+
+        stats.m_clears++;
+        env.update_stats();
+        send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
+    }
+
+    env.update_stats();
+    GO_HOME_WHEN_DONE.run_end_of_program(context);
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+}
+
+void run_esp_training(SingleSwitchProgramEnvironment& env, ProControllerContext& context, ESPTrainingStats& stats){
+    bool endflag = true;
+    while (endflag){
+        ESPStartDetector ESPstart;
+        ESPShowNewEmotionDetector ESPstop;
+        ESPEmotionDetector detector;
+        {
+            //Countdown -> Dialog w/emotion
+            int ret = wait_until(
+                env.console, context,
+                std::chrono::seconds(15),
+                { { ESPstart } }
+            );
+            if (ret < 0){
+                env.log("Timeout waiting for dialog.");
+                endflag = false;
+                break;
+            }
+            int ret2 = wait_until(
+                env.console, context,
+                std::chrono::seconds(5),
+                { { detector } }
+            );
+            if (ret2 < 0){
+                env.log("Timeout waiting for emotion.");
+            }
+
+            Button emotion_button = BUTTON_X;
+
+            switch (detector.result()){
+            case Detection::RED:
+                env.log("ESPEmotionDetector: Angry - Red - Press X", COLOR_BLACK);
+                emotion_button = BUTTON_X;
+                stats.m_emotions++;
+                stats.m_anger++;
+                break;
+            case Detection::YELLOW:
+                env.log("ESPEmotionDetector: Joy - Yellow - Press A", COLOR_BLACK);
+                emotion_button = BUTTON_A;
+                stats.m_emotions++;
+                stats.m_joy++;
+                break;
+            case Detection::BLUE:
+                env.log("ESPEmotionDetector: Surprised - Blue - Press B", COLOR_BLACK);
+                emotion_button = BUTTON_B;
+                stats.m_emotions++;
+                stats.m_surprise++;
+                break;
+            case Detection::GREEN:
+                env.log("ESPEmotionDetector: Excited - Green - Press Y", COLOR_BLACK);
+                emotion_button = BUTTON_Y;
+                stats.m_emotions++;
+                stats.m_excitement++;
+                break;
+            case Detection::GREY:
+                //Press any button to start next round
+                //Pressing A tends to make Dendra :D two extra times during the transition so press B instead
+                //Sometimes this is detected as blue, the B press there also works
+                env.log("ESPEmotionDetector: Grey - Mash though dialog", COLOR_BLACK);
+                emotion_button = BUTTON_B;
+                break;
+            default:
+                endflag = false;
+                break;
+            }
+
+            // Press button and check it did not drop input. Press again if it did.
+            // This will result in a duplicate press between phases, but the press will do nothing.
+            pbf_press_button(context, emotion_button, 80ms, 400ms);
+            env.update_stats();
+
+            ESPPressedEmotionDetector emotion_press_detected;
+            int check = wait_until(
+                env.console, context,
+                std::chrono::seconds(1),
+                { { emotion_press_detected } }
+            );
+            if (check < 0){
+                env.log("Emotion press not detected in bottom right. Pressing button again.");
+                pbf_press_button(context, emotion_button, 80ms, 400ms);
+            }else{
+                env.log("Emotion press detected.");
+            }
+
+            //Look for the brief moment the dialog bubble vanishes
+            ret = wait_until(
+                env.console, context,
+                std::chrono::seconds(15),
+                { { ESPstop } }
+            );
+            if (ret < 0){
+                env.log("Timeout waiting for dialog to vanish.");
+            }
+        }
+        context.wait_for_all_requests();
+    }    
+
+}
+    
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_ESPTraining.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_ESPTraining.h
new file mode 100644
index 0000000000..46c3d12330
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_ESPTraining.h
@@ -0,0 +1,78 @@
+/*  ESP Training
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_ESPTraining_H
+#define PokemonAutomation_PokemonSV_ESPTraining_H
+
+#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+class ESPTraining_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    ESPTraining_Descriptor();
+
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+struct ESPTrainingStats : public StatsTracker{
+    ESPTrainingStats()
+        : m_emotions(m_stats["Emotions Shown"])
+        , m_joy(m_stats["Joy"])
+        , m_surprise(m_stats["Surprise"])
+        , m_excitement(m_stats["Excitement"])
+        , m_anger(m_stats["Anger"])
+        , m_clears(m_stats["Times Cleared"])
+        , errors(m_stats["Errors"])
+    {
+        m_display_order.emplace_back("Emotions Shown");
+        m_display_order.emplace_back("Joy");
+        m_display_order.emplace_back("Surprise");
+        m_display_order.emplace_back("Excitement");
+        m_display_order.emplace_back("Anger");
+        m_display_order.emplace_back("Times Cleared");
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+    }
+    std::atomic<uint64_t>& m_emotions;
+    std::atomic<uint64_t>& m_joy;
+    std::atomic<uint64_t>& m_surprise;
+    std::atomic<uint64_t>& m_excitement;
+    std::atomic<uint64_t>& m_anger;
+    std::atomic<uint64_t>& m_clears;
+    std::atomic<uint64_t>& errors;
+};
+
+class ESPTraining : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = ESPTraining_Descriptor;
+    ESPTraining();
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    SimpleIntegerOption<uint32_t> ROUNDS;
+
+    BooleanCheckBoxOption SAVE;
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
+    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+//Detect emotion and press the right button
+//151 emotions + pauses but the game is inconsistent and sometimes displays an emotion during the transitions
+//Note: can hit the wrong emotion and then the right one right after, as long as its before the timer
+void run_esp_training(SingleSwitchProgramEnvironment& env, ProControllerContext& context, ESPTrainingStats& stats);
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_FlyingTrialFarmer.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_FlyingTrialFarmer.cpp
new file mode 100644
index 0000000000..e9c625d913
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_FlyingTrialFarmer.cpp
@@ -0,0 +1,295 @@
+/*  Flying Trial Farmer
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/StaticGlobals.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "CommonTools/VisualDetectors/BlackScreenDetector.h"
+#include "CommonTools/StartupChecks/StartProgramChecks.h"
+#include "CommonTools/StartupChecks/VideoResolutionCheck.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h"
+#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h"
+#include "VideoGames/PokemonSV/Inference/PokemonSV_WhiteButtonDetector.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h"
+#include "PokemonSV_FlyingTrialFarmer.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+using namespace Pokemon;
+
+
+FlyingTrialFarmer_Descriptor::FlyingTrialFarmer_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonSV:FlyingTrialFarmer",
+        STRING_POKEMON + " SV", "Flying Trial Farmer",
+        "Programs/PokemonSV/FlyingTrialFarmer.html",
+        "Farm the flying trial for BP.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_RequiresPrecision,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+struct FlyingTrialFarmer_Descriptor::Stats : public StatsTracker{
+    Stats()
+        : m_trials(m_stats["Trials"])
+        , m_success(m_stats["Success"])
+        , m_fail(m_stats["Fail"])
+        , m_saves(m_stats["Save & Reset"])
+    {
+        m_display_order.emplace_back("Trials");
+        m_display_order.emplace_back("Success");
+        m_display_order.emplace_back("Fail");
+        m_display_order.emplace_back("Save & Reset");
+        m_aliases["Game Saves"] = "Save & Reset";
+    }
+    std::atomic<uint64_t>& m_trials;
+    std::atomic<uint64_t>& m_success;
+    std::atomic<uint64_t>& m_fail;
+    std::atomic<uint64_t>& m_saves;
+};
+std::unique_ptr<StatsTracker> FlyingTrialFarmer_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+
+
+FlyingTrialFarmer::FlyingTrialFarmer()
+    : GO_HOME_WHEN_DONE(false)
+    , NUM_TRIALS(
+        "<b>Number of Trials to Run (10BP/Trial):</b>",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        1000
+    )
+    , SAVE_NUM_ROUNDS(
+          "<b>Save and reset the game after attempting this many trials:</b><br>This preserves progress and prevents potential game lags from long runs.<br>0 disables this option.",
+          LockMode::UNLOCK_WHILE_RUNNING,
+          50
+    )
+    , FLIGHT_PATH(
+          "<b>Select the flight path to use:</b>",
+          {
+              {FlightPath::FRONT_ENTRY,          "path0", "Front gate entry, sharp turn (might be needed if game is on 3.0.0)"},
+              {FlightPath::BACK_ENTRY_STRAIGHT,  "path1", "Back gate entry, no turn (candidate for waterfill adjustments)"},
+              {FlightPath::BACK_ENTRY_SOFT_TURN, "path2", "Back gate entry, soft turn (current release candidate)"},
+              {FlightPath::BACK_ENTRY_HARD_TURN, "path3", "Back gate entry, sharp turn (highest location tolerance but tight timer)"}
+          },
+          LockMode::UNLOCK_WHILE_RUNNING,
+          FlightPath::BACK_ENTRY_SOFT_TURN
+    )
+    , INVERT_CONTROLS_WHILE_FLYING(
+        "<b>Inverted controls while flying:</b><br>"
+        "Check this option if you have inverted controls on during flying.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        false
+    )
+    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_STATUS_UPDATE,
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+{
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+    PA_ADD_OPTION(NUM_TRIALS);
+    PA_ADD_OPTION(SAVE_NUM_ROUNDS);
+    if (STATIC_GLOBALS.DEVELOPER_MODE){
+        PA_ADD_OPTION(FLIGHT_PATH);
+    }
+    PA_ADD_OPTION(INVERT_CONTROLS_WHILE_FLYING);
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+
+
+bool FlyingTrialFarmer::run_rewards(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    //  Wait until a dialog shows up.
+    {
+        AdvanceDialogWatcher dialog(COLOR_RED);
+        int ret = wait_until(
+            env.console, context,
+            std::chrono::seconds(180),
+            {dialog}
+        );
+        if (ret != 0){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "End of trial not detected after 3 minutes.",
+                env.console
+            );
+        }
+        env.log("Detected end of trial.");
+    }
+
+    bool trial_passed = false;
+    while (true){
+        OverworldWatcher overworld(env.console, COLOR_CYAN);
+        AdvanceDialogWatcher dialog_white(COLOR_RED, DialogType::DIALOG_WHITE);
+        AdvanceDialogWatcher dialog_black(COLOR_RED, DialogType::DIALOG_BLACK);
+        context.wait_for_all_requests();
+
+        int ret_finish = wait_until(
+            env.console, context,
+            std::chrono::seconds(80),
+            {
+                overworld,
+                dialog_white,
+                dialog_black
+            }
+        );
+        context.wait_for_all_requests();
+
+        switch (ret_finish){
+        case 0: // overworld
+            return trial_passed;
+        case 1: // white dialog
+            pbf_press_button(context, BUTTON_B, 160ms, 0ms);
+            continue;
+        case 2: // black dialog
+            pbf_press_button(context, BUTTON_B, 160ms, 0ms);
+            trial_passed = true;
+            continue;
+        default:
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "No recognized state after 80 seconds.",
+                env.console
+            );
+        }
+    }
+}
+
+double FlyingTrialFarmer::get_final_y_axis(double delta_y){
+    if (INVERT_CONTROLS_WHILE_FLYING){
+        return -delta_y;
+    }else{
+        return delta_y;
+    }
+}
+
+void FlyingTrialFarmer::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    StartProgramChecks::check_performance_class_wired_or_wireless(context);
+    assert_16_9_720p_min(env.logger(), env.console);
+
+    FlyingTrialFarmer_Descriptor::Stats& stats = env.current_stats<FlyingTrialFarmer_Descriptor::Stats>();
+
+    //  Connect the controller.
+    require_player(env.console, context, BUTTON_L);
+
+    for (uint16_t i = 0; i < NUM_TRIALS; i++){
+        BlackScreenOverWatcher black_screen(COLOR_RED, { 0.2, 0.2, 0.6, 0.6 });
+        context.wait_for_all_requests();
+
+        int ret_entry = run_until<ProControllerContext>(
+            env.console, context,
+            [](ProControllerContext& context){
+                pbf_mash_button(context, BUTTON_A, 80000ms);
+            },
+            { black_screen }
+        );
+        context.wait_for_all_requests();
+        if (ret_entry == 0){
+            env.log("Black screen detected. Trial starting...");
+        }
+
+        WhiteButtonWatcher whitebutton(COLOR_GREEN, WhiteButton::ButtonY, {0.40, 0.85, 0.20, 0.14});
+        context.wait_for_all_requests();
+
+        int ret_trial_start = wait_until(
+            env.console, context,
+            std::chrono::seconds(120),
+            {whitebutton}
+        );
+        context.wait_for_all_requests();
+        if (ret_trial_start == 0){
+            env.log("Countdown is over. Starting navigation sequence...");
+
+            switch (FLIGHT_PATH){
+            case FlightPath::FRONT_ENTRY:
+                pbf_wait(context,  3000ms);
+                pbf_move_left_joystick(context, {+0.567, get_final_y_axis(+0.766)}, 1000ms, 0ms);
+                pbf_wait(context,  2000ms);
+                pbf_move_left_joystick(context, {-0.688, get_final_y_axis(+0.609)}, 2000ms, 0ms);
+                pbf_wait(context,  1000ms);
+                pbf_move_left_joystick(context, {0, get_final_y_axis(+0.609)}, 2000ms, 0ms);
+                pbf_wait(context,  6000ms);
+                pbf_move_left_joystick(context, {-0.102, get_final_y_axis(0)}, 1000ms, 0ms);
+                pbf_wait(context,  7000ms);
+                pbf_move_left_joystick(context, {0, get_final_y_axis(-0.406)}, 2000ms, 0ms);
+                pbf_wait(context, 6240ms);
+                pbf_move_left_joystick(context, {-1, get_final_y_axis(0)}, 3000ms, 0ms);
+                break;
+            case FlightPath::BACK_ENTRY_STRAIGHT:
+                pbf_wait(context,  3000ms);
+                pbf_move_left_joystick(context, {+0.409, get_final_y_axis(+0.844)}, 1000ms, 0ms);
+                pbf_wait(context,  2000ms);
+                pbf_move_left_joystick(context, {-0.688, get_final_y_axis(+0.609)}, 1920ms, 0ms);
+                pbf_wait(context,  1000ms);
+                pbf_move_left_joystick(context, {0, get_final_y_axis(+0.609)}, 2000ms, 0ms);
+                pbf_wait(context, 13000ms);
+                pbf_move_left_joystick(context, {0, get_final_y_axis(-0.406)}, 2000ms, 0ms);
+                pbf_wait(context,  9000ms);
+                break;
+            case FlightPath::BACK_ENTRY_SOFT_TURN:
+                pbf_wait(context,  3000ms);
+                pbf_move_left_joystick(context, {+0.409, get_final_y_axis(+0.844)}, 1000ms, 0ms);
+                pbf_wait(context,  2000ms);
+                pbf_move_left_joystick(context, {-0.688, get_final_y_axis(+0.609)}, 1920ms, 0ms);
+                pbf_wait(context,  1000ms);
+                pbf_move_left_joystick(context, {-0.141, get_final_y_axis(+0.609)}, 2000ms, 0ms);
+                pbf_wait(context, 14000ms);
+                pbf_move_left_joystick(context, {+0.606, get_final_y_axis(-0.289)}, 1280ms, 0ms);
+                pbf_wait(context,  9000ms);
+                break;
+            case FlightPath::BACK_ENTRY_HARD_TURN:
+                pbf_wait(context,  3000ms);
+                pbf_move_left_joystick(context, {+0.252, get_final_y_axis(+0.844)}, 1000ms, 0ms);
+                pbf_wait(context,  2000ms);
+                pbf_move_left_joystick(context, {-0.688, get_final_y_axis(+0.609)}, 1920ms, 0ms);
+                pbf_wait(context,  1000ms);
+                pbf_move_left_joystick(context, {0, get_final_y_axis(+0.609)}, 1280ms, 0ms);
+                pbf_wait(context, 20400ms);
+                pbf_move_left_joystick(context, {+1, get_final_y_axis(-0.625)}, 2000ms, 0ms);
+                pbf_wait(context,  9000ms);
+                break;
+            }
+        }
+
+        if (run_rewards(env, context)){
+            stats.m_success++;
+        }else{
+            stats.m_fail++;
+        }
+
+        stats.m_trials++;
+
+        if (SAVE_NUM_ROUNDS != 0 && stats.m_trials % SAVE_NUM_ROUNDS == 0){
+            save_game_from_overworld(env.program_info(), env.console, context);
+            reset_game(env.program_info(), env.console, context);
+            stats.m_saves++;
+        }
+
+        env.update_stats();
+        send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
+    }
+
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+    GO_HOME_WHEN_DONE.run_end_of_program(context);
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_FlyingTrialFarmer.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_FlyingTrialFarmer.h
new file mode 100644
index 0000000000..2f431c0e41
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_FlyingTrialFarmer.h
@@ -0,0 +1,63 @@
+/*  Flying Trial Farmer
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_FlyingTrialFarmer_H
+#define PokemonAutomation_PokemonSV_FlyingTrialFarmer_H
+
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+class FlyingTrialFarmer_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    FlyingTrialFarmer_Descriptor();
+
+    struct Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+
+};
+
+
+
+
+class FlyingTrialFarmer : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = FlyingTrialFarmer_Descriptor;
+    FlyingTrialFarmer();
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
+    SimpleIntegerOption<uint16_t> NUM_TRIALS;
+    SimpleIntegerOption<uint16_t> SAVE_NUM_ROUNDS;
+
+    enum class FlightPath{
+        FRONT_ENTRY,
+        BACK_ENTRY_STRAIGHT,
+        BACK_ENTRY_SOFT_TURN,
+        BACK_ENTRY_HARD_TURN
+    };
+    EnumDropdownOption<FlightPath> FLIGHT_PATH;
+
+    BooleanCheckBoxOption INVERT_CONTROLS_WHILE_FLYING;
+    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
+    EventNotificationsOption NOTIFICATIONS;
+
+    bool run_rewards(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+    double get_final_y_axis(double delta_y);
+};
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_GimmighoulChestFarmer.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_GimmighoulChestFarmer.cpp
new file mode 100644
index 0000000000..d747beb1ba
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_GimmighoulChestFarmer.cpp
@@ -0,0 +1,299 @@
+/*  Gimmighoul Chest Farmer
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/PrettyPrint.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "CommonTools/StartupChecks/StartProgramChecks.h"
+#include "CommonTools/StartupChecks/VideoResolutionCheck.h"
+#include "NintendoSwitch/NintendoSwitch_Settings.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "NintendoSwitch/Programs/DateSpam/NintendoSwitch_HomeToDateTime.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonSV/PokemonSV_Settings.h"
+#include "VideoGames/PokemonSV/Inference/Battles/PokemonSV_NormalBattleMenus.h"
+#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h"
+#include "PokemonSV_GimmighoulChestFarmer.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+using namespace Pokemon;
+
+GimmighoulChestFarmer_Descriptor::GimmighoulChestFarmer_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonSV:GimmighoulChestFarmer",
+        STRING_POKEMON + " SV", "Gimmighoul Chest Farmer",
+        "Programs/PokemonSV/GimmighoulChestFarmer.html",
+        "Farm Chest Gimmighoul for coins.",
+        PanelQualityStanding::DEPRECATED,
+        ProgramControllerClass::StandardController_RequiresPrecision,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+struct GimmighoulChestFarmer_Descriptor::Stats : public StatsTracker{
+    Stats()
+        : pokemon_fainted(m_stats["Chests farmed"])
+        , wild_interrupts(m_stats["Wild interrupts"])
+        , resets(m_stats["Resets"])
+        , errors(m_stats["Errors"])
+    {
+        m_display_order.emplace_back("Chests farmed");
+        m_display_order.emplace_back("Wild interrupts");
+        m_display_order.emplace_back("Resets");
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+    }
+    std::atomic<uint64_t>& pokemon_fainted;
+    std::atomic<uint64_t>& wild_interrupts;
+    std::atomic<uint64_t>& resets;
+    std::atomic<uint64_t>& errors;
+};
+std::unique_ptr<StatsTracker> GimmighoulChestFarmer_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+GimmighoulChestFarmer::GimmighoulChestFarmer()
+    : PP(
+        "<b>First Attack PP:</b><br>The amount of PP remaining on your lead's first attack.",
+        LockMode::LOCK_WHILE_RUNNING,
+        15
+    )
+    , START_LOCATION(
+        "<b>Start Location:</b><br>The start location of your character.",
+        {
+            {StartLocation::FlyPoint, "fly-point", "Fly Point - East Province (Area One) Watchtower"},
+            {StartLocation::InFrontOfChest, "in-front-of-chest", "In front of chest"},
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        StartLocation::FlyPoint
+    )
+    , GO_HOME_WHEN_DONE(false)
+    , FIX_TIME_WHEN_DONE(
+        "<b>Fix Time when Done:</b><br>Fix the time after the program finishes.",
+        LockMode::UNLOCK_WHILE_RUNNING, false
+    )
+    , ADDITIONAL_BATTLE_WAIT_TIME0(
+        "<b>Additional Battle Wait Time:</b><br>Increase this if you are timing out when entering battle.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "10000 ms"
+    )
+    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_STATUS_UPDATE,
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+{
+    PA_ADD_OPTION(PP);
+    PA_ADD_OPTION(START_LOCATION);
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+    PA_ADD_OPTION(FIX_TIME_WHEN_DONE);
+    PA_ADD_OPTION(ADDITIONAL_BATTLE_WAIT_TIME0);
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+void GimmighoulChestFarmer::navigate_to_gimmi(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    //Cursor is already in position
+    fly_to_overworld_from_map(env.program_info(), env.console, context);
+    pbf_move_left_joystick(context, {-1, +1}, 1264ms, 0ms);
+    pbf_press_button(context, BUTTON_L, 400ms, 320ms);
+    pbf_move_left_joystick(context, {0, +1}, 800ms, 0ms);
+    //Climb ladder
+    pbf_press_button(context, BUTTON_L, 400ms, 320ms);
+    pbf_move_left_joystick(context, {0, +1}, 18800ms, 0ms);
+    pbf_press_button(context, BUTTON_L, 400ms, 320ms);
+    pbf_wait(context, 800ms);
+    context.wait_for_all_requests();
+    //Walk into the wall
+    pbf_move_left_joystick(context, {0, +1}, 1600ms, 800ms);
+    context.wait_for_all_requests();
+    //Turn back
+    pbf_move_left_joystick(context, {0, -1}, 480ms, 800ms);
+    context.wait_for_all_requests();
+    //Position toward chest
+    pbf_move_left_joystick(context, {0, +1}, 240ms, 0ms);
+    context.wait_for_all_requests();
+}
+
+void GimmighoulChestFarmer::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    StartProgramChecks::check_performance_class_wired_or_wireless(context);
+    assert_16_9_720p_min(env.logger(), env.console);
+
+    //  Connect the controller.
+    require_player(env.console, context, BUTTON_LCLICK);
+
+    GimmighoulChestFarmer_Descriptor::Stats& stats = env.current_stats<GimmighoulChestFarmer_Descriptor::Stats>();
+
+    if (START_LOCATION == StartLocation::FlyPoint){
+        //Set starting position by flying - must fly to East Province (Area One) Watchtower, do not move from fly point
+        open_map_from_overworld(env.program_info(), env.console, context);
+        fly_to_overworld_from_map(env.program_info(), env.console, context);
+        pbf_move_left_joystick(context, {-1, +1}, 1264ms, 0ms);
+        pbf_press_button(context, BUTTON_L, 400ms, 320ms);
+        pbf_move_left_joystick(context, {0, +1}, 800ms, 0ms);
+        //Climb ladder
+        pbf_press_button(context, BUTTON_L, 400ms, 320ms);
+        pbf_move_left_joystick(context, {0, +1}, 18800ms, 0ms);
+        pbf_press_button(context, BUTTON_L, 400ms, 320ms);
+        pbf_wait(context, 800ms);
+        context.wait_for_all_requests();
+        //Walk into the wall
+        pbf_move_left_joystick(context, {0, +1}, 1600ms, 800ms);
+        context.wait_for_all_requests();
+        //Press A in case there's already a chest
+        //The remaining commands will run harmlessly during the battle intro if there is a chest
+        pbf_press_button(context, BUTTON_A, 400ms, 320ms);
+        //Turn back
+        pbf_move_left_joystick(context, {0, -1}, 480ms, 800ms);
+        context.wait_for_all_requests();
+        //Position toward chest
+        pbf_move_left_joystick(context, {0, +1}, 240ms, 0ms);
+        context.wait_for_all_requests();
+    }
+    //else assuming player is positioned correctly in front of the chest
+
+    uint32_t c = 0;
+    while(c < PP){
+        //  Press A to enter battle, assuming there is a chest
+        env.log("Fetch Attempts: " + tostr_u_commas(c));
+        pbf_mash_button(context, BUTTON_A, 1000ms);
+        pbf_wait(context, 1000ms); //Wait extra to make sure the overworld map vanishes
+        context.wait_for_all_requests();
+
+        OverworldWatcher battleStarting(env.console, COLOR_RED);
+        NormalBattleMenuWatcher battle_detected(COLOR_RED);
+        int retOverworld = wait_until(
+            env.console, context,
+            std::chrono::seconds(5),
+            {battleStarting, battle_detected}
+        );
+        if (retOverworld != 0){
+            //Wait for the battle to load then check for battle menu, if there isn't a battle menu then no chest
+            NormalBattleMenuWatcher battle_menu(COLOR_YELLOW);
+            int ret = wait_until(
+                env.console, context,
+                ADDITIONAL_BATTLE_WAIT_TIME0,
+                { battle_menu }
+            );
+
+            if (ret == 0){
+                //  Attack using your first move
+                pbf_mash_button(context, BUTTON_A, 720ms);
+                c++;
+                context.wait_for_all_requests();
+                OverworldWatcher overworld(env.console, COLOR_RED);
+                int ret2 = wait_until(
+                    env.console, context,
+                    std::chrono::seconds(120),
+                    { overworld }
+                );
+                if (ret2 != 0){
+                    stats.errors++;
+                    env.update_stats();
+                    OperationFailedExceptionWithScreenshot::fire(
+                        ErrorReportMode::SEND_ERROR_REPORT,
+                        "Failed to return to Overworld after two minutes. Did your attack miss or fail to defeat Gimmighoul in one hit?",
+                        env.console
+                    );
+                }
+                stats.pokemon_fainted++;
+                env.update_stats();
+                send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
+
+                //Set starting position by flying - move map cursor
+                open_map_from_overworld(env.program_info(), env.console, context);
+                pbf_press_button(context, BUTTON_ZR, 400ms, 320ms);
+                pbf_move_left_joystick(context, {-0.625, -0.5}, 80ms, 0ms);
+                navigate_to_gimmi(env, context);
+
+                //Check for tauros interrupt before pressing A - reset position if there was one
+                ret = wait_until(
+                    env.console, context,
+                    std::chrono::seconds(1),
+                    { battle_menu }
+                );
+                if (ret == 0){
+                    pbf_mash_button(context, BUTTON_A, 720ms);
+                    c++;
+                    context.wait_for_all_requests();
+                    ret2 = wait_until(
+                        env.console, context,
+                        std::chrono::seconds(120),
+                        { overworld }
+                    );
+                    if (ret2 != 0){
+                        stats.errors++;
+                        env.update_stats();
+                        OperationFailedExceptionWithScreenshot::fire(
+                            ErrorReportMode::SEND_ERROR_REPORT,
+                            "Failed to return to Overworld after two minutes.",
+                            env.console
+                        );
+                    }
+                    //Don't move map cursor this time
+                    open_map_from_overworld(env.program_info(), env.console, context);
+                    navigate_to_gimmi(env, context);
+
+                    stats.wild_interrupts++;
+                    env.update_stats();
+                    send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
+                }
+            }
+        }
+
+        //  Save the game
+        save_game_from_overworld(env.program_info(), env.console, context);
+        pbf_press_button(context, BUTTON_HOME, 160ms, GameSettings::instance().GAME_TO_HOME_DELAY1);
+
+        //  Date skip - in-game day cycle is 72 mins, so 2 hours is fastest way
+        //  This isn't perfect because 12 hour format but it works
+        home_to_date_time(env.console, context, true);
+        ssf_press_button_ptv(context, BUTTON_A, 160ms, 80ms);
+        ssf_issue_scroll_ptv(context, DPAD_RIGHT, 0ms);
+        ssf_press_button_ptv(context, BUTTON_A, 16ms);
+        ssf_issue_scroll_ptv(context, SSF_SCROLL_RIGHT);
+        ssf_issue_scroll_ptv(context, SSF_SCROLL_UP);
+        ssf_issue_scroll_ptv(context, SSF_SCROLL_UP);
+        ssf_issue_scroll_ptv(context, DPAD_RIGHT, 0ms);
+        ssf_press_button_ptv(context, BUTTON_A, 16ms);
+        ssf_issue_scroll_ptv(context, SSF_SCROLL_RIGHT);
+        ssf_issue_scroll_ptv(context, SSF_SCROLL_RIGHT);
+        ssf_press_button_ptv(context, BUTTON_A, 160ms, 80ms);
+        pbf_press_button(context, BUTTON_HOME, 160ms, ConsoleSettings::instance().SETTINGS_TO_HOME_DELAY0);
+
+        stats.resets++;
+        env.update_stats();
+        send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
+        reset_game_from_home(env.program_info(), env.console, context, 5000ms);
+    }
+
+    if (FIX_TIME_WHEN_DONE){
+        go_home(env.console, context);
+        home_to_date_time(env.console, context, false);
+        pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+        pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+        pbf_press_button(context, BUTTON_HOME, 160ms, ConsoleSettings::instance().SETTINGS_TO_HOME_DELAY0);
+        resume_game_from_home(env.console, context);
+    }
+    GO_HOME_WHEN_DONE.run_end_of_program(context);
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+}
+
+}
+}
+}
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_GimmighoulChestFarmer.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_GimmighoulChestFarmer.h
new file mode 100644
index 0000000000..fd6595fa1e
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_GimmighoulChestFarmer.h
@@ -0,0 +1,58 @@
+/*  Gimmighoul Chest Farmer
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_GimmighoulChestFarm_H
+#define PokemonAutomation_PokemonSwSh_GimmighoulChestFarm_H
+
+#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "Common/Cpp/Options/EnumDropdownOption.h"
+#include "Common/Cpp/Options/TimeDurationOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+class GimmighoulChestFarmer_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    GimmighoulChestFarmer_Descriptor();
+    struct Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+class GimmighoulChestFarmer : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = GimmighoulChestFarmer_Descriptor;
+    GimmighoulChestFarmer();
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    enum class StartLocation{
+        FlyPoint,
+        InFrontOfChest,
+    };
+
+    SimpleIntegerOption<uint32_t> PP;
+    EnumDropdownOption<StartLocation> START_LOCATION;
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
+    BooleanCheckBoxOption FIX_TIME_WHEN_DONE;
+    MillisecondsOption ADDITIONAL_BATTLE_WAIT_TIME0;
+    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
+    EventNotificationsOption NOTIFICATIONS;
+
+    void navigate_to_gimmi(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+};
+
+}
+}
+}
+#endif
+
+
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_GimmighoulRoamingFarmer.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_GimmighoulRoamingFarmer.cpp
new file mode 100644
index 0000000000..4f05f05604
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_GimmighoulRoamingFarmer.cpp
@@ -0,0 +1,114 @@
+/*  Gimmighoul Roaming Farmer
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/PrettyPrint.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonTools/StartupChecks/VideoResolutionCheck.h"
+#include "NintendoSwitch/NintendoSwitch_Settings.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "NintendoSwitch/Programs/DateSpam/NintendoSwitch_HomeToDateTime.h"
+#include "NintendoSwitch/Programs/DateSpam/NintendoSwitch_RollDateForward1.h"
+#include "NintendoSwitch/Programs/DateSpam/NintendoSwitch_RollDateBackwardN.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.h"
+#include "VideoGames/PokemonSV/PokemonSV_Settings.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h"
+#include "PokemonSV_GimmighoulRoamingFarmer.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+using namespace Pokemon;
+
+GimmighoulRoamingFarmer_Descriptor::GimmighoulRoamingFarmer_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonSV:GimmighoulRoamingFarmer",
+        STRING_POKEMON + " SV", "Gimmighoul Roaming Farmer",
+        "Programs/PokemonSV/GimmighoulRoamingFarmer.html",
+        "Farm roaming Gimmighoul for coins.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_PerformanceClassSensitive,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+GimmighoulRoamingFarmer::GimmighoulRoamingFarmer()
+    : SKIPS(
+        "<b>Number of Attempts:</b>",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        1500
+    )
+    , GO_HOME_WHEN_DONE(false)
+    , FIX_TIME_WHEN_DONE(
+        "<b>Fix Time when Done:</b><br>Fix the time after the program finishes.",
+        LockMode::UNLOCK_WHILE_RUNNING, false
+    )
+    , NOTIFICATIONS({
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+{
+    PA_ADD_OPTION(SKIPS);
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+    PA_ADD_OPTION(FIX_TIME_WHEN_DONE);
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+void GimmighoulRoamingFarmer::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    assert_16_9_720p_min(env.logger(), env.console);
+
+    //  Connect the controller.
+    require_player(env.console, context, BUTTON_LCLICK);
+
+    //  Start in game facing a roaming Gimmighoul somewhere safe. (ex. Pokemon Center since wild Pokemon can't fight you there.)
+    uint8_t year = MAX_YEAR;
+    for (uint32_t c = 0; c < SKIPS; c++){
+        //  Grab coin assuming there is one
+        env.log("Fetch Attempts: " + tostr_u_commas(c));
+        pbf_mash_button(context, BUTTON_A, 720ms);
+        pbf_wait(context, 2000ms);
+
+        //  Save the game
+        save_game_from_overworld(env.program_info(), env.console, context);
+
+        //  Date skip
+        pbf_press_button(context, BUTTON_HOME, 160ms, GameSettings::instance().GAME_TO_HOME_DELAY1);
+        home_to_date_time(env.console, context, true);
+        if (year >= MAX_YEAR){
+            roll_date_backward_N(env.console, context, MAX_YEAR, true);
+            year = 0;
+        }else{
+            roll_date_forward_1(env.console, context, true);
+            year++;
+        }
+
+        pbf_press_button(context, BUTTON_HOME, 160ms, ConsoleSettings::instance().SETTINGS_TO_HOME_DELAY0);
+
+        //  Reset game
+        reset_game_from_home(env.program_info(), env.console, context, 5000ms);
+    }
+
+    if (FIX_TIME_WHEN_DONE){
+        go_home(env.console, context);
+        home_to_date_time(env.console, context, false);
+        pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+        pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+        pbf_press_button(context, BUTTON_HOME, 160ms, ConsoleSettings::instance().SETTINGS_TO_HOME_DELAY0);
+        resume_game_from_home(env.console, context);
+    }
+    GO_HOME_WHEN_DONE.run_end_of_program(context);
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+}
+
+
+}
+}
+}
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_GimmighoulRoamingFarmer.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_GimmighoulRoamingFarmer.h
new file mode 100644
index 0000000000..d90ac9dd3b
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_GimmighoulRoamingFarmer.h
@@ -0,0 +1,47 @@
+/*  Gimmighoul Roaming Farmer
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_GimmighoulRoamingFarm_H
+#define PokemonAutomation_PokemonSV_GimmighoulRoamingFarm_H
+
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+class GimmighoulRoamingFarmer_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    GimmighoulRoamingFarmer_Descriptor();
+};
+
+class GimmighoulRoamingFarmer : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = GimmighoulRoamingFarmer_Descriptor;
+    GimmighoulRoamingFarmer();
+
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    SimpleIntegerOption<uint32_t> SKIPS;
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
+    BooleanCheckBoxOption FIX_TIME_WHEN_DONE;
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+
+}
+}
+}
+#endif
+
+
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_LPFarmer.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_LPFarmer.cpp
new file mode 100644
index 0000000000..006c7d5f65
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_LPFarmer.cpp
@@ -0,0 +1,149 @@
+/*  Mass Release
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonTools/StartupChecks/VideoResolutionCheck.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonSV/PokemonSV_Settings.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h"
+#include "VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_TeraRoutines.h"
+#include "PokemonSV_LPFarmer.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+using namespace Pokemon;
+
+
+LPFarmer_Descriptor::LPFarmer_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonSV:LPFarmer",
+        STRING_POKEMON + " SV", "LP Farmer",
+        "Programs/PokemonSV/LPFarmer.html",
+        "Farm LP by day skipping Tera raids.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_PerformanceClassSensitive,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+struct LPFarmer_Descriptor::Stats : public StatsTracker{
+    Stats()
+        : m_skips(m_stats["Day Skips"])
+        , m_resets(m_stats["Resets"])
+        , m_fetches(m_stats["Fetches"])
+        , m_errors(m_stats["Errors"])
+    {
+        m_display_order.emplace_back("Day Skips");
+        m_display_order.emplace_back("Resets");
+        m_display_order.emplace_back("Fetches");
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+    }
+    std::atomic<uint64_t>& m_skips;
+    std::atomic<uint64_t>& m_resets;
+    std::atomic<uint64_t>& m_fetches;
+    std::atomic<uint64_t>& m_errors;
+};
+std::unique_ptr<StatsTracker> LPFarmer_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+
+
+LPFarmer::LPFarmer()
+    : GO_HOME_WHEN_DONE(false)
+    , FETCHES(
+        "<b>Fetches:</b>",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        10000, 1
+    )
+    , PERIODIC_RESET(
+        "<b>Periodic Game Reset:</b><br>Reset the game after this many skips. This clears up the framerate bug.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        20, 0, 100
+    )
+    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_STATUS_UPDATE,
+        &NOTIFICATION_PROGRAM_FINISH,
+//        &NOTIFICATION_ERROR_RECOVERABLE,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+{
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+    PA_ADD_OPTION(FETCHES);
+    PA_ADD_OPTION(PERIODIC_RESET);
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+
+
+void LPFarmer::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    assert_16_9_720p_min(env.logger(), env.console);
+
+    LPFarmer_Descriptor::Stats& stats = env.current_stats<LPFarmer_Descriptor::Stats>();
+
+    //  Connect the controller.
+    require_player(env.console, context, BUTTON_L);
+
+    bool first = true;
+    uint32_t skip_counter = 0;
+
+    for (size_t fetches = 0; fetches < FETCHES;){
+        env.update_stats();
+        send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
+
+        if (!first){
+            day_skip_from_overworld(env.console, context);
+            pbf_wait(context, GameSettings::instance().RAID_SPAWN_DELAY0);
+            context.wait_for_all_requests();
+            stats.m_skips++;
+            skip_counter++;
+            env.update_stats();
+        }
+        first = false;
+
+        uint8_t reset_period = PERIODIC_RESET;
+        if (reset_period != 0 && skip_counter >= reset_period){
+            env.log("Resetting game to clear framerate.");
+            save_game_from_overworld(env.program_info(), env.console, context);
+            reset_game(env.program_info(), env.console, context);
+            skip_counter = 0;
+        }
+
+        if (!open_raid(env.console, context)){
+            continue;
+        }
+
+        fetches++;
+        stats.m_fetches++;
+
+        close_raid(env.program_info(), env.console, context);
+    }
+
+    env.update_stats();
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+    GO_HOME_WHEN_DONE.run_end_of_program(context);
+}
+
+
+
+
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_LPFarmer.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_LPFarmer.h
new file mode 100644
index 0000000000..7b391269bb
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_LPFarmer.h
@@ -0,0 +1,50 @@
+/*  LP Farmer
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_LPFarmer_H
+#define PokemonAutomation_PokemonSwSh_LPFarmer_H
+
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+class LPFarmer_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    LPFarmer_Descriptor();
+    struct Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+class LPFarmer : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = LPFarmer_Descriptor;
+    LPFarmer();
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
+    SimpleIntegerOption<uint32_t> FETCHES;
+    SimpleIntegerOption<uint8_t> PERIODIC_RESET;
+    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+
+
+}
+}
+}
+#endif
+
+
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_MaterialFarmer.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_MaterialFarmer.cpp
new file mode 100644
index 0000000000..d3d0636c14
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_MaterialFarmer.cpp
@@ -0,0 +1,111 @@
+/*  Material Farmer
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Exceptions/ProgramFinishedException.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "CommonTools/StartupChecks/VideoResolutionCheck.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h"
+#include "PokemonSV_MaterialFarmer.h"
+
+// #include <iostream>
+// using std::cout;
+// using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+using namespace Pokemon;
+
+MaterialFarmer_Descriptor::MaterialFarmer_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonSV:MaterialFarmer",
+        STRING_POKEMON + " SV", "Material Farmer",
+        "Programs/PokemonSV/MaterialFarmer.html",
+        "Farm materials - Happiny dust from Chanseys/Blisseys, for Item Printer.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::VIDEO_AUDIO,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+std::unique_ptr<StatsTracker> MaterialFarmer_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new MaterialFarmerStats());
+}
+
+
+MaterialFarmer::MaterialFarmer()
+    : GO_HOME_WHEN_DONE(true)
+    , MATERIAL_FARMER_OPTIONS(
+        GroupOption::EnableMode::ALWAYS_ENABLED,
+        nullptr,
+        NOTIFICATION_STATUS_UPDATE,
+        NOTIFICATION_PROGRAM_FINISH,
+        NOTIFICATION_ERROR_RECOVERABLE,
+        NOTIFICATION_ERROR_FATAL
+    )
+    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_STATUS_UPDATE,
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_RECOVERABLE,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+{
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+    PA_ADD_OPTION(MATERIAL_FARMER_OPTIONS);
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+
+void MaterialFarmer::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    assert_16_9_720p_min(env.logger(), env.console);
+
+    //  Connect the controller.
+    require_player(env.console, context, BUTTON_L);
+
+    // Throw user setup errors early in program
+    // - Ensure language is set
+    const Language language = MATERIAL_FARMER_OPTIONS.LANGUAGE;
+    if (language == Language::None){
+        throw UserSetupError(env.console.logger(), "Must set game language option to read ingredient lists.");
+    }
+
+    // - Ensure audio input is enabled
+    LetsGoKillSoundDetector audio_detector(env.console, [](float){ return true; });
+    wait_until(
+        env.console, context,
+        std::chrono::milliseconds(1100),
+        {audio_detector}
+    );
+    audio_detector.throw_if_no_sound(std::chrono::milliseconds(1000));
+
+    // start by warping to pokecenter for positioning reasons
+    if (!MATERIAL_FARMER_OPTIONS.SKIP_WARP_TO_POKECENTER){
+        reset_to_pokecenter(env.program_info(), env.console, context);
+    }
+
+    MaterialFarmerStats& stats = env.current_stats<MaterialFarmerStats>();
+
+    try{
+        run_material_farmer(env, env.console, context, MATERIAL_FARMER_OPTIONS, stats);
+    }catch (ProgramFinishedException&){}
+
+    GO_HOME_WHEN_DONE.run_end_of_program(context);
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+}
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_MaterialFarmer.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_MaterialFarmer.h
new file mode 100644
index 0000000000..55112806fb
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_MaterialFarmer.h
@@ -0,0 +1,49 @@
+/*  Material Farmer - Happiny dust
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_MaterialFarmer_H
+#define PokemonAutomation_PokemonSV_MaterialFarmer_H
+
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+#include "PokemonSV_MaterialFarmerTools.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+class MaterialFarmer_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    MaterialFarmer_Descriptor();
+
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+
+class MaterialFarmer : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = MaterialFarmer_Descriptor;
+    MaterialFarmer();
+
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
+    MaterialFarmerOptions MATERIAL_FARMER_OPTIONS;
+
+    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_MaterialFarmerTools.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_MaterialFarmerTools.cpp
new file mode 100644
index 0000000000..426e85f38e
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_MaterialFarmerTools.cpp
@@ -0,0 +1,949 @@
+/*  Material Farmer
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <atomic>
+#include <array>
+#include "Common/Cpp/PrettyPrint.h"
+#include "CommonFramework/StaticGlobals.h"
+#include "CommonFramework/Exceptions/ProgramFinishedException.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/Exceptions/UnexpectedBattleException.h"
+#include "CommonFramework/Exceptions/FatalProgramException.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "VideoGames/PokemonSV/Inference/Boxes/PokemonSV_IvJudgeReader.h"
+#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_GradientArrowDetector.h"
+#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h"
+#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldSensors.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h"
+#include "VideoGames/PokemonSV/Programs/Battles/PokemonSV_Battles.h"
+#include "VideoGames/PokemonSV/Programs/Sandwiches/PokemonSV_SandwichRoutines.h"
+#include "VideoGames/PokemonSV/Programs/ShinyHunting/PokemonSV_LetsGoTools.h"
+#include "VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStoryTools.h"
+#include "PokemonSV_MaterialFarmerTools.h"
+
+// #include <iostream>
+// using std::cout;
+// using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+using namespace Pokemon;
+
+
+MaterialFarmerOptions::~MaterialFarmerOptions(){
+//    ENABLE_SANDWICH.remove_listener(*this);
+}
+
+MaterialFarmerOptions::MaterialFarmerOptions(
+    GroupOption::EnableMode enable_mode,
+    OCR::LanguageOCROption* language_option,
+    EventNotificationOption& notif_status_update_option,
+    EventNotificationOption& notif_program_finish_option,
+    EventNotificationOption& notif_error_recoverable_option,
+    EventNotificationOption& notif_error_fatal_option
+)
+    : GroupOption(
+        "Material Farmer",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        enable_mode
+    )
+    , m_language_owner(language_option == nullptr
+        ? new OCR::LanguageOCROption(
+            "<b>Game Language:</b><br>Required to read sandwich ingredients.",
+            IV_READER().languages(),
+            LockMode::UNLOCK_WHILE_RUNNING,
+            true
+        )
+        : nullptr
+    )
+    , RUN_TIME_IN_MINUTES(
+        "<b>Run Duration:</b><br>Run the material farmer for this many minutes.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        32
+    )
+//    , SAVE_GAME_BEFORE_SANDWICH(
+//        "<b>Save Game before each round:</b>",
+//        LockMode::UNLOCK_WHILE_RUNNING,
+//        true
+//    )
+//    , SAVE_GAME_BEFORE_SANDWICH_STATIC_TEXT("")
+//    , NUM_SANDWICH_ROUNDS_STATIC_TEXT("")
+    , LANGUAGE(language_option == nullptr ? *m_language_owner : *language_option)
+    , SANDWICH_OPTIONS(
+        "Make a Sandwich",
+        &LANGUAGE,
+        BaseRecipe::non_shiny,
+        true,
+        GroupOption::EnableMode::DEFAULT_DISABLED
+    )
+    , AUTO_HEAL_PERCENT(
+        "<b>Auto-Heal %</b><br>Auto-heal if your HP drops below this percentage.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        75, 0, 100
+    )
+    , m_advanced_options(
+        "<font size=4><b>Advanced Options: (developer only)</b></font>"
+    )
+    , SAVE_DEBUG_VIDEO(
+        "<b>Save debug videos to Switch:</b><br>"
+        "Set this on to save a Switch video everytime an error occurs. You can send the video to developers to help them debug later.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        false
+    )
+    , SKIP_WARP_TO_POKECENTER(
+        "<b>Skip warping to closest PokeCenter:</b><br>"
+        "This is for debugging the program without waiting for the initial warp.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        false
+    )
+//    , ENABLE_SANDWICH(
+//        "<b>Enable Sandwich making:</b><br>"
+//        "This is for boosting spawn rates of specific Pokemon.",
+//        LockMode::UNLOCK_WHILE_RUNNING,
+//        false
+//    )
+    , TIME_PER_SANDWICH(
+        "<b>Time per sandwich:</b><br>Number of minutes before resetting sandwich.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        30, 1, 30
+    )
+    , NUM_FORWARD_MOVES_PER_LETS_GO_ITERATION(
+        "<b>Number of forward moves per lets go iteration:</b><br>"
+        "During Let's go autobattling sequence, the number of forward movements before resetting to Pokecenter.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        13
+    )
+    , NOTIFICATION_STATUS_UPDATE(notif_status_update_option)
+    , NOTIFICATION_PROGRAM_FINISH(notif_program_finish_option)
+    , NOTIFICATION_ERROR_RECOVERABLE(notif_error_recoverable_option)
+    , NOTIFICATION_ERROR_FATAL(notif_error_fatal_option)
+{
+    PA_ADD_OPTION(RUN_TIME_IN_MINUTES);
+//    PA_ADD_OPTION(ENABLE_SANDWICH);
+//    PA_ADD_OPTION(SAVE_GAME_BEFORE_SANDWICH);
+//    PA_ADD_OPTION(SAVE_GAME_BEFORE_SANDWICH_STATIC_TEXT);
+//    PA_ADD_OPTION(NUM_SANDWICH_ROUNDS_STATIC_TEXT);
+    if (m_language_owner){
+        PA_ADD_OPTION(LANGUAGE);
+    }
+    PA_ADD_OPTION(SANDWICH_OPTIONS);
+    PA_ADD_OPTION(AUTO_HEAL_PERCENT);
+
+    if (STATIC_GLOBALS.DEVELOPER_MODE){
+        PA_ADD_OPTION(m_advanced_options);
+        PA_ADD_OPTION(SAVE_DEBUG_VIDEO);
+        PA_ADD_OPTION(SKIP_WARP_TO_POKECENTER);
+        PA_ADD_OPTION(TIME_PER_SANDWICH);
+        PA_ADD_OPTION(NUM_FORWARD_MOVES_PER_LETS_GO_ITERATION);
+    }
+
+    MaterialFarmerOptions::on_config_value_changed(this);
+//    ENABLE_SANDWICH.add_listener(*this);
+}
+
+void MaterialFarmerOptions::on_config_value_changed(void* object){
+
+//    if (MaterialFarmerOptions::ENABLE_SANDWICH){
+//        SAVE_GAME_BEFORE_SANDWICH_STATIC_TEXT.set_text(
+//            "Saves the game before each sandwich.<br>"
+//            "Recommended to leave on, as the sandwich maker will reset the game if it detects an error.<br>"
+//        );
+//        NUM_SANDWICH_ROUNDS_STATIC_TEXT.set_text(
+//            "One sandwich per round.<br>"
+//            "400-650 Happiny dust per sandwich, with Normal Encounter power level 2.<br>"
+//            "(e.g. Chorizo x4, Banana x2, Mayo x3, Whipped Cream x1)<br>"
+//        );
+//        MaterialFarmerOptions::SANDWICH_OPTIONS.set_visibility(ConfigOptionState::ENABLED);
+//    }else{
+//        SAVE_GAME_BEFORE_SANDWICH_STATIC_TEXT.set_text("");
+//        NUM_SANDWICH_ROUNDS_STATIC_TEXT.set_text("30 minutes per round.<br>");
+//        MaterialFarmerOptions::SANDWICH_OPTIONS.set_visibility(ConfigOptionState::DISABLED);
+//    }
+
+}
+
+// return new start time, so that minutes remaining is rounded up to a multiple of 32
+WallClock new_start_time_after_reset(WallClock old_start_time, uint16_t run_time_in_minutes){
+    auto farming_time_remaining = minutes_remaining(old_start_time, std::chrono::minutes(run_time_in_minutes));
+    // round up the time to multiple of 32 (30 minutes per sandwich, plus 2 minutes for sandwich making)
+    size_t desired_minutes_remaining = ((farming_time_remaining.count()/32)+1)*32;
+    WallClock new_start_time = current_time() + std::chrono::minutes(desired_minutes_remaining) - std::chrono::minutes(run_time_in_minutes);
+    return new_start_time;
+}
+
+
+void run_material_farmer(
+    ProgramEnvironment& env,
+    ConsoleHandle& console, ProControllerContext& context,
+    MaterialFarmerOptions& options,
+    MaterialFarmerStats& stats
+){
+    OverworldSensors sensors(
+        env.logger(), console, context
+    );
+    LetsGoEncounterBotTracker encounter_tracker(
+        env, console,
+        stats,
+        sensors.lets_go_kill
+    );
+    WallClock start_time = current_time();
+    WallClock last_sandwich_time = WallClock::min();
+    LetsGoHpWatcher hp_watcher(COLOR_RED);
+
+    // ensure we save before running the material farmer.
+    // but no need to save if already saving prior to each sandwich
+    if (!(options.SANDWICH_OPTIONS.enabled() && options.SANDWICH_OPTIONS.SAVE_GAME_BEFORE_SANDWICH)){
+        save_game_from_overworld(env.program_info(), console, context);
+    }    
+
+    /* 
+    - Use Let's Go along the path. Fly back to pokecenter when it reaches the end of the path.
+    - Keeping repeating this for RUN_TIME_IN_MINUTES minutes
+    */
+    size_t consecutive_failures = 0;
+    size_t max_consecutive_failures = 15;     
+    while (true){
+    try{
+        while (true){
+            // check time left on material farming
+            auto farming_time_remaining = minutes_remaining(start_time, std::chrono::minutes(options.RUN_TIME_IN_MINUTES));
+            console.log(
+                "Time left in Material Farming: " + 
+                std::to_string(farming_time_remaining.count()) + " min", 
+                COLOR_PURPLE
+            );
+            if (farming_time_remaining <= std::chrono::minutes(0)){
+                console.log("Time's up. Stop the Material farming program.", COLOR_RED);
+                return;
+            }
+
+            // Check time left on sandwich
+            if (options.SANDWICH_OPTIONS.enabled()){
+                auto sandwich_time_remaining = minutes_remaining(last_sandwich_time, std::chrono::minutes(options.TIME_PER_SANDWICH));
+                console.log(
+                    "Time left on sandwich: " + 
+                    std::to_string(sandwich_time_remaining.count()) + " min", 
+                    COLOR_PURPLE
+                );                   
+                if (sandwich_time_remaining <= std::chrono::minutes(0)){
+                    console.log("Sandwich not active. Make a sandwich.");
+                    last_sandwich_time = make_sandwich_material_farm(env, console, context, options, stats);
+                    console.overlay().add_log("Sandwich made.");
+
+                    // Log time remaining in Material farming 
+                    farming_time_remaining = minutes_remaining(start_time, std::chrono::minutes(options.RUN_TIME_IN_MINUTES));
+                    console.log(
+                        "Time left in Material Farming: " + 
+                        std::to_string(farming_time_remaining.count()) + " min", 
+                        COLOR_PURPLE
+                    );
+                    // Log time remaining on Sandwich
+                    sandwich_time_remaining = minutes_remaining(last_sandwich_time, std::chrono::minutes(options.TIME_PER_SANDWICH));
+                    console.log(
+                        "Time left on sandwich: " + 
+                        std::to_string(sandwich_time_remaining.count()) + " min", 
+                        COLOR_PURPLE
+                    );                  
+                }else{
+                    console.log("Sandwich is still active. Continue material farming.", COLOR_ORANGE);
+                }
+            }else{
+                console.log("Sandwich making disabled. Skip sandwich checks.", COLOR_ORANGE);
+            }
+
+            // heal before starting Let's go
+            console.log("Heal before starting Let's go", COLOR_PURPLE);
+            console.log("Heal threshold: " + tostr_default(options.AUTO_HEAL_PERCENT), COLOR_PURPLE);
+            check_hp(env, console, context, options, hp_watcher, stats);
+
+            /*
+            - Starts from pokemon center.
+            - Flies to start position. Runs a Let's Go iteration. 
+            - Then returns to pokemon center, regardless of whether 
+            it completes the action or gets caught in a battle 
+            */
+            run_from_battles_and_back_to_pokecenter(env, console, context, stats,
+                [&](ProgramEnvironment& env, VideoStream& stream, ProControllerContext& context){
+                    // Move to starting position for Let's Go hunting path
+                    stream.log("Move to starting position for Let's Go hunting path.", COLOR_PURPLE);
+                    move_to_start_position_for_letsgo1(env.program_info(), stream, context);
+
+                    // run let's go while updating the HP watcher
+                    stream.log("Starting Let's Go hunting path.", COLOR_PURPLE);
+                    run_until<ProControllerContext>(
+                        stream, context,
+                        [&](ProControllerContext& context){
+                            run_lets_go_iteration(stream, context, encounter_tracker, options.NUM_FORWARD_MOVES_PER_LETS_GO_ITERATION);
+                        },
+                        {hp_watcher}
+                    );
+                } 
+            ); 
+            
+            context.wait_for_all_requests();
+        }
+    }catch (OperationFailedExceptionWithScreenshot& e){
+        stats.m_errors++;
+        env.update_stats();
+        e.send_recoverable_error_notif_and_telemetry_report(env, options.NOTIFICATION_ERROR_RECOVERABLE);
+
+        // save screenshot after operation failed, 
+        // dump_snapshot(console);
+
+        if (options.SAVE_DEBUG_VIDEO){
+            // Take a video to give more context for debugging
+            pbf_press_button(context, BUTTON_CAPTURE, 2000ms, 2000ms);
+            context.wait_for_all_requests();
+        }
+
+        consecutive_failures++;
+        if (consecutive_failures >= max_consecutive_failures){
+            throw;
+        }
+
+        env.log("Reset game to handle recoverable error.");
+        reset_game(env.program_info(), console, context);
+        stats.m_game_resets++;
+        env.update_stats();
+
+        // update start time, so that minutes remaining is rounded up to a multiple of 32
+        start_time = new_start_time_after_reset(start_time, options.RUN_TIME_IN_MINUTES);      
+        // also update last sandwich time
+        last_sandwich_time = WallClock::min();
+    }
+    }
+}
+
+
+
+void check_hp(
+    ProgramEnvironment& env,
+    VideoStream& stream,
+    ProControllerContext& context,
+    MaterialFarmerOptions& options,
+    LetsGoHpWatcher& hp_watcher,
+    MaterialFarmerStats& stats
+){
+    double hp = hp_watcher.last_known_value() * 100;
+    if (0 < hp){
+        stream.log("Last Known HP: " + tostr_default(hp) + "%", COLOR_BLUE);
+    }else{
+        stream.log("Last Known HP: ?", COLOR_RED);
+    }
+    if (0 < hp && hp < options.AUTO_HEAL_PERCENT){
+        auto_heal_from_menu_or_overworld(env.program_info(), stream, context, 0, true);
+        stats.m_autoheals++;
+        env.update_stats();
+        send_program_status_notification(env, options.NOTIFICATION_STATUS_UPDATE);
+    }
+}
+
+
+
+// make sandwich then go back to Pokecenter to reset position
+// if gets caught up in a battle, try again.
+WallClock make_sandwich_material_farm(
+    ProgramEnvironment& env,
+    VideoStream& stream,
+    ProControllerContext& context, 
+    MaterialFarmerOptions& options,
+    MaterialFarmerStats& stats
+){
+
+    if (options.SANDWICH_OPTIONS.SAVE_GAME_BEFORE_SANDWICH){
+        save_game_from_overworld(env.program_info(), stream, context);
+    }
+
+    WallClock last_sandwich_time = WallClock::min();
+    while(last_sandwich_time == WallClock::min()){
+        run_from_battles_and_back_to_pokecenter(env, stream, context, stats,
+            [&](ProgramEnvironment& env, VideoStream& stream, ProControllerContext& context){
+                // Orient camera to look at same direction as player character
+                // - This is needed because when save-load the game, 
+                // the camera angle is different than when just flying to pokecenter
+                pbf_press_button(context, BUTTON_L, 400ms, 320ms);
+
+                // move up towards pokecenter counter
+                pbf_move_left_joystick(context, {0, -1}, 1440ms, 80ms);
+                // Orient camera to look at same direction as player character
+                pbf_press_button(context, BUTTON_L, 400ms, 320ms);
+                // look left
+                pbf_move_right_joystick(context, {-1, 0}, 960ms, 0ms);
+                // move toward clearing besides the pokecenter
+                pbf_move_left_joystick(context, {0, +1}, 2400ms, 0ms);
+
+                // make sandwich
+                picnic_from_overworld(env.program_info(), stream, context);
+                pbf_move_left_joystick(context, {0, +1}, 800ms, 320ms);  // walk forward to picnic table
+                enter_sandwich_recipe_list(env.program_info(), stream, context);
+                make_sandwich_option(env, stream, context, options.SANDWICH_OPTIONS);
+                last_sandwich_time = current_time();
+                leave_picnic(env.program_info(), stream, context);
+
+                stats.m_sandwiches++;
+                env.update_stats();
+
+            }
+        );
+    }
+    
+    return last_sandwich_time;
+}
+
+// given the start time, and duration in minutes, return the number of remaining minutes
+// WARNING: this function may silently overflow if start_time is near WallClock::min() or WallClock::max()
+std::chrono::minutes minutes_remaining(WallClock start_time, std::chrono::minutes minutes_duration){
+    if (start_time == WallClock::min()){
+        return std::chrono::minutes(0);
+    }else{
+        auto elapsed_time = std::chrono::duration_cast<std::chrono::minutes>(current_time() - start_time);
+        return minutes_duration - elapsed_time;
+    }
+}
+
+// from the North Province (Area 3) pokecenter, move to start position for Happiny dust farming
+void move_to_start_position_for_letsgo0(    
+    VideoStream& stream,
+    ProControllerContext& context
+){
+    // Orient camera to look at same direction as player character
+    // - This is needed because when save-load the game, 
+    // the camera angle is different than when just flying to pokecenter
+    pbf_press_button(context, BUTTON_L, 400ms, 320ms);
+
+    // move up towards pokecenter counter        
+    pbf_move_left_joystick(context, {0, -1}, 1440ms, 80ms);
+    // Orient camera to look at same direction as player character
+    pbf_press_button(context, BUTTON_L, 400ms, 320ms);
+    // look left
+    pbf_move_right_joystick(context, {-1, 0}, 960ms, 80ms);
+    // move toward clearing besides the pokecenter
+    pbf_move_left_joystick(context, {0, +1}, 2400ms, 80ms);
+
+    // look right, towards the start position
+    pbf_move_right_joystick(context, {+1, 0}, 960ms, 80ms);
+    pbf_move_left_joystick(context, {0, +1}, 80ms, 80ms);
+
+    // get on ride
+    pbf_press_button(context, BUTTON_PLUS, 400ms, 400ms);
+
+    // Jump
+    pbf_press_button(context, BUTTON_B, 1000ms, 800ms);
+
+    // Fly 
+    pbf_press_button(context, BUTTON_B, 400ms, 80ms); //  Double up this press
+    pbf_press_button(context, BUTTON_B, 400ms, 80ms);     //  in case one is dropped.
+    pbf_press_button(context, BUTTON_LCLICK, 400ms, 0ms);
+    // you automatically move forward without pressing any buttons. so just wait
+    pbf_wait(context, 11200ms);
+
+    // Glide forward
+    // pbf_move_left_joystick(context, {0, +1}, 20000ms, 80ms);
+
+    // arrived at start position. stop flying
+    pbf_press_button(context, BUTTON_B, 400ms, 3200ms);
+    // get off ride
+    pbf_press_button(context, BUTTON_PLUS, 400ms, 400ms);
+
+    // look right
+    pbf_move_right_joystick(context, {+1, 0}, 240ms, 80ms);
+    pbf_move_left_joystick(context, {0, +1}, 400ms, 80ms);
+
+    stream.log("Arrived at Let's go start position", COLOR_PURPLE);
+    
+
+}
+
+void do_action_and_run_from_battle(
+    const ProgramInfo& info, 
+    VideoStream& stream,
+    ProControllerContext& context,
+    std::function<
+        void(const ProgramInfo& info, 
+        VideoStream& stream,
+        ProControllerContext& context)
+    >&& action
+){
+    size_t max_attempts = 5;
+    for (size_t i = 0; i < max_attempts; i++){
+        try{
+            do_action_and_monitor_for_battles(info, stream, context,
+                [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                    action(info, stream, context);
+                }
+            );
+            break;
+        }catch (UnexpectedBattleException&){
+            stream.log("Detected battle. Now running away.", COLOR_PURPLE);
+            run_from_battle(stream, context);
+        }
+    }
+
+}
+
+void do_action_and_run_from_battle2(
+    const ProgramInfo& info, 
+    VideoStream& stream,
+    ProControllerContext& context,
+    std::function<
+        void(const ProgramInfo& info, 
+        VideoStream& stream,
+        ProControllerContext& context)
+    >&& action
+){
+    size_t max_attempts = 5;
+    for (size_t i = 0; i < max_attempts; i++){
+        try{
+            do_action_and_monitor_for_battles_early(info, stream, context,
+                [&](const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+                    action(info, stream, context);
+                }
+            );
+            break;
+        }catch (UnexpectedBattleException&){
+            stream.log("Detected battle. Now running away.", COLOR_PURPLE);
+            run_from_battle(stream, context);
+        }
+    }
+
+}
+
+// from the North Province (Area 3) pokecenter, move to start position for Happiny dust farming
+void move_to_start_position_for_letsgo1(
+    const ProgramInfo& info,
+    VideoStream& stream,
+    ProControllerContext& context
+){
+    // Orient camera to look at same direction as player character
+    // - This is needed because when save-load the game, 
+    // the camera angle is different than when just flying to pokecenter
+    pbf_press_button(context, BUTTON_L, 400ms, 320ms);
+
+    // move up towards pokecenter counter        
+    pbf_move_left_joystick(context, {0, -1}, 1440ms, 80ms);
+    // Orient camera to look at same direction as player character
+    pbf_press_button(context, BUTTON_L, 400ms, 320ms);
+    // look left
+    pbf_move_right_joystick(context, {-1, 0}, 960ms, 80ms);
+    // move toward clearing besides the pokecenter
+    pbf_move_left_joystick(context, {0, +1}, 2400ms, 80ms);
+
+    // look right, towards the start position.
+    // don't throw error if caught in unexpected battle
+    // instead, allow the battle detector that wraps the parent function to trigger.
+    DirectionDetector direction;
+    direction.change_direction(info, stream, context, 5.76, false);
+    
+
+    // pbf_move_right_joystick(context, {+1, 0}, 1040ms, 80ms);
+    pbf_move_left_joystick(context, {0, +1}, 80ms, 80ms);
+
+    // get on ride
+    pbf_press_button(context, BUTTON_PLUS, 400ms, 400ms);
+
+    // Jump
+    pbf_press_button(context, BUTTON_B, 1000ms, 240ms);
+
+    // Fly 
+    pbf_press_button(context, BUTTON_B, 400ms, 80ms);
+    pbf_press_button(context, BUTTON_B, 400ms, 400ms); // Double click in case of drop
+    pbf_press_button(context, BUTTON_LCLICK, 400ms, 0ms);
+
+    // you automatically move forward  when flying without pressing any buttons. 
+    // so, just wait.
+    pbf_wait(context, 17600ms);
+
+    // arrived at start position. stop flying
+    pbf_press_button(context, BUTTON_B, 400ms, 3200ms);
+    // get off ride
+    pbf_press_button(context, BUTTON_PLUS, 400ms, 400ms);
+
+    // extra B presses to ensure we stop flying, in case the previous B press
+    // was dropped. This way, you eventually reset back to Pokecenter, instead
+    // of flying until an exception is thrown.
+    pbf_press_button(context, BUTTON_B, 400ms, 80ms);
+    pbf_press_button(context, BUTTON_B, 400ms, 80ms);
+
+    // look right.
+    // don't throw error if caught in unexpected battle
+    // pbf_move_right_joystick(context, {+1, 0}, 160ms, 80ms);
+    direction.change_direction(info, stream, context, 5.3, false);
+
+    // move forward slightly
+    pbf_move_left_joystick(context, {0, +1}, 400ms, 80ms);
+
+    stream.log("Arrived at Let's go start position", COLOR_PURPLE);
+}
+
+
+// wait, then move forward quickly
+void lets_go_movement0(ProControllerContext& context){
+    pbf_wait(context, 4000ms);
+    pbf_move_left_joystick(context, {0, +1}, 1600ms, 80ms);
+}
+
+// wait, then move forward quickly, then wait some more.
+void lets_go_movement1(ProControllerContext& context){
+    pbf_wait(context, 4000ms);
+    pbf_move_left_joystick(context, {0, +1}, 800ms, 80ms);
+    pbf_wait(context, 800ms);
+}
+
+
+/*
+- One iteration of the hunt: 
+- start at North Province (Area 3) pokecenter, go out and use Let's Go to battle
+- move forward and send out lead pokemon to autobattle. When it runs out of pokemon to battle, 
+move forward again to repeat the cycle. It does this as many times as per num_forward_moves_per_lets_go_iteration.
+ */
+void run_lets_go_iteration(
+    VideoStream& stream,
+    ProControllerContext& context,
+    LetsGoEncounterBotTracker& encounter_tracker,
+    int num_forward_moves_per_lets_go_iteration
+){
+    // - Orient camera to look at same direction as player character
+    // - This is needed because when save-load the game, the camera points
+    // in the same direction as the player.
+    // - But when warping to pokecenter, the camera is facing the player.
+    pbf_press_button(context, BUTTON_L, 400ms, 320ms);
+
+    // zoom out camera
+    pbf_move_right_joystick(context, {0, -1}, 360ms, 80ms);
+
+    const bool throw_ball_if_bubble = false;
+    const int total_iterations = num_forward_moves_per_lets_go_iteration;
+
+    context.wait_for_all_requests();
+    for (int i = 0; i < total_iterations; i++){
+        use_lets_go_to_clear_in_front(stream, context, encounter_tracker, throw_ball_if_bubble, [&](ProControllerContext& context){
+            // Do the following movement while the Let's Go pokemon clearing wild pokemon.
+            stream.log("Move-forward iteration number: " + std::to_string(i + 1) + "/" + std::to_string(total_iterations), COLOR_PURPLE);
+
+            lets_go_movement1(context);
+        });
+    }
+
+}
+
+/* 
+- This function wraps around an action (e.g. leave the PokeCenter to make a sandwich) so that
+we can handle pokemon wild encounters when executing the action.
+  - note that returning to the PokeCenter is also wrapped, since it's possible to get caught
+  in a wild encounter when trying to return to the PokeCenter.
+- Whenever a battle happens, we run away and after the battle ends, move back to the PokeCenter
+- When `action` ends, go back to the PokeCenter.
+- i.e. return to Pokecenter regardless of whether the action succeeds or not.
+- NOTE: This works differently than `handle_battles_and_back_to_pokecenter` from the Scatterbug program,
+where the action will be attempted infinite times if you keep failing. In contrast, this function
+only gives you one attempt before returning to the Pokecenter
+*/
+void run_from_battles_and_back_to_pokecenter(
+    ProgramEnvironment& env,
+    VideoStream& stream,
+    ProControllerContext& context,
+    MaterialFarmerStats& stats,
+    std::function<
+        void(ProgramEnvironment& env,
+        VideoStream& stream,
+        ProControllerContext& context)
+    >&& action
+){
+    bool attempted_action = false;
+    // a flag for the case that the action has finished but not yet returned to pokecenter
+    bool returned_to_pokecenter = false;
+    while(returned_to_pokecenter == false){
+        NormalBattleMenuWatcher battle_menu(COLOR_RED);
+        int ret = run_until<ProControllerContext>(
+            stream, context,
+            [&](ProControllerContext& context){
+                if (!attempted_action){ // We still need to carry out `action`
+                    attempted_action = true;
+                    context.wait_for_all_requests();
+                    action(env, stream, context);
+                    context.wait_for_all_requests();                    
+                }
+
+                // we have already attempted the action,
+                // so reset to the Pokecenter
+                stream.log("Go back to PokeCenter.");
+                reset_to_pokecenter(env.program_info(), stream, context);
+                returned_to_pokecenter = true;
+            },
+            {battle_menu}
+        );
+        if (ret == 0){ // battle detected
+            stats.m_encounters++;
+            env.update_stats();
+            stream.log("Detected battle. Now running away.", COLOR_PURPLE);
+            stream.overlay().add_log("Detected battle. Now running away.");
+            try{
+                run_from_battle(stream, context);
+            }catch (OperationFailedExceptionWithScreenshot& e){
+                throw FatalProgramException(e.error_report_mode(), e.message(), e.video_stream(), e.screenshot());
+            }
+        }
+    } 
+}
+
+
+
+
+void move_from_material_farming_to_item_printer(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+    stream.log("Start moving from material farming to item printer.");
+    fly_from_paldea_to_blueberry_entrance(info, stream, context);
+    move_from_blueberry_entrance_to_league_club(info, stream, context);
+    move_from_league_club_entrance_to_item_printer(info, stream, context);
+}
+
+void fly_from_paldea_to_blueberry_entrance(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+    int numAttempts = 0;
+    const int maxAttempts = 11;
+    bool isFlySuccessful = false;
+
+    // in order to land on the target fly point semi-consistently, 
+    // the push magnitude can range from 69 to 85 (range of 16). 
+    // On each failure, try increasing/decreasing the push by 1/4 of the max range,
+    // then 1/2 of the range, then the full range, then back to re-attempts with no adjustment
+    const std::array<Milliseconds, maxAttempts + 1> adjustment_table = {
+        0ms, 0ms, 0ms, 32ms, -32ms, 64ms, -64ms, 128ms, -128ms, 0ms, 0ms, 0ms
+    };
+    while (!isFlySuccessful && numAttempts < maxAttempts){
+        // close all menus
+        pbf_mash_button(context, BUTTON_B, 800ms);
+
+        numAttempts++;
+
+        open_map_from_overworld(info, stream, context);
+
+        // change from Paldea map to Blueberry map
+        pbf_press_button(context, BUTTON_L, 400ms, 2400ms);
+
+        // move cursor to bottom right corner
+        pbf_move_left_joystick(context, {+1, -1}, 5000ms, 400ms);
+
+        // move cursor to Blueberry academy fast travel point (up-left)
+        // try different magnitudes of cursor push with each failure.
+//        int push_magnitude_ticks = 105 + adjustment_table[numAttempts];
+//        Milliseconds push_magnitude = push_magnitude_ticks * 8ms;
+        Milliseconds push_magnitude = 840ms + adjustment_table[numAttempts];
+        pbf_move_left_joystick(context, {-0.5, +0.5}, push_magnitude, 400ms);
+
+        // press A to fly to Blueberry academy
+        isFlySuccessful = fly_to_overworld_from_map(info, stream, context, true);
+        if (!isFlySuccessful){
+            stream.log("Failed to fly to Blueberry academy.");
+            // dump_snapshot(stream);
+        }
+    }
+
+    if (!isFlySuccessful){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "Failed to fly to Blueberry academy, five times in a row.",
+            stream
+        );
+    }
+}
+
+void move_from_blueberry_entrance_to_league_club(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+
+    int numAttempts = 0;
+    int maxAttempts = 5;
+    bool isSuccessful = false;
+
+    while (!isSuccessful && numAttempts < maxAttempts){
+        if (numAttempts > 0){ // failed at least once
+            pbf_mash_button(context, BUTTON_B, 800ms);
+            open_map_from_overworld(info, stream, context);
+            fly_to_overworld_from_map(info, stream, context, false);
+        }
+
+        numAttempts++;
+
+        // move toward entrance gates
+        pbf_move_left_joystick(context, {+0.488, +1}, 1600ms, 400ms);
+
+        context.wait_for_all_requests();
+
+        // Wait for detection of Blueberry navigation menu
+        ImageFloatBox select_entrance_box(0.031, 0.193, 0.047, 0.078);
+        GradientArrowWatcher select_entrance(COLOR_RED, GradientArrowType::RIGHT, select_entrance_box);
+        int ret = wait_until(stream, context, Milliseconds(5000), { select_entrance });
+        if (ret == 0){
+            stream.log("Blueberry navigation menu detected.");
+        }else{
+            stream.log("Failed to detect Blueberry navigation menu.");
+            continue;
+        }
+
+        // Move selector to League club room
+        pbf_press_dpad(context, DPAD_UP, 160ms, 400ms);
+
+        // Confirm to League club room is selected
+        ImageFloatBox select_league_club_box(0.038, 0.785, 0.043, 0.081);
+        GradientArrowWatcher select_league_club(COLOR_RED, GradientArrowType::RIGHT, select_league_club_box, Milliseconds(1000));
+        ret = wait_until(stream, context, Milliseconds(5000), { select_league_club });
+        if (ret == 0){
+            stream.log("League club room selected.");
+        }else{
+            stream.log("Failed to select League club room in navigation menu.");
+            continue;            
+        }
+        // press A
+        pbf_mash_button(context, BUTTON_A, 800ms);
+
+        // check for overworld
+        OverworldWatcher overworld(stream.logger(), COLOR_CYAN);
+        ret = wait_until(stream, context, Milliseconds(10000), { overworld });
+        if (ret == 0){
+            stream.log("Entered League club room.");
+        }else{
+            stream.log("Failed to enter League club room from menu selection.");
+            continue;            
+        }
+
+        isSuccessful = true;
+    }
+
+    if (!isSuccessful){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "Failed to enter League club room, five times in a row.",
+            stream
+        );
+    }
+
+}
+
+void move_from_league_club_entrance_to_item_printer(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+    context.wait_for_all_requests();
+
+    // move forwards towards table next to item printer
+    pbf_move_left_joystick(context, {-0.062, +1}, 1600ms, 400ms);
+
+    // look left towards item printer
+    pbf_move_left_joystick(context, {-1, 0}, 80ms, 400ms);
+}
+
+void move_from_item_printer_to_material_farming(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+    stream.log("Start moving from item printer to material farming.");
+    move_from_item_printer_to_blueberry_entrance(info, stream, context);
+    fly_from_blueberry_to_north_province_3(info, stream, context);
+}
+
+// assumes you start in the position in front of the item printer, as if you finished using it.
+void move_from_item_printer_to_blueberry_entrance(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+    context.wait_for_all_requests();
+
+    // look left towards door
+    pbf_move_left_joystick(context, {-1, 0}, 80ms, 400ms);
+
+    // re-orient camera to look same direction as player
+    pbf_press_button(context, BUTTON_L, 400ms, 400ms);
+
+    // move forward towards door
+    pbf_move_left_joystick(context, {0, +1}, 5600ms, 400ms);
+
+    context.wait_for_all_requests();
+
+    stream.log("Wait for detection of Blueberry navigation menu.");
+
+    // Wait for detection of Blueberry navigation menu
+    ImageFloatBox select_entrance_box(0.031, 0.193, 0.047, 0.078);
+    GradientArrowWatcher select_entrance(COLOR_RED, GradientArrowType::RIGHT, select_entrance_box);
+    int ret = wait_until(stream, context, Milliseconds(5000), { select_entrance }, Milliseconds(1000));
+    if (ret == 0){
+        stream.log("Blueberry navigation menu detected.");
+    }else{
+        stream.log("Failed to detect Blueberry navigation menu.");
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "Failed to find the exit from the League room.",
+            stream
+        );
+    }
+
+    // press A
+    pbf_mash_button(context, BUTTON_A, 800ms);
+
+    // check for overworld
+    OverworldWatcher overworld(stream.logger(), COLOR_CYAN);
+    ret = wait_until(stream, context, std::chrono::seconds(30), { overworld });
+    if (ret == 0){
+        stream.log("Overworld detected");
+    }else{
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "Failed to detect overworld.",
+            stream
+        );      
+    }
+}
+
+
+void fly_from_blueberry_to_north_province_3(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+    int numAttempts = 0;
+    const int maxAttempts = 11;
+    bool isFlySuccessful = false;
+
+    // in order to land on the target fly point, the push magnitude can range from
+    // 156 to 172 (range of 16). 
+    // On each failure, try increasing/decreasing the push by 1/4 of the max range,
+    // then 1/2 of the range, then the full range, then back to re-attempts with no adjustment
+    const std::array<int, maxAttempts + 1> adjustment_table =  {0, 0, 0, 4, -4, 8, -8, 16, -16, 0, 0, 0};
+    while (!isFlySuccessful && numAttempts < maxAttempts){
+        numAttempts++;
+
+        // close all menus
+        pbf_mash_button(context, BUTTON_B, 800ms);
+
+        open_map_from_overworld(info, stream, context);
+
+        // change from Blueberry map to Paldea map
+        pbf_press_button(context, BUTTON_R, 400ms, 2400ms);
+
+        // zoom out
+        pbf_press_button(context, BUTTON_ZL, 200ms, 1600ms);
+
+        // move cursor up-left
+        // try different magnitudes of cursor push with each failure.
+        int push_magnitude_ticks = 168 + adjustment_table[numAttempts];
+        Milliseconds push_magnitude = push_magnitude_ticks * 8ms;
+        pbf_move_left_joystick(context, {-0.125, +1}, push_magnitude, 400ms);
+
+        // press A to fly to North province area 3
+        isFlySuccessful = fly_to_overworld_from_map(info, stream, context, true);
+
+        if (!isFlySuccessful){
+            stream.log("Failed to fly to North province area 3.");
+            // dump_snapshot(console);
+        }
+    }
+
+    if (!isFlySuccessful){
+
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "Failed to fly to North province area 3, ten times in a row.",
+            stream
+        );
+
+    }
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_MaterialFarmerTools.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_MaterialFarmerTools.h
new file mode 100644
index 0000000000..e6921661cc
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_MaterialFarmerTools.h
@@ -0,0 +1,191 @@
+/*  Material Farmer - Happiny dust
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_MaterialFarmerTools_H
+#define PokemonAutomation_PokemonSV_MaterialFarmerTools_H
+
+#include <functional>
+#include "Common/Cpp/Options/FloatingPointOption.h"
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "CommonFramework/Notifications/EventNotificationOption.h"
+#include "CommonTools/Options/LanguageOCROption.h"
+#include "NintendoSwitch/NintendoSwitch_ConsoleHandle.h"
+#include "VideoGames/PokemonSV/Options/PokemonSV_SandwichMakerOption.h"
+#include "VideoGames/PokemonSV/Programs/ShinyHunting/PokemonSV_LetsGoTools.h"
+#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_LetsGoHpReader.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+struct MaterialFarmerStats : public LetsGoEncounterBotStats{
+    MaterialFarmerStats()
+        : m_sandwiches(m_stats["Sandwiches"])
+        , m_autoheals(m_stats["Auto Heals"])
+        , m_game_resets(m_stats["Game Resets"])
+        , m_errors(m_stats["Errors"])
+    {
+        m_display_order.insert(m_display_order.begin() + 2, {"Sandwiches", HIDDEN_IF_ZERO});
+        m_display_order.insert(m_display_order.begin() + 3, {"Auto Heals", HIDDEN_IF_ZERO});
+        m_display_order.insert(m_display_order.begin() + 4, {"Game Resets", HIDDEN_IF_ZERO});
+        m_display_order.insert(m_display_order.begin() + 5, {"Errors", HIDDEN_IF_ZERO});
+    }
+    std::atomic<uint64_t>& m_sandwiches;
+    std::atomic<uint64_t>& m_autoheals;
+    std::atomic<uint64_t>& m_game_resets;
+    std::atomic<uint64_t>& m_errors;
+};
+
+class MaterialFarmerOptions : public GroupOption, public ConfigOption::Listener{
+public:
+    ~MaterialFarmerOptions();
+    MaterialFarmerOptions(
+        GroupOption::EnableMode enable_mode,
+        OCR::LanguageOCROption* language_option,
+        EventNotificationOption& notif_status_update_option,
+        EventNotificationOption& notif_program_finish_option,
+        EventNotificationOption& notif_error_recoverable_option,
+        EventNotificationOption& notif_error_fatal_option
+    );
+    virtual void on_config_value_changed(void* object) override;
+
+private:
+    std::unique_ptr<OCR::LanguageOCROption> m_language_owner;
+
+public:
+    SimpleIntegerOption<uint16_t> RUN_TIME_IN_MINUTES;
+
+
+//    BooleanCheckBoxOption SAVE_GAME_BEFORE_SANDWICH;
+//    StaticTextOption SAVE_GAME_BEFORE_SANDWICH_STATIC_TEXT;
+
+//    StaticTextOption NUM_SANDWICH_ROUNDS_STATIC_TEXT;
+    
+    OCR::LanguageOCROption& LANGUAGE;
+    SandwichMakerOption SANDWICH_OPTIONS;
+    FloatingPointOption AUTO_HEAL_PERCENT;
+
+    // Debug options
+    SectionDividerOption m_advanced_options;
+    BooleanCheckBoxOption SAVE_DEBUG_VIDEO;
+    BooleanCheckBoxOption SKIP_WARP_TO_POKECENTER;
+//    BooleanCheckBoxOption ENABLE_SANDWICH;
+    SimpleIntegerOption<uint16_t> TIME_PER_SANDWICH;
+    SimpleIntegerOption<uint16_t> NUM_FORWARD_MOVES_PER_LETS_GO_ITERATION;
+
+    EventNotificationOption& NOTIFICATION_STATUS_UPDATE;
+    EventNotificationOption& NOTIFICATION_PROGRAM_FINISH;
+    EventNotificationOption& NOTIFICATION_ERROR_RECOVERABLE;
+    EventNotificationOption& NOTIFICATION_ERROR_FATAL;
+};
+
+
+
+void run_material_farmer(
+    ProgramEnvironment& env,
+    ConsoleHandle& console, ProControllerContext& context,
+    MaterialFarmerOptions& options,
+    MaterialFarmerStats& stats
+);
+
+void check_hp(
+    ProgramEnvironment& env,
+    VideoStream& stream,
+    ProControllerContext& context,
+    MaterialFarmerOptions& options,
+    LetsGoHpWatcher& hp_watcher,
+    MaterialFarmerStats& stats
+);
+
+WallClock make_sandwich_material_farm(
+    ProgramEnvironment& env, 
+    VideoStream& stream,
+    ProControllerContext& context, 
+    MaterialFarmerOptions& options,
+    MaterialFarmerStats& stats
+);        
+
+// do the given action
+// if encounters battle, run away and try the given action again
+// will re-attempt up to 5 times.
+void do_action_and_run_from_battle(
+    const ProgramInfo& info, 
+    VideoStream& stream,
+    ProControllerContext& context,
+    std::function<
+        void(const ProgramInfo& info, 
+        VideoStream& stream,
+        ProControllerContext& context)
+    >&& action
+);
+
+// same as do_action_and_run_from_battle, but will 
+// stop the action once the overworld disappears
+void do_action_and_run_from_battle2(
+    const ProgramInfo& info, 
+    VideoStream& stream,
+    ProControllerContext& context,
+    std::function<
+        void(const ProgramInfo& info, 
+        VideoStream& stream,
+        ProControllerContext& context)
+    >&& action
+);
+
+void move_to_start_position_for_letsgo0(VideoStream& stream, ProControllerContext& context);
+
+void move_to_start_position_for_letsgo1(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context);
+
+void lets_go_movement0(ProControllerContext& context);
+
+void lets_go_movement1(ProControllerContext& context);
+
+std::chrono::minutes minutes_remaining(WallClock start_time, std::chrono::minutes minutes_duration);
+
+void run_lets_go_iteration(
+    VideoStream& stream,
+    ProControllerContext& context,
+    LetsGoEncounterBotTracker& encounter_tracker,
+    int num_forward_moves_per_lets_go_iteration
+);
+
+void run_from_battles_and_back_to_pokecenter(
+    ProgramEnvironment& env, 
+    VideoStream& stream,
+    ProControllerContext& context,
+    MaterialFarmerStats& stats,
+    std::function<
+        void(ProgramEnvironment& env,
+        VideoStream& stream,
+        ProControllerContext& context)
+    >&& action
+);
+
+
+
+void move_from_material_farming_to_item_printer(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context);
+
+void fly_from_paldea_to_blueberry_entrance(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context);
+
+void move_from_blueberry_entrance_to_league_club(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context);
+
+void move_from_league_club_entrance_to_item_printer(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context);
+
+
+
+void move_from_item_printer_to_material_farming(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context);
+
+void move_from_item_printer_to_blueberry_entrance(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context);
+
+void fly_from_blueberry_to_north_province_3(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context);
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_TournamentFarmer.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_TournamentFarmer.cpp
new file mode 100644
index 0000000000..eb4bf5626e
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_TournamentFarmer.cpp
@@ -0,0 +1,815 @@
+/*  Tournament Farmer
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Logging/Logger.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonTools/Images/ImageFilter.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "CommonTools/VisualDetectors/BlackScreenDetector.h"
+#include "CommonTools/StartupChecks/VideoResolutionCheck.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonSV/Inference/PokemonSV_MoneyReader.h"
+#include "VideoGames/PokemonSV/Inference/Battles/PokemonSV_NormalBattleMenus.h"
+#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h"
+#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h"
+#include "VideoGames/PokemonSV/Inference/PokemonSV_TournamentPrizeNameReader.h"
+#include "VideoGames/PokemonSV/Resources/PokemonSV_TournamentPrizeNames.h"
+#include "PokemonSV_TournamentFarmer.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+using namespace Pokemon;
+
+TournamentFarmer_Descriptor::TournamentFarmer_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonSV:TournamentFarmer",
+        STRING_POKEMON + " SV", "Tournament Farmer",
+        "Programs/PokemonSV/TournamentFarmer.html",
+        "Farm the Academy Ace Tournament for money and prizes.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+struct TournamentFarmer_Descriptor::Stats : public StatsTracker{
+    Stats()
+        : tournaments(m_stats["Tournaments won"])
+        , battles(m_stats["Battles fought"])
+        , losses(m_stats["Losses"])
+        , money(m_stats["Money made"])
+        , matches(m_stats["Items matched"])
+        , errors(m_stats["Errors"])
+    {
+        m_display_order.emplace_back("Tournaments won");
+        m_display_order.emplace_back("Battles fought");
+        m_display_order.emplace_back("Losses");
+        m_display_order.emplace_back("Money made");
+        m_display_order.emplace_back("Items matched");
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+    }
+    std::atomic<uint64_t>& tournaments;
+    std::atomic<uint64_t>& battles;
+    std::atomic<uint64_t>& losses;
+    std::atomic<uint64_t>& money;
+    std::atomic<uint64_t>& matches;
+    std::atomic<uint64_t>& errors;
+};
+std::unique_ptr<StatsTracker> TournamentFarmer_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+
+TournamentFarmer::StopButton::StopButton()
+    : ButtonOption(
+      "<b>Stop after Current Tournament:",
+      "Stop after current Tournament",
+      0, 16
+    )
+{}
+void TournamentFarmer::StopButton::set_idle(){
+    this->set_enabled(false);
+    this->set_text("Stop after current Tournament");
+}
+void TournamentFarmer::StopButton::set_ready(){
+    this->set_enabled(true);
+    this->set_text("Stop after current Tournament");
+}
+void TournamentFarmer::StopButton::set_pressed(){
+    this->set_enabled(false);
+    this->set_text("Program will stop after current tournament...");
+}
+
+
+TournamentFarmer::~TournamentFarmer(){
+    STOP_AFTER_CURRENT.remove_listener(*this);
+}
+TournamentFarmer::TournamentFarmer()
+    : NUM_ROUNDS(
+        "<b>Number of Tournaments to run:",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        100, 0
+    )
+    , TRY_TO_TERASTILLIZE(
+        "<b>Use Terastillization:</b><br>Tera at the start of battle. Will take longer to complete each tournament but may be worth the attack boost.<br>This setting is not necessary if you are running a set specifically made to farm the tournament.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        false
+    )
+    , SAVE_NUM_ROUNDS(
+        "<b>Save every this many tournaments:</b><br>Zero disables saving. Will save win or lose.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        1, 0
+    )
+    , MONEY_LIMIT(
+        "<b>Stop after earning this amount of money:</b><br>Zero disables this check. Does not count losses. In-game maximum is 9,999,999. This can be set up to 999,999,999.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        9999999, 0, 999999999
+    )
+    , HHH_ZOROARK(
+        "<b>Happy Hour H-Zoroark:</b><br>Check this if you have an event Hisuian Zoroark with Happy Hour and Memento as your lead.<br>Happy Hour must be in its first move slot and Memento must be in its second.<br>",
+        LockMode::LOCK_WHILE_RUNNING,
+        false
+    )
+    , GO_HOME_WHEN_DONE(false)
+    , LANGUAGE(
+        "<b>Game Language:</b><br>The language is needed to read the prizes.",
+        TournamentPrizeNameReader::instance().languages(),
+        LockMode::LOCK_WHILE_RUNNING,
+        true
+    )
+    , TARGET_ITEMS("<b>Items:</b>")
+    , NOTIFICATION_PRIZE_MATCH("Matching Prize", true, false, ImageAttachmentMode::JPG, { "Notifs" })
+    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_PRIZE_MATCH,
+        &NOTIFICATION_STATUS_UPDATE,
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+    , m_stop_after_current(false)
+{
+    PA_ADD_OPTION(STOP_AFTER_CURRENT);
+    PA_ADD_OPTION(NUM_ROUNDS);
+    PA_ADD_OPTION(TRY_TO_TERASTILLIZE);
+    PA_ADD_OPTION(SAVE_NUM_ROUNDS);
+    PA_ADD_OPTION(MONEY_LIMIT);
+    PA_ADD_OPTION(HHH_ZOROARK);
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+    PA_ADD_OPTION(LANGUAGE);
+    PA_ADD_OPTION(TARGET_ITEMS);
+    PA_ADD_OPTION(NOTIFICATIONS);
+
+    STOP_AFTER_CURRENT.set_idle();
+    STOP_AFTER_CURRENT.add_listener(*this);
+}
+
+void TournamentFarmer::on_press(ButtonCell& button){
+    global_logger_tagged().log("Stop after current requested...");
+    m_stop_after_current.store(true, std::memory_order_relaxed);
+    STOP_AFTER_CURRENT.set_pressed();
+}
+
+//Check and process the amount of money earned at the end of a battle
+void TournamentFarmer::check_money(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    TournamentFarmer_Descriptor::Stats& stats = env.current_stats<TournamentFarmer_Descriptor::Stats>();
+
+    int top_money = -1;
+    int bottom_money = -1;
+
+    //There must be a value for top money
+    //Bottom money only appear after 1st battle and should clear out
+    for (uint16_t c = 0; c < 3 && top_money == -1; c++){
+        VideoSnapshot screen = env.console.video().snapshot();
+        ImageFloatBox top_notif(0.745, 0.152, 0.206, 0.083);
+        ImageFloatBox bottom_notif(0.745, 0.261, 0.220, 0.083);
+
+        ImageRGB32 image_top = to_blackwhite_rgb32_range(
+            extract_box_reference(screen, top_notif),
+            true,
+            combine_rgb(215, 215, 215), combine_rgb(255, 255, 255)
+        );
+        //image_top.save("./image_top.png");
+
+        //Different color range on the bottom notif ~B0B5B8
+        ImageRGB32 image_bottom = to_blackwhite_rgb32_range(
+            extract_box_reference(screen, bottom_notif),
+            true,
+            combine_rgb(130, 130, 130), combine_rgb(240, 240, 240)
+        );
+        //image_bottom.save("./image_bottom.png");
+        
+        top_money = OCR::read_money(env.console, image_top);
+        bottom_money = OCR::read_money(env.console, image_bottom);
+
+        //dump_image(
+        //    env.console, env.program_info(),
+        //    "battledone",
+        //    screen
+        //);
+
+        //Filter out low and high numbers in case of misreads
+        //From bulbapedia: Nemona is lowest at 8640,  Penny and Geeta are highest at 16800
+        //Max earnings? in one battle: happy hour * amulet coin * (base winnings + (8 * make it rain lv100))
+        if (top_money < 8000 || top_money > 80000 ){
+            top_money = -1;
+        }
+        if (bottom_money < 8000 || bottom_money > 80000){
+            bottom_money = -1;
+        }
+    }
+
+    if (top_money != -1){
+        //If both notification boxes appear take the newer one.
+        if (bottom_money != -1){
+            stats.money += bottom_money;
+            env.update_stats();
+        }else{
+            stats.money += top_money;
+            env.update_stats();
+        }
+    }else{
+        env.log("Unable to read money.");
+    }
+
+}
+
+
+//Handle a single battle by mashing A until AdvanceDialog (end of battle) is detected
+void TournamentFarmer::run_battle(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    TournamentFarmer_Descriptor::Stats& stats = env.current_stats<TournamentFarmer_Descriptor::Stats>();
+
+    //Only applies if the player has The Hidden Treasure of Area Zero Hisuian Zoroark
+    if (HHH_ZOROARK){
+        env.log("Zoroark option checked.");
+        
+        //Use happy hour
+        env.log("Using Happy Hour.");
+        pbf_mash_button(context, BUTTON_A, 2400ms);
+        context.wait_for_all_requests();
+
+        //If not already dead, use memento and die
+        NormalBattleMenuWatcher memento(COLOR_RED);
+        MoveSelectDetector move_select(COLOR_BLUE);
+        SwapMenuWatcher fainted(COLOR_YELLOW);
+        int retZ = wait_until(
+            env.console, context,
+            std::chrono::seconds(60),
+            { memento, fainted }
+        );
+        if (retZ == 0){
+            env.log("Using Memento to faint.");
+            pbf_press_button(context, BUTTON_A, 80ms, 400ms);
+            move_select.move_to_slot(env.console, context, 1);
+            pbf_press_button(context, BUTTON_A, 80ms, 400ms);
+            pbf_wait(context, 800ms);
+            context.wait_for_all_requests();
+
+            pbf_press_dpad(context, DPAD_DOWN, 80ms, 400ms);
+            pbf_press_button(context, BUTTON_A, 80ms, 400ms);
+            context.wait_for_all_requests();
+
+            //Try six times, in case of paralysis (only applies to Pachirisu's Nuzzle) preventing use of Memento.
+            int retF = run_until<ProControllerContext>(
+                env.console, context,
+                [&](ProControllerContext& context){
+                    for (size_t c = 0; c < 6; c++){
+                        NormalBattleMenuWatcher battle_memento(COLOR_RED);
+                        int ret_memento = wait_until(
+                            env.console, context,
+                            std::chrono::seconds(60),
+                            { battle_memento }
+                        );
+                        if (ret_memento == 0){
+                            env.log("Attempting to use Memento.");
+                            pbf_mash_button(context, BUTTON_A, 2400ms);
+                            context.wait_for_all_requests();
+                        }
+                    }
+                },
+                { fainted }
+            );
+
+            if (retF == 0){
+                env.log("Swap menu detected.");
+            }else{
+                env.log("Took more than 6 turns to use Memento. Was Zoroark able to faint?", COLOR_RED);
+                stats.errors++;
+                env.update_stats();
+                send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
+                OperationFailedExceptionWithScreenshot::fire(
+                    ErrorReportMode::SEND_ERROR_REPORT,
+                    "Took more than 6 turns to use Memento. Was Zoroark able to faint?",
+                    env.console
+                );
+            }
+
+        }else if (retZ == 1){
+            env.log("Detected swap menu. Assuming Zoroark fainted turn one.");
+        }else{
+            env.log("Timed out after Happy Hour.", COLOR_RED);
+            stats.errors++;
+            env.update_stats();
+            send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "Timed out after Happy Hour.",
+                env.console
+            );
+        }
+
+        //Select 2nd pokemon from swap menu and send it out
+        fainted.move_to_slot(env.console, context, 1);
+        pbf_mash_button(context, BUTTON_A, 2400ms);
+        context.wait_for_all_requests();
+
+        //Check for battle menu to ensure it's sent out
+        NormalBattleMenuWatcher resume_battle(COLOR_RED);
+        int retRes = wait_until(
+            env.console, context,
+            std::chrono::seconds(60),
+            { resume_battle }
+        );
+        if (retRes == 0){
+            env.log("Battle menu detected. Second Pokemon has been sent out. Resuming usual battle sequence.");
+        }else{
+            env.log("Could not find battle menu.", COLOR_RED);
+            stats.errors++;
+            env.update_stats();
+            send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "Could not find battle menu.",
+                env.console
+            );
+        }
+
+    }
+
+    //Assuming the player has a charged orb
+    if (TRY_TO_TERASTILLIZE){
+        env.log("Attempting to terastillize.");
+        //Open move menu
+        pbf_press_button(context, BUTTON_A, 80ms, 400ms);
+        pbf_wait(context, 800ms);
+        context.wait_for_all_requests();
+
+        pbf_press_button(context, BUTTON_R, 160ms, 400ms);
+        pbf_press_button(context, BUTTON_A, 80ms, 400ms);
+    }
+
+    //Mash A until battle finished
+    AdvanceDialogWatcher end_of_battle(COLOR_YELLOW);
+    WallClock start = current_time();
+    uint8_t switch_party_slot = HHH_ZOROARK ? 2: 1;
+    int ret_black = run_until<ProControllerContext>(
+        env.console, context,
+        [&](ProControllerContext& context){
+            for (size_t c = 0; c < 30; c++){ //Sylveon build has 16 PP at max, and Chi-Yu build has 24.
+                if (current_time() - start > std::chrono::minutes(5)){
+                    env.log("Timed out during battle after 5 minutes.", COLOR_RED);
+                    stats.errors++;
+                    env.update_stats();
+                    send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
+                    OperationFailedExceptionWithScreenshot::fire(
+                        ErrorReportMode::SEND_ERROR_REPORT,
+                        "Timed out during battle after 5 minutes.",
+                        env.console
+                    );
+                }
+
+                GradientArrowWatcher switch_pokemon(COLOR_BLUE, GradientArrowType::RIGHT, {0.50, 0.40, 0.20, 0.30});
+                NormalBattleMenuWatcher battle_menu(COLOR_YELLOW);
+                MoveSelectWatcher move_select(COLOR_GREEN);
+                SwapMenuWatcher fainted(COLOR_RED);
+                context.wait_for_all_requests();
+
+                int ret = wait_until(
+                    env.console, context,
+                    std::chrono::seconds(90), //Tera takes ~25 to 30 seconds each, slightly over 60 seconds if both player and opponent uses in the same turn
+                    {
+                        switch_pokemon,
+                        battle_menu,
+                        move_select,
+                        fainted,
+                    }   //End of battle from tera'd ace takes longer, 45 seconds was not enough
+                );
+                switch (ret){
+                case 0:
+                    env.log("Detected switch " + STRING_POKEMON + " prompt. Pressing B to not switch...");
+                    pbf_mash_button(context, BUTTON_B, 3000ms);
+                    break;
+                case 1:
+                    env.log("Detected battle menu. Pressing A to attack...");
+                    pbf_mash_button(context, BUTTON_A, 3000ms);
+                    break;
+                case 2:
+                    env.log("Detected move selection. Pressing A to attack...");
+                    pbf_mash_button(context, BUTTON_A, 3000ms);
+                    break;
+                case 3:
+                    // Since we can't run from the tournament, loop through all party Pokemon spamming their first move.
+                    env.log("Detected fainted " + STRING_POKEMON + ". Switching to next living " + STRING_POKEMON + "...");
+                    if (fainted.move_to_slot(env.console, context, switch_party_slot)){
+                        pbf_mash_button(context, BUTTON_A, 3000ms);
+                        switch_party_slot++;
+                    }
+                    break;
+                default:
+                    env.log("Timed out during battle. Stuck, crashed, or took more than 90 seconds for a turn.", COLOR_RED);
+                    stats.errors++;
+                    env.update_stats();
+                    OperationFailedExceptionWithScreenshot::fire(
+                        ErrorReportMode::SEND_ERROR_REPORT,
+                        "Timed out during battle. Stuck, crashed, or took more than 90 seconds for a turn.",
+                        env.console
+                    );
+                }
+            }
+        },
+        { end_of_battle }
+        );
+    if (ret_black == 0){
+        env.log("Battle finished."); //Cannot tell if win or loss.
+        stats.battles++;
+        env.update_stats();
+        send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
+
+        //Close dialog and then check money
+        pbf_press_button(context, BUTTON_B, 80ms, 400ms);
+        pbf_wait(context, 800ms);
+        context.wait_for_all_requests();
+
+        check_money(env, context);
+
+        //Clear any remaining dialog
+        pbf_mash_button(context, BUTTON_B, 2400ms);
+        context.wait_for_all_requests();
+    }else{
+        env.log("Timed out during battle. Stuck, crashed, or took over 30 turns.", COLOR_RED);
+        stats.errors++;
+        env.update_stats();
+        send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "Timed out during battle. Stuck, crashed, or took over 30 turns.",
+            env.console
+        );
+    }
+    context.wait_for_all_requests();
+}
+
+
+//Check prize and notify if it matches filters after a tournament win
+void TournamentFarmer::check_prize(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    TournamentFarmer_Descriptor::Stats& stats = env.current_stats<TournamentFarmer_Descriptor::Stats>();
+
+    VideoSnapshot screen = env.console.video().snapshot();
+    ImageFloatBox dialog_box(0.259, 0.734, 0.484, 0.158);
+    ImageViewRGB32 dialog_image = extract_box_reference(screen, dialog_box);
+
+    //bool replace_color_within_range = false;
+    //ImageRGB32 dialog_filtered = filter_rgb32_range(
+    //    extract_box_reference(screen, dialog_box),
+    //    combine_rgb(50, 135, 162), combine_rgb(167, 244, 255), Color(0), replace_color_within_range
+    //);
+    //dialog_filtered.save("./dialog_image.png");
+
+    const double LOG10P_THRESHOLD = -1.5;
+    OCR::StringMatchResult result = PokemonSV::TournamentPrizeNameReader::instance().read_substring(
+        env.console, LANGUAGE, dialog_image,
+        OCR::BLUE_TEXT_FILTERS()
+    );
+    result.clear_beyond_log10p(LOG10P_THRESHOLD);
+    if (result.results.empty()){
+        env.log("No matching prize name found in dialog box.");
+        send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
+    }
+    for (const auto& r : result.results){
+        env.console.log("Found prize: " + r.second.token);
+        if (TARGET_ITEMS.find_item(r.second.token)){
+            env.log("Prize matched");
+
+            stats.matches++;
+            env.update_stats();
+
+            send_program_notification(
+                env, NOTIFICATION_PRIZE_MATCH,
+                COLOR_GREEN, "Prize matched",
+                {
+                    { "Item:", get_tournament_prize_name(r.second.token).display_name() },
+                }
+            , "", screen);
+            break;
+        }
+    }
+}
+
+
+//Tournament won and over
+void TournamentFarmer::handle_end_of_tournament(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    TournamentFarmer_Descriptor::Stats& stats = env.current_stats<TournamentFarmer_Descriptor::Stats>();
+
+    //Space out the black screen detection after the "champion" battle
+    //pbf_wait(context, 700);
+    //context.wait_for_all_requests();
+
+    //One more black screen when done to load the academy
+    BlackScreenOverWatcher black_screen(COLOR_RED, { 0.2, 0.2, 0.6, 0.6 });
+    int ret_black_won = run_until<ProControllerContext>(
+        env.console, context,
+        [](ProControllerContext& context){
+            pbf_mash_button(context, BUTTON_B, 80000ms);
+        },
+        { black_screen }
+        );
+    if (ret_black_won == 0){
+        env.log("Tournament complete, waiting for academy.");
+    }
+    context.wait_for_all_requests();
+
+    //Wait for congrats dialog - wait an extra bit since the dialog appears while still loading in
+    AdvanceDialogWatcher advance_detector(COLOR_YELLOW);
+    int ret_dialog = wait_until(env.console, context, Milliseconds(1000), { advance_detector });
+    if (ret_dialog == 0){
+        env.log("Dialog detected.");
+    }
+    pbf_wait(context, 2400ms);
+    context.wait_for_all_requests();
+
+    //Next dialog is prize dialog - wait until all dialog has appeared then check prize
+    pbf_press_button(context, BUTTON_A, 80ms, 800ms);
+    pbf_wait(context, 800ms);
+    context.wait_for_all_requests();
+
+    check_prize(env, context);
+
+    //Clear remaining dialog
+    OverworldWatcher overworld(env.console, COLOR_CYAN);
+    int ret_over = run_until<ProControllerContext>(
+        env.console, context,
+        [](ProControllerContext& context){
+            pbf_mash_button(context, BUTTON_B, 5600ms);
+        },
+        { overworld }
+        );
+    if (ret_over != 0){
+        env.console.log("Failed to detect overworld.", COLOR_RED);
+    }
+    context.wait_for_all_requests();
+
+    stats.tournaments++;
+    env.update_stats();
+    send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
+}
+
+
+//Fly to academy from west pokemon center after losing.
+void return_to_academy_after_loss(
+    ProgramEnvironment& env,
+    VideoStream& stream,
+    ProControllerContext& context
+){
+    env.log("Tournament lost! Navigating back to academy.");
+    go_to_academy_fly_point(env, stream, context);
+
+
+    pbf_wait(context, 800ms);
+    context.wait_for_all_requests();
+
+    env.log("At academy fly point. Heading back to doors.");
+    pbf_move_left_joystick(context, {-1, 0}, 64ms, 0ms);
+    pbf_press_button(context, BUTTON_L, 400ms, 320ms);
+    pbf_press_button(context, BUTTON_PLUS, 400ms, 320ms);
+    pbf_press_button(context, BUTTON_B, 400ms, 320ms); //Trying to jump/glide over npc spawns
+    pbf_press_button(context, BUTTON_B, 400ms, 320ms);
+    pbf_move_left_joystick(context, {0, +1}, 4000ms, 0ms);
+    pbf_press_button(context, BUTTON_B, 400ms, 320ms);
+    pbf_press_button(context, BUTTON_B, 400ms, 320ms);
+
+    BlackScreenOverWatcher black_screen(COLOR_RED, { 0.2, 0.2, 0.6, 0.6 });
+    int ret_black_lost = run_until<ProControllerContext>(
+        stream, context,
+        [](ProControllerContext& context){
+            pbf_move_left_joystick(context, {0, +1}, 40000ms, 0ms);
+        },
+        { black_screen }
+        );
+    context.wait_for_all_requests();
+    if (ret_black_lost == 0){
+        env.log("Black screen detected.");
+    }
+
+    //Wait for academy to load.
+    OverworldWatcher overworld(stream.logger(), COLOR_CYAN);
+    int ret_academy = wait_until(stream, context, Milliseconds(4000), { overworld });
+    if (ret_academy == 0){
+        env.log("Entered academy. Walking to tournament entry.");
+    }
+    context.wait_for_all_requests();
+
+    //Move to tournament entry
+    pbf_move_left_joystick(context, {0, +1}, 4000ms, 0ms);
+    pbf_move_left_joystick(context, {-1, 0}, 800ms, 0ms);
+    pbf_move_left_joystick(context, {+1, +1}, 800ms, 0ms);
+    context.wait_for_all_requests();
+}
+
+void go_to_academy_fly_point(ProgramEnvironment& env, VideoStream& stream, ProControllerContext& context){
+    int numAttempts = 0;
+    int maxAttempts = 5;
+
+    bool isFlySuccessful = false;
+
+    while (!isFlySuccessful && numAttempts < maxAttempts ){
+        open_map_from_overworld(env.program_info(), stream, context);
+        pbf_press_button(context, BUTTON_ZR, 400ms, 320ms);
+        pbf_move_left_joystick(context, {+0.567, +1}, 376ms, 200ms);
+        // pbf_move_left_joystick(context, 187, 0, 400ms, 0ms);
+        numAttempts++;
+        isFlySuccessful = fly_to_overworld_from_map(env.program_info(), stream, context, true);
+        if (!isFlySuccessful){
+            env.log("Unsuccessful fly attempt.");
+        }
+        pbf_mash_button(context, BUTTON_B, 800ms);
+    }
+
+    if(!isFlySuccessful){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "Failed to fly back to academy!",
+            stream
+        );
+    }
+
+}
+
+
+
+class TournamentFarmer::ResetOnExit{
+public:
+    ResetOnExit(StopButton& button)
+        : m_button(button)
+    {}
+    ~ResetOnExit(){
+        m_button.set_idle();
+    }
+
+private:
+    StopButton& m_button;
+};
+
+
+
+void TournamentFarmer::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    assert_16_9_720p_min(env.logger(), env.console);
+    TournamentFarmer_Descriptor::Stats& stats = env.current_stats<TournamentFarmer_Descriptor::Stats>();
+
+    //  Connect the controller.
+    require_player(env.console, context, BUTTON_LCLICK);
+
+    m_stop_after_current.store(false, std::memory_order_relaxed);
+    STOP_AFTER_CURRENT.set_ready();
+    ResetOnExit reset_button_on_exit(STOP_AFTER_CURRENT);
+
+    /*
+    Preconditions:
+    Last Pokemon Center visited is Mesagzoa West
+    Sylveon only farming build - ideally with fairy tera
+    stand in front of tournament entry man
+    Ride legendary is not the solo pokemon (in case of loss)
+    Do not have other notifications on screen for money reading (ex. new outbreak)
+
+    Possible improvements to make:
+    find prize sprites - some code is there, just disabled
+    find translations for tera shards
+    other languages: make sure "bottle cap" isn't misread as "bottle of PP Up"
+    */
+
+    for (uint32_t c = 0; c < NUM_ROUNDS; c++){
+        if (m_stop_after_current.load(std::memory_order_relaxed)){
+            break;
+        }
+
+        env.log("Tournament loop started.");
+
+        //  Initiate dialog then mash until first battle starts
+        AdvanceDialogWatcher advance_detector(COLOR_YELLOW);
+        pbf_press_button(context, BUTTON_A, 80ms, 400ms);
+        pbf_press_button(context, BUTTON_A, 80ms, 400ms);
+        int ret = wait_until(env.console, context, Milliseconds(7000), { advance_detector });
+        if (ret == 0){
+            env.log("Dialog detected.");
+        }else{
+            env.log("Dialog not detected.");
+        }
+        pbf_mash_button(context, BUTTON_A, 3200ms);
+        context.wait_for_all_requests();
+
+        NormalBattleMenuWatcher battle_menu(COLOR_YELLOW);
+        int ret_battle = run_until<ProControllerContext>(
+            env.console, context,
+            [](ProControllerContext& context){
+                pbf_mash_button(context, BUTTON_B, 80000ms); //it takes a while to load and start
+            },
+            { battle_menu }
+        );
+        if (ret_battle != 0){
+            env.console.log("Failed to detect battle start!", COLOR_RED);
+        }
+        context.wait_for_all_requests();
+
+        bool battle_lost = false;
+        for (uint16_t battles = 0; battles < 4; battles++){
+            NormalBattleMenuWatcher battle_menu2(COLOR_YELLOW); //Next battle started
+            OverworldWatcher overworld(env.console, COLOR_CYAN); //Previous battle was lost
+            int ret_battle2 = run_until<ProControllerContext>(
+                env.console, context,
+                [](ProControllerContext& context){
+                    pbf_mash_button(context, BUTTON_B, 120000ms);
+                },
+                { battle_menu2, overworld }
+            );
+            context.wait_for_all_requests();
+
+            switch (ret_battle2){
+            case 0:
+                env.log("Detected battle menu.");
+                run_battle(env, context);
+                break;
+            case 1:
+                env.log("Detected overworld.");
+                battle_lost = true;
+                stats.losses++;
+                env.update_stats();
+                send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
+                break;
+            default:
+                env.log("Failed to detect battle menu or dialog prompt!");
+                stats.errors++;
+                env.update_stats();
+                send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
+                OperationFailedExceptionWithScreenshot::fire(
+                    ErrorReportMode::SEND_ERROR_REPORT,
+                    "Failed to detect battle menu or dialog prompt!",
+                    env.console
+                );
+                break;
+            }
+
+            //If this is the last battle in the tournament check for overworld in case player lost
+            if (battles == 3){
+                env.log("Final battle of the tournament complete, checking for overworld/loss.");
+
+                //Clear dialog, mash B
+                pbf_mash_button(context, BUTTON_B, 3200ms);
+                context.wait_for_all_requests();
+
+                OverworldWatcher overworld2(env.console, COLOR_RED);
+                int ret_lost_final = wait_until(
+                    env.console, context,
+                    std::chrono::seconds(3),
+                    { overworld2 }
+                );
+                switch (ret_lost_final){
+                case 0:
+                    env.log("Final battle of the tournament lost.");
+                    battle_lost = true;
+                    stats.losses++;
+                    env.update_stats();
+                    send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
+                    break;
+                default:
+                    env.log("Final battle of the tournament won.");
+                    break;
+                }
+            }
+
+            if (battle_lost){
+                return_to_academy_after_loss(env, env.console, context);
+                break;
+            }
+        }
+
+        //Tournament won
+        if (!battle_lost){
+            handle_end_of_tournament(env, context);
+        }
+
+        env.log("Tournament loop complete.");
+
+        //Save the game if option is set
+        uint16_t num_rounds_temp = SAVE_NUM_ROUNDS;
+        if (num_rounds_temp != 0 && ((c + 1) % num_rounds_temp) == 0){
+            env.log("Saving game.");
+            save_game_from_overworld(env.program_info(), env.console, context);
+        }
+
+        //Break loop and finish program if money limit is hit
+        uint32_t earnings_temp = MONEY_LIMIT;
+        if (earnings_temp != 0 && stats.money >= earnings_temp){
+            env.log("Money limit hit. Ending program.");
+            break;
+        }
+    }
+
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+    GO_HOME_WHEN_DONE.run_end_of_program(context);
+}
+
+}
+}
+}
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_TournamentFarmer.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_TournamentFarmer.h
new file mode 100644
index 0000000000..44acb31bb5
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_TournamentFarmer.h
@@ -0,0 +1,89 @@
+/*  Tournament Farmer
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_TournamentFarmer_H
+#define PokemonAutomation_PokemonSwSh_TournamentFarmer_H
+
+#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "Common/Cpp/Options/ButtonOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "CommonTools/Options/LanguageOCROption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+#include "VideoGames/PokemonSV/Options/PokemonSV_TournamentPrizeTable.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+void return_to_academy_after_loss(
+    ProgramEnvironment& env,
+    VideoStream& stream,
+    ProControllerContext& context
+);
+
+// attempt to fly back to academy fly point from the West Mesogoza Pokecenter. Will attempt maxAttempts times.
+void go_to_academy_fly_point(
+    ProgramEnvironment& env,
+    VideoStream& stream,
+    ProControllerContext& context
+);
+
+class TournamentFarmer_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    TournamentFarmer_Descriptor();
+    struct Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+class TournamentFarmer : public SingleSwitchProgramInstance, public ButtonListener{
+public:
+    using Descriptor = TournamentFarmer_Descriptor;
+    ~TournamentFarmer();
+    TournamentFarmer();
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+    virtual void on_press(ButtonCell& button) override;
+
+private:
+    class StopButton : public ButtonOption{
+    public:
+        StopButton();
+        void set_idle();
+        void set_ready();
+        void set_pressed();
+    };
+    class ResetOnExit;
+
+    StopButton STOP_AFTER_CURRENT;
+    SimpleIntegerOption<uint32_t> NUM_ROUNDS;
+    BooleanCheckBoxOption TRY_TO_TERASTILLIZE;
+    SimpleIntegerOption<uint16_t> SAVE_NUM_ROUNDS;
+    SimpleIntegerOption<uint32_t> MONEY_LIMIT;
+    BooleanCheckBoxOption HHH_ZOROARK;
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
+    OCR::LanguageOCROption LANGUAGE;
+    TournamentPrizeTable TARGET_ITEMS;
+    EventNotificationOption NOTIFICATION_PRIZE_MATCH;
+    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
+    EventNotificationsOption NOTIFICATIONS;
+
+    std::atomic<bool> m_stop_after_current;
+
+    void check_money(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+    void run_battle(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+    void check_prize(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+    void handle_end_of_tournament(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+};
+
+}
+}
+}
+#endif
+
+
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_TournamentFarmer2.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_TournamentFarmer2.cpp
new file mode 100644
index 0000000000..06c0f1f8da
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_TournamentFarmer2.cpp
@@ -0,0 +1,339 @@
+/*  Tournament Farmer 2
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Logging/Logger.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "CommonTools/StartupChecks/VideoResolutionCheck.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h"
+#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h"
+#include "VideoGames/PokemonSV/Inference/Battles/PokemonSV_NormalBattleMenus.h"
+#include "VideoGames/PokemonSV/Inference/Map/PokemonSV_FastTravelDetector.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h"
+#include "VideoGames/PokemonSV/Programs/Battles/PokemonSV_SinglesBattler.h"
+#include "PokemonSV_TournamentFarmer.h"
+#include "PokemonSV_TournamentFarmer2.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+using namespace Pokemon;
+
+TournamentFarmer2_Descriptor::TournamentFarmer2_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonSV:TournamentFarmer2",
+        STRING_POKEMON + " SV", "Tournament Farmer 2",
+        "Programs/PokemonSV/TournamentFarmer2.html",
+        "Farm the Academy Ace Tournament for money and prizes. (version 2)",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+struct TournamentFarmer2_Descriptor::Stats : public StatsTracker{
+    Stats()
+        : tournaments(m_stats["Tournaments"])
+        , battles(m_stats["Battles Fought"])
+        , wins(m_stats["Wins"])
+        , losses(m_stats["Losses"])
+//        , money(m_stats["Money Made"])
+//        , matches(m_stats["Items Matched"])
+        , errors(m_stats["Errors"])
+    {
+        m_display_order.emplace_back("Tournaments");
+        m_display_order.emplace_back("Battles Fought");
+        m_display_order.emplace_back("Wins");
+        m_display_order.emplace_back("Losses");
+//        m_display_order.emplace_back("Money Made");
+//        m_display_order.emplace_back("Items Matched");
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+    }
+    std::atomic<uint64_t>& tournaments;
+    std::atomic<uint64_t>& battles;
+    std::atomic<uint64_t>& wins;
+    std::atomic<uint64_t>& losses;
+//    std::atomic<uint64_t>& money;
+//    std::atomic<uint64_t>& matches;
+    std::atomic<uint64_t>& errors;
+};
+std::unique_ptr<StatsTracker> TournamentFarmer2_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+
+TournamentFarmer2::StopButton::StopButton()
+    : ButtonOption(
+      "<b>Stop after Current Tournament:",
+      "Stop after current Tournament",
+      0, 16
+    )
+{}
+void TournamentFarmer2::StopButton::set_idle(){
+    this->set_enabled(false);
+    this->set_text("Stop after current Tournament");
+}
+void TournamentFarmer2::StopButton::set_ready(){
+    this->set_enabled(true);
+    this->set_text("Stop after current Tournament");
+}
+void TournamentFarmer2::StopButton::set_pressed(){
+    this->set_enabled(false);
+    this->set_text("Program will stop after current tournament...");
+}
+
+
+TournamentFarmer2::~TournamentFarmer2(){
+    STOP_AFTER_CURRENT.remove_listener(*this);
+}
+TournamentFarmer2::TournamentFarmer2()
+    : NUM_ROUNDS(
+        "<b>Number of Tournaments to run:",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        100, 0
+    )
+    , SAVE_NUM_ROUNDS(
+        "<b>Save every this many tournaments:</b><br>Zero disables saving. Will save win or lose.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        1, 0
+    )
+    , BATTLE_AI(true, GroupOption::EnableMode::ALWAYS_ENABLED)
+    , GO_HOME_WHEN_DONE(false)
+    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_STATUS_UPDATE,
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+    , m_stop_after_current(false)
+{
+    PA_ADD_OPTION(STOP_AFTER_CURRENT);
+    PA_ADD_OPTION(NUM_ROUNDS);
+    PA_ADD_OPTION(SAVE_NUM_ROUNDS);
+    PA_ADD_OPTION(BATTLE_AI);
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+    PA_ADD_OPTION(NOTIFICATIONS);
+
+    STOP_AFTER_CURRENT.set_idle();
+    STOP_AFTER_CURRENT.add_listener(*this);
+}
+
+void TournamentFarmer2::on_press(ButtonCell& button){
+    global_logger_tagged().log("Stop after current requested...");
+    m_stop_after_current.store(true, std::memory_order_relaxed);
+    STOP_AFTER_CURRENT.set_pressed();
+}
+
+
+
+class TournamentFarmer2::ResetOnExit{
+public:
+    ResetOnExit(StopButton& button)
+        : m_button(button)
+    {}
+    ~ResetOnExit(){
+        m_button.set_idle();
+    }
+
+private:
+    StopButton& m_button;
+};
+
+
+
+void TournamentFarmer2::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    assert_16_9_720p_min(env.logger(), env.console);
+    TournamentFarmer2_Descriptor::Stats& stats = env.current_stats<TournamentFarmer2_Descriptor::Stats>();
+
+    //  Connect the controller.
+    require_player(env.console, context, BUTTON_LCLICK);
+
+    m_stop_after_current.store(false, std::memory_order_relaxed);
+    STOP_AFTER_CURRENT.set_ready();
+    ResetOnExit reset_button_on_exit(STOP_AFTER_CURRENT);
+
+
+    for (uint32_t c = 0; c < NUM_ROUNDS; c++){
+        if (m_stop_after_current.load(std::memory_order_relaxed)){
+            break;
+        }
+
+        env.log("Tournament loop started.");
+        send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
+
+        //  Initiate dialog then mash until first battle starts
+        {
+            AdvanceDialogWatcher advance_detector(COLOR_YELLOW);
+            pbf_press_button(context, BUTTON_A, 80ms, 400ms);
+            pbf_press_button(context, BUTTON_A, 80ms, 400ms);
+            int ret = wait_until(env.console, context, Milliseconds(7000), { advance_detector });
+            if (ret == 0){
+                env.log("Dialog detected.");
+            }else{
+                env.log("Dialog not detected.");
+            }
+            pbf_mash_button(context, BUTTON_A, 3200ms);
+            context.wait_for_all_requests();
+        }
+        {
+            NormalBattleMenuWatcher battle_menu(COLOR_YELLOW);
+            int ret = run_until<ProControllerContext>(
+                env.console, context,
+                [](ProControllerContext& context){
+                    pbf_mash_button(context, BUTTON_B, 80000ms); //it takes a while to load and start
+                },
+                {battle_menu}
+            );
+            if (ret != 0){
+                stats.errors++;
+                env.update_stats();
+                OperationFailedExceptionWithScreenshot::fire(
+                    ErrorReportMode::SEND_ERROR_REPORT,
+                    "Failed to detect battle start!",
+                    env.console
+                );
+            }
+        }
+        context.wait_for_all_requests();
+
+        stats.tournaments++;
+        env.update_stats();
+
+        bool battle_lost = false;
+        for (uint16_t battles = 0; battles < 4; battles++){
+            NormalBattleMenuWatcher battle_menu(COLOR_YELLOW);  //  Next battle started
+            OverworldWatcher overworld(env.console, COLOR_CYAN);             //  Previous battle was lost
+            int ret = run_until<ProControllerContext>(
+                env.console, context,
+                [](ProControllerContext& context){
+                    pbf_mash_button(context, BUTTON_B, 120000ms);
+                },
+                {battle_menu, overworld}
+            );
+            context.wait_for_all_requests();
+
+            switch (ret){
+            case 0:
+                env.log("Detected battle menu.");
+                run_singles_battle(env.console, context, BATTLE_AI, true);
+                stats.battles++;
+                env.update_stats();
+                break;
+            case 1:
+                env.log("Detected overworld.");
+                battle_lost = true;
+                stats.losses++;
+                env.update_stats();
+                break;
+            default:
+                env.log("Failed to detect battle menu or dialog prompt!");
+                stats.errors++;
+                env.update_stats();
+                OperationFailedExceptionWithScreenshot::fire(
+                    ErrorReportMode::SEND_ERROR_REPORT,
+                    "Failed to detect battle menu or dialog prompt!",
+                    env.console
+                );
+            }
+
+
+            if (battles == 3){
+                env.log("Final battle of the tournament complete, checking for overworld.");
+
+                context.wait_for_all_requests();
+
+                /* 
+                - mash B to clear dialog until it reaches the overworld.
+                - then it looks for the Fast travel icon
+                  - if win: Fast Travel will be detected
+                  - if lose: will time out.
+                */
+                ret = run_until<ProControllerContext>(
+                    env.console, context,
+                    [](ProControllerContext& context){
+                        pbf_mash_button(context, BUTTON_B, 120000ms);
+                    },
+                    {overworld} 
+                );
+                if (ret < 0){
+                    OperationFailedExceptionWithScreenshot::fire(
+                        ErrorReportMode::SEND_ERROR_REPORT,
+                        "Failed to return to overworld after 2 minutes.",
+                        env.console
+                    );
+                }
+                context.wait_for_all_requests();
+
+                FastTravelWatcher fast_travel(COLOR_YELLOW, env.console.overlay(), MINIMAP_AREA);
+                ret = run_until<ProControllerContext>(
+                    env.console, context,
+                    [](ProControllerContext& context){
+                        pbf_mash_button(context, BUTTON_B, 5000ms);
+                    },
+                    {fast_travel}
+                );
+                context.wait_for_all_requests();
+
+                switch (ret){
+                case 0:
+                    env.log("Detected fast travel icon.");
+                    env.log("Final battle of the tournament won.");
+                    break;
+                default:
+                    env.log("Final battle of the tournament lost.");
+                    battle_lost = true;
+                    stats.losses++;
+                    env.update_stats();
+                    break;
+                }
+            }
+
+
+            if (battle_lost){
+                return_to_academy_after_loss(env, env.console, context);
+                break;
+            }
+        }
+
+        //  Tournament won
+        if (!battle_lost){
+            stats.wins++;
+            env.update_stats();
+        }
+
+        env.log("Tournament loop complete.");
+
+        //Save the game if option is set
+        uint16_t num_rounds_temp = SAVE_NUM_ROUNDS;
+        if (num_rounds_temp != 0 && ((c + 1) % num_rounds_temp) == 0){
+            env.log("Saving game.");
+            save_game_from_overworld(env.program_info(), env.console, context);
+        }
+
+    }
+
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+    GO_HOME_WHEN_DONE.run_end_of_program(context);
+}
+
+
+
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_TournamentFarmer2.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_TournamentFarmer2.h
new file mode 100644
index 0000000000..9001e5a404
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_TournamentFarmer2.h
@@ -0,0 +1,65 @@
+/*  Tournament Farmer 2
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_TournamentFarmer2_H
+#define PokemonAutomation_PokemonSwSh_TournamentFarmer2_H
+
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "Common/Cpp/Options/ButtonOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+#include "VideoGames/PokemonSV/Options/PokemonSV_SinglesAIOption.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+class TournamentFarmer2_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    TournamentFarmer2_Descriptor();
+    struct Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+class TournamentFarmer2 : public SingleSwitchProgramInstance, public ButtonListener{
+public:
+    using Descriptor = TournamentFarmer2_Descriptor;
+    ~TournamentFarmer2();
+    TournamentFarmer2();
+
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+    virtual void on_press(ButtonCell& button) override;
+
+private:
+    class StopButton : public ButtonOption{
+    public:
+        StopButton();
+        void set_idle();
+        void set_ready();
+        void set_pressed();
+    };
+    class ResetOnExit;
+
+    StopButton STOP_AFTER_CURRENT;
+    SimpleIntegerOption<uint32_t> NUM_ROUNDS;
+    SimpleIntegerOption<uint16_t> SAVE_NUM_ROUNDS;
+    SinglesAIOption BATTLE_AI;
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
+    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
+    EventNotificationsOption NOTIFICATIONS;
+
+    std::atomic<bool> m_stop_after_current;
+};
+
+}
+}
+}
+#endif
+
+
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/FastCodeEntry/PokemonSV_ClipboardFastCodeEntry.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/FastCodeEntry/PokemonSV_ClipboardFastCodeEntry.cpp
new file mode 100644
index 0000000000..70381696f4
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/FastCodeEntry/PokemonSV_ClipboardFastCodeEntry.cpp
@@ -0,0 +1,102 @@
+/*  Fast Code Entry (Clipboard)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <QApplication>
+#include <QClipboard>
+//#include "Common/Cpp/Exceptions.h"
+#include "Common/Cpp/CancellableScope.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "NintendoSwitch/Inference/NintendoSwitch_ConsoleTypeDetector.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "PokemonSV_CodeEntry.h"
+#include "PokemonSV_ClipboardFastCodeEntry.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+using namespace Pokemon;
+
+
+ClipboardFastCodeEntry_Descriptor::ClipboardFastCodeEntry_Descriptor()
+    : MultiSwitchProgramDescriptor(
+        "PokemonSV:ClipboardFastCodeEntry",
+        STRING_POKEMON + " SV", "Clipboard Fast Code Entry (C-FCE)",
+        "Programs/PokemonSV/ClipboardFastCodeEntry.html",
+        "Automatically enter a 4, 6, or 8 digit link code from your clipboard.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_PerformanceClassSensitive,
+        FeedbackType::NONE,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS,
+        1, 4, 1
+    )
+{}
+
+ClipboardFastCodeEntry::ClipboardFastCodeEntry(){
+    PA_ADD_OPTION(SETTINGS);
+}
+void ClipboardFastCodeEntry::update_active_consoles(size_t switch_count){
+    SETTINGS.set_active_consoles(switch_count);
+}
+
+
+void ClipboardFastCodeEntry::program(MultiSwitchProgramEnvironment& env, CancellableScope& scope){
+    //  Connect the controller.
+    env.run_in_parallel(scope, [&](CancellableScope& scope, ConsoleHandle& console){
+        auto* procon = console.controller().cast<ProController>();
+        if (procon == nullptr){
+            return;
+        }
+        ProControllerContext context(scope, *procon);
+        ssf_press_button_ptv(context, BUTTON_R | BUTTON_L);
+        detect_console_type_from_in_game(console, context);
+    });
+
+
+    QClipboard* clipboard = QApplication::clipboard();
+#if 0
+    std::atomic<bool> cleared(false);
+    QMetaObject::invokeMethod(clipboard, [clipboard, &cleared, &env]{
+        clipboard->clear();
+        cleared.store(true, std::memory_order_release);
+        env.log("Clipboard cleared.");
+    }, Qt::QueuedConnection);
+
+    env.log("Clearing clipboard...");
+    while (!cleared.load(std::memory_order_acquire)){
+        scope.throw_if_cancelled();
+    }
+#endif
+    std::string start_text = clipboard->text().toStdString();
+
+    while (true){
+        std::string code = clipboard->text().toStdString();
+//        cout << code << endl;
+        if (code != start_text && !code.empty()){
+            const char* error = enter_code(env, scope, false, SETTINGS, code, false, false);
+            if (error == nullptr){
+                return;
+            }
+        }
+        scope.wait_for(std::chrono::milliseconds(1));
+    }
+
+}
+
+
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/FastCodeEntry/PokemonSV_ClipboardFastCodeEntry.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/FastCodeEntry/PokemonSV_ClipboardFastCodeEntry.h
new file mode 100644
index 0000000000..2a1bdff506
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/FastCodeEntry/PokemonSV_ClipboardFastCodeEntry.h
@@ -0,0 +1,43 @@
+/*  Fast Code Entry (Clipboard)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_ClipboardFastCodeEntry_H
+#define PokemonAutomation_PokemonSV_ClipboardFastCodeEntry_H
+
+#include "NintendoSwitch/NintendoSwitch_MultiSwitchProgram.h"
+#include "PokemonSV_CodeEntry.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+class ClipboardFastCodeEntry_Descriptor : public MultiSwitchProgramDescriptor{
+public:
+    ClipboardFastCodeEntry_Descriptor();
+};
+
+
+
+
+class ClipboardFastCodeEntry : public MultiSwitchProgramInstance{
+public:
+    using Descriptor = ClipboardFastCodeEntry_Descriptor;
+    ClipboardFastCodeEntry();
+    virtual void update_active_consoles(size_t switch_count) override;
+    virtual void program(MultiSwitchProgramEnvironment& env, CancellableScope& scope) override;
+
+private:
+    FastCodeEntrySettingsOption SETTINGS;
+};
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/FastCodeEntry/PokemonSV_CodeEntry.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/FastCodeEntry/PokemonSV_CodeEntry.cpp
new file mode 100644
index 0000000000..adcab091ca
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/FastCodeEntry/PokemonSV_CodeEntry.cpp
@@ -0,0 +1,226 @@
+/*  Code Entry
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <map>
+#include "Common/Cpp/Containers/FixedLimitVector.tpp"
+#include "NintendoSwitch/NintendoSwitch_ConsoleHandle.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/NintendoSwitch_MultiSwitchProgram.h"
+#include "NintendoSwitch/Programs/FastCodeEntry/NintendoSwitch_NumberCodeEntry.h"
+#include "NintendoSwitch/Programs/FastCodeEntry/NintendoSwitch_KeyboardCodeEntry.h"
+#include "PokemonSV_CodeEntry.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+FastCodeEntryKeyboardLayout::FastCodeEntryKeyboardLayout()
+    : GroupOption(
+        "Keyboard Layouts",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        EnableMode::ALWAYS_ENABLED
+    )
+    , CONSOLE(4)
+{
+    CONSOLE.emplace_back("<b>Switch 0 (Top Left):</b>");
+    CONSOLE.emplace_back("<b>Switch 1 (Top Right):</b>");
+    CONSOLE.emplace_back("<b>Switch 2 (Bottom Left):</b>");
+    CONSOLE.emplace_back("<b>Switch 3 (Bottom Right):</b>");
+    PA_ADD_OPTION(CONSOLE[0]);
+    PA_ADD_OPTION(CONSOLE[1]);
+    PA_ADD_OPTION(CONSOLE[2]);
+    PA_ADD_OPTION(CONSOLE[3]);
+}
+FastCodeEntryKeyboardLayout::~FastCodeEntryKeyboardLayout() = default;
+
+
+FastCodeEntrySettingsOption::FastCodeEntrySettingsOption()
+    : BatchOption(LockMode::UNLOCK_WHILE_RUNNING)
+{
+    PA_ADD_OPTION(SKIP_PLUS);
+    PA_ADD_OPTION(KEYBOARD_LAYOUTS);
+}
+void FastCodeEntrySettingsOption::set_active_consoles(size_t active_consoles){
+    for (size_t c = 0; c < 4; c++){
+        KEYBOARD_LAYOUTS.CONSOLE[c].set_visibility(
+            c < active_consoles ? ConfigOptionState::ENABLED : ConfigOptionState::HIDDEN
+        );
+    }
+}
+
+
+
+const char* normalize_code(std::string& normalized_code, const std::string& code, bool override_mode){
+    static const std::map<char, char> MAP{
+        {'1', '1'}, {'I', '1'}, {'i', '1'},
+        {'2', '2'},
+        {'3', '3'},
+        {'4', '4'},
+        {'5', '5'},
+        {'6', '6'},
+        {'7', '7'},
+        {'8', '8'},
+        {'9', '9'},
+        {'0', '0'}, {'O', '0'}, {'o', '0'},
+
+        {'Q', 'Q'}, {'q', 'Q'},
+        {'W', 'W'}, {'w', 'W'},
+        {'E', 'E'}, {'e', 'E'},
+        {'R', 'R'}, {'r', 'R'},
+        {'T', 'T'}, {'t', 'T'},
+        {'Y', 'Y'}, {'y', 'Y'},
+        {'U', 'U'}, {'u', 'U'},
+        {'P', 'P'}, {'p', 'P'},
+
+        {'A', 'A'}, {'a', 'A'},
+        {'S', 'S'}, {'s', 'S'}, {'Z', 'S'}, {'z', 'S'},
+        {'D', 'D'}, {'d', 'D'},
+        {'F', 'F'}, {'f', 'F'},
+        {'G', 'G'}, {'g', 'G'},
+        {'H', 'H'}, {'h', 'H'},
+        {'J', 'J'}, {'j', 'J'},
+        {'K', 'K'}, {'k', 'K'},
+        {'L', 'L'}, {'l', 'L'},
+
+        {'X', 'X'}, {'x', 'X'},
+        {'C', 'C'}, {'c', 'C'},
+        {'V', 'V'}, {'v', 'V'},
+        {'B', 'B'}, {'b', 'B'},
+        {'N', 'N'}, {'n', 'N'},
+        {'M', 'M'}, {'m', 'M'},
+    };
+
+    normalized_code.clear();
+
+    //  Prune invalid characters.
+    bool digits_only = true;
+    for (char ch : code){
+        auto iter = MAP.find(ch);
+        if (iter == MAP.end()){
+            continue;
+        }
+        ch = iter->second;
+        digits_only &= '0' <= ch && ch <= '9';
+        normalized_code += ch;
+    }
+
+    if (override_mode){
+        return nullptr;
+    }
+
+    switch (normalized_code.size()){
+    case 4:
+        if (!digits_only){
+            return "4-digit codes must be only digits.";
+        }
+        break;
+    case 6:
+        break;
+    case 8:
+        if (!digits_only){
+            return "8-digit codes must be only digits.";
+        }
+        break;
+    default:
+        return "Invalid code length. Must be 4, 6, or 8 characters long.";
+    }
+
+    return nullptr;
+}
+
+void enter_code(
+    ConsoleHandle& console, AbstractControllerContext& context,
+    bool assume_console_type_is_ready,
+    KeyboardLayout keyboard_layout,
+    const std::string& normalized_code, bool force_keyboard_mode,
+    bool include_plus,
+    bool connect_controller_press
+){
+    if (connect_controller_press){
+        //  Connect the controller.
+        auto* procon = context->cast<ProController>();
+        if (procon){
+            ProControllerContext subcontext(context, *procon);
+            pbf_press_button(subcontext, BUTTON_R | BUTTON_L, 40ms, 24ms);
+        }
+    }
+
+    if (force_keyboard_mode){
+        FastCodeEntry::keyboard_enter_code(
+            console, context,
+            assume_console_type_is_ready,
+            keyboard_layout,
+            normalized_code, include_plus
+        );
+        return;
+    }
+
+    switch (normalized_code.size()){
+    case 4:
+//        enter_digits_str(context, 4, normalized_code.c_str());
+        FastCodeEntry::numberpad_enter_code(
+            console, context,
+            assume_console_type_is_ready,
+            normalized_code, include_plus
+        );
+        break;
+    case 6:
+        FastCodeEntry::keyboard_enter_code(
+            console, context,
+            assume_console_type_is_ready,
+            keyboard_layout,
+            normalized_code, include_plus
+        );
+        break;
+    case 8:
+//        enter_digits_str(context, 8, normalized_code.c_str());
+        FastCodeEntry::numberpad_enter_code(
+            console, context,
+            assume_console_type_is_ready,
+            normalized_code, include_plus
+        );
+        break;
+    }
+}
+const char* enter_code(
+    MultiSwitchProgramEnvironment& env, CancellableScope& scope,
+    bool assume_console_type_is_ready,
+    const FastCodeEntrySettings& settings,
+    const std::string& code, bool force_keyboard_mode,
+    bool connect_controller_press
+){
+    std::string normalized_code;
+    const char* error = normalize_code(normalized_code, code, force_keyboard_mode);
+    if (error){
+        return error;
+    }
+
+    env.run_in_parallel(scope, [&](CancellableScope& scope, ConsoleHandle& console){
+        AbstractControllerContext context(scope, console.controller());
+        enter_code(
+            console, context,
+            assume_console_type_is_ready,
+            settings.keyboard_layout[console.index()],
+            normalized_code, force_keyboard_mode,
+            !settings.skip_plus,
+            connect_controller_press
+        );
+    });
+
+    return nullptr;
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/FastCodeEntry/PokemonSV_CodeEntry.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/FastCodeEntry/PokemonSV_CodeEntry.h
new file mode 100644
index 0000000000..d4029bbfa3
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/FastCodeEntry/PokemonSV_CodeEntry.h
@@ -0,0 +1,110 @@
+/*  Code Entry
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_CodeEntry_H
+#define PokemonAutomation_PokemonSV_CodeEntry_H
+
+#include "Common/Cpp/Containers/FixedLimitVector.h"
+//#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+#include "NintendoSwitch/Options/NintendoSwitch_CodeEntrySettingsOption.h"
+#include "NintendoSwitch/NintendoSwitch_ConsoleHandle.h"
+
+namespace PokemonAutomation{
+    class CancellableScope;
+    class ProgramEnvironment;
+namespace NintendoSwitch{
+    class MultiSwitchProgramEnvironment;
+namespace PokemonSV{
+
+
+class FastCodeEntryKeyboardLayout : public GroupOption{
+public:
+    FastCodeEntryKeyboardLayout();
+    ~FastCodeEntryKeyboardLayout();
+
+public:
+    FixedLimitVector<KeyboardLayoutOption> CONSOLE;
+};
+
+
+class FastCodeEntrySettingsOption : public BatchOption{
+public:
+    FastCodeEntrySettingsOption();
+
+    void set_active_consoles(size_t active_consoles);
+
+public:
+    CodeEntrySkipPlusOption SKIP_PLUS;
+    FastCodeEntryKeyboardLayout KEYBOARD_LAYOUTS;
+};
+
+struct FastCodeEntrySettings{
+    bool skip_plus = false;
+    KeyboardLayout keyboard_layout[4];
+
+    FastCodeEntrySettings() = default;
+    FastCodeEntrySettings(const FastCodeEntrySettingsOption& settings)
+        : skip_plus(settings.SKIP_PLUS)
+    {
+        keyboard_layout[0] = settings.KEYBOARD_LAYOUTS.CONSOLE[0];
+        keyboard_layout[1] = settings.KEYBOARD_LAYOUTS.CONSOLE[1];
+        keyboard_layout[2] = settings.KEYBOARD_LAYOUTS.CONSOLE[2];
+        keyboard_layout[3] = settings.KEYBOARD_LAYOUTS.CONSOLE[3];
+    }
+};
+
+
+
+const char* normalize_code(
+    std::string& normalized_code,
+    const std::string& code,
+    bool override_mode = false
+);
+
+void enter_code(
+    ConsoleHandle& console, AbstractControllerContext& context,
+    bool assume_console_type_is_ready,
+    KeyboardLayout keyboard_layout,
+    const std::string& normalized_code, bool force_keyboard_mode,
+    bool include_plus,
+    bool connect_controller_press
+);
+template <typename ControllerContext>
+inline void enter_code(
+    ConsoleHandle& console, ControllerContext& context,
+    bool assume_console_type_is_ready,
+    KeyboardLayout keyboard_layout,
+    const std::string& normalized_code, bool force_keyboard_mode,
+    bool include_plus,
+    bool connect_controller_press
+){
+    AbstractControllerContext subcontext(context);
+    enter_code(
+        console, subcontext,
+        assume_console_type_is_ready,
+        keyboard_layout,
+        normalized_code, force_keyboard_mode,
+        include_plus,
+        connect_controller_press
+    );
+}
+
+const char* enter_code(
+    MultiSwitchProgramEnvironment& env, CancellableScope& scope,
+    bool assume_console_type_is_ready,
+    const FastCodeEntrySettings& settings,
+    const std::string& code, bool force_keyboard_mode,
+    bool connect_controller_press
+);
+
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/FastCodeEntry/PokemonSV_FastCodeEntry.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/FastCodeEntry/PokemonSV_FastCodeEntry.cpp
new file mode 100644
index 0000000000..c77a0790a3
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/FastCodeEntry/PokemonSV_FastCodeEntry.cpp
@@ -0,0 +1,165 @@
+/*  Fast Code Entry
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Exceptions.h"
+#include "Common/Cpp/Concurrency/Mutex.h"
+#include "Common/Cpp/Concurrency/ConditionVariable.h"
+//#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "NintendoSwitch/Inference/NintendoSwitch_ConsoleTypeDetector.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "PokemonSV_CodeEntry.h"
+#include "PokemonSV_FastCodeEntry.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+using namespace Pokemon;
+
+
+
+FastCodeEntry_Descriptor::FastCodeEntry_Descriptor()
+    : MultiSwitchProgramDescriptor(
+        "PokemonSV:FastCodeEntry",
+        STRING_POKEMON + " SV", "Fast Code Entry (FCE)",
+        "Programs/PokemonSV/FastCodeEntry.html",
+        "Quickly enter a 4, 6, or 8 digit link code.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_RequiresPrecision,
+        FeedbackType::NONE,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS,
+        1, 4, 1
+    )
+{}
+
+FastCodeEntry::FastCodeEntry()
+    : MODE(
+        "<b>Mode:</b>",
+        {
+            {Mode::NORMAL, "normal", "Enter Code when clicking Start Program."},
+            {Mode::ENTER_ON_PASTE, "on-paste", "Start the program first. Code is entered when you paste into the code box."},
+            {Mode::MYSTERY_GIFT, "mystery", "Enter Mystery Gift Code when clicking Start Program."},
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        Mode::NORMAL
+    )
+    , CODE(
+        "<b>Link Code:</b><br>Unless in Mystery Gift mode, code must be 4-digit numeric or 6-digit alphanumeric. (not case sensitive)<br>"
+        "(Box is big so it's easy to land your mouse on.)",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        "0123", "0123",
+        true
+    )
+{
+    PA_ADD_OPTION(MODE);
+    PA_ADD_OPTION(CODE);
+    PA_ADD_OPTION(SETTINGS);
+}
+void FastCodeEntry::update_active_consoles(size_t switch_count){
+    SETTINGS.set_active_consoles(switch_count);
+}
+
+
+
+
+class FceCodeListener : public ConfigOption::Listener{
+public:
+    FceCodeListener(TextEditOption& code_box)
+        : m_code_box(code_box)
+    {
+        code_box.add_listener(*this);
+    }
+    ~FceCodeListener(){
+        m_code_box.remove_listener(*this);
+    }
+
+    virtual void on_config_value_changed(void* object) override{
+        std::lock_guard<Mutex> lg(m_lock);
+        m_cv.notify_all();
+    }
+//    virtual void focus_in() override{
+//        std::lock_guard<Mutex> lg(m_lock);
+//        m_cv.notify_all();
+//    }
+
+    void run(
+        MultiSwitchProgramEnvironment& env, CancellableScope& scope,
+        const FastCodeEntrySettings& settings
+    ){
+//        const QClipboard* clipboard = QApplication::clipboard();
+
+        std::unique_lock<Mutex> lg(m_lock);
+        while (true){
+            std::string code = m_code_box;
+//            if (code.empty()){
+//                code = clipboard->text().toStdString();
+//            }
+            if (!code.empty()){
+                const char* error = enter_code(
+                    env, scope,
+                    false,
+                    settings,
+                    code, false,
+                    false
+                );
+                if (error == nullptr){
+                    return;
+                }
+            }
+            scope.throw_if_cancelled();
+            m_cv.wait_for(lg, std::chrono::milliseconds(1));
+        }
+    }
+
+private:
+    TextEditOption& m_code_box;
+    Mutex m_lock;
+    ConditionVariable m_cv;
+};
+
+
+void FastCodeEntry::program(MultiSwitchProgramEnvironment& env, CancellableScope& scope){
+    if (MODE == Mode::NORMAL || MODE == Mode::MYSTERY_GIFT){
+        const char* error = enter_code(
+            env, scope,
+            MODE == Mode::NORMAL,
+            SETTINGS,
+            CODE,
+            MODE == Mode::MYSTERY_GIFT ? true : false,
+            true
+        );
+        if (MODE == Mode::NORMAL && error){
+            throw UserSetupError(env.logger(), error);
+        }
+        return;
+    }
+
+    //  Connect the controller.
+    env.run_in_parallel(scope, [&](CancellableScope& scope, ConsoleHandle& console){
+        auto* procon = console.controller().cast<ProController>();
+        if (procon == nullptr){
+            return;
+        }
+        ProControllerContext context(scope, *procon);
+        ssf_press_button_ptv(context, BUTTON_R | BUTTON_L);
+        detect_console_type_from_in_game(console, context);
+    });
+
+    FceCodeListener listener(CODE);
+    listener.run(env, scope, SETTINGS);
+
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/FastCodeEntry/PokemonSV_FastCodeEntry.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/FastCodeEntry/PokemonSV_FastCodeEntry.h
new file mode 100644
index 0000000000..5ccf46b3a8
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/FastCodeEntry/PokemonSV_FastCodeEntry.h
@@ -0,0 +1,54 @@
+/*  Fast Code Entry
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_FastCodeEntry_H
+#define PokemonAutomation_PokemonSV_FastCodeEntry_H
+
+#include "Common/Cpp/Options/TextEditOption.h"
+#include "NintendoSwitch/NintendoSwitch_MultiSwitchProgram.h"
+#include "PokemonSV_CodeEntry.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+class FastCodeEntry_Descriptor : public MultiSwitchProgramDescriptor{
+public:
+    FastCodeEntry_Descriptor();
+};
+
+
+
+
+class FastCodeEntry : public MultiSwitchProgramInstance{
+public:
+    using Descriptor = FastCodeEntry_Descriptor;
+    FastCodeEntry();
+    virtual void update_active_consoles(size_t switch_count) override;
+    virtual void program(MultiSwitchProgramEnvironment& env, CancellableScope& scope) override;
+
+private:
+    enum class Mode{
+        NORMAL,
+        ENTER_ON_PASTE,
+        MYSTERY_GIFT,
+    };
+    EnumDropdownOption<Mode> MODE;
+
+    TextEditOption CODE;
+    FastCodeEntrySettingsOption SETTINGS;
+
+};
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/FastCodeEntry/PokemonSV_VideoFastCodeEntry.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/FastCodeEntry/PokemonSV_VideoFastCodeEntry.cpp
new file mode 100644
index 0000000000..9060ec77a3
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/FastCodeEntry/PokemonSV_VideoFastCodeEntry.cpp
@@ -0,0 +1,221 @@
+/*  Video Fast Code Entry
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/CancellableScope.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ImageTools/ImageDiff.h"
+#include "CommonFramework/Tools/GlobalThreadPools.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonTools/Images/ImageFilter.h"
+#include "CommonTools/OCR/OCR_Routines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "NintendoSwitch/Inference/NintendoSwitch_ConsoleTypeDetector.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonSV/Inference/Tera/PokemonSV_TeraCodeReader.h"
+#include "PokemonSV_CodeEntry.h"
+#include "PokemonSV_VideoFastCodeEntry.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+using namespace Pokemon;
+
+
+VideoFceSettings::VideoFceSettings()
+    : GroupOption("Join Settings (V-FCE)", LockMode::UNLOCK_WHILE_RUNNING)
+    , OCR_METHOD(
+        "<b>Text Recognition Method:</b><br>"
+        "Each text recognition method has its own strengths and weaknesses. This option lets you choose which method to use.",
+        {
+            {VideoFceOcrMethod::RAW_OCR,    "raw-ocr",          "Raw OCR. No image pre-processing."},
+            {VideoFceOcrMethod::BLACK_TEXT, "black-on-white",   "Filter: Black Text on White Background"},
+            {VideoFceOcrMethod::WHITE_TEXT, "white-on-black",   "Filter: White Text on Black Background"},
+            {VideoFceOcrMethod::TERA_CARD,  "tera-card",        "Tera Card"},
+        },
+        LockMode::UNLOCK_WHILE_RUNNING,
+        VideoFceOcrMethod::TERA_CARD
+    )
+    , SKIP_INITIAL_CODE(
+        "<b>Skip Initial Code:</b><br>"
+        "If there is already a code up when you start the program, skip it since it's from the last raid.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        true
+    )
+{
+    PA_ADD_OPTION(OCR_METHOD);
+    PA_ADD_OPTION(SKIP_INITIAL_CODE);
+}
+
+
+
+void wait_for_video_code_and_join(
+    MultiSwitchProgramEnvironment& env, CancellableScope& scope,
+    ScreenWatchOption& screen_watcher,
+    VideoFceSettings& join_method,
+    const FastCodeEntrySettings& settings
+){
+    bool skip_initial = join_method.SKIP_INITIAL_CODE;
+    VideoSnapshot snapshot;
+    while (true){
+        scope.throw_if_cancelled();
+        VideoSnapshot current = screen_watcher.screenshot();
+
+//        env.log("start");
+
+        if (snapshot && current &&
+            snapshot->width() == current->width() &&
+            snapshot->height() == current->height()
+        ){
+            double rmsd = ImageMatch::pixel_RMSD(snapshot, current);
+            if (rmsd < 2){
+                scope.wait_for(std::chrono::milliseconds(1));
+                continue;
+            }
+        }
+        snapshot = std::move(current);
+//        env.log("done new frame check");
+
+        if (skip_initial){
+            env.log("Waiting for next screen change...");
+            skip_initial = false;
+            continue;
+        }
+
+        std::string code;
+        switch (join_method.OCR_METHOD){
+        case VideoFceOcrMethod::RAW_OCR:
+            code = OCR::ocr_read(Language::English, snapshot);
+            env.log("OCR: " + code);
+            break;
+        case VideoFceOcrMethod::BLACK_TEXT:{
+            ImageRGB32 filtered = to_blackwhite_rgb32_range(snapshot, true, 0xff000000, 0xff7f7f7f);
+            code = OCR::ocr_read(Language::English, filtered);
+            env.log("OCR: " + code);
+            break;
+        }
+        case VideoFceOcrMethod::WHITE_TEXT:{
+            ImageRGB32 filtered = to_blackwhite_rgb32_range(snapshot, true, 0xffc0c0c0, 0xffffffff);
+            code = OCR::ocr_read(Language::English, filtered);
+            env.log("OCR: " + code);
+            break;
+        }
+        case VideoFceOcrMethod::TERA_CARD:
+            code = read_raid_code(env.logger(), snapshot);
+        }
+        const char* error = enter_code(
+            env, scope,
+            false,
+            settings,
+            code, false,
+            false
+        );
+        if (error == nullptr){
+            break;
+        }else{
+            env.log(std::string("Invalid Code: ") + error, COLOR_RED);
+        }
+    }
+}
+
+
+
+
+
+VideoFastCodeEntry_Descriptor::VideoFastCodeEntry_Descriptor()
+    : MultiSwitchProgramDescriptor(
+        "PokemonSV:VideoFastCodeEntry",
+        STRING_POKEMON + " SV", "Video Fast Code Entry (V-FCE)",
+        "Programs/PokemonSV/VideoFastCodeEntry.html",
+        "Read a 4, 6, or 8 digit link code from someone on your screen and enter it as quickly as possible.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_PerformanceClassSensitive,
+        FeedbackType::NONE,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS,
+        1, 4, 1
+    )
+{}
+
+VideoFastCodeEntry::VideoFastCodeEntry()
+    : SCREEN_WATCHER("Capture Box:")
+    , MODE(
+        "<b>Mode:</b>",
+        {
+            {Mode::MANUAL,      "manual",   "Manual - Enter code when you start the program."},
+            {Mode::AUTOMATIC,   "auto",     "Automatic - Monitor the region. Automatically enter code when it appears."},
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        Mode::MANUAL
+    )
+    , SKIP_CONNECT_TO_CONTROLLER(
+        "<b>Skip Connect to Controller:</b><br>"
+        "If you know your controllers are already connected, you can skip this to save 64 milliseconds. (only applies to manual mode)",
+        LockMode::LOCK_WHILE_RUNNING,
+        false
+    )
+    , NOTIFICATIONS({
+        &NOTIFICATION_PROGRAM_FINISH,
+    })
+{
+    PA_ADD_OPTION(SCREEN_WATCHER);
+    PA_ADD_OPTION(MODE);
+    PA_ADD_OPTION(SKIP_CONNECT_TO_CONTROLLER);
+    PA_ADD_OPTION(JOIN_METHOD);
+    PA_ADD_OPTION(SETTINGS);
+    PA_ADD_OPTION(NOTIFICATIONS);
+
+    //  Preload
+    GlobalThreadPools::computation_realtime().ensure_threads(6);
+    OCR::ensure_ocr_instances(Language::English, 6);
+    preload_code_templates();
+}
+void VideoFastCodeEntry::update_active_consoles(size_t switch_count){
+    SETTINGS.set_active_consoles(switch_count);
+}
+
+
+void VideoFastCodeEntry::program(MultiSwitchProgramEnvironment& env, CancellableScope& scope){
+    if (MODE == Mode::MANUAL){
+        std::string code = read_raid_code(env.logger(), SCREEN_WATCHER.screenshot());
+        const char* error = enter_code(
+            env, scope,
+            true,
+            SETTINGS,
+            code, false,
+            !SKIP_CONNECT_TO_CONTROLLER
+        );
+        if (error){
+            env.log("No valid code found: " + std::string(error), COLOR_RED);
+        }
+        return;
+    }
+
+    //  Connect the controller.
+    env.run_in_parallel(scope, [&](CancellableScope& scope, ConsoleHandle& console){
+        auto* procon = console.controller().cast<ProController>();
+        if (procon == nullptr){
+            return;
+        }
+        ProControllerContext context(scope, *procon);
+        ssf_press_button_ptv(context, BUTTON_R | BUTTON_L);
+        detect_console_type_from_in_game(console, context);
+    });
+
+    //  Preload 6 threads to OCR the code.
+//    env.realtime_dispatcher().ensure_threads(6);
+
+    wait_for_video_code_and_join(env, scope, SCREEN_WATCHER, JOIN_METHOD, SETTINGS);
+
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+}
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/FastCodeEntry/PokemonSV_VideoFastCodeEntry.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/FastCodeEntry/PokemonSV_VideoFastCodeEntry.h
new file mode 100644
index 0000000000..36a2025be7
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/FastCodeEntry/PokemonSV_VideoFastCodeEntry.h
@@ -0,0 +1,84 @@
+/*  Video Fast Code Entry
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_VideoFastCodeEntry_H
+#define PokemonAutomation_PokemonSV_VideoFastCodeEntry_H
+
+#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "Common/Cpp/Options/EnumDropdownOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "CommonTools/Options/ScreenWatchOption.h"
+#include "NintendoSwitch/NintendoSwitch_MultiSwitchProgram.h"
+#include "PokemonSV_CodeEntry.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+enum VideoFceOcrMethod{
+    RAW_OCR,
+    BLACK_TEXT,
+    WHITE_TEXT,
+    TERA_CARD,
+};
+class VideoFceSettings : public GroupOption{
+public:
+    VideoFceSettings();
+
+public:
+    EnumDropdownOption<VideoFceOcrMethod> OCR_METHOD;
+    BooleanCheckBoxOption SKIP_INITIAL_CODE;
+};
+
+void wait_for_video_code_and_join(
+    MultiSwitchProgramEnvironment& env, CancellableScope& scope,
+    ScreenWatchOption& screen_watcher,
+    VideoFceSettings& join_method,
+    const FastCodeEntrySettings& settings
+);
+
+
+
+
+
+class VideoFastCodeEntry_Descriptor : public MultiSwitchProgramDescriptor{
+public:
+    VideoFastCodeEntry_Descriptor();
+};
+
+
+class VideoFastCodeEntry : public MultiSwitchProgramInstance{
+public:
+    using Descriptor = VideoFastCodeEntry_Descriptor;
+    VideoFastCodeEntry();
+    virtual void update_active_consoles(size_t switch_count) override;
+    virtual void program(MultiSwitchProgramEnvironment& env, CancellableScope& scope) override;
+
+private:
+    ScreenWatchOption SCREEN_WATCHER;
+
+    enum class Mode{
+        MANUAL,
+        AUTOMATIC,
+    };
+    EnumDropdownOption<Mode> MODE;
+
+    BooleanCheckBoxOption SKIP_CONNECT_TO_CONTROLLER;
+
+    VideoFceSettings JOIN_METHOD;
+
+    FastCodeEntrySettingsOption SETTINGS;
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/FormHunting/PokemonSV_ThreeSegmentDudunsparceFinder.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/FormHunting/PokemonSV_ThreeSegmentDudunsparceFinder.cpp
new file mode 100644
index 0000000000..cb1a77db2c
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/FormHunting/PokemonSV_ThreeSegmentDudunsparceFinder.cpp
@@ -0,0 +1,213 @@
+/*  Three-Segment Dudunsparce Finder
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Exceptions.h"
+#include "CommonFramework/Exceptions/FatalProgramException.h"
+#include "CommonFramework/Exceptions/OperationFailedException.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "CommonTools/StartupChecks/VideoResolutionCheck.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonSV/Inference/PokemonSV_PokemonSummaryReader.h"
+#include "VideoGames/PokemonSV/Programs/Boxes/PokemonSV_BoxRoutines.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h"
+#include "PokemonSV_ThreeSegmentDudunsparceFinder.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+using namespace Pokemon;
+
+ThreeSegmentDudunsparceFinder_Descriptor::ThreeSegmentDudunsparceFinder_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonSV:ThreeSegmentDudunsparceFinder",
+        STRING_POKEMON + " SV", "Three-Segment Dudunsparce Finder",
+        "Programs/PokemonSV/ThreeSegmentDudunsparceFinder.html",
+        "Check whether a box of Dunsparce contain at least one that evolves into Three-Segment Dudunsparce.",
+        PanelQualityStanding::OFFICIAL_BETA,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+struct ThreeSegmentDudunsparceFinder_Descriptor::Stats : public StatsTracker{
+    Stats()
+        : m_attempts(m_stats["Attempts"])
+        , m_errors(m_stats["Errors"])
+    {
+        m_display_order.emplace_back("Attempts");
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+    }
+    std::atomic<uint64_t>& m_attempts;
+    std::atomic<uint64_t>& m_errors;
+};
+std::unique_ptr<StatsTracker> ThreeSegmentDudunsparceFinder_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+
+
+ThreeSegmentDudunsparceFinder::ThreeSegmentDudunsparceFinder()
+    : GO_HOME_WHEN_DONE(false)
+    , HAS_CLONE_RIDE_POKEMON(
+        "<b>Cloned Ride Legendary 2nd in Party:</b><br>"
+        "Ride legendary cannot be cloned after patch 1.0.1. To preserve the existing clone while hatching eggs, "
+        "place it as second in party before starting the program.</b>"
+        "The program will skip the first row of eggs in the box as a result.",
+        LockMode::LOCK_WHILE_RUNNING,
+        false)
+    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_STATUS_UPDATE,
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_RECOVERABLE,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+{
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+    PA_ADD_OPTION(HAS_CLONE_RIDE_POKEMON);
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+void ThreeSegmentDudunsparceFinder::check_one_column(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    uint8_t column_index
+){
+    enter_box_system_from_overworld(env.program_info(), env.console, context);
+    const uint8_t expected_empty_slots_in_party = HAS_CLONE_RIDE_POKEMON ? 4 : 5;
+    if (check_empty_slots_in_party(env.program_info(), env.console, context) != expected_empty_slots_in_party){
+        throw_and_log<FatalProgramException>(
+            env.console, ErrorReportMode::SEND_ERROR_REPORT,
+            "Your party should have " + std::to_string(6 - expected_empty_slots_in_party) + " " + STRING_POKEMON +
+            " and " + std::to_string(expected_empty_slots_in_party) + " empty slots.",
+            env.console
+        );
+    }
+
+    load_one_column_to_party(env, env.console, context, NOTIFICATION_ERROR_FATAL, column_index, HAS_CLONE_RIDE_POKEMON);
+    const int empty_party_slots = check_empty_slots_in_party(env.program_info(), env.console, context);
+    if (empty_party_slots == 5){
+        env.log("Empty column");
+        env.console.overlay().add_log("Empty column");
+        return;
+    }
+    const int num_pokemon_in_party = 6 - empty_party_slots;
+    const int menu_index = -1;
+    // go to bag from box system
+    enter_menu_from_box_system(env.program_info(), env.console, context, menu_index);
+    enter_bag_from_menu(env.program_info(), env.console, context);
+    // move cursor to the "Other Items" tab
+    for (size_t c = 0; c < 4; c++){
+        pbf_press_dpad(context, DPAD_RIGHT, 160ms, 840ms);
+    }
+    context.wait_for_all_requests();
+    // move to candies:
+
+    // Exp M: 3k exp points. from Tera Raid Battles (2★, 3★, 4★)
+    // Exp L: 10k exp points. from Tera Raid Battles (4★, 5★, 6★, 7★)
+    // Exp XL: 30k exp points. from Tera Raid Battles (5★, 6★, 7★)
+
+    // - 3 exp L to go to lv 31 from lv 1
+    // - 4 Exp L to go to lv 34 from lv 1
+    // - 11 exp M to go to lv 32 from lv 1
+    // - 1 exp M to go from lv 32 to lv 33
+
+    // so total 12 exp M per dunsparce. 12 * 30 = 360 exp M
+    // or 3 expl L + 2 exp M per dunsparce. 90 exp M and 60 exp M
+    // or 1 exp XL + 2 exp M per dunsparce. 30 exp XL and 60 exp M
+    
+    // go down 5 to go to candy XL
+    for (size_t c = 0; c < 5; c++){
+        pbf_press_dpad(context, DPAD_DOWN, 160ms, 840ms);
+    }
+    // press A to bring up sub menu: "Use this item", "Give to Pokemon", "Cancel"
+    pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+    // press A again to select "Use this item"
+    pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+    // now the cursor is on the first pokemon
+    const int starting_pokemon_in_party = HAS_CLONE_RIDE_POKEMON ? 2 : 1;
+    for (int i_pokemon = starting_pokemon_in_party; i_pokemon < num_pokemon_in_party; i_pokemon++){
+        // go down to the target pokemon
+        for (int c = 0; c < i_pokemon; c++){
+            pbf_press_dpad(context, DPAD_DOWN, 160ms, 840ms);
+        }
+        // select the pokemon. This will open up the item count "x1"
+        pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+        // press A again to apply the x1 candy XL to the pokemon
+        pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+        // wait for some more time to let the level up animation finish
+        pbf_wait(context, Seconds(1));
+        // press A to clear the "dudunsparce grew up to lv 31" message box
+        pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+    }
+
+    // leave bag and move to menu, enter the first dunsparce's sub-menu
+    enter_menu_from_bag(env.program_info(), env.console, context, starting_pokemon_in_party, MenuSide::LEFT);
+    // press A again to go into pokemon status summary screen
+    pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+    // wait until we are in pokemon status summary screen
+    PokemonSummaryWatcher summary_watcher;
+    int ret = wait_until(
+        env.console, context,
+        Seconds(3),
+        {summary_watcher}
+    );
+    if (ret < 0){
+        throw_and_log<FatalProgramException>(
+            env.console, ErrorReportMode::NO_ERROR_REPORT,
+            "ThreeSegmentDudunsparceFinder::check_one_column(): No pokemon status summary screen found.",
+            env.console
+        );
+    }
+    // move to the moves screen
+    pbf_press_dpad(context, DPAD_RIGHT, 160ms, 840ms);
+
+    for (int i_pokemon = starting_pokemon_in_party; i_pokemon < num_pokemon_in_party; i_pokemon++){
+        // press A to open submenu "Remember moves", "Forget a move", "Use TMs to learn moves", "Quit"
+        pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+        // press A to select "Remember moves"
+        pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+        // wait until Remember Move list to appear
+        // XXX
+    }
+}
+
+void ThreeSegmentDudunsparceFinder::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    assert_16_9_720p_min(env.logger(), env.console);
+
+    ThreeSegmentDudunsparceFinder_Descriptor::Stats& stats = env.current_stats<ThreeSegmentDudunsparceFinder_Descriptor::Stats>();
+
+    //  Connect the controller.
+    require_player(env.console, context, BUTTON_L);
+
+    try{
+        for (uint8_t i = 0; i < 6; i++){
+            check_one_column(env, context, i);
+        }
+    }catch (OperationFailedException&){
+        stats.m_errors++;
+        env.update_stats();
+        throw;
+    }
+
+    env.update_stats();
+    GO_HOME_WHEN_DONE.run_end_of_program(context);
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+}
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/FormHunting/PokemonSV_ThreeSegmentDudunsparceFinder.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/FormHunting/PokemonSV_ThreeSegmentDudunsparceFinder.h
new file mode 100644
index 0000000000..25e9252aba
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/FormHunting/PokemonSV_ThreeSegmentDudunsparceFinder.h
@@ -0,0 +1,60 @@
+/*  Three-Segment Dudunsparce Finder
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_ThreeSegmentDudunsparceFinder_H
+#define PokemonAutomation_PokemonSV_ThreeSegmentDudunsparceFinder_H
+
+#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+class ThreeSegmentDudunsparceFinder_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    ThreeSegmentDudunsparceFinder_Descriptor();
+
+    struct Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+
+
+class ThreeSegmentDudunsparceFinder : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = ThreeSegmentDudunsparceFinder_Descriptor;
+    ThreeSegmentDudunsparceFinder();
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    void check_one_column(
+        SingleSwitchProgramEnvironment& env,
+        ProControllerContext& context,
+        uint8_t column_index
+    );
+    
+private:
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
+
+    BooleanCheckBoxOption HAS_CLONE_RIDE_POKEMON;
+
+
+    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/General/PokemonSV_AutonomousBallThrower.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/General/PokemonSV_AutonomousBallThrower.cpp
new file mode 100644
index 0000000000..cbf58b9416
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/General/PokemonSV_AutonomousBallThrower.cpp
@@ -0,0 +1,116 @@
+/*  Autonomous Ball Thrower
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonTools/StartupChecks/VideoResolutionCheck.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Inference/Pokemon_NameReader.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonSV/Programs/Battles/PokemonSV_BasicCatcher.h"
+#include "PokemonSV_AutonomousBallThrower.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+using namespace Pokemon;
+
+
+AutonomousBallThrower_Descriptor::AutonomousBallThrower_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonSV:AutonomousBallThrower",
+        STRING_POKEMON + " SV", "Autonomous Ball Thrower",
+        "Programs/PokemonSV/AutonomousBallThrower.html",
+        "Repeatedly throw a ball until you catch the pokemon.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+struct AutonomousBallThrower_Descriptor::Stats : public StatsTracker{
+    Stats()
+        : m_balls(m_stats["Balls Thrown"])
+    {
+        m_display_order.emplace_back("Balls Thrown");
+    }
+    std::atomic<uint64_t>& m_balls;
+};
+std::unique_ptr<StatsTracker> AutonomousBallThrower_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+
+
+AutonomousBallThrower::AutonomousBallThrower()
+    : LANGUAGE(
+        "<b>Game Language:</b>",
+        PokemonNameReader::instance().languages(),
+        LockMode::UNLOCK_WHILE_RUNNING
+    )
+    , BALL_SELECT(
+        "<b>Ball Select:</b>",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        "poke-ball"
+    )
+    , USE_FIRST_MOVE_IF_CANNOT_THROW_BALL(
+        "<b>Use 1st Move if Cannot Throw Ball:</b><br>"
+        "If you can't throw a ball because the opponent is semi-invulnerable, use the 1st move instead. "
+        "Therefore, your first move should be non-damaging to avoid killing the wild " + STRING_POKEMON + ".",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        true
+    )
+    , NOTIFICATION_CATCH_SUCCESS("Catch Success", true, true)
+    , NOTIFICATION_CATCH_FAILED("Catch Failed", true, true)
+    , NOTIFICATIONS({
+        &NOTIFICATION_CATCH_SUCCESS,
+        &NOTIFICATION_CATCH_FAILED,
+    })
+{
+    PA_ADD_OPTION(LANGUAGE);
+    PA_ADD_OPTION(BALL_SELECT);
+    PA_ADD_OPTION(USE_FIRST_MOVE_IF_CANNOT_THROW_BALL);
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+
+
+
+void AutonomousBallThrower::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    assert_16_9_720p_min(env.logger(), env.console);
+
+    AutonomousBallThrower_Descriptor::Stats& stats = env.current_stats<AutonomousBallThrower_Descriptor::Stats>();
+
+    //  Connect the controller.
+    require_player(env.console, context, BUTTON_LCLICK);
+
+    CatchResults results = basic_catcher(
+        env.console, context, LANGUAGE,
+        BALL_SELECT.slug(), 999,
+        USE_FIRST_MOVE_IF_CANNOT_THROW_BALL,
+        [&]{
+            stats.m_balls++;
+            env.update_stats();
+        }
+    );
+    env.update_stats();
+
+    send_catch_notification(
+        env,
+        NOTIFICATION_CATCH_SUCCESS,
+        NOTIFICATION_CATCH_FAILED,
+        nullptr,
+        BALL_SELECT.slug(),
+        results.balls_used,
+        results.result
+    );
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/General/PokemonSV_AutonomousBallThrower.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/General/PokemonSV_AutonomousBallThrower.h
new file mode 100644
index 0000000000..9de646400c
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/General/PokemonSV_AutonomousBallThrower.h
@@ -0,0 +1,57 @@
+/*  Autonomous Ball Thrower
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_AutonomousBallThrower_H
+#define PokemonAutomation_PokemonSV_AutonomousBallThrower_H
+
+#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "CommonTools/Options/LanguageOCROption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "VideoGames/PokemonSwSh/Options/PokemonSwSh_BallSelectOption.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+class AutonomousBallThrower_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    AutonomousBallThrower_Descriptor();
+
+    struct Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+
+
+
+class AutonomousBallThrower : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = AutonomousBallThrower_Descriptor;
+    AutonomousBallThrower();
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+//    void throw_ball(VideoStream& stream, ProControllerContext& context);
+
+    OCR::LanguageOCROption LANGUAGE;
+    PokemonSwSh::PokemonBallSelectOption BALL_SELECT;
+    BooleanCheckBoxOption USE_FIRST_MOVE_IF_CANNOT_THROW_BALL;
+
+    EventNotificationOption NOTIFICATION_CATCH_SUCCESS;
+    EventNotificationOption NOTIFICATION_CATCH_FAILED;
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/General/PokemonSV_ClothingBuyer.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/General/PokemonSV_ClothingBuyer.cpp
new file mode 100644
index 0000000000..0b966878c5
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/General/PokemonSV_ClothingBuyer.cpp
@@ -0,0 +1,243 @@
+/*  Clothing Buyer
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "CommonTools/StartupChecks/VideoResolutionCheck.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h"
+#include "VideoGames/PokemonSV/Inference/PokemonSV_ClothingTopDetector.h"
+#include "PokemonSV_ClothingBuyer.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+using namespace Pokemon;
+
+ClothingBuyer_Descriptor::ClothingBuyer_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonSV:ClothingBuyer",
+        STRING_POKEMON + " SV", "Clothing Buyer",
+        "Programs/PokemonSV/ClothingBuyer.html",
+        "Buy all the clothing in a store.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+ClothingBuyer::ClothingBuyer()
+    : USE_LP(
+        "<b>Use LP to purchase:</b>",
+        LockMode::UNLOCK_WHILE_RUNNING, false
+    )
+    , WEAR_NEW_CLOTHES(
+        "<b>Wear new clothing after purchase:</b>",
+        LockMode::UNLOCK_WHILE_RUNNING, false
+    )
+    , NUM_CATEGORY(
+        "<b>Number of Categories:</b><br>The number of categories of clothing the shop has.",
+        LockMode::LOCK_WHILE_RUNNING,
+        1, 1, 5
+    )
+    , GO_HOME_WHEN_DONE(false)
+    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_STATUS_UPDATE,
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+{
+    PA_ADD_OPTION(USE_LP);
+    PA_ADD_OPTION(WEAR_NEW_CLOTHES);
+    PA_ADD_OPTION(NUM_CATEGORY);
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+void ClothingBuyer::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    assert_16_9_720p_min(env.logger(), env.console);
+
+    //  Connect the controller.
+    require_player(env.console, context, BUTTON_LCLICK);
+
+    /*
+    * Start at the top of the first category in clothing shop menu.
+    * Program will buy everything in num of categories.
+    * Can set num category higher or lower and will still work.
+    * Lower - can buy only one category by setting to one and starting program on desired clothes type
+    * Higher - will take longer to finish as it will repeat an already purchased category
+    * Stop conditions: Out of money/lp, hit catogory count
+    */
+
+    uint8_t category_rotation_count = 0;
+    bool finish_program = false;
+    while (category_rotation_count < NUM_CATEGORY){
+        pbf_press_button(context, BUTTON_A, 160ms, 800ms);
+
+        AdvanceDialogWatcher already_purchased(COLOR_RED);
+        PromptDialogWatcher buy_yes_no(COLOR_CYAN);
+        PromptDialogWatcher hairstyle_purchase_prompt(COLOR_RED);
+        int retP = 0;
+        bool incompatible_hairstyle = false;
+
+        int ret = wait_until(
+            env.console, context,
+            std::chrono::seconds(10),
+            { already_purchased, buy_yes_no }
+        );
+        switch (ret){
+        case 0:
+                env.log("Item already purchased or incompatible hairstyle.");
+                pbf_press_button(context, BUTTON_A, 80ms, 800ms);
+
+                retP = wait_until(
+                    env.console, context,
+                    std::chrono::seconds(2),
+                    { hairstyle_purchase_prompt }
+                );
+                if (retP != 0){
+                    env.log("Item already purchased.");
+                    send_program_status_notification(
+                        env, NOTIFICATION_STATUS_UPDATE,
+                        "Item already purchased."
+                    );
+                    break;
+                }
+                env.log("Incompatible hairstyle. Proceed to purchase.");
+                incompatible_hairstyle = true;
+        case 1:
+        {
+            PromptDialogWatcher wear_yes_no(COLOR_CYAN);
+            AdvanceDialogWatcher afford_yes_no(COLOR_RED);
+            AdvanceDialogWatcher afford_yes_no_hairstyle(COLOR_RED);
+            int retHairstyle;
+
+            env.log("Detected purchase prompt.");
+
+            if (USE_LP){
+                env.log("Using LP.");
+                pbf_press_dpad(context, DPAD_DOWN, 80ms, 800ms);
+            }
+            env.log("Purchasing.");
+            //Purchase, then wait a bit more for wear prompt detector.
+            pbf_press_button(context, BUTTON_A, 80ms, 800ms);
+            pbf_wait(context, 800ms);
+            context.wait_for_all_requests();
+
+            int retWear = wait_until(
+                env.console, context,
+                std::chrono::seconds(10),
+                { wear_yes_no, afford_yes_no }
+            );
+            switch (retWear){
+            case 0:
+                if (!WEAR_NEW_CLOTHES){
+                    env.log("Do not wear new clothes.");
+                    pbf_press_dpad(context, DPAD_DOWN, 80ms, 800ms);
+                }else{
+                    env.log("Wear new clothes.");
+                }
+                pbf_press_button(context, BUTTON_A, 80ms, 800ms);
+                env.log("Clothing purchased. Selecting next item.");
+                send_program_status_notification(
+                    env, NOTIFICATION_STATUS_UPDATE,
+                    "Clothing purchased. Selecting next item."
+                );
+                break;
+            case 1:
+                if (!incompatible_hairstyle){
+                    env.log("Out of Cash/LP.");
+                    send_program_status_notification(
+                        env, NOTIFICATION_STATUS_UPDATE,
+                        "Out of Cash/LP."
+                    );
+                    finish_program = true;
+                }else{
+                    pbf_press_button(context, BUTTON_A, 80ms, 800ms);
+                    retHairstyle = wait_until(
+                        env.console, context,
+                        std::chrono::seconds(2),
+                        { afford_yes_no_hairstyle }
+                    );
+                    if (retHairstyle == 0){
+                        env.log("Out of Cash/LP.");
+                        send_program_status_notification(
+                            env, NOTIFICATION_STATUS_UPDATE,
+                            "Out of Cash/LP."
+                        );
+                        finish_program = true;
+                    }
+                }
+                break;
+            default:
+                env.log("Error looking for wear prompt.");
+                OperationFailedExceptionWithScreenshot::fire(
+                    ErrorReportMode::SEND_ERROR_REPORT,
+                    "Error looking for wear prompt.",
+                    env.console
+                );
+                break;
+            }
+            break;
+        }
+        default:
+                env.log("Error looking for purchase prompt.");
+                OperationFailedExceptionWithScreenshot::fire(
+                    ErrorReportMode::SEND_ERROR_REPORT,
+                    "Error looking for purchase prompt.",
+                    env.console
+                );
+                break;
+        }
+        //Out of cash/LP, stop.
+        if (finish_program){
+            break;
+        }
+
+        env.log("Moving on to next item.");
+        pbf_press_dpad(context, DPAD_DOWN, 80ms, 800ms);
+        //Wait to load a bit for next item
+        pbf_wait(context, 800ms);
+        context.wait_for_all_requests();
+
+        ClothingTopWatcher top_item(COLOR_YELLOW);
+
+        int retTop = wait_until(
+            env.console, context,
+            std::chrono::seconds(1),
+            { top_item }
+        );
+        if (retTop == 0){
+            env.log("Reached top of category.");
+            if (NUM_CATEGORY > 1){
+                env.log("Category rotation set. Moving to next category.");
+                pbf_press_dpad(context, DPAD_RIGHT, 80ms, 800ms);
+                pbf_wait(context, 800ms);
+                context.wait_for_all_requests();
+                category_rotation_count++;
+            }else{
+                env.log("No category rotation. Ending program.");
+                break;
+            }
+        }
+
+    }
+    env.log("Category num hit. Ending program.");
+    GO_HOME_WHEN_DONE.run_end_of_program(context);
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+}
+
+
+}
+}
+}
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/General/PokemonSV_ClothingBuyer.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/General/PokemonSV_ClothingBuyer.h
new file mode 100644
index 0000000000..9ad3ba27b0
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/General/PokemonSV_ClothingBuyer.h
@@ -0,0 +1,50 @@
+/*  Clothing Buyer
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_ClothingBuyer_H
+#define PokemonAutomation_PokemonSV_ClothingBuyer_H
+
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+class ClothingBuyer_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    ClothingBuyer_Descriptor();
+};
+
+class ClothingBuyer : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = ClothingBuyer_Descriptor;
+    ClothingBuyer();
+
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    BooleanCheckBoxOption USE_LP;
+    BooleanCheckBoxOption WEAR_NEW_CLOTHES;
+    SimpleIntegerOption<uint8_t> NUM_CATEGORY;
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
+    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+
+}
+}
+}
+#endif
+
+
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/General/PokemonSV_MassPurchase.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/General/PokemonSV_MassPurchase.cpp
new file mode 100644
index 0000000000..5adc1f718f
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/General/PokemonSV_MassPurchase.cpp
@@ -0,0 +1,250 @@
+/*  SV Mass Purchase
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Exceptions.h"
+#include "CommonFramework/Exceptions/FatalProgramException.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/Tools/ProgramEnvironment.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "CommonTools/StartupChecks/VideoResolutionCheck.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h"
+#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h"
+#include "PokemonSV_MassPurchase.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+    using namespace Pokemon;
+
+MassPurchase_Descriptor::MassPurchase_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonSV:MassPurchase",
+        STRING_POKEMON + " SV", "Mass Purchase",
+        "Programs/PokemonSV/MassPurchase.html",
+        "Purchase a specified amount of items from a shop.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+struct MassPurchase_Descriptor::Stats : public StatsTracker{
+    Stats()
+        : total_items(m_stats["Items Purchased"])
+        , skip(m_stats["Skipped"])
+        , errors(m_stats["Errors"])
+    {
+        m_display_order.emplace_back(Stat("Items Purchased"));
+        m_display_order.emplace_back(Stat("Skipped"));
+        m_display_order.emplace_back(Stat("Errors"));
+    }
+    std::atomic<uint64_t>& total_items;
+    std::atomic<uint64_t>& skip;
+    std::atomic<uint64_t>& errors;
+};
+std::unique_ptr<StatsTracker> MassPurchase_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+MassPurchase::MassPurchase()
+    : ITEMS(
+        "<b>Items to Buy:</b><br>The amount of Items to buy from the position of the cursor.",
+        LockMode::LOCK_WHILE_RUNNING,
+        50
+    )
+    , QUANTITY(
+        "<b>Quantity to Buy:</b><br>The amount of each item to buy. If a clothing store, set to 1.",
+        LockMode::LOCK_WHILE_RUNNING,
+        1, 1, 999
+    )
+    , GO_HOME_WHEN_DONE(false)
+    , PAY_LP(
+        "<b>Pay with LP:</b>",
+        LockMode::UNLOCK_WHILE_RUNNING, false
+    )
+    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_STATUS_UPDATE,
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_RECOVERABLE,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+{
+    PA_ADD_OPTION(ITEMS);
+    PA_ADD_OPTION(QUANTITY);
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+    PA_ADD_OPTION(PAY_LP);
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+bool MassPurchase::mass_purchase(ProgramEnvironment& env, VideoStream& stream, ProControllerContext& context){
+    MassPurchase_Descriptor::Stats& stats = env.current_stats<MassPurchase_Descriptor::Stats>();
+
+    OverworldWatcher overworld(stream.logger(), COLOR_RED);
+    AdvanceDialogWatcher dialog(COLOR_CYAN);
+    context.wait_for_all_requests();
+    int ret = wait_until(
+        stream, context,
+        std::chrono::seconds(2),
+        {
+            overworld,
+            dialog,
+        }
+    );
+    context.wait_for(std::chrono::milliseconds(50));
+
+    switch (ret){
+    case 0:
+        env.log("Error - Stuck in Overworld");
+        stats.errors++;
+        throw_and_log<FatalProgramException>(
+            stream.logger(), ErrorReportMode::SEND_ERROR_REPORT,
+            "Stuck in Overworld.",
+            stream
+        );
+
+    case 1:
+        env.log("Detected full bag. Skipped Item");
+        stats.skip++;
+        send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
+        return true;
+
+    default:
+        return false;
+    }
+};
+    
+bool MassPurchase::extra_items(ProgramEnvironment& env, VideoStream& stream, ProControllerContext& context){
+    MassPurchase_Descriptor::Stats& stats = env.current_stats<MassPurchase_Descriptor::Stats>();
+
+    OverworldWatcher overworld(stream.logger(), COLOR_RED);
+    AdvanceDialogWatcher dialog(COLOR_CYAN);
+    context.wait_for_all_requests();
+    int ret = wait_until(
+        stream, context,
+        std::chrono::seconds(2),
+        {
+            overworld,
+            dialog,
+        }
+    );
+    context.wait_for(std::chrono::milliseconds(50));
+
+    switch (ret){
+    case 0:
+        env.log("Error - Stuck in Overworld");
+        stats.errors++;
+        throw_and_log<FatalProgramException>(
+            stream.logger(), ErrorReportMode::SEND_ERROR_REPORT,
+            "Stuck in Overworld.",
+            stream
+        );
+
+    case 1:
+        env.log("Detected Extra Item/Reward");
+        return true;
+
+    default:
+        return false;
+    }
+};
+
+void PokemonSV::MassPurchase::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    assert_16_9_720p_min(env.logger(), env.console);
+    MassPurchase_Descriptor::Stats& stats = env.current_stats<MassPurchase_Descriptor::Stats>();
+
+    //  Connect the controller.
+    require_player(env.console, context, BUTTON_LCLICK);
+
+    send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
+
+    uint16_t item_val = ITEMS;
+    bool skip_item = false;
+    bool extra = false;
+    while (item_val != 0){
+        uint16_t qt_val = QUANTITY;
+        pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+
+        skip_item = mass_purchase(env, env.console, context);
+
+        if (skip_item){
+            pbf_press_button(context, BUTTON_B, 160ms, 840ms);
+        }
+
+        if (!skip_item){
+            if (qt_val <= 500){
+                uint16_t current = 1;
+                while (current + 10 <= qt_val){
+                    pbf_press_dpad(context, DPAD_RIGHT, 160ms, 80ms);
+                    current += 10;
+                }
+                while (current < qt_val){
+                    pbf_press_dpad(context, DPAD_UP, 160ms, 80ms);
+                    current++;
+                }
+            }else{
+                uint16_t current = 999;
+                pbf_press_dpad(context, DPAD_LEFT, 160ms, 80ms);
+                while (current >= qt_val + 10){
+                    pbf_press_dpad(context, DPAD_LEFT, 160ms, 80ms);
+                    current -= 10;
+                }
+                while (current > qt_val){
+                    pbf_press_dpad(context, DPAD_DOWN, 160ms, 80ms);
+                    current--;
+                }
+            }
+
+            pbf_press_button(context, BUTTON_A, 160ms, 1000ms);
+
+            if (PAY_LP){
+                pbf_press_dpad(context, DPAD_DOWN, 40ms, 840ms);
+            }
+
+            pbf_press_button(context, BUTTON_A, 160ms, 1840ms);
+            pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+            extra = extra_items(env, env.console, context);
+            if (extra){
+                pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+            };
+
+            env.log("Item Purchased");
+            stats.total_items++;
+            env.update_stats();
+            send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
+        }
+        
+        pbf_press_dpad(context, DPAD_DOWN, 160ms, 840ms);
+        
+        item_val--;
+    }
+        
+    pbf_press_button(context, BUTTON_B, 160ms, 840ms);
+    pbf_press_button(context, BUTTON_B, 160ms, 840ms);
+    pbf_press_button(context, BUTTON_B, 160ms, 840ms);
+    pbf_press_button(context, BUTTON_B, 160ms, 840ms);
+    pbf_press_button(context, BUTTON_B, 160ms, 840ms);
+    pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+    pbf_press_button(context, BUTTON_B, 160ms, 840ms);
+    pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+
+    GO_HOME_WHEN_DONE.run_end_of_program(context);
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+}
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/General/PokemonSV_MassPurchase.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/General/PokemonSV_MassPurchase.h
new file mode 100644
index 0000000000..717937723e
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/General/PokemonSV_MassPurchase.h
@@ -0,0 +1,56 @@
+/*  Mass Purchase
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_MassPurchase_H
+#define PokemonAutomation_PokemonSV_MassPurchase_H
+
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+class MassPurchase_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    MassPurchase_Descriptor();
+    struct Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+
+class MassPurchase : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = MassPurchase_Descriptor;
+    MassPurchase();
+
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    bool mass_purchase(ProgramEnvironment& env, VideoStream& stream, ProControllerContext& context);
+    bool extra_items(ProgramEnvironment& env, VideoStream& stream, ProControllerContext& context);
+    
+private:
+    SimpleIntegerOption<uint16_t> ITEMS;
+    SimpleIntegerOption<uint16_t> QUANTITY;
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
+    BooleanCheckBoxOption PAY_LP;
+    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/General/PokemonSV_SizeChecker.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/General/PokemonSV_SizeChecker.cpp
new file mode 100644
index 0000000000..555972a49c
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/General/PokemonSV_SizeChecker.cpp
@@ -0,0 +1,291 @@
+/*  Size Checker
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "CommonTools/StartupChecks/VideoResolutionCheck.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h"
+#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h"
+#include "VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxDetection.h"
+#include "VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxEggDetector.h"
+#include "VideoGames/PokemonSV/Programs/Boxes/PokemonSV_BoxRoutines.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h"
+#include "PokemonSV_SizeChecker.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+using namespace Pokemon;
+
+
+SizeChecker_Descriptor::SizeChecker_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonSV:SizeChecker",
+        STRING_POKEMON + " SV", "Size Checker",
+        "Programs/PokemonSV/SizeChecker.html",
+        "Check boxes of " + STRING_POKEMON + " for size marks.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+struct SizeChecker_Descriptor::Stats : public StatsTracker{
+    Stats()
+        : m_boxes(m_stats["Boxes Checked"])
+        , m_checked(m_stats["Checked"])
+        , m_empty(m_stats["Empty Slots"])
+        , m_eggs(m_stats["Eggs"])
+        , m_mark(m_stats["Mark/Ribbon"])
+    {
+        m_display_order.emplace_back("Boxes Checked");
+        m_display_order.emplace_back("Checked");
+        m_display_order.emplace_back("Empty Slots");
+        m_display_order.emplace_back("Eggs");
+        m_display_order.emplace_back("Mark/Ribbon");
+    }
+    std::atomic<uint64_t>& m_boxes;
+    std::atomic<uint64_t>& m_checked;
+    std::atomic<uint64_t>& m_empty;
+    std::atomic<uint64_t>& m_eggs;
+    std::atomic<uint64_t>& m_mark;
+};
+std::unique_ptr<StatsTracker> SizeChecker_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+
+
+SizeChecker::SizeChecker()
+    : GO_HOME_WHEN_DONE(false)
+    , BOXES_TO_CHECK(
+        "<b>Number of Boxes to Check:</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        2, 1, 32
+    )
+    , NOTIFICATION_MARK("Mark/Ribbon Given", true, false, ImageAttachmentMode::JPG, { "Notifs" })
+    , NOTIFICATIONS({
+        &NOTIFICATION_MARK,
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+{
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+    PA_ADD_OPTION(BOXES_TO_CHECK);
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+
+
+
+void SizeChecker::enter_check_mode(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    env.console.log("Enter box mode to check size...");
+    WallClock start = current_time();
+
+    while (true){
+        if (current_time() - start > std::chrono::minutes(2)){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "enter_check_mode(): Failed to enter box mode after 2 minutes.",
+                env.console
+            );
+        }
+        
+        AdvanceDialogWatcher dialog(COLOR_GREEN);
+        OverworldWatcher overworld(env.console, COLOR_CYAN);
+        GradientArrowWatcher prompt(COLOR_YELLOW, GradientArrowType::RIGHT, {0.72, 0.55, 0.05, 0.08});
+        BoxWatcher box(COLOR_BLUE);
+        
+        context.wait_for_all_requests();
+
+        int ret = wait_until(
+            env.console, context,
+            std::chrono::seconds(60),
+            {dialog, overworld, prompt, box}
+        );
+        context.wait_for(std::chrono::milliseconds(100));
+
+        switch (ret){
+
+        case 0: // dialog
+        case 1: // overworld
+        case 2: // prompt
+            pbf_press_button(context, BUTTON_A, 160ms, 40ms);
+            continue;
+        case 3: // box
+            return;
+
+        default:
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "enter_check_mode(): No recognized state after 60 seconds.",
+                env.console
+            );
+        }
+    }
+
+}
+
+
+
+void SizeChecker::exit_check_mode(SingleSwitchProgramEnvironment& env, ProControllerContext& context, VideoSnapshot screen){
+    SizeChecker_Descriptor::Stats& stats = env.current_stats<SizeChecker_Descriptor::Stats>();
+    env.console.log("Check size and exit box mode...");
+    WallClock start = current_time();
+
+    while (true){
+        if (current_time() - start > std::chrono::minutes(2)){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "exit_check_mode(): Failed to exit box mode after 2 minutes.",
+                env.console
+            );
+        }
+
+        DialogBoxWatcher ribbon(COLOR_GREEN, true, std::chrono::milliseconds(250), DialogType::DIALOG_BLACK);
+        DialogBoxWatcher dialog(COLOR_GREEN, true, std::chrono::milliseconds(250), DialogType::DIALOG_WHITE);
+        OverworldWatcher overworld(env.console, COLOR_CYAN);
+        
+        context.wait_for_all_requests();
+
+        int ret = wait_until(
+            env.console, context,
+            std::chrono::seconds(60),
+            {ribbon, dialog, overworld}
+        );
+        context.wait_for(std::chrono::milliseconds(100));
+
+        switch (ret){
+
+        case 0: // ribbon
+            stats.m_mark++;
+            env.update_stats();
+
+            send_program_notification(
+                env, NOTIFICATION_MARK,
+                COLOR_ORANGE, "Mark/Ribbon Given",
+                {}, "",
+                screen
+            );
+        case 1: // dialog
+            pbf_press_button(context, BUTTON_A, 160ms, 40ms);
+            continue;
+        case 2: // overworld
+            return;
+
+        default:
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "exit_check_mode(): No recognized state after 60 seconds.",
+                env.console
+            );
+        }
+
+    }
+
+}
+
+
+
+void SizeChecker::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    assert_16_9_720p_min(env.logger(), env.console);
+
+    SizeChecker_Descriptor::Stats& stats = env.current_stats<SizeChecker_Descriptor::Stats>();
+
+    //  Connect the controller.
+    require_player(env.console, context, BUTTON_L);
+
+    // Loop through boxes.
+    for (uint8_t box = 0; box < BOXES_TO_CHECK; box++){
+        enter_check_mode(env, context);
+        context.wait_for_all_requests();
+
+        if (box > 0){
+            move_to_right_box(context);
+        }
+        context.wait_for_all_requests();
+
+        // Loop through the rows and columns.
+        for (uint8_t row = 0; row < 5; row++){
+            for (uint8_t col = 0; col < 6; col++){
+                enter_check_mode(env, context);
+                context.wait_for_all_requests();
+                move_box_cursor(env.program_info(), env.console, context, BoxCursorLocation::SLOTS, row, col);
+
+                SomethingInBoxSlotDetector sth_in_box_detector(COLOR_RED);
+                BoxCurrentEggDetector egg_detector;
+                VideoOverlaySet overlays(env.console.overlay());
+                sth_in_box_detector.make_overlays(overlays);
+                egg_detector.make_overlays(overlays);
+                context.wait_for_all_requests();
+
+                VideoSnapshot screen = env.console.video().snapshot();
+
+                if (!sth_in_box_detector.detect(screen)){
+                    env.console.log("Detected empty cell.");
+                    stats.m_empty++;
+                    env.update_stats();
+                    continue;
+                }
+
+                if (egg_detector.detect(screen)){
+                    env.console.log("Detected egg in cell.");
+                    stats.m_eggs++;
+                    env.update_stats();
+                    continue;
+                }
+                context.wait_for_all_requests();
+
+                // Initiate size checking prompt.
+                DialogBoxWatcher dialog(COLOR_GREEN, true, std::chrono::milliseconds(250), DialogType::DIALOG_WHITE);
+                int ret = run_until<ProControllerContext>(
+                    env.console, context,
+                    [](ProControllerContext& context){
+                        for (size_t c = 0; c < 10; c++){
+                            pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+                        }
+                    },
+                    {dialog}
+                );
+                if (ret < 0){
+                    OperationFailedExceptionWithScreenshot::fire(
+                        ErrorReportMode::SEND_ERROR_REPORT,
+                        "Unable to initiate check after 10 A presses.",
+                        env.console
+                    );
+                }
+                context.wait_for_all_requests();
+
+                exit_check_mode(env, context, screen);
+                context.wait_for_all_requests();
+
+                stats.m_checked++;
+                env.update_stats();
+            }
+        }
+
+        stats.m_boxes++;
+        env.update_stats();
+    }
+
+    // handle last box space being empty
+    press_Bs_to_back_to_overworld(env.program_info(), env.console, context);
+
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+    GO_HOME_WHEN_DONE.run_end_of_program(context);
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/General/PokemonSV_SizeChecker.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/General/PokemonSV_SizeChecker.h
new file mode 100644
index 0000000000..eedf1f667d
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/General/PokemonSV_SizeChecker.h
@@ -0,0 +1,57 @@
+/*  Size Checker
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_SizeChecker_H
+#define PokemonAutomation_PokemonSV_SizeChecker_H
+
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+class BoxDetector;
+
+
+class SizeChecker_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    SizeChecker_Descriptor();
+
+    struct Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+
+};
+
+
+
+
+class SizeChecker : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = SizeChecker_Descriptor;
+    SizeChecker();
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    void enter_check_mode(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+    void exit_check_mode(SingleSwitchProgramEnvironment& env, ProControllerContext& context, VideoSnapshot screen);
+
+private:
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
+    SimpleIntegerOption<uint8_t> BOXES_TO_CHECK;
+    EventNotificationOption NOTIFICATION_MARK;
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/General/PokemonSV_StatsReset.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/General/PokemonSV_StatsReset.cpp
new file mode 100644
index 0000000000..e12b47c804
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/General/PokemonSV_StatsReset.cpp
@@ -0,0 +1,653 @@
+/*  Stats Reset
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "CommonTools/StartupChecks/VideoResolutionCheck.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonSV/PokemonSV_Settings.h"
+#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h"
+#include "VideoGames/PokemonSV/Inference/Battles/PokemonSV_NormalBattleMenus.h"
+#include "VideoGames/PokemonSV/Inference/Boxes/PokemonSV_StatsResetChecker.h"
+#include "VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxDetection.h"
+#include "VideoGames/PokemonSV/Inference/Boxes/PokemonSV_IvJudgeReader.h"
+#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h"
+#include "VideoGames/PokemonSV/Programs/Battles/PokemonSV_BasicCatcher.h"
+#include "VideoGames/PokemonSV/Programs/Boxes/PokemonSV_BoxRoutines.h"
+#include "PokemonSV_StatsReset.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+using namespace Pokemon;
+ 
+StatsReset_Descriptor::StatsReset_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonSV:StatsReset",
+        STRING_POKEMON + " SV", "Stats Reset",
+        "Programs/PokemonSV/StatsReset.html",
+        "Repeatedly catch static encounters until you get the stats you want.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+struct StatsReset_Descriptor::Stats : public StatsTracker{
+    Stats()
+        : resets(m_stats["Resets"])
+        , balls(m_stats["Balls Thrown"])
+        , catches(m_stats["Catches"])
+        , matches(m_stats["Matches"])
+        , errors(m_stats["Errors"])
+    {
+        m_display_order.emplace_back("Resets");
+        m_display_order.emplace_back("Balls Thrown");
+        m_display_order.emplace_back("Catches");
+        m_display_order.emplace_back("Matches");
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+    }
+    std::atomic<uint64_t>& resets;
+    std::atomic<uint64_t>& balls;
+    std::atomic<uint64_t>& catches;
+    std::atomic<uint64_t>& matches;
+    std::atomic<uint64_t>& errors;
+};
+std::unique_ptr<StatsTracker> StatsReset_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+StatsReset::StatsReset()
+    : TARGET(
+        "<b>Target:</b><br>The Pokemon you are resetting for.",
+        //"Treasures of Ruin: Stand in front of the unsealed vaults of one of the Ruinous Quartet.<br>"
+        //"Loyal Three: Stand in front of Okidogi/Munkidori/Fezandipiti.<br>"
+        //"Snacksworth Legendary: After unlocking a legendary from Snacksworth, stand in front of it.<br>"
+        //"Generic: You are standing in front of a Pokemon that requires an A press to initiate battle.<br>",
+        //"Gimmighoul: Stand in front of a Gimmighoul chest.<br>",
+        {
+            {Target::TreasuresOfRuin, "treasures-of-ruin", "Treasures of Ruin"},
+            {Target::LoyalThree, "loyal-three", "Loyal Three"},
+            {Target::Snacksworth, "snacksworth", "Snacksworth Legendaries + Meloetta"},
+            {Target::Generic, "generic", "Indigo Disk Paradoxes (nature only) + Gimmighoul"},
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        Target::TreasuresOfRuin
+    )
+    , LANGUAGE(
+        "<b>Game Language:</b><br>This field is required so we can read IVs.",
+        IV_READER().languages(),
+        LockMode::LOCK_WHILE_RUNNING,
+        true
+    )
+    , BALL_SELECT(
+        "<b>Ball Select:</b>",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        "poke-ball"
+    )
+    , QUICKBALL(
+        "<b>Throw Quick Ball:</b><br>Use a Quick Ball on the first turn. If there are moves in the Move Table, they will run <i>after</i> the Quick Ball is thrown.",
+        LockMode::LOCK_WHILE_RUNNING,
+        false
+    )
+    , FILTERS(
+        StatsHuntIvJudgeFilterTable_Label_Regular,
+        {
+            .action = false,
+            .shiny = false,
+            .gender = false,
+            .nature = true,
+        }
+    )
+    , GO_HOME_WHEN_DONE(false)
+    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_STATUS_UPDATE,
+        & NOTIFICATION_PROGRAM_FINISH,
+        & NOTIFICATION_ERROR_FATAL,
+    })
+{
+    {
+        std::vector<std::unique_ptr<EditableTableRow>> ret;
+        {
+            auto row = std::make_unique<StatsHuntIvJudgeFilterRow>(FILTERS);
+            row->iv_atk.set(IvJudgeFilter::NoGood);
+            ret.emplace_back(std::move(row));
+        }
+        {
+            auto row = std::make_unique<StatsHuntIvJudgeFilterRow>(FILTERS);
+            row->iv_speed.set(IvJudgeFilter::NoGood);
+            ret.emplace_back(std::move(row));
+        }
+        FILTERS.set_default(std::move(ret));
+    }
+    PA_ADD_OPTION(TARGET);
+    PA_ADD_OPTION(LANGUAGE); //This is required
+    PA_ADD_OPTION(BALL_SELECT);
+    PA_ADD_OPTION(QUICKBALL);
+    PA_ADD_OPTION(BATTLE_MOVES);
+    PA_ADD_OPTION(FILTERS); //Note: None of these can be shiny, and the quartet will have some perfect IVs.
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+bool StatsReset::enter_battle(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    StatsReset_Descriptor::Stats& stats = env.current_stats<StatsReset_Descriptor::Stats>();
+
+    //Press A to talk to target
+    AdvanceDialogWatcher advance_detector(COLOR_YELLOW);
+    pbf_press_button(context, BUTTON_A, 80ms, 400ms);
+    int retD = wait_until(env.console, context, Milliseconds(4000), { advance_detector });
+    if (retD < 0){
+        env.log("Dialog not detected.");
+    }
+
+    switch (TARGET){
+    case Target::TreasuresOfRuin:
+        //~30 seconds to start battle?
+        pbf_mash_button(context, BUTTON_A, 26000ms);
+        context.wait_for_all_requests();
+        break;
+    case Target::LoyalThree:
+        //Mash through dialog box
+        pbf_mash_button(context, BUTTON_B, 10400ms);
+        context.wait_for_all_requests();
+        break;
+    case Target::Snacksworth:
+        //The same as generic, but Snacksworth legendaries are not in the dex and skip the caught/summary/add to party menu.
+        pbf_mash_button(context, BUTTON_B, 2000ms);
+        context.wait_for_all_requests();
+        break;
+    case Target::Generic:
+        //Mash A to initiate battle
+        pbf_mash_button(context, BUTTON_A, 720ms);
+        context.wait_for_all_requests();
+        break;
+    default:
+        throw InternalProgramError(&env.logger(), PA_CURRENT_FUNCTION, "Unknown Target");
+    }
+
+    NormalBattleMenuWatcher battle_menu(COLOR_YELLOW);
+    int ret = wait_until(
+        env.console, context,
+        std::chrono::seconds(15),
+        { battle_menu }
+    );
+    if (ret != 0){
+        stats.errors++;
+        env.update_stats();
+        env.log("Failed to enter battle!", COLOR_RED);
+
+        return false;
+        /*
+        OperationFailedExceptionWithScreenshot::fire(
+            env.console, ErrorReportMode::SEND_ERROR_REPORT,
+            "Failed to enter battle. Are you facing the Pokemon or in a menu?",
+            true
+        );
+        */
+    }
+    return true;
+}
+
+void StatsReset::open_ball_menu(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    StatsReset_Descriptor::Stats& stats = env.current_stats<StatsReset_Descriptor::Stats>();
+
+    BattleBallReader reader(env.console, LANGUAGE);
+    std::string ball_reader = "";
+    WallClock start = current_time();
+
+    env.log("Opening ball menu...");
+    while (ball_reader == ""){
+        if (current_time() - start > std::chrono::minutes(2)){
+            env.log("Timed out trying to read ball after 2 minutes.", COLOR_RED);
+            stats.errors++;
+            env.update_stats();
+            send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "Timed out trying to read ball after 2 minutes.",
+                env.console
+            );
+        }
+
+        //Mash B to exit anything else
+        pbf_mash_button(context, BUTTON_B, 1000ms);
+        context.wait_for_all_requests();
+
+        //Press X to open Ball menu
+        pbf_press_button(context, BUTTON_X, 160ms, 800ms);
+        context.wait_for_all_requests();
+
+        VideoSnapshot screen = env.console.video().snapshot();
+        ball_reader = reader.read_ball(screen);
+    }
+}
+
+//Returns target_fainted. If overworld is detected then the target fainted.
+//Otherwise if AdvanceDialog is detected the Pokemon was caught or the player lost.
+bool StatsReset::run_battle(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    StatsReset_Descriptor::Stats& stats = env.current_stats<StatsReset_Descriptor::Stats>();
+
+    AdvanceDialogWatcher advance_dialog(COLOR_MAGENTA);
+    OverworldWatcher overworld(env.console, COLOR_BLUE);
+
+    uint8_t switch_party_slot = 1;
+
+    size_t table_turn = 0;
+    std::vector<std::unique_ptr<BattleMoveTableRow>> move_table = BATTLE_MOVES.copy_snapshot();
+
+    bool target_fainted = false;
+    bool out_of_balls = false;
+    bool quickball_thrown = false;
+
+    int ret = run_until<ProControllerContext>(
+        env.console, context,
+        [&](ProControllerContext& context){
+            while (true){
+                //Check that battle menu appears - this is in case of swapping pokemon
+                NormalBattleMenuWatcher menu_before_throw(COLOR_YELLOW);
+                int bMenu = wait_until(
+                    env.console, context,
+                    std::chrono::seconds(15),
+                    { menu_before_throw }
+                );
+                if (bMenu < 0){
+                    env.console.log("Unable to find menu_before_throw.");
+                    stats.errors++;
+                    env.update_stats();
+                    OperationFailedExceptionWithScreenshot::fire(
+                        ErrorReportMode::SEND_ERROR_REPORT,
+                        "Unable to find menu_before_throw.",
+                        env.console
+                    );
+                }
+
+                //Quick ball occurs before anything else in battle, so we can throw the ball without worrying about bounce/fainted/etc.
+                if (QUICKBALL && !quickball_thrown){
+                    env.log("Quick Ball option checked. Throwing Quick Ball.");
+
+                    BattleBallReader reader(env.console, LANGUAGE);
+                    open_ball_menu(env, context);
+
+                    env.log("Selecting Quick Ball.");
+                    int quantity = move_to_ball(reader, env.console, context, "quick-ball");
+                    if (quantity == 0){
+                        //Stop so user can check they have quick balls.
+                        env.console.log("Unable to find Quick Ball on turn 1.");
+                        stats.errors++;
+                        env.update_stats();
+                        OperationFailedExceptionWithScreenshot::fire(
+                            ErrorReportMode::SEND_ERROR_REPORT,
+                            "Unable to find Quick Ball on turn 1.",
+                            env.console
+                        );
+                    }
+                    if (quantity < 0){
+                        stats.errors++;
+                        env.update_stats();
+                        env.console.log("Unable to read ball quantity.", COLOR_RED);
+                    }
+
+                    //Throw ball
+                    env.log("Throwing Quick Ball.");
+                    pbf_mash_button(context, BUTTON_A, 1200ms);
+                    context.wait_for_all_requests();
+
+                    quickball_thrown = true;
+
+                    stats.balls++;
+                    env.update_stats();
+                    pbf_mash_button(context, BUTTON_B, 7200ms);
+                    context.wait_for_all_requests();
+                }else if (switch_party_slot == 1 && !move_table.empty() && table_turn < move_table.size()){
+                    //Lead pokemon not fainted and table has not been completed
+                    //Run through moves in table
+                    env.log("Lead has not fainted, using move.");
+
+                    MoveSelectWatcher move_watcher(COLOR_BLUE);
+                    MoveSelectDetector move_select(COLOR_BLUE);
+                    BattleMoveType move = move_table.at(table_turn)->type;
+                    uint8_t move_slot = 0;
+
+                    //Leaving room to expand to other battle actions later
+                    switch (move){
+                    case BattleMoveType::Move1:
+                        move_slot = 0;
+                        break;
+                    case BattleMoveType::Move2:
+                        move_slot = 1;
+                        break;
+                    case BattleMoveType::Move3:
+                        move_slot = 2;
+                        break;
+                    case BattleMoveType::Move4:
+                        move_slot = 3;
+                        break;
+                    }
+
+                    //Select and use move
+                    int ret_move_select = run_until<ProControllerContext>(
+                    env.console, context,
+                    [&](ProControllerContext& context){
+                        pbf_press_button(context, BUTTON_A, 80ms, 400ms);
+                        pbf_wait(context, 800ms);
+                        context.wait_for_all_requests();
+                    },
+                    { move_watcher }
+                    );
+                    if (ret_move_select != 0){
+                        env.log("Could not find move select.");
+                    }else{
+                        env.log("Move select found!");
+                    }
+
+                    context.wait_for_all_requests();
+                    move_select.move_to_slot(env.console, context, move_slot);
+                    pbf_mash_button(context, BUTTON_A, 1200ms);
+                    pbf_wait(context, 800ms);
+                    context.wait_for_all_requests();
+                    table_turn++;
+
+                    //Check for battle menu
+                    //If found after a second, assume out of PP and stop as this is a setup issue
+                    //None of the target pokemon for this program have disable, taunt, etc.
+                    NormalBattleMenuWatcher battle_menu(COLOR_YELLOW);
+                    int ret = wait_until(
+                        env.console, context,
+                        std::chrono::seconds(4),
+                        { battle_menu }
+                    );
+                    if (ret == 0){
+                        env.console.log("Battle menu detected early. Out of PP, please check your setup.");
+                        stats.errors++;
+                        env.update_stats();
+                        OperationFailedExceptionWithScreenshot::fire(
+                            ErrorReportMode::SEND_ERROR_REPORT,
+                            "Battle menu detected early. Out of PP, please check your setup.",
+                            env.console
+                        );
+                    }else{
+                        env.log("Move successfully used.");
+                        if (table_turn == move_table.size()){
+                            env.log("End of table reached. Switch to throwing balls.");
+                        }
+                    }
+                }else{
+                    BattleBallReader reader(env.console, LANGUAGE);
+                    open_ball_menu(env, context);
+
+                    env.log("Selecting ball.");
+                    int quantity = move_to_ball(reader, env.console, context, BALL_SELECT.slug());
+                    if (quantity == 0){
+                        out_of_balls = true;
+                        env.console.log("Unable to find appropriate ball/out of balls.");
+                        send_program_status_notification(
+                            env, NOTIFICATION_STATUS_UPDATE,
+                            "Unable to find appropriate ball/out of balls."
+                        );
+                        break;
+                    }
+                    if (quantity < 0){
+                        stats.errors++;
+                        env.update_stats();
+                        env.console.log("Unable to read ball quantity.", COLOR_RED);
+                    }
+
+                    //Throw ball
+                    env.log("Throwing selected ball.");
+                    pbf_mash_button(context, BUTTON_A, 1200ms);
+                    context.wait_for_all_requests();
+
+                    //Check for battle menu
+                    //If found after a second then assume Chi-Yu used Bounce and is invulnerable
+                    //Use first attack this turn!
+                    NormalBattleMenuWatcher battle_menu(COLOR_YELLOW);
+                    int ret = wait_until(
+                        env.console, context,
+                        std::chrono::seconds(4),
+                        { battle_menu }
+                    );
+                    if (ret == 0){
+                        env.console.log("Battle menu detected early. Using first attack.");
+                        pbf_mash_button(context, BUTTON_A, 2000ms);
+                        context.wait_for_all_requests();
+                    }else{
+                        //Wild pokemon's turn/wait for catch animation
+                        stats.balls++;
+                        env.update_stats();
+                        pbf_mash_button(context, BUTTON_B, 7200ms);
+                        context.wait_for_all_requests();
+                    }
+                }
+
+                NormalBattleMenuWatcher battle_menu(COLOR_YELLOW);
+                OverworldWatcher overworld(env.console, COLOR_BLUE);
+                SwapMenuWatcher fainted(COLOR_YELLOW);
+                int ret2 = wait_until(
+                    env.console, context,
+                    std::chrono::seconds(60),
+                    { battle_menu, fainted }
+                );
+                switch (ret2){
+                case 0:
+                    env.log("Battle menu detected, continuing.");
+                    break;
+                case 1:
+                    env.log("Detected fainted Pokemon. Switching to next living Pokemon...");
+                    if (fainted.move_to_slot(env.console, context, switch_party_slot)){
+                        pbf_mash_button(context, BUTTON_A, 3000ms);
+                        context.wait_for_all_requests();
+                        switch_party_slot++;
+                    }
+                    break;
+                default:
+                    env.console.log("Invalid state ret2 run_battle.");
+                    stats.errors++;
+                    env.update_stats();
+                    OperationFailedExceptionWithScreenshot::fire(
+                        ErrorReportMode::SEND_ERROR_REPORT,
+                        "Invalid state ret2 run_battle.",
+                        env.console
+                    );
+                }
+
+            }
+        },
+        { advance_dialog, overworld }
+        );
+
+    switch (ret){
+    case 0:
+        //Non-Snack: dialog appears on caught screen.
+        //Snack: "target fled somewhere..."
+        //Lost battle: joy dialog
+        env.log("Advance Dialog detected. Caught regular target, lost battle, or fainted Snacksworth.");
+        target_fainted = false;
+        break;
+    case 1:
+        if (TARGET == Target::Snacksworth){
+            env.log("Overworld detected. Snacksworth legendary caught, checking box system.");
+            target_fainted = false;
+        }else{
+            env.log("Overworld detected, target Pokemon fainted.");
+            send_program_status_notification(
+                env, NOTIFICATION_STATUS_UPDATE,
+                "Overworld detected, target Pokemon fainted."
+            );
+            target_fainted = true;
+        }
+        break;
+    default:
+        if (out_of_balls){
+            target_fainted = true; //Resets game.
+            env.log("Ran out of selected Pokeball. Resetting.");
+            break;
+        }
+        env.console.log("Invalid state in run_battle().");
+        stats.errors++;
+        env.update_stats();
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "Invalid state in run_battle().",
+            env.console
+        );
+    }
+
+    return target_fainted;
+}
+
+bool StatsReset::check_stats(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    StatsReset_Descriptor::Stats& stats = env.current_stats<StatsReset_Descriptor::Stats>();
+    bool match = false;
+
+    //  Open box
+    enter_box_system_from_overworld(env.program_info(), env.console, context);
+    context.wait_for(std::chrono::milliseconds(400));
+
+    //  Check that the target pokemon was caught
+    if (check_empty_slots_in_party(env.program_info(), env.console, context) != 0){
+        env.console.log("One or more empty slots in party. Target was not caught or user setup error.");
+        send_program_status_notification(
+            env, NOTIFICATION_STATUS_UPDATE,
+            "One or more empty slots in party. Target was not caught."
+        );
+    }else{
+        stats.catches++;
+        env.update_stats();
+
+        //  Navigate to last party slot
+        move_box_cursor(env.program_info(), env.console, context, BoxCursorLocation::PARTY, 5, 0);
+
+        //  Check the IVs of the newly caught Pokemon - *must be on IV panel*
+        StatsHuntAction action = StatsHuntAction::Keep;
+        check_stats_reset_info(env.console, context, LANGUAGE, FILTERS, action);
+
+        switch (action){
+        case StatsHuntAction::StopProgram:
+            match = true;
+
+            pbf_press_button(context, BUTTON_CAPTURE, 2000ms, 5000ms);
+
+            env.console.log("Match found!");
+            stats.matches++;
+            env.update_stats();
+            break;
+        case StatsHuntAction::Discard:
+            match = false;
+            env.console.log("Stats did not match table settings.");
+            send_program_status_notification(
+                env, NOTIFICATION_STATUS_UPDATE,
+                "Stats did not match table settings."
+            );
+            break;
+        default:
+            env.console.log("Invalid state.");
+            stats.errors++;
+            env.update_stats();
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "Invalid state.",
+                env.console
+            );
+        }
+    }
+
+    return match;
+}
+
+void StatsReset::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    //  This will only work for Pokemon that you press A to talk to.
+    //  Regular static spawns will have the same stats, resetting won't work.
+    //  Won't apply to the former titan pokemon or the box legends + ogrepon either, as their IVs are locked.
+    //  So this really only applies to the ruinous quartet and loyal three
+    //  Use first attack if target pokemon is invulnerable (Chi-Yu used Bounce)
+
+    assert_16_9_720p_min(env.logger(), env.console);
+    StatsReset_Descriptor::Stats& stats = env.current_stats<StatsReset_Descriptor::Stats>();
+
+    //  Connect the controller.
+    require_player(env.console, context, BUTTON_L);
+
+    //  Autosave must be off, settings like Tera farmer.
+    bool stats_matched = false;
+    while (!stats_matched){
+        bool battle_started = false;
+        for (size_t c = 0; !battle_started; c++){
+            battle_started = enter_battle(env, context);
+
+            if (!battle_started){
+                env.log("Did not detect battle. Resetting.");
+                stats.resets++;
+                env.update_stats();
+                pbf_press_button(context, BUTTON_HOME, 160ms, GameSettings::instance().GAME_TO_HOME_DELAY1);
+                reset_game_from_home(env.program_info(), env.console, context, 5000ms);
+            }
+
+            //  Try to start battle 3 times.
+            if (c > 2){
+                OperationFailedExceptionWithScreenshot::fire(
+                    ErrorReportMode::SEND_ERROR_REPORT,
+                    "Failed to enter battle after 3 attempts.",
+                    env.console
+                );
+                break;
+            }
+        }
+        
+        bool target_fainted = run_battle(env, context);
+
+        if (!target_fainted){
+            //  Close all the dex entry and caught menus
+            //  If the player lost, this closes all dialog from Joy
+            OverworldWatcher overworld(env.console);
+            int retOver = run_until<ProControllerContext>(
+                env.console, context,
+                [](ProControllerContext& context){
+                    pbf_mash_button(context, BUTTON_B, 80000ms);
+                },
+                { overworld }
+                );
+            if (retOver != 0){
+                env.log("Failed to detect overworld.", COLOR_RED);
+            }else{
+                env.log("Detected overworld.");
+            }
+            context.wait_for_all_requests();
+
+            stats_matched = check_stats(env, context);
+        }
+
+        if (target_fainted || !stats_matched){
+            //  Reset game
+            send_program_status_notification(
+                env, NOTIFICATION_STATUS_UPDATE,
+                "Resetting game."
+            );
+            stats.resets++;
+            env.update_stats();
+            pbf_press_button(context, BUTTON_HOME, 160ms, GameSettings::instance().GAME_TO_HOME_DELAY1);
+            reset_game_from_home(env.program_info(), env.console, context, 5000ms);
+        }
+    }
+    env.update_stats();
+    auto screenshot = env.console.video().snapshot();
+    send_program_finished_notification(
+        env, NOTIFICATION_PROGRAM_FINISH,
+        "Match found!", screenshot, true
+    );
+    GO_HOME_WHEN_DONE.run_end_of_program(context);
+}
+    
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/General/PokemonSV_StatsReset.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/General/PokemonSV_StatsReset.h
new file mode 100644
index 0000000000..e92cfcc704
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/General/PokemonSV_StatsReset.h
@@ -0,0 +1,65 @@
+/*  Stats Reset
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_StatsReset_H
+#define PokemonAutomation_PokemonSV_StatsReset_H
+
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "CommonTools/Options/LanguageOCROption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+#include "Pokemon/Options/Pokemon_StatsHuntFilter.h"
+#include "VideoGames/PokemonSwSh/Options/PokemonSwSh_BallSelectOption.h"
+#include "VideoGames/PokemonSV/Options/PokemonSV_BattleMoveTable.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+class StatsReset_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    StatsReset_Descriptor();
+
+    struct Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+class StatsReset : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = StatsReset_Descriptor;
+    StatsReset();
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    //Can expand targets assuming there's anything else not locked in the DLC
+    enum class Target{
+        TreasuresOfRuin,
+        LoyalThree,
+        Snacksworth,
+        Generic,
+    };
+    EnumDropdownOption<Target> TARGET;
+
+    OCR::LanguageOCROption LANGUAGE;
+    PokemonSwSh::PokemonBallSelectOption BALL_SELECT;
+    BooleanCheckBoxOption QUICKBALL;
+    BattleMoveTable BATTLE_MOVES;
+    Pokemon::StatsHuntIvJudgeFilterTable FILTERS;
+
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
+    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
+    EventNotificationsOption NOTIFICATIONS;
+
+    bool enter_battle(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+    void open_ball_menu(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+    bool run_battle(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+    bool check_stats(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+};
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/General/PokemonSV_StatsResetEventBattle.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/General/PokemonSV_StatsResetEventBattle.cpp
new file mode 100644
index 0000000000..6de78c9f40
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/General/PokemonSV_StatsResetEventBattle.cpp
@@ -0,0 +1,578 @@
+/*  Stats Reset Event Battle
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "CommonTools/StartupChecks/VideoResolutionCheck.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonSV/PokemonSV_Settings.h"
+#include "VideoGames/PokemonSV/Inference/PokemonSV_PokemonSummaryReader.h"
+#include "VideoGames/PokemonSV/Inference/PokemonSV_StatHexagonReader.h"
+#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h"
+#include "VideoGames/PokemonSV/Inference/Battles/PokemonSV_NormalBattleMenus.h"
+#include "VideoGames/PokemonSV/Inference/Battles/PokemonSV_TeraBattleMenus.h"
+#include "VideoGames/PokemonSV/Inference/Battles/PokemonSV_BattleBallReader.h"
+#include "VideoGames/PokemonSV/Inference/Boxes/PokemonSV_IvJudgeReader.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h"
+#include "VideoGames/PokemonSV/Programs/Battles/PokemonSV_BasicCatcher.h"
+#include "PokemonSV_StatsResetEventBattle.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+using namespace Pokemon;
+
+
+
+IvDisplay::IvDisplay()
+    : GroupOption("Calculated IV Range", LockMode::READ_ONLY)
+    , hp(false, "<b>HP:</b>", LockMode::READ_ONLY, "-", "")
+    , atk(false, "<b>Attack:</b>", LockMode::READ_ONLY, "-", "")
+    , def(false, "<b>Defense:</b>", LockMode::READ_ONLY, "-", "")
+    , spatk(false, "<b>Special Attack:</b>", LockMode::READ_ONLY, "-", "")
+    , spdef(false, "<b>Special Defense:</b>", LockMode::READ_ONLY, "-", "")
+    , speed(false, "<b>Speed:</b>", LockMode::READ_ONLY, "-", "")
+{
+    PA_ADD_STATIC(hp);
+    PA_ADD_STATIC(atk);
+    PA_ADD_STATIC(def);
+    PA_ADD_STATIC(spatk);
+    PA_ADD_STATIC(spdef);
+    PA_ADD_STATIC(speed);
+}
+std::string IvDisplay::get_range_string(const IvRange& range){
+    if (range.low < 0 || range.high < 0){
+        return "(invalid or unable to read)";
+    }
+    if (range.low == range.high){
+        return std::to_string(range.low);
+    }
+    return std::to_string(range.low) + " - " + std::to_string(range.high);
+}
+void IvDisplay::set(const IvRanges& ivs){
+    hp.set(get_range_string(ivs.hp));
+    atk.set(get_range_string(ivs.attack));
+    def.set(get_range_string(ivs.defense));
+    spatk.set(get_range_string(ivs.spatk));
+    spdef.set(get_range_string(ivs.spdef));
+    speed.set(get_range_string(ivs.speed));
+}
+
+
+StatsResetEventBattle_Descriptor::StatsResetEventBattle_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonSV:StatsResetEventBattle",
+        STRING_POKEMON + " SV", "Stats Reset - Event Battle",
+        "Programs/PokemonSV/StatsResetEventBattle.html",
+        "Repeatedly catch Bloodmoon Ursaluna or Pecharunt until you get the stats you want.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+struct StatsResetEventBattle_Descriptor::Stats : public StatsTracker{
+    Stats()
+        : resets(m_stats["Resets"])
+        , catches(m_stats["Catches"])
+        , matches(m_stats["Matches"])
+        , errors(m_stats["Errors"])
+    {
+        m_display_order.emplace_back("Resets");
+        m_display_order.emplace_back("Catches");
+        m_display_order.emplace_back("Matches");
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+    }
+    std::atomic<uint64_t>& resets;
+    std::atomic<uint64_t>& catches;
+    std::atomic<uint64_t>& matches;
+    std::atomic<uint64_t>& errors;
+};
+std::unique_ptr<StatsTracker> StatsResetEventBattle_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+StatsResetEventBattle::StatsResetEventBattle()
+    : TARGET(
+        "<b>Target:</b><br>The Pokemon you are resetting for.",
+        {
+            {Target::Ursaluna, "ursaluna", "Bloodmoon Ursaluna"},
+            {Target::Pecharunt, "pecharunt", "Pecharunt"},
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        Target::Ursaluna
+    )
+    , LANGUAGE(
+        "<b>Game Language:</b><br>This field is required so we can read IVs.",
+        IV_READER().languages(),
+        LockMode::LOCK_WHILE_RUNNING,
+        true
+    )
+    , BALL_SELECT(
+        "<b>Ball Select:</b>",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        "poke-ball"
+    )
+    , TRY_TO_TERASTILLIZE(
+        "<b>Use Terastillization:</b><br>Tera at the start of battle.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        false
+    )
+#if 0
+    , FILTERS(
+        StatsHuntIvJudgeFilterTable_Label_Regular,
+        {
+            .action = false,
+            .shiny = false,
+            .gender = false,
+            .nature = false,
+        }
+    )
+#endif
+    , FILTERS0(
+        StatsHuntIvRangeFilterTable_Label_Regular,
+        {
+            .action = false,
+            .shiny = false,
+            .gender = false,
+            .nature = false,
+        }
+    )
+    , GO_HOME_WHEN_DONE(false)
+    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_STATUS_UPDATE,
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_RECOVERABLE,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+{
+#if 0
+    {
+        std::vector<std::unique_ptr<EditableTableRow>> ret;
+        {
+            auto row = std::make_unique<StatsHuntIvJudgeFilterRow>(FILTERS.feature_flags);
+            row->iv_atk.set(IvJudgeFilter::NoGood);
+            ret.emplace_back(std::move(row));
+        }
+        {
+            auto row = std::make_unique<StatsHuntIvJudgeFilterRow>(FILTERS.feature_flags);
+            row->iv_speed.set(IvJudgeFilter::NoGood);
+            ret.emplace_back(std::move(row));
+        }
+        FILTERS.set_default(std::move(ret));
+    }
+#endif
+    {
+        std::vector<std::unique_ptr<EditableTableRow>> ret;
+        {
+            auto row = std::make_unique<StatsHuntIvRangeFilterRow>(FILTERS0);
+            row->iv_atk.set(0, 1);
+            ret.emplace_back(std::move(row));
+        }
+        {
+            auto row = std::make_unique<StatsHuntIvRangeFilterRow>(FILTERS0);
+            row->iv_speed.set(0, 1);
+            ret.emplace_back(std::move(row));
+        }
+        FILTERS0.set_default(std::move(ret));
+        FILTERS0.restore_defaults();
+    }
+    PA_ADD_STATIC(CALCULATED_IVS);
+    PA_ADD_OPTION(TARGET);
+    PA_ADD_OPTION(LANGUAGE);
+    PA_ADD_OPTION(BALL_SELECT);
+    PA_ADD_OPTION(TRY_TO_TERASTILLIZE);
+    PA_ADD_OPTION(FILTERS0);
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+void StatsResetEventBattle::enter_battle_ursaluna(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    AdvanceDialogWatcher advance_detector(COLOR_YELLOW);
+    PromptDialogWatcher prompt_detector(COLOR_YELLOW);
+    NormalBattleMenuWatcher battle_menu(COLOR_YELLOW);
+
+    //  Initiate dialog with Perrin
+    pbf_press_button(context, BUTTON_A, 80ms, 400ms);
+    int ret = wait_until(env.console, context, Milliseconds(4000), { advance_detector });
+    if (ret == 0){
+        env.log("Dialog detected.");
+    }else{
+        env.log("Dialog not detected.");
+    }
+    //  Yes, ready
+    pbf_mash_button(context, BUTTON_A, 3200ms);
+    context.wait_for_all_requests();
+
+    //  Mash B until next dialog select
+    int retPrompt = run_until<ProControllerContext>(
+        env.console, context,
+        [](ProControllerContext& context){
+            pbf_mash_button(context, BUTTON_B, 80000ms);
+        },
+        { prompt_detector }
+        );
+    if (retPrompt != 0){
+        env.log("Failed to detect prompt dialog!", COLOR_RED);
+    }else{
+        env.log("Detected prompt dialog.");
+    }
+    context.wait_for_all_requests();
+
+    //  Pick an option to continue
+    pbf_mash_button(context, BUTTON_A, 3200ms);
+    context.wait_for_all_requests();
+
+    //  Mash B until next dialog select (again)
+//    PromptDialogWatcher prompt_detector2(COLOR_YELLOW);
+    int retPrompt2 = run_until<ProControllerContext>(
+        env.console, context,
+        [](ProControllerContext& context){
+            pbf_mash_button(context, BUTTON_B, 80000ms);
+        },
+        { prompt_detector }
+    );
+    if (retPrompt2 != 0){
+        env.log("Failed to detect prompt (again) dialog!", COLOR_RED);
+    }else{
+        env.log("Detected prompt (again) dialog.");
+    }
+    context.wait_for_all_requests();
+
+    //  Pick an option to continue
+    pbf_mash_button(context, BUTTON_A, 3200ms);
+    context.wait_for_all_requests();
+
+    //  Now keep going until the battle starts
+    int ret_battle = run_until<ProControllerContext>(
+        env.console, context,
+        [](ProControllerContext& context){
+            pbf_mash_button(context, BUTTON_B, 80000ms);
+        },
+        { battle_menu }
+    );
+    if (ret_battle != 0){
+        env.log("Failed to detect battle start!", COLOR_RED);
+    }else{
+        env.log("Battle started.");
+    }
+    context.wait_for_all_requests();
+}
+
+void StatsResetEventBattle::enter_battle_pecharunt(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    AdvanceDialogWatcher advance_detector(COLOR_YELLOW);
+    AdvanceDialogWatcher advance_detector2(COLOR_YELLOW);
+    NormalBattleMenuWatcher battle_menu(COLOR_YELLOW);
+
+    //  Talk to Pecharunt
+    pbf_press_button(context, BUTTON_A, 80ms, 400ms);
+    int ret = wait_until(env.console, context, Milliseconds(6000), { advance_detector });
+    if (ret == 0){
+        env.log("Dialog detected.");
+    }else{
+        env.log("Dialog not detected.");
+    }
+    pbf_mash_button(context, BUTTON_A, 3200ms);
+    context.wait_for_all_requests();
+
+    //  Do you want to challenge the strange pokemon?
+    int ret2 = wait_until(env.console, context, Milliseconds(6000), { advance_detector2 });
+    if (ret2 == 0){
+        env.log("Dialog detected.");
+    }else{
+        env.log("Dialog not detected.");
+    }
+    //  Mash through, answer Yes.
+    pbf_mash_button(context, BUTTON_A, 4000ms);
+    context.wait_for_all_requests();
+
+    //  Mash B until the battle starts
+    //  Note - Sending out Ogerpon/Loyal Three during battle adds time, but the below is more than enough.
+    int ret_battle = run_until<ProControllerContext>(
+        env.console, context,
+        [](ProControllerContext& context){
+            pbf_mash_button(context, BUTTON_B, 80000ms);
+        },
+        { battle_menu }
+        );
+    if (ret_battle != 0){
+        env.log("Failed to detect battle start!", COLOR_RED);
+    }else{
+        env.log("Battle started.");
+    }
+    context.wait_for_all_requests();
+}
+
+bool StatsResetEventBattle::run_battle(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    StatsResetEventBattle_Descriptor::Stats& stats = env.current_stats<StatsResetEventBattle_Descriptor::Stats>();
+
+    //  Assuming the player has a charged orb
+    if (TRY_TO_TERASTILLIZE){
+        env.log("Attempting to terastillize.");
+        //Open move menu
+        pbf_press_button(context, BUTTON_A, 80ms, 400ms);
+        pbf_wait(context, 800ms);
+        context.wait_for_all_requests();
+
+        pbf_press_button(context, BUTTON_R, 160ms, 400ms);
+        pbf_press_button(context, BUTTON_A, 80ms, 400ms);
+    }
+
+    //  Repeatedly use first attack
+    TeraCatchWatcher catch_menu(COLOR_BLUE);
+    AdvanceDialogWatcher lost(COLOR_YELLOW);
+    WallClock start = current_time();
+    uint8_t switch_party_slot = 1;
+
+    int ret = run_until<ProControllerContext>(
+        env.console, context,
+        [&](ProControllerContext& context){
+            while(true){
+                if (current_time() - start > std::chrono::minutes(5)){
+                    env.log("Timed out during battle after 5 minutes.", COLOR_RED);
+                    stats.errors++;
+                    env.update_stats();
+                    OperationFailedExceptionWithScreenshot::fire(
+                        ErrorReportMode::SEND_ERROR_REPORT,
+                        "Timed out during battle after 5 minutes.",
+                        env.console
+                    );
+                }
+
+                NormalBattleMenuWatcher battle_menu(COLOR_MAGENTA);
+                SwapMenuWatcher fainted(COLOR_RED);
+                context.wait_for_all_requests();
+
+                int ret = wait_until(
+                    env.console, context,
+                    std::chrono::seconds(90),
+                    { battle_menu, fainted }
+                );
+                switch (ret){
+                case 0:
+                    env.log("Detected battle menu. Pressing A to attack...");
+                    pbf_mash_button(context, BUTTON_A, 3000ms);
+                    context.wait_for_all_requests();
+                    break;
+                case 1:
+                    env.log("Detected fainted Pokemon. Switching to next living Pokemon...");
+                    if (fainted.move_to_slot(env.console, context, switch_party_slot)){
+                        pbf_mash_button(context, BUTTON_A, 3000ms);
+                        context.wait_for_all_requests();
+                        switch_party_slot++;
+                    }
+                    break;
+                default:
+                    env.log("Timed out during battle. Stuck, crashed, or took more than 90 seconds for a turn.", COLOR_RED);
+                    stats.errors++;
+                    env.update_stats();
+                    OperationFailedExceptionWithScreenshot::fire(
+                        ErrorReportMode::SEND_ERROR_REPORT,
+                        "Timed out during battle. Stuck, crashed, or took more than 90 seconds for a turn.",
+                        env.console
+                    );
+                }
+            }
+        },
+        { catch_menu, lost }
+    );
+    if (ret == 0){
+        env.log("Catch prompt detected.");
+
+        pbf_press_button(context, BUTTON_A, 160ms, 1200ms);
+        context.wait_for_all_requests();
+
+        BattleBallReader reader(env.console, LANGUAGE);
+        int quantity = move_to_ball(reader, env.console, context, BALL_SELECT.slug());
+        if (quantity == 0){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "Unable to find appropriate ball. Did you run out?",
+                env.console
+            );
+        }
+        if (quantity < 0){
+            stats.errors++;
+            env.update_stats();
+            env.log("Unable to read ball quantity.", COLOR_RED);
+        }
+        pbf_mash_button(context, BUTTON_A, 1000ms);
+        context.wait_for_all_requests();
+
+        stats.catches++;
+        env.update_stats();
+        env.log("Target caught.");
+    }else{
+        env.log("Battle against target lost.", COLOR_RED);
+        env.update_stats();
+        send_program_status_notification(
+            env, NOTIFICATION_STATUS_UPDATE,
+            "Battle against target lost."
+        );
+
+        return false;
+    }
+    return true;
+}
+
+
+bool StatsResetEventBattle::check_stats_after_win(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    //  If this is the first advance dialog, it might be linked to pokedex filling so press A and continue
+    bool first_advance_dialog = true;
+
+    while (true){
+        PromptDialogWatcher add_to_party(COLOR_PURPLE, {0.500, 0.395, 0.400, 0.100});
+        PromptDialogWatcher view_summary(COLOR_PURPLE, {0.500, 0.470, 0.400, 0.100});
+        PromptDialogWatcher nickname(COLOR_GREEN, {0.500, 0.545, 0.400, 0.100});
+        PokemonSummaryWatcher summary(COLOR_MAGENTA);
+        AdvanceDialogWatcher advance(COLOR_YELLOW);
+        context.wait_for_all_requests();
+        int ret = wait_until(
+            env.console, context, std::chrono::seconds(60),
+            {
+                add_to_party,
+                view_summary,
+                nickname,
+                summary,
+                advance,
+            }
+        );
+        switch (ret){
+        case 0:
+            env.console.log("Detected add-to-party prompt.");
+            pbf_press_dpad(context, DPAD_DOWN, 160ms, 480ms);
+            continue;
+        case 1:
+            env.console.log("Detected cursor over view summary.");
+            pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+            continue;
+        case 2:
+            env.console.log("Detected nickname prompt.");
+            pbf_press_button(context, BUTTON_B, 160ms, 840ms);
+            continue;
+        case 3:{
+            env.console.log("Detected summary.");
+            VideoOverlaySet overlays(env.console.overlay());
+
+            SummaryStatsReader reader;
+            reader.make_overlays(overlays);
+
+            pbf_press_dpad(context, DPAD_RIGHT, 160ms, 1840ms);
+            context.wait_for_all_requests();
+
+            auto snapshot = env.console.video().snapshot();
+            IvRanges ivs;
+            try{
+                if (TARGET == Target::Ursaluna){
+                    ivs = reader.calc_ivs(env.logger(), snapshot, { 113, 70, 120, 135, 65, 52 });
+                }else{
+                    ivs = reader.calc_ivs(env.logger(), snapshot, { 88, 88, 160, 88, 88, 88 });
+                }
+            }catch (OperationFailedException& e){
+                send_program_recoverable_error_notification(
+                    env, NOTIFICATION_ERROR_RECOVERABLE,
+                    e.message(),
+                    snapshot
+                );
+                return false;
+            }
+
+            CALCULATED_IVS.set(ivs);
+
+            StatsHuntAction action;
+            if (TARGET == Target::Ursaluna){
+                action = FILTERS0.get_action(false, StatsHuntGenderFilter::Any, NatureCheckerValue::Hardy, ivs);
+            }else{
+                action = FILTERS0.get_action(false, StatsHuntGenderFilter::Any, NatureCheckerValue::Timid, ivs);
+            }
+
+            return action != StatsHuntAction::Discard;
+        }
+        case 4:{
+            if (first_advance_dialog){
+                env.console.log("Pressing continue, in case it's a new pokedex entry.");
+                pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+                first_advance_dialog = false;
+                continue;
+            }else{
+                StatsResetEventBattle_Descriptor::Stats& stats = env.current_stats<StatsResetEventBattle_Descriptor::Stats>();
+                stats.errors++;
+                env.update_stats();
+                throw UserSetupError(
+                    env.logger(),
+                    "Did not detect add-to-party prompt. Make sure your party is full and \"Send to Boxes\" is set to \"Manual\"."
+                );
+            }
+        }
+        default:
+            StatsResetEventBattle_Descriptor::Stats& stats = env.current_stats<StatsResetEventBattle_Descriptor::Stats>();
+            stats.errors++;
+            env.update_stats();
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "StatsResetEventBattle::check_stats_after_win(): No state detected after 1 minute.",
+                env.console
+            );
+        }
+    }
+}
+
+void StatsResetEventBattle::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    assert_16_9_720p_min(env.logger(), env.console);
+    StatsResetEventBattle_Descriptor::Stats& stats = env.current_stats<StatsResetEventBattle_Descriptor::Stats>();
+
+    //  Connect the controller.
+    require_player(env.console, context, BUTTON_L);
+
+    while (true){
+        if (TARGET == Target::Ursaluna){
+            enter_battle_ursaluna(env, context);
+        }else{
+            enter_battle_pecharunt(env, context);
+        }
+
+        if (run_battle(env, context) && check_stats_after_win(env, context)){
+            break;
+        }
+
+        //  Reset
+        stats.resets++;
+        env.update_stats();
+        send_program_status_notification(
+            env, NOTIFICATION_STATUS_UPDATE,
+            "Resetting game."
+        );
+        pbf_press_button(context, BUTTON_HOME, 160ms, GameSettings::instance().GAME_TO_HOME_DELAY1);
+        reset_game_from_home(env.program_info(), env.console, context, 5000ms);
+    }
+    stats.matches++;
+    env.update_stats();
+
+    auto snapshot = env.console.video().snapshot();
+
+    GO_HOME_WHEN_DONE.run_end_of_program(context);
+    send_program_finished_notification(
+        env, NOTIFICATION_PROGRAM_FINISH,
+        "HP: " + (std::string)CALCULATED_IVS.hp + "\n" +
+        "Atk: " + (std::string)CALCULATED_IVS.atk + "\n" +
+        "Def: " + (std::string)CALCULATED_IVS.def + "\n" +
+        "SpAtk: " + (std::string)CALCULATED_IVS.spatk + "\n" +
+        "SpDef: " + (std::string)CALCULATED_IVS.spdef + "\n" +
+        "Speed: " + (std::string)CALCULATED_IVS.speed,
+        snapshot,
+        true
+    );
+}
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/General/PokemonSV_StatsResetEventBattle.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/General/PokemonSV_StatsResetEventBattle.h
new file mode 100644
index 0000000000..cb69013551
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/General/PokemonSV_StatsResetEventBattle.h
@@ -0,0 +1,90 @@
+/*  Stats Reset Event Battle
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_StatsResetEventBattle_H
+#define PokemonAutomation_PokemonSV_StatsResetEventBattle_H
+
+#include "Common/Cpp/Options/StringOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "CommonTools/Options/LanguageOCROption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+#include "Pokemon/Options/Pokemon_StatsHuntFilter.h"
+#include "VideoGames/PokemonSwSh/Options/PokemonSwSh_BallSelectOption.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+using namespace Pokemon;
+
+
+class IvDisplay : public GroupOption{
+public:
+    IvDisplay();
+
+    void set(const IvRanges& ivs);
+
+private:
+    static std::string get_range_string(const IvRange& range);
+
+public:
+    StringOption hp;
+    StringOption atk;
+    StringOption def;
+    StringOption spatk;
+    StringOption spdef;
+    StringOption speed;
+};
+
+
+class StatsResetEventBattle_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    StatsResetEventBattle_Descriptor();
+
+    struct Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+class StatsResetEventBattle : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = StatsResetEventBattle_Descriptor;
+    StatsResetEventBattle();
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    bool check_stats_after_win(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+
+private:
+    enum class Target{
+        Ursaluna,
+        Pecharunt,
+    };
+    EnumDropdownOption<Target> TARGET;
+
+    IvDisplay CALCULATED_IVS;
+
+    OCR::LanguageOCROption LANGUAGE;
+    PokemonSwSh::PokemonBallSelectOption BALL_SELECT;
+    BooleanCheckBoxOption TRY_TO_TERASTILLIZE;
+
+//    Pokemon::StatsHuntIvJudgeFilterTable FILTERS;
+    Pokemon::StatsHuntIvRangeFilterTable FILTERS0;
+
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
+    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
+    EventNotificationsOption NOTIFICATIONS;
+
+    void enter_battle_ursaluna(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+    void enter_battle_pecharunt(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+    bool run_battle(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+    bool check_stats(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+};
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Glitches/PokemonSV_CloneItems-1.0.1.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Glitches/PokemonSV_CloneItems-1.0.1.cpp
new file mode 100644
index 0000000000..81008b4b4b
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Glitches/PokemonSV_CloneItems-1.0.1.cpp
@@ -0,0 +1,330 @@
+/*  Clone Items
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Exceptions/FatalProgramException.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonFramework/Tools/ErrorDumper.h"
+#include "CommonTools/Images/SolidColorTest.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "CommonTools/StartupChecks/StartProgramChecks.h"
+#include "CommonTools/StartupChecks/VideoResolutionCheck.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_GradientArrowDetector.h"
+#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h"
+#include "VideoGames/PokemonSV/Inference/PokemonSV_MainMenuDetector.h"
+#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h"
+#include "PokemonSV_CloneItems-1.0.1.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+using namespace Pokemon;
+
+
+CloneItems101_Descriptor::CloneItems101_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonSV:CloneItems1.0.1",
+        STRING_POKEMON + " SV", "Clone Items (1.0.1)",
+        "Programs/PokemonSV/CloneItems-101.html",
+        "Clone items using the add-to-party glitch.",
+        PanelQualityStanding::UNMAINTAINED,
+        ProgramControllerClass::StandardController_RequiresPrecision,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+struct CloneItems101_Descriptor::Stats : public StatsTracker{
+    Stats()
+        : m_cloned(m_stats["Cloned"])
+        , m_errors(m_stats["Errors"])
+    {
+        m_display_order.emplace_back("Cloned");
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+    }
+    std::atomic<uint64_t>& m_cloned;
+    std::atomic<uint64_t>& m_errors;
+};
+std::unique_ptr<StatsTracker> CloneItems101_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+
+
+
+class BattleTeamDetector{
+public:
+    BattleTeamDetector()
+        : m_slot1(0.024, 0.187 + 0 * 0.1166, 0.005, 0.100)
+        , m_slot2(0.024, 0.187 + 1 * 0.1166, 0.005, 0.100)
+        , m_slot3(0.024, 0.187 + 2 * 0.1166, 0.005, 0.100)
+        , m_slot4(0.024, 0.187 + 3 * 0.1166, 0.005, 0.100)
+        , m_slot5(0.024, 0.187 + 4 * 0.1166, 0.005, 0.100)
+        , m_slot6(0.024, 0.187 + 5 * 0.1166, 0.005, 0.100)
+    {}
+
+    bool detect(const ImageViewRGB32& screen) const{
+        ImageStats stats1 = image_stats(extract_box_reference(screen, m_slot1));
+//        cout << stats0.average << stats0.stddev << endl;
+        if (!is_white(stats1, 500, 20)) return false;
+        ImageStats stats2 = image_stats(extract_box_reference(screen, m_slot2));
+        if (!is_white(stats2, 500, 20)) return false;
+        ImageStats stats3 = image_stats(extract_box_reference(screen, m_slot3));
+        if (!is_white(stats3, 500, 20)) return false;
+        ImageStats stats4 = image_stats(extract_box_reference(screen, m_slot4));
+        if (!is_white(stats4, 500, 20)) return false;
+        ImageStats stats5 = image_stats(extract_box_reference(screen, m_slot5));
+        if (!is_white(stats5, 500, 20)) return false;
+        ImageStats stats6 = image_stats(extract_box_reference(screen, m_slot6));
+        if (!is_white(stats6, 500, 20)) return false;
+        return true;
+    }
+
+private:
+    ImageFloatBox m_slot1;
+    ImageFloatBox m_slot2;
+    ImageFloatBox m_slot3;
+    ImageFloatBox m_slot4;
+    ImageFloatBox m_slot5;
+    ImageFloatBox m_slot6;
+};
+
+
+
+CloneItems101::CloneItems101()
+    : GO_HOME_WHEN_DONE(false)
+    , ITEMS_TO_CLONE(
+        "<b>Items to Clone:</b><br>Clone this many time.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        999, 1, 999
+    )
+    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_STATUS_UPDATE,
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_RECOVERABLE,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+{
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+    PA_ADD_OPTION(ITEMS_TO_CLONE);
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+
+
+bool CloneItems101::clone_item(ProgramEnvironment& env, VideoStream& stream, ProControllerContext& context){
+    CloneItems101_Descriptor::Stats& stats = env.current_stats<CloneItems101_Descriptor::Stats>();
+
+    bool item_held = false;
+    WallClock start = current_time();
+    while (true){
+        if (current_time() - start > std::chrono::minutes(5)){
+            dump_image_and_throw_recoverable_exception(
+                env.program_info(), stream, "CloneItemFailed",
+                "Failed to clone an item after 5 minutes."
+            );
+        }
+
+        OverworldWatcher overworld(stream.logger(), COLOR_RED);
+        MainMenuWatcher main_menu(COLOR_YELLOW);
+        GradientArrowWatcher party_select_top(COLOR_GREEN, GradientArrowType::RIGHT, {0.30, 0.27, 0.10, 0.08});
+        GradientArrowWatcher party_select_return(COLOR_GREEN, GradientArrowType::RIGHT, {0.30, 0.57, 0.10, 0.08});
+        GradientArrowWatcher party_select_back(COLOR_GREEN, GradientArrowType::RIGHT, {0.30, 0.64, 0.10, 0.08});
+        AdvanceDialogWatcher dialog(COLOR_CYAN);
+        GradientArrowWatcher box_slot_one(COLOR_BLUE, GradientArrowType::DOWN, {0.24, 0.16, 0.05, 0.09});
+
+        PromptDialogDetector return_to_ride_prompt(COLOR_DARKGREEN, {0.500, 0.545, 0.400, 0.100});
+        BattleTeamDetector battle_team;
+
+        context.wait_for_all_requests();
+        int ret = wait_until(
+            stream, context,
+            std::chrono::seconds(10),
+            {
+                overworld,
+                main_menu,
+                party_select_top,
+                party_select_return,
+                party_select_back,
+                dialog,
+                box_slot_one,
+            }
+        );
+        context.wait_for(std::chrono::milliseconds(50));
+
+        switch (ret){
+        case 0:
+            stream.log("Detected overworld. (unexpected)", COLOR_RED);
+            stats.m_errors++;
+            pbf_press_button(context, BUTTON_X, 160ms, 840ms);
+            continue;
+        case 1:
+            stream.log("Detected main menu.");
+            try{
+                if (item_held){
+                    main_menu.move_cursor(env.program_info(), stream, context, MenuSide::RIGHT, 1, true);
+                    pbf_press_button(context, BUTTON_A, 160ms, 160ms);
+                }else{
+                    main_menu.move_cursor(env.program_info(), stream, context, MenuSide::LEFT, 1, true);
+                    pbf_press_button(context, BUTTON_A, 160ms, 400ms);
+                    pbf_press_dpad(context, DPAD_UP, 80ms, 80ms);
+                    pbf_press_dpad(context, DPAD_UP, 160ms, 80ms);
+                    pbf_press_button(context, BUTTON_A, 160ms, 160ms);
+                }
+            }catch (OperationFailedExceptionWithScreenshot& e){
+                e.send_recoverable_error_notif_and_telemetry_report(env, NOTIFICATION_ERROR_RECOVERABLE);
+            }
+            continue;
+        case 2:
+            stream.log("Detected 6th slot select top. (unexpected)", COLOR_RED);
+            stats.m_errors++;
+            pbf_press_dpad(context, DPAD_UP, 80ms, 80ms);
+            pbf_press_dpad(context, DPAD_UP, 80ms, 80ms);
+            continue;
+        case 3:
+            stream.log("Detected 6th slot select return. (unexpected)", COLOR_RED);
+            stats.m_errors++;
+            pbf_press_button(context, BUTTON_A, 160ms, 160ms);
+            continue;
+        case 4:
+            stream.log("Detected 6th slot select back. (unexpected)", COLOR_RED);
+            stats.m_errors++;
+            pbf_press_dpad(context, DPAD_UP, 160ms, 240ms);
+            continue;
+        case 5:{
+            stream.log("Detected dialog.");
+
+            //  Resolve ambiguities.
+            VideoSnapshot snapshot = stream.video().snapshot();
+
+            //  Confirmation prompt for returning your ride back to ride form.
+            if (return_to_ride_prompt.detect(snapshot)){
+                pbf_press_button(context, BUTTON_A, 160ms, 160ms);
+                item_held = true;
+                continue;
+            }
+
+            //  No other recognized ambiguities.
+            pbf_press_button(context, BUTTON_B, 160ms, 160ms);
+            continue;
+        }
+        case 6:{
+            stream.log("Detected box slot 1.");
+
+            if (!item_held){
+                pbf_press_button(context, BUTTON_B, 160ms, 840ms);
+//                continue;
+                return true;
+            }
+
+            VideoSnapshot snapshot = stream.video().snapshot();
+
+            //  Not on the battle teams.
+            if (!battle_team.detect(snapshot)){
+                pbf_press_button(context, BUTTON_X, 160ms, 80ms);
+                pbf_press_button(context, BUTTON_X, 160ms, 80ms);
+                continue;
+            }
+
+            pbf_press_button(context, BUTTON_L, 160ms, 320ms);
+            pbf_press_button(context, BUTTON_A, 160ms, 400ms);
+            pbf_press_dpad(context, DPAD_DOWN, 80ms, 80ms);
+            pbf_press_dpad(context, DPAD_DOWN, 80ms, 80ms);
+            pbf_press_dpad(context, DPAD_DOWN, 80ms, 80ms);
+            pbf_press_button(context, BUTTON_A, 160ms, 400ms);
+            item_held = false;
+
+            continue;
+        }
+        default:
+            stats.m_errors++;
+            stream.log("No recognized state after 10 seconds.", COLOR_RED);
+            return false;
+//            dump_image_and_throw_recoverable_exception(
+//                env, console, NOTIFICATION_ERROR_RECOVERABLE,
+//                "CloneItemNoState", "No recognized state after 10 seconds."
+//            );
+        }
+
+    }
+}
+
+void CloneItems101::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    StartProgramChecks::check_performance_class_wired_or_wireless(context);
+    assert_16_9_720p_min(env.logger(), env.console);
+
+    //  Connect the controller.
+    require_player(env.console, context, BUTTON_LCLICK);
+
+    CloneItems101_Descriptor::Stats& stats = env.current_stats<CloneItems101_Descriptor::Stats>();
+
+    for (uint16_t cloned = 0; cloned < ITEMS_TO_CLONE;){
+        env.update_stats();
+        send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
+
+        if (clone_item(env, env.console, context)){
+            cloned++;
+            stats.m_cloned++;
+            continue;
+        }
+#if 0
+        try{
+            clone_item(env, env.console, context);
+            cloned++;
+            stats.m_cloned++;
+            continue;
+        }catch (OperationFailedExceptionWithScreenshot& e){
+            e.send_recoverable_error_notif_and_telemetry_report(env, NOTIFICATION_ERROR_RECOVERABLE);
+        }
+#endif
+
+        env.console.log("Attempting to recover by backing out to a known state.", COLOR_RED);
+
+        OverworldWatcher overworld(env.console, COLOR_RED);
+        MainMenuWatcher main_menu(COLOR_YELLOW);
+        context.wait_for_all_requests();
+        int ret = run_until<ProControllerContext>(
+            env.console, context,
+            [](ProControllerContext& context){
+                for (size_t c = 0; c < 10; c++){
+                    pbf_press_button(context, BUTTON_B, 160ms, 1840ms);
+                }
+            },
+            {overworld, main_menu}
+        );
+        context.wait_for(std::chrono::milliseconds(50));
+        if (ret < 0){
+            throw_and_log<FatalProgramException>(
+                env.console, ErrorReportMode::SEND_ERROR_REPORT,
+                "Unable to recover from error state.",
+                env.console
+            );
+        }
+    }
+
+    env.update_stats();
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+    GO_HOME_WHEN_DONE.run_end_of_program(context);
+}
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Glitches/PokemonSV_CloneItems-1.0.1.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Glitches/PokemonSV_CloneItems-1.0.1.h
new file mode 100644
index 0000000000..7cd13303f5
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Glitches/PokemonSV_CloneItems-1.0.1.h
@@ -0,0 +1,59 @@
+/*  Clone Items
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_CloneItems_H
+#define PokemonAutomation_PokemonSV_CloneItems_H
+
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+class CloneItems101_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    CloneItems101_Descriptor();
+
+    struct Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+
+};
+
+
+
+
+class CloneItems101 : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = CloneItems101_Descriptor;
+    CloneItems101();
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+
+private:
+    //  Returns true on success.
+    bool clone_item(ProgramEnvironment& env, VideoStream& stream, ProControllerContext& context);
+
+private:
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
+
+    SimpleIntegerOption<uint16_t> ITEMS_TO_CLONE;
+
+    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Glitches/PokemonSV_RideCloner-1.0.1.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Glitches/PokemonSV_RideCloner-1.0.1.cpp
new file mode 100644
index 0000000000..4dca93fecc
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Glitches/PokemonSV_RideCloner-1.0.1.cpp
@@ -0,0 +1,538 @@
+/*  Egg Fetcher
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Exceptions/FatalProgramException.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonFramework/Tools/ErrorDumper.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "CommonTools/StartupChecks/StartProgramChecks.h"
+#include "CommonTools/StartupChecks/VideoResolutionCheck.h"
+#include "NintendoSwitch/NintendoSwitch_Settings.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "NintendoSwitch/Programs/DateSpam/NintendoSwitch_HomeToDateTime.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "Pokemon/Inference/Pokemon_NameReader.h"
+#include "VideoGames/PokemonSV/PokemonSV_Settings.h"
+#include "VideoGames/PokemonSV/Inference/PokemonSV_MainMenuDetector.h"
+#include "VideoGames/PokemonSV/Inference/PokemonSV_PokemonSummaryReader.h"
+#include "VideoGames/PokemonSV/Inference/Battles/PokemonSV_TeraBattleMenus.h"
+#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h"
+#include "VideoGames/PokemonSV/Inference/Tera/PokemonSV_TeraCardDetector.h"
+#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h"
+#include "VideoGames/PokemonSV/Programs/Battles/PokemonSV_BasicCatcher.h"
+#include "VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_TeraRoutines.h"
+#include "VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_TeraBattler.h"
+#include "PokemonSV_RideCloner-1.0.1.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+using namespace Pokemon;
+
+
+RideCloner101_Descriptor::RideCloner101_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonSV:RideCloner1.0.1",
+        STRING_POKEMON + " SV", "Ride Cloner (1.0.1)",
+        "Programs/PokemonSV/RideCloner-101.html",
+        "Clone your ride legendary (and its item) using the add-to-party glitch.",
+        PanelQualityStanding::UNMAINTAINED,
+        ProgramControllerClass::StandardController_RequiresPrecision,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+struct RideCloner101_Descriptor::Stats : public StatsTracker{
+    Stats()
+        : m_skips(m_stats["Date Skips"])
+//        , m_raids(m_stats["Raids"])
+        , m_wins(m_stats["Wins"])
+        , m_losses(m_stats["Losses"])
+        , m_skipped(m_stats["Skipped"])
+        , m_errors(m_stats["Errors"])
+        , m_shinies(m_stats["Shinies"])
+        , m_cloned(m_stats["Cloned"])
+        , m_failed(m_stats["Failed"])
+    {
+        m_display_order.emplace_back("Date Skips");
+//        m_display_order.emplace_back("Raids");
+        m_display_order.emplace_back("Wins");
+        m_display_order.emplace_back("Losses");
+        m_display_order.emplace_back("Skipped");
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+        m_display_order.emplace_back("Shinies", HIDDEN_IF_ZERO);
+        m_display_order.emplace_back("Cloned");
+        m_display_order.emplace_back("Failed", HIDDEN_IF_ZERO);
+    }
+    std::atomic<uint64_t>& m_skips;
+//    std::atomic<uint64_t>& m_raids;
+    std::atomic<uint64_t>& m_wins;
+    std::atomic<uint64_t>& m_losses;
+    std::atomic<uint64_t>& m_skipped;
+    std::atomic<uint64_t>& m_errors;
+    std::atomic<uint64_t>& m_shinies;
+    std::atomic<uint64_t>& m_cloned;
+    std::atomic<uint64_t>& m_failed;
+};
+std::unique_ptr<StatsTracker> RideCloner101_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+
+
+RideCloner101::RideCloner101()
+    : GO_HOME_WHEN_DONE(false)
+    , LANGUAGE(
+        "<b>Game Language:</b>",
+        PokemonNameReader::instance().languages(),
+        LockMode::UNLOCK_WHILE_RUNNING
+    )
+    , MODE(
+        "<b>Mode:</b>",
+        {
+            {Mode::CLONE_ONLY,  "clone-only",   "Clone only. Don't stop on a shiny raid."},
+            {Mode::SHINY_HUNT,  "shiny-hunt",   "Shiny Hunt: Save before each raid and catch. Stop if shiny."},
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        Mode::SHINY_HUNT
+    )
+    , RIDES_TO_CLONE(
+        "<b>Rides to Clone:</b><br>Stop program after cloning this many times. Make sure you have enough box space for twice this amount.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        100, 1, 100
+    )
+    , MAX_STARS(
+        "<b>Max Stars:</b><br>Skip raids with more than this many stars to save time since you're likely to lose.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        4, 1, 7
+    )
+    , BALL_SELECT(
+        "<b>Ball Select:</b>",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        "poke-ball"
+    )
+    , FIX_TIME_ON_CATCH(
+        "<b>Fix Clock on Catch:</b><br>Fix the time when catching so the caught date will be correct.",
+        LockMode::UNLOCK_WHILE_RUNNING, false
+    )
+    , A_TO_B_DELAY0(
+        "<b>A-to-B Delay:</b><br>The delay between the critical A-to-B press that activates the glitch.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        "64ms"
+    )
+    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATION_NONSHINY(
+        "Non-Shiny Encounter",
+        true, false,
+        {"Notifs"},
+        std::chrono::seconds(3600)
+    )
+    , NOTIFICATION_SHINY(
+        "Shiny Encounter",
+        true, true, ImageAttachmentMode::JPG,
+        {"Notifs", "Showcase"}
+    )
+    , NOTIFICATIONS({
+        &NOTIFICATION_STATUS_UPDATE,
+        &NOTIFICATION_NONSHINY,
+        &NOTIFICATION_SHINY,
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_RECOVERABLE,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+{
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+    PA_ADD_OPTION(LANGUAGE);
+    PA_ADD_OPTION(MODE);
+    PA_ADD_OPTION(RIDES_TO_CLONE);
+    PA_ADD_OPTION(MAX_STARS);
+    PA_ADD_OPTION(BALL_SELECT);
+    PA_ADD_OPTION(FIX_TIME_ON_CATCH);
+    PA_ADD_OPTION(A_TO_B_DELAY0);
+    PA_ADD_OPTION(BATTLE_AI);
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+
+
+//  Start from the overworld with 5 (non-ride legendary) Pokemon in your
+//  party. Move your ride legendary into the 6th slot in your party.
+void RideCloner101::setup(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+    stream.log("Running setup...");
+
+    bool in_party = false;
+    WallClock start = current_time();
+    while (true){
+        if (current_time() - start > std::chrono::minutes(5)){
+            dump_image_and_throw_recoverable_exception(info, stream, "RideCloneSetupFailed", "Failed to setup after 5 minutes.");
+        }
+
+        OverworldWatcher overworld(stream.logger(), COLOR_RED);
+        MainMenuWatcher main_menu(COLOR_YELLOW);
+        AdvanceDialogWatcher advance(COLOR_PURPLE);
+        PromptDialogWatcher prompt(COLOR_GREEN, {0.500, 0.545, 0.400, 0.100});
+
+        context.wait_for_all_requests();
+        int ret = wait_until(
+            stream, context,
+            std::chrono::seconds(60),
+            {
+                overworld,
+                main_menu,
+                advance,
+                prompt,
+            }
+        );
+        context.wait_for(std::chrono::milliseconds(100));
+        VideoSnapshot snapshot = stream.video().snapshot();
+
+        switch (ret){
+        case 0:
+            stream.log("Detected overworld.");
+            if (in_party){
+                return;
+            }
+//            pbf_press_button(context, BUTTON_PLUS, 160ms, 1840ms);
+            pbf_press_button(context, BUTTON_X, 160ms, 840ms);
+            continue;
+        case 1:
+            stream.log("Detected main menu.");
+            if (advance.detect(snapshot)){
+                //  If we detect both the dialog and the main menu, it means we
+                //  are selecting who in the party to replace with the ride legendary.
+                main_menu.move_cursor(info, stream, context, MenuSide::LEFT, 5, false);
+                pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+                in_party = true;
+            }else{
+                //  Otherwise we try to move the ride legendary to the party.
+                if (main_menu.move_cursor(info, stream, context, MenuSide::LEFT, 6, false)){
+                    //  Success, continue.
+                    pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+                }else{
+                    //  Failed. It's already in our party.
+                    pbf_press_button(context, BUTTON_B, 160ms, 840ms);
+                    in_party = true;
+                }
+            }
+            continue;
+        case 2:
+            stream.log("Detected dialog.");
+            if (main_menu.detect(snapshot)){
+                //  If we detect both the dialog and the main menu, it means we
+                //  are selecting who in the party to replace with the ride legendary.
+                main_menu.move_cursor(info, stream, context, MenuSide::LEFT, 5, false);
+                pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+                in_party = true;
+            }else{
+                pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+            }
+            continue;
+        case 3:
+            stream.log("Detected prompt.");
+            pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+            continue;
+        default:
+            dump_image_and_throw_recoverable_exception(info, stream, "RideCloneSetupFailed",
+                "setup(): No recognized state after 60 seconds.");
+        }
+    }
+}
+bool RideCloner101::run_post_win(
+    ProgramEnvironment& env,
+    ConsoleHandle& console,
+    ProControllerContext& context
+){
+    console.log("Running post-win...");
+
+    RideCloner101_Descriptor::Stats& stats = env.current_stats<RideCloner101_Descriptor::Stats>();
+
+    if (FIX_TIME_ON_CATCH){
+        go_home(console, context);
+        home_to_date_time(console, context, false);
+        pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+        pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+        pbf_press_button(context, BUTTON_HOME, 160ms, ConsoleSettings::instance().SETTINGS_TO_HOME_DELAY0);
+        resume_game_from_home(console, context);
+    }
+
+    TeraResult result = TeraResult::NO_DETECTION;
+    VideoSnapshot screenshot;
+    bool add_to_party_menu = false;
+    bool success = false;
+    WallClock start = current_time();
+    while (true){
+        context.wait_for_all_requests();
+        if (current_time() - start > std::chrono::minutes(5)){
+            dump_image_and_throw_recoverable_exception(
+                env.program_info(),
+                console,
+                "RideCloneReturnToOverworldFailed",
+                "Failed to return to overworld after 5 minutes."
+            );
+        }
+
+        TeraCatchWatcher catch_menu(COLOR_BLUE);
+        WhiteButtonWatcher next_button(
+            COLOR_CYAN,
+            WhiteButton::ButtonA,
+            {0.8, 0.93, 0.2, 0.07},
+            WhiteButtonWatcher::FinderType::PRESENT,
+            std::chrono::seconds(1)
+        );
+        AdvanceDialogWatcher advance(COLOR_YELLOW);
+        PromptDialogWatcher add_to_party(COLOR_PURPLE, {0.500, 0.395, 0.400, 0.100});
+        PromptDialogWatcher nickname(COLOR_GREEN, {0.500, 0.545, 0.400, 0.100});
+        PokemonSummaryWatcher summary(COLOR_MAGENTA);
+        MainMenuWatcher main_menu(COLOR_BLUE);
+        OverworldWatcher overworld(console.logger(), COLOR_RED);
+        context.wait_for_all_requests();
+        int ret = wait_until(
+            console, context,
+            std::chrono::seconds(60),
+            {
+                catch_menu,
+                next_button,
+                advance,
+                add_to_party,
+                nickname,
+                summary,
+                main_menu,
+                overworld,
+            }
+        );
+        context.wait_for(std::chrono::milliseconds(100));
+        switch (ret){
+        case 0:{
+            console.log("Detected catch prompt.");
+            screenshot = console.video().snapshot();
+
+            pbf_press_button(context, BUTTON_A, 160ms, 1200ms);
+            context.wait_for_all_requests();
+
+            BattleBallReader reader(console, LANGUAGE);
+            int quantity = move_to_ball(reader, console, context, BALL_SELECT.slug());
+            if (quantity == 0){
+                throw_and_log<FatalProgramException>(
+                    console.logger(), ErrorReportMode::NO_ERROR_REPORT,
+                    "Unable to find appropriate ball. Did you run out?",
+                    console
+                );
+            }
+            if (quantity < 0){
+                console.log("Unable to read ball quantity.", COLOR_RED);
+            }
+            pbf_mash_button(context, BUTTON_A, 1000ms);
+
+            continue;
+        }
+        case 2:
+            console.log("Detected dialog.");
+            pbf_press_button(context, BUTTON_B, 160ms, 840ms);
+            continue;
+        case 3:
+            console.log("Detected add-to-party prompt.");
+            add_to_party_menu = true;
+            if (result == TeraResult::NO_DETECTION){
+                pbf_press_dpad(context, DPAD_DOWN, 160ms, 480ms);
+            }
+            pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+            continue;
+        case 4:
+            console.log("Detected prompt.");
+            pbf_press_button(context, BUTTON_B, 160ms, 840ms);
+            if (add_to_party_menu){
+                success = true;
+            }
+            continue;
+        case 1:
+            //  Next button detector is unreliable. Check if the summary is
+            //  open. If so, fall-through to that.
+            if (!summary.detect(console.video().snapshot())){
+                console.log("Detected possible (A) Next button.");
+                pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+                pbf_press_button(context, BUTTON_B, 160ms, 840ms);
+                continue;
+            }
+            console.log("Detected false positive (A) Next button.", COLOR_RED);
+        case 5:
+            console.log("Detected summary.");
+            if (result == TeraResult::NO_DETECTION){
+                context.wait_for(std::chrono::milliseconds(500));
+                result = run_tera_summary(
+                    env, console, context,
+                    NOTIFICATION_NONSHINY,
+                    NOTIFICATION_SHINY,
+                    MODE == Mode::SHINY_HUNT, screenshot,
+                    &stats.m_shinies
+                );
+            }
+            pbf_press_button(context, BUTTON_B, 160ms, 840ms);
+            continue;
+        case 6:
+            console.log("Detected party swap.");
+//            context.wait_for(std::chrono::milliseconds(150));
+            try{
+                if (main_menu.move_cursor(env.program_info(), console, context, MenuSide::LEFT, 5, false)){
+                    ssf_press_button(context, BUTTON_A, A_TO_B_DELAY0, 160ms);
+                    pbf_press_button(context, BUTTON_B, 160ms, 1840ms);
+                }
+            }catch (OperationFailedExceptionWithScreenshot& e){
+                e.send_recoverable_error_notif_and_telemetry_report(env, NOTIFICATION_ERROR_RECOVERABLE);
+            }
+            continue;
+        case 7:
+            console.log("Detected overworld.");
+            break;
+        default:
+            dump_image_and_throw_recoverable_exception(
+                env.program_info(), console, "FailedPostRaidWin",
+                "run_post_win(): No recognized state after 60 seconds."
+            );
+        }
+        break;
+    }
+
+
+
+
+    return success;
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+void RideCloner101::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    StartProgramChecks::check_performance_class_wired_or_wireless(context);
+    assert_16_9_720p_min(env.logger(), env.console);
+
+    //  Connect the controller.
+    require_player(env.console, context, BUTTON_LCLICK);
+
+    RideCloner101_Descriptor::Stats& stats = env.current_stats<RideCloner101_Descriptor::Stats>();
+
+
+    bool first = true;
+    size_t move_counter = 0;
+    for (uint16_t items = 0; items < RIDES_TO_CLONE;){
+        env.update_stats();
+        send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
+
+        setup(env.program_info(), env.console, context);
+
+        //  Find raid.
+        while (true){
+            env.update_stats();
+            if (!first){
+                day_skip_from_overworld(env.console, context);
+                pbf_wait(context, GameSettings::instance().RAID_SPAWN_DELAY0);
+                context.wait_for_all_requests();
+                stats.m_skips++;
+            }
+            first = false;
+
+            if (!open_raid(env.console, context)){
+                continue;
+            }
+            context.wait_for(std::chrono::milliseconds(500));
+
+            VideoSnapshot screen = env.console.video().snapshot();
+            TeraCardReader reader(COLOR_RED);
+            size_t stars = reader.stars(env.logger(),env.program_info(), screen);
+            if (stars != 0){
+                env.log("Detected " + std::to_string(stars) + " star raid.", COLOR_PURPLE);
+            }
+
+            if (stars > MAX_STARS){
+                env.log("Skipping raid...", COLOR_ORANGE);
+                stats.m_skipped++;
+                close_raid(env.program_info(), env.console, context);
+                continue;
+            }
+
+            //  Reopen the raid if we need to do stuff.
+            bool fix_position = move_counter % 5 == 1;
+            Mode mode = MODE;
+            if (fix_position || mode == Mode::SHINY_HUNT){
+                close_raid(env.program_info(), env.console, context);
+
+                //  Save game because we're shiny-hunting.
+                if (mode == Mode::SHINY_HUNT){
+                    save_game_from_overworld(env.program_info(), env.console, context);
+                }
+
+                //  Fix our position.
+                if (fix_position){
+                    pbf_move_left_joystick(context, {0, -1}, 1200ms, 0ms);
+                    pbf_move_left_joystick(context, {0, +1}, 1600ms, 0ms);
+                }
+
+                context.wait_for_all_requests();
+                if (open_raid(env.console, context)){
+                    env.log("Tera raid found!", COLOR_BLUE);
+                }else{
+                    env.log("No Tera raid found.", COLOR_ORANGE);
+                    continue;
+                }
+            }
+
+            pbf_press_dpad(context, DPAD_DOWN, 80ms, 80ms);
+            pbf_mash_button(context, BUTTON_A, 2000ms);
+
+            bool win = run_tera_battle(env, env.console, context, BATTLE_AI);
+
+            if (win){
+                stats.m_wins++;
+            }else{
+                stats.m_losses++;
+                context.wait_for(std::chrono::seconds(3));
+                continue;
+            }
+
+            break;
+        }
+
+        if (run_post_win(env, env.console, context)){
+            items++;
+            stats.m_cloned++;
+            pbf_press_button(context, BUTTON_PLUS, 160ms, 1840ms);
+        }else{
+            stats.m_failed++;
+        }
+
+        move_counter++;
+    }
+
+
+    env.update_stats();
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+    GO_HOME_WHEN_DONE.run_end_of_program(context);
+}
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Glitches/PokemonSV_RideCloner-1.0.1.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Glitches/PokemonSV_RideCloner-1.0.1.h
new file mode 100644
index 0000000000..4f50957137
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Glitches/PokemonSV_RideCloner-1.0.1.h
@@ -0,0 +1,85 @@
+/*  Ride Cloner
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_RideCloner_H
+#define PokemonAutomation_PokemonSV_RideCloner_H
+
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "Common/Cpp/Options/TimeDurationOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "CommonTools/Options/LanguageOCROption.h"
+#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "VideoGames/PokemonSwSh/Options/PokemonSwSh_BallSelectOption.h"
+#include "VideoGames/PokemonSV/Options/PokemonSV_TeraAIOption.h"
+
+namespace PokemonAutomation{
+    struct ProgramInfo;
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+class RideCloner101_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    RideCloner101_Descriptor();
+
+    struct Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+
+};
+
+
+
+
+class RideCloner101 : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = RideCloner101_Descriptor;
+    RideCloner101();
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    void setup(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context);
+    bool run_post_win(
+        ProgramEnvironment& env,
+        ConsoleHandle& console,
+        ProControllerContext& context
+    );
+
+private:
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
+
+    OCR::LanguageOCROption LANGUAGE;
+
+    enum class Mode{
+        CLONE_ONLY,
+        SHINY_HUNT,
+    };
+    EnumDropdownOption<Mode> MODE;
+
+    SimpleIntegerOption<uint16_t> RIDES_TO_CLONE;
+
+    SimpleIntegerOption<uint8_t> MAX_STARS;
+
+    PokemonSwSh::PokemonBallSelectOption BALL_SELECT;
+    BooleanCheckBoxOption FIX_TIME_ON_CATCH;
+
+    MillisecondsOption A_TO_B_DELAY0;
+    TeraAIOption BATTLE_AI;
+
+    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
+    EventNotificationOption NOTIFICATION_NONSHINY;
+    EventNotificationOption NOTIFICATION_SHINY;
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Glitches/PokemonSV_WildItemFarmer.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Glitches/PokemonSV_WildItemFarmer.cpp
new file mode 100644
index 0000000000..4ce5bd27b5
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Glitches/PokemonSV_WildItemFarmer.cpp
@@ -0,0 +1,475 @@
+/*  Wild Item Farmer
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonTools/Images/SolidColorTest.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "CommonTools/StartupChecks/VideoResolutionCheck.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonSV/Inference/PokemonSV_WhiteButtonDetector.h"
+#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h"
+#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_GradientArrowDetector.h"
+#include "VideoGames/PokemonSV/Inference/PokemonSV_MainMenuDetector.h"
+#include "VideoGames/PokemonSV/Inference/PokemonSV_PokemonSummaryReader.h"
+#include "VideoGames/PokemonSV/Inference/Battles/PokemonSV_NormalBattleMenus.h"
+#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h"
+#include "PokemonSV_WildItemFarmer.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+WildItemFarmer_Descriptor::WildItemFarmer_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonSV:WildItemFarmer",
+        Pokemon::STRING_POKEMON + " SV", "Wild Item Farmer",
+        "Programs/PokemonSV/WildItemFarmer.html",
+        "Farm an item held by a wild " + Pokemon::STRING_POKEMON + ".",
+        PanelQualityStanding::UNMAINTAINED,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+
+struct WildItemFarmer_Descriptor::Stats : public StatsTracker{
+    Stats()
+        : battles(m_stats["Battles"])
+        , items(m_stats["Items Cloned"])
+        , failed(m_stats["Clone Failed"])
+        , errors(m_stats["Errors"])
+    {
+        m_display_order.emplace_back("Battles");
+        m_display_order.emplace_back("Items Cloned");
+        m_display_order.emplace_back("Clone Failed", HIDDEN_IF_ZERO);
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+    }
+    std::atomic<uint64_t>& battles;
+    std::atomic<uint64_t>& items;
+    std::atomic<uint64_t>& failed;
+    std::atomic<uint64_t>& errors;
+};
+std::unique_ptr<StatsTracker> WildItemFarmer_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+
+
+
+WildItemFarmer::WildItemFarmer()
+    : ITEMS_TO_CLONE(
+        "<b>Items to Clone:</b>",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        999, 0, 999
+    )
+#if 0
+    , TRICK_MOVE_SLOT(
+        "<b>Trick Move Slot:",
+        {
+            {0, "slot1", "Slot 1"},
+            {1, "slot2", "Slot 2"},
+            {2, "slot3", "Slot 3"},
+            {3, "slot4", "Slot 4"},
+        },
+        LockMode::UNLOCK_WHILE_RUNNING,
+        0
+    )
+#endif
+    , INITIAL_TRICK_PP(
+        "<b>Initial Trick PP:</b>",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        1, 0, 16
+    )
+    , VERIFY_ITEM_CLONED(
+        "<b>Verify Item Cloned:</b><br>Verify each run that the item has actually been cloned. "
+        "This will slow each iteration by a few seconds, but will better detect errors.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        true
+    )
+    , ENABLE_FORWARD_RUN(
+        "<b>Forward Run:</b><br>Run forward a bit before throwing ball. This will correct for "
+        "the clone moving away, but may cause your position to wander more.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        false
+    )
+    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_STATUS_UPDATE,
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+{
+    PA_ADD_OPTION(ITEMS_TO_CLONE);
+//    PA_ADD_OPTION(TRICK_MOVE_SLOT);
+    PA_ADD_OPTION(INITIAL_TRICK_PP);
+    PA_ADD_OPTION(VERIFY_ITEM_CLONED);
+    PA_ADD_OPTION(ENABLE_FORWARD_RUN);
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+void WildItemFarmer::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    try{
+        run_program(env, context);
+    }catch (...){
+        pbf_press_button(context, BUTTON_HOME, 160ms, 840ms);
+        throw;
+    }
+}
+
+void WildItemFarmer::refresh_pp(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    int move_overwrites = 0;
+    bool move_selected = false;
+    while (true){
+        WhiteButtonWatcher summary(
+            COLOR_RED, WhiteButton::ButtonA,
+            {0.12, 0.67, 0.20, 0.06},
+            WhiteButtonWatcher::FinderType::PRESENT,
+            std::chrono::milliseconds(500)
+        );
+        AdvanceDialogWatcher dialog(COLOR_RED);
+        GradientArrowWatcher action_select(COLOR_GREEN, GradientArrowType::RIGHT, {0.515, 0.33, 0.05, 0.09});
+        GradientArrowWatcher move_select(COLOR_YELLOW, GradientArrowType::RIGHT, {0.05, 0.20, 0.05, 0.09});
+        context.wait_for_all_requests();
+
+        int ret = wait_until(
+            env.console, context, std::chrono::seconds(10),
+            {
+                summary,
+                dialog,
+                action_select,
+                move_select,
+            }
+        );
+        if (move_overwrites >= 2){
+            pbf_mash_button(context, BUTTON_B, 400ms);
+            return;
+        }
+
+        switch (ret){
+        case 0:
+            if (move_selected){
+                move_overwrites++;
+            }
+            move_selected = false;
+            env.log("Detected Change Moves button. Overwrite count = " + std::to_string(move_overwrites));
+            if (move_overwrites >= 2){
+                continue;
+            }
+            pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+            continue;
+
+        case 1:
+            env.log("Detected dialog.");
+            pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+            continue;
+
+        case 2:
+            env.log("Detected action select.");
+            pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+            continue;
+
+        case 3:
+            env.log("Detected move select.");
+            pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+            move_selected = true;
+            continue;
+
+        default:
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "No state detected while changing moves after 10 seconds.",
+                env.console
+            );
+        }
+    }
+}
+
+bool WildItemFarmer::verify_item_held(SingleSwitchProgramEnvironment& env, ProControllerContext& context, NormalBattleMenuWatcher& battle_menu){
+    env.log("Verifying that item has been taken...");
+
+    while (true){
+        SwapMenuWatcher swap_menu(COLOR_BLUE);
+        context.wait_for_all_requests();
+        int ret = wait_until(
+            env.console, context, std::chrono::seconds(10),
+            {battle_menu, swap_menu}
+        );
+        context.wait_for(std::chrono::milliseconds(100));
+        switch (ret){
+        case 0:
+            env.log("Detected battle menu...");
+            if (!battle_menu.move_to_slot(env.console, context, 1)){
+                return false;
+            }
+            pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+            continue;
+
+        case 1:
+            env.log("Detected swap menu...");
+            break;
+
+        default:
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "Unable to detect " + Pokemon::STRING_POKEMON + " select menu.",
+                env.console
+            );
+        }
+
+        break;
+    }
+
+    VideoSnapshot screen = env.console.video().snapshot();
+    ImageViewRGB32 box = extract_box_reference(screen, ImageFloatBox(0.28, 0.20, 0.03, 0.055));
+    ImageStats stats = image_stats(box);
+    bool item_held = !is_solid(stats, {0.550405, 0.449595, 0.}, 0.20);
+
+    {
+        int ret = run_until<ProControllerContext>(
+            env.console, context,
+            [](ProControllerContext& context){
+                pbf_mash_button(context, BUTTON_B, 4000ms);
+            },
+            {battle_menu}
+        );
+        if (ret < 0){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "Unable to back out to battle menu.",
+                env.console
+            );
+        }
+    }
+
+    return item_held;
+}
+
+
+void WildItemFarmer::run_program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    assert_16_9_720p_min(env.logger(), env.console);
+    WildItemFarmer_Descriptor::Stats& stats = env.current_stats<WildItemFarmer_Descriptor::Stats>();
+
+    //  Connect the controller.
+    require_player(env.console, context, BUTTON_LCLICK);
+
+    const std::vector<std::pair<double, double>> MANUVERS{
+        {0, +1},
+        {-0.25, +1},
+        {+0.25, +1},
+    };
+
+    uint16_t items_cloned = 0;
+    bool trick_used = false;
+    bool overworld_seen = false;
+    int8_t trick_PP = INITIAL_TRICK_PP;
+    uint8_t consecutive_throw_attempts = 0;
+    WallClock last_trick_attempt = WallClock::min();
+    while (items_cloned < ITEMS_TO_CLONE){
+        OverworldWatcher overworld(env.console, COLOR_CYAN);
+        NormalBattleMenuWatcher battle_menu(COLOR_RED);
+        MoveSelectWatcher move_select(COLOR_YELLOW);
+        MainMenuWatcher main_menu(COLOR_GREEN);
+        PokemonSummaryWatcher summary(COLOR_BLUE);
+
+        context.wait_for_all_requests();
+
+        int ret = wait_until(
+            env.console, context, std::chrono::seconds(120),
+            {
+                overworld,
+                battle_menu,
+                move_select,
+                main_menu,
+                summary,
+            }
+        );
+        context.wait_for(std::chrono::milliseconds(100));
+        switch (ret){
+        case 0:
+            env.log("Detected overworld.");
+            if (trick_used && trick_PP > 0){
+                trick_PP--;
+                if (!VERIFY_ITEM_CLONED){
+                    items_cloned++;
+                    stats.items++;
+                    env.update_stats();
+                }
+            }
+            if (!overworld_seen){
+                send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
+            }
+            overworld_seen = true;
+            trick_used = false;
+
+            env.log("Trick PP: " + std::to_string(trick_PP));
+
+            if (trick_PP <= 0){
+                pbf_press_button(context, BUTTON_X, 160ms, 840ms);
+                continue;
+            }
+
+            if (consecutive_throw_attempts >= MANUVERS.size()){
+                stats.errors++;
+                env.update_stats();
+                OperationFailedExceptionWithScreenshot::fire(
+                    ErrorReportMode::NO_ERROR_REPORT,
+                    "Failed to start battle after " + std::to_string(MANUVERS.size()) + " attempts.",
+                    env.console
+                );
+            }
+
+            pbf_press_button(context, BUTTON_L, 160ms, 184ms);
+            if (ENABLE_FORWARD_RUN){
+                const std::pair<double, double>& direction = MANUVERS[consecutive_throw_attempts];
+                pbf_move_left_joystick(context, {direction.first, direction.second}, 400ms, 0ms);
+            }
+            pbf_mash_button(context, BUTTON_ZR, 2000ms);
+            pbf_wait(context, 2800ms);
+
+            consecutive_throw_attempts++;
+
+            continue;
+
+        case 1:
+            env.log("Detected battle menu.");
+            if (current_time() - std::chrono::seconds(5) < last_trick_attempt){
+                env.log("Unable to use move. Assume out of PP.");
+                trick_PP = 0;
+//                pbf_mash_button(context, BUTTON_B, 30);
+//                continue;
+            }
+
+            consecutive_throw_attempts = 0;
+            if (overworld_seen){
+                stats.battles++;
+                env.update_stats();
+            }
+            overworld_seen = false;
+
+            if (trick_used && trick_PP > 0 && VERIFY_ITEM_CLONED){
+                if (verify_item_held(env, context, battle_menu)){
+                    items_cloned++;
+                    stats.items++;
+                    env.update_stats();
+                }else{
+                    stats.failed++;
+                    env.update_stats();
+                    OperationFailedExceptionWithScreenshot::fire(
+                        ErrorReportMode::NO_ERROR_REPORT,
+                        "Failed to clone item. Possible incorrect encounter.",
+                        env.console
+                    );
+                }
+            }
+
+            if (trick_used || trick_PP <= 0){
+                env.log("Running away...");
+                if (battle_menu.move_to_slot(env.console, context, 3)){
+                    pbf_press_button(context, BUTTON_A, 160ms, 240ms);
+                }else{
+                    stats.errors++;
+                    env.update_stats();
+                    pbf_mash_button(context, BUTTON_B, 1000ms);
+                }
+            }else{
+                env.log("Attempt to select a move.");
+                if (battle_menu.move_to_slot(env.console, context, 0)){
+                    pbf_press_button(context, BUTTON_A, 160ms, 240ms);
+                }else{
+                    stats.errors++;
+                    env.update_stats();
+                    pbf_mash_button(context, BUTTON_B, 1000ms);
+                }
+            }
+            continue;
+
+        case 2:
+            env.log("Detected move select.");
+            if (current_time() - std::chrono::seconds(5) < last_trick_attempt){
+                env.log("Unable to use move. Assume out of PP.");
+                trick_PP = 0;
+                pbf_mash_button(context, BUTTON_B, 240ms);
+                continue;
+            }
+            if (move_select.move_to_slot(env.console, context, 0)){
+                pbf_press_button(context, BUTTON_A, 160ms, 240ms);
+                trick_used = true;
+                last_trick_attempt = current_time();
+            }else{
+                stats.errors++;
+                env.update_stats();
+                pbf_mash_button(context, BUTTON_B, 1000ms);
+            }
+            continue;
+
+        case 3:
+            env.log("Detected main menu.");
+            if (trick_PP > 0){
+                env.log("Backing out to overworld...");
+                pbf_press_button(context, BUTTON_B, 160ms, 840ms);
+                continue;
+            }
+
+            if (!main_menu.move_cursor(env.program_info(), env.console, context, MenuSide::LEFT, 0)){
+                stats.errors++;
+                env.update_stats();
+                pbf_press_button(context, BUTTON_B, 160ms, 840ms);
+                continue;
+            }
+
+            env.log("Attempting to enter summary...");
+
+            pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+            pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+
+            continue;
+
+        case 4:
+            env.log("Detected " + Pokemon::STRING_POKEMON + " summary.");
+
+            if (trick_PP > 0){
+                pbf_press_button(context, BUTTON_B, 160ms, 840ms);
+                continue;
+            }
+
+            pbf_press_dpad(context, DPAD_RIGHT, 160ms, 1840ms);
+
+            refresh_pp(env, context);
+            trick_PP = 10;
+
+            pbf_press_button(context, BUTTON_B, 160ms, 840ms);
+
+//            throw ProgramFinishedException(env.console, "Out of PP.");
+            continue;
+
+        default:
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "No state detected after 120 seconds.",
+                env.console
+            );
+        }
+
+
+    }
+
+
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+}
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Glitches/PokemonSV_WildItemFarmer.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Glitches/PokemonSV_WildItemFarmer.h
new file mode 100644
index 0000000000..52b95e35aa
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Glitches/PokemonSV_WildItemFarmer.h
@@ -0,0 +1,56 @@
+/*  Wild Item Farmer
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_WildItemFarmer_H
+#define PokemonAutomation_PokemonSwSh_WildItemFarmer_H
+
+#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+class NormalBattleMenuWatcher;
+
+
+class WildItemFarmer_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    WildItemFarmer_Descriptor();
+    struct Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+class WildItemFarmer : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = WildItemFarmer_Descriptor;
+    WildItemFarmer();
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    void refresh_pp(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+    bool verify_item_held(SingleSwitchProgramEnvironment& env, ProControllerContext& context, NormalBattleMenuWatcher& battle_menu);
+    void run_program(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+
+private:
+    SimpleIntegerOption<uint16_t> ITEMS_TO_CLONE;
+//    IntegerEnumDropdownOption TRICK_MOVE_SLOT;
+    SimpleIntegerOption<uint8_t> INITIAL_TRICK_PP;
+    BooleanCheckBoxOption VERIFY_ITEM_CLONED;
+    BooleanCheckBoxOption ENABLE_FORWARD_RUN;
+    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+}
+}
+}
+#endif
+
+
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ItemPrinter/PokemonSV_AutoItemPrinter.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ItemPrinter/PokemonSV_AutoItemPrinter.cpp
new file mode 100644
index 0000000000..b760a77119
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ItemPrinter/PokemonSV_AutoItemPrinter.cpp
@@ -0,0 +1,162 @@
+/*  Auto Item Printer
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "CommonTools/StartupChecks/VideoResolutionCheck.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_IvJudgeReader.h"
+#include "VideoGames/PokemonSV/Inference/PokemonSV_WhiteButtonDetector.h"
+#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h"
+#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h"
+#include "PokemonSV_ItemPrinterTools.h"
+#include "PokemonSV_AutoItemPrinter.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+using namespace Pokemon;
+
+
+
+
+AutoItemPrinter_Descriptor::AutoItemPrinter_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonSV:AutoItemPrinter",
+        STRING_POKEMON + " SV", "Auto Item Printer",
+        "Programs/PokemonSV/AutoItemPrinter.html",
+        "Automate the Item Printer for rare items.",
+        PanelQualityStanding::DEPRECATED,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+struct AutoItemPrinter_Descriptor::Stats : public StatsTracker{
+    Stats()
+        : m_rounds(m_stats["Rounds"])
+    {
+        m_display_order.emplace_back("Rounds");
+    }
+    std::atomic<uint64_t>& m_rounds;
+};
+std::unique_ptr<StatsTracker> AutoItemPrinter_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+
+
+AutoItemPrinter::AutoItemPrinter()
+    : LANGUAGE(
+        "<b>Game Language:</b>",
+        PokemonSwSh::IV_READER().languages(),
+        LockMode::UNLOCK_WHILE_RUNNING,
+        true
+    )
+    , NUM_ROUNDS(
+        "<b>Number of Rounds to Run:</b>",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        100
+    )
+    , GO_HOME_WHEN_DONE(false)
+    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_STATUS_UPDATE,
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+{
+    PA_ADD_OPTION(LANGUAGE);
+    PA_ADD_OPTION(NUM_ROUNDS);
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+
+void AutoItemPrinter::enter_printing_mode(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    env.console.log("Entering printing mode...");
+
+    while (true){
+        OverworldWatcher     overworld(env.console, COLOR_CYAN);
+        AdvanceDialogWatcher dialog(COLOR_YELLOW);
+        PromptDialogWatcher  prompt(COLOR_YELLOW);
+        WhiteButtonWatcher   material(COLOR_GREEN, WhiteButton::ButtonX, {0.63, 0.93, 0.17, 0.06});
+        context.wait_for_all_requests();
+
+        int ret_printer_entry = wait_until(
+            env.console, context,
+            std::chrono::seconds(120),
+            { material, overworld, dialog, prompt }
+        );
+        context.wait_for_all_requests();
+
+        switch (ret_printer_entry){
+        case 0: // material
+            env.console.log("Material selection screen detected.");
+            return;
+        case 1: // overworld
+        case 2: // dialog
+            pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+            continue;
+        case 3: // prompt
+            env.console.log("Prompt detected.");
+            pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+            continue;
+        default:
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "enter_printing_mode(): No recognized state after 120 seconds.",
+                env.console
+            );
+        }
+    }
+}
+
+
+
+
+void AutoItemPrinter::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    assert_16_9_720p_min(env.logger(), env.console);
+
+    AutoItemPrinter_Descriptor::Stats& stats = env.current_stats<AutoItemPrinter_Descriptor::Stats>();
+
+    //  Connect the controller.
+    require_player(env.console, context, BUTTON_L);
+
+    enter_printing_mode(env, context);
+
+    for (uint16_t i = 0; i < NUM_ROUNDS; i++){
+        item_printer_start_print(
+            env.console, context, LANGUAGE,
+            ItemPrinterJobs::Jobs_10
+        );
+        item_printer_finish_print(
+            env.console, context, Language::None
+        );
+
+        env.console.log("Print completed.");
+        stats.m_rounds++;
+        env.update_stats();
+        send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
+    }
+
+    press_Bs_to_back_to_overworld(env.program_info(), env.console, context);
+
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+    GO_HOME_WHEN_DONE.run_end_of_program(context);
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ItemPrinter/PokemonSV_AutoItemPrinter.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ItemPrinter/PokemonSV_AutoItemPrinter.h
new file mode 100644
index 0000000000..16c0f656b4
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ItemPrinter/PokemonSV_AutoItemPrinter.h
@@ -0,0 +1,56 @@
+/*  Auto Item Printer
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_AutoItemPrinter_H
+#define PokemonAutomation_PokemonSV_AutoItemPrinter_H
+
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "CommonTools/Options/LanguageOCROption.h"
+#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+class AutoItemPrinter_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    AutoItemPrinter_Descriptor();
+
+    struct Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+
+};
+
+
+
+class AutoItemPrinter : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = AutoItemPrinter_Descriptor;
+    AutoItemPrinter();
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    OCR::LanguageOCROption LANGUAGE;
+    SimpleIntegerOption<uint16_t> NUM_ROUNDS;
+
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
+
+    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
+    EventNotificationsOption NOTIFICATIONS;
+
+    void enter_printing_mode(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+};
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ItemPrinter/PokemonSV_ItemPrinterDatabase.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ItemPrinter/PokemonSV_ItemPrinterDatabase.cpp
new file mode 100644
index 0000000000..01c88c2d16
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ItemPrinter/PokemonSV_ItemPrinterDatabase.cpp
@@ -0,0 +1,674 @@
+/*  Item Printer Database
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <vector>
+#include <map>
+#include "Common/Cpp/Exceptions.h"
+#include "PokemonSV_ItemPrinterDatabase.h"
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+namespace ItemPrinter{
+
+
+const EnumDropdownDatabase<PrebuiltOptions>& PrebuiltOptions_Database(){
+    static const EnumDropdownDatabase<PrebuiltOptions> database({
+        {PrebuiltOptions::NONE, "none", "---"},
+        {PrebuiltOptions::ITEM_BONUS, "item-bonus", "Item Bonus"},
+        {PrebuiltOptions::BALL_BONUS, "ball-bonus", "Ball Bonus"},
+
+        // ordered by category
+        {PrebuiltOptions::ABILITY_PATCH, "ability-patch", "Ability Patch"},
+        {PrebuiltOptions::EXP_CANDY, "exp-candy-xl", "Exp Candy"},
+        {PrebuiltOptions::PP_MAX, "pp-max", "PP Max"},
+
+        {PrebuiltOptions::ASSORTED_BALLS_1, "assorted-balls-1", "Assorted Balls 1"},
+        {PrebuiltOptions::ASSORTED_BALLS_2, "assorted-balls-2", "Assorted Balls 2"},
+        {PrebuiltOptions::ASSORTED_BALLS_3, "assorted-balls-3", "Assorted Balls 3"},
+
+        {PrebuiltOptions::MASTER_BALL, "master-ball", "Master Ball"},
+        {PrebuiltOptions::FAST_BALL, "fast-ball", "Fast Ball"},
+        {PrebuiltOptions::FRIEND_BALL, "friend-ball", "Friend Ball"},
+        {PrebuiltOptions::LURE_BALL, "lure-ball", "Lure Ball"},
+        {PrebuiltOptions::LEVEL_BALL, "level-ball", "Level Ball"},
+        {PrebuiltOptions::HEAVY_BALL, "heavy-ball", "Heavy Ball"},
+        {PrebuiltOptions::LOVE_BALL, "love-ball", "Love Ball"},
+        {PrebuiltOptions::MOON_BALL, "moon-ball", "Moon Ball"},
+        {PrebuiltOptions::DREAM_BALL, "dream-ball", "Dream Ball"},
+        {PrebuiltOptions::SPORT_BALL, "sport-ball", "Sport Ball"},
+        {PrebuiltOptions::SAFARI_BALL, "safari-ball", "Safari Ball"},
+        {PrebuiltOptions::BEAST_BALL, "beast-ball", "Beast Ball"},
+
+        {PrebuiltOptions::BUG_TERA, "bug-tera-shard", "Bug Tera Shard"},
+        {PrebuiltOptions::DARK_TERA, "dark-tera-shard", "Dark Tera Shard"},
+        {PrebuiltOptions::DRAGON_TERA, "dragon-tera-shard", "Dragon Tera Shard"},
+        {PrebuiltOptions::ELECTRIC_TERA, "electric-tera-shard", "Electric Tera Shard"},
+        {PrebuiltOptions::FAIRY_TERA, "fairy-tera-shard", "Fairy Tera Shard"},
+        {PrebuiltOptions::FIGHTING_TERA, "fighting-tera-shard", "Fighting Tera Shard"},
+        {PrebuiltOptions::FIRE_TERA, "fire-tera-shard", "Fire Tera Shard"},
+        {PrebuiltOptions::FLYING_TERA, "flying-tera-shard", "Flying Tera Shard"},
+        {PrebuiltOptions::GHOST_TERA, "ghost-tera-shard", "Ghost Tera Shard"},
+        {PrebuiltOptions::GRASS_TERA, "grass-tera-shard", "Grass Tera Shard"},
+        {PrebuiltOptions::GROUND_TERA, "ground-tera-shard", "Ground Tera Shard"},
+        {PrebuiltOptions::ICE_TERA, "ice-tera-shard", "Ice Tera Shard"},
+        {PrebuiltOptions::NORMAL_TERA, "normal-tera-shard", "Normal Tera Shard"},
+        {PrebuiltOptions::POISON_TERA, "poison-tera-shard", "Poison Tera Shard"},
+        {PrebuiltOptions::PSYCHIC_TERA, "psychic-tera-shard", "Psychic Tera Shard"},
+        {PrebuiltOptions::ROCK_TERA, "rock-tera-shard", "Rock Tera Shard"},
+        {PrebuiltOptions::STEEL_TERA, "steel-tera-shard", "Steel Tera Shard"},
+        {PrebuiltOptions::WATER_TERA, "water-tera-shard", "Water Tera Shard"},
+        {PrebuiltOptions::STELLAR_TERA, "stellar-tera-shard", "Stellar Tera Shard"},
+
+    });
+    return database;
+}
+
+const EnumDropdownDatabase<PrebuiltOptions>& PrebuiltOptions_AutoMode_Database(){
+    static const EnumDropdownDatabase<PrebuiltOptions> database({
+
+        // ordered by category
+        {PrebuiltOptions::ABILITY_PATCH, "ability-patch", "Ability Patch"},
+        {PrebuiltOptions::EXP_CANDY, "exp-candy-xl", "Exp Candy"},
+        {PrebuiltOptions::PP_MAX, "pp-max", "PP Max"},
+
+        {PrebuiltOptions::MASTER_BALL, "master-ball", "Master Ball"},
+        {PrebuiltOptions::FAST_BALL, "fast-ball", "Fast Ball"},
+        {PrebuiltOptions::FRIEND_BALL, "friend-ball", "Friend Ball"},
+        {PrebuiltOptions::LURE_BALL, "lure-ball", "Lure Ball"},
+        {PrebuiltOptions::LEVEL_BALL, "level-ball", "Level Ball"},
+        {PrebuiltOptions::HEAVY_BALL, "heavy-ball", "Heavy Ball"},
+        {PrebuiltOptions::LOVE_BALL, "love-ball", "Love Ball"},
+        {PrebuiltOptions::MOON_BALL, "moon-ball", "Moon Ball"},
+        {PrebuiltOptions::DREAM_BALL, "dream-ball", "Dream Ball"},
+        {PrebuiltOptions::SPORT_BALL, "sport-ball", "Sport Ball"},
+        {PrebuiltOptions::SAFARI_BALL, "safari-ball", "Safari Ball"},
+        {PrebuiltOptions::BEAST_BALL, "beast-ball", "Beast Ball"},
+
+        {PrebuiltOptions::BUG_TERA, "bug-tera-shard", "Bug Tera Shard"},
+        {PrebuiltOptions::DARK_TERA, "dark-tera-shard", "Dark Tera Shard"},
+        {PrebuiltOptions::DRAGON_TERA, "dragon-tera-shard", "Dragon Tera Shard"},
+        {PrebuiltOptions::ELECTRIC_TERA, "electric-tera-shard", "Electric Tera Shard"},
+        {PrebuiltOptions::FAIRY_TERA, "fairy-tera-shard", "Fairy Tera Shard"},
+        {PrebuiltOptions::FIGHTING_TERA, "fighting-tera-shard", "Fighting Tera Shard"},
+        {PrebuiltOptions::FIRE_TERA, "fire-tera-shard", "Fire Tera Shard"},
+        {PrebuiltOptions::FLYING_TERA, "flying-tera-shard", "Flying Tera Shard"},
+        {PrebuiltOptions::GHOST_TERA, "ghost-tera-shard", "Ghost Tera Shard"},
+        {PrebuiltOptions::GRASS_TERA, "grass-tera-shard", "Grass Tera Shard"},
+        {PrebuiltOptions::GROUND_TERA, "ground-tera-shard", "Ground Tera Shard"},
+        {PrebuiltOptions::ICE_TERA, "ice-tera-shard", "Ice Tera Shard"},
+        {PrebuiltOptions::NORMAL_TERA, "normal-tera-shard", "Normal Tera Shard"},
+        {PrebuiltOptions::POISON_TERA, "poison-tera-shard", "Poison Tera Shard"},
+        {PrebuiltOptions::PSYCHIC_TERA, "psychic-tera-shard", "Psychic Tera Shard"},
+        {PrebuiltOptions::ROCK_TERA, "rock-tera-shard", "Rock Tera Shard"},
+        {PrebuiltOptions::STEEL_TERA, "steel-tera-shard", "Steel Tera Shard"},
+        {PrebuiltOptions::WATER_TERA, "water-tera-shard", "Water Tera Shard"},
+        {PrebuiltOptions::STELLAR_TERA, "stellar-tera-shard", "Stellar Tera Shard"},
+
+    });
+    return database;
+}
+
+
+static const std::vector<ItemPrinterEnumOption>& ItemPrinter_AllOptions(){
+    // - Specific item seeds taken from Anubis's Item printer seeds
+    //   - https://gist.github.com/Lusamine/112d4230919fadd254f0e6dfca850471
+    // - How I chose the specific item seeds
+    //   - seeds (and adjacent seeds +/- 2) that didn't also trigger item/ball bonuses. This is because
+    // accidentally triggering a ball bonus, may prevent you from intentionally triggering an item bonus
+    // on the next job, and vice versa for the item bonus.
+    //   - seconds value: minimum of 8. ideally less than 20.
+    // - Confirmation of seeds done with Kurt's ItemPrinterDeGacha tool
+    static const std::vector<ItemPrinterEnumOption> database{
+        // 2044-05-06 15:33:08
+        // Calcium
+        {2346161588, PrebuiltOptions::ITEM_BONUS,       ItemPrinterJobs::Jobs_1, 0},
+
+        // 2024-06-04 00:37:08
+        // Full Restore
+        {1717461428, PrebuiltOptions::BALL_BONUS,       ItemPrinterJobs::Jobs_1, 0},
+
+        // 958172368, 2000-05-12 22:59:28
+        // 16 total Ability Patches
+        // x36 Dark Tera Shard
+        // x4 Ability Patch
+        // x4 Ability Patch
+        // x4 Ability Patch
+        // x4 Ability Patch
+        {958172368,  PrebuiltOptions::ABILITY_PATCH,    ItemPrinterJobs::Jobs_5, 16},
+
+        // 1991472489, 2033-02-08 10:48:09
+        // 1040000 exp, 28 total Exp. Candy XL
+        // x10 Exp. Candy XL
+        // x4 Protein
+        // x20 Exp. Candy L
+        // x8 Exp. Candy XL
+        // x10 Exp. Candy XL
+        {1991472489, PrebuiltOptions::EXP_CANDY,        ItemPrinterJobs::Jobs_5, 28},
+
+        // 2030-03-11 16:44:09
+        // 18 total PP Maxes
+        // 6x PP Max, 6x PP Max, 14x Honey, 10x Revive, 6x PP Max
+        {1899477849, PrebuiltOptions::PP_MAX,           ItemPrinterJobs::Jobs_5, 18},
+
+        // 2049-08-18 23:51:08
+        {2512943468, PrebuiltOptions::ASSORTED_BALLS_1, ItemPrinterJobs::Jobs_10, 1},
+
+        // 2031-10-08 07:09:09
+        {1949209749, PrebuiltOptions::ASSORTED_BALLS_2, ItemPrinterJobs::Jobs_10, 1},
+
+        // 2020-03-03 06:38:18
+        {1583217498, PrebuiltOptions::ASSORTED_BALLS_3, ItemPrinterJobs::Jobs_10, 1},
+
+        // 2005-11-07 11:32:08
+        // x1 Master Ball
+        // x1 Master Ball
+        // x5 Great Ball
+        // x1 Master Ball
+        // x1 Master Ball
+        {1131363128, PrebuiltOptions::MASTER_BALL,      ItemPrinterJobs::Jobs_5, 4},
+
+        // 2034-09-01 02:33:39
+        {2040690819, PrebuiltOptions::FAST_BALL,        ItemPrinterJobs::Jobs_5, 5},
+
+        // 2046-12-11 02:23:17
+        {2428107797, PrebuiltOptions::FRIEND_BALL,      ItemPrinterJobs::Jobs_5, 5},
+
+        // 2057-11-21 04:28:37
+        {2773542517, PrebuiltOptions::LURE_BALL,        ItemPrinterJobs::Jobs_5, 5},
+
+        // 2045-03-17 10:05:38
+        {2373357938, PrebuiltOptions::LEVEL_BALL,       ItemPrinterJobs::Jobs_5, 5},
+
+        // 2029-07-24 11:53:11
+        {1879588391, PrebuiltOptions::HEAVY_BALL,       ItemPrinterJobs::Jobs_5, 5},
+
+        // 2023-05-22 05:36:11
+        {1684733771, PrebuiltOptions::LOVE_BALL,        ItemPrinterJobs::Jobs_5, 5},
+
+        // 2042-10-14 05:56:33
+        {2296878993, PrebuiltOptions::MOON_BALL,        ItemPrinterJobs::Jobs_5, 5},
+
+        // 2054-03-22 09:31:21
+        {2657784681, PrebuiltOptions::DREAM_BALL,       ItemPrinterJobs::Jobs_5, 5},
+
+        // 2009-06-05 20:17:11
+        {1244233031, PrebuiltOptions::SPORT_BALL,       ItemPrinterJobs::Jobs_5, 5},
+
+        // 2049-01-02 01:20:22
+        {2493163222, PrebuiltOptions::SAFARI_BALL,      ItemPrinterJobs::Jobs_5, 5},
+
+        // 2037-02-02 15:37:15
+        {2117201835, PrebuiltOptions::BEAST_BALL,       ItemPrinterJobs::Jobs_5, 5},
+
+        // 2246577010, 2041-03-11 01:10:10
+        // 134 Normal Tera Shards, 134 total Tera Shards
+        // x40 Normal Tera Shard
+        // x28 Normal Tera Shard
+        // x16 Normal Tera Shard
+        // x38 Normal Tera Shard
+        // x12 Normal Tera Shard
+        {2246577010, PrebuiltOptions::NORMAL_TERA,      ItemPrinterJobs::Jobs_5, 134},
+
+        // 2669513710, 2054-08-05 03:35:10
+        // 148 Fire Tera Shards, 148 total Tera Shards
+        // x40 Fire Tera Shard
+        // x36 Fire Tera Shard
+        // x40 Fire Tera Shard
+        // x32 Fire Tera Shard
+        // x20 Honey
+        {2669513710, PrebuiltOptions::FIRE_TERA,        ItemPrinterJobs::Jobs_5, 148},
+
+        // 2419526534, 2046-09-02 18:42:14
+        // 120 Water Tera Shards, 154 total Tera Shards
+        // x40 Water Tera Shard
+        // x8 Full Restore
+        // x40 Water Tera Shard
+        // x34 Flying Tera Shard
+        // x40 Water Tera Shard        
+        {2419526534, PrebuiltOptions::WATER_TERA,       ItemPrinterJobs::Jobs_5, 120},
+
+        // 1300121653, 2011-03-14 16:54:13
+        // 138 Electric Tera Shards, 138 total Tera Shards
+        // x26 Electric Tera Shard
+        // x4 Light Clay
+        // x40 Electric Tera Shard
+        // x40 Electric Tera Shard
+        // x32 Electric Tera Shard
+        {1300121653, PrebuiltOptions::ELECTRIC_TERA,    ItemPrinterJobs::Jobs_5, 138},
+
+        // 1258326250, 2009-11-15 23:04:10
+        // 122 Grass Tera Shards, 122 total Tera Shards
+        // x30 Grass Tera Shard
+        // x12 Tiny Mushroom
+        // x38 Grass Tera Shard
+        // x34 Grass Tera Shard
+        // x20 Grass Tera Shard
+        {1258326250, PrebuiltOptions::GRASS_TERA,       ItemPrinterJobs::Jobs_5, 122},
+
+        // 2567326030, 2051-05-10 10:07:10
+        // 134 Ice Tera Shards, 134 total Tera Shards
+        // x38 Ice Tera Shard
+        // x16 Ice Tera Shard
+        // x40 Ice Tera Shard
+        // x40 Ice Tera Shard
+        // x2 Metal Alloy
+        {2567326030, PrebuiltOptions::ICE_TERA,         ItemPrinterJobs::Jobs_5, 134},
+
+        // 1510682535, 2017-11-14 18:02:15
+        // 132 Fighting Tera Shards, 132 total Tera Shards
+        // x40 Fighting Tera Shard
+        // x32 Fighting Tera Shard
+        // x20 Fighting Tera Shard
+        // x40 Fighting Tera Shard
+        // x6 Shiny Stone
+        {1510682535, PrebuiltOptions::FIGHTING_TERA,    ItemPrinterJobs::Jobs_5, 132},
+
+        // 2041396572, 2034-09-09 06:36:12
+        // 140 Poison Tera Shards, 140 total Tera Shards
+        // x4 Electirizer
+        // x32 Poison Tera Shard
+        // x36 Poison Tera Shard
+        // x38 Poison Tera Shard
+        // x34 Poison Tera Shard
+        {2041396572, PrebuiltOptions::POISON_TERA,      ItemPrinterJobs::Jobs_5, 140},
+
+        // 1463321889, 2016-05-15 14:18:09
+        // 130 Ground Tera Shards, 130 total Tera Shards
+        // x10 PP Up
+        // x28 Ground Tera Shard
+        // x34 Ground Tera Shard
+        // x30 Ground Tera Shard
+        // x38 Ground Tera Shard
+        {1463321889, PrebuiltOptions::GROUND_TERA,      ItemPrinterJobs::Jobs_5, 130},
+
+        // 1580633500, 2020-02-02 08:51:40
+        // 128 Flying Tera Shards, 128 total Tera Shards
+        // x22 Flying Tera Shard
+        // x30 Flying Tera Shard
+        // x28 Flying Tera Shard
+        // x38 Flying Tera Shard
+        // x10 Flying Tera Shard
+        {1580633500, PrebuiltOptions::FLYING_TERA,      ItemPrinterJobs::Jobs_5, 128},
+
+        // 2190593713, 2039-06-02 02:15:13
+        // 134 Psychic Tera Shards, 134 total Tera Shards
+        // x30 Psychic Tera Shard
+        // x4 Never-Melt Ice
+        // x28 Psychic Tera Shard
+        // x36 Psychic Tera Shard
+        // x40 Psychic Tera Shard
+        {2190593713, PrebuiltOptions::PSYCHIC_TERA,     ItemPrinterJobs::Jobs_5, 134},
+
+        // 2458109848, 2047-11-23 08:17:28
+        // 134 Bug Tera Shards, 134 total Tera Shards
+        // x4 Ether
+        // x38 Bug Tera Shard
+        // x34 Bug Tera Shard
+        // x32 Bug Tera Shard
+        // x30 Bug Tera Shard
+        {2458109848, PrebuiltOptions::BUG_TERA,         ItemPrinterJobs::Jobs_5, 134},
+
+        // 2801954289, 2058-10-16 00:38:09
+        // 120 Rock Tera Shards, 120 total Tera Shards
+        // x40 Rock Tera Shard
+        // x40 Rock Tera Shard
+        // x16 Pretty Feather
+        // x40 Rock Tera Shard
+        // x18 Stardust
+        {2801954289, PrebuiltOptions::ROCK_TERA,        ItemPrinterJobs::Jobs_5, 120},
+
+        // 1509904271, 2017-11-05 17:51:11
+        // 122 Ghost Tera Shards, 122 total Tera Shards
+        // x38 Ghost Tera Shard
+        // x36 Ghost Tera Shard
+        // x12 Ghost Tera Shard
+        // x4 Magnet
+        // x36 Ghost Tera Shard
+        {1509904271, PrebuiltOptions::GHOST_TERA,       ItemPrinterJobs::Jobs_5, 122},
+
+        // 2155674309, 2038-04-23 22:25:09
+        // 136 Dragon Tera Shards, 136 total Tera Shards
+        // x2 Ability Patch
+        // x24 Dragon Tera Shard
+        // x38 Dragon Tera Shard
+        // x40 Dragon Tera Shard
+        // x34 Dragon Tera Shard
+        {2155674309, PrebuiltOptions::DRAGON_TERA,      ItemPrinterJobs::Jobs_5, 136},
+
+        // 2537180413, 2050-05-26 12:20:13
+        // 120 Dark Tera Shards, 120 total Tera Shards
+        // x20 Dark Tera Shard
+        // x28 Dark Tera Shard
+        // x32 Dark Tera Shard
+        // x40 Dark Tera Shard
+        // x4 Prism Scale
+        {2537180413, PrebuiltOptions::DARK_TERA,        ItemPrinterJobs::Jobs_5, 120},
+
+        // 1766067369, 2025-12-18 14:16:09
+        // 120 Steel Tera Shards, 120 total Tera Shards
+        // x40 Steel Tera Shard
+        // x24 Steel Tera Shard
+        // x38 Steel Tera Shard
+        // x18 Steel Tera Shard
+        // x4 Berry Sweet
+        {1766067369, PrebuiltOptions::STEEL_TERA,       ItemPrinterJobs::Jobs_5, 120},
+
+        // 2183028974, 2039-03-06 12:56:14
+        // 120 Fairy Tera Shards, 134 total Tera Shards
+        // x40 Fairy Tera Shard
+        // x40 Fairy Tera Shard
+        // x14 Water Tera Shard
+        // x12 Tiny Bamboo Shoot
+        // x40 Fairy Tera Shard
+        {2183028974, PrebuiltOptions::FAIRY_TERA,       ItemPrinterJobs::Jobs_5, 120},
+
+        // 1165654034, 2006-12-09 08:47:14
+        // 88 Stellar Tera Shards, 88 total Tera Shards
+        // x30 Stellar Tera Shard
+        // x6 Max Revive
+        // x28 Stellar Tera Shard
+        // x30 Stellar Tera Shard
+        // x2 Clover Sweet
+        {1165654034, PrebuiltOptions::STELLAR_TERA,     ItemPrinterJobs::Jobs_5, 88},
+    };
+    return database;
+};
+
+static std::map<PrebuiltOptions, const ItemPrinterEnumOption*> make_ItemPrinter_option_lookup_by_enum(){
+    std::map<PrebuiltOptions, const ItemPrinterEnumOption*> ret;
+    for (const ItemPrinterEnumOption& item : ItemPrinter_AllOptions()){
+        if (!ret.emplace(item.enum_value, &item).second){
+            throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Duplicate Enum: " + std::to_string((int)item.enum_value));
+        }
+    }
+    return ret;
+}
+const ItemPrinterEnumOption& option_lookup_by_enum(PrebuiltOptions enum_value){
+    static const std::map<PrebuiltOptions, const ItemPrinterEnumOption*> database = make_ItemPrinter_option_lookup_by_enum();
+    auto iter = database.find(enum_value);
+    if (iter != database.end()){
+        return *iter->second;
+    }else{
+        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Unknown Enum: " + std::to_string((int)enum_value));
+    }
+}
+static std::map<int64_t, const ItemPrinterEnumOption*> make_ItemPrinter_option_lookup_by_seed(){
+    std::map<int64_t, const ItemPrinterEnumOption*> ret;
+    for (const ItemPrinterEnumOption& item : ItemPrinter_AllOptions()){
+        if (!ret.emplace(item.seed, &item).second){
+            throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Duplicate Seed: " + std::to_string(item.seed));
+        }
+    }
+    return ret;
+}
+const ItemPrinterEnumOption* option_lookup_by_seed(int64_t seed){
+    static const std::map<int64_t, const ItemPrinterEnumOption*> database = make_ItemPrinter_option_lookup_by_seed();
+    auto iter = database.find(seed);
+    if (iter != database.end()){
+        return iter->second;
+    }else{
+        return nullptr;
+    }
+}
+
+
+
+DateSeed get_date_seed(int64_t seed){
+    //  This is the function that we would replace with Kurt's seed calculator.
+
+    static const std::map<int64_t, DateSeed> DATABASE{
+        {2346161588, {2346161588, {"calcium"}}},
+        {2346161588 - 2, {2346161588 - 2, {"stardust"}}},
+        {2346161588 - 1, {2346161588 - 1, {"tiny-mushroom"}}},
+        {2346161588 + 1, {2346161588 + 1, {"max-ether"}}},
+        {2346161588 + 2, {2346161588 + 2, {"electric-tera-shard"}}},
+
+        {1717461428, {1717461428, {"full-restore"}}},
+        {1717461428 - 2, {1717461428 - 2, {"balm-mushroom"}}},
+        {1717461428 - 1, {1717461428 - 1, {"revive"}}},
+        {1717461428 + 1, {1717461428 + 1, {"fairy-tera-shard"}}},
+        {1717461428 + 2, {1717461428 + 2, {"big-bamboo-shoot"}}},
+
+        {958172368, {958172368, {"dark-tera-shard", "ability-patch", "ability-patch", "ability-patch", "ability-patch"}}},
+        {958172368 - 2, {958172368 - 2, {"dark-tera-shard", "revive", "reaper-cloth", "ability-patch", "poison-tera-shard"}}},
+        {958172368 - 1, {958172368 - 1, {"dark-tera-shard", "fire-tera-shard", "big-bamboo-shoot", "balm-mushroom", "super-potion"}}},
+        {958172368 + 1, {958172368 + 1, {"dark-tera-shard", "pearl", "spell-tag", "flower-sweet", "ribbon-sweet"}}},
+        {958172368 + 2, {958172368 + 2, {"dark-tera-shard", "water-stone", "max-potion", "tiny-mushroom", "electric-tera-shard"}}},
+
+        {1991472489, {1991472489, {"exp-candy-xl", "protein", "exp-candy-l", "exp-candy-xl", "exp-candy-xl"}}},
+        {1991472489 - 2, {1991472489 - 2, {"exp-candy-xl", "tiny-bamboo-shoot", "exp-candy-s", "iron", "tiny-bamboo-shoot"}}},
+        {1991472489 - 1, {1991472489 - 1, {"exp-candy-xl", "toxic-orb", "rare-bone", "silver-powder", "lucky-egg"}}},
+        {1991472489 + 1, {1991472489 + 1, {"exp-candy-xl", "silver-powder", "dubious-disc", "mystic-water", "toxic-orb"}}},
+        {1991472489 + 2, {1991472489 + 2, {"exp-candy-xl", "tiny-bamboo-shoot", "toxic-orb", "ice-stone", "charcoal"}}},
+
+        {2246577010, {2246577010, {"normal-tera-shard", "normal-tera-shard", "normal-tera-shard", "normal-tera-shard", "normal-tera-shard"}}},
+        {2246577010 - 2, {2246577010 - 2, {"normal-tera-shard", "exp-candy-l", "star-piece", "tiny-mushroom", "rock-tera-shard"}}},
+        {2246577010 - 1, {2246577010 - 1, {"normal-tera-shard", "oval-stone", "ether", "stardust", "steel-tera-shard"}}},
+        {2246577010 + 1, {2246577010 + 1, {"normal-tera-shard", "exp-candy-s", "ether", "elixir", "big-pearl"}}},
+        {2246577010 + 2, {2246577010 + 2, {"normal-tera-shard", "dragon-tera-shard", "ice-tera-shard", "exp-candy-xl", "black-sludge"}}},
+
+        {2669513710, {2669513710, {"fire-tera-shard", "fire-tera-shard", "fire-tera-shard", "fire-tera-shard", "honey"}}},
+        {2669513710 - 2, {2669513710 - 2, {"fire-tera-shard", "flame-orb", "steel-tera-shard", "fire-stone", "max-revive"}}},
+        {2669513710 - 1, {2669513710 - 1, {"fire-tera-shard", "exp-candy-xs", "miracle-seed", "sun-stone", "iron"}}},
+        {2669513710 + 1, {2669513710 + 1, {"fire-tera-shard", "poison-tera-shard", "love-sweet", "safety-goggles", "exp-candy-m"}}},
+        {2669513710 + 2, {2669513710 + 2, {"fire-tera-shard", "rare-bone", "dubious-disc", "berry-sweet", "hp-up"}}},
+
+        {2419526534, {2419526534, {"water-tera-shard", "full-restore", "water-tera-shard", "flying-tera-shard", "water-tera-shard"}}},
+        {2419526534 - 2, {2419526534 - 2, {"water-tera-shard", "exp-candy-xs", "flame-orb", "exp-candy-s", "honey"}}},
+        {2419526534 - 1, {2419526534 - 1, {"water-tera-shard", "never-melt-ice", "rock-tera-shard", "hp-up", "sun-stone"}}},
+        {2419526534 + 1, {2419526534 + 1, {"water-tera-shard", "heavy-duty-boots", "moon-stone", "strawberry-sweet", "exp-candy-xs"}}},
+        {2419526534 + 2, {2419526534 + 2, {"water-tera-shard", "ghost-tera-shard", "max-revive", "ground-tera-shard", "exp-candy-xl"}}},
+
+        {1300121653, {1300121653, {"electric-tera-shard", "light-clay", "electric-tera-shard", "electric-tera-shard", "electric-tera-shard"}}},
+        {1300121653 - 2, {1300121653 - 2, {"electric-tera-shard", "elixir", "full-restore", "upgrade", "toxic-orb"}}},
+        {1300121653 - 1, {1300121653 - 1, {"electric-tera-shard", "exp-candy-xs", "steel-tera-shard", "big-mushroom", "exp-candy-s"}}},
+        {1300121653 + 1, {1300121653 + 1, {"electric-tera-shard", "calcium", "ground-tera-shard", "water-tera-shard", "upgrade"}}},
+        {1300121653 + 2, {1300121653 + 2, {"electric-tera-shard", "max-potion", "charcoal", "exp-candy-xs", "grass-tera-shard"}}},
+
+        {1258326250, {1258326250, {"grass-tera-shard", "tiny-mushroom", "grass-tera-shard", "grass-tera-shard", "grass-tera-shard"}}},
+        {1258326250 - 2, {1258326250 - 2, {"grass-tera-shard", "pretty-feather", "exp-candy-m", "bug-tera-shard", "tiny-mushroom"}}},
+        {1258326250 - 1, {1258326250 - 1, {"grass-tera-shard", "ghost-tera-shard", "bug-tera-shard", "silver-powder", "berry-sweet"}}},
+        {1258326250 + 1, {1258326250 + 1, {"grass-tera-shard", "steel-tera-shard", "honey", "strawberry-sweet", "normal-tera-shard"}}},
+        {1258326250 + 2, {1258326250 + 2, {"grass-tera-shard", "exp-candy-xl", "exp-candy-xs", "zinc", "dragon-fang"}}},
+
+        {2567326030, {2567326030, {"ice-tera-shard", "ice-tera-shard", "ice-tera-shard", "ice-tera-shard", "metal-alloy"}}},
+        {2567326030 - 2, {2567326030 - 2, {"ice-tera-shard", "pearl-string", "dragon-tera-shard", "sun-stone", "water-tera-shard"}}},
+        {2567326030 - 1, {2567326030 - 1, {"ice-tera-shard", "scope-lens", "full-restore", "dubious-disc", "lucky-egg"}}},
+        {2567326030 + 1, {2567326030 + 1, {"ice-tera-shard", "poison-barb", "leaf-stone", "cracked-pot", "ghost-tera-shard"}}},
+        {2567326030 + 2, {2567326030 + 2, {"ice-tera-shard", "exp-candy-xs", "rock-tera-shard", "loaded-dice", "Pretty Feather"}}},
+
+        {1510682535, {1510682535, {"fighting-tera-shard", "fighting-tera-shard", "fighting-tera-shard", "fighting-tera-shard", "shiny-stone"}}},
+        {1510682535 - 2, {1510682535 - 2, {"fairy-feather", "normal-tera-shard", "air-balloon", "poison-tera-shard", "pearl"}}},
+        {1510682535 - 1, {1510682535 - 1, {"strawberry-sweet", "electric-tera-shard", "calcium", "revive", "ghost-tera-shard"}}},
+        {1510682535 + 1, {1510682535 + 1, {"miracle-seed", "fighting-tera-shard", "ice-tera-shard", "light-clay", "dark-tera-shard"}}},
+        {1510682535 + 2, {1510682535 + 2, {"rare-bone", "max-elixir", "leaf-stone", "metal-alloy", "magmarizer"}}},
+
+        {2041396572, {2041396572, {"electirizer", "poison-tera-shard", "poison-tera-shard", "poison-tera-shard", "poison-tera-shard"}}},
+        {2041396572 - 2, {2041396572 - 2, {"electirizer", "upgrade", "zinc", "elixir", "revive"}}},
+        {2041396572 - 1, {2041396572 - 1, {"electirizer", "flame-orb", "magmarizer", "hp-up", "pretty-feather"}}},
+        {2041396572 + 1, {2041396572 + 1, {"electirizer", "poison-tera-shard", "poison-tera-shard", "poison-tera-shard", "poison-tera-shard"}}},
+        {2041396572 + 2, {2041396572 + 2, {"electirizer", "pp-up", "rock-tera-shard", "big-mushroom", "light-clay"}}},
+
+        {1463321889, {1463321889, {"pp-up", "ground-tera-shard", "ground-tera-shard", "ground-tera-shard", "ground-tera-shard"}}},
+        {1463321889 - 2, {1463321889 - 2, {"pp-up", "pretty-feather", "max-ether", "big-pearl", "carbos"}}},
+        {1463321889 - 1, {1463321889 - 1, {"pp-up", "spell-tag", "bug-tera-shard", "pearl", "fighting-tera-shard"}}},
+        {1463321889 + 1, {1463321889 + 1, {"pp-up", "metal-alloy", "full-restore", "pearl", "silver-powder"}}},
+        {1463321889 + 2, {1463321889 + 2, {"pp-up", "ghost-tera-shard", "nugget", "safety-goggles", "leftovers"}}},
+
+        {1580633500, {1580633500, {"flying-tera-shard", "flying-tera-shard", "flying-tera-shard", "flying-tera-shard", "flying-tera-shard"}}},
+        {1580633500 - 2, {1580633500 - 2, {"black-glasses", "big-nugget", "max-revive", "pearl-string", "balm-mushroom"}}},
+        {1580633500 - 1, {1580633500 - 1, {"loaded-dice", "exp-candy-s", "strawberry-sweet", "never-melt-ice", "moon-stone"}}},
+        {1580633500 + 1, {1580633500 + 1, {"water-stone", "rare-bone", "max-ether", "moon-stone", "ability-patch"}}},
+        {1580633500 + 2, {1580633500 + 2, {"max-ether", "big-bamboo-shoot", "iron", "big-mushroom", "pearl"}}},
+
+        {2190593713, {2190593713, {"psychic-tera-shard", "never-melt-ice", "psychic-tera-shard", "psychic-tera-shard", "psychic-tera-shard"}}},
+        {2190593713 - 2, {2190593713 - 2, {"psychic-tera-shard", "big-mushroom", "fairy-feather", "fairy-tera-shard", "reaper-cloth"}}},
+        {2190593713 - 1, {2190593713 - 1, {"psychic-tera-shard", "electric-tera-shard", "pearl", "stellar-tera-shard", "dawn-stone"}}},
+        {2190593713 + 1, {2190593713 + 1, {"psychic-tera-shard", "pearl-string", "twisted-spoon", "big-pearl", "iron"}}},
+        {2190593713 + 2, {2190593713 + 2, {"psychic-tera-shard", "heavy-duty-boots", "water-tera-shard", "rock-tera-shard", "twisted-spoon"}}},
+
+        {2458109848, {2458109848, {"ether", "bug-tera-shard", "bug-tera-shard", "bug-tera-shard", "bug-tera-shard"}}},
+        {2458109848 - 2, {2458109848 - 2, {"ether", "big-nugget", "mystic-water", "pretty-feather", "pretty-feather"}}},
+        {2458109848 - 1, {2458109848 - 1, {"ether", "psychic-tera-shard", "exp-candy-s", "honey", "sharp-beak"}}},
+        {2458109848 + 1, {2458109848 + 1, {"ether", "black-glasses", "fighting-tera-shard", "tiny-bamboo-shoot", "poison-barb"}}},
+        {2458109848 + 2, {2458109848 + 2, {"ether", "exp-candy-xl", "normal-tera-shard", "fairy-tera-shard", "balm-mushroom"}}},
+
+        {2801954289, {2801954289, {"rock-tera-shard", "rock-tera-shard", "pretty-feather", "rock-tera-shard", "stardust"}}},
+        {2801954289 - 2, {2801954289 - 2, {"max-revive", "scope-lens", "razor-claw", "big-nugget", "tiny-bamboo-shoot"}}},
+        {2801954289 - 1, {2801954289 - 1, {"iron", "dark-tera-shard", "air-balloon", "rare-bone", "ability-patch"}}},
+        {2801954289 + 1, {2801954289 + 1, {"normal-tera-shard", "ground-tera-shard", "honey", "upgrade", "honey"}}},
+        {2801954289 + 2, {2801954289 + 2, {"heavy-duty-boots", "ice-tera-shard", "sun-stone", "dubious-disc", "pearl"}}},
+
+        {1509904271, {1509904271, {"ghost-tera-shard", "ghost-tera-shard", "ghost-tera-shard", "magnet", "ghost-tera-shard"}}},
+        {1509904271 - 2, {1509904271 - 2, {"ghost-tera-shard", "hyper-potion", "toxic-orb", "magmarizer", "black-glasses"}}},
+        {1509904271 - 1, {1509904271 - 1, {"ghost-tera-shard", "black-belt", "pp-up", "ice-tera-shard", "magmarizer"}}},
+        {1509904271 + 1, {1509904271 + 1, {"ghost-tera-shard", "big-nugget", "hp-up", "gold-bottle-cap", "big-bamboo-shoot"}}},
+        {1509904271 + 2, {1509904271 + 2, {"ghost-tera-shard", "hp-up", "elixir", "water-tera-shard", "pp-up"}}},
+
+        {2155674309, {2155674309, {"ability-patch", "dragon-tera-shard", "dragon-tera-shard", "dragon-tera-shard", "dragon-tera-shard"}}},
+        {2155674309 - 2, {2155674309 - 2, {"comet-shard", "soft-sand", "big-mushroom", "steel-tera-shard", "metronome"}}},
+        {2155674309 - 1, {2155674309 - 1, {"pearl", "balm-mushroom", "moon-stone", "protein", "ability-patch"}}},
+        {2155674309 + 1, {2155674309 + 1, {"reaper-cloth", "hp-up", "revive", "light-clay", "focus-band"}}},
+        {2155674309 + 2, {2155674309 + 2, {"spell-tag", "love-sweet", "fire-tera-shard", "ether", "black-belt"}}},
+
+        {2537180413, {2537180413, {"dark-tera-shard", "dark-tera-shard", "dark-tera-shard", "dark-tera-shard", "prism-scale"}}},
+        {2537180413 - 2, {2537180413 - 2, {"dark-tera-shard", "upgrade", "big-mushroom", "normal-tera-shard", "exp-candy-m"}}},
+        {2537180413 - 1, {2537180413 - 1, {"dark-tera-shard", "pp-max", "calcium", "rock-tera-shard", "hard-stone"}}},
+        {2537180413 + 1, {2537180413 + 1, {"dark-tera-shard", "leaf-stone", "big-pearl", "comet-shard", "exp-candy-m"}}},
+        {2537180413 + 2, {2537180413 + 2, {"dark-tera-shard", "ground-tera-shard", "fairy-tera-shard", "exp-candy-xs", "fighting-tera-shard"}}},
+
+        {1766067369, {1766067369, {"steel-tera-shard", "steel-tera-shard", "steel-tera-shard", "steel-tera-shard", "berry-sweet"}}},
+        {1766067369 - 2, {1766067369 - 2, {"steel-tera-shard", "bug-tera-shard", "exp-candy-xl", "pretty-feather", "silk-scarf"}}},
+        {1766067369 - 1, {1766067369 - 1, {"steel-tera-shard", "tiny-mushroom", "super-potion", "sharp-beak", "ice-tera-shard"}}},
+        {1766067369 + 1, {1766067369 + 1, {"steel-tera-shard", "moon-stone", "exp-candy-xl", "iron", "exp-candy-xs"}}},
+        {1766067369 + 2, {1766067369 + 2, {"steel-tera-shard", "metal-alloy", "ability-patch", "pp-up", "rare-bone"}}},
+
+        {2183028974, {2183028974, {"fairy-tera-shard", "fairy-tera-shard", "water-tera-shard", "tiny-bamboo-shoot", "fairy-tera-shard"}}},
+        {2183028974 - 2, {2183028974 - 2, {"max-elixir", "never-melt-ice", "pearl", "max-potion", "pp-up"}}},
+        {2183028974 - 1, {2183028974 - 1, {"full-restore", "psychic-tera-shard", "gold-bottle-cap", "dawn-stone", "never-melt-ice"}}},
+        {2183028974 + 1, {2183028974 + 1, {"ice-tera-shard", "twisted-spoon", "exp-candy-s", "max-elixir", "razor-fang"}}},
+        {2183028974 + 2, {2183028974 + 2, {"exp-candy-xl", "bug-tera-shard", "star-piece", "hp-up", "bug-tera-shard"}}},
+
+        {1165654034, {1165654034, {"stellar-tera-shard", "max-revive", "stellar-tera-shard", "stellar-tera-shard", "clover-sweet"}}},
+        {1165654034 - 2, {1165654034 - 2, {"stellar-tera-shard", "pp-up", "scope-lens", "electric-tera-shard", "metronome"}}},
+        {1165654034 - 1, {1165654034 - 1, {"stellar-tera-shard", "dragon-tera-shard", "honey", "steel-tera-shard", "max-potion"}}},
+        {1165654034 + 1, {1165654034 + 1, {"stellar-tera-shard", "full-heal", "toxic-orb", "max-potion", "miracle-seed"}}},
+        {1165654034 + 2, {1165654034 + 2, {"stellar-tera-shard", "big-bamboo-shoot", "poison-tera-shard", "honey", "oval-stone"}}},
+
+        {1131363128, {1131363128, {}, {"master-ball", "master-ball", "great-ball", "master-ball", "master-ball"}}},
+        {1131363128 - 2, {1131363128 - 2, {}, {"master-ball", "great-ball", "quick-ball", "luxury-ball", "heal-ball"}}},
+        {1131363128 - 1, {1131363128 - 1, {}, {"master-ball", "great-ball", "timer-ball", "fast-ball", "love-ball"}}},
+        {1131363128 + 1, {1131363128 + 1, {}, {"master-ball", "premier-ball", "great-ball", "luxury-ball", "heal-ball"}}},
+        {1131363128 + 2, {1131363128 + 2, {}, {"master-ball", "quick-ball", "poke-ball", "premier-ball", "poke-ball"}}},
+
+        {2040690819, {2040690819, {}, {"fast-ball", "fast-ball", "fast-ball", "fast-ball", "fast-ball"}}},
+        {2040690819 - 2, {2040690819 - 2, {}, {"fast-ball", "lure-ball", "dream-ball", "friend-ball", "level-ball"}}},
+        {2040690819 - 1, {2040690819 - 1, {}, {"fast-ball", "great-ball", "quick-ball", "great-ball", "heal-ball"}}},
+        {2040690819 + 1, {2040690819 + 1, {}, {"fast-ball", "dream-ball", "luxury-ball", "luxury-ball", "premier-ball"}}},
+        {2040690819 + 2, {2040690819 + 2, {}, {"fast-ball", "luxury-ball", "great-ball", "poke-ball", "premier-ball"}}},
+
+        {2428107797, {2428107797, {}, {"friend-ball", "friend-ball", "friend-ball", "friend-ball", "friend-ball"}}},
+        {2428107797 - 2, {2428107797 - 2, {}, {"friend-ball", "great-ball", "sport-ball", "great-ball", "great-ball"}}},
+        {2428107797 - 1, {2428107797 - 1, {}, {"friend-ball", "premier-ball", "heal-ball", "repeat-ball", "nest-ball"}}},
+        {2428107797 + 1, {2428107797 + 1, {}, {"friend-ball", "premier-ball", "heavy-ball", "timer-ball", "friend-ball"}}},
+        {2428107797 + 2, {2428107797 + 2, {}, {"friend-ball", "heal-ball", "great-ball", "beast-ball", "moon-ball"}}},
+
+        {2773542517, {2773542517, {}, {"lure-ball", "lure-ball", "lure-ball", "lure-ball", "lure-ball"}}},
+        {2773542517 - 2, {2773542517 - 2, {}, {"lure-ball", "premier-ball", "premier-ball", "great-ball", "poke-ball"}}},
+        {2773542517 - 1, {2773542517 - 1, {}, {"dream-ball", "poke-ball", "poke-ball", "luxury-ball", "poke-ball"}}},
+        {2773542517 + 1, {2773542517 + 1, {}, {"luxury-ball", "premier-ball", "great-ball", "luxury-ball", "fast-ball"}}},
+        {2773542517 + 2, {2773542517 + 2, {}, {"timer-ball", "safari-ball", "dive-ball", "poke-ball", "premier-ball"}}},
+
+        {2373357938, {2373357938, {}, {"level-ball", "level-ball", "level-ball", "level-ball", "level-ball"}}},
+        {2373357938 - 2, {2373357938 - 2, {}, {"dusk-ball", "heal-ball", "luxury-ball", "premier-ball", "poke-ball"}}},
+        {2373357938 - 1, {2373357938 - 1, {}, {"great-ball", "dive-ball", "dream-ball", "luxury-ball", "luxury-ball"}}},
+        {2373357938 + 1, {2373357938 + 1, {}, {"repeat-ball", "heal-ball", "heal-ball", "luxury-ball", "dive-ball"}}},
+        {2373357938 + 2, {2373357938 + 2, {}, {"luxury-ball", "master-ball", "premier-ball", "ultra-ball", "heal-ball"}}},
+
+        {1879588391, {1879588391, {}, {"heavy-ball", "heavy-ball", "heavy-ball", "heavy-ball", "heavy-ball"}}},
+        {1879588391 - 2, {1879588391 - 2, {}, {"heavy-ball", "nest-ball", "nest-ball", "heal-ball", "luxury-ball"}}},
+        {1879588391 - 1, {1879588391 - 1, {}, {"heavy-ball", "poke-ball", "premier-ball", "premier-ball", "heal-ball"}}},
+        {1879588391 + 1, {1879588391 + 1, {}, {"heavy-ball", "heal-ball", "premier-ball", "timer-ball", "premier-ball"}}},
+        {1879588391 + 2, {1879588391 + 2, {}, {"heavy-ball", "ultra-ball", "heal-ball", "quick-ball", "beast-ball"}}},
+
+        {1684733771, {1684733771, {}, {"love-ball", "love-ball", "love-ball", "love-ball", "love-ball"}}},
+        {1684733771 - 2, {1684733771 - 2, {}, {"love-ball", "sport-ball", "great-ball", "poke-ball", "poke-ball"}}},
+        {1684733771 - 1, {1684733771 - 1, {}, {"love-ball", "poke-ball", "great-ball", "luxury-ball", "master-ball"}}},
+        {1684733771 + 1, {1684733771 + 1, {}, {"love-ball", "great-ball", "luxury-ball", "luxury-ball", "poke-ball"}}},
+        {1684733771 + 2, {1684733771 + 2, {}, {"love-ball", "luxury-ball", "premier-ball", "poke-ball", "quick-ball"}}},
+
+        {2296878993, {2296878993, {}, {"moon-ball", "moon-ball", "moon-ball", "moon-ball", "moon-ball"}}},
+        {2296878993 - 2, {2296878993 - 2, {}, {"luxury-ball", "timer-ball", "premier-ball", "luxury-ball", "poke-ball"}}},
+        {2296878993 - 1, {2296878993 - 1, {}, {"nest-ball", "poke-ball", "heal-ball", "premier-ball", "premier-ball"}}},
+        {2296878993 + 1, {2296878993 + 1, {}, {"fast-ball", "heal-ball", "poke-ball", "dusk-ball", "luxury-ball"}}},
+        {2296878993 + 2, {2296878993 + 2, {}, {"lure-ball", "heavy-ball", "luxury-ball", "heal-ball", "poke-ball"}}},
+
+        {2657784681, {2657784681, {}, {"dream-ball", "dream-ball", "dream-ball", "dream-ball", "dream-ball"}}},
+        {2657784681 - 2, {2657784681 - 2, {}, {"master-ball", "poke-ball", "luxury-ball", "level-ball", "dream-ball"}}},
+        {2657784681 - 1, {2657784681 - 1, {}, {"timer-ball", "beast-ball", "poke-ball", "premier-ball", "heal-ball"}}},
+        {2657784681 + 1, {2657784681 + 1, {}, {"heavy-ball", "poke-ball", "friend-ball", "fast-ball", "heavy-ball"}}},
+        {2657784681 + 2, {2657784681 + 2, {}, {"luxury-ball", "poke-ball", "luxury-ball", "quick-ball", "friend-ball"}}},
+
+        {1244233031, {1244233031, {}, {"sport-ball", "sport-ball", "sport-ball", "sport-ball", "sport-ball"}}},
+        {1244233031 - 2, {1244233031 - 2, {}, {"sport-ball", "heal-ball", "luxury-ball", "great-ball", "heal-ball"}}},
+        {1244233031 - 1, {1244233031 - 1, {}, {"sport-ball", "dream-ball", "level-ball", "poke-ball", "luxury-ball"}}},
+        {1244233031 + 1, {1244233031 + 1, {}, {"moon-ball", "heal-ball", "poke-ball", "poke-ball", "heal-ball"}}},
+        {1244233031 + 2, {1244233031 + 2, {}, {"moon-ball", "poke-ball", "ultra-ball", "poke-ball", "great-ball"}}},
+
+        {2493163222, {2493163222, {}, {"safari-ball", "safari-ball", "safari-ball", "safari-ball", "safari-ball"}}},
+        {2493163222 - 2, {2493163222 - 2, {}, {"premier-ball", "great-ball", "lure-ball", "ultra-ball", "safari-ball"}}},
+        {2493163222 - 1, {2493163222 - 1, {}, {"premier-ball", "great-ball", "poke-ball", "poke-ball", "poke-ball"}}},
+        {2493163222 + 1, {2493163222 + 1, {}, {"poke-ball", "poke-ball", "poke-ball", "premier-ball", "great-ball"}}},
+        {2493163222 + 2, {2493163222 + 2, {}, {"great-ball", "great-ball", "level-ball", "poke-ball", "safari-ball"}}},
+
+        {2117201835, {2117201835, {}, {"beast-ball", "beast-ball", "beast-ball", "beast-ball", "beast-ball"}}},
+        {2117201835 - 2, {2117201835 - 2, {}, {"luxury-ball", "poke-ball", "lure-ball", "master-ball", "dive-ball"}}},
+        {2117201835 - 1, {2117201835 - 1, {}, {"heavy-ball", "premier-ball", "premier-ball", "poke-ball", "level-ball"}}},
+        {2117201835 + 1, {2117201835 + 1, {}, {"heal-ball", "great-ball", "luxury-ball", "heavy-ball", "great-ball"}}},
+        {2117201835 + 2, {2117201835 + 2, {}, {"poke-ball", "premier-ball", "great-ball", "poke-ball", "dive-ball"}}},
+
+        {2512943468, {2512943468, {}, {"level-ball", "level-ball", "friend-ball", "lure-ball", "beast-ball", "moon-ball", "fast-ball", "dream-ball", "love-ball", "beast-ball"}}},
+        {2512943468 - 2, {2512943468 - 2, {}, {"level-ball", "dusk-ball", "sport-ball", "great-ball", "dusk-ball", "great-ball", "timer-ball", "premier-ball", "premier-ball", "safari-ball"}}},
+        {2512943468 - 1, {2512943468 - 1, {}, {"level-ball", "premier-ball", "dream-ball", "beast-ball", "dream-ball", "premier-ball", "luxury-ball", "lure-ball", "luxury-ball", "poke-ball"}}},
+        {2512943468 + 1, {2512943468 + 1, {}, {"level-ball", "premier-ball", "sport-ball", "premier-ball", "poke-ball", "great-ball", "great-ball", "poke-ball", "luxury-ball", "dive-ball"}}},
+        {2512943468 + 2, {2512943468 + 2, {}, {"level-ball", "lure-ball", "moon-ball", "heal-ball", "heal-ball", "dream-ball", "great-ball", "safari-ball", "premier-ball", "premier-ball"}}},
+
+        {1949209749, {1949209749, {}, {"love-ball", "dream-ball", "heavy-ball", "lure-ball", "fast-ball", "fast-ball", "safari-ball", "safari-ball", "friend-ball", "heavy-ball"}}},
+        {1949209749 - 2, {1949209749 - 2, {}, {"ultra-ball", "luxury-ball", "luxury-ball", "poke-ball", "poke-ball", "moon-ball", "heal-ball", "timer-ball", "dusk-ball", "great-ball"}}},
+        {1949209749 - 1, {1949209749 - 1, {}, {"net-ball", "heal-ball", "heavy-ball", "heal-ball", "dive-ball", "great-ball", "great-ball", "premier-ball", "luxury-ball", "love-ball"}}},
+        {1949209749 + 1, {1949209749 + 1, {}, {"luxury-ball", "heal-ball", "poke-ball", "poke-ball", "premier-ball", "sport-ball", "luxury-ball", "premier-ball", "poke-ball", "poke-ball"}}},
+        {1949209749 + 2, {1949209749 + 2, {}, {"dusk-ball", "lure-ball", "fast-ball", "premier-ball", "great-ball", "luxury-ball", "poke-ball", "safari-ball", "luxury-ball", "premier-ball"}}},
+
+        {1583217498, {1583217498, {}, {"sport-ball", "master-ball", "fast-ball", "master-ball", "dream-ball", "friend-ball", "lure-ball", "sport-ball", "moon-ball", "dream-ball"}}},
+        {1583217498 - 2, {1583217498 - 2, {}, {"heal-ball", "net-ball", "poke-ball", "premier-ball", "poke-ball", "repeat-ball", "luxury-ball", "poke-ball", "great-ball", "heal-ball"}}},
+        {1583217498 - 1, {1583217498 - 1, {}, {"poke-ball", "heal-ball", "heavy-ball", "luxury-ball", "moon-ball", "timer-ball", "premier-ball", "great-ball", "great-ball", "friend-ball"}}},
+        {1583217498 + 1, {1583217498 + 1, {}, {"level-ball", "dive-ball", "great-ball", "luxury-ball", "moon-ball", "friend-ball", "timer-ball", "heal-ball", "poke-ball", "quick-ball"}}},
+        {1583217498 + 2, {1583217498 + 2, {}, {"luxury-ball", "friend-ball", "dream-ball", "heal-ball", "luxury-ball", "great-ball", "premier-ball", "dusk-ball", "level-ball", "beast-ball"}}},
+
+        //  Template
+//        {1717461428 - 2, {1717461428 - 2, {}, }},
+//        {1717461428 - 1, {1717461428 - 1, {}, }},
+//        {1717461428 + 1, {1717461428 + 1, {}, }},
+//        {1717461428 + 2, {1717461428 + 2, {}, }},
+
+    };
+
+    auto iter = DATABASE.find(seed);
+    if (iter != DATABASE.end()){
+        return iter->second;
+    }
+
+    return DateSeed();
+}
+
+
+
+
+
+}
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ItemPrinter/PokemonSV_ItemPrinterDatabase.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ItemPrinter/PokemonSV_ItemPrinterDatabase.h
new file mode 100644
index 0000000000..92b4c35d29
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ItemPrinter/PokemonSV_ItemPrinterDatabase.h
@@ -0,0 +1,127 @@
+/*  Item Printer Database
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_ItemPrinterDatabase_H
+#define PokemonAutomation_PokemonSV_ItemPrinterDatabase_H
+
+#include "Common/Cpp/Options/EnumDropdownDatabase.h"
+#include "PokemonSV_ItemPrinterTools.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+namespace ItemPrinter{
+
+
+
+enum class PrebuiltOptions{
+    NONE,
+    ITEM_BONUS,
+    BALL_BONUS,
+
+    ABILITY_PATCH,
+    EXP_CANDY,
+    PP_MAX,
+
+    ASSORTED_BALLS_1,
+    ASSORTED_BALLS_2,
+    ASSORTED_BALLS_3,
+
+    MASTER_BALL,
+    FAST_BALL,
+    FRIEND_BALL,
+    LURE_BALL,
+    LEVEL_BALL,
+    HEAVY_BALL,
+    LOVE_BALL,
+    MOON_BALL,
+    DREAM_BALL,
+    SPORT_BALL,
+    SAFARI_BALL,
+    BEAST_BALL,
+
+    BUG_TERA,
+    DARK_TERA,
+    DRAGON_TERA,
+    ELECTRIC_TERA,
+    FAIRY_TERA,
+    FIGHTING_TERA,
+    FIRE_TERA,
+    FLYING_TERA,
+    GHOST_TERA,
+    GRASS_TERA,
+    GROUND_TERA,
+    ICE_TERA,
+    NORMAL_TERA,
+    POISON_TERA,
+    PSYCHIC_TERA,
+    ROCK_TERA,
+    STEEL_TERA,
+    WATER_TERA,
+    STELLAR_TERA,
+};
+const EnumDropdownDatabase<PrebuiltOptions>& PrebuiltOptions_Database();
+
+const EnumDropdownDatabase<PrebuiltOptions>& PrebuiltOptions_AutoMode_Database();
+
+const EnumDropdownDatabase<PrebuiltOptions>& PrebuiltOptions_Simple_Database2();
+
+
+struct ItemPrinterEnumOption{
+    int64_t seed;
+    PrebuiltOptions enum_value;
+    ItemPrinterJobs jobs;
+    uint16_t quantity_obtained;  // quantity obtained from the given seed, with given number of print jobs (ususally 5 print), with bonus active
+};
+const ItemPrinterEnumOption& option_lookup_by_enum(PrebuiltOptions enum_value);
+const ItemPrinterEnumOption* option_lookup_by_seed(int64_t seed);
+
+
+
+struct DateSeed{
+    //  Seed details.
+    int64_t seed;
+    std::array<std::string, 10> regular;
+    std::array<std::string, 10> item_bonus;
+    std::array<std::string, 10> ball_bonus;
+
+    DateSeed()
+        : seed(0)
+    {}
+
+    DateSeed(
+        int64_t p_seed,
+        std::array<std::string, 10> p_items,
+        std::array<std::string, 10> p_balls = {}
+    )
+        : seed(p_seed)
+        , item_bonus(std::move(p_items))
+        , ball_bonus(std::move(p_balls))
+    {}
+    DateSeed(
+        int64_t p_seed,
+        std::array<std::string, 10> p_regular,
+        std::array<std::string, 10> p_item_bonus,
+        std::array<std::string, 10> p_ball_bonus
+    )
+        : seed(p_seed)
+        , regular(std::move(p_regular))
+        , item_bonus(std::move(p_item_bonus))
+        , ball_bonus(std::move(p_ball_bonus))
+    {}
+
+    operator bool() const{
+        return seed >= 0;
+    }
+};
+DateSeed get_date_seed(int64_t seed);
+
+
+}
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ItemPrinter/PokemonSV_ItemPrinterRNG.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ItemPrinter/PokemonSV_ItemPrinterRNG.cpp
new file mode 100644
index 0000000000..d833157fc9
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ItemPrinter/PokemonSV_ItemPrinterRNG.cpp
@@ -0,0 +1,1106 @@
+/*  Item Printer RNG
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/PrettyPrint.h"
+#include "Common/Qt/TimeQt.h"
+#include "CommonFramework/StaticGlobals.h"
+#include "CommonFramework/Exceptions/ProgramFinishedException.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "CommonTools/StartupChecks/VideoResolutionCheck.h"
+#include "NintendoSwitch/NintendoSwitch_Settings.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "NintendoSwitch/Programs/DateSpam/NintendoSwitch_HomeToDateTime.h"
+#include "NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManip.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_IvJudgeReader.h"
+#include "VideoGames/PokemonSV/Inference/PokemonSV_WhiteButtonDetector.h"
+#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h"
+#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h"
+#include "VideoGames/PokemonSV/Inference/ItemPrinter/PokemonSV_ItemPrinterMenuDetector.h"
+#include "VideoGames/PokemonSV/Inference/ItemPrinter/PokemonSV_ItemPrinterMaterialDetector.h"
+#include "VideoGames/PokemonSV/Programs/Farming/PokemonSV_MaterialFarmerTools.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h"
+#include "PokemonSV_ItemPrinterSeedCalc.h"
+#include "PokemonSV_ItemPrinterDatabase.h"
+#include "PokemonSV_ItemPrinterRNG.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+ItemPrinterRNG_Descriptor::ItemPrinterRNG_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonSV:ItemPrinterRNG",
+        Pokemon::STRING_POKEMON + " SV", "Item Printer RNG",
+        "Programs/PokemonSV/ItemPrinterRNG.html",
+        "Farm the Item Printer using RNG Manipulation.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_PerformanceClassSensitive,
+        FeedbackType::VIDEO_AUDIO,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+struct ItemPrinterRNG_Descriptor::Stats : public StatsTracker{
+    Stats()
+        : iterations(m_stats["Rounds"])
+        , prints(m_stats["Prints"])
+//        , total_jobs(m_stats["Total Jobs"])
+        , frame_hits(m_stats["Frame Hits"])
+        , frame_misses(m_stats["Frame Misses"])
+        , frame_unknown(m_stats["Unknown Frame"])
+        , material_farmer_runs(m_stats["Material Farmer Runs"])
+        , errors(m_stats["Errors"])
+    {
+        m_display_order.emplace_back("Rounds");
+        m_display_order.emplace_back("Prints");
+//        m_display_order.emplace_back("Total Jobs", HIDDEN_IF_ZERO);
+        m_display_order.emplace_back("Frame Hits");
+        m_display_order.emplace_back("Frame Misses");
+        m_display_order.emplace_back("Unknown Frame", HIDDEN_IF_ZERO);
+        m_display_order.emplace_back("Material Farmer Runs", HIDDEN_IF_ZERO);
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+    }
+    std::atomic<uint64_t>& iterations;
+    std::atomic<uint64_t>& prints;
+//    std::atomic<uint64_t>& total_jobs;
+    std::atomic<uint64_t>& frame_hits;
+    std::atomic<uint64_t>& frame_misses;
+    std::atomic<uint64_t>& frame_unknown;
+    std::atomic<uint64_t>& material_farmer_runs;
+    std::atomic<uint64_t>& errors;
+};
+std::unique_ptr<StatsTracker> ItemPrinterRNG_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+ItemPrinterRNG::~ItemPrinterRNG(){
+    MATERIAL_FARMER_OPTIONS.remove_listener(*this);
+    MATERIAL_FARMER_TRIGGER.remove_listener(*this);
+    DATE_SEED_TABLE.remove_listener(*this);
+//    AUTO_MATERIAL_FARMING.remove_listener(*this);
+}
+
+ItemPrinterRNG::ItemPrinterRNG()
+    : LANGUAGE(
+        "<b>Game Language:</b>",
+        PokemonSwSh::IV_READER().languages(),
+        LockMode::UNLOCK_WHILE_RUNNING,
+        true
+    )
+    , NUM_ITEM_PRINTER_ROUNDS(
+        "<b>Number of rounds per Item Printer session:</b><br>Iterate the rounds table this many times. ",
+        LockMode::UNLOCK_WHILE_RUNNING, 10
+    )
+//    , AFTER_ITEM_PRINTER_DONE_EXPLANATION(
+//        "Then proceed to material farming."
+//    )
+    , OVERLAPPING_BONUS_WARNING(
+        "<font color=\"red\">WARNING: At least one of the Ball/Item bonuses haven't been fully used up. "
+        "This can mess up your rewards for subsequent prints.</font><br>"
+        "<font color=\"red\">\nNote: Each Ball/Item bonus lasts for 10 prints.</font>"
+    )
+    , MODE(
+        "<b>Item Printer mode:</b><br>",
+        {
+            {ItemPrinterMode::AUTO_MODE, "auto", "Auto Mode: Select your desired item and its quantity, and items will be automatically printed."},
+            {ItemPrinterMode::STANDARD_MODE, "standard", "Standard Mode: Manually select exactly what is being printed for each print job."},
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        ItemPrinterMode::AUTO_MODE
+    )
+    , DESIRED_ITEM_TABLE(
+        "<b>Item Table:</b><br>"
+        "Input your desired item and desired quantity to the table.<br>"
+        "Ensure you have enough BP and are maxed out on the following sandwich ingredients: Chorizo, Bananas, Mayonnaise, Whipped Cream. "
+        "Also, ensure you have a strong lead pokemon for auto-battling, for farming materials.<br>"
+        "If there are duplicate items in the table, only the higher quantity will be considered."
+    )
+    , DATE_SEED_TABLE(
+        "<b>Rounds Table:</b><br>Run the following prints in order and repeat. "
+        "Changes to this table take effect the next time the table starts from the beginning."
+    )
+    , DELAY_MILLIS(
+        "<b>Delay (Milliseconds):</b><br>"
+        "The delay from when you press A to when the game reads the date for the seed. "
+        "For OLED Switches, this delay is about 500 milliseconds. For older Switches, this delay is closer to 1500 milliseconds. "
+        "If the following option is enabled, this delay will be automatically adjusted based on how you miss the frames.",
+        LockMode::UNLOCK_WHILE_RUNNING, 1000,
+        0, 5000
+    )
+    , ADJUST_DELAY(
+        "<b>Automatically Adjust Delay:</b><br>Adjust the delay, depending on the desired item and the actual print result.",
+        LockMode::UNLOCK_WHILE_RUNNING, true
+    )
+    , GO_HOME_WHEN_DONE(false)
+    , FIX_TIME_WHEN_DONE(
+        "<b>Fix Time when Done:</b><br>Fix the time after the program finishes.",
+        LockMode::UNLOCK_WHILE_RUNNING, true
+    )
+    , MATERIAL_FARMER_TRIGGER(
+        "<b>Trigger to start material farmer:</b><br>",
+        {
+            {MaterialFarmerTrigger::FIXED_NUM_PRINT_JOBS, "fixed", "Start Material Farmer when done a certain number of print jobs."},
+            {MaterialFarmerTrigger::MINIMUM_HAPPINY_DUST, "happiny-dust", "Start Material Farmer when Happiny Dust is less than a certain number."},
+        },
+        LockMode::UNLOCK_WHILE_RUNNING,
+        MaterialFarmerTrigger::FIXED_NUM_PRINT_JOBS
+    )
+    , MATERIAL_FARMER_FIXED_NUM_JOBS(
+        "<b>Print Jobs per Material Farming Session:</b><br>"
+        "Run the material farmer once for this many jobs printed.",
+        LockMode::UNLOCK_WHILE_RUNNING, 500,
+        20, 650
+    )
+    , MIN_HAPPINY_DUST(
+        "<b>Minimum Happiny Dust:</b><br>"
+        "Run the material farmer before the number of Happiny Dust drops "
+        "below this number.<br>"
+        "This ensures no other material drops below this number. "
+        "If a material starts below this threshold, it remains there.<br>"
+        "Changes to this number only take place after returning to "
+        "the item printer, after material farming.",
+        LockMode::UNLOCK_WHILE_RUNNING, 400,
+        1, 999
+    )
+    , MATERIAL_FARMER_OPTIONS(
+        GroupOption::EnableMode::DEFAULT_DISABLED,
+        &LANGUAGE,
+        NOTIFICATION_STATUS_UPDATE,
+        NOTIFICATION_PROGRAM_FINISH,
+        NOTIFICATION_ERROR_RECOVERABLE,
+        NOTIFICATION_ERROR_FATAL
+    )
+    , ENABLE_SEED_CALC(
+        "<b>Enable Seed Calculation: (developer only)</b><br>"
+        "Use Kurt's seed calculation instead of hardcoded database. Ensure you have the appropriate resources.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        true
+    )
+    , AVOID_STRING_OCR(
+        "<b>Avoid using OCR on strings:</b><br>"
+        "Only use this if you're having issues (particularly with Asian languages). "
+        "This will detect all materials with a value of 68%, and the highest quantity of this is assumed to be your Happiny Dust quantity. "
+        "i.e. This only detects numbers, therefore sidestepping the issue of poor OCR with Asian languages. "
+        "If you enable this, I recommend ensuring that your quantity of Happiny Dust is greater than the other materials with a value of 68% (Beldum Claw, Ditto Goo, Magby Hair).",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        false
+    )
+    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_STATUS_UPDATE,
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+{
+    PA_ADD_OPTION(LANGUAGE);
+
+    PA_ADD_OPTION(MODE);
+    PA_ADD_OPTION(DESIRED_ITEM_TABLE);
+    PA_ADD_OPTION(NUM_ITEM_PRINTER_ROUNDS);
+    PA_ADD_OPTION(DATE_SEED_TABLE);
+    PA_ADD_OPTION(OVERLAPPING_BONUS_WARNING);
+    PA_ADD_OPTION(DELAY_MILLIS);
+    PA_ADD_OPTION(ADJUST_DELAY);
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+    PA_ADD_OPTION(FIX_TIME_WHEN_DONE);
+
+    PA_ADD_OPTION(MATERIAL_FARMER_TRIGGER);
+    PA_ADD_OPTION(MATERIAL_FARMER_FIXED_NUM_JOBS);
+    PA_ADD_OPTION(MIN_HAPPINY_DUST);
+    PA_ADD_OPTION(MATERIAL_FARMER_OPTIONS);
+    PA_ADD_OPTION(AVOID_STRING_OCR);
+    if (STATIC_GLOBALS.DEVELOPER_MODE){
+        PA_ADD_OPTION(ENABLE_SEED_CALC);
+    }
+
+    PA_ADD_OPTION(NOTIFICATIONS);
+
+    ItemPrinterRNG::on_config_value_changed(this);
+//    AUTO_MATERIAL_FARMING.add_listener(*this);
+    DATE_SEED_TABLE.add_listener(*this);
+    MODE.add_listener(*this);
+    MATERIAL_FARMER_OPTIONS.add_listener(*this);
+    MATERIAL_FARMER_TRIGGER.add_listener(*this);
+}
+
+void ItemPrinterRNG::on_config_value_changed(void* object){
+
+    NUM_ITEM_PRINTER_ROUNDS.set_visibility(
+        MODE == ItemPrinterMode::AUTO_MODE ? ConfigOptionState::HIDDEN : ConfigOptionState::ENABLED
+    );
+
+    OVERLAPPING_BONUS_WARNING.set_visibility(
+        (MODE != ItemPrinterMode::AUTO_MODE) && overlapping_bonus()
+        ? ConfigOptionState::ENABLED : ConfigOptionState::HIDDEN
+    );
+
+    DESIRED_ITEM_TABLE.set_visibility(
+        MODE == ItemPrinterMode::AUTO_MODE ? ConfigOptionState::ENABLED : ConfigOptionState::HIDDEN
+    );
+
+    DATE_SEED_TABLE.set_visibility(
+        MODE == ItemPrinterMode::AUTO_MODE ? ConfigOptionState::HIDDEN : ConfigOptionState::ENABLED
+    );
+
+    ADJUST_DELAY.set_visibility(
+        MODE == ItemPrinterMode::AUTO_MODE ? ConfigOptionState::HIDDEN : ConfigOptionState::ENABLED
+    );
+
+    MATERIAL_FARMER_TRIGGER.set_visibility(
+        (MODE != ItemPrinterMode::AUTO_MODE) && MATERIAL_FARMER_OPTIONS.enabled()
+        ? ConfigOptionState::ENABLED : ConfigOptionState::HIDDEN
+    );
+
+    MATERIAL_FARMER_FIXED_NUM_JOBS.set_visibility(
+        (MODE != ItemPrinterMode::AUTO_MODE) && MATERIAL_FARMER_OPTIONS.enabled() && (MATERIAL_FARMER_TRIGGER == MaterialFarmerTrigger::FIXED_NUM_PRINT_JOBS)
+        ? ConfigOptionState::ENABLED : ConfigOptionState::HIDDEN
+    );    
+
+    MIN_HAPPINY_DUST.set_visibility(
+        (MODE != ItemPrinterMode::AUTO_MODE) && MATERIAL_FARMER_OPTIONS.enabled() && (MATERIAL_FARMER_TRIGGER == MaterialFarmerTrigger::MINIMUM_HAPPINY_DUST)
+        ? ConfigOptionState::ENABLED : ConfigOptionState::HIDDEN
+    );
+
+    MATERIAL_FARMER_OPTIONS.set_visibility(
+        MODE == ItemPrinterMode::AUTO_MODE ? ConfigOptionState::HIDDEN : ConfigOptionState::ENABLED
+    );
+
+    ENABLE_SEED_CALC.set_visibility(
+        MODE == ItemPrinterMode::AUTO_MODE ? ConfigOptionState::HIDDEN : ConfigOptionState::ENABLED
+    );
+
+}
+
+
+// - return true if the user is trying to trigger another Ball/Item bonus without
+// using up the previous bonus. Doing this can mess up rewards for subsequent prints, 
+// since a ball bonus interferes with activating an item bonus and vice versa.
+// - each Bonus lasts for 10 prints.
+bool ItemPrinterRNG::overlapping_bonus(){
+    // for each row in table. if ball/item bonus, ensure that sum of prints in subsequent rows >=10 before the next bonus, or end of the table.
+    uint16_t total_prints_since_last_bonus = 10;
+    for (std::shared_ptr<EditableTableRow>& table_row : DATE_SEED_TABLE.current_refs()){
+        ItemPrinterRngRow& row = static_cast<ItemPrinterRngRow&>(*table_row);
+        if (row.desired_item == ItemPrinter::PrebuiltOptions::BALL_BONUS || row.desired_item == ItemPrinter::PrebuiltOptions::ITEM_BONUS){
+            if (total_prints_since_last_bonus < 10){
+                return true;
+            }
+            total_prints_since_last_bonus = 0;
+        }else{
+            total_prints_since_last_bonus += (uint16_t)static_cast<ItemPrinterJobs>(row.jobs);
+        }
+    }
+
+    if (total_prints_since_last_bonus < 10){
+        return true;
+    }
+
+    return false;
+}
+
+
+ItemPrinterPrizeResult ItemPrinterRNG::run_print_at_date(
+    SingleSwitchProgramEnvironment& env, ProControllerContext& context,
+    const DateTime& date, ItemPrinterJobs jobs
+){
+    ItemPrinterRNG_Descriptor::Stats& stats = env.current_stats<ItemPrinterRNG_Descriptor::Stats>();
+    ItemPrinterPrizeResult prize_result;
+    bool printed = false;
+    bool overworld_seen = false;
+    size_t failures = 0;
+    std::chrono::seconds next_wait_time = std::chrono::seconds(120);
+    while (true){
+        if (failures >= 5){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "Unable to print after 5 attempts.",
+                env.console
+            );
+        }
+        context.wait_for_all_requests();
+
+        OverworldWatcher overworld(env.console, COLOR_BLUE);
+        AdvanceDialogWatcher dialog(COLOR_RED);
+        PromptDialogWatcher prompt(COLOR_GREEN);
+        DateChangeWatcher date_reader(env.console);
+        WhiteButtonWatcher material(COLOR_GREEN, WhiteButton::ButtonX, {0.63, 0.93, 0.17, 0.06});
+        int ret = wait_until(
+            env.console, context, next_wait_time,
+            {
+                overworld,
+                dialog,
+                prompt,
+                date_reader,
+                material,
+            }
+        );
+        context.wait_for(std::chrono::milliseconds(250));
+        next_wait_time = std::chrono::seconds(120);
+        switch (ret){
+        case 0:
+            overworld_seen = true;
+            if (printed){
+                env.log("Detected overworld... (unexpected)", COLOR_RED);
+                return prize_result;
+            }
+            env.log("Detected overworld... Starting print.");
+            pbf_press_button(context, BUTTON_A, 160ms, 240ms);
+            continue;
+
+        case 1:
+            env.log("Detected advance dialog.");
+            pbf_press_button(context, BUTTON_B, 160ms, 240ms);
+            continue;
+
+        case 2:{
+            env.log("Detected prompt dialog.");
+            go_home(env.console, context);
+            home_to_date_time(env.console, context, true);
+            pbf_press_button(context, BUTTON_A, 80ms, 240ms);
+            context.wait_for_all_requests();
+            next_wait_time = std::chrono::seconds(5);
+            continue;
+        }
+        case 3:{
+            env.log("Detected date change.");
+            uint16_t delay_mills = DELAY_MILLIS;
+
+            //  This is the seed we intend to hit.
+            uint64_t seed_epoch_millis = to_seconds_since_epoch(date) * 1000;
+            seed_epoch_millis -= delay_mills;
+
+            //  This is the time we intend to set the clock to.
+            uint64_t threshold = delay_mills + 3000;
+            uint64_t clock_epoch = (seed_epoch_millis - threshold) / 1000;
+            clock_epoch /= 60;  //  Round down to minute.
+            clock_epoch *= 60;
+            DateTime set_date = from_seconds_since_epoch(clock_epoch);
+
+            std::chrono::milliseconds trigger_delay(seed_epoch_millis - clock_epoch * 1000);
+
+            VideoOverlaySet overlays(env.console.overlay());
+            date_reader.make_overlays(overlays);
+            date_reader.set_date(env.program_info(), env.console, context, set_date);
+
+            //  Commit the date and start the timer.
+            pbf_press_button(context, BUTTON_A, 160ms, 240ms);
+            WallClock trigger_time = std::chrono::system_clock::now() + trigger_delay;
+            env.log("Will commit in " + tostr_u_commas(trigger_delay.count()) + " milliseconds.");
+
+            //  Re-enter the game.
+            pbf_press_button(context, BUTTON_HOME, 160ms, ConsoleSettings::instance().SETTINGS_TO_HOME_DELAY0);
+            resume_game_from_home(env.console, context, false);
+
+            context.wait_for(250ms);
+
+            VideoSnapshot snapshot = env.console.video().snapshot();
+            if (!prompt.detect(snapshot)){
+                env.log("Expected to be on prompt menu. Backing out.", COLOR_RED);
+//                snapshot->save("noprompt.png");
+                stats.errors++;
+                env.update_stats();
+                pbf_mash_button(context, BUTTON_B, 4000ms);
+                continue;
+            }
+
+            //  Wait for trigger time.
+            context.wait_until(trigger_time);
+            pbf_press_button(context, BUTTON_A, 80ms, 500ms);
+            continue;
+        }
+        case 4:{
+            env.log("Detected material selection.");
+            if (printed){
+                return prize_result;
+            }
+            if (!overworld_seen){
+                pbf_press_button(context, BUTTON_B, 160ms, 240ms);
+                continue;
+            }
+            item_printer_start_print(env.console, context, LANGUAGE, jobs);
+            stats.prints++;
+            env.update_stats();
+            printed = true;
+            prize_result = item_printer_finish_print(env.console, context, LANGUAGE);
+            std::array<std::string, 10> print_results = prize_result.prizes;
+            uint64_t seed = to_seconds_since_epoch(date);
+            int distance_from_target = get_distance_from_target(env.console, stats, print_results, seed);
+            env.update_stats();
+            if ((ADJUST_DELAY || MODE == ItemPrinterMode::AUTO_MODE) &&
+                distance_from_target != 0 &&
+                distance_from_target != std::numeric_limits<int>::min()
+            ){
+                adjust_delay(env.logger(), env, print_results, distance_from_target);
+            }
+
+//            pbf_press_button(context, BUTTON_B, 160ms, 240ms);
+            continue;
+        }
+        default:
+            failures++;
+            stats.errors++;
+            env.update_stats();
+            env.console.log("No state detected after 2 minutes.", COLOR_RED);
+#if 0
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "No state detected after 2 minutes.",
+                env.console
+            );
+#endif
+        }
+    }
+}
+
+void ItemPrinterRNG::adjust_delay(
+    Logger& logger,
+    SingleSwitchProgramEnvironment& env,
+    const std::array<std::string, 10>& print_results,
+    int distance_from_target
+){
+    const int MAX_MISS = 2;
+    const int16_t ADJUSTMENT_TABLE[MAX_MISS + 1] = {0, 50, 1000};
+
+    int16_t delay_adjustment;
+    if (distance_from_target < 0){
+        distance_from_target = std::min(-distance_from_target, MAX_MISS);
+        delay_adjustment = -ADJUSTMENT_TABLE[distance_from_target];
+    }else if (distance_from_target > 0){
+        distance_from_target = std::min(distance_from_target, MAX_MISS);
+        delay_adjustment = ADJUSTMENT_TABLE[distance_from_target];
+    }else{
+        return;
+    }
+
+    int16_t new_delay = DELAY_MILLIS + delay_adjustment;
+    new_delay = std::max(new_delay, (int16_t)DELAY_MILLIS.min_value());
+    new_delay = std::min(new_delay, (int16_t)DELAY_MILLIS.max_value());
+    DELAY_MILLIS.set((uint16_t)new_delay);
+    logger.log("Current delay: " + std::to_string(new_delay));
+    // std::cout << "Current delay:" << new_delay << std::endl;
+
+}
+
+int ItemPrinterRNG::get_distance_from_target(
+    Logger& logger,
+    ItemPrinterRNG_Descriptor::Stats& stats,
+    const std::array<std::string, 10>& print_results,
+    uint64_t seed
+){
+    int distance_from_target = std::numeric_limits<int>::min();
+    const int MAX_DEVIATION = 10;
+    for (int current_deviation = 0; current_deviation <= MAX_DEVIATION; current_deviation++){
+        ItemPrinter::DateSeed seed_data;
+        if (ENABLE_SEED_CALC || MODE == ItemPrinterMode::AUTO_MODE){
+            seed_data = ItemPrinter::calculate_seed_prizes(seed - current_deviation);
+        }else{
+            seed_data = ItemPrinter::get_date_seed(seed - current_deviation);
+        }
+        if (results_approximately_match(print_results, seed_data.regular) ||
+            results_approximately_match(print_results, seed_data.item_bonus) ||
+            results_approximately_match(print_results, seed_data.ball_bonus)
+        ){
+            distance_from_target = -current_deviation;
+            break;
+        }
+
+        if (current_deviation == 0){
+            continue;
+        }
+
+        if (ENABLE_SEED_CALC || MODE == ItemPrinterMode::AUTO_MODE){
+            seed_data = ItemPrinter::calculate_seed_prizes(seed + current_deviation);
+        }else{
+            seed_data = ItemPrinter::get_date_seed(seed + current_deviation);
+        }
+        if (results_approximately_match(print_results, seed_data.regular) ||
+            results_approximately_match(print_results, seed_data.item_bonus) ||
+            results_approximately_match(print_results, seed_data.ball_bonus)
+        ){
+            distance_from_target = current_deviation;
+            break;
+        }
+    }
+
+    if (distance_from_target == std::numeric_limits<int>::min()){
+        logger.log("Frame Result: Unable to determine frame.", COLOR_RED);
+        stats.frame_unknown++;
+    }else if (distance_from_target < 0){
+        logger.log("Frame Result: Missed. (Target - " + std::to_string(-distance_from_target) + ")", COLOR_ORANGE);
+        stats.frame_misses++;
+    }else if (distance_from_target > 0){
+        logger.log("Frame Result: Missed. (Target + " + std::to_string(distance_from_target) + ")", COLOR_ORANGE);
+        stats.frame_misses++;
+    }else{
+        logger.log("Frame Result: Target hit", COLOR_BLUE);
+        stats.frame_hits++;
+    }
+
+    return distance_from_target;
+}
+
+
+
+bool ItemPrinterRNG::results_approximately_match(
+    const std::array<std::string, 10>& print_results, 
+    const std::array<std::string, 10>& expected_result
+){
+    size_t total_items = 0;
+    size_t mismatches = 0;
+    for (uint8_t i = 0; i < 10; i++){
+        const std::string& x = print_results[i];
+        const std::string& y = expected_result[i];
+        if (x.empty() || y.empty()){
+            continue;
+        }
+
+        total_items++;
+
+        if (x == y){
+            continue;
+        }
+
+        mismatches++;
+    }
+
+    if (total_items == 0){
+        return false;
+    }
+
+    return mismatches * 5 <= total_items;
+}
+
+void ItemPrinterRNG::print_again(
+    SingleSwitchProgramEnvironment& env, ProControllerContext& context,
+    ItemPrinterJobs jobs
+) const{
+    ItemPrinterRNG_Descriptor::Stats& stats = env.current_stats<ItemPrinterRNG_Descriptor::Stats>();
+
+    bool printed = false;
+    while (true){
+        context.wait_for_all_requests();
+
+        OverworldWatcher overworld(env.console, COLOR_BLUE);
+        AdvanceDialogWatcher dialog(COLOR_RED);
+//        PromptDialogWatcher prompt(COLOR_GREEN);
+        WhiteButtonWatcher material(COLOR_GREEN, WhiteButton::ButtonX, {0.63, 0.93, 0.17, 0.06});
+        int ret = wait_until(
+            env.console, context, std::chrono::seconds(120),
+            {
+                overworld,
+                dialog,
+//                prompt,
+                material,
+            }
+        );
+        switch (ret){
+        case 0:
+            env.log("Detected overworld... (unexpected)", COLOR_RED);
+            return;
+
+        case 1:
+            env.log("Detected advance dialog.");
+            pbf_press_button(context, BUTTON_B, 160ms, 240ms);
+            continue;
+
+        case 2:{
+            env.log("Detected material selection.");
+            if (printed){
+                return;
+            }
+            item_printer_start_print(env.console, context, LANGUAGE, jobs);
+            stats.prints++;
+            env.update_stats();
+            printed = true;
+            item_printer_finish_print(env.console, context, LANGUAGE);
+            continue;
+        }
+        default:
+            stats.errors++;
+            env.update_stats();
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "No state detected after 2 minutes.",
+                env.console
+            );
+        }
+    }
+}
+
+void ItemPrinterRNG::run_item_printer_rng_automode(
+    SingleSwitchProgramEnvironment& env, 
+    ProControllerContext& context, 
+    ItemPrinterRNG_Descriptor::Stats& stats
+){
+    const uint16_t min_happiny_dust = 400;
+
+    MaterialFarmerOptions material_farmer_options(
+        GroupOption::EnableMode::DEFAULT_ENABLED,
+        &LANGUAGE,
+        NOTIFICATION_STATUS_UPDATE,
+        NOTIFICATION_PROGRAM_FINISH,
+        NOTIFICATION_ERROR_RECOVERABLE,
+        NOTIFICATION_ERROR_FATAL
+    );
+
+    material_farmer_options.RUN_TIME_IN_MINUTES.set(32);
+    material_farmer_options.SANDWICH_OPTIONS.set_enabled(true);
+    material_farmer_options.SANDWICH_OPTIONS.SAVE_GAME_BEFORE_SANDWICH = true;
+    material_farmer_options.SANDWICH_OPTIONS.BASE_RECIPE.set(BaseRecipe::non_shiny);
+
+    //  For each job that we print, we increment jobs_counter.
+    //  Each time we run the material farmer, we reset jobs_counter to 0.
+    uint32_t jobs_counter = 0;
+
+    // Check material quantity when:
+    // - once when first starting the item printer
+    // - before starting material farming. If still have material, 
+    // can keep using item printer. But this check is only done once, 
+    // until you farm materials again.
+    // - when back from material farming
+    bool done_one_last_material_check_before_mat_farming = false;
+    uint32_t material_farmer_jobs_period = calc_num_jobs_using_happiny_dust(env, context, min_happiny_dust);   
+    bool have_cleared_out_bonus = false;
+    std::map<std::string, uint16_t> obtained_prizes;
+
+    std::vector<ItemPrinterDesiredItemRowSnapshot> desired_table = DESIRED_ITEM_TABLE.snapshot<ItemPrinterDesiredItemRowSnapshot>();
+    for (const ItemPrinterDesiredItemRowSnapshot& desired_row : desired_table){
+        std::string desired_slug = ItemPrinter::PrebuiltOptions_AutoMode_Database().find(desired_row.item)->slug;
+        int16_t desired_quantity = desired_row.quantity;
+        int16_t obtained_quantity = check_obtained_quantity(obtained_prizes, desired_slug);
+        
+        while (obtained_quantity < desired_quantity){
+            int16_t quantity_to_print = desired_quantity - obtained_quantity;
+            std::vector<ItemPrinterRngRowSnapshot> print_table = desired_print_table(desired_row.item, quantity_to_print);
+            if (!have_cleared_out_bonus){
+                // 2323229535, 8 Ability Patches, with no bonus active
+                // x2 Magnet, x9 Exp. Candy S, x7 Pretty Feather, x2 Ability Patch, x2 Ability Patch, 
+                // x7 Big Pearl, x1 Ability Patch, x1 Ability Patch, x16 Ground Tera Shard, x2 Ability Patch     
+
+                // start with printing out 10 just to clear out any lingering bonuses.       
+                ItemPrinterRngRowSnapshot print_10_items = {false, from_seconds_since_epoch(2323229535), ItemPrinterJobs::Jobs_10};
+                print_table.insert(print_table.begin(), print_10_items);
+                have_cleared_out_bonus = true;
+            }
+            
+            for (const ItemPrinterRngRowSnapshot& row : print_table){
+                env.console.log(desired_slug + ": " + std::to_string(check_obtained_quantity(obtained_prizes, desired_slug)) + "/" + std::to_string(desired_quantity));
+
+                // check if need to run material farmer
+                while (jobs_counter >= material_farmer_jobs_period){ 
+                    if (!done_one_last_material_check_before_mat_farming){
+                        // one more material quantity check before material farming
+                        // if still have material, keep using item printer
+                        material_farmer_jobs_period = calc_num_jobs_using_happiny_dust(env, context, min_happiny_dust);
+                        jobs_counter = 0;
+                        done_one_last_material_check_before_mat_farming = true;
+                        continue;
+                    }
+
+                    //  Run the material farmer.
+                    run_material_farming_then_return_to_item_printer(env, context, stats, material_farmer_options);
+
+                    // Recheck number of Happiny Dust after returning from Material Farming,
+                    // prior to restarting Item printing
+                    material_farmer_jobs_period = calc_num_jobs_using_happiny_dust(env, context, min_happiny_dust);
+                    jobs_counter = 0;
+                    done_one_last_material_check_before_mat_farming = false;
+                }
+
+                ItemPrinterPrizeResult prize_result = run_print_at_date(env, context, row.date, row.jobs);
+                std::array<std::string, 10> prizes = prize_result.prizes;
+                std::array<int16_t, 10> quantities = prize_result.quantities;
+                for (size_t i = 0; i < 10; i++){
+                    obtained_prizes[prizes[i]] += quantities[i];
+                }
+
+                jobs_counter += (uint32_t)row.jobs;
+                env.console.log("Print job counter: " + std::to_string(jobs_counter) + "/" + std::to_string(material_farmer_jobs_period));
+                env.console.log("Cumulative prize list:");
+                for (const auto& prize : obtained_prizes){
+                    if (prize.first == ""){
+                        continue;
+                    }
+                    env.console.log(prize.first + ": " + std::to_string(prize.second));
+                }                   
+                
+            }
+
+            obtained_quantity = check_obtained_quantity(obtained_prizes, desired_slug);
+        }
+
+        
+        // stats.iterations++;
+        // env.update_stats();
+    }
+  
+}
+
+int16_t ItemPrinterRNG::check_obtained_quantity(std::map<std::string, uint16_t> obtained_prizes, std::string desired_slug){
+    int16_t obtained_quantity = 0;
+    auto prize_iter = obtained_prizes.find(desired_slug);
+    if (prize_iter != obtained_prizes.end()){
+        obtained_quantity = prize_iter->second;
+    }
+
+    return obtained_quantity;
+}
+
+
+void ItemPrinterRNG::run_material_farming_then_return_to_item_printer(
+    SingleSwitchProgramEnvironment& env, 
+    ProControllerContext& context, 
+    ItemPrinterRNG_Descriptor::Stats& stats,
+    MaterialFarmerOptions& material_farmer_options
+){
+    press_Bs_to_back_to_overworld(env.program_info(), env.console, context);
+    move_from_item_printer_to_material_farming(env.program_info(), env.console, context);
+    {
+        //  Dummy stats since we don't use the material farmer stats.
+        MaterialFarmerStats mat_farm_stats;
+        run_material_farmer(env, env.console, context, material_farmer_options, mat_farm_stats);
+        stats.material_farmer_runs++;
+        env.update_stats();
+    }
+    move_from_material_farming_to_item_printer(env.program_info(), env.console, context);
+
+}
+
+std::vector<ItemPrinterRngRowSnapshot> ItemPrinterRNG::desired_print_table(
+    ItemPrinter::PrebuiltOptions desired_item,
+    uint16_t quantity_to_print
+){
+    ItemPrinter::ItemPrinterEnumOption desired_enum_option = option_lookup_by_enum(desired_item);
+
+    // one bonus bundle is Item/Ball Bonus -> 5 print -> 5 print
+    // quantity_obtained stores the quantity of the desired item that
+    // is produced with one 5 print, with the bonus active.
+    uint16_t num_bonus_bundles = (quantity_to_print + (desired_enum_option.quantity_obtained * 2) - 1)/(desired_enum_option.quantity_obtained * 2); // round up after dividing
+
+    ItemPrinter::PrebuiltOptions bonus_type = get_bonus_type(desired_item);
+    ItemPrinter::ItemPrinterEnumOption bonus_enum_option = option_lookup_by_enum(bonus_type);
+    ItemPrinterRngRowSnapshot bonus_snapshot = {false, from_seconds_since_epoch(bonus_enum_option.seed), bonus_enum_option.jobs};    
+    ItemPrinterRngRowSnapshot desired_item_snapshot = {false, from_seconds_since_epoch(desired_enum_option.seed), desired_enum_option.jobs};
+
+    std::vector<ItemPrinterRngRowSnapshot> print_table;
+    for (size_t i = 0; i < num_bonus_bundles; i++){
+        print_table.push_back(bonus_snapshot);
+        // - we assume all the desired item prints are 5 prints,
+        // since all the single item prints stored in the database are 5 prints.
+        print_table.push_back(desired_item_snapshot); 
+        print_table.push_back(desired_item_snapshot);
+    }
+
+    // cout << "Total number of bonus bundles: " << num_bonus_bundles << endl;
+    // for (const ItemPrinterRngRowSnapshot& row : print_table){
+    //     cout << (int)row.jobs << ": ";
+    //     std::cout << row.date.year << "-" << (int)row.date.month << "-" << (int)row.date.day << " ";
+    //     std::cout << (int)row.date.hour << ":" << (int)row.date.minute << ":" << (int)row.date.second << endl;
+    // }
+
+    return print_table;
+}
+
+
+ItemPrinter::PrebuiltOptions ItemPrinterRNG::get_bonus_type(ItemPrinter::PrebuiltOptions desired_item){
+    // EnumDropdownDatabase<ItemPrinter::PrebuiltOptions> database = ItemPrinter::PrebuiltOptions_AutoMode_Database();
+    // std::string slug = database.find(desired_item)->slug;
+    std::string slug = ItemPrinter::PrebuiltOptions_AutoMode_Database().find(desired_item)->slug;
+    // cout << slug << endl;
+    if (slug.find("ball") != std::string::npos){
+        return ItemPrinter::PrebuiltOptions::BALL_BONUS;
+    }else{
+        return ItemPrinter::PrebuiltOptions::ITEM_BONUS;
+    }
+}
+
+
+void ItemPrinterRNG::run_item_printer_rng(
+    SingleSwitchProgramEnvironment& env, ProControllerContext& context, 
+    ItemPrinterRNG_Descriptor::Stats& stats
+){
+    //  For each job that we print, we increment jobs_counter.
+    //  Each time we run the material farmer, we reset jobs_counter to 0.
+    uint32_t jobs_counter = 0;
+
+    bool done_one_last_material_check_before_mat_farming = false;
+    uint32_t material_farmer_jobs_period = MATERIAL_FARMER_FIXED_NUM_JOBS;
+    if (MATERIAL_FARMER_OPTIONS.enabled() && MATERIAL_FARMER_TRIGGER == MaterialFarmerTrigger::MINIMUM_HAPPINY_DUST){
+        // Check material quantity when:
+        // - once when first starting the item printer
+        // - before starting material farming. If still have material, 
+        // can keep using item printer. But this check is only done once, 
+        // until you farm materials again.
+        // - when back from material farming
+
+        uint32_t num_jobs_with_happiny_dust = calc_num_jobs_using_happiny_dust(env, context, MIN_HAPPINY_DUST);
+        material_farmer_jobs_period = num_jobs_with_happiny_dust;
+    }
+
+    for (uint32_t c = 0; c < NUM_ITEM_PRINTER_ROUNDS; c++){
+        send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
+
+        std::vector<ItemPrinterRngRowSnapshot> table = DATE_SEED_TABLE.snapshot<ItemPrinterRngRowSnapshot>();
+        for (const ItemPrinterRngRowSnapshot& row : table){
+            //  Cannot run material farmer between chained prints.
+            if (row.chain){
+                print_again(env, context, row.jobs);
+                jobs_counter += (uint32_t)row.jobs;
+                continue;
+            }
+
+            run_print_at_date(env, context, row.date, row.jobs);
+            jobs_counter += (uint32_t)row.jobs;
+
+            if (!MATERIAL_FARMER_OPTIONS.enabled()){
+                continue;
+            }
+
+            ////////////////////////////////////////////////////
+            //  Material farmer is enabled. 
+            //  Check number of print jobs before triggering material farmer.
+            ////////////////////////////////////////////////////
+
+            if (MATERIAL_FARMER_TRIGGER == MaterialFarmerTrigger::FIXED_NUM_PRINT_JOBS){
+                material_farmer_jobs_period = MATERIAL_FARMER_FIXED_NUM_JOBS;
+            }
+            env.console.log(
+                "Print job counter: " 
+                + std::to_string(jobs_counter) 
+                + "/" 
+                + std::to_string(material_farmer_jobs_period)
+            );
+            
+            //  Not ready to run material farmer yet.
+            if (jobs_counter < material_farmer_jobs_period){
+                continue;
+            }
+            
+            if (MATERIAL_FARMER_TRIGGER == MaterialFarmerTrigger::MINIMUM_HAPPINY_DUST 
+                && !done_one_last_material_check_before_mat_farming
+            ){
+                // one more material quantity check before material farming
+                // if still have material, keep using item printer
+                uint32_t num_jobs_with_happiny_dust = calc_num_jobs_using_happiny_dust(env, context, MIN_HAPPINY_DUST);
+                material_farmer_jobs_period = num_jobs_with_happiny_dust;
+                jobs_counter = 0;
+                done_one_last_material_check_before_mat_farming = true;
+                if (material_farmer_jobs_period > 0){
+                    continue;
+                }                
+            }            
+
+            //  Run the material farmer.
+            press_Bs_to_back_to_overworld(env.program_info(), env.console, context);
+            move_from_item_printer_to_material_farming(env.program_info(), env.console, context);
+            {
+                //  Dummy stats since we don't use the material farmer stats.
+                MaterialFarmerStats mat_farm_stats;
+                run_material_farmer(env, env.console, context, MATERIAL_FARMER_OPTIONS, mat_farm_stats);
+                stats.material_farmer_runs++;
+                env.update_stats();
+            }
+            move_from_material_farming_to_item_printer(env.program_info(), env.console, context);
+
+            // Recheck number of Happiny Dust after returning from Material Farming,
+            // prior to restarting Item printing
+            if (MATERIAL_FARMER_TRIGGER == MaterialFarmerTrigger::MINIMUM_HAPPINY_DUST){
+                uint32_t num_jobs_with_happiny_dust = calc_num_jobs_using_happiny_dust(env, context, MIN_HAPPINY_DUST);
+                material_farmer_jobs_period = num_jobs_with_happiny_dust;
+                done_one_last_material_check_before_mat_farming = false;
+            }
+            
+            jobs_counter = 0;
+        }
+//        run_print_at_date(env, context, DATE0, 1);
+//        run_print_at_date(env, context, DATE1, 10);
+        stats.iterations++;
+        env.update_stats();
+    }
+}
+
+// return number of print jobs we can do, based on how much Happiny Dust we have,
+// and how low we allow the Happiny dust to go (min_happiny_dust)
+uint32_t ItemPrinterRNG::calc_num_jobs_using_happiny_dust(
+    SingleSwitchProgramEnvironment& env, 
+    ProControllerContext& context,
+    uint16_t min_happiny_dust
+){
+    uint32_t num_happiny_dust = check_num_happiny_dust(env, context);
+
+    // give a buffer of 50, for a margin of safety. signed int to handle negative numbers
+    int32_t num_happiny_dust_can_use = num_happiny_dust - MIN_HAPPINY_DUST - 50; 
+    num_happiny_dust_can_use = num_happiny_dust_can_use < 0 ? 0 : num_happiny_dust_can_use;
+
+    // assume 62% value for Happiny Dust to account for item printer wasteage.
+    uint32_t num_print_jobs = (uint32_t)(num_happiny_dust_can_use * 0.62); // truncate the float back to int
+    env.console.log("Number of Happiny Dust we have: " + std::to_string(num_happiny_dust));
+    env.console.log("Number of Happiny Dust we can use (with some safety margins): " + std::to_string(num_happiny_dust_can_use));
+    env.console.log("Number of print jobs we can do before material farming: " + std::to_string(num_print_jobs));
+    return num_print_jobs;
+}
+
+uint32_t ItemPrinterRNG::check_num_happiny_dust(
+    SingleSwitchProgramEnvironment& env, ProControllerContext& context
+){
+    ItemPrinterRNG_Descriptor::Stats& stats = env.current_stats<ItemPrinterRNG_Descriptor::Stats>();
+    env.log("Check how much Happiny Dust we have.");
+    uint32_t num_happiny_dust;
+    while (true){
+        context.wait_for_all_requests();
+
+        OverworldWatcher overworld(env.console, COLOR_BLUE);
+        AdvanceDialogWatcher dialog(COLOR_RED);
+        PromptDialogWatcher prompt(COLOR_GREEN);
+        DateChangeWatcher date_reader(env.console);
+        ItemPrinterMenuWatcher material(COLOR_GREEN);
+        int ret = wait_until(
+            env.console, context, std::chrono::seconds(120),
+            {
+                overworld,
+                dialog,
+                prompt,
+                material,
+            }
+        );
+        switch (ret){
+        case 0:
+            env.log("Detected overworld... Entering item printer.");
+            pbf_press_button(context, BUTTON_A, 160ms, 240ms);
+            continue;
+
+        case 1:
+            env.log("Detected advance dialog.");
+            pbf_press_button(context, BUTTON_B, 160ms, 240ms);
+            continue;
+
+        case 2:{
+            env.log("Detected prompt dialog. Entering item printer.");
+            pbf_press_button(context, BUTTON_A, 80ms, 240ms);
+            context.wait_for_all_requests();
+            continue;
+        }
+        case 3:{
+            env.log("Detected material selection.");
+            ItemPrinterMaterialDetector detector(COLOR_RED, LANGUAGE);
+            if (AVOID_STRING_OCR){
+                uint32_t highest_quantity_of_value_68 = detector.find_highest_quantity_of_value_68(env.console, context);
+                return highest_quantity_of_value_68;
+
+            }else{
+                int8_t happiny_dust_row_num = detector.find_happiny_dust_row_index(
+                    env.console, context
+                );
+
+                context.wait_for_all_requests();
+                VideoSnapshot snapshot = env.console.video().snapshot();
+                num_happiny_dust = detector.detect_material_quantity(
+                    env.console, snapshot, context,
+                    happiny_dust_row_num
+                );
+                pbf_mash_button(context, BUTTON_B, 800ms);
+                return num_happiny_dust;
+            }
+            
+        }
+        default:
+            stats.errors++;
+            env.update_stats();
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "No state detected after 2 minutes.",
+                env.console
+            );
+        }
+    }    
+
+    return 0;
+}
+
+void ItemPrinterRNG::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    assert_16_9_720p_min(env.logger(), env.console);
+
+    //  Connect the controller.
+    require_player(env.console, context, BUTTON_LCLICK);
+
+    ItemPrinterRNG_Descriptor::Stats& stats = env.current_stats<ItemPrinterRNG_Descriptor::Stats>();
+    env.update_stats();
+
+
+    if (MODE == ItemPrinterMode::AUTO_MODE || MATERIAL_FARMER_OPTIONS.enabled()){
+        // - Ensure audio input is enabled
+        LetsGoKillSoundDetector audio_detector(env.console, [](float){ return true; });
+        wait_until(
+            env.console, context,
+            std::chrono::milliseconds(1100),
+            {audio_detector}
+        );
+        audio_detector.throw_if_no_sound(std::chrono::milliseconds(1000));
+    }
+
+    try{
+        if (MODE == ItemPrinterMode::AUTO_MODE){
+            run_item_printer_rng_automode(env, context, stats);
+        }else{
+            run_item_printer_rng(env, context, stats);
+        }
+
+    }catch (ProgramFinishedException&){}
+
+    if (FIX_TIME_WHEN_DONE){
+        go_home(env.console, context);
+        home_to_date_time(env.console, context, false);
+        pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+        pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+        pbf_press_button(context, BUTTON_HOME, 160ms, ConsoleSettings::instance().SETTINGS_TO_HOME_DELAY0);
+        resume_game_from_home(env.console, context);
+    }
+    GO_HOME_WHEN_DONE.run_end_of_program(context);
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ItemPrinter/PokemonSV_ItemPrinterRNG.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ItemPrinter/PokemonSV_ItemPrinterRNG.h
new file mode 100644
index 0000000000..4377e3d450
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ItemPrinter/PokemonSV_ItemPrinterRNG.h
@@ -0,0 +1,154 @@
+/*  Item Printer RNG
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_ItemPrinterRNG_H
+#define PokemonAutomation_PokemonSV_ItemPrinterRNG_H
+
+#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "CommonTools/Options/LanguageOCROption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+#include "VideoGames/PokemonSV/Programs/Farming/PokemonSV_MaterialFarmerTools.h"
+#include "PokemonSV_ItemPrinterTools.h"
+#include "PokemonSV_ItemPrinterRNGTable.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+class ItemPrinterRNG_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    ItemPrinterRNG_Descriptor();
+    struct Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+class ItemPrinterRNG : public SingleSwitchProgramInstance, public ConfigOption::Listener{
+public:
+    using Descriptor = ItemPrinterRNG_Descriptor;
+    ~ItemPrinterRNG();
+    ItemPrinterRNG();
+
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+
+private:
+    enum class MaterialFarmerTrigger{
+        FIXED_NUM_PRINT_JOBS,
+        MINIMUM_HAPPINY_DUST,
+    };
+
+    enum class ItemPrinterMode{
+        STANDARD_MODE,
+        AUTO_MODE,
+    };
+
+    virtual void on_config_value_changed(void* object) override;
+
+    bool overlapping_bonus();
+
+    void run_item_printer_rng_automode(SingleSwitchProgramEnvironment& env, ProControllerContext& context, ItemPrinterRNG_Descriptor::Stats& stats);
+
+    void run_item_printer_rng(SingleSwitchProgramEnvironment& env, ProControllerContext& context, ItemPrinterRNG_Descriptor::Stats& stats);
+
+    std::vector<ItemPrinterRngRowSnapshot> desired_print_table(
+        ItemPrinter::PrebuiltOptions desired_item,
+        uint16_t quantity_to_print
+    );
+
+    // return Ball bonus or item bonus, based on the desired_item
+    // if the desired_item is a type of ball, return Ball Bonus, else return Item Bonus
+    ItemPrinter::PrebuiltOptions get_bonus_type(ItemPrinter::PrebuiltOptions desired_item);
+
+    int16_t check_obtained_quantity(std::map<std::string, uint16_t> obtained_prizes, std::string desired_slug);
+
+    // move from item printer to material farming, run material farmer, then 
+    // return to item printer
+    void run_material_farming_then_return_to_item_printer(
+        SingleSwitchProgramEnvironment& env, 
+        ProControllerContext& context, 
+        ItemPrinterRNG_Descriptor::Stats& stats,
+        MaterialFarmerOptions& material_farmer_options
+    );
+
+    ItemPrinterPrizeResult run_print_at_date(
+        SingleSwitchProgramEnvironment& env, ProControllerContext& context,
+        const DateTime& date, ItemPrinterJobs jobs
+    );
+
+    void print_again(
+        SingleSwitchProgramEnvironment& env, ProControllerContext& context,
+        ItemPrinterJobs jobs
+    ) const;
+
+    void adjust_delay(
+        Logger& logger,
+        SingleSwitchProgramEnvironment& env,
+        const std::array<std::string, 10>& print_results, 
+        int distance_from_target
+    );
+
+    int get_distance_from_target(
+        Logger& logger,
+        ItemPrinterRNG_Descriptor::Stats& stats,
+        const std::array<std::string, 10>& print_results,
+        uint64_t seed
+    );
+
+    bool results_approximately_match(
+        const std::array<std::string, 10>& print_results, 
+        const std::array<std::string, 10>& expected_result
+    );
+
+    uint32_t calc_num_jobs_using_happiny_dust(
+        SingleSwitchProgramEnvironment& env, 
+        ProControllerContext& context,
+        uint16_t min_happiny_dust
+    );
+
+    uint32_t check_num_happiny_dust(
+        SingleSwitchProgramEnvironment& env, ProControllerContext& context
+    );
+
+private:
+    OCR::LanguageOCROption LANGUAGE;
+    SimpleIntegerOption<uint16_t> NUM_ITEM_PRINTER_ROUNDS;
+
+    StaticTextOption OVERLAPPING_BONUS_WARNING;
+    EnumDropdownOption<ItemPrinterMode> MODE;
+    ItemPrinterDesiredItemTable DESIRED_ITEM_TABLE;
+    ItemPrinterRngTable DATE_SEED_TABLE;
+
+    SimpleIntegerOption<uint16_t> DELAY_MILLIS;
+    BooleanCheckBoxOption ADJUST_DELAY;
+
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
+    BooleanCheckBoxOption FIX_TIME_WHEN_DONE;
+
+    EnumDropdownOption<MaterialFarmerTrigger> MATERIAL_FARMER_TRIGGER;
+    SimpleIntegerOption<uint16_t> MATERIAL_FARMER_FIXED_NUM_JOBS;
+    SimpleIntegerOption<uint16_t> MIN_HAPPINY_DUST;
+    MaterialFarmerOptions MATERIAL_FARMER_OPTIONS;
+
+    BooleanCheckBoxOption ENABLE_SEED_CALC;
+
+    BooleanCheckBoxOption AVOID_STRING_OCR;
+
+    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+
+}
+}
+}
+#endif
+
+
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ItemPrinter/PokemonSV_ItemPrinterRNGTable.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ItemPrinter/PokemonSV_ItemPrinterRNGTable.cpp
new file mode 100644
index 0000000000..9ea03a414a
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ItemPrinter/PokemonSV_ItemPrinterRNGTable.cpp
@@ -0,0 +1,238 @@
+/*  Item Printer RNG Table
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Qt/TimeQt.h"
+#include "PokemonSV_ItemPrinterRNGTable.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+ItemPrinterRngRow::~ItemPrinterRngRow(){
+    chain.remove_listener(*this);
+    date.remove_listener(*this);
+    jobs.remove_listener(*this);
+    desired_item.remove_listener(*this);
+}
+ItemPrinterRngRow::ItemPrinterRngRow(EditableTableOption& parent_table)
+    : EditableTableRow(parent_table)
+    , chain(LockMode::UNLOCK_WHILE_RUNNING, false)
+    , date(
+        LockMode::UNLOCK_WHILE_RUNNING,
+        DateTimeOption::DATE_HOUR_MIN_SEC,
+        DateTime{2000, 1, 1, 0, 1, 0},
+        DateTime{2060, 12, 31, 23, 59, 59},
+        DateTime{2024,  6,  4,  0, 37,  8}
+    )
+    , jobs(
+        ItemPrinterJobs_Database(),
+        LockMode::UNLOCK_WHILE_RUNNING,
+        ItemPrinterJobs::Jobs_1
+    )
+    , desired_item(
+        ItemPrinter::PrebuiltOptions_Database(),
+        LockMode::UNLOCK_WHILE_RUNNING,
+        ItemPrinter::PrebuiltOptions::BALL_BONUS
+    )
+{
+    PA_ADD_OPTION(chain);
+    PA_ADD_OPTION(date);
+    PA_ADD_OPTION(jobs);
+    PA_ADD_OPTION(desired_item);
+
+    chain.add_listener(*this);
+    date.add_listener(*this);
+    jobs.add_listener(*this);
+    desired_item.add_listener(*this);
+}
+ItemPrinterRngRow::ItemPrinterRngRow(
+    EditableTableOption& parent_table,
+    bool p_chain, const DateTime& p_date, ItemPrinterJobs p_jobs
+)
+    : ItemPrinterRngRow(parent_table)
+{
+    chain = p_chain;
+    date.set(p_date);
+    jobs.set(p_jobs);
+}
+ItemPrinterRngRowSnapshot ItemPrinterRngRow::snapshot() const{
+    return ItemPrinterRngRowSnapshot{chain, date, jobs};
+}
+std::unique_ptr<EditableTableRow> ItemPrinterRngRow::clone() const{
+    std::unique_ptr<ItemPrinterRngRow> ret(new ItemPrinterRngRow(parent()));
+    ret->chain = (bool)chain;
+    ret->date.set(date);
+    ret->jobs.set(jobs);
+    return ret;
+}
+
+
+
+// - if desired_item has changed, set the seed (and number of jobs) accordingly
+// - if any of date/jobs/chain changes, check if the date and jobs match one of ItemPrinterEnumOption, 
+// and that chain is disabled. If so, set the desired item to the enum_value. Else set desired_item to NONE.
+//  - also, hide the date if chain enabled.
+// - trigger the listener for the parent table.
+void ItemPrinterRngRow::on_config_value_changed(void* object){
+    //  This is really ugly due to the circular update dependency.
+    //  TODO: Redesign this.
+
+    {
+        WriteSpinLock lg1(m_pending_lock);
+        m_pending.emplace_back(object);
+    }
+
+    bool keep_going;
+    do{
+        std::unique_lock<Mutex> lg(m_update_lock, std::try_to_lock_t());
+        if (!lg.owns_lock()){
+            return;
+        }
+        {
+            WriteSpinLock lg1(m_pending_lock);
+            object = m_pending.front();
+            m_pending.pop_front();
+        }
+
+        ItemPrinterRngTable& table = static_cast<ItemPrinterRngTable&>(parent());
+
+        if (object == &desired_item){
+            ItemPrinter::PrebuiltOptions option = desired_item;
+            if (option != ItemPrinter::PrebuiltOptions::NONE){
+                const ItemPrinter::ItemPrinterEnumOption& option_data = option_lookup_by_enum(option);
+                chain = false;
+                jobs.set(option_data.jobs);
+                date.set(from_seconds_since_epoch(option_data.seed));
+            }
+        }else if (object == &date || object == &jobs || object == &chain){
+            date.set_visibility(chain ? ConfigOptionState::HIDDEN : ConfigOptionState::ENABLED);
+            const ItemPrinter::ItemPrinterEnumOption* option_data = ItemPrinter::option_lookup_by_seed(to_seconds_since_epoch(date));
+//            cout << "option_data = " << option_data << endl;
+            // seed found in the PrebuiltOptions table, and jobs number matches and chain disabled
+            if (option_data != nullptr && option_data->jobs == jobs && !chain){
+                desired_item.set(option_data->enum_value);
+            }else{
+//                cout << "option_data->jobs = " << (size_t)option_data->jobs << ", jobs = " << jobs.current_value() << ", chain = " << chain << endl;
+                desired_item.set(ItemPrinter::PrebuiltOptions::NONE);
+            }
+        }
+
+        table.report_value_changed(object);
+
+        WriteSpinLock lg1(m_pending_lock);
+        keep_going = !m_pending.empty();
+    }while (keep_going);
+}
+
+ItemPrinterRngTable::ItemPrinterRngTable(std::string label)
+    : EditableTableOption_t<ItemPrinterRngRow>(
+        std::move(label),
+        LockMode::UNLOCK_WHILE_RUNNING
+    )
+{
+    //  Need to do this separately because this prematurely accesses the table.
+    set_default(make_defaults());
+    restore_defaults();
+}
+std::vector<std::string> ItemPrinterRngTable::make_header() const{
+    return std::vector<std::string>{
+        "Continue Previous?",
+        "Date Seed",
+        "Jobs to Print",
+        "Desired Item",
+    };
+}
+std::vector<std::unique_ptr<EditableTableRow>> ItemPrinterRngTable::make_defaults(){
+    std::vector<std::unique_ptr<EditableTableRow>> ret;
+    ret.emplace_back(std::make_unique<ItemPrinterRngRow>(*this, false, DateTime{2024,  6,  4,  0, 37,  8}, ItemPrinterJobs::Jobs_1));
+    ret.emplace_back(std::make_unique<ItemPrinterRngRow>(*this, false, DateTime{2049,  8, 18, 23, 51,  8}, ItemPrinterJobs::Jobs_10));
+    ret.emplace_back(std::make_unique<ItemPrinterRngRow>(*this, false, DateTime{2024,  6,  4,  0, 37,  8}, ItemPrinterJobs::Jobs_1));
+    ret.emplace_back(std::make_unique<ItemPrinterRngRow>(*this, false, DateTime{2031, 10,  8,  7,  9,  9}, ItemPrinterJobs::Jobs_10));
+    ret.emplace_back(std::make_unique<ItemPrinterRngRow>(*this, false, DateTime{2024,  6,  4,  0, 37,  8}, ItemPrinterJobs::Jobs_1));
+    ret.emplace_back(std::make_unique<ItemPrinterRngRow>(*this, false, DateTime{2020,  3,  3,  6, 38, 18}, ItemPrinterJobs::Jobs_10));
+    return ret;
+}
+
+
+
+ItemPrinterDesiredItemRow::ItemPrinterDesiredItemRow(EditableTableOption& parent_table)
+    : EditableTableRow(parent_table)
+    , desired_item(
+        ItemPrinter::PrebuiltOptions_AutoMode_Database(),
+        LockMode::UNLOCK_WHILE_RUNNING,
+        ItemPrinter::PrebuiltOptions::ABILITY_PATCH
+    )
+    , desired_quantity(
+        LockMode::UNLOCK_WHILE_RUNNING,
+        999, 1, 999
+    )
+{
+    PA_ADD_OPTION(desired_item);
+    PA_ADD_OPTION(desired_quantity);
+
+}
+
+ItemPrinterDesiredItemRow::ItemPrinterDesiredItemRow(
+    EditableTableOption& parent_table,
+    ItemPrinter::PrebuiltOptions item, uint16_t quantity
+)
+    : ItemPrinterDesiredItemRow(parent_table)
+{
+    desired_item.set(item);
+    desired_quantity.set(quantity);
+}
+
+ItemPrinterDesiredItemRowSnapshot ItemPrinterDesiredItemRow::snapshot() const{
+    
+    return ItemPrinterDesiredItemRowSnapshot{desired_item, desired_quantity};
+}
+
+
+std::unique_ptr<EditableTableRow> ItemPrinterDesiredItemRow::clone() const{
+    std::unique_ptr<ItemPrinterDesiredItemRow> ret(new ItemPrinterDesiredItemRow(parent()));
+    ret->desired_item.set(desired_item);
+    ret->desired_quantity.set(desired_quantity);
+    return ret;
+}
+
+
+void ItemPrinterDesiredItemRow::on_config_value_changed(void* object){
+
+}
+
+ItemPrinterDesiredItemTable::ItemPrinterDesiredItemTable(std::string label)
+    : EditableTableOption_t<ItemPrinterDesiredItemRow>(
+        std::move(label),
+        LockMode::LOCK_WHILE_RUNNING
+    )
+{
+    //  Need to do this separately because this prematurely accesses the table.
+    set_default(make_defaults());
+    restore_defaults();
+}
+std::vector<std::string> ItemPrinterDesiredItemTable::make_header() const{
+    return std::vector<std::string>{
+        "Desired Item",
+        "Quantity",
+    };
+}
+std::vector<std::unique_ptr<EditableTableRow>> ItemPrinterDesiredItemTable::make_defaults(){
+    std::vector<std::unique_ptr<EditableTableRow>> ret;
+    ret.emplace_back(std::make_unique<ItemPrinterDesiredItemRow>(*this, ItemPrinter::PrebuiltOptions::ABILITY_PATCH, (uint16_t)999));
+    ret.emplace_back(std::make_unique<ItemPrinterDesiredItemRow>(*this, ItemPrinter::PrebuiltOptions::EXP_CANDY, (uint16_t)999));
+    return ret;
+}
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ItemPrinter/PokemonSV_ItemPrinterRNGTable.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ItemPrinter/PokemonSV_ItemPrinterRNGTable.h
new file mode 100644
index 0000000000..51d43ad538
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ItemPrinter/PokemonSV_ItemPrinterRNGTable.h
@@ -0,0 +1,112 @@
+/*  Item Printer RNG Table
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_ItemPrinterRNGTable_H
+#define PokemonAutomation_PokemonSV_ItemPrinterRNGTable_H
+
+#include <deque>
+#include "Common/Cpp/Concurrency/Mutex.h"
+#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "Common/Cpp/Options/EnumDropdownOption.h"
+#include "Common/Cpp/Options/DateOption.h"
+#include "Common/Cpp/Options/EditableTableOption.h"
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "PokemonSV_ItemPrinterTools.h"
+#include "PokemonSV_ItemPrinterDatabase.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+struct ItemPrinterRngRowSnapshot{
+    bool chain;
+    DateTime date;
+    ItemPrinterJobs jobs;
+};
+
+
+class ItemPrinterRngRow : public EditableTableRow, public ConfigOption::Listener{
+public:
+
+    ~ItemPrinterRngRow();
+    ItemPrinterRngRow(EditableTableOption& parent_table);
+    ItemPrinterRngRow(
+        EditableTableOption& parent_table,
+        bool p_chain, const DateTime& p_date, ItemPrinterJobs p_jobs
+    );
+
+    ItemPrinterRngRowSnapshot snapshot() const;
+
+    virtual std::unique_ptr<EditableTableRow> clone() const override;
+    virtual void on_config_value_changed(void* object) override;
+
+//    void set_seed_based_on_desired_item();
+
+public:
+    BooleanCheckBoxCell chain;
+    DateTimeCell date;
+    EnumDropdownCell<ItemPrinterJobs> jobs;
+    EnumDropdownCell<ItemPrinter::PrebuiltOptions> desired_item;
+
+private:
+    //  Brutal work-around for circular callback dependency.
+    SpinLock m_pending_lock;
+    std::deque<void*> m_pending;
+    Mutex m_update_lock;
+};
+
+
+class ItemPrinterRngTable : public EditableTableOption_t<ItemPrinterRngRow>{
+public:
+    ItemPrinterRngTable(std::string label);
+    virtual std::vector<std::string> make_header() const override;
+    std::vector<std::unique_ptr<EditableTableRow>> make_defaults();
+
+    friend class ItemPrinterRngRow;
+};
+
+struct ItemPrinterDesiredItemRowSnapshot{
+    ItemPrinter::PrebuiltOptions item;
+    uint16_t quantity;
+};
+
+class ItemPrinterDesiredItemRow : public EditableTableRow, public ConfigOption::Listener{
+public:
+    ItemPrinterDesiredItemRow(EditableTableOption& parent_table);
+
+    ItemPrinterDesiredItemRow(
+        EditableTableOption& parent_table,
+        ItemPrinter::PrebuiltOptions item, uint16_t quantity
+    );
+
+    ItemPrinterDesiredItemRowSnapshot snapshot() const;
+
+    virtual std::unique_ptr<EditableTableRow> clone() const override;
+    virtual void on_config_value_changed(void* object) override;
+
+public:
+    EnumDropdownCell<ItemPrinter::PrebuiltOptions> desired_item;
+    SimpleIntegerCell<uint16_t> desired_quantity;
+
+};
+
+class ItemPrinterDesiredItemTable : public EditableTableOption_t<ItemPrinterDesiredItemRow>{
+public:
+    ItemPrinterDesiredItemTable(std::string label);
+    virtual std::vector<std::string> make_header() const override;
+    std::vector<std::unique_ptr<EditableTableRow>> make_defaults();
+
+    friend class ItemPrinterDesiredItemRow;
+};
+
+
+
+}
+}
+}
+
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ItemPrinter/PokemonSV_ItemPrinterSeedCalc.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ItemPrinter/PokemonSV_ItemPrinterSeedCalc.cpp
new file mode 100644
index 0000000000..c7a6043ec8
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ItemPrinter/PokemonSV_ItemPrinterSeedCalc.cpp
@@ -0,0 +1,416 @@
+/*  Item Printer Seed Calculation
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  This file is ported from:
+ *  https://github.com/kwsch/ItemPrinterDeGacha/blob/main/ItemPrinterDeGacha.Core/ItemPrinter.cs
+ *
+ *  The actual RNG logic is from Anubis.
+ *
+ */
+
+#include <vector>
+#include <map>
+#include "Common/Compiler.h"
+#include "Common/Cpp/Json/JsonValue.h"
+#include "Common/Cpp/Json/JsonArray.h"
+#include "Common/Cpp/Json/JsonObject.h"
+#include "CommonFramework/GlobalAutoPaths.h"
+#include "Pokemon/Pokemon_Xoroshiro128Plus.h"
+#include "PokemonSV_ItemPrinterSeedCalc.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+namespace ItemPrinter{
+
+
+const char* item_id_to_slug(int item_id){
+    //  Taken from: https://github.com/kwsch/ItemPrinterDeGacha/blob/main/ItemPrinterDeGacha.Core/Resources/text/items_en.txt
+    static const std::map<int, const char*> database{
+        {1, "master-ball"},
+        {2, "ultra-ball"},
+        {3, "great-ball"},
+        {4, "poke-ball"},
+        {5, "safari-ball"},
+        {6, "net-ball"},
+        {7, "dive-ball"},
+        {8, "nest-ball"},
+        {9, "repeat-ball"},
+        {10, "timer-ball"},
+        {11, "luxury-ball"},
+        {12, "premier-ball"},
+        {13, "dusk-ball"},
+        {14, "heal-ball"},
+        {15, "quick-ball"},
+
+        {23, "full-restore"},
+        {24, "max-potion"},
+        {25, "hyper-potion"},
+        {26, "super-potion"},
+        {27, "full-heal"},
+        {28, "revive"},
+        {29, "max-revive"},
+
+        {38, "ether"},
+        {39, "max-ether"},
+        {40, "elixir"},
+        {41, "max-elixir"},
+
+        {45, "hp-up"},
+        {46, "protein"},
+        {47, "iron"},
+        {48, "carbos"},
+        {49, "calcium"},
+
+        {51, "pp-up"},
+        {52, "zinc"},
+        {53, "pp-max"},
+
+        {80, "sun-stone"},
+        {81, "moon-stone"},
+        {82, "fire-stone"},
+        {83, "thunder-stone"},
+        {84, "water-stone"},
+        {85, "leaf-stone"},
+        {86, "tiny-mushroom"},
+        {87, "big-mushroom"},
+        {88, "pearl"},
+        {89, "big-pearl"},
+        {90, "stardust"},
+        {91, "star-piece"},
+        {92, "nugget"},
+
+        {94, "honey"},
+
+        {106, "rare-bone"},
+        {107, "shiny-stone"},
+        {108, "dusk-stone"},
+        {109, "dawn-stone"},
+        {110, "oval-stone"},
+
+        {221, "kings-rock"},
+        {222, "silver-powder"},
+        {223, "amulet-coin"},
+
+        {229, "everstone"},
+        {230, "focus-band"},
+        {231, "lucky-egg"},
+        {232, "scope-lens"},
+        {233, "metal-coat"},
+        {234, "leftovers"},
+        {235, "dragon-scale"},
+
+        {237, "soft-sand"},
+        {238, "hard-stone"},
+        {239, "miracle-seed"},
+        {240, "black-glasses"},
+        {241, "black-belt"},
+        {242, "magnet"},
+        {243, "mystic-water"},
+        {244, "sharp-beak"},
+        {245, "poison-barb"},
+        {246, "never-melt-ice"},
+        {247, "spell-tag"},
+        {248, "twisted-spoon"},
+        {249, "charcoal"},
+        {250, "dragon-fang"},
+        {251, "silk-scarf"},
+        {252, "upgrade"},
+
+        {269, "light-clay"},
+
+        {272, "toxic-orb"},
+        {273, "flame-orb"},
+
+        {277, "metronome"},
+
+        {281, "black-sludge"},
+
+        {321, "protector"},
+        {322, "electirizer"},
+        {323, "magmarizer"},
+        {324, "dubious-disc"},
+        {325, "reaper-cloth"},
+        {326, "razor-claw"},
+        {327, "razor-fang"},
+
+        {492, "fast-ball"},
+        {493, "level-ball"},
+        {494, "lure-ball"},
+        {495, "heavy-ball"},
+        {496, "love-ball"},
+        {497, "friend-ball"},
+        {498, "moon-ball"},
+        {499, "sport-ball"},
+
+        {537, "prism-scale"},
+
+        {541, "air-balloon"},
+
+        {571, "pretty-feather"},
+
+        {576, "dream-ball"},
+
+        {580, "balm-mushroom"},
+        {581, "big-nugget"},
+        {582, "pearl-string"},
+        {583, "comet-shard"},
+
+        {645, "ability-capsule"},
+
+        {650, "safety-goggles"},
+
+        {795, "bottle-cap"},
+        {796, "gold-bottle-cap"},
+
+        {849, "ice-stone"},
+
+        {851, "beast-ball"},
+
+        {1109, "strawberry-sweet"},
+        {1110, "love-sweet"},
+        {1111, "berry-sweet"},
+        {1112, "clover-sweet"},
+        {1113, "flower-sweet"},
+        {1114, "star-sweet"},
+        {1115, "ribbon-sweet"},
+
+        {1120, "heavy-duty-boots"},
+
+        {1124, "exp-candy-xs"},
+        {1125, "exp-candy-s"},
+        {1126, "exp-candy-m"},
+        {1127, "exp-candy-l"},
+        {1128, "exp-candy-xl"},
+
+        {1253, "cracked-pot"},
+        {1254, "chipped-pot"},
+
+        {1606, "ability-patch"},
+
+        {1842, "tiny-bamboo-shoot"},
+        {1843, "big-bamboo-shoot"},
+
+        {1862, "normal-tera-shard"},
+        {1863, "fire-tera-shard"},
+        {1864, "water-tera-shard"},
+        {1865, "electric-tera-shard"},
+        {1866, "grass-tera-shard"},
+        {1867, "ice-tera-shard"},
+        {1868, "fighting-tera-shard"},
+        {1869, "poison-tera-shard"},
+        {1870, "ground-tera-shard"},
+        {1871, "flying-tera-shard"},
+        {1872, "psychic-tera-shard"},
+        {1873, "bug-tera-shard"},
+        {1874, "rock-tera-shard"},
+        {1875, "ghost-tera-shard"},
+        {1876, "dragon-tera-shard"},
+        {1877, "dark-tera-shard"},
+        {1878, "steel-tera-shard"},
+        {1879, "fairy-tera-shard"},
+
+        {1885, "covert-cloak"},
+        {1886, "loaded-dice"},
+
+        {2401, "fairy-feather"},
+
+        {2403, "unremarkable-teacup"},
+        {2404, "masterpiece-teacup"},
+
+        {2482, "metal-alloy"},
+
+        {2549, "stellar-tera-shard"},
+    };
+    auto iter = database.find(item_id);
+    if (iter != database.end()){
+        return iter->second;
+    }else{
+        return nullptr;
+    }
+}
+
+struct ItemPrinterItemData{
+    const char* slug;
+    uint16_t weight;
+    uint8_t min_quantity;
+    uint8_t max_quantity;
+};
+
+std::vector<ItemPrinterItemData> make_item_prize_list(){
+    //  This is taken from:
+    //      https://github.com/kwsch/ItemPrinterDeGacha/blob/main/ItemPrinterDeGacha.Core/Resources/item_table_array.json
+    //  The file itself is originally from a pkNX dump of the game.
+    const std::string path = "PokemonSV/ItemPrinterItems.json";
+    JsonValue json = load_json_file(RESOURCE_PATH() + path);
+    const JsonArray& array = json
+        .to_object_throw(path)
+        .get_array_throw("Table", path);
+
+    std::vector<ItemPrinterItemData> ret;
+    ret.reserve(array.size());
+
+    for (const JsonValue& item : array){
+        const JsonObject& entry = item.to_object_throw(path)
+            .get_object_throw("Param", path)
+            .get_object_throw("Value", path);
+        int item_id = (int)entry.get_integer_throw("ItemId", path);
+        const char* slug = item_id_to_slug(item_id);
+        if (slug == nullptr){
+            throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Unknown Item ID: " + std::to_string(item_id));
+        }
+        ret.emplace_back(ItemPrinterItemData{
+            slug,
+            (uint16_t)entry.get_integer_throw("EmergePercent", path),
+            (uint8_t)entry.get_integer_throw("LotteryItemNumMin", path),
+            (uint8_t)entry.get_integer_throw("LotteryItemNumMax", path)
+        });
+    }
+
+    return ret;
+}
+std::vector<ItemPrinterItemData> make_ball_prize_list(){
+    //  This is taken from:
+    //      https://github.com/kwsch/ItemPrinterDeGacha/blob/main/ItemPrinterDeGacha.Core/Resources/special_item_table_array.json
+    //  The file itself is originally from a pkNX dump of the game.
+    const std::string path = "PokemonSV/ItemPrinterBalls.json";
+    JsonValue json = load_json_file(RESOURCE_PATH() + path);
+    const JsonArray& array = json
+        .to_object_throw(path)
+        .get_array_throw("Table", path)[0]
+        .to_object_throw(path)
+        .get_object_throw("Param", path)
+        .get_array_throw("Table", path);
+
+    std::vector<ItemPrinterItemData> ret;
+    ret.reserve(array.size());
+
+    for (const JsonValue& item : array){
+        const JsonObject& entry = item.to_object_throw(path);
+        int item_id = (int)entry.get_integer_throw("ItemId", path);
+        const char* slug = item_id_to_slug(item_id);
+        if (slug == nullptr){
+            throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Unknown Item ID: " + std::to_string(item_id));
+        }
+        ret.emplace_back(ItemPrinterItemData{
+            slug,
+            (uint16_t)entry.get_integer_throw("EmergePercent", path),
+            (uint8_t)entry.get_integer_throw("LotteryItemNumMin", path),
+            (uint8_t)entry.get_integer_throw("LotteryItemNumMax", path)
+        });
+    }
+
+    return ret;
+}
+std::vector<const ItemPrinterItemData*> make_item_prize_table(const std::vector<ItemPrinterItemData>& prize_list){
+    const size_t RAND_SLOTS = 10001;
+    std::vector<const ItemPrinterItemData*> ret;
+    ret.reserve(RAND_SLOTS);
+
+    //  Sort by weight.
+    std::multimap<uint16_t, const ItemPrinterItemData*> sorted;
+    for (const ItemPrinterItemData& item : prize_list){
+        sorted.emplace(item.weight, &item);
+    }
+
+    //  Handle quirk where the first item has n+1 weight.
+    ret.emplace_back();
+
+    for (const auto& item : sorted){
+        size_t weight = item.second->weight;
+        while (weight-- > 0){
+            ret.emplace_back(item.second);
+        }
+    }
+
+    if (ret.size() != RAND_SLOTS){
+        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Sum of weights doesn't match expected value: " + std::to_string(ret.size()));
+    }
+
+    //  Handle quirk where the first item has n+1 weight.
+    ret[0] = ret[1];
+
+    return ret;
+}
+
+
+std::vector<const ItemPrinterItemData*> make_item_prize_table(){
+    static const std::vector<ItemPrinterItemData>& PRIZE_LIST = make_item_prize_list();
+    return make_item_prize_table(PRIZE_LIST);
+}
+std::vector<const ItemPrinterItemData*> make_ball_prize_table(){
+    static const std::vector<ItemPrinterItemData>& PRIZE_LIST = make_ball_prize_list();
+    return make_item_prize_table(PRIZE_LIST);
+}
+
+
+enum class PrintMode{
+    Regular = 0,
+    ItemBonus = 1,
+    BallBonus = 2,
+};
+
+
+std::array<std::string, 10> calculate_prizes(int64_t seed, PrintMode mode){
+    static const std::vector<const ItemPrinterItemData*> ITEM_TABLE = make_item_prize_table();
+    static const std::vector<const ItemPrinterItemData*> BALL_TABLE = make_ball_prize_table();
+
+    const std::vector<const ItemPrinterItemData*>& table = mode == PrintMode::BallBonus
+        ? BALL_TABLE
+        : ITEM_TABLE;
+
+    Pokemon::Xoroshiro128Plus rand(seed, 0x82A2B175229D6A5B);
+
+    PrintMode return_mode = PrintMode::Regular;
+    std::array<std::string, 10> ret;
+    for (size_t c = 0; c < 10; c++){
+        //  Always check for next bonus mode, even if not possible.
+        uint64_t roll = rand.nextInt(1000);
+        bool bonus = roll < 20;
+
+        //  Determine the item to print.
+        uint64_t item_roll = rand.nextInt(table.size());
+        const ItemPrinterItemData& item = *table[item_roll];
+        ret[c] = item.slug;
+
+        //  Determine quantity.
+        if (item.min_quantity != item.max_quantity){
+            rand.nextInt(item.max_quantity - item.min_quantity + 1);
+        }
+
+        //  If we're lucky enough to get a bonus mode, pick one.
+        //  Assume the player has both modes unlocked.
+        //  If a bonus mode was previously set, don't recalculate.
+        if (mode == PrintMode::Regular && bonus && return_mode == PrintMode::Regular){
+            return_mode = (PrintMode)(1 + rand.nextInt(2));
+        }
+
+    }
+
+    return ret;
+}
+
+
+
+
+DateSeed calculate_seed_prizes(int64_t seed){
+    return DateSeed{
+        seed,
+        calculate_prizes(seed, PrintMode::Regular),
+        calculate_prizes(seed, PrintMode::ItemBonus),
+        calculate_prizes(seed, PrintMode::BallBonus)
+    };
+}
+
+
+
+
+}
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ItemPrinter/PokemonSV_ItemPrinterSeedCalc.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ItemPrinter/PokemonSV_ItemPrinterSeedCalc.h
new file mode 100644
index 0000000000..2da0d617b4
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ItemPrinter/PokemonSV_ItemPrinterSeedCalc.h
@@ -0,0 +1,30 @@
+/*  Item Printer Seed Calculation
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  Calculate Item Printer prizes from seed.
+ *
+ *  This file is ported from:
+ *  https://github.com/kwsch/ItemPrinterDeGacha/blob/main/ItemPrinterDeGacha.Core/ItemPrinter.cs
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_ItemPrinterSeedCalc_H
+#define PokemonAutomation_PokemonSV_ItemPrinterSeedCalc_H
+
+#include "PokemonSV_ItemPrinterDatabase.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+namespace ItemPrinter{
+
+
+DateSeed calculate_seed_prizes(int64_t seed);
+
+
+}
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ItemPrinter/PokemonSV_ItemPrinterTools.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ItemPrinter/PokemonSV_ItemPrinterTools.cpp
new file mode 100644
index 0000000000..6fbf08d1c0
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ItemPrinter/PokemonSV_ItemPrinterTools.cpp
@@ -0,0 +1,141 @@
+/*  Item Printer Tools
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "VideoGames/PokemonSV/Inference/PokemonSV_WhiteButtonDetector.h"
+#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h"
+#include "VideoGames/PokemonSV/Inference/ItemPrinter/PokemonSV_ItemPrinterJobsDetector.h"
+#include "VideoGames/PokemonSV/Inference/ItemPrinter/PokemonSV_ItemPrinterPrizeReader.h"
+#include "PokemonSV_ItemPrinterTools.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+const EnumDropdownDatabase<ItemPrinterJobs>& ItemPrinterJobs_Database(){
+    static const EnumDropdownDatabase<ItemPrinterJobs> database({
+        {ItemPrinterJobs::Jobs_1, "1", "1 Job"},
+        {ItemPrinterJobs::Jobs_5, "5", "5 Jobs"},
+        {ItemPrinterJobs::Jobs_10, "10", "10 Jobs"},
+    });
+    return database;
+}
+
+
+
+void item_printer_start_print(
+    VideoStream& stream, ProControllerContext& context,
+    Language language, ItemPrinterJobs jobs
+){
+    stream.log("Starting print...");
+
+    while (true){
+        PromptDialogWatcher  prompt(COLOR_YELLOW);
+        WhiteButtonWatcher   material(COLOR_GREEN, WhiteButton::ButtonX, {0.63, 0.93, 0.17, 0.06});
+        WhiteButtonWatcher   handle(COLOR_BLUE,    WhiteButton::ButtonA, {0.40, 0.80, 0.20, 0.14});
+        context.wait_for_all_requests();
+
+        int ret_print_start = wait_until(
+            stream, context,
+            std::chrono::seconds(120),
+            { handle, prompt, material }
+        );
+        context.wait_for_all_requests();
+
+        switch (ret_print_start){
+        case 0: // handle
+            return;
+        case 1: // prompt
+            stream.log("Confirming material selection...");
+            pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+            continue;
+        case 2:{    // material
+            ItemPrinterJobsDetector detector(COLOR_RED);
+            VideoOverlaySet overlays(stream.overlay());
+            detector.make_overlays(overlays);
+            detector.set_print_jobs(stream, context, (uint8_t)jobs);
+            pbf_press_button(context, BUTTON_X, 160ms, 1840ms);
+            continue;
+        }
+        default:
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "start_print(): No recognized state after 120 seconds.",
+                stream
+            );
+        }
+    }
+}
+ItemPrinterPrizeResult item_printer_finish_print(
+    VideoStream& stream, ProControllerContext& context,
+    Language language
+){
+    stream.log("Finishing print...");
+    bool print_finished = false;
+
+    ItemPrinterPrizeResult prize_result;
+    while (true){
+        AdvanceDialogWatcher dialog(COLOR_YELLOW);
+        WhiteButtonWatcher   material(COLOR_GREEN, WhiteButton::ButtonX, {0.63, 0.93, 0.17, 0.06});
+        WhiteButtonWatcher   handle(COLOR_BLUE,    WhiteButton::ButtonA, {0.40, 0.80, 0.20, 0.14});
+        WhiteButtonWatcher   result(COLOR_CYAN,    WhiteButton::ButtonA, {0.87, 0.93, 0.10, 0.06});
+        context.wait_for_all_requests();
+
+        int ret_print_end = wait_until(
+            stream, context,
+            std::chrono::seconds(120),
+            { material, handle, dialog, result }
+        );
+        context.wait_for_all_requests();
+
+        switch (ret_print_end){
+        case 0: // material
+            stream.log("Material selection screen detected.");
+            return prize_result;
+        case 1: // handle
+        case 2: // dialog
+            pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+            continue;
+        case 3:{    // result
+            stream.log("Result screen detected.");
+            if (print_finished){
+                continue;
+            }
+
+            if (language != Language::None){
+                ItemPrinterPrizeReader reader(language);
+                VideoOverlaySet overlays(stream.overlay());
+                reader.make_overlays(overlays);
+                auto snapshot = stream.video().snapshot();
+                std::array<std::string, 10> prizes = reader.read_prizes(stream.logger(), snapshot);
+                std::array<int16_t, 10> quantities = reader.read_quantity(stream.logger(), snapshot);
+                prize_result = {prizes, quantities};
+//                static int c = 0;
+//                snapshot->save("test-" + std::to_string(c) + ".png");
+            }
+
+            pbf_mash_button(context, BUTTON_A, 1000ms);
+            print_finished = true;
+            continue;
+        }
+        default:
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "finish_print(): No recognized state after 120 seconds.",
+                stream
+            );
+        }
+    }
+}
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ItemPrinter/PokemonSV_ItemPrinterTools.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ItemPrinter/PokemonSV_ItemPrinterTools.h
new file mode 100644
index 0000000000..adb57077bc
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ItemPrinter/PokemonSV_ItemPrinterTools.h
@@ -0,0 +1,49 @@
+/*  Item Printer Tools
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_ItemPrinterTools_H
+#define PokemonAutomation_PokemonSV_ItemPrinterTools_H
+
+#include <array>
+#include "Common/Cpp/Options/EnumDropdownDatabase.h"
+#include "CommonFramework/Language.h"
+#include "CommonFramework/Tools/VideoStream.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+enum class ItemPrinterJobs{
+    Jobs_1      =   1,
+    Jobs_5      =   5,
+    Jobs_10     =   10,
+};
+const EnumDropdownDatabase<ItemPrinterJobs>& ItemPrinterJobs_Database();
+
+struct ItemPrinterPrizeResult{
+    std::array<std::string, 10> prizes;
+    std::array<int16_t, 10> quantities;
+};
+
+
+void item_printer_start_print(
+    VideoStream& stream, ProControllerContext& context,
+    Language language, ItemPrinterJobs jobs
+);
+ItemPrinterPrizeResult item_printer_finish_print(
+    VideoStream& stream, ProControllerContext& context,
+    Language language
+);
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/PokemonSV_AreaZero.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/PokemonSV_AreaZero.cpp
new file mode 100644
index 0000000000..dc8a07acb3
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/PokemonSV_AreaZero.cpp
@@ -0,0 +1,334 @@
+/*  Area Zero
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonTools/VisualDetectors/BlackScreenDetector.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "VideoGames/PokemonSV/Inference/PokemonSV_ZeroGateWarpPromptDetector.h"
+#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h"
+#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h"
+#include "PokemonSV_AreaZero.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+void inside_zero_gate_to_station(
+    const ProgramInfo& info,
+    VideoStream& stream, ProControllerContext& context,
+    int station,    //  1 - 4
+    bool heal_at_station
+){
+    {
+        AdvanceDialogWatcher dialog(COLOR_GREEN);
+        int ret = run_until<ProControllerContext>(
+            stream, context,
+            [](ProControllerContext& context){
+                pbf_move_left_joystick(context, {0, +1}, 10000ms, 0ms);
+            },
+            {dialog}
+        );
+        if (ret < 0){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "Unable to find warp circle.",
+                stream
+            );
+        }
+    }
+
+
+
+    WallClock start = current_time();
+    while (true){
+        if (current_time() - start > std::chrono::seconds(60)){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "Unable to warp to station after 60 seconds.",
+                stream
+            );
+        }
+
+        AdvanceDialogWatcher dialog(COLOR_GREEN);
+        ZeroGateWarpPromptWatcher prompt(COLOR_GREEN);
+        BlackScreenOverWatcher black_screen(COLOR_RED);
+        context.wait_for_all_requests();
+        int ret = wait_until(
+            stream, context, std::chrono::seconds(5),
+            {dialog, prompt, black_screen}
+        );
+        context.wait_for(std::chrono::milliseconds(100));
+
+        switch (ret){
+        case 0:
+            stream.log("Detected dialog.");
+            pbf_press_button(context, BUTTON_A, 160ms, 240ms);
+            continue;
+        case 1:
+            stream.log("Detected prompt.");
+            prompt.move_cursor(info, stream, context, station - 1);
+            pbf_mash_button(context, BUTTON_A, 3000ms);
+            continue;
+        case 2:
+            stream.log("Black screen is over. Arrive at station.");
+            break;
+        default:
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "Unable to find warp to station 2.",
+                stream
+            );
+        }
+
+        break;
+    }
+    context.wait_for_all_requests();
+    context.wait_for(std::chrono::seconds(3));
+
+    if (heal_at_station){
+        stream.log("Moving to bed to heal.");
+        pbf_move_left_joystick(context, {+0.126, +1}, 4000ms, 0ms);
+        ssf_press_left_joystick(context, {+1, 0}, 0ms, 1000ms);
+        bool healed = false;
+        while (true){
+            AdvanceDialogWatcher dialog(COLOR_GREEN);
+            PromptDialogWatcher confirm(COLOR_GREEN);
+            BlackScreenOverWatcher black_screen(COLOR_RED);
+            OverworldWatcher overworld(stream.logger(), COLOR_BLUE);
+            context.wait_for_all_requests();
+            int ret = wait_until(
+                stream, context, std::chrono::seconds(30),
+                {dialog, confirm, black_screen, overworld}
+            );
+            context.wait_for(std::chrono::milliseconds(100));
+            switch (ret){
+            case 0:
+                stream.log("Detected dialog.");
+                pbf_press_button(context, BUTTON_B, 160ms, 840ms);
+                continue;
+            case 1:
+                stream.log("Detected rest prompt.");
+                pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+                continue;
+            case 2:
+                stream.log("Done healing!");
+                healed = true;
+                continue;
+            case 3:
+                stream.log("Detected overworld.");
+                if (healed){
+                    break;
+                }else{
+                    pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+                    continue;
+                }
+            default:
+                OperationFailedExceptionWithScreenshot::fire(
+                    ErrorReportMode::SEND_ERROR_REPORT,
+                    "Heal at station: No state detected after 30 seconds.",
+                    stream
+                );
+            }
+            break;
+        }
+    }
+
+    stream.log("Exiting station. Waiting for black screen...");
+    {
+        BlackScreenOverWatcher black_screen(COLOR_RED);
+        int ret = run_until<ProControllerContext>(
+            stream, context,
+            [=](ProControllerContext& context){
+                if (heal_at_station){
+                    pbf_move_left_joystick(context, {-0.25, -1}, 60000ms, 0ms);
+                }else{
+                    pbf_move_left_joystick(context, {-1, -1}, 60000ms, 0ms);
+                }
+            },
+            {black_screen}
+        );
+        if (ret < 0){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "Unable to exit station after 60 seconds.",
+                stream
+            );
+        }
+    }
+
+    stream.log("Exiting station. Waiting for overworld...");
+    {
+        OverworldWatcher overworld(stream.logger(), COLOR_BLUE);
+        int ret = wait_until(
+            stream, context, std::chrono::seconds(30),
+            {overworld}
+        );
+        if (ret < 0){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "Unable to load overworld after exiting station for 30 seconds.",
+                stream
+            );
+        }
+    }
+}
+
+void return_to_outside_zero_gate(
+    const ProgramInfo& info,
+    VideoStream& stream, ProControllerContext& context
+){
+    open_map_from_overworld(info, stream, context);
+    pbf_move_left_joystick(context, {-0.25, +0.25}, 40ms, 400ms);
+    fly_to_overworld_from_map(info, stream, context);
+}
+void return_to_inside_zero_gate(
+    const ProgramInfo& info,
+    VideoStream& stream, ProControllerContext& context
+){
+    return_to_outside_zero_gate(info, stream, context);
+
+    BlackScreenOverWatcher black_screen;
+    int ret = run_until<ProControllerContext>(
+        stream, context,
+        [](ProControllerContext& context){
+            pbf_move_left_joystick(context, {+1, +0.75}, 160ms, 840ms);
+            pbf_mash_button(context, BUTTON_L, 480ms);
+            pbf_move_left_joystick(context, {0, +1}, 10000ms, 0ms);
+        },
+        {black_screen}
+    );
+    if (ret < 0){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "Unable to enter Zero Gate.",
+            stream
+        );
+    }
+
+    OverworldWatcher overworld(stream.logger());
+    ret = wait_until(
+        stream, context, std::chrono::seconds(10),
+        {overworld}
+    );
+    if (ret < 0){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "Unable to detect overworld inside Zero Gate.",
+            stream
+        );
+    }
+}
+void return_to_inside_zero_gate_from_picnic(
+    const ProgramInfo& info,
+    VideoStream& stream, ProControllerContext& context
+){
+    BlackScreenOverWatcher black_screen;
+    int ret = run_until<ProControllerContext>(
+        stream, context,
+        [](ProControllerContext& context){
+            pbf_move_left_joystick(context, {0, -1}, 800ms, 320ms);
+            pbf_mash_button(context, BUTTON_L, 480ms);
+            pbf_move_left_joystick(context, {0, +1}, 10000ms, 0ms);
+        },
+        {black_screen}
+    );
+    if (ret < 0){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "Unable to enter Zero Gate.",
+            stream
+        );
+    }
+
+    OverworldWatcher overworld(stream.logger());
+    ret = wait_until(
+        stream, context, std::chrono::seconds(10),
+        {overworld}
+    );
+    if (ret < 0){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "Unable to detect overworld inside Zero Gate.",
+            stream
+        );
+    }
+}
+
+
+
+
+void inside_zero_gate_to_secret_cave_entrance(
+    const ProgramInfo& info, VideoStream& stream, ProControllerContext& context,
+    bool heal_at_station
+){
+    inside_zero_gate_to_station(info, stream, context, 1, heal_at_station);
+
+    context.wait_for(std::chrono::seconds(3));
+
+    pbf_move_left_joystick(context, {-1, -0.63}, 240ms, 400ms);
+    pbf_press_button(context, BUTTON_L | BUTTON_PLUS, 160ms, 840ms);
+
+
+    //  Leg 1
+    ssf_press_button(context, BUTTON_LCLICK, 0ms, 4000ms);
+    ssf_press_left_joystick(context, {0, +1}, 480ms, 10000ms);
+
+    //  Jump
+    ssf_press_button(context, BUTTON_B, 1000ms, 800ms);
+
+    //  Fly
+    ssf_press_button(context, BUTTON_B, 0ms, 160ms, 80ms);  //  Double up this press in
+    ssf_press_button(context, BUTTON_B, 0ms, 160ms);        //  case one is dropped.
+
+    pbf_move_left_joystick(context, {0, +1}, 9000ms, 2400ms);
+
+
+    //  Leg 2
+    ssf_press_button(context, BUTTON_LCLICK, 0ms, 4000ms);
+    ssf_press_left_joystick(context, {0, +1}, 480ms, 2000ms);
+
+    //  Jump
+    ssf_press_button(context, BUTTON_B, 1000ms, 800ms);
+
+    //  Fly
+    ssf_press_button(context, BUTTON_B, 0ms, 160ms, 80ms);  //  Double up this press in
+    ssf_press_button(context, BUTTON_B, 0ms, 160ms);        //  case one is dropped.
+
+    pbf_move_left_joystick(context, {0, +1}, 2000ms, 0ms);
+    pbf_move_left_joystick(context, {-0.125, +1}, 2000ms, 0ms);
+    pbf_move_left_joystick(context, {0, +1}, 6016ms, 0ms);
+    pbf_move_left_joystick(context, {-0.25, +1}, 2400ms, 0ms);
+    pbf_move_left_joystick(context, {0, +1}, 5040ms, 2000ms);
+
+//    context.wait_for_all_requests();
+
+
+    //  Leg 3
+    ssf_press_button(context, BUTTON_LCLICK, 0ms, 4000ms);
+    ssf_press_left_joystick(context, {0, +1}, 1440ms, 4400ms);
+
+    //  Fly
+    ssf_press_button(context, BUTTON_B, 0ms, 160ms, 80ms);  //  Double up this press in
+    ssf_press_button(context, BUTTON_B, 0ms, 160ms);        //  case one is dropped.
+
+    pbf_move_left_joystick(context, {-0.625, +1}, 1600ms, 0ms);
+    pbf_move_left_joystick(context, {0, +1}, 2000ms, 0ms);
+
+
+}
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/PokemonSV_AreaZero.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/PokemonSV_AreaZero.h
new file mode 100644
index 0000000000..d3da49dc58
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/PokemonSV_AreaZero.h
@@ -0,0 +1,59 @@
+/*  Area Zero
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_AreaZero_H
+#define PokemonAutomation_PokemonSV_AreaZero_H
+
+#include "CommonFramework/Tools/VideoStream.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+
+namespace PokemonAutomation{
+    struct ProgramInfo;
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+//  After just entering the Zero Gate, go to the specified station.
+void inside_zero_gate_to_station(
+    const ProgramInfo& info,
+    VideoStream& stream, ProControllerContext& context,
+    int station,    //  1 - 4
+    bool heal_at_station
+);
+
+//  You are inside Area Zero having traveled there via the Zero Gate. Return to
+//  the zero gate fly spot.
+void return_to_outside_zero_gate(
+    const ProgramInfo& info,
+    VideoStream& stream, ProControllerContext& context
+);
+
+//  You are inside Area Zero having traveled there via the Zero Gate. Return to
+//  inside the zero gate to setup for a subsequent call to "inside_zero_gate_to_station()".
+void return_to_inside_zero_gate(
+    const ProgramInfo& info,
+    VideoStream& stream, ProControllerContext& context
+);
+void return_to_inside_zero_gate_from_picnic(
+    const ProgramInfo& info,
+    VideoStream& stream, ProControllerContext& context
+);
+
+
+
+void inside_zero_gate_to_secret_cave_entrance(
+    const ProgramInfo& info,
+    VideoStream& stream, ProControllerContext& context,
+    bool heal_at_station
+);
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/PokemonSV_ConnectToInternet.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/PokemonSV_ConnectToInternet.cpp
new file mode 100644
index 0000000000..530753bdd6
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/PokemonSV_ConnectToInternet.cpp
@@ -0,0 +1,228 @@
+/*  Connect to Integer
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/Tools/ErrorDumper.h"
+#include "CommonTools/Images/SolidColorTest.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h"
+#include "VideoGames/PokemonSV/Inference/Battles/PokemonSV_NormalBattleMenus.h"
+#include "VideoGames/PokemonSV/Inference/PokemonSV_MainMenuDetector.h"
+#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h"
+#include "PokemonSV_ConnectToInternet.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+class NewsDetector : public StaticScreenDetector{
+public:
+    NewsDetector(Color color = COLOR_RED);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    Color m_color;
+    ImageFloatBox m_bottom_solid;
+    ImageFloatBox m_bottom_buttons;
+};
+NewsDetector::NewsDetector(Color color)
+    : m_color(color)
+    , m_bottom_solid(0.15, 0.92, 0.20, 0.06)
+    , m_bottom_buttons(0.40, 0.92, 0.58, 0.06)
+{}
+void NewsDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_bottom_solid);
+    items.add(m_color, m_bottom_buttons);
+}
+bool NewsDetector::detect(const ImageViewRGB32& screen){
+    ImageStats bottom_solid = image_stats(extract_box_reference(screen, m_bottom_solid));
+    if (!is_white(bottom_solid) && !is_black(bottom_solid)){
+        return false;
+    }
+
+    ImageStats bottom_buttons = image_stats(extract_box_reference(screen, m_bottom_buttons));
+//    cout << bottom_buttons.average << bottom_buttons.stddev << endl;
+    if (bottom_buttons.stddev.sum() < 100){
+        return false;
+    }
+
+    return true;
+}
+class NewsWatcher : public DetectorToFinder<NewsDetector>{
+public:
+    NewsWatcher(Color color = COLOR_RED)
+         : DetectorToFinder("NewsWatcher", std::chrono::milliseconds(1000), color)
+    {}
+};
+
+
+
+
+void connect_to_internet_from_menu(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+    WallClock start = current_time();
+    bool connected = false;
+    while (true){
+        if (current_time() - start > std::chrono::minutes(5)){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "connect_to_internet_from_menu(): Failed to connect to internet after 5 minutes.",
+                stream
+            );
+        }
+
+        OverworldWatcher overworld(stream.logger(), COLOR_RED);
+        MainMenuWatcher main_menu(COLOR_YELLOW);
+        AdvanceDialogWatcher dialog(COLOR_GREEN);
+        PromptDialogWatcher prompt(COLOR_CYAN);
+        NewsWatcher news(COLOR_BLUE);
+        NormalBattleMenuWatcher battle_menu(COLOR_MAGENTA);
+        context.wait_for_all_requests();
+        int ret = wait_until(
+            stream, context,
+            std::chrono::seconds(60),
+            {overworld, main_menu, dialog, prompt, news, battle_menu}
+        );
+        context.wait_for(std::chrono::milliseconds(100));
+        switch (ret){
+        case 0:
+            stream.log("Detected overworld. (unexpected)", COLOR_RED);
+            pbf_press_button(context, BUTTON_X, 160ms, 840ms);
+            continue;
+        case 1:
+            stream.log("Detected main menu.");
+            if (connected){
+                return;
+            }else{
+                pbf_press_button(context, BUTTON_L, 160ms, 840ms);
+            }
+            continue;
+        case 2:
+            stream.log("Detected dialog.");
+            connected = true;
+            pbf_press_button(context, BUTTON_B, 160ms, 840ms);
+            continue;
+        case 3:
+            stream.log("Already connected to internet.");
+            connected = true;
+            pbf_press_button(context, BUTTON_B, 160ms, 840ms);
+            continue;
+        case 4:
+            stream.log("Detected news menu...");
+            connected = true;
+            pbf_press_button(context, BUTTON_B, 160ms, 840ms);
+            continue;
+        case 5:
+            stream.log("Detected battle menu...");
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::NO_ERROR_REPORT,
+                "connect_to_internet_from_menu(): Looks like you got attacked.",
+                stream
+            );
+        default:
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "connect_to_internet_from_menu(): No recognized state after 60 seconds.",
+                stream
+            );
+        }
+    }
+}
+void connect_to_internet_from_overworld(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+    WallClock start = current_time();
+    bool connected = false;
+    while (true){
+        if (current_time() - start > std::chrono::minutes(5)){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "connect_to_internet_from_overworld(): Failed to connect to internet after 5 minutes.",
+                stream
+            );
+        }
+
+        OverworldWatcher overworld(stream.logger(), COLOR_RED);
+        MainMenuWatcher main_menu(COLOR_YELLOW);
+        AdvanceDialogWatcher dialog(COLOR_GREEN);
+        PromptDialogWatcher prompt(COLOR_CYAN);
+        NewsWatcher news(COLOR_BLUE);
+        NormalBattleMenuWatcher battle_menu(COLOR_MAGENTA);
+        context.wait_for_all_requests();
+        int ret = wait_until(
+            stream, context,
+            std::chrono::seconds(60),
+            {
+                overworld,
+                main_menu,
+                dialog,
+                prompt,
+                news,
+                battle_menu,
+            }
+        );
+        context.wait_for(std::chrono::milliseconds(100));
+        switch (ret){
+        case 0:
+            stream.log("Detected overworld.");
+            if (connected){
+                return;
+            }else{
+                pbf_press_button(context, BUTTON_X, 160ms, 840ms);
+                continue;
+            }
+        case 1:
+            stream.log("Detected main menu.");
+            if (connected){
+                pbf_press_button(context, BUTTON_B, 160ms, 840ms);
+            }else{
+                pbf_press_button(context, BUTTON_L, 160ms, 840ms);
+            }
+            continue;
+        case 2:
+            stream.log("Detected dialog.");
+            connected = true;
+            pbf_press_button(context, BUTTON_B, 160ms, 840ms);
+            continue;
+        case 3:
+            stream.log("Already connected to internet.");
+            connected = true;
+            pbf_press_button(context, BUTTON_B, 160ms, 840ms);
+            continue;
+        case 4:
+            stream.log("Detected news menu...");
+            connected = true;
+            pbf_press_button(context, BUTTON_B, 160ms, 840ms);
+            continue;
+        case 5:
+            stream.log("Detected battle menu...");
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::NO_ERROR_REPORT,
+                "connect_to_internet_from_overworld(): Looks like you got attacked.",
+                stream
+            );
+        default:
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "connect_to_internet_from_overworld(): No recognized state after 60 seconds.",
+                stream
+            );
+        }
+    }
+}
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/PokemonSV_ConnectToInternet.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/PokemonSV_ConnectToInternet.h
new file mode 100644
index 0000000000..ef40e7cde5
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/PokemonSV_ConnectToInternet.h
@@ -0,0 +1,30 @@
+/*  Connect to Integer
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_ConnectToInternet_H
+#define PokemonAutomation_PokemonSV_ConnectToInternet_H
+
+#include "CommonFramework/Tools/VideoStream.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+
+namespace PokemonAutomation{
+    struct ProgramInfo;
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+//  Connect to internet from the main menu. Stay in the main menu.
+void connect_to_internet_from_menu(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context);
+
+//  Connect to internet from the overworld. Return to the overworld.
+void connect_to_internet_from_overworld(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context);
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.cpp
new file mode 100644
index 0000000000..5aa261f986
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.cpp
@@ -0,0 +1,183 @@
+/*  Game Entry
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Exceptions/FatalProgramException.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonFramework/Tools/ErrorDumper.h"
+#include "CommonFramework/Tools/ProgramEnvironment.h"
+#include "CommonTools/Images/SolidColorTest.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "CommonTools/VisualDetectors/BlackScreenDetector.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "VideoGames/PokemonSV/PokemonSV_Settings.h"
+#include "PokemonSV_GameEntry.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+class WaitforWhiteLoadScreen : public VisualInferenceCallback{
+public:
+    WaitforWhiteLoadScreen(bool invert)
+        : VisualInferenceCallback("LoadingDetector")
+        , m_box0(0.2, 0.2, 0.6, 0.1)
+        , m_box1(0.2, 0.7, 0.6, 0.1)
+        , m_invert(invert)
+    {}
+
+    virtual void make_overlays(VideoOverlaySet& items) const override{
+        items.add(COLOR_RED, m_box0);
+        items.add(COLOR_RED, m_box1);
+    }
+
+    virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override{
+        if (!is_white(extract_box_reference(frame, m_box0))){
+            return m_invert;
+        }
+        if (!is_white(extract_box_reference(frame, m_box1))){
+            return m_invert;
+        }
+        return !m_invert;
+   }
+
+private:
+    ImageFloatBox m_box0;
+    ImageFloatBox m_box1;
+    bool m_invert;
+};
+
+
+bool reset_game_to_gamemenu(ConsoleHandle& console, ProControllerContext& context){
+    from_home_close_and_reopen_game(console, context, true);
+
+    Milliseconds timeout = GameSettings::instance().START_GAME_WAIT0;
+
+    {
+        console.log("Waiting to load game...");
+        WaitforWhiteLoadScreen detector(false);
+        int ret = wait_until(
+            console, context,
+            timeout,
+            {{detector}}
+        );
+        if (ret < 0){
+            console.log("Timed out waiting to enter game.", COLOR_RED);
+            return false;
+        }
+    }
+    {
+        console.log("Waiting for game menu...");
+        WaitforWhiteLoadScreen detector(true);
+        int ret = wait_until(
+            console, context,
+            timeout,
+            {{detector}}
+        );
+        if (ret < 0){
+            console.log("Timed out waiting for game menu.", COLOR_RED);
+            return false;
+        }
+    }
+
+//    // Now the game has opened:
+//    return openedgame_to_gamemenu(console, context, GameSettings::instance().START_GAME_WAIT);
+    return true;
+}
+
+bool gamemenu_to_ingame(VideoStream& stream, ProControllerContext& context){
+    stream.log("Mashing A to enter game...");
+    BlackScreenOverWatcher detector(COLOR_RED, {0.2, 0.2, 0.6, 0.6});
+    pbf_mash_button(context, BUTTON_A, GameSettings::instance().ENTER_GAME_MASH0);
+    context.wait_for_all_requests();
+    stream.log("Waiting to enter game...");
+    int ret = wait_until(
+        stream, context,
+        GameSettings::instance().ENTER_GAME_WAIT0,
+        {{detector}}
+    );
+    if (ret == 0){
+        stream.log("Entered game!");
+        return true;
+    }else{
+        stream.log("Timed out waiting to enter game.", COLOR_RED);
+        return false;
+    }
+}
+
+bool reset_game_from_home(
+    const ProgramInfo& info,
+    ConsoleHandle& console, ProControllerContext& context,
+    Milliseconds post_wait_time
+){
+    console.log("Resetting game from home...");
+    console.overlay().add_log("Reset game", COLOR_WHITE);
+    bool ok = true;
+    ok &= reset_game_to_gamemenu(console, context);
+    ok &= gamemenu_to_ingame(console, context);
+    if (!ok){
+        dump_image(console.logger(), info, console.video(), "StartGame");
+    }
+    console.log("Entered game! Waiting out grace period.");
+    pbf_wait(context, post_wait_time);
+    context.wait_for_all_requests();
+    return ok;
+}
+bool reset_game_from_home_zoom_out(
+    const ProgramInfo& info,
+    ConsoleHandle& console, ProControllerContext& context,
+    Milliseconds post_wait_time
+){
+    bool ret = reset_game_from_home(info, console, context, post_wait_time);
+
+    //  5 zooms will guarantee that are fully zoomed out regardless of whether
+    //  we are on the DLC update.
+    pbf_press_button(context, BUTTON_RCLICK, 160ms, 840ms);
+    pbf_press_button(context, BUTTON_RCLICK, 160ms, 840ms);
+    pbf_press_button(context, BUTTON_RCLICK, 160ms, 840ms);
+    pbf_press_button(context, BUTTON_RCLICK, 160ms, 840ms);
+    pbf_press_button(context, BUTTON_RCLICK, 160ms, 840ms);
+
+    return ret;
+}
+
+void reset_game(
+    const ProgramInfo& info,
+    ConsoleHandle& console, ProControllerContext& context
+){
+    try{
+        pbf_press_button(context, BUTTON_HOME, 160ms, GameSettings::instance().GAME_TO_HOME_DELAY1);
+        context.wait_for_all_requests();
+        if (!reset_game_from_home(info, console, context, 5000ms)){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "Failed to start game.",
+                console
+            );
+        }
+    }catch (OperationFailedExceptionWithScreenshot& e){
+        // To be safe: avoid doing anything outside of game on Switch,
+        // make game resetting non error recoverable
+        throw FatalProgramException(e.error_report_mode(), e.message(), e.video_stream(), e.screenshot());
+    }
+}
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h
new file mode 100644
index 0000000000..114ef29845
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h
@@ -0,0 +1,60 @@
+/*  Game Entry
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_GameEntry_H
+#define PokemonAutomation_PokemonSV_GameEntry_H
+
+#include <stdint.h>
+#include "CommonFramework/Tools/VideoStream.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+#include "NintendoSwitch/NintendoSwitch_ConsoleHandle.h"
+
+namespace PokemonAutomation{
+    struct ProgramInfo;
+    class ProgramEnvironment;
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+// From Switch Home menu, reset game and wait until the game menu screen (where
+// "Press A" is displayed to enter the game) is shown.
+bool reset_game_to_gamemenu(ConsoleHandle& console, ProControllerContext& context);
+
+// From the game menu screen (where "Press A" is displayed to enter the game),
+// mash A to enter the game and wait until the black screen is gone.
+bool gamemenu_to_ingame(VideoStream& stream, ProControllerContext& context);
+
+// From Switch Home menu, start game and wait until the player character appears in game.
+// post_wait_time: how many ticks to wait after the black screen (shown when loading the map) is over.
+// Return whether it successfully enters the game
+bool reset_game_from_home(
+    const ProgramInfo& info,
+    ConsoleHandle& console, ProControllerContext& context,
+    Milliseconds post_wait_time = Milliseconds(1000)
+);
+bool reset_game_from_home_zoom_out(
+    const ProgramInfo& info,
+    ConsoleHandle& console, ProControllerContext& context,
+    Milliseconds post_wait_time = Milliseconds(1000)
+);
+
+// From within the game, reset the game.
+// Will throw FatalProgramException if it fails to enter the game.
+void reset_game(
+    const ProgramInfo& info,
+    ConsoleHandle& console, ProControllerContext& context
+);
+
+
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.cpp
new file mode 100644
index 0000000000..4058c951a5
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.cpp
@@ -0,0 +1,810 @@
+/*  PokemonSV World Navigation
+ *
+ */
+
+#include "Common/Cpp/RecursiveThrottler.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/Exceptions/UnexpectedBattleException.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/NintendoSwitch_Settings.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "NintendoSwitch/Programs/DateSpam/NintendoSwitch_HomeToDateTime.h"
+//#include "NintendoSwitch/Programs/DateSpam/NintendoSwitch_RollDateForward1.h"
+//#include "NintendoSwitch/Programs/DateSpam/NintendoSwitch_NeutralDateSkip.h"
+#include "NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManip.h"
+#include "VideoGames/PokemonSV/PokemonSV_Settings.h"
+#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h"
+#include "VideoGames/PokemonSV/Inference/Map/PokemonSV_MapDetector.h"
+#include "VideoGames/PokemonSV/Inference/PokemonSV_BagDetector.h"
+#include "VideoGames/PokemonSV/Inference/PokemonSV_MainMenuDetector.h"
+#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_LetsGoKillDetector.h"
+#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h"
+#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h"
+#include "VideoGames/PokemonSV/Inference/Battles/PokemonSV_NormalBattleMenus.h"
+#include "PokemonSV_ConnectToInternet.h"
+#include "PokemonSV_MenuNavigation.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+void set_time_to_12am_from_home(const ProgramInfo& info, ConsoleHandle& console, ProControllerContext& context){
+    DateReader reader (console);
+    VideoOverlaySet overlays(console.overlay());
+    reader.make_overlays(overlays);
+
+//    pbf_press_button(context, BUTTON_HOME, 10, GameSettings::instance().GAME_TO_HOME_DELAY);
+    home_to_date_time(console, context, true);
+    pbf_press_button(context, BUTTON_A, 160ms, 400ms);
+
+    context.wait_for_all_requests();
+
+    DateTime time = reader.read_date(console, console.video().snapshot()).second;
+    time.hour = 0;
+    reader.set_date(info, console, context, time);
+//    reader.set_hours(info, console, context, 0);
+
+    pbf_press_button(context, BUTTON_A, 160ms, 240ms);
+    pbf_press_button(context, BUTTON_HOME, 160ms, ConsoleSettings::instance().SETTINGS_TO_HOME_DELAY0);
+//    resume_game_from_home(console, context);
+}
+
+void neutral_day_skip_switch1(ConsoleHandle& console, ProControllerContext& context){
+    ThrottleScope scope(context->logging_throttler());
+    if (scope){
+        context->logger().log("PokemonSV::neutral_day_skip_switch1()");
+    }
+
+    Milliseconds tv = context->timing_variation();
+    if (tv == 0ms){
+        ssf_press_button(context, BUTTON_A, 160ms, 80ms);
+
+        //  Left scroll in case we missed the date menu and landed in the
+        //  language change.
+        ssf_issue_scroll(context, DPAD_LEFT, 0ms, 48ms, 24ms);
+
+        ssf_press_button(context, BUTTON_A, 24ms);
+        ssf_issue_scroll(context, DPAD_RIGHT, 24ms);
+        ssf_issue_scroll(context, DPAD_RIGHT, 24ms);
+        ssf_press_button(context, BUTTON_A, 0ms);
+        ssf_issue_scroll(context, DPAD_RIGHT, 24ms);
+        ssf_issue_scroll(context, DPAD_RIGHT, 24ms);
+        ssf_issue_scroll(context, DPAD_RIGHT, 24ms);
+        ssf_issue_scroll(context, DPAD_RIGHT, 0ms, 48ms, 24ms);
+        ssf_press_button(context, BUTTON_A, 160ms, 80ms);
+    }else{
+        ssf_press_button_ptv(context, BUTTON_A, 160ms);
+
+        //  Left scroll in case we missed the date menu and landed in the
+        //  language change.
+        ssf_issue_scroll_ptv(context, DPAD_LEFT);
+
+        ssf_issue_scroll_ptv(context, DPAD_RIGHT);
+        ssf_press_button_ptv(context, BUTTON_A);
+        ssf_issue_scroll_ptv(context, DPAD_RIGHT);
+        ssf_issue_scroll_ptv(context, DPAD_RIGHT);
+        ssf_press_button_ptv(context, BUTTON_A);
+        ssf_issue_scroll_ptv(context, DPAD_RIGHT);
+        ssf_issue_scroll_ptv(context, DPAD_RIGHT);
+        ssf_issue_scroll_ptv(context, DPAD_RIGHT);
+        ssf_press_button_ptv(context, BUTTON_A, 160ms);
+    }
+}
+void neutral_day_skip_switch2(ConsoleHandle& console, ProControllerContext& context){
+    ThrottleScope scope(context->logging_throttler());
+    if (scope){
+        context->logger().log("PokemonSV::neutral_day_skip_switch2()");
+    }
+
+    ssf_press_button(context, BUTTON_A, ConsoleSettings::instance().DATE_MENU_OPEN_SWITCH2_0, 80ms);
+    ssf_issue_scroll_ptv(context, SSF_SCROLL_RIGHT);
+    ssf_issue_scroll_ptv(context, SSF_SCROLL_RIGHT);
+    ssf_issue_scroll_ptv(context, SSF_SCROLL_RIGHT);
+    ssf_issue_scroll_ptv(context, SSF_SCROLL_RIGHT);
+    ssf_issue_scroll_ptv(context, SSF_SCROLL_RIGHT);
+    ssf_issue_scroll_ptv(context, SSF_SCROLL_RIGHT);
+    ssf_press_button(context, BUTTON_A, ConsoleSettings::instance().DATE_MENU_CLOSE_SWITCH2_0, 80ms);
+}
+
+void day_skip_from_overworld(ConsoleHandle& console, ProControllerContext& context){
+    go_home(console, context);
+    home_to_date_time(console, context, true);
+
+    ConsoleType console_type = console.state().console_type();
+    if (is_switch1(console_type)){
+        neutral_day_skip_switch1(console, context);
+    }else if (is_switch2(console_type)){
+        neutral_day_skip_switch2(console, context);
+
+#if 0
+        for (int c = 0; c < 10; c++){
+            NintendoSwitch::roll_date_forward_1(console, context, true);
+//            NintendoSwitch::neutral_date_skip(console, context);
+        }
+#endif
+    }else{
+        throw UserSetupError(
+            console,
+            "Please select a valid Switch console type."
+        );
+    }
+
+    pbf_press_button(context, BUTTON_HOME, 160ms, ConsoleSettings::instance().SETTINGS_TO_HOME_DELAY0);
+    resume_game_from_home(console, context);
+}
+
+void press_Bs_to_back_to_overworld(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context, uint16_t seconds_between_b_presses){
+    context.wait_for_all_requests();
+    OverworldWatcher overworld(stream.logger(), COLOR_RED);
+    NormalBattleMenuWatcher battle(COLOR_BLUE);
+    int ret = run_until<ProControllerContext>(
+        stream, context,
+        [seconds_between_b_presses](ProControllerContext& context){
+            pbf_wait(context, Seconds(seconds_between_b_presses)); // avoiding pressing B if already in overworld
+            for (size_t c = 0; c < 10; c++){
+                pbf_press_button(context, BUTTON_B, 20*8ms, Seconds(seconds_between_b_presses));
+            }
+        },
+        {overworld, battle}
+    );
+    if (ret == 1){
+        throw_and_log<UnexpectedBattleException>(
+            stream.logger(), ErrorReportMode::SEND_ERROR_REPORT,
+            "press_Bs_to_back_to_overworld(): Unexpectedly detected battle.",
+            stream
+        );         
+    }else if (ret < 0){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "press_Bs_to_back_to_overworld(): Unable to detect overworld after 10 button B presses.",
+            stream
+        );
+    }
+}
+
+void open_map_from_overworld(
+    const ProgramInfo& info,
+    VideoStream& stream,
+    ProControllerContext& context,
+    bool clear_tutorial
+){
+    {
+        OverworldWatcher overworld(stream.logger(), COLOR_CYAN);
+        NormalBattleMenuWatcher battle(COLOR_RED);
+        context.wait_for_all_requests();
+        int ret = wait_until(
+            stream, context,
+            std::chrono::seconds(10),
+            {overworld, battle}
+        );
+        context.wait_for(std::chrono::milliseconds(100));
+
+        if (ret == 0){
+            stream.log("Detected overworld.");
+            pbf_press_button(context, BUTTON_Y, 160ms, 840ms); // open map
+        }else if (ret == 1){
+            throw_and_log<UnexpectedBattleException>(
+                stream.logger(), ErrorReportMode::NO_ERROR_REPORT,
+                "open_map_from_overworld(): Unexpectedly detected battle.",
+                stream
+            );              
+        }else{
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "open_map_from_overworld(): No overworld state found after 10 seconds.",
+                stream
+            );
+        }
+    }
+
+    WallClock start = current_time();
+    while (true){
+        if (current_time() - start > std::chrono::minutes(2)){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "open_map_from_overworld(): Failed to open map after 2 minutes.",
+                stream
+            );
+        }
+
+        OverworldWatcher overworld(stream.logger(), COLOR_CYAN);
+        AdvanceDialogWatcher advance_dialog(COLOR_YELLOW);
+        PromptDialogWatcher prompt_dialog(COLOR_GREEN);
+        MapWatcher map(COLOR_RED);
+        NormalBattleMenuWatcher battle(COLOR_RED);
+
+        context.wait_for_all_requests();
+        int ret = wait_until(
+            stream, context,
+            std::chrono::seconds(30),
+            {overworld, advance_dialog, prompt_dialog, map, battle}
+        );
+        context.wait_for(std::chrono::milliseconds(100));
+
+        switch (ret){
+        case 0:
+            stream.log("Detected overworld.");
+            pbf_press_button(context, BUTTON_Y, 160ms, 840ms); // open map
+            continue;
+        case 1:
+            stream.log("Detected dialog. Did you fall down?", COLOR_RED);
+            pbf_press_button(context, BUTTON_B, 160ms, 840ms);
+            continue;
+        case 2:
+            stream.log("Detected dialog. Did you fall down?", COLOR_RED);
+            pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+            continue;
+        case 3:
+            stream.log("Detected map.");
+            stream.overlay().add_log("Map opened", COLOR_WHITE);
+            if (map.map_in_fixed_view()){
+                return;
+            }else{ // click R joystick to change to fixed view
+                if (clear_tutorial){
+                    pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+                }
+                stream.log("Map in rotate view, fix it");
+                stream.overlay().add_log("Change map to fixed view", COLOR_WHITE);
+                pbf_press_button(context, BUTTON_RCLICK, 160ms, 840ms);
+                continue;
+            }
+        case 4:
+            stream.log("Detected battle.");
+            throw_and_log<UnexpectedBattleException>(
+                stream.logger(), ErrorReportMode::NO_ERROR_REPORT,
+                "open_map_from_overworld(): Unexpectedly detected battle.",
+                stream
+            ); 
+        default:
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "open_map_from_overworld(): No recognized state after 30 seconds.",
+                stream
+            );
+        }
+    }
+}
+
+
+void enter_box_system_from_overworld(
+    const ProgramInfo& info,
+    VideoStream& stream, ProControllerContext& context
+){
+    context.wait_for_all_requests();
+    stream.log("Enter box system from overworld...");
+    WallClock start = current_time();
+    bool success = false;
+    while (true){
+        if (current_time() - start > std::chrono::minutes(3)){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "enter_box_system_from_overworld(): Failed to enter box system after 3 minutes.",
+                stream
+            );
+        }
+
+        OverworldWatcher overworld(stream.logger(), COLOR_CYAN);
+        MainMenuWatcher main_menu(COLOR_RED);
+        GradientArrowWatcher box_slot_one(COLOR_BLUE, GradientArrowType::DOWN, {0.24, 0.16, 0.05, 0.09});
+        context.wait_for_all_requests();
+        int ret = wait_until(
+            stream, context,
+            std::chrono::seconds(30),
+            {overworld, main_menu, box_slot_one}
+        );
+        context.wait_for(std::chrono::milliseconds(100));
+        const bool fast_mode = false;
+        switch (ret){
+        case 0:
+            stream.log("Detected overworld.");
+            pbf_press_button(context, BUTTON_X, 160ms, 840ms); // open menu
+            continue;
+        case 1:
+            stream.log("Detected main menu.");
+            stream.overlay().add_log("Enter box", COLOR_WHITE);
+            success = main_menu.move_cursor(info, stream, context, MenuSide::RIGHT, 1, fast_mode);
+            if (success == false){
+                OperationFailedExceptionWithScreenshot::fire(
+                    ErrorReportMode::SEND_ERROR_REPORT,
+                    "enter_box_system_from_overworld(): Cannot move menu cursor to Boxes.",
+                    stream
+                );
+            }
+            pbf_press_button(context, BUTTON_A, 160ms, 400ms);
+            continue;
+        case 2:
+            stream.log("Detected box.");
+            context.wait_for(std::chrono::milliseconds(200));
+            return;
+        default:
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "enter_box_system_from_overworld(): No recognized state after 30 seconds.",
+                stream
+            );
+        }
+    }
+}
+
+
+void leave_box_system_to_overworld(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+    context.wait_for_all_requests();
+    stream.log("Leave box system to overworld...");
+    press_Bs_to_back_to_overworld(info, stream, context);
+}
+
+
+void open_pokedex_from_overworld(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+    stream.log("Opening Pokédex...");
+    WallClock start = current_time();
+    while (true){
+        if (current_time() - start > std::chrono::seconds(30)){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "open_pokedex_from_overworld(): Failed to open Pokédex after 30 seconds.",
+                stream
+            );
+        }
+
+        OverworldWatcher overworld(stream.logger(), COLOR_CYAN);
+        WhiteButtonWatcher pokedex(COLOR_RED, WhiteButton::ButtonY, {0.800, 0.118, 0.030, 0.060});
+
+        context.wait_for_all_requests();
+        int ret = wait_until(
+            stream, context,
+            std::chrono::seconds(30),
+            {overworld, pokedex}
+        );
+        context.wait_for(std::chrono::milliseconds(100));
+        switch (ret){
+        case 0:
+            // Try opening the Pokédex if overworld is detected
+            pbf_press_button(context, BUTTON_MINUS, 160ms, 800ms);
+            continue;
+        case 1:
+            stream.log("Detected Pokédex.");
+            return;
+        default:
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "open_pokedex_from_overworld(): No recognized state after 30 seconds.",
+                stream
+            );
+        }
+    }
+}
+
+
+void open_recently_battled_from_pokedex(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+    stream.log("Opening recently battled...");
+    LetsGoKillWatcher menu(stream.logger(), COLOR_RED, true, {0.23, 0.23, 0.04, 0.20});
+    context.wait_for_all_requests();
+
+    int ret = run_until<ProControllerContext>(
+        stream, context,
+        [](ProControllerContext& context){
+            for (size_t i = 0; i < 10; i++){
+                pbf_press_dpad(context, DPAD_DOWN, 160ms, 840ms);
+            }
+        },
+        {menu}
+    );
+    if (ret == 0){
+        stream.log("Detected Recently Battled menu icon.");
+        pbf_mash_button(context, BUTTON_A, 1200ms);
+        pbf_wait(context, 1600ms);
+    }else{
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "open_recently_battled_from_pokedex(): Unknown state after 10 dpad down presses.",
+            stream
+        );
+    }
+}
+
+
+void leave_phone_to_overworld(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+    stream.log("Exiting to overworld from Rotom Phone...");
+    OverworldWatcher overworld(stream.logger(), COLOR_CYAN);
+    NormalBattleMenuWatcher battle(COLOR_BLUE);
+    GradientArrowWatcher arrow(COLOR_RED, GradientArrowType::DOWN, {0.475, 0.465, 0.05, 0.085});
+    context.wait_for_all_requests();
+
+    int ret = run_until<ProControllerContext>(
+        stream, context,
+        [](ProControllerContext& context){
+            for (size_t i = 0; i < 10; i++){
+                pbf_press_button(context, BUTTON_Y, 160ms, 8000ms);
+            }
+        },
+        {overworld, battle, arrow}
+    );
+    switch (ret){
+    case 0:
+        return;
+    case 1:
+        throw_and_log<UnexpectedBattleException>(
+            stream.logger(), ErrorReportMode::SEND_ERROR_REPORT,
+            "leave_phone_to_overworld(): Unexpectedly detected battle.",
+            stream
+        );  
+    case 2:
+        stream.log("Stuck in battle status screen.");
+        pbf_mash_button(context, BUTTON_B, 1600ms);
+        throw_and_log<UnexpectedBattleException>(
+            stream.logger(), ErrorReportMode::SEND_ERROR_REPORT,
+            "leave_phone_to_overworld(): Unexpectedly detected battle.",
+            stream
+        ); 
+    default:
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "leave_phone_to_overworld(): Unknown state after 10 button Y presses.",
+            stream
+        );
+    }
+}
+
+
+void mash_button_till_overworld(
+    VideoStream& stream,
+    ProControllerContext& context,
+    Button button, uint16_t seconds_run
+){
+    OverworldWatcher overworld(stream.logger(), COLOR_CYAN);
+    context.wait_for_all_requests();
+
+    int ret = run_until<ProControllerContext>(
+        stream, context,
+        [button, seconds_run](ProControllerContext& context){
+            ssf_mash1_button(context, button, Seconds(seconds_run));
+            // pbf_wait(context, Seconds(seconds_run));
+        },
+        {overworld}
+    );
+
+    if (ret < 0){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "mash_button_till_overworld(): Timed out, no recognized state found.",
+            stream
+        );
+    }
+}
+
+void enter_menu_from_overworld(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context,
+    int menu_index,
+    MenuSide side,
+    bool has_minimap
+){
+    if (!has_minimap){
+        pbf_press_button(context, BUTTON_X, 160ms, 840ms);
+    }
+
+    WallClock start = current_time();
+    bool success = false;
+
+    while (true){
+        if (current_time() - start > std::chrono::minutes(1)){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "enter_menu_from_overworld(): Failed to enter specified menu after 1 minute.",
+                stream
+            );
+        }
+
+        OverworldWatcher overworld(stream.logger(), COLOR_CYAN);
+        MainMenuWatcher main_menu(COLOR_RED);
+        NormalBattleMenuWatcher battle(COLOR_RED);
+        context.wait_for_all_requests();
+
+        int ret = run_until<ProControllerContext>(
+            stream, context,
+            [has_minimap](ProControllerContext& context){
+                for (int i = 0; i < 10; i++){
+                    pbf_wait(context, 3000ms);
+                    if (!has_minimap){ 
+                        // if no minimap, can't detect overworld, so repeatedly press X to cover for button drops
+                        pbf_press_button(context, BUTTON_X, 160ms, 800ms);
+                    }
+                }
+            },
+            {overworld, main_menu, battle}
+        );
+        context.wait_for(std::chrono::milliseconds(100));
+
+        const bool fast_mode = false;
+        switch (ret){
+        case 0:
+            stream.log("Detected overworld.");
+            pbf_press_button(context, BUTTON_X, 160ms, 840ms);
+            continue;
+        case 1:
+            stream.log("Detected main menu.");
+            if (menu_index == -1){
+                return;
+            }
+            success = main_menu.move_cursor(info, stream, context, side, menu_index, fast_mode);
+            if (success == false){
+                OperationFailedExceptionWithScreenshot::fire(
+                    ErrorReportMode::SEND_ERROR_REPORT,
+                    "enter_menu_from_overworld(): Cannot move menu cursor to specified menu.",
+                    stream
+                );
+            }
+            pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+            return;
+        case 2:
+            throw_and_log<UnexpectedBattleException>(
+                stream.logger(), ErrorReportMode::SEND_ERROR_REPORT,
+                "enter_menu_from_overworld(): Unexpectedly detected battle.",
+                stream
+            );            
+        default:
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "enter_menu_from_overworld(): No recognized state after 30 seconds. Can't find overworld or main menu.",
+                stream
+            );
+        }
+    }
+}
+
+void enter_menu_from_box_system(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context,
+    int menu_index,
+    MenuSide side
+){
+    WallClock start = current_time();
+    bool success = false;
+
+    while (true){
+        if (current_time() - start > std::chrono::seconds(20)){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "enter_menu_from_box_system(): Failed to enter specified menu after 20 seconds.",
+                stream
+            );
+        }
+
+        MainMenuWatcher main_menu(COLOR_RED);
+        context.wait_for_all_requests();
+
+        int ret = run_until<ProControllerContext>(
+            stream, context,
+            [](ProControllerContext& context){
+                // repeatedly pressing B and waiting for three seconds
+                for (int i = 0; i < 10; i++){
+                    pbf_press_button(context, BUTTON_B, 200ms, 3s);
+                }
+            },
+            {main_menu}
+        );
+
+        const bool fast_mode = false;
+        switch (ret){
+        case 0:
+            stream.log("Detected main menu when going from box system to menu");
+            if (menu_index == -1){
+                return;
+            }
+            success = main_menu.move_cursor(info, stream, context, side, menu_index, fast_mode);
+            if (success == false){
+                OperationFailedExceptionWithScreenshot::fire(
+                    ErrorReportMode::SEND_ERROR_REPORT,
+                    "enter_menu_from_box_system(): Cannot move menu cursor to specified menu.",
+                    stream
+                );
+            }
+            pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+            return;     
+        default:
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "enter_menu_from_box_system(): No recognized state after 30 seconds.",
+                stream
+            );
+        }
+    }
+}
+
+
+void enter_menu_from_bag(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context,
+    int menu_index,
+    MenuSide side
+){
+    WallClock start = current_time();
+    bool success = false;
+
+    while (true){
+        if (current_time() - start > std::chrono::seconds(20)){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "enter_menu_from_bag(): Failed to enter specified menu after 20 seconds.",
+                stream
+            );
+        }
+
+        MainMenuWatcher main_menu(COLOR_RED);
+        BagWatcher bag_watcher(BagWatcher::FinderType::PRESENT, COLOR_RED);
+        context.wait_for_all_requests();
+
+        int ret = run_until<ProControllerContext>(
+            stream, context,
+            [](ProControllerContext& context){
+                // repeatedly pressing B and waiting for three seconds
+                for (int i = 0; i < 10; i++){
+                    pbf_press_button(context, BUTTON_B, 200ms, 3s);
+                }
+            },
+            {main_menu, bag_watcher}
+        );
+
+        const bool fast_mode = false;
+        switch (ret){
+        case 0:
+            stream.log("Detected main menu when going from box system to menu");
+            if (menu_index == -1){
+                return;
+            }
+            success = main_menu.move_cursor(info, stream, context, side, menu_index, fast_mode);
+            if (success == false){
+                OperationFailedExceptionWithScreenshot::fire(
+                    ErrorReportMode::SEND_ERROR_REPORT,
+                    "enter_menu_from_bag(): Cannot move menu cursor to specified menu.",
+                    stream
+                );
+            }
+            pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+            return;
+        case 1:
+            stream.log("still on bag.");
+            pbf_press_button(context, BUTTON_B, 160ms, 840ms);
+            continue;
+        default:
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "enter_menu_from_bag(): No recognized state after 30 seconds.",
+                stream
+            );
+        }
+    }
+}
+
+
+void enter_bag_from_menu(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+    WallClock start = current_time();
+    bool success = false;
+    stream.log("Entering bag from menu");
+
+    while (true){
+        if (current_time() - start > std::chrono::seconds(20)){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "enter_bag_from_menu(): Failed to enter specified menu after 20 seconds.",
+                stream
+            );
+        }
+
+        MainMenuWatcher main_menu(COLOR_RED);
+        BagWatcher bag_watcher(BagWatcher::FinderType::PRESENT, COLOR_RED);
+        context.wait_for_all_requests();
+
+        int ret = wait_until(
+            stream, context,
+            Seconds(5),
+            {main_menu, bag_watcher}
+        );
+
+        const bool fast_mode = false;
+        switch (ret){
+        case 0:
+            stream.log("Detected main menu.");
+            success = main_menu.move_cursor(info, stream, context, MenuSide::RIGHT, 0, fast_mode);
+            if (success == false){
+                OperationFailedExceptionWithScreenshot::fire(
+                    ErrorReportMode::SEND_ERROR_REPORT,
+                    "enter_bag_from_menu(): Cannot move menu cursor to specified menu.",
+                    stream
+                );
+            }
+            pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+            continue;
+        case 1:
+            stream.overlay().add_log("Enter bag");
+            return;
+        default:
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "enter_bag_from_menu(): No recognized state after 30 seconds.",
+                stream
+            );
+        }
+    }
+}
+
+
+void press_button_until_gradient_arrow(
+    const ProgramInfo& info, 
+    VideoStream& stream,
+    ProControllerContext& context,
+    ImageFloatBox box_area_to_check,
+    Button button,
+    GradientArrowType arrow_type
+){
+    GradientArrowWatcher arrow(COLOR_RED, arrow_type, box_area_to_check);
+    int ret = run_until<ProControllerContext>(
+        stream, context,
+        [button](ProControllerContext& context){
+            pbf_wait(context, 3000ms); // avoid pressing button if arrow already detected
+            for (size_t c = 0; c < 10; c++){
+                pbf_press_button(context, button, 160ms, 3000ms);
+            }
+        },
+        {arrow}
+    );
+    if (ret == 0){
+        stream.log("Gradient arrow detected.");
+    }else{
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "Failed to detect gradient arrow.",
+            stream
+        );
+    }     
+}
+
+void navigate_school_layout_menu(
+    const ProgramInfo& info, 
+    VideoStream& stream,
+    ProControllerContext& context,
+    ImageFloatBox arrow_box_start,
+    ImageFloatBox arrow_box_end,
+    DpadPosition dpad_button,
+    uint16_t num_button_presses
+){
+    GradientArrowWatcher arrow_start(COLOR_RED, GradientArrowType::RIGHT, arrow_box_start);
+
+    int ret = wait_until(stream, context, Milliseconds(5000), { arrow_start });
+    if (ret < 0){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "navigate_school_layout_menu: Failed to detect gradient arrow at expected start position.",
+            stream
+        );        
+    }
+
+    for (uint16_t i = 0; i < num_button_presses; i++){
+        pbf_press_dpad(context, dpad_button, 160ms, 840ms);
+    }
+
+    GradientArrowWatcher arrow_end(COLOR_RED, GradientArrowType::RIGHT, arrow_box_end);
+    ret = run_until<ProControllerContext>(
+        stream,
+        context,
+        [dpad_button](ProControllerContext& context){
+            for (int i = 0; i < 3; i++){
+                pbf_press_dpad(context, dpad_button, 160ms, 4000ms);
+            }
+        },
+        { arrow_end }        
+    );
+
+    if (ret == 0){
+        stream.log("navigate_school_layout_menu: Desired item selected.");
+    }else{
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "navigate_school_layout_menu: Failed to detect gradient arrow at expected end position.",
+            stream
+        );        
+    }
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h
new file mode 100644
index 0000000000..d409457184
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h
@@ -0,0 +1,121 @@
+/*  PokemonSV Menu Navigation
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  Move between different game menu states: overworld, menu, box system, etc.
+ *  The location of the player charater in the overworld is not moved
+ */
+
+#ifndef PokemonAutomation_PokemonSV_MenuNavigation_H
+#define PokemonAutomation_PokemonSV_MenuNavigation_H
+
+#include "CommonFramework/Tools/VideoStream.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+#include "NintendoSwitch/NintendoSwitch_ConsoleHandle.h"
+#include "VideoGames/PokemonSV/Inference/PokemonSV_MainMenuDetector.h"
+
+
+namespace PokemonAutomation{
+    struct ProgramInfo;
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+void set_time_to_12am_from_home(const ProgramInfo& info, ConsoleHandle& console, ProControllerContext& context);
+
+//  Perform a No-op day skip that rolls over all the outbreaks and raids.
+void day_skip_from_overworld(ConsoleHandle& console, ProControllerContext& context);
+
+// Press B to return to the overworld
+void press_Bs_to_back_to_overworld(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context,
+    uint16_t seconds_between_b_presses = 3);
+
+// mashes A button by default
+void mash_button_till_overworld(
+    VideoStream& stream,
+    ProControllerContext& context,
+    Button button = BUTTON_A,
+    uint16_t seconds_run = 360
+);
+
+//  From overworld, open map. Will change map view from rotated to fixed if not already fixed.
+void open_map_from_overworld(
+    const ProgramInfo& info,
+    VideoStream& stream,
+    ProControllerContext& context,
+    bool clear_tutorial = false
+);
+
+//  Enter box system from overworld.
+void enter_box_system_from_overworld(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context);
+
+//  From box system go to overworld.
+void leave_box_system_to_overworld(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context);
+
+//  From overworld, open Pokédex.
+void open_pokedex_from_overworld(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context);
+
+//  From Pokédex, open Recently Battled.
+void open_recently_battled_from_pokedex(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context);
+
+//  From any of the rotom phone apps (Map/Pokédex/Profile) go to overworld.
+void leave_phone_to_overworld(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context);
+
+// enter menu and move the cursor to the given side and index, then press the A button (without wait for A button to press)
+// if menu_index is -1, return once the menu is detected.
+void enter_menu_from_overworld(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context,
+    int menu_index,
+    MenuSide side = MenuSide::RIGHT,
+    bool has_minimap = true
+);
+
+// enter menu from box system and move the cursor to the given side and index, then press the A button (without wait for A
+// button to press)
+// if menu_index is -1, return once the menu is detected.
+void enter_menu_from_box_system(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context,
+    int menu_index,
+    MenuSide side = MenuSide::NONE
+);
+
+// enter menu from bag and move the cursor to the given side and index, then press the A button (without wait for A
+// button to press)
+// if menu_index is -1, return once the menu is detected.
+void enter_menu_from_bag(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context,
+    int menu_index,
+    MenuSide side = MenuSide::NONE
+);
+
+// enter bag from any place on the main menu
+void enter_bag_from_menu(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context);
+
+// press given button until gradient arrow appears in given box_area_to_check.
+void press_button_until_gradient_arrow(
+    const ProgramInfo& info, 
+    VideoStream& stream,
+    ProControllerContext& context,
+    ImageFloatBox box_area_to_check,
+    Button button = BUTTON_A,
+    GradientArrowType arrow_type = GradientArrowType::RIGHT
+);
+
+// navigate school layout menu using only gradient arrow detection, without OCR
+// first, wait for the gradient arrow to appear within `arrow_box_start`.
+// then, press `dpad_button` a certain number of times, as per `num_button_presses`.
+// then, watch for the gradient arrow within `arrow_box_end`. 
+// If arrow not seen, press `dpad_button` a maximum of 3 times, while still watching for the gradient arrow
+// If arrow still not seen, throw exception.
+void navigate_school_layout_menu(
+    const ProgramInfo& info, 
+    VideoStream& stream,
+    ProControllerContext& context,
+    ImageFloatBox arrow_box_start,
+    ImageFloatBox arrow_box_end,
+    DpadPosition dpad_button,
+    uint16_t num_button_presses
+);
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.cpp
new file mode 100644
index 0000000000..82401f11c7
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.cpp
@@ -0,0 +1,153 @@
+/*  Save Game
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/Tools/ErrorDumper.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "VideoGames/PokemonSV/Inference/PokemonSV_MainMenuDetector.h"
+#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h"
+#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h"
+#include "PokemonSV_SaveGame.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+
+
+void save_game_from_menu(
+    const ProgramInfo& info,
+    VideoStream& stream, ProControllerContext& context
+){
+    save_game_from_menu_or_overworld(info, stream, context, false);
+}
+
+void save_game_from_overworld(
+    const ProgramInfo& info,
+    VideoStream& stream, ProControllerContext& context
+){
+    save_game_from_menu_or_overworld(info, stream, context, true);
+}
+
+
+
+void save_game_from_menu_or_overworld(
+    const ProgramInfo& info,
+    VideoStream& stream, ProControllerContext& context,
+    bool return_to_overworld
+){
+    context.wait_for_all_requests();
+    stream.log("Saving game...");
+    stream.overlay().add_log("Save game", COLOR_YELLOW);
+    WallClock start = current_time();
+    bool saved = false;
+    while (true){
+        if (current_time() - start > std::chrono::minutes(5)){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "save_game_from_menu_or_overworld(): Failed to save game after 5 minutes.",
+                stream
+            );
+        }
+
+        OverworldWatcher overworld(stream.logger(), COLOR_CYAN);
+        MainMenuWatcher menu(COLOR_RED);
+        GradientArrowWatcher confirmation(COLOR_YELLOW, GradientArrowType::RIGHT, {0.72, 0.55, 0.05, 0.08});
+        AdvanceDialogWatcher finished(COLOR_GREEN);
+        context.wait_for_all_requests();
+
+        int ret = wait_until(
+            stream, context,
+            std::chrono::seconds(60),
+            {overworld, menu, confirmation, finished}
+        );
+        context.wait_for(std::chrono::milliseconds(100));
+        switch (ret){
+        case 0:
+            stream.log("Detected overworld.");
+            if (saved && return_to_overworld){
+                return;
+            }
+            pbf_press_button(context, BUTTON_X, 160ms, 840ms);
+            continue;
+        case 1:
+            if (!saved){
+                stream.log("Detected main menu. Saving game...");
+                pbf_press_button(context, BUTTON_R, 160ms, 840ms);
+                continue;
+            }
+            if (return_to_overworld){
+                pbf_press_button(context, BUTTON_B, 160ms, 840ms);
+                continue;
+            }
+            return;
+        case 2:
+            stream.log("Detected save confirmation prompt.");
+            pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+            continue;
+        case 3:
+            stream.log("Detected save finished dialog.");
+            pbf_press_button(context, BUTTON_B, 160ms, 840ms);
+            saved = true;
+            continue;
+        default:
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "save_game_from_menu_or_overworld(): No recognized state after 60 seconds.",
+                stream
+            );
+        }
+
+
+
+
+
+    }
+
+}
+
+
+void save_game_tutorial(
+    const ProgramInfo& info,
+    VideoStream& stream, ProControllerContext& context
+){
+    stream.log("Save game from tutorial. Open the menu.");
+    context.wait_for_all_requests();
+    
+    // open the menu.
+    MainMenuWatcher menu(COLOR_RED);
+    int ret0 = run_until<ProControllerContext>(
+        stream, context,
+        [](ProControllerContext& context){
+            pbf_wait(context, 4000ms); // avoiding pressing X if menu already open
+            for (size_t i = 0; i < 10; i++){
+                pbf_press_button(context, BUTTON_X, 160ms, 4000ms);
+            }
+        },
+        {menu}
+    );
+    if (ret0 != 0){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "Failed to open menu!",
+            stream
+        );
+    }    
+
+    save_game_from_menu(info, stream, context);
+    pbf_mash_button(context, BUTTON_B, 1600ms);
+
+}
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h
new file mode 100644
index 0000000000..fcc57dfc84
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h
@@ -0,0 +1,47 @@
+/*  Save Game
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_SaveGame_H
+#define PokemonAutomation_PokemonSV_SaveGame_H
+
+#include "CommonFramework/Tools/VideoStream.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+
+namespace PokemonAutomation{
+    struct ProgramInfo;
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+//  Save game from menu.
+void save_game_from_menu(
+    const ProgramInfo& info,
+    VideoStream& stream, ProControllerContext& context
+);
+
+//  Save game from overworld.
+void save_game_from_overworld(
+    const ProgramInfo& info,
+    VideoStream& stream, ProControllerContext& context
+);
+
+//  Save game from either menu or overworld.
+void save_game_from_menu_or_overworld(
+    const ProgramInfo& info,
+    VideoStream& stream, ProControllerContext& context,
+    bool return_to_overworld
+);
+
+// Save game from overworld in the tutorial, where the minimap isn't available.
+void save_game_tutorial(
+    const ProgramInfo& info,
+    VideoStream& stream, ProControllerContext& context
+);
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/PokemonSV_Terarium.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/PokemonSV_Terarium.cpp
new file mode 100644
index 0000000000..aae34299d3
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/PokemonSV_Terarium.cpp
@@ -0,0 +1,215 @@
+/*  Terarium
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/Tools/ErrorDumper.h"
+#include "CommonFramework/Exceptions/ProgramFinishedException.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "VideoGames/PokemonSV/Inference/Battles/PokemonSV_NormalBattleMenus.h"
+#include "VideoGames/PokemonSV/Inference/Battles/PokemonSV_EncounterWatcher.h"
+#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h"
+#include "PokemonSV_Terarium.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+void return_to_plaza(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+    stream.log("Attempting to return to Central Plaza.");
+    //Modified version of handle_battles_and_back_to_pokecenter()
+    bool returned_to_pokecenter = false;
+    bool laggy = false;
+
+    while(!returned_to_pokecenter){
+        EncounterWatcher encounter_watcher(stream, COLOR_RED);
+        int ret = run_until<ProControllerContext>(
+            stream, context,
+            [&](ProControllerContext& context){
+                //Exit any dialogs (ex. Cyrano upgrading BBQs)
+                OverworldWatcher overworld(stream.logger(), COLOR_RED);
+                int ret_overworld = run_until<ProControllerContext>(
+                    stream, context,
+                    [&](ProControllerContext& context){
+                        pbf_mash_button(context, BUTTON_B, 80000ms);
+                    },
+                    {overworld}
+                );
+                if (ret_overworld == 0){
+                    stream.log("Overworld detected.");
+                }
+                context.wait_for_all_requests();
+
+                try{
+                    open_map_from_overworld(info, stream, context);
+                }catch (...){
+                    jump_off_wall_until_map_open(info, stream, context);
+                }
+
+                //Move cursor to top left corner - even works when at Entrance fly point
+                pbf_press_button(context, BUTTON_ZL, 320ms, 800ms);
+                pbf_move_left_joystick(context, {-1, +1}, 4000ms, 320ms);
+
+                //Now move toward center
+                if (laggy){
+                    pbf_move_left_joystick(context, {+1, -1}, 2400ms, 320ms); //overshoot by a bit (still works even if not laggy)
+                }else{
+                    pbf_move_left_joystick(context, {+1, -1}, 2000ms, 320ms); //250 is more accurate but 300 helps with lag
+                }
+                pbf_press_button(context, BUTTON_ZR, 320ms, 800ms);
+
+                try{
+                    //The only pokecenter on the map is Central Plaza
+                    fly_to_closest_pokecenter_on_map(info, stream, context);
+                    context.wait_for_all_requests();
+                    returned_to_pokecenter = true;
+                }catch (...){
+                    stream.log("Failed to return to Pokecenter. Closing map and retrying.");
+                    laggy = true;
+                }
+                context.wait_for_all_requests();
+            },
+            {
+                static_cast<VisualInferenceCallback&>(encounter_watcher),
+                static_cast<AudioInferenceCallback&>(encounter_watcher),
+            }
+        );
+        if (ret == 0){
+            stream.log("Battle menu detected.");
+            encounter_watcher.throw_if_no_sound();
+
+            bool is_shiny = (bool)encounter_watcher.shiny_screenshot();
+            if (is_shiny){
+                stream.log("Shiny detected!");
+                pbf_press_button(context, BUTTON_CAPTURE, 2000ms, 5000ms);
+                throw ProgramFinishedException();
+            }else{
+                stream.log("Detected battle. Running from battle.");
+                try{
+                    //Smoke Ball or Flying type required due to Arena Trap
+                    NormalBattleMenuWatcher battle_menu(COLOR_YELLOW);
+                    battle_menu.move_to_slot(stream, context, 3);
+                    pbf_press_button(context, BUTTON_A, 80ms, 400ms);
+                }catch (...){
+                    stream.log("Unable to flee.");
+                    OperationFailedExceptionWithScreenshot::fire(
+                        ErrorReportMode::SEND_ERROR_REPORT,
+                        "Unable to flee!",
+                        stream
+                    );
+                }
+            }
+        }
+    }
+    context.wait_for_all_requests();
+}
+
+void map_move_cursor_fly(
+    const ProgramInfo& info,
+    VideoStream& stream, ProControllerContext& context,
+    double x, double y,
+    Milliseconds hold, Milliseconds release,
+    std::string location
+){
+    stream.log("Attempting to fly to " + location + ".");
+
+    for (int i = 0; i < 3; i++){
+        try{
+            open_map_from_overworld(info, stream, context);
+            pbf_move_left_joystick(context, {x, y}, hold, release);
+            pbf_press_button(context, BUTTON_ZL, 320ms, 800ms);
+            fly_to_overworld_from_map(info, stream, context);
+            break;
+        }
+        catch(...){
+            stream.log("Failed to fly! Closing map and retrying.");
+            press_Bs_to_back_to_overworld(info, stream, context);
+            if (i == 2){
+                OperationFailedExceptionWithScreenshot::fire(
+                    ErrorReportMode::SEND_ERROR_REPORT,
+                    "Unable to fly to " + location + "!",
+                    stream
+                );
+            }
+        }
+    }
+}
+
+void central_to_polar_rest(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+    map_move_cursor_fly(info, stream, context, -0.414, +1, 1840ms, 160ms, "Polar Rest Area");
+}
+
+void central_to_polar_class1(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+    map_move_cursor_fly(info, stream, context, -1, +0.844, 1200ms, 160ms, "Polar Classroom 1");
+}
+
+void central_to_polar_plaza(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+    map_move_cursor_fly(info, stream, context, -0.844, +0.805, 1960ms, 160ms, "Polar Plaza");
+}
+
+void central_to_coastal_plaza(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+    map_move_cursor_fly(info, stream, context, +0.409, +1, 1680ms, 160ms, "Coastal Plaza");
+}
+
+void central_to_canyon_plaza(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+    map_move_cursor_fly(info, stream, context, -1, -1, 1720ms, 160ms, "Canyon Plaza");
+}
+
+void central_to_savanna_plaza(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+    map_move_cursor_fly(info, stream, context, +0.291, -1, 1440ms, 160ms, "Savanna Plaza");
+}
+
+void central_to_canyon_rest(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+    map_move_cursor_fly(info, stream, context, -1, -0.094, 1280ms, 160ms, "Canyon Rest Area");
+}
+
+void central_to_savanna_class(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+    map_move_cursor_fly(info, stream, context, +1, -0.724, 1120ms, 160ms, "Savanna Classroom");
+}
+
+void central_to_chargestone(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+    map_move_cursor_fly(info, stream, context, -1, -0.055, 1040ms, 160ms, "Chargestone Cavern");
+}
+
+void jump_glide_fly(
+    VideoStream& stream, ProControllerContext& context,
+    bool inverted_flight,
+    Milliseconds hold_up,
+    Milliseconds flight_wait,
+    Milliseconds drop_time
+){
+    stream.log("Jump, glide, fly.");
+
+    ssf_press_button(context, BUTTON_B, 0ms, 800ms);
+    ssf_press_button(context, BUTTON_B, 0ms, 160ms, 80ms);
+    ssf_press_button(context, BUTTON_B, 0ms, 160ms);
+    pbf_wait(context, 800ms);
+    context.wait_for_all_requests();
+    pbf_press_button(context, BUTTON_LCLICK, 400ms, 0ms);
+
+
+    if (inverted_flight){
+        pbf_move_left_joystick(context, {0, -1}, hold_up, 2000ms);
+    }else{
+        pbf_move_left_joystick(context, {0, +1}, hold_up, 2000ms);
+    }
+
+    pbf_wait(context, flight_wait);
+    context.wait_for_all_requests();
+
+    pbf_press_button(context, BUTTON_B, 160ms, 400ms);
+    pbf_wait(context, drop_time);
+    context.wait_for_all_requests();
+}
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/PokemonSV_Terarium.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/PokemonSV_Terarium.h
new file mode 100644
index 0000000000..8c21530cea
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/PokemonSV_Terarium.h
@@ -0,0 +1,70 @@
+/*  Terarium
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_Terarium_H
+#define PokemonAutomation_PokemonSV_Terarium_H
+
+#include "CommonFramework/Tools/VideoStream.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+
+namespace PokemonAutomation{
+    struct ProgramInfo;
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+// Return to Central Plaza from anywhere in the terarium
+void return_to_plaza(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context);
+
+// Open map from overworld, move cursor to fly location, and fly to location
+void map_move_cursor_fly(
+    const ProgramInfo& info,
+    VideoStream& stream, ProControllerContext& context,
+    double x, double y,
+    Milliseconds hold, Milliseconds release,
+    std::string location
+);
+
+// From central plaza, fly to the polar rest area
+void central_to_polar_rest(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context);
+
+// From central plaza, fly to polar outdoor classroom 1
+void central_to_polar_class1(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context);
+
+// From central plaza, fly to coastal plaza
+void central_to_polar_plaza(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context);
+
+// From central plaza, fly to coastal plaza
+void central_to_coastal_plaza(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context);
+
+// From central plaza, fly to canyon plaza
+void central_to_canyon_plaza(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context);
+
+// From central plaza, fly to savanna plaza
+void central_to_savanna_plaza(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context);
+
+// From central plaza, fly to canyon rest area
+void central_to_canyon_rest(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context);
+
+// From central plaza, fly to savanna classroom. Warning: extremely laggy area.
+void central_to_savanna_class(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context);
+
+// From central plaza, fly to chargestone cavern
+void central_to_chargestone(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context);
+
+// Jump straight up into the air and fly. Fly up for hold_up ticks, fly straight for flight_wait ticks, and wait drop_time ticks to fall to the ground.
+void jump_glide_fly(
+    VideoStream& stream, ProControllerContext& context,
+    bool inverted_flight,
+    Milliseconds hold_up,
+    Milliseconds flight_wait,
+    Milliseconds drop_time
+);
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.cpp
new file mode 100644
index 0000000000..9867d96edd
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.cpp
@@ -0,0 +1,1067 @@
+/*  PokemonSV World Navigation
+ *
+ */
+
+#include <array>
+#include <cmath>
+#include <sstream>
+//#include "NintendoSwitch/NintendoSwitch_Settings.h"
+#include <cfloat>
+#include <iostream>
+//#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+//#include "NintendoSwitch/Programs/DateSpam/NintendoSwitch_HomeToDateTime.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+//#include "VideoGames/PokemonSV/PokemonSV_Settings.h"
+#include "CommonFramework/Exceptions/UnexpectedBattleException.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManip.h"
+#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h"
+#include "VideoGames/PokemonSV/Inference/Map/PokemonSV_MapDetector.h"
+#include "VideoGames/PokemonSV/Inference/Map/PokemonSV_MapMenuDetector.h"
+#include "VideoGames/PokemonSV/Inference/Map/PokemonSV_MapPokeCenterIconDetector.h"
+#include "VideoGames/PokemonSV/Inference/Map/PokemonSV_FastTravelDetector.h"
+#include "VideoGames/PokemonSV/Inference/Picnics/PokemonSV_PicnicDetector.h"
+#include "VideoGames/PokemonSV/Inference/PokemonSV_MainMenuDetector.h"
+#include "VideoGames/PokemonSV/Inference/PokemonSV_ZeroGateWarpPromptDetector.h"
+#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h"
+#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h"
+
+#include "VideoGames/PokemonSV/Inference/PokemonSV_TutorialDetector.h"
+#include "VideoGames/PokemonSV/Inference/Battles/PokemonSV_NormalBattleMenus.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h"
+#include "PokemonSV_ConnectToInternet.h"
+#include "PokemonSV_WorldNavigation.h"
+
+using std::cout;
+using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+bool fly_to_overworld_from_map(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context, bool check_fly_menuitem){
+    context.wait_for_all_requests();
+    // Press A to bring up the promp dialog on choosing "Fly here", "Set as destination", "Never mind".
+    pbf_press_button(context, BUTTON_A, 160ms, 1040ms);
+
+    WallClock start = current_time();
+    while (true){
+        if (current_time() - start > std::chrono::minutes(2)){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "fly_to_overworld_from_map(): Failed to fly from map after 2 minutes.",
+                stream
+            );
+        }
+
+        int ret = 0;
+        NormalBattleMenuWatcher battle(COLOR_BLUE);
+        OverworldWatcher overworld(stream.logger(), COLOR_CYAN);
+        WhiteButtonWatcher map(COLOR_RED, WhiteButton::ButtonY, {0.800, 0.118, 0.030, 0.060});
+        GradientArrowWatcher spot_dialog_watcher(COLOR_YELLOW, GradientArrowType::RIGHT, {0.469, 0.500, 0.215, 0.150});
+        PromptDialogWatcher confirm_watcher(COLOR_BLUE, {0.686, 0.494, 0.171, 0.163});
+        MapFlyMenuWatcher flyMenuItemWatcher(COLOR_BLACK);
+        MapDestinationMenuWatcher destinationMenuItemWatcher(COLOR_BLACK);
+
+        context.wait_for_all_requests();
+
+        std::vector<PeriodicInferenceCallback> callbacks{overworld, map, spot_dialog_watcher, confirm_watcher, battle};
+        if (check_fly_menuitem){ // callbacks: overworld, map, flyMenuItemWatcher, confirm_watcher, battle, destinationMenuItemWatcher
+            callbacks[2] = flyMenuItemWatcher;
+            callbacks.push_back(destinationMenuItemWatcher);
+        }
+
+        ret = wait_until(stream, context, std::chrono::minutes(2), callbacks);
+        context.wait_for(std::chrono::milliseconds(100));
+        switch (ret){
+        case 0: // overworld
+            stream.log("Detected overworld. Fly successful.");
+            return true;
+        case 1: // map
+            stream.log("Detected map. Pressing A to open map menu.");
+            // Press A to bring up the promp dialog on choosing "Fly here", "Set as destination", "Never mind".
+            pbf_press_button(context, BUTTON_A, 160ms, 1040ms);
+            continue;
+        case 2: // spot_dialog_watcher or flyMenuItemWatcher
+            stream.log("Detected fly here prompt dialog.");
+            stream.overlay().add_log("Fly");
+            pbf_press_button(context, BUTTON_A, 160ms, 1040ms);
+            continue;
+        case 3: //confirm_watcher
+            stream.log("Detected fly confirmation prompt.");
+            pbf_press_button(context, BUTTON_A, 160ms, 1040ms);
+            continue;
+        case 4: //battle
+            stream.log("Detected battle.");
+            throw_and_log<UnexpectedBattleException>(
+                stream.logger(), ErrorReportMode::SEND_ERROR_REPORT,
+                "fly_to_overworld_from_map(): Unexpectedly detected battle.",
+                stream
+            ); 
+        case 5: //destinationMenuItemWatcher
+            stream.log("Detected no fly spot here.");
+            stream.overlay().add_log("No fly spot", COLOR_RED);
+            return false;
+        default:
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "fly_to_overworld_from_map(): No recognized state after 2 minutes.",
+                stream
+            );
+        }
+    }
+}
+
+
+void picnic_from_overworld(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+    context.wait_for_all_requests();
+    stream.log("Start picnic from overworld...");
+    WallClock start = current_time();
+    bool success = false;
+    while (true){
+        if (current_time() - start > std::chrono::minutes(3)){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "picnic_from_overworld(): Failed to start picnic after 3 minutes.",
+                stream
+            );
+        }
+
+        OverworldWatcher overworld(stream.logger(), COLOR_CYAN);
+        MainMenuWatcher main_menu(COLOR_RED);
+        PicnicWatcher picnic;
+        context.wait_for_all_requests();
+        int ret = wait_until(
+            stream, context,
+            std::chrono::seconds(30),
+            {overworld, main_menu, picnic}
+        );
+        context.wait_for(std::chrono::milliseconds(100));
+        const bool fast_mode = false;
+        switch (ret){
+        case 0:
+            stream.log("Detected overworld.");
+            pbf_press_button(context, BUTTON_X, 160ms, 840ms); // open menu
+            continue;
+        case 1:
+            stream.log("Detected main menu.");
+            success = main_menu.move_cursor(info, stream, context, MenuSide::RIGHT, 2, fast_mode);
+            if (success == false){
+                OperationFailedExceptionWithScreenshot::fire(
+                    ErrorReportMode::SEND_ERROR_REPORT,
+                    "picnic_from_overworld(): Cannot move menu cursor to picnic.",
+                    stream
+                );
+            }
+            pbf_mash_button(context, BUTTON_A, 1000ms); // mash button A to enter picnic mode
+            continue;
+        case 2:
+            stream.log("Detected picnic.");
+            stream.overlay().add_log("Start picnic", COLOR_WHITE);
+            // extra wait to make sure by the end the player can move.
+            // the player throwing out pokeballs animation is long.
+            pbf_wait(context, 8000ms);
+            context.wait_for_all_requests();
+            return;
+        default:
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "picnic_from_overworld(): No recognized state after 30 seconds.",
+                stream
+            );
+        }
+    }
+}
+
+void leave_picnic(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+    context.wait_for_all_requests();
+    stream.log("Leaving picnic...");
+    stream.overlay().add_log("Leaving picnic", COLOR_WHITE);
+
+    pbf_press_button(context, BUTTON_Y, 240ms, 800ms);
+    for (int i = 0; i < 5; i++){
+        PromptDialogWatcher prompt(COLOR_RED, {0.595, 0.517, 0.273, 0.131});
+        context.wait_for_all_requests();
+        int ret = wait_until(
+            stream, context,
+            std::chrono::seconds(5),
+            {prompt}
+        );
+
+        if (ret == 0){
+            stream.log("Detected end picnic prompt");
+            break;
+        }
+
+        if (i == 4){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "leave_picnic(): Failed to leave picnic after 5 tries.",
+                stream
+            );
+        }
+
+        // prompt not found, maybe button Y dropped?
+        pbf_press_button(context, BUTTON_Y, 240ms, 800ms);
+    }
+
+    // We have now the prompt to asking for confirmation of leaving picnic.
+    // Mash A to confirm
+    pbf_mash_button(context, BUTTON_A, 1200ms);
+    context.wait_for_all_requests();
+    
+    // Wait for overworld:
+    OverworldWatcher overworld(stream.logger(), COLOR_CYAN);
+    int ret = wait_until(
+        stream, context,
+        std::chrono::seconds(20),
+        {overworld}
+    );
+    if (ret < 0){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "leave_picnic(): Failed to detect overworld after 20 seconds.",
+            stream
+        );
+    }
+    // Wait three more seconds to make sure the player character is free to operate:
+    context.wait_for(std::chrono::seconds(3));
+}
+
+std::string get_flypoint_string(FlyPoint fly_point){
+    std::string fly_point_string;
+    if (fly_point == FlyPoint::POKECENTER){
+        fly_point_string = "Pokecenter";
+    }else if(fly_point == FlyPoint::FAST_TRAVEL){
+        fly_point_string = "Fast Travel";
+    }
+
+    return fly_point_string;
+}
+
+const std::vector<ImageFloatBox> get_flypoint_locations(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context, FlyPoint fly_point){
+    context.wait_for_all_requests();
+    std::vector<ImageFloatBox> found_locations;
+    MapPokeCenterIconWatcher pokecenter_watcher(COLOR_RED, stream.overlay(), MAP_READABLE_AREA);
+    FastTravelWatcher fast_travel_watcher(COLOR_RED, stream.overlay(), MAP_READABLE_AREA);
+    int ret = -1;
+    if (fly_point == FlyPoint::POKECENTER){
+        ret = wait_until(stream, context, std::chrono::seconds(2), {pokecenter_watcher});
+        if (ret == 0){
+            found_locations = pokecenter_watcher.found_locations();
+        }
+    }else if(fly_point == FlyPoint::FAST_TRAVEL){
+        ret = wait_until(stream, context, std::chrono::seconds(2), {fast_travel_watcher});
+        if (ret == 0){
+            found_locations = fast_travel_watcher.found_locations();
+        }
+    }
+
+    return found_locations;
+}
+
+void print_flypoint_location(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context, FlyPoint fly_point){
+    std::string fly_point_string = get_flypoint_string(fly_point);
+
+    const std::vector<ImageFloatBox> found_locations = get_flypoint_locations(info, stream, context, fly_point);
+    if (found_locations.empty()){
+        stream.log("No visible " + fly_point_string + " found on map");
+        return;
+    }
+
+    for (const auto& box: found_locations){
+        std::ostringstream os;
+        os << "Found " + fly_point_string + " at box: {" << box.x << ", " << box.y << "}"; // << ", width=" << box.width << ", height=" << box.height;
+        stream.log(os.str());
+  
+    }
+}
+
+
+
+void place_marker_offset_from_flypoint(
+    const ProgramInfo& info, 
+    VideoStream& stream,
+    ProControllerContext& context,
+    MoveCursor move_cursor_near_flypoint,
+    FlyPoint fly_point, 
+    ExpectedMarkerPosition marker_offset
+){
+
+    stream.log("place_marker_offset_from_flypoint()");
+    WallClock start = current_time();
+
+    while (true){
+        if (current_time() - start > std::chrono::minutes(2)){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "place_marker_offset_from_flypoint(): Failed to place down marker after 2 minutes.",
+                stream
+            );
+        }
+
+        try{
+            open_map_from_overworld(info, stream, context, false);
+
+            // move cursor near landmark (pokecenter)
+            switch(move_cursor_near_flypoint.zoom_change){
+            case ZoomChange::ZOOM_IN:
+                pbf_press_button(context, BUTTON_ZR, 160ms, 840ms);
+                break;
+            case ZoomChange::ZOOM_IN_TWICE:
+                pbf_press_button(context, BUTTON_ZR, 160ms, 840ms);
+                pbf_press_button(context, BUTTON_ZR, 160ms, 840ms);
+                break;                
+            case ZoomChange::ZOOM_OUT:
+                pbf_press_button(context, BUTTON_ZL, 160ms, 840ms);
+                break;    
+            case ZoomChange::ZOOM_OUT_TWICE:
+                pbf_press_button(context, BUTTON_ZL, 160ms, 840ms);
+                pbf_press_button(context, BUTTON_ZL, 160ms, 840ms);
+                break;                  
+            case ZoomChange::KEEP_ZOOM:
+                break;
+            }
+            double move_x1 = move_cursor_near_flypoint.move_x;
+            double move_y1 = move_cursor_near_flypoint.move_y;
+            Milliseconds move_duration1 = move_cursor_near_flypoint.move_duration;
+            pbf_move_left_joystick(context, {move_x1, move_y1}, move_duration1, 1000ms);
+
+            move_cursor_to_position_offset_from_flypoint(info, stream, context, fly_point, {marker_offset.x, marker_offset.y});
+
+            // place down marker
+            pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+            pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+            leave_phone_to_overworld(info, stream, context);
+
+            return;      
+
+        }catch (UnexpectedBattleException&){
+            run_wild_battle_press_A(stream, context, BattleStopCondition::STOP_OVERWORLD);
+        }catch (OperationFailedException&){
+            // reset to overworld if failed to center on the pokecenter, and re-try
+            leave_phone_to_overworld(info, stream, context);
+        }
+    }
+}
+
+void move_cursor_to_position_offset_from_flypoint(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context, FlyPoint fly_point, ExpectedMarkerPosition marker_offset){
+    // loop through flypoint locations. find the point that is closest to marker_offset, by distance x_diff^2 + y_diff^2
+    // based on the closest point, move cursor based on x_diff and y_diff. do this again until x_diff/y_diff are within certain margins
+    std::string fly_point_string = get_flypoint_string(fly_point);
+    size_t MAX_ATTEMPTS = 20;
+    for (size_t i = 0; i < MAX_ATTEMPTS; i++){
+        const std::vector<ImageFloatBox> found_locations = get_flypoint_locations(info, stream, context, fly_point);
+        if (found_locations.empty()){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "move_cursor_to_position_offset_from_flypoint(): No visible " + fly_point_string + " found on map",
+                stream
+            );
+        }
+        
+        const double expected_x = marker_offset.x;
+        const double expected_y = marker_offset.y;
+        double closest_icon_x = 0.0; 
+        double closest_icon_y = 0.0;
+        double closest_dist2 = DBL_MAX;  // distance^2 in pixels
+
+        for (const auto& box: found_locations){
+            const double found_x = box.x;
+            const double found_y = box.y;
+            const double x_diff = (found_x - expected_x) * 1920;
+            const double y_diff = (found_y - expected_y) * 1080;
+            const double dist2 = x_diff * x_diff + y_diff * y_diff;
+            
+
+            if (dist2 < closest_dist2){
+                closest_dist2 = dist2;
+                closest_icon_x = found_x; 
+                closest_icon_y = found_y;
+            }
+        }
+        stream.log("Found closest " + fly_point_string + " icon on map: (" + std::to_string(closest_icon_x) + ", " + std::to_string(closest_icon_y) + ").");
+
+
+        // Convert the vector from ExpectedMarkerPosition to the FlyPoint icon into a left joystick movement
+        const double dif_x = (closest_icon_x - expected_x) * 1920;
+        const double dif_y = (closest_icon_y - expected_y) * 1080;
+        const double magnitude = std::max(std::sqrt(closest_dist2), 1.0);
+        double push_x = dif_x * 0.5 / magnitude;
+        double push_y = dif_y * 0.5 / magnitude;
+
+        double scale = 0.29;
+        if (closest_dist2 < 1000){ // if we're already very close to the target, reduce push velocity and push duration
+            scale = 0.1;
+            push_x *= 0.25;
+            push_y *= 0.25;
+        }
+
+        if (closest_dist2 < 5){ // if we're very very close to the target, reduce push velocity and push duration even further
+            push_x *= 0.5;
+            push_y *= 0.5;
+        }
+
+        cout << "sqrt(closest_dist2): " << std::sqrt(closest_dist2) << endl;
+        // cout << "push_x " << push_x << endl;
+        // cout << "dif_x "<< dif_x << endl;
+        // cout << "magnitude " << magnitude << endl;
+
+        if (std::sqrt(closest_dist2) < 1.01){
+            // return when we're close enough to the target
+            break;
+        }
+
+        const double move_x = std::max(std::min(push_x, 1.0), -1.0);
+        const double move_y = -std::max(std::min(push_y, 1.0), -1.0);
+
+        const uint16_t push_time_ticks = std::max(uint16_t(magnitude * scale + 0.5), uint16_t(3));
+        Milliseconds push_time = push_time_ticks * 8ms;
+        pbf_move_left_joystick(context, {move_x, move_y}, push_time, 240ms);
+        if (closest_dist2 > 100 && i > 4){ 
+            // add a wait for the case where the cursor is bouncing between a snap point and the desired location.
+            // the wait allows the true distance to be calculated. Without the wait, you could end up capturing a transitional moment 
+            // where the cursor is falling towards the snap point, therefore causing the calculated distance to be 
+            // less than expected, leading to the push being weaker than needed, which could perpetuate the issue
+            // as the push may not be strong enough to escape the gravity of a snap point.
+            // e.g. when caught in the gravity of a snap point, sqrt(closest_dist2) could be 45-50. But if you wait to let the 
+            // distance settle, the true sqrt(closest_dist2) could be 68.
+            // we only add the wait if closest_dist2 is large, so that we don't reduce the efficiency of small adjustments
+            pbf_wait(context, 500ms);
+        }
+        context.wait_for_all_requests();
+    }
+
+}
+
+// While in the current map zoom level, detect pokecenter icons and move the map cursor there.
+// Return true if succeed. Return false if no visible pokcenter on map
+bool detect_closest_flypoint_and_move_map_cursor_there(
+    const ProgramInfo& info,
+    VideoStream& stream,
+    ProControllerContext& context,
+    FlyPoint fly_point,
+    double push_scale
+){
+    context.wait_for_all_requests();
+    const auto snapshot_frame = stream.video().snapshot().frame;
+    const size_t screen_width = snapshot_frame->width();
+    const size_t screen_height = snapshot_frame->height();
+
+    double closest_icon_x = 0., closest_icon_y = 0.;
+    double max_dist = DBL_MAX;
+    const double center_x = 0.5 * screen_width, center_y = 0.5 * screen_height;
+    {
+        std::string fly_point_string = get_flypoint_string(fly_point);
+        const std::vector<ImageFloatBox> found_locations = get_flypoint_locations(info, stream, context, fly_point);
+        if (found_locations.empty()){
+            stream.log("No visible " + fly_point_string + " found on map");
+            stream.overlay().add_log("No whole " + fly_point_string + " icon");
+            return false;
+        }
+        
+        // Find the detected PokeCenter icon closest to the screen center (where player character is on the map).
+        for (const auto& box: found_locations){
+            const double loc_x = (box.x + box.width/2) * screen_width;
+            const double loc_y = (box.y + box.height/2) * screen_height;
+            const double x_diff = loc_x - center_x, y_diff = loc_y - center_y;
+            const double dist2 = x_diff * x_diff + y_diff * y_diff;
+            std::ostringstream os;
+            os << "Found " + fly_point_string + " at box: x=" << box.x << ", y=" << box.y << ", width=" << box.width << ", height=" << box.height << 
+                ", dist to center " << std::sqrt(dist2) << " pixels";
+            stream.log(os.str());
+
+            if (dist2 < max_dist){
+                max_dist = dist2;
+                closest_icon_x = loc_x; closest_icon_y = loc_y;
+            }
+        }
+        stream.log("Found closest " + fly_point_string + " icon on map: (" + std::to_string(closest_icon_x) + ", " + std::to_string(closest_icon_y) + ").");
+        stream.overlay().add_log("Detected " + fly_point_string + " icon");
+    }
+
+    // Convert the vector from center to the PokeCenter icon into a left joystick movement
+    const double dif_x = (closest_icon_x - center_x) * 1920/ screen_width;
+    const double dif_y = (closest_icon_y - center_y) * 1080/ screen_height;
+    const double magnitude = std::max(std::sqrt(max_dist), 1.0);
+    const double push_x = dif_x * 0.5 / magnitude, push_y = dif_y * 0.5 / magnitude;
+
+    // 0.5 is too large, 0.25 a little too small, 0.30 is a bit too much for a far-away pokecenter
+    const double scale = push_scale;
+
+    const double move_x = std::max(std::min(push_x, +1.0), -1.0);
+    const double move_y = -std::max(std::min(push_y, +1.0), -1.0);
+
+    stream.overlay().add_log("Move Cursor to PokeCenter", COLOR_WHITE);
+    const uint16_t push_time_ticks = std::max(uint16_t(magnitude * scale + 0.5), uint16_t(3));
+    Milliseconds push_time = push_time_ticks * 8ms;
+    pbf_move_left_joystick(context, {move_x, move_y}, push_time, 240ms);
+    context.wait_for_all_requests();
+    return true;
+}
+
+// While in the current map zoom level, detect pokecenter icons and fly to the closest one.
+// Return true if succeed. Return false if no visible pokcenter on map
+// Throw Operation failed Exception if detected pokecenter, but failed to fly there.
+bool fly_to_visible_closest_flypoint_cur_zoom_level(
+    const ProgramInfo& info, 
+    VideoStream& stream,
+    ProControllerContext& context, 
+    FlyPoint fly_point,
+    double push_scale
+){
+    if (!detect_closest_flypoint_and_move_map_cursor_there(info, stream, context, fly_point, push_scale)){
+        return false;
+    }
+    bool check_fly_menuitem = true;
+    const bool success = fly_to_overworld_from_map(info, stream, context, check_fly_menuitem);
+    if (success){
+        return true;
+    }else{
+        // detected pokecenter, but failed to fly there.
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "fly_to_visible_closest_flypoint_cur_zoom_level(): Detected pokecenter, but failed to fly there as no \"Fly\" menuitem.",
+            stream
+        );
+    }
+
+}
+
+
+void fly_to_closest_pokecenter_on_map(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+    const int MAX_TRY_COUNT = 17;
+    int try_count = 0;
+    // Part 1: Tries to detect a pokecenter that is very close to the player
+    // Zoom in one level onto the map.
+    // If the player character icon or any wild pokemon icon overlaps with the PokeCenter icon, the code cannot
+    // detect it. So we zoom in as much as we can to prevent any icon overlap.
+
+    // failures to fly to pokecenter are often when the Switch lags. from my testing, a 1.4-1.5 adjustment factor seems to work
+    const std::array<double, MAX_TRY_COUNT> adjustment_table =  {1, 1.4, 1, 1, 1.1, 1.2, 1.3, 1.4, 1.5, 1.6, 1.7, 1.8, 1.9, 2.0, 0.9, 0.8, 1.4}; // {1, 1.4, 1.5};
+    
+    while(true){
+        try{
+            pbf_press_button(context, BUTTON_ZR, 320ms, 800ms);
+            // try different magnitudes of cursor push with each failure.
+            double push_scale = 0.29 * adjustment_table[try_count];
+            // std::cout << "push_scale: " << std::to_string(push_scale) << std::endl;
+            if (fly_to_visible_closest_flypoint_cur_zoom_level(info, stream, context, FlyPoint::POKECENTER, push_scale)){
+                return; // success in finding the closest pokecenter. Return.
+            }
+
+            // no visible pokecenters at this zoom level. Move on to part 2.
+            break;
+        }catch (OperationFailedException&){ // pokecenter was detected, but failed to fly there
+            try_count++;
+            if (try_count >= MAX_TRY_COUNT){
+                OperationFailedExceptionWithScreenshot::fire(
+                    ErrorReportMode::SEND_ERROR_REPORT,
+                    "fly_to_closest_pokecenter_on_map(): At min warpable map level, pokecenter was detected, but failed to fly there.",
+                    stream
+                );                
+            }
+            stream.log("Failed to find the fly menu item. Restart the closest Pokecenter travel process.");
+            press_Bs_to_back_to_overworld(info, stream, context);
+            open_map_from_overworld(info, stream, context);
+        }
+    }
+
+    // Part 2: Tries to detect any pokecenter that is overlapped with the player.
+    // Zoom out to the max warpable level and try pressing on the player character.
+    stream.log("Zoom to max map level to try searching for Pokecenter again.");
+    stream.overlay().add_log("Pokecenter Icon occluded");
+    pbf_press_button(context, BUTTON_ZL, 320ms, 800ms);
+    pbf_press_button(context, BUTTON_ZL, 320ms, 800ms);
+
+    const bool check_fly_menuitem = true;
+    if (fly_to_overworld_from_map(info, stream, context, check_fly_menuitem)){
+        return; // success in flying to the pokecenter that overlaps with the player character at max warpable level.
+    }
+
+    // Failed to find pokecenter overlapping with player
+    stream.log("No PokeCenter icon overlapping with the player character on the max warpable level");
+    stream.overlay().add_log("No overlapping PokeCenter");
+    // press B to close the destination menu item
+    pbf_press_button(context, BUTTON_B, 480ms, 800ms);
+
+
+    // Part 3: Tries to detect a pokecenter that is further away from the player, while at max warpable level
+    try_count = 0;
+    while(true){
+        try{
+            double push_scale = 0.29 * adjustment_table[try_count];
+            // std::cout << "push_scale: " << std::to_string(push_scale) << std::endl;
+            // Now try finding the closest pokecenter at the max warpable level
+            if (fly_to_visible_closest_flypoint_cur_zoom_level(info, stream, context, FlyPoint::POKECENTER, push_scale)){
+                return; // success in finding the closest pokecenter. Return.
+            }else{
+                // Does not detect any pokecenter on map
+                stream.overlay().add_log("Still no PokeCenter Found!", COLOR_RED);
+                OperationFailedExceptionWithScreenshot::fire(
+                    ErrorReportMode::SEND_ERROR_REPORT,
+                    "fly_to_closest_pokecenter_on_map(): At max warpable map level, still cannot find PokeCenter icon.",
+                    stream
+                );
+            }
+        }catch (OperationFailedException&){ 
+            try_count++;
+            if (try_count >= MAX_TRY_COUNT){
+                // either: 
+                // - pokecenter was detected, but failed to fly there. 
+                // - could not find pokecenter icon.
+                throw;
+            }
+            stream.log("Failed to find the fly menuitem. Restart the closest Pokecenter travel process.");
+            press_Bs_to_back_to_overworld(info, stream, context);
+            open_map_from_overworld(info, stream, context);
+            // zoom out to max warpable level
+            pbf_press_button(context, BUTTON_ZL, 320ms, 800ms);
+        }
+    }
+}
+
+void jump_off_wall_until_map_open(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+    for (auto i = 0; i < 3; i++){
+        pbf_press_button(context, BUTTON_L, 400ms, 400ms);
+        pbf_press_button(context, BUTTON_B, 400ms, 400ms);
+        pbf_move_left_joystick(context, {0, -1}, 800ms, 400ms);
+        context.wait_for_all_requests();
+        try{
+            open_map_from_overworld(info, stream, context);
+            break;
+        }
+        catch(...){
+            stream.log("Failed to open map.");
+        }
+        if (i >= 3){
+            stream.log("Could not escape wall.");
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "jump_off_wall_until_map_open(): Could not escape wall.",
+                stream
+            );
+        }
+    }
+}
+
+// Open map and teleport back to town pokecenter
+void reset_to_pokecenter(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+    while (true){
+        try{
+            open_map_from_overworld(info, stream, context);
+            fly_to_closest_pokecenter_on_map(info, stream, context);
+            break;
+        }catch (UnexpectedBattleException&){
+            run_wild_battle_press_A(stream, context, BattleStopCondition::STOP_OVERWORLD);
+        }
+    }
+
+}
+
+
+
+void walk_forward_until_dialog(
+    const ProgramInfo& info, 
+    VideoStream& stream,
+    ProControllerContext& context,
+    NavigationMovementMode movement_mode,
+    Milliseconds timeout,
+    double x,
+    double y
+){
+
+    DialogBoxWatcher dialog(COLOR_RED, true);
+    context.wait_for_all_requests();
+    int ret = run_until<ProControllerContext>(
+        stream, context,
+        [&](ProControllerContext& context){
+            ssf_press_left_joystick(context, {x, y}, 0ms, timeout);
+            if (movement_mode == NavigationMovementMode::DIRECTIONAL_ONLY){
+                pbf_wait(context, timeout);
+            }else if (movement_mode == NavigationMovementMode::DIRECTIONAL_SPAM_A){
+                pbf_mash_button(context, BUTTON_A, timeout);
+                // for (size_t j = 0; j < seconds_timeout; j++){
+                //     pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+                // }
+            }
+        },
+        {dialog}
+    );
+    context.wait_for(std::chrono::milliseconds(100));
+
+    switch (ret){
+    case 0: // dialog
+        stream.log("walk_forward_until_dialog(): Detected dialog.");
+        return;
+    default:
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "walk_forward_until_dialog(): Timed out. Did not detect dialog.",
+            stream
+        );
+    }
+}
+
+void walk_forward_while_clear_front_path(
+    const ProgramInfo& info, 
+    VideoStream& stream,
+    ProControllerContext& context,
+    Milliseconds forward_duration,
+    double y,
+    Milliseconds duration_between_lets_go,
+    Milliseconds delay_after_lets_go
+){
+    context.wait_for_all_requests();
+    pbf_press_button(context, BUTTON_R, 160ms, delay_after_lets_go);
+
+    Milliseconds milliseconds_left = forward_duration;
+    while (true){
+
+        if (milliseconds_left < duration_between_lets_go){
+            pbf_move_left_joystick(context, {0, y}, milliseconds_left, 160ms);
+            context.wait_for_all_requests();
+            stream.log("walk_forward_while_clear_front_path() duration traveled: " + std::to_string(forward_duration.count()) + "ms");
+            break;
+        }
+
+        pbf_move_left_joystick(context, {0, y}, duration_between_lets_go, 160ms);
+        milliseconds_left -= duration_between_lets_go;
+
+        context.wait_for_all_requests();
+        stream.log("walk_forward_while_clear_front_path() duration traveled: " + std::to_string(forward_duration.count() - milliseconds_left.count()) + "ms");
+
+        pbf_press_button(context, BUTTON_R, 160ms, delay_after_lets_go);
+        
+
+    }
+}
+
+
+bool attempt_fly_to_overlapping_flypoint(
+    const ProgramInfo& info, 
+    VideoStream& stream,
+    ProControllerContext& context
+){
+    while (true){
+        try{
+            open_map_from_overworld(info, stream, context, false);
+            context.wait_for_all_requests();
+            pbf_press_button(context, BUTTON_ZL, 320ms, 800ms);
+
+            return fly_to_overworld_from_map(info, stream, context, true);
+
+        }catch (UnexpectedBattleException&){
+            run_wild_battle_press_A(stream, context, BattleStopCondition::STOP_OVERWORLD);
+        }
+    }
+
+}
+
+void fly_to_overlapping_flypoint(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+    if (!attempt_fly_to_overlapping_flypoint(info, stream, context)){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "Failed to reset to overlapping Pokecenter.",
+            stream
+        );
+    }
+}
+
+void confirm_no_overlapping_flypoint(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+    if (attempt_fly_to_overlapping_flypoint(info, stream, context)){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "Overlapping fly detected, when it wasn't expected.",
+            stream
+        );
+    }
+}
+
+
+void heal_at_pokecenter(
+    const ProgramInfo& info, 
+    VideoStream& stream,
+    ProControllerContext& context
+){
+    context.wait_for_all_requests();
+    
+    // if (!attempt_fly_to_overlapping_flypoint(info, stream, context)){
+    //     OperationFailedExceptionWithScreenshot::fire(
+    //         ErrorReportMode::SEND_ERROR_REPORT,
+    //         "Failed to fly to pokecenter.",
+    //         stream
+    //     );  
+    // }           
+    uint16_t seconds_timeout = 60;
+
+    // re-orient camera
+    pbf_press_button(context, BUTTON_L, 160ms, 160ms);
+    // move towards pokecenter
+    pbf_move_left_joystick(context, {0, -1}, 800ms, 160ms);
+    // re-orient camera
+    pbf_press_button(context, BUTTON_L, 160ms, 160ms);
+
+    bool seen_prompt = false;
+
+    while (true){
+        OverworldWatcher    overworld(stream.logger(), COLOR_CYAN);
+        // TODO: test the Prompt watcher on all languages. Ensure FloatBox is sized correctly.
+        PromptDialogWatcher prompt(COLOR_YELLOW, {0.50, 0.400, 0.400, 0.320}); // 0.50, 0.400, 0.400, 0.080  // 0.630, 0.400, 0.100, 0.080 // {0.50, 0.40, 0.40, 0.50}
+        AdvanceDialogWatcher    advance_dialog(COLOR_RED);
+        TutorialWatcher     tutorial(COLOR_RED);
+        context.wait_for_all_requests();
+
+        int ret = wait_until(
+            stream, context,
+            std::chrono::seconds(seconds_timeout),
+            {overworld, prompt, advance_dialog, tutorial}
+        );
+        context.wait_for(std::chrono::milliseconds(100));
+
+        switch (ret){
+        case 0: // overworld
+            stream.log("heal_at_pokecenter: Detected overworld.");
+            if (seen_prompt){ 
+                // if have seen the prompt dialog and are now in overworld, assume we have healed
+                stream.log("heal_at_pokecenter: Done healing.");
+                return;
+            }
+            pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+            break;
+        case 1: // prompt
+            stream.log("heal_at_pokecenter: Detected prompt.");
+            seen_prompt = true;
+            pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+            break;
+        case 2: // advance dialog
+            stream.log("heal_at_pokecenter: Detected advance dialog.");
+            pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+            break;
+        case 3: // tutorial
+            stream.log("heal_at_pokecenter: Detected tutorial.");
+            pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+            break;   
+        default:
+            stream.log("heal_at_pokecenter: Timed out.");
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "Failed to heal at pokecenter.",
+                stream
+            );  
+        }
+    }
+}
+
+
+// spam A button to choose the first move
+// throw exception if wipeout or if your lead faints.
+void run_battle_press_A(
+    VideoStream& stream,
+    ProControllerContext& context,
+    BattleStopCondition stop_condition,
+    std::unordered_set<CallbackEnum> enum_optional_callbacks,
+    bool detect_wipeout
+){
+    int16_t num_times_seen_overworld = 0;
+    size_t consecutive_move_select = 0;
+    while (true){
+        NormalBattleMenuWatcher battle(COLOR_BLUE);
+        SwapMenuWatcher         fainted(COLOR_PURPLE);
+        OverworldWatcher        overworld(stream.logger(), COLOR_CYAN);
+        AdvanceDialogWatcher    dialog(COLOR_RED);
+        DialogArrowWatcher dialog_arrow(COLOR_RED, stream.overlay(), {0.850, 0.820, 0.020, 0.050}, 0.8365, 0.846);
+        GradientArrowWatcher next_pokemon(COLOR_BLUE, GradientArrowType::RIGHT, {0.50, 0.51, 0.30, 0.10});
+        GradientArrowWatcher bag(COLOR_BLUE, GradientArrowType::RIGHT, {0.10, 0.10, 0.05, 0.90});
+        MoveSelectWatcher move_select_menu(COLOR_YELLOW);
+        GradientArrowWatcher select_move_target(COLOR_BLUE, GradientArrowType::DOWN, {0.38, 0.08, 0.25, 0.1});
+
+        std::vector<PeriodicInferenceCallback> callbacks; 
+        std::vector<CallbackEnum> enum_all_callbacks;
+        //  mandatory callbacks: Battle, Overworld, Advance Dialog, Swap menu, Move select
+        //  optional callbacks: DIALOG_ARROW, NEXT_POKEMON, SELECT_MOVE_TARGET, BATTLE_BAG
+
+        // merge the mandatory and optional callbacks as a set, to avoid duplicates. then convert to vector
+        std::unordered_set<CallbackEnum> enum_all_callbacks_set{CallbackEnum::BATTLE, CallbackEnum::OVERWORLD, CallbackEnum::ADVANCE_DIALOG, CallbackEnum::SWAP_MENU, CallbackEnum::MOVE_SELECT}; // mandatory callbacks
+        enum_all_callbacks_set.insert(enum_optional_callbacks.begin(), enum_optional_callbacks.end()); // append the mandatory and optional callback sets together
+        enum_all_callbacks.assign(enum_all_callbacks_set.begin(), enum_all_callbacks_set.end());
+
+        for (const CallbackEnum& enum_callback : enum_all_callbacks){
+            switch(enum_callback){
+            case CallbackEnum::ADVANCE_DIALOG:
+                callbacks.emplace_back(dialog);
+                break;                
+            case CallbackEnum::OVERWORLD:
+                callbacks.emplace_back(overworld);
+                break;
+            case CallbackEnum::DIALOG_ARROW:
+                callbacks.emplace_back(dialog_arrow);
+                break;
+            case CallbackEnum::BATTLE:
+                callbacks.emplace_back(battle);
+                break;
+            case CallbackEnum::NEXT_POKEMON: // to detect the "next pokemon" prompt.
+                callbacks.emplace_back(next_pokemon);
+                break;
+            case CallbackEnum::SWAP_MENU:  // detecting Swap Menu implies your lead fainted.
+                callbacks.emplace_back(fainted);
+                break;                     
+            case CallbackEnum::MOVE_SELECT:
+                callbacks.emplace_back(move_select_menu);
+                break;
+            case CallbackEnum::SELECT_MOVE_TARGET:
+                callbacks.emplace_back(select_move_target);
+                break;
+            case CallbackEnum::BATTLE_BAG:
+                callbacks.emplace_back(bag);
+                break;
+            default:
+                throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "run_battle_press_A: Unknown callback requested.");
+            }
+        }        
+        context.wait_for_all_requests();
+
+        int ret = wait_until(
+            stream, context,
+            std::chrono::seconds(360),
+            callbacks
+        );
+        context.wait_for(std::chrono::milliseconds(100));
+        if (ret < 0){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "run_battle_press_A(): Timed out. Did not detect expected stop condition.",
+                stream
+            );
+        }        
+
+        CallbackEnum enum_callback = enum_all_callbacks[ret];
+        switch (enum_callback){
+        case CallbackEnum::BATTLE: // battle
+            stream.log("Detected battle menu.");
+            consecutive_move_select = 0;
+            pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+            break;
+        case CallbackEnum::MOVE_SELECT:
+            stream.log("Detected move select. Spam first move");
+            consecutive_move_select++;
+            select_top_move(stream, context, consecutive_move_select);
+            break;
+        case CallbackEnum::OVERWORLD: // overworld
+            stream.log("Detected overworld, battle over.");
+            num_times_seen_overworld++;
+            if (stop_condition == BattleStopCondition::STOP_OVERWORLD){
+                return;
+            }
+            if(num_times_seen_overworld > 30){
+                OperationFailedExceptionWithScreenshot::fire(
+                    ErrorReportMode::SEND_ERROR_REPORT,
+                    "run_battle_press_A(): Stuck in overworld. Did not detect expected stop condition.",
+                    stream
+                );  
+            }            
+            break;
+        case CallbackEnum::ADVANCE_DIALOG: // advance dialog
+            stream.log("Detected dialog.");
+
+            if (detect_wipeout){
+                context.wait_for_all_requests();
+                WipeoutDetector wipeout;
+                VideoSnapshot screen = stream.video().snapshot();
+                // dump_snapshot(console);
+                if (wipeout.detect(screen)){
+                    OperationFailedExceptionWithScreenshot::fire(
+                        ErrorReportMode::SEND_ERROR_REPORT,
+                        "run_battle_press_A(): Detected wipeout. All pokemon fainted.",
+                        stream
+                    );                
+                }
+            }
+
+            if (stop_condition == BattleStopCondition::STOP_DIALOG){
+                return;
+            }
+            pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+            break;
+        case CallbackEnum::DIALOG_ARROW:  // dialog arrow
+            stream.log("run_battle_press_A: Detected dialog arrow.");
+            pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+            break;
+        case CallbackEnum::NEXT_POKEMON:
+            stream.log("run_battle_press_A: Detected prompt for bringing in next pokemon. Keep current pokemon.");
+            pbf_mash_button(context, BUTTON_B, 800ms);
+            break;
+        case CallbackEnum::SWAP_MENU:
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "run_battle_press_A(): Lead pokemon fainted.",
+                stream
+            );    
+        case CallbackEnum::SELECT_MOVE_TARGET:
+            stream.log("run_battle_press_A: Detected arrows to select move target. Press A.");
+            pbf_mash_button(context, BUTTON_A, 800ms);
+            break;
+        case CallbackEnum::BATTLE_BAG:
+            stream.log("run_battle_press_A: Detected Bag. Press B. Hold Dpad Up so cursor is back on 'Battle'.");
+            pbf_mash_button(context, BUTTON_B, 800ms);
+            pbf_press_dpad(context, DPAD_UP, 2000ms, 100ms);
+            break;
+        default:
+            throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "run_battle_press_A: Unknown callback triggered.");
+          
+        }
+    }
+}
+
+void run_trainer_double_battle_press_A(
+    VideoStream& stream,
+    ProControllerContext& context,
+    BattleStopCondition stop_condition,
+    std::unordered_set<CallbackEnum> enum_optional_callbacks,
+    bool detect_wipeout
+){
+    enum_optional_callbacks.insert(CallbackEnum::SELECT_MOVE_TARGET);  // always check for the "Select Move target" arrow, for double battles
+    run_battle_press_A(stream, context, stop_condition, enum_optional_callbacks, detect_wipeout);
+}
+
+void run_trainer_battle_press_A(
+    VideoStream& stream,
+    ProControllerContext& context,
+    BattleStopCondition stop_condition,
+    std::unordered_set<CallbackEnum> enum_optional_callbacks,
+    bool detect_wipeout
+){
+    enum_optional_callbacks.insert(CallbackEnum::NEXT_POKEMON);  // always check for the "Next pokemon" prompt when in trainer battles
+    run_battle_press_A(stream, context, stop_condition, enum_optional_callbacks, detect_wipeout);
+}
+
+void run_wild_battle_press_A(
+    VideoStream& stream,
+    ProControllerContext& context,
+    BattleStopCondition stop_condition,
+    std::unordered_set<CallbackEnum> enum_optional_callbacks,
+    bool detect_wipeout
+){
+    enum_optional_callbacks.insert(CallbackEnum::BATTLE_BAG);  // check for Bag.
+    run_battle_press_A(stream, context, stop_condition, enum_optional_callbacks, detect_wipeout);
+}
+
+
+
+void select_top_move(VideoStream& stream, ProControllerContext& context, size_t consecutive_move_select){
+    if (consecutive_move_select > 3){
+        // to handle case where move is disabled/out of PP/taunted
+        stream.log("Failed to select a move 3 times. Choosing a different move.", COLOR_RED);
+        pbf_press_dpad(context, DPAD_DOWN, 160ms, 320ms);
+    }
+    pbf_mash_button(context, BUTTON_A, 800ms);
+
+}
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h
new file mode 100644
index 0000000000..9c995410ad
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h
@@ -0,0 +1,225 @@
+/*  PokemonSV World Navigation
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  Move player character around the overworld
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_WorldNavigation_H
+#define PokemonAutomation_PokemonSV_WorldNavigation_H
+
+#include <unordered_set>
+#include "CommonFramework/Tools/VideoStream.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+#include "VideoGames/PokemonSV/Inference/PokemonSV_MainMenuDetector.h"
+
+namespace PokemonAutomation{
+    struct ProgramInfo;
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+enum class PlayerRealignMode{
+    REALIGN_NEW_MARKER,
+    REALIGN_OLD_MARKER,
+    REALIGN_NO_MARKER,
+};
+
+enum class NavigationMovementMode{
+    DIRECTIONAL_ONLY,
+    DIRECTIONAL_SPAM_A,
+    CLEAR_WITH_LETS_GO,
+};
+
+enum class FlyPoint{
+    POKECENTER,
+    FAST_TRAVEL,
+};
+struct ExpectedMarkerPosition{
+    double x;
+    double y;
+};
+
+enum class BattleStopCondition{
+    STOP_OVERWORLD,
+    STOP_DIALOG,
+};
+
+enum class CallbackEnum{
+    ADVANCE_DIALOG,
+    OVERWORLD,
+    PROMPT_DIALOG,
+    WHITE_A_BUTTON,
+    DIALOG_ARROW,
+    BATTLE,
+    TUTORIAL,
+    BLACK_DIALOG_BOX,
+    NEXT_POKEMON,
+    SWAP_MENU,
+    MOVE_SELECT,
+    SELECT_MOVE_TARGET,
+    BATTLE_BAG,
+};
+
+enum class ZoomChange{
+    ZOOM_IN,
+    ZOOM_IN_TWICE,
+    ZOOM_OUT,
+    ZOOM_OUT_TWICE,
+    KEEP_ZOOM,
+};
+
+struct MoveCursor{
+    ZoomChange zoom_change;
+    double move_x;
+    double move_y;
+    Milliseconds move_duration;
+};
+
+//  From map, press A to fly to a travel spot.
+//  check_fly_menuitem == true: will detect if the "Fly" menuitem is available. Return false if no "Fly" menuitem (the game
+//    will be on the map menu opened state). Return true if the flight is successful (the game will be at the overworld).
+//  check_fly_menuitem == false: will use GradientArrowDetector to check if a map menu is opened. No "Fly" menuitem check.
+//    The function always returns true. It throws an error in the case of no "Fly" menuitem. But the error message will be about
+//    timeout running the function.
+bool fly_to_overworld_from_map(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context, bool check_fly_menuitem = false);
+
+//  Assume the user can set up picnic at current location, start picnic from overworld.
+void picnic_from_overworld(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context);
+
+//  While in picnic, stop picnic and back to overworld.
+void leave_picnic(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context);
+
+void print_flypoint_location(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context, FlyPoint fly_point);
+
+void place_marker_offset_from_flypoint(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context, MoveCursor move_cursor_near_flypoint, FlyPoint fly_point, ExpectedMarkerPosition marker_offset);
+
+// with the map open, move the cursor to a specific position offset from the flypoint, as per marker_offset
+// throw exception if no flypoints visible on map
+void move_cursor_to_position_offset_from_flypoint(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context, FlyPoint fly_point, ExpectedMarkerPosition marker_offset);
+
+// While in the current map zoom level, detect pokecenter icons and move the map cursor there.
+// Return true if succeed. Return false if no visible pokcenter on map
+bool detect_closest_flypoint_and_move_map_cursor_there(
+    const ProgramInfo& info,
+    VideoStream& stream,
+    ProControllerContext& context,
+    FlyPoint fly_point,
+    double push_scale = 0.29
+);
+
+bool fly_to_visible_closest_flypoint_cur_zoom_level(
+    const ProgramInfo& info, 
+    VideoStream& stream,
+    ProControllerContext& context, 
+    FlyPoint fly_point,
+    double push_scale = 0.29
+);
+
+//  While on map (default zoom), move to the closest PokeCenter and fly there.
+//  The PokeCenter must be already visited before (so having the little wing icon with it) and not occluded
+//  by other map icons on the most zoomed-in level of the map.
+void fly_to_closest_pokecenter_on_map(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context);
+
+// Attempt to escape being stuck on a wall.
+// Repeatedly center camera and try to backwards jump off.
+// Finishes when map is successfully open.
+void jump_off_wall_until_map_open(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context);
+
+void reset_to_pokecenter(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context);
+
+
+
+
+
+
+void walk_forward_until_dialog(
+    const ProgramInfo& info, 
+    VideoStream& stream,
+    ProControllerContext& context,
+    NavigationMovementMode movement_mode,
+    Milliseconds timeout = Milliseconds(10000),
+    double x = 0,
+    double y = +1
+);
+
+// walk forward while using lets go to clear the path
+// forward_duration: number of ticks to walk forward
+// y = 0: walks forward. y = 128: stand in place. y = 255: walk backwards (towards camera)
+// duration_between_lets_go: milliseconds between firing off Let's go to clear the path from wild pokemon
+// delay_after_lets_go: milliseconds to wait after firing off Let's go.
+void walk_forward_while_clear_front_path(
+    const ProgramInfo& info, 
+    VideoStream& stream,
+    ProControllerContext& context,
+    Milliseconds forward_duration,
+    double y = +1,
+    Milliseconds duration_between_lets_go = Milliseconds(1000),
+    Milliseconds delay_after_lets_go = Milliseconds(2000)
+);
+
+// fly to the pokecenter that overlaps with the player on the map, and return true.
+// if no overlapping pokecenter, return false.
+bool attempt_fly_to_overlapping_flypoint(
+    const ProgramInfo& info, 
+    VideoStream& stream,
+    ProControllerContext& context
+);
+
+// fly to the pokecenter that overlaps with the player on the map
+// throw exception if unsuccessful
+void fly_to_overlapping_flypoint(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context);
+
+// throw exception if there is a fly point/pokecenter that overlaps with the player on the map
+void confirm_no_overlapping_flypoint(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context);
+
+
+// heal at the pokecenter, that your character is currently at.
+// if not currently at the pokecenter, throws error.
+void heal_at_pokecenter(
+    const ProgramInfo& info, 
+    VideoStream& stream,
+    ProControllerContext& context
+);
+
+// spam A button to choose the first move for double trainer battles
+// detect_wipeout: can be false if you have multiple pokemon in your party, since an exception will be thrown if your lead faints.
+// throw exception if wipeout or if your lead faints.
+void run_trainer_double_battle_press_A(
+    VideoStream& stream,
+    ProControllerContext& context,
+    BattleStopCondition stop_condition,
+    std::unordered_set<CallbackEnum> enum_optional_callbacks = {},
+    bool detect_wipeout = false
+);
+
+
+// spam A button to choose the first move for trainer battles
+// detect_wipeout: can be false if you have multiple pokemon in your party, since an exception will be thrown if your lead faints.
+// throw exception if wipeout or if your lead faints.
+void run_trainer_battle_press_A(
+    VideoStream& stream,
+    ProControllerContext& context,
+    BattleStopCondition stop_condition,
+    std::unordered_set<CallbackEnum> enum_optional_callbacks = {},
+    bool detect_wipeout = false
+);
+
+// spam A button to choose the first move for wild battles
+// detect_wipeout: can be false if you have multiple pokemon in your party, since an exception will be thrown if your lead faints.
+// throw exception if wipeout or if your lead faints.
+void run_wild_battle_press_A(
+    VideoStream& stream,
+    ProControllerContext& context,
+    BattleStopCondition stop_condition,
+    std::unordered_set<CallbackEnum> enum_optional_callbacks = {},
+    bool detect_wipeout = false
+);
+
+void select_top_move(VideoStream& stream, ProControllerContext& context, size_t consecutive_move_select);
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Sandwiches/PokemonSV_IngredientSession.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Sandwiches/PokemonSV_IngredientSession.cpp
new file mode 100644
index 0000000000..38c97cc00e
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Sandwiches/PokemonSV_IngredientSession.cpp
@@ -0,0 +1,392 @@
+/*  Ingredient Session
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <algorithm>
+#include "Common/Cpp/Containers/FixedLimitVector.tpp"
+#include "Common/Cpp/PrettyPrint.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/Tools/GlobalThreadPools.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "VideoGames/PokemonSV/Resources/PokemonSV_Ingredients.h"
+#include "PokemonSV_IngredientSession.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+IngredientSession::~IngredientSession() = default;
+
+IngredientSession::IngredientSession(
+    VideoStream& stream, ProControllerContext& context,
+    Language language, SandwichIngredientType type
+)
+    : m_stream(stream)
+    , m_context(context)
+    , m_language(language)
+    , m_overlays(stream.overlay())
+    , m_type(type)
+    , m_num_confirmed(0)  // Starts at 0, increments as ingredients are confirmed added
+    , m_arrow(COLOR_CYAN, GradientArrowType::RIGHT, {0.02, 0.15, 0.05, 0.80})  // Detects cursor arrow
+{
+    SandwichIngredientReader reader(m_type, COLOR_CYAN);
+    reader.make_overlays(m_overlays);
+}
+
+
+
+// Reads and analyzes one screenshot of the ingredient menu.
+// Uses dual detection: OCR for all lines of ingredient names, and sprite matching for the cursor selected ingredient.
+// This redundancy removes OCR ambiguity on the cursor selected ingredient.
+//
+// Process:
+// 1. Detect cursor position using gradient arrow detector
+// 2. Calculate which line (0-9) the cursor is on based on Y position
+// 3. Run parallel OCR on all 10 lines to read ingredient names
+// 4. Run sprite matching on the selected item's icon for confirmation
+// 5. Cross-reference OCR and sprite results for the selected item to remove redundancy
+//
+// Returns: PageIngredients with detected cursor position and ingredient slugs.
+//   It guarantees the cursor selected ingredient has no ambigurity (its line in PageIngredients::item[] has size of 1).
+PageIngredients IngredientSession::read_screen(std::shared_ptr<const ImageRGB32> screen) const{
+    PageIngredients ret;
+    ImageFloatBox box;
+
+    // Step 1: Detect the cyan gradient arrow that indicates cursor position
+    if (!m_arrow.detect(box, *screen)){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "IngredientSession::read_current_page(): Unable to find cursor.",
+            m_stream
+        );
+    }
+
+    // Step 2: Calculate which line (slot) the cursor is on based on arrow Y position
+    // Menu lines are evenly spaced, starting at Y=0.177778 with spacing of 0.0738683
+    double slot = (box.y - 0.177778) / 0.0738683;
+    ret.selected = (int8_t)(slot + 0.5);
+
+    // Throws if cursor is not within expected range (0-9 for 10 lines per page)
+    if (ret.selected < 0 || ret.selected >= 10){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "IngredientSession::read_current_page(): Invalid cursor slot.",
+            m_stream,
+            screen
+        );
+    }
+
+    // Step 3 & 4: Run parallel OCR on all lines + sprite matching on selected item
+    // Uses thread pool to speed up inference (11 tasks: 10 OCR + 1 sprite match)
+    ImageMatch::ImageMatchResult image_result;
+    SandwichIngredientReader reader(m_type);
+    GlobalThreadPools::computation_normal().run_in_parallel(
+        [&](size_t index){
+            if (index < SandwichIngredientReader::INGREDIENT_PAGE_LINES){
+                // Task 0-9: OCR text detection on each of the 10 visible lines
+                OCR::StringMatchResult result = reader.read_ingredient_page_with_ocr(*screen, m_stream.logger(), m_language, index);
+                // Filter out low-confidence OCR matches
+                result.clear_beyond_log10p(SandwichFillingOCR::MAX_LOG10P);
+                result.clear_beyond_spread(SandwichFillingOCR::MAX_LOG10P_SPREAD);
+                // Store all plausible ingredient slugs for this line
+                for (auto& item : result.results){
+                    ret.item[index].insert(item.second.token);
+                }
+            }else{
+                // Task 10: Sprite matching on the selected item's icon (for confirmation)
+                image_result = reader.read_ingredient_page_with_icon_matcher(*screen, ret.selected);
+                // Filter out low-confidence sprite matches
+                image_result.clear_beyond_spread(SandwichIngredientReader::ALPHA_SPREAD);
+                image_result.log(m_stream.logger(), SandwichIngredientReader::MAX_ALPHA);
+                image_result.clear_beyond_alpha(SandwichIngredientReader::MAX_ALPHA);
+            }
+        },
+        0, SandwichIngredientReader::INGREDIENT_PAGE_LINES + 1
+    );
+
+#if 1
+    // Step 5: Cross-reference OCR and sprite matching for the selected item
+    // This disambiguation logic reduces false positives by requiring both methods to agree
+    do{
+        std::set<std::string>& ocr_result = ret.item[ret.selected];
+
+        // Special case: If OCR completely failed but sprite matching found exactly one match,
+        // trust the sprite result (OCR is less reliable than sprite matching)
+        if (ocr_result.empty() || image_result.results.size() == 1){
+            ocr_result.insert(image_result.results.begin()->second);
+            break;
+        }
+
+        // Find ingredients that both OCR and sprite matching agree on
+        // This intersection is our most confident result
+        std::set<std::string> common;
+        for (auto& item : image_result.results){
+            auto iter = ocr_result.find(item.second);
+            if (iter != ocr_result.end()){
+                common.insert(item.second);
+            }
+        }
+
+        // Error: OCR and sprite matching found no common ingredients
+        // This indicates a serious detection failure
+        if (common.empty()){
+            std::set<std::string> sprite_result;
+            for (const auto& p : image_result.results){
+                sprite_result.insert(p.second);
+            }
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "IngredientSession::read_current_page(): Unable to read selected item. OCR and sprite do not agree on any match: ocr "
+                + set_to_str(ocr_result) + ", sprite " + set_to_str(sprite_result),
+                m_stream,
+                screen
+            );
+        }
+
+        // Error: Multiple ingredients match both OCR and sprite (ambiguous)
+        if (common.size() > 1){
+            std::set<std::string> sprite_result;
+            for (const auto& p : image_result.results){
+                sprite_result.insert(p.second);
+            }
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "IngredientSession::read_current_page(): Unable to read selected item. Ambiguous result: "
+                + set_to_str(ocr_result) + ", " + set_to_str(sprite_result) + "\n" + language_warning(m_language),
+                m_stream,
+                screen
+            );
+        }
+
+        // Success: Exactly one ingredient matched by both methods
+        // Replace OCR results with the confirmed ingredient
+        ocr_result = std::move(common);
+    }while (false);
+#endif
+
+    return ret;
+}
+
+PageIngredients IngredientSession::read_current_page() const{
+    return read_screen(m_stream.video().snapshot());
+}
+
+bool IngredientSession::run_move_iteration(
+    std::string& slug, const std::map<std::string, uint8_t>& ingredients,
+    const PageIngredients& page
+) const{
+    size_t current_index = page.selected;
+
+    // Find all desired ingredients on this page
+    std::map<size_t, std::string> found_ingredients;  // line_index -> slug
+    for (size_t c = 0; c < SandwichIngredientReader::INGREDIENT_PAGE_LINES; c++){
+        for (const std::string& item : page.item[c]){
+            if (ingredients.find(item) != ingredients.end()){
+                found_ingredients[c] = item;
+            }
+        }
+    }
+
+    if (found_ingredients.empty()){
+        return false;  // None of the desired ingredients are on this page
+    }
+
+    // Choose which ingredient to move to:
+    // - If cursor is below all found ingredients, move to the closest (bottom-most) one
+    // - Otherwise, move to the first (top-most) one
+    size_t target_line_index = 0;
+    if (std::all_of(found_ingredients.begin(), found_ingredients.end(),
+                     [&](const auto& p){return p.first <= current_index;})){
+        target_line_index = found_ingredients.rbegin()->first;  // Closest = bottom-most
+    }else{
+        target_line_index = found_ingredients.begin()->first;   // First = top-most
+    }
+
+    const std::string& item = found_ingredients[target_line_index];
+
+    // Already on target ingredient
+    if (current_index == target_line_index){
+        m_stream.log("Desired ingredient " + item + " is selected!", COLOR_BLUE);
+        slug = item;
+        return true;
+    }
+
+    // Move cursor to target ingredient
+    m_stream.log("Found desired ingredient " + item + " on current page. Moving towards it...", COLOR_BLUE);
+    while (current_index < target_line_index){
+        pbf_press_dpad(m_context, DPAD_DOWN, 80ms, 240ms);
+        current_index++;
+    }
+    while (current_index > target_line_index){
+        pbf_press_dpad(m_context, DPAD_UP, 80ms, 240ms);
+        current_index--;
+    }
+    m_context.wait_for_all_requests();
+    m_context.wait_for(std::chrono::seconds(1));
+    return true;
+}
+
+
+std::string IngredientSession::move_to_ingredient(const std::map<std::string, uint8_t>& ingredients) const{
+    if (ingredients.empty()){
+        m_stream.log("No desired ingredients.", COLOR_RED);
+        return "";
+    }
+
+    // TODO: Gin: we can delete the wait_for here?
+    m_context.wait_for_all_requests();
+    m_context.wait_for(std::chrono::milliseconds(180));
+
+    size_t not_found_count = 0;  // Tracks full scans through menu
+    while (true){
+        // Read current page and try to move to ingredient
+        PageIngredients page = read_current_page();
+        std::string found_ingredient;
+        if (run_move_iteration(found_ingredient, ingredients, page)){
+            // We have found at least one ingredient on the current page:
+            if (!found_ingredient.empty()){
+                // The current cursor is already on a desired ingredient
+                return found_ingredient;
+            }
+            // Desired ingredients found on page but not yet positioned, keep trying
+            continue;
+        }
+
+        // Not found on current page. Check if at end of menu.
+        // If you use DPAD_UP and DPAD_DOWN to move to the last line of the current page, the UI will always
+        // show the next ingredient so that you are never at the last line of a page unless you really reach
+        // the bottom of the menu.
+        size_t current = page.selected;
+        if (current == SandwichIngredientReader::INGREDIENT_PAGE_LINES - 1){  // On last line
+            not_found_count++;
+            if (not_found_count >= 2){
+                // Scanned entire menu twice without finding ingredient
+                m_stream.log("Ingredient not found anywhere.", COLOR_RED);
+                return "";
+            }else{
+                // Wrap around to beginning for second pass
+                m_stream.log("End of page reached without finding ingredient. Wrapping back to beginning.", COLOR_ORANGE);
+                pbf_press_dpad(m_context, DPAD_DOWN, 160ms, 840ms);  // Wraps to top
+                continue;
+            }
+        }
+
+        m_stream.log("Ingredient not found on current page. Jumping down.", COLOR_ORANGE);
+        // Press DPAD_RIGHT to jump to the next screen to have a full page of ingredients to check
+        pbf_press_dpad(m_context, DPAD_RIGHT, 80ms, 240ms);
+        m_context.wait_for_all_requests();
+        m_context.wait_for(std::chrono::milliseconds(180));
+    }
+    return "";
+}
+
+
+void IngredientSession::add_ingredients(
+    VideoStream& stream, ProControllerContext& context,
+    std::map<std::string, uint8_t>&& ingredients  // Modified as items are added
+){
+    // Process ingredients until all are added
+    while (!ingredients.empty()){
+        // Navigate to any remaining ingredient
+        std::string found = this->move_to_ingredient(ingredients);
+        if (found.empty()){
+            const SandwichIngredientNames& name = get_ingredient_name(ingredients.begin()->first);
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::NO_ERROR_REPORT,
+                "Unable to find ingredient: \"" + name.display_name() + "\" - Did you run out?",
+                stream
+            );
+        }
+
+        const SandwichIngredientNames& name = get_ingredient_name(found);
+        stream.log("Add " + name.display_name() + " as ingredient", COLOR_BLUE);
+
+        // Add this ingredient the required number of times.
+        // If you don't have enough number of this ingredient, it throws OperationFailedException.
+        auto iter = ingredients.find(found);
+        SandwichIngredientReader reader(m_type);
+        while (iter->second > 0){  // While quantity remaining > 0
+            bool ingredient_added = false;
+
+            // Try up to 5 times to add and verify
+            for (int attempt = 0; attempt < 5; attempt++){
+                pbf_press_button(context, BUTTON_A, 160ms, 840ms);  // Add ingredient
+                context.wait_for_all_requests();
+
+                // Verify it appeared in confirmed list (bottom of screen)
+                VideoSnapshot image = stream.video().snapshot();
+                ImageMatch::ImageMatchResult image_result =
+                    reader.read_confirmed_list_with_icon_matcher(image, m_num_confirmed);
+                image_result.clear_beyond_spread(SandwichIngredientReader::ALPHA_SPREAD);
+                image_result.clear_beyond_alpha(SandwichIngredientReader::MAX_ALPHA);
+                image_result.log(stream.logger(), SandwichIngredientReader::MAX_ALPHA);
+
+                if (image_result.results.size() > 0){  // Confirmed ingredient was added
+                    stream.overlay().add_log("Added " + name.display_name());
+                    m_num_confirmed++;
+                    ingredient_added = true;
+                    iter->second--;  // Decrement quantity needed
+                    break;
+                }
+            }
+
+            if (!ingredient_added){
+                OperationFailedExceptionWithScreenshot::fire(
+                    ErrorReportMode::NO_ERROR_REPORT,
+                    "Unable to add ingredient: \"" + name.display_name() + "\" - Did you run out?",
+                    stream
+                );
+            }
+        }
+        ingredients.erase(iter);  // Remove fully-added ingredient from map
+    }
+}
+
+
+void add_sandwich_ingredients(
+    VideoStream& stream, ProControllerContext& context,
+    Language language,
+    std::map<std::string, uint8_t>&& fillings,
+    std::map<std::string, uint8_t>&& condiments
+){
+    // Phase 1: Add fillings
+    {
+        IngredientSession session(stream, context, language, SandwichIngredientType::FILLING);
+        session.add_ingredients(stream, context, std::move(fillings));
+        pbf_press_button(context, BUTTON_PLUS, 160ms, 1840ms);  // Advance to condiments menu
+    }
+
+    // Phase 2: Add condiments
+    {
+        IngredientSession session(stream, context, language, SandwichIngredientType::CONDIMENT);
+
+        // Special case: Herba Mystica ingredients are at the bottom of the list
+        // Navigate to bottom first to avoid scrolling through entire menu
+        if (std::any_of(condiments.begin(), condiments.end(),
+                         [&](const auto& p){return p.first.find("herba") != std::string::npos;})){
+            pbf_press_dpad(context, DPAD_UP, 160ms, 840ms);  // Wrap to bottom
+        }
+
+        session.add_ingredients(stream, context, std::move(condiments));
+        pbf_press_button(context, BUTTON_PLUS, 160ms, 1840ms);  // Advance to pick menu
+    }
+
+    // Select the first pick and clear any remaining dialogs to go to stacking minigame.
+    pbf_mash_button(context, BUTTON_A, 1000ms);
+}
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Sandwiches/PokemonSV_IngredientSession.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Sandwiches/PokemonSV_IngredientSession.h
new file mode 100644
index 0000000000..fd2a243278
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Sandwiches/PokemonSV_IngredientSession.h
@@ -0,0 +1,112 @@
+/*  Ingredient Session
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_IngredientSession_H
+#define PokemonAutomation_PokemonSV_IngredientSession_H
+
+#include <map>
+#include <memory>
+#include "CommonFramework/Language.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonFramework/Tools/VideoStream.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_GradientArrowDetector.h"
+#include "VideoGames/PokemonSV/Inference/Picnics/PokemonSV_SandwichIngredientDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+// Detection output of one ingredient menu page: cursor position and detected ingredients per line.
+// Returned by IngredientSession::read_screen()/read_current_page()
+struct PageIngredients{
+    // Line index (0-9) of cursor-selected ingredient. -1 if detection failed.
+    int8_t selected = -1;
+
+    // Detected ingredient slugs for each line (At most INGREDIENT_PAGE_LINES lines). Sets contain
+    // multiple slugs if OCR is ambiguous.
+    std::set<std::string> item[SandwichIngredientReader::INGREDIENT_PAGE_LINES];
+};
+
+
+// Manages navigation and selection of ingredients in the sandwich menu (fillings or condiments).
+// Uses OCR+sprite matching to detect ingredients, navigates cursor, and confirms selections.
+// It's only used in add_sandwich_ingredients() function.
+class IngredientSession{
+public:
+    ~IngredientSession();
+
+    IngredientSession(
+        VideoStream& stream, ProControllerContext& context,
+        Language language, SandwichIngredientType type
+    );
+
+    // Adds ingredients to sandwich by navigating menu, pressing A, and verifying each addition.
+    // Throws if ingredient not found or failed to verify the addition.
+    // Example: {{"lettuce", 2}, {"tomato", 1}} adds 2 lettuce and 1 tomato.
+    void add_ingredients(
+        VideoStream& stream, ProControllerContext& context,
+        std::map<std::string, uint8_t>&& ingredients
+    );
+
+private:
+    // Navigates menu to find and select any ingredient from the set. Scrolls pages as needed.
+    // Returns ingredient slug if found, empty string if not found after checking all pages.
+    std::string move_to_ingredient(const std::map<std::string, uint8_t>& ingredients) const;
+
+    // Reads screenshot with OCR+sprite matching. Detects cursor position and all visible ingredients.
+    // Uses dual detection (OCR + sprite) on selected item to remove OCR ambiguity.
+    PageIngredients read_screen(std::shared_ptr<const ImageRGB32> screenshot) const;
+
+    // Captures current frame and calls read_screen().
+    PageIngredients read_current_page() const;
+
+    // Checks if any desired ingredient is on the current page.
+    // If no desired ingredients found, returns false and does not change `slug`.
+    // If at least one desired ingredients is found:
+    // - If the current cursor is already on a desired ingredient, returns True and sets
+    //   `slug` to the ingredient slug.
+    // - Otherwise, there are at least one desired ingredient at least one line away from
+    //   the cursor. Move the cursor blindly towards the closest ingredient, returns True
+    //   and does not change `slug`.
+    bool run_move_iteration(
+        std::string& slug, const std::map<std::string, uint8_t>& ingredients,
+        const PageIngredients& page
+    ) const;
+
+
+private:
+    VideoStream& m_stream;
+    ProControllerContext& m_context;
+    Language m_language;
+    VideoOverlaySet m_overlays;
+    SandwichIngredientType m_type; // FILLING or CONDIMENT (which menu type)
+    int8_t m_num_confirmed; // Running count of confirmed ingredient additions
+    GradientArrowDetector m_arrow; // Detects the cursor arrow position
+};
+
+
+
+// Adds all fillings and condiments to a sandwich.
+// Navigates both menus, adds ingredients, confirms additions, and mashes A in the end to select the first
+// pick and go to the ingredient stacking mini-game.
+// Note: There is no wait for the microcontroller commands in the final button mashing phase.
+// Throws OperationFailedException if any ingredient not found or addition fails.
+void add_sandwich_ingredients(
+    VideoStream& stream, ProControllerContext& context,
+    Language language,
+    std::map<std::string, uint8_t>&& fillings,     // {slug, quantity} e.g. {{"lettuce", 2}}
+    std::map<std::string, uint8_t>&& condiments    // {slug, quantity} e.g. {{"salt", 1}}
+);
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Sandwiches/PokemonSV_SandwichMaker.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Sandwiches/PokemonSV_SandwichMaker.cpp
new file mode 100644
index 0000000000..25aeab4d61
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Sandwiches/PokemonSV_SandwichMaker.cpp
@@ -0,0 +1,103 @@
+/*  Sandwich Maker
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonTools/StartupChecks/VideoResolutionCheck.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonSV/Programs/Sandwiches/PokemonSV_SandwichRoutines.h"
+#include "PokemonSV_SandwichMaker.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+using namespace Pokemon;
+
+SandwichMaker_Descriptor::SandwichMaker_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonSV:SandwichMaker",
+        STRING_POKEMON + " SV", "Sandwich Maker",
+        "Programs/PokemonSV/SandwichMaker.html",
+        "Make a sandwich of your choice.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+struct SandwichMaker_Descriptor::Stats : public StatsTracker{
+    Stats()
+        : sandwiches(m_stats["Sandwiches"])
+        , errors(m_stats["Errors"])
+    {
+        m_display_order.emplace_back("Sandwiches");
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+    }
+    std::atomic<uint64_t>& sandwiches;
+    std::atomic<uint64_t>& errors;
+};
+
+std::unique_ptr<StatsTracker> SandwichMaker_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+SandwichMaker::SandwichMaker()
+    : SANDWICH_OPTIONS(
+        "Sandwich Options",
+        nullptr,
+        BaseRecipe::non_shiny,
+        false,
+        GroupOption::EnableMode::ALWAYS_ENABLED
+    )
+    , NUM_SANDWICHES(
+        "<b>Number of sandwiches to make:</b><br>Repeatedly make the same sandwich.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        1, 1, 1000
+    )
+    , GO_HOME_WHEN_DONE(false)
+    , NOTIFICATIONS({
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_FATAL,
+        })
+{
+    PA_ADD_OPTION(SANDWICH_OPTIONS);
+    PA_ADD_OPTION(NUM_SANDWICHES);
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+void SandwichMaker::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    assert_16_9_720p_min(env.logger(), env.console);
+
+    //  Connect the controller.
+    require_player(env.console, context, BUTTON_LCLICK);
+
+    SandwichMaker_Descriptor::Stats& stats = env.current_stats<SandwichMaker_Descriptor::Stats>();
+
+    for (int i = 0; i < NUM_SANDWICHES; i++){
+        env.console.log("Making sandwich number: " + std::to_string(i+1), COLOR_ORANGE);
+        stats.sandwiches++;
+        env.update_stats();
+        make_sandwich_option(env, env.console, context, SANDWICH_OPTIONS);
+        enter_sandwich_recipe_list(env.program_info(), env.console, context);
+    }
+
+    GO_HOME_WHEN_DONE.run_end_of_program(context);
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+}
+
+
+}
+}
+}
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Sandwiches/PokemonSV_SandwichMaker.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Sandwiches/PokemonSV_SandwichMaker.h
new file mode 100644
index 0000000000..6713eb84b4
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Sandwiches/PokemonSV_SandwichMaker.h
@@ -0,0 +1,49 @@
+/*  Sandwich Maker
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_SandwichMaker_H
+#define PokemonAutomation_PokemonSV_SandwichMaker_H
+
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+#include "VideoGames/PokemonSV/Options/PokemonSV_SandwichMakerOption.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+class SandwichMaker_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    SandwichMaker_Descriptor();
+    struct Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+class SandwichMaker : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = SandwichMaker_Descriptor;
+    SandwichMaker();
+
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    SandwichMakerOption SANDWICH_OPTIONS;
+    SimpleIntegerOption<uint16_t> NUM_SANDWICHES;
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+
+}
+}
+}
+#endif
+
+
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Sandwiches/PokemonSV_SandwichRoutines.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Sandwiches/PokemonSV_SandwichRoutines.cpp
new file mode 100644
index 0000000000..e5b806bf79
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Sandwiches/PokemonSV_SandwichRoutines.cpp
@@ -0,0 +1,1375 @@
+/*  Sandwich Routines
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <cmath>
+#include <algorithm>
+#include <sstream>
+#include <unordered_map>
+#include "Common/Cpp/Exceptions.h"
+#include "CommonFramework/StaticGlobals.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonFramework/VideoPipeline/VideoOverlay.h"
+#include "CommonFramework/Tools/ErrorDumper.h"
+#include "CommonFramework/Tools/ProgramEnvironment.h"
+#include "CommonTools/Async/InterruptableCommands.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h"
+#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_GradientArrowDetector.h"
+#include "VideoGames/PokemonSV/Inference/Picnics/PokemonSV_PicnicDetector.h"
+#include "VideoGames/PokemonSV/Inference/Picnics/PokemonSV_SandwichHandDetector.h"
+#include "VideoGames/PokemonSV/Inference/Picnics/PokemonSV_SandwichIngredientDetector.h"
+#include "VideoGames/PokemonSV/Inference/Picnics/PokemonSV_SandwichRecipeDetector.h"
+#include "VideoGames/PokemonSV/Resources/PokemonSV_FillingsCoordinates.h"
+#include "VideoGames/PokemonSV/Resources/PokemonSV_Ingredients.h"
+#include "VideoGames/PokemonSV/Programs/Sandwiches/PokemonSV_IngredientSession.h"
+#include "VideoGames/PokemonSV/Inference/Picnics/PokemonSV_SandwichPlateDetector.h"
+#include "PokemonSV_SandwichRoutines.h"
+
+// #include <iostream>
+// using std::cout;
+// using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+namespace{
+    const ImageFloatBox HAND_INITIAL_BOX{0.440, 0.455, 0.112, 0.179};
+    const ImageFloatBox INGREDIENT_BOX{0.455, 0.130, 0.090, 0.030};
+
+void wait_for_initial_hand(
+    const ProgramInfo& info,
+    VideoStream& stream, ProControllerContext& context
+){
+     SandwichHandWatcher free_hand(SandwichHandType::FREE, HAND_INITIAL_BOX);
+    int ret = wait_until(stream, context, std::chrono::seconds(30), {free_hand});
+    if (ret < 0){
+        dump_image_and_throw_recoverable_exception(
+            info, stream, "FreeHandNotDetected",
+            "Cannot detect hand at start of making a sandwich."
+        );
+    }
+}
+
+} // anonymous namespace
+
+bool enter_sandwich_recipe_list(
+    const ProgramInfo& info,
+    VideoStream& stream, ProControllerContext& context
+){
+    context.wait_for_all_requests();
+    stream.log("Opening sandwich menu at picnic table.");
+
+    // Firt, try pressing button A to bring up the menu to make sandwich
+    pbf_press_button(context, BUTTON_A, 160ms, 640ms);
+
+    WallClock start = current_time();
+    bool opened_table_menu = false;
+    while(true){
+        context.wait_for_all_requests();
+        if (current_time() - start > std::chrono::minutes(1)){
+            dump_image_and_throw_recoverable_exception(
+                info, stream, "FailToSandwich",
+                "enter_sandwich_recipe_list(): Failed to open sandwich menu after 1 minute."
+            );
+        }
+
+        PicnicWatcher picnic_watcher;
+        GradientArrowWatcher sandwich_arrow(COLOR_YELLOW, GradientArrowType::RIGHT, {0.551, 0.311, 0.310, 0.106});
+        GradientArrowWatcher recipe_arrow(COLOR_YELLOW, GradientArrowType::DOWN, {0.103, 0.074, 0.068, 0.085});
+        AdvanceDialogWatcher dialog_watcher(COLOR_RED);
+
+        const int ret = wait_until(
+            stream, context,
+            std::chrono::seconds(30),
+            {picnic_watcher, sandwich_arrow, recipe_arrow, dialog_watcher}
+        );
+        switch (ret){
+        case 0:
+            stream.log("Detected picnic. Maybe button A press dropped.");
+            // walk forward and press A again
+            pbf_move_left_joystick(context, {0, +1}, 800ms, 320ms);
+            pbf_press_button(context, BUTTON_A, 160ms, 640ms);
+            continue;
+        case 1:
+            stream.log("Detected \"make a sandwich\" menu item selection arrrow.");
+            stream.overlay().add_log("Open sandwich recipes", COLOR_WHITE);
+            opened_table_menu = true;
+            pbf_press_button(context, BUTTON_A, 160ms, 800ms);
+            continue;
+        case 2:
+            stream.log("Detected recipe selection arrow.");
+            context.wait_for(std::chrono::seconds(1)); // wait one second to make sure the menu is fully loaded.
+            return true;
+        case 3:
+            stream.log("Detected advance dialog.");
+            if (opened_table_menu){
+                stream.log("Advance dialog after \"make a sandwich\" menu item. No ingredients.", COLOR_RED);
+                stream.overlay().add_log("No ingredient!", COLOR_RED);
+                return false;
+            }
+            pbf_press_button(context, BUTTON_A, 160ms, 640ms);
+            continue;
+        default:
+            dump_image_and_throw_recoverable_exception(info, stream, "NotEnterSandwichList",
+                "enter_sandwich_recipe_list(): No recognized state after 60 seconds.");
+        }
+    }
+}
+
+
+bool select_sandwich_recipe(
+    const ProgramInfo& info,
+    VideoStream& stream, ProControllerContext& context,
+    size_t target_sandwich_ID
+){
+    context.wait_for_all_requests();
+    stream.log("Choosing sandwich recipe: " + std::to_string(target_sandwich_ID));
+    stream.overlay().add_log("Search recipe " + std::to_string(target_sandwich_ID), COLOR_WHITE);
+
+    SandwichRecipeNumberDetector recipe_detector(stream.logger());
+    SandwichRecipeSelectionWatcher selection_watcher;
+
+    VideoOverlaySet overlay_set(stream.overlay());
+    recipe_detector.make_overlays(overlay_set);
+    selection_watcher.make_overlays(overlay_set);
+
+    bool found_recipe = false;
+    int max_move_down_list_attempts = 100; // There are 151 total recipes, so 76 rows.
+    for (int move_down_list_attempt = 0; move_down_list_attempt < max_move_down_list_attempts; move_down_list_attempt++){
+        context.wait_for(Milliseconds(200));
+        context.wait_for_all_requests();
+
+        auto snapshot = stream.video().snapshot();
+        size_t recipe_IDs[6] = {0, 0, 0, 0, 0, 0};
+        recipe_detector.detect_recipes(snapshot, recipe_IDs);
+        {
+            std::ostringstream os;
+            os << "Recipe IDs detected: ";
+            for (int i = 0; i < 6; i++){
+                os << recipe_IDs[i] << ", ";
+            }
+            stream.log(os.str());
+        }
+
+        size_t min_ID = 300;
+        for (int i = 0; i < 6; i++){
+            if (recipe_IDs[i] > 0 && recipe_IDs[i] < min_ID){
+                min_ID = recipe_IDs[i];
+            }
+        }
+        if (min_ID == 300){
+            min_ID = 0; // set case of no recipe ID detected to be 0 min_ID
+        }
+        size_t max_ID = *std::max_element(recipe_IDs, recipe_IDs+6);
+        stream.log("min, max IDs " + std::to_string(min_ID) + ", " + std::to_string(max_ID));
+
+        if (0 < min_ID && min_ID <= target_sandwich_ID && target_sandwich_ID <= max_ID){
+            // target is in this page!
+            
+            int target_cell = -1;
+            for (int i = 0; i < 6; i++){
+                if (recipe_IDs[i] == target_sandwich_ID){
+                    target_cell = i;
+                    break;
+                }
+            }
+            if (target_cell == -1){ // not targe recipe found in this page, probably not enough ingredients
+                stream.log("Not enough ingredients for target recipe.", COLOR_RED);
+                stream.overlay().add_log("Not enough ingredients", COLOR_RED);
+                return false;
+            }
+
+            stream.log("found recipe in the current page, cell " + std::to_string(target_cell));
+            
+            int ret = wait_until(stream, context, std::chrono::seconds(10), {selection_watcher});
+            int selected_cell = selection_watcher.selected_recipe_cell();
+            if (ret < 0 || selected_cell < 0){
+                dump_image_and_throw_recoverable_exception(
+                    info, stream, "RecipeSelectionArrowNotDetected",
+                    "select_sandwich_recipe(): Cannot detect recipe selection arrow."
+                );
+            }
+
+            stream.log("Current selected cell " + std::to_string(selected_cell));
+
+            if (target_cell == selected_cell){
+                // Selected target recipe!
+                stream.log("Found recipe at cell " + std::to_string(selected_cell));
+                stream.overlay().add_log("Found recipe", COLOR_WHITE);
+                found_recipe = true;
+                break;
+            }else if (target_cell == selected_cell + 1){
+                stream.log("Move to the right column.");
+                // Target is in a different column
+                // Move cursor right.
+                pbf_press_dpad(context, DPAD_RIGHT, 80ms, 400ms);
+                continue;
+            }
+            // else, continue moving down the list
+        }
+
+        // target sandwich recipe is still below the current displayed recipes.
+        // Move down the list.
+        pbf_press_dpad(context, DPAD_DOWN, 80ms, 400ms);
+    } // end for moving down the recipe list
+
+    overlay_set.clear();
+
+    if (found_recipe){
+        // Press A to enter the pick selection 
+        pbf_press_button(context, BUTTON_A, 240ms, 800ms);
+//        context.wait_for_all_requests();
+
+        SandwichIngredientArrowWatcher pick_selection(0, COLOR_YELLOW);
+        while(true){
+            context.wait_for_all_requests();
+            int ret = wait_until(
+                stream, context, std::chrono::seconds(3),
+                {selection_watcher, pick_selection}
+            );
+
+            if (ret == 0){
+                stream.log("Detected recipe selection. Dropped Button A?");
+                pbf_press_button(context, BUTTON_A, 240ms, 800ms);
+                continue;
+            }else if (ret == 1){
+                stream.log("Detected pick selection.");
+                pbf_press_button(context, BUTTON_A, 240ms, 800ms);
+                continue;
+            }else{
+                stream.log("Entered sandwich minigame.");
+                break;
+            }
+        }
+        return true;
+    }
+
+    // we cannot find the receipt
+    stream.log("Max list traverse attempt reached. Target recipe not found", COLOR_RED);
+    stream.overlay().add_log("Recipe not found", COLOR_RED);
+
+    return false;
+}
+
+namespace{
+
+// expand the hand bounding box so that the hand watcher can pick the hand in the next iteration
+ImageFloatBox expand_box(const ImageFloatBox& box){
+    const double x = std::max(0.0, box.x - box.width * 1.5);
+    const double y = std::max(0.0, box.y - box.height * 1.5);
+    const double width = std::min(box.width*4, 1.0 - x);
+    const double height = std::min(box.height*4, 1.0 - y);
+    return ImageFloatBox(x, y, width, height);
+}
+
+ImageFloatBox hand_location_to_box(const std::pair<double, double>& loc){
+    const double hand_width = 0.071, hand_height = 0.106;
+    return {loc.first - hand_width/2, loc.second - hand_height/2, hand_width, hand_height};
+}
+
+std::string box_to_string(const ImageFloatBox& box){
+    std::ostringstream os;
+    os << "(" << box.x << ", " << box.y << ", " << box.width << ", " << box.height << ")";
+    return os.str();
+}
+
+/* 
+- center the cursor by moving the cursor to the edge of the screen, then away from the edge.
+- then search the whole screen for the sandwich hand, instead of just the box, and
+update the location of the sandwich hand
+- return true if successful. else throw an exception
+*/
+bool move_then_recover_sandwich_hand_position(
+    const ProgramInfo& info,
+    VideoStream& stream, ProControllerContext& context,
+    SandwichHandType& hand_type,
+    SandwichHandWatcher& hand_watcher,
+    AsyncCommandSession<ProController>& move_session
+){
+
+    stream.log("center the cursor: move towards bottom right, then left slightly.");
+    Milliseconds move_1 = 4000ms;
+    Milliseconds move_2 = 800ms;
+
+    // center the cursor
+    if(SandwichHandType::FREE == hand_type){
+        // move to bottom right corner,
+        pbf_move_left_joystick(context, {+1, -1}, move_1, 800ms);
+        // move to left slightly
+        pbf_move_left_joystick(context, {-1, 0}, move_2, 800ms);
+        context.wait_for_all_requests();
+    }
+    else if(SandwichHandType::GRABBING == hand_type){
+        // center the cursor while holding the A button, so you don't drop the ingredient.
+
+        Milliseconds move_total = move_1 + move_2;
+        Milliseconds wait = move_total + 1000ms; // add one extra second of waiting
+        Milliseconds hold_A = wait + 10000ms; // hold A for extra 10 seconds
+        // the A button hold will be overwritten on the next move_session.dispatch, in the main function
+        
+        move_session.dispatch([&](ProControllerContext& context){
+            // move to bottom right corner, while holding A
+            pbf_controller_state(context, BUTTON_A, DPAD_NONE, {+1, -1}, {0, 0}, move_1);
+
+            // move to left slightly, while holding A
+            pbf_controller_state(context, BUTTON_A, DPAD_NONE, {-1, 0}, {0, 0}, move_2);
+
+            // keep holding A. 
+            pbf_press_button(context, BUTTON_A, hold_A, 0ms);
+            // pbf_controller_state(context, BUTTON_A, DPAD_NONE, 128, 128, 128, 128, 3000);
+        });
+
+        // - wait long enough for the cursor movement to finish, before we try image matching
+        // - wait_for_all_requests doesn't work since we want to still hold the A button.
+        // - this is a workaround until there is a way to wait for a subset of a bunch of overlapping buttons to finish
+        // - need to make sure the A button hold is long enough to last past this wait.
+        context.wait_for(wait);
+    }
+    
+    const VideoSnapshot& frame = stream.video().snapshot();
+    stream.log("Try to recover sandwich hand location.");
+    if(hand_watcher.recover_sandwich_hand_position(frame)){
+        // sandwich hand detected.
+        return true;
+    }
+
+    // if still can't find the sandwich hand, throw a exception
+    dump_image_and_throw_recoverable_exception(
+        info, stream,
+        SANDWICH_HAND_TYPE_NAMES(hand_type) + "SandwichHandNotDetected",
+        "move_sandwich_hand(): Cannot detect " + SANDWICH_HAND_TYPE_NAMES(hand_type) + " hand."
+    );
+}
+
+// return true if the current plate is empty.
+// i.e. the current plate label is not yellow.
+// Assumes that we are in a grabbing state.
+bool check_plate_empty(VideoStream& stream, SandwichPlateDetector::Side target_plate_label, Language language){
+    auto screen = stream.video().snapshot();
+    // screen.frame->save("test.png");
+
+    // switch(target_plate_label){
+    //     case SandwichPlateDetector::Side::LEFT:
+    //         cout << "left" << endl;
+    //         break;
+    //     case SandwichPlateDetector::Side::MIDDLE:
+    //         cout << "middle" << endl;
+    //         break;
+    //     case SandwichPlateDetector::Side::RIGHT:
+    //         cout << "right" << endl;
+    //         break;                        
+    //     default:
+    //         break;
+    // }
+
+    stream.log("Check if the plate is empty.");
+
+    SandwichPlateDetector plate_detector = SandwichPlateDetector(stream.logger(), COLOR_RED, language, target_plate_label);
+              
+    return !plate_detector.is_label_yellow(screen);
+}
+
+struct HandMoveData{
+    ImageFloatBox end_box;
+    bool plate_empty;
+};
+
+
+/* 
+- moves the sandwich hand from start_box to end_box
+- It detects the location of the sandwich hand, from within the bounds of the last frame's 
+expanded_hand_bb (i.e. m_box field in SandwichHandLocator). 
+Then updates the current location of expanded_hand_bb. 
+Then moves the sandwich hand closer towards end_box. 
+ */
+HandMoveData move_sandwich_hand_and_check_if_plates_empty(
+    ProgramEnvironment& env,
+    VideoStream& stream,
+    ProControllerContext& context,
+    SandwichHandType hand_type,
+    bool pressing_A,
+    const ImageFloatBox& start_box,
+    const ImageFloatBox& end_box,
+    SandwichPlateDetector::Side target_plate_label = SandwichPlateDetector::Side::NOT_APPLICABLE,
+    Language language = Language::None
+){
+    context.wait_for_all_requests();
+    stream.log("Start moving sandwich hand: " + SANDWICH_HAND_TYPE_NAMES(hand_type)
+        + " start box " + box_to_string(start_box) + " end box " + box_to_string(end_box));
+
+    double joystick_x = 0;
+    double joystick_y = 0;
+
+    SandwichHandWatcher hand_watcher(hand_type, start_box);
+
+    // A session that creates a new thread to send button commands to controller
+    AsyncCommandSession<ProController> move_session(
+        context,
+        stream.logger(),
+        context.controller()
+    );
+    
+    if (pressing_A){
+        move_session.dispatch([](ProControllerContext& context){
+            pbf_press_button(context, BUTTON_A, 24000ms, 0ms);
+        });
+    }
+
+    const std::pair<double, double> target_loc(end_box.x + end_box.width/2, end_box.y + end_box.height/2);
+
+    std::pair<double, double> last_loc(-1, -1);
+    std::pair<double, double> speed(-1, -1);
+    WallClock cur_time, last_time;
+    VideoOverlaySet overlay_set(stream.overlay());
+
+    if (STATIC_GLOBALS.DEVELOPER_MODE){
+        #if 0
+            // to intentionally trigger failures in hand detection, for testing recovery
+            if (SandwichHandType::FREE == hand_type){
+                std::pair<double, double> hand_location(1.0, 1.0);
+                const ImageFloatBox hand_bb_debug = hand_location_to_box(hand_location); 
+                const ImageFloatBox expanded_hand_bb_debug = expand_box(hand_bb_debug);
+                hand_watcher.change_box(expanded_hand_bb_debug);
+                overlay_set.clear();
+                overlay_set.add(COLOR_RED, hand_bb_debug);
+                overlay_set.add(COLOR_BLUE, expanded_hand_bb_debug);
+                pbf_move_left_joystick(context, {-1, +1}, 5000ms, 800ms);  // move hand to screen edge
+                context.wait_for_all_requests();
+            }
+        #endif
+
+        #if 0
+            // to intentionally trigger failures in hand detection, for testing recovery
+            // move hand to edge of screen, while still holding A
+            if (SandwichHandType::GRABBING == hand_type){
+                pbf_controller_state(context, BUTTON_A, DPAD_NONE, 0, 0, 128, 128, 5000ms);
+                pbf_press_button(context, BUTTON_A, 1600ms, 0ms);
+                // pbf_controller_state(context, BUTTON_A, DPAD_NONE, 128, 128, 128, 128, 800ms);
+            }
+        #endif
+    }
+
+    while(true){
+        int ret = wait_until(stream, context, std::chrono::seconds(5), {hand_watcher});
+        if (ret < 0){
+            // - the sandwich hand might be at the edge of the screen, so move it to the middle
+            // and try searching the entire screen again
+            // - move hand to bottom-right, then to the middle
+            stream.log(
+                "Failed to detect sandwich hand. It may be at the screen's edge. " 
+                "Try moving the hand to the middle of the screen and try searching again."
+            );
+
+            if(move_then_recover_sandwich_hand_position(
+                env.program_info(), stream, context, hand_type, hand_watcher, move_session
+            )){
+                continue;
+            }
+
+        }
+
+        auto cur_loc = hand_watcher.location();
+        stream.log("Hand location: " + std::to_string(cur_loc.first) + ", " + std::to_string(cur_loc.second));
+        cur_time = current_time();
+
+        const ImageFloatBox hand_bb = hand_location_to_box(cur_loc); 
+        const ImageFloatBox expanded_hand_bb = expand_box(hand_bb);
+        hand_watcher.change_box(expanded_hand_bb);
+
+        overlay_set.clear();
+        overlay_set.add(COLOR_RED, hand_bb);
+        overlay_set.add(COLOR_BLUE, expanded_hand_bb);
+
+        std::pair<double, double> dif(target_loc.first - cur_loc.first, target_loc.second - cur_loc.second);
+        // console.log("float diff to target: " + std::to_string(dif.first) + ", " + std::to_string(dif.second));
+
+
+        // Reached the Target
+        if (std::fabs(dif.first) < end_box.width/2 && std::fabs(dif.second) < end_box.height/2){
+            stream.log(SANDWICH_HAND_TYPE_NAMES(hand_type) + " hand reached target.");
+            bool plate_empty = false;
+
+            // check if the plate is empty. but only if the target_plate_label isn't NOT_APPLICABLE.
+            if (target_plate_label != SandwichPlateDetector::Side::NOT_APPLICABLE){
+                plate_empty = check_plate_empty(stream, target_plate_label, language);
+            }
+
+            move_session.stop_session_and_rethrow(); // Stop the commands
+            if (hand_type == SandwichHandType::GRABBING){
+                // wait for some time to let hand release ingredient
+                context.wait_for(Milliseconds(100));
+            }
+            return {hand_bb, plate_empty};
+        }
+
+        // Assume screen width is 16.0, then the screen height is 9.0
+        std::pair<double, double> real_dif(dif.first * 16, dif.second * 9);
+        double distance = std::sqrt(real_dif.first * real_dif.first + real_dif.second * real_dif.second);
+        // console.log("scaled diff to target: " + std::to_string(real_dif.first) + ", " + std::to_string(real_dif.second)
+        //     + " distance " + std::to_string(distance));
+
+        // Build a P-D controller!
+
+        // We assume for a screen distance of 4 (1/4 of the width), we can use max joystick push, 128.
+        // So for distance of value 1.0, we multiply by 32 to get joystick push
+        double target_joystick_push = std::min(distance * 0.25, 1.0);
+
+        std::pair<double, double> push(real_dif.first * target_joystick_push / distance, real_dif.second * target_joystick_push / distance);
+        // console.log("push force " + std::to_string(push.first) + ", " + std::to_string(push.second));
+
+        if (last_loc.first < 0){
+            speed = std::make_pair(0.0, 0.0);
+        }else{
+            std::chrono::microseconds time = std::chrono::duration_cast<std::chrono::microseconds>(cur_time - last_time);
+            double time_s = time.count() / 1000000.0;
+            std::pair<double, double> moved((cur_loc.first - last_loc.first) * 16, (cur_loc.second - last_loc.second) * 9);
+
+            // Currently set to zero damping as it seems we don't need them for now
+            double damping_factor = 0.0;
+            double damping_multiplier = (-1.0) * damping_factor / time_s;
+            std::pair<double, double> damped_push_offset(moved.first * damping_multiplier, moved.second * damping_multiplier);
+
+            push.first += damped_push_offset.first;
+            push.second += damped_push_offset.second;
+        }
+
+        joystick_x = std::max(std::min(push.first, +1.0), -1.0);
+        joystick_y = -std::max(std::min(push.second, +1.0), -1.0);
+        // console.log("joystick push " + std::to_string(joystick_x) + ", " + std::to_string(joystick_y));
+
+        // Dispatch a new series of commands that overwrites the last ones
+        move_session.dispatch([&](ProControllerContext& context){
+            if (pressing_A){
+                // Note: joystick_x and joystick_y must be defined to outlive `move_session`.
+//                pbf_controller_state(context, BUTTON_A, DPAD_NONE, joystick_x, joystick_y, 128, 128, 20);
+                ssf_press_button(context, BUTTON_A, 0ms, 8000ms, 0ms);
+            }
+            pbf_move_left_joystick(context, {joystick_x, joystick_y}, 160ms, 0ms);
+        });
+        
+        stream.log("Moved joystick");
+
+        last_loc = cur_loc;
+        last_time = cur_time;
+        context.wait_for(Milliseconds(80));
+    }
+}
+
+ImageFloatBox move_sandwich_hand(
+    ProgramEnvironment& env,
+    VideoStream& stream,
+    ProControllerContext& context,
+    SandwichHandType hand_type,
+    bool pressing_A,
+    const ImageFloatBox& start_box,
+    const ImageFloatBox& end_box
+){
+    return move_sandwich_hand_and_check_if_plates_empty(
+        env,
+        stream, context,
+        hand_type, pressing_A,
+        start_box, end_box,
+        SandwichPlateDetector::Side::NOT_APPLICABLE,
+        Language::None
+    ).end_box;
+}
+
+} // end anonymous namespace
+
+void finish_sandwich_eating(
+    const ProgramInfo& info,
+    VideoStream& stream, ProControllerContext& context
+){
+    stream.overlay().add_log("Eating", COLOR_WHITE);
+    PicnicWatcher picnic_watcher;
+    int ret = run_until<ProControllerContext>(
+        stream, context,
+        [](ProControllerContext& context){
+            for (int i = 0; i < 20; i++){
+                pbf_press_button(context, BUTTON_A, 160ms, 3840ms);
+            }
+        },
+        {picnic_watcher}
+    );
+    if (ret < 0){
+        dump_image_and_throw_recoverable_exception(
+            info, stream, "PicnicNotDetected",
+            "finish_sandwich_eating(): cannot detect picnic after 60 seconds."
+        );
+    }
+    stream.overlay().add_log("Finish eating", COLOR_WHITE);
+    stream.log("Finished eating sandwich. Back at picnic.");
+    context.wait_for(std::chrono::seconds(1));
+}
+
+namespace{
+
+void repeat_press_until(
+    const ProgramInfo& info,
+    VideoStream& stream, ProControllerContext& context,
+    std::function<void()> button_press,
+    const std::vector<PeriodicInferenceCallback>& callbacks,
+    const std::string &error_name, const std::string &error_message,
+    Milliseconds detection_timeout = std::chrono::seconds(5),
+    size_t max_presses = 10,
+    Milliseconds default_video_period = Milliseconds(50),
+    Milliseconds default_audio_period = Milliseconds(20)
+){
+    button_press();
+    for (size_t i_try = 0; i_try < max_presses; i_try++){
+        context.wait_for_all_requests();
+        const int ret = wait_until(stream, context, detection_timeout, callbacks);
+        if (ret >= 0){
+            return;
+        }
+        button_press();
+    }
+
+    dump_image_and_throw_recoverable_exception(
+        info, stream, "IngredientListNotDetected",
+        "enter_custom_sandwich_mode(): cannot detect ingredient list after 50 seconds."
+    );
+}
+
+void repeat_button_press_until(
+    const ProgramInfo& info,
+    VideoStream& stream, ProControllerContext& context,
+    Button button, Milliseconds hold, Milliseconds release,
+    const std::vector<PeriodicInferenceCallback>& callbacks,
+    const std::string &error_name, const std::string &error_message,
+    Milliseconds iteration_length = std::chrono::seconds(5),
+    size_t max_presses = 10,
+    Milliseconds default_video_period = Milliseconds(50),
+    Milliseconds default_audio_period = Milliseconds(20)
+){
+    const Milliseconds button_time = hold + release;
+    repeat_press_until(
+        info, stream, context,
+        [&](){
+            pbf_press_button(context, button, hold, release);
+        },
+        callbacks, error_name, error_message, iteration_length - button_time, max_presses,
+        default_video_period, default_audio_period
+    );
+}
+
+void repeat_dpad_press_until(
+    const ProgramInfo& info, VideoStream& stream, ProControllerContext& context,
+    DpadPosition dpad_position, Milliseconds hold, Milliseconds release,
+    const std::vector<PeriodicInferenceCallback>& callbacks,
+    const std::string &error_name, const std::string &error_message,
+    Milliseconds iteration_length = std::chrono::seconds(5),
+    size_t max_presses = 10,
+    Milliseconds default_video_period = Milliseconds(50),
+    Milliseconds default_audio_period = Milliseconds(20)
+){
+    const Milliseconds button_time = hold + release;
+    repeat_press_until(
+        info, stream, context,
+        [&](){ pbf_press_dpad(context, dpad_position, hold, release); },
+        callbacks, error_name, error_message, iteration_length - button_time, max_presses, 
+        default_video_period, default_audio_period
+    );
+}
+
+
+} // anonymous namespace
+
+
+void enter_custom_sandwich_mode(
+    const ProgramInfo& info,
+    VideoStream& stream, ProControllerContext& context
+){
+    context.wait_for_all_requests();
+    stream.log("Entering custom sandwich mode.");
+    stream.overlay().add_log("Custom sandwich", COLOR_WHITE);
+
+    SandwichIngredientArrowWatcher ingredient_selection_arrow(0, COLOR_YELLOW);
+    repeat_button_press_until(
+        info, stream, context, BUTTON_X, 320ms, 640ms, {ingredient_selection_arrow},
+        "IngredientListNotDetected", "enter_custom_sandwich_mode(): cannot detect ingredient list after 50 seconds."
+    );
+}
+
+namespace{
+
+void finish_two_herbs_sandwich(
+    ProgramEnvironment& env,
+    VideoStream& stream, ProControllerContext& context
+){
+    stream.log("Finish determining ingredients for two-sweet-herb sandwich.");
+    stream.overlay().add_log("Finish picking ingredients", COLOR_WHITE);
+
+    wait_for_initial_hand(env.program_info(), stream, context);
+
+    stream.overlay().add_log("Start making sandwich", COLOR_WHITE);
+    move_sandwich_hand(env, stream, context, SandwichHandType::FREE, false, HAND_INITIAL_BOX, INGREDIENT_BOX);
+    // Mash button A to pick and drop ingredients, upper bread and pick.
+    // Egg Power 3 is applied with only two sweet herb condiments!
+    pbf_mash_button(context, BUTTON_A, 8000ms);
+    context.wait_for_all_requests();
+    stream.overlay().add_log("Built sandwich", COLOR_WHITE);
+}
+
+} // anonymous namespace
+
+void make_two_herbs_sandwich(
+    ProgramEnvironment& env,
+    VideoStream& stream, ProControllerContext& context,
+    EggSandwichType sandwich_type, size_t sweet_herb_index_last, size_t salty_herb_index_last, size_t bitter_herb_index_last
+){
+    // The game has at most 5 herbs, in the order of sweet, salty, sour, bitter, spicy:
+    if (sweet_herb_index_last >= 5){ // sweet index can only be: 0, 1, 2, 3, 4
+        throw InternalProgramError(
+            &stream.logger(), PA_CURRENT_FUNCTION,
+            "Invalid sweet herb index: " + std::to_string(sweet_herb_index_last)
+        );
+    }
+    if (salty_herb_index_last >= 4){ // 0, 1, 2, 3
+        throw InternalProgramError(
+            &stream.logger(), PA_CURRENT_FUNCTION,
+            "Invalid salty herb index: " + std::to_string(salty_herb_index_last)
+        );
+    }
+    if (bitter_herb_index_last >= 2){ // 0, 1
+        throw InternalProgramError(
+            &stream.logger(), PA_CURRENT_FUNCTION,
+            "Invalid bitter herb index: " + std::to_string(bitter_herb_index_last)
+        );
+    }
+
+    if (sandwich_type == EggSandwichType::SALTY_SWEET_HERBS && salty_herb_index_last >= sweet_herb_index_last){
+        throw InternalProgramError(
+            &stream.logger(), PA_CURRENT_FUNCTION,
+            "Invalid salty and sweet herb indices: " + std::to_string(salty_herb_index_last) + ", " + std::to_string(sweet_herb_index_last)
+        );
+    }
+    if (sandwich_type == EggSandwichType::BITTER_SWEET_HERBS && bitter_herb_index_last >= sweet_herb_index_last){
+        throw InternalProgramError(
+            &stream.logger(), PA_CURRENT_FUNCTION,
+            "Invalid bitter and sweet herb indices: " + std::to_string(bitter_herb_index_last) + ", " + std::to_string(sweet_herb_index_last)
+        );
+    }
+
+    {
+        // Press button A to add first filling, assumed to be lettuce
+        DeterminedSandwichIngredientWatcher filling_watcher(SandwichIngredientType::FILLING, 0);
+        repeat_button_press_until(
+            env.program_info(), stream, context, BUTTON_A, 320ms, 400ms, {filling_watcher},
+            "DeterminedIngredientNotDetected", "make_two_herbs_sandwich(): cannot detect determined lettuce after 50 seconds."
+        );
+    }
+
+    {
+        // Press button + to go to condiments page
+        SandwichCondimentsPageWatcher condiments_page_watcher;
+        repeat_button_press_until(
+            env.program_info(), stream, context, BUTTON_PLUS, 320ms, 480ms, {condiments_page_watcher},
+            "CondimentsPageNotDetected", "make_two_herbs_sandwich(): cannot detect condiments page after 50 seconds."
+        );
+    }
+
+    size_t first_herb_index_last = 0;
+    switch(sandwich_type){
+    case EggSandwichType::TWO_SWEET_HERBS:
+        first_herb_index_last = sweet_herb_index_last;
+        break;
+    case EggSandwichType::SALTY_SWEET_HERBS:
+        first_herb_index_last = salty_herb_index_last;
+        break;
+    case EggSandwichType::BITTER_SWEET_HERBS:
+        first_herb_index_last = bitter_herb_index_last;
+        break;
+    default:
+        throw InternalProgramError(&stream.logger(), PA_CURRENT_FUNCTION,
+            "Invalid EggSandwichType for make_two_herbs_sandwich()");
+    }
+
+    auto move_one_up_to_row = [&](size_t row){
+        stream.log("Move arrow to row " + std::to_string(row));
+        SandwichIngredientArrowWatcher arrow(row);
+        repeat_dpad_press_until(env.program_info(), stream, context, DPAD_UP, 80ms, 240ms, {arrow}, "IngredientArrowNotDetected",
+            "make_two_herbs_sandwich(): cannot detect ingredient selection arrow at row " + std::to_string(row) + " after 50 seconds."
+        );
+    };
+
+    auto press_a_to_determine_herb = [&](size_t herb_index){
+        DeterminedSandwichIngredientWatcher herb_watcher(SandwichIngredientType::CONDIMENT, herb_index);
+        repeat_button_press_until(
+            env.program_info(), stream, context, BUTTON_A, 320ms, 480ms, {herb_watcher}, "CondimentsPageNotDetected",
+            "make_two_herbs_sandwich(): cannot detect determined herb at cell " + std::to_string(herb_index) + " after 50 seconds."
+        );
+    };
+
+    // Press DPAD_UP multiple times to move to the first herb row
+    for (size_t i = 0; i < first_herb_index_last+1; i++){
+        move_one_up_to_row(9 - i);
+    }
+    press_a_to_determine_herb(0); // Press A to determine one herb
+    // Press DPAD_UP against to move to the second herb row
+    for (size_t i = first_herb_index_last+1; i < sweet_herb_index_last+1; i++){
+        move_one_up_to_row(9 - i);
+    }
+    press_a_to_determine_herb(1); // Press A to determine the second herb
+
+    {
+        // Press button + to go to picks page
+        SandwichPicksPageWatcher picks_page_watcher;
+        repeat_button_press_until(
+            env.program_info(), stream, context, BUTTON_PLUS, 320ms, 480ms, {picks_page_watcher},
+            "CondimentsPageNotDetected", "make_two_herbs_sandwich(): cannot detect picks page after 50 seconds."
+        );
+    }
+
+    // Mesh button A to select the first pick
+    pbf_mash_button(context, BUTTON_A, 640ms);
+    context.wait_for_all_requests();
+
+    finish_two_herbs_sandwich(env, stream, context);
+}
+
+void make_two_herbs_sandwich(
+    ProgramEnvironment& env,
+    VideoStream& stream, ProControllerContext& context,
+    EggSandwichType sandwich_type, Language language
+){
+    std::map<std::string, uint8_t> fillings = {{"lettuce", (uint8_t)1}};
+    std::map<std::string, uint8_t> condiments = {{"sweet-herba-mystica", (uint8_t)1}};
+    switch(sandwich_type){
+    case EggSandwichType::TWO_SWEET_HERBS:
+        condiments["sweet-herba-mystica"] = 2;
+        break;
+    case EggSandwichType::SALTY_SWEET_HERBS:
+        condiments["salty-herba-mystica"] = 1;
+        break;
+    case EggSandwichType::BITTER_SWEET_HERBS:
+        condiments["bitter-herba-mystica"] = 1;
+        break;
+    default:
+        throw InternalProgramError(
+            &stream.logger(), PA_CURRENT_FUNCTION,
+            "Invalid EggSandwichType for make_two_herbs_sandwich()"
+        );
+    }
+    add_sandwich_ingredients(
+        stream, context,
+        language,
+        std::move(fillings),
+        std::move(condiments)
+    );
+
+    finish_two_herbs_sandwich(env, stream, context);
+}
+
+void make_sandwich_option(ProgramEnvironment& env, VideoStream& stream, ProControllerContext& context, SandwichMakerOption& SANDWICH_OPTIONS){
+    const Language language = SANDWICH_OPTIONS.LANGUAGE;
+    if (language == Language::None){
+        throw UserSetupError(stream.logger(), "Must set game language option to read ingredient lists.");
+    }
+
+    int num_fillings = 0;
+    int num_condiments = 0;
+    std::map<std::string, uint8_t> fillings;
+    std::map<std::string, uint8_t> condiments;
+
+    //Add the selected ingredients to the maps if set to custom
+    if (SANDWICH_OPTIONS.BASE_RECIPE == BaseRecipe::custom){
+        stream.log("Custom sandwich selected. Validating ingredients.", COLOR_BLACK);
+        stream.overlay().add_log("Custom sandwich selected.");
+
+        std::vector<std::unique_ptr<SandwichIngredientsTableRow>> table = SANDWICH_OPTIONS.SANDWICH_INGREDIENTS.copy_snapshot();
+
+        for (const std::unique_ptr<SandwichIngredientsTableRow>& row : table){
+            const std::string& table_item = row->item.slug();
+            if (!(table_item == "baguette")){ //ignore baguette
+                if (std::find(ALL_SANDWICH_FILLINGS_SLUGS().begin(), ALL_SANDWICH_FILLINGS_SLUGS().end(), table_item) != ALL_SANDWICH_FILLINGS_SLUGS().end()){
+                    fillings[table_item]++;
+                    num_fillings++;
+                }else{
+                    condiments[table_item]++;
+                    num_condiments++;
+                }
+            }else{
+                stream.log("Skipping baguette as it is unobtainable.");
+                stream.overlay().add_log("Skipping baguette as it is unobtainable.", COLOR_WHITE);
+            }
+        }
+
+        if (num_fillings == 0 || num_condiments == 0){
+            throw UserSetupError(stream.logger(), "Must have at least one filling and at least one condiment.");
+        }
+
+        if (num_fillings > 6 || num_condiments > 4){
+            throw UserSetupError(stream.logger(), "Number of fillings exceed 6 and/or number of condiments exceed 4.");
+        }
+        stream.log("Ingredients validated.", COLOR_BLACK);
+        stream.overlay().add_log("Ingredients validated.", COLOR_WHITE);
+    }
+else if(SANDWICH_OPTIONS.BASE_RECIPE == BaseRecipe::non_shiny){
+        stream.log("Preset sandwich selected.", COLOR_BLACK);
+        stream.overlay().add_log("Preset sandwich selected.");
+
+        // std::vector<std::string> table = SANDWICH_OPTIONS.get_premade_ingredients(
+        //     SANDWICH_OPTIONS.get_premade_sandwich_recipe(SANDWICH_OPTIONS.BASE_RECIPE, SANDWICH_OPTIONS.TYPE, SANDWICH_OPTIONS.PARADOX));
+
+        // The only non-shiny sandwich added at this time is Normal Encounter.
+        std::vector<std::string> table = SANDWICH_OPTIONS.get_premade_ingredients(SandwichRecipe::non_shiny_normal);
+
+        for (auto&& s : table){
+            if (std::find(ALL_SANDWICH_FILLINGS_SLUGS().begin(), ALL_SANDWICH_FILLINGS_SLUGS().end(), s) != ALL_SANDWICH_FILLINGS_SLUGS().end()){
+                fillings[s]++;
+                num_fillings++;
+            }else{
+                condiments[s]++;
+                num_condiments++;
+            }
+        }
+    }else{
+        //  Otherwise get the preset ingredients
+        stream.log("Preset sandwich selected.", COLOR_BLACK);
+        stream.overlay().add_log("Preset sandwich selected.");
+
+        std::vector<std::string> table = SANDWICH_OPTIONS.get_premade_ingredients(
+            SANDWICH_OPTIONS.get_premade_sandwich_recipe(SANDWICH_OPTIONS.BASE_RECIPE, SANDWICH_OPTIONS.TYPE, SANDWICH_OPTIONS.PARADOX));
+
+        for (auto&& s : table){
+            if (std::find(ALL_SANDWICH_FILLINGS_SLUGS().begin(), ALL_SANDWICH_FILLINGS_SLUGS().end(), s) != ALL_SANDWICH_FILLINGS_SLUGS().end()){
+                fillings[s]++;
+                num_fillings++;
+            }else{
+                condiments[s]++;
+                num_condiments++;
+            }
+        }
+        //Insert Herba Mystica if required
+        if (SandwichMakerOption::two_herba_required(SANDWICH_OPTIONS.BASE_RECIPE)){
+            if (SANDWICH_OPTIONS.HERBA_ONE == SANDWICH_OPTIONS.HERBA_TWO){
+                condiments.insert(std::make_pair(SANDWICH_OPTIONS.herba_to_string(SANDWICH_OPTIONS.HERBA_ONE), (uint8_t)2));
+            }else{
+                condiments.insert(std::make_pair(SANDWICH_OPTIONS.herba_to_string(SANDWICH_OPTIONS.HERBA_ONE), (uint8_t)1));
+                condiments.insert(std::make_pair(SANDWICH_OPTIONS.herba_to_string(SANDWICH_OPTIONS.HERBA_TWO), (uint8_t)1));
+            }
+            num_condiments++;
+            num_condiments++;
+        }
+    }
+
+    /*
+    //Print ingredients
+    cout << "Fillings:" << endl;
+    for (const auto& [key, value] : fillings){
+        std::cout << key << ": " << (int)value << endl;
+    }
+    cout << "Condiments:" << endl;
+    for (const auto& [key, value] : condiments){
+        std::cout << key << ": " << (int)value << endl;
+    }
+    */
+
+    make_sandwich_preset(env, stream, context, SANDWICH_OPTIONS.LANGUAGE, fillings, condiments);
+}
+
+void make_sandwich_preset(ProgramEnvironment& env, VideoStream& stream, ProControllerContext& context, Language language, std::map<std::string, uint8_t>& fillings, std::map<std::string, uint8_t>& condiments){
+    //Sort the fillings by priority for building (ex. large items on bottom, cherry tomatoes on top)
+    //std::vector<std::string> fillings_game_order = {"lettuce", "tomato", "cherry-tomatoes", "cucumber", "pickle", "onion", "red-onion", "green-bell-pepper", "red-bell-pepper",
+    //    "yellow-bell-pepper", "avocado", "bacon", "ham", "prosciutto", "chorizo", "herbed-sausage", "hamburger", "klawf-stick", "smoked-fillet", "fried-fillet", "egg", "potato-tortilla",
+    //    "tofu", "rice", "noodles", "potato-salad", "cheese", "banana", "strawberry", "apple", "kiwi", "pineapple", "jalapeno", "watercress", "basil"};
+    std::vector<std::string> fillings_game_order = { "hamburger", "rice", "noodles", "smoked-fillet", "fried-fillet", "cucumber", "pickle", "tofu",
+        "chorizo", "herbed-sausage", "potato-tortilla", "klawf-stick", "lettuce", "tomato", "onion", "red-onion", "green-bell-pepper", "red-bell-pepper", "yellow-bell-pepper", "avocado",
+        "bacon", "ham", "prosciutto", "cheese", "banana", "strawberry", "apple", "kiwi", "pineapple", "jalape\xc3\xb1o", "watercress", "potato-salad", "egg", "basil", "cherry-tomatoes" };
+
+    //Add keys to new vector and sort
+    std::vector<std::string> fillings_sorted;
+    for (auto i = fillings.begin(); i != fillings.end(); i++){
+        fillings_sorted.push_back(i->first);
+    }
+    std::unordered_map<std::string, int> temp_map;
+    for (auto i = 0; i < (int)fillings_game_order.size(); i++){
+        temp_map[fillings_game_order[i]] = i;
+    }
+    auto compare = [&temp_map](const std::string& s, const std::string& s1){
+        return temp_map[s] < temp_map[s1];
+    };
+    std::sort(fillings_sorted.begin(), fillings_sorted.end(), compare);
+
+    /*
+    //Print sorted fillings
+    cout << "Sorted fillings:" << endl;
+    for (auto i : fillings_sorted){
+        cout << i << endl;
+    }
+    */
+
+    //Calculate number of plates there will be on the build screen
+    //Get each ingredient in list order, then get the number of times it appears from the map
+    //Also store how many of each ingredient is in each plate (ex. 6 onion in first plate and then 3 onion in the next)
+    int plates = 0;
+    std::vector<int> plate_amounts;
+
+    for (const std::string& i : fillings_sorted){
+        //Add "full" plates
+        int plate_calcs = (int)(fillings[i] / FillingsCoordinates::instance().get_filling_information(i).servingsPerPlate);
+        if (plate_calcs != 0){
+            plates += plate_calcs;
+            for (int j = 0; j < plate_calcs; j++){
+                plate_amounts.push_back(
+                    (int)(FillingsCoordinates::instance().get_filling_information(i).servingsPerPlate)
+                    *(int)(FillingsCoordinates::instance().get_filling_information(i).piecesPerServing)
+                );
+            }
+        }
+
+        //Add plates for remaining servings
+        int plate_remaining = ((int)(fillings[i] % FillingsCoordinates::instance().get_filling_information(i).servingsPerPlate));
+        if (plate_remaining != 0){
+            plates++;
+            plate_amounts.push_back(plate_remaining * (int)(FillingsCoordinates::instance().get_filling_information(i).piecesPerServing));
+        }
+    }
+    //cout << "Number of plates: " << plates << endl;
+    int plates_string = plates;
+    stream.log("Number of plates: " + std::to_string(plates_string), COLOR_BLACK);
+    stream.overlay().add_log("Number of plates: " + std::to_string(plates_string), COLOR_WHITE);
+    for (const auto& filling: fillings){
+        env.log("Require filling " + filling.first + " x" + std::to_string(int(filling.second)));
+    }
+    for (const auto& condiment: condiments){
+        env.log("Require condiment " + condiment.first + " x" + std::to_string(int(condiment.second)));
+    }
+
+    //Player must be on default sandwich menu
+    std::map<std::string, uint8_t> fillings_copy(fillings); //Making a copy as we need the map for later
+    enter_custom_sandwich_mode(env.program_info(), stream, context);
+    add_sandwich_ingredients(
+        stream, context,
+        language,
+        std::move(fillings_copy),
+        std::move(condiments)
+    );
+
+    run_sandwich_maker(env, stream, context, language, fillings, fillings_sorted, plates);
+}
+
+void run_sandwich_maker(
+    ProgramEnvironment& env,
+    VideoStream& stream, ProControllerContext& context,
+    Language language,
+    std::map<std::string, uint8_t>& fillings,
+    std::vector<std::string>& fillings_sorted,
+    int& plates
+){
+
+    wait_for_initial_hand(env.program_info(), stream, context);
+
+    //Wait for labels to appear
+    stream.log("Waiting for labels to appear.", COLOR_BLACK);
+    stream.overlay().add_log("Waiting for labels to appear.", COLOR_WHITE);
+    pbf_wait(context, 2400ms);
+    context.wait_for_all_requests();
+
+    //Now read in plate labels and store which plate has what
+    stream.log("Reading plate labels.", COLOR_BLACK);
+    stream.overlay().add_log("Reading plate labels.", COLOR_WHITE);
+
+    std::vector<std::string> plate_order;
+
+    SandwichPlateDetector left_plate_detector(stream.logger(), COLOR_RED, language, SandwichPlateDetector::Side::LEFT);
+    SandwichPlateDetector middle_plate_detector(stream.logger(), COLOR_RED, language, SandwichPlateDetector::Side::MIDDLE);
+    SandwichPlateDetector right_plate_detector(stream.logger(), COLOR_RED, language, SandwichPlateDetector::Side::RIGHT);
+    bool left_plate_absent = false;
+    bool right_plate_absent = false;
+    {
+        VideoSnapshot screen = stream.video().snapshot();
+
+        const int max_read_label_tries = 4;
+        for (int read_label_try_count = 0; read_label_try_count < max_read_label_tries; ++read_label_try_count){
+            std::string center_filling = middle_plate_detector.detect_filling_name(screen);
+            if (center_filling.empty()){
+                if (read_label_try_count + 1 < max_read_label_tries){
+                    // Wait more time
+                    pbf_wait(context, 2000ms);
+                    context.wait_for_all_requests();
+                    screen = stream.video().snapshot();
+                    continue;
+                }else{
+                    stream.log("Read nothing on center plate label.");
+                    OperationFailedExceptionWithScreenshot::fire(
+                        ErrorReportMode::SEND_ERROR_REPORT,
+                        "run_sandwich_maker: No ingredient found on center plate label.\n" + language_warning(language),
+                        stream,
+                        std::move(screen)
+                    );
+                }
+            }
+            stream.log("Read center plate label: " + center_filling);
+            stream.overlay().add_log("Center plate: " + center_filling);
+            plate_order.push_back(center_filling);
+            break;
+        }
+
+        //Get left (2nd) ingredient
+        std::string left_filling = left_plate_detector.detect_filling_name(screen);
+        left_plate_absent = left_filling.empty();
+        if (left_plate_absent){
+            stream.log("No ingredient found on left label.");
+            stream.overlay().add_log("No left plate");
+        }else{
+            stream.log("Read left plate label: " + left_filling);
+            stream.overlay().add_log("Left plate: " + left_filling);
+            plate_order.push_back(left_filling);
+        }
+
+        //Get right (3rd) ingredient
+        std::string right_filling = right_plate_detector.detect_filling_name(screen);
+        right_plate_absent = right_filling.empty();
+        if (right_plate_absent){
+            stream.log("No ingredient found on right label.");
+            stream.overlay().add_log("No right plate");
+        }else{
+            stream.log("Read right plate label: " + right_filling);
+            stream.overlay().add_log("Right plate: " + right_filling);
+            plate_order.push_back(right_filling);
+        }
+
+        //Get remaining ingredients if any
+        //center 1, left 2, right 3, far left 4, far far left/right 5, right 6
+        //this differs from the game layout: far right is 5 and far far left/right is 6 in game
+        //however as long as we stay internally consistent with this numbering it will work
+        for (int i = 0; i < (plates - 3); i++){
+            pbf_press_button(context, BUTTON_R, 160ms, 1440ms);
+            context.wait_for_all_requests();
+
+            screen = stream.video().snapshot();
+            left_filling = left_plate_detector.detect_filling_name(screen);
+
+            if (left_filling.empty()){
+                OperationFailedExceptionWithScreenshot::fire(
+                    ErrorReportMode::SEND_ERROR_REPORT,
+                    "No ingredient label found on remaining plate " + std::to_string(i) + ".",
+                    stream,
+                    std::move(screen)
+                );
+            }
+            stream.log("Read remaining plate " + std::to_string(i) + " label: " + left_filling);
+            stream.overlay().add_log("Remaining plate " + std::to_string(i) + ": " + left_filling);
+            plate_order.push_back(left_filling);
+        }
+
+        //Now re-center plates
+        stream.log("Re-centering plates if needed.");
+        stream.overlay().add_log("Re-centering plates if needed.");
+        for (int i = 0; i < (plates - 3); i++){
+            pbf_press_button(context, BUTTON_L, 160ms, 640ms);
+        }
+
+        //If a label fails to read it'll cause issues down the line
+        if ((int)plate_order.size() != plates){
+            env.log("Found # plate labels " + std::to_string(plate_order.size()) + ", not same as desired # plates " + std::to_string(plates));
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "Number of plate labels did not match number of plates.",
+                stream,
+                std::move(screen)
+            );
+        }
+    }
+
+    //Finally.
+    stream.log("Start making sandwich", COLOR_BLACK);
+    stream.overlay().add_log("Start making sandwich.", COLOR_WHITE);
+
+    const ImageFloatBox center_plate{ 0.455, 0.130, 0.090, 0.030 };
+    const ImageFloatBox left_plate{ 0.190, 0.136, 0.096, 0.031 };
+    const ImageFloatBox right_plate{ 0.715, 0.140, 0.108, 0.033 };
+
+    ImageFloatBox target_plate = center_plate;
+    //Initial position handling
+    auto end_box = move_sandwich_hand(
+        env,
+        stream, context,
+        SandwichHandType::FREE,
+        false,
+        HAND_INITIAL_BOX,
+        HAND_INITIAL_BOX
+    );
+    move_sandwich_hand(
+        env,
+        stream, context,
+        SandwichHandType::GRABBING,
+        true,
+        { 0, 0, 1.0, 1.0 },
+        HAND_INITIAL_BOX
+    );
+    context.wait_for_all_requests();
+
+    //Find fillings and add them in order
+    for (const std::string& expected_filling : fillings_sorted){
+        //cout << "Placing " << expected_filling << endl;
+        stream.log("Placing " + expected_filling, COLOR_WHITE);
+        stream.overlay().add_log("Placing " + expected_filling, COLOR_WHITE);
+
+        int times_to_place = (int)(FillingsCoordinates::instance().get_filling_information(expected_filling).piecesPerServing) * (fillings.find(expected_filling)->second);
+        int placement_number = 0;
+
+        //cout << "Times to place: " << times_to_place << endl;
+        stream.log("Times to place: " + std::to_string(times_to_place), COLOR_WHITE);
+        stream.overlay().add_log("Times to place: " + std::to_string(times_to_place), COLOR_WHITE);
+
+        std::vector<int> plate_index;
+        //Get the plates we want to go to
+        bool found_plate_index = false;
+        for (int j = 0; j < (int)plate_order.size(); j++){
+            if (expected_filling == plate_order.at(j)){
+                plate_index.push_back(j);
+                found_plate_index = true;
+            }
+        }
+        if (!found_plate_index){
+            // expected_filling not found within plate_order
+            stream.log("The expected filling not found within the plates.", COLOR_ORANGE);
+            if (plate_order.size() == 1){ // if there's only one plate, we assume it's the expected filling
+                stream.log("There's only one plate, so we assume it's the expected filling.");
+                plate_index.push_back(0);
+            }else{
+                OperationFailedExceptionWithScreenshot::fire(
+                    ErrorReportMode::SEND_ERROR_REPORT,
+                    "run_sandwich_maker(): Did not detect the expected ingredients on the plate(s).",
+                    stream
+                );
+            }
+                 
+        }
+
+
+        //Target the correct filling plate and place until it is empty
+        for (int j = 0; j < (int)plate_index.size(); j++){
+            //Navigate to plate and set target plate
+            //cout << "Target plate: " << plate_index.at(j) << endl;
+            stream.log("Target plate: " + std::to_string(plate_index.at(j)), COLOR_WHITE);
+            stream.overlay().add_log("Target plate: " + std::to_string(plate_index.at(j)), COLOR_WHITE);
+            SandwichPlateDetector::Side target_plate_label = SandwichPlateDetector::Side::MIDDLE;
+            switch (plate_index.at(j)){
+            case 0:
+                target_plate = center_plate;
+                break;
+            case 1:
+                target_plate = left_plate;
+                target_plate_label = SandwichPlateDetector::Side::LEFT;
+                break;
+            case 2:
+                target_plate = right_plate;
+                target_plate_label = SandwichPlateDetector::Side::RIGHT;
+                break;
+            case 3: case 4: case 5: case 6:
+                //Press R the appropriate number of times
+                for (int k = 2; k < plate_index.at(j); k++){
+                    pbf_press_button(context, BUTTON_R, 160ms, 640ms);
+                }
+                target_plate = left_plate;
+                target_plate_label = SandwichPlateDetector::Side::LEFT;
+                break;
+            default:
+                break;
+            }
+
+            // place down all the ingredients for the current plate.
+            //Place the fillings until label does not light up yellow on grab/the piece count is not hit
+            while (true){
+                //Break out after placing all pieces of the filling
+                if (placement_number == times_to_place){
+                    stream.log("We have placed down enough ingredients of that type, so we assume our current plate is empty. Move on to the next plate/ingredient.", COLOR_ORANGE);
+                    break;
+                }
+
+                end_box = move_sandwich_hand(
+                    env,
+                    stream, context,
+                    SandwichHandType::FREE,
+                    false,
+                    { 0, 0, 1.0, 1.0 },
+                    target_plate
+                );
+                context.wait_for_all_requests();
+
+                //Get placement location
+                ImageFloatBox placement_target = FillingsCoordinates::instance().get_filling_information(expected_filling).placementCoordinates.at(
+                    (int)fillings.find(expected_filling)->second).at(placement_number);
+
+                HandMoveData hand_move_data = move_sandwich_hand_and_check_if_plates_empty(
+                    env,
+                    stream, context,
+                    SandwichHandType::GRABBING,
+                    true,
+                    expand_box(end_box),
+                    placement_target,
+                    target_plate_label
+                );
+                end_box = hand_move_data.end_box;
+                context.wait_for_all_requests();
+
+                // If the current plate is empty, break out of the loop and move on to the next plate.
+                if (hand_move_data.plate_empty){
+                    context.wait_for_all_requests();
+                    stream.log("Our current plate label is NOT yellow, so we assume our current plate is empty. Move on to the next plate.", COLOR_ORANGE);
+                    break;
+                }
+
+                stream.log("Our current plate label is yellow, so we assume our current plate is NOT empty. Continue with the current plate.", COLOR_YELLOW);
+
+                //If the plate is empty the increment is skipped using the above break
+                placement_number++;
+            }
+
+            //Reset plate positions
+            for (int k = 2; k < plate_index.at(j); k++){
+                pbf_press_button(context, BUTTON_L, 160ms, 640ms);
+            }
+        }
+    }
+
+    context.wait_for_all_requests();
+    context.wait_for(Milliseconds(500));
+    stream.log("All ingredients should now be empty. Wait for upper bread.", COLOR_YELLOW);
+    // Handle top slice by tossing it away
+    SandwichHandWatcher grabbing_hand(SandwichHandType::GRABBING, { 0, 0, 1.0, 1.0 });
+    int ret = wait_until(stream, context, std::chrono::seconds(30), { grabbing_hand });
+    if (ret < 0){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "SandwichMaker: Cannot detect grabbing hand when waiting for upper bread.",
+            stream,
+            grabbing_hand.last_snapshot()
+        );
+    }
+
+    auto hand_box = hand_location_to_box(grabbing_hand.location());
+
+    end_box = move_sandwich_hand(
+        env,
+        stream, context,
+        SandwichHandType::GRABBING,
+        false,
+        expand_box(hand_box),
+        center_plate
+    );
+    pbf_mash_button(context, BUTTON_A, 5000ms);
+
+    env.log("Hand end box " + box_to_string(end_box));
+    env.log("Built sandwich", COLOR_BLACK);
+    // env.console.overlay().add_log("Hand end box " + box_to_string(end_box), COLOR_WHITE);
+    stream.overlay().add_log("Built sandwich.", COLOR_WHITE);
+    context.wait_for_all_requests();
+
+    finish_sandwich_eating(env.program_info(), stream, context);
+}
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Sandwiches/PokemonSV_SandwichRoutines.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Sandwiches/PokemonSV_SandwichRoutines.h
new file mode 100644
index 0000000000..a1334acc99
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Sandwiches/PokemonSV_SandwichRoutines.h
@@ -0,0 +1,128 @@
+/*  Sandwich Routines
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  Various functions to do sandwich making related automation.
+ *  This file is used to share sandwich related code among different programs (egg auto, sandwich auto, etc.).
+ */
+
+#ifndef PokemonAutomation_PokemonSV_SandwichRoutines_H
+#define PokemonAutomation_PokemonSV_SandwichRoutines_H
+
+#include <cstddef>
+#include "CommonFramework/Language.h"
+#include "CommonFramework/Tools/VideoStream.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+#include "VideoGames/PokemonSV/Options/PokemonSV_SandwichMakerOption.h"
+
+namespace PokemonAutomation{
+    
+    struct ProgramInfo;
+    class ProgramEnvironment;
+
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+// Assuming at picnic table, press A to start making sandwich.
+// The function returns when the game shows the sandwich recipe menu.
+// Return true if it enters the recipe menu. Return false if there is no ingredients on the plyaer character so
+// no sandwich can be made.
+bool enter_sandwich_recipe_list(
+    const ProgramInfo& info,
+    VideoStream& stream, ProControllerContext& context
+);
+
+// Starting at sandwich recipe selection menu, select the desired sandwich recipe and press A to enter
+// the making sandwich mini game. It will use the first sandwich pick in the sandwich pick selection list.
+// sandwich_index: [1, 151].
+// Return true if it successfully finds and starts the recipe.
+// Return false if the function fails to find the recipe. This could be that ingredients are not enough, and therefore
+// the recipe cell is semi-transparent, failed to be detected.
+bool select_sandwich_recipe(
+    const ProgramInfo& info,
+    VideoStream& stream, ProControllerContext& context,
+    size_t sandwich_index
+);
+
+// Assuming sandwich is made, press A repeatedly to finish eating animation until returning to picnic
+void finish_sandwich_eating(
+    const ProgramInfo& info,
+    VideoStream& stream, ProControllerContext& context
+);
+
+// Assuming at sanwich recipe list, press X to enter custom sandwich mode
+void enter_custom_sandwich_mode(
+    const ProgramInfo& info,
+    VideoStream& stream, ProControllerContext& context
+);
+
+enum class EggSandwichType{
+    GREAT_PEANUT_BUTTER,
+    TWO_SWEET_HERBS,
+    BITTER_SWEET_HERBS,
+    SALTY_SWEET_HERBS
+};
+
+// Assuming starting at the custom sandwich mode,
+// select lettuce (assuming the first entry in the filling list), then select two herbs (two sweets, bitter sweet or salty sweet) in the end
+// of the condiments list. The location of herbs are set by `xxx_herb_index_last`:
+// if a herb is the last entry, set `xxx_herb_index_last` to 0;
+// if a herb is second to last, set `xxx_herb_index_last` to 1; ...
+// It will use the first sandwich pick in the sandwich pick selection list.
+// After entering sandiwich mini game, it will drop the filling to quickly make a two-herb only sandwich to gain egg power lv 3.
+void make_two_herbs_sandwich(
+    ProgramEnvironment& env,
+    VideoStream& stream, ProControllerContext& context,
+    EggSandwichType sandwich_type,
+    size_t sweet_herb_index_last,
+    size_t salty_herb_index_last,
+    size_t bitter_herb_index_last
+);
+// Assuming starting at the custom sandwich mode,
+// select lettuce and two herbs (two sweets, bitter sweet or salty sweet according to `sandwich_type`).
+// It will use the first sandwich pick in the sandwich pick selection list.
+// After entering sandiwich mini game, it will drop the filling to quickly make a two-herb only sandwich to gain egg power lv 3.
+void make_two_herbs_sandwich(
+    ProgramEnvironment& env,
+    VideoStream& stream, ProControllerContext& context,
+    EggSandwichType sandwich_type,
+    Language language
+);
+
+// Assuming starting at the sandwich recipe list,
+// Process sandwich options and make a custom sandwich by calling make_sandwich_preset
+void make_sandwich_option(
+    ProgramEnvironment& env,
+    VideoStream& stream, ProControllerContext& context,
+    SandwichMakerOption& SANDWICH_OPTIONS
+);
+
+// Assuming starting at the sandwich recipe list, make a sandwich given a preset ingredient/filling list
+// calls run_sandwich_maker() when done
+// ex. fillings = {{"apple", (uint8_t)1}}; condiments = {{"marmalade", (uint8_t)1}};
+// make_sandwich_preset(env, context, language, fillings, condiments);
+void make_sandwich_preset(
+    ProgramEnvironment& env,
+    VideoStream& stream, ProControllerContext& context,
+    Language language,
+    std::map<std::string, uint8_t>& fillings,
+    std::map<std::string, uint8_t>& condiments
+);
+
+// Assuming starting waiting for sandwich hand,
+// Take a list of ingredients and make a sandwich
+// Not meant to be run directly, use make_sandwich_option() or make_sandwich_preset() instead
+// make great pb sandwich does call this directly, as it skips the custom sandwich menu
+void run_sandwich_maker(
+    ProgramEnvironment& env,
+    VideoStream& stream, ProControllerContext& context,
+    Language language,
+    std::map<std::string, uint8_t>& fillings,
+    std::vector<std::string>& fillings_sorted,
+    int& plates
+);
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ShinyHunting/PokemonSV_AreaZeroPlatform.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ShinyHunting/PokemonSV_AreaZeroPlatform.cpp
new file mode 100644
index 0000000000..8ab03c2d0f
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ShinyHunting/PokemonSV_AreaZeroPlatform.cpp
@@ -0,0 +1,551 @@
+/*  Area Zero Platform
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <algorithm>
+#include <cmath>
+#include "Common/Cpp/PrettyPrint.h"
+#include "Kernels/Waterfill/Kernels_Waterfill_Session.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonFramework/Tools/ProgramEnvironment.h"
+#include "CommonTools/Images/BinaryImage_FilterRgb32.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_AreaZeroSkyDetector.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_AreaZero.h"
+#include "PokemonSV_LetsGoTools.h"
+#include "PokemonSV_AreaZeroPlatform.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+using namespace Pokemon;
+
+
+
+PlatformResetSettings::~PlatformResetSettings(){
+    ENCOUNTERS_IN_WINDOW.remove_listener(*this);
+    KILLS_IN_WINDOW0.remove_listener(*this);
+    WINDOW_IN_MINUTES.remove_listener(*this);
+}
+PlatformResetSettings::PlatformResetSettings()
+    : GroupOption(
+        "Platform Reset Conditions",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        GroupOption::EnableMode::DEFAULT_ENABLED
+    )
+    , m_description(
+        "A \"Platform Reset\" is when you fly to Zero Gate, then return to the "
+        "platform. This is usually done to recover from falling off the "
+        "platform or to reset the spawns on the platform.<br><br>"
+        "The reason for resetting spawns is that over time, the " + STRING_POKEMON +
+        " can spawn in inaccessible places. When there are too few spawns, the "
+        "kill and encounter rates will drop to very inefficient levels. "
+        "Resetting the spawns will fix this, at the cost of also despawning any "
+        "shinies that have not yet been encountered."
+    )
+    , m_sliding_window("")
+    , WINDOW_IN_MINUTES(
+        "<b>Time Window (in minutes):</b><br>The sliding time window for which to watch for kills and encounters.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        10
+    )
+    , KILLS_IN_WINDOW0(
+        "<b>Kills in Window:</b><br>If the number of kills in the last X seconds has drops below this value, consider resetting.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        20
+    )
+    , ENCOUNTERS_IN_WINDOW(
+        "<b>Encounters in Window:</b><br>If the number of encounters in the last X seconds has drops below this value, consider resetting.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        5
+    )
+#if 0
+    , RESET_DURATION_MINUTES(
+        "<b>Reset Duration (minutes):</b><br>If you are resetting, reset the game every "
+        "this many minutes.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        180
+    )
+#endif
+{
+    PA_ADD_STATIC(m_description);
+
+    PA_ADD_STATIC(m_sliding_window);
+    PA_ADD_OPTION(WINDOW_IN_MINUTES);
+    PA_ADD_OPTION(KILLS_IN_WINDOW0);
+    PA_ADD_OPTION(ENCOUNTERS_IN_WINDOW);
+
+//    PA_ADD_OPTION(RESET_DURATION_MINUTES);
+
+    PlatformResetSettings::on_config_value_changed(this);
+
+    WINDOW_IN_MINUTES.add_listener(*this);
+    KILLS_IN_WINDOW0.add_listener(*this);
+    ENCOUNTERS_IN_WINDOW.add_listener(*this);
+}
+
+std::string int_to_text(size_t value, const std::string& unit){
+    std::string str = "<b><em>" + std::to_string(value) + "</em></b> ";
+    str += unit;
+    if (value != 1){
+        str += "s";
+    }
+    return str;
+}
+void PlatformResetSettings::on_config_value_changed(void* object){
+    m_sliding_window.set_text(
+        "<font color=\"red\">Perform a platform reset if there are fewer than " + int_to_text(KILLS_IN_WINDOW0, "kill") +
+        " and " + int_to_text(ENCOUNTERS_IN_WINDOW, "encounter") +
+        " in the last " + int_to_text(WINDOW_IN_MINUTES, "minute") + ".</font>"
+    );
+}
+
+
+NavigatePlatformSettings::NavigatePlatformSettings()
+    : GroupOption("Navigate to Platform Settings", LockMode::UNLOCK_WHILE_RUNNING)
+    , m_description(
+        "These settings are used when traveling from Zero Gate to the platform. "
+        "This can happen either at program start or during a platform reset."
+    )
+    , HEAL_AT_STATION(
+        "<b>Heal at Station:</b><br>If you're passing through the station, take the opportunity to heal up.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        true
+    )
+    , STATION_ARRIVE_PAUSE_SECONDS(
+        "<b>Station Arrive Pause Time:</b><br>Pause for this many seconds after leaving the station. "
+        "This gives the game time to load and thus reduce the chance of lag affecting the flight path.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        1
+    )
+    , MIDAIR_PAUSE_TIME0(
+        "<b>Mid-Air Pause Time:</b><br>Pause for this long before final approach to the platform. "
+        "Too small and you may crash into the wall above the platform or have reduced spawns. "
+        "Too large and you may undershoot the platform.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        "400 ms"
+    )
+{
+    PA_ADD_STATIC(m_description);
+    PA_ADD_OPTION(HEAL_AT_STATION);
+    PA_ADD_OPTION(STATION_ARRIVE_PAUSE_SECONDS);
+    PA_ADD_OPTION(MIDAIR_PAUSE_TIME0);
+}
+
+
+void inside_zero_gate_to_platform(
+    const ProgramInfo& info,
+    VideoStream& stream, ProControllerContext& context,
+    bool flying_unlocked,
+    NavigatePlatformSettings& settings
+){
+    inside_zero_gate_to_station(info, stream, context, 2, settings.HEAL_AT_STATION);
+
+    context.wait_for(std::chrono::seconds(settings.STATION_ARRIVE_PAUSE_SECONDS));
+
+    //  Navigate to platform.
+#if 0
+    //  Don't jump to avoid spawn.
+    pbf_press_button(context, BUTTON_PLUS, 160ms, 840ms);
+    pbf_move_left_joystick(context, {0, +1}, 5000ms, 0ms);
+    ssf_press_button(context, BUTTON_B, 0ms, 400ms);
+    pbf_move_left_joystick(context, {0, +1}, 2000ms, 0ms);
+    pbf_move_left_joystick(context, 160, 0, 4800ms, 0ms);
+    pbf_move_left_joystick(context, {0, +1}, 15000ms, 0ms);
+#endif
+
+#if 0
+    //  Jump late.
+    pbf_press_button(context, BUTTON_PLUS, 160ms, 840ms);
+
+    ssf_press_joystick(context, true, 128, 0, 315, 500);
+
+    //  Jump
+    ssf_press_button(context, BUTTON_B, 125, 100);
+
+    //  Fly
+    ssf_press_button(context, BUTTON_B, 0ms, 400ms);
+
+    pbf_move_left_joystick(context, 144, 0, 1150, 0);
+    pbf_move_left_joystick(context, 128, 0, 125, NAVIGATE_TO_PLATFORM.MIDAIR_PAUSE_TIME);
+
+    pbf_move_left_joystick(context, 128, 0, 1375, 250);
+#endif
+
+#if 0
+    //  Jump earlier.
+    pbf_press_button(context, BUTTON_PLUS, 160ms, 840ms);
+
+    ssf_press_joystick(context, true, 128, 0, 280, 500);
+
+    //  Jump
+    ssf_press_button(context, BUTTON_B, 125, 100);
+
+    //  Fly
+    ssf_press_button(context, BUTTON_B, 0ms, 400ms);
+
+    pbf_move_left_joystick(context, 144, 0, 1150, 0);
+    pbf_move_left_joystick(context, 128, 0, 125, NAVIGATE_TO_PLATFORM.MIDAIR_PAUSE_TIME);
+
+    pbf_move_left_joystick(context, 128, 0, 1375, 250);
+#endif
+
+#if 1
+    //  Jump on the downhill to improve chance of clearing things.
+    pbf_move_left_joystick(context, {+0.5, +1}, 160ms, 840ms);
+    pbf_press_button(context, BUTTON_L | BUTTON_PLUS, 160ms, 840ms);
+
+    ssf_press_button(context, BUTTON_LCLICK, 0ms, 4000ms);
+    if (!flying_unlocked){
+        ssf_press_left_joystick(context, {0, +1}, 1000ms, 10000ms);
+    }else{
+        ssf_press_left_joystick(context, {0, +1}, 1000ms, 7000ms);
+    }
+
+    //  Jump
+    ssf_press_button(context, BUTTON_B, 1000ms, 800ms);
+
+    //  Fly
+    ssf_press_button(context, BUTTON_B, 0ms, 160ms, 80ms);  //  Double up this press in
+    ssf_press_button(context, BUTTON_B, 0ms, 160ms);        //  case one is dropped.
+
+    if (!flying_unlocked){
+//        ssf_press_left_joystick(context, {0, +1}, 375, 875);
+        pbf_move_left_joystick(context, {+0.126, +1}, 5600ms, 0ms);
+        pbf_move_left_joystick(context, {0, +1}, 1000ms, settings.MIDAIR_PAUSE_TIME0);
+        pbf_move_left_joystick(context, {0, +1}, 7000ms, 2000ms);
+    }else{
+//        ssf_press_button(context, BUTTON_B, 0, 20);
+//        pbf_move_left_joystick(context, {0, +1}, 375, 250);
+        pbf_move_left_joystick(context, {+0.283, +1}, 1000ms, settings.MIDAIR_PAUSE_TIME0);
+        pbf_press_button(context, BUTTON_LCLICK, 400ms, 0ms);
+        ssf_press_right_joystick(context, {0, -1}, 0ms, 12000ms);
+        pbf_move_left_joystick(context, {0, -1}, 12800ms, 1000ms);
+
+        pbf_press_button(context, BUTTON_B, 1000ms, 3000ms);
+
+    }
+#endif
+
+//    context.wait_for_all_requests();
+    pbf_press_button(context, BUTTON_PLUS, 160ms, 840ms);
+    ssf_press_left_joystick(context, {0, +1}, 1000ms, 4000ms);
+    pbf_press_button(context, BUTTON_R, 160ms, 2840ms);
+    pbf_press_button(context, BUTTON_R, 160ms, 840ms);
+
+    context.wait_for_all_requests();
+}
+
+
+bool read_platform_center(
+    double& x, double& y,
+    const ProgramInfo& info, VideoStream& stream
+){
+    using namespace Kernels::Waterfill;
+
+    VideoSnapshot screen = stream.video().snapshot();
+    if (!screen){
+        return false;
+    }
+
+    PackedBinaryMatrix matrix = compress_rgb32_to_binary_range(screen, 0xff000040, 0xff8080ff);
+
+//    size_t min_width = screen.width() / 4;
+//    size_t min_height = screen.height() / 4;
+
+    WaterfillObject biggest;
+    WaterfillObject object;
+
+    std::unique_ptr<WaterfillSession> session = make_WaterfillSession(matrix);
+    size_t min_area = screen->width() * screen->height() / 10;
+    auto iter = session->make_iterator(min_area);
+    while (iter->find_next(object, false)){
+//        if (object.min_y != 0){
+//            continue;
+//        }
+        if (biggest.area < object.area){
+            biggest = std::move(object);
+        }
+    }
+
+    if (biggest.area == 0){
+        return false;
+    }
+
+    x = biggest.center_of_gravity_x() / screen->width();
+    y = biggest.center_of_gravity_y() / screen->height();
+
+    return true;
+}
+
+
+
+void area_zero_platform_run_path0(
+    ProgramEnvironment& env,
+    VideoStream& stream, ProControllerContext& context,
+    LetsGoEncounterBotTracker& tracker,
+    uint64_t iteration_count
+){
+    //  Go back to the wall.
+    stream.log("Go back to wall...");
+    use_lets_go_to_clear_in_front(stream, context, tracker, false, [&](ProControllerContext& context){
+        find_and_center_on_sky(env, stream, context);
+        pbf_move_right_joystick(context, {0, -1}, 640ms, 0ms);
+        pbf_move_left_joystick(context, {+0.378, -1}, 240ms, 0ms);
+        pbf_press_button(context, BUTTON_L, 160ms, 400ms);
+    });
+
+    use_lets_go_to_clear_in_front(stream, context, tracker, false, [&](ProControllerContext& context){
+        //  Move to wall.
+        pbf_move_left_joystick(context, {0, +1}, 4000ms, 0ms);
+
+        //  Turn around.
+        stream.log("Turning towards sky...");
+        pbf_move_left_joystick(context, {0, -1}, 240ms, 760ms);
+        pbf_press_button(context, BUTTON_L, 160ms, 400ms);
+    });
+
+    //  Move forward and kill everything in your path.
+    stream.log("Moving towards sky and killing everything...");
+    Milliseconds duration = 2600ms;
+    use_lets_go_to_clear_in_front(stream, context, tracker, true, [&](ProControllerContext& context){
+        find_and_center_on_sky(env, stream, context);
+        pbf_move_right_joystick(context, {0, -1}, 560ms, 0ms);
+
+        double x = 0;
+        switch (iteration_count % 4){
+        case 0:
+            x = -0.25;
+            duration = 2000ms;
+            break;
+        case 1:
+            x = -0.125;
+            break;
+        case 2:
+            x = 0;
+            break;
+        case 3:
+            x = -0.125;
+            break;
+        }
+
+        ssf_press_button(context, BUTTON_L, 0ms, 160ms);
+        pbf_move_left_joystick(context, {x, +1}, duration, 0ms);
+    });
+    use_lets_go_to_clear_in_front(stream, context, tracker, true, [&](ProControllerContext& context){
+        pbf_move_left_joystick(context, {0, -1}, duration, 4000ms);
+    });
+}
+void area_zero_platform_run_path1(
+    ProgramEnvironment& env,
+    VideoStream& stream, ProControllerContext& context,
+    LetsGoEncounterBotTracker& tracker,
+    uint64_t iteration_count
+){
+    //  Go back to the wall.
+    stream.log("Go back to wall...");
+    pbf_press_button(context, BUTTON_L, 160ms, 840ms);
+    use_lets_go_to_clear_in_front(stream, context, tracker, true, [&](ProControllerContext& context){
+        find_and_center_on_sky(env, stream, context);
+        pbf_move_right_joystick(context, {0, -1}, 640ms, 0ms);
+        pbf_move_left_joystick(context, {+0.5, -1}, 480ms, 0ms);
+    });
+
+    //  Clear path to the wall.
+    stream.log("Clear path to the wall...");
+    pbf_press_button(context, BUTTON_L, 160ms, 400ms);
+    use_lets_go_to_clear_in_front(stream, context, tracker, false, [&](ProControllerContext& context){
+        pbf_move_left_joystick(context, {0, +1}, 5000ms, 0ms);
+
+        //  Turn right.
+        pbf_move_left_joystick(context, {+1, 0}, 240ms, 0ms);
+        pbf_press_button(context, BUTTON_L, 160ms, 400ms);
+    });
+
+    //  Clear the wall.
+    stream.log("Clear the wall...");
+    Milliseconds duration = 2600ms;
+    use_lets_go_to_clear_in_front(stream, context, tracker, true, [&](ProControllerContext& context){
+        pbf_move_left_joystick(context, {+1, 0}, 1000ms, 0ms);
+        pbf_press_button(context, BUTTON_L, 160ms, 400ms);
+        context.wait_for_all_requests();
+
+        find_and_center_on_sky(env, stream, context);
+        pbf_move_left_joystick(context, {0, +1}, 400ms, 0ms);
+        pbf_press_button(context, BUTTON_L, 160ms, 240ms);
+
+        //  Move forward.
+
+        double x = 0;
+        switch (iteration_count % 4){
+        case 0:
+            x = -0.25;
+            duration = 2000ms;
+            break;
+        case 1:
+            x = -0.125;
+            break;
+        case 2:
+            x = 0;
+            break;
+        case 3:
+            x = -0.125;
+            break;
+        }
+
+        pbf_move_left_joystick(context, {x, +1}, duration, 0ms);
+    });
+
+    stream.log("Run backwards and wait...");
+    use_lets_go_to_clear_in_front(stream, context, tracker, true, [&](ProControllerContext& context){
+//        pbf_move_left_joystick(context, 64, 0, 1000ms, 0ms);
+//        pbf_press_button(context, BUTTON_L, 160ms, 840ms);
+        pbf_move_left_joystick(context, {0, -1}, duration, 4000ms);
+//        pbf_controller_state(context, 0, DPAD_NONE, 255, 255, 120, 128, 3000ms);
+    });
+}
+
+
+void direction_to_stick(
+    double& joystick_x, double& joystick_y,
+    double direction_x, double direction_y
+){
+//    cout << "direction = " << direction_x << ", " << direction_y << endl;
+
+    double scale = std::max(std::abs(direction_x), std::abs(direction_y));
+
+    joystick_x =  (direction_x / scale);
+    joystick_y = -(direction_y / scale);
+}
+void choose_path(
+    Logger& logger,
+    double& x, double& y, Milliseconds& duration,
+    double platform_x, double platform_y
+){
+    double diff_x = platform_x - 0.62;
+    double diff_y = platform_y - 0.71;
+
+    logger.log("Move Direction: x = " + tostr_default(diff_x) + ", y = " + tostr_default(diff_y), COLOR_BLUE);
+
+    direction_to_stick(x, y, diff_x, diff_y);
+    duration = std::min(
+        (Milliseconds)(int64_t)(std::sqrt(diff_x*diff_x + diff_y*diff_y) * 12000),
+        3200ms
+    );
+}
+void turn_angle(ProControllerContext& context, double angle_radians){
+    double turn_x, turn_y;
+    direction_to_stick(turn_x, turn_y, -std::sin(angle_radians), std::cos(angle_radians));
+    pbf_move_left_joystick(context, {turn_x, turn_y}, 320ms, 160ms);
+    pbf_mash_button(context, BUTTON_L, 480ms);
+}
+
+void area_zero_platform_run_path2(
+    ProgramEnvironment& env,
+    VideoStream& stream, ProControllerContext& context,
+    LetsGoEncounterBotTracker& tracker,
+    uint64_t iteration_count
+){
+    stream.log("Look forward and fire...");
+    pbf_mash_button(context, BUTTON_L, 480ms);
+
+    double platform_x, platform_y;
+    Milliseconds duration;
+    double move_x, move_y;
+    use_lets_go_to_clear_in_front(stream, context, tracker, true, [&](ProControllerContext& context){
+
+        stream.log("Find the sky, turn around and fire.");
+        pbf_move_right_joystick(context, {0, +1}, 480ms, 0ms);
+        find_and_center_on_sky(env, stream, context);
+        context.wait_for(std::chrono::seconds(1));
+        pbf_move_left_joystick(context, {0, -1}, 320ms, 680ms);
+        pbf_mash_button(context, BUTTON_L, 480ms);
+
+        pbf_move_right_joystick(context, {0, -1}, 2000ms, 0ms);
+        context.wait_for_all_requests();
+
+        stream.log("Finding center of platform...");
+        if (!read_platform_center(platform_x, platform_y, env.program_info(), stream)){
+            stream.log("Unable to find center of platform.", COLOR_RED);
+            return;
+        }
+        stream.log("Platform center at: x = " + tostr_default(platform_x) + ", y = " + tostr_default(platform_y), COLOR_BLUE);
+
+        choose_path(stream.logger(), move_x, move_y, duration, platform_x, platform_y);
+
+        pbf_move_left_joystick(context, {move_x, move_y}, 320ms, 160ms);
+        pbf_mash_button(context, BUTTON_L, 480ms);
+//        pbf_wait(context, 1250);
+    });
+    use_lets_go_to_clear_in_front(stream, context, tracker, duration > 800ms, [&](ProControllerContext& context){
+        stream.log("Making location correction...");
+        pbf_move_left_joystick(context, {0, +1}, duration, 0ms);
+
+        //  Optimization, calculate angle to aim you back at the sky.
+        //  This speeds up the "find_and_center_on_sky()" call.
+        double angle0 = std::atan2(move_x, -move_y);
+        double angle1 = angle0 >= 0 ? 6.2831853071795864769 - angle0 : -6.2831853071795864769 - angle0;
+        turn_angle(context, angle1);
+
+        find_and_center_on_sky(env, stream, context);
+        pbf_move_left_joystick(context, {-0.25, +1}, 320ms, 0ms);
+        pbf_mash_button(context, BUTTON_L, 480ms);
+    });
+
+    //  One in every 4 iterations: Clear wall of spawns.
+    if (iteration_count % 4 == 0){
+        stream.log("Turning along wall...");
+        pbf_move_left_joystick(context, {-1, -1}, 160ms, 160ms);
+        pbf_mash_button(context, BUTTON_L, 480ms);
+        use_lets_go_to_clear_in_front(stream, context, tracker, true, [&](ProControllerContext& context){
+            context.wait_for(std::chrono::milliseconds(1000));
+
+            stream.log("Turning back to sky.");
+            pbf_move_left_joystick(context, {+1, -1}, 160ms, 160ms);
+            pbf_mash_button(context, BUTTON_L, 480ms);
+            find_and_center_on_sky(env, stream, context);
+            pbf_move_left_joystick(context, {-0.25, +1}, 320ms, 0ms);
+            pbf_mash_button(context, BUTTON_L, 480ms);
+        });
+    }
+
+    if (platform_x < 0.5 || platform_y < 0.5){
+        stream.log("Not close enough to desired spot. Skipping forward attack...", COLOR_ORANGE);
+        return;
+    }
+
+    use_lets_go_to_clear_in_front(stream, context, tracker, true, [&](ProControllerContext& context){
+        stream.log("Move forward, fire, and retreat.");
+        switch (iteration_count % 3){
+        case 0:
+            pbf_move_left_joystick(context, {-0.15625, +1}, 2400ms, 0ms);
+            break;
+        case 1:
+            pbf_move_left_joystick(context, {0, +1}, 2400ms, 0ms);
+            break;
+        case 2:
+            pbf_move_left_joystick(context, {+0.15625, +1}, 2400ms, 0ms);
+            break;
+        }
+    });
+
+    use_lets_go_to_clear_in_front(stream, context, tracker, true, [&](ProControllerContext& context){
+        pbf_move_left_joystick(context, {0, -1}, 4000ms, 0ms);
+        pbf_move_left_joystick(context, {0, +1}, 480ms, 4000ms);
+    });
+}
+
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ShinyHunting/PokemonSV_AreaZeroPlatform.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ShinyHunting/PokemonSV_AreaZeroPlatform.h
new file mode 100644
index 0000000000..cbe1d6318f
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ShinyHunting/PokemonSV_AreaZeroPlatform.h
@@ -0,0 +1,110 @@
+/*  Area Zero Platform
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_AreaZeroPlatform_H
+#define PokemonAutomation_PokemonSV_AreaZeroPlatform_H
+
+#include "Common/Cpp/Options/GroupOption.h"
+#include "Common/Cpp/Options/StaticTextOption.h"
+#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "Common/Cpp/Options/TimeDurationOption.h"
+#include "CommonFramework/Tools/VideoStream.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+
+namespace PokemonAutomation{
+    struct ProgramInfo;
+    class ProgramEnvironment;
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+class LetsGoEncounterBotTracker;
+
+
+class PlatformResetSettings : public GroupOption, private ConfigOption::Listener{
+public:
+    ~PlatformResetSettings();
+    PlatformResetSettings();
+
+private:
+    virtual void on_config_value_changed(void* object) override;
+
+public:
+    StaticTextOption m_description;
+    StaticTextOption m_sliding_window;
+    SimpleIntegerOption<uint16_t> WINDOW_IN_MINUTES;
+    SimpleIntegerOption<uint16_t> KILLS_IN_WINDOW0;
+    SimpleIntegerOption<uint16_t> ENCOUNTERS_IN_WINDOW;
+//    SimpleIntegerOption<uint16_t> RESET_DURATION_MINUTES;
+};
+
+
+
+
+class NavigatePlatformSettings : public GroupOption{
+public:
+    NavigatePlatformSettings();
+
+public:
+    StaticTextOption m_description;
+    BooleanCheckBoxOption HEAL_AT_STATION;
+    SimpleIntegerOption<uint16_t> STATION_ARRIVE_PAUSE_SECONDS;
+    MillisecondsOption MIDAIR_PAUSE_TIME0;
+};
+
+void inside_zero_gate_to_platform(
+    const ProgramInfo& info,
+    VideoStream& stream, ProControllerContext& context,
+    bool flying_unlocked,
+    NavigatePlatformSettings& settings
+);
+
+
+
+
+bool read_platform_center(
+    double& x, double& y,
+    const ProgramInfo& info, VideoStream& stream
+);
+
+
+
+// Send Let's Go pokemon to beat wild pokemon while moving on the Area Zero platform following Path 0.
+// It tracks the kill chain by sound detection from `tracker`. The function does not handle any pokemon
+// battle encounters (turn-based battles).
+void area_zero_platform_run_path0(
+    ProgramEnvironment& env,
+    VideoStream& stream, ProControllerContext& context,
+    LetsGoEncounterBotTracker& tracker,
+    uint64_t iteration_count
+);
+// Send Let's Go pokemon to beat wild pokemon while moving on the Area Zero platform following Path 1.
+// It tracks the kill chain by sound detection from `tracker`. The function does not handle any pokemon
+// battle encounters (turn-based battles).
+void area_zero_platform_run_path1(
+    ProgramEnvironment& env,
+    VideoStream& stream, ProControllerContext& context,
+    LetsGoEncounterBotTracker& tracker,
+    uint64_t iteration_count
+);
+// Send Let's Go pokemon to beat wild pokemon while moving on the Area Zero platform following Path 2.
+// It tracks the kill chain by sound detection from `tracker`. The function does not handle any pokemon
+// battle encounters (turn-based battles).
+void area_zero_platform_run_path2(
+    ProgramEnvironment& env,
+    VideoStream& stream, ProControllerContext& context,
+    LetsGoEncounterBotTracker& tracker,
+    uint64_t iteration_count
+);
+
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ShinyHunting/PokemonSV_LetsGoTools.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ShinyHunting/PokemonSV_LetsGoTools.cpp
new file mode 100644
index 0000000000..d21bb3b405
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ShinyHunting/PokemonSV_LetsGoTools.cpp
@@ -0,0 +1,266 @@
+/*  Let's Go Tools
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <algorithm>
+#include "Common/Cpp/PrettyPrint.h"
+#include "CommonFramework/Logging/Logger.h"
+#include "CommonFramework/Exceptions/ProgramFinishedException.h"
+//#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+//#include "CommonFramework/Exceptions/FatalProgramException.h"
+#include "CommonFramework/Tools/ProgramEnvironment.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+//#include "Pokemon/Pokemon_Notification.h"
+//#include "VideoGames/PokemonSV/Options/PokemonSV_EncounterBotCommon.h"
+#include "VideoGames/PokemonSV/Inference/PokemonSV_SweatBubbleDetector.h"
+#include "VideoGames/PokemonSV/Programs/Battles/PokemonSV_Battles.h"
+//#include "VideoGames/PokemonSV/Programs/Battles/PokemonSV_BasicCatcher.h"
+#include "PokemonSV_LetsGoTools.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+using namespace Pokemon;
+
+
+
+EncounterRateTracker::EncounterRateTracker()
+    : m_start_time(current_time())
+{}
+bool EncounterRateTracker::get_encounters_in_window(
+    size_t& kills, size_t& encounters,
+    std::chrono::seconds time_window
+){
+    WallClock now = current_time();
+    WallClock threshold = now - time_window;
+
+    size_t index = std::lower_bound(m_kill_history.begin(), m_kill_history.end(), threshold) - m_kill_history.begin();
+//    cout << "kills index = " << index << endl;
+    kills = m_kill_history.size() - index;
+
+    index = std::lower_bound(m_encounter_history.begin(), m_encounter_history.end(), threshold) - m_encounter_history.begin();
+//    cout << "encounters index = " << index << endl;
+    encounters = m_encounter_history.size() - index;
+
+//    cout << "time_window: " << std::chrono::duration_cast<std::chrono::seconds>(time_window).count() << endl;
+//    cout << "m_start_time: " << std::chrono::duration_cast<std::chrono::seconds>(now - m_start_time).count() << endl;
+
+    return m_start_time <= threshold;
+}
+void EncounterRateTracker::report_start(WallClock now){
+    m_start_time = now;
+}
+void EncounterRateTracker::report_kill(){
+    WallClock now = current_time();
+    if (m_kill_history.empty() || m_kill_history.back() < now){
+        m_kill_history.push_back(now);
+        return;
+    }
+
+    global_logger_tagged().log(
+        "EncounterRateTracker: Detected that time has travelled backwards. Clearing history.",
+        COLOR_RED
+    );
+
+    m_kill_history.clear();
+    m_encounter_history.clear();
+    m_start_time = now;
+
+    m_kill_history.push_back(now);
+}
+void EncounterRateTracker::report_encounter(){
+    WallClock now = current_time();
+    if (m_encounter_history.empty() || m_encounter_history.back() < now){
+        m_encounter_history.push_back(now);
+        return;
+    }
+
+    global_logger_tagged().log(
+        "EncounterRateTracker: Detected that time has travelled backwards. Clearing history.",
+        COLOR_RED
+    );
+
+    m_kill_history.clear();
+    m_encounter_history.clear();
+    m_start_time = now;
+
+    m_encounter_history.push_back(now);
+}
+
+
+
+
+WallDuration DiscontiguousTimeTracker::last_window_in_realtime(
+    WallClock realtime_end,
+    WallDuration last_window_in_virtual_time
+){
+    if (m_blocks.empty()){
+        return WallDuration::zero();
+    }
+
+    WallDuration remaining(last_window_in_virtual_time);
+
+    auto iter = m_blocks.rbegin();
+    WallClock start;
+
+    do{
+        WallDuration block = iter->second - iter->first;
+        if (remaining > block){
+            remaining -= block;
+            start = iter->first;
+        }else{
+            start = iter->second - remaining;
+            return realtime_end - start;
+        }
+        ++iter;
+    }while (iter != m_blocks.rend());
+
+    return WallDuration::zero();
+}
+
+void DiscontiguousTimeTracker::add_block(WallClock start, WallClock end){
+    if (end <= start){
+        global_logger_tagged().log(
+            "DiscontiguousTimeTracker: Dropping invalid time block.",
+            COLOR_RED
+        );
+        return;
+    }
+    if (m_blocks.empty() || start >= m_blocks.back().second){
+        m_blocks.emplace_back(start, end);
+        return;
+    }
+    global_logger_tagged().log(
+        "DiscontiguousTimeTracker: Detected that time has travelled backwards. Clearing history.",
+        COLOR_RED
+    );
+    m_blocks.clear();
+    return;
+}
+
+
+
+
+
+
+LetsGoEncounterBotTracker::LetsGoEncounterBotTracker(
+    ProgramEnvironment& env,
+    VideoStream& stream,
+    LetsGoEncounterBotStats& stats,
+    LetsGoKillSoundDetector& kill_sound
+)
+    : m_kill_sound(kill_sound)
+{
+    m_kill_sound.set_detected_callback([&](float){
+        stream.log("Detected kill.");
+        m_encounter_rate.report_kill();
+        stats.m_kills++;
+        env.update_stats();
+        return false;
+    });
+}
+
+
+
+
+
+bool use_lets_go_to_clear_in_front(
+    VideoStream& stream, ProControllerContext& context,
+    LetsGoEncounterBotTracker& tracker,
+    bool throw_ball_if_bubble,
+    std::function<void(ProControllerContext& context)>&& command
+){
+//    ShinyHuntAreaZeroPlatform_Descriptor::Stats& stats = env.current_stats<ShinyHuntAreaZeroPlatform_Descriptor::Stats>();
+
+//    static int calls = 0;
+    stream.log("Clearing what's in front with Let's Go...");
+//    cout << calls++ << endl;
+
+    SweatBubbleWatcher bubble(COLOR_GREEN);
+    int ret = run_until<ProControllerContext>(
+        stream, context,
+        [](ProControllerContext& context){
+            pbf_press_button(context, BUTTON_R, 160ms, 1600ms);
+        },
+        {bubble}
+    );
+//    cout << "asdf" << endl;
+    if (ret == 0){
+        if (throw_ball_if_bubble){
+            stream.log("Detected sweat bubble. Throwing ball...");
+            pbf_mash_button(context, BUTTON_ZR, 5000ms);
+        }else{
+            stream.log("Detected sweat bubble. Will not throw ball.");
+        }
+    }else{
+        stream.log("Did not detect sweat bubble.");
+    }
+
+    context.wait_for_all_requests();
+    std::chrono::seconds timeout(6);
+    while (true){
+//        cout << "last kill: " << last_kill << endl;
+        if (command){
+//            cout << "running command..." << endl;
+            command(context);
+            context.wait_for_all_requests();
+            command = nullptr;
+        }else{
+//            cout << "Waiting out... " << timeout.count() << " seconds" << endl;
+            context.wait_until(tracker.last_kill() + timeout);
+        }
+//        timeout = std::chrono::seconds(3);
+
+        WallClock now = current_time();
+        WallClock last_kill_time = tracker.last_kill();
+        WallDuration last_kill;
+        if (last_kill_time == WallClock::min()){
+            stream.log("Last Kill: Never");
+            last_kill = WallDuration::max();
+        }else{
+            last_kill = now - last_kill_time;
+            stream.log(
+                "Last Kill: " +
+                tostr_fixed(std::chrono::duration_cast<Milliseconds>(last_kill).count() / 1000., 3) +
+                " seconds ago"
+            );
+        }
+
+        if (last_kill > timeout){
+//            cout << "no kill" << endl;
+            break;
+        }
+//        cout << "found kill" << endl;
+    }
+    stream.log("Nothing left to clear...");
+    tracker.throw_if_no_sound();
+    return tracker.last_kill() != WallClock::min();
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ShinyHunting/PokemonSV_LetsGoTools.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ShinyHunting/PokemonSV_LetsGoTools.h
new file mode 100644
index 0000000000..3e06d2019a
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ShinyHunting/PokemonSV_LetsGoTools.h
@@ -0,0 +1,207 @@
+/*  Let's Go Tools
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_LetsGoTools_H
+#define PokemonAutomation_PokemonSV_LetsGoTools_H
+
+#include <deque>
+#include <atomic>
+#include "Common/Cpp/Time.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonTools/Options/LanguageOCROption.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+#include "Pokemon/Pokemon_EncounterStats.h"
+#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_LetsGoKillDetector.h"
+#include "VideoGames/PokemonSV/Inference/Battles/PokemonSV_EncounterWatcher.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+    class CancellableScope;
+    class ProgramEnvironment;
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+using namespace Pokemon;
+
+class EncounterBotCommonOptions;
+
+
+
+class EncounterRateTracker{
+public:
+    EncounterRateTracker();
+
+    WallClock start_time() const{
+        return m_start_time;
+    }
+
+    //  Get the # of encounters in the last specified time window.
+    //  Returns false if the history is less than the window.
+    bool get_encounters_in_window(
+        size_t& kills, size_t& encounters,
+        std::chrono::seconds time_window
+    );
+
+    void report_start(WallClock now = current_time());
+    void report_kill();
+    void report_encounter();
+
+private:
+    WallClock m_start_time;
+
+    //  Note that this keeps the entire history. Nothing is dropped. This is
+    //  fine since it's unlikely we'll have enough encounters in one run to
+    //  cause memory issues.
+    std::deque<WallClock> m_kill_history;
+    std::deque<WallClock> m_encounter_history;
+};
+
+
+//  Consider a virtual timeline that starts and stops relative to the wall clock.
+//  Now you want to get the last X seconds of the virtual timeline, but on the
+//  wall clock instead. Because of the starts and stops, the last X seconds
+//  of virtual time will be less than the last X seconds of real time.
+//
+//  The use case here is the platform reset conditions. Resets are performed if
+//  the # of encounters in the last X time drops below Y. But only the time
+//  spent hunting for encounters should count. Time spent in battles or resets
+//  does not.
+//
+class DiscontiguousTimeTracker{
+public:
+    //  Returns zero if there is insufficient virtual time.
+    WallDuration last_window_in_realtime(
+        WallClock realtime_end,
+        WallDuration last_window_in_virtual_time
+    );
+
+    void add_block(WallClock start, WallClock end);
+
+private:
+    std::deque<std::pair<WallClock, WallClock>> m_blocks;
+};
+
+
+class LetsGoEncounterBotStats : public StatsTracker{
+public:
+    LetsGoEncounterBotStats()
+        : m_kills(m_stats["Kills"])
+        , m_encounters(m_stats["Encounters"])
+        , m_shinies(m_stats["Shinies"])
+    {
+        m_display_order.emplace_back("Kills");
+        m_display_order.emplace_back("Encounters");
+        m_display_order.emplace_back("Shinies");
+    }
+
+public:
+    std::atomic<uint64_t>& m_kills;
+    std::atomic<uint64_t>& m_encounters;
+    std::atomic<uint64_t>& m_shinies;
+};
+
+
+
+//  Used to track Let's Go kill chain progress, stats.
+//  It can also run `process_battle()` to handle pokemon battle encounters (turn-based battles)
+//  according to user options.
+class LetsGoEncounterBotTracker{
+public:
+    LetsGoEncounterBotTracker(
+        ProgramEnvironment& env,
+        VideoStream& stream,
+        LetsGoEncounterBotStats& stats,
+        LetsGoKillSoundDetector& kill_sound
+    );
+
+    void throw_if_no_sound(std::chrono::milliseconds min_duration = std::chrono::milliseconds(10000)) const{
+        m_kill_sound.throw_if_no_sound(min_duration);
+    }
+
+    WallClock encounter_rate_tracker_start_time() const{
+        return m_encounter_rate.start_time();
+    }
+    WallClock last_kill() const{
+        return m_kill_sound.last_kill();
+    }
+    EncounterRateTracker& encounter_rate_tracker(){
+        return m_encounter_rate;
+    }
+    EncounterFrequencies& encounter_frequencies(){
+        return m_encounter_frequencies;
+    }
+
+    //  Get the # of encounters in the last specified time window.
+    //  Returns false if the history is less than the window.
+    bool get_encounters_in_window(
+        size_t& kills, size_t& encounters,
+        std::chrono::seconds time_window
+    ){
+        return m_encounter_rate.get_encounters_in_window(kills, encounters, time_window);
+    }
+    void reset_rate_tracker_start_time(){
+        m_encounter_rate.report_start();
+    }
+
+private:
+    LetsGoKillSoundDetector& m_kill_sound;
+
+    EncounterRateTracker m_encounter_rate;
+    EncounterFrequencies m_encounter_frequencies;
+
+};
+
+
+
+
+//  Send your Pokemon out in front in Let's Go. Then run the specified command.
+//  Don't return until both the command has finished, and it appears the kill
+//  chain has ended.
+//  The function tracks kill chain by sound detection from `tracker`. The function
+//  does not handle any pokemon battle encounters (turn-based battles).
+bool use_lets_go_to_clear_in_front(
+    VideoStream& stream, ProControllerContext& context,
+    LetsGoEncounterBotTracker& tracker,
+    bool throw_ball_if_bubble,
+    std::function<void(ProControllerContext& context)>&& command
+);
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ShinyHunting/PokemonSV_ShinyHunt-AreaZeroPlatform.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ShinyHunting/PokemonSV_ShinyHunt-AreaZeroPlatform.cpp
new file mode 100644
index 0000000000..f107b6c755
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ShinyHunting/PokemonSV_ShinyHunt-AreaZeroPlatform.cpp
@@ -0,0 +1,606 @@
+/*  Shiny Hunt - Area Zero Platform
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <atomic>
+#include "Common/Cpp/PrettyPrint.h"
+#include "CommonFramework/StaticGlobals.h"
+#include "CommonFramework/Exceptions/ProgramFinishedException.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/Exceptions/FatalProgramException.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "CommonTools/StartupChecks/VideoResolutionCheck.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "VideoGames/PokemonSV/PokemonSV_Settings.h"
+#include "VideoGames/PokemonSV/Inference/Boxes/PokemonSV_IvJudgeReader.h"
+#include "VideoGames/PokemonSV/Programs/Eggs/PokemonSV_EggRoutines.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_AreaZero.h"
+#include "VideoGames/PokemonSV/Programs/Battles/PokemonSV_Battles.h"
+#include "VideoGames/PokemonSV/Programs/Sandwiches/PokemonSV_SandwichRoutines.h"
+#include "PokemonSV_LetsGoTools.h"
+#include "PokemonSV_ShinyHunt-AreaZeroPlatform.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+using namespace Pokemon;
+
+ShinyHuntAreaZeroPlatform_Descriptor::ShinyHuntAreaZeroPlatform_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonSV:ShinyHuntAreaZeroPlatform",
+        STRING_POKEMON + " SV", "Shiny Hunt - Area Zero Platform",
+        "Programs/PokemonSV/ShinyHunt-AreaZeroPlatform.html",
+        "Shiny hunt the isolated platform at the bottom of Area Zero.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::VIDEO_AUDIO,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+struct ShinyHuntAreaZeroPlatform_Descriptor::Stats : public LetsGoEncounterBotStats{
+    Stats()
+        : m_sandwiches(m_stats["Sandwiches"])
+        , m_autoheals(m_stats["Auto Heals"])
+        , m_platform_resets(m_stats["Platform Resets"])
+        , m_game_resets(m_stats["Game Resets"])
+        , m_errors(m_stats["Errors"])
+    {
+        m_display_order.insert(m_display_order.begin() + 2, {"Sandwiches", HIDDEN_IF_ZERO});
+        m_display_order.insert(m_display_order.begin() + 3, {"Auto Heals", HIDDEN_IF_ZERO});
+        m_display_order.insert(m_display_order.begin() + 4, {"Platform Resets", HIDDEN_IF_ZERO});
+        m_display_order.insert(m_display_order.begin() + 5, {"Game Resets", ALWAYS_HIDDEN});
+        m_display_order.insert(m_display_order.begin() + 6, {"Errors", HIDDEN_IF_ZERO});
+    }
+    std::atomic<uint64_t>& m_sandwiches;
+    std::atomic<uint64_t>& m_autoheals;
+    std::atomic<uint64_t>& m_platform_resets;
+    std::atomic<uint64_t>& m_game_resets;
+    std::atomic<uint64_t>& m_errors;
+};
+std::unique_ptr<StatsTracker> ShinyHuntAreaZeroPlatform_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+
+
+
+ShinyHuntAreaZeroPlatform::~ShinyHuntAreaZeroPlatform(){
+    MODE.remove_listener(*this);
+}
+
+ShinyHuntAreaZeroPlatform::ShinyHuntAreaZeroPlatform()
+    : LANGUAGE(
+        "<b>Game Language:</b>",
+        IV_READER().languages(),
+        LockMode::LOCK_WHILE_RUNNING,
+        true
+    )
+    , MODE(
+        "<b>Mode:</b><br>"
+        "If starting on the platform, you should stand near the center of the platform facing any direction.<br>"
+        "If starting at the Zero Gate fly spot, you should be at the fly spot as if you just flew there."
+        "<br>If making a sandwich, you should be at the Zero Gate fly spot as if you just flew there.",
+        {
+            {Mode::START_ON_PLATFORM,   "platform", "Start on platform."},
+            {Mode::START_AT_ZERO_GATE_FLY_SPOT,  "zerogate", "Start at Zero Gate fly spot."},
+            {Mode::MAKE_SANDWICH,       "sandwich", "Make a sandwich."},
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        Mode::START_ON_PLATFORM
+    )
+    , FLYING_UNLOCKED(
+        "<b>Flying Unlocked:</b><br>Check this box if you have unlocked your ride's ability to fly after completing the Indigo Disk DLC.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        true
+    )
+    , PATH0(
+        "<b>Path:</b><br>Traversal path on the platform to trigger encounters.",
+        {
+            {Path::PATH0, "path0", "Path 0"},
+            {Path::PATH1, "path1", "Path 1"},
+            {Path::PATH2, "path2", "Path 2"},
+        },
+        LockMode::UNLOCK_WHILE_RUNNING,
+        Path::PATH2
+    )
+    , SANDWICH_RESET_IN_MINUTES(
+        "<b>Sandwich Reset Time (in minutes):</b><br>The time to reset game to make a new sandwich.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        35
+    )
+    , SANDWICH_OPTIONS(
+        "Sandwich Options",
+        &LANGUAGE,
+        BaseRecipe::paradox,
+        false,
+        GroupOption::EnableMode::ALWAYS_ENABLED
+    )
+    , GO_HOME_WHEN_DONE(true)
+    , AUTO_HEAL_PERCENT(
+        "<b>Auto-Heal %</b><br>Auto-heal if your HP drops below this percentage.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        75, 0, 100
+    )
+    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_STATUS_UPDATE,
+        &ENCOUNTER_BOT_OPTIONS.NOTIFICATION_NONSHINY,
+        &ENCOUNTER_BOT_OPTIONS.NOTIFICATION_SHINY,
+        &ENCOUNTER_BOT_OPTIONS.NOTIFICATION_CATCH_SUCCESS,
+        &ENCOUNTER_BOT_OPTIONS.NOTIFICATION_CATCH_FAILED,
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_RECOVERABLE,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+{
+    PA_ADD_OPTION(LANGUAGE);
+    PA_ADD_OPTION(MODE);
+    PA_ADD_OPTION(FLYING_UNLOCKED);
+    if (STATIC_GLOBALS.DEVELOPER_MODE){
+        PA_ADD_OPTION(PATH0);
+    }
+    PA_ADD_OPTION(SANDWICH_RESET_IN_MINUTES);
+    PA_ADD_OPTION(SANDWICH_OPTIONS);
+    PA_ADD_OPTION(ENCOUNTER_BOT_OPTIONS);
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+    PA_ADD_OPTION(AUTO_HEAL_PERCENT);
+    PA_ADD_OPTION(PLATFORM_RESET);
+    PA_ADD_OPTION(NAVIGATE_TO_PLATFORM);
+    PA_ADD_OPTION(NOTIFICATIONS);
+
+    ShinyHuntAreaZeroPlatform::on_config_value_changed(this);
+
+    MODE.add_listener(*this);
+}
+
+std::string ShinyHuntAreaZeroPlatform::check_validity() const{
+    std::string error = SingleSwitchProgramInstance::check_validity();
+    if (!error.empty()){
+        return error;
+    }
+    if (LANGUAGE == Language::None && MODE == Mode::MAKE_SANDWICH){
+        return "Sandwich mode requires selecting a language.";
+    }
+    return "";
+}
+void ShinyHuntAreaZeroPlatform::on_config_value_changed(void* object){
+    ConfigOptionState state = MODE == Mode::MAKE_SANDWICH
+        ? ConfigOptionState::ENABLED
+        : ConfigOptionState::HIDDEN;
+    SANDWICH_RESET_IN_MINUTES.set_visibility(state);
+    SANDWICH_OPTIONS.set_visibility(state);
+}
+
+
+
+
+
+
+
+
+
+
+
+
+bool ShinyHuntAreaZeroPlatform::run_traversal(ProControllerContext& context){
+    ShinyHuntAreaZeroPlatform_Descriptor::Stats& stats = m_env->current_stats<ShinyHuntAreaZeroPlatform_Descriptor::Stats>();
+
+    const ProgramInfo& info = m_env->program_info();
+    VideoStream& stream = m_env->console;
+
+//    if (m_pending_save){
+//        save_game_from_overworld(info, console, context);
+//        m_pending_save = false;
+//        m_last_save = SavedLocation::AREA_ZERO;
+//    }
+
+    double hp = m_sensors->lets_go_hp.last_known_value() * 100;
+    if (0 < hp){
+        stream.log("Last Known HP: " + tostr_default(hp) + "%", COLOR_BLUE);
+    }else{
+        stream.log("Last Known HP: ?", COLOR_RED);
+    }
+    if (0 < hp && hp < AUTO_HEAL_PERCENT){
+        auto_heal_from_menu_or_overworld(info, stream, context, 0, true);
+        stats.m_autoheals++;
+        m_env->update_stats();
+    }
+
+    WallClock start = current_time();
+
+    size_t kills = 0, encounters = 0;
+    std::chrono::minutes window_minutes(PLATFORM_RESET.WINDOW_IN_MINUTES);
+    WallDuration window = m_time_tracker->last_window_in_realtime(start, window_minutes);
+
+    std::chrono::seconds window_seconds;
+    bool enough_time;
+    if (window == WallDuration::zero()){
+//        stream.log("Debug Reset Timer: Window not initialized.", COLOR_RED);
+
+        //  Not enough history.
+        enough_time = false;
+        window = start - m_encounter_tracker->encounter_rate_tracker_start_time();
+        window_seconds = std::chrono::duration_cast<Seconds>(window);
+        m_encounter_tracker->get_encounters_in_window(
+            kills, encounters, window_seconds
+        );
+    }else{
+//        stream.log("Debug Reset Timer: Window started.", COLOR_RED);
+
+        window_seconds = std::chrono::duration_cast<Seconds>(window);
+        enough_time = m_encounter_tracker->get_encounters_in_window(
+            kills, encounters, window_seconds
+        );
+    }
+    stream.log(
+        "Starting Traversal Iteration: " + tostr_u_commas(m_iterations) +
+        "\n    Time Window (Seconds): " + std::to_string(window_seconds.count()) +
+        "\n    Kills: " + std::to_string(kills) +
+        "\n    Encounters: " + std::to_string(encounters)
+    );
+
+    // Check we want to do a platform reset first:
+    do{
+        if (!PLATFORM_RESET.enabled()){
+            stream.log("Platform Reset: Disabled", COLOR_ORANGE);
+            break;
+        }
+        if (!enough_time){
+            stream.log("Platform Reset: Not enough time has elapsed.", COLOR_ORANGE);
+            break;
+        }
+        if (kills >= PLATFORM_RESET.KILLS_IN_WINDOW0){
+            stream.log("Platform Reset: Enough kills in window.", COLOR_ORANGE);
+            break;
+        }
+        if (encounters >= PLATFORM_RESET.ENCOUNTERS_IN_WINDOW){
+            stream.log("Platform Reset: Enough encounters in window.", COLOR_ORANGE);
+            break;
+        }
+
+        stream.log("Conditions met for platform reset.");
+        m_pending_platform_reset = true;
+//        m_state = State::LEAVE_AND_RETURN;
+        return false;
+    }while (false);
+
+    // Send Let's Go pokemon to beat wild pokemon while moving on the platform following one path.
+    // It tracks the kill chain by sound detection from `m_encounter_tracker`.
+    try{
+        switch (PATH0){
+        case Path::PATH0:
+            area_zero_platform_run_path0(*m_env, stream, context, *m_encounter_tracker, m_iterations);
+            break;
+        case Path::PATH1:
+            area_zero_platform_run_path1(*m_env, stream, context, *m_encounter_tracker, m_iterations);
+            break;
+        case Path::PATH2:
+            area_zero_platform_run_path2(*m_env, stream, context, *m_encounter_tracker, m_iterations);
+            break;
+        }
+        m_iterations++;
+    }catch (...){
+        m_time_tracker->add_block(start, current_time());
+        throw;
+    }
+
+    m_time_tracker->add_block(start, current_time());
+
+    return true;
+}
+
+
+struct ResetException{};
+
+
+void ShinyHuntAreaZeroPlatform::set_flags(SingleSwitchProgramEnvironment& env){
+//    ShinyHuntAreaZeroPlatform_Descriptor::Stats& stats = m_env->current_stats<ShinyHuntAreaZeroPlatform_Descriptor::Stats>();
+//    const ProgramInfo& info = m_env->program_info();
+    VideoStream& stream = m_env->console;
+
+    send_program_notification(
+        *m_env, NOTIFICATION_STATUS_UPDATE,
+        Color(0),
+        "Program Status",
+        {}, m_encounter_tracker->encounter_frequencies().dump_sorted_map("")
+    );
+
+    WallClock now = current_time();
+    if (MODE == Mode::MAKE_SANDWICH &&
+        m_last_sandwich + std::chrono::minutes(SANDWICH_RESET_IN_MINUTES) < now
+    ){
+        stream.log("Enough time has elapsed. Time to reset sandwich...");
+        m_pending_sandwich = true;
+    }
+
+    int64_t seconds_on_sandwich = std::chrono::duration_cast<std::chrono::seconds>(now - m_last_sandwich).count();
+    stream.log(
+        std::string("State:\n") +
+        "    Time on Sandwich: " + (m_last_sandwich == WallClock::min()
+            ? "N/A"
+            : std::to_string(seconds_on_sandwich)) + " seconds\n" +
+        "    Pending Save: " + (m_pending_save ? "Yes" : "No") + "\n" +
+        "    Pending Platform Reset: " + (m_pending_platform_reset ? "Yes" : "No") + "\n" +
+        "    Pending Sandwich: " + (m_pending_sandwich ? "Yes" : "No") + "\n" +
+        "    Reset after Sandwich: " + (m_reset_on_next_sandwich ? "Yes" : "No") + "\n"
+    );
+
+}
+void ShinyHuntAreaZeroPlatform::run_state(
+    SingleSwitchProgramEnvironment& env, ProControllerContext& context
+){
+    ShinyHuntAreaZeroPlatform_Descriptor::Stats& stats = m_env->current_stats<ShinyHuntAreaZeroPlatform_Descriptor::Stats>();
+    const ProgramInfo& info = m_env->program_info();
+    VideoStream& stream = m_env->console;
+
+    if (m_pending_save){
+        stream.log("Executing: Pending Save...");
+        if (m_current_location != Location::ZERO_GATE_FLY_SPOT && m_current_location != Location::AREA_ZERO){
+            return_to_outside_zero_gate(info, stream, context);
+            m_current_location = Location::ZERO_GATE_FLY_SPOT;
+        }
+        save_game_from_overworld(info, stream, context);
+        m_saved_location = m_current_location;
+        m_pending_save = false;
+        return;
+    }
+
+    if (m_pending_sandwich){
+        stream.log("Executing: Pending Sandwich...");
+
+        //  If we need to reset, do so now.
+        if (m_reset_on_next_sandwich){
+            throw ResetException();
+        }
+
+        //  If we're not at Zero Gate, go there now.
+        if (m_current_location != Location::ZERO_GATE_FLY_SPOT){
+            return_to_outside_zero_gate(info, stream, context);
+            m_current_location = Location::ZERO_GATE_FLY_SPOT;
+            m_pending_platform_reset = false;
+        }
+
+        m_reset_on_next_sandwich = true;
+
+        //  If we're not saved at Zero Gate, do it now.
+        if (m_saved_location != Location::ZERO_GATE_FLY_SPOT){
+            save_game_from_overworld(info, stream, context);
+            m_saved_location = m_current_location;
+        }
+
+        picnic_at_zero_gate(info, stream, context);
+        pbf_move_left_joystick(context, {0, +1}, 560ms, 0ms);
+        enter_sandwich_recipe_list(info, stream, context);
+        make_sandwich_option(env, stream, context, SANDWICH_OPTIONS);
+
+        stream.log("Sandwich Reset: Starting new sandwich timer...");
+        m_last_sandwich = current_time();
+
+        stats.m_sandwiches++;
+        m_env->update_stats();
+
+        leave_picnic(info, stream, context);
+        return_to_inside_zero_gate_from_picnic(info, stream, context);
+        inside_zero_gate_to_platform(info, stream, context, FLYING_UNLOCKED, NAVIGATE_TO_PLATFORM);
+        m_current_location = Location::AREA_ZERO;
+
+        m_pending_sandwich = false;
+
+        m_encounter_tracker->reset_rate_tracker_start_time();
+        m_consecutive_failures = 0;
+
+        return;
+    }
+
+    if (m_pending_platform_reset){
+        stream.log("Executing: Platform Reset");
+        return_to_inside_zero_gate(info, stream, context);
+        inside_zero_gate_to_platform(info, stream, context, FLYING_UNLOCKED, NAVIGATE_TO_PLATFORM);
+        m_current_location = Location::AREA_ZERO;
+
+        stats.m_platform_resets++;
+        m_env->update_stats();
+
+        m_pending_platform_reset = false;
+        m_encounter_tracker->reset_rate_tracker_start_time();
+        m_consecutive_failures = 0;
+        return;
+    }
+
+    switch (m_current_location){
+    case Location::UNKNOWN:
+    case Location::ZERO_GATE_FLY_SPOT:
+    case Location::TRAVELING_TO_PLATFORM:
+        stream.log("Executing: Platform Reset (state-based)...");
+        return_to_inside_zero_gate(info, stream, context);
+        inside_zero_gate_to_platform(info, stream, context, FLYING_UNLOCKED, NAVIGATE_TO_PLATFORM);
+        m_current_location = Location::AREA_ZERO;
+        m_pending_platform_reset = false;
+        m_encounter_tracker->reset_rate_tracker_start_time();
+        m_consecutive_failures = 0;
+        return;
+    case Location::AREA_ZERO:
+        stream.log("Executing: Traversal...");
+        try{
+            run_traversal(context);
+        }catch (OperationFailedException&){
+            m_pending_platform_reset = true;
+            throw;
+        }
+//        m_encounter_tracker->reset_rate_tracker_start_time();
+        m_consecutive_failures = 0;
+        return;
+    }
+}
+void ShinyHuntAreaZeroPlatform::set_flags_and_run_state(
+    SingleSwitchProgramEnvironment& env, ProControllerContext& context
+){
+    set_flags(env);
+
+    ShinyHuntAreaZeroPlatform_Descriptor::Stats& stats = m_env->current_stats<ShinyHuntAreaZeroPlatform_Descriptor::Stats>();
+//    const ProgramInfo& info = m_env->program_info();
+    VideoStream& stream = m_env->console;
+
+    try{
+        run_state(env, context);
+    }catch (OperationFailedExceptionWithScreenshot& e){
+        stats.m_errors++;
+        m_env->update_stats();
+        m_consecutive_failures++;
+        e.send_recoverable_error_notif_and_telemetry_report(env, NOTIFICATION_ERROR_RECOVERABLE);
+
+        if (m_consecutive_failures >= 3){
+            throw_and_log<FatalProgramException>(
+                stream.logger(),
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "Failed 3 times consecutively."
+            );
+        }
+    }
+}
+
+
+
+
+
+
+
+void ShinyHuntAreaZeroPlatform::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    m_env = &env;
+
+    ShinyHuntAreaZeroPlatform_Descriptor::Stats& stats = env.current_stats<ShinyHuntAreaZeroPlatform_Descriptor::Stats>();
+
+    assert_16_9_720p_min(env.logger(), env.console);
+
+    //  Connect the controller.
+    require_player(env.console, context, BUTTON_LCLICK);
+
+    m_iterations = 0;
+
+    OverworldSensors sensors(
+        env.logger(), env.console, context
+    );
+    m_sensors = &sensors;
+
+    OverworldBattleTracker battle_tracker(env.logger(), sensors);
+
+    DiscontiguousTimeTracker time_tracker;
+    m_time_tracker = &time_tracker;
+
+    LetsGoEncounterBotTracker encounter_tracker(
+        env, env.console,
+        stats,
+        sensors.lets_go_kill
+    );
+    m_encounter_tracker = &encounter_tracker;
+
+    m_saved_location = Location::UNKNOWN;
+    m_pending_save = false;
+    m_pending_platform_reset = false;
+    m_pending_sandwich = false;
+    m_reset_on_next_sandwich = false;
+
+    switch (MODE){
+    case Mode::START_ON_PLATFORM:
+        m_current_location = Location::AREA_ZERO;
+//        m_state = State::TRAVERSAL;
+        break;
+    case Mode::START_AT_ZERO_GATE_FLY_SPOT:
+        m_current_location = Location::ZERO_GATE_FLY_SPOT;
+//        m_state = State::INSIDE_GATE_AND_RETURN;
+        break;
+    case Mode::MAKE_SANDWICH:
+        m_current_location = Location::UNKNOWN;
+        m_pending_save = false;
+        m_pending_sandwich = true;
+//        m_state = State::RESET_SANDWICH;
+        break;
+    }
+
+
+//    m_pending_save = false;
+//    m_last_save = SavedLocation::NONE;
+    m_last_sandwich = WallClock::min();
+
+    //  This is the outer-most program loop that wraps all logic with the
+    //  battle menu detector. If at any time you detect a battle menu, you break
+    //  all the way out here to handle the encounter. This is needed because you
+    //  can get attacked at almost any time while in Area Zero.
+    m_consecutive_failures = 0;
+    while (true){
+        try{
+            env.console.log("Starting encounter loop...", COLOR_PURPLE);
+            NormalBattleMenuWatcher battle_menu(COLOR_RED);
+            run_until<ProControllerContext>(
+                env.console, context,
+                [&](ProControllerContext& context){
+                    //  Inner program loop that runs the state machine.
+                    while (true){
+                        set_flags_and_run_state(env, context);
+                    }
+                },
+                {battle_menu}
+            );
+            sensors.throw_if_no_sound();
+
+            env.console.log("Detected battle.", COLOR_PURPLE);
+            stats.m_encounters++;
+            env.update_stats();
+            encounter_tracker.encounter_rate_tracker().report_encounter();
+
+            bool caught, should_save;
+            process_battle(
+                caught, should_save,
+                env,
+                ENCOUNTER_BOT_OPTIONS,
+                env.console, context,
+                battle_tracker,
+                encounter_tracker.encounter_frequencies(),
+                stats.m_shinies,
+                LANGUAGE
+            );
+
+            m_pending_save |= should_save;
+            if (caught){
+                m_reset_on_next_sandwich = false;
+            }
+        }catch (ResetException&){
+            pbf_press_button(context, BUTTON_HOME, 160ms, GameSettings::instance().GAME_TO_HOME_DELAY1);
+            reset_game_from_home_zoom_out(env.program_info(), env.console, context, 5000ms);
+            m_current_location = m_saved_location;
+            stats.m_game_resets++;
+            m_env->update_stats();
+            m_pending_platform_reset = false;
+            m_reset_on_next_sandwich = false;
+        }catch (ProgramFinishedException&){
+            GO_HOME_WHEN_DONE.run_end_of_program(context);
+            throw;
+        }
+    }
+
+//    GO_HOME_WHEN_DONE.run_end_of_program(context);
+//    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+}
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ShinyHunting/PokemonSV_ShinyHunt-AreaZeroPlatform.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ShinyHunting/PokemonSV_ShinyHunt-AreaZeroPlatform.h
new file mode 100644
index 0000000000..ae62f51dcc
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ShinyHunting/PokemonSV_ShinyHunt-AreaZeroPlatform.h
@@ -0,0 +1,152 @@
+/*  Shiny Hunt - Area Zero Platform
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_ShinyHuntAreaZeroPlatform_H
+#define PokemonAutomation_PokemonSV_ShinyHuntAreaZeroPlatform_H
+
+//#include <functional>
+//#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+//#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "Common/Cpp/Options/FloatingPointOption.h"
+#include "Common/Cpp/Options/EnumDropdownOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "CommonTools/Options/LanguageOCROption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+#include "VideoGames/PokemonSV/Options/PokemonSV_EncounterBotCommon.h"
+#include "VideoGames/PokemonSV/Options/PokemonSV_SandwichMakerOption.h"
+#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldSensors.h"
+#include "VideoGames/PokemonSV/Programs/ShinyHunting/PokemonSV_LetsGoTools.h"
+#include "PokemonSV_AreaZeroPlatform.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+class LetsGoHpWatcher;
+class DiscontiguousTimeTracker;
+class LetsGoEncounterBotTracker;
+
+
+
+class ShinyHuntAreaZeroPlatform_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    ShinyHuntAreaZeroPlatform_Descriptor();
+
+    struct Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+
+
+class ShinyHuntAreaZeroPlatform : public SingleSwitchProgramInstance, public ConfigOption::Listener{
+public:
+    using Descriptor = ShinyHuntAreaZeroPlatform_Descriptor;
+    ~ShinyHuntAreaZeroPlatform();
+    ShinyHuntAreaZeroPlatform();
+
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    virtual std::string check_validity() const override;
+    virtual void on_config_value_changed(void* object) override;
+
+    enum class Location{
+        UNKNOWN,
+        ZERO_GATE_FLY_SPOT,
+        TRAVELING_TO_PLATFORM,
+        AREA_ZERO,
+    };
+//    enum class State{
+//        TRAVERSAL,
+//        INSIDE_GATE_AND_RETURN,
+//        LEAVE_AND_RETURN,
+//        RESET_AND_RETURN,
+//        RESET_SANDWICH,
+//    };
+
+    void set_flags(SingleSwitchProgramEnvironment& env);
+    void run_state(
+        SingleSwitchProgramEnvironment& env, ProControllerContext& context
+    );
+    void set_flags_and_run_state(
+        SingleSwitchProgramEnvironment& env, ProControllerContext& context
+    );
+
+    //  Returns true on success.
+    bool run_traversal(ProControllerContext& context);
+
+
+private:
+    OCR::LanguageOCROption LANGUAGE;
+
+    enum class Mode{
+        START_ON_PLATFORM,
+        START_AT_ZERO_GATE_FLY_SPOT,
+        MAKE_SANDWICH,
+    };
+    EnumDropdownOption<Mode> MODE;
+
+    BooleanCheckBoxOption FLYING_UNLOCKED;
+
+    enum class Path{
+        PATH0,
+        PATH1,
+        PATH2,
+    };
+    EnumDropdownOption<Path> PATH0;
+
+    SimpleIntegerOption<uint16_t> SANDWICH_RESET_IN_MINUTES;
+    SandwichMakerOption SANDWICH_OPTIONS;
+
+    EncounterBotCommonOptions ENCOUNTER_BOT_OPTIONS;
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
+
+    PlatformResetSettings PLATFORM_RESET;
+    NavigatePlatformSettings NAVIGATE_TO_PLATFORM;
+    FloatingPointOption AUTO_HEAL_PERCENT;
+
+    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
+    EventNotificationsOption NOTIFICATIONS;
+
+    SingleSwitchProgramEnvironment* m_env;
+
+    OverworldSensors* m_sensors;
+//    LetsGoHpWatcher* m_hp_watcher;
+    DiscontiguousTimeTracker* m_time_tracker;
+    LetsGoEncounterBotTracker* m_encounter_tracker;
+
+    uint64_t m_iterations = 0;
+    Location m_current_location;
+    Location m_saved_location;
+//    State m_state;
+
+    //  Set to true if we should save on the first available opportunity.
+    bool m_pending_save;
+    bool m_pending_platform_reset;
+    bool m_pending_sandwich;
+    bool m_reset_on_next_sandwich;
+
+//    enum class SavedLocation{
+//        NONE,
+//        ZERO_GATE_FLY_SPOT,
+//        AREA_ZERO,
+//    };
+//    SavedLocation m_last_save;
+
+    WallClock m_last_sandwich;
+
+    size_t m_consecutive_failures;
+};
+
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ShinyHunting/PokemonSV_ShinyHunt-Scatterbug.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ShinyHunting/PokemonSV_ShinyHunt-Scatterbug.cpp
new file mode 100644
index 0000000000..c21a3658c8
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ShinyHunting/PokemonSV_ShinyHunt-Scatterbug.cpp
@@ -0,0 +1,456 @@
+/*  Shiny Hunt - Scatterbug
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <atomic>
+#include "Common/Cpp/PrettyPrint.h"
+#include "CommonFramework/StaticGlobals.h"
+#include "CommonFramework/Exceptions/ProgramFinishedException.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "CommonTools/StartupChecks/VideoResolutionCheck.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "VideoGames/PokemonSV/Inference/Boxes/PokemonSV_IvJudgeReader.h"
+#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_LetsGoHpReader.h"
+#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldSensors.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h"
+#include "VideoGames/PokemonSV/Programs/Battles/PokemonSV_Battles.h"
+#include "VideoGames/PokemonSV/Programs/Sandwiches/PokemonSV_SandwichRoutines.h"
+#include "PokemonSV_LetsGoTools.h"
+#include "PokemonSV_ShinyHunt-Scatterbug.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+using namespace Pokemon;
+
+
+
+ShinyHuntScatterbug_Descriptor::ShinyHuntScatterbug_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonSV:ShinyHuntScatterbug",
+        STRING_POKEMON + " SV", "Shiny Hunt - Scatterbug",
+        "Programs/PokemonSV/ShinyHunt-Scatterbug.html",
+        "Shiny hunt Scatterbug.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::VIDEO_AUDIO,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+struct ShinyHuntScatterbug_Descriptor::Stats : public LetsGoEncounterBotStats{
+    Stats()
+        : m_sandwiches(m_stats["Sandwiches"])
+        , m_autoheals(m_stats["Auto Heals"])
+        , m_game_resets(m_stats["Game Resets"])
+        , m_errors(m_stats["Errors"])
+    {
+        m_display_order.insert(m_display_order.begin() + 2, {"Sandwiches", HIDDEN_IF_ZERO});
+        m_display_order.insert(m_display_order.begin() + 3, {"Auto Heals", HIDDEN_IF_ZERO});
+        m_display_order.insert(m_display_order.begin() + 4, {"Game Resets", HIDDEN_IF_ZERO});
+        m_display_order.insert(m_display_order.begin() + 5, {"Errors", HIDDEN_IF_ZERO});
+    }
+    std::atomic<uint64_t>& m_sandwiches;
+    std::atomic<uint64_t>& m_autoheals;
+    std::atomic<uint64_t>& m_game_resets;
+    std::atomic<uint64_t>& m_errors;
+};
+std::unique_ptr<StatsTracker> ShinyHuntScatterbug_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+
+
+
+ShinyHuntScatterbug::ShinyHuntScatterbug()
+    : SAVE_GAME_AT_START(
+        "<b>Save Game at Program Start:</b><br>"
+        "This is to ensure the program can continue after resetting the game. Uncheck this option if you have manually saved the game.",
+        LockMode::LOCK_WHILE_RUNNING,
+        true
+    )
+    , LANGUAGE(
+        "<b>Game Language:</b>",
+        IV_READER().languages(),
+        LockMode::UNLOCK_WHILE_RUNNING,
+        true
+    )
+    , SANDWICH_OPTIONS(
+        "Sandwich Options",
+        &LANGUAGE,
+        BaseRecipe::shiny,
+        false,
+        GroupOption::EnableMode::ALWAYS_ENABLED
+    )
+    , GO_HOME_WHEN_DONE(true)
+    , AUTO_HEAL_PERCENT(
+        "<b>Auto-Heal %</b><br>Auto-heal if your HP drops below this percentage.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        75, 0, 100
+    )
+    , SAVE_DEBUG_VIDEO(
+        "<b>Save debug videos to Switch:</b><br>"
+        "Set this on to save a Switch video everytime an error occurs. You can send the video to developers to help them debug later.",
+        LockMode::LOCK_WHILE_RUNNING,
+        false
+    )
+    , DEBUG_WARP_TO_POKECENTER(
+        "<b>Whether to change the program to just warping to closest PokeCenter and stopping:</b><br>"
+        "This is for debugging the PokeCenter warping function.",
+        LockMode::LOCK_WHILE_RUNNING,
+        false
+    )
+    , SKIP_SANDWICH(
+        "<b>Whether to skip making sandwich:</b><br>"
+        "This is for debugging the program without waiting for sandwich making.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        false
+    )
+    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_STATUS_UPDATE,
+        &ENCOUNTER_BOT_OPTIONS.NOTIFICATION_NONSHINY,
+        &ENCOUNTER_BOT_OPTIONS.NOTIFICATION_SHINY,
+        &ENCOUNTER_BOT_OPTIONS.NOTIFICATION_CATCH_SUCCESS,
+        &ENCOUNTER_BOT_OPTIONS.NOTIFICATION_CATCH_FAILED,
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_RECOVERABLE,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+{
+    PA_ADD_OPTION(SAVE_GAME_AT_START);
+    PA_ADD_OPTION(LANGUAGE);
+    PA_ADD_OPTION(SANDWICH_OPTIONS);
+    PA_ADD_OPTION(ENCOUNTER_BOT_OPTIONS);
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+    PA_ADD_OPTION(AUTO_HEAL_PERCENT);
+
+    if (STATIC_GLOBALS.DEVELOPER_MODE){
+        PA_ADD_OPTION(SAVE_DEBUG_VIDEO);
+        PA_ADD_OPTION(DEBUG_WARP_TO_POKECENTER);
+        PA_ADD_OPTION(SKIP_SANDWICH);
+    }
+
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+
+void ShinyHuntScatterbug::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    ShinyHuntScatterbug_Descriptor::Stats& stats = env.current_stats<ShinyHuntScatterbug_Descriptor::Stats>();
+
+    //  Connect the controller.
+    require_player(env.console, context, BUTTON_L);
+
+    assert_16_9_720p_min(env.logger(), env.console);
+
+    if (DEBUG_WARP_TO_POKECENTER){
+        reset_to_pokecenter(env.program_info(), env.console, context);
+        return;
+    }
+
+    size_t consecutive_failures = 0;
+    m_pending_save = false;
+
+    if (SAVE_GAME_AT_START){
+        save_game_from_overworld(env.program_info(), env.console, context);
+    }
+
+    OverworldSensors sensors(
+        env.logger(), env.console, context
+    );
+    m_sensors = &sensors;
+
+    OverworldBattleTracker battle_tracker(env.logger(), sensors);
+    m_battle_tracker = &battle_tracker;
+
+    LetsGoEncounterBotTracker encounter_tracker(
+        env, env.console,
+        stats,
+        sensors.lets_go_kill
+    );
+    m_encounter_tracker = &encounter_tracker;
+
+    while(true){
+        try{
+            run_one_sandwich_iteration(env, context);
+            consecutive_failures = 0;
+        }catch (OperationFailedExceptionWithScreenshot& e){
+            stats.m_errors++;
+            env.update_stats();
+            e.send_recoverable_error_notif_and_telemetry_report(env, NOTIFICATION_ERROR_RECOVERABLE);
+
+            if (SAVE_DEBUG_VIDEO){
+                // Take a video to give more context for debugging
+                pbf_press_button(context, BUTTON_CAPTURE, 2000ms, 2000ms);
+                context.wait_for_all_requests();
+            }
+
+            if (m_pending_save){
+                // We have found a pokemon to keep, but before we can save the game to protect the pokemon, an error occurred.
+                // To not lose the pokemon, don't reset.
+                env.log("Found an error before we can save the game to protect the newly kept pokemon.", COLOR_RED);
+                env.log("Don't reset game to protect it.", COLOR_RED);
+                throw std::move(e);
+            }
+
+            consecutive_failures++;
+            if (consecutive_failures >= 3){
+                OperationFailedExceptionWithScreenshot::fire(
+                    ErrorReportMode::SEND_ERROR_REPORT,
+                    "Failed 3 times in the row.",
+                    env.console
+                );
+            }
+
+            env.log("Reset game to handle recoverable error");
+            reset_game(env.program_info(), env.console, context);
+            ++stats.m_game_resets;
+            env.update_stats();
+
+        }catch (ProgramFinishedException&){
+            GO_HOME_WHEN_DONE.run_end_of_program(context);
+            throw;
+        }
+    }
+}
+
+
+// This function wraps around an action (e.g. go out of PokeCenter to make a sandwich) so that
+// we can handle pokemon wild encounters when executing the action.
+// Whenever a battle happens, we check shinies and handle battle according to user setting. After battle ends, move
+// back to PokeCenter to start the `action` again.
+// `action` must be an action starting at the PokeCenter
+void ShinyHuntScatterbug::handle_battles_and_back_to_pokecenter(
+    SingleSwitchProgramEnvironment& env, ProControllerContext& context,
+    std::function<void(SingleSwitchProgramEnvironment& env, ProControllerContext& context)>&& action
+){
+    if (m_encounter_tracker == nullptr){
+        throw InternalProgramError(&env.logger(), PA_CURRENT_FUNCTION, "m_encounter_tracker == nullptr");
+    }
+
+    ShinyHuntScatterbug_Descriptor::Stats& stats = env.current_stats<ShinyHuntScatterbug_Descriptor::Stats>();
+
+    bool action_finished = false;
+    bool first_iteration = true;
+    // a flag for the case that the action has finished but not yet returned to pokecenter
+    bool returned_to_pokecenter = false;
+    while(action_finished == false || returned_to_pokecenter == false){
+        // env.console.overlay().add_log("Calculate what to do next");
+        NormalBattleMenuWatcher battle_menu(COLOR_RED);
+        int ret = run_until<ProControllerContext>(
+            env.console, context,
+            [&](ProControllerContext& context){
+                if (action_finished){
+                    // `action` is already finished. Now we just try to get back to pokecenter:
+                    reset_to_pokecenter(env.program_info(), env.console, context);
+                    context.wait_for_all_requests();
+                    returned_to_pokecenter = true;
+                    return;
+                }
+                // We still need to carry out `action`
+                if (first_iteration){
+                    first_iteration = false;
+                }else{
+                    // This is at least the second iteration in the while-loop.
+                    // So a previous round of action failed.
+                    // We need to first re-initialize our position to the PokeCenter
+                    // Use map to fly back to the pokecenter
+                    reset_to_pokecenter(env.program_info(), env.console, context);
+                }
+                context.wait_for_all_requests();
+                action(env, context);
+                context.wait_for_all_requests();
+                action_finished = true;
+            },
+                {battle_menu}
+        );
+        m_sensors->throw_if_no_sound();
+        if (ret >= 0){
+            env.console.log("Detected battle.", COLOR_PURPLE);
+            env.console.overlay().add_log("Detected battle");
+            stats.m_encounters++;
+            env.update_stats();
+            m_encounter_tracker->encounter_rate_tracker().report_encounter();
+            try{
+                bool caught, should_save;
+                process_battle(
+                    caught, should_save,
+                    env,
+                    ENCOUNTER_BOT_OPTIONS,
+                    env.console, context,
+                    *m_battle_tracker,
+                    m_encounter_tracker->encounter_frequencies(),
+                    stats.m_shinies,
+                    LANGUAGE
+                );
+
+                m_pending_save |= should_save;
+            }catch (ProgramFinishedException&){
+                GO_HOME_WHEN_DONE.run_end_of_program(context);
+                throw;
+            }
+        }
+        // Back on the overworld.
+    } // end while(action_finished == false || returned_to_pokecenter == false)
+}
+
+// Start at Mesagoza South Gate pokecenter, make a sandwich, then use let's go repeatedly until 30 min passes.
+// If 
+void ShinyHuntScatterbug::run_one_sandwich_iteration(
+    SingleSwitchProgramEnvironment& env, ProControllerContext& context
+){
+    ShinyHuntScatterbug_Descriptor::Stats& stats = env.current_stats<ShinyHuntScatterbug_Descriptor::Stats>();
+
+    bool saved_after_this_sandwich = false;
+
+    WallClock last_sandwich_time = WallClock::min();
+
+    auto save_if_needed = [&](){
+        if (m_pending_save){
+            save_game_from_overworld(env.program_info(), env.console, context);
+            m_pending_save = false;
+            saved_after_this_sandwich = true;
+        }
+    };
+
+    handle_battles_and_back_to_pokecenter(
+        env, context,
+        [this, &last_sandwich_time](SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+            // Orient camera to look at same direction as player character
+            // This is needed because when save-load the game, the camera is reset
+            // to this location.
+            pbf_press_button(context, BUTTON_L, 400ms, 320ms);
+            // Move forward
+            pbf_move_left_joystick(context, {0, +1}, 1440ms, 0ms);
+            if (!SKIP_SANDWICH){
+                picnic_from_overworld(env.program_info(), env.console, context);
+
+                pbf_move_left_joystick(context, {0, +1}, 240ms, 320ms);
+                enter_sandwich_recipe_list(env.program_info(), env.console, context);
+                make_sandwich_option(env, env.console, context, SANDWICH_OPTIONS);
+                last_sandwich_time = current_time();
+                leave_picnic(env.program_info(), env.console, context);
+            }else{
+                last_sandwich_time = current_time();
+            }
+        }
+    );
+    env.console.overlay().add_log("Started Let's Go Paths");
+    save_if_needed();
+
+    // Which path to choose starting at the PokeCenter.
+    size_t path_id = 0;
+    const size_t num_paths = 2;
+
+    LetsGoHpWatcher hp_watcher(COLOR_RED);
+    // In each iteration of this while-loop, it picks a path starting from the pokecenter or the
+    // last sandwich making spot, use Let's Go along the path, then fly back to pokecenter.
+    for (;;path_id = (path_id + 1) % num_paths){
+        if (last_sandwich_time + std::chrono::minutes(30) < current_time()){
+            env.log("Sandwich expires.");
+            env.console.overlay().add_log("Sandwich expires");
+            break;
+        }
+
+        env.console.log("Starting Let's Go hunting path " + std::to_string(path_id) + "...", COLOR_PURPLE);
+        env.console.overlay().add_log("Let's Go on Path " + std::to_string(path_id));
+
+        double hp = hp_watcher.last_known_value() * 100;
+        if (0 < hp){
+            env.console.log("Last Known HP: " + tostr_default(hp) + "%", COLOR_BLUE);
+        }else{
+            env.console.log("Last Known HP: ?", COLOR_RED);
+        }
+        if (0 < hp && hp < AUTO_HEAL_PERCENT){
+            auto_heal_from_menu_or_overworld(env.program_info(), env.console, context, 0, true);
+            stats.m_autoheals++;
+            env.update_stats();
+            send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
+        }
+
+        handle_battles_and_back_to_pokecenter(
+            env, context,
+            [this, &path_id, &hp_watcher](SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+                run_until<ProControllerContext>(
+                    env.console, context,
+                    [&](ProControllerContext& context){
+                        run_lets_go_iteration(env, context, path_id);
+                    },
+                    {hp_watcher}
+                );
+            } // end [](...)
+        ); // end handle_battles_and_back_to_pokecenter()
+        save_if_needed();
+    } // end for (;;path_id = (path_id + 1) % num_paths)
+
+    if (!saved_after_this_sandwich){
+        // Reset game to save rare herbs
+        reset_game(env.program_info(), env.console, context);
+        ++stats.m_game_resets;
+        env.update_stats();
+        send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
+    }
+}
+
+// One iteration of the hunt: 
+// start at Mesagoza South Gate pokecenter, go out and use Let's Go to battle Scatterbug, 
+void ShinyHuntScatterbug::run_lets_go_iteration(SingleSwitchProgramEnvironment& env, ProControllerContext& context, size_t path_id){
+    auto& console = env.console;
+    // Orient camera to look at same direction as player character
+    // This is needed because when save-load the game, the camera is reset
+    // to this location.
+    pbf_press_button(context, BUTTON_L, 400ms, 320ms);
+
+    const bool throw_ball_if_bubble = true;
+
+    auto move_forward_with_lets_go = [&](int num_iterations){
+        context.wait_for_all_requests();
+        for (int i = 0; i < num_iterations; i++){
+            use_lets_go_to_clear_in_front(console, context, *m_encounter_tracker, throw_ball_if_bubble, [&](ProControllerContext& context){
+                // Do the following movement while the Let's Go pokemon clearing wild pokemon.
+                // Slowly Moving forward
+                pbf_move_left_joystick(context, {0, +0.18}, 6400ms, 0ms);
+            });
+        }
+    };
+
+    if (path_id == 0){
+        // move rightward, to the west
+        pbf_move_left_joystick(context, {+1, 0}, 800ms, 160ms);
+        // Align camera
+        pbf_press_button(context, BUTTON_L, 400ms, 320ms);
+
+        move_forward_with_lets_go(10);
+    }else{ // path_id == 1
+        // move leftward, to the east
+        pbf_move_left_joystick(context, {-1, 0}, 800ms, 160ms);
+        // Align camera
+        pbf_press_button(context, BUTTON_L, 400ms, 320ms);
+
+        move_forward_with_lets_go(5);
+
+        // move rightward, to south
+        pbf_move_left_joystick(context, {+1, 0}, 400ms, 160ms);
+        // Align camera
+        pbf_press_button(context, BUTTON_L, 400ms, 320ms);
+
+        move_forward_with_lets_go(5);
+    }
+}
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ShinyHunting/PokemonSV_ShinyHunt-Scatterbug.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ShinyHunting/PokemonSV_ShinyHunt-Scatterbug.h
new file mode 100644
index 0000000000..8ea9eb3a52
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/ShinyHunting/PokemonSV_ShinyHunt-Scatterbug.h
@@ -0,0 +1,93 @@
+/*  Shiny Hunt - Scatterbug
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_ShinyHuntScatterbug_H
+#define PokemonAutomation_PokemonSV_ShinyHuntScatterbug_H
+
+#include <functional>
+#include "Common/Cpp/Options/FloatingPointOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "CommonTools/Options/LanguageOCROption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldSensors.h"
+#include "VideoGames/PokemonSV/Options/PokemonSV_EncounterBotCommon.h"
+#include "VideoGames/PokemonSV/Options/PokemonSV_SandwichMakerOption.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+class LetsGoEncounterBotTracker;
+
+
+class ShinyHuntScatterbug_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    ShinyHuntScatterbug_Descriptor();
+
+    struct Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+
+
+class ShinyHuntScatterbug : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = ShinyHuntScatterbug_Descriptor;
+    ShinyHuntScatterbug();
+
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    void run_one_sandwich_iteration(
+        SingleSwitchProgramEnvironment& env, ProControllerContext& context
+    );
+    
+    void run_lets_go_iteration(
+        SingleSwitchProgramEnvironment& env, ProControllerContext& context,
+        size_t path_id
+    );
+
+    void handle_battles_and_back_to_pokecenter(
+        SingleSwitchProgramEnvironment& env, ProControllerContext& context,
+        std::function<void(SingleSwitchProgramEnvironment& env, ProControllerContext& context)>&& action
+    );
+
+    BooleanCheckBoxOption SAVE_GAME_AT_START;
+    
+    OCR::LanguageOCROption LANGUAGE;
+
+    SandwichMakerOption SANDWICH_OPTIONS;
+
+    EncounterBotCommonOptions ENCOUNTER_BOT_OPTIONS;
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
+
+    FloatingPointOption AUTO_HEAL_PERCENT;
+
+    // Debug options
+    BooleanCheckBoxOption SAVE_DEBUG_VIDEO;
+    BooleanCheckBoxOption DEBUG_WARP_TO_POKECENTER;
+    BooleanCheckBoxOption SKIP_SANDWICH;
+
+    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
+    EventNotificationsOption NOTIFICATIONS;
+
+    OverworldSensors* m_sensors;
+    OverworldBattleTracker* m_battle_tracker;
+    LetsGoEncounterBotTracker* m_encounter_tracker;
+
+    //  Set to true if we should save on the first available opportunity.
+    bool m_pending_save;
+};
+
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_AutoHost.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_AutoHost.cpp
new file mode 100644
index 0000000000..643cca0e5c
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_AutoHost.cpp
@@ -0,0 +1,398 @@
+/*  Auto Host
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/PrettyPrint.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "CommonTools/VisualDetectors/BlackScreenDetector.h"
+#include "CommonTools/StartupChecks/VideoResolutionCheck.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonSV/PokemonSV_Settings.h"
+#include "VideoGames/PokemonSV/Inference/Battles/PokemonSV_TeraBattleMenus.h"
+#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h"
+#include "VideoGames/PokemonSV/Inference/Tera/PokemonSV_TeraCardDetector.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_ConnectToInternet.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h"
+#include "VideoGames/PokemonSV/Programs/FastCodeEntry/PokemonSV_CodeEntry.h"
+#include "VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_TeraBattler.h"
+#include "VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_TeraRoutines.h"
+#include "PokemonSV_AutoHostTools.h"
+#include "PokemonSV_AutoHostLobbyWaiter.h"
+#include "PokemonSV_AutoHost.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+using namespace Pokemon;
+
+
+AutoHost_Descriptor::AutoHost_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonSV:AutoHost",
+        STRING_POKEMON + " SV", "Auto-Host",
+        "Programs/PokemonSV/AutoHost.html",
+        "Auto-host a Tera raid.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+struct AutoHost_Descriptor::Stats : public StatsTracker{
+    Stats()
+        : m_raids(m_stats["Raids"])
+        , m_empty(m_stats["Empty Raids"])
+        , m_full(m_stats["Full Raids"])
+        , m_raiders(m_stats["Total Raiders"])
+        , m_wins(m_stats["Wins"])
+        , m_losses(m_stats["Losses"])
+        , m_banned(m_stats["Banned"])
+        , m_errors(m_stats["Errors"])
+    {
+        m_display_order.emplace_back("Raids");
+        m_display_order.emplace_back("Empty Raids");
+        m_display_order.emplace_back("Full Raids");
+        m_display_order.emplace_back("Total Raiders");
+        m_display_order.emplace_back("Wins");
+        m_display_order.emplace_back("Losses");
+        m_display_order.emplace_back("Banned", HIDDEN_IF_ZERO);
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+    }
+    std::atomic<uint64_t>& m_raids;
+    std::atomic<uint64_t>& m_empty;
+    std::atomic<uint64_t>& m_full;
+    std::atomic<uint64_t>& m_raiders;
+    std::atomic<uint64_t>& m_wins;
+    std::atomic<uint64_t>& m_losses;
+    std::atomic<uint64_t>& m_banned;
+    std::atomic<uint64_t>& m_errors;
+};
+std::unique_ptr<StatsTracker> AutoHost_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+
+
+AutoHost::AutoHost()
+    : SingleSwitchProgramInstance({"Notifs", "LiveHost"})
+    , MODE(
+        "<b>Hosting Mode:</b>",
+        {
+            {HostingMode::LOCAL,            "local",            "Host Locally"},
+            {HostingMode::ONLINE_CODED,     "online-coded",     "Host Online (link code)"},
+            {HostingMode::ONLINE_EVERYONE,  "online-everyone",  "Host Online (everyone)"},
+        },
+        LockMode::UNLOCK_WHILE_RUNNING,
+        HostingMode::ONLINE_CODED
+    )
+    , NOTIFICATIONS0({
+        &NOTIFICATION_RAID_POST,
+        &NOTIFICATION_RAID_START,
+        &NOTIFICATION_JOIN_REPORT,
+        &NOTIFICATION_ERROR_RECOVERABLE,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+{
+    PA_ADD_OPTION(MODE);
+
+    //  General Auto-Hosting Options
+    PA_ADD_OPTION(LOBBY_WAIT_DELAY);
+    PA_ADD_OPTION(START_RAID_PLAYERS);
+    PA_ADD_OPTION(SHOW_RAID_CODE);
+    PA_ADD_OPTION(DESCRIPTION);
+    PA_ADD_OPTION(REMOTE_KILL_SWITCH0);
+    PA_ADD_OPTION(CONSECUTIVE_FAILURE_PAUSE);
+    PA_ADD_OPTION(FAILURE_PAUSE_MINUTES);
+
+    PA_ADD_OPTION(ROLLOVER_PREVENTION);
+    PA_ADD_OPTION(BATTLE_AI);
+
+    //  Extended Auto-Hosting Options
+    PA_ADD_OPTION(BAN_LIST);
+    PA_ADD_OPTION(JOIN_REPORT);
+
+    PA_ADD_OPTION(NOTIFICATIONS0);
+}
+
+
+
+WallClock AutoHost::wait_for_lobby_open(
+    SingleSwitchProgramEnvironment& env, ProControllerContext& context,
+    std::string& lobby_code
+){
+    VideoOverlaySet overlays(env.console.overlay());
+
+    TeraLobbyWatcher lobby(env.logger(), COLOR_RED);
+    lobby.make_overlays(overlays);
+
+    int ret = wait_until(
+        env.console, context,
+        std::chrono::seconds(60),
+        {{lobby, std::chrono::milliseconds(500)}}
+    );
+    if (ret < 0){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "Unable to detect Tera lobby after 60 seconds.",
+            env.console
+        );
+    }
+    WallClock start_time = current_time();
+    context.wait_for(std::chrono::seconds(1));
+
+    VideoSnapshot snapshot = env.console.video().snapshot();
+    lobby_code = lobby.raid_code(env.logger(), snapshot);
+    std::string code = lobby.raid_code(env.logger(), snapshot);
+    normalize_code(lobby_code, code);
+
+    send_host_announcement(
+        env, env.console,
+        lobby_code,
+        SHOW_RAID_CODE,
+        DESCRIPTION,
+        NOTIFICATION_RAID_POST
+    );
+
+    return start_time;
+}
+void AutoHost::update_stats_on_raid_start(SingleSwitchProgramEnvironment& env, uint8_t player_count){
+    AutoHost_Descriptor::Stats& stats = env.current_stats<AutoHost_Descriptor::Stats>();
+
+    player_count = std::max<uint8_t>(player_count, 1);
+
+    if (player_count == 4){
+        stats.m_full++;
+    }
+    if (player_count == 1){
+        stats.m_empty++;
+    }
+    stats.m_raiders += player_count - 1;
+}
+bool AutoHost::start_raid(
+    SingleSwitchProgramEnvironment& env, ProControllerContext& context,
+    WallClock start_time,
+    uint8_t player_count
+){
+    AutoHost_Descriptor::Stats& stats = env.current_stats<AutoHost_Descriptor::Stats>();
+
+    //  This is the state machine to actually start the raid.
+
+    while (true){
+        AdvanceDialogWatcher dialog(COLOR_YELLOW);
+        WhiteScreenOverWatcher start_raid(COLOR_BLUE);
+        TeraBattleMenuWatcher battle_menu(COLOR_CYAN);
+        context.wait_for_all_requests();
+        int ret = run_until<ProControllerContext>(
+            env.console, context,
+            [start_time](ProControllerContext& context){
+                while (true){
+                    pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+                    context.wait_for_all_requests();
+                    if (current_time() > start_time + std::chrono::minutes(4)){
+                        return;
+                    }
+                }
+            },
+            {dialog, start_raid, battle_menu}
+        );
+        context.wait_for(std::chrono::milliseconds(100));
+        switch (ret){
+        case 0:
+            env.log("Raid timed out!", COLOR_ORANGE);
+            stats.m_empty++;
+            return false;
+        case 1:
+            env.log("Raid started! (white screen)", COLOR_BLUE);
+            update_stats_on_raid_start(env, player_count);
+            return true;
+        case 2:
+            env.log("Raid started! (battle menu)", COLOR_BLUE);
+            update_stats_on_raid_start(env, player_count);
+            return true;
+        default:
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "Stuck in lobby for 4 minutes.",
+                env.console
+            );
+        }
+    }
+}
+
+
+bool AutoHost::run_lobby(
+    SingleSwitchProgramEnvironment& env, ProControllerContext& context,
+    std::string& lobby_code,
+    std::array<std::map<Language, std::string>, 4>& player_names
+){
+    AutoHost_Descriptor::Stats& stats = env.current_stats<AutoHost_Descriptor::Stats>();
+
+    WallClock start_time = wait_for_lobby_open(env, context, lobby_code);
+
+    TeraLobbyWaiter waiter(
+        env, env.console, context,
+        1,
+        lobby_code, start_time,
+        LOBBY_WAIT_DELAY,
+        START_RAID_PLAYERS,
+        NOTIFICATION_RAID_START,
+        BAN_LIST,
+        JOIN_REPORT
+    );
+
+    TeraLobbyWaiter::LobbyResult result = waiter.run_lobby();
+    player_names = waiter.names();
+
+    if (result == TeraLobbyWaiter::LobbyResult::BANNED_PLAYER){
+        stats.m_banned++;
+    }
+    if (result != TeraLobbyWaiter::LobbyResult::RAID_STARTED){
+        return false;
+    }
+
+    return start_raid(env, context, start_time, waiter.last_known_players());
+}
+
+void AutoHost::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    assert_16_9_720p_min(env.logger(), env.console);
+
+    AutoHost_Descriptor::Stats& stats = env.current_stats<AutoHost_Descriptor::Stats>();
+
+    //  Connect the controller.
+    require_player(env.console, context, BUTTON_L);
+
+    m_killswitch_time = WallClock::max();
+
+    std::string report_name = "PokemonSV-AutoHost-JoinReport-" + now_to_filestring() + ".txt";
+    MultiLanguageJoinTracker join_tracker(1);
+
+    TeraFailTracker fail_tracker(
+        env, context,
+        NOTIFICATION_ERROR_RECOVERABLE,
+        CONSECUTIVE_FAILURE_PAUSE,
+        FAILURE_PAUSE_MINUTES
+    );
+    KillSwitchTracker kill_switch(env);
+
+    bool skip_reset = true;
+    WallClock last_time_fix = WallClock::min();
+    while (true){
+        env.update_stats();
+
+        fail_tracker.on_raid_start();
+
+        if (!skip_reset){
+            pbf_press_button(context, BUTTON_HOME, 160ms, GameSettings::instance().GAME_TO_HOME_DELAY1);
+            if (ROLLOVER_PREVENTION){
+                WallClock now = current_time();
+                if (last_time_fix == WallClock::min() || now - last_time_fix > std::chrono::hours(4)){
+                    set_time_to_12am_from_home(env.program_info(), env.console, context);
+                    last_time_fix = now;
+                }
+            }
+            reset_game_from_home(env.program_info(), env.console, context, 5000ms);
+        }
+        skip_reset = false;
+
+        //  Check kill-switch now before we go online.
+        if (MODE != HostingMode::LOCAL){
+            kill_switch.check_kill_switch(REMOTE_KILL_SWITCH0);
+        }
+
+        //  Store the mode locally in case the user changes in the middle of
+        //  this iteration.
+        HostingMode mode = MODE;
+
+        if (mode != HostingMode::LOCAL){
+            //  Connect to internet.
+            try{
+                connect_to_internet_from_overworld(env.program_info(), env.console, context);
+            }catch (OperationFailedExceptionWithScreenshot& e){
+                stats.m_errors++;
+                e.send_recoverable_error_notif_and_telemetry_report(env, NOTIFICATION_ERROR_RECOVERABLE);
+                fail_tracker.report_raid_error();
+                continue;
+            }
+        }
+
+        if (!open_raid(env.console, context)){
+            env.log("No Tera raid found.", COLOR_RED);
+            fail_tracker.report_raid_error();
+            continue;
+        }
+        env.log("Tera raid found!", COLOR_BLUE);
+
+        context.wait_for(std::chrono::milliseconds(100));
+
+        BAN_LIST.refresh_online_table(env.logger());
+
+        try{
+            open_hosting_lobby(env, env.console, context, mode);
+        }catch (OperationFailedExceptionWithScreenshot& e){
+            stats.m_errors++;
+            e.send_recoverable_error_notif_and_telemetry_report(env, NOTIFICATION_ERROR_RECOVERABLE);
+            fail_tracker.report_raid_error();
+            continue;
+        }
+
+        try{
+            std::string lobby_code;
+            std::array<std::map<Language, std::string>, 4> player_names;
+
+            if (!run_lobby(env, context, lobby_code, player_names)){
+                continue;
+            }
+            env.update_stats();
+
+            stats.m_raids++;
+            bool win = run_tera_battle(env, env.console, context, BATTLE_AI);
+            env.update_stats();
+            if (win){
+                stats.m_wins++;
+            }else{
+                stats.m_losses++;
+            }
+            if (JOIN_REPORT.enabled() && (win || !JOIN_REPORT.wins_only)){
+                join_tracker.append(player_names, lobby_code);
+                join_tracker.dump(report_name);
+                send_program_notification_with_file(
+                    env,
+                    NOTIFICATION_JOIN_REPORT,
+                    Color(0),
+                    "Join Report",
+                    {}, "",
+                    report_name
+                );
+            }
+            if (win){
+                exit_tera_win_without_catching(env.program_info(), env.console, context, 0);
+            }
+            fail_tracker.report_successful_raid();
+        }catch (OperationFailedExceptionWithScreenshot& e){
+            stats.m_errors++;
+            e.send_recoverable_error_notif_and_telemetry_report(env, NOTIFICATION_ERROR_RECOVERABLE);
+            fail_tracker.report_raid_error();
+            continue;
+        }
+    }
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_AutoHost.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_AutoHost.h
new file mode 100644
index 0000000000..4f16b80fde
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_AutoHost.h
@@ -0,0 +1,95 @@
+/*  Auto Host
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_AutoHost_H
+#define PokemonAutomation_PokemonSV_AutoHost_H
+
+#include "Common/Cpp/Options/EnumDropdownOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "VideoGames/PokemonSV/Options/PokemonSV_PlayerList.h"
+#include "VideoGames/PokemonSV/Options/PokemonSV_TeraAIOption.h"
+#include "VideoGames/PokemonSV/Options/PokemonSV_AutoHostOptions.h"
+#include "VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_TeraRoutines.h"
+#include "PokemonSV_JoinTracker.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+class AutoHost_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    AutoHost_Descriptor();
+
+    struct Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+
+};
+
+
+
+
+class AutoHost : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = AutoHost_Descriptor;
+    AutoHost();
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    WallClock wait_for_lobby_open(
+        SingleSwitchProgramEnvironment& env, ProControllerContext& context,
+        std::string& lobby_code
+    );
+    void update_stats_on_raid_start(SingleSwitchProgramEnvironment& env, uint8_t player_count);
+    bool start_raid(
+        SingleSwitchProgramEnvironment& env, ProControllerContext& context,
+        WallClock start_time,
+        uint8_t player_count
+    );
+    bool run_lobby(
+        SingleSwitchProgramEnvironment& env, ProControllerContext& context,
+        std::string& lobby_code,
+        std::array<std::map<Language, std::string>, 4>& player_names
+    );
+    void check_kill_switch(ProgramEnvironment& env);
+
+private:
+//    OCR::LanguageOCR LANGUAGE;
+
+    EnumDropdownOption<HostingMode> MODE;
+
+    LobbyWaitDelay LOBBY_WAIT_DELAY;
+    StartRaidPlayers START_RAID_PLAYERS;
+    ShowRaidCode SHOW_RAID_CODE;
+    AutoHostDescription DESCRIPTION;
+    RemoteKillSwitch REMOTE_KILL_SWITCH0;
+    ConsecutiveFailurePause CONSECUTIVE_FAILURE_PAUSE;
+    FailurePauseMinutes FAILURE_PAUSE_MINUTES;
+
+    RolloverPrevention ROLLOVER_PREVENTION;
+    TeraAIOption BATTLE_AI;
+
+    RaidPlayerBanList BAN_LIST;
+    RaidJoinReportOption JOIN_REPORT;
+
+    RaidPostNotification NOTIFICATION_RAID_POST;
+    RaidStartNotification NOTIFICATION_RAID_START;
+    JoinReportNotification NOTIFICATION_JOIN_REPORT;
+    EventNotificationsOption NOTIFICATIONS0;
+
+    WallClock m_killswitch_time;
+    std::string m_killswitch_reason;
+};
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/PokemonSV/Programs/TeraRaids/PokemonSV_AutoHostLobbyWaiter.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_AutoHostLobbyWaiter.cpp
similarity index 88%
rename from SerialPrograms/Source/PokemonSV/Programs/TeraRaids/PokemonSV_AutoHostLobbyWaiter.cpp
rename to SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_AutoHostLobbyWaiter.cpp
index a3ab4cdf43..ce717ae051 100644
--- a/SerialPrograms/Source/PokemonSV/Programs/TeraRaids/PokemonSV_AutoHostLobbyWaiter.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_AutoHostLobbyWaiter.cpp
@@ -1,13 +1,13 @@
 /*  Auto Host Lobby Waiter
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include "Common/Cpp/Exceptions.h"
 #include "CommonFramework/Notifications/ProgramNotifications.h"
-#include "CommonFramework/OCR/OCR_StringNormalization.h"
-#include "CommonFramework/InferenceInfra/InferenceSession.h"
+#include "CommonTools/OCR/OCR_StringNormalization.h"
+#include "CommonTools/Async/InferenceSession.h"
 #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
 #include "PokemonSV_AutoHostLobbyWaiter.h"
 
@@ -22,7 +22,7 @@ namespace PokemonSV{
 
 TeraLobbyWaiter::TeraLobbyWaiter(
     ProgramEnvironment& env,
-    ConsoleHandle& console, BotBaseContext& context,
+    VideoStream& stream, ProControllerContext& context,
     uint8_t host_players,
     const std::string& lobby_code, WallClock start_time,
     SimpleIntegerOption<uint16_t>& LOBBY_WAIT_DELAY,
@@ -32,7 +32,7 @@ TeraLobbyWaiter::TeraLobbyWaiter(
     RaidJoinReportOption& JOIN_REPORT
 )
     : m_env(env)
-    , m_console(console), m_context(context)
+    , m_stream(stream), m_context(context)
     , m_host_players(host_players)
     , m_lobby_code(lobby_code), m_start_time(start_time)
     , m_lobby_wait_delay(LOBBY_WAIT_DELAY)
@@ -40,12 +40,12 @@ TeraLobbyWaiter::TeraLobbyWaiter(
     , m_notification_raid_start(NOTIFICATION_RAID_START)
     , m_dialog(COLOR_YELLOW)
     , m_start_raid(COLOR_BLUE)
-    , m_join_watcher(console.logger(), env.realtime_dispatcher(), COLOR_RED, host_players)
-    , m_name_watcher(console.logger(), env.realtime_dispatcher(), COLOR_RED, JOIN_REPORT, BAN_LIST, host_players)
+    , m_join_watcher(stream.logger(), COLOR_RED, host_players)
+    , m_name_watcher(stream.logger(), COLOR_RED, JOIN_REPORT, BAN_LIST, host_players)
 {}
 
 VideoSnapshot TeraLobbyWaiter::synchronize_state(){
-    VideoSnapshot snapshot = m_console.video().snapshot();
+    VideoSnapshot snapshot = m_stream.video().snapshot();
     m_join_watcher.process_frame(snapshot, snapshot.timestamp);
     m_name_watcher.process_frame(snapshot, snapshot.timestamp);
     m_total_players = m_join_watcher.last_known_total_players();
@@ -152,7 +152,7 @@ bool TeraLobbyWaiter::process_hat_trick(const ImageViewRGB32& snapshot){
     if (name.empty()){
         return false;
     }
-    m_console.log(name + " with the Hat Trick!", COLOR_BLUE);
+    m_stream.log(name + " with the Hat Trick!", COLOR_BLUE);
     send_program_notification(
         m_env, m_notification_raid_start,
         COLOR_PURPLE,
@@ -192,8 +192,8 @@ bool TeraLobbyWaiter::process_bans(const ImageViewRGB32& snapshot, bool skip_gra
         {{"Banned User(s):", std::move(message)}}, "",
         snapshot
     );
-    pbf_press_button(m_context, BUTTON_B, 20, 230);
-    pbf_press_button(m_context, BUTTON_A, 20, 230);
+    pbf_press_button(m_context, BUTTON_B, 160ms, 1840ms);
+    pbf_press_button(m_context, BUTTON_A, 160ms, 1840ms);
 
     return true;
 }
@@ -229,7 +229,7 @@ bool TeraLobbyWaiter::process_enough_players(const ImageViewRGB32& snapshot){
         return false;
     }
 
-    m_console.log("Enough players are ready, attempting to start raid!", COLOR_BLUE);
+    m_stream.log("Enough players are ready, attempting to start raid!", COLOR_BLUE);
     send_program_notification(
         m_env, m_notification_raid_start,
         COLOR_GREEN,
@@ -249,7 +249,7 @@ bool TeraLobbyWaiter::process_enough_players(const ImageViewRGB32& snapshot){
 TeraLobbyWaiter::LobbyResult TeraLobbyWaiter::run_lobby(){
     CancellableHolder<CancellableScope> subcontext(static_cast<CancellableScope&>(m_context));
     InferenceSession session(
-        subcontext, m_console,
+        subcontext, m_stream,
         {
             m_dialog,
             m_start_raid,
@@ -313,7 +313,7 @@ TeraLobbyWaiter::LobbyResult TeraLobbyWaiter::run_lobby(){
 
         //  Almost out of time.
         if (end_time < snapshot.timestamp){
-            m_console.log("Clock running down, attempting to start raid!", COLOR_BLUE);
+            m_stream.log("Clock running down, attempting to start raid!", COLOR_BLUE);
             send_program_notification(
                 m_env, m_notification_raid_start,
                 COLOR_GREEN,
@@ -332,7 +332,7 @@ TeraLobbyWaiter::LobbyResult TeraLobbyWaiter::run_lobby(){
         //  Otherwise, resume looping.
     }
 
-    VideoSnapshot snapshot = m_console.video().snapshot();
+    VideoSnapshot snapshot = m_stream.video().snapshot();
     if (ret == 0){
         m_env.log("Raid timed out!", COLOR_ORANGE);
         send_program_notification(
@@ -361,7 +361,7 @@ TeraLobbyWaiter::LobbyResult TeraLobbyWaiter::run_lobby(){
         return LobbyResult::RAID_STARTED;
     }
 
-    throw InternalProgramError(&m_console.logger(), PA_CURRENT_FUNCTION, "Invalid session return code.");
+    throw InternalProgramError(&m_stream.logger(), PA_CURRENT_FUNCTION, "Invalid session return code.");
 }
 
 
diff --git a/SerialPrograms/Source/PokemonSV/Programs/TeraRaids/PokemonSV_AutoHostLobbyWaiter.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_AutoHostLobbyWaiter.h
similarity index 80%
rename from SerialPrograms/Source/PokemonSV/Programs/TeraRaids/PokemonSV_AutoHostLobbyWaiter.h
rename to SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_AutoHostLobbyWaiter.h
index ab98031706..038e4cedde 100644
--- a/SerialPrograms/Source/PokemonSV/Programs/TeraRaids/PokemonSV_AutoHostLobbyWaiter.h
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_AutoHostLobbyWaiter.h
@@ -1,6 +1,6 @@
 /*  Auto Host Lobby Waiter
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -9,14 +9,14 @@
 
 #include "Common/Cpp/Options/EnumDropdownOption.h"
 #include "Common/Cpp/Options/SimpleIntegerOption.h"
-#include "ClientSource/Connection/BotBase.h"
 #include "CommonFramework/VideoPipeline/VideoFeed.h"
 #include "CommonFramework/Notifications/EventNotificationOption.h"
-#include "CommonFramework/Inference/BlackScreenDetector.h"
 #include "CommonFramework/Tools/ProgramEnvironment.h"
-#include "CommonFramework/Tools/ConsoleHandle.h"
-#include "PokemonSV/Options/PokemonSV_PlayerList.h"
-#include "PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h"
+#include "CommonFramework/Tools/VideoStream.h"
+#include "CommonTools/VisualDetectors/BlackScreenDetector.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+#include "VideoGames/PokemonSV/Options/PokemonSV_PlayerList.h"
+#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h"
 #include "PokemonSV_JoinTracker.h"
 
 namespace PokemonAutomation{
@@ -29,7 +29,7 @@ class TeraLobbyWaiter{
 public:
     TeraLobbyWaiter(
         ProgramEnvironment& env,
-        ConsoleHandle& console, BotBaseContext& context,
+        VideoStream& stream, ProControllerContext& context,
         uint8_t host_players,
         const std::string& lobby_code, WallClock start_time,
         SimpleIntegerOption<uint16_t>& LOBBY_WAIT_DELAY,
@@ -72,8 +72,8 @@ class TeraLobbyWaiter{
 
 private:
     ProgramEnvironment& m_env;
-    ConsoleHandle& m_console;
-    BotBaseContext& m_context;
+    VideoStream& m_stream;
+    ProControllerContext& m_context;
     uint8_t m_host_players;
 
     const std::string& m_lobby_code;
diff --git a/SerialPrograms/Source/PokemonSV/Programs/TeraRaids/PokemonSV_AutoHostTools.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_AutoHostTools.cpp
similarity index 86%
rename from SerialPrograms/Source/PokemonSV/Programs/TeraRaids/PokemonSV_AutoHostTools.cpp
rename to SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_AutoHostTools.cpp
index ea7057b7ce..adc2f78aff 100644
--- a/SerialPrograms/Source/PokemonSV/Programs/TeraRaids/PokemonSV_AutoHostTools.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_AutoHostTools.cpp
@@ -1,6 +1,6 @@
 /*  Auto Host Tools
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -14,8 +14,7 @@
 #include "CommonFramework/VideoPipeline/VideoFeed.h"
 #include "CommonFramework/Tools/FileDownloader.h"
 #include "CommonFramework/Tools/ProgramEnvironment.h"
-#include "CommonFramework/Tools/ConsoleHandle.h"
-#include "PokemonSV/Options/PokemonSV_AutoHostOptions.h"
+#include "VideoGames/PokemonSV/Options/PokemonSV_AutoHostOptions.h"
 #include "PokemonSV_AutoHostTools.h"
 
 namespace PokemonAutomation{
@@ -25,7 +24,7 @@ namespace PokemonSV{
 
 
 void send_host_announcement(
-    ProgramEnvironment& env, ConsoleHandle& host_console,
+    ProgramEnvironment& env, VideoStream& host_console,
     const std::string& lobby_code, bool show_raid_code,
     const std::string& description,
     EventNotificationOption& NOTIFICATION_RAID_POST
@@ -71,18 +70,23 @@ void TeraFailTracker::on_raid_start(){
     }
     m_current_raid_error.store(false, std::memory_order_relaxed);
 
+#if 1
     if (m_consecutive_failures > 0 && !m_completed_one){
-        throw FatalProgramException(
-            ErrorReport::SEND_ERROR_REPORT, m_env.logger(),
+        throw_and_log<FatalProgramException>(
+            m_env.logger(),
+            ErrorReportMode::NO_ERROR_REPORT,
             "Failed 1st raid attempt. Will not retry due to risk of ban."
         );
     }
+#endif
+
     size_t fail_threshold = m_consecutive_failure_pause;
     if (m_consecutive_failures >= fail_threshold){
         uint16_t minutes = m_failure_pause_minutes;
         if (minutes == 0){
-            throw FatalProgramException(
-                ErrorReport::SEND_ERROR_REPORT, m_env.logger(),
+            throw_and_log<FatalProgramException>(
+                m_env.logger(),
+                ErrorReportMode::NO_ERROR_REPORT,
                 "Failed " + std::to_string(fail_threshold) +  " raid(s) in the row. "
                 "Stopping to prevent possible ban."
             );
@@ -140,7 +144,7 @@ void KillSwitchTracker::check_kill_switch(const std::string& kill_switch_url){
 
         try{
             JsonValue json = FileDownloader::download_json_file(m_env.logger(), kill_switch_url);
-            const JsonObject* obj = json.get_object();
+            const JsonObject* obj = json.to_object();
             if (obj == nullptr){
                 throw ParseException("Invalid kill-switch Json.");
             }
@@ -173,13 +177,15 @@ void KillSwitchTracker::check_kill_switch(const std::string& kill_switch_url){
     );
     if (start_time < m_killswitch_time && now > m_killswitch_time){
         if (m_killswitch_reason.empty()){
-            throw FatalProgramException(
-                ErrorReport::NO_ERROR_REPORT, m_env.logger(),
+            throw_and_log<FatalProgramException>(
+                m_env.logger(),
+                ErrorReportMode::NO_ERROR_REPORT,
                 "Stopped by remote kill switch. No reason specified."
             );
         }else{
-            throw FatalProgramException(
-                ErrorReport::NO_ERROR_REPORT, m_env.logger(),
+            throw_and_log<FatalProgramException>(
+                m_env.logger(),
+                ErrorReportMode::NO_ERROR_REPORT,
                 "Stopped by remote kill switch. Reason: " + m_killswitch_reason
             );
         }
diff --git a/SerialPrograms/Source/PokemonSV/Programs/TeraRaids/PokemonSV_AutoHostTools.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_AutoHostTools.h
similarity index 83%
rename from SerialPrograms/Source/PokemonSV/Programs/TeraRaids/PokemonSV_AutoHostTools.h
rename to SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_AutoHostTools.h
index 34d5ab2022..0ee11f5bf9 100644
--- a/SerialPrograms/Source/PokemonSV/Programs/TeraRaids/PokemonSV_AutoHostTools.h
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_AutoHostTools.h
@@ -1,6 +1,6 @@
 /*  Auto Host Tools
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -9,18 +9,18 @@
 
 #include <atomic>
 #include "CommonFramework/Notifications/ProgramNotifications.h"
-#include "PokemonSV/Options/PokemonSV_AutoHostOptions.h"
+#include "CommonFramework/Tools/VideoStream.h"
+#include "VideoGames/PokemonSV/Options/PokemonSV_AutoHostOptions.h"
 
 namespace PokemonAutomation{
     class CancellableScope;
-    class ConsoleHandle;
 namespace NintendoSwitch{
 namespace PokemonSV{
 
 
 
 void send_host_announcement(
-    ProgramEnvironment& env, ConsoleHandle& host_console,
+    ProgramEnvironment& env, VideoStream& host_console,
     const std::string& lobby_code, bool show_raid_code,
     const std::string& description,
     EventNotificationOption& NOTIFICATION_RAID_POST
diff --git a/SerialPrograms/Source/PokemonSV/Programs/TeraRaids/PokemonSV_JoinTracker.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_JoinTracker.cpp
similarity index 88%
rename from SerialPrograms/Source/PokemonSV/Programs/TeraRaids/PokemonSV_JoinTracker.cpp
rename to SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_JoinTracker.cpp
index 9696baf492..0c281ac36d 100644
--- a/SerialPrograms/Source/PokemonSV/Programs/TeraRaids/PokemonSV_JoinTracker.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_JoinTracker.cpp
@@ -1,18 +1,18 @@
 /*  Join Tracker
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include <cmath>
-#include <fstream>
-#include <QFile>
+#include "Common/Cpp/Filesystem/FileIO.h"
+#include "Common/Cpp/Filesystem/Filesystem.h"
+#include "Common/Cpp/Strings/Unicode.h"
 #include "Common/Cpp/Exceptions.h"
 #include "Common/Cpp/PrettyPrint.h"
-#include "Common/Qt/StringToolsQt.h"
-#include "CommonFramework/GlobalSettingsPanel.h"
-#include "CommonFramework/OCR/OCR_StringNormalization.h"
-#include "CommonFramework/OCR/OCR_TextMatcher.h"
+#include "CommonFramework/StaticGlobals.h"
+#include "CommonTools/OCR/OCR_StringNormalization.h"
+#include "CommonTools/OCR/OCR_TextMatcher.h"
 #include "PokemonSV_JoinTracker.h"
 
 //#include <iostream>
@@ -85,7 +85,7 @@ bool check_ban_for_name(
             );
             double w_log10p = std::log10(w_probability);
             if (w_log10p <= entry.log10p){
-                if (PreloadSettings::instance().DEVELOPER_MODE){
+                if (STATIC_GLOBALS.DEVELOPER_MODE){
                     logger.log("Cannot ban whitelisted user: " + name + " (log10p = " + tostr_default(w_log10p) + ")", COLOR_RED);
                 }
                 return false;
@@ -96,7 +96,7 @@ bool check_ban_for_name(
     matches.emplace_back(TeraLobbyNameMatchResult{
         entry, banlist_source,
         ocr_name,
-        to_utf8(normalized_ocr_name),
+        utf32_to_str(normalized_ocr_name),
         log10p, distance == 0,
         entry.notes
     });
@@ -179,8 +179,8 @@ uint8_t check_ban_list(
 
 JoinReportRow::JoinReportRow(Language p_language, bool p_enabled)
     : StaticTableRow(language_data(p_language).code)
-    , language(LockWhileRunning::UNLOCKED, language_data(p_language).name)
-    , enabled(LockWhileRunning::UNLOCKED, p_enabled)
+    , language(LockMode::UNLOCK_WHILE_RUNNING, language_data(p_language).name)
+    , enabled(LockMode::UNLOCK_WHILE_RUNNING, p_enabled)
 {
     PA_ADD_STATIC(language);
     PA_ADD_OPTION(enabled);
@@ -190,7 +190,7 @@ JoinReportTable::JoinReportTable()
         "<b>Languages to Read:</b><br>"
         "Attempt to read every player's name in the following languages. "
         "Note that all the Latin-based languages are largely the same. So only English is enabled by default.",
-        LockWhileRunning::UNLOCKED, false
+        LockMode::UNLOCK_WHILE_RUNNING, false
     )
 {
     add_row(std::make_unique<JoinReportRow>(Language::English, true));
@@ -214,7 +214,11 @@ std::vector<std::string> JoinReportTable::make_header() const{
 
 
 RaidJoinReportOption::RaidJoinReportOption()
-    : GroupOption("Join Reports:", LockWhileRunning::UNLOCKED, true, true)
+    : GroupOption(
+        "Join Reports:",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        GroupOption::EnableMode::DEFAULT_ENABLED
+    )
     , text(
         "Track how many times each IGN has joined and generate a report. "
         "This can be used to help identify people who join too many times for "
@@ -225,7 +229,7 @@ RaidJoinReportOption::RaidJoinReportOption()
     )
     , wins_only(
         "<b>Track Wins Only:</b><br>Track wins only. Ignore losses and incomplete raids.",
-        LockWhileRunning::UNLOCKED,
+        LockMode::UNLOCK_WHILE_RUNNING,
         true
     )
 {
@@ -302,11 +306,13 @@ std::string MultiLanguageJoinTracker::dump() const{
 }
 void MultiLanguageJoinTracker::dump(const std::string& filename) const{
     std::string str = dump();
-    QFile file(QString::fromStdString(filename));
-    file.open(QIODevice::WriteOnly);
+    FileIO file(Filesystem::Path(filename), FileMode::WRITE);
+    if (!file.is_open()){
+        return;
+    }
     std::string bom = "\xef\xbb\xbf";
-    file.write(bom.c_str(), bom.size());
-    file.write(str.c_str(), str.size());
+    file.write(bom);
+    file.write(str);
 }
 
 
@@ -315,10 +321,10 @@ void MultiLanguageJoinTracker::dump(const std::string& filename) const{
 
 
 TeraLobbyJoinWatcher2::TeraLobbyJoinWatcher2(
-    Logger& logger, AsyncDispatcher& dispatcher, Color color,
+    Logger& logger, Color color,
     uint8_t host_players
 )
-    : TeraLobbyReader(logger, dispatcher, color)
+    : TeraLobbyReader(logger, color)
     , VisualInferenceCallback("TeraLobbyJoinWatcher2")
     , m_host_players(host_players)
 {}
@@ -343,13 +349,13 @@ bool TeraLobbyJoinWatcher2::process_frame(const ImageViewRGB32& frame, WallClock
 
 
 TeraLobbyNameWatcher::TeraLobbyNameWatcher(
-    Logger& logger, AsyncDispatcher& dispatcher,
+    Logger& logger,
     Color color,
     RaidJoinReportOption& report_settings,
     RaidPlayerBanList& ban_settings,
     uint8_t host_players
 )
-    : TeraLobbyReader(logger, dispatcher, color)
+    : TeraLobbyReader(logger, color)
     , VisualInferenceCallback("TeraLobbyNameWatcher")
     , m_logger(logger)
     , m_report_settings(report_settings)
@@ -361,7 +367,7 @@ void TeraLobbyNameWatcher::get_last_known_state(
     std::array<std::map<Language, std::string>, 4>& names,
     std::vector<TeraLobbyNameMatchResult>& bans
 ){
-    std::lock_guard<std::mutex> lg(m_lock);
+    std::lock_guard<Mutex> lg(m_lock);
     names = m_last_known_names;
     bans = m_last_known_bans;
 }
@@ -421,7 +427,7 @@ bool TeraLobbyNameWatcher::process_frame(const ImageViewRGB32& frame, WallClock
     }
 
     {
-        std::lock_guard<std::mutex> lg(m_lock);
+        std::lock_guard<Mutex> lg(m_lock);
 //        m_last_known_players.store(players, std::memory_order_relaxed);
         m_last_known_names = std::move(names);
         m_last_known_bans = std::move(match_list);
diff --git a/SerialPrograms/Source/PokemonSV/Programs/TeraRaids/PokemonSV_JoinTracker.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_JoinTracker.h
similarity index 89%
rename from SerialPrograms/Source/PokemonSV/Programs/TeraRaids/PokemonSV_JoinTracker.h
rename to SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_JoinTracker.h
index c84a1345c1..b4743bd28e 100644
--- a/SerialPrograms/Source/PokemonSV/Programs/TeraRaids/PokemonSV_JoinTracker.h
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_JoinTracker.h
@@ -1,6 +1,6 @@
 /*  Join Tracker
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -11,13 +11,14 @@
 #include <array>
 #include <set>
 #include <map>
-#include "CommonFramework/Language.h"
+#include "Common/Cpp/Concurrency/Mutex.h"
 #include "Common/Cpp/Options/GroupOption.h"
 #include "Common/Cpp/Options/StaticTextOption.h"
 #include "Common/Cpp/Options/BooleanCheckBoxOption.h"
 #include "Common/Cpp/Options/StaticTableOption.h"
+#include "CommonFramework/Language.h"
 #include "CommonFramework/Options/LabelCellOption.h"
-#include "PokemonSV/Inference/Tera/PokemonSV_TeraCardDetector.h"
+#include "VideoGames/PokemonSV/Inference/Tera/PokemonSV_TeraCardDetector.h"
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
@@ -98,7 +99,7 @@ class MultiLanguageJoinTracker{
 class TeraLobbyJoinWatcher2 : public TeraLobbyReader, public VisualInferenceCallback{
 public:
     TeraLobbyJoinWatcher2(
-        Logger& logger, AsyncDispatcher& dispatcher, Color color,
+        Logger& logger, Color color,
         uint8_t host_players
     );
 
@@ -120,7 +121,7 @@ class TeraLobbyJoinWatcher2 : public TeraLobbyReader, public VisualInferenceCall
 class TeraLobbyNameWatcher : public TeraLobbyReader, public VisualInferenceCallback{
 public:
     TeraLobbyNameWatcher(
-        Logger& logger, AsyncDispatcher& dispatcher, Color color,
+        Logger& logger, Color color,
         RaidJoinReportOption& report_settings,
         RaidPlayerBanList& ban_settings,
         uint8_t host_players
@@ -140,7 +141,7 @@ class TeraLobbyNameWatcher : public TeraLobbyReader, public VisualInferenceCallb
     RaidPlayerBanList& m_ban_settings;
     uint8_t m_host_players;
 
-    mutable std::mutex m_lock;
+    mutable Mutex m_lock;
     std::array<std::map<Language, std::string>, 4> m_last_known_names;
     std::vector<TeraLobbyNameMatchResult> m_last_known_bans;
 };
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_TeraBattler.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_TeraBattler.cpp
new file mode 100644
index 0000000000..69fc40c7c0
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_TeraBattler.cpp
@@ -0,0 +1,371 @@
+/*  Tera Battler
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Concurrency/Mutex.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "VideoGames/PokemonSV/Inference/Battles/PokemonSV_NormalBattleMenus.h"
+#include "VideoGames/PokemonSV/Inference/Battles/PokemonSV_TeraBattleMenus.h"
+#include "VideoGames/PokemonSV/Inference/Battles/PokemonSV_TeraRewardsMenu.h"
+#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h"
+#include "PokemonSV_TeraBattler.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+//  If two Switches send commands at exactly the same time, it may cause the
+//  Switches to desync and fork the battle state. So we use this lock prevent
+//  any two Switches from sending commands too close to each other.
+Mutex tera_battle_throttle_lock;
+
+
+enum class BattleMenuResult{
+    RESUME_CURRENT_TURN,
+    RESUME_ADVANCE_TURN,
+    BATTLE_WON,
+    BATTLE_LOST,
+};
+BattleMenuResult run_battle_menu(
+    VideoStream& stream, ProControllerContext& context,
+    TeraBattleMenuDetector& battle_menu,
+    TeraCatchWatcher& catch_menu,
+    OverworldWatcher& overworld,
+    const TeraMoveEntry& move
+){
+    stream.log("Current Move Selection: " + move.to_str());
+    switch (move.type){
+    case TeraMoveType::Wait:{
+        int ret = run_until<ProControllerContext>(
+            stream, context,
+            [&](ProControllerContext& context){
+                pbf_mash_button(context, BUTTON_B, move.duration);
+            },
+            {catch_menu, overworld}
+        );
+        switch (ret){
+        case 0: return BattleMenuResult::BATTLE_WON;
+        case 1: return BattleMenuResult::BATTLE_LOST;
+        }
+        return BattleMenuResult::RESUME_ADVANCE_TURN;
+    }
+    case TeraMoveType::Move1:
+    case TeraMoveType::Move2:
+    case TeraMoveType::Move3:
+    case TeraMoveType::Move4:
+        if (battle_menu.move_to_slot(stream, context, 0)){
+            pbf_press_button(context, BUTTON_A, 160ms, 80ms);
+        }
+        break;
+    case TeraMoveType::Cheer_AllOut:
+    case TeraMoveType::Cheer_HangTough:
+    case TeraMoveType::Cheer_HealUp:
+        if (battle_menu.move_to_slot(stream, context, 1)){
+            pbf_press_button(context, BUTTON_A, 160ms, 80ms);
+        }
+        break;
+    }
+    return BattleMenuResult::RESUME_CURRENT_TURN;
+}
+bool run_cheer_select(
+    VideoStream& stream, ProControllerContext& context,
+    CheerSelectDetector& cheer_select_menu,
+    TeraMoveEntry& move
+){
+    uint8_t index = 0;
+    switch (move.type){
+    case TeraMoveType::Cheer_AllOut:
+        index = 0;
+        break;
+    case TeraMoveType::Cheer_HangTough:
+        index = 1;
+        break;
+    case TeraMoveType::Cheer_HealUp:
+        index = 2;
+        break;
+    default:
+        pbf_press_button(context, BUTTON_B, 160ms, 80ms);
+        return false;
+    }
+    if (cheer_select_menu.move_to_slot(stream, context, index)){
+        std::lock_guard<Mutex> lg(tera_battle_throttle_lock);
+        pbf_press_button(context, BUTTON_A, 160ms, 320ms);
+        context.wait_for_all_requests();
+    }
+    return true;
+}
+bool run_move_select(
+    VideoStream& stream, ProControllerContext& context,
+    TeraAIOption& battle_AI,
+    TerastallizingDetector& terastallizing,
+    MoveSelectWatcher& move_select_menu,
+    TeraMoveEntry& move, size_t consecutive_move_select
+){
+    uint8_t index = 0;
+    switch (move.type){
+    case TeraMoveType::Move1:
+        index = 0;
+        break;
+    case TeraMoveType::Move2:
+        index = 1;
+        break;
+    case TeraMoveType::Move3:
+        index = 2;
+        break;
+    case TeraMoveType::Move4:
+        index = 3;
+        break;
+    default:
+        pbf_press_button(context, BUTTON_B, 160ms, 80ms);
+        return false;
+    }
+
+    //  If we end up here consecutively too many times, the move is
+    //  probably disabled. Select a different move.
+    if (consecutive_move_select > 3){
+        stream.log("Failed to select a move 3 times. Choosing a different move.", COLOR_RED);
+//        pbf_press_dpad(context, DPAD_DOWN, 160ms, 320ms);
+        index++;
+        if (index >= 4){
+            index = 0;
+        }
+        move.type = (TeraMoveType)((uint8_t)TeraMoveType::Move1 + index);
+    }
+
+    do{
+        if (!battle_AI.TRY_TO_TERASTILLIZE){
+            stream.log("Skipping Terastallization. Reason: Disabled by settings.");
+            break;
+        }
+        if (consecutive_move_select > 1){
+            stream.log("Skipping Terastallization. Reason: Previously failed move select.");
+            break;
+        }
+        if (!terastallizing.detect(stream.video().snapshot())){
+            stream.log("Skipping Terastallization. Reason: Not ready.");
+            break;
+        }
+
+        stream.log("Attempting to Terastallize...");
+        pbf_press_button(context, BUTTON_R, 160ms, 4000ms);
+    }while (false);
+
+    if (move_select_menu.move_to_slot(stream, context, index)){
+        pbf_press_button(context, BUTTON_A, 160ms, 80ms);
+    }
+    return true;
+}
+bool run_target_select(
+    VideoStream& stream, ProControllerContext& context,
+    TeraTargetSelectDetector& target_select_menu,
+    TeraMoveEntry& move
+){
+    switch (move.type){
+    case TeraMoveType::Move1:
+    case TeraMoveType::Move2:
+    case TeraMoveType::Move3:
+    case TeraMoveType::Move4:{
+        target_select_menu.move_to_slot(stream, context, (uint8_t)move.target);
+        std::lock_guard<Mutex> lg(tera_battle_throttle_lock);
+        pbf_press_button(context, BUTTON_A, 160ms, 320ms);
+        context.wait_for_all_requests();
+        return true;
+    }
+    default:
+        pbf_press_button(context, BUTTON_B, 160ms, 80ms);
+        return false;
+    }
+}
+
+
+
+
+bool run_tera_battle(
+    ProgramEnvironment& env,
+    VideoStream& stream, ProControllerContext& context,
+    TeraAIOption& battle_AI
+){
+    stream.log("Starting tera battle routine...");
+
+    size_t turn = 0;
+    std::vector<TeraMoveEntry> move_table = battle_AI.MOVE_TABLE.snapshot();
+    TeraMoveEntry current_move{TeraMoveType::Move1, 0ms, TeraTarget::Opponent};
+    if (!move_table.empty()){
+        current_move = move_table[0];
+    }
+
+    size_t consecutive_timeouts = 0;
+    size_t consecutive_move_select = 0;
+    bool battle_menu_seen = false;
+    bool next_turn_on_battle_menu = false;
+    while (true){
+        // Warning, this terastallizing detector isn't used in the wait_until() below.
+        TerastallizingDetector terastallizing(COLOR_ORANGE);
+        VideoOverlaySet overlay_set(stream.overlay());
+        terastallizing.make_overlays(overlay_set);
+
+        TeraBattleMenuWatcher battle_menu(COLOR_RED);
+        CheerSelectWatcher cheer_select_menu(COLOR_YELLOW);
+        MoveSelectWatcher move_select_menu(COLOR_YELLOW);
+        TargetSelectWatcher target_select_menu(COLOR_CYAN);
+        TeraRewardsMenuWatcher rewards_menu(
+            COLOR_BLUE,
+            //  This can false positive against the back (B) button while in the
+            //  lobby. So don't trigger this unless we see the battle menu first.
+            //  At the same time, there's a possibility that we miss the battle
+            //  menu if the raid is won before it even loads. And this can only
+            //  happen if the raid was uncatchable to begin with.
+            std::chrono::seconds(battle_menu_seen ? 5 : 180)
+        );
+#if 0
+        WhiteButtonWatcher next_button(
+            COLOR_CYAN,
+            WhiteButton::ButtonA,
+            {0.8, 0.93, 0.2, 0.07},
+            WhiteButtonWatcher::FinderType::PRESENT,
+            //  This can false positive against the back (B) button while in the
+            //  lobby. So don't trigger this unless we see the battle menu first.
+            //  At the same time, there's a possibility that we miss the battle
+            //  menu if the raid is won before it even loads. And this can only
+            //  happen if the raid was uncatchable to begin with.
+            std::chrono::seconds(battle_menu_seen ? 5 : 180)
+        );
+#endif
+        TeraCatchWatcher catch_menu(COLOR_BLUE);
+        OverworldWatcher overworld(stream.logger(), COLOR_GREEN);
+        context.wait_for_all_requests();
+        int ret = run_until<ProControllerContext>(
+            stream, context,
+            [](ProControllerContext& context){
+                for (size_t c = 0; c < 4; c++){
+                    pbf_wait(context, 30000ms);
+                    pbf_press_button(context, BUTTON_B, 160ms, 0ms);
+                }
+            },
+            {
+                battle_menu,
+                cheer_select_menu,
+                move_select_menu,
+                target_select_menu,
+//                next_button,
+                rewards_menu,
+                catch_menu,
+                overworld,
+            }
+        );
+        context.wait_for(std::chrono::milliseconds(100));
+        switch (ret){
+        case 0:{
+            stream.log("Detected battle menu.");
+            battle_menu_seen = true;
+
+            //  If we enter here, we advance to the next turn.
+            if (next_turn_on_battle_menu){
+                stream.log("Detected battle menu. Turn: " + std::to_string(turn));
+                turn++;
+                //  Reset the move to the table entry in case we were forced to
+                //  change moves due to move being unselectable.
+                if (move_table.empty()){
+                    current_move = TeraMoveEntry{TeraMoveType::Move1, 0ms, TeraTarget::Opponent};
+                }else if (turn < move_table.size()){
+                    current_move = move_table[turn];
+                }else{
+                    current_move = move_table.back();
+                }
+                next_turn_on_battle_menu = false;
+            }
+
+            stream.log("Current Move Selection: " + current_move.to_str());
+            BattleMenuResult battle_menu_result = run_battle_menu(
+                stream, context,
+                battle_menu,
+                catch_menu,
+                overworld,
+                current_move
+            );
+            switch (battle_menu_result){
+            case BattleMenuResult::RESUME_CURRENT_TURN:
+                continue;
+            case BattleMenuResult::RESUME_ADVANCE_TURN:
+                next_turn_on_battle_menu = true;
+                continue;
+            case BattleMenuResult::BATTLE_WON:
+                stream.log("Detected a win!", COLOR_BLUE);
+                pbf_mash_button(context, BUTTON_B, 240ms);
+                return true;
+            case BattleMenuResult::BATTLE_LOST:
+                stream.log("Detected a loss!", COLOR_ORANGE);
+                return false;
+            }
+        }
+        case 1:{
+            stream.log("Detected cheer select. Turn: " + std::to_string(turn));
+            if (run_cheer_select(stream, context, cheer_select_menu, current_move)){
+                next_turn_on_battle_menu = true;
+            }
+            continue;
+        }
+        case 2:{
+            stream.log("Detected move select. Turn: " + std::to_string(turn));
+            consecutive_move_select++;
+            run_move_select(
+                stream, context,
+                battle_AI,
+                terastallizing,
+                move_select_menu,
+                current_move,
+                consecutive_move_select
+            );
+            continue;
+        }
+        case 3:
+            stream.log("Detected target select. Turn: " + std::to_string(turn));
+            consecutive_move_select = 0;
+            if (run_target_select(stream, context, target_select_menu, current_move)){
+                next_turn_on_battle_menu = true;
+            }
+            continue;
+        case 4:
+            stream.log("Detected item rewards menu!", COLOR_BLUE);
+            pbf_mash_button(context, BUTTON_B, 240ms);
+            return true;
+        case 5:
+            stream.log("Detected catch menu!", COLOR_BLUE);
+            pbf_mash_button(context, BUTTON_B, 240ms);
+            return true;
+        case 6:
+            stream.log("Detected a loss!", COLOR_ORANGE);
+            return false;
+        default:
+            consecutive_timeouts++;
+            if (consecutive_timeouts == 3){
+                OperationFailedExceptionWithScreenshot::fire(
+                    ErrorReportMode::SEND_ERROR_REPORT,
+                    "No state detected after 6 minutes.",
+                    stream
+                );
+            }
+            stream.log("Unable to detect any state for 2 minutes. Mashing B...", COLOR_RED);
+            pbf_mash_button(context, BUTTON_B, 2000ms);
+        }
+    }
+
+    return false;
+}
+
+
+
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_TeraBattler.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_TeraBattler.h
new file mode 100644
index 0000000000..631e16f8c0
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_TeraBattler.h
@@ -0,0 +1,33 @@
+/*  Tera Battler
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_TeraBattler_H
+#define PokemonAutomation_PokemonSV_TeraBattler_H
+
+#include "CommonFramework/Tools/ProgramEnvironment.h"
+#include "CommonFramework/Tools/VideoStream.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+#include "VideoGames/PokemonSV/Options/PokemonSV_TeraAIOption.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+//  Run a tera battle until you either win or lose.
+bool run_tera_battle(
+    ProgramEnvironment& env,
+    VideoStream& stream, ProControllerContext& context,
+    TeraAIOption& battle_AI
+);
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_TeraMultiFarmer.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_TeraMultiFarmer.cpp
new file mode 100644
index 0000000000..0e806bacda
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_TeraMultiFarmer.cpp
@@ -0,0 +1,646 @@
+/*  Tera Multi-Farmer
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/PrettyPrint.h"
+//#include "CommonFramework/GlobalSettingsPanel.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "CommonTools/StartupChecks/VideoResolutionCheck.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "Pokemon/Inference/Pokemon_NameReader.h"
+#include "VideoGames/PokemonSV/PokemonSV_Settings.h"
+//#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h"
+#include "VideoGames/PokemonSV/Inference/Tera/PokemonSV_TeraCardDetector.h"
+#include "VideoGames/PokemonSV/Inference/Tera/PokemonSV_TeraRaidSearchDetector.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_ConnectToInternet.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h"
+#include "VideoGames/PokemonSV/Programs/FastCodeEntry/PokemonSV_CodeEntry.h"
+#include "PokemonSV_TeraRoutines.h"
+#include "PokemonSV_TeraBattler.h"
+#include "PokemonSV_AutoHostTools.h"
+#include "PokemonSV_AutoHostLobbyWaiter.h"
+#include "PokemonSV_TeraMultiFarmer.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+using namespace Pokemon;
+
+
+
+GeneralHostingOptions::GeneralHostingOptions()
+    : GroupOption("Hosting Options", LockMode::UNLOCK_WHILE_RUNNING)
+{
+    PA_ADD_OPTION(LOBBY_WAIT_DELAY);
+    PA_ADD_OPTION(START_RAID_PLAYERS);
+    PA_ADD_OPTION(SHOW_RAID_CODE);
+    PA_ADD_OPTION(DESCRIPTION);
+    PA_ADD_OPTION(REMOTE_KILL_SWITCH);
+    PA_ADD_OPTION(CONSECUTIVE_FAILURE_PAUSE);
+    PA_ADD_OPTION(FAILURE_PAUSE_MINUTES);
+}
+
+
+
+
+TeraFarmerPerConsoleOptions::~TeraFarmerPerConsoleOptions(){
+    catch_on_win.remove_listener(*this);
+}
+TeraFarmerPerConsoleOptions::TeraFarmerPerConsoleOptions(std::string label, const LanguageSet& languages, bool host)
+    : GroupOption(std::move(label), LockMode::UNLOCK_WHILE_RUNNING)
+    , is_host_label("<font color=\"blue\" size=4><b>This is the host Switch.</b></font>")
+    , language("<b>Game Language:</b>", languages, LockMode::LOCK_WHILE_RUNNING, true)
+    , catch_on_win(
+        "<b>Catch the " + STRING_POKEMON + ":</b>",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        false
+    )
+    , ball_select(
+        "<b>Ball Select:</b>",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        "poke-ball"
+    )
+{
+    PA_ADD_STATIC(is_host_label);
+    PA_ADD_OPTION(language);
+    PA_ADD_OPTION(keyboard_layout);
+    PA_ADD_OPTION(catch_on_win);
+    PA_ADD_OPTION(ball_select);
+    PA_ADD_OPTION(battle_ai);
+
+    set_host(host);
+
+    catch_on_win.add_listener(*this);
+}
+void TeraFarmerPerConsoleOptions::set_host(bool is_host){
+    this->is_host = is_host;
+    TeraFarmerPerConsoleOptions::on_config_value_changed(this);
+}
+void TeraFarmerPerConsoleOptions::on_config_value_changed(void* object){
+    if (this->is_host){
+        is_host_label.set_visibility(ConfigOptionState::ENABLED);
+        catch_on_win.set_visibility(ConfigOptionState::DISABLED);
+        ball_select.set_visibility(ConfigOptionState::DISABLED);
+    }else{
+        is_host_label.set_visibility(ConfigOptionState::HIDDEN);
+        catch_on_win.set_visibility(ConfigOptionState::ENABLED);
+        ball_select.set_visibility(catch_on_win ? ConfigOptionState::ENABLED : ConfigOptionState::DISABLED);
+    }
+}
+
+
+
+TeraMultiFarmer_Descriptor::TeraMultiFarmer_Descriptor()
+    : MultiSwitchProgramDescriptor(
+        "PokemonSV:TeraMultiFarmer",
+        STRING_POKEMON + " SV", "Tera Multi-Farmer",
+        "Programs/PokemonSV/TeraMultiFarmer.html",
+        "Farm items and " + STRING_POKEMON + " from your own Tera raid using multiple Switches.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS,
+        2, 4, 2
+    )
+{}
+struct TeraMultiFarmer_Descriptor::Stats : public StatsTracker{
+    Stats()
+        : m_raids(m_stats["Raids"])
+        , m_empty(m_stats["Empty Raids"])
+        , m_full(m_stats["Full Raids"])
+        , m_joiners(m_stats["Total Joiners"])
+        , m_wins(m_stats["Wins"])
+        , m_losses(m_stats["Losses"])
+        , m_banned(m_stats["Banned"])
+        , m_errors(m_stats["Errors"])
+    {
+        m_display_order.emplace_back("Raids");
+        m_display_order.emplace_back("Empty Raids", HIDDEN_IF_ZERO);
+        m_display_order.emplace_back("Full Raids", HIDDEN_IF_ZERO);
+        m_display_order.emplace_back("Total Joiners", HIDDEN_IF_ZERO);
+        m_display_order.emplace_back("Wins");
+        m_display_order.emplace_back("Losses");
+        m_display_order.emplace_back("Banned", HIDDEN_IF_ZERO);
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+    }
+    std::atomic<uint64_t>& m_raids;
+    std::atomic<uint64_t>& m_empty;
+    std::atomic<uint64_t>& m_full;
+    std::atomic<uint64_t>& m_joiners;
+    std::atomic<uint64_t>& m_wins;
+    std::atomic<uint64_t>& m_losses;
+    std::atomic<uint64_t>& m_banned;
+    std::atomic<uint64_t>& m_errors;
+};
+std::unique_ptr<StatsTracker> TeraMultiFarmer_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+
+TeraMultiFarmer::~TeraMultiFarmer(){
+    HOSTING_MODE.remove_listener(*this);
+    HOSTING_SWITCH.remove_listener(*this);
+}
+TeraMultiFarmer::TeraMultiFarmer()
+    : HOSTING_SWITCH(
+        "<b>Host Switch:</b><br>This is the Switch that hosts the raid.",
+        {
+            {0, "switch0", "Switch 0 (Top Left)"},
+            {1, "switch1", "Switch 1 (Top Right)"},
+            {2, "switch2", "Switch 2 (Bottom Left)"},
+            {3, "switch3", "Switch 3 (Bottom Right)"},
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        0
+    )
+    , MAX_WINS(
+        "<b>Max Wins:</b><br>Stop program after winning this many times.",
+          LockMode::UNLOCK_WHILE_RUNNING,
+        999, 1, 999
+    )
+    , HOSTING_MODE(
+        "<b>Mode:</b>",
+        {
+            {Mode::FARM_ALONE,      "farm-alone",   "Farm by yourself."},
+            {Mode::HOST_LOCALLY,    "host-locally", "Host remaining slots locally."},
+            {Mode::HOST_ONLINE,     "host-online",  "Host remaining slots online."},
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        Mode::FARM_ALONE
+    )
+    , RECOVERY_MODE(
+        "<b>Recovery Mode:</b>",
+        {
+            {RecoveryMode::STOP_ON_ERROR,   "stop-on-error",    "Stop on any error."},
+            {RecoveryMode::SAVE_AND_RESET,  "save-and-reset",   "Save before each raid. Reset on errors."},
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        RecoveryMode::SAVE_AND_RESET
+    )
+    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_STATUS_UPDATE,
+        &NOTIFICATION_RAID_POST,
+        &NOTIFICATION_RAID_START,
+        &NOTIFICATION_JOIN_REPORT,
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_RECOVERABLE,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+{
+    const LanguageSet& languages = PokemonNameReader::instance().languages();
+    size_t host = HOSTING_SWITCH.current_value();
+    PLAYERS[0].reset(new TeraFarmerPerConsoleOptions("Switch 0 (Top Left)", languages, host == 0));
+    PLAYERS[1].reset(new TeraFarmerPerConsoleOptions("Switch 1 (Top Right)", languages, host == 1));
+    PLAYERS[2].reset(new TeraFarmerPerConsoleOptions("Switch 2 (Bottom Left)", languages, host == 2));
+    PLAYERS[3].reset(new TeraFarmerPerConsoleOptions("Switch 3 (Bottom Right)", languages, host == 3));
+
+    PA_ADD_OPTION(HOSTING_SWITCH);
+    PA_ADD_OPTION(MAX_WINS);
+
+    //  General Auto-Hosting Options
+    PA_ADD_OPTION(HOSTING_MODE);
+    PA_ADD_OPTION(HOSTING_OPTIONS);
+
+    PA_ADD_OPTION(*PLAYERS[0]);
+    PA_ADD_OPTION(*PLAYERS[1]);
+    PA_ADD_OPTION(*PLAYERS[2]);
+    PA_ADD_OPTION(*PLAYERS[3]);
+
+    PA_ADD_OPTION(ROLLOVER_PREVENTION);
+//    PA_ADD_OPTION(RECOVERY_MODE);
+
+    //  Extended Auto-Hosting Options
+    PA_ADD_OPTION(BAN_LIST);
+    PA_ADD_OPTION(JOIN_REPORT);
+
+    PA_ADD_OPTION(NOTIFICATIONS);
+
+    TeraMultiFarmer::on_config_value_changed(this);
+
+    HOSTING_SWITCH.add_listener(*this);
+    HOSTING_MODE.add_listener(*this);
+}
+void TeraMultiFarmer::update_active_consoles(size_t switch_count){
+    for (size_t c = 0; c < 4; c ++){
+        PLAYERS[c]->set_visibility(c < switch_count ? ConfigOptionState::ENABLED : ConfigOptionState::HIDDEN);
+    }
+}
+void TeraMultiFarmer::on_config_value_changed(void* object){
+    size_t host = HOSTING_SWITCH.current_value();
+    for (size_t c = 0; c < 4; c++){
+        PLAYERS[c]->set_host(host == c);
+    }
+
+    ConfigOptionState hosting = HOSTING_MODE == Mode::FARM_ALONE
+        ? ConfigOptionState::HIDDEN
+        : ConfigOptionState::ENABLED;
+    HOSTING_OPTIONS.set_visibility(hosting);
+    BAN_LIST.set_visibility(hosting);
+    JOIN_REPORT.set_visibility(hosting);
+}
+
+
+void TeraMultiFarmer::reset_host(const ProgramInfo& info, ConsoleHandle& console, ProControllerContext& context){
+    pbf_press_button(context, BUTTON_HOME, 160ms, GameSettings::instance().GAME_TO_HOME_DELAY1);
+    if (ROLLOVER_PREVENTION){
+        WallClock now = current_time();
+        if (m_last_time_fix == WallClock::min() || now - m_last_time_fix > std::chrono::hours(4)){
+            set_time_to_12am_from_home(info, console, context);
+            m_last_time_fix = now;
+        }
+    }
+    reset_game_from_home(info, console, context, 5000ms);
+}
+void TeraMultiFarmer::reset_joiner(const ProgramInfo& info, ConsoleHandle& console, ProControllerContext& context){
+    pbf_press_button(context, BUTTON_HOME, 160ms, GameSettings::instance().GAME_TO_HOME_DELAY1);
+    reset_game_from_home(info, console, context, 5000ms);
+}
+bool TeraMultiFarmer::run_raid_host(ProgramEnvironment& env, ConsoleHandle& console, ProControllerContext& context){
+    TeraMultiFarmer_Descriptor::Stats& stats = env.current_stats<TeraMultiFarmer_Descriptor::Stats>();
+    TeraFarmerPerConsoleOptions& option = *PLAYERS[console.index()];
+
+    stats.m_raids++;
+    env.update_stats();
+    bool win = run_tera_battle(env, console, context, option.battle_ai);
+
+    if (win){
+        stats.m_wins++;
+        env.update_stats();
+        if (HOSTING_MODE == Mode::HOST_ONLINE){
+            exit_tera_win_without_catching(env.program_info(), console, context, 0);
+        }
+        reset_host(env.program_info(), console, context);
+//        if (HOSTING_MODE == Mode::HOST_ONLINE){
+//            connect_to_internet_from_overworld(env.program_info(), console, context);
+//        }
+    }else{
+        stats.m_losses++;
+        env.update_stats();
+    }
+
+//    open_raid(console, context);
+
+    return win;
+}
+void TeraMultiFarmer::run_raid_joiner(ProgramEnvironment& env, ConsoleHandle& console, ProControllerContext& context){
+    TeraFarmerPerConsoleOptions& option = *PLAYERS[console.index()];
+
+    bool win = run_tera_battle(env, console, context, option.battle_ai);
+
+    if (win){
+        if (option.catch_on_win){
+            exit_tera_win_by_catching(env, console, context, option.language, option.ball_select.slug(), 0);
+        }else{
+            exit_tera_win_without_catching(env.program_info(), console, context, 0);
+        }
+    }
+
+    if (RECOVERY_MODE == RecoveryMode::SAVE_AND_RESET){
+        pbf_press_button(context, BUTTON_X, 160ms, 840ms);
+        save_game_from_menu(env.program_info(), console, context);
+    }
+
+//    enter_tera_search(env.program_info(), console, context, HOSTING_MODE == Mode::HOST_ONLINE);
+}
+
+
+bool TeraMultiFarmer::start_sequence_host(
+    MultiSwitchProgramEnvironment& env, ConsoleHandle& console, ProControllerContext& context,
+    RaidWaiter& raid_waiter, CancellableScope& joiner_scope,
+    std::string& lobby_code,
+    std::array<std::map<Language, std::string>, 4>& player_names
+){
+    TeraMultiFarmer_Descriptor::Stats& stats = env.current_stats<TeraMultiFarmer_Descriptor::Stats>();
+
+    TeraCardReader card_detector(COLOR_RED);
+    if (!card_detector.detect(console.video().snapshot())){
+        if (HOSTING_MODE == Mode::HOST_ONLINE){
+            connect_to_internet_from_overworld(env.program_info(), console, context);
+        }
+        open_raid(console, context);
+    }
+
+    if (HOSTING_MODE != Mode::FARM_ALONE){
+        BAN_LIST.refresh_online_table(env.logger());
+    }
+
+    //  Open lobby and read code.
+    WallClock lobby_start_time;
+    try{
+        TeraLobbyReader lobby_reader(console.logger());
+        open_hosting_lobby(
+            env, console, context,
+            HOSTING_MODE == Mode::HOST_ONLINE
+                ? HostingMode::ONLINE_CODED
+                : HostingMode::LOCAL
+        );
+        lobby_start_time = current_time();
+        std::string code = lobby_reader.raid_code(
+            env.logger(),
+            console.video().snapshot()
+        );
+
+//        code.back() = '0';
+
+        const char* error = normalize_code(lobby_code, code);
+        if (error){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "Unable to read raid code.",
+                console
+            );
+        }
+    }catch (OperationFailedException&){
+        stats.m_errors++;
+        m_reset_required[console.index()].store(true, std::memory_order_relaxed);
+        throw;
+    }
+
+    raid_waiter.signal_raid_code_is_ready(lobby_code);
+    raid_waiter.wait_for_joiners(env.consoles() - 1);
+
+#if 1
+    //  Put it up on auto-host.
+    if (HOSTING_MODE != Mode::FARM_ALONE){
+        send_host_announcement(
+            env, console,
+            lobby_code,
+            HOSTING_OPTIONS.SHOW_RAID_CODE,
+            HOSTING_OPTIONS.DESCRIPTION,
+            NOTIFICATION_RAID_POST
+        );
+
+        TeraLobbyWaiter waiter(
+            env, console, context,
+            (uint8_t)env.consoles(),
+            lobby_code, lobby_start_time,
+            HOSTING_OPTIONS.LOBBY_WAIT_DELAY,
+            HOSTING_OPTIONS.START_RAID_PLAYERS,
+            NOTIFICATION_RAID_START,
+            BAN_LIST,
+            JOIN_REPORT
+        );
+
+        TeraLobbyWaiter::LobbyResult result = waiter.run_lobby();
+        player_names = waiter.names();
+
+        if (result == TeraLobbyWaiter::LobbyResult::BANNED_PLAYER){
+            stats.m_banned++;
+            m_reset_required[0].store(true, std::memory_order_relaxed);
+            m_reset_required[1].store(true, std::memory_order_relaxed);
+            m_reset_required[2].store(true, std::memory_order_relaxed);
+            m_reset_required[3].store(true, std::memory_order_relaxed);
+        }
+        if (result != TeraLobbyWaiter::LobbyResult::RAID_STARTED){
+            return false;
+        }
+
+        uint8_t hosts = (uint8_t)env.consoles();
+        uint8_t players = waiter.last_known_players();
+        if (players > hosts){
+            stats.m_joiners += players - hosts;
+        }
+        if (players == 4){
+            stats.m_full++;
+        }else if (players == hosts){
+            stats.m_empty++;
+        }
+
+
+    }
+#endif
+
+    //  Start the raid.
+    pbf_mash_button(context, BUTTON_A, 10000ms);
+
+    return true;
+}
+void TeraMultiFarmer::start_sequence_joiner(
+    ProgramEnvironment& env, ConsoleHandle& console, ProControllerContext& context,
+    RaidWaiter& raid_waiter
+){
+    join_raid(
+        env.program_info(), console, context,
+        HOSTING_MODE == Mode::HOST_ONLINE,
+        PLAYERS[console.index()]->keyboard_layout,
+        raid_waiter
+    );
+
+    raid_waiter.signal_joiner_is_ready();
+
+    //  Mash A to ready up. Even though this runs for 3 minutes, it will
+    //  automatically be cancelled by the host when the host starts the raid.
+    pbf_mash_button(context, BUTTON_A, std::chrono::minutes(3));
+}
+
+bool TeraMultiFarmer::run_raid(
+    MultiSwitchProgramEnvironment& env, CancellableScope& scope,
+    std::string& lobby_code,
+    std::array<std::map<Language, std::string>, 4>& player_names
+){
+    TeraMultiFarmer_Descriptor::Stats& stats = env.current_stats<TeraMultiFarmer_Descriptor::Stats>();
+    size_t host_index = HOSTING_SWITCH.current_value();
+
+    CancellableHolder<RaidWaiter> raid_waiter(scope);
+    CancellableHolder<CancellableScope> joiner_scope((CancellableScope&)raid_waiter);
+
+    env.run_in_parallel<ProController>(scope, [&](ConsoleHandle& console, ProControllerContext& context){
+        try{
+            if (console.index() == host_index){
+                start_sequence_host(
+                    env, console, context,
+                    raid_waiter,
+                    joiner_scope,
+                    lobby_code,
+                    player_names
+                );
+                joiner_scope.cancel();
+                return;
+            }
+
+            ProControllerContext sub_context(joiner_scope, context.controller());
+            start_sequence_joiner(
+                env, console, sub_context,
+                raid_waiter
+            );
+            sub_context.wait_for_all_requests();
+
+        }catch (OperationCancelledException&){
+        }catch (OperationFailedException&){
+            stats.m_errors++;
+#if 0
+            m_reset_required[console.index()].store(true, std::memory_order_relaxed);
+#else
+            m_reset_required[0].store(true, std::memory_order_relaxed);
+            m_reset_required[1].store(true, std::memory_order_relaxed);
+            m_reset_required[2].store(true, std::memory_order_relaxed);
+            m_reset_required[3].store(true, std::memory_order_relaxed);
+#endif
+            raid_waiter.cancel();
+//            cout << "OperationFailedException: " << console.index() << endl;
+            throw;
+        }catch (...){
+            raid_waiter.cancel();
+//            cout << "General Exception: " << console.index() << endl;
+            throw;
+        }
+//        cout << "Finishing: " << console.index() << endl;
+    });
+
+
+    bool win = false;
+
+    //  Run the raid.
+    env.run_in_parallel<ProController>(scope, [&](ConsoleHandle& console, ProControllerContext& context){
+        try{
+            if (console.index() == host_index){
+                win = run_raid_host(env, console, context);
+            }else{
+                run_raid_joiner(env, console, context);
+            }
+        }catch (OperationFailedException&){
+            //  Host throws. Reset the host and keep going.
+            stats.m_errors++;
+            env.update_stats();
+            m_reset_required[console.index()].store(true, std::memory_order_relaxed);
+            throw;
+        }
+    });
+
+    return win;
+}
+void TeraMultiFarmer::program(MultiSwitchProgramEnvironment& env, CancellableScope& scope){
+    size_t host_index = HOSTING_SWITCH.current_value();
+    if (host_index >= env.consoles()){
+        throw UserSetupError(env.logger(), "The host Switch doesn't exist.");
+    }
+    env.run_in_parallel<ProController>(scope, [&](ConsoleHandle& console, ProControllerContext& context){
+        assert_16_9_720p_min(console.logger(), console);
+        //  Connect the controller.
+        require_player(console, context, BUTTON_LCLICK);
+    });
+
+//    Mode mode = MODE;
+//    ConsoleHandle& host_console = env.consoles[host_index];
+//    BotBaseContext host_context(scope, host_console.botbase());
+
+    std::string report_name = "PokemonSV-AutoHost-JoinReport-" + now_to_filestring() + ".txt";
+    MultiLanguageJoinTracker join_tracker((uint8_t)env.consoles());
+
+    m_reset_required[0].store(false, std::memory_order_relaxed);
+    m_reset_required[1].store(false, std::memory_order_relaxed);
+    m_reset_required[2].store(false, std::memory_order_relaxed);
+    m_reset_required[3].store(false, std::memory_order_relaxed);
+
+    if (RECOVERY_MODE == RecoveryMode::SAVE_AND_RESET){
+        env.run_in_parallel<ProController>(scope, [&](ConsoleHandle& console, ProControllerContext& context){
+            if (console.index() != host_index){
+                //  Do 2 presses in quick succession in case one drops or is
+                //  needed to connect the controller.
+                pbf_press_button(context, BUTTON_X, 40ms, 40ms);
+                pbf_press_button(context, BUTTON_X, 160ms, 840ms);
+                save_game_from_menu(env.program_info(), console, context);
+            }else{
+                pbf_press_button(context, BUTTON_L, 40ms, 40ms);
+            }
+        });
+    }
+
+    TeraFailTracker fail_tracker(
+        env, scope,
+        NOTIFICATION_ERROR_RECOVERABLE,
+        HOSTING_OPTIONS.CONSECUTIVE_FAILURE_PAUSE,
+        HOSTING_OPTIONS.FAILURE_PAUSE_MINUTES
+    );
+    KillSwitchTracker kill_switch(env);
+
+    m_last_time_fix = WallClock::min();
+    for (uint16_t wins = 0; wins < MAX_WINS;){
+        send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
+
+        //  We don't care about fail tracking if we're alone. No chance of ban.
+        if (HOSTING_MODE != Mode::FARM_ALONE){
+            fail_tracker.on_raid_start();
+        }
+
+        //  Reset all errored Switches.
+        env.run_in_parallel<ProController>(scope, [&](ConsoleHandle& console, ProControllerContext& context){
+            size_t index = console.index();
+            if (!m_reset_required[index].load(std::memory_order_relaxed)){
+                return;
+            }
+            if (index == host_index){
+                reset_host(env.program_info(), console, context);
+            }else{
+                reset_joiner(env.program_info(), console, context);
+            }
+            m_reset_required[index].store(false, std::memory_order_relaxed);
+        });
+
+        //  Check kill-switch now before we go online.
+        if (HOSTING_MODE == Mode::HOST_ONLINE){
+            kill_switch.check_kill_switch(HOSTING_OPTIONS.REMOTE_KILL_SWITCH);
+        }
+
+        try{
+            std::string lobby_code;
+            std::array<std::map<Language, std::string>, 4> player_names;
+            bool win = run_raid(env, scope, lobby_code, player_names);
+            if (win){
+                wins++;
+            }
+            if (HOSTING_MODE != Mode::FARM_ALONE && JOIN_REPORT.enabled() && (win || !JOIN_REPORT.wins_only)){
+                join_tracker.append(player_names, lobby_code);
+                join_tracker.dump(report_name);
+                send_program_notification_with_file(
+                    env,
+                    NOTIFICATION_JOIN_REPORT,
+                    Color(0),
+                    "Join Report",
+                    {}, "",
+                    report_name
+                );
+            }
+            fail_tracker.report_successful_raid();
+        }catch (OperationFailedExceptionWithScreenshot& e){
+//            cout << "caught: TeraMultiFarmer::program" << endl;
+
+            e.send_recoverable_error_notif_and_telemetry_report(env, NOTIFICATION_ERROR_RECOVERABLE);
+            if (RECOVERY_MODE != RecoveryMode::SAVE_AND_RESET){
+                //  Iterate the errored Switches. If a non-host has errored,
+                //  rethrow the exception to stop the program.
+                for (size_t c = 0; c < 4; c++){
+                    if (m_reset_required[c].load(std::memory_order_relaxed) && c != host_index){
+                        throw;
+                    }
+                }
+            }
+            fail_tracker.report_raid_error();
+        }
+    }
+
+    env.update_stats();
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+}
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_TeraMultiFarmer.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_TeraMultiFarmer.h
new file mode 100644
index 0000000000..fa84619ca5
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_TeraMultiFarmer.h
@@ -0,0 +1,162 @@
+/*  Tera Multi-Farmer
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_TeraMultiFarmer_H
+#define PokemonAutomation_PokemonSV_TeraMultiFarmer_H
+
+#include "Common/Cpp/Time.h"
+#include "Common/Cpp/Options/GroupOption.h"
+#include "Common/Cpp/Options/StaticTextOption.h"
+#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "Common/Cpp/Options/EnumDropdownOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "CommonTools/Options/LanguageOCROption.h"
+#include "NintendoSwitch/Options/NintendoSwitch_CodeEntrySettingsOption.h"
+#include "NintendoSwitch/NintendoSwitch_MultiSwitchProgram.h"
+#include "VideoGames/PokemonSwSh/Options/PokemonSwSh_BallSelectOption.h"
+#include "VideoGames/PokemonSV/Options/PokemonSV_TeraAIOption.h"
+#include "VideoGames/PokemonSV/Options/PokemonSV_AutoHostOptions.h"
+#include "VideoGames/PokemonSV/Options/PokemonSV_PlayerList.h"
+#include "PokemonSV_AutoHostTools.h"
+#include "PokemonSV_JoinTracker.h"
+#include "PokemonSV_TeraRoutines.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+class GeneralHostingOptions : public GroupOption{
+public:
+    GeneralHostingOptions();
+
+    LobbyWaitDelay LOBBY_WAIT_DELAY;
+    StartRaidPlayers START_RAID_PLAYERS;
+    ShowRaidCode SHOW_RAID_CODE;
+    AutoHostDescription DESCRIPTION;
+    RemoteKillSwitch REMOTE_KILL_SWITCH;
+    ConsecutiveFailurePause CONSECUTIVE_FAILURE_PAUSE;
+    FailurePauseMinutes FAILURE_PAUSE_MINUTES;
+};
+
+
+
+class TeraFarmerPerConsoleOptions : public GroupOption, public ConfigOption::Listener{
+public:
+    ~TeraFarmerPerConsoleOptions();
+    TeraFarmerPerConsoleOptions(std::string label, const LanguageSet& languages, bool host);
+
+    void set_host(bool is_host);
+    virtual void on_config_value_changed(void* object) override;
+
+public:
+    bool is_host;
+    StaticTextOption is_host_label;
+    OCR::LanguageOCROption language;
+    KeyboardLayoutOption keyboard_layout;
+
+    BooleanCheckBoxOption catch_on_win;
+    PokemonSwSh::PokemonBallSelectOption ball_select;
+
+    TeraAIOption battle_ai;
+};
+
+
+
+class TeraMultiFarmer_Descriptor : public MultiSwitchProgramDescriptor{
+public:
+    TeraMultiFarmer_Descriptor();
+
+    struct Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+
+class TeraMultiFarmer : public MultiSwitchProgramInstance, private ConfigOption::Listener{
+public:
+    using Descriptor = TeraMultiFarmer_Descriptor;
+    ~TeraMultiFarmer();
+    TeraMultiFarmer();
+    virtual void update_active_consoles(size_t switch_count) override;
+    virtual void program(MultiSwitchProgramEnvironment& env, CancellableScope& scope) override;
+
+    virtual void on_config_value_changed(void* object) override;
+
+private:
+    void reset_host(const ProgramInfo& info, ConsoleHandle& console, ProControllerContext& context);
+    void reset_joiner(const ProgramInfo& info, ConsoleHandle& console, ProControllerContext& context);
+
+    bool run_raid_host(ProgramEnvironment& env, ConsoleHandle& console, ProControllerContext& context);
+    void run_raid_joiner(ProgramEnvironment& env, ConsoleHandle& console, ProControllerContext& context);
+    void join_lobby(
+        ProgramEnvironment& env, ConsoleHandle& console, ProControllerContext& context,
+        size_t host_index, const std::string& normalized_code
+    );
+
+    bool start_sequence_host(
+        MultiSwitchProgramEnvironment& env, ConsoleHandle& console, ProControllerContext& context,
+        RaidWaiter& raid_waiter, CancellableScope& joiner_scope,
+        std::string& lobby_code,
+        std::array<std::map<Language, std::string>, 4>& player_names
+    );
+    void start_sequence_joiner(
+        ProgramEnvironment& env, ConsoleHandle& console, ProControllerContext& context,
+        RaidWaiter& raid_waiter
+    );
+
+    bool run_raid(
+        MultiSwitchProgramEnvironment& env, CancellableScope& scope,
+        std::string& lobby_code,
+        std::array<std::map<Language, std::string>, 4>& player_names
+    );
+
+private:
+    IntegerEnumDropdownOption HOSTING_SWITCH;
+    SimpleIntegerOption<uint16_t> MAX_WINS;
+
+    enum class Mode{
+        FARM_ALONE,
+        HOST_LOCALLY,
+        HOST_ONLINE,
+    };
+    EnumDropdownOption<Mode> HOSTING_MODE;
+
+    GeneralHostingOptions HOSTING_OPTIONS;
+
+    //  Per-console Options
+    std::unique_ptr<TeraFarmerPerConsoleOptions> PLAYERS[4];
+
+    enum class RecoveryMode{
+        STOP_ON_ERROR,
+        SAVE_AND_RESET,
+    };
+    EnumDropdownOption<RecoveryMode> RECOVERY_MODE;
+    RolloverPrevention ROLLOVER_PREVENTION;
+
+    //  Extended Auto-host Options
+    RaidPlayerBanList BAN_LIST;
+    RaidJoinReportOption JOIN_REPORT;
+
+    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
+    RaidPostNotification NOTIFICATION_RAID_POST;
+    RaidStartNotification NOTIFICATION_RAID_START;
+    JoinReportNotification NOTIFICATION_JOIN_REPORT;
+    EventNotificationsOption NOTIFICATIONS;
+
+    WallClock m_last_time_fix;
+//    std::atomic<bool> m_raid_error;
+    std::atomic<bool> m_reset_required[4];
+};
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_TeraRoller.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_TeraRoller.cpp
new file mode 100644
index 0000000000..3072d95431
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_TeraRoller.cpp
@@ -0,0 +1,257 @@
+/*  Tera Roller
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <cmath>
+#include "CommonFramework/Exceptions/ProgramFinishedException.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "CommonTools/StartupChecks/VideoResolutionCheck.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "Pokemon/Pokemon_Notification.h"
+#include "VideoGames/PokemonSV/PokemonSV_Settings.h"
+#include "VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxShinyDetector.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h"
+#include "VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_TeraRoutines.h"
+#include "PokemonSV_TeraRoller.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+using namespace Pokemon;
+
+
+TeraRoller_Descriptor::TeraRoller_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonSV:TeraRoller",
+        STRING_POKEMON + " SV", "Tera Roller",
+        "Programs/PokemonSV/TeraRoller.html",
+        "Roll Tera raids to find shiny " + STRING_POKEMON + ".",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_PerformanceClassSensitive,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+struct TeraRoller_Descriptor::Stats : public StatsTracker{
+    Stats()
+        : m_skips(m_stats["Date Skips"])
+        , m_resets(m_stats["Resets"])
+        , m_raids(m_stats["Raids"])
+        , m_skipped(m_stats["Skipped"])
+        , m_errors(m_stats["Errors"])
+        , m_shinies(m_stats["Shinies"])
+    {
+        m_display_order.emplace_back("Date Skips");
+        m_display_order.emplace_back("Resets");
+        m_display_order.emplace_back("Raids");
+        m_display_order.emplace_back("Skipped");
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+        m_display_order.emplace_back("Shinies", HIDDEN_IF_ZERO);
+    }
+    std::atomic<uint64_t>& m_skips;
+    std::atomic<uint64_t>& m_resets;
+    std::atomic<uint64_t>& m_raids;
+    std::atomic<uint64_t>& m_skipped;
+    std::atomic<uint64_t>& m_errors;
+    std::atomic<uint64_t>& m_shinies;
+};
+std::unique_ptr<StatsTracker> TeraRoller_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+
+
+
+
+TeraRoller::TeraRoller()
+    : FILTER0(7, false)
+    , CHECK_ONLY_FIRST(
+          "<b>Check Only the First Pokédex Page:</b><br>Reduce time per reset at the expense of not checking repeated encounters.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+          false
+    )
+    , PERIODIC_RESET(
+        "<b>Periodic Game Reset:</b><br>Reset the game after this many skips. This clears up the framerate bug.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        20, 0, 100
+    )
+    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATION_SHINY(
+        "Shiny Encounter",
+        true, true, ImageAttachmentMode::JPG,
+        {"Notifs", "Showcase"}
+    )
+    , m_notification_noop("", false, false)
+    , NOTIFICATIONS({
+        &NOTIFICATION_STATUS_UPDATE,
+        &NOTIFICATION_SHINY,
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_RECOVERABLE,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+{
+    PA_ADD_OPTION(FILTER0);
+    PA_ADD_OPTION(CHECK_ONLY_FIRST);
+    PA_ADD_OPTION(PERIODIC_RESET);
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+
+void TeraRoller::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    assert_16_9_720p_min(env.logger(), env.console);
+
+    TeraRoller_Descriptor::Stats& stats = env.current_stats<TeraRoller_Descriptor::Stats>();
+
+    //  Connect the controller.
+    require_player(env.console, context, BUTTON_L);
+
+    bool first = true;
+    uint32_t skip_counter = 0;
+
+    //  Keep track of when we last reset.
+    //  Day skips too soon out of a reset may fail.
+    WallClock last_reset = WallClock::min();
+
+    while (true){
+        env.update_stats();
+        send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
+
+        if (!first){
+            day_skip_from_overworld(env.console, context);
+
+            //  Do it again if we're fresh out of a reset.
+            while (last_reset + std::chrono::seconds(20) > current_time()){
+                env.log("Fresh out of a reset. Skipping again.");
+                day_skip_from_overworld(env.console, context);
+            }
+
+            pbf_wait(context, GameSettings::instance().RAID_SPAWN_DELAY0);
+            context.wait_for_all_requests();
+            stats.m_skips++;
+            skip_counter++;
+            env.update_stats();
+        }
+        first = false;
+
+        uint8_t reset_period = PERIODIC_RESET;
+        if (reset_period != 0 && skip_counter >= reset_period){
+            env.log("Resetting game to clear framerate.");
+            save_game_from_overworld(env.program_info(), env.console, context);
+            reset_game(env.program_info(), env.console, context);
+            last_reset = current_time();
+            skip_counter = 0;
+            stats.m_resets++;
+        }
+
+        TeraRaidData raid_data;
+        TeraRollFilter::FilterResult result = FILTER0.run_filter(
+            env.program_info(), env.console, context,
+            raid_data
+        );
+        switch (result){
+        case TeraRollFilter::FilterResult::NO_RAID:
+            continue;
+        case TeraRollFilter::FilterResult::FAILED:
+            stats.m_raids++;
+            stats.m_skipped++;
+            continue;
+        case TeraRollFilter::FilterResult::PASSED:
+            stats.m_raids++;
+            break;
+        }
+
+
+        // Enter tera raid battle alone
+        pbf_press_dpad(context, DPAD_DOWN, 80ms, 80ms);
+        pbf_mash_button(context, BUTTON_A, 2000ms);
+        context.wait_for_all_requests();
+//        overlay_set.clear();
+        env.console.log("Entering tera raid...");
+        env.console.overlay().add_log("Entering tera raid...", COLOR_WHITE);
+
+        // Run away from the tera raid battle
+        run_from_tera_battle(env, env.console, context, &stats.m_errors);
+        context.wait_for_all_requests();
+
+        env.console.log("Checking if tera raid is shiny...");
+        env.console.overlay().add_log("Checking Pokédex...", COLOR_WHITE);
+        open_pokedex_from_overworld(env.program_info(), env.console, context);
+        open_recently_battled_from_pokedex(env.program_info(), env.console, context);
+
+        // Since encountering the same species within 5 encounters is possible,
+        // loop through all 5 candidates of recently battled pokemon for shinies
+        for (int i = 0; i < 5; i++){
+            BoxShinyWatcher shiny_detector(COLOR_YELLOW, {0.187, 0.196, 0.028, 0.046});
+            context.wait_for_all_requests();
+
+            int ret = wait_until(
+                env.console, context,
+                std::chrono::seconds(1),
+                {shiny_detector}
+            );
+
+            if (ret == 0){
+                env.console.log("Found a shiny tera raid!", COLOR_GREEN);
+                env.console.overlay().add_log("Shiny!", COLOR_GREEN);
+                stats.m_shinies += 1;
+
+                pbf_wait(context, 4000ms); // Wait enough time for the Pokemon sprite to load
+                context.wait_for_all_requests();
+                send_encounter_notification(
+                    env,
+                    m_notification_noop,
+                    NOTIFICATION_SHINY,
+                    false, true, {{{}, ShinyType::UNKNOWN_SHINY}}, std::nan(""),
+                    env.console.video().snapshot()
+                );
+
+                leave_phone_to_overworld(env.program_info(), env.console, context);
+                save_game_from_overworld(env.program_info(), env.console, context);
+
+                throw ProgramFinishedException();
+            }
+
+            if (CHECK_ONLY_FIRST){ // Check only the first Pokédex page
+                break;
+            }else if (i < 4){ // Check the remaining four Pokédex pages
+                pbf_press_dpad(context, DPAD_RIGHT, 80ms, 160ms);
+            }
+        }
+
+        env.console.log("Not a shiny tera raid...");
+        env.console.overlay().add_log("Not shiny", COLOR_WHITE);
+        leave_phone_to_overworld(env.program_info(), env.console, context);
+
+        pbf_wait(context, 400ms);
+    }
+
+    env.update_stats();
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+}
+
+
+
+
+
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_TeraRoller.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_TeraRoller.h
new file mode 100644
index 0000000000..395afebfce
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_TeraRoller.h
@@ -0,0 +1,60 @@
+/*  Tera Roller
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_TeraRoller_H
+#define PokemonAutomation_PokemonSV_TeraRoller_H
+
+#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "VideoGames/PokemonSV/Options/PokemonSV_TeraRollFilter.h"
+
+namespace PokemonAutomation{
+   struct VideoSnapshot;
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+class TeraRoller_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    TeraRoller_Descriptor();
+
+    struct Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+
+};
+
+
+
+
+class TeraRoller : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = TeraRoller_Descriptor;
+    TeraRoller();
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    TeraRollFilter FILTER0;
+
+    BooleanCheckBoxOption CHECK_ONLY_FIRST;
+    SimpleIntegerOption<uint8_t> PERIODIC_RESET;
+
+    //  Notifications
+    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
+    EventNotificationOption NOTIFICATION_SHINY;
+    EventNotificationOption m_notification_noop;
+    EventNotificationsOption NOTIFICATIONS;
+
+};
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_TeraRoutines.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_TeraRoutines.cpp
new file mode 100644
index 0000000000..d0766fde74
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_TeraRoutines.cpp
@@ -0,0 +1,914 @@
+/*  Tera Exit Routines
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <cmath>
+#include "Common/Cpp/Exceptions.h"
+#include "CommonFramework/Exceptions/ProgramFinishedException.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/Exceptions/FatalProgramException.h"
+#include "CommonFramework/ErrorReports/ErrorReports.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonFramework/Tools/ProgramEnvironment.h"
+#include "CommonFramework/Tools/ErrorDumper.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "CommonTools/VisualDetectors/FrozenImageDetector.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "Pokemon/Pokemon_Notification.h"
+#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h"
+#include "VideoGames/PokemonSV/Inference/Battles/PokemonSV_TeraBattleMenus.h"
+#include "VideoGames/PokemonSV/Inference/PokemonSV_PokemonSummaryReader.h"
+#include "VideoGames/PokemonSV/Inference/PokemonSV_MainMenuDetector.h"
+#include "VideoGames/PokemonSV/Inference/PokemonSV_PokePortalDetector.h"
+#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h"
+#include "VideoGames/PokemonSV/Inference/Tera/PokemonSV_TeraCardDetector.h"
+#include "VideoGames/PokemonSV/Inference/Tera/PokemonSV_TeraRaidSearchDetector.h"
+#include "VideoGames/PokemonSV/Inference/Tera/PokemonSV_TeraRewardsReader.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_ConnectToInternet.h"
+#include "VideoGames/PokemonSV/Programs/FastCodeEntry/PokemonSV_CodeEntry.h"
+#include "VideoGames/PokemonSV/Programs/Battles/PokemonSV_BasicCatcher.h"
+#include "PokemonSV_TeraRoutines.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+using namespace Pokemon;
+
+
+
+bool open_raid(VideoStream& stream, ProControllerContext& context){
+    stream.log("Opening raid...");
+    while (true){
+        TeraCardWatcher card_detector(COLOR_RED);
+        AdvanceDialogWatcher dialog(COLOR_YELLOW);
+        int ret = run_until<ProControllerContext>(
+            stream, context,
+            [](ProControllerContext& context){
+                //  Do 2 presses in quick succession in case one drops or is
+                //  needed to connect the controller.
+                pbf_press_button(context, BUTTON_A, 40ms, 40ms);
+                pbf_press_button(context, BUTTON_A, 160ms, 2840ms);
+            },
+            {
+                card_detector,
+                dialog,
+            }
+        );
+        switch (ret){
+        case 0:
+            stream.log("Tera raid found!", COLOR_BLUE);
+            return true;
+        case 1:
+            stream.log("Detect possible uncatchable dialog...", COLOR_ORANGE);
+            pbf_press_button(context, BUTTON_B, 160ms, 840ms);
+            continue;
+        default:
+            stream.log("No Tera raid found.", COLOR_ORANGE);
+            return false;
+        }
+    }
+}
+void close_raid(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context){
+    stream.log("Closing raid...");
+
+    WallClock start = current_time();
+    while (true){
+        context.wait_for_all_requests();
+        if (current_time() - start > std::chrono::minutes(5)){
+            dump_image_and_throw_recoverable_exception(
+                info, stream, "CloseRaidFailed",
+                "Failed to return to overworld after 5 minutes."
+            );
+        }
+
+        TeraCardWatcher card_detector(COLOR_RED);
+        OverworldWatcher overworld(stream.logger(), COLOR_CYAN);
+        int ret = wait_until(
+            stream, context,
+            std::chrono::seconds(60),
+            {card_detector, overworld}
+        );
+        context.wait_for(std::chrono::milliseconds(100));
+        switch (ret){
+        case 0:
+            pbf_press_button(context, BUTTON_B, 160ms, 840ms);
+            continue;
+        case 1:
+            stream.log("Detected overworld.");
+            return;
+        default:
+            dump_image_and_throw_recoverable_exception(info, stream, "CloseRaidFailed",
+                "close_raid(): No recognized state after 60 seconds.");
+        }
+    }
+}
+
+
+
+void open_hosting_lobby(
+    ProgramEnvironment& env, VideoStream& stream, ProControllerContext& context,
+    HostingMode mode
+){
+    bool recovery_mode = false;
+    WallClock start = current_time();
+    while (true){
+        context.wait_for_all_requests();
+        if (current_time() - start > std::chrono::minutes(2)){
+            dump_image_and_throw_recoverable_exception(
+                env.program_info(), stream, "OpenLobbyFailed",
+                "Unable to open Tera lobby after 2 minutes."
+            );
+        }
+
+        OverworldWatcher overworld(stream.logger(), COLOR_RED);
+        if (recovery_mode){
+            context.wait_for_all_requests();
+            int ret = run_until<ProControllerContext>(
+                stream, context,
+                [](ProControllerContext& context){
+                    pbf_press_button(context, BUTTON_B, 160ms, 7840ms);
+                },
+                {overworld}
+            );
+            if (ret < 0){
+                continue;
+            }
+            stream.log("Detected overworld. Recovery finished.");
+            recovery_mode = true;
+        }
+
+//        AdvanceDialogWatcher dialog(COLOR_GREEN);
+        TeraCardWatcher card_detector(COLOR_YELLOW);
+        TeraLobbyWatcher lobby(stream.logger(), COLOR_BLUE);
+        context.wait_for_all_requests();
+        int ret = wait_until(
+            stream, context,
+            std::chrono::seconds(30),
+            {
+                overworld,
+//                dialog,
+                card_detector,
+                {lobby, std::chrono::milliseconds(500)}
+            }
+        );
+        context.wait_for(std::chrono::milliseconds(100));
+        switch (ret){
+        case 0:
+            stream.log("Detected overworld.");
+            recovery_mode = false;
+            if (!open_raid(stream, context)){
+                OperationFailedExceptionWithScreenshot::fire(
+                    ErrorReportMode::SEND_ERROR_REPORT,
+                    "No Tera raid found.",
+                    stream
+                );
+            }
+            continue;
+#if 0
+        case 1:
+            stream.log("Detect possible uncatchable dialog...", COLOR_ORANGE);
+            pbf_press_button(context, BUTTON_B, 160ms, 1840ms);
+            continue;
+#endif
+        case 1:
+            stream.log("Detected Tera card.");
+            if (mode != HostingMode::LOCAL){
+                pbf_press_button(context, BUTTON_A, 160ms, 1840ms);
+                if (mode == HostingMode::ONLINE_EVERYONE){
+                    pbf_press_dpad(context, DPAD_DOWN, 160ms, 840ms);
+                }
+            }
+            pbf_press_button(context, BUTTON_A, 160ms, 1840ms);
+            continue;
+        case 2:
+            stream.log("Detected Tera lobby.");
+            return;
+        default:
+            stream.log("No state detected after 30 seconds. Backing out...", COLOR_RED);
+            pbf_press_button(context, BUTTON_B, 160ms, 1840ms);
+            recovery_mode = true;
+        }
+    }
+}
+
+
+
+
+
+void enter_tera_search(
+    const ProgramInfo& info, VideoStream& stream, ProControllerContext& context,
+    bool connect_to_internet
+){
+    WallClock start = current_time();
+    bool connected = false;
+    while (true){
+        if (current_time() - start > std::chrono::minutes(5)){
+            dump_image_and_throw_recoverable_exception(
+                info, stream, "EnterTeraSearchFailed",
+                "enter_tera_search(): Failed to enter Tera search."
+            );
+        }
+
+        OverworldWatcher overworld(stream.logger(), COLOR_RED);
+        MainMenuWatcher main_menu(COLOR_YELLOW);
+        PokePortalWatcher poke_portal(COLOR_GREEN);
+        TeraRaidSearchWatcher raid_search(COLOR_CYAN, std::chrono::milliseconds(500));
+        CodeEntryWatcher code_entry(COLOR_PURPLE);
+        AdvanceDialogWatcher dialog(COLOR_BLUE);
+        context.wait_for_all_requests();
+        int ret = wait_until(
+            stream, context,
+            std::chrono::seconds(30),
+            {
+                overworld,
+                main_menu,
+                poke_portal,
+                raid_search,
+                code_entry,
+                dialog,
+            }
+        );
+        context.wait_for(std::chrono::milliseconds(100));
+        switch (ret){
+        case 0:
+            stream.log("Detected overworld.");
+            pbf_press_button(context, BUTTON_X, 160ms, 840ms);
+            continue;
+        case 1:
+            stream.log("Detected main menu.");
+            if (connect_to_internet && !connected){
+                connect_to_internet_from_menu(info, stream, context);
+                connected = true;
+                continue;
+            }
+            if (main_menu.move_cursor(info, stream, context, MenuSide::RIGHT, 3)){
+                pbf_press_button(context, BUTTON_A, 160ms, 1840ms);
+            }
+            continue;
+        case 2:
+            stream.log("Detected Poke Portal.");
+            if (poke_portal.move_cursor(info, stream, context, 1)){
+                pbf_press_button(context, BUTTON_A, 160ms, 1840ms);
+            }
+            continue;
+        case 3:
+            stream.log("Detected Tera Raid Search.");
+            if (raid_search.move_cursor_to_search(info, stream, context)){
+                pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+            }
+            continue;
+        case 4:
+            stream.log("Detected Code Entry.");
+            return;
+        case 5:
+            stream.log("Detected Dialog.");
+            pbf_press_button(context, BUTTON_B, 160ms, 840ms);
+            continue;
+        default:
+            dump_image_and_throw_recoverable_exception(
+                info, stream, "EnterTeraSearchFailed",
+                "enter_tera_search(): No recognized state after 30 seconds."
+            );
+        }
+    }
+}
+
+void join_raid(
+    const ProgramInfo& info, ConsoleHandle& console, ProControllerContext& context,
+    bool connect_to_internet,
+    KeyboardLayout keyboard_layout,
+    RaidWaiter& raid_waiter
+){
+    WallClock start = current_time();
+    bool connected = false;
+    while (true){
+        if (current_time() - start > std::chrono::minutes(5)){
+            dump_image_and_throw_recoverable_exception(
+                info, console, "JoinRaidFailed",
+                "join_raid(): Failed to enter Tera raid."
+            );
+        }
+
+        OverworldWatcher overworld(console.logger(), COLOR_RED);
+        MainMenuWatcher main_menu(COLOR_YELLOW);
+        PokePortalWatcher poke_portal(COLOR_GREEN);
+        TeraRaidSearchWatcher raid_search(COLOR_CYAN);
+        AdvanceDialogWatcher dialog(COLOR_BLUE);
+        CodeEntryWatcher code_entry(COLOR_PURPLE);
+        TeraLobbyWatcher lobby(console.logger(), COLOR_ORANGE);
+        context.wait_for_all_requests();
+        int ret = wait_until(
+            console, context,
+            std::chrono::seconds(30),
+            {
+                overworld,
+                main_menu,
+                poke_portal,
+                raid_search,
+                dialog,
+                code_entry,
+                lobby,
+            }
+        );
+        context.wait_for(std::chrono::milliseconds(100));
+        switch (ret){
+        case 0:
+            console.log("Detected overworld.");
+            pbf_press_button(context, BUTTON_X, 160ms, 840ms);
+            continue;
+
+        case 1:
+            console.log("Detected main menu.");
+            if (connect_to_internet && !connected){
+                connect_to_internet_from_menu(info, console, context);
+                connected = true;
+                continue;
+            }
+            if (main_menu.move_cursor(info, console, context, MenuSide::RIGHT, 3)){
+                pbf_press_button(context, BUTTON_A, 160ms, 1840ms);
+            }
+            continue;
+
+        case 2:
+            console.log("Detected Poke Portal.");
+            if (poke_portal.move_cursor(info, console, context, 1)){
+                pbf_press_button(context, BUTTON_A, 160ms, 1840ms);
+            }
+            continue;
+
+        case 3:
+            console.log("Detected Tera Raid Search.");
+            if (raid_search.move_cursor_to_search(info, console, context)){
+                pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+            }
+            continue;
+
+        case 4:
+            console.log("Detected Dialog.");
+            pbf_press_button(context, BUTTON_B, 160ms, 840ms);
+            continue;
+
+        case 5:{
+            console.log("Detected Code Entry.");
+            std::string code = raid_waiter.wait_for_raid_code();
+            enter_code(
+                console, context,
+                false,
+                keyboard_layout,
+                code, false, true,
+                false
+            );
+
+#if 0
+            if (console.index() == 1){
+                dump_image_and_throw_recoverable_exception(
+                    info, console, "InjectedError",
+                    "join_raid(): Injected Error"
+                );
+            }
+#endif
+
+            break;
+        }
+        case 6:
+            console.log("Detected Raid Lobby.");
+            return;
+
+        default:
+            auto screen = console.video().snapshot();
+            report_error_to_telemetry(
+                &console.logger(),
+                info,
+                "join_raid()",
+                {{"Message", "No recognized state after 30 seconds."}},
+                screen,
+                &console.history()
+            );
+
+            pbf_press_button(context, BUTTON_B, 160ms, 840ms);
+//            OperationFailedExceptionWithScreenshot::fire(
+//                ErrorReportMode::SEND_ERROR_REPORT,
+//                "join_raid(): No recognized state after 30 seconds.",
+//                console,
+//                std::move(screen)
+//            );
+        }
+    }
+}
+
+
+
+
+
+
+void stop_if_enough_rare_items(
+    VideoStream& stream, ProControllerContext& context,
+    size_t stop_on_sparkly_items
+){
+    if (stop_on_sparkly_items == 0){
+        return;
+    }
+    size_t sparkly_items = SparklyItemDetector::count_sparkly_items(stream, context);
+    stream.log("Sparkly Items Detected: " + std::to_string(sparkly_items), COLOR_BLUE);
+    if (sparkly_items >= stop_on_sparkly_items){
+        throw_and_log<ProgramFinishedException>(
+            stream.logger(),
+            "Found a raid with " + std::to_string(sparkly_items) + " rare items!",
+            stream
+        );
+    }
+}
+
+
+void exit_tera_win_without_catching(
+    const ProgramInfo& info,
+    VideoStream& stream, ProControllerContext& context,
+    size_t stop_on_sparkly_items
+){
+    stream.log("Exiting raid without catching...");
+
+    WallClock start = current_time();
+    while (true){
+        context.wait_for_all_requests();
+        if (current_time() - start > std::chrono::minutes(5)){
+            dump_image_and_throw_recoverable_exception(
+                info, stream, "ExitTeraWinFailed",
+                "Failed to return to overworld after 5 minutes."
+            );
+        }
+
+        TeraCatchWatcher catch_menu(COLOR_BLUE);
+        WhiteButtonWatcher next_button(
+            COLOR_CYAN,
+            WhiteButton::ButtonA,
+            {0.8, 0.93, 0.2, 0.07},
+            WhiteButtonWatcher::FinderType::PRESENT,
+            std::chrono::seconds(1)
+        );
+        AdvanceDialogWatcher dialog(COLOR_YELLOW);
+        OverworldWatcher overworld(stream.logger(), COLOR_RED);
+        int ret = wait_until(
+            stream, context,
+            std::chrono::seconds(60),
+            {catch_menu, next_button, dialog, overworld}
+        );
+        context.wait_for(std::chrono::milliseconds(100));
+        switch (ret){
+        case 0:
+            stream.log("Detected catch prompt.");
+            catch_menu.move_to_slot(stream, context, 1);
+//            pbf_press_dpad(context, DPAD_DOWN, 160ms, 240ms);
+            pbf_mash_button(context, BUTTON_A, 240ms);
+            pbf_mash_button(context, BUTTON_B, 1000ms);
+            continue;
+        case 1:
+            stream.log("Detected possible (A) Next button.");
+            stop_if_enough_rare_items(stream, context, stop_on_sparkly_items);
+            pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+            continue;
+        case 2:
+            stream.log("Detected dialog.");
+            pbf_press_button(context, BUTTON_B, 160ms, 840ms);
+            break;
+        case 3:
+            stream.log("Detected overworld.");
+            return;
+        default:
+            dump_image_and_throw_recoverable_exception(
+                info, stream, "ExitTeraWinFailed",
+                "exit_tera_win_without_catching(): No recognized state after 60 seconds."
+            );
+        }
+    }
+}
+
+
+void exit_tera_win_by_catching(
+    ProgramEnvironment& env,
+    VideoStream& stream, ProControllerContext& context,
+    Language language,
+    const std::string& ball_slug,
+    size_t stop_on_sparkly_items
+){
+    stream.log("Exiting raid with catching...");
+
+    VideoSnapshot screenshot;
+    WallClock start = current_time();
+    while (true){
+        context.wait_for_all_requests();
+        if (current_time() - start > std::chrono::minutes(5)){
+            dump_image_and_throw_recoverable_exception(
+                env.program_info(), stream, "ExitTeraWinFailed",
+                "Failed to return to overworld after 5 minutes."
+            );
+        }
+
+        TeraCatchWatcher catch_menu(COLOR_BLUE);
+        WhiteButtonWatcher next_button(
+            COLOR_CYAN,
+            WhiteButton::ButtonA,
+            {0.8, 0.93, 0.2, 0.07},
+            WhiteButtonWatcher::FinderType::PRESENT,
+            std::chrono::seconds(1)
+        );
+        AdvanceDialogWatcher advance(COLOR_YELLOW);
+        PromptDialogWatcher add_to_party(COLOR_PURPLE, {0.500, 0.395, 0.400, 0.100});
+        PromptDialogWatcher nickname(COLOR_GREEN, {0.500, 0.545, 0.400, 0.100});
+        MainMenuWatcher main_menu(COLOR_BLUE);
+        OverworldWatcher overworld(stream.logger(), COLOR_RED);
+        context.wait_for_all_requests();
+        int ret = wait_until(
+            stream, context,
+            std::chrono::seconds(60),
+            {
+                catch_menu,
+                next_button,
+                advance,
+                add_to_party,
+                nickname,
+                main_menu,
+                overworld,
+            }
+        );
+        context.wait_for(std::chrono::milliseconds(100));
+        switch (ret){
+        case 0:{
+            stream.log("Detected catch prompt.");
+            screenshot = stream.video().snapshot();
+
+            catch_menu.move_to_slot(stream, context, 0);
+            pbf_press_button(context, BUTTON_A, 160ms, 1200ms);
+            context.wait_for_all_requests();
+
+            BattleBallReader reader(stream, language);
+            int quantity = move_to_ball(reader, stream, context, ball_slug);
+            if (quantity == 0){
+                throw_and_log<FatalProgramException>(
+                    stream.logger(), ErrorReportMode::NO_ERROR_REPORT,
+                    "Unable to find appropriate ball. Did you run out?",
+                    stream
+                );
+            }
+            if (quantity < 0){
+                stream.log("Unable to read ball quantity.", COLOR_RED);
+            }
+            pbf_mash_button(context, BUTTON_A, 1000ms);
+
+            continue;
+        }
+        case 1:
+            stream.log("Detected (A) Next button.");
+            stop_if_enough_rare_items(stream, context, stop_on_sparkly_items);
+            pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+            pbf_press_button(context, BUTTON_B, 160ms, 840ms);
+            continue;
+        case 2:
+            stream.log("Detected dialog.");
+            pbf_press_button(context, BUTTON_B, 160ms, 840ms);
+            continue;
+        case 3:
+            stream.log("Detected add-to-party prompt.");
+            pbf_press_button(context, BUTTON_B, 160ms, 840ms);
+            continue;
+        case 4:
+            stream.log("Detected nickname prompt.");
+            pbf_press_button(context, BUTTON_B, 160ms, 840ms);
+            continue;
+        case 5:
+            stream.log("Detected unexpected main menu.", COLOR_RED);
+            pbf_press_button(context, BUTTON_B, 160ms, 840ms);
+            continue;
+        case 6:
+            stream.log("Detected overworld.");
+            return;
+        default:
+            dump_image_and_throw_recoverable_exception(
+                env.program_info(), stream, "ExitTeraWinFailed",
+                "exit_tera_win_by_catching(): No recognized state after 60 seconds."
+            );
+        }
+    }
+}
+
+
+TeraResult exit_tera_win_by_catching(
+    ProgramEnvironment& env,
+    VideoStream& stream, ProControllerContext& context,
+    Language language,
+    const std::string& ball_slug,
+    EventNotificationOption& notification_nonshiny,
+    EventNotificationOption& notification_shiny,
+    bool stop_on_shiny, size_t stop_on_sparkly_items,
+    std::atomic<uint64_t>* stat_shinies
+){
+    stream.log("Exiting raid with catching...");
+
+    TeraResult result = TeraResult::NO_DETECTION;
+    VideoSnapshot screenshot;
+    WallClock start = current_time();
+    while (true){
+        context.wait_for_all_requests();
+        if (current_time() - start > std::chrono::minutes(5)){
+            dump_image_and_throw_recoverable_exception(
+                env.program_info(), stream, "ExitTeraWinFailed",
+                "Failed to return to overworld after 5 minutes."
+            );
+        }
+
+        TeraCatchWatcher catch_menu(COLOR_BLUE);
+        WhiteButtonWatcher next_button(
+            COLOR_CYAN,
+            WhiteButton::ButtonA,
+            {0.8, 0.93, 0.2, 0.07},
+            WhiteButtonWatcher::FinderType::PRESENT,
+            std::chrono::seconds(1)
+        );
+        AdvanceDialogWatcher advance(COLOR_YELLOW);
+        PromptDialogWatcher add_to_party(COLOR_PURPLE, {0.500, 0.395, 0.400, 0.100});
+        PromptDialogWatcher view_summary(COLOR_PURPLE, {0.500, 0.470, 0.400, 0.100});
+        PromptDialogWatcher nickname(COLOR_GREEN, {0.500, 0.545, 0.400, 0.100});
+        PokemonSummaryWatcher summary(COLOR_MAGENTA);
+        MainMenuWatcher main_menu(COLOR_BLUE);
+        OverworldWatcher overworld(stream.logger(), COLOR_RED);
+        context.wait_for_all_requests();
+        int ret = wait_until(
+            stream, context,
+            std::chrono::seconds(60),
+            {
+                catch_menu,
+                next_button,
+                advance,
+                add_to_party,
+                view_summary,
+                nickname,
+                summary,
+                main_menu,
+                overworld,
+            }
+        );
+        context.wait_for(std::chrono::milliseconds(100));
+        switch (ret){
+        case 0:{
+            stream.log("Detected catch prompt.");
+            screenshot = stream.video().snapshot();
+
+            catch_menu.move_to_slot(stream, context, 0);
+            pbf_press_button(context, BUTTON_A, 160ms, 1200ms);
+            context.wait_for_all_requests();
+
+            BattleBallReader reader(stream, language);
+            int quantity = move_to_ball(reader, stream, context, ball_slug);
+            if (quantity == 0){
+                throw_and_log<FatalProgramException>(
+                    stream.logger(), ErrorReportMode::NO_ERROR_REPORT,
+                    "Unable to find appropriate ball. Did you run out?",
+                    stream
+                );
+            }
+            if (quantity < 0){
+                stream.log("Unable to read ball quantity.", COLOR_RED);
+            }
+            pbf_mash_button(context, BUTTON_A, 1000ms);
+
+            continue;
+        }
+        case 2:
+            stream.log("Detected dialog.");
+            pbf_press_button(context, BUTTON_B, 160ms, 840ms);
+            continue;
+        case 3:
+            stream.log("Detected add-to-party prompt.");
+            if (result == TeraResult::NO_DETECTION){
+                pbf_press_dpad(context, DPAD_DOWN, 160ms, 480ms);
+//                pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+            }else{
+                pbf_press_button(context, BUTTON_B, 160ms, 840ms);
+            }
+            continue;
+        case 4:
+            stream.log("Detected cursor over view summary.");
+            pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+            continue;
+        case 5:
+            stream.log("Detected nickname prompt.");
+            pbf_press_button(context, BUTTON_B, 160ms, 840ms);
+            continue;
+        case 1:
+            //  Next button detector is unreliable. Check if the summary is
+            //  open. If so, fall-through to that.
+            if (!summary.detect(stream.video().snapshot())){
+                stream.log("Detected possible (A) Next button.");
+                stop_if_enough_rare_items(stream, context, stop_on_sparkly_items);
+                pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+                pbf_press_button(context, BUTTON_B, 160ms, 840ms);
+                break;
+            }
+            stream.log("Detected false positive (A) Next button.", COLOR_RED);
+        case 6:
+            stream.log("Detected summary.");
+            if (result == TeraResult::NO_DETECTION){
+                context.wait_for(std::chrono::milliseconds(500));
+                result = run_tera_summary(
+                    env, stream, context,
+                    notification_nonshiny,
+                    notification_shiny,
+                    stop_on_shiny, screenshot,
+                    stat_shinies
+                );
+            }
+            pbf_press_button(context, BUTTON_B, 160ms, 840ms);
+            continue;
+        case 7:
+            stream.log("Detected unexpected main menu.", COLOR_RED);
+            pbf_press_button(context, BUTTON_B, 160ms, 840ms);
+            continue;
+        case 8:
+            stream.log("Detected overworld.");
+            if (stop_on_shiny && result == TeraResult::NO_DETECTION){
+                throw UserSetupError(
+                    stream.logger(),
+                    "Unable to find " + STRING_POKEMON + " summary to check for shininess. "
+                    "Make sure your party is full and \"Send to Boxes\" is set to \"Manual\"."
+                );
+            }
+            return result;
+        default:
+            dump_image_and_throw_recoverable_exception(
+                env.program_info(), stream, "ExitTeraWinFailed",
+                "exit_tera_win_by_catching(): No recognized state after 60 seconds."
+            );
+        }
+    }
+}
+
+
+
+
+TeraResult run_tera_summary(
+    ProgramEnvironment& env,
+    VideoStream& stream,
+    ProControllerContext& context,
+    EventNotificationOption& notification_nonshiny,
+    EventNotificationOption& notification_shiny,
+    bool stop_on_shiny, const ImageViewRGB32& battle_screenshot,
+    std::atomic<uint64_t>* stat_shinies
+){
+    stream.log("Reading summary...");
+
+    VideoSnapshot screen = stream.video().snapshot();
+    PokemonSummaryDetector reader;
+    if (reader.is_shiny(screen)){
+        if (stat_shinies != nullptr){
+            (*stat_shinies)++;
+        }
+        send_encounter_notification(
+            env,
+            notification_nonshiny,
+            notification_shiny,
+            false, true,
+            {{{}, ShinyType::UNKNOWN_SHINY}},
+            std::nan(""),
+            battle_screenshot
+        );
+        if (stop_on_shiny){
+            throw ProgramFinishedException();
+        }
+        return TeraResult::SHINY;
+    }else{
+        send_encounter_notification(
+            env,
+            notification_nonshiny,
+            notification_shiny,
+            false, false,
+            {{{}, ShinyType::NOT_SHINY}},
+            std::nan("")
+        );
+        return TeraResult::NOT_SHINY;
+    }
+}
+
+
+void run_from_tera_battle(
+    ProgramEnvironment& env,
+    VideoStream& stream,
+    ProControllerContext& context,
+    std::atomic<uint64_t>* stat_errors
+){
+    stream.log("Running away from tera raid battle...");
+
+    WallClock start = current_time();
+    while (true){
+        // Having a lot of Abilities activating can take a while, setting 3 minutes to be safe
+        if (current_time() - start > std::chrono::minutes(3)){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "run_from_tera_battle(): Failed to run away from tera raid battle after 3 minutes.",
+                stream
+            );
+        }
+
+        TeraBattleMenuWatcher battle_menu(COLOR_GREEN);
+        GradientArrowWatcher leave_confirm(
+            COLOR_RED,
+            GradientArrowType::RIGHT,
+            {0.557621, 0.471074, 0.25, 0.247934}
+        );
+        OverworldWatcher overworld(stream.logger(), COLOR_CYAN);
+        TeraCardWatcher tera_card(COLOR_BLUE);
+        context.wait_for_all_requests();
+
+        int ret = wait_until(
+            stream, context,
+            std::chrono::minutes(1),
+            {
+                battle_menu,
+                leave_confirm,
+                overworld,
+                tera_card,
+            }
+        );
+
+        context.wait_for(std::chrono::milliseconds(100));
+        switch (ret){
+        case 0:
+            stream.log("Detected tera raid battle menu, running away...");
+            stream.overlay().add_log("Running away...", COLOR_WHITE);
+            battle_menu.move_to_slot(stream, context, 2);
+            pbf_press_button(context, BUTTON_A, 160ms, 80ms);
+            continue;
+        case 1:
+            stream.log("Detected leave confirm.");
+            pbf_press_button(context, BUTTON_A, 160ms, 80ms);
+            continue;
+        case 2:
+            stream.log("Detected overworld.");
+            return;
+        case 3:
+            stream.log("Detected a raid. (unexpected)", COLOR_RED);
+            if (stat_errors){
+                (*stat_errors)++;
+                env.update_stats();
+            }
+            pbf_press_button(context, BUTTON_B, 160ms, 80ms);
+            continue;
+        default:
+            if (stat_errors){
+                (*stat_errors)++;
+                env.update_stats();
+            }
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "run_from_tera_battle(): No recognized state after 1 minutes.",
+                stream
+            );
+        }
+    }
+}
+
+
+
+
+bool is_sparkling_raid(VideoStream& stream, ProControllerContext& context){
+//    cout << "is_sparkling_raid()" << endl;
+
+    FrozenImageDetector static_map(
+        COLOR_RED,
+        {0.890, 0.800, 0.030, 0.060},
+        std::chrono::seconds(1), 20
+    );
+
+    context.wait_for_all_requests();
+
+    int ret = wait_until(
+        stream, context,
+        std::chrono::seconds(2),
+        {static_map}
+    );
+
+    if (ret == 0){
+        stream.log("Did not detect sparkling raid", COLOR_ORANGE);
+        return false;
+    }
+    stream.log("Detected sparkling raid", COLOR_ORANGE);
+    return true;
+}
+
+
+
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_TeraRoutines.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_TeraRoutines.h
new file mode 100644
index 0000000000..882609174b
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_TeraRoutines.h
@@ -0,0 +1,192 @@
+/*  Tera Exit Routines
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_TeraExitRoutines_H
+#define PokemonAutomation_PokemonSV_TeraExitRoutines_H
+
+#include <string>
+#include <atomic>
+#include "Common/Cpp/Concurrency/Mutex.h"
+#include "Common/Cpp/Concurrency/ConditionVariable.h"
+#include "CommonFramework/Language.h"
+#include "CommonFramework/Tools/VideoStream.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+#include "NintendoSwitch/Options/NintendoSwitch_CodeEntrySettingsOption.h"
+
+namespace PokemonAutomation{
+    class ProgramEnvironment;
+    class EventNotificationOption;
+    class ImageViewRGB32;
+    struct ProgramInfo;
+    class ConsoleHandle;
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+
+
+
+//  While in the overworld, attempt to enter a raid in front of you.
+bool open_raid(VideoStream& stream, ProControllerContext& context);
+
+//  While viewing a raid card, close and return to the overworld.
+void close_raid(const ProgramInfo& info, VideoStream& stream, ProControllerContext& context);
+
+
+enum class HostingMode{
+    LOCAL,
+    ONLINE_CODED,
+    ONLINE_EVERYONE,
+};
+void open_hosting_lobby(
+    ProgramEnvironment& env, VideoStream& stream, ProControllerContext& context,
+    HostingMode mode
+);
+
+
+//  From overworld or main menu => Code entry for tera raid.
+void enter_tera_search(
+    const ProgramInfo& info, VideoStream& stream, ProControllerContext& context,
+    bool connect_to_internet
+);
+
+
+class RaidWaiter : public CancellableScope{
+public:
+    void signal_joiner_is_ready(){
+        {
+            std::lock_guard<Mutex> lg(m_lock);
+            m_joiners_ready++;
+        }
+        m_cv.notify_all();
+    }
+    void signal_raid_code_is_ready(std::string raid_code){
+        {
+            std::lock_guard<Mutex> lg(m_lock);
+            m_raid_code = std::move(raid_code);
+        }
+        m_cv.notify_all();
+    }
+
+    std::string wait_for_raid_code(){
+        std::unique_lock<Mutex> lg(m_lock);
+        m_cv.wait(
+            lg,
+            [&]{
+                return !m_raid_code.empty() || cancelled();
+            }
+        );
+        throw_if_cancelled();
+        return m_raid_code;
+    }
+    void wait_for_joiners(size_t joiners){
+        std::unique_lock<Mutex> lg(m_lock);
+        m_cv.wait(
+            lg,
+            [&]{
+                return m_joiners_ready >= joiners || cancelled();
+            }
+        );
+        throw_if_cancelled();
+    }
+    virtual bool cancel(std::exception_ptr exception = nullptr) noexcept override{
+        bool ret = CancellableScope::cancel(exception);
+        {
+            std::unique_lock<Mutex> lg(m_lock);
+        }
+        m_cv.notify_all();
+        return ret;
+    }
+
+private:
+    size_t m_joiners_ready = 0;
+    std::string m_raid_code;
+    Mutex m_lock;
+    ConditionVariable m_cv;
+};
+
+void join_raid(
+    const ProgramInfo& info, ConsoleHandle& console, ProControllerContext& context,
+    bool connect_to_internet,
+    KeyboardLayout keyboard_layout,
+    RaidWaiter& raid_waiter
+);
+
+
+
+//  Exit a Tera raid after winning without catching.
+//  The entry point is with the catch/no-catch option up.
+//  Upon returning, you will be in the overworld.
+void exit_tera_win_without_catching(
+    const ProgramInfo& info,
+    VideoStream& stream, ProControllerContext& context,
+    size_t stop_on_sparkly_items
+);
+
+
+//  Exit a Tera raid after winning by catching.
+//  The entry point is with the catch/no-catch option up.
+//  Does not check for shininess.
+void exit_tera_win_by_catching(
+    ProgramEnvironment& env,
+    VideoStream& stream, ProControllerContext& context,
+    Language language,
+    const std::string& ball_slug,
+    size_t stop_on_sparkly_items
+);
+
+
+
+enum class TeraResult{
+    NO_DETECTION,
+    NOT_SHINY,
+    SHINY,
+};
+
+//  Exit a Tera raid after winning by catching.
+//  The entry point is with the catch/no-catch option up.
+//  Returns the result of the caught Pokemon.
+//  Upon returning, you will be in the overworld except if it is shiny and
+//  "stop_on_shiny == true', then you will be in the summary of the shiny.
+TeraResult exit_tera_win_by_catching(
+    ProgramEnvironment& env,
+    VideoStream& stream, ProControllerContext& context,
+    Language language,
+    const std::string& ball_slug,
+    EventNotificationOption& notification_nonshiny,
+    EventNotificationOption& notification_shiny,
+    bool stop_on_shiny, size_t stop_on_sparkly_items,
+    std::atomic<uint64_t>* stat_shinies
+);
+
+
+
+TeraResult run_tera_summary(
+    ProgramEnvironment& env,
+    VideoStream& stream,
+    ProControllerContext& context,
+    EventNotificationOption& notification_nonshiny,
+    EventNotificationOption& notification_shiny,
+    bool stop_on_shiny, const ImageViewRGB32& battle_screenshot,
+    std::atomic<uint64_t>* stat_shinies
+);
+
+//  Run away from tera battle.
+void run_from_tera_battle(
+    ProgramEnvironment& env,
+    VideoStream& stream,
+    ProControllerContext& context,
+    std::atomic<uint64_t>* stat_errors
+);
+
+bool is_sparkling_raid(VideoStream& stream, ProControllerContext& context);
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_TeraSelfFarmer.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_TeraSelfFarmer.cpp
new file mode 100644
index 0000000000..74c4196e32
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_TeraSelfFarmer.cpp
@@ -0,0 +1,346 @@
+/*  Tera Farmer
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <sstream>
+#include "Common/Cpp/Exceptions.h"
+#include "Common/Cpp/PrettyPrint.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonTools/StartupChecks/VideoResolutionCheck.h"
+#include "NintendoSwitch/NintendoSwitch_Settings.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "NintendoSwitch/Programs/DateSpam/NintendoSwitch_HomeToDateTime.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "Pokemon/Inference/Pokemon_NameReader.h"
+#include "VideoGames/PokemonSV/PokemonSV_Settings.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h"
+#include "VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h"
+#include "VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_TeraRoutines.h"
+#include "VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_TeraBattler.h"
+#include "PokemonSV_TeraSelfFarmer.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+using namespace Pokemon;
+
+
+TeraSelfFarmer_Descriptor::TeraSelfFarmer_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonSV:TeraSelfFarmer",
+        STRING_POKEMON + " SV", "Tera Self Farmer",
+        "Programs/PokemonSV/TeraSelfFarmer.html",
+        "Farm items and " + STRING_POKEMON + " from Tera raids. Can also hunt for shiny and high reward raids.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_PerformanceClassSensitive,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+struct TeraSelfFarmer_Descriptor::Stats : public StatsTracker{
+    Stats()
+        : m_skips(m_stats["Date Skips"])
+        , m_raids(m_stats["Raids"])
+        , m_wins(m_stats["Wins"])
+        , m_losses(m_stats["Losses"])
+        , m_skipped(m_stats["Skipped"])
+        , m_errors(m_stats["Errors"])
+        , m_caught(m_stats["Caught"])
+        , m_shinies(m_stats["Shinies"])
+    {
+        m_display_order.emplace_back("Date Skips");
+        m_display_order.emplace_back("Raids");
+        m_display_order.emplace_back("Wins");
+        m_display_order.emplace_back("Losses");
+        m_display_order.emplace_back("Skipped");
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+        m_display_order.emplace_back("Caught", HIDDEN_IF_ZERO);
+        m_display_order.emplace_back("Shinies", HIDDEN_IF_ZERO);
+    }
+    std::atomic<uint64_t>& m_skips;
+    std::atomic<uint64_t>& m_raids;
+    std::atomic<uint64_t>& m_wins;
+    std::atomic<uint64_t>& m_losses;
+    std::atomic<uint64_t>& m_skipped;
+    std::atomic<uint64_t>& m_errors;
+    std::atomic<uint64_t>& m_caught;
+    std::atomic<uint64_t>& m_shinies;
+};
+std::unique_ptr<StatsTracker> TeraSelfFarmer_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+
+
+TeraFarmerStopConditions::TeraFarmerStopConditions()
+    : GroupOption("Stop Conditions", LockMode::UNLOCK_WHILE_RUNNING)
+    , MAX_CATCHES(
+        "<b>Max Catches:</b><br>Stop program after catching this many " + STRING_POKEMON + ".",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        50, 1, 999
+    )
+    , STOP_ON_SHINY(
+        "<b>Stop on Shiny:</b> (requires catching the " + STRING_POKEMON + ")<br>"
+        "Stop the program if a shiny is found. Resetting the game will return you to the front of this (shiny) raid so it can be hosted again.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        true
+    )
+    , STOP_ON_RARE_ITEMS(
+        "<b>Stop on Rare Items:</b><br>"
+        "Stop the program if the rewards contain at least this many rare (sparkly) items. Set to zero to disable this feature and never stop for item rewards.<br>"
+        "Note that the program can only see the first 8 item rewards. It will not scroll down.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        0, 0, 8
+    )
+{
+    PA_ADD_OPTION(MAX_CATCHES);
+    PA_ADD_OPTION(STOP_ON_SHINY);
+    PA_ADD_OPTION(STOP_ON_RARE_ITEMS);
+}
+
+
+TeraSelfFarmer::~TeraSelfFarmer(){
+    CATCH_ON_WIN.remove_listener(*this);
+}
+TeraSelfFarmer::TeraSelfFarmer()
+    : LANGUAGE(
+        "<b>Game Language:</b>",
+        PokemonNameReader::instance().languages(),
+        LockMode::UNLOCK_WHILE_RUNNING
+    )
+    , FILTER(4, true)
+    , PERIODIC_RESET(
+        "<b>Periodic Game Reset:</b><br>Reset the game after this many skips. This clears up the framerate bug.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        20, 0, 100
+    )
+    , CATCH_ON_WIN(true)
+    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATION_NONSHINY(
+        "Non-Shiny Encounter",
+        true, false,
+        {"Notifs"},
+        std::chrono::seconds(3600)
+    )
+    , NOTIFICATION_SHINY(
+        "Shiny Encounter",
+        true, true, ImageAttachmentMode::JPG,
+        {"Notifs", "Showcase"}
+    )
+    , NOTIFICATIONS({
+        &NOTIFICATION_STATUS_UPDATE,
+        &NOTIFICATION_NONSHINY,
+        &NOTIFICATION_SHINY,
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_RECOVERABLE,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+{
+    PA_ADD_OPTION(LANGUAGE);
+    PA_ADD_OPTION(FILTER);
+    PA_ADD_OPTION(BATTLE_AI);
+    PA_ADD_OPTION(PERIODIC_RESET);
+    PA_ADD_OPTION(CATCH_ON_WIN);
+    PA_ADD_OPTION(STOP_CONDITIONS);
+    PA_ADD_OPTION(NOTIFICATIONS);
+
+    CATCH_ON_WIN.add_listener(*this);
+}
+void TeraSelfFarmer::on_config_value_changed(void* object){
+    STOP_CONDITIONS.STOP_ON_SHINY.set_visibility(
+        CATCH_ON_WIN.enabled() ? ConfigOptionState::ENABLED : ConfigOptionState::HIDDEN
+    );
+}
+
+
+bool TeraSelfFarmer::run_raid(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    env.console.log("Running raid...");
+
+    TeraSelfFarmer_Descriptor::Stats& stats = env.current_stats<TeraSelfFarmer_Descriptor::Stats>();
+
+    bool win = run_tera_battle(env, env.console, context, BATTLE_AI);
+
+    if (win){
+        stats.m_wins++;
+    }else{
+        stats.m_losses++;
+        context.wait_for(std::chrono::seconds(3));
+        return false;
+    }
+
+    if (!CATCH_ON_WIN.enabled()){
+        exit_tera_win_without_catching(env.program_info(), env.console, context, STOP_CONDITIONS.STOP_ON_RARE_ITEMS);
+        return true;
+    }
+
+    VideoSnapshot battle_snapshot = env.console.video().snapshot();
+
+
+    if (CATCH_ON_WIN.FIX_TIME_ON_CATCH){
+        go_home(env.console, context);
+        home_to_date_time(env.console, context, false);
+        pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+        pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+        pbf_press_button(context, BUTTON_HOME, 160ms, ConsoleSettings::instance().SETTINGS_TO_HOME_DELAY0);
+        resume_game_from_home(env.console, context);
+    }
+
+    m_number_caught++;
+    stats.m_caught++;
+
+    exit_tera_win_by_catching(
+        env, env.console, context,
+        LANGUAGE,
+        CATCH_ON_WIN.BALL_SELECT.slug(),
+        NOTIFICATION_NONSHINY,
+        NOTIFICATION_SHINY,
+        STOP_CONDITIONS.STOP_ON_SHINY,
+        STOP_CONDITIONS.STOP_ON_RARE_ITEMS,
+        &stats.m_shinies
+    );
+    return true;
+}
+
+
+void TeraSelfFarmer::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    assert_16_9_720p_min(env.logger(), env.console);
+
+    //  Connect the controller.
+    require_player(env.console, context, BUTTON_LCLICK);
+
+    TeraSelfFarmer_Descriptor::Stats& stats = env.current_stats<TeraSelfFarmer_Descriptor::Stats>();
+
+    if (FILTER.MIN_STARS > FILTER.MAX_STARS){
+        throw UserSetupError(env.console, "Error in the settings, \"Min Stars\" is bigger than \"Max Stars\".");
+    }
+
+    if (FILTER.SKIP_NON_HERBA && FILTER.MAX_STARS < 5){
+        throw UserSetupError(env.console, "Error in the settings, Skip Non-Herba Raids is checked but Max Stars is less than 5.");
+    }
+
+    m_number_caught = 0;
+
+    //  Connect the controller.
+    pbf_press_button(context, BUTTON_L, 80ms, 80ms);
+
+    bool first = true;
+    uint32_t skip_counter = 0;
+
+    while (true){
+        if (m_number_caught >= STOP_CONDITIONS.MAX_CATCHES){
+            break;
+        }
+
+        env.update_stats();
+        send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
+
+        if (!first){
+            day_skip_from_overworld(env.console, context);
+            pbf_wait(context, GameSettings::instance().RAID_SPAWN_DELAY0);
+            context.wait_for_all_requests();
+            stats.m_skips++;
+            skip_counter++;
+            env.update_stats();
+        }
+        first = false;
+
+        uint8_t reset_period = PERIODIC_RESET;
+        if (reset_period != 0 && skip_counter >= reset_period){
+            env.log("Resetting game to clear framerate.");
+            save_game_from_overworld(env.program_info(), env.console, context);
+            reset_game(env.program_info(), env.console, context);
+            skip_counter = 0;
+//            stats.m_resets++;
+        }
+
+        TeraRaidData raid_data;
+        TeraRollFilter::FilterResult result = FILTER.run_filter(
+            env.program_info(), env.console, context,
+            raid_data
+        );
+        switch (result){
+        case TeraRollFilter::FilterResult::NO_RAID:
+            continue;
+        case TeraRollFilter::FilterResult::FAILED:
+            stats.m_raids++;
+            stats.m_skipped++;
+            continue;
+        case TeraRollFilter::FilterResult::PASSED:
+            stats.m_raids++;
+            break;
+        }
+        
+
+        close_raid(env.program_info(), env.console, context);
+        save_game_from_overworld(env.program_info(), env.console, context);
+
+        context.wait_for_all_requests();
+        if (open_raid(env.console, context)){
+            env.log("Tera raid found!", COLOR_BLUE);
+        }else{
+            env.log("No Tera raid found.", COLOR_ORANGE);
+            continue;
+        }
+
+        pbf_press_dpad(context, DPAD_DOWN, 80ms, 80ms);
+        pbf_mash_button(context, BUTTON_A, 2000ms);
+        bool raid_won = run_raid(env, context);
+        {
+            std::stringstream ss;
+            ss << "You ";
+            if (raid_won){
+                ss << "won";
+            }else{
+                ss << "lost";
+            }
+
+            std::string stars = raid_data.stars == 0
+                ? "?"
+                : std::to_string(raid_data.stars);
+            std::string tera_type = raid_data.tera_type.empty()
+                ? "unknown tera type"
+                : raid_data.tera_type;
+
+            std::string pokemon;
+            if (raid_data.species.empty()){
+                pokemon = "unknown " + Pokemon::STRING_POKEMON;
+            }else if (raid_data.species.size() == 1){
+                pokemon = *raid_data.species.begin();
+            }else{
+                pokemon = set_to_str(raid_data.species);
+            }
+
+            ss << " a " << stars << "* " << tera_type << " " << pokemon << " raid";
+            env.log(ss.str());
+            env.console.overlay().add_log(ss.str(), COLOR_GREEN);
+        }
+    }
+
+    env.update_stats();
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+}
+
+
+
+
+
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_TeraSelfFarmer.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_TeraSelfFarmer.h
new file mode 100644
index 0000000000..df0e856c5f
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_TeraSelfFarmer.h
@@ -0,0 +1,93 @@
+/*  Tera Farmer
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_TeraSelfFarmer_H
+#define PokemonAutomation_PokemonSV_TeraSelfFarmer_H
+
+#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "CommonTools/Options/LanguageOCROption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "VideoGames/PokemonSV/Options/PokemonSV_TeraRollFilter.h"
+#include "VideoGames/PokemonSV/Options/PokemonSV_TeraAIOption.h"
+#include "VideoGames/PokemonSV/Options/PokemonSV_TeraCatchOnWinOption.h"
+
+namespace PokemonAutomation{
+    struct VideoSnapshot;
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+class TeraSelfFarmer;
+
+
+class TeraSelfFarmer_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    TeraSelfFarmer_Descriptor();
+
+    struct Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+
+};
+
+
+
+
+class TeraFarmerStopConditions : public GroupOption{
+public:
+    TeraFarmerStopConditions();
+
+    SimpleIntegerOption<uint16_t> MAX_CATCHES;
+    BooleanCheckBoxOption STOP_ON_SHINY;
+    SimpleIntegerOption<uint8_t> STOP_ON_RARE_ITEMS;
+};
+
+
+
+class TeraSelfFarmer : public SingleSwitchProgramInstance, public ConfigOption::Listener{
+public:
+    using Descriptor = TeraSelfFarmer_Descriptor;
+    ~TeraSelfFarmer();
+    TeraSelfFarmer();
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    virtual void on_config_value_changed(void* object) override;
+    bool run_raid(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+
+private:
+    friend class TeraFarmerCatchOnWin;
+
+    OCR::LanguageOCROption LANGUAGE;
+
+//    TeraFarmerOpponentFilter FILTER;
+    TeraRollFilter FILTER;
+    TeraAIOption BATTLE_AI;
+    SimpleIntegerOption<uint8_t> PERIODIC_RESET;
+    TeraFarmerCatchOnWin CATCH_ON_WIN;
+    TeraFarmerStopConditions STOP_CONDITIONS;
+
+    //  Notifications
+    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
+    EventNotificationOption NOTIFICATION_NONSHINY;
+    EventNotificationOption NOTIFICATION_SHINY;
+    EventNotificationsOption NOTIFICATIONS;
+
+    uint16_t m_number_caught;
+
+    //  Per iteration flags.
+//    bool m_battle_finished;
+//    bool m_caught;
+//    bool m_summary_read;
+};
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TestPrograms/PokemonSV_SoundListener.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TestPrograms/PokemonSV_SoundListener.cpp
new file mode 100644
index 0000000000..fe900d5a67
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TestPrograms/PokemonSV_SoundListener.cpp
@@ -0,0 +1,112 @@
+/*  Sound Listener
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <iostream>
+#include "Common/Cpp/Exceptions.h"
+#include "CommonTools/Async/InferenceSession.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonSV/Inference/Battles/PokemonSV_ShinySoundDetector.h"
+#include "VideoGames/PokemonSV/Inference/Overworld/PokemonSV_LetsGoKillDetector.h"
+#include "PokemonSV_SoundListener.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+using namespace Pokemon;
+
+
+
+SoundListener_Descriptor::SoundListener_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonLA:SoundListener",
+        STRING_POKEMON + " LA", "Sound Listener",
+        "",
+        "Test sound detectors listening to audio stream.",
+        PanelQualityStanding::DEVELOPER,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::ENABLE_COMMANDS
+    )
+{}
+
+
+SoundListener::SoundListener()
+    : SOUND_TYPE("<b>Which Sound to Detect</b>",
+        {
+            {SoundType::Shiny,          "shiny",        "Shiny Sound"},
+            {SoundType::LetsGoKill,     "lets-go-kill", "Let's Go Kill"},
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        SoundType::Shiny
+    )
+    , STOP_ON_DETECTED_SOUND(
+        "<b>Stop on the detected sound</b><br>Stop program when the sound is detected.",
+        LockMode::LOCK_WHILE_RUNNING,
+        false
+    )
+{
+    PA_ADD_OPTION(SOUND_TYPE);
+    PA_ADD_OPTION(STOP_ON_DETECTED_SOUND);
+}
+
+
+// void search_alpha_roar_from_audio_dump();
+
+void SoundListener::program(SingleSwitchProgramEnvironment& env, CancellableScope& scope){
+    //  Connect the controller.
+    // pbf_move_right_joystick(context, {-1, -1}, 80ms, 0ms);
+
+    // search_alpha_roar_from_audio_dump();
+    // return;
+
+    std::cout << "Running audio test program." << std::endl;
+
+    std::unique_ptr<AudioInferenceCallback> detector;
+    auto action = [&](float error_coefficient) -> bool{
+        // This lambda function will be called when the sound is detected.
+        // Its return will determine whether to stop the program:
+        return STOP_ON_DETECTED_SOUND;
+    };
+
+    SoundType type = SOUND_TYPE;
+    switch (type){
+    case SoundType::Shiny:
+        detector = std::make_unique<ShinySoundDetector>(env.console, action);
+        break;
+    case SoundType::LetsGoKill:
+        detector = std::make_unique<LetsGoKillSoundDetector>(env.console, action);
+        break;
+    default:
+        throw InternalProgramError(
+            &env.logger(), PA_CURRENT_FUNCTION,
+            "Not such sound detector as sound type " + std::to_string((size_t)type)
+        );
+    }
+
+#if 0
+    ShinySoundDetector detector0(env.console, action);
+    LetsGoKillSoundDetector detector1(env.console, action);
+    InferenceSession session(
+        scope, env.console,
+        {detector0, detector1}
+    );
+#else
+    InferenceSession session(
+        scope, env.console,
+        {*detector}
+    );
+#endif
+    scope.wait_until_cancel();
+
+    std::cout << "Audio test program Sound listener finished." << std::endl;
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/PokemonSV/Programs/TestPrograms/PokemonSV_SoundListener.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TestPrograms/PokemonSV_SoundListener.h
similarity index 77%
rename from SerialPrograms/Source/PokemonSV/Programs/TestPrograms/PokemonSV_SoundListener.h
rename to SerialPrograms/Source/VideoGames/PokemonSV/Programs/TestPrograms/PokemonSV_SoundListener.h
index fd17039e13..ff4cb79856 100644
--- a/SerialPrograms/Source/PokemonSV/Programs/TestPrograms/PokemonSV_SoundListener.h
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/TestPrograms/PokemonSV_SoundListener.h
@@ -1,6 +1,6 @@
 /*  Sound Listener
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  *  Debug program to test all kinds of sound detectors.
  */
@@ -25,9 +25,10 @@ class SoundListener_Descriptor : public SingleSwitchProgramDescriptor{
 
 class SoundListener : public SingleSwitchProgramInstance{
 public:
+    using Descriptor = SoundListener_Descriptor;
     SoundListener();
 
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
+    virtual void program(SingleSwitchProgramEnvironment& env, CancellableScope& scope) override;
 
 private:
     enum class SoundType{
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Trading/PokemonSV_SelfBoxTrade.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Trading/PokemonSV_SelfBoxTrade.cpp
new file mode 100644
index 0000000000..811509dca3
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Trading/PokemonSV_SelfBoxTrade.cpp
@@ -0,0 +1,108 @@
+/*  Self Box Trade
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+//#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+//#include "VideoGames/PokemonSV/PokemonSV_Settings.h"
+#include "VideoGames/PokemonSV/Programs/Boxes/PokemonSV_BoxRoutines.h"
+#include "PokemonSV_TradeRoutines.h"
+#include "PokemonSV_SelfBoxTrade.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+    using namespace Pokemon;
+
+
+SelfBoxTrade_Descriptor::SelfBoxTrade_Descriptor()
+    : MultiSwitchProgramDescriptor(
+        "PokemonSV:SelfBoxTrade",
+        STRING_POKEMON + " SV", "Self Box Trade",
+        "Programs/PokemonSV/SelfBoxTrade.html",
+        "Trade boxes of " + STRING_POKEMON + " between two local Switches.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS,
+        2, 2, 2
+    )
+{}
+std::unique_ptr<StatsTracker> SelfBoxTrade_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new TradeStats());
+}
+
+
+
+SelfBoxTrade::SelfBoxTrade()
+    : BOXES_TO_TRADE(
+        "<b>Number of Boxes to Trade:</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        2, 0, 32
+    )
+    , START_ROW(
+        "<b>Starting Row of 1st Box:</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        1, 1, 5
+    )
+    , START_COL(
+        "<b>Starting Column of 1st Box:</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        1, 1, 6
+    )
+    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_STATUS_UPDATE,
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+{
+    PA_ADD_OPTION(BOXES_TO_TRADE);
+    PA_ADD_OPTION(START_ROW);
+    PA_ADD_OPTION(START_COL);
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+
+
+void SelfBoxTrade::program(MultiSwitchProgramEnvironment& env, CancellableScope& scope){
+    TradeStats& stats = env.current_stats<TradeStats>();
+    env.update_stats();
+
+    //  Connect the controller.
+    env.run_in_parallel<ProController>(scope, [](ConsoleHandle& console, ProControllerContext& context){
+        require_player(console, context, BUTTON_LCLICK);
+    });
+
+    uint8_t start_row = START_ROW - 1;
+    uint8_t start_col = START_COL - 1;
+
+    for (uint8_t box = 0; box < BOXES_TO_TRADE; box++){
+        if (box != 0){
+            env.run_in_parallel<ProController>(scope, [](ConsoleHandle& console, ProControllerContext& context){
+                move_to_right_box(context);
+//                pbf_press_dpad(context, DPAD_RIGHT, 160ms, 240ms);
+//                pbf_press_dpad(context, DPAD_DOWN, 160ms, 240ms);
+//                pbf_press_dpad(context, DPAD_DOWN, 160ms, 240ms);
+//                pbf_press_dpad(context, DPAD_DOWN, 160ms, 240ms);
+            });
+        }
+        trade_current_box(env, scope, NOTIFICATION_STATUS_UPDATE, stats, start_row, start_col);
+        start_row = 0;
+        start_col = 0;
+    }
+
+    env.update_stats();
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+}
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/PokemonSV/Programs/Trading/PokemonSV_SelfBoxTrade.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Trading/PokemonSV_SelfBoxTrade.h
similarity index 87%
rename from SerialPrograms/Source/PokemonSV/Programs/Trading/PokemonSV_SelfBoxTrade.h
rename to SerialPrograms/Source/VideoGames/PokemonSV/Programs/Trading/PokemonSV_SelfBoxTrade.h
index d243e0cc07..0e3fb1fa01 100644
--- a/SerialPrograms/Source/PokemonSV/Programs/Trading/PokemonSV_SelfBoxTrade.h
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Trading/PokemonSV_SelfBoxTrade.h
@@ -1,6 +1,6 @@
 /*  Self Box Trade
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -26,6 +26,7 @@ class SelfBoxTrade_Descriptor : public MultiSwitchProgramDescriptor{
 
 class SelfBoxTrade : public MultiSwitchProgramInstance{
 public:
+    using Descriptor = SelfBoxTrade_Descriptor;
     SelfBoxTrade();
     virtual void program(MultiSwitchProgramEnvironment& env, CancellableScope& scope) override;
 
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Trading/PokemonSV_TradeRoutines.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Trading/PokemonSV_TradeRoutines.cpp
new file mode 100644
index 0000000000..64de6ba8d9
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Trading/PokemonSV_TradeRoutines.cpp
@@ -0,0 +1,210 @@
+/*  Trade Routines
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonTools/Images/SolidColorTest.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "CommonTools/VisualDetectors/BlackScreenDetector.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_GradientArrowDetector.h"
+#include "VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h"
+#include "VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxDetection.h"
+#include "VideoGames/PokemonSV/Programs/Boxes/PokemonSV_BoxRoutines.h"
+#include "PokemonSV_TradeRoutines.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+
+TradeStats::TradeStats()
+    : m_trades(m_stats["Trades"])
+    , m_errors(m_stats["Errors"])
+{
+    m_display_order.emplace_back("Trades");
+    m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+}
+
+
+class TradeWarningDetector : public StaticScreenDetector{
+public:
+    TradeWarningDetector(Color color)
+        : m_color(color)
+//        , m_box_top(0.30, 0.33, 0.40, 0.02)
+//        , m_box_bot(0.30, 0.65, 0.40, 0.02)
+        , m_box_left(0.25, 0.33, 0.02, 0.34)
+        , m_box_right(0.73, 0.33, 0.02, 0.34)
+    {}
+    virtual void make_overlays(VideoOverlaySet& items) const override{
+//        items.add(m_color, m_box_top);
+//        items.add(m_color, m_box_bot);
+        items.add(m_color, m_box_left);
+        items.add(m_color, m_box_right);
+    }
+    virtual bool detect(const ImageViewRGB32& screen) override{
+        ImageStats box_top = image_stats(extract_box_reference(screen, m_box_left));
+        if (!is_solid(box_top, {0.11424, 0.310539, 0.575221}, 0.30)){
+            return false;
+        }
+        ImageStats box_bot = image_stats(extract_box_reference(screen, m_box_right));
+        if (!is_solid(box_bot, {0.11424, 0.310539, 0.575221}, 0.30)){
+            return false;
+        }
+        return true;
+    }
+
+protected:
+    Color m_color;
+//    ImageFloatBox m_box_top;
+//    ImageFloatBox m_box_bot;
+    ImageFloatBox m_box_left;
+    ImageFloatBox m_box_right;
+};
+class TradeWarningFinder : public DetectorToFinder<TradeWarningDetector>{
+public:
+    TradeWarningFinder(Color color)
+         : DetectorToFinder("TradeWarningFinder", std::chrono::milliseconds(250), color)
+    {}
+};
+
+
+
+class TradeDoneDetector : public StaticScreenDetector{
+public:
+    TradeDoneDetector(VideoOverlay& overlay)
+        : m_cursor(COLOR_RED, GradientArrowType::DOWN, {0.24, 0.17, 0.38, 0.55})
+        , m_slot(COLOR_RED, true)
+    {}
+    virtual void make_overlays(VideoOverlaySet& items) const override{
+        m_cursor.make_overlays(items);
+        m_slot.make_overlays(items);
+    }
+    virtual bool detect(const ImageViewRGB32& screen) override{
+        bool cursor_ok = m_cursor.detect(screen);
+        bool slot_ok = m_slot.detect(screen);
+//        cout << "cursor = " << cursor_ok << ", slot_ok = " << slot_ok << endl;
+        return cursor_ok && slot_ok;
+    }
+
+private:
+    GradientArrowDetector m_cursor;
+    SomethingInBoxSlotDetector m_slot;
+};
+class TradeDoneHold : public DetectorToFinder<TradeDoneDetector>{
+public:
+    TradeDoneHold(VideoOverlay& overlay)
+         : DetectorToFinder("AdvanceDialogHold", std::chrono::milliseconds(500), overlay)
+    {}
+};
+
+
+
+void trade_current_pokemon(
+    VideoStream& stream, ProControllerContext& context,
+    MultiConsoleErrorState& tracker,
+    TradeStats& stats
+){
+    tracker.check_unrecoverable_error(stream.logger());
+    context.wait_for_all_requests();
+
+    //  Make sure there is something to trade.
+    {
+        SomethingInBoxSlotDetector detector(COLOR_CYAN, true);
+        if (!detector.detect(stream.video().snapshot())){
+            stats.m_errors++;
+            tracker.report_unrecoverable_error(stream, "Box slot is empty.");
+        }
+    }
+
+
+    //  Wait for black screen.
+    {
+        BlackScreenOverWatcher black_screen(COLOR_CYAN);
+        int ret = run_until<ProControllerContext>(
+            stream, context,
+            [](ProControllerContext& context){
+                pbf_mash_button(context, BUTTON_A, 120000ms);
+            },
+            {{black_screen}}
+        );
+        if (ret < 0){
+            stats.m_errors++;
+            tracker.report_unrecoverable_error(stream, "Failed to detect start of trade after 2 minutes.");
+        }
+        stream.log("Detected start of trade.");
+        context.wait_for(std::chrono::milliseconds(100));
+        tracker.check_unrecoverable_error(stream.logger());
+    }
+
+
+    TradeDoneHold trade_done(stream.overlay());
+
+    while (true){
+        AdvanceDialogWatcher dialog(COLOR_YELLOW, DialogType::DIALOG_ALL, std::chrono::seconds(2));
+        PromptDialogWatcher learn_move(COLOR_BLUE);
+
+        int ret = wait_until(
+            stream, context, std::chrono::minutes(2),
+            {dialog, trade_done, learn_move}
+        );
+        switch (ret){
+        case 0:
+            stream.log("Detected dialog.");
+            pbf_press_button(context, BUTTON_B, 160ms, 840ms);
+            break;
+        case 1:
+            stream.log("Detected box. Trade completed.");
+            tracker.check_unrecoverable_error(stream.logger());
+            context.wait_for(std::chrono::milliseconds(500));
+            return;
+        case 2:
+            stream.log("Detected move learn.");
+            pbf_press_button(context, BUTTON_B, 160ms, 840ms);
+            break;
+        default:
+            stats.m_errors++;
+            tracker.report_unrecoverable_error(stream, "Failed to return to box after 2 minutes after a trade.");
+        }
+    }
+}
+
+
+void trade_current_box(
+    MultiSwitchProgramEnvironment& env, CancellableScope& scope,
+    EventNotificationOption& notifications,
+    TradeStats& stats,
+    uint8_t start_row, uint8_t start_col
+){
+    for (uint8_t row = start_row; row < 5; row++){
+        for (uint8_t col = start_col; col < 6; col++){
+            env.update_stats();
+            send_program_status_notification(env, notifications);
+
+            MultiConsoleErrorState error_state;
+            env.run_in_parallel<ProController>(scope, [&](ConsoleHandle& console, ProControllerContext& context){
+//                VideoOverlaySet overlays(console.overlay());
+                move_box_cursor(env.program_info(), console, context, BoxCursorLocation::SLOTS, row, col);
+                trade_current_pokemon(console, context, error_state, stats);
+            });
+            stats.m_trades++;
+        }
+        start_col = 0;
+    }
+}
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Trading/PokemonSV_TradeRoutines.h b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Trading/PokemonSV_TradeRoutines.h
new file mode 100644
index 0000000000..5a7c6bd92e
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Programs/Trading/PokemonSV_TradeRoutines.h
@@ -0,0 +1,49 @@
+/*  Trade Routines
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_TradeRoutines_H
+#define PokemonAutomation_PokemonSV_TradeRoutines_H
+
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/Tools/VideoStream.h"
+#include "CommonTools/MultiConsoleErrors.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+#include "NintendoSwitch/NintendoSwitch_MultiSwitchProgram.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+struct TradeStats : public StatsTracker{
+    TradeStats();
+    std::atomic<uint64_t>& m_trades;
+    std::atomic<uint64_t>& m_errors;
+};
+
+
+
+
+void trade_current_pokemon(
+    VideoStream& stream, ProControllerContext& context,
+    MultiConsoleErrorState& tracker,
+    TradeStats& stats
+);
+void trade_current_box(
+    MultiSwitchProgramEnvironment& env, CancellableScope& scope,
+    EventNotificationOption& notifications,
+    TradeStats& stats,
+    uint8_t start_row, uint8_t start_col
+);
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/PokemonSV/Resources/PokemonSV_AuctionItemNames.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Resources/PokemonSV_AuctionItemNames.cpp
similarity index 79%
rename from SerialPrograms/Source/PokemonSV/Resources/PokemonSV_AuctionItemNames.cpp
rename to SerialPrograms/Source/VideoGames/PokemonSV/Resources/PokemonSV_AuctionItemNames.cpp
index bcf3fd04a6..e43b17b223 100644
--- a/SerialPrograms/Source/PokemonSV/Resources/PokemonSV_AuctionItemNames.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Resources/PokemonSV_AuctionItemNames.cpp
@@ -1,6 +1,6 @@
 /*  Auction Item Names
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -8,7 +8,7 @@
 #include "Common/Cpp/Json/JsonValue.h"
 #include "Common/Cpp/Json/JsonArray.h"
 #include "Common/Cpp/Json/JsonObject.h"
-#include "CommonFramework/Globals.h"
+#include "CommonFramework/GlobalAutoPaths.h"
 #include "PokemonSV_AuctionItemNames.h"
 
 namespace PokemonAutomation{
@@ -16,10 +16,10 @@ namespace NintendoSwitch{
 namespace PokemonSV{
 
 
-struct AuctionItemNameDatabase {
+struct AuctionItemNameDatabase{
     AuctionItemNameDatabase();
 
-    static const AuctionItemNameDatabase& instance() {
+    static const AuctionItemNameDatabase& instance(){
         static AuctionItemNameDatabase database;
         return database;
     }
@@ -38,7 +38,7 @@ AuctionItemNameDatabase::AuctionItemNameDatabase()
     // ["potion", "fresh-water", ... ]
     std::string path_slugs = RESOURCE_PATH() + "PokemonSV/Auction/AuctionItemList.json";
     JsonValue json_slugs = load_json_file(path_slugs);
-    JsonArray& slugs = json_slugs.get_array_throw(path_slugs);
+    JsonArray& slugs = json_slugs.to_array_throw(path_slugs);
 
     // Load a map of auction item slugs to item names in all languages, e.g.:
     // {
@@ -51,10 +51,10 @@ AuctionItemNameDatabase::AuctionItemNameDatabase()
     // }
     std::string path_disp = RESOURCE_PATH() + "PokemonSV/Auction/AuctionItemNameDisplay.json";
     JsonValue json_disp = load_json_file(path_disp);
-    JsonObject& item_disp = json_disp.get_object_throw(path_disp);
+    JsonObject& item_disp = json_disp.to_object_throw(path_disp);
 
-    for (auto& item : slugs) {
-        std::string& slug = item.get_string_throw(path_slugs);
+    for (auto& item : slugs){
+        std::string& slug = item.to_string_throw(path_slugs);
 
         JsonObject& auction_item_name_dict = item_disp.get_object_throw(slug, path_disp);
         std::string& display_name = auction_item_name_dict.get_string_throw("eng", path_disp);
@@ -63,15 +63,15 @@ AuctionItemNameDatabase::AuctionItemNameDatabase()
         database[std::move(slug)].m_display_name = std::move(display_name);
     }
 
-    for (const auto& item : database) {
+    for (const auto& item : database){
         reverse_lookup[item.second.m_display_name] = item.first;
     }
 }
 
-const AuctionItemNames& get_auction_item_name(const std::string& slug) {
+const AuctionItemNames& get_auction_item_name(const std::string& slug){
     const std::map<std::string, AuctionItemNames>& database = AuctionItemNameDatabase::instance().database;
     auto iter = database.find(slug);
-    if (iter == database.end()) {
+    if (iter == database.end()){
         throw InternalProgramError(
             nullptr, PA_CURRENT_FUNCTION,
             "Auction item slug not found in database: " + slug
@@ -79,10 +79,10 @@ const AuctionItemNames& get_auction_item_name(const std::string& slug) {
     }
     return iter->second;
 }
-const std::string& parse_auction_item_name(const std::string& display_name) {
+const std::string& parse_auction_item_name(const std::string& display_name){
     const std::map<std::string, std::string>& database = AuctionItemNameDatabase::instance().reverse_lookup;
     auto iter = database.find(display_name);
-    if (iter == database.end()) {
+    if (iter == database.end()){
         throw InternalProgramError(
             nullptr, PA_CURRENT_FUNCTION,
             "Auction item name not found in database: " + display_name
@@ -90,17 +90,17 @@ const std::string& parse_auction_item_name(const std::string& display_name) {
     }
     return iter->second;
 }
-const std::string& parse_auction_item_name_nothrow(const std::string& display_name) {
+const std::string& parse_auction_item_name_nothrow(const std::string& display_name){
     const std::map<std::string, std::string>& database = AuctionItemNameDatabase::instance().reverse_lookup;
     auto iter = database.find(display_name);
-    if (iter == database.end()) {
+    if (iter == database.end()){
         return AuctionItemNameDatabase::NULL_SLUG;
     }
     return iter->second;
 }
 
 
-const std::vector<std::string>& AUCTION_ITEM_SLUGS() {
+const std::vector<std::string>& AUCTION_ITEM_SLUGS(){
     return AuctionItemNameDatabase::instance().ordered_list;
 }
 
diff --git a/SerialPrograms/Source/PokemonSV/Resources/PokemonSV_AuctionItemNames.h b/SerialPrograms/Source/VideoGames/PokemonSV/Resources/PokemonSV_AuctionItemNames.h
similarity index 88%
rename from SerialPrograms/Source/PokemonSV/Resources/PokemonSV_AuctionItemNames.h
rename to SerialPrograms/Source/VideoGames/PokemonSV/Resources/PokemonSV_AuctionItemNames.h
index c514e39035..dfccacda84 100644
--- a/SerialPrograms/Source/PokemonSV/Resources/PokemonSV_AuctionItemNames.h
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Resources/PokemonSV_AuctionItemNames.h
@@ -1,6 +1,6 @@
 /*  Auction Item Names
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/PokemonSV/Resources/PokemonSV_FillingsCoordinates.h b/SerialPrograms/Source/VideoGames/PokemonSV/Resources/PokemonSV_FillingsCoordinates.h
similarity index 96%
rename from SerialPrograms/Source/PokemonSV/Resources/PokemonSV_FillingsCoordinates.h
rename to SerialPrograms/Source/VideoGames/PokemonSV/Resources/PokemonSV_FillingsCoordinates.h
index 6e48aa54ce..eb2fa1c58b 100644
--- a/SerialPrograms/Source/PokemonSV/Resources/PokemonSV_FillingsCoordinates.h
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Resources/PokemonSV_FillingsCoordinates.h
@@ -1,148 +1,148 @@
-/*  Fillings Coordinates
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSV_FillingsCoordinates_H
-#define PokemonAutomation_PokemonSV_FillingsCoordinates_H
-
-#include "CommonFramework/ImageTools/ImageBoxes.h"
-#include <vector>
-#include <map>
-
-namespace PokemonAutomation {
-namespace NintendoSwitch {
-namespace PokemonSV {
-
-class FillingsCoordinates {
-
-    struct FillingInfo {
-        uint8_t piecesPerServing;
-        uint8_t servingsPerBowl;
-        std::map<int, std::vector<ImageFloatBox>> placementCoordinates;
-    };
-
-    //Easy to place fillings. Three pieces per serving. Cucumber, Pickle, etc. Works with Lettuce, Onion, others as well.
-    const std::map<int, std::vector<ImageFloatBox>> flatCircleFilling { //Number of servings, Coordinates for each piece
-        {1, { {0.386, 0.507, 0.060, 0.055}, {0.470, 0.507, 0.060, 0.055}, {0.554, 0.507, 0.060, 0.055} }}, //One serving, three pieces
-        {2, { {0.386, 0.507, 0.060, 0.055}, {0.470, 0.507, 0.060, 0.055}, {0.554, 0.507, 0.060, 0.055}, {0.386, 0.507, 0.060, 0.055}, {0.470, 0.507, 0.060, 0.055}, {0.554, 0.507, 0.060, 0.055} }}, //Two servings, six pieces
-        {3, { {0.386, 0.507, 0.060, 0.055}, {0.470, 0.507, 0.060, 0.055}, {0.554, 0.507, 0.060, 0.055}, {0.386, 0.507, 0.060, 0.055}, {0.470, 0.507, 0.060, 0.055}, {0.554, 0.507, 0.060, 0.055},
-            {0.386, 0.507, 0.060, 0.055}, {0.470, 0.507, 0.060, 0.055}, {0.554, 0.507, 0.060, 0.055} }}, //Three servings, etc.
-        {4, { {0.386, 0.507, 0.060, 0.055}, {0.470, 0.507, 0.060, 0.055}, {0.554, 0.507, 0.060, 0.055}, {0.386, 0.507, 0.060, 0.055}, {0.470, 0.507, 0.060, 0.055}, {0.554, 0.507, 0.060, 0.055},
-            {0.386, 0.507, 0.060, 0.055}, {0.470, 0.507, 0.060, 0.055}, {0.554, 0.507, 0.060, 0.055}, {0.386, 0.507, 0.060, 0.055}, {0.470, 0.507, 0.060, 0.055}, {0.554, 0.507, 0.060, 0.055} }},
-        {5, { {0.386, 0.507, 0.060, 0.055}, {0.470, 0.507, 0.060, 0.055}, {0.554, 0.507, 0.060, 0.055}, {0.386, 0.507, 0.060, 0.055}, {0.470, 0.507, 0.060, 0.055}, {0.554, 0.507, 0.060, 0.055},
-            {0.386, 0.507, 0.060, 0.055}, {0.470, 0.507, 0.060, 0.055}, {0.554, 0.507, 0.060, 0.055}, {0.386, 0.507, 0.060, 0.055}, {0.470, 0.507, 0.060, 0.055}, {0.554, 0.507, 0.060, 0.055},
-            {0.386, 0.507, 0.060, 0.055}, {0.470, 0.507, 0.060, 0.055}, {0.554, 0.507, 0.060, 0.055} }},
-        {6, { {0.386, 0.507, 0.060, 0.055}, {0.470, 0.507, 0.060, 0.055}, {0.554, 0.507, 0.060, 0.055}, {0.386, 0.507, 0.060, 0.055}, {0.470, 0.507, 0.060, 0.055}, {0.554, 0.507, 0.060, 0.055},
-            {0.386, 0.507, 0.060, 0.055}, {0.470, 0.507, 0.060, 0.055}, {0.554, 0.507, 0.060, 0.055}, {0.386, 0.507, 0.060, 0.055}, {0.470, 0.507, 0.060, 0.055}, {0.554, 0.507, 0.060, 0.055},
-            {0.386, 0.507, 0.060, 0.055}, {0.470, 0.507, 0.060, 0.055}, {0.554, 0.507, 0.060, 0.055}, {0.386, 0.507, 0.060, 0.055}, {0.470, 0.507, 0.060, 0.055}, {0.554, 0.507, 0.060, 0.055} }},
-    };
-
-    //Hamburger, potato salad, etc. Intended for recipe use. If you do 1 serving each of mutliple big items they'll end up stacking in the center.
-    const std::map<int, std::vector<ImageFloatBox>> bigSingleFilling {
-        {1, { {0.470, 0.507, 0.060, 0.055} }}, //One serving, one piece. If only one place in the center
-        {2, { {0.386, 0.507, 0.060, 0.055}, {0.554, 0.507, 0.060, 0.055} }}, //Two pieces, left and right
-        {3, { {0.386, 0.507, 0.060, 0.055}, {0.554, 0.507, 0.060, 0.055}, {0.470, 0.507, 0.060, 0.055} }}, //Three pieces, left right then center
-        {4, { {0.386, 0.507, 0.060, 0.055}, {0.554, 0.507, 0.060, 0.055}, {0.386, 0.507, 0.060, 0.055}, {0.554, 0.507, 0.060, 0.055} }}, //l r l r
-        {5, { {0.386, 0.507, 0.060, 0.055}, {0.554, 0.507, 0.060, 0.055}, {0.386, 0.507, 0.060, 0.055}, {0.554, 0.507, 0.060, 0.055}, {0.470, 0.507, 0.060, 0.055} }}, //l r l r c
-        {6, { {0.386, 0.507, 0.060, 0.055}, {0.554, 0.507, 0.060, 0.055}, {0.386, 0.507, 0.060, 0.055}, {0.554, 0.507, 0.060, 0.055}, {0.386, 0.507, 0.060, 0.055}, {0.554, 0.507, 0.060, 0.055} }},
-    };
-
-    //This is for basil as it has four pieces per serving
-    const std::map<int, std::vector<ImageFloatBox>> fourPiecesFilling {
-        {1, { {0.344, 0.498, 0.064, 0.052} , {0.424, 0.498, 0.064, 0.053}, {0.504, 0.498, 0.061, 0.055}, {0.573, 0.475, 0.076, 0.072} }}, //left, center left, center right, right
-        {2, { {0.344, 0.498, 0.064, 0.052} , {0.424, 0.498, 0.064, 0.053}, {0.504, 0.498, 0.061, 0.055}, {0.573, 0.475, 0.076, 0.072},
-                {0.344, 0.498, 0.064, 0.052} , {0.424, 0.498, 0.064, 0.053}, {0.504, 0.498, 0.061, 0.055}, {0.573, 0.475, 0.076, 0.072} }},
-        {3, { {0.344, 0.498, 0.064, 0.052} , {0.424, 0.498, 0.064, 0.053}, {0.504, 0.498, 0.061, 0.055}, {0.573, 0.475, 0.076, 0.072},
-                {0.344, 0.498, 0.064, 0.052} , {0.424, 0.498, 0.064, 0.053}, {0.504, 0.498, 0.061, 0.055}, {0.573, 0.475, 0.076, 0.072},
-                {0.344, 0.498, 0.064, 0.052} , {0.424, 0.498, 0.064, 0.053}, {0.504, 0.498, 0.061, 0.055}, {0.573, 0.475, 0.076, 0.072} }},
-        {4, { {0.344, 0.498, 0.064, 0.052} , {0.424, 0.498, 0.064, 0.053}, {0.504, 0.498, 0.061, 0.055}, {0.573, 0.475, 0.076, 0.072},
-                {0.344, 0.498, 0.064, 0.052} , {0.424, 0.498, 0.064, 0.053}, {0.504, 0.498, 0.061, 0.055}, {0.573, 0.475, 0.076, 0.072},
-                {0.344, 0.498, 0.064, 0.052} , {0.424, 0.498, 0.064, 0.053}, {0.504, 0.498, 0.061, 0.055}, {0.573, 0.475, 0.076, 0.072},
-                {0.344, 0.498, 0.064, 0.052} , {0.424, 0.498, 0.064, 0.053}, {0.504, 0.498, 0.061, 0.055}, {0.573, 0.475, 0.076, 0.072} }},
-        {5, { {0.344, 0.498, 0.064, 0.052} , {0.424, 0.498, 0.064, 0.053}, {0.504, 0.498, 0.061, 0.055}, {0.573, 0.475, 0.076, 0.072},
-                {0.344, 0.498, 0.064, 0.052} , {0.424, 0.498, 0.064, 0.053}, {0.504, 0.498, 0.061, 0.055}, {0.573, 0.475, 0.076, 0.072},
-                {0.344, 0.498, 0.064, 0.052} , {0.424, 0.498, 0.064, 0.053}, {0.504, 0.498, 0.061, 0.055}, {0.573, 0.475, 0.076, 0.072},
-                {0.344, 0.498, 0.064, 0.052} , {0.424, 0.498, 0.064, 0.053}, {0.504, 0.498, 0.061, 0.055}, {0.573, 0.475, 0.076, 0.072},
-                {0.344, 0.498, 0.064, 0.052} , {0.424, 0.498, 0.064, 0.053}, {0.504, 0.498, 0.061, 0.055}, {0.573, 0.475, 0.076, 0.072} }},
-        {6, { {0.344, 0.498, 0.064, 0.052} , {0.424, 0.498, 0.064, 0.053}, {0.504, 0.498, 0.061, 0.055}, {0.573, 0.475, 0.076, 0.072},
-                {0.344, 0.498, 0.064, 0.052} , {0.424, 0.498, 0.064, 0.053}, {0.504, 0.498, 0.061, 0.055}, {0.573, 0.475, 0.076, 0.072},
-                {0.344, 0.498, 0.064, 0.052} , {0.424, 0.498, 0.064, 0.053}, {0.504, 0.498, 0.061, 0.055}, {0.573, 0.475, 0.076, 0.072},
-                {0.344, 0.498, 0.064, 0.052} , {0.424, 0.498, 0.064, 0.053}, {0.504, 0.498, 0.061, 0.055}, {0.573, 0.475, 0.076, 0.072},
-                {0.344, 0.498, 0.064, 0.052} , {0.424, 0.498, 0.064, 0.053}, {0.504, 0.498, 0.061, 0.055}, {0.573, 0.475, 0.076, 0.072},
-                {0.344, 0.498, 0.064, 0.052} , {0.424, 0.498, 0.064, 0.053}, {0.504, 0.498, 0.061, 0.055}, {0.573, 0.475, 0.076, 0.072} }},
-    };
-
-    //Cherry tomato - custom coordinates due to placement issues
-    const std::map<int, std::vector<ImageFloatBox>> cherryTomatoCustom {
-    {1, { {0.386, 0.507, 0.060, 0.055}, {0.470, 0.507, 0.060, 0.055}, {0.554, 0.507, 0.060, 0.055} }},
-    {2, { {0.386, 0.507, 0.060, 0.055}, {0.470, 0.507, 0.060, 0.055}, {0.554, 0.507, 0.060, 0.055}, {0.382, 0.466, 0.064, 0.053}, {0.468, 0.467, 0.064, 0.050}, {0.551, 0.463, 0.064, 0.056} }},
-    {3, { {0.386, 0.507, 0.060, 0.055}, {0.470, 0.507, 0.060, 0.055}, {0.554, 0.507, 0.060, 0.055}, {0.382, 0.466, 0.064, 0.053}, {0.468, 0.467, 0.064, 0.050}, {0.551, 0.463, 0.064, 0.056},
-        {0.339, 0.484, 0.059, 0.055}, {0.428, 0.486, 0.060, 0.056}, {0.528, 0.484, 0.063, 0.058} }},
-    {4, { {0.386, 0.507, 0.060, 0.055}, {0.470, 0.507, 0.060, 0.055}, {0.554, 0.507, 0.060, 0.055}, {0.382, 0.466, 0.064, 0.053}, {0.468, 0.467, 0.064, 0.050}, {0.551, 0.463, 0.064, 0.056},
-        {0.339, 0.484, 0.059, 0.055}, {0.428, 0.486, 0.060, 0.056}, {0.528, 0.484, 0.063, 0.058}, {0.412, 0.462, 0.062, 0.067}, {0.495, 0.459, 0.061, 0.064}, {0.578, 0.464, 0.061, 0.056} }},
-    {5, { {0.386, 0.507, 0.060, 0.055}, {0.470, 0.507, 0.060, 0.055}, {0.554, 0.507, 0.060, 0.055}, {0.382, 0.466, 0.064, 0.053}, {0.468, 0.467, 0.064, 0.050}, {0.551, 0.463, 0.064, 0.056},
-        {0.339, 0.484, 0.059, 0.055}, {0.428, 0.486, 0.060, 0.056}, {0.528, 0.484, 0.063, 0.058}, {0.412, 0.462, 0.062, 0.067}, {0.495, 0.459, 0.061, 0.064}, {0.578, 0.464, 0.061, 0.056},
-        {0.386, 0.507, 0.060, 0.055}, {0.470, 0.507, 0.060, 0.055}, {0.554, 0.507, 0.060, 0.055} }},
-    {6, { {0.386, 0.507, 0.060, 0.055}, {0.470, 0.507, 0.060, 0.055}, {0.554, 0.507, 0.060, 0.055}, {0.382, 0.466, 0.064, 0.053}, {0.468, 0.467, 0.064, 0.050}, {0.551, 0.463, 0.064, 0.056},
-        {0.339, 0.484, 0.059, 0.055}, {0.428, 0.486, 0.060, 0.056}, {0.528, 0.484, 0.063, 0.058}, {0.412, 0.462, 0.062, 0.067}, {0.495, 0.459, 0.061, 0.064}, {0.578, 0.464, 0.061, 0.056},
-        {0.386, 0.507, 0.060, 0.055}, {0.470, 0.507, 0.060, 0.055}, {0.554, 0.507, 0.060, 0.055}, {0.386, 0.507, 0.060, 0.055}, {0.470, 0.507, 0.060, 0.055}, {0.554, 0.507, 0.060, 0.055} }},
-    };
-
-    const std::map<std::string, FillingInfo> SandwichFillingsData{
-        {"baguette",            {0, 0, flatCircleFilling}},
-        {"lettuce",             {3, 1, flatCircleFilling}},
-        {"tomato",              {3, 1, flatCircleFilling}},
-        {"cherry-tomatoes",     {3, 3, cherryTomatoCustom}},
-        {"cucumber",            {3, 2, flatCircleFilling}},
-        {"pickle",              {3, 2, flatCircleFilling}},
-        {"onion",               {3, 2, flatCircleFilling}},
-        {"red-onion",           {3, 2, flatCircleFilling}},
-        {"green-bell-pepper",   {3, 2, flatCircleFilling}},
-        {"red-bell-pepper",     {3, 2, flatCircleFilling}},
-        {"yellow-bell-pepper",  {3, 2, flatCircleFilling}},
-        {"avocado",             {3, 2, flatCircleFilling}},
-        {"bacon",               {3, 1, flatCircleFilling}},
-        {"ham",                 {3, 2, flatCircleFilling}},
-        {"prosciutto",          {3, 2, flatCircleFilling}},
-        {"chorizo",             {3, 2, flatCircleFilling}},
-        {"herbed-sausage",      {3, 2, flatCircleFilling}},
-        {"hamburger",           {1, 1, bigSingleFilling}},
-        {"klawf-stick",         {3, 1, flatCircleFilling}},
-        {"smoked-fillet",       {3, 1, flatCircleFilling}},
-        {"fried-fillet",        {1, 1, bigSingleFilling}},
-        {"egg",                 {3, 1, flatCircleFilling}},
-        {"potato-tortilla",     {1, 1, bigSingleFilling}},
-        {"tofu",                {3, 1, flatCircleFilling}},
-        {"rice",                {1, 1, bigSingleFilling}},
-        {"noodles",             {1, 1, bigSingleFilling}},
-        {"potato-salad",        {1, 1, bigSingleFilling}},
-        {"cheese",              {3, 1, flatCircleFilling}},
-        {"banana",              {3, 2, flatCircleFilling}},
-        {"strawberry",          {3, 2, flatCircleFilling}},
-        {"apple",               {3, 2, flatCircleFilling}},
-        {"kiwi",                {3, 2, flatCircleFilling}},
-        {"pineapple",           {3, 2, flatCircleFilling}},
-        {"jalape\xc3\xb1o",     {3, 2, flatCircleFilling}},
-        {"watercress",          {3, 2, flatCircleFilling}},
-        {"basil",               {4, 1, fourPiecesFilling}},
-    };
-
-public:
-    FillingInfo get_filling_information(std::string filling) {
-        auto iter = SandwichFillingsData.find(filling);
-        return iter->second;
-    }
-
-    static FillingsCoordinates& instance() {
-        static FillingsCoordinates self;
-        return self;
-    }
-
-
-};
-}
-}
-}
-#endif
+/*  Fillings Coordinates
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_FillingsCoordinates_H
+#define PokemonAutomation_PokemonSV_FillingsCoordinates_H
+
+#include <vector>
+#include <map>
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+class FillingsCoordinates{
+
+    struct FillingInfo{
+        uint8_t piecesPerServing;
+        uint8_t servingsPerPlate;
+        std::map<int, std::vector<ImageFloatBox>> placementCoordinates;
+    };
+
+    //Easy to place fillings. Three pieces per serving. Cucumber, Pickle, etc. Works with Lettuce, Onion, others as well.
+    const std::map<int, std::vector<ImageFloatBox>> flatCircleFilling { //Number of servings, Coordinates for each piece
+        {1, { {0.386, 0.507, 0.060, 0.055}, {0.470, 0.507, 0.060, 0.055}, {0.554, 0.507, 0.060, 0.055} }}, //One serving, three pieces
+        {2, { {0.386, 0.507, 0.060, 0.055}, {0.470, 0.507, 0.060, 0.055}, {0.554, 0.507, 0.060, 0.055}, {0.386, 0.507, 0.060, 0.055}, {0.470, 0.507, 0.060, 0.055}, {0.554, 0.507, 0.060, 0.055} }}, //Two servings, six pieces
+        {3, { {0.386, 0.507, 0.060, 0.055}, {0.470, 0.507, 0.060, 0.055}, {0.554, 0.507, 0.060, 0.055}, {0.386, 0.507, 0.060, 0.055}, {0.470, 0.507, 0.060, 0.055}, {0.554, 0.507, 0.060, 0.055},
+            {0.386, 0.507, 0.060, 0.055}, {0.470, 0.507, 0.060, 0.055}, {0.554, 0.507, 0.060, 0.055} }}, //Three servings, etc.
+        {4, { {0.386, 0.507, 0.060, 0.055}, {0.470, 0.507, 0.060, 0.055}, {0.554, 0.507, 0.060, 0.055}, {0.386, 0.507, 0.060, 0.055}, {0.470, 0.507, 0.060, 0.055}, {0.554, 0.507, 0.060, 0.055},
+            {0.386, 0.507, 0.060, 0.055}, {0.470, 0.507, 0.060, 0.055}, {0.554, 0.507, 0.060, 0.055}, {0.386, 0.507, 0.060, 0.055}, {0.470, 0.507, 0.060, 0.055}, {0.554, 0.507, 0.060, 0.055} }},
+        {5, { {0.386, 0.507, 0.060, 0.055}, {0.470, 0.507, 0.060, 0.055}, {0.554, 0.507, 0.060, 0.055}, {0.386, 0.507, 0.060, 0.055}, {0.470, 0.507, 0.060, 0.055}, {0.554, 0.507, 0.060, 0.055},
+            {0.386, 0.507, 0.060, 0.055}, {0.470, 0.507, 0.060, 0.055}, {0.554, 0.507, 0.060, 0.055}, {0.386, 0.507, 0.060, 0.055}, {0.470, 0.507, 0.060, 0.055}, {0.554, 0.507, 0.060, 0.055},
+            {0.386, 0.507, 0.060, 0.055}, {0.470, 0.507, 0.060, 0.055}, {0.554, 0.507, 0.060, 0.055} }},
+        {6, { {0.386, 0.507, 0.060, 0.055}, {0.470, 0.507, 0.060, 0.055}, {0.554, 0.507, 0.060, 0.055}, {0.386, 0.507, 0.060, 0.055}, {0.470, 0.507, 0.060, 0.055}, {0.554, 0.507, 0.060, 0.055},
+            {0.386, 0.507, 0.060, 0.055}, {0.470, 0.507, 0.060, 0.055}, {0.554, 0.507, 0.060, 0.055}, {0.386, 0.507, 0.060, 0.055}, {0.470, 0.507, 0.060, 0.055}, {0.554, 0.507, 0.060, 0.055},
+            {0.386, 0.507, 0.060, 0.055}, {0.470, 0.507, 0.060, 0.055}, {0.554, 0.507, 0.060, 0.055}, {0.386, 0.507, 0.060, 0.055}, {0.470, 0.507, 0.060, 0.055}, {0.554, 0.507, 0.060, 0.055} }},
+    };
+
+    //Hamburger, potato salad, etc. Intended for recipe use. If you do 1 serving each of mutliple big items they'll end up stacking in the center.
+    const std::map<int, std::vector<ImageFloatBox>> bigSingleFilling {
+        {1, { {0.470, 0.507, 0.060, 0.055} }}, //One serving, one piece. If only one place in the center
+        {2, { {0.386, 0.507, 0.060, 0.055}, {0.554, 0.507, 0.060, 0.055} }}, //Two pieces, left and right
+        {3, { {0.386, 0.507, 0.060, 0.055}, {0.554, 0.507, 0.060, 0.055}, {0.470, 0.507, 0.060, 0.055} }}, //Three pieces, left right then center
+        {4, { {0.386, 0.507, 0.060, 0.055}, {0.554, 0.507, 0.060, 0.055}, {0.386, 0.507, 0.060, 0.055}, {0.554, 0.507, 0.060, 0.055} }}, //l r l r
+        {5, { {0.386, 0.507, 0.060, 0.055}, {0.554, 0.507, 0.060, 0.055}, {0.386, 0.507, 0.060, 0.055}, {0.554, 0.507, 0.060, 0.055}, {0.470, 0.507, 0.060, 0.055} }}, //l r l r c
+        {6, { {0.386, 0.507, 0.060, 0.055}, {0.554, 0.507, 0.060, 0.055}, {0.386, 0.507, 0.060, 0.055}, {0.554, 0.507, 0.060, 0.055}, {0.386, 0.507, 0.060, 0.055}, {0.554, 0.507, 0.060, 0.055} }},
+    };
+
+    //This is for basil as it has four pieces per serving
+    const std::map<int, std::vector<ImageFloatBox>> fourPiecesFilling {
+        {1, { {0.344, 0.498, 0.064, 0.052} , {0.424, 0.498, 0.064, 0.053}, {0.504, 0.498, 0.061, 0.055}, {0.573, 0.475, 0.076, 0.072} }}, //left, center left, center right, right
+        {2, { {0.344, 0.498, 0.064, 0.052} , {0.424, 0.498, 0.064, 0.053}, {0.504, 0.498, 0.061, 0.055}, {0.573, 0.475, 0.076, 0.072},
+                {0.344, 0.498, 0.064, 0.052} , {0.424, 0.498, 0.064, 0.053}, {0.504, 0.498, 0.061, 0.055}, {0.573, 0.475, 0.076, 0.072} }},
+        {3, { {0.344, 0.498, 0.064, 0.052} , {0.424, 0.498, 0.064, 0.053}, {0.504, 0.498, 0.061, 0.055}, {0.573, 0.475, 0.076, 0.072},
+                {0.344, 0.498, 0.064, 0.052} , {0.424, 0.498, 0.064, 0.053}, {0.504, 0.498, 0.061, 0.055}, {0.573, 0.475, 0.076, 0.072},
+                {0.344, 0.498, 0.064, 0.052} , {0.424, 0.498, 0.064, 0.053}, {0.504, 0.498, 0.061, 0.055}, {0.573, 0.475, 0.076, 0.072} }},
+        {4, { {0.344, 0.498, 0.064, 0.052} , {0.424, 0.498, 0.064, 0.053}, {0.504, 0.498, 0.061, 0.055}, {0.573, 0.475, 0.076, 0.072},
+                {0.344, 0.498, 0.064, 0.052} , {0.424, 0.498, 0.064, 0.053}, {0.504, 0.498, 0.061, 0.055}, {0.573, 0.475, 0.076, 0.072},
+                {0.344, 0.498, 0.064, 0.052} , {0.424, 0.498, 0.064, 0.053}, {0.504, 0.498, 0.061, 0.055}, {0.573, 0.475, 0.076, 0.072},
+                {0.344, 0.498, 0.064, 0.052} , {0.424, 0.498, 0.064, 0.053}, {0.504, 0.498, 0.061, 0.055}, {0.573, 0.475, 0.076, 0.072} }},
+        {5, { {0.344, 0.498, 0.064, 0.052} , {0.424, 0.498, 0.064, 0.053}, {0.504, 0.498, 0.061, 0.055}, {0.573, 0.475, 0.076, 0.072},
+                {0.344, 0.498, 0.064, 0.052} , {0.424, 0.498, 0.064, 0.053}, {0.504, 0.498, 0.061, 0.055}, {0.573, 0.475, 0.076, 0.072},
+                {0.344, 0.498, 0.064, 0.052} , {0.424, 0.498, 0.064, 0.053}, {0.504, 0.498, 0.061, 0.055}, {0.573, 0.475, 0.076, 0.072},
+                {0.344, 0.498, 0.064, 0.052} , {0.424, 0.498, 0.064, 0.053}, {0.504, 0.498, 0.061, 0.055}, {0.573, 0.475, 0.076, 0.072},
+                {0.344, 0.498, 0.064, 0.052} , {0.424, 0.498, 0.064, 0.053}, {0.504, 0.498, 0.061, 0.055}, {0.573, 0.475, 0.076, 0.072} }},
+        {6, { {0.344, 0.498, 0.064, 0.052} , {0.424, 0.498, 0.064, 0.053}, {0.504, 0.498, 0.061, 0.055}, {0.573, 0.475, 0.076, 0.072},
+                {0.344, 0.498, 0.064, 0.052} , {0.424, 0.498, 0.064, 0.053}, {0.504, 0.498, 0.061, 0.055}, {0.573, 0.475, 0.076, 0.072},
+                {0.344, 0.498, 0.064, 0.052} , {0.424, 0.498, 0.064, 0.053}, {0.504, 0.498, 0.061, 0.055}, {0.573, 0.475, 0.076, 0.072},
+                {0.344, 0.498, 0.064, 0.052} , {0.424, 0.498, 0.064, 0.053}, {0.504, 0.498, 0.061, 0.055}, {0.573, 0.475, 0.076, 0.072},
+                {0.344, 0.498, 0.064, 0.052} , {0.424, 0.498, 0.064, 0.053}, {0.504, 0.498, 0.061, 0.055}, {0.573, 0.475, 0.076, 0.072},
+                {0.344, 0.498, 0.064, 0.052} , {0.424, 0.498, 0.064, 0.053}, {0.504, 0.498, 0.061, 0.055}, {0.573, 0.475, 0.076, 0.072} }},
+    };
+
+    //Cherry tomato - custom coordinates due to placement issues
+    const std::map<int, std::vector<ImageFloatBox>> cherryTomatoCustom {
+    {1, { {0.386, 0.507, 0.060, 0.055}, {0.470, 0.507, 0.060, 0.055}, {0.554, 0.507, 0.060, 0.055} }},
+    {2, { {0.386, 0.507, 0.060, 0.055}, {0.470, 0.507, 0.060, 0.055}, {0.554, 0.507, 0.060, 0.055}, {0.382, 0.466, 0.064, 0.053}, {0.468, 0.467, 0.064, 0.050}, {0.551, 0.463, 0.064, 0.056} }},
+    {3, { {0.386, 0.507, 0.060, 0.055}, {0.470, 0.507, 0.060, 0.055}, {0.554, 0.507, 0.060, 0.055}, {0.382, 0.466, 0.064, 0.053}, {0.468, 0.467, 0.064, 0.050}, {0.551, 0.463, 0.064, 0.056},
+        {0.339, 0.484, 0.059, 0.055}, {0.428, 0.486, 0.060, 0.056}, {0.528, 0.484, 0.063, 0.058} }},
+    {4, { {0.386, 0.507, 0.060, 0.055}, {0.470, 0.507, 0.060, 0.055}, {0.554, 0.507, 0.060, 0.055}, {0.382, 0.466, 0.064, 0.053}, {0.468, 0.467, 0.064, 0.050}, {0.551, 0.463, 0.064, 0.056},
+        {0.339, 0.484, 0.059, 0.055}, {0.428, 0.486, 0.060, 0.056}, {0.528, 0.484, 0.063, 0.058}, {0.412, 0.462, 0.062, 0.067}, {0.495, 0.459, 0.061, 0.064}, {0.578, 0.464, 0.061, 0.056} }},
+    {5, { {0.386, 0.507, 0.060, 0.055}, {0.470, 0.507, 0.060, 0.055}, {0.554, 0.507, 0.060, 0.055}, {0.382, 0.466, 0.064, 0.053}, {0.468, 0.467, 0.064, 0.050}, {0.551, 0.463, 0.064, 0.056},
+        {0.339, 0.484, 0.059, 0.055}, {0.428, 0.486, 0.060, 0.056}, {0.528, 0.484, 0.063, 0.058}, {0.412, 0.462, 0.062, 0.067}, {0.495, 0.459, 0.061, 0.064}, {0.578, 0.464, 0.061, 0.056},
+        {0.386, 0.507, 0.060, 0.055}, {0.470, 0.507, 0.060, 0.055}, {0.554, 0.507, 0.060, 0.055} }},
+    {6, { {0.386, 0.507, 0.060, 0.055}, {0.470, 0.507, 0.060, 0.055}, {0.554, 0.507, 0.060, 0.055}, {0.382, 0.466, 0.064, 0.053}, {0.468, 0.467, 0.064, 0.050}, {0.551, 0.463, 0.064, 0.056},
+        {0.339, 0.484, 0.059, 0.055}, {0.428, 0.486, 0.060, 0.056}, {0.528, 0.484, 0.063, 0.058}, {0.412, 0.462, 0.062, 0.067}, {0.495, 0.459, 0.061, 0.064}, {0.578, 0.464, 0.061, 0.056},
+        {0.386, 0.507, 0.060, 0.055}, {0.470, 0.507, 0.060, 0.055}, {0.554, 0.507, 0.060, 0.055}, {0.386, 0.507, 0.060, 0.055}, {0.470, 0.507, 0.060, 0.055}, {0.554, 0.507, 0.060, 0.055} }},
+    };
+
+    const std::map<std::string, FillingInfo> SandwichFillingsData{
+        {"baguette",            {0, 0, flatCircleFilling}},
+        {"lettuce",             {3, 1, flatCircleFilling}},
+        {"tomato",              {3, 1, flatCircleFilling}},
+        {"cherry-tomatoes",     {3, 3, cherryTomatoCustom}},
+        {"cucumber",            {3, 2, flatCircleFilling}},
+        {"pickle",              {3, 2, flatCircleFilling}},
+        {"onion",               {3, 2, flatCircleFilling}},
+        {"red-onion",           {3, 2, flatCircleFilling}},
+        {"green-bell-pepper",   {3, 2, flatCircleFilling}},
+        {"red-bell-pepper",     {3, 2, flatCircleFilling}},
+        {"yellow-bell-pepper",  {3, 2, flatCircleFilling}},
+        {"avocado",             {3, 2, flatCircleFilling}},
+        {"bacon",               {3, 1, flatCircleFilling}},
+        {"ham",                 {3, 2, flatCircleFilling}},
+        {"prosciutto",          {3, 2, flatCircleFilling}},
+        {"chorizo",             {3, 2, flatCircleFilling}},
+        {"herbed-sausage",      {3, 2, flatCircleFilling}},
+        {"hamburger",           {1, 1, bigSingleFilling}},
+        {"klawf-stick",         {3, 1, flatCircleFilling}},
+        {"smoked-fillet",       {3, 1, flatCircleFilling}},
+        {"fried-fillet",        {1, 1, bigSingleFilling}},
+        {"egg",                 {3, 1, flatCircleFilling}},
+        {"potato-tortilla",     {1, 1, bigSingleFilling}},
+        {"tofu",                {3, 1, flatCircleFilling}},
+        {"rice",                {1, 1, bigSingleFilling}},
+        {"noodles",             {1, 1, bigSingleFilling}},
+        {"potato-salad",        {1, 1, bigSingleFilling}},
+        {"cheese",              {3, 1, flatCircleFilling}},
+        {"banana",              {3, 2, flatCircleFilling}},
+        {"strawberry",          {3, 2, flatCircleFilling}},
+        {"apple",               {3, 2, flatCircleFilling}},
+        {"kiwi",                {3, 2, flatCircleFilling}},
+        {"pineapple",           {3, 2, flatCircleFilling}},
+        {"jalape\xc3\xb1o",     {3, 2, flatCircleFilling}},
+        {"watercress",          {3, 2, flatCircleFilling}},
+        {"basil",               {4, 1, fourPiecesFilling}},
+    };
+
+public:
+    FillingInfo get_filling_information(std::string filling){
+        auto iter = SandwichFillingsData.find(filling);
+        return iter->second;
+    }
+
+    static FillingsCoordinates& instance(){
+        static FillingsCoordinates self;
+        return self;
+    }
+
+
+};
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/PokemonSV/Resources/PokemonSV_Ingredients.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Resources/PokemonSV_Ingredients.cpp
similarity index 86%
rename from SerialPrograms/Source/PokemonSV/Resources/PokemonSV_Ingredients.cpp
rename to SerialPrograms/Source/VideoGames/PokemonSV/Resources/PokemonSV_Ingredients.cpp
index 6670f870dd..1080247aaa 100644
--- a/SerialPrograms/Source/PokemonSV/Resources/PokemonSV_Ingredients.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Resources/PokemonSV_Ingredients.cpp
@@ -1,150 +1,150 @@
-/*  Pokemon Scarlet/Violet Sandwich Sprites
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Cpp/Json/JsonValue.h"
-#include "Common/Cpp/Json/JsonArray.h"
-#include "Common/Cpp/Json/JsonObject.h"
-#include "CommonFramework/Globals.h"
-#include "PokemonSV_Ingredients.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-
-
-std::vector<std::string> make_ALL_SANDWICH_FILLINGS_SLUGS(){
-    std::vector<std::string> ret;
-    for (const auto& item : SANDWICH_FILLINGS_DATABASE()){
-        ret.emplace_back(item.first);
-    }
-    return ret;
-}
-const std::vector<std::string>& ALL_SANDWICH_FILLINGS_SLUGS(){
-    static std::vector<std::string> database = make_ALL_SANDWICH_FILLINGS_SLUGS();
-    return database;
-}
-
-std::vector<std::string> make_ALL_SANDWICH_CONDIMENTS_SLUGS(){
-    std::vector<std::string> ret;
-    for (const auto& item : SANDWICH_CONDIMENTS_DATABASE()){
-        ret.emplace_back(item.first);
-    }
-    return ret;
-}
-const std::vector<std::string>& ALL_SANDWICH_CONDIMENTS_SLUGS(){
-    static std::vector<std::string> database = make_ALL_SANDWICH_CONDIMENTS_SLUGS();
-    return database;
-}
-
-
-
-struct IngredientNameDatabase{
-    IngredientNameDatabase();
-
-    static const IngredientNameDatabase& instance() {
-        static IngredientNameDatabase database;
-        return database;
-    }
-
-    std::map<std::string, SandwichIngredientNames> database;
-    std::map<std::string, std::string> m_display_name_to_slug;
-};
-IngredientNameDatabase::IngredientNameDatabase(){
-    {
-        std::string path = RESOURCE_PATH() + "PokemonSV/Picnic/SandwichFillingOCR.json";
-        JsonValue json = load_json_file(path);
-        JsonObject& object = json.get_object_throw(path);
-        for (const auto& language_block : object){
-            Language language = language_code_to_enum(language_block.first);
-            const JsonObject& per_language = language_block.second.get_object_throw(path);
-            for (const auto& slug : per_language){
-                const JsonArray& names = slug.second.get_array_throw(path);
-                if (names.empty()){
-                    throw JsonParseException(path, "Expected at least one name for: " + language_block.first + " : " + slug.first);
-                }
-                database[slug.first].m_display_names[language] = names[0].get_string_throw();
-            }
-        }
-        for (auto& item : database){
-            auto iter = item.second.m_display_names.find(Language::English);
-            if (iter == item.second.m_display_names.end()){
-                throw JsonParseException(path, "English not found for: " + item.first);
-            }
-            item.second.m_display_name = iter->second;
-            m_display_name_to_slug[iter->second] = item.first;
-        }
-    }
-    {
-        std::string path = RESOURCE_PATH() + "PokemonSV/Picnic/SandwichCondimentOCR.json";
-        JsonValue json = load_json_file(path);
-        JsonObject& object = json.get_object_throw(path);
-        for (const auto& language_block : object){
-            Language language = language_code_to_enum(language_block.first);
-            const JsonObject& per_language = language_block.second.get_object_throw(path);
-            for (const auto& slug : per_language){
-                const JsonArray& names = slug.second.get_array_throw(path);
-                if (names.empty()){
-                    throw JsonParseException(path, "Expected at least one name for: " + language_block.first + " : " + slug.first);
-                }
-                database[slug.first].m_display_names[language] = names[0].get_string_throw();
-            }
-        }
-        for (auto& item : database){
-            auto iter = item.second.m_display_names.find(Language::English);
-            if (iter == item.second.m_display_names.end()){
-                throw JsonParseException(path, "English not found for: " + item.first);
-            }
-            item.second.m_display_name = iter->second;
-            m_display_name_to_slug[iter->second] = item.first;
-        }
-    }
-}
-
-const SandwichIngredientNames& get_ingredient_name(const std::string& slug){
-    const std::map<std::string, SandwichIngredientNames>& database = IngredientNameDatabase::instance().database;
-    auto iter = database.find(slug);
-    if (iter == database.end()) {
-        throw InternalProgramError(
-            nullptr, PA_CURRENT_FUNCTION,
-            "Ingredient slug not found in database: " + slug
-        );
-    }
-    return iter->second;
-}
-
-const std::string& parse_ingredient_name(const std::string& display_name){
-    const std::map<std::string, std::string>& database = IngredientNameDatabase::instance().m_display_name_to_slug;
-    auto iter = database.find(display_name);
-    if (iter == database.end()) {
-        throw InternalProgramError(
-            nullptr, PA_CURRENT_FUNCTION,
-            "Ingredient name not found in database: " + display_name
-        );
-    }
-    return iter->second;
-}
-
-
-
-
-
-
-const SpriteDatabase& SANDWICH_FILLINGS_DATABASE(){
-    static const SpriteDatabase database("PokemonSV/Picnic/SandwichFillingSprites.png", "PokemonSV/Picnic/SandwichFillingSprites.json");
-    return database;
-}
-
-const SpriteDatabase& SANDWICH_CONDIMENTS_DATABASE(){
-    static const SpriteDatabase database("PokemonSV/Picnic/SandwichCondimentSprites.png", "PokemonSV/Picnic/SandwichCondimentSprites.json");
-    return database;
-}
-
-
-
-}
-}
-}
+/*  Pokemon Scarlet/Violet Sandwich Sprites
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Json/JsonValue.h"
+#include "Common/Cpp/Json/JsonArray.h"
+#include "Common/Cpp/Json/JsonObject.h"
+#include "CommonFramework/GlobalAutoPaths.h"
+#include "PokemonSV_Ingredients.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+
+std::vector<std::string> make_ALL_SANDWICH_FILLINGS_SLUGS(){
+    std::vector<std::string> ret;
+    for (const auto& item : SANDWICH_FILLINGS_DATABASE()){
+        ret.emplace_back(item.first);
+    }
+    return ret;
+}
+const std::vector<std::string>& ALL_SANDWICH_FILLINGS_SLUGS(){
+    static std::vector<std::string> database = make_ALL_SANDWICH_FILLINGS_SLUGS();
+    return database;
+}
+
+std::vector<std::string> make_ALL_SANDWICH_CONDIMENTS_SLUGS(){
+    std::vector<std::string> ret;
+    for (const auto& item : SANDWICH_CONDIMENTS_DATABASE()){
+        ret.emplace_back(item.first);
+    }
+    return ret;
+}
+const std::vector<std::string>& ALL_SANDWICH_CONDIMENTS_SLUGS(){
+    static std::vector<std::string> database = make_ALL_SANDWICH_CONDIMENTS_SLUGS();
+    return database;
+}
+
+
+
+struct IngredientNameDatabase{
+    IngredientNameDatabase();
+
+    static const IngredientNameDatabase& instance(){
+        static IngredientNameDatabase database;
+        return database;
+    }
+
+    std::map<std::string, SandwichIngredientNames> database;
+    std::map<std::string, std::string> m_display_name_to_slug;
+};
+IngredientNameDatabase::IngredientNameDatabase(){
+    {
+        std::string path = RESOURCE_PATH() + "PokemonSV/Picnic/SandwichFillingOCR.json";
+        JsonValue json = load_json_file(path);
+        JsonObject& object = json.to_object_throw(path);
+        for (const auto& language_block : object){
+            Language language = language_code_to_enum(language_block.first);
+            const JsonObject& per_language = language_block.second.to_object_throw(path);
+            for (const auto& slug : per_language){
+                const JsonArray& names = slug.second.to_array_throw(path);
+                if (names.empty()){
+                    throw JsonParseException(path, "Expected at least one name for: " + language_block.first + " : " + slug.first);
+                }
+                database[slug.first].m_display_names[language] = names[0].to_string_throw();
+            }
+        }
+        for (auto& item : database){
+            auto iter = item.second.m_display_names.find(Language::English);
+            if (iter == item.second.m_display_names.end()){
+                throw JsonParseException(path, "English not found for: " + item.first);
+            }
+            item.second.m_display_name = iter->second;
+            m_display_name_to_slug[iter->second] = item.first;
+        }
+    }
+    {
+        std::string path = RESOURCE_PATH() + "PokemonSV/Picnic/SandwichCondimentOCR.json";
+        JsonValue json = load_json_file(path);
+        JsonObject& object = json.to_object_throw(path);
+        for (const auto& language_block : object){
+            Language language = language_code_to_enum(language_block.first);
+            const JsonObject& per_language = language_block.second.to_object_throw(path);
+            for (const auto& slug : per_language){
+                const JsonArray& names = slug.second.to_array_throw(path);
+                if (names.empty()){
+                    throw JsonParseException(path, "Expected at least one name for: " + language_block.first + " : " + slug.first);
+                }
+                database[slug.first].m_display_names[language] = names[0].to_string_throw();
+            }
+        }
+        for (auto& item : database){
+            auto iter = item.second.m_display_names.find(Language::English);
+            if (iter == item.second.m_display_names.end()){
+                throw JsonParseException(path, "English not found for: " + item.first);
+            }
+            item.second.m_display_name = iter->second;
+            m_display_name_to_slug[iter->second] = item.first;
+        }
+    }
+}
+
+const SandwichIngredientNames& get_ingredient_name(const std::string& slug){
+    const std::map<std::string, SandwichIngredientNames>& database = IngredientNameDatabase::instance().database;
+    auto iter = database.find(slug);
+    if (iter == database.end()){
+        throw InternalProgramError(
+            nullptr, PA_CURRENT_FUNCTION,
+            "Ingredient slug not found in database: " + slug
+        );
+    }
+    return iter->second;
+}
+
+const std::string& parse_ingredient_name(const std::string& display_name){
+    const std::map<std::string, std::string>& database = IngredientNameDatabase::instance().m_display_name_to_slug;
+    auto iter = database.find(display_name);
+    if (iter == database.end()){
+        throw InternalProgramError(
+            nullptr, PA_CURRENT_FUNCTION,
+            "Ingredient name not found in database: " + display_name
+        );
+    }
+    return iter->second;
+}
+
+
+
+
+
+
+const SpriteDatabase& SANDWICH_FILLINGS_DATABASE(){
+    static const SpriteDatabase database("PokemonSV/Picnic/SandwichFillingSprites.png", "PokemonSV/Picnic/SandwichFillingSprites.json");
+    return database;
+}
+
+const SpriteDatabase& SANDWICH_CONDIMENTS_DATABASE(){
+    static const SpriteDatabase database("PokemonSV/Picnic/SandwichCondimentSprites.png", "PokemonSV/Picnic/SandwichCondimentSprites.json");
+    return database;
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/PokemonSV/Resources/PokemonSV_Ingredients.h b/SerialPrograms/Source/VideoGames/PokemonSV/Resources/PokemonSV_Ingredients.h
similarity index 86%
rename from SerialPrograms/Source/PokemonSV/Resources/PokemonSV_Ingredients.h
rename to SerialPrograms/Source/VideoGames/PokemonSV/Resources/PokemonSV_Ingredients.h
index f91ac8896e..f62d818157 100644
--- a/SerialPrograms/Source/PokemonSV/Resources/PokemonSV_Ingredients.h
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Resources/PokemonSV_Ingredients.h
@@ -1,46 +1,46 @@
-/*  Pokemon Scarlet/Violet Ingredients
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSV_Ingredients_H
-#define PokemonAutomation_PokemonSV_Ingredients_H
-
-#include <vector>
-#include <map>
-#include "CommonFramework/Language.h"
-#include "CommonFramework/Resources/SpriteDatabase.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-
-const std::vector<std::string>& ALL_SANDWICH_FILLINGS_SLUGS();
-const std::vector<std::string>& ALL_SANDWICH_CONDIMENTS_SLUGS();
-
-class SandwichIngredientNames{
-public:
-    const std::string& display_name() const{ return m_display_name; }
-
-private:
-    friend struct IngredientNameDatabase;
-
-    std::string m_display_name;
-    std::map<Language, std::string> m_display_names;
-};
-
-const SandwichIngredientNames& get_ingredient_name(const std::string& slug);
-const std::string& parse_ingredient_name(const std::string& display_name);
-
-
-
-const SpriteDatabase& SANDWICH_FILLINGS_DATABASE();
-const SpriteDatabase& SANDWICH_CONDIMENTS_DATABASE();
-
-
-}
-}
-}
-#endif
+/*  Pokemon Scarlet/Violet Ingredients
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_Ingredients_H
+#define PokemonAutomation_PokemonSV_Ingredients_H
+
+#include <vector>
+#include <map>
+#include "CommonFramework/Language.h"
+#include "CommonTools/Resources/SpriteDatabase.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+const std::vector<std::string>& ALL_SANDWICH_FILLINGS_SLUGS();
+const std::vector<std::string>& ALL_SANDWICH_CONDIMENTS_SLUGS();
+
+class SandwichIngredientNames{
+public:
+    const std::string& display_name() const{ return m_display_name; }
+
+private:
+    friend struct IngredientNameDatabase;
+
+    std::string m_display_name;
+    std::map<Language, std::string> m_display_names;
+};
+
+const SandwichIngredientNames& get_ingredient_name(const std::string& slug);
+const std::string& parse_ingredient_name(const std::string& display_name);
+
+
+
+const SpriteDatabase& SANDWICH_FILLINGS_DATABASE();
+const SpriteDatabase& SANDWICH_CONDIMENTS_DATABASE();
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/PokemonSV/Resources/PokemonSV_ItemSprites.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Resources/PokemonSV_ItemSprites.cpp
similarity index 81%
rename from SerialPrograms/Source/PokemonSV/Resources/PokemonSV_ItemSprites.cpp
rename to SerialPrograms/Source/VideoGames/PokemonSV/Resources/PokemonSV_ItemSprites.cpp
index d12f430ae6..7e2ca4ae1b 100644
--- a/SerialPrograms/Source/PokemonSV/Resources/PokemonSV_ItemSprites.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Resources/PokemonSV_ItemSprites.cpp
@@ -1,6 +1,6 @@
 /*  Pokemon Scarlet/Violet Item Sprites
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Resources/PokemonSV_ItemSprites.h b/SerialPrograms/Source/VideoGames/PokemonSV/Resources/PokemonSV_ItemSprites.h
new file mode 100644
index 0000000000..e16107a27e
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Resources/PokemonSV_ItemSprites.h
@@ -0,0 +1,22 @@
+/*  Pokemon Scarlet/Violet Item Sprites
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_ItemSprites_H
+#define PokemonAutomation_PokemonSV_ItemSprites_H
+
+#include "CommonTools/Resources/SpriteDatabase.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+const SpriteDatabase& AUCTION_ITEM_SPRITES();
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/PokemonSV/Resources/PokemonSV_NameDatabase.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Resources/PokemonSV_NameDatabase.cpp
similarity index 82%
rename from SerialPrograms/Source/PokemonSV/Resources/PokemonSV_NameDatabase.cpp
rename to SerialPrograms/Source/VideoGames/PokemonSV/Resources/PokemonSV_NameDatabase.cpp
index b70cd3e6ae..6dc291b52b 100644
--- a/SerialPrograms/Source/PokemonSV/Resources/PokemonSV_NameDatabase.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Resources/PokemonSV_NameDatabase.cpp
@@ -1,12 +1,13 @@
 /*  Name Database
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include "CommonFramework/Logging/Logger.h"
 #include "Pokemon/Resources/Pokemon_PokemonNames.h"
-#include "PokemonSV/Resources/PokemonSV_PokemonSprites.h"
+#include "Pokemon/Resources/Pokemon_PokemonSlugs.h"
+#include "VideoGames/PokemonSV/Resources/PokemonSV_PokemonSprites.h"
 #include "PokemonSV_NameDatabase.h"
 
 namespace PokemonAutomation{
@@ -44,10 +45,10 @@ StringSelectDatabase make_ALL_POKEMON_NAMES(){
     const SpriteDatabase& sprites = ALL_POKEMON_SPRITES();
 
     std::vector<std::string> slugs;
-    for (std::string& slug : load_pokemon_slug_json_list("Pokemon/Pokedex/Pokedex-National.json")){
+    for (const std::string& slug : NATIONAL_DEX_SLUGS()){
         const SpriteDatabase::Sprite* sprite = sprites.get_nothrow(slug);
         if (sprite != nullptr){
-            slugs.emplace_back(std::move(slug));
+            slugs.emplace_back(slug);
         }
     }
 
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Resources/PokemonSV_NameDatabase.h b/SerialPrograms/Source/VideoGames/PokemonSV/Resources/PokemonSV_NameDatabase.h
new file mode 100644
index 0000000000..a04a8d1744
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Resources/PokemonSV_NameDatabase.h
@@ -0,0 +1,20 @@
+/*  Name Database
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonTools/Options/StringSelectOption.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+const StringSelectDatabase& ALL_POKEMON_NAMES();
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Resources/PokemonSV_PokemonSprites.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Resources/PokemonSV_PokemonSprites.cpp
new file mode 100644
index 0000000000..8ca43b2ded
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Resources/PokemonSV_PokemonSprites.cpp
@@ -0,0 +1,67 @@
+/*  Pokemon Scarlet/Violet Pokemon Sprites
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/GlobalAutoPaths.h"
+#include "CommonTools/ImageMatch/ImageCropper.h"
+#include "PokemonSV_PokemonSprites.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+const SpriteDatabase& ALL_POKEMON_SPRITES(){
+    static const SpriteDatabase database("PokemonSV/PokemonSprites.png", "PokemonSV/PokemonSprites.json");
+    return database;
+}
+
+const SpriteDatabase& ALL_POKEMON_SILHOUETTES(){
+    static const SpriteDatabase database("PokemonSV/PokemonSilhouettes.png", "PokemonSV/PokemonSprites.json");
+    return database;
+}
+
+const std::array<std::string, NUM_TERA_TYPE> TERA_TYPE_NAMES = {
+    "Bug",
+    "Dark",
+    "Dragon",
+    "Electric",
+    "Fairy",
+    "Fighting",
+    "Fire",
+    "Flying",
+    "Ghost",
+    "Grass",
+    "Ground",
+    "Ice",
+    "Normal",
+    "Poison",
+    "Psychic",
+    "Rock",
+    "Steel",
+    "Water",
+};
+std::array<ImageRGB32, NUM_TERA_TYPE> BUILD_TERA_TYPE_ICONS(){
+    const std::string image_folder_path = RESOURCE_PATH() + "PokemonSV/TeraTypes/";
+
+    std::array<ImageRGB32, NUM_TERA_TYPE> ret;
+    for (size_t i = 0; i < NUM_TERA_TYPE; i++){
+        const auto& type_name = TERA_TYPE_NAMES[i];
+        const std::string image_path = image_folder_path + type_name + ".png";
+
+        // Trim the image to remove 0-alpha boundaries.
+        ImageRGB32 image(ImageMatch::trim_image_alpha(ImageRGB32(image_path)).copy());
+        ret[i] = std::move(image);
+    }
+
+    return ret;
+}
+const std::array<ImageRGB32, NUM_TERA_TYPE>& ALL_TERA_TYPE_ICONS(){
+    const static auto icons = BUILD_TERA_TYPE_ICONS();
+    return icons;
+}
+
+}
+}
+}
diff --git a/SerialPrograms/Source/PokemonSV/Resources/PokemonSV_PokemonSprites.h b/SerialPrograms/Source/VideoGames/PokemonSV/Resources/PokemonSV_PokemonSprites.h
similarity index 79%
rename from SerialPrograms/Source/PokemonSV/Resources/PokemonSV_PokemonSprites.h
rename to SerialPrograms/Source/VideoGames/PokemonSV/Resources/PokemonSV_PokemonSprites.h
index 5bbb90d588..548e3ca1fe 100644
--- a/SerialPrograms/Source/PokemonSV/Resources/PokemonSV_PokemonSprites.h
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Resources/PokemonSV_PokemonSprites.h
@@ -1,6 +1,6 @@
 /*  Pokemon Scarlet/Violet Pokemon Sprites
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -8,7 +8,7 @@
 #define PokemonAutomation_PokemonSV_PokemonSprites_H
 
 #include <array>
-#include "CommonFramework/Resources/SpriteDatabase.h"
+#include "CommonTools/Resources/SpriteDatabase.h"
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
@@ -19,7 +19,7 @@ const SpriteDatabase& ALL_POKEMON_SPRITES();
 
 const SpriteDatabase& ALL_POKEMON_SILHOUETTES();
 
-enum class TeraType {
+enum class TeraType{
     Bug,
     Dark,
     Dragon,
diff --git a/SerialPrograms/Source/PokemonSV/Resources/PokemonSV_TournamentPrizeNames.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Resources/PokemonSV_TournamentPrizeNames.cpp
similarity index 79%
rename from SerialPrograms/Source/PokemonSV/Resources/PokemonSV_TournamentPrizeNames.cpp
rename to SerialPrograms/Source/VideoGames/PokemonSV/Resources/PokemonSV_TournamentPrizeNames.cpp
index d4ef4bc327..f623cf4a7f 100644
--- a/SerialPrograms/Source/PokemonSV/Resources/PokemonSV_TournamentPrizeNames.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Resources/PokemonSV_TournamentPrizeNames.cpp
@@ -1,109 +1,109 @@
-/*  Tournament Prize Names
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include <map>
-#include "Common/Cpp/Json/JsonValue.h"
-#include "Common/Cpp/Json/JsonArray.h"
-#include "Common/Cpp/Json/JsonObject.h"
-#include "CommonFramework/Globals.h"
-#include "PokemonSV_TournamentPrizeNames.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSV{
-
-
-struct TournamentPrizeNameDatabase {
-    TournamentPrizeNameDatabase();
-
-    static const TournamentPrizeNameDatabase& instance() {
-        static TournamentPrizeNameDatabase database;
-        return database;
-    }
-
-    static const std::string NULL_SLUG;
-    std::vector<std::string> ordered_list;
-    std::map<std::string, TournamentPrizeNames> database;
-    std::map<std::string, std::string> reverse_lookup;
-};
-const std::string TournamentPrizeNameDatabase::NULL_SLUG;
-
-TournamentPrizeNameDatabase::TournamentPrizeNameDatabase()
-{
-    // Load a list of tournament prize slugs in the desired order:
-    // ["potion", "fresh-water", ... ]
-    std::string path_slugs = RESOURCE_PATH() + "PokemonSV/AAT/TournamentPrizeList.json";
-    JsonValue json_slugs = load_json_file(path_slugs);
-    JsonArray& slugs = json_slugs.get_array_throw(path_slugs);
-
-    // Load a map of tournament prize slugs to item names in all languages, e.g.:
-    // {
-    //      "potion": {
-    //          "eng": "Potion",
-    //          "deu": "Trank",
-    //          ...
-    //      },
-    //      ....
-    // }
-    std::string path_disp = RESOURCE_PATH() + "PokemonSV/AAT/TournamentPrizeNameDisplay.json";
-    JsonValue json_disp = load_json_file(path_disp);
-    JsonObject& item_disp = json_disp.get_object_throw(path_disp);
-
-    for (auto& item : slugs) {
-        std::string& slug = item.get_string_throw(path_slugs);
-
-        JsonObject& auction_item_name_dict = item_disp.get_object_throw(slug, path_disp);
-        std::string& display_name = auction_item_name_dict.get_string_throw("eng", path_disp);
-
-        ordered_list.push_back(slug);
-        database[std::move(slug)].m_display_name = std::move(display_name);
-    }
-
-    for (const auto& item : database) {
-        reverse_lookup[item.second.m_display_name] = item.first;
-    }
-}
-
-const TournamentPrizeNames& get_tournament_prize_name(const std::string& slug) {
-    const std::map<std::string, TournamentPrizeNames>& database = TournamentPrizeNameDatabase::instance().database;
-    auto iter = database.find(slug);
-    if (iter == database.end()) {
-        throw InternalProgramError(
-            nullptr, PA_CURRENT_FUNCTION,
-            "Tournament prize slug not found in database: " + slug
-        );
-    }
-    return iter->second;
-}
-const std::string& parse_tournament_prize_name(const std::string& display_name) {
-    const std::map<std::string, std::string>& database = TournamentPrizeNameDatabase::instance().reverse_lookup;
-    auto iter = database.find(display_name);
-    if (iter == database.end()) {
-        throw InternalProgramError(
-            nullptr, PA_CURRENT_FUNCTION,
-            "Tournament prize name not found in database: " + display_name
-        );
-    }
-    return iter->second;
-}
-const std::string& parse_tournament_prize_name_nothrow(const std::string& display_name) {
-    const std::map<std::string, std::string>& database = TournamentPrizeNameDatabase::instance().reverse_lookup;
-    auto iter = database.find(display_name);
-    if (iter == database.end()) {
-        return TournamentPrizeNameDatabase::NULL_SLUG;
-    }
-    return iter->second;
-}
-
-
-const std::vector<std::string>& TOURNAMENT_PRIZE_SLUGS() {
-    return TournamentPrizeNameDatabase::instance().ordered_list;
-}
-
-
-}
-}
-}
+/*  Tournament Prize Names
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <map>
+#include "Common/Cpp/Json/JsonValue.h"
+#include "Common/Cpp/Json/JsonArray.h"
+#include "Common/Cpp/Json/JsonObject.h"
+#include "CommonFramework/GlobalAutoPaths.h"
+#include "PokemonSV_TournamentPrizeNames.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+struct TournamentPrizeNameDatabase{
+    TournamentPrizeNameDatabase();
+
+    static const TournamentPrizeNameDatabase& instance(){
+        static TournamentPrizeNameDatabase database;
+        return database;
+    }
+
+    static const std::string NULL_SLUG;
+    std::vector<std::string> ordered_list;
+    std::map<std::string, TournamentPrizeNames> database;
+    std::map<std::string, std::string> reverse_lookup;
+};
+const std::string TournamentPrizeNameDatabase::NULL_SLUG;
+
+TournamentPrizeNameDatabase::TournamentPrizeNameDatabase()
+{
+    // Load a list of tournament prize slugs in the desired order:
+    // ["potion", "fresh-water", ... ]
+    std::string path_slugs = RESOURCE_PATH() + "PokemonSV/AAT/TournamentPrizeList.json";
+    JsonValue json_slugs = load_json_file(path_slugs);
+    JsonArray& slugs = json_slugs.to_array_throw(path_slugs);
+
+    // Load a map of tournament prize slugs to item names in all languages, e.g.:
+    // {
+    //      "potion": {
+    //          "eng": "Potion",
+    //          "deu": "Trank",
+    //          ...
+    //      },
+    //      ....
+    // }
+    std::string path_disp = RESOURCE_PATH() + "PokemonSV/AAT/TournamentPrizeNameDisplay.json";
+    JsonValue json_disp = load_json_file(path_disp);
+    JsonObject& item_disp = json_disp.to_object_throw(path_disp);
+
+    for (auto& item : slugs){
+        std::string& slug = item.to_string_throw(path_slugs);
+
+        JsonObject& auction_item_name_dict = item_disp.get_object_throw(slug, path_disp);
+        std::string& display_name = auction_item_name_dict.get_string_throw("eng", path_disp);
+
+        ordered_list.push_back(slug);
+        database[std::move(slug)].m_display_name = std::move(display_name);
+    }
+
+    for (const auto& item : database){
+        reverse_lookup[item.second.m_display_name] = item.first;
+    }
+}
+
+const TournamentPrizeNames& get_tournament_prize_name(const std::string& slug){
+    const std::map<std::string, TournamentPrizeNames>& database = TournamentPrizeNameDatabase::instance().database;
+    auto iter = database.find(slug);
+    if (iter == database.end()){
+        throw InternalProgramError(
+            nullptr, PA_CURRENT_FUNCTION,
+            "Tournament prize slug not found in database: " + slug
+        );
+    }
+    return iter->second;
+}
+const std::string& parse_tournament_prize_name(const std::string& display_name){
+    const std::map<std::string, std::string>& database = TournamentPrizeNameDatabase::instance().reverse_lookup;
+    auto iter = database.find(display_name);
+    if (iter == database.end()){
+        throw InternalProgramError(
+            nullptr, PA_CURRENT_FUNCTION,
+            "Tournament prize name not found in database: " + display_name
+        );
+    }
+    return iter->second;
+}
+const std::string& parse_tournament_prize_name_nothrow(const std::string& display_name){
+    const std::map<std::string, std::string>& database = TournamentPrizeNameDatabase::instance().reverse_lookup;
+    auto iter = database.find(display_name);
+    if (iter == database.end()){
+        return TournamentPrizeNameDatabase::NULL_SLUG;
+    }
+    return iter->second;
+}
+
+
+const std::vector<std::string>& TOURNAMENT_PRIZE_SLUGS(){
+    return TournamentPrizeNameDatabase::instance().ordered_list;
+}
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/PokemonSV/Resources/PokemonSV_TournamentPrizeNames.h b/SerialPrograms/Source/VideoGames/PokemonSV/Resources/PokemonSV_TournamentPrizeNames.h
similarity index 78%
rename from SerialPrograms/Source/PokemonSV/Resources/PokemonSV_TournamentPrizeNames.h
rename to SerialPrograms/Source/VideoGames/PokemonSV/Resources/PokemonSV_TournamentPrizeNames.h
index eab2681ae6..fa789e33f1 100644
--- a/SerialPrograms/Source/PokemonSV/Resources/PokemonSV_TournamentPrizeNames.h
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Resources/PokemonSV_TournamentPrizeNames.h
@@ -1,39 +1,39 @@
-/*  Tournament Prize Names
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSV_TournamentPrizeNames_H
-#define PokemonAutomation_PokemonSV_TournamentPrizeNames_H
-
-#include <string>
-#include <vector>
-
-namespace PokemonAutomation {
-namespace NintendoSwitch {
-namespace PokemonSV {
-
-
-class TournamentPrizeNames {
-public:
-    const std::string& display_name() const { return m_display_name; }
-
-private:
-    friend struct TournamentPrizeNameDatabase;
-
-    std::string m_display_name;
-};
-
-
-const TournamentPrizeNames& get_tournament_prize_name(const std::string& slug);
-const std::string& parse_tournament_prize_name(const std::string& display_name);
-const std::string& parse_tournament_prize_name_nothrow(const std::string& display_name);
-
-const std::vector<std::string>& TOURNAMENT_PRIZE_SLUGS();
-
-
-}
-}
-}
-#endif
+/*  Tournament Prize Names
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSV_TournamentPrizeNames_H
+#define PokemonAutomation_PokemonSV_TournamentPrizeNames_H
+
+#include <string>
+#include <vector>
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSV{
+
+
+class TournamentPrizeNames{
+public:
+    const std::string& display_name() const { return m_display_name; }
+
+private:
+    friend struct TournamentPrizeNameDatabase;
+
+    std::string m_display_name;
+};
+
+
+const TournamentPrizeNames& get_tournament_prize_name(const std::string& slug);
+const std::string& parse_tournament_prize_name(const std::string& display_name);
+const std::string& parse_tournament_prize_name_nothrow(const std::string& display_name);
+
+const std::vector<std::string>& TOURNAMENT_PRIZE_SLUGS();
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_AutoHosts.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_AutoHosts.cpp
new file mode 100644
index 0000000000..30a16530c5
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_AutoHosts.cpp
@@ -0,0 +1,123 @@
+/*  Auto Host Routines
+ * 
+ *  From: https://github.com/PokemonAutomation/
+ * 
+ */
+
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "VideoGames/PokemonSwSh/PokemonSwSh_Settings.h"
+#include "VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_GameEntry.h"
+#include "PokemonSwSh_Commands_AutoHosts.h"
+//#include "PokemonSwSh_Messages_AutoHosts.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+void connect_to_internet(
+    ProControllerContext& context,
+    Milliseconds open_ycomm_delay,
+    Milliseconds connect_to_internet_delay
+){
+    ssf_press_button(context, BUTTON_Y, open_ycomm_delay, 80ms);
+
+    //  Move the cursor as far away from Link Trade and Surprise Trade as possible.
+    //  This is added safety in case connect to internet takes too long.
+    ssf_issue_scroll(context, SSF_SCROLL_UP, 40ms, 40ms, 40ms);
+    ssf_issue_scroll(context, SSF_SCROLL_UP, 40ms, 40ms, 40ms);
+    ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 40ms, 40ms, 40ms);
+
+    //  Connect to internet.
+    ssf_press_button(context, BUTTON_PLUS, 24ms);
+
+    //  Mash B to get out of YCOMM.
+    ssf_mash1_button(context, BUTTON_B, connect_to_internet_delay);
+}
+void home_to_add_friends(
+    ProControllerContext& context,
+    uint8_t user_slot,
+    uint8_t scroll_down,
+    bool fix_cursor
+){
+//    cout << "scroll_down = " << (int)scroll_down << endl;
+
+    //  Scroll to correct user.
+    //  Do 2 up-scrolls instead of one. In the event that an error leaves you in
+    //  the game instead of the Switch Home, these button presses will actually
+    //  start the raid - which can kill the den. This will move the cursor over
+    //  "Quit" instead of "Ready to Battle!".
+    ssf_issue_scroll_ptv(context, SSF_SCROLL_UP);
+    for (uint8_t c = 0; c < user_slot; c++){
+        ssf_issue_scroll_ptv(context, SSF_SCROLL_RIGHT);
+    }
+    ssf_issue_scroll_ptv(context, SSF_SCROLL_UP);
+
+    //  Enter user profile.
+    ssf_press_button_ptv(context, BUTTON_A, 2000ms);
+
+    if (fix_cursor){
+        //  Force cursor to bottom, then up one to FRs.
+        for (uint8_t c = 0; c < 40; c++){
+            ssf_issue_scroll(context, SSF_SCROLL_DOWN, 24ms);
+        }
+        ssf_issue_scroll_ptv(context, SSF_SCROLL_UP);
+    }
+
+    ssf_do_nothing(context, 400ms);
+    ssf_issue_scroll_ptv(context, DPAD_RIGHT);
+    while (scroll_down--){
+        ssf_issue_scroll_ptv(context, SSF_SCROLL_DOWN);
+    }
+}
+void accept_FRs(
+    ConsoleHandle& console, ProControllerContext& context,
+    uint8_t slot, bool fix_cursor,
+    Milliseconds game_to_home_delay_safe,
+    Milliseconds auto_fr_duration,
+    bool tolerate_system_update_window_slow
+){
+    if (slot > 7){
+        slot = 7;
+    }
+
+    //  Go to Switch Home menu.
+    go_home(console, context);
+
+    home_to_add_friends(context, slot, 0, fix_cursor);
+
+    //  Mash A.
+    pbf_mash_button(context, BUTTON_A, auto_fr_duration);
+
+    //  Return to Switch Home menu. (or game)
+    if (console.video().snapshot()){
+        console.log("Entering game using inference...");
+        pbf_press_button(context, BUTTON_HOME, 160ms, 1440ms);
+        NintendoSwitch::resume_game_from_home(console, context);
+    }else{
+        console.log("Entering game without inference...", COLOR_RED);
+        settings_to_enter_game_den_lobby(
+            context,
+            tolerate_system_update_window_slow, false,
+            GameSettings::instance().ENTER_SWITCH_POKEMON0,
+            GameSettings::instance().EXIT_SWITCH_POKEMON0
+        );
+    }
+    pbf_wait(context, 2400ms);
+}
+
+
+
+
+}
+}
+}
+
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_AutoHosts.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_AutoHosts.h
new file mode 100644
index 0000000000..69551d059c
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_AutoHosts.h
@@ -0,0 +1,44 @@
+/*  Auto Host Routines
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_Commands_AutoHosts_H
+#define PokemonAutomation_PokemonSwSh_Commands_AutoHosts_H
+
+#include "CommonFramework/Tools/VideoStream.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+#include "NintendoSwitch/NintendoSwitch_ConsoleHandle.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+void connect_to_internet(
+    ProControllerContext& context,
+    Milliseconds open_ycomm_delay,
+    Milliseconds connect_to_internet_delay
+);
+void home_to_add_friends(
+    ProControllerContext& context,
+    uint8_t user_slot,
+    uint8_t scroll_down,
+    bool fix_cursor
+);
+void accept_FRs(
+    ConsoleHandle& console, ProControllerContext& context,
+    uint8_t slot, bool fix_cursor,
+    Milliseconds game_to_home_delay_safe,
+    Milliseconds auto_fr_duration,
+    bool tolerate_system_update_window_slow
+);
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.cpp
new file mode 100644
index 0000000000..d9497a09f0
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.cpp
@@ -0,0 +1,249 @@
+/*  Auto Host Routines
+ * 
+ *  From: https://github.com/PokemonAutomation/
+ * 
+ */
+
+#include "Common/Cpp/Exceptions.h"
+//#include "CommonFramework/VideoPipeline/VideoFeed.h"
+//#include "Controllers/ControllerTypes.h"
+#include "NintendoSwitch/NintendoSwitch_Settings.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+//#include "NintendoSwitch/Inference/NintendoSwitch_HomeMenuDetector.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "NintendoSwitch/Programs/DateSpam/NintendoSwitch_HomeToDateTime.h"
+#include "NintendoSwitch/Programs/DateSpam/NintendoSwitch_RollDateForward1.h"
+#include "NintendoSwitch/Programs/DateSpam/NintendoSwitch_RollDateBackwardN.h"
+#include "PokemonSwSh_Commands_GameEntry.h"
+#include "PokemonSwSh_Commands_DateSpam.h"
+//#include "PokemonSwSh_Messages_DateSpam.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+void rollback_year_skip_forward(
+    ConsoleHandle& console, ProControllerContext& context
+){
+    ConsoleType type = console.state().console_type();
+    if (is_switch1(type)){
+        roll_date_backward_N(console, context, MAX_YEAR, true);
+        ssf_press_button_ptv(context, BUTTON_A, 160ms, 80ms);
+        ssf_issue_scroll_ptv(context, SSF_SCROLL_LEFT, 24ms);
+        ssf_issue_scroll_ptv(context, SSF_SCROLL_LEFT, 24ms);
+        ssf_issue_scroll_ptv(context, SSF_SCROLL_LEFT, 24ms);
+        ssf_issue_scroll_ptv(context, SSF_SCROLL_UP, 16ms);
+        ssf_issue_scroll_ptv(context, SSF_SCROLL_LEFT, 24ms);
+        ssf_issue_scroll_ptv(context, SSF_SCROLL_UP, 16ms);
+        ssf_issue_scroll_ptv(context, SSF_SCROLL_LEFT, 24ms);
+//        ssf_issue_scroll_ptv(context, SSF_SCROLL_LEFT, 24ms);
+        ssf_issue_scroll_ptv(context, SSF_SCROLL_UP, 16ms);
+        return;
+    }
+
+    if (is_switch2(type)){
+        roll_date_backward_N(console, context, MAX_YEAR, true);
+        roll_date_forward_1(console, context, true);
+        return;
+    }
+
+    throw UserSetupError(
+        console.logger(),
+        "Please select a valid Switch console type."
+    );
+}
+
+
+void home_roll_date_enter_game(
+    ConsoleHandle& console, ProControllerContext& context,
+    bool rollback_year
+){
+    //  From the Switch home menu, roll the date, then re-enter the game.
+    home_to_date_time(console, context, true);
+
+    if (rollback_year){
+        rollback_year_skip_forward(console, context);
+    }else{
+        roll_date_forward_1(console, context, true);
+    }
+
+    settings_to_enter_game(context, true);
+    resume_game_from_home(console, context, true);
+}
+void home_roll_date_enter_game_autorollback(
+    ConsoleHandle& console, ProControllerContext& context,
+    uint8_t& year
+){
+    //  This version automatically handles the 2060 roll-back.
+    if (year >= MAX_YEAR){
+        home_roll_date_enter_game(console, context, true);
+        year = 0;
+    }else{
+        home_roll_date_enter_game(console, context, false);
+    }
+    year++;
+}
+
+
+
+
+
+void touch_date_from_home_switch1(
+    ConsoleHandle& console, ProControllerContext& context,
+    Milliseconds settings_to_home_delay
+){
+    home_to_date_time(console, context, true);
+    ssf_press_button_ptv(context, BUTTON_A, 160ms, 80ms);
+
+    ssf_press_button_ptv(context, BUTTON_A, 0ms);
+    ssf_issue_scroll_ptv(context, SSF_SCROLL_RIGHT);
+    ssf_issue_scroll_ptv(context, SSF_SCROLL_RIGHT);
+    ssf_issue_scroll_ptv(context, SSF_SCROLL_RIGHT);
+    ssf_press_button_ptv(context, BUTTON_A, 0ms);
+    ssf_issue_scroll_ptv(context, SSF_SCROLL_RIGHT);
+
+    ssf_issue_scroll_ptv(context, SSF_SCROLL_LEFT);
+    ssf_issue_scroll_ptv(context, SSF_SCROLL_UP, 16ms);
+    ssf_issue_scroll_ptv(context, SSF_SCROLL_RIGHT, 0ms);
+    ssf_press_button_ptv(context, BUTTON_A, 160ms, 80ms);
+
+    ssf_press_button_ptv(context, BUTTON_A, 160ms, 80ms);
+    ssf_issue_scroll_ptv(context, SSF_SCROLL_LEFT);
+    ssf_issue_scroll_ptv(context, SSF_SCROLL_DOWN, 16ms);
+    ssf_press_button(context, BUTTON_HOME, settings_to_home_delay, 80ms);
+}
+void touch_date_from_home_switch2(
+    ConsoleHandle& console, ProControllerContext& context,
+    Milliseconds settings_to_home_delay
+){
+    home_to_date_time(console, context, true);
+
+    ssf_press_button(context, BUTTON_A, ConsoleSettings::instance().DATE_MENU_OPEN_SWITCH2_0, 80ms);
+    ssf_issue_scroll_ptv(context, SSF_SCROLL_UP);
+    ssf_issue_scroll_ptv(context, SSF_SCROLL_RIGHT);
+    ssf_issue_scroll_ptv(context, SSF_SCROLL_RIGHT);
+    ssf_issue_scroll_ptv(context, SSF_SCROLL_RIGHT);
+    ssf_issue_scroll_ptv(context, SSF_SCROLL_RIGHT);
+    ssf_issue_scroll_ptv(context, SSF_SCROLL_RIGHT);
+    ssf_issue_scroll_ptv(context, SSF_SCROLL_RIGHT);
+    ssf_press_button(context, BUTTON_A, ConsoleSettings::instance().DATE_MENU_CLOSE_SWITCH2_0, 80ms);
+
+    ssf_press_button(context, BUTTON_A, ConsoleSettings::instance().DATE_MENU_OPEN_SWITCH2_0, 80ms);
+    ssf_issue_scroll_ptv(context, SSF_SCROLL_DOWN);
+    ssf_issue_scroll_ptv(context, SSF_SCROLL_RIGHT);
+    ssf_issue_scroll_ptv(context, SSF_SCROLL_RIGHT);
+    ssf_issue_scroll_ptv(context, SSF_SCROLL_RIGHT);
+    ssf_issue_scroll_ptv(context, SSF_SCROLL_RIGHT);
+    ssf_issue_scroll_ptv(context, SSF_SCROLL_RIGHT);
+    ssf_issue_scroll_ptv(context, SSF_SCROLL_RIGHT);
+    ssf_press_button(context, BUTTON_A, ConsoleSettings::instance().DATE_MENU_CLOSE_SWITCH2_0, 80ms);
+
+    ssf_press_button(context, BUTTON_HOME, settings_to_home_delay, 80ms);
+}
+void touch_date_from_home(
+    ConsoleHandle& console, ProControllerContext& context,
+    Milliseconds settings_to_home_delay
+){
+    ensure_at_home(console, context);
+
+    ConsoleType type = console.state().console_type();
+
+    if (is_switch1(type)){
+        touch_date_from_home_switch1(console, context, settings_to_home_delay);
+        return;
+    }
+    if (is_switch2(type)){
+        touch_date_from_home_switch2(console, context, settings_to_home_delay);
+        return;
+    }
+
+    throw UserSetupError(
+        console.logger(),
+        "Please select a valid Switch console type."
+    );
+}
+
+
+
+
+void rollback_hours_from_home_switch1(
+    ConsoleHandle& console, ProControllerContext& context,
+    uint8_t hours,
+    Milliseconds settings_to_home_delay
+){
+    home_to_date_time(console, context, true);
+    ssf_press_button_ptv(context, BUTTON_A, 160ms, 80ms);
+
+    ssf_press_button_ptv(context, BUTTON_A, 0ms);
+    ssf_issue_scroll_ptv(context, SSF_SCROLL_RIGHT);
+    ssf_issue_scroll_ptv(context, SSF_SCROLL_RIGHT);
+    for (uint8_t c = 0; c < hours; c++){
+        ssf_issue_scroll_ptv(context, SSF_SCROLL_DOWN);
+    }
+    ssf_press_button_ptv(context, BUTTON_A, 0ms);
+    ssf_issue_scroll_ptv(context, SSF_SCROLL_RIGHT);
+    ssf_issue_scroll_ptv(context, SSF_SCROLL_RIGHT);
+
+    ssf_press_button_ptv(context, BUTTON_A, 160ms, 80ms);
+    ssf_press_button(context, BUTTON_HOME, settings_to_home_delay, 80ms);
+}
+void rollback_hours_from_home_switch2(
+    ConsoleHandle& console, ProControllerContext& context,
+    uint8_t hours,
+    Milliseconds settings_to_home_delay
+){
+    home_to_date_time(console, context, true);
+
+    Milliseconds tv = context->timing_variation();
+    Milliseconds unit = 24ms + tv;
+
+    ssf_press_button(context, BUTTON_A, ConsoleSettings::instance().DATE_MENU_OPEN_SWITCH2_0, 80ms);
+    ssf_issue_scroll_ptv(context, SSF_SCROLL_RIGHT);
+    ssf_issue_scroll_ptv(context, SSF_SCROLL_RIGHT);
+    ssf_issue_scroll_ptv(context, SSF_SCROLL_RIGHT);
+    for (uint8_t c = 0; c < hours; c++){
+        ssf_issue_scroll(context, SSF_SCROLL_DOWN, 112ms + tv, 2*unit, unit);
+    }
+    ssf_issue_scroll_ptv(context, SSF_SCROLL_RIGHT);
+    ssf_issue_scroll_ptv(context, SSF_SCROLL_RIGHT);
+    ssf_issue_scroll_ptv(context, SSF_SCROLL_RIGHT);
+    ssf_press_button(context, BUTTON_A, ConsoleSettings::instance().DATE_MENU_CLOSE_SWITCH2_0, 80ms);
+
+    ssf_press_button(context, BUTTON_HOME, settings_to_home_delay, 80ms);
+}
+
+
+void rollback_hours_from_home(
+    ConsoleHandle& console, ProControllerContext& context,
+    uint8_t hours,
+    Milliseconds settings_to_home_delay
+){
+    ensure_at_home(console, context);
+
+    ConsoleType type = console.state().console_type();
+
+    if (is_switch1(type)){
+        rollback_hours_from_home_switch1(console, context, hours, settings_to_home_delay);
+        return;
+    }
+    if (is_switch2(type)){
+        rollback_hours_from_home_switch2(console, context, hours, settings_to_home_delay);
+        return;
+    }
+
+    throw UserSetupError(
+        console.logger(),
+        "Please select a valid Switch console type."
+    );
+}
+
+
+
+
+
+}
+
+}
+}
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.h
new file mode 100644
index 0000000000..93e7e447a4
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.h
@@ -0,0 +1,42 @@
+/*  Date Spamming Routines
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_Commands_DateSpam_H
+#define PokemonAutomation_PokemonSwSh_Commands_DateSpam_H
+
+#include "CommonFramework/Tools/VideoStream.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+#include "NintendoSwitch/NintendoSwitch_ConsoleHandle.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+
+constexpr uint8_t MAX_YEAR = 60;
+
+
+namespace PokemonSwSh{
+
+//void neutral_date_skip                      (ProControllerContext& context);
+//void roll_date_forward_1                    (ProControllerContext& context, bool fast);
+//void roll_date_backward_N                   (ProControllerContext& context, uint8_t skips, bool fast);
+//void home_roll_date_enter_game              (ConsoleHandle& console, ProControllerContext& context, bool rollback_year);
+void home_roll_date_enter_game_autorollback (ConsoleHandle& console, ProControllerContext& context, uint8_t& year);
+void touch_date_from_home                   (
+    ConsoleHandle& console, ProControllerContext& context,
+    Milliseconds settings_to_home_delay
+);
+void rollback_hours_from_home(
+    ConsoleHandle& console, ProControllerContext& context,
+    uint8_t hours,
+    Milliseconds settings_to_home_delay
+);
+
+}
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_EggRoutines.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_EggRoutines.cpp
new file mode 100644
index 0000000000..850e3e5bb5
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_EggRoutines.cpp
@@ -0,0 +1,88 @@
+/*  Egg Routines
+ * 
+ *  From: https://github.com/PokemonAutomation/
+ * 
+ */
+
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "PokemonSwSh_Commands_EggRoutines.h"
+//#include "PokemonSwSh_Messages_EggRoutines.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+
+void eggfetcher_loop(ProControllerContext& context){
+    ssf_press_left_joystick(context, {+1, -1}, 400ms, 400ms);
+    ssf_press_left_joystick(context, {+1, -0.252}, 0ms, 4080ms);
+    ssf_press_button(context, BUTTON_A, 1360ms);
+    ssf_press_button(context, BUTTON_A, 1360ms);
+    ssf_press_button(context, BUTTON_A, 1360ms);
+    ssf_press_left_joystick(context, {-1, 0}, 400ms, 3120ms);
+    ssf_mash1_button(context, BUTTON_B, 720ms);
+    ssf_do_nothing(context, 2400ms);
+
+    ssf_press_left_joystick(context, {+0.5, +1}, 960ms, 960ms);
+    ssf_press_left_joystick(context, {+1, +1}, 960ms, 960ms);
+}
+void move_while_mashing_B(ProControllerContext& context, Milliseconds duration){
+    //  Hold the joystick to the right for the entire duration.
+    ssf_press_left_joystick(context, {+1, 0}, 0ms, duration);
+
+    //  While the above is running, spam B.
+    ssf_mash1_button(context, BUTTON_B, duration);
+}
+void spin_and_mash_A(ProControllerContext& context, Milliseconds duration){
+    for (Milliseconds c = 0ms; c < duration; c += 1280ms){
+        ssf_press_left_joystick(context, {0, -1}, 0ms, 320ms);
+        ssf_press_button(context, BUTTON_A, 160ms);
+        ssf_press_button(context, BUTTON_A, 160ms);
+
+        ssf_press_left_joystick(context, {+1, 0}, 0ms, 320ms);
+        ssf_press_button(context, BUTTON_A, 160ms);
+        ssf_press_button(context, BUTTON_A, 160ms);
+
+        ssf_press_left_joystick(context, {0, +1}, 0ms, 320ms);
+        ssf_press_button(context, BUTTON_A, 160ms);
+        ssf_press_button(context, BUTTON_A, 160ms);
+
+        ssf_press_left_joystick(context, {-1, 0}, 0ms, 320ms);
+        ssf_press_button(context, BUTTON_A, 160ms);
+        ssf_press_button(context, BUTTON_A, 160ms);
+    }
+}
+void travel_to_spin_location(ProControllerContext& context){
+    ssf_press_left_joystick(context, {+1, -0.126}, 800ms, 2000ms);
+    ssf_press_button(context, BUTTON_A, 800ms);
+    ssf_press_button(context, BUTTON_A, 400ms);
+    ssf_press_left_joystick(context, {+1, -1}, 400ms, 400ms);
+}
+void travel_back_to_lady(ProControllerContext& context){
+    ssf_press_left_joystick(context, {0, -1}, 240ms, 240ms);
+    ssf_press_left_joystick(context, {+1, -0.126}, 2080ms, 2080ms);
+    ssf_press_left_joystick(context, {-1, 0}, 400ms, 3200ms);
+    ssf_mash1_button(context, BUTTON_B, 800ms);
+    ssf_do_nothing(context, 2400ms);
+    ssf_press_left_joystick(context, {+0.5, +1}, 960ms, 960ms);
+    ssf_press_left_joystick(context, {+1, +1}, 960ms, 960ms);
+}
+
+void travel_to_spin_location2(ProControllerContext& context){
+    ssf_press_left_joystick(context, {+1, -0.126}, 800ms, 2000ms);
+    ssf_press_left_joystick(context, {+1, -1}, 400ms, 400ms);
+}
+void travel_back_to_lady2(ProControllerContext& context){
+    ssf_press_left_joystick(context, {0, -1}, 240ms, 240ms);
+    ssf_press_left_joystick(context, {+1, -0.126}, 2080ms, 2080ms);
+    ssf_press_left_joystick(context, {-1, 0}, 400ms, 3200ms);
+    ssf_mash1_button(context, BUTTON_R, 800ms); // bike boost
+    ssf_do_nothing(context, 2400ms);
+    ssf_press_left_joystick(context, {+0.5, +1}, 960ms, 960ms);
+    ssf_press_left_joystick(context, {+1, +1}, 960ms, 960ms);
+}
+
+
+
+}
+}
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_EggRoutines.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_EggRoutines.h
new file mode 100644
index 0000000000..6857a25e3b
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_EggRoutines.h
@@ -0,0 +1,31 @@
+/*  Egg Routines
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *      This file requires (PABB_PABOTBASE_LEVEL >= 31).
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_Commands_EggRoutines_H
+#define PokemonAutomation_PokemonSwSh_Commands_EggRoutines_H
+
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+
+void eggfetcher_loop        (ProControllerContext& context);
+void move_while_mashing_B   (ProControllerContext& context, Milliseconds duration);
+void spin_and_mash_A        (ProControllerContext& context, Milliseconds duration);
+void travel_to_spin_location(ProControllerContext& context);
+void travel_back_to_lady    (ProControllerContext& context);
+void travel_to_spin_location2(ProControllerContext& context);
+void travel_back_to_lady2    (ProControllerContext& context);
+
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_GameEntry.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_GameEntry.cpp
new file mode 100644
index 0000000000..2492ac1e1c
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_GameEntry.cpp
@@ -0,0 +1,198 @@
+/*  Game Entry Routines
+ * 
+ *  From: https://github.com/PokemonAutomation/
+ * 
+ */
+
+#include "NintendoSwitch/NintendoSwitch_Settings.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "VideoGames/PokemonSwSh/PokemonSwSh_Settings.h"
+#include "PokemonSwSh_Commands_GameEntry.h"
+//#include "PokemonSwSh_Messages_GameEntry.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+void resume_game_no_interact_old(ProControllerContext& context, bool tolerate_update_menu){
+    Milliseconds HOME_TO_GAME_DELAY = GameSettings::instance().HOME_TO_GAME_DELAY0;
+    if (tolerate_update_menu){
+        pbf_press_button(context, BUTTON_HOME, 80ms, HOME_TO_GAME_DELAY);
+        pbf_press_dpad(context, DPAD_DOWN, 80ms, 80ms);
+        pbf_press_dpad(context, DPAD_UP, 80ms, 80ms);
+        pbf_press_button(context, BUTTON_A, 80ms, HOME_TO_GAME_DELAY);
+    }else{
+        pbf_press_button(context, BUTTON_HOME, 80ms, HOME_TO_GAME_DELAY);
+    }
+}
+void resume_game_back_out_old(ProControllerContext& context, bool tolerate_update_menu, Milliseconds mash_B_time){
+    Milliseconds HOME_TO_GAME_DELAY = GameSettings::instance().HOME_TO_GAME_DELAY0;
+    if (tolerate_update_menu){
+        pbf_press_button(context, BUTTON_HOME, 80ms, HOME_TO_GAME_DELAY);
+        pbf_press_dpad(context, DPAD_DOWN, 80ms, 80ms);
+        pbf_press_dpad(context, DPAD_UP, 80ms, 80ms);
+        pbf_press_button(context, BUTTON_A, 80ms, HOME_TO_GAME_DELAY);
+        pbf_mash_button(context, BUTTON_B, mash_B_time);
+    }else{
+        pbf_press_button(context, BUTTON_HOME, 80ms, HOME_TO_GAME_DELAY);
+    }
+}
+void resume_game_front_of_den_nowatts(ProControllerContext& context, bool tolerate_update_menu){
+    resume_game_back_out_old(context, tolerate_update_menu, 3200ms);
+}
+
+void fast_reset_game(
+    ProControllerContext& context,
+    Milliseconds start_game_wait,
+    Milliseconds enter_game_mash,
+    Milliseconds enter_game_wait
+){
+    //  Fastest setting. No internet needed and no update menu.
+    ssf_mash1_button(context, BUTTON_X, 400ms);
+
+    //  Use mashing to ensure that the X press succeeds. If it fails, the SR
+    //  will fail and can kill a den for the autohosts.
+    ssf_mash2_button(context, BUTTON_X, BUTTON_A, 3000ms + ConsoleSettings::instance().BLIND_START_GAME_MASH.get());
+    ssf_mash1_button(context, BUTTON_X, start_game_wait);
+
+    ssf_mash_AZs(context, enter_game_mash);
+    pbf_wait(context, enter_game_wait);
+}
+
+void settings_to_enter_game(ProControllerContext& context, bool fast){
+    if (fast){
+        //  100 ticks for the first press isn't enough to finish the animation.
+        //  But since the HOME button has delayed effect, we start pressing the 2nd
+        //  press before the animation finishes.
+        ssf_press_button(context, BUTTON_HOME, 800ms, 160ms);
+        ssf_press_button(context, BUTTON_HOME, 160ms, 160ms);
+    }else{
+        ssf_press_button(context, BUTTON_HOME, 1600ms, 160ms);
+        ssf_press_button(context, BUTTON_HOME, 160ms, 160ms);
+    }
+}
+void settings_to_enter_game_den_lobby(
+    ProControllerContext& context,
+    bool tolerate_update_menu, bool fast,
+    Milliseconds enter_switch_pokemon_delay,
+    Milliseconds exit_switch_pokemon_delay
+){
+    settings_to_enter_game(context, fast);
+    pbf_wait(context, 720ms);
+    if (tolerate_update_menu){
+        //  home                home
+//        ssf_press_button2(BUTTON_HOME, 800ms, 80ms);
+        //  lobby-switch        update-yes
+        ssf_press_dpad(context, DPAD_DOWN, 80ms);
+        ssf_press_dpad(context, DPAD_UP, 80ms);
+        //  lobby-switch        update-start
+        ssf_press_button(context, BUTTON_A, enter_switch_pokemon_delay, 80ms);
+        //  lobby-select        lobby-switch
+        ssf_press_dpad(context, DPAD_LEFT, 80ms);
+        //  lobby-select        lobby-switch
+        ssf_press_button(context, BUTTON_A, enter_switch_pokemon_delay);
+        //  lobby-confirm       lobby-select
+        ssf_press_button(context, BUTTON_Y, 80ms);
+        ssf_press_dpad(context, DPAD_LEFT, 80ms);
+        //  lobby-confirm       lobby-select
+        ssf_press_button(context, BUTTON_A, exit_switch_pokemon_delay);
+        //  lobby-switch        lobby-switch
+    }else{
+        pbf_wait(context, 400ms);
+    }
+}
+void start_game_from_home(
+    ProControllerContext& context,
+    bool tolerate_update_menu,
+    uint8_t game_slot,
+    uint8_t user_slot,
+    bool backup_save
+){
+    //  Start the game with the specified "game_slot" and "user_slot".
+    //  If "game_slot" is zero, it uses whatever the cursor is on.
+    //  If "user_slot" is zero, it uses whatever the cursor is on.
+
+    if (game_slot != 0){
+        ssf_press_button(context, BUTTON_HOME, ConsoleSettings::instance().SETTINGS_TO_HOME_DELAY0, 160ms);
+        for (uint8_t c = 1; c < game_slot; c++){
+            ssf_press_dpad_ptv(context, DPAD_RIGHT, 80ms);
+        }
+    }
+
+    if (tolerate_update_menu){
+        //  If the update menu isn't there, these will get swallowed by the opening
+        //  animation for the select user menu.
+        pbf_press_button(context, BUTTON_A, 160ms, 280ms);    //  Choose game
+        pbf_press_dpad(context, DPAD_UP, 160ms, 0ms);   //  Skip the update window.
+    }
+
+    bool START_GAME_REQUIRES_INTERNET = ConsoleSettings::instance().START_GAME_REQUIRES_INTERNET;
+    Milliseconds START_GAME_MASH = ConsoleSettings::instance().BLIND_START_GAME_MASH;
+
+    if (!START_GAME_REQUIRES_INTERNET && user_slot == 0){
+        //  Mash your way into the game.
+        pbf_mash_button(context, BUTTON_A, START_GAME_MASH);
+    }else{
+        pbf_press_button(context, BUTTON_A, 160ms, 1280ms);     //  Enter select user menu.
+        if (user_slot != 0){
+            //  Move to correct user.
+            for (uint8_t c = 0; c < 8; c++){
+                ssf_issue_scroll_ptv(context, DPAD_LEFT, 160ms, 160ms);
+            }
+//            pbf_wait(50);
+            for (uint8_t c = 1; c < user_slot; c++){
+                ssf_issue_scroll_ptv(context, DPAD_RIGHT, 160ms, 160ms);
+            }
+        }
+        pbf_press_button(context, BUTTON_A, 160ms, 160ms);        //  Enter game
+
+        //  Switch to mashing ZR instead of A to get into the game.
+        //  Mash your way into the game.
+        Milliseconds duration = START_GAME_MASH;
+        if (START_GAME_REQUIRES_INTERNET){
+            //  Need to wait a bit longer for the internet check.
+            duration += ConsoleSettings::instance().START_GAME_INTERNET_CHECK_DELAY0;
+        }
+        pbf_mash_button(context, BUTTON_ZR, duration);
+    }
+
+    pbf_wait(context, GameSettings::instance().START_GAME_WAIT0);
+    enter_game(
+        context,
+        backup_save,
+        GameSettings::instance().ENTER_GAME_MASH0,
+        GameSettings::instance().ENTER_GAME_WAIT0
+    );
+}
+
+void enter_game(
+    ProControllerContext& context,
+    bool backup_save,
+    Milliseconds enter_game_mash,
+    Milliseconds enter_game_wait
+){
+    if (backup_save){
+        pbf_wait(context, enter_game_mash);
+        ssf_press_dpad(context, DPAD_UP, 0ms, 80ms);
+        ssf_press_button(context, BUTTON_B | BUTTON_X, 1000ms, 80ms);
+        ssf_mash_AZs(context, 5000ms);
+        if (enter_game_wait > 4s){
+            pbf_wait(context, enter_game_wait - 4s);
+        }
+    }else{
+        ssf_mash_AZs(context, enter_game_mash);
+        pbf_wait(context, enter_game_wait);
+    }
+}
+
+
+
+
+
+
+}
+}
+}
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_GameEntry.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_GameEntry.h
new file mode 100644
index 0000000000..77067fd234
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_GameEntry.h
@@ -0,0 +1,55 @@
+/*  Game Entry Routines
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_Commands_GameEntry_H
+#define PokemonAutomation_PokemonSwSh_Commands_GameEntry_H
+
+#include "CommonFramework/Tools/VideoStream.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+#include "NintendoSwitch/NintendoSwitch_ConsoleHandle.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+void resume_game_no_interact_old        (ProControllerContext& device, bool tolerate_update_menu);
+void resume_game_back_out_old           (ProControllerContext& device, bool tolerate_update_menu, Milliseconds mash_B_time);
+void resume_game_front_of_den_nowatts   (ProControllerContext& device, bool tolerate_update_menu);
+void settings_to_enter_game             (ProControllerContext& device, bool fast);
+void settings_to_enter_game_den_lobby(
+    ProControllerContext& device,
+    bool tolerate_update_menu, bool fast,
+    Milliseconds enter_switch_pokemon_delay,
+    Milliseconds exit_switch_pokemon_delay
+);
+void enter_game(
+    ProControllerContext& device,
+    bool backup_save,
+    Milliseconds enter_game_mash,
+    Milliseconds enter_game_wait
+);
+void start_game_from_home(
+    ProControllerContext& device,
+    bool tolerate_update_menu,
+    uint8_t game_slot,
+    uint8_t user_slot,
+    bool backup_save
+);
+void fast_reset_game(
+    ProControllerContext& device,
+    Milliseconds start_game_wait,
+    Milliseconds enter_game_mash,
+    Milliseconds enter_game_wait
+);
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_Misc.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_Misc.cpp
new file mode 100644
index 0000000000..ca452e9ded
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_Misc.cpp
@@ -0,0 +1,29 @@
+/*  Misc. Routines
+ * 
+ *  From: https://github.com/PokemonAutomation/
+ * 
+ */
+
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "PokemonSwSh_Commands_Misc.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+
+void IoA_backout(ProControllerContext& context, Milliseconds pokemon_to_menu_delay){
+    //  Back out to menu.
+    //  Prepend each B press by a DOWN press so that the B gets
+    //  swallowed while in the summary.
+    ssf_press_dpad(context, DPAD_DOWN, 40ms, 120ms);
+    ssf_press_button(context, BUTTON_B, 480ms, 80ms);
+    ssf_press_dpad(context, DPAD_DOWN, 40ms, 120ms);
+    ssf_press_button(context, BUTTON_B, pokemon_to_menu_delay, 80ms);
+}
+
+
+
+}
+}
+
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_Misc.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_Misc.h
new file mode 100644
index 0000000000..73c1e75a46
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_Misc.h
@@ -0,0 +1,22 @@
+/*  Misc. Routines
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_Commands_Misc_H
+#define PokemonAutomation_PokemonSwSh_Commands_Misc_H
+
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+
+void IoA_backout    (ProControllerContext& context, Milliseconds pokemon_to_menu_delay);
+
+
+
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleBallReader.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleBallReader.cpp
new file mode 100644
index 0000000000..9b66bc07b0
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleBallReader.cpp
@@ -0,0 +1,130 @@
+/*  Ball Sprite Reader
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/Notifications/ProgramInfo.h"
+#include "CommonFramework/Tools/ErrorDumper.h"
+#include "CommonTools/Images/ImageFilter.h"
+#include "CommonTools/OCR/OCR_NumberReader.h"
+#include "VideoGames/PokemonSwSh/Resources/PokemonSwSh_PokeballSprites.h"
+#include "PokemonSwSh_BattleBallReader.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+const double BattleBallReader::MAX_ALPHA = 0.29;
+const double BattleBallReader::ALPHA_SPREAD = 0.02;
+
+
+ImageMatch::ExactImageDictionaryMatcher make_BALL_SPRITE_MATCHER(){
+    ImageMatch::ExactImageDictionaryMatcher matcher({1, 128});
+    for (const auto& item : ALL_POKEBALL_SPRITES()){
+        matcher.add(item.first, item.second.sprite.copy());
+    }
+    return matcher;
+}
+const ImageMatch::ExactImageDictionaryMatcher& BALL_SPRITE_MATCHER(){
+    static ImageMatch::ExactImageDictionaryMatcher matcher = make_BALL_SPRITE_MATCHER();
+    return matcher;
+}
+
+
+
+BattleBallReader::BattleBallReader(
+    VideoStream& stream,
+    Language language
+)
+    : m_matcher(BALL_SPRITE_MATCHER())
+    , m_name_reader(PokeballNameReader::instance())
+    , m_language(language)
+    , m_stream(stream)
+    , m_box_sprite(stream.overlay(), {0.649, 0.624, 0.0335, 0.060})
+    , m_box_name(stream.overlay(), {0.710, 0.624, 0.18, 0.060})
+    , m_box_quantity(stream.overlay(), {0.895, 0.624, 0.059, 0.060})
+{}
+
+std::string BattleBallReader::read_ball(const ImageViewRGB32& screen) const{
+    if (!screen){
+        return "";
+    }
+
+    ImageMatch::ImageMatchResult sprite_result;
+    {
+        sprite_result = m_matcher.match(screen, m_box_sprite, 2, ALPHA_SPREAD);
+        sprite_result.log(m_stream.logger(), 0.50);
+        if (!sprite_result.results.empty() && sprite_result.results.begin()->first > MAX_ALPHA){
+            sprite_result.results.clear();
+        }
+    }
+    if (sprite_result.results.empty()){
+        ImageViewRGB32 sprite = extract_box_reference(screen, m_box_sprite);
+        ImageStats stats = image_stats(sprite);
+        if (stats.stddev.sum() > 20){
+            dump_image(m_stream.logger(), ProgramInfo(), "BattleBallReader-Sprite", screen);
+        }
+    }
+
+    OCR::StringMatchResult name_result;
+    {
+        ImageViewRGB32 cropped = extract_box_reference(screen, m_box_name);
+        name_result = m_name_reader.read_substring(
+            m_stream.logger(), m_language, cropped,
+            OCR::WHITE_TEXT_FILTERS()
+        );
+    }
+    if (name_result.results.size() != 1){
+        dump_image(m_stream.logger(), ProgramInfo(), "BattleBallReader-Name", screen);
+    }
+
+    if (sprite_result.results.empty()){
+        if (name_result.results.size() == 1){
+            return name_result.results.begin()->second.token;
+        }
+        return "";
+    }
+
+    if (sprite_result.results.size() == 1){
+        return sprite_result.results.begin()->second;
+    }
+
+    std::set<std::string> ocr_slugs;
+    for (const auto& item : name_result.results){
+        ocr_slugs.insert(item.second.token);
+    }
+
+    std::vector<std::string> overlap;
+    for (const auto& item : sprite_result.results){
+        auto iter = ocr_slugs.find(item.second);
+        if (iter != ocr_slugs.end()){
+            overlap.emplace_back(item.second);
+        }
+    }
+    if (overlap.size() != 1){
+        dump_image(m_stream.logger(), ProgramInfo(), "BattleBallReader-SpriteNameMismatch", screen);
+        return "";
+    }
+    return overlap[0];
+}
+uint16_t BattleBallReader::read_quantity(const ImageViewRGB32& screen) const{
+    ImageRGB32 image = to_blackwhite_rgb32_range(
+        extract_box_reference(screen, m_box_quantity),
+        true,
+        0xff808080, 0xffffffff
+    );
+    int qty = OCR::read_number(m_stream.logger(), image);
+    return (uint16_t)std::max(qty, 0);
+}
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleBallReader.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleBallReader.h
new file mode 100644
index 0000000000..c678111685
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleBallReader.h
@@ -0,0 +1,52 @@
+/*  In-Battle Ball Inventory Reader
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_BattleBallInventoryReader_H
+#define PokemonAutomation_PokemonSwSh_BattleBallInventoryReader_H
+
+#include <string>
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonFramework/Tools/VideoStream.h"
+#include "CommonTools/ImageMatch/ExactImageDictionaryMatcher.h"
+#include "Pokemon/Inference/Pokemon_PokeballNameReader.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+using namespace Pokemon;
+
+
+class BattleBallReader{
+    static const double MAX_ALPHA;
+    static const double ALPHA_SPREAD;
+
+public:
+    BattleBallReader(
+        VideoStream& stream,
+        Language language
+    );
+
+public:
+    std::string read_ball(const ImageViewRGB32& screen) const;
+    uint16_t read_quantity(const ImageViewRGB32& screen) const;
+
+private:
+    const ImageMatch::ExactImageDictionaryMatcher& m_matcher;
+    const PokeballNameReader& m_name_reader;
+    Language m_language;
+    VideoStream& m_stream;
+    OverlayBoxScope m_box_sprite;
+    OverlayBoxScope m_box_name;
+    OverlayBoxScope m_box_quantity;
+};
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleDialogDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleDialogDetector.cpp
new file mode 100644
index 0000000000..25bcb3e5cb
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleDialogDetector.cpp
@@ -0,0 +1,66 @@
+/*  Battle Dialog Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Images/SolidColorTest.h"
+#include "PokemonSwSh_BattleDialogDetector.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+
+BattleDialogDetector::BattleDialogDetector(Color color)
+    : m_color(color)
+    , m_bottom(0.50, 0.89, 0.40, 0.07)
+    , m_left(0.01, 0.82, 0.03, 0.07)
+    , m_right(0.97, 0.87, 0.02, 0.09)
+{}
+void BattleDialogDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_bottom);
+    items.add(m_color, m_left);
+    items.add(m_color, m_right);
+}
+bool BattleDialogDetector::detect(const ImageViewRGB32& screen){
+    ImageStats bottom = image_stats(extract_box_reference(screen, m_bottom));
+//    cout << "bottom: " << bottom.average << bottom.stddev << endl;
+    if (!is_grey(bottom, 0, 200, 5)){
+        return false;
+    }
+    ImageStats left = image_stats(extract_box_reference(screen, m_left));
+//    cout << "left:   " << left.average << left.stddev << endl;
+    if (!is_grey(left, 0, 200, 3)){
+        return false;
+    }
+    ImageStats right = image_stats(extract_box_reference(screen, m_right));
+//    cout << "right:  " << right.average << right.stddev << endl;
+    if (!is_grey(right, 0, 200, 3)){
+        return false;
+    }
+
+    if (euclidean_distance(left.average, right.average) > 10){
+        return false;
+    }
+    if (left.average.sum() > bottom.average.sum()){
+        return false;
+    }
+    if (right.average.sum() > bottom.average.sum()){
+        return false;
+    }
+
+    return true;
+}
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleDialogDetector.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleDialogDetector.h
new file mode 100644
index 0000000000..2f74196e7a
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleDialogDetector.h
@@ -0,0 +1,39 @@
+/*  Battle Dialog Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_BattleDialogDetector_H
+#define PokemonAutomation_PokemonSwSh_BattleDialogDetector_H
+
+#include "Common/Cpp/Color.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonTools/VisualDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+
+class BattleDialogDetector : public StaticScreenDetector{
+public:
+    BattleDialogDetector(Color color = COLOR_RED);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    Color m_color;
+    ImageFloatBox m_bottom;
+    ImageFloatBox m_left;
+    ImageFloatBox m_right;
+};
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleDialogTracker.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleDialogTracker.cpp
similarity index 91%
rename from SerialPrograms/Source/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleDialogTracker.cpp
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleDialogTracker.cpp
index e9b50989c6..fc794dff15 100644
--- a/SerialPrograms/Source/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleDialogTracker.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleDialogTracker.cpp
@@ -1,17 +1,16 @@
 /*  Encounter Dialog Tracker
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include "Common/Cpp/PrettyPrint.h"
 #include "CommonFramework/ImageTypes/ImageViewRGB32.h"
-#include "PokemonSwSh/Inference/Battles/PokemonSwSh_StartBattleDetector.h"
 #include "PokemonSwSh_BattleDialogTracker.h"
 
-#include <iostream>
-using std::cout;
-using std::endl;
+//#include <iostream>
+//using std::cout;
+//using std::endl;
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
@@ -56,6 +55,9 @@ bool EncounterDialogTracker::process_frame(const ImageViewRGB32& screen, WallClo
         COLOR_PURPLE
     );
 
+//    static int c = 0;
+//    screen.save("test-" + std::to_string(c++) + ".png");
+
     EncounterState state = m_state.load(std::memory_order_relaxed);
     switch (state){
     case EncounterState::BEFORE_ANYTHING:
diff --git a/SerialPrograms/Source/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleDialogTracker.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleDialogTracker.h
similarity index 84%
rename from SerialPrograms/Source/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleDialogTracker.h
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleDialogTracker.h
index d335b2799d..b8f4654bee 100644
--- a/SerialPrograms/Source/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleDialogTracker.h
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleDialogTracker.h
@@ -1,6 +1,6 @@
 /*  Encounter Dialog Tracker
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -9,9 +9,9 @@
 
 #include <chrono>
 #include <atomic>
-#include "CommonFramework/Logging/Logger.h"
-#include "CommonFramework/Inference/VisualDetector.h"
-#include "CommonFramework/InferenceInfra/VisualInferenceCallback.h"
+#include "Common/Cpp/Logging/AbstractLogger.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+#include "CommonTools/VisualDetector.h"
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
diff --git a/SerialPrograms/Source/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleMenuDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleMenuDetector.cpp
similarity index 93%
rename from SerialPrograms/Source/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleMenuDetector.cpp
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleMenuDetector.cpp
index b0e07f415e..9e020e6a11 100644
--- a/SerialPrograms/Source/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleMenuDetector.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleMenuDetector.cpp
@@ -1,18 +1,17 @@
 /*  Battle Menu Detector
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include "Common/Compiler.h"
-#include "CommonFramework/ImageTools/SolidColorTest.h"
-#include "CommonFramework/ImageTools/ColorClustering.h"
 #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Images/SolidColorTest.h"
+#include "CommonTools/Images/ColorClustering.h"
 #include "PokemonSwSh_BattleMenuDetector.h"
 
-#include <iostream>
-using std::cout;
-using std::endl;
+//#include <iostream>
+//using std::cout;
+//using std::endl;
 
 //#define DEBUG_StandardBattleMenuDetector
 
@@ -57,7 +56,7 @@ void StandardBattleMenuDetector::make_overlays(VideoOverlaySet& items) const{
     items.add(m_color, m_text_bag);
     items.add(m_color, m_text_run);
 }
-bool StandardBattleMenuDetector::detect(const ImageViewRGB32& screen) const{
+bool StandardBattleMenuDetector::detect(const ImageViewRGB32& screen){
     if (!m_den){
         if (!is_white(extract_box_reference(screen, m_ball_left))){
             return false;
diff --git a/SerialPrograms/Source/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleMenuDetector.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleMenuDetector.h
similarity index 81%
rename from SerialPrograms/Source/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleMenuDetector.h
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleMenuDetector.h
index 047b81ced7..4b2badbdc7 100644
--- a/SerialPrograms/Source/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleMenuDetector.h
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleMenuDetector.h
@@ -1,6 +1,6 @@
 /*  Battle Menu Detector
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -9,8 +9,8 @@
 
 #include "Common/Cpp/Color.h"
 #include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "CommonFramework/InferenceInfra/VisualInferenceCallback.h"
-#include "CommonFramework/Inference/VisualDetector.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+#include "CommonTools/VisualDetector.h"
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
@@ -22,7 +22,7 @@ class StandardBattleMenuDetector : public StaticScreenDetector{
     StandardBattleMenuDetector(bool den, Color color = COLOR_RED);
 
     virtual void make_overlays(VideoOverlaySet& items) const override;
-    virtual bool detect(const ImageViewRGB32& screen) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
 
 private:
     bool m_den;
diff --git a/SerialPrograms/Source/PokemonSwSh/Inference/Battles/PokemonSwSh_ExperienceGainDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_ExperienceGainDetector.cpp
similarity index 88%
rename from SerialPrograms/Source/PokemonSwSh/Inference/Battles/PokemonSwSh_ExperienceGainDetector.cpp
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_ExperienceGainDetector.cpp
index dd1cc44967..eb947fbd03 100644
--- a/SerialPrograms/Source/PokemonSwSh/Inference/Battles/PokemonSwSh_ExperienceGainDetector.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_ExperienceGainDetector.cpp
@@ -1,18 +1,17 @@
 /*  Experience Gain Detector
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include "Common/Compiler.h"
 #include "Common/Cpp/Containers/FixedLimitVector.tpp"
-#include "CommonFramework/ImageTools/SolidColorTest.h"
 #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Images/SolidColorTest.h"
 #include "PokemonSwSh_ExperienceGainDetector.h"
 
-#include <iostream>
-using std::cout;
-using std::endl;
+//#include <iostream>
+//using std::cout;
+//using std::endl;
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
@@ -43,7 +42,7 @@ void ExperienceGainDetector::make_overlays(VideoOverlaySet& items) const{
         items.add(m_color, item.second);
     }
 }
-bool ExperienceGainDetector::detect(const ImageViewRGB32& screen) const{
+bool ExperienceGainDetector::detect(const ImageViewRGB32& screen){
     if (!m_dialog.detect(screen)){
         return false;
     }
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_ExperienceGainDetector.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_ExperienceGainDetector.h
new file mode 100644
index 0000000000..7fcbca2f98
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_ExperienceGainDetector.h
@@ -0,0 +1,47 @@
+/*  Battle Won Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_BattleWonDetector_H
+#define PokemonAutomation_PokemonSwSh_BattleWonDetector_H
+
+#include "Common/Cpp/Containers/FixedLimitVector.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+#include "CommonTools/VisualDetector.h"
+#include "PokemonSwSh_BattleDialogDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+class ExperienceGainDetector : public StaticScreenDetector{
+public:
+    ~ExperienceGainDetector();
+    ExperienceGainDetector(Color color = COLOR_RED);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    Color m_color;
+    BattleDialogDetector m_dialog;
+    FixedLimitVector<std::pair<ImageFloatBox, ImageFloatBox>> m_rows;
+};
+
+
+class ExperienceGainWatcher : public ExperienceGainDetector, public VisualInferenceCallback{
+public:
+    ExperienceGainWatcher(Color color = COLOR_RED);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override final;
+};
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Inference/Battles/PokemonSwSh_StartBattleDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_StartBattleDetector.cpp
similarity index 85%
rename from SerialPrograms/Source/PokemonSwSh/Inference/Battles/PokemonSwSh_StartBattleDetector.cpp
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_StartBattleDetector.cpp
index cad30be080..23d1f28956 100644
--- a/SerialPrograms/Source/PokemonSwSh/Inference/Battles/PokemonSwSh_StartBattleDetector.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_StartBattleDetector.cpp
@@ -1,18 +1,16 @@
 /*  Start Battle Detector
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
-
-#include "Common/Compiler.h"
 #include "CommonFramework/ImageTypes/ImageViewRGB32.h"
 #include "CommonFramework/ImageTools/ImageStats.h"
 #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
 #include "PokemonSwSh_StartBattleDetector.h"
 
-#include <iostream>
-using std::cout;
-using std::endl;
+//#include <iostream>
+//using std::cout;
+//using std::endl;
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_StartBattleDetector.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_StartBattleDetector.h
new file mode 100644
index 0000000000..49307ac461
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_StartBattleDetector.h
@@ -0,0 +1,42 @@
+/*  Start Battle Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_StartBattleDetector_H
+#define PokemonAutomation_PokemonSwSh_StartBattleDetector_H
+
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+#include "VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleDialogDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+
+class StartBattleWatcher : public VisualInferenceCallback{
+public:
+    StartBattleWatcher(Color color = COLOR_RED);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override final;
+
+private:
+    Color m_color;
+    ImageFloatBox m_screen_box;
+    BattleDialogDetector m_dialog;
+};
+
+
+
+
+
+
+
+}
+}
+}
+#endif
+
diff --git a/SerialPrograms/Source/PokemonSwSh/Inference/Dens/PokemonSwSh_BeamSetter.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Dens/PokemonSwSh_BeamSetter.cpp
similarity index 75%
rename from SerialPrograms/Source/PokemonSwSh/Inference/Dens/PokemonSwSh_BeamSetter.cpp
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Dens/PokemonSwSh_BeamSetter.cpp
index b43efb7a55..4aa83547c1 100644
--- a/SerialPrograms/Source/PokemonSwSh/Inference/Dens/PokemonSwSh_BeamSetter.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Dens/PokemonSwSh_BeamSetter.cpp
@@ -1,41 +1,40 @@
 /*  Beam Setter
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  *
  *      Drop a wishing piece and determine if it is red or purple.
  *
  */
 
-#include "Common/Compiler.h"
 #include "Common/Cpp/PrettyPrint.h"
 #include "CommonFramework/ImageTypes/ImageViewRGB32.h"
 #include "CommonFramework/ImageTools/ImageStats.h"
-#include "CommonFramework/ImageMatch/ImageDiff.h"
+#include "CommonFramework/ImageTools/ImageDiff.h"
+#include "CommonFramework/Tools/StatAccumulator.h"
 #include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "CommonFramework/Inference/ImageTools.h"
-#include "CommonFramework/Inference/InferenceThrottler.h"
-#include "CommonFramework/Inference/StatAccumulator.h"
-#include "CommonFramework/Inference/TimeWindowStatTracker.h"
+#include "CommonTools/InferenceThrottler.h"
+#include "CommonTools/Images/ImageTools.h"
+#include "CommonTools/TrendInference/TimeWindowStatTracker.h"
 #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
 #include "PokemonSwSh_BeamSetter.h"
 
-#include <iostream>
-using std::cout;
-using std::endl;
+//#include <iostream>
+//using std::cout;
+//using std::endl;
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
 namespace PokemonSwSh{
 
 
-BeamSetter::BeamSetter(ProgramEnvironment& /*env*/, ConsoleHandle& console, BotBaseContext& context)
+BeamSetter::BeamSetter(ProgramEnvironment& /*env*/, VideoStream& stream, ProControllerContext& context)
     // : m_env(env)
-    : m_console(console)
+    : m_stream(stream)
     , m_context(context)
-    , m_text_box0(console, {0.400, 0.825, 0.05, 0.05}, COLOR_RED)
-    , m_text_box1(console, {0.250, 0.900, 0.05, 0.05}, COLOR_RED)
-    , m_box(console, {0.10, 0.005, 0.8, 0.470}, COLOR_RED)
+    , m_text_box0(stream.overlay(), {0.400, 0.825, 0.05, 0.05}, COLOR_RED)
+    , m_text_box1(stream.overlay(), {0.250, 0.900, 0.05, 0.05}, COLOR_RED)
+    , m_box(stream.overlay(), {0.10, 0.005, 0.8, 0.470}, COLOR_RED)
 {
     for (size_t c = 0; c < 32; c++){
         m_boxes.emplace_back(0.10 + 0.025*c, 0.005, 0.025, 0.470);
@@ -47,16 +46,16 @@ BeamSetter::BeamSetter(ProgramEnvironment& /*env*/, ConsoleHandle& console, BotB
 
 BeamSetter::Detection BeamSetter::run(
     bool save_screenshot,
-    uint16_t timeout_ticks,
+    Milliseconds timeout,
     double min_brightness,
     double min_euclidean,
     double min_delta_ratio,
     double min_sigma_ratio
 ){
     //  Grab baseline image.
-    VideoSnapshot baseline_image = m_console.video().snapshot();
+    VideoSnapshot baseline_image = m_stream.video().snapshot();
     if (!baseline_image){
-        m_console.log("BeamSetter(): Screenshot failed.", COLOR_PURPLE);
+        m_stream.log("BeamSetter(): Screenshot failed.", COLOR_PURPLE);
         return Detection::NO_DETECTION;
     }
 
@@ -68,7 +67,7 @@ BeamSetter::Detection BeamSetter::run(
     }
 
     //  Drop the wishing piece.
-    pbf_press_button(m_context, BUTTON_A, 10, 10);
+    pbf_press_button(m_context, BUTTON_A, 80ms, 80ms);
     m_context.wait_for_all_requests();
 
     bool low_stddev_flag = false;
@@ -78,17 +77,14 @@ BeamSetter::Detection BeamSetter::run(
         trackers.emplace_back(std::chrono::milliseconds(1000));
     }
 
-    InferenceThrottler throttler(
-        std::chrono::milliseconds((uint64_t)timeout_ticks * 1000 / TICKS_PER_SECOND),
-        std::chrono::milliseconds(50)
-    );
+    InferenceThrottler throttler(timeout, std::chrono::milliseconds(50));
 
     VideoSnapshot last_screenshot = baseline_image;
     do{
         //  Take screenshot.
-        VideoSnapshot current_screenshot = m_console.video().snapshot();
+        VideoSnapshot current_screenshot = m_stream.video().snapshot();
         if (!current_screenshot){
-            m_console.log("BeamSetter(): Screenshot failed.", COLOR_PURPLE);
+            m_stream.log("BeamSetter(): Screenshot failed.", COLOR_PURPLE);
             return Detection::NO_DETECTION;
         }
 
@@ -170,18 +166,18 @@ BeamSetter::Detection BeamSetter::run(
         str += ", sigma = " + tostr_default(best_sigma);
 
         if (purple){
-            m_console.log(str, COLOR_BLUE);
-            m_console.log("BeamReader(): Purple beam found!", COLOR_BLUE);
+            m_stream.log(str, COLOR_BLUE);
+            m_stream.log("BeamReader(): Purple beam found!", COLOR_BLUE);
             if (save_screenshot){
                 current_screenshot->save("PurpleBeam-" + now_to_filestring() + ".png");
             }
             return Detection::PURPLE;
         }else{
-            m_console.log(str, COLOR_PURPLE);
+            m_stream.log(str, COLOR_PURPLE);
         }
 
         if (low_stddev_flag && text_stddev > 100){
-            m_console.log("BeamReader(): No beam detected with text. Resetting.", COLOR_BLUE);
+            m_stream.log("BeamReader(): No beam detected with text. Resetting.", COLOR_BLUE);
             return Detection::RED_ASSUMED;
         }
 
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Dens/PokemonSwSh_BeamSetter.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Dens/PokemonSwSh_BeamSetter.h
new file mode 100644
index 0000000000..fa2bc196c9
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Dens/PokemonSwSh_BeamSetter.h
@@ -0,0 +1,64 @@
+/*  Beam Setter
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *
+ *      Drop a wishing piece and determine if it is red or purple.
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_BeamSetter_H
+#define PokemonAutomation_PokemonSwSh_BeamSetter_H
+
+#include <vector>
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonFramework/Tools/VideoStream.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+
+namespace PokemonAutomation{
+    class ProgramEnvironment;
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+class BeamSetter{
+public:
+    enum Detection{
+        NO_DETECTION,
+        RED_DETECTED,
+        RED_ASSUMED,
+        PURPLE,
+    };
+
+public:
+    BeamSetter(
+        ProgramEnvironment& env,
+        VideoStream& stream, ProControllerContext& context
+    );
+
+    Detection run(
+        bool save_screenshot,
+        Milliseconds timeout,
+        double min_brightness,
+        double min_euclidean,
+        double min_delta_ratio,
+        double min_sigma_ratio
+    );
+
+
+private:
+    VideoStream& m_stream;
+    ProControllerContext& m_context;
+    OverlayBoxScope m_text_box0;
+    OverlayBoxScope m_text_box1;
+    OverlayBoxScope m_box;
+    std::vector<ImageFloatBox> m_boxes;
+};
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Inference/Dens/PokemonSwSh_DenMonReader.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Dens/PokemonSwSh_DenMonReader.cpp
similarity index 86%
rename from SerialPrograms/Source/PokemonSwSh/Inference/Dens/PokemonSwSh_DenMonReader.cpp
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Dens/PokemonSwSh_DenMonReader.cpp
index 9e4f6889e4..58c8e8cd3b 100644
--- a/SerialPrograms/Source/PokemonSwSh/Inference/Dens/PokemonSwSh_DenMonReader.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Dens/PokemonSwSh_DenMonReader.cpp
@@ -1,19 +1,19 @@
 /*  Den Sprite Identifier
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include "CommonFramework/ImageTools/SolidColorTest.h"
-#include "CommonFramework/ImageMatch/FilterToAlpha.h"
-#include "CommonFramework/ImageMatch/ImageCropper.h"
-#include "CommonFramework/ImageMatch/SilhouetteDictionaryMatcher.h"
-#include "PokemonSwSh/Resources/PokemonSwSh_PokemonSprites.h"
+#include "CommonTools/Images/SolidColorTest.h"
+#include "CommonTools/ImageMatch/ImageCropper.h"
+#include "CommonTools/ImageMatch/FilterToAlpha.h"
+#include "CommonTools/ImageMatch/SilhouetteDictionaryMatcher.h"
+#include "VideoGames/PokemonSwSh/Resources/PokemonSwSh_PokemonSprites.h"
 #include "PokemonSwSh_DenMonReader.h"
 
-#include <iostream>
-using std::cout;
-using std::endl;
+//#include <iostream>
+//using std::cout;
+//using std::endl;
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
@@ -119,7 +119,7 @@ DenMonSelectOption::DenMonSelectOption(std::string label)
     : StringSelectOption(
         std::move(label),
         DenMonSelectData::m_database,
-        LockWhileRunning::LOCKED,
+        LockMode::LOCK_WHILE_RUNNING,
         ""
     )
 {}
diff --git a/SerialPrograms/Source/PokemonSwSh/Inference/Dens/PokemonSwSh_DenMonReader.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Dens/PokemonSwSh_DenMonReader.h
similarity index 84%
rename from SerialPrograms/Source/PokemonSwSh/Inference/Dens/PokemonSwSh_DenMonReader.h
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Dens/PokemonSwSh_DenMonReader.h
index 1cf55d68eb..7a12c46831 100644
--- a/SerialPrograms/Source/PokemonSwSh/Inference/Dens/PokemonSwSh_DenMonReader.h
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Dens/PokemonSwSh_DenMonReader.h
@@ -1,6 +1,6 @@
 /*  Den Mon Reader
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -8,9 +8,9 @@
 #define PokemonAutomation_PokemonSwSh_DenMonReader_H
 
 #include <string>
-#include "CommonFramework/ImageMatch/ImageMatchResult.h"
-#include "CommonFramework/Options/StringSelectOption.h"
 #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Options/StringSelectOption.h"
+#include "CommonTools/ImageMatch/ImageMatchResult.h"
 
 namespace PokemonAutomation{
     namespace ImageMatch{
diff --git a/SerialPrograms/Source/PokemonSwSh/Inference/Dens/PokemonSwSh_RaidCatchDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Dens/PokemonSwSh_RaidCatchDetector.cpp
similarity index 76%
rename from SerialPrograms/Source/PokemonSwSh/Inference/Dens/PokemonSwSh_RaidCatchDetector.cpp
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Dens/PokemonSwSh_RaidCatchDetector.cpp
index 349b323bf8..1601fdbc0c 100644
--- a/SerialPrograms/Source/PokemonSwSh/Inference/Dens/PokemonSwSh_RaidCatchDetector.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Dens/PokemonSwSh_RaidCatchDetector.cpp
@@ -1,13 +1,12 @@
 /*  Raid Catch Detector
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include "Common/Compiler.h"
-#include "CommonFramework/ImageTools/SolidColorTest.h"
-#include "CommonFramework/ImageTools/ColorClustering.h"
 #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Images/SolidColorTest.h"
+#include "CommonTools/Images/ColorClustering.h"
 #include "PokemonSwSh_RaidCatchDetector.h"
 
 namespace PokemonAutomation{
@@ -16,8 +15,7 @@ namespace PokemonSwSh{
 
 
 RaidCatchDetector::RaidCatchDetector(VideoOverlay& overlay)
-    : VisualInferenceCallback("RaidCatchDetector")
-    , m_left0 (0.82, 0.85 + 0 * 0.078, 0.01, 0.04)
+    : m_left0 (0.82, 0.85 + 0 * 0.078, 0.01, 0.04)
     , m_right0(0.96, 0.85 + 0 * 0.078, 0.01, 0.04)
 //    , m_left1 (0.82, 0.85 + 1 * 0.078, 0.01, 0.04)
 //    , m_right1(0.96, 0.85 + 1 * 0.078, 0.01, 0.04)
@@ -79,15 +77,6 @@ bool RaidCatchDetector::detect(const ImageViewRGB32& screen){
 
     return true;
 }
-bool RaidCatchDetector::process_frame(const ImageViewRGB32& frame, WallClock timestamp){
-    //  Need 5 consecutive successful detections.
-    if (!detect(frame)){
-        m_trigger_count = 0;
-        return false;
-    }
-    m_trigger_count++;
-    return m_trigger_count >= 5;
-}
 
 
 
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Dens/PokemonSwSh_RaidCatchDetector.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Dens/PokemonSwSh_RaidCatchDetector.h
new file mode 100644
index 0000000000..6a2c6db801
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Dens/PokemonSwSh_RaidCatchDetector.h
@@ -0,0 +1,49 @@
+/*  Raid Catch Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_RaidCatchDetector_H
+#define PokemonAutomation_PokemonSwSh_RaidCatchDetector_H
+
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+#include "CommonTools/VisualDetector.h"
+#include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_SelectionArrowFinder.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+class RaidCatchDetector : public StaticScreenDetector{
+public:
+    RaidCatchDetector(VideoOverlay& overlay);
+
+    virtual bool detect(const ImageViewRGB32& screen) override;
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+
+
+private:
+    ImageFloatBox m_left0;
+    ImageFloatBox m_right0;
+//    ImageFloatBox m_left1;
+//    ImageFloatBox m_right1;
+    ImageFloatBox m_text0;
+    ImageFloatBox m_text1;
+    SelectionArrowFinder m_arrow;
+};
+class RaidCatchWatcher : public DetectorToFinder<RaidCatchDetector>{
+public:
+    RaidCatchWatcher(VideoOverlay& overlay)
+        : DetectorToFinder("RaidCatchWatcher", std::chrono::milliseconds(500), overlay)
+    {}
+};
+
+
+}
+}
+}
+#endif
+
diff --git a/SerialPrograms/Source/PokemonSwSh/Inference/Dens/PokemonSwSh_RaidLobbyReader.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Dens/PokemonSwSh_RaidLobbyReader.cpp
similarity index 95%
rename from SerialPrograms/Source/PokemonSwSh/Inference/Dens/PokemonSwSh_RaidLobbyReader.cpp
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Dens/PokemonSwSh_RaidLobbyReader.cpp
index 75a40550d6..632029452b 100644
--- a/SerialPrograms/Source/PokemonSwSh/Inference/Dens/PokemonSwSh_RaidLobbyReader.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Dens/PokemonSwSh_RaidLobbyReader.cpp
@@ -1,6 +1,6 @@
 /*  Raid Lobby Reader
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  *
  *      Determine if a raid is full and ready to start early.
diff --git a/SerialPrograms/Source/PokemonSwSh/Inference/Dens/PokemonSwSh_RaidLobbyReader.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Dens/PokemonSwSh_RaidLobbyReader.h
similarity index 92%
rename from SerialPrograms/Source/PokemonSwSh/Inference/Dens/PokemonSwSh_RaidLobbyReader.h
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Dens/PokemonSwSh_RaidLobbyReader.h
index ede4e85a9c..59f2f85ad7 100644
--- a/SerialPrograms/Source/PokemonSwSh/Inference/Dens/PokemonSwSh_RaidLobbyReader.h
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Dens/PokemonSwSh_RaidLobbyReader.h
@@ -1,6 +1,6 @@
 /*  Raid Lobby Reader
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  *
  *      Determine if a raid is full and ready to start early.
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_BoxEggDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_BoxEggDetector.cpp
new file mode 100644
index 0000000000..d5af29fbbd
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_BoxEggDetector.cpp
@@ -0,0 +1,113 @@
+/*  Box Egg Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+
+#include "Common/Cpp/Exceptions.h"
+#include "CommonFramework/GlobalAutoPaths.h"
+//#include "CommonFramework/ImageTypes/ImageRGB32.h"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/ImageTools/ImageStats.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/ImageMatch/ImageCropper.h"
+#include "CommonTools/ImageMatch/ExactImageMatcher.h"
+//#include "VideoGames/PokemonSwSh/Resources/PokemonSwSh_PokemonSprites.h"
+#include "PokemonSwSh_BoxEggDetector.h"
+
+// #include <iostream>
+// using std::cout;
+// using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+
+const ImageMatch::ExactImageMatcher& EGG_MATCHER(){
+    static ImageMatch::ExactImageMatcher matcher(RESOURCE_PATH() + "PokemonSwSh/EggTemplate.png");
+    return matcher;
+}
+
+BoxEggDetector::BoxEggDetector(SlotLocation side, uint8_t row, double min_euclidean_distance, Color color)
+: m_min_euclidean_distance_squared(min_euclidean_distance * min_euclidean_distance)
+, m_color(color){
+    if (side == SlotLocation::PARTY){
+        if (row > 5){
+            throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "INVALID party row for BoxEggDetector");
+        }
+        m_box = ImageFloatBox(0.045414, 0.1255 * row + 0.2401, 0.023882, 0.043856);
+    }else if (side == SlotLocation::BOX){
+        if (row > 4){
+            throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "INVALID box row for BoxEggDetector");
+        }
+        m_box = ImageFloatBox(0.270241, 0.1255 * row + 0.2401, 0.023882, 0.049);
+    }else{
+        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "INVALID SlotLocation for BoxEggDetector");
+    }
+}
+
+void BoxEggDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_box);
+}
+
+bool BoxEggDetector::detect(const ImageViewRGB32& screen){
+
+    std::vector<ImageViewRGB32> crops = get_crop_candidates(extract_box_reference(screen, m_box));
+
+    // int i = 0;
+    double rmsd_threshold = 80;
+    for (const ImageViewRGB32& crop : crops){
+        // crop.save("image" + std::to_string(i) + ".png");
+        // i++;
+        double rmsd = EGG_MATCHER().rmsd(crop);
+        // cout << "RMSD: " << std::to_string(rmsd) << endl;
+        if (rmsd < rmsd_threshold){
+            return true;
+        }
+    }
+
+    return false;
+}
+
+auto BoxEggDetector::get_crop_candidates(const ImageViewRGB32& image) const -> std::vector<ImageViewRGB32>{
+    ImageStats border = image_border_stats(image);
+//    cout << border.average << border.stddev << endl;
+//    image.save("image1.png");
+    ImagePixelBox box = ImageMatch::enclosing_rectangle_with_pixel_filter(
+        image,
+        [&](Color pixel){
+//            if (qAlpha(pixel) == 0){
+//                return false;
+//            }
+//            FloatPixel p(pixel);
+//            cout << p << endl;
+            double r = (double)pixel.red() - border.average.r;
+            double g = (double)pixel.green() - border.average.g;
+            double b = (double)pixel.blue() - border.average.b;
+            bool stop = r*r + g*g + b*b >= m_min_euclidean_distance_squared;
+            if (stop){
+//                FloatPixel p(pixel);
+//                cout << p << " : " << r << " " << g << " " << b << endl;
+            }
+            return stop;
+        }
+    );
+    std::vector<ImageViewRGB32> ret;
+    ret.emplace_back(extract_box_reference(image, box));
+    return ret;
+}
+
+
+
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_BoxEggDetector.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_BoxEggDetector.h
new file mode 100644
index 0000000000..bb0b912c57
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_BoxEggDetector.h
@@ -0,0 +1,45 @@
+/*  Box Egg Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_BoxEggDetector_H
+#define PokemonAutomation_PokemonSwSh_BoxEggDetector_H
+
+#include <vector>
+#include "Common/Cpp/Color.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonTools/VisualDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+enum class SlotLocation{
+    PARTY,      // player's party
+    BOX, //  one of the 5 x 6 slots in the box
+};
+
+class BoxEggDetector : public StaticScreenDetector{
+public:
+    BoxEggDetector(SlotLocation side, uint8_t row, double min_euclidean_distance = 100, Color color = COLOR_BLUE);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+    std::vector<ImageViewRGB32> get_crop_candidates(const ImageViewRGB32& image) const;
+
+private:
+    double m_min_euclidean_distance_squared;
+    Color m_color;
+    ImageFloatBox m_box;
+};
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_BoxEmptySlotDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_BoxEmptySlotDetector.cpp
new file mode 100644
index 0000000000..44c91dfc3e
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_BoxEmptySlotDetector.cpp
@@ -0,0 +1,64 @@
+/*  Box Empty Slot Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+
+#include "Common/Cpp/Exceptions.h"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/ImageTools/ImageStats.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "PokemonSwSh_BoxEmptySlotDetector.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+
+
+BoxEmptySlotDetector::BoxEmptySlotDetector(SlotLocation side, uint8_t row, uint8_t column, Color color)
+: m_color(color){
+    if (side == SlotLocation::PARTY){
+        if (row > 5){
+            throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "INVALID party row for BoxEmptySlotDetector");
+        }
+        m_box = ImageFloatBox(0.087527, 0.1255 * row + 0.192607, 0.079869, 0.089494);
+    }else if (side == SlotLocation::BOX){
+        if (row > 4 || column > 5){
+            throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "INVALID box row/column for BoxEmptySlotDetector");
+        }
+        m_box = ImageFloatBox(0.0705 * column + 0.265, 0.1255 * row + 0.260700, 0.043, 0.023346);
+    }else{
+        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "INVALID SlotLocation for BoxEmptySlotDetector");
+    }
+}
+
+void BoxEmptySlotDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_box);
+}
+
+bool BoxEmptySlotDetector::detect(const ImageViewRGB32& screen){
+    ImageStats stats = image_stats(extract_box_reference(screen, m_box));
+
+    const double max_stddev_sum = 50;
+    const double stddev = stats.stddev.sum();
+    // cout << "BoxEmptySlotDetector::detect: stddev sum " << stddev << " vs max " << max_stddev_sum << endl;
+
+    // if the stddev.sum() is low, it's likely an empty slot
+    return stddev <= max_stddev_sum;
+}
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_BoxEmptySlotDetector.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_BoxEmptySlotDetector.h
new file mode 100644
index 0000000000..239ce4c862
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_BoxEmptySlotDetector.h
@@ -0,0 +1,41 @@
+/*  Box Empty Slot Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_BoxEmptySlotDetector_H
+#define PokemonAutomation_PokemonSwSh_BoxEmptySlotDetector_H
+
+#include "Common/Cpp/Color.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonTools/VisualDetector.h"
+#include "PokemonSwSh_BoxEggDetector.h"
+// #include "CommonTools/ImageMatch/ExactImageDictionaryMatcher.h"
+// #include "CommonTools/ImageMatch/CroppedImageDictionaryMatcher.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+// Determine if given slot is empty
+
+class BoxEmptySlotDetector : public StaticScreenDetector{
+public:
+    BoxEmptySlotDetector(SlotLocation side, uint8_t row, uint8_t column, Color color = COLOR_BLUE);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+
+private:
+    Color m_color;
+    ImageFloatBox m_box;
+};
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_BoxGenderDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_BoxGenderDetector.cpp
new file mode 100644
index 0000000000..8c20af7fdf
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_BoxGenderDetector.cpp
@@ -0,0 +1,87 @@
+/*  IV Checker Reader
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "CommonFramework/ImageTypes/ImageRGB32.h"
+#include "Tests/ImageUnitTest.h"
+#include "PokemonSwSh_BoxGenderDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+using namespace Pokemon;
+
+
+BoxGenderDetector::BoxGenderDetector(Color color)
+    : Pokemon::BoxGenderDetector({0.720, 0.028, 0.229, 0.056}, 0.01f, color)
+{}
+
+
+
+
+
+
+
+class Test_BoxGenderDetector : public ImageUnitTest{
+public:
+    Test_BoxGenderDetector(
+        const std::string& image,
+        StatsHuntGenderFilter expected
+    )
+        : ImageUnitTest("PokemonSwSh::BoxGenderDetector - " + image, {image})
+        , m_expected(expected)
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        BoxGenderDetector detector;
+        const ImageRGB32& image = images[0];
+        return detector.detect(image) == m_expected;
+    };
+
+private:
+    StatsHuntGenderFilter m_expected;
+};
+
+
+
+
+
+
+
+
+void add_tests_BoxGenderDetector(UnitTestDatabase& database){
+    database.add<Test_BoxGenderDetector>("PokemonSwSh/BoxGenderDetector/macOS_bright/Female_2.png", StatsHuntGenderFilter::Female);
+    database.add<Test_BoxGenderDetector>("PokemonSwSh/BoxGenderDetector/macOS_bright/Genderless_3.png", StatsHuntGenderFilter::Genderless);
+    database.add<Test_BoxGenderDetector>("PokemonSwSh/BoxGenderDetector/macOS_bright/Male_1.png", StatsHuntGenderFilter::Male);
+    database.add<Test_BoxGenderDetector>("PokemonSwSh/BoxGenderDetector/Switch/Centiskorch_2.jpg", StatsHuntGenderFilter::Female);
+    database.add<Test_BoxGenderDetector>("PokemonSwSh/BoxGenderDetector/Switch/Claydol_3.jpg", StatsHuntGenderFilter::Genderless);
+    database.add<Test_BoxGenderDetector>("PokemonSwSh/BoxGenderDetector/Switch/Nuzleaf_1.jpg", StatsHuntGenderFilter::Male);
+    database.add<Test_BoxGenderDetector>("PokemonSwSh/BoxGenderDetector/WinMyPin/Gardevoir_2.png", StatsHuntGenderFilter::Female);
+    database.add<Test_BoxGenderDetector>("PokemonSwSh/BoxGenderDetector/WinNoNameBrand/Gardevoir_2.png", StatsHuntGenderFilter::Female);
+    database.add<Test_BoxGenderDetector>("PokemonSwSh/BoxGenderDetector/WinNoNameBrand/Thwackey_1.png", StatsHuntGenderFilter::Male);
+    database.add<Test_BoxGenderDetector>("PokemonSwSh/BoxGenderDetector/WinNoNameBrand/Urshifu_1.png", StatsHuntGenderFilter::Male);
+    database.add<Test_BoxGenderDetector>("PokemonSwSh/BoxGenderDetector/WinNoNameBrand/Zigzagoon_2.png", StatsHuntGenderFilter::Female);
+}
+
+
+
+
+
+
+
+
+
+
+
+
+}
+}
+}
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_BoxGenderDetector.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_BoxGenderDetector.h
new file mode 100644
index 0000000000..d8ce39846b
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_BoxGenderDetector.h
@@ -0,0 +1,35 @@
+/*  Box Gender Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_BoxGenderDetector_H
+#define PokemonAutomation_PokemonSwSh_BoxGenderDetector_H
+
+#include "Common/Cpp/TestRunners/UnitTest.h"
+#include "Pokemon/Inference/Pokemon_BoxGenderDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+class BoxGenderDetector : public Pokemon::BoxGenderDetector{
+
+public:
+    BoxGenderDetector(Color color = COLOR_RED);
+
+};
+
+
+
+
+void add_tests_BoxGenderDetector(UnitTestDatabase& database);
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_BoxNatureDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_BoxNatureDetector.cpp
similarity index 84%
rename from SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_BoxNatureDetector.cpp
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_BoxNatureDetector.cpp
index 7322311410..ee4ac85adf 100644
--- a/SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_BoxNatureDetector.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_BoxNatureDetector.cpp
@@ -1,84 +1,82 @@
-/*  IV Checker Reader
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Cpp/Color.h"
-#include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "CommonFramework/ImageTools/ImageFilter.h"
-#include "CommonFramework/ImageTypes/ImageRGB32.h"
-#include "CommonFramework/ImageTools/ImageStats.h"
-#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
-#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
-#include "PokemonSwSh_BoxNatureDetector.h"
-
-//#include <iostream>
-//using std::cout;
-//using std::endl;
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-
-BoxNatureDetector::BoxNatureDetector(VideoOverlay& overlay)
-    : m_box_atk(overlay, { 0.689, 0.198 + 1 * 0.0515, 0.084, 0.047})
-    , m_box_def(overlay, { 0.689, 0.198 + 2 * 0.0515, 0.084, 0.047})
-    , m_box_spatk(overlay, { 0.689, 0.198 + 3 * 0.0515, 0.084, 0.047})
-    , m_box_spdef(overlay, { 0.689, 0.198 + 4 * 0.0515, 0.084, 0.047})
-    , m_box_spd(overlay, { 0.689, 0.198 + 5 * 0.0515, 0.084, 0.047})
-{}
-
-NaturePlusMinus BoxNatureDetector::read(Logger& logger, const ImageViewRGB32& frame, const ImageFloatBox& box){
-    const bool replace_color_within_range = true;
-
-    //Filter out background - white/gray
-    ImageRGB32 filtered_region = filter_rgb32_range(
-        extract_box_reference(frame, box),
-        combine_rgb(215, 215, 215), combine_rgb(255, 255, 255), Color(0), replace_color_within_range
-    );
-    ImageStats stats = image_stats(filtered_region);
-
-    //filtered_region.save("./filtered_only.png");
-    //cout << stats.average.r << endl;
-    //cout << stats.average.g << endl;
-    //cout << stats.average.b << endl;
-
-    if (stats.average.b > stats.average.r + 50) {
-        return NaturePlusMinus::MINUS;
-    } else if (stats.average.r > stats.average.b + 50) {
-        return NaturePlusMinus::PLUS;
-    }
-    return NaturePlusMinus::NEUTRAL;
-}
-
-NatureReader::Results BoxNatureDetector::read(Logger& logger, const ImageViewRGB32& frame){
-    NatureReader::Results results;
-    NaturePlusMinus stats[5];
-    int statPlus = -1;
-    int statMinus = -1;
-
-    stats[0] = read(logger, frame, m_box_atk);
-    stats[1] = read(logger, frame, m_box_def);
-    stats[2] = read(logger, frame, m_box_spatk);
-    stats[3] = read(logger, frame, m_box_spdef);
-    stats[4] = read(logger, frame, m_box_spd);
-
-    for (int i = 0; i < 5; i++) {
-        if (stats[i] == NaturePlusMinus::PLUS) {
-            statPlus = i;
-        }
-        else if (stats[i] == NaturePlusMinus::MINUS) {
-            statMinus = i;
-        }
-    }
-
-    results.nature = NatureCheckerValue_helphinder_to_enum(std::make_pair(statPlus, statMinus));
-    return results;
-}
-
-
-}
-}
-}
-
+/*  IV Checker Reader
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Color.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/ImageTypes/ImageRGB32.h"
+#include "CommonFramework/ImageTools/ImageStats.h"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonTools/Images/ImageFilter.h"
+#include "PokemonSwSh_BoxNatureDetector.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+BoxNatureDetector::BoxNatureDetector(VideoOverlay& overlay)
+    : m_box_atk(overlay, { 0.689, 0.198 + 1 * 0.0515, 0.084, 0.047})
+    , m_box_def(overlay, { 0.689, 0.198 + 2 * 0.0515, 0.084, 0.047})
+    , m_box_spatk(overlay, { 0.689, 0.198 + 3 * 0.0515, 0.084, 0.047})
+    , m_box_spdef(overlay, { 0.689, 0.198 + 4 * 0.0515, 0.084, 0.047})
+    , m_box_spd(overlay, { 0.689, 0.198 + 5 * 0.0515, 0.084, 0.047})
+{}
+
+NaturePlusMinus BoxNatureDetector::read(Logger& logger, const ImageViewRGB32& frame, const ImageFloatBox& box){
+    const bool replace_color_within_range = true;
+
+    //Filter out background - white/gray
+    ImageRGB32 filtered_region = filter_rgb32_range(
+        extract_box_reference(frame, box),
+        combine_rgb(215, 215, 215), combine_rgb(255, 255, 255), Color(0), replace_color_within_range
+    );
+    ImageStats stats = image_stats(filtered_region);
+
+    //filtered_region.save("./filtered_only.png");
+    //cout << stats.average.r << endl;
+    //cout << stats.average.g << endl;
+    //cout << stats.average.b << endl;
+
+    if (stats.average.b > stats.average.r + 50){
+        return NaturePlusMinus::MINUS;
+    }else if (stats.average.r > stats.average.b + 50){
+        return NaturePlusMinus::PLUS;
+    }
+    return NaturePlusMinus::NEUTRAL;
+}
+
+NatureReader::Results BoxNatureDetector::read(Logger& logger, const ImageViewRGB32& frame){
+    NatureReader::Results results;
+    NaturePlusMinus stats[5];
+    int statPlus = -1;
+    int statMinus = -1;
+
+    stats[0] = read(logger, frame, m_box_atk);
+    stats[1] = read(logger, frame, m_box_def);
+    stats[2] = read(logger, frame, m_box_spatk);
+    stats[3] = read(logger, frame, m_box_spdef);
+    stats[4] = read(logger, frame, m_box_spd);
+
+    for (int i = 0; i < 5; i++){
+        if (stats[i] == NaturePlusMinus::PLUS){
+            statPlus = i;
+        }else if (stats[i] == NaturePlusMinus::MINUS){
+            statMinus = i;
+        }
+    }
+
+    results.nature = NatureCheckerValue_helphinder_to_enum(std::make_pair(statPlus, statMinus));
+    return results;
+}
+
+
+}
+}
+}
+
diff --git a/SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_BoxNatureDetector.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_BoxNatureDetector.h
similarity index 87%
rename from SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_BoxNatureDetector.h
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_BoxNatureDetector.h
index 78341d3625..889ddc8350 100644
--- a/SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_BoxNatureDetector.h
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_BoxNatureDetector.h
@@ -1,46 +1,46 @@
-/*  IV Checker Reader
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_PokemonSwSh_BoxNatureDetector_H
-#define PokemonAutomation_PokemonSwSh_BoxNatureDetector_H
-
-#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
-#include "Pokemon/Inference/Pokemon_NatureReader.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace PokemonSwSh{
-using namespace Pokemon;
-
-enum class NaturePlusMinus{
-    NEUTRAL = 0,
-    PLUS,
-    MINUS,
-};
-
-class BoxNatureDetector {
-public:
-    BoxNatureDetector(VideoOverlay& overlay);
-
-    NatureReader::Results read(Logger& logger, const ImageViewRGB32& frame);
-
-private:
-    NaturePlusMinus read(Logger& logger, const ImageViewRGB32& frame, const ImageFloatBox& box);
-
-private:
-    OverlayBoxScope m_box_atk;
-    OverlayBoxScope m_box_def;
-    OverlayBoxScope m_box_spatk;
-    OverlayBoxScope m_box_spdef;
-    OverlayBoxScope m_box_spd;
-};
-
-
-
-}
-}
-}
-#endif
+/*  IV Checker Reader
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_BoxNatureDetector_H
+#define PokemonAutomation_PokemonSwSh_BoxNatureDetector_H
+
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "Pokemon/Inference/Pokemon_NatureReader.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+using namespace Pokemon;
+
+enum class NaturePlusMinus{
+    NEUTRAL = 0,
+    PLUS,
+    MINUS,
+};
+
+class BoxNatureDetector{
+public:
+    BoxNatureDetector(VideoOverlay& overlay);
+
+    NatureReader::Results read(Logger& logger, const ImageViewRGB32& frame);
+
+private:
+    NaturePlusMinus read(Logger& logger, const ImageViewRGB32& frame, const ImageFloatBox& box);
+
+private:
+    OverlayBoxScope m_box_atk;
+    OverlayBoxScope m_box_def;
+    OverlayBoxScope m_box_spatk;
+    OverlayBoxScope m_box_spdef;
+    OverlayBoxScope m_box_spd;
+};
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_BoxShinySymbolDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_BoxShinySymbolDetector.cpp
new file mode 100644
index 0000000000..0ac3d9c045
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_BoxShinySymbolDetector.cpp
@@ -0,0 +1,93 @@
+/*  Box Shiny Symbol Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *
+ *
+ */
+
+#include <iostream>
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "CommonFramework/StaticGlobals.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/ImageTools/ImageStats.h"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "Tests/ImageUnitTest.h"
+#include "PokemonSwSh_BoxShinySymbolDetector.h"
+
+using std::cout;
+using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+void BoxShinySymbolDetector::make_overlays(VideoOverlaySet& items){
+    items.add(COLOR_RED, m_box);
+}
+
+bool BoxShinySymbolDetector::detect(const ImageViewRGB32& screen){
+    const ImageStats symbol = image_stats(extract_box_reference(screen, m_box));
+    if (STATIC_GLOBALS.COLOR_CHECK){
+        cout << "Symbol region stddev " << symbol.stddev.to_string() << " (sum " << symbol.stddev.sum() << "), threshold: 50" << endl;
+    }
+    return symbol.stddev.sum() > 50;
+}
+
+
+
+
+
+class Test_BoxShinySymbolDetector : public ImageUnitTest{
+public:
+    Test_BoxShinySymbolDetector(
+        const std::string& image,
+        bool expected
+    )
+        : ImageUnitTest("PokemonSwSh::BoxShinySymbolDetector - " + image, {image})
+        , m_expected(expected)
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        BoxShinySymbolDetector detector;
+        const ImageRGB32& image = images[0];
+        return detector.detect(image) == m_expected;
+    };
+
+private:
+    bool m_expected;
+};
+
+
+
+
+void add_tests_BoxShinySymbolDetector(UnitTestDatabase& database){
+    database.add<Test_BoxShinySymbolDetector>("PokemonSwSh/BoxShinySymbolDetector/macOS_bright/Drifblim_Jpn_False.jpg", false);
+    database.add<Test_BoxShinySymbolDetector>("PokemonSwSh/BoxShinySymbolDetector/macOS_bright/Nuzleaf_True.jpg", true);
+    database.add<Test_BoxShinySymbolDetector>("PokemonSwSh/BoxShinySymbolDetector/Switch/Centiskorch_False.jpg", false);
+    database.add<Test_BoxShinySymbolDetector>("PokemonSwSh/BoxShinySymbolDetector/Switch/Claydol_False.jpg", false);
+    database.add<Test_BoxShinySymbolDetector>("PokemonSwSh/BoxShinySymbolDetector/Switch/Nuzleaf_True.jpg", true);
+    database.add<Test_BoxShinySymbolDetector>("PokemonSwSh/BoxShinySymbolDetector/WinMyPin/Gardevoir_False.png", false);
+    database.add<Test_BoxShinySymbolDetector>("PokemonSwSh/BoxShinySymbolDetector/WinMyPin/Lilligant_True.png", true);
+    database.add<Test_BoxShinySymbolDetector>("PokemonSwSh/BoxShinySymbolDetector/WinNoNameBrand/Gardevoir_True.png", true);
+    database.add<Test_BoxShinySymbolDetector>("PokemonSwSh/BoxShinySymbolDetector/WinNoNameBrand/Urshifu_False.png", false);
+    database.add<Test_BoxShinySymbolDetector>("PokemonSwSh/BoxShinySymbolDetector/WinNoNameBrand/Zigzagoon_False.png", false);
+}
+
+
+
+
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_BoxShinySymbolDetector.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_BoxShinySymbolDetector.h
new file mode 100644
index 0000000000..fb729b9668
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_BoxShinySymbolDetector.h
@@ -0,0 +1,50 @@
+/*  Box Shiny Symbol Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *
+ *  Check shiny symbol when viewing pokemon in a storage box.
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_BoxShinySymbolDetector_H
+#define PokemonAutomation_PokemonSwSh_BoxShinySymbolDetector_H
+
+#include "Common/Cpp/TestRunners/UnitTest.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+
+namespace PokemonAutomation{
+
+class ImageViewRGB32;
+class VideoOverlaySet;
+
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+class BoxShinySymbolDetector{
+public:
+    BoxShinySymbolDetector()
+        : m_box(0.969, 0.145, 0.024, 0.040)
+    {}
+
+    void make_overlays(VideoOverlaySet& items);
+    bool detect(const ImageViewRGB32& screen);
+
+private:
+    ImageFloatBox m_box;
+};
+
+
+
+
+void add_tests_BoxShinySymbolDetector(UnitTestDatabase& database);
+
+
+
+}
+}
+}
+
+#endif
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_DialogBoxDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_DialogBoxDetector.cpp
new file mode 100644
index 0000000000..5894dcf69d
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_DialogBoxDetector.cpp
@@ -0,0 +1,175 @@
+/*  Dialog Triangle Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <array>
+
+#include "Common/Cpp/Color.h"
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Images/SolidColorTest.h"
+#include "Tests/ImageUnitTest.h"
+#include "PokemonSwSh_DialogBoxDetector.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+namespace{
+    // This box covers all possible locations of the black triangle arrow
+    std::array<ImageFloatBox, 4> BLACK_BOXES{{
+        {0.254, 0.806, 0.012, 0.052},
+        {0.730, 0.806, 0.016, 0.068},
+        {0.741, 0.880, 0.005, 0.055},
+        {0.710, 0.880, 0.007, 0.055},
+    }};
+}
+
+
+BlackDialogBoxDetector::BlackDialogBoxDetector(
+    bool stop_on_detected
+)
+    : VisualInferenceCallback("BlackDialogBoxDetector")
+    , m_stop_on_detected(stop_on_detected)
+{}
+
+
+void BlackDialogBoxDetector::make_overlays(VideoOverlaySet& items) const{
+    for (const auto& box : BLACK_BOXES){
+        items.add(COLOR_RED, box);
+    }
+}
+
+
+bool BlackDialogBoxDetector::process_frame(const ImageViewRGB32& frame, WallClock timestamp){
+    bool detected = true;
+    for (const auto& box : BLACK_BOXES){
+        if (is_black(extract_box_reference(frame, box), 200, 35) == false){
+            detected = false;
+            break;
+        }
+    }
+
+    m_detected.store(detected, std::memory_order_release);
+
+    return detected && m_stop_on_detected;
+}
+
+BlackDialogBoxDetector2::BlackDialogBoxDetector2(Color color)
+    : m_color(color)
+    , m_bottom(0.184009, 0.955, 0.552, 0.013)
+    , m_left(0.175246, 0.807018, 0.019715, 0.064327)
+    , m_right(0.808324, 0.810916, 0.014239, 0.146199)
+{}
+void BlackDialogBoxDetector2::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_bottom);
+    items.add(m_color, m_left);
+    items.add(m_color, m_right);
+}
+
+bool BlackDialogBoxDetector2::detect(const ImageViewRGB32& screen){
+    return is_grey(extract_box_reference(screen, m_bottom), 50, 300)
+            && is_black(extract_box_reference(screen, m_left), 200, 50)
+            && is_black(extract_box_reference(screen, m_right), 200, 50);
+}
+
+
+
+
+WhiteDialogBoxDetector::WhiteDialogBoxDetector(Color color)
+    : m_color(color)
+    , m_right(0.782, 0.850, 0.030, 0.050)
+    , m_triangle(color)
+{}
+
+void WhiteDialogBoxDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_right);
+    m_triangle.make_overlays(items);
+}
+bool WhiteDialogBoxDetector::detect(const ImageViewRGB32& screen){
+    ImageStats right = image_stats(extract_box_reference(screen, m_right));
+    if (!is_grey(right, 400, 1000)){
+        return false;
+    }
+
+    if (!m_triangle.detect(screen)){
+        return false;
+    }
+
+    return true;
+}
+
+
+
+
+
+
+
+class Test_BlackDialogBoxDetector : public ImageUnitTest{
+public:
+    Test_BlackDialogBoxDetector(
+        const std::string& image,
+        bool expected
+    )
+        : ImageUnitTest("PokemonSwSh::BlackDialogBoxDetector - " + image, {image})
+        , m_expected(expected)
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        BlackDialogBoxDetector detector(true);
+        const ImageRGB32& image = images[0];
+        return detector.process_frame(image, current_time()) == m_expected;
+    };
+
+private:
+    bool m_expected;
+};
+
+class Test_BlackDialogBoxDetector2 : public ImageUnitTest{
+public:
+    Test_BlackDialogBoxDetector2(
+        const std::string& image,
+        bool expected
+    )
+        : ImageUnitTest("PokemonSwSh::BlackDialogBoxDetector2 - " + image, {image})
+        , m_expected(expected)
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        BlackDialogBoxDetector2 detector;
+        const ImageRGB32& image = images[0];
+        return detector.detect(image) == m_expected;
+    };
+
+private:
+    bool m_expected;
+};
+
+
+void add_tests_DialogBoxDetector(UnitTestDatabase& database){
+    database.add<Test_BlackDialogBoxDetector2>("PokemonSwSh/BlackDialogBoxDetector2/black-dialog-2-1.png", true);
+    database.add<Test_BlackDialogBoxDetector2>("PokemonSwSh/BlackDialogBoxDetector2/black-dialog-2-2.jpg", true);
+    database.add<Test_BlackDialogBoxDetector2>("PokemonSwSh/BlackDialogBoxDetector2/black-dialog-2-3.jpg", true);
+
+}
+
+
+
+}
+}
+}
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_DialogBoxDetector.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_DialogBoxDetector.h
new file mode 100644
index 0000000000..bf25ec8c52
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_DialogBoxDetector.h
@@ -0,0 +1,93 @@
+/*  Dialog Box Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_DialogBoxDetector_H
+#define PokemonAutomation_PokemonSwSh_DialogBoxDetector_H
+
+#include <atomic>
+#include "Common/Cpp/Color.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonTools/VisualDetector.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+#include "PokemonSwSh_DialogTriangleDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+// Detect the black dialog box. It is used in places like releasing pokemon in box storage.
+class BlackDialogBoxDetector : public VisualInferenceCallback{
+public:
+    BlackDialogBoxDetector(bool stop_on_detected);
+
+    bool detected() const{
+        return m_detected.load(std::memory_order_acquire);
+    }
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override;
+
+private:
+    bool m_stop_on_detected;
+
+    std::atomic<bool> m_detected;
+};
+
+// Detect the bigger black dialog box. It is used in places such as egg hatching detection
+class BlackDialogBoxDetector2 : public StaticScreenDetector{
+public:
+    BlackDialogBoxDetector2(Color color = COLOR_RED);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+
+protected:
+    Color m_color;
+    ImageFloatBox m_bottom;
+    ImageFloatBox m_left;
+    ImageFloatBox m_right;
+};
+class BlackDialogBoxWatcher2 : public DetectorToFinder<BlackDialogBoxDetector2>{
+public:
+    BlackDialogBoxWatcher2(Color color = COLOR_RED)
+         : DetectorToFinder("BlackDialogBoxWatcher2", std::chrono::milliseconds(250), color)
+    {}
+};
+
+
+class WhiteDialogBoxDetector : public StaticScreenDetector{
+public:
+    WhiteDialogBoxDetector(Color color = COLOR_RED);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    Color m_color;
+    ImageFloatBox m_right;
+    DialogTriangleDetector m_triangle;
+};
+class WhiteDialogBoxWatcher : public DetectorToFinder<WhiteDialogBoxDetector>{
+public:
+    WhiteDialogBoxWatcher(Color color = COLOR_RED)
+         : DetectorToFinder("WhiteDialogBoxWatcher", std::chrono::milliseconds(250), color)
+    {}
+};
+
+
+
+
+
+void add_tests_DialogBoxDetector(UnitTestDatabase& database);
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_DialogTriangleDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_DialogTriangleDetector.cpp
new file mode 100644
index 0000000000..88ff1f52e5
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_DialogTriangleDetector.cpp
@@ -0,0 +1,130 @@
+/*  Dialog Triangle Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <stdint.h>
+#include "Common/Cpp/Color.h"
+#include "Common/Cpp/Logging/AbstractLogger.h"
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "Kernels/Waterfill/Kernels_Waterfill_Types.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Images/WaterfillUtilities.h"
+#include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h"
+#include "Tests/ImageUnitTest.h"
+#include "PokemonSwSh_DialogTriangleDetector.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+
+
+class DialogTriangleMatcher : public ImageMatch::WaterfillTemplateMatcher{
+public:
+    DialogTriangleMatcher();
+    static const DialogTriangleMatcher& instance();
+};
+
+
+DialogTriangleMatcher::DialogTriangleMatcher()
+    : WaterfillTemplateMatcher(
+        "PokemonSwSh/DialogBlackTriangle.png",
+        Color(0,0,0), Color(30, 30, 30), 50
+    )
+{
+    m_aspect_ratio_lower = 0.9;
+    m_aspect_ratio_upper = 1.1;
+    m_area_ratio_lower = 0.9;
+    m_area_ratio_upper = 1.1;
+}
+
+const DialogTriangleMatcher& DialogTriangleMatcher::instance(){
+    static DialogTriangleMatcher matcher;
+    return matcher;
+}
+
+
+
+
+DialogTriangleDetector::DialogTriangleDetector(
+    Color color,
+    ImageFloatBox box
+)
+    : m_color(color)
+    , m_box(box)
+{}
+
+void DialogTriangleDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_box);
+}
+bool DialogTriangleDetector::detect(const ImageViewRGB32& screen){
+    const std::vector<std::pair<uint32_t, uint32_t>> filters = {
+        {combine_rgb(0, 0, 0), combine_rgb(50, 50, 50)}
+    };
+
+    const double screen_rel_size = (screen.height() / 1080.0);
+    const size_t min_size = size_t(screen_rel_size * screen_rel_size * 500.0);
+
+    return match_template_by_waterfill(
+        screen.size(),
+        extract_box_reference(screen, m_box),
+        DialogTriangleMatcher::instance(),
+        filters,
+        {min_size, SIZE_MAX},
+        80,
+        [](Kernels::Waterfill::WaterfillObject& object) -> bool { return true; }
+    );
+}
+
+
+
+
+
+
+
+
+class Test_DialogTriangleDetector : public ImageUnitTest{
+public:
+    Test_DialogTriangleDetector(
+        const std::string& image,
+        bool expected
+    )
+        : ImageUnitTest("PokemonSwSh::DialogTriangleDetector - " + image, {image})
+        , m_expected(expected)
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        DialogTriangleDetector detector(COLOR_RED);
+        const ImageRGB32& image = images[0];
+        return detector.detect(image) == m_expected;
+    };
+
+private:
+    bool m_expected;
+};
+
+
+void add_tests_DialogTriangleDetector(UnitTestDatabase& database){
+
+}
+
+
+
+
+
+
+
+}
+}
+}
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_DialogTriangleDetector.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_DialogTriangleDetector.h
new file mode 100644
index 0000000000..2a747608db
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_DialogTriangleDetector.h
@@ -0,0 +1,54 @@
+/*  Dialog Triangle Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_DialogTriangleDetector_H
+#define PokemonAutomation_PokemonSwSh_DialogTriangleDetector_H
+
+#include "Common/Cpp/Color.h"
+#include "Common/Cpp/TestRunners/UnitTest.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonTools/VisualDetector.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+// Detect the black triangle arrow in the lower right portion of the white dialog box.
+// The dialog box shows up when talking to npcs.
+class DialogTriangleDetector : public StaticScreenDetector{
+public:
+    DialogTriangleDetector(
+        Color color,
+        ImageFloatBox box = {0.771, 0.901, 0.031, 0.069}
+    );
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    Color m_color;
+    ImageFloatBox m_box;
+};
+class DialogTriangleWatcher : public DetectorToFinder<DialogTriangleDetector>{
+public:
+    DialogTriangleWatcher(Color color = COLOR_RED)
+         : DetectorToFinder("DialogTriangleWatcher", std::chrono::milliseconds(250), color)
+    {}
+};
+
+
+
+
+void add_tests_DialogTriangleDetector(UnitTestDatabase& database);
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_FishingDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_FishingDetector.cpp
similarity index 90%
rename from SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_FishingDetector.cpp
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_FishingDetector.cpp
index 6a743aa147..c62f1a85bb 100644
--- a/SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_FishingDetector.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_FishingDetector.cpp
@@ -1,11 +1,11 @@
 /*  Fishing Detector
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include "CommonFramework/ImageTools/SolidColorTest.h"
 #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Images/SolidColorTest.h"
 #include "PokemonSwSh_MarkFinder.h"
 #include "PokemonSwSh_FishingDetector.h"
 
diff --git a/SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_FishingDetector.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_FishingDetector.h
similarity index 84%
rename from SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_FishingDetector.h
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_FishingDetector.h
index e49995887a..f5318f8473 100644
--- a/SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_FishingDetector.h
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_FishingDetector.h
@@ -1,15 +1,14 @@
 /*  Fishing Detector
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifndef PokemonAutomation_PokemonSwSh_FishingDetector_H
 #define PokemonAutomation_PokemonSwSh_FishingDetector_H
 
-#include <chrono>
 #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
-#include "CommonFramework/InferenceInfra/VisualInferenceCallback.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
 
 namespace PokemonAutomation{
     class VideoOverlay;
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_IvJudgeReader.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_IvJudgeReader.cpp
new file mode 100644
index 0000000000..ca7b4d0219
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_IvJudgeReader.cpp
@@ -0,0 +1,77 @@
+/*  IV Judge Reader
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "PokemonSwSh_IvJudgeReader.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+const IvJudgeReader& IV_READER(){
+    const static Pokemon::IvJudgeReader reader("PokemonSwSh/IVCheckerOCR.json");
+    return reader;
+}
+
+
+
+
+IvJudgeReaderScope::IvJudgeReaderScope(VideoOverlay& overlay, Language language)
+    : m_language(language)
+    , m_box0(overlay, {0.777, 0.198 + 0 * 0.0515, 0.2, 0.0515})
+    , m_box1(overlay, {0.777, 0.198 + 1 * 0.0515, 0.2, 0.0515})
+    , m_box2(overlay, {0.777, 0.198 + 2 * 0.0515, 0.2, 0.0515})
+    , m_box3(overlay, {0.777, 0.198 + 3 * 0.0515, 0.2, 0.0515})
+    , m_box4(overlay, {0.777, 0.198 + 4 * 0.0515, 0.2, 0.0515})
+    , m_box5(overlay, {0.777, 0.198 + 5 * 0.0515, 0.2, 0.0515})
+{}
+
+
+
+
+IvJudgeValue IvJudgeReaderScope::read(Logger& logger, const ImageViewRGB32& frame, const OverlayBoxScope& box){
+    ImageViewRGB32 image = extract_box_reference(frame, box);
+    OCR::StringMatchResult result = IV_READER().read_substring(
+        logger, m_language, image,
+        OCR::BLACK_TEXT_FILTERS()
+    );
+    result.clear_beyond_log10p(IvJudgeReader::MAX_LOG10P);
+    if (result.results.size() != 1){
+        return IvJudgeValue::UnableToDetect;
+    }
+    return IV_JUDGE_VALUE_STRINGS().get_enum(result.results.begin()->second.token);
+}
+IvJudgeReader::Results IvJudgeReaderScope::read(Logger& logger, const ImageViewRGB32& frame){
+    IvJudgeReader::Results results;
+    if (m_language != Language::None){
+        results.hp      = read(logger, frame, m_box0);
+        results.attack  = read(logger, frame, m_box1);
+        results.defense = read(logger, frame, m_box2);
+        results.spatk   = read(logger, frame, m_box3);
+        results.spdef   = read(logger, frame, m_box4);
+        results.speed   = read(logger, frame, m_box5);
+    }
+    return results;
+}
+
+std::vector<ImageViewRGB32> IvJudgeReaderScope::dump_images(const ImageViewRGB32& frame){
+    std::vector<ImageViewRGB32> images;
+    images.emplace_back(extract_box_reference(frame, m_box0));
+    images.emplace_back(extract_box_reference(frame, m_box1));
+    images.emplace_back(extract_box_reference(frame, m_box2));
+    images.emplace_back(extract_box_reference(frame, m_box3));
+    images.emplace_back(extract_box_reference(frame, m_box4));
+    images.emplace_back(extract_box_reference(frame, m_box5));
+    return images;
+}
+
+
+
+}
+}
+}
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_IvJudgeReader.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_IvJudgeReader.h
new file mode 100644
index 0000000000..224d4fc82d
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_IvJudgeReader.h
@@ -0,0 +1,48 @@
+/*  IV Judge Reader
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_IvJudgeReader_H
+#define PokemonAutomation_PokemonSwSh_IvJudgeReader_H
+
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "Pokemon/Inference/Pokemon_IvJudgeReader.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+using namespace Pokemon;
+
+
+const IvJudgeReader& IV_READER();
+
+
+class IvJudgeReaderScope{
+public:
+    IvJudgeReaderScope(VideoOverlay& overlay, Language language);
+    
+    IvJudgeReader::Results read(Logger& logger, const ImageViewRGB32& frame);
+
+    std::vector<ImageViewRGB32> dump_images(const ImageViewRGB32& frame);
+
+private:
+    IvJudgeValue read(Logger& logger, const ImageViewRGB32& frame, const OverlayBoxScope& box);
+
+private:
+    Language m_language;
+    OverlayBoxScope m_box0;
+    OverlayBoxScope m_box1;
+    OverlayBoxScope m_box2;
+    OverlayBoxScope m_box3;
+    OverlayBoxScope m_box4;
+    OverlayBoxScope m_box5;
+};
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_MainMenuDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_MainMenuDetector.cpp
new file mode 100644
index 0000000000..c442b80570
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_MainMenuDetector.cpp
@@ -0,0 +1,178 @@
+/*  Main Menu Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Images/SolidColorTest.h"
+#include "Tests/ImageUnitTest.h"
+#include "PokemonSwSh_MainMenuDetector.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+MainMenuDetector::MainMenuDetector(Color color)
+    : m_color(color)
+    , m_top_red(0.302449, 0.028409, 0.630458, 0.060606)
+    , m_top_left(0.015974, 0.028409, 0.068158, 0.096591)
+    , m_bottom_left(0.095847, 0.782197, 0.122471, 0.140152)
+{}
+
+void MainMenuDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_top_red);
+    items.add(m_color, m_top_left);
+    items.add(m_color, m_bottom_left);
+}
+bool MainMenuDetector::detect(const ImageViewRGB32& screen){
+    ImageStats top_red = image_stats(extract_box_reference(screen, m_top_red));
+    if (!is_solid(top_red, {0.66369, 0.145833, 0.190476}, 0.20)){
+        return false;
+    }
+
+    ImageStats top_left = image_stats(extract_box_reference(screen, m_top_left));
+    if (!is_solid(top_left, {0.352778, 0.323611, 0.323611})){
+        return false;
+    }
+
+    ImageStats bottom_left = image_stats(extract_box_reference(screen, m_bottom_left));
+    if (!is_solid(bottom_left, {0.66369, 0.145833, 0.190476}, 0.20)){
+        return false;
+    }
+
+    if (euclidean_distance(top_red.average, bottom_left.average) > 10){
+        return false;
+    }
+
+    return true;
+}
+
+
+
+
+
+PartyMenuDetector::PartyMenuDetector(Color color)
+    : m_color(color)
+    , m_top_right(0.767838, 0.018939, 0.220447, 0.034091)
+    , m_top_dark_red(0.619808, 0.013258, 0.078807, 0.022727)
+    , m_bottom_dark_red(0.383387, 0.922348, 0.078807, 0.026515)
+    , m_left(0.007455, 0.143939, 0.011715, 0.793561)
+{}
+
+void PartyMenuDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_top_right);
+    items.add(m_color, m_top_dark_red);
+    items.add(m_color, m_bottom_dark_red);
+    items.add(m_color, m_left);
+}
+bool PartyMenuDetector::detect(const ImageViewRGB32& screen){
+    ImageStats top_right = image_stats(extract_box_reference(screen, m_top_right));
+//    cout << top_right.average << top_right.stddev << endl;
+    if (!is_white(top_right, 500, 20)){
+        return false;
+    }
+
+    ImageStats top_dark_red = image_stats(extract_box_reference(screen, m_top_dark_red));
+//    cout << top_dark_red.average << top_dark_red.stddev << endl;
+    if (!is_solid(top_dark_red, {0.681818, 0.136364, 0.181818}, 0.25)){
+        return false;
+    }
+
+    ImageStats bottom_dark_red = image_stats(extract_box_reference(screen, m_bottom_dark_red));
+//    cout << bottom_dark_red.average << bottom_dark_red.stddev << endl;
+    if (!is_solid(bottom_dark_red, {0.681818, 0.136364, 0.181818}, 0.25)){
+        return false;
+    }
+
+    ImageStats left = image_stats(extract_box_reference(screen, m_left));
+//    cout << left.average << left.stddev << endl;
+    if (!is_solid(left, {0.66369, 0.145833, 0.190476}, 0.20)){
+        return false;
+    }
+
+    if (euclidean_distance(top_dark_red.average, bottom_dark_red.average) > 10){
+        return false;
+    }
+
+    return true;
+}
+
+class Test_PartyMenuDetector : public ImageUnitTest{
+public:
+    Test_PartyMenuDetector(
+        const std::string& image,
+        bool expected
+    )
+        : ImageUnitTest("PokemonSwSh::PartyMenuDetector - " + image, {image})
+        , m_expected(expected)
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        const ImageRGB32& image = images[0];
+        PartyMenuDetector detector;
+
+        return m_expected == detector.detect(image);
+    };
+
+private:
+    bool m_expected;
+};
+
+void add_tests_PartyMenuDetector(UnitTestDatabase& database){
+    database.add<Test_PartyMenuDetector>("PokemonSwSh/PartyMenuDetector/party-menu-1.png", true);
+}
+
+
+
+BoxMenuDetector::BoxMenuDetector(Color color)
+    : m_color(color)
+    , m_left_green(0.007455, 0.085227, 0.010650, 0.587121)
+    , m_top_white(0.621938, 0.032197, 0.050053, 0.121212)
+    , m_bottom_white(0.234292, 0.818182, 0.009585, 0.113636)
+{}
+
+void BoxMenuDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(m_color, m_left_green);
+    items.add(m_color, m_top_white);
+    items.add(m_color, m_bottom_white);
+}
+bool BoxMenuDetector::detect(const ImageViewRGB32& screen){
+    ImageStats left_green = image_stats(extract_box_reference(screen, m_left_green));
+    if (!is_solid(left_green, {0.387097, 0.501075, 0.111828}, 0.20)){
+        return false;
+    }
+
+    ImageStats top_white = image_stats(extract_box_reference(screen, m_top_white));
+    if (!is_white(top_white, 500, 20)){
+        return false;
+    }
+
+    ImageStats bottom_white = image_stats(extract_box_reference(screen, m_bottom_white));
+    if (!is_white(bottom_white, 500, 15)){
+        return false;
+    }
+
+    return true;
+}
+
+
+
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_MainMenuDetector.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_MainMenuDetector.h
new file mode 100644
index 0000000000..71fbc4f706
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_MainMenuDetector.h
@@ -0,0 +1,98 @@
+/*  Main Menu Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_MainMenuDetector_H
+#define PokemonAutomation_PokemonSwSh_MainMenuDetector_H
+
+#include "Common/Cpp/Color.h"
+#include "Common/Cpp/TestRunners/UnitTest.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonTools/VisualDetector.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+
+class MainMenuDetector : public StaticScreenDetector{
+public:
+    MainMenuDetector(Color color = COLOR_BLUE);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    Color m_color;
+    ImageFloatBox m_top_red;
+    ImageFloatBox m_top_left;
+    ImageFloatBox m_bottom_left;
+};
+class MainMenuWatcher : public DetectorToFinder<MainMenuDetector>{
+public:
+    MainMenuWatcher(Color color = COLOR_BLUE)
+         : DetectorToFinder("MainMenuWatcher", std::chrono::milliseconds(250), color)
+    {}
+};
+
+
+
+class PartyMenuDetector : public StaticScreenDetector{
+public:
+    PartyMenuDetector(Color color = COLOR_GREEN);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    Color m_color;
+    ImageFloatBox m_top_right;
+    ImageFloatBox m_top_dark_red;
+    ImageFloatBox m_bottom_dark_red;
+    ImageFloatBox m_left;
+};
+class PartyMenuWatcher : public DetectorToFinder<PartyMenuDetector>{
+public:
+    PartyMenuWatcher(Color color = COLOR_GREEN)
+         : DetectorToFinder("PartyMenuWatcher", std::chrono::milliseconds(250), color)
+    {}
+};
+
+
+
+class BoxMenuDetector : public StaticScreenDetector{
+public:
+    BoxMenuDetector(Color color = COLOR_RED);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    Color m_color;
+    ImageFloatBox m_left_green;
+    ImageFloatBox m_top_white;
+    ImageFloatBox m_bottom_white;
+};
+class BoxMenuWatcher : public DetectorToFinder<BoxMenuDetector>{
+public:
+    BoxMenuWatcher(Color color = COLOR_RED)
+         : DetectorToFinder("BoxMenuWatcher", std::chrono::milliseconds(250), color)
+    {}
+};
+
+
+void add_tests_PartyMenuDetector(UnitTestDatabase& database);
+
+
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_MarkFinder.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_MarkFinder.cpp
similarity index 90%
rename from SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_MarkFinder.cpp
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_MarkFinder.cpp
index 584d753906..96bd6ff1c8 100644
--- a/SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_MarkFinder.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_MarkFinder.cpp
@@ -1,15 +1,15 @@
 /*  Mark Finder
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include "Common/Cpp/Exceptions.h"
 #include "Kernels/Waterfill/Kernels_Waterfill.h"
-#include "CommonFramework/Globals.h"
-#include "CommonFramework/ImageTools/BinaryImage_FilterRgb32.h"
-#include "CommonFramework/ImageMatch/ExactImageMatcher.h"
-#include "CommonFramework/ImageMatch/SubObjectTemplateMatcher.h"
+#include "CommonFramework/GlobalAutoPaths.h"
+#include "CommonTools/Images/BinaryImage_FilterRgb32.h"
+#include "CommonTools/ImageMatch/ExactImageMatcher.h"
+#include "CommonTools/ImageMatch/SubObjectTemplateMatcher.h"
 #include "PokemonSwSh_MarkFinder.h"
 
 //#include <iostream>
diff --git a/SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_MarkFinder.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_MarkFinder.h
similarity index 83%
rename from SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_MarkFinder.h
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_MarkFinder.h
index cae1fe0063..2e1f06cd1d 100644
--- a/SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_MarkFinder.h
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_MarkFinder.h
@@ -1,6 +1,6 @@
 /*  Mark Finder
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_PokemonSpriteReader.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_PokemonSpriteReader.cpp
similarity index 82%
rename from SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_PokemonSpriteReader.cpp
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_PokemonSpriteReader.cpp
index c508fbb617..d7cff2eba6 100644
--- a/SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_PokemonSpriteReader.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_PokemonSpriteReader.cpp
@@ -1,18 +1,18 @@
 /*  Pokemon Sprite Reader
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include "CommonFramework/ImageTypes/ImageViewRGB32.h"
 #include "CommonFramework/ImageTools/ImageStats.h"
-#include "CommonFramework/ImageMatch/ImageCropper.h"
-#include "PokemonSwSh/Resources/PokemonSwSh_PokemonSprites.h"
+#include "CommonTools/ImageMatch/ImageCropper.h"
+#include "VideoGames/PokemonSwSh/Resources/PokemonSwSh_PokemonSprites.h"
 #include "PokemonSwSh_PokemonSpriteReader.h"
 
-#include <iostream>
-using std::cout;
-using std::endl;
+//#include <iostream>
+//using std::cout;
+//using std::endl;
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
@@ -60,7 +60,7 @@ PokemonSpriteMatcherCropped::PokemonSpriteMatcherCropped(const std::set<std::str
     }
 }
 
-ImageRGB32 PokemonSpriteMatcherCropped::process_image(const ImageViewRGB32& image, Color& background) const{
+auto PokemonSpriteMatcherCropped::get_crop_candidates(const ImageViewRGB32& image) const -> std::vector<ImageViewRGB32>{
     ImageStats border = image_border_stats(image);
 //    cout << border.average << border.stddev << endl;
 //    image.save("image1.png");
@@ -83,9 +83,9 @@ ImageRGB32 PokemonSpriteMatcherCropped::process_image(const ImageViewRGB32& imag
             return stop;
         }
     );
-
-    background = border.average.round();
-    return extract_box_reference(image, box).copy();
+    std::vector<ImageViewRGB32> ret;
+    ret.emplace_back(extract_box_reference(image, box));
+    return ret;
 }
 
 
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_PokemonSpriteReader.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_PokemonSpriteReader.h
new file mode 100644
index 0000000000..74c46dfaed
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_PokemonSpriteReader.h
@@ -0,0 +1,50 @@
+/*  Pokemon Sprite Reader
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_PokemonSpriteReader_H
+#define PokemonAutomation_PokemonSwSh_PokemonSpriteReader_H
+
+#include <set>
+#include "CommonTools/ImageMatch/ExactImageDictionaryMatcher.h"
+#include "CommonTools/ImageMatch/CroppedImageDictionaryMatcher.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+class PokemonSpriteMatcherExact : public ImageMatch::ExactImageDictionaryMatcher{
+public:
+    PokemonSpriteMatcherExact(const std::set<std::string>* subset);
+};
+
+//  Used by Max Lair when there's an item blocking the right side.
+class PokemonLeftSpriteMatcherExact : public ImageMatch::ExactImageDictionaryMatcher{
+public:
+    PokemonLeftSpriteMatcherExact(const std::set<std::string>* subset);
+};
+
+
+
+class PokemonSpriteMatcherCropped : public ImageMatch::CroppedImageDictionaryMatcher{
+public:
+    PokemonSpriteMatcherCropped(const std::set<std::string>* subset, double min_euclidean_distance = 100);
+
+private:
+    virtual std::vector<ImageViewRGB32> get_crop_candidates(const ImageViewRGB32& image) const override;
+
+private:
+    double m_min_euclidean_distance_squared;
+};
+
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_QuantityReader.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_QuantityReader.cpp
similarity index 87%
rename from SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_QuantityReader.cpp
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_QuantityReader.cpp
index 973f194209..eebf35882f 100644
--- a/SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_QuantityReader.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_QuantityReader.cpp
@@ -1,10 +1,10 @@
 /*  Quantity Reader
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include "CommonFramework/OCR/OCR_NumberReader.h"
+#include "CommonTools/OCR/OCR_NumberReader.h"
 #include "PokemonSwSh_QuantityReader.h"
 
 namespace PokemonAutomation{
diff --git a/SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_QuantityReader.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_QuantityReader.h
similarity index 87%
rename from SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_QuantityReader.h
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_QuantityReader.h
index 5a270beba5..944a85d2ca 100644
--- a/SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_QuantityReader.h
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_QuantityReader.h
@@ -1,6 +1,6 @@
 /*  Quantity Reader
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_ReceivePokemonDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_ReceivePokemonDetector.cpp
new file mode 100644
index 0000000000..80d9dcd034
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_ReceivePokemonDetector.cpp
@@ -0,0 +1,168 @@
+/*  Receive Pokemon (Orange Background) Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/ImageTools/ImageStats.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "PokemonSwSh_ReceivePokemonDetector.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+ReceivePokemonDetector::ReceivePokemonDetector(Color color)
+    : m_color(color)
+    , m_box_top(0.2, 0.02, 0.78, 0.02)
+    , m_box_top_right(0.93, 0.02, 0.05, 0.1)
+    , m_box_bot_left(0.02, 0.85, 0.1, 0.1)
+{}
+void ReceivePokemonDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(COLOR_RED, m_box_top);
+    items.add(COLOR_RED, m_box_top_right);
+    items.add(COLOR_RED, m_box_bot_left);
+}
+bool ReceivePokemonDetector::detect(const ImageViewRGB32& screen){
+    ImageStats stats0 = image_stats(extract_box_reference(screen, m_box_top));
+    ImageStats stats1 = image_stats(extract_box_reference(screen, m_box_top_right));
+    ImageStats stats2 = image_stats(extract_box_reference(screen, m_box_bot_left));
+
+    FloatPixel expected(193, 78, 56);
+    FloatPixel actual0 = stats0.average;
+    FloatPixel actual1 = stats1.average;
+    FloatPixel actual2 = stats2.average;
+
+//    cout << actual0 << actual1 << actual2 << endl;
+
+    if (actual0.sum() < 100){
+        return false;
+    }
+    if (actual1.sum() < 100){
+        return false;
+    }
+    if (actual2.sum() < 100){
+        return false;
+    }
+
+    expected /= expected.sum();
+    actual0 /= actual0.sum();
+    actual1 /= actual1.sum();
+    actual2 /= actual2.sum();
+
+    double distance0 = euclidean_distance(expected, actual0);
+    double distance1 = euclidean_distance(expected, actual1);
+    double distance2 = euclidean_distance(expected, actual2);
+
+    if (euclidean_distance(actual0, actual1) > 10){
+        return false;
+    }
+    if (euclidean_distance(actual0, actual2) > 10){
+        return false;
+    }
+    if (euclidean_distance(actual1, actual2) > 10){
+        return false;
+    }
+    if (stats0.stddev.sum() > 10 || distance0 > 0.2){
+        return false;
+    }
+    if (stats1.stddev.sum() > 10 || distance1 > 0.2){
+        return false;
+    }
+    if (stats2.stddev.sum() > 10 || distance2 > 0.2){
+        return false;
+    }
+
+    return true;
+}
+
+
+
+
+ReceivePokemonOverWatcher::ReceivePokemonOverWatcher(bool stop_on_detected)
+    : VisualInferenceCallback("ReceivePokemonDetector")
+    , m_stop_on_detected(stop_on_detected)
+    , m_box_top(0.2, 0.02, 0.78, 0.02)
+    , m_box_top_right(0.93, 0.02, 0.05, 0.1)
+    , m_box_bot_left(0.02, 0.85, 0.1, 0.1)
+    , m_has_been_orange(false)
+    , m_triggered(false)
+{}
+void ReceivePokemonOverWatcher::make_overlays(VideoOverlaySet& items) const{
+    items.add(COLOR_RED, m_box_top);
+    items.add(COLOR_RED, m_box_top_right);
+    items.add(COLOR_RED, m_box_bot_left);
+}
+
+bool ReceivePokemonOverWatcher::process_frame(const ImageViewRGB32& frame, WallClock timestamp){
+    bool ret = receive_is_over(frame);
+    bool triggered = m_triggered.load(std::memory_order_acquire);
+    m_triggered.store(triggered | ret, std::memory_order_release);
+//    cout << "m_has_been_orange = " << m_has_been_orange << endl;
+    return ret && m_stop_on_detected;
+}
+bool ReceivePokemonOverWatcher::receive_is_over(const ImageViewRGB32& frame){
+    ImageStats stats0 = image_stats(extract_box_reference(frame, m_box_top));
+    ImageStats stats1 = image_stats(extract_box_reference(frame, m_box_top_right));
+    ImageStats stats2 = image_stats(extract_box_reference(frame, m_box_bot_left));
+
+    FloatPixel expected(193, 78, 56);
+    FloatPixel actual0 = stats0.average;
+    FloatPixel actual1 = stats1.average;
+    FloatPixel actual2 = stats2.average;
+
+//    cout << actual0 << actual1 << actual2 << endl;
+
+    if (actual0.sum() < 100){
+        return m_has_been_orange;
+    }
+    if (actual1.sum() < 100){
+        return m_has_been_orange;
+    }
+    if (actual2.sum() < 100){
+        return m_has_been_orange;
+    }
+
+    expected /= expected.sum();
+    actual0 /= actual0.sum();
+    actual1 /= actual1.sum();
+    actual2 /= actual2.sum();
+
+    double distance0 = euclidean_distance(expected, actual0);
+    double distance1 = euclidean_distance(expected, actual1);
+    double distance2 = euclidean_distance(expected, actual2);
+
+    if (euclidean_distance(actual0, actual1) > 10){
+        return m_has_been_orange;
+    }
+    if (euclidean_distance(actual0, actual2) > 10){
+        return m_has_been_orange;
+    }
+    if (euclidean_distance(actual1, actual2) > 10){
+        return m_has_been_orange;
+    }
+    if (stats0.stddev.sum() > 10 || distance0 > 0.2){
+        return m_has_been_orange;
+    }
+    if (stats1.stddev.sum() > 10 || distance1 > 0.2){
+        return m_has_been_orange;
+    }
+    if (stats2.stddev.sum() > 10 || distance2 > 0.2){
+        return m_has_been_orange;
+    }
+
+    m_has_been_orange = true;
+    return false;
+}
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_ReceivePokemonDetector.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_ReceivePokemonDetector.h
new file mode 100644
index 0000000000..bdeb951ffe
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_ReceivePokemonDetector.h
@@ -0,0 +1,72 @@
+/*  Receive Pokemon (Orange Background) Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *
+ *      Returns true after a orange background has been detected
+ * and has ended.
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_ReceivePokemonDetector_H
+#define PokemonAutomation_PokemonSwSh_ReceivePokemonDetector_H
+
+#include <atomic>
+#include "Common/Cpp/Color.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonTools/VisualDetector.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+class ReceivePokemonDetector : public StaticScreenDetector{
+public:
+    ReceivePokemonDetector(Color color);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    Color m_color;
+    ImageFloatBox m_box_top;
+    ImageFloatBox m_box_top_right;
+    ImageFloatBox m_box_bot_left;
+};
+class ReceivePokemonWatcher : public DetectorToFinder<ReceivePokemonDetector>{
+public:
+    ReceivePokemonWatcher(Color color = COLOR_RED)
+         : DetectorToFinder("ReceivePokemonWatcher", std::chrono::milliseconds(100), color)
+    {}
+};
+
+
+
+
+class ReceivePokemonOverWatcher : public VisualInferenceCallback{
+public:
+    ReceivePokemonOverWatcher(bool stop_on_detected);
+
+    bool triggered() const{ return m_triggered.load(std::memory_order_acquire); }
+    bool receive_is_over(const ImageViewRGB32& frame);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override;
+
+private:
+    bool m_stop_on_detected;
+    ImageFloatBox m_box_top;
+    ImageFloatBox m_box_top_right;
+    ImageFloatBox m_box_bot_left;
+    bool m_has_been_orange;
+
+    std::atomic<bool> m_triggered;
+};
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_SelectionArrowFinder.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_SelectionArrowFinder.cpp
new file mode 100644
index 0000000000..57d71c9ace
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_SelectionArrowFinder.cpp
@@ -0,0 +1,423 @@
+/*  In-Battle Arrow Finder
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <iostream>
+#include "Common/Cpp/Exceptions.h"
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "Kernels/Waterfill/Kernels_Waterfill_Session.h"
+#include "CommonFramework/StaticGlobals.h"
+#include "CommonFramework/GlobalAutoPaths.h"
+#include "CommonFramework/Logging/Logger.h"
+#include "CommonFramework/Notifications/ProgramInfo.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/Tools/ErrorDumper.h"
+#include "CommonFramework/Tools/DebugDumper.h"
+#include "CommonFramework/VideoPipeline/VideoOverlay.h"
+#include "CommonTools/Images/BinaryImage_FilterRgb32.h"
+#include "CommonTools/ImageMatch/ExactImageMatcher.h"
+#include "Tests/ImageUnitTest.h"
+#include "Tests/TestUtils.h"
+#include "PokemonSwSh_SelectionArrowFinder.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+using namespace Kernels;
+using namespace Kernels::Waterfill;
+
+
+const ImageMatch::ExactImageMatcher& SELECTION_ARROW(){
+    static ImageMatch::ExactImageMatcher matcher(RESOURCE_PATH() + "PokemonSwSh/BattleArrow.png");
+    return matcher;
+}
+
+bool is_selection_arrow(const ImageViewRGB32& image, const WaterfillObject& object){
+    double area_ratio = (double)object.area_ratio();
+    if (STATIC_GLOBALS.IMAGE_TEMPLATE_MATCHING){
+        std::cout << "Object area: " << object.area << ", area ratio: " << area_ratio
+                  << " bound [0.4, 0.5]" << std::endl;
+        dump_debug_image(global_logger_command_line(), "PokemonSwSh/SelectionArrowFinder", "is_selection_arrow", extract_box_reference(image, object));
+    }
+    if (area_ratio < 0.4 || area_ratio > 0.5){
+        return false;
+    }
+
+    ImageRGB32 cropped = extract_box_reference(image, object).copy();
+    auto packed_matrix = object.packed_matrix();
+    size_t matrix_width = packed_matrix->width();
+    size_t matrix_height = packed_matrix->height();
+    try{
+        filter_by_mask(
+            std::move(packed_matrix),
+            cropped,
+            COLOR_WHITE,
+            true
+        );
+    }catch (InternalProgramError&){
+        global_logger_tagged().log(
+            "Mismatching matrix and image size.\n"
+            "    Image: " + std::to_string(image.width()) + "x" + std::to_string(image.height()) +
+            "    Cropped: " + std::to_string(cropped.width()) + "x" + std::to_string(cropped.height()) +
+            "    Matrix: " + std::to_string(matrix_width) + "x" + std::to_string(matrix_height) +
+            "    Object: " + std::to_string(object.width()) + "x" + std::to_string(object.height()) +
+            "    Object X: " + std::to_string(object.min_x) + "-" + std::to_string(object.max_x) +
+            "    Object Y: " + std::to_string(object.min_y) + "-" + std::to_string(object.max_y),
+            COLOR_RED
+        );
+        dump_image(global_logger_tagged(), ProgramInfo(), "is_selection_arrow_size_mismatch", image);
+        throw;
+    }
+
+
+    double rmsd = SELECTION_ARROW().rmsd(cropped);
+    
+    if (STATIC_GLOBALS.IMAGE_TEMPLATE_MATCHING){
+        std::cout << "rmsd: " << rmsd << ", threshold 130" << std::endl;
+    }
+    return rmsd <= 130;
+}
+std::vector<ImagePixelBox> find_selection_arrows(const ImageViewRGB32& image, size_t min_area){
+    if (STATIC_GLOBALS.IMAGE_TEMPLATE_MATCHING){
+        std::cout << "Match SwSh selection arrow by waterfill, size range (" << min_area << ", SIZE_MAX) " 
+                  << "input image size " << image.width() << " x " << image.height() << std::endl;
+    }
+    PackedBinaryMatrix matrix = compress_rgb32_to_binary_max(image, 63, 63, 63);
+    auto session = make_WaterfillSession(matrix);
+    auto finder = session->make_iterator(min_area);
+    std::vector<ImagePixelBox> ret;
+    WaterfillObject object;
+    while (finder->find_next(object, true)){
+        if (STATIC_GLOBALS.IMAGE_TEMPLATE_MATCHING){
+            std::cout << "Found object: " << object.min_x << "-" << object.max_x << ", " << object.min_y << "-" << object.max_y << std::endl;
+        }
+        if (is_selection_arrow(image, object)){
+            ret.emplace_back(object);
+        }
+    }
+    return ret;
+}
+
+
+
+SelectionArrowFinder::SelectionArrowFinder(VideoOverlay& overlay, const ImageFloatBox& box)
+    : VisualInferenceCallback("SelectionArrowFinder")
+    , m_overlay(overlay)
+    , m_box(box)
+{}
+void SelectionArrowFinder::make_overlays(VideoOverlaySet& items) const{
+    items.add(COLOR_YELLOW, m_box);
+}
+bool SelectionArrowFinder::detect(const ImageViewRGB32& screen){
+    const double screen_scale = screen.height() / 1080.0;
+    // Smallest arrow takes at least 600 pixels on 1920x1080 screen.
+    const size_t min_arrow_area = size_t(600.0 * screen_scale * screen_scale);
+    std::vector<ImagePixelBox> arrows = find_selection_arrows(
+        extract_box_reference(screen, m_box),
+        min_arrow_area
+    );
+
+    m_arrow_boxes.clear();
+    for (const ImagePixelBox& mark : arrows){
+        m_last_detection.emplace_back(translate_to_parent(screen, m_box, mark));
+        m_arrow_boxes.emplace_back(m_overlay, m_last_detection.back(), COLOR_MAGENTA);
+    }
+    return !m_arrow_boxes.empty();
+}
+bool SelectionArrowFinder::process_frame(const ImageViewRGB32& frame, WallClock timestamp){
+    detect(frame);
+//    cout << m_arrow_boxes.size() << endl;
+    return !m_arrow_boxes.empty();
+}
+
+SelectionArrowDetector::SelectionArrowDetector(VideoOverlay& overlay, const ImageFloatBox& box)
+    : m_overlay(overlay)
+    , m_box(box)
+{}
+void SelectionArrowDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(COLOR_YELLOW, m_box);
+}
+bool SelectionArrowDetector::detect(const ImageViewRGB32& screen){
+    const double screen_scale = screen.height() / 1080.0;
+    // Smallest arrow takes at least 600 pixels on 1920x1080 screen.
+    const size_t min_arrow_area = size_t(600.0 * screen_scale * screen_scale);
+    std::vector<ImagePixelBox> arrows = find_selection_arrows(
+        extract_box_reference(screen, m_box),
+        min_arrow_area
+    );
+
+    m_arrow_boxes.clear();
+    for (const ImagePixelBox& mark : arrows){
+        m_last_detection.emplace_back(translate_to_parent(screen, m_box, mark));
+        m_arrow_boxes.emplace_back(m_overlay, m_last_detection.back(), COLOR_MAGENTA);
+    }
+    return !m_arrow_boxes.empty();
+}
+
+
+
+BattleMoveArrowFinder::BattleMoveArrowFinder(VideoOverlay& overlay)
+    : SelectionArrowFinder(overlay, ImageFloatBox(0.640, 0.600, 0.055, 0.380))
+    , m_arrow_slot(-1)
+{}
+
+int8_t BattleMoveArrowFinder::get_slot(){
+    return m_arrow_slot.load(std::memory_order_acquire);
+}
+int8_t BattleMoveArrowFinder::detect(const ImageViewRGB32& screen){
+    SelectionArrowFinder::detect(screen);
+
+    if (m_arrow_boxes.empty()){
+        return -1;
+    }
+
+    const ImageFloatBox& arrow = m_arrow_boxes[0];
+    double arrow_y_center = arrow.y + arrow.height * 0.5;
+
+    int8_t slot = arrow_slot(arrow_y_center);
+    m_arrow_slot.store(slot, std::memory_order_release);
+    return slot;
+}
+bool BattleMoveArrowFinder::process_frame(const ImageViewRGB32& frame, WallClock timestamp){
+    detect(frame);
+    return false;
+}
+
+int8_t BattleMoveArrowFinder::arrow_slot(double y_center){
+    if (y_center < 0){
+        return -1;
+    }
+    y_center -= 0.647222;
+    y_center /= 0.0962963;
+    return (int8_t)(y_center + 0.5);
+}
+
+
+
+RetrieveEggArrowFinder::RetrieveEggArrowFinder(VideoOverlay& overlay)
+    : SelectionArrowFinder(overlay, ImageFloatBox(0.597, 0.640, 0.166, 0.071))
+{}
+
+
+CheckNurseryArrowFinder::CheckNurseryArrowFinder(VideoOverlay& overlay)
+    : SelectionArrowFinder(overlay, ImageFloatBox(0.419, 0.570, 0.290, 0.084))
+{}
+
+
+StoragePokemonMenuArrowFinder::StoragePokemonMenuArrowFinder(VideoOverlay& overlay)
+    : SelectionArrowFinder(overlay, ImageFloatBox(0.555, 0.413, 0.177, 0.078))
+{}
+
+
+RotomPhoneMenuArrowFinder::RotomPhoneMenuArrowFinder(VideoOverlay& overlay)
+    : m_overlay_set(overlay)
+{
+    for (size_t i_row = 0; i_row < 2; i_row++){
+        for (size_t j_col = 0; j_col < 5; j_col++){
+            ImageFloatBox box(0.047 + j_col*0.183, 0.175 + 0.333*i_row, 0.059, 0.104);
+            m_overlay_set.add(COLOR_YELLOW, box);
+        }
+    }
+}
+
+void RotomPhoneMenuArrowFinder::make_overlays(VideoOverlaySet& items) const{
+
+}
+bool RotomPhoneMenuArrowFinder::detect(const ImageViewRGB32& screen){
+    return detect_index(screen) >= 0;
+}
+
+int RotomPhoneMenuArrowFinder::detect_index(const ImageViewRGB32& screen){
+    const double screen_scale = screen.height() / 1080.0;
+    const size_t min_arrow_area = size_t(1400 * screen_scale * screen_scale);
+    for (size_t i_row = 0; i_row < 2; i_row++){
+        for (size_t j_col = 0; j_col < 5; j_col++){
+            ImageFloatBox box(0.047 + j_col*0.183, 0.175 + 0.333*i_row, 0.059, 0.104);
+            std::vector<ImagePixelBox> arrows = find_selection_arrows(
+                extract_box_reference(screen, box),
+                min_arrow_area
+            );
+            if (arrows.size() > 0){
+                m_index = (int)(i_row * 5 + j_col);
+                return m_index;
+            }
+        }
+    }
+    return -1;
+}
+
+
+
+
+
+
+
+
+class Test_SelectionArrowFinder : public ImageUnitTest{
+public:
+    Test_SelectionArrowFinder(
+        const std::string& image,
+        size_t expected
+    )
+        : ImageUnitTest("PokemonSwSh::SelectionArrowFinder - " + image, {image})
+        , m_expected(expected)
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        const ImageRGB32& image = images[0];
+        std::vector<ImagePixelBox> boxes = find_selection_arrows(image, 10);
+        for (const auto& box : boxes){
+            std::cout << "Found box: " << box.min_x << " " << box.max_x << " " << box.min_y << " " << box.max_y << std::endl;
+        }
+        return boxes.size() == m_expected;
+    };
+
+private:
+    size_t m_expected;
+};
+class Test_RetrieveEggArrowFinder : public ImageUnitTest{
+public:
+    Test_RetrieveEggArrowFinder(
+        const std::string& image,
+        bool expected
+    )
+        : ImageUnitTest("PokemonSwSh::RetrieveEggArrowFinder - " + image, {image})
+        , m_expected(expected)
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        DummyVideoOverlay overlay;
+        RetrieveEggArrowFinder detector(overlay);
+        const ImageRGB32& image = images[0];
+        return detector.detect(image) == m_expected;
+    };
+
+private:
+    bool m_expected;
+};
+class Test_CheckNurseryArrowFinder : public ImageUnitTest{
+public:
+    Test_CheckNurseryArrowFinder(
+        const std::string& image,
+        bool expected
+    )
+        : ImageUnitTest("PokemonSwSh::CheckNurseryArrowFinder - " + image, {image})
+        , m_expected(expected)
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        DummyVideoOverlay overlay;
+        CheckNurseryArrowFinder detector(overlay);
+        const ImageRGB32& image = images[0];
+        return detector.detect(image) == m_expected;
+    };
+
+private:
+    bool m_expected;
+};
+class Test_StoragePokemonMenuArrowFinder : public ImageUnitTest{
+public:
+    Test_StoragePokemonMenuArrowFinder(
+        const std::string& image,
+        bool expected
+    )
+        : ImageUnitTest("PokemonSwSh::StoragePokemonMenuArrowFinder - " + image, {image})
+        , m_expected(expected)
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        DummyVideoOverlay overlay;
+        StoragePokemonMenuArrowFinder detector(overlay);
+        const ImageRGB32& image = images[0];
+        return detector.detect(image) == m_expected;
+    };
+
+private:
+    bool m_expected;
+};
+class Test_RotomPhoneMenuArrowFinder : public ImageUnitTest{
+public:
+    Test_RotomPhoneMenuArrowFinder(
+        const std::string& image,
+        int index
+    )
+        : ImageUnitTest("PokemonSwSh::RotomPhoneMenuArrowFinder - " + image, {image})
+        , m_index(index)
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        DummyVideoOverlay overlay;
+        RotomPhoneMenuArrowFinder detector(overlay);
+        const ImageRGB32& image = images[0];
+        return detector.detect_index(image) == m_index;
+    };
+
+private:
+    int m_index;
+};
+
+
+
+
+
+
+
+
+void add_tests_SelectionArrowFinder(UnitTestDatabase& database){
+    database.add<Test_SelectionArrowFinder>("PokemonSwSh/SelectionArrowFinder/mac_neon_error_1.png", 1);
+
+    database.add<Test_RetrieveEggArrowFinder>("PokemonSwSh/RetrieveEggArrowFinder/German_False.png", false);
+    database.add<Test_RetrieveEggArrowFinder>("PokemonSwSh/RetrieveEggArrowFinder/JPN_False.png", false);
+    database.add<Test_RetrieveEggArrowFinder>("PokemonSwSh/RetrieveEggArrowFinder/JPN_True.png", true);
+    database.add<Test_RetrieveEggArrowFinder>("PokemonSwSh/RetrieveEggArrowFinder/macOS_bright/No_Dialog_False.png", false);
+    database.add<Test_RetrieveEggArrowFinder>("PokemonSwSh/RetrieveEggArrowFinder/macOS_bright/Take_Back_False.png", false);
+    database.add<Test_RetrieveEggArrowFinder>("PokemonSwSh/RetrieveEggArrowFinder/macOS_bright/Take_Egg_True.png", true);
+
+    database.add<Test_StoragePokemonMenuArrowFinder>("PokemonSwSh/StoragePokemonMenuArrowFinder/French_False.png", false);
+
+    database.add<Test_RotomPhoneMenuArrowFinder>("PokemonSwSh/RotomPhoneMenuArrowFinder/Map_5.png", 5);
+    database.add<Test_RotomPhoneMenuArrowFinder>("PokemonSwSh/RotomPhoneMenuArrowFinder/Pokemon_1.png", 1);
+    database.add<Test_RotomPhoneMenuArrowFinder>("PokemonSwSh/RotomPhoneMenuArrowFinder/macOS_bright/Pokedex_0.png", 0);
+    database.add<Test_RotomPhoneMenuArrowFinder>("PokemonSwSh/RotomPhoneMenuArrowFinder/macOS_bright/Pokemon_1.png", 1);
+    database.add<Test_RotomPhoneMenuArrowFinder>("PokemonSwSh/RotomPhoneMenuArrowFinder/macOS_bright/Town_Map_5.png", 5);
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_SelectionArrowFinder.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_SelectionArrowFinder.h
new file mode 100644
index 0000000000..8a669ccbfb
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_SelectionArrowFinder.h
@@ -0,0 +1,165 @@
+/*  Selection Arrow Finder
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_SelectionArrowFinder_H
+#define PokemonAutomation_PokemonSwSh_SelectionArrowFinder_H
+
+#include <atomic>
+#include <vector>
+#include <deque>
+#include "Common/Cpp/TestRunners/UnitTest.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+#include "CommonTools/VisualDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+//  Deprecated
+class SelectionArrowFinder : public VisualInferenceCallback{
+public:
+    SelectionArrowFinder(VideoOverlay& overlay, const ImageFloatBox& box);
+
+    bool detect(const ImageViewRGB32& screen);
+
+    const std::vector<ImageFloatBox>& last_detection() const{
+        return m_last_detection;
+    }
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override;
+
+protected:
+    VideoOverlay& m_overlay;
+    ImageFloatBox m_box;
+    std::vector<ImageFloatBox> m_last_detection;
+    std::deque<OverlayBoxScope> m_arrow_boxes;
+};
+
+class SelectionArrowDetector : public StaticScreenDetector{
+public:
+    SelectionArrowDetector(VideoOverlay& overlay, const ImageFloatBox& box);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+    const std::vector<ImageFloatBox>& last_detection() const{
+        return m_last_detection;
+    }
+
+protected:
+    VideoOverlay& m_overlay;
+    ImageFloatBox m_box;
+    std::vector<ImageFloatBox> m_last_detection;
+    std::deque<OverlayBoxScope> m_arrow_boxes;
+};
+class SelectionArrowWatcher : public DetectorToFinder<SelectionArrowDetector>{
+public:
+    SelectionArrowWatcher(
+        VideoOverlay& overlay,
+        const ImageFloatBox& box,
+        Milliseconds hold = Milliseconds(250)
+    )
+         : DetectorToFinder("SelectionArrowWatcher", hold, overlay, box)
+    {}
+};
+
+
+
+class BattleMoveArrowFinder : public SelectionArrowFinder{
+public:
+    BattleMoveArrowFinder(VideoOverlay& overlay);
+
+    int8_t get_slot();
+
+    //  These are not thread safe.
+    int8_t detect(const ImageViewRGB32& screen);
+    virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override;
+
+
+private:
+    int8_t arrow_slot(double y_center);
+
+
+private:
+    std::atomic<int8_t> m_arrow_slot;
+};
+
+
+// Selection arrow for the dialog of the egg lady when you would like to retrieve an egg.
+class RetrieveEggArrowFinder : public SelectionArrowFinder{
+public:
+    RetrieveEggArrowFinder(VideoOverlay& overlay);
+};
+
+
+// Selection arrow for the dialog of the egg lady when you check the condition of the pokemon
+// in the Pokemon Nursery, where there is no egg.
+class CheckNurseryArrowFinder : public SelectionArrowFinder{
+public:
+    CheckNurseryArrowFinder(VideoOverlay& overlay);
+};
+
+
+// Selection arrow for the menu of the pokemon in a pokemon storage box.
+// The menuitems are: "Move", "Check summary", "Check held item", "Change markings", ...
+class StoragePokemonMenuArrowFinder : public SelectionArrowFinder{
+public:
+    StoragePokemonMenuArrowFinder(VideoOverlay& overlay);
+};
+
+// The arrow that points to one of the ten apps on Rotom Phone menu
+class RotomPhoneMenuArrowFinder : public StaticScreenDetector{
+public:
+    RotomPhoneMenuArrowFinder(VideoOverlay& overlay);
+
+    int current_index() const{
+        return m_index;
+    }
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+    // Detect which app is selected by the arrow. Return the index of the app
+    // The order is: from top to bottom, from left to right.
+    // If no arrow found, return -1.
+    int detect_index(const ImageViewRGB32& screen);
+
+private:
+    VideoOverlaySet m_overlay_set;
+    int m_index = -1;
+};
+class RotomPhoneMenuArrowWatcher : public DetectorToFinder<RotomPhoneMenuArrowFinder>{
+public:
+    RotomPhoneMenuArrowWatcher(VideoOverlay& overlay)
+         : DetectorToFinder("RotomPhoneMenuArrowWatcher", std::chrono::milliseconds(250), overlay)
+    {}
+};
+
+
+
+
+
+
+
+
+
+
+
+void add_tests_SelectionArrowFinder(UnitTestDatabase& database);
+
+
+
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_SummaryShinySymbolDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_SummaryShinySymbolDetector.cpp
similarity index 89%
rename from SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_SummaryShinySymbolDetector.cpp
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_SummaryShinySymbolDetector.cpp
index d509ef7113..f3807c0639 100644
--- a/SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_SummaryShinySymbolDetector.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_SummaryShinySymbolDetector.cpp
@@ -1,13 +1,13 @@
 /*  Summary Shiny Symbol
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include "CommonFramework/ImageTools/SolidColorTest.h"
-#include "CommonFramework/ImageTools/ColorClustering.h"
 #include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "CommonFramework/Inference/InferenceThrottler.h"
+#include "CommonTools/Images/SolidColorTest.h"
+#include "CommonTools/Images/ColorClustering.h"
+#include "CommonTools/InferenceThrottler.h"
 #include "PokemonSwSh_SummaryShinySymbolDetector.h"
 
 //#include <iostream>
diff --git a/SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_SummaryShinySymbolDetector.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_SummaryShinySymbolDetector.h
similarity index 90%
rename from SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_SummaryShinySymbolDetector.h
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_SummaryShinySymbolDetector.h
index cb4bde321a..a6c2ba0c9b 100644
--- a/SerialPrograms/Source/PokemonSwSh/Inference/PokemonSwSh_SummaryShinySymbolDetector.h
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_SummaryShinySymbolDetector.h
@@ -1,6 +1,6 @@
 /*  Summary Shiny Symbol
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  *
  *      Check shiny symbol in the party pokemon info screen.
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_YCommDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_YCommDetector.cpp
new file mode 100644
index 0000000000..156c9db207
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_YCommDetector.cpp
@@ -0,0 +1,254 @@
+/*  Y-Comm Menu Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "Kernels/Waterfill/Kernels_Waterfill_Types.h"
+#include "CommonFramework/ImageTools/ImageStats.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Images/SolidColorTest.h"
+#include "CommonTools/Images/WaterfillUtilities.h"
+#include "CommonTools/ImageMatch/WaterfillTemplateMatcher.h"
+#include "Tests/ImageUnitTest.h"
+#include "PokemonSwSh_YCommDetector.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+
+YCommMenuDetector::YCommMenuDetector(bool is_on)
+    : m_is_on(is_on)
+    , m_top(0.600, 0.020, 0.100, 0.040)
+    , m_bottom(0.100, 0.970, 0.400, 0.020)
+{}
+void YCommMenuDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(COLOR_RED, m_top);
+    items.add(COLOR_RED, m_bottom);
+}
+
+bool YCommMenuDetector::detect(const ImageViewRGB32& screen){
+    ImageStats bottom = image_stats(extract_box_reference(screen, m_bottom));
+//    cout << bottom.average << bottom.stddev << endl;
+    if (!is_black(bottom)){
+        return !m_is_on;
+    }
+
+    ImageStats top = image_stats(extract_box_reference(screen, m_top));
+//    cout << top.average << top.stddev << endl;
+    if (!is_solid(top, {0.0819777, 0.124031, 0.793991}, 0.30)){
+        return !m_is_on;
+    }
+
+    return m_is_on;
+}
+
+
+
+class YCommIconMatcherOffline : public ImageMatch::WaterfillTemplateMatcher{
+public:
+    YCommIconMatcherOffline()
+        : WaterfillTemplateMatcher(
+            "PokemonSwSh/YComm-Offline.png",
+            Color(0, 0, 255), Color(100, 100, 255), 50
+        )
+    {
+        m_aspect_ratio_lower = 0.9;
+        m_aspect_ratio_upper = 1.1;
+        m_area_ratio_lower = 0.9;
+        m_area_ratio_upper = 1.2;
+    }
+    static const YCommIconMatcherOffline& instance(){
+        static YCommIconMatcherOffline matcher;
+        return matcher;
+    }
+};
+class YCommIconMatcherOnline : public ImageMatch::WaterfillTemplateMatcher{
+public:
+    YCommIconMatcherOnline()
+        : WaterfillTemplateMatcher(
+            "PokemonSwSh/YComm-Online.png",
+            Color(200, 200, 200), Color(255, 255, 255), 50
+        )
+    {
+        m_aspect_ratio_lower = 0.9;
+        m_aspect_ratio_upper = 1.1;
+        m_area_ratio_lower = 0.9;
+        m_area_ratio_upper = 1.2;
+    }
+    static const YCommIconMatcherOnline& instance(){
+        static YCommIconMatcherOnline matcher;
+        return matcher;
+    }
+};
+
+
+
+YCommIconDetector::YCommIconDetector(Color color, bool is_on)
+    : m_color(color)
+    , m_icon(0.007, 0.944, 0.032, 0.054)
+//    , m_left(0.004362, 0.961165, 0.007634, 0.025243)
+//    , m_right(0.038000, 0.961165, 0.007634, 0.025243)
+    , m_is_on(is_on)
+{}
+
+void YCommIconDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(COLOR_RED, m_icon);
+//    items.add(COLOR_RED, m_left);
+//    items.add(COLOR_RED, m_right);
+}
+
+bool YCommIconDetector::detect(const ImageViewRGB32& screen){
+    const size_t MIN_SIZE = (size_t)(350. * screen.total_pixels() / (1920 * 1080.));
+
+    {
+        const std::vector<std::pair<uint32_t, uint32_t>> filters = {
+            {combine_rgb(0, 0, 150), combine_rgb(100, 100, 255)},
+            {combine_rgb(0, 0, 150), combine_rgb(127, 127, 255)},
+            {combine_rgb(0, 0, 150), combine_rgb(191, 191, 255)},
+        };
+        if (match_template_by_waterfill(
+            screen.size(),
+            extract_box_reference(screen, m_icon),
+            YCommIconMatcherOffline::instance(),
+            filters,
+            {MIN_SIZE, SIZE_MAX},
+            120,
+            [](Kernels::Waterfill::WaterfillObject& object) -> bool { return true; }
+        )){
+//            cout << "waterfill 0" << endl;
+            return m_is_on;
+        }
+    }
+    {
+        const std::vector<std::pair<uint32_t, uint32_t>> filters = {
+            {0xff808080, 0xffffffff},
+            {0xffa0a0a0, 0xffffffff},
+            {0xffc0c0c0, 0xffffffff},
+        };
+        if (match_template_by_waterfill(
+            screen.size(),
+            extract_box_reference(screen, m_icon),
+            YCommIconMatcherOnline::instance(),
+            filters,
+            {MIN_SIZE, SIZE_MAX},
+            120,
+            [](Kernels::Waterfill::WaterfillObject& object) -> bool { return true; }
+        )){
+//            cout << "waterfill 1" << endl;
+            return m_is_on;
+        }
+    }
+
+#if 0
+    ImageStats left = image_stats(extract_box_reference(screen, m_left));
+    if (!is_solid(left, {0.0410557, 0.211144, 0.747801}, 0.20)){
+        cout << "not solid" << endl;
+        return !m_is_on;
+    }
+    ImageStats right = image_stats(extract_box_reference(screen, m_right));
+    if (!is_solid(right, {0.0410557, 0.211144, 0.747801}, 0.20)){
+        cout << "not solid" << endl;
+        return !m_is_on;
+    }
+#endif
+
+//    cout << "end" << endl;
+    return !m_is_on;
+}
+
+
+
+
+
+
+
+
+class Test_YCommIconDetector : public ImageUnitTest{
+public:
+    Test_YCommIconDetector(
+        const std::string& image,
+        bool expected
+    )
+        : ImageUnitTest("PokemonSwSh::YCommIconDetector - " + image, {image})
+        , m_expected(expected)
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        YCommIconDetector detector(COLOR_RED, true);
+        const ImageRGB32& image = images[0];
+        return detector.detect(image) == m_expected;
+    };
+
+private:
+    bool m_expected;
+};
+
+class Test_YCommMenuDetector : public ImageUnitTest{
+public:
+    Test_YCommMenuDetector(
+        const std::string& image,
+        bool expected
+    )
+        : ImageUnitTest("PokemonSwSh::YCommMenuDetector - " + image, {image})
+        , m_expected(expected)
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        YCommMenuDetector detector(true);
+        const ImageRGB32& image = images[0];
+        return detector.detect(image) == m_expected;
+    };
+
+private:
+    bool m_expected;
+};
+
+
+
+
+void add_tests_YCommDetector(UnitTestDatabase& database){
+    database.add<Test_YCommIconDetector>("PokemonSwSh/YCommIconDetector/Front_Door_2_True.png", true);
+    database.add<Test_YCommIconDetector>("PokemonSwSh/YCommIconDetector/Front_Door_3_True.png", true);
+    database.add<Test_YCommIconDetector>("PokemonSwSh/YCommIconDetector/Front_Door_True.png", true);
+    database.add<Test_YCommIconDetector>("PokemonSwSh/YCommIconDetector/macOS_bright/Nursery_False.png", false);
+    database.add<Test_YCommIconDetector>("PokemonSwSh/YCommIconDetector/macOS_bright/Nursery_True.png", true);
+
+    database.add<Test_YCommMenuDetector>("PokemonSwSh/YCommMenuDetector/Avermedia_Qt5_True.jpg", true);
+    database.add<Test_YCommMenuDetector>("PokemonSwSh/YCommMenuDetector/MiraBox_Qt6_True.jpg", true);
+    database.add<Test_YCommMenuDetector>("PokemonSwSh/YCommMenuDetector/MyPin_Qt5_True.jpg", true);
+    database.add<Test_YCommMenuDetector>("PokemonSwSh/YCommMenuDetector/MyPin_Qt6_True.jpg", true);
+    database.add<Test_YCommMenuDetector>("PokemonSwSh/YCommMenuDetector/NoBrand_Qt6_True.jpg", true);
+    database.add<Test_YCommMenuDetector>("PokemonSwSh/YCommMenuDetector/ShadowCast_Qt6_True.jpg", true);
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_YCommDetector.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_YCommDetector.h
new file mode 100644
index 0000000000..ede7c96608
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_YCommDetector.h
@@ -0,0 +1,81 @@
+/*  Y-Comm Menu Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_YCommDetector_H
+#define PokemonAutomation_PokemonSwSh_YCommDetector_H
+
+#include "Common/Cpp/Color.h"
+#include "Common/Cpp/TestRunners/UnitTest.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonTools/VisualDetector.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+
+namespace PokemonAutomation{
+
+class Logger;
+
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+class YCommMenuDetector : public StaticScreenDetector{
+public:
+    YCommMenuDetector(bool is_on);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    bool m_is_on;
+    ImageFloatBox m_top;
+    ImageFloatBox m_bottom;
+};
+class YCommMenuWatcher : public DetectorToFinder<YCommMenuDetector>{
+public:
+    YCommMenuWatcher(bool is_on)
+         : DetectorToFinder("YCommMenuWatcher", std::chrono::milliseconds(250), is_on)
+    {}
+};
+
+// Detect the blue Y letter as the Y Comm symbol in the lower left corner of the screen on the
+// overworld, when Y Comm is active.
+class YCommIconDetector : public StaticScreenDetector{
+public:
+    // If `is_on` is true, `process_frame()` returns true if it finds the Y letter.
+    // Otherwise, `process_frame()` returns true if the Y letter is not found.
+    YCommIconDetector(Color color, bool is_on);
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    Color m_color;
+    ImageFloatBox m_icon;
+//    ImageFloatBox m_left;
+//    ImageFloatBox m_right;
+
+    bool m_is_on;
+};
+class YCommIconWatcher : public DetectorToFinder<YCommIconDetector>{
+public:
+    YCommIconWatcher(Color color = COLOR_RED, bool is_on = true)
+         : DetectorToFinder("YCommIconWatcher", std::chrono::milliseconds(250), color, is_on)
+    {}
+};
+
+
+
+void add_tests_YCommDetector(UnitTestDatabase& database);
+
+
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/RNG/PokemonSwSh_OrbeetleAttackAnimationDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/RNG/PokemonSwSh_OrbeetleAttackAnimationDetector.cpp
new file mode 100644
index 0000000000..a8099b7276
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/RNG/PokemonSwSh_OrbeetleAttackAnimationDetector.cpp
@@ -0,0 +1,102 @@
+/*  Orbeetle Attack Animation Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *
+ *      Detects whether Orbeetle's animation is special or physical.
+ *
+ */
+
+#include "Common/Cpp/PrettyPrint.h"
+#include "CommonFramework/ImageTools/ImageStats.h"
+#include "CommonFramework/Tools/DebugDumper.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "PokemonSwSh_OrbeetleAttackAnimationDetector.h"
+
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+OrbeetleAttackAnimationDetector::OrbeetleAttackAnimationDetector(VideoStream& stream, ProControllerContext& context)
+    : m_stream(stream)
+    , m_context(context)
+    , m_box(stream.overlay(), {0.86, 0.2, 0.1, 0.15})
+{}
+
+
+OrbeetleAttackAnimationDetector::Detection OrbeetleAttackAnimationDetector::run(bool save_screenshot, bool log_values)
+{
+    //  Grab baseline image.
+    VideoSnapshot baseline_image = m_stream.video().snapshot();
+    if (!baseline_image){
+        m_stream.log("Orbeetle Attack Animation: Screenshot failed.", COLOR_PURPLE);
+        return Detection::NO_DETECTION;
+    }
+
+    if (save_screenshot){
+        //baseline_image->save("orbeetle-baseline-" + now_to_filestring() + ".png");
+        dump_debug_image(m_stream.logger(), "rng", "orbeetle-baseline", baseline_image);
+    }
+
+    FloatPixel baseline_values = image_average(extract_box_reference(baseline_image, m_box));
+    FloatPixel baseline_ratios = baseline_values / baseline_values.sum();
+
+
+    //  Play the attack animation.
+    pbf_press_button(m_context, BUTTON_RCLICK, 80ms, 1240ms);
+    m_context.wait_for_all_requests();
+
+
+    //  Grab the animation image.
+    VideoSnapshot animation_image = m_stream.video().snapshot();
+    if (!animation_image){
+        m_stream.log("Orbeetle Attack Animation: Screenshot failed.", COLOR_PURPLE);
+        return Detection::NO_DETECTION;
+    }
+
+    FloatPixel animation_values = image_average(extract_box_reference(animation_image, m_box));
+    FloatPixel animation_ratios = animation_values / animation_values.sum();
+
+    if (log_values){
+        m_stream.log("Orbeetle baseline value red: " + std::to_string(baseline_values.r));
+        m_stream.log("Orbeetle attack value red: " + std::to_string(animation_values.r));
+        m_stream.log("Orbeetle baseline value green: " + std::to_string(baseline_values.g));
+        m_stream.log("Orbeetle attack value green: " + std::to_string(animation_values.g));
+        m_stream.log("Orbeetle baseline value blue: " + std::to_string(baseline_values.b));
+        m_stream.log("Orbeetle attack value blue: " + std::to_string(animation_values.b));
+
+        m_stream.log("Orbeetle baseline ratio red: " + std::to_string(baseline_ratios.r));
+        m_stream.log("Orbeetle attack ratio red: " + std::to_string(animation_ratios.r));
+        m_stream.log("Orbeetle baseline ratio green: " + std::to_string(baseline_ratios.g));
+        m_stream.log("Orbeetle attack ratio green: " + std::to_string(animation_ratios.g));
+        m_stream.log("Orbeetle baseline ratio blue: " + std::to_string(baseline_ratios.b));
+        m_stream.log("Orbeetle attack ratio blue: " + std::to_string(animation_ratios.b));
+    }
+
+    if ((animation_ratios.r >= 1.4 * baseline_ratios.r)
+//        && (animation_ratios.g <= 0.85 * baseline_ratios.g)
+//        && (animation_ratios.b <= 0.85 * baseline_ratios.b)
+        )
+    {
+        if (save_screenshot){
+            //animation_image->save("orbeetle-attack-special-" + now_to_filestring() + ".png");
+            dump_debug_image(m_stream.logger(), "rng", "orbeetle-special", animation_image);
+        }
+        m_stream.log("Orbeetle Attack Animation: Special animation detected.");
+        return Detection::SPECIAL;
+    }
+    if (save_screenshot){
+        //animation_image->save("orbeetle-attack-physical-" + now_to_filestring() + ".png");
+        dump_debug_image(m_stream.logger(), "rng", "orbeetle-physical", animation_image);
+    }
+    m_stream.log("Orbeetle Attack Animation: Physical animation detected.");
+    return Detection::PHYSICAL;
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/RNG/PokemonSwSh_OrbeetleAttackAnimationDetector.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/RNG/PokemonSwSh_OrbeetleAttackAnimationDetector.h
new file mode 100644
index 0000000000..12f5cc8356
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/RNG/PokemonSwSh_OrbeetleAttackAnimationDetector.h
@@ -0,0 +1,48 @@
+/*  Orbeetle Attack Animation Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *
+ *      Detects whether Orbeetle's animation is special or physical.
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_OrbeetleAttackAnimationDetector_H
+#define PokemonAutomation_PokemonSwSh_OrbeetleAttackAnimationDetector_H
+
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonFramework/Tools/VideoStream.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+
+namespace PokemonAutomation{
+class ProgramEnvironment;
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+class OrbeetleAttackAnimationDetector{
+public:
+    enum Detection{
+        NO_DETECTION,
+        SPECIAL,
+        PHYSICAL,
+    };
+
+public:
+    OrbeetleAttackAnimationDetector(VideoStream& stream, ProControllerContext& context);
+
+    Detection run(bool save_screenshot, bool log_values);
+
+
+private:
+    VideoStream& m_stream;
+    ProControllerContext& m_context;
+    OverlayBoxScope m_box;
+};
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_ShinyEncounterDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_ShinyEncounterDetector.cpp
similarity index 86%
rename from SerialPrograms/Source/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_ShinyEncounterDetector.cpp
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_ShinyEncounterDetector.cpp
index 12c011f389..df6a22b947 100644
--- a/SerialPrograms/Source/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_ShinyEncounterDetector.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_ShinyEncounterDetector.cpp
@@ -1,16 +1,15 @@
 /*  Shiny Encounter Detector
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include "Common/Cpp/PrettyPrint.h"
 #include "Common/Cpp/Exceptions.h"
 #include "CommonFramework/ImageTypes/ImageRGB32.h"
-//#include "CommonFramework/Tools/ErrorDumper.h"
 #include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
-#include "PokemonSwSh/PokemonSwSh_Settings.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "VideoGames/PokemonSwSh/PokemonSwSh_Settings.h"
 #include "PokemonSwSh_ShinyEncounterDetector.h"
 
 //#include <iostream>
@@ -97,7 +96,7 @@ ShinyType determine_shiny_status(
     std::chrono::milliseconds min_delay = battle_settings.dialog_delay_when_shiny - std::chrono::milliseconds(300);
     std::chrono::milliseconds max_delay = battle_settings.dialog_delay_when_shiny + std::chrono::milliseconds(500);
     if (min_delay <= dialog_duration && dialog_duration <= max_delay){
-        alpha += GameSettings::instance().SHINY_DIALOG_ALPHA;
+        alpha += GameSettings::instance().SHINY_DIALOG_ALPHA0;
     }
 
     double best_star = sparkles.best_star();
@@ -129,23 +128,23 @@ ShinyType determine_shiny_status(
 
 
 ShinyDetectionResult detect_shiny_battle(
-    ConsoleHandle& console, CancellableScope& scope,
+    VideoStream& stream, CancellableScope& scope,
     const ShinyDetectionBattle& battle_settings,
     std::chrono::seconds timeout
 ){
-    ShinyEncounterTracker tracker(console, console, battle_settings);
+    ShinyEncounterTracker tracker(stream.logger(), stream.overlay(), battle_settings);
     int result = wait_until(
-        console, scope, timeout,
+        stream, scope, timeout,
         {{tracker}}
     );
     if (result < 0){
-        console.log("ShinyDetector: Battle menu not found after timeout.", COLOR_RED);
+        stream.log("ShinyDetector: Battle menu not found after timeout.", COLOR_RED);
         return ShinyDetectionResult{ShinyType::UNKNOWN, 0, std::make_shared<ImageRGB32>()};
     }
     double alpha;
     ShinyType shiny_type = determine_shiny_status(
         alpha,
-        console,
+        stream.logger(),
         battle_settings,
         tracker.dialog_tracker(),
         tracker.sparkles_wild()
diff --git a/SerialPrograms/Source/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_ShinyEncounterDetector.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_ShinyEncounterDetector.h
similarity index 75%
rename from SerialPrograms/Source/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_ShinyEncounterDetector.h
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_ShinyEncounterDetector.h
index 82365926e2..69718f3db9 100644
--- a/SerialPrograms/Source/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_ShinyEncounterDetector.h
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_ShinyEncounterDetector.h
@@ -1,26 +1,25 @@
 /*  Shiny Encounter Detector
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifndef PokemonAutomation_PokemonSwSh_ShinyEncounterDetector_H
 #define PokemonAutomation_PokemonSwSh_ShinyEncounterDetector_H
 
-#include "CommonFramework/InferenceInfra/VisualInferenceCallback.h"
+#include "CommonFramework/Tools/VideoStream.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
 #include "Pokemon/Pokemon_DataTypes.h"
-#include "Pokemon/Options/Pokemon_EncounterBotOptions.h"
-#include "PokemonSwSh/Inference/Battles/PokemonSwSh_BattleMenuDetector.h"
-#include "PokemonSwSh/Inference/Battles/PokemonSwSh_BattleDialogDetector.h"
-#include "PokemonSwSh/Inference/Battles/PokemonSwSh_BattleDialogTracker.h"
+#include "VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleMenuDetector.h"
+#include "VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleDialogDetector.h"
+#include "VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleDialogTracker.h"
 #include "PokemonSwSh_ShinySparkleSet.h"
 
 namespace PokemonAutomation{
     class CancellableScope;
-    class BotBaseContext;
-    class ConsoleHandle;
 namespace NintendoSwitch{
 namespace PokemonSwSh{
+
 using namespace Pokemon;
 
 
@@ -80,7 +79,7 @@ ShinyType determine_shiny_status(
 
 
 ShinyDetectionResult detect_shiny_battle(
-    ConsoleHandle& console, CancellableScope& scope,
+    VideoStream& stream, CancellableScope& scope,
     const ShinyDetectionBattle& battle_settings,
     std::chrono::seconds timeout
 );
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_ShinySparkleSet.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_ShinySparkleSet.cpp
new file mode 100644
index 0000000000..ed375c9948
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_ShinySparkleSet.cpp
@@ -0,0 +1,236 @@
+/*  Shiny Sparkle Set
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <deque>
+#include <sstream>
+#include "Common/Cpp/Concurrency/SpinLock.h"
+#include "Common/Cpp/Concurrency/AsyncTask.h"
+#include "Kernels/Waterfill/Kernels_Waterfill_Session.h"
+#include "CommonFramework/Tools/GlobalThreadPools.h"
+#include "CommonTools/Images/BinaryImage_FilterRgb32.h"
+#include "VideoGames/PokemonSwSh/PokemonSwSh_Settings.h"
+#include "PokemonSwSh_SparkleDetectorRadial.h"
+#include "PokemonSwSh_SparkleDetectorSquare.h"
+#include "PokemonSwSh_ShinySparkleSet.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+using namespace Kernels;
+using namespace Kernels::Waterfill;
+
+
+ShinySparkleSetSwSh::~ShinySparkleSetSwSh(){}
+void ShinySparkleSetSwSh::clear(){
+    balls.clear();
+    stars.clear();
+    squares.clear();
+    lines.clear();
+    m_alpha_overall = 0;
+    m_alpha_star = 0;
+    m_alpha_square = 0;
+}
+
+std::string ShinySparkleSetSwSh::to_str() const{
+    std::ostringstream ss;
+    if (m_alpha_overall < 1.0){
+        return "";
+    }
+    ss << "SparkleDetector";
+    if (!balls.empty()){
+        ss << " - Balls: " << balls.size();
+    }
+    if (!stars.empty()){
+        ss << " - Stars: " << stars.size();
+    }
+    if (!squares.empty()){
+        ss << " - Squares: " << squares.size();
+    }
+    if (!lines.empty()){
+        ss << " - Lines: " << lines.size();
+    }
+    ss << " - (alpha = " << m_alpha_overall << ")";
+    return ss.str();
+}
+void ShinySparkleSetSwSh::draw_boxes(
+    VideoOverlaySet& overlays,
+    const ImageViewRGB32& frame,
+    const ImageFloatBox& inference_box
+) const{
+    for (const ImagePixelBox& box : balls){
+        overlays.add(COLOR_GREEN, translate_to_parent(frame, inference_box, box));
+    }
+    for (const ImagePixelBox& box : stars){
+        overlays.add(COLOR_BLUE, translate_to_parent(frame, inference_box, box));
+    }
+    for (const ImagePixelBox& box : squares){
+        overlays.add(COLOR_MAGENTA, translate_to_parent(frame, inference_box, box));
+    }
+    for (const ImagePixelBox& box : lines){
+        overlays.add(COLOR_YELLOW, translate_to_parent(frame, inference_box, box));
+    }
+}
+void ShinySparkleSetSwSh::update_alphas(){
+    const GameSettings& settings = GameSettings::instance();
+    double ball_alpha   = settings.BALL_SPARKLE_ALPHA * balls.size();
+    double star_alpha   = settings.STAR_SPARKLE_ALPHA * stars.size();
+    double square_alpha = settings.SQUARE_SPARKLE_ALPHA * squares.size();
+    double line_alpha   = std::min(settings.LINE_SPARKLE_ALPHA * lines.size(), square_alpha);
+    m_alpha_overall = ball_alpha + star_alpha + square_alpha + line_alpha;
+    m_alpha_star = star_alpha;
+    m_alpha_square = square_alpha + line_alpha;
+}
+
+
+
+void find_sparkles(
+    size_t screen_area,
+    SpinLock& lock,
+    ShinySparkleSetSwSh& sparkles,
+    const WaterfillObject& object
+){
+    RadialSparkleDetector radial_sparkle(screen_area, object);
+    if (radial_sparkle.is_ball()){
+        WriteSpinLock lg(lock);
+        sparkles.balls.emplace_back(object.min_x, object.min_y, object.max_x, object.max_y);
+        return;
+    }
+    if (radial_sparkle.is_star()){
+        WriteSpinLock lg(lock);
+        sparkles.stars.emplace_back(object.min_x, object.min_y, object.max_x, object.max_y);
+        return;
+    }
+    if (is_line_sparkle(object)){
+        WriteSpinLock lg(lock);
+        sparkles.lines.emplace_back(object.min_x, object.min_y, object.max_x, object.max_y);
+        return;
+    }
+    if (is_square_sparkle(object)){
+        WriteSpinLock lg(lock);
+        sparkles.squares.emplace_back(object.min_x, object.min_y, object.max_x, object.max_y);
+        return;
+    }
+}
+
+//
+//  Find all sparkle-shaped objects in one binary image and sort them into
+//  balls, stars, lines and squares.
+//
+//  This already runs inside a `run_in_parallel()` task on the real-time pool
+//  (see `read_from_image()`), so it must not wait for a free thread in that
+//  same pool, e.g. with `dispatch_now_blocking()`. If every pool thread is
+//  running one of these calls, all of them wait for a free thread that never
+//  comes, and the program freezes with the pool stuck at 100% per thread.
+//
+ShinySparkleSetSwSh find_sparkles(size_t screen_area, WaterfillSession& session){
+    ThreadPool& pool = GlobalThreadPools::computation_realtime();
+    SpinLock lock;
+    ShinySparkleSetSwSh sparkles;
+    std::deque<AsyncTask> tasks;
+    auto finder = session.make_iterator(20);
+    WaterfillObject object;
+    while (finder->find_next(object, true)){
+        std::function<void()> func = [&, screen_area, object = std::move(object)]{
+            find_sparkles(
+                screen_area,
+                lock,
+                sparkles,
+                object
+            );
+        };
+
+        //  Try to dispatch. If thread pool is full, just run it instead.
+        AsyncTask task = pool.try_dispatch_now(func);
+        if (task){
+            tasks.emplace_back(std::move(task));
+        }else{
+            func();
+        }
+    }
+    return sparkles;
+}
+void ShinySparkleSetSwSh::read_from_image(size_t screen_area, const ImageViewRGB32& image){
+    clear();
+    if (!image){
+        return;
+    }
+
+    std::vector<PackedBinaryMatrix> matrices = compress_rgb32_to_binary_range(
+        image,
+        {
+            {0xffa0a000, 0xffffffff},
+            {0xffb0b000, 0xffffffff},
+            {0xffc0c000, 0xffffffff},
+            {0xffd0d000, 0xffffffff},
+        }
+    );
+
+    SpinLock lock;
+    double best_alpha = 0;
+    GlobalThreadPools::computation_realtime().run_in_parallel(
+        [&](size_t index){
+            auto session = make_WaterfillSession();
+            session->set_source(matrices[index]);
+            ShinySparkleSetSwSh sparkles = find_sparkles(screen_area, *session);
+            sparkles.update_alphas();
+            double alpha = sparkles.alpha_overall();
+
+            WriteSpinLock lg(lock);
+            if (best_alpha < alpha){
+                best_alpha = alpha;
+                *this = std::move(sparkles);
+            }
+        },
+        0, matrices.size(), 1
+    );
+
+#if 0
+    auto session = make_WaterfillSession();
+
+    double best_alpha = 0;
+    for (PackedBinaryMatrix& matrix : matrices){
+        session->set_source(matrix);
+        ShinySparkleSetSwSh sparkles = find_sparkles(screen_area, *session);
+        sparkles.update_alphas();
+        double alpha = sparkles.alpha_overall();
+        if (best_alpha < alpha){
+            best_alpha = alpha;
+            *this = std::move(sparkles);
+        }
+    }
+#endif
+}
+
+
+
+
+void ShinySparkleAggregator::add_frame(const std::shared_ptr<const ImageRGB32>& image, const ShinySparkleSetSwSh& sparkles){
+    m_best_overall = std::max(m_best_overall, sparkles.alpha_overall());
+
+    double current_star = sparkles.alpha_star();
+    double current_square = sparkles.alpha_square();
+
+    m_best_star = std::max(m_best_star, current_star);
+    m_best_square = std::max(m_best_square, current_square);
+
+    double type_alpha = std::max(current_star, current_square);
+    if (m_best_type < type_alpha){
+        m_best_type = type_alpha;
+        m_best_image = image;
+    }
+}
+
+
+
+
+
+
+}
+}
+}
+
+
diff --git a/SerialPrograms/Source/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_ShinySparkleSet.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_ShinySparkleSet.h
similarity index 87%
rename from SerialPrograms/Source/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_ShinySparkleSet.h
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_ShinySparkleSet.h
index fa4736840f..10d0a7f38d 100644
--- a/SerialPrograms/Source/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_ShinySparkleSet.h
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_ShinySparkleSet.h
@@ -1,12 +1,14 @@
 /*  Shiny Sparkle Set
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifndef PokemonAutomation_PokemonSwSh_ShinySparkleSet_H
 #define PokemonAutomation_PokemonSwSh_ShinySparkleSet_H
 
+#include <memory>
+#include <vector>
 #include "CommonFramework/ImageTools/ImageBoxes.h"
 #include "Pokemon/Pokemon_ShinySparkleSet.h"
 
@@ -31,7 +33,7 @@ class ShinySparkleSetSwSh : public Pokemon::ShinySparkleSet{
     double alpha_square() const{ return m_alpha_square; }
 
     virtual std::string to_str() const override;
-    virtual void read_from_image(const ImageViewRGB32& image) override;
+    virtual void read_from_image(size_t screen_area, const ImageViewRGB32& image) override;
 
     virtual void draw_boxes(
         VideoOverlaySet& overlays,
diff --git a/SerialPrograms/Source/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_SparkleDetectorRadial.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_SparkleDetectorRadial.cpp
similarity index 86%
rename from SerialPrograms/Source/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_SparkleDetectorRadial.cpp
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_SparkleDetectorRadial.cpp
index cedb2f6564..68d562225d 100644
--- a/SerialPrograms/Source/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_SparkleDetectorRadial.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_SparkleDetectorRadial.cpp
@@ -1,19 +1,18 @@
 /*  Shiny Sparkle Detector
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include <cmath>
 #include <set>
-#include "Kernels/Waterfill/Kernels_Waterfill.h"
 #include "Kernels/Waterfill/Kernels_Waterfill_Session.h"
-#include "CommonFramework/ImageTools/WaterfillUtilities.h"
+#include "CommonTools/Images/WaterfillUtilities.h"
 #include "PokemonSwSh_SparkleDetectorRadial.h"
 
-#include <iostream>
-using std::cout;
-using std::endl;
+//#include <iostream>
+//using std::cout;
+//using std::endl;
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
@@ -27,13 +26,16 @@ const double STAR_SPARKLE_ANGLE_TOLERANCE_DEGREES = 10.;
 
 
 RadialSparkleDetector::~RadialSparkleDetector(){}
-RadialSparkleDetector::RadialSparkleDetector(const WaterfillObject& object)
+RadialSparkleDetector::RadialSparkleDetector(size_t screen_area, const WaterfillObject& object)
     : m_object(object)
 {
     if (object.area < 20){
         return;
     }
-    if (object.area > 10000){
+
+    double area_1080p = 1920 * 1080;
+    double area_current = (double)screen_area;
+    if (object.area * area_1080p > 10000 * area_current){
         return;
     }
 
@@ -126,7 +128,12 @@ bool RadialSparkleDetector::is_star() const{
     size_t width = m_object.width();
     size_t height = m_object.height();
 
-    //  Make sure dimentions are roughly square-ish.
+    //  Area is too small.
+    if (width * height < 100){
+        return false;
+    }
+
+    //  Make sure dimensions are roughly square-ish.
     if (width > 2 * height || height > 2 * width){
         return false;
     }
diff --git a/SerialPrograms/Source/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_SparkleDetectorRadial.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_SparkleDetectorRadial.h
similarity index 81%
rename from SerialPrograms/Source/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_SparkleDetectorRadial.h
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_SparkleDetectorRadial.h
index 343857519d..2eb63ec232 100644
--- a/SerialPrograms/Source/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_SparkleDetectorRadial.h
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_SparkleDetectorRadial.h
@@ -1,6 +1,6 @@
 /*  Shiny Sparkle Detector
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -24,7 +24,7 @@ struct RadialSparkleDetector{
 
 public:
     ~RadialSparkleDetector();
-    RadialSparkleDetector(const WaterfillObject& obj);
+    RadialSparkleDetector(size_t screen_area, const WaterfillObject& obj);
 
     bool is_ball() const;
     bool is_star() const;
diff --git a/SerialPrograms/Source/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_SparkleDetectorSquare.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_SparkleDetectorSquare.cpp
similarity index 90%
rename from SerialPrograms/Source/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_SparkleDetectorSquare.cpp
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_SparkleDetectorSquare.cpp
index b4ff878782..c9637fa73a 100644
--- a/SerialPrograms/Source/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_SparkleDetectorSquare.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_SparkleDetectorSquare.cpp
@@ -1,17 +1,22 @@
 /*  Square Detector
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include <cmath>
+#include <algorithm>
 #include <map>
 #include "Kernels/Waterfill/Kernels_Waterfill.h"
 #include "Kernels/Waterfill/Kernels_Waterfill_Session.h"
 #include "CommonFramework/ImageTypes/BinaryImage.h"
-#include "CommonFramework/ImageTools/DistanceToLine.h"
+#include "CommonTools/Images/DistanceToLine.h"
 #include "PokemonSwSh_SparkleDetectorSquare.h"
 
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
 namespace PokemonAutomation{
 namespace NintendoSwitch{
 namespace PokemonSwSh{
@@ -313,7 +318,7 @@ double normalize_angle_0_360_new(double angle){
 
 
 //  Get all the pixels that border the background.
-std::multimap<double, std::pair<size_t, size_t>> get_edge_pixels(
+std::vector<std::pair<double, std::pair<size_t, size_t>>> get_edge_pixels(
     const PackedBinaryMatrix& object,
     const WaterfillObject& background,
     size_t center_x, size_t center_y,
@@ -322,7 +327,7 @@ std::multimap<double, std::pair<size_t, size_t>> get_edge_pixels(
     size_t width = object.width();
     size_t height = object.height();
 
-    std::multimap<double, std::pair<size_t, size_t>> edge_pixels;
+    std::vector<std::pair<double, std::pair<size_t, size_t>>> edge_pixels;
     if (background.area == 0){
         //  No background. Grab the entire edge.
         for (size_t r = 0; r < height; r++){
@@ -337,7 +342,7 @@ std::multimap<double, std::pair<size_t, size_t>> get_edge_pixels(
                         (ptrdiff_t)c - (ptrdiff_t)center_x
                     ) * 57.295779513082320877;
                     angle = normalize_angle_0_360_new(angle - base_angle);
-                    edge_pixels.emplace(
+                    edge_pixels.emplace_back(
                         angle,
                         std::pair<size_t, size_t>{c, r}
                     );
@@ -365,7 +370,7 @@ std::multimap<double, std::pair<size_t, size_t>> get_edge_pixels(
                     (ptrdiff_t)c - (ptrdiff_t)center_x
                 ) * 57.295779513082320877;
                 angle = normalize_angle_0_360_new(angle - base_angle);
-                edge_pixels.emplace(
+                edge_pixels.emplace_back(
                     angle,
                     std::pair<size_t, size_t>{c, r}
                 );
@@ -376,6 +381,32 @@ std::multimap<double, std::pair<size_t, size_t>> get_edge_pixels(
 }
 
 
+template <typename Key, typename Value>
+typename std::vector<std::pair<Key, Value>>::const_iterator lower_bound(
+    const std::vector<std::pair<Key, Value>>& sorted_vector,
+    const Key& target
+){
+    return std::lower_bound(
+        sorted_vector.begin(), sorted_vector.end(), target,
+        [](const std::pair<Key, Value>& element, const Key& key){
+            return element.first < key;
+        }
+    );
+}
+template <typename Key, typename Value>
+typename std::vector<std::pair<Key, Value>>::const_iterator upper_bound(
+    const std::vector<std::pair<Key, Value>>& sorted_vector,
+    const Key& target
+){
+    return std::upper_bound(
+        sorted_vector.begin(), sorted_vector.end(), target,
+        [](const Key& key, const std::pair<Key, Value>& element){
+            return key < element.first;
+        }
+    );
+}
+
+
 double area_of_triangle(
     ptrdiff_t x0, ptrdiff_t y0,
     ptrdiff_t x1, ptrdiff_t y1,
@@ -393,7 +424,7 @@ double area_of_triangle(
 //      [point_hi_x, point_hi_y]
 //
 double sum_squares_from_line(
-    const std::multimap<double, std::pair<size_t, size_t>>& points_by_angle,
+    const std::vector<std::pair<double, std::pair<size_t, size_t>>>& points_by_angle,
     double point_lo_angle, size_t point_lo_x, size_t point_lo_y,
     double point_hi_angle, size_t point_hi_x, size_t point_hi_y
 ){
@@ -404,8 +435,8 @@ double sum_squares_from_line(
 //    double sum = 0;
     double sum_sqr = 0;
 
-    auto iter0 = points_by_angle.lower_bound(point_lo_angle);
-    auto iter1 = points_by_angle.lower_bound(point_hi_angle);
+    auto iter0 = lower_bound(points_by_angle, point_lo_angle);
+    auto iter1 = lower_bound(points_by_angle, point_hi_angle);
     DistanceToLine calc(
         point_lo_x, point_lo_y,
         point_hi_x, point_hi_y
@@ -522,7 +553,7 @@ bool is_square_sparkle(const Kernels::Waterfill::WaterfillObject& object, double
 
 
     //  Get all the edge pixels.
-    std::multimap<double, std::pair<size_t, size_t>> edge_pixels = get_edge_pixels(
+    std::vector<std::pair<double, std::pair<size_t, size_t>>> edge_pixels = get_edge_pixels(
         matrix, background,
         center_x, center_y, far_corner0.angle
     );
@@ -533,6 +564,13 @@ bool is_square_sparkle(const Kernels::Waterfill::WaterfillObject& object, double
 //    for (const auto& item : points_by_angle){
 //        cout << item.first << " : distance = " << item.second.distance << ", (" << item.second.x << "," << item.second.y << ")" << endl;
 //    }
+    std::sort(
+        edge_pixels.begin(),
+        edge_pixels.end(),
+        [](const auto& a, const auto& b){
+            return a.first < b.first;
+        }
+    );
 
 
     PackedBinaryMatrix test(width, height);
diff --git a/SerialPrograms/Source/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_SparkleDetectorSquare.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_SparkleDetectorSquare.h
similarity index 85%
rename from SerialPrograms/Source/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_SparkleDetectorSquare.h
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_SparkleDetectorSquare.h
index 36a18b1341..0a356a7aa1 100644
--- a/SerialPrograms/Source/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_SparkleDetectorSquare.h
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_SparkleDetectorSquare.h
@@ -1,6 +1,6 @@
 /*  Square Detector
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Sounds/PokemonSwSh_BerryTreeRustlingSoundDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Sounds/PokemonSwSh_BerryTreeRustlingSoundDetector.cpp
new file mode 100644
index 0000000000..a20360a58d
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Sounds/PokemonSwSh_BerryTreeRustlingSoundDetector.cpp
@@ -0,0 +1,52 @@
+/*  Berry Tree Rustling Sound Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+
+#include "CommonTools/Audio/SpectrogramMatcher.h"
+#include "CommonTools/Audio/AudioTemplateCache.h"
+#include "PokemonSwSh_BerryTreeRustlingSoundDetector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+BerryTreeRustlingSoundDetector::BerryTreeRustlingSoundDetector(
+    VideoStream& stream,
+    DetectedCallback detected_callback,
+    float threshold
+)
+    // Use a red as the detection color because the Levelball is made using red apricorns.
+    : AudioPerSpectrumDetectorBase(
+        stream.logger(),
+        "BerryTreeRustlingSoundDetector",
+        "Berry tree rustling sound",
+        COLOR_RED,
+        detected_callback
+    )
+    , m_threshold(threshold)
+{}
+
+
+float BerryTreeRustlingSoundDetector::get_score_threshold() const{
+    return m_threshold;
+}
+
+std::unique_ptr<SpectrogramMatcher> BerryTreeRustlingSoundDetector::build_spectrogram_matcher(size_t sample_rate){
+    return std::make_unique<SpectrogramMatcher>(
+        "Berry Rustle",
+        AudioTemplateCache::instance().get_throw("PokemonSwSh/BerryTreeRustlingSound", sample_rate),
+        SpectrogramMatcher::Mode::RAW, sample_rate,
+        2000,
+        1
+    );
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/PokemonSwSh/Inference/Sounds/PokemonSwSh_BerryTreeRustlingSoundDetector.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Sounds/PokemonSwSh_BerryTreeRustlingSoundDetector.h
similarity index 77%
rename from SerialPrograms/Source/PokemonSwSh/Inference/Sounds/PokemonSwSh_BerryTreeRustlingSoundDetector.h
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Sounds/PokemonSwSh_BerryTreeRustlingSoundDetector.h
index 469968ab38..500b9d9cb6 100644
--- a/SerialPrograms/Source/PokemonSwSh/Inference/Sounds/PokemonSwSh_BerryTreeRustlingSoundDetector.h
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Inference/Sounds/PokemonSwSh_BerryTreeRustlingSoundDetector.h
@@ -1,19 +1,17 @@
 /*  Berry Tree Rustling Sound Detector
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifndef PokemonAutomation_PokemonSwSh_BerryTreeRustlingSoundDetector_H
 #define PokemonAutomation_PokemonSwSh_BerryTreeRustlingSoundDetector_H
 
-#include "CommonFramework/Inference/AudioPerSpectrumDetectorBase.h"
+#include "CommonFramework/Tools/VideoStream.h"
+#include "CommonTools/Audio/AudioPerSpectrumDetectorBase.h"
 
 namespace PokemonAutomation{
-
-class ConsoleHandle;
-class SpectrogramMatcher;
-
+    class SpectrogramMatcher;
 namespace NintendoSwitch{
 namespace PokemonSwSh{
 
@@ -22,7 +20,7 @@ class BerryTreeRustlingSoundDetector : public AudioPerSpectrumDetectorBase{
 public:
     //  Warning: The callback will be called from the audio inference thread.
     BerryTreeRustlingSoundDetector(
-        ConsoleHandle& console,
+        VideoStream& stream,
         DetectedCallback detected_callback,
         float threshold
     );
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/InferenceTraining/PokemonSwSh_GenerateIVCheckerOCR.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/InferenceTraining/PokemonSwSh_GenerateIVCheckerOCR.cpp
new file mode 100644
index 0000000000..a2effa62d0
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/InferenceTraining/PokemonSwSh_GenerateIVCheckerOCR.cpp
@@ -0,0 +1,100 @@
+/*  Generate IV Checker OCR Data
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Filesystem/Filesystem.h"
+#include "Common/Cpp/PrettyPrint.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_IvJudgeReader.h"
+#include "PokemonSwSh_GenerateIVCheckerOCR.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+const std::string IVCheckerOptionOCR::TOKENS[]{
+    "No Good",
+    "Decent",
+    "Pretty Good",
+    "Very Good",
+    "Fantastic",
+    "Best",
+    "Hyper trained!",
+};
+
+
+
+GenerateIVCheckerOCR_Descriptor::GenerateIVCheckerOCR_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonSwSh:GenerateIVCheckerOCR",
+        STRING_POKEMON + " SwSh", "Generate IV Checker OCR Data",
+        "",
+        "Generate IV Checker OCR Data",
+        PanelQualityStanding::DEVELOPER,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+
+
+GenerateIVCheckerOCR::GenerateIVCheckerOCR()
+    : LANGUAGE(
+        "<b>Game Language:</b>",
+        IV_READER().languages(),
+        LockMode::LOCK_WHILE_RUNNING
+    )
+    , HP("<b>HP:</b>", IvJudgeValue::Best)
+    , ATTACK("<b>Attack:</b>", IvJudgeValue::Best)
+    , DEFENSE("<b>Defense:</b>", IvJudgeValue::Best)
+    , SPATK("<b>Sp. Atk:</b>", IvJudgeValue::Best)
+    , SPDEF("<b>Sp. Def:</b>", IvJudgeValue::Best)
+    , SPEED("<b>Speed:</b>", IvJudgeValue::Best)
+{
+    PA_ADD_OPTION(LANGUAGE);
+    PA_ADD_OPTION(HP);
+    PA_ADD_OPTION(ATTACK);
+    PA_ADD_OPTION(DEFENSE);
+    PA_ADD_OPTION(SPATK);
+    PA_ADD_OPTION(SPDEF);
+    PA_ADD_OPTION(SPEED);
+}
+
+
+void GenerateIVCheckerOCR::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    IvJudgeReaderScope reader(env.console, LANGUAGE);
+
+    std::string path = "IVCheckerOCR/";
+    path += language_data(LANGUAGE).code;
+
+    if (!Filesystem::exists(Filesystem::Path(path))){
+        Filesystem::create_directories(Filesystem::Path(path));
+    }
+    path += "/";
+
+    VideoSnapshot screen = env.console.video().snapshot();
+    std::vector<ImageViewRGB32> images = reader.dump_images(screen);
+
+    std::string now = now_to_filestring();
+    
+    const EnumDropdownDatabase<IvJudgeValue>& database = IvJudgeValue_Database();
+    images[0].save(path + database.find(HP)->display + "-" + now + "a.png");
+    images[1].save(path + database.find(ATTACK)->display + "-" + now + "b.png");
+    images[2].save(path + database.find(DEFENSE)->display + "-" + now + "c.png");
+    images[3].save(path + database.find(SPATK)->display + "-" + now + "d.png");
+    images[4].save(path + database.find(SPDEF)->display + "-" + now + "e.png");
+    images[5].save(path + database.find(SPEED)->display + "-" + now + "f.png");
+
+}
+
+
+
+}
+}
+}
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/InferenceTraining/PokemonSwSh_GenerateIVCheckerOCR.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/InferenceTraining/PokemonSwSh_GenerateIVCheckerOCR.h
new file mode 100644
index 0000000000..9fcbb2a5ea
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/InferenceTraining/PokemonSwSh_GenerateIVCheckerOCR.h
@@ -0,0 +1,74 @@
+/*  Generate IV Checker OCR Data
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_GenerateIVCheckerOCR_H
+#define PokemonAutomation_PokemonSwSh_GenerateIVCheckerOCR_H
+
+#include "CommonTools/Options/LanguageOCROption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "Pokemon/Pokemon_IvJudge.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+using namespace Pokemon;
+
+
+
+class IVCheckerOptionOCR : public EnumDropdownOption<IvJudgeValue>{
+public:
+    static const std::string TOKENS[];
+
+public:
+    IVCheckerOptionOCR(std::string label, IvJudgeValue default_value)
+        : EnumDropdownOption<IvJudgeValue>(
+            std::move(label),
+            IvJudgeValue_Database(),
+            LockMode::LOCK_WHILE_RUNNING,
+            default_value
+        )
+    {}
+};
+
+
+
+class GenerateIVCheckerOCR_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    GenerateIVCheckerOCR_Descriptor();
+};
+
+
+
+class GenerateIVCheckerOCR : public SingleSwitchProgramInstance{
+public:
+    enum Mode{
+        READ_AND_SAVE,
+        GENERATE_TRAINING_DATA,
+    };
+
+public:
+    using Descriptor = GenerateIVCheckerOCR_Descriptor;
+    GenerateIVCheckerOCR();
+
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    OCR::LanguageOCROption LANGUAGE;
+    IVCheckerOptionOCR HP;
+    IVCheckerOptionOCR ATTACK;
+    IVCheckerOptionOCR DEFENSE;
+    IVCheckerOptionOCR SPATK;
+    IVCheckerOptionOCR SPDEF;
+    IVCheckerOptionOCR SPEED;
+};
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/InferenceTraining/PokemonSwSh_GenerateNameOCRPokedex.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/InferenceTraining/PokemonSwSh_GenerateNameOCRPokedex.cpp
similarity index 85%
rename from SerialPrograms/Source/PokemonSwSh/InferenceTraining/PokemonSwSh_GenerateNameOCRPokedex.cpp
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/InferenceTraining/PokemonSwSh_GenerateNameOCRPokedex.cpp
index e480ad2de6..1ed8ebe5d4 100644
--- a/SerialPrograms/Source/PokemonSwSh/InferenceTraining/PokemonSwSh_GenerateNameOCRPokedex.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/InferenceTraining/PokemonSwSh_GenerateNameOCRPokedex.cpp
@@ -1,14 +1,14 @@
 /*  Generate Pokemon Name OCR Data (Pokedex)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include <QDir>
+#include "Common/Cpp/Filesystem/Filesystem.h"
 #include "Common/Cpp/PrettyPrint.h"
 #include "Common/Cpp/Json/JsonValue.h"
 #include "Common/Cpp/Json/JsonArray.h"
-#include "CommonFramework/Globals.h"
+#include "CommonFramework/GlobalAutoPaths.h"
 #include "CommonFramework/ImageTypes/ImageViewRGB32.h"
 #include "CommonFramework/VideoPipeline/VideoFeed.h"
 #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
@@ -17,9 +17,9 @@
 #include "Pokemon/Inference/Pokemon_NameReader.h"
 #include "PokemonSwSh_GenerateNameOCRPokedex.h"
 
-#include <iostream>
-using std::cout;
-using std::endl;
+//#include <iostream>
+//using std::cout;
+//using std::endl;
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
@@ -33,9 +33,10 @@ GenerateNameOCRDataPokedex_Descriptor::GenerateNameOCRDataPokedex_Descriptor()
         STRING_POKEMON + " SwSh", "Generate " + STRING_POKEMON + " Name OCR Data",
         "",
         "Generate " + STRING_POKEMON + " Name OCR data by iterating the " + STRING_POKEDEX + ".",
+        PanelQualityStanding::DEVELOPER,
+        ProgramControllerClass::StandardController_NoRestrictions,
         FeedbackType::REQUIRED,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
     )
 {}
 
@@ -45,7 +46,7 @@ GenerateNameOCRDataPokedex::GenerateNameOCRDataPokedex()
     : LANGUAGE(
         "<b>Game Language:</b>",
         PokemonNameReader::instance().languages(),
-        LockWhileRunning::LOCKED
+        LockMode::LOCK_WHILE_RUNNING
     )
     , POKEDEX(
         "<b>" + STRING_POKEDEX + ":</b>",
@@ -54,7 +55,7 @@ GenerateNameOCRDataPokedex::GenerateNameOCRDataPokedex()
             {Pokedex::IsleOfArmor, "isle-of-armor", "Isle of Armor"},
             {Pokedex::CrownTundra, "crown-tundra", "Crown Tundra"},
         },
-        LockWhileRunning::LOCKED,
+        LockMode::LOCK_WHILE_RUNNING,
         Pokedex::Galar
     )
     , MODE(
@@ -63,7 +64,7 @@ GenerateNameOCRDataPokedex::GenerateNameOCRDataPokedex()
             {Mode::SaveToJson, "save-to-json", "Read names and save to JSON."},
             {Mode::GenerateTrainingData, "generate-training-data", "Generate training data."},
         },
-        LockWhileRunning::LOCKED,
+        LockMode::LOCK_WHILE_RUNNING,
         Mode::GenerateTrainingData
     )
 {
@@ -100,9 +101,8 @@ void GenerateNameOCRDataPokedex::dump_images(
     std::string path = "PokemonNameOCR/";
     path += language_data(LANGUAGE).code;
 
-    QDir dir(QString::fromStdString(path));
-    if (!dir.exists()){
-        dir.mkpath(".");
+    if (!Filesystem::exists(Filesystem::Path(path))){
+        Filesystem::create_directories(Filesystem::Path(path));
     }
 
     path += "/";
@@ -115,7 +115,7 @@ void GenerateNameOCRDataPokedex::dump_images(
 //    OCR::make_OCR_filter(image).apply(image);
 }
 
-void GenerateNameOCRDataPokedex::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
+void GenerateNameOCRDataPokedex::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
 
     std::string dex_name;
     size_t dex_size = 0;
@@ -149,9 +149,9 @@ void GenerateNameOCRDataPokedex::program(SingleSwitchProgramEnvironment& env, Bo
     if (MODE == Mode::GenerateTrainingData){
         std::string path = RESOURCE_PATH() + "Pokemon/Pokedex/Pokedex-" + dex_name + ".json";
         JsonValue json = load_json_file(path);
-        JsonArray& array = json.get_array_throw(path);
+        JsonArray& array = json.to_array_throw(path);
         for (const auto& item : array){
-            expected.emplace_back(item.get_string_throw(path));
+            expected.emplace_back(item.to_string_throw(path));
         }
     }
 
@@ -195,7 +195,7 @@ void GenerateNameOCRDataPokedex::program(SingleSwitchProgramEnvironment& env, Bo
             break;
         }
 
-        pbf_press_dpad(context, DPAD_RIGHT, 10, TICKS_PER_SECOND);
+        pbf_press_dpad(context, DPAD_RIGHT, 80ms, 1000ms);
     }
 
     if (MODE == Mode::SaveToJson){
diff --git a/SerialPrograms/Source/PokemonSwSh/InferenceTraining/PokemonSwSh_GenerateNameOCRPokedex.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/InferenceTraining/PokemonSwSh_GenerateNameOCRPokedex.h
similarity index 78%
rename from SerialPrograms/Source/PokemonSwSh/InferenceTraining/PokemonSwSh_GenerateNameOCRPokedex.h
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/InferenceTraining/PokemonSwSh_GenerateNameOCRPokedex.h
index 9f653b663d..4b8276e483 100644
--- a/SerialPrograms/Source/PokemonSwSh/InferenceTraining/PokemonSwSh_GenerateNameOCRPokedex.h
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/InferenceTraining/PokemonSwSh_GenerateNameOCRPokedex.h
@@ -1,6 +1,6 @@
 /*  Generate Pokemon Name OCR Data (Pokedex)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -8,7 +8,7 @@
 #define PokemonAutomation_PokemonSwSh_GenerateNameOCRData_H
 
 #include "Common/Cpp/Options/EnumDropdownOption.h"
-#include "CommonFramework/Options/LanguageOCROption.h"
+#include "CommonTools/Options/LanguageOCROption.h"
 #include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
 
 
@@ -28,11 +28,10 @@ class GenerateNameOCRDataPokedex_Descriptor : public SingleSwitchProgramDescript
 
 class GenerateNameOCRDataPokedex : public SingleSwitchProgramInstance{
 public:
-
-public:
+    using Descriptor = GenerateNameOCRDataPokedex_Descriptor;
     GenerateNameOCRDataPokedex();
 
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
 
 private:
     void read(
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/InferenceTraining/PokemonSwSh_GeneratePokedexSprites.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/InferenceTraining/PokemonSwSh_GeneratePokedexSprites.cpp
new file mode 100644
index 0000000000..1b5fc73eef
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/InferenceTraining/PokemonSwSh_GeneratePokedexSprites.cpp
@@ -0,0 +1,241 @@
+/*  Generate Pokemon Sprite Data (Pokedex)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Filesystem/Filesystem.h"
+#include "CommonFramework/Exceptions/ProgramFinishedException.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/ImageTools/ImageStats.h"
+#include "CommonFramework/ImageTools/ImageDiff.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "Pokemon/Inference/Pokemon_NameReader.h"
+#include "VideoGames/PokemonSwSh/Resources/PokemonSwSh_NameDatabase.h"
+#include "PokemonSwSh_GeneratePokedexSprites.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+using namespace Pokemon;
+
+
+GeneratePokedexSprites_Descriptor::GeneratePokedexSprites_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonSwSh:GeneratePokedexSprites",
+        STRING_POKEMON + " SwSh", "Generate " + STRING_POKEMON + " Sprite Data",
+        "",
+        "Generate " + STRING_POKEMON + " Sprite data by iterating the " + STRING_POKEDEX + ".",
+        PanelQualityStanding::DEVELOPER,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+
+GeneratePokedexSprites::GeneratePokedexSprites()
+    : LANGUAGE(
+        "<b>Game Language:</b>",
+        PokemonNameReader::instance().languages(),
+        LockMode::LOCK_WHILE_RUNNING
+    )
+    , HORIZONTAL_FRAMES(
+        "<b>Frames per 360 Degree Horizontal Rotation:</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        10
+    )
+    , ANIMATION_FRAMES(
+        "<b>Animation Frames per Camera Angle:</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        2
+    )
+{
+    PA_ADD_OPTION(LANGUAGE);
+    PA_ADD_OPTION(HORIZONTAL_FRAMES);
+    PA_ADD_OPTION(ANIMATION_FRAMES);
+}
+
+
+class GenerateDexModelSession{
+    static constexpr uint16_t HORIZONTAL_360 = 160;
+    static constexpr uint16_t VERTICAL_90 = 40;
+
+public:
+    GenerateDexModelSession(
+        VideoStream& stream, ProControllerContext& context,
+        size_t horizontal_frames = 10,
+        size_t animation_frames = 2
+    )
+        : m_stream(stream), m_context(context)
+        , m_path("PokedexSprites/")
+        , m_horizontal_frames(horizontal_frames)
+        , m_vertical_frames(horizontal_frames * 40 / HORIZONTAL_360 + 1)
+        , m_animation_frames(animation_frames)
+//        , m_frames_per_form(m_horizontal_frames * m_vertical_frames * (m_animation_frames + 1))
+    {
+//        cout << "frames/form = " << m_frames_per_form << endl;
+    }
+
+
+public:
+    void save_image(const std::string& slug, bool is_shiny, size_t form_index, size_t image_index);
+    void iterate_form(const std::string& slug, bool shiny, size_t form_index);
+    void iterate_species();
+    void iterate_dex();
+
+private:
+    VideoStream& m_stream;
+    ProControllerContext& m_context;
+
+    std::string m_path;
+
+    size_t m_horizontal_frames;
+    size_t m_vertical_frames;
+    size_t m_animation_frames;
+//    size_t m_frames_per_form;
+
+    std::set<std::string> m_processed_slugs;
+};
+
+
+
+
+void GenerateDexModelSession::save_image(const std::string& slug, bool is_shiny, size_t form_index, size_t image_index){
+    m_context.wait_for_all_requests();
+    VideoSnapshot screen = m_stream.video().snapshot();
+    ImageViewRGB32 cropped = extract_box_reference(screen, ImageFloatBox(0.20, 0.01, 0.60, 0.93));
+
+    std::string filename = m_path + slug + "/" + slug;
+    filename += is_shiny ? "_shiny" : "_nonshiny";
+    filename += "_f" + std::to_string(form_index);
+    filename += "_#" + std::to_string(image_index);
+    filename += ".jpg";
+    cropped.save(filename);
+}
+void GenerateDexModelSession::iterate_form(const std::string& slug, bool shiny, size_t form_index){
+    size_t image_index = 0;
+
+    Milliseconds step = 1280ms / m_horizontal_frames + 8ms;
+
+    //  Stills
+    for (size_t y = 0; y < m_vertical_frames; y++){
+        for (size_t x = 0; x < m_horizontal_frames; x++){
+            pbf_press_dpad(m_context, DPAD_RIGHT, step, 400ms);
+            save_image(slug, shiny, form_index, image_index++);
+        }
+        pbf_press_dpad(m_context, DPAD_DOWN, step, 400ms);
+    }
+    pbf_press_dpad(m_context, DPAD_UP, 1000ms, 0ms);
+
+    //  Motion
+    pbf_press_button(m_context, BUTTON_A, 160ms, 240ms);
+    for (size_t y = 0; y < m_vertical_frames; y++){
+        for (size_t x = 0; x < m_horizontal_frames; x++){
+            pbf_press_dpad(m_context, DPAD_RIGHT, step, 400ms);
+            for (size_t t = 0; t < m_animation_frames; t++){
+                save_image(slug, shiny, form_index, image_index++);
+                m_context.wait_for(std::chrono::milliseconds(500));
+            }
+        }
+        pbf_press_dpad(m_context, DPAD_DOWN, step, 400ms);
+    }
+    pbf_press_dpad(m_context, DPAD_UP, 1000ms, 0ms);
+}
+void GenerateDexModelSession::iterate_species(){
+    ImageFloatBox SPRITE_BOX(0.45, 0.13, 0.06, 0.09);
+    ImageFloatBox LABEL_BOX(0.85, 0.13, 0.05, 0.09);
+    ImageFloatBox SHINY_BOX(0.90, 0.14, 0.03, 0.06);
+    ImageRGB32 start_sprite;
+    ImageRGB32 start_label;
+    ImageRGB32 start_shiny;
+    std::string slug;
+    bool is_shiny;
+    {
+        VideoSnapshot screen = m_stream.video().snapshot();
+        start_sprite = extract_box_reference(screen, SPRITE_BOX).copy();
+        start_label = extract_box_reference(screen, LABEL_BOX).copy();
+        start_shiny = extract_box_reference(screen, SHINY_BOX).copy();
+        is_shiny = image_stats(start_shiny).stddev.sum() > 100;
+
+        ImageFloatBox NAME_BOX(0.641, 0.134, 0.210, 0.080);
+        PokemonNameReader reader(ALL_POKEMON_SLUGS());
+        OCR::StringMatchResult result = reader.read_substring(
+            m_stream.logger(), Language::English,
+            extract_box_reference(screen, NAME_BOX),
+            OCR::WHITE_TEXT_FILTERS()
+        );
+        if (result.results.empty()){
+            m_stream.log("Unable to read " + STRING_POKEMON + "name.", COLOR_RED);
+            return;
+        }
+        slug = result.results.begin()->second.token;
+    }
+
+#if 1
+    if (m_processed_slugs.contains(slug)){
+//        m_console.log("Skipping already processed " + STRING_POKEMON + ".", COLOR_BLUE);
+//        return;
+        throw ProgramFinishedException();
+    }
+    m_processed_slugs.insert(slug);
+#endif
+
+    Filesystem::create_directories(m_path + slug);
+
+    size_t non_shiny_index = 0;
+    size_t shiny_index = 0;
+
+    double rmsd;
+    do{
+//        cout << "shiny = " << is_shiny;
+
+        size_t& index = is_shiny ? shiny_index : non_shiny_index;
+
+        pbf_press_button(m_context, BUTTON_A, 160ms, 1840ms);
+        iterate_form(slug, is_shiny, index);
+        pbf_press_button(m_context, BUTTON_B, 160ms, 1840ms);
+        pbf_press_dpad(m_context, DPAD_RIGHT, 160ms, 840ms);
+        m_context.wait_for_all_requests();
+
+        index++;
+
+        VideoSnapshot screen = m_stream.video().snapshot();
+        ImageViewRGB32 current_sprite = extract_box_reference(screen, SPRITE_BOX);
+        ImageViewRGB32 current_label = extract_box_reference(screen, LABEL_BOX);
+        ImageViewRGB32 current_shiny = extract_box_reference(screen, SHINY_BOX);
+        is_shiny = image_stats(current_shiny).stddev.sum() > 100;
+        double rmsd0 = ImageMatch::pixel_RMSD(start_sprite, current_sprite);
+        double rmsd1 = ImageMatch::pixel_RMSD(start_label, current_label);
+        double rmsd2 = ImageMatch::pixel_RMSD(start_shiny, current_shiny);
+        rmsd = rmsd0 + rmsd1 + rmsd2;
+//        cout << ", rmsd = " << rmsd << endl;
+    }while (rmsd > 5);
+}
+void GenerateDexModelSession::iterate_dex(){
+    while (true){
+        iterate_species();
+        pbf_press_dpad(m_context, DPAD_DOWN, 160ms, 840ms);
+        m_context.wait_for_all_requests();
+    }
+}
+
+
+
+
+
+
+void GeneratePokedexSprites::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    GenerateDexModelSession session(env.console, context);
+    session.iterate_dex();
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/InferenceTraining/PokemonSwSh_GeneratePokedexSprites.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/InferenceTraining/PokemonSwSh_GeneratePokedexSprites.h
new file mode 100644
index 0000000000..3bfa67df27
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/InferenceTraining/PokemonSwSh_GeneratePokedexSprites.h
@@ -0,0 +1,45 @@
+/*  Generate Pokemon Sprite Data (Pokedex)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_GeneratePokedexSprites_H
+#define PokemonAutomation_PokemonSwSh_GeneratePokedexSprites_H
+
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "CommonTools/Options/LanguageOCROption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+class GeneratePokedexSprites_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    GeneratePokedexSprites_Descriptor();
+};
+
+
+
+class GeneratePokedexSprites : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = GeneratePokedexSprites_Descriptor;
+    GeneratePokedexSprites();
+
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+
+private:
+    OCR::LanguageOCROption LANGUAGE;
+    SimpleIntegerOption<uint16_t> HORIZONTAL_FRAMES;
+    SimpleIntegerOption<uint16_t> ANIMATION_FRAMES;
+};
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI.cpp
new file mode 100644
index 0000000000..2edbd3e9c6
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI.cpp
@@ -0,0 +1,24 @@
+/*  Max Lair AI
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+//#include "CommonFramework/Environment/Environment.h"
+#include "CommonTools/Random.h"
+#include "PokemonSwSh_MaxLair_AI.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+namespace MaxLairInternal{
+
+
+int random(int min, int max){
+    return random_u32(min, max);
+}
+
+
+}
+}
+}
+}
diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI.h
similarity index 86%
rename from SerialPrograms/Source/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI.h
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI.h
index b1094afcfa..c14c376691 100644
--- a/SerialPrograms/Source/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI.h
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI.h
@@ -1,6 +1,6 @@
 /*  Max Lair AI
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -8,7 +8,7 @@
 #define PokemonAutomation_PokemonSwSh_MaxLair_AI_H
 
 #include "NintendoSwitch/NintendoSwitch_MultiSwitchProgram.h"
-#include "PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_State.h"
+#include "VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_State.h"
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_PathMatchup.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_PathMatchup.cpp
similarity index 90%
rename from SerialPrograms/Source/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_PathMatchup.cpp
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_PathMatchup.cpp
index 0e40442607..c6fba20ea8 100644
--- a/SerialPrograms/Source/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_PathMatchup.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_PathMatchup.cpp
@@ -1,6 +1,6 @@
 /*  Max Lair AI Path Matchup
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -9,9 +9,9 @@
 #include "Common/Cpp/Json/JsonValue.h"
 #include "Common/Cpp/Json/JsonArray.h"
 #include "Common/Cpp/Json/JsonObject.h"
-#include "CommonFramework/Globals.h"
-#include "PokemonSwSh/Resources/PokemonSwSh_MaxLairDatabase.h"
-#include "PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Pokemon.h"
+#include "CommonFramework/GlobalAutoPaths.h"
+#include "VideoGames/PokemonSwSh/Resources/PokemonSwSh_MaxLairDatabase.h"
+#include "VideoGames/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Pokemon.h"
 #include "PokemonSwSh_MaxLair_AI_PathMatchup.h"
 
 namespace PokemonAutomation{
@@ -33,18 +33,18 @@ struct PathMatchDatabase{
     PathMatchDatabase(){
         std::string path = RESOURCE_PATH() + "PokemonSwSh/MaxLair/path_tree.json";
         JsonValue json = load_json_file(path);
-        JsonObject& root = json.get_object_throw(path);
+        JsonObject& root = json.to_object_throw(path);
 
         {
             JsonObject& obj = root.get_object_throw("rental_by_type", path);
-            for (const auto& type : TYPE_ENUM_TO_SLUG){
+            for (const auto& type : POKEMON_TYPE_SLUGS()){
                 if (type.first == PokemonType::NONE){
                     continue;
                 }
                 JsonArray& array = obj.get_array_throw(type.second, path);
                 std::set<std::string>& set = rentals_by_type[type.first];
                 for (auto& item : array){
-                    std::string& str = item.get_string_throw(path);
+                    std::string& str = item.to_string_throw(path);
                     set.insert(std::move(str));
                 }
             }
@@ -54,9 +54,9 @@ struct PathMatchDatabase{
         for (auto& item : node){
             std::map<PokemonType, double>& boss = type_vs_boss[item.first];
 
-            JsonObject& obj = item.second.get_object_throw(path).get_object_throw("hash_table", path);
+            JsonObject& obj = item.second.to_object_throw(path).get_object_throw("hash_table", path);
 
-            for (const auto& type : TYPE_ENUM_TO_SLUG){
+            for (const auto& type : POKEMON_TYPE_SLUGS()){
                 if (type.first == PokemonType::NONE){
                     continue;
                 }
diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_PathMatchup.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_PathMatchup.h
similarity index 83%
rename from SerialPrograms/Source/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_PathMatchup.h
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_PathMatchup.h
index 5028d937ca..1d00c50b30 100644
--- a/SerialPrograms/Source/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_PathMatchup.h
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_PathMatchup.h
@@ -1,6 +1,6 @@
 /*  Max Lair AI Path Matchup
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -11,7 +11,7 @@
 #include <set>
 #include "CommonFramework/Logging/Logger.h"
 #include "Pokemon/Pokemon_Types.h"
-#include "PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_State.h"
+#include "VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_State.h"
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_RentalBossMatchup.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_RentalBossMatchup.cpp
similarity index 82%
rename from SerialPrograms/Source/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_RentalBossMatchup.cpp
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_RentalBossMatchup.cpp
index 84d23a0cef..900c66c34b 100644
--- a/SerialPrograms/Source/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_RentalBossMatchup.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_RentalBossMatchup.cpp
@@ -1,6 +1,6 @@
 /*  Max Lair AI Rental/Boss Matchup
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -8,8 +8,8 @@
 #include "Common/Cpp/Exceptions.h"
 #include "Common/Cpp/Json/JsonValue.h"
 #include "Common/Cpp/Json/JsonObject.h"
-#include "CommonFramework/Globals.h"
-#include "PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Pokemon.h"
+#include "CommonFramework/GlobalAutoPaths.h"
+#include "VideoGames/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Pokemon.h"
 #include "PokemonSwSh_MaxLair_AI_RentalBossMatchup.h"
 
 namespace PokemonAutomation{
@@ -43,12 +43,12 @@ struct MatchupDatabase{
     MatchupDatabase(){
         std::string path = RESOURCE_PATH() + "PokemonSwSh/MaxLair/boss_matchup_LUT.json";
         JsonValue json = load_json_file(path);
-        JsonObject& root = json.get_object_throw(path);
+        JsonObject& root = json.to_object_throw(path);
         for (auto& item0 : root){
             std::map<std::string, double>& sub = map[item0.first];
-            JsonObject& obj = item0.second.get_object_throw(path);
+            JsonObject& obj = item0.second.to_object_throw(path);
             for (auto& item1 : obj){
-                sub[item1.first] = item1.second.get_double_throw(path);
+                sub[item1.first] = item1.second.to_double_throw(path);
             }
         }
     }
diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_RentalBossMatchup.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_RentalBossMatchup.h
similarity index 85%
rename from SerialPrograms/Source/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_RentalBossMatchup.h
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_RentalBossMatchup.h
index 81834c67a1..8c967413b5 100644
--- a/SerialPrograms/Source/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_RentalBossMatchup.h
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_RentalBossMatchup.h
@@ -1,6 +1,6 @@
 /*  Max Lair AI Rental/Boss Matchup
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_SelectItem.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_SelectItem.cpp
similarity index 78%
rename from SerialPrograms/Source/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_SelectItem.cpp
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_SelectItem.cpp
index af0677c779..7f4c6f963c 100644
--- a/SerialPrograms/Source/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_SelectItem.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_SelectItem.cpp
@@ -1,11 +1,11 @@
 /*  Max Lair AI Select Item
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include <cstddef>
-#include "PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI.h"
+#include "VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI.h"
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_SelectMove.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_SelectMove.cpp
similarity index 89%
rename from SerialPrograms/Source/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_SelectMove.cpp
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_SelectMove.cpp
index 1b953a6227..c11c89a886 100644
--- a/SerialPrograms/Source/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_SelectMove.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_SelectMove.cpp
@@ -1,12 +1,11 @@
 /*  Max Lair AI Select Move
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include "PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Matchup.h"
-#include "PokemonSwSh/Resources/PokemonSwSh_TypeMatchup.h"
-#include "PokemonSwSh/Resources/PokemonSwSh_MaxLairDatabase.h"
+#include "VideoGames/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Matchup.h"
+#include "VideoGames/PokemonSwSh/Resources/PokemonSwSh_MaxLairDatabase.h"
 #include "PokemonSwSh_MaxLair_AI.h"
 #include "PokemonSwSh_MaxLair_AI_Tools.h"
 
@@ -134,7 +133,7 @@ std::pair<uint8_t, bool> select_move(
     );
 
     if (state.opponent.empty()){
-        logger.log("Don't know the opponent is. Picking a random move...", COLOR_RED);
+        logger.log("Don't know who the opponent is. Picking a random move...", COLOR_RED);
         return {(uint8_t)random(0, 3), false};
     }
 
diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_SelectPath.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_SelectPath.cpp
similarity index 84%
rename from SerialPrograms/Source/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_SelectPath.cpp
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_SelectPath.cpp
index fc68d99826..6edc227f3b 100644
--- a/SerialPrograms/Source/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_SelectPath.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_SelectPath.cpp
@@ -1,15 +1,13 @@
 /*  Max Lair AI Select Path
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include <cstddef>
-#include "PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI.h"
+#include "VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI.h"
 #include "PokemonSwSh_MaxLair_AI_PathMatchup.h"
 
-#include "PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Pokemon.h"
-
 namespace PokemonAutomation{
 namespace NintendoSwitch{
 namespace PokemonSwSh{
diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_SelectStarter.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_SelectStarter.cpp
similarity index 90%
rename from SerialPrograms/Source/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_SelectStarter.cpp
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_SelectStarter.cpp
index c8bbbebdb8..6ee91c28dc 100644
--- a/SerialPrograms/Source/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_SelectStarter.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_SelectStarter.cpp
@@ -1,10 +1,10 @@
 /*  Max Lair AI Select Starter
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include "PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Matchup.h"
+#include "VideoGames/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Matchup.h"
 #include "PokemonSwSh_MaxLair_AI.h"
 #include "PokemonSwSh_MaxLair_AI_Tools.h"
 #include "PokemonSwSh_MaxLair_AI_RentalBossMatchup.h"
diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_SwapCatch.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_SwapCatch.cpp
similarity index 90%
rename from SerialPrograms/Source/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_SwapCatch.cpp
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_SwapCatch.cpp
index 176163abf4..e1e2de0163 100644
--- a/SerialPrograms/Source/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_SwapCatch.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_SwapCatch.cpp
@@ -1,17 +1,16 @@
 /*  Max Lair AI Swap with Newly Caught
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include <cstddef>
 #include "PokemonSwSh_MaxLair_AI.h"
 #include "PokemonSwSh_MaxLair_AI_Tools.h"
-#include "PokemonSwSh_MaxLair_AI_RentalBossMatchup.h"
 
-#include <iostream>
-using std::cout;
-using std::endl;
+//#include <iostream>
+//using std::cout;
+//using std::endl;
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_SwapProfessor.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_SwapProfessor.cpp
similarity index 91%
rename from SerialPrograms/Source/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_SwapProfessor.cpp
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_SwapProfessor.cpp
index a04db97fa7..74fa33ede8 100644
--- a/SerialPrograms/Source/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_SwapProfessor.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_SwapProfessor.cpp
@@ -1,18 +1,18 @@
 /*  Max Lair AI Swap with Professor
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include "Common/Cpp/Exceptions.h"
-#include "PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Pokemon.h"
-#include "PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Matchup.h"
+#include "VideoGames/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Pokemon.h"
+#include "VideoGames/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Matchup.h"
 #include "PokemonSwSh_MaxLair_AI.h"
 #include "PokemonSwSh_MaxLair_AI_Tools.h"
 
-#include <iostream>
-using std::cout;
-using std::endl;
+//#include <iostream>
+//using std::cout;
+//using std::endl;
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_Tools.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_Tools.cpp
similarity index 91%
rename from SerialPrograms/Source/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_Tools.cpp
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_Tools.cpp
index eb73e7c30b..f1d5a477c2 100644
--- a/SerialPrograms/Source/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_Tools.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_Tools.cpp
@@ -1,21 +1,20 @@
 /*  Max Lair AI Tools
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include <vector>
 #include "Common/Cpp/Exceptions.h"
-#include "PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Pokemon.h"
-#include "PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Matchup.h"
-#include "PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_State.h"
+#include "VideoGames/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Pokemon.h"
+#include "VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_State.h"
 #include "PokemonSwSh_MaxLair_AI_Tools.h"
 #include "PokemonSwSh_MaxLair_AI_PathMatchup.h"
 #include "PokemonSwSh_MaxLair_AI_RentalBossMatchup.h"
 
-#include <iostream>
-using std::cout;
-using std::endl;
+//#include <iostream>
+//using std::cout;
+//using std::endl;
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
@@ -170,8 +169,8 @@ double evaluate_hypothetical_team(
     double sum = 0;
     size_t count = 0;
 
-//    static std::mutex lock;
-//    std::lock_guard<std::mutex> lg(lock);
+//    static Mutex lock;
+//    std::lock_guard<Mutex> lg(lock);
 
 //    cout << team[0]->dump() << endl;
 //    cout << team[1]->dump() << endl;
diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_Tools.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_Tools.h
similarity index 79%
rename from SerialPrograms/Source/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_Tools.h
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_Tools.h
index 8fbcc55c0f..62ac1467b5 100644
--- a/SerialPrograms/Source/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_Tools.h
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_Tools.h
@@ -1,6 +1,6 @@
 /*  Max Lair AI Tools
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -9,8 +9,8 @@
 
 #include <memory>
 #include "CommonFramework/Logging/Logger.h"
-#include "PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Pokemon.h"
-#include "PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_State.h"
+#include "VideoGames/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Pokemon.h"
+#include "VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_State.h"
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_CatchScreenTracker.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_CatchScreenTracker.cpp
new file mode 100644
index 0000000000..26c374a27d
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_CatchScreenTracker.cpp
@@ -0,0 +1,168 @@
+/*  Catch Screen Tracker
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonFramework/Tools/ErrorDumper.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_EndBattle.h"
+#include "PokemonSwSh_MaxLair_CatchScreenTracker.h"
+
+//#define PA_FORCE_SLOT_SHINY     2
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+namespace MaxLairInternal{
+
+
+CaughtPokemonScreen::CaughtPokemonScreen(VideoStream& stream, ProControllerContext& context)
+    : m_stream(stream)
+    , m_context(context)
+    , m_total(count_catches(stream.overlay(), stream.video().snapshot()))
+{
+    if (m_total == 0 || m_total > 4){
+        stream.log("Detected " + std::to_string(m_total) + " catches. Something is wrong.", COLOR_RED);
+    }
+}
+
+size_t CaughtPokemonScreen::total() const{
+    return m_total;
+}
+const CaughtPokemon& CaughtPokemonScreen::operator[](size_t position) const{
+    return m_mons[position];
+}
+CaughtPokemon& CaughtPokemonScreen::operator[](size_t position){
+    return m_mons[position];
+}
+bool CaughtPokemonScreen::current_position() const{
+    return m_current_position;
+}
+bool CaughtPokemonScreen::is_summary() const{
+    return m_in_summary;
+}
+
+void CaughtPokemonScreen::enter_summary(){
+    SummaryShinySymbolDetector detector(m_stream.logger(), m_stream.overlay());
+    if (m_in_summary){
+        //  Make sure we're actually in the summary screen.
+        process_detection(detector.wait_for_detection(m_context, m_stream.video()));
+        return;
+    }
+
+    pbf_press_button(m_context, BUTTON_A, 160ms, 800ms);
+    pbf_press_dpad(m_context, DPAD_DOWN, 160ms, 400ms);
+    pbf_press_button(m_context, BUTTON_A, 160ms, 0ms);
+    m_context.wait_for_all_requests();
+
+    Detection detection = detector.wait_for_detection(m_context, m_stream.video());
+    m_in_summary = true;
+    process_detection(detection);
+}
+void CaughtPokemonScreen::leave_summary(){
+    if (!m_in_summary){
+        return;
+    }
+
+    //  Make sure we're actually in the summary screen.
+    SummaryShinySymbolDetector detector(m_stream.logger(), m_stream.overlay());
+    process_detection(detector.wait_for_detection(m_context, m_stream.video()));
+
+    pbf_press_button(m_context, BUTTON_B, 160ms, 1000ms);
+
+    PokemonCaughtMenuWatcher caught_menu;
+
+    int result = wait_until(
+        m_stream, m_context,
+        std::chrono::seconds(10),
+        {{caught_menu}}
+    );
+
+    switch (result){
+    case 0:
+        pbf_wait(m_context, 1000ms);
+        m_context.wait_for_all_requests();
+        break;
+    default:
+//        auto snapshot = m_stream.video().snapshot();
+//        dump_image(m_stream, m_env.program_info(), "CaughtMenu", snapshot);
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "Failed to detect caught menu.",
+            m_stream
+        );
+    }
+
+    m_in_summary = false;
+}
+void CaughtPokemonScreen::scroll_down(){
+    pbf_press_dpad(m_context, DPAD_DOWN, 160ms, 1000ms);
+    m_context.wait_for_all_requests();
+    m_current_position++;
+    if (m_current_position >= m_total){
+        m_current_position = 0;
+    }
+    if (m_in_summary){
+        SummaryShinySymbolDetector detector(m_stream.logger(), m_stream.overlay());
+        Detection detection = detector.wait_for_detection(m_context, m_stream.video());
+        process_detection(detection);
+    }
+}
+void CaughtPokemonScreen::scroll_to(size_t position){
+    while (m_current_position != position){
+        scroll_down();
+    }
+}
+void CaughtPokemonScreen::process_detection(Detection detection){
+#ifdef PA_FORCE_SLOT_SHINY
+        if (m_current_position == PA_FORCE_SLOT_SHINY){
+            detection = Detection::SHINY;
+        }
+#endif
+    CaughtPokemon& mon = m_mons[m_current_position];
+    switch (detection){
+    case SummaryShinySymbolDetector::Detection::NO_DETECTION:
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "Failed to detect summary screen.",
+            m_stream
+        );
+    case SummaryShinySymbolDetector::Detection::NOT_SHINY:
+        if (!mon.read){
+            m_stream.log("Not shiny.", COLOR_BLUE);
+            mon.shiny = false;
+            mon.read = true;
+        }else if (mon.shiny){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "Fatal Inconsistency: Expected to see a non-shiny.",
+                m_stream
+            );
+        }
+        break;
+    case SummaryShinySymbolDetector::Detection::SHINY:
+        if (!mon.read){
+            m_stream.log("Found shiny!", COLOR_BLUE);
+            mon.shiny = true;
+            mon.read = true;
+        }else if (!mon.shiny){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "Fatal Inconsistency: Expected to see a shiny.",
+                m_stream
+            );
+        }
+        break;
+    }
+}
+
+
+
+}
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_CatchScreenTracker.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_CatchScreenTracker.h
new file mode 100644
index 0000000000..5884de38ce
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_CatchScreenTracker.h
@@ -0,0 +1,62 @@
+/*  Catch Screen Tracker
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_MaxLair_CatchScreenTracker_H
+#define PokemonAutomation_PokemonSwSh_MaxLair_CatchScreenTracker_H
+
+#include "CommonFramework/Tools/VideoStream.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+#include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_SummaryShinySymbolDetector.h"
+
+namespace PokemonAutomation{
+    class ProgramEnvironment;
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+namespace MaxLairInternal{
+
+
+struct CaughtPokemon{
+    bool read = false;
+    bool shiny = false;
+};
+
+class CaughtPokemonScreen{
+    using Detection = SummaryShinySymbolDetector::Detection;
+
+public:
+    CaughtPokemonScreen(VideoStream& stream, ProControllerContext& context);
+
+    size_t total() const;
+    const CaughtPokemon& operator[](size_t position) const;
+          CaughtPokemon& operator[](size_t position);
+
+    bool current_position() const;
+    bool is_summary() const;
+
+    void enter_summary();
+    void leave_summary();
+    void scroll_down();
+    void scroll_to(size_t position);
+
+private:
+    void process_detection(Detection detection);
+
+private:
+    VideoStream& m_stream;
+    ProControllerContext& m_context;
+    size_t m_total;
+    size_t m_current_position = 0;
+    bool m_in_summary = false;
+    CaughtPokemon m_mons[4];
+};
+
+
+
+}
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_Notifications.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_Notifications.cpp
similarity index 82%
rename from SerialPrograms/Source/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_Notifications.cpp
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_Notifications.cpp
index c9e3efc317..7b6dda5677 100644
--- a/SerialPrograms/Source/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_Notifications.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_Notifications.cpp
@@ -1,6 +1,6 @@
 /*  Max Lair Notifications
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -11,7 +11,7 @@
 #include "Pokemon/Pokemon_Strings.h"
 #include "Pokemon/Pokemon_Notification.h"
 #include "Pokemon/Resources/Pokemon_PokemonNames.h"
-#include "PokemonSwSh/Resources/PokemonSwSh_MaxLairDatabase.h"
+#include "VideoGames/PokemonSwSh/Resources/PokemonSwSh_MaxLairDatabase.h"
 #include "PokemonSwSh_MaxLair_Notifications.h"
 
 namespace PokemonAutomation{
@@ -41,11 +41,11 @@ void send_status_notification(
         embeds.emplace_back("Last Boss:", std::move(str));
     }
     {
-        std::string str = runtime.path_stats.to_str();
+        std::string str = runtime.path_stats.to_str(StatsTracker::DISPLAY_ON_SCREEN);
         status_str += "Current Path: " + str + "\n";
         embeds.emplace_back("Current Path:", std::move(str));
     }
-    for (size_t c = 0; c < env.consoles.size(); c++){
+    for (size_t c = 0; c < env.consoles(); c++){
         const ConsoleRuntime& stats = runtime.consoles[c];
         std::string label = "Console " + std::to_string(c) + ":";
         std::string str;
@@ -66,9 +66,9 @@ void send_status_notification(
 
 void send_raid_notification(
     ProgramEnvironment& env,
-    ConsoleHandle& console,
+    VideoStream& stream,
     AutoHostNotificationOption& settings,
-    bool has_code, uint8_t code[8],
+    const std::string& code,
     const std::string& slug,
     const PathStats& path_stats,
     const StatsTracker& session_stats
@@ -77,7 +77,7 @@ void send_raid_notification(
         return;
     }
 
-    VideoSnapshot screen = console.video().snapshot();
+    VideoSnapshot screen = stream.video().snapshot();
 
     std::vector<std::pair<std::string, std::string>> embeds;
 
@@ -95,23 +95,14 @@ void send_raid_notification(
 
     {
         std::string code_str;
-        if (has_code){
-            size_t c = 0;
-            for (; c < 4; c++){
-                code_str += code[c] + '0';
-            }
-            code_str += " ";
-            for (; c < 8; c++){
-                code_str += code[c] + '0';
-            }
-        }else{
-            code_str += "None";
+        if (code.empty()){
+            code_str = "None";
         }
         embeds.emplace_back("Raid Code:", std::move(code_str));
     }
 
     if (path_stats.runs() > 0){
-        embeds.emplace_back("Current Path:", path_stats.to_str());
+        embeds.emplace_back("Current Path:", path_stats.to_str(StatsTracker::DISPLAY_ON_SCREEN));
     }
 
     send_program_notification(
@@ -173,7 +164,7 @@ void send_shiny_notification(
         embeds.emplace_back(STRING_POKEMON + ":", std::move(str));
     }
     if (path_stats.runs() > 0){
-        embeds.emplace_back("Current Path:", path_stats.to_str());
+        embeds.emplace_back("Current Path:", path_stats.to_str(StatsTracker::DISPLAY_ON_SCREEN));
     }
 
     send_program_notification(
diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_Notifications.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_Notifications.h
similarity index 77%
rename from SerialPrograms/Source/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_Notifications.h
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_Notifications.h
index 9ab2d034c8..45818b67df 100644
--- a/SerialPrograms/Source/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_Notifications.h
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_Notifications.h
@@ -1,17 +1,16 @@
 /*  Max Lair Notifications
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifndef PokemonAutomation_PokemonSwSh_MaxLair_Notifications_H
 #define PokemonAutomation_PokemonSwSh_MaxLair_Notifications_H
 
-#include "CommonFramework/Logging/Logger.h"
-#include "CommonFramework/Tools/ConsoleHandle.h"
 #include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/Tools/VideoStream.h"
 #include "NintendoSwitch/NintendoSwitch_MultiSwitchProgram.h"
-#include "PokemonSwSh/Options/PokemonSwSh_AutoHostNotification.h"
+#include "VideoGames/PokemonSwSh/Options/PokemonSwSh_AutoHostNotification.h"
 #include "PokemonSwSh_MaxLair_Stats.h"
 #include "PokemonSwSh_MaxLair_StateMachine.h"
 
@@ -32,9 +31,9 @@ void send_status_notification(
 
 void send_raid_notification(
     ProgramEnvironment& env,
-    ConsoleHandle& console,
+    VideoStream& stream,
     AutoHostNotificationOption& settings,
-    bool has_code, uint8_t code[8],
+    const std::string& code,
     const std::string& slug,
     const PathStats& path_stats,
     const StatsTracker& session_stats
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_State.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_State.cpp
new file mode 100644
index 0000000000..b6bd7a8349
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_State.cpp
@@ -0,0 +1,215 @@
+/*  Max Lair State
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+#include "Common/Cpp/PrettyPrint.h"
+#include "Pokemon/Pokemon_Types.h"
+#include "VideoGames/PokemonSwSh/Resources/PokemonSwSh_MaxLairDatabase.h"
+#include "PokemonSwSh_MaxLair_State.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+namespace MaxLairInternal{
+
+
+namespace{
+
+//  wins is incremented after each battle is won: battles 1-3 (wins < 3) are
+//  against rental Pokemon, and battle 4 (wins == 3) is against the legendary boss.
+bool is_boss_battle(const GlobalState& state){
+    return state.wins == 3;
+}
+
+} // namespace
+
+bool GlobalState::accept_opponent(){
+    const std::string opponent_slug = opponent.empty() ? "" : *opponent.begin();
+    //  A boss before the end means something is out-of-sync.
+    if (!is_boss_battle(*this) && is_boss(opponent_slug)){
+        return false;
+    }
+    //  Infer the boss if we don't know it.
+    if (is_boss_battle(*this) && boss.empty()){
+        boss = opponent_slug;
+    }
+    return true;
+}
+
+std::string GlobalState::boss_if_caught() const{
+    //  The identified boss is reported whether or not it was caught.
+    return boss;
+}
+
+std::string PlayerState::dump() const{
+    std::string str;
+    str += console_id < 0 ? "NPC" : "Switch " + std::to_string(console_id);
+    str += " - mon:";
+    str += pokemon.empty() ? "?" : pokemon;
+    str += " - item:";
+    str += item.empty() ? "?" : item;
+    str += " - dmax-turns-left:";
+    str += std::to_string((int)dmax_turns_left);
+    str += " - can-dmax:";
+    str += can_dmax ? "yes" : "no";
+    str += " - HP:";
+    str += health.value.hp < 0 ? "?" : std::to_string(100*health.value.hp);
+    str += "% - dead:";
+    str += health.value.dead < 0 ? "?" : (health.value.dead ? "yes" : "no");
+    str += " - PP:{";
+    for (size_t c = 0; c < 4; c++){
+        str += std::to_string(pp[c]);
+        if (c + 1 < 4){
+            str += ", ";
+        }
+    }
+    str += "} - blocked:{";
+    for (size_t c = 0; c < 4; c++){
+        str += move_blocked[c] ? "1" : "0";
+        if (c + 1 < 4){
+            str += ", ";
+        }
+    }
+    str += "}";
+    return str;
+}
+void PlayerState::clear_battle_state(){
+    dmax_turns_left = -1;
+    for (size_t c = 0; c < 4 ; c++){
+        move_blocked[c] = false;
+    }
+}
+
+std::string PathMap::dump() const{
+    std::string str;
+    str += "    Path Type: " + std::to_string((int)path_type);
+    str += "\n";
+    {
+        str += "        Row 3: ";
+        bool first = true;
+        for (size_t c = 0; c < 4; c++){
+            if (!first){
+                str += ", ";
+            }
+            first = false;
+            str += POKEMON_TYPE_SLUGS().get_string(mon3[c]);
+        }
+        str += "\n";
+    }
+    {
+        str += "        Row 2: ";
+        bool first = true;
+        for (size_t c = 0; c < 4; c++){
+            if (!first){
+                str += ", ";
+            }
+            first = false;
+            str += POKEMON_TYPE_SLUGS().get_string(mon2[c]);
+        }
+        str += "\n";
+    }
+    {
+        str += "        Row 1: ";
+        bool first = true;
+        for (size_t c = 0; c < 2; c++){
+            if (!first){
+                str += ", ";
+            }
+            first = false;
+            str += POKEMON_TYPE_SLUGS().get_string(mon1[c]);
+        }
+        str += "\n";
+    }
+    return str;
+}
+
+std::string dump_path(const std::vector<PathNode>& path){
+    std::string str;
+    for (const auto& item : path){
+        str += "[";
+        str += std::to_string(item.path_slot);
+        str += ":";
+        str += POKEMON_TYPE_SLUGS().get_string(item.type);
+        str += "] ";
+    }
+    return str;
+}
+
+
+
+std::string GlobalState::dump() const{
+    std::string str;
+    str += "    boss:";
+    if (boss.empty()){
+        str += "? (" + POKEMON_TYPE_SLUGS().get_string(path.boss) + ")";
+    }else{
+        str += boss;
+    }
+    str += " - wins:" + std::to_string(wins);
+    str += " - lives:";
+    str += lives_left < 0 ? "?" : std::to_string(lives_left);
+    str += " - opponent:";
+    if (opponent.empty()){
+        str += "?";
+    }else if (opponent.size() == 1){
+        str += *opponent.begin();
+    }else{
+        str += set_to_str(opponent);
+    }
+    str += " - HP:";
+    str += opponent_hp < 0 ? "?" : std::to_string(100 * opponent_hp);
+    str += "% - slot:";
+    str += std::to_string(move_slot);
+    str += "\n";
+    str += "    Player 0: " + players[0].dump() + "\n";
+    str += "    Player 1: " + players[1].dump() + "\n";
+    str += "    Player 2: " + players[2].dump() + "\n";
+    str += "    Player 3: " + players[3].dump() + "\n";
+    str += path.dump();
+    switch (path_side){
+    case 0: str += "        current-side: left"; break;
+    case 1: str += "        current-side: right"; break;
+    default: str += "        current-side: ?"; break;
+    }
+    str += "\n";
+    str += "    Best Remaining Path: " + dump_path(last_best_path) + "\n";
+    str += "    Seen: " + set_to_str(seen) + "\n";
+    return str;
+}
+void GlobalState::clear_battle_state(){
+    opponent.clear();
+    opponent_hp = -1;
+    move_slot = 0;
+    players[0].clear_battle_state();
+    players[1].clear_battle_state();
+    players[2].clear_battle_state();
+    players[3].clear_battle_state();
+}
+void GlobalState::add_seen(const std::string& mon){
+    if (!mon.empty()){
+        seen.insert(mon);
+    }
+}
+size_t GlobalState::find_player_index(size_t console_id) const{
+    for (size_t c = 0; c < 4; c++){
+        if (players[c].console_id == (int8_t)console_id){
+            return c;
+        }
+    }
+    return console_id;
+}
+
+
+
+
+
+
+
+
+
+
+}
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_State.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_State.h
new file mode 100644
index 0000000000..e6aa8e7050
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_State.h
@@ -0,0 +1,201 @@
+/*  Max Lair State
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_MaxLair_State_H
+#define PokemonAutomation_PokemonSwSh_MaxLair_State_H
+
+#include <string>
+#include <vector>
+#include <set>
+#include "Common/Cpp/Time.h"
+#include "Pokemon/Pokemon_Types.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+namespace MaxLairInternal{
+using namespace Pokemon;
+
+
+template <typename Type>
+struct TimestampedValue{
+    TimestampedValue(const TimestampedValue& x)
+        : timestamp(x.timestamp)
+        , value(x.value)
+    {}
+    void operator=(const TimestampedValue& x){
+        timestamp = x.timestamp;
+        value = x.value;
+    }
+
+    TimestampedValue()
+        : timestamp(WallClock::min())
+        , value()
+    {}
+    TimestampedValue(Type p_value)
+        : timestamp(current_time())
+        , value(std::move(p_value))
+    {}
+    TimestampedValue(Type p_value, WallClock timestamp)
+        : timestamp(timestamp)
+        , value(std::move(p_value))
+    {}
+    void operator=(Type x){
+        timestamp = current_time();
+        value = std::move(x);
+    }
+
+    operator Type() const{
+        return value;
+    }
+
+    WallClock timestamp;
+    Type value;
+};
+
+
+struct Health{
+    double hp = -1;     //  [0.0 - 1.0], -1 means unknown.
+    int8_t dead = -1;   //  1 = dead, 0 = alive, -1 = unknown.
+};
+
+
+struct PlayerState{
+    int8_t console_id = -1;             //  -1 means NPC
+    std::string pokemon;
+    std::string item;
+    int8_t dmax_turns_left = -1;        //  -1 means unknown
+    bool can_dmax = false;
+    TimestampedValue<Health> health;
+    int8_t pp[4] = {-1, -1, -1, -1};    //  -1 means unknown
+
+    //  Battle State
+    bool move_blocked[4] = {false, false, false, false};
+
+    void clear_battle_state();
+
+    std::string dump() const;
+};
+
+
+
+/*
+  Path 0
+     X
+   // \\
+  X X X X
+  \/ \\ /
+   O   O
+  /\\   \
+  X X X X
+   \//\/
+    X  X
+     \/
+     X
+
+  Path 1
+     X
+   // \\
+  X X X X
+  \ //\/
+   O   O
+  / \ / \
+  X X X X
+   \/\\/
+    X  X
+     \/
+     X
+
+  Path 2
+     X
+   // \\
+  X X X X
+  \/ \\ /
+   O   O
+  /  // \
+  X X X X
+   \/ \/
+    X  X
+     \/
+     X
+*/
+
+struct PathMap{
+    int8_t path_type = -1;
+    PokemonType boss = PokemonType::NONE;
+    PokemonType mon3[4] = {PokemonType::NONE, PokemonType::NONE, PokemonType::NONE, PokemonType::NONE};
+    PokemonType mon2[4] = {PokemonType::NONE, PokemonType::NONE, PokemonType::NONE, PokemonType::NONE};
+    PokemonType mon1[2] = {PokemonType::NONE, PokemonType::NONE};
+
+    std::string dump() const;
+};
+
+struct PathNode{
+    uint8_t path_slot;
+    PokemonType type;
+};
+std::string dump_path(const std::vector<PathNode>& path);
+
+
+struct GlobalState{
+    //  Timestamp when this state was issued.
+    WallClock timestamp = WallClock::min();
+
+    bool adventure_started = false;
+
+    //  The adventure's boss as known from the start: the den's boss sprite,
+    //  voted across consoles. Used all adventure long (path and move choice,
+    //  the boss ball, the fourth battle's check, Save Path) and kept after a
+    //  lost adventure.
+    std::string boss;
+
+    PathMap path;
+    int8_t path_side = -1;  //  -1 = unknown, 0 = left, 1 = right
+    std::vector<PathNode> last_best_path;
+
+    uint8_t wins = 0;
+    int8_t lives_left = -1; //  -1 means unknown
+
+    PlayerState players[4];
+
+    std::set<std::string> seen;
+    void add_seen(const std::string& mon);
+
+    //  Battle State
+    std::set<std::string> opponent;
+    TimestampedValue<double> opponent_hp = -1;
+    uint8_t move_slot = 0;
+
+    size_t find_player_index(size_t console_id) const;
+    void clear_battle_state();
+
+    //  Returns false when the opponent read doesn't fit this battle stage (a
+    //  boss before the fourth battle), so the caller retries the read. On an
+    //  accepted read at the fourth battle, records the boss if none is known.
+    bool accept_opponent();
+
+    //  The same boss, but only if the adventure caught it, else empty: for the
+    //  end-of-adventure decision (end_adventure_action()), which must not apply
+    //  the boss-caught rules after a loss. Decided from the battles won (the
+    //  boss is the fourth battle), not from how many Pokemon were caught, so it
+    //  stays right if non-boss catches are ever skipped.
+    //  For now this returns boss whatever the battles won.
+    std::string boss_if_caught() const;
+
+    std::string dump() const;
+};
+
+
+
+
+
+
+
+}
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_StateMachine.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_StateMachine.cpp
new file mode 100644
index 0000000000..747d4d5bba
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_StateMachine.cpp
@@ -0,0 +1,217 @@
+/*  Max Lair State Machine
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Containers/FixedLimitVector.tpp"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/Tools/ErrorDumper.h"
+#include "CommonFramework/Notifications/ProgramInfo.h"
+#include "CommonTools/Async/InterruptableCommands.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "CommonTools/VisualDetectors/FrozenImageDetector.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonSwSh/Inference/Dens/PokemonSwSh_RaidCatchDetector.h"
+#include "VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonSelectMenu.h"
+#include "VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathSelect.h"
+#include "VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_ItemSelectMenu.h"
+#include "VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_ProfessorSwap.h"
+#include "VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_BattleMenu.h"
+#include "VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonSwapMenu.h"
+#include "VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_EndBattle.h"
+#include "VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_Entrance.h"
+#include "VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_PokemonSelect.h"
+#include "VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_PathSelect.h"
+#include "VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_ItemSelect.h"
+#include "VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_ProfessorSwap.h"
+#include "VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_Battle.h"
+#include "VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_PokemonSwap.h"
+#include "VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_CaughtScreen.h"
+#include "VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_Entrance.h"
+#include "PokemonSwSh_MaxLair_StateMachine.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+namespace MaxLairInternal{
+
+
+
+AdventureRuntime::~AdventureRuntime() = default;
+AdventureRuntime::AdventureRuntime(
+    MultiSwitchProgramEnvironment& env,
+    const size_t p_host_index,
+    const Consoles& p_console_settings,
+    const EndBattleDecider& p_actions,
+    const bool p_go_home_when_done,
+    HostingSettings& p_hosting_settings,
+    EventNotificationOption& p_notification_status,
+    EventNotificationOption& p_notification_shiny,
+    Stats& p_session_stats
+)
+    : host_index(p_host_index)
+    , console_settings(p_console_settings)
+    , actions(p_actions)
+    , go_home_when_done(p_go_home_when_done)
+    , hosting_settings(p_hosting_settings)
+    , notification_status(p_notification_status)
+    , notification_shiny(p_notification_shiny)
+    , ocr_watchdog(p_console_settings.active_consoles())
+    , session_stats(p_session_stats)
+{
+    for (size_t c = 0; c < p_console_settings.active_consoles(); c++){
+        ocr_watchdog.emplace_back(env.console(c).logger(), console_settings.PLAYERS[c]->language);
+    }
+}
+
+
+StateMachineAction run_state_iteration(
+    AdventureRuntime& runtime, size_t console_index,
+    ProgramEnvironment& env,
+    ConsoleHandle& console, ProControllerContext& context,
+    bool save_path,
+    GlobalStateTracker& global_state,
+    const EndBattleDecider& decider,
+    const ImageViewRGB32& entrance
+){
+    GlobalState state = global_state.infer_actual_state(console_index);
+//    uint8_t wins = state.wins;
+    bool starting = true;
+    for (size_t c = 0; c < 4; c++){
+        if (state.players[c].console_id == (int8_t)console_index){
+            starting = false;
+            break;
+        }
+    }
+
+    PokemonSelectMenuDetector pokemon_select(false);
+    PokemonSwapMenuDetector pokemon_swap(false);
+    PathSelectDetector path_select;
+    ItemSelectDetector item_menu(false);
+    ProfessorSwapDetector professor_swap(console.overlay(), !starting);
+    BattleMenuDetector battle_menu;
+    RaidCatchWatcher catch_select(console.overlay());
+    PokemonCaughtMenuWatcher caught_menu;
+    EntranceDetector entrance_detector(entrance);
+    FrozenImageDetector frozen_screen(COLOR_CYAN, {0, 0, 1, 0.5}, std::chrono::seconds(30), 10);
+
+    int result = wait_until(
+        console, context,
+        std::chrono::seconds(300),
+        {
+            {starting
+                ? (VisualInferenceCallback&)pokemon_select
+                : (VisualInferenceCallback&)pokemon_swap
+            },
+            {path_select},
+            {item_menu},
+            {professor_swap},
+            {battle_menu},
+            {catch_select},
+            {caught_menu},
+            {entrance_detector},
+            {frozen_screen},
+        },
+        std::chrono::milliseconds(200)
+    );
+
+    switch (result){
+    case 0:
+        if (starting){
+            console.log("Current State: " + STRING_POKEMON + " Select");
+            run_select_pokemon(
+                console_index,
+                console, context,
+                global_state,
+                runtime.ocr_watchdog[console_index],
+                runtime.console_settings[console_index]
+            );
+            return StateMachineAction::KEEP_GOING;
+        }else{
+            console.log("Current State: " + STRING_POKEMON + " Swap");
+            run_swap_pokemon(
+                console_index,
+                runtime,
+                console, context,
+                global_state,
+                runtime.console_settings[console_index]
+            );
+            return StateMachineAction::KEEP_GOING;
+        }
+    case 1:
+        console.log("Current State: Path Select");
+        run_path_select(env, console_index, console, context, global_state);
+        return StateMachineAction::KEEP_GOING;
+    case 2:
+        console.log("Current State: Item Select");
+        run_item_select(console_index, console, context, global_state);
+        return StateMachineAction::KEEP_GOING;
+    case 3:
+        console.log("Current State: Professor Swap");
+        run_professor_swap(console_index, runtime, console, context, global_state);
+        return StateMachineAction::KEEP_GOING;
+    case 4:
+        console.log("Current State: Move Select");
+        return run_move_select(
+            env, console_index,
+            console, context,
+            runtime.ocr_watchdog[console_index],
+            global_state,
+            runtime.console_settings[console_index],
+            battle_menu.dmaxed(),
+            battle_menu.cheer()
+        );
+    case 5:
+        console.log("Current State: Catch Select");
+        return throw_balls(
+            runtime,
+            env, console_index,
+            console, context,
+            runtime.console_settings[console_index].language,
+            runtime.ocr_watchdog[console_index],
+            global_state,
+            decider
+        );
+    case 6:
+        console.log("Current State: Caught Menu");
+        return run_caught_screen(
+            runtime,
+            env, console_index,
+            console, context,
+            global_state, decider,
+            entrance
+        );
+    case 7:
+        console.log("Current State: Entrance");
+        run_entrance(
+            runtime,
+            env, console_index,
+            console, context,
+            save_path,
+            global_state
+        );
+        return StateMachineAction::DONE_WITH_ADVENTURE;
+    case 8:
+        console.log("Current State: Frozen Screen", COLOR_RED);
+//        pbf_mash_button(context, BUTTON_B, 1000ms);
+//        context.wait_for_all_requests();
+//        return StateMachineAction::KEEP_GOING;
+        return StateMachineAction::RESET_RECOVER;
+    default:
+        console.log("Program hang. No state detected after 5 minutes.", COLOR_RED);
+        dump_image(console.logger(), MODULE_NAME, console.video(), "ProgramHang");
+        global_state.mark_as_dead(console_index);
+        return StateMachineAction::RESET_RECOVER;
+    }
+
+
+}
+
+
+
+
+}
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_StateMachine.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_StateMachine.h
new file mode 100644
index 0000000000..5fb18ada7a
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_StateMachine.h
@@ -0,0 +1,114 @@
+/*  Max Lair State Machine
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_MaxLair_StateMachine_H
+#define PokemonAutomation_PokemonSwSh_MaxLair_StateMachine_H
+
+#include "Common/Cpp/Concurrency/SpinLock.h"
+#include "Common/Cpp/Concurrency/Mutex.h"
+#include "CommonFramework/Tools/VideoStream.h"
+#include "CommonFramework/Tools/ProgramEnvironment.h"
+#include "CommonTools/FailureWatchdog.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+#include "NintendoSwitch/NintendoSwitch_ConsoleHandle.h"
+#include "NintendoSwitch/NintendoSwitch_MultiSwitchProgram.h"
+#include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_QuantityReader.h"
+#include "VideoGames/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options.h"
+#include "VideoGames/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options_Consoles.h"
+#include "VideoGames/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options_Hosting.h"
+#include "VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_Stats.h"
+#include "PokemonSwSh_MaxLair_StateTracker.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+namespace MaxLairInternal{
+
+
+enum class ConsoleState{
+    CONSOLE_DEAD,
+    POKEMON_SELECT,
+    PATH_SELECT,
+    ITEM_SELECT,
+    MOVE_SELECT,
+    CATCH_SELECT,
+    POKEMON_SWAP,
+    CAUGHT_MENU,
+};
+
+
+
+enum class StateMachineAction{
+    KEEP_GOING,
+    DONE_WITH_ADVENTURE,
+    STOP_PROGRAM,
+    RESET_RECOVER,
+};
+
+
+struct ConsoleRuntime{
+    ReadableQuantity999 ore;
+    ReadableQuantity999 normal_balls;
+    ReadableQuantity999 boss_balls;
+};
+
+struct AdventureRuntime{
+    ~AdventureRuntime();
+    AdventureRuntime(
+        MultiSwitchProgramEnvironment& env,
+        const size_t p_host_index,
+        const Consoles& p_console_settings,
+        const EndBattleDecider& p_actions,
+        const bool p_go_home_when_done,
+        HostingSettings& p_hosting_settings,
+        EventNotificationOption& p_notification_status,
+        EventNotificationOption& p_notification_shiny,
+        Stats& p_session_stats
+    );
+
+    const size_t host_index;
+    const Consoles& console_settings;
+    const EndBattleDecider& actions;
+    const bool go_home_when_done;
+    HostingSettings& hosting_settings;
+    EventNotificationOption& notification_status;
+    EventNotificationOption& notification_shiny;
+
+    FixedLimitVector<OcrFailureWatchdog> ocr_watchdog;
+
+    Stats& session_stats;
+
+    PathStats path_stats;
+    std::string last_boss;
+    ConsoleRuntime consoles[4];
+
+    //  State lock to protect fields of this class.
+    SpinLock m_lock;
+
+    //  A lock to allow timed-serialization of Switches.
+    //  For example: Don't let multiple Switches simultaneously choose to swap with Pokemon.
+    Mutex m_delay_lock;
+};
+
+
+//  Return true if done.
+StateMachineAction run_state_iteration(
+    AdventureRuntime& runtime, size_t console_index,
+    ProgramEnvironment& env,
+    ConsoleHandle& console, ProControllerContext& context,
+    bool save_path,
+    GlobalStateTracker& state_tracker,
+    const EndBattleDecider& boss_action,
+    const ImageViewRGB32& entrance
+);
+
+
+
+}
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_StateTracker.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_StateTracker.cpp
similarity index 94%
rename from SerialPrograms/Source/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_StateTracker.cpp
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_StateTracker.cpp
index 6930dd6526..c1a8247f34 100644
--- a/SerialPrograms/Source/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_StateTracker.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_StateTracker.cpp
@@ -1,13 +1,12 @@
 /*  Max Lair State Tracker
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
+#include <map>
 #include <mutex>
-#include <condition_variable>
-#include "Common/Compiler.h"
-#include "Common/Cpp/AbstractLogger.h"
+#include "Common/Cpp/Logging/AbstractLogger.h"
 #include "PokemonSwSh_MaxLair_StateTracker.h"
 
 namespace PokemonAutomation{
@@ -30,8 +29,7 @@ GlobalStateTracker::~GlobalStateTracker(){
     detach();
 }
 std::pair<uint64_t, std::string> GlobalStateTracker::dump(){
-    std::lock_guard<std::mutex> lg(m_lock);
-//    SpinLockGuard lg(m_lock);
+    std::lock_guard<Mutex> lg(m_lock);
     std::string str;
     for (size_t c = 0; c < m_count; c++){
         str += "Switch " + std::to_string(c) + ": (group " + std::to_string(m_groups[c]) + ")\n";
@@ -49,12 +47,12 @@ bool GlobalStateTracker::cancel(std::exception_ptr exception) noexcept{
     if (Cancellable::cancel(std::move(exception))){
         return true;
     }
-    std::lock_guard<std::mutex> lg(m_lock);
+    std::lock_guard<Mutex> lg(m_lock);
     m_cv.notify_all();
     return false;
 }
 void GlobalStateTracker::push_update(size_t index){
-    std::lock_guard<std::mutex> lg(m_lock);
+    std::lock_guard<Mutex> lg(m_lock);
     m_state_epoch++;
     m_master_consoles[index] = m_consoles[index];
     m_master_consoles[index].timestamp = current_time();
@@ -62,8 +60,7 @@ void GlobalStateTracker::push_update(size_t index){
 }
 
 GlobalState GlobalStateTracker::infer_actual_state(size_t index){
-    std::lock_guard<std::mutex> lg(m_lock);
-//    SpinLockGuard lg(m_lock);
+    std::lock_guard<Mutex> lg(m_lock);
     return infer_actual_state_unprotected(index);
 }
 
@@ -101,7 +98,7 @@ void GlobalStateTracker::group_clear_status(uint8_t group){
     }
 }
 void GlobalStateTracker::mark_as_dead(size_t index){
-    std::lock_guard<std::mutex> lg(m_lock);
+    std::lock_guard<Mutex> lg(m_lock);
     m_state_epoch++;
     m_groups[index] = 4;
 }
@@ -109,7 +106,7 @@ void GlobalStateTracker::mark_as_dead(size_t index){
 GlobalState GlobalStateTracker::synchronize(
     Logger& logger, size_t index, std::chrono::milliseconds window
 ){
-    std::unique_lock<std::mutex> lg(m_lock);
+    std::unique_lock<Mutex> lg(m_lock);
     m_state_epoch++;
 
     time_point timestamp = current_time();
diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_StateTracker.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_StateTracker.h
similarity index 92%
rename from SerialPrograms/Source/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_StateTracker.h
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_StateTracker.h
index 538aa32746..57fd3e23f9 100644
--- a/SerialPrograms/Source/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_StateTracker.h
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_StateTracker.h
@@ -1,14 +1,14 @@
 /*  Max Lair State Tracker
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifndef PokemonAutomation_PokemonSwSh_MaxLair_StateTracker_H
 #define PokemonAutomation_PokemonSwSh_MaxLair_StateTracker_H
 
-#include <mutex>
-#include <condition_variable>
+#include "Common/Cpp/Concurrency/Mutex.h"
+#include "Common/Cpp/Concurrency/ConditionVariable.h"
 #include "Common/Cpp/CancellableScope.h"
 #include "PokemonSwSh_MaxLair_State.h"
 
@@ -84,8 +84,8 @@ class GlobalStateTracker final : public Cancellable{
 
 
 private:
-    std::mutex m_lock;
-    std::condition_variable m_cv;
+    Mutex m_lock;
+    ConditionVariable m_cv;
 
     uint64_t m_state_epoch = 0;
 
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_State_Tests.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_State_Tests.cpp
new file mode 100644
index 0000000000..b5b27ac65b
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_State_Tests.cpp
@@ -0,0 +1,133 @@
+/*  Max Lair State Tests
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <format>
+#include <utility>
+#include "Common/Cpp/TestRunners/UnitTest.h"
+#include "VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_State.h"
+#include "PokemonSwSh_MaxLair_State_Tests.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+namespace MaxLairInternal{
+namespace{
+
+struct BossStateTestCaseInput{
+    std::string name;
+    uint8_t wins;
+    std::set<std::string> opponent;
+    std::string boss;
+    uint8_t final_wins;     //  wins on the caught screen
+};
+
+struct BossStateTestCaseExpectation{
+    bool accepted;
+    std::string boss;
+    std::string boss_if_caught;
+};
+
+struct BossStateTestCase{
+    BossStateTestCaseInput input;
+    BossStateTestCaseExpectation expectation;
+};
+
+class Test_MaxLairBossState : public UnitTest{
+public:
+    explicit Test_MaxLairBossState(BossStateTestCase scenario)
+        : UnitTest("PokemonSwSh::MaxLairBossState - " + scenario.input.name)
+        , m_scenario(std::move(scenario))
+    {}
+
+    virtual UnitTestResult run(Logger&, CancellableScope&) const override{
+        const BossStateTestCaseInput& input = m_scenario.input;
+        const BossStateTestCaseExpectation& expected = m_scenario.expectation;
+        GlobalState state;
+        state.wins = input.wins;
+        state.opponent = input.opponent;
+        state.boss = input.boss;
+        const bool accepted = state.accept_opponent();
+        if (accepted != expected.accepted){
+            return std::format("Expected opponent accepted={}, got {}", expected.accepted, accepted);
+        }
+        if (state.boss != expected.boss){
+            return std::format("Expected boss '{}', got '{}'", expected.boss, state.boss);
+        }
+        state.wins = input.final_wins;
+        const std::string caught = state.boss_if_caught();
+        if (caught != expected.boss_if_caught){
+            return std::format("Expected boss_if_caught '{}', got '{}'", expected.boss_if_caught, caught);
+        }
+        return true;
+    }
+
+private:
+    BossStateTestCase m_scenario;
+};
+
+//  Cases marked TODO record the current, wrong behaviour.
+const BossStateTestCase CASES[] = {
+    {
+        .input = {.name = "rental before three wins", .wins = 2, .opponent = {"mimikyu-disguised"}, .boss = "", .final_wins = 3},
+        .expectation = {.accepted = true, .boss = "", .boss_if_caught = ""},
+    },
+    //  TODO: to be fixed: a rental at the boss stage is accepted as the boss and reported caught.
+    {
+        .input = {.name = "Mimikyu at boss stage", .wins = 3, .opponent = {"mimikyu-disguised"}, .boss = "", .final_wins = 3},
+        .expectation = {.accepted = true, .boss = "mimikyu-disguised", .boss_if_caught = "mimikyu-disguised"},
+    },
+    //  TODO: to be fixed: a rental misread as the boss is kept after the real boss is read.
+    {
+        .input = {.name = "Kyurem after Mimikyu misidentification", .wins = 3, .opponent = {"kyurem"}, .boss = "mimikyu-disguised", .final_wins = 3},
+        .expectation = {.accepted = true, .boss = "mimikyu-disguised", .boss_if_caught = "mimikyu-disguised"},
+    },
+    //  TODO: to be fixed: the boss is reported caught without a fourth win.
+    {
+        .input = {.name = "identified boss lost", .wins = 3, .opponent = {"kyurem"}, .boss = "kyurem", .final_wins = 3},
+        .expectation = {.accepted = true, .boss = "kyurem", .boss_if_caught = "kyurem"},
+    },
+    {
+        .input = {.name = "identified boss caught", .wins = 3, .opponent = {"kyurem"}, .boss = "", .final_wins = 4},
+        .expectation = {.accepted = true, .boss = "kyurem", .boss_if_caught = "kyurem"},
+    },
+    {
+        .input = {.name = "boss before three wins must retry", .wins = 2, .opponent = {"kyurem"}, .boss = "", .final_wins = 2},
+        .expectation = {.accepted = false, .boss = "", .boss_if_caught = ""},
+    },
+    //  TODO: to be fixed: a boss stage with no opponent read is accepted.
+    {
+        .input = {.name = "empty boss-stage read", .wins = 3, .opponent = {}, .boss = "", .final_wins = 3},
+        .expectation = {.accepted = true, .boss = "", .boss_if_caught = ""},
+    },
+    //  TODO: to be fixed: a two-candidate read is accepted and the first is taken as the boss.
+    {
+        .input = {.name = "ambiguous boss-stage read", .wins = 3, .opponent = {"kyurem", "mimikyu-disguised"}, .boss = "", .final_wins = 3},
+        .expectation = {.accepted = true, .boss = "kyurem", .boss_if_caught = "kyurem"},
+    },
+    //  TODO: to be fixed: a rental read at the boss stage is accepted, and the boss is reported caught without a fourth win.
+    {
+        .input = {.name = "rental read after known boss", .wins = 3, .opponent = {"mimikyu-disguised"}, .boss = "kyurem", .final_wins = 3},
+        .expectation = {.accepted = true, .boss = "kyurem", .boss_if_caught = "kyurem"},
+    },
+    //  TODO: to be fixed: a rental read at the boss stage is accepted and the rental is reported as the caught boss.
+    {
+        .input = {.name = "fourth win after rental boss", .wins = 3, .opponent = {"mimikyu-disguised"}, .boss = "mimikyu-disguised", .final_wins = 4},
+        .expectation = {.accepted = true, .boss = "mimikyu-disguised", .boss_if_caught = "mimikyu-disguised"},
+    },
+};
+
+}
+
+void add_tests_MaxLairBossState(UnitTestDatabase& database){
+    for (const BossStateTestCase& scenario : CASES){
+        database.add<Test_MaxLairBossState>(scenario);
+    }
+}
+
+}
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_State_Tests.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_State_Tests.h
new file mode 100644
index 0000000000..3044aa1792
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_State_Tests.h
@@ -0,0 +1,25 @@
+/*  Max Lair State Tests
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_MaxLair_State_Tests_H
+#define PokemonAutomation_PokemonSwSh_MaxLair_State_Tests_H
+
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+namespace MaxLairInternal{
+
+
+void add_tests_MaxLairBossState(UnitTestDatabase& database);
+
+
+}
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_Stats.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_Stats.h
similarity index 87%
rename from SerialPrograms/Source/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_Stats.h
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_Stats.h
index 3fb0805219..ea0e91959f 100644
--- a/SerialPrograms/Source/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_Stats.h
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_Stats.h
@@ -1,13 +1,13 @@
 /*  Max Lair Stats
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifndef PokemonAutomation_PokemonSwSh_MaxLair_Stats_H
 #define PokemonAutomation_PokemonSwSh_MaxLair_Stats_H
 
-#include "CommonFramework/Tools/StatsTracking.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
@@ -25,11 +25,11 @@ struct Stats : public StatsTracker{
         , m_shiny_legendary(m_stats["Shiny Legendary"])
     {
         m_display_order.emplace_back("Runs");
-        m_display_order.emplace_back("Errors", true);
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
         m_display_order.emplace_back("Wins");
         m_display_order.emplace_back("Catches");
         m_display_order.emplace_back("Shinies");
-        m_display_order.emplace_back("Shiny Legendary", true);
+        m_display_order.emplace_back("Shiny Legendary", HIDDEN_IF_ZERO);
     }
 
     void add_run(size_t catches){
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_BattleMenu.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_BattleMenu.cpp
new file mode 100644
index 0000000000..5f53191aab
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_BattleMenu.cpp
@@ -0,0 +1,598 @@
+/*  Max Lair Detect Battle Menu
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <cmath>
+#include "Common/Cpp/PrettyPrint.h"
+#include "Common/Cpp/CancellableScope.h"
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "CommonFramework/Notifications/ProgramInfo.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonFramework/Tools/ErrorDumper.h"
+#include "CommonTools/Images/SolidColorTest.h"
+#include "CommonTools/Images/ColorClustering.h"
+#include "Tests/ImageUnitTest.h"
+#include "Pokemon/Inference/Pokemon_ReadHpBar.h"
+#include "Pokemon/Inference/Pokemon_TypeReader.h"
+#include "VideoGames/PokemonSwSh/Resources/PokemonSwSh_MaxLairDatabase.h"
+#include "VideoGames/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options.h"
+#include "PokemonSwSh_MaxLair_Detect_PokemonReader.h"
+#include "PokemonSwSh_MaxLair_Detect_HPPP.h"
+#include "PokemonSwSh_MaxLair_Detect_BattleMenu.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+namespace MaxLairInternal{
+
+
+BattleMenuDetector::BattleMenuDetector()
+    : VisualInferenceCallback("BattleMenuDetector")
+    , m_icon_fight  (0.923, 0.576 + 1 * 0.1075, 0.05, 0.080)
+    , m_icon_pokemon(0.923, 0.576 + 2 * 0.1075, 0.05, 0.080)
+    , m_icon_run    (0.923, 0.576 + 3 * 0.1075, 0.05, 0.080)
+    , m_text_fight  (0.830, 0.576 + 1 * 0.1075, 0.08, 0.080)
+    , m_text_pokemon(0.830, 0.576 + 2 * 0.1075, 0.08, 0.080)
+    , m_text_run    (0.830, 0.576 + 3 * 0.1075, 0.08, 0.080)
+    , m_icon_cheer  (0.923, 0.636 + 1 * 0.1075, 0.05, 0.020)
+//    , m_info_left   (0.907, 0.500, 0.02, 0.03)
+//    , m_info_right  (0.970, 0.500, 0.02, 0.03)
+    , m_status0     (0.280, 0.870, 0.015, 0.030)
+    , m_status1     (0.165, 0.945, 0.100, 0.015)
+{}
+void BattleMenuDetector::make_overlays(VideoOverlaySet& items) const{
+    items.add(COLOR_YELLOW, m_icon_fight);
+    items.add(COLOR_YELLOW, m_icon_pokemon);
+    items.add(COLOR_YELLOW, m_icon_run);
+    items.add(COLOR_YELLOW, m_text_fight);
+    items.add(COLOR_YELLOW, m_text_pokemon);
+    items.add(COLOR_YELLOW, m_text_run);
+    items.add(COLOR_YELLOW, m_icon_cheer);
+    items.add(COLOR_YELLOW, m_status0);
+    items.add(COLOR_YELLOW, m_status1);
+}
+bool BattleMenuDetector::process_frame(const ImageViewRGB32& frame, WallClock timestamp){
+    //  Need 5 consecutive successful detections.
+    if (!detect(frame)){
+        m_trigger_count = 0;
+        return false;
+    }
+    m_trigger_count++;
+    return m_trigger_count >= 5;
+}
+
+
+bool BattleMenuDetector::detect(const ImageViewRGB32& screen){
+    bool fight;
+
+    fight = false;
+    fight |= !fight && cluster_fit_2(
+        extract_box_reference(screen, m_text_fight),
+        Color(0, 0, 0), 0.9,
+        Color(255, 255, 255), 0.1
+    );
+    fight |= !fight && cluster_fit_2(
+        extract_box_reference(screen, m_text_fight),
+        Color(0, 0, 0), 0.1,
+        Color(255, 255, 255), 0.9
+    );
+    if (!fight){
+//        cout << "Fight out" << endl;
+        return false;
+    }
+
+    fight = false;
+    fight |= !fight && cluster_fit_2(
+        extract_box_reference(screen, m_text_pokemon),
+        Color(0, 0, 0), 0.1,
+        Color(255, 255, 255), 0.9
+    );
+    fight |= !fight && cluster_fit_2(
+        extract_box_reference(screen, m_text_pokemon),
+        Color(0, 0, 0), 0.9,
+        Color(255, 255, 255), 0.1
+    );
+    if (!fight){
+//        cout << "Pokemon out" << endl;
+        return false;
+    }
+
+    fight = false;
+    fight |= !fight && cluster_fit_2(
+        extract_box_reference(screen, m_text_run),
+        Color(0, 0, 0), 0.1,
+        Color(255, 255, 255), 0.9
+    );
+    fight |= !fight && cluster_fit_2(
+        extract_box_reference(screen, m_text_run),
+        Color(0, 0, 0), 0.9,
+        Color(255, 255, 255), 0.1
+    );
+    if (!fight){
+//        cout << "Run out" << endl;
+        return false;
+    }
+
+//    cout << "===============" << endl;
+
+    fight = false;
+    fight |= !fight && cluster_fit_2(   //  Not selected (red on white)
+        extract_box_reference(screen, m_icon_fight),
+        Color(255, 255, 255), 1.7,
+        Color(153, 75, 112), 1.0
+    );
+    fight |= !fight && cluster_fit_2(   //  Selected (red on black)
+        extract_box_reference(screen, m_icon_fight),
+        Color(0, 0, 0), 1.4,
+        Color(185, 6, 40), 1.0
+    );
+    fight |= !fight && cluster_fit_2(   //  Max raid Fight button is a bit different.
+        extract_box_reference(screen, m_icon_fight),
+        Color(0, 0, 0), 1.7,
+        Color(182, 33, 82), 1.0
+    );
+//    cout << "===============" << endl;
+    if (!fight){
+        fight = cluster_fit_2(   //  Cheer
+            extract_box_reference(screen, m_icon_cheer),
+            Color(0, 0, 0), 1.0,
+            Color(9, 162, 218), 1.0,
+            0.2, 60
+        );
+//        cout << "fight = " << fight << endl;
+        m_cheer = fight;
+    }
+    if (!fight){
+//        cout << "Failed: m_icon_fight" << endl;
+        return false;
+    }
+
+    bool pokemon = false;
+    pokemon |= !pokemon && cluster_fit_2(
+        extract_box_reference(screen, m_icon_pokemon),
+        Color(255, 255, 255), 3.1,
+        Color(126, 224, 142), 1.0
+    );
+    pokemon |= !pokemon && cluster_fit_2(
+        extract_box_reference(screen, m_icon_pokemon),
+        Color(0, 0, 0), 2.7,
+        Color(8, 158, 18), 1.0
+    );
+    if (!pokemon){
+//        cout << "Failed: m_icon_pokemon" << endl;
+        return false;
+    }
+
+    bool run = false;
+    run |= !run && cluster_fit_2(
+        extract_box_reference(screen, m_icon_run),
+        Color(255, 255, 255), 2.3,
+        Color(216, 150, 230), 1.0
+    );
+    run |= !run && cluster_fit_2(
+        extract_box_reference(screen, m_icon_run),
+        Color(0, 0, 0), 1.9,
+        Color(179, 15, 195), 1.0
+    );
+    if (!run){
+//        cout << "Failed: m_icon_run" << endl;
+        return false;
+    }
+
+
+    //  Check for white status bar in bottom left corner.
+    ImageStats status = image_stats(extract_box_reference(screen, m_status0));
+    ImageStats health = image_stats(extract_box_reference(screen, m_status1));
+//    extract_box_reference(screen, m_status1).save("test.png");
+//    cout << status.average << ", " << status.stddev << endl;
+//    cout << health.average << ", " << health.stddev << endl;
+    if (is_white(status, 500, 20) && is_white(health)){
+        m_dmaxed = false;
+        return true;
+    }
+
+    //  Check the semi-transparent red status bar if you're dmaxed.
+    if (is_solid(status, {0.618001, 0.145809, 0.23619}, 0.15, 40) &&
+        is_solid(health, {0.615249, 0.102789, 0.281963}, 0.15, 40)
+    ){
+        m_dmaxed = true;
+        return true;
+    }
+
+
+//    image.save("battle-menu.png");
+    return false;
+}
+
+
+
+
+BattleMenuReader::BattleMenuReader(
+    VideoOverlay& overlay,
+    Language language,
+    OcrFailureWatchdog& ocr_watchdog
+)
+    : m_language(language)
+    , m_ocr_watchdog(ocr_watchdog)
+    , m_opponent_name(overlay, {0.3, 0.010, 0.4, 0.10}, COLOR_BLUE)
+    , m_summary_opponent_name(overlay, {0.200, 0.100, 0.300, 0.065}, COLOR_BLUE)
+    , m_summary_opponent_types(overlay, {0.200, 0.170, 0.300, 0.050}, COLOR_BLUE)
+    , m_own_name(overlay, {0.060, 0.860, 0.160, 0.045}, COLOR_BLUE)
+    , m_own_sprite(overlay, {0.002, 0.860, 0.060, 0.100}, COLOR_BLUE)
+    , m_opponent_hp(overlay, {0.360, 0.120, 0.280, 0.005}, COLOR_BLUE)
+    , m_own_hp(overlay, {0.069, 0.914, 0.204, 0.006}, COLOR_BLUE)
+    , m_hp0(overlay, {0.073, 0.096 + 0*0.096, 0.052, 0.005}, COLOR_BLUE)
+    , m_hp1(overlay, {0.073, 0.096 + 1*0.096, 0.052, 0.005}, COLOR_BLUE)
+    , m_hp2(overlay, {0.073, 0.096 + 2*0.096, 0.052, 0.005}, COLOR_BLUE)
+    , m_sprite0(overlay, {0.010, 0.040 + 0*0.096, 0.052, 0.061}, COLOR_BLUE)
+    , m_sprite1(overlay, {0.010, 0.040 + 1*0.096, 0.052, 0.061}, COLOR_BLUE)
+    , m_sprite2(overlay, {0.010, 0.040 + 2*0.096, 0.052, 0.061}, COLOR_BLUE)
+    , m_pp0(overlay, {0.902, 0.710 - 1*0.097, 0.070, 0.063}, COLOR_BLUE)
+    , m_pp1(overlay, {0.902, 0.710 + 0*0.097, 0.070, 0.063}, COLOR_BLUE)
+    , m_pp2(overlay, {0.902, 0.710 + 1*0.097, 0.070, 0.063}, COLOR_BLUE)
+    , m_pp3(overlay, {0.902, 0.710 + 2*0.097, 0.070, 0.063}, COLOR_BLUE)
+    , m_dmax(overlay, {0.541, 0.779, 0.105, 0.186}, COLOR_BLUE)
+{}
+
+std::set<std::string> BattleMenuReader::read_opponent(
+    Logger& logger, CancellableScope& scope,
+    VideoFeed& feed
+) const{
+    std::set<std::string> result;
+
+    VideoSnapshot screen;
+    for (size_t c = 0; c < 3; c++){
+        screen = feed.snapshot();
+        ImageViewRGB32 image = extract_box_reference(screen, m_opponent_name);
+        result = read_pokemon_name(logger, m_language, m_ocr_watchdog, image);
+        if (!result.empty()){
+            return result;
+        }
+        logger.log("Failed to read opponent name. Retrying in 1 second...", COLOR_ORANGE);
+        scope.wait_for(std::chrono::seconds(1));
+    }
+//    dump_image(logger, MODULE_NAME, "MaxLair-read_opponent", screen);
+    return result;
+}
+std::set<std::string> BattleMenuReader::read_opponent_in_summary(Logger& logger, const ImageViewRGB32& screen) const{
+    //  Start by reading the types.
+    PokemonType type0, type1;
+    {
+        ImageViewRGB32 types = extract_box_reference(screen, m_summary_opponent_types);
+        std::multimap<double, std::pair<PokemonType, ImagePixelBox>> candidates = find_type_symbols(
+            screen, 
+            types, 
+            0.2, 
+            PokemonTypeGeneration::GEN8
+        );
+
+        std::string type_str = "Type Read Result:\n";
+        for (const auto& item : candidates){
+            type_str += "    " + POKEMON_TYPE_SLUGS().get_string(item.second.first) + " : " + tostr_default(item.first ) + "\n";
+        }
+        logger.log(type_str);
+
+        type0 = PokemonType::NONE;
+        type1 = PokemonType::NONE;
+        {
+            auto iter = candidates.begin();
+            if (iter != candidates.end()){
+                type0 = iter->second.first;
+                ++iter;
+            }
+            if (iter != candidates.end()){
+                type1 = iter->second.first;
+                ++iter;
+            }
+        }
+    }
+
+    //  Compile a list of all possible mons that match the type.
+    std::set<std::string> allowed_slugs;
+    for (const auto& item : maxlair_slugs()){
+        const MaxLairMon& mon = get_maxlair_mon(item.first);
+        if ((type0 == mon.type[0] && type1 == mon.type[1]) ||
+            (type0 == mon.type[1] && type1 == mon.type[0])
+        ){
+            allowed_slugs.insert(item.first);
+        }
+    }
+
+    //  Special case for stunfisk-galar which changes types.
+    if (type1 == PokemonType::NONE){
+        switch (type0){
+        case PokemonType::ELECTRIC:
+        case PokemonType::GRASS:
+        case PokemonType::FAIRY:
+        case PokemonType::PSYCHIC:
+            allowed_slugs.insert("stunfisk-galar");
+            break;
+        default:;
+        }
+    }
+
+    if (allowed_slugs.size() == 1){
+        return allowed_slugs;
+    }
+
+
+    //  Now we read the name.
+    std::set<std::string> name_slugs;
+    {
+        ImageViewRGB32 name = extract_box_reference(screen, m_summary_opponent_name);
+
+        //  We can use a weaker threshold here since we are cross-checking with the type.
+        name_slugs = read_pokemon_name(logger, m_language, m_ocr_watchdog, name, -1.0);
+    }
+
+    //  See if there's anything in common between the slugs that match the type
+    //  and the slugs that match the OCR'ed name.
+    std::set<std::string> common_slugs;
+    for (const std::string& slug : name_slugs){
+        if (allowed_slugs.find(slug) != allowed_slugs.end()){
+            common_slugs.insert(slug);
+        }
+    }
+
+#if 0
+    for (const auto& slug : allowed_slugs){
+        cout << "allowed_slugs = " << slug << endl;
+    }
+    for (const auto& slug : name_slugs){
+        cout << "name_slugs = " << slug << endl;
+    }
+#endif
+
+    if (common_slugs.size() == 1){
+        logger.log("Disambiguation succeeded: " + *common_slugs.begin(), COLOR_BLUE);
+        return common_slugs;
+    }
+
+
+    //  Special case: Korean Clefairy
+    //  Reason: Korean OCR cannot read the character: 삐
+    if (m_language == Language::Korean &&
+        name_slugs.empty() &&
+        type0 == PokemonType::FAIRY &&
+        type1 == PokemonType::NONE
+    ){
+        logger.log("Known case that cannot be read: Korean Clefairy", COLOR_RED);
+        return {"clefairy"};
+    }
+
+
+
+    static std::set<std::string> KNOWN_BAD_SLUGS{
+        "basculin-blue-striped",
+        "basculin-red-striped",
+        "lycanroc-midday",
+        "lycanroc-midnight",
+//        "stunfisk-galar",   //  After using terrain pulse.
+    };
+    bool error = true;
+    for (const std::string& slug : common_slugs){
+        auto iter = KNOWN_BAD_SLUGS.find(slug);
+        if (iter != KNOWN_BAD_SLUGS.end()){
+            error = false;
+            logger.log("Known case that cannot be disambiguated: (" + slug + ") Skipping error report.", COLOR_RED);
+            break;
+        }
+    }
+
+    //  At this point we're out of options.
+    if (error){
+        dump_image(logger, MODULE_NAME, "DisambiguateBoss", screen);
+    }
+
+    return common_slugs;
+}
+std::string BattleMenuReader::read_own_mon(Logger& logger, const ImageViewRGB32& screen) const{
+    return read_pokemon_name_sprite(
+        logger,
+        m_ocr_watchdog,
+        screen,
+        m_own_sprite,
+        m_own_name, m_language,
+        false
+    );
+}
+
+double BattleMenuReader::read_opponent_hp(Logger& logger, const ImageViewRGB32& screen) const{
+    ImageViewRGB32 image = extract_box_reference(screen, m_opponent_hp);
+//    image.save("test.png");
+
+//    ImageStats stats = image_stats(image);
+//    cout << stats.average << " - " << stats.stddev << endl;
+
+#if 0
+    double hp = read_hp_bar(image);
+    logger.log("Opponent HP: " + (hp < 0 ? "?" : std::to_string(100 * hp)) + "%");
+    if (hp < 0){
+        dump_image(logger, screen, "BattleMenuReader-read_opponent_hp");
+    }
+    return hp;
+#endif
+    return read_hp_bar(logger, image);
+}
+double BattleMenuReader::read_own_hp(Logger& logger, const ImageViewRGB32& screen) const{
+    ImageViewRGB32 image = extract_box_reference(screen, m_own_hp);
+//    image.save("test.png");
+#if 0
+    double hp = read_hp_bar(image);
+    logger.log("Your HP: " + (hp < 0 ? "?" : std::to_string(100 * hp)) + "%");
+    if (hp == 0){
+        hp = 0.001;
+    }
+    if (hp < 0){
+        dump_image(logger, screen, "BattleMenuReader-read_own_hp");
+    }
+#endif
+    return read_hp_bar(logger, image);
+}
+void BattleMenuReader::read_hp(Logger& logger, const ImageViewRGB32& screen, Health health[4], size_t player_index){
+    Health tmp_hp[4];
+    tmp_hp[0] = {read_own_hp(logger, screen), false};
+    tmp_hp[1] = read_in_battle_hp_box(logger, extract_box_reference(screen, m_sprite0), extract_box_reference(screen, m_hp0));
+    tmp_hp[2] = read_in_battle_hp_box(logger, extract_box_reference(screen, m_sprite1), extract_box_reference(screen, m_hp1));
+    tmp_hp[3] = read_in_battle_hp_box(logger, extract_box_reference(screen, m_sprite2), extract_box_reference(screen, m_hp2));
+    bool bad = false;
+    for (size_t c = 0; c < 4; c++){
+        bad |= tmp_hp[c].hp < 0;
+        health[(c + player_index) % 4] = tmp_hp[c];
+    }
+
+    if (bad){
+//        dump_image(logger, MODULE_NAME, "BattlePartyReader-ReadHP", screen);
+    }
+}
+void BattleMenuReader::read_own_pp(Logger& logger, const ImageViewRGB32& screen, int8_t pp[4]) const{
+    pp[0] = read_pp_text(logger, extract_box_reference(screen, m_pp0));
+    pp[1] = read_pp_text(logger, extract_box_reference(screen, m_pp1));
+    pp[2] = read_pp_text(logger, extract_box_reference(screen, m_pp2));
+    pp[3] = read_pp_text(logger, extract_box_reference(screen, m_pp3));
+    if (pp[0] < 0 && pp[1] < 0 && pp[2] < 0 && pp[3] < 0){
+//        dump_image(logger, MODULE_NAME, "BattleMenuReader-read_own_pp", screen);
+        return;
+    }
+#if 0
+    bool ok = pp[0] > 0 || pp[1] > 0 || pp[2] > 0 || pp[3] > 0;
+    if (ok){
+        for (size_t c = 0; c < 4; c++){
+            pp[c] = std::max(pp[c], (int8_t)0);
+        }
+    }
+#endif
+}
+
+
+bool dmax_circle_ready(const ImageViewRGB32& image){
+    size_t w = image.width();
+    size_t h = image.height();
+    if (w * h <= 1){
+        return false;
+    }
+
+    w = 200;
+    h = 200;
+    ImageRGB32 processed = image.scale_to(w, h);
+    if (image_stats(processed).stddev.sum() < 75){
+        return false;
+    }
+//    cout << image_stats(processed).stddev.sum() << endl;
+
+
+    size_t total = 0;
+    FloatPixel sum;
+    FloatPixel sqr_sum;
+    for (size_t r = 0; r < h; r++){
+        for (size_t c = 0; c < w; c++){
+            int dy = (int)r - 100;
+            int dx = (int)c - 100;
+            if (dy < -60){
+//                processed.setPixelColor(c, r, COLOR_BLUE);
+                continue;
+            }
+            if (-25 < dy && dy < 55){
+//                processed.setPixelColor(c, r, COLOR_BLUE);
+                continue;
+            }
+            if (dx*dx + dy*dy < 72*72){
+//                processed.setPixelColor(c, r, COLOR_BLUE);
+                continue;
+            }
+            if (dx*dx + dy*dy > 80*80){
+//                processed.setPixelColor(c, r, COLOR_BLUE);
+                continue;
+            }
+            FloatPixel p(processed.pixel(c, r));
+            total++;
+            sum += p;
+            sqr_sum += p * p;
+        }
+    }
+//    processed.save("test.png");
+
+//    size_t total = (size_t)w * (size_t)h;
+    double totalf = (double)total;
+    FloatPixel variance = (sqr_sum - sum*sum / totalf) / (totalf - 1);
+    ImageStats stats{
+        sum / totalf,
+        FloatPixel(
+            std::sqrt(variance.r),
+            std::sqrt(variance.g),
+            std::sqrt(variance.b)
+        ),
+        total
+    };
+//    cout << stats.average << stats.stddev << endl;
+
+    if (stats.average.r < 128){
+        return false;
+    }
+    return is_solid(stats, {0.684591, 0.000481775, 0.314928}, 0.15, 50);
+
+//    ImageStats stats = image_stats(processed);
+}
+bool BattleMenuReader::can_dmax(const ImageViewRGB32& screen) const{
+    return dmax_circle_ready(extract_box_reference(screen, m_dmax));
+}
+
+
+
+
+
+
+class Test_MaxLairBattleMenuDetector : public ImageUnitTest{
+public:
+    Test_MaxLairBattleMenuDetector(
+        const std::string& image,
+        bool expected
+    )
+        : ImageUnitTest("PokemonSwSh::MaxLairBattleMenuDetector - " + image, {image})
+        , m_expected(expected)
+    {}
+
+    virtual UnitTestResult run_on_images(
+        Logger& logger, CancellableScope& scope,
+        const std::vector<ImageRGB32>& images
+    ) const override{
+        BattleMenuDetector detector;
+        const ImageRGB32& image = images[0];
+        return detector.detect(image) == m_expected;
+    };
+
+private:
+    bool m_expected;
+};
+
+
+
+
+
+
+
+void add_tests_MaxLairBattleMenuDetector(UnitTestDatabase& database){
+    database.add<Test_MaxLairBattleMenuDetector>("PokemonSwSh/MaxLair_BattleMenuDetector/MyPin_Q6g_BattleMenuDA_True.jpg", true);
+}
+
+
+
+
+
+
+
+
+
+
+
+
+}
+}
+}
+}
diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_BattleMenu.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_BattleMenu.h
similarity index 80%
rename from SerialPrograms/Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_BattleMenu.h
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_BattleMenu.h
index c7d3cc9eb2..b2a98cd5c9 100644
--- a/SerialPrograms/Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_BattleMenu.h
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_BattleMenu.h
@@ -1,17 +1,18 @@
 /*  Max Lair Detect Battle Menu
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifndef PokemonAutomation_PokemonSwSh_MaxLair_Detect_BattleMenu_H
 #define PokemonAutomation_PokemonSwSh_MaxLair_Detect_BattleMenu_H
 
+#include "Common/Cpp/TestRunners/UnitTest.h"
 #include "CommonFramework/Language.h"
-#include "CommonFramework/Logging/Logger.h"
 #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
-#include "CommonFramework/InferenceInfra/VisualInferenceCallback.h"
-#include "PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_State.h"
+#include "CommonTools/FailureWatchdog.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+#include "VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_State.h"
 
 namespace PokemonAutomation{
     class CancellableScope;
@@ -56,7 +57,11 @@ class BattleMenuDetector : public VisualInferenceCallback{
 
 class BattleMenuReader{
 public:
-    BattleMenuReader(VideoOverlay& overlay, Language language);
+    BattleMenuReader(
+        VideoOverlay& overlay,
+        Language language,
+        OcrFailureWatchdog& ocr_watchdog
+    );
 
     std::set<std::string> read_opponent(
         Logger& logger, CancellableScope& scope,
@@ -74,6 +79,7 @@ class BattleMenuReader{
 
 private:
     Language m_language;
+    OcrFailureWatchdog& m_ocr_watchdog;
     OverlayBoxScope m_opponent_name;
     OverlayBoxScope m_summary_opponent_name;
     OverlayBoxScope m_summary_opponent_types;
@@ -100,6 +106,10 @@ class BattleMenuReader{
 
 
 
+void add_tests_MaxLairBattleMenuDetector(UnitTestDatabase& database);
+
+
+
 }
 }
 }
diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_EndBattle.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_EndBattle.cpp
similarity index 86%
rename from SerialPrograms/Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_EndBattle.cpp
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_EndBattle.cpp
index c6d4ff0381..b295d5489b 100644
--- a/SerialPrograms/Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_EndBattle.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_EndBattle.cpp
@@ -1,17 +1,16 @@
 /*  Max Lair Detect Battle Menu
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include "Common/Compiler.h"
-#include "CommonFramework/ImageTools/SolidColorTest.h"
 #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Images/SolidColorTest.h"
 #include "PokemonSwSh_MaxLair_Detect_EndBattle.h"
 
-#include <iostream>
-using std::cout;
-using std::endl;
+//#include <iostream>
+//using std::cout;
+//using std::endl;
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
@@ -20,8 +19,7 @@ namespace MaxLairInternal{
 
 
 PokemonCaughtMenuDetector::PokemonCaughtMenuDetector()
-    : VisualInferenceCallback("PokemonCaughtMenuDetector")
-    , m_top_white(0.550, 0.020, 0.400, 0.020)
+    : m_top_white(0.550, 0.020, 0.400, 0.020)
     , m_caught_left(0.500, 0.080, 0.050, 0.070)
     , m_caught_right(0.930, 0.080, 0.050, 0.070)
     , m_middle_pink(0.930, 0.300, 0.050, 0.200)
@@ -38,9 +36,6 @@ void PokemonCaughtMenuDetector::make_overlays(VideoOverlaySet& items) const{
     items.add(COLOR_MAGENTA, m_bottom_black);
     items.add(COLOR_MAGENTA, m_bottom_options);
 }
-bool PokemonCaughtMenuDetector::process_frame(const ImageViewRGB32& frame, WallClock timestamp){
-    return detect(frame);
-}
 
 
 bool PokemonCaughtMenuDetector::detect(const ImageViewRGB32& screen){
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_EndBattle.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_EndBattle.h
new file mode 100644
index 0000000000..333a3fff91
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_EndBattle.h
@@ -0,0 +1,57 @@
+/*  Max Lair Detect End Battle
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_MaxLair_Detect_EndBattle_H
+#define PokemonAutomation_PokemonSwSh_MaxLair_Detect_EndBattle_H
+
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+#include "CommonTools/VisualDetector.h"
+
+namespace PokemonAutomation{
+    class VideoOverlay;
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+namespace MaxLairInternal{
+
+
+class PokemonCaughtMenuDetector : public StaticScreenDetector{
+public:
+    PokemonCaughtMenuDetector();
+
+    virtual void make_overlays(VideoOverlaySet& items) const override;
+    virtual bool detect(const ImageViewRGB32& screen) override;
+
+private:
+    ImageFloatBox m_top_white;
+    ImageFloatBox m_caught_left;
+    ImageFloatBox m_caught_right;
+    ImageFloatBox m_middle_pink;
+    ImageFloatBox m_bottom_white;
+    ImageFloatBox m_bottom_black;
+    ImageFloatBox m_bottom_options;
+
+};
+class PokemonCaughtMenuWatcher : public DetectorToFinder<PokemonCaughtMenuDetector>{
+public:
+    PokemonCaughtMenuWatcher()
+        : DetectorToFinder("PokemonCaughtMenuWatcher", std::chrono::milliseconds(250))
+    {}
+};
+
+
+
+
+size_t count_catches(VideoOverlay& overlay, const ImageViewRGB32& screen);
+
+
+
+
+}
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_Entrance.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_Entrance.cpp
similarity index 83%
rename from SerialPrograms/Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_Entrance.cpp
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_Entrance.cpp
index df34917861..4dc758854a 100644
--- a/SerialPrograms/Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_Entrance.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_Entrance.cpp
@@ -1,18 +1,17 @@
 /*  Max Lair Detect Entrance
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include "Common/Compiler.h"
 #include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "CommonFramework/ImageMatch/ImageDiff.h"
+#include "CommonFramework/ImageTools/ImageDiff.h"
 #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
 #include "PokemonSwSh_MaxLair_Detect_Entrance.h"
 
-#include <iostream>
-using std::cout;
-using std::endl;
+//#include <iostream>
+//using std::cout;
+//using std::endl;
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_Entrance.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_Entrance.h
similarity index 83%
rename from SerialPrograms/Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_Entrance.h
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_Entrance.h
index a995468487..8828d2a92e 100644
--- a/SerialPrograms/Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_Entrance.h
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_Entrance.h
@@ -1,15 +1,16 @@
 /*  Max Lair Detect Entrance
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifndef PokemonAutomation_PokemonSwSh_MaxLair_Detect_Entrance_H
 #define PokemonAutomation_PokemonSwSh_MaxLair_Detect_Entrance_H
 
+#include <memory>
 #include "CommonFramework/ImageTypes/ImageRGB32.h"
 #include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "CommonFramework/InferenceInfra/VisualInferenceCallback.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_HPPP.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_HPPP.cpp
similarity index 82%
rename from SerialPrograms/Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_HPPP.cpp
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_HPPP.cpp
index 76ca28daab..72b501b149 100644
--- a/SerialPrograms/Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_HPPP.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_HPPP.cpp
@@ -1,16 +1,16 @@
 /*  Max Lair Detect PP
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include "Common/Qt/StringToolsQt.h"
+#include "Common/Cpp/Strings/Unicode.h"
 #include "CommonFramework/ImageTypes/ImageRGB32.h"
 #include "CommonFramework/ImageTools/ImageStats.h"
-#include "CommonFramework/ImageTools/SolidColorTest.h"
-#include "CommonFramework/ImageTools/ImageFilter.h"
-#include "CommonFramework/OCR/OCR_StringNormalization.h"
-#include "CommonFramework/OCR/OCR_RawOCR.h"
+#include "CommonTools/Images/ImageFilter.h"
+#include "CommonTools/Images/SolidColorTest.h"
+#include "CommonTools/OCR/OCR_StringNormalization.h"
+#include "CommonTools/OCR/OCR_Routines.h"
 #include "Pokemon/Inference/Pokemon_ReadHpBar.h"
 #include "PokemonSwSh_MaxLair_Detect_HPPP.h"
 
@@ -81,6 +81,10 @@ int8_t parse_pp(const std::string& str){
             tokens.back() += '0';
             continue;
         }
+        if (ch == 'A'){
+            tokens.back() += '4';
+            continue;
+        }
         if (ch == '/'){
             tokens.emplace_back();
             continue;
@@ -137,7 +141,11 @@ int8_t read_pp_text(Logger& logger, const ImageViewRGB32& image){
 //    cout << "============" << endl;
     for (const auto& item : filters){
         size_t text_pixels;
-        processed = to_blackwhite_rgb32_range(text_pixels, image, item.first, item.second, false);
+        processed = to_blackwhite_rgb32_range(
+            text_pixels, image,
+            false,
+            item.first, item.second
+        );
         double text_ratio = 1.0 - (double)text_pixels / (image.width() * image.height());
 //        cout << "text_ratio = " << text_ratio << endl;
         if (0.02 <= text_ratio && text_ratio <= 0.50){
@@ -153,7 +161,7 @@ int8_t read_pp_text(Logger& logger, const ImageViewRGB32& image){
 
     std::string ocr_text = OCR::ocr_read(Language::English, processed);
 
-    ocr_text = to_utf8(OCR::run_character_reductions(to_utf32(ocr_text)));
+    ocr_text = utf32_to_str(OCR::run_character_reductions(utf8_to_utf32(ocr_text)));
     int8_t pp = parse_pp(ocr_text);
 
     std::string str;
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_HPPP.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_HPPP.h
new file mode 100644
index 0000000000..c0c3bb0ebd
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_HPPP.h
@@ -0,0 +1,31 @@
+/*  Max Lair Detect HP and PP
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_MaxLair_Detect_HPPP_H
+#define PokemonAutomation_PokemonSwSh_MaxLair_Detect_HPPP_H
+
+#include <stdint.h>
+#include "Common/Cpp/Logging/AbstractLogger.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_State.h"
+
+namespace PokemonAutomation{
+    class Logger;
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+namespace MaxLairInternal{
+
+
+//double read_hp_bar(Logger& logger, const ImageViewRGB32& image);
+Health read_in_battle_hp_box(Logger& logger, const ImageViewRGB32& sprite, const ImageViewRGB32& hp_bar);
+int8_t read_pp_text(Logger& logger, const ImageViewRGB32& image);
+
+
+}
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_ItemSelectMenu.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_ItemSelectMenu.cpp
similarity index 89%
rename from SerialPrograms/Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_ItemSelectMenu.cpp
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_ItemSelectMenu.cpp
index 32fb4628c2..0691c9cfe6 100644
--- a/SerialPrograms/Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_ItemSelectMenu.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_ItemSelectMenu.cpp
@@ -1,12 +1,11 @@
 /*  Max Lair Detect Item Select Menu
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include "Common/Compiler.h"
-#include "CommonFramework/ImageTools/SolidColorTest.h"
 #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Images/SolidColorTest.h"
 #include "PokemonSwSh_MaxLair_Detect_ItemSelectMenu.h"
 
 namespace PokemonAutomation{
diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_ItemSelectMenu.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_ItemSelectMenu.h
similarity index 79%
rename from SerialPrograms/Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_ItemSelectMenu.h
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_ItemSelectMenu.h
index fd83e51ca7..c2e299b1f4 100644
--- a/SerialPrograms/Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_ItemSelectMenu.h
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_ItemSelectMenu.h
@@ -1,6 +1,6 @@
 /*  Max Lair Detect Item Select Menu
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -8,8 +8,7 @@
 #define PokemonAutomation_PokemonSwSh_MaxLair_Detect_ItemSelectMenu_H
 
 #include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "CommonFramework/Tools/ConsoleHandle.h"
-#include "CommonFramework/InferenceInfra/VisualInferenceCallback.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_Lobby.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_Lobby.cpp
similarity index 88%
rename from SerialPrograms/Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_Lobby.cpp
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_Lobby.cpp
index e145866a10..b9c0271c14 100644
--- a/SerialPrograms/Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_Lobby.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_Lobby.cpp
@@ -1,19 +1,18 @@
 /*  Max Lair Detect Lobby
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include "Common/Compiler.h"
-#include "CommonFramework/ImageTools/SolidColorTest.h"
 #include "CommonFramework/ImageTools/ImageStats.h"
-#include "CommonFramework/ImageMatch/ImageDiff.h"
+#include "CommonFramework/ImageTools/ImageDiff.h"
 #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Images/SolidColorTest.h"
 #include "PokemonSwSh_MaxLair_Detect_Lobby.h"
 
-#include <iostream>
-using std::cout;
-using std::endl;
+//#include <iostream>
+//using std::cout;
+//using std::endl;
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
@@ -22,19 +21,15 @@ namespace MaxLairInternal{
 
 
 
-#if 1
-LobbyDetector::LobbyDetector(bool invert)
-    : VisualInferenceCallback("LobbyDetector")
+LobbyDetector::LobbyDetector(Color color, bool invert)
+    : m_color(color)
     , m_invert(invert)
     , m_pink (0.575, 0.035, 0.050, 0.100)
     , m_white(0.800, 0.200, 0.150, 0.100)
 {}
 void LobbyDetector::make_overlays(VideoOverlaySet& items) const{
-    items.add(COLOR_RED, m_pink);
-    items.add(COLOR_RED, m_white);
-}
-bool LobbyDetector::process_frame(const ImageViewRGB32& frame, WallClock timestamp){
-    return detect(frame);
+    items.add(m_color, m_pink);
+    items.add(m_color, m_white);
 }
 bool LobbyDetector::detect(const ImageViewRGB32& screen){
     ImageStats stats0 = image_stats(extract_box_reference(screen, m_pink));
@@ -49,7 +44,6 @@ bool LobbyDetector::detect(const ImageViewRGB32& screen){
     }
     return !m_invert;
 }
-#endif
 
 
 LobbyDoneConnecting::LobbyDoneConnecting()
diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_Lobby.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_Lobby.h
similarity index 77%
rename from SerialPrograms/Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_Lobby.h
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_Lobby.h
index ec865c7c34..d2611abf45 100644
--- a/SerialPrograms/Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_Lobby.h
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_Lobby.h
@@ -1,15 +1,15 @@
 /*  Max Lair Detect Lobby
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifndef PokemonAutomation_PokemonSwSh_MaxLair_Detect_Lobby_H
 #define PokemonAutomation_PokemonSwSh_MaxLair_Detect_Lobby_H
 
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "CommonFramework/InferenceInfra/VisualInferenceCallback.h"
-#include "CommonFramework/Inference/FrozenImageDetector.h"
+#include "CommonTools/VisualDetector.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+#include "CommonTools/VisualDetectors/FrozenImageDetector.h"
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
@@ -17,23 +17,26 @@ namespace PokemonSwSh{
 namespace MaxLairInternal{
 
 
-#if 1
-class LobbyDetector  : public VisualInferenceCallback{
+class LobbyDetector  : public StaticScreenDetector{
 public:
-    LobbyDetector(bool invert);
-
-    bool detect(const ImageViewRGB32& screen);
+    LobbyDetector(Color color, bool invert);
 
     virtual void make_overlays(VideoOverlaySet& items) const override;
-    virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override final;
+    virtual bool detect(const ImageViewRGB32& screen) override;
 
 
 private:
+    Color m_color;
     bool m_invert;
     ImageFloatBox m_pink;
     ImageFloatBox m_white;
 };
-#endif
+class LobbyWatcher : public DetectorToFinder<LobbyDetector>{
+public:
+    LobbyWatcher(Color color, bool invert)
+         : DetectorToFinder("LobbyWatcher", std::chrono::milliseconds(250), color, invert)
+    {}
+};
 
 
 class LobbyDoneConnecting  : public VisualInferenceCallback{
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathMap.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathMap.cpp
new file mode 100644
index 0000000000..68dfeae36e
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathMap.cpp
@@ -0,0 +1,195 @@
+/*  Max Lair Detect Path Map
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonFramework/Tools/ErrorDumper.h"
+#include "CommonFramework/Tools/ProgramEnvironment.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "Pokemon/Inference/Pokemon_TypeReader.h"
+//#include "VideoGames/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options.h"
+#include "PokemonSwSh_MaxLair_Detect_PathMap.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+namespace MaxLairInternal{
+
+
+bool read_type_array(
+    VideoStream& stream,
+    const ImageViewRGB32& screen,
+    const ImageFloatBox& box,
+    std::deque<OverlayBoxScope>& hits,
+    size_t count,
+    PokemonType* type, ImagePixelBox* boxes
+){
+    ImageViewRGB32 image = extract_box_reference(screen, box);
+    for (size_t c = 0; c < count; c++){
+        type[c] = PokemonType::NONE;
+    }
+
+    std::multimap<double, std::pair<PokemonType, ImagePixelBox>> candidates = find_type_symbols(
+        screen, 
+        image, 
+        0.20, 
+        PokemonTypeGeneration::GEN8
+    );
+//    cout << candidates.size() << endl;
+
+#if 0
+    for (auto& item : candidates){
+        cout << item.first << " : " << POKEMON_TYPE_SLUGS().get_string(item.second.first) << endl;
+    }
+#endif
+
+    if (candidates.size() < count){
+//        dump_image(console, screen, "ReadPath");
+        return false;
+    }
+
+    std::multimap<size_t, const std::pair<PokemonType, ImagePixelBox>*> sorted;
+//    std::deque<InferenceBoxScope> hits;
+    hits.clear();
+    size_t c = 0;
+    for (const auto& item : candidates){
+        hits.emplace_back(
+            stream.overlay(),
+            COLOR_GREEN,
+            translate_to_parent(screen, box, item.second.second),
+            POKEMON_TYPE_SLUGS().get_string(item.second.first)
+        );
+        sorted.emplace(item.second.second.min_x, &item.second);
+        c++;
+        if (c >= count){
+            break;
+        }
+    }
+
+    c = 0;
+    for (const auto& item : sorted){
+        type[c] = item.second->first;
+        if (boxes != nullptr){
+            boxes[c] = item.second->second;
+        }
+        c++;
+    }
+
+    return true;
+}
+
+std::shared_ptr<const ImageRGB32> read_type_array_retry(
+    VideoStream& stream, CancellableScope& scope,
+    const ImageFloatBox& box,
+    std::deque<OverlayBoxScope>& hits,
+    size_t count,
+    PokemonType* type, ImagePixelBox* boxes,
+    size_t max_attempts = 3
+){
+    VideoSnapshot screen;
+    for (size_t c = 0; c < max_attempts; c++){
+        screen = stream.video().snapshot();
+        if (read_type_array(stream, screen, box, hits, count, type, boxes)){
+            return nullptr;
+        }
+        scope.wait_for(std::chrono::milliseconds(200));
+    }
+    return std::move(screen.frame);
+}
+
+
+bool read_path(
+    ProgramEnvironment& env, VideoStream& stream, ProControllerContext& context,
+    PathMap& path,
+    const ImageFloatBox& box
+){
+    context.wait_for_all_requests();
+
+    std::deque<OverlayBoxScope> hits;
+
+    std::shared_ptr<const ImageRGB32> error_image;
+    error_image = read_type_array_retry(stream, context, box, hits, 2, path.mon1, nullptr);
+    if (error_image){
+        dump_image(stream.logger(), env.program_info(), "ReadPath", *error_image);
+        return false;
+    }
+
+    pbf_move_right_joystick(context, {0, +1}, 560ms, 400ms);
+    context.wait_for_all_requests();
+    ImagePixelBox boxes[4];
+    error_image = read_type_array_retry(stream, context, box, hits, 4, path.mon2, boxes);
+    if (error_image){
+        dump_image(stream.logger(), env.program_info(), "ReadPath", *error_image);
+        return false;
+    }
+
+    while (true){
+        pbf_move_right_joystick(context, {0, +1}, 640ms, 400ms);
+        context.wait_for_all_requests();
+
+        error_image = read_type_array_retry(stream, context, box, hits, 4, path.mon3, nullptr);
+        if (!error_image){
+            break;
+        }
+        pbf_move_right_joystick(context, {0, +1}, 160ms, 400ms);
+        context.wait_for_all_requests();
+        error_image = read_type_array_retry(stream, context, box, hits, 4, path.mon3, nullptr);
+        if (!error_image){
+            break;
+        }
+
+        dump_image(stream.logger(), env.program_info(), "ReadPath", *error_image);
+        return false;
+    }
+
+    pbf_move_right_joystick(context, {0, +1}, 1000ms, 400ms);
+    context.wait_for_all_requests();
+
+    error_image = read_type_array_retry(stream, context, box, hits, 1, &path.boss, nullptr);
+    if (error_image){
+        dump_image(stream.logger(), env.program_info(), "ReadPath", *error_image);
+        return false;
+    }
+
+
+
+    if (boxes[0].min_y < boxes[2].min_y &&
+        boxes[2].min_y < boxes[1].min_y &&
+        boxes[1].min_y < boxes[3].min_y
+    ){
+        path.path_type = 2;
+        return true;
+    }
+    if (
+        boxes[3].min_y > boxes[0].min_y &&
+        boxes[0].min_y > boxes[1].min_y &&
+        boxes[0].min_y > boxes[2].min_y
+    ){
+        path.path_type = 1;
+        return true;
+    }
+    if (
+        boxes[2].min_y < boxes[0].min_y &&
+        boxes[0].min_y < boxes[1].min_y &&
+        boxes[1].min_y < boxes[3].min_y
+    ){
+        path.path_type = 0;
+        return true;
+    }
+
+    return false;
+}
+
+
+
+}
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathMap.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathMap.h
new file mode 100644
index 0000000000..8b039112a0
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathMap.h
@@ -0,0 +1,47 @@
+/*  Max Lair Detect Path Map
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_MaxLair_Detect_PathMap_H
+#define PokemonAutomation_PokemonSwSh_MaxLair_Detect_PathMap_H
+
+#include <deque>
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonFramework/Tools/VideoStream.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+#include "Pokemon/Pokemon_Types.h"
+#include "VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_State.h"
+
+namespace PokemonAutomation{
+    class ProgramEnvironment;
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+namespace MaxLairInternal{
+using namespace Pokemon;
+
+
+bool read_type_array(
+    VideoStream& stream,
+    const ImageViewRGB32& screen,
+    const ImageFloatBox& box,
+    std::deque<OverlayBoxScope>& hits,
+    size_t count,
+    PokemonType* type, ImagePixelBox* boxes
+);
+
+
+bool read_path(
+    ProgramEnvironment& env, VideoStream& stream, ProControllerContext& context,
+    PathMap& path,
+    const ImageFloatBox& box
+);
+
+
+}
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathSelect.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathSelect.cpp
similarity index 86%
rename from SerialPrograms/Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathSelect.cpp
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathSelect.cpp
index 1d348d09e4..8fbd3e9376 100644
--- a/SerialPrograms/Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathSelect.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathSelect.cpp
@@ -1,18 +1,17 @@
 /*  Max Lair Detect Path Select
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include <cmath>
-#include "CommonFramework/ImageTools/SolidColorTest.h"
 #include "CommonFramework/Notifications/ProgramInfo.h"
 #include "CommonFramework/VideoPipeline/VideoOverlay.h"
 #include "CommonFramework/Tools/ErrorDumper.h"
+#include "CommonTools/Images/SolidColorTest.h"
 #include "Pokemon/Inference/Pokemon_ReadHpBar.h"
-#include "PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options.h"
-#include "PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonReader.h"
-#include "PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_HPPP.h"
+#include "VideoGames/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options.h"
+#include "VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonReader.h"
+#include "VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_HPPP.h"
 #include "PokemonSwSh_MaxLair_Detect_PathSide.h"
 #include "PokemonSwSh_MaxLair_Detect_PathMap.h"
 #include "PokemonSwSh_MaxLair_Detect_PathSelect.h"
@@ -99,6 +98,7 @@ PathSelectDetector::PathSelectDetector()
     , m_dialog_middle(0.500, 0.880, 0.180, 0.050)
 //    , m_dialog_right(0.710, 0.880, 0.030, 0.050)
     , m_left(0.050, 0.100, 0.200, 0.700)
+    , m_path_box(0.150, 0.020, 0.800, 0.780)
 {}
 void PathSelectDetector::make_overlays(VideoOverlaySet& items) const{
     items.add(COLOR_CYAN, m_bottom_right);
@@ -148,6 +148,14 @@ bool PathSelectDetector::detect(const ImageViewRGB32& screen) const{
 //    if (dialog_right.average.sum() > dialog_middle.average.sum()){
 //        return false;
 //    }
+
+    ImageViewRGB32 path_box = extract_box_reference(screen, m_path_box);
+    if (read_side(path_box) < 0){
+//        cout << "PathSelectDetector(): read_side(screen) < 0" << endl;
+        return false;
+    }
+
+//    cout << "PathSelectDetector(): Passed" << endl;
     return true;
 }
 bool PathSelectDetector::process_frame(const ImageViewRGB32& frame, WallClock timestamp){
@@ -169,8 +177,7 @@ bool PathSelectDetector::process_frame(const ImageViewRGB32& frame, WallClock ti
 
 
 PathReader::PathReader(VideoOverlay& overlay, size_t player_index)
-    : m_player_index(player_index)
-    , m_path(overlay, {0.150, 0.020, 0.800, 0.780})
+    : m_path(overlay, {0.150, 0.020, 0.800, 0.780})
     , m_sprite0(overlay, {0.002, 0.345 + 0*0.16315, 0.071, 0.102})
     , m_sprite1(overlay, {0.002, 0.345 + 1*0.16315, 0.071, 0.102})
     , m_sprite2(overlay, {0.002, 0.345 + 2*0.16315, 0.071, 0.102})
@@ -240,13 +247,17 @@ void PathReader::read_hp(
 
 
 
-void PathReader::read_path(ProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context, GlobalState& state){
+void PathReader::read_path(
+    ProgramEnvironment& env,
+    VideoStream& stream, ProControllerContext& context,
+    GlobalState& state
+){
     PathMap path;
-    if (MaxLairInternal::read_path(env, console, context, path, m_path)){
-        console.log("Path Detection:\n" + path.dump(), COLOR_BLUE);
+    if (MaxLairInternal::read_path(env, stream, context, path, m_path)){
+        stream.log("Path Detection:\n" + path.dump(), COLOR_BLUE);
         state.path = path;
     }else{
-        console.log("Path Detection: Failed", COLOR_RED);
+        stream.log("Path Detection: Failed", COLOR_RED);
     }
 }
 
diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathSelect.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathSelect.h
similarity index 79%
rename from SerialPrograms/Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathSelect.h
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathSelect.h
index 196a5e2b9e..1d82ec13bd 100644
--- a/SerialPrograms/Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathSelect.h
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathSelect.h
@@ -1,21 +1,20 @@
 /*  Max Lair Detect Path Select
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifndef PokemonAutomation_PokemonSwSh_MaxLair_Detect_PathSelect_H
 #define PokemonAutomation_PokemonSwSh_MaxLair_Detect_PathSelect_H
 
-#include "CommonFramework/Logging/Logger.h"
 #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
-#include "CommonFramework/InferenceInfra/VisualInferenceCallback.h"
 #include "CommonFramework/Tools/ProgramEnvironment.h"
-#include "CommonFramework/Tools/ConsoleHandle.h"
-#include "PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_State.h"
+#include "CommonFramework/Tools/VideoStream.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+#include "VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_State.h"
 
 namespace PokemonAutomation{
-    class BotBaseContext;
 namespace NintendoSwitch{
 namespace PokemonSwSh{
 namespace MaxLairInternal{
@@ -57,6 +56,7 @@ class PathSelectDetector : public PathScreenDetector{
     ImageFloatBox m_dialog_middle;
 //    ImageFloatBox m_dialog_right;
     ImageFloatBox m_left;
+    ImageFloatBox m_path_box;
 };
 
 
@@ -78,7 +78,11 @@ class PathReader{
     ) const;
 
 
-    void read_path(ProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context, GlobalState& state);
+    void read_path(
+        ProgramEnvironment& env,
+        VideoStream& stream, ProControllerContext& context,
+        GlobalState& state
+    );
 
 
     //  Determine which side you're on (left or right) in the path.
@@ -96,10 +100,8 @@ class PathReader{
     void read_sprites(Logger& logger, const ImageViewRGB32& screen, std::string slugs[4]) const;
     void read_hp(Logger& logger, const ImageViewRGB32& screen, double hp[4]) const;
 
-    static int8_t read_side(const ImageViewRGB32& image, int p_min_rgb_sum);
-
 private:
-    size_t m_player_index;
+//    size_t m_player_index;
     OverlayBoxScope m_path;
     OverlayBoxScope m_sprite0;
     OverlayBoxScope m_sprite1;
diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathSide.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathSide.cpp
similarity index 91%
rename from SerialPrograms/Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathSide.cpp
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathSide.cpp
index 7f4a62a0a0..fcdba0d9b7 100644
--- a/SerialPrograms/Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathSide.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathSide.cpp
@@ -1,22 +1,21 @@
 /*  Max Lair Detect Path Side
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include <cmath>
-#include "Kernels/Waterfill/Kernels_Waterfill.h"
 #include "Kernels/Waterfill/Kernels_Waterfill_Session.h"
 #include "CommonFramework/ImageTypes/ImageRGB32.h"
 #include "CommonFramework/ImageTools/ImageStats.h"
-#include "CommonFramework/ImageTools/SolidColorTest.h"
-#include "CommonFramework/ImageTools/DistanceToLine.h"
-#include "CommonFramework/ImageTools/BinaryImage_FilterRgb32.h"
+#include "CommonTools/Images/DistanceToLine.h"
+#include "CommonTools/Images/SolidColorTest.h"
+#include "CommonTools/Images/BinaryImage_FilterRgb32.h"
 #include "PokemonSwSh_MaxLair_Detect_PathSide.h"
 
-#include <iostream>
-using std::cout;
-using std::endl;
+//#include <iostream>
+//using std::cout;
+//using std::endl;
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
@@ -326,15 +325,19 @@ int8_t read_side(WaterfillSession& session, const ImageViewRGB32& image, uint8_t
 //    cout << "pixel_threshold = " << (int)pixel_threshold << endl;
     session.set_source(matrix);
 
-    auto finder = session.make_iterator(300);
+    size_t min_area = image.total_pixels();
+    min_area = (size_t)((double)300 * min_area / 1293312);
+
+    auto finder = session.make_iterator(min_area);
     WaterfillObject arrow;
     WaterfillObject object;
     size_t count = 0;
     while (finder->find_next(object, true)){
-        if (is_arrow(image, object)){
-            count++;
-            arrow = object;
+        if (!is_arrow(image, object)){
+            continue;
         }
+        count++;
+        arrow = object;
     }
 //    cout << "count = " << count << endl;
     if (count != 1){
@@ -349,6 +352,7 @@ int8_t read_side(WaterfillSession& session, const ImageViewRGB32& image, uint8_t
 }
 
 int8_t read_side(const ImageViewRGB32& image){
+//    cout << image.width() * image.height() << endl;
     auto session = make_WaterfillSession();
     int8_t ret;
     if ((ret = read_side(*session, image, 160)) != -1) return ret;
diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathSide.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathSide.h
similarity index 82%
rename from SerialPrograms/Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathSide.h
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathSide.h
index e1c9ca8aec..dfb08012e1 100644
--- a/SerialPrograms/Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathSide.h
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathSide.h
@@ -1,6 +1,6 @@
 /*  Max Lair Detect Path Side
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonReader.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonReader.cpp
similarity index 87%
rename from SerialPrograms/Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonReader.cpp
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonReader.cpp
index ecc0100631..6cd925c7c2 100644
--- a/SerialPrograms/Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonReader.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonReader.cpp
@@ -1,6 +1,6 @@
 /*  Max Lair Pokemon Reader
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -11,11 +11,11 @@
 #include "CommonFramework/Tools/ErrorDumper.h"
 #include "Pokemon/Pokemon_Strings.h"
 #include "Pokemon/Inference/Pokemon_NameReader.h"
-#include "PokemonSwSh/Resources/PokemonSwSh_MaxLairDatabase.h"
-#include "PokemonSwSh/Inference/PokemonSwSh_PokemonSpriteReader.h"
-#include "PokemonSwSh/Inference/Dens/PokemonSwSh_DenMonReader.h"
-#include "PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Pokemon.h"
-#include "PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options.h"
+#include "VideoGames/PokemonSwSh/Resources/PokemonSwSh_MaxLairDatabase.h"
+#include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_PokemonSpriteReader.h"
+#include "VideoGames/PokemonSwSh/Inference/Dens/PokemonSwSh_DenMonReader.h"
+#include "VideoGames/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Pokemon.h"
+#include "VideoGames/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options.h"
 #include "PokemonSwSh_MaxLair_Detect_PokemonReader.h"
 
 namespace PokemonAutomation{
@@ -75,9 +75,9 @@ struct SpeciesReadDatabase{
 
 
 
-std::string read_boss_sprite(ConsoleHandle& console){
-    DenMonReader reader(console, console);
-    DenMonReadResults results = reader.read(console.video().snapshot());
+std::string read_boss_sprite(VideoStream& stream){
+    DenMonReader reader(stream.logger(), stream.overlay());
+    DenMonReadResults results = reader.read(stream.video().snapshot());
 
     std::string sprite_slug;
     {
@@ -92,13 +92,13 @@ std::string read_boss_sprite(ConsoleHandle& console){
     auto iter = database.sprite_map.find(sprite_slug);
     if (iter == database.sprite_map.end()){
         throw InternalProgramError(
-            &console.logger(), PA_CURRENT_FUNCTION,
+            &stream.logger(), PA_CURRENT_FUNCTION,
             "Slug doesn't exist in sprite map: " + sprite_slug
         );
     }
     if (iter->second.empty()){
         throw InternalProgramError(
-            &console.logger(), PA_CURRENT_FUNCTION,
+            &stream.logger(), PA_CURRENT_FUNCTION,
             "Sprite map is empty for slug: " + sprite_slug
         );
     }
@@ -108,7 +108,9 @@ std::string read_boss_sprite(ConsoleHandle& console){
 
 std::set<std::string> read_pokemon_name(
     Logger& logger, Language language,
-    const ImageViewRGB32& image
+    OcrFailureWatchdog& ocr_watchdog,
+    const ImageViewRGB32& image,
+    double max_log10p
 ){
     const SpeciesReadDatabase& database = SpeciesReadDatabase::instance();
 
@@ -116,12 +118,16 @@ std::set<std::string> read_pokemon_name(
 //    image.save("test.png");
     OCR::StringMatchResult result = database.name_reader->read_substring(
         logger, language, image,
-        OCR::BLACK_OR_WHITE_TEXT_FILTERS()
+        OCR::BLACK_OR_WHITE_TEXT_FILTERS(),
+        0.01, 0.50,
+        max_log10p
     );
 //    result.log(logger);
     if (result.results.empty()){
+        ocr_watchdog.push_result(false);
         return {};
     }
+    ocr_watchdog.push_result(true);
 
     //  Convert OCR slugs to MaxLair name slugs.
     std::set<std::string> ret;
@@ -298,6 +304,7 @@ std::string read_pokemon_sprite_with_item(
 
 std::string read_pokemon_name_sprite(
     Logger& logger,
+    OcrFailureWatchdog& ocr_watchdog,
     const ImageViewRGB32& screen,
     const ImageFloatBox& sprite_box,
     const ImageFloatBox& name_box, Language language,
@@ -310,7 +317,7 @@ std::string read_pokemon_name_sprite(
     ImageViewRGB32 image = extract_box_reference(screen, name_box);
 
     std::set<std::string> ocr_slugs;
-    for (const std::string& slug : read_pokemon_name(logger, language, image)){
+    for (const std::string& slug : read_pokemon_name(logger, language, ocr_watchdog, image)){
         //  Only include candidates that are valid rental Pokemon.
         auto iter = RENTALS.find(slug);
         if (iter != RENTALS.end()){
@@ -319,9 +326,9 @@ std::string read_pokemon_name_sprite(
     }
     bool ocr_hit = !ocr_slugs.empty();
     bool ocr_unique = ocr_hit && ocr_slugs.size() == 1;
-    if (!ocr_hit){
-        dump_image(logger, MODULE_NAME, "MaxLair-read_name_sprite", screen);
-    }
+//    if (!ocr_hit){
+//        dump_image(logger, MODULE_NAME, "MaxLair-read_name_sprite", screen);
+//    }
 
     ImageMatch::ImageMatchResult result = read_pokemon_sprite_set(
         logger,
@@ -331,9 +338,9 @@ std::string read_pokemon_name_sprite(
     );
     auto iter = result.results.begin();
     bool sprite_hit = iter != result.results.end() && iter->first <= SpeciesReadDatabase::CROPPED_MAX_ALPHA;
-    if (!sprite_hit || result.results.size() > 1){
-        dump_image(logger, MODULE_NAME, "MaxLair-read_name_sprite", screen);
-    }
+//    if (!sprite_hit || result.results.size() > 1){
+//        dump_image(logger, MODULE_NAME, "MaxLair-read_name_sprite", screen);
+//    }
 
     //  No hit on sprite. Use OCR.
     if (!sprite_hit){
@@ -347,6 +354,7 @@ std::string read_pokemon_name_sprite(
     if (!ocr_hit){
         std::string ret = sprite_hit ? std::move(iter->second) : "";
         logger.log("Failed to read name. Using sprite result: " + ret, COLOR_RED);
+        ocr_watchdog.push_result(false);
 //        dump_image(logger, screen, "MaxLair-read_name_sprite");
         return ret;
     }
@@ -364,11 +372,11 @@ std::string read_pokemon_name_sprite(
     }
 
     //  This is where things get bad since OCR and sprites disagree.
-    dump_image(logger, MODULE_NAME, "MaxLair-read_name_sprite", screen);
 
     //  If there is only one sprite match, use it.
     if (result.results.size() == 1){
         logger.log("Sprite and OCR disagree. Attempt to arbitrate... Picking: " + result.results.begin()->second, COLOR_RED);
+        ocr_watchdog.push_result(false);
         return std::move(result.results.begin()->second);
     }
 
@@ -380,6 +388,10 @@ std::string read_pokemon_name_sprite(
 
     //  At this point, both OCR and sprites have multiple items in completely disjoint sets.
     logger.log("Sprite and OCR disagree so badly that no arbitration will be attempted.", COLOR_RED);
+    ocr_watchdog.push_result(false);
+
+    dump_image(logger, MODULE_NAME, "MaxLair-read_name_sprite", screen);
+
     return "";
 }
 
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonReader.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonReader.h
new file mode 100644
index 0000000000..e05c5c8553
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonReader.h
@@ -0,0 +1,59 @@
+/*  Max Lair Pokemon Reader
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_MaxLair_Detect_PokemonReader_H
+#define PokemonAutomation_PokemonSwSh_MaxLair_Detect_PokemonReader_H
+
+#include "CommonFramework/Language.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/Tools/VideoStream.h"
+#include "CommonTools/FailureWatchdog.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+namespace MaxLairInternal{
+
+
+std::string read_boss_sprite(VideoStream& stream);
+
+
+//  OCR the Pokemon name and return all possible candidates.
+std::set<std::string> read_pokemon_name(
+    Logger& logger, Language language,
+    OcrFailureWatchdog& ocr_watchdog,
+    const ImageViewRGB32& image,
+    double max_log10p = -1.4
+);
+
+
+//  Read a Pokemon sprite. The sprite may be partially obstructed
+//  on the right side by an item.
+std::string read_pokemon_sprite_with_item(
+    Logger& logger,
+    const ImageViewRGB32& screen, const ImageFloatBox& box
+);
+
+
+
+//  Use both OCR and sprite to read the Pokemon. It will try to
+//  arbitrate conflicts.
+std::string read_pokemon_name_sprite(
+    Logger& logger,
+    OcrFailureWatchdog& ocr_watchdog,
+    const ImageViewRGB32& screen,
+    const ImageFloatBox& sprite_box,
+    const ImageFloatBox& name_box, Language language,
+    bool allow_exact_match_fallback
+);
+
+
+
+}
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonSelectMenu.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonSelectMenu.cpp
similarity index 86%
rename from SerialPrograms/Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonSelectMenu.cpp
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonSelectMenu.cpp
index 11f3df3db6..25a3c38650 100644
--- a/SerialPrograms/Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonSelectMenu.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonSelectMenu.cpp
@@ -1,18 +1,20 @@
 /*  Max Lair Detect Pokemon Select Menu
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include "Common/Compiler.h"
 #include "CommonFramework/ImageTypes/ImageViewRGB32.h"
-#include "CommonFramework/ImageTools/SolidColorTest.h"
 #include "CommonFramework/VideoPipeline/VideoOverlay.h"
 #include "CommonFramework/Tools/ErrorDumper.h"
-#include "Pokemon/Inference/Pokemon_NameReader.h"
+#include "CommonTools/Images/SolidColorTest.h"
 #include "PokemonSwSh_MaxLair_Detect_PokemonReader.h"
 #include "PokemonSwSh_MaxLair_Detect_PokemonSelectMenu.h"
 
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
 namespace PokemonAutomation{
 namespace NintendoSwitch{
 namespace PokemonSwSh{
@@ -25,7 +27,7 @@ PokemonSelectMenuDetector::PokemonSelectMenuDetector(bool stop_no_detect)
     , m_box0(0.02, 0.02, 0.40, 0.04)
 //    , m_box1(overlay, 0.09, 0.18, 0.30, 0.10)
     , m_box1(0.10, 0.18, 0.27, 0.12)
-    , m_box2(0.50, 0.02, 0.20, 0.03)
+    , m_box2(0.50, 0.02, 0.15, 0.03)
     , m_box3(0.55, 0.07, 0.10, 0.05)
 //    , m_box4(overlay, 0.87, 0.17, 0.03, 0.20)
 //    , m_box5(overlay, 0.87, 0.43, 0.03, 0.20)
@@ -90,10 +92,12 @@ bool PokemonSelectMenuDetector::process_frame(const ImageViewRGB32& frame, WallC
 PokemonSelectMenuReader::PokemonSelectMenuReader(
     Logger& logger,
     VideoOverlay& overlay,
-    Language language
+    Language language,
+    OcrFailureWatchdog& ocr_watchdog
 )
     : m_logger(logger)
     , m_language(language)
+    , m_ocr_watchdog(ocr_watchdog)
     , m_sprite0(overlay, {0.481, 0.178 + 0*0.258, 0.071, 0.103})
     , m_sprite1(overlay, {0.481, 0.178 + 1*0.258, 0.071, 0.103})
     , m_sprite2(overlay, {0.481, 0.178 + 2*0.258, 0.071, 0.103})
@@ -119,9 +123,9 @@ int8_t PokemonSelectMenuReader::who_is_selecting(const ImageViewRGB32& screen) c
 }
 std::string PokemonSelectMenuReader::read_option(const ImageViewRGB32& screen, size_t index){
     switch (index){
-    case 0: return read_pokemon_name_sprite(m_logger, screen, m_sprite0, m_name0, m_language, true);
-    case 1: return read_pokemon_name_sprite(m_logger, screen, m_sprite1, m_name1, m_language, true);
-    case 2: return read_pokemon_name_sprite(m_logger, screen, m_sprite2, m_name2, m_language, true);
+    case 0: return read_pokemon_name_sprite(m_logger, m_ocr_watchdog, screen, m_sprite0, m_name0, m_language, true);
+    case 1: return read_pokemon_name_sprite(m_logger, m_ocr_watchdog, screen, m_sprite1, m_name1, m_language, true);
+    case 2: return read_pokemon_name_sprite(m_logger, m_ocr_watchdog, screen, m_sprite2, m_name2, m_language, true);
     }
     return "";
 }
diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonSelectMenu.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonSelectMenu.h
similarity index 83%
rename from SerialPrograms/Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonSelectMenu.h
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonSelectMenu.h
index 6eed3646c9..6e57129e32 100644
--- a/SerialPrograms/Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonSelectMenu.h
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonSelectMenu.h
@@ -1,16 +1,17 @@
 /*  Max Lair Detect Pokemon Select Menu
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifndef PokemonAutomation_PokemonSwSh_MaxLair_Detect_PokemonSelectMenu_H
 #define PokemonAutomation_PokemonSwSh_MaxLair_Detect_PokemonSelectMenu_H
 
+#include "Common/Cpp/Logging/AbstractLogger.h"
 #include "CommonFramework/Language.h"
-#include "CommonFramework/Logging/Logger.h"
 #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
-#include "CommonFramework/InferenceInfra/VisualInferenceCallback.h"
+#include "CommonTools/FailureWatchdog.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
 
 namespace PokemonAutomation{
     struct ImageStats;
@@ -63,7 +64,8 @@ class PokemonSelectMenuReader{
     PokemonSelectMenuReader(
         Logger& logger,
         VideoOverlay& overlay,
-        Language language
+        Language language,
+        OcrFailureWatchdog& ocr_watchdog
     );
 
     int8_t who_is_selecting(const ImageViewRGB32& screen) const;
@@ -75,6 +77,7 @@ class PokemonSelectMenuReader{
 private:
     Logger& m_logger;
     Language m_language;
+    OcrFailureWatchdog& m_ocr_watchdog;
     OverlayBoxScope m_sprite0;
     OverlayBoxScope m_sprite1;
     OverlayBoxScope m_sprite2;
diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonSwapMenu.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonSwapMenu.cpp
similarity index 87%
rename from SerialPrograms/Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonSwapMenu.cpp
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonSwapMenu.cpp
index be1932cb7a..4b9ee75ba6 100644
--- a/SerialPrograms/Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonSwapMenu.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonSwapMenu.cpp
@@ -1,23 +1,23 @@
 /*  Max Lair Detect Pokemon Swap Menu
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include "CommonFramework/ImageTypes/ImageViewRGB32.h"
-#include "CommonFramework/ImageTools/SolidColorTest.h"
 #include "CommonFramework/Notifications/ProgramInfo.h"
 #include "CommonFramework/VideoPipeline/VideoOverlay.h"
 #include "CommonFramework/Tools/ErrorDumper.h"
+#include "CommonTools/Images/SolidColorTest.h"
 #include "Pokemon/Inference/Pokemon_ReadHpBar.h"
-#include "PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options.h"
-#include "PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_HPPP.h"
+#include "VideoGames/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options.h"
+#include "VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_HPPP.h"
 #include "PokemonSwSh_MaxLair_Detect_PokemonReader.h"
 #include "PokemonSwSh_MaxLair_Detect_PokemonSwapMenu.h"
 
-#include <iostream>
-using std::cout;
-using std::endl;
+//#include <iostream>
+//using std::cout;
+//using std::endl;
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
@@ -94,10 +94,11 @@ bool PokemonSwapMenuDetector::detect(const ImageViewRGB32& screen) const{
 PokemonSwapMenuReader::PokemonSwapMenuReader(
     Logger& logger,
     VideoOverlay& overlay,
-    Language language
+    Language language,
+    OcrFailureWatchdog& ocr_watchdog
 )
     : m_logger(logger)
-    , m_language(language)
+    , m_language(language), m_ocr_watchdog(ocr_watchdog)
     , m_sprite0(overlay, {0.481, 0.235 + 0*0.258, 0.071, 0.103})
     , m_sprite1(overlay, {0.481, 0.235 + 1*0.258, 0.071, 0.103})
     , m_name0(overlay, {0.485, 0.335 + 0*0.258, 0.180, 0.045})
@@ -121,8 +122,8 @@ bool PokemonSwapMenuReader::my_turn(const ImageViewRGB32& screen){
     return false;
 }
 void PokemonSwapMenuReader::read_options(const ImageViewRGB32& screen, std::string option[2]){
-    option[0] = read_pokemon_name_sprite(m_logger, screen, m_sprite0, m_name0, m_language, true);
-    option[1] = read_pokemon_name_sprite(m_logger, screen, m_sprite1, m_name1, m_language, true);
+    option[0] = read_pokemon_name_sprite(m_logger, m_ocr_watchdog, screen, m_sprite0, m_name0, m_language, true);
+    option[1] = read_pokemon_name_sprite(m_logger, m_ocr_watchdog, screen, m_sprite1, m_name1, m_language, true);
 }
 
 void PokemonSwapMenuReader::read_hp(const ImageViewRGB32& screen, double hp[4]){
diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonSwapMenu.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonSwapMenu.h
similarity index 84%
rename from SerialPrograms/Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonSwapMenu.h
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonSwapMenu.h
index 1be01b4932..eb8bef8dac 100644
--- a/SerialPrograms/Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonSwapMenu.h
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonSwapMenu.h
@@ -1,18 +1,18 @@
 /*  Max Lair Detect Pokemon Swap Menu
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifndef PokemonAutomation_PokemonSwSh_MaxLair_Detect_PokemonSwapMenu_H
 #define PokemonAutomation_PokemonSwSh_MaxLair_Detect_PokemonSwapMenu_H
 
+#include "Common/Cpp/Logging/AbstractLogger.h"
 #include "CommonFramework/Language.h"
-#include "CommonFramework/Logging/Logger.h"
 #include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
 #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
-#include "CommonFramework/InferenceInfra/VisualInferenceCallback.h"
+#include "CommonTools/FailureWatchdog.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
@@ -59,7 +59,8 @@ class PokemonSwapMenuReader{
     PokemonSwapMenuReader(
         Logger& logger,
         VideoOverlay& overlay,
-        Language language
+        Language language,
+        OcrFailureWatchdog& ocr_watchdog
     );
 
     bool my_turn(const ImageViewRGB32& screen);
@@ -72,6 +73,7 @@ class PokemonSwapMenuReader{
 private:
     Logger& m_logger;
     Language m_language;
+    OcrFailureWatchdog& m_ocr_watchdog;
     OverlayBoxScope m_sprite0;
     OverlayBoxScope m_sprite1;
     OverlayBoxScope m_name0;
diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_ProfessorSwap.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_ProfessorSwap.cpp
similarity index 88%
rename from SerialPrograms/Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_ProfessorSwap.cpp
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_ProfessorSwap.cpp
index 76df84c204..524eafb51c 100644
--- a/SerialPrograms/Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_ProfessorSwap.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_ProfessorSwap.cpp
@@ -1,12 +1,11 @@
 /*  Max Lair Detect Professor Swap
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include "Common/Compiler.h"
-#include "CommonFramework/ImageTools/SolidColorTest.h"
 #include "CommonFramework/VideoPipeline/VideoOverlay.h"
+#include "CommonTools/Images/SolidColorTest.h"
 #include "PokemonSwSh_MaxLair_Detect_ProfessorSwap.h"
 
 namespace PokemonAutomation{
diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_ProfessorSwap.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_ProfessorSwap.h
similarity index 82%
rename from SerialPrograms/Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_ProfessorSwap.h
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_ProfessorSwap.h
index 698b48e723..549cb6ee4d 100644
--- a/SerialPrograms/Source/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_ProfessorSwap.h
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_ProfessorSwap.h
@@ -1,13 +1,13 @@
 /*  Max Lair Detect Professor Swap
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifndef PokemonAutomation_PokemonSwSh_MaxLair_Detect_ProfessorSwap_H
 #define PokemonAutomation_PokemonSwSh_MaxLair_Detect_ProfessorSwap_H
 
-#include "PokemonSwSh/Inference/PokemonSwSh_SelectionArrowFinder.h"
+#include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_SelectionArrowFinder.h"
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options.cpp
new file mode 100644
index 0000000000..8e60e4e0f2
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options.cpp
@@ -0,0 +1,71 @@
+/*  Max Lair Options
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "PokemonSwSh_MaxLair_Options.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+namespace MaxLairInternal{
+
+
+
+const std::string MODULE_NAME = "Max Lair";
+const std::chrono::milliseconds INFERENCE_RATE = std::chrono::milliseconds(200);
+
+
+
+
+HostingSwitch::HostingSwitch()
+    : IntegerEnumDropdownOption(
+        "<b>Host Switch:</b><br>This is the Switch that hosts the raid.",
+        {
+            {0, "switch0", "Switch 0 (Top Left)"},
+            {1, "switch1", "Switch 1 (Top Right)"},
+            {2, "switch2", "Switch 2 (Bottom Left)"},
+            {3, "switch3", "Switch 3 (Bottom Right)"},
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        0
+    )
+{}
+std::string HostingSwitch::check_validity(size_t consoles) const{
+    if (current_value() >= consoles){
+        return "Host Switch cannot be larger than " + std::to_string(consoles - 1) +
+        " since you only have " + std::to_string(consoles) + " Switch(es) enabled.";
+    }
+    return std::string();
+}
+
+BossSlotOption::BossSlotOption()
+    : IntegerEnumDropdownOption(
+        "<b>Boss Slot:</b>",
+        {
+            {0, "anything", "Anything is fine"},
+            {1, "slot1", "Slot 1"},
+            {2, "slot2", "Slot 2"},
+            {3, "slot3", "Slot 3"},
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        0
+    )
+{}
+
+
+MaxLairTouchDateIntervalOption::MaxLairTouchDateIntervalOption()
+    : PokemonSwSh::TouchDateIntervalOption(
+        "<b>Rollover Prevention:</b><br>Prevent any Wild Area raid dens from rolling over by touching the date every this many hours. Set to zero to disable date touching.",
+        LockMode::UNLOCK_WHILE_RUNNING
+    )
+{}
+
+
+
+
+}
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options.h
new file mode 100644
index 0000000000..c6ce85547a
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options.h
@@ -0,0 +1,85 @@
+/*  Max Lair Options
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_MaxLair_Options_H
+#define PokemonAutomation_PokemonSwSh_MaxLair_Options_H
+
+#include <chrono>
+#include "Common/Compiler.h"
+#include "Common/Cpp/Options/EnumDropdownOption.h"
+#include "VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_Stats.h"
+#include "VideoGames/PokemonSwSh/Options/PokemonSwSh_DateToucher.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+namespace MaxLairInternal{
+
+
+extern const std::string MODULE_NAME;
+extern const std::chrono::milliseconds INFERENCE_RATE;
+
+
+
+
+class HostingSwitch : public IntegerEnumDropdownOption{
+public:
+    HostingSwitch();
+    using ConfigOption::check_validity;
+    std::string check_validity(size_t consoles) const;
+};
+
+
+
+class BossSlotOption : public IntegerEnumDropdownOption{
+public:
+    BossSlotOption();
+};
+
+
+class MaxLairTouchDateIntervalOption : public PokemonSwSh::TouchDateIntervalOption{
+public:
+    MaxLairTouchDateIntervalOption();
+};
+
+
+
+
+enum class CaughtScreenAction{
+    STOP_PROGRAM,
+    TAKE_NON_BOSS_SHINY_AND_CONTINUE,
+    RESET,
+};
+class EndBattleDecider{
+public:
+    virtual const std::string& normal_ball(
+        size_t console_index
+    ) const = 0;
+    virtual const std::string& boss_ball(
+        size_t console_index, const std::string& boss_slug
+    ) const = 0;
+    virtual CaughtScreenAction end_adventure_action(
+        size_t console_index, const std::string& boss_slug,
+        const PathStats& path_stats,
+        bool any_shiny, bool boss_is_shiny
+    ) const = 0;
+    
+    // For BossFinder: whether the boss is in the "save on the go" list.
+    virtual bool is_in_save_list(const std::string& boss_slug) const { return false; }
+};
+
+
+
+
+
+
+
+
+}
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options_BossAction.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options_BossAction.cpp
new file mode 100644
index 0000000000..13049cdd67
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options_BossAction.cpp
@@ -0,0 +1,111 @@
+/*  Max Lair Boss Action
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <vector>
+#include <memory>
+//#include "Common/Compiler.h"
+//#include "Common/Cpp/Json/JsonValue.h"
+//#include "Common/Cpp/Json/JsonArray.h"
+//#include "Common/Cpp/Json/JsonObject.h"
+#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "Common/Cpp/Options/ConfigOption.h"
+//#include "CommonFramework/Globals.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "Pokemon/Resources/Pokemon_PokemonNames.h"
+//#include "Pokemon/Resources/Pokemon_PokeballNames.h"
+#include "VideoGames/PokemonSwSh/Resources/PokemonSwSh_PokemonSprites.h"
+#include "VideoGames/PokemonSwSh/Resources/PokemonSwSh_MaxLairDatabase.h"
+#include "PokemonSwSh_MaxLair_Options_BossAction.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+namespace MaxLairInternal{
+
+
+
+
+const EnumDropdownDatabase<BossAction>& BossAction_Database(){
+    static const EnumDropdownDatabase<BossAction> database({
+        {BossAction::CATCH_AND_STOP_PROGRAM, "always-stop", "Always stop program."},
+        {BossAction::CATCH_AND_STOP_IF_SHINY, "stop-if-shiny", "Stop if shiny."},
+    });
+    return database;
+}
+
+BossActionRow::BossActionRow(std::string slug, const std::string& name_slug, const std::string& sprite_slug)
+    : StaticTableRow(std::move(slug))
+    , pokemon(
+        LockMode::UNLOCK_WHILE_RUNNING,
+        get_pokemon_name(name_slug).display_name(),
+        ALL_POKEMON_SPRITES().get_throw(sprite_slug).icon
+    )
+    , action(
+        BossAction_Database(),
+        LockMode::UNLOCK_WHILE_RUNNING,
+        BossAction::CATCH_AND_STOP_IF_SHINY
+    )
+    , ball(LockMode::UNLOCK_WHILE_RUNNING, "poke-ball")
+    , save_on_the_go(LockMode::UNLOCK_WHILE_RUNNING, false)
+{
+    PA_ADD_STATIC(pokemon);
+    add_option(action, "Action");
+    add_option(ball, "Ball");
+    add_option(save_on_the_go, "Save Path");
+    
+    BossActionRow::on_config_value_changed(nullptr);
+    
+    action.add_listener(*this);
+}
+
+void BossActionRow::on_config_value_changed(void* object){
+    switch (action){
+    case BossAction::CATCH_AND_STOP_PROGRAM:
+        save_on_the_go = false;
+        save_on_the_go.set_visibility(ConfigOptionState::DISABLED);
+        break;
+    case BossAction::CATCH_AND_STOP_IF_SHINY:
+        save_on_the_go.set_visibility(ConfigOptionState::ENABLED);
+        break;
+    }
+}
+
+
+BossActionTable::BossActionTable()
+    : StaticTableOption("<b>Boss Actions:</b>", LockMode::UNLOCK_WHILE_RUNNING)
+{
+    for (const auto& item : all_bosses_by_dex()){
+//        cout << item.second << endl;
+        const MaxLairSlugs& slugs = get_maxlair_slugs(item.second);
+        const std::string& sprite_slug = *slugs.sprite_slugs.begin();
+        const std::string& name_slug = slugs.name_slug;
+        add_row(std::make_unique<BossActionRow>(item.second, name_slug, sprite_slug));
+    }
+    finish_construction();
+}
+std::vector<std::string> BossActionTable::make_header() const{
+    std::vector<std::string> ret{
+        STRING_POKEMON,
+        "Action",
+        STRING_POKEBALL,
+        "Save Path"
+    };
+    return ret;
+}
+
+
+
+
+
+
+}
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options_BossAction.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options_BossAction.h
new file mode 100644
index 0000000000..ff44bf09e8
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options_BossAction.h
@@ -0,0 +1,54 @@
+/*  Max Lair Boss Action
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_MaxLair_Options_BossAction_H
+#define PokemonAutomation_PokemonSwSh_MaxLair_Options_BossAction_H
+
+#include <vector>
+#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "Common/Cpp/Options/EnumDropdownOption.h"
+#include "Common/Cpp/Options/StaticTableOption.h"
+#include "CommonFramework/Options/LabelCellOption.h"
+#include "VideoGames/PokemonSwSh/Options/PokemonSwSh_BallSelectOption.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+namespace MaxLairInternal{
+
+
+enum class BossAction{
+    CATCH_AND_STOP_PROGRAM,
+    CATCH_AND_STOP_IF_SHINY,
+};
+
+
+class BossActionRow : public StaticTableRow, private ConfigOption::Listener{
+public:
+    BossActionRow(std::string slug, const std::string& name_slug, const std::string& sprite_slug);
+    virtual void on_config_value_changed(void* object) override;
+
+    LabelCellOption pokemon;
+    EnumDropdownCell<BossAction> action;
+    PokemonBallSelectCell ball;
+    BooleanCheckBoxCell save_on_the_go;
+};
+
+class BossActionTable : public StaticTableOption{
+public:
+    BossActionTable();
+    virtual std::vector<std::string> make_header() const override;
+};
+
+
+
+
+
+}
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options_Consoles.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options_Consoles.cpp
similarity index 78%
rename from SerialPrograms/Source/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options_Consoles.cpp
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options_Consoles.cpp
index ac914528b2..5d98ebed67 100644
--- a/SerialPrograms/Source/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options_Consoles.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options_Consoles.cpp
@@ -1,18 +1,15 @@
 /*  Max Lair Consoles
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
-
-#include "Common/Compiler.h"
-#include "CommonFramework/Globals.h"
 #include "Pokemon/Pokemon_Strings.h"
 #include "Pokemon/Inference/Pokemon_NameReader.h"
 #include "PokemonSwSh_MaxLair_Options_Consoles.h"
 
-#include <iostream>
-using std::cout;
-using std::endl;
+//#include <iostream>
+//using std::cout;
+//using std::endl;
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
@@ -41,7 +38,7 @@ CaughtScreenActionOption::CaughtScreenActionOption(
                     : "Reset Game if win-rate is above the threshold. Otherwise continue running."
             },
         },
-        LockWhileRunning::LOCKED,
+        LockMode::LOCK_WHILE_RUNNING,
         default_action
     )
 {}
@@ -52,7 +49,7 @@ CaughtScreenActionsOption::CaughtScreenActionsOption(
     CaughtScreenAction default_shiny_nonboss,
     CaughtScreenAction default_shiny_boss
 )
-    : GroupOption("End Adventure Actions", LockWhileRunning::LOCKED)
+    : GroupOption("End Adventure Actions", LockMode::LOCK_WHILE_RUNNING)
     , no_shinies(false, winrate_reset_tooltip, "<b>No Shinies:</b>", default_no_shinies)
     , shiny_nonboss(
         true, winrate_reset_tooltip,
@@ -62,7 +59,11 @@ CaughtScreenActionsOption::CaughtScreenActionsOption(
     )
     , shiny_boss(
         true, winrate_reset_tooltip,
-        "<b>Boss/Legendary is Shiny:</b><br>If there are mulitiple shinies where one is the boss, this option still applies.",
+        "<b>Boss/Legendary is Shiny:</b><br>If there are multiple shinies where one is the boss, this option still applies.<br><br>"
+        "<font color=\"red\">For safety reasons, this program will <i>NEVER</i> automatically take a boss. "
+        "Likewise, the settings here are intentionally worded so that it's impossible to ask the program to take a boss. "
+        "Taking a boss is irreversible, therefore we refuse to automate it. We require you to do it manually to avoid any mistakes.<br><br>"
+        "<b>Please DO NOT ask us to implement the ability to automatically take a boss. Thank you.</b></font>",
         default_shiny_boss
     )
     , description(
@@ -87,9 +88,9 @@ CaughtScreenActionsOption::CaughtScreenActionsOption(
 
 
 ConsoleSpecificOptions::ConsoleSpecificOptions(std::string label, const LanguageSet& languages, bool host)
-    : GroupOption(std::move(label), LockWhileRunning::LOCKED)
+    : GroupOption(std::move(label), LockMode::LOCK_WHILE_RUNNING)
     , is_host_label("<font color=\"blue\" size=4><b>This is the host Switch.</b></font>")
-    , language("<b>Game Language:</b>", languages, LockWhileRunning::LOCKED, true)
+    , language("<b>Game Language:</b>", languages, LockMode::LOCK_WHILE_RUNNING, true)
 {
     ConsoleSpecificOptions::set_host(host);
     PA_ADD_STATIC(is_host_label);
@@ -108,7 +109,7 @@ Consoles::~Consoles(){
     HOST.remove_listener(*this);
 }
 Consoles::Consoles(const ConsoleSpecificOptionsFactory& factory)
-    : BatchOption(LockWhileRunning::LOCKED)
+    : BatchOption(LockMode::LOCK_WHILE_RUNNING)
     , m_languages(PokemonNameReader::instance().languages())
 {
     PLAYERS[0] = factory.make("Switch 0 (Top Left)", m_languages, true);
@@ -140,7 +141,7 @@ void Consoles::set_active_consoles(size_t consoles){
     }
     m_active_consoles = consoles;
 }
-void Consoles::value_changed(){
+void Consoles::on_config_value_changed(void* object){
     size_t host_index = HOST.current_value();
     for (size_t c = 0; c < 4; c++){
         PLAYERS[c]->set_host(c == host_index);
diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options_Consoles.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options_Consoles.h
similarity index 88%
rename from SerialPrograms/Source/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options_Consoles.h
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options_Consoles.h
index dd3bc90ae8..8f08f3516c 100644
--- a/SerialPrograms/Source/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options_Consoles.h
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options_Consoles.h
@@ -1,6 +1,6 @@
 /*  Max Lair Consoles
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -12,9 +12,8 @@
 #include "Common/Cpp/Options/GroupOption.h"
 #include "Common/Cpp/Options/StaticTextOption.h"
 #include "Common/Cpp/Options/EnumDropdownOption.h"
-#include "CommonFramework/Options/LanguageOCROption.h"
 #include "CommonFramework/Language.h"
-//#include "PokemonSwSh/Options/PokemonSwSh_BallSelectOption.h"
+#include "CommonTools/Options/LanguageOCROption.h"
 #include "PokemonSwSh_MaxLair_Options.h"
 
 namespace PokemonAutomation{
@@ -83,7 +82,7 @@ class Consoles : public BatchOption, private ConfigOption::Listener{
         return *PLAYERS[index];
     }
 
-    virtual void value_changed() override;
+    virtual void on_config_value_changed(void* object) override;
 
 private:
     LanguageSet m_languages;
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options_Hosting.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options_Hosting.cpp
new file mode 100644
index 0000000000..827d2385bd
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options_Hosting.cpp
@@ -0,0 +1,93 @@
+/*  Max Lair Hosting
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "PokemonSwSh_MaxLair_Options_Hosting.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+namespace MaxLairInternal{
+
+
+
+HostingSettings::~HostingSettings(){
+    MODE.remove_listener(*this);
+}
+HostingSettings::HostingSettings()
+    : GroupOption("Hosting Options", LockMode::LOCK_WHILE_RUNNING)
+    , MODE(
+        "<b>Mode:</b>",
+        {
+            {HostingMode::NOT_HOSTING, "none", "Not Hosting: Run by yourself using only Switches controlled by this program."},
+            {HostingMode::HOST_LOCALLY, "local", "Host Locally: Allow other local Switches to join."},
+            {HostingMode::HOST_ONLINE, "online", "Host Online: Allow other people online to join."},
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        HostingMode::NOT_HOSTING
+    )
+    , RAID_CODE(
+        "<b>Raid Code:</b><br>Required if using multiple Switches. "
+        "Random code is strongly recommended when hosting to ensure your own Switches get in.",
+        8, 4, ""
+    )
+    , CONNECT_TO_INTERNET_DELAY0(
+        "<b>Connect to Internet Delay:</b><br>Time from \"Connect to Internet\" to when you're ready to start adventure.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "20 s"
+    )
+    , START_DELAY0(
+        "<b>Start Delay:</b><br>Wait this long before entering the lobby.<br><br>"
+        "If two Switches open a lobby at the same time, they might not see each other and "
+        "thus fail to join each other. If you are joining someone else's auto-host, you "
+        "will want to set this to 3 seconds or more to make sure that the host opens the "
+        "lobby before everyone else tries to join.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "0 s"
+    )
+    , LOBBY_WAIT_DELAY0(
+        "<b>Lobby Wait Delay:</b><br>Wait this long before starting raid. Start time is 3 minutes minus this number.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "60 s"
+    )
+    , NOTIFICATIONS("Live-Hosting Announcements", true)
+{
+    PA_ADD_OPTION(MODE);
+    PA_ADD_OPTION(RAID_CODE);
+    PA_ADD_OPTION(CONNECT_TO_INTERNET_DELAY0);
+    PA_ADD_OPTION(START_DELAY0);
+    PA_ADD_OPTION(LOBBY_WAIT_DELAY0);
+    PA_ADD_OPTION(NOTIFICATIONS);
+
+    MODE.add_listener(*this);
+}
+std::string HostingSettings::check_validity(size_t consoles) const{
+    if (consoles != 1 && !RAID_CODE.code_enabled()){
+        return "You must use a code when running with multiple Switches.";
+    }
+    return std::string();
+}
+void HostingSettings::on_config_value_changed(void* object){
+    HostingMode mode = MODE;
+    if (mode == HostingMode::HOST_ONLINE){
+        CONNECT_TO_INTERNET_DELAY0.set_visibility(ConfigOptionState::ENABLED);
+    }else{
+        CONNECT_TO_INTERNET_DELAY0.set_visibility(ConfigOptionState::DISABLED);
+    }
+    if (mode != HostingMode::NOT_HOSTING){
+        START_DELAY0.set_visibility(ConfigOptionState::ENABLED);
+        NOTIFICATIONS.set_visibility(ConfigOptionState::ENABLED);
+    }else{
+        START_DELAY0.set_visibility(ConfigOptionState::DISABLED);
+        NOTIFICATIONS.set_visibility(ConfigOptionState::DISABLED);
+    }
+}
+
+
+
+}
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options_Hosting.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options_Hosting.h
new file mode 100644
index 0000000000..c872963d83
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options_Hosting.h
@@ -0,0 +1,53 @@
+/*  Max Lair Hosting
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_MaxLair_Options_Hosting_H
+#define PokemonAutomation_PokemonSwSh_MaxLair_Options_Hosting_H
+
+#include "Common/Cpp/Options/GroupOption.h"
+#include "Common/Cpp/Options/RandomCodeOption.h"
+#include "Common/Cpp/Options/EnumDropdownOption.h"
+#include "Common/Cpp/Options/TimeDurationOption.h"
+#include "VideoGames/PokemonSwSh/Options/PokemonSwSh_AutoHostNotification.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+namespace MaxLairInternal{
+
+
+
+enum class HostingMode{
+    NOT_HOSTING,
+    HOST_LOCALLY,
+    HOST_ONLINE,
+};
+
+class HostingSettings : public GroupOption, private ConfigOption::Listener{
+public:
+    ~HostingSettings();
+    HostingSettings();
+    using GroupOption::check_validity;
+    std::string check_validity(size_t consoles) const;
+
+    virtual void on_config_value_changed(void* object) override;
+
+    EnumDropdownOption<HostingMode> MODE;
+    RandomCodeOption RAID_CODE;
+    MillisecondsOption CONNECT_TO_INTERNET_DELAY0;
+    MillisecondsOption START_DELAY0;
+    MillisecondsOption LOBBY_WAIT_DELAY0;
+
+    AutoHostNotificationOption NOTIFICATIONS;
+};
+
+
+
+}
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/PokemonSwSh_MaxLair_BossFinder.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/PokemonSwSh_MaxLair_BossFinder.cpp
similarity index 85%
rename from SerialPrograms/Source/PokemonSwSh/MaxLair/PokemonSwSh_MaxLair_BossFinder.cpp
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/PokemonSwSh_MaxLair_BossFinder.cpp
index d4454b7919..3ddd84eead 100644
--- a/SerialPrograms/Source/PokemonSwSh/MaxLair/PokemonSwSh_MaxLair_BossFinder.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/PokemonSwSh_MaxLair_BossFinder.cpp
@@ -1,16 +1,18 @@
 /*  Max Lair (Boss Finder)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include "Common/Compiler.h"
 #include "Common/Cpp/Exceptions.h"
 #include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonTools/StartupChecks/VideoResolutionCheck.h"
 #include "NintendoSwitch/NintendoSwitch_Settings.h"
 #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
 #include "Pokemon/Pokemon_Strings.h"
-#include "PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
+#include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
 #include "Program/PokemonSwSh_MaxLair_Run_Adventure.h"
 #include "PokemonSwSh_MaxLair_BossFinder.h"
 
@@ -25,11 +27,12 @@ MaxLairBossFinder_Descriptor::MaxLairBossFinder_Descriptor()
     : MultiSwitchProgramDescriptor(
         "PokemonSwSh:MaxLair-BossFinder",
         STRING_POKEMON + " SwSh", "Max Lair - Boss Finder",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonSwSh/MaxLair-BossFinder.md",
+        "Programs/PokemonSwSh/MaxLair-BossFinder.html",
         "Auto Max Lair 2.0 - Run adventures until you find the boss you want. Once you find your boss, switch to the other programs to shiny hunt it.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
         FeedbackType::REQUIRED,
         AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB,
         1, 4, 1
     )
 {}
@@ -45,7 +48,7 @@ class MaxLairBossFinder_ConsoleOptions : public ConsoleSpecificOptions{
         : ConsoleSpecificOptions(std::move(label), languages, host)
         , normal_ball(
             "<b>Normal Ball:</b> Ball for catching non-boss " + STRING_POKEMON + ".",
-            LockWhileRunning::LOCKED,
+            LockMode::LOCK_WHILE_RUNNING,
             "poke-ball"
         )
     {
@@ -150,6 +153,9 @@ class EndBattleDecider_BossFinder : public EndBattleDecider{
         }
         throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Invalid enum.");
     }
+    virtual bool is_in_save_list(const std::string& boss_slug) const override{
+        return get_filter(boss_slug).save_on_the_go;
+    }
 
 
 private:
@@ -179,16 +185,18 @@ class EndBattleDecider_BossFinder : public EndBattleDecider{
 
 void MaxLairBossFinder::program(MultiSwitchProgramEnvironment& env, CancellableScope& scope){
     size_t host_index = CONSOLES.HOST.current_value();
-    if (host_index >= env.consoles.size()){
+    if (host_index >= env.consoles()){
         throw UserSetupError(env.logger(), "Invalid Host Switch");
     }
 
-    env.run_in_parallel(scope, [&](ConsoleHandle& console, BotBaseContext& context){
+    env.run_in_parallel<ProController>(scope, [&](ConsoleHandle& console, ProControllerContext& context){
+        assert_16_9_720p_min(console, console);
         if (START_LOCATION.start_in_grip_menu()){
             grip_menu_connect_go_home(context);
             resume_game_no_interact(console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST);
         }else{
-            pbf_press_button(context, BUTTON_B, 5, 5);
+            //  Connect the controller.
+            require_player(console, context, BUTTON_B);
         }
     });
 
diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/PokemonSwSh_MaxLair_BossFinder.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/PokemonSwSh_MaxLair_BossFinder.h
similarity index 84%
rename from SerialPrograms/Source/PokemonSwSh/MaxLair/PokemonSwSh_MaxLair_BossFinder.h
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/PokemonSwSh_MaxLair_BossFinder.h
index ea49dd91a9..1bae705524 100644
--- a/SerialPrograms/Source/PokemonSwSh/MaxLair/PokemonSwSh_MaxLair_BossFinder.h
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/PokemonSwSh_MaxLair_BossFinder.h
@@ -1,6 +1,6 @@
 /*  Max Lair (Boss Finder)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -11,7 +11,7 @@
 #include "NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h"
 #include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
 #include "NintendoSwitch/NintendoSwitch_MultiSwitchProgram.h"
-#include "PokemonSwSh/Options/PokemonSwSh_DateToucher.h"
+#include "VideoGames/PokemonSwSh/Options/PokemonSwSh_DateToucher.h"
 #include "Options/PokemonSwSh_MaxLair_Options.h"
 #include "Options/PokemonSwSh_MaxLair_Options_Consoles.h"
 #include "Options/PokemonSwSh_MaxLair_Options_Hosting.h"
@@ -33,6 +33,7 @@ class MaxLairBossFinder_Descriptor : public MultiSwitchProgramDescriptor{
 
 class MaxLairBossFinder : public MultiSwitchProgramInstance{
 public:
+    using Descriptor = MaxLairBossFinder_Descriptor;
     MaxLairBossFinder();
 
     virtual std::string check_validity() const override;
@@ -48,7 +49,7 @@ class MaxLairBossFinder : public MultiSwitchProgramInstance{
     MaxLairInternal::BossActionTable BOSS_LIST;
     MaxLairInternal::HostingSettings HOSTING;
 
-    TouchDateIntervalOption TOUCH_DATE_INTERVAL;
+    MaxLairInternal::MaxLairTouchDateIntervalOption TOUCH_DATE_INTERVAL;
 
     EventNotificationOption NOTIFICATION_STATUS;
     EventNotificationOption NOTIFICATION_SHINY;
diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/PokemonSwSh_MaxLair_Standard.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/PokemonSwSh_MaxLair_Standard.cpp
similarity index 83%
rename from SerialPrograms/Source/PokemonSwSh/MaxLair/PokemonSwSh_MaxLair_Standard.cpp
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/PokemonSwSh_MaxLair_Standard.cpp
index f039d3438b..7dfa8a000e 100644
--- a/SerialPrograms/Source/PokemonSwSh/MaxLair/PokemonSwSh_MaxLair_Standard.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/PokemonSwSh_MaxLair_Standard.cpp
@@ -1,22 +1,24 @@
 /*  Max Lair (Normal Mode)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include "Common/Cpp/Exceptions.h"
 #include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonTools/StartupChecks/VideoResolutionCheck.h"
 #include "NintendoSwitch/NintendoSwitch_Settings.h"
 #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
 #include "Pokemon/Pokemon_Strings.h"
-#include "PokemonSwSh/Options/PokemonSwSh_BallSelectOption.h"
-#include "PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
+#include "VideoGames/PokemonSwSh/Options/PokemonSwSh_BallSelectOption.h"
+#include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
 #include "Program/PokemonSwSh_MaxLair_Run_Adventure.h"
 #include "PokemonSwSh_MaxLair_Standard.h"
 
-#include <iostream>
-using std::cout;
-using std::endl;
+//#include <iostream>
+//using std::cout;
+//using std::endl;
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
@@ -29,11 +31,12 @@ MaxLairStandard_Descriptor::MaxLairStandard_Descriptor()
     : MultiSwitchProgramDescriptor(
         "PokemonSwSh:MaxLair-Standard",
         STRING_POKEMON + " SwSh", "Max Lair - Standard",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonSwSh/MaxLair-Standard.md",
+        "Programs/PokemonSwSh/MaxLair-Standard.html",
         "Auto Max Lair 2.0 - Run Dynamax Adventures until a shiny legendary is found.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
         FeedbackType::REQUIRED,
         AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB,
         1, 4, 1
     )
 {}
@@ -54,12 +57,12 @@ class MaxLairStandard_ConsoleOptions : public ConsoleSpecificOptions{
         : ConsoleSpecificOptions(std::move(label), languages, host)
         , normal_ball(
             "<b>Normal Ball:</b> Ball for catching non-boss " + STRING_POKEMON + ".",
-            LockWhileRunning::LOCKED,
+            LockMode::LOCK_WHILE_RUNNING,
             "poke-ball"
         )
         , boss_ball(
             "<b>Boss Ball:</b> Ball for catching the boss/legendary " + STRING_POKEMON + ".",
-            LockWhileRunning::LOCKED,
+            LockMode::LOCK_WHILE_RUNNING,
             "poke-ball"
         )
         , actions(true, false)
@@ -179,16 +182,18 @@ class EndBattleDecider_Standard : public EndBattleDecider{
 
 void MaxLairStandard::program(MultiSwitchProgramEnvironment& env, CancellableScope& scope){
     size_t host_index = CONSOLES.HOST.current_value();
-    if (host_index >= env.consoles.size()){
+    if (host_index >= env.consoles()){
         throw UserSetupError(env.logger(), "Invalid Host Switch");
     }
 
-    env.run_in_parallel(scope, [&](ConsoleHandle& console, BotBaseContext& context){
+    env.run_in_parallel<ProController>(scope, [&](ConsoleHandle& console, ProControllerContext& context){
+        assert_16_9_720p_min(console, console);
         if (START_LOCATION.start_in_grip_menu()){
             grip_menu_connect_go_home(context);
             resume_game_no_interact(console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST);
         }else{
-            pbf_press_button(context, BUTTON_B, 5, 5);
+            //  Connect the controller.
+            require_player(console, context, BUTTON_B);
         }
     });
 
diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/PokemonSwSh_MaxLair_Standard.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/PokemonSwSh_MaxLair_Standard.h
similarity index 84%
rename from SerialPrograms/Source/PokemonSwSh/MaxLair/PokemonSwSh_MaxLair_Standard.h
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/PokemonSwSh_MaxLair_Standard.h
index 1fc522136e..8869ef9e0e 100644
--- a/SerialPrograms/Source/PokemonSwSh/MaxLair/PokemonSwSh_MaxLair_Standard.h
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/PokemonSwSh_MaxLair_Standard.h
@@ -1,6 +1,6 @@
 /*  Max Lair (Standard Mode)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -11,7 +11,7 @@
 #include "NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h"
 #include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
 #include "NintendoSwitch/NintendoSwitch_MultiSwitchProgram.h"
-#include "PokemonSwSh/Options/PokemonSwSh_DateToucher.h"
+#include "VideoGames/PokemonSwSh/Options/PokemonSwSh_DateToucher.h"
 #include "Options/PokemonSwSh_MaxLair_Options.h"
 #include "Options/PokemonSwSh_MaxLair_Options_Consoles.h"
 #include "Options/PokemonSwSh_MaxLair_Options_Hosting.h"
@@ -37,6 +37,7 @@ class MaxLairStandard : public MultiSwitchProgramInstance{
     };
 
 public:
+    using Descriptor = MaxLairStandard_Descriptor;
     MaxLairStandard();
 
     virtual std::string check_validity() const override;
@@ -53,7 +54,7 @@ class MaxLairStandard : public MultiSwitchProgramInstance{
     MaxLairInternal::Consoles CONSOLES;
     MaxLairInternal::HostingSettings HOSTING;
 
-    TouchDateIntervalOption TOUCH_DATE_INTERVAL;
+    MaxLairInternal::MaxLairTouchDateIntervalOption TOUCH_DATE_INTERVAL;
 
     EventNotificationOption NOTIFICATION_STATUS;
     EventNotificationOption NOTIFICATION_SHINY;
diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/PokemonSwSh_MaxLair_StrongBoss.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/PokemonSwSh_MaxLair_StrongBoss.cpp
similarity index 86%
rename from SerialPrograms/Source/PokemonSwSh/MaxLair/PokemonSwSh_MaxLair_StrongBoss.cpp
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/PokemonSwSh_MaxLair_StrongBoss.cpp
index 5d3505a964..1f61a1d4ca 100644
--- a/SerialPrograms/Source/PokemonSwSh/MaxLair/PokemonSwSh_MaxLair_StrongBoss.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/PokemonSwSh_MaxLair_StrongBoss.cpp
@@ -1,17 +1,19 @@
 /*  Max Lair (Strong-Boss Mode)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include "Common/Cpp/PrettyPrint.h"
 #include "Common/Cpp/Exceptions.h"
 #include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonTools/StartupChecks/VideoResolutionCheck.h"
 #include "NintendoSwitch/NintendoSwitch_Settings.h"
 #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
 #include "Pokemon/Pokemon_Strings.h"
-#include "PokemonSwSh/Options/PokemonSwSh_BallSelectOption.h"
-#include "PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
+#include "VideoGames/PokemonSwSh/Options/PokemonSwSh_BallSelectOption.h"
+#include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
 #include "Program/PokemonSwSh_MaxLair_Run_Adventure.h"
 #include "PokemonSwSh_MaxLair_StrongBoss.h"
 
@@ -22,6 +24,7 @@
 namespace PokemonAutomation{
 namespace NintendoSwitch{
 namespace PokemonSwSh{
+
 using namespace MaxLairInternal;
 
 
@@ -30,11 +33,12 @@ MaxLairStrongBoss_Descriptor::MaxLairStrongBoss_Descriptor()
     : MultiSwitchProgramDescriptor(
         "PokemonSwSh:MaxLair-StrongBoss",
         STRING_POKEMON + " SwSh", "Max Lair - Strong Boss",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonSwSh/MaxLair-StrongBoss.md",
+        "Programs/PokemonSwSh/MaxLair-StrongBoss.html",
         "Auto Max Lair 2.0 - Run Dynamax Adventures and intelligently reset to keep paths that have high win rates.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
         FeedbackType::REQUIRED,
         AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB,
         1, 4, 1
     )
 {}
@@ -49,12 +53,12 @@ class MaxLairStrongBoss_ConsoleOptions : public ConsoleSpecificOptions{
         : ConsoleSpecificOptions(std::move(label), languages, host)
         , normal_ball(
             "<b>Normal Ball:</b> Ball for catching non-boss " + STRING_POKEMON + ".",
-            LockWhileRunning::LOCKED,
+            LockMode::LOCK_WHILE_RUNNING,
             "poke-ball"
         )
         , boss_ball(
             "<b>Boss Ball:</b> Ball for catching the boss/legendary " + STRING_POKEMON + ".",
-            LockWhileRunning::LOCKED,
+            LockMode::LOCK_WHILE_RUNNING,
             "poke-ball"
         )
         , actions_non_host(false, false)
@@ -109,7 +113,7 @@ MaxLairStrongBoss::MaxLairStrongBoss()
     , MIN_WIN_RATE(
         "<b>Minimum Win Rate:</b><br>"
         "Keep the path if the win rate stays above this ratio. This is done by resetting the host.",
-        LockWhileRunning::LOCKED,
+        LockMode::UNLOCK_WHILE_RUNNING,
         0.75, 0, 1.0
     )
     , CONSOLES(MaxLairStrongBoss_ConsoleFactory())
@@ -166,7 +170,7 @@ class EndBattleDecider_StrongBoss : public EndBattleDecider{
     EndBattleDecider_StrongBoss(
         Logger& logger,
         const Consoles& consoles, size_t host_index,
-        double min_win_ratio
+        const FloatingPointOption& min_win_ratio
     )
         : m_logger(logger)
         , m_consoles(consoles)
@@ -222,23 +226,25 @@ class EndBattleDecider_StrongBoss : public EndBattleDecider{
     Logger& m_logger;
     const Consoles& m_consoles;
     size_t m_host_index;
-    double m_min_win_ratio;
+    const FloatingPointOption& m_min_win_ratio;
 };
 
 
 
 void MaxLairStrongBoss::program(MultiSwitchProgramEnvironment& env, CancellableScope& scope){
     size_t host_index = CONSOLES.HOST.current_value();
-    if (host_index >= env.consoles.size()){
+    if (host_index >= env.consoles()){
         throw UserSetupError(env.logger(), "Invalid Host Switch");
     }
 
-    env.run_in_parallel(scope, [&](ConsoleHandle& console, BotBaseContext& context){
+    env.run_in_parallel<ProController>(scope, [&](ConsoleHandle& console, ProControllerContext& context){
+        assert_16_9_720p_min(console, console);
         if (START_LOCATION.start_in_grip_menu()){
             grip_menu_connect_go_home(context);
             resume_game_no_interact(console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST);
         }else{
-            pbf_press_button(context, BUTTON_B, 5, 5);
+            //  Connect the controller.
+            require_player(console, context, BUTTON_B);
         }
     });
 
diff --git a/SerialPrograms/Source/PokemonSwSh/MaxLair/PokemonSwSh_MaxLair_StrongBoss.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/PokemonSwSh_MaxLair_StrongBoss.h
similarity index 85%
rename from SerialPrograms/Source/PokemonSwSh/MaxLair/PokemonSwSh_MaxLair_StrongBoss.h
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/PokemonSwSh_MaxLair_StrongBoss.h
index d4b33245d8..269bc43d2e 100644
--- a/SerialPrograms/Source/PokemonSwSh/MaxLair/PokemonSwSh_MaxLair_StrongBoss.h
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/PokemonSwSh_MaxLair_StrongBoss.h
@@ -1,6 +1,6 @@
 /*  Max Lair (Strong-Boss Mode)
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -12,7 +12,7 @@
 #include "NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h"
 #include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
 #include "NintendoSwitch/NintendoSwitch_MultiSwitchProgram.h"
-#include "PokemonSwSh/Options/PokemonSwSh_DateToucher.h"
+#include "VideoGames/PokemonSwSh/Options/PokemonSwSh_DateToucher.h"
 #include "Options/PokemonSwSh_MaxLair_Options.h"
 #include "Options/PokemonSwSh_MaxLair_Options_Consoles.h"
 #include "Options/PokemonSwSh_MaxLair_Options_Hosting.h"
@@ -38,6 +38,7 @@ class MaxLairStrongBoss : public MultiSwitchProgramInstance{
     };
 
 public:
+    using Descriptor = MaxLairStrongBoss_Descriptor;
     MaxLairStrongBoss();
 
     virtual std::string check_validity() const override;
@@ -55,7 +56,7 @@ class MaxLairStrongBoss : public MultiSwitchProgramInstance{
     MaxLairInternal::Consoles CONSOLES;
     MaxLairInternal::HostingSettings HOSTING;
 
-    TouchDateIntervalOption TOUCH_DATE_INTERVAL;
+    MaxLairInternal::MaxLairTouchDateIntervalOption TOUCH_DATE_INTERVAL;
 
     EventNotificationOption NOTIFICATION_STATUS;
     EventNotificationOption NOTIFICATION_SHINY;
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_Adventure.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_Adventure.cpp
new file mode 100644
index 0000000000..4df08229f3
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_Adventure.cpp
@@ -0,0 +1,211 @@
+/*  Max Lair Run Adventure
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Exceptions/OperationFailedException.h"
+#include "CommonFramework/ErrorReports/ErrorReports.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/NintendoSwitch_Settings.h"
+#include "VideoGames/PokemonSwSh/PokemonSwSh_Settings.h"
+#include "VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.h"
+#include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
+#include "VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_Notifications.h"
+#include "VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_Start.h"
+#include "PokemonSwSh_MaxLair_Run_Adventure.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+namespace MaxLairInternal{
+
+
+AdventureResult run_adventure(
+    MultiSwitchProgramEnvironment& env, CancellableScope& scope,
+    size_t boss_slot,
+    AdventureRuntime& runtime
+){
+    env.log("Starting new adventure...");
+    env.update_stats();
+
+    send_status_notification(env, runtime);
+
+    std::shared_ptr<const ImageRGB32> entrance[4];
+    GlobalStateTracker state_tracker(scope, env.consoles());
+
+    if (!start_adventure(
+        env, scope,
+        state_tracker,
+        entrance,
+        env.console(runtime.host_index), boss_slot,
+        runtime.hosting_settings,
+        runtime.path_stats,
+        runtime.session_stats,
+        runtime.consoles
+    )){
+        runtime.session_stats.add_error();
+        return AdventureResult::START_ERROR;
+    }
+
+    uint64_t epoch = 0;
+    SpinLock lock;
+
+    std::atomic<bool> stop(false);
+    std::atomic<bool> error(false);
+
+    env.run_in_parallel<ProController>(scope, [&](ConsoleHandle& console, ProControllerContext& context){
+        StateMachineAction action;
+        while (true){
+            //  Dump current state, but don't spam if nothing has changed.
+            {
+                WriteSpinLock lg(lock);
+                std::pair<uint64_t, std::string> status = state_tracker.dump();
+                if (status.first > epoch){
+                    console.log("State Tracker\n" + status.second);
+                    epoch = status.first;
+                }
+            }
+
+            size_t index = console.index();
+            action = run_state_iteration(
+                runtime, index,
+                env, console, context, boss_slot != 0 && console.index() == runtime.host_index,
+                state_tracker, runtime.actions,
+                *entrance[index]
+            );
+            switch (action){
+            case StateMachineAction::KEEP_GOING:
+                continue;
+            case StateMachineAction::DONE_WITH_ADVENTURE:
+                env.log("End of adventure.", COLOR_PURPLE);
+                return;
+            case StateMachineAction::STOP_PROGRAM:
+                env.log("End of adventure. Stop program requested...", COLOR_PURPLE);
+                if (runtime.go_home_when_done){
+                    pbf_press_button(context, BUTTON_HOME, 160ms, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE0);
+                }
+                stop.store(true, std::memory_order_release);
+                return;
+            case StateMachineAction::RESET_RECOVER:
+                env.log("Error detected. Attempting to correct by resetting...", COLOR_RED);
+                runtime.session_stats.add_error();
+                error.store(true, std::memory_order_release);
+                pbf_press_button(context, BUTTON_HOME, 160ms, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE0);
+                reset_game_from_home_with_inference(console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST);
+                return;
+            }
+        }
+    });
+
+    std::string boss = state_tracker.infer_actual_state(0).boss;
+    if (!boss.empty()){
+        runtime.last_boss = std::move(boss);
+    }
+
+    if (stop.load(std::memory_order_acquire)){
+        return AdventureResult::STOP_PROGRAM;
+    }
+//    if (error.load(std::memory_order_acquire)){
+//        return AdventureResult::START_ERROR;
+//    }
+    return AdventureResult::FINISHED;
+}
+
+
+
+
+
+void loop_adventures(
+    MultiSwitchProgramEnvironment& env, CancellableScope& scope,
+    const Consoles& consoles,
+    size_t host_index, size_t boss_slot,
+    const EndBattleDecider& decider,
+    bool go_home_when_done,
+    HostingSettings& HOSTING,
+    TouchDateIntervalOption& TOUCH_DATE_INTERVAL,
+    EventNotificationOption& notification_status,
+    EventNotificationOption& notification_shiny
+){
+    Stats& stats = env.current_stats<Stats>();
+
+    AdventureRuntime runtime(
+        env,
+        host_index,
+        consoles,
+        decider,
+        go_home_when_done,
+        HOSTING,
+        notification_status,
+        notification_shiny,
+        stats
+    );
+
+    size_t restart_count = 0;
+    while (true){
+        //  Touch the date.
+        if (TOUCH_DATE_INTERVAL.ok_to_touch_now()){
+            env.run_in_parallel<ProController>(scope, [&](ConsoleHandle& console, ProControllerContext& context){
+                env.log("Touching date to prevent rollover.");
+                pbf_press_button(context, BUTTON_HOME, 160ms, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE0);
+                touch_date_from_home(console, context, ConsoleSettings::instance().SETTINGS_TO_HOME_DELAY0);
+                resume_game_back_out(console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST, 5000ms);
+            });
+        }
+
+        AdventureResult result = run_adventure(env, scope, boss_slot, runtime);
+        switch (result){
+        case AdventureResult::FINISHED:
+            restart_count = 0;
+            continue;
+        case AdventureResult::STOP_PROGRAM:
+            return;
+        case AdventureResult::START_ERROR:
+            restart_count++;
+            if (restart_count == 10){
+                report_error_to_telemetry(
+                    &env.logger(),
+                    env.program_info(),
+                    "Error",
+                    {{"Message:", "Failed to start adventure 10 times in the row."}}
+                );
+                throw_and_log<OperationFailedException>(
+                    env.logger(), ErrorReportMode::SEND_ERROR_REPORT,
+                    "Failed to start adventure 10 times in the row."
+                );
+            }
+            env.log("Failed to start adventure. Resetting all Switches...", COLOR_RED);
+            env.run_in_parallel<ProController>(scope, [&](ConsoleHandle& console, ProControllerContext& context){
+                pbf_press_button(context, BUTTON_HOME, 160ms, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE0);
+                reset_game_from_home_with_inference(console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST);
+            });
+            continue;
+        }
+    }
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_Adventure.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_Adventure.h
new file mode 100644
index 0000000000..c3719adab2
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_Adventure.h
@@ -0,0 +1,46 @@
+/*  Max Lair Run Adventure
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_MaxLair_Run_Adventure_H
+#define PokemonAutomation_PokemonSwSh_MaxLair_Run_Adventure_H
+
+#include "NintendoSwitch/NintendoSwitch_MultiSwitchProgram.h"
+#include "VideoGames/PokemonSwSh/Options/PokemonSwSh_DateToucher.h"
+#include "VideoGames/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options.h"
+#include "VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_StateTracker.h"
+#include "VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_StateMachine.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+namespace MaxLairInternal{
+
+
+enum class AdventureResult{
+    FINISHED,
+    STOP_PROGRAM,
+    START_ERROR,
+};
+
+
+void loop_adventures(
+    MultiSwitchProgramEnvironment& env, CancellableScope& scope,
+    const Consoles& consoles,
+    size_t host_index, size_t boss_slot,
+    const EndBattleDecider& decider,
+    bool go_home_when_done,
+    HostingSettings& HOSTING,
+    TouchDateIntervalOption& TOUCH_DATE_INTERVAL,
+    EventNotificationOption& notification_status,
+    EventNotificationOption& notification_shiny
+);
+
+
+}
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_Battle.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_Battle.cpp
new file mode 100644
index 0000000000..ba8dcd4059
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_Battle.cpp
@@ -0,0 +1,399 @@
+/*  Max Lair Battle
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/PrettyPrint.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonFramework/Tools/ErrorDumper.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "VideoGames/PokemonSwSh/Resources/PokemonSwSh_MaxLairDatabase.h"
+#include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_SelectionArrowFinder.h"
+#include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_BasicCatcher.h"
+#include "VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_BattleMenu.h"
+#include "VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI.h"
+//#include "PokemonSwSh_MaxLair_Run_CaughtScreen.h"
+#include "PokemonSwSh_MaxLair_Run_Battle.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+namespace MaxLairInternal{
+
+
+
+bool process_header_read(
+    Logger& logger,
+    GlobalState& state,
+    std::set<std::string> mon
+){
+    if (mon.size() == 1){
+        state.opponent = std::move(mon);
+        return true;
+    }
+    if (mon.size() > 1){
+        logger.log("Ambiguous Read Result: " + set_to_str(mon), COLOR_PURPLE);
+        if (state.opponent.size() == 1 && mon.find(*state.opponent.begin()) != mon.end()){
+            logger.log(
+                "Using previous known value to disambiguate: " + set_to_str(mon),
+                COLOR_PURPLE
+            );
+            return true;
+        }
+    }
+    if (state.opponent.size() == 1){
+        logger.log(
+            "Failed to read opponent from battle. Using previously known value: " + set_to_str(state.opponent),
+            COLOR_ORANGE
+        );
+        return true;
+    }
+
+    return false;
+}
+
+
+bool read_battle_menu(
+    ProgramEnvironment& env,
+    VideoStream& stream, ProControllerContext& context, size_t player_index,
+    OcrFailureWatchdog& ocr_watchdog,
+    GlobalState& state,
+    const ConsoleSpecificOptions& settings,
+    bool currently_dmaxed, bool cheer_only
+){
+    PlayerState& player = state.players[player_index];
+
+    VideoOverlaySet boxes(stream.overlay());
+    BattleMenuReader reader(stream.overlay(), settings.language, ocr_watchdog);
+    BattleMoveArrowFinder arrow_finder(stream.overlay());
+    arrow_finder.make_overlays(boxes);
+
+    //  Read raid mon.
+    std::set<std::string> mon = reader.read_opponent(stream.logger(), context, stream.video());
+
+    bool retry = !process_header_read(stream.logger(), state, std::move(mon));
+    std::string opponent = state.opponent.empty()
+        ? ""
+        : *state.opponent.begin();
+
+    //  If we see a boss before the end. Something is wrong. Retry.
+    if (state.wins != 3 && is_boss(opponent)){
+        retry = true;
+    }
+
+    VideoSnapshot snapshot;
+    if (retry){
+        stream.log("Unable to read opponent from battle. Attempting to read from summary.", COLOR_ORANGE);
+        pbf_press_button(context, BUTTON_Y, 80ms, 1000ms);
+        pbf_press_dpad(context, DPAD_UP, 80ms, 400ms);
+        pbf_press_button(context, BUTTON_A, 80ms, 2000ms);
+        context.wait_for_all_requests();
+
+        snapshot = stream.video().snapshot();
+        mon = reader.read_opponent_in_summary(stream.logger(), snapshot);
+        pbf_mash_button(context, BUTTON_B, 3000ms);
+        state.opponent = std::move(mon);
+
+        if (state.wins == 3 && !state.boss.empty()){
+            if (!state.opponent.empty() && *state.opponent.begin() != state.boss){
+                stream.log(
+                    "Inconsistent Boss: Expected " + state.boss + ", Read: " + *state.opponent.begin(),
+                    COLOR_RED
+                );
+            }
+            state.opponent = {state.boss};
+        }
+    }
+    context.wait_for_all_requests();
+
+
+    if (!state.accept_opponent()){
+        stream.log("Boss found before 3 wins. Something is seriously out-of-sync.", COLOR_RED);
+        dump_image(stream.logger(), MODULE_NAME, "BossBeforeEnd", snapshot);
+        return false;
+    }
+
+    //  Read misc.
+    VideoSnapshot screen = stream.video().snapshot();
+    state.opponent_hp = reader.read_opponent_hp(stream.logger(), screen);
+    if (cheer_only){
+        player.dmax_turns_left = 0;
+        player.health = Health{0, 1};
+        player.can_dmax = false;
+        pbf_press_button(context, BUTTON_A, 80ms, 1000ms);
+        context.wait_for_all_requests();
+        return true;
+    }
+
+    if (currently_dmaxed){
+        player.dmax_turns_left--;
+        if (player.dmax_turns_left <= 0){
+            stream.log("State Inconsistency: dmax_turns_left <= 0 && currently_dmaxed == true", COLOR_RED);
+            player.dmax_turns_left = 1;
+        }
+    }else{
+        std::string name = reader.read_own_mon(stream.logger(), screen);
+        if (!name.empty()){
+            state.players[player_index].pokemon = std::move(name);
+        }
+        if (player.dmax_turns_left > 1){
+            stream.log("State Inconsistency: dmax_turns_left > 0 && currently_dmaxed == false", COLOR_RED);
+            state.move_slot = 0;
+        }
+        if (player.dmax_turns_left == 1){
+            stream.log("End of Dmax.");
+            state.move_slot = 0;
+        }
+        player.dmax_turns_left = 0;
+    }
+
+    Health health[4];
+    reader.read_hp(stream.logger(), screen, health, player_index);
+    if (health[0].hp >= 0) state.players[0].health = health[0];
+    if (health[1].hp >= 0) state.players[1].health = health[1];
+    if (health[2].hp >= 0) state.players[2].health = health[2];
+    if (health[3].hp >= 0) state.players[3].health = health[3];
+
+
+    for (size_t attempts = 0; attempts < 5; attempts++){
+        //  Enter move selection to read PP.
+        pbf_press_button(context, BUTTON_A, 80ms, 1000ms);
+        context.wait_for_all_requests();
+
+
+        //  Clear move blocked status.
+        player.move_blocked[0] = false;
+        player.move_blocked[1] = false;
+        player.move_blocked[2] = false;
+        player.move_blocked[3] = false;
+
+        screen = stream.video().snapshot();
+
+        int8_t pp[4] = {-1, -1, -1, -1};
+        reader.read_own_pp(stream.logger(), screen, pp);
+        player.pp[0] = pp[0];
+        player.pp[1] = pp[1];
+        player.pp[2] = pp[2];
+        player.pp[3] = pp[3];
+
+        player.can_dmax = reader.can_dmax(screen);
+
+        //  Read move slot.
+    //    int8_t move_slot = arrow_finder.get_slot();
+        int8_t move_slot = arrow_finder.detect(screen);
+        if (move_slot < 0){
+            stream.log("Unable to detect move slot.", COLOR_RED);
+//            dump_image(stream.logger(), MODULE_NAME, "MoveSlot", screen);
+//            pbf_press_button(context, BUTTON_A, 80ms, 1000ms);
+//            pbf_press_dpad(context, DPAD_RIGHT, 2000ms, 0ms);
+//            pbf_press_dpad(context, DPAD_UP, 2000ms, 0ms);
+//            move_slot = 0;
+            pbf_mash_button(context, BUTTON_B, 1000ms);
+            continue;
+        }else{
+            stream.log("Current Move Slot: " + std::to_string(move_slot), COLOR_BLUE);
+        }
+        if (move_slot != state.move_slot){
+            stream.log(
+                "Move Slot Mismatch: Expected = " + std::to_string(state.move_slot) + ", Actual = " + std::to_string(move_slot),
+                COLOR_RED
+            );
+        }
+        state.move_slot = move_slot;
+
+        return true;
+    }
+
+    dump_image(stream.logger(), MODULE_NAME, "MoveSlot", screen);
+    return true;
+}
+
+
+StateMachineAction run_move_select(
+    ProgramEnvironment& env, size_t console_index,
+    VideoStream& stream, ProControllerContext& context,
+    OcrFailureWatchdog& ocr_watchdog,
+    GlobalStateTracker& state_tracker,
+    const ConsoleSpecificOptions& settings,
+    bool currently_dmaxed, bool cheer_only
+){
+    GlobalState& state = state_tracker[console_index];
+    size_t player_index = state.find_player_index(console_index);
+    PlayerState& player = state.players[player_index];
+
+
+    if (!read_battle_menu(
+        env, stream, context, player_index,
+        ocr_watchdog,
+        state, settings,
+        currently_dmaxed, cheer_only
+    )){
+        return StateMachineAction::RESET_RECOVER;
+    }
+
+
+    GlobalState inferred = state_tracker.synchronize(stream.logger(), console_index);
+
+    bool all_moves_blocked = false;
+
+    while (true){
+        stream.log("Selecting move...");
+
+        if (cheer_only){
+            stream.log("Choosing move Cheer. (you are dead)", COLOR_PURPLE);
+//            pbf_mash_button(context, BUTTON_A, 2000ms);
+//            context.wait_for_all_requests();
+            break;
+        }
+
+        std::pair<uint8_t, bool> move = select_move(
+            stream.logger(),
+            inferred,
+            player_index
+        );
+        stream.log("Choosing move " + std::to_string((int)move.first) + (move.second ? " (dmax)." : "."), COLOR_PURPLE);
+
+        if (player.can_dmax && move.second){
+            pbf_press_dpad(context, DPAD_LEFT, 80ms, 400ms);
+            pbf_press_button(context, BUTTON_A, 80ms, 1000ms);
+            player.dmax_turns_left = 3;
+        }
+        while (state.move_slot != move.first){
+            pbf_press_dpad(context, DPAD_DOWN, 80ms, 400ms);
+            state.move_slot++;
+            state.move_slot %= 4;
+        }
+
+        //  Enter the move.
+        if (all_moves_blocked){
+            //  If we had trouble selecting a move, then we're probably stuck in a self-target loop.
+            //  Force target the opponent.
+            stream.log("Force targeting opponent due to inability to select a move after multiple attempts...", COLOR_RED);
+            pbf_press_button(context, BUTTON_A, 160ms, 2000ms);
+            pbf_press_dpad(context, DPAD_UP, 2000ms, 0ms);
+        }
+        pbf_mash_button(context, BUTTON_A, 2000ms);
+        context.wait_for_all_requests();
+
+//        inference.stop();
+
+        //  Back out and look for battle menu. This indicates that the move wasn't selectable.
+        BattleMenuDetector detector;
+        int result = run_until<ProControllerContext>(
+            stream, context,
+            [](ProControllerContext& context){
+                pbf_mash_button(context, BUTTON_B, 5000ms);
+            },
+            {{detector}},
+            INFERENCE_RATE
+        );
+
+        //  No battle menu detected, we're good.
+        if (result < 0){
+            player.move_blocked[state.move_slot] = false;
+            break;
+        }
+
+        //  Battle menu detected. It means the move wasn't selectable.
+
+        stream.log("Move not selectable.", COLOR_RED);
+        player.move_blocked[state.move_slot] = true;
+
+        bool no_moves = true;
+        for (size_t c = 0; c < 4; c++){
+            no_moves &= player.move_blocked[c];
+        }
+        if (no_moves){
+            stream.log("All moves reported as blocked. This is impossible. Clearing state.", COLOR_RED);
+            for (size_t c = 0; c < 4; c++){
+                player.move_blocked[c] = false;
+            }
+            all_moves_blocked = true;
+        }
+
+        state_tracker.push_update(console_index);
+
+        //  Reset position.
+        pbf_mash_button(context, BUTTON_B, 2000ms);
+        pbf_press_button(context, BUTTON_A, 160ms, 1000ms);
+        pbf_press_dpad(context, DPAD_RIGHT, 2000ms, 0ms);
+        pbf_press_dpad(context, DPAD_UP, 2000ms, 0ms);
+        state.move_slot = 0;
+
+        inferred = state_tracker.infer_actual_state(console_index);
+//        inferred.players[player_index].move_blocked[state.move_slot] = true;
+
+    }
+
+//    inference.stop();
+    return StateMachineAction::KEEP_GOING;
+}
+
+
+
+StateMachineAction throw_balls(
+    AdventureRuntime& runtime,
+    ProgramEnvironment& env, size_t console_index,
+    VideoStream& stream, ProControllerContext& context,
+    Language language,
+    OcrFailureWatchdog& ocr_watchdog,
+    GlobalStateTracker& state_tracker,
+    const EndBattleDecider& decider
+){
+    GlobalState& state = state_tracker[console_index];
+    state.clear_battle_state();
+
+    state.wins++;
+    state.players[0].health.value.dead = 0;
+    state.players[1].health.value.dead = 0;
+    state.players[2].health.value.dead = 0;
+    state.players[3].health.value.dead = 0;
+
+
+    GlobalState inferred = state_tracker.synchronize(stream.logger(), console_index);
+
+
+    std::string ball;
+
+    bool boss = inferred.wins == 4;
+    if (boss){
+        ball = decider.boss_ball(console_index, inferred.boss);
+    }else{
+        ball = decider.normal_ball(console_index);
+    }
+
+    BattleBallReader reader(stream, language);
+    pbf_press_button(context, BUTTON_A, 400ms, 600ms);
+    context.wait_for_all_requests();
+
+    int16_t balls = move_to_ball(reader, stream, context, ball);
+    if (balls != 0){
+        pbf_mash_button(context, BUTTON_A, 1000ms);
+    }else{
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::NO_ERROR_REPORT,
+            "Unable to find appropriate ball. Did you run out?",
+            stream
+        );
+    }
+
+    ReadableQuantity999& stat = boss
+        ? runtime.consoles[console_index].boss_balls
+        : runtime.consoles[console_index].normal_balls;
+
+    stat.update_with_ocr(balls, boss ? -1 : 1);
+    stat.quantity = (uint16_t)std::max((int)stat.quantity - 1, 0);
+
+    return StateMachineAction::KEEP_GOING;
+}
+
+
+
+
+}
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_Battle.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_Battle.h
new file mode 100644
index 0000000000..a749d51450
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_Battle.h
@@ -0,0 +1,46 @@
+/*  Max Lair Run Battle
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_MaxLair_Run_Battle_H
+#define PokemonAutomation_PokemonSwSh_MaxLair_Run_Battle_H
+
+#include "CommonFramework/Language.h"
+#include "VideoGames/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options.h"
+#include "VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_StateMachine.h"
+#include "VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_StateTracker.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+namespace MaxLairInternal{
+
+
+StateMachineAction run_move_select(
+    ProgramEnvironment& env, size_t console_index,
+    VideoStream& stream, ProControllerContext& context,
+    OcrFailureWatchdog& ocr_watchdog,
+    GlobalStateTracker& state_tracker,
+    const ConsoleSpecificOptions& settings,
+    bool currently_dmaxed, bool cheer_only
+);
+
+StateMachineAction throw_balls(
+    AdventureRuntime& runtime,
+    ProgramEnvironment& env, size_t console_index,
+    VideoStream& stream, ProControllerContext& context,
+    Language language,
+    OcrFailureWatchdog& ocr_watchdog,
+    GlobalStateTracker& state_tracker,
+    const EndBattleDecider& decider
+);
+
+
+
+}
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_CaughtScreen.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_CaughtScreen.cpp
new file mode 100644
index 0000000000..6091b3daae
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_CaughtScreen.cpp
@@ -0,0 +1,267 @@
+/*  Max Lair Run Caught Screen
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Exceptions.h"
+#include "CommonFramework/Exceptions/FatalProgramException.h"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonFramework/Tools/ErrorDumper.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/NintendoSwitch_Settings.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonSwSh/PokemonSwSh_Settings.h"
+#include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_SelectionArrowFinder.h"
+#include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_DialogBoxDetector.h"
+#include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_ReceivePokemonDetector.h"
+#include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_YCommDetector.h"
+#include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
+#include "VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_Entrance.h"
+#include "VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_Notifications.h"
+#include "VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_CatchScreenTracker.h"
+#include "PokemonSwSh_MaxLair_Run_CaughtScreen.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+namespace MaxLairInternal{
+
+
+StateMachineAction process_entrance(
+    AdventureRuntime& runtime,
+    VideoStream& stream, ProControllerContext& context,
+    const ImageViewRGB32& entrance
+){
+    WallClock start = current_time();
+    while (true){
+        if (current_time() - start > std::chrono::seconds(60)){
+            stream.log("Unable to find entrance after 60 seconds.", COLOR_RED);
+            runtime.session_stats.add_error();
+            dump_image(stream.logger(), MODULE_NAME, stream.video(), "FailedToDetectEntrance");
+            return StateMachineAction::RESET_RECOVER;
+        }
+
+        EntranceDetector entrance_detector(entrance);
+        YCommIconWatcher overworld;
+        SelectionArrowFinder prompt(stream.overlay(), {0.362689, 0.282828, 0.625000, 0.580808});
+        WhiteDialogBoxWatcher white_dialog;
+        BlackDialogBoxDetector black_dialog(true);
+        ReceivePokemonWatcher receive(COLOR_RED);
+
+        context.wait_for_all_requests();
+        int ret = wait_until(
+            stream, context,
+            std::chrono::seconds(10),
+            {
+                entrance_detector,
+                overworld,
+                prompt,
+                white_dialog,
+                black_dialog,
+                receive,
+            },
+            INFERENCE_RATE
+        );
+        context.wait_for(std::chrono::milliseconds(500));
+        if (receive.detect(stream.video().snapshot())){
+            ret = 4;
+        }
+
+        switch (ret){
+        case 0:
+        case 1:
+            stream.log("Detected entrance.");
+            return StateMachineAction::KEEP_GOING;
+        case 2:
+            stream.log("Detected prompt.");
+            pbf_press_button(context, BUTTON_A, 80ms, 320ms);
+            break;
+        case 3:
+            stream.log("Detected dialog triangle.");
+            pbf_press_button(context, BUTTON_B, 80ms, 320ms);
+            break;
+        case 4:
+            stream.log("Detected dialog box.");
+            pbf_press_button(context, BUTTON_B, 80ms, 320ms);
+            break;
+        case 5:
+            stream.log("Detected receive " + Pokemon::STRING_POKEMON + ".");
+            pbf_press_button(context, BUTTON_B, 80ms, 320ms);
+            break;
+        default:
+            stream.log("No recognized state after 10 seconds.", COLOR_RED);
+            pbf_press_button(context, BUTTON_B, 80ms, 320ms);
+            pbf_press_button(context, BUTTON_X, 80ms, 320ms);   //  In case we landed in the nickname menu.
+        }
+    }
+
+    EntranceDetector entrance_detector(entrance);
+    int ret = run_until<ProControllerContext>(
+        stream, context,
+        [](ProControllerContext& context){
+            for (size_t c = 0; c < 60; c++){
+                pbf_press_button(context, BUTTON_B, 80ms, 920ms);
+            }
+        },
+        {entrance_detector}
+    );
+    if (ret < 0){
+        stream.log("Unable to find entrance after 60 seconds.", COLOR_RED);
+        runtime.session_stats.add_error();
+        dump_image(stream.logger(), MODULE_NAME, stream.video(), "FailedToDetectEntrance");
+        return StateMachineAction::RESET_RECOVER;
+    }
+
+    return StateMachineAction::KEEP_GOING;
+}
+
+
+void synchronize_caught_screen(
+    size_t console_index,
+    VideoStream& stream, ProControllerContext& context,
+    GlobalStateTracker& state_tracker
+){
+    context.wait_for_all_requests();
+    state_tracker.synchronize(stream.logger(), console_index, std::chrono::seconds(60));
+}
+
+
+StateMachineAction run_caught_screen(
+    AdventureRuntime& runtime,
+    ProgramEnvironment& env, size_t console_index,
+    ConsoleHandle& console, ProControllerContext& context,
+    GlobalStateTracker& state_tracker,
+    const EndBattleDecider& decider,
+    const ImageViewRGB32& entrance
+){
+    bool is_host = console_index == runtime.host_index;
+
+    pbf_wait(context, 1000ms);
+    context.wait_for_all_requests();
+
+    CaughtPokemonScreen tracker(console, context);
+    runtime.session_stats.add_run(tracker.total());
+    if (is_host){
+        runtime.path_stats.add_run(tracker.total() >= 4);
+//        cout << runtime.path_stats.to_str() << endl;
+    }
+
+    //  Scroll over everything. This checks them for shinies.
+    tracker.enter_summary();
+    for (size_t c = 0; c < tracker.total(); c++){
+        tracker.scroll_to(c);
+    }
+
+    //  Get all the shinies.
+    bool boss_is_shiny = false;
+    std::vector<size_t> shinies;
+    for (size_t c = 0; c < tracker.total(); c++){
+        if (!tracker[c].shiny){
+            continue;
+        }
+        shinies.emplace_back(c);
+        runtime.session_stats.add_shiny();
+        if (c == 3){
+            boss_is_shiny = true;
+            runtime.session_stats.add_shiny_legendary();
+        }
+    }
+
+    //  If anything is shiny, take a video.
+    if (!shinies.empty()){
+        tracker.scroll_to(shinies.back());
+        tracker.leave_summary();
+        context.wait_for(std::chrono::seconds(1));
+        pbf_press_button(context, BUTTON_CAPTURE, 2000ms, 5000ms);
+        context.wait_for_all_requests();
+    }
+
+    //  Screencap all the shinies and send notifications.
+    for (size_t index : shinies){
+        tracker.scroll_to(index);
+        tracker.leave_summary();
+        VideoSnapshot screen = console.video().snapshot();
+
+        WriteSpinLock lg(runtime.m_lock);
+        send_shiny_notification(
+            env, console.logger(),
+            runtime.notification_shiny,
+            console_index, shinies.size(),
+            nullptr,
+            runtime.path_stats,
+            runtime.session_stats,
+            screen
+        );
+    }
+
+
+    const std::string boss = state_tracker[console_index].boss_if_caught();
+    CaughtScreenAction action =
+        decider.end_adventure_action(
+            console_index, boss,
+            runtime.path_stats,
+            !shinies.empty(), boss_is_shiny
+        );
+
+    switch (action){
+    case CaughtScreenAction::STOP_PROGRAM:
+        console.log("Stopping program...", COLOR_PURPLE);
+        synchronize_caught_screen(console_index, console, context, state_tracker);
+        return StateMachineAction::STOP_PROGRAM;
+
+    case CaughtScreenAction::TAKE_NON_BOSS_SHINY_AND_CONTINUE:
+        if (is_host){
+            runtime.path_stats.clear();
+        }
+        if (shinies.empty() || shinies[0] == 3){
+            console.log("Quitting back to entrance.", COLOR_PURPLE);
+            tracker.leave_summary();
+            synchronize_caught_screen(console_index, console, context, state_tracker);
+            pbf_press_dpad(context, DPAD_DOWN, 80ms, 400ms);
+            pbf_press_button(context, BUTTON_B, 80ms, 1000ms);
+            pbf_press_button(context, BUTTON_A, 80ms, 920ms);
+            return process_entrance(runtime, console, context, entrance);
+        }else{
+            console.log("Taking non-boss shiny and returning to entrance...", COLOR_BLUE);
+            tracker.scroll_to(shinies[0]);
+            tracker.enter_summary();    //  Enter summary to verify you're on the right mon.
+            tracker.leave_summary();
+            synchronize_caught_screen(console_index, console, context, state_tracker);
+            StateMachineAction state = process_entrance(runtime, console, context, entrance);
+            if (state == StateMachineAction::RESET_RECOVER){
+                throw_and_log<FatalProgramException>(
+                    console.logger(),
+                    ErrorReportMode::NO_ERROR_REPORT,
+                    "Unable to take " + Pokemon::STRING_POKEMON + ". Did you forget to disable nicknames?",
+                    console
+               );
+            }
+            return state;
+        }
+
+    case CaughtScreenAction::RESET:
+        console.log("Resetting game...", COLOR_BLUE);
+        synchronize_caught_screen(console_index, console, context, state_tracker);
+        pbf_press_button(context, BUTTON_HOME, 160ms, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE0);
+        reset_game_from_home_with_inference(
+            console, context,
+            ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST
+        );
+        return StateMachineAction::DONE_WITH_ADVENTURE;
+    }
+
+    throw InternalProgramError(&console.logger(), PA_CURRENT_FUNCTION, "Invalid enum.");
+}
+
+
+}
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_CaughtScreen.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_CaughtScreen.h
new file mode 100644
index 0000000000..9585a01773
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_CaughtScreen.h
@@ -0,0 +1,35 @@
+/*  Max Lair Run Caught Screen
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_MaxLair_Run_CaughtScreen_H
+#define PokemonAutomation_PokemonSwSh_MaxLair_Run_CaughtScreen_H
+
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+#include "VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_StateMachine.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+namespace MaxLairInternal{
+
+
+StateMachineAction run_caught_screen(
+    AdventureRuntime& runtime,
+    ProgramEnvironment& env, size_t console_index,
+    ConsoleHandle& console, ProControllerContext& context,
+    GlobalStateTracker& state_tracker,
+    const EndBattleDecider& decider,
+    const ImageViewRGB32& entrance
+);
+
+
+
+}
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_EnterLobby.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_EnterLobby.cpp
new file mode 100644
index 0000000000..ffebd58916
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_EnterLobby.cpp
@@ -0,0 +1,228 @@
+/*  Max Lair Enter Lobby
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/ImageTypes/ImageRGB32.h"
+#include "CommonFramework/ImageTools/ImageStats.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonTools/Images/ImageManip.h"
+#include "CommonTools/Images/ImageFilter.h"
+#include "CommonTools/Images/SolidColorTest.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_SelectionArrowFinder.h"
+#include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_DialogBoxDetector.h"
+#include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_YCommDetector.h"
+#include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_Internet.h"
+#include "VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_Lobby.h"
+#include "PokemonSwSh_MaxLair_Run_EnterLobby.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+namespace MaxLairInternal{
+
+
+
+class GreyDialogDetector : public StaticScreenDetector{
+public:
+    GreyDialogDetector(Color color = COLOR_RED)
+        : m_color(color)
+        , m_box0(0.180, 0.815, 0.015, 0.030)
+        , m_box1(0.785, 0.840, 0.030, 0.050)
+    {}
+
+    virtual void make_overlays(VideoOverlaySet& items) const override{
+        items.add(m_color, m_box0);
+        items.add(m_color, m_box1);
+    }
+    virtual bool detect(const ImageViewRGB32& screen) override{
+        ImageStats stats0 = image_stats(extract_box_reference(screen, m_box0));
+        if (!is_grey(stats0, 0, 200, 10)){
+            return false;
+        }
+        ImageStats stats1 = image_stats(extract_box_reference(screen, m_box1));
+        if (!is_grey(stats1, 0, 200, 10)){
+            return false;
+        }
+        return true;
+    }
+
+private:
+    Color m_color;
+    ImageFloatBox m_box0;
+    ImageFloatBox m_box1;
+};
+class GreyDialogWatcher : public DetectorToFinder<GreyDialogDetector>{
+public:
+    GreyDialogWatcher(Color color = COLOR_RED)
+         : DetectorToFinder("GreyDialogWatcher", std::chrono::milliseconds(250), color)
+    {}
+};
+
+
+
+
+std::shared_ptr<const ImageRGB32> enter_lobby(
+    const ProgramInfo& info,
+    VideoStream& stream, ProControllerContext& context,
+    size_t boss_slot, bool connect_to_internet,
+    ReadableQuantity999& ore
+){
+    pbf_mash_button(context, BUTTON_B, 2000ms);
+
+    if (connect_to_internet){
+        connect_to_internet_with_inference(info, stream, context);
+    }
+
+//    VideoOverlaySet boxes(stream.overlay());
+
+//    arrow_detector.make_overlays(boxes);
+//    dialog_detector.make_overlays(boxes);
+
+//    OverlayBoxScope ore_box(stream.overlay(), {0.900, 0.015, 0.020, 0.040});
+    OverlayBoxScope ore_box(stream.overlay(), {0.930, 0.050, 0.065, 0.010});
+    OverlayBoxScope ore_quantity(stream.overlay(), {0.945, 0.010, 0.0525, 0.050});
+
+    size_t arrow_count = 0;
+    size_t ore_dialog_count = 0;
+    VideoSnapshot entrance;
+    WallClock deadline = current_time() + std::chrono::seconds(120);
+    while (current_time() < deadline){
+        YCommIconWatcher overworld(COLOR_CYAN);
+        WhiteDialogBoxWatcher white_dialog(COLOR_RED);
+        SelectionArrowWatcher arrow_detector(
+            stream.overlay(),
+            ImageFloatBox(0.350, 0.450, 0.500, 0.400)
+        );
+        GreyDialogWatcher big_dialog(COLOR_RED);
+        LobbyWatcher lobby(COLOR_BLUE, false);
+        context.wait_for_all_requests();
+        int ret = wait_until(
+            stream, context, std::chrono::seconds(30),
+            {
+                overworld,
+                white_dialog,
+                arrow_detector,
+                big_dialog,
+                lobby,
+            }
+        );
+        context.wait_for(100ms);
+
+        //  If we detected the dialog arrow, we need to disambiguate.
+        while (ret == 2){
+            stream.log("Detected selection arrow.");
+
+            //  Wait for screen to settle.
+            context.wait_for(250ms);
+            VideoSnapshot screen = stream.video().snapshot();
+
+            if (lobby.detect(screen)){
+                ret = 4;
+                break;
+            }
+
+            arrow_count++;
+            ImageStats ore_stats = image_stats(extract_box_reference(screen, ore_box));
+            if (is_solid(ore_stats, {0.594724, 0.405276, 0.})){
+                stream.log("Need to pay ore.", COLOR_PURPLE);
+
+                arrow_count = 0;
+                ImageRGB32 image = to_blackwhite_rgb32_range(
+                    extract_box_reference(screen, ore_quantity),
+                    true,
+                    0xff808080, 0xffffffff
+                );
+                ImageRGB32 filtered = pad_image(image, 10, 0xffffffff);
+                ore.update_with_ocr(stream.logger(), filtered);
+
+                if (ore.quantity < 20){
+                    OperationFailedExceptionWithScreenshot::fire(
+                        ErrorReportMode::NO_ERROR_REPORT,
+                        "You have less than 20 ore. Program stopped. (Quantity: " + ore.to_str() + ")",
+                        stream
+                    );
+                }
+
+                ore_dialog_count++;
+                if (ore_dialog_count >= 2){
+                    OperationFailedExceptionWithScreenshot::fire(
+                        ErrorReportMode::NO_ERROR_REPORT,
+                        "Unable to start adventure. Are you out of ore? (Quantity: " + ore.to_str() + ")",
+                        stream
+                    );
+                }
+            }else if (arrow_count == 2){
+                //  Select a boss.
+                stream.log("Detected boss selection.");
+                if (boss_slot > 0){
+                    for (size_t c = 1; c < boss_slot; c++){
+                        pbf_press_dpad(context, DPAD_DOWN, 160ms, 400ms);
+                    }
+                    pbf_press_button(context, BUTTON_A, 160ms, 1000ms);
+                }else{
+                    pbf_press_button(context, BUTTON_B, 160ms, 1000ms);
+                }
+            }
+
+            pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+            break;
+        }
+
+
+        switch (ret){
+        case 0:
+            stream.log("Detected overworld.");
+            pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+            continue;
+
+        case 1:
+            stream.log("Detected dialog prompt.");
+            pbf_press_button(context, BUTTON_B, 160ms, 840ms);
+            continue;
+
+        case 2:
+            continue;
+
+        case 3:{
+            stream.log("Detected save dialog.");
+            context.wait_for_all_requests();
+            entrance = stream.video().snapshot();
+            static int c = 0;
+            entrance->save("entrance-" + std::to_string(c++) + ".png");
+            pbf_press_button(context, BUTTON_A, 160ms, 5000ms);
+            continue;
+        }
+        case 4:
+            stream.log("Detected lobby.");
+            return std::move(entrance.frame);
+
+        default:
+#if 0
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "obtain_starter(): No recognized state after 30 seconds.",
+                stream
+            );
+#endif
+            return std::make_shared<ImageRGB32>();
+        }
+    }
+
+    return std::make_shared<ImageRGB32>();
+}
+
+
+
+}
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_EnterLobby.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_EnterLobby.h
new file mode 100644
index 0000000000..c8ce84bf0d
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_EnterLobby.h
@@ -0,0 +1,35 @@
+/*  Max Lair Enter Lobby
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_MaxLair_Run_EnterLobby_H
+#define PokemonAutomation_PokemonSwSh_MaxLair_Run_EnterLobby_H
+
+#include <memory>
+#include "CommonFramework/ImageTypes/ImageRGB32.h"
+#include "CommonFramework/Tools/VideoStream.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+#include "VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_StateMachine.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+namespace MaxLairInternal{
+
+
+std::shared_ptr<const ImageRGB32> enter_lobby(
+    const ProgramInfo& info,
+    VideoStream& stream, ProControllerContext& context,
+    size_t boss_slot, bool connect_to_internet,
+    ReadableQuantity999& ore
+);
+
+
+
+}
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_Entrance.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_Entrance.cpp
new file mode 100644
index 0000000000..9f244962b5
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_Entrance.cpp
@@ -0,0 +1,127 @@
+/*  Max Lair Run Entrance
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_SelectionArrowFinder.h"
+#include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_DialogBoxDetector.h"
+#include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_YCommDetector.h"
+#include "PokemonSwSh_MaxLair_Run_Entrance.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+namespace MaxLairInternal{
+
+
+void run_entrance(
+    AdventureRuntime& runtime,
+    ProgramEnvironment& env, size_t console_index,
+    VideoStream& stream, ProControllerContext& context,
+    bool followed_path,
+    GlobalStateTracker& state_tracker
+){
+    GlobalState& state = state_tracker[console_index];
+
+    if (!state.adventure_started){
+        stream.log("Failed to start raid.", COLOR_RED);
+        runtime.session_stats.add_error();
+    }else if (state.wins == 0){
+        stream.log("Lost on first raid.", COLOR_PURPLE);
+        runtime.session_stats.add_run(0);
+        if (console_index == runtime.host_index){
+            runtime.path_stats.clear();
+        }
+    }
+
+    context.wait_for(1000ms);
+
+    // Get the boss slug
+    std::string boss_slug;
+    if (runtime.host_index < runtime.console_settings.active_consoles()){
+        boss_slug = state_tracker.infer_actual_state(runtime.host_index).boss;
+    };
+    
+    bool save_path = false;
+    
+    if (!followed_path){
+        // Check if the user checked the box to save the path when running the BossFinder program
+        
+        if (!boss_slug.empty()){
+            save_path = runtime.actions.is_in_save_list(boss_slug);
+            stream.log("Boss: " + boss_slug + ", should save: " + (save_path ? "Yes" : "No"), COLOR_BLUE);
+        }
+    }else{
+        save_path = followed_path;
+    }
+
+
+    while (true){
+        WhiteDialogBoxWatcher dialog;
+        SelectionArrowFinder arrow(stream.overlay(), {0.462377, 0.332039, 0.388222, 0.640777});
+        YCommIconWatcher overworld;
+
+        context.wait_for_all_requests();
+        context.wait_for(100ms);
+
+        int ret = wait_until(
+            stream, context,
+            std::chrono::seconds(10),
+            {
+                dialog,
+                arrow,
+                overworld,
+            }
+        );
+        switch (ret){
+        case 0:
+            stream.log("Detected dialog menu.");
+            pbf_press_button(context, BUTTON_B, 80ms, 160ms);
+            continue;
+        case 1:{
+            stream.log("Detected arrow.");
+            if (!save_path){
+                pbf_press_button(context, BUTTON_B, 80ms, 160ms);
+                continue;
+            }
+            const std::vector<ImageFloatBox>& arrows = arrow.last_detection();
+            if (arrows.empty()){
+                continue;
+            }
+            if (arrows[0].y > 0.56){
+                pbf_press_button(context, BUTTON_A, 80ms, 160ms);
+                continue;
+            }
+
+            // List of bosses is full, stop the program
+            stream.log("Cannot save path – saved list is full. Stopping program.", COLOR_RED);
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::NO_ERROR_REPORT,
+                "Paths list is full. Program stopped.",
+                stream
+            );
+        }
+        case 2:
+            stream.log("Detected overworld.");
+            return;
+        default:
+            throw OperationFailedExceptionWithScreenshot(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "No recognized state after 10 seconds.",
+                stream
+            );
+        }
+    }
+}
+
+
+
+}
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_Entrance.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_Entrance.h
new file mode 100644
index 0000000000..192d819ac2
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_Entrance.h
@@ -0,0 +1,35 @@
+/*  Max Lair Run Entrance
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_MaxLair_Run_Entrance_H
+#define PokemonAutomation_PokemonSwSh_MaxLair_Run_Entrance_H
+
+#include "CommonFramework/Tools/VideoStream.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+#include "VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_StateTracker.h"
+#include "VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_StateMachine.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+namespace MaxLairInternal{
+
+
+void run_entrance(
+    AdventureRuntime& runtime,
+    ProgramEnvironment& env, size_t console_index,
+    VideoStream& stream, ProControllerContext& context,
+    bool followed_path,
+    GlobalStateTracker& state_tracker
+);
+
+
+
+}
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_ItemSelect.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_ItemSelect.cpp
new file mode 100644
index 0000000000..b72657e668
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_ItemSelect.cpp
@@ -0,0 +1,70 @@
+/*  Max Lair Item
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "VideoGames/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options.h"
+#include "VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathSelect.h"
+#include "VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_ItemSelectMenu.h"
+#include "VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI.h"
+#include "PokemonSwSh_MaxLair_Run_ItemSelect.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+namespace MaxLairInternal{
+
+
+void run_item_select(
+    size_t console_index,
+    VideoStream& stream, ProControllerContext& context,
+    GlobalStateTracker& state_tracker
+){
+    GlobalState& state = state_tracker[console_index];
+    size_t player_index = state.find_player_index(console_index);
+
+    PathReader reader(stream.overlay(), player_index);
+    {
+        VideoSnapshot screen = stream.video().snapshot();
+        reader.read_sprites(stream.logger(), state, screen);
+        reader.read_hp(stream.logger(), state, screen);
+    }
+
+
+    GlobalState inferred = state_tracker.synchronize(stream.logger(), console_index);
+
+    int8_t item_index = select_item(stream.logger(), inferred, player_index);
+    stream.log("Choosing item " + std::to_string((int)item_index) + ".", COLOR_PURPLE);
+
+    if (item_index < 0){
+        pbf_press_button(context, BUTTON_B, 80ms, 400ms);
+        return;
+    }
+    for (int8_t c = 0; c < item_index; c++){
+        pbf_press_dpad(context, DPAD_DOWN, 80ms, 400ms);
+    }
+    pbf_press_button(context, BUTTON_A, 80ms, 5000ms);
+    context.wait_for_all_requests();
+
+    //  Wait until we exit the window.
+    ItemSelectDetector item_menu(true);
+    wait_until(
+        stream, context,
+        std::chrono::seconds(480),
+        {{item_menu}},
+        INFERENCE_RATE
+    );
+
+    pbf_wait(context, 1000ms);
+}
+
+
+
+}
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_ItemSelect.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_ItemSelect.h
new file mode 100644
index 0000000000..30db375e05
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_ItemSelect.h
@@ -0,0 +1,32 @@
+/*  Max Lair Run Item Select
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_MaxLair_Run_ItemSelect_H
+#define PokemonAutomation_PokemonSwSh_MaxLair_Run_ItemSelect_H
+
+#include "CommonFramework/Tools/VideoStream.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+#include "VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_StateTracker.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+namespace MaxLairInternal{
+
+
+void run_item_select(
+    size_t console_index,
+    VideoStream& stream, ProControllerContext& context,
+    GlobalStateTracker& state_tracker
+);
+
+
+
+}
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_PathSelect.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_PathSelect.cpp
new file mode 100644
index 0000000000..242e460b5d
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_PathSelect.cpp
@@ -0,0 +1,77 @@
+/*  Max Lair Run Path Select
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonFramework/Tools/ErrorDumper.h"
+#include "CommonTools/Async/InterruptableCommands.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_BattleMenu.h"
+#include "VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathSelect.h"
+#include "VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI.h"
+#include "PokemonSwSh_MaxLair_Run_PathSelect.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+namespace MaxLairInternal{
+
+
+void run_path_select(
+    ProgramEnvironment& env, size_t console_index,
+    VideoStream& stream, ProControllerContext& context,
+    GlobalStateTracker& state_tracker
+){
+    GlobalState& state = state_tracker[console_index];
+    size_t player_index = state.find_player_index(console_index);
+
+    PathReader reader(stream.overlay(), player_index);
+    context.wait_for(std::chrono::milliseconds(500));
+
+    VideoSnapshot screen = stream.video().snapshot();
+    reader.read_sprites(stream.logger(), state, screen);
+    reader.read_hp(stream.logger(), state, screen);
+
+    if (state.wins == 0){
+        reader.read_path(env, stream, context, state);
+    }else{
+        reader.read_side(stream.logger(), state, screen);
+    }
+
+
+    GlobalState inferred = state_tracker.synchronize(stream.logger(), console_index);
+
+
+    //  Select the path.
+    std::vector<PathNode> path = select_path(stream.logger(), inferred, player_index);
+    uint8_t slot;
+    if (path.empty()){
+        stream.log("No available paths due to read errors. Picking left-most path.", COLOR_RED);
+        slot = 0;
+    }else{
+        slot = path[0].path_slot;
+    }
+    state.last_best_path = std::move(path);
+
+    stream.log("Choosing path " + std::to_string((int)slot) + ".", COLOR_PURPLE);
+
+    for (uint8_t c = 0; c < slot; c++){
+        pbf_press_dpad(context, DPAD_RIGHT, 80ms, 400ms);
+    }
+    pbf_mash_button(context, BUTTON_A, 1000ms);
+    pbf_wait(context, 5000ms);
+    context.wait_for_all_requests();
+}
+
+
+
+}
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_PathSelect.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_PathSelect.h
new file mode 100644
index 0000000000..04a1864f99
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_PathSelect.h
@@ -0,0 +1,32 @@
+/*  Max Lair Run Path Select
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_MaxLair_Run_PathSelect_H
+#define PokemonAutomation_PokemonSwSh_MaxLair_Run_PathSelect_H
+
+#include "CommonFramework/Tools/VideoStream.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+#include "VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_StateTracker.h"
+
+namespace PokemonAutomation{
+    class ProgramEnvironment;
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+namespace MaxLairInternal{
+
+
+void run_path_select(
+    ProgramEnvironment& env, size_t console_index,
+    VideoStream& stream, ProControllerContext& context,
+    GlobalStateTracker& state_tracker
+);
+
+
+}
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_PokemonSelect.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_PokemonSelect.cpp
new file mode 100644
index 0000000000..33f2076ae9
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_PokemonSelect.cpp
@@ -0,0 +1,110 @@
+/*  Max Lair Run Pokemon Select
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI.h"
+#include "VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonSelectMenu.h"
+#include "PokemonSwSh_MaxLair_Run_PokemonSelect.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+namespace MaxLairInternal{
+
+
+void run_select_pokemon(
+    size_t console_index,
+    VideoStream& stream, ProControllerContext& context,
+    GlobalStateTracker& state_tracker,
+    OcrFailureWatchdog& ocr_watchdog,
+    const ConsoleSpecificOptions& settings
+){
+    GlobalState& state = state_tracker[console_index];
+
+    state.adventure_started = true;
+
+    stream.log("Switch " + std::to_string(console_index) + "'s turn to select.");
+
+    //  Wait for the screen to finish loading.
+    context.wait_for(std::chrono::milliseconds(500));
+
+
+    PokemonSelectMenuReader reader(
+        stream.logger(),
+        stream.overlay(),
+        settings.language,
+        ocr_watchdog
+    );
+
+
+    std::string options[3];
+
+//    //  Wait for bottom row to reload.
+//    pbf_wait(context, 400ms);
+//    context.wait_for_all_requests();
+
+    //  Read the bottom two options first.
+    VideoSnapshot screen = stream.video().snapshot();
+    options[1] = reader.read_option(screen, 1);
+    options[2] = reader.read_option(screen, 2);
+
+//    reader.read_options(screen, options);
+    int8_t player_index = reader.who_is_selecting(screen);
+    if (player_index >= 0){
+        state.players[player_index].console_id = (int8_t)console_index;
+    }else{
+        player_index = 0;
+    }
+
+    //  Scroll down one to move the arrow off the top row. Then we can read it.
+    pbf_press_dpad(context, DPAD_DOWN, 80ms, 640ms);
+    context.wait_for_all_requests();
+    screen = stream.video().snapshot();
+    options[0] = reader.read_option(screen, 0);
+
+    state.add_seen(options[0]);
+    state.add_seen(options[1]);
+    state.add_seen(options[2]);
+
+
+//    GlobalState inferred = state_tracker.synchronize(env, console, console_index);
+    state_tracker.push_update(console_index);
+    GlobalState inferred = state_tracker.infer_actual_state(console_index);
+
+
+    //  Make your selection.
+    int8_t selection = select_starter(stream.logger(), inferred, player_index, options);
+    stream.log("Choosing option " + std::to_string((int)selection) + ".", COLOR_PURPLE);
+    switch (selection){
+    case 0:
+        pbf_press_dpad(context, DPAD_UP, 80ms, 400ms);
+        break;
+    case 1:
+        break;
+    case 2:
+        pbf_press_dpad(context, DPAD_DOWN, 80ms, 400ms);
+        break;
+    }
+    pbf_press_button(context, BUTTON_A, 80ms, 400ms);
+    context.wait_for_all_requests();
+
+    //  Update state.
+    if (player_index >= 0){
+        state.players[console_index].pokemon = std::move(options[selection]);
+    }
+
+
+}
+
+
+
+
+
+}
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_PokemonSelect.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_PokemonSelect.h
new file mode 100644
index 0000000000..74c29c4951
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_PokemonSelect.h
@@ -0,0 +1,36 @@
+/*  Max Lair Run Pokemon Select
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_MaxLair_Run_PokemonSelect_H
+#define PokemonAutomation_PokemonSwSh_MaxLair_Run_PokemonSelect_H
+
+#include "CommonFramework/Tools/VideoStream.h"
+#include "CommonTools/FailureWatchdog.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+#include "VideoGames/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options_Consoles.h"
+#include "VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_StateTracker.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+namespace MaxLairInternal{
+
+
+void run_select_pokemon(
+    size_t console_index,
+    VideoStream& stream, ProControllerContext& context,
+    GlobalStateTracker& state_tracker,
+    OcrFailureWatchdog& ocr_watchdog,
+    const ConsoleSpecificOptions& settings
+);
+
+
+
+}
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_PokemonSwap.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_PokemonSwap.cpp
new file mode 100644
index 0000000000..661f7934af
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_PokemonSwap.cpp
@@ -0,0 +1,126 @@
+/*  Max Lair Run Pokemon Swap
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "CommonTools/VisualDetectors/BlackScreenDetector.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathSelect.h"
+#include "VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonSwapMenu.h"
+#include "VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI.h"
+#include "PokemonSwSh_MaxLair_Run_PokemonSwap.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+namespace MaxLairInternal{
+
+
+void run_swap_pokemon(
+    size_t console_index,
+    AdventureRuntime& runtime,
+    VideoStream& stream, ProControllerContext& context,
+    GlobalStateTracker& state_tracker,
+    const ConsoleSpecificOptions& settings
+){
+    GlobalState& state = state_tracker[console_index];
+    size_t player_index = state.find_player_index(console_index);
+    PlayerState& player = state.players[player_index];
+
+
+    //  Wait for bottom row to reload.
+    context.wait_for(std::chrono::milliseconds(100));
+
+
+    PokemonSwapMenuReader reader(
+        stream.logger(), stream.overlay(),
+        settings.language,
+        runtime.ocr_watchdog[console_index]
+    );
+    PokemonSwapMenuDetector menu(false);
+
+    //  Now read the options.
+    std::string options[2];
+    VideoSnapshot screen = stream.video().snapshot();
+    reader.read_options(screen, options);
+    reader.read_pp(screen, player.pp);
+
+    //  Read HP of party.
+    double hp[4];
+    reader.read_hp(screen,hp);
+    if (hp[0] >= 0) state.players[0].health = Health{hp[0], 0};
+    if (hp[1] >= 0) state.players[1].health = Health{hp[1], 0};
+    if (hp[2] >= 0) state.players[2].health = Health{hp[2], 0};
+    if (hp[3] >= 0) state.players[3].health = Health{hp[3], 0};
+
+    state.add_seen(options[0]);
+    state.add_seen(options[1]);
+
+
+    GlobalState inferred = state_tracker.synchronize(stream.logger(), console_index);
+
+
+    //  Make your selection.
+    bool swap = should_swap_with_newly_caught(stream.logger(), inferred, player_index, options);
+    if (swap){
+        stream.log("Choosing to swap for: " + options[1], COLOR_PURPLE);
+        std::lock_guard<Mutex> lg(runtime.m_delay_lock);
+        pbf_mash_button(context, BUTTON_A, 1000ms);
+        context.wait_for_all_requests();
+    }else{
+        stream.log("Choosing not to swap.", COLOR_PURPLE);
+        pbf_mash_button(context, BUTTON_B, 1000ms);
+        context.wait_for_all_requests();
+    }
+
+#if 1
+    //  Wait until we exit the window.
+    {
+        BlackScreenWatcher detector;
+        int result = run_until<ProControllerContext>(
+            stream, context,
+            [&](ProControllerContext& context){
+                pbf_mash_button(context, swap ? BUTTON_A : BUTTON_B, 30000ms);
+            },
+            {{detector}}
+        );
+        if (result < 0){
+            stream.log("Timed out waiting for black screen.", COLOR_RED);
+        }else{
+            stream.log("Found path screen. Reading party...");
+        }
+    }
+#endif
+    {
+        PathScreenDetector detector;
+        int result = wait_until(
+            stream, context,
+            std::chrono::seconds(30),
+            {{detector}},
+            INFERENCE_RATE
+        );
+        if (result < 0){
+            stream.log("Timed out waiting for path screen.", COLOR_RED);
+            return;
+        }
+    }
+
+    stream.log("Found path screen. Reading party...");
+    context.wait_for(std::chrono::milliseconds(100));
+
+    PathReader path_reader(stream.overlay(), player_index);
+    auto snapshot = stream.video().snapshot();
+    path_reader.read_sprites(stream.logger(), state, snapshot);
+    path_reader.read_hp(stream.logger(), state, snapshot);
+}
+
+
+
+
+}
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_PokemonSwap.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_PokemonSwap.h
new file mode 100644
index 0000000000..c7bf64365c
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_PokemonSwap.h
@@ -0,0 +1,34 @@
+/*  Max Lair Run Pokemon Swap
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_MaxLair_Run_PokemonSwap_H
+#define PokemonAutomation_PokemonSwSh_MaxLair_Run_PokemonSwap_H
+
+#include "VideoGames/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options_Consoles.h"
+#include "VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_StateTracker.h"
+#include "VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_StateMachine.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+namespace MaxLairInternal{
+
+
+void run_swap_pokemon(
+    size_t console_index,
+    AdventureRuntime& runtime,
+    VideoStream& stream, ProControllerContext& context,
+    GlobalStateTracker& state_tracker,
+    const ConsoleSpecificOptions& settings
+);
+
+
+
+}
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_ProfessorSwap.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_ProfessorSwap.cpp
new file mode 100644
index 0000000000..d9bef02ced
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_ProfessorSwap.cpp
@@ -0,0 +1,97 @@
+/*  Max Lair Run Professor Swap
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <mutex>
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "CommonTools/VisualDetectors/BlackScreenDetector.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathSelect.h"
+#include "VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI.h"
+#include "PokemonSwSh_MaxLair_Run_ProfessorSwap.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+namespace MaxLairInternal{
+
+
+void run_professor_swap(
+    size_t console_index,
+    AdventureRuntime& runtime,
+    VideoStream& stream, ProControllerContext& context,
+    GlobalStateTracker& state_tracker
+){
+    GlobalState& state = state_tracker[console_index];
+    size_t player_index = state.find_player_index(console_index);
+
+    PathReader reader(stream.overlay(), player_index);
+    {
+        VideoSnapshot screen = stream.video().snapshot();
+        reader.read_sprites(stream.logger(), state, screen);
+        reader.read_hp(stream.logger(), state, screen);
+    }
+
+
+    GlobalState inferred = state_tracker.synchronize(stream.logger(), console_index);
+
+
+    bool swap = should_swap_with_professor(stream.logger(), inferred, player_index);
+    if (swap){
+        stream.log("Choosing to swap.", COLOR_PURPLE);
+        std::lock_guard<Mutex> lg(runtime.m_delay_lock);
+        pbf_press_button(context, BUTTON_A, 200ms, 800ms);
+        context.wait_for_all_requests();
+    }else{
+        stream.log("Choosing not to swap.", COLOR_PURPLE);
+        pbf_press_button(context, BUTTON_B, 200ms, 800ms);
+    }
+    context.wait_for_all_requests();
+
+
+    //  Wait until we exit the window.
+    {
+        BlackScreenWatcher detector;
+        int result = wait_until(
+            stream, context,
+            std::chrono::seconds(30),
+            {detector}
+        );
+        if (result < 0){
+            stream.log("Timed out waiting for black screen.", COLOR_RED);
+            return;
+        }
+    }
+
+    {
+        PathScreenDetector detector;
+        int result = wait_until(
+            stream, context,
+            std::chrono::seconds(30),
+            {detector},
+            INFERENCE_RATE
+        );
+        if (result < 0){
+            stream.log("Timed out waiting for path screen.", COLOR_RED);
+            return;
+        }
+    }
+
+    stream.log("Found path screen. Reading party...");
+    context.wait_for(std::chrono::milliseconds(100));
+
+    VideoSnapshot screen = stream.video().snapshot();
+    reader.read_sprites(stream.logger(), state, screen);
+    reader.read_hp(stream.logger(), state, screen);
+}
+
+
+
+
+}
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_ProfessorSwap.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_ProfessorSwap.h
new file mode 100644
index 0000000000..320809a987
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_ProfessorSwap.h
@@ -0,0 +1,34 @@
+/*  Max Lair Run Professor Swap
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_MaxLair_Run_ProfessorSwap_H
+#define PokemonAutomation_PokemonSwSh_MaxLair_Run_ProfessorSwap_H
+
+#include "CommonFramework/Tools/VideoStream.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+#include "VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_StateTracker.h"
+#include "VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_StateMachine.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+namespace MaxLairInternal{
+
+
+void run_professor_swap(
+    size_t console_index,
+    AdventureRuntime& runtime,
+    VideoStream& stream, ProControllerContext& context,
+    GlobalStateTracker& state_tracker
+);
+
+
+
+}
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_Start.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_Start.cpp
new file mode 100644
index 0000000000..b657df1a52
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_Start.cpp
@@ -0,0 +1,479 @@
+/*  Max Lair Run Start
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Exceptions.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/FastCodeEntry/NintendoSwitch_NumberCodeEntry.h"
+#include "VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonReader.h"
+#include "VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_Lobby.h"
+#include "VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_Entrance.h"
+#include "VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_Notifications.h"
+#include "PokemonSwSh_MaxLair_Run_EnterLobby.h"
+#include "PokemonSwSh_MaxLair_Run_Start.h"
+#include "PokemonSwSh_MaxLair_Run_StartSolo.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+namespace MaxLairInternal{
+
+
+bool abort_if_error(MultiSwitchProgramEnvironment& env, CancellableScope& scope, const std::atomic<size_t>& errors){
+    if (errors.load(std::memory_order_acquire)){
+        env.run_in_parallel<ProController>(scope, [&](ConsoleHandle& console, ProControllerContext& context){
+            pbf_press_button(context, BUTTON_B, 80ms, 1000ms);
+            pbf_press_button(context, BUTTON_A, 80ms, 1000ms);
+            pbf_mash_button(context, BUTTON_B, 8000ms);
+        });
+        return true;
+    }
+    return false;
+}
+
+bool wait_for_all_join(
+    VideoStream& stream, ProControllerContext& context,
+    const ImageViewRGB32& entrance,
+    size_t start_players
+){
+    LobbyJoinedDetector joined_detector(start_players, false);
+    EntranceDetector entrance_detector(entrance);
+    int result = wait_until(
+        stream, context,
+        std::chrono::seconds(10),
+        {
+            {joined_detector},
+            {entrance_detector},
+        },
+        INFERENCE_RATE
+    );
+    switch (result){
+    case 0:
+        stream.log("Detected " + std::to_string(start_players) + " players in lobby!");
+        return true;
+    case 1:
+        stream.log("Detected entrance... Did you get disconnected?", COLOR_RED);
+//        dump_image(stream, MODULE_NAME, "wait_for_all_join", stream.video().snapshot());
+        return false;
+    default:
+        stream.log("Timed out waiting for everyone to join.", COLOR_RED);
+//        dump_image(stream, MODULE_NAME, "wait_for_all_join", stream.video().snapshot());
+        return false;
+    }
+}
+
+class AllJoinedTracker final : public Cancellable{
+public:
+    AllJoinedTracker(
+        CancellableScope& scope, size_t consoles,
+        WallClock time_limit
+    )
+        : m_time_limit(time_limit)
+        , m_consoles(consoles)
+        , m_counter(0)
+    {
+        attach(scope);
+    }
+    virtual ~AllJoinedTracker(){}
+
+    bool report_joined(){
+        std::unique_lock<Mutex> lg(m_lock);
+        m_counter++;
+        if (m_counter >= m_consoles){
+            m_cv.notify_all();
+            return true;
+        }
+        while (true){
+            m_cv.wait_until(lg, m_time_limit);
+            throw_if_cancelled();
+            if (m_counter >= m_consoles){
+                return true;
+            }
+            if (current_time() > m_time_limit){
+                return false;
+            }
+        }
+    }
+
+    virtual bool cancel(std::exception_ptr exception) noexcept override{
+        if (Cancellable::cancel(std::move(exception))){
+            return true;
+        }
+        std::lock_guard<Mutex> lg(m_lock);
+        m_cv.notify_all();
+        return false;
+    }
+
+private:
+    Mutex m_lock;
+    ConditionVariable m_cv;
+
+    WallClock m_time_limit;
+    size_t m_consoles;
+    size_t m_counter;
+};
+
+
+
+
+
+
+bool start_raid_local(
+    MultiSwitchProgramEnvironment& env, CancellableScope& scope,
+    GlobalStateTracker& state_tracker,
+    std::shared_ptr<const ImageRGB32> entrance[4],
+    ConsoleHandle& host, size_t boss_slot,
+    const HostingSettings& settings,
+    ConsoleRuntime console_stats[4]
+){
+    if (env.consoles() == 1){
+        ProControllerContext context(scope, host.controller<ProController>());
+        return start_raid_self_solo(
+            env.program_info(), host, context,
+            state_tracker, entrance[0], boss_slot, console_stats[0].ore
+        );
+    }
+
+    env.log("Entering lobby...");
+
+    std::string code = settings.RAID_CODE.get_code();
+
+    std::atomic<size_t> errors(0);
+    env.run_in_parallel<ProController>(scope, [&](ConsoleHandle& console, ProControllerContext& context){
+        size_t index = console.index();
+        bool is_host = index == host.index();
+
+        entrance[index] = enter_lobby(
+            env.program_info(), console, context,
+            is_host ? boss_slot : 0,
+            settings.MODE == HostingMode::HOST_ONLINE,
+            console_stats[index].ore
+        );
+        if (!*entrance[index]){
+            errors.fetch_add(1);
+            return;
+        }
+    });
+    if (errors.load(std::memory_order_acquire) != 0){
+        env.run_in_parallel<ProController>(scope, [&](ConsoleHandle& console, ProControllerContext& context){
+            pbf_mash_button(context, BUTTON_B, 8000ms);
+        });
+        return false;
+    }
+
+    env.run_in_parallel<ProController>(scope, [&](ConsoleHandle& console, ProControllerContext& context){
+        size_t index = console.index();
+        GlobalState& state = state_tracker[index];
+        bool is_host = index == host.index();
+
+        //  Read boss.
+        if (is_host){
+            state.boss = read_boss_sprite(console);
+        }
+
+        //  Enter code.
+        if (!code.empty() && env.consoles() > 1){
+            pbf_press_button(context, BUTTON_PLUS, 80ms, 1000ms);
+            FastCodeEntry::numberpad_enter_code(console, context, false, code, true);
+            pbf_wait(context, 2000ms);
+            pbf_press_button(context, BUTTON_A, 80ms, 1000ms);
+        }
+    });
+
+    //  Open lobby.
+    env.run_in_parallel<ProController>(scope, [&](ConsoleHandle& console, ProControllerContext& context){
+        //  Delay to prevent the Switches from forming separate lobbies.
+        if (env.consoles() > 1 && console.index() != host.index()){
+            pbf_wait(context, 5000ms);
+        }
+        pbf_press_button(context, BUTTON_A, 80ms, 1000ms);
+    });
+
+    auto time_limit = current_time() + settings.LOBBY_WAIT_DELAY0.get();
+
+    AllJoinedTracker joined_tracker(scope, env.consoles(), time_limit);
+
+    //  Wait for all Switches to join.
+    env.run_in_parallel<ProController>(scope, [&](ConsoleHandle& console, ProControllerContext& context){
+        size_t index = console.index();
+
+        //  Wait for a player to show up. This lets you ready up.
+        if (!wait_for_a_player(console, context, *entrance[index], time_limit)){
+            errors.fetch_add(1);
+            return;
+        }
+    });
+    if (abort_if_error(env, scope, errors)){
+        return false;
+    }
+
+    env.run_in_parallel<ProController>(scope, [&](ConsoleHandle& console, ProControllerContext& context){
+        //  Wait for all consoles to join.
+        if (!joined_tracker.report_joined()){
+            console.log("Not everyone was able to join.", COLOR_RED);
+            errors.fetch_add(1);
+            return;
+        }
+    });
+    if (abort_if_error(env, scope, errors)){
+        return false;
+    }
+
+    env.run_in_parallel<ProController>(scope, [&](ConsoleHandle& console, ProControllerContext& context){
+        size_t index = console.index();
+        if (!wait_for_all_join(console, context, *entrance[index], env.consoles())){
+            console.log("Switches joined into different raids.", COLOR_RED);
+            errors.fetch_add(1);
+            return;
+        }
+    });
+    if (abort_if_error(env, scope, errors)){
+        return false;
+    }
+
+    //  Ready up and wait for lobby to be ready.
+    env.run_in_parallel<ProController>(scope, [&](ConsoleHandle& console, ProControllerContext& context){
+        //  Ready up.
+        context.wait_for(std::chrono::seconds(1));
+        pbf_press_button(context, BUTTON_A, 80ms, 1000ms);
+        context.wait_for_all_requests();
+
+        //  Wait
+        size_t index = console.index();
+        if (!wait_for_lobby_ready(console, context, *entrance[index], env.consoles(), env.consoles(), time_limit)){
+            errors.fetch_add(1);
+            pbf_mash_button(context, BUTTON_B, 10000ms);
+            return;
+        }
+    });
+    if (abort_if_error(env, scope, errors)){
+        return false;
+    }
+
+    env.run_in_parallel<ProController>(scope, [&](ConsoleHandle& console, ProControllerContext& context){
+        //  Start
+        if (!start_adventure(console, context, env.consoles())){
+            errors.fetch_add(1);
+            pbf_mash_button(context, BUTTON_B, 10000ms);
+            return;
+        }
+    });
+    if (abort_if_error(env, scope, errors)){
+        return false;
+    }
+
+    return true;
+}
+
+bool start_raid_host(
+    MultiSwitchProgramEnvironment& env, CancellableScope& scope,
+    GlobalStateTracker& state_tracker,
+    std::shared_ptr<const ImageRGB32> entrance[4],
+    ConsoleHandle& host, size_t boss_slot,
+    HostingSettings& settings,
+    const PathStats& path_stats,
+    const StatsTracker& session_stats,
+    ConsoleRuntime console_stats[4]
+){
+    if (env.consoles() == 1){
+        ProControllerContext context(scope, host.controller<ProController>());
+        return start_raid_host_solo(
+            env, host, context,
+            state_tracker,
+            entrance[0], boss_slot,
+            settings,
+            path_stats, session_stats,
+            console_stats[0].ore
+        );
+    }
+
+    env.log("Entering lobby...");
+
+    std::string code = settings.RAID_CODE.get_code();
+    std::string boss;
+
+    std::atomic<size_t> errors(0);
+    env.run_in_parallel<ProController>(scope, [&](ConsoleHandle& console, ProControllerContext& context){
+        size_t index = console.index();
+        bool is_host = index == host.index();
+
+        entrance[index] = enter_lobby(
+            env.program_info(), console, context,
+            is_host ? boss_slot : 0,
+            settings.MODE == HostingMode::HOST_ONLINE,
+            console_stats[index].ore
+        );
+        if (!*entrance[index]){
+            errors.fetch_add(1);
+            return;
+        }
+    });
+    if (errors.load(std::memory_order_acquire) != 0){
+        env.run_in_parallel<ProController>(scope, [&](ConsoleHandle& console, ProControllerContext& context){
+            pbf_mash_button(context, BUTTON_B, 8000ms);
+        });
+        return false;
+    }
+
+    env.run_in_parallel<ProController>(scope, [&](ConsoleHandle& console, ProControllerContext& context){
+        size_t index = console.index();
+        GlobalState& state = state_tracker[index];
+        bool is_host = index == host.index();
+
+        //  Read boss.
+        if (is_host){
+            boss = read_boss_sprite(console);
+            state.boss = boss;
+        }
+
+        //  Enter Code
+        if (!code.empty()){
+            pbf_press_button(context, BUTTON_PLUS, 80ms, 1000ms);
+            FastCodeEntry::numberpad_enter_code(console, context, false, code, true);
+            pbf_wait(context, 2000ms);
+            pbf_press_button(context, BUTTON_A, 80ms, 1000ms);
+        }
+    });
+
+    //  Start delay.
+    scope.wait_for(settings.START_DELAY0);
+
+    //  Open lobby.
+    env.run_in_parallel<ProController>(scope, [&](ConsoleHandle& console, ProControllerContext& context){
+        //  If you start the raids at the same time, they won't find each other.
+        if (console.index() != host.index()){
+            pbf_wait(context, 3000ms);
+        }
+        pbf_press_button(context, BUTTON_A, 80ms, 1000ms);
+    });
+
+    auto time_limit = current_time() + settings.LOBBY_WAIT_DELAY0.get();
+
+    AllJoinedTracker joined_tracker(scope, env.consoles(), time_limit);
+
+    //  Wait for all Switches to join.
+    env.run_in_parallel<ProController>(scope, [&](ConsoleHandle& console, ProControllerContext& context){
+        //  Wait for a player to show up. This lets you ready up.
+        size_t index = console.index();
+        if (!wait_for_a_player(console, context, *entrance[index], time_limit)){
+            errors.fetch_add(1);
+            return;
+        }
+    });
+    if (abort_if_error(env, scope, errors)){
+        return false;
+    }
+
+    env.run_in_parallel<ProController>(scope, [&](ConsoleHandle& console, ProControllerContext& context){
+        //  Wait for all consoles to join.
+        if (!joined_tracker.report_joined()){
+            console.log("Not everyone was able to join.", COLOR_RED);
+            errors.fetch_add(1);
+            return;
+        }
+    });
+    if (abort_if_error(env, scope, errors)){
+        return false;
+    }
+
+    env.run_in_parallel<ProController>(scope, [&](ConsoleHandle& console, ProControllerContext& context){
+        size_t index = console.index();
+        if (!wait_for_all_join(console, context, *entrance[index], env.consoles())){
+            console.log("Switches joined into different raids.", COLOR_RED);
+            errors.fetch_add(1);
+            return;
+        }
+    });
+    if (abort_if_error(env, scope, errors)){
+        return false;
+    }
+
+    send_raid_notification(
+        env,
+        host,
+        settings.NOTIFICATIONS,
+        code,
+        boss,
+        path_stats, session_stats
+    );
+
+    //  Ready up and wait for lobby to be ready.
+    env.run_in_parallel<ProController>(scope, [&](ConsoleHandle& console, ProControllerContext& context){
+        //  Ready up.
+        context.wait_for(std::chrono::seconds(1));
+        pbf_press_button(context, BUTTON_A, 80ms, 1000ms);
+        context.wait_for_all_requests();
+
+        //  Wait
+        size_t index = console.index();
+        if (!wait_for_lobby_ready(console, context, *entrance[index], env.consoles(), 4, time_limit)){
+            errors.fetch_add(1);
+            pbf_mash_button(context, BUTTON_B, 10000ms);
+            return;
+        }
+    });
+    if (abort_if_error(env, scope, errors)){
+        return false;
+    }
+
+    env.run_in_parallel<ProController>(scope, [&](ConsoleHandle& console, ProControllerContext& context){
+        //  Start
+        if (!start_adventure(console, context, env.consoles())){
+            errors.fetch_add(1);
+            pbf_mash_button(context, BUTTON_B, 10000ms);
+            return;
+        }
+    });
+    if (abort_if_error(env, scope, errors)){
+        return false;
+    }
+
+    return true;
+}
+
+
+
+bool start_adventure(
+    MultiSwitchProgramEnvironment& env, CancellableScope& scope,
+    GlobalStateTracker& state_tracker,
+    std::shared_ptr<const ImageRGB32> entrance[4],
+    ConsoleHandle& host, size_t boss_slot,
+    HostingSettings& settings,
+    const PathStats& path_stats,
+    const StatsTracker& session_stats,
+    ConsoleRuntime console_stats[4]
+){
+    switch (settings.MODE){
+    case HostingMode::NOT_HOSTING:
+        return start_raid_local(env, scope, state_tracker, entrance, host, boss_slot, settings, console_stats);
+    case HostingMode::HOST_LOCALLY:
+    case HostingMode::HOST_ONLINE:
+        return start_raid_host(
+            env, scope,
+            state_tracker,
+            entrance,
+            host, boss_slot,
+            settings,
+            path_stats, session_stats,
+            console_stats
+        );
+    }
+    throw InternalProgramError(&env.logger(), PA_CURRENT_FUNCTION, "Invalid mode enum.");
+}
+
+
+
+
+
+
+
+
+
+
+}
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_Start.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_Start.h
new file mode 100644
index 0000000000..7218193ded
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_Start.h
@@ -0,0 +1,41 @@
+/*  Max Lair Run Start
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_MaxLair_Run_Start_H
+#define PokemonAutomation_PokemonSwSh_MaxLair_Run_Start_H
+
+#include <memory>
+#include "CommonFramework/ImageTypes/ImageRGB32.h"
+#include "NintendoSwitch/NintendoSwitch_MultiSwitchProgram.h"
+#include "VideoGames/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options_Hosting.h"
+#include "VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_StateTracker.h"
+#include "VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_StateMachine.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+namespace MaxLairInternal{
+
+
+//  Returns true if adventure started. False if you errored and are back at the entrance.
+bool start_adventure(
+    MultiSwitchProgramEnvironment& env, CancellableScope& scope,
+    GlobalStateTracker& state_tracker,
+    std::shared_ptr<const ImageRGB32> entrance[4],
+    ConsoleHandle& host, size_t boss_slot,
+    HostingSettings& settings,
+    const PathStats& path_stats,
+    const StatsTracker& session_stats,
+    ConsoleRuntime console_stats[4]
+);
+
+
+
+}
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_StartSolo.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_StartSolo.cpp
new file mode 100644
index 0000000000..63ee5b295e
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_StartSolo.cpp
@@ -0,0 +1,250 @@
+/*  Max Lair Run Start (Solo)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/FastCodeEntry/NintendoSwitch_NumberCodeEntry.h"
+#include "VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonReader.h"
+#include "VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_Lobby.h"
+#include "VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_Entrance.h"
+#include "VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonSelectMenu.h"
+#include "VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_Notifications.h"
+#include "PokemonSwSh_MaxLair_Run_EnterLobby.h"
+#include "PokemonSwSh_MaxLair_Run_StartSolo.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+namespace MaxLairInternal{
+
+
+
+
+bool wait_for_a_player(
+    VideoStream& stream, ProControllerContext& context,
+    const ImageViewRGB32& entrance,
+    WallClock time_limit
+){
+    LobbyDoneConnecting done_connecting_detector;
+    EntranceDetector entrance_detector(entrance);
+    PokemonSelectMenuDetector false_start_detector(false);
+
+    int result = wait_until(
+        stream, context,
+        time_limit,
+        {
+            {done_connecting_detector},
+            {entrance_detector},
+            {false_start_detector},
+        },
+        INFERENCE_RATE
+    );
+    switch (result){
+    case 0:
+        stream.log("Connected to lobby.");
+        break;
+    case 1:
+        stream.log("Detected entrance... Did you get disconnected?", COLOR_RED);
+        return false;
+    case 2:
+        stream.log("Detected false start. Did you join the wrong lobby?", COLOR_RED);
+        return false;
+    default:
+        stream.log("Timed out connecting to lobby.", COLOR_RED);
+        return false;
+    }
+    return true;
+}
+
+bool wait_for_lobby_ready(
+    VideoStream& stream, ProControllerContext& context,
+    const ImageViewRGB32& entrance,
+    size_t min_players,
+    size_t start_players,
+    WallClock time_limit
+){
+    LobbyAllReadyDetector ready_detector(start_players);
+    EntranceDetector entrance_detector(entrance);
+    PokemonSelectMenuDetector false_start_detector(false);
+
+    int result = wait_until(
+        stream, context,
+        time_limit,
+        {
+            {ready_detector},
+            {entrance_detector},
+        },
+        INFERENCE_RATE
+    );
+    switch (result){
+    case 0:
+        stream.log("Detected lobby ready...");
+        return true;
+    case 1:
+        stream.log("Detected entrance... Did you get disconnected?", COLOR_RED);
+        return false;
+    case 2:
+        stream.log("Detected false start. Did you join the wrong lobby?", COLOR_RED);
+        return false;
+    }
+    return true;
+}
+bool start_adventure(
+    VideoStream& stream, ProControllerContext& context,
+    size_t consoles
+){
+    LobbyMinReadyDetector ready_detector(consoles, true);
+    if (ready_detector.ready_players(stream.video().snapshot()) < consoles){
+        stream.log("Number of players less than expected. Did someone join the wrong lobby?", COLOR_RED);
+        return false;
+    }
+
+    //  Press A until you're not in the lobby anymore.
+    LobbyWatcher lobby_detector(COLOR_RED, true);
+    int result = run_until<ProControllerContext>(
+        stream, context,
+        [](ProControllerContext& context){
+            for (size_t c = 0; c < 180; c++){
+                pbf_press_button(context, BUTTON_A, 80ms, 920ms);
+                context.wait_for_all_requests();
+            }
+        },
+        {{lobby_detector}},
+        INFERENCE_RATE
+    );
+    switch (result){
+    case 0:
+        return true;
+    default:
+        stream.log("Timed out starting raid.", COLOR_RED);
+        return false;
+    }
+}
+
+
+
+
+bool start_raid_self_solo(
+    const ProgramInfo& info,
+    VideoStream& stream, ProControllerContext& context,
+    GlobalStateTracker& state_tracker,
+    std::shared_ptr<const ImageRGB32>& entrance, size_t boss_slot,
+    ReadableQuantity999& ore
+){
+    stream.log("Entering lobby...");
+
+    GlobalState& state = state_tracker[0];
+
+    //  Enter lobby.
+    entrance = enter_lobby(info, stream, context, boss_slot, false, ore);
+    if (!*entrance){
+        return false;
+    }
+
+    //  Read boss.
+    state.boss = read_boss_sprite(stream);
+
+    //  Start raid.
+    pbf_press_dpad(context, DPAD_DOWN, 80ms, 400ms);
+    pbf_press_button(context, BUTTON_A, 80ms, 1000ms);
+    context.wait_for_all_requests();
+
+    return true;
+}
+
+bool start_raid_host_solo(
+    ProgramEnvironment& env, ConsoleHandle& console, ProControllerContext& context,
+    GlobalStateTracker& state_tracker,
+    std::shared_ptr<const ImageRGB32>& entrance, size_t boss_slot,
+    HostingSettings& settings,
+    const PathStats& path_stats,
+    const StatsTracker& session_stats,
+    ReadableQuantity999& ore
+){
+    console.log("Entering lobby...");
+
+    GlobalState& state = state_tracker[0];
+
+    //  Start delay.
+    context.wait_for(settings.START_DELAY0);
+
+    //  Enter lobby.
+    entrance = enter_lobby(
+        env.program_info(), console, context,
+        boss_slot,
+        settings.MODE == HostingMode::HOST_ONLINE,
+        ore
+    );
+    if (!*entrance){
+        return false;
+    }
+
+    //  Read boss.
+    state.boss = read_boss_sprite(console);
+
+    //  Enter code.
+    std::string code = settings.RAID_CODE.get_code();
+    if (!code.empty()){
+        pbf_press_button(context, BUTTON_PLUS, 80ms, 1000ms);
+        FastCodeEntry::numberpad_enter_code(console, context, false, code, true);
+        pbf_wait(context, 2000ms);
+        pbf_press_button(context, BUTTON_A, 80ms, 1000ms);
+        context.wait_for_all_requests();
+    }
+
+    send_raid_notification(
+        env,
+        console,
+        settings.NOTIFICATIONS,
+        code,
+        state.boss,
+        path_stats, session_stats
+    );
+
+    //  Open lobby.
+    pbf_press_button(context, BUTTON_A, 80ms, 1000ms);
+    context.wait_for_all_requests();
+
+    auto time_limit = current_time() + settings.LOBBY_WAIT_DELAY0.get();
+
+    if (!wait_for_a_player(console, context, *entrance, time_limit)){
+        pbf_mash_button(context, BUTTON_B, 10000ms);
+        return start_raid_self_solo(
+            env.program_info(), console, context,
+            state_tracker,
+            entrance,
+            boss_slot,
+            ore
+        );
+    }
+
+    //  Ready up.
+    context.wait_for(std::chrono::seconds(1));
+    pbf_press_button(context, BUTTON_A, 80ms, 1000ms);
+    context.wait_for_all_requests();
+
+    //  Wait
+    if (!wait_for_lobby_ready(console, context, *entrance, 1, 4, time_limit)){
+        pbf_mash_button(context, BUTTON_B, 10000ms);
+        return false;
+    }
+
+    //  Start
+    context.wait_for_all_requests();
+    if (!start_adventure(console, context, 1)){
+        pbf_mash_button(context, BUTTON_B, 10000ms);
+        return false;
+    }
+
+    return true;
+}
+
+
+
+}
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_StartSolo.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_StartSolo.h
new file mode 100644
index 0000000000..809993f46f
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_StartSolo.h
@@ -0,0 +1,69 @@
+/*  Max Lair Run Start (Solo)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_MaxLair_Run_StartSolo_H
+#define PokemonAutomation_PokemonSwSh_MaxLair_Run_StartSolo_H
+
+#include <memory>
+#include "CommonFramework/Notifications/ProgramInfo.h"
+#include "CommonFramework/ImageTypes/ImageRGB32.h"
+#include "CommonFramework/Tools/VideoStream.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+#include "NintendoSwitch/NintendoSwitch_ConsoleHandle.h"
+#include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_QuantityReader.h"
+#include "VideoGames/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options_Hosting.h"
+#include "VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_Stats.h"
+#include "VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_StateTracker.h"
+
+namespace PokemonAutomation{
+    class ProgramEnvironment;
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+namespace MaxLairInternal{
+
+
+bool wait_for_a_player(
+    VideoStream& stream, ProControllerContext& context,
+    const ImageViewRGB32& entrance,
+    WallClock time_limit
+);
+bool wait_for_lobby_ready(
+    VideoStream& stream, ProControllerContext& context,
+    const ImageViewRGB32& entrance,
+    size_t min_players,
+    size_t start_players,
+    WallClock time_limit
+);
+bool start_adventure(
+    VideoStream& stream, ProControllerContext& context,
+    size_t consoles
+);
+
+
+bool start_raid_self_solo(
+    const ProgramInfo& info,
+    VideoStream& stream, ProControllerContext& context,
+    GlobalStateTracker& state_tracker,
+    std::shared_ptr<const ImageRGB32>& entrance, size_t boss_slot,
+    ReadableQuantity999& ore
+);
+
+bool start_raid_host_solo(
+    ProgramEnvironment& env, ConsoleHandle& console, ProControllerContext& context,
+    GlobalStateTracker& state_tracker,
+    std::shared_ptr<const ImageRGB32>& entrance, size_t boss_slot,
+    HostingSettings& settings,
+    const PathStats& path_stats,
+    const StatsTracker& session_stats,
+    ReadableQuantity999& ore
+);
+
+
+}
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterEnums.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterEnums.cpp
new file mode 100644
index 0000000000..1fd360de8f
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterEnums.cpp
@@ -0,0 +1,81 @@
+/*  Encounter Filter
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "PokemonSwSh_EncounterFilterEnums.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+
+const EnumDropdownDatabase<EncounterAction>& EncounterAction_Database(){
+    static const EnumDropdownDatabase<EncounterAction> database({
+        {EncounterAction::StopProgram,          "stop",                 "Stop Program"},
+        {EncounterAction::RunAway,              "run",                  "Run Away"},
+        {EncounterAction::ThrowBalls,           "throw-balls",          "Throw balls."},
+        {EncounterAction::ThrowBallsAndSave,    "throw-balls-and-save", "Throw balls. Save if caught."},
+    });
+    return database;
+}
+
+
+
+const EnumDropdownDatabase<ShinyFilter>& ShinyFilter_Normal_Database(){
+    static const EnumDropdownDatabase<ShinyFilter> database({
+        {ShinyFilter::ANYTHING,     "anything",     "Anything"},
+        {ShinyFilter::NOT_SHINY,    "not-shiny",    "Not Shiny"},
+        {ShinyFilter::ANY_SHINY,    "any-shiny",    "Any Shiny"},
+        {ShinyFilter::STAR_ONLY,    "star-shiny",   "Star Shiny"},
+        {ShinyFilter::SQUARE_ONLY,  "square-shiny", "Square Shiny"},
+//        {ShinyFilter::NOTHING,      "nothing",      "Nothing"},
+    });
+    return database;
+}
+const EnumDropdownDatabase<ShinyFilter>& ShinyFilter_StopRareStars_Database(){
+    static const EnumDropdownDatabase<ShinyFilter> database({
+        {ShinyFilter::NOT_SHINY,    "not-shiny",    "Not Shiny"},
+        {ShinyFilter::ANY_SHINY,    "any-shiny",    "Any Shiny"},
+        {ShinyFilter::STAR_ONLY,    "star-shiny",   "Star Shiny"},
+    });
+    return database;
+}
+const EnumDropdownDatabase<ShinyFilter>& ShinyFilter_TableRareStars_Database(){
+    static const EnumDropdownDatabase<ShinyFilter> database({
+        {ShinyFilter::NOT_SHINY,    "not-shiny",    "Not Shiny"},
+        {ShinyFilter::SQUARE_ONLY,  "square-shiny", "Square Shiny"},
+    });
+    return database;
+}
+
+
+
+const std::vector<std::string> ShinyFilter_NAMES{
+    "Anything",
+    "Not Shiny",
+    "Any Shiny",
+    "Star Shiny",
+    "Square Shiny",
+    "Nothing",
+};
+const std::map<std::string, ShinyFilter> ShinyFilter_MAP{
+    {ShinyFilter_NAMES[0], ShinyFilter::ANYTHING},
+    {ShinyFilter_NAMES[1], ShinyFilter::NOT_SHINY},
+    {ShinyFilter_NAMES[2], ShinyFilter::ANY_SHINY},
+    {ShinyFilter_NAMES[3], ShinyFilter::STAR_ONLY},
+    {ShinyFilter_NAMES[4], ShinyFilter::SQUARE_ONLY},
+    {ShinyFilter_NAMES[5], ShinyFilter::NOTHING},
+};
+
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterEnums.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterEnums.h
new file mode 100644
index 0000000000..d939263b1c
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterEnums.h
@@ -0,0 +1,77 @@
+/*  Encounter Filter
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_EncounterFilterEnums_H
+#define PokemonAutomation_PokemonSwSh_EncounterFilterEnums_H
+
+#include <string>
+#include <vector>
+#include <map>
+#include "Common/Cpp/Options/EnumDropdownOption.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+
+enum class EncounterAction{
+    StopProgram,
+    RunAway,
+    ThrowBalls,
+    ThrowBallsAndSave,
+};
+const EnumDropdownDatabase<EncounterAction>& EncounterAction_Database();
+
+
+class EncounterActionCell : public EnumDropdownCell<EncounterAction>{
+public:
+    EncounterActionCell()
+        : EnumDropdownCell<EncounterAction>(
+            EncounterAction_Database(),
+            LockMode::LOCK_WHILE_RUNNING,
+            EncounterAction::StopProgram
+        )
+    {}
+};
+
+
+
+enum class ShinyFilter{
+    ANYTHING,
+    NOT_SHINY,
+    ANY_SHINY,
+    STAR_ONLY,
+    SQUARE_ONLY,
+    NOTHING,
+};
+const EnumDropdownDatabase<ShinyFilter>& ShinyFilter_Normal_Database();
+const EnumDropdownDatabase<ShinyFilter>& ShinyFilter_StopRareStars_Database();
+const EnumDropdownDatabase<ShinyFilter>& ShinyFilter_TableRareStars_Database();
+
+class ShinyFilterCell : public EnumDropdownCell<ShinyFilter>{
+public:
+    ShinyFilterCell(bool rare_stars)
+        : EnumDropdownCell<ShinyFilter>(
+            rare_stars ? ShinyFilter_TableRareStars_Database() : ShinyFilter_Normal_Database(),
+            LockMode::LOCK_WHILE_RUNNING,
+            ShinyFilter::NOT_SHINY
+        )
+    {}
+};
+
+
+extern const std::vector<std::string> ShinyFilter_NAMES;
+extern const std::map<std::string, ShinyFilter> ShinyFilter_MAP;
+
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterOption.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterOption.cpp
new file mode 100644
index 0000000000..2f9057cebe
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterOption.cpp
@@ -0,0 +1,56 @@
+/*  Encounter Filter
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "PokemonSwSh_EncounterFilterEnums.h"
+#include "PokemonSwSh_EncounterFilterOption.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+
+
+
+EncounterFilterOption2::EncounterFilterOption2(bool rare_stars, bool enable_overrides)
+    : BatchOption(LockMode::UNLOCK_WHILE_RUNNING)
+    , SHINY_FILTER(
+        "<b>Stop on:</b>",
+        rare_stars ? ShinyFilter_StopRareStars_Database() : ShinyFilter_Normal_Database(),
+        LockMode::UNLOCK_WHILE_RUNNING,
+        ShinyFilter::ANY_SHINY
+    )
+    , FILTER_TABLE(rare_stars)
+{
+    PA_ADD_OPTION(SHINY_FILTER);
+    if (enable_overrides){
+        PA_ADD_OPTION(FILTER_TABLE);
+    }
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterOption.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterOption.h
new file mode 100644
index 0000000000..95409b8936
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterOption.h
@@ -0,0 +1,36 @@
+/*  Encounter Filter
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_EncounterFilterOption_H
+#define PokemonAutomation_PokemonSwSh_EncounterFilterOption_H
+
+#include "Common/Cpp/Options/BatchOption.h"
+#include "PokemonSwSh_EncounterFilterOverride.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+
+
+class EncounterFilterOption2 : public BatchOption{
+public:
+    EncounterFilterOption2(bool rare_stars, bool enable_overrides);
+
+public:
+    EnumDropdownOption<ShinyFilter> SHINY_FILTER;
+    EncounterFilterTable FILTER_TABLE;
+};
+
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterOverride.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterOverride.cpp
similarity index 75%
rename from SerialPrograms/Source/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterOverride.cpp
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterOverride.cpp
index a60ef3bfa1..9b4320f4b2 100644
--- a/SerialPrograms/Source/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterOverride.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterOverride.cpp
@@ -1,13 +1,13 @@
 /*  Encounter Filter
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include "Common/Cpp/Json/JsonValue.h"
 #include "Common/Cpp/Json/JsonObject.h"
 #include "Pokemon/Pokemon_Strings.h"
-#include "PokemonSwSh/Resources/PokemonSwSh_NameDatabase.h"
+#include "VideoGames/PokemonSwSh/Resources/PokemonSwSh_NameDatabase.h"
 #include "PokemonSwSh_EncounterFilterOverride.h"
 
 //#include <iostream>
@@ -26,35 +26,30 @@ using namespace Pokemon;
 EncounterFilterOverride::~EncounterFilterOverride(){
     action.remove_listener(*this);
 }
-EncounterFilterOverride::EncounterFilterOverride(bool rare_stars)
-    : m_rare_stars(rare_stars)
-    , pokemon(COMBINED_DEX_NAMES(), LockWhileRunning::LOCKED, "rookidee")
-    , shininess(rare_stars)
+EncounterFilterOverride::EncounterFilterOverride(EditableTableOption& parent_table)
+    : EditableTableRow(parent_table)
+    , pokemon(COMBINED_DEX_NAMES(), LockMode::UNLOCK_WHILE_RUNNING, "rookidee")
+    , shininess(static_cast<EncounterFilterTable&>(parent_table).rare_stars)
+    , pokeball(LockMode::UNLOCK_WHILE_RUNNING)
+    , ball_limit(LockMode::UNLOCK_WHILE_RUNNING, 40, 1, 999)
 {
-    PA_ADD_OPTION(action);
-    PA_ADD_OPTION(pokeball);
     PA_ADD_OPTION(pokemon);
     PA_ADD_OPTION(shininess);
+    PA_ADD_OPTION(action);
+    PA_ADD_OPTION(pokeball);
+    PA_ADD_OPTION(ball_limit);
     action.add_listener(*this);
 }
 void EncounterFilterOverride::load_json(const JsonValue& json){
     EditableTableRow::load_json(json);
 
     //  Parse old format for backwards compatibility.
-    const JsonObject* obj = json.get_object();
+    const JsonObject* obj = json.to_object();
     if (obj == nullptr){
         return;
     }
 
     const JsonValue* value;
-    value = obj->get_value("Action");
-    if (value != nullptr){
-        action.load_json(*value);
-    }
-    value = obj->get_value("Ball");
-    if (value != nullptr){
-        pokeball.load_json(*value);
-    }
     value = obj->get_value("Species");
     if (value != nullptr){
         pokemon.load_json(*value);
@@ -63,16 +58,25 @@ void EncounterFilterOverride::load_json(const JsonValue& json){
     if (value != nullptr){
         shininess.load_json(*value);
     }
+    value = obj->get_value("Action");
+    if (value != nullptr){
+        action.load_json(*value);
+    }
+    value = obj->get_value("Ball");
+    if (value != nullptr){
+        pokeball.load_json(*value);
+    }
 }
 std::unique_ptr<EditableTableRow> EncounterFilterOverride::clone() const{
-    std::unique_ptr<EncounterFilterOverride> ret(new EncounterFilterOverride(m_rare_stars));
-    ret->action.set(action);
-    ret->pokeball.set_by_index(pokeball.index());
+    std::unique_ptr<EncounterFilterOverride> ret(new EncounterFilterOverride(parent()));
     ret->pokemon.set_by_index(pokemon.index());
     ret->shininess.set(shininess);
+    ret->action.set(action);
+    ret->pokeball.set_by_index(pokeball.index());
+    ret->ball_limit.set(ball_limit);
     return ret;
 }
-void EncounterFilterOverride::value_changed(){
+void EncounterFilterOverride::on_config_value_changed(void* object){
     switch ((EncounterAction)action){
     case EncounterAction::StopProgram:
     case EncounterAction::RunAway:
@@ -87,9 +91,9 @@ void EncounterFilterOverride::value_changed(){
 
 
 
-EncounterFilterTable::EncounterFilterTable(bool rare_stars)
+EncounterFilterTable::EncounterFilterTable(bool p_rare_stars)
     : EditableTableOption(
-        rare_stars
+        p_rare_stars
             ?   "<b>Overrides:</b><br>"
                 "The game language must be properly set to read " + STRING_POKEMON + " names. "
                 "If more than one override applies, the last one will be chosen.<br>"
@@ -100,22 +104,24 @@ EncounterFilterTable::EncounterFilterTable(bool rare_stars)
                 "<b>Overrides:</b><br>"
                 "The game language must be properly set to read " + STRING_POKEMON + " names.<br>"
                 "If more than one override applies, the last one will be chosen.",
-        LockWhileRunning::LOCKED
+        LockMode::UNLOCK_WHILE_RUNNING
     )
+    , rare_stars(p_rare_stars)
 {}
 std::vector<std::unique_ptr<EncounterFilterOverride>> EncounterFilterTable::copy_snapshot() const{
     return EditableTableOption::copy_snapshot<EncounterFilterOverride>();
 }
 std::vector<std::string> EncounterFilterTable::make_header() const{
     return std::vector<std::string>{
-        "Action",
-        STRING_POKEBALL,
         STRING_POKEMON,
         "Shininess",
+        "Action",
+        STRING_POKEBALL,
+        "Ball Limit",
     };
 }
-std::unique_ptr<EditableTableRow> EncounterFilterTable::make_row() const{
-    return std::unique_ptr<EditableTableRow>(new EncounterFilterOverride(m_rare_stars));
+std::unique_ptr<EditableTableRow> EncounterFilterTable::make_row(){
+    return std::unique_ptr<EditableTableRow>(new EncounterFilterOverride(*this));
 }
 
 
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterOverride.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterOverride.h
new file mode 100644
index 0000000000..0b8205499d
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterOverride.h
@@ -0,0 +1,65 @@
+/*  Encounter Filter
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_EncounterFilterOverride_H
+#define PokemonAutomation_PokemonSwSh_EncounterFilterOverride_H
+
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "Common/Cpp/Options/EditableTableOption.h"
+#include "VideoGames/PokemonSwSh/Options/PokemonSwSh_BallSelectOption.h"
+#include "PokemonSwSh_EncounterFilterEnums.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+struct EncounterActionFull{
+    EncounterAction action;
+    std::string pokeball_slug;
+    uint16_t ball_limit = 999;
+};
+
+
+class EncounterFilterOverride : public EditableTableRow, private ConfigOption::Listener{
+public:
+    ~EncounterFilterOverride();
+    EncounterFilterOverride(EditableTableOption& parent_table);
+    virtual void load_json(const JsonValue& json) override;
+    virtual std::unique_ptr<EditableTableRow> clone() const override;
+
+    virtual void on_config_value_changed(void* object) override;
+
+public:
+    StringSelectCell pokemon;
+    ShinyFilterCell shininess;
+    EncounterActionCell action;
+    PokemonBallSelectCell pokeball;
+    SimpleIntegerCell<uint16_t> ball_limit;
+};
+
+
+//  Cannot use "EditableTableOption_t<>" since the row class takes an extra
+//  parameter.
+class EncounterFilterTable : public EditableTableOption{
+public:
+    EncounterFilterTable(bool rare_stars);
+    std::vector<std::unique_ptr<EncounterFilterOverride>> copy_snapshot() const;
+    virtual std::vector<std::string> make_header() const override;
+    virtual std::unique_ptr<EditableTableRow> make_row() override;
+
+public:
+    const bool rare_stars;
+};
+
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterWidget.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterWidget.cpp
similarity index 93%
rename from SerialPrograms/Source/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterWidget.cpp
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterWidget.cpp
index 4d8bf4d16f..4f5c823c5b 100644
--- a/SerialPrograms/Source/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterWidget.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterWidget.cpp
@@ -1,6 +1,6 @@
 /*  Encounter Filter
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -8,7 +8,6 @@
 #include <QLabel>
 #include "Common/Cpp/Exceptions.h"
 #include "Common/Qt/NoWheelComboBox.h"
-#include "PokemonSwSh_EncounterFilterEnums.h"
 #include "PokemonSwSh_EncounterFilterWidget.h"
 
 namespace PokemonAutomation{
@@ -17,6 +16,7 @@ namespace PokemonSwSh{
 
 
 
+#if 0
 EncounterFilterWidget::EncounterFilterWidget(QWidget& parent, EncounterFilterOption& value)
     : QWidget(&parent)
     , ConfigWidget(value, *this)
@@ -34,7 +34,7 @@ EncounterFilterWidget::EncounterFilterWidget(QWidget& parent, EncounterFilterOpt
         layout->addLayout(hbox);
         hbox->addWidget(new QLabel("<b>Stop on:</b>"));
 
-        m_shininess = new NoWheelComboBox(this);
+        m_shininess = new NoWheelCompactComboBox(this);
         hbox->addWidget(m_shininess);
         if (m_value.m_rare_stars){
             m_shininess->addItem(QString::fromStdString(ShinyFilter_NAMES[(int)ShinyFilter::ANYTHING]));
@@ -93,7 +93,7 @@ void EncounterFilterWidget::update_visibility(){
         m_table->update_visibility();
     }
 }
-
+#endif
 
 
 
diff --git a/SerialPrograms/Source/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterWidget.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterWidget.h
similarity index 87%
rename from SerialPrograms/Source/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterWidget.h
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterWidget.h
index 255bacc195..37d3ed977a 100644
--- a/SerialPrograms/Source/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterWidget.h
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterWidget.h
@@ -1,6 +1,6 @@
 /*  Encounter Filter
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -18,6 +18,7 @@ namespace PokemonSwSh{
 
 
 
+#if 0
 class EncounterFilterWidget : public QWidget, public ConfigWidget{
 public:
     EncounterFilterWidget(QWidget& parent, EncounterFilterOption& value);
@@ -31,6 +32,7 @@ class EncounterFilterWidget : public QWidget, public ConfigWidget{
     QComboBox* m_shininess = nullptr;
     ConfigWidget* m_table = nullptr;
 };
+#endif
 
 
 
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Options/PokemonSwSh_AutoHostNotification.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Options/PokemonSwSh_AutoHostNotification.cpp
new file mode 100644
index 0000000000..eed0a07949
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Options/PokemonSwSh_AutoHostNotification.cpp
@@ -0,0 +1,45 @@
+/*  Auto-Host Notification
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "PokemonSwSh_AutoHostNotification.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+AutoHostNotificationOption::AutoHostNotificationOption(std::string label, bool max_lair)
+    : GroupOption(
+        std::move(label),
+        LockMode::LOCK_WHILE_RUNNING,
+        GroupOption::EnableMode::DEFAULT_DISABLED
+    )
+    , DESCRIPTION(
+        "<b>Description:</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        "",
+        max_lair
+            ? "Auto-Hosting Lugia\nCode: Random"
+            : "Den 123: Square Shiny\nIGN: Kimberly\nCode: 1234-5678\nFC: SW-1234-5678-9012"
+    )
+    , SHOW_STATS(
+        "<b>Show Stats:</b> Show program stats for this session.",
+        LockMode::LOCK_WHILE_RUNNING,
+        true
+    )
+//    , SCREENSHOT("<b>Notification Screenshot:</b><br>Attach screenshot of the den to notifications.")
+    , NOTIFICATION("Hosting Announcements", true, false, ImageAttachmentMode::JPG, {"LiveHost"})
+{
+    PA_ADD_OPTION(DESCRIPTION);
+    PA_ADD_OPTION(SHOW_STATS);
+//    PA_ADD_OPTION(SCREENSHOT);
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/PokemonSwSh/Options/PokemonSwSh_AutoHostNotification.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Options/PokemonSwSh_AutoHostNotification.h
similarity index 89%
rename from SerialPrograms/Source/PokemonSwSh/Options/PokemonSwSh_AutoHostNotification.h
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/Options/PokemonSwSh_AutoHostNotification.h
index 8d027a3dab..48c6c752bf 100644
--- a/SerialPrograms/Source/PokemonSwSh/Options/PokemonSwSh_AutoHostNotification.h
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Options/PokemonSwSh_AutoHostNotification.h
@@ -1,6 +1,6 @@
 /*  Auto-Host Notification
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Options/PokemonSwSh_BallSelectOption.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Options/PokemonSwSh_BallSelectOption.cpp
new file mode 100644
index 0000000000..d3b4b5987b
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Options/PokemonSwSh_BallSelectOption.cpp
@@ -0,0 +1,77 @@
+/*  Pokemon Ball Select
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Logging/Logger.h"
+#include "Pokemon/Resources/Pokemon_PokeballNames.h"
+#include "VideoGames/PokemonSwSh/Resources/PokemonSwSh_PokeballSprites.h"
+#include "PokemonSwSh_BallSelectOption.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+using namespace Pokemon;
+
+
+StringSelectDatabase make_all_balls_database(){
+    StringSelectDatabase ret;
+    for (const auto& slug : POKEBALL_SLUGS()){
+//        cout << "slug = " << slug << endl;
+        const PokeballNames& data = get_pokeball_name(slug);
+        const SpriteDatabase::Sprite* sprite = ALL_POKEBALL_SPRITES().get_nothrow(slug);
+        if (sprite != nullptr){
+            ret.add_entry(StringSelectEntry(slug, data.display_name(), sprite->icon));
+        }else{
+//            ret.add_entry(StringSelectEntry(slug, data.display_name()));
+//            global_logger_tagged().log("Missing sprite for: " + slug, COLOR_RED);
+        }
+    }
+    return ret;
+}
+const StringSelectDatabase& ALL_BALLS_SELECT_DATABASE(){
+    static StringSelectDatabase database = make_all_balls_database();
+    return database;
+}
+
+
+
+
+PokemonBallSelectCell::PokemonBallSelectCell(
+    LockMode lock_while_running,
+    const std::string& default_slug
+)
+    : StringSelectCell(
+        ALL_BALLS_SELECT_DATABASE(),
+        lock_while_running,
+        default_slug
+    )
+{}
+
+
+
+PokemonBallSelectOption::PokemonBallSelectOption(
+    std::string label,
+    LockMode lock_while_running,
+    const std::string& default_slug
+)
+    : StringSelectOption(
+        std::move(label),
+        ALL_BALLS_SELECT_DATABASE(),
+        lock_while_running,
+        default_slug
+    )
+{}
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Options/PokemonSwSh_BallSelectOption.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Options/PokemonSwSh_BallSelectOption.h
new file mode 100644
index 0000000000..cad11c444c
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Options/PokemonSwSh_BallSelectOption.h
@@ -0,0 +1,40 @@
+/*  Pokemon Ball Select
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_PokemonBallSelect_H
+#define PokemonAutomation_PokemonSwSh_PokemonBallSelect_H
+
+#include "CommonTools/Options/StringSelectOption.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+
+class PokemonBallSelectCell : public StringSelectCell{
+public:
+    PokemonBallSelectCell(
+        LockMode lock_while_running,
+        const std::string& default_slug = ""
+    );
+};
+
+
+class PokemonBallSelectOption : public StringSelectOption{
+public:
+    PokemonBallSelectOption(
+        std::string label,
+        LockMode lock_while_running,
+        const std::string& default_slug = ""
+    );
+};
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Options/PokemonSwSh_Catchability.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Options/PokemonSwSh_Catchability.h
similarity index 83%
rename from SerialPrograms/Source/PokemonSwSh/Options/PokemonSwSh_Catchability.h
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/Options/PokemonSwSh_Catchability.h
index 8869b7f0c7..c395877ac6 100644
--- a/SerialPrograms/Source/PokemonSwSh/Options/PokemonSwSh_Catchability.h
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Options/PokemonSwSh_Catchability.h
@@ -1,6 +1,6 @@
 /*  Catchability Selector
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -9,7 +9,7 @@
 
 #include "Common/Cpp/Options/EnumDropdownOption.h"
 #include "Pokemon/Pokemon_Strings.h"
-#include "PokemonSwSh/PokemonSwSh_Settings.h"
+#include "VideoGames/PokemonSwSh/PokemonSwSh_Settings.h"
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
@@ -33,7 +33,7 @@ class CatchabilitySelectorOption : public EnumDropdownOption<Catchability>{
                 {Catchability::MAYBE_UNCATCHABLE,   "maybe", "Maybe Uncatchable"},
                 {Catchability::ALWAYS_UNCATCHABLE,  "never", "Never Catchable"},
             },
-            LockWhileRunning::LOCKED,
+            LockMode::LOCK_WHILE_RUNNING,
             Catchability::ALWAYS_CATCHABLE
         )
     {}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Options/PokemonSwSh_CramomaticTable.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Options/PokemonSwSh_CramomaticTable.cpp
new file mode 100644
index 0000000000..1b9edfff5b
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Options/PokemonSwSh_CramomaticTable.cpp
@@ -0,0 +1,114 @@
+/*  Cram-o-matic Table
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "PokemonSwSh_CramomaticTable.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+const EnumDropdownDatabase<CramomaticBallType>& BallType_Database(){
+    static const EnumDropdownDatabase<CramomaticBallType> database({
+        {CramomaticBallType::Poke,     "poke",     "Poké Ball"},
+        {CramomaticBallType::Great,    "great",    "Great Ball"},
+        {CramomaticBallType::Shop1,    "shop1",    "Shop 1 (Ultra Ball, Net Ball, Dusk Ball, Premier Ball)"},
+        {CramomaticBallType::Shop2,    "shop2",    "Shop 2 (Repeat Ball, Dive Ball, Quick Ball, Nest Ball, Heal Ball, Timer Ball, Luxury Ball)"},
+        {CramomaticBallType::Apricorn, "apricorn", "Apricorn (Level Ball, Lure Ball, Moon Ball, Friend Ball, Love Ball, Fast Ball, Heavy Ball)"},
+        {CramomaticBallType::Safari,   "safari",   "Safari Ball"},
+        {CramomaticBallType::Sport,    "sport",    "Sport Ball (uses two different Apricorn colors)"},
+    });
+    return database;
+}
+
+
+
+CramomaticRow::CramomaticRow(EditableTableOption& parent_table)
+    : EditableTableRow(parent_table)
+    , ball_type(BallType_Database(), LockMode::LOCK_WHILE_RUNNING, CramomaticBallType::Apricorn)
+    , is_bonus(LockMode::LOCK_WHILE_RUNNING, false)
+    , priority(LockMode::LOCK_WHILE_RUNNING, 0)
+{
+    PA_ADD_OPTION(ball_type);
+    PA_ADD_OPTION(is_bonus);
+    PA_ADD_OPTION(priority);
+}
+
+CramomaticRow::CramomaticRow(EditableTableOption& parent_table, CramomaticBallType p_ball_type, bool p_is_bonus, uint16_t p_priority)
+    : CramomaticRow(parent_table)
+{
+    ball_type.set(p_ball_type);
+    is_bonus = p_is_bonus;
+    priority.set(p_priority);
+}
+
+std::unique_ptr<EditableTableRow> CramomaticRow::clone() const{
+    std::unique_ptr<CramomaticRow> ret(new CramomaticRow(parent()));
+    ret->ball_type.set_value(ball_type.current_value());
+    ret->is_bonus = is_bonus.current_value();
+    ret->priority.set(priority.current_value());
+    return ret;
+}
+
+
+CramomaticTable::CramomaticTable(std::string label)
+    : EditableTableOption_t<CramomaticRow>(
+        std::move(label),
+        LockMode::LOCK_WHILE_RUNNING,
+        make_defaults()
+    )
+{}
+
+
+std::vector<CramomaticSelection> CramomaticTable::selected_balls() const{
+    std::vector<std::unique_ptr<CramomaticRow>> table = copy_snapshot();
+    std::vector<CramomaticSelection> selections;
+    for (const std::unique_ptr<CramomaticRow>& row : table){
+        CramomaticSelection selection;
+        selection.ball_type = CramomaticBallType(row->ball_type.current_value());
+        selection.is_bonus = row->is_bonus.current_value();
+        selection.priority = row->priority.current_value();
+
+        selections.emplace_back(selection);
+    }
+    return selections;
+}
+
+
+
+
+std::vector<std::string> CramomaticTable::make_header() const{
+    return std::vector<std::string>{
+        "Ball", "Only Bonus", "Priority",
+    };
+}
+
+std::vector<std::unique_ptr<EditableTableRow>> CramomaticTable::make_defaults(){
+    std::vector<std::unique_ptr<EditableTableRow>> ret;
+    ret.emplace_back(std::make_unique<CramomaticRow>(*this, CramomaticBallType::Apricorn, true, (uint16_t)1));
+    ret.emplace_back(std::make_unique<CramomaticRow>(*this, CramomaticBallType::Apricorn, false, (uint16_t)0));
+    return ret;
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/PokemonSwSh/Options/PokemonSwSh_CramomaticTable.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Options/PokemonSwSh_CramomaticTable.h
similarity index 76%
rename from SerialPrograms/Source/PokemonSwSh/Options/PokemonSwSh_CramomaticTable.h
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/Options/PokemonSwSh_CramomaticTable.h
index b40bc1697f..236d9e5465 100644
--- a/SerialPrograms/Source/PokemonSwSh/Options/PokemonSwSh_CramomaticTable.h
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Options/PokemonSwSh_CramomaticTable.h
@@ -1,6 +1,6 @@
 /*  Cram-o-matic Table
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -36,7 +36,8 @@ struct CramomaticSelection
 
 class CramomaticRow : public EditableTableRow{
 public:
-    CramomaticRow();
+    CramomaticRow(EditableTableOption& parent_table);
+    CramomaticRow(EditableTableOption& parent_table, CramomaticBallType p_ball_type, bool p_is_bonus, uint16_t p_priority);
     virtual std::unique_ptr<EditableTableRow> clone() const;
 
 public:
@@ -55,7 +56,7 @@ class CramomaticTable : public EditableTableOption_t<CramomaticRow>{
 
     virtual std::vector<std::string> make_header() const;
 
-    static std::vector<std::unique_ptr<EditableTableRow>> make_defaults();
+    std::vector<std::unique_ptr<EditableTableRow>> make_defaults();
 };
 
 
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Options/PokemonSwSh_DateToucher.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Options/PokemonSwSh_DateToucher.cpp
new file mode 100644
index 0000000000..fd1ac7be78
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Options/PokemonSwSh_DateToucher.cpp
@@ -0,0 +1,74 @@
+/*  Date Toucher
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "NintendoSwitch/NintendoSwitch_Settings.h"
+#include "VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.h"
+#include "PokemonSwSh_DateToucher.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+TimeRollbackHoursOption::TimeRollbackHoursOption()
+    : SimpleIntegerOption<uint8_t>(
+        "<b>Time Rollback (in hours):</b><br>Periodically roll back the time to keep the weather the same. If set to zero, this feature is disabled.",
+        LockMode::LOCK_WHILE_RUNNING,
+        1, 0, 11
+    )
+{}
+
+
+
+
+
+TouchDateIntervalOption::TouchDateIntervalOption()
+    : TouchDateIntervalOption(
+        "<b>Rollover Prevention:</b><br>Prevent a date-skip by touching the date every this many hours. If set to zero, this feature is disabled.",
+        LockMode::LOCK_WHILE_RUNNING
+    )
+{}
+
+
+TouchDateIntervalOption::TouchDateIntervalOption(std::string label, LockMode lock_mode)
+    : SimpleIntegerOption<uint8_t>(std::move(label), lock_mode, 4, 0, 11)
+{
+    reset_state();
+}
+
+
+void TouchDateIntervalOption::reset_state(){
+    WriteSpinLock lg(m_lock, PA_CURRENT_FUNCTION);
+    m_last_touch = WallClock::min();
+}
+
+
+bool TouchDateIntervalOption::ok_to_touch_now(){
+    uint8_t hours = *this;
+    if (hours == 0){
+        return false;
+    }
+    auto now = current_time();
+    WriteSpinLock lg(m_lock, PA_CURRENT_FUNCTION);
+    if (now < m_last_touch + std::chrono::hours(hours)){
+        return false;
+    }
+    m_last_touch = now;
+    return true;
+}
+void TouchDateIntervalOption::touch_now_from_home_if_needed(ConsoleHandle& console, ProControllerContext& context){
+    if (!ok_to_touch_now()){
+        return;
+    }
+    touch_date_from_home(console, context, ConsoleSettings::instance().SETTINGS_TO_HOME_DELAY0);
+}
+
+
+
+}
+}
+}
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Options/PokemonSwSh_DateToucher.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Options/PokemonSwSh_DateToucher.h
new file mode 100644
index 0000000000..3fbd91777b
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Options/PokemonSwSh_DateToucher.h
@@ -0,0 +1,45 @@
+/*  Date Toucher
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_DateToucher_H
+#define PokemonAutomation_DateToucher_H
+
+#include "Common/Cpp/Concurrency/SpinLock.h"
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+#include "NintendoSwitch/NintendoSwitch_ConsoleHandle.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+class TimeRollbackHoursOption : public SimpleIntegerOption<uint8_t>{
+public:
+    TimeRollbackHoursOption();
+};
+
+class TouchDateIntervalOption : public SimpleIntegerOption<uint8_t>{
+public:
+    TouchDateIntervalOption();
+    TouchDateIntervalOption(std::string label, LockMode lock_mode);
+
+    virtual void reset_state() override final;
+
+    bool ok_to_touch_now();
+    void touch_now_from_home_if_needed(ConsoleHandle& console, ProControllerContext& context);
+
+private:
+    SpinLock m_lock;
+    WallClock m_last_touch;
+};
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Options/PokemonSwSh_EggStepOption.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Options/PokemonSwSh_EggStepOption.cpp
new file mode 100644
index 0000000000..f6c2cb90a1
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Options/PokemonSwSh_EggStepOption.cpp
@@ -0,0 +1,41 @@
+/*  Egg Step Count Dropdown
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Pokemon/Resources/Pokemon_EggSteps.h"
+#include "VideoGames/PokemonSwSh/Resources/PokemonSwSh_PokemonSprites.h"
+#include "PokemonSwSh_EggStepOption.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+
+const Pokemon::EggStepDatabase& EGGSTEP_DATABASE(){
+    static Pokemon::EggStepDatabase database("PokemonSwSh/EggSteps.json", &ALL_POKEMON_SPRITES());
+    return database;
+}
+
+
+
+EggStepCountOption::EggStepCountOption()
+    : StringSelectOption(
+        "<b>Step Count:</b>",
+        EGGSTEP_DATABASE().database(),
+        LockMode::LOCK_WHILE_RUNNING,
+        "grookey"
+    )
+{}
+
+EggStepCountOption::operator uint16_t() const{
+    return (uint16_t)EGGSTEP_DATABASE().step_count(this->slug());
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Options/PokemonSwSh_EggStepOption.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Options/PokemonSwSh_EggStepOption.h
new file mode 100644
index 0000000000..6ad1182465
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Options/PokemonSwSh_EggStepOption.h
@@ -0,0 +1,33 @@
+/*  Egg Step Count Dropdown
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_EggStepOption_H
+#define PokemonAutomation_PokemonSwSh_EggStepOption_H
+
+#include "CommonTools/Options/StringSelectOption.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+
+
+class EggStepCountOption : public StringSelectOption{
+public:
+    EggStepCountOption();
+
+    operator uint16_t() const;
+};
+
+
+
+
+}
+}
+}
+#endif
+
diff --git a/SerialPrograms/Source/PokemonSwSh/Options/PokemonSwSh_EncounterBotCommon.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Options/PokemonSwSh_EncounterBotCommon.h
similarity index 87%
rename from SerialPrograms/Source/PokemonSwSh/Options/PokemonSwSh_EncounterBotCommon.h
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/Options/PokemonSwSh_EncounterBotCommon.h
index 0754016a6f..dc5f8e9bbf 100644
--- a/SerialPrograms/Source/PokemonSwSh/Options/PokemonSwSh_EncounterBotCommon.h
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Options/PokemonSwSh_EncounterBotCommon.h
@@ -1,6 +1,6 @@
 /*  Encounter Bot Common
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -21,11 +21,11 @@ namespace PokemonSwSh{
 class EncounterBotCommonOptions : public BatchOption{
 public:
     EncounterBotCommonOptions(bool rare_stars, bool enable_overrides)
-        : BatchOption(LockWhileRunning::LOCKED)
+        : BatchOption(LockMode::UNLOCK_WHILE_RUNNING)
         , FILTER(rare_stars, enable_overrides)
         , VIDEO_ON_SHINY(
             "<b>Video Capture:</b><br>Take a video of the encounter if it is shiny.",
-            LockWhileRunning::LOCKED,
+            LockMode::UNLOCK_WHILE_RUNNING,
             true
         )
         , NOTIFICATION_NONSHINY(
@@ -54,7 +54,7 @@ class EncounterBotCommonOptions : public BatchOption{
         PA_ADD_OPTION(VIDEO_ON_SHINY);
     }
 
-    EncounterFilterOption FILTER;
+    EncounterFilterOption2 FILTER;
     BooleanCheckBoxOption VIDEO_ON_SHINY;
 
     EventNotificationOption NOTIFICATION_NONSHINY;
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Options/PokemonSwSh_FossilTable.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Options/PokemonSwSh_FossilTable.h
new file mode 100644
index 0000000000..e67e676257
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Options/PokemonSwSh_FossilTable.h
@@ -0,0 +1,112 @@
+/*  Fossil Table
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_FossilTableOption_H
+#define PokemonAutomation_PokemonSwSh_FossilTableOption_H
+
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "Common/Cpp/Options/EnumDropdownOption.h"
+#include "Common/Cpp/Options/EditableTableOption.h"
+#include "NintendoSwitch/Options/NintendoSwitch_SlotDatabase.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+enum class Fossil{
+    Dracozolt   =   0,
+    Arctozolt   =   1,
+    Dracovish   =   2,
+    Arctovish   =   3,
+};
+
+
+class FossilGame : public EditableTableRow{
+private:
+    static const EnumDropdownDatabase<Fossil>& Fossil_Database(){
+        static const EnumDropdownDatabase<Fossil> database({
+            {Fossil::Dracozolt, "dracozolt", "Dracozolt"},
+            {Fossil::Arctozolt, "arctozolt", "Arctozolt"},
+            {Fossil::Dracovish, "dracovish", "Dracovish"},
+            {Fossil::Arctovish, "arctovish", "Arctovish"},
+        });
+        return database;
+    }
+
+public:
+    FossilGame(EditableTableOption& parent_table)
+        : EditableTableRow(parent_table)
+        , game_slot(GameSlot_Database(), LockMode::LOCK_WHILE_RUNNING, 1)
+        , user_slot(UserSlot_Database(), LockMode::LOCK_WHILE_RUNNING, 1)
+        , fossil(Fossil_Database(), LockMode::LOCK_WHILE_RUNNING, Fossil::Dracovish)
+        , revives(LockMode::LOCK_WHILE_RUNNING, 960, 0, 965)
+    {
+        PA_ADD_OPTION(game_slot);
+        PA_ADD_OPTION(user_slot);
+        PA_ADD_OPTION(fossil);
+        PA_ADD_OPTION(revives);
+    }
+    FossilGame(
+        EditableTableOption& parent_table,
+        uint8_t p_game_slot, uint8_t p_user_slot, Fossil p_fossil, uint16_t p_revives
+    )
+        : FossilGame(parent_table)
+    {
+        game_slot.set_value(p_game_slot);
+        user_slot.set_value(p_user_slot);
+        fossil.set(p_fossil);
+        revives.set(p_revives);
+    }
+    virtual std::unique_ptr<EditableTableRow> clone() const override{
+        std::unique_ptr<FossilGame> ret(new FossilGame(parent()));
+        ret->game_slot.set_value(game_slot.current_value());
+        ret->user_slot.set_value(user_slot.current_value());
+        ret->fossil.set(fossil);
+        ret->revives.set(revives);
+        return ret;
+    }
+
+public:
+    IntegerEnumDropdownCell game_slot;
+    IntegerEnumDropdownCell user_slot;
+    EnumDropdownCell<Fossil> fossil;
+    SimpleIntegerCell<uint16_t> revives;
+};
+
+
+class FossilTable : public EditableTableOption_t<FossilGame>{
+public:
+    FossilTable()
+        : EditableTableOption_t<FossilGame>(
+            "<b>Game List:</b>",
+            LockMode::LOCK_WHILE_RUNNING,
+            make_defaults()
+        )
+    {}
+    virtual std::vector<std::string> make_header() const override{
+        return std::vector<std::string>{
+            "Game",
+            "User",
+            "Fossil",
+            "Revives"
+        };
+    }
+
+    std::vector<std::unique_ptr<EditableTableRow>> make_defaults(){
+        std::vector<std::unique_ptr<EditableTableRow>> ret;
+        ret.emplace_back(new FossilGame(*this, 1, 1, Fossil::Dracovish, 960));
+        return ret;
+    }
+};
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Options/PokemonSwSh_MultiHostTable.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Options/PokemonSwSh_MultiHostTable.cpp
new file mode 100644
index 0000000000..78559ee061
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Options/PokemonSwSh_MultiHostTable.cpp
@@ -0,0 +1,103 @@
+/*  Multi-Host Table
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "NintendoSwitch/Options/NintendoSwitch_SlotDatabase.h"
+#include "PokemonSwSh_MultiHostTable.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+MultiHostSlot::MultiHostSlot(EditableTableOption& parent_table)
+    : EditableTableRow(parent_table)
+    , game_slot(GameSlot_Database(), LockMode::LOCK_WHILE_RUNNING, 1)
+    , user_slot(UserSlot_Database(), LockMode::LOCK_WHILE_RUNNING, 1)
+    , skips(LockMode::LOCK_WHILE_RUNNING, 3, 0, 7)
+    , backup_save(LockMode::LOCK_WHILE_RUNNING, false)
+    , always_catchable(LockMode::LOCK_WHILE_RUNNING, true)
+    , use_raid_code(LockMode::LOCK_WHILE_RUNNING, true)
+    , accept_FRs(LockMode::LOCK_WHILE_RUNNING, true)
+    , move_slot(LockMode::LOCK_WHILE_RUNNING, 0, 0, 4)
+    , dynamax(LockMode::LOCK_WHILE_RUNNING, true)
+    , post_raid_delay(LockMode::LOCK_WHILE_RUNNING, "0 s")
+{
+    PA_ADD_OPTION(game_slot);
+    PA_ADD_OPTION(user_slot);
+    PA_ADD_OPTION(skips);
+    PA_ADD_OPTION(backup_save);
+    PA_ADD_OPTION(always_catchable);
+    if (static_cast<MultiHostTable&>(parent_table).raid_code_option){
+        PA_ADD_OPTION(use_raid_code);
+    }
+    PA_ADD_OPTION(accept_FRs);
+    PA_ADD_OPTION(move_slot);
+    PA_ADD_OPTION(dynamax);
+    PA_ADD_OPTION(post_raid_delay);
+}
+
+std::unique_ptr<EditableTableRow> MultiHostSlot::clone() const{
+    std::unique_ptr<MultiHostSlot> ret(new MultiHostSlot(parent()));
+    ret->game_slot.set_value(game_slot.current_value());
+    ret->user_slot.set_value(user_slot.current_value());
+    ret->skips.set(skips);
+    ret->backup_save = (bool)backup_save;
+    ret->always_catchable = (bool)always_catchable;
+    ret->use_raid_code = (bool)use_raid_code;
+    ret->accept_FRs = (bool)accept_FRs;
+    ret->move_slot.set(move_slot);
+    ret->dynamax = (bool)dynamax;
+    ret->post_raid_delay.set(post_raid_delay.current_text());
+    return ret;
+}
+
+
+
+MultiHostTable::MultiHostTable(bool p_raid_code_option)
+    : EditableTableOption("<b>Game List:</b>", LockMode::LOCK_WHILE_RUNNING)
+    , raid_code_option(p_raid_code_option)
+{}
+std::vector<std::unique_ptr<MultiHostSlot>> MultiHostTable::copy_snapshot() const{
+    return EditableTableOption::copy_snapshot<MultiHostSlot>();
+}
+std::vector<std::string> MultiHostTable::make_header() const{
+    if (raid_code_option){
+        return std::vector<std::string>{
+            "Game",
+            "User",
+            "Skips",
+            "Backup Save",
+            "Always Catchable",
+            "Use Raid Code",
+            "Accept FRs",
+            "1st Move",
+            "Dynamax",
+            "Post Raid Delay",
+        };
+    }else{
+        return std::vector<std::string>{
+            "Game",
+            "User",
+            "Skips",
+            "Backup Save",
+            "Always Catchable",
+            "Accept FRs",
+            "1st Move",
+            "Dynamax",
+            "Post Raid Delay",
+        };
+    }
+}
+std::unique_ptr<EditableTableRow> MultiHostTable::make_row(){
+    return std::unique_ptr<EditableTableRow>(new MultiHostSlot(*this));
+}
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Options/PokemonSwSh_MultiHostTable.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Options/PokemonSwSh_MultiHostTable.h
new file mode 100644
index 0000000000..3e7f1f9995
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Options/PokemonSwSh_MultiHostTable.h
@@ -0,0 +1,63 @@
+/*  Multi-Host Table
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_MultiHostTableOption_H
+#define PokemonAutomation_PokemonSwSh_MultiHostTableOption_H
+
+#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "Common/Cpp/Options/TimeDurationOption.h"
+#include "Common/Cpp/Options/EnumDropdownOption.h"
+#include "Common/Cpp/Options/EditableTableOption.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+class MultiHostTable;
+
+
+class MultiHostSlot : public EditableTableRow{
+public:
+    MultiHostSlot(EditableTableOption& parent_table);
+
+    virtual std::unique_ptr<EditableTableRow> clone() const override;
+
+public:
+    IntegerEnumDropdownCell game_slot;
+    IntegerEnumDropdownCell user_slot;
+    SimpleIntegerCell<uint8_t> skips;
+    BooleanCheckBoxCell backup_save;
+    BooleanCheckBoxCell always_catchable;
+    BooleanCheckBoxCell use_raid_code;
+    BooleanCheckBoxCell accept_FRs;
+    SimpleIntegerCell<uint8_t> move_slot;
+    BooleanCheckBoxCell dynamax;
+    MillisecondsCell post_raid_delay;
+};
+
+
+
+class MultiHostTable : public EditableTableOption{
+public:
+    MultiHostTable(bool p_raid_code_option);
+    std::vector<std::unique_ptr<MultiHostSlot>> copy_snapshot() const;
+    virtual std::vector<std::string> make_header() const override;
+    virtual std::unique_ptr<EditableTableRow> make_row() override;
+
+public:
+    const bool raid_code_option;
+};
+
+
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Options/PokemonSwSh_RegiSelector.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Options/PokemonSwSh_RegiSelector.h
similarity index 86%
rename from SerialPrograms/Source/PokemonSwSh/Options/PokemonSwSh_RegiSelector.h
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/Options/PokemonSwSh_RegiSelector.h
index 841f66995a..1b33bc63c3 100644
--- a/SerialPrograms/Source/PokemonSwSh/Options/PokemonSwSh_RegiSelector.h
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Options/PokemonSwSh_RegiSelector.h
@@ -1,6 +1,6 @@
 /*  Regi Selector
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -34,7 +34,7 @@ class RegiSelectorOption : public EnumDropdownOption<RegiGolem>{
                 {RegiGolem::Regieleki,  "regieleki", "Regieleki"},
                 {RegiGolem::Regidrago,  "regidrago", "Regidrago"},
             },
-            LockWhileRunning::LOCKED,
+            LockMode::LOCK_WHILE_RUNNING,
             RegiGolem::Registeel
         )
     {}
diff --git a/SerialPrograms/Source/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Battle.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Battle.cpp
similarity index 96%
rename from SerialPrograms/Source/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Battle.cpp
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Battle.cpp
index 0dc07d816e..f329125da6 100644
--- a/SerialPrograms/Source/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Battle.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Battle.cpp
@@ -1,6 +1,6 @@
 /*  PkmnLib Battle
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Battle.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Battle.h
similarity index 87%
rename from SerialPrograms/Source/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Battle.h
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Battle.h
index 71196075c7..eee9eac65e 100644
--- a/SerialPrograms/Source/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Battle.h
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Battle.h
@@ -1,6 +1,6 @@
 /*  PkmnLib Battle
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Field.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Field.cpp
similarity index 88%
rename from SerialPrograms/Source/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Field.cpp
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Field.cpp
index ed1e40321f..76db78b49c 100644
--- a/SerialPrograms/Source/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Field.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Field.cpp
@@ -1,6 +1,6 @@
 /*  PkmnLib Field
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Field.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Field.h
new file mode 100644
index 0000000000..d9f4d0c3ed
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Field.h
@@ -0,0 +1,98 @@
+/*  PkmnLib Field
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef _PokemonAutomation_PokemonSwSh_PkmnLib_Field_H
+#define _PokemonAutomation_PokemonSwSh_PkmnLib_Field_H
+
+#include <string>
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+namespace papkmnlib{
+
+
+enum class Weather{
+    CLEAR,
+    RAIN,
+    SUN,
+    SANDSTORM,
+    HAIL
+};
+
+enum class Terrain{
+    NONE,
+    ELECTRIC,
+    GRASSY,
+    MISTY,
+    PSYCHIC
+};
+
+
+class Field{
+    Weather m_default_weather = Weather::CLEAR;
+    Weather m_current_weather = m_default_weather;
+
+    Terrain m_default_terrain = Terrain::NONE;
+    Terrain m_current_terrain = m_default_terrain;
+
+public:
+    Field() = default;
+    Field(Weather w, Terrain t)
+        : m_default_weather(w)
+        , m_current_weather(w)
+        , m_default_terrain(t)
+        , m_current_terrain(t)
+    {}
+
+    // weather related-queries
+    Weather weather() const{ return m_current_weather; }
+    bool is_clear() const{ return m_current_weather == Weather::CLEAR; }
+    bool is_rain() const{ return m_current_weather == Weather::RAIN; }
+    bool is_sun() const{ return m_current_weather == Weather::SUN; }
+    bool is_sandstorm() const{ return m_current_weather == Weather::SANDSTORM; }
+    bool is_hail() const{ return m_current_weather == Weather::HAIL; }
+
+    // set the weather
+    void set_rain(){ m_current_weather = Weather::RAIN; }
+    void set_sun(){ m_current_weather = Weather::SUN; }
+    void set_sandstorm(){ m_current_weather = Weather::SANDSTORM; }
+    void set_hail(){ m_current_weather = Weather::HAIL; }
+    void set_clear(){ m_current_weather = Weather::CLEAR; }
+
+    // terrain-related queries
+    Terrain terrain() const{ return m_current_terrain; }
+    bool is_electric() const{ return m_current_terrain == Terrain::ELECTRIC; }
+    bool is_grassy() const{ return m_current_terrain == Terrain::GRASSY; }
+    bool is_misty() const{ return m_current_terrain == Terrain::MISTY; }
+    bool is_psychic() const{ return m_current_terrain == Terrain::PSYCHIC; }
+    bool is_none_terrain() const{ return m_current_terrain == Terrain::NONE; }
+
+    // set the terrain
+    void set_electric(){ m_current_terrain = Terrain::ELECTRIC; }
+    void set_grassy(){ m_current_terrain = Terrain::GRASSY; }
+    void set_misty(){ m_current_terrain = Terrain::MISTY; }
+    void set_psychic(){ m_current_terrain = Terrain::PSYCHIC; }
+    void set_none_terrain(){ m_current_terrain = Terrain::NONE; }
+
+    // reset field
+    void reset(){
+        m_current_terrain = m_default_terrain;
+        m_current_weather = m_default_weather;
+    }
+
+    void set_default_field(const std::string& boss);
+};
+
+
+
+
+
+}
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Matchup.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Matchup.cpp
similarity index 95%
rename from SerialPrograms/Source/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Matchup.cpp
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Matchup.cpp
index 05e9592679..e60d5864e7 100644
--- a/SerialPrograms/Source/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Matchup.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Matchup.cpp
@@ -1,15 +1,15 @@
 /*  PkmnLib Matchup
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include <cmath>
 #include "PokemonSwSh_PkmnLib_Matchup.h"
 
-#include <iostream>
-using std::cout;
-using std::endl;
+//#include <iostream>
+//using std::cout;
+//using std::endl;
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
diff --git a/SerialPrograms/Source/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Matchup.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Matchup.h
similarity index 92%
rename from SerialPrograms/Source/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Matchup.h
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Matchup.h
index 59f14d1f95..011b0ef40c 100644
--- a/SerialPrograms/Source/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Matchup.h
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Matchup.h
@@ -1,6 +1,6 @@
 /*  PkmnLib Matchup
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Moves.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Moves.cpp
similarity index 92%
rename from SerialPrograms/Source/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Moves.cpp
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Moves.cpp
index ae128d25a9..2d6d9686ca 100644
--- a/SerialPrograms/Source/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Moves.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Moves.cpp
@@ -1,15 +1,15 @@
 /*  PkmnLib Moves
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
+#include <cstdlib>
 #include <deque>
-#include <fstream>
 #include "Common/Cpp/Exceptions.h"
 #include "Common/Cpp/Json/JsonValue.h"
 #include "Common/Cpp/Json/JsonObject.h"
-#include "CommonFramework/Globals.h"
+#include "CommonFramework/GlobalAutoPaths.h"
 #include "PokemonSwSh_PkmnLib_Types.h"
 #include "PokemonSwSh_PkmnLib_Moves.h"
 
@@ -106,11 +106,11 @@ struct MoveDatabase{
     ){
         std::string path = RESOURCE_PATH() + filepath;
         JsonValue json = load_json_file(path);
-        JsonObject& root = json.get_object_throw(path);
+        JsonObject& root = json.to_object_throw(path);
 
         for (auto& item : root){
             uint32_t move_id = std::atoi(item.first.c_str());
-            JsonObject& obj = item.second.get_object_throw(path);
+            JsonObject& obj = item.second.to_object_throw(path);
             std::string& slug = obj.get_string_throw("name", path);
             moves.emplace_back(
                 move_id,
@@ -160,7 +160,7 @@ uint8_t get_max_move_power(const Move& move){
     int found_idx = 0;
 
     // quick iteration to find index where power is between these values
-    for (int ii = 0; ii > 7; ii++)
+    for (int ii = 0; ii < 7; ii++)
     {
         if (max_move_bounds[ii][0] <= move_power && move_power <= max_move_bounds[ii][1])
         {
diff --git a/SerialPrograms/Source/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Moves.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Moves.h
similarity index 91%
rename from SerialPrograms/Source/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Moves.h
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Moves.h
index 23c3e08c03..7191242779 100644
--- a/SerialPrograms/Source/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Moves.h
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Moves.h
@@ -1,6 +1,6 @@
 /*  PkmnLib Moves
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -49,8 +49,8 @@ class Move{
     double       correction_factor  () const{ return m_correction_factor; }
 
     // the only setter so far is updating the move type
-    void set_type(Type update_type) { m_current_type = update_type; }
-    void reset_move_type() { m_current_type = m_type; }
+    void set_type(Type update_type){ m_current_type = update_type; }
+    void reset_move_type(){ m_current_type = m_type; }
 
     bool operator<(const Move& move);
 
diff --git a/SerialPrograms/Source/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Pokemon.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Pokemon.cpp
similarity index 89%
rename from SerialPrograms/Source/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Pokemon.cpp
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Pokemon.cpp
index f36968ac5a..c1689ddeb0 100644
--- a/SerialPrograms/Source/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Pokemon.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Pokemon.cpp
@@ -1,16 +1,15 @@
 /*  PkmnLib Pokemon
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include <algorithm>
-#include <cmath>
 #include "Common/Cpp/Exceptions.h"
 #include "Common/Cpp/Json/JsonValue.h"
 #include "Common/Cpp/Json/JsonArray.h"
 #include "Common/Cpp/Json/JsonObject.h"
-#include "CommonFramework/Globals.h"
+#include "CommonFramework/GlobalAutoPaths.h"
 #include "PokemonSwSh_PkmnLib_Pokemon.h"
 
 namespace PokemonAutomation{
@@ -177,17 +176,14 @@ void Pokemon::load_moves(){
 
 void Pokemon::update_stats(bool is_iv, uint8_t HP, uint8_t Atk, uint8_t Def, uint8_t SpAtk, uint8_t SpDef, uint8_t Speed){
     // this method updates internally what the IVs or EVs are and then recalculates stats
-    if (is_iv)
-    {
+    if (is_iv){
         m_iv_hp = HP;
         m_iv_atk = Atk;
         m_iv_def = Def;
         m_iv_spatk = SpAtk;
         m_iv_spdef = SpDef;
         m_iv_speed = Speed;
-    }
-    else
-    {
+    }else{
         m_ev_hp = HP;
         m_ev_atk = Atk;
         m_ev_def = Def;
@@ -339,7 +335,7 @@ std::string Pokemon::dump() const{
 std::map<std::string, Pokemon> load_pokemon(const std::string& filepath, bool is_legendary){
     std::string path = RESOURCE_PATH() + filepath;
     JsonValue json = load_json_file(path);
-    JsonObject& root = json.get_object_throw(path);
+    JsonObject& root = json.to_object_throw(path);
 
     std::map<std::string, Pokemon> map;
 
@@ -355,7 +351,7 @@ std::map<std::string, Pokemon> load_pokemon(const std::string& filepath, bool is
 
     for (auto& item : root){
         const std::string& slug = item.first;
-        JsonObject& obj = item.second.get_object_throw(path);
+        JsonObject& obj = item.second.to_object_throw(path);
 
         Type type1 = Type::none;
         Type type2 = Type::none;
@@ -364,9 +360,9 @@ std::map<std::string, Pokemon> load_pokemon(const std::string& filepath, bool is
             if (array.size() < 1){
                 throw FileException(nullptr, PA_CURRENT_FUNCTION, "Must have at least one type: " + slug, std::move(path));
             }
-            type1 = get_type_from_string(array[0].get_string_throw(path));
+            type1 = get_type_from_string(array[0].to_string_throw(path));
             if (array.size() > 1){
-                type2 = get_type_from_string(array[1].get_string_throw(path));
+                type2 = get_type_from_string(array[1].to_string_throw(path));
             }
         }
 
@@ -377,7 +373,7 @@ std::map<std::string, Pokemon> load_pokemon(const std::string& filepath, bool is
                 throw FileException(nullptr, PA_CURRENT_FUNCTION, "Too many moves specified: " + slug, std::move(path));
             }
             for (size_t c = 0; c < array.size(); c++){
-                moves[c] = (uint32_t)array[c].get_integer_throw(path);
+                moves[c] = (uint32_t)array[c].to_integer_throw(path);
             }
         }
 
@@ -388,7 +384,7 @@ std::map<std::string, Pokemon> load_pokemon(const std::string& filepath, bool is
                 throw FileException(nullptr, PA_CURRENT_FUNCTION, "Too many moves specified: " + slug, std::move(path));
             }
             for (size_t c = 0; c < array.size(); c++){
-                max_moves[c] = (uint32_t)array[c].get_integer_throw(path);
+                max_moves[c] = (uint32_t)array[c].to_integer_throw(path);
             }
         }
         JsonArray& base_stats = obj.get_array_throw("base_stats", path);
@@ -405,12 +401,12 @@ std::map<std::string, Pokemon> load_pokemon(const std::string& filepath, bool is
                 obj.get_string_throw("ability_id", path),
                 type1, type2,
                 level,
-                (uint8_t)base_stats[0].get_integer_throw(path),
-                (uint8_t)base_stats[1].get_integer_throw(path),
-                (uint8_t)base_stats[2].get_integer_throw(path),
-                (uint8_t)base_stats[3].get_integer_throw(path),
-                (uint8_t)base_stats[4].get_integer_throw(path),
-                (uint8_t)base_stats[5].get_integer_throw(path),
+                (uint8_t)base_stats[0].to_integer_throw(path),
+                (uint8_t)base_stats[1].to_integer_throw(path),
+                (uint8_t)base_stats[2].to_integer_throw(path),
+                (uint8_t)base_stats[3].to_integer_throw(path),
+                (uint8_t)base_stats[4].to_integer_throw(path),
+                (uint8_t)base_stats[5].to_integer_throw(path),
                 moves[0],
                 moves[1],
                 moves[2],
diff --git a/SerialPrograms/Source/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Pokemon.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Pokemon.h
similarity index 93%
rename from SerialPrograms/Source/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Pokemon.h
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Pokemon.h
index 18a8e27c14..db896a690d 100644
--- a/SerialPrograms/Source/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Pokemon.h
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Pokemon.h
@@ -1,6 +1,6 @@
 /*  PkmnLib Pokemon
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -110,13 +110,13 @@ class Pokemon{
     uint16_t            speed() const{ return m_calc_speed; }
 
     bool is_dynamax() const{ return m_is_dynamax; }
-    void set_is_dynamax(bool is_dynamax) { m_is_dynamax = is_dynamax; }
+    void set_is_dynamax(bool is_dynamax){ m_is_dynamax = is_dynamax; }
 
     bool is_stab(Type move_type) const{ return move_type == m_type1 || move_type == m_type2; }
     bool has_type(Type theType) const{ return theType == m_type1 || theType == m_type2; }
 
     bool is_legendary() const{ return m_is_legendary; }
-    void set_is_legendary(bool is_legendary) { m_is_legendary = is_legendary; }
+    void set_is_legendary(bool is_legendary){ m_is_legendary = is_legendary; }
 
     size_t num_moves() const;
     const Move& move(size_t index) const;
@@ -146,7 +146,7 @@ class Pokemon{
     void set_hp_ratio(double hp_ratio);
 //    void take_damage(uint16_t damage);
 //    void heal(uint16_t points);
-//    void set_level(uint8_t level) { m_level = level; }
+//    void set_level(uint8_t level){ m_level = level; }
 
     VolatileStatusEffects volatile_status_effect() const{ return volatile_status; }
     NonVolatileStatusEffects non_volatile_status_effect() const{ return non_volatile_status; }
diff --git a/SerialPrograms/Source/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Stats.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Stats.cpp
similarity index 89%
rename from SerialPrograms/Source/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Stats.cpp
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Stats.cpp
index c55ee4395b..906b8e3c4e 100644
--- a/SerialPrograms/Source/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Stats.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Stats.cpp
@@ -1,10 +1,8 @@
 /*  PkmnLib Stats
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
-
-#include <cmath>
 #include "PokemonSwSh_PkmnLib_Stats.h"
 
 namespace PokemonAutomation{
diff --git a/SerialPrograms/Source/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Stats.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Stats.h
similarity index 83%
rename from SerialPrograms/Source/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Stats.h
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Stats.h
index 46bf75d992..e633e506f3 100644
--- a/SerialPrograms/Source/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Stats.h
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Stats.h
@@ -1,6 +1,6 @@
 /*  PkmnLib Stats
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Types.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Types.cpp
similarity index 96%
rename from SerialPrograms/Source/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Types.cpp
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Types.cpp
index 47531f6e2f..f9e09a3f8a 100644
--- a/SerialPrograms/Source/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Types.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Types.cpp
@@ -1,6 +1,6 @@
 /*  PkmnLib Types
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Types.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Types.h
similarity index 87%
rename from SerialPrograms/Source/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Types.h
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Types.h
index 47560b9803..7210ecda1d 100644
--- a/SerialPrograms/Source/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Types.h
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Types.h
@@ -1,6 +1,6 @@
 /*  PkmnLib Types
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/PokemonSwSh_Panels.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/PokemonSwSh_Panels.cpp
new file mode 100644
index 0000000000..b0a31f06b2
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/PokemonSwSh_Panels.cpp
@@ -0,0 +1,211 @@
+/*  Pokemon Sword/Shield Panels
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/StaticGlobals.h"
+#include "CommonFramework/GlobalAutoPaths.h"
+#include "PokemonSwSh_Panels.h"
+
+#include "PokemonSwSh_Settings.h"
+
+#include "Programs/QoLMacros/PokemonSwSh_FastCodeEntry.h"
+#include "Programs/QoLMacros/PokemonSwSh_FriendSearchDisconnect.h"
+
+#include "Programs/General/PokemonSwSh_MassRelease.h"
+#include "Programs/General/PokemonSwSh_SurpriseTrade.h"
+#include "Programs/General/PokemonSwSh_TradeBot.h"
+#include "Programs/General/PokemonSwSh_ClothingBuyer.h"
+#include "Programs/General/PokemonSwSh_AutonomousBallThrower.h"
+#include "Programs/General/PokemonSwSh_DexRecFinder.h"
+#include "Programs/General/PokemonSwSh_BoxReorderNationalDex.h"
+
+#include "Programs/DateSpamFarmers/PokemonSwSh_DateSpam-WattFarmer.h"
+#include "Programs/DateSpamFarmers/PokemonSwSh_DateSpam-BerryFarmer.h"
+#include "Programs/DateSpamFarmers/PokemonSwSh_DateSpam-BerryFarmer2.h"
+#include "Programs/DateSpamFarmers/PokemonSwSh_DateSpam-LotoFarmer.h"
+#include "Programs/DateSpamFarmers/PokemonSwSh_DateSpam-StowOnSideFarmer.h"
+#include "Programs/DateSpamFarmers/PokemonSwSh_DateSpam-DailyHighlightFarmer.h"
+#include "Programs/DateSpamFarmers/PokemonSwSh_DateSpam-PokeJobsFarmer.h"
+#include "Programs/DateSpamFarmers/PokemonSwSh_DateSpam-WattTraderFarmer.h"
+
+#include "Programs/DenHunting/PokemonSwSh_PurpleBeamFinder.h"
+#include "Programs/DenHunting/PokemonSwSh_EventBeamFinder.h"
+#include "Programs/DenHunting/PokemonSwSh_DaySkipperJPN.h"
+#include "Programs/DenHunting/PokemonSwSh_DaySkipperEU.h"
+#include "Programs/DenHunting/PokemonSwSh_DaySkipperUS.h"
+#include "Programs/DenHunting/PokemonSwSh_DaySkipperJPN-7.8k.h"
+
+#include "Programs/Hosting/PokemonSwSh_DenRoller.h"
+#include "Programs/Hosting/PokemonSwSh_AutoHost-Rolling.h"
+#include "Programs/Hosting/PokemonSwSh_AutoHost-MultiGame.h"
+
+#include "Programs/NonShinyHunting/PokemonSwSh_StatsReset.h"
+#include "Programs/NonShinyHunting/PokemonSwSh_StatsReset-Calyrex.h"
+#include "Programs/NonShinyHunting/PokemonSwSh_StatsReset-Moltres.h"
+#include "Programs/NonShinyHunting/PokemonSwSh_StatsReset-Regi.h"
+
+#include "Programs/EggPrograms/PokemonSwSh_EggAutonomous.h"
+#include "Programs/EggPrograms/PokemonSwSh_EggFetcher2.h"
+#include "Programs/EggPrograms/PokemonSwSh_EggFetcherMultiple.h"
+#include "Programs/EggPrograms/PokemonSwSh_EggHatcher.h"
+#include "Programs/EggPrograms/PokemonSwSh_GodEggDuplication.h"
+#include "Programs/EggPrograms/PokemonSwSh_GodEggItemDupe.h"
+
+#include "Programs/ShinyHuntUnattended/PokemonSwSh_MultiGameFossil.h"
+#include "Programs/ShinyHuntUnattended/PokemonSwSh_CurryHunter.h"
+
+#include "Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Regi.h"
+#include "Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-SwordsOfJustice.h"
+#include "Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-StrongSpawn.h"
+#include "Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Regigigas2.h"
+#include "Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-IoATrade.h"
+#include "Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-BerryTree.h"
+#include "Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Whistling.h"
+#include "Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Fishing.h"
+#include "Programs/OverworldBot/PokemonSwSh_ShinyHuntAutonomous-Overworld.h"
+
+#include "Programs/RNG/PokemonSwSh_CramomaticRNG.h"
+#include "Programs/RNG/PokemonSwSh_DailyHighlightRNG.h"
+#include "Programs/RNG/PokemonSwSh_SeedFinder.h"
+
+#include "Programs/PokemonSwSh_SynchronizedSpinning.h"
+#include "Programs/PokemonSwSh_RaidItemFarmerOKHO.h"
+
+#include "MaxLair/PokemonSwSh_MaxLair_Standard.h"
+#include "MaxLair/PokemonSwSh_MaxLair_StrongBoss.h"
+#include "MaxLair/PokemonSwSh_MaxLair_BossFinder.h"
+
+#include "Programs/TestPrograms/PokemonSwSh_ShinyEncounterTester.h"
+#include "InferenceTraining/PokemonSwSh_GenerateIVCheckerOCR.h"
+#include "InferenceTraining/PokemonSwSh_GenerateNameOCRPokedex.h"
+#include "InferenceTraining/PokemonSwSh_GeneratePokedexSprites.h"
+
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+
+PanelListFactory::PanelListFactory()
+    : PanelListDescriptor(
+        Pokemon::STRING_POKEMON + " Sword and Shield",
+        RESOURCE_PATH() + "CategoryIcons/PokemonSwSh.png"
+    )
+{}
+
+std::vector<PanelEntry> PanelListFactory::make_panels() const{
+    std::vector<PanelEntry> ret;
+
+    ret.emplace_back("---- Settings ----");
+    ret.emplace_back(make_OptionsPanel<GameSettingsPanel>());
+
+    ret.emplace_back("---- QoL Macros ----");
+    ret.emplace_back(make_SingleSwitchProgram<FastCodeEntry>());
+    ret.emplace_back(make_SingleSwitchProgram<FriendSearchDisconnect>());
+
+    ret.emplace_back("---- General ----");
+    ret.emplace_back(make_SingleSwitchProgram<MassRelease>());
+    ret.emplace_back(make_SingleSwitchProgram<SurpriseTrade>());
+    ret.emplace_back(make_SingleSwitchProgram<ClothingBuyer>());
+    ret.emplace_back(make_SingleSwitchProgram<AutonomousBallThrower>());
+    ret.emplace_back(make_SingleSwitchProgram<DexRecFinder>());
+    ret.emplace_back(make_SingleSwitchProgram<BoxReorderNationalDex>());
+
+    ret.emplace_back("---- Date-Spam Farmers ----");
+    ret.emplace_back(make_SingleSwitchProgram<WattFarmer>());
+    ret.emplace_back(make_SingleSwitchProgram<BerryFarmer>());
+    ret.emplace_back(make_SingleSwitchProgram<BerryFarmer2>());
+    ret.emplace_back(make_SingleSwitchProgram<LotoFarmer>());
+    ret.emplace_back(make_SingleSwitchProgram<StowOnSideFarmer>());
+    ret.emplace_back(make_SingleSwitchProgram<DailyHighlightFarmer>());
+    ret.emplace_back(make_SingleSwitchProgram<PokeJobsFarmer>());
+    ret.emplace_back(make_SingleSwitchProgram<DailyHighlightRNG>());
+    ret.emplace_back(make_SingleSwitchProgram<WattTraderFarmer>());
+
+    ret.emplace_back("---- Den Hunting ----");
+    ret.emplace_back(make_SingleSwitchProgram<PurpleBeamFinder>());
+    ret.emplace_back(make_SingleSwitchProgram<EventBeamFinder>());
+    ret.emplace_back(make_SingleSwitchProgram<DaySkipperJPN>());
+    ret.emplace_back(make_SingleSwitchProgram<DaySkipperEU>());
+    ret.emplace_back(make_SingleSwitchProgram<DaySkipperUS>());
+    ret.emplace_back(make_SingleSwitchProgram<DaySkipperJPN7p8k>());
+
+    ret.emplace_back("---- Hosting ----");
+    ret.emplace_back(make_SingleSwitchProgram<DenRoller>());
+    ret.emplace_back(make_SingleSwitchProgram<AutoHostRolling>());
+    ret.emplace_back(make_SingleSwitchProgram<AutoHostMultiGame>());
+
+    ret.emplace_back("---- Eggs ----");
+    ret.emplace_back(make_SingleSwitchProgram<EggFetcher2>());
+    ret.emplace_back(make_SingleSwitchProgram<EggFetcherMultiple>());
+    ret.emplace_back(make_SingleSwitchProgram<EggHatcher>());
+    ret.emplace_back(make_SingleSwitchProgram<EggAutonomous>());
+    ret.emplace_back(make_SingleSwitchProgram<GodEggItemDupe>());
+    if (STATIC_GLOBALS.NAUGHTY_MODE || STATIC_GLOBALS.DEVELOPER_MODE){
+        ret.emplace_back(make_SingleSwitchProgram<GodEggDuplication>());
+    }
+
+    ret.emplace_back("---- Non-Shiny Hunting ----");
+    ret.emplace_back(make_SingleSwitchProgram<StatsReset>());
+    ret.emplace_back(make_SingleSwitchProgram<StatsResetCalyrex>());
+    ret.emplace_back(make_SingleSwitchProgram<StatsResetMoltres>());
+    ret.emplace_back(make_SingleSwitchProgram<StatsResetRegi>());
+
+    ret.emplace_back("---- Shiny Hunting ----");
+    ret.emplace_back(make_SingleSwitchProgram<MultiGameFossil>());
+    ret.emplace_back(make_SingleSwitchProgram<CurryHunter>());
+    ret.emplace_back(make_SingleSwitchProgram<ShinyHuntAutonomousRegi>());
+    ret.emplace_back(make_SingleSwitchProgram<ShinyHuntAutonomousSwordsOfJustice>());
+    ret.emplace_back(make_SingleSwitchProgram<ShinyHuntAutonomousStrongSpawn>());
+    ret.emplace_back(make_SingleSwitchProgram<ShinyHuntAutonomousRegigigas2>());
+    ret.emplace_back(make_SingleSwitchProgram<ShinyHuntAutonomousIoATrade>());
+    ret.emplace_back(make_SingleSwitchProgram<ShinyHuntAutonomousBerryTree>());
+    ret.emplace_back(make_SingleSwitchProgram<ShinyHuntAutonomousWhistling>());
+    ret.emplace_back(make_SingleSwitchProgram<ShinyHuntAutonomousFishing>());
+    ret.emplace_back(make_SingleSwitchProgram<ShinyHuntAutonomousOverworld>());
+
+    ret.emplace_back("---- RNG ----");
+    ret.emplace_back(make_SingleSwitchProgram<SeedFinder>());
+    ret.emplace_back(make_SingleSwitchProgram<CramomaticRNG>());
+
+    ret.emplace_back("---- Multi-Switch Programs ----");
+    ret.emplace_back(make_MultiSwitchProgram<SynchronizedSpinning>());
+    ret.emplace_back(make_MultiSwitchProgram<RaidItemFarmerOHKO>());
+
+    ret.emplace_back("---- Auto Max Lair 2.0 ----");
+    ret.emplace_back(make_MultiSwitchProgram<MaxLairStandard>());
+    ret.emplace_back(make_MultiSwitchProgram<MaxLairStrongBoss>());
+    ret.emplace_back(make_MultiSwitchProgram<MaxLairBossFinder>());
+
+//    ret.emplace_back("---- Public Betas ----");
+
+#if 1
+    ret.emplace_back("---- Deprecated Programs ----");
+    ret.emplace_back(make_SingleSwitchProgram<TradeBot>());
+#endif
+
+    if (STATIC_GLOBALS.DEVELOPER_MODE){
+        ret.emplace_back("---- Untested/Beta/WIP ----");
+    }
+    if (STATIC_GLOBALS.DEVELOPER_MODE){
+        ret.emplace_back("---- Developer Tools ----");
+        ret.emplace_back(make_SingleSwitchProgram<ShinyEncounterTester>());
+        ret.emplace_back(make_SingleSwitchProgram<GenerateIVCheckerOCR>());
+        ret.emplace_back(make_SingleSwitchProgram<GenerateNameOCRDataPokedex>());
+        ret.emplace_back(make_SingleSwitchProgram<GeneratePokedexSprites>());
+    }
+
+    return ret;
+}
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/PokemonSwSh_Panels.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/PokemonSwSh_Panels.h
new file mode 100644
index 0000000000..a935e18ad0
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/PokemonSwSh_Panels.h
@@ -0,0 +1,30 @@
+/*  Pokemon Sword/Shield Panels
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwordShieldPanels_H
+#define PokemonAutomation_PokemonSwordShieldPanels_H
+
+#include "CommonFramework/Panels/PanelList.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+
+class PanelListFactory : public PanelListDescriptor{
+public:
+    PanelListFactory();
+private:
+    virtual std::vector<PanelEntry> make_panels() const override;
+};
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/PokemonSwSh_Settings.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/PokemonSwSh_Settings.cpp
new file mode 100644
index 0000000000..530923816e
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/PokemonSwSh_Settings.cpp
@@ -0,0 +1,312 @@
+/*  Pokemon Sword/Shield Settings
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+#include "Pokemon/Pokemon_Strings.h"
+#include "PokemonSwSh_Settings.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+    using namespace Pokemon;
+
+
+
+GameSettings& GameSettings::instance(){
+    static GameSettings settings;
+    return settings;
+}
+GameSettings::GameSettings()
+    : BatchOption(LockMode::LOCK_WHILE_RUNNING)
+    , m_egg_options("<font size=4><b>Egg Options:</b></font>")
+    , AUTO_DEPOSIT(
+        "<b>Auto-Deposit:</b><br>true = Send " + STRING_POKEMON + " to boxes is \"Automatic\".<br>false = Send " + STRING_POKEMON + " to boxes is \"Manual\".",
+        LockMode::LOCK_WHILE_RUNNING,
+        true
+    )
+    , EGG_FETCH_EXTRA_LINE(
+        "<b>Egg Fetch Extra Line:</b><br>true = The daycare lady has an extra line of text in Japanese. Set this to true if you are running any of the egg programs in a Japanese game.",
+        LockMode::LOCK_WHILE_RUNNING,
+        false
+    )
+    , FETCH_EGG_MASH_DELAY0(
+        "<b>Fetch Egg Mash Delay:</b><br>Time needed to mash B to fetch an egg and return to overworld when auto-deposit is on.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "6400 ms"
+    )
+    , m_den_options("<font size=4><b>Den Options:</b></font>")
+    , DODGE_UNCATCHABLE_PROMPT_FAST(
+        "<b>Dodge Uncatchable Prompt Fast:</b><br>Which method to use to bypass the uncatchable " + STRING_POKEMON + " prompt?<br>true = Use a fast (but potentially unreliable) method.<br>false = Use a slower (by about 5 seconds) method.",
+        LockMode::LOCK_WHILE_RUNNING,
+        false
+    )
+    , m_advanced_options("<font size=5><b>Advanced Options:</b></font> You shouldn't need to touch anything below here.")
+    , m_general_options("<font size=4><b>General Timings:</b></font>")
+    , AUTO_FR_DURATION0(
+        "<b>Auto-FR Duration:</b><br>Time to accept FRs before returning to den lobby.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "8000 ms"
+    )
+    , m_menu_navigation("<font size=4><b>Menu Navigation Timings:</b></font>")
+    , OVERWORLD_TO_MENU_DELAY0(
+        "<b>Overworld to Menu Delay:</b><br>Delay to bring up the menu when pressing X in the overworld.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "960 ms"
+    )
+    , MENU_TO_OVERWORLD_DELAY0(
+        "<b>Menu to Overworld Delay:</b><br>Delay to go from menu back to overworld.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "2000 ms"
+    )
+    , GAME_TO_HOME_DELAY_FAST0(
+        "<b>Game to Home Delay (fast):</b><br>"
+        "Delay from pressing home to entering the the Switch home menu. This affects the speed of date-spamming programs.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "800 ms"
+    )
+    , GAME_TO_HOME_DELAY_SAFE0(
+        "<b>Game to Home Delay (safe):</b><br>"
+        "Delay from pressing home to entering the the Switch home menu. This affects the speed of date-spamming programs.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "1000 ms"
+    )
+    , HOME_TO_GAME_DELAY0(
+        "<b>Home to Game Delay:</b><br>Delay to enter game from home menu.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "3000 ms"
+    )
+    , OPEN_YCOMM_DELAY0(
+        "<b>Open Y-COMM Delay:</b><br>Time needed to open Y-COMM.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "1600 ms"
+    )
+    , ENTER_PROFILE_DELAY0(
+        "<b>Enter Profile Delay:</b><br>Delay to enter your Switch profile.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "2000 ms"
+    )
+    , m_start_game_timings("<font size=4><b>Start Game Timings:</b></font>")
+    , START_GAME_WAIT0(
+        "<b>Start Game Wait:</b><br>Wait this long for the game to load.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "20000 ms"
+    )
+    , ENTER_GAME_MASH0(
+        "<b>Enter Game Mash:</b><br>Mash A for this long to enter the game.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "3000 ms"
+    )
+    , ENTER_GAME_WAIT0(
+        "<b>Enter Game Wait:</b><br>Wait this long for the game to enter the overworld.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "11000 ms"
+    )
+    , m_den_timings("<font size=4><b>Den Timings:</b></font>")
+    , ENTER_OFFLINE_DEN_DELAY0(
+        "<b>Enter Offline Game Delay:</b><br>Time needed to enter a den on final button press.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "1000 ms"
+    )
+    , REENTER_DEN_DELAY0(
+        "<b>Re-enter Den Delay:</b><br>Time from exiting den after a day-skip to when you can collect watts and re-enter it.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "5000 ms"
+    )
+    , COLLECT_WATTS_OFFLINE_DELAY0(
+        "<b>Collect Watts Delay (offline):</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        "640 ms"
+    )
+    , COLLECT_WATTS_ONLINE_DELAY0(
+        "<b>Collect Watts Delay (online):</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        "3000 ms"
+    )
+    , UNCATCHABLE_PROMPT_DELAY0(
+        "<b>Uncatchable Prompt Delay:</b><br>Time needed to bypass uncatchable pokemon prompt.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "880 ms"
+    )
+    , OPEN_LOCAL_DEN_LOBBY_DELAY0(
+        "<b>Open Local Den Lobby Delay:</b><br>Time needed to open a den lobby on local connection.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "3000 ms"
+    )
+    , ENTER_SWITCH_POKEMON0(
+        "<b>Enter Switch " + STRING_POKEMON + ":</b><br>Time needed to enter Switch " + STRING_POKEMON + ".",
+        LockMode::LOCK_WHILE_RUNNING,
+        "4000 ms"
+    )
+    , EXIT_SWITCH_POKEMON0(
+        "<b>Exit Switch " + STRING_POKEMON + ":</b><br>Time needed to exit Switch " + STRING_POKEMON + " back to den lobby.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "3000 ms"
+    )
+    , FULL_LOBBY_TIMER0(
+        "<b>Full Lobby Timer:</b><br>Always 3 minutes.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "180 s"
+    )
+    , m_box_timings("<font size=4><b>Box Timings:</b></font> (for egg programs)")
+//    , BOX_SCROLL_DELAY1(
+//        "<b>Box Scroll Delay:</b><br>Delay to move the cursor.",
+//        LockMode::LOCK_WHILE_RUNNING,
+//        "200 ms"
+//    )
+    , BOX_CHANGE_DELAY0(
+        "<b>Box Change Delay:</b><br>Delay to change boxes.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "640 ms"
+    )
+    , BOX_PICKUP_DROP_DELAY0(
+        "<b>Box Pickup/Drop Delay:</b><br>Delay to pickup/drop " + STRING_POKEMON + ".",
+        LockMode::LOCK_WHILE_RUNNING,
+        "720 ms"
+    )
+    , MENU_TO_POKEMON_DELAY0(
+        "<b>Menu To " + STRING_POKEMON + " Delay:</b><br>Delay to enter " + STRING_POKEMON + " menu.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "2400 ms"
+    )
+    , POKEMON_TO_BOX_DELAY0(
+        "<b>" + STRING_POKEMON + " to Box Delay:</b><br>Delay to enter box system.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "2400 ms"
+    )
+    , BOX_TO_POKEMON_DELAY0(
+        "<b>Box to " + STRING_POKEMON + " Delay:</b><br>Delay to exit box system.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "2000 ms"
+    )
+    , POKEMON_TO_MENU_DELAY0(
+        "<b>" + STRING_POKEMON + " to Menu Delay:</b><br>Delay to return to menu.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "2000 ms"
+    )
+    , m_shiny_detection("<font size=4><b>Shiny Detection:</b></font>")
+    , SHINY_ALPHA_THRESHOLD(
+        "<b>Shiny Threshold:</b><br>Threshold to detect a shiny encounter.",
+        LockMode::LOCK_WHILE_RUNNING,
+        2.0, 0
+    )
+    , BALL_SPARKLE_ALPHA(
+        "<b>Ball Sparkle Alpha:</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        0.4, 0
+    )
+    , STAR_SPARKLE_ALPHA(
+        "<b>Star Sparkle Alpha:</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        0.5, 0
+    )
+    , SQUARE_SPARKLE_ALPHA(
+        "<b>Ball Sparkle Alpha:</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        0.3, 0
+    )
+    , LINE_SPARKLE_ALPHA(
+        "<b>Line Sparkle Alpha:</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        0.3, 0
+    )
+    , SHINY_DIALOG_ALPHA0(
+        "<b>Shiny Dialog Alpha:</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        1.0, 0
+    )
+//    , m_experimental("<font size=4><b>Experimental/Beta Features:</b></font>")
+{
+    PA_ADD_STATIC(m_egg_options);
+    PA_ADD_OPTION(AUTO_DEPOSIT);
+    PA_ADD_OPTION(EGG_FETCH_EXTRA_LINE);
+    PA_ADD_OPTION(FETCH_EGG_MASH_DELAY0);
+
+    PA_ADD_STATIC(m_den_options);
+    PA_ADD_OPTION(DODGE_UNCATCHABLE_PROMPT_FAST);
+
+    PA_ADD_STATIC(m_advanced_options);
+
+    PA_ADD_STATIC(m_general_options);
+    PA_ADD_OPTION(AUTO_FR_DURATION0);
+
+    PA_ADD_STATIC(m_menu_navigation);
+    PA_ADD_OPTION(OVERWORLD_TO_MENU_DELAY0);
+    PA_ADD_OPTION(MENU_TO_OVERWORLD_DELAY0);
+    PA_ADD_OPTION(GAME_TO_HOME_DELAY_FAST0);
+    PA_ADD_OPTION(GAME_TO_HOME_DELAY_SAFE0);
+    PA_ADD_OPTION(HOME_TO_GAME_DELAY0);
+    PA_ADD_OPTION(OPEN_YCOMM_DELAY0);
+    PA_ADD_OPTION(ENTER_PROFILE_DELAY0);
+
+    PA_ADD_STATIC(m_start_game_timings);
+    PA_ADD_OPTION(START_GAME_WAIT0);
+    PA_ADD_OPTION(ENTER_GAME_MASH0);
+    PA_ADD_OPTION(ENTER_GAME_WAIT0);
+
+    PA_ADD_STATIC(m_den_timings);
+    PA_ADD_OPTION(ENTER_OFFLINE_DEN_DELAY0);
+    PA_ADD_OPTION(REENTER_DEN_DELAY0);
+    PA_ADD_OPTION(COLLECT_WATTS_OFFLINE_DELAY0);
+    PA_ADD_OPTION(COLLECT_WATTS_ONLINE_DELAY0);
+    PA_ADD_OPTION(UNCATCHABLE_PROMPT_DELAY0);
+    PA_ADD_OPTION(OPEN_LOCAL_DEN_LOBBY_DELAY0);
+    PA_ADD_OPTION(ENTER_SWITCH_POKEMON0);
+    PA_ADD_OPTION(EXIT_SWITCH_POKEMON0);
+    PA_ADD_OPTION(FULL_LOBBY_TIMER0);
+
+    PA_ADD_STATIC(m_box_timings);
+//    PA_ADD_OPTION(BOX_SCROLL_DELAY1);
+    PA_ADD_OPTION(BOX_CHANGE_DELAY0);
+    PA_ADD_OPTION(BOX_PICKUP_DROP_DELAY0);
+    PA_ADD_OPTION(MENU_TO_POKEMON_DELAY0);
+    PA_ADD_OPTION(POKEMON_TO_BOX_DELAY0);
+    PA_ADD_OPTION(BOX_TO_POKEMON_DELAY0);
+    PA_ADD_OPTION(POKEMON_TO_MENU_DELAY0);
+
+    PA_ADD_STATIC(m_shiny_detection);
+    PA_ADD_OPTION(SHINY_ALPHA_THRESHOLD);
+    PA_ADD_OPTION(BALL_SPARKLE_ALPHA);
+    PA_ADD_OPTION(STAR_SPARKLE_ALPHA);
+    PA_ADD_OPTION(SQUARE_SPARKLE_ALPHA);
+    PA_ADD_OPTION(LINE_SPARKLE_ALPHA);
+    PA_ADD_OPTION(SHINY_DIALOG_ALPHA0);
+
+//    PA_ADD_STATIC(m_experimental);
+}
+
+
+
+
+
+GameSettings_Descriptor::GameSettings_Descriptor()
+    : OptionsPanelDescriptor(
+        "PokemonSwSh:GlobalSettings",
+        STRING_POKEMON + " SwSh", "Game Settings",
+        "Programs/PokemonSwSh/PokemonSettings.html",
+        "Global " + STRING_POKEMON + " Sword and Shield Settings",
+        PanelQualityStanding::OFFICIAL
+    )
+{}
+
+
+
+GameSettingsPanel::GameSettingsPanel()
+    : settings(GameSettings::instance())
+{
+    PA_ADD_OPTION(settings);
+}
+
+
+
+
+
+}
+}
+}
+
+
+
+
+
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/PokemonSwSh_Settings.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/PokemonSwSh_Settings.h
new file mode 100644
index 0000000000..39515ea1f5
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/PokemonSwSh_Settings.h
@@ -0,0 +1,105 @@
+/*  Pokemon Sword/Shield Settings
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_Settings_H
+#define PokemonAutomation_PokemonSwSh_Settings_H
+
+#include "Common/Cpp/Options/StaticTextOption.h"
+#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "Common/Cpp/Options/FloatingPointOption.h"
+#include "Common/Cpp/Options/TimeDurationOption.h"
+#include "CommonFramework/Panels/OptionsPanel.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+class GameSettings : public BatchOption{
+    GameSettings();
+public:
+    static GameSettings& instance();
+
+    SectionDividerOption m_egg_options;
+    BooleanCheckBoxOption AUTO_DEPOSIT;
+    BooleanCheckBoxOption EGG_FETCH_EXTRA_LINE;
+    MillisecondsOption FETCH_EGG_MASH_DELAY0;
+
+    SectionDividerOption m_den_options;
+    BooleanCheckBoxOption DODGE_UNCATCHABLE_PROMPT_FAST;
+
+    SectionDividerOption m_advanced_options;
+
+    SectionDividerOption m_general_options;
+    MillisecondsOption AUTO_FR_DURATION0;
+
+    SectionDividerOption m_menu_navigation;
+    MillisecondsOption OVERWORLD_TO_MENU_DELAY0;
+    MillisecondsOption MENU_TO_OVERWORLD_DELAY0;
+    MillisecondsOption GAME_TO_HOME_DELAY_FAST0;
+    MillisecondsOption GAME_TO_HOME_DELAY_SAFE0;
+    MillisecondsOption HOME_TO_GAME_DELAY0;
+    MillisecondsOption OPEN_YCOMM_DELAY0;
+    MillisecondsOption ENTER_PROFILE_DELAY0;
+
+    SectionDividerOption m_start_game_timings;
+    MillisecondsOption START_GAME_WAIT0;
+    MillisecondsOption ENTER_GAME_MASH0;
+    MillisecondsOption ENTER_GAME_WAIT0;
+
+    SectionDividerOption m_den_timings;
+    MillisecondsOption ENTER_OFFLINE_DEN_DELAY0;
+    MillisecondsOption REENTER_DEN_DELAY0;
+    MillisecondsOption COLLECT_WATTS_OFFLINE_DELAY0;
+    MillisecondsOption COLLECT_WATTS_ONLINE_DELAY0;
+    MillisecondsOption UNCATCHABLE_PROMPT_DELAY0;
+    MillisecondsOption OPEN_LOCAL_DEN_LOBBY_DELAY0;
+    MillisecondsOption ENTER_SWITCH_POKEMON0;
+    MillisecondsOption EXIT_SWITCH_POKEMON0;
+    MillisecondsOption FULL_LOBBY_TIMER0;
+
+    SectionDividerOption m_box_timings;
+//    MillisecondsOption BOX_SCROLL_DELAY1;
+    MillisecondsOption BOX_CHANGE_DELAY0;
+    MillisecondsOption BOX_PICKUP_DROP_DELAY0;
+    MillisecondsOption MENU_TO_POKEMON_DELAY0;
+    MillisecondsOption POKEMON_TO_BOX_DELAY0;
+    MillisecondsOption BOX_TO_POKEMON_DELAY0;
+    MillisecondsOption POKEMON_TO_MENU_DELAY0;
+
+    SectionDividerOption m_shiny_detection;
+    FloatingPointOption SHINY_ALPHA_THRESHOLD;
+
+    FloatingPointOption BALL_SPARKLE_ALPHA;
+    FloatingPointOption STAR_SPARKLE_ALPHA;
+    FloatingPointOption SQUARE_SPARKLE_ALPHA;
+    FloatingPointOption LINE_SPARKLE_ALPHA;
+
+    FloatingPointOption SHINY_DIALOG_ALPHA0;
+};
+
+
+
+
+class GameSettings_Descriptor : public OptionsPanelDescriptor{
+public:
+    GameSettings_Descriptor();
+};
+
+
+class GameSettingsPanel : public OptionsPanelInstance{
+public:
+    using Descriptor = GameSettings_Descriptor;
+    GameSettingsPanel();
+private:
+    GameSettings& settings;
+};
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/PokemonSwSh_Tests.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/PokemonSwSh_Tests.cpp
new file mode 100644
index 0000000000..a6190002a1
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/PokemonSwSh_Tests.cpp
@@ -0,0 +1,41 @@
+/*  Pokemon Sword/Shield Tests
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/TestRunners/UnitTestDatabase.h"
+#include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_DialogBoxDetector.h"
+#include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_DialogTriangleDetector.h"
+#include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_BoxGenderDetector.h"
+#include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_BoxShinySymbolDetector.h"
+#include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_MainMenuDetector.h"
+#include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_YCommDetector.h"
+#include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_SelectionArrowFinder.h"
+#include "VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_State_Tests.h"
+#include "VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_BattleMenu.h"
+#include "PokemonSwSh_Tests.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+
+void add_tests(UnitTestDatabase& database){
+    NintendoSwitch::PokemonSwSh::add_tests_DialogBoxDetector(database);
+    NintendoSwitch::PokemonSwSh::add_tests_DialogTriangleDetector(database);
+    NintendoSwitch::PokemonSwSh::add_tests_BoxGenderDetector(database);
+    NintendoSwitch::PokemonSwSh::add_tests_BoxShinySymbolDetector(database);
+    NintendoSwitch::PokemonSwSh::add_tests_PartyMenuDetector(database);
+    NintendoSwitch::PokemonSwSh::add_tests_YCommDetector(database);
+    NintendoSwitch::PokemonSwSh::add_tests_SelectionArrowFinder(database);
+    NintendoSwitch::PokemonSwSh::MaxLairInternal::add_tests_MaxLairBattleMenuDetector(database);
+    NintendoSwitch::PokemonSwSh::MaxLairInternal::add_tests_MaxLairBossState(database);
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/PokemonSwSh_Tests.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/PokemonSwSh_Tests.h
new file mode 100644
index 0000000000..6dda3d886f
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/PokemonSwSh_Tests.h
@@ -0,0 +1,25 @@
+/*  Pokemon Sword/Shield Tests
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_Tests_H
+#define PokemonAutomation_PokemonSwSh_Tests_H
+
+#include "Common/Cpp/TestRunners/UnitTest.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+
+void add_tests(UnitTestDatabase& database);
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-BerryFarmer.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-BerryFarmer.cpp
new file mode 100644
index 0000000000..9837089f98
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-BerryFarmer.cpp
@@ -0,0 +1,109 @@
+/*  Berry Farmer
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/PrettyPrint.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonSwSh/PokemonSwSh_Settings.h"
+#include "VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.h"
+#include "PokemonSwSh_DateSpam-BerryFarmer.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+    using namespace Pokemon;
+
+
+BerryFarmer_Descriptor::BerryFarmer_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonSwSh:BerryFarmer",
+        STRING_POKEMON + " SwSh", "Date Spam - Berry Farmer",
+        "Programs/PokemonSwSh/DateSpam-BerryFarmer.html",
+        "Farm berries.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_PerformanceClassSensitive,
+        FeedbackType::NONE,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+
+
+BerryFarmer::BerryFarmer()
+    : SKIPS(
+        "<b>Number of Fetch Attempts:</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        100000
+    )
+    , SAVE_ITERATIONS0(
+        "<b>Save Every this Many Fetches:</b><br>(zero disables saving): ",
+        LockMode::LOCK_WHILE_RUNNING,
+        100
+    )
+    , NOTIFICATIONS({
+        &NOTIFICATION_PROGRAM_FINISH,
+    })
+{
+    PA_ADD_OPTION(START_LOCATION);
+    PA_ADD_OPTION(SKIPS);
+    PA_ADD_OPTION(SAVE_ITERATIONS0);
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+void BerryFarmer::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    if (START_LOCATION.start_in_grip_menu()){
+        grip_menu_connect_go_home(context);
+    }else{
+        //  Connect the controller.
+        require_player(env.console, context, BUTTON_B);
+        ssf_press_button(context, BUTTON_HOME, GameSettings::instance().GAME_TO_HOME_DELAY_FAST0, 160ms);
+    }
+
+    uint8_t year = MAX_YEAR;
+    uint16_t save_count = 0;
+    for (uint32_t c = 0; c < SKIPS; c++){
+        env.log("Fetch Attempts: " + tostr_u_commas(c));
+
+        home_roll_date_enter_game_autorollback(env.console, context, year);
+        if (context->performance_class() == ControllerPerformanceClass::SysbotBase){
+            pbf_wait(context, 720ms);
+        }else{
+            pbf_mash_button(context, BUTTON_B, 720ms);
+        }
+
+        pbf_press_button(context, BUTTON_A, 80ms, 80ms);
+        pbf_mash_button(context, BUTTON_ZL, 3080ms);
+        pbf_mash_button(context, BUTTON_B, 4800ms);
+
+        if (SAVE_ITERATIONS0 != 0){
+            save_count++;
+            if (save_count >= SAVE_ITERATIONS0){
+                save_count = 0;
+                pbf_mash_button(context, BUTTON_B, 2000ms);
+                pbf_press_button(context, BUTTON_X, 160ms, GameSettings::instance().OVERWORLD_TO_MENU_DELAY0);
+                pbf_press_button(context, BUTTON_R, 160ms, 2000ms);
+                pbf_press_button(context, BUTTON_ZL, 160ms, 3000ms);
+            }
+        }
+
+        //  Tap HOME and quickly spam B. The B spamming ensures that we don't
+        //  accidentally update the system if the system update window pops up.
+        ssf_press_button(context, BUTTON_HOME, 120ms, 160ms);
+        pbf_mash_button(context, BUTTON_B, GameSettings::instance().GAME_TO_HOME_DELAY_FAST0.get() - 120ms);
+    }
+
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+}
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-BerryFarmer.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-BerryFarmer.h
new file mode 100644
index 0000000000..eeb73bc914
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-BerryFarmer.h
@@ -0,0 +1,50 @@
+/*  Berry Farmer
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_BerryFarmer_H
+#define PokemonAutomation_PokemonSwSh_BerryFarmer_H
+
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+class BerryFarmer_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    BerryFarmer_Descriptor();
+};
+
+
+
+class BerryFarmer : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = BerryFarmer_Descriptor;
+    BerryFarmer();
+
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    StartInGripOrGameOption START_LOCATION;
+
+    SimpleIntegerOption<uint32_t> SKIPS;
+    SimpleIntegerOption<uint16_t> SAVE_ITERATIONS0;
+
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+
+}
+}
+}
+#endif
+
+
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-BerryFarmer2.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-BerryFarmer2.cpp
new file mode 100644
index 0000000000..a9a09c047b
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-BerryFarmer2.cpp
@@ -0,0 +1,360 @@
+/*  Berry Farmer 2
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/PrettyPrint.h"
+#include "Common/Cpp/Time.h"
+#include "Common/Cpp/ColoredText.h"
+#include "CommonFramework/Exceptions/ProgramFinishedException.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "VideoGames/PokemonSwSh/PokemonSwSh_Settings.h"
+#include "VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.h"
+#include "VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleMenuDetector.h"
+#include "VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_StartBattleDetector.h"
+#include "VideoGames/PokemonSwSh/Inference/Sounds/PokemonSwSh_BerryTreeRustlingSoundDetector.h"
+#include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_EncounterHandler.h"
+#include "PokemonSwSh_DateSpam-BerryFarmer2.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+    using namespace Pokemon;
+
+
+BerryFarmer2_Descriptor::BerryFarmer2_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonSwSh:BerryFarmer2",
+        STRING_POKEMON + " SwSh", "Date Spam - Berry Farmer 2",
+        "Programs/PokemonSwSh/DateSpam-BerryFarmer2.html",
+        "Farm berries using Feedback.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_PerformanceClassSensitive,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+class BerryFarmer2_Descriptor::Stats : public ShinyHuntTracker{
+public:
+    Stats()
+        : ShinyHuntTracker(true)
+        , days(m_stats["Days"])
+        , shakes(m_stats["Shakes"])
+    {
+        m_display_order.insert(m_display_order.begin() + 0, Stat("Days"));
+        m_display_order.insert(m_display_order.begin() + 1, Stat("Shakes"));
+    }
+
+public:
+    std::atomic<uint64_t>& days;
+    std::atomic<uint64_t>& shakes;
+};
+std::unique_ptr<StatsTracker> BerryFarmer2_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+
+
+BerryFarmer2::BerryFarmer2()
+    : REQUIRES_AUDIO(
+        html_color_text(
+            "<font size=4><b>Rustling detection uses sound. Make sure you have the correct audio input set.</b></font>",
+            COLOR_BLUE
+        )
+    )
+    , FETCH_ATTEMPTS(
+        "<b>Number of Fetch Attempts:</b>",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        100000
+    )
+    , SAVE_ITERATIONS0(
+        "<b>Save Every this Many Fetches:</b><br>(zero disables saving): ",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        100
+    )
+    , ENCOUNTER_BOT_OPTIONS(false, true)
+    , NOTIFICATIONS({
+        &ENCOUNTER_BOT_OPTIONS.NOTIFICATION_NONSHINY,
+        &ENCOUNTER_BOT_OPTIONS.NOTIFICATION_SHINY,
+        &ENCOUNTER_BOT_OPTIONS.NOTIFICATION_CATCH_SUCCESS,
+        &ENCOUNTER_BOT_OPTIONS.NOTIFICATION_CATCH_FAILED,
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+    , m_advanced_options(
+        "<font size=4><b>Advanced Options:</b> You should not need to touch anything below here.</font>"
+    )
+    , EXIT_BATTLE_TIMEOUT0(
+        "<b>Exit Battle Timeout:</b><br>After running, wait this long to return to overworld.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        "10 s"
+    )
+//    , START_BATTLE_TIMEOUT(
+//        "<b>Start Battle Timeout:</b><br>After a battle is detected, wait this long to flee in seconds.",
+//        LockMode::LOCK_WHILE_RUNNING,
+//        15
+//    )
+    , RUSTLING_INTERVAL(
+        "<b>Rustling Interval:</b><br>How much time between two rustling sounds has to pass to be considered slow rustling in ms.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        1350
+    )
+    , RUSTLING_TIMEOUT0(
+        "<b>Rustling Timeout:</b><br>Wait this many ticks to detect rustling.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        "3200 ms"
+    )
+    , SECONDARY_ATTEMPT_MASH_TIME0(
+        "<b>Secondary attempt mash time:</b><br>Mash ZL this many ticks for secondary fetch attempts.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        "1920 ms"
+    )
+    , SOUND_THRESHOLD(
+        "<b>Maximum Sound Error Coefficient",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        0.75, 0, 1.0
+    )
+{
+    PA_ADD_OPTION(REQUIRES_AUDIO);
+    PA_ADD_OPTION(START_LOCATION);
+    PA_ADD_OPTION(FETCH_ATTEMPTS);
+    PA_ADD_OPTION(SAVE_ITERATIONS0);
+
+    PA_ADD_OPTION(LANGUAGE);
+    PA_ADD_OPTION(ENCOUNTER_BOT_OPTIONS);
+    PA_ADD_OPTION(NOTIFICATIONS);
+
+    PA_ADD_STATIC(m_advanced_options);
+    PA_ADD_OPTION(EXIT_BATTLE_TIMEOUT0);
+//    PA_ADD_OPTION(START_BATTLE_TIMEOUT);
+    PA_ADD_OPTION(RUSTLING_INTERVAL);
+    PA_ADD_OPTION(RUSTLING_TIMEOUT0);
+    PA_ADD_OPTION(SECONDARY_ATTEMPT_MASH_TIME0);
+    PA_ADD_OPTION(SOUND_THRESHOLD);
+}
+
+
+BerryFarmer2::Rustling BerryFarmer2::check_rustling(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    BerryFarmer2_Descriptor::Stats& stats = env.current_stats<BerryFarmer2_Descriptor::Stats>();
+
+    // wait some time in order to not detect rustling from previous fetch attempt
+    pbf_wait(context, 640ms);
+    context.wait_for_all_requests();
+
+    BerryTreeRustlingSoundDetector initial_rustling_detector(
+        env.console, [&](float error_coefficient) -> bool {
+            //  Warning: This callback will be run from a different thread than this function.
+            return true;
+        },
+        (float)SOUND_THRESHOLD
+    );
+
+    BerryTreeRustlingSoundDetector secondary_rustling_detector(
+        env.console, [&](float error_coefficient) -> bool {
+            //  Warning: This callback will be run from a different thread than this function.
+            return true;
+        },
+        (float)SOUND_THRESHOLD
+    );
+
+    StandardBattleMenuWatcher battle_menu_detector(false);
+    StartBattleWatcher start_battle_detector;
+
+    Rustling result = Rustling::No;
+    int ret = run_until<ProControllerContext>(
+        env.console, context,
+        [&](ProControllerContext& context){
+            pbf_wait(context, RUSTLING_TIMEOUT0);
+            context.wait_for_all_requests();
+        },
+        { {initial_rustling_detector}, {battle_menu_detector}, {start_battle_detector} }
+    );
+    switch (ret){
+    case 0:{
+        env.console.log("BerryFarmer: Initial Rustling detected.");
+        WallClock initial_rustling_time = current_time();
+        result = Rustling::Slow;
+
+        int ret1 = run_until<ProControllerContext>(
+            env.console, context,
+            [&](ProControllerContext& context){
+                pbf_wait(context, RUSTLING_TIMEOUT0);
+                context.wait_for_all_requests();
+            },
+            { {secondary_rustling_detector} }
+        );
+
+        if (ret1 == 0){
+            env.console.log("BerryFarmer: Secondary Rustling detected.");
+            WallClock secondary_rustling_time = current_time();
+            if (std::chrono::duration_cast<Milliseconds>(secondary_rustling_time - initial_rustling_time).count() <= RUSTLING_INTERVAL){
+                result = Rustling::Fast;
+            }
+        }
+        break;
+    }
+    case 1:
+        env.log("Unexpected battle menu.", COLOR_RED);
+        stats.add_error();
+        env.update_stats();
+        pbf_mash_button(context, BUTTON_B, 1000ms);
+        run_away(env.console, context, EXIT_BATTLE_TIMEOUT0);
+        result = Rustling::Battle;
+        break;
+    case 2:{
+        env.console.log("BerryFarmer: Battle Start detected.");
+//        wait_until(env.console, context, std::chrono::seconds(START_BATTLE_TIMEOUT), { battle_menu_detector });
+
+        //  Detect shiny.
+        ShinyDetectionResult encounter_result = detect_shiny_battle(
+            env.console, context,
+            SHINY_BATTLE_REGULAR,
+            std::chrono::seconds(30)
+        );
+
+        StandardEncounterHandler handler(
+            env, env.console, context,
+            LANGUAGE,
+            ENCOUNTER_BOT_OPTIONS,
+            stats
+        );
+
+        bool stop = handler.handle_standard_encounter_end_battle(encounter_result, EXIT_BATTLE_TIMEOUT0);
+        if (stop){
+            throw ProgramFinishedException();
+        }
+
+        result = Rustling::Battle;
+        break;
+    }
+    default:
+        result = Rustling::No;
+    }
+        
+    context.wait_for_all_requests();
+    return result;
+}
+
+uint16_t BerryFarmer2::do_secondary_attempts(SingleSwitchProgramEnvironment& env, ProControllerContext& context, Rustling rustling){
+    BerryFarmer2_Descriptor::Stats& stats = env.current_stats<BerryFarmer2_Descriptor::Stats>();
+
+    uint8_t no_rustling = (rustling == Rustling::No) ? 1 : 0;
+    Rustling current_rustling = rustling;
+    uint16_t attempts = 0;
+
+    while ((current_rustling == Rustling::Slow || current_rustling == Rustling::No) && no_rustling < 3){
+        /* Slow or No rustling, not in Battle! */
+        pbf_mash_button(context, BUTTON_ZL, 1920ms);
+        pbf_mash_button(context, BUTTON_B, 80ms);
+        attempts++;
+        stats.shakes++;
+
+        current_rustling = check_rustling(env, context);
+
+        if (current_rustling == Rustling::No){
+            no_rustling++;
+        }
+    }
+    /* Fast rustling, in Battle or too many times No rustling */
+    if (no_rustling >= 3){
+        return attempts;
+    }
+    if (current_rustling == Rustling::Fast){
+        // this is the last tree interaction for this time skip
+        pbf_mash_button(context, BUTTON_ZL, SECONDARY_ATTEMPT_MASH_TIME0);
+        pbf_mash_button(context, BUTTON_B, 80ms);
+        attempts++;
+        stats.shakes++;
+        current_rustling = check_rustling(env, context);
+    }
+    if (current_rustling == Rustling::Battle){
+        pbf_mash_button(context, BUTTON_B, 1000ms);
+        env.console.log("Clearing dialog boxes...");
+//        run_away(env.console, context, EXIT_BATTLE_TIMEOUT);
+//        context.wait_for_all_requests();
+    }
+    return attempts;
+}
+
+void BerryFarmer2::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    if (START_LOCATION.start_in_grip_menu()){
+        grip_menu_connect_go_home(context);
+    }else{
+        //  Connect the controller.
+        require_player(env.console, context, BUTTON_B);
+        ssf_press_button(context, BUTTON_HOME, GameSettings::instance().GAME_TO_HOME_DELAY_FAST0, 160ms);
+    }
+
+    BerryFarmer2_Descriptor::Stats& stats = env.current_stats<BerryFarmer2_Descriptor::Stats>();
+
+    uint8_t year = MAX_YEAR;
+    uint16_t save_count = 0;
+    uint32_t c = 0;
+    while (c < FETCH_ATTEMPTS){
+        env.update_stats();
+        uint16_t iteration_attempts = 1;
+        env.log("Fetch Attempts: " + tostr_u_commas(c));
+        
+        home_roll_date_enter_game_autorollback(env.console, context, year);
+        stats.days++;
+        // Interact with the tree
+        pbf_mash_button(context, BUTTON_ZL, 3000ms);
+        pbf_mash_button(context, BUTTON_B, 80ms);
+        stats.shakes++;
+
+        // Rustling after the first fetch attempt
+        Rustling current_rustling = check_rustling(env, context);
+        
+        switch (current_rustling){
+        case Rustling::Battle:
+            pbf_mash_button(context, BUTTON_B, 1000ms);
+            run_away(env.console, context, EXIT_BATTLE_TIMEOUT0);
+            break;
+        case Rustling::Fast:
+            // Do nothing -> stop current tree session
+            break;
+        case Rustling::No:
+        case Rustling::Slow:
+            iteration_attempts += do_secondary_attempts(env, context, current_rustling);
+            break;
+        }
+
+        // end tree session
+        pbf_mash_button(context, BUTTON_B, iteration_attempts > 1 ? 6400ms : 4800ms);
+
+        c += iteration_attempts;
+
+        uint16_t save_iterations = SAVE_ITERATIONS0;
+        if (save_iterations != 0){
+            save_count += iteration_attempts;
+            if (save_count >= save_iterations){
+                save_count = 0;
+                pbf_mash_button(context, BUTTON_B, 2000ms);
+                pbf_press_button(context, BUTTON_X, 160ms, GameSettings::instance().OVERWORLD_TO_MENU_DELAY0);
+                pbf_press_button(context, BUTTON_R, 160ms, 2000ms);
+                pbf_press_button(context, BUTTON_ZL, 160ms, 3000ms);
+            }
+        }
+
+        // Tap HOME and quickly spam B. The B spamming ensures that we don't
+        // accidentally update the system if the system update window pops up.
+        ssf_press_button(context, BUTTON_HOME, 120ms, 160ms);
+        pbf_mash_button(context, BUTTON_B, GameSettings::instance().GAME_TO_HOME_DELAY_FAST0.get() - 120ms);
+    }
+    VideoSnapshot screen = env.console.video().snapshot();
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH, "", screen);
+}
+}
+
+
+
+}
+}
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-BerryFarmer2.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-BerryFarmer2.h
new file mode 100644
index 0000000000..8c304d94c8
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-BerryFarmer2.h
@@ -0,0 +1,83 @@
+/*  Berry Farmer 2
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_BerryFarmer2_H
+#define PokemonAutomation_PokemonSwSh_BerryFarmer2_H
+
+#include "Common/Cpp/Options/StaticTextOption.h"
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "Common/Cpp/Options/FloatingPointOption.h"
+#include "Common/Cpp/Options/TimeDurationOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h"
+#include "Pokemon/Options/Pokemon_EncounterBotOptions.h"
+#include "VideoGames/PokemonSwSh/Options/PokemonSwSh_EncounterBotCommon.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+using namespace Pokemon;
+
+
+class BerryFarmer2_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    BerryFarmer2_Descriptor();
+
+    class Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+
+
+class BerryFarmer2 : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = BerryFarmer2_Descriptor;
+    BerryFarmer2();
+
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+    enum Rustling{
+        No,
+        Slow,
+        Fast,
+        Battle
+    };
+
+private:
+    Rustling check_rustling(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+    uint16_t do_secondary_attempts(SingleSwitchProgramEnvironment& env, ProControllerContext& context, Rustling last_rustling);
+
+private:
+    StaticTextOption REQUIRES_AUDIO;
+    StartInGripOrGameOption START_LOCATION;
+
+    SimpleIntegerOption<uint32_t> FETCH_ATTEMPTS;
+    SimpleIntegerOption<uint16_t> SAVE_ITERATIONS0;
+
+    EncounterBotLanguage LANGUAGE;
+    EncounterBotCommonOptions ENCOUNTER_BOT_OPTIONS;
+
+    EventNotificationsOption NOTIFICATIONS;
+
+    SectionDividerOption m_advanced_options;
+    MillisecondsOption EXIT_BATTLE_TIMEOUT0;
+//    SimpleIntegerOption<uint16_t> START_BATTLE_TIMEOUT;
+    SimpleIntegerOption<uint16_t> RUSTLING_INTERVAL;
+    MillisecondsOption RUSTLING_TIMEOUT0;
+    MillisecondsOption SECONDARY_ATTEMPT_MASH_TIME0;
+    FloatingPointOption SOUND_THRESHOLD;
+};
+
+
+}
+}
+}
+#endif
+
+
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-DailyHighlightFarmer.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-DailyHighlightFarmer.cpp
new file mode 100644
index 0000000000..75753831d4
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-DailyHighlightFarmer.cpp
@@ -0,0 +1,109 @@
+/*  Daily Highlight Farmer
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/PrettyPrint.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonSwSh/PokemonSwSh_Settings.h"
+#include "VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.h"
+#include "PokemonSwSh_DateSpam-DailyHighlightFarmer.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+    using namespace Pokemon;
+
+
+DailyHighlightFarmer_Descriptor::DailyHighlightFarmer_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonSwSh:DailyHighlightFarmer",
+        STRING_POKEMON + " SwSh", "Date Spam - Daily Highlight Farmer",
+        "Programs/PokemonSwSh/DateSpam-DailyHighlightFarmer.html",
+        "Farm the daily highlight watt trader in Crown Tundra.",
+        PanelQualityStanding::OFFICIAL_BETA,
+        ProgramControllerClass::StandardController_PerformanceClassSensitive,
+        FeedbackType::NONE,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+
+
+DailyHighlightFarmer::DailyHighlightFarmer()
+    : SKIPS(
+        "<b>Number of Purchase Attempts:</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        100000
+    )
+    , SAVE_ITERATIONS0(
+        "<b>Save Every this Many Fetches:</b><br>(zero disables saving): ",
+        LockMode::LOCK_WHILE_RUNNING,
+        100
+    )
+    , NOTIFICATIONS({
+        &NOTIFICATION_PROGRAM_FINISH,
+    })
+{
+    PA_ADD_OPTION(START_LOCATION);
+    PA_ADD_OPTION(SKIPS);
+    PA_ADD_OPTION(SAVE_ITERATIONS0);
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+void DailyHighlightFarmer::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    if (START_LOCATION.start_in_grip_menu()){
+        grip_menu_connect_go_home(context);
+    }else{
+        //  Connect the controller.
+        require_player(env.console, context, BUTTON_B);
+        ssf_press_button(context, BUTTON_HOME, GameSettings::instance().GAME_TO_HOME_DELAY_FAST0, 160ms);
+    }
+
+    uint8_t year = MAX_YEAR;
+    uint16_t save_count = 0;
+    for (uint32_t c = 0; c < SKIPS; c++){
+        env.log("Fetch Attempts: " + tostr_u_commas(c));
+        home_roll_date_enter_game_autorollback(env.console, context, year);
+        if (context->performance_class() == ControllerPerformanceClass::SysbotBase){
+            pbf_wait(context, 720ms);
+        }else{
+            pbf_mash_button(context, BUTTON_B, 720ms);
+        }
+
+        pbf_press_button(context, BUTTON_A, 80ms, 880ms);
+        pbf_press_button(context, BUTTON_ZL, 80ms, 320ms);
+        pbf_press_dpad(context, DPAD_DOWN, 80ms, 80ms);
+        pbf_mash_button(context, BUTTON_ZL, 3200ms);
+        pbf_mash_button(context, BUTTON_B, 5600ms);
+
+        if (SAVE_ITERATIONS0 != 0){
+            save_count++;
+            if (save_count >= SAVE_ITERATIONS0){
+                save_count = 0;
+                pbf_mash_button(context, BUTTON_B, 2000ms);
+                pbf_press_button(context, BUTTON_X, 160ms, GameSettings::instance().OVERWORLD_TO_MENU_DELAY0);
+                pbf_press_button(context, BUTTON_R, 160ms, 2000ms);
+                pbf_press_button(context, BUTTON_ZL, 160ms, 3000ms);
+            }
+        }
+
+        //  Tap HOME and quickly spam B. The B spamming ensures that we don't
+        //  accidentally update the system if the system update window pops up.
+        ssf_press_button(context, BUTTON_HOME, 120ms, 160ms);
+        pbf_mash_button(context, BUTTON_B, GameSettings::instance().GAME_TO_HOME_DELAY_FAST0.get() - 120ms);
+    }
+
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+}
+
+
+}
+}
+}
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-DailyHighlightFarmer.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-DailyHighlightFarmer.h
new file mode 100644
index 0000000000..3c5cd18012
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-DailyHighlightFarmer.h
@@ -0,0 +1,50 @@
+/*  Daily Highlight Farmer
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_DailyHighlightFarmer_H
+#define PokemonAutomation_PokemonSwSh_DailyHighlightFarmer_H
+
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+class DailyHighlightFarmer_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    DailyHighlightFarmer_Descriptor();
+};
+
+
+
+class DailyHighlightFarmer : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = DailyHighlightFarmer_Descriptor;
+    DailyHighlightFarmer();
+
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    StartInGripOrGameOption START_LOCATION;
+
+    SimpleIntegerOption<uint32_t> SKIPS;
+    SimpleIntegerOption<uint16_t> SAVE_ITERATIONS0;
+
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+
+}
+}
+}
+#endif
+
+
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-LotoFarmer.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-LotoFarmer.cpp
new file mode 100644
index 0000000000..669fa3bc1f
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-LotoFarmer.cpp
@@ -0,0 +1,96 @@
+/*  Loto Farmer
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/PrettyPrint.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonSwSh/PokemonSwSh_Settings.h"
+#include "VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.h"
+#include "PokemonSwSh_DateSpam-LotoFarmer.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+    using namespace Pokemon;
+
+
+LotoFarmer_Descriptor::LotoFarmer_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonSwSh:LotoFarmer",
+        STRING_POKEMON + " SwSh", "Date Spam - Loto Farmer",
+        "Programs/PokemonSwSh/DateSpam-LotoFarmer.html",
+        "Farm the Loto ID.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_PerformanceClassSensitive,
+        FeedbackType::NONE,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+
+
+LotoFarmer::LotoFarmer()
+    : SKIPS(
+        "<b>Number of Loto Attempts:</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        100000
+    )
+    , MASH_B_DURATION0(
+        "<b>Mash B for this long to exit the dialog:</b><br>(Some languages like German need to increase this.)",
+        LockMode::LOCK_WHILE_RUNNING,
+        "9000 ms"
+    )
+    , NOTIFICATIONS({
+        &NOTIFICATION_PROGRAM_FINISH,
+    })
+{
+    PA_ADD_OPTION(START_LOCATION);
+    PA_ADD_OPTION(SKIPS);
+    PA_ADD_OPTION(MASH_B_DURATION0);
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+void LotoFarmer::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    if (START_LOCATION.start_in_grip_menu()){
+        grip_menu_connect_go_home(context);
+    }else{
+        //  Connect the controller.
+        require_player(env.console, context, BUTTON_B);
+        ssf_press_button(context, BUTTON_HOME, GameSettings::instance().GAME_TO_HOME_DELAY_FAST0, 160ms);
+    }
+
+    uint8_t year = MAX_YEAR;
+    for (uint32_t c = 0; c < SKIPS; c++){
+        env.log("Fetch Attempts: " + tostr_u_commas(c));
+        home_roll_date_enter_game_autorollback(env.console, context, year);
+        if (context->performance_class() == ControllerPerformanceClass::SysbotBase){
+            pbf_wait(context, 720ms);
+        }else{
+            pbf_mash_button(context, BUTTON_B, 720ms);
+        }
+
+        pbf_press_button(context, BUTTON_A, 80ms, 720ms);
+        pbf_press_button(context, BUTTON_B, 80ms, 560ms);
+        ssf_press_dpad_ptv(context, DPAD_DOWN, 120ms);
+        pbf_mash_button(context, BUTTON_ZL, 3920ms);
+        pbf_mash_button(context, BUTTON_B, MASH_B_DURATION0);
+
+        //  Tap HOME and quickly spam B. The B spamming ensures that we don't
+        //  accidentally update the system if the system update window pops up.
+        ssf_press_button(context, BUTTON_HOME, 120ms, 160ms);
+        pbf_mash_button(context, BUTTON_B, GameSettings::instance().GAME_TO_HOME_DELAY_FAST0.get() - 120ms);
+    }
+
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+}
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-LotoFarmer.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-LotoFarmer.h
new file mode 100644
index 0000000000..e2e0c130e1
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-LotoFarmer.h
@@ -0,0 +1,51 @@
+/*  Loto Farmer
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_LotoFarmer_H
+#define PokemonAutomation_PokemonSwSh_LotoFarmer_H
+
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "Common/Cpp/Options/TimeDurationOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+class LotoFarmer_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    LotoFarmer_Descriptor();
+};
+
+
+
+class LotoFarmer : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = LotoFarmer_Descriptor;
+    LotoFarmer();
+
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    StartInGripOrGameOption START_LOCATION;
+
+    SimpleIntegerOption<uint32_t> SKIPS;
+    MillisecondsOption MASH_B_DURATION0;
+
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+
+}
+}
+}
+#endif
+
+
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-PokeJobsFarmer.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-PokeJobsFarmer.cpp
new file mode 100644
index 0000000000..0be965ad19
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-PokeJobsFarmer.cpp
@@ -0,0 +1,177 @@
+/*  Poke Jobs Farmer
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/PrettyPrint.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonSwSh/PokemonSwSh_Settings.h"
+#include "VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.h"
+#include "PokemonSwSh_DateSpam-PokeJobsFarmer.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+using namespace Pokemon;
+
+
+
+PokeJobsFarmer_Descriptor::PokeJobsFarmer_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonSwSh:PokeJobsFarmer",
+        STRING_POKEMON + " SwSh",
+        "Date Spam - " + STRING_POKEJOB + "s Farmer",
+        "Programs/PokemonSwSh/DateSpam-PokeJobsFarmer.html",
+        "Farm " + STRING_POKEJOB + "s.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_PerformanceClassSensitive,
+        FeedbackType::NONE,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+     )
+{}
+
+PokeJobsFarmer::PokeJobsFarmer()
+    : SKIPS(
+        "<b>Number of days:</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        200
+    )
+    , CONCURRENCY(
+        "<b>Number of concurrent " + STRING_POKEJOB + "s per day:</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        2
+    )
+    , MENU_INDEX(
+        "<b>Index of " + STRING_POKEJOB + "s in Rotom menu:</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        3
+    )
+    , m_advanced_options(
+        "<font size=4><b>Advanced Options:</b> You should not need to touch anything below here.</font>"
+    )
+    , MASH_B_DURATION0(
+        "<b>Mash B for this long upon completion of " + STRING_POKEJOB + ":</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        "8000 ms"
+    )
+    , NOTIFICATIONS({
+        &NOTIFICATION_PROGRAM_FINISH,
+    })
+{
+    PA_ADD_OPTION(SKIPS);
+    PA_ADD_OPTION(CONCURRENCY);
+    PA_ADD_OPTION(MENU_INDEX);
+    PA_ADD_STATIC(m_advanced_options);
+    PA_ADD_OPTION(MASH_B_DURATION0);
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+static void enter_jobs(ProControllerContext& context, uint16_t index){
+    // Enter menu
+    pbf_press_button(context, BUTTON_A, 80ms, 720ms);
+    pbf_press_button(context, BUTTON_B, 80ms, 720ms);
+    // Select entry
+    for (uint16_t i = 1; i < index; i++){
+        ssf_press_dpad_ptv(context, DPAD_DOWN, 160ms);
+    }
+    pbf_press_button(context, BUTTON_A, 80ms, 5000ms);  // Wait for animation to complete
+}
+
+void PokeJobsFarmer::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    uint8_t year = MAX_YEAR;
+
+    //  Connect the controller.
+    require_player(env.console, context, BUTTON_B);
+
+    // Play it safe in case some menu is open
+    pbf_mash_button(context, BUTTON_B, MASH_B_DURATION0);
+
+    for (uint32_t c = 0; c < SKIPS; c++){
+        if (MAX_YEAR <= year){
+            // Roll back to 2001
+            env.log("Rolling back!");
+            ssf_press_button_ptv(context, BUTTON_B, 80ms);
+            ssf_press_button(context, BUTTON_HOME, GameSettings::instance().GAME_TO_HOME_DELAY_FAST0, 160ms);
+            home_roll_date_enter_game_autorollback(env.console, context, year);
+            pbf_mash_button(context, BUTTON_B, MASH_B_DURATION0);
+
+            // Get rid of new jobs notification by entering Poke Jobs and leaving immediately
+            enter_jobs(context, MENU_INDEX);
+            pbf_mash_button(context, BUTTON_B, 5000ms);
+        }
+
+        // Start new jobs
+        for (uint16_t j = 1; j <= CONCURRENCY; j++){
+            env.log("Starting job #" + tostr_u_commas(j) + " in year " + tostr_u_commas(2000 + year));
+
+            // Enter Poke Jobs
+            enter_jobs(context, MENU_INDEX);
+
+            // Select first Poke Job
+            env.log("#### Select first " + STRING_POKEJOB);
+            pbf_press_button(context, BUTTON_A, 80ms, 1000ms);
+            pbf_press_button(context, BUTTON_A, 80ms, 1000ms);
+            pbf_press_button(context, BUTTON_A, 80ms, 3000ms);
+
+            // Select all Pokemons
+            env.log("#### Select all");
+            pbf_press_button(context, BUTTON_X, 80ms, 720ms);
+
+            // Send to Poke Job
+            env.log("#### Send to " + STRING_POKEJOB);
+            pbf_press_button(context, BUTTON_B, 80ms, 2000ms);
+            pbf_mash_button(context, BUTTON_A, 6000ms); // Mash until animation starts
+
+            // Wait for animation to end and exit Poke Jobs
+            env.log("#### Exit " + STRING_POKEJOB + "s");
+            pbf_mash_button(context, BUTTON_B, 5000ms);
+        }
+
+        env.log("Skipping one year...");
+
+        // Go to home menu
+        env.log("#### Go to Switch home menu");
+        ssf_press_button(context, BUTTON_HOME, GameSettings::instance().GAME_TO_HOME_DELAY_FAST0, 160ms);
+
+        // Skip frame
+        env.log("#### Skip frame");
+        home_roll_date_enter_game_autorollback(env.console, context, year);
+        pbf_mash_button(context, BUTTON_B, 1000ms);
+
+        // Get rid of new jobs notification by entering Poke Jobs and leaving immediately
+        enter_jobs(context, MENU_INDEX);
+        pbf_mash_button(context, BUTTON_B, 5000ms);
+
+        // Complete jobs
+        for (uint16_t j = 1; j <= CONCURRENCY; j++){
+            env.log("Completing job #" + tostr_u_commas(j) + " in year " + tostr_u_commas(2000 + year));
+
+            // Enter Poke Jobs
+            enter_jobs(context, MENU_INDEX);
+
+            // Select first Poke Job
+            env.log("#### Select first " + STRING_POKEJOB);
+            pbf_press_button(context, BUTTON_A, 80ms, 1000ms);
+            pbf_press_button(context, BUTTON_A, 80ms, 1000ms);
+            pbf_press_button(context, BUTTON_A, 80ms, 10000ms); // Wait for animation to complete
+
+            // Skip through wall of text and exit
+            env.log("#### Exit " + STRING_POKEJOB + "s");
+            pbf_mash_button(context, BUTTON_B, MASH_B_DURATION0);
+        }
+    }
+
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-PokeJobsFarmer.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-PokeJobsFarmer.h
new file mode 100644
index 0000000000..b47ed57241
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-PokeJobsFarmer.h
@@ -0,0 +1,53 @@
+/*  PokeJobs Farmer
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_PokeJobsFarmer_H
+#define PokemonAutomation_PokemonSwSh_PokeJobsFarmer_H
+
+#include "Common/Cpp/Options/StaticTextOption.h"
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "Common/Cpp/Options/TimeDurationOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+class PokeJobsFarmer_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    PokeJobsFarmer_Descriptor();
+};
+
+class PokeJobsFarmer : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = PokeJobsFarmer_Descriptor;
+    PokeJobsFarmer();
+
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    StartInGripOrGameOption START_LOCATION;
+
+    SimpleIntegerOption<uint32_t> SKIPS;
+    SimpleIntegerOption<uint32_t> CONCURRENCY;
+    SimpleIntegerOption<uint16_t> MENU_INDEX;
+
+    SectionDividerOption m_advanced_options;
+
+    MillisecondsOption MASH_B_DURATION0;
+
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-StowOnSideFarmer.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-StowOnSideFarmer.cpp
new file mode 100644
index 0000000000..c157b2e285
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-StowOnSideFarmer.cpp
@@ -0,0 +1,106 @@
+/*  Stow-On-Side Farmer
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/PrettyPrint.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonSwSh/PokemonSwSh_Settings.h"
+#include "VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.h"
+#include "PokemonSwSh_DateSpam-StowOnSideFarmer.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+    using namespace Pokemon;
+
+
+StowOnSideFarmer_Descriptor::StowOnSideFarmer_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonSwSh:StowOnSideFarmer",
+        STRING_POKEMON + " SwSh", "Date Spam - Stow-On-Side Farmer",
+        "Programs/PokemonSwSh/DateSpam-StowOnSideFarmer.html",
+        "Farm the Stow-on-Side items dealer.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_PerformanceClassSensitive,
+        FeedbackType::NONE,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+
+
+StowOnSideFarmer::StowOnSideFarmer()
+    : SKIPS(
+        "<b>Number of Purchase Attempts:</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        100000
+    )
+    , SAVE_ITERATIONS0(
+        "<b>Save Every this Many Fetches:</b><br>(zero disables saving): ",
+        LockMode::LOCK_WHILE_RUNNING,
+        100
+    )
+    , NOTIFICATIONS({
+        &NOTIFICATION_PROGRAM_FINISH,
+    })
+{
+    PA_ADD_OPTION(START_LOCATION);
+    PA_ADD_OPTION(SKIPS);
+    PA_ADD_OPTION(SAVE_ITERATIONS0);
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+void StowOnSideFarmer::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    if (START_LOCATION.start_in_grip_menu()){
+        grip_menu_connect_go_home(context);
+    }else{
+        //  Connect the controller.
+        require_player(env.console, context, BUTTON_B);
+        ssf_press_button(context, BUTTON_HOME, GameSettings::instance().GAME_TO_HOME_DELAY_FAST0, 160ms);
+    }
+
+    uint8_t year = MAX_YEAR;
+    uint16_t save_count = 0;
+    for (uint32_t c = 0; c < SKIPS; c++){
+        env.log("Fetch Attempts: " + tostr_u_commas(c));
+        home_roll_date_enter_game_autorollback(env.console, context, year);
+        if (context->performance_class() == ControllerPerformanceClass::SysbotBase){
+            pbf_wait(context, 720ms);
+        }else{
+            pbf_mash_button(context, BUTTON_B, 720ms);
+        }
+
+        ssf_press_button_ptv(context, BUTTON_A, 160ms);
+        pbf_mash_button(context, BUTTON_ZL, 3080ms);
+        pbf_mash_button(context, BUTTON_B, 5600ms);
+
+        if (SAVE_ITERATIONS0 != 0){
+            save_count++;
+            if (save_count >= SAVE_ITERATIONS0){
+                save_count = 0;
+                pbf_mash_button(context, BUTTON_B, 2000ms);
+                pbf_press_button(context, BUTTON_X, 160ms, GameSettings::instance().OVERWORLD_TO_MENU_DELAY0);
+                pbf_press_button(context, BUTTON_R, 160ms, 2000ms);
+                pbf_press_button(context, BUTTON_ZL, 160ms, 3000ms);
+            }
+        }
+
+        //  Tap HOME and quickly spam B. The B spamming ensures that we don't
+        //  accidentally update the system if the system update window pops up.
+        ssf_press_button(context, BUTTON_HOME, 120ms, 160ms);
+        pbf_mash_button(context, BUTTON_B, GameSettings::instance().GAME_TO_HOME_DELAY_FAST0.get() - 120ms);
+    }
+
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+}
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-StowOnSideFarmer.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-StowOnSideFarmer.h
new file mode 100644
index 0000000000..47a318543d
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-StowOnSideFarmer.h
@@ -0,0 +1,50 @@
+/*  Stow-On-Side Farmer
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_StowOnSideFarmer_H
+#define PokemonAutomation_PokemonSwSh_StowOnSideFarmer_H
+
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+class StowOnSideFarmer_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    StowOnSideFarmer_Descriptor();
+};
+
+
+
+class StowOnSideFarmer : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = StowOnSideFarmer_Descriptor;
+    StowOnSideFarmer();
+
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    StartInGripOrGameOption START_LOCATION;
+
+    SimpleIntegerOption<uint32_t> SKIPS;
+    SimpleIntegerOption<uint16_t> SAVE_ITERATIONS0;
+
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+
+}
+}
+}
+#endif
+
+
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-WattFarmer.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-WattFarmer.cpp
new file mode 100644
index 0000000000..fcd5c9bcaa
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-WattFarmer.cpp
@@ -0,0 +1,170 @@
+/*  Watt Farmer
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/PrettyPrint.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "VideoGames/PokemonSwSh/PokemonSwSh_Settings.h"
+#include "VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.h"
+#include "VideoGames/PokemonSwSh/Programs/Hosting/PokemonSwSh_DenTools.h"
+#include "PokemonSwSh_DateSpam-WattFarmer.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+using namespace Pokemon;
+
+
+WattFarmer_Descriptor::WattFarmer_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonSwSh:WattFarmer",
+        STRING_POKEMON + " SwSh", "Date Spam - Watt Farmer",
+        "Programs/PokemonSwSh/DateSpam-WattFarmer.html",
+        "Farm watts. (7.2 seconds/fetch, 1 million watts/hour with a tick-precise controller)",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_PerformanceClassSensitive,
+        FeedbackType::NONE,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+
+
+WattFarmer::WattFarmer()
+    : GRIP_MENU_WAIT0(
+        "<b>Exit Grip Menu Delay:</b><br>"
+        "Wait this long after leaving the grip menu to allow for the Switch to reestablish local connection.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "5000 ms"
+    )
+    , EXIT_DEN_WAIT(
+        "<b>Exit Den Wait Time:</b><br>"
+        "Wait this long after backing out of the den before date skipping.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "1720 ms"
+    )
+    , SKIPS(
+        "<b>Number of Fetch Attempts:</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        33334
+    )
+    , SAVE_ITERATIONS0(
+        "<b>Save Every this Many Fetches:</b><br>(zero disables saving): ",
+        LockMode::LOCK_WHILE_RUNNING,
+        100
+    )
+    , YCOMM_GLITCH_ENABLED(
+        "<b>Y-COMM Glitch is Enabled:</b><br>"
+        "Uncheck this box to allow this program to function without enabling the Y-COMM glitch. "
+        "However, this will drastically slow down the program.",
+        LockMode::LOCK_WHILE_RUNNING,
+        true
+    )
+    , NOTIFICATIONS({
+        &NOTIFICATION_PROGRAM_FINISH,
+    })
+{
+    PA_ADD_OPTION(GRIP_MENU_WAIT0);
+    PA_ADD_OPTION(START_LOCATION);
+    PA_ADD_OPTION(EXIT_DEN_WAIT);
+    PA_ADD_OPTION(SKIPS);
+    PA_ADD_OPTION(SAVE_ITERATIONS0);
+    PA_ADD_OPTION(YCOMM_GLITCH_ENABLED);
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+
+void WattFarmer::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    if (START_LOCATION.start_in_grip_menu()){
+        grip_menu_connect_go_home(context);
+        pbf_wait(context, GRIP_MENU_WAIT0);
+    }else{
+        //  Connect the controller.
+        require_player(env.console, context, BUTTON_B);
+        ssf_press_button(context, BUTTON_HOME, GameSettings::instance().GAME_TO_HOME_DELAY_FAST0, 160ms);
+    }
+
+    uint8_t year = MAX_YEAR;
+    uint16_t save_count = 0;
+
+    if (!YCOMM_GLITCH_ENABLED){
+        bool has_watts = false;
+
+        //  First subdivide the number of skips into batches of 60 because the roll_den function only goes up to 60.
+        for (uint32_t c = 0; c < SKIPS; c++){
+            //  Skip forward.
+            home_roll_date_enter_game_autorollback(env.console, context, year);
+
+            //  Exit Raid
+            ssf_press_button(context, BUTTON_B, 960ms, 400ms);
+            ssf_press_button(context, BUTTON_A, GameSettings::instance().REENTER_DEN_DELAY0, 400ms);
+            has_watts = true;
+
+            //  1st iteration is unclear if there are watts.
+            if (c < 1){
+                pbf_mash_button(context, BUTTON_B, EXIT_DEN_WAIT);
+                ssf_press_button_ptv(context, BUTTON_A, 40ms);
+                pbf_mash_button(context, BUTTON_B, EXIT_DEN_WAIT);
+                has_watts = false;
+            }
+
+            // Save after X skips
+            if (SAVE_ITERATIONS0 != 0){
+                save_count++;
+                if (save_count >= SAVE_ITERATIONS0){
+                    save_count = 0;
+                    pbf_mash_button(context, BUTTON_B, 2000ms);
+                    pbf_press_button(context, BUTTON_X, 160ms, GameSettings::instance().OVERWORLD_TO_MENU_DELAY0);
+                    pbf_press_button(context, BUTTON_R, 160ms, 2000ms);
+                    pbf_press_button(context, BUTTON_ZL, 160ms, 3000ms);
+                }
+            }
+
+            enter_den(context, 0ms, has_watts, false);
+            enter_lobby(context, 0ms, false, Catchability::ALWAYS_CATCHABLE);
+
+            ssf_press_button(context, BUTTON_HOME, GameSettings::instance().GAME_TO_HOME_DELAY_FAST0, 80ms);
+        }
+    }else{
+        //  First subdivide the number of skips into batches of 60 because the roll_den function only goes up to 60.
+        for (uint32_t c = 0; c < SKIPS; c++){
+            env.log("Fetch Attempts: " + tostr_u_commas(c));
+
+            home_roll_date_enter_game_autorollback(env.console, context, year);
+            pbf_mash_button(context, BUTTON_B, 720ms);
+
+            ssf_press_button_ptv(context, BUTTON_A, 40ms);
+            pbf_mash_button(context, BUTTON_B, EXIT_DEN_WAIT);
+
+            if (SAVE_ITERATIONS0 != 0){
+                save_count++;
+                if (save_count >= SAVE_ITERATIONS0){
+                    save_count = 0;
+                    pbf_mash_button(context, BUTTON_B, 2000ms);
+                    pbf_press_button(context, BUTTON_X, 160ms, GameSettings::instance().OVERWORLD_TO_MENU_DELAY0);
+                    pbf_press_button(context, BUTTON_R, 160ms, 2000ms);
+                    pbf_press_button(context, BUTTON_ZL, 160ms, 3000ms);
+                }
+            }
+
+            //  Tap HOME and quickly spam B. The B spamming ensures that we don't
+            //  accidentally update the system if the system update window pops up.
+            ssf_press_button(context, BUTTON_HOME, 120ms, 160ms);
+            pbf_mash_button(context, BUTTON_B, GameSettings::instance().GAME_TO_HOME_DELAY_FAST0.get() - 120ms);
+        }
+    }
+
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+}
+
+
+}
+}
+}
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-WattFarmer.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-WattFarmer.h
new file mode 100644
index 0000000000..1ee0117ed9
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-WattFarmer.h
@@ -0,0 +1,56 @@
+/*  Watt Farmer
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_WattFarmer_H
+#define PokemonAutomation_PokemonSwSh_WattFarmer_H
+
+#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "Common/Cpp/Options/TimeDurationOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+class WattFarmer_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    WattFarmer_Descriptor();
+};
+
+
+
+class WattFarmer : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = WattFarmer_Descriptor;
+    WattFarmer();
+
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    StartInGripOrGameOption START_LOCATION;
+    MillisecondsOption GRIP_MENU_WAIT0;
+    MillisecondsOption EXIT_DEN_WAIT;
+
+    SimpleIntegerOption<uint32_t> SKIPS;
+    SimpleIntegerOption<uint16_t> SAVE_ITERATIONS0;
+    
+    BooleanCheckBoxOption YCOMM_GLITCH_ENABLED;
+
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+
+}
+}
+}
+#endif
+
+
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-WattTraderFarmer.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-WattTraderFarmer.cpp
new file mode 100644
index 0000000000..09051064b5
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-WattTraderFarmer.cpp
@@ -0,0 +1,198 @@
+/*  Watt Trader Farmer
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonTools/Images/SolidColorTest.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonSwSh/PokemonSwSh_Settings.h"
+#include "VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.h"
+#include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_DialogTriangleDetector.h"
+#include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_SelectionArrowFinder.h"
+#include "PokemonSwSh_DateSpam-WattTraderFarmer.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+using namespace Pokemon;
+
+
+WattTraderFarmer_Descriptor::WattTraderFarmer_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonSwSh:WattTraderFarmer",
+        STRING_POKEMON + " SwSh", "Date Spam - Watt Trader Farmer",
+        "",
+        "Buy as much stuff from a watt trader as possible - day skipping as needed to reroll items.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_PerformanceClassSensitive,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+class WattTraderFarmer_Descriptor::Stats : public StatsTracker{
+public:
+    Stats()
+        : day_skips(m_stats["Day Skips"])
+        , items_probed(m_stats["Items Probed"])
+        , failed(m_stats["Failed"])
+        , success(m_stats["Success"])
+        , errors(m_stats["Errors"])
+    {
+        m_display_order.insert(m_display_order.begin() + 0, Stat("Day Skips"));
+        m_display_order.insert(m_display_order.begin() + 1, Stat("Items Probed"));
+        m_display_order.insert(m_display_order.begin() + 2, Stat("Failed"));
+        m_display_order.insert(m_display_order.begin() + 3, Stat("Success"));
+        m_display_order.insert(m_display_order.begin() + 4, Stat("Errors"));
+    }
+
+public:
+    std::atomic<uint64_t>& day_skips;
+    std::atomic<uint64_t>& items_probed;
+    std::atomic<uint64_t>& failed;
+    std::atomic<uint64_t>& success;
+    std::atomic<uint64_t>& errors;
+};
+std::unique_ptr<StatsTracker> WattTraderFarmer_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+
+
+WattTraderFarmer::WattTraderFarmer(){
+
+}
+
+
+
+class BuyCursorDetector : public SelectionArrowFinder{
+public:
+    BuyCursorDetector(VideoOverlay& overlay)
+        : SelectionArrowFinder(overlay, ImageFloatBox(0.448775, 0.087129, 0.062361, 0.596040))
+    {}
+};
+class BuyQuantityDetector : public VisualInferenceCallback{
+public:
+    BuyQuantityDetector()
+        : VisualInferenceCallback("BuyQuantityDetector")
+        , m_box(0.814031, 0.681188, 0.170379, 0.045545)
+    {}
+    virtual void make_overlays(VideoOverlaySet& items) const override{
+        items.add(COLOR_GREEN, m_box);
+    }
+    virtual bool process_frame(const VideoSnapshot& frame) override{
+        ImageStats stats = image_stats(extract_box_reference(frame, m_box));
+        return is_solid(stats, {0.62963, 0.37037, 0.});
+    }
+
+private:
+    ImageFloatBox m_box;
+};
+
+
+
+void WattTraderFarmer::buy_one(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    WattTraderFarmer_Descriptor::Stats& stats = env.current_stats<WattTraderFarmer_Descriptor::Stats>();
+
+    bool purchased = false;
+    while (true){
+        DialogTriangleWatcher dialog;
+        BuyCursorDetector item_select(env.console);
+        BuyQuantityDetector quantity;
+        context.wait_for_all_requests();
+        int ret = wait_until(
+            env.console, context,
+            std::chrono::seconds(10),
+            {
+                dialog,
+                item_select,
+                quantity,
+            }
+        );
+        context.wait_for(200ms);
+        switch (ret){
+        case 0:
+            env.log("Detected dialog...", COLOR_BLUE);
+            if (!purchased){
+                stats.failed++;
+                env.update_stats();
+            }
+            pbf_press_button(context, BUTTON_B, 200ms, 800ms);
+            return;
+        case 1:
+            env.log("Detected item select...", COLOR_BLUE);
+            if (purchased){
+                return;
+            }
+            pbf_press_button(context, BUTTON_A, 200ms, 800ms);
+            continue;
+        case 2:
+            env.log("Detected quantity select...", COLOR_BLUE);
+            stats.success++;
+            env.update_stats();
+            pbf_press_dpad(context, DPAD_DOWN, 200ms, 800ms);
+            pbf_press_button(context, BUTTON_A, 200ms, 800ms);
+            pbf_press_button(context, BUTTON_A, 200ms, 800ms);
+            purchased = true;
+            continue;
+        default:
+            env.log("No recognized state after 5 seconds.", COLOR_RED);
+            stats.errors++;
+            env.update_stats();
+            pbf_mash_button(context, BUTTON_B, 5000ms);
+            pbf_press_button(context, BUTTON_A, 200ms, 800ms);
+            pbf_press_button(context, BUTTON_A, 200ms, 800ms);
+            continue;
+        }
+    }
+}
+
+
+
+void WattTraderFarmer::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    WattTraderFarmer_Descriptor::Stats& stats = env.current_stats<WattTraderFarmer_Descriptor::Stats>();
+
+    //  Connect the controller.
+    require_player(env.console, context, BUTTON_B);
+
+    uint8_t year = MAX_YEAR;
+    while (true){
+        pbf_press_button(context, BUTTON_A, 200ms, 800ms);
+        pbf_press_button(context, BUTTON_A, 200ms, 800ms);
+
+        for (size_t c = 0; c < 7; c++){
+            buy_one(env, context);
+            stats.items_probed++;
+            env.update_stats();
+            pbf_press_dpad(context, DPAD_DOWN, 200ms, 200ms);
+        }
+
+        pbf_mash_button(context, BUTTON_B, 5000ms);
+
+        //  Tap HOME and quickly spam B. The B spamming ensures that we don't
+        //  accidentally update the system if the system update window pops up.
+        ssf_press_button(context, BUTTON_HOME, 120ms, 160ms);
+        pbf_mash_button(context, BUTTON_B, GameSettings::instance().GAME_TO_HOME_DELAY_FAST0.get() - 120ms);
+
+        home_roll_date_enter_game_autorollback(env.console, context, year);
+        pbf_mash_button(context, BUTTON_B, 720ms);
+        stats.day_skips++;
+            env.update_stats();
+    }
+}
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-WattTraderFarmer.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-WattTraderFarmer.h
new file mode 100644
index 0000000000..043714ee72
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-WattTraderFarmer.h
@@ -0,0 +1,48 @@
+/*  Watt Trader Farmer
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_WattTraderFarmer_H
+#define PokemonAutomation_PokemonSwSh_WattTraderFarmer_H
+
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+class WattTraderFarmer_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    WattTraderFarmer_Descriptor();
+
+    class Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+
+
+class WattTraderFarmer : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = WattTraderFarmer_Descriptor;
+    WattTraderFarmer();
+
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    void buy_one(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+
+
+};
+
+
+
+}
+}
+}
+#endif
+
+
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperEU.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperEU.cpp
new file mode 100644
index 0000000000..b9981a5b96
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperEU.cpp
@@ -0,0 +1,233 @@
+/*  Day Skipper (EU)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Exceptions.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "Controllers/ControllerTypes.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "NintendoSwitch/Programs/DateManip/NintendoSwitch_DateSkippers.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "PokemonSwSh_DaySkipperStats.h"
+#include "PokemonSwSh_DaySkipperEU.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+using namespace Pokemon;
+
+
+DaySkipperEU_Descriptor::DaySkipperEU_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonSwSh:DaySkipperEU",
+        STRING_POKEMON + " SwSh", "Day Skipper (EU)",
+        "Programs/PokemonSwSh/DaySkipperEU.html",
+        "A day skipper for EU date format that.  (Switch 1: ~7500 skips/hour, Switch 2: 5655 skips/hour)",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_WithRestrictions,
+        FeedbackType::NONE,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+std::unique_ptr<StatsTracker> DaySkipperEU_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new SkipperStats());
+}
+
+
+
+DaySkipperEU::DaySkipperEU()
+    : SKIPS(
+        "<b>Number of Frame Skips:</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        10
+    )
+    , REAL_LIFE_YEAR(
+        "<b>Real Life Year:</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        std::min(current_year(), (uint16_t)2060),
+        2000, 2060
+    )
+    , NOTIFICATION_PROGRESS_UPDATE("Progress Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATION_PROGRAM_FINISH("Program Finished", true, true)
+    , NOTIFICATIONS({
+        &NOTIFICATION_PROGRESS_UPDATE,
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+    , m_advanced_options(
+        "<font size=4><b>Advanced Options:</b> You should not need to touch anything below here.</font>"
+    )
+    , CORRECTION_SKIPS(
+        "<b>Auto-Correct Interval:</b><br>Run auto-recovery every this # of skips. Zero disables the auto-corrections.",
+        LockMode::LOCK_WHILE_RUNNING,
+        1000
+    )
+{
+    PA_ADD_OPTION(SKIPS);
+    PA_ADD_OPTION(REAL_LIFE_YEAR);
+    PA_ADD_OPTION(NOTIFICATIONS);
+    PA_ADD_STATIC(m_advanced_options);
+    PA_ADD_OPTION(CORRECTION_SKIPS);
+}
+
+
+
+void DaySkipperEU::run_switch1(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    using namespace DateSkippers::Switch1;
+
+    bool needs_inference;
+    switch (context->performance_class()){
+    case ControllerPerformanceClass::SerialPABotBase_Wired:
+        needs_inference = false;
+        break;
+    case ControllerPerformanceClass::SerialPABotBase_Wireless:
+        needs_inference = true;
+        break;
+    default:
+        throw UserSetupError(
+            env.logger(),
+            "This program requires a controller performance class of \"Wired\" or \"Wireless\" for the Switch 1."
+        );
+    }
+
+
+    SkipperStats& stats = env.current_stats<SkipperStats>();
+    stats.total_skips = SKIPS;
+    stats.runs++;
+
+    //  Setup globals.
+    uint8_t real_life_year = (uint8_t)(
+        REAL_LIFE_YEAR < 2000 ?  0 :
+        REAL_LIFE_YEAR > 2060 ? 60 : REAL_LIFE_YEAR - 2000
+    );
+    uint8_t year = 60;
+    uint32_t remaining_skips = SKIPS;
+
+    //  Connect
+    pbf_press_button(context, BUTTON_ZR, 40ms, 40ms);
+
+    //  Setup starting state.
+    init_view(context);
+    rollback_year_full(context, false);
+    year = 0;
+
+    uint16_t correct_count = 0;
+    while (remaining_skips > 0){
+        send_program_status_notification(env, NOTIFICATION_PROGRESS_UPDATE);
+
+        if (needs_inference){
+            increment_day_with_feedback(env.console, context, false);
+        }else{
+            increment_day(context, false);
+        }
+
+
+        correct_count++;
+        year++;
+        remaining_skips--;
+        stats.issued++;
+//        env.log("Skips Remaining: " + tostr_u_commas(remaining_skips));
+        env.update_stats();
+
+        if (year >= 60){
+            if (real_life_year <= 36){
+                rollback_year_sync(context);
+                year = real_life_year;
+            }else{
+                rollback_year_full(context, false);
+                year = 0;
+            }
+        }
+        if (CORRECTION_SKIPS != 0 && correct_count == CORRECTION_SKIPS){
+            correct_count = 0;
+            auto_recovery(context);
+        }
+    }
+
+    //  Prevent the Switch from sleeping and the time from advancing.
+    context.wait_for_all_requests();
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+
+    pbf_wait(context, 15000ms);
+    while (true){
+        ssf_press_button(context, BUTTON_A, 15000ms);
+    }
+}
+void DaySkipperEU::run_switch2(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    using namespace DateSkippers::Switch2;
+
+    if (context->performance_class() != ControllerPerformanceClass::SerialPABotBase_Wired){
+        throw UserSetupError(
+            env.logger(),
+            "This program requires a controller performance class of \"Wired\" for the Switch 2."
+        );
+    }
+
+    SkipperStats& stats = env.current_stats<SkipperStats>();
+    stats.total_skips = SKIPS;
+    stats.runs++;
+
+    uint32_t remaining_skips = SKIPS;
+
+    //  Connect
+    pbf_press_button(context, BUTTON_ZR, 40ms, 40ms);
+
+    //  Setup starting state.
+    init_view(context);
+
+    uint8_t day = 1;
+    while (remaining_skips > 0){
+        send_program_status_notification(env, NOTIFICATION_PROGRESS_UPDATE);
+
+        increment_day_eu(context);
+
+        if (day == 31){
+            day = 1;
+        }else{
+            day++;
+            remaining_skips--;
+            stats.issued++;
+            env.update_stats();
+        }
+    }
+
+    //  Prevent the Switch from sleeping and the time from advancing.
+    context.wait_for_all_requests();
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+
+    while (true){
+        ssf_press_button(context, BUTTON_A, 760ms);
+        for (int c = 0; c < 10; c++){
+            ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 24ms, 48ms, 24ms);
+        }
+        ssf_press_button(context, BUTTON_A, 14000ms, 80ms);
+    }
+}
+
+
+
+
+void DaySkipperEU::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    ConsoleType console_type = env.console.state().console_type();
+    if (is_switch1(console_type)){
+        run_switch1(env, context);
+        return;
+    }
+    if (is_switch2(console_type)){
+        run_switch2(env, context);
+        return;
+    }
+    throw UserSetupError(
+        env.console,
+        "Please select a valid Switch console type."
+    );
+}
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperEU.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperEU.h
new file mode 100644
index 0000000000..02897ad226
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperEU.h
@@ -0,0 +1,58 @@
+/*  Day Skipper (EU)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_DaySkipperEU_H
+#define PokemonAutomation_PokemonSwSh_DaySkipperEU_H
+
+#include "Common/Cpp/Options/StaticTextOption.h"
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+class DaySkipperEU_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    DaySkipperEU_Descriptor();
+
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+
+
+class DaySkipperEU : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = DaySkipperEU_Descriptor;
+    DaySkipperEU();
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    void run_switch1(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+    void run_switch2(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+
+private:
+    SimpleIntegerOption<uint32_t> SKIPS;
+    SimpleIntegerOption<uint16_t> REAL_LIFE_YEAR;
+
+    EventNotificationOption NOTIFICATION_PROGRESS_UPDATE;
+    EventNotificationOption NOTIFICATION_PROGRAM_FINISH;
+    EventNotificationsOption NOTIFICATIONS;
+
+    SectionDividerOption m_advanced_options;
+    SimpleIntegerOption<uint16_t> CORRECTION_SKIPS;
+};
+
+
+}
+}
+}
+#endif
+
+
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperJPN-7.8k.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperJPN-7.8k.cpp
new file mode 100644
index 0000000000..f0e2fabc77
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperJPN-7.8k.cpp
@@ -0,0 +1,227 @@
+/*  Day Skipper (JPN) - 7.8k version
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Exceptions.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "Controllers/ControllerTypes.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "NintendoSwitch/Programs/DateManip/NintendoSwitch_DateSkippers.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "PokemonSwSh_DaySkipperStats.h"
+#include "PokemonSwSh_DaySkipperJPN-7.8k.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+using namespace Pokemon;
+
+
+DaySkipperJPN7p8k_Descriptor::DaySkipperJPN7p8k_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonSwSh:DaySkipperJPN7p8k",
+        STRING_POKEMON + " SwSh", "Day Skipper (JPN) - 7.8k",
+        "Programs/PokemonSwSh/DaySkipperJPN-7.8k.html",
+        "A faster, but less reliable Japanese date skipper. (7800 skips/hour)",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_WithRestrictions,
+        FeedbackType::NONE,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+std::unique_ptr<StatsTracker> DaySkipperJPN7p8k_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new SkipperStats());
+}
+
+
+
+DaySkipperJPN7p8k::DaySkipperJPN7p8k()
+    : SKIPS(
+        "<b>Number of Frame Skips:</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        10
+    )
+    , START_DATE(
+        "<b>Start Date:</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        DateTimeOption::Level::DATE,
+        DateTime{2000, 1, 1}, DateTime{2060, 12, 31},
+        DateTime{2000, 1, 1}
+    )
+    , NOTIFICATION_PROGRESS_UPDATE("Progress Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_PROGRESS_UPDATE,
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+    , m_advanced_options(
+        "<font size=4><b>Advanced Options:</b> You should not need to touch anything below here.</font>"
+    )
+    , CORRECTION_SKIPS(
+        "<b>Auto-Correct Interval:</b><br>Run auto-recovery every this # of skips. Zero disables the auto-corrections.",
+        LockMode::LOCK_WHILE_RUNNING,
+        1000
+    )
+{
+    PA_ADD_OPTION(SKIPS);
+    PA_ADD_OPTION(START_DATE);
+    PA_ADD_OPTION(NOTIFICATIONS);
+    PA_ADD_STATIC(m_advanced_options);
+    PA_ADD_OPTION(CORRECTION_SKIPS);
+}
+
+
+const uint8_t DAYS_PER_MONTH[] = {
+    31, //  January
+    28, //  February
+    31, //  March
+    30, //  April
+    31, //  May
+    30, //  June
+    31, //  July
+    31, //  August
+    30, //  September
+    31, //  October
+    30, //  November
+    31, //  December
+};
+uint8_t days_in_month(uint8_t year, uint8_t month){
+    return month != 2
+        ? DAYS_PER_MONTH[month - 1]
+        : (year & 0x3) ? 28 : 29;
+}
+typedef struct{
+    uint8_t year;
+    uint8_t month;
+    uint8_t day;
+} DateSmall;
+
+bool is_start(const DateSmall* date){
+    return date->year != 0 || date->month != 1 || date->day != 1;
+}
+bool date_increment_day(ProControllerContext& context, DateSmall* date, bool press){
+    using namespace DateSkippers::Switch1;
+
+    uint8_t days = days_in_month(date->year, date->month);
+    if (date->day != days){
+        if (press){
+            increment_day(context, false);
+        }
+        date->day++;
+        return true;
+    }
+
+    date->day = 1;
+    date->month++;
+    if (date->month > 12){
+        date->month = 1;
+        date->year++;
+    }
+    if (date->year > 60){
+        date->year = 0;
+    }
+
+    if (!press){
+        return is_start(date);
+    }
+
+    if (date->month != 1){
+        increment_month(context, DAYS_PER_MONTH[date->month - 1]);
+        return true;
+    }
+
+    if (date->year != 0){
+        increment_all(context);
+        return true;
+    }
+
+    increment_all_rollback(context);
+    return false;
+}
+
+void DaySkipperJPN7p8k::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    using namespace DateSkippers::Switch1;
+
+    if (env.console.state().console_type() != ConsoleType::Switch1){
+        throw UserSetupError(
+            env.logger(),
+            "This program only works on the Switch 1."
+        );
+    }
+    if (context->performance_class() != ControllerPerformanceClass::SerialPABotBase_Wired){
+        throw UserSetupError(
+            env.logger(),
+            "This program requires a controller performance class of \"Wired\" for the Switch 1."
+        );
+    }
+
+    SkipperStats& stats = env.current_stats<SkipperStats>();
+    stats.total_skips = SKIPS;
+    stats.runs++;
+
+    //  Setup globals.
+    uint32_t remaining_skips = SKIPS;
+
+    //  Connect
+    pbf_press_button(context, BUTTON_ZL, 40ms, 40ms);
+
+    DateTime start_date = START_DATE;
+
+    //  Sanitize starting date.
+    uint16_t year = (uint16_t)start_date.year;
+    if (year < 2000) year = 2000;
+    if (year > 2060) year = 2060;
+
+    DateSmall date;
+    date.year   = (uint8_t)(year - 2000);
+    date.month  = (uint8_t)start_date.month;
+    date.day    = (uint8_t)start_date.day;
+    if (date.month < 1)     date.month = 1;
+    if (date.month > 12)    date.month = 12;
+    if (date.day < 1)       date.day = 1;
+    {
+        uint8_t day = days_in_month(date.year, date.month);
+        if (date.day > day) date.day = day;
+    }
+
+    //  Setup starting state.
+    init_view(context);
+
+    uint16_t correct_count = 0;
+    while (remaining_skips > 0){
+        send_program_status_notification(env, NOTIFICATION_PROGRESS_UPDATE);
+
+        if (date_increment_day(context, &date, true)){
+            correct_count++;
+            remaining_skips--;
+            stats.issued++;
+            env.log("Expected Date: " + std::to_string(date.year + 2000) + "/" + std::to_string(date.month) + "/" + std::to_string(date.day));
+//            env.log("Skips Remaining: " + tostr_u_commas(remaining_skips));
+            env.update_stats();
+        }
+        if (CORRECTION_SKIPS != 0 && correct_count == CORRECTION_SKIPS){
+            correct_count = 0;
+            auto_recovery(context);
+        }
+
+    }
+
+    //  Prevent the Switch from sleeping and the time from advancing.
+    context.wait_for_all_requests();
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+
+    pbf_wait(context, 15000ms);
+    while (true){
+        ssf_press_button(context, BUTTON_A, 15000ms);
+    }
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperJPN-7.8k.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperJPN-7.8k.h
similarity index 77%
rename from SerialPrograms/Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperJPN-7.8k.h
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperJPN-7.8k.h
index 7b16f01845..7c9d0301df 100644
--- a/SerialPrograms/Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperJPN-7.8k.h
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperJPN-7.8k.h
@@ -1,6 +1,6 @@
 /*  Day Skipper (JPN) - 7.8k version
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -10,7 +10,6 @@
 #include "Common/Cpp/Options/StaticTextOption.h"
 #include "Common/Cpp/Options/SimpleIntegerOption.h"
 #include "Common/Cpp/Options/DateOption.h"
-#include "Common/NintendoSwitch/NintendoSwitch_Protocol_PushButtons.h"
 #include "CommonFramework/Notifications/EventNotificationsTable.h"
 #include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
 
@@ -30,12 +29,13 @@ class DaySkipperJPN7p8k_Descriptor : public SingleSwitchProgramDescriptor{
 
 class DaySkipperJPN7p8k : public SingleSwitchProgramInstance{
 public:
+    using Descriptor = DaySkipperJPN7p8k_Descriptor;
     DaySkipperJPN7p8k();
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
 
 private:
     SimpleIntegerOption<uint32_t> SKIPS;
-    DateOption START_DATE;
+    DateTimeOption START_DATE;
 
     EventNotificationOption NOTIFICATION_PROGRESS_UPDATE;
     EventNotificationsOption NOTIFICATIONS;
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperJPN.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperJPN.cpp
new file mode 100644
index 0000000000..fb2fbf5cd9
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperJPN.cpp
@@ -0,0 +1,212 @@
+/*  Day Skipper (JPN)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Exceptions.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "Controllers/ControllerTypes.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "NintendoSwitch/Programs/DateManip/NintendoSwitch_DateSkippers.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "PokemonSwSh_DaySkipperStats.h"
+#include "PokemonSwSh_DaySkipperJPN.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+using namespace Pokemon;
+
+
+DaySkipperJPN_Descriptor::DaySkipperJPN_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonSwSh:DaySkipperJPN",
+        STRING_POKEMON + " SwSh", "Day Skipper (JPN)",
+        "Programs/PokemonSwSh/DaySkipperJPN.html",
+        "A day skipper for Japanese date format. (Switch 1: 7600 skips/hour, Switch 2: 5655 skips/hour)",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_WithRestrictions,
+        FeedbackType::NONE,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+std::unique_ptr<StatsTracker> DaySkipperJPN_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new SkipperStats());
+}
+
+
+
+DaySkipperJPN::DaySkipperJPN()
+    : SKIPS(
+        "<b>Number of Frame Skips:</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        10
+    )
+    , NOTIFICATION_PROGRESS_UPDATE("Progress Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_PROGRESS_UPDATE,
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+    , m_advanced_options(
+        "<font size=4><b>Advanced Options:</b> You should not need to touch anything below here.</font>"
+    )
+    , CORRECTION_SKIPS(
+        "<b>Auto-Correct Interval:</b><br>Run auto-recovery every this # of skips. Zero disables the auto-corrections.",
+        LockMode::LOCK_WHILE_RUNNING,
+        1000
+    )
+{
+    PA_ADD_OPTION(SKIPS);
+    PA_ADD_OPTION(NOTIFICATIONS);
+    PA_ADD_STATIC(m_advanced_options);
+    PA_ADD_OPTION(CORRECTION_SKIPS);
+}
+
+
+
+void DaySkipperJPN::run_switch1(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    using namespace DateSkippers::Switch1;
+
+    bool needs_inference;
+    switch (context->performance_class()){
+    case ControllerPerformanceClass::SerialPABotBase_Wired:
+        needs_inference = false;
+        break;
+    case ControllerPerformanceClass::SerialPABotBase_Wireless:
+        needs_inference = true;
+        break;
+    default:
+        throw UserSetupError(
+            env.logger(),
+            "This program requires a controller performance class of \"Wired\" or \"Wireless\" for the Switch 1."
+        );
+    }
+
+    SkipperStats& stats = env.current_stats<SkipperStats>();
+    stats.total_skips = SKIPS;
+    stats.runs++;
+
+    //  Setup globals.
+    uint32_t remaining_skips = SKIPS;
+
+    //  Connect
+    pbf_press_button(context, BUTTON_ZR, 40ms, 40ms);
+
+    //  Setup starting state.
+    init_view(context);
+
+    uint8_t day = 1;
+    uint16_t correct_count = 0;
+    while (remaining_skips > 0){
+        send_program_status_notification(env, NOTIFICATION_PROGRESS_UPDATE);
+
+        if (needs_inference){
+            increment_day_with_feedback(env.console, context, false);
+        }else{
+            increment_day(context, false);
+        }
+
+        if (day == 31){
+            day = 1;
+        }else{
+            correct_count++;
+            day++;
+            remaining_skips--;
+            stats.issued++;
+//            env.log("Skips Remaining: " + tostr_u_commas(remaining_skips));
+            env.update_stats();
+        }
+        if (CORRECTION_SKIPS != 0 && correct_count == CORRECTION_SKIPS){
+            correct_count = 0;
+            auto_recovery(context);
+        }
+
+    }
+
+    //  Prevent the Switch from sleeping and the time from advancing.
+    context.wait_for_all_requests();
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+
+    pbf_wait(context, 15000ms);
+    while (true){
+        ssf_press_button(context, BUTTON_A, 15000ms);
+    }
+}
+void DaySkipperJPN::run_switch2(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    using namespace DateSkippers::Switch2;
+
+    if (context->performance_class() != ControllerPerformanceClass::SerialPABotBase_Wired){
+        throw UserSetupError(
+            env.logger(),
+            "This program requires a controller performance class of \"Wired\" for the Switch 2."
+        );
+    }
+
+    SkipperStats& stats = env.current_stats<SkipperStats>();
+    stats.total_skips = SKIPS;
+    stats.runs++;
+
+    uint32_t remaining_skips = SKIPS;
+
+    //  Connect
+    pbf_press_button(context, BUTTON_ZR, 40ms, 40ms);
+
+    //  Setup starting state.
+    init_view(context);
+
+    uint8_t day = 1;
+    while (remaining_skips > 0){
+        send_program_status_notification(env, NOTIFICATION_PROGRESS_UPDATE);
+
+        increment_day_jp(context);
+
+        if (day == 31){
+            day = 1;
+        }else{
+            day++;
+            remaining_skips--;
+            stats.issued++;
+            env.update_stats();
+        }
+    }
+
+    //  Prevent the Switch from sleeping and the time from advancing.
+    context.wait_for_all_requests();
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+
+    while (true){
+        ssf_press_button(context, BUTTON_A, 760ms);
+        for (int c = 0; c < 10; c++){
+            ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 24ms, 48ms, 24ms);
+        }
+        ssf_press_button(context, BUTTON_A, 14000ms, 80ms);
+    }
+}
+
+
+
+void DaySkipperJPN::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    ConsoleType console_type = env.console.state().console_type();
+    if (is_switch1(console_type)){
+        run_switch1(env, context);
+        return;
+    }
+    if (is_switch2(console_type)){
+        run_switch2(env, context);
+        return;
+    }
+    throw UserSetupError(
+        env.console,
+        "Please select a valid Switch console type."
+    );
+}
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperJPN.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperJPN.h
new file mode 100644
index 0000000000..b849054c05
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperJPN.h
@@ -0,0 +1,56 @@
+/*  Day Skipper (JPN)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_DaySkipperJPN_H
+#define PokemonAutomation_PokemonSwSh_DaySkipperJPN_H
+
+#include "Common/Cpp/Options/StaticTextOption.h"
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+class DaySkipperJPN_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    DaySkipperJPN_Descriptor();
+
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+
+
+class DaySkipperJPN : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = DaySkipperJPN_Descriptor;
+    DaySkipperJPN();
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    void run_switch1(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+    void run_switch2(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+
+private:
+    SimpleIntegerOption<uint32_t> SKIPS;
+
+    EventNotificationOption NOTIFICATION_PROGRESS_UPDATE;
+    EventNotificationsOption NOTIFICATIONS;
+
+    SectionDividerOption m_advanced_options;
+    SimpleIntegerOption<uint16_t> CORRECTION_SKIPS;
+};
+
+
+}
+}
+}
+#endif
+
+
+
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperStats.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperStats.h
similarity index 77%
rename from SerialPrograms/Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperStats.h
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperStats.h
index cb7d3dc664..6ae26c2b1c 100644
--- a/SerialPrograms/Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperStats.h
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperStats.h
@@ -1,6 +1,6 @@
 /*  Day Skipper Stats
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -8,7 +8,7 @@
 #define PokemonAutomation_PokemonSwSh_DaySkipperStats_H
 
 #include "Common/Cpp/PrettyPrint.h"
-#include "CommonFramework/Tools/StatsTracking.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
@@ -25,9 +25,9 @@ class SkipperStats : public StatsTracker{
         m_display_order.emplace_back(Stat("Skips Issued"));
     }
 
-    virtual std::string to_str() const override{
+    virtual std::string to_str(PrintMode mode) const override{
         if (total_skips == 0){
-            return StatsTracker::to_str();
+            return StatsTracker::to_str(mode);
         }else{
             return
                 "Skips Issued: " + tostr_u_commas(issued) +
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperUS.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperUS.cpp
new file mode 100644
index 0000000000..082a8a3552
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperUS.cpp
@@ -0,0 +1,235 @@
+/*  Day Skipper (US)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Exceptions.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "Controllers/ControllerTypes.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "NintendoSwitch/Programs/DateManip/NintendoSwitch_DateSkippers.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "PokemonSwSh_DaySkipperStats.h"
+#include "PokemonSwSh_DaySkipperUS.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+using namespace Pokemon;
+
+
+DaySkipperUS_Descriptor::DaySkipperUS_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonSwSh:DaySkipperUS",
+        STRING_POKEMON + " SwSh", "Day Skipper (US)",
+        "Programs/PokemonSwSh/DaySkipperUS.html",
+        "A day skipper for US date format that.  (Switch 1: ~7100 skips/hour, Switch 2: 5443 skips/hour)",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_WithRestrictions,
+        FeedbackType::NONE,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+std::unique_ptr<StatsTracker> DaySkipperUS_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new SkipperStats());
+}
+
+
+
+DaySkipperUS::DaySkipperUS()
+    : SKIPS(
+        "<b>Number of Frame Skips:</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        10
+    )
+    , REAL_LIFE_YEAR(
+        "<b>Real Life Year:</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        std::min(current_year(), (uint16_t)2060),
+        2000, 2060
+    )
+    , NOTIFICATION_PROGRESS_UPDATE("Progress Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_PROGRESS_UPDATE,
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+    , m_advanced_options(
+        "<font size=4><b>Advanced Options:</b> You should not need to touch anything below here.</font>"
+    )
+    , CORRECTION_SKIPS(
+        "<b>Auto-Correct Interval:</b><br>Run auto-recovery every this # of skips. Zero disables the auto-corrections.",
+        LockMode::LOCK_WHILE_RUNNING,
+        1000
+    )
+{
+    PA_ADD_OPTION(SKIPS);
+    PA_ADD_OPTION(REAL_LIFE_YEAR);
+    PA_ADD_OPTION(NOTIFICATIONS);
+    PA_ADD_STATIC(m_advanced_options);
+    PA_ADD_OPTION(CORRECTION_SKIPS);
+}
+
+
+
+void DaySkipperUS::run_switch1(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    using namespace DateSkippers::Switch1;
+
+    bool needs_inference;
+    switch (context->performance_class()){
+    case ControllerPerformanceClass::SerialPABotBase_Wired:
+        needs_inference = false;
+        break;
+    case ControllerPerformanceClass::SerialPABotBase_Wireless:
+        needs_inference = true;
+        break;
+    default:
+        throw UserSetupError(
+            env.logger(),
+            "This program requires a controller performance class of \"Wired\" or \"Wireless\" for the Switch 1."
+        );
+    }
+
+    SkipperStats& stats = env.current_stats<SkipperStats>();
+    stats.total_skips = SKIPS;
+    stats.runs++;
+
+    //  Setup globals.
+    uint8_t real_life_year = (uint8_t)(
+        REAL_LIFE_YEAR < 2000 ?  0 :
+        REAL_LIFE_YEAR > 2060 ? 60 : REAL_LIFE_YEAR - 2000
+    );
+    uint8_t year = 60;
+    uint32_t remaining_skips = SKIPS;
+
+    //  Connect
+    pbf_press_button(context, BUTTON_ZR, 40ms, 40ms);
+
+    //  Setup starting state.
+    init_view(context);
+    rollback_year_full(context, true);
+    year = 0;
+
+    uint16_t correct_count = 0;
+    while (remaining_skips > 0){
+        send_program_status_notification(env, NOTIFICATION_PROGRESS_UPDATE);
+
+        if (needs_inference){
+            increment_day_with_feedback(env.console, context, true);
+        }else{
+            increment_day(context, true);
+        }
+
+
+        correct_count++;
+        year++;
+        remaining_skips--;
+        stats.issued++;
+//        env.log("Skips Remaining: " + tostr_u_commas(remaining_skips));
+        env.update_stats();
+
+        if (year >= 60){
+            if (real_life_year <= 36){
+                rollback_year_sync(context);
+                year = real_life_year;
+            }else{
+                rollback_year_full(context, true);
+                year = 0;
+            }
+        }
+        if (CORRECTION_SKIPS != 0 && correct_count == CORRECTION_SKIPS){
+            correct_count = 0;
+            auto_recovery(context);
+        }
+    }
+
+    //  Prevent the Switch from sleeping and the time from advancing.
+    context.wait_for_all_requests();
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+
+    pbf_wait(context, 15000ms);
+    while (true){
+        ssf_press_button(context, BUTTON_A, 15000ms);
+    }
+}
+void DaySkipperUS::run_switch2(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    using namespace DateSkippers::Switch2;
+
+#if 1
+    if (context->performance_class() != ControllerPerformanceClass::SerialPABotBase_Wired){
+        throw UserSetupError(
+            env.logger(),
+            "This program requires a controller performance class of \"Wired\" for the Switch 2."
+        );
+    }
+#endif
+
+    SkipperStats& stats = env.current_stats<SkipperStats>();
+    stats.total_skips = SKIPS;
+    stats.runs++;
+
+    uint32_t remaining_skips = SKIPS;
+
+    //  Connect
+    pbf_press_button(context, BUTTON_ZR, 40ms, 40ms);
+
+    //  Setup starting state.
+    init_view(context);
+
+    uint8_t day = 1;
+    while (remaining_skips > 0){
+        send_program_status_notification(env, NOTIFICATION_PROGRESS_UPDATE);
+
+        increment_day_us(context);
+
+        if (day == 31){
+            day = 1;
+        }else{
+            day++;
+            remaining_skips--;
+            stats.issued++;
+            env.update_stats();
+        }
+    }
+
+    //  Prevent the Switch from sleeping and the time from advancing.
+    context.wait_for_all_requests();
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+
+    while (true){
+        ssf_press_button(context, BUTTON_A, 760ms);
+        for (int c = 0; c < 10; c++){
+            ssf_issue_scroll(context, SSF_SCROLL_RIGHT, 24ms, 48ms, 24ms);
+        }
+        ssf_press_button(context, BUTTON_A, 14000ms, 80ms);
+    }
+}
+
+
+
+
+
+void DaySkipperUS::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    ConsoleType console_type = env.console.state().console_type();
+    if (is_switch1(console_type)){
+        run_switch1(env, context);
+        return;
+    }
+    if (is_switch2(console_type)){
+        run_switch2(env, context);
+        return;
+    }
+    throw UserSetupError(
+        env.console,
+        "Please select a valid Switch console type."
+    );
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperUS.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperUS.h
new file mode 100644
index 0000000000..a40c69758d
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperUS.h
@@ -0,0 +1,57 @@
+/*  Day Skipper (US)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_DaySkipperUS_H
+#define PokemonAutomation_PokemonSwSh_DaySkipperUS_H
+
+#include "Common/Cpp/Options/StaticTextOption.h"
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+class DaySkipperUS_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    DaySkipperUS_Descriptor();
+
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+
+
+class DaySkipperUS : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = DaySkipperUS_Descriptor;
+    DaySkipperUS();
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    void run_switch1(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+    void run_switch2(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+
+private:
+    SimpleIntegerOption<uint32_t> SKIPS;
+    SimpleIntegerOption<uint16_t> REAL_LIFE_YEAR;
+
+    EventNotificationOption NOTIFICATION_PROGRESS_UPDATE;
+    EventNotificationsOption NOTIFICATIONS;
+
+    SectionDividerOption m_advanced_options;
+    SimpleIntegerOption<uint16_t> CORRECTION_SKIPS;
+};
+
+
+}
+}
+}
+#endif
+
+
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DenHunting/PokemonSwSh_EventBeamFinder.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DenHunting/PokemonSwSh_EventBeamFinder.cpp
new file mode 100644
index 0000000000..45b65afa03
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DenHunting/PokemonSwSh_EventBeamFinder.cpp
@@ -0,0 +1,108 @@
+/*  Event Beam Finder
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "NintendoSwitch/NintendoSwitch_Settings.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonSwSh/PokemonSwSh_Settings.h"
+#include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
+#include "PokemonSwSh_EventBeamFinder.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+    using namespace Pokemon;
+
+
+EventBeamFinder_Descriptor::EventBeamFinder_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonSwSh:EventBeamFinder",
+        STRING_POKEMON + " SwSh", "Event Beam Finder",
+        "Programs/PokemonSwSh/EventBeamFinder.html",
+        "Drop wishing pieces until you find an event den.",
+        PanelQualityStanding::OFFICIAL_BELOW_STANDARDS,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::NONE,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+
+
+EventBeamFinder::EventBeamFinder()
+    : WAIT_TIME_IN_DEN0(
+        "<b>Wait time in Den:</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        "5800 ms"
+    )
+{
+    PA_ADD_OPTION(START_LOCATION);
+    PA_ADD_OPTION(WAIT_TIME_IN_DEN0);
+}
+
+
+void EventBeamFinder::goto_near_den(ProControllerContext& context) const{
+    ssf_press_left_joystick(context, {0, +1}, 3000ms, 3000ms);
+    pbf_wait(context, 400ms);
+    ssf_press_button(context, BUTTON_PLUS, 800ms);
+    ssf_press_left_joystick(context, {+1, 0}, 800ms, 40ms);
+    ssf_press_button(context, BUTTON_L, 800ms);
+    ssf_press_button(context, BUTTON_PLUS, 800ms);
+    ssf_press_left_joystick(context, {0, +1}, 2960ms, 2960ms);
+}
+void EventBeamFinder::goto_far_den(ProControllerContext& context) const{
+    ssf_press_left_joystick(context, {0, +1}, 7936ms, 7936ms);
+    pbf_wait(context, 400ms);
+    ssf_press_button(context, BUTTON_PLUS, 800ms);
+    ssf_press_left_joystick(context, {-1, 0}, 800ms, 40ms);
+    ssf_press_button(context, BUTTON_L, 800ms);
+    ssf_press_button(context, BUTTON_PLUS, 800ms);
+    ssf_press_left_joystick(context, {0, +1}, 2400ms, 2400ms);
+}
+void EventBeamFinder::drop_wishing_piece(ProControllerContext& context) const{
+    ssf_press_button(context, BUTTON_A, 1600ms, 80ms);
+    ssf_press_button(context, BUTTON_A, 1200ms, 80ms);
+    ssf_press_button(context, BUTTON_A, 40ms);
+    pbf_mash_button(context, BUTTON_B, 4000ms);
+    ssf_press_button(context, BUTTON_A, WAIT_TIME_IN_DEN0, 80ms);
+    pbf_mash_button(context, BUTTON_B, 4800ms);
+}
+void EventBeamFinder::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    if (START_LOCATION.start_in_grip_menu()){
+        grip_menu_connect_go_home(context);
+        resume_game_no_interact(env.console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST);
+        pbf_mash_button(context, BUTTON_B, 5600ms);
+    }else{
+        //  Connect the controller.
+        require_player(env.console, context, BUTTON_B);
+    }
+
+    bool parity = false;
+    while (true){
+        //  Fly back to daycare.
+        ssf_press_button(context, BUTTON_X, GameSettings::instance().OVERWORLD_TO_MENU_DELAY0, 160ms);
+        pbf_mash_button(context, BUTTON_A, 5600ms);
+
+        //  Goto den.
+        if (parity){
+            goto_far_den(context);
+        }else{
+            goto_near_den(context);
+        }
+        parity = !parity;
+
+        //  Drop wishing piece and see what you get.
+        drop_wishing_piece(context);
+    }
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DenHunting/PokemonSwSh_EventBeamFinder.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DenHunting/PokemonSwSh_EventBeamFinder.h
new file mode 100644
index 0000000000..e8c17c2c0a
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DenHunting/PokemonSwSh_EventBeamFinder.h
@@ -0,0 +1,49 @@
+/*  Event Beam Finder
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_EventBeamFinder_H
+#define PokemonAutomation_PokemonSwSh_EventBeamFinder_H
+
+#include "Common/Cpp/Options/TimeDurationOption.h"
+#include "NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+class EventBeamFinder_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    EventBeamFinder_Descriptor();
+};
+
+
+
+class EventBeamFinder : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = EventBeamFinder_Descriptor;
+    EventBeamFinder();
+
+    void goto_near_den(ProControllerContext& context) const;
+    void goto_far_den(ProControllerContext& context) const;
+    void drop_wishing_piece(ProControllerContext& context) const;
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    StartInGripOrGameOption START_LOCATION;
+
+    MillisecondsOption WAIT_TIME_IN_DEN0;
+};
+
+
+}
+}
+}
+#endif
+
+
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DenHunting/PokemonSwSh_PurpleBeamFinder.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DenHunting/PokemonSwSh_PurpleBeamFinder.cpp
new file mode 100644
index 0000000000..d538ee45f1
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DenHunting/PokemonSwSh_PurpleBeamFinder.cpp
@@ -0,0 +1,250 @@
+/*  Purple Beam Finder
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/StaticGlobals.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/NintendoSwitch_Settings.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonSwSh/PokemonSwSh_Settings.h"
+#include "VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_GameEntry.h"
+#include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_SelectionArrowFinder.h"
+#include "VideoGames/PokemonSwSh/Inference/Dens/PokemonSwSh_BeamSetter.h"
+#include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
+#include "PokemonSwSh_PurpleBeamFinder.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+    using namespace Pokemon;
+
+
+PurpleBeamFinder_Descriptor::PurpleBeamFinder_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonSwSh:PurpleBeamFinder",
+        STRING_POKEMON + " SwSh", "Purple Beam Finder",
+        "Programs/PokemonSwSh/PurpleBeamFinder.html",
+        "Automatically reset for a purple beam.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+struct PurpleBeamFinder_Descriptor::Stats : public StatsTracker{
+    Stats()
+        : attempts(m_stats["Attempts"])
+        , errors(m_stats["Errors"])
+        , timeouts(m_stats["Timeouts"])
+        , red_detected(m_stats["Red Detected"])
+        , red_presumed(m_stats["Red Presumed"])
+        , red(m_stats["Red"])
+        , purple(m_stats["Purple"])
+    {
+        m_display_order.emplace_back(Stat("Attempts"));
+        m_display_order.emplace_back(Stat("Errors"));
+        m_display_order.emplace_back(Stat("Timeouts"));
+//        m_display_order.emplace_back(Stat("Red Detected"));
+//        m_display_order.emplace_back(Stat("Red Presumed"));
+        m_display_order.emplace_back(Stat("Red"));
+        m_display_order.emplace_back(Stat("Purple"));
+        m_aliases["Red Detected"] = "Red";
+        m_aliases["Red Presumed"] = "Red";
+    }
+    std::atomic<uint64_t>& attempts;
+    std::atomic<uint64_t>& errors;
+    std::atomic<uint64_t>& timeouts;
+    std::atomic<uint64_t>& red_detected;
+    std::atomic<uint64_t>& red_presumed;
+    std::atomic<uint64_t>& red;
+    std::atomic<uint64_t>& purple;
+};
+std::unique_ptr<StatsTracker> PurpleBeamFinder_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+
+
+PurpleBeamFinder::PurpleBeamFinder()
+    : NOTIFICATION_RED_BEAM("Red Beam", false, false)
+    , NOTIFICATION_PURPLE_BEAM("Purple Beam", true, true, ImageAttachmentMode::JPG)
+    , NOTIFICATIONS({
+        &NOTIFICATION_RED_BEAM,
+        &NOTIFICATION_PURPLE_BEAM,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+    , m_advanced_options(
+        "<font size=4><b>Advanced Options:</b> Don't adjust these unless you're having problems.</font>"
+    )
+    , SAVE_SCREENSHOT(
+        "<b>Screenshot Purple Beams:</b> (for debugging purposes)",
+        LockMode::LOCK_WHILE_RUNNING,
+        false
+    )
+    , TIMEOUT_DELAY0(
+        "<b>Timeout Delay:</b><br>Reset if no beam is detected after this long.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "2000 ms"
+    )
+//    , MAX_STDDEV(
+//        "<b>Maximum Standard Deviation:</b><br>Range: 0 - 768",
+//        10, 0, 768
+//    )
+    , MIN_BRIGHTNESS(
+        "<b>Minimum Brightness:</b><br>Range: 0 - 768",
+        LockMode::LOCK_WHILE_RUNNING,
+        500, 0, 768
+    )
+    , MIN_EUCLIDEAN(
+        "<b>Minimum Euclidean Distance:</b><br>Range: 0 - 443",
+        LockMode::LOCK_WHILE_RUNNING,
+        15, 0, 443
+    )
+    , MIN_DELTA_STDDEV_RATIO(
+        "<b>Minimum Delta/Stddev Ratio:</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        5.0, 0
+    )
+    , MIN_SIGMA_STDDEV_RATIO(
+        "<b>Minimum Sigma/Stddev Ratio:</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        5.0, 0
+    )
+{
+    PA_ADD_OPTION(START_LOCATION);
+    PA_ADD_OPTION(NOTIFICATIONS);
+    if (STATIC_GLOBALS.DEVELOPER_MODE){
+        PA_ADD_STATIC(m_advanced_options);
+        PA_ADD_OPTION(TIMEOUT_DELAY0);
+        PA_ADD_OPTION(MIN_BRIGHTNESS);
+        PA_ADD_OPTION(MIN_EUCLIDEAN);
+        PA_ADD_OPTION(MIN_DELTA_STDDEV_RATIO);
+        PA_ADD_OPTION(MIN_SIGMA_STDDEV_RATIO);
+    }
+}
+
+
+
+
+bool PurpleBeamFinder::run(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    PurpleBeamFinder_Descriptor::Stats& stats = env.current_stats<PurpleBeamFinder_Descriptor::Stats>();
+
+    SelectionArrowFinder arrow_detector(env.console.overlay(), {0.5, 0.5, 0.3, 0.3});
+    int ret = run_until<ProControllerContext>(
+        env.console, context,
+        [](ProControllerContext& context){
+            pbf_mash_button(context, BUTTON_A, 8000ms);
+        },
+        { arrow_detector }
+    );
+    if (ret < 0){
+        env.log("Failed to detect cursor.", COLOR_RED);
+        stats.errors++;
+        return false;
+    }
+    env.log("Detected initial prompt.");
+
+    pbf_mash_button(context, BUTTON_A, 400ms);
+    pbf_wait(context, 800ms);
+    context.wait_for_all_requests();
+
+    ret = run_until<ProControllerContext>(
+        env.console, context,
+        [](ProControllerContext& context){
+            pbf_press_button(context, BUTTON_A, 80ms, 2400ms);
+        },
+        { arrow_detector }
+    );
+    if (ret < 0){
+        env.log("Failed to detect save confirmation.", COLOR_RED);
+        stats.errors++;
+        return false;
+    }
+    env.log("Detected save confirmation.");
+
+    BeamSetter::Detection detection;
+    {
+        BeamSetter setter(env, env.console, context);
+        detection = setter.run(
+            SAVE_SCREENSHOT,
+            TIMEOUT_DELAY0,
+            MIN_BRIGHTNESS,
+            MIN_EUCLIDEAN,
+            MIN_DELTA_STDDEV_RATIO,
+            MIN_SIGMA_STDDEV_RATIO
+        );
+        stats.attempts++;
+    }
+    switch (detection){
+    case BeamSetter::NO_DETECTION:
+        stats.timeouts++;
+        send_program_status_notification(env, NOTIFICATION_RED_BEAM, "Red Beam...");
+        return false;
+    case BeamSetter::RED_DETECTED:
+        stats.red_detected++;
+        send_program_status_notification(env, NOTIFICATION_RED_BEAM, "Red Beam...");
+        return false;
+    case BeamSetter::RED_ASSUMED:
+        stats.red_presumed++;
+        send_program_status_notification(env, NOTIFICATION_RED_BEAM, "Red Beam...");
+        return false;
+    case BeamSetter::PURPLE:
+        stats.purple++;
+        return true;
+    }
+
+    return false;
+}
+
+void PurpleBeamFinder::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    if (START_LOCATION.start_in_grip_menu()){
+        grip_menu_connect_go_home(context);
+        resume_game_front_of_den_nowatts(context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST);
+        pbf_mash_button(context, BUTTON_B, 800ms);
+    }else{
+        //  Connect the controller.
+        require_player(env.console, context, BUTTON_B);
+    }
+    context.wait_for_all_requests();
+
+    while (true){
+        bool exit = run(env, context);
+        env.update_stats();
+        if (exit){
+            break;
+        }
+
+        pbf_press_button(context, BUTTON_HOME, 160ms, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE0);
+        reset_game_from_home_with_inference(
+            env.console, context,
+            ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST
+        );
+    }
+
+    context.wait_for(std::chrono::seconds(2));
+    send_program_finished_notification(
+        env, NOTIFICATION_PURPLE_BEAM,
+        "Found a purple beam!",
+        env.console.video().snapshot()
+    );
+    while (true){
+        pbf_press_button(context, BUTTON_B, 160ms, 160ms);
+        pbf_press_button(context, BUTTON_LCLICK, 160ms, 160ms);
+    }
+}
+
+
+
+
+
+}
+}
+}
+
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_PurpleBeamFinder.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DenHunting/PokemonSwSh_PurpleBeamFinder.h
similarity index 76%
rename from SerialPrograms/Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_PurpleBeamFinder.h
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DenHunting/PokemonSwSh_PurpleBeamFinder.h
index 008bd48e54..86e2e36596 100644
--- a/SerialPrograms/Source/PokemonSwSh/Programs/DenHunting/PokemonSwSh_PurpleBeamFinder.h
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/DenHunting/PokemonSwSh_PurpleBeamFinder.h
@@ -1,6 +1,6 @@
 /*  Purple Beam Finder
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -10,7 +10,7 @@
 #include "Common/Cpp/Options/StaticTextOption.h"
 #include "Common/Cpp/Options/BooleanCheckBoxOption.h"
 #include "Common/Cpp/Options/FloatingPointOption.h"
-#include "Common/Cpp/Options/TimeExpressionOption.h"
+#include "Common/Cpp/Options/TimeDurationOption.h"
 #include "CommonFramework/Notifications/EventNotificationsTable.h"
 #include "NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h"
 #include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
@@ -32,11 +32,12 @@ class PurpleBeamFinder_Descriptor : public SingleSwitchProgramDescriptor{
 
 class PurpleBeamFinder : public SingleSwitchProgramInstance{
 public:
+    using Descriptor = PurpleBeamFinder_Descriptor;
     PurpleBeamFinder();
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
 
 private:
-    bool run(SingleSwitchProgramEnvironment& env, BotBaseContext& context);
+    bool run(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
 
 private:
     StartInGripOrGameOption START_LOCATION;
@@ -47,7 +48,7 @@ class PurpleBeamFinder : public SingleSwitchProgramInstance{
 
     SectionDividerOption m_advanced_options;
     BooleanCheckBoxOption SAVE_SCREENSHOT;
-    TimeExpressionOption<uint16_t> TIMEOUT_DELAY;
+    MillisecondsOption TIMEOUT_DELAY0;
 //    FloatingPoint MAX_STDDEV;
     FloatingPointOption MIN_BRIGHTNESS;
     FloatingPointOption MIN_EUCLIDEAN;
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggAutonomous.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggAutonomous.cpp
new file mode 100644
index 0000000000..8b0ab51f75
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggAutonomous.cpp
@@ -0,0 +1,1195 @@
+/*  Egg Autonomous
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <cmath>
+#include "CommonFramework/StaticGlobals.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/Tools/ErrorDumper.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/NintendoSwitch_Settings.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Notification.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.h"
+#include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_BoxEmptySlotDetector.h"
+#include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_BoxGenderDetector.h"
+#include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_BoxShinySymbolDetector.h"
+#include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_DialogBoxDetector.h"
+#include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_IvJudgeReader.h"
+#include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_BoxNatureDetector.h"
+#include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_SelectionArrowFinder.h"
+#include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_YCommDetector.h"
+#include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
+#include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_BoxHelpers.h"
+#include "VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_EggRoutines.h"
+#include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_MenuNavigation.h"
+#include "PokemonSwSh_EggHelpers.h"
+#include "PokemonSwSh_EggAutonomous.h"
+
+namespace PokemonAutomation{
+
+using namespace Pokemon;
+
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+namespace{
+
+
+}
+
+
+EggAutonomous_Descriptor::EggAutonomous_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonSwSh:EggAutonomous",
+        STRING_POKEMON + " SwSh", "Egg Autonomous",
+        "Programs/PokemonSwSh/EggAutonomous.html",
+        "Automatically fetch+hatch eggs and keep all shinies.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+class EggAutonomous_Descriptor::Stats : public StatsTracker{
+public:
+    Stats()
+        : m_hatched(m_stats["Eggs Hatched"])
+        , m_errors(m_stats["Errors"])
+        , m_fetch_attempts(m_stats["Fetch Attempts"])
+        , m_fetch_success(m_stats["Fetch Success"])
+        , m_shinies(m_stats["Shinies"])
+    {
+        m_display_order.emplace_back("Eggs Hatched");
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+        m_display_order.emplace_back("Fetch Attempts");
+        m_display_order.emplace_back("Fetch Success");
+        m_display_order.emplace_back("Shinies");
+    }
+
+    std::atomic<uint64_t>& m_hatched;
+    std::atomic<uint64_t>& m_errors;
+    std::atomic<uint64_t>& m_fetch_attempts;
+    std::atomic<uint64_t>& m_fetch_success;
+    std::atomic<uint64_t>& m_shinies;
+};
+std::unique_ptr<StatsTracker> EggAutonomous_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+
+EggAutonomous::EggAutonomous()
+    : GO_HOME_WHEN_DONE(false)
+    , LANGUAGE(
+        "<b>Game Language:</b><br>Required to read IVs.",
+        IV_READER().languages(),
+        LockMode::LOCK_WHILE_RUNNING,
+        false
+    )
+    , MAX_KEEPERS(
+        "<b>Max Keepers:</b><br>Stop the program after keeping this many " + STRING_POKEMON + ". "
+        "This number plus the number of " + STRING_POKEMON + " in the box left to your current box must not exceed 30. "
+        "Otherwise, the program will break when that box is full.",
+        LockMode::LOCK_WHILE_RUNNING,
+        10, 1, 30
+    )
+    , LOOPS_PER_FETCH(
+        "<b>Bike Loops Per Fetch:</b><br>Fetch an egg after doing this many bike loops on Route 5.",
+        LockMode::LOCK_WHILE_RUNNING,
+        1, 1
+    )
+    , AUTO_SAVING(
+        "<b>Auto-Saving:</b><br>Automatically save the game to recover from crashes and allow eggs to be unhatched.<br>"
+        "(Unhatching eggs can be useful for obtaining breeding parents by rehatching a perfect egg in a game with a different language.)<br><br>"
+        "To collect (unhatched) eggs with the desired stats, set this option to \"Save before every batch\". "
+        "Then set the Action Table below to \"Stop Program\" on the desired stats. "
+        "Once the program stops on the baby with the desired stats, you can manually reset the game and it will revert to an egg in your party.",
+        {
+            {AutoSave::NoAutoSave, "none", "No auto-saving. (No error/crash recovery.)"},
+            {AutoSave::AfterStartAndKeep, "start-and-keep", "Save at beginning and after obtaining each baby that is kept. (Allows for error/crash recovery.)"},
+            {AutoSave::EveryBatch, "every-batch", "Save before every batch. (Allows you to unhatch eggs.)"},
+        },
+          LockMode::LOCK_WHILE_RUNNING,
+        AutoSave::AfterStartAndKeep
+    )
+    , FILTERS0(
+        StatsHuntIvJudgeFilterTable_Label_Eggs,
+        {
+            .action = true,
+            .shiny = true,
+            .gender = true,
+            .nature = true,
+        }
+    )
+    , DEBUG_PROCESSING_HATCHED(
+        "Debug the part of program after all eggs hatched",
+        LockMode::LOCK_WHILE_RUNNING,
+        false
+    )
+    , SAVE_DEBUG_VIDEO(
+        "<b>Save debug videos to Switch:</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        false
+    )
+    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATION_NONSHINY_KEEP(
+        "Non-Shiny Keep",
+        true, true, ImageAttachmentMode::JPG,
+        {"Notifs"}
+    )
+    , NOTIFICATION_SHINY(
+        "Shiny Hatch",
+        true, true, ImageAttachmentMode::JPG,
+        {"Notifs", "Showcase"}
+    )
+    , m_notification_noop("", false, false)
+    , NOTIFICATIONS({
+        &NOTIFICATION_STATUS_UPDATE,
+        &NOTIFICATION_NONSHINY_KEEP,
+        &NOTIFICATION_SHINY,
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_RECOVERABLE,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+{
+    PA_ADD_OPTION(START_LOCATION);
+    PA_ADD_OPTION(TOUCH_DATE_INTERVAL);
+    // PA_ADD_OPTION(STEPS_TO_HATCH);
+
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+    PA_ADD_OPTION(LANGUAGE);
+    PA_ADD_OPTION(MAX_KEEPERS);
+    PA_ADD_OPTION(LOOPS_PER_FETCH);
+    PA_ADD_OPTION(AUTO_SAVING);
+    PA_ADD_OPTION(FILTERS0);
+    PA_ADD_OPTION(NOTIFICATIONS);
+
+    if (STATIC_GLOBALS.DEVELOPER_MODE){
+        PA_ADD_OPTION(DEBUG_PROCESSING_HATCHED);
+        PA_ADD_OPTION(SAVE_DEBUG_VIDEO);
+    }
+}
+
+void EggAutonomous::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    auto& stats = env.current_stats<EggAutonomous_Descriptor::Stats>();
+    env.update_stats();
+
+    if (START_LOCATION.start_in_grip_menu()){
+        grip_menu_connect_go_home(context);
+        resume_game_back_out(
+            env.console,
+            context,
+            ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST,
+            3200ms
+        );
+    }else{
+        //  Connect the controller.
+        require_player(env.console, context, BUTTON_B);
+    }
+
+    if (DEBUG_PROCESSING_HATCHED){ // only for debugging
+        const bool need_taxi = true;
+        process_hatched_pokemon(env, context, stats, need_taxi);
+        return;
+    }
+
+    menus_to_boxsystem(env.console, context);
+    check_box(env.console, context);
+    context.wait_for_all_requests();
+    context.wait_for(500ms);
+    auto screen = env.console.video().snapshot();
+    size_t num_eggs_in_column_0 = count_eggs_in_first_box_column(env.console, screen);
+    size_t num_empty_slots_in_column_0 = count_empty_slots_in_first_box_column(env.console, screen);
+    size_t num_eggs_in_party = count_eggs_in_party(env.console, screen);
+    size_t num_empty_slots_in_party = count_empty_slots_in_party(env.console, screen);
+    if (num_eggs_in_column_0 + num_empty_slots_in_column_0 != 5){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "Total number of eggs and empty slots in the first box column don't add up to 5. "
+            "During setup, ensure there are no non-egg Pokemon in the first box column.",
+            env.console
+        );
+    }
+    if (num_eggs_in_party + num_empty_slots_in_party != 5){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "Total number of eggs and empty slots in the party don't add up to 5. "
+            "During setup, ensure there is only one Pokemon in the lead slot, and no other Pokemon.",
+            env.console
+        );
+    }
+
+    env.log("Starting with " + std::to_string(num_eggs_in_party) + " eggs in the party and " + 
+        std::to_string(num_eggs_in_column_0) + " eggs in the first box column.");
+
+    // select top Pokemon in party
+    box_scroll(context, DPAD_LEFT);
+    // Change box view to judge or stats
+    Language language = LANGUAGE;
+    if (language == Language::None){
+        change_view_to_stats_or_judge(env.console, context);
+    }else{
+        change_view_to_judge(env.console, context, language);
+    }
+
+    // go back to overworld
+    mash_B_until_y_comm_icon(env.console, context, "Cannot return to overworld.");
+
+    if (AUTO_SAVING == AutoSave::AfterStartAndKeep){
+        save_game(env.console, context);
+        m_num_eggs_in_storage_when_game_saved = num_eggs_in_column_0;
+        m_num_eggs_in_party_when_game_saved = num_eggs_in_party;
+    }
+    num_eggs_in_column_0_at_batch_start = num_eggs_in_column_0;
+    m_num_eggs_in_party_at_batch_start = num_eggs_in_party;
+
+    m_num_pokemon_kept = 0;
+
+    m_player_at_loop_start = false;
+
+    // while(run_batch(env, context, stats)){}
+
+    size_t consecutive_failures = 0;
+    while(m_num_pokemon_kept < MAX_KEEPERS){
+        try{
+            if (TOUCH_DATE_INTERVAL.ok_to_touch_now()){
+                env.log("Touching date to prevent rollover.");
+                env.console.overlay().add_log("Touching date", COLOR_WHITE);
+                go_home(env.console, context);
+                touch_date_from_home(env.console, context, ConsoleSettings::instance().SETTINGS_TO_HOME_DELAY0);
+                resume_game_no_interact(env.console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST);
+            }
+
+            // Hatch one batch of eggs. If run_batch() returns true, stop the egg loop.
+            if (run_batch(env, context, stats)){
+                break;
+            }
+            env.log("stats: " + stats.to_str(StatsTracker::DISPLAY_ON_SCREEN));
+            // We successfully finish one egg loop iteration without any error thrown.
+            // So we reset the failure counter.
+            consecutive_failures = 0;
+        }catch (OperationFailedExceptionWithScreenshot& e){
+            stats.m_errors++;
+            env.update_stats();
+            e.send_recoverable_error_notif_and_telemetry_report(env, NOTIFICATION_ERROR_RECOVERABLE);
+            
+            if (SAVE_DEBUG_VIDEO){
+                // Take a video to give more context for debugging
+                pbf_press_button(context, BUTTON_CAPTURE, 2000ms, 2000ms);
+                context.wait_for_all_requests();
+            }
+
+            // If there is no auto save, then we shouldn't reset to game to lose previous progress.
+            if (AUTO_SAVING == AutoSave::NoAutoSave){
+                throw;
+            }
+
+            consecutive_failures++;
+            if (consecutive_failures >= 3){
+                OperationFailedExceptionWithScreenshot::fire(
+                    ErrorReportMode::SEND_ERROR_REPORT,
+                    "Failed 3 batches in the row.",
+                    env.console
+                );
+            }
+            go_home(env.console, context);
+            env.console.overlay().add_log("Reset game", COLOR_WHITE);
+            reset_game_from_home_with_inference(
+                env.console, context,
+                ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST
+            );
+
+            m_player_at_loop_start = false;
+            num_eggs_in_column_0_at_batch_start = m_num_eggs_in_storage_when_game_saved;
+            m_num_eggs_in_party_at_batch_start = m_num_eggs_in_party_when_game_saved;
+        }
+    }
+
+    env.update_stats();
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+    GO_HOME_WHEN_DONE.run_end_of_program(context);
+}
+
+// Run one iteration of the egg loop:
+// - Hatch five eggs while fetch five eggs.
+// - Check if pokemon needs to be kept. Keep them if needed.
+// - Put five eggs from storage to party. Save game if needed.
+// Return true if the egg loop should stop.
+bool EggAutonomous::run_batch(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EggAutonomous_Descriptor::Stats& stats
+){
+    env.update_stats();
+    send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
+
+    size_t total_eggs_to_fetch = 10 - num_eggs_in_column_0_at_batch_start - m_num_eggs_in_party_at_batch_start;
+    size_t num_eggs_retrieved = 0;
+
+    EggAutoPhase phase = EggAutoPhase::BIKE_LOOP;
+    if (m_player_at_loop_start == false){ // reset position
+        phase = EggAutoPhase::FLY_RESET;
+    }
+
+    size_t total_bike_loop_count = 0;
+    const size_t MAX_BIKE_LOOP_COUNT = 100;
+    size_t num_loops_since_last_fetch_attempt = 0;
+
+    size_t num_eggs_hatched = 0;
+    m_player_at_loop_start = false;
+    
+    // Each iteration in the while-loop is made by:
+    // - bike loops of LOOPS_PER_FETCH times. Bike loops begin at lady or nursery front door, end at lady.
+    // - if not enough eggs fetched, talk to lady to try fetching an egg.
+    while (num_eggs_hatched < 5 || num_eggs_retrieved < total_eggs_to_fetch){
+        env.log("Eggs hatched: " + std::to_string(num_eggs_hatched) +
+            "/5. Eggs fetched: " + std::to_string(num_eggs_retrieved) + "/" + std::to_string(total_eggs_to_fetch));
+
+        // NOTE: the egg hatching detector cannot be constantly running, 
+        // since it only detects the black dialog box, and speaking to the lady will also produce a black dialog box.
+        // therefore, each phase has its own egg hatching detector, so it can be more easily turned on and off.
+
+        switch(phase){
+        case EggAutoPhase::BIKE_LOOP:{
+            env.console.overlay().add_log("Loop " + std::to_string(total_bike_loop_count+1), COLOR_WHITE);
+            env.console.log("Bike Loop " + std::to_string(total_bike_loop_count+1));
+            bool hatch_detected = run_bike_loop(env, context);
+            if (hatch_detected){
+                phase = EggAutoPhase::HATCHING;
+                continue;
+            }
+
+            // done Bike loop
+            ++num_loops_since_last_fetch_attempt;
+            ++total_bike_loop_count;
+            if (total_bike_loop_count >= MAX_BIKE_LOOP_COUNT){
+                // throw exception
+                exceed_bike_loop_limit(env, context, MAX_BIKE_LOOP_COUNT);
+            }
+
+            if (num_loops_since_last_fetch_attempt < LOOPS_PER_FETCH){
+                phase = EggAutoPhase::BIKE_LOOP; // repeat bike loop
+            }else{
+                if (num_eggs_retrieved < total_eggs_to_fetch){
+                    phase = EggAutoPhase::FETCH_EGG;
+                }else{
+                    env.log("Done retrieving eggs. Resume bike loop to hatch eggs.");
+                    // done retrieving eggs
+                    // resume hatching eggs if needed
+                    phase = EggAutoPhase::BIKE_LOOP;
+                }
+            }
+            continue;
+        }
+        case EggAutoPhase::HATCHING:{
+            env.console.log("Hatching egg.");
+            num_eggs_hatched = hatch_routine(env, context, stats, num_eggs_hatched);
+            // env.log("Hatched eggs " + std::to_string(num_eggs_hatched) + "/5");
+            env.console.overlay().add_log("Found egg " + std::to_string(num_eggs_retrieved) + "/" + std::to_string(total_eggs_to_fetch), COLOR_WHITE);
+            phase = EggAutoPhase::FLY_RESET;
+            continue;
+        }
+        case EggAutoPhase::FLY_RESET:{
+            env.console.log("Call flying taxi to reset position.");
+            const bool fly_from_overworld = true;
+            bool hatch_detected = call_flying_taxi(env, context, fly_from_overworld);
+            if (hatch_detected){
+                phase = EggAutoPhase::HATCHING;
+            }else{
+                phase = EggAutoPhase::BIKE_LOOP;
+            }
+            continue;
+        }
+        case EggAutoPhase::FETCH_EGG:{
+            env.console.log("Talk to lady to fetch egg.");
+            EggFetchResult fetch_result = talk_to_lady_to_fetch_egg(env, context, stats);
+            if (fetch_result.hatch_detected){
+                phase = EggAutoPhase::HATCHING;
+            }else{
+                if(fetch_result.found_egg){ 
+                    num_eggs_retrieved++; 
+                    // env.log("Found egg " + std::to_string(num_eggs_retrieved) + "/" + std::to_string(total_eggs_to_fetch));
+                    env.console.overlay().add_log("Found egg " + std::to_string(num_eggs_retrieved) + "/" + std::to_string(total_eggs_to_fetch), COLOR_WHITE);
+                    stats.m_fetch_success++;
+                    env.update_stats();
+                }
+
+                if (!fetch_result.spoke_to_lady){ // never spoke to lady
+                    phase = EggAutoPhase::FLY_RESET;
+                }else{
+                    // if spoke to lady, back to the bike loop regardless of the success of the egg fetch
+                    num_loops_since_last_fetch_attempt = 0;
+                    phase = EggAutoPhase::BIKE_LOOP;
+                }
+
+            }
+            continue;
+        }
+        }
+    }
+
+    // - Go to pokemon storage.
+    // - Check the hatched pokemon, keep shiny pokemon and those that match the stats requirements. Release the rest.
+    // - Retrieve the stored egg column to the party.
+    // - Call flying taxi to reset player location if needed
+    // Return true if the program should stop
+    size_t last_num_pokemon_kept = m_num_pokemon_kept;
+    if (process_hatched_pokemon(env, context, stats, !m_player_at_loop_start)){
+        // While checking hatched pokemon, we find that We need to stop the program:
+        return true;
+    }
+    num_eggs_in_column_0_at_batch_start = 0;
+    m_num_eggs_in_party_at_batch_start = 5;
+    // after process_hatched_pokemon(), the player location is at the start of bike loop
+    m_player_at_loop_start = true;
+
+    bool save = false;
+    switch (AUTO_SAVING){
+    case AutoSave::NoAutoSave:
+        break;
+    case AutoSave::AfterStartAndKeep:
+        save = (last_num_pokemon_kept != m_num_pokemon_kept);
+        break;
+    case AutoSave::EveryBatch:
+        save = true;
+        break;
+    default:
+        throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Invalid saving option.");
+    }
+
+    if (save){
+        save_game(env.console, context);
+        m_num_eggs_in_storage_when_game_saved = 0;
+        m_num_eggs_in_party_when_game_saved = 5;
+    }
+    
+    context.wait_for_all_requests();
+    return false;
+}
+
+bool EggAutonomous::run_bike_loop(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context
+){
+    YCommIconWatcher no_overworld(COLOR_RED, false);
+    int ret = run_until<ProControllerContext>(
+        env.console, context,
+        [](ProControllerContext& context){
+            travel_to_spin_location2(context);
+            travel_back_to_lady2(context);
+        },
+        {{no_overworld}}
+    );
+
+    if (ret == 0){ // no overworld detected. Check if we find egg hatching.
+        BlackDialogBoxWatcher2 egg_hatching_detector;
+        int ret2 = wait_until(
+            env.console, context,
+            std::chrono::seconds(10),
+            {
+                egg_hatching_detector,
+            }
+        );
+        if (ret2 == 0){
+            env.console.log("Hatching detected during bike loop.");
+            return true;
+        }else{
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "run_bike_loop: No recognized state after 10 seconds.",
+                env.console
+            );
+        }
+    }
+
+    return false;
+}
+
+void EggAutonomous::exceed_bike_loop_limit(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    size_t max_bike_loop_count
+){
+    env.console.log("Reached max number of bike loops " + std::to_string(max_bike_loop_count));
+    env.console.overlay().add_log("Error: max loops " + std::to_string(max_bike_loop_count), COLOR_WHITE);
+    env.console.log("Take a screenshot of party to debug.");
+    // Now take a photo at the player's party for dumping debug info:
+    // Enter Rotom Phone menu
+    menus_to_mainmenu(env.console, context);
+    // Select Pokemon App
+    navigate_to_menu_app(env.console, context, POKEMON_APP_INDEX);
+    // From menu enter Pokemon App
+    ssf_press_button(context, BUTTON_A, GameSettings::instance().MENU_TO_POKEMON_DELAY0, EGG_BUTTON_HOLD_DELAY);
+    context.wait_for_all_requests();
+
+    OperationFailedExceptionWithScreenshot::fire(
+        ErrorReportMode::SEND_ERROR_REPORT,
+        "Max number of loops reached. Not enough eggs in party?",
+        env.console
+    );
+
+}
+
+size_t EggAutonomous::hatch_routine(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EggAutonomous_Descriptor::Stats& stats,
+    size_t num_eggs_hatched
+){
+    // confirm we are starting with the hatching screen
+    BlackDialogBoxWatcher2 egg_hatching_detector;
+    int ret0 = wait_until(
+        env.console, context,
+        std::chrono::seconds(5),
+        {
+            egg_hatching_detector,
+        }
+    );
+    if (ret0 < 0){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "hatch_routine: We expected to see a hatching egg, but no hatching detected.",
+            env.console
+        );
+    }
+
+    int ret = -1;
+    do{
+        ++num_eggs_hatched;
+        stats.m_hatched++;
+        env.update_stats();
+        wait_for_egg_hatched(env, context, stats, num_eggs_hatched);
+
+        // Now we see if we can hatch one more egg.
+        ret = run_until<ProControllerContext>(
+            env.console, context,
+            [](ProControllerContext& context){
+                //  Try move a little to hatch more:
+                //  We move toward lower-left so that it wont hit the lady or enter the Nursory.
+                //  Add 1 second of settle time to stop moving.
+                //  We need to not be moving before trying to fly or an egg will hatch during
+                //  that sequence when we cannot handle it.
+                pbf_move_left_joystick(context, {-1, -1}, 800ms, 1000ms);
+            },
+            {{egg_hatching_detector}}
+        );
+    }while (ret == 0);
+
+    return num_eggs_hatched;
+}
+
+
+bool EggAutonomous::call_flying_taxi(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    bool fly_from_overworld
+){
+
+    BlackDialogBoxWatcher2 egg_hatching_detector;
+    int ret = run_until<ProControllerContext>(
+        env.console, context,
+        [&](ProControllerContext& context){
+            context.wait_for_all_requests();
+            env.console.overlay().add_log("Call Flying Taxi", COLOR_WHITE);
+            if (fly_from_overworld){
+                // Open menu
+                env.log("Fly from overworld to reset position");
+                menus_to_mainmenu(env.console, context);
+            }else{
+                env.log("Fly from menu to reset position");
+            }
+
+            navigate_to_menu_app(env.console, context, TOWN_MAP_APP_INDEX);            
+        },
+        {{egg_hatching_detector}}
+    );
+
+    bool hatch_detected = ret == 0;
+    if (hatch_detected){
+        env.console.log("Hatching detected while trying to call flying taxi.");
+    }else {
+        fly_home(context, false);
+        mash_B_until_y_comm_icon(env.console, context, "Cannot detect end of flying taxi animation.");
+    }
+
+    return hatch_detected;
+}
+
+void EggAutonomous::wait_for_egg_hatched(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EggAutonomous_Descriptor::Stats& stats,
+    size_t num_hatched_eggs
+){
+    env.console.overlay().add_log("Egg hatching " + std::to_string(num_hatched_eggs) + "/5", COLOR_GREEN);
+    const bool y_comm_visible_at_end_of_egg_hatching = true;
+    YCommIconWatcher end_egg_hatching_detector(COLOR_RED, y_comm_visible_at_end_of_egg_hatching);
+    const int ret = run_until<ProControllerContext>(
+        env.console, context,
+        [](ProControllerContext& context){
+            pbf_mash_button(context, BUTTON_B, 60000ms);
+        },
+        {{end_egg_hatching_detector}}
+    );
+    if (ret > 0){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "Cannot detect egg hatching ends.",
+            env.console
+        );
+    }
+}
+
+EggFetchResult EggAutonomous::talk_to_lady_to_fetch_egg(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EggAutonomous_Descriptor::Stats& stats
+){
+    env.log("Fetching egg");
+    stats.m_fetch_attempts++;
+    env.update_stats();
+
+    YCommIconWatcher overworld;
+    RetrieveEggArrowFinder egg_arrow_detector(env.console);
+    CheckNurseryArrowFinder no_egg_arrow_detector(env.console);
+    WhiteDialogBoxWatcher white_dialog;
+    BlackDialogBoxWatcher2 black_dialog;
+
+    size_t seen_overworld = 0;
+    bool egg_status_known = false;
+    bool found_egg = false;
+
+    WallClock deadline = current_time() + std::chrono::minutes(2);
+    while(!egg_status_known && current_time() < deadline){
+        context.wait_for_all_requests();
+        int ret = wait_until(
+            env.console, context,
+            std::chrono::seconds(30),
+            {
+                overworld,
+                egg_arrow_detector,
+                black_dialog,
+                white_dialog,
+                no_egg_arrow_detector,
+            }
+        );
+        switch (ret){
+        case 0: // overworld
+            env.log("Detected Overworld...", COLOR_BLUE);
+            seen_overworld++;
+            if (seen_overworld > 10){
+                // No NPC found
+                env.log("Stuck in Overworld. Daycare lady not found.", COLOR_BLUE);
+                return EggFetchResult{
+                    .found_egg = false,
+                    .hatch_detected = false,
+                    .spoke_to_lady = false
+                };
+            }
+            pbf_press_button(context, BUTTON_A, 160ms, 100ms);
+            continue;            
+        case 1: // egg_arrow_detector
+            env.log("Found egg");            
+            found_egg = true;
+            // Press A to get the egg
+            ssf_press_button(context, BUTTON_A, 320ms, 160ms);
+            continue;        
+        case 2: // black_dialog
+            if (found_egg){
+                env.log("Received egg");
+                egg_status_known = true;  // break the loop. then mash B
+
+            }else{ // this black dialog might actually be a hatching egg.
+                env.log("Hatching detected while trying to talk to lady to fetch egg.");
+                return EggFetchResult{
+                    .found_egg = false,
+                    .hatch_detected = true,
+                    .spoke_to_lady = true
+                };
+            }
+            continue;
+        case 3: // white_dialog
+            env.log("Detected dialog box...", COLOR_BLUE);
+            pbf_press_button(context, BUTTON_A, 160ms, 40ms);
+            continue;            
+        case 4: // no_egg_arrow_detector
+            env.log("No egg");
+            env.console.overlay().add_log("No egg", COLOR_WHITE);
+            found_egg = false;
+            egg_status_known = true;  // break the loop. then mash B
+            continue;     
+        default:
+           OperationFailedExceptionWithScreenshot::fire(
+               ErrorReportMode::SEND_ERROR_REPORT,
+               "talk_to_lady_to_fetch_egg(): No recognized state after 30 seconds.",
+               env.console
+           );
+        }
+    }
+
+    if (!egg_status_known){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "talk_to_lady_to_fetch_egg(): Caught in loop. Unable to speak to lady after 2 minutes.",
+            env.console
+        );
+    }
+
+    // we know if the egg was found or not
+    // mash b to return to overworld
+    int ret2 = run_until<ProControllerContext>(
+        env.console, context,
+        [](ProControllerContext& context){
+            pbf_mash_button(context, BUTTON_B, 30s);
+        },
+        {{overworld}}
+    );
+    if (ret2 < 0){ // If dialog over is not detected:
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "Cannot detect end of Nursery lady dialog. No Y-Comm mark found.",
+            env.console
+        );
+    }
+
+    return EggFetchResult{ 
+        .found_egg = found_egg,
+        .hatch_detected = false,
+        .spoke_to_lady = true
+    };
+}
+
+// After all five eggs hatched and another five eggs deposit into the first column of the box,
+// call this function to:
+// - Go to pokemon storage.
+// - Check the hatched pokemon, keep shiny pokemon and those that match the stats requirements. Release the rest.
+// - Retrieve the stored egg column to the party.
+// - Call flying taxi to reset player location if needed
+// Return true if the program should stop
+bool EggAutonomous::process_hatched_pokemon(
+    SingleSwitchProgramEnvironment& env,
+    ProControllerContext& context,
+    EggAutonomous_Descriptor::Stats& stats,
+    bool need_taxi
+){
+    env.log("Checking hatched pokemon.");
+    env.console.overlay().add_log("Checking hatched pokemon", COLOR_WHITE);
+
+    menus_to_boxsystem(env.console, context);
+
+    // Before processing the box:
+    // Confirm that Box Column 0 has 5 eggs, and the party has no eggs
+    context.wait_for_all_requests();
+    context.wait_for(500ms);
+    auto screen0 = env.console.video().snapshot();
+    size_t num_eggs_in_column_0_before = count_eggs_in_first_box_column(env.console, screen0);
+    size_t num_empty_slots_in_column_0_before = count_empty_slots_in_first_box_column(env.console, screen0);
+    size_t num_eggs_in_party_before = count_eggs_in_party(env.console, screen0);
+    size_t num_empty_slots_in_party_before = count_empty_slots_in_party(env.console, screen0);
+    if (num_eggs_in_column_0_before != 5 || num_empty_slots_in_column_0_before != 0){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "process_hatched_pokemon: Before processing, we expected 5 eggs in the first box column.",
+            env.console
+        );
+    }
+    if (num_eggs_in_party_before != 0 || num_empty_slots_in_party_before != 0){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "process_hatched_pokemon: Before processing, we expected a party without eggs (and no empty slots), since they should all be hatched.",
+            env.console
+        );        
+    }
+
+
+    const Milliseconds BOX_CHANGE_DELAY = GameSettings::instance().BOX_CHANGE_DELAY0;
+    const Milliseconds BOX_PICKUP_DROP_DELAY = GameSettings::instance().BOX_PICKUP_DROP_DELAY0;
+
+    // select top Pokemon in party
+    box_scroll(context, DPAD_LEFT);
+    // select the first egg
+    box_scroll(context, DPAD_DOWN);
+
+    context.wait_for_all_requests();
+    {
+        // Define the scope of video overlay rendering for various checks:
+        VideoOverlaySet overlay_set(env.console.overlay());
+        BoxShinySymbolDetector shiny_symbol;
+        shiny_symbol.make_overlays(overlay_set);
+        BoxGenderDetector gender_detector;
+        gender_detector.make_overlays(overlay_set);
+        IvJudgeReaderScope iv_reader(env.console.overlay(), LANGUAGE);
+        BoxNatureDetector nature_detector(env.console.overlay());
+
+        for (size_t i_hatched = 0; i_hatched < 5; i_hatched++){
+            pbf_wait(context, 400ms); // wait for a while to make sure the pokemon stats are loaded.
+            context.wait_for_all_requests();
+            auto screen = env.console.video().snapshot();
+
+            bool shiny = shiny_symbol.detect(screen);
+            if (shiny){
+                env.log("Pokemon " + std::to_string(i_hatched) + " is shiny!", COLOR_BLUE);
+                env.console.overlay().add_log("Pokemon " + std::to_string(i_hatched+1) + "/5 is shiny!", COLOR_YELLOW);
+                stats.m_shinies++;
+                env.update_stats();
+                send_encounter_notification(
+                    env,
+                    m_notification_noop,
+                    NOTIFICATION_SHINY,
+                    false, true, {{{}, ShinyType::UNKNOWN_SHINY}}, std::nan(""),
+                    screen
+                );
+            }else{
+                env.log("Pokemon " + std::to_string(i_hatched) + " is not shiny.", COLOR_PURPLE);
+                env.console.overlay().add_log("Pokemon " + std::to_string(i_hatched+1) + "/5 not shiny", COLOR_WHITE);
+            }
+            // Note: we assume the pokemon storage UI is in the state of judging pokemon stats.
+            //   In this way we can detect pokemon stats.
+            
+            IvJudgeReader::Results IVs = iv_reader.read(env.console, screen);
+            StatsHuntGenderFilter gender = gender_detector.detect(screen);
+            env.log(IVs.to_string(), COLOR_GREEN);
+            env.log("Gender: " + gender_to_string(gender), COLOR_GREEN);
+            NatureReader::Results nature = nature_detector.read(env.console.logger(), screen);
+
+            StatsHuntAction action = FILTERS0.get_action(shiny, gender, nature.nature, IVs);
+
+            auto send_keep_notification = [&](){
+                if (!shiny){
+                    send_encounter_notification(
+                        env,
+                        NOTIFICATION_NONSHINY_KEEP,
+                        NOTIFICATION_SHINY,
+                        false, false, {}, std::nan(""),
+                        screen
+                    );
+                }
+            };
+            switch (action){
+            case StatsHuntAction::StopProgram:
+                env.log("Program stop requested...");
+                env.console.overlay().add_log("Request program stop", COLOR_WHITE);
+                send_keep_notification();
+                return true;
+            case StatsHuntAction::Keep:
+                env.log("Moving Pokemon to keep box...", COLOR_BLUE);
+                m_num_pokemon_kept++;
+                env.console.overlay().add_log("Keep pokemon " + std::to_string(m_num_pokemon_kept) + "/" + std::to_string(MAX_KEEPERS), COLOR_YELLOW);
+                send_keep_notification();
+
+                // Press A twice to pick the pokemon
+                ssf_press_button_ptv(context, BUTTON_A, 480ms, EGG_BUTTON_HOLD_DELAY);
+                ssf_press_button_ptv(context, BUTTON_A, BOX_PICKUP_DROP_DELAY, EGG_BUTTON_HOLD_DELAY);
+
+                // Move it rightward, so that it stays on top of the box area
+                box_scroll(context, DPAD_RIGHT);
+                // Press Button L to change to the box on the left
+                ssf_press_button_ptv(context, BUTTON_L, BOX_CHANGE_DELAY, EGG_BUTTON_HOLD_DELAY);
+
+                // Because we don't know which place in the box to place the pokemon, we will
+                // throw the pokemon in the all-box view. So it automatically sit in the first empty slot
+                // in the box:
+                
+                // Move it three times upward, so that it stays on top of the "Box List" button
+                box_scroll(context, DPAD_UP);
+                box_scroll(context, DPAD_UP);
+                box_scroll(context, DPAD_UP);
+                
+                // Press the button to go to box list view
+                ssf_press_button_ptv(context, BUTTON_A, BOX_CHANGE_DELAY, EGG_BUTTON_HOLD_DELAY);
+                // Press button A to drop the pokemon into the box
+                ssf_press_button_ptv(context, BUTTON_A, BOX_PICKUP_DROP_DELAY, EGG_BUTTON_HOLD_DELAY);
+                // Press button B to go back to the last box
+                ssf_press_button_ptv(context, BUTTON_B, BOX_CHANGE_DELAY, EGG_BUTTON_HOLD_DELAY);
+                // Press button R to change to the box on the right, the box with the next batch of eggs
+                ssf_press_button_ptv(context, BUTTON_R, BOX_CHANGE_DELAY, EGG_BUTTON_HOLD_DELAY);
+                // Move cursor left to point to the last slot in the party
+                box_scroll(context, DPAD_LEFT);
+                // Move cursor downward three times so that it goes to the original place (second slot in the party)
+                box_scroll(context, DPAD_DOWN);
+                box_scroll(context, DPAD_DOWN);
+                box_scroll(context, DPAD_DOWN);
+                
+                if (m_num_pokemon_kept >= MAX_KEEPERS){
+                    env.log("Max keepers reached. Stopping program...");
+                    env.console.overlay().add_log("Max Keepers reached.", COLOR_WHITE);
+                    // Stopping here skips the save at the end of the batch, so save now
+                    // or the last kept pokemon is lost if the game is reset.
+                    if (AUTO_SAVING != AutoSave::NoAutoSave){
+                        menus_to_mainmenu(env.console, context);
+                        save_game(env.console, context);
+                    }
+                    return true;
+                }
+                break;
+            case StatsHuntAction::Discard:
+                env.log("Releasing Pokemon...", COLOR_PURPLE);
+                env.console.overlay().add_log("Release Pokemon", COLOR_WHITE);
+
+                // ssf_press_button2(context, BUTTON_A, 60, 10);
+                // ssf_press_dpad2(context, DPAD_UP, BOX_SCROLL_DELAY, EGG_BUTTON_HOLD_DELAY);
+                // ssf_press_dpad2(context, DPAD_UP, BOX_SCROLL_DELAY, EGG_BUTTON_HOLD_DELAY);
+                // ssf_press_button2(context, BUTTON_A, 125, 10);
+                // ssf_press_dpad2(context, DPAD_UP, BOX_SCROLL_DELAY, EGG_BUTTON_HOLD_DELAY);
+                // pbf_mash_button(context, BUTTON_A, 180);
+
+                // Press A to open pokemon menu
+                pbf_press_button(context, BUTTON_A, 160ms, 400ms);
+                context.wait_for_all_requests();
+                StoragePokemonMenuArrowFinder pokemon_menu_detector(env.console.overlay());
+                int ret = wait_until(
+                    env.console, context, std::chrono::seconds(10),
+                    {{pokemon_menu_detector}}
+                );
+                if (ret != 0){
+                    OperationFailedExceptionWithScreenshot::fire(
+                        ErrorReportMode::SEND_ERROR_REPORT,
+                        "Cannot detect pokemon menu in storage box.",
+                        env.console
+                    );
+                }
+
+                const bool stop_on_detected = true;
+                BlackDialogBoxDetector dialog_detector(stop_on_detected);
+                VideoOverlaySet dialog_overlay_set(env.console);
+                dialog_detector.make_overlays(dialog_overlay_set);
+
+                // Move cursor upward two times to point to "Release" menu item
+                pbf_press_dpad(context, DPAD_UP, 160ms, 160ms);
+                pbf_press_dpad(context, DPAD_UP, 160ms, 160ms);
+
+                // Press A to release
+                pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+                // Move cursor from "Not release" to "release".
+                pbf_press_dpad(context, DPAD_UP, 160ms, 240ms);
+                // Press A to confirm release, wait for a while to let the next dialog box pop up.
+                pbf_press_button(context, BUTTON_A, 160ms, 1600ms);
+
+                context.wait_for_all_requests();
+                ret = wait_until(
+                    env.console, context, std::chrono::seconds(10),
+                    {{dialog_detector}}
+                );
+                if (ret != 0){
+                    OperationFailedExceptionWithScreenshot::fire(
+                        ErrorReportMode::SEND_ERROR_REPORT,
+                        "Miss second dialog when releasing pokemon.",
+                        env.console
+                    );
+                }
+                pbf_press_button(context, BUTTON_A, 160ms, 800ms);
+                
+                size_t dialog_count = 0;
+                const size_t max_dialog_count = 6;
+                for (; dialog_count < max_dialog_count; dialog_count++){
+                    context.wait_for_all_requests();
+                    if (!dialog_detector.process_frame(env.console.video().snapshot(), current_time())){
+                        break;
+                    }
+                    pbf_press_button(context, BUTTON_A, 160ms, 800ms);
+                }
+                if (dialog_count == max_dialog_count){
+                    OperationFailedExceptionWithScreenshot::fire(
+                        ErrorReportMode::SEND_ERROR_REPORT,
+                        "Unexpected dialogs when releasing pokemon.",
+                        env.console
+                    );
+                }
+                break;
+            }
+        }
+    }
+
+    // Get eggs to party:
+
+    // Move cursor to the first slot in the box
+    box_scroll(context, DPAD_UP);
+    box_scroll(context, DPAD_RIGHT);
+
+    // Press Y twice to change selection method to group selection
+    pbf_press_button(context, BUTTON_Y, EGG_BUTTON_HOLD_DELAY, 400ms);
+    pbf_press_button(context, BUTTON_Y, EGG_BUTTON_HOLD_DELAY, 400ms);
+
+    // Press A to start selection
+    pbf_press_button(context, BUTTON_A, EGG_BUTTON_HOLD_DELAY, 400ms);
+    // Move down to selection the entire column
+    for (size_t c = 0; c < 4; c++){
+        box_scroll(context, DPAD_DOWN);
+    }
+    // Press A to finish the selection
+    ssf_press_button_ptv(context, BUTTON_A, BOX_PICKUP_DROP_DELAY, EGG_BUTTON_HOLD_DELAY);
+    
+    // Move cursor to the second slot in the party
+    box_scroll(context, DPAD_LEFT);
+    box_scroll(context, DPAD_DOWN);
+
+    // Press A to finish dropping the egg column 
+    ssf_press_button_ptv(context, BUTTON_A, BOX_PICKUP_DROP_DELAY, EGG_BUTTON_HOLD_DELAY);
+
+    // After processing the box:
+    // Confirm that Box Column 0 is empty, and the party is full of eggs
+    check_box(env.console, context);
+    context.wait_for_all_requests();
+    context.wait_for(500ms);
+    auto screen = env.console.video().snapshot();
+    size_t num_eggs_in_column_0_after = count_eggs_in_first_box_column(env.console, screen);
+    size_t num_empty_slots_in_column_0_after = count_empty_slots_in_first_box_column(env.console, screen);
+    size_t num_eggs_in_party_after = count_eggs_in_party(env.console, screen);
+    size_t num_empty_slots_in_party_after = count_empty_slots_in_party(env.console, screen);
+    if (num_eggs_in_column_0_after != 0 || num_empty_slots_in_column_0_after != 5){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "process_hatched_pokemon: After processing, we expected an empty first box column.",
+            env.console
+        );
+    }
+
+    if (num_eggs_in_party_after != 5 || num_empty_slots_in_party_after != 0){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "process_hatched_pokemon: After processing, we expected a party full of 5 eggs.",
+            env.console
+        );        
+    }
+
+    //  Back out to menu.
+    menus_to_mainmenu(env.console, context);
+
+    if (need_taxi){
+        bool fly_from_overworld = false; // fly from menu
+        call_flying_taxi(env, context, fly_from_overworld);
+    }else{
+        // Leave menu, go back to overworld
+        const bool y_comm_visible = true;
+        YCommIconWatcher y_comm_detector(COLOR_RED, y_comm_visible);
+        const int ret = run_until<ProControllerContext>(
+            env.console, context,
+            [](ProControllerContext& context){
+                pbf_mash_button(context, BUTTON_B, 5000ms);
+            },
+            {{y_comm_detector}}
+        );
+        if (ret > 0){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "Cannot detect Y-Comm after leaving menu.",
+                env.console
+            );
+        }
+    }
+
+    return false;
+}
+
+
+
+void EggAutonomous::check_box(VideoStream& stream, ProControllerContext& context){
+    context.wait_for_all_requests();
+    context.wait_for(500ms);
+    
+    auto screen = stream.video().snapshot();
+    check_box_filled(stream, screen);
+    check_non_egg_lead(stream, screen);
+}
+
+
+void EggAutonomous::check_box_filled(VideoStream& stream, const ImageViewRGB32& screen){
+    for (uint8_t row = 0; row < 5; row++){
+        for (uint8_t column = 1; column < 6; column++){
+            BoxEmptySlotDetector slot(SlotLocation::BOX, row, column);
+            bool is_empty = slot.detect(screen);
+            // stream.log("row " + std::to_string(row) + " col " + std::to_string(column) + (is_empty ? " is_empty" : " not empty"));
+            if (is_empty){
+                OperationFailedExceptionWithScreenshot::fire(
+                    ErrorReportMode::SEND_ERROR_REPORT,
+                    "check_box_filled: Box is not filled.",
+                    stream
+                );
+            }
+
+        }
+    }
+}
+
+void EggAutonomous::check_non_egg_lead(VideoStream& stream, const ImageViewRGB32& screen){
+    BoxEmptySlotDetector slot(SlotLocation::PARTY, 0, 0);
+    bool is_empty = slot.detect(screen);
+    if (is_empty){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "check_non_egg_lead: Detected an empty lead slot in party. This shouldn't be possible.",
+            stream
+        );
+    }
+
+    BoxEggDetector egg(SlotLocation::PARTY, 0);
+    bool is_egg = egg.detect(screen);
+    if (is_egg){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "check_non_egg_lead: Detected an egg in lead slot of party.",
+            stream
+        );
+    }
+}
+
+size_t EggAutonomous::count_eggs_in_party(VideoStream& stream, const ImageViewRGB32& screen){
+    size_t num_eggs = 0;
+    for (uint8_t row = 0; row < 6; row++){
+        BoxEggDetector egg(SlotLocation::PARTY, row);
+        bool is_egg = egg.detect(screen);
+        if (is_egg) { num_eggs++; }
+    }
+
+    return num_eggs;
+}
+
+size_t EggAutonomous::count_empty_slots_in_party(VideoStream& stream, const ImageViewRGB32& screen){
+    size_t num_empty = 0;
+    for (uint8_t row = 0; row < 6; row++){
+        BoxEmptySlotDetector slot(SlotLocation::PARTY, row, 0);
+        bool is_empty = slot.detect(screen);
+        if (is_empty) { num_empty++; }
+    }
+
+    return num_empty;
+}
+
+size_t EggAutonomous::count_eggs_in_first_box_column(VideoStream& stream, const ImageViewRGB32& screen){
+
+    size_t num_eggs = 0;
+    for (uint8_t row = 0; row < 5; row++){
+        BoxEggDetector egg(SlotLocation::BOX, row);
+        bool is_egg = egg.detect(screen);
+        if (is_egg) { num_eggs++; }
+    }
+
+    return num_eggs;
+}
+
+size_t EggAutonomous::count_empty_slots_in_first_box_column(VideoStream& stream, const ImageViewRGB32& screen){
+
+    size_t num_empty = 0;
+    for (uint8_t row = 0; row < 5; row++){
+        BoxEmptySlotDetector slot(SlotLocation::BOX, row, 0);
+        bool is_empty = slot.detect(screen);
+        if (is_empty) { num_empty++; }
+    }
+
+    return num_empty;
+}
+
+
+
+
+
+}
+}
+}
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggAutonomous.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggAutonomous.h
new file mode 100644
index 0000000000..d5edaa020f
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggAutonomous.h
@@ -0,0 +1,211 @@
+/*  Egg Autonomous
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_EggAutonomous_H
+#define PokemonAutomation_PokemonSwSh_EggAutonomous_H
+
+#include <optional>
+#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "CommonTools/Options/LanguageOCROption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+#include "NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h"
+#include "Pokemon/Options/Pokemon_StatsHuntFilter.h"
+#include "VideoGames/PokemonSwSh/Options/PokemonSwSh_DateToucher.h"
+// #include "VideoGames/PokemonSwSh/Options/PokemonSwSh_EggStepCount.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+enum class EggAutoPhase{
+    BIKE_LOOP,
+    HATCHING,
+    FLY_RESET,
+    FETCH_EGG,
+
+};
+
+struct EggFetchResult{
+    bool found_egg;
+    bool hatch_detected;
+    bool spoke_to_lady;
+};
+
+
+
+class EggAutonomous_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    EggAutonomous_Descriptor();
+    class Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+
+
+class EggAutonomous : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = EggAutonomous_Descriptor;
+    EggAutonomous();
+
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    // Run one iteration of the egg loop:
+    // - Hatch five eggs while fetch five eggs.
+    // - Check if pokemon needs to be kept. Keep them if needed.
+    // - Put five eggs from storage to party. Save game if needed.
+    // Return true if the egg loop should stop.
+    bool run_batch(
+        SingleSwitchProgramEnvironment& env,
+        ProControllerContext& context,
+        EggAutonomous_Descriptor::Stats& stats
+    );
+
+
+    // return true if egg hatching detected during the bike loop
+    bool run_bike_loop(
+        SingleSwitchProgramEnvironment& env,
+        ProControllerContext& context
+    );
+
+    void exceed_bike_loop_limit(
+        SingleSwitchProgramEnvironment& env,
+        ProControllerContext& context,
+        size_t max_bike_loop_count
+    );
+
+    // Return updated `num_eggs_hatched` to reflect change in hatched eggs.
+    size_t hatch_routine(
+        SingleSwitchProgramEnvironment& env,
+        ProControllerContext& context,
+        EggAutonomous_Descriptor::Stats& stats,
+        size_t num_eggs_hatched
+    );
+
+    // Call flying taxi to reset player character position to Nursery front door.
+    // fly_from_overworld: if true, the game is in the overworld while calling this function. If false, the game is in the menu.
+    // Note: the cursor in the menu must already be at Town Map.
+    // return true if egg hatching detected while trying to open Rotom phone menu
+    bool call_flying_taxi(
+        SingleSwitchProgramEnvironment& env,
+        ProControllerContext& context,
+        bool fly_from_overworld
+    );
+
+    // After detecting egg hatching, call this function to wait entil the end of the hatching.
+    // num_hatched_eggs: how many eggs hatched (including the current hatching one)
+    void wait_for_egg_hatched(
+        SingleSwitchProgramEnvironment& env,
+        ProControllerContext& context,
+        EggAutonomous_Descriptor::Stats& stats,
+        size_t num_hatched_eggs
+    );
+
+    // Call this function when standing in front of the lady to fetch one egg.
+    // return EggFetchResult, which is a struct of the following:
+    //  - found_egg: boolean that is true if an egg was retrieved from the lady
+    //  - hatch_detected: boolean that is true if hatch was detected.
+    //  - spoke_to_lady: boolean that is true if we spoke to the lady
+    EggFetchResult talk_to_lady_to_fetch_egg(
+        SingleSwitchProgramEnvironment& env,
+        ProControllerContext& context,
+        EggAutonomous_Descriptor::Stats& stats
+    );
+
+    // After all five eggs hatched and another five eggs deposit into the first column of the box,
+    // call this function to:
+    // - Go to pokemon storage.
+    // - Check the hatched pokemon, keep shiny pokemon and those that match the stats requirements. Release the rest.
+    // - Retrieve the stored egg column to the party.
+    // - Call flying taxi to reset player location if needed
+    // Return true if the program should stop
+    bool process_hatched_pokemon(
+        SingleSwitchProgramEnvironment& env,
+        ProControllerContext& context,
+        EggAutonomous_Descriptor::Stats& stats,
+        bool need_taxi
+    );
+
+    // Starting within the box, confirm that the lead is not an egg, and that the box is full except for the first column
+    // this is run before each batch
+    void check_box(VideoStream& stream, ProControllerContext& context);
+
+    // ensure that all rows/columns are filled except the first column
+    // ASSUMES: the cursor should NOT be on the box, with the exception that it can be at the top row. 
+    // This is because it pop-up text otherwise covers up the box slot, preventing proper detection
+    void check_box_filled(VideoStream& stream, const ImageViewRGB32& screen);
+
+    // ensure that the lead pokemon in the party is not an egg
+    void check_non_egg_lead(VideoStream& stream, const ImageViewRGB32& screen);
+
+    size_t count_eggs_in_party(VideoStream& stream, const ImageViewRGB32& screen);
+    size_t count_empty_slots_in_party(VideoStream& stream, const ImageViewRGB32& screen);
+
+    size_t count_eggs_in_first_box_column(VideoStream& stream, const ImageViewRGB32& screen);
+    size_t count_empty_slots_in_first_box_column(VideoStream& stream, const ImageViewRGB32& screen);
+
+
+
+
+    StartInGripOrGameOption START_LOCATION;
+    TouchDateIntervalOption TOUCH_DATE_INTERVAL;
+    // EggStepCountOption STEPS_TO_HATCH;
+    
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
+
+    OCR::LanguageOCROption LANGUAGE;
+
+    SimpleIntegerOption<uint8_t> MAX_KEEPERS;
+    SimpleIntegerOption<uint8_t> LOOPS_PER_FETCH;
+
+    enum class AutoSave{
+        NoAutoSave,
+        AfterStartAndKeep,
+        EveryBatch,
+    };
+    EnumDropdownOption<AutoSave> AUTO_SAVING;
+    
+    Pokemon::StatsHuntIvJudgeFilterTable FILTERS0;
+
+    BooleanCheckBoxOption DEBUG_PROCESSING_HATCHED;
+    BooleanCheckBoxOption SAVE_DEBUG_VIDEO;
+
+    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
+    EventNotificationOption NOTIFICATION_NONSHINY_KEEP;
+    EventNotificationOption NOTIFICATION_SHINY;
+    EventNotificationOption m_notification_noop;
+    EventNotificationsOption NOTIFICATIONS;
+
+    // How many pokemon have been kept so far. These pokemon are shiny or met certain stats requirement.
+    size_t m_num_pokemon_kept = 0;
+
+    // How many eggs have been placed behind a game save.
+    // This is used so that if we recover from an error, we know how many eggs are in storage.
+    size_t m_num_eggs_in_storage_when_game_saved = 0;
+
+    // This is used so that if we recover from an error, we know how many eggs are in the party
+    size_t m_num_eggs_in_party_when_game_saved = 0;
+
+    // number of eggs in box column 0 at the start of run_batch()
+    size_t num_eggs_in_column_0_at_batch_start = 0;
+
+    // number of eggs in party at the start of run_batch()
+    size_t m_num_eggs_in_party_at_batch_start = 0;
+
+    // Is player's location at the bike loop start
+    bool m_player_at_loop_start = false;
+};
+
+    
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggCombinedShared.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggCombinedShared.h
new file mode 100644
index 0000000000..30bd4af35a
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggCombinedShared.h
@@ -0,0 +1,275 @@
+/*  Egg Combined Shared Libraries
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_EggCombinedShared_H
+#define PokemonAutomation_PokemonSwSh_EggCombinedShared_H
+
+#include "CommonFramework/Tools/VideoStream.h"
+#include "NintendoSwitch/NintendoSwitch_Settings.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+#include "VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.h"
+#include "VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_EggRoutines.h"
+#include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
+#include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_BoxHelpers.h"
+#include "VideoGames/PokemonSwSh/Options/PokemonSwSh_DateToucher.h"
+#include "PokemonSwSh_EggHelpers.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+constexpr Milliseconds TRAVEL_TO_SPIN_SPOT_DURATION    = 300 * 8ms;
+//  constexpr Milliseconds TRAVEL_BACK_TO_LADY_DURATION = (30 + 260 + (580) + 120 + 120 * 0) * 8ms;
+constexpr Milliseconds TRAVEL_BACK_TO_LADY_DURATION    = (30 + 260 + (620) + 120 + 120 * 0) * 8ms;
+
+
+typedef struct{
+    uint8_t fetches;
+    Milliseconds spin_duration;
+    Milliseconds total_duration;
+} EggCombinedBlock;
+
+struct EggCombinedSession{
+    uint8_t         BOXES_TO_HATCH;
+    uint16_t        STEPS_TO_HATCH;
+    float           FETCHES_PER_BATCH;
+    Milliseconds    SAFETY_TIME;
+    Milliseconds    EARLY_HATCH_SAFETY;
+    Milliseconds    HATCH_DELAY;
+    TouchDateIntervalOption& TOUCH_DATE_INTERVAL;
+
+    EggCombinedBlock sanitize_fetch_count(uint8_t desired_fetches, Milliseconds duration){
+        //  The amount of time during egg-fetches that counts towards incubation.
+        const Milliseconds FETCH_TRAVEL_TIME = TRAVEL_RIGHT_DURATION + GO_TO_LADY_DURATION;
+
+        EggCombinedBlock block;
+
+        //  Cap the # of fetches to 7 because things can ugly at larger values.
+        block.fetches = desired_fetches;
+        if (desired_fetches == 0){
+            block.spin_duration = 0ms;
+            block.total_duration = TRAVEL_RIGHT_DURATION;
+            return block;
+        }
+        if (block.fetches > 7){
+            block.fetches = 7;
+        }
+
+        //  Divide the incubation time by the # of fetches. But don't let the fetch
+        //  interval drop below the FETCH_TRAVEL_TIME.
+        block.total_duration = duration / block.fetches;
+        if (block.total_duration >= FETCH_TRAVEL_TIME){
+            block.spin_duration = block.total_duration - FETCH_TRAVEL_TIME;
+        }else{
+            block.fetches = (uint8_t)(duration / FETCH_TRAVEL_TIME);
+            block.spin_duration = 0ms;
+            block.total_duration = block.fetches == 0
+                ? TRAVEL_RIGHT_DURATION
+                : FETCH_TRAVEL_TIME;
+        }
+
+        return block;
+    }
+    void withdraw_column_shiftR(VideoStream& stream, ProControllerContext& context, uint8_t column){
+        menu_to_box(stream, context, false);
+        party_to_column(context, column);
+        pickup_column(context, false);
+        ssf_press_button(context, BUTTON_R, GameSettings::instance().BOX_CHANGE_DELAY0, EGG_BUTTON_HOLD_DELAY);
+        column_to_party(context, column);
+        ssf_press_button(context, BUTTON_A, GameSettings::instance().BOX_PICKUP_DROP_DELAY0, EGG_BUTTON_HOLD_DELAY);
+        box_to_menu(context);
+    }
+    void deposit_column_shiftL(VideoStream& stream, ProControllerContext& context, uint8_t column){
+        menu_to_box(stream, context, true);
+        pickup_column(context, true);
+        party_to_column(context, column);
+        ssf_press_button(context, BUTTON_L, GameSettings::instance().BOX_CHANGE_DELAY0, EGG_BUTTON_HOLD_DELAY);
+        ssf_press_button(context, BUTTON_A, GameSettings::instance().BOX_PICKUP_DROP_DELAY0, EGG_BUTTON_HOLD_DELAY);
+        box_to_menu(context);
+    }
+    uint8_t swap_party_shift(VideoStream& stream, ProControllerContext& context, uint8_t column){
+        menu_to_box(stream, context, true);
+        pickup_column(context, true);
+
+        Milliseconds BOX_CHANGE_DELAY = GameSettings::instance().BOX_CHANGE_DELAY0;
+        Milliseconds BOX_PICKUP_DROP_DELAY = GameSettings::instance().BOX_PICKUP_DROP_DELAY0;
+
+        //  Move to column.
+        party_to_column(context, column);
+        ssf_press_button(context, BUTTON_L, BOX_CHANGE_DELAY, EGG_BUTTON_HOLD_DELAY);
+        ssf_press_button(context, BUTTON_A, BOX_PICKUP_DROP_DELAY, EGG_BUTTON_HOLD_DELAY);
+
+        //  Move to next column.
+        column++;
+        if (column < 6){
+            box_scroll(context, DPAD_RIGHT);
+        }else{
+            column = 0;
+            ssf_press_button(context, BUTTON_R, BOX_CHANGE_DELAY, EGG_BUTTON_HOLD_DELAY);
+            box_scroll(context, DPAD_RIGHT);
+            box_scroll(context, DPAD_RIGHT);
+        }
+
+        pickup_column(context, false);
+
+        //  Move to party.
+        ssf_press_button(context, BUTTON_R, BOX_CHANGE_DELAY, EGG_BUTTON_HOLD_DELAY);
+        column_to_party(context, column);
+        ssf_press_button(context, BUTTON_A, BOX_PICKUP_DROP_DELAY, EGG_BUTTON_HOLD_DELAY);
+
+        //  Return to menu.
+        box_to_menu(context);
+
+        return column;
+    }
+
+
+    void eggcombined2_run_batch(
+        VideoStream& stream,
+        ProControllerContext& context,
+        Milliseconds INCUBATION_DELAY_LOWER,
+        Milliseconds remaining_travel_duration,
+        uint8_t column,
+        uint8_t fetches,
+        bool last_batch
+    ){
+        const Milliseconds MIN_TRAVEL_TIME = TRAVEL_TO_SPIN_SPOT_DURATION + TRAVEL_BACK_TO_LADY_DURATION;
+
+        //  Trim off TRAVEL_TO_SPIN_SPOT_DURATION for the last iteration.
+        Milliseconds loop_incubation = INCUBATION_DELAY_LOWER < TRAVEL_TO_SPIN_SPOT_DURATION
+            ? 0ms
+            : INCUBATION_DELAY_LOWER - TRAVEL_TO_SPIN_SPOT_DURATION;
+
+        while (fetches > 1 && loop_incubation >= MIN_TRAVEL_TIME){
+            Milliseconds period = loop_incubation / (fetches - 1);
+            Milliseconds spin = 0ms;
+            if (period >= MIN_TRAVEL_TIME){
+                spin = period - MIN_TRAVEL_TIME;
+                spin = spin / 1024 * 1024;
+            }
+
+            collect_egg(context);
+            collect_egg_mash_out(context, GameSettings::instance().AUTO_DEPOSIT);
+
+            travel_to_spin_location(context);
+            spin_and_mash_A(context, spin);
+            travel_back_to_lady(context);
+
+            fetches--;
+            loop_incubation -= MIN_TRAVEL_TIME + spin;
+            remaining_travel_duration -= MIN_TRAVEL_TIME + spin;
+        }
+
+        //  Last fetch.
+        if (fetches > 0){
+            collect_egg(context);
+            collect_egg_mash_out(context, GameSettings::instance().AUTO_DEPOSIT);
+            fetches--;
+        }
+        travel_to_spin_location(context);
+
+        //  Hatch eggs.
+        if (remaining_travel_duration >= END_BATCH_MASH_B_DURATION){
+            spin_and_mash_A(context, remaining_travel_duration - END_BATCH_MASH_B_DURATION);
+            pbf_mash_button(context, BUTTON_B, END_BATCH_MASH_B_DURATION);
+        }else{
+            spin_and_mash_A(context, remaining_travel_duration);
+        }
+
+        if (fetches == 0){
+            //  Swap party.
+            ssf_press_button(context, BUTTON_X, GameSettings::instance().OVERWORLD_TO_MENU_DELAY0, 160ms);
+            if (last_batch){
+                deposit_column_shiftL(stream, context, column);
+                ssf_press_button(context, BUTTON_B, GameSettings::instance().MENU_TO_OVERWORLD_DELAY0, 160ms);
+            }else{
+                swap_party_shift(stream, context, column);
+                fly_home_goto_lady(context, false);
+            }
+            return;
+        }
+
+        //  Additional fetches.
+        fly_home_goto_lady(context, true);
+        while (fetches-- > 0){
+            collect_egg(context);
+            collect_egg_mash_out(context, GameSettings::instance().AUTO_DEPOSIT);
+            eggfetcher_loop(context);
+        }
+
+        //  Swap party.
+        ssf_press_button(context, BUTTON_X, GameSettings::instance().OVERWORLD_TO_MENU_DELAY0, 160ms);
+        if (last_batch){
+            deposit_column_shiftL(stream, context, column);
+        }else{
+            swap_party_shift(stream, context, column);
+        }
+        ssf_press_button(context, BUTTON_B, GameSettings::instance().MENU_TO_OVERWORLD_DELAY0, 160ms);
+    }
+
+    void eggcombined2_body(ConsoleHandle& console, ProControllerContext& context){
+        if (BOXES_TO_HATCH == 0){
+            ssf_press_button(context, BUTTON_HOME, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE0, 80ms);
+            return;
+        }
+
+        //  Calculate lower/upper bounds for incubation time.
+        const Milliseconds INCUBATION_DELAY_UPPER = (uint16_t)((uint32_t)STEPS_TO_HATCH * 2 * (uint32_t)103180 >> 16) * 8ms;
+        const Milliseconds INCUBATION_DELAY_LOWER = INCUBATION_DELAY_UPPER >= EARLY_HATCH_SAFETY
+            ? INCUBATION_DELAY_UPPER - EARLY_HATCH_SAFETY
+            : 0ms;
+
+        const Milliseconds FINISH_DELAY = HATCH_DELAY + SAFETY_TIME;
+
+        float fetches_per_batch = FETCHES_PER_BATCH;
+        if (fetches_per_batch < 0){
+            fetches_per_batch = 0;
+        }
+
+        float fetch_residual = 0;
+
+        //  Withdraw party.
+        ssf_press_button(context, BUTTON_X, GameSettings::instance().OVERWORLD_TO_MENU_DELAY0, 160ms);
+        withdraw_column_shiftR(console, context, 0);
+        fly_home_goto_lady(context, false);
+
+        for (uint8_t box = 0; box < BOXES_TO_HATCH; box++){
+            for (uint8_t column = 0; column < 6; column++){
+                //  Touch the date.
+                if (TOUCH_DATE_INTERVAL.ok_to_touch_now()){
+                    console.log("Touching date to prevent rollover.");
+                    pbf_press_button(context, BUTTON_HOME, 160ms, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE0);
+                    touch_date_from_home(console, context, ConsoleSettings::instance().SETTINGS_TO_HOME_DELAY0);
+                    resume_game_no_interact(console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST);
+                }
+
+                fetch_residual += fetches_per_batch;
+                uint8_t fetches = (uint8_t)fetch_residual;
+                eggcombined2_run_batch(
+                    console,
+                    context,
+                    INCUBATION_DELAY_LOWER,
+                    INCUBATION_DELAY_UPPER + FINISH_DELAY,
+                    column,
+                    fetches,
+                    box == BOXES_TO_HATCH - 1 && column == 5
+                );
+                fetch_residual -= (float)fetches;
+            }
+        }
+
+        //  Finish
+        ssf_press_button(context, BUTTON_HOME, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE0, 80ms);
+    }
+
+};
+
+
+
+}
+}
+}
+#endif
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggFetcher2.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggFetcher2.cpp
new file mode 100644
index 0000000000..0c0d1073c3
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggFetcher2.cpp
@@ -0,0 +1,110 @@
+/*  Egg Fetcher 2
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/PrettyPrint.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "NintendoSwitch/NintendoSwitch_Settings.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_EggRoutines.h"
+#include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
+#include "PokemonSwSh_EggHelpers.h"
+#include "PokemonSwSh_EggFetcher2.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+    using namespace Pokemon;
+
+
+EggFetcher2_Descriptor::EggFetcher2_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonSwSh:EggFetcher2",
+        STRING_POKEMON + " SwSh", "Egg Fetcher 2",
+        "Programs/PokemonSwSh/EggFetcher2.html",
+        "Fetch eggs without hatching them.",
+        PanelQualityStanding::OFFICIAL_BELOW_STANDARDS,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::NONE,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+
+
+EggFetcher2::EggFetcher2()
+    : MAX_FETCH_ATTEMPTS(
+        "<b>Fetch this many times:</b><br>This puts a limit on how many eggs you can get so you don't make a mess of your boxes for fetching too many.",
+        LockMode::LOCK_WHILE_RUNNING,
+        2000
+    )
+    , NOTIFICATIONS({
+        &NOTIFICATION_PROGRAM_FINISH,
+    })
+{
+    PA_ADD_OPTION(START_LOCATION);
+    PA_ADD_OPTION(MAX_FETCH_ATTEMPTS);
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+
+void EggFetcher2::run_eggfetcher(
+    Logger& logger, ProControllerContext& context,
+    bool deposit_automatically,
+    uint16_t attempts
+) const{
+    if (attempts == 0){
+        return;
+    }
+
+    uint16_t c = 0;
+
+    //  1st Fetch: Get into position.
+    {
+        logger.log("Fetch Attempts: " + tostr_u_commas(c));
+        fly_home_collect_egg(context, true);
+        collect_egg_mash_out(context, deposit_automatically);
+
+        c++;
+        if (c >= attempts){
+            return;
+        }
+    }
+
+    //  Now we are in steady state.
+    for (; c < attempts; c++){
+        logger.log("Fetch Attempts: " + tostr_u_commas(c));
+        eggfetcher_loop(context);
+        collect_egg(context);
+        collect_egg_mash_out(context, deposit_automatically);
+    }
+}
+
+void EggFetcher2::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    if (START_LOCATION.start_in_grip_menu()){
+        grip_menu_connect_go_home(context);
+        resume_game_back_out(
+            env.console,
+            context,
+            ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST,
+            3200ms
+        );
+    }else{
+        //  Connect the controller.
+        require_player(env.console, context, BUTTON_B);
+    }
+
+    run_eggfetcher(env.console, context, GameSettings::instance().AUTO_DEPOSIT, MAX_FETCH_ATTEMPTS);
+
+    pbf_press_button(context, BUTTON_HOME, 160ms, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE0);
+
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+}
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggFetcher2.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggFetcher2.h
new file mode 100644
index 0000000000..0c6e2657bb
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggFetcher2.h
@@ -0,0 +1,48 @@
+/*  Egg Fetcher 2
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_EggFetcher2_H
+#define PokemonAutomation_PokemonSwSh_EggFetcher2_H
+
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+//#include "PokemonSwSh_EggHelpers.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+class EggFetcher2_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    EggFetcher2_Descriptor();
+};
+
+
+
+class EggFetcher2 : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = EggFetcher2_Descriptor;
+    EggFetcher2();
+
+    void run_eggfetcher(Logger& logger, ProControllerContext& context, bool deposit_automatically, uint16_t attempts) const;
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    StartInGripOrGameOption START_LOCATION;
+    SimpleIntegerOption<uint16_t> MAX_FETCH_ATTEMPTS;
+
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggFetcherMultiple.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggFetcherMultiple.cpp
new file mode 100644
index 0000000000..ffaba03a28
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggFetcherMultiple.cpp
@@ -0,0 +1,166 @@
+/*  Egg Fetcher Multiple
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/PrettyPrint.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "NintendoSwitch/NintendoSwitch_Settings.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_EggRoutines.h"
+#include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
+#include "PokemonSwSh_EggHelpers.h"
+#include "PokemonSwSh_EggFetcherMultiple.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+    using namespace Pokemon;
+
+
+std::tuple<uint16_t, uint16_t, uint16_t> get_location(uint16_t index){
+    uint16_t box = index / 30;
+    index = index % 30;
+
+    uint16_t row = index / 6;
+    index = index % 6;
+
+    uint16_t column = index;
+    return { box, row, column };
+}
+
+EggFetcherMultiple_Descriptor::EggFetcherMultiple_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonSwSh:EggFetcherMultiple",
+        STRING_POKEMON + " SwSh", "Egg Fetcher Multiple",
+        "Programs/PokemonSwSh/EggFetcherMultiple.html",
+        "Fetch eggs from multiple species without hatching them.",
+        PanelQualityStanding::OFFICIAL_BELOW_STANDARDS,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::NONE,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+
+
+EggFetcherMultiple::EggFetcherMultiple()
+    : POKEMON_SPECIES_COUNT(
+        "<b>Breed this many species:</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        30
+    )
+    , MAX_FETCH_ATTEMPTS_PER_SPECIES(
+        "<b>Fetch this many times per species:</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        10
+    )
+    , NOTIFICATIONS({
+        &NOTIFICATION_PROGRAM_FINISH,
+    })
+{
+    PA_ADD_OPTION(START_LOCATION);
+    PA_ADD_OPTION(POKEMON_SPECIES_COUNT);
+    PA_ADD_OPTION(MAX_FETCH_ATTEMPTS_PER_SPECIES);
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+
+void EggFetcherMultiple::run_eggfetcher(
+    Logger& logger, ProControllerContext& context,
+    bool deposit_automatically,
+    uint16_t attempts
+) const{
+    if (attempts == 0){
+        return;
+    }
+
+    uint16_t c = 0;
+
+    //  1st Fetch: Get into position.
+    {
+        logger.log("Fetch Attempts: " + tostr_u_commas(c));
+        fly_home_collect_egg(context, true);
+        collect_egg_mash_out(context, deposit_automatically);
+
+        c++;
+        if (c >= attempts){
+            return;
+        }
+    }
+
+    //  Now we are in steady state.
+    for (; c < attempts; c++){
+        logger.log("Fetch Attempts: " + tostr_u_commas(c));
+        eggfetcher_loop(context);
+        collect_egg(context);
+        collect_egg_mash_out(context, deposit_automatically);
+    }
+}
+
+void EggFetcherMultiple::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    if (START_LOCATION.start_in_grip_menu()){
+        grip_menu_connect_go_home(context);
+        resume_game_back_out(
+            env.console,
+            context,
+            ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST,
+            3200ms
+        );
+    }else{
+        //  Connect the controller.
+        require_player(env.console, context, BUTTON_B);
+    }
+
+    for (uint16_t s = 0; s < POKEMON_SPECIES_COUNT; ++s){
+        fly_home_collect_egg(context, true);
+
+        //remove the second pokemon from the daycare
+        pbf_press_button(context, BUTTON_A , 160ms, 1500ms);
+        pbf_press_button(context, BUTTON_A , 160ms, 1500ms);
+        pbf_press_button(context, BUTTON_A , 160ms, 1000ms);
+        pbf_press_dpad  (context, DPAD_DOWN, 160ms, 1000ms);
+        pbf_press_button(context, BUTTON_A , 160ms, 1000ms);
+        pbf_mash_button (context, BUTTON_B , 5000ms);
+
+        //add a new second pokemon from the daycare
+        pbf_press_button(context, BUTTON_A, 160ms, 1000ms);
+        pbf_press_button(context, BUTTON_A, 160ms, 1000ms);
+        pbf_press_button(context, BUTTON_A, 160ms, 1500ms);
+        pbf_press_button(context, BUTTON_A, 160ms, 2000ms);
+        auto [box, row, column] = get_location(s);
+        if (row == 0 && column == 0 && box != 0){
+            box = 1;
+        }else{
+            box = 0;
+        }
+        for (uint16_t b = 0; b < box; ++b){
+            pbf_press_button(context, BUTTON_R, 160ms, 1000ms);
+        }
+        for (uint16_t r = 0; r < row; ++r){
+            pbf_press_dpad(context, DPAD_DOWN, 160ms, 1000ms);
+        }
+        for (uint16_t c = 0; c < column; ++c){
+            pbf_press_dpad(context, DPAD_RIGHT, 160ms, 1000ms);
+        }
+        pbf_press_button(context, BUTTON_A, 160ms, 1000ms);
+        pbf_press_button(context, BUTTON_A, 160ms, 2000ms);
+        pbf_press_button(context, BUTTON_A, 160ms, 1000ms);
+        pbf_press_button(context, BUTTON_A, 160ms, 5000ms);
+        pbf_press_button(context, BUTTON_A, 160ms, 1000ms);
+        pbf_press_button(context, BUTTON_A, 160ms, 1000ms);
+
+        run_eggfetcher(env.console, context, GameSettings::instance().AUTO_DEPOSIT, MAX_FETCH_ATTEMPTS_PER_SPECIES);
+    }
+
+    pbf_press_button(context, BUTTON_HOME, 160ms, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE0);
+
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+}
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggFetcherMultiple.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggFetcherMultiple.h
new file mode 100644
index 0000000000..0ddd66123f
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggFetcherMultiple.h
@@ -0,0 +1,49 @@
+/*  Egg Fetcher Multiple
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_EggFetcherMultiple_H
+#define PokemonAutomation_PokemonSwSh_EggFetcherMultiple_H
+
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+//#include "PokemonSwSh_EggHelpers.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+class EggFetcherMultiple_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    EggFetcherMultiple_Descriptor();
+};
+
+
+
+class EggFetcherMultiple : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = EggFetcherMultiple_Descriptor;
+    EggFetcherMultiple();
+
+    void run_eggfetcher(Logger& logger, ProControllerContext& context, bool deposit_automatically, uint16_t attempts) const;
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    StartInGripOrGameOption START_LOCATION;
+    SimpleIntegerOption<uint16_t> POKEMON_SPECIES_COUNT;
+    SimpleIntegerOption<uint16_t> MAX_FETCH_ATTEMPTS_PER_SPECIES;
+
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggHatcher.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggHatcher.cpp
new file mode 100644
index 0000000000..1a97188e0c
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggHatcher.cpp
@@ -0,0 +1,185 @@
+/*  Egg Hatcher
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "NintendoSwitch/NintendoSwitch_Settings.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+//#include "VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_GameEntry.h"
+#include "VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_EggRoutines.h"
+#include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
+#include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_BoxHelpers.h"
+#include "PokemonSwSh_EggHelpers.h"
+#include "PokemonSwSh_EggHatcher.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+    using namespace Pokemon;
+
+
+EggHatcher_Descriptor::EggHatcher_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonSwSh:EggHatcher",
+        STRING_POKEMON + " SwSh", "Egg Hatcher",
+        "Programs/PokemonSwSh/EggHatcher.html",
+        "Hatch eggs from boxes.",
+        PanelQualityStanding::OFFICIAL_BELOW_STANDARDS,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::NONE,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+
+
+void withdraw_column(VideoStream& stream, ProControllerContext& context, uint8_t column){
+    menu_to_box(stream, context, false);
+    party_to_column(context, column);
+    pickup_column(context, false);
+    column_to_party(context, column);
+    ssf_press_button_ptv(context, BUTTON_A, GameSettings::instance().BOX_PICKUP_DROP_DELAY0);
+    box_to_menu(context);
+}
+void deposit_column(VideoStream& stream, ProControllerContext& context, uint8_t column){
+    menu_to_box(stream, context, true);
+    pickup_column(context, true);
+    party_to_column(context, column);
+    ssf_press_button_ptv(context, BUTTON_A, GameSettings::instance().BOX_PICKUP_DROP_DELAY0);
+    box_to_menu(context);
+}
+uint8_t swap_party(VideoStream& stream, ProControllerContext& context, uint8_t column){
+    menu_to_box(stream, context, true);
+    pickup_column(context, true);
+
+    Milliseconds BOX_PICKUP_DROP_DELAY = GameSettings::instance().BOX_PICKUP_DROP_DELAY0;
+
+    //  Move to column.
+    party_to_column(context, column);
+    ssf_press_button_ptv(context, BUTTON_A, BOX_PICKUP_DROP_DELAY, 100ms);
+
+    //  Move to next column.
+    column++;
+    if (column < 6){
+        box_scroll(context, DPAD_RIGHT);
+    }else{
+        column = 0;
+        ssf_press_button_ptv(context, BUTTON_R, GameSettings::instance().BOX_CHANGE_DELAY0, 100ms);
+        box_scroll(context, DPAD_RIGHT);
+        box_scroll(context, DPAD_RIGHT);
+    }
+
+    pickup_column(context, false);
+
+    //  Move to party.
+    column_to_party(context, column);
+    ssf_press_button_ptv(context, BUTTON_A, BOX_PICKUP_DROP_DELAY);
+
+    //  Return to menu.
+    box_to_menu(context);
+
+    return column;
+}
+
+
+EggHatcher::EggHatcher()
+    : BOXES_TO_HATCH(
+        "<b>Boxes to Hatch:</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        3
+    )
+    , m_advanced_options(
+        "<font size=4><b>Advanced Options:</b> You should not need to touch anything below here.</font>"
+    )
+    , SAFETY_TIME1(
+        "<b>Safety Time:</b><br>Additional time added to the spinning.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "12 s"
+    )
+    , HATCH_DELAY0(
+        "<b>Hatch Delay:</b><br>Total animation time for hatching 5 eggs when there are no shinies.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "88 s"
+    )
+    , NOTIFICATIONS({
+        &NOTIFICATION_PROGRAM_FINISH,
+    })
+{
+    PA_ADD_OPTION(START_LOCATION);
+    PA_ADD_OPTION(BOXES_TO_HATCH);
+    PA_ADD_OPTION(STEPS_TO_HATCH);
+    PA_ADD_STATIC(m_advanced_options);
+    PA_ADD_OPTION(SAFETY_TIME1);
+    PA_ADD_OPTION(HATCH_DELAY0);
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+void EggHatcher::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    //  Calculate upper bounds for incubation time.
+    Milliseconds INCUBATION_DELAY_UPPER = (uint16_t)((uint32_t)STEPS_TO_HATCH * 2 * (uint32_t)103180 >> 16) * 8ms;
+    Milliseconds TOTAL_DELAY = INCUBATION_DELAY_UPPER + HATCH_DELAY0.get() + SAFETY_TIME1.get() - TRAVEL_RIGHT_DURATION;
+
+    if (START_LOCATION.start_in_grip_menu()){
+        grip_menu_connect_go_home(context);
+        resume_game_back_out(
+            env.console,
+            context,
+            ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST,
+            3200ms
+        );
+    }else{
+        //  Connect the controller.
+        require_player(env.console, context, BUTTON_B);
+    }
+
+    bool party_is_empty = true;
+    for (uint8_t box = 0; box < BOXES_TO_HATCH; box++){
+        for (uint8_t column = 0; column < 6; column++){
+            //  Get eggs from box.
+            ssf_press_button_ptv(context, BUTTON_X, GameSettings::instance().OVERWORLD_TO_MENU_DELAY0);
+            if (party_is_empty){
+                withdraw_column(env.console, context, column);
+                party_is_empty = false;
+            }else if (column == 0){
+                swap_party(env.console, context, 5);
+            }else{
+                swap_party(env.console, context, column - 1);
+            }
+
+            fly_home(context, false);
+
+            //  Travel to spin location.
+            pbf_move_left_joystick(context, {+1, 0}, TRAVEL_RIGHT_DURATION, 0ms);
+
+            //  Spin
+#if 0
+            spin_and_mash_A(TOTAL_DELAY);
+#else
+            if (TOTAL_DELAY >= END_BATCH_MASH_B_DURATION){
+                spin_and_mash_A(context, TOTAL_DELAY - END_BATCH_MASH_B_DURATION);
+                pbf_mash_button(context, BUTTON_B, END_BATCH_MASH_B_DURATION);
+            }else{
+                spin_and_mash_A(context, TOTAL_DELAY);
+            }
+#endif
+        }
+    }
+
+    Milliseconds OVERWORLD_TO_MENU_DELAY = GameSettings::instance().OVERWORLD_TO_MENU_DELAY0;
+
+    if (!party_is_empty){
+        ssf_press_button_ptv(context, BUTTON_X, OVERWORLD_TO_MENU_DELAY);
+        deposit_column(env.console, context, 5);
+        ssf_press_button_ptv(context, BUTTON_X, OVERWORLD_TO_MENU_DELAY);
+    }
+    ssf_press_button(context, BUTTON_HOME, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE0, 160ms);
+
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+}
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggHatcher.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggHatcher.h
new file mode 100644
index 0000000000..5f8e15e9d0
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggHatcher.h
@@ -0,0 +1,56 @@
+/*  Egg Hatcher
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_EggHatcher_H
+#define PokemonAutomation_PokemonSwSh_EggHatcher_H
+
+#include "Common/Cpp/Options/StaticTextOption.h"
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "Common/Cpp/Options/TimeDurationOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "VideoGames/PokemonSwSh/Options/PokemonSwSh_EggStepOption.h"
+//#include "PokemonSwSh_EggHelpers.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+class EggHatcher_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    EggHatcher_Descriptor();
+};
+
+
+
+class EggHatcher : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = EggHatcher_Descriptor;
+    EggHatcher();
+
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+
+private:
+    StartInGripOrGameOption START_LOCATION;
+
+    SimpleIntegerOption<uint8_t> BOXES_TO_HATCH;
+    EggStepCountOption STEPS_TO_HATCH;
+
+    SectionDividerOption m_advanced_options;
+    MillisecondsOption SAFETY_TIME1;
+    MillisecondsOption HATCH_DELAY0;
+
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggHelpers.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggHelpers.h
new file mode 100644
index 0000000000..ab2b9b2a15
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggHelpers.h
@@ -0,0 +1,165 @@
+/*  EggHelpers
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_EggHelpers_H
+#define PokemonAutomation_PokemonSwSh_EggHelpers_H
+
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonFramework/Tools/VideoStream.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "VideoGames/PokemonSwSh/PokemonSwSh_Settings.h"
+#include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_MenuNavigation.h"
+#include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_BoxHelpers.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+constexpr Milliseconds GO_TO_LADY_DURATION         = 508ms;
+constexpr Milliseconds TRAVEL_RIGHT_DURATION       = 2400ms;
+constexpr Milliseconds END_BATCH_MASH_B_DURATION   = 20000ms;
+
+
+//  Collect egg.
+static void collect_egg(ProControllerContext& context){
+    ssf_press_button(context, BUTTON_A, 960ms);
+    if (GameSettings::instance().EGG_FETCH_EXTRA_LINE){
+        ssf_press_button(context, BUTTON_A, 960ms);
+    }
+    ssf_press_button(context, BUTTON_A, 80ms, 80ms);
+}
+static void collect_egg_mash_out(ProControllerContext& context, bool deposit_automatically){
+    Milliseconds FETCH_EGG_MASH_DELAY = GameSettings::instance().FETCH_EGG_MASH_DELAY0;
+    pbf_mash_button(
+        context,
+        BUTTON_B,
+        deposit_automatically
+            ? FETCH_EGG_MASH_DELAY
+            : FETCH_EGG_MASH_DELAY + 1920ms
+    );
+}
+
+
+//  Fly Home: Used by everything.
+//  Assume the selected app in the menu is Town Map.
+static void fly_home(ProControllerContext& context, char from_overworld){
+    if (from_overworld){
+        ssf_press_button(context, BUTTON_X, GameSettings::instance().OVERWORLD_TO_MENU_DELAY0, 160ms);
+    }
+    ssf_press_button(context, BUTTON_A, 3200ms, 160ms);
+    ssf_press_right_joystick(context, {0.25, 0.25}, 160ms, 160ms);
+    pbf_mash_button(context, BUTTON_A, 3840ms);
+}
+
+//  Assume the selected app in the menu is Twon Map.
+static void fly_home_goto_lady(ProControllerContext& context, char from_overworld){
+    fly_home(context, from_overworld);
+
+    //  Go to lady.
+    //  If you change this, you MUST update "GO_TO_LADY_DURATION".
+    ssf_press_left_joystick(context, {-1, 0}, 160ms, 80ms);
+    ssf_press_left_joystick(context, {0, +1}, 720ms, 360ms);
+}
+
+//  Assume the selected app in the menu is Twon Map.
+static void fly_home_collect_egg(ProControllerContext& context, char from_overworld){
+    fly_home_goto_lady(context, from_overworld);
+    collect_egg(context);
+}
+
+
+
+//  EggHatcher+EggCombined Helpers
+
+//#define EGG_BUTTON_HOLD_DELAY   10
+static const Milliseconds EGG_BUTTON_HOLD_DELAY = 80ms;
+
+// - From game menu to pokemon storage box
+// - Move cursor to the second pokemon in the party, aka first hatched pokemon in the party
+// - Press button Y two times to change pokemon selection to group selection
+static void menu_to_box(VideoStream& stream, ProControllerContext& context, bool from_map){
+    if (stream.video().snapshot_latest_blocking()){
+        menus_to_boxsystem(stream, context);
+    }else{
+        if (from_map){
+            box_scroll(context, DPAD_UP);
+            box_scroll(context, DPAD_RIGHT);
+        }
+        ssf_press_button_ptv(context, BUTTON_A, GameSettings::instance().MENU_TO_POKEMON_DELAY0, EGG_BUTTON_HOLD_DELAY);
+        ssf_press_button_ptv(context, BUTTON_R, GameSettings::instance().POKEMON_TO_BOX_DELAY0, EGG_BUTTON_HOLD_DELAY);
+    }
+    box_scroll(context, DPAD_LEFT);
+    box_scroll(context, DPAD_DOWN);
+    ssf_press_button_ptv(context, BUTTON_Y, 240ms, EGG_BUTTON_HOLD_DELAY);
+    ssf_press_button_ptv(context, BUTTON_Y, 240ms, EGG_BUTTON_HOLD_DELAY);
+}
+static void box_to_menu(ProControllerContext& context){
+    //  There are two states here which need to be merged:
+    //      1.  The depositing column was empty. The party has been swapped and
+    //          it's sitting in the box with no held pokemon.
+    //      2.  The depositing column was not empty. The party swap failed and
+    //          it's sitting in the box holding on the party pokemon.
+    //
+    //  Double press B quickly here to back out of the box.
+    //  In state (1):   The 1st B will begin back out of the box. The 2nd B will
+    //                  be swallowed by the animation.
+    //  In state (2):   The 1st B will drop the party pokemon. The 2nd B will
+    //                  back out of the box.
+
+    ssf_press_button_ptv(context, BUTTON_B, 160ms, EGG_BUTTON_HOLD_DELAY);
+    ssf_press_button_ptv(context, BUTTON_B, GameSettings::instance().BOX_TO_POKEMON_DELAY0, EGG_BUTTON_HOLD_DELAY);
+
+    //  Back out to menu.
+    ssf_press_button_ptv(context, BUTTON_B, GameSettings::instance().POKEMON_TO_MENU_DELAY0, EGG_BUTTON_HOLD_DELAY);
+
+    box_scroll(context, DPAD_LEFT);
+    box_scroll(context, DPAD_DOWN);
+}
+
+static void party_to_column(ProControllerContext& context, uint8_t column){
+    box_scroll(context, DPAD_UP);
+    column++;
+    if (column <= 3){
+        for (uint8_t c = 0; c != column; c++){
+            box_scroll(context, DPAD_RIGHT);
+        }
+    }else{
+        for (uint8_t c = 7; c != column; c--){
+            box_scroll(context, DPAD_LEFT);
+        }
+    }
+}
+static void column_to_party(ProControllerContext& context, uint8_t column){
+    column++;
+    if (column <= 3){
+        for (uint8_t c = column; c != 0; c--){
+            box_scroll(context, DPAD_LEFT);
+        }
+    }else{
+        for (uint8_t c = column; c != 7; c++){
+            box_scroll(context, DPAD_RIGHT);
+        }
+    }
+    box_scroll(context, DPAD_DOWN);
+}
+
+static void pickup_column(ProControllerContext& context, char party){
+    ssf_press_button_ptv(context, BUTTON_A, 160ms, EGG_BUTTON_HOLD_DELAY);
+    if (party){
+        box_scroll(context, DPAD_UP);
+    }
+    box_scroll(context, DPAD_UP);
+    ssf_press_button_ptv(context, BUTTON_A, GameSettings::instance().BOX_PICKUP_DROP_DELAY0, EGG_BUTTON_HOLD_DELAY);
+}
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_GodEggDuplication.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_GodEggDuplication.cpp
new file mode 100644
index 0000000000..e52d2b008e
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_GodEggDuplication.cpp
@@ -0,0 +1,148 @@
+/*  God Egg Duplication
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/PrettyPrint.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "NintendoSwitch/NintendoSwitch_Settings.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_EggRoutines.h"
+#include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
+#include "PokemonSwSh_EggHelpers.h"
+#include "PokemonSwSh_GodEggDuplication.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+using namespace Pokemon;
+
+
+GodEggDuplication_Descriptor::GodEggDuplication_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonSwSh:GodEggDuplication",
+        STRING_POKEMON + " SwSh", "God Egg Duplication",
+        "Programs/PokemonSwSh/GodEggDuplication.html",
+        "Mass duplicate " + STRING_POKEMON + " with the God Egg.",
+        PanelQualityStanding::OFFICIAL_BELOW_STANDARDS,
+        ProgramControllerClass::StandardController_PerformanceClassSensitive,
+        FeedbackType::NONE,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+
+
+GodEggDuplication::GodEggDuplication()
+    : MAX_FETCH_ATTEMPTS(
+        "<b>Fetch this many times:</b><br>This puts a limit on how many eggs you can get so you don't make a mess of your boxes for fetching too many.",
+        LockMode::LOCK_WHILE_RUNNING,
+        2000
+    )
+    , PARTY_ROUND_ROBIN(
+        "<b>Party Round Robin:</b><br>Cycle through this many party members.",
+        LockMode::LOCK_WHILE_RUNNING,
+        6, 1, 6
+    )
+    , NOTIFICATIONS({
+        &NOTIFICATION_PROGRAM_FINISH,
+    })
+{
+    PA_ADD_OPTION(START_LOCATION);
+    PA_ADD_OPTION(MAX_FETCH_ATTEMPTS);
+    PA_ADD_OPTION(PARTY_ROUND_ROBIN);
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+
+void GodEggDuplication::collect_godegg(ProControllerContext& context, uint8_t party_slot) const{
+    pbf_wait(context, 400ms);
+    ssf_press_button_ptv(context, BUTTON_B, 800ms);
+    ssf_press_button_ptv(context, BUTTON_B, 800ms);
+    pbf_wait(context, 1800ms);
+
+    //  "You received an Egg from the Nursery worker!"
+    ssf_press_button_ptv(context, BUTTON_B, 2400ms);
+
+    //  "Where do you want to send the Egg to?"
+    ssf_press_button_ptv(context, BUTTON_A, 800ms);
+
+    //  (extra line of text for French)
+    ssf_press_button_ptv(context, BUTTON_B, 800ms);
+
+    //  "Please select a Pokemon to swap from your party."
+    ssf_press_button_ptv(context, BUTTON_B, GameSettings::instance().MENU_TO_POKEMON_DELAY0);
+
+    //  Select the party member.
+    for (uint8_t c = 0; c < party_slot; c++){
+        ssf_press_dpad_ptv(context, DPAD_DOWN, 80ms);
+    }
+    ssf_press_button_ptv(context, BUTTON_A, 2400ms);
+    pbf_mash_button(context, BUTTON_B, 4000ms);
+}
+void GodEggDuplication::run_program(Logger& logger, ProControllerContext& context, uint16_t attempts) const{
+    if (attempts == 0){
+        return;
+    }
+
+    uint8_t items = PARTY_ROUND_ROBIN > 6 ? 6 : PARTY_ROUND_ROBIN;
+    uint8_t party_slot = 0;
+
+    uint16_t c = 0;
+
+    //  1st Fetch: Get into position.
+    {
+        logger.log("Fetch Attempts: " + tostr_u_commas(c));
+        fly_home_collect_egg(context, true);
+        collect_godegg(context, party_slot++);
+        if (party_slot >= items){
+            party_slot = 0;
+        }
+
+        c++;
+        if (c >= attempts){
+            return;
+        }
+    }
+
+    //  Now we are in steady state.
+    for (; c < attempts; c++){
+        logger.log("Fetch Attempts: " + tostr_u_commas(c));
+        eggfetcher_loop(context);
+        collect_egg(context);
+        collect_godegg(context, party_slot++);
+        if (party_slot >= items){
+            party_slot = 0;
+        }
+    }
+}
+
+void GodEggDuplication::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    if (START_LOCATION.start_in_grip_menu()){
+        grip_menu_connect_go_home(context);
+        resume_game_back_out(
+            env.console,
+            context,
+            ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST,
+            3200ms
+        );
+    }else{
+        //  Connect the controller.
+        require_player(env.console, context, BUTTON_B);
+    }
+
+    run_program(env.console, context, MAX_FETCH_ATTEMPTS);
+    ssf_press_button(context, BUTTON_HOME, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE0, 80ms);
+
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+}
+
+
+
+}
+}
+}
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_GodEggDuplication.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_GodEggDuplication.h
new file mode 100644
index 0000000000..f0272948ad
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_GodEggDuplication.h
@@ -0,0 +1,48 @@
+/*  God Egg Duplication
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_GodEggDuplication_H
+#define PokemonAutomation_PokemonSwSh_GodEggDuplication_H
+
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+class GodEggDuplication_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    GodEggDuplication_Descriptor();
+};
+
+
+
+class GodEggDuplication : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = GodEggDuplication_Descriptor;
+    GodEggDuplication();
+
+    void collect_godegg(ProControllerContext& context, uint8_t party_slot) const;
+    void run_program(Logger& logger, ProControllerContext& context, uint16_t attempts) const;
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    StartInGripOrGameOption START_LOCATION;
+    SimpleIntegerOption<uint16_t> MAX_FETCH_ATTEMPTS;
+    SimpleIntegerOption<uint8_t> PARTY_ROUND_ROBIN;
+
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_GodEggItemDupe.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_GodEggItemDupe.cpp
new file mode 100644
index 0000000000..a21d37c517
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_GodEggItemDupe.cpp
@@ -0,0 +1,200 @@
+/*  God Egg Item Duplication
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/PrettyPrint.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "NintendoSwitch/NintendoSwitch_Settings.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_EggRoutines.h"
+#include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
+#include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_ReleaseHelpers.h"
+#include "PokemonSwSh_EggHelpers.h"
+#include "PokemonSwSh_GodEggItemDupe.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+    using namespace Pokemon;
+
+
+GodEggItemDupe_Descriptor::GodEggItemDupe_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonSwSh:GodEggItemDupe",
+        STRING_POKEMON + " SwSh", "God Egg Item Duplication",
+        "Programs/PokemonSwSh/GodEggItemDuplication.html",
+        "Mass duplicate items with the God Egg.",
+        PanelQualityStanding::OFFICIAL_BELOW_STANDARDS,
+        ProgramControllerClass::StandardController_PerformanceClassSensitive,
+        FeedbackType::NONE,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+
+
+GodEggItemDupe::GodEggItemDupe()
+    : MAX_FETCH_ATTEMPTS(
+        "<b>Fetch this many times:</b><br>This puts a limit on how many eggs you can get so you don't make a mess of your boxes for fetching too many.",
+        LockMode::LOCK_WHILE_RUNNING,
+        2000
+    )
+    , PARTY_ROUND_ROBIN(
+        "<b>Party Round Robin:</b><br>Cycle through this many party members.",
+        LockMode::LOCK_WHILE_RUNNING,
+        6, 1, 6
+    )
+    , DETACH_BEFORE_RELEASE(
+        "<b>Detach before Release:</b><br>Needed for items like Rusted Sword/Shield.",
+        LockMode::LOCK_WHILE_RUNNING,
+        false
+    )
+    , NOTIFICATIONS({
+        &NOTIFICATION_PROGRAM_FINISH,
+    })
+{
+    PA_ADD_OPTION(START_LOCATION);
+    PA_ADD_OPTION(MAX_FETCH_ATTEMPTS);
+    PA_ADD_OPTION(PARTY_ROUND_ROBIN);
+    PA_ADD_OPTION(DETACH_BEFORE_RELEASE);
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+
+void GodEggItemDupe::collect_godegg(
+    ProControllerContext& context,
+    uint8_t party_slot,
+    bool map_to_pokemon,
+    bool pokemon_to_map
+) const{
+    pbf_wait(context, 400ms);
+    ssf_press_button_ptv(context, BUTTON_B, 800ms);
+    ssf_press_button_ptv(context, BUTTON_B, 800ms);
+    pbf_wait(context, 1800ms);
+
+    //  "You received an Egg from the Nursery worker!"
+    ssf_press_button_ptv(context, BUTTON_B, 2400ms);
+
+    //  "Where do you want to send the Egg to?"
+    ssf_press_button_ptv(context, BUTTON_A, 800ms);
+
+    //  (extra line of text for French)
+    ssf_press_button_ptv(context, BUTTON_B, 800ms);
+
+    //  "Please select a Pokemon to swap from your party."
+    ssf_press_button_ptv(context, BUTTON_B, GameSettings::instance().MENU_TO_POKEMON_DELAY0);
+
+    //  Select the party member.
+    for (uint8_t c = 0; c < party_slot; c++){
+        ssf_press_dpad_ptv(context, DPAD_DOWN, 80ms);
+    }
+    ssf_press_button_ptv(context, BUTTON_A, 2400ms);
+    pbf_mash_button(context, BUTTON_B, 4000ms);
+
+    //  Enter box
+    ssf_press_button(context, BUTTON_X, GameSettings::instance().OVERWORLD_TO_MENU_DELAY0, 160ms);
+    if (map_to_pokemon){
+        ssf_press_dpad_ptv(context, DPAD_UP, 160ms, 80ms);
+        ssf_press_dpad_ptv(context, DPAD_RIGHT, 160ms, 80ms);
+    }
+    ssf_press_button(context, BUTTON_A, GameSettings::instance().MENU_TO_POKEMON_DELAY0, 80ms);
+    ssf_press_button(context, BUTTON_R, GameSettings::instance().POKEMON_TO_BOX_DELAY0, 80ms);
+
+    if (DETACH_BEFORE_RELEASE){
+        //  Detach item
+        ssf_press_button(context, BUTTON_A, 400ms, 160ms);
+        ssf_press_dpad_ptv(context, DPAD_DOWN, 80ms);
+        ssf_press_dpad_ptv(context, DPAD_DOWN, 80ms);
+        ssf_press_button(context, BUTTON_A, 1200ms, 160ms);
+        ssf_press_button(context, BUTTON_A, 1200ms, 160ms);
+        ssf_press_button(context, BUTTON_A, 800ms, 160ms);
+
+        //  Release
+        release(context);
+    }else{
+        //  Release (item detaches automatically)
+        ssf_press_button(context, BUTTON_A, 480ms, 160ms);
+        ssf_press_dpad_ptv(context, DPAD_DOWN, 120ms);
+        ssf_press_dpad_ptv(context, DPAD_DOWN, 120ms);
+        ssf_press_dpad_ptv(context, DPAD_DOWN, 120ms);
+        ssf_press_dpad_ptv(context, DPAD_DOWN, 120ms);
+        ssf_press_button(context, BUTTON_A, 1000ms, 160ms);
+        ssf_press_dpad_ptv(context, DPAD_UP, 80ms);
+        ssf_mash_AZs(context, 1440ms);
+    }
+
+    //  Back out to menu.
+    if (pokemon_to_map){
+        box_to_menu(context);
+        ssf_press_button(context, BUTTON_B, 2000ms, 50ms);
+    }else{
+        pbf_mash_button(context, BUTTON_B, 5600ms);
+    }
+}
+void GodEggItemDupe::run_program(Logger& logger, ProControllerContext& context, uint16_t attempts) const{
+    if (attempts == 0){
+        return;
+    }
+
+    uint8_t items = PARTY_ROUND_ROBIN > 6 ? 6 : PARTY_ROUND_ROBIN;
+    uint8_t party_slot = 0;
+
+    uint16_t c = 0;
+
+    //  1st Fetch: Get into position.
+    {
+        logger.log("Fetch Attempts: " + tostr_u_commas(c));
+        fly_home_collect_egg(context, true);
+        collect_godegg(context, party_slot++, true, false);
+        if (party_slot >= items){
+            party_slot = 0;
+        }
+
+        c++;
+        if (c >= attempts){
+            return;
+        }
+    }
+
+    //  Now we are in steady state.
+    for (; c < attempts; c++){
+        logger.log("Fetch Attempts: " + tostr_u_commas(c));
+        eggfetcher_loop(context);
+        collect_egg(context);
+        collect_godegg(context, party_slot++, false, false);
+        if (party_slot >= items){
+            party_slot = 0;
+        }
+    }
+}
+
+void GodEggItemDupe::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    if (START_LOCATION.start_in_grip_menu()){
+        grip_menu_connect_go_home(context);
+        resume_game_back_out(
+            env.console,
+            context,
+            ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST,
+            3200ms
+        );
+    }else{
+        //  Connect the controller.
+        require_player(env.console, context, BUTTON_B);
+    }
+
+    run_program(env.console, context, MAX_FETCH_ATTEMPTS);
+    ssf_press_button(context, BUTTON_HOME, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE0, 80ms);
+
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+}
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_GodEggItemDupe.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_GodEggItemDupe.h
new file mode 100644
index 0000000000..7857266e40
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_GodEggItemDupe.h
@@ -0,0 +1,50 @@
+/*  God Egg Item Duplication
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_GodEggItemDupe_H
+#define PokemonAutomation_PokemonSwSh_GodEggItemDupe_H
+
+#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+class GodEggItemDupe_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    GodEggItemDupe_Descriptor();
+};
+
+
+
+class GodEggItemDupe : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = GodEggItemDupe_Descriptor;
+    GodEggItemDupe();
+
+    void collect_godegg(ProControllerContext& context, uint8_t party_slot, bool map_to_pokemon, bool pokemon_to_map) const;
+    void run_program(Logger& logger, ProControllerContext& context, uint16_t attempts) const;
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    StartInGripOrGameOption START_LOCATION;
+    SimpleIntegerOption<uint16_t> MAX_FETCH_ATTEMPTS;
+    SimpleIntegerOption<uint8_t> PARTY_ROUND_ROBIN;
+    BooleanCheckBoxOption DETACH_BEFORE_RELEASE;
+
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/General/PokemonSwSh_AutonomousBallThrower.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/General/PokemonSwSh_AutonomousBallThrower.cpp
similarity index 76%
rename from SerialPrograms/Source/PokemonSwSh/Programs/General/PokemonSwSh_AutonomousBallThrower.cpp
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/General/PokemonSwSh_AutonomousBallThrower.cpp
index ddc4e6b418..16e4b13772 100644
--- a/SerialPrograms/Source/PokemonSwSh/Programs/General/PokemonSwSh_AutonomousBallThrower.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/General/PokemonSwSh_AutonomousBallThrower.cpp
@@ -1,19 +1,20 @@
 /*  Autonomous Ball Thrower
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include "CommonFramework/Tools/StatsTracking.h"
 #include "CommonFramework/Notifications/ProgramNotifications.h"
-#include "CommonFramework/InferenceInfra/InferenceRoutines.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonTools/Async/InferenceRoutines.h"
 #include "NintendoSwitch/NintendoSwitch_Settings.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
 #include "Pokemon/Pokemon_Strings.h"
-#include "PokemonSwSh/PokemonSwSh_Settings.h"
-#include "PokemonSwSh/Inference/Battles/PokemonSwSh_BattleMenuDetector.h"
-#include "PokemonSwSh/Programs/PokemonSwSh_BasicCatcher.h"
-#include "PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
+#include "VideoGames/PokemonSwSh/PokemonSwSh_Settings.h"
+#include "VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleMenuDetector.h"
+#include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_BasicCatcher.h"
+#include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
 #include "PokemonSwSh_AutonomousBallThrower.h"
 
 namespace PokemonAutomation{
@@ -25,11 +26,12 @@ AutonomousBallThrower_Descriptor::AutonomousBallThrower_Descriptor()
     : SingleSwitchProgramDescriptor(
         "PokemonSwSh:AutonomousBallThrower",
         STRING_POKEMON + " SwSh", "Autonomous Ball Thrower",
-        "ComputerControl/blob/master/Wiki/Programs/PokemonSwSh/AutonomousBallThrower.md",
+        "Programs/PokemonSwSh/AutonomousBallThrower.html",
         "Repeatedly throw a ball and reset until you catch the pokemon.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
         FeedbackType::REQUIRED,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
     )
 {}
 struct AutonomousBallThrower_Descriptor::Stats : public StatsTracker{
@@ -66,7 +68,7 @@ AutonomousBallThrower::AutonomousBallThrower()
     : GO_HOME_WHEN_DONE(false)
     , BALL_SELECT(
         "<b>Ball Select:</b>",
-        LockWhileRunning::LOCKED,
+        LockMode::LOCK_WHILE_RUNNING,
         "master-ball"
     )
     , LANGUAGE(
@@ -82,7 +84,7 @@ AutonomousBallThrower::AutonomousBallThrower()
             Language::ChineseSimplified,
             Language::ChineseTraditional,
         },
-        LockWhileRunning::LOCKED,
+        LockMode::LOCK_WHILE_RUNNING,
         true
     )
     , NOTIFICATION_CATCH_SUCCESS("Catch Success", true, false, std::chrono::seconds(3600))
@@ -103,12 +105,18 @@ AutonomousBallThrower::AutonomousBallThrower()
 
 
 
-void AutonomousBallThrower::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context){
+void AutonomousBallThrower::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
     if (START_LOCATION.start_in_grip_menu()){
         grip_menu_connect_go_home(context);
-        resume_game_back_out(env.console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST, 200);
+        resume_game_back_out(
+            env.console,
+            context,
+            ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST,
+            1600ms
+        );
     }else{
-        pbf_press_button(context, BUTTON_B, 5, 5);
+        //  Connect the controller.
+        require_player(env.console, context, BUTTON_B);
     }
 
     AutonomousBallThrower_Descriptor::Stats& stats = env.current_stats<AutonomousBallThrower_Descriptor::Stats>();
@@ -119,23 +127,23 @@ void AutonomousBallThrower::program(SingleSwitchProgramEnvironment& env, BotBase
         env.log("Wait for a pokemon to attack you.", COLOR_PURPLE);
         {
             StandardBattleMenuWatcher fight_detector(false);
-            int result = run_until(
+            int result = run_until<ProControllerContext>(
                 env.console, context,
-                [](BotBaseContext& context){
+                [](ProControllerContext& context){
                     while (true){
                         //TODO edit here for what to do
-                        pbf_wait(context, 1 * TICKS_PER_SECOND);
+                        pbf_wait(context, 1000ms);
                     }
                 },
                 {{fight_detector}}
             );
             if (result == 0){
                 env.log("New fight detected.", COLOR_PURPLE);
-                pbf_mash_button(context, BUTTON_B, 1 * TICKS_PER_SECOND);
+                pbf_mash_button(context, BUTTON_B, 1000ms);
             }
         }
 
-        CatchResults result = basic_catcher(env.console, context, LANGUAGE, BALL_SELECT.slug());
+        CatchResults result = basic_catcher(env.console, context, LANGUAGE, BALL_SELECT.slug(), 999);
         switch (result.result){
         case CatchResult::POKEMON_CAUGHT:
             pokemon_caught = true;
@@ -150,6 +158,7 @@ void AutonomousBallThrower::program(SingleSwitchProgramEnvironment& env, BotBase
         case CatchResult::OUT_OF_BALLS:
             stats.out_of_balls++;
             break;
+        case CatchResult::BALL_LIMIT_REACHED:
         case CatchResult::CANNOT_THROW_BALL:
         case CatchResult::TIMED_OUT:
             stats.errors++;
@@ -171,7 +180,7 @@ void AutonomousBallThrower::program(SingleSwitchProgramEnvironment& env, BotBase
         }
 
         if (!pokemon_caught){
-            pbf_press_button(context, BUTTON_HOME, 10, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE);
+            pbf_press_button(context, BUTTON_HOME, 160ms, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE0);
             reset_game_from_home_with_inference(
                 env.console, context,
                 ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/General/PokemonSwSh_AutonomousBallThrower.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/General/PokemonSwSh_AutonomousBallThrower.h
similarity index 75%
rename from SerialPrograms/Source/PokemonSwSh/Programs/General/PokemonSwSh_AutonomousBallThrower.h
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/General/PokemonSwSh_AutonomousBallThrower.h
index 104951b3d2..16f741027c 100644
--- a/SerialPrograms/Source/PokemonSwSh/Programs/General/PokemonSwSh_AutonomousBallThrower.h
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/General/PokemonSwSh_AutonomousBallThrower.h
@@ -1,18 +1,18 @@
 /*  Autonomous Ball Thrower
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifndef PokemonAutomation_PokemonSwSh_AutonomousStatsReset_H
 #define PokemonAutomation_PokemonSwSh_AutonomousStatsReset_H
 
-#include "CommonFramework/Options/LanguageOCROption.h"
 #include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "CommonTools/Options/LanguageOCROption.h"
 #include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
 #include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
 #include "NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h"
-#include "PokemonSwSh/Options/PokemonSwSh_BallSelectOption.h"
+#include "VideoGames/PokemonSwSh/Options/PokemonSwSh_BallSelectOption.h"
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
@@ -31,8 +31,9 @@ class AutonomousBallThrower_Descriptor : public SingleSwitchProgramDescriptor{
 
 class AutonomousBallThrower : public SingleSwitchProgramInstance{
 public:
+    using Descriptor = AutonomousBallThrower_Descriptor;
     AutonomousBallThrower();
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
 
 private:
     StartInGripOrGameOption START_LOCATION;
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/General/PokemonSwSh_BoxReorderNationalDex.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/General/PokemonSwSh_BoxReorderNationalDex.cpp
new file mode 100644
index 0000000000..b7f044809c
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/General/PokemonSwSh_BoxReorderNationalDex.cpp
@@ -0,0 +1,244 @@
+/*  Box Reorder National Dex
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <algorithm>
+#include <sstream>
+#include <map>
+#include "CommonFramework/Language.h"
+//#include "CommonFramework/Exceptions/OperationFailedException.h"
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/StartupChecks/StartProgramChecks.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "Pokemon/Resources/Pokemon_PokemonSlugs.h"
+#include "Pokemon/Inference/Pokemon_NameReader.h"
+//#include "VideoGames/PokemonSwSh/PokemonSwSh_Settings.h"
+#include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
+#include "PokemonSwSh_BoxReorderNationalDex.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+    using namespace Pokemon;
+
+
+namespace{
+
+constexpr Milliseconds k_wait_after_move = 664ms;
+constexpr std::chrono::milliseconds k_wait_after_read = std::chrono::milliseconds(200);
+
+// A location can be represented as a uint16_t, meaning the order of the location starting at the first box.
+// This function decodes this location into box ID and in-box 2D location.
+std::tuple<uint16_t, uint16_t, uint16_t> get_location(size_t index){
+    uint16_t box = (uint16_t)(index / 30);
+    index = index % 30;
+
+    uint16_t row = (uint16_t)(index / 6);
+    index = index % 6;
+
+    uint16_t column = (uint16_t)(index);
+    return { box, row, column };
+}
+
+// Move cursor from one location to another
+// The location is represented as a uint16_t, meaning the order of the location starting at the first box.
+// Decode this location into box ID and in-box 2D location by `get_location()`
+uint16_t move_to_location(Logger& logger, ProControllerContext& context, uint16_t from, uint16_t to){
+    auto [from_box, from_row, from_column] = get_location(from);
+    auto [to_box, to_row, to_column] = get_location(to);
+
+    std::ostringstream ss;
+    ss << "Moving from location index " << from << "(" << from_box << "/" << from_row << "/" << from_column << ")";
+    ss << " to location index " << to << "(" << to_box << "/" << to_row << "/" << to_column << ")";
+    logger.log(ss.str());
+
+    int difference_box = to_box - from_box;
+    int difference_row = to_row - from_row;
+    int difference_column = to_column - from_column;
+
+    // TODO: can make this more efficient by moving past grid boundary to appear at the other side
+
+    for (int i = 0; i < difference_box; ++i){
+        pbf_press_button(context, BUTTON_R, 80ms, k_wait_after_move);
+    }
+    for (int i = 0; i > difference_box; --i){
+        pbf_press_button(context, BUTTON_L, 80ms, k_wait_after_move);
+    }
+
+    for (int i = 0; i < difference_row; ++i){
+        pbf_press_dpad(context, DPAD_DOWN, 80ms, k_wait_after_move);
+    }
+    for (int i = 0; i > difference_row; --i){
+        pbf_press_dpad(context, DPAD_UP, 80ms, k_wait_after_move);
+    }
+
+    for (int i = 0; i < difference_column; ++i){
+        pbf_press_dpad(context, DPAD_RIGHT, 80ms, k_wait_after_move);
+    }
+    for (int i = 0; i > difference_column; --i){
+        pbf_press_dpad(context, DPAD_LEFT, 80ms, k_wait_after_move);
+    }
+    return to;
+}
+
+// Read the current displayed pokemon name. Return the pokemon slug.
+//
+// A slug is a unique name used in a program, different than the name that is displayed to user on UI.
+// In most cases, a pokemon slug is the lower-case version of the Pokemon name, but there are some cases
+// like the slug of the Pokemon Mr. Mime is "mr-mime".
+std::string read_selected_pokemon(
+    VideoStream& stream, ProControllerContext& context,
+    Language language
+){
+    context.wait_for_all_requests();
+    OverlayBoxScope box(stream.overlay(), ImageFloatBox(0.76, 0.08, 0.15, 0.064));
+    context.wait_for(k_wait_after_read);
+
+    VideoSnapshot screen = stream.video().snapshot();
+    ImageViewRGB32 frame = extract_box_reference(screen, box);
+
+    OCR::StringMatchResult result = PokemonNameReader::instance().read_substring(
+        stream.logger(), language, frame,
+        OCR::BLACK_TEXT_FILTERS()
+    );
+    result.log(stream.logger(), PokemonNameReader::MAX_LOG10P);
+//        assert(result.results.size() == 1);
+    if (result.results.size() != 1){
+        return "";
+    }
+    return result.results.begin()->second.token;
+}
+
+// Move through some pokemon according to the box location order and read their names.
+// Return a list of pokemon slugs.
+std::vector<std::string> read_all_pokemon(
+    Logger& logger,
+    VideoStream& stream, ProControllerContext& context,
+    uint16_t pokemon_count,
+    Language language
+){
+    std::vector<std::string> pokemons;
+    uint16_t current_location = 0;
+    for (uint16_t i = 0; i < pokemon_count; ++i){
+        current_location = move_to_location(logger, context, current_location, i);
+        pokemons.push_back(read_selected_pokemon(stream, context, language));
+    }
+    return pokemons;
+}
+
+}
+
+BoxReorderNationalDex_Descriptor::BoxReorderNationalDex_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonSwSh:BoxReorderNationalDex",
+        STRING_POKEMON + " SwSh", "Box Reorder National Dex",
+        "Programs/PokemonSwSh/BoxReorderNationalDex.html",
+        "Order boxes of " + STRING_POKEMON + ".",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_RequiresPrecision,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+
+
+BoxReorderNationalDex::BoxReorderNationalDex()
+    : LANGUAGE(
+        "<b>Game Language:</b><br>This needs to be set correctly for " + STRING_POKEMON + " to be identified correctly.",
+        PokemonNameReader::instance().languages(),
+        LockMode::LOCK_WHILE_RUNNING,
+        true
+    )
+    , POKEMON_COUNT(
+        "<b>Number of " + STRING_POKEMON + " to order:</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        30
+    )
+    , DODGE_SYSTEM_UPDATE_WINDOW(
+        "<b>Dodge System Update Window:</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        false
+    )
+{
+    PA_ADD_OPTION(START_LOCATION);
+    PA_ADD_OPTION(LANGUAGE);
+    PA_ADD_OPTION(POKEMON_COUNT);
+    PA_ADD_OPTION(DODGE_SYSTEM_UPDATE_WINDOW);
+}
+
+void BoxReorderNationalDex::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    StartProgramChecks::check_performance_class_wired_or_wireless(context);
+
+    if (START_LOCATION.start_in_grip_menu()){
+        grip_menu_connect_go_home(context);
+        resume_game_no_interact(env.console, context, DODGE_SYSTEM_UPDATE_WINDOW);
+    }else{
+        //  Connect the controller.
+        require_player(env.console, context, BUTTON_LCLICK);
+    }
+
+    // Read all the pokemon and return a list of their slugs in the current box order.
+    std::vector<std::string> current_order = read_all_pokemon(env.console, env.console, context, POKEMON_COUNT, LANGUAGE);
+
+    // The list of pokemon slugs in national order.
+    const std::vector<std::string>& dex_slugs = NATIONAL_DEX_SLUGS();
+    // Build a map of slug -> national dex ID for fast lookup
+    std::map<std::string, size_t> dex_slug_order;
+    for (size_t i = 0; i < dex_slugs.size(); ++i){
+        dex_slug_order.emplace(dex_slugs[i], i);
+    }
+
+    // Sort the read pokemon by the dex order.
+    std::vector<std::string> sorted_order = current_order;
+
+    std::sort(sorted_order.begin(), sorted_order.end(), [&](const std::string& str1, const std::string& str2){
+        const size_t id1 = dex_slug_order.find(str1)->second;
+        const size_t id2 = dex_slug_order.find(str2)->second;
+        return id1 < id2;
+    });
+
+    // Now the cursor is at the last pokemon:
+    uint16_t current_location = POKEMON_COUNT - 1;
+    for (uint16_t index = 0; index < current_order.size(); ++index){
+        if (current_order[index] == sorted_order[index]){
+            continue;
+        }
+
+        const auto it = std::find(current_order.begin() + index, current_order.end(), sorted_order[index]);
+        // Where the pokemon should be moved from
+        const uint16_t unsorted_location = (uint16_t)(it - current_order.begin());
+        // Where the pokemon should be moved to
+        const uint16_t sorted_location = index;
+
+        std::ostringstream ss;
+        ss << "Swapping " << current_order[unsorted_location] << " at location index " << unsorted_location << " and " << current_order[sorted_location] << " at location index " << sorted_location;
+        env.console.log(ss.str());
+        // Move the cursor to the unsorted_location
+        current_location = move_to_location(env.console, context, current_location, unsorted_location);
+        // Press A to grab the pokemon
+        pbf_press_button(context, BUTTON_A, 80ms, k_wait_after_move);
+        // Move the cursor to the sorted_location
+        current_location = move_to_location(env.console, context, current_location, sorted_location);
+        // Press A to finish swapping the pokemon
+        pbf_press_button(context, BUTTON_A, 80ms, k_wait_after_move);
+        // Now the order in the box is changed, update `current_order` to reflect this change.
+        std::swap(current_order[unsorted_location], current_order[sorted_location]);
+    }
+
+    // Go to Switch home menu
+    go_home(env.console, context);
+}
+
+
+
+}
+}
+}
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/General/PokemonSwSh_BoxReorderNationalDex.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/General/PokemonSwSh_BoxReorderNationalDex.h
new file mode 100644
index 0000000000..642ae0f044
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/General/PokemonSwSh_BoxReorderNationalDex.h
@@ -0,0 +1,47 @@
+/*  Box Reorder National Dex
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_Ordering_H
+#define PokemonAutomation_PokemonSwSh_Ordering_H
+
+#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "CommonTools/Options/LanguageOCROption.h"
+#include "NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+class BoxReorderNationalDex_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    BoxReorderNationalDex_Descriptor();
+};
+
+
+
+class BoxReorderNationalDex : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = BoxReorderNationalDex_Descriptor;
+    BoxReorderNationalDex();
+
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    StartInGripOrGameOption START_LOCATION;
+    OCR::LanguageOCROption LANGUAGE;
+    SimpleIntegerOption<uint16_t> POKEMON_COUNT;
+    BooleanCheckBoxOption DODGE_SYSTEM_UPDATE_WINDOW;
+};
+
+
+}
+}
+}
+#endif
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/General/PokemonSwSh_ClothingBuyer.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/General/PokemonSwSh_ClothingBuyer.cpp
new file mode 100644
index 0000000000..b106eb2890
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/General/PokemonSwSh_ClothingBuyer.cpp
@@ -0,0 +1,69 @@
+/*  Clothing Buyer
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/NintendoSwitch_Settings.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
+#include "PokemonSwSh_ClothingBuyer.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+    using namespace Pokemon;
+
+
+ClothingBuyer_Descriptor::ClothingBuyer_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonSwSh:ClothingBuyer",
+        STRING_POKEMON + " SwSh", "Clothing Buyer",
+        "Programs/PokemonSwSh/ClothingBuyer.html",
+        "Buy out all the clothing in a store.",
+        PanelQualityStanding::OFFICIAL_BELOW_STANDARDS,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::NONE,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+
+
+ClothingBuyer::ClothingBuyer()
+    : CATEGORY_ROTATION(
+        "<b>Rotate Categories:</b><br>This slows down the program, but ensures it will cover all categories.",
+        LockMode::LOCK_WHILE_RUNNING,
+        true
+    )
+{
+    PA_ADD_OPTION(START_LOCATION);
+    PA_ADD_OPTION(CATEGORY_ROTATION);
+}
+
+void ClothingBuyer::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    if (START_LOCATION.start_in_grip_menu()){
+        grip_menu_connect_go_home(context);
+        resume_game_no_interact(env.console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST);
+    }else{
+        //  Connect the controller.
+        require_player(env.console, context, BUTTON_LCLICK);
+    }
+
+    while (true){
+        pbf_press_button(context, BUTTON_A, 80ms, 720ms);
+        if (CATEGORY_ROTATION){
+            pbf_press_dpad(context, DPAD_RIGHT, 80ms, 320ms);
+        }
+        pbf_press_button(context, BUTTON_A, 80ms, 720ms);
+        pbf_press_button(context, BUTTON_A, 80ms, 720ms);
+        pbf_press_dpad(context, DPAD_DOWN, 80ms, 320ms);
+    }
+}
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/General/PokemonSwSh_ClothingBuyer.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/General/PokemonSwSh_ClothingBuyer.h
new file mode 100644
index 0000000000..af8066b668
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/General/PokemonSwSh_ClothingBuyer.h
@@ -0,0 +1,46 @@
+/*  Clothing Buyer
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_ClothingBuyer_H
+#define PokemonAutomation_PokemonSwSh_ClothingBuyer_H
+
+#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+class ClothingBuyer_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    ClothingBuyer_Descriptor();
+};
+
+
+
+class ClothingBuyer : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = ClothingBuyer_Descriptor;
+    ClothingBuyer();
+
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    StartInGripOrGameOption START_LOCATION;
+    BooleanCheckBoxOption CATEGORY_ROTATION;
+};
+
+
+
+}
+}
+}
+#endif
+
+
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/General/PokemonSwSh_DexRecFinder.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/General/PokemonSwSh_DexRecFinder.cpp
new file mode 100644
index 0000000000..24ff860d79
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/General/PokemonSwSh_DexRecFinder.cpp
@@ -0,0 +1,257 @@
+/*  Pokedex Recommendation Finder
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/ImageTypes/ImageViewRGB32.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "NintendoSwitch/Programs/DateSpam/NintendoSwitch_HomeToDateTime.h"
+#include "NintendoSwitch/Programs/DateSpam/NintendoSwitch_NeutralDateSkip.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "Pokemon/Inference/Pokemon_NameReader.h"
+#include "VideoGames/PokemonSwSh/PokemonSwSh_Settings.h"
+#include "VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_GameEntry.h"
+#include "VideoGames/PokemonSwSh/Resources/PokemonSwSh_NameDatabase.h"
+#include "PokemonSwSh_DexRecFinder.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+using namespace Pokemon;
+
+
+
+DexRecFinder_Descriptor::DexRecFinder_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonSwSh:DexRecFinder",
+        STRING_POKEMON + " SwSh", "Dex Rec Finder",
+        "Programs/PokemonSwSh/DexRecFinder.html",
+        "Search for a " + STRING_POKEDEX + " recommendation by date-spamming.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_PerformanceClassSensitive,
+        FeedbackType::OPTIONAL_,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+struct DexRecFinder_Descriptor::Stats : public StatsTracker{
+    Stats()
+        : attempts(m_stats["Attempts"])
+        , errors(m_stats["Read Errors"])
+        , excluded(m_stats["Excluded"])
+        , matches(m_stats["Matches"])
+    {
+        m_display_order.emplace_back(Stat("Attempts"));
+        m_display_order.emplace_back(Stat("Read Errors"));
+        m_display_order.emplace_back(Stat("Excluded"));
+        m_display_order.emplace_back(Stat("Matches"));
+    }
+
+    std::atomic<uint64_t>& attempts;
+    std::atomic<uint64_t>& errors;
+    std::atomic<uint64_t>& excluded;
+    std::atomic<uint64_t>& matches;
+};
+std::unique_ptr<StatsTracker> DexRecFinder_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+
+
+DexRecFilters::DexRecFilters()
+    : GroupOption(
+        "Stop Automatically (requires video feedback)",
+        LockMode::LOCK_WHILE_RUNNING,
+        GroupOption::EnableMode::DEFAULT_ENABLED
+    )
+    , LANGUAGE(
+        "<b>Game Language:</b><br>This needs to be set correctly for stop filters to work correctly.",
+        PokemonNameReader::instance().languages(),
+        LockMode::LOCK_WHILE_RUNNING,
+        true
+    )
+    , DESIRED(
+        "<b>Desired " + STRING_POKEMON + ":</b><br>Stop when it finds this " + STRING_POKEMON + ". Requires the language be set.",
+        COMBINED_DEX_NAMES(),
+        LockMode::LOCK_WHILE_RUNNING,
+        "ralts"
+    )
+    , EXCLUSIONS(
+        "<b>Exclusions:</b><br>Do not stop on these " + STRING_POKEMON + " even if the desired " + STRING_POKEMON + " is found. "
+        "Use this to avoid dex recs that include other " + STRING_POKEMON + " in the spawn pool you don't want.",
+        STRING_POKEMON, COMBINED_DEX_NAMES(), "grubbin"
+    )
+{
+    PA_ADD_OPTION(LANGUAGE);
+    PA_ADD_OPTION(DESIRED);
+    PA_ADD_OPTION(EXCLUSIONS);
+}
+
+
+
+DexRecFinder::DexRecFinder()
+    : GO_HOME_WHEN_DONE(false)
+    , VIEW_TIME0(
+        "<b>View Time:</b><br>View the " + STRING_POKEDEX + " for this long before continuing.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "2000 ms"
+    )
+    , NOTIFICATION_PROGRAM_FINISH("Program Finished", true, true, ImageAttachmentMode::JPG)
+    , NOTIFICATIONS({
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+    , m_advanced_options(
+        "<font size=4><b>Advanced Options:</b> You should not need to touch anything below here.</font>"
+    )
+    , ENTER_POKEDEX_TIME0(
+        "<b>Enter " + STRING_POKEDEX + " Time:</b><br>Wait this long for the " + STRING_POKEDEX + " to open.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "3000 ms"
+    )
+    , BACK_OUT_TIME0(
+        "<b>Back Out Time:</b><br>Mash B for this long to return to the overworld.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "3000 ms"
+    )
+{
+    PA_ADD_OPTION(START_LOCATION);
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+
+    PA_ADD_OPTION(FILTERS);
+    PA_ADD_OPTION(VIEW_TIME0);
+    PA_ADD_OPTION(NOTIFICATIONS);
+
+    PA_ADD_STATIC(m_advanced_options);
+    PA_ADD_OPTION(ENTER_POKEDEX_TIME0);
+    PA_ADD_OPTION(BACK_OUT_TIME0);
+}
+
+
+void DexRecFinder::read_line(
+    bool& found,
+    bool& excluded,
+    bool& bad_read,
+    Logger& logger,
+    Language language,
+    const ImageViewRGB32& frame,
+    const ImageFloatBox& box,
+    const std::set<std::string>& desired,
+    const std::set<std::string>& exclusions
+){
+    ImageViewRGB32 image = extract_box_reference(frame, box);
+    OCR::StringMatchResult result = PokemonNameReader::instance().read_substring(
+        logger, language, image,
+        OCR::BLACK_TEXT_FILTERS()
+    );
+    if (result.results.empty()){
+        bad_read = true;
+        return;
+    }
+    for (const auto& hit : result.results){
+        if (desired.find(hit.second.token) != desired.end()){
+            found = true;
+        }
+        if (exclusions.find(hit.second.token) != exclusions.end()){
+            excluded = true;
+        }
+    }
+}
+
+void DexRecFinder::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    if (START_LOCATION.start_in_grip_menu()){
+        grip_menu_connect_go_home(context);
+    }else{
+        //  Connect the controller.
+        require_player(env.console, context, BUTTON_B);
+        pbf_press_button(context, BUTTON_HOME, 160ms, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE0);
+    }
+
+    std::set<std::string> desired;
+    desired.insert(FILTERS.DESIRED.slug());
+
+    std::set<std::string> exclusions;
+    for (std::string& slug : FILTERS.EXCLUSIONS.all_slugs()){
+        exclusions.insert(std::move(slug));
+    }
+
+    DexRecFinder_Descriptor::Stats& stats = env.current_stats<DexRecFinder_Descriptor::Stats>();
+
+    while (true){
+        home_to_date_time(env.console, context, true);
+        neutral_date_skip(env.console, context);
+        settings_to_enter_game(context, true);
+        pbf_mash_button(context, BUTTON_B, 720ms);
+        ssf_press_button(context, BUTTON_X, GameSettings::instance().OVERWORLD_TO_MENU_DELAY0, 160ms);
+
+        if (FILTERS.enabled()){
+            context.wait_for_all_requests();
+            OverlayBoxScope box0(env.console, ImageFloatBox(0.75, 0.531 + 0 * 0.1115, 0.18, 0.059));
+            OverlayBoxScope box1(env.console, ImageFloatBox(0.75, 0.531 + 1 * 0.1115, 0.18, 0.059));
+            OverlayBoxScope box2(env.console, ImageFloatBox(0.75, 0.531 + 2 * 0.1115, 0.18, 0.059));
+            OverlayBoxScope box3(env.console, ImageFloatBox(0.75, 0.531 + 3 * 0.1115, 0.18, 0.059));
+            pbf_press_button(context, BUTTON_A, 80ms, ENTER_POKEDEX_TIME0);
+            context.wait_for_all_requests();
+
+            VideoSnapshot frame = env.console.video().snapshot();
+            bool found = false;
+            bool excluded = false;
+            bool bad_read = false;
+            if (!frame){
+                bad_read = true;
+            }else{
+                read_line(found, excluded, bad_read, env.console, FILTERS.LANGUAGE, frame, box0, desired, exclusions);
+                read_line(found, excluded, bad_read, env.console, FILTERS.LANGUAGE, frame, box1, desired, exclusions);
+                read_line(found, excluded, bad_read, env.console, FILTERS.LANGUAGE, frame, box2, desired, exclusions);
+                read_line(found, excluded, bad_read, env.console, FILTERS.LANGUAGE, frame, box3, desired, exclusions);
+            }
+
+            stats.attempts++;
+            if (found){
+                if (excluded){
+                    env.log("Found desired, but contains exclusion.", COLOR_BLUE);
+                    stats.excluded++;
+                }else{
+                    env.log("Found a match!", COLOR_BLUE);
+                    stats.matches++;
+                    break;
+                }
+            }
+            if (bad_read){
+                env.log("Read Errors. Pausing for user to see.", COLOR_RED);
+                stats.errors++;
+                pbf_wait(context, VIEW_TIME0);
+            }
+        }else{
+            stats.attempts++;
+//            stats.errors++;
+            pbf_press_button(context, BUTTON_A, 80ms, ENTER_POKEDEX_TIME0);
+            pbf_wait(context, VIEW_TIME0);
+        }
+        env.update_stats();
+
+        pbf_mash_button(context, BUTTON_B, BACK_OUT_TIME0);
+        pbf_press_button(context, BUTTON_HOME, 160ms, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE0);
+    }
+
+    env.update_stats();
+    send_program_finished_notification(
+        env, NOTIFICATION_PROGRAM_FINISH,
+        "Found a match!",
+        env.console.video().snapshot(), false
+    );
+    GO_HOME_WHEN_DONE.run_end_of_program(context);
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/General/PokemonSwSh_DexRecFinder.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/General/PokemonSwSh_DexRecFinder.h
new file mode 100644
index 0000000000..06ae61c8f4
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/General/PokemonSwSh_DexRecFinder.h
@@ -0,0 +1,86 @@
+/*  Pokedex Recommendation Finder
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_DexRecFinder_H
+#define PokemonAutomation_PokemonSwSh_DexRecFinder_H
+
+#include "Common/Cpp/Options/StaticTextOption.h"
+#include "Common/Cpp/Options/TimeDurationOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonTools/Options/StringSelectTableOption.h"
+#include "CommonTools/Options/LanguageOCROption.h"
+#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+#include "NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+
+class DexRecFinder_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    DexRecFinder_Descriptor();
+
+    struct Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+
+
+class DexRecFilters : public GroupOption{
+public:
+    DexRecFilters();
+
+    OCR::LanguageOCROption LANGUAGE;
+    StringSelectOption DESIRED;
+    StringSelectTableOption EXCLUSIONS;
+};
+
+
+class DexRecFinder : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = DexRecFinder_Descriptor;
+    DexRecFinder();
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    void read_line(
+        bool& found,
+        bool& excluded,
+        bool& bad_read,
+        Logger& logger,
+        Language language,
+        const ImageViewRGB32& frame,
+        const ImageFloatBox& box,
+        const std::set<std::string>& desired,
+        const std::set<std::string>& exclusions
+    );
+
+private:
+    StartInGripOrGameOption START_LOCATION;
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
+
+    DexRecFilters FILTERS;
+    MillisecondsOption VIEW_TIME0;
+
+    EventNotificationOption NOTIFICATION_PROGRAM_FINISH;
+    EventNotificationsOption NOTIFICATIONS;
+
+    SectionDividerOption m_advanced_options;
+    MillisecondsOption ENTER_POKEDEX_TIME0;
+    MillisecondsOption BACK_OUT_TIME0;
+};
+
+}
+}
+}
+#endif
+
+
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/General/PokemonSwSh_MassRelease.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/General/PokemonSwSh_MassRelease.cpp
new file mode 100644
index 0000000000..a8def37ee7
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/General/PokemonSwSh_MassRelease.cpp
@@ -0,0 +1,70 @@
+/*  Mass Release
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
+#include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_ReleaseHelpers.h"
+#include "PokemonSwSh_MassRelease.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+    using namespace Pokemon;
+
+
+MassRelease_Descriptor::MassRelease_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonSwSh:MassRelease",
+        STRING_POKEMON + " SwSh", "Mass Release",
+        "Programs/PokemonSwSh/MassRelease.html",
+        "Mass release boxes of " + STRING_POKEMON + ".",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_PerformanceClassSensitive,
+        FeedbackType::NONE,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+
+
+MassRelease::MassRelease()
+    : BOXES_TO_RELEASE(
+        "<b>Number of Boxes to Release:</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        2, 0, 32
+    )
+    , DODGE_SYSTEM_UPDATE_WINDOW(
+        "<b>Dodge System Update Window:</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        false
+    )
+{
+    PA_ADD_OPTION(START_LOCATION);
+    PA_ADD_OPTION(BOXES_TO_RELEASE);
+    PA_ADD_OPTION(DODGE_SYSTEM_UPDATE_WINDOW);
+}
+
+void MassRelease::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    if (START_LOCATION.start_in_grip_menu()){
+        grip_menu_connect_go_home(context);
+        resume_game_no_interact(env.console, context, DODGE_SYSTEM_UPDATE_WINDOW);
+    }else{
+        //  Connect the controller.
+        require_player(env.console, context, BUTTON_LCLICK);
+    }
+
+    release_boxes(context, BOXES_TO_RELEASE);
+    go_home(env.console, context);
+}
+
+
+
+}
+}
+}
+
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/General/PokemonSwSh_MassRelease.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/General/PokemonSwSh_MassRelease.h
similarity index 77%
rename from SerialPrograms/Source/PokemonSwSh/Programs/General/PokemonSwSh_MassRelease.h
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/General/PokemonSwSh_MassRelease.h
index 31e96b9622..bba2b2420b 100644
--- a/SerialPrograms/Source/PokemonSwSh/Programs/General/PokemonSwSh_MassRelease.h
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/General/PokemonSwSh_MassRelease.h
@@ -1,6 +1,6 @@
 /*  Mass Release
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -26,9 +26,10 @@ class MassRelease_Descriptor : public SingleSwitchProgramDescriptor{
 
 class MassRelease : public SingleSwitchProgramInstance{
 public:
+    using Descriptor = MassRelease_Descriptor;
     MassRelease();
 
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
 
 private:
     StartInGripOrGameOption START_LOCATION;
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/General/PokemonSwSh_SurpriseTrade.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/General/PokemonSwSh_SurpriseTrade.cpp
new file mode 100644
index 0000000000..e1c517ba11
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/General/PokemonSwSh_SurpriseTrade.cpp
@@ -0,0 +1,157 @@
+/*  Surprise Trade
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonTools/StartupChecks/StartProgramChecks.h"
+#include "NintendoSwitch/NintendoSwitch_Settings.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonSwSh/PokemonSwSh_Settings.h"
+#include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
+#include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_BoxHelpers.h"
+#include "PokemonSwSh_SurpriseTrade.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+    using namespace Pokemon;
+
+
+SurpriseTrade_Descriptor::SurpriseTrade_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonSwSh:SurpriseTrade",
+        STRING_POKEMON + " SwSh", "Surprise Trade",
+        "Programs/PokemonSwSh/SurpriseTrade.html",
+        "Surprise trade away boxes of " + STRING_POKEMON,
+        PanelQualityStanding::OFFICIAL_BELOW_STANDARDS,
+        ProgramControllerClass::StandardController_RequiresPrecision,
+        FeedbackType::NONE,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+
+
+SurpriseTrade::SurpriseTrade()
+    : BOXES_TO_TRADE(
+        "<b>Number of Boxes to Trade:</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        2
+    )
+    , INITIAL_WAIT0(
+        "<b>Time to wait for a Trade Partner:</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        "30 s"
+    )
+    , m_advanced_options(
+        "<font size=4><b>Advanced Options:</b> You should not need to touch anything below here.</font>"
+    )
+    , TRADE_ANIMATION0(
+        "<b>Trade Animation Time:</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        "23 s"
+    )
+    , EVOLVE_DELAY0(
+        "<b>Evolve Delay:</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        "30 s"
+    )
+{
+    PA_ADD_OPTION(START_LOCATION);
+
+    PA_ADD_OPTION(BOXES_TO_TRADE);
+    PA_ADD_OPTION(INITIAL_WAIT0);
+    PA_ADD_STATIC(m_advanced_options);
+    PA_ADD_OPTION(TRADE_ANIMATION0);
+    PA_ADD_OPTION(EVOLVE_DELAY0);
+}
+
+
+void SurpriseTrade::trade_slot(ProControllerContext& context, uint8_t slot, bool next_box) const{
+    ssf_press_button(context, BUTTON_Y, GameSettings::instance().OPEN_YCOMM_DELAY0, 400ms);
+    ssf_press_dpad(context, DPAD_DOWN, 80ms);
+    ssf_press_button(context, BUTTON_A, 2240ms, 160ms);
+
+    if (next_box){
+        ssf_press_button(context, BUTTON_R, GameSettings::instance().BOX_CHANGE_DELAY0);
+    }
+
+    //  Move to slot
+    while (slot >= 6){
+        box_scroll(context, DPAD_DOWN);
+        slot -= 6;
+    }
+    while (slot > 0){
+        box_scroll(context, DPAD_RIGHT);
+        slot--;
+    }
+
+    ssf_press_button(context, BUTTON_A, 400ms);
+    ssf_press_button(context, BUTTON_A, 4000ms);
+    ssf_press_button(context, BUTTON_A, 800ms);
+    ssf_press_button(context, BUTTON_A, 800ms);
+
+    pbf_mash_button(context, BUTTON_B, INITIAL_WAIT0);
+
+    //  This is a state-merging operation.
+    //  If we just finished a trade, this will start the animation for it.
+    //  If we failed the previous trade and are stuck in the wrong parity, this
+    //  is a no-op that will correct the parity and setup the next trade.
+    ssf_press_button(context, BUTTON_Y, GameSettings::instance().OPEN_YCOMM_DELAY0);
+    pbf_mash_button(context, BUTTON_B, TRADE_ANIMATION0);
+}
+
+void SurpriseTrade::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    StartProgramChecks::check_performance_class_wired_or_wireless(context);
+
+    if (START_LOCATION.start_in_grip_menu()){
+        grip_menu_connect_go_home(context);
+        resume_game_no_interact(env.console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST);
+    }else{
+        //  Connect the controller.
+        require_player(env.console, context, BUTTON_B);
+    }
+
+    for (uint8_t box = 0; box < BOXES_TO_TRADE; box++){
+        //  At this point, we MUST be in the overworld with no pending trade.
+        //  Otherwise the box transition will fail. Therefore we add a cleanup
+        //  stage after each box to make sure we are in this state.
+        trade_slot(context, 0, box != 0);
+
+        for (uint8_t c = 1; c < 30; c++){
+            trade_slot(context, c, false);
+        }
+
+        //  If the previous trade isn't done, either wait to finish or cancel it.
+        //  Two iterations of this will merge all the following states:
+        //      1.  The last trade finished successfully. Both iterations are no-ops.
+        //      2.  The last trade was slightly too slow. The 1st iteration
+        //          will finish it. The 2nd iteration is a no-op.
+        //      3.  The last trade was very slow. The 1st iteration is suppressed
+        //          because the trade is in progress. The 2nd iteration finishes it.
+        //      4.  No partner was ever found. The 1st iteration will cancel the trade.
+        for (uint8_t c = 0; c < 2; c++){
+            ssf_press_button(context, BUTTON_Y, 2000ms);
+            ssf_press_dpad(context, DPAD_DOWN, 160ms);
+            ssf_press_button(context, BUTTON_A, 2240ms);
+            ssf_press_button(context, BUTTON_B, 2240ms);
+            ssf_press_button(context, BUTTON_B, 1600ms);
+            ssf_press_button(context, BUTTON_A, 800ms);
+            pbf_mash_button(context, BUTTON_B, TRADE_ANIMATION0);
+        }
+
+        //  Wait out any new pokedex entries or trade evolutions.
+        pbf_mash_button(context, BUTTON_B, EVOLVE_DELAY0);
+    }
+
+    ssf_press_button(context, BUTTON_HOME, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE0, 80ms);
+}
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/General/PokemonSwSh_SurpriseTrade.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/General/PokemonSwSh_SurpriseTrade.h
new file mode 100644
index 0000000000..0330540578
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/General/PokemonSwSh_SurpriseTrade.h
@@ -0,0 +1,55 @@
+/*  Surprise Trade
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_SurpriseTrade_H
+#define PokemonAutomation_PokemonSwSh_SurpriseTrade_H
+
+#include "Common/Cpp/Options/StaticTextOption.h"
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "Common/Cpp/Options/TimeDurationOption.h"
+#include "NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+class SurpriseTrade_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    SurpriseTrade_Descriptor();
+};
+
+
+
+class SurpriseTrade : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = SurpriseTrade_Descriptor;
+    SurpriseTrade();
+
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    void trade_slot(ProControllerContext& context, uint8_t slot, bool next_box) const;
+
+private:
+    StartInGripOrGameOption START_LOCATION;
+
+    SimpleIntegerOption<uint8_t> BOXES_TO_TRADE;
+    MillisecondsOption INITIAL_WAIT0;
+    SectionDividerOption m_advanced_options;
+    MillisecondsOption TRADE_ANIMATION0;
+    MillisecondsOption EVOLVE_DELAY0;
+};
+
+
+}
+}
+}
+#endif
+
+
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/General/PokemonSwSh_TradeBot.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/General/PokemonSwSh_TradeBot.cpp
new file mode 100644
index 0000000000..243d09411e
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/General/PokemonSwSh_TradeBot.cpp
@@ -0,0 +1,224 @@
+/*  TradeBot
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonTools/StartupChecks/StartProgramChecks.h"
+#include "NintendoSwitch/NintendoSwitch_Settings.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "NintendoSwitch/Programs/FastCodeEntry/NintendoSwitch_NumberCodeEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonSwSh/PokemonSwSh_Settings.h"
+#include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
+#include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_BoxHelpers.h"
+#include "PokemonSwSh_TradeBot.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+using namespace Pokemon;
+
+
+TradeBot_Descriptor::TradeBot_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonSwSh:TradeBot",
+        STRING_POKEMON + " SwSh", "Trade Bot",
+        "Programs/PokemonSwSh/TradeBot.html",
+        "Surprise trade with a code for hosting giveaways.",
+        PanelQualityStanding::DEPRECATED,
+        ProgramControllerClass::StandardController_RequiresPrecision,
+        FeedbackType::NONE,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+
+
+TradeBot::TradeBot()
+    : TRADE_CODE(
+        "<b>Trade Code:</b>",
+        8,
+        "1280 0000"
+    )
+    , BOXES_TO_TRADE(
+        "<b>Number of Boxes to Trade:</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        2
+    )
+    , LINK_TRADE_EXTRA_LINE(
+        "<b>Link Trade Extra Line:</b><br>Set this if you are playing in German.",
+        LockMode::LOCK_WHILE_RUNNING,
+        false
+    )
+    , SEARCH_DELAY0(
+        "<b>Time to wait for a Trade Partner:</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        "20 s"
+    )
+    , CONFIRM_DELAY0(
+        "<b>Time to wait for Partner to Confirm:</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        "10 s"
+    )
+    , TRADE_START0(
+        "<b>Time for Trade to Start:</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        "10 s"
+    )
+    , TRADE_COMMUNICATION0(
+        "<b>Communication Window:</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        "20 s"
+    )
+    , m_advanced_options(
+        "<font size=4><b>Advanced Options:</b> You should not need to touch anything below here.</font>"
+    )
+    , TRADE_ANIMATION0(
+        "<b>Trade Animation Time:</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        "23 s"
+    )
+    , EVOLVE_DELAY0(
+        "<b>Evolve Delay:</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        "30 s"
+    )
+{
+    PA_ADD_OPTION(START_LOCATION);
+
+    PA_ADD_OPTION(TRADE_CODE);
+    PA_ADD_OPTION(BOXES_TO_TRADE);
+    PA_ADD_OPTION(LINK_TRADE_EXTRA_LINE);
+    PA_ADD_OPTION(SEARCH_DELAY0);
+    PA_ADD_OPTION(CONFIRM_DELAY0);
+    PA_ADD_OPTION(TRADE_START0);
+    PA_ADD_OPTION(TRADE_COMMUNICATION0);
+    PA_ADD_STATIC(m_advanced_options);
+    PA_ADD_OPTION(TRADE_ANIMATION0);
+    PA_ADD_OPTION(EVOLVE_DELAY0);
+}
+
+
+void TradeBot::trade_slot(
+    ConsoleHandle& console, ProControllerContext& context,
+    const std::string& code, uint8_t slot
+) const{
+    ssf_press_button(context, BUTTON_Y, GameSettings::instance().OPEN_YCOMM_DELAY0, 400ms);
+    ssf_press_button(context, BUTTON_A, 1200ms, 160ms);
+    ssf_press_dpad(context, DPAD_DOWN, 80ms);
+    ssf_press_button(context, BUTTON_A, 1600ms, 160ms);
+    if (LINK_TRADE_EXTRA_LINE){
+        ssf_press_button(context, BUTTON_B, 400ms, 160ms);
+    }
+    ssf_press_button(context, BUTTON_B, 1600ms, 160ms);
+    ssf_press_dpad(context, DPAD_UP, 80ms);
+    ssf_press_button(context, BUTTON_A, 40ms);
+    ssf_press_button(context, BUTTON_B, 40ms);
+
+    FastCodeEntry::numberpad_enter_code(console, context, false, code, true);
+    ssf_press_button(context, BUTTON_PLUS, 1600ms);
+    ssf_press_button(context, BUTTON_B, 1000ms, 80ms);
+    ssf_press_button(context, BUTTON_A, 400ms, 80ms);
+    pbf_mash_button(context, BUTTON_B, 3200ms);
+
+    pbf_wait(context, SEARCH_DELAY0);
+
+    //  If we're not in a trade, enter Y-COMM to avoid a connection at this point.
+    ssf_press_button(context, BUTTON_Y, GameSettings::instance().OPEN_YCOMM_DELAY0, 400ms);
+    ssf_press_button(context, BUTTON_A, 1600ms, 160ms);
+    ssf_press_button(context, BUTTON_B, 640ms, 80ms);
+
+    //  Move to slot
+    while (slot >= 6){
+        box_scroll(context, DPAD_DOWN);
+        slot -= 6;
+    }
+    while (slot > 0){
+        box_scroll(context, DPAD_RIGHT);
+        slot--;
+    }
+
+    //  Select Pokemon
+    ssf_press_button(context, BUTTON_A, 800ms);
+    ssf_press_button(context, BUTTON_A, CONFIRM_DELAY0);
+
+    //  Start Trade
+    ssf_press_button(context, BUTTON_A, TRADE_START0);
+
+    //  Cancel out
+    for (Milliseconds c = 0ms; c < TRADE_COMMUNICATION0.get() + TRADE_ANIMATION0.get(); c += 2400ms){
+        ssf_press_button(context, BUTTON_B, 800ms);
+        ssf_press_button(context, BUTTON_B, 800ms);
+        ssf_press_button(context, BUTTON_A, 800ms);
+    }
+}
+
+void TradeBot::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    StartProgramChecks::check_performance_class_wired_or_wireless(context);
+
+    std::string code = TRADE_CODE.to_str();
+
+    if (START_LOCATION.start_in_grip_menu()){
+        grip_menu_connect_go_home(context);
+        resume_game_no_interact(env.console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST);
+    }else{
+        //  Connect the controller.
+        require_player(env.console, context, BUTTON_B);
+    }
+
+    for (uint8_t box = 0; box < BOXES_TO_TRADE; box++){
+        for (uint8_t c = 0; c < 30; c++){
+            trade_slot(env.console, context, code, c);
+        }
+
+        //  If the previous trade isn't done, either wait to finish or cancel it.
+        //  Two iterations of this will merge all the following states:
+        //      1.  The last trade finished successfully. Both iterations are no-ops.
+        //      2.  The last trade was slightly too slow. The 1st iteration
+        //          will finish it. The 2nd iteration is a no-op.
+        //      3.  The last trade was very slow. The 1st iteration is suppressed
+        //          because the trade is in progress. The 2nd iteration finishes it.
+        //      4.  No partner was ever found. The 1st iteration will cancel the trade.
+        for (uint8_t c = 0; c < 2; c++){
+            ssf_press_button(context, BUTTON_Y, 2000ms);
+            ssf_press_button(context, BUTTON_A, 2240ms);
+            ssf_press_button(context, BUTTON_B, 2240ms);
+            ssf_press_button(context, BUTTON_B, 1600ms);
+            ssf_press_button(context, BUTTON_A, 800ms);
+            pbf_mash_button(context, BUTTON_B, TRADE_ANIMATION0);
+        }
+
+        //  Wait out any new pokedex entries or trade evolutions.
+        pbf_mash_button(context, BUTTON_B, EVOLVE_DELAY0);
+
+        //  Change boxes.
+        ssf_press_button(context, BUTTON_X, GameSettings::instance().OVERWORLD_TO_MENU_DELAY0, 160ms);
+        ssf_press_button(context, BUTTON_A, GameSettings::instance().MENU_TO_POKEMON_DELAY0, 80ms);
+        ssf_press_button(context, BUTTON_R, GameSettings::instance().POKEMON_TO_BOX_DELAY0, 80ms);
+        ssf_press_button(context, BUTTON_R, GameSettings::instance().BOX_CHANGE_DELAY0, 80ms);
+        pbf_mash_button(
+            context, BUTTON_B,
+            GameSettings::instance().BOX_TO_POKEMON_DELAY0.get() +
+            GameSettings::instance().POKEMON_TO_MENU_DELAY0.get() +
+            GameSettings::instance().OVERWORLD_TO_MENU_DELAY0.get()
+        );
+    }
+
+    ssf_press_button(context, BUTTON_HOME, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE0, 80ms);
+}
+
+
+}
+}
+}
+
+
+
+
+
+
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/General/PokemonSwSh_TradeBot.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/General/PokemonSwSh_TradeBot.h
new file mode 100644
index 0000000000..710ee0f105
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/General/PokemonSwSh_TradeBot.h
@@ -0,0 +1,66 @@
+/*  TradeBot
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_TradeBot_H
+#define PokemonAutomation_PokemonSwSh_TradeBot_H
+
+#include "Common/Cpp/Options/StaticTextOption.h"
+#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "Common/Cpp/Options/TimeDurationOption.h"
+#include "Common/Cpp/Options/FixedCodeOption.h"
+#include "NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+class TradeBot_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    TradeBot_Descriptor();
+};
+
+
+
+class TradeBot : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = TradeBot_Descriptor;
+    TradeBot();
+
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    void trade_slot(
+        ConsoleHandle& console, ProControllerContext& context,
+        const std::string& code, uint8_t slot
+    ) const;
+
+private:
+    StartInGripOrGameOption START_LOCATION;
+
+    FixedCodeOption TRADE_CODE;
+    SimpleIntegerOption<uint8_t> BOXES_TO_TRADE;
+    BooleanCheckBoxOption LINK_TRADE_EXTRA_LINE;
+    MillisecondsOption SEARCH_DELAY0;
+    MillisecondsOption CONFIRM_DELAY0;
+    MillisecondsOption TRADE_START0;
+    MillisecondsOption TRADE_COMMUNICATION0;
+    SectionDividerOption m_advanced_options;
+    MillisecondsOption TRADE_ANIMATION0;
+    MillisecondsOption EVOLVE_DELAY0;
+};
+
+
+
+}
+}
+}
+#endif
+
+
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHost-MultiGame.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHost-MultiGame.cpp
new file mode 100644
index 0000000000..dda073dd42
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHost-MultiGame.cpp
@@ -0,0 +1,244 @@
+/*  Multi-Game Auto-Host
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/PrettyPrint.h"
+//#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Device.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "NintendoSwitch/NintendoSwitch_Settings.h"
+//#include "VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_GameEntry.h"
+//#include "VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.h"
+#include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
+#include "PokemonSwSh_DenTools.h"
+#include "PokemonSwSh_AutoHostStats.h"
+#include "PokemonSwSh_AutoHost.h"
+#include "PokemonSwSh_AutoHost-MultiGame.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+    using namespace Pokemon;
+
+
+AutoHostMultiGame_Descriptor::AutoHostMultiGame_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonSwSh:AutoHostMultiGame",
+        STRING_POKEMON + " SwSh", "Auto-Host Multi-Game",
+        "Programs/PokemonSwSh/AutoHost-MultiGame.html",
+        "Run AutoHost-Rolling across multiple game saves. (Up to 16 dens!)",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_PerformanceClassSensitive,
+        FeedbackType::OPTIONAL_,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+std::unique_ptr<StatsTracker> AutoHostMultiGame_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new AutoHostStats());
+}
+
+
+
+AutoHostMultiGame::AutoHostMultiGame()
+    : SingleSwitchProgramInstance({"Notifs", "LiveHost"})
+    , RAID_CODE(8)
+    , HOST_ONLINE("<b>Host Online:</b>", LockMode::LOCK_WHILE_RUNNING, true)
+    , LOBBY_WAIT_DELAY0(
+        "<b>Lobby Wait Delay:</b><br>Wait this long before starting raid. Start time is 3 minutes minus this number.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "60 s"
+    )
+    , GAME_LIST(true)
+    , FR_FORWARD_ACCEPT(
+        "<b>Forward Friend Accept:</b><br>Accept FRs this many raids in the future.",
+        LockMode::LOCK_WHILE_RUNNING,
+        1
+    )
+    , HOSTING_NOTIFICATIONS("Live-Hosting Announcements", false)
+    , NOTIFICATIONS({
+        &HOSTING_NOTIFICATIONS.NOTIFICATION,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+    , m_internet_settings(
+        "<font size=4><b>Internet Settings:</b> Increase these if your internet is slow.</font>"
+    )
+    , CONNECT_TO_INTERNET_DELAY0(
+        "<b>Connect to Internet Delay:</b><br>Time from \"Connect to Internet\" to when you're ready to enter den.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "60000 ms"
+    )
+    , ENTER_ONLINE_DEN_DELAY0(
+        "<b>Enter Online Den Delay:</b><br>\"Communicating\" when entering den while online.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "8000 ms"
+    )
+    , OPEN_ONLINE_DEN_LOBBY_DELAY0(
+        "<b>Open Online Den Delay:</b><br>Delay from \"Invite Others\" to when the clock starts ticking.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "8000 ms"
+    )
+    , RAID_START_TO_EXIT_DELAY0(
+        "<b>Raid Start to Exit Delay:</b><br>Time from start raid to reset. (when not selecting move)",
+        LockMode::LOCK_WHILE_RUNNING,
+        "15 s"
+    )
+    , DELAY_TO_SELECT_MOVE0(
+        "<b>Delay to Select Move:</b><br>This + above = time from start raid to select move.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "32 s"
+    )
+{
+    PA_ADD_OPTION(START_LOCATION);
+    PA_ADD_OPTION(TOUCH_DATE_INTERVAL);
+
+    PA_ADD_OPTION(RAID_CODE);
+    PA_ADD_OPTION(HOST_ONLINE);
+    PA_ADD_OPTION(LOBBY_WAIT_DELAY0);
+    PA_ADD_OPTION(GAME_LIST);
+    PA_ADD_OPTION(FR_FORWARD_ACCEPT);
+    PA_ADD_OPTION(HOSTING_NOTIFICATIONS);
+    PA_ADD_OPTION(NOTIFICATIONS);
+
+    PA_ADD_OPTION(m_internet_settings);
+    PA_ADD_OPTION(CONNECT_TO_INTERNET_DELAY0);
+    PA_ADD_OPTION(ENTER_ONLINE_DEN_DELAY0);
+    PA_ADD_OPTION(OPEN_ONLINE_DEN_LOBBY_DELAY0);
+    PA_ADD_OPTION(RAID_START_TO_EXIT_DELAY0);
+    PA_ADD_OPTION(DELAY_TO_SELECT_MOVE0);
+}
+
+
+
+
+void AutoHostMultiGame::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    Milliseconds start_raid_delay = HOST_ONLINE
+        ? OPEN_ONLINE_DEN_LOBBY_DELAY0
+        : GameSettings::instance().OPEN_LOCAL_DEN_LOBBY_DELAY0;
+    const Milliseconds lobby_wait_delay = LOBBY_WAIT_DELAY0.get() < start_raid_delay
+        ? 0ms
+        : LOBBY_WAIT_DELAY0.get() - start_raid_delay;
+
+    std::vector<std::unique_ptr<MultiHostSlot>> list = GAME_LIST.copy_snapshot();
+
+    //  Scan den list for any rolling dens.
+    bool enable_touch = true;
+    for (uint8_t index = 0; index < list.size(); index++){
+        const MultiHostSlot& game = *list[index];
+//        if (game.user_slot == 0){
+//            break;
+//        }
+        if (game.skips > 0){
+            enable_touch = false;
+            break;
+        }
+    }
+
+    if (START_LOCATION.start_in_grip_menu()){
+        grip_menu_connect_go_home(context);
+    }else{
+        //  Connect the controller.
+        require_player(env.console, context, BUTTON_B);
+        ssf_press_button(context, BUTTON_HOME, GameSettings::instance().GAME_TO_HOME_DELAY_FAST0, 160ms);
+    }
+
+    if (enable_touch){
+        TOUCH_DATE_INTERVAL.touch_now_from_home_if_needed(env.console, context);
+    }
+
+    uint32_t raids = 0;
+    bool game_slot_flipped = false;
+    while (true){
+        env.log("Beginning from start of game list.");
+        for (uint8_t index = 0; index < list.size(); index++){
+            env.update_stats();
+
+            const MultiHostSlot& game = *list[index];
+//            if (game.user_slot == 0){
+//                break;
+//            }
+
+            env.log("Raids Attempted: " + tostr_u_commas(raids++));
+
+            //  Start game.
+            rollback_date_from_home(env.console, context, game.skips);
+
+            //  Sanitize game slot.
+            uint8_t game_slot = (uint8_t)game.game_slot.current_value();
+            if (game_slot > 2){
+                game_slot = 0;
+            }
+
+            //  Calculate current game slot.
+            switch (game_slot){
+            case 0:
+                break;
+            case 1:
+                game_slot = game_slot_flipped ? 2 : 0;
+                break;
+            case 2:
+                game_slot = game_slot_flipped ? 0 : 2;
+                break;
+            }
+            start_game_from_home_with_inference(
+                env.console, context,
+                ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_SLOW,
+                game_slot,
+                (uint8_t)game.user_slot.current_value(),
+                game.backup_save
+            );
+            if (game_slot == 2){
+                game_slot_flipped = !game_slot_flipped;
+            }
+
+            //  Calculate accept_FR_slot.
+            size_t FR_index = index;
+            for (uint8_t c = 0; c < FR_FORWARD_ACCEPT; c++){
+                FR_index++;
+                if (FR_index >= list.size()){
+                    FR_index = 0;
+                }
+            }
+
+            //  Run auto-host.
+            const MultiHostSlot& fr_game = *list[FR_index];
+            run_autohost(
+                env, env.console, context,
+                game.always_catchable
+                    ? Catchability::ALWAYS_CATCHABLE
+                    : Catchability::MAYBE_UNCATCHABLE,
+                (uint8_t)game.skips,
+                game.use_raid_code ? &RAID_CODE : nullptr, lobby_wait_delay,
+                HOST_ONLINE, fr_game.accept_FRs ? (uint8_t)fr_game.user_slot.current_value() : 0,
+                game.move_slot, game.dynamax, 0,
+                HOSTING_NOTIFICATIONS,
+                CONNECT_TO_INTERNET_DELAY0,
+                ENTER_ONLINE_DEN_DELAY0,
+                OPEN_ONLINE_DEN_LOBBY_DELAY0,
+                RAID_START_TO_EXIT_DELAY0,
+                DELAY_TO_SELECT_MOVE0
+            );
+
+            //  Exit game.
+            pbf_press_button(context, BUTTON_HOME, 160ms, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE0);
+            close_game_from_home(env.console, context);
+
+            //  Post-raid delay.
+            pbf_wait(context, game.post_raid_delay);
+
+            //  Touch the date.
+            if (enable_touch){
+                TOUCH_DATE_INTERVAL.touch_now_from_home_if_needed(env.console, context);
+            }
+        }
+    }
+}
+
+
+
+}
+}
+}
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHost-MultiGame.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHost-MultiGame.h
new file mode 100644
index 0000000000..3562082b37
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHost-MultiGame.h
@@ -0,0 +1,68 @@
+/*  Multi-Game Auto-Host
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_AutoHostMultiGame_H
+#define PokemonAutomation_PokemonSwSh_AutoHostMultiGame_H
+
+#include "Common/Cpp/Options/StaticTextOption.h"
+#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "Common/Cpp/Options/RandomCodeOption.h"
+#include "Common/Cpp/Options/TimeDurationOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "VideoGames/PokemonSwSh/Options/PokemonSwSh_DateToucher.h"
+#include "VideoGames/PokemonSwSh/Options/PokemonSwSh_AutoHostNotification.h"
+#include "VideoGames/PokemonSwSh/Options/PokemonSwSh_MultiHostTable.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+class AutoHostMultiGame_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    AutoHostMultiGame_Descriptor();
+
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+
+
+class AutoHostMultiGame : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = AutoHostMultiGame_Descriptor;
+    AutoHostMultiGame();
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    StartInGripOrClosedOption START_LOCATION;
+    TouchDateIntervalOption TOUCH_DATE_INTERVAL;
+
+    RandomCodeOption RAID_CODE;
+    BooleanCheckBoxOption HOST_ONLINE;
+    MillisecondsOption LOBBY_WAIT_DELAY0;
+    MultiHostTable GAME_LIST;
+    SimpleIntegerOption<uint8_t> FR_FORWARD_ACCEPT;
+
+    AutoHostNotificationOption HOSTING_NOTIFICATIONS;
+    EventNotificationsOption NOTIFICATIONS;
+
+    SectionDividerOption m_internet_settings;
+    MillisecondsOption CONNECT_TO_INTERNET_DELAY0;
+    MillisecondsOption ENTER_ONLINE_DEN_DELAY0;
+    MillisecondsOption OPEN_ONLINE_DEN_LOBBY_DELAY0;
+    MillisecondsOption RAID_START_TO_EXIT_DELAY0;
+    MillisecondsOption DELAY_TO_SELECT_MOVE0;
+};
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHost-Rolling.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHost-Rolling.cpp
new file mode 100644
index 0000000000..5276469c96
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHost-Rolling.cpp
@@ -0,0 +1,231 @@
+/*  Rolling Auto-Host
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/PrettyPrint.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+//#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Device.h"
+#include "NintendoSwitch/NintendoSwitch_Settings.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "VideoGames/PokemonSwSh/PokemonSwSh_Settings.h"
+#include "VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_GameEntry.h"
+#include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
+#include "PokemonSwSh_DenTools.h"
+#include "PokemonSwSh_AutoHostStats.h"
+#include "PokemonSwSh_AutoHost.h"
+#include "PokemonSwSh_AutoHost-Rolling.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+    using namespace Pokemon;
+
+
+AutoHostRolling_Descriptor::AutoHostRolling_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonSwSh:AutoHostRolling",
+        STRING_POKEMON + " SwSh", "Auto-Host Rolling",
+        "Programs/PokemonSwSh/AutoHost-Rolling.html",
+        "Roll N days, host, SR and repeat. Also supports hard-locks and soft-locks.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_PerformanceClassSensitive,
+        FeedbackType::OPTIONAL_,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+std::unique_ptr<StatsTracker> AutoHostRolling_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new AutoHostStats());
+}
+
+
+
+AutoHostRolling::AutoHostRolling()
+    : SingleSwitchProgramInstance({"Notifs", "LiveHost"})
+    , RAID_CODE(8)
+    , SKIPS("<b>Day Skips:</b>", LockMode::LOCK_WHILE_RUNNING, 3)
+    , BACKUP_SAVE(
+        "<b>Load Backup Save:</b><br>For backup save soft-locking method.",
+        LockMode::LOCK_WHILE_RUNNING,
+        false
+    )
+    , HOST_ONLINE("<b>Host Online:</b>", LockMode::LOCK_WHILE_RUNNING, true)
+    , LOBBY_WAIT_DELAY0(
+        "<b>Lobby Wait Delay:</b><br>Wait this long before starting raid. Start time is 3 minutes minus this number.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "60 s"
+    )
+    , FRIEND_ACCEPT_USER_SLOT(
+        "<b>Friend Request Accept Slot:</b><br>Zero disables friend accepts.",
+        LockMode::LOCK_WHILE_RUNNING,
+        0, 0, 8
+    )
+    , EXTRA_DELAY_BETWEEN_RAIDS0(
+        "<b>Extra Delay Between Raids:</b><br>May aid in farming.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "0 s"
+    )
+    , MOVE_SLOT(
+        "<b>1st Move Select Slot:</b><br>Zero disables 1st move select.",
+        LockMode::LOCK_WHILE_RUNNING,
+        0, 0, 4
+    )
+    , DYNAMAX(
+        "<b>1st Move Dynamax:</b><br>Dynamax on first move. (only applies if above option is non-zero)",
+        LockMode::LOCK_WHILE_RUNNING,
+        true
+    )
+    , TROLL_HOSTING(
+        "<b>Troll Hosting:</b> (requires 1st move select)<br>0 disables the troll hosting option, 1 attacks the first ally, 2 attacks the second one, 3 attacks the third one. Dynamaxing will disable this option.",
+        LockMode::LOCK_WHILE_RUNNING,
+        0, 0, 3
+    )
+    , ALTERNATE_GAMES(
+        "<b>Alternate Games:</b><br>Alternate hosting between 1st and 2nd games. Host from both Sword and Shield.",
+        LockMode::LOCK_WHILE_RUNNING,
+        false
+    )
+    , HOSTING_NOTIFICATIONS("Live-Hosting Announcements", false)
+    , NOTIFICATIONS({
+        &HOSTING_NOTIFICATIONS.NOTIFICATION,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+    , m_internet_settings(
+        "<font size=4><b>Internet Settings:</b> Increase these if your internet is slow.</font>"
+    )
+    , CONNECT_TO_INTERNET_DELAY0(
+        "<b>Connect to Internet Delay:</b><br>Time from \"Connect to Internet\" to when you're ready to enter den.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "60000 ms"
+    )
+    , ENTER_ONLINE_DEN_DELAY0(
+        "<b>Enter Online Den Delay:</b><br>\"Communicating\" when entering den while online.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "8000 ms"
+    )
+    , OPEN_ONLINE_DEN_LOBBY_DELAY0(
+        "<b>Open Online Den Delay:</b><br>Delay from \"Invite Others\" to when the clock starts ticking.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "8000 ms"
+    )
+    , RAID_START_TO_EXIT_DELAY0(
+        "<b>Raid Start to Exit Delay:</b><br>Time from start raid to reset. (when not selecting move)",
+        LockMode::LOCK_WHILE_RUNNING,
+        "15 s"
+    )
+    , DELAY_TO_SELECT_MOVE0(
+        "<b>Delay to Select Move:</b><br>This + above = time from start raid to select move.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "32 s"
+    )
+{
+    PA_ADD_OPTION(START_LOCATION);
+    PA_ADD_OPTION(TOUCH_DATE_INTERVAL);
+
+    PA_ADD_OPTION(RAID_CODE);
+    PA_ADD_OPTION(SKIPS);
+    PA_ADD_OPTION(BACKUP_SAVE);
+    PA_ADD_OPTION(HOST_ONLINE);
+    PA_ADD_OPTION(LOBBY_WAIT_DELAY0);
+    PA_ADD_OPTION(CATCHABILITY);
+    PA_ADD_OPTION(FRIEND_ACCEPT_USER_SLOT);
+    PA_ADD_OPTION(EXTRA_DELAY_BETWEEN_RAIDS0);
+    PA_ADD_OPTION(MOVE_SLOT);
+    PA_ADD_OPTION(DYNAMAX);
+    PA_ADD_OPTION(TROLL_HOSTING);
+    PA_ADD_OPTION(ALTERNATE_GAMES);
+    PA_ADD_OPTION(HOSTING_NOTIFICATIONS);
+    PA_ADD_OPTION(NOTIFICATIONS);
+
+    PA_ADD_OPTION(m_internet_settings);
+    PA_ADD_OPTION(CONNECT_TO_INTERNET_DELAY0);
+    PA_ADD_OPTION(ENTER_ONLINE_DEN_DELAY0);
+    PA_ADD_OPTION(OPEN_ONLINE_DEN_LOBBY_DELAY0);
+    PA_ADD_OPTION(RAID_START_TO_EXIT_DELAY0);
+    PA_ADD_OPTION(DELAY_TO_SELECT_MOVE0);
+}
+
+
+
+void AutoHostRolling::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    Milliseconds start_raid_delay = HOST_ONLINE
+        ? OPEN_ONLINE_DEN_LOBBY_DELAY0
+        : GameSettings::instance().OPEN_LOCAL_DEN_LOBBY_DELAY0;
+    const Milliseconds lobby_wait_delay = LOBBY_WAIT_DELAY0.get() < start_raid_delay
+        ? 0ms
+        : LOBBY_WAIT_DELAY0.get() - start_raid_delay;
+
+    if (START_LOCATION.start_in_grip_menu()){
+        grip_menu_connect_go_home(context);
+    }else{
+        //  Connect the controller.
+        require_player(env.console, context, BUTTON_B);
+        ssf_press_button(context, BUTTON_HOME, GameSettings::instance().GAME_TO_HOME_DELAY_FAST0, 160ms);
+    }
+
+    if (SKIPS == 0){
+        TOUCH_DATE_INTERVAL.touch_now_from_home_if_needed(env.console, context);
+    }
+    rollback_date_from_home(env.console, context, SKIPS);
+    if (env.console.video().snapshot()){
+        NintendoSwitch::resume_game_from_home(env.console, context);
+    }else{
+        resume_game_front_of_den_nowatts(context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_SLOW);
+    }
+
+    for (uint32_t raids = 0;; raids++){
+        env.log("Raids Attempted: " + tostr_u_commas(raids));
+        env.update_stats();
+
+        run_autohost(
+            env, env.console, context,
+            CATCHABILITY, SKIPS,
+            &RAID_CODE, lobby_wait_delay,
+            HOST_ONLINE, FRIEND_ACCEPT_USER_SLOT,
+            MOVE_SLOT, DYNAMAX, TROLL_HOSTING,
+            HOSTING_NOTIFICATIONS,
+            CONNECT_TO_INTERNET_DELAY0,
+            ENTER_ONLINE_DEN_DELAY0,
+            OPEN_ONLINE_DEN_LOBBY_DELAY0,
+            RAID_START_TO_EXIT_DELAY0,
+            DELAY_TO_SELECT_MOVE0
+        );
+
+        //  Exit game.
+        ssf_press_button(context, BUTTON_HOME, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE0, 160ms);
+        close_game_from_home(env.console, context);
+
+        //  Post-raid delay.
+        pbf_wait(context, EXTRA_DELAY_BETWEEN_RAIDS0);
+
+        //  Touch the date.
+        if (SKIPS == 0){
+            TOUCH_DATE_INTERVAL.touch_now_from_home_if_needed(env.console, context);
+        }else{
+            rollback_date_from_home(env.console, context, SKIPS);
+        }
+
+        start_game_from_home_with_inference(
+            env.console, context,
+            ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_SLOW,
+            ALTERNATE_GAMES ? 2 : 0, 0,
+            BACKUP_SAVE
+        );
+    }
+}
+
+
+
+}
+}
+}
+
+
+
+
+
+
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHost-Rolling.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHost-Rolling.h
new file mode 100644
index 0000000000..10c2014f00
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHost-Rolling.h
@@ -0,0 +1,79 @@
+/*  Rolling Auto-Host
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_AutoHostRolling_H
+#define PokemonAutomation_PokemonSwSh_AutoHostRolling_H
+
+#include "Common/Cpp/Options/StaticTextOption.h"
+#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "Common/Cpp/Options/RandomCodeOption.h"
+//#include "CommonFramework/Options/ScreenshotFormatOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h"
+//#include "NintendoSwitch/Options/NintendoSwitch_FriendCodeListOption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "VideoGames/PokemonSwSh/Options/PokemonSwSh_DateToucher.h"
+#include "VideoGames/PokemonSwSh/Options/PokemonSwSh_Catchability.h"
+#include "VideoGames/PokemonSwSh/Options/PokemonSwSh_AutoHostNotification.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+class AutoHostRolling_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    AutoHostRolling_Descriptor();
+
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+
+
+class AutoHostRolling : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = AutoHostRolling_Descriptor;
+    AutoHostRolling();
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    StartInGripOrGameOption START_LOCATION;
+    TouchDateIntervalOption TOUCH_DATE_INTERVAL;
+
+    RandomCodeOption RAID_CODE;
+    SimpleIntegerOption<uint8_t> SKIPS;
+    BooleanCheckBoxOption BACKUP_SAVE;
+    BooleanCheckBoxOption HOST_ONLINE;
+    MillisecondsOption LOBBY_WAIT_DELAY0;
+    CatchabilitySelectorOption CATCHABILITY;
+    SimpleIntegerOption<uint8_t> FRIEND_ACCEPT_USER_SLOT;
+    MillisecondsOption EXTRA_DELAY_BETWEEN_RAIDS0;
+
+    SimpleIntegerOption<uint8_t> MOVE_SLOT;
+    BooleanCheckBoxOption DYNAMAX;
+    SimpleIntegerOption<uint8_t> TROLL_HOSTING;
+
+    BooleanCheckBoxOption ALTERNATE_GAMES;
+
+    AutoHostNotificationOption HOSTING_NOTIFICATIONS;
+    EventNotificationsOption NOTIFICATIONS;
+
+    SectionDividerOption m_internet_settings;
+    MillisecondsOption CONNECT_TO_INTERNET_DELAY0;
+    MillisecondsOption ENTER_ONLINE_DEN_DELAY0;
+    MillisecondsOption OPEN_ONLINE_DEN_LOBBY_DELAY0;
+    MillisecondsOption RAID_START_TO_EXIT_DELAY0;
+    MillisecondsOption DELAY_TO_SELECT_MOVE0;
+};
+
+
+
+}
+}
+}
+#endif
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHost.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHost.cpp
new file mode 100644
index 0000000000..a0998ef19e
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHost.cpp
@@ -0,0 +1,254 @@
+/*  Auto-Hosting
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/Tools/ProgramEnvironment.h"
+#include "CommonTools/VisualDetectors/BlackScreenDetector.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/FastCodeEntry/NintendoSwitch_NumberCodeEntry.h"
+#include "VideoGames/PokemonSwSh/PokemonSwSh_Settings.h"
+#include "VideoGames/PokemonSwSh/Inference/Dens/PokemonSwSh_RaidLobbyReader.h"
+#include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_Internet.h"
+#include "PokemonSwSh_DenTools.h"
+#include "PokemonSwSh_AutoHostStats.h"
+#include "PokemonSwSh_LobbyWait.h"
+#include "PokemonSwSh_AutoHost.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+using namespace Pokemon;
+
+
+bool connect_to_internet(
+    const ProgramInfo& info,
+    VideoStream& stream, ProControllerContext& context,
+    bool host_online,
+    Milliseconds connect_to_internet_delay
+){
+    if (!host_online){
+        return true;
+    }
+    if (!stream.video().snapshot()){
+        connect_to_internet(context, GameSettings::instance().OPEN_YCOMM_DELAY0, connect_to_internet_delay);
+        return true;
+    }
+    if (connect_to_internet_with_inference(
+        info, stream, context,
+        std::chrono::seconds(5), connect_to_internet_delay
+    )){
+        return true;
+    }
+    return false;
+}
+
+void send_raid_notification(
+    ProgramEnvironment& env,
+    VideoStream& stream,
+    AutoHostNotificationOption& settings,
+    const std::string& code,
+    const ImageViewRGB32& screenshot,
+    const DenMonReadResults& results,
+    const StatsTracker& stats_tracker
+){
+    if (!settings.enabled()){
+        return;
+    }
+
+    std::vector<std::pair<std::string, std::string>> embeds;
+
+    std::string description = settings.DESCRIPTION;
+    if (!description.empty()){
+        embeds.emplace_back("Description:", description);
+    }
+
+    std::string slugs;
+
+    if (results.type == DenMonReadResults::NOT_DETECTED){
+        slugs += "Unable to detect - Not in den lobby.";
+    }else if (results.slugs.results.empty()){
+        slugs += "Unable to detect.";
+    }else if (results.slugs.results.size() == 1){
+        slugs += results.slugs.results.begin()->second;
+    }else{
+        slugs += "Ambiguous: ";
+        size_t c = 0;
+        for (const auto& item : results.slugs.results){
+            if (c > 0){
+                slugs += ", ";
+            }
+            slugs += item.second;
+            c++;
+            if (c >= 5){
+                break;
+            }
+        }
+        if (c < results.slugs.results.size()){
+            slugs += ", (";
+            slugs += std::to_string(results.slugs.results.size() - c);
+            slugs += " more...)";
+        }
+    }
+    embeds.emplace_back("Current " + STRING_POKEMON + ":", slugs);
+
+    embeds.emplace_back("Raid Code:", code.empty() ? "None" : code);
+
+    send_program_notification(
+        env, settings.NOTIFICATION,
+        Color(),
+        "Max Raid Notification",
+        embeds, "",
+        screenshot, false
+    );
+
+}
+
+
+void run_autohost(
+    ProgramEnvironment& env,
+    ConsoleHandle& console, ProControllerContext& context,
+    Catchability catchability, uint8_t skips,
+    const RandomCodeOption* raid_code, Milliseconds lobby_wait_delay,
+    bool host_online, uint8_t accept_FR_slot,
+    uint8_t move_slot, bool dynamax, uint8_t troll_hosting,
+    AutoHostNotificationOption& notifications,
+    Milliseconds connect_to_internet_delay,
+    Milliseconds enter_online_den_delay,
+    Milliseconds open_online_den_lobby_delay,
+    Milliseconds raid_start_to_exit_delay,
+    Milliseconds delay_to_select_move
+){
+    AutoHostStats& stats = env.current_stats<AutoHostStats>();
+
+    roll_den(
+        console, context,
+        enter_online_den_delay,
+        open_online_den_lobby_delay,
+        skips,
+        catchability
+    );
+    context.wait_for_all_requests();
+
+    if (!connect_to_internet(
+        env.program_info(), console, context,
+        host_online,
+        connect_to_internet_delay
+    )){
+        stats.add_timeout();
+        env.log("Timed out waiting for internet connection. Skipping raid.", COLOR_RED);
+        return;
+    }
+
+    {
+        DenMonReader reader(console.logger(), console.overlay());
+        enter_den(context, enter_online_den_delay, skips != 0, host_online);
+        context.wait_for_all_requests();
+
+        //  Make sure we're actually in a den.
+        VideoSnapshot screen = console.video().snapshot();
+        DenMonReadResults results;
+        if (screen){
+            results = reader.read(screen);
+            switch (results.type){
+            case DenMonReadResults::RED_BEAM:
+            case DenMonReadResults::PURPLE_BEAM:
+                break;
+            default:
+                console.log("Failed to detect den lobby. Skipping raid.", COLOR_RED);
+                return;
+            }
+        }
+
+        std::string code;
+        if (raid_code){
+            code = raid_code->get_code();
+        }
+        if (!code.empty()){
+            env.log("Next Raid Code: " + code);
+            pbf_press_button(context, BUTTON_PLUS, 40ms, 1160ms);
+            FastCodeEntry::numberpad_enter_code(console, context, false, code, true);
+            pbf_wait(context, 1440ms);
+            pbf_press_button(context, BUTTON_A, 40ms, 760ms);
+        }
+        context.wait_for_all_requests();
+
+        screen = console.video().snapshot();
+        send_raid_notification(
+            env,
+            console,
+            notifications,
+            code,
+            screen, results, stats
+        );
+    }
+
+    enter_lobby(context, open_online_den_lobby_delay, host_online, catchability);
+
+    //  Accept friend requests while we wait.
+    RaidLobbyState raid_state = raid_lobby_wait(
+        console, context,
+        host_online,
+        accept_FR_slot,
+        lobby_wait_delay
+    );
+
+    //  Start Raid
+    pbf_press_dpad(context, DPAD_UP, 40ms, 360ms);
+
+    //  Mash A until it's time to close the game.
+    if (console.video().snapshot()){
+        BlackScreenOverWatcher black_screen;
+        int ret = run_until<ProControllerContext>(
+            console, context,
+            [&](ProControllerContext& context){
+                pbf_mash_button(context, BUTTON_A, raid_start_to_exit_delay);
+            },
+            {black_screen}
+        );
+        if (ret == 0){
+            env.log("Raid has Started!", COLOR_BLUE);
+            stats.add_raid(raid_state.raiders());
+        }else{
+            env.log("Timed out waiting for raid to start.", COLOR_RED);
+            stats.add_timeout();
+        }
+    }else{
+        pbf_mash_button(context, BUTTON_A, raid_start_to_exit_delay);
+    }
+
+    //  Select a move.
+    if (move_slot > 0){
+        pbf_wait(context, delay_to_select_move);
+        pbf_press_button(context, BUTTON_A, 160ms, 640ms);
+        if (dynamax){
+            pbf_press_dpad(context, DPAD_LEFT, 160ms, 240ms);
+            pbf_press_button(context, BUTTON_A, 160ms, 480ms);
+        }
+        for (uint8_t c = 1; c < move_slot; c++){
+            pbf_press_dpad(context, DPAD_DOWN, 160ms, 240ms);
+        }
+        pbf_press_button(context, BUTTON_A, 160ms, 640ms);
+
+        // Disable the troll hosting option if the dynamax is set to TRUE.
+        if (!dynamax && troll_hosting > 0){
+            pbf_press_dpad(context, DPAD_DOWN, 160ms, 640ms);
+            for (uint8_t c = 0; c < troll_hosting; c++){
+                pbf_press_dpad(context, DPAD_RIGHT, 160ms, 640ms);
+            }
+        }
+
+        pbf_press_button(context, BUTTON_A, 160ms, 7840ms);
+    }
+}
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHost.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHost.h
new file mode 100644
index 0000000000..7dd889f6ff
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHost.h
@@ -0,0 +1,63 @@
+/*  Auto-Hosting
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_AutoHost_H
+#define PokemonAutomation_PokemonSwSh_AutoHost_H
+
+#include "Common/Cpp/Options/RandomCodeOption.h"
+#include "CommonFramework/Tools/VideoStream.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+#include "NintendoSwitch/NintendoSwitch_ConsoleHandle.h"
+#include "VideoGames/PokemonSwSh/Options/PokemonSwSh_Catchability.h"
+#include "VideoGames/PokemonSwSh/Options/PokemonSwSh_AutoHostNotification.h"
+#include "VideoGames/PokemonSwSh/Inference/Dens/PokemonSwSh_DenMonReader.h"
+
+namespace PokemonAutomation{
+    struct ProgramInfo;
+    class ProgramEnvironment;
+    class StatsTracker;
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+bool connect_to_internet(
+    const ProgramInfo& info,
+    VideoStream& stream, ProControllerContext& context,
+    bool host_online,
+    Milliseconds connect_to_internet_delay
+);
+
+void send_raid_notification(
+    const ProgramEnvironment& env,
+    VideoStream& stream,
+    AutoHostNotificationOption& settings,
+    const std::string& code,
+    const ImageViewRGB32& screenshot,
+    const DenMonReadResults& results,
+    const StatsTracker& stats_tracker
+);
+
+
+void run_autohost(
+    ProgramEnvironment& env,
+    ConsoleHandle& console, ProControllerContext& context,
+    Catchability catchability, uint8_t skips,
+    const RandomCodeOption* raid_code, Milliseconds lobby_wait_delay,
+    bool host_online, uint8_t accept_FR_slot,
+    uint8_t move_slot, bool dynamax, uint8_t troll_hosting,
+    AutoHostNotificationOption& notifications,
+    Milliseconds connect_to_internet_delay,
+    Milliseconds enter_online_den_delay,
+    Milliseconds open_online_den_lobby_delay,
+    Milliseconds raid_start_to_exit_delay,
+    Milliseconds delay_to_select_move
+);
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHostStats.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHostStats.cpp
similarity index 88%
rename from SerialPrograms/Source/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHostStats.cpp
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHostStats.cpp
index ed30cf0456..a69fa15172 100644
--- a/SerialPrograms/Source/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHostStats.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHostStats.cpp
@@ -1,6 +1,6 @@
 /*  Auto-Hosting Stats
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHostStats.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHostStats.h
similarity index 79%
rename from SerialPrograms/Source/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHostStats.h
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHostStats.h
index bc41dae250..64b26cbb47 100644
--- a/SerialPrograms/Source/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHostStats.h
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHostStats.h
@@ -1,13 +1,13 @@
 /*  Auto-Hosting Stats
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifndef PokemonAutomation_PokemonSwSh_AutoHostStats_H
 #define PokemonAutomation_PokemonSwSh_AutoHostStats_H
 
-#include "CommonFramework/Tools/StatsTracking.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/Hosting/PokemonSwSh_DenRoller.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/Hosting/PokemonSwSh_DenRoller.cpp
new file mode 100644
index 0000000000..bf87b233d4
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/Hosting/PokemonSwSh_DenRoller.cpp
@@ -0,0 +1,206 @@
+/*  Den Roller
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/Tools/ErrorDumper.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "NintendoSwitch/NintendoSwitch_Settings.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_GameEntry.h"
+#include "VideoGames/PokemonSwSh/Inference/Dens/PokemonSwSh_DenMonReader.h"
+#include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
+#include "PokemonSwSh_DenTools.h"
+#include "PokemonSwSh_DenRoller.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+    using namespace Pokemon;
+
+
+DenRoller_Descriptor::DenRoller_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonSwSh:DenRoller",
+        STRING_POKEMON + " SwSh", "Den Roller",
+        "Programs/PokemonSwSh/DenRoller.html",
+        "Roll den to the N'th day, SR and repeat.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_PerformanceClassSensitive,
+        FeedbackType::OPTIONAL_,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+struct DenRoller_Descriptor::Stats : public StatsTracker{
+    Stats()
+        : rolls(m_stats["Rolls"])
+        , skips(m_stats["Day Skips"])
+        , errors(m_stats["Errors"])
+        , matches(m_stats["Matches"])
+    {
+        m_display_order.emplace_back(Stat("Rolls"));
+        m_display_order.emplace_back(Stat("Day Skips"));
+        m_display_order.emplace_back(Stat("Errors"));
+        m_display_order.emplace_back(Stat("Matches"));
+    }
+    std::atomic<uint64_t>& rolls;
+    std::atomic<uint64_t>& skips;
+    std::atomic<uint64_t>& errors;
+    std::atomic<uint64_t>& matches;
+};
+std::unique_ptr<StatsTracker> DenRoller_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+
+
+DenRoller::DenRoller()
+    : SKIPS(
+        "<b>Number of Skips:</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        3, 0, 60
+    )
+    , FILTER(
+        "<b>Desired " + STRING_POKEMON + ":</b><br>"
+        "Automatically stop when this " + STRING_POKEMON + " is rolled. Video output is required."
+    )
+    , VIEW_TIME0(
+        "<b>View Time:</b><br>Wait this long before resetting. This wait is skipped if the desired " +
+        STRING_POKEMON + " is set since the program will be watching it for you.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "5 s"
+    )
+    , NOTIFICATION_PROGRAM_FINISH("Program Finished", true, true, ImageAttachmentMode::JPG)
+    , NOTIFICATIONS({
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+    , m_advanced_options(
+        "<font size=4><b>Advanced Options:</b> You should not need to touch anything below here.</font>"
+    )
+    , READ_DELAY0(
+        "<b>Read Delay:</b><br>Wait this long before attempting to " +
+        STRING_POKEMON + ". This needs to be long enough for the silhouette to load.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "1000 ms"
+    )
+{
+    PA_ADD_OPTION(START_LOCATION);
+    PA_ADD_OPTION(SKIPS);
+    PA_ADD_OPTION(FILTER);
+    PA_ADD_OPTION(CATCHABILITY);
+    PA_ADD_OPTION(VIEW_TIME0);
+    PA_ADD_OPTION(NOTIFICATIONS);
+
+    PA_ADD_STATIC(m_advanced_options);
+    PA_ADD_OPTION(READ_DELAY0);
+}
+
+
+
+
+void DenRoller::ring_bell(ProControllerContext& context, int count) const{
+    for (int c = 0; c < count; c++){
+        pbf_press_button(context, BUTTON_LCLICK, 40ms, 80ms);
+    }
+    pbf_wait(context, 1600ms);
+}
+
+void DenRoller::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    DenRoller_Descriptor::Stats& stats = env.current_stats<DenRoller_Descriptor::Stats>();
+
+    if (START_LOCATION.start_in_grip_menu()){
+        grip_menu_connect_go_home(context);
+    }else{
+        //  Connect the controller.
+        require_player(env.console, context, BUTTON_B);
+        ssf_press_button(context, BUTTON_HOME, GameSettings::instance().GAME_TO_HOME_DELAY_FAST0, 160ms);
+    }
+
+    rollback_date_from_home(env.console, context, SKIPS);
+    if (env.console.video().snapshot()){
+        NintendoSwitch::resume_game_from_home(env.console, context);
+    }else{
+        resume_game_front_of_den_nowatts(context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_SLOW);
+    }
+
+
+    VideoSnapshot screen;
+    while (true){
+        roll_den(env.console, context, 0ms, 0ms, SKIPS, CATCHABILITY);
+
+        size_t desired_index = FILTER.index();
+        std::string desired_slug = FILTER.slug();
+
+        if (desired_index == 0){
+            ring_bell(context, 20);
+        }else{
+            context.wait_for_all_requests();
+        }
+        stats.rolls++;
+        stats.skips += SKIPS;
+
+        {
+            DenMonReader reader(env.console, env.console);
+
+            enter_den(context, 0ms, SKIPS != 0, false);
+
+            if (desired_index != 0){
+                pbf_wait(context, READ_DELAY0);
+            }
+            context.wait_for_all_requests();
+
+            screen = env.console.video().snapshot();
+            DenMonReadResults results = reader.read(screen);
+
+            //  Give user time to look at the mon.
+            if (desired_index == 0){
+                //  No filter enabled. Keep going.
+                pbf_wait(context, VIEW_TIME0);
+            }else if (results.slugs.results.empty()){
+                //  No detection. Keep going.
+                stats.errors++;
+                dump_image(env.console, env.program_info(), "ReadDenMon", screen);
+                pbf_wait(context, VIEW_TIME0);
+            }else{
+                //  Check if we got what we wanted.
+                for (const auto& item : results.slugs.results){
+                    if (item.second == desired_slug){
+                        stats.matches++;
+                        goto StopProgram;
+                    }
+                }
+            }
+        }
+        env.update_stats();
+
+        //  Add a little extra wait time since correctness matters here.
+        ssf_press_button(context, BUTTON_HOME, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE0, 160ms);
+
+        rollback_date_from_home(env.console, context, SKIPS);
+//        reset_game_from_home(TOLERATE_SYSTEM_UPDATE_MENU_SLOW);
+        reset_game_from_home_with_inference(
+            env.console, context,
+            ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST
+        );
+    }
+
+StopProgram:
+    env.update_stats();
+    send_program_finished_notification(
+        env, NOTIFICATION_PROGRAM_FINISH,
+        "Found a match!",
+        screen, false
+    );
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/Hosting/PokemonSwSh_DenRoller.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/Hosting/PokemonSwSh_DenRoller.h
new file mode 100644
index 0000000000..1d19e0fe04
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/Hosting/PokemonSwSh_DenRoller.h
@@ -0,0 +1,63 @@
+/*  Den Roller
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_DenRoller_H
+#define PokemonAutomation_PokemonSwSh_DenRoller_H
+
+#include "Common/Cpp/Options/StaticTextOption.h"
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "Common/Cpp/Options/TimeDurationOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "VideoGames/PokemonSwSh/Options/PokemonSwSh_Catchability.h"
+#include "VideoGames/PokemonSwSh/Inference/Dens/PokemonSwSh_DenMonReader.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+class DenRoller_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    DenRoller_Descriptor();
+
+    struct Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+
+
+class DenRoller : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = DenRoller_Descriptor;
+    DenRoller();
+
+    void ring_bell(ProControllerContext& context, int count) const;
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    StartInGripOrGameOption START_LOCATION;
+    SimpleIntegerOption<uint8_t> SKIPS;
+    DenMonSelectOption FILTER;
+
+    CatchabilitySelectorOption CATCHABILITY;
+    MillisecondsOption VIEW_TIME0;
+
+    EventNotificationOption NOTIFICATION_PROGRAM_FINISH;
+    EventNotificationsOption NOTIFICATIONS;
+
+    SectionDividerOption m_advanced_options;
+    MillisecondsOption READ_DELAY0;
+};
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/Hosting/PokemonSwSh_DenTools.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/Hosting/PokemonSwSh_DenTools.cpp
new file mode 100644
index 0000000000..58fdf0f83d
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/Hosting/PokemonSwSh_DenTools.cpp
@@ -0,0 +1,161 @@
+/*  Den Tools
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "NintendoSwitch/NintendoSwitch_Settings.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "NintendoSwitch/Programs/DateSpam/NintendoSwitch_HomeToDateTime.h"
+#include "NintendoSwitch/Programs/DateSpam/NintendoSwitch_RollDateForward1.h"
+#include "NintendoSwitch/Programs/DateSpam/NintendoSwitch_RollDateBackwardN.h"
+#include "VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_GameEntry.h"
+//#include "VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.h"
+#include "PokemonSwSh_DenTools.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+void enter_den(
+    ProControllerContext& context,
+    Milliseconds ENTER_ONLINE_DEN_DELAY,
+    bool watts,
+    bool online
+){
+    if (!online){
+        if (!watts){
+            ssf_press_button(context, BUTTON_A, GameSettings::instance().ENTER_OFFLINE_DEN_DELAY0, 160ms);
+        }else{
+            //  This is the critical den-rolling path. It needs to be fast.
+            ssf_mash_AZs(context, GameSettings::instance().COLLECT_WATTS_OFFLINE_DELAY0);
+            pbf_wait(context, GameSettings::instance().ENTER_OFFLINE_DEN_DELAY0);
+        }
+    }else{
+        if (!watts){
+            ssf_press_button(context, BUTTON_A, ENTER_ONLINE_DEN_DELAY, 400ms);
+        }else{
+            ssf_press_button(context, BUTTON_A, GameSettings::instance().COLLECT_WATTS_ONLINE_DELAY0, 400ms);
+            ssf_press_button(context, BUTTON_B, 800ms, 400ms);
+            ssf_press_button(context, BUTTON_B, ENTER_ONLINE_DEN_DELAY, 400ms);
+        }
+    }
+}
+
+
+void enter_lobby(
+    ProControllerContext& context,
+    Milliseconds OPEN_ONLINE_DEN_LOBBY_DELAY,
+    bool online,
+    Catchability catchability
+){
+    if (online){
+        switch (catchability){
+        case Catchability::ALWAYS_CATCHABLE:
+            ssf_press_button(context, BUTTON_A, OPEN_ONLINE_DEN_LOBBY_DELAY);
+            return;
+        case Catchability::MAYBE_UNCATCHABLE:
+        case Catchability::ALWAYS_UNCATCHABLE:
+            ssf_press_button(context, BUTTON_A, GameSettings::instance().UNCATCHABLE_PROMPT_DELAY0);
+            ssf_press_button(context, BUTTON_A, OPEN_ONLINE_DEN_LOBBY_DELAY);
+            return;
+        }
+    }
+
+    switch (catchability){
+    case Catchability::ALWAYS_CATCHABLE:
+        ssf_press_button(context, BUTTON_A, GameSettings::instance().OPEN_LOCAL_DEN_LOBBY_DELAY0);
+        return;
+    case Catchability::MAYBE_UNCATCHABLE:
+        ssf_press_button(context, BUTTON_A, GameSettings::instance().UNCATCHABLE_PROMPT_DELAY0);
+        ssf_press_button(context, BUTTON_A, GameSettings::instance().OPEN_LOCAL_DEN_LOBBY_DELAY0);
+
+        if (!GameSettings::instance().DODGE_UNCATCHABLE_PROMPT_FAST){
+            //  lobby-switch        switch-box
+            ssf_press_dpad(context, DPAD_LEFT, 80ms);
+            //  lobby-switch        switch-party-red
+            ssf_press_button(context, BUTTON_A, GameSettings::instance().ENTER_SWITCH_POKEMON0);
+            //  switch-box          switch-confirm
+            ssf_press_button(context, BUTTON_Y, 80ms);
+            ssf_press_dpad(context, DPAD_LEFT, 80ms);
+            //  switch-party-blue   switch-confirm
+            ssf_press_button(context, BUTTON_A, GameSettings::instance().EXIT_SWITCH_POKEMON0);
+            //  lobby-switch        lobby-switch
+        }
+        return;
+    case Catchability::ALWAYS_UNCATCHABLE:
+        ssf_press_button(context, BUTTON_A, GameSettings::instance().UNCATCHABLE_PROMPT_DELAY0);
+        ssf_press_button(context, BUTTON_A, GameSettings::instance().OPEN_LOCAL_DEN_LOBBY_DELAY0);
+        return;
+    }
+}
+
+
+void roll_den(
+    ConsoleHandle& console, ProControllerContext& context,
+    Milliseconds ENTER_ONLINE_DEN_DELAY,
+    Milliseconds OPEN_ONLINE_DEN_LOBBY_DELAY,
+    uint8_t skips, Catchability catchability
+){
+    if (skips > 60){
+        skips = 60;
+    }
+    for (uint8_t c = 0; c < skips; c++){
+        enter_den(context, ENTER_ONLINE_DEN_DELAY, c != 0, false);
+        enter_lobby(context, OPEN_ONLINE_DEN_LOBBY_DELAY, false, catchability);
+
+        //  Skip forward.
+        ssf_press_button(context, BUTTON_HOME, GameSettings::instance().GAME_TO_HOME_DELAY_FAST0, 80ms);
+        home_to_date_time(console, context, true);
+        roll_date_forward_1(console, context, false);
+
+        //  Enter game
+        if (console.video().snapshot()){
+            console.log("Entering game using inference...");
+            pbf_press_button(context, BUTTON_HOME, 80ms, 720ms);
+            NintendoSwitch::resume_game_from_home(console, context);
+        }else{
+            console.log("Entering game without inference...", COLOR_RED);
+            settings_to_enter_game_den_lobby(
+                context,
+                ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_SLOW, true,
+                GameSettings::instance().ENTER_SWITCH_POKEMON0,
+                GameSettings::instance().EXIT_SWITCH_POKEMON0
+            );
+        }
+
+        //  Exit Raid
+        ssf_press_button(context, BUTTON_B, 960ms, 400ms);
+        ssf_press_button(context, BUTTON_A, GameSettings::instance().REENTER_DEN_DELAY0, 400ms);
+    }
+}
+void rollback_date_from_home(ConsoleHandle& console, ProControllerContext& context, uint8_t skips){
+    if (skips == 0){
+        return;
+    }
+    if (skips > 60){
+        skips = 60;
+    }
+    home_to_date_time(console, context, true);
+    roll_date_backward_N(console, context, skips, false);
+//    pbf_wait(5);
+
+    //  Note that it is possible for this return animation to run longer than
+    //  "SETTINGS_TO_HOME_DELAY" and swallow a subsequent button press.
+    //  Therefore the caller needs to be able to tolerate this.
+    ssf_press_button(context, BUTTON_HOME, ConsoleSettings::instance().SETTINGS_TO_HOME_DELAY0, 160ms);
+}
+
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/Hosting/PokemonSwSh_DenTools.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/Hosting/PokemonSwSh_DenTools.h
new file mode 100644
index 0000000000..d7e76c3191
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/Hosting/PokemonSwSh_DenTools.h
@@ -0,0 +1,50 @@
+/*  Den Tools
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_DenTools_H
+#define PokemonAutomation_PokemonSwSh_DenTools_H
+
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+#include "NintendoSwitch/NintendoSwitch_ConsoleHandle.h"
+#include "VideoGames/PokemonSwSh/Options/PokemonSwSh_Catchability.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+void enter_den(
+    ProControllerContext& context,
+    Milliseconds ENTER_ONLINE_DEN_DELAY,
+    bool watts,
+    bool online
+);
+void enter_lobby(
+    ProControllerContext& context,
+    Milliseconds OPEN_ONLINE_DEN_LOBBY_DELAY,
+    bool online,
+    Catchability catchability
+);
+
+void roll_den(
+    ConsoleHandle& console, ProControllerContext& context,
+    Milliseconds ENTER_ONLINE_DEN_DELAY,
+    Milliseconds OPEN_ONLINE_DEN_LOBBY_DELAY,
+    uint8_t skips, Catchability catchability
+);
+void rollback_date_from_home(
+    ConsoleHandle& console, ProControllerContext& context,
+    uint8_t skips
+);
+
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/Hosting/PokemonSwSh_LobbyWait.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/Hosting/PokemonSwSh_LobbyWait.h
new file mode 100644
index 0000000000..424a69767e
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/Hosting/PokemonSwSh_LobbyWait.h
@@ -0,0 +1,108 @@
+/*  Lobby Wait
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_LobbyWait_H
+#define PokemonAutomation_PokemonSwSh_LobbyWait_H
+
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonFramework/Tools/VideoStream.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+#include "NintendoSwitch/NintendoSwitch_Settings.h"
+#include "VideoGames/PokemonSwSh/PokemonSwSh_Settings.h"
+#include "VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_AutoHosts.h"
+#include "VideoGames/PokemonSwSh/Inference/Dens/PokemonSwSh_RaidLobbyReader.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+static RaidLobbyState raid_lobby_wait(
+    ConsoleHandle& console, ProControllerContext& context,
+    bool HOST_ONLINE,
+    uint8_t accept_FR_slot,
+    Milliseconds lobby_wait_delay
+){
+    Milliseconds GAME_TO_HOME_DELAY_SAFE = GameSettings::instance().GAME_TO_HOME_DELAY_SAFE0;
+    Milliseconds AUTO_FR_DURATION = GameSettings::instance().AUTO_FR_DURATION0;
+    bool TOLERATE_SYSTEM_UPDATE_MENU_SLOW = ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_SLOW;
+    Milliseconds FULL_LOBBY_TIMER = GameSettings::instance().FULL_LOBBY_TIMER0;
+
+    context.wait_for_all_requests();
+    WallClock start = current_time();
+    WallClock deadline_start_time = start + lobby_wait_delay;
+    WallClock deadline_lobby_limit = start + FULL_LOBBY_TIMER;
+    RaidLobbyReader inference(console.logger(), console.overlay());
+    RaidLobbyState state;
+
+    if (HOST_ONLINE && accept_FR_slot > 0){
+        accept_FRs(
+            console, context,
+            accept_FR_slot - 1, true,
+            GAME_TO_HOME_DELAY_SAFE,
+            AUTO_FR_DURATION,
+            TOLERATE_SYSTEM_UPDATE_MENU_SLOW
+        );
+        context.wait_for_all_requests();
+        WallDuration time_elapsed = current_time() - start;
+        WallDuration delay = time_elapsed;
+
+        while (true){
+            state = inference.read(console.video().snapshot());
+            if (state.valid && state.raid_is_full() && state.raiders_are_ready()){
+                return state;
+            }
+            time_elapsed = current_time() - start;
+            if (time_elapsed + delay >= lobby_wait_delay){
+                break;
+            }
+            accept_FRs(
+                console, context,
+                accept_FR_slot - 1, false,
+                GAME_TO_HOME_DELAY_SAFE,
+                AUTO_FR_DURATION,
+                TOLERATE_SYSTEM_UPDATE_MENU_SLOW
+            );
+            context.wait_for_all_requests();
+        }
+    }
+
+    while (true){
+        state = inference.read(console.video().snapshot());
+        if (state.valid && state.raid_is_full() && state.raiders_are_ready()){
+            return state;
+        }
+        if (current_time() > deadline_start_time){
+            break;
+        }
+        context.wait_for(std::chrono::milliseconds(1000));
+    }
+
+//    context.wait_for_all_requests();
+
+    while (true){
+        if (!state.valid || state.raiders_are_ready()){
+            return state;
+        }
+        if (current_time() > deadline_lobby_limit){
+            return state;
+        }
+        context.wait_for(std::chrono::milliseconds(1000));
+        state = inference.read(console.video().snapshot());
+    }
+}
+
+
+
+}
+}
+}
+#endif
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset-Calyrex.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset-Calyrex.cpp
new file mode 100644
index 0000000000..4293ea9406
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset-Calyrex.cpp
@@ -0,0 +1,313 @@
+/*  Stats Reset - Calyrex
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/NintendoSwitch_Settings.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonSwSh/PokemonSwSh_Settings.h"
+#include "VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleMenuDetector.h"
+#include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_IvJudgeReader.h"
+#include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_BasicCatcher.h"
+#include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
+#include "PokemonSwSh_StatsReset-Calyrex.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+StatsResetCalyrex_Descriptor::StatsResetCalyrex_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonSwSh:StatsResetCalyrex",
+        STRING_POKEMON + " SwSh", "Stats Reset - Calyrex",
+        "Programs/PokemonSwSh/StatsReset-Calyrex.html",
+        "Repeatedly catch calyrex (and its horse) until you get the stats you want.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+struct StatsResetCalyrex_Descriptor::Stats : public StatsTracker{
+    Stats()
+        : pokemon_caught(m_stats["Pokemon caught"])
+        , pokemon_fainted(m_stats["Pokemon fainted"])
+        , own_fainted(m_stats["Own fainted"])
+        , out_of_balls(m_stats["Out of balls"])
+        , errors(m_stats["Errors"])
+        , total_balls_thrown(m_stats["Total balls thrown"])
+        , matches(m_stats["Matches"])
+    {
+        m_display_order.emplace_back(Stat("Pokemon caught"));
+        m_display_order.emplace_back(Stat("Pokemon fainted"));
+        m_display_order.emplace_back(Stat("Own fainted"));
+        m_display_order.emplace_back(Stat("Out of balls"));
+        m_display_order.emplace_back(Stat("Errors"));
+        m_display_order.emplace_back(Stat("Total balls thrown"));
+        m_display_order.emplace_back(Stat("Matches"));
+    }
+
+    std::atomic<uint64_t>& pokemon_caught;
+    std::atomic<uint64_t>& pokemon_fainted;
+    std::atomic<uint64_t>& own_fainted;
+    std::atomic<uint64_t>& out_of_balls;
+    std::atomic<uint64_t>& errors;
+    std::atomic<uint64_t>& total_balls_thrown;
+    std::atomic<uint64_t>& matches;
+};
+std::unique_ptr<StatsTracker> StatsResetCalyrex_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+
+
+StatsResetCalyrex::StatsResetCalyrex()
+    : GO_HOME_WHEN_DONE(false)
+    , BALL_SELECT(
+        "<b>Ball Select:</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        "master-ball"
+    )
+    , LANGUAGE(
+        "<b>Game Language:</b>",
+        IV_READER().languages(),
+        LockMode::LOCK_WHILE_RUNNING,
+        true
+    )
+    , CHECK_CALYREX_STATS(
+        "<b>Check Calyrex stats</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        true
+    )
+    , CALYREX_HP("<b>Calyrex HP:</b>")
+    , CALYREX_ATTACK("<b>Calyrex Attack:</b>", IvJudgeFilter::NoGood)
+    , CALYREX_DEFENSE("<b>Calyrex Defense:</b>")
+    , CALYREX_SPATK("<b>Calyrex Sp. Atk:</b>")
+    , CALYREX_SPDEF("<b>Calyrex Sp. Def:</b>")
+    , CALYREX_SPEED("<b>Calyrex Speed:</b>")
+    , CHECK_HORSE_STATS(
+        "<b>Check Horse stats</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        true
+    )
+    , HORSE_HP("<b>Horse HP:</b>")
+    , HORSE_ATTACK("<b>Horse Attack:</b>", IvJudgeFilter::NoGood)
+    , HORSE_DEFENSE("<b>Horse Defense:</b>")
+    , HORSE_SPATK("<b>Horse Sp. Atk:</b>")
+    , HORSE_SPDEF("<b>Horse Sp. Def:</b>")
+    , HORSE_SPEED("<b>Horse Speed:</b>")
+    , NOTIFICATION_CATCH_SUCCESS("Catch Success", true, false, std::chrono::seconds(3600))
+    , NOTIFICATION_CATCH_FAILED("Catch Failed", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_CATCH_SUCCESS,
+        &NOTIFICATION_CATCH_FAILED,
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+{
+
+    PA_ADD_OPTION(START_LOCATION);
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+
+    PA_ADD_OPTION(BALL_SELECT);
+    PA_ADD_OPTION(LANGUAGE);
+
+    PA_ADD_OPTION(CHECK_CALYREX_STATS);
+    PA_ADD_OPTION(CALYREX_HP);
+    PA_ADD_OPTION(CALYREX_ATTACK);
+    PA_ADD_OPTION(CALYREX_DEFENSE);
+    PA_ADD_OPTION(CALYREX_SPATK);
+    PA_ADD_OPTION(CALYREX_SPDEF);
+    PA_ADD_OPTION(CALYREX_SPEED);
+
+    PA_ADD_OPTION(CHECK_HORSE_STATS);
+    PA_ADD_OPTION(HORSE_HP);
+    PA_ADD_OPTION(HORSE_ATTACK);
+    PA_ADD_OPTION(HORSE_DEFENSE);
+    PA_ADD_OPTION(HORSE_SPATK);
+    PA_ADD_OPTION(HORSE_SPDEF);
+    PA_ADD_OPTION(HORSE_SPEED);
+
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+
+
+void StatsResetCalyrex::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    if (START_LOCATION.start_in_grip_menu()){
+        grip_menu_connect_go_home(context);
+        resume_game_back_out(
+            env.console,
+            context,
+            ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST,
+            1600ms
+        );
+    }else{
+        //  Connect the controller.
+        require_player(env.console, context, BUTTON_B);
+    }
+
+    StatsResetCalyrex_Descriptor::Stats& stats = env.current_stats<StatsResetCalyrex_Descriptor::Stats>();
+
+    bool match_found = false;
+    while (!match_found){
+
+        bool calyrex_caught = false;
+        while (!calyrex_caught){
+            env.log("Talk to calyrex.", COLOR_PURPLE);
+            context.wait_for_all_requests();
+            {
+                StandardBattleMenuWatcher fight_detector(false);
+                int result = run_until<ProControllerContext>(
+                    env.console, context,
+                    [](ProControllerContext& context){
+                        while (true){
+                            pbf_press_button(context, BUTTON_A, 80ms, 1000ms);
+                        }
+                    },
+                    {{fight_detector}}
+                );
+                if (result == 0){
+                    env.log("New fight detected, let's begin to throw balls.", COLOR_PURPLE);
+                    pbf_mash_button(context, BUTTON_B, 1000ms);
+                }
+            }
+
+            pbf_mash_button(context, BUTTON_B, 1000ms);
+            CatchResults result = basic_catcher(env.console, context, LANGUAGE, BALL_SELECT.slug(), 999);
+            switch (result.result){
+            case CatchResult::POKEMON_CAUGHT:
+                calyrex_caught = true;
+                stats.pokemon_caught++;
+                break;
+            case CatchResult::POKEMON_FAINTED:
+                stats.pokemon_fainted++;
+                break;
+            case CatchResult::OWN_FAINTED:
+                stats.own_fainted++;
+                break;
+            case CatchResult::OUT_OF_BALLS:
+                stats.out_of_balls++;
+                break;
+            case CatchResult::BALL_LIMIT_REACHED:
+            case CatchResult::CANNOT_THROW_BALL:
+            case CatchResult::TIMED_OUT:
+                stats.errors++;
+                break;
+            }
+            stats.total_balls_thrown += result.balls_used;
+            env.update_stats();
+
+            if (calyrex_caught){
+                send_program_status_notification(
+                    env, NOTIFICATION_CATCH_SUCCESS,
+                    "Threw " + std::to_string(result.balls_used) + " ball(s) and caught it."
+                );
+            }else{
+                send_program_status_notification(
+                    env, NOTIFICATION_CATCH_FAILED,
+                    "Threw " + std::to_string(result.balls_used) + " ball(s) and did not catch it."
+                );
+            }
+
+            if (!calyrex_caught){
+                ssf_press_button(context, BUTTON_HOME, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE0, 160ms);
+                reset_game_from_home_with_inference(
+                    env.console, context,
+                    ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST
+                );
+            }
+        }
+
+        env.log("Unfuse calyrex.", COLOR_PURPLE);
+        for (int i = 0; i < 40; i++){
+            pbf_press_button(context, BUTTON_A, 80ms, 1000ms);
+        }
+        pbf_press_button(context, BUTTON_X  , 80ms, 1500ms);
+        pbf_press_dpad  (context, DPAD_RIGHT, 80ms, 500ms);
+        pbf_press_dpad  (context, DPAD_RIGHT, 80ms, 500ms);
+        pbf_press_button(context, BUTTON_A  , 80ms, 2000ms);
+        pbf_press_dpad  (context, DPAD_LEFT , 80ms, 500ms);
+        pbf_press_dpad  (context, DPAD_UP   , 80ms, 500ms);
+        pbf_press_button(context, BUTTON_A  , 80ms, 2000ms);
+        pbf_press_button(context, BUTTON_A  , 80ms, 2000ms);
+        pbf_press_dpad  (context, DPAD_UP   , 80ms, 2000ms);
+        pbf_press_button(context, BUTTON_A  , 80ms, 2000ms);
+        pbf_press_button(context, BUTTON_A  , 80ms, 2000ms);
+        context.wait_for_all_requests();
+
+        env.log("Check the stats.", COLOR_PURPLE);
+        for (int i = 0; i < 10; i++){
+            pbf_press_button(context, BUTTON_B, 80ms, 1000ms);
+        }
+        pbf_press_button(context, BUTTON_X , 80ms, 2000ms);
+        pbf_press_dpad  (context, DPAD_LEFT, 80ms, 500ms);
+        pbf_press_button(context, BUTTON_A , 80ms, 2000ms);
+        pbf_press_button(context, BUTTON_R , 80ms, 3000ms);
+        pbf_press_dpad  (context, DPAD_LEFT, 80ms, 1000ms);
+        pbf_press_dpad  (context, DPAD_UP  , 80ms, 1000ms);
+        pbf_press_dpad  (context, DPAD_UP  , 80ms, 1000ms);
+
+        if (CHECK_HORSE_STATS){
+            context.wait_for_all_requests();
+            IvJudgeReaderScope reader(env.console, LANGUAGE);
+            IvJudgeReader::Results results = reader.read(env.console, env.console.video().snapshot());
+            bool horse_ok = true;
+            horse_ok &= HORSE_HP.matches(stats.errors, results.hp);
+            horse_ok &= HORSE_ATTACK.matches(stats.errors, results.attack);
+            horse_ok &= HORSE_DEFENSE.matches(stats.errors, results.defense);
+            horse_ok &= HORSE_SPATK.matches(stats.errors, results.spatk);
+            horse_ok &= HORSE_SPDEF.matches(stats.errors, results.spdef);
+            horse_ok &= HORSE_SPEED.matches(stats.errors, results.speed);
+            if (horse_ok){
+                match_found = true;
+            }
+        }
+        if (CHECK_CALYREX_STATS){
+            pbf_press_dpad(context, DPAD_UP, 80ms, 1000ms);
+            context.wait_for_all_requests();
+            
+            IvJudgeReaderScope reader(env.console, LANGUAGE);
+            IvJudgeReader::Results results = reader.read(env.console, env.console.video().snapshot());
+            bool calyrex_ok = true;
+            calyrex_ok &= CALYREX_HP.matches(stats.errors, results.hp);
+            calyrex_ok &= CALYREX_ATTACK.matches(stats.errors, results.attack);
+            calyrex_ok &= CALYREX_DEFENSE.matches(stats.errors, results.defense);
+            calyrex_ok &= CALYREX_SPATK.matches(stats.errors, results.spatk);
+            calyrex_ok &= CALYREX_SPDEF.matches(stats.errors, results.spdef);
+            calyrex_ok &= CALYREX_SPEED.matches(stats.errors, results.speed);
+            if (calyrex_ok){
+                match_found = true;
+            }
+        }
+        if (!match_found){
+            ssf_press_button(context, BUTTON_HOME, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE0, 160ms);
+            reset_game_from_home_with_inference(
+                env.console, context,
+                ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST
+            );
+        }
+    }
+    stats.matches++;
+    env.log("Result Found!", COLOR_BLUE);
+    env.update_stats();
+    send_program_finished_notification(
+        env, NOTIFICATION_PROGRAM_FINISH,
+        "Found a perfect match!"
+    );
+    GO_HOME_WHEN_DONE.run_end_of_program(context);
+}
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset-Calyrex.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset-Calyrex.h
new file mode 100644
index 0000000000..cb3a25f171
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset-Calyrex.h
@@ -0,0 +1,74 @@
+/*  Stats Reset - Calyrex
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_StatsResetCalyrex_H
+#define PokemonAutomation_PokemonSwSh_StatsResetCalyrex_H
+
+#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "CommonTools/Options/LanguageOCROption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+#include "NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h"
+#include "Pokemon/Options/Pokemon_IvJudgeOption.h"
+#include "VideoGames/PokemonSwSh/Options/PokemonSwSh_BallSelectOption.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+using namespace Pokemon;
+
+
+class StatsResetCalyrex_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    StatsResetCalyrex_Descriptor();
+
+    struct Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+
+
+class StatsResetCalyrex : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = StatsResetCalyrex_Descriptor;
+    StatsResetCalyrex();
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    StartInGripOrGameOption START_LOCATION;
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
+
+    PokemonBallSelectOption BALL_SELECT;
+    OCR::LanguageOCROption LANGUAGE;
+
+    BooleanCheckBoxOption CHECK_CALYREX_STATS;
+    IVJudgeFilterOption CALYREX_HP;
+    IVJudgeFilterOption CALYREX_ATTACK;
+    IVJudgeFilterOption CALYREX_DEFENSE;
+    IVJudgeFilterOption CALYREX_SPATK;
+    IVJudgeFilterOption CALYREX_SPDEF;
+    IVJudgeFilterOption CALYREX_SPEED;
+
+    BooleanCheckBoxOption CHECK_HORSE_STATS;
+    IVJudgeFilterOption HORSE_HP;
+    IVJudgeFilterOption HORSE_ATTACK;
+    IVJudgeFilterOption HORSE_DEFENSE;
+    IVJudgeFilterOption HORSE_SPATK;
+    IVJudgeFilterOption HORSE_SPDEF;
+    IVJudgeFilterOption HORSE_SPEED;
+
+    EventNotificationOption NOTIFICATION_CATCH_SUCCESS;
+    EventNotificationOption NOTIFICATION_CATCH_FAILED;
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset-Moltres.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset-Moltres.cpp
new file mode 100644
index 0000000000..1ddf7cedab
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset-Moltres.cpp
@@ -0,0 +1,241 @@
+/*  Stats Reset - Moltres
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/NintendoSwitch_Settings.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonSwSh/PokemonSwSh_Settings.h"
+#include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_IvJudgeReader.h"
+#include "VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleMenuDetector.h"
+#include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
+#include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_BasicCatcher.h"
+#include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
+#include "PokemonSwSh_StatsReset-Moltres.h"
+
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+StatsResetMoltres_Descriptor::StatsResetMoltres_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonSwSh:StatsResetMoltres",
+        STRING_POKEMON + " SwSh", "Stats Reset - Moltres",
+        "Programs/PokemonSwSh/StatsReset-Moltres.html",
+        "Repeatedly catch moltres until you get the stats you want.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+struct StatsResetMoltres_Descriptor::Stats : public StatsTracker{
+    Stats()
+        : resets(m_stats["Resets"])
+        , errors(m_stats["Errors"])
+        , matches(m_stats["Matches"])
+    {
+        m_display_order.emplace_back(Stat("Resets"));
+        m_display_order.emplace_back(Stat("Errors"));
+        m_display_order.emplace_back(Stat("Matches"));
+    }
+
+    std::atomic<uint64_t>& resets;
+    std::atomic<uint64_t>& errors;
+    std::atomic<uint64_t>& matches;
+};
+std::unique_ptr<StatsTracker> StatsResetMoltres_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+
+
+
+StatsResetMoltres::StatsResetMoltres()
+    : GO_HOME_WHEN_DONE(false)
+    , LANGUAGE(
+        "<b>Game Language:</b>",
+        IV_READER().languages(),
+        LockMode::LOCK_WHILE_RUNNING,
+        true
+    )
+    , HP("<b>HP:</b>")
+    , ATTACK("<b>Attack:</b>", IvJudgeFilter::NoGood)
+    , DEFENSE("<b>Defense:</b>")
+    , SPATK("<b>Sp. Atk:</b>")
+    , SPDEF("<b>Sp. Def:</b>")
+    , SPEED("<b>Speed:</b>")
+    , NOTIFICATIONS({
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+{
+    PA_ADD_OPTION(START_LOCATION);
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+
+    PA_ADD_OPTION(LANGUAGE);
+    PA_ADD_OPTION(HP);
+    PA_ADD_OPTION(ATTACK);
+    PA_ADD_OPTION(DEFENSE);
+    PA_ADD_OPTION(SPATK);
+    PA_ADD_OPTION(SPDEF);
+    PA_ADD_OPTION(SPEED);
+
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+
+
+void StatsResetMoltres::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    if (START_LOCATION.start_in_grip_menu()){
+        grip_menu_connect_go_home(context);
+        resume_game_back_out(
+            env.console,
+            context,
+            ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST,
+            1600ms
+        );
+    }else{
+        //  Connect the controller.
+        require_player(env.console, context, BUTTON_B);
+    }
+
+    StatsResetMoltres_Descriptor::Stats& stats = env.current_stats<StatsResetMoltres_Descriptor::Stats>();
+
+    while (true){
+        context.wait_for_all_requests();
+        env.log("Wait for moltres to attack you.", COLOR_PURPLE);
+        {
+            StandardBattleMenuWatcher fight_detector(false);
+            int result = run_until<ProControllerContext>(
+                env.console, context,
+                [](ProControllerContext& context){
+                    while (true){
+                        pbf_wait(context, 1000ms);
+                    }
+                },
+                {{fight_detector}}
+            );
+            if (result == 0){
+                env.log("New fight detected.", COLOR_PURPLE);
+                pbf_mash_button(context, BUTTON_B, 1000ms);
+            }
+        }
+
+        context.wait_for_all_requests();
+        CatchResults result = basic_catcher(env.console, context, LANGUAGE, "master-ball", 999);
+        if (result.result != CatchResult::POKEMON_CAUGHT){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "Unable to catch Moltres.",
+                env.console
+            );
+        }
+
+        context.wait_for_all_requests();
+        env.log("Exit the fight.", COLOR_PURPLE);
+        for (int i = 0; i < 20; i++){
+            pbf_press_button(context, BUTTON_B, 80ms, 1000ms);
+        }
+
+        context.wait_for_all_requests();
+        env.log("Check the stats.", COLOR_PURPLE);
+        pbf_press_button(context, BUTTON_X , 80ms, GameSettings::instance().OVERWORLD_TO_MENU_DELAY0);
+        pbf_press_dpad  (context, DPAD_UP  , 80ms, 500ms);
+        pbf_press_button(context, BUTTON_A , 80ms, 2000ms);
+        pbf_press_button(context, BUTTON_R , 80ms, 3000ms);
+        pbf_press_dpad  (context, DPAD_LEFT, 80ms, 1000ms);
+        pbf_press_dpad  (context, DPAD_UP  , 80ms, 1000ms);
+        pbf_press_dpad  (context, DPAD_UP  , 80ms, 1000ms);
+
+        context.wait_for_all_requests();
+        IvJudgeReaderScope reader(env.console, LANGUAGE);
+        IvJudgeReader::Results results = reader.read(env.console, env.console.video().snapshot());
+        bool ok = true;
+        ok &= HP.matches(stats.errors, results.hp);
+        ok &= ATTACK.matches(stats.errors, results.attack);
+        ok &= DEFENSE.matches(stats.errors, results.defense);
+        ok &= SPATK.matches(stats.errors, results.spatk);
+        ok &= SPDEF.matches(stats.errors, results.spdef);
+        ok &= SPEED.matches(stats.errors, results.speed);
+        env.update_stats();
+        if (ok){
+            break;
+        }else{
+            stats.resets++;
+            env.update_stats();
+            ssf_press_button(context, BUTTON_HOME, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE0, 160ms);
+            reset_game_from_home_with_inference(
+                env.console, context,
+                ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST
+            );
+
+            context.wait_for_all_requests();
+            env.log("Wait for moltres to attack you.", COLOR_PURPLE);
+            {
+                StandardBattleMenuWatcher fight_detector(false);
+                int ret = run_until<ProControllerContext>(
+                    env.console, context,
+                    [](ProControllerContext& context){
+                        while (true){
+                            pbf_wait(context, 1000ms);
+                        }
+                    },
+                    {{fight_detector}}
+                );
+                if (ret == 0){
+                    env.log("New fight detected.", COLOR_PURPLE);
+                    pbf_mash_button(context, BUTTON_B, 1000ms);
+                    pbf_press_dpad(context, DPAD_UP , 80ms, 1000ms);
+                    pbf_press_button(context, BUTTON_A, 80ms, 1000ms);
+                }
+            }
+            for (int i = 0; i < 10; i++){
+                pbf_press_button(context, BUTTON_B, 80ms, 1000ms);
+            }
+
+            context.wait_for_all_requests();
+            env.log("Let's camp.", COLOR_PURPLE);
+            pbf_press_button(context, BUTTON_X  , 80ms, GameSettings::instance().OVERWORLD_TO_MENU_DELAY0);
+            pbf_press_dpad  (context, DPAD_RIGHT, 80ms, 1000ms);
+            pbf_press_dpad  (context, DPAD_DOWN , 80ms, 1000ms);
+            pbf_press_button(context, BUTTON_A  , 80ms, 8000ms);
+            pbf_press_button(context, BUTTON_X  , 80ms, 1000ms);
+            pbf_press_dpad  (context, DPAD_LEFT , 80ms, 1000ms);
+            pbf_press_button(context, BUTTON_A  , 80ms, 7000ms);
+
+            context.wait_for_all_requests();
+            env.log("Let's save.", COLOR_PURPLE);
+            pbf_press_button(context, BUTTON_X , 80ms, GameSettings::instance().OVERWORLD_TO_MENU_DELAY0);
+            pbf_press_button(context, BUTTON_R , 80ms, 1000ms);
+            pbf_press_button(context, BUTTON_A , 80ms, 1000ms);
+            pbf_press_button(context, BUTTON_A , 80ms, 1000ms);
+        }
+    }
+
+    env.log("Result Found!", COLOR_BLUE);
+    stats.matches++;
+
+    env.update_stats();
+    send_program_finished_notification(
+        env, NOTIFICATION_PROGRAM_FINISH,
+        "Found a perfect match!"
+    );
+    GO_HOME_WHEN_DONE.run_end_of_program(context);
+}
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset-Moltres.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset-Moltres.h
new file mode 100644
index 0000000000..ea84ccc007
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset-Moltres.h
@@ -0,0 +1,59 @@
+/*  Stats Reset - Moltres
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_StatsResetMoltres_H
+#define PokemonAutomation_PokemonSwSh_StatsResetMoltres_H
+
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "CommonTools/Options/LanguageOCROption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h"
+#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+#include "Pokemon/Options/Pokemon_IvJudgeOption.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+using namespace Pokemon;
+
+
+class StatsResetMoltres_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    StatsResetMoltres_Descriptor();
+
+    struct Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+
+
+class StatsResetMoltres : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = StatsResetMoltres_Descriptor;
+    StatsResetMoltres();
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    StartInGripOrGameOption START_LOCATION;
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
+
+    OCR::LanguageOCROption LANGUAGE;
+    IVJudgeFilterOption HP;
+    IVJudgeFilterOption ATTACK;
+    IVJudgeFilterOption DEFENSE;
+    IVJudgeFilterOption SPATK;
+    IVJudgeFilterOption SPDEF;
+    IVJudgeFilterOption SPEED;
+
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset-Regi.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset-Regi.cpp
new file mode 100644
index 0000000000..419d803740
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset-Regi.cpp
@@ -0,0 +1,252 @@
+/*  Stats Reset - Regi
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/NintendoSwitch_Settings.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonSwSh/PokemonSwSh_Settings.h"
+#include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_IvJudgeReader.h"
+#include "VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleMenuDetector.h"
+#include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_BasicCatcher.h"
+#include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
+#include "PokemonSwSh_StatsReset-Regi.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+StatsResetRegi_Descriptor::StatsResetRegi_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonSwSh:StatsResetRegi",
+        STRING_POKEMON + " SwSh", "Stats Reset - Regi",
+        "Programs/PokemonSwSh/StatsReset-Regi.html",
+        "Repeatedly catch regi until you get the stats you want.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+struct StatsResetRegi_Descriptor::Stats : public StatsTracker{
+    Stats()
+        : pokemon_caught(m_stats["Pokemon caught"])
+        , pokemon_fainted(m_stats["Pokemon fainted"])
+        , own_fainted(m_stats["Own fainted"])
+        , out_of_balls(m_stats["Out of balls"])
+        , errors(m_stats["Errors"])
+        , total_balls_thrown(m_stats["Total balls thrown"])
+        , matches(m_stats["Matches"])
+    {
+        m_display_order.emplace_back(Stat("Pokemon caught"));
+        m_display_order.emplace_back(Stat("Pokemon fainted"));
+        m_display_order.emplace_back(Stat("Own fainted"));
+        m_display_order.emplace_back(Stat("Out of balls"));
+        m_display_order.emplace_back(Stat("Errors"));
+        m_display_order.emplace_back(Stat("Total balls thrown"));
+        m_display_order.emplace_back(Stat("Matches"));
+    }
+
+    std::atomic<uint64_t>& pokemon_caught;
+    std::atomic<uint64_t>& pokemon_fainted;
+    std::atomic<uint64_t>& own_fainted;
+    std::atomic<uint64_t>& out_of_balls;
+    std::atomic<uint64_t>& errors;
+    std::atomic<uint64_t>& total_balls_thrown;
+    std::atomic<uint64_t>& matches;
+};
+std::unique_ptr<StatsTracker> StatsResetRegi_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+
+
+StatsResetRegi::StatsResetRegi()
+    : GO_HOME_WHEN_DONE(false)
+    , BALL_SELECT(
+        "<b>Ball Select:</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        "master-ball"
+    )
+    , LANGUAGE(
+        "<b>Game Language:</b>",
+        IV_READER().languages(),
+        LockMode::LOCK_WHILE_RUNNING,
+        true
+    )
+    , HP("<b>HP:</b>")
+    , ATTACK("<b>Attack:</b>", IvJudgeFilter::NoGood)
+    , DEFENSE("<b>Defense:</b>")
+    , SPATK("<b>Sp. Atk:</b>")
+    , SPDEF("<b>Sp. Def:</b>")
+    , SPEED("<b>Speed:</b>")
+    , NOTIFICATION_CATCH_SUCCESS("Catch Success", true, false, std::chrono::seconds(3600))
+    , NOTIFICATION_CATCH_FAILED("Catch Failed", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_CATCH_SUCCESS,
+        &NOTIFICATION_CATCH_FAILED,
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+{
+    PA_ADD_OPTION(START_LOCATION);
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+
+    PA_ADD_OPTION(BALL_SELECT);
+    PA_ADD_OPTION(LANGUAGE);
+    PA_ADD_OPTION(HP);
+    PA_ADD_OPTION(ATTACK);
+    PA_ADD_OPTION(DEFENSE);
+    PA_ADD_OPTION(SPATK);
+    PA_ADD_OPTION(SPDEF);
+    PA_ADD_OPTION(SPEED);
+
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+
+
+void StatsResetRegi::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    if (START_LOCATION.start_in_grip_menu()){
+        grip_menu_connect_go_home(context);
+        resume_game_back_out(
+            env.console,
+            context,
+            ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST,
+            1600ms
+        );
+    }else{
+        //  Connect the controller.
+        require_player(env.console, context, BUTTON_B);
+    }
+
+    StatsResetRegi_Descriptor::Stats& stats = env.current_stats<StatsResetRegi_Descriptor::Stats>();
+
+    bool match_found = false;
+    while (!match_found){
+
+        bool regi_caught = false;
+        while (!regi_caught){
+            env.log("Talk to regi.", COLOR_PURPLE);
+            context.wait_for_all_requests();
+            {
+                StandardBattleMenuWatcher fight_detector(false);
+                int result = run_until<ProControllerContext>(
+                    env.console, context,
+                    [](ProControllerContext& context){
+                        while (true){
+                            pbf_press_button(context, BUTTON_A, 80ms, 1000ms);
+                        }
+                    },
+                    {{fight_detector}}
+                );
+                if (result == 0){
+                    env.log("New fight detected, let's begin to throw balls.", COLOR_PURPLE);
+                    pbf_mash_button(context, BUTTON_B, 1000ms);
+                }
+            }
+
+            env.log("Catch regi.", COLOR_PURPLE);
+            CatchResults result = basic_catcher(env.console, context, LANGUAGE, BALL_SELECT.slug(), 999);
+            switch (result.result){
+            case CatchResult::POKEMON_CAUGHT:
+                regi_caught = true;
+                stats.pokemon_caught++;
+                break;
+            case CatchResult::POKEMON_FAINTED:
+                stats.pokemon_fainted++;
+                break;
+            case CatchResult::OWN_FAINTED:
+                stats.own_fainted++;
+                break;
+            case CatchResult::OUT_OF_BALLS:
+                stats.out_of_balls++;
+                break;
+            case CatchResult::BALL_LIMIT_REACHED:
+            case CatchResult::CANNOT_THROW_BALL:
+            case CatchResult::TIMED_OUT:
+                stats.errors++;
+                break;
+            }
+            stats.total_balls_thrown += result.balls_used;
+            env.update_stats();
+
+            if (regi_caught){
+                send_program_status_notification(
+                    env, NOTIFICATION_CATCH_SUCCESS,
+                    "Threw " + std::to_string(result.balls_used) + " ball(s) and caught it."
+                );
+            }else{
+                send_program_status_notification(
+                    env, NOTIFICATION_CATCH_FAILED,
+                    "Threw " + std::to_string(result.balls_used) + " ball(s) and did not catch it."
+                );
+            }
+
+            if (!regi_caught){
+                ssf_press_button(context, BUTTON_HOME, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE0, 160ms);
+                reset_game_from_home_with_inference(
+                    env.console, context,
+                    ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST
+                );
+            }
+        }
+
+        env.log("Check the stats.", COLOR_PURPLE);
+        for (int i = 0; i < 20; i++){
+            pbf_press_button(context, BUTTON_B, 80ms, 1000ms);
+        }
+        pbf_press_button(context, BUTTON_X  , 80ms, 2000ms);
+        pbf_press_dpad  (context, DPAD_RIGHT, 80ms, 500ms);
+        pbf_press_button(context, BUTTON_A  , 80ms, 2000ms);
+        pbf_press_button(context, BUTTON_R  , 80ms, 3000ms);
+        pbf_press_dpad  (context, DPAD_LEFT , 80ms, 1000ms);
+        pbf_press_dpad  (context, DPAD_UP   , 80ms, 1000ms);
+        pbf_press_dpad  (context, DPAD_UP   , 80ms, 1000ms);
+
+        context.wait_for_all_requests();
+        IvJudgeReaderScope reader(env.console, LANGUAGE);
+        IvJudgeReader::Results results = reader.read(env.console, env.console.video().snapshot());
+        bool ok = true;
+        ok &= HP.matches(stats.errors, results.hp);
+        ok &= ATTACK.matches(stats.errors, results.attack);
+        ok &= DEFENSE.matches(stats.errors, results.defense);
+        ok &= SPATK.matches(stats.errors, results.spatk);
+        ok &= SPDEF.matches(stats.errors, results.spdef);
+        ok &= SPEED.matches(stats.errors, results.speed);
+        env.update_stats();
+        match_found = ok;
+
+        if (!match_found){
+            ssf_press_button(context, BUTTON_HOME, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE0, 160ms);
+            reset_game_from_home_with_inference(
+                env.console, context,
+                ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST
+            );
+        }
+    }
+
+    env.log("Result Found!", COLOR_BLUE);
+    stats.matches++;
+
+    env.update_stats();
+    send_program_finished_notification(
+        env, NOTIFICATION_PROGRAM_FINISH,
+        "Found a perfect match!"
+    );
+    GO_HOME_WHEN_DONE.run_end_of_program(context);
+}
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset-Regi.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset-Regi.h
new file mode 100644
index 0000000000..78e9a4694e
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset-Regi.h
@@ -0,0 +1,63 @@
+/*  Stats Reset - Regi
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_StatsResetRegi_H
+#define PokemonAutomation_PokemonSwSh_StatsResetRegi_H
+
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "CommonTools/Options/LanguageOCROption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h"
+#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+#include "Pokemon/Options/Pokemon_IvJudgeOption.h"
+#include "VideoGames/PokemonSwSh/Options/PokemonSwSh_BallSelectOption.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+using namespace Pokemon;
+
+
+class StatsResetRegi_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    StatsResetRegi_Descriptor();
+
+    struct Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+
+
+class StatsResetRegi : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = StatsResetRegi_Descriptor;
+    StatsResetRegi();
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    StartInGripOrGameOption START_LOCATION;
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
+
+    PokemonBallSelectOption BALL_SELECT;
+    OCR::LanguageOCROption LANGUAGE;
+    IVJudgeFilterOption HP;
+    IVJudgeFilterOption ATTACK;
+    IVJudgeFilterOption DEFENSE;
+    IVJudgeFilterOption SPATK;
+    IVJudgeFilterOption SPDEF;
+    IVJudgeFilterOption SPEED;
+
+    EventNotificationOption NOTIFICATION_CATCH_SUCCESS;
+    EventNotificationOption NOTIFICATION_CATCH_FAILED;
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset.cpp
new file mode 100644
index 0000000000..cf517d0ec9
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset.cpp
@@ -0,0 +1,201 @@
+/*  Stats Reset
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "CommonTools/VisualDetectors/BlackScreenDetector.h"
+#include "NintendoSwitch/NintendoSwitch_Settings.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonSwSh/PokemonSwSh_Settings.h"
+#include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_IvJudgeReader.h"
+#include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
+#include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_BoxHelpers.h"
+#include "PokemonSwSh_StatsReset.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+StatsReset_Descriptor::StatsReset_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonSwSh:StatsReset",
+        STRING_POKEMON + " SwSh", "Stats Reset",
+        "Programs/PokemonSwSh/StatsReset.html",
+        "Repeatedly receive gift " + STRING_POKEMON + " until you get the stats you want.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+struct StatsReset_Descriptor::Stats : public StatsTracker{
+    Stats()
+        : attempts(m_stats["Attempts"])
+        , errors(m_stats["Errors"])
+        , matches(m_stats["Matches"])
+    {
+        m_display_order.emplace_back(Stat("Attempts"));
+        m_display_order.emplace_back(Stat("Errors"));
+        m_display_order.emplace_back(Stat("Matches"));
+    }
+
+    std::atomic<uint64_t>& attempts;
+    std::atomic<uint64_t>& errors;
+    std::atomic<uint64_t>& matches;
+};
+std::unique_ptr<StatsTracker> StatsReset_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+
+
+StatsReset::StatsReset()
+    : GO_HOME_WHEN_DONE(false)
+    , LANGUAGE(
+        "<b>Game Language:</b>",
+        IV_READER().languages(),
+        LockMode::LOCK_WHILE_RUNNING
+    )
+    , POKEMON(
+        "<b>Gift " + STRING_POKEMON + ":</b>",
+        {
+            {GiftPokemon::TypeNull, "type-null",    "Type: Null"},
+            {GiftPokemon::Cosmog,   "cosmog",       "Cosmog"},
+            {GiftPokemon::Poipole,  "poipole",      "Poipole"},
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        GiftPokemon::TypeNull
+    )
+    , HP("<b>HP:</b>")
+    , ATTACK("<b>Attack:</b>", IvJudgeFilter::NoGood)
+    , DEFENSE("<b>Defense:</b>")
+    , SPATK("<b>Sp. Atk:</b>")
+    , SPDEF("<b>Sp. Def:</b>")
+    , SPEED("<b>Speed:</b>")
+    , NOTIFICATION_PROGRAM_FINISH("Program Finished", true, true, ImageAttachmentMode::JPG)
+    , NOTIFICATIONS({
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+{
+    PA_ADD_OPTION(START_LOCATION);
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+
+    PA_ADD_OPTION(LANGUAGE);
+    PA_ADD_OPTION(POKEMON);
+    PA_ADD_OPTION(HP);
+    PA_ADD_OPTION(ATTACK);
+    PA_ADD_OPTION(DEFENSE);
+    PA_ADD_OPTION(SPATK);
+    PA_ADD_OPTION(SPDEF);
+    PA_ADD_OPTION(SPEED);
+
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+
+
+void StatsReset::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    if (START_LOCATION.start_in_grip_menu()){
+        grip_menu_connect_go_home(context);
+        resume_game_back_out(
+            env.console,
+            context,
+            ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST,
+            1600ms
+        );
+    }else{
+        //  Connect the controller.
+        require_player(env.console, context, BUTTON_B);
+    }
+
+    StatsReset_Descriptor::Stats& stats = env.current_stats<StatsReset_Descriptor::Stats>();
+
+    VideoSnapshot screen;
+    while (true){
+        env.update_stats();
+
+        context.wait_for_all_requests();
+        {
+            BlackScreenOverWatcher detector;
+            int result = run_until<ProControllerContext>(
+                env.console, context,
+                [this](ProControllerContext& context){
+                    if (POKEMON == GiftPokemon::TypeNull){
+                        pbf_mash_button(context, BUTTON_A, 10s);
+                    }else{
+                        pbf_mash_button(context, BUTTON_A, 5s);
+                    }
+                    pbf_mash_button(context, BUTTON_B, 20s);
+                },
+                {{detector}}
+            );
+            if (result == 0){
+                env.log(STRING_POKEMON + " receive menu detected.", COLOR_PURPLE);
+            }else{
+                env.log(STRING_POKEMON + " receive menu timed out.", COLOR_RED);
+            }
+        }
+        stats.attempts++;
+
+        pbf_mash_button(context, BUTTON_B, 1000ms);
+
+        ssf_press_button(context, BUTTON_X, GameSettings::instance().OVERWORLD_TO_MENU_DELAY0, 160ms);
+        box_scroll(context, DPAD_RIGHT);
+        ssf_press_button(context, BUTTON_A, GameSettings::instance().MENU_TO_POKEMON_DELAY0, 160ms);
+        ssf_press_button(context, BUTTON_R, GameSettings::instance().POKEMON_TO_BOX_DELAY0, 160ms);
+        context.wait_for_all_requests();
+
+        {
+            IvJudgeReaderScope reader(env.console, LANGUAGE);
+            screen = env.console.video().snapshot();
+            IvJudgeReader::Results results = reader.read(env.console, screen);
+            bool ok = true;
+            ok &= HP.matches(stats.errors, results.hp);
+            ok &= ATTACK.matches(stats.errors, results.attack);
+            ok &= DEFENSE.matches(stats.errors, results.defense);
+            ok &= SPATK.matches(stats.errors, results.spatk);
+            ok &= SPDEF.matches(stats.errors, results.spdef);
+            ok &= SPEED.matches(stats.errors, results.speed);
+            if (ok){
+                break;
+            }
+        }
+
+        //  Add a little extra wait time since correctness matters here.
+        ssf_press_button(context, BUTTON_HOME, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE0, 160ms);
+
+        reset_game_from_home_with_inference(
+            env.console, context,
+            ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST
+        );
+    }
+
+    stats.matches++;
+    env.update_stats();
+    env.log("Result Found!", COLOR_BLUE);
+
+    pbf_wait(context, 5000ms);
+    pbf_press_button(context, BUTTON_CAPTURE, 2000ms, 5000ms);
+
+    send_program_finished_notification(
+        env, NOTIFICATION_PROGRAM_FINISH,
+        "Found a match!",
+        screen, false
+    );
+    GO_HOME_WHEN_DONE.run_end_of_program(context);
+}
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset.h
new file mode 100644
index 0000000000..309c2027eb
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset.h
@@ -0,0 +1,69 @@
+/*  Stats Reset
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_StatsReset_H
+#define PokemonAutomation_PokemonSwSh_StatsReset_H
+
+#include "Common/Cpp/Options/EnumDropdownOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "CommonTools/Options/LanguageOCROption.h"
+#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+#include "NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "Pokemon/Options/Pokemon_IvJudgeOption.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+using namespace Pokemon;
+
+
+class StatsReset_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    StatsReset_Descriptor();
+
+    struct Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+
+
+class StatsReset : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = StatsReset_Descriptor;
+    StatsReset();
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    StartInGripOrGameOption START_LOCATION;
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
+
+    OCR::LanguageOCROption LANGUAGE;
+
+    enum class GiftPokemon{
+        TypeNull,
+        Cosmog,
+        Poipole,
+    };
+    EnumDropdownOption<GiftPokemon> POKEMON;
+    
+    IVJudgeFilterOption HP;
+    IVJudgeFilterOption ATTACK;
+    IVJudgeFilterOption DEFENSE;
+    IVJudgeFilterOption SPATK;
+    IVJudgeFilterOption SPDEF;
+    IVJudgeFilterOption SPEED;
+
+    EventNotificationOption NOTIFICATION_PROGRAM_FINISH;
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_OverworldMovement.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_OverworldMovement.cpp
new file mode 100644
index 0000000000..b4ac0d1e0c
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_OverworldMovement.cpp
@@ -0,0 +1,97 @@
+/*  Overworld Movement
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "PokemonSwSh_OverworldMovement.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+void move_in_circle_up(ProControllerContext& context, bool counter_clockwise){
+//    cout << "up" << endl;
+    if (counter_clockwise){
+        pbf_move_left_joystick(context, {+1, 0}, 128ms, 0ms);
+        pbf_move_left_joystick(context, {+1, +1}, 128ms, 0ms);
+        pbf_move_left_joystick(context, {0, +1}, 128ms, 0ms);
+        pbf_move_left_joystick(context, {-1, +1}, 128ms, 0ms);
+        pbf_move_left_joystick(context, {-1, 0}, 128ms, 0ms);
+        pbf_move_left_joystick(context, {-1, -1}, 128ms, 0ms);
+        pbf_move_left_joystick(context, {0, -1}, 128ms, 0ms);
+        pbf_move_left_joystick(context, {+1, -1}, 128ms, 0ms);
+    }else{
+        pbf_move_left_joystick(context, {-1, 0}, 128ms, 0ms);
+        pbf_move_left_joystick(context, {-1, +1}, 128ms, 0ms);
+        pbf_move_left_joystick(context, {0, +1}, 128ms, 0ms);
+        pbf_move_left_joystick(context, {+1, +1}, 128ms, 0ms);
+        pbf_move_left_joystick(context, {+1, 0}, 128ms, 0ms);
+        pbf_move_left_joystick(context, {+1, -1}, 128ms, 0ms);
+        pbf_move_left_joystick(context, {0, -1}, 128ms, 0ms);
+        pbf_move_left_joystick(context, {-1, -1}, 128ms, 0ms);
+    }
+}
+void move_in_circle_down(ProControllerContext& context, bool counter_clockwise){
+    if (counter_clockwise){
+        pbf_move_left_joystick(context, {-1, 0}, 128ms, 0ms);
+        pbf_move_left_joystick(context, {-1, -1}, 128ms, 0ms);
+        pbf_move_left_joystick(context, {0, -1}, 128ms, 0ms);
+        pbf_move_left_joystick(context, {+1, -1}, 128ms, 0ms);
+        pbf_move_left_joystick(context, {+1, 0}, 128ms, 0ms);
+        pbf_move_left_joystick(context, {+1, +1}, 192ms, 0ms);
+        pbf_move_left_joystick(context, {0, +1}, 192ms, 0ms);
+        pbf_move_left_joystick(context, {-1, +1}, 192ms, 0ms);
+    }else{
+        pbf_move_left_joystick(context, {+1, 0}, 128ms, 0ms);
+        pbf_move_left_joystick(context, {+1, -1}, 128ms, 0ms);
+        pbf_move_left_joystick(context, {0, -1}, 128ms, 0ms);
+        pbf_move_left_joystick(context, {-1, -1}, 128ms, 0ms);
+        pbf_move_left_joystick(context, {-1, 0}, 128ms, 0ms);
+        pbf_move_left_joystick(context, {-1, +1}, 192ms, 0ms);
+        pbf_move_left_joystick(context, {0, +1}, 192ms, 0ms);
+        pbf_move_left_joystick(context, {+1, +1}, 192ms, 0ms);
+    }
+}
+void circle_in_place(ProControllerContext& context, bool counter_clockwise){
+    if (counter_clockwise){
+        pbf_move_left_joystick(context, {-1, 0}, 512ms, 0ms);    //  Correct for bias.
+        pbf_move_left_joystick(context, {0, -1}, 256ms, 0ms);
+        pbf_move_left_joystick(context, {+1, -1}, 256ms, 0ms);
+        pbf_move_left_joystick(context, {+1, 0}, 256ms, 0ms);
+        pbf_move_left_joystick(context, {+1, +1}, 256ms, 0ms);
+        pbf_move_left_joystick(context, {0, +1}, 256ms, 0ms);
+        pbf_move_left_joystick(context, {-1, +1}, 256ms, 0ms);
+        pbf_move_left_joystick(context, {-1, 0}, 256ms, 0ms);
+        pbf_move_left_joystick(context, {-1, -1}, 256ms, 0ms);
+        pbf_move_left_joystick(context, {+1, 0}, 128ms, 0ms);  //  Correct for bias.
+    }else{
+        pbf_move_left_joystick(context, {+1, 0}, 512ms, 0ms);  //  Correct for bias.
+        pbf_move_left_joystick(context, {0, -1}, 256ms, 0ms);
+        pbf_move_left_joystick(context, {-1, -1}, 256ms, 0ms);
+        pbf_move_left_joystick(context, {-1, 0}, 256ms, 0ms);
+        pbf_move_left_joystick(context, {-1, +1}, 256ms, 0ms);
+        pbf_move_left_joystick(context, {0, +1}, 256ms, 0ms);
+        pbf_move_left_joystick(context, {+1, +1}, 256ms, 0ms);
+        pbf_move_left_joystick(context, {+1, 0}, 256ms, 0ms);
+        pbf_move_left_joystick(context, {+1, -1}, 256ms, 0ms);
+        pbf_move_left_joystick(context, {-1, 0}, 128ms, 0ms);    //  Correct for bias.
+    }
+}
+void move_in_line(ProControllerContext& context, bool horizontal){
+    if (horizontal){
+        pbf_move_left_joystick(context, {-1, 0}, 1024ms, 256ms);
+        pbf_move_left_joystick(context, {+1, 0}, 1024ms, 256ms);
+    }else{
+        pbf_move_left_joystick(context, {0, -1}, 1024ms, 256ms);
+        pbf_move_left_joystick(context, {0, +1}, 1024ms, 256ms);
+    }
+}
+
+
+}
+}
+}
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_OverworldMovement.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_OverworldMovement.h
new file mode 100644
index 0000000000..2a3eaa865b
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_OverworldMovement.h
@@ -0,0 +1,25 @@
+/*  Overworld Movement
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_OverworldMovement_H
+#define PokemonAutomation_PokemonSwSh_OverworldMovement_H
+
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+void move_in_circle_up(ProControllerContext& context, bool counter_clockwise);
+void move_in_circle_down(ProControllerContext& context, bool counter_clockwise);
+void circle_in_place(ProControllerContext& context, bool counter_clockwise);
+void move_in_line(ProControllerContext& context, bool horizontal);
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_OverworldTargetTracker.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_OverworldTargetTracker.cpp
similarity index 92%
rename from SerialPrograms/Source/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_OverworldTargetTracker.cpp
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_OverworldTargetTracker.cpp
index a77df52504..8ed438603e 100644
--- a/SerialPrograms/Source/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_OverworldTargetTracker.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_OverworldTargetTracker.cpp
@@ -1,13 +1,13 @@
 /*  Overworld Mark Tracker
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include "Common/Cpp/PrettyPrint.h"
 #include "CommonFramework/ImageTypes/ImageViewRGB32.h"
 #include "CommonFramework/VideoPipeline/VideoOverlay.h"
-#include "PokemonSwSh/Inference/PokemonSwSh_MarkFinder.h"
+#include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_MarkFinder.h"
 #include "PokemonSwSh_OverworldTargetTracker.h"
 
 namespace PokemonAutomation{
@@ -56,7 +56,7 @@ void OverworldTargetTracker::set_stop_on_target(bool stop){
     m_stop_on_target.store(stop, std::memory_order_release);
 }
 void OverworldTargetTracker::clear_detections(){
-    SpinLockGuard lg(m_lock, "OverworldTargetTracker::clear_detections()");
+    WriteSpinLock lg(m_lock, "OverworldTargetTracker::clear_detections()");
     m_best_target.first = -1;
     m_detection_boxes.clear();
     m_exclamations.clear();
@@ -64,7 +64,7 @@ void OverworldTargetTracker::clear_detections(){
 }
 bool OverworldTargetTracker::has_good_target(){
 //    m_logger.log("has_good_target()");
-    SpinLockGuard lg(m_lock, "OverworldTargetTracker::has_good_target()");
+    ReadSpinLock lg(m_lock, "OverworldTargetTracker::has_good_target()");
     if (m_best_target.first < 0){
 //        m_logger.log("has_good_target(): < 0");
         return false;
@@ -72,8 +72,8 @@ bool OverworldTargetTracker::has_good_target(){
 //    m_logger.log("has_good_target(): " + std::to_string(m_best_target.first));
     return m_best_target.first <= m_max_alpha;
 }
-std::pair<double, OverworldTarget> OverworldTargetTracker::best_target(){
-    SpinLockGuard lg(m_lock, "OverworldTargetTracker::best_target()");
+std::pair<double, OverworldTarget> OverworldTargetTracker::best_target() const{
+    ReadSpinLock lg(m_lock, "OverworldTargetTracker::best_target()");
     return m_best_target;
 }
 
@@ -108,7 +108,7 @@ void OverworldTargetTracker::populate_targets(
             }
             overlap += (max_x - min_x) * (max_y - min_y);
         }
-        double score = targets[c].trajectory.distance_in_ticks / overlap;
+        double score = targets[c].trajectory.distance_in_millis.count() / (overlap * 8);
         scored_targets.emplace(score, targets[c]);
 //        cout << "    " << score << " = "
 //             << (int)targets[c].trajectory.joystick_x << ", "
@@ -144,7 +144,7 @@ bool OverworldTargetTracker::save_target(std::multimap<double, OverworldTarget>:
         COLOR_ORANGE
     );
 #endif
-//    SpinLockGuard lg(m_lock, "OverworldTargetTracker::save_target()");
+//    WriteSpinLock lg(m_lock, "OverworldTargetTracker::save_target()");
     m_best_target = *target;
     return target->first <= m_max_alpha && m_stop_on_target.load(std::memory_order_acquire);
 //    return target->first <= m_max_alpha;
@@ -157,7 +157,7 @@ bool OverworldTargetTracker::process_frame(const ImageViewRGB32& frame, WallCloc
     std::vector<ImagePixelBox> question_marks = find_question_marks(image);
 //    question_marks.clear();
 
-    SpinLockGuard lg(m_lock, "OverworldTargetTracker::on_frame()");
+    WriteSpinLock lg(m_lock, "OverworldTargetTracker::on_frame()");
 
     //  Clear out old detections.
     auto oldest = timestamp - m_window;
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_OverworldTargetTracker.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_OverworldTargetTracker.h
similarity index 85%
rename from SerialPrograms/Source/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_OverworldTargetTracker.h
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_OverworldTargetTracker.h
index 957a0346d7..3fbdbe9b83 100644
--- a/SerialPrograms/Source/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_OverworldTargetTracker.h
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_OverworldTargetTracker.h
@@ -1,6 +1,6 @@
 /*  Overworld Target Tracker
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -10,11 +10,11 @@
 #include <vector>
 #include <deque>
 #include <map>
+#include "Common/Cpp/Logging/AbstractLogger.h"
 #include "Common/Cpp/Concurrency/SpinLock.h"
-#include "CommonFramework/Logging/Logger.h"
 #include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
-#include "CommonFramework/InferenceInfra/VisualInferenceCallback.h"
-#include "PokemonSwSh/Programs/OverworldBot/PokemonSwSh_OverworldTrajectory.h"
+#include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
+#include "VideoGames/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_OverworldTrajectory.h"
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
@@ -69,7 +69,7 @@ class OverworldTargetTracker : public VisualInferenceCallback{
 
     //  Get the best target as of right now.
     //  The return value is only valid if the first element is non-negative.
-    std::pair<double, OverworldTarget> best_target();
+    std::pair<double, OverworldTarget> best_target() const;
 
     virtual void make_overlays(VideoOverlaySet& items) const override;
     virtual bool process_frame(const ImageViewRGB32& frame, WallClock timestamp) override final;
@@ -110,7 +110,7 @@ class OverworldTargetTracker : public VisualInferenceCallback{
     std::deque<Mark> m_questions;
 
     std::atomic<bool> m_stop_on_target;
-    SpinLock m_lock;
+    mutable SpinLock m_lock;
     std::pair<double, OverworldTarget> m_best_target;
 };
 
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_OverworldTrajectory.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_OverworldTrajectory.cpp
new file mode 100644
index 0000000000..0c2e736010
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_OverworldTrajectory.cpp
@@ -0,0 +1,77 @@
+/*  Overworld Trajectory
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <algorithm>
+#include <cmath>
+#include "PokemonSwSh_OverworldTrajectory.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+
+const Trajectory TRAJECTORY_TABLE[8][6] = {
+    {{400,128,  0},{420,160,  0},{420,190,  0},{480,208,  0},{480,208,  0},{480,208,  0},},
+    {{210,128,  0},{220,164,  0},{250,200,  0},{280,208,  0},{300,209,  0},{320,209,  0},},
+    {{120,128,  0},{120,192,  0},{140,209,  0},{180,224,  0},{220,224,  0},{260,232,  0},},
+    {{ 60,128,  0},{ 65,224,  0},{ 95,255, 32},{125,255, 48},{160,255, 48},{200,255, 48},},
+    {{  0,128,128},{ 40,255,110},{ 70,255,105},{100,255,100},{130,255, 95},{160,255, 90},},
+    {{ 35,128,255},{ 45,255,255},{ 70,255,170},{ 90,255,160},{115,255,140},{140,255,128},},
+    {{ 55,128,255},{ 60,192,255},{ 75,255,255},{ 90,255,192},{110,255,176},{135,255,144},},
+    {{ 75,128,255},{ 80,160,255},{ 85,216,255},{ 95,255,224},{115,255,192},{130,255,176},},
+};
+Trajectory get_trajectory_int(int delta_x, int delta_y){
+    delta_x = std::max(delta_x, -5);
+    delta_x = std::min(delta_x, +5);
+    delta_y = std::max(delta_y, -4);
+    delta_y = std::min(delta_y, +3);
+
+    if (delta_x < 0){
+        Trajectory entry = get_trajectory_int(-delta_x, delta_y);
+        entry.joystick_fx = -entry.joystick_fx;
+        return entry;
+    }
+
+    return TRAJECTORY_TABLE[delta_y + 4][delta_x];
+}
+Trajectory get_trajectory_float(double delta_x, double delta_y){
+    delta_x *= 10;
+    delta_y *= 10;
+
+    int int_x = (int)std::floor(delta_x);
+    int int_y = (int)std::floor(delta_y);
+
+    double frac_x = delta_x - int_x;
+    double frac_y = delta_y - int_y;
+
+    Trajectory corner11 = get_trajectory_int(int_x, int_y);
+    Trajectory corner01 = get_trajectory_int(int_x + 1, int_y);
+    Trajectory corner10 = get_trajectory_int(int_x, int_y + 1);
+    Trajectory corner00 = get_trajectory_int(int_x + 1, int_y + 1);
+
+    double top_x = corner11.joystick_fx * (1.0 - frac_x) + corner01.joystick_fx * frac_x;
+    double bot_x = corner10.joystick_fx * (1.0 - frac_x) + corner00.joystick_fx * frac_x;
+    double x = top_x * (1.0 - frac_y) + bot_x * frac_y;
+//    cout << "top_x = " << top_x << endl;
+//    cout << "bot_x = " << bot_x << endl;
+//    cout << "x = " << x << endl;
+
+    double top_y = corner11.joystick_fy * (1.0 - frac_y) + corner10.joystick_fy * frac_y;
+    double bot_y = corner01.joystick_fy * (1.0 - frac_y) + corner00.joystick_fy * frac_y;
+    double y = top_y * (1.0 - frac_x) + bot_y * frac_x;
+
+    double top_d = corner11.distance_in_millis.count() * (1.0 - frac_x) + corner01.distance_in_millis.count() * frac_x;
+    double bot_d = corner10.distance_in_millis.count() * (1.0 - frac_x) + corner00.distance_in_millis.count() * frac_x;
+    double d = top_d * (1.0 - frac_y) + bot_d * frac_y;
+
+    return Trajectory{nullptr, Milliseconds((int64_t)d), x, y};
+}
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_OverworldTrajectory.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_OverworldTrajectory.h
new file mode 100644
index 0000000000..305fbef2cd
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_OverworldTrajectory.h
@@ -0,0 +1,54 @@
+/*  Overworld Trajectory
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_OverworldTrajectory_H
+#define PokemonAutomation_PokemonSwSh_OverworldTrajectory_H
+
+#include <stdint.h>
+#include "Common/Cpp/Time.h"
+#include "Controllers/JoystickTools.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+struct Trajectory{
+    Milliseconds distance_in_millis;
+    double joystick_fx;
+    double joystick_fy;
+
+    Trajectory() = default;
+
+    //  Old constructor for TRAJECTORY_TABLE.
+    Trajectory(
+        uint16_t distance_in_ticks,
+        uint8_t joystick_x,
+        uint8_t joystick_y
+    )
+        : distance_in_millis(distance_in_ticks * Milliseconds(8))
+        , joystick_fx(JoystickTools::linear_u8_to_float(joystick_x))
+        , joystick_fy(-JoystickTools::linear_u8_to_float(joystick_y))
+    {}
+
+    Trajectory(
+        void*,
+        Milliseconds distance_in_millis,
+        double joystick_x,
+        double joystick_y
+    )
+        : distance_in_millis(distance_in_millis)
+        , joystick_fx(joystick_x)
+        , joystick_fy(joystick_y)
+    {}
+};
+
+Trajectory get_trajectory_float(double delta_x, double delta_y);
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_OverworldTrigger.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_OverworldTrigger.cpp
new file mode 100644
index 0000000000..6b449f4ff1
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_OverworldTrigger.cpp
@@ -0,0 +1,103 @@
+/*  Overworld Trigger
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+#include "Common/Cpp/Exceptions.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "PokemonSwSh_OverworldMovement.h"
+#include "PokemonSwSh_OverworldTrigger.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+OverworldTrigger::OverworldTrigger(OverworldTargetTracker& target_tracker)
+    : m_target_tracker(target_tracker)
+{}
+void OverworldTrigger::whistle(ProControllerContext& context, bool rotate){
+    context.wait_for_all_requests();
+    m_target_tracker.set_stop_on_target(false);
+
+    if (rotate){
+        pbf_move_right_joystick(context, {+0.5, -1}, 400ms, 560ms);
+    }
+    pbf_press_button(context, BUTTON_LCLICK, 40ms, 0ms);
+    pbf_mash_button(context, BUTTON_B, 960ms);
+
+    context.wait_for_all_requests();
+    m_target_tracker.set_stop_on_target(true);
+    if (m_target_tracker.has_good_target()){
+        throw OperationCancelledException();
+    }
+
+    pbf_mash_button(context, BUTTON_B, 320ms);
+
+    context.wait_for_all_requests();
+    m_target_tracker.set_stop_on_target(false);
+}
+
+
+void OverworldTrigger_Whistle::run(ProControllerContext& context){
+    whistle(context, !m_first_after_battle);
+    m_first_after_battle = false;
+}
+
+
+OverworldTrigger_WhistleStaticAction::OverworldTrigger_WhistleStaticAction(
+    OverworldTargetTracker& target_tracker,
+    bool whistle_first,
+    size_t whistle_count,
+    size_t action_count
+)
+    : OverworldTrigger(target_tracker)
+    , m_whistle_first(whistle_first)
+    , m_whistle_count(whistle_count)
+    , m_action_count(action_count)
+{}
+void OverworldTrigger_WhistleStaticAction::run(ProControllerContext& context){
+    if (m_whistle_first){
+        whistle_loop(context);
+        action_loop(context);
+    }else{
+        action_loop(context);
+        whistle_loop(context);
+    }
+}
+void OverworldTrigger_WhistleStaticAction::whistle_loop(ProControllerContext& context){
+    for (size_t c = 0; c < m_whistle_count; c++){
+        whistle(context, !m_first_after_battle);
+        m_first_after_battle = false;
+    }
+}
+void OverworldTrigger_WhistleStaticAction::action_loop(ProControllerContext& context){
+    m_target_tracker.set_stop_on_target(true);
+    context.wait_for_all_requests();
+    for (size_t c = 0; c < m_action_count; c++){
+        action(context);
+        m_first_after_battle = false;
+    }
+    context.wait_for_all_requests();
+    m_target_tracker.set_stop_on_target(false);
+}
+
+
+void OverworldTrigger_WhistleCircle::action(ProControllerContext& context){
+    circle_in_place(context, rand() % 2);
+}
+void OverworldTrigger_WhistleHorizontal::action(ProControllerContext& context){
+    move_in_line(context, true);
+}
+void OverworldTrigger_WhistleVertical::action(ProControllerContext& context){
+    move_in_line(context, false);
+}
+
+
+
+}
+}
+}
+
+
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_OverworldTrigger.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_OverworldTrigger.h
new file mode 100644
index 0000000000..a00c6b97af
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_OverworldTrigger.h
@@ -0,0 +1,94 @@
+/*  Overworld Trigger
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_OverworldTrigger_H
+#define PokemonAutomation_PokemonSwSh_OverworldTrigger_H
+
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+#include "PokemonSwSh_OverworldTargetTracker.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+class OverworldTrigger{
+public:
+    OverworldTrigger(OverworldTargetTracker& target_tracker);
+    virtual ~OverworldTrigger() = default;
+
+    virtual void run(ProControllerContext& context) = 0;
+
+protected:
+    void whistle(ProControllerContext& context, bool rotate);
+
+protected:
+    OverworldTargetTracker& m_target_tracker;
+};
+
+
+
+class OverworldTrigger_Whistle : public OverworldTrigger{
+public:
+    using OverworldTrigger::OverworldTrigger;
+    virtual void run(ProControllerContext& context) override;
+
+private:
+    bool m_first_after_battle = true;
+};
+
+
+class OverworldTrigger_WhistleStaticAction : public OverworldTrigger{
+public:
+    OverworldTrigger_WhistleStaticAction(
+        OverworldTargetTracker& target_tracker,
+        bool whistle_first,
+        size_t whistle_count,
+        size_t action_count
+    );
+    virtual void run(ProControllerContext& context) override;
+
+protected:
+    virtual void action(ProControllerContext& context) = 0;
+
+private:
+    void whistle_loop(ProControllerContext& context);
+    void action_loop(ProControllerContext& context);
+
+private:
+    bool m_whistle_first;
+    size_t m_whistle_count;
+    size_t m_action_count;
+    bool m_first_after_battle = true;
+};
+
+
+class OverworldTrigger_WhistleCircle : public OverworldTrigger_WhistleStaticAction{
+public:
+    using OverworldTrigger_WhistleStaticAction::OverworldTrigger_WhistleStaticAction;
+    virtual void action(ProControllerContext& context) override;
+};
+
+
+class OverworldTrigger_WhistleHorizontal : public OverworldTrigger_WhistleStaticAction{
+public:
+    using OverworldTrigger_WhistleStaticAction::OverworldTrigger_WhistleStaticAction;
+    virtual void action(ProControllerContext& context) override;
+};
+
+
+class OverworldTrigger_WhistleVertical : public OverworldTrigger_WhistleStaticAction{
+public:
+    using OverworldTrigger_WhistleStaticAction::OverworldTrigger_WhistleStaticAction;
+    virtual void action(ProControllerContext& context) override;
+};
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_ShinyHuntAutonomous-Overworld.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_ShinyHuntAutonomous-Overworld.cpp
new file mode 100644
index 0000000000..146aaaa9d4
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_ShinyHuntAutonomous-Overworld.cpp
@@ -0,0 +1,456 @@
+/*  Shiny Hunt Autonomous - Overworld
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <cmath>
+#include "Common/Cpp/PrettyPrint.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/NintendoSwitch_Settings.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "VideoGames/PokemonSwSh/PokemonSwSh_Settings.h"
+#include "VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.h"
+#include "VideoGames/PokemonSwSh/ShinyHuntTracker.h"
+#include "VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_StartBattleDetector.h"
+#include "VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleMenuDetector.h"
+#include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
+#include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_EncounterHandler.h"
+#include "PokemonSwSh_OverworldMovement.h"
+#include "PokemonSwSh_OverworldTrajectory.h"
+#include "PokemonSwSh_OverworldTrigger.h"
+#include "PokemonSwSh_ShinyHuntAutonomous-Overworld.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+ShinyHuntAutonomousOverworld_Descriptor::ShinyHuntAutonomousOverworld_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonSwSh:ShinyHuntAutonomousOverworld",
+        STRING_POKEMON + " SwSh", "Shiny Hunt Autonomous - Overworld",
+        "Programs/PokemonSwSh/ShinyHuntAutonomous-Overworld.html",
+        "Automatically shiny hunt overworld " + STRING_POKEMON + " with video feedback.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+struct ShinyHuntAutonomousOverworld_Descriptor::Stats : public ShinyHuntTracker{
+    Stats()
+        : ShinyHuntTracker(true)
+        , m_resets(m_stats["Resets"])
+    {
+        m_display_order.insert(m_display_order.begin() + 2, Stat("Resets"));
+        m_aliases["Unexpected Battles"] = "Errors";
+    }
+    std::atomic<uint64_t>& m_resets;
+};
+std::unique_ptr<StatsTracker> ShinyHuntAutonomousOverworld_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+
+
+ShinyHuntAutonomousOverworld::ShinyHuntAutonomousOverworld()
+    : GO_HOME_WHEN_DONE(false)
+    , TIME_ROLLBACK_HOURS(
+        "<b>Time Rollback (in hours):</b><br>Periodically roll back the time to keep the weather the same. If set to zero, this feature is disabled.",
+        LockMode::LOCK_WHILE_RUNNING,
+        1, 0, 11
+    )
+    , MARK_OFFSET(
+        "<b>Mark Offset:</b><br>Aim this far below the bottom of the exclamation/question mark. 1.0 is the height of the mark. "
+        "Increase this value when the " + STRING_POKEMON + " are large.",
+        LockMode::LOCK_WHILE_RUNNING,
+        0.5, 0, 20
+    )
+    , MARK_PRIORITY(
+        "<b>Mark Priority:</b><br>Favor exclamation marks or question marks?",
+        {
+            {MarkPriority::EXCLAMATION_ONLY,        "exclamation-only",         "Exclamation Marks Only (Ignore Question Marks)"},
+            {MarkPriority::PRIORITIZE_EXCLAMATION,  "prioritize-exclamation",   "Prioritize Exclamation Marks"},
+            {MarkPriority::NO_PREFERENCE,           "no-preference",            "No Preference"},
+            {MarkPriority::PRIORITIZE_QUESTION,     "prioritize-question",      "Prioritize Question Marks"},
+            {MarkPriority::QUESTION_ONLY,           "question-only",            "Question Marks Only (Ignore Exclamation Marks)"},
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        MarkPriority::PRIORITIZE_EXCLAMATION
+    )
+    , TRIGGER_METHOD(
+        "<b>Trigger Method:</b><br>How to trigger an overworld reaction mark?",
+        {
+            {TriggerMethod::WhistleOnly,            "whistle-only",         "Whistle Only"},
+            {TriggerMethod::Whistle3Circle1,        "whistle3-circle1",     "Whistle 3 times, then circle once."},
+            {TriggerMethod::Circle3Whistle3,        "circle3-whistle3",     "Circle 3 times, then whistle 3 times."},
+            {TriggerMethod::CircleOnly,             "circle-only",          "Circle Only"},
+            {TriggerMethod::Horizontal,             "horizontal",           "Horizontal Line Only"},
+            {TriggerMethod::Whistle3Horizontal1,    "whistle3-horizontal1", "Whistle 3 times, then do horizontal line once."},
+            {TriggerMethod::Horizontal3Whistle3,    "horizontal3-whistle3", "Do horizontal line 3 times, then whistle 3 times."},
+            {TriggerMethod::Vertical,               "vertical",             "Vertical Line Only"},
+            {TriggerMethod::Whistle3Vertical1,      "whistle3-vertical1",   "Whistle 3 times, then do vertical line once."},
+            {TriggerMethod::Vertical3Whistle3,      "vertical3-whistle3",   "Do vertical line 3 times, then whistle 3 times."},
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        TriggerMethod::Whistle3Circle1
+    )
+    , MAX_MOVE_DURATION0(
+        "<b>Maximum Move Duration:</b><br>Do not move in the same direction for more than this long."
+        " If you set this too high, you may wander too far from the grassy area.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "1600 ms"
+    )
+    , MAX_TARGET_ALPHA(
+        "<b>Max Target Alpha:</b><br>Ignore all targets with alpha larger than this. Set to zero to ignore all marks.",
+        LockMode::LOCK_WHILE_RUNNING,
+        70000, 0
+    )
+    , ENCOUNTER_BOT_OPTIONS(true, true)
+    , NOTIFICATIONS({
+        &ENCOUNTER_BOT_OPTIONS.NOTIFICATION_NONSHINY,
+        &ENCOUNTER_BOT_OPTIONS.NOTIFICATION_SHINY,
+        &ENCOUNTER_BOT_OPTIONS.NOTIFICATION_CATCH_SUCCESS,
+        &ENCOUNTER_BOT_OPTIONS.NOTIFICATION_CATCH_FAILED,
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+    , m_advanced_options(
+        "<font size=4><b>Advanced Options:</b> You should not need to touch anything below here.</font>"
+    )
+    , WATCHDOG_TIMER0(
+        "<b>Watchdog Timer:</b><br>Reset the game if you go this long without any encounters.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "60 s"
+    )
+    , EXIT_BATTLE_TIMEOUT0(
+        "<b>Exit Battle Timeout:</b><br>After running, wait this long to return to overworld.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "10 s"
+    )
+    , TARGET_CIRCLING(
+        "<b>Target Circling:</b><br>After moving towards a " + STRING_POKEMON + ", make a circle."
+        " This increases the chance of encountering the " + STRING_POKEMON + " if it has moved or if the trajectory missed.",
+        LockMode::LOCK_WHILE_RUNNING,
+        true
+    )
+{
+    PA_ADD_OPTION(START_LOCATION);
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+    PA_ADD_OPTION(TIME_ROLLBACK_HOURS);
+
+    PA_ADD_OPTION(LANGUAGE);
+    PA_ADD_OPTION(MARK_OFFSET);
+    PA_ADD_OPTION(MARK_PRIORITY);
+    PA_ADD_OPTION(TRIGGER_METHOD);
+    PA_ADD_OPTION(MAX_MOVE_DURATION0);
+    PA_ADD_OPTION(MAX_TARGET_ALPHA);
+
+    PA_ADD_OPTION(ENCOUNTER_BOT_OPTIONS);
+    PA_ADD_OPTION(NOTIFICATIONS);
+
+    PA_ADD_STATIC(m_advanced_options);
+    PA_ADD_OPTION(WATCHDOG_TIMER0);
+    PA_ADD_OPTION(EXIT_BATTLE_TIMEOUT0);
+    PA_ADD_OPTION(TARGET_CIRCLING);
+}
+
+
+
+
+bool ShinyHuntAutonomousOverworld::find_encounter(
+    VideoStream& stream, ProControllerContext& context,
+    ShinyHuntAutonomousOverworld_Descriptor::Stats& stats,
+    WallClock expiration
+) const{
+    OverlayBoxScope self(
+        stream.overlay(),
+        {
+            OverworldTargetTracker::OVERWORLD_CENTER_X - 0.02,
+            OverworldTargetTracker::OVERWORLD_CENTER_Y - 0.05,
+            0.04,
+            0.1
+        },
+        COLOR_CYAN
+    );
+
+    OverworldTargetTracker target_tracker(
+        stream.logger(), stream.overlay(),
+        std::chrono::milliseconds(1000),
+        MARK_OFFSET,
+        MARK_PRIORITY,
+        MAX_TARGET_ALPHA
+    );
+
+    std::unique_ptr<OverworldTrigger> trigger;
+    switch (TRIGGER_METHOD){
+    case TriggerMethod::WhistleOnly:
+        trigger.reset(new OverworldTrigger_Whistle(target_tracker));
+        break;
+    case TriggerMethod::Whistle3Circle1:
+        trigger.reset(new OverworldTrigger_WhistleCircle(target_tracker, true, 3, 1));
+        break;
+    case TriggerMethod::Circle3Whistle3:
+        trigger.reset(new OverworldTrigger_WhistleCircle(target_tracker, false, 3, 3));
+        break;
+    case TriggerMethod::CircleOnly:
+        trigger.reset(new OverworldTrigger_WhistleCircle(target_tracker, false, 0, 1));
+        break;
+    case TriggerMethod::Horizontal:
+        trigger.reset(new OverworldTrigger_WhistleHorizontal(target_tracker, false, 0, 1));
+        break;
+    case TriggerMethod::Whistle3Horizontal1:
+        trigger.reset(new OverworldTrigger_WhistleHorizontal(target_tracker, true, 3, 1));
+        break;
+    case TriggerMethod::Horizontal3Whistle3:
+        trigger.reset(new OverworldTrigger_WhistleHorizontal(target_tracker, false, 3, 3));
+        break;
+    case TriggerMethod::Vertical:
+        trigger.reset(new OverworldTrigger_WhistleVertical(target_tracker, false, 0, 1));
+        break;
+    case TriggerMethod::Whistle3Vertical1:
+        trigger.reset(new OverworldTrigger_WhistleVertical(target_tracker, true, 3, 1));
+        break;
+    case TriggerMethod::Vertical3Whistle3:
+        trigger.reset(new OverworldTrigger_WhistleVertical(target_tracker, false, 3, 3));
+        break;
+    }
+
+    while (true){
+        //  Time expired.
+        if (current_time() > expiration){
+            return false;
+        }
+
+        target_tracker.clear_detections();
+
+        //  Run trigger.
+        {
+            StandardBattleMenuWatcher battle_menu_detector(false);
+            StartBattleWatcher start_battle_detector;
+
+            int result = run_until<ProControllerContext>(
+                stream, context,
+                [&](ProControllerContext& context){
+                    trigger->run(context);
+                },
+                {
+                    {battle_menu_detector},
+                    {start_battle_detector},
+                    {target_tracker},
+                }
+            );
+
+            switch (result){
+            case 0:
+                stream.log("Unexpected Battle.", COLOR_RED);
+                run_away(stream, context, EXIT_BATTLE_TIMEOUT0);
+                return false;
+            case 1:
+                stream.log("Battle started!");
+                return true;
+            }
+        }
+
+        std::pair<double, OverworldTarget> target = target_tracker.best_target();
+        target_tracker.clear_detections();
+
+//        env.log("target: " + std::to_string(target.first));
+
+        if (target.first < 0){
+            stream.log("No targets found.", COLOR_ORANGE);
+            continue;
+        }
+        if (target.first > MAX_TARGET_ALPHA){
+            stream.log(
+                std::string("Target too Weak: ") +
+                (target.second.mark == OverworldMark::EXCLAMATION_MARK ? "Exclamation" : "Question") +
+                " at [" +
+                tostr_default(target.second.delta_x) + " , " +
+                tostr_default(-target.second.delta_y) + "], alpha = " +
+                tostr_default(target.first),
+                COLOR_ORANGE
+            );
+            continue;
+        }
+
+        if (charge_at_target(stream, context, target)){
+            return true;
+        }
+    }
+}
+
+
+bool ShinyHuntAutonomousOverworld::charge_at_target(
+    VideoStream& stream, ProControllerContext& context,
+    const std::pair<double, OverworldTarget>& target
+) const{
+    OverlayBoxScope target_box(stream.overlay(), target.second.box, COLOR_YELLOW);
+    stream.log(
+        std::string("Best Target: ") +
+        (target.second.mark == OverworldMark::EXCLAMATION_MARK ? "Exclamation" : "Question") +
+        " at [" +
+        tostr_default(target.second.delta_x) + " , " +
+        tostr_default(-target.second.delta_y) + "], alpha = " +
+        tostr_default(target.first),
+        COLOR_PURPLE
+    );
+
+    const Trajectory& trajectory = target.second.trajectory;
+    double stick_x = trajectory.joystick_fx;
+    double stick_y = trajectory.joystick_fy;
+    double angle = std::atan2(stick_y, stick_x) * 57.295779513082320877;
+    stream.log(
+        "Trajectory: Distance = " + std::to_string(trajectory.distance_in_millis.count()) +
+        "ms, Direction = " + tostr_default(angle) + " degrees"
+    );
+
+    Milliseconds duration = trajectory.distance_in_millis + 128ms;
+    duration = std::min<Milliseconds>(duration, MAX_MOVE_DURATION0);
+
+
+    StandardBattleMenuWatcher battle_menu_detector(false);
+    StartBattleWatcher start_battle_detector;
+    OverworldTargetTracker target_tracker(
+        stream.logger(), stream.overlay(),
+        std::chrono::milliseconds(1000),
+        MARK_OFFSET,
+        MARK_PRIORITY,
+        MAX_TARGET_ALPHA
+    );
+
+    int result = run_until<ProControllerContext>(
+        stream, context,
+        [&](ProControllerContext& context){
+            //  Move to target.
+            pbf_move_left_joystick(
+                context,
+                {stick_x, stick_y},
+                duration, 0ms
+            );
+
+            //  Circle Maneuver
+            if (TARGET_CIRCLING){
+                if (trajectory.joystick_fy > 0.5 &&
+                    -0.5 <= trajectory.joystick_fx && trajectory.joystick_fx <= 0.5
+                ){
+                    move_in_circle_up(context, trajectory.joystick_fx > 0);
+                }else{
+                    move_in_circle_down(context, trajectory.joystick_fx <= 0);
+                }
+            }
+        },
+        {
+            {battle_menu_detector},
+            {start_battle_detector},
+            {target_tracker},
+        }
+    );
+
+    switch (result){
+    case 0:
+        stream.log("Unexpected Battle.", COLOR_RED);
+        return true;
+    case 1:
+        stream.log("Battle started!");
+        return true;
+    default:
+        return false;
+    }
+}
+
+
+
+
+
+
+void ShinyHuntAutonomousOverworld::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    srand((unsigned)time(nullptr));
+
+    if (START_LOCATION.start_in_grip_menu()){
+        grip_menu_connect_go_home(context);
+        resume_game_back_out(
+            env.console,
+            context,
+            ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST,
+            1600ms
+        );
+    }else{
+        //  Connect the controller.
+        require_player(env.console, context, BUTTON_B);
+    }
+    pbf_move_right_joystick(context, {0, -1}, 1000ms, 0ms);
+
+    WallDuration TIMEOUT = WATCHDOG_TIMER0;
+    WallDuration PERIOD = std::chrono::hours(TIME_ROLLBACK_HOURS);
+    WallClock last_touch = current_time();
+
+    ShinyHuntAutonomousOverworld_Descriptor::Stats& stats = env.current_stats<ShinyHuntAutonomousOverworld_Descriptor::Stats>();
+    env.update_stats();
+
+    StandardEncounterHandler handler(
+        env, env.console, context,
+        LANGUAGE,
+        ENCOUNTER_BOT_OPTIONS,
+        stats
+    );
+
+    //  Encounter Loop
+    auto last = current_time();
+    while (true){
+        //  Touch the date.
+        if (TIME_ROLLBACK_HOURS > 0 && current_time() - last_touch >= PERIOD){
+            pbf_press_button(context, BUTTON_HOME, 160ms, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE0);
+            rollback_hours_from_home(env.console, context, TIME_ROLLBACK_HOURS, ConsoleSettings::instance().SETTINGS_TO_HOME_DELAY0);
+            resume_game_no_interact(env.console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST);
+            last_touch += PERIOD;
+        }
+
+        auto now = current_time();
+        if (now - last > TIMEOUT){
+            pbf_press_button(context, BUTTON_HOME, 160ms, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE0);
+            reset_game_from_home_with_inference(
+                env.console, context,
+                ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST
+            );
+            stats.m_resets++;
+            last = current_time();
+            continue;
+        }
+
+        context.wait_for_all_requests();
+
+        bool battle = find_encounter(env.console, context, stats, last + TIMEOUT);
+        if (!battle){
+            continue;
+        }
+
+        //  Detect shiny.
+        ShinyDetectionResult result = detect_shiny_battle(
+            env.console, context,
+            SHINY_BATTLE_REGULAR,
+            std::chrono::seconds(30)
+        );
+//        shininess = ShinyDetection::SQUARE_SHINY;
+
+        bool stop = handler.handle_standard_encounter_end_battle(result, EXIT_BATTLE_TIMEOUT0);
+        if (stop){
+            break;
+        }
+
+        last = current_time();
+    }
+
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+    GO_HOME_WHEN_DONE.run_end_of_program(context);
+}
+
+
+
+}
+}
+}
+
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_ShinyHuntAutonomous-Overworld.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_ShinyHuntAutonomous-Overworld.h
similarity index 76%
rename from SerialPrograms/Source/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_ShinyHuntAutonomous-Overworld.h
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_ShinyHuntAutonomous-Overworld.h
index fe68dcb032..5f303d9aa0 100644
--- a/SerialPrograms/Source/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_ShinyHuntAutonomous-Overworld.h
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_ShinyHuntAutonomous-Overworld.h
@@ -1,6 +1,6 @@
 /*  Shiny Hunt Autonomous - Overworld
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -12,19 +12,21 @@
 #include "Common/Cpp/Options/SimpleIntegerOption.h"
 #include "Common/Cpp/Options/FloatingPointOption.h"
 #include "Common/Cpp/Options/EnumDropdownOption.h"
-#include "Common/Cpp/Options/TimeExpressionOption.h"
+#include "Common/Cpp/Options/TimeDurationOption.h"
 #include "CommonFramework/Notifications/EventNotificationsTable.h"
 #include "NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h"
 #include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
 #include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
 #include "Pokemon/Options/Pokemon_EncounterBotOptions.h"
-#include "PokemonSwSh/Options/PokemonSwSh_EncounterBotCommon.h"
+#include "VideoGames/PokemonSwSh/Options/PokemonSwSh_EncounterBotCommon.h"
 #include "PokemonSwSh_OverworldTargetTracker.h"
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
 namespace PokemonSwSh{
 
+using namespace Pokemon;
+
 
 class ShinyHuntAutonomousOverworld_Descriptor : public SingleSwitchProgramDescriptor{
 public:
@@ -38,19 +40,20 @@ class ShinyHuntAutonomousOverworld_Descriptor : public SingleSwitchProgramDescri
 
 class ShinyHuntAutonomousOverworld : public SingleSwitchProgramInstance{
 public:
+    using Descriptor = ShinyHuntAutonomousOverworld_Descriptor;
     ShinyHuntAutonomousOverworld();
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
 
 
 private:
     bool find_encounter(
-        ConsoleHandle& console, BotBaseContext& context,
+        VideoStream& stream, ProControllerContext& context,
         ShinyHuntAutonomousOverworld_Descriptor::Stats& stats,
         WallClock expiration
     ) const;
 
     bool charge_at_target(
-        ConsoleHandle& console, BotBaseContext& context,
+        VideoStream& stream, ProControllerContext& context,
         const std::pair<double, OverworldTarget>& target
     ) const;
 
@@ -78,7 +81,7 @@ class ShinyHuntAutonomousOverworld : public SingleSwitchProgramInstance{
     };
     EnumDropdownOption<TriggerMethod> TRIGGER_METHOD;
 
-    TimeExpressionOption<uint16_t> MAX_MOVE_DURATION;
+    MillisecondsOption MAX_MOVE_DURATION0;
     FloatingPointOption MAX_TARGET_ALPHA;
 
     EncounterBotCommonOptions ENCOUNTER_BOT_OPTIONS;
@@ -86,8 +89,8 @@ class ShinyHuntAutonomousOverworld : public SingleSwitchProgramInstance{
     EventNotificationsOption NOTIFICATIONS;
 
     SectionDividerOption m_advanced_options;
-    TimeExpressionOption<uint16_t> WATCHDOG_TIMER;
-    TimeExpressionOption<uint16_t> EXIT_BATTLE_TIMEOUT;
+    MillisecondsOption WATCHDOG_TIMER0;
+    MillisecondsOption EXIT_BATTLE_TIMEOUT0;
     BooleanCheckBoxOption TARGET_CIRCLING;
 };
 
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_BasicCatcher.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_BasicCatcher.cpp
new file mode 100644
index 0000000000..1ffc02cab2
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_BasicCatcher.cpp
@@ -0,0 +1,230 @@
+/*  Basic Pokemon Catcher
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "CommonTools/VisualDetectors/BlackScreenDetector.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_ReceivePokemonDetector.h"
+#include "VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_ExperienceGainDetector.h"
+#include "VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleMenuDetector.h"
+#include "PokemonSwSh_BasicCatcher.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+//  Returns the # of slots scrolled. Returns -1 if not found.
+int move_to_ball(
+    const BattleBallReader& reader,
+    VideoStream& stream, ProControllerContext& context,
+    const std::string& ball_slug,
+    bool forward, int attempts, Milliseconds delay
+){
+    VideoSnapshot frame = stream.video().snapshot();
+    std::string first_ball = reader.read_ball(frame);
+    if (first_ball == ball_slug){
+        return 0;
+    }
+
+    size_t repeat_counter = 0;
+    for (int c = 1; c < attempts; c++){
+        pbf_press_dpad(context, forward ? DPAD_RIGHT : DPAD_LEFT, 80ms, delay);
+        context.wait_for_all_requests();
+        frame = stream.video().snapshot();
+        std::string current_ball = reader.read_ball(frame);
+        if (current_ball == ball_slug){
+            return c;
+        }
+        if (current_ball == first_ball){
+            repeat_counter++;
+            if (repeat_counter == 3){
+                return -1;
+            }
+        }
+    }
+    return -1;
+}
+
+//  Returns the quantity of the ball.
+//  Returns -1 if unable to read.
+int16_t move_to_ball(
+    const BattleBallReader& reader, VideoStream& stream, ProControllerContext& context,
+    const std::string& ball_slug
+){
+    //  Search forward at high speed.
+    int ret = move_to_ball(reader, stream, context, ball_slug, true, 100, 320ms);
+    if (ret < 0){
+        return 0;
+    }
+    if (ret == 0){
+        uint16_t quantity = reader.read_quantity(stream.video().snapshot());
+        return quantity == 0 ? -1 : quantity;
+    }
+
+    //  Wait a second to let the video catch up.
+    pbf_wait(context, 1000ms);
+    context.wait_for_all_requests();
+
+    //  Now try again in reverse at a lower speed in case we overshot.
+    //  This will return immediately if we got it right the first time.
+    ret = move_to_ball(reader, stream, context, ball_slug, false, 5, 1000ms);
+    if (ret < 0){
+        return 0;
+    }
+    if (ret > 0){
+        stream.log("Fast ball scrolling overshot by " + std::to_string(ret) + " slot(s).", COLOR_RED);
+    }
+    uint16_t quantity = reader.read_quantity(stream.video().snapshot());
+    return quantity == 0 ? -1 : quantity;
+}
+
+
+CatchResults throw_balls(
+    VideoStream& stream, ProControllerContext& context,
+    Language language,
+    const std::string& ball_slug, uint16_t ball_limit
+){
+    uint16_t balls_used = 0;
+    while (true){
+        {
+            BattleBallReader reader(stream, language);
+
+            pbf_mash_button(context, BUTTON_X, 1000ms);
+            context.wait_for_all_requests();
+
+            bool success = move_to_ball(reader, stream, context, ball_slug);
+            if (!success){
+                return {CatchResult::OUT_OF_BALLS, balls_used};
+            }
+
+            pbf_mash_button(context, BUTTON_A, 1000ms);
+            context.wait_for_all_requests();
+        }
+        balls_used++;
+
+        auto start = current_time();
+
+        StandardBattleMenuWatcher menu_detector(false);
+        ExperienceGainWatcher experience_detector;
+        int result = wait_until(
+            stream, context,
+            std::chrono::seconds(60),
+            {
+                {menu_detector},
+                {experience_detector},
+            }
+        );
+        switch (result){
+        case 0:
+            if (current_time() < start + std::chrono::seconds(5)){
+                stream.log("BasicCatcher: Unable to throw ball.", COLOR_RED);
+                return {CatchResult::CANNOT_THROW_BALL, balls_used};
+            }
+            stream.log("BasicCatcher: Failed to catch.", COLOR_ORANGE);
+            if (balls_used >= ball_limit){
+                stream.log("Reached the limit of " + std::to_string(ball_limit) + " balls.", COLOR_RED);
+                return {CatchResult::BALL_LIMIT_REACHED, balls_used};
+            }
+            continue;
+        case 1:
+            stream.log("BasicCatcher: End of battle detected.", COLOR_PURPLE);
+            return {CatchResult::POKEMON_FAINTED, balls_used};
+        default:
+            stream.log("BasicCatcher: Timed out.", COLOR_RED);
+            return {CatchResult::TIMED_OUT, balls_used};
+        }
+    }
+}
+
+
+CatchResults basic_catcher(
+    VideoStream& stream, ProControllerContext& context,
+    Language language,
+    const std::string& ball_slug, uint16_t ball_limit
+){
+    context.wait_for_all_requests();
+    stream.log("Attempting to catch with: " + ball_slug);
+
+    CatchResults results = throw_balls(stream, context, language, ball_slug, ball_limit);
+    switch (results.result){
+    case CatchResult::OUT_OF_BALLS:
+    case CatchResult::CANNOT_THROW_BALL:
+    case CatchResult::BALL_LIMIT_REACHED:
+    case CatchResult::TIMED_OUT:
+        return results;
+    default:;
+    }
+
+
+    //  Need to distinguish between caught or faint.
+
+
+    //  Wait for end of battle.
+//    console.video().snapshot()->save("test0.png");
+    {
+        stream.log("Waiting for black screen end...");
+        BlackScreenOverWatcher black_screen_detector;
+        run_until<ProControllerContext>(
+            stream, context,
+            [](ProControllerContext& context){
+                pbf_mash_button(context, BUTTON_B, 120000ms);
+            },
+            {{black_screen_detector}}
+        );
+        stream.log("Waiting for black screen end... Found!");
+    }
+
+    //  Look for the orange caught screen.
+//    console.video().snapshot()->save("test1.png");
+//    context.wait_for(std::chrono::milliseconds(5000));
+    {
+        ReceivePokemonOverWatcher caught_detector(true);
+
+        int result = run_until<ProControllerContext>(
+            stream, context,
+            [](ProControllerContext& context){
+                pbf_mash_button(context, BUTTON_B, 4000ms);
+            },
+            {{caught_detector}}
+        );
+
+        switch (result){
+        case 0:
+            stream.log("BasicCatcher: The wild " + STRING_POKEMON + " was caught!", COLOR_BLUE);
+            break;
+        default:
+            stream.log("BasicCatcher: The wild " + STRING_POKEMON + " fainted.", COLOR_RED);
+            results.result = CatchResult::POKEMON_FAINTED;
+            return results;
+        }
+    }
+
+//    pbf_wait(context, 5000ms);
+//    console.video().snapshot()->save("test2.png");
+    {
+        stream.log("Waiting for black screen end...");
+        BlackScreenOverWatcher black_screen_detector;
+        run_until<ProControllerContext>(
+            stream, context,
+            [](ProControllerContext& context){
+                pbf_mash_button(context, BUTTON_B, 10000ms);
+            },
+            {{black_screen_detector}}
+        );
+        stream.log("Waiting for black screen end... Found!");
+    }
+
+    results.result = CatchResult::POKEMON_CAUGHT;
+    return results;
+}
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_BasicCatcher.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_BasicCatcher.h
new file mode 100644
index 0000000000..063e4b285e
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_BasicCatcher.h
@@ -0,0 +1,46 @@
+/*  Basic Pokemon Catcher
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_BasicCatcher_H
+#define PokemonAutomation_PokemonSwSh_BasicCatcher_H
+
+#include "CommonFramework/Language.h"
+#include "CommonFramework/Tools/VideoStream.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+#include "Pokemon/Pokemon_Notification.h"
+#include "VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleBallReader.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+using namespace Pokemon;
+
+
+//  Returns the quantity of the ball.
+//  Returns -1 if unable to read.
+int16_t move_to_ball(
+    const BattleBallReader& reader, VideoStream& stream, ProControllerContext& context,
+    const std::string& ball_slug
+);
+
+
+struct CatchResults{
+    CatchResult result;
+    uint16_t balls_used;
+};
+CatchResults basic_catcher(
+    VideoStream& stream, ProControllerContext& context,
+    Language language,
+    const std::string& ball_slug, uint16_t ball_limit
+);
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_BoxHelpers.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_BoxHelpers.cpp
new file mode 100644
index 0000000000..c96b436064
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_BoxHelpers.cpp
@@ -0,0 +1,127 @@
+/*  Box Helpers
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Tools/VideoStream.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/ImageTools/ImageStats.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_IvJudgeReader.h"
+#include "PokemonSwSh_BoxHelpers.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+
+bool change_view_to_stats_or_judge(
+    VideoStream& stream, ProControllerContext& context,
+    bool throw_exception
+){
+    ImageFloatBox name_bar(0.69, 0.03, 0.30, 0.05);
+    OverlayBoxScope name_bar_overlay(stream.overlay(), name_bar);
+    for (size_t attempts = 0;; attempts++){
+        if (throw_exception){
+            if (attempts == 10){
+                OperationFailedExceptionWithScreenshot::fire(
+                    ErrorReportMode::SEND_ERROR_REPORT,
+                    "Unable to change Pokemon view after 10 tries.",
+                    stream
+                );
+            }
+        }else{
+            if (attempts == 3){
+                return false;
+            }
+        }
+
+        context.wait_for_all_requests();
+        VideoSnapshot screen = stream.video().snapshot();
+        ImageStats stats = image_stats(extract_box_reference(screen, name_bar));
+//        cout << stats.stddev << endl;
+        if (stats.stddev.sum() > 50){
+            break;
+        }
+
+        stream.log("Unable to detect stats menu. Attempting to correct.", COLOR_RED);
+
+//        //  Alternate one and two + presses. If IV checker is enabled, we should
+//        //  land on the IV checker. Otherwise, it will land us back to nothing.
+//        //  Then the next press will be a single which will put us on the stats
+//        //  with no IV checker.
+        pbf_press_button(context, BUTTON_PLUS, 160ms, 840ms);
+//        if (attempts % 2 == 0){
+//            pbf_press_button(context, BUTTON_PLUS, 160ms, 1840ms);
+//        }
+    }
+    return true;
+}
+
+
+void change_view_to_judge(
+    VideoStream& stream, ProControllerContext& context,
+    Language language
+){
+    if (language == Language::None){
+        throw InternalProgramError(
+            &stream.logger(), PA_CURRENT_FUNCTION,
+            "change_view_to_judge() called with no language."
+        );
+    }
+
+    ImageFloatBox name_bar(0.69, 0.03, 0.30, 0.05);
+    IvJudgeReaderScope iv_checker(stream.overlay(), language);
+    OverlayBoxScope name_bar_overlay(stream.overlay(), name_bar);
+    for (size_t attempts = 0;; attempts++){
+        if (attempts == 10){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "Unable to change Pokemon view to judge after 10 tries. Have you unlocked it?",
+                stream
+            );
+        }
+
+        context.wait_for_all_requests();
+        VideoSnapshot screen = stream.video().snapshot();
+        ImageStats stats = image_stats(extract_box_reference(screen, name_bar));
+//        cout << stats.stddev << endl;
+
+        //  Check if we're even on a stats screen.
+        if (stats.stddev.sum() < 50){
+            stream.log("Unable to detect stats menu. Attempting to correct.", COLOR_RED);
+            pbf_press_button(context, BUTTON_PLUS, 160ms, 840ms);
+            continue;
+        }
+
+        //  See if we're on the judge screen.
+        IvJudgeReader::Results ivs = iv_checker.read(stream.logger(), screen);
+
+        size_t detected = 0;
+        if (ivs.hp      != IvJudgeValue::UnableToDetect) detected++;
+        if (ivs.attack  != IvJudgeValue::UnableToDetect) detected++;
+        if (ivs.defense != IvJudgeValue::UnableToDetect) detected++;
+        if (ivs.spatk   != IvJudgeValue::UnableToDetect) detected++;
+        if (ivs.spdef   != IvJudgeValue::UnableToDetect) detected++;
+        if (ivs.speed   != IvJudgeValue::UnableToDetect) detected++;
+
+        //  If less than 4 of the IVs are read, assume we're not on the judge screen.
+        if (detected < 4){
+            pbf_press_button(context, BUTTON_PLUS, 160ms, 1840ms);
+        }else{
+            break;
+        }
+    }
+}
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_BoxHelpers.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_BoxHelpers.h
new file mode 100644
index 0000000000..bdfbe80928
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_BoxHelpers.h
@@ -0,0 +1,46 @@
+/*  Box Helpers
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_BoxHelpers_H
+#define PokemonAutomation_PokemonSwSh_BoxHelpers_H
+
+#include "CommonFramework/Language.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+
+namespace PokemonAutomation{
+class VideoStream;
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+static inline void box_scroll(ProControllerContext& context, DpadPosition direction){
+    ssf_press_dpad_ptv(context, direction, 200ms, 104ms);
+}
+
+//  Assuming the current slot in box system is a pokemon, not egg or empty space,
+//  try to change the view to the judge. However, it may land on the stats instead.
+//  If it can't land on either stats or judge and `throw_exception` is true, it will throw an exception.
+//  Return true if it successfully changed view to judge (or stats if judge is not found)
+bool change_view_to_stats_or_judge(
+    VideoStream& stream, ProControllerContext& context,
+    bool throw_exception = true
+);
+
+
+//  Assuming the current slot in box system is a pokemon, not egg or empty space,
+//  change the view to the judge. If it fails, it will OperationFailedExceptionWithScreenshot::fire.
+void change_view_to_judge(
+    VideoStream& stream, ProControllerContext& context,
+    Language language
+);
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/PokemonSwSh_EncounterDetection.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_EncounterDetection.cpp
similarity index 75%
rename from SerialPrograms/Source/PokemonSwSh/Programs/PokemonSwSh_EncounterDetection.cpp
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_EncounterDetection.cpp
index 80f715014b..9cc8316fbe 100644
--- a/SerialPrograms/Source/PokemonSwSh/Programs/PokemonSwSh_EncounterDetection.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_EncounterDetection.cpp
@@ -1,17 +1,17 @@
 /*  Encounter Detection
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
-#include "Common/NintendoSwitch/NintendoSwitch_Protocol_PushButtons.h"
-#include "CommonFramework/Globals.h"
+//#include "Common/NintendoSwitch/NintendoSwitch_Protocol_PushButtons.h"
+//#include "CommonFramework/Globals.h"
 #include "CommonFramework/ImageTypes/ImageViewRGB32.h"
 #include "CommonFramework/VideoPipeline/VideoFeed.h"
 #include "CommonFramework/Tools/ErrorDumper.h"
 #include "CommonFramework/Tools/ProgramEnvironment.h"
-#include "CommonFramework/Tools/InterruptableCommands.h"
-#include "CommonFramework/Inference/BlackScreenDetector.h"
+#include "CommonTools/Async/InterruptableCommands.h"
+#include "Pokemon/Inference/Pokemon_NameReader.h"
 #include "PokemonSwSh_EncounterDetection.h"
 
 //#include <iostream>
@@ -24,14 +24,15 @@ namespace PokemonSwSh{
 
 
 StandardEncounterDetection::StandardEncounterDetection(
-    ProgramEnvironment& env, ConsoleHandle& console, BotBaseContext& context,
+    ProgramEnvironment& env,
+    VideoStream& stream, ProControllerContext& context,
     Language language,
-    const EncounterFilterOption& filter,
+    const EncounterFilterOption2& filter,
     ShinyType shininess,
     std::chrono::milliseconds read_name_delay
 )
     : m_env(env)
-    , m_console(console)
+    , m_stream(stream)
     , m_context(context)
     , m_language(language)
     , m_filter(filter)
@@ -61,19 +62,19 @@ const std::set<std::string>* StandardEncounterDetection::candidates(){
         return &m_candidates;
     }
 
-    OverlayBoxScope box(m_console, ImageFloatBox(0.76, 0.04, 0.15, 0.044));
+    OverlayBoxScope box(m_stream.overlay(), ImageFloatBox(0.76, 0.04, 0.15, 0.044));
     m_context.wait_for(m_read_name_delay);
 
-    VideoSnapshot screen = m_console.video().snapshot();
+    VideoSnapshot screen = m_stream.video().snapshot();
     ImageViewRGB32 frame = extract_box_reference(screen, box);
 
     OCR::StringMatchResult result = PokemonNameReader::instance().read_substring(
-        m_console, m_language, frame,
+        m_stream.logger(), m_language, frame,
         OCR::BLACK_TEXT_FILTERS()
     );
     if (result.results.empty()){
         dump_image(
-            m_console, m_env.program_info(),
+            m_stream.logger(), m_env.program_info(),
             "StandardEncounterDetection-NameOCR-" + language_data(m_language).code,
             screen
         );
@@ -111,18 +112,18 @@ bool filter_match(ShinyType detection, ShinyFilter filter){
     return false;
 }
 
-std::pair<EncounterAction, std::string> StandardEncounterDetection::get_action(){
+EncounterActionFull StandardEncounterDetection::get_action(){
     if (m_shininess == ShinyType::UNKNOWN){
         return {EncounterAction::RunAway, ""};
     }
 
-    std::pair<EncounterAction, std::string> action;
-    action.first = filter_match(m_shininess, m_filter.shiny_filter())
+    EncounterActionFull action;
+    action.action = filter_match(m_shininess, m_filter.SHINY_FILTER)
         ? EncounterAction::StopProgram
         : EncounterAction::RunAway;
 
 //    const std::vector<EncounterFilterOverride>& overrides = m_filter.overrides();
-    std::vector<std::unique_ptr<EncounterFilterOverride>> overrides = m_filter.copy_snapshot();
+    std::vector<std::unique_ptr<EncounterFilterOverride>> overrides = m_filter.FILTER_TABLE.copy_snapshot();
 
     if (overrides.empty()){
         return action;
@@ -143,8 +144,9 @@ std::pair<EncounterAction, std::string> StandardEncounterDetection::get_action()
                 continue;
             }
 
-            action.first = override->action;
-            action.second = override->pokeball.slug();
+            action.action = override->action;
+            action.pokeball_slug = override->pokeball.slug();
+            action.ball_limit = override->ball_limit;
         }
     }
 
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_EncounterDetection.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_EncounterDetection.h
new file mode 100644
index 0000000000..c9919cb657
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_EncounterDetection.h
@@ -0,0 +1,63 @@
+/*  Encounter Detection
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_EncounterTracker_H
+#define PokemonAutomation_PokemonSwSh_EncounterTracker_H
+
+#include "CommonFramework/Language.h"
+#include "CommonFramework/Tools/VideoStream.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+#include "VideoGames/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterOption.h"
+#include "VideoGames/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_ShinyEncounterDetector.h"
+
+namespace PokemonAutomation{
+    class ProgramEnvironment;
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+class StandardEncounterDetection{
+public:
+    StandardEncounterDetection(
+        ProgramEnvironment& env,
+        VideoStream& stream, ProControllerContext& context,
+        Language language,
+        const EncounterFilterOption2& filter,
+        ShinyType shininess,
+        std::chrono::milliseconds read_name_delay = std::chrono::milliseconds(500)
+    );
+
+    bool is_shiny() const;
+    ShinyType shininess() const{ return m_shininess; }
+
+    //  nullptr     =   disabled
+    //  empty set   =   unable to detect
+    const std::set<std::string>* candidates();
+
+    EncounterActionFull get_action();
+
+private:
+    ProgramEnvironment& m_env;
+    VideoStream& m_stream;
+    ProControllerContext& m_context;
+
+    const Language m_language;
+
+    const EncounterFilterOption2& m_filter;
+    const ShinyType m_shininess;
+    const std::chrono::milliseconds m_read_name_delay;
+
+    bool m_name_read = false;
+    std::set<std::string> m_candidates;
+};
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_EncounterHandler.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_EncounterHandler.cpp
new file mode 100644
index 0000000000..678fb4b91c
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_EncounterHandler.cpp
@@ -0,0 +1,319 @@
+/*  Encounter Handler
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/Exceptions/FatalProgramException.h"
+#include "CommonFramework/Tools/ProgramEnvironment.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "CommonTools/VisualDetectors/BlackScreenDetector.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "Pokemon/Pokemon_Notification.h"
+#include "VideoGames/PokemonSwSh/PokemonSwSh_Settings.h"
+#include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_BasicCatcher.h"
+#include "PokemonSwSh_EncounterHandler.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+void take_video(ProControllerContext& context){
+    pbf_wait(context, 5000ms);
+    pbf_press_button(context, BUTTON_CAPTURE, 2000ms, 5000ms);
+//    context->wait_for_all_requests();
+}
+void run_away(
+    VideoStream& stream, ProControllerContext& context,
+    Milliseconds exit_battle_time
+){
+    pbf_press_dpad(context, DPAD_UP, 160ms, 0ms);
+    pbf_press_button(context, BUTTON_A, 250ms, 750ms);
+
+    BlackScreenOverWatcher black_screen_detector;
+    StandardBattleMenuWatcher battle_menu(false, COLOR_GREEN);
+    while (true){
+        context.wait_for_all_requests();
+        int ret = run_until<ProControllerContext>(
+            stream, context,
+            [exit_battle_time](ProControllerContext& context){
+                pbf_mash_button(context, BUTTON_B, exit_battle_time);
+            },
+            {
+                black_screen_detector,
+                battle_menu,
+            }
+        );
+        switch (ret){
+        case 0:
+            context->logger().log("Detected end of battle!");
+            return;
+        case 1:
+            context->logger().log("Detected unexpected battle menu!", COLOR_RED);
+            pbf_press_dpad(context, DPAD_DOWN, 3000ms, 0ms);
+            pbf_press_button(context, BUTTON_A, 80ms, 0ms);
+            continue;
+        default:
+            context->logger().log("Unable to detect end of battle. Assume successful run away.", COLOR_ORANGE);
+            return;
+#if 0
+            throw OperationFailedExceptionWithScreenshot(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "Unable to run away. Are you stuck in the battle?",
+                stream
+            );
+#endif
+        }
+    }
+}
+
+
+
+
+StandardEncounterHandler::StandardEncounterHandler(
+    ProgramEnvironment& env,
+    VideoStream& stream, ProControllerContext& context,
+    Language language,
+    EncounterBotCommonOptions& settings,
+    ShinyHuntTracker& session_stats
+)
+    : m_env(env)
+    , m_context(context)
+    , m_stream(stream)
+    , m_language(language)
+    , m_settings(settings)
+    , m_session_stats(session_stats)
+//    , m_notification_sender(settings.notification_level)
+{}
+
+
+void StandardEncounterHandler::update_frequencies(StandardEncounterDetection& encounter){
+    const std::set<std::string>* slugs = encounter.candidates();
+    if (slugs){
+        m_frequencies += *slugs;
+        m_env.log(m_frequencies.dump_sorted_map("Encounter Stats:\n"));
+    }
+}
+void StandardEncounterHandler::run_away_and_update_stats(
+    StandardEncounterDetection& encounter,
+    Milliseconds exit_battle_time,
+    const ShinyDetectionResult& result
+){
+    //  Read the name.
+    const std::set<std::string>* candidates_ptr = encounter.candidates();
+
+    run_away(m_stream, m_context, exit_battle_time);
+
+    update_frequencies(encounter);
+
+    const std::set<std::string>& candidates = candidates_ptr
+        ? *candidates_ptr
+        : std::set<std::string>();
+    send_encounter_notification(
+        m_env,
+        m_settings.NOTIFICATION_NONSHINY,
+        m_settings.NOTIFICATION_SHINY,
+        candidates_ptr, is_likely_shiny(result.shiny_type),
+        {{candidates, result.shiny_type}}, result.alpha,
+        result.get_best_screenshot(),
+        &m_frequencies
+    );
+}
+
+
+bool StandardEncounterHandler::handle_standard_encounter(const ShinyDetectionResult& result){
+    if (result.shiny_type == ShinyType::UNKNOWN){
+        m_stream.log("Unable to determine result of battle.", COLOR_RED);
+        m_session_stats.add_error();
+        m_consecutive_failures++;
+        if (m_consecutive_failures >= 3){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "3 consecutive failed encounter detections.",
+                m_stream
+            );
+        }
+        return false;
+    }
+    m_consecutive_failures = 0;
+
+    m_session_stats += result.shiny_type;
+    m_env.update_stats();
+
+    if (result.shiny_type == ShinyType::UNKNOWN){
+        pbf_mash_button(m_context, BUTTON_B, 1000ms);
+        return false;
+    }
+
+    StandardEncounterDetection encounter(
+        m_env, m_stream, m_context,
+        m_language,
+        m_settings.FILTER,
+        result.shiny_type
+    );
+
+    update_frequencies(encounter);
+
+    const std::set<std::string>* candidates_ptr = encounter.candidates();
+    const std::set<std::string>& candidates = candidates_ptr
+        ? *candidates_ptr
+        : std::set<std::string>();
+    send_encounter_notification(
+        m_env,
+        m_settings.NOTIFICATION_NONSHINY,
+        m_settings.NOTIFICATION_SHINY,
+        candidates_ptr, is_likely_shiny(result.shiny_type),
+        {{candidates, result.shiny_type}}, result.alpha,
+        result.get_best_screenshot(),
+        &m_frequencies
+    );
+
+    if (m_settings.VIDEO_ON_SHINY && encounter.is_shiny()){
+        take_video(m_context);
+    }
+
+    return encounter.get_action().action == EncounterAction::StopProgram;
+}
+bool StandardEncounterHandler::handle_standard_encounter_end_battle(
+    const ShinyDetectionResult& result,
+    Milliseconds exit_battle_time
+){
+    if (result.shiny_type == ShinyType::UNKNOWN){
+        m_stream.log("Unable to determine result of battle.", COLOR_RED);
+        m_session_stats.add_error();
+        m_consecutive_failures++;
+        if (m_consecutive_failures >= 3){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "3 consecutive failed encounter detections.",
+                m_stream
+            );
+        }
+        return false;
+    }
+    m_consecutive_failures = 0;
+
+    m_session_stats += result.shiny_type;
+    m_env.update_stats();
+
+    StandardEncounterDetection encounter(
+        m_env, m_stream, m_context,
+        m_language,
+        m_settings.FILTER,
+        result.shiny_type
+    );
+
+    if (m_settings.VIDEO_ON_SHINY && encounter.is_shiny()){
+        take_video(m_context);
+    }
+
+    EncounterActionFull action = encounter.get_action();
+
+//    cout << "action = " << (int)action.first << " : " << action.second << endl;
+
+    //  Fast run-away sequence to save time.
+    if (action.action == EncounterAction::RunAway){
+        run_away_and_update_stats(encounter, exit_battle_time, result);
+        return false;
+    }
+
+    update_frequencies(encounter);
+    const std::set<std::string>* candidates_ptr = encounter.candidates();
+    const std::set<std::string>& candidates = candidates_ptr
+        ? *candidates_ptr
+        : std::set<std::string>();
+    send_encounter_notification(
+        m_env,
+        m_settings.NOTIFICATION_NONSHINY,
+        m_settings.NOTIFICATION_SHINY,
+        candidates_ptr, is_likely_shiny(result.shiny_type),
+        {{candidates, result.shiny_type}}, result.alpha,
+        result.get_best_screenshot(),
+        &m_frequencies
+    );
+
+    switch (action.action){
+    case EncounterAction::StopProgram:
+        return true;
+    case EncounterAction::RunAway:
+        return false;
+    case EncounterAction::ThrowBalls:{
+        CatchResults results = basic_catcher(
+            m_stream, m_context,
+            m_language,
+            action.pokeball_slug,
+            action.ball_limit
+        );
+        send_catch_notification(
+            m_env,
+            m_settings.NOTIFICATION_CATCH_SUCCESS,
+            m_settings.NOTIFICATION_CATCH_FAILED,
+            encounter.candidates(),
+            action.pokeball_slug,
+            results.balls_used,
+            results.result
+        );
+        switch (results.result){
+        case CatchResult::POKEMON_CAUGHT:
+        case CatchResult::POKEMON_FAINTED:
+            break;
+        default:
+            throw_and_log<FatalProgramException>(
+                m_stream.logger(), ErrorReportMode::NO_ERROR_REPORT,
+                "Unable to recover from failed catch.",
+                m_stream
+            );
+        }
+        return false;
+    }
+    case EncounterAction::ThrowBallsAndSave:{
+        CatchResults results = basic_catcher(
+            m_stream, m_context,
+            m_language,
+            action.pokeball_slug,
+            action.ball_limit
+        );
+        send_catch_notification(
+            m_env,
+            m_settings.NOTIFICATION_CATCH_SUCCESS,
+            m_settings.NOTIFICATION_CATCH_FAILED,
+            encounter.candidates(),
+            action.pokeball_slug,
+            results.balls_used,
+            results.result
+        );
+        switch (results.result){
+        case CatchResult::POKEMON_CAUGHT:
+            pbf_mash_button(m_context, BUTTON_B, 2000ms);
+            pbf_press_button(m_context, BUTTON_X, 160ms, GameSettings::instance().OVERWORLD_TO_MENU_DELAY0); //  Save game.
+            pbf_press_button(m_context, BUTTON_R, 160ms, 1200ms);
+            pbf_press_button(m_context, BUTTON_A, 80ms, 4000ms);
+            break;
+        case CatchResult::POKEMON_FAINTED:
+            pbf_mash_button(m_context, BUTTON_B, 2000ms);
+            break;
+        default:
+            throw_and_log<FatalProgramException>(
+                m_stream.logger(), ErrorReportMode::NO_ERROR_REPORT,
+                "Unable to recover from failed catch.",
+                m_stream
+            );
+        }
+        return false;
+    }
+    }
+
+    return false;
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_EncounterHandler.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_EncounterHandler.h
new file mode 100644
index 0000000000..b655903b4e
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_EncounterHandler.h
@@ -0,0 +1,73 @@
+/*  Encounter Handler
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_EncounterHandler_H
+#define PokemonAutomation_PokemonSwSh_EncounterHandler_H
+
+#include "CommonFramework/Tools/VideoStream.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+#include "Pokemon/Pokemon_EncounterStats.h"
+#include "VideoGames/PokemonSwSh/ShinyHuntTracker.h"
+#include "VideoGames/PokemonSwSh/Options/PokemonSwSh_EncounterBotCommon.h"
+#include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_EncounterDetection.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+class StandardEncounterHandler{
+public:
+    StandardEncounterHandler(
+        ProgramEnvironment& env, VideoStream& stream, ProControllerContext& context,
+        Language language,
+        EncounterBotCommonOptions& settings,
+        ShinyHuntTracker& session_stats
+    );
+
+
+    //  Return true if program should stop.
+    bool handle_standard_encounter(const ShinyDetectionResult& result);
+    bool handle_standard_encounter_end_battle(
+        const ShinyDetectionResult& result,
+        Milliseconds exit_battle_time
+    );
+
+
+private:
+    void update_frequencies(StandardEncounterDetection& encounter);
+    void run_away_and_update_stats(
+        StandardEncounterDetection& encounter,
+        Milliseconds exit_battle_time,
+        const ShinyDetectionResult& result
+    );
+
+private:
+    ProgramEnvironment& m_env;
+    ProControllerContext& m_context;
+    VideoStream& m_stream;
+    const Language m_language;
+    EncounterBotCommonOptions& m_settings;
+
+    EncounterFrequencies m_frequencies;
+    ShinyHuntTracker& m_session_stats;
+    size_t m_consecutive_failures = 0;
+
+//    EncounterNotificationSender m_notification_sender;
+};
+
+
+void take_video(ProControllerContext& context);
+void run_away(
+    VideoStream& stream, ProControllerContext& context,
+    Milliseconds exit_battle_time
+);
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_GameEntry.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_GameEntry.cpp
new file mode 100644
index 0000000000..6d255e92e5
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_GameEntry.cpp
@@ -0,0 +1,179 @@
+/*  Start Game
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
+#include "CommonTools/Images/SolidColorTest.h"
+#include "CommonTools/InferenceThrottler.h"
+#include "NintendoSwitch/NintendoSwitch_Settings.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "VideoGames/PokemonSwSh/PokemonSwSh_Settings.h"
+#include "VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_GameEntry.h"
+#include "PokemonSwSh_GameEntry.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+
+void resume_game_no_interact(
+    ConsoleHandle& console, ProControllerContext& context,
+    bool tolerate_update_menu
+){
+    bool video_available = (bool)console.video().snapshot();
+    if (video_available){
+        resume_game_from_home(console, context);
+    }else{
+        resume_game_no_interact_old(context, tolerate_update_menu);
+    }
+}
+void resume_game_back_out(
+    ConsoleHandle& console, ProControllerContext& context,
+    bool tolerate_update_menu,
+    Milliseconds mash_B_time
+){
+    bool video_available = (bool)console.video().snapshot();
+    if (video_available){
+        resume_game_from_home(console, context);
+    }else{
+        resume_game_back_out_old(context, tolerate_update_menu, mash_B_time);
+    }
+}
+
+
+
+
+void enter_loading_game(
+    VideoStream& stream, ProControllerContext& context,
+    bool backup_save,
+    Milliseconds post_wait_time
+){
+    openedgame_to_gamemenu(stream, context, GameSettings::instance().START_GAME_WAIT0);
+
+    stream.log("enter_loading_game(): Game Loaded. Entering game...", COLOR_PURPLE);
+    enter_game(context, backup_save, GameSettings::instance().ENTER_GAME_MASH0, 0ms);
+    context.wait_for_all_requests();
+
+    //  Wait to enter game.
+    {
+        Milliseconds timeout = GameSettings::instance().ENTER_GAME_WAIT0;
+
+        OverlayBoxScope box(stream.overlay(), {0.2, 0.2, 0.6, 0.6});
+
+        bool black_found = false;
+
+        InferenceThrottler throttler(timeout);
+        while (true){
+            context.throw_if_cancelled();
+
+            VideoSnapshot screen = stream.video().snapshot();
+            if (!screen){
+                stream.log("enter_loading_game(): Screenshot failed.", COLOR_PURPLE);
+                throttler.set_period(std::chrono::milliseconds(1000));
+            }else{
+                bool black = is_black(extract_box_reference(screen, box));
+                if (black){
+                    if (!black_found){
+                        stream.log("enter_loading_game(): Game entry started.", COLOR_PURPLE);
+                    }
+                    black_found = true;
+                }else if (black_found){
+                    break;
+                }
+            }
+
+            if (throttler.end_iteration(context)){
+                stream.log("enter_loading_game(): Game entry timed out. Proceeding with default start delay.", COLOR_RED);
+                break;
+            }
+        }
+    }
+    stream.log("start_game_with_inference(): Game started.", COLOR_PURPLE);
+
+    if (post_wait_time != 0ms){
+        pbf_wait(context, post_wait_time);
+    }
+}
+
+void start_game_from_home_with_inference(
+    ConsoleHandle& console, ProControllerContext& context,
+    bool tolerate_update_menu,
+    uint8_t game_slot,
+    uint8_t user_slot,
+    bool backup_save,
+    Milliseconds post_wait_time
+){
+    NintendoSwitch::start_game_from_home(
+        console,
+        context,
+        tolerate_update_menu,
+        game_slot,
+        user_slot
+    );
+
+    //  Wait for game to load.
+    enter_loading_game(console, context, backup_save, post_wait_time);
+}
+void start_game_from_home(
+    ConsoleHandle& console, ProControllerContext& context,
+    bool tolerate_update_menu,
+    uint8_t game_slot,
+    uint8_t user_slot,
+    bool backup_save,
+    Milliseconds post_wait_time
+){
+    bool video_available = (bool)console.video().snapshot();
+    if (video_available ||
+        ConsoleSettings::instance().START_GAME_REQUIRES_INTERNET ||
+        tolerate_update_menu
+    ){
+//        cout << "close game" << endl;
+        close_game_from_home(console, context);
+//        cout << "start_game_from_home_with_inference game" << endl;
+        start_game_from_home_with_inference(
+            console,
+            context,
+            tolerate_update_menu,
+            game_slot,
+            user_slot,
+            backup_save,
+            post_wait_time
+        );
+        return;
+    }
+
+    fast_reset_game(context, 0ms, 0ms, 0ms);
+    context.wait_for_all_requests();
+
+    //  Wait for game to load.
+    enter_loading_game(console, context, backup_save, post_wait_time);
+}
+
+
+void reset_game_from_home_with_inference(
+    ConsoleHandle& console, ProControllerContext& context,
+    bool tolerate_update_menu,
+    bool backup_save,
+    Milliseconds post_wait_time
+){
+    from_home_close_and_reopen_game(console, context, tolerate_update_menu);
+    context.wait_for_all_requests();
+
+    //  Wait for game to load.
+    enter_loading_game(console, context, backup_save, post_wait_time);
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_GameEntry.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_GameEntry.h
new file mode 100644
index 0000000000..02723badb6
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_GameEntry.h
@@ -0,0 +1,63 @@
+/*  Start Game
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_StartGame_H
+#define PokemonAutomation_PokemonSwSh_StartGame_H
+
+#include "CommonFramework/Tools/VideoStream.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+#include "NintendoSwitch/NintendoSwitch_ConsoleHandle.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+void resume_game_no_interact(
+    ConsoleHandle& console, ProControllerContext& context,
+    bool tolerate_update_menu
+);
+void resume_game_back_out(
+    ConsoleHandle& console, ProControllerContext& context,
+    bool tolerate_update_menu,
+    Milliseconds mash_B_time
+);
+
+
+
+//  Start the game with the specified "game_slot" and "user_slot".
+//  If "game_slot" is zero, it uses whatever the cursor is on.
+//  If "user_slot" is zero, it uses whatever the cursor is on.
+void start_game_from_home_with_inference(
+    ConsoleHandle& console, ProControllerContext& context,
+    bool tolerate_update_menu,
+    uint8_t game_slot = 0,
+    uint8_t user_slot = 0,
+    bool backup_save = false,
+    Milliseconds post_wait_time = Milliseconds(1000)
+);
+void start_game_from_home(
+    ConsoleHandle& console, ProControllerContext& context,
+    bool tolerate_update_menu,
+    uint8_t game_slot = 0,
+    uint8_t user_slot = 0,
+    bool backup_save = false,
+    Milliseconds post_wait_time = Milliseconds(1000)
+);
+
+void reset_game_from_home_with_inference(
+    ConsoleHandle& console, ProControllerContext& context,
+    bool tolerate_update_menu,
+    bool backup_save = false,
+    Milliseconds post_wait_time = Milliseconds(1000)
+);
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_Internet.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_Internet.cpp
new file mode 100644
index 0000000000..fcf2238b69
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_Internet.cpp
@@ -0,0 +1,97 @@
+/*  Internet
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonFramework/Notifications/ProgramInfo.h"
+#include "CommonFramework/Tools/ErrorDumper.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_YCommDetector.h"
+#include "PokemonSwSh_Internet.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+bool connect_to_internet_with_inference(
+    const ProgramInfo& info,
+    VideoStream& stream, ProControllerContext& context,
+    Milliseconds post_wait_time,
+    Milliseconds timeout_ticks
+){
+    stream.log("Connecting to internet...");
+    //  Enter Y-COMM.
+    bool ok = true;
+//    cout << "Waiting for Y-COMM to open..." << endl;
+    for (size_t attempts = 0;;){
+        YCommMenuWatcher detector(true);
+        if (detector.detect(stream.video().snapshot())){
+            stream.log("Y-COMM detected.");
+            break;
+        }
+
+        int result = run_until<ProControllerContext>(
+            stream, context,
+            [](ProControllerContext& context){
+                pbf_press_button(context, BUTTON_Y, 200ms, 4800ms);
+            },
+            {detector}
+        );
+        if (result == 0){
+            stream.log("Y-COMM detected.");
+            break;
+        }
+        stream.log("Failed to detect Y-COMM.", COLOR_RED);
+
+        attempts++;
+        if (attempts >= 9){
+            dump_image(
+                stream.logger(), info,
+                "connect_to_internet_with_inference",
+                stream.video().snapshot()
+            );
+            ok = false;
+            break;
+        }
+    }
+
+    //  Connect to internet.
+    context.wait_for(std::chrono::seconds(1));
+    pbf_press_dpad(context, DPAD_UP, 40ms, 0ms);
+    pbf_move_right_joystick(context, {0, +1}, 40ms, 0ms);
+    pbf_mash_button(context, BUTTON_PLUS, 1000ms);
+    context.wait_for_all_requests();
+
+//    cout << "Waiting for Y-COMM to close..." << endl;
+    //  Mash B until you leave Y-COMM.
+    {
+        YCommMenuWatcher detector(false);
+        int result = run_until<ProControllerContext>(
+            stream, context,
+            [&](ProControllerContext& context){
+                pbf_mash_button(context, BUTTON_B, timeout_ticks);
+            },
+            {{detector}}
+        );
+        if (result == 0){
+            stream.log("Y-COMM no longer detected. Assume done connected to internet.");
+        }else{
+            stream.log("Failed to see Y-COMM go away after timeout.", COLOR_RED);
+            ok = false;
+        }
+    }
+
+    //  Extra wait.
+    context.wait_for(post_wait_time);
+
+    return ok;
+}
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_Internet.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_Internet.h
new file mode 100644
index 0000000000..28c8762212
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_Internet.h
@@ -0,0 +1,35 @@
+/*  Internet
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_Internet_H
+#define PokemonAutomation_PokemonSwSh_Internet_H
+
+#include <chrono>
+#include "CommonFramework/Notifications/ProgramInfo.h"
+#include "CommonFramework/Tools/VideoStream.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+
+namespace PokemonAutomation{
+    class ProgramEnvironment;
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+using namespace std::chrono_literals;
+
+
+bool connect_to_internet_with_inference(
+    const ProgramInfo& info,
+    VideoStream& stream, ProControllerContext& context,
+    Milliseconds post_wait_time = 3000ms,
+    Milliseconds timeout_ticks = 120s
+);
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_MenuNavigation.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_MenuNavigation.cpp
new file mode 100644
index 0000000000..9eeb3be630
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_MenuNavigation.cpp
@@ -0,0 +1,275 @@
+/*  Start Game
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/Tools/ErrorDumper.h"
+//#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_MainMenuDetector.h"
+#include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_YCommDetector.h"
+#include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_SelectionArrowFinder.h"
+#include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_BoxHelpers.h"
+#include "PokemonSwSh_MenuNavigation.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+void navigate_to_menu_app(
+    VideoStream& stream,
+    ProControllerContext& context,
+    size_t target_app_index
+){
+    context.wait_for_all_requests();
+    RotomPhoneMenuArrowWatcher menu_arrow(stream.overlay());
+    wait_until(
+        stream, context,
+        5000ms,
+        {menu_arrow}
+    );
+    const int cur_app_index = menu_arrow.current_index();
+    if (cur_app_index < 0){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "Cannot detect Rotom phone menu.",
+            stream
+        );
+    }
+    stream.log("Detect menu cursor at " + std::to_string(cur_app_index) + ".");
+
+    const int cur_row = cur_app_index / 5;
+    const int cur_col = cur_app_index % 5;
+
+    const int target_row = (int)target_app_index / 5;
+    const int target_col = (int)target_app_index % 5;
+
+    const DpadPosition dir = (cur_col < target_col ? DPAD_RIGHT : DPAD_LEFT);
+    const int steps = std::abs(cur_col - target_col);
+    for (int i = 0; i < steps; i++){
+        box_scroll(context, dir);
+    }
+
+    if (cur_row < target_row){
+        box_scroll(context, DPAD_DOWN);
+    }else if (cur_row > target_row){
+        box_scroll(context, DPAD_UP);
+    }
+
+    context.wait_for_all_requests();
+    return;
+}
+
+
+
+void menus_to_mainmenu(VideoStream& stream, ProControllerContext& context){
+    WallClock deadline = current_time() + std::chrono::minutes(2);
+    do{
+        YCommIconWatcher overworld;
+        MainMenuWatcher main_menu;
+        PartyMenuWatcher party_menu;
+        BoxMenuWatcher box_menu;
+        context.wait_for_all_requests();
+
+        int ret = wait_until(
+            stream, context,
+            std::chrono::seconds(30),
+            {
+                overworld,
+                main_menu,
+                party_menu,
+                box_menu,
+            }
+        );
+        switch (ret){
+        case 0:
+            stream.log("Detected Overworld...", COLOR_BLUE);
+            pbf_press_button(context, BUTTON_X, 160ms, 40ms);
+            continue;
+        case 1:
+            stream.log("Detected Main Menu...", COLOR_BLUE);
+            return;
+        case 2:
+            stream.log("Detected Party Menu...", COLOR_BLUE);
+            pbf_press_button(context, BUTTON_B, 160ms, 40ms);
+            continue;
+        case 3:
+            stream.log("Detected Box System...", COLOR_BLUE);
+            pbf_press_button(context, BUTTON_B, 160ms, 40ms);
+            continue;
+        default:
+            stream.log("menus_to_mainmenu(): No recognized state after 30 seconds.", COLOR_RED);
+            pbf_mash_button(context, BUTTON_B, 5000ms);
+        }
+    }while (current_time() < deadline);
+
+    OperationFailedExceptionWithScreenshot::fire(
+        ErrorReportMode::SEND_ERROR_REPORT,
+        "Unable to reach Main Menu after 2 minutes.",
+        stream
+    );
+}
+void menus_to_boxsystem(VideoStream& stream, ProControllerContext& context){
+    WallClock deadline = current_time() + std::chrono::minutes(2);
+    do{
+        YCommIconWatcher overworld;
+        MainMenuWatcher main_menu;
+        PartyMenuWatcher party_menu;
+        BoxMenuWatcher box_menu;
+        context.wait_for_all_requests();
+
+        int ret = wait_until(
+            stream, context,
+            std::chrono::seconds(30),
+            {
+                overworld,
+                main_menu,
+                party_menu,
+                box_menu,
+            }
+        );
+        context.wait_for(100ms);
+        switch (ret){
+        case 0:
+            stream.log("Detected Overworld...", COLOR_BLUE);
+            pbf_press_button(context, BUTTON_X, 160ms, 40ms);
+            continue;
+        case 1:
+            stream.log("Detected Main Menu...", COLOR_BLUE);
+            navigate_to_menu_app(stream, context, POKEMON_APP_INDEX);
+            pbf_press_button(context, BUTTON_A, 160ms, 40ms);
+            continue;
+        case 2:
+            stream.log("Detected Party Menu...", COLOR_BLUE);
+            pbf_press_button(context, BUTTON_R, 160ms, 40ms);
+            continue;
+        case 3:
+            stream.log("Detected Box System...", COLOR_BLUE);
+            return;
+        default:
+            stream.log("menus_to_boxsystem(): No recognized state after 30 seconds.", COLOR_RED);
+            pbf_mash_button(context, BUTTON_B, 10000ms);
+        }
+    }while (current_time() < deadline);
+
+    OperationFailedExceptionWithScreenshot::fire(
+        ErrorReportMode::SEND_ERROR_REPORT,
+        "Unable to reach Box System after 2 minutes.",
+        stream
+    );
+}
+
+
+void save_game(VideoStream& stream, ProControllerContext& context){
+    context.wait_for_all_requests();
+    stream.log("Save game.");
+    stream.overlay().add_log("Save game", COLOR_WHITE);
+
+    WallClock deadline = current_time() + std::chrono::minutes(2);
+    bool seen_save_menu = false;
+    do{
+        YCommIconWatcher overworld;
+        MainMenuWatcher main_menu;
+        SelectionArrowFinder save_arrow(stream.overlay(), {0.475, 0.688, 0.060, 0.089});
+        context.wait_for_all_requests();
+
+        int ret = wait_until(
+            stream, context,
+            std::chrono::seconds(30),
+            {
+                overworld,
+                main_menu,
+                save_arrow,
+            }
+        );
+        switch (ret){
+        case 0:
+            stream.log("Detected Overworld...", COLOR_BLUE);
+            if (seen_save_menu){
+                stream.log("Detected Overworld. Successfully saved.", COLOR_BLUE);
+                return;
+            }
+
+            pbf_press_button(context, BUTTON_X, 160ms, 40ms);
+            continue;
+        case 1:
+            stream.log("Detected Main Menu...", COLOR_BLUE);
+            pbf_press_button(context, BUTTON_R, 80ms, 2000ms);
+            continue;
+        case 2:
+            stream.log("Detected Save Menu...", COLOR_BLUE);
+            seen_save_menu = true;
+            pbf_mash_button(context, BUTTON_A, 500ms);
+            continue;
+        default:
+            stream.log("save_game(): No recognized state after 30 seconds.", COLOR_RED);
+            pbf_mash_button(context, BUTTON_B, 5000ms);
+        }
+    }while (current_time() < deadline);
+
+    OperationFailedExceptionWithScreenshot::fire(
+        ErrorReportMode::SEND_ERROR_REPORT,
+        "Unable to save game after 2 minutes.",
+        stream
+    );
+
+}
+
+void mash_B_until_y_comm_icon(
+    VideoStream& stream,
+    ProControllerContext& context,
+    const std::string& error_msg
+){
+    context.wait_for_all_requests();
+    const bool y_comm_visible = true;
+    YCommIconWatcher y_comm_detector(COLOR_RED, y_comm_visible);
+    int ret = run_until<ProControllerContext>(
+        stream, context,
+        [](ProControllerContext& context){
+            pbf_mash_button(context, BUTTON_B, 10s);
+        },
+        {y_comm_detector}
+    );
+    if (ret != 0){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            error_msg + " No Y-Comm mark found.",
+            stream
+        );
+    }
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_MenuNavigation.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_MenuNavigation.h
new file mode 100644
index 0000000000..916138bde4
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_MenuNavigation.h
@@ -0,0 +1,59 @@
+/*  Menu Navigation
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_MenuNavigation_H
+#define PokemonAutomation_PokemonSwSh_MenuNavigation_H
+
+#include "CommonFramework/Tools/VideoStream.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+
+namespace PokemonAutomation{
+    class EventNotificationOption;
+    class ProgramEnvironment;
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+// We assume Pokemon app is always at row 0, col 1
+constexpr size_t POKEMON_APP_INDEX = 1;
+// We assume Town Map app is always at row 1, col 0
+constexpr size_t TOWN_MAP_APP_INDEX = 5;
+
+
+
+
+// When Rotom Phone menu is opened, move the cursor to the target app.
+// The target app index is from 0 to 9, in the order of top to bottom, left to right.
+// e.g. by default, Pokemon app is at index 1, while Town Map app is at index 5.
+// The function detects the current cursor location. So the function works on any initial cursor location.
+// Will OperationFailedExceptionWithScreenshot::fire when failed to detect menu
+void navigate_to_menu_app(
+    VideoStream& stream,
+    ProControllerContext& context,
+    size_t app_index
+);
+
+// Move to Main Menu, starting from Overworld, Party menu, or Box menu
+void menus_to_mainmenu(VideoStream& stream, ProControllerContext& context);
+void menus_to_boxsystem(VideoStream& stream, ProControllerContext& context);
+
+// saves the game. starting from the menu or overworld
+void save_game(VideoStream& stream, ProControllerContext& context);
+
+// Used to wait until Y-Comm icon shows up.
+// Throw error if it does not find it after 10 sec.
+void mash_B_until_y_comm_icon(
+    VideoStream& stream,
+    ProControllerContext& context,
+    const std::string& error_msg
+);
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_RaidItemFarmerOKHO.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_RaidItemFarmerOKHO.cpp
new file mode 100644
index 0000000000..b448afe2dd
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_RaidItemFarmerOKHO.cpp
@@ -0,0 +1,213 @@
+/*  OHKO Raid Farmer
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/PrettyPrint.h"
+#include "CommonTools/StartupChecks/StartProgramChecks.h"
+#include "NintendoSwitch/NintendoSwitch_Settings.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_GameEntry.h"
+#include "VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.h"
+#include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
+#include "VideoGames/PokemonSwSh/Programs/Hosting/PokemonSwSh_DenTools.h"
+#include "PokemonSwSh_RaidItemFarmerOKHO.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+using namespace Pokemon;
+
+
+RaidItemFarmerOHKO_Descriptor::RaidItemFarmerOHKO_Descriptor()
+    : MultiSwitchProgramDescriptor(
+        "PokemonSwSh:RaidItemFarmerOHKO",
+        STRING_POKEMON + " SwSh", "Raid Item Farmer (OHKO)",
+        "Programs/PokemonSwSh/RaidItemFarmerOHKO.html",
+        "Farm items from raids that can be OHKO'ed. (requires multiple Switches)",
+        PanelQualityStanding::OFFICIAL_BELOW_STANDARDS,
+        ProgramControllerClass::StandardController_RequiresPrecision,
+        FeedbackType::NONE,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS,
+        2, 4, 2
+    )
+{}
+
+
+
+RaidItemFarmerOHKO::RaidItemFarmerOHKO()
+    : BACKUP_SAVE(
+        "<b>Load Backup Save:</b><br>For backup save soft-locking method.",
+        LockMode::LOCK_WHILE_RUNNING,
+        false
+    )
+//    , m_advanced_options(
+//        "<font size=4><b>Advanced Options:</b> You should not need to touch anything below here.</font>"
+//    )
+    , WAIT_FOR_STAMP_DELAY0(
+        "<b>Wait for Stamp Delay:</b><br>Wait this long for the stamp to show up.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "3000 ms"
+    )
+    , ENTER_STAMP_MASH_DURATION0(
+        "<b>Enter Stamp Mash Duration:</b><br>Mash A this long to enter a raid from its stamp.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "5000 ms"
+    )
+    , RAID_START_MASH_DURATION0(
+        "<b>Raid Start Mash Duration:</b><br>Mash A this long to start raid.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "10 s"
+    )
+    , RAID_START_TO_ATTACK_DELAY0(
+        "<b>Raid Start to Attack Delay:</b><br>Time from start raid to when the raiders attack.<br>"
+        "Do not over-optimize this timing unless you are running with 4 Switches. The Wishiwashi NPC will break the program.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "30 s"
+    )
+    , ATTACK_TO_CATCH_DELAY0(
+        "<b>Attack to Catch Delay:</b><br>Time from when you attack to when the catch selection appears.<br>"
+        "Do not over-optimize this timing unless you are running with 4 Switches. The Clefairy NPC's Follow Me will break the program.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "18 s"
+    )
+    , RETURN_TO_OVERWORLD_DELAY0(
+        "<b>Return to Overworld Delay:</b><br>Time from when you don't catch to when you return to the overworld.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "18 s"
+    )
+    , TOUCH_DATE_INTERVAL0(
+        "<b>Rollover Prevention:</b><br>Prevent the den from rolling over by periodically touching the date. If set to zero, this feature is disabled.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "4 hours"
+    )
+{
+    PA_ADD_OPTION(BACKUP_SAVE);
+//    PA_ADD_STATIC(m_advanced_options);
+    PA_ADD_OPTION(WAIT_FOR_STAMP_DELAY0);
+    PA_ADD_OPTION(ENTER_STAMP_MASH_DURATION0);
+    PA_ADD_OPTION(RAID_START_MASH_DURATION0);
+    PA_ADD_OPTION(RAID_START_TO_ATTACK_DELAY0);
+    PA_ADD_OPTION(ATTACK_TO_CATCH_DELAY0);
+    PA_ADD_OPTION(RETURN_TO_OVERWORLD_DELAY0);
+    PA_ADD_OPTION(TOUCH_DATE_INTERVAL0);
+}
+
+void RaidItemFarmerOHKO::program(MultiSwitchProgramEnvironment& env, CancellableScope& scope){
+    ProControllerContext host(scope, env.console(0).controller<ProController>());
+    size_t switches = env.consoles();
+
+    WallDuration TOUCH_DATE_INTERVAL = TOUCH_DATE_INTERVAL0;
+
+    env.run_in_parallel<ProController>(
+        scope,
+        [](ConsoleHandle& console, ProControllerContext& context){
+            StartProgramChecks::check_performance_class_wired_or_wireless(context);
+            grip_menu_connect_go_home(context);
+        }
+    );
+
+    WallClock last_touch = current_time();
+    if (TOUCH_DATE_INTERVAL > 0ms){
+        touch_date_from_home(env.console(0), host, ConsoleSettings::instance().SETTINGS_TO_HOME_DELAY0);
+        last_touch = current_time();
+    }
+    env.run_in_parallel<ProController>(
+        scope,
+        [](ConsoleHandle& console, ProControllerContext& context){
+            if (console.index() == 0){
+                resume_game_front_of_den_nowatts(context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_SLOW);
+            }else{
+                resume_game_no_interact(console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_SLOW);
+            }
+        }
+    );
+
+
+    for (uint32_t raids = 0;; raids++){
+        env.log("Raids Completed: " + tostr_u_commas(raids));
+
+        host.wait_for_all_requests();
+        env.run_in_parallel<ProController>(
+            scope,
+            [&](ConsoleHandle& console, ProControllerContext& context){
+                if (console.index() == 0){
+                    enter_den(context, 0ms, false, false);
+                }else{
+                    pbf_press_button(context, BUTTON_Y, 80ms, GameSettings::instance().OPEN_YCOMM_DELAY0);
+                    pbf_press_dpad(context, DPAD_UP, 40ms, 0ms);
+                    pbf_move_right_joystick(context, {0, +1}, 40ms, 0ms);
+                    pbf_press_button(context, BUTTON_X, 80ms, 80ms);
+                }
+            }
+        );
+
+        enter_lobby(host, 0ms, false, Catchability::ALWAYS_CATCHABLE);
+
+        host.wait_for_all_requests();
+        env.run_in_parallel<ProController>(
+            scope, 1, switches,
+            [&](ConsoleHandle& console, ProControllerContext& context){
+                pbf_wait(context, WAIT_FOR_STAMP_DELAY0);
+                pbf_press_button(context, BUTTON_X, 80ms, 80ms);
+                pbf_press_dpad(context, DPAD_RIGHT, 80ms, 80ms);
+                pbf_mash_button(context, BUTTON_A, ENTER_STAMP_MASH_DURATION0);
+            }
+        );
+
+        //  Start Raid
+        pbf_press_dpad(host, DPAD_UP, 40ms, 360ms);
+
+        host.wait_for_all_requests();
+        env.run_in_parallel<ProController>(
+            scope,
+            [&](ConsoleHandle& console, ProControllerContext& context){
+                pbf_mash_button(context, BUTTON_A, RAID_START_MASH_DURATION0);
+                pbf_wait(context, RAID_START_TO_ATTACK_DELAY0);
+                pbf_mash_button(context, BUTTON_A, 5000ms);
+                pbf_wait(context, ATTACK_TO_CATCH_DELAY0);
+
+                if (console.index() == 0){
+                    //  Add a little extra wait time since correctness matters here.
+                    ssf_press_button(context, BUTTON_HOME, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE0, 80ms);
+
+                    close_game_from_home(console, context);
+
+                    //  Touch the date.
+                    if (TOUCH_DATE_INTERVAL > 0ms && current_time() - last_touch >= TOUCH_DATE_INTERVAL){
+                        touch_date_from_home(console, context, ConsoleSettings::instance().SETTINGS_TO_HOME_DELAY0);
+                        last_touch += TOUCH_DATE_INTERVAL;
+                    }
+                    start_game_from_home_with_inference(
+                        console, context,
+                        ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_SLOW,
+                        0, 0,
+                        BACKUP_SAVE
+                    );
+                }else{
+                    pbf_press_dpad(context, DPAD_DOWN, 80ms, 80ms);
+                    Milliseconds delay = RETURN_TO_OVERWORLD_DELAY0;
+                    if (delay > 5000ms){
+                        pbf_mash_button(context, BUTTON_A, delay - 5000ms);
+                        pbf_mash_button(context, BUTTON_B, 5000ms);
+                    }else{
+                        pbf_mash_button(context, BUTTON_A, delay);
+                    }
+                }
+            }
+        );
+
+
+    }
+
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_RaidItemFarmerOKHO.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_RaidItemFarmerOKHO.h
new file mode 100644
index 0000000000..0565117993
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_RaidItemFarmerOKHO.h
@@ -0,0 +1,51 @@
+/*  Raid Item Farmer (OHKO)
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_RaidItemFarmerOHKO_H
+#define PokemonAutomation_PokemonSwSh_RaidItemFarmerOHKO_H
+
+#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "Common/Cpp/Options/TimeDurationOption.h"
+#include "NintendoSwitch/NintendoSwitch_MultiSwitchProgram.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+class RaidItemFarmerOHKO_Descriptor : public MultiSwitchProgramDescriptor{
+public:
+    RaidItemFarmerOHKO_Descriptor();
+};
+
+
+
+class RaidItemFarmerOHKO : public MultiSwitchProgramInstance{
+public:
+    using Descriptor = RaidItemFarmerOHKO_Descriptor;
+    RaidItemFarmerOHKO();
+
+    virtual void program(MultiSwitchProgramEnvironment& env, CancellableScope& scope) override;
+
+private:
+    BooleanCheckBoxOption BACKUP_SAVE;
+//    SectionDivider m_advanced_options;
+    MillisecondsOption WAIT_FOR_STAMP_DELAY0;
+    MillisecondsOption ENTER_STAMP_MASH_DURATION0;
+    MillisecondsOption RAID_START_MASH_DURATION0;
+    MillisecondsOption RAID_START_TO_ATTACK_DELAY0;
+    MillisecondsOption ATTACK_TO_CATCH_DELAY0;
+    MillisecondsOption RETURN_TO_OVERWORLD_DELAY0;
+    MillisecondsOption TOUCH_DATE_INTERVAL0;
+};
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_ReleaseHelpers.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_ReleaseHelpers.h
new file mode 100644
index 0000000000..e23e6b48a5
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_ReleaseHelpers.h
@@ -0,0 +1,70 @@
+/*  Mass Release Helpers
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_ReleaseHelpers_H
+#define PokemonAutomation_PokemonSwSh_ReleaseHelpers_H
+
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "VideoGames/PokemonSwSh/PokemonSwSh_Settings.h"
+#include "PokemonSwSh_BoxHelpers.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+
+// Release one pokemon in box
+static void release(ProControllerContext& context){
+    ssf_press_button(context, BUTTON_A, 600ms, 80ms);
+    ssf_press_dpad_ptv(context, DPAD_UP, 160ms, 80ms);
+    ssf_press_dpad_ptv(context, DPAD_UP, 160ms, 80ms);
+    ssf_press_button(context, BUTTON_A, 1000ms, 80ms);
+    ssf_press_dpad_ptv(context, DPAD_DOWN, 120ms, 80ms);
+//    ssf_press_button(context, BUTTON_A, 150);
+//    ssf_press_button(context, BUTTON_A, 40);
+    ssf_mash_AZs(context, 1840ms);
+}
+static void release_box(ProControllerContext& context){
+    for (uint8_t row = 0; row < 5; row++){
+        if (row != 0){
+            box_scroll(context, DPAD_DOWN);
+            box_scroll(context, DPAD_RIGHT);
+            box_scroll(context, DPAD_RIGHT);
+        }
+        for (uint8_t col = 0; col < 6; col++){
+            if (col != 0){
+                box_scroll(context, DPAD_RIGHT);
+            }
+            release(context);
+        }
+    }
+}
+static void release_boxes(ProControllerContext& context, uint8_t boxes){
+    if (boxes == 0){
+        return;
+    }
+    release_box(context);
+
+    Milliseconds box_change_delay = GameSettings::instance().BOX_CHANGE_DELAY0;
+    for (uint8_t box = 1; box < boxes; box++){
+        box_scroll(context, DPAD_DOWN);
+        box_scroll(context, DPAD_DOWN);
+        box_scroll(context, DPAD_DOWN);
+        box_scroll(context, DPAD_RIGHT);
+        box_scroll(context, DPAD_RIGHT);
+        ssf_press_button_ptv(context, BUTTON_R, box_change_delay, 104ms);
+        release_box(context);
+    }
+}
+
+
+
+}
+}
+}
+#endif
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_SynchronizedSpinning.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_SynchronizedSpinning.cpp
new file mode 100644
index 0000000000..0677f50aad
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_SynchronizedSpinning.cpp
@@ -0,0 +1,63 @@
+/*  Synchronized Spinning
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "PokemonSwSh_SynchronizedSpinning.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+    using namespace Pokemon;
+
+
+SynchronizedSpinning_Descriptor::SynchronizedSpinning_Descriptor()
+    : MultiSwitchProgramDescriptor(
+        "PokemonSwSh:SynchronizedSpinning",
+        STRING_POKEMON + " SwSh", "Synchronized Spinning", "",
+        "Don't ask... seriously, don't ask...",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_PerformanceClassSensitive,
+        FeedbackType::NONE,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS,
+        1, 4, 1
+    )
+{}
+
+
+
+SynchronizedSpinning::SynchronizedSpinning(){}
+
+void SynchronizedSpinning::program(MultiSwitchProgramEnvironment& env, CancellableScope& scope){
+    //  Ensure all controllers are ready. This will automatically throw if they aren't.
+    env.run_in_parallel<ProController>(
+        scope,
+        [&](ConsoleHandle& console, ProControllerContext& context){}
+    );
+
+    env.run_in_parallel<ProController>(
+        scope,
+        [&](ConsoleHandle& console, ProControllerContext& context){
+            pbf_move_left_joystick(context, {0, -1}, 40ms, 160ms);
+            while (true){
+                pbf_move_left_joystick(context, {0, +1}, 40ms, 0ms);
+                pbf_move_left_joystick(context, {+1, +1}, 40ms, 0ms);
+                pbf_move_left_joystick(context, {+1, 0}, 40ms, 0ms);
+                pbf_move_left_joystick(context, {+1, -1}, 40ms, 0ms);
+                pbf_move_left_joystick(context, {0, -1}, 40ms, 0ms);
+                pbf_move_left_joystick(context, {-1, -1}, 40ms, 0ms);
+                pbf_move_left_joystick(context, {-1, 0}, 40ms, 0ms);
+                pbf_move_left_joystick(context, {-1, +1}, 40ms, 0ms);
+            }
+        }
+    );
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/PokemonSwSh_SynchronizedSpinning.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_SynchronizedSpinning.h
similarity index 82%
rename from SerialPrograms/Source/PokemonSwSh/Programs/PokemonSwSh_SynchronizedSpinning.h
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_SynchronizedSpinning.h
index 5961ccd901..dcfd7b76aa 100644
--- a/SerialPrograms/Source/PokemonSwSh/Programs/PokemonSwSh_SynchronizedSpinning.h
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_SynchronizedSpinning.h
@@ -1,6 +1,6 @@
 /*  Synchronized Spinning
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -23,6 +23,7 @@ class SynchronizedSpinning_Descriptor : public MultiSwitchProgramDescriptor{
 
 class SynchronizedSpinning : public MultiSwitchProgramInstance{
 public:
+    using Descriptor = SynchronizedSpinning_Descriptor;
     SynchronizedSpinning();
 
     virtual void program(MultiSwitchProgramEnvironment& env, CancellableScope& scope) override;
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/QoLMacros/PokemonSwSh_FastCodeEntry.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/QoLMacros/PokemonSwSh_FastCodeEntry.cpp
new file mode 100644
index 0000000000..67fb41a0f7
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/QoLMacros/PokemonSwSh_FastCodeEntry.cpp
@@ -0,0 +1,67 @@
+/*  Fast Code Entry
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/FastCodeEntry/NintendoSwitch_NumberCodeEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "PokemonSwSh_FastCodeEntry.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+    using namespace Pokemon;
+
+
+FastCodeEntry_Descriptor::FastCodeEntry_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonSwSh:FastCodeEntry",
+        STRING_POKEMON + " SwSh", "Fast Code Entry (FCE)",
+        "Programs/PokemonSwSh/FastCodeEntry.html",
+        "Force your way into raids by entering 8-digit codes in under 1 second.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_PerformanceClassSensitive,
+        FeedbackType::NONE,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+
+
+FastCodeEntry::FastCodeEntry()
+    : RAID_CODE(
+        "<b>Raid Code:</b>",
+        8,
+        "9107 3091"
+    )
+    , INITIAL_DELAY0(
+        "<b>Initial Delay:</b><br>Wait this long before entering the code.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "0 ms"
+    )
+{
+    PA_ADD_OPTION(RAID_CODE);
+    PA_ADD_OPTION(INITIAL_DELAY0);
+}
+
+void FastCodeEntry::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    std::string code = RAID_CODE.to_str();
+
+    pbf_wait(context, INITIAL_DELAY0);
+
+    pbf_press_button(context, BUTTON_PLUS, 40ms, 40ms);
+    pbf_press_button(context, BUTTON_PLUS, 40ms, 40ms);
+    NintendoSwitch::FastCodeEntry::numberpad_enter_code(
+        env.console, context,
+        true,
+        code, true
+    );
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/QoLMacros/PokemonSwSh_FastCodeEntry.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/QoLMacros/PokemonSwSh_FastCodeEntry.h
new file mode 100644
index 0000000000..9225d68a45
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/QoLMacros/PokemonSwSh_FastCodeEntry.h
@@ -0,0 +1,47 @@
+/*  Fast Code Entry
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_FastCodeEntry_H
+#define PokemonAutomation_PokemonSwSh_FastCodeEntry_H
+
+#include "Common/Cpp/Options/FixedCodeOption.h"
+#include "Common/Cpp/Options/TimeDurationOption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+class FastCodeEntry_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    FastCodeEntry_Descriptor();
+};
+
+
+
+class FastCodeEntry : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = FastCodeEntry_Descriptor;
+    FastCodeEntry();
+
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    FixedCodeOption RAID_CODE;
+    MillisecondsOption INITIAL_DELAY0;
+};
+
+
+
+
+}
+}
+}
+#endif
+
+
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/QoLMacros/PokemonSwSh_FriendSearchDisconnect.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/QoLMacros/PokemonSwSh_FriendSearchDisconnect.cpp
new file mode 100644
index 0000000000..6d71262e93
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/QoLMacros/PokemonSwSh_FriendSearchDisconnect.cpp
@@ -0,0 +1,98 @@
+/*  Friend Search Disconnect
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "NintendoSwitch/Inference/NintendoSwitch_HomeMenuDetector.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonSwSh/PokemonSwSh_Settings.h"
+#include "VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_GameEntry.h"
+#include "VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_AutoHosts.h"
+#include "PokemonSwSh_FriendSearchDisconnect.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+    using namespace Pokemon;
+
+
+FriendSearchDisconnect_Descriptor::FriendSearchDisconnect_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonSwSh:FriendSearchDisconnect",
+        STRING_POKEMON + " SwSh", "Friend Search Disconnect",
+        "Programs/PokemonSwSh/FriendSearchDisconnect.html",
+        "Disconnect from the internet using the friend search method.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::NONE,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+
+
+FriendSearchDisconnect::FriendSearchDisconnect()
+    : USER_SLOT(
+        "<b>User Slot:</b><br>Use this profile to disconnect.",
+        LockMode::LOCK_WHILE_RUNNING,
+        1, 1, 8
+    )
+{
+    PA_ADD_OPTION(USER_SLOT);
+}
+
+void FriendSearchDisconnect::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    //  Connect the controller.
+    require_player(env.console, context, BUTTON_B);
+
+    ssf_press_button(context, BUTTON_HOME, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE0, 80ms);
+    context.wait_for_all_requests();
+
+    auto snapshot = env.console.video().snapshot();
+    if (snapshot){
+        HomeMenuWatcher home_menu(env.console);
+        int ret = wait_until(
+            env.console, context,
+            5000ms,
+            {home_menu}
+        );
+        if (ret < 0){
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "Home menu not detected after 5 seconds.",
+                env.console
+            );
+        }
+    }
+
+    ConsoleType type = env.console.state().console_type();
+    uint8_t scroll_down_slots = 0;
+    if (is_switch1(type)){
+        scroll_down_slots = 1;
+    }else if (is_switch2(type)){
+        scroll_down_slots = 3;
+    }else{
+        throw UserSetupError(
+            env.logger(),
+            "Please select a valid Switch console type."
+        );
+    }
+
+    home_to_add_friends(context, USER_SLOT - 1, scroll_down_slots, true);
+
+    //  Enter friend search.
+    pbf_mash_button(context, BUTTON_A, 2000ms);
+    settings_to_enter_game(context, true);
+}
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/QoLMacros/PokemonSwSh_FriendSearchDisconnect.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/QoLMacros/PokemonSwSh_FriendSearchDisconnect.h
new file mode 100644
index 0000000000..c7d4126b0c
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/QoLMacros/PokemonSwSh_FriendSearchDisconnect.h
@@ -0,0 +1,43 @@
+/*  Friend Search Disconnect
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_FriendSearchDisconnect_H
+#define PokemonAutomation_PokemonSwSh_FriendSearchDisconnect_H
+
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+class FriendSearchDisconnect_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    FriendSearchDisconnect_Descriptor();
+};
+
+
+
+class FriendSearchDisconnect : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = FriendSearchDisconnect_Descriptor;
+    FriendSearchDisconnect();
+
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    SimpleIntegerOption<uint8_t> USER_SLOT;
+};
+
+
+
+
+}
+}
+}
+#endif
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/RNG/PokemonSwSh_BasicRNG.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/RNG/PokemonSwSh_BasicRNG.cpp
new file mode 100644
index 0000000000..9b796a66c9
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/RNG/PokemonSwSh_BasicRNG.cpp
@@ -0,0 +1,198 @@
+/*  Basic RNG manipulation 
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <algorithm>
+#include "Common/Cpp/PrettyPrint.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "VideoGames/PokemonSwSh/Inference/RNG/PokemonSwSh_OrbeetleAttackAnimationDetector.h"
+#include "VideoGames/PokemonSwSh/Programs/RNG/PokemonSwSh_BasicRNG.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+Xoroshiro128PlusState find_rng_state(
+    VideoStream& stream,
+    ProControllerContext& context,
+    bool save_screenshots,
+    bool log_image_values
+){
+    OrbeetleAttackAnimationDetector detector(stream, context);
+    uint64_t last_bits0 = 0;
+    uint64_t last_bits1 = 0;
+
+    for (size_t i = 0; i < 128; i++){
+        context.wait_for_all_requests();
+        std::string text = std::to_string(i + 1) + "/128";
+        stream.log("RNG: Attack animation " + text);
+        OrbeetleAttackAnimationDetector::Detection detection = detector.run(save_screenshots, log_image_values);
+        uint64_t last_bit = 0;
+        switch (detection){
+        case OrbeetleAttackAnimationDetector::NO_DETECTION:
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "Attack animation could not be detected.",
+                stream
+            );
+        case OrbeetleAttackAnimationDetector::SPECIAL:
+            text += " : Special";
+            last_bit = 1;
+            break;
+        case OrbeetleAttackAnimationDetector::PHYSICAL:
+            text += " : Physical";
+            last_bit = 0;
+            break;
+        }
+        stream.overlay().add_log(text, COLOR_BLUE);
+        pbf_wait(context, 1440ms);
+
+        if (i < 64){
+            last_bits0 += last_bit << (63 - i);
+        }else{
+            last_bits1 += last_bit << (63 - (i - 64));
+        }
+    }
+    Xoroshiro128Plus rng = Xoroshiro128Plus::xoroshiro128plus_from_last_bits(std::pair(last_bits0, last_bits1));
+
+    for (size_t j = 0; j < 128; j++){
+        rng.next();
+    }
+    stream.log("RNG: state[0] = " + tostr_hex(rng.get_state().s0));
+    stream.log("RNG: state[1] = " + tostr_hex(rng.get_state().s1));
+    return rng.get_state();
+}
+
+Xoroshiro128PlusState refind_rng_state(
+    VideoStream& stream,
+    ProControllerContext& context,
+    Xoroshiro128PlusState last_known_state,
+    size_t min_advances,
+    size_t max_advances,
+    bool save_screenshots,
+    bool log_image_values
+){
+    return refind_rng_state_and_animations(stream, context, last_known_state, min_advances, max_advances, save_screenshots, log_image_values).first;
+}
+
+std::pair<Xoroshiro128PlusState, uint64_t> refind_rng_state_and_animations(
+    VideoStream& stream,
+    ProControllerContext& context,
+    Xoroshiro128PlusState last_known_state,
+    size_t min_advances,
+    size_t max_advances,
+    bool save_screenshots,
+    bool log_image_values
+)
+{
+    Xoroshiro128Plus rng(last_known_state.s0, last_known_state.s1);
+    for (size_t i = 0; i < min_advances; i++){
+        rng.next();
+    }
+    OrbeetleAttackAnimationDetector detector(stream, context);
+    size_t possible_indices = SIZE_MAX;
+    std::vector<bool> sequence = {};
+    std::vector<bool> last_bit_sequence = rng.generate_last_bit_sequence(max_advances - min_advances);
+    size_t distance = 0;
+
+    size_t i = 0;
+    while (possible_indices > 1){
+        context.wait_for_all_requests();
+
+        std::string text = std::to_string(++i) + "/?";
+        OrbeetleAttackAnimationDetector::Detection detection = detector.run(save_screenshots, log_image_values);
+        switch (detection){
+        case OrbeetleAttackAnimationDetector::NO_DETECTION:
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "Attack animation could not be detected.",
+                stream
+            );
+        case OrbeetleAttackAnimationDetector::SPECIAL:
+            text += " : Special";
+            sequence.emplace_back(true);
+            break;
+        case OrbeetleAttackAnimationDetector::PHYSICAL:
+            text += " : Physical";
+            sequence.emplace_back(false);
+            break;
+        }
+        stream.overlay().add_log(text, COLOR_BLUE);
+        pbf_wait(context, 1440ms);
+
+        std::vector<bool>::iterator last_bit_start = std::search(last_bit_sequence.begin(), last_bit_sequence.end(), sequence.begin(), sequence.end());
+        possible_indices = 0;
+        distance = 0;
+        while (last_bit_start != last_bit_sequence.end()){
+            possible_indices++;
+            distance = std::distance(last_bit_sequence.begin(), last_bit_start);
+
+            last_bit_start++;
+            last_bit_start = std::search(last_bit_start, last_bit_sequence.end(), sequence.begin(), sequence.end());
+        }
+    }
+    if (possible_indices == 0){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "Detected sequence of attack motions does not exist in expected range.",
+            stream
+        );
+    }
+
+    distance += sequence.size();
+    stream.log("RNG: needed " + std::to_string(sequence.size()) + " animations.");
+    stream.log("RNG: new state is " + std::to_string(distance + min_advances) + " advances from last known state.");
+    for (size_t advance = 0; advance < distance; advance++){
+        rng.next();
+    }
+    stream.log("RNG: state[0] = " + tostr_hex(rng.get_state().s0));
+    stream.log("RNG: state[1] = " + tostr_hex(rng.get_state().s1));
+
+    return { rng.get_state(), sequence.size() };
+}
+
+
+void do_rng_advances(
+    VideoStream& stream, ProControllerContext& context,
+    Xoroshiro128Plus& rng,
+    size_t advances,
+    Milliseconds press_duration,
+    Milliseconds release_duration
+){
+    Milliseconds tv = context->timing_variation();
+    for (size_t i = 0; i < advances; i++){
+        if ((i + 1) % 10 == 0){
+            std::string text = std::to_string(i + 1) + "/" + std::to_string(advances);
+            stream.log("RNG advance: " + text);
+            stream.overlay().add_log("Advancing: " + text, COLOR_GREEN);
+        }
+        pbf_press_button(
+            context,
+            BUTTON_RCLICK,
+            press_duration + tv,
+            release_duration + tv
+        );
+        rng.next();
+    }
+    pbf_wait(context, 1000ms);
+}
+
+Xoroshiro128PlusState predict_state_after_menu_close(Xoroshiro128PlusState current_state, uint8_t num_npcs){
+    Xoroshiro128Plus rng(current_state);
+
+    for (size_t i = 0; i < num_npcs; i++){
+        rng.nextInt(91);
+    }
+    rng.next();
+    rng.nextInt(61);
+
+    return rng.get_state();
+}
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/RNG/PokemonSwSh_BasicRNG.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/RNG/PokemonSwSh_BasicRNG.h
new file mode 100644
index 0000000000..6ff8270360
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/RNG/PokemonSwSh_BasicRNG.h
@@ -0,0 +1,65 @@
+/*  Basic RNG manipulation
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Tools/VideoStream.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+#include "Pokemon/Pokemon_Xoroshiro128Plus.h"
+
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+using namespace Pokemon;
+
+// Performs 128 Orbeetle attack animations. 
+// Returns the state after those animations.
+Xoroshiro128PlusState find_rng_state(
+    VideoStream& stream, ProControllerContext& context,
+    bool save_screenshots, bool log_values
+);
+
+// Performs Orbeetle attack animations until only one possible state is left.
+// Returns the state after those animations.
+Xoroshiro128PlusState refind_rng_state(
+    VideoStream& stream,
+    ProControllerContext& context,
+    Xoroshiro128PlusState last_known_state,
+    size_t min_advances,
+    size_t max_advances,
+    bool save_screenshots,
+    bool log_values
+);
+
+// Performs Orbeetle attack animations until only one possible state is left.
+// Returns a pair:
+// first: current RNG state
+// second: the number of animations required to find the state
+std::pair<Xoroshiro128PlusState, uint64_t> refind_rng_state_and_animations(
+    VideoStream& stream,
+    ProControllerContext& context,
+    Xoroshiro128PlusState last_known_state,
+    size_t min_advances,
+    size_t max_advances,
+    bool save_screenshots,
+    bool log_values
+);
+
+void do_rng_advances(
+    VideoStream& stream, ProControllerContext& context,
+    Xoroshiro128Plus& rng,
+    size_t advances,
+    Milliseconds press_duration,
+    Milliseconds release_duration
+);
+
+Xoroshiro128PlusState predict_state_after_menu_close(Xoroshiro128PlusState current_state, uint8_t num_npcs);
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/RNG/PokemonSwSh_CramomaticRNG.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/RNG/PokemonSwSh_CramomaticRNG.cpp
new file mode 100644
index 0000000000..43ccbac48c
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/RNG/PokemonSwSh_CramomaticRNG.cpp
@@ -0,0 +1,607 @@
+/*  Cram-o-matic RNG Manipulation
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ *  Credit goes to Anubis for discovering how the Cram-o-matic works
+ *  and for the original code to calculate how many advances are needed
+ *  to get the wanted balls.
+ *
+ */
+
+#include <algorithm>
+#include <set>
+#include "CommonFramework/Exceptions/ProgramFinishedException.h"
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/ImageTools/ImageStats.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonFramework/Tools/DebugDumper.h"
+#include "CommonTools/Images/SolidColorTest.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/NintendoSwitch_Settings.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "Pokemon/Inference/Pokemon_PokeballNameReader.h"
+#include "Pokemon/Inference/Pokemon_NameReader.h"
+#include "VideoGames/PokemonSwSh/PokemonSwSh_Settings.h"
+#include "VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.h"
+#include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_SelectionArrowFinder.h"
+#include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
+#include "VideoGames/PokemonSwSh/Programs/RNG/PokemonSwSh_BasicRNG.h"
+#include "VideoGames/PokemonSwSh/Programs/RNG/PokemonSwSh_CramomaticRNG.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+using namespace Pokemon;
+
+CramomaticRNG_Descriptor::CramomaticRNG_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonSwSh:CramomaticRNG",
+        STRING_POKEMON + " SwSh", "Cram-o-matic RNG",
+        "Programs/PokemonSwSh/CramomaticRNG.html",
+        "Perform RNG manipulation to get rare balls from the Cram-o-matic.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_PerformanceClassSensitive,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+class CramomaticRNG_Descriptor::Stats : public StatsTracker{
+public:
+    Stats()
+        : iterations(m_stats["Iterations"])
+        , reads(m_stats["Seed Reads"])
+        , errors(m_stats["Errors"])
+        , total_balls(m_stats["Balls"])
+        , apri_balls(m_stats["Apriballs"])
+        , sport_safari_balls(m_stats["Safari/Sport Balls"])
+        , bonus(m_stats["Bonus"])
+    {
+        m_display_order.emplace_back("Iterations");
+        m_display_order.emplace_back("Seed Reads");
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+        m_display_order.emplace_back("Balls");
+        m_display_order.emplace_back("Apriballs");
+        m_display_order.emplace_back("Safari/Sport Balls");
+        m_display_order.emplace_back("Bonus", HIDDEN_IF_ZERO);
+    }
+
+public:
+    std::atomic<uint64_t>& iterations;
+    std::atomic<uint64_t>& reads;
+    std::atomic<uint64_t>& errors;
+    std::atomic<uint64_t>& total_balls;
+    std::atomic<uint64_t>& apri_balls;
+    std::atomic<uint64_t>& sport_safari_balls;
+    std::atomic<uint64_t>& bonus;
+};
+std::unique_ptr<StatsTracker> CramomaticRNG_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+CramomaticRNG::CramomaticRNG()
+    : LANGUAGE(
+        "<b>Game Language:</b><br>Required to read the ball received.",
+        PokemonNameReader::instance().languages(),
+        LockMode::LOCK_WHILE_RUNNING,
+        true
+    )
+    , NUM_APRICORN_ONE(
+        "<b>Primary Apricorns:</b><br>Number of Apricorns in the selected slot.",
+        LockMode::LOCK_WHILE_RUNNING,
+        0
+    )
+    , NUM_APRICORN_TWO(
+        "<b>Secondary Apricorns:</b><br>Number of Apricorns in the slot below the selected one.",
+        LockMode::LOCK_WHILE_RUNNING,
+        0
+    )
+    , NUM_NPCS(
+        "<b>NPCs:</b><br>Number of NPCs in the dojo, including " + STRING_POKEMON + ".",
+        LockMode::LOCK_WHILE_RUNNING,
+        21
+    )
+    , BALL_TABLE(
+        "<b>Wanted Balls:</b><br>Exact kind depends on the currently selected apricorn."
+    )
+    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_STATUS_UPDATE,
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_RECOVERABLE,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+    , m_advanced_options(
+        "<font size=4><b>Advanced Options:</b> You should not need to touch anything below here.</font>"
+    )
+    , MAX_PRIORITY_ADVANCES(
+        "<b>Priority Advances:</b><br>How many advances to check when checking for higher priority selections.",
+        LockMode::LOCK_WHILE_RUNNING,
+        300
+    )
+    , MAX_UNKNOWN_ADVANCES(
+        "<b>Max Unknown advances:</b><br>How many advances to check when updating the rng state.",
+        LockMode::LOCK_WHILE_RUNNING,
+        300
+    )
+    , ADVANCE_PRESS_DURATION(
+        "<b>Advance Press Duration:</b><br>"
+        "Hold the button down for this long to advance once.<br>"
+        "<font color=\"red\">For tick-imprecise controllers, this number will be increased automatically.</font>",
+        LockMode::LOCK_WHILE_RUNNING,
+        "80 ms"
+    )
+    , ADVANCE_RELEASE_DURATION(
+        "<b>Advance Release Duration:</b><br>"
+        "After releasing the button, wait this long before pressing it again.<br>"
+        "<font color=\"red\">For tick-imprecise controllers, this number will be increased automatically.</font>",
+        LockMode::LOCK_WHILE_RUNNING,
+        "80 ms"
+    )
+    , DIALOG_RELEASE_DURATION(
+        "<b>Dialog Release Duration:</b><br>"
+        "After releasing the button, wait this long before checking the dialog.<br>"
+        "<font color=\"red\">For tick-imprecise controllers, this number will be increased automatically.</font>",
+        LockMode::LOCK_WHILE_RUNNING,
+        "1840 ms"
+    )
+    , SAVE_SCREENSHOTS(
+        "<b>Save Debug Screenshots:</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        false
+    )
+    , LOG_VALUES(
+        "<b>Log Animation Values:</br>",
+        LockMode::LOCK_WHILE_RUNNING,
+        false
+    )
+{
+    PA_ADD_OPTION(START_LOCATION);
+
+    PA_ADD_OPTION(LANGUAGE);
+    PA_ADD_OPTION(NUM_APRICORN_ONE);
+    PA_ADD_OPTION(NUM_APRICORN_TWO);
+    PA_ADD_OPTION(NUM_NPCS);
+    PA_ADD_OPTION(BALL_TABLE);
+
+    PA_ADD_OPTION(TOUCH_DATE_INTERVAL);
+
+    PA_ADD_OPTION(NOTIFICATIONS);
+
+    PA_ADD_STATIC(m_advanced_options);
+    PA_ADD_OPTION(MAX_PRIORITY_ADVANCES);
+    PA_ADD_OPTION(MAX_UNKNOWN_ADVANCES);
+    PA_ADD_OPTION(ADVANCE_PRESS_DURATION);
+    PA_ADD_OPTION(ADVANCE_RELEASE_DURATION);
+    PA_ADD_OPTION(DIALOG_RELEASE_DURATION);
+    PA_ADD_OPTION(SAVE_SCREENSHOTS);
+    PA_ADD_OPTION(LOG_VALUES);
+}
+
+void CramomaticRNG::navigate_to_party(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    pbf_press_button(context, BUTTON_X, 80ms, 1000ms);
+    pbf_press_button(context, BUTTON_A, 160ms, 80ms);
+    pbf_wait(context, 2000ms);
+}
+
+CramomaticTarget CramomaticRNG::calculate_target(SingleSwitchProgramEnvironment& env, Xoroshiro128PlusState state, std::vector<CramomaticSelection> selected_balls){
+    Xoroshiro128Plus rng(state);
+    size_t advances = 0;
+    uint16_t priority_advances = 0;
+    std::vector<CramomaticTarget> possible_targets;
+
+    std::sort(
+        selected_balls.begin(),
+        selected_balls.end(),
+        [](CramomaticSelection sel1, CramomaticSelection sel2){
+            return sel1.priority > sel2.priority;
+        }
+    );
+    // priority_advances only starts counting up after the first good result is found
+    while (priority_advances <= MAX_PRIORITY_ADVANCES){
+        // calculate the result for the current temp_rng state
+        Xoroshiro128PlusState temp_state = predict_state_after_menu_close(rng.get_state(), NUM_NPCS);
+        Xoroshiro128Plus temp_rng(temp_state);
+
+
+        /*uint64_t item_roll =*/ temp_rng.nextInt(4);
+        uint64_t ball_roll = temp_rng.nextInt(100);
+        bool is_safari_sport = temp_rng.nextInt(1000) == 0;
+        bool is_bonus = false;
+
+        if (is_safari_sport || ball_roll == 99){
+            is_bonus = temp_rng.nextInt(1000) == 0;
+        }else{
+            is_bonus = temp_rng.nextInt(100) == 0;
+        }
+
+        CramomaticBallType type;
+        if (is_safari_sport){
+            type = CramomaticBallType::Safari;
+        }else if (ball_roll < 25){
+            type = CramomaticBallType::Poke;
+        }else if (ball_roll < 50){
+            type = CramomaticBallType::Great;
+        }else if (ball_roll < 75){
+            type = CramomaticBallType::Shop1;
+        }else if (ball_roll < 99){
+            type = CramomaticBallType::Shop2;
+        }else{
+            type = CramomaticBallType::Apricorn;
+        }
+        
+
+        // check whether the result is a good result
+        for (size_t i = 0; i < selected_balls.size(); i++){
+            CramomaticSelection selection = selected_balls[i];
+            if (!selection.is_bonus || is_bonus){
+                if (is_safari_sport){
+                    if (selection.ball_type == CramomaticBallType::Safari || selection.ball_type == CramomaticBallType::Sport){
+                        type = selection.ball_type;
+                    }
+                }
+                
+                if (selection.ball_type == type){
+                    CramomaticTarget target;
+                    target.ball_type = type;
+                    target.is_bonus = is_bonus;
+                    target.needed_advances = advances;
+                    possible_targets.emplace_back(target);
+
+                    priority_advances = 0;
+
+                    uint16_t priority = selection.priority;
+                    selected_balls.erase(
+                        std::remove_if(
+                            selected_balls.begin(),
+                            selected_balls.end(),
+                            [priority](CramomaticSelection sel){ return sel.priority <= priority; }
+                        )
+                        , selected_balls.end());
+                    break;
+                }
+
+            }
+        }
+        if (possible_targets.size() > 0){
+            if (selected_balls.empty()){
+                //priority_advances = MAX_PRIORITY_ADVANCES + 1;
+                break;
+            }
+            priority_advances++;
+        }
+
+        rng.next();
+        advances++;
+    }
+
+    // Choose the first result which doesn't overshadow a higher priority choice.
+    // Ignores rng advances done by NPCs when the menu closes
+    while (possible_targets.size() > 1){
+        auto last_target = possible_targets.end() - 1;
+        auto second_to_last_target = possible_targets.end() - 2;
+
+        if ((*last_target).needed_advances - (*second_to_last_target).needed_advances > MAX_PRIORITY_ADVANCES){
+            possible_targets.erase(last_target);
+        }else{
+            possible_targets.erase(second_to_last_target);
+        }
+    }
+
+    return possible_targets[0];
+}
+
+void CramomaticRNG::leave_to_overworld_and_interact(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    pbf_press_button(context, BUTTON_B, 2000ms, 40ms);
+    pbf_press_button(context, BUTTON_B, 80ms, 560ms);
+
+    pbf_mash_button(context, BUTTON_A, 2560ms);
+    pbf_wait(context, 1000ms);
+}
+
+void CramomaticRNG::choose_apricorn(SingleSwitchProgramEnvironment& env, ProControllerContext& context, bool sport){
+    // check whether the bag is open
+    context.wait_for_all_requests();
+    VideoOverlaySet boxes(env.console);
+    SelectionArrowFinder bag_arrow_detector(env.console, ImageFloatBox(0.465, 0.195, 0.054, 0.57));
+    bag_arrow_detector.make_overlays(boxes);
+
+    int ret = wait_until(env.console, context, Milliseconds(5000), { bag_arrow_detector });
+    if (ret < 0){
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "Could not detect bag.",
+            env.console
+        );
+    }
+
+    // select the apricorn(s)
+    pbf_wait(context, 1000ms);
+    pbf_press_button(context, BUTTON_A, 80ms, 240ms);
+    if (sport){
+        pbf_press_dpad(context, DPAD_DOWN, 160ms, 80ms);
+    }
+    pbf_press_button(context, BUTTON_A, 80ms, 240ms);
+    pbf_press_button(context, BUTTON_A, 80ms, 240ms);
+    if (sport){
+        pbf_press_dpad(context, DPAD_UP, 160ms, 80ms);
+    }
+    pbf_press_button(context, BUTTON_A, 80ms, 240ms);
+
+    pbf_mash_button(context, BUTTON_A, 5000ms);
+}
+
+std::pair<bool, std::string> CramomaticRNG::receive_ball(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    // receive ball and refuse to use the cram-o-matic again
+    VideoOverlaySet boxes(env.console);
+
+    SelectionArrowFinder arrow_detector(env.console, ImageFloatBox(0.350, 0.450, 0.500, 0.400));
+    arrow_detector.make_overlays(boxes);
+
+    OverlayBoxScope dialog_text(env.console, {0.21, 0.80, 0.53, 0.17});
+    OverlayBoxScope dialog_box(env.console, {0.70, 0.90, 0.03, 0.05});
+    const double LOG10P_THRESHOLD = -1.5;
+    std::string best_ball;
+
+    size_t presses = 0;
+    bool arrow_detected = false;
+
+    while (presses < 30 && !arrow_detected){
+        presses++;
+        pbf_press_button(context, BUTTON_B, 80ms, DIALOG_RELEASE_DURATION);
+        context.wait_for_all_requests();
+
+        VideoSnapshot screen = env.console.video().snapshot();
+        if (SAVE_SCREENSHOTS){
+            dump_debug_image(env.logger(), "cramomatic-rng", "receive", screen);
+        }
+
+        //  If we detect a dialog box, attempt to read the ball that was received.
+        ImageStats stats = image_stats(extract_box_reference(screen, dialog_box));
+//        cout << stats.average << stats.stddev << endl;
+        if (is_grey(stats, 0, 200, 5)){
+            OCR::StringMatchResult result = PokeballNameReader::instance().read_substring(
+                env.console, LANGUAGE,
+                extract_box_reference(screen, dialog_text),
+                {{0xff007f7f, 0xffc0ffff}}
+            );
+            result.clear_beyond_log10p(LOG10P_THRESHOLD);
+            if (best_ball.empty() && !result.results.empty()){
+                auto iter = result.results.begin();
+                if (iter->first < LOG10P_THRESHOLD){
+                    best_ball = iter->second.token;
+                }
+            }
+        }
+
+        if (arrow_detector.detect(screen)){
+            arrow_detected = true;
+        }
+    }
+    pbf_press_button(context, BUTTON_B, 80ms, 1000ms);
+    return {arrow_detected, best_ball};
+}
+
+void CramomaticRNG::recover_from_wrong_state(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    // Mash the B button to exit potential menus or dialog boxes
+    pbf_mash_button(context, BUTTON_B, 30s);
+
+    // take a step in case Hyde repositioned the player
+    pbf_move_left_joystick(context, {0, +1}, 1000ms, 80ms);
+
+    context.wait_for_all_requests();
+}
+
+
+void CramomaticRNG::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    CramomaticRNG_Descriptor::Stats& stats = env.current_stats<CramomaticRNG_Descriptor::Stats>();
+    env.update_stats();
+
+    std::vector<CramomaticSelection> selections = BALL_TABLE.selected_balls();
+    if (selections.empty()){
+        throw UserSetupError(env.console, "At least one type of ball needs to be selected!");
+    }
+
+
+    if (START_LOCATION.start_in_grip_menu()){
+        grip_menu_connect_go_home(context);
+        resume_game_back_out(
+            env.console,
+            context,
+            ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST,
+            1600ms
+        );
+    }else{
+        //  Connect the controller.
+        require_player(env.console, context, BUTTON_B);
+    }
+
+    static const std::set<std::string> APRIBALLS{
+        "fast-ball",
+        "friend-ball",
+        "lure-ball",
+        "level-ball",
+        "heavy-ball",
+        "love-ball",
+        "moon-ball",
+    };
+    static const std::set<std::string> RARE_BALLS{
+        "sport-ball",
+        "safari-ball",
+    };
+
+    Xoroshiro128Plus rng(0, 0);
+    bool is_state_valid = false;
+    uint32_t num_apricorn_one = NUM_APRICORN_ONE;
+    uint32_t num_apricorn_two = NUM_APRICORN_TWO;
+
+    // if there is no Sport Ball in the selected balls we ignore num_apricorn_two
+    bool sport_wanted = false;
+    for (CramomaticSelection selection : selections){
+        if (selection.ball_type == CramomaticBallType::Sport){
+            sport_wanted = true;
+            break;
+        }
+    }
+
+    size_t iteration = 0;
+    uint16_t state_errors = 0;
+    uint16_t apricorn_selection_errors = 0;
+    while (num_apricorn_one > 4 && (!sport_wanted || num_apricorn_two > 2)){
+        send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
+
+        //  Touch the date.
+        if (TOUCH_DATE_INTERVAL.ok_to_touch_now()){
+            env.log("Touching date to prevent rollover.");
+            ssf_press_button(context, BUTTON_HOME, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE0, 160ms);
+            touch_date_from_home(env.console, context, ConsoleSettings::instance().SETTINGS_TO_HOME_DELAY0);
+            resume_game_no_interact(env.console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST);
+        }
+
+        env.console.log("Cram-o-matic RNG iteration: " + std::to_string(iteration));
+        navigate_to_party(env, context);
+        context.wait_for_all_requests();
+
+        if (!is_state_valid){
+            rng = Xoroshiro128Plus(find_rng_state(env.console, context, SAVE_SCREENSHOTS, LOG_VALUES));
+//            rng = Xoroshiro128Plus(100, 10000);
+            is_state_valid = true;
+            stats.reads++;
+        }else{
+            rng = Xoroshiro128Plus(refind_rng_state(env.console, context, rng.get_state(), 0, MAX_UNKNOWN_ADVANCES, SAVE_SCREENSHOTS, LOG_VALUES));
+            stats.reads++;
+        }
+        env.update_stats();
+
+        Xoroshiro128PlusState rng_state = rng.get_state();
+        if (rng_state.s0 == 0 && rng_state.s1 == 0){
+            stats.errors++;
+            env.update_stats();
+
+            state_errors++;
+            if (state_errors >= 3){
+                OperationFailedExceptionWithScreenshot::fire(
+                    ErrorReportMode::SEND_ERROR_REPORT,
+                    "Detected invalid RNG state three times in a row.",
+                    env.console
+                );
+            }
+            VideoSnapshot screen = env.console.video().snapshot();
+            send_program_recoverable_error_notification(env, NOTIFICATION_ERROR_RECOVERABLE, "Detected invalid RNG state.", screen);
+            recover_from_wrong_state(env, context);
+            is_state_valid = false;
+            continue;
+        }
+
+        CramomaticTarget target = calculate_target(env, rng.get_state(), BALL_TABLE.selected_balls());
+        bool sport = target.ball_type == CramomaticBallType::Sport;
+        env.console.log("Needed advances: " + std::to_string(target.needed_advances));
+        num_apricorn_one -= sport ? 2 : 4;
+        num_apricorn_two -= sport ? 2 : 0;
+
+        do_rng_advances(
+            env.console, context,
+            rng,
+            target.needed_advances,
+            ADVANCE_PRESS_DURATION,
+            ADVANCE_RELEASE_DURATION
+        );
+        leave_to_overworld_and_interact(env, context);
+
+        try{
+            choose_apricorn(env, context, sport);
+        }catch (OperationFailedExceptionWithScreenshot& e){
+            stats.errors++;
+            env.update_stats();
+
+            apricorn_selection_errors++;
+            if (apricorn_selection_errors >= 3){
+                OperationFailedExceptionWithScreenshot::fire(
+                    ErrorReportMode::SEND_ERROR_REPORT,
+                    "Could not detect the bag three times on a row.",
+                env.console
+                );
+            }
+            send_program_recoverable_error_notification(
+                env,
+                NOTIFICATION_ERROR_RECOVERABLE,
+                e.message(),
+                *e.screenshot()
+            );
+            is_state_valid = false;
+            recover_from_wrong_state(env, context);
+            continue;
+        }
+
+        std::pair<bool, std::string> result = receive_ball(env, context);
+
+        //  Update ball stats.
+        if (!result.second.empty()){
+            stats.total_balls++;
+        }
+        auto iter = APRIBALLS.find(result.second);
+        if (iter != APRIBALLS.end()){
+            stats.apri_balls++;
+        }
+        iter = RARE_BALLS.find(result.second);
+        if (iter != RARE_BALLS.end()){
+            stats.sport_safari_balls++;
+        }
+
+        //  Out of apricorns.
+        if (!result.first || num_apricorn_one <= 4 || (sport_wanted && num_apricorn_two <= 2)){
+            throw_and_log<ProgramFinishedException>(env.console, "Out of apricorns.", env.console);
+        }
+
+
+#if 0
+//        cout << "Ball Slug = " << ball << endl;
+        if (result.first || num_apricorn_one <= 4 || (sport_wanted && num_apricorn_two <= 2)){
+        }else{
+            is_state_valid = false;
+            stats.errors++;
+        }
+#endif
+
+#if 0
+        if (!ball.empty() || num_apricorn_one <= 4 || (sport_wanted && num_apricorn_two <= 2)){
+            int amount = target.is_bonus ? 5 : 1;
+            if (target.is_bonus){
+                stats.bonus++;
+            }
+            if (target.ball_type == CramomaticBallType::Apricorn){
+                stats.apri_balls += amount;
+            }else if (target.ball_type == CramomaticBallType::Sport || target.ball_type == CramomaticBallType::Safari){
+                stats.sport_safari_balls += amount;
+            }
+            stats.total_balls += amount;
+        }else{
+            is_state_valid = false;
+            stats.errors++;
+        }
+#endif
+        env.update_stats();
+
+        state_errors = 0;
+        apricorn_selection_errors = 0;
+
+        iteration++;
+        stats.iterations++;
+        env.update_stats();
+    }
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+}
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/RNG/PokemonSwSh_CramomaticRNG.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/RNG/PokemonSwSh_CramomaticRNG.h
new file mode 100644
index 0000000000..6b1fd195c8
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/RNG/PokemonSwSh_CramomaticRNG.h
@@ -0,0 +1,87 @@
+/*  Cram-o-matic RNG Manipulation
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_CramomaticRNG_H
+#define PokemonAutomation_PokemonSwSh_CramomaticRNG_H
+
+#include "Common/Cpp/Options/StaticTextOption.h"
+#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "Common/Cpp/Options/TimeDurationOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "CommonTools/Options/LanguageOCROption.h"
+#include "NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "Pokemon/Pokemon_Xoroshiro128Plus.h"
+#include "VideoGames/PokemonSwSh/Options/PokemonSwSh_DateToucher.h"
+#include "VideoGames/PokemonSwSh/Options/PokemonSwSh_CramomaticTable.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+class CramomaticRNG_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    CramomaticRNG_Descriptor();
+
+    class Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+struct CramomaticTarget{
+    CramomaticBallType ball_type;
+    bool is_bonus;
+    size_t needed_advances;
+};
+
+class CramomaticRNG : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = CramomaticRNG_Descriptor;
+    CramomaticRNG();
+
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    StartInGripOrGameOption START_LOCATION;
+    OCR::LanguageOCROption LANGUAGE;
+    SimpleIntegerOption<uint32_t> NUM_APRICORN_ONE;
+    SimpleIntegerOption<uint32_t> NUM_APRICORN_TWO;
+    SimpleIntegerOption<uint8_t> NUM_NPCS;
+    CramomaticTable BALL_TABLE;
+
+    TouchDateIntervalOption TOUCH_DATE_INTERVAL;
+
+    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
+    EventNotificationsOption NOTIFICATIONS;
+
+    SectionDividerOption m_advanced_options;
+    SimpleIntegerOption<uint16_t> MAX_PRIORITY_ADVANCES;
+    SimpleIntegerOption<uint16_t> MAX_UNKNOWN_ADVANCES;
+    MillisecondsOption ADVANCE_PRESS_DURATION;
+    MillisecondsOption ADVANCE_RELEASE_DURATION;
+    MillisecondsOption DIALOG_RELEASE_DURATION;
+    BooleanCheckBoxOption SAVE_SCREENSHOTS;
+    BooleanCheckBoxOption LOG_VALUES;
+
+    void navigate_to_party(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+    CramomaticTarget calculate_target(SingleSwitchProgramEnvironment& env, Xoroshiro128PlusState state, std::vector<CramomaticSelection> wanted_balls);
+    void leave_to_overworld_and_interact(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+    void choose_apricorn(SingleSwitchProgramEnvironment& env, ProControllerContext& context, bool sport);
+    std::pair<bool, std::string> receive_ball(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+    void recover_from_wrong_state(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+};
+
+
+
+
+}
+}
+}
+#endif
+
+
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/RNG/PokemonSwSh_DailyHighlightRNG.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/RNG/PokemonSwSh_DailyHighlightRNG.cpp
new file mode 100644
index 0000000000..3bc0f5527b
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/RNG/PokemonSwSh_DailyHighlightRNG.cpp
@@ -0,0 +1,586 @@
+/*  RNG Manipulation of the Highlight Watt Trader in the Snowslide Slope area in the Crown Tundra
+ *
+ *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *
+ *  Based on Anubis' findings: https://docs.google.com/spreadsheets/u/0/d/1pNYtCJKRh_efX9LvzjCiA-0n2lGSFnVmSWwmPzgSOMw
+ *
+ */
+
+#include "CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/DateSpam/NintendoSwitch_HomeToDateTime.h"
+#include "NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManip.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "NintendoSwitch/NintendoSwitch_Settings.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonSwSh/PokemonSwSh_Settings.h"
+#include "VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.h"
+#include "VideoGames/PokemonSwSh/Resources/PokemonSwSh_DailyHighlightDatabase.h"
+#include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_DialogTriangleDetector.h"
+#include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_SelectionArrowFinder.h"
+#include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_YCommDetector.h"
+#include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_MenuNavigation.h"
+#include "VideoGames/PokemonSwSh/Programs/RNG/PokemonSwSh_BasicRNG.h"
+#include "VideoGames/PokemonSwSh/Programs/RNG/PokemonSwSh_DailyHighlightRNG.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+using namespace Pokemon;
+
+
+const DailyHighlightDatabase& DAILY_HIGHLIGHT_DATABASE(){
+    static DailyHighlightDatabase database("PokemonSwSh/DailyHighlights.json");
+    return database;
+}
+
+
+DailyHighlightRNG_Descriptor::DailyHighlightRNG_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonSwSh:DailyHighlightRNG",
+        STRING_POKEMON + " SwSh", "Daily Highlight RNG",
+        "Programs/PokemonSwSh/DailyHighlightRNG.html",
+        "Perform RNG manipulation to get rare items from the daily highlight trader.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_PerformanceClassSensitive,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+struct DailyHighlightRNG_Descriptor::Stats : public StatsTracker{
+public:
+    Stats()
+        : iterations(m_stats["Iterations"])
+        , reads(m_stats["Seed Reads"])
+        , errors(m_stats["Errors"])
+        , highlights(m_stats["Highlights"])
+    {
+        m_display_order.emplace_back("Iterations");
+        m_display_order.emplace_back("Seed Reads");
+        m_display_order.emplace_back("Highlights");
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+    }
+
+public:
+    std::atomic<uint64_t>& iterations;
+    std::atomic<uint64_t>& reads;
+    std::atomic<uint64_t>& errors;
+    std::atomic<uint64_t>& highlights;
+};
+std::unique_ptr<StatsTracker> DailyHighlightRNG_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+DailyHighlightRNG::DailyHighlightRNG()
+    : NUM_HIGHLIGHTS(
+        "<b>Number of Highlights:</b><br>How many daily highlights should be bought. <br>Zero will run until you stop the program.",
+        LockMode::UNLOCK_WHILE_RUNNING, 0)
+    , FIX_TIME_WHEN_DONE(
+        "<b>Fix Time when Done:</b><br>Fix the time after the program finishes.<br>Doesn't do anything if Number of Highlights is 0.",
+        LockMode::UNLOCK_WHILE_RUNNING, false)
+    , GO_HOME_WHEN_DONE(false)
+    , SAVE_INTERVAL(
+        "<b>Save Every this Many Day Skips:</b><br>Zero disables saving.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        20
+    )
+    , CALIBRATION_INTERAVAL(
+        "<b>Calibrate the Number of NPCs this Many Day Skips:</b><br>Zero will only calibrate once.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        10
+    )
+    , HIGHLIGHT_SELECTION(
+        "<b>Desired Highlights:</b>", 
+        "Highlight", 
+        DAILY_HIGHLIGHT_DATABASE().database(), 
+        "dream-ball")
+    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_STATUS_UPDATE,
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_RECOVERABLE,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+    , m_advanced_options(
+        "<font size=4><b>Advanced Options:</b> You should not need to touch anything below here.</font>"
+    )
+    , MAX_EXPECTED_NPCS(
+        "<b>Max Expected NPCs:</b><br>How many NPCs are expected in the area at most.",
+        LockMode::LOCK_WHILE_RUNNING,
+        8
+    )
+    , CALIBRATION_REPEATS(
+        "<b>Calibration Repeats:</b><br>How many times the number of NPCs is checked per calibration.",
+        LockMode::LOCK_WHILE_RUNNING,
+        5
+    )
+    , CALIBRATION_THRESHOLD(
+        "<b>Calibration Treshold:</b><br>How many NPC counts need to be the same.<br>This needs to be less than or equal to Calibration Repeats.",
+        LockMode::LOCK_WHILE_RUNNING,
+        3
+    )
+    , MAX_UNKNOWN_ADVANCES(
+        "<b>Max Unknown Advances:</b><br>How many advances to check when updating the rng state.",
+        LockMode::LOCK_WHILE_RUNNING,
+        100000
+    )
+    , ADVANCE_PRESS_DURATION(
+        "<b>Advance Press Duration:</b><br>Hold the button down for this long to advance once.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "80 ms"
+    )
+    , ADVANCE_RELEASE_DURATION(
+        "<b>Advance Release Duration:</b><br>After releasing the button, wait this long before pressing it again.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "80 ms"
+    )
+    , SAVE_SCREENSHOTS(
+        "<b>Save Debug Screenshots:</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        false
+    )
+    , LOG_VALUES(
+        "<b>Log Animation Values:</br>",
+        LockMode::LOCK_WHILE_RUNNING,
+        false
+    )
+{
+    PA_ADD_OPTION(START_LOCATION);
+
+    PA_ADD_OPTION(NUM_HIGHLIGHTS);
+    PA_ADD_OPTION(FIX_TIME_WHEN_DONE);
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+    PA_ADD_OPTION(SAVE_INTERVAL);
+    PA_ADD_OPTION(CALIBRATION_INTERAVAL);
+    PA_ADD_OPTION(HIGHLIGHT_SELECTION);
+
+    PA_ADD_OPTION(NOTIFICATIONS);
+
+    PA_ADD_STATIC(m_advanced_options);
+    PA_ADD_OPTION(CALIBRATION_REPEATS);
+    PA_ADD_OPTION(CALIBRATION_THRESHOLD);
+    PA_ADD_OPTION(MAX_EXPECTED_NPCS);
+    PA_ADD_OPTION(MAX_UNKNOWN_ADVANCES);
+    PA_ADD_OPTION(ADVANCE_PRESS_DURATION);
+    PA_ADD_OPTION(ADVANCE_RELEASE_DURATION);
+    PA_ADD_OPTION(SAVE_SCREENSHOTS);
+    PA_ADD_OPTION(LOG_VALUES);
+}
+
+void DailyHighlightRNG::move_to_trader(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    pbf_move_right_joystick(context, {+1, 0}, 460ms, 80ms);
+    pbf_move_left_joystick(context, {0, +1}, 1280ms, 80ms);
+}
+
+void DailyHighlightRNG::interact_with_trader(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    VideoOverlaySet boxes(env.console);
+    SelectionArrowFinder arrow_detector(env.console, ImageFloatBox(0.5, 0.58, 0.2, 0.08));
+    YCommIconWatcher y_comm_icon_detector;
+    DialogTriangleWatcher triangle_detector(COLOR_DARKGREEN);
+    size_t tries = 0;
+
+    while (true){
+        context.wait_for_all_requests();
+        int ret = wait_until(env.console, context, 1000ms, { y_comm_icon_detector, triangle_detector, arrow_detector });
+        if (ret == 2){
+            return;
+        }
+        if (tries >= 10){
+            DailyHighlightRNG_Descriptor::Stats& stats = env.current_stats<DailyHighlightRNG_Descriptor::Stats>();
+            stats.errors++;
+            OperationFailedExceptionWithScreenshot::fire(
+                ErrorReportMode::SEND_ERROR_REPORT,
+                "Failed to talk to the trader.",
+                env.console
+            );
+        }
+        tries++;
+        if (ret == 0 || ret == 1){
+            pbf_press_button(context, BUTTON_A, 80ms, 80ms);
+        }
+        // ret == -1: probably an inbetween screen; no a press
+    }
+}
+
+void DailyHighlightRNG::buy_highlight(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    // The player is expected to be in main dialog of the trader
+    env.log("Buying Highlight.");
+    env.console.overlay().add_log("Buying Highlight!", COLOR_WHITE);
+    pbf_press_dpad(context, DPAD_DOWN, 160ms, 160ms);
+
+    pbf_press_button(context, BUTTON_A, 160ms, 160ms);
+    context.wait_for_all_requests();
+
+    VideoOverlaySet boxes(env.console);
+    SelectionArrowFinder arrow_detector(env.console, ImageFloatBox(0.5, 0.58, 0.2, 0.08));
+    arrow_detector.make_overlays(boxes);
+
+    int ret = run_until<ProControllerContext>(
+        env.console,
+        context, 
+        [](ProControllerContext& context){ 
+            pbf_mash_button(context, BUTTON_A, 20000ms);
+        },
+        { {arrow_detector} }
+    );
+
+    if (ret < 0){
+        DailyHighlightRNG_Descriptor::Stats& stats = env.current_stats<DailyHighlightRNG_Descriptor::Stats>();
+        stats.errors++;
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "Could not detect dialog.",
+            env.console
+        );
+    }
+}
+
+void DailyHighlightRNG::navigate_to_party(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    pbf_press_button(context, BUTTON_X, 80ms, GameSettings::instance().OVERWORLD_TO_MENU_DELAY0);
+    pbf_wait(context, 200ms);
+    navigate_to_menu_app(env.console, context, 1);
+    pbf_press_button(context, BUTTON_A, 80ms, 3000ms);
+}
+
+void DailyHighlightRNG::save_game(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    env.log("Saving.");
+    env.console.overlay().add_log("Saving!", COLOR_WHITE);
+    pbf_press_button(context, BUTTON_X, 80ms, GameSettings::instance().OVERWORLD_TO_MENU_DELAY0);
+    pbf_wait(context, 200ms);
+    pbf_press_button(context, BUTTON_R, 80ms, 2000ms);
+    pbf_mash_button(context, BUTTON_A, 500ms);
+
+    return_to_overworld(env, context);
+}
+
+uint8_t DailyHighlightRNG::calibrate_num_npc_from_party(SingleSwitchProgramEnvironment& env, ProControllerContext& context, Pokemon::Xoroshiro128Plus& rng){
+    env.log("Calibrating NPC count.");
+    env.console.overlay().add_log("Calibrating NPC count.", COLOR_WHITE);
+
+    DailyHighlightRNG_Descriptor::Stats& stats = env.current_stats<DailyHighlightRNG_Descriptor::Stats>();
+    size_t max_expected_npcs = MAX_EXPECTED_NPCS;
+    size_t calibration_repeats = CALIBRATION_REPEATS;
+    size_t calibration_threshold = CALIBRATION_THRESHOLD;
+    size_t finished_calibration_steps = 0;
+    std::vector<size_t> npc_counts(max_expected_npcs, 0);
+    while (finished_calibration_steps < calibration_repeats){
+        env.log("Calibration: " + std::to_string(finished_calibration_steps+1) + "/" + std::to_string(calibration_repeats));
+        env.console.overlay().add_log("Calibration: " + std::to_string(finished_calibration_steps+1) + "/" + std::to_string(calibration_repeats), COLOR_WHITE);
+
+        return_to_overworld(env, context);
+        navigate_to_party(env, context);
+
+        Xoroshiro128PlusState state_before_menu_close(rng.get_state());
+        std::pair<Xoroshiro128PlusState, uint64_t> result = refind_rng_state_and_animations(env.console, context, rng.get_state(), 0, 100, SAVE_SCREENSHOTS, LOG_VALUES);
+        Xoroshiro128PlusState new_state = result.first;
+        uint64_t additional_advances = result.second;
+
+        // Calculate state for possible NPC counts
+        std::vector<Xoroshiro128PlusState> rng_states;
+
+        for (uint8_t npcs = 0; npcs <= max_expected_npcs; npcs++){
+            Xoroshiro128PlusState temp_state = predict_state_after_menu_close(state_before_menu_close, npcs);
+            Xoroshiro128Plus temp_rng(temp_state);
+
+            // Do advances that were needed to refind current state
+            for (size_t i = 0; i < additional_advances; i++){
+                temp_rng.next();
+            }
+            rng_states.push_back(temp_rng.get_state());
+        }
+
+        // Compare current state to expected states
+        uint8_t num_npcs = 0;
+        uint8_t possible_choices = 0;
+        for (uint8_t i = 0; i <= max_expected_npcs; i++){
+            if (rng_states[i].s0 == new_state.s0 && rng_states[i].s1 == new_state.s1){
+                num_npcs = i;
+                possible_choices++;
+            }
+        }
+        rng.state = new_state;
+
+        stats.reads++;
+
+        // Add another calibration round if multiple npcs counts are possible
+        if (possible_choices > 1){
+            env.log("NPC count is ambiguous.");
+            env.console.overlay().add_log("NPC count is ambiguous. Repeat calibration.", COLOR_WHITE);
+            continue;
+        }
+
+        env.console.log("Calculated there are " + std::to_string(num_npcs) + " NPCs.");
+        env.console.overlay().add_log(std::to_string(num_npcs) + " NPCs", COLOR_WHITE);
+        npc_counts[num_npcs]++;
+        finished_calibration_steps++;
+
+        if (npc_counts[num_npcs] >= calibration_threshold){
+            env.console.log("Final Calibration: " + std::to_string(num_npcs) + " NPCs.");
+            env.console.overlay().add_log("Final Calibration: " + std::to_string(num_npcs) + " NPCs", COLOR_WHITE);
+
+            return num_npcs;
+        }
+    }
+
+    OperationFailedExceptionWithScreenshot::fire(
+        ErrorReportMode::SEND_ERROR_REPORT,
+        "NPC is in the wrong state or an unexpected number of NPCs is in the area.",
+        env.console
+    );
+}
+
+size_t DailyHighlightRNG::calculate_target(SingleSwitchProgramEnvironment& env, Xoroshiro128PlusState state, uint8_t num_npcs, std::vector<std::string> wanted_highlights){
+    Xoroshiro128Plus rng(state);
+    size_t advances = 0;
+    bool found_advance_amount = false;
+
+    std::vector<std::pair<uint16_t, uint16_t>> ranges; 
+    for (std::string slug : wanted_highlights){
+        ranges.push_back(DAILY_HIGHLIGHT_DATABASE().get_range_for_slug(slug));
+    }
+
+    while (!found_advance_amount){
+        // Calculate the result for the current temp_rng state
+
+        Xoroshiro128PlusState temp_state = predict_state_after_menu_close(rng.get_state(), num_npcs);
+        Xoroshiro128Plus temp_rng(temp_state);
+
+        uint64_t highlight_roll = temp_rng.nextInt(1000);
+
+        for (auto& range : ranges){
+            if (range.first <= highlight_roll && range.second >= highlight_roll){
+                found_advance_amount = true;
+                env.console.log("Target highlight roll: " + std::to_string(highlight_roll));
+            }
+        }
+        
+        if (!found_advance_amount){
+            rng.next();
+            advances++;
+        }
+    }
+
+    return advances;
+}
+
+void DailyHighlightRNG::prepare_game_state(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    env.log("Prepare player position.");
+    env.console.overlay().add_log("Reset Player Position.", COLOR_WHITE);
+    
+    // Open map
+    pbf_press_button(context, BUTTON_X, 160ms, GameSettings::instance().OVERWORLD_TO_MENU_DELAY0);
+    pbf_wait(context, 200ms);
+    navigate_to_menu_app(env.console, context, 5);
+    pbf_wait(context, 200ms);
+    pbf_press_button(context, BUTTON_A, 160ms, 4000ms);
+
+    // Fly to Snowslide Slope
+    pbf_move_left_joystick(context, {+0.567, -0.646}, 160ms, 160ms);
+    pbf_move_left_joystick(context, {+0.173, -0.291}, 160ms, 160ms);
+    pbf_mash_button(context, BUTTON_A, 1500ms);
+    return_to_overworld(env, context);
+}
+
+void DailyHighlightRNG::return_to_overworld(SingleSwitchProgramEnvironment& env, ProControllerContext& context, bool wait_after_detection){
+    context.wait_for_all_requests();
+    env.console.log("Returning to the overworld.");
+    YCommIconWatcher y_comm_icon_detector;
+    int ret = run_until<ProControllerContext>(
+        env.console, context,
+        [](ProControllerContext& context){
+            pbf_mash_button(context, BUTTON_B, 20000ms);
+        },
+        { {y_comm_icon_detector} }
+    );
+    if (ret != 0){
+        DailyHighlightRNG_Descriptor::Stats& stats = env.current_stats<DailyHighlightRNG_Descriptor::Stats>();
+        stats.errors++;
+        OperationFailedExceptionWithScreenshot::fire(
+            ErrorReportMode::SEND_ERROR_REPORT,
+            "Cannot detect the Y-Comm icon.",
+            env.console
+        );
+    }
+
+    // Sometimes Y-Comm is detected before button presses are accepted again
+    if (wait_after_detection){
+        context.wait_for(300ms); 
+    }
+}
+
+void DailyHighlightRNG::advance_date(SingleSwitchProgramEnvironment& env, ProControllerContext& context, uint8_t& year){
+    context.wait_for(200ms);
+    pbf_press_button(context, BUTTON_HOME, 160ms, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE0);
+    home_to_date_time(env.console, context, true);
+    pbf_press_button(context, BUTTON_A, 160ms, 240ms);
+    context.wait_for_all_requests();
+
+    VideoOverlaySet overlays(env.console.overlay());
+    DateChangeWatcher date_reader(env.console);
+    date_reader.make_overlays(overlays);
+
+    DateTime date{ 2000, 12, 31, 1, 0, 0 }; // 31st December for fixed Normal weather
+    
+    if (year >= MAX_YEAR){
+        date_reader.set_date(env.program_info(), env.console, context, date);
+        pbf_press_button(context, BUTTON_A, 160ms, 240ms);
+        pbf_press_button(context, BUTTON_A, 160ms, 240ms);
+        year = 1;
+    }
+
+    date.year += year;
+    date_reader.set_date(env.program_info(), env.console, context, date);
+    pbf_press_button(context, BUTTON_A, 160ms, 240ms);
+
+    pbf_press_button(context, BUTTON_HOME, 160ms, ConsoleSettings::instance().SETTINGS_TO_HOME_DELAY0);
+    resume_game_from_home(env.console, context, false);
+    year++;
+}
+
+
+void DailyHighlightRNG::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    DailyHighlightRNG_Descriptor::Stats& stats = env.current_stats<DailyHighlightRNG_Descriptor::Stats>();
+    env.update_stats();
+
+    std::vector<std::string> wanted_highlights = HIGHLIGHT_SELECTION.all_slugs();
+    if (wanted_highlights.empty()){
+        throw UserSetupError(env.console, "At least one highlight item needs to be selected!");
+    }
+
+    if (START_LOCATION.start_in_grip_menu()){
+        grip_menu_connect_go_home(context);
+    }else{
+        //  Connect the controller.
+        require_player(env.console, context, BUTTON_B);
+    }
+
+
+    Xoroshiro128Plus rng(0, 0);
+    uint8_t num_npcs = 0;
+    size_t iterations = 0;
+    size_t assumed_successful_iterations = 0;
+    size_t bought_highlights = 0;
+    uint8_t year = MAX_YEAR;
+    uint16_t state_errors = 0;
+
+    while (bought_highlights < NUM_HIGHLIGHTS || NUM_HIGHLIGHTS <= 0){
+        iterations++;
+        stats.iterations++;
+        env.update_stats();
+        send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
+        env.console.log("Daily Highlight RNG iteration: " + std::to_string(iterations));
+        env.console.overlay().add_log("Iteration: " + std::to_string(iterations), COLOR_WHITE);
+
+        if (SAVE_INTERVAL > 0 && iterations % SAVE_INTERVAL == 0){
+            save_game(env, context);
+        }
+
+        return_to_overworld(env, context);
+
+        if (assumed_successful_iterations <= 0){
+            prepare_game_state(env, context);
+
+            // open and close the menu and immediately walk to the trader
+            pbf_press_button(context, BUTTON_X, 160ms, GameSettings::instance().OVERWORLD_TO_MENU_DELAY0);
+            return_to_overworld(env, context);
+            move_to_trader(env, context);
+            interact_with_trader(env, context);
+
+            return_to_overworld(env, context);
+        }
+
+        advance_date(env, context, year);
+        navigate_to_party(env, context);
+        context.wait_for_all_requests();
+
+        // (Re-)Find RNG state
+        if (assumed_successful_iterations <= 0){
+            env.log("Finding initial rng state.");
+            env.console.overlay().add_log("Initial RNG state:", COLOR_WHITE);
+            rng = Xoroshiro128Plus(find_rng_state(env.console, context, SAVE_SCREENSHOTS, LOG_VALUES));
+            stats.reads++;
+        }else{
+            env.log("Refinding rng state.");
+            env.console.overlay().add_log("New RNG state:", COLOR_WHITE);
+            rng = Xoroshiro128Plus(refind_rng_state(env.console, context, rng.get_state(), 0, MAX_UNKNOWN_ADVANCES, SAVE_SCREENSHOTS, LOG_VALUES));
+            stats.reads++;
+        }
+
+        Xoroshiro128PlusState rng_state = rng.get_state();
+        if (rng_state.s0 == 0 && rng_state.s1 == 0){
+            stats.errors++;
+            env.update_stats();
+
+            state_errors++;
+            if (state_errors >= 3){
+                OperationFailedExceptionWithScreenshot::fire(
+                    ErrorReportMode::SEND_ERROR_REPORT,
+                    "Detected invalid RNG state three times in a row.",
+                    env.console
+                );
+            }
+            VideoSnapshot screen = env.console.video().snapshot();
+            send_program_recoverable_error_notification(env, NOTIFICATION_ERROR_RECOVERABLE, "Detected invalid RNG state.", screen);
+            assumed_successful_iterations = 0;
+            continue;
+        }
+
+        // Calibrate number of NPCs in the area and check whether the trader is in the slow state
+        if ((CALIBRATION_INTERAVAL > 0 && assumed_successful_iterations % CALIBRATION_INTERAVAL == 0) || assumed_successful_iterations <= 0){
+            try{
+                num_npcs = calibrate_num_npc_from_party(env, context, rng);
+            }
+            catch (OperationFailedExceptionWithScreenshot& exception){
+                send_program_recoverable_error_notification(
+                    env,
+                    NOTIFICATION_ERROR_RECOVERABLE,
+                    exception.message(),
+                    *exception.screenshot()
+                );
+                assumed_successful_iterations = 0;
+                stats.errors++;
+                continue;
+            }
+        }
+
+        // Do required advances
+        size_t target_advances = calculate_target(env, rng.get_state(), num_npcs, HIGHLIGHT_SELECTION.all_slugs());
+        env.console.log("Needed advances: " + std::to_string(target_advances));
+        do_rng_advances(env.console, context, rng, target_advances, ADVANCE_PRESS_DURATION, ADVANCE_RELEASE_DURATION);
+
+        // Talk to NPC and buy highlight
+        return_to_overworld(env, context, false);
+        interact_with_trader(env, context);
+        if (assumed_successful_iterations >= 2){
+            buy_highlight(env, context);
+            bought_highlights++;
+            stats.highlights++;
+        }
+        return_to_overworld(env, context);
+        
+        env.update_stats();
+        assumed_successful_iterations++;
+        state_errors = 0;
+    }
+
+    if (FIX_TIME_WHEN_DONE){
+        pbf_press_button(context, BUTTON_HOME, 160ms, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE0);
+        home_to_date_time(env.console, context, false);
+        pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+        pbf_press_button(context, BUTTON_A, 160ms, 840ms);
+        pbf_press_button(context, BUTTON_HOME, 160ms, ConsoleSettings::instance().SETTINGS_TO_HOME_DELAY0);
+        resume_game_from_home(env.console, context);
+    }
+    GO_HOME_WHEN_DONE.run_end_of_program(context);
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH, "Finished buying " + std::to_string(bought_highlights) + " daily highlights!", env.console.video().snapshot());
+}
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/RNG/PokemonSwSh_DailyHighlightRNG.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/RNG/PokemonSwSh_DailyHighlightRNG.h
new file mode 100644
index 0000000000..3f0ab4aa96
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/RNG/PokemonSwSh_DailyHighlightRNG.h
@@ -0,0 +1,86 @@
+/*  RNG Manipulation of the Highlight Watt Trader in the Snowslide Slope area in the Crown Tundra
+ *
+ *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *
+ *  Based on Anubis' findings: https://docs.google.com/spreadsheets/u/0/d/1pNYtCJKRh_efX9LvzjCiA-0n2lGSFnVmSWwmPzgSOMw/htmlview
+ * 
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_DailyHighlightRNG_H
+#define PokemonAutomation_PokemonSwSh_DailyHighlightRNG_H
+
+#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "Common/Cpp/Options/StaticTextOption.h"
+#include "Common/Cpp/Options/TimeDurationOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "CommonTools/Options/StringSelectTableOption.h"
+#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+#include "NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "Pokemon/Pokemon_Xoroshiro128Plus.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+class DailyHighlightRNG_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    DailyHighlightRNG_Descriptor();
+
+    struct Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+class DailyHighlightRNG : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = DailyHighlightRNG_Descriptor;
+    DailyHighlightRNG();
+
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    StartInGripOrGameOption START_LOCATION;
+    SimpleIntegerOption<uint16_t> NUM_HIGHLIGHTS;
+    BooleanCheckBoxOption FIX_TIME_WHEN_DONE;
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
+    SimpleIntegerOption<uint16_t> SAVE_INTERVAL;
+    SimpleIntegerOption<uint16_t> CALIBRATION_INTERAVAL;
+    StringSelectTableOption HIGHLIGHT_SELECTION;
+
+    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
+    EventNotificationsOption NOTIFICATIONS;
+
+    SectionDividerOption m_advanced_options;
+    SimpleIntegerOption<uint8_t> MAX_EXPECTED_NPCS;
+    SimpleIntegerOption<uint8_t> CALIBRATION_REPEATS;
+    SimpleIntegerOption<uint8_t> CALIBRATION_THRESHOLD;
+    SimpleIntegerOption<uint32_t> MAX_UNKNOWN_ADVANCES;
+    MillisecondsOption ADVANCE_PRESS_DURATION;
+    MillisecondsOption ADVANCE_RELEASE_DURATION;
+    BooleanCheckBoxOption SAVE_SCREENSHOTS;
+    BooleanCheckBoxOption LOG_VALUES;
+
+    void move_to_trader(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+    void interact_with_trader(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+    void return_to_overworld(SingleSwitchProgramEnvironment& env, ProControllerContext& context, bool wait_after_detection = true);
+    void buy_highlight(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+    uint8_t calibrate_num_npc_from_party(SingleSwitchProgramEnvironment& env, ProControllerContext& context, Pokemon::Xoroshiro128Plus& rng);
+    void navigate_to_party(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+    size_t calculate_target(SingleSwitchProgramEnvironment& env, Pokemon::Xoroshiro128PlusState state, uint8_t num_npcs, std::vector<std::string> wanted_highlights);
+    void prepare_game_state(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+    void save_game(SingleSwitchProgramEnvironment& env, ProControllerContext& context);
+    void advance_date(SingleSwitchProgramEnvironment& env, ProControllerContext& context, uint8_t& year);
+};
+
+
+
+
+}
+}
+}
+#endif
+
+
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/RNG/PokemonSwSh_SeedFinder.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/RNG/PokemonSwSh_SeedFinder.cpp
new file mode 100644
index 0000000000..b323e0a269
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/RNG/PokemonSwSh_SeedFinder.cpp
@@ -0,0 +1,145 @@
+/*  RNG Manipulation SeedFinder
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <string>
+#include "Common/Cpp/Exceptions.h"
+#include "Common/Cpp/PrettyPrint.h"
+#include "NintendoSwitch/NintendoSwitch_Settings.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
+#include "VideoGames/PokemonSwSh/Programs/RNG/PokemonSwSh_BasicRNG.h"
+
+#include "VideoGames/PokemonSwSh/Programs/RNG/PokemonSwSh_SeedFinder.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+using namespace Pokemon;
+
+SeedFinder_Descriptor::SeedFinder_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonSwSh:SeedFinder",
+        STRING_POKEMON + " SwSh", "Seed Finder",
+        "Programs/PokemonSwSh/SeedFinder.html",
+        "Finds the current state to be used for manual RNG manipulation.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+SeedFinder::SeedFinder()
+    : STATE_0(
+        false,
+        "<b>state[0]:</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        "",
+        ""
+    )
+    , STATE_1(
+        false,
+        "<b>state[1]:</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        "",
+        ""
+    )
+    , UPDATE_STATE(
+        "<b>Update State</b>:<br>Use the last known state to update the rng state.",
+        LockMode::LOCK_WHILE_RUNNING,
+        false
+    )
+    , MIN_ADVANCES(
+        "<b>Min Advances:</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        0
+    )
+    , MAX_ADVANCES(
+        "<b>Max Advances:</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        10000
+    )
+    , m_advanced_options(
+        "<font size=4><b>Advanced Options:</b> You should not need to touch anything below here.</font>"
+    )
+    , SAVE_SCREENSHOTS(
+        "<b>Save Debug Screenshots:</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        false
+    )
+    , LOG_VALUES(
+        "<b>Log Animation Values:</br>",
+        LockMode::LOCK_WHILE_RUNNING,
+        false
+    )
+
+{
+    PA_ADD_OPTION(START_LOCATION);
+    PA_ADD_OPTION(STATE_0);
+    PA_ADD_OPTION(STATE_1);
+    PA_ADD_OPTION(UPDATE_STATE);
+    PA_ADD_OPTION(MIN_ADVANCES);
+    PA_ADD_OPTION(MAX_ADVANCES);
+
+    PA_ADD_STATIC(m_advanced_options);
+    PA_ADD_OPTION(SAVE_SCREENSHOTS);
+    PA_ADD_OPTION(LOG_VALUES);
+}
+
+
+
+void SeedFinder::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    Xoroshiro128PlusState state(0, 0);
+    // sanitize STATE_0 and STATE_1 and make ints
+    if (UPDATE_STATE){
+        try{
+            state.s0 = std::stoull(STATE_0, nullptr, 16);
+            state.s1 = std::stoull(STATE_1, nullptr, 16);
+        }catch (std::invalid_argument&){
+            throw UserSetupError(env.console, "State is invalid.");
+        }catch (std::out_of_range&){
+            throw UserSetupError(env.console, "State is invalid. Are there any extra characters?");
+        }
+
+        // clean up STATE_0 and STATE_1
+        env.console.log("Known state: " + tostr_hex(state.s0));
+        env.console.log("Known state: " + tostr_hex(state.s1));
+        STATE_0.set(tostr_hex(state.s0));
+        STATE_1.set(tostr_hex(state.s1));
+    }
+
+
+    if (START_LOCATION.start_in_grip_menu()){
+        grip_menu_connect_go_home(context);
+        resume_game_back_out(
+            env.console,
+            context,
+            ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST,
+            1600ms
+        );
+    }else{
+        //  Connect the controller.
+        require_player(env.console, context, BUTTON_LEFT);
+    }
+
+
+    if (UPDATE_STATE){
+        state = refind_rng_state(env.console, context, state, MIN_ADVANCES, MAX_ADVANCES, SAVE_SCREENSHOTS, LOG_VALUES);
+    }else{
+        state = find_rng_state(env.console, context, SAVE_SCREENSHOTS, LOG_VALUES);
+    }
+
+    // show state to the user
+    STATE_0.set(tostr_hex(state.s0));
+    STATE_1.set(tostr_hex(state.s1));
+}
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/RNG/PokemonSwSh_SeedFinder.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/RNG/PokemonSwSh_SeedFinder.h
new file mode 100644
index 0000000000..56322220cd
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/RNG/PokemonSwSh_SeedFinder.h
@@ -0,0 +1,57 @@
+/*  RNG Manipulation SeedFinder
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_SeedFinder_H
+#define PokemonAutomation_PokemonSwSh_SeedFinder_H
+
+#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "Common/Cpp/Options/StaticTextOption.h"
+#include "Common/Cpp/Options/StringOption.h"
+#include "NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+class SeedFinder_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    SeedFinder_Descriptor();
+};
+
+
+class SeedFinder : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = SeedFinder_Descriptor;
+    SeedFinder();
+
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    StartInGripOrGameOption START_LOCATION;
+    
+    StringOption STATE_0;
+    StringOption STATE_1;
+    BooleanCheckBoxOption UPDATE_STATE;
+    SimpleIntegerOption<uint64_t> MIN_ADVANCES;
+    SimpleIntegerOption<uint64_t> MAX_ADVANCES;
+
+    SectionDividerOption m_advanced_options;
+    BooleanCheckBoxOption SAVE_SCREENSHOTS;
+    BooleanCheckBoxOption LOG_VALUES;
+};
+
+
+
+
+}
+}
+}
+#endif
+
+
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-BerryTree.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-BerryTree.cpp
new file mode 100644
index 0000000000..d46a2f549c
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-BerryTree.cpp
@@ -0,0 +1,182 @@
+/*  Shiny Hunt Autonomous - Berry Tree
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/NintendoSwitch_Settings.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "NintendoSwitch/Programs/DateSpam/NintendoSwitch_HomeToDateTime.h"
+#include "VideoGames/PokemonSwSh/PokemonSwSh_Settings.h"
+#include "VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.h"
+#include "VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_StartBattleDetector.h"
+#include "VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleMenuDetector.h"
+#include "VideoGames/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_ShinyEncounterDetector.h"
+#include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
+#include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_EncounterHandler.h"
+#include "PokemonSwSh_ShinyHuntAutonomous-BerryTree.h"
+
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+ShinyHuntAutonomousBerryTree_Descriptor::ShinyHuntAutonomousBerryTree_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonSwSh:ShinyHuntAutonomousBerryTree",
+        STRING_POKEMON + " SwSh", "Shiny Hunt Autonomous - Berry Tree",
+        "Programs/PokemonSwSh/ShinyHuntAutonomous-BerryTree.html",
+        "Automatically hunt for shiny berry tree " + STRING_POKEMON + " using video feedback.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_PerformanceClassSensitive,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+std::unique_ptr<StatsTracker> ShinyHuntAutonomousBerryTree_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new ShinyHuntTracker(true));
+}
+
+
+
+ShinyHuntAutonomousBerryTree::ShinyHuntAutonomousBerryTree()
+    : GO_HOME_WHEN_DONE(false)
+    , ENCOUNTER_BOT_OPTIONS(false, true)
+    , NOTIFICATIONS({
+        &ENCOUNTER_BOT_OPTIONS.NOTIFICATION_NONSHINY,
+        &ENCOUNTER_BOT_OPTIONS.NOTIFICATION_SHINY,
+        &ENCOUNTER_BOT_OPTIONS.NOTIFICATION_CATCH_SUCCESS,
+        &ENCOUNTER_BOT_OPTIONS.NOTIFICATION_CATCH_FAILED,
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+    , m_advanced_options(
+        "<font size=4><b>Advanced Options:</b> You should not need to touch anything below here.</font>"
+    )
+    , EXIT_BATTLE_TIMEOUT0(
+        "<b>Exit Battle Timeout:</b><br>After running, wait this long to return to overworld.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "10 s"
+    )
+{
+    PA_ADD_OPTION(START_LOCATION);
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+
+    PA_ADD_OPTION(LANGUAGE);
+    PA_ADD_OPTION(ENCOUNTER_BOT_OPTIONS);
+    PA_ADD_OPTION(NOTIFICATIONS);
+
+    PA_ADD_STATIC(m_advanced_options);
+    PA_ADD_OPTION(EXIT_BATTLE_TIMEOUT0);
+}
+
+
+
+
+void ShinyHuntAutonomousBerryTree::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    if (START_LOCATION.start_in_grip_menu()){
+        grip_menu_connect_go_home(context);
+        resume_game_no_interact(env.console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST);
+    }else{
+        //  Connect the controller.
+        require_player(env.console, context, BUTTON_B);
+    }
+
+    ShinyHuntTracker& stats = env.current_stats<ShinyHuntTracker>();
+    env.update_stats();
+
+    StandardEncounterHandler handler(
+        env, env.console, context,
+        LANGUAGE,
+        ENCOUNTER_BOT_OPTIONS,
+        stats
+    );
+
+    uint8_t year = MAX_YEAR;
+    while (true){
+        ssf_press_button(context, BUTTON_HOME, GameSettings::instance().GAME_TO_HOME_DELAY_FAST0, 160ms);
+        home_roll_date_enter_game_autorollback(env.console, context, year);
+//        home_to_date_time(context, true, true);
+//        neutral_date_skip(context);
+//        settings_to_enter_game(context, true);
+        pbf_mash_button(context, BUTTON_B, 720ms);
+        context.wait_for_all_requests();
+
+        {
+            StandardBattleMenuWatcher battle_menu_detector(false);
+            StartBattleWatcher start_battle_detector;
+
+            int result = run_until<ProControllerContext>(
+                env.console, context,
+                [](ProControllerContext& context){
+                    pbf_mash_button(context, BUTTON_A, 60s);
+                },
+                {
+                    {battle_menu_detector},
+                    {start_battle_detector},
+                }
+            );
+
+            switch (result){
+            case 0:
+                env.log("Unexpected battle menu.", COLOR_RED);
+                stats.add_error();
+                env.update_stats();
+                pbf_mash_button(context, BUTTON_B, 1000ms);
+                run_away(env.console, context, EXIT_BATTLE_TIMEOUT0);
+                continue;
+            case 1:
+                env.log("Battle started!");
+                break;
+            default:
+                stats.add_error();
+                env.update_stats();
+                env.log("Timed out.");
+                continue;
+            }
+        }
+
+        //  Detect shiny.
+        ShinyDetectionResult result = detect_shiny_battle(
+            env.console, context,
+            SHINY_BATTLE_REGULAR,
+            std::chrono::seconds(30)
+        );
+
+        bool stop = handler.handle_standard_encounter_end_battle(
+            result, EXIT_BATTLE_TIMEOUT0
+        );
+        if (stop){
+            break;
+        }
+//        pbf_mash_button(context, BUTTON_B, 10s);
+    }
+
+    pbf_press_button(context, BUTTON_HOME, 160ms, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE0);
+
+    home_to_date_time(env.console, context, false);
+    pbf_press_button(context, BUTTON_A, 40ms, 40ms);
+    pbf_press_button(context, BUTTON_A, 40ms, 80ms);
+    pbf_press_button(context, BUTTON_HOME, 80ms, ConsoleSettings::instance().SETTINGS_TO_HOME_DELAY0);
+
+    if (!GO_HOME_WHEN_DONE){
+        go_home(env.console, context);
+    }
+
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+}
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-BerryTree.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-BerryTree.h
new file mode 100644
index 0000000000..ad700cc32d
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-BerryTree.h
@@ -0,0 +1,57 @@
+/*  Shiny Hunt Autonomous - BerryTree
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_ShinyHuntAutonomousBerryTree_H
+#define PokemonAutomation_PokemonSwSh_ShinyHuntAutonomousBerryTree_H
+
+#include "Common/Cpp/Options/StaticTextOption.h"
+#include "Common/Cpp/Options/TimeDurationOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h"
+#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "Pokemon/Options/Pokemon_EncounterBotOptions.h"
+#include "VideoGames/PokemonSwSh/Options/PokemonSwSh_EncounterBotCommon.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+using namespace Pokemon;
+
+
+class ShinyHuntAutonomousBerryTree_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    ShinyHuntAutonomousBerryTree_Descriptor();
+
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+
+
+class ShinyHuntAutonomousBerryTree : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = ShinyHuntAutonomousBerryTree_Descriptor;
+    ShinyHuntAutonomousBerryTree();
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    StartInGripOrGameOption START_LOCATION;
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
+
+    EncounterBotLanguage LANGUAGE;
+    EncounterBotCommonOptions ENCOUNTER_BOT_OPTIONS;
+
+    EventNotificationsOption NOTIFICATIONS;
+
+    SectionDividerOption m_advanced_options;
+    MillisecondsOption EXIT_BATTLE_TIMEOUT0;
+};
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Fishing.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Fishing.cpp
new file mode 100644
index 0000000000..f46094e134
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Fishing.cpp
@@ -0,0 +1,204 @@
+/*  Shiny Hunt Autonomous - Fishing
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/NintendoSwitch_Settings.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "VideoGames/PokemonSwSh/PokemonSwSh_Settings.h"
+#include "VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.h"
+#include "VideoGames/PokemonSwSh/ShinyHuntTracker.h"
+#include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_FishingDetector.h"
+#include "VideoGames/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_ShinyEncounterDetector.h"
+#include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
+#include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_EncounterHandler.h"
+#include "PokemonSwSh_ShinyHuntAutonomous-Fishing.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+ShinyHuntAutonomousFishing_Descriptor::ShinyHuntAutonomousFishing_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonSwSh:ShinyHuntAutonomousFishing",
+        STRING_POKEMON + " SwSh", "Shiny Hunt Autonomous - Fishing",
+        "Programs/PokemonSwSh/ShinyHuntAutonomous-Fishing.html",
+        "Automatically hunt for shiny fishing " + STRING_POKEMON + " using video feedback.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+struct ShinyHuntAutonomousFishing_Descriptor::Stats : public ShinyHuntTracker{
+    Stats()
+        : ShinyHuntTracker(true)
+        , m_misses(m_stats["Misses"])
+    {
+        m_display_order.insert(m_display_order.begin() + 1, Stat("Misses"));
+        m_aliases["Timeouts"] = "Errors";
+        m_aliases["Unexpected Battles"] = "Errors";
+    }
+    std::atomic<uint64_t>& m_misses;
+};
+std::unique_ptr<StatsTracker> ShinyHuntAutonomousFishing_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+
+
+ShinyHuntAutonomousFishing::ShinyHuntAutonomousFishing()
+    : GO_HOME_WHEN_DONE(false)
+    , ENCOUNTER_BOT_OPTIONS(true, true)
+    , NOTIFICATIONS({
+        &ENCOUNTER_BOT_OPTIONS.NOTIFICATION_NONSHINY,
+        &ENCOUNTER_BOT_OPTIONS.NOTIFICATION_SHINY,
+        &ENCOUNTER_BOT_OPTIONS.NOTIFICATION_CATCH_SUCCESS,
+        &ENCOUNTER_BOT_OPTIONS.NOTIFICATION_CATCH_FAILED,
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+    , m_advanced_options(
+        "<font size=4><b>Advanced Options:</b> You should not need to touch anything below here.</font>"
+    )
+    , EXIT_BATTLE_TIMEOUT0(
+        "<b>Exit Battle Timeout:</b><br>After running, wait this long to return to overworld and for the fish to reappear.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "10000 ms"
+    )
+    , FISH_RESPAWN_TIME0(
+        "<b>Fish Respawn Time:</b><br>Wait this long for fish to respawn.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "5000 ms"
+    )
+{
+    PA_ADD_OPTION(START_LOCATION);
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+    PA_ADD_OPTION(TIME_ROLLBACK_HOURS);
+
+    PA_ADD_OPTION(LANGUAGE);
+    PA_ADD_OPTION(ENCOUNTER_BOT_OPTIONS);
+    PA_ADD_OPTION(NOTIFICATIONS);
+
+    PA_ADD_STATIC(m_advanced_options);
+    PA_ADD_OPTION(EXIT_BATTLE_TIMEOUT0);
+    PA_ADD_OPTION(FISH_RESPAWN_TIME0);
+}
+
+
+
+void ShinyHuntAutonomousFishing::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    if (START_LOCATION.start_in_grip_menu()){
+        grip_menu_connect_go_home(context);
+        resume_game_no_interact(env.console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST);
+    }else{
+        //  Connect the controller.
+        require_player(env.console, context, BUTTON_B);
+    }
+
+    WallDuration PERIOD = std::chrono::hours(TIME_ROLLBACK_HOURS);
+    WallClock last_touch = current_time();
+
+    ShinyHuntAutonomousFishing_Descriptor::Stats& stats = env.current_stats<ShinyHuntAutonomousFishing_Descriptor::Stats>();
+    env.update_stats();
+
+    StandardEncounterHandler handler(
+        env, env.console, context,
+        LANGUAGE,
+        ENCOUNTER_BOT_OPTIONS,
+        stats
+    );
+
+    while (true){
+        //  Touch the date.
+        if (TIME_ROLLBACK_HOURS > 0 && current_time() - last_touch >= PERIOD){
+            pbf_press_button(context, BUTTON_HOME, 160ms, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE0);
+            rollback_hours_from_home(env.console, context, TIME_ROLLBACK_HOURS, ConsoleSettings::instance().SETTINGS_TO_HOME_DELAY0);
+            resume_game_no_interact(env.console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST);
+            last_touch += PERIOD;
+        }
+
+        pbf_wait(context, FISH_RESPAWN_TIME0);
+        context.wait_for_all_requests();
+
+        //  Trigger encounter.
+        {
+            pbf_press_button(context, BUTTON_A, 80ms, 80ms);
+            pbf_mash_button(context, BUTTON_B, 1000ms);
+            context.wait_for_all_requests();
+
+            FishingMissDetector miss_detector;
+            FishingHookDetector hook_detector(env.console);
+            StandardBattleMenuWatcher menu_detector(false);
+            int result = wait_until(
+                env.console, context,
+                std::chrono::seconds(12),
+                {
+                    {miss_detector},
+                    {hook_detector},
+                    {menu_detector},
+                }
+            );
+            switch (result){
+            case 0:
+                env.log("Missed a hook.", COLOR_RED);
+                stats.m_misses++;
+                pbf_mash_button(context, BUTTON_B, 2000ms);
+                continue;
+            case 1:
+                env.log("Detected hook!", COLOR_PURPLE);
+                ssf_press_button_ptv(context, BUTTON_A, 120ms);
+//                pbf_mash_button(context, BUTTON_A, 1000ms);
+                break;
+            case 2:
+                env.log("Unexpected battle menu.", COLOR_RED);
+                stats.add_error();
+                env.update_stats();
+                run_away(env.console, context, EXIT_BATTLE_TIMEOUT0);
+                continue;
+            default:
+                env.log("Timed out.", COLOR_RED);
+                stats.add_error();
+                env.update_stats();
+                pbf_mash_button(context, BUTTON_B, 2000ms);
+                continue;
+            }
+            context.wait_for(std::chrono::seconds(3));
+            if (miss_detector.detect(env.console.video().snapshot())){
+                env.log("False alarm! We actually missed.", COLOR_RED);
+                stats.m_misses++;
+                pbf_mash_button(context, BUTTON_B, 2000ms);
+                continue;
+            }
+        }
+
+        //  Detect shiny.
+        ShinyDetectionResult result = detect_shiny_battle(
+            env.console, context,
+            SHINY_BATTLE_REGULAR,
+            std::chrono::seconds(30)
+        );
+
+        bool stop = handler.handle_standard_encounter_end_battle(result, EXIT_BATTLE_TIMEOUT0);
+        if (stop){
+            break;
+        }
+    }
+
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+    GO_HOME_WHEN_DONE.run_end_of_program(context);
+}
+
+
+
+}
+}
+}
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Fishing.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Fishing.h
new file mode 100644
index 0000000000..7e2b5aab24
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Fishing.h
@@ -0,0 +1,62 @@
+/*  Shiny Hunt Autonomous - Fishing
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_ShinyHuntAutonomousFishing_H
+#define PokemonAutomation_PokemonSwSh_ShinyHuntAutonomousFishing_H
+
+#include "Common/Cpp/Options/StaticTextOption.h"
+#include "Common/Cpp/Options/TimeDurationOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h"
+#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "Pokemon/Options/Pokemon_EncounterBotOptions.h"
+#include "VideoGames/PokemonSwSh/Options/PokemonSwSh_DateToucher.h"
+#include "VideoGames/PokemonSwSh/Options/PokemonSwSh_EncounterBotCommon.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+using namespace Pokemon;
+
+
+class ShinyHuntAutonomousFishing_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    ShinyHuntAutonomousFishing_Descriptor();
+
+    struct Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+
+
+class ShinyHuntAutonomousFishing : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = ShinyHuntAutonomousFishing_Descriptor;
+    ShinyHuntAutonomousFishing();
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    StartInGripOrGameOption START_LOCATION;
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
+    TimeRollbackHoursOption TIME_ROLLBACK_HOURS;
+
+    EncounterBotLanguage LANGUAGE;
+    EncounterBotCommonOptions ENCOUNTER_BOT_OPTIONS;
+
+    EventNotificationsOption NOTIFICATIONS;
+
+    SectionDividerOption m_advanced_options;
+    MillisecondsOption EXIT_BATTLE_TIMEOUT0;
+    MillisecondsOption FISH_RESPAWN_TIME0;
+};
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-IoATrade.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-IoATrade.cpp
new file mode 100644
index 0000000000..3c180d5420
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-IoATrade.cpp
@@ -0,0 +1,192 @@
+/*  Shiny Hunt Autonomous - IoA Trade
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include <cmath>
+#include "CommonFramework/StaticGlobals.h"
+#include "CommonFramework/VideoPipeline/VideoFeed.h"
+#include "NintendoSwitch/NintendoSwitch_Settings.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "Pokemon/Pokemon_Notification.h"
+#include "VideoGames/PokemonSwSh/PokemonSwSh_Settings.h"
+#include "VideoGames/PokemonSwSh/ShinyHuntTracker.h"
+#include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_SummaryShinySymbolDetector.h"
+#include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
+#include "PokemonSwSh_ShinyHuntAutonomous-IoATrade.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+using namespace Pokemon;
+
+
+ShinyHuntAutonomousIoATrade_Descriptor::ShinyHuntAutonomousIoATrade_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonSwSh:ShinyHuntAutonomousIoATrade",
+        STRING_POKEMON + " SwSh", "Shiny Hunt Autonomous - IoA Trade",
+        "Programs/PokemonSwSh/ShinyHuntAutonomous-IoATrade.html",
+        "Hunt for shiny Isle of Armor trade using video feedback.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+std::unique_ptr<StatsTracker> ShinyHuntAutonomousIoATrade_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new ShinyHuntTracker(false));
+}
+
+
+
+ShinyHuntAutonomousIoATrade::ShinyHuntAutonomousIoATrade()
+    : GO_HOME_WHEN_DONE(false)
+    , VIDEO_ON_SHINY(
+        "<b>Video Capture:</b><br>Take a video of the encounter if it is shiny.",
+        LockMode::LOCK_WHILE_RUNNING,
+        true
+    )
+    , NOTIFICATION_NONSHINY(
+        "Non-Shiny Encounter",
+        true, false,
+        {"Notifs"},
+        std::chrono::seconds(3600)
+    )
+    , NOTIFICATION_SHINY(
+        "Shiny Encounter",
+        true, true, ImageAttachmentMode::JPG,
+        {"Notifs", "Showcase"}
+    )
+//    , NOTIFICATION_PROGRAM_FINISH("Program Finished", true, true)
+    , NOTIFICATIONS({
+        &NOTIFICATION_NONSHINY,
+        &NOTIFICATION_SHINY,
+//        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+    , m_advanced_options(
+        "<font size=4><b>Advanced Options:</b> You should not need to touch anything below here.</font>"
+    )
+    , MASH_TO_TRADE_DELAY0(
+        "<b>Mash to Trade Delay:</b><br>Time to perform the trade.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "30 s"
+    )
+    , RUN_FROM_EVERYTHING(
+        "<b>Run from Everything:</b><br>Run from everything - even if it is shiny. (For testing only.)",
+        LockMode::LOCK_WHILE_RUNNING,
+        false
+    )
+{
+    PA_ADD_OPTION(START_LOCATION);
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+    PA_ADD_OPTION(TOUCH_DATE_INTERVAL);
+
+    PA_ADD_OPTION(VIDEO_ON_SHINY);
+    PA_ADD_OPTION(NOTIFICATIONS);
+
+    PA_ADD_STATIC(m_advanced_options);
+    PA_ADD_OPTION(MASH_TO_TRADE_DELAY0);
+    if (STATIC_GLOBALS.DEVELOPER_MODE){
+        PA_ADD_OPTION(RUN_FROM_EVERYTHING);
+    }
+}
+
+
+void ShinyHuntAutonomousIoATrade::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    if (START_LOCATION.start_in_grip_menu()){
+        grip_menu_connect_go_home(context);
+        resume_game_back_out(
+            env.console,
+            context,
+            ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST,
+            4000ms
+        );
+    }else{
+        //  Connect the controller.
+        require_player(env.console, context, BUTTON_B);
+    }
+
+    ShinyHuntTracker& stats = env.current_stats<ShinyHuntTracker>();
+
+    while (true){
+        env.update_stats();
+
+        pbf_press_button(context, BUTTON_A, 160ms, 800ms);
+        pbf_press_button(context, BUTTON_A, 160ms, 480ms);
+        pbf_press_button(context, BUTTON_A, 160ms, 800ms);
+        pbf_press_button(context, BUTTON_A, 160ms, 400ms);
+        pbf_press_button(context, BUTTON_A, 160ms, GameSettings::instance().POKEMON_TO_BOX_DELAY0);
+        pbf_press_dpad(context, DPAD_LEFT, 160ms, 80ms);
+        pbf_mash_button(context, BUTTON_A, MASH_TO_TRADE_DELAY0);
+
+        //  Enter box system.
+        pbf_press_button(context, BUTTON_X, 160ms, GameSettings::instance().OVERWORLD_TO_MENU_DELAY0);
+        pbf_press_dpad(context, DPAD_RIGHT, 160ms, 80ms);
+        pbf_press_button(context, BUTTON_A, 160ms, GameSettings::instance().MENU_TO_POKEMON_DELAY0);
+
+        //  View summary.
+        pbf_press_button(context, BUTTON_A, 160ms, 800ms);
+        pbf_press_button(context, BUTTON_A, 160ms, 0ms);
+        context.wait_for_all_requests();
+
+        SummaryShinySymbolDetector::Detection detection;
+        {
+            SummaryShinySymbolDetector detector(env.console, env.console);
+            detection = detector.wait_for_detection(context, env.console);
+//            detection = SummaryShinySymbolDetector::SHINY;
+        }
+        switch (detection){
+        case SummaryShinySymbolDetector::NO_DETECTION:
+            stats.add_error();
+            break;
+        case SummaryShinySymbolDetector::NOT_SHINY:
+            stats.add_non_shiny();
+            send_encounter_notification(
+                env,
+                NOTIFICATION_NONSHINY,
+                NOTIFICATION_SHINY,
+                false, false, {{{}, ShinyType::NOT_SHINY}}, std::nan(""),
+                ImageViewRGB32()
+            );
+            break;
+        case SummaryShinySymbolDetector::SHINY:
+            stats.add_unknown_shiny();
+            send_encounter_notification(
+                env,
+                NOTIFICATION_NONSHINY,
+                NOTIFICATION_SHINY,
+                false, true, {{{}, ShinyType::UNKNOWN_SHINY}}, std::nan(""),
+                env.console.video().snapshot()
+            );
+            if (VIDEO_ON_SHINY){
+                pbf_wait(context, 1000ms);
+                pbf_press_button(context, BUTTON_CAPTURE, 2000ms, 5000ms);
+            }
+            if (!RUN_FROM_EVERYTHING){
+                goto StopProgram;
+            }
+        }
+
+        pbf_press_button(context, BUTTON_HOME, 160ms, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE0);
+        TOUCH_DATE_INTERVAL.touch_now_from_home_if_needed(env.console, context);
+        reset_game_from_home_with_inference(
+            env.console, context,
+            ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST
+        );
+    }
+
+StopProgram:
+    env.update_stats();
+    GO_HOME_WHEN_DONE.run_end_of_program(context);
+}
+
+
+}
+}
+}
+
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-IoATrade.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-IoATrade.h
similarity index 76%
rename from SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-IoATrade.h
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-IoATrade.h
index cc075f6359..0e97faa51d 100644
--- a/SerialPrograms/Source/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-IoATrade.h
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-IoATrade.h
@@ -1,6 +1,6 @@
 /*  Shiny Hunt Autonomous - IoATrade
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -9,13 +9,12 @@
 
 #include "Common/Cpp/Options/StaticTextOption.h"
 #include "Common/Cpp/Options/BooleanCheckBoxOption.h"
-#include "Common/Cpp/Options/TimeExpressionOption.h"
+#include "Common/Cpp/Options/TimeDurationOption.h"
 #include "CommonFramework/Notifications/EventNotificationsTable.h"
 #include "NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h"
 #include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
 #include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-#include "Pokemon/Options/Pokemon_EncounterBotOptions.h"
-#include "PokemonSwSh/Options/PokemonSwSh_DateToucher.h"
+#include "VideoGames/PokemonSwSh/Options/PokemonSwSh_DateToucher.h"
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
@@ -33,8 +32,9 @@ class ShinyHuntAutonomousIoATrade_Descriptor : public SingleSwitchProgramDescrip
 
 class ShinyHuntAutonomousIoATrade : public SingleSwitchProgramInstance{
 public:
+    using Descriptor = ShinyHuntAutonomousIoATrade_Descriptor;
     ShinyHuntAutonomousIoATrade();
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
 
 private:
     StartInGripOrGameOption START_LOCATION;
@@ -47,7 +47,7 @@ class ShinyHuntAutonomousIoATrade : public SingleSwitchProgramInstance{
     EventNotificationsOption NOTIFICATIONS;
 
     SectionDividerOption m_advanced_options;
-    TimeExpressionOption<uint16_t> MASH_TO_TRADE_DELAY;
+    MillisecondsOption MASH_TO_TRADE_DELAY0;
     BooleanCheckBoxOption RUN_FROM_EVERYTHING;
 };
 
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Regi.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Regi.cpp
new file mode 100644
index 0000000000..b9ebeec495
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Regi.cpp
@@ -0,0 +1,176 @@
+/*  Shiny Hunt Autonomous - Regi
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "NintendoSwitch/NintendoSwitch_Settings.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "VideoGames/PokemonSwSh/PokemonSwSh_Settings.h"
+#include "VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.h"
+#include "VideoGames/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_ShinyEncounterDetector.h"
+#include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
+#include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_EncounterHandler.h"
+#include "VideoGames/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHunt-Regi.h"
+#include "PokemonSwSh_ShinyHuntAutonomous-Regi.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+ShinyHuntAutonomousRegi_Descriptor::ShinyHuntAutonomousRegi_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonSwSh:ShinyHuntAutonomousRegi",
+        STRING_POKEMON + " SwSh", "Shiny Hunt Autonomous - Regi",
+        "Programs/PokemonSwSh/ShinyHuntAutonomous-Regi.html",
+        "Automatically hunt for shiny Regi using video feedback.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+std::unique_ptr<StatsTracker> ShinyHuntAutonomousRegi_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(
+        new ShinyHuntTracker(
+            true,
+            {{"Light Resets", "Errors"}}
+        )
+    );
+}
+
+
+
+ShinyHuntAutonomousRegi::ShinyHuntAutonomousRegi()
+    : GO_HOME_WHEN_DONE(false)
+    , ENCOUNTER_BOT_OPTIONS(false, false)
+    , NOTIFICATIONS({
+        &ENCOUNTER_BOT_OPTIONS.NOTIFICATION_NONSHINY,
+        &ENCOUNTER_BOT_OPTIONS.NOTIFICATION_SHINY,
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+    , m_advanced_options(
+        "<font size=4><b>Advanced Options:</b> You should not need to touch anything below here.</font>"
+    )
+    , EXIT_BATTLE_TIMEOUT0(
+        "<b>Exit Battle Timeout:</b><br>After running, wait this long to return to overworld.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "10 s"
+    )
+    , POST_BATTLE_MASH_TIME0(
+        "<b>Post-Battle Mash:</b><br>After each battle, mash B for this long to clear the dialogs.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "1000 ms"
+    )
+    , TRANSITION_DELAY0(
+        "<b>Transition Delay:</b><br>Time to enter/exit the building.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "5000 ms"
+    )
+{
+    PA_ADD_OPTION(START_LOCATION);
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+    PA_ADD_OPTION(TOUCH_DATE_INTERVAL);
+
+    PA_ADD_OPTION(LANGUAGE);
+    PA_ADD_OPTION(REGI_NAME);
+
+    PA_ADD_OPTION(ENCOUNTER_BOT_OPTIONS);
+    PA_ADD_OPTION(NOTIFICATIONS);
+
+    PA_ADD_STATIC(m_advanced_options);
+    PA_ADD_OPTION(EXIT_BATTLE_TIMEOUT0);
+    PA_ADD_OPTION(POST_BATTLE_MASH_TIME0);
+    PA_ADD_OPTION(TRANSITION_DELAY0);
+}
+
+
+
+
+void ShinyHuntAutonomousRegi::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    if (START_LOCATION.start_in_grip_menu()){
+        grip_menu_connect_go_home(context);
+        resume_game_back_out(
+            env.console,
+            context,
+            ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST,
+            1600ms
+        );
+    }else{
+        //  Connect the controller.
+        require_player(env.console, context, BUTTON_B);
+    }
+
+    ShinyHuntTracker& stats = env.current_stats<ShinyHuntTracker>();
+    env.update_stats();
+
+    StandardEncounterHandler handler(
+        env, env.console, context,
+        LANGUAGE,
+        ENCOUNTER_BOT_OPTIONS,
+        stats
+    );
+
+    bool error = false;
+    while (true){
+        pbf_mash_button(context, BUTTON_B, POST_BATTLE_MASH_TIME0);
+        move_to_corner(env.console, context, error, TRANSITION_DELAY0);
+        if (error){
+            env.update_stats();
+            error = false;
+        }
+
+        //  Touch the date.
+        if (TOUCH_DATE_INTERVAL.ok_to_touch_now()){
+            env.log("Touching date to prevent rollover.");
+            pbf_press_button(context, BUTTON_HOME, 160ms, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE0);
+            touch_date_from_home(env.console, context, ConsoleSettings::instance().SETTINGS_TO_HOME_DELAY0);
+            resume_game_no_interact(env.console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST);
+        }
+
+        //  Do the light puzzle.
+        run_regi_light_puzzle(env.console, context, REGI_NAME, stats.encounters());
+
+        //  Start the encounter.
+        pbf_mash_button(context, BUTTON_A, 5000ms);
+        context.wait_for_all_requests();
+
+        //  Detect shiny.
+        ShinyDetectionResult result = detect_shiny_battle(
+            env.console, context,
+            SHINY_BATTLE_REGULAR,
+            std::chrono::seconds(30)
+        );
+//        shininess = ShinyDetection::SQUARE_SHINY;
+        if (result.shiny_type == ShinyType::UNKNOWN){
+            stats.add_error();
+            pbf_mash_button(context, BUTTON_B, 1000ms);
+            run_away(env.console, context, EXIT_BATTLE_TIMEOUT0);
+            error = true;
+            continue;
+        }
+
+        bool stop = handler.handle_standard_encounter_end_battle(
+            result, EXIT_BATTLE_TIMEOUT0
+        );
+        if (stop){
+            break;
+        }
+    }
+
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+    GO_HOME_WHEN_DONE.run_end_of_program(context);
+}
+
+
+
+
+}
+}
+}
+
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Regi.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Regi.h
new file mode 100644
index 0000000000..d8f163e354
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Regi.h
@@ -0,0 +1,64 @@
+/*  Shiny Hunt Autonomous - Regi
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_ShinyHuntAutonomousRegi_H
+#define PokemonAutomation_PokemonSwSh_ShinyHuntAutonomousRegi_H
+
+#include "Common/Cpp/Options/StaticTextOption.h"
+#include "Common/Cpp/Options/TimeDurationOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h"
+#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "Pokemon/Options/Pokemon_EncounterBotOptions.h"
+#include "VideoGames/PokemonSwSh/Options/PokemonSwSh_DateToucher.h"
+#include "VideoGames/PokemonSwSh/Options/PokemonSwSh_EncounterBotCommon.h"
+#include "VideoGames/PokemonSwSh/Options/PokemonSwSh_RegiSelector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+using namespace Pokemon;
+
+
+class ShinyHuntAutonomousRegi_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    ShinyHuntAutonomousRegi_Descriptor();
+
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+
+
+class ShinyHuntAutonomousRegi : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = ShinyHuntAutonomousRegi_Descriptor;
+    ShinyHuntAutonomousRegi();
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    StartInGripOrGameOption START_LOCATION;
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
+    TouchDateIntervalOption TOUCH_DATE_INTERVAL;
+
+    EncounterBotLanguage LANGUAGE;
+
+    RegiSelectorOption REGI_NAME;
+    EncounterBotCommonOptions ENCOUNTER_BOT_OPTIONS;
+
+    EventNotificationsOption NOTIFICATIONS;
+
+    SectionDividerOption m_advanced_options;
+    MillisecondsOption EXIT_BATTLE_TIMEOUT0;
+    MillisecondsOption POST_BATTLE_MASH_TIME0;
+    MillisecondsOption TRANSITION_DELAY0;
+};
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Regigigas2.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Regigigas2.cpp
new file mode 100644
index 0000000000..8195618461
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Regigigas2.cpp
@@ -0,0 +1,204 @@
+/*  Shiny Hunt Autonomous - Regigigas2
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/PrettyPrint.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/Tools/ErrorDumper.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/NintendoSwitch_Settings.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonSwSh/PokemonSwSh_Settings.h"
+#include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_YCommDetector.h"
+#include "VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_StartBattleDetector.h"
+#include "VideoGames/PokemonSwSh/Inference/Dens/PokemonSwSh_RaidCatchDetector.h"
+#include "VideoGames/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_ShinyEncounterDetector.h"
+#include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
+#include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_EncounterHandler.h"
+#include "PokemonSwSh_ShinyHuntAutonomous-Regigigas2.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+ShinyHuntAutonomousRegigigas2_Descriptor::ShinyHuntAutonomousRegigigas2_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonSwSh:ShinyHuntAutonomousRegigigas2",
+        STRING_POKEMON + " SwSh", "Shiny Hunt Autonomous - Regigigas2",
+        "Programs/PokemonSwSh/ShinyHuntAutonomous-Regigigas2.html",
+        "Automatically hunt for shiny Regigigas using video feedback.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+std::unique_ptr<StatsTracker> ShinyHuntAutonomousRegigigas2_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(
+        new ShinyHuntTracker(
+            true,
+            {{"Timeouts", "Errors"}}
+        )
+    );
+}
+
+
+
+ShinyHuntAutonomousRegigigas2::ShinyHuntAutonomousRegigigas2()
+    : GO_HOME_WHEN_DONE(false)
+    , REVERSAL_PP(
+        "<b>Reversal PP:</b><br>The amount of Reversal PP you are saved with.",
+        LockMode::LOCK_WHILE_RUNNING,
+        24
+    )
+    , ENCOUNTER_BOT_OPTIONS(false, false)
+    , NOTIFICATIONS({
+        &ENCOUNTER_BOT_OPTIONS.NOTIFICATION_NONSHINY,
+        &ENCOUNTER_BOT_OPTIONS.NOTIFICATION_SHINY,
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_RECOVERABLE,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+{
+    PA_ADD_OPTION(START_LOCATION);
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+    PA_ADD_OPTION(TOUCH_DATE_INTERVAL);
+
+    PA_ADD_OPTION(REVERSAL_PP);
+    PA_ADD_OPTION(ENCOUNTER_BOT_OPTIONS);
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+
+
+bool ShinyHuntAutonomousRegigigas2::kill_and_return(VideoStream& stream, ProControllerContext& context) const{
+    pbf_mash_button(context, BUTTON_A, 4000ms);
+
+    while (true){
+        RaidCatchWatcher detector(stream.overlay());
+        YCommIconWatcher overworld;
+        context.wait_for_all_requests();
+        int result = wait_until(
+            stream, context,
+            std::chrono::seconds(30),
+            {
+                detector,
+                overworld,
+            }
+        );
+        context.wait_for(std::chrono::milliseconds(250));
+        switch (result){
+        case 0:
+            ssf_press_dpad_ptv(context, DPAD_DOWN, 80ms);
+            pbf_mash_button(context, BUTTON_A, 250ms);
+            break;
+        case 1:
+            stream.log("Detected overworld.");
+            return true;
+        default:
+            stream.log("No state detected after 30 seconds.", COLOR_RED);
+            return false;
+        }
+    }
+}
+void ShinyHuntAutonomousRegigigas2::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    if (START_LOCATION.start_in_grip_menu()){
+        grip_menu_connect_go_home(context);
+        resume_game_back_out(
+            env.console,
+            context,
+            ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST,
+            4000ms
+        );
+    }else{
+        //  Connect the controller.
+        require_player(env.console, context, BUTTON_B);
+    }
+
+    ShinyHuntTracker& stats = env.current_stats<ShinyHuntTracker>();
+    env.update_stats();
+
+    StandardEncounterHandler handler(
+        env, env.console, context,
+        Language::None,
+        ENCOUNTER_BOT_OPTIONS,
+        stats
+    );
+
+    while (true){
+        for (uint8_t pp = REVERSAL_PP; pp > 0; pp--){
+            env.log("Starting Regigigas Encounter: " + tostr_u_commas(stats.encounters() + 1));
+
+            pbf_mash_button(context, BUTTON_A, 5s);
+            context.wait_for_all_requests();
+
+            {
+                StartBattleWatcher detector;
+                int result = wait_until(
+                    env.console, context,
+                    std::chrono::seconds(30),
+                    {{detector}}
+                );
+                if (result < 0){
+                    stats.add_error();
+                    env.update_stats();
+                    if (NOTIFICATION_ERROR_RECOVERABLE.ok_to_send_now(env.logger())){
+                        dump_image(
+                            env.logger(), env.program_info(), env.console,
+                            "Start of battle not detected after 30 seconds."
+                        );
+                    }
+                    break;
+                }
+                env.log("Detected battle start.");
+            }
+
+            ShinyDetectionResult result = detect_shiny_battle(
+                env.console, context,
+                SHINY_BATTLE_RAID,
+                std::chrono::seconds(30)
+            );
+//            shininess = ShinyDetection::STAR_SHINY;
+
+            bool stop = handler.handle_standard_encounter(result);
+            if (stop){
+                goto StopProgram;
+            }
+
+            if (result.shiny_type == ShinyType::UNKNOWN){
+                stats.add_error();
+                env.update_stats();
+                break;
+            }
+
+            kill_and_return(env.console, context);
+        }
+
+        pbf_press_button(context, BUTTON_HOME, 160ms, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE0);
+        TOUCH_DATE_INTERVAL.touch_now_from_home_if_needed(env.console, context);
+        reset_game_from_home_with_inference(
+            env.console, context,
+            ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST
+        );
+    }
+
+
+StopProgram:
+    env.update_stats();
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+    GO_HOME_WHEN_DONE.run_end_of_program(context);
+}
+
+
+
+}
+}
+}
+
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Regigigas2.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Regigigas2.h
new file mode 100644
index 0000000000..14b757ae83
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Regigigas2.h
@@ -0,0 +1,56 @@
+/*  Shiny Hunt Autonomous - Regigigas2
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_ShinyHuntAutonomousRegigigas2_H
+#define PokemonAutomation_PokemonSwSh_ShinyHuntAutonomousRegigigas2_H
+
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h"
+#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+//#include "Pokemon/Options/Pokemon_EncounterBotOptions.h"
+#include "VideoGames/PokemonSwSh/Options/PokemonSwSh_DateToucher.h"
+#include "VideoGames/PokemonSwSh/Options/PokemonSwSh_EncounterBotCommon.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+class ShinyHuntAutonomousRegigigas2_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    ShinyHuntAutonomousRegigigas2_Descriptor();
+
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+
+
+class ShinyHuntAutonomousRegigigas2 : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = ShinyHuntAutonomousRegigigas2_Descriptor;
+    ShinyHuntAutonomousRegigigas2();
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    bool kill_and_return(VideoStream& stream, ProControllerContext& context) const;
+
+private:
+    StartInGripOrGameOption START_LOCATION;
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
+    TouchDateIntervalOption TOUCH_DATE_INTERVAL;
+
+    SimpleIntegerOption<uint8_t> REVERSAL_PP;
+    EncounterBotCommonOptions ENCOUNTER_BOT_OPTIONS;
+
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-StrongSpawn.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-StrongSpawn.cpp
new file mode 100644
index 0000000000..f236ac682e
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-StrongSpawn.cpp
@@ -0,0 +1,142 @@
+/*  Shiny Hunt Autonomous - Strong Spawn
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/PrettyPrint.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "NintendoSwitch/NintendoSwitch_Settings.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "VideoGames/PokemonSwSh/PokemonSwSh_Settings.h"
+#include "VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.h"
+//#include "VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_StartBattleDetector.h"
+#include "VideoGames/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_ShinyEncounterDetector.h"
+#include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
+#include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_EncounterHandler.h"
+#include "PokemonSwSh_ShinyHuntAutonomous-StrongSpawn.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+ShinyHuntAutonomousStrongSpawn_Descriptor::ShinyHuntAutonomousStrongSpawn_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonSwSh:ShinyHuntAutonomousStrongSpawn",
+        STRING_POKEMON + " SwSh", "Shiny Hunt Autonomous - Strong Spawn",
+        "Programs/PokemonSwSh/ShinyHuntAutonomous-StrongSpawn.html",
+        "Automatically hunt for shiny strong spawns using video feedback.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+std::unique_ptr<StatsTracker> ShinyHuntAutonomousStrongSpawn_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(
+        new ShinyHuntTracker(
+            true,
+            {{"Timeouts", "Errors"}}
+        )
+    );
+}
+
+
+
+ShinyHuntAutonomousStrongSpawn::ShinyHuntAutonomousStrongSpawn()
+    : GO_HOME_WHEN_DONE(false)
+    , ENCOUNTER_BOT_OPTIONS(true, false)
+    , NOTIFICATIONS({
+        &ENCOUNTER_BOT_OPTIONS.NOTIFICATION_NONSHINY,
+        &ENCOUNTER_BOT_OPTIONS.NOTIFICATION_SHINY,
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+//    , m_advanced_options(
+//        "<font size=4><b>Advanced Options:</b> You should not need to touch anything below here.</font>"
+//    )
+{
+    PA_ADD_OPTION(START_LOCATION);
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+    PA_ADD_OPTION(TIME_ROLLBACK_HOURS);
+
+    PA_ADD_OPTION(LANGUAGE);
+
+    PA_ADD_OPTION(ENCOUNTER_BOT_OPTIONS);
+    PA_ADD_OPTION(NOTIFICATIONS);
+
+//    if (PERSISTENT_SETTINGS().developer_mode){
+//        PA_ADD_STATIC(m_advanced_options);
+//    }
+}
+
+
+
+void ShinyHuntAutonomousStrongSpawn::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    if (START_LOCATION.start_in_grip_menu()){
+        grip_menu_connect_go_home(context);
+    }else{
+        //  Connect the controller.
+        require_player(env.console, context, BUTTON_B);
+        ssf_press_button(context, BUTTON_HOME, GameSettings::instance().GAME_TO_HOME_DELAY_FAST0, 160ms);
+    }
+
+    WallDuration PERIOD = std::chrono::hours(TIME_ROLLBACK_HOURS);
+    WallClock last_touch = current_time();
+
+    ShinyHuntTracker& stats = env.current_stats<ShinyHuntTracker>();
+    env.update_stats();
+
+    StandardEncounterHandler handler(
+        env, env.console, context,
+        LANGUAGE,
+        ENCOUNTER_BOT_OPTIONS,
+        stats
+    );
+
+    while (true){
+        WallClock now = current_time();
+        if (TIME_ROLLBACK_HOURS > 0 && now - last_touch >= PERIOD){
+            rollback_hours_from_home(
+                env.console, context,
+                TIME_ROLLBACK_HOURS,
+                ConsoleSettings::instance().SETTINGS_TO_HOME_DELAY0
+            );
+            last_touch += PERIOD;
+        }
+        reset_game_from_home_with_inference(
+            env.console, context,
+            ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST
+        );
+        env.log("Starting Encounter: " + tostr_u_commas(stats.encounters() + 1));
+        context.wait_for_all_requests();
+
+        //  Detect shiny.
+        ShinyDetectionResult result = detect_shiny_battle(
+            env.console, context,
+            SHINY_BATTLE_REGULAR,
+            std::chrono::seconds(30)
+        );
+
+        bool stop = handler.handle_standard_encounter(result);
+        if (stop){
+            break;
+        }
+
+        pbf_press_button(context, BUTTON_HOME, 160ms, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE0);
+    }
+
+    env.update_stats();
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+    GO_HOME_WHEN_DONE.run_end_of_program(context);
+}
+
+
+
+}
+}
+}
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-StrongSpawn.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-StrongSpawn.h
new file mode 100644
index 0000000000..bc6fba4508
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-StrongSpawn.h
@@ -0,0 +1,57 @@
+/*  Shiny Hunt Autonomous - StrongSpawn
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_ShinyHuntAutonomousStrongSpawn_H
+#define PokemonAutomation_PokemonSwSh_ShinyHuntAutonomousStrongSpawn_H
+
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h"
+#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "Pokemon/Options/Pokemon_EncounterBotOptions.h"
+#include "VideoGames/PokemonSwSh/Options/PokemonSwSh_DateToucher.h"
+#include "VideoGames/PokemonSwSh/Options/PokemonSwSh_EncounterBotCommon.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+using namespace Pokemon;
+
+
+
+class ShinyHuntAutonomousStrongSpawn_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    ShinyHuntAutonomousStrongSpawn_Descriptor();
+
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+
+
+class ShinyHuntAutonomousStrongSpawn : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = ShinyHuntAutonomousStrongSpawn_Descriptor;
+    ShinyHuntAutonomousStrongSpawn();
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    StartInGripOrGameOption START_LOCATION;
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
+    TimeRollbackHoursOption TIME_ROLLBACK_HOURS;
+
+    EncounterBotLanguage LANGUAGE;
+    EncounterBotCommonOptions ENCOUNTER_BOT_OPTIONS;
+
+    EventNotificationsOption NOTIFICATIONS;
+
+//    SectionDivider m_advanced_options;
+};
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-SwordsOfJustice.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-SwordsOfJustice.cpp
new file mode 100644
index 0000000000..f0e921c631
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-SwordsOfJustice.cpp
@@ -0,0 +1,186 @@
+/*  Shiny Hunt Autonomous - Swords Of Justice
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/PrettyPrint.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/NintendoSwitch_Settings.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "VideoGames/PokemonSwSh/PokemonSwSh_Settings.h"
+#include "VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.h"
+#include "VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_StartBattleDetector.h"
+#include "VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleMenuDetector.h"
+#include "VideoGames/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_ShinyEncounterDetector.h"
+#include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
+#include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_EncounterHandler.h"
+#include "PokemonSwSh_ShinyHuntAutonomous-SwordsOfJustice.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+ShinyHuntAutonomousSwordsOfJustice_Descriptor::ShinyHuntAutonomousSwordsOfJustice_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonSwSh:ShinyHuntAutonomousSwordsOfJustice",
+        STRING_POKEMON + " SwSh", "Shiny Hunt Autonomous - Swords Of Justice",
+        "Programs/PokemonSwSh/ShinyHuntAutonomous-SwordsOfJustice.html",
+        "Automatically hunt for shiny Sword of Justice using video feedback.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+std::unique_ptr<StatsTracker> ShinyHuntAutonomousSwordsOfJustice_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(
+        new ShinyHuntTracker(
+            true,
+            {{"Timeouts", "Errors"}}
+        )
+    );
+}
+
+
+
+ShinyHuntAutonomousSwordsOfJustice::ShinyHuntAutonomousSwordsOfJustice()
+    : GO_HOME_WHEN_DONE(false)
+    , AIRPLANE_MODE(
+        "<b>Airplane Mode:</b><br>Enable if airplane mode is on.",
+        LockMode::LOCK_WHILE_RUNNING,
+        false
+    )
+    , ENCOUNTER_BOT_OPTIONS(true, false)
+    , NOTIFICATIONS({
+        &ENCOUNTER_BOT_OPTIONS.NOTIFICATION_NONSHINY,
+        &ENCOUNTER_BOT_OPTIONS.NOTIFICATION_SHINY,
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+    , m_advanced_options(
+        "<font size=4><b>Advanced Options:</b> You should not need to touch anything below here.</font>"
+    )
+    , EXIT_BATTLE_TIMEOUT0(
+        "<b>Exit Battle Timeout:</b><br>After running, wait this long to return to overworld.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "10 s"
+    )
+    , POST_BATTLE_MASH_TIME0(
+        "<b>Post-Battle Mash:</b><br>After each battle, mash B for this long before entering the camp.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "1000 ms"
+    )
+    , ENTER_CAMP_DELAY0(
+        "<b>Enter Camp Delay:</b>",
+        LockMode::LOCK_WHILE_RUNNING,
+        "8000 ms"
+    )
+{
+    PA_ADD_OPTION(START_LOCATION);
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+    PA_ADD_OPTION(TIME_ROLLBACK_HOURS);
+
+    PA_ADD_OPTION(LANGUAGE);
+    PA_ADD_OPTION(AIRPLANE_MODE);
+    PA_ADD_OPTION(ENCOUNTER_BOT_OPTIONS);
+    PA_ADD_OPTION(NOTIFICATIONS);
+
+    PA_ADD_STATIC(m_advanced_options);
+    PA_ADD_OPTION(EXIT_BATTLE_TIMEOUT0);
+    PA_ADD_OPTION(POST_BATTLE_MASH_TIME0);
+    PA_ADD_OPTION(ENTER_CAMP_DELAY0);
+}
+
+
+
+void ShinyHuntAutonomousSwordsOfJustice::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    if (START_LOCATION.start_in_grip_menu()){
+        grip_menu_connect_go_home(context);
+        resume_game_no_interact(env.console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST);
+    }else{
+        //  Connect the controller.
+        require_player(env.console, context, BUTTON_B);
+    }
+
+    WallDuration PERIOD = std::chrono::hours(TIME_ROLLBACK_HOURS);
+    WallClock last_touch = current_time();
+
+    ShinyHuntTracker& stats = env.current_stats<ShinyHuntTracker>();
+    env.update_stats();
+
+    StandardEncounterHandler handler(
+        env, env.console, context,
+        LANGUAGE,
+        ENCOUNTER_BOT_OPTIONS,
+        stats
+    );
+
+    while (true){
+        //  Touch the date.
+        if (TIME_ROLLBACK_HOURS > 0 && current_time() - last_touch >= PERIOD){
+            pbf_press_button(context, BUTTON_HOME, 160ms, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE0);
+            rollback_hours_from_home(env.console, context, TIME_ROLLBACK_HOURS, ConsoleSettings::instance().SETTINGS_TO_HOME_DELAY0);
+            resume_game_no_interact(env.console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST);
+            last_touch += PERIOD;
+        }
+
+        //  Trigger encounter.
+        pbf_mash_button(context, BUTTON_B, POST_BATTLE_MASH_TIME0);
+        pbf_press_button(context, BUTTON_X, 160ms, GameSettings::instance().OVERWORLD_TO_MENU_DELAY0);
+        pbf_press_button(context, BUTTON_A, 160ms, ENTER_CAMP_DELAY0);
+        if (AIRPLANE_MODE){
+            pbf_press_button(context, BUTTON_A, 160ms, 800ms);
+            pbf_press_button(context, BUTTON_A, 160ms, 800ms);
+        }
+        pbf_press_button(context, BUTTON_X, 160ms, 400ms);
+        pbf_press_dpad(context, DPAD_LEFT, 160ms, 160ms);
+        env.log("Starting Encounter: " + tostr_u_commas(stats.encounters() + 1));
+        pbf_press_button(context, BUTTON_A, 160ms, 0ms);
+        context.wait_for_all_requests();
+
+        {
+            //  Wait for start of battle.
+            StandardBattleMenuWatcher battle_menu_detector(false);
+            StartBattleWatcher start_back_detector;
+            wait_until(
+                env.console, context,
+                std::chrono::seconds(30),
+                {
+                    {battle_menu_detector},
+                    {start_back_detector},
+                }
+            );
+        }
+
+        //  Detect shiny.
+        ShinyDetectionResult result = detect_shiny_battle(
+            env.console, context,
+            SHINY_BATTLE_REGULAR,
+            std::chrono::seconds(30)
+        );
+//        shininess = ShinyDetection::SQUARE_SHINY;
+
+        bool stop = handler.handle_standard_encounter_end_battle(
+            result, EXIT_BATTLE_TIMEOUT0
+        );
+        if (stop){
+            break;
+        }
+    }
+
+    env.update_stats();
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+    GO_HOME_WHEN_DONE.run_end_of_program(context);
+}
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-SwordsOfJustice.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-SwordsOfJustice.h
new file mode 100644
index 0000000000..4f63918ac3
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-SwordsOfJustice.h
@@ -0,0 +1,65 @@
+/*  Shiny Hunt Autonomous - Swords Of Justice
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_ShinyHuntAutonomousSwordsOfJustice_H
+#define PokemonAutomation_PokemonSwSh_ShinyHuntAutonomousSwordsOfJustice_H
+
+#include "Common/Cpp/Options/StaticTextOption.h"
+#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "Common/Cpp/Options/TimeDurationOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h"
+#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "Pokemon/Options/Pokemon_EncounterBotOptions.h"
+#include "VideoGames/PokemonSwSh/Options/PokemonSwSh_DateToucher.h"
+#include "VideoGames/PokemonSwSh/Options/PokemonSwSh_EncounterBotCommon.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+using namespace Pokemon;
+
+
+class ShinyHuntAutonomousSwordsOfJustice_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    ShinyHuntAutonomousSwordsOfJustice_Descriptor();
+
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+
+
+class ShinyHuntAutonomousSwordsOfJustice : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = ShinyHuntAutonomousSwordsOfJustice_Descriptor;
+    ShinyHuntAutonomousSwordsOfJustice();
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    StartInGripOrGameOption START_LOCATION;
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
+    TimeRollbackHoursOption TIME_ROLLBACK_HOURS;
+
+    EncounterBotLanguage LANGUAGE;
+
+    BooleanCheckBoxOption AIRPLANE_MODE;
+    EncounterBotCommonOptions ENCOUNTER_BOT_OPTIONS;
+
+    EventNotificationsOption NOTIFICATIONS;
+
+    SectionDividerOption m_advanced_options;
+    MillisecondsOption EXIT_BATTLE_TIMEOUT0;
+    MillisecondsOption POST_BATTLE_MASH_TIME0;
+    MillisecondsOption ENTER_CAMP_DELAY0;
+};
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Whistling.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Whistling.cpp
new file mode 100644
index 0000000000..c7620a2463
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Whistling.cpp
@@ -0,0 +1,182 @@
+/*  Shiny Hunt Autonomous - Whistling
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonTools/Async/InferenceRoutines.h"
+#include "NintendoSwitch/NintendoSwitch_Settings.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "VideoGames/PokemonSwSh/PokemonSwSh_Settings.h"
+#include "VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.h"
+#include "VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_StartBattleDetector.h"
+#include "VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleMenuDetector.h"
+#include "VideoGames/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_ShinyEncounterDetector.h"
+#include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
+#include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_EncounterHandler.h"
+#include "PokemonSwSh_ShinyHuntAutonomous-Whistling.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+ShinyHuntAutonomousWhistling_Descriptor::ShinyHuntAutonomousWhistling_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonSwSh:ShinyHuntAutonomousWhistling",
+        STRING_POKEMON + " SwSh", "Shiny Hunt Autonomous - Whistling",
+        "Programs/PokemonSwSh/ShinyHuntAutonomous-Whistling.html",
+        "Stand in one place and whistle. Shiny hunt everything that attacks you using video feedback.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+struct ShinyHuntAutonomousWhistling_Descriptor::Stats : public ShinyHuntTracker{
+    Stats()
+        : ShinyHuntTracker(true)
+        , m_unexpected_battles(m_stats["Unexpected Battles"])
+    {
+        m_display_order.insert(m_display_order.begin() + 2, Stat("Unexpected Battles"));
+        m_aliases["Timeouts"] = "Errors";
+    }
+    std::atomic<uint64_t>& m_unexpected_battles;
+};
+std::unique_ptr<StatsTracker> ShinyHuntAutonomousWhistling_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+
+
+ShinyHuntAutonomousWhistling::ShinyHuntAutonomousWhistling()
+    : GO_HOME_WHEN_DONE(false)
+    , ENCOUNTER_BOT_OPTIONS(true, true)
+    , NOTIFICATIONS({
+        &ENCOUNTER_BOT_OPTIONS.NOTIFICATION_NONSHINY,
+        &ENCOUNTER_BOT_OPTIONS.NOTIFICATION_SHINY,
+        &ENCOUNTER_BOT_OPTIONS.NOTIFICATION_CATCH_SUCCESS,
+        &ENCOUNTER_BOT_OPTIONS.NOTIFICATION_CATCH_FAILED,
+        &NOTIFICATION_PROGRAM_FINISH,
+        &NOTIFICATION_ERROR_FATAL,
+    })
+    , m_advanced_options(
+        "<font size=4><b>Advanced Options:</b> You should not need to touch anything below here.</font>"
+    )
+    , EXIT_BATTLE_TIMEOUT0(
+        "<b>Exit Battle Timeout:</b><br>After running, wait this long to return to overworld.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "10 s"
+    )
+{
+    PA_ADD_OPTION(START_LOCATION);
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+    PA_ADD_OPTION(TIME_ROLLBACK_HOURS);
+
+    PA_ADD_OPTION(LANGUAGE);
+    PA_ADD_OPTION(ENCOUNTER_BOT_OPTIONS);
+    PA_ADD_OPTION(NOTIFICATIONS);
+
+    PA_ADD_STATIC(m_advanced_options);
+    PA_ADD_OPTION(EXIT_BATTLE_TIMEOUT0);
+}
+
+
+
+void ShinyHuntAutonomousWhistling::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    if (START_LOCATION.start_in_grip_menu()){
+        grip_menu_connect_go_home(context);
+        resume_game_back_out(
+            env.console,
+            context,
+            ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST,
+            1600ms
+        );
+    }else{
+        //  Connect the controller.
+        require_player(env.console, context, BUTTON_B);
+    }
+
+    WallDuration PERIOD = std::chrono::hours(TIME_ROLLBACK_HOURS);
+    WallClock last_touch = current_time();
+
+    ShinyHuntAutonomousWhistling_Descriptor::Stats& stats = env.current_stats<ShinyHuntAutonomousWhistling_Descriptor::Stats>();
+    env.update_stats();
+
+    StandardEncounterHandler handler(
+        env, env.console, context,
+        LANGUAGE,
+        ENCOUNTER_BOT_OPTIONS,
+        stats
+    );
+
+    while (true){
+        //  Touch the date.
+        if (TIME_ROLLBACK_HOURS > 0 && current_time() - last_touch >= PERIOD){
+            pbf_press_button(context, BUTTON_HOME, 160ms, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE0);
+            rollback_hours_from_home(env.console, context, TIME_ROLLBACK_HOURS, ConsoleSettings::instance().SETTINGS_TO_HOME_DELAY0);
+            resume_game_no_interact(env.console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST);
+            last_touch += PERIOD;
+        }
+
+        context.wait_for_all_requests();
+        {
+            StandardBattleMenuWatcher battle_menu_detector(false);
+            StartBattleWatcher start_battle_detector;
+
+            int result = run_until<ProControllerContext>(
+                env.console, context,
+                [](ProControllerContext& context){
+                    while (true){
+                        pbf_mash_button(context, BUTTON_LCLICK, 1000ms);
+                        pbf_move_right_joystick(context, {+0.5, 0}, 1000ms, 0ms);
+                    }
+                },
+                {
+                    {battle_menu_detector},
+                    {start_battle_detector},
+                }
+            );
+
+            switch (result){
+            case 0:
+                env.log("Unexpected battle menu.", COLOR_RED);
+                stats.m_unexpected_battles++;
+                env.update_stats();
+                pbf_mash_button(context, BUTTON_B, 1000ms);
+                run_away(env.console, context, EXIT_BATTLE_TIMEOUT0);
+                continue;
+            case 1:
+                env.log("Battle started!");
+                break;
+            }
+        }
+
+        //  Detect shiny.
+        ShinyDetectionResult result = detect_shiny_battle(
+            env.console, context,
+            SHINY_BATTLE_REGULAR,
+            std::chrono::seconds(30)
+        );
+
+        bool stop = handler.handle_standard_encounter_end_battle(
+            result, EXIT_BATTLE_TIMEOUT0
+        );
+        if (stop){
+            break;
+        }
+    }
+
+    env.update_stats();
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+    GO_HOME_WHEN_DONE.run_end_of_program(context);
+}
+
+
+
+}
+}
+}
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Whistling.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Whistling.h
new file mode 100644
index 0000000000..f6a3cf834c
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Whistling.h
@@ -0,0 +1,61 @@
+/*  Shiny Hunt Autonomous - Whistling
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_ShinyHuntAutonomousWhistling_H
+#define PokemonAutomation_PokemonSwSh_ShinyHuntAutonomousWhistling_H
+
+#include "Common/Cpp/Options/StaticTextOption.h"
+#include "Common/Cpp/Options/TimeDurationOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h"
+#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "Pokemon/Options/Pokemon_EncounterBotOptions.h"
+#include "VideoGames/PokemonSwSh/Options/PokemonSwSh_DateToucher.h"
+#include "VideoGames/PokemonSwSh/Options/PokemonSwSh_EncounterBotCommon.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+using namespace Pokemon;
+
+
+
+class ShinyHuntAutonomousWhistling_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    ShinyHuntAutonomousWhistling_Descriptor();
+
+    struct Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+
+
+class ShinyHuntAutonomousWhistling : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = ShinyHuntAutonomousWhistling_Descriptor;
+    ShinyHuntAutonomousWhistling();
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    StartInGripOrGameOption START_LOCATION;
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
+    TimeRollbackHoursOption TIME_ROLLBACK_HOURS;
+
+    EncounterBotLanguage LANGUAGE;
+    EncounterBotCommonOptions ENCOUNTER_BOT_OPTIONS;
+
+    EventNotificationsOption NOTIFICATIONS;
+
+    SectionDividerOption m_advanced_options;
+    MillisecondsOption EXIT_BATTLE_TIMEOUT0;
+};
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_CurryHunter.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_CurryHunter.cpp
new file mode 100644
index 0000000000..ebc9268c73
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_CurryHunter.cpp
@@ -0,0 +1,319 @@
+/*  Curry Hunter
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Globals.h"
+#include "CommonTools/Async/InferenceSession.h"
+#include "CommonTools/StartupChecks/StartProgramChecks.h"
+#include "NintendoSwitch/NintendoSwitch_Settings.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonSwSh/PokemonSwSh_Settings.h"
+#include "VideoGames/PokemonSwSh/ShinyHuntTracker.h"
+#include "VideoGames/PokemonSwSh/Inference/PokemonSwSh_ReceivePokemonDetector.h"
+//#include "VideoGames/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_ShinySparkleDetector.h"
+#include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
+#include "PokemonSwSh_CurryHunter.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+CurryHunter_Descriptor::CurryHunter_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonSwSh:CurryHunter",
+        STRING_POKEMON + " SwSh", "Curry Hunter",
+        "Programs/PokemonSwSh/CurryHunter.html",
+        "Cooks curry to attract " + STRING_POKEMON + " to your camp. "
+        "<font color=\"red\">(This program cannot detect shinies. You must check manually or with " + STRING_POKEMON + " HOME.)</font>",
+        PanelQualityStanding::OFFICIAL_BELOW_STANDARDS,
+        ProgramControllerClass::StandardController_RequiresPrecision,
+        FeedbackType::OPTIONAL_,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+struct CurryHunter_Descriptor::Stats : public ShinyHuntTracker{
+    Stats()
+        : ShinyHuntTracker(true)
+        , m_attempts(m_stats["Attempts"])
+    {
+        for (auto& item : m_display_order){
+            item.display_mode = HIDDEN_IF_ZERO;
+        }
+        m_display_order.insert(m_display_order.begin(), Stat("Attempts"));
+    }
+    std::atomic<uint64_t>& m_attempts;
+};
+std::unique_ptr<StatsTracker> CurryHunter_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+
+CurryHunter::CurryHunter()
+    : WALK_UP_DELAY0(
+        "<b>Walk up Delay:</b><br>Wait this long for the " + STRING_POKEMON + " to walk up to you.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "2000 ms"
+    )
+    , SMALL_POKEMON(
+        "<b>Walk forward for Small " + STRING_POKEMON + ":</b><br>"
+        "If there are small " + STRING_POKEMON +
+        ", increase this number by 240 ms. You may have to adjust the number and check what works best for your area.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "0 ms"
+    )
+    , TAKE_VIDEO(
+        "<b>Take Videos:</b><br>Take a video after each cooking iteration. This will spam your album with videos.",
+        LockMode::LOCK_WHILE_RUNNING,
+        false
+    )
+    , ITERATIONS(
+        "<b>Iterations:</b><br># of cooking attempts.",
+        LockMode::LOCK_WHILE_RUNNING,
+        999
+    )
+{
+    PA_ADD_OPTION(WALK_UP_DELAY0);
+    PA_ADD_OPTION(SMALL_POKEMON);
+    PA_ADD_OPTION(START_LOCATION);
+    PA_ADD_OPTION(TAKE_VIDEO);
+    PA_ADD_OPTION(ITERATIONS);
+}
+
+
+
+void CurryHunter::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    StartProgramChecks::check_performance_class_wired_or_wireless(context);
+
+    if (START_LOCATION.start_in_grip_menu()){
+        grip_menu_connect_go_home(context);
+        resume_game_no_interact(env.console, context, ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST);
+    }else{
+        //  Connect the controller.
+        require_player(env.console, context, BUTTON_R);
+    }
+
+
+    CurryHunter_Descriptor::Stats& stats = env.current_stats<CurryHunter_Descriptor::Stats>();
+    env.update_stats();
+
+
+    //  Select the cooking option.
+    pbf_press_button(context, BUTTON_X, 40ms, 1000ms);
+    pbf_press_dpad(context, DPAD_RIGHT, 40ms, 800ms);
+    pbf_press_button(context, BUTTON_A, 40ms, 1000ms);
+    pbf_press_button(context, BUTTON_A, 40ms, 2400ms);
+
+
+    for (uint32_t it = 0; it < ITERATIONS; it++){
+        //  Which ingredient do you want to use?
+        pbf_press_button(context, BUTTON_A, 40ms, 600ms);     //  Get rid of the pop-up menu.
+        pbf_press_button(context, BUTTON_A, 40ms, 1200ms);    //  75. english text is longer.
+        pbf_press_button(context, BUTTON_A, 40ms, 800ms);    //  Ingredient is now selected.
+
+        //  Which berries do you want to use?
+        pbf_press_button(context, BUTTON_A, 40ms, 600ms);     //  Get rid of the pop-up menu.
+        pbf_press_button(context, BUTTON_A, 40ms, 600ms);
+        pbf_press_dpad(context, DPAD_UP, 40ms, 600ms);
+        pbf_press_button(context, BUTTON_A, 40ms, 1000ms);
+        pbf_press_button(context, BUTTON_PLUS, 40ms, 1600ms); //  125. english text is longer.
+        pbf_press_button(context, BUTTON_A, 40ms, 8000ms);   //  Berries are now selected as well.
+
+
+        //  Around 17 seconds of A mashing for the first curry cooking phase.
+        for (uint16_t c = 0; c < 2100; c = c + 10){
+            pbf_press_button(context, BUTTON_A, 40ms, 40ms);
+        }
+
+        //  Slowing down to not burn the curry.
+        for (uint16_t c = 0; c < 300; c = c + 25){
+            pbf_press_button(context, BUTTON_A, 40ms, 160ms);
+        }
+        pbf_wait(context, 1360ms);
+
+
+        //  Do circles with the joystick. Each circle has ten positions.
+        for (uint16_t i = 0; i < 2350; i = i + 50){
+            pbf_move_right_joystick(context, {0, -1}, 40ms, 0ms);
+            pbf_move_right_joystick(context, {+0.583, -0.811}, 40ms, 0ms);
+            pbf_move_right_joystick(context, {+0.953, -0.307}, 40ms, 0ms);
+            pbf_move_right_joystick(context, {+0.953, +0.312}, 40ms, 0ms);
+            pbf_move_right_joystick(context, {+0.583, +0.812}, 40ms, 0ms);
+            pbf_move_right_joystick(context, {0, +1}, 40ms, 0ms);
+            pbf_move_right_joystick(context, {-0.586, +0.812}, 40ms, 0ms);
+            pbf_move_right_joystick(context, {-0.953, +0.312}, 40ms, 0ms);
+            pbf_move_right_joystick(context, {-0.953, -0.307}, 40ms, 0ms);
+            pbf_move_right_joystick(context, {-0.586, -0.811}, 40ms, 0ms);
+        }
+
+
+        //  Last step for the curry cooking part.
+        pbf_wait(context, 3400ms);
+        pbf_press_button(context, BUTTON_A, 40ms, 18000ms);
+
+        //  Press A when it shows your curry, and its class.
+        pbf_press_button(context, BUTTON_A, 40ms, 12000ms);
+        pbf_press_button(context, BUTTON_A, 40ms, 4000ms);
+        // You are now back to the camping with your 6 Pokemon, and hopefully a curry Pokemon.
+
+        {
+            context.wait_for_all_requests();
+
+            ReceivePokemonOverWatcher receive_detector(false);
+//            ShinySparkleDetector shiny_detector(
+//                env.console, env.console,
+//                ImageFloatBox(0.1, 0.01, 0.8, 0.77)
+//            );
+            InferenceSession inference(
+                context, env.console,
+                {
+                    {receive_detector},
+//                    {shiny_detector},
+                }
+            );
+
+            //  Default implementation of the "attract curry Pokemon" routine.
+            pbf_move_left_joystick(context, {0, +1}, 320ms, 40ms);     //  Move up a bit to avoid talking to your pokemon.
+            pbf_press_button(context, BUTTON_A, 40ms, 40ms);
+            pbf_move_left_joystick(context, {+1, 0}, 440ms, 0ms);     //  Right
+            for (uint16_t i = 0;  i< 2; i++){
+                pbf_move_left_joystick(context, {-1, 0}, 216ms, 0ms); //  Left
+                pbf_press_button(context, BUTTON_A, 40ms, 40ms);
+                pbf_move_left_joystick(context, {-1, 0}, 216ms, 0ms); //  Left
+                pbf_press_button(context, BUTTON_A, 40ms, 40ms);
+                pbf_move_left_joystick(context, {-1, 0}, 216ms, 0ms); //  Left
+                pbf_press_button(context, BUTTON_A, 40ms, 40ms);
+                pbf_move_left_joystick(context, {-1, 0}, 216ms, 0ms); //  Left
+                pbf_press_button(context, BUTTON_A, 40ms, 40ms);
+                pbf_move_left_joystick(context, {+1, 0}, 216ms, 0ms); //  Right
+                pbf_press_button(context, BUTTON_A, 40ms, 40ms);
+                pbf_move_left_joystick(context, {+1, 0}, 216ms, 0ms); //  Right
+                pbf_press_button(context, BUTTON_A, 40ms, 40ms);
+                pbf_move_left_joystick(context, {+1, 0}, 216ms, 0ms); //  Right
+                pbf_press_button(context, BUTTON_A, 40ms, 40ms);
+                pbf_move_left_joystick(context, {+1, 0}, 216ms, 0ms); //  Right
+                pbf_press_button(context, BUTTON_A, 40ms, 40ms);
+            }
+
+
+            //  This routine gives better odds of attracting a low Pokemon if the option is enabled.
+            if (SMALL_POKEMON.get() > 0ms){
+                pbf_move_left_joystick(context, {0, -1}, SMALL_POKEMON, 0ms);
+
+                for (uint16_t i = 0; i<2; i++){
+                    pbf_move_left_joystick(context, {-1, 0}, 240ms, 0ms); // Left
+                    pbf_press_button(context, BUTTON_A, 40ms, 40ms);
+                    pbf_move_left_joystick(context, {-1, 0}, 240ms, 0ms); // Left
+                    pbf_press_button(context, BUTTON_A, 40ms, 40ms);
+                    pbf_move_left_joystick(context, {-1, 0}, 240ms, 0ms); // Left
+                    pbf_press_button(context, BUTTON_A, 40ms, 40ms);
+                    pbf_move_left_joystick(context, {+1, 0}, 240ms, 0ms); // Right
+                    pbf_press_button(context, BUTTON_A, 40ms, 40ms);
+                    pbf_move_left_joystick(context, {+1, 0}, 240ms, 0ms); // Right
+                    pbf_press_button(context, BUTTON_A, 40ms, 40ms);
+                    pbf_move_left_joystick(context, {+1, 0}, 240ms, 0ms); // Right
+                    pbf_press_button(context, BUTTON_A, 40ms, 40ms);
+                }
+            
+            }
+
+            //  Give the pokemon the time to come to us.
+            pbf_wait(context, WALK_UP_DELAY0);
+
+            //  Record the encounter.
+            if (TAKE_VIDEO){
+                pbf_press_button(context, BUTTON_CAPTURE, 2000ms, 4000ms);
+            }else{
+                pbf_wait(context, 6000ms);
+            }
+
+
+            //  At this point, let's assume we have attracted the curry pokemon.
+            //  Now we need to add it to our party while making sure this won't break anything if there is
+            //  No curry encounter.
+            //  This sequence seems to work because when you whistle at a curry encounter, your camera
+            //  Automatically focuses on it, while it doesn't do that for your pokemons.
+
+            //  "a [wild pokemon] came to your camp !"
+            pbf_press_button(context, BUTTON_A, 40ms, 2000ms);
+
+            //  "[wild pokemon] seems to want to come with you!"
+            pbf_press_button(context, BUTTON_A, 40ms, 1600ms);
+
+            //  "do you want to adopt it ?"
+            pbf_press_button(context, BUTTON_A, 40ms, 1600ms);
+
+            //  "you adopted [wild pokemon]!"
+            pbf_press_button(context, BUTTON_A, 40ms, 1600ms);
+
+            //  "[wild pokemon] entered into a poke ball"
+            pbf_press_button(context, BUTTON_A, 40ms, 6400ms);
+
+            //  "[wild pokemon] has been sent to the PC"
+            pbf_press_button(context, BUTTON_A, 40ms, 3000ms);
+
+
+            context.wait_for_all_requests();
+            ShinyType shininess = ShinyType::NOT_SHINY;
+            if (receive_detector.triggered()){
+//                shininess = shiny_detector.results();
+#if 1
+                stats.add_non_shiny();
+#else
+                switch (shininess){
+                case ShinyType::UNKNOWN:
+                case ShinyType::NOT_SHINY:
+                    stats.add_non_shiny();
+                    break;
+                case ShinyType::UNKNOWN_SHINY:
+                    stats.add_unknown_shiny();
+                    break;
+                case ShinyType::STAR_SHINY:
+                    stats.add_star_shiny();
+                    break;
+                case ShinyType::SQUARE_SHINY:
+                    stats.add_square_shiny();
+                    break;
+
+                }
+#endif
+            }
+
+            stats.m_attempts++;
+            env.update_stats();
+            if (shininess != ShinyType::NOT_SHINY){
+                pbf_press_button(context, BUTTON_CAPTURE, 2000ms, 4000ms);
+            }
+        }
+
+
+        //  If you talked to the curry Pokemon too early, you can end up talking to one of your Pokemon
+        //  Once you reach this part of the program. The following sequence ensures that you
+        //  Are in a correct state to cook again.
+        pbf_move_left_joystick(context, {+1, 0}, 1000ms, 40ms);
+        pbf_move_left_joystick(context, {0, +1}, 1000ms, 40ms);
+        pbf_move_left_joystick(context, {0, +1}, 40ms, 400ms);
+        pbf_press_button(context, BUTTON_A, 40ms, 2000ms);    //  Wait 2 seconds to be sure the following X press won't be dropped.
+
+        //  And now we cook another curry.
+        pbf_press_button(context, BUTTON_X, 40ms, 1000ms);
+        pbf_press_button(context, BUTTON_A, 40ms, 1000ms);
+        pbf_press_button(context, BUTTON_A, 40ms, 2400ms);
+    }
+
+
+    //  Not really relevant here, but for programs that finish, go to
+    //  Switch home to idle.
+    pbf_press_button(context, BUTTON_HOME, 160ms, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE0);
+}
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_CurryHunter.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_CurryHunter.h
new file mode 100644
index 0000000000..159cfa023f
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_CurryHunter.h
@@ -0,0 +1,51 @@
+/*  Curry Bot
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_CurryHunter_H
+#define PokemonAutomation_PokemonSwSh_CurryHunter_H
+
+#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "Common/Cpp/Options/TimeDurationOption.h"
+#include "NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+class CurryHunter_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    CurryHunter_Descriptor();
+
+    struct Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+
+
+class CurryHunter : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = CurryHunter_Descriptor;
+    CurryHunter();
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    StartInGripOrGameOption START_LOCATION;
+    MillisecondsOption WALK_UP_DELAY0;
+    MillisecondsOption SMALL_POKEMON;
+    BooleanCheckBoxOption TAKE_VIDEO;
+    SimpleIntegerOption<uint32_t> ITERATIONS;
+};
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_MultiGameFossil.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_MultiGameFossil.cpp
new file mode 100644
index 0000000000..9beeb9611e
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_MultiGameFossil.cpp
@@ -0,0 +1,176 @@
+/*  Multiple Game Fossil
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "NintendoSwitch/NintendoSwitch_Settings.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonSwSh/PokemonSwSh_Settings.h"
+#include "VideoGames/PokemonSwSh/Programs/PokemonSwSh_GameEntry.h"
+#include "PokemonSwSh_MultiGameFossil.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+    using namespace Pokemon;
+
+
+MultiGameFossil_Descriptor::MultiGameFossil_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonSwSh:MultiGameFossil",
+        STRING_POKEMON + " SwSh", "Multi-Game Fossil Revive",
+        "Programs/PokemonSwSh/MultiGameFossil.html",
+        "Revive fossils. Supports multiple saves so you can go afk for longer than 5 hours.",
+        PanelQualityStanding::UNMAINTAINED,
+        ProgramControllerClass::StandardController_PerformanceClassSensitive,
+        FeedbackType::NONE,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+
+
+MultiGameFossil::MultiGameFossil(){
+    PA_ADD_OPTION(START_LOCATION);
+    PA_ADD_OPTION(GAME_LIST);
+}
+
+void run_fossil_batch(
+    ConsoleHandle& console,
+    ProControllerContext& context,
+    const FossilGame& batch,
+    bool* game_slot_flipped,
+    bool save_and_exit
+){
+    //  Sanitize Slots
+    uint8_t game_slot = (uint8_t)batch.game_slot.current_value();
+    uint8_t user_slot = (uint8_t)batch.user_slot.current_value();
+    if (game_slot > 2){
+        game_slot = 0;
+    }
+
+    console.log(
+        std::string("Batch:") +
+        "\nGame Slot: " + std::to_string(game_slot) +
+        "\nUser Slot: " + std::to_string(user_slot) +
+        "\nFossil: " + std::to_string(batch.fossil.current_value()) +
+        "\nRevives: " + std::to_string(batch.revives)
+    );
+
+    //  Calculate current game slot.
+    switch (game_slot){
+    case 0:
+        break;
+    case 1:
+        game_slot = *game_slot_flipped ? 2 : 0;
+        break;
+    case 2:
+        game_slot = *game_slot_flipped ? 0 : 2;
+        break;
+    }
+
+    start_game_from_home(
+        console, context,
+        ConsoleSettings::instance().TOLERATE_SYSTEM_UPDATE_MENU_FAST,
+        game_slot,
+        user_slot,
+        false
+    );
+    if (game_slot == 2){
+        *game_slot_flipped = !*game_slot_flipped;
+    }
+
+    //  Revive
+#if 1
+    for (uint16_t c = 0; c < batch.revives; c++){
+#if 1
+        ssf_mash_AZs(context, 1360ms);
+        pbf_wait(context, 520ms);
+#else
+        ssf_mash_AZs(context, 50);
+        pbf_wait(context, 140);
+        ssf_press_button1(context, BUTTON_A, 160);
+#endif
+        switch (batch.fossil){
+        case Fossil::Dracozolt:
+            ssf_press_button_ptv(context, BUTTON_A, 1280ms);
+            break;
+        case Fossil::Arctozolt:
+            ssf_press_button_ptv(context, BUTTON_A, 1280ms);
+            ssf_press_dpad_ptv(context, DPAD_DOWN, 40ms);
+            break;
+        case Fossil::Dracovish:
+            ssf_press_dpad_ptv(context, DPAD_DOWN, 40ms);
+            ssf_press_button_ptv(context, BUTTON_A, 1280ms);
+            break;
+        case Fossil::Arctovish:
+            ssf_press_dpad_ptv(context, DPAD_DOWN, 40ms);
+            ssf_press_button_ptv(context, BUTTON_A, 1280ms);
+            ssf_press_dpad_ptv(context, DPAD_DOWN, 40ms);
+            break;
+        }
+
+        if (context->performance_class() == ControllerPerformanceClass::SysbotBase){
+            ssf_mash_AZs(context, 4000ms);
+        }else{
+            ssf_mash_AZs(context, 3200ms);
+        }
+        pbf_mash_button(
+            context,
+            BUTTON_B,
+            GameSettings::instance().AUTO_DEPOSIT ? 11200ms : 12160ms
+        );
+    }
+    pbf_wait(context, 800ms);
+#endif
+
+    if (!save_and_exit){
+//        ssf_press_button2(BUTTON_HOME, GAME_TO_HOME_DELAY_SAFE, 10);
+        return;
+    }
+
+    //  Save game.
+    ssf_press_button(context, BUTTON_X, GameSettings::instance().OVERWORLD_TO_MENU_DELAY0, 160ms);
+    ssf_press_button(context, BUTTON_R, 1200ms, 160ms);
+    ssf_press_button(context, BUTTON_A, 4000ms, 80ms);
+
+    //  Exit game.
+    ssf_press_button(context, BUTTON_HOME, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE0, 80ms);
+    close_game_from_home(console, context);
+}
+
+
+void MultiGameFossil::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    if (START_LOCATION.start_in_grip_menu()){
+        grip_menu_connect_go_home(context);
+    }else{
+        //  Connect the controller.
+        require_player(env.console, context, BUTTON_B);
+        ssf_press_button(context, BUTTON_HOME, GameSettings::instance().GAME_TO_HOME_DELAY_FAST0, 160ms);
+    }
+
+    std::vector<std::unique_ptr<FossilGame>> list = GAME_LIST.copy_snapshot();
+
+//    FossilGame2 batch;
+
+    size_t games = list.size();
+
+    bool game_slot_flipped = false;
+    for (size_t c = 0; c < games; c++){
+//        batch = GAME_LIST2[c];
+        run_fossil_batch(env.console, context, *list[c], &game_slot_flipped, c + 1 < games);
+    }
+
+    ssf_press_button(context, BUTTON_HOME, GameSettings::instance().GAME_TO_HOME_DELAY_SAFE0, 160ms);
+}
+
+
+
+}
+}
+}
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_MultiGameFossil.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_MultiGameFossil.h
new file mode 100644
index 0000000000..b01a45a764
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_MultiGameFossil.h
@@ -0,0 +1,43 @@
+/*  Multiple Game Fossil
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_MultiGameFossil_H
+#define PokemonAutomation_PokemonSwSh_MultiGameFossil_H
+
+#include "NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "VideoGames/PokemonSwSh/Options/PokemonSwSh_FossilTable.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+class MultiGameFossil_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    MultiGameFossil_Descriptor();
+};
+
+
+
+class MultiGameFossil : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = MultiGameFossil_Descriptor;
+    MultiGameFossil();
+
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    StartInGripOrClosedOption START_LOCATION;
+    FossilTable GAME_LIST;
+};
+
+
+}
+}
+}
+#endif
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHunt-Regi.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHunt-Regi.cpp
new file mode 100644
index 0000000000..5092220c23
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHunt-Regi.cpp
@@ -0,0 +1,126 @@
+/*  Regi Routines
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/PrettyPrint.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "PokemonSwSh_ShinyHunt-Regi.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+void move_to_corner(
+    Logger& logger, ProControllerContext& context,
+    bool correction, Milliseconds TRANSITION_DELAY
+){
+    if (correction){
+        logger.log("Performing auto-correction.");
+        //  Move down to building exit and exit.
+        pbf_move_left_joystick(context, {0, -1}, 4000ms, TRANSITION_DELAY);
+        pbf_move_left_joystick(context, {0, -1}, 2400ms, TRANSITION_DELAY);
+
+        //  Navigate back into the corner.
+        pbf_move_left_joystick(context, {+1, +0.5}, 1600ms, 0ms);
+        pbf_move_left_joystick(context, {-0.062, +1}, 2000ms, 0ms);
+        pbf_move_left_joystick(context, {+1, +0.219}, 1200ms, 80ms);
+    }else{
+        //  Move to corner.
+        pbf_move_left_joystick(context, {+1, +0.219}, 2400ms, 80ms);
+    }
+}
+
+
+void regirock(ProControllerContext& context){
+    pbf_move_left_joystick(context, {-1, -0.819}, 1352ms, 0ms);
+    pbf_move_left_joystick(context, {0, -1}, 1080ms, 0ms);
+    pbf_move_left_joystick(context, {-1, 0}, 872ms, 0ms);
+    pbf_move_left_joystick(context, {0, +1}, 1120ms, 0ms);
+    pbf_move_left_joystick(context, {+0.772, -1}, 720ms, 0ms);
+    pbf_move_left_joystick(context, {0, +1}, 160ms, 0ms);
+    pbf_mash_button(context, BUTTON_A, 5000ms);
+    pbf_move_left_joystick(context, {0, +1}, 1600ms, 0ms);
+}
+void regice(ProControllerContext& context){
+    pbf_move_left_joystick(context, {-0.375, -1}, 1456ms, 0ms);
+    pbf_move_left_joystick(context, {-1, 0}, 912ms, 0ms);
+    pbf_move_left_joystick(context, {0, -1}, 448ms, 0ms);
+    pbf_move_left_joystick(context, {-0.75, +1}, 608ms, 0ms);
+    pbf_move_left_joystick(context, {-1, 0}, 432ms, 0ms);
+    pbf_move_left_joystick(context, {+1, +0.469}, 1224ms, 0ms);
+    pbf_move_left_joystick(context, {0, +1}, 160ms, 0ms);
+    pbf_mash_button(context, BUTTON_A, 5000ms);
+    pbf_move_left_joystick(context, {0, +1}, 1360ms, 0ms);
+}
+void registeel(ProControllerContext& context){
+    pbf_move_left_joystick(context, {-1, -0.819}, 1352ms, 0ms);
+    pbf_move_left_joystick(context, {+0.5, -1}, 512ms, 0ms);
+    pbf_move_left_joystick(context, {-0.5, -1}, 512ms, 0ms);
+    pbf_move_left_joystick(context, {-1, 0}, 880ms, 0ms);
+    pbf_move_left_joystick(context, {-0.5, +1}, 544ms, 0ms);
+    pbf_move_left_joystick(context, {+0.5, +1}, 528ms, 0ms);
+    pbf_move_left_joystick(context, {+0.803, -1}, 720ms, 0ms);
+    pbf_move_left_joystick(context, {0, +1}, 400ms, 0ms);
+    pbf_mash_button(context, BUTTON_A, 5000ms);
+    pbf_move_left_joystick(context, {0, +1}, 2000ms, 0ms);
+}
+void regieleki(ProControllerContext& context){
+    pbf_move_left_joystick(context, {-0.875, -1}, 1296ms, 0ms);
+    pbf_move_left_joystick(context, {-0.5, -1}, 416ms, 0ms);
+    pbf_move_left_joystick(context, {+0.567, -1}, 416ms, 0ms);
+    pbf_move_left_joystick(context, {-1, +0.609}, 976ms, 0ms);
+    pbf_move_left_joystick(context, {-1, -0.614}, 744ms, 0ms);
+    pbf_move_left_joystick(context, {+0.63, +1}, 624ms, 0ms);
+    pbf_move_left_joystick(context, {-0.531, +1}, 640ms, 0ms);
+    pbf_mash_button(context, BUTTON_A, 5000ms);
+    pbf_move_left_joystick(context, {+0.693, +1}, 1360ms, 0ms);
+}
+void regidrago(ProControllerContext& context){
+    pbf_move_left_joystick(context, {-0.875, -1}, 1280ms, 0ms);
+    pbf_move_left_joystick(context, {-0.438, -1}, 400ms, 0ms);
+    pbf_move_left_joystick(context, {-0.625, -1}, 848ms, 0ms);
+    pbf_move_left_joystick(context, {0, +1}, 384ms, 0ms);
+    pbf_move_left_joystick(context, {-1, +0.562}, 480ms, 0ms);
+    pbf_move_left_joystick(context, {-0.5, +1}, 480ms, 0ms);
+    pbf_move_left_joystick(context, {+1, -0.189}, 640ms, 0ms);
+    pbf_move_left_joystick(context, {0, +1}, 160ms, 0ms);
+    pbf_mash_button(context, BUTTON_A, 5000ms);
+    pbf_move_left_joystick(context, {0, +1}, 1440ms, 0ms);
+}
+
+void run_regi_light_puzzle(
+    Logger& logger, ProControllerContext& context,
+    RegiGolem regi, uint64_t encounter
+){
+    switch (regi){
+    case RegiGolem::Regirock:
+        regirock(context);
+        logger.log("Starting Regirock Encounter: " + tostr_u_commas(encounter + 1));
+        break;
+    case RegiGolem::Regice:
+        regice(context);
+        logger.log("Starting Regice Encounter: " + tostr_u_commas(encounter + 1));
+        break;
+    case RegiGolem::Registeel:
+        registeel(context);
+        logger.log("Starting Registeel Encounter: " + tostr_u_commas(encounter + 1));
+        break;
+    case RegiGolem::Regieleki:
+        regieleki(context);
+        logger.log("Starting Regieleki Encounter: " + tostr_u_commas(encounter + 1));
+        break;
+    case RegiGolem::Regidrago:
+        regidrago(context);
+        logger.log("Starting Regidrago Encounter: " + tostr_u_commas(encounter + 1));
+        break;
+    }
+}
+
+
+}
+}
+}
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHunt-Regi.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHunt-Regi.h
new file mode 100644
index 0000000000..7e573c3c95
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHunt-Regi.h
@@ -0,0 +1,35 @@
+/*  Regi Routines
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_RegiPatterns_H
+#define PokemonAutomation_PokemonSwSh_RegiPatterns_H
+
+#include "Common/Cpp/Logging/AbstractLogger.h"
+#include "Common/Cpp/Time.h"
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+#include "VideoGames/PokemonSwSh/Options/PokemonSwSh_RegiSelector.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+void move_to_corner(
+    Logger& logger, ProControllerContext& context,
+    bool correction, Milliseconds TRANSITION_DELAY
+);
+
+void run_regi_light_puzzle(
+    Logger& logger, ProControllerContext& context,
+    RegiGolem regi, uint64_t encounter
+);
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntTools.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntTools.cpp
new file mode 100644
index 0000000000..9a8feed819
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntTools.cpp
@@ -0,0 +1,30 @@
+/*  Shiny Hunting Tools
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "PokemonSwSh_ShinyHuntTools.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+void enter_summary(ProControllerContext& context, bool regi_move_right){
+    pbf_press_dpad(context, DPAD_DOWN, 80ms, 0ms);
+    pbf_press_button(context, BUTTON_A, 80ms, 2000ms);
+    pbf_press_button(context, BUTTON_A, 80ms, 1600ms);
+    if (regi_move_right){
+        pbf_move_left_joystick(context, {+1, 0}, 160ms, 240ms);
+    }
+    pbf_press_dpad(context, DPAD_DOWN, 80ms, 0ms);
+    pbf_press_button(context, BUTTON_A, 80ms, 80ms);    //  For Regi, this clears the dialog after running.
+}
+
+
+}
+}
+}
+
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntTools.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntTools.h
new file mode 100644
index 0000000000..a112a15b87
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntTools.h
@@ -0,0 +1,24 @@
+/*  Shiny Hunting Tools
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_ShinyHuntingTools_H
+#define PokemonAutomation_PokemonSwSh_ShinyHuntingTools_H
+
+#include "NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+void enter_summary(ProControllerContext& context, bool regi_move_right);
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/TestPrograms/PokemonSwSh_ShinyEncounterTester.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/TestPrograms/PokemonSwSh_ShinyEncounterTester.cpp
new file mode 100644
index 0000000000..d569a66f62
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/TestPrograms/PokemonSwSh_ShinyEncounterTester.cpp
@@ -0,0 +1,62 @@
+/*  Shiny Encounter Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/PrettyPrint.h"
+#include "Pokemon/Pokemon_Strings.h"
+#include "VideoGames/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_ShinyEncounterDetector.h"
+#include "PokemonSwSh_ShinyEncounterTester.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+ShinyEncounterTester_Descriptor::ShinyEncounterTester_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "PokemonSwSh:ShinyEncounterTester",
+        STRING_POKEMON + " SwSh", "Shiny Encounter Tester",
+        "",
+        "Test the shiny encounter detector. Start this program just before an encounter.",
+        PanelQualityStanding::DEVELOPER,
+        ProgramControllerClass::StandardController_NoRestrictions,
+        FeedbackType::REQUIRED,
+        AllowCommandsWhenRunning::ENABLE_COMMANDS
+    )
+{}
+
+
+
+ShinyEncounterTester::ShinyEncounterTester()
+    : ENCOUNTER_TYPE(
+        "<b>Encounter Type:</b>",
+        {
+            {EncounterType::Wild, "wild", "Wild Encounter"},
+            {EncounterType::Raid, "raid", "Raid Den"},
+        },
+        LockMode::LOCK_WHILE_RUNNING,
+        EncounterType::Wild
+    )
+{
+    PA_ADD_OPTION(ENCOUNTER_TYPE);
+}
+
+
+void ShinyEncounterTester::program(SingleSwitchProgramEnvironment& env, CancellableScope& scope){
+    ShinyDetectionResult result = detect_shiny_battle(
+        env.console, scope,
+        ENCOUNTER_TYPE == EncounterType::Wild ? SHINY_BATTLE_REGULAR : SHINY_BATTLE_RAID,
+        std::chrono::seconds(30)
+    );
+    result.get_best_screenshot().save(now_to_filestring() + ".png");
+}
+
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/TestPrograms/PokemonSwSh_ShinyEncounterTester.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/TestPrograms/PokemonSwSh_ShinyEncounterTester.h
new file mode 100644
index 0000000000..5c2465fce6
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Programs/TestPrograms/PokemonSwSh_ShinyEncounterTester.h
@@ -0,0 +1,43 @@
+/*  Shiny Encounter Detector
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/Options/EnumDropdownOption.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+
+class ShinyEncounterTester_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    ShinyEncounterTester_Descriptor();
+};
+
+
+
+class ShinyEncounterTester : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = ShinyEncounterTester_Descriptor;
+    ShinyEncounterTester();
+
+    virtual void program(SingleSwitchProgramEnvironment& env, CancellableScope& scope) override;
+
+private:
+    enum class EncounterType{
+        Wild,
+        Raid,
+    };
+    EnumDropdownOption<EncounterType> ENCOUNTER_TYPE;
+};
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Resources/PokemonSwSh_DailyHighlightDatabase.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Resources/PokemonSwSh_DailyHighlightDatabase.cpp
new file mode 100644
index 0000000000..c48a68f915
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Resources/PokemonSwSh_DailyHighlightDatabase.cpp
@@ -0,0 +1,52 @@
+/*  Daily Highlight Database
+ *
+ *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *
+ */
+
+#include "Common/Cpp/Json/JsonObject.h"
+#include "CommonFramework/GlobalAutoPaths.h"
+#include "PokemonSwSh_DailyHighlightDatabase.h"
+
+namespace PokemonAutomation {
+namespace NintendoSwitch {
+namespace PokemonSwSh {
+
+
+
+DailyHighlightDatabase::DailyHighlightDatabase(const char* resource_path){
+    std::string filepath = RESOURCE_PATH() + resource_path;
+    JsonValue json = load_json_file(filepath);
+    JsonObject& root = json.to_object_throw(filepath);
+
+    for (auto& item : root){
+        const std::string& slug = item.first;
+        JsonObject& obj = item.second.to_object_throw(filepath);
+
+        uint16_t min = (uint16_t)obj.get_integer_throw("min", filepath);
+        uint16_t max = (uint16_t)obj.get_integer_throw("max", filepath);
+        m_slug_to_range[slug] = std::pair<uint16_t, uint16_t>(min, max);
+
+        std::string display_name = obj.get_string_throw("display_name", filepath);
+        StringSelectEntry string_select_entry(slug, display_name);
+        m_stringselect_database.add_entry(string_select_entry);
+    }
+}
+
+std::pair<uint16_t, uint16_t> DailyHighlightDatabase::get_range_for_slug(const std::string& slug) const {
+    auto iter = m_slug_to_range.find(slug);
+    if (iter == m_slug_to_range.end()){
+        throw InternalProgramError(
+            nullptr,
+            PA_CURRENT_FUNCTION,
+            std::string("Invalid daily highlight slug: " + slug)
+        );
+    }
+    return iter->second;
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Resources/PokemonSwSh_DailyHighlightDatabase.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Resources/PokemonSwSh_DailyHighlightDatabase.h
new file mode 100644
index 0000000000..e7219fce37
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Resources/PokemonSwSh_DailyHighlightDatabase.h
@@ -0,0 +1,38 @@
+/*  Daily Highlight Database
+ *
+ *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_DailyHighlightDatabase_H
+#define PokemonAutomation_PokemonSwSh_DailyHighlightDatabase_H
+
+#include <map>
+#include "CommonTools/Options/StringSelectOption.h"
+
+namespace PokemonAutomation {
+namespace NintendoSwitch {
+namespace PokemonSwSh {
+
+
+class DailyHighlightDatabase {
+public:
+    DailyHighlightDatabase(const char* resource_path);
+
+    std::pair<uint16_t, uint16_t> get_range_for_slug(const std::string& slug) const;
+    const StringSelectDatabase& database() const {
+        return m_stringselect_database;
+    }
+
+private:
+    std::map<std::string, std::pair<uint16_t, uint16_t>> m_slug_to_range;
+    StringSelectDatabase m_stringselect_database;
+};
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Resources/PokemonSwSh_MaxLairDatabase.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Resources/PokemonSwSh_MaxLairDatabase.cpp
similarity index 87%
rename from SerialPrograms/Source/PokemonSwSh/Resources/PokemonSwSh_MaxLairDatabase.cpp
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/Resources/PokemonSwSh_MaxLairDatabase.cpp
index a143a9d2a1..9529415cfc 100644
--- a/SerialPrograms/Source/PokemonSwSh/Resources/PokemonSwSh_MaxLairDatabase.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Resources/PokemonSwSh_MaxLairDatabase.cpp
@@ -1,6 +1,6 @@
 /*  Pokemon Sword/Shield Max Lair Rentals
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -10,9 +10,8 @@
 #include "Common/Cpp/Json/JsonValue.h"
 #include "Common/Cpp/Json/JsonArray.h"
 #include "Common/Cpp/Json/JsonObject.h"
-#include "CommonFramework/Globals.h"
+#include "CommonFramework/GlobalAutoPaths.h"
 #include "Pokemon/Resources/Pokemon_PokemonSlugs.h"
-#include "Pokemon/Resources/Pokemon_PokemonNames.h"
 #include "PokemonSwSh_MaxLairDatabase.h"
 
 namespace PokemonAutomation{
@@ -34,21 +33,21 @@ struct MaxLairSlugsDatabase{
     MaxLairSlugsDatabase(){
         std::string path = RESOURCE_PATH() + "PokemonSwSh/MaxLairSlugMap.json";
         JsonValue json = load_json_file(path);
-        JsonObject& root = json.get_object_throw(path);
+        JsonObject& root = json.to_object_throw(path);
 
         for (auto& item0 : root){
             const std::string& maxlair_slug = item0.first;
-            JsonObject& obj = item0.second.get_object_throw(path);
+            JsonObject& obj = item0.second.to_object_throw(path);
             MaxLairSlugs slugs;
             for (auto& item1 : obj.get_array_throw("OCR", path)){
-                std::string& slug = item1.get_string_throw(path);
+                std::string& slug = item1.to_string_throw(path);
                 if (!slugs.name_slug.empty()){
                     throw FileException(nullptr, PA_CURRENT_FUNCTION, "Multiple names specified for MaxLair slug.", std::move(path));
                 }
                 slugs.name_slug = std::move(slug);
             }
             for (auto& item1 : obj.get_array_throw("Sprite", path)){
-                std::string& slug = item1.get_string_throw(path);
+                std::string& slug = item1.to_string_throw(path);
                 slugs.sprite_slugs.insert(std::move(slug));
             }
             m_slugs[maxlair_slug] = std::move(slugs);
@@ -133,13 +132,13 @@ MaxLairMove parse_move(JsonObject&& obj, const std::string& path){
 std::map<std::string, MaxLairMon> build_maxlair_mon_database(const std::string& path){
     std::string filepath = RESOURCE_PATH() + path;
     JsonValue json = load_json_file(filepath);
-    JsonObject& root = json.get_object_throw(filepath);
+    JsonObject& root = json.to_object_throw(filepath);
 
     std::map<std::string, MaxLairMon> database;
 
     for (auto& item : root){
         const std::string& slug = item.first;
-        JsonObject& obj = item.second.get_object_throw(filepath);
+        JsonObject& obj = item.second.to_object_throw(filepath);
 
         MaxLairMon& mon = database[slug];
         mon.species = slug;
@@ -148,11 +147,11 @@ std::map<std::string, MaxLairMon> build_maxlair_mon_database(const std::string&
         {
             JsonArray& array = obj.get_array_throw("type", filepath);
             if (array.size() >= 1){
-                std::string& str = array[0].get_string_throw(filepath);
+                std::string& str = array[0].to_string_throw(filepath);
                 mon.type[0] = parse_type_slug(str);
             }
             if (array.size() >= 2){
-                std::string& str = array[1].get_string_throw(filepath);
+                std::string& str = array[1].to_string_throw(filepath);
                 mon.type[1] = parse_type_slug(str);
             }
         }
@@ -163,17 +162,17 @@ std::map<std::string, MaxLairMon> build_maxlair_mon_database(const std::string&
         {
             JsonArray& array = obj.get_array_throw("base_stats", filepath);
             if (array.size() != 6){
-                throw FileException(nullptr, PA_CURRENT_FUNCTION, "Base stats should contain 6 elements: " + slug, std::move(path));
+                throw FileException(nullptr, PA_CURRENT_FUNCTION, "Base stats should contain 6 elements: " + slug, std::move(filepath));
             }
             for (int c = 0; c < 6; c++){
-                mon.base_stats[c] = (uint8_t)array[c].get_integer_throw(filepath);
+                mon.base_stats[c] = (uint8_t)array[c].to_integer_throw(filepath);
             }
         }
         {
             JsonArray& array = obj.get_array_throw("moves", filepath);
             size_t stop = std::min<size_t>(5, array.size());
             for (size_t c = 0; c < stop; c++){
-                JsonObject& move = array[c].get_object_throw(filepath);
+                JsonObject& move = array[c].to_object_throw(filepath);
                 mon.moves[c] = parse_move(std::move(move), filepath);
             }
         }
@@ -181,7 +180,7 @@ std::map<std::string, MaxLairMon> build_maxlair_mon_database(const std::string&
             JsonArray& array = obj.get_array_throw("max_moves", filepath);
             size_t stop = std::min<size_t>(5, array.size());
             for (size_t c = 0; c < stop; c++){
-                JsonObject& move = array[c].get_object_throw(filepath);
+                JsonObject& move = array[c].to_object_throw(filepath);
                 mon.max_moves[c] = parse_move(std::move(move), filepath);
             }
         }
diff --git a/SerialPrograms/Source/PokemonSwSh/Resources/PokemonSwSh_MaxLairDatabase.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Resources/PokemonSwSh_MaxLairDatabase.h
similarity index 86%
rename from SerialPrograms/Source/PokemonSwSh/Resources/PokemonSwSh_MaxLairDatabase.h
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/Resources/PokemonSwSh_MaxLairDatabase.h
index 8808feeaca..1f6fbe76ff 100644
--- a/SerialPrograms/Source/PokemonSwSh/Resources/PokemonSwSh_MaxLairDatabase.h
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Resources/PokemonSwSh_MaxLairDatabase.h
@@ -1,6 +1,6 @@
 /*  Pokemon Sword/Shield Max Lair Rentals
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -9,13 +9,17 @@
 
 #include <string>
 #include <set>
-#include "PokemonSwSh_TypeMatchup.h"
+#include <map>
+#include "Pokemon/Pokemon_Types.h"
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
 namespace PokemonSwSh{
 namespace MaxLairInternal{
 
+using namespace Pokemon;
+
+
 
 //  Max Lair slug mappings with respect to name and sprite slugs.
 struct MaxLairSlugs{
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Resources/PokemonSwSh_NameDatabase.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Resources/PokemonSwSh_NameDatabase.cpp
new file mode 100644
index 0000000000..2534e9a6f8
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Resources/PokemonSwSh_NameDatabase.cpp
@@ -0,0 +1,68 @@
+/*  Name Database
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/Logging/Logger.h"
+#include "Pokemon/Resources/Pokemon_PokemonNames.h"
+#include "PokemonSwSh_PokemonSprites.h"
+#include "PokemonSwSh_NameDatabase.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+using namespace Pokemon;
+
+
+std::set<std::string> make_ALL_POKEMON_SLUGS(){
+    std::vector<std::string> list = load_pokemon_slug_json_list("PokemonSwSh/Pokedex-Combined.json");
+    return std::set<std::string>(list.begin(), list.end());
+}
+
+const std::set<std::string>& ALL_POKEMON_SLUGS(){
+    static std::set<std::string> database = make_ALL_POKEMON_SLUGS();
+    return database;
+}
+
+
+StringSelectDatabase make_name_database(const std::vector<std::string>& slugs){
+    const SpriteDatabase& sprites = ALL_POKEMON_SPRITES();
+
+    StringSelectDatabase database;
+    for (const std::string& slug : slugs){
+        const PokemonNames& name = get_pokemon_name(slug);
+        const SpriteDatabase::Sprite* sprite = sprites.get_nothrow(slug);
+        if (sprite){
+            database.add_entry(StringSelectEntry(
+                slug,
+                name.display_name(),
+                sprite->icon
+            ));
+        }else{
+            global_logger_tagged().log("No sprite for: " + slug);
+            database.add_entry(StringSelectEntry(
+                slug,
+                name.display_name()
+            ));
+        }
+    }
+    return database;
+}
+StringSelectDatabase make_name_database(const char* json_file_slugs){
+    return make_name_database(load_pokemon_slug_json_list(json_file_slugs));
+}
+
+
+const StringSelectDatabase& COMBINED_DEX_NAMES(){
+    static const StringSelectDatabase database = make_name_database("PokemonSwSh/Pokedex-Combined.json");
+    return database;
+}
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Resources/PokemonSwSh_NameDatabase.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Resources/PokemonSwSh_NameDatabase.h
new file mode 100644
index 0000000000..56636948af
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Resources/PokemonSwSh_NameDatabase.h
@@ -0,0 +1,30 @@
+/*  Name Database
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_NameDatabase_H
+#define PokemonAutomation_PokemonSwSh_NameDatabase_H
+
+#include <set>
+#include "CommonTools/Options/StringSelectOption.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+const std::set<std::string>& ALL_POKEMON_SLUGS();
+
+StringSelectDatabase make_name_database(const std::vector<std::string>& slugs);
+StringSelectDatabase make_name_database(const char* json_file_slugs);
+
+const StringSelectDatabase& COMBINED_DEX_NAMES();
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Resources/PokemonSwSh_PokeballSprites.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Resources/PokemonSwSh_PokeballSprites.cpp
similarity index 81%
rename from SerialPrograms/Source/PokemonSwSh/Resources/PokemonSwSh_PokeballSprites.cpp
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/Resources/PokemonSwSh_PokeballSprites.cpp
index 386aa94a7a..cd2d684588 100644
--- a/SerialPrograms/Source/PokemonSwSh/Resources/PokemonSwSh_PokeballSprites.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Resources/PokemonSwSh_PokeballSprites.cpp
@@ -1,6 +1,6 @@
 /*  Pokemon Sword/Shield Pokeball Sprites
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Resources/PokemonSwSh_PokeballSprites.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Resources/PokemonSwSh_PokeballSprites.h
new file mode 100644
index 0000000000..745576b63a
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Resources/PokemonSwSh_PokeballSprites.h
@@ -0,0 +1,24 @@
+/*  Pokemon Sword/Shield Pokeball Sprites
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_PokeballSprites_H
+#define PokemonAutomation_PokemonSwSh_PokeballSprites_H
+
+#include "CommonTools/Resources/SpriteDatabase.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+const SpriteDatabase& ALL_POKEBALL_SPRITES();
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Resources/PokemonSwSh_PokemonSprites.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Resources/PokemonSwSh_PokemonSprites.cpp
new file mode 100644
index 0000000000..0fe7cc5cfd
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Resources/PokemonSwSh_PokemonSprites.cpp
@@ -0,0 +1,27 @@
+/*  Pokemon Sword/Shield Pokemon Sprites
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "PokemonSwSh_PokemonSprites.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+const SpriteDatabase& ALL_POKEMON_SPRITES(){
+    static const SpriteDatabase database("PokemonSwSh/PokemonSprites.png", "PokemonSwSh/PokemonSprites.json");
+    return database;
+}
+const SpriteDatabase& ALL_POKEMON_SILHOUETTES(){
+    static const SpriteDatabase database("PokemonSwSh/PokemonSilhouettes.png", "PokemonSwSh/PokemonSprites.json");
+    return database;
+}
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Resources/PokemonSwSh_PokemonSprites.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Resources/PokemonSwSh_PokemonSprites.h
new file mode 100644
index 0000000000..ddc4a2cda0
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Resources/PokemonSwSh_PokemonSprites.h
@@ -0,0 +1,25 @@
+/*  Pokemon Sword/Shield Pokemon Sprites
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_PokemonSprites_H
+#define PokemonAutomation_PokemonSwSh_PokemonSprites_H
+
+#include "CommonTools/Resources/SpriteDatabase.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+
+const SpriteDatabase& ALL_POKEMON_SPRITES();
+const SpriteDatabase& ALL_POKEMON_SILHOUETTES();
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/Resources/PokemonSwSh_TypeMatchup.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Resources/PokemonSwSh_TypeMatchup.cpp
similarity index 96%
rename from SerialPrograms/Source/PokemonSwSh/Resources/PokemonSwSh_TypeMatchup.cpp
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/Resources/PokemonSwSh_TypeMatchup.cpp
index 9a6a5b63ac..de5b3514ad 100644
--- a/SerialPrograms/Source/PokemonSwSh/Resources/PokemonSwSh_TypeMatchup.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Resources/PokemonSwSh_TypeMatchup.cpp
@@ -1,6 +1,6 @@
 /*  Pokemon Sword/Shield Type Matchup
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
diff --git a/SerialPrograms/Source/PokemonSwSh/Resources/PokemonSwSh_TypeMatchup.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Resources/PokemonSwSh_TypeMatchup.h
similarity index 79%
rename from SerialPrograms/Source/PokemonSwSh/Resources/PokemonSwSh_TypeMatchup.h
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/Resources/PokemonSwSh_TypeMatchup.h
index 7312a18d6f..778c7a267d 100644
--- a/SerialPrograms/Source/PokemonSwSh/Resources/PokemonSwSh_TypeMatchup.h
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Resources/PokemonSwSh_TypeMatchup.h
@@ -1,13 +1,12 @@
 /*  Pokemon Sword/Shield Type Matchup
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifndef PokemonAutomation_PokemonSwSh_TypeMatchup_H
 #define PokemonAutomation_PokemonSwSh_TypeMatchup_H
 
-#include <string>
 #include "Pokemon/Pokemon_Types.h"
 
 namespace PokemonAutomation{
diff --git a/SerialPrograms/Source/PokemonSwSh/Resources/PokemonSwSh_TypeSprites.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/Resources/PokemonSwSh_TypeSprites.cpp
similarity index 85%
rename from SerialPrograms/Source/PokemonSwSh/Resources/PokemonSwSh_TypeSprites.cpp
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/Resources/PokemonSwSh_TypeSprites.cpp
index e105887407..f7bda427b5 100644
--- a/SerialPrograms/Source/PokemonSwSh/Resources/PokemonSwSh_TypeSprites.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Resources/PokemonSwSh_TypeSprites.cpp
@@ -1,20 +1,19 @@
 /*  Pokemon Sword/Shield Type Sprites
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #include "Common/Cpp/Exceptions.h"
 #include "Kernels/Waterfill/Kernels_Waterfill.h"
-#include "CommonFramework/Globals.h"
+#include "CommonFramework/GlobalAutoPaths.h"
 #include "CommonFramework/ImageTools/ImageBoxes.h"
-#include "CommonFramework/ImageTools/ImageStats.h"
-#include "CommonFramework/ImageTools/BinaryImage_FilterRgb32.h"
+#include "CommonTools/Images/BinaryImage_FilterRgb32.h"
 #include "PokemonSwSh_TypeSprites.h"
 
-#include <iostream>
-using std::cout;
-using std::endl;
+//#include <iostream>
+//using std::cout;
+//using std::endl;
 
 namespace PokemonAutomation{
 namespace NintendoSwitch{
@@ -35,7 +34,7 @@ struct TypeSpriteDatabase{
     }
 
     TypeSpriteDatabase(){
-        for (const auto& item : TYPE_ENUM_TO_SLUG){
+        for (const auto& item : POKEMON_TYPE_SLUGS()){
             if (item.first == PokemonType::NONE){
                 continue;
             }
@@ -81,6 +80,8 @@ TypeSprite::TypeSprite(const std::string& slug)
         object.merge_assume_no_overlap(item);
     }
 
+    m_aspect_ratio = object.aspect_ratio();
+
 //    sprite.save("symbol-" + std::to_string(slug) + ".png");
     m_matcher.reset(
         new ImageMatch::WeightedExactImageMatcher(
diff --git a/SerialPrograms/Source/VideoGames/PokemonSwSh/Resources/PokemonSwSh_TypeSprites.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/Resources/PokemonSwSh_TypeSprites.h
new file mode 100644
index 0000000000..a5864ab18d
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/Resources/PokemonSwSh_TypeSprites.h
@@ -0,0 +1,51 @@
+/*  Pokemon Sword/Shield Type Sprites
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_PokemonSwSh_TypeSprites_H
+#define PokemonAutomation_PokemonSwSh_TypeSprites_H
+
+#include <memory>
+#include <map>
+#include "CommonTools/ImageMatch/ExactImageMatcher.h"
+#include "Pokemon/Pokemon_Types.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace PokemonSwSh{
+
+using namespace Pokemon;
+
+
+class TypeSprite{
+public:
+    const std::string& slug() const{ return m_slug; }
+    double aspect_ratio() const{ return m_aspect_ratio; }
+//    const ImageRGB32& sprite() const{ return m_sprite; }
+
+    const ImageMatch::WeightedExactImageMatcher& matcher() const{ return *m_matcher; }
+
+public:
+//    friend struct TypeSpriteDatabase;
+    TypeSprite(const std::string& slug);
+
+private:
+    std::string m_slug;
+    double m_aspect_ratio;
+
+    std::unique_ptr<ImageMatch::WeightedExactImageMatcher> m_matcher;
+};
+
+
+const TypeSprite& get_type_sprite(PokemonType type);
+const std::map<PokemonType, TypeSprite>& all_type_sprites();
+
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/PokemonSwSh/ShinyHuntTracker.cpp b/SerialPrograms/Source/VideoGames/PokemonSwSh/ShinyHuntTracker.cpp
similarity index 77%
rename from SerialPrograms/Source/PokemonSwSh/ShinyHuntTracker.cpp
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/ShinyHuntTracker.cpp
index d23dccf90f..fcddeba451 100644
--- a/SerialPrograms/Source/PokemonSwSh/ShinyHuntTracker.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/ShinyHuntTracker.cpp
@@ -1,6 +1,6 @@
 /*  Shiny Hunt Tracker
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
@@ -23,15 +23,15 @@ ShinyHuntTracker::ShinyHuntTracker(bool shiny_types)
     , m_square_shinies(m_stats["Square Shinies"])
 {
     m_display_order.emplace_back("Encounters");
-    m_display_order.emplace_back("Errors", true);
+    m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
     if (shiny_types){
-        m_display_order.emplace_back("Star Shinies", true);
-        m_display_order.emplace_back("Square Shinies", true);
-        m_display_order.emplace_back("Unknown Shinies", true);
+        m_display_order.emplace_back("Star Shinies", HIDDEN_IF_ZERO);
+        m_display_order.emplace_back("Square Shinies", HIDDEN_IF_ZERO);
+        m_display_order.emplace_back("Unknown Shinies", HIDDEN_IF_ZERO);
     }else{
-        m_display_order.emplace_back("Shinies", true);
+        m_display_order.emplace_back("Shinies", HIDDEN_IF_ZERO);
     }
-    m_display_order.emplace_back("Caught", true);
+    m_display_order.emplace_back("Caught", HIDDEN_IF_ZERO);
 }
 ShinyHuntTracker::ShinyHuntTracker(bool shiny_types, std::map<std::string, std::string> aliases)
     : ShinyHuntTracker(shiny_types)
diff --git a/SerialPrograms/Source/PokemonSwSh/ShinyHuntTracker.h b/SerialPrograms/Source/VideoGames/PokemonSwSh/ShinyHuntTracker.h
similarity index 86%
rename from SerialPrograms/Source/PokemonSwSh/ShinyHuntTracker.h
rename to SerialPrograms/Source/VideoGames/PokemonSwSh/ShinyHuntTracker.h
index d7fb91f17f..60b15f9ee0 100644
--- a/SerialPrograms/Source/PokemonSwSh/ShinyHuntTracker.h
+++ b/SerialPrograms/Source/VideoGames/PokemonSwSh/ShinyHuntTracker.h
@@ -1,13 +1,13 @@
 /*  Shiny Hunt Tracker
  *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
+ *  From: https://github.com/PokemonAutomation/
  *
  */
 
 #ifndef PokemonAutomation_ShinyHuntTracker_H
 #define PokemonAutomation_ShinyHuntTracker_H
 
-#include "CommonFramework/Tools/StatsTracking.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
 #include "Pokemon/Pokemon_DataTypes.h"
 
 namespace PokemonAutomation{
diff --git a/SerialPrograms/Source/VideoGames/ZeldaTotK/Programs/ZeldaTotK_BowItemDuper.cpp b/SerialPrograms/Source/VideoGames/ZeldaTotK/Programs/ZeldaTotK_BowItemDuper.cpp
new file mode 100644
index 0000000000..9bc13810c7
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/ZeldaTotK/Programs/ZeldaTotK_BowItemDuper.cpp
@@ -0,0 +1,161 @@
+/*  TotK Bow Item Duper
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/PrettyPrint.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonTools/StartupChecks/StartProgramChecks.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "ZeldaTotK_BowItemDuper.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace ZeldaTotK{
+
+// using namespace Pokemon;
+
+BowItemDuper_Descriptor::BowItemDuper_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "ZeldaTotK:BowItemDuper",
+        "Zelda: TotK", "Bow Item Duper",
+        "Programs/ZeldaTotK/BowItemDuper.html",
+        "Use the Bow Swap Glitch to farm any fusable items.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_RequiresPrecision,
+        FeedbackType::NONE,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+struct BowItemDuper_Descriptor::Stats : public StatsTracker{
+    Stats()
+        : dupe_attempts(m_stats["Dupe Attempts"])
+    {
+        m_display_order.emplace_back("Dupe Attempts");
+    }
+    std::atomic<uint64_t>& dupe_attempts;
+};
+std::unique_ptr<StatsTracker> BowItemDuper_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+BowItemDuper::BowItemDuper()
+    : ATTEMPTS(
+        "<b>Duplication Attempts:</b><br>The number of times you wish to run this routine.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        100
+    )
+    , TICK_DELAY0(
+        "<b>Menu Delay:</b><br>Adjustable delay for exiting and reentering the menu. "
+        "This should not typically be lower than 5 nor exceed 25 for successful results. "
+        "Too low and the game will eat inputs and put the program in an irrecoverable state."
+        "Too high and the dupes will not be successful.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        "120 ms"
+    )
+    , GO_HOME_WHEN_DONE(false)
+    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_STATUS_UPDATE,
+        &NOTIFICATION_PROGRAM_FINISH,
+        // &NOTIFICATION_ERROR_FATAL,
+    })
+{
+    PA_ADD_OPTION(ATTEMPTS);
+    PA_ADD_OPTION(TICK_DELAY0);
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+void BowItemDuper::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    StartProgramChecks::check_performance_class_wired_or_wireless(context);
+
+    // assert_16_9_720p_min(env.logger(), env.console);
+
+    // just do a forever loop where we have to do stuff
+    uint32_t c = 0;
+    BowItemDuper_Descriptor::Stats& stats = env.current_stats<BowItemDuper_Descriptor::Stats>();
+
+    while (c < ATTEMPTS){
+
+        env.log("Current Attempts: " + tostr_u_commas(c));
+
+        // this routine is thanks to koboldtime#2248 on the PA discord server
+        // it has been adjusted and modified by denvoros#0001
+
+        // zr to pull out bow
+        pbf_press_button(context, BUTTON_ZR, 96ms, 96ms);
+        // dpad up to try to fuse the item, release for a while to make sure fused
+        pbf_press_dpad(context, DPAD_UP, 160ms, 1600ms);
+        
+        // then go ahead and enter the menu and do the various menuing in order to actually perform glitch
+        pbf_press_button(context, BUTTON_PLUS, 160ms, 80ms);
+
+        // drop current bow
+        pbf_press_button(context, BUTTON_A, 80ms, 80ms);
+        pbf_press_dpad(context, DPAD_DOWN, 80ms, 40ms);
+        pbf_press_button(context, BUTTON_A, 80ms, 80ms);
+        // now go to other bow and equip
+        pbf_press_dpad(context, DPAD_RIGHT, 80ms, 40ms);
+        pbf_press_button(context, BUTTON_A, 80ms, 80ms);
+        pbf_press_button(context, BUTTON_A, 80ms, 120ms);
+
+        // NOW WE HAVE TO PRESS PLUS AS FAST AS POSSIBLE
+        pbf_press_button(context, BUTTON_PLUS, 24ms, TICK_DELAY0);
+        pbf_press_button(context, BUTTON_PLUS, 24ms, 24ms);
+
+        // navigate back to the "current" bow, then drop it
+        pbf_press_dpad(context, DPAD_LEFT, 80ms, 40ms);
+        pbf_press_button(context, BUTTON_A, 80ms, 80ms);
+        pbf_press_dpad(context, DPAD_DOWN, 80ms, 40ms);
+        pbf_press_button(context, BUTTON_A, 80ms, 160ms);
+
+        // back to overworld
+        pbf_press_button(context, BUTTON_PLUS, 80ms, 80ms);
+
+        // turn around
+        pbf_move_left_joystick(context, {0, +1}, 24ms, 80ms);
+        // wait half a second
+        pbf_wait(context, 300ms);
+
+        // pick up both bows
+        pbf_press_button(context, BUTTON_A, 160ms, 80ms);
+        pbf_press_button(context, BUTTON_A, 160ms, 160ms);
+
+        // turn back around and wait before reopening menu
+        pbf_move_left_joystick(context, {0, -1}, 24ms, 80ms);
+        // wait half a second
+        pbf_wait(context, 400ms);
+
+        // now go back into the menu
+        pbf_press_button(context, BUTTON_PLUS, 80ms, 80ms);
+
+        // reset the cursor location, then go back to overworld to start again
+        pbf_press_dpad(context, DPAD_LEFT, 80ms, 40ms);
+
+        pbf_press_button(context, BUTTON_PLUS, 160ms, 320ms);
+        // NOTE: needs a short buffer between runs to make sure new bow is ready
+
+        // wait for everything before we try anything else
+        context.wait_for_all_requests();
+
+        // increment counter, increment stats
+        c++;
+        stats.dupe_attempts++;
+        env.update_stats();
+        send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
+
+    }
+
+    // then we can finish up
+    GO_HOME_WHEN_DONE.run_end_of_program(context);
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+}
+
+}
+}
+}
+
diff --git a/SerialPrograms/Source/VideoGames/ZeldaTotK/Programs/ZeldaTotK_BowItemDuper.h b/SerialPrograms/Source/VideoGames/ZeldaTotK/Programs/ZeldaTotK_BowItemDuper.h
new file mode 100644
index 0000000000..6235cd8ef6
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/ZeldaTotK/Programs/ZeldaTotK_BowItemDuper.h
@@ -0,0 +1,47 @@
+/*  TotK Bow Item Duper
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_ZeldaTotK_BowItemDuper_H
+#define PokemonAutomation_ZeldaTotK_BowItemDuper_H
+
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "Common/Cpp/Options/TimeDurationOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace ZeldaTotK{
+
+class BowItemDuper_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    BowItemDuper_Descriptor();
+    struct Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+class BowItemDuper : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = BowItemDuper_Descriptor;
+    BowItemDuper();
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    SimpleIntegerOption<uint32_t> ATTEMPTS;
+    MillisecondsOption TICK_DELAY0;
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
+    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+}
+}
+}
+#endif
+
+
+
diff --git a/SerialPrograms/Source/VideoGames/ZeldaTotK/Programs/ZeldaTotK_MineruItemDuper.cpp b/SerialPrograms/Source/VideoGames/ZeldaTotK/Programs/ZeldaTotK_MineruItemDuper.cpp
new file mode 100644
index 0000000000..509fef32cc
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/ZeldaTotK/Programs/ZeldaTotK_MineruItemDuper.cpp
@@ -0,0 +1,144 @@
+/*  TotK Mineru Item Duper
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/PrettyPrint.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonTools/StartupChecks/StartProgramChecks.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "ZeldaTotK_MineruItemDuper.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace ZeldaTotK{
+
+MineruItemDuper_Descriptor::MineruItemDuper_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "ZeldaTotK:MineruItemDuper",
+        "Zelda: TotK", "Mineru Item Duper",
+        "Programs/ZeldaTotK/MineruItemDuper.html",
+        "Use the Mineru Menu Sort glitch to duplicate items.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_RequiresPrecision,
+        FeedbackType::NONE,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+struct MineruItemDuper_Descriptor::Stats : public StatsTracker{
+    Stats()
+        : dupe_attempts(m_stats["Dupe Attempts"])
+    {
+        m_display_order.emplace_back("Dupe Attempts");
+    }
+    std::atomic<uint64_t>& dupe_attempts;
+};
+std::unique_ptr<StatsTracker> MineruItemDuper_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+MineruItemDuper::MineruItemDuper()
+    : AMOUNT(
+        "<b>Duplication Amount:</b><br>The number of items you wish to duplicate.",
+        LockMode::LOCK_WHILE_RUNNING,
+        900
+    )
+    , IS_ZONAI_DEVICE(
+        "<b>Is Zonai Device:</b><br>Whether or not you are duplicating a Zonai device, or just a normal material.",
+        LockMode::LOCK_WHILE_RUNNING,
+        false
+    )
+    , GO_HOME_WHEN_DONE(false)
+    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_STATUS_UPDATE,
+        &NOTIFICATION_PROGRAM_FINISH,
+        // &NOTIFICATION_ERROR_FATAL,
+        })
+{
+    PA_ADD_OPTION(AMOUNT);
+    PA_ADD_OPTION(IS_ZONAI_DEVICE);
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+void MineruItemDuper::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    StartProgramChecks::check_performance_class_wired_or_wireless(context);
+
+    MineruItemDuper_Descriptor::Stats& stats = env.current_stats<MineruItemDuper_Descriptor::Stats>();
+
+    /*
+    Setup:
+    Menu has been opened to materials tab
+    Item you wish to dupe is selected in menu
+    Now close the menu
+
+    Warp to The Depths to run this without having to worry about blood moons. All of my testing was done at
+    the Great Abandoned Central Mine. 
+
+    Mount Mineru. Ideally, avoid having other Sages near you to prevent interacting with them.
+
+    If you are duping Zonai devices, you will need to be right next to a wall. Otherwise, try to stay in a
+    flat, open area.
+
+    ITEMS_PER_ATTEMPT will be 5 for normal materials and 10 for Zonai devices.
+
+    Works on 1.1 and 1.1.1
+    */
+
+    uint32_t ITEMS_PER_ATTEMPT = IS_ZONAI_DEVICE ? 10 : 5;
+    uint32_t c = 0;
+    while (c < AMOUNT){
+        env.log("Current Amount: " + tostr_u_commas(c));
+
+        // Open menu
+        pbf_press_button(context, BUTTON_PLUS, 160ms, 800ms);
+
+        // Hold items to dupe
+        pbf_press_button(context, BUTTON_A, 80ms, 80ms);
+
+        // Pressing "Hold Item" is only necessary for Materials
+        if (!IS_ZONAI_DEVICE){
+            pbf_press_dpad(context, DPAD_DOWN, 80ms, 80ms);
+        }
+
+        pbf_press_button(context, BUTTON_A, 80ms, 80ms);
+         for (uint32_t i = 0; i < ITEMS_PER_ATTEMPT && c < AMOUNT; i++){
+            pbf_press_button(context, BUTTON_A, 80ms, 80ms);
+
+            // Increment counters
+            c++;
+            stats.dupe_attempts++;
+        }
+
+        // Now press Y (sort) and B (exit) at the same time
+        ssf_press_button(context, BUTTON_B, 0ms, 80ms);
+        pbf_press_button(context, BUTTON_Y, 80ms, 320ms);
+
+        // There is no need to pick up Zonai devices 
+        if (!IS_ZONAI_DEVICE){
+            // Pick up duped items plus some extra attempts for potentially missed ones
+            for (uint32_t i = 0; i < ITEMS_PER_ATTEMPT + 2; i++){
+                pbf_press_button(context, BUTTON_A, 80ms, 80ms);
+            }
+        }else{
+            pbf_wait(context, 2000ms);
+        }
+
+        // increment stats
+        env.update_stats();
+        send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
+    }
+
+    GO_HOME_WHEN_DONE.run_end_of_program(context);
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+}
+
+}
+}
+}
+
diff --git a/SerialPrograms/Source/VideoGames/ZeldaTotK/Programs/ZeldaTotK_MineruItemDuper.h b/SerialPrograms/Source/VideoGames/ZeldaTotK/Programs/ZeldaTotK_MineruItemDuper.h
new file mode 100644
index 0000000000..d8a75f5d9f
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/ZeldaTotK/Programs/ZeldaTotK_MineruItemDuper.h
@@ -0,0 +1,47 @@
+/*  TotK Mineru Item Duper
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_ZeldaTotK_MineruItemDuper_H
+#define PokemonAutomation_ZeldaTotK_MineruItemDuper_H
+
+#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace ZeldaTotK{
+
+class MineruItemDuper_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    MineruItemDuper_Descriptor();
+    struct Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+class MineruItemDuper : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = MineruItemDuper_Descriptor;
+    MineruItemDuper();
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    SimpleIntegerOption<uint32_t> AMOUNT;
+    BooleanCheckBoxOption IS_ZONAI_DEVICE;
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
+    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+}
+}
+}
+#endif
+
+
+
diff --git a/SerialPrograms/Source/VideoGames/ZeldaTotK/Programs/ZeldaTotK_ParaglideItemDuper.cpp b/SerialPrograms/Source/VideoGames/ZeldaTotK/Programs/ZeldaTotK_ParaglideItemDuper.cpp
new file mode 100644
index 0000000000..4e8d6015fa
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/ZeldaTotK/Programs/ZeldaTotK_ParaglideItemDuper.cpp
@@ -0,0 +1,178 @@
+/*  TotK Paraglide Item Duper
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/PrettyPrint.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonTools/StartupChecks/StartProgramChecks.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "ZeldaTotK_ParaglideItemDuper.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace ZeldaTotK{
+
+ParaglideItemDuper_Descriptor::ParaglideItemDuper_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "ZeldaTotK:ParaglideItemDuper",
+        "Zelda: TotK", "Paraglide Item Duper",
+        "Programs/ZeldaTotK/ParaglideItemDuper.html",
+        "Use the Paraglide Menu Sort glitch to duplicate items.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_RequiresPrecision,
+        FeedbackType::NONE,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+struct ParaglideItemDuper_Descriptor::Stats : public StatsTracker{
+    Stats()
+        : dupe_attempts(m_stats["Dupe Attempts"])
+    {
+        m_display_order.emplace_back("Dupe Attempts");
+    }
+    std::atomic<uint64_t>& dupe_attempts;
+};
+std::unique_ptr<StatsTracker> ParaglideItemDuper_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+ParaglideItemDuper::ParaglideItemDuper()
+    : ATTEMPTS(
+        "<b>Duplication Attempts:</b><br>The number of times you wish to run this routine.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        100
+    )
+    , LOAD_DELAY0(
+        "<b>Loading time:</b><br>Adjustable delay for the load screen after warping. "
+        "Adjust this to match the loading time of your game.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        "25 s"
+    )
+    , GO_HOME_WHEN_DONE(false)
+    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_STATUS_UPDATE,
+        &NOTIFICATION_PROGRAM_FINISH,
+        // &NOTIFICATION_ERROR_FATAL,
+    })
+{
+    PA_ADD_OPTION(ATTEMPTS);
+    PA_ADD_OPTION(LOAD_DELAY0);
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+void ParaglideItemDuper::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    StartProgramChecks::check_performance_class_wired_or_wireless(context);
+
+    ParaglideItemDuper_Descriptor::Stats& stats = env.current_stats<ParaglideItemDuper_Descriptor::Stats>();
+
+    /*
+    Setup:
+    Menu has been opened to materials tab
+    Item you wish to dupe is selected in menu
+    Now close the menu
+
+    Warp point placed directly opposite the ladder (face slightly to the left of the ladder) in Lookout Landing
+    angle away from the guard if possible to prevent talking to them.
+    can always readjust if needed - sometimes the map places a stamp instead of warping if position is off
+    
+    Map tab is selected and is on the second to last zoom level (zoom all the way in and the go back one)
+    
+    Sages being out doesn't matter as they don't appear inside town
+
+    Some items may bounce more, so all 5 dupes are not always picked up (ex large batteries may roll away)
+    Works with less than 5 of an item but tends to be less consistent
+
+    Don't try this with bombs or anything explosive
+    Don't have any other stamps on the map in the area
+    Unequip anything metal in case of thunderstorm
+    again, do not try this with bombs
+
+    Travel Medallion required.
+
+    In theory this program can be modified to work with a shrine near a cliff. Needs to be in a safe location and sages need to be disabled.
+
+    Works on 1.1 and 1.1.1
+    */
+
+    uint32_t c = 0;
+
+    while (c < ATTEMPTS){
+        env.log("Current Attempts: " + tostr_u_commas(c));
+
+        //Walk forward from teleportation point
+        pbf_move_left_joystick(context, {0, +1}, 80ms, 40ms);
+
+        //Jump and open paraglider
+        pbf_press_button(context, BUTTON_X, 160ms, 640ms);
+        pbf_press_button(context, BUTTON_X, 160ms, 160ms);
+
+        //Open menu
+        pbf_press_button(context, BUTTON_PLUS, 160ms, 800ms);
+
+        //Select 5 of the item to dupe - if less than 5 this still works
+        pbf_press_button(context, BUTTON_A, 160ms, 160ms);
+        pbf_press_dpad(context, DPAD_DOWN, 160ms, 160ms);
+        pbf_press_button(context, BUTTON_A, 160ms, 160ms);
+        pbf_press_button(context, BUTTON_A, 160ms, 160ms);
+        pbf_press_button(context, BUTTON_A, 160ms, 160ms);
+        pbf_press_button(context, BUTTON_A, 160ms, 160ms);
+        pbf_press_button(context, BUTTON_A, 160ms, 160ms);
+
+        //Now press Y (sort) and B (exit) at the same time
+        ssf_press_button(context, BUTTON_B, 0ms, 80ms);
+        pbf_press_button(context, BUTTON_Y, 80ms, 320ms);
+
+        //Close paraglider and drop to the ground
+        pbf_press_button(context, BUTTON_B, 160ms, 400ms);
+
+        //Pick up duped items - extra presses just in case
+        pbf_press_button(context, BUTTON_A, 160ms, 80ms);
+        pbf_press_button(context, BUTTON_A, 160ms, 80ms);
+        pbf_press_button(context, BUTTON_A, 160ms, 80ms);
+        pbf_press_button(context, BUTTON_A, 160ms, 80ms);
+        pbf_press_button(context, BUTTON_A, 160ms, 80ms);
+        pbf_press_button(context, BUTTON_A, 160ms, 80ms);
+        pbf_press_button(context, BUTTON_A, 160ms, 80ms);
+
+        //Turn around and try to pick up items as well
+        pbf_move_left_joystick(context, {0, -1}, 80ms, 40ms);
+        pbf_press_button(context, BUTTON_A, 160ms, 80ms);
+        pbf_press_button(context, BUTTON_A, 160ms, 80ms);
+        pbf_press_button(context, BUTTON_A, 160ms, 80ms);
+        pbf_press_button(context, BUTTON_A, 160ms, 80ms);
+        pbf_press_button(context, BUTTON_A, 160ms, 80ms);
+        pbf_press_button(context, BUTTON_A, 160ms, 80ms);
+
+        //Open map and teleport back
+        pbf_press_button(context, BUTTON_MINUS, 160ms, 80ms);
+        pbf_move_left_joystick(context, {0, -1}, 80ms, 80ms);
+        pbf_press_button(context, BUTTON_A, 160ms, 80ms);
+        pbf_press_button(context, BUTTON_A, 160ms, 80ms);
+
+        //Wait for loading screen
+        pbf_wait(context, LOAD_DELAY0);
+        context.wait_for_all_requests();
+
+        // increment counter, increment stats
+        c++;
+        stats.dupe_attempts++;
+        env.update_stats();
+        send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
+
+    }
+
+    GO_HOME_WHEN_DONE.run_end_of_program(context);
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+}
+
+}
+}
+}
+
diff --git a/SerialPrograms/Source/VideoGames/ZeldaTotK/Programs/ZeldaTotK_ParaglideItemDuper.h b/SerialPrograms/Source/VideoGames/ZeldaTotK/Programs/ZeldaTotK_ParaglideItemDuper.h
new file mode 100644
index 0000000000..645095e576
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/ZeldaTotK/Programs/ZeldaTotK_ParaglideItemDuper.h
@@ -0,0 +1,47 @@
+/*  TotK Paraglide Item Duper
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_ZeldaTotK_ParaglideItemDuper_H
+#define PokemonAutomation_ZeldaTotK_ParaglideItemDuper_H
+
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "Common/Cpp/Options/TimeDurationOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace ZeldaTotK{
+
+class ParaglideItemDuper_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    ParaglideItemDuper_Descriptor();
+    struct Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+class ParaglideItemDuper : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = ParaglideItemDuper_Descriptor;
+    ParaglideItemDuper();
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    SimpleIntegerOption<uint32_t> ATTEMPTS;
+    MillisecondsOption LOAD_DELAY0;
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
+    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+}
+}
+}
+#endif
+
+
+
diff --git a/SerialPrograms/Source/VideoGames/ZeldaTotK/Programs/ZeldaTotK_SurfItemDuper.cpp b/SerialPrograms/Source/VideoGames/ZeldaTotK/Programs/ZeldaTotK_SurfItemDuper.cpp
new file mode 100644
index 0000000000..420337b0c8
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/ZeldaTotK/Programs/ZeldaTotK_SurfItemDuper.cpp
@@ -0,0 +1,150 @@
+/*  TotK Surf Item Duper
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/PrettyPrint.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonTools/StartupChecks/StartProgramChecks.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
+#include "ZeldaTotK_SurfItemDuper.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace ZeldaTotK{
+
+SurfItemDuper_Descriptor::SurfItemDuper_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "ZeldaTotK:SurfItemDuper",
+        "Zelda: TotK", "Shield Surf Item Duper",
+        "Programs/ZeldaTotK/SurfItemDuper.html",
+        "Use the Shield Surfing Menu Sort glitch to duplicate items.",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_RequiresPrecision,
+        FeedbackType::NONE,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+struct SurfItemDuper_Descriptor::Stats : public StatsTracker{
+    Stats()
+        : dupe_attempts(m_stats["Dupe Attempts"])
+    {
+        m_display_order.emplace_back("Dupe Attempts");
+    }
+    std::atomic<uint64_t>& dupe_attempts;
+};
+std::unique_ptr<StatsTracker> SurfItemDuper_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+SurfItemDuper::SurfItemDuper()
+    : ATTEMPTS(
+        "<b>Duplication Attempts:</b><br>The number of times you wish to run this routine.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        100
+    )
+    , GO_HOME_WHEN_DONE(false)
+    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_STATUS_UPDATE,
+        &NOTIFICATION_PROGRAM_FINISH,
+        // &NOTIFICATION_ERROR_FATAL,
+        })
+{
+    PA_ADD_OPTION(ATTEMPTS);
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+void SurfItemDuper::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    StartProgramChecks::check_performance_class_wired_or_wireless(context);
+
+    SurfItemDuper_Descriptor::Stats& stats = env.current_stats<SurfItemDuper_Descriptor::Stats>();
+
+    /*
+    Setup:
+    Stand on a patch of sand in a shrine or in the depths (under a lightroot)
+
+    Menu has been opened to materials tab
+    Item you wish to dupe is selected in menu
+    Now close the menu
+
+    Durability should not matter when on sand or snow
+    
+    Sages being out doesn't matter as they don't appear inside shrines
+    Blood moons don't matter inside shrines
+    Heat/Cold don't matter inside shrines
+
+    Some items may bounce more, so all 5 dupes are not always picked up (ex large batteries may roll away)
+    Works with less than 5 of an item but tends to be less consistent
+
+    Don't try this with bombs or anything explosive
+
+    Works on 1.1 and 1.1.1
+    */
+
+    uint32_t c = 0;
+
+    while (c < ATTEMPTS){
+        env.log("Current Attempts: " + tostr_u_commas(c));
+
+        //Initiate Shield Surf
+        ssf_press_button(context, BUTTON_ZL, 0ms, 640ms);
+        ssf_press_button(context, BUTTON_X, 40ms, 240ms);
+        ssf_press_button(context, BUTTON_A, 80ms, 640ms);
+
+        //Open menu
+        pbf_press_button(context, BUTTON_PLUS, 160ms, 800ms);
+
+        //Select 5 of the item to dupe - if less than 5 this still works
+        pbf_press_button(context, BUTTON_X, 80ms, 80ms);
+        pbf_press_button(context, BUTTON_A, 80ms, 80ms);
+        pbf_press_button(context, BUTTON_A, 80ms, 80ms);
+        pbf_press_button(context, BUTTON_A, 80ms, 80ms);
+        pbf_press_button(context, BUTTON_A, 80ms, 80ms);
+        pbf_press_button(context, BUTTON_A, 80ms, 80ms);
+
+        //Now press Y (sort) and B (exit) at the same time
+        pbf_press_button(context, BUTTON_B | BUTTON_Y, 80ms, 320ms);
+
+        //Drop to the ground
+        pbf_press_button(context, BUTTON_B, 160ms, 400ms);
+
+        //Pick up duped items - extra presses just in case
+        pbf_press_button(context, BUTTON_A, 80ms, 80ms);
+        pbf_press_button(context, BUTTON_A, 80ms, 80ms);
+        pbf_press_button(context, BUTTON_A, 80ms, 80ms);
+        pbf_press_button(context, BUTTON_A, 80ms, 80ms);
+        pbf_press_button(context, BUTTON_A, 80ms, 80ms);
+        pbf_press_button(context, BUTTON_A, 80ms, 80ms);
+        pbf_press_button(context, BUTTON_A, 80ms, 80ms);
+
+        //Turn around and try to pick up items as well
+        pbf_move_left_joystick(context, {0, -1}, 80ms, 40ms);
+        pbf_press_button(context, BUTTON_A, 80ms, 80ms);
+        pbf_press_button(context, BUTTON_A, 80ms, 80ms);
+        pbf_press_button(context, BUTTON_A, 80ms, 80ms);
+        pbf_press_button(context, BUTTON_A, 80ms, 80ms);
+        pbf_press_button(context, BUTTON_A, 80ms, 80ms);
+        pbf_press_button(context, BUTTON_A, 80ms, 80ms);
+
+        // increment counter, increment stats
+        c++;
+        stats.dupe_attempts++;
+        env.update_stats();
+        send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
+
+    }
+
+    GO_HOME_WHEN_DONE.run_end_of_program(context);
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+}
+
+}
+}
+}
+
diff --git a/SerialPrograms/Source/VideoGames/ZeldaTotK/Programs/ZeldaTotK_SurfItemDuper.h b/SerialPrograms/Source/VideoGames/ZeldaTotK/Programs/ZeldaTotK_SurfItemDuper.h
new file mode 100644
index 0000000000..b744b4c1f8
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/ZeldaTotK/Programs/ZeldaTotK_SurfItemDuper.h
@@ -0,0 +1,45 @@
+/*  TotK Surf Item Duper
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_ZeldaTotK_SurfItemDuper_H
+#define PokemonAutomation_ZeldaTotK_SurfItemDuper_H
+
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace ZeldaTotK{
+
+class SurfItemDuper_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    SurfItemDuper_Descriptor();
+    struct Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+class SurfItemDuper : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = SurfItemDuper_Descriptor;
+    SurfItemDuper();
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    SimpleIntegerOption<uint32_t> ATTEMPTS;
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
+    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+}
+}
+}
+#endif
+
+
+
diff --git a/SerialPrograms/Source/VideoGames/ZeldaTotK/Programs/ZeldaTotK_WeaponDuper.cpp b/SerialPrograms/Source/VideoGames/ZeldaTotK/Programs/ZeldaTotK_WeaponDuper.cpp
new file mode 100644
index 0000000000..d649ecb63b
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/ZeldaTotK/Programs/ZeldaTotK_WeaponDuper.cpp
@@ -0,0 +1,208 @@
+/*  TotK Weapon Duper
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "Common/Cpp/PrettyPrint.h"
+#include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
+#include "CommonTools/StartupChecks/StartProgramChecks.h"
+#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
+#include "ZeldaTotK_WeaponDuper.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace ZeldaTotK{
+
+WeaponDuper_Descriptor::WeaponDuper_Descriptor()
+    : SingleSwitchProgramDescriptor(
+        "ZeldaTotK:WeaponDuper",
+        "Zelda: TotK", "Weapon Duper",
+        "Programs/ZeldaTotK/WeaponDuper.html",
+        "Use a glitch to duplicate your weapons (Bows, Shields and Swords)",
+        PanelQualityStanding::OFFICIAL,
+        ProgramControllerClass::StandardController_RequiresPrecision,
+        FeedbackType::NONE,
+        AllowCommandsWhenRunning::DISABLE_COMMANDS
+    )
+{}
+
+struct WeaponDuper_Descriptor::Stats : public StatsTracker{
+    Stats()
+        : dupe_attempts(m_stats["Dupe Attempts"])
+    {
+        m_display_order.emplace_back("Dupe Attempts");
+    }
+    std::atomic<uint64_t>& dupe_attempts;
+};
+std::unique_ptr<StatsTracker> WeaponDuper_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
+WeaponDuper::WeaponDuper()
+    : ATTEMPTS(
+        "<b>Duplication Attempts:</b><br>The number of times you wish to run this routine.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        10
+    )
+    , WEAPON_MENU_BUTTON_COUNT(
+        "<b>Menu change button presses: :</b><br>How many button presses are required to go from option menu to weapon menu (bow = 7, shield = 6, sword = 5).",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        5
+    )
+    , DPAD_RIGHT_BUTTON_COUNT(
+        "<b>Right button presses: :</b><br>How many dpad right button presses are required to go from the left-most slot to the one you want to dupe.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        0
+    )
+    , DPAD_DOWN_BUTTON_COUNT(
+        "<b>Down button presses: :</b><br>How many dpad down button presses are required to go from the top-most slot to the one you want to dupe.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        0
+    )
+    , GO_HOME_WHEN_DONE(false)
+    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
+    , NOTIFICATIONS({
+        &NOTIFICATION_STATUS_UPDATE,
+        &NOTIFICATION_PROGRAM_FINISH,
+        // &NOTIFICATION_ERROR_FATAL,
+        })
+{
+    PA_ADD_OPTION(ATTEMPTS);
+    PA_ADD_OPTION(WEAPON_MENU_BUTTON_COUNT);
+    PA_ADD_OPTION(DPAD_RIGHT_BUTTON_COUNT);
+    PA_ADD_OPTION(DPAD_DOWN_BUTTON_COUNT);
+    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
+    PA_ADD_OPTION(NOTIFICATIONS);
+}
+
+void WeaponDuper::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+    StartProgramChecks::check_performance_class_wired_or_wireless(context);
+
+    WeaponDuper_Descriptor::Stats& stats = env.current_stats<WeaponDuper_Descriptor::Stats>();
+
+    uint32_t c = 0;
+
+    while (c < ATTEMPTS){
+        env.log("Current Attempts: " + tostr_u_commas(c));
+
+        env.log("Open menu");
+        pbf_press_button(context, BUTTON_PLUS, 80ms, 240ms);
+
+        context.wait_for_all_requests();
+        env.log("Go to options menu");
+        for (uint32_t i = 0; i < WEAPON_MENU_BUTTON_COUNT; ++i)
+        {
+            pbf_press_button(context, BUTTON_R, 80ms, 240ms);
+        }
+
+        context.wait_for_all_requests();
+        env.log("Save game");
+        pbf_press_button(context, BUTTON_A, 80ms, 800ms);
+        pbf_press_dpad(context, DPAD_UP, 80ms, 240ms);
+        pbf_press_button(context, BUTTON_A, 80ms, 800ms);
+        pbf_wait(context, 5000ms);
+
+        context.wait_for_all_requests();
+        env.log("Go to weapon menu");
+        for (uint32_t i = 0; i < WEAPON_MENU_BUTTON_COUNT; ++i)
+        {
+            pbf_press_button(context, BUTTON_L, 80ms, 240ms);
+        }
+
+        context.wait_for_all_requests();
+        env.log("Come back to first slot");
+        for (uint32_t i = 0; i < 5; ++i)
+        {
+            pbf_press_dpad(context, DPAD_UP, 80ms, 240ms);
+            pbf_press_dpad(context, DPAD_LEFT, 80ms, 240ms);
+        }
+
+        context.wait_for_all_requests();
+        env.log("Go to desired slot");
+        for (uint32_t i = 0; i < DPAD_RIGHT_BUTTON_COUNT; ++i)
+        {
+            pbf_press_dpad(context, DPAD_RIGHT, 80ms, 240ms);
+        }
+        for (uint32_t i = 0; i < DPAD_DOWN_BUTTON_COUNT; ++i)
+        {
+            pbf_press_dpad(context, DPAD_DOWN, 80ms, 240ms);
+        }
+
+        context.wait_for_all_requests();
+        env.log("Drop weapon");
+        pbf_press_button(context, BUTTON_A, 80ms, 240ms);
+        pbf_press_dpad(context, DPAD_DOWN, 80ms, 240ms);
+        pbf_press_button(context, BUTTON_A, 80ms, 400ms);
+
+        context.wait_for_all_requests();
+        env.log("Equip weapon on the right");
+        pbf_press_dpad(context, DPAD_RIGHT, 80ms, 240ms);
+        pbf_press_button(context, BUTTON_A, 80ms, 240ms);
+        pbf_press_button(context, BUTTON_A, 80ms, 240ms);
+
+        context.wait_for_all_requests();
+        env.log("Open and close the menu fast");
+        pbf_press_button(context, BUTTON_PLUS, 80ms, 80ms);
+        pbf_press_button(context, BUTTON_PLUS, 80ms, 800ms);
+
+        context.wait_for_all_requests();
+        env.log("Drop weapon");
+        pbf_press_dpad(context, DPAD_LEFT, 80ms, 240ms);
+        pbf_press_button(context, BUTTON_A, 80ms, 240ms);
+        pbf_press_dpad(context, DPAD_DOWN, 80ms, 240ms);
+        pbf_press_button(context, BUTTON_A, 80ms, 400ms);
+
+        context.wait_for_all_requests();
+        env.log("Go back to options menu");
+        for (uint32_t i = 0; i < WEAPON_MENU_BUTTON_COUNT; ++i)
+        {
+            pbf_press_button(context, BUTTON_R, 80ms, 240ms);
+        }
+
+        context.wait_for_all_requests();
+        env.log("Load the save");
+        pbf_press_dpad(context, DPAD_DOWN, 80ms, 240ms);
+        pbf_press_button(context, BUTTON_A, 80ms, 800ms);
+        pbf_press_button(context, BUTTON_A, 80ms, 800ms);
+        pbf_press_dpad(context, DPAD_UP, 80ms, 240ms);
+        pbf_press_button(context, BUTTON_A, 80ms, 800ms);
+        pbf_wait(context, 25000ms);
+
+        context.wait_for_all_requests();
+        env.log("Pick up duped weapon - extra presses just in case");
+        pbf_press_button(context, BUTTON_A, 80ms, 80ms);
+        pbf_press_button(context, BUTTON_A, 80ms, 80ms);
+        pbf_press_button(context, BUTTON_A, 80ms, 80ms);
+        pbf_press_button(context, BUTTON_A, 80ms, 80ms);
+        pbf_press_button(context, BUTTON_A, 80ms, 80ms);
+        pbf_press_button(context, BUTTON_A, 80ms, 80ms);
+        pbf_press_button(context, BUTTON_A, 80ms, 80ms);
+
+        context.wait_for_all_requests();
+        env.log("Turn around and try to pick up items as well");
+        pbf_move_left_joystick(context, {0, -1}, 80ms, 40ms);
+        pbf_press_button(context, BUTTON_A, 80ms, 80ms);
+        pbf_press_button(context, BUTTON_A, 80ms, 80ms);
+        pbf_press_button(context, BUTTON_A, 80ms, 80ms);
+        pbf_press_button(context, BUTTON_A, 80ms, 80ms);
+        pbf_press_button(context, BUTTON_A, 80ms, 80ms);
+        pbf_press_button(context, BUTTON_A, 80ms, 80ms);
+        pbf_move_left_joystick(context, {0, +1}, 80ms, 40ms);
+
+        // increment counter, increment stats
+        c++;
+        stats.dupe_attempts++;
+        env.update_stats();
+        send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
+    }
+
+    GO_HOME_WHEN_DONE.run_end_of_program(context);
+    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
+}
+
+}
+}
+}
+
diff --git a/SerialPrograms/Source/VideoGames/ZeldaTotK/Programs/ZeldaTotK_WeaponDuper.h b/SerialPrograms/Source/VideoGames/ZeldaTotK/Programs/ZeldaTotK_WeaponDuper.h
new file mode 100644
index 0000000000..e2e13b86db
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/ZeldaTotK/Programs/ZeldaTotK_WeaponDuper.h
@@ -0,0 +1,48 @@
+/*  TotK Weapon Duper
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_ZeldaTotK_WeaponDuper_H
+#define PokemonAutomation_ZeldaTotK_WeaponDuper_H
+
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
+#include "CommonFramework/Notifications/EventNotificationsTable.h"
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace ZeldaTotK{
+
+class WeaponDuper_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    WeaponDuper_Descriptor();
+    struct Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
+};
+
+class WeaponDuper : public SingleSwitchProgramInstance{
+public:
+    using Descriptor = WeaponDuper_Descriptor;
+    WeaponDuper();
+    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+
+private:
+    SimpleIntegerOption<uint32_t> ATTEMPTS;
+    SimpleIntegerOption<uint32_t> WEAPON_MENU_BUTTON_COUNT;
+    SimpleIntegerOption<uint32_t> DPAD_RIGHT_BUTTON_COUNT;
+    SimpleIntegerOption<uint32_t> DPAD_DOWN_BUTTON_COUNT;
+    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
+    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
+    EventNotificationsOption NOTIFICATIONS;
+};
+
+}
+}
+}
+#endif
+
+
+
diff --git a/SerialPrograms/Source/VideoGames/ZeldaTotK/ZeldaTotK_Panels.cpp b/SerialPrograms/Source/VideoGames/ZeldaTotK/ZeldaTotK_Panels.cpp
new file mode 100644
index 0000000000..6e154da32d
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/ZeldaTotK/ZeldaTotK_Panels.cpp
@@ -0,0 +1,55 @@
+/*  Zelda: TotK Panels
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "CommonFramework/GlobalAutoPaths.h"
+//#include "CommonFramework/GlobalSettingsPanel.h"
+#include "ZeldaTotK_Panels.h"
+
+//#include "ZeldaTotK_Settings.h"
+
+#include "Programs/ZeldaTotK_BowItemDuper.h"
+#include "Programs/ZeldaTotK_MineruItemDuper.h"
+#include "Programs/ZeldaTotK_ParaglideItemDuper.h"
+#include "Programs/ZeldaTotK_SurfItemDuper.h"
+#include "Programs/ZeldaTotK_WeaponDuper.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace ZeldaTotK{
+
+
+
+PanelListFactory::PanelListFactory()
+    : PanelListDescriptor(
+        "Zelda: Tears of the Kingdom",
+        RESOURCE_PATH() + "CategoryIcons/ZeldaTotK.png"
+    )
+{}
+
+std::vector<PanelEntry> PanelListFactory::make_panels() const{
+    std::vector<PanelEntry> ret;
+    
+    // ret.emplace_back("---- Settings ----");
+    // ret.emplace_back(make_settings<GameSettings_Descriptor, GameSettingsPanel>());
+
+    //ret.emplace_back("---- General ----");
+
+    ret.emplace_back("---- Glitches (v1.1.1) ----");
+    ret.emplace_back(make_SingleSwitchProgram<BowItemDuper>());
+    ret.emplace_back(make_SingleSwitchProgram<MineruItemDuper>());
+    ret.emplace_back(make_SingleSwitchProgram<ParaglideItemDuper>());
+    ret.emplace_back(make_SingleSwitchProgram<SurfItemDuper>());
+    ret.emplace_back(make_SingleSwitchProgram<WeaponDuper>());
+
+    return ret;
+}
+
+
+
+
+}
+}
+}
diff --git a/SerialPrograms/Source/VideoGames/ZeldaTotK/ZeldaTotK_Panels.h b/SerialPrograms/Source/VideoGames/ZeldaTotK/ZeldaTotK_Panels.h
new file mode 100644
index 0000000000..4037b4a599
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/ZeldaTotK/ZeldaTotK_Panels.h
@@ -0,0 +1,30 @@
+/*  Zelda: TotK Panels
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_ZeldaTotK_Panels_H
+#define PokemonAutomation_ZeldaTotK_Panels_H
+
+#include "CommonFramework/Panels/PanelList.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace ZeldaTotK{
+
+
+
+class PanelListFactory : public PanelListDescriptor{
+public:
+    PanelListFactory();
+private:
+    virtual std::vector<PanelEntry> make_panels() const override;
+};
+
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/VideoGames/ZeldaTotK/ZeldaTotK_Settings.cpp b/SerialPrograms/Source/VideoGames/ZeldaTotK/ZeldaTotK_Settings.cpp
new file mode 100644
index 0000000000..7206dffdf8
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/ZeldaTotK/ZeldaTotK_Settings.cpp
@@ -0,0 +1,92 @@
+/*  Zelda: TotK Settings
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#include "ZeldaTotK_Settings.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace ZeldaTotK{
+
+
+
+GameSettings& GameSettings::instance(){
+    static GameSettings settings;
+    return settings;
+}
+GameSettings::GameSettings()
+    : BatchOption(LockMode::LOCK_WHILE_RUNNING)
+    , m_menu_navigation("<font size=4><b>Menu Navigation Timings:</b></font>")
+    , GAME_TO_HOME_DELAY0(
+        "<b>Game to Home Delay:</b><br>Delay from pressing home to entering the the Switch home menu.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "1000 ms"
+    )
+    , m_start_game_timings("<font size=4><b>Start Game Timings:</b></font>")
+    , START_GAME_MASH0(
+        "<b>1. Start Game Mash:</b><br>Mash A for this long to start the game.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "2000 ms"
+    )
+    , START_GAME_WAIT0(
+        "<b>Start Game Wait:</b><br>Wait this long for the game to load.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "60 s"
+    )
+    , ENTER_GAME_MASH0(
+        "<b>Enter Game Mash:</b><br>Mash A for this long to enter the game.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "5000 ms"
+    )
+    , ENTER_GAME_WAIT0(
+        "<b>Enter Game Wait:</b><br>Wait this long for the game to enter the overworld.",
+        LockMode::LOCK_WHILE_RUNNING,
+        "60 s"
+    )
+{
+    PA_ADD_STATIC(m_menu_navigation);
+    PA_ADD_OPTION(GAME_TO_HOME_DELAY0);
+    PA_ADD_STATIC(m_start_game_timings);
+    PA_ADD_OPTION(START_GAME_MASH0);
+    PA_ADD_OPTION(START_GAME_WAIT0);
+    PA_ADD_OPTION(ENTER_GAME_MASH0);
+    PA_ADD_OPTION(ENTER_GAME_WAIT0);
+}
+
+
+
+
+
+GameSettings_Descriptor::GameSettings_Descriptor()
+    : OptionsPanelDescriptor(
+        "ZeldaTotK:GlobalSettings",
+        "Zelda: TotK", "Tears of the Kingdom Settings",
+        "Programs/ZeldaTotK/TotKSettings.html",
+        "Global Zelda: Tears of the Kingom Settings",
+        PanelQualityStanding::OFFICIAL
+    )
+{}
+
+
+
+GameSettingsPanel::GameSettingsPanel()
+    : settings(GameSettings::instance())
+{
+    PA_ADD_OPTION(settings);
+}
+
+
+
+
+
+}
+}
+}
+
+
+
+
+
+
diff --git a/SerialPrograms/Source/VideoGames/ZeldaTotK/ZeldaTotK_Settings.h b/SerialPrograms/Source/VideoGames/ZeldaTotK/ZeldaTotK_Settings.h
new file mode 100644
index 0000000000..1bb41ac56d
--- /dev/null
+++ b/SerialPrograms/Source/VideoGames/ZeldaTotK/ZeldaTotK_Settings.h
@@ -0,0 +1,56 @@
+/*  Zelda: TotK Settings
+ *
+ *  From: https://github.com/PokemonAutomation/
+ *
+ */
+
+#ifndef PokemonAutomation_ZeldaTotK_Settings_H
+#define PokemonAutomation_ZeldaTotK_Settings_H
+
+#include "Common/Cpp/Options/StaticTextOption.h"
+#include "Common/Cpp/Options/TimeDurationOption.h"
+#include "CommonFramework/Panels/OptionsPanel.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+namespace ZeldaTotK{
+
+
+class GameSettings : public BatchOption{
+    GameSettings();
+public:
+    static GameSettings& instance();
+
+    SectionDividerOption m_menu_navigation;
+    MillisecondsOption GAME_TO_HOME_DELAY0;
+
+    SectionDividerOption m_start_game_timings;
+    MillisecondsOption START_GAME_MASH0;
+    MillisecondsOption START_GAME_WAIT0;
+    MillisecondsOption ENTER_GAME_MASH0;
+    MillisecondsOption ENTER_GAME_WAIT0;
+
+};
+
+
+
+
+class GameSettings_Descriptor : public OptionsPanelDescriptor{
+public:
+    GameSettings_Descriptor();
+};
+
+
+class GameSettingsPanel : public OptionsPanelInstance{
+public:
+    using Descriptor = GameSettings_Descriptor;
+    GameSettingsPanel();
+private:
+    GameSettings& settings;
+};
+
+
+}
+}
+}
+#endif
diff --git a/SerialPrograms/Source/ZeldaTotK/Programs/ZeldaTotK_BowItemDuper.cpp b/SerialPrograms/Source/ZeldaTotK/Programs/ZeldaTotK_BowItemDuper.cpp
deleted file mode 100644
index fb964fff22..0000000000
--- a/SerialPrograms/Source/ZeldaTotK/Programs/ZeldaTotK_BowItemDuper.cpp
+++ /dev/null
@@ -1,158 +0,0 @@
-/*  TotK Bow Item Duper
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Cpp/PrettyPrint.h"
-#include "CommonFramework/Notifications/ProgramNotifications.h"
-#include "CommonFramework/Tools/StatsTracking.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "ZeldaTotK_BowItemDuper.h"
-
-namespace PokemonAutomation {
-namespace NintendoSwitch {
-namespace ZeldaTotK {
-
-// using namespace Pokemon;
-
-BowItemDuper_Descriptor::BowItemDuper_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "ZeldaTotK:BowItemDuper",
-        "Zelda: TotK", "Bow Item Duper",
-        "ComputerControl/blob/master/Wiki/Programs/ZeldaTotK/BowItemDuper.md",
-        "Use the Bow Swap Glitch to farm any fusable items.",
-        FeedbackType::NONE,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-
-struct BowItemDuper_Descriptor::Stats : public StatsTracker {
-    Stats()
-        : dupe_attempts(m_stats["Dupe Attempts"])
-    {
-        m_display_order.emplace_back("Dupe Attempts");
-    }
-    std::atomic<uint64_t>& dupe_attempts;
-};
-std::unique_ptr<StatsTracker> BowItemDuper_Descriptor::make_stats() const {
-    return std::unique_ptr<StatsTracker>(new Stats());
-}
-
-BowItemDuper::BowItemDuper()
-    : ATTEMPTS(
-        "<b>Duplication Attempts:</b><br>The number of times you wish to run this routine.",
-        LockWhileRunning::UNLOCKED,
-        100
-    )
-    , TICK_DELAY(
-        "<b>Menu Delay:</b><br>Adjustable delay for exiting and reentering the menu. "
-        "This should not typically be lower than 5 nor exceed 25 for successful results. "
-        "Too low and the game will eat inputs and put the program in an irrecoverable state."
-        "Too high and the dupes will not be successful.",
-        LockWhileRunning::UNLOCKED,
-        TICKS_PER_SECOND,
-        "15"
-    )
-    , GO_HOME_WHEN_DONE(false)
-    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
-    , NOTIFICATIONS({
-        &NOTIFICATION_STATUS_UPDATE,
-        &NOTIFICATION_PROGRAM_FINISH,
-        // &NOTIFICATION_ERROR_FATAL,
-        })
-{
-    PA_ADD_OPTION(ATTEMPTS);
-    PA_ADD_OPTION(TICK_DELAY);
-    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
-    PA_ADD_OPTION(NOTIFICATIONS);
-}
-
-void BowItemDuper::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) {
-    // assert_16_9_720p_min(env.logger(), env.console);
-
-    // just do a forever loop where we have to do stuff
-    uint32_t c = 0;
-    BowItemDuper_Descriptor::Stats& stats = env.current_stats<BowItemDuper_Descriptor::Stats>();
-
-    while (c < ATTEMPTS) {
-
-        env.log("Current Attempts: " + tostr_u_commas(c));
-
-        // this routine is thanks to koboldtime#2248 on the PA discord server
-        // it has been adjusted and modified by denvoros#0001
-
-        // zr to pull out bow
-        pbf_press_button(context, BUTTON_ZR, 12, 12);
-        // dpad up to try to fuse the item, release for a while to make sure fused
-        pbf_press_dpad(context, DPAD_UP, 20, 200);
-        
-        // then go ahead and enter the menu and do the various menuing in order to actually perform glitch
-        pbf_press_button(context, BUTTON_PLUS, 20, 10);
-
-        // drop current bow
-        pbf_press_button(context, BUTTON_A, 10, 10);
-        pbf_press_dpad(context, DPAD_DOWN, 10, 5);
-        pbf_press_button(context, BUTTON_A, 10, 10);
-        // now go to other bow and equip
-        pbf_press_dpad(context, DPAD_RIGHT, 10, 5);
-        pbf_press_button(context, BUTTON_A, 10, 10);
-        pbf_press_button(context, BUTTON_A, 10, 15);
-
-        // NOW WE HAVE TO PRESS PLUS AS FAST AS POSSIBLE
-        pbf_press_button(context, BUTTON_PLUS, 3, TICK_DELAY);
-        pbf_press_button(context, BUTTON_PLUS, 3, 3);
-
-        // navigate back to the "current" bow, then drop it
-        pbf_press_dpad(context, DPAD_LEFT, 10, 5);
-        pbf_press_button(context, BUTTON_A, 10, 10);
-        pbf_press_dpad(context, DPAD_DOWN, 10, 5);
-        pbf_press_button(context, BUTTON_A, 10, 20);
-
-        // back to overworld
-        pbf_press_button(context, BUTTON_PLUS, 10, 10);
-
-        // turn around
-        pbf_move_left_joystick(context, 128, 0, 3, 10);
-        // wait half a second
-        pbf_wait(context, (uint16_t)(0.3 * TICKS_PER_SECOND));
-
-        // pick up both bows
-        pbf_press_button(context, BUTTON_A, 20, 10);
-        pbf_press_button(context, BUTTON_A, 20, 20);
-
-        // turn back around and wait before reopening menu
-        pbf_move_left_joystick(context, 128, 255, 3, 10);
-        // wait half a second
-        pbf_wait(context, (uint16_t)(0.4 * TICKS_PER_SECOND));
-
-        // now go back into the menu
-        pbf_press_button(context, BUTTON_PLUS, 10, 10);
-
-        // reset the cursor location, then go back to overworld to start again
-        pbf_press_dpad(context, DPAD_LEFT, 10, 5);
-
-        pbf_press_button(context, BUTTON_PLUS, 20, 40);
-        // NOTE: needs a short buffer between runs to make sure new bow is ready
-
-        // wait for everything before we try anything else
-        context.wait_for_all_requests();
-
-        // increment counter, increment stats
-        c++;
-        stats.dupe_attempts++;
-        env.update_stats();
-        send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
-
-    }
-
-    // then we can finish up
-    GO_HOME_WHEN_DONE.run_end_of_program(context);
-    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
-}
-
-}
-}
-}
-
diff --git a/SerialPrograms/Source/ZeldaTotK/Programs/ZeldaTotK_BowItemDuper.h b/SerialPrograms/Source/ZeldaTotK/Programs/ZeldaTotK_BowItemDuper.h
deleted file mode 100644
index 4ec0b4aa3a..0000000000
--- a/SerialPrograms/Source/ZeldaTotK/Programs/ZeldaTotK_BowItemDuper.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*  TotK Bow Item Duper
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_ZeldaTotK_BowItemDuper_H
-#define PokemonAutomation_ZeldaTotK_BowItemDuper_H
-
-#include "Common/Cpp/Options/SimpleIntegerOption.h"
-#include "Common/Cpp/Options/TimeExpressionOption.h"
-#include "CommonFramework/Notifications/EventNotificationsTable.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
-
-namespace PokemonAutomation {
-namespace NintendoSwitch {
-namespace ZeldaTotK {
-
-class BowItemDuper_Descriptor : public SingleSwitchProgramDescriptor {
-public:
-    BowItemDuper_Descriptor();
-    struct Stats;
-    virtual std::unique_ptr<StatsTracker> make_stats() const override;
-};
-
-class BowItemDuper : public SingleSwitchProgramInstance {
-public:
-    BowItemDuper();
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-    SimpleIntegerOption<uint32_t> ATTEMPTS;
-    TimeExpressionOption<uint16_t> TICK_DELAY;
-    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
-    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
-    EventNotificationsOption NOTIFICATIONS;
-};
-
-}
-}
-}
-#endif
-
-
-
diff --git a/SerialPrograms/Source/ZeldaTotK/Programs/ZeldaTotK_MineruItemDuper.cpp b/SerialPrograms/Source/ZeldaTotK/Programs/ZeldaTotK_MineruItemDuper.cpp
deleted file mode 100644
index d1189f5ba8..0000000000
--- a/SerialPrograms/Source/ZeldaTotK/Programs/ZeldaTotK_MineruItemDuper.cpp
+++ /dev/null
@@ -1,140 +0,0 @@
-/*  TotK Mineru Item Duper
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Cpp/PrettyPrint.h"
-#include "CommonFramework/Notifications/ProgramNotifications.h"
-#include "CommonFramework/Tools/StatsTracking.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_ScalarButtons.h"
-#include "ZeldaTotK_MineruItemDuper.h"
-
-namespace PokemonAutomation {
-namespace NintendoSwitch {
-namespace ZeldaTotK {
-
-MineruItemDuper_Descriptor::MineruItemDuper_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "ZeldaTotK:MineruItemDuper",
-        "Zelda: TotK", "Mineru Item Duper",
-        "ComputerControl/blob/master/Wiki/Programs/ZeldaTotK/MineruItemDuper.md",
-        "Use the Mineru Menu Sort glitch to duplicate items.",
-        FeedbackType::NONE,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-
-struct MineruItemDuper_Descriptor::Stats : public StatsTracker {
-    Stats()
-        : dupe_attempts(m_stats["Dupe Attempts"])
-    {
-        m_display_order.emplace_back("Dupe Attempts");
-    }
-    std::atomic<uint64_t>& dupe_attempts;
-};
-std::unique_ptr<StatsTracker> MineruItemDuper_Descriptor::make_stats() const {
-    return std::unique_ptr<StatsTracker>(new Stats());
-}
-
-MineruItemDuper::MineruItemDuper()
-    : AMOUNT(
-        "<b>Duplication Amount:</b><br>The number of items you wish to duplicate.",
-        LockWhileRunning::LOCKED,
-        900
-    )
-    , IS_ZONAI_DEVICE(
-        "<b>Is Zonai Device:</b><br>Whether or not you are duplicating a Zonai device, or just a normal material.",
-        LockWhileRunning::LOCKED,
-        false
-    )
-    , GO_HOME_WHEN_DONE(false)
-    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
-    , NOTIFICATIONS({
-        &NOTIFICATION_STATUS_UPDATE,
-        &NOTIFICATION_PROGRAM_FINISH,
-        // &NOTIFICATION_ERROR_FATAL,
-        })
-{
-    PA_ADD_OPTION(AMOUNT);
-    PA_ADD_OPTION(IS_ZONAI_DEVICE);
-    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
-    PA_ADD_OPTION(NOTIFICATIONS);
-}
-
-void MineruItemDuper::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) {
-    MineruItemDuper_Descriptor::Stats& stats = env.current_stats<MineruItemDuper_Descriptor::Stats>();
-
-    /*
-    Setup:
-    Menu has been opened to materials tab
-    Item you wish to dupe is selected in menu
-    Now close the menu
-
-    Warp to The Depths to run this without having to worry about blood moons. All of my testing was done at
-    the Great Abandoned Central Mine. 
-
-    Mount Mineru. Ideally, avoid having other Sages near you to prevent interacting with them.
-
-    If you are duping Zonai devices, you will need to be right next to a wall. Otherwise, try to stay in a
-    flat, open area.
-
-    ITEMS_PER_ATTEMPT will be 5 for normal materials and 10 for Zonai devices.
-
-    Works on 1.1 and 1.1.1
-    */
-
-    uint32_t ITEMS_PER_ATTEMPT = IS_ZONAI_DEVICE ? 10 : 5;
-    uint32_t c = 0;
-    while (c < AMOUNT) {
-        env.log("Current Amount: " + tostr_u_commas(c));
-
-        // Open menu
-        pbf_press_button(context, BUTTON_PLUS, 20, 100);
-
-        // Hold items to dupe
-        pbf_press_button(context, BUTTON_A, 10, 10);
-
-        // Pressing "Hold Item" is only necessary for Materials
-        if (!IS_ZONAI_DEVICE) {
-            pbf_press_dpad(context, DPAD_DOWN, 10, 10);
-        }
-
-        pbf_press_button(context, BUTTON_A, 10, 10);
-         for (uint32_t i = 0; i < ITEMS_PER_ATTEMPT && c < AMOUNT; i++) {
-            pbf_press_button(context, BUTTON_A, 10, 10);
-
-            // Increment counters
-            c++;
-            stats.dupe_attempts++;
-        }
-
-        // Now press Y (sort) and B (exit) at the same time
-        ssf_press_button(context, BUTTON_B, 0, 10);
-        pbf_press_button(context, BUTTON_Y, 10, 40);
-
-        // There is no need to pick up Zonai devices 
-        if (!IS_ZONAI_DEVICE) {
-            // Pick up duped items plus some extra attempts for potentially missed ones
-            for (uint32_t i = 0; i < ITEMS_PER_ATTEMPT + 2; i++) {
-                pbf_press_button(context, BUTTON_A, 10, 10);
-            }
-        } else {
-            pbf_wait(context, 250);
-        }
-
-        // increment stats
-        env.update_stats();
-        send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
-    }
-
-    GO_HOME_WHEN_DONE.run_end_of_program(context);
-    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
-}
-
-}
-}
-}
-
diff --git a/SerialPrograms/Source/ZeldaTotK/Programs/ZeldaTotK_MineruItemDuper.h b/SerialPrograms/Source/ZeldaTotK/Programs/ZeldaTotK_MineruItemDuper.h
deleted file mode 100644
index 0fc3e4b22d..0000000000
--- a/SerialPrograms/Source/ZeldaTotK/Programs/ZeldaTotK_MineruItemDuper.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*  TotK Mineru Item Duper
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_ZeldaTotK_MineruItemDuper_H
-#define PokemonAutomation_ZeldaTotK_MineruItemDuper_H
-
-#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
-#include "Common/Cpp/Options/SimpleIntegerOption.h"
-#include "Common/Cpp/Options/TimeExpressionOption.h"
-#include "CommonFramework/Notifications/EventNotificationsTable.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
-
-namespace PokemonAutomation {
-namespace NintendoSwitch {
-namespace ZeldaTotK {
-
-class MineruItemDuper_Descriptor : public SingleSwitchProgramDescriptor {
-public:
-    MineruItemDuper_Descriptor();
-    struct Stats;
-    virtual std::unique_ptr<StatsTracker> make_stats() const override;
-};
-
-class MineruItemDuper : public SingleSwitchProgramInstance {
-public:
-    MineruItemDuper();
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-    SimpleIntegerOption<uint32_t> AMOUNT;
-    BooleanCheckBoxOption IS_ZONAI_DEVICE;
-    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
-    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
-    EventNotificationsOption NOTIFICATIONS;
-};
-
-}
-}
-}
-#endif
-
-
-
diff --git a/SerialPrograms/Source/ZeldaTotK/Programs/ZeldaTotK_ParaglideItemDuper.cpp b/SerialPrograms/Source/ZeldaTotK/Programs/ZeldaTotK_ParaglideItemDuper.cpp
deleted file mode 100644
index fd4e9e0be1..0000000000
--- a/SerialPrograms/Source/ZeldaTotK/Programs/ZeldaTotK_ParaglideItemDuper.cpp
+++ /dev/null
@@ -1,175 +0,0 @@
-/*  TotK Paraglide Item Duper
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Cpp/PrettyPrint.h"
-#include "CommonFramework/Notifications/ProgramNotifications.h"
-#include "CommonFramework/Tools/StatsTracking.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_ScalarButtons.h"
-#include "ZeldaTotK_ParaglideItemDuper.h"
-
-namespace PokemonAutomation {
-namespace NintendoSwitch {
-namespace ZeldaTotK {
-
-ParaglideItemDuper_Descriptor::ParaglideItemDuper_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "ZeldaTotK:ParaglideItemDuper",
-        "Zelda: TotK", "Paraglide Item Duper",
-        "ComputerControl/blob/master/Wiki/Programs/ZeldaTotK/ParaglideItemDuper.md",
-        "Use the Paraglide Menu Sort glitch to duplicate items.",
-        FeedbackType::NONE,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-
-struct ParaglideItemDuper_Descriptor::Stats : public StatsTracker {
-    Stats()
-        : dupe_attempts(m_stats["Dupe Attempts"])
-    {
-        m_display_order.emplace_back("Dupe Attempts");
-    }
-    std::atomic<uint64_t>& dupe_attempts;
-};
-std::unique_ptr<StatsTracker> ParaglideItemDuper_Descriptor::make_stats() const {
-    return std::unique_ptr<StatsTracker>(new Stats());
-}
-
-ParaglideItemDuper::ParaglideItemDuper()
-    : ATTEMPTS(
-        "<b>Duplication Attempts:</b><br>The number of times you wish to run this routine.",
-        LockWhileRunning::UNLOCKED,
-        100
-    )
-    , LOAD_DELAY(
-        "<b>Loading time:</b><br>Adjustable delay for the load screen after warping. "
-        "Adjust this to match the loading time of your game.",
-        LockWhileRunning::UNLOCKED,
-        TICKS_PER_SECOND,
-        "3125"
-    )
-    , GO_HOME_WHEN_DONE(false)
-    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
-    , NOTIFICATIONS({
-        &NOTIFICATION_STATUS_UPDATE,
-        &NOTIFICATION_PROGRAM_FINISH,
-        // &NOTIFICATION_ERROR_FATAL,
-        })
-{
-    PA_ADD_OPTION(ATTEMPTS);
-    PA_ADD_OPTION(LOAD_DELAY);
-    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
-    PA_ADD_OPTION(NOTIFICATIONS);
-}
-
-void ParaglideItemDuper::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) {
-    ParaglideItemDuper_Descriptor::Stats& stats = env.current_stats<ParaglideItemDuper_Descriptor::Stats>();
-
-    /*
-    Setup:
-    Menu has been opened to materials tab
-    Item you wish to dupe is selected in menu
-    Now close the menu
-
-    Warp point placed directly opposite the ladder (face slightly to the left of the ladder) in Lookout Landing
-    angle away from the guard if possible to prevent talking to them.
-    can always readjust if needed - sometimes the map places a stamp instead of warping if position is off
-    
-    Map tab is selected and is on the second to last zoom level (zoom all the way in and the go back one)
-    
-    Sages being out doesn't matter as they don't appear inside town
-
-    Some items may bounce more, so all 5 dupes are not always picked up (ex large batteries may roll away)
-    Works with less than 5 of an item but tends to be less consistent
-
-    Don't try this with bombs or anything explosive
-    Don't have any other stamps on the map in the area
-    Unequip anything metal in case of thunderstorm
-    again, do not try this with bombs
-
-    Travel Medallion required.
-
-    In theory this program can be modified to work with a shrine near a cliff. Needs to be in a safe location and sages need to be disabled.
-
-    Works on 1.1 and 1.1.1
-    */
-
-    uint32_t c = 0;
-
-    while (c < ATTEMPTS) {
-        env.log("Current Attempts: " + tostr_u_commas(c));
-
-        //Walk forward from teleportation point
-        pbf_move_left_joystick(context, 128, 0, 10, 5);
-
-        //Jump and open paraglider
-        pbf_press_button(context, BUTTON_X, 20, 80);
-        pbf_press_button(context, BUTTON_X, 20, 20);
-
-        //Open menu
-        pbf_press_button(context, BUTTON_PLUS, 20, 100);
-
-        //Select 5 of the item to dupe - if less than 5 this still works
-        pbf_press_button(context, BUTTON_A, 20, 20);
-        pbf_press_dpad(context, DPAD_DOWN, 20, 20);
-        pbf_press_button(context, BUTTON_A, 20, 20);
-        pbf_press_button(context, BUTTON_A, 20, 20);
-        pbf_press_button(context, BUTTON_A, 20, 20);
-        pbf_press_button(context, BUTTON_A, 20, 20);
-        pbf_press_button(context, BUTTON_A, 20, 20);
-
-        //Now press Y (sort) and B (exit) at the same time
-        ssf_press_button(context, BUTTON_B, 0, 10);
-        pbf_press_button(context, BUTTON_Y, 10, 40);
-
-        //Close paraglider and drop to the ground
-        pbf_press_button(context, BUTTON_B, 20, 50);
-
-        //Pick up duped items - extra presses just in case
-        pbf_press_button(context, BUTTON_A, 20, 10);
-        pbf_press_button(context, BUTTON_A, 20, 10);
-        pbf_press_button(context, BUTTON_A, 20, 10);
-        pbf_press_button(context, BUTTON_A, 20, 10);
-        pbf_press_button(context, BUTTON_A, 20, 10);
-        pbf_press_button(context, BUTTON_A, 20, 10);
-        pbf_press_button(context, BUTTON_A, 20, 10);
-
-        //Turn around and try to pick up items as well
-        pbf_move_left_joystick(context, 128, 255, 10, 5);
-        pbf_press_button(context, BUTTON_A, 20, 10);
-        pbf_press_button(context, BUTTON_A, 20, 10);
-        pbf_press_button(context, BUTTON_A, 20, 10);
-        pbf_press_button(context, BUTTON_A, 20, 10);
-        pbf_press_button(context, BUTTON_A, 20, 10);
-        pbf_press_button(context, BUTTON_A, 20, 10);
-
-        //Open map and teleport back
-        pbf_press_button(context, BUTTON_MINUS, 20, 10);
-        pbf_move_left_joystick(context, 128, 255, 10, 10);
-        pbf_press_button(context, BUTTON_A, 20, 10);
-        pbf_press_button(context, BUTTON_A, 20, 10);
-
-        //Wait for loading screen
-        pbf_wait(context, LOAD_DELAY);
-        context.wait_for_all_requests();
-
-        // increment counter, increment stats
-        c++;
-        stats.dupe_attempts++;
-        env.update_stats();
-        send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
-
-    }
-
-    GO_HOME_WHEN_DONE.run_end_of_program(context);
-    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
-}
-
-}
-}
-}
-
diff --git a/SerialPrograms/Source/ZeldaTotK/Programs/ZeldaTotK_ParaglideItemDuper.h b/SerialPrograms/Source/ZeldaTotK/Programs/ZeldaTotK_ParaglideItemDuper.h
deleted file mode 100644
index 48309fa705..0000000000
--- a/SerialPrograms/Source/ZeldaTotK/Programs/ZeldaTotK_ParaglideItemDuper.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*  TotK Paraglide Item Duper
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_ZeldaTotK_ParaglideItemDuper_H
-#define PokemonAutomation_ZeldaTotK_ParaglideItemDuper_H
-
-#include "Common/Cpp/Options/SimpleIntegerOption.h"
-#include "Common/Cpp/Options/TimeExpressionOption.h"
-#include "CommonFramework/Notifications/EventNotificationsTable.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
-
-namespace PokemonAutomation {
-namespace NintendoSwitch {
-namespace ZeldaTotK {
-
-class ParaglideItemDuper_Descriptor : public SingleSwitchProgramDescriptor {
-public:
-    ParaglideItemDuper_Descriptor();
-    struct Stats;
-    virtual std::unique_ptr<StatsTracker> make_stats() const override;
-};
-
-class ParaglideItemDuper : public SingleSwitchProgramInstance {
-public:
-    ParaglideItemDuper();
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-    SimpleIntegerOption<uint32_t> ATTEMPTS;
-    TimeExpressionOption<uint16_t> LOAD_DELAY;
-    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
-    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
-    EventNotificationsOption NOTIFICATIONS;
-};
-
-}
-}
-}
-#endif
-
-
-
diff --git a/SerialPrograms/Source/ZeldaTotK/Programs/ZeldaTotK_SurfItemDuper.cpp b/SerialPrograms/Source/ZeldaTotK/Programs/ZeldaTotK_SurfItemDuper.cpp
deleted file mode 100644
index f6c2d29aa0..0000000000
--- a/SerialPrograms/Source/ZeldaTotK/Programs/ZeldaTotK_SurfItemDuper.cpp
+++ /dev/null
@@ -1,146 +0,0 @@
-/*  TotK Surf Item Duper
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Cpp/PrettyPrint.h"
-#include "CommonFramework/Notifications/ProgramNotifications.h"
-#include "CommonFramework/Tools/StatsTracking.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_ScalarButtons.h"
-#include "ZeldaTotK_SurfItemDuper.h"
-
-namespace PokemonAutomation {
-namespace NintendoSwitch {
-namespace ZeldaTotK {
-
-SurfItemDuper_Descriptor::SurfItemDuper_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "ZeldaTotK:SurfItemDuper",
-        "Zelda: TotK", "Shield Surf Item Duper",
-        "ComputerControl/blob/master/Wiki/Programs/ZeldaTotK/SurfItemDuper.md",
-        "Use the Shield Surfing Menu Sort glitch to duplicate items.",
-        FeedbackType::NONE,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-
-struct SurfItemDuper_Descriptor::Stats : public StatsTracker {
-    Stats()
-        : dupe_attempts(m_stats["Dupe Attempts"])
-    {
-        m_display_order.emplace_back("Dupe Attempts");
-    }
-    std::atomic<uint64_t>& dupe_attempts;
-};
-std::unique_ptr<StatsTracker> SurfItemDuper_Descriptor::make_stats() const {
-    return std::unique_ptr<StatsTracker>(new Stats());
-}
-
-SurfItemDuper::SurfItemDuper()
-    : ATTEMPTS(
-        "<b>Duplication Attempts:</b><br>The number of times you wish to run this routine.",
-        LockWhileRunning::UNLOCKED,
-        100
-    )
-    , GO_HOME_WHEN_DONE(false)
-    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
-    , NOTIFICATIONS({
-        &NOTIFICATION_STATUS_UPDATE,
-        &NOTIFICATION_PROGRAM_FINISH,
-        // &NOTIFICATION_ERROR_FATAL,
-        })
-{
-    PA_ADD_OPTION(ATTEMPTS);
-    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
-    PA_ADD_OPTION(NOTIFICATIONS);
-}
-
-void SurfItemDuper::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) {
-    SurfItemDuper_Descriptor::Stats& stats = env.current_stats<SurfItemDuper_Descriptor::Stats>();
-
-    /*
-    Setup:
-    Stand on a patch of sand in a shrine or in the depths (under a lightroot)
-
-    Menu has been opened to materials tab
-    Item you wish to dupe is selected in menu
-    Now close the menu
-
-    Durability should not matter when on sand or snow
-    
-    Sages being out doesn't matter as they don't appear inside shrines
-    Blood moons don't matter inside shrines
-    Heat/Cold don't matter inside shrines
-
-    Some items may bounce more, so all 5 dupes are not always picked up (ex large batteries may roll away)
-    Works with less than 5 of an item but tends to be less consistent
-
-    Don't try this with bombs or anything explosive
-
-    Works on 1.1 and 1.1.1
-    */
-
-    uint32_t c = 0;
-
-    while (c < ATTEMPTS) {
-        env.log("Current Attempts: " + tostr_u_commas(c));
-
-        //Initiate Shield Surf
-        ssf_press_button(context, BUTTON_ZL, 0, 80);
-        ssf_press_button(context, BUTTON_X, 5, 30);
-        ssf_press_button(context, BUTTON_A, 10, 80);
-
-        //Open menu
-        pbf_press_button(context, BUTTON_PLUS, 20, 100);
-
-        //Select 5 of the item to dupe - if less than 5 this still works
-        pbf_press_button(context, BUTTON_X, 10, 10);
-        pbf_press_button(context, BUTTON_A, 10, 10);
-        pbf_press_button(context, BUTTON_A, 10, 10);
-        pbf_press_button(context, BUTTON_A, 10, 10);
-        pbf_press_button(context, BUTTON_A, 10, 10);
-        pbf_press_button(context, BUTTON_A, 10, 10);
-
-        //Now press Y (sort) and B (exit) at the same time
-        pbf_press_button(context, BUTTON_B | BUTTON_Y, 10, 40);
-
-        //Drop to the ground
-        pbf_press_button(context, BUTTON_B, 20, 50);
-
-        //Pick up duped items - extra presses just in case
-        pbf_press_button(context, BUTTON_A, 10, 10);
-        pbf_press_button(context, BUTTON_A, 10, 10);
-        pbf_press_button(context, BUTTON_A, 10, 10);
-        pbf_press_button(context, BUTTON_A, 10, 10);
-        pbf_press_button(context, BUTTON_A, 10, 10);
-        pbf_press_button(context, BUTTON_A, 10, 10);
-        pbf_press_button(context, BUTTON_A, 10, 10);
-
-        //Turn around and try to pick up items as well
-        pbf_move_left_joystick(context, 128, 255, 10, 5);
-        pbf_press_button(context, BUTTON_A, 10, 10);
-        pbf_press_button(context, BUTTON_A, 10, 10);
-        pbf_press_button(context, BUTTON_A, 10, 10);
-        pbf_press_button(context, BUTTON_A, 10, 10);
-        pbf_press_button(context, BUTTON_A, 10, 10);
-        pbf_press_button(context, BUTTON_A, 10, 10);
-
-        // increment counter, increment stats
-        c++;
-        stats.dupe_attempts++;
-        env.update_stats();
-        send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
-
-    }
-
-    GO_HOME_WHEN_DONE.run_end_of_program(context);
-    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
-}
-
-}
-}
-}
-
diff --git a/SerialPrograms/Source/ZeldaTotK/Programs/ZeldaTotK_SurfItemDuper.h b/SerialPrograms/Source/ZeldaTotK/Programs/ZeldaTotK_SurfItemDuper.h
deleted file mode 100644
index b848c7e2e1..0000000000
--- a/SerialPrograms/Source/ZeldaTotK/Programs/ZeldaTotK_SurfItemDuper.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*  TotK Surf Item Duper
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_ZeldaTotK_SurfItemDuper_H
-#define PokemonAutomation_ZeldaTotK_SurfItemDuper_H
-
-#include "Common/Cpp/Options/SimpleIntegerOption.h"
-#include "CommonFramework/Notifications/EventNotificationsTable.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
-
-namespace PokemonAutomation {
-namespace NintendoSwitch {
-namespace ZeldaTotK {
-
-class SurfItemDuper_Descriptor : public SingleSwitchProgramDescriptor {
-public:
-    SurfItemDuper_Descriptor();
-    struct Stats;
-    virtual std::unique_ptr<StatsTracker> make_stats() const override;
-};
-
-class SurfItemDuper : public SingleSwitchProgramInstance {
-public:
-    SurfItemDuper();
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-    SimpleIntegerOption<uint32_t> ATTEMPTS;
-    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
-    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
-    EventNotificationsOption NOTIFICATIONS;
-};
-
-}
-}
-}
-#endif
-
-
-
diff --git a/SerialPrograms/Source/ZeldaTotK/Programs/ZeldaTotK_WeaponDuper.cpp b/SerialPrograms/Source/ZeldaTotK/Programs/ZeldaTotK_WeaponDuper.cpp
deleted file mode 100644
index 5276cba2c0..0000000000
--- a/SerialPrograms/Source/ZeldaTotK/Programs/ZeldaTotK_WeaponDuper.cpp
+++ /dev/null
@@ -1,205 +0,0 @@
-/*  TotK Weapon Duper
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/Cpp/PrettyPrint.h"
-#include "CommonFramework/Notifications/ProgramNotifications.h"
-#include "CommonFramework/Tools/StatsTracking.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
-#include "NintendoSwitch/Commands/NintendoSwitch_Commands_ScalarButtons.h"
-#include "ZeldaTotK_WeaponDuper.h"
-
-namespace PokemonAutomation {
-namespace NintendoSwitch {
-namespace ZeldaTotK {
-
-WeaponDuper_Descriptor::WeaponDuper_Descriptor()
-    : SingleSwitchProgramDescriptor(
-        "ZeldaTotK:WeaponDuper",
-        "Zelda: TotK", "Weapon Duper",
-        "ComputerControl/blob/master/Wiki/Programs/ZeldaTotK/WeaponDuper.md",
-        "Use a glitch to duplicate your weapons (Bows, Shields and Swords)",
-        FeedbackType::NONE,
-        AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        PABotBaseLevel::PABOTBASE_12KB
-    )
-{}
-
-struct WeaponDuper_Descriptor::Stats : public StatsTracker {
-    Stats()
-        : dupe_attempts(m_stats["Dupe Attempts"])
-    {
-        m_display_order.emplace_back("Dupe Attempts");
-    }
-    std::atomic<uint64_t>& dupe_attempts;
-};
-std::unique_ptr<StatsTracker> WeaponDuper_Descriptor::make_stats() const {
-    return std::unique_ptr<StatsTracker>(new Stats());
-}
-
-WeaponDuper::WeaponDuper()
-    : ATTEMPTS(
-        "<b>Duplication Attempts:</b><br>The number of times you wish to run this routine.",
-        LockWhileRunning::UNLOCKED,
-        10
-    )
-    , WEAPON_MENU_BUTTON_COUNT(
-        "<b>Menu change button presses: :</b><br>How many button presses are required to go from option menu to weapon menu (bow = 7, shield = 6, sword = 5).",
-        LockWhileRunning::UNLOCKED,
-        5
-    )
-    , DPAD_RIGHT_BUTTON_COUNT(
-        "<b>Right button presses: :</b><br>How many dpad right button presses are required to go from the left-most slot to the one you want to dupe.",
-        LockWhileRunning::UNLOCKED,
-        0
-    )
-    , DPAD_DOWN_BUTTON_COUNT(
-        "<b>Down button presses: :</b><br>How many dpad down button presses are required to go from the top-most slot to the one you want to dupe.",
-        LockWhileRunning::UNLOCKED,
-        0
-    )
-    , GO_HOME_WHEN_DONE(false)
-    , NOTIFICATION_STATUS_UPDATE("Status Update", true, false, std::chrono::seconds(3600))
-    , NOTIFICATIONS({
-        &NOTIFICATION_STATUS_UPDATE,
-        &NOTIFICATION_PROGRAM_FINISH,
-        // &NOTIFICATION_ERROR_FATAL,
-        })
-{
-    PA_ADD_OPTION(ATTEMPTS);
-    PA_ADD_OPTION(WEAPON_MENU_BUTTON_COUNT);
-    PA_ADD_OPTION(DPAD_RIGHT_BUTTON_COUNT);
-    PA_ADD_OPTION(DPAD_DOWN_BUTTON_COUNT);
-    PA_ADD_OPTION(GO_HOME_WHEN_DONE);
-    PA_ADD_OPTION(NOTIFICATIONS);
-}
-
-void WeaponDuper::program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) {
-    WeaponDuper_Descriptor::Stats& stats = env.current_stats<WeaponDuper_Descriptor::Stats>();
-
-    uint32_t c = 0;
-
-    while (c < ATTEMPTS) {
-        env.log("Current Attempts: " + tostr_u_commas(c));
-
-        env.log("Open menu");
-        pbf_press_button(context, BUTTON_PLUS, 10, 30);
-
-        context.wait_for_all_requests();
-        env.log("Go to options menu");
-        for (uint32_t i = 0; i < WEAPON_MENU_BUTTON_COUNT; ++i)
-        {
-            pbf_press_button(context, BUTTON_R, 10, 30);
-        }
-
-        context.wait_for_all_requests();
-        env.log("Save game");
-        pbf_press_button(context, BUTTON_A, 10, 100);
-        pbf_press_dpad(context, DPAD_UP, 10, 30);
-        pbf_press_button(context, BUTTON_A, 10, 100);
-        pbf_wait(context, 5 * TICKS_PER_SECOND);
-
-        context.wait_for_all_requests();
-        env.log("Go to weapon menu");
-        for (uint32_t i = 0; i < WEAPON_MENU_BUTTON_COUNT; ++i)
-        {
-            pbf_press_button(context, BUTTON_L, 10, 30);
-        }
-
-        context.wait_for_all_requests();
-        env.log("Come back to first slot");
-        for (uint32_t i = 0; i < 5; ++i)
-        {
-            pbf_press_dpad(context, DPAD_UP, 10, 30);
-            pbf_press_dpad(context, DPAD_LEFT, 10, 30);
-        }
-
-        context.wait_for_all_requests();
-        env.log("Go to desired slot");
-        for (uint32_t i = 0; i < DPAD_RIGHT_BUTTON_COUNT; ++i)
-        {
-            pbf_press_dpad(context, DPAD_RIGHT, 10, 30);
-        }
-        for (uint32_t i = 0; i < DPAD_DOWN_BUTTON_COUNT; ++i)
-        {
-            pbf_press_dpad(context, DPAD_DOWN, 10, 30);
-        }
-
-        context.wait_for_all_requests();
-        env.log("Drop weapon");
-        pbf_press_button(context, BUTTON_A, 10, 30);
-        pbf_press_dpad(context, DPAD_DOWN, 10, 30);
-        pbf_press_button(context, BUTTON_A, 10, 50);
-
-        context.wait_for_all_requests();
-        env.log("Equip weapon on the right");
-        pbf_press_dpad(context, DPAD_RIGHT, 10, 30);
-        pbf_press_button(context, BUTTON_A, 10, 30);
-        pbf_press_button(context, BUTTON_A, 10, 30);
-
-        context.wait_for_all_requests();
-        env.log("Open and close the menu fast");
-        pbf_press_button(context, BUTTON_PLUS, 10, 10);
-        pbf_press_button(context, BUTTON_PLUS, 10, 100);
-
-        context.wait_for_all_requests();
-        env.log("Drop weapon");
-        pbf_press_dpad(context, DPAD_LEFT, 10, 30);
-        pbf_press_button(context, BUTTON_A, 10, 30);
-        pbf_press_dpad(context, DPAD_DOWN, 10, 30);
-        pbf_press_button(context, BUTTON_A, 10, 50);
-
-        context.wait_for_all_requests();
-        env.log("Go back to options menu");
-        for (uint32_t i = 0; i < WEAPON_MENU_BUTTON_COUNT; ++i)
-        {
-            pbf_press_button(context, BUTTON_R, 10, 30);
-        }
-
-        context.wait_for_all_requests();
-        env.log("Load the save");
-        pbf_press_dpad(context, DPAD_DOWN, 10, 30);
-        pbf_press_button(context, BUTTON_A, 10, 100);
-        pbf_press_button(context, BUTTON_A, 10, 100);
-        pbf_press_dpad(context, DPAD_UP, 10, 30);
-        pbf_press_button(context, BUTTON_A, 10, 100);
-        pbf_wait(context, 25 * TICKS_PER_SECOND);
-
-        context.wait_for_all_requests();
-        env.log("Pick up duped weapon - extra presses just in case");
-        pbf_press_button(context, BUTTON_A, 10, 10);
-        pbf_press_button(context, BUTTON_A, 10, 10);
-        pbf_press_button(context, BUTTON_A, 10, 10);
-        pbf_press_button(context, BUTTON_A, 10, 10);
-        pbf_press_button(context, BUTTON_A, 10, 10);
-        pbf_press_button(context, BUTTON_A, 10, 10);
-        pbf_press_button(context, BUTTON_A, 10, 10);
-
-        context.wait_for_all_requests();
-        env.log("Turn around and try to pick up items as well");
-        pbf_move_left_joystick(context, 128, 255, 10, 5);
-        pbf_press_button(context, BUTTON_A, 10, 10);
-        pbf_press_button(context, BUTTON_A, 10, 10);
-        pbf_press_button(context, BUTTON_A, 10, 10);
-        pbf_press_button(context, BUTTON_A, 10, 10);
-        pbf_press_button(context, BUTTON_A, 10, 10);
-        pbf_press_button(context, BUTTON_A, 10, 10);
-        pbf_move_left_joystick(context, 128, 0, 10, 5);
-
-        // increment counter, increment stats
-        c++;
-        stats.dupe_attempts++;
-        env.update_stats();
-        send_program_status_notification(env, NOTIFICATION_STATUS_UPDATE);
-    }
-
-    GO_HOME_WHEN_DONE.run_end_of_program(context);
-    send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);
-}
-
-}
-}
-}
-
diff --git a/SerialPrograms/Source/ZeldaTotK/Programs/ZeldaTotK_WeaponDuper.h b/SerialPrograms/Source/ZeldaTotK/Programs/ZeldaTotK_WeaponDuper.h
deleted file mode 100644
index 292f8e93e3..0000000000
--- a/SerialPrograms/Source/ZeldaTotK/Programs/ZeldaTotK_WeaponDuper.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*  TotK Weapon Duper
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_ZeldaTotK_WeaponDuper_H
-#define PokemonAutomation_ZeldaTotK_WeaponDuper_H
-
-#include "Common/Cpp/Options/SimpleIntegerOption.h"
-#include "CommonFramework/Notifications/EventNotificationsTable.h"
-#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
-#include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
-
-namespace PokemonAutomation {
-namespace NintendoSwitch {
-namespace ZeldaTotK {
-
-class WeaponDuper_Descriptor : public SingleSwitchProgramDescriptor {
-public:
-    WeaponDuper_Descriptor();
-    struct Stats;
-    virtual std::unique_ptr<StatsTracker> make_stats() const override;
-};
-
-class WeaponDuper : public SingleSwitchProgramInstance {
-public:
-    WeaponDuper();
-    virtual void program(SingleSwitchProgramEnvironment& env, BotBaseContext& context) override;
-
-private:
-    SimpleIntegerOption<uint32_t> ATTEMPTS;
-    SimpleIntegerOption<uint32_t> WEAPON_MENU_BUTTON_COUNT;
-    SimpleIntegerOption<uint32_t> DPAD_RIGHT_BUTTON_COUNT;
-    SimpleIntegerOption<uint32_t> DPAD_DOWN_BUTTON_COUNT;
-    GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
-    EventNotificationOption NOTIFICATION_STATUS_UPDATE;
-    EventNotificationsOption NOTIFICATIONS;
-};
-
-}
-}
-}
-#endif
-
-
-
diff --git a/SerialPrograms/Source/ZeldaTotK/ZeldaTotK_Panels.cpp b/SerialPrograms/Source/ZeldaTotK/ZeldaTotK_Panels.cpp
deleted file mode 100644
index 299a6728e3..0000000000
--- a/SerialPrograms/Source/ZeldaTotK/ZeldaTotK_Panels.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-/*  Zelda: TotK Panels
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-//#include "CommonFramework/GlobalSettingsPanel.h"
-#include "ZeldaTotK_Panels.h"
-
-//#include "ZeldaTotK_Settings.h"
-
-#include "Programs/ZeldaTotK_BowItemDuper.h"
-#include "Programs/ZeldaTotK_MineruItemDuper.h"
-#include "Programs/ZeldaTotK_ParaglideItemDuper.h"
-#include "Programs/ZeldaTotK_SurfItemDuper.h"
-#include "Programs/ZeldaTotK_WeaponDuper.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace ZeldaTotK{
-
-
-
-PanelListFactory::PanelListFactory()
-    : PanelListDescriptor("Zelda: Tears of the Kingdom")
-{}
-
-std::vector<PanelEntry> PanelListFactory::make_panels() const{
-    std::vector<PanelEntry> ret;
-    
-    // ret.emplace_back("---- Settings ----");
-    // ret.emplace_back(make_settings<GameSettings_Descriptor, GameSettingsPanel>());
-
-    //ret.emplace_back("---- General ----");
-
-    ret.emplace_back("---- Glitches (v1.1.1) ----");
-    ret.emplace_back(make_single_switch_program<BowItemDuper_Descriptor, BowItemDuper>());
-    ret.emplace_back(make_single_switch_program<MineruItemDuper_Descriptor, MineruItemDuper>());
-    ret.emplace_back(make_single_switch_program<ParaglideItemDuper_Descriptor, ParaglideItemDuper>());
-    ret.emplace_back(make_single_switch_program<SurfItemDuper_Descriptor, SurfItemDuper>());
-    ret.emplace_back(make_single_switch_program<WeaponDuper_Descriptor, WeaponDuper>());
-
-    return ret;
-}
-
-
-
-
-}
-}
-}
diff --git a/SerialPrograms/Source/ZeldaTotK/ZeldaTotK_Panels.h b/SerialPrograms/Source/ZeldaTotK/ZeldaTotK_Panels.h
deleted file mode 100644
index 7795ded9af..0000000000
--- a/SerialPrograms/Source/ZeldaTotK/ZeldaTotK_Panels.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*  Zelda: TotK Panels
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_ZeldaTotK_Panels_H
-#define PokemonAutomation_ZeldaTotK_Panels_H
-
-#include "CommonFramework/Panels/PanelList.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace ZeldaTotK{
-
-
-
-class PanelListFactory : public PanelListDescriptor{
-public:
-    PanelListFactory();
-    virtual std::vector<PanelEntry> make_panels() const;
-};
-
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/Source/ZeldaTotK/ZeldaTotK_Settings.cpp b/SerialPrograms/Source/ZeldaTotK/ZeldaTotK_Settings.cpp
deleted file mode 100644
index 5608160c37..0000000000
--- a/SerialPrograms/Source/ZeldaTotK/ZeldaTotK_Settings.cpp
+++ /dev/null
@@ -1,99 +0,0 @@
-/*  Zelda: TotK Settings
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#include "Common/NintendoSwitch/NintendoSwitch_ControllerDefs.h"
-#include "CommonFramework/Globals.h"
-
-#include "ZeldaTotK_Settings.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace ZeldaTotK{
-
-
-
-GameSettings& GameSettings::instance(){
-    static GameSettings settings;
-    return settings;
-}
-GameSettings::GameSettings()
-    : BatchOption(LockWhileRunning::LOCKED)
-    , m_menu_navigation("<font size=4><b>Menu Navigation Timings:</b></font>")
-    , GAME_TO_HOME_DELAY(
-        "<b>Game to Home Delay:</b><br>Delay from pressing home to entering the the Switch home menu.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "125"
-    )
-    , m_start_game_timings("<font size=4><b>Start Game Timings:</b></font>")
-    , START_GAME_MASH(
-        "<b>1. Start Game Mash:</b><br>Mash A for this long to start the game.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "2 * TICKS_PER_SECOND"
-    )
-    , START_GAME_WAIT(
-        "<b>2. Start Game Wait:</b><br>Wait this long for the game to load.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "60 * TICKS_PER_SECOND"
-    )
-    , ENTER_GAME_MASH(
-        "<b>3. Enter Game Mash:</b><br>Mash A for this long to enter the game.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "5 * TICKS_PER_SECOND"
-    )
-    , ENTER_GAME_WAIT(
-        "<b>4. Enter Game Wait:</b><br>Wait this long for the game to enter the overworld.",
-        LockWhileRunning::LOCKED,
-        TICKS_PER_SECOND,
-        "60 * TICKS_PER_SECOND"
-    )
-{
-    PA_ADD_STATIC(m_start_game_timings);
-    PA_ADD_OPTION(START_GAME_MASH);
-    PA_ADD_OPTION(START_GAME_WAIT);
-    PA_ADD_OPTION(ENTER_GAME_MASH);
-    PA_ADD_OPTION(ENTER_GAME_WAIT);
-}
-
-
-
-
-
-GameSettings_Descriptor::GameSettings_Descriptor()
-    : PanelDescriptor(
-        Color(),
-        "ZeldaTotK:GlobalSettings",
-        "Zelda: TotK", "Tears of the Kingdom Settings",
-        "ComputerControl/blob/master/Wiki/Programs/ZeldaTotK/TotKSettings.md",
-        "Global Zelda: Tears of the Kingom Settings"
-    )
-{}
-
-
-
-GameSettingsPanel::GameSettingsPanel(const GameSettings_Descriptor& descriptor)
-    : SettingsPanelInstance(descriptor)
-    , settings(GameSettings::instance())
-{
-    PA_ADD_OPTION(settings);
-}
-
-
-
-
-
-}
-}
-}
-
-
-
-
-
-
diff --git a/SerialPrograms/Source/ZeldaTotK/ZeldaTotK_Settings.h b/SerialPrograms/Source/ZeldaTotK/ZeldaTotK_Settings.h
deleted file mode 100644
index a8cd4da38c..0000000000
--- a/SerialPrograms/Source/ZeldaTotK/ZeldaTotK_Settings.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*  Zelda: TotK Settings
- *
- *  From: https://github.com/PokemonAutomation/Arduino-Source
- *
- */
-
-#ifndef PokemonAutomation_ZeldaTotK_Settings_H
-#define PokemonAutomation_ZeldaTotK_Settings_H
-
-#include "Common/Cpp/Options/StaticTextOption.h"
-#include "Common/Cpp/Options/BooleanCheckBoxOption.h"
-#include "Common/Cpp/Options/FloatingPointOption.h"
-#include "Common/Cpp/Options/TimeExpressionOption.h"
-#include "CommonFramework/Panels/SettingsPanel.h"
-
-namespace PokemonAutomation{
-namespace NintendoSwitch{
-namespace ZeldaTotK{
-
-
-class GameSettings : public BatchOption{
-    GameSettings();
-public:
-    static GameSettings& instance();
-
-    SectionDividerOption m_menu_navigation;
-    TimeExpressionOption<uint16_t> GAME_TO_HOME_DELAY;
-
-    SectionDividerOption m_start_game_timings;
-    TimeExpressionOption<uint16_t> START_GAME_MASH;
-    TimeExpressionOption<uint16_t> START_GAME_WAIT;
-    TimeExpressionOption<uint16_t> ENTER_GAME_MASH;
-    TimeExpressionOption<uint16_t> ENTER_GAME_WAIT;
-
-};
-
-
-
-
-class GameSettings_Descriptor : public PanelDescriptor{
-public:
-    GameSettings_Descriptor();
-};
-
-
-class GameSettingsPanel : public SettingsPanelInstance{
-public:
-    GameSettingsPanel(const GameSettings_Descriptor& descriptor);
-private:
-    GameSettings& settings;
-};
-
-
-}
-}
-}
-#endif
diff --git a/SerialPrograms/cmake/CoreLib.cmake b/SerialPrograms/cmake/CoreLib.cmake
new file mode 100644
index 0000000000..a397d8bf03
--- /dev/null
+++ b/SerialPrograms/cmake/CoreLib.cmake
@@ -0,0 +1,98 @@
+# CoreLib: the GUI-free core of SerialPrograms.
+#
+# CoreLib contains the serial connection, the PABotBase2 protocol, controller
+# scheduling and the Nintendo Switch controllers, plus the utilities they need
+# (logging, threads, options, etc.). It is built from ${CORE_LIBRARY_SOURCES}
+# (see SourceFiles.cmake) and needs no third-party libraries: no Qt, OpenCV,
+# ONNX Runtime, Tesseract or DPP. Qt-specific code in these files is guarded by
+# `#ifdef QT_CORE_LIB`, which is never defined for CoreLib.
+#
+# Users of CoreLib:
+#   - SerialProgramsCommandLine (Source/CommandLine/)
+# The GUI program does not link CoreLib; SerialProgramsLib compiles the same
+# sources itself with Qt enabled.
+#
+# This file is included by CMakeLists.txt for both the full build and the core-only
+# build (-DPA_CORE_ONLY=ON). It requires ${CORE_LIBRARY_SOURCES} and Threads.
+#
+# It also defines cmake function:
+# `pa_apply_base_target_properties()`: sets up base properties (include directores
+# and definitions) for every target (GUI or not) in this project.
+# `pa_apply_gui_free_target_properties()`: sets up properties for GUI-free targets.
+#   It calls `pa_apply_base_target_properties()` and sets properties to remove GUI
+#   dependencies and code.
+
+#  The SerialPrograms folder, normalized so include paths are spelled exactly as
+#  before this file existed (a different spelling would force a full rebuild).
+get_filename_component(PA_SERIAL_PROGRAMS_DIR "${CMAKE_CURRENT_LIST_DIR}/.." ABSOLUTE)
+
+
+# Include directories, definitions and threading shared by all targets.
+function(pa_apply_base_target_properties target_name)
+    set_target_properties(${target_name} PROPERTIES LINKER_LANGUAGE CXX)
+    target_link_libraries(${target_name} PRIVATE Threads::Threads)
+
+    #add defines
+    target_compile_definitions(${target_name} PRIVATE NOMINMAX DPP_NO_DEPRECATED)
+    if(WIN32)
+        #  Keep <Windows.h> from pulling in the legacy <winsock.h>; the socket
+        #  layer uses <winsock2.h>, which is mutually exclusive with it.
+        target_compile_definitions(${target_name} PRIVATE WIN32_LEAN_AND_MEAN)
+    endif()
+
+    #add include directory
+    target_include_directories(${target_name} SYSTEM PRIVATE ${PA_SERIAL_PROGRAMS_DIR}/../3rdParty-Core)
+    target_include_directories(${target_name} PRIVATE
+        ${PA_SERIAL_PROGRAMS_DIR}/..
+        ${PA_SERIAL_PROGRAMS_DIR}/../../Internal/
+        ${PA_SERIAL_PROGRAMS_DIR}/Source/
+    )
+endfunction()
+
+# Base properties for a target that must not depend on Qt or any other GUI library.
+# Qt-only code paths are compiled out, and images use no GUI backend.
+function(pa_apply_gui_free_target_properties target_name)
+    pa_apply_base_target_properties(${target_name})
+    target_compile_definitions(${target_name} PRIVATE PA_IMAGE_BACKEND_None)
+    #  The global CMAKE_AUTOMOC etc. would make CMake look for Qt's code generators.
+    set_target_properties(${target_name} PROPERTIES AUTOMOC OFF AUTOUIC OFF AUTORCC OFF)
+endfunction()
+
+
+# Create GUI-free Controller library
+add_library(CoreLib STATIC ${CORE_LIBRARY_SOURCES})
+pa_apply_gui_free_target_properties(CoreLib)
+
+if (WIN32)
+    if(PA_ASSEMBLY_LISTINGS)  # option defined in CMakeLists.txt
+        #  /FaAssembly/CoreLib/ writes assembly listings to Assembly/CoreLib/ in the build folder.
+        file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/Assembly/CoreLib)
+        target_compile_options(CoreLib PRIVATE /FAs /FaAssembly/CoreLib/)
+    endif()
+    target_compile_options(CoreLib PRIVATE /W4 /WX /external:W0 /utf-8)
+    if(NOT CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+        # cl only: clang-cl ignores these, and /WX turns its unused-argument warning into an error.
+        target_compile_options(CoreLib PRIVATE /MP /external:anglebrackets)
+    endif()
+    target_compile_options(CoreLib PRIVATE /wd5054)  # Deprecated enum arithemtic
+    target_compile_options(CoreLib PRIVATE /wd4505)  # unreferenced local function has been removed
+
+    # clang-cl, from Visual Studio's ClangCL toolset or from another generator such as Ninja.
+    if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+        target_compile_options(CoreLib PRIVATE -Wno-unused-function)
+        target_compile_options(CoreLib PRIVATE -march=nehalem)
+    endif()
+else() # macOS and Linux
+    if(APPLE)
+        target_compile_options(CoreLib PRIVATE -Wall -Wextra -Wpedantic -Werror -Wshorten-64-to-32)
+        target_link_libraries(CoreLib PRIVATE "-framework IOKit -framework CoreFoundation")
+    else() # Linux
+        # Assume GCC
+        target_compile_options(CoreLib PRIVATE -Wall -Wextra -Wpedantic -Werror -fno-strict-aliasing)
+    endif()
+
+    if(NOT ${CMAKE_SYSTEM_PROCESSOR} MATCHES "^(arm|arm64|aarch64)")
+        # Intel CPU
+        target_compile_options(CoreLib PRIVATE -march=nehalem)
+    endif()
+endif()
diff --git a/SerialPrograms/cmake/ExtractDiscordSDK.cmake b/SerialPrograms/cmake/ExtractDiscordSDK.cmake
new file mode 100644
index 0000000000..6b166df418
--- /dev/null
+++ b/SerialPrograms/cmake/ExtractDiscordSDK.cmake
@@ -0,0 +1,73 @@
+# Extract the Discord Social SDK from `DISCORD_ZIP` into `DISCORD_DIR` when DISCORD_DIR does
+# not exist or is older than DISCORD_ZIP.
+#
+function(extract_discord_sdk DISCORD_ZIP DISCORD_DIR)
+    if (NOT EXISTS "${DISCORD_ZIP}")
+        message(FATAL_ERROR "Discord SDK archive is missing: ${DISCORD_ZIP}")
+    endif()
+
+    # Initialize the string for logging the reason for extracing the zip.
+    set(EXTRACT_REASON "")
+
+    # Directories are excluded by GLOB_RECURSE, so this is the list of real files.
+    file(GLOB_RECURSE EXTRACTED_FILES "${DISCORD_DIR}/*")
+
+    if (NOT EXISTS "${DISCORD_DIR}")
+        set(EXTRACT_REASON "not extracted yet")
+    elseif (NOT EXTRACTED_FILES)
+        set(EXTRACT_REASON "extracted directory is empty")
+    else()
+        # Compare each file's timestamp against the zip file.
+        file(TIMESTAMP "${DISCORD_ZIP}" ZIP_TIME "%s" UTC)
+        set(OLDEST_TIME "")
+        foreach (EXTRACTED_FILE IN LISTS EXTRACTED_FILES)
+            file(TIMESTAMP "${EXTRACTED_FILE}" FILE_TIME "%s" UTC)
+            # file(TIMESTAMP) yields "" for a file it cannot stat. Treat that as requiring
+            # extraction to cover the case of broken files.
+            if (FILE_TIME STREQUAL "")
+                set(OLDEST_TIME "")
+                break()
+            endif()
+            if (OLDEST_TIME STREQUAL "" OR FILE_TIME LESS OLDEST_TIME)
+                set(OLDEST_TIME "${FILE_TIME}")
+            endif()
+        endforeach()
+        if (OLDEST_TIME STREQUAL "")
+            set(EXTRACT_REASON "extracted files are unreadable")
+        elseif (ZIP_TIME STREQUAL "")
+            # Unknown zip timestamp: extract anyway
+            set(EXTRACT_REASON "zip timestamp is unreadable")
+        elseif (ZIP_TIME GREATER_EQUAL OLDEST_TIME)
+            # GREATER_EQUAL, not GREATER: file(TIMESTAMP) has whole-second resolution, so a
+            # zip replaced within the same second as the extraction is indistinguishable from
+            # one that predates it.
+            set(EXTRACT_REASON "zip is newer than the extracted files")
+        endif()
+    endif()
+
+    if (EXTRACT_REASON STREQUAL "")
+        # No need to extract.
+        return()
+    endif()
+
+    message(STATUS "Discord SDK ${EXTRACT_REASON}, extracting from ${DISCORD_ZIP}...")
+
+    # Delete first so files dropped or renamed by the new SDK do not survive as leftovers.
+    file(REMOVE_RECURSE "${DISCORD_DIR}")
+    get_filename_component(DISCORD_PARENT_DIR "${DISCORD_DIR}" DIRECTORY)
+    execute_process(
+        COMMAND ${CMAKE_COMMAND} -E tar xf "${DISCORD_ZIP}"
+        WORKING_DIRECTORY "${DISCORD_PARENT_DIR}"
+        RESULT_VARIABLE EXTRACT_RESULT
+    )
+    if (NOT EXTRACT_RESULT EQUAL 0)
+        message(FATAL_ERROR "Failed to extract ${DISCORD_ZIP} (error: ${EXTRACT_RESULT})")
+    endif()
+
+    file(GLOB_RECURSE EXTRACTED_FILES "${DISCORD_DIR}/*")
+    if (NOT EXTRACTED_FILES)
+        message(FATAL_ERROR "Extracting ${DISCORD_ZIP} produced no files in ${DISCORD_DIR}")
+    endif()
+    # Touch the files to ensure their timestamps are newer to avoid redundant extraction.
+    file(TOUCH ${EXTRACTED_FILES})
+endfunction()
diff --git a/SerialPrograms/cmake/MacOSXBundleInfo.plist.in b/SerialPrograms/cmake/MacOSXBundleInfo.plist.in
new file mode 100644
index 0000000000..c16d937fcd
--- /dev/null
+++ b/SerialPrograms/cmake/MacOSXBundleInfo.plist.in
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>LSEnvironment</key>
+	<dict>
+		<key>LANG</key>
+		<string>en_US.UTF-8</string>
+	</dict>
+	<key>CFBundleExecutable</key>
+	<string>${MACOSX_BUNDLE_EXECUTABLE_NAME}</string>
+	<key>CFBundleGetInfoString</key>
+	<string>${MACOSX_BUNDLE_INFO_STRING}</string>
+	<key>CFBundleIconFile</key>
+	<string>${MACOSX_BUNDLE_ICON_FILE}</string>
+	<key>CFBundleIdentifier</key>
+	<string>${MACOSX_BUNDLE_GUI_IDENTIFIER}</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleLongVersionString</key>
+	<string>${MACOSX_BUNDLE_LONG_VERSION_STRING}</string>
+	<key>CFBundleName</key>
+	<string>${MACOSX_BUNDLE_BUNDLE_NAME}</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>${MACOSX_BUNDLE_SHORT_VERSION_STRING}</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>${MACOSX_BUNDLE_BUNDLE_VERSION}</string>
+	<key>CSResourcesFileMapped</key>
+	<true/>
+	<key>NSHumanReadableCopyright</key>
+	<string>${MACOSX_BUNDLE_COPYRIGHT}</string>
+	<key>NSCameraUsageDescription</key>
+	<string>The cameras are listed to choose the Switch video stream from the capture card.</string>
+	<key>NSCameraUseContinuityCameraDeviceType</key>
+	<true/>
+	<key>NSMicrophoneUsageDescription</key>
+	<string>The microphones are listed to choose the Switch audio stream from the capture card.</string>
+</dict>
+</plist>
diff --git a/SerialPrograms/cmake/MacOSXEntitlements.plist b/SerialPrograms/cmake/MacOSXEntitlements.plist
new file mode 100644
index 0000000000..87eb62951b
--- /dev/null
+++ b/SerialPrograms/cmake/MacOSXEntitlements.plist
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN"
+  "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+  <key>com.apple.security.device.camera</key>
+  <true/>
+  <key>com.apple.security.device.microphone</key>
+  <true/>
+  <key>com.apple.security.device.audio-input</key>
+  <true/>
+</dict>
+</plist>
diff --git a/SerialPrograms/cmake/SourceFiles.cmake b/SerialPrograms/cmake/SourceFiles.cmake
new file mode 100644
index 0000000000..5d130faff9
--- /dev/null
+++ b/SerialPrograms/cmake/SourceFiles.cmake
@@ -0,0 +1,3176 @@
+# This CMake file defines all the code file paths as the CMake variables
+# For the main CMake file, see CMakeLists.txt
+
+# the GUI executable needs the dark style format file
+# PA_CORE_ONLY: cmake option to only build the GUI-free core lib
+if(NOT PA_CORE_ONLY)
+    qt_add_resources(DARK_STYLE_RES "../3rdParty/qdarkstyle/dark/darkstyle.qrc")
+    set(EXECUTABLE_SOURCES "Source/CommonFramework/Main.cpp" ${DARK_STYLE_RES})
+endif()
+
+# Note: Command-line executable sources are defined in Source/CommandLine/CommandLineExecutable.cmake
+
+file(GLOB CORE_LIBRARY_SOURCES
+    ../3rdParty-Core/miniz-3.1.1/miniz.c
+    ../3rdParty-Core/miniz-3.1.1/miniz.h
+    ../Common/Compiler.h
+    ../Common/ControllerStates/NintendoSwitch_OemController_State.cpp
+    ../Common/ControllerStates/NintendoSwitch_OemController_State.h
+    ../Common/ControllerStates/NintendoSwitch_WiredController_State.h
+    ../Common/ControllerStates/StandardHid_Keyboard_State.c
+    ../Common/ControllerStates/StandardHid_Keyboard_State.h
+    ../Common/Cpp/CancellableScope.cpp
+    ../Common/Cpp/CancellableScope.h
+    ../Common/Cpp/Color.cpp
+    ../Common/Cpp/Color.h
+    ../Common/Cpp/ColoredText.cpp
+    ../Common/Cpp/ColoredText.h
+    ../Common/Cpp/Concurrency/AsyncTask.h
+    ../Common/Cpp/Concurrency/Backends/AsyncTask_Default.h
+    ../Common/Cpp/Concurrency/Backends/Thread_StdThread.tpp
+    ../Common/Cpp/Concurrency/Backends/ThreadPool_Default.cpp
+    ../Common/Cpp/Concurrency/Backends/ThreadPool_Default.h
+    ../Common/Cpp/Concurrency/ConditionVariable.h
+    ../Common/Cpp/Concurrency/Mutex.h
+    ../Common/Cpp/Concurrency/PeriodicRunner.cpp
+    ../Common/Cpp/Concurrency/PeriodicRunner.h
+    ../Common/Cpp/Concurrency/Qt6.9ThreadBugWorkaround.h
+    ../Common/Cpp/Concurrency/ReverseLockGuard.h
+    ../Common/Cpp/Concurrency/ScheduledTaskRunner.cpp
+    ../Common/Cpp/Concurrency/ScheduledTaskRunner.h
+    ../Common/Cpp/Concurrency/SpinLock.cpp
+    ../Common/Cpp/Concurrency/SpinLock.h
+    ../Common/Cpp/Concurrency/SpinPause.h
+    ../Common/Cpp/Concurrency/Thread.cpp
+    ../Common/Cpp/Concurrency/Thread.h
+    ../Common/Cpp/Concurrency/ThreadPool.h
+    ../Common/Cpp/Concurrency/Watchdog.cpp
+    ../Common/Cpp/Concurrency/Watchdog.h
+    ../Common/Cpp/Containers/AlignedMalloc.cpp
+    ../Common/Cpp/Containers/AlignedMalloc.h
+    ../Common/Cpp/Containers/AlignedVector.h
+    ../Common/Cpp/Containers/AlignedVector.tpp
+    ../Common/Cpp/Containers/CircularBuffer.h
+    ../Common/Cpp/Containers/FixedLimitVector.h
+    ../Common/Cpp/Containers/FixedLimitVector.tpp
+    ../Common/Cpp/Containers/GuardPageBuffer.cpp
+    ../Common/Cpp/Containers/GuardPageBuffer.h
+    ../Common/Cpp/Containers/Pimpl.h
+    ../Common/Cpp/Containers/Pimpl.tpp
+    ../Common/Cpp/CpuId/CpuId.cpp
+    ../Common/Cpp/CpuId/CpuId.h
+    ../Common/Cpp/CpuId/CpuId_arm64.h
+    ../Common/Cpp/CpuId/CpuId_arm64.tpp
+    ../Common/Cpp/CpuId/CpuId_x86.h
+    ../Common/Cpp/CpuId/CpuId_x86.tpp
+    ../Common/Cpp/CpuUtilization/CpuUtilization.cpp
+    ../Common/Cpp/CpuUtilization/CpuUtilization.h
+    ../Common/Cpp/CpuUtilization/CpuUtilization_Linux.h
+    ../Common/Cpp/CpuUtilization/CpuUtilization_Linux.tpp
+    ../Common/Cpp/CpuUtilization/CpuUtilization_Windows.h
+    ../Common/Cpp/CpuUtilization/CpuUtilization_Windows.tpp
+    ../Common/Cpp/Cryptography/SHA256.cpp
+    ../Common/Cpp/Cryptography/SHA256.h
+    ../Common/Cpp/EarlyShutdown.h
+    ../Common/Cpp/EnumStringMap.h
+    ../Common/Cpp/EventRateTracker.h
+    ../Common/Cpp/Exceptions.cpp
+    ../Common/Cpp/Exceptions.h
+    ../Common/Cpp/ExpressionEvaluator.cpp
+    ../Common/Cpp/ExpressionEvaluator.h
+    ../Common/Cpp/Filesystem/FileIO.cpp
+    ../Common/Cpp/Filesystem/FileIO.h
+    ../Common/Cpp/Filesystem/FilePath.cpp
+    ../Common/Cpp/Filesystem/FilePath.h
+    ../Common/Cpp/Filesystem/Filesystem.cpp
+    ../Common/Cpp/Filesystem/Filesystem.h
+    ../Common/Cpp/Filesystem/Filesystem_Linux.h
+    ../Common/Cpp/Filesystem/Filesystem_Mac.h
+    ../Common/Cpp/Filesystem/Filesystem_Windows.h
+    ../Common/Cpp/Hardware/FloatingPointMode.h
+    ../Common/Cpp/Hardware/Hardware.cpp
+    ../Common/Cpp/Hardware/Hardware.h
+    ../Common/Cpp/Hardware/Hardware_arm64_Linux.tpp
+    ../Common/Cpp/Hardware/Hardware_x86.tpp
+    ../Common/Cpp/Hardware/Hardware_x86_Linux.tpp
+    ../Common/Cpp/Hardware/Hardware_x86_Windows.tpp
+    ../Common/Cpp/ImageResolution.cpp
+    ../Common/Cpp/ImageResolution.h
+    ../Common/Cpp/Json/JsonArray.cpp
+    ../Common/Cpp/Json/JsonArray.h
+    ../Common/Cpp/Json/JsonObject.cpp
+    ../Common/Cpp/Json/JsonObject.h
+    ../Common/Cpp/Json/JsonTools.cpp
+    ../Common/Cpp/Json/JsonTools.h
+    ../Common/Cpp/Json/JsonValue.cpp
+    ../Common/Cpp/Json/JsonValue.h
+    ../Common/Cpp/LifetimeSanitizer.cpp
+    ../Common/Cpp/LifetimeSanitizer.h
+    ../Common/Cpp/ListenerSet.h
+    ../Common/Cpp/ListenerSet.cpp
+    ../Common/Cpp/Logging/AbstractLogger.h
+    ../Common/Cpp/Logging/FileLogger.cpp
+    ../Common/Cpp/Logging/FileLogger.h
+    ../Common/Cpp/Logging/GlobalLogger.cpp
+    ../Common/Cpp/Logging/GlobalLogger.h
+    ../Common/Cpp/Logging/LastLogTracker.cpp
+    ../Common/Cpp/Logging/LastLogTracker.h
+    ../Common/Cpp/Logging/MultiOutputLogger.h
+    ../Common/Cpp/Logging/TaggedLogger.cpp
+    ../Common/Cpp/Logging/TaggedLogger.h
+    ../Common/Cpp/MoveOnlyFunction.h
+    ../Common/Cpp/MoveOnlyFunction_Tests.cpp
+    ../Common/Cpp/MoveOnlyFunction_Tests.h
+    ../Common/Cpp/Options/BatchOption.cpp
+    ../Common/Cpp/Options/BatchOption.h
+    ../Common/Cpp/Options/BooleanCheckBoxOption.cpp
+    ../Common/Cpp/Options/BooleanCheckBoxOption.h
+    ../Common/Cpp/Options/ButtonOption.cpp
+    ../Common/Cpp/Options/ButtonOption.h
+    ../Common/Cpp/Options/ColorOption.cpp
+    ../Common/Cpp/Options/ColorOption.h
+    ../Common/Cpp/Options/ConfigOption.cpp
+    ../Common/Cpp/Options/ConfigOption.h
+    ../Common/Cpp/Options/EditableTableOption.cpp
+    ../Common/Cpp/Options/EditableTableOption.h
+    ../Common/Cpp/Options/EnumDropdownDatabase.cpp
+    ../Common/Cpp/Options/EnumDropdownDatabase.h
+    ../Common/Cpp/Options/EnumDropdownOption.cpp
+    ../Common/Cpp/Options/EnumDropdownOption.h
+    ../Common/Cpp/Options/FloatingPointOption.cpp
+    ../Common/Cpp/Options/FloatingPointOption.h
+    ../Common/Cpp/Options/GroupOption.cpp
+    ../Common/Cpp/Options/GroupOption.h
+    ../Common/Cpp/Options/KeyboardLayoutOption.cpp
+    ../Common/Cpp/Options/KeyboardLayoutOption.h
+    ../Common/Cpp/Options/MacAddressOption.cpp
+    ../Common/Cpp/Options/MacAddressOption.h
+    ../Common/Cpp/Options/SimpleIntegerOption.cpp
+    ../Common/Cpp/Options/SimpleIntegerOption.h
+    ../Common/Cpp/Options/SimpleIntegerOptionBase.h
+    ../Common/Cpp/Options/StaticTableOption.cpp
+    ../Common/Cpp/Options/StaticTableOption.h
+    ../Common/Cpp/Options/StaticTextOption.cpp
+    ../Common/Cpp/Options/StaticTextOption.h
+    ../Common/Cpp/Options/StringOption.cpp
+    ../Common/Cpp/Options/StringOption.h
+    ../Common/Cpp/Options/TimeDurationOption.cpp
+    ../Common/Cpp/Options/TimeDurationOption.h
+    ../Common/Cpp/PanicDump.cpp
+    ../Common/Cpp/PanicDump.h
+    ../Common/Cpp/PrettyPrint.cpp
+    ../Common/Cpp/PrettyPrint.h
+    ../Common/Cpp/RecursiveThrottler.h
+    ../Common/Cpp/ScopeExit.h
+    ../Common/Cpp/SerialConnection/SerialConnection.cpp
+    ../Common/Cpp/SerialConnection/SerialConnection.h
+    ../Common/Cpp/SerialConnection/SerialConnectionPOSIX.h
+    ../Common/Cpp/SerialConnection/SerialConnectionWinAPI.h
+    ../Common/Cpp/SparseRegion.cpp
+    ../Common/Cpp/SparseRegion.h
+    ../Common/Cpp/Stopwatch.h
+    ../Common/Cpp/StreamConnections/PollingStreamConnections.h
+    ../Common/Cpp/StreamConnections/PushingStreamConnections.h
+    ../Common/Cpp/StreamConnections/StreamInterface.h
+    ../Common/Cpp/StreamConverters.cpp
+    ../Common/Cpp/StreamConverters.h
+    ../Common/Cpp/Strings/StringTools.cpp
+    ../Common/Cpp/Strings/StringTools.h
+    ../Common/Cpp/Strings/Unicode.cpp
+    ../Common/Cpp/Strings/Unicode.h
+    ../Common/Cpp/Time.cpp
+    ../Common/Cpp/Time.h
+    ../Common/Cpp/UiWrapper.h
+    ../Common/CRC32/pabb_CRC32.c
+    ../Common/CRC32/pabb_CRC32.h
+    ../Common/PABotBase2/Controllers/PABotBase2_Controller_HID_Keyboard.h
+    ../Common/PABotBase2/Controllers/PABotBase2_Controller_NS1_OemController.h
+    ../Common/PABotBase2/Controllers/PABotBase2_Controller_NS_WiredController.h
+    ../Common/PABotBase2/PABotBase2_MessageProtocol.h
+    ../Common/PABotBase2/PABotBase2CC_MessageDumper.cpp
+    ../Common/PABotBase2/PABotBase2CC_MessageDumper.h
+    ../Common/PABotBase2/ReliableConnectionLayer/PABotBase2_ConnectionDebug.cpp
+    ../Common/PABotBase2/ReliableConnectionLayer/PABotBase2_ConnectionDebug.h
+    ../Common/PABotBase2/ReliableConnectionLayer/PABotBase2_PacketParser.cpp
+    ../Common/PABotBase2/ReliableConnectionLayer/PABotBase2_PacketParser.h
+    ../Common/PABotBase2/ReliableConnectionLayer/PABotBase2_PacketProtocol.h
+    ../Common/PABotBase2/ReliableConnectionLayer/PABotBase2_PacketSender.cpp
+    ../Common/PABotBase2/ReliableConnectionLayer/PABotBase2_PacketSender.h
+    ../Common/PABotBase2/ReliableConnectionLayer/PABotBase2_StreamCoalescer.cpp
+    ../Common/PABotBase2/ReliableConnectionLayer/PABotBase2_StreamCoalescer.h
+    ../Common/PABotBase2/ReliableConnectionLayer/PABotBase2CC_ReliableStreamConnection.cpp
+    ../Common/PABotBase2/ReliableConnectionLayer/PABotBase2CC_ReliableStreamConnection.h
+    ../Common/SerialPABotBase/SerialPABotBase_Protocol_IDs.h
+    Source/CommonFramework/Environment/Environment.cpp
+    Source/CommonFramework/Environment/Environment.h
+    Source/CommonFramework/Environment/Environment_Linux.h
+    Source/CommonFramework/Environment/Environment_Linux.tpp
+    Source/CommonFramework/Environment/Environment_Windows.h
+    Source/CommonFramework/Environment/Environment_Windows.tpp
+    Source/CommonFramework/GlobalAutoPaths.cpp
+    Source/CommonFramework/GlobalAutoPaths.h
+    Source/CommonFramework/Globals.cpp
+    Source/CommonFramework/Globals.h
+    Source/CommonFramework/GlobalServices.cpp
+    Source/CommonFramework/GlobalServices.h
+    Source/CommonFramework/ImageTypes/ImageRGB32.cpp
+    Source/CommonFramework/ImageTypes/ImageRGB32.h
+    Source/CommonFramework/ImageTypes/ImageViewPlanar32.cpp
+    Source/CommonFramework/ImageTypes/ImageViewPlanar32.h
+    Source/CommonFramework/ImageTypes/ImageViewRGB32.cpp
+    Source/CommonFramework/ImageTypes/ImageViewRGB32.h
+    Source/CommonFramework/Logging/Logger.cpp
+    Source/CommonFramework/Logging/Logger.h
+    Source/CommonFramework/Options/CheckForUpdatesOption.h
+    Source/CommonFramework/Options/Environment/CoreAffinityOption.cpp
+    Source/CommonFramework/Options/Environment/CoreAffinityOption.h
+    Source/CommonFramework/Options/Environment/PerformanceOptions.cpp
+    Source/CommonFramework/Options/Environment/PerformanceOptions.h
+    Source/CommonFramework/Options/Environment/ProcessorLevelOption.cpp
+    Source/CommonFramework/Options/Environment/ProcessorLevelOption.h
+    Source/CommonFramework/Options/Environment/ProcessPriorityOption.h
+    Source/CommonFramework/Options/ThreadPoolOption.cpp
+    Source/CommonFramework/Options/ThreadPoolOption.h
+    Source/CommonFramework/Options/WallpaperOption.cpp
+    Source/CommonFramework/Options/WallpaperOption.h
+    Source/CommonFramework/StaticGlobals.cpp
+    Source/CommonFramework/StaticGlobals.h
+    Source/CommonFramework/Tools/FileHash.cpp
+    Source/CommonFramework/Tools/FileHash.h
+    Source/CommonFramework/Tools/FileUnzip.cpp
+    Source/CommonFramework/Tools/FileUnzip.h
+    Source/CommonFramework/Tools/GlobalThreadPools.cpp
+    Source/CommonFramework/Tools/GlobalThreadPools.h
+    Source/CommonFramework/Tools/StatAccumulator.cpp
+    Source/CommonFramework/Tools/StatAccumulator.h
+    Source/CommonTools/Async/InterruptableCommands.cpp
+    Source/CommonTools/Async/InterruptableCommands.h
+    Source/CommonTools/Async/InterruptableCommands.tpp
+    Source/CommonTools/InferenceCallbacks/InferenceCallback.h
+    Source/CommonTools/Options/StringSelectOption.cpp
+    Source/CommonTools/Options/StringSelectOption.h
+    Source/CommonTools/Random.cpp
+    Source/CommonTools/Random.h
+    Source/CompileTimeBackends.h
+    Source/ControllerInput/ControllerInput.cpp
+    Source/ControllerInput/ControllerInput.h
+    Source/ControllerInput/Keyboard/KeyBindingOption.cpp
+    Source/ControllerInput/Keyboard/KeyBindingOption.h
+    Source/ControllerInput/Keyboard/KeyboardHidButtons.h
+    Source/ControllerInput/Keyboard/KeyboardInput_State.cpp
+    Source/ControllerInput/Keyboard/KeyboardInput_State.h
+    Source/Controllers/Controller.cpp
+    Source/Controllers/Controller.h
+    Source/Controllers/ControllerConnection.cpp
+    Source/Controllers/ControllerConnection.h
+    Source/Controllers/ControllerDescriptor.cpp
+    Source/Controllers/ControllerDescriptor.h
+    Source/Controllers/ControllerOption.cpp
+    Source/Controllers/ControllerOption.h
+    Source/Controllers/ControllerSession.cpp
+    Source/Controllers/ControllerSession.h
+    Source/Controllers/ControllerState.cpp
+    Source/Controllers/ControllerState.h
+    Source/Controllers/ControllerStatusThread.h
+    Source/Controllers/ControllerTypes.h
+    Source/Controllers/ControllerTypeStrings.cpp
+    Source/Controllers/ControllerTypeStrings.h
+    Source/Controllers/Joystick.cpp
+    Source/Controllers/Joystick.h
+    Source/Controllers/JoystickTools.h
+    Source/Controllers/NullController.cpp
+    Source/Controllers/NullController.h
+    Source/Controllers/PABotBase2/PABotBase2_CommandQueueManager.cpp
+    Source/Controllers/PABotBase2/PABotBase2_CommandQueueManager.h
+    Source/Controllers/PABotBase2/PABotBase2_Connection.cpp
+    Source/Controllers/PABotBase2/PABotBase2_Connection.h
+    Source/Controllers/PABotBase2/PABotBase2_DeviceHandle.cpp
+    Source/Controllers/PABotBase2/PABotBase2_DeviceHandle.h
+    Source/Controllers/PABotBase2/PABotBase2_MessageHandler.cpp
+    Source/Controllers/PABotBase2/PABotBase2_MessageHandler.h
+    Source/Controllers/PABotBase2/SerialPABotBase2_Connection.cpp
+    Source/Controllers/PABotBase2/SerialPABotBase2_Connection.h
+    Source/Controllers/PABotBase2/SerialPABotBase2_Descriptor.cpp
+    Source/Controllers/PABotBase2/SerialPABotBase2_Descriptor.h
+    Source/Controllers/RumbleListener.h
+    Source/Controllers/Schedulers/ControllerWithScheduler.h
+    Source/Controllers/Schedulers/SuperscalarScheduler.cpp
+    Source/Controllers/Schedulers/SuperscalarScheduler.h
+    Source/Controllers/SerialPort/SerialLogger.cpp
+    Source/Controllers/SerialPort/SerialLogger.h
+    Source/Controllers/SerialPort/SerialPABotBase.cpp
+    Source/Controllers/SerialPort/SerialPABotBase.h
+    Source/Controllers/StandardHid/StandardHid_Keyboard.cpp
+    Source/Controllers/StandardHid/StandardHid_Keyboard.h
+    Source/Controllers/StandardHid/StandardHid_Keyboard_PABotBase2.cpp
+    Source/Controllers/StandardHid/StandardHid_Keyboard_PABotBase2.h
+    Source/Controllers/StandardHid/StandardHid_KeyboardWithScheduler.cpp
+    Source/Controllers/StandardHid/StandardHid_KeyboardWithScheduler.h
+    Source/Integrations/PybindSwitchController.cpp
+    Source/Integrations/PybindSwitchController.h
+    Source/NintendoSwitch/Controllers/Joycon/NintendoSwitch_Joycon.cpp
+    Source/NintendoSwitch/Controllers/Joycon/NintendoSwitch_Joycon.h
+    Source/NintendoSwitch/Controllers/Joycon/NintendoSwitch_Joycon_from_Keyboard.cpp
+    Source/NintendoSwitch/Controllers/Joycon/NintendoSwitch_Joycon_from_Keyboard.h
+    Source/NintendoSwitch/Controllers/Joycon/NintendoSwitch_JoyconState.cpp
+    Source/NintendoSwitch/Controllers/Joycon/NintendoSwitch_JoyconState.h
+    Source/NintendoSwitch/Controllers/NintendoSwitch_ControllerButtons.cpp
+    Source/NintendoSwitch/Controllers/NintendoSwitch_ControllerButtons.h
+    Source/NintendoSwitch/Controllers/NintendoSwitch_ControllerSettings.cpp
+    Source/NintendoSwitch/Controllers/NintendoSwitch_ControllerSettings.h
+    Source/NintendoSwitch/Controllers/NintendoSwitch_ControllerWithScheduler.cpp
+    Source/NintendoSwitch/Controllers/NintendoSwitch_ControllerWithScheduler.h
+    Source/NintendoSwitch/Controllers/NintendoSwitch_KeyboardMapping.cpp
+    Source/NintendoSwitch/Controllers/NintendoSwitch_KeyboardMapping.h
+    Source/NintendoSwitch/Controllers/NintendoSwitch_VirtualControllerState.cpp
+    Source/NintendoSwitch/Controllers/NintendoSwitch_VirtualControllerState.h
+    Source/NintendoSwitch/Controllers/PABotBase2/NintendoSwitch_PABotBase2_Controller.cpp
+    Source/NintendoSwitch/Controllers/PABotBase2/NintendoSwitch_PABotBase2_Controller.h
+    Source/NintendoSwitch/Controllers/PABotBase2/NintendoSwitch_PABotBase2_Joycon.h
+    Source/NintendoSwitch/Controllers/PABotBase2/NintendoSwitch_PABotBase2_OemController.cpp
+    Source/NintendoSwitch/Controllers/PABotBase2/NintendoSwitch_PABotBase2_OemController.h
+    Source/NintendoSwitch/Controllers/PABotBase2/NintendoSwitch_PABotBase2_ProController.h
+    Source/NintendoSwitch/Controllers/PABotBase2/NintendoSwitch_PABotBase2_WiredController.cpp
+    Source/NintendoSwitch/Controllers/PABotBase2/NintendoSwitch_PABotBase2_WiredController.h
+    Source/NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.cpp
+    Source/NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController.h
+    Source/NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController_from_Keyboard.cpp
+    Source/NintendoSwitch/Controllers/Procon/NintendoSwitch_ProController_from_Keyboard.h
+    Source/NintendoSwitch/Controllers/Procon/NintendoSwitch_ProControllerState.cpp
+    Source/NintendoSwitch/Controllers/Procon/NintendoSwitch_ProControllerState.h
+    Source/NintendoSwitch/NintendoSwitch_Settings.cpp
+    Source/NintendoSwitch/NintendoSwitch_Settings.h
+    Source/NintendoSwitch/Options/NintendoSwitch_CodeEntrySettingsOption.cpp
+    Source/NintendoSwitch/Options/NintendoSwitch_CodeEntrySettingsOption.h
+    Source/NintendoSwitch/Programs/FastCodeEntry/NintendoSwitch_KeyboardEntryMappings.cpp
+    Source/NintendoSwitch/Programs/FastCodeEntry/NintendoSwitch_KeyboardEntryMappings.h
+)
+
+file(GLOB LIBRARY_SOURCES
+    ../3rdParty/ONNX/OnnxToolsPA.h
+    ../3rdParty/QtWavFile/WavFile.cpp
+    ../3rdParty/QtWavFile/WavFile.h
+    ../3rdParty/TesseractPA/TesseractPA.cpp
+    ../3rdParty/TesseractPA/TesseractPA.h
+    ../Common/Cpp/BitmapConversion.cpp
+    ../Common/Cpp/BitmapConversion.h
+    ../Common/Cpp/Concurrency/Backends/Thread_Qt.tpp
+    ../Common/Cpp/Concurrency/Backends/Thread_StdThreadDetach.tpp
+    ../Common/Cpp/Concurrency/BusyPeriodicRunner.cpp
+    ../Common/Cpp/Concurrency/BusyPeriodicRunner.h
+    ../Common/Cpp/Concurrency/FireForgetDispatcher.cpp
+    ../Common/Cpp/Concurrency/FireForgetDispatcher.h
+    ../Common/Cpp/Containers/BoxSet.h
+    ../Common/Cpp/Containers/DllSafeString.h
+    ../Common/Cpp/Containers/SparseArray.cpp
+    ../Common/Cpp/Containers/SparseArray.h
+    ../Common/Cpp/DateTime.h
+    ../Common/Cpp/Filesystem/Filesystem_Qt.h
+    ../Common/Cpp/Logging/OutputRedirector.cpp
+    ../Common/Cpp/Logging/OutputRedirector.h
+    ../Common/Cpp/MemoryUtilization/MemoryUtilization.cpp
+    ../Common/Cpp/MemoryUtilization/MemoryUtilization.h
+    ../Common/Cpp/MemoryUtilization/MemoryUtilization_Linux.tpp
+    ../Common/Cpp/MemoryUtilization/MemoryUtilization_Mac.tpp
+    ../Common/Cpp/MemoryUtilization/MemoryUtilization_Windows.tpp
+    ../Common/Cpp/Options/BoxFloatOption.cpp
+    ../Common/Cpp/Options/BoxFloatOption.h
+    ../Common/Cpp/Options/CheckboxDropdownDatabase.h
+    ../Common/Cpp/Options/CheckboxDropdownOption.cpp
+    ../Common/Cpp/Options/CheckboxDropdownOption.h
+    ../Common/Cpp/Options/CheckboxDropdownOption.tpp
+    ../Common/Cpp/Options/DateOption.cpp
+    ../Common/Cpp/Options/DateOption.h
+    ../Common/Cpp/Options/FixedCodeOption.cpp
+    ../Common/Cpp/Options/FixedCodeOption.h
+    ../Common/Cpp/Options/IntegerRangeOption.cpp
+    ../Common/Cpp/Options/IntegerRangeOption.h
+    ../Common/Cpp/Options/PathOption.cpp
+    ../Common/Cpp/Options/PathOption.h
+    ../Common/Cpp/Options/RandomCodeOption.cpp
+    ../Common/Cpp/Options/RandomCodeOption.h
+    ../Common/Cpp/Options/TextEditOption.cpp
+    ../Common/Cpp/Options/TextEditOption.h
+    ../Common/Cpp/Options/TimeExpressionOption.cpp
+    ../Common/Cpp/Options/TimeExpressionOption.h
+    ../Common/Cpp/PixelRGB32.h
+    ../Common/Cpp/PrintDebuggers.h
+    ../Common/Cpp/Rectangle.h
+    ../Common/Cpp/Rectangle.tpp
+    ../Common/Cpp/SIMDDebuggers.h
+    ../Common/Cpp/Sockets/AbstractClientSocket.h
+    ../Common/Cpp/Sockets/AbstractServerSocket.h
+    ../Common/Cpp/Sockets/ClientSocket.cpp
+    ../Common/Cpp/Sockets/ClientSocket.h
+    ../Common/Cpp/Sockets/ClientSocket_POSIX.cpp
+    ../Common/Cpp/Sockets/ClientSocket_POSIX.h
+    ../Common/Cpp/Sockets/ClientSocket_Qt.cpp
+    ../Common/Cpp/Sockets/ClientSocket_Qt.h
+    ../Common/Cpp/Sockets/ClientSocket_WinSocket.cpp
+    ../Common/Cpp/Sockets/ClientSocket_WinSocket.h
+    ../Common/Cpp/Sockets/ServerSocket_POSIX.cpp
+    ../Common/Cpp/Sockets/ServerSocket_WinSocket.cpp
+    ../Common/Cpp/Sockets/ServerSocket_Qt.cpp
+    ../Common/Cpp/Sockets/ServerSocket_POSIX.h
+    ../Common/Cpp/Sockets/ServerSocket_WinSocket.h
+    ../Common/Cpp/Sockets/ServerSocket_Qt.h
+    ../Common/Cpp/Sockets/Sockets_Tests.cpp
+    ../Common/Cpp/Sockets/Sockets_Tests.h
+    ../Common/Cpp/StreamConnections/MockDevice.cpp
+    ../Common/Cpp/StreamConnections/MockDevice.h
+    ../Common/Cpp/TestRunners/ParallelUnitTestRunner.cpp
+    ../Common/Cpp/TestRunners/ParallelUnitTestRunner.h
+    ../Common/Cpp/TestRunners/TestImageDistortionManager.cpp
+    ../Common/Cpp/TestRunners/TestImageDistortionManager.h
+    ../Common/Cpp/TestRunners/UnitTest.h
+    ../Common/Cpp/TestRunners/UnitTestDatabase.h
+    ../Common/Cpp/ValueDebouncer.h
+    ../Common/PABotBase2/ReliableConnectionLayer/PABotBase2FW_ReliableStreamConnection.cpp
+    ../Common/PABotBase2/ReliableConnectionLayer/PABotBase2FW_ReliableStreamConnection.h
+    ../Common/Qt/AutoHeightTable.cpp
+    ../Common/Qt/AutoHeightTable.h
+    ../Common/Qt/AutoWidthLineEdit.cpp
+    ../Common/Qt/AutoWidthLineEdit.h
+    ../Common/Qt/CheckboxDropdown.h
+    ../Common/Qt/CodeValidator.cpp
+    ../Common/Qt/CodeValidator.h
+    ../Common/Qt/CollapsibleGroupBox.cpp
+    ../Common/Qt/CollapsibleGroupBox.h
+    ../Common/Qt/GlobalThreadPoolsQt.cpp
+    ../Common/Qt/GlobalThreadPoolsQt.h
+    ../Common/Qt/NoWheelComboBox.h
+    ../Common/Qt/Options/BatchWidget.cpp
+    ../Common/Qt/Options/BatchWidget.h
+    ../Common/Qt/Options/BooleanCheckBoxWidget.cpp
+    ../Common/Qt/Options/BooleanCheckBoxWidget.h
+    ../Common/Qt/Options/BoxFloatWidget.cpp
+    ../Common/Qt/Options/BoxFloatWidget.h
+    ../Common/Qt/Options/ButtonWidget.cpp
+    ../Common/Qt/Options/ButtonWidget.h
+    ../Common/Qt/Options/CheckboxDropdownWidget.cpp
+    ../Common/Qt/Options/CheckboxDropdownWidget.h
+    ../Common/Qt/Options/ColorWidget.cpp
+    ../Common/Qt/Options/ColorWidget.h
+    ../Common/Qt/Options/ConfigWidget.cpp
+    ../Common/Qt/Options/ConfigWidget.h
+    ../Common/Qt/Options/DateWidget.cpp
+    ../Common/Qt/Options/DateWidget.h
+    ../Common/Qt/Options/EditableTableWidget.cpp
+    ../Common/Qt/Options/EditableTableWidget.h
+    ../Common/Qt/Options/EnumDropdownWidget.cpp
+    ../Common/Qt/Options/EnumDropdownWidget.h
+    ../Common/Qt/Options/FixedCodeWidget.cpp
+    ../Common/Qt/Options/FixedCodeWidget.h
+    ../Common/Qt/Options/FloatingPointWidget.cpp
+    ../Common/Qt/Options/FloatingPointWidget.h
+    ../Common/Qt/Options/GroupWidget.cpp
+    ../Common/Qt/Options/GroupWidget.h
+    ../Common/Qt/Options/IntegerRangeWidget.cpp
+    ../Common/Qt/Options/IntegerRangeWidget.h
+    ../Common/Qt/Options/MacAddressWidget.cpp
+    ../Common/Qt/Options/MacAddressWidget.h
+    ../Common/Qt/Options/PathWidget.cpp
+    ../Common/Qt/Options/PathWidget.h
+    ../Common/Qt/Options/RandomCodeWidget.cpp
+    ../Common/Qt/Options/RandomCodeWidget.h
+    ../Common/Qt/Options/SimpleIntegerWidget.cpp
+    ../Common/Qt/Options/SimpleIntegerWidget.h
+    ../Common/Qt/Options/StaticTableWidget.cpp
+    ../Common/Qt/Options/StaticTableWidget.h
+    ../Common/Qt/Options/StaticTextWidget.cpp
+    ../Common/Qt/Options/StaticTextWidget.h
+    ../Common/Qt/Options/StringWidget.cpp
+    ../Common/Qt/Options/StringWidget.h
+    ../Common/Qt/Options/TextEditWidget.cpp
+    ../Common/Qt/Options/TextEditWidget.h
+    ../Common/Qt/Options/TimeDurationWidget.cpp
+    ../Common/Qt/Options/TimeDurationWidget.h
+    ../Common/Qt/Options/TimeExpressionWidget.cpp
+    ../Common/Qt/Options/TimeExpressionWidget.h
+    ../Common/Qt/QtThreadPool.cpp
+    ../Common/Qt/QtThreadPool.h
+    ../Common/Qt/QtThreadPool_Tests.cpp
+    ../Common/Qt/QtThreadPool_Tests.h
+    ../Common/Qt/Redispatch.cpp
+    ../Common/Qt/Redispatch.h
+    ../Common/Qt/ShutdownWithEvents.h
+    ../Common/Qt/SpinWaitWithEvents.h
+    ../Common/Qt/StringToolsQt.cpp
+    ../Common/Qt/StringToolsQt.h
+    ../Common/Qt/TimeQt.cpp
+    ../Common/Qt/TimeQt.h
+    ../Common/Qt/UiStateQtWidget.h
+    ../Common/Qt/WidgetStackFixedAspectRatio.cpp
+    ../Common/Qt/WidgetStackFixedAspectRatio.h
+    ../Common/SerialPABotBase/SerialPABotBase_Messages_HID_Keyboard.h
+    ../Common/SerialPABotBase/SerialPABotBase_Messages_NS1_OemControllers.h
+    ../Common/SerialPABotBase/SerialPABotBase_Messages_NS_WiredController.h
+    ../Common/SerialPABotBase/SerialPABotBase_Protocol.h
+    Source/CommonFramework/AudioPipeline/AudioConstants.h
+    Source/CommonFramework/AudioPipeline/AudioFeed.h
+    Source/CommonFramework/AudioPipeline/AudioFormat.cpp
+    Source/CommonFramework/AudioPipeline/AudioFormat.h
+    Source/CommonFramework/AudioPipeline/AudioInfo_Tests.cpp
+    Source/CommonFramework/AudioPipeline/AudioInfo_Tests.h
+    Source/CommonFramework/AudioPipeline/AudioInputChoice.cpp
+    Source/CommonFramework/AudioPipeline/AudioInputChoice.h
+    Source/CommonFramework/AudioPipeline/AudioOption.cpp
+    Source/CommonFramework/AudioPipeline/AudioOption.h
+    Source/CommonFramework/AudioPipeline/AudioPassthroughPair.h
+    Source/CommonFramework/AudioPipeline/AudioPipelineOptions.h
+    Source/CommonFramework/AudioPipeline/AudioSession.cpp
+    Source/CommonFramework/AudioPipeline/AudioSession.h
+    Source/CommonFramework/AudioPipeline/AudioSourceDescriptor.cpp
+    Source/CommonFramework/AudioPipeline/AudioSourceDescriptor.h
+    Source/CommonFramework/AudioPipeline/Sources/AudioSource_Device.cpp
+    Source/CommonFramework/AudioPipeline/Sources/AudioSource_Device.h
+    Source/CommonFramework/AudioPipeline/Sources/AudioSource_File.cpp
+    Source/CommonFramework/AudioPipeline/Sources/AudioSource_File.h
+    Source/CommonFramework/AudioPipeline/Sources/AudioSource_Null.cpp
+    Source/CommonFramework/AudioPipeline/Sources/AudioSource_Null.h
+    Source/CommonFramework/AudioPipeline/AudioSource.h
+    Source/CommonFramework/AudioPipeline/AudioTemplate.cpp
+    Source/CommonFramework/AudioPipeline/AudioTemplate.h
+    Source/CommonFramework/AudioPipeline/Backends/AudioDeviceInfo.cpp
+    Source/CommonFramework/AudioPipeline/Backends/AudioDeviceInfo.h
+    Source/CommonFramework/AudioPipeline/Backends/AudioPassthroughPairQt.cpp
+    Source/CommonFramework/AudioPipeline/Backends/AudioPassthroughPairQt.h
+    Source/CommonFramework/AudioPipeline/Backends/AudioPassthroughPairQtThread.cpp
+    Source/CommonFramework/AudioPipeline/Backends/AudioPassthroughPairQtThread.h
+    Source/CommonFramework/AudioPipeline/Backends/NativeAudioFormats.cpp
+    Source/CommonFramework/AudioPipeline/Backends/NativeAudioFormats.h
+    Source/CommonFramework/AudioPipeline/Backends/NativeAudioFormats_Apple.tpp
+    Source/CommonFramework/AudioPipeline/IO/AudioFileLoader.cpp
+    Source/CommonFramework/AudioPipeline/IO/AudioFileLoader.h
+    Source/CommonFramework/AudioPipeline/IO/AudioFileLoader_Tests.cpp
+    Source/CommonFramework/AudioPipeline/IO/AudioFileLoader_Tests.h
+    Source/CommonFramework/AudioPipeline/IO/AudioInputDevice.cpp
+    Source/CommonFramework/AudioPipeline/IO/AudioInputDevice.h
+    Source/CommonFramework/AudioPipeline/IO/AudioInputFile.cpp
+    Source/CommonFramework/AudioPipeline/IO/AudioInputFile.h
+    Source/CommonFramework/AudioPipeline/IO/AudioOutputDevice.cpp
+    Source/CommonFramework/AudioPipeline/IO/AudioOutputDevice.h
+    Source/CommonFramework/AudioPipeline/Spectrum/AudioSpectrumHolder.cpp
+    Source/CommonFramework/AudioPipeline/Spectrum/AudioSpectrumHolder.h
+    Source/CommonFramework/AudioPipeline/SinkPipeline_Tests.cpp
+    Source/CommonFramework/AudioPipeline/SinkPipeline_Tests.h
+    Source/CommonFramework/AudioPipeline/Spectrum/FFTStreamer.cpp
+    Source/CommonFramework/AudioPipeline/Spectrum/FFTStreamer.h
+    Source/CommonFramework/AudioPipeline/Spectrum/FFTStreamer_Tests.cpp
+    Source/CommonFramework/AudioPipeline/Spectrum/Spectrograph.cpp
+    Source/CommonFramework/AudioPipeline/Spectrum/Spectrograph.h
+    Source/CommonFramework/AudioPipeline/Tools/AudioFormatUtils.cpp
+    Source/CommonFramework/AudioPipeline/Tools/AudioFormatUtils.h
+    Source/CommonFramework/AudioPipeline/Tools/ChannelMixer.cpp
+    Source/CommonFramework/AudioPipeline/Tools/ChannelMixer.h
+    Source/CommonFramework/AudioPipeline/UI/AudioDisplayWidget.cpp
+    Source/CommonFramework/AudioPipeline/UI/AudioDisplayWidget.h
+    Source/CommonFramework/AudioPipeline/UI/AudioSelectorWidget.cpp
+    Source/CommonFramework/AudioPipeline/UI/AudioSelectorWidget.h
+    Source/CommonFramework/Environment/HardwareValidation.cpp
+    Source/CommonFramework/Environment/HardwareValidation.h
+    Source/CommonFramework/Environment/HardwareValidation_arm64.tpp
+    Source/CommonFramework/Environment/HardwareValidation_x86.tpp
+    Source/CommonFramework/Environment/SystemSleep.cpp
+    Source/CommonFramework/Environment/SystemSleep.h
+    Source/CommonFramework/Environment/SystemSleep_Apple.tpp
+    Source/CommonFramework/Environment/SystemSleep_Linux.tpp
+    Source/CommonFramework/Environment/SystemSleep_Windows.tpp
+    Source/CommonFramework/ErrorReports/CrashBacktrace.cpp
+    Source/CommonFramework/ErrorReports/CrashBacktrace.h
+    Source/CommonFramework/ErrorReports/ErrorReports.cpp
+    Source/CommonFramework/ErrorReports/ErrorReports.h
+    Source/CommonFramework/ErrorReports/ProgramDumper.cpp
+    Source/CommonFramework/ErrorReports/ProgramDumper.h
+    Source/CommonFramework/ErrorReports/ProgramDumper_Windows.tpp
+    Source/CommonFramework/Exceptions/FatalProgramException.cpp
+    Source/CommonFramework/Exceptions/FatalProgramException.h
+    Source/CommonFramework/Exceptions/OperationFailedException.cpp
+    Source/CommonFramework/Exceptions/OperationFailedException.h
+    Source/CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.cpp
+    Source/CommonFramework/Exceptions/OperationFailedExceptionWithScreenshot.h
+    Source/CommonFramework/Exceptions/ProgramFinishedException.cpp
+    Source/CommonFramework/Exceptions/ProgramFinishedException.h
+    Source/CommonFramework/Exceptions/UnexpectedBattleException.h
+    Source/CommonFramework/GlobalSettingsPanel.cpp
+    Source/CommonFramework/GlobalSettingsPanel.h
+    Source/CommonFramework/ImageTools/FloatPixel.cpp
+    Source/CommonFramework/ImageTools/FloatPixel.h
+    Source/CommonFramework/ImageTools/ImageBoxes.cpp
+    Source/CommonFramework/ImageTools/ImageBoxes.h
+    Source/CommonFramework/ImageTools/ImageDiff.cpp
+    Source/CommonFramework/ImageTools/ImageDiff.h
+    Source/CommonFramework/ImageTools/ImageStats.cpp
+    Source/CommonFramework/ImageTools/ImageStats.h
+    Source/CommonFramework/ImageTypes/BinaryImage.cpp
+    Source/CommonFramework/ImageTypes/BinaryImage.h
+    Source/CommonFramework/ImageTypes/ImageHSV32.cpp
+    Source/CommonFramework/ImageTypes/ImageHSV32.h
+    Source/CommonFramework/ImageTypes/ImageRGB32_OpenCV.cpp
+    Source/CommonFramework/ImageTypes/ImageRGB32_OpenCV.h
+    Source/CommonFramework/ImageTypes/ImageRGB32_Qt.cpp
+    Source/CommonFramework/ImageTypes/ImageRGB32_Qt.h
+    Source/CommonFramework/ImageTypes/ImageViewHSV32.cpp
+    Source/CommonFramework/ImageTypes/ImageViewHSV32.h
+    Source/CommonFramework/Language.cpp
+    Source/CommonFramework/Language.h
+    Source/CommonFramework/Logging/LoggerWindow.cpp
+    Source/CommonFramework/Logging/LoggerWindow.h
+    Source/CommonFramework/Logging/OutputRedirector.h
+    Source/CommonFramework/Logging/QueuedLogger.cpp
+    Source/CommonFramework/Logging/QueuedLogger.h
+    Source/CommonFramework/Notifications/EventNotificationOption.cpp
+    Source/CommonFramework/Notifications/EventNotificationOption.h
+    Source/CommonFramework/Notifications/EventNotificationsTable.cpp
+    Source/CommonFramework/Notifications/EventNotificationsTable.h
+    Source/CommonFramework/Notifications/EventNotificationWidget.cpp
+    Source/CommonFramework/Notifications/EventNotificationWidget.h
+    Source/CommonFramework/Notifications/MessageAttachment.cpp
+    Source/CommonFramework/Notifications/MessageAttachment.h
+    Source/CommonFramework/Notifications/ProgramInfo.h
+    Source/CommonFramework/Notifications/ProgramNotifications.cpp
+    Source/CommonFramework/Notifications/ProgramNotifications.h
+    Source/CommonFramework/Notifications/SenderNotificationTable.cpp
+    Source/CommonFramework/Notifications/SenderNotificationTable.h
+    Source/CommonFramework/Options/BoxOption.cpp
+    Source/CommonFramework/Options/BoxOption.h
+    Source/CommonFramework/Options/DeviceDropdownAliases.cpp
+    Source/CommonFramework/Options/DeviceDropdownAliases.h
+    Source/CommonFramework/Options/Environment/OnnxOptions.h
+    Source/CommonFramework/Options/Environment/SleepSuppressOption.cpp
+    Source/CommonFramework/Options/Environment/SleepSuppressOption.h
+    Source/CommonFramework/Options/Environment/ThemeSelectorOption.cpp
+    Source/CommonFramework/Options/Environment/ThemeSelectorOption.h
+    Source/CommonFramework/Options/LabelCellOption.cpp
+    Source/CommonFramework/Options/LabelCellOption.h
+    Source/CommonFramework/Options/NestedBoxDrawOption.cpp
+    Source/CommonFramework/Options/NestedBoxDrawOption.h
+    Source/CommonFramework/Options/QtWidget/LabelCellWidget.cpp
+    Source/CommonFramework/Options/QtWidget/LabelCellWidget.h
+    Source/CommonFramework/Options/QtWidget/WallpaperWidget.cpp
+    Source/CommonFramework/Options/QtWidget/WallpaperWidget.h
+    Source/CommonFramework/Options/ResolutionOption.cpp
+    Source/CommonFramework/Options/ResolutionOption.h
+    Source/CommonFramework/Options/ScreenshotFormatOption.h
+    Source/CommonFramework/Panels/ConsoleSettingsStretch.h
+    Source/CommonFramework/Panels/PanelDescriptor.cpp
+    Source/CommonFramework/Panels/PanelDescriptor.h
+    Source/CommonFramework/Panels/PanelSession.cpp
+    Source/CommonFramework/Panels/PanelSession.h
+    Source/CommonFramework/Panels/PanelList.cpp
+    Source/CommonFramework/Panels/PanelList.h
+    Source/CommonFramework/Panels/PanelTools.h
+    Source/CommonFramework/Panels/ProgramDescriptor.cpp
+    Source/CommonFramework/Panels/ProgramDescriptor.h
+    Source/CommonFramework/Panels/OptionsPanel.cpp
+    Source/CommonFramework/Panels/OptionsPanel.h
+    Source/CommonFramework/Panels/OptionsPanelSession.cpp
+    Source/CommonFramework/Panels/OptionsPanelSession.h
+    Source/CommonFramework/Panels/UI/OptionsPanelWidget.cpp
+    Source/CommonFramework/Panels/UI/OptionsPanelWidget.h
+    Source/CommonFramework/Panels/UI/PanelElements.cpp
+    Source/CommonFramework/Panels/UI/PanelElements.h
+    Source/CommonFramework/Panels/UI/PanelListWidget.cpp
+    Source/CommonFramework/Panels/UI/PanelListWidget.h
+    Source/CommonFramework/Panels/UI/PanelWidget.cpp
+    Source/CommonFramework/Panels/UI/PanelWidget.h
+    Source/CommonFramework/PersistentSettings.cpp
+    Source/CommonFramework/PersistentSettings.h
+    Source/CommonFramework/ProgramSession.cpp
+    Source/CommonFramework/ProgramSession.h
+    Source/CommonFramework/ProgramStats/StatsDatabase.cpp
+    Source/CommonFramework/ProgramStats/StatsDatabase.h
+    Source/CommonFramework/ProgramStats/StatsTracking.cpp
+    Source/CommonFramework/ProgramStats/StatsTracking.h
+    Source/CommonFramework/Recording/StreamHistoryOption.cpp
+    Source/CommonFramework/Recording/StreamHistoryOption.h
+    Source/CommonFramework/Recording/StreamHistorySession.cpp
+    Source/CommonFramework/Recording/StreamHistorySession.h
+    Source/CommonFramework/Recording/StreamHistoryTracker_Null.h
+    Source/CommonFramework/Recording/StreamHistoryTracker_ParallelStreams.h
+    Source/CommonFramework/Recording/StreamHistoryTracker_RecordOnTheFly.h
+    Source/CommonFramework/Recording/StreamHistoryTracker_SaveFrames.cpp
+    Source/CommonFramework/Recording/StreamHistoryTracker_SaveFrames.h
+    Source/CommonFramework/Recording/StreamRecorder.cpp
+    Source/CommonFramework/Recording/StreamRecorder.h
+    Source/CommonFramework/ResourceDownload/DownloadThread.cpp
+    Source/CommonFramework/ResourceDownload/DownloadThread.h
+    Source/CommonFramework/ResourceDownload/GlobalResourceDownloadManager.cpp
+    Source/CommonFramework/ResourceDownload/GlobalResourceDownloadManager.h
+    Source/CommonFramework/ResourceDownload/ProgramMissingResourceTracker.cpp
+    Source/CommonFramework/ResourceDownload/ProgramMissingResourceTracker.h
+    Source/CommonFramework/ResourceDownload/ProgramResourceDownloadWidget.cpp
+    Source/CommonFramework/ResourceDownload/ProgramResourceDownloadWidget.h
+    Source/CommonFramework/ResourceDownload/ResourceDownload.cpp
+    Source/CommonFramework/ResourceDownload/ResourceDownload.h
+    Source/CommonFramework/ResourceDownload/ResourceDownloadHelpers.cpp
+    Source/CommonFramework/ResourceDownload/ResourceDownloadHelpers.h
+    Source/CommonFramework/ResourceDownload/SettingsResourceDownloadOptions.cpp
+    Source/CommonFramework/ResourceDownload/SettingsResourceDownloadOptions.h
+    Source/CommonFramework/ResourceDownload/SettingsResourceDownloadRow.cpp
+    Source/CommonFramework/ResourceDownload/SettingsResourceDownloadRow.h
+    Source/CommonFramework/ResourceDownload/SettingsResourceDownloadTable.cpp
+    Source/CommonFramework/ResourceDownload/SettingsResourceDownloadTable.h
+    Source/CommonFramework/ResourceDownload/SettingsResourceDownloadWidget.cpp
+    Source/CommonFramework/ResourceDownload/SettingsResourceDownloadWidget.h
+    Source/CommonFramework/Startup/NewVersionCheck.cpp
+    Source/CommonFramework/Startup/NewVersionCheck.h
+    Source/CommonFramework/Startup/SetupSettings.cpp
+    Source/CommonFramework/Startup/SetupSettings.h
+    Source/CommonFramework/Tools/DebugDumper.cpp
+    Source/CommonFramework/Tools/DebugDumper.h
+    Source/CommonFramework/Tools/ErrorDumper.cpp
+    Source/CommonFramework/Tools/ErrorDumper.h
+    Source/CommonFramework/Tools/FileDownloader.cpp
+    Source/CommonFramework/Tools/FileDownloader.h
+    Source/CommonFramework/Tools/ProgramEnvironment.cpp
+    Source/CommonFramework/Tools/ProgramEnvironment.h
+    Source/CommonFramework/Tools/VideoStream.cpp
+    Source/CommonFramework/Tools/VideoStream.h
+    Source/CommonFramework/VideoPipeline/Backends/CameraImplementations.cpp
+    Source/CommonFramework/VideoPipeline/Backends/CameraImplementations.h
+    Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt6.5.cpp
+    Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt6.5.h
+    Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt6.cpp
+    Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt6.h
+    Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt6_QQuickView.cpp
+    Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt6_QQuickView.h
+    Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt6_QQuickWidget.cpp
+    Source/CommonFramework/VideoPipeline/Backends/CameraWidgetQt6_QQuickWidget.h
+    Source/CommonFramework/VideoPipeline/Backends/MediaServicesQt6.cpp
+    Source/CommonFramework/VideoPipeline/Backends/MediaServicesQt6.h
+    Source/CommonFramework/VideoPipeline/Backends/QCameraThread.h
+    Source/CommonFramework/VideoPipeline/Backends/QFormatAggregator.cpp
+    Source/CommonFramework/VideoPipeline/Backends/QFormatAggregator.h
+    Source/CommonFramework/VideoPipeline/Backends/QVideoFrameCache.h
+    Source/CommonFramework/VideoPipeline/Backends/SnapshotManager.cpp
+    Source/CommonFramework/VideoPipeline/Backends/SnapshotManager.h
+    Source/CommonFramework/VideoPipeline/Backends/VideoFrameQt.cpp
+    Source/CommonFramework/VideoPipeline/Backends/VideoFrameQt.h
+    Source/CommonFramework/VideoPipeline/CameraInfo.cpp
+    Source/CommonFramework/VideoPipeline/CameraInfo.h
+    Source/CommonFramework/VideoPipeline/Stats/CpuUtilizationStats.cpp
+    Source/CommonFramework/VideoPipeline/Stats/CpuUtilizationStats.h
+    Source/CommonFramework/VideoPipeline/Stats/MemoryUtilizationStats.cpp
+    Source/CommonFramework/VideoPipeline/Stats/MemoryUtilizationStats.h
+    Source/CommonFramework/VideoPipeline/Stats/ThreadUtilizationStats.cpp
+    Source/CommonFramework/VideoPipeline/Stats/ThreadUtilizationStats.h
+    Source/CommonFramework/VideoPipeline/UI/VideoDisplayWidget.cpp
+    Source/CommonFramework/VideoPipeline/UI/VideoDisplayWidget.h
+    Source/CommonFramework/VideoPipeline/UI/VideoDisplayWindow.cpp
+    Source/CommonFramework/VideoPipeline/UI/VideoDisplayWindow.h
+    Source/CommonFramework/VideoPipeline/UI/VideoOverlayWidget.cpp
+    Source/CommonFramework/VideoPipeline/UI/VideoOverlayWidget.h
+    Source/CommonFramework/VideoPipeline/UI/VideoSourceSelectorWidget.cpp
+    Source/CommonFramework/VideoPipeline/UI/VideoSourceSelectorWidget.h
+    Source/CommonFramework/VideoPipeline/VideoFeed.h
+    Source/CommonFramework/VideoPipeline/VideoFormats.cpp
+    Source/CommonFramework/VideoPipeline/VideoFormats.h
+    Source/CommonFramework/VideoPipeline/VideoOverlay.cpp
+    Source/CommonFramework/VideoPipeline/VideoOverlay.h
+    Source/CommonFramework/VideoPipeline/VideoOverlayOption.cpp
+    Source/CommonFramework/VideoPipeline/VideoOverlayOption.h
+    Source/CommonFramework/VideoPipeline/VideoOverlayScopes.h
+    Source/CommonFramework/VideoPipeline/VideoOverlaySession.cpp
+    Source/CommonFramework/VideoPipeline/VideoOverlaySession.h
+    Source/CommonFramework/VideoPipeline/VideoOverlayTypes.cpp
+    Source/CommonFramework/VideoPipeline/VideoOverlayTypes.h
+    Source/CommonFramework/VideoPipeline/VideoPipelineOptions.h
+    Source/CommonFramework/VideoPipeline/VideoSession.cpp
+    Source/CommonFramework/VideoPipeline/VideoSession.h
+    Source/CommonFramework/VideoPipeline/VideoSource.cpp
+    Source/CommonFramework/VideoPipeline/VideoSource.h
+    Source/CommonFramework/VideoPipeline/VideoSourceDescriptor.h
+    Source/CommonFramework/VideoPipeline/VideoSourceOption.cpp
+    Source/CommonFramework/VideoPipeline/VideoSourceOption.h
+    Source/CommonFramework/VideoPipeline/Sources/VideoSource_Camera.cpp
+    Source/CommonFramework/VideoPipeline/Sources/VideoSource_Camera.h
+    Source/CommonFramework/VideoPipeline/Sources/VideoSource_Null.cpp
+    Source/CommonFramework/VideoPipeline/Sources/VideoSource_Null.h
+    Source/CommonFramework/VideoPipeline/Sources/VideoSource_StillImage.cpp
+    Source/CommonFramework/VideoPipeline/Sources/VideoSource_StillImage.h
+    Source/CommonFramework/Windows/ButtonDiagram.cpp
+    Source/CommonFramework/Windows/ButtonDiagram.h
+    Source/CommonFramework/Windows/DpiScaler.cpp
+    Source/CommonFramework/Windows/DpiScaler.h
+    Source/CommonFramework/Windows/MainWindow.cpp
+    Source/CommonFramework/Windows/MainWindow.h
+    Source/CommonFramework/Windows/WindowTracker.cpp
+    Source/CommonFramework/Windows/WindowTracker.h
+    Source/CommonTools/Async/InferenceRoutines.cpp
+    Source/CommonTools/Async/InferenceRoutines.h
+    Source/CommonTools/Async/InferenceSession.cpp
+    Source/CommonTools/Async/InferenceSession.h
+    Source/CommonTools/Async/SuperControlSession.cpp
+    Source/CommonTools/Async/SuperControlSession.h
+    Source/CommonTools/Async/SuperControlSession.tpp
+    Source/CommonTools/Audio/AudioPerSpectrumDetectorBase.cpp
+    Source/CommonTools/Audio/AudioPerSpectrumDetectorBase.h
+    Source/CommonTools/Audio/AudioTemplateCache.cpp
+    Source/CommonTools/Audio/AudioTemplateCache.h
+    Source/CommonTools/Audio/SpectrogramMatcher.cpp
+    Source/CommonTools/Audio/SpectrogramMatcher.h
+    Source/CommonTools/DetectedBoxes.cpp
+    Source/CommonTools/DetectedBoxes.h
+    Source/CommonTools/DetectionDebouncer.h
+    Source/CommonTools/FailureWatchdog.h
+    Source/CommonTools/ImageMatch/CroppedImageDictionaryMatcher.cpp
+    Source/CommonTools/ImageMatch/CroppedImageDictionaryMatcher.h
+    Source/CommonTools/ImageMatch/ExactImageDictionaryMatcher.cpp
+    Source/CommonTools/ImageMatch/ExactImageDictionaryMatcher.h
+    Source/CommonTools/ImageMatch/ExactImageMatcher.cpp
+    Source/CommonTools/ImageMatch/ExactImageMatcher.h
+    Source/CommonTools/ImageMatch/FilterToAlpha.cpp
+    Source/CommonTools/ImageMatch/FilterToAlpha.h
+    Source/CommonTools/ImageMatch/ImageCropper.cpp
+    Source/CommonTools/ImageMatch/ImageCropper.h
+    Source/CommonTools/ImageMatch/ImageMatchOption.cpp
+    Source/CommonTools/ImageMatch/ImageMatchOption.h
+    Source/CommonTools/ImageMatch/ImageMatchResult.cpp
+    Source/CommonTools/ImageMatch/ImageMatchResult.h
+    Source/CommonTools/ImageMatch/SilhouetteDictionaryMatcher.cpp
+    Source/CommonTools/ImageMatch/SilhouetteDictionaryMatcher.h
+    Source/CommonTools/ImageMatch/SubObjectTemplateMatcher.cpp
+    Source/CommonTools/ImageMatch/SubObjectTemplateMatcher.h
+    Source/CommonTools/ImageMatch/WaterfillTemplateMatcher.cpp
+    Source/CommonTools/ImageMatch/WaterfillTemplateMatcher.h
+    Source/CommonTools/Images/BinaryImage_FilterRgb32.cpp
+    Source/CommonTools/Images/BinaryImage_FilterRgb32.h
+    Source/CommonTools/Images/ColorClustering.cpp
+    Source/CommonTools/Images/ColorClustering.h
+    Source/CommonTools/Images/DistanceToLine.h
+    Source/CommonTools/Images/ImageFilter.cpp
+    Source/CommonTools/Images/ImageFilter.h
+    Source/CommonTools/Images/ImageGradient.cpp
+    Source/CommonTools/Images/ImageGradient.h
+    Source/CommonTools/Images/ImageManip.cpp
+    Source/CommonTools/Images/ImageManip.h
+    Source/CommonTools/Images/ImageTools.cpp
+    Source/CommonTools/Images/ImageTools.h
+    Source/CommonTools/Images/SolidColorTest.cpp
+    Source/CommonTools/Images/SolidColorTest.h
+    Source/CommonTools/Images/WaterfillUtilities.cpp
+    Source/CommonTools/Images/WaterfillUtilities.h
+    Source/CommonTools/InferenceCallbacks/AudioInferenceCallback.h
+    Source/CommonTools/InferenceCallbacks/VisualInferenceCallback.cpp
+    Source/CommonTools/InferenceCallbacks/VisualInferenceCallback.h
+    Source/CommonTools/InferencePivots/AudioInferencePivot.cpp
+    Source/CommonTools/InferencePivots/AudioInferencePivot.h
+    Source/CommonTools/InferencePivots/VisualInferencePivot.cpp
+    Source/CommonTools/InferencePivots/VisualInferencePivot.h
+    Source/CommonTools/InferenceThrottler.h
+    Source/CommonTools/MultiConsoleErrors.cpp
+    Source/CommonTools/MultiConsoleErrors.h
+    Source/CommonTools/OCR/OCR_DictionaryMatcher.cpp
+    Source/CommonTools/OCR/OCR_DictionaryMatcher.h
+    Source/CommonTools/OCR/OCR_DictionaryOCR.cpp
+    Source/CommonTools/OCR/OCR_DictionaryOCR.h
+    Source/CommonTools/OCR/OCR_LargeDictionaryMatcher.cpp
+    Source/CommonTools/OCR/OCR_LargeDictionaryMatcher.h
+    Source/CommonTools/OCR/OCR_NumberReader.cpp
+    Source/CommonTools/OCR/OCR_NumberReader.h
+    Source/CommonTools/OCR/OCR_PaddleOCR.cpp
+    Source/CommonTools/OCR/OCR_PaddleOCR.h
+    Source/CommonTools/OCR/OCR_RawTesseractOCR.cpp
+    Source/CommonTools/OCR/OCR_RawTesseractOCR.h
+    Source/CommonTools/OCR/OCR_Routines.cpp
+    Source/CommonTools/OCR/OCR_Routines.h
+    Source/CommonTools/OCR/OCR_SmallDictionaryMatcher.cpp
+    Source/CommonTools/OCR/OCR_SmallDictionaryMatcher.h
+    Source/CommonTools/OCR/OCR_StringMatchResult.cpp
+    Source/CommonTools/OCR/OCR_StringMatchResult.h
+    Source/CommonTools/OCR/OCR_StringNormalization.cpp
+    Source/CommonTools/OCR/OCR_StringNormalization.h
+    Source/CommonTools/OCR/OCR_Tests.cpp
+    Source/CommonTools/OCR/OCR_Tests.h
+    Source/CommonTools/OCR/OCR_TextMatcher.cpp
+    Source/CommonTools/OCR/OCR_TextMatcher.h
+    Source/CommonTools/OCR/OCR_TrainingTools.cpp
+    Source/CommonTools/OCR/OCR_TrainingTools.h
+    Source/CommonTools/Options/LanguageOCROption.cpp
+    Source/CommonTools/Options/LanguageOCROption.h
+    Source/CommonTools/Options/QtWidgets/LanguageOCRWidget.cpp
+    Source/CommonTools/Options/QtWidgets/LanguageOCRWidget.h
+    Source/CommonTools/Options/QtWidgets/ScreenWatchWidget.cpp
+    Source/CommonTools/Options/QtWidgets/ScreenWatchWidget.h
+    Source/CommonTools/Options/QtWidgets/StringSelectWidget.cpp
+    Source/CommonTools/Options/QtWidgets/StringSelectWidget.h
+    Source/CommonTools/Options/ScreenWatchOption.cpp
+    Source/CommonTools/Options/ScreenWatchOption.h
+    Source/CommonTools/Options/StringSelectTableOption.h
+    Source/CommonTools/Options/TrainOCRModeOption.h
+    Source/CommonTools/Resources/SpriteDatabase.cpp
+    Source/CommonTools/Resources/SpriteDatabase.h
+    Source/CommonTools/StartupChecks/StartProgramChecks.cpp
+    Source/CommonTools/StartupChecks/StartProgramChecks.h
+    Source/CommonTools/StartupChecks/VideoResolutionCheck.cpp
+    Source/CommonTools/StartupChecks/VideoResolutionCheck.h
+    Source/CommonTools/TrendInference/AnomalyDetector.cpp
+    Source/CommonTools/TrendInference/AnomalyDetector.h
+    Source/CommonTools/TrendInference/TimeWindowStatTracker.h
+    Source/CommonTools/VisualDetector.h
+    Source/CommonTools/VisualDetectors/BlackBorderDetector.cpp
+    Source/CommonTools/VisualDetectors/BlackBorderDetector.h
+    Source/CommonTools/VisualDetectors/BlackScreenDetector.cpp
+    Source/CommonTools/VisualDetectors/BlackScreenDetector.h
+    Source/CommonTools/VisualDetectors/FrozenImageDetector.cpp
+    Source/CommonTools/VisualDetectors/FrozenImageDetector.h
+    Source/CommonTools/VisualDetectors/ImageMatchDetector.cpp
+    Source/CommonTools/VisualDetectors/ImageMatchDetector.h
+    Source/ComputerPrograms/ComputerProgram.cpp
+    Source/ComputerPrograms/ComputerProgram.h
+    Source/ComputerPrograms/ComputerPrograms_UnitTestRunner.cpp
+    Source/ComputerPrograms/ComputerPrograms_UnitTestRunner.h
+    Source/ComputerPrograms/Framework/ComputerProgramSession.cpp
+    Source/ComputerPrograms/Framework/ComputerProgramSession.h
+    Source/ComputerPrograms/Framework/ComputerProgramWidget.cpp
+    Source/ComputerPrograms/Framework/ComputerProgramWidget.h
+    Source/ControllerInput/Keyboard/GlobalKeyboardHidTracker.cpp
+    Source/ControllerInput/Keyboard/GlobalKeyboardHidTracker.h
+    Source/ControllerInput/Keyboard/GlobalQtKeyMap.cpp
+    Source/ControllerInput/Keyboard/GlobalQtKeyMap.h
+    Source/ControllerInput/Keyboard/KeyBindingWidget.cpp
+    Source/ControllerInput/Keyboard/KeyBindingWidget.h
+    Source/ControllerInput/Keyboard/KeyboardInput_KeyMappings.cpp
+    Source/ControllerInput/Keyboard/KeyboardInput_KeyMappings.h
+    Source/ControllerInput/Keyboard/KeyboardInput_KeyMappings_AZERTY.cpp
+    Source/ControllerInput/Keyboard/KeyboardInput_KeyMappings_QWERTY.cpp
+    Source/ControllerInput/Keyboard/KeyboardInput_StateTracker.cpp
+    Source/ControllerInput/Keyboard/KeyboardInput_StateTracker.h
+    Source/Controllers/ControllerSelectorWidget.cpp
+    Source/Controllers/ControllerSelectorWidget.h
+    Source/Controllers/ControllerSettings.h
+    Source/Controllers/ControllerStateTable.cpp
+    Source/Controllers/ControllerStateTable.h
+    Source/Controllers/NullControllerWidget.cpp
+    Source/Controllers/NullControllerWidget.h
+    Source/Controllers/PABotBase2/SerialPABotBase2_SelectorWidget.cpp
+    Source/Controllers/PABotBase2/SerialPABotBase2_SelectorWidget.h
+    Source/Controllers/PABotBase2/SerialPABotBase_StatusThread.h
+    Source/Controllers/SerialPort/SerialPortPollerQt.cpp
+    Source/Controllers/SerialPort/SerialPortPollerQt.h
+    Source/Integrations/DiscordIntegrationSettings.cpp
+    Source/Integrations/DiscordIntegrationSettings.h
+    Source/Integrations/DiscordIntegrationTable.cpp
+    Source/Integrations/DiscordIntegrationTable.h
+    Source/Integrations/DiscordSettingsOption.cpp
+    Source/Integrations/DiscordSettingsOption.h
+    Source/Integrations/DiscordSocial/DiscordSocial.cpp
+    Source/Integrations/DiscordSocial/DiscordSocial.h
+    Source/Integrations/DiscordWebhook.cpp
+    Source/Integrations/DiscordWebhook.h
+    Source/Integrations/DiscordWebhookSettings.cpp
+    Source/Integrations/DiscordWebhookSettings.h
+    Source/Integrations/DppIntegration/DppClient.cpp
+    Source/Integrations/DppIntegration/DppClient.h
+    Source/Integrations/DppIntegration/DppCommandHandler.cpp
+    Source/Integrations/DppIntegration/DppCommandHandler.h
+    Source/Integrations/DppIntegration/DppUtility.cpp
+    Source/Integrations/DppIntegration/DppUtility.h
+    Source/Integrations/IntegrationsAPI.cpp
+    Source/Integrations/IntegrationsAPI.h
+    Source/Integrations/ProgramTracker.cpp
+    Source/Integrations/ProgramTracker.h
+    Source/GameConsole/ConsoleHandle.cpp
+    Source/GameConsole/ConsoleHandle.h
+    Source/GameConsole/ConsolePanel.cpp
+    Source/GameConsole/ConsolePanel.h
+    Source/GameConsole/ConsoleProgram.cpp
+    Source/GameConsole/ConsoleProgram.h
+    Source/GameConsole/Framework/ConsolePanelSession.cpp
+    Source/GameConsole/Framework/ConsolePanelSession.h
+    Source/GameConsole/Framework/ConsoleProgramSession.cpp
+    Source/GameConsole/Framework/ConsoleProgramSession.h
+    Source/GameConsole/Framework/ConsoleSystemOption.cpp
+    Source/GameConsole/Framework/ConsoleSystemOption.h
+    Source/GameConsole/Framework/ConsoleSystemSession.cpp
+    Source/GameConsole/Framework/ConsoleSystemSession.h
+    Source/GameConsole/Framework/MultiConsolePanelSession.cpp
+    Source/GameConsole/Framework/MultiConsolePanelSession.h
+    Source/GameConsole/Framework/MultiConsoleProgramSession.cpp
+    Source/GameConsole/Framework/MultiConsoleProgramSession.h
+    Source/GameConsole/Framework/MultiConsoleSystemOption.cpp
+    Source/GameConsole/Framework/MultiConsoleSystemOption.h
+    Source/GameConsole/Framework/MultiConsoleSystemSession.cpp
+    Source/GameConsole/Framework/MultiConsoleSystemSession.h
+    Source/GameConsole/MultiConsolePanel.cpp
+    Source/GameConsole/MultiConsolePanel.h
+    Source/GameConsole/MultiConsoleProgram.cpp
+    Source/GameConsole/MultiConsoleProgram.h
+    Source/GameConsole/Panels/GameConsole_BoxDraw.cpp
+    Source/GameConsole/Panels/GameConsole_BoxDraw.h
+    Source/GameConsole/Panels/GameConsole_MultiConsoleViewer.h
+    Source/GameConsole/Panels/GameConsole_SnapshotDumper.cpp
+    Source/GameConsole/Panels/GameConsole_SnapshotDumper.h
+    Source/GameConsole/Panels/GameConsole_VirtualConsole.h
+    Source/GameConsole/Panels/GameConsole_WaterfillTemplateMaker.cpp
+    Source/GameConsole/Panels/GameConsole_WaterfillTemplateMaker.h
+    Source/GameConsole/UI/CommandRowWidget.cpp
+    Source/GameConsole/UI/CommandRowWidget.h
+    Source/GameConsole/UI/ConsolePanelWidget.cpp
+    Source/GameConsole/UI/ConsolePanelWidget.h
+    Source/GameConsole/UI/ConsoleProgramWidget.cpp
+    Source/GameConsole/UI/ConsoleProgramWidget.h
+    Source/GameConsole/UI/ConsoleSystemWidget.cpp
+    Source/GameConsole/UI/ConsoleSystemWidget.h
+    Source/GameConsole/UI/MultiConsolePanelWidget.cpp
+    Source/GameConsole/UI/MultiConsolePanelWidget.h
+    Source/GameConsole/UI/MultiConsoleProgramWidget.cpp
+    Source/GameConsole/UI/MultiConsoleProgramWidget.h
+    Source/GameConsole/UI/MultiConsoleSystemWidget.cpp
+    Source/GameConsole/UI/MultiConsoleSystemWidget.h
+    Source/Kernels/AbsFFT/Kernels_AbsFFT.cpp
+    Source/Kernels/AbsFFT/Kernels_AbsFFT.h
+    Source/Kernels/AbsFFT/Kernels_AbsFFT_Arch.h
+    Source/Kernels/AbsFFT/Kernels_AbsFFT_Arch_arm64_NEON.h
+    Source/Kernels/AbsFFT/Kernels_AbsFFT_Arch_Default.h
+    Source/Kernels/AbsFFT/Kernels_AbsFFT_Arch_x86_AVX2.h
+    Source/Kernels/AbsFFT/Kernels_AbsFFT_Arch_x86_AVX512.h
+    Source/Kernels/AbsFFT/Kernels_AbsFFT_Arch_x86_SSE41.h
+    Source/Kernels/AbsFFT/Kernels_AbsFFT_BaseTransform_arm64_NEON.h
+    Source/Kernels/AbsFFT/Kernels_AbsFFT_BaseTransform_x86_AVX2.h
+    Source/Kernels/AbsFFT/Kernels_AbsFFT_BaseTransform_x86_AVX512.h
+    Source/Kernels/AbsFFT/Kernels_AbsFFT_BaseTransform_x86_SSE41.h
+    Source/Kernels/AbsFFT/Kernels_AbsFFT_BitReverse.h
+    Source/Kernels/AbsFFT/Kernels_AbsFFT_Butterflies.h
+    Source/Kernels/AbsFFT/Kernels_AbsFFT_ComplexScalar.h
+    Source/Kernels/AbsFFT/Kernels_AbsFFT_ComplexToAbs.h
+    Source/Kernels/AbsFFT/Kernels_AbsFFT_ComplexVector.h
+    Source/Kernels/AbsFFT/Kernels_AbsFFT_Core_arm64_NEON.cpp
+    Source/Kernels/AbsFFT/Kernels_AbsFFT_Core_Default.cpp
+    Source/Kernels/AbsFFT/Kernels_AbsFFT_Core_x86_AVX2.cpp
+    Source/Kernels/AbsFFT/Kernels_AbsFFT_Core_x86_AVX512.cpp
+    Source/Kernels/AbsFFT/Kernels_AbsFFT_Core_x86_SSE41.cpp
+    Source/Kernels/AbsFFT/Kernels_AbsFFT_FullTransform.h
+    Source/Kernels/AbsFFT/Kernels_AbsFFT_FullTransform.tpp
+    Source/Kernels/AbsFFT/Kernels_AbsFFT_Reductions.h
+    Source/Kernels/AbsFFT/Kernels_AbsFFT_TestInfra.cpp
+    Source/Kernels/AbsFFT/Kernels_AbsFFT_TestInfra.h
+    Source/Kernels/AbsFFT/Kernels_AbsFFT_TwiddleTable.h
+    Source/Kernels/AbsFFT/Kernels_AbsFFT_TwiddleTable.tpp
+    Source/Kernels/Algorithm/Kernels_Algorithm_DisjointSet.cpp
+    Source/Kernels/Algorithm/Kernels_Algorithm_DisjointSet.h
+    Source/Kernels/AudioChannelInterleave/Kernels_AudioChannelInterleave.cpp
+    Source/Kernels/AudioChannelInterleave/Kernels_AudioChannelInterleave.h
+    Source/Kernels/AudioChannelInterleave/Kernels_AudioChannelInterleave_ARM64_NEON.cpp
+    Source/Kernels/AudioChannelInterleave/Kernels_AudioChannelInterleave_TestInfra.cpp
+    Source/Kernels/AudioChannelInterleave/Kernels_AudioChannelInterleave_TestInfra.h
+    Source/Kernels/AudioChannelInterleave/Kernels_AudioChannelInterleave_Default.cpp
+    Source/Kernels/AudioChannelInterleave/Kernels_AudioChannelInterleave_Default.h
+    Source/Kernels/AudioChannelInterleave/Kernels_AudioChannelInterleave_x64_AVX2.cpp
+    Source/Kernels/AudioChannelInterleave/Kernels_AudioChannelInterleave_x64_AVX512.cpp
+    Source/Kernels/AudioChannelInterleave/Kernels_AudioChannelInterleave_x64_SSE.cpp
+    Source/Kernels/AudioChannelMixer/Kernels_AudioChannelMixer.cpp
+    Source/Kernels/AudioChannelMixer/Kernels_AudioChannelMixer.h
+    Source/Kernels/AudioChannelMixer/Kernels_AudioChannelMixer_ARM64_NEON.cpp
+    Source/Kernels/AudioChannelMixer/Kernels_AudioChannelMixer_Default.cpp
+    Source/Kernels/AudioChannelMixer/Kernels_AudioChannelMixer_Default.h
+    Source/Kernels/AudioChannelMixer/Kernels_AudioChannelMixer_TestInfra.cpp
+    Source/Kernels/AudioChannelMixer/Kernels_AudioChannelMixer_TestInfra.h
+    Source/Kernels/AudioChannelMixer/Kernels_AudioChannelMixer_x64_AVX512.cpp
+    Source/Kernels/AudioChannelMixer/Kernels_AudioChannelMixer_x64_FMA3.cpp
+    Source/Kernels/AudioChannelMixer/Kernels_AudioChannelMixer_x64_SSE.cpp
+    Source/Kernels/AudioPipeline/Kernels_AudioPipeline.h
+    Source/Kernels/AudioPipeline/Kernels_AudioPipeline_RoundTrip_TestInfra.cpp
+    Source/Kernels/AudioPipeline/Kernels_AudioPipeline_RoundTrip_TestInfra.h
+    Source/Kernels/AudioPipeline/Kernels_AudioPipeline_Tests.cpp
+    Source/Kernels/AudioPipeline/Kernels_ChannelMixer.cpp
+    Source/Kernels/AudioPipeline/Kernels_ChannelMixer.h
+    Source/Kernels/AudioPipeline/Kernels_ChannelMixer_TestInfra.cpp
+    Source/Kernels/AudioPipeline/Kernels_ChannelMixer_TestInfra.h
+    Source/Kernels/AudioPipeline/Kernels_RawAudio2WorkingAudio.cpp
+    Source/Kernels/AudioPipeline/Kernels_RawAudio2WorkingAudio.h
+    Source/Kernels/AudioPipeline/Kernels_WorkingAudio2RawAudio.cpp
+    Source/Kernels/AudioPipeline/Kernels_WorkingAudio2RawAudio.h
+    Source/Kernels/AudioPipeline/Kernels_WorkingAudio2WorkingAudio.cpp
+    Source/Kernels/AudioPipeline/Kernels_WorkingAudio2WorkingAudio.h
+    Source/Kernels/AudioResampler/Kernels_AudioResampler.cpp
+    Source/Kernels/AudioResampler/Kernels_AudioResampler.h
+    Source/Kernels/AudioResampler/Kernels_AudioResampler_BlockKernel_Default.cpp
+    Source/Kernels/AudioResampler/Kernels_AudioResampler_BlockKernel_ARM64_NEON.cpp
+    Source/Kernels/AudioResampler/Kernels_AudioResampler_BlockKernel_x64_SSE2.cpp
+    Source/Kernels/AudioResampler/Kernels_AudioResampler_BlockKernel_x64_FMA3.cpp
+    Source/Kernels/AudioResampler/Kernels_AudioResampler_BlockKernel_x64_AVX512.cpp
+    Source/Kernels/AudioResampler/Kernels_AudioResampler_BlockKernels.cpp
+    Source/Kernels/AudioResampler/Kernels_AudioResampler_BlockKernels.h
+    Source/Kernels/AudioResampler/Kernels_AudioResampler_Tests.cpp
+    Source/Kernels/AudioResampler/Kernels_AudioResampler_Tests.h
+    Source/Kernels/AudioResampler/Kernels_AudioResampler_WeightTable.cpp
+    Source/Kernels/AudioResampler/Kernels_AudioResampler_WeightTable.h
+    Source/Kernels/AudioStreamConverter/Kernels_AudioStreamConverter.cpp
+    Source/Kernels/AudioStreamConverter/Kernels_AudioStreamConverter.h
+    Source/Kernels/AudioStreamConverter/Kernels_AudioStreamConverter_Kernels_ARM64_NEON.cpp
+    Source/Kernels/AudioStreamConverter/Kernels_AudioStreamConverter_Kernels_Default.cpp
+    Source/Kernels/AudioStreamConverter/Kernels_AudioStreamConverter_Kernels_Default.h
+    Source/Kernels/AudioStreamConverter/Kernels_AudioStreamConverter_Kernels_x64_SSE41.cpp
+    Source/Kernels/AudioStreamConverter/Kernels_AudioStreamConverter_Kernels_x64_AVX2.cpp
+    Source/Kernels/AudioStreamConverter/Kernels_AudioStreamConverter_Kernels_x64_AVX512.cpp
+    Source/Kernels/AudioStreamConverter/Kernels_AudioStreamConverter_TestInfra.cpp
+    Source/Kernels/AudioStreamConverter/Kernels_AudioStreamConverter_TestInfra.h
+    Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters.cpp
+    Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters.h
+    Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters_arm64_NEON.h
+    Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters_Core_64x16_x64_AVX2.cpp
+    Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters_Core_64x32_x64_AVX512.cpp
+    Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters_Core_64x4_Default.cpp
+    Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters_Core_64x64_x64_AVX512.cpp
+    Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters_Core_64x8_arm64_NEON.cpp
+    Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters_Core_64x8_x64_SSE42.cpp
+    Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters_Default.h
+    Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters_Routines.h
+    Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters_x64_AVX2.h
+    Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters_x64_AVX512.h
+    Source/Kernels/BinaryImageFilters/Kernels_BinaryImage_BasicFilters_x64_SSE42.h
+    Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix.cpp
+    Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix.h
+    Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Arch_64x16_x64_AVX2.h
+    Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Arch_64x32_x64_AVX512.h
+    Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Arch_64x4_Default.h
+    Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Arch_64x64_x64_AVX512.h
+    Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Arch_64x8_arm64_NEON.h
+    Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Arch_64x8_x64_SSE42.h
+    Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Arch_64xH_Default.h
+    Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Core_64x16_x64_AVX2.cpp
+    Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Core_64x32_x64_AVX512.cpp
+    Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Core_64x64_x64_AVX512.cpp
+    Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Core_64x8_x64_SSE42.cpp
+    Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Core_64xH_Default.cpp
+    Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Core_arm64_NEON.cpp
+    Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_t.h
+    Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Tests.cpp
+    Source/Kernels/BinaryMatrix/Kernels_BinaryMatrix_Tests.h
+    Source/Kernels/BinaryMatrix/Kernels_BinaryMatrixTile_64x16_x64_AVX2.h
+    Source/Kernels/BinaryMatrix/Kernels_BinaryMatrixTile_64x32_x64_AVX512.h
+    Source/Kernels/BinaryMatrix/Kernels_BinaryMatrixTile_64x4_Default.h
+    Source/Kernels/BinaryMatrix/Kernels_BinaryMatrixTile_64x64_x64_AVX512.h
+    Source/Kernels/BinaryMatrix/Kernels_BinaryMatrixTile_64x8_arm64_NEON.h
+    Source/Kernels/BinaryMatrix/Kernels_BinaryMatrixTile_64x8_x64_SSE42.h
+    Source/Kernels/BinaryMatrix/Kernels_BinaryMatrixTile_64xH_Default.h
+    Source/Kernels/BinaryMatrix/Kernels_BinaryMatrixTile_Debugging.h
+    Source/Kernels/BinaryMatrix/Kernels_PackedBinaryMatrix.h
+    Source/Kernels/BinaryMatrix/Kernels_PackedBinaryMatrixCore.h
+    Source/Kernels/BinaryMatrix/Kernels_PackedBinaryMatrixCore.tpp
+    Source/Kernels/BinaryMatrix/Kernels_SparseBinaryMatrixCore.h
+    Source/Kernels/BinaryMatrix/Kernels_SparseBinaryMatrixCore.tpp
+    Source/Kernels/ImageFilters/Kernels_ImageFilter_Basic_Routines.h
+    Source/Kernels/ImageFilters/Kernels_ImageFilter_Basic_Routines_ARM64_NEON.h
+    Source/Kernels/ImageFilters/Kernels_ImageFilter_Basic_Routines_Default.h
+    Source/Kernels/ImageFilters/Kernels_ImageFilter_Basic_Routines_x64_AVX2.h
+    Source/Kernels/ImageFilters/Kernels_ImageFilter_Basic_Routines_x64_AVX512.h
+    Source/Kernels/ImageFilters/Kernels_ImageFilter_Basic_Routines_x64_SSE42.h
+    Source/Kernels/ImageFilters/Kernels_ImageFilter_Misc.cpp
+    Source/Kernels/ImageFilters/Kernels_ImageFilter_Misc.h
+    Source/Kernels/ImageFilters/Kernels_ImageFilter_Misc_Default.cpp
+    Source/Kernels/ImageFilters/Kernels_ImageFilter_Tests.cpp
+    Source/Kernels/ImageFilters/Kernels_ImageFilter_Tests.h
+    Source/Kernels/ImageFilters/RGB32_Brightness/Kernels_ImageFilter_RGB32_Brightness.cpp
+    Source/Kernels/ImageFilters/RGB32_Brightness/Kernels_ImageFilter_RGB32_Brightness.h
+    Source/Kernels/ImageFilters/RGB32_Brightness/Kernels_ImageFilter_RGB32_Brightness_Default.cpp
+    Source/Kernels/ImageFilters/RGB32_Brightness/Kernels_ImageFilter_RGB32_Brightness_x64_AVX2.cpp
+    Source/Kernels/ImageFilters/RGB32_Brightness/Kernels_ImageFilter_RGB32_Brightness_x64_AVX512-VNNI.cpp
+    Source/Kernels/ImageFilters/RGB32_Brightness/Kernels_ImageFilter_RGB32_Brightness_x64_SSE42.cpp
+    Source/Kernels/ImageFilters/RGB32_EuclideanDistance/Kernels_ImageFilter_RGB32_Euclidean.cpp
+    Source/Kernels/ImageFilters/RGB32_EuclideanDistance/Kernels_ImageFilter_RGB32_Euclidean.h
+    Source/Kernels/ImageFilters/RGB32_EuclideanDistance/Kernels_ImageFilter_RGB32_Euclidean_ARM64_NEON.cpp
+    Source/Kernels/ImageFilters/RGB32_EuclideanDistance/Kernels_ImageFilter_RGB32_Euclidean_Default.cpp
+    Source/Kernels/ImageFilters/RGB32_EuclideanDistance/Kernels_ImageFilter_RGB32_Euclidean_Tests.cpp
+    Source/Kernels/ImageFilters/RGB32_EuclideanDistance/Kernels_ImageFilter_RGB32_Euclidean_Tests.h
+    Source/Kernels/ImageFilters/RGB32_EuclideanDistance/Kernels_ImageFilter_RGB32_Euclidean_x64_AVX2.cpp
+    Source/Kernels/ImageFilters/RGB32_EuclideanDistance/Kernels_ImageFilter_RGB32_Euclidean_x64_AVX512.cpp
+    Source/Kernels/ImageFilters/RGB32_EuclideanDistance/Kernels_ImageFilter_RGB32_Euclidean_x64_SSE42.cpp
+    Source/Kernels/ImageFilters/RGB32_Range/Kernels_ImageFilter_RGB32_Range.cpp
+    Source/Kernels/ImageFilters/RGB32_Range/Kernels_ImageFilter_RGB32_Range.h
+    Source/Kernels/ImageFilters/RGB32_Range/Kernels_ImageFilter_RGB32_Range_ARM64_NEON.cpp
+    Source/Kernels/ImageFilters/RGB32_Range/Kernels_ImageFilter_RGB32_Range_Default.cpp
+    Source/Kernels/ImageFilters/RGB32_Range/Kernels_ImageFilter_RGB32_Range_x64_AVX2.cpp
+    Source/Kernels/ImageFilters/RGB32_Range/Kernels_ImageFilter_RGB32_Range_x64_AVX512.cpp
+    Source/Kernels/ImageFilters/RGB32_Range/Kernels_ImageFilter_RGB32_Range_x64_SSE42.cpp
+    Source/Kernels/ImageScaleBrightness/Kernels_ImageScaleBrightness.cpp
+    Source/Kernels/ImageScaleBrightness/Kernels_ImageScaleBrightness.h
+    Source/Kernels/ImageScaleBrightness/Kernels_ImageScaleBrightness_arm64_NEON.cpp
+    Source/Kernels/ImageScaleBrightness/Kernels_ImageScaleBrightness_Default.cpp
+    Source/Kernels/ImageScaleBrightness/Kernels_ImageScaleBrightness_Tests.cpp
+    Source/Kernels/ImageScaleBrightness/Kernels_ImageScaleBrightness_Tests.h
+    Source/Kernels/ImageScaleBrightness/Kernels_ImageScaleBrightness_x64_AVX2.cpp
+    Source/Kernels/ImageScaleBrightness/Kernels_ImageScaleBrightness_x64_AVX512.cpp
+    Source/Kernels/ImageScaleBrightness/Kernels_ImageScaleBrightness_x64_SSE41.cpp
+    Source/Kernels/ImageStats/Kernels_ImagePixelSumSqr.cpp
+    Source/Kernels/ImageStats/Kernels_ImagePixelSumSqr.h
+    Source/Kernels/ImageStats/Kernels_ImagePixelSumSqr_arm64_NEON.cpp
+    Source/Kernels/ImageStats/Kernels_ImagePixelSumSqr_Default.cpp
+    Source/Kernels/ImageStats/Kernels_ImagePixelSumSqr_TestInfra.cpp
+    Source/Kernels/ImageStats/Kernels_ImagePixelSumSqr_TestInfra.h
+    Source/Kernels/ImageStats/Kernels_ImagePixelSumSqr_x64_AVX2.cpp
+    Source/Kernels/ImageStats/Kernels_ImagePixelSumSqr_x64_AVX512.cpp
+    Source/Kernels/ImageStats/Kernels_ImagePixelSumSqr_x64_SSE41.cpp
+    Source/Kernels/ImageStats/Kernels_ImagePixelSumSqrDev.cpp
+    Source/Kernels/ImageStats/Kernels_ImagePixelSumSqrDev.h
+    Source/Kernels/ImageStats/Kernels_ImagePixelSumSqrDev_Default.cpp
+    Source/Kernels/ImageStats/Kernels_ImagePixelSumSqrDev_TestInfra.cpp
+    Source/Kernels/ImageStats/Kernels_ImagePixelSumSqrDev_TestInfra.h
+    Source/Kernels/ImageStats/Kernels_ImagePixelSumSqrDev_x64_AVX2.cpp
+    Source/Kernels/ImageStats/Kernels_ImagePixelSumSqrDev_x64_AVX512.cpp
+    Source/Kernels/ImageStats/Kernels_ImagePixelSumSqrDev_x64_SSE41.cpp
+    Source/Kernels/ImageStats/Kernels_ImageStats_Tests.cpp
+    Source/Kernels/ImageStats/Kernels_ImageStats_Tests.h
+    Source/Kernels/KaiserWindow/Kernels_KaiserWindow.cpp
+    Source/Kernels/KaiserWindow/Kernels_KaiserWindow.h
+    Source/Kernels/Kernels_Alignment.h
+    Source/Kernels/Kernels_arm64_NEON.h
+    Source/Kernels/Kernels_BitScan.h
+    Source/Kernels/Kernels_BitSet.h
+    Source/Kernels/Kernels_Tests.cpp
+    Source/Kernels/Kernels_Tests.h
+    Source/Kernels/Kernels_x64_AVX2.h
+    Source/Kernels/Kernels_x64_AVX512.h
+    Source/Kernels/Kernels_x64_SSE41.h
+    Source/Kernels/PartialWordAccess/Kernels_PartialWordAccess_arm64_NEON.h
+    Source/Kernels/PartialWordAccess/Kernels_PartialWordAccess_x64_AVX2.h
+    Source/Kernels/PartialWordAccess/Kernels_PartialWordAccess_x64_SSE41.h
+    Source/Kernels/ScaleInvariantMatrixMatch/Kernels_ScaleInvariantMatrixMatch.cpp
+    Source/Kernels/ScaleInvariantMatrixMatch/Kernels_ScaleInvariantMatrixMatch.h
+    Source/Kernels/ScaleInvariantMatrixMatch/Kernels_ScaleInvariantMatrixMatch_Core_Default.cpp
+    Source/Kernels/ScaleInvariantMatrixMatch/Kernels_ScaleInvariantMatrixMatch_Core_arm64_NEON.cpp
+    Source/Kernels/ScaleInvariantMatrixMatch/Kernels_ScaleInvariantMatrixMatch_Core_x86_AVX2.cpp
+    Source/Kernels/ScaleInvariantMatrixMatch/Kernels_ScaleInvariantMatrixMatch_Core_x86_AVX512.cpp
+    Source/Kernels/ScaleInvariantMatrixMatch/Kernels_ScaleInvariantMatrixMatch_Core_x86_SSE.cpp
+    Source/Kernels/ScaleInvariantMatrixMatch/Kernels_ScaleInvariantMatrixMatch_Routines.h
+    Source/Kernels/ScaleInvariantMatrixMatch/Kernels_ScaleInvariantMatrixMatch_TestInfra.cpp
+    Source/Kernels/ScaleInvariantMatrixMatch/Kernels_ScaleInvariantMatrixMatch_TestInfra.h
+    Source/Kernels/SpikeConvolution/Kernels_SpikeConvolution.cpp
+    Source/Kernels/SpikeConvolution/Kernels_SpikeConvolution.h
+    Source/Kernels/SpikeConvolution/Kernels_SpikeConvolution_Core_Default.cpp
+    Source/Kernels/SpikeConvolution/Kernels_SpikeConvolution_Core_arm64_NEON.cpp
+    Source/Kernels/SpikeConvolution/Kernels_SpikeConvolution_Core_x86_AVX2.cpp
+    Source/Kernels/SpikeConvolution/Kernels_SpikeConvolution_Core_x86_AVX512.cpp
+    Source/Kernels/SpikeConvolution/Kernels_SpikeConvolution_Core_x86_SSE41.cpp
+    Source/Kernels/SpikeConvolution/Kernels_SpikeConvolution_Routines.h
+    Source/Kernels/SpikeConvolution/Kernels_SpikeConvolution_TestInfra.cpp
+    Source/Kernels/SpikeConvolution/Kernels_SpikeConvolution_TestInfra.h
+    Source/Kernels/Waterfill/Kernels_Waterfill.cpp
+    Source/Kernels/Waterfill/Kernels_Waterfill.h
+    Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x16_x64_AVX2.cpp
+    Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x16_x64_AVX2.h
+    Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x32_x64_AVX512-GF.cpp
+    Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x32_x64_AVX512-GF.h
+    Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x32_x64_AVX512.cpp
+    Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x32_x64_AVX512.h
+    Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x4_Default.h
+    Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x64_x64_AVX512-GF.cpp
+    Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x64_x64_AVX512-GF.h
+    Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x64_x64_AVX512.cpp
+    Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x64_x64_AVX512.h
+    Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x8_arm64_NEON.cpp
+    Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x8_arm64_NEON.h
+    Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x8_x64_SSE42.cpp
+    Source/Kernels/Waterfill/Kernels_Waterfill_Core_64x8_x64_SSE42.h
+    Source/Kernels/Waterfill/Kernels_Waterfill_Core_64xH_Default.cpp
+    Source/Kernels/Waterfill/Kernels_Waterfill_Core_64xH_Default.h
+    Source/Kernels/Waterfill/Kernels_Waterfill_Intrinsics_x64_AVX512-GF.h
+    Source/Kernels/Waterfill/Kernels_Waterfill_Intrinsics_x64_AVX512.h
+    Source/Kernels/Waterfill/Kernels_Waterfill_Routines.h
+    Source/Kernels/Waterfill/Kernels_Waterfill_Session.cpp
+    Source/Kernels/Waterfill/Kernels_Waterfill_Session.h
+    Source/Kernels/Waterfill/Kernels_Waterfill_Session.tpp
+    Source/Kernels/Waterfill/Kernels_Waterfill_Tests.cpp
+    Source/Kernels/Waterfill/Kernels_Waterfill_Tests.h
+    Source/Kernels/Waterfill/Kernels_Waterfill_Types.h
+    Source/ML/DataLabeling/ML_AnnotationIO.cpp
+    Source/ML/DataLabeling/ML_AnnotationIO.h
+    Source/ML/DataLabeling/ML_ObjectAnnotation.cpp
+    Source/ML/DataLabeling/ML_ObjectAnnotation.h
+    Source/ML/DataLabeling/ML_SegmentAnythingModel.cpp
+    Source/ML/DataLabeling/ML_SegmentAnythingModel.h
+    Source/ML/DataLabeling/ML_SegmentAnythingModelConstants.h
+    Source/ML/Inference/ML_PaddleOCRDetector.cpp
+    Source/ML/Inference/ML_PaddleOCRDetector.h
+    Source/ML/Inference/ML_PaddleOCRPipeline.cpp
+    Source/ML/Inference/ML_PaddleOCRPipeline.h
+    Source/ML/Inference/ML_YOLONavigation.cpp
+    Source/ML/Inference/ML_YOLONavigation.h
+    Source/ML/Inference/ML_YOLOv5Detector.cpp
+    Source/ML/Inference/ML_YOLOv5Detector.h
+    Source/ML/ML_Panels.cpp
+    Source/ML/ML_Panels.h
+    Source/ML/Models/ML_ONNXRuntimeHelpers.cpp
+    Source/ML/Models/ML_ONNXRuntimeHelpers.h
+    Source/ML/Models/ML_OrtEnv.cpp
+    Source/ML/Models/ML_OrtEnv.h
+    Source/ML/Models/ML_YOLOv5Model.cpp
+    Source/ML/Models/ML_YOLOv5Model.h
+    Source/ML/Programs/ML_LabelImages.cpp
+    Source/ML/Programs/ML_LabelImages.h
+    Source/ML/Programs/ML_LabelImagesOverlayManager.cpp
+    Source/ML/Programs/ML_LabelImagesOverlayManager.h
+    Source/ML/Programs/ML_RunYOLO.cpp
+    Source/ML/Programs/ML_RunYOLO.h
+    Source/NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.cpp
+    Source/NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h
+    Source/NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.cpp
+    Source/NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h
+    Source/NintendoSwitch/Controllers/Joycon/NintendoSwitch_JoyconTable.cpp
+    Source/NintendoSwitch/Controllers/Joycon/NintendoSwitch_JoyconTable.h
+    Source/NintendoSwitch/Controllers/Procon/NintendoSwitch_ProControllerTable.cpp
+    Source/NintendoSwitch/Controllers/Procon/NintendoSwitch_ProControllerTable.h
+    Source/NintendoSwitch/Controllers/SysbotBase/SysbotBase3_ControllerState.h
+    Source/NintendoSwitch/Controllers/SysbotBase/SysbotBase3_ProController.cpp
+    Source/NintendoSwitch/Controllers/SysbotBase/SysbotBase3_ProController.h
+    Source/NintendoSwitch/Controllers/SysbotBase/SysbotBase_Connection.cpp
+    Source/NintendoSwitch/Controllers/SysbotBase/SysbotBase_Connection.h
+    Source/NintendoSwitch/Controllers/SysbotBase/SysbotBase_Descriptor.cpp
+    Source/NintendoSwitch/Controllers/SysbotBase/SysbotBase_Descriptor.h
+    Source/NintendoSwitch/Controllers/SysbotBase/SysbotBase_SelectorWidget.cpp
+    Source/NintendoSwitch/Controllers/SysbotBase/SysbotBase_SelectorWidget.h
+    Source/NintendoSwitch/DevPrograms/JoyconProgram.cpp
+    Source/NintendoSwitch/DevPrograms/JoyconProgram.h
+    Source/NintendoSwitch/DevPrograms/TestDudunsparceFormDetector.cpp
+    Source/NintendoSwitch/DevPrograms/TestDudunsparceFormDetector.h
+    Source/NintendoSwitch/DevPrograms/TestProgramComputer.cpp
+    Source/NintendoSwitch/DevPrograms/TestProgramComputer.h
+    Source/NintendoSwitch/DevPrograms/TestProgramSwitch.cpp
+    Source/NintendoSwitch/DevPrograms/TestProgramSwitch.h
+    Source/NintendoSwitch/Framework/NintendoSwitch_MultiSwitchProgramSession.cpp
+    Source/NintendoSwitch/Framework/NintendoSwitch_MultiSwitchProgramSession.h
+    Source/NintendoSwitch/Framework/NintendoSwitch_SingleSwitchProgramSession.cpp
+    Source/NintendoSwitch/Framework/NintendoSwitch_SingleSwitchProgramSession.h
+    Source/NintendoSwitch/Inference/NintendoSwitch2_BinarySliderDetector.cpp
+    Source/NintendoSwitch/Inference/NintendoSwitch2_BinarySliderDetector.h
+    Source/NintendoSwitch/Inference/NintendoSwitch_CheckOnlineDetector.cpp
+    Source/NintendoSwitch/Inference/NintendoSwitch_CheckOnlineDetector.h
+    Source/NintendoSwitch/Inference/NintendoSwitch_CloseGameDetector.cpp
+    Source/NintendoSwitch/Inference/NintendoSwitch_CloseGameDetector.h
+    Source/NintendoSwitch/Inference/NintendoSwitch_ConsoleTypeDetector.cpp
+    Source/NintendoSwitch/Inference/NintendoSwitch_ConsoleTypeDetector.h
+    Source/NintendoSwitch/Inference/NintendoSwitch_DateChangeDetector.cpp
+    Source/NintendoSwitch/Inference/NintendoSwitch_DateChangeDetector.h
+    Source/NintendoSwitch/Inference/NintendoSwitch_FailedToConnectDetector.cpp
+    Source/NintendoSwitch/Inference/NintendoSwitch_FailedToConnectDetector.h
+    Source/NintendoSwitch/Inference/NintendoSwitch_HomeMenuDetector.cpp
+    Source/NintendoSwitch/Inference/NintendoSwitch_HomeMenuDetector.h
+    Source/NintendoSwitch/Inference/NintendoSwitch_SelectedSettingDetector.cpp
+    Source/NintendoSwitch/Inference/NintendoSwitch_SelectedSettingDetector.h
+    Source/NintendoSwitch/Inference/NintendoSwitch_StartGameUserSelectDetector.cpp
+    Source/NintendoSwitch/Inference/NintendoSwitch_StartGameUserSelectDetector.h
+    Source/NintendoSwitch/Inference/NintendoSwitch_UpdatePopupDetector.cpp
+    Source/NintendoSwitch/Inference/NintendoSwitch_UpdatePopupDetector.h
+    Source/NintendoSwitch/NintendoSwitch_ConsoleHandle.cpp
+    Source/NintendoSwitch/NintendoSwitch_ConsoleHandle.h
+    Source/NintendoSwitch/NintendoSwitch_ConsoleState.cpp
+    Source/NintendoSwitch/NintendoSwitch_ConsoleState.h
+    Source/NintendoSwitch/NintendoSwitch_MultiSwitchProgram.cpp
+    Source/NintendoSwitch/NintendoSwitch_MultiSwitchProgram.h
+    Source/NintendoSwitch/NintendoSwitch_Panels.cpp
+    Source/NintendoSwitch/NintendoSwitch_Panels.h
+    Source/NintendoSwitch/NintendoSwitch_SettingsPanel.cpp
+    Source/NintendoSwitch/NintendoSwitch_SettingsPanel.h
+    Source/NintendoSwitch/NintendoSwitch_SingleSwitchProgram.cpp
+    Source/NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h
+    Source/NintendoSwitch/Options/NintendoSwitch_FriendCodeListOption.cpp
+    Source/NintendoSwitch/Options/NintendoSwitch_FriendCodeListOption.h
+    Source/NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.cpp
+    Source/NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h
+    Source/NintendoSwitch/Options/NintendoSwitch_ModelType.h
+    Source/NintendoSwitch/Options/NintendoSwitch_SlotDatabase.h
+    Source/NintendoSwitch/Options/NintendoSwitch_StartInGripMenuOption.h
+    Source/NintendoSwitch/Options/TurboMacroTable.cpp
+    Source/NintendoSwitch/Options/TurboMacroTable.h
+    Source/NintendoSwitch/Programs/DateManip/NintendoSwitch2_DateSkippers.cpp
+    Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManip.cpp
+    Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManip.h
+    Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManip_24h.cpp
+    Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManip_24h.h
+    Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManip_US.cpp
+    Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManip_US.h
+    Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManipBase.h
+    Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManipTools.cpp
+    Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateManipTools.h
+    Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateSkippers.cpp
+    Source/NintendoSwitch/Programs/DateManip/NintendoSwitch_DateSkippers.h
+    Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch1_HomeToDateTime.cpp
+    Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch2_HomeToDateTime.cpp
+    Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch_HomeToDateTime.cpp
+    Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch_HomeToDateTime.h
+    Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch_NeutralDateSkip.cpp
+    Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch_NeutralDateSkip.h
+    Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch_RollDateBackwardN.cpp
+    Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch_RollDateBackwardN.h
+    Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch_RollDateForward1.cpp
+    Source/NintendoSwitch/Programs/DateSpam/NintendoSwitch_RollDateForward1.h
+    Source/NintendoSwitch/Programs/FastCodeEntry/NintendoSwitch_CodeEntryTools.cpp
+    Source/NintendoSwitch/Programs/FastCodeEntry/NintendoSwitch_CodeEntryTools.h
+    Source/NintendoSwitch/Programs/FastCodeEntry/NintendoSwitch_KeyboardCodeEntry.cpp
+    Source/NintendoSwitch/Programs/FastCodeEntry/NintendoSwitch_KeyboardCodeEntry.h
+    Source/NintendoSwitch/Programs/FastCodeEntry/NintendoSwitch_NumberCodeEntry.cpp
+    Source/NintendoSwitch/Programs/FastCodeEntry/NintendoSwitch_NumberCodeEntry.h
+    Source/NintendoSwitch/Programs/NintendoSwitch_FriendCodeAdder.cpp
+    Source/NintendoSwitch/Programs/NintendoSwitch_FriendCodeAdder.h
+    Source/NintendoSwitch/Programs/NintendoSwitch_FriendDelete.cpp
+    Source/NintendoSwitch/Programs/NintendoSwitch_FriendDelete.h
+    Source/NintendoSwitch/Programs/NintendoSwitch_GameEntry.cpp
+    Source/NintendoSwitch/Programs/NintendoSwitch_GameEntry.h
+    Source/NintendoSwitch/Programs/NintendoSwitch_MenuStabilityTester.cpp
+    Source/NintendoSwitch/Programs/NintendoSwitch_MenuStabilityTester.h
+    Source/NintendoSwitch/Programs/NintendoSwitch_PreventSleep.cpp
+    Source/NintendoSwitch/Programs/NintendoSwitch_PreventSleep.h
+    Source/NintendoSwitch/Programs/NintendoSwitch_PushJoySticks.cpp
+    Source/NintendoSwitch/Programs/NintendoSwitch_PushJoySticks.h
+    Source/NintendoSwitch/Programs/NintendoSwitch_RecordKeyboardController.cpp
+    Source/NintendoSwitch/Programs/NintendoSwitch_RecordKeyboardController.h
+    Source/NintendoSwitch/Programs/NintendoSwitch_TurboA.cpp
+    Source/NintendoSwitch/Programs/NintendoSwitch_TurboA.h
+    Source/NintendoSwitch/Programs/NintendoSwitch_TurboButton.cpp
+    Source/NintendoSwitch/Programs/NintendoSwitch_TurboButton.h
+    Source/NintendoSwitch/Programs/NintendoSwitch_TurboMacro.cpp
+    Source/NintendoSwitch/Programs/NintendoSwitch_TurboMacro.h
+    Source/NintendoSwitch/Programs/Typewriter/NintendoSwitch_Typewriter.cpp
+    Source/NintendoSwitch/Programs/Typewriter/NintendoSwitch_Typewriter.h
+    Source/NintendoSwitch/Programs/Typewriter/NintendoSwitch_Typewriter_Tests.cpp
+    Source/NintendoSwitch/Programs/Typewriter/NintendoSwitch_Typewriter_Tests.h
+    Source/NintendoSwitch/Programs/Typewriter/NintendoSwitch_TypewriterTextMapping.cpp
+    Source/NintendoSwitch/Programs/Typewriter/NintendoSwitch_TypewriterTextMapping.h
+    Source/PanelLists.cpp
+    Source/PanelLists.h
+    Source/Pokemon/Inference/Pokemon_AbilityReader.cpp
+    Source/Pokemon/Inference/Pokemon_AbilityReader.h
+    Source/Pokemon/Inference/Pokemon_BerryNameReader.cpp
+    Source/Pokemon/Inference/Pokemon_BerryNameReader.h
+    Source/Pokemon/Inference/Pokemon_BoxGenderDetector.cpp
+    Source/Pokemon/Inference/Pokemon_BoxGenderDetector.h
+    Source/Pokemon/Inference/Pokemon_IvJudgeReader.cpp
+    Source/Pokemon/Inference/Pokemon_IvJudgeReader.h
+    Source/Pokemon/Inference/Pokemon_NameReader.cpp
+    Source/Pokemon/Inference/Pokemon_NameReader.h
+    Source/Pokemon/Inference/Pokemon_NatureReader.cpp
+    Source/Pokemon/Inference/Pokemon_NatureReader.h
+    Source/Pokemon/Inference/Pokemon_PokeballNameReader.cpp
+    Source/Pokemon/Inference/Pokemon_PokeballNameReader.h
+    Source/Pokemon/Inference/Pokemon_ReadHpBar.cpp
+    Source/Pokemon/Inference/Pokemon_ReadHpBar.h
+    Source/Pokemon/Inference/Pokemon_TrainIVCheckerOCR.cpp
+    Source/Pokemon/Inference/Pokemon_TrainIVCheckerOCR.h
+    Source/Pokemon/Inference/Pokemon_TrainPokemonOCR.cpp
+    Source/Pokemon/Inference/Pokemon_TrainPokemonOCR.h
+    Source/Pokemon/Inference/Pokemon_TypeReader.cpp
+    Source/Pokemon/Inference/Pokemon_TypeReader.h
+    Source/Pokemon/Options/Pokemon_BoxSortingTable.cpp
+    Source/Pokemon/Options/Pokemon_BoxSortingTable.h
+    Source/Pokemon/Options/Pokemon_EncounterBotOptions.h
+    Source/Pokemon/Options/Pokemon_HomeSpriteSelectOption.cpp
+    Source/Pokemon/Options/Pokemon_HomeSpriteSelectOption.h
+    Source/Pokemon/Options/Pokemon_IvJudgeOption.cpp
+    Source/Pokemon/Options/Pokemon_IvJudgeOption.h
+    Source/Pokemon/Options/Pokemon_NameSelectOption.cpp
+    Source/Pokemon/Options/Pokemon_NameSelectOption.h
+    Source/Pokemon/Options/Pokemon_NameSelectWidget.cpp
+    Source/Pokemon/Options/Pokemon_NameSelectWidget.h
+    Source/Pokemon/Options/Pokemon_StatsHuntFilter.cpp
+    Source/Pokemon/Options/Pokemon_StatsHuntFilter.h
+    Source/Pokemon/Pokemon_AdvRng.cpp
+    Source/Pokemon/Pokemon_AdvRng.h
+    Source/Pokemon/Pokemon_BdspRng.cpp
+    Source/Pokemon/Pokemon_BdspRng.h
+    Source/Pokemon/Pokemon_BoxCursor.cpp
+    Source/Pokemon/Pokemon_BoxCursor.h
+    Source/Pokemon/Pokemon_CollectedPokemonInfo.cpp
+    Source/Pokemon/Pokemon_CollectedPokemonInfo.h
+    Source/Pokemon/Pokemon_DataTypes.h
+    Source/Pokemon/Pokemon_EncounterStats.cpp
+    Source/Pokemon/Pokemon_EncounterStats.h
+    Source/Pokemon/Pokemon_Gf2Matrix.cpp
+    Source/Pokemon/Pokemon_Gf2Matrix.h
+    Source/Pokemon/Pokemon_IvJudge.cpp
+    Source/Pokemon/Pokemon_IvJudge.h
+    Source/Pokemon/Pokemon_NatureChecker.cpp
+    Source/Pokemon/Pokemon_NatureChecker.h
+    Source/Pokemon/Pokemon_Notification.cpp
+    Source/Pokemon/Pokemon_Notification.h
+    Source/Pokemon/Pokemon_OriginMarks.cpp
+    Source/Pokemon/Pokemon_OriginMarks.h
+    Source/Pokemon/Pokemon_ShinySparkleSet.cpp
+    Source/Pokemon/Pokemon_ShinySparkleSet.h
+    Source/Pokemon/Pokemon_StatsCalculation.cpp
+    Source/Pokemon/Pokemon_StatsCalculation.h
+    Source/Pokemon/Pokemon_Strings.cpp
+    Source/Pokemon/Pokemon_Strings.h
+    Source/Pokemon/Pokemon_Types.cpp
+    Source/Pokemon/Pokemon_Types.h
+    Source/Pokemon/Pokemon_Xoroshiro128Plus.cpp
+    Source/Pokemon/Pokemon_Xoroshiro128Plus.h
+    Source/Pokemon/Pokemon_Xorshift128.cpp
+    Source/Pokemon/Pokemon_Xorshift128.h
+    Source/Pokemon/Resources/Pokemon_BerryNames.cpp
+    Source/Pokemon/Resources/Pokemon_BerryNames.h
+    Source/Pokemon/Resources/Pokemon_BerrySprites.cpp
+    Source/Pokemon/Resources/Pokemon_BerrySprites.h
+    Source/Pokemon/Resources/Pokemon_EggSteps.cpp
+    Source/Pokemon/Resources/Pokemon_EggSteps.h
+    Source/Pokemon/Resources/Pokemon_PokeballNames.cpp
+    Source/Pokemon/Resources/Pokemon_PokeballNames.h
+    Source/Pokemon/Resources/Pokemon_PokemonForms.cpp
+    Source/Pokemon/Resources/Pokemon_PokemonForms.h
+    Source/Pokemon/Resources/Pokemon_PokemonHomeSprites.cpp
+    Source/Pokemon/Resources/Pokemon_PokemonHomeSprites.h
+    Source/Pokemon/Resources/Pokemon_PokemonNames.cpp
+    Source/Pokemon/Resources/Pokemon_PokemonNames.h
+    Source/Pokemon/Resources/Pokemon_PokemonSlugs.cpp
+    Source/Pokemon/Resources/Pokemon_PokemonSlugs.h
+    Source/PokemonBDSP/Inference/Battles/PokemonBDSP_BattleBallReader.cpp
+    Source/PokemonBDSP/Inference/Battles/PokemonBDSP_BattleBallReader.h
+    Source/PokemonBDSP/Inference/Battles/PokemonBDSP_BattleMenuDetector.cpp
+    Source/PokemonBDSP/Inference/Battles/PokemonBDSP_BattleMenuDetector.h
+    Source/PokemonBDSP/Inference/Battles/PokemonBDSP_EndBattleDetector.cpp
+    Source/PokemonBDSP/Inference/Battles/PokemonBDSP_EndBattleDetector.h
+    Source/PokemonBDSP/Inference/Battles/PokemonBDSP_ExperienceGainDetector.cpp
+    Source/PokemonBDSP/Inference/Battles/PokemonBDSP_ExperienceGainDetector.h
+    Source/PokemonBDSP/Inference/Battles/PokemonBDSP_StartBattleDetector.cpp
+    Source/PokemonBDSP/Inference/Battles/PokemonBDSP_StartBattleDetector.h
+    Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxDetector.cpp
+    Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxDetector.h
+    Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxGenderDetector.cpp
+    Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxGenderDetector.h
+    Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxNatureDetector.cpp
+    Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxNatureDetector.h
+    Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxShinyDetector.cpp
+    Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_BoxShinyDetector.h
+    Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_IvJudgeReader.cpp
+    Source/PokemonBDSP/Inference/BoxSystem/PokemonBDSP_IvJudgeReader.h
+    Source/PokemonBDSP/Inference/PokemonBDSP_DialogDetector.cpp
+    Source/PokemonBDSP/Inference/PokemonBDSP_DialogDetector.h
+    Source/PokemonBDSP/Inference/PokemonBDSP_MapDetector.cpp
+    Source/PokemonBDSP/Inference/PokemonBDSP_MapDetector.h
+    Source/PokemonBDSP/Inference/PokemonBDSP_MarkFinder.cpp
+    Source/PokemonBDSP/Inference/PokemonBDSP_MarkFinder.h
+    Source/PokemonBDSP/Inference/PokemonBDSP_MenuDetector.cpp
+    Source/PokemonBDSP/Inference/PokemonBDSP_MenuDetector.h
+    Source/PokemonBDSP/Inference/PokemonBDSP_PokeballSpriteMatcher.cpp
+    Source/PokemonBDSP/Inference/PokemonBDSP_PokeballSpriteMatcher.h
+    Source/PokemonBDSP/Inference/PokemonBDSP_ReceivePokemonDetector.cpp
+    Source/PokemonBDSP/Inference/PokemonBDSP_ReceivePokemonDetector.h
+    Source/PokemonBDSP/Inference/PokemonBDSP_SelectionArrow.cpp
+    Source/PokemonBDSP/Inference/PokemonBDSP_SelectionArrow.h
+    Source/PokemonBDSP/Inference/PokemonBDSP_VSSeekerReaction.cpp
+    Source/PokemonBDSP/Inference/PokemonBDSP_VSSeekerReaction.h
+    Source/PokemonBDSP/Inference/Rng/PokemonBDSP_BlinkExtraction.cpp
+    Source/PokemonBDSP/Inference/Rng/PokemonBDSP_BlinkExtraction.h
+    Source/PokemonBDSP/Inference/Rng/PokemonBDSP_BlinkScenes.cpp
+    Source/PokemonBDSP/Inference/Rng/PokemonBDSP_BlinkScenes.h
+    Source/PokemonBDSP/Inference/Rng/PokemonBDSP_EyeBlinkDetector.cpp
+    Source/PokemonBDSP/Inference/Rng/PokemonBDSP_EyeBlinkDetector.h
+    Source/PokemonBDSP/Inference/Rng/PokemonBDSP_SummaryReader.cpp
+    Source/PokemonBDSP/Inference/Rng/PokemonBDSP_SummaryReader.h
+    Source/PokemonBDSP/Inference/ShinyDetection/PokemonBDSP_ShinyEncounterDetector.cpp
+    Source/PokemonBDSP/Inference/ShinyDetection/PokemonBDSP_ShinyEncounterDetector.h
+    Source/PokemonBDSP/Inference/ShinyDetection/PokemonBDSP_ShinySparkleSet.cpp
+    Source/PokemonBDSP/Inference/ShinyDetection/PokemonBDSP_ShinySparkleSet.h
+    Source/PokemonBDSP/Inference/Sounds/PokemonBDSP_ShinySoundDetector.cpp
+    Source/PokemonBDSP/Inference/Sounds/PokemonBDSP_ShinySoundDetector.h
+    Source/PokemonBDSP/Options/EncounterFilter/PokemonBDSP_EncounterFilterEnums.cpp
+    Source/PokemonBDSP/Options/EncounterFilter/PokemonBDSP_EncounterFilterEnums.h
+    Source/PokemonBDSP/Options/EncounterFilter/PokemonBDSP_EncounterFilterOption.cpp
+    Source/PokemonBDSP/Options/EncounterFilter/PokemonBDSP_EncounterFilterOption.h
+    Source/PokemonBDSP/Options/EncounterFilter/PokemonBDSP_EncounterFilterOverride.cpp
+    Source/PokemonBDSP/Options/EncounterFilter/PokemonBDSP_EncounterFilterOverride.h
+    Source/PokemonBDSP/Options/EncounterFilter/PokemonBDSP_EncounterFilterWidget.cpp
+    Source/PokemonBDSP/Options/EncounterFilter/PokemonBDSP_EncounterFilterWidget.h
+    Source/PokemonBDSP/Options/PokemonBDSP_BerrySelectOption.cpp
+    Source/PokemonBDSP/Options/PokemonBDSP_BerrySelectOption.h
+    Source/PokemonBDSP/Options/PokemonBDSP_BerryTable.cpp
+    Source/PokemonBDSP/Options/PokemonBDSP_BerryTable.h
+    Source/PokemonBDSP/Options/PokemonBDSP_EggStepOption.cpp
+    Source/PokemonBDSP/Options/PokemonBDSP_EggStepOption.h
+    Source/PokemonBDSP/Options/PokemonBDSP_EncounterBotCommon.h
+    Source/PokemonBDSP/Options/PokemonBDSP_LearnMove.h
+    Source/PokemonBDSP/Options/PokemonBDSP_PlayerModelOption.cpp
+    Source/PokemonBDSP/Options/PokemonBDSP_PlayerModelOption.h
+    Source/PokemonBDSP/Options/PokemonBDSP_ShortcutDirection.cpp
+    Source/PokemonBDSP/Options/PokemonBDSP_ShortcutDirection.h
+    Source/PokemonBDSP/Panels_PokemonBDSP.cpp
+    Source/PokemonBDSP/Panels_PokemonBDSP.h
+    Source/PokemonBDSP/PokemonBDSP_Panels.cpp
+    Source/PokemonBDSP/PokemonBDSP_Panels.h
+    Source/PokemonBDSP/PokemonBDSP_Settings.cpp
+    Source/PokemonBDSP/PokemonBDSP_Settings.h
+    Source/PokemonBDSP/PokemonBDSP_Tests.cpp
+    Source/PokemonBDSP/PokemonBDSP_Tests.h
+    Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggAutonomous.cpp
+    Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggAutonomous.h
+    Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggAutonomousState.cpp
+    Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggAutonomousState.h
+    Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggFeedback.cpp
+    Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggFeedback.h
+    Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggFetcher.cpp
+    Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggFetcher.h
+    Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggHatcher.cpp
+    Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggHatcher.h
+    Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggRoutines.cpp
+    Source/PokemonBDSP/Programs/Eggs/PokemonBDSP_EggRoutines.h
+    Source/PokemonBDSP/Programs/Farming/PokemonBDSP_AmitySquarePickUpFarmer.cpp
+    Source/PokemonBDSP/Programs/Farming/PokemonBDSP_AmitySquarePickUpFarmer.h
+    Source/PokemonBDSP/Programs/Farming/PokemonBDSP_DoublesLeveling.cpp
+    Source/PokemonBDSP/Programs/Farming/PokemonBDSP_DoublesLeveling.h
+    Source/PokemonBDSP/Programs/Farming/PokemonBDSP_GiftBerryReset.cpp
+    Source/PokemonBDSP/Programs/Farming/PokemonBDSP_GiftBerryReset.h
+    Source/PokemonBDSP/Programs/Farming/PokemonBDSP_MoneyFarmerRoute210.cpp
+    Source/PokemonBDSP/Programs/Farming/PokemonBDSP_MoneyFarmerRoute210.h
+    Source/PokemonBDSP/Programs/Farming/PokemonBDSP_MoneyFarmerRoute212.cpp
+    Source/PokemonBDSP/Programs/Farming/PokemonBDSP_MoneyFarmerRoute212.h
+    Source/PokemonBDSP/Programs/Farming/PokemonBDSP_PoffinCooker.cpp
+    Source/PokemonBDSP/Programs/Farming/PokemonBDSP_PoffinCooker.h
+    Source/PokemonBDSP/Programs/General/PokemonBDSP_AutonomousBallThrower.cpp
+    Source/PokemonBDSP/Programs/General/PokemonBDSP_AutonomousBallThrower.h
+    Source/PokemonBDSP/Programs/General/PokemonBDSP_MassRelease.cpp
+    Source/PokemonBDSP/Programs/General/PokemonBDSP_MassRelease.h
+    Source/PokemonBDSP/Programs/Glitches/PokemonBDSP_ActivateMenuGlitch-1.1.2.cpp
+    Source/PokemonBDSP/Programs/Glitches/PokemonBDSP_ActivateMenuGlitch-1.1.2.h
+    Source/PokemonBDSP/Programs/Glitches/PokemonBDSP_ActivateMenuGlitch-1.1.3.cpp
+    Source/PokemonBDSP/Programs/Glitches/PokemonBDSP_ActivateMenuGlitch-1.1.3.h
+    Source/PokemonBDSP/Programs/Glitches/PokemonBDSP_CloneItemsBoxCopy2.cpp
+    Source/PokemonBDSP/Programs/Glitches/PokemonBDSP_CloneItemsBoxCopy2.h
+    Source/PokemonBDSP/Programs/PokemonBDSP_BasicCatcher.cpp
+    Source/PokemonBDSP/Programs/PokemonBDSP_BasicCatcher.h
+    Source/PokemonBDSP/Programs/PokemonBDSP_BoxRelease.cpp
+    Source/PokemonBDSP/Programs/PokemonBDSP_BoxRelease.h
+    Source/PokemonBDSP/Programs/PokemonBDSP_EncounterDetection.cpp
+    Source/PokemonBDSP/Programs/PokemonBDSP_EncounterDetection.h
+    Source/PokemonBDSP/Programs/PokemonBDSP_EncounterHandler.cpp
+    Source/PokemonBDSP/Programs/PokemonBDSP_EncounterHandler.h
+    Source/PokemonBDSP/Programs/PokemonBDSP_GameEntry.cpp
+    Source/PokemonBDSP/Programs/PokemonBDSP_GameEntry.h
+    Source/PokemonBDSP/Programs/PokemonBDSP_GameNavigation.cpp
+    Source/PokemonBDSP/Programs/PokemonBDSP_GameNavigation.h
+    Source/PokemonBDSP/Programs/PokemonBDSP_GlobalRoomHeal.cpp
+    Source/PokemonBDSP/Programs/PokemonBDSP_GlobalRoomHeal.h
+    Source/PokemonBDSP/Programs/PokemonBDSP_OverworldTrigger.cpp
+    Source/PokemonBDSP/Programs/PokemonBDSP_OverworldTrigger.h
+    Source/PokemonBDSP/Programs/PokemonBDSP_RunFromBattle.cpp
+    Source/PokemonBDSP/Programs/PokemonBDSP_RunFromBattle.h
+    Source/PokemonBDSP/Programs/RngManipulation/PokemonBDSP_AdvanceClock.cpp
+    Source/PokemonBDSP/Programs/RngManipulation/PokemonBDSP_AdvanceClock.h
+    Source/PokemonBDSP/Programs/RngManipulation/PokemonBDSP_BedroomSeedFinder.cpp
+    Source/PokemonBDSP/Programs/RngManipulation/PokemonBDSP_BedroomSeedFinder.h
+    Source/PokemonBDSP/Programs/RngManipulation/PokemonBDSP_BlinkModel.cpp
+    Source/PokemonBDSP/Programs/RngManipulation/PokemonBDSP_BlinkModel.h
+    Source/PokemonBDSP/Programs/RngManipulation/PokemonBDSP_BlinkRecovery.cpp
+    Source/PokemonBDSP/Programs/RngManipulation/PokemonBDSP_BlinkRecovery.h
+    Source/PokemonBDSP/Programs/RngManipulation/PokemonBDSP_IntroSeedFinder.cpp
+    Source/PokemonBDSP/Programs/RngManipulation/PokemonBDSP_IntroSeedFinder.h
+    Source/PokemonBDSP/Programs/RngManipulation/PokemonBDSP_RngDisplays.cpp
+    Source/PokemonBDSP/Programs/RngManipulation/PokemonBDSP_RngDisplays.h
+    Source/PokemonBDSP/Programs/RngManipulation/PokemonBDSP_StateReidentifier.cpp
+    Source/PokemonBDSP/Programs/RngManipulation/PokemonBDSP_StateReidentifier.h
+    Source/PokemonBDSP/Programs/RngManipulation/PokemonBDSP_StateSolver.cpp
+    Source/PokemonBDSP/Programs/RngManipulation/PokemonBDSP_StateSolver.h
+    Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_LegendaryReset.cpp
+    Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_LegendaryReset.h
+    Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_ShinyHunt-Fishing.cpp
+    Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_ShinyHunt-Fishing.h
+    Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_ShinyHunt-Overworld.cpp
+    Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_ShinyHunt-Overworld.h
+    Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_ShinyHunt-Shaymin.cpp
+    Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_ShinyHunt-Shaymin.h
+    Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_StarterReset.cpp
+    Source/PokemonBDSP/Programs/ShinyHunting/PokemonBDSP_StarterReset.h
+    Source/PokemonBDSP/Programs/TestPrograms/PokemonBDSP_ShinyEncounterTester.cpp
+    Source/PokemonBDSP/Programs/TestPrograms/PokemonBDSP_ShinyEncounterTester.h
+    Source/PokemonBDSP/Programs/TestPrograms/PokemonBDSP_SoundListener.cpp
+    Source/PokemonBDSP/Programs/TestPrograms/PokemonBDSP_SoundListener.h
+    Source/PokemonBDSP/Programs/TestPrograms/PokemonBDSP_SummaryReaderTester.cpp
+    Source/PokemonBDSP/Programs/TestPrograms/PokemonBDSP_SummaryReaderTester.h
+    Source/PokemonBDSP/Programs/Trading/PokemonBDSP_SelfBoxTrade.cpp
+    Source/PokemonBDSP/Programs/Trading/PokemonBDSP_SelfBoxTrade.h
+    Source/PokemonBDSP/Programs/Trading/PokemonBDSP_SelfTouchTrade.cpp
+    Source/PokemonBDSP/Programs/Trading/PokemonBDSP_SelfTouchTrade.h
+    Source/PokemonBDSP/Programs/Trading/PokemonBDSP_TradeRoutines.cpp
+    Source/PokemonBDSP/Programs/Trading/PokemonBDSP_TradeRoutines.h
+    Source/PokemonBDSP/Resources/PokemonBDSP_NameDatabase.cpp
+    Source/PokemonBDSP/Resources/PokemonBDSP_NameDatabase.h
+    Source/VideoGames/PokemonFRLG/Inference/Box/PokemonFRLG_BoxCellOccupiedDetector.cpp
+    Source/VideoGames/PokemonFRLG/Inference/Box/PokemonFRLG_BoxCellOccupiedDetector.h
+    Source/VideoGames/PokemonFRLG/Inference/Box/PokemonFRLG_BoxCellReader.cpp
+    Source/VideoGames/PokemonFRLG/Inference/Box/PokemonFRLG_BoxCellReader.h
+    Source/VideoGames/PokemonFRLG/Inference/Box/PokemonFRLG_BoxGenderReader.cpp
+    Source/VideoGames/PokemonFRLG/Inference/Box/PokemonFRLG_BoxGenderReader.h
+    Source/VideoGames/PokemonFRLG/Inference/Box/PokemonFRLG_BoxSelectionModeDetector.cpp
+    Source/VideoGames/PokemonFRLG/Inference/Box/PokemonFRLG_BoxSelectionModeDetector.h
+    Source/VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_BattleDialogs.cpp
+    Source/VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_BattleDialogs.h
+    Source/VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_DialogDetector.cpp
+    Source/VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_DialogDetector.h
+    Source/VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_PartyDialogs.cpp
+    Source/VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_PartyDialogs.h
+    Source/VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_PrizeSelectDetector.cpp
+    Source/VideoGames/PokemonFRLG/Inference/Dialogs/PokemonFRLG_PrizeSelectDetector.h
+    Source/VideoGames/PokemonFRLG/Inference/Map/PokemonFRLG_MapDetector.cpp
+    Source/VideoGames/PokemonFRLG/Inference/Map/PokemonFRLG_MapDetector.h
+    Source/VideoGames/PokemonFRLG/Inference/Map/PokemonFRLG_PokemonLeagueDetectors.cpp
+    Source/VideoGames/PokemonFRLG/Inference/Map/PokemonFRLG_PokemonLeagueDetectors.h
+    Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_BagDetector.cpp
+    Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_BagDetector.h
+    Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_LoadMenuDetector.cpp
+    Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_LoadMenuDetector.h
+    Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_PartyEmptySlotDetector.cpp
+    Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_PartyEmptySlotDetector.h
+    Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_PartyHeldItemDetector.cpp
+    Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_PartyHeldItemDetector.h
+    Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_PartyMenuDetector.cpp
+    Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_PartyMenuDetector.h
+    Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_PartySlot.h
+    Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_StartMenuDetector.cpp
+    Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_StartMenuDetector.h
+    Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_SummaryDetector.cpp
+    Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_SummaryDetector.h
+    Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_TrainerCardDetector.cpp
+    Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_TrainerCardDetector.h
+    Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_BattleLevelUpReader.cpp
+    Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_BattleLevelUpReader.h
+    Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_BattlePokemonDetector.cpp
+    Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_BattlePokemonDetector.h
+    Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_BattleSelectionArrowDetector.cpp
+    Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_BattleSelectionArrowDetector.h
+    Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_DaycareManDetector.cpp
+    Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_DaycareManDetector.h
+    Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_DigitReader.cpp
+    Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_DigitReader.h
+    Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_OcrPreprocessing.cpp
+    Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_OcrPreprocessing.h
+    Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_PartyLevelUpReader.cpp
+    Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_PartyLevelUpReader.h
+    Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_PokedexRegisteredDetector.cpp
+    Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_PokedexRegisteredDetector.h
+    Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_PokemonSpriteReader.cpp
+    Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_PokemonSpriteReader.h
+    Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_SelectionArrowDetector.cpp
+    Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_SelectionArrowDetector.h
+    Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_ShinySymbolDetector.cpp
+    Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_ShinySymbolDetector.h
+    Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_StatsReader.cpp
+    Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_StatsReader.h
+    Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_TrainerIdReader.cpp
+    Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_TrainerIdReader.h
+    Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_WildEncounterReader.cpp
+    Source/VideoGames/PokemonFRLG/Inference/PokemonFRLG_WildEncounterReader.h
+    Source/VideoGames/PokemonFRLG/Inference/Sounds/PokemonFRLG_CatchFanfareDetector.cpp
+    Source/VideoGames/PokemonFRLG/Inference/Sounds/PokemonFRLG_CatchFanfareDetector.h
+    Source/VideoGames/PokemonFRLG/Inference/Sounds/PokemonFRLG_ShinySoundDetector.cpp
+    Source/VideoGames/PokemonFRLG/Inference/Sounds/PokemonFRLG_ShinySoundDetector.h
+    Source/VideoGames/PokemonFRLG/PokemonFRLG_Navigation.cpp
+    Source/VideoGames/PokemonFRLG/PokemonFRLG_Navigation.h
+    Source/VideoGames/PokemonFRLG/PokemonFRLG_Panels.cpp
+    Source/VideoGames/PokemonFRLG/PokemonFRLG_Panels.h
+    Source/VideoGames/PokemonFRLG/PokemonFRLG_Settings.cpp
+    Source/VideoGames/PokemonFRLG/PokemonFRLG_Settings.h
+    Source/VideoGames/PokemonFRLG/PokemonFRLG_Tests.cpp
+    Source/VideoGames/PokemonFRLG/PokemonFRLG_Tests.h
+    Source/VideoGames/PokemonFRLG/Programs/BoxOrganization/PokemonFRLG_BoxOrganization.cpp
+    Source/VideoGames/PokemonFRLG/Programs/BoxOrganization/PokemonFRLG_BoxOrganization.h
+    Source/VideoGames/PokemonFRLG/Programs/BoxOrganization/PokemonFRLG_BoxSorter.cpp
+    Source/VideoGames/PokemonFRLG/Programs/BoxOrganization/PokemonFRLG_BoxSorter.h
+    Source/VideoGames/PokemonFRLG/Programs/Farming/PokemonFRLG_EliteFourFarmer.cpp
+    Source/VideoGames/PokemonFRLG/Programs/Farming/PokemonFRLG_EliteFourFarmer.h
+    Source/VideoGames/PokemonFRLG/Programs/Farming/PokemonFRLG_EvTrainer.cpp
+    Source/VideoGames/PokemonFRLG/Programs/Farming/PokemonFRLG_EvTrainer.h
+    Source/VideoGames/PokemonFRLG/Programs/Farming/PokemonFRLG_HeldItemFarmer-SafariZone.cpp
+    Source/VideoGames/PokemonFRLG/Programs/Farming/PokemonFRLG_HeldItemFarmer-SafariZone.h
+    Source/VideoGames/PokemonFRLG/Programs/Farming/PokemonFRLG_ItemDuplication.cpp
+    Source/VideoGames/PokemonFRLG/Programs/Farming/PokemonFRLG_ItemDuplication.h
+    Source/VideoGames/PokemonFRLG/Programs/Farming/PokemonFRLG_NuggetBridgeFarmer.cpp
+    Source/VideoGames/PokemonFRLG/Programs/Farming/PokemonFRLG_NuggetBridgeFarmer.h
+    Source/VideoGames/PokemonFRLG/Programs/Farming/PokemonFRLG_PickupFarmer.cpp
+    Source/VideoGames/PokemonFRLG/Programs/Farming/PokemonFRLG_PickupFarmer.h
+    Source/VideoGames/PokemonFRLG/Programs/PokemonFRLG_BattleMenuNavigation.cpp
+    Source/VideoGames/PokemonFRLG/Programs/PokemonFRLG_BattleMenuNavigation.h
+    Source/VideoGames/PokemonFRLG/Programs/PokemonFRLG_SafariOptimalAction.cpp
+    Source/VideoGames/PokemonFRLG/Programs/PokemonFRLG_SafariOptimalAction.h
+    Source/VideoGames/PokemonFRLG/Programs/PokemonFRLG_StartMenuNavigation.cpp
+    Source/VideoGames/PokemonFRLG/Programs/PokemonFRLG_StartMenuNavigation.h
+    Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_BlindNavigation.cpp
+    Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_BlindNavigation.h
+    Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_EggRng.cpp
+    Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_EggRng.h
+    Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_EncountersDatabase.cpp
+    Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_EncountersDatabase.h
+    Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_GiftRng.cpp
+    Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_GiftRng.h
+    Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_HardReset.cpp
+    Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_HardReset.h
+    Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_LocationsDatabase.cpp
+    Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_LocationsDatabase.h
+    Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngCalibration.cpp
+    Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngCalibration.h
+    Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngDisplays.cpp
+    Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngDisplays.h
+    Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngHelper.cpp
+    Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngHelper.h
+    Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngLoopRoutines.cpp
+    Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngLoopRoutines.h
+    Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngNavigation.cpp
+    Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngNavigation.h
+    Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngStatsDatabase.cpp
+    Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RngStatsDatabase.h
+    Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RoamingLegendaryRng.cpp
+    Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_RoamingLegendaryRng.h
+    Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_SeedsDatabase.cpp
+    Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_SeedsDatabase.h
+    Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_SidHelper.cpp
+    Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_SidHelper.h
+    Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_StarterRng.cpp
+    Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_StarterRng.h
+    Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_StaticRng.cpp
+    Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_StaticRng.h
+    Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_WildRng.cpp
+    Source/VideoGames/PokemonFRLG/Programs/RngManipulation/PokemonFRLG_WildRng.h
+    Source/VideoGames/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_GiftReset.cpp
+    Source/VideoGames/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_GiftReset.h
+    Source/VideoGames/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_LegendaryReset.cpp
+    Source/VideoGames/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_LegendaryReset.h
+    Source/VideoGames/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_LegendaryRunAway.cpp
+    Source/VideoGames/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_LegendaryRunAway.h
+    Source/VideoGames/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_PrizeCornerReset.cpp
+    Source/VideoGames/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_PrizeCornerReset.h
+    Source/VideoGames/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_ShinyHunt-Fishing.cpp
+    Source/VideoGames/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_ShinyHunt-Fishing.h
+    Source/VideoGames/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_ShinyHunt-Overworld.cpp
+    Source/VideoGames/PokemonFRLG/Programs/ShinyHunting/PokemonFRLG_ShinyHunt-Overworld.h
+    Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_ReadBattleLevelUp.cpp
+    Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_ReadBattleLevelUp.h
+    Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_ReadBoxInfo.cpp
+    Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_ReadBoxInfo.h
+    Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_ReadEncounter.cpp
+    Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_ReadEncounter.h
+    Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_ReadStats.cpp
+    Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_ReadStats.h
+    Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_ReadTrainerId.cpp
+    Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_ReadTrainerId.h
+    Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_SafariOptimalActionTest.cpp
+    Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_SafariOptimalActionTest.h
+    Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_SoundListener.cpp
+    Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_SoundListener.h
+    Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_TestPartyInference.cpp
+    Source/VideoGames/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_TestPartyInference.h
+    Source/VideoGames/PokemonFRLG/Resources/PokemonFRLG_PokemonSprites.cpp
+    Source/VideoGames/PokemonFRLG/Resources/PokemonFRLG_PokemonSprites.h
+    Source/VideoGames/PokemonHome/Inference/PokemonHome_AlphaDetector.cpp
+    Source/VideoGames/PokemonHome/Inference/PokemonHome_AlphaDetector.h
+    Source/VideoGames/PokemonHome/Inference/PokemonHome_BallReader.cpp
+    Source/VideoGames/PokemonHome/Inference/PokemonHome_BallReader.h
+    Source/VideoGames/PokemonHome/Inference/PokemonHome_BoxGenderDetector.cpp
+    Source/VideoGames/PokemonHome/Inference/PokemonHome_BoxGenderDetector.h
+    Source/VideoGames/PokemonHome/Inference/PokemonHome_BoxViewDetector.cpp
+    Source/VideoGames/PokemonHome/Inference/PokemonHome_BoxViewDetector.h
+    Source/VideoGames/PokemonHome/Inference/PokemonHome_ButtonDetector.cpp
+    Source/VideoGames/PokemonHome/Inference/PokemonHome_ButtonDetector.h
+    Source/VideoGames/PokemonHome/Inference/PokemonHome_GigantamaxDetector.cpp
+    Source/VideoGames/PokemonHome/Inference/PokemonHome_GigantamaxDetector.h
+    Source/VideoGames/PokemonHome/Inference/PokemonHome_OriginMarkReader.cpp
+    Source/VideoGames/PokemonHome/Inference/PokemonHome_OriginMarkReader.h
+    Source/VideoGames/PokemonHome/Inference/PokemonHome_SelectionArrowDetector.cpp
+    Source/VideoGames/PokemonHome/Inference/PokemonHome_SelectionArrowDetector.h
+    Source/VideoGames/PokemonHome/Inference/PokemonHome_ShinyDetector.cpp
+    Source/VideoGames/PokemonHome/Inference/PokemonHome_ShinyDetector.h
+    Source/VideoGames/PokemonHome/Inference/PokemonHome_SummaryReader.cpp
+    Source/VideoGames/PokemonHome/Inference/PokemonHome_SummaryReader.h
+    Source/VideoGames/PokemonHome/Inference/PokemonHome_SummaryScreenDetector.cpp
+    Source/VideoGames/PokemonHome/Inference/PokemonHome_SummaryScreenDetector.h
+    Source/VideoGames/PokemonHome/Inference/PokemonHome_TeraTypeReader.cpp
+    Source/VideoGames/PokemonHome/Inference/PokemonHome_TeraTypeReader.h
+    Source/VideoGames/PokemonHome/PokemonHome_Panels.cpp
+    Source/VideoGames/PokemonHome/PokemonHome_Panels.h
+    Source/VideoGames/PokemonHome/PokemonHome_Settings.cpp
+    Source/VideoGames/PokemonHome/PokemonHome_Settings.h
+    Source/VideoGames/PokemonHome/PokemonHome_Tests.cpp
+    Source/VideoGames/PokemonHome/PokemonHome_Tests.h
+    Source/VideoGames/PokemonHome/Programs/PokemonHome_BoxNavigation.cpp
+    Source/VideoGames/PokemonHome/Programs/PokemonHome_BoxNavigation.h
+    Source/VideoGames/PokemonHome/Programs/PokemonHome_BoxSorter.cpp
+    Source/VideoGames/PokemonHome/Programs/PokemonHome_BoxSorter.h
+    Source/VideoGames/PokemonHome/Programs/PokemonHome_BoxSorterLivingDex.cpp
+    Source/VideoGames/PokemonHome/Programs/PokemonHome_BoxSorterLivingDex.h
+    Source/VideoGames/PokemonHome/Programs/PokemonHome_GenerateNameOCR.cpp
+    Source/VideoGames/PokemonHome/Programs/PokemonHome_GenerateNameOCR.h
+    Source/VideoGames/PokemonHome/Programs/PokemonHome_PageSwap.cpp
+    Source/VideoGames/PokemonHome/Programs/PokemonHome_PageSwap.h
+    Source/VideoGames/PokemonHome/Programs/TestPrograms/PokemonHome_ReadSummaryScreen.cpp
+    Source/VideoGames/PokemonHome/Programs/TestPrograms/PokemonHome_ReadSummaryScreen.h
+    Source/VideoGames/PokemonHome/Programs/TestPrograms/PokemonHome_TestDatabaseGenerator.cpp
+    Source/VideoGames/PokemonHome/Programs/TestPrograms/PokemonHome_TestDatabaseGenerator.h
+    Source/VideoGames/PokemonHome/Resources/PokemonHome_PokeballSprites.cpp
+    Source/VideoGames/PokemonHome/Resources/PokemonHome_PokeballSprites.h
+    Source/VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattleMenuDetector.cpp
+    Source/VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattleMenuDetector.h
+    Source/VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattleMoveSelectionDetector.cpp
+    Source/VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattleMoveSelectionDetector.h
+    Source/VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattlePokemonSwitchDetector.cpp
+    Source/VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattlePokemonSwitchDetector.h
+    Source/VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattleSpriteWatcher.cpp
+    Source/VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattleSpriteWatcher.h
+    Source/VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattleStartDetector.cpp
+    Source/VideoGames/PokemonLA/Inference/Battles/PokemonLA_BattleStartDetector.h
+    Source/VideoGames/PokemonLA/Inference/Battles/PokemonLA_TransparentDialogueDetector.cpp
+    Source/VideoGames/PokemonLA/Inference/Battles/PokemonLA_TransparentDialogueDetector.h
+    Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_MapDetector.cpp
+    Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_MapDetector.h
+    Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_MapMarkerLocator.cpp
+    Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_MapMarkerLocator.h
+    Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_MapMissionTabReader.cpp
+    Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_MapMissionTabReader.h
+    Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_MapWeatherAndTimeReader.cpp
+    Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_MapWeatherAndTimeReader.h
+    Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_MapZoomLevelReader.cpp
+    Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_MapZoomLevelReader.h
+    Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_MMOSpriteStarSymbolDetector.cpp
+    Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_MMOSpriteStarSymbolDetector.h
+    Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_OutbreakReader.cpp
+    Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_OutbreakReader.h
+    Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_PokemonMapSpriteReader.cpp
+    Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_PokemonMapSpriteReader.h
+    Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_SelectedRegionDetector.cpp
+    Source/VideoGames/PokemonLA/Inference/Map/PokemonLA_SelectedRegionDetector.h
+    Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_ArcDetector.cpp
+    Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_ArcDetector.h
+    Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_ArcPhoneDetector.cpp
+    Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_ArcPhoneDetector.h
+    Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_BattleSpriteArrowDetector.cpp
+    Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_BattleSpriteArrowDetector.h
+    Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_BubbleDetector.cpp
+    Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_BubbleDetector.h
+    Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_ButtonDetector.cpp
+    Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_ButtonDetector.h
+    Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_DialogEllipseDetector.cpp
+    Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_DialogEllipseDetector.h
+    Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_DialogYellowArrowDetector.cpp
+    Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_DialogYellowArrowDetector.h
+    Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_FlagDetector.cpp
+    Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_FlagDetector.h
+    Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_FlagTracker.cpp
+    Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_FlagTracker.h
+    Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_MMOQuestionMarkDetector.cpp
+    Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_MMOQuestionMarkDetector.h
+    Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_QuestMarkDetector.cpp
+    Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_QuestMarkDetector.h
+    Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_ShinySymbolDetector.cpp
+    Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_ShinySymbolDetector.h
+    Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_WhiteObjectDetector.cpp
+    Source/VideoGames/PokemonLA/Inference/Objects/PokemonLA_WhiteObjectDetector.h
+    Source/VideoGames/PokemonLA/Inference/PokemonLA_BerryTreeDetector.cpp
+    Source/VideoGames/PokemonLA/Inference/PokemonLA_BerryTreeDetector.h
+    Source/VideoGames/PokemonLA/Inference/PokemonLA_BlackOutDetector.cpp
+    Source/VideoGames/PokemonLA/Inference/PokemonLA_BlackOutDetector.h
+    Source/VideoGames/PokemonLA/Inference/PokemonLA_CommonColorCheck.cpp
+    Source/VideoGames/PokemonLA/Inference/PokemonLA_CommonColorCheck.h
+    Source/VideoGames/PokemonLA/Inference/PokemonLA_DialogDetector.cpp
+    Source/VideoGames/PokemonLA/Inference/PokemonLA_DialogDetector.h
+    Source/VideoGames/PokemonLA/Inference/PokemonLA_ItemCompatibilityDetector.cpp
+    Source/VideoGames/PokemonLA/Inference/PokemonLA_ItemCompatibilityDetector.h
+    Source/VideoGames/PokemonLA/Inference/PokemonLA_MountDetector.cpp
+    Source/VideoGames/PokemonLA/Inference/PokemonLA_MountDetector.h
+    Source/VideoGames/PokemonLA/Inference/PokemonLA_NotificationReader.cpp
+    Source/VideoGames/PokemonLA/Inference/PokemonLA_NotificationReader.h
+    Source/VideoGames/PokemonLA/Inference/PokemonLA_OverworldDetector.cpp
+    Source/VideoGames/PokemonLA/Inference/PokemonLA_OverworldDetector.h
+    Source/VideoGames/PokemonLA/Inference/PokemonLA_StatusInfoScreenDetector.cpp
+    Source/VideoGames/PokemonLA/Inference/PokemonLA_StatusInfoScreenDetector.h
+    Source/VideoGames/PokemonLA/Inference/PokemonLA_UnderAttackDetector.cpp
+    Source/VideoGames/PokemonLA/Inference/PokemonLA_UnderAttackDetector.h
+    Source/VideoGames/PokemonLA/Inference/PokemonLA_WildPokemonFocusDetector.cpp
+    Source/VideoGames/PokemonLA/Inference/PokemonLA_WildPokemonFocusDetector.h
+    Source/VideoGames/PokemonLA/Inference/Sounds/PokemonLA_AlphaMusicDetector.cpp
+    Source/VideoGames/PokemonLA/Inference/Sounds/PokemonLA_AlphaMusicDetector.h
+    Source/VideoGames/PokemonLA/Inference/Sounds/PokemonLA_AlphaRoarDetector.cpp
+    Source/VideoGames/PokemonLA/Inference/Sounds/PokemonLA_AlphaRoarDetector.h
+    Source/VideoGames/PokemonLA/Inference/Sounds/PokemonLA_ItemDropSoundDetector.cpp
+    Source/VideoGames/PokemonLA/Inference/Sounds/PokemonLA_ItemDropSoundDetector.h
+    Source/VideoGames/PokemonLA/Inference/Sounds/PokemonLA_ShinySoundDetector.cpp
+    Source/VideoGames/PokemonLA/Inference/Sounds/PokemonLA_ShinySoundDetector.h
+    Source/VideoGames/PokemonLA/Options/PokemonLA_BattlePokemonActionTable.cpp
+    Source/VideoGames/PokemonLA/Options/PokemonLA_BattlePokemonActionTable.h
+    Source/VideoGames/PokemonLA/Options/PokemonLA_CustomPathTable.cpp
+    Source/VideoGames/PokemonLA/Options/PokemonLA_CustomPathTable.h
+    Source/VideoGames/PokemonLA/Options/PokemonLA_IngoOpponent.cpp
+    Source/VideoGames/PokemonLA/Options/PokemonLA_IngoOpponent.h
+    Source/VideoGames/PokemonLA/Options/PokemonLA_MiscOptions.h
+    Source/VideoGames/PokemonLA/Options/PokemonLA_ShinyDetectedAction.cpp
+    Source/VideoGames/PokemonLA/Options/PokemonLA_ShinyDetectedAction.h
+    Source/VideoGames/PokemonLA/Options/PokemonLA_TradeCountTable.cpp
+    Source/VideoGames/PokemonLA/Options/PokemonLA_TradeCountTable.h
+    Source/VideoGames/PokemonLA/Options/PokemonLA_TravelLocation.cpp
+    Source/VideoGames/PokemonLA/Options/PokemonLA_TravelLocation.h
+    Source/VideoGames/PokemonLA/Options/QtWidgets/PokemonLA_CustomPathTableWidget.cpp
+    Source/VideoGames/PokemonLA/Options/QtWidgets/PokemonLA_CustomPathTableWidget.h
+    Source/VideoGames/PokemonLA/Panels_PokemonLA.cpp
+    Source/VideoGames/PokemonLA/Panels_PokemonLA.h
+    Source/VideoGames/PokemonLA/PokemonLA_Locations.cpp
+    Source/VideoGames/PokemonLA/PokemonLA_Locations.h
+    Source/VideoGames/PokemonLA/PokemonLA_Panels.cpp
+    Source/VideoGames/PokemonLA/PokemonLA_Panels.h
+    Source/VideoGames/PokemonLA/PokemonLA_Settings.cpp
+    Source/VideoGames/PokemonLA/PokemonLA_Settings.h
+    Source/VideoGames/PokemonLA/PokemonLA_Tests.cpp
+    Source/VideoGames/PokemonLA/PokemonLA_Tests.h
+    Source/VideoGames/PokemonLA/PokemonLA_TravelLocations.cpp
+    Source/VideoGames/PokemonLA/PokemonLA_TravelLocations.h
+    Source/VideoGames/PokemonLA/PokemonLA_WeatherAndTime.cpp
+    Source/VideoGames/PokemonLA/PokemonLA_WeatherAndTime.h
+    Source/VideoGames/PokemonLA/Programs/Farming/PokemonLA_IngoBattleGrinder.cpp
+    Source/VideoGames/PokemonLA/Programs/Farming/PokemonLA_IngoBattleGrinder.h
+    Source/VideoGames/PokemonLA/Programs/Farming/PokemonLA_IngoMoveGrinder.cpp
+    Source/VideoGames/PokemonLA/Programs/Farming/PokemonLA_IngoMoveGrinder.h
+    Source/VideoGames/PokemonLA/Programs/Farming/PokemonLA_LeapGrinder.cpp
+    Source/VideoGames/PokemonLA/Programs/Farming/PokemonLA_LeapGrinder.h
+    Source/VideoGames/PokemonLA/Programs/Farming/PokemonLA_MagikarpMoveGrinder.cpp
+    Source/VideoGames/PokemonLA/Programs/Farming/PokemonLA_MagikarpMoveGrinder.h
+    Source/VideoGames/PokemonLA/Programs/Farming/PokemonLA_NuggetFarmerHighlands.cpp
+    Source/VideoGames/PokemonLA/Programs/Farming/PokemonLA_NuggetFarmerHighlands.h
+    Source/VideoGames/PokemonLA/Programs/Farming/PokemonLA_TenacityCandyFarmer.cpp
+    Source/VideoGames/PokemonLA/Programs/Farming/PokemonLA_TenacityCandyFarmer.h
+    Source/VideoGames/PokemonLA/Programs/General/PokemonLA_ApplyGrits.cpp
+    Source/VideoGames/PokemonLA/Programs/General/PokemonLA_ApplyGrits.h
+    Source/VideoGames/PokemonLA/Programs/General/PokemonLA_BraviaryHeightGlitch.cpp
+    Source/VideoGames/PokemonLA/Programs/General/PokemonLA_BraviaryHeightGlitch.h
+    Source/VideoGames/PokemonLA/Programs/General/PokemonLA_ClothingBuyer.cpp
+    Source/VideoGames/PokemonLA/Programs/General/PokemonLA_ClothingBuyer.h
+    Source/VideoGames/PokemonLA/Programs/General/PokemonLA_DistortionWaiter.cpp
+    Source/VideoGames/PokemonLA/Programs/General/PokemonLA_DistortionWaiter.h
+    Source/VideoGames/PokemonLA/Programs/General/PokemonLA_MMORoutines.cpp
+    Source/VideoGames/PokemonLA/Programs/General/PokemonLA_MMORoutines.h
+    Source/VideoGames/PokemonLA/Programs/General/PokemonLA_OutbreakFinder.cpp
+    Source/VideoGames/PokemonLA/Programs/General/PokemonLA_OutbreakFinder.h
+    Source/VideoGames/PokemonLA/Programs/General/PokemonLA_PokedexTasksReader.cpp
+    Source/VideoGames/PokemonLA/Programs/General/PokemonLA_PokedexTasksReader.h
+    Source/VideoGames/PokemonLA/Programs/General/PokemonLA_RamanasIslandCombee.cpp
+    Source/VideoGames/PokemonLA/Programs/General/PokemonLA_RamanasIslandCombee.h
+    Source/VideoGames/PokemonLA/Programs/General/PokemonLA_SkipToFullMoon.cpp
+    Source/VideoGames/PokemonLA/Programs/General/PokemonLA_SkipToFullMoon.h
+    Source/VideoGames/PokemonLA/Programs/ML/PokemonLA_GeneratePokemonImageTrainingData.cpp
+    Source/VideoGames/PokemonLA/Programs/ML/PokemonLA_GeneratePokemonImageTrainingData.h
+    Source/VideoGames/PokemonLA/Programs/PokemonLA_BattleRoutines.cpp
+    Source/VideoGames/PokemonLA/Programs/PokemonLA_BattleRoutines.h
+    Source/VideoGames/PokemonLA/Programs/PokemonLA_EscapeFromAttack.cpp
+    Source/VideoGames/PokemonLA/Programs/PokemonLA_EscapeFromAttack.h
+    Source/VideoGames/PokemonLA/Programs/PokemonLA_FlagNavigationAir.cpp
+    Source/VideoGames/PokemonLA/Programs/PokemonLA_FlagNavigationAir.h
+    Source/VideoGames/PokemonLA/Programs/PokemonLA_GameEntry.cpp
+    Source/VideoGames/PokemonLA/Programs/PokemonLA_GameEntry.h
+    Source/VideoGames/PokemonLA/Programs/PokemonLA_GameSave.cpp
+    Source/VideoGames/PokemonLA/Programs/PokemonLA_GameSave.h
+    Source/VideoGames/PokemonLA/Programs/PokemonLA_LeapPokemonActions.cpp
+    Source/VideoGames/PokemonLA/Programs/PokemonLA_LeapPokemonActions.h
+    Source/VideoGames/PokemonLA/Programs/PokemonLA_MountChange.cpp
+    Source/VideoGames/PokemonLA/Programs/PokemonLA_MountChange.h
+    Source/VideoGames/PokemonLA/Programs/PokemonLA_RegionNavigation.cpp
+    Source/VideoGames/PokemonLA/Programs/PokemonLA_RegionNavigation.h
+    Source/VideoGames/PokemonLA/Programs/PokemonLA_TimeOfDayChange.cpp
+    Source/VideoGames/PokemonLA/Programs/PokemonLA_TimeOfDayChange.h
+    Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_AutoMultiSpawn.cpp
+    Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_AutoMultiSpawn.h
+    Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_BurmyFinder.cpp
+    Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_BurmyFinder.h
+    Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_CrobatFinder.cpp
+    Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_CrobatFinder.h
+    Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_FroslassFinder.cpp
+    Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_FroslassFinder.h
+    Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_GalladeFinder.cpp
+    Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_GalladeFinder.h
+    Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_PostMMOSpawnReset.cpp
+    Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_PostMMOSpawnReset.h
+    Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_ShinyHunt-CustomPath.cpp
+    Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_ShinyHunt-CustomPath.h
+    Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_ShinyHunt-FlagPin.cpp
+    Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_ShinyHunt-FlagPin.h
+    Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_UnownFinder.cpp
+    Source/VideoGames/PokemonLA/Programs/ShinyHunting/PokemonLA_UnownFinder.h
+    Source/VideoGames/PokemonLA/Programs/TestPrograms/PokemonLA_FlagNavigationTest.cpp
+    Source/VideoGames/PokemonLA/Programs/TestPrograms/PokemonLA_FlagNavigationTest.h
+    Source/VideoGames/PokemonLA/Programs/TestPrograms/PokemonLA_MountDetectionTest.cpp
+    Source/VideoGames/PokemonLA/Programs/TestPrograms/PokemonLA_MountDetectionTest.h
+    Source/VideoGames/PokemonLA/Programs/TestPrograms/PokemonLA_OverworldWatcher.cpp
+    Source/VideoGames/PokemonLA/Programs/TestPrograms/PokemonLA_OverworldWatcher.h
+    Source/VideoGames/PokemonLA/Programs/TestPrograms/PokemonLA_SoundListener.cpp
+    Source/VideoGames/PokemonLA/Programs/TestPrograms/PokemonLA_SoundListener.h
+    Source/VideoGames/PokemonLA/Programs/Trading/PokemonLA_SelfBoxTrade.cpp
+    Source/VideoGames/PokemonLA/Programs/Trading/PokemonLA_SelfBoxTrade.h
+    Source/VideoGames/PokemonLA/Programs/Trading/PokemonLA_SelfTouchTrade.cpp
+    Source/VideoGames/PokemonLA/Programs/Trading/PokemonLA_SelfTouchTrade.h
+    Source/VideoGames/PokemonLA/Programs/Trading/PokemonLA_TradeRoutines.cpp
+    Source/VideoGames/PokemonLA/Programs/Trading/PokemonLA_TradeRoutines.h
+    Source/VideoGames/PokemonLA/Resources/PokemonLA_AvailablePokemon.cpp
+    Source/VideoGames/PokemonLA/Resources/PokemonLA_AvailablePokemon.h
+    Source/VideoGames/PokemonLA/Resources/PokemonLA_NameDatabase.cpp
+    Source/VideoGames/PokemonLA/Resources/PokemonLA_NameDatabase.h
+    Source/VideoGames/PokemonLA/Resources/PokemonLA_PokemonInfo.cpp
+    Source/VideoGames/PokemonLA/Resources/PokemonLA_PokemonInfo.h
+    Source/VideoGames/PokemonLA/Resources/PokemonLA_PokemonSprites.cpp
+    Source/VideoGames/PokemonLA/Resources/PokemonLA_PokemonSprites.h
+    Source/VideoGames/PokemonLA/Resources/PokemonLA_WeatherAndTimeIcons.cpp
+    Source/VideoGames/PokemonLA/Resources/PokemonLA_WeatherAndTimeIcons.h
+    Source/VideoGames/PokemonLGPE/Commands/PokemonLGPE_DateSpam.cpp
+    Source/VideoGames/PokemonLGPE/Commands/PokemonLGPE_DateSpam.h
+    Source/VideoGames/PokemonLGPE/Inference/Battles/PokemonLGPE_BattleArrowDetector.cpp
+    Source/VideoGames/PokemonLGPE/Inference/Battles/PokemonLGPE_BattleArrowDetector.h
+    Source/VideoGames/PokemonLGPE/Inference/PokemonLGPE_ShinySymbolDetector.cpp
+    Source/VideoGames/PokemonLGPE/Inference/PokemonLGPE_ShinySymbolDetector.h
+    Source/VideoGames/PokemonLGPE/Inference/Sounds/PokemonLGPE_ShinySoundDetector.cpp
+    Source/VideoGames/PokemonLGPE/Inference/Sounds/PokemonLGPE_ShinySoundDetector.h
+    Source/VideoGames/PokemonLGPE/PokemonLGPE_Panels.cpp
+    Source/VideoGames/PokemonLGPE/PokemonLGPE_Panels.h
+    Source/VideoGames/PokemonLGPE/PokemonLGPE_Settings.cpp
+    Source/VideoGames/PokemonLGPE/PokemonLGPE_Settings.h
+    Source/VideoGames/PokemonLGPE/Programs/Farming/PokemonLGPE_DailyItemFarmer.cpp
+    Source/VideoGames/PokemonLGPE/Programs/Farming/PokemonLGPE_DailyItemFarmer.h
+    Source/VideoGames/PokemonLGPE/Programs/PokemonLGPE_GameEntry.cpp
+    Source/VideoGames/PokemonLGPE/Programs/PokemonLGPE_GameEntry.h
+    Source/VideoGames/PokemonLGPE/Programs/ShinyHunting/PokemonLGPE_AlolanTrade.cpp
+    Source/VideoGames/PokemonLGPE/Programs/ShinyHunting/PokemonLGPE_AlolanTrade.h
+    Source/VideoGames/PokemonLGPE/Programs/ShinyHunting/PokemonLGPE_FossilRevival.cpp
+    Source/VideoGames/PokemonLGPE/Programs/ShinyHunting/PokemonLGPE_FossilRevival.h
+    Source/VideoGames/PokemonLGPE/Programs/ShinyHunting/PokemonLGPE_GiftReset.cpp
+    Source/VideoGames/PokemonLGPE/Programs/ShinyHunting/PokemonLGPE_GiftReset.h
+    Source/VideoGames/PokemonLGPE/Programs/ShinyHunting/PokemonLGPE_LegendaryReset.cpp
+    Source/VideoGames/PokemonLGPE/Programs/ShinyHunting/PokemonLGPE_LegendaryReset.h
+    Source/VideoGames/PokemonLGPE/Programs/TestPrograms/PokemonLGPE_SoundListener.cpp
+    Source/VideoGames/PokemonLGPE/Programs/TestPrograms/PokemonLGPE_SoundListener.h
+    Source/VideoGames/PokemonLZA/Inference/Battles/PokemonLZA_MoveEffectivenessSymbol.cpp
+    Source/VideoGames/PokemonLZA/Inference/Battles/PokemonLZA_MoveEffectivenessSymbol.h
+    Source/VideoGames/PokemonLZA/Inference/Battles/PokemonLZA_RunFromBattleDetector.cpp
+    Source/VideoGames/PokemonLZA/Inference/Battles/PokemonLZA_RunFromBattleDetector.h
+    Source/VideoGames/PokemonLZA/Inference/Boxes/PokemonLZA_BoxDetection.cpp
+    Source/VideoGames/PokemonLZA/Inference/Boxes/PokemonLZA_BoxDetection.h
+    Source/VideoGames/PokemonLZA/Inference/Boxes/PokemonLZA_BoxInfoDetector.cpp
+    Source/VideoGames/PokemonLZA/Inference/Boxes/PokemonLZA_BoxInfoDetector.h
+    Source/VideoGames/PokemonLZA/Inference/Boxes/PokemonLZA_IvJudgeReader.cpp
+    Source/VideoGames/PokemonLZA/Inference/Boxes/PokemonLZA_IvJudgeReader.h
+    Source/VideoGames/PokemonLZA/Inference/Donuts/PokemonLZA_DonutBerriesDetector.cpp
+    Source/VideoGames/PokemonLZA/Inference/Donuts/PokemonLZA_DonutBerriesDetector.h
+    Source/VideoGames/PokemonLZA/Inference/Donuts/PokemonLZA_FlavorPowerDetector.cpp
+    Source/VideoGames/PokemonLZA/Inference/Donuts/PokemonLZA_FlavorPowerDetector.h
+    Source/VideoGames/PokemonLZA/Inference/Donuts/PokemonLZA_FlavorPowerScreenDetector.cpp
+    Source/VideoGames/PokemonLZA/Inference/Donuts/PokemonLZA_FlavorPowerScreenDetector.h
+    Source/VideoGames/PokemonLZA/Inference/Map/PokemonLZA_DirectionArrowDetector.cpp
+    Source/VideoGames/PokemonLZA/Inference/Map/PokemonLZA_DirectionArrowDetector.h
+    Source/VideoGames/PokemonLZA/Inference/Map/PokemonLZA_LocationNameReader.cpp
+    Source/VideoGames/PokemonLZA/Inference/Map/PokemonLZA_LocationNameReader.h
+    Source/VideoGames/PokemonLZA/Inference/Map/PokemonLZA_MapDetector.cpp
+    Source/VideoGames/PokemonLZA/Inference/Map/PokemonLZA_MapDetector.h
+    Source/VideoGames/PokemonLZA/Inference/Map/PokemonLZA_MapIconDetector.cpp
+    Source/VideoGames/PokemonLZA/Inference/Map/PokemonLZA_MapIconDetector.h
+    Source/VideoGames/PokemonLZA/Inference/PokemonLZA_AlertEyeDetector.cpp
+    Source/VideoGames/PokemonLZA/Inference/PokemonLZA_AlertEyeDetector.h
+    Source/VideoGames/PokemonLZA/Inference/PokemonLZA_ButtonDetector.cpp
+    Source/VideoGames/PokemonLZA/Inference/PokemonLZA_ButtonDetector.h
+    Source/VideoGames/PokemonLZA/Inference/PokemonLZA_DayNightChangeDetector.cpp
+    Source/VideoGames/PokemonLZA/Inference/PokemonLZA_DayNightChangeDetector.h
+    Source/VideoGames/PokemonLZA/Inference/PokemonLZA_DayNightStateDetector.cpp
+    Source/VideoGames/PokemonLZA/Inference/PokemonLZA_DayNightStateDetector.h
+    Source/VideoGames/PokemonLZA/Inference/PokemonLZA_DialogDetector.cpp
+    Source/VideoGames/PokemonLZA/Inference/PokemonLZA_DialogDetector.h
+    Source/VideoGames/PokemonLZA/Inference/PokemonLZA_HyperspaceCalorieDetector.cpp
+    Source/VideoGames/PokemonLZA/Inference/PokemonLZA_HyperspaceCalorieDetector.h
+    Source/VideoGames/PokemonLZA/Inference/PokemonLZA_HyperspaceRewardNameReader.cpp
+    Source/VideoGames/PokemonLZA/Inference/PokemonLZA_HyperspaceRewardNameReader.h
+    Source/VideoGames/PokemonLZA/Inference/PokemonLZA_MainMenuDetector.cpp
+    Source/VideoGames/PokemonLZA/Inference/PokemonLZA_MainMenuDetector.h
+    Source/VideoGames/PokemonLZA/Inference/PokemonLZA_OverworldPartySelectionDetector.cpp
+    Source/VideoGames/PokemonLZA/Inference/PokemonLZA_OverworldPartySelectionDetector.h
+    Source/VideoGames/PokemonLZA/Inference/PokemonLZA_SelectionArrowDetector.cpp
+    Source/VideoGames/PokemonLZA/Inference/PokemonLZA_SelectionArrowDetector.h
+    Source/VideoGames/PokemonLZA/Inference/PokemonLZA_WeatherDetector.cpp
+    Source/VideoGames/PokemonLZA/Inference/PokemonLZA_WeatherDetector.h
+    Source/VideoGames/PokemonLZA/InferenceTraining/PokemonLZA_GenerateLocationNameOCR.cpp
+    Source/VideoGames/PokemonLZA/InferenceTraining/PokemonLZA_GenerateLocationNameOCR.h
+    Source/VideoGames/PokemonLZA/Options/PokemonLZA_BattleAIOption.cpp
+    Source/VideoGames/PokemonLZA/Options/PokemonLZA_BattleAIOption.h
+    Source/VideoGames/PokemonLZA/Options/PokemonLZA_DonutBerriesOption.cpp
+    Source/VideoGames/PokemonLZA/Options/PokemonLZA_DonutBerriesOption.h
+    Source/VideoGames/PokemonLZA/Options/PokemonLZA_HyperspaceRewardOption.cpp
+    Source/VideoGames/PokemonLZA/Options/PokemonLZA_HyperspaceRewardOption.h
+    Source/VideoGames/PokemonLZA/Options/PokemonLZA_HyperspaceRewardTable.cpp
+    Source/VideoGames/PokemonLZA/Options/PokemonLZA_HyperspaceRewardTable.h
+    Source/VideoGames/PokemonLZA/Options/PokemonLZA_ShinyDetectedAction.cpp
+    Source/VideoGames/PokemonLZA/Options/PokemonLZA_ShinyDetectedAction.h
+    Source/VideoGames/PokemonLZA/PokemonLZA_Panels.cpp
+    Source/VideoGames/PokemonLZA/PokemonLZA_Panels.h
+    Source/VideoGames/PokemonLZA/PokemonLZA_Settings.cpp
+    Source/VideoGames/PokemonLZA/PokemonLZA_Settings.h
+    Source/VideoGames/PokemonLZA/PokemonLZA_Tests.cpp
+    Source/VideoGames/PokemonLZA/PokemonLZA_Tests.h
+    Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_DonutMaker.cpp
+    Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_DonutMaker.h
+    Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_FriendshipFarmer.cpp
+    Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_FriendshipFarmer.h
+    Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_HyperspaceRewardReset.cpp
+    Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_HyperspaceRewardReset.h
+    Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_InPlaceCatcher.cpp
+    Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_InPlaceCatcher.h
+    Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_JacintheInfiniteFarmer.cpp
+    Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_JacintheInfiniteFarmer.h
+    Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_MegaShardFarmer.cpp
+    Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_MegaShardFarmer.h
+    Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_RestaurantFarmer.cpp
+    Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_RestaurantFarmer.h
+    Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_WigglytuffFarmer.cpp
+    Source/VideoGames/PokemonLZA/Programs/Farming/PokemonLZA_WigglytuffFarmer.h
+    Source/VideoGames/PokemonLZA/Programs/NonShinyHunting/PokemonLZA_StatsReset.cpp
+    Source/VideoGames/PokemonLZA/Programs/NonShinyHunting/PokemonLZA_StatsReset.h
+    Source/VideoGames/PokemonLZA/Programs/NonShinyHunting/PokemonLZA_WeatherFinder.cpp
+    Source/VideoGames/PokemonLZA/Programs/NonShinyHunting/PokemonLZA_WeatherFinder.h
+    Source/VideoGames/PokemonLZA/Programs/PokemonLZA_BasicNavigation.cpp
+    Source/VideoGames/PokemonLZA/Programs/PokemonLZA_BasicNavigation.h
+    Source/VideoGames/PokemonLZA/Programs/PokemonLZA_BoxSorter.cpp
+    Source/VideoGames/PokemonLZA/Programs/PokemonLZA_BoxSorter.h
+    Source/VideoGames/PokemonLZA/Programs/PokemonLZA_ClothingBuyer.cpp
+    Source/VideoGames/PokemonLZA/Programs/PokemonLZA_ClothingBuyer.h
+    Source/VideoGames/PokemonLZA/Programs/PokemonLZA_DonutBerrySession.cpp
+    Source/VideoGames/PokemonLZA/Programs/PokemonLZA_DonutBerrySession.h
+    Source/VideoGames/PokemonLZA/Programs/PokemonLZA_FastTravelNavigation.cpp
+    Source/VideoGames/PokemonLZA/Programs/PokemonLZA_FastTravelNavigation.h
+    Source/VideoGames/PokemonLZA/Programs/PokemonLZA_GameEntry.cpp
+    Source/VideoGames/PokemonLZA/Programs/PokemonLZA_GameEntry.h
+    Source/VideoGames/PokemonLZA/Programs/PokemonLZA_HyperspaceNavigation.cpp
+    Source/VideoGames/PokemonLZA/Programs/PokemonLZA_HyperspaceNavigation.h
+    Source/VideoGames/PokemonLZA/Programs/PokemonLZA_MegaShardFarmer.cpp
+    Source/VideoGames/PokemonLZA/Programs/PokemonLZA_MegaShardFarmer.h
+    Source/VideoGames/PokemonLZA/Programs/PokemonLZA_MenuNavigation.cpp
+    Source/VideoGames/PokemonLZA/Programs/PokemonLZA_MenuNavigation.h
+    Source/VideoGames/PokemonLZA/Programs/PokemonLZA_PostKillCatcher.cpp
+    Source/VideoGames/PokemonLZA/Programs/PokemonLZA_PostKillCatcher.h
+    Source/VideoGames/PokemonLZA/Programs/PokemonLZA_StallBuyer.cpp
+    Source/VideoGames/PokemonLZA/Programs/PokemonLZA_StallBuyer.h
+    Source/VideoGames/PokemonLZA/Programs/PokemonLZA_TrainerBattle.cpp
+    Source/VideoGames/PokemonLZA/Programs/PokemonLZA_TrainerBattle.h
+    Source/VideoGames/PokemonLZA/Programs/PokemonLZA_TurboMacro.cpp
+    Source/VideoGames/PokemonLZA/Programs/PokemonLZA_TurboMacro.h
+    Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_AutoFossil.cpp
+    Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_AutoFossil.h
+    Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_BeldumHunter.cpp
+    Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_BeldumHunter.h
+    Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_SewerHunter.cpp
+    Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_SewerHunter.h
+    Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_BenchSit.cpp
+    Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_BenchSit.h
+    Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_FlySpotReset.cpp
+    Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_FlySpotReset.h
+    Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_HelioptileHunter.cpp
+    Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_HelioptileHunter.h
+    Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_HyperspaceHunter.cpp
+    Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_HyperspaceHunter.h
+    Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_HyperspaceLegendary.cpp
+    Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_HyperspaceLegendary.h
+    Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_OverworldReset.cpp
+    Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShinyHunt_OverworldReset.h
+    Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShuttleRun.cpp
+    Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_ShuttleRun.h
+    Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_WildZoneCafe.cpp
+    Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_WildZoneCafe.h
+    Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_WildZoneEntrance.cpp
+    Source/VideoGames/PokemonLZA/Programs/ShinyHunting/PokemonLZA_WildZoneEntrance.h
+    Source/VideoGames/PokemonLZA/Programs/TestPrograms/PokemonLZA_MoveBoxArrow.cpp
+    Source/VideoGames/PokemonLZA/Programs/TestPrograms/PokemonLZA_MoveBoxArrow.h
+    Source/VideoGames/PokemonLZA/Programs/TestPrograms/PokemonLZA_OverworldWatcher.cpp
+    Source/VideoGames/PokemonLZA/Programs/TestPrograms/PokemonLZA_OverworldWatcher.h
+    Source/VideoGames/PokemonLZA/Programs/TestPrograms/PokemonLZA_TestBoxCellInfo.cpp
+    Source/VideoGames/PokemonLZA/Programs/TestPrograms/PokemonLZA_TestBoxCellInfo.h
+    Source/VideoGames/PokemonLZA/Programs/Trading/PokemonLZA_SelfBoxTrade.cpp
+    Source/VideoGames/PokemonLZA/Programs/Trading/PokemonLZA_SelfBoxTrade.h
+    Source/VideoGames/PokemonLZA/Programs/Trading/PokemonLZA_TradeRoutines.cpp
+    Source/VideoGames/PokemonLZA/Programs/Trading/PokemonLZA_TradeRoutines.h
+    Source/VideoGames/PokemonLZA/Resources/PokemonLZA_AvailablePokemon.cpp
+    Source/VideoGames/PokemonLZA/Resources/PokemonLZA_AvailablePokemon.h
+    Source/VideoGames/PokemonLZA/Resources/PokemonLZA_DonutBerries.cpp
+    Source/VideoGames/PokemonLZA/Resources/PokemonLZA_DonutBerries.h
+    Source/VideoGames/PokemonLZA/Resources/PokemonLZA_HyperspaceRewardNames.cpp
+    Source/VideoGames/PokemonLZA/Resources/PokemonLZA_HyperspaceRewardNames.h
+    Source/VideoGames/PokemonLZA/Resources/PokemonLZA_Locations.cpp
+    Source/VideoGames/PokemonLZA/Resources/PokemonLZA_Locations.h
+    Source/VideoGames/PokemonPokopia/Inference/PokemonPokopia_ButtonDetector.cpp
+    Source/VideoGames/PokemonPokopia/Inference/PokemonPokopia_ButtonDetector.h
+    Source/VideoGames/PokemonPokopia/Inference/PokemonPokopia_MovesDetection.cpp
+    Source/VideoGames/PokemonPokopia/Inference/PokemonPokopia_MovesDetection.h
+    Source/VideoGames/PokemonPokopia/Inference/PokemonPokopia_PCDetection.cpp
+    Source/VideoGames/PokemonPokopia/Inference/PokemonPokopia_PCDetection.h
+    Source/VideoGames/PokemonPokopia/Inference/PokemonPokopia_SelectionArrowDetector.cpp
+    Source/VideoGames/PokemonPokopia/Inference/PokemonPokopia_SelectionArrowDetector.h
+    Source/VideoGames/PokemonPokopia/Inference/PokemonPokopia_SettingsScreenDetector.cpp
+    Source/VideoGames/PokemonPokopia/Inference/PokemonPokopia_SettingsScreenDetector.h
+    Source/VideoGames/PokemonPokopia/PokemonPokopia_Panels.cpp
+    Source/VideoGames/PokemonPokopia/PokemonPokopia_Panels.h
+    Source/VideoGames/PokemonPokopia/PokemonPokopia_Settings.cpp
+    Source/VideoGames/PokemonPokopia/PokemonPokopia_Settings.h
+    Source/VideoGames/PokemonPokopia/Programs/PokemonPokopia_CloudIslandReset.cpp
+    Source/VideoGames/PokemonPokopia/Programs/PokemonPokopia_CloudIslandReset.h
+    Source/VideoGames/PokemonPokopia/Programs/PokemonPokopia_DailyFarmer.cpp
+    Source/VideoGames/PokemonPokopia/Programs/PokemonPokopia_DailyFarmer.h
+    Source/VideoGames/PokemonPokopia/Programs/PokemonPokopia_PCNavigation.cpp
+    Source/VideoGames/PokemonPokopia/Programs/PokemonPokopia_PCNavigation.h
+    Source/VideoGames/PokemonRSE/Inference/Dialogs/PokemonRSE_BattleDialogs.cpp
+    Source/VideoGames/PokemonRSE/Inference/Dialogs/PokemonRSE_BattleDialogs.h
+    Source/VideoGames/PokemonRSE/Inference/Dialogs/PokemonRSE_DialogDetector.cpp
+    Source/VideoGames/PokemonRSE/Inference/Dialogs/PokemonRSE_DialogDetector.h
+    Source/VideoGames/PokemonRSE/Inference/Menus/PokemonRSE_LoadMenuDetector.cpp
+    Source/VideoGames/PokemonRSE/Inference/Menus/PokemonRSE_LoadMenuDetector.h
+    Source/VideoGames/PokemonRSE/Inference/Menus/PokemonRSE_PartyMenuDetector.cpp
+    Source/VideoGames/PokemonRSE/Inference/Menus/PokemonRSE_PartyMenuDetector.h
+    Source/VideoGames/PokemonRSE/Inference/Menus/PokemonRSE_StartMenuDetector.cpp
+    Source/VideoGames/PokemonRSE/Inference/Menus/PokemonRSE_StartMenuDetector.h
+    Source/VideoGames/PokemonRSE/Inference/Menus/PokemonRSE_SummaryDetector.cpp
+    Source/VideoGames/PokemonRSE/Inference/Menus/PokemonRSE_SummaryDetector.h
+    Source/VideoGames/PokemonRSE/Inference/PokemonRSE_SelectionDetector.cpp
+    Source/VideoGames/PokemonRSE/Inference/PokemonRSE_SelectionDetector.h
+    Source/VideoGames/PokemonRSE/Inference/PokemonRSE_ShinyNumberDetector.cpp
+    Source/VideoGames/PokemonRSE/Inference/PokemonRSE_ShinyNumberDetector.h
+    Source/VideoGames/PokemonRSE/Inference/Sounds/PokemonRSE_ShinySoundDetector.cpp
+    Source/VideoGames/PokemonRSE/Inference/Sounds/PokemonRSE_ShinySoundDetector.h
+    Source/VideoGames/PokemonRSE/PokemonRSE_Navigation.cpp
+    Source/VideoGames/PokemonRSE/PokemonRSE_Navigation.h
+    Source/VideoGames/PokemonRSE/PokemonRSE_Panels.cpp
+    Source/VideoGames/PokemonRSE/PokemonRSE_Panels.h
+    Source/VideoGames/PokemonRSE/PokemonRSE_Settings.cpp
+    Source/VideoGames/PokemonRSE/PokemonRSE_Settings.h
+    Source/VideoGames/PokemonRSE/PokemonRSE_Tests.cpp
+    Source/VideoGames/PokemonRSE/PokemonRSE_Tests.h
+    Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_AudioStarterReset.cpp
+    Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_AudioStarterReset.h
+    Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_GiftReset.cpp
+    Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_GiftReset.h
+    Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_LegendaryReset.cpp
+    Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_LegendaryReset.h
+    Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_LegendaryRunAway-Emerald.cpp
+    Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_LegendaryRunAway-Emerald.h
+    Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_ShinyHunt-Deoxys.cpp
+    Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_ShinyHunt-Deoxys.h
+    Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_ShinyHunt-Mew.cpp
+    Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_ShinyHunt-Mew.h
+    Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_StarterReset.cpp
+    Source/VideoGames/PokemonRSE/Programs/ShinyHunting/PokemonRSE_StarterReset.h
+    Source/VideoGames/PokemonRSE/Programs/TestPrograms/PokemonRSE_SoundListener.cpp
+    Source/VideoGames/PokemonRSE/Programs/TestPrograms/PokemonRSE_SoundListener.h
+    Source/VideoGames/PokemonSV/Inference/Battles/PokemonSV_BattleBallReader.cpp
+    Source/VideoGames/PokemonSV/Inference/Battles/PokemonSV_BattleBallReader.h
+    Source/VideoGames/PokemonSV/Inference/Battles/PokemonSV_EncounterWatcher.cpp
+    Source/VideoGames/PokemonSV/Inference/Battles/PokemonSV_EncounterWatcher.h
+    Source/VideoGames/PokemonSV/Inference/Battles/PokemonSV_NormalBattleMenus.cpp
+    Source/VideoGames/PokemonSV/Inference/Battles/PokemonSV_NormalBattleMenus.h
+    Source/VideoGames/PokemonSV/Inference/Battles/PokemonSV_PostCatchDetector.cpp
+    Source/VideoGames/PokemonSV/Inference/Battles/PokemonSV_PostCatchDetector.h
+    Source/VideoGames/PokemonSV/Inference/Battles/PokemonSV_ShinySoundDetector.cpp
+    Source/VideoGames/PokemonSV/Inference/Battles/PokemonSV_ShinySoundDetector.h
+    Source/VideoGames/PokemonSV/Inference/Battles/PokemonSV_StartBattleYellowBar.cpp
+    Source/VideoGames/PokemonSV/Inference/Battles/PokemonSV_StartBattleYellowBar.h
+    Source/VideoGames/PokemonSV/Inference/Battles/PokemonSV_TeraBattleMenus.cpp
+    Source/VideoGames/PokemonSV/Inference/Battles/PokemonSV_TeraBattleMenus.h
+    Source/VideoGames/PokemonSV/Inference/Battles/PokemonSV_TeraRewardsMenu.cpp
+    Source/VideoGames/PokemonSV/Inference/Battles/PokemonSV_TeraRewardsMenu.h
+    Source/VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxDetection.cpp
+    Source/VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxDetection.h
+    Source/VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxEggDetector.cpp
+    Source/VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxEggDetector.h
+    Source/VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxGenderDetector.cpp
+    Source/VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxGenderDetector.h
+    Source/VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxNatureDetector.cpp
+    Source/VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxNatureDetector.h
+    Source/VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxShinyDetector.cpp
+    Source/VideoGames/PokemonSV/Inference/Boxes/PokemonSV_BoxShinyDetector.h
+    Source/VideoGames/PokemonSV/Inference/Boxes/PokemonSV_IvJudgeReader.cpp
+    Source/VideoGames/PokemonSV/Inference/Boxes/PokemonSV_IvJudgeReader.h
+    Source/VideoGames/PokemonSV/Inference/Boxes/PokemonSV_StatsResetChecker.cpp
+    Source/VideoGames/PokemonSV/Inference/Boxes/PokemonSV_StatsResetChecker.h
+    Source/VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogArrowDetector.cpp
+    Source/VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogArrowDetector.h
+    Source/VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.cpp
+    Source/VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_DialogDetector.h
+    Source/VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_GradientArrowDetector.cpp
+    Source/VideoGames/PokemonSV/Inference/Dialogs/PokemonSV_GradientArrowDetector.h
+    Source/VideoGames/PokemonSV/Inference/ItemPrinter/PokemonSV_ItemPrinterJobsDetector.cpp
+    Source/VideoGames/PokemonSV/Inference/ItemPrinter/PokemonSV_ItemPrinterJobsDetector.h
+    Source/VideoGames/PokemonSV/Inference/ItemPrinter/PokemonSV_ItemPrinterMaterialDetector.cpp
+    Source/VideoGames/PokemonSV/Inference/ItemPrinter/PokemonSV_ItemPrinterMaterialDetector.h
+    Source/VideoGames/PokemonSV/Inference/ItemPrinter/PokemonSV_ItemPrinterMenuDetector.cpp
+    Source/VideoGames/PokemonSV/Inference/ItemPrinter/PokemonSV_ItemPrinterMenuDetector.h
+    Source/VideoGames/PokemonSV/Inference/ItemPrinter/PokemonSV_ItemPrinterPrizeReader.cpp
+    Source/VideoGames/PokemonSV/Inference/ItemPrinter/PokemonSV_ItemPrinterPrizeReader.h
+    Source/VideoGames/PokemonSV/Inference/Map/PokemonSV_DestinationMarkerDetector.cpp
+    Source/VideoGames/PokemonSV/Inference/Map/PokemonSV_DestinationMarkerDetector.h
+    Source/VideoGames/PokemonSV/Inference/Map/PokemonSV_FastTravelDetector.cpp
+    Source/VideoGames/PokemonSV/Inference/Map/PokemonSV_FastTravelDetector.h
+    Source/VideoGames/PokemonSV/Inference/Map/PokemonSV_MapDetector.cpp
+    Source/VideoGames/PokemonSV/Inference/Map/PokemonSV_MapDetector.h
+    Source/VideoGames/PokemonSV/Inference/Map/PokemonSV_MapMenuDetector.cpp
+    Source/VideoGames/PokemonSV/Inference/Map/PokemonSV_MapMenuDetector.h
+    Source/VideoGames/PokemonSV/Inference/Map/PokemonSV_MapPokeCenterIconDetector.cpp
+    Source/VideoGames/PokemonSV/Inference/Map/PokemonSV_MapPokeCenterIconDetector.h
+    Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_AreaZeroSkyDetector.cpp
+    Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_AreaZeroSkyDetector.h
+    Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.cpp
+    Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_DirectionDetector.h
+    Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_LetsGoHpReader.cpp
+    Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_LetsGoHpReader.h
+    Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_LetsGoKillDetector.cpp
+    Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_LetsGoKillDetector.h
+    Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_NoMinimapDetector.cpp
+    Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_NoMinimapDetector.h
+    Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OliveDetector.cpp
+    Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OliveDetector.h
+    Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.cpp
+    Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldDetector.h
+    Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldSensors.cpp
+    Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_OverworldSensors.h
+    Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_StationaryOverworldWatcher.cpp
+    Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_StationaryOverworldWatcher.h
+    Source/VideoGames/PokemonSV/Inference/Picnics/PokemonSV_PicnicDetector.cpp
+    Source/VideoGames/PokemonSV/Inference/Picnics/PokemonSV_PicnicDetector.h
+    Source/VideoGames/PokemonSV/Inference/Picnics/PokemonSV_SandwichHandDetector.cpp
+    Source/VideoGames/PokemonSV/Inference/Picnics/PokemonSV_SandwichHandDetector.h
+    Source/VideoGames/PokemonSV/Inference/Picnics/PokemonSV_SandwichIngredientDetector.cpp
+    Source/VideoGames/PokemonSV/Inference/Picnics/PokemonSV_SandwichIngredientDetector.h
+    Source/VideoGames/PokemonSV/Inference/Picnics/PokemonSV_SandwichPlateDetector.cpp
+    Source/VideoGames/PokemonSV/Inference/Picnics/PokemonSV_SandwichPlateDetector.h
+    Source/VideoGames/PokemonSV/Inference/Picnics/PokemonSV_SandwichRecipeDetector.cpp
+    Source/VideoGames/PokemonSV/Inference/Picnics/PokemonSV_SandwichRecipeDetector.h
+    Source/VideoGames/PokemonSV/Inference/PokemonSV_AuctionItemNameReader.cpp
+    Source/VideoGames/PokemonSV/Inference/PokemonSV_AuctionItemNameReader.h
+    Source/VideoGames/PokemonSV/Inference/PokemonSV_BagDetector.cpp
+    Source/VideoGames/PokemonSV/Inference/PokemonSV_BagDetector.h
+    Source/VideoGames/PokemonSV/Inference/PokemonSV_BlueberryPointsReader.cpp
+    Source/VideoGames/PokemonSV/Inference/PokemonSV_BlueberryPointsReader.h
+    Source/VideoGames/PokemonSV/Inference/PokemonSV_BlueberryQuestDetector.cpp
+    Source/VideoGames/PokemonSV/Inference/PokemonSV_BlueberryQuestDetector.h
+    Source/VideoGames/PokemonSV/Inference/PokemonSV_BlueberryQuestReader.cpp
+    Source/VideoGames/PokemonSV/Inference/PokemonSV_BlueberryQuestReader.h
+    Source/VideoGames/PokemonSV/Inference/PokemonSV_ClothingTopDetector.cpp
+    Source/VideoGames/PokemonSV/Inference/PokemonSV_ClothingTopDetector.h
+    Source/VideoGames/PokemonSV/Inference/PokemonSV_ESPEmotionDetector.cpp
+    Source/VideoGames/PokemonSV/Inference/PokemonSV_ESPEmotionDetector.h
+    Source/VideoGames/PokemonSV/Inference/PokemonSV_MainMenuDetector.cpp
+    Source/VideoGames/PokemonSV/Inference/PokemonSV_MainMenuDetector.h
+    Source/VideoGames/PokemonSV/Inference/PokemonSV_MenuOptionReader.cpp
+    Source/VideoGames/PokemonSV/Inference/PokemonSV_MenuOptionReader.h
+    Source/VideoGames/PokemonSV/Inference/PokemonSV_MoneyReader.cpp
+    Source/VideoGames/PokemonSV/Inference/PokemonSV_MoneyReader.h
+    Source/VideoGames/PokemonSV/Inference/PokemonSV_PokemonMovesReader.cpp
+    Source/VideoGames/PokemonSV/Inference/PokemonSV_PokemonMovesReader.h
+    Source/VideoGames/PokemonSV/Inference/PokemonSV_PokemonSummaryReader.cpp
+    Source/VideoGames/PokemonSV/Inference/PokemonSV_PokemonSummaryReader.h
+    Source/VideoGames/PokemonSV/Inference/PokemonSV_PokePortalDetector.cpp
+    Source/VideoGames/PokemonSV/Inference/PokemonSV_PokePortalDetector.h
+    Source/VideoGames/PokemonSV/Inference/PokemonSV_StatHexagonReader.cpp
+    Source/VideoGames/PokemonSV/Inference/PokemonSV_StatHexagonReader.h
+    Source/VideoGames/PokemonSV/Inference/PokemonSV_SweatBubbleDetector.cpp
+    Source/VideoGames/PokemonSV/Inference/PokemonSV_SweatBubbleDetector.h
+    Source/VideoGames/PokemonSV/Inference/PokemonSV_TournamentPrizeNameReader.cpp
+    Source/VideoGames/PokemonSV/Inference/PokemonSV_TournamentPrizeNameReader.h
+    Source/VideoGames/PokemonSV/Inference/PokemonSV_TutorialDetector.cpp
+    Source/VideoGames/PokemonSV/Inference/PokemonSV_TutorialDetector.h
+    Source/VideoGames/PokemonSV/Inference/PokemonSV_WhiteButtonDetector.cpp
+    Source/VideoGames/PokemonSV/Inference/PokemonSV_WhiteButtonDetector.h
+    Source/VideoGames/PokemonSV/Inference/PokemonSV_WhiteTriangleDetector.cpp
+    Source/VideoGames/PokemonSV/Inference/PokemonSV_WhiteTriangleDetector.h
+    Source/VideoGames/PokemonSV/Inference/PokemonSV_ZeroGateWarpPromptDetector.cpp
+    Source/VideoGames/PokemonSV/Inference/PokemonSV_ZeroGateWarpPromptDetector.h
+    Source/VideoGames/PokemonSV/Inference/Tera/PokemonSV_TeraCardDetector.cpp
+    Source/VideoGames/PokemonSV/Inference/Tera/PokemonSV_TeraCardDetector.h
+    Source/VideoGames/PokemonSV/Inference/Tera/PokemonSV_TeraCodeReader.cpp
+    Source/VideoGames/PokemonSV/Inference/Tera/PokemonSV_TeraCodeReader.h
+    Source/VideoGames/PokemonSV/Inference/Tera/PokemonSV_TeraRaidSearchDetector.cpp
+    Source/VideoGames/PokemonSV/Inference/Tera/PokemonSV_TeraRaidSearchDetector.h
+    Source/VideoGames/PokemonSV/Inference/Tera/PokemonSV_TeraRewardsReader.cpp
+    Source/VideoGames/PokemonSV/Inference/Tera/PokemonSV_TeraRewardsReader.h
+    Source/VideoGames/PokemonSV/Inference/Tera/PokemonSV_TeraSilhouetteReader.cpp
+    Source/VideoGames/PokemonSV/Inference/Tera/PokemonSV_TeraSilhouetteReader.h
+    Source/VideoGames/PokemonSV/Inference/Tera/PokemonSV_TeraTypeReader.cpp
+    Source/VideoGames/PokemonSV/Inference/Tera/PokemonSV_TeraTypeReader.h
+    Source/VideoGames/PokemonSV/Options/PokemonSV_AuctionItemSelectOption.cpp
+    Source/VideoGames/PokemonSV/Options/PokemonSV_AuctionItemSelectOption.h
+    Source/VideoGames/PokemonSV/Options/PokemonSV_AuctionItemTable.cpp
+    Source/VideoGames/PokemonSV/Options/PokemonSV_AuctionItemTable.h
+    Source/VideoGames/PokemonSV/Options/PokemonSV_AutoHostOptions.h
+    Source/VideoGames/PokemonSV/Options/PokemonSV_BattleMoveTable.cpp
+    Source/VideoGames/PokemonSV/Options/PokemonSV_BattleMoveTable.h
+    Source/VideoGames/PokemonSV/Options/PokemonSV_BBQOption.cpp
+    Source/VideoGames/PokemonSV/Options/PokemonSV_BBQOption.h
+    Source/VideoGames/PokemonSV/Options/PokemonSV_BBQuests.cpp
+    Source/VideoGames/PokemonSV/Options/PokemonSV_BBQuests.h
+    Source/VideoGames/PokemonSV/Options/PokemonSV_EggPowerSandwichOption.cpp
+    Source/VideoGames/PokemonSV/Options/PokemonSV_EggPowerSandwichOption.h
+    Source/VideoGames/PokemonSV/Options/PokemonSV_EncounterActionsTable.cpp
+    Source/VideoGames/PokemonSV/Options/PokemonSV_EncounterActionsTable.h
+    Source/VideoGames/PokemonSV/Options/PokemonSV_EncounterBotCommon.h
+    Source/VideoGames/PokemonSV/Options/PokemonSV_PlayerList.cpp
+    Source/VideoGames/PokemonSV/Options/PokemonSV_PlayerList.h
+    Source/VideoGames/PokemonSV/Options/PokemonSV_SandwichIngredientsOption.cpp
+    Source/VideoGames/PokemonSV/Options/PokemonSV_SandwichIngredientsOption.h
+    Source/VideoGames/PokemonSV/Options/PokemonSV_SandwichIngredientsTable.cpp
+    Source/VideoGames/PokemonSV/Options/PokemonSV_SandwichIngredientsTable.h
+    Source/VideoGames/PokemonSV/Options/PokemonSV_SandwichMakerOption.cpp
+    Source/VideoGames/PokemonSV/Options/PokemonSV_SandwichMakerOption.h
+    Source/VideoGames/PokemonSV/Options/PokemonSV_SinglesAIOption.cpp
+    Source/VideoGames/PokemonSV/Options/PokemonSV_SinglesAIOption.h
+    Source/VideoGames/PokemonSV/Options/PokemonSV_SinglesMoveTable.cpp
+    Source/VideoGames/PokemonSV/Options/PokemonSV_SinglesMoveTable.h
+    Source/VideoGames/PokemonSV/Options/PokemonSV_TeraAIOption.cpp
+    Source/VideoGames/PokemonSV/Options/PokemonSV_TeraAIOption.h
+    Source/VideoGames/PokemonSV/Options/PokemonSV_TeraCatchOnWinOption.cpp
+    Source/VideoGames/PokemonSV/Options/PokemonSV_TeraCatchOnWinOption.h
+    Source/VideoGames/PokemonSV/Options/PokemonSV_TeraMoveTable.cpp
+    Source/VideoGames/PokemonSV/Options/PokemonSV_TeraMoveTable.h
+    Source/VideoGames/PokemonSV/Options/PokemonSV_TeraRollFilter.cpp
+    Source/VideoGames/PokemonSV/Options/PokemonSV_TeraRollFilter.h
+    Source/VideoGames/PokemonSV/Options/PokemonSV_TournamentPrizeSelectOption.cpp
+    Source/VideoGames/PokemonSV/Options/PokemonSV_TournamentPrizeSelectOption.h
+    Source/VideoGames/PokemonSV/Options/PokemonSV_TournamentPrizeTable.cpp
+    Source/VideoGames/PokemonSV/Options/PokemonSV_TournamentPrizeTable.h
+    Source/VideoGames/PokemonSV/PokemonSV_Panels.cpp
+    Source/VideoGames/PokemonSV/PokemonSV_Panels.h
+    Source/VideoGames/PokemonSV/PokemonSV_Settings.cpp
+    Source/VideoGames/PokemonSV/PokemonSV_Settings.h
+    Source/VideoGames/PokemonSV/PokemonSV_Tests.cpp
+    Source/VideoGames/PokemonSV/PokemonSV_Tests.h
+    Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory.cpp
+    Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory.h
+    Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_00.cpp
+    Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_00.h
+    Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_01.cpp
+    Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_01.h
+    Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_02.cpp
+    Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_02.h
+    Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_03.cpp
+    Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_03.h
+    Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_04.cpp
+    Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_04.h
+    Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_05.cpp
+    Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_05.h
+    Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_06.cpp
+    Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_06.h
+    Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_07.cpp
+    Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_07.h
+    Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_08.cpp
+    Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_08.h
+    Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_09.cpp
+    Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_09.h
+    Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_10.cpp
+    Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_10.h
+    Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_11.cpp
+    Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_11.h
+    Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_12.cpp
+    Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_12.h
+    Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_13.cpp
+    Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_13.h
+    Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_14.cpp
+    Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_14.h
+    Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_15.cpp
+    Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_15.h
+    Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_16.cpp
+    Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_16.h
+    Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_17.cpp
+    Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_17.h
+    Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_18.cpp
+    Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_18.h
+    Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_19.cpp
+    Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_19.h
+    Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_20.cpp
+    Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_20.h
+    Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_21.cpp
+    Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_21.h
+    Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_22.cpp
+    Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_22.h
+    Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_23.cpp
+    Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_23.h
+    Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_24.cpp
+    Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_24.h
+    Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_25.cpp
+    Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_25.h
+    Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_26.cpp
+    Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_26.h
+    Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_27.cpp
+    Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_27.h
+    Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_28.cpp
+    Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_28.h
+    Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_29.cpp
+    Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_29.h
+    Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_30.cpp
+    Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_30.h
+    Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_31.cpp
+    Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_31.h
+    Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_32.cpp
+    Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_32.h
+    Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_33.cpp
+    Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_33.h
+    Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_34.cpp
+    Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_34.h
+    Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_35.cpp
+    Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_35.h
+    Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_36.cpp
+    Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_36.h
+    Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_37.cpp
+    Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_37.h
+    Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_38.cpp
+    Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_38.h
+    Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_39.cpp
+    Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_39.h
+    Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_40.cpp
+    Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStory_Segment_40.h
+    Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStoryTools.cpp
+    Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_AutoStoryTools.h
+    Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_MenuOption.cpp
+    Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_MenuOption.h
+    Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_MenuOptionDatabase.cpp
+    Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_MenuOptionDatabase.h
+    Source/VideoGames/PokemonSV/Programs/AutoStory/PokemonSV_OliveActionFailedException.h
+    Source/VideoGames/PokemonSV/Programs/Battles/PokemonSV_BasicCatcher.cpp
+    Source/VideoGames/PokemonSV/Programs/Battles/PokemonSV_BasicCatcher.h
+    Source/VideoGames/PokemonSV/Programs/Battles/PokemonSV_Battles.cpp
+    Source/VideoGames/PokemonSV/Programs/Battles/PokemonSV_Battles.h
+    Source/VideoGames/PokemonSV/Programs/Battles/PokemonSV_SinglesBattler.cpp
+    Source/VideoGames/PokemonSV/Programs/Battles/PokemonSV_SinglesBattler.h
+    Source/VideoGames/PokemonSV/Programs/Boxes/PokemonSV_BoxAttach.cpp
+    Source/VideoGames/PokemonSV/Programs/Boxes/PokemonSV_BoxAttach.h
+    Source/VideoGames/PokemonSV/Programs/Boxes/PokemonSV_BoxRelease.cpp
+    Source/VideoGames/PokemonSV/Programs/Boxes/PokemonSV_BoxRelease.h
+    Source/VideoGames/PokemonSV/Programs/Boxes/PokemonSV_BoxRoutines.cpp
+    Source/VideoGames/PokemonSV/Programs/Boxes/PokemonSV_BoxRoutines.h
+    Source/VideoGames/PokemonSV/Programs/Boxes/PokemonSV_MassAttachItems.cpp
+    Source/VideoGames/PokemonSV/Programs/Boxes/PokemonSV_MassAttachItems.h
+    Source/VideoGames/PokemonSV/Programs/Boxes/PokemonSV_MassRelease.cpp
+    Source/VideoGames/PokemonSV/Programs/Boxes/PokemonSV_MassRelease.h
+    Source/VideoGames/PokemonSV/Programs/Eggs/PokemonSV_EggAutonomous.cpp
+    Source/VideoGames/PokemonSV/Programs/Eggs/PokemonSV_EggAutonomous.h
+    Source/VideoGames/PokemonSV/Programs/Eggs/PokemonSV_EggFetcher.cpp
+    Source/VideoGames/PokemonSV/Programs/Eggs/PokemonSV_EggFetcher.h
+    Source/VideoGames/PokemonSV/Programs/Eggs/PokemonSV_EggHatcher.cpp
+    Source/VideoGames/PokemonSV/Programs/Eggs/PokemonSV_EggHatcher.h
+    Source/VideoGames/PokemonSV/Programs/Eggs/PokemonSV_EggRoutines.cpp
+    Source/VideoGames/PokemonSV/Programs/Eggs/PokemonSV_EggRoutines.h
+    Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_AuctionFarmer.cpp
+    Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_AuctionFarmer.h
+    Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_BBQSoloFarmer.cpp
+    Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_BBQSoloFarmer.h
+    Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_BBQTests.cpp
+    Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_BBQTests.h
+    Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_BlueberryCatchPhoto.cpp
+    Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_BlueberryCatchPhoto.h
+    Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_BlueberryQuests.cpp
+    Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_BlueberryQuests.h
+    Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_ClaimMysteryGift.cpp
+    Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_ClaimMysteryGift.h
+    Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_ESPTraining.cpp
+    Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_ESPTraining.h
+    Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_FlyingTrialFarmer.cpp
+    Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_FlyingTrialFarmer.h
+    Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_GimmighoulChestFarmer.cpp
+    Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_GimmighoulChestFarmer.h
+    Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_GimmighoulRoamingFarmer.cpp
+    Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_GimmighoulRoamingFarmer.h
+    Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_LPFarmer.cpp
+    Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_LPFarmer.h
+    Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_MaterialFarmer.cpp
+    Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_MaterialFarmer.h
+    Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_MaterialFarmerTools.cpp
+    Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_MaterialFarmerTools.h
+    Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_TournamentFarmer.cpp
+    Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_TournamentFarmer.h
+    Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_TournamentFarmer2.cpp
+    Source/VideoGames/PokemonSV/Programs/Farming/PokemonSV_TournamentFarmer2.h
+    Source/VideoGames/PokemonSV/Programs/FastCodeEntry/PokemonSV_ClipboardFastCodeEntry.cpp
+    Source/VideoGames/PokemonSV/Programs/FastCodeEntry/PokemonSV_ClipboardFastCodeEntry.h
+    Source/VideoGames/PokemonSV/Programs/FastCodeEntry/PokemonSV_CodeEntry.cpp
+    Source/VideoGames/PokemonSV/Programs/FastCodeEntry/PokemonSV_CodeEntry.h
+    Source/VideoGames/PokemonSV/Programs/FastCodeEntry/PokemonSV_FastCodeEntry.cpp
+    Source/VideoGames/PokemonSV/Programs/FastCodeEntry/PokemonSV_FastCodeEntry.h
+    Source/VideoGames/PokemonSV/Programs/FastCodeEntry/PokemonSV_VideoFastCodeEntry.cpp
+    Source/VideoGames/PokemonSV/Programs/FastCodeEntry/PokemonSV_VideoFastCodeEntry.h
+    Source/VideoGames/PokemonSV/Programs/FormHunting/PokemonSV_ThreeSegmentDudunsparceFinder.cpp
+    Source/VideoGames/PokemonSV/Programs/FormHunting/PokemonSV_ThreeSegmentDudunsparceFinder.h
+    Source/VideoGames/PokemonSV/Programs/General/PokemonSV_AutonomousBallThrower.cpp
+    Source/VideoGames/PokemonSV/Programs/General/PokemonSV_AutonomousBallThrower.h
+    Source/VideoGames/PokemonSV/Programs/General/PokemonSV_ClothingBuyer.cpp
+    Source/VideoGames/PokemonSV/Programs/General/PokemonSV_ClothingBuyer.h
+    Source/VideoGames/PokemonSV/Programs/General/PokemonSV_MassPurchase.cpp
+    Source/VideoGames/PokemonSV/Programs/General/PokemonSV_MassPurchase.h
+    Source/VideoGames/PokemonSV/Programs/General/PokemonSV_SizeChecker.cpp
+    Source/VideoGames/PokemonSV/Programs/General/PokemonSV_SizeChecker.h
+    Source/VideoGames/PokemonSV/Programs/General/PokemonSV_StatsReset.cpp
+    Source/VideoGames/PokemonSV/Programs/General/PokemonSV_StatsReset.h
+    Source/VideoGames/PokemonSV/Programs/General/PokemonSV_StatsResetEventBattle.cpp
+    Source/VideoGames/PokemonSV/Programs/General/PokemonSV_StatsResetEventBattle.h
+    Source/VideoGames/PokemonSV/Programs/Glitches/PokemonSV_CloneItems-1.0.1.cpp
+    Source/VideoGames/PokemonSV/Programs/Glitches/PokemonSV_CloneItems-1.0.1.h
+    Source/VideoGames/PokemonSV/Programs/Glitches/PokemonSV_RideCloner-1.0.1.cpp
+    Source/VideoGames/PokemonSV/Programs/Glitches/PokemonSV_RideCloner-1.0.1.h
+    Source/VideoGames/PokemonSV/Programs/Glitches/PokemonSV_WildItemFarmer.cpp
+    Source/VideoGames/PokemonSV/Programs/Glitches/PokemonSV_WildItemFarmer.h
+    Source/VideoGames/PokemonSV/Programs/ItemPrinter/PokemonSV_AutoItemPrinter.cpp
+    Source/VideoGames/PokemonSV/Programs/ItemPrinter/PokemonSV_AutoItemPrinter.h
+    Source/VideoGames/PokemonSV/Programs/ItemPrinter/PokemonSV_ItemPrinterDatabase.cpp
+    Source/VideoGames/PokemonSV/Programs/ItemPrinter/PokemonSV_ItemPrinterDatabase.h
+    Source/VideoGames/PokemonSV/Programs/ItemPrinter/PokemonSV_ItemPrinterRNG.cpp
+    Source/VideoGames/PokemonSV/Programs/ItemPrinter/PokemonSV_ItemPrinterRNG.h
+    Source/VideoGames/PokemonSV/Programs/ItemPrinter/PokemonSV_ItemPrinterRNGTable.cpp
+    Source/VideoGames/PokemonSV/Programs/ItemPrinter/PokemonSV_ItemPrinterRNGTable.h
+    Source/VideoGames/PokemonSV/Programs/ItemPrinter/PokemonSV_ItemPrinterSeedCalc.cpp
+    Source/VideoGames/PokemonSV/Programs/ItemPrinter/PokemonSV_ItemPrinterSeedCalc.h
+    Source/VideoGames/PokemonSV/Programs/ItemPrinter/PokemonSV_ItemPrinterTools.cpp
+    Source/VideoGames/PokemonSV/Programs/ItemPrinter/PokemonSV_ItemPrinterTools.h
+    Source/VideoGames/PokemonSV/Programs/PokemonSV_AreaZero.cpp
+    Source/VideoGames/PokemonSV/Programs/PokemonSV_AreaZero.h
+    Source/VideoGames/PokemonSV/Programs/PokemonSV_ConnectToInternet.cpp
+    Source/VideoGames/PokemonSV/Programs/PokemonSV_ConnectToInternet.h
+    Source/VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.cpp
+    Source/VideoGames/PokemonSV/Programs/PokemonSV_GameEntry.h
+    Source/VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.cpp
+    Source/VideoGames/PokemonSV/Programs/PokemonSV_MenuNavigation.h
+    Source/VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.cpp
+    Source/VideoGames/PokemonSV/Programs/PokemonSV_SaveGame.h
+    Source/VideoGames/PokemonSV/Programs/PokemonSV_Terarium.cpp
+    Source/VideoGames/PokemonSV/Programs/PokemonSV_Terarium.h
+    Source/VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.cpp
+    Source/VideoGames/PokemonSV/Programs/PokemonSV_WorldNavigation.h
+    Source/VideoGames/PokemonSV/Programs/Sandwiches/PokemonSV_IngredientSession.cpp
+    Source/VideoGames/PokemonSV/Programs/Sandwiches/PokemonSV_IngredientSession.h
+    Source/VideoGames/PokemonSV/Programs/Sandwiches/PokemonSV_SandwichMaker.cpp
+    Source/VideoGames/PokemonSV/Programs/Sandwiches/PokemonSV_SandwichMaker.h
+    Source/VideoGames/PokemonSV/Programs/Sandwiches/PokemonSV_SandwichRoutines.cpp
+    Source/VideoGames/PokemonSV/Programs/Sandwiches/PokemonSV_SandwichRoutines.h
+    Source/VideoGames/PokemonSV/Programs/ShinyHunting/PokemonSV_AreaZeroPlatform.cpp
+    Source/VideoGames/PokemonSV/Programs/ShinyHunting/PokemonSV_AreaZeroPlatform.h
+    Source/VideoGames/PokemonSV/Programs/ShinyHunting/PokemonSV_LetsGoTools.cpp
+    Source/VideoGames/PokemonSV/Programs/ShinyHunting/PokemonSV_LetsGoTools.h
+    Source/VideoGames/PokemonSV/Programs/ShinyHunting/PokemonSV_ShinyHunt-AreaZeroPlatform.cpp
+    Source/VideoGames/PokemonSV/Programs/ShinyHunting/PokemonSV_ShinyHunt-AreaZeroPlatform.h
+    Source/VideoGames/PokemonSV/Programs/ShinyHunting/PokemonSV_ShinyHunt-Scatterbug.cpp
+    Source/VideoGames/PokemonSV/Programs/ShinyHunting/PokemonSV_ShinyHunt-Scatterbug.h
+    Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_AutoHost.cpp
+    Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_AutoHost.h
+    Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_AutoHostLobbyWaiter.cpp
+    Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_AutoHostLobbyWaiter.h
+    Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_AutoHostTools.cpp
+    Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_AutoHostTools.h
+    Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_JoinTracker.cpp
+    Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_JoinTracker.h
+    Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_TeraBattler.cpp
+    Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_TeraBattler.h
+    Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_TeraMultiFarmer.cpp
+    Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_TeraMultiFarmer.h
+    Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_TeraRoller.cpp
+    Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_TeraRoller.h
+    Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_TeraRoutines.cpp
+    Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_TeraRoutines.h
+    Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_TeraSelfFarmer.cpp
+    Source/VideoGames/PokemonSV/Programs/TeraRaids/PokemonSV_TeraSelfFarmer.h
+    Source/VideoGames/PokemonSV/Programs/TestPrograms/PokemonSV_SoundListener.cpp
+    Source/VideoGames/PokemonSV/Programs/TestPrograms/PokemonSV_SoundListener.h
+    Source/VideoGames/PokemonSV/Programs/Trading/PokemonSV_SelfBoxTrade.cpp
+    Source/VideoGames/PokemonSV/Programs/Trading/PokemonSV_SelfBoxTrade.h
+    Source/VideoGames/PokemonSV/Programs/Trading/PokemonSV_TradeRoutines.cpp
+    Source/VideoGames/PokemonSV/Programs/Trading/PokemonSV_TradeRoutines.h
+    Source/VideoGames/PokemonSV/Resources/PokemonSV_AuctionItemNames.cpp
+    Source/VideoGames/PokemonSV/Resources/PokemonSV_AuctionItemNames.h
+    Source/VideoGames/PokemonSV/Resources/PokemonSV_FillingsCoordinates.h
+    Source/VideoGames/PokemonSV/Resources/PokemonSV_Ingredients.cpp
+    Source/VideoGames/PokemonSV/Resources/PokemonSV_Ingredients.h
+    Source/VideoGames/PokemonSV/Resources/PokemonSV_ItemSprites.cpp
+    Source/VideoGames/PokemonSV/Resources/PokemonSV_ItemSprites.h
+    Source/VideoGames/PokemonSV/Resources/PokemonSV_NameDatabase.cpp
+    Source/VideoGames/PokemonSV/Resources/PokemonSV_NameDatabase.h
+    Source/VideoGames/PokemonSV/Resources/PokemonSV_PokemonSprites.cpp
+    Source/VideoGames/PokemonSV/Resources/PokemonSV_PokemonSprites.h
+    Source/VideoGames/PokemonSV/Resources/PokemonSV_TournamentPrizeNames.cpp
+    Source/VideoGames/PokemonSV/Resources/PokemonSV_TournamentPrizeNames.h
+    Source/VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_AutoHosts.cpp
+    Source/VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_AutoHosts.h
+    Source/VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.cpp
+    Source/VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.h
+    Source/VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_EggRoutines.cpp
+    Source/VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_EggRoutines.h
+    Source/VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_GameEntry.cpp
+    Source/VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_GameEntry.h
+    Source/VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_Misc.cpp
+    Source/VideoGames/PokemonSwSh/Commands/PokemonSwSh_Commands_Misc.h
+    Source/VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleBallReader.cpp
+    Source/VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleBallReader.h
+    Source/VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleDialogDetector.cpp
+    Source/VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleDialogDetector.h
+    Source/VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleDialogTracker.cpp
+    Source/VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleDialogTracker.h
+    Source/VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleMenuDetector.cpp
+    Source/VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_BattleMenuDetector.h
+    Source/VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_ExperienceGainDetector.cpp
+    Source/VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_ExperienceGainDetector.h
+    Source/VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_StartBattleDetector.cpp
+    Source/VideoGames/PokemonSwSh/Inference/Battles/PokemonSwSh_StartBattleDetector.h
+    Source/VideoGames/PokemonSwSh/Inference/Dens/PokemonSwSh_BeamSetter.cpp
+    Source/VideoGames/PokemonSwSh/Inference/Dens/PokemonSwSh_BeamSetter.h
+    Source/VideoGames/PokemonSwSh/Inference/Dens/PokemonSwSh_DenMonReader.cpp
+    Source/VideoGames/PokemonSwSh/Inference/Dens/PokemonSwSh_DenMonReader.h
+    Source/VideoGames/PokemonSwSh/Inference/Dens/PokemonSwSh_RaidCatchDetector.cpp
+    Source/VideoGames/PokemonSwSh/Inference/Dens/PokemonSwSh_RaidCatchDetector.h
+    Source/VideoGames/PokemonSwSh/Inference/Dens/PokemonSwSh_RaidLobbyReader.cpp
+    Source/VideoGames/PokemonSwSh/Inference/Dens/PokemonSwSh_RaidLobbyReader.h
+    Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_BoxEggDetector.cpp
+    Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_BoxEggDetector.h
+    Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_BoxEmptySlotDetector.cpp
+    Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_BoxEmptySlotDetector.h
+    Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_BoxGenderDetector.cpp
+    Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_BoxGenderDetector.h
+    Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_BoxNatureDetector.cpp
+    Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_BoxNatureDetector.h
+    Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_BoxShinySymbolDetector.cpp
+    Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_BoxShinySymbolDetector.h
+    Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_DialogBoxDetector.cpp
+    Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_DialogBoxDetector.h
+    Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_DialogTriangleDetector.cpp
+    Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_DialogTriangleDetector.h
+    Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_FishingDetector.cpp
+    Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_FishingDetector.h
+    Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_IvJudgeReader.cpp
+    Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_IvJudgeReader.h
+    Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_MainMenuDetector.cpp
+    Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_MainMenuDetector.h
+    Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_MarkFinder.cpp
+    Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_MarkFinder.h
+    Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_PokemonSpriteReader.cpp
+    Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_PokemonSpriteReader.h
+    Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_QuantityReader.cpp
+    Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_QuantityReader.h
+    Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_ReceivePokemonDetector.cpp
+    Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_ReceivePokemonDetector.h
+    Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_SelectionArrowFinder.cpp
+    Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_SelectionArrowFinder.h
+    Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_SummaryShinySymbolDetector.cpp
+    Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_SummaryShinySymbolDetector.h
+    Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_YCommDetector.cpp
+    Source/VideoGames/PokemonSwSh/Inference/PokemonSwSh_YCommDetector.h
+    Source/VideoGames/PokemonSwSh/Inference/RNG/PokemonSwSh_OrbeetleAttackAnimationDetector.cpp
+    Source/VideoGames/PokemonSwSh/Inference/RNG/PokemonSwSh_OrbeetleAttackAnimationDetector.h
+    Source/VideoGames/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_ShinyEncounterDetector.cpp
+    Source/VideoGames/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_ShinyEncounterDetector.h
+    Source/VideoGames/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_ShinySparkleSet.cpp
+    Source/VideoGames/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_ShinySparkleSet.h
+    Source/VideoGames/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_SparkleDetectorRadial.cpp
+    Source/VideoGames/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_SparkleDetectorRadial.h
+    Source/VideoGames/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_SparkleDetectorSquare.cpp
+    Source/VideoGames/PokemonSwSh/Inference/ShinyDetection/PokemonSwSh_SparkleDetectorSquare.h
+    Source/VideoGames/PokemonSwSh/Inference/Sounds/PokemonSwSh_BerryTreeRustlingSoundDetector.cpp
+    Source/VideoGames/PokemonSwSh/Inference/Sounds/PokemonSwSh_BerryTreeRustlingSoundDetector.h
+    Source/VideoGames/PokemonSwSh/InferenceTraining/PokemonSwSh_GenerateIVCheckerOCR.cpp
+    Source/VideoGames/PokemonSwSh/InferenceTraining/PokemonSwSh_GenerateIVCheckerOCR.h
+    Source/VideoGames/PokemonSwSh/InferenceTraining/PokemonSwSh_GenerateNameOCRPokedex.cpp
+    Source/VideoGames/PokemonSwSh/InferenceTraining/PokemonSwSh_GenerateNameOCRPokedex.h
+    Source/VideoGames/PokemonSwSh/InferenceTraining/PokemonSwSh_GeneratePokedexSprites.cpp
+    Source/VideoGames/PokemonSwSh/InferenceTraining/PokemonSwSh_GeneratePokedexSprites.h
+    Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI.cpp
+    Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI.h
+    Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_PathMatchup.cpp
+    Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_PathMatchup.h
+    Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_RentalBossMatchup.cpp
+    Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_RentalBossMatchup.h
+    Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_SelectItem.cpp
+    Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_SelectMove.cpp
+    Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_SelectPath.cpp
+    Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_SelectStarter.cpp
+    Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_SwapCatch.cpp
+    Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_SwapProfessor.cpp
+    Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_Tools.cpp
+    Source/VideoGames/PokemonSwSh/MaxLair/AI/PokemonSwSh_MaxLair_AI_Tools.h
+    Source/VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_CatchScreenTracker.cpp
+    Source/VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_CatchScreenTracker.h
+    Source/VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_Notifications.cpp
+    Source/VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_Notifications.h
+    Source/VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_State.cpp
+    Source/VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_State.h
+    Source/VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_State_Tests.cpp
+    Source/VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_State_Tests.h
+    Source/VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_StateMachine.cpp
+    Source/VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_StateMachine.h
+    Source/VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_StateTracker.cpp
+    Source/VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_StateTracker.h
+    Source/VideoGames/PokemonSwSh/MaxLair/Framework/PokemonSwSh_MaxLair_Stats.h
+    Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_BattleMenu.cpp
+    Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_BattleMenu.h
+    Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_EndBattle.cpp
+    Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_EndBattle.h
+    Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_Entrance.cpp
+    Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_Entrance.h
+    Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_HPPP.cpp
+    Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_HPPP.h
+    Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_ItemSelectMenu.cpp
+    Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_ItemSelectMenu.h
+    Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_Lobby.cpp
+    Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_Lobby.h
+    Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathMap.cpp
+    Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathMap.h
+    Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathSelect.cpp
+    Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathSelect.h
+    Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathSide.cpp
+    Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PathSide.h
+    Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonReader.cpp
+    Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonReader.h
+    Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonSelectMenu.cpp
+    Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonSelectMenu.h
+    Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonSwapMenu.cpp
+    Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_PokemonSwapMenu.h
+    Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_ProfessorSwap.cpp
+    Source/VideoGames/PokemonSwSh/MaxLair/Inference/PokemonSwSh_MaxLair_Detect_ProfessorSwap.h
+    Source/VideoGames/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options.cpp
+    Source/VideoGames/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options.h
+    Source/VideoGames/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options_BossAction.cpp
+    Source/VideoGames/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options_BossAction.h
+    Source/VideoGames/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options_Consoles.cpp
+    Source/VideoGames/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options_Consoles.h
+    Source/VideoGames/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options_Hosting.cpp
+    Source/VideoGames/PokemonSwSh/MaxLair/Options/PokemonSwSh_MaxLair_Options_Hosting.h
+    Source/VideoGames/PokemonSwSh/MaxLair/PokemonSwSh_MaxLair_BossFinder.cpp
+    Source/VideoGames/PokemonSwSh/MaxLair/PokemonSwSh_MaxLair_BossFinder.h
+    Source/VideoGames/PokemonSwSh/MaxLair/PokemonSwSh_MaxLair_Standard.cpp
+    Source/VideoGames/PokemonSwSh/MaxLair/PokemonSwSh_MaxLair_Standard.h
+    Source/VideoGames/PokemonSwSh/MaxLair/PokemonSwSh_MaxLair_StrongBoss.cpp
+    Source/VideoGames/PokemonSwSh/MaxLair/PokemonSwSh_MaxLair_StrongBoss.h
+    Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_Adventure.cpp
+    Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_Adventure.h
+    Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_Battle.cpp
+    Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_Battle.h
+    Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_CaughtScreen.cpp
+    Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_CaughtScreen.h
+    Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_EnterLobby.cpp
+    Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_EnterLobby.h
+    Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_Entrance.cpp
+    Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_Entrance.h
+    Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_ItemSelect.cpp
+    Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_ItemSelect.h
+    Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_PathSelect.cpp
+    Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_PathSelect.h
+    Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_PokemonSelect.cpp
+    Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_PokemonSelect.h
+    Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_PokemonSwap.cpp
+    Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_PokemonSwap.h
+    Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_ProfessorSwap.cpp
+    Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_ProfessorSwap.h
+    Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_Start.cpp
+    Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_Start.h
+    Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_StartSolo.cpp
+    Source/VideoGames/PokemonSwSh/MaxLair/Program/PokemonSwSh_MaxLair_Run_StartSolo.h
+    Source/VideoGames/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterEnums.cpp
+    Source/VideoGames/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterEnums.h
+    Source/VideoGames/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterOption.cpp
+    Source/VideoGames/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterOption.h
+    Source/VideoGames/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterOverride.cpp
+    Source/VideoGames/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterOverride.h
+    Source/VideoGames/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterWidget.cpp
+    Source/VideoGames/PokemonSwSh/Options/EncounterFilter/PokemonSwSh_EncounterFilterWidget.h
+    Source/VideoGames/PokemonSwSh/Options/PokemonSwSh_AutoHostNotification.cpp
+    Source/VideoGames/PokemonSwSh/Options/PokemonSwSh_AutoHostNotification.h
+    Source/VideoGames/PokemonSwSh/Options/PokemonSwSh_BallSelectOption.cpp
+    Source/VideoGames/PokemonSwSh/Options/PokemonSwSh_BallSelectOption.h
+    Source/VideoGames/PokemonSwSh/Options/PokemonSwSh_Catchability.h
+    Source/VideoGames/PokemonSwSh/Options/PokemonSwSh_CramomaticTable.cpp
+    Source/VideoGames/PokemonSwSh/Options/PokemonSwSh_CramomaticTable.h
+    Source/VideoGames/PokemonSwSh/Options/PokemonSwSh_DateToucher.cpp
+    Source/VideoGames/PokemonSwSh/Options/PokemonSwSh_DateToucher.h
+    Source/VideoGames/PokemonSwSh/Options/PokemonSwSh_EggStepOption.cpp
+    Source/VideoGames/PokemonSwSh/Options/PokemonSwSh_EggStepOption.h
+    Source/VideoGames/PokemonSwSh/Options/PokemonSwSh_EncounterBotCommon.h
+    Source/VideoGames/PokemonSwSh/Options/PokemonSwSh_FossilTable.h
+    Source/VideoGames/PokemonSwSh/Options/PokemonSwSh_MultiHostTable.cpp
+    Source/VideoGames/PokemonSwSh/Options/PokemonSwSh_MultiHostTable.h
+    Source/VideoGames/PokemonSwSh/Options/PokemonSwSh_RegiSelector.h
+    Source/VideoGames/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Battle.cpp
+    Source/VideoGames/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Battle.h
+    Source/VideoGames/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Field.cpp
+    Source/VideoGames/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Field.h
+    Source/VideoGames/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Matchup.cpp
+    Source/VideoGames/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Matchup.h
+    Source/VideoGames/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Moves.cpp
+    Source/VideoGames/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Moves.h
+    Source/VideoGames/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Pokemon.cpp
+    Source/VideoGames/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Pokemon.h
+    Source/VideoGames/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Stats.cpp
+    Source/VideoGames/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Stats.h
+    Source/VideoGames/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Types.cpp
+    Source/VideoGames/PokemonSwSh/PkmnLib/PokemonSwSh_PkmnLib_Types.h
+    Source/VideoGames/PokemonSwSh/PokemonSwSh_Panels.cpp
+    Source/VideoGames/PokemonSwSh/PokemonSwSh_Panels.h
+    Source/VideoGames/PokemonSwSh/PokemonSwSh_Settings.cpp
+    Source/VideoGames/PokemonSwSh/PokemonSwSh_Settings.h
+    Source/VideoGames/PokemonSwSh/PokemonSwSh_Tests.cpp
+    Source/VideoGames/PokemonSwSh/PokemonSwSh_Tests.h
+    Source/VideoGames/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-BerryFarmer.cpp
+    Source/VideoGames/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-BerryFarmer.h
+    Source/VideoGames/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-BerryFarmer2.cpp
+    Source/VideoGames/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-BerryFarmer2.h
+    Source/VideoGames/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-DailyHighlightFarmer.cpp
+    Source/VideoGames/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-DailyHighlightFarmer.h
+    Source/VideoGames/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-LotoFarmer.cpp
+    Source/VideoGames/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-LotoFarmer.h
+    Source/VideoGames/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-PokeJobsFarmer.cpp
+    Source/VideoGames/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-PokeJobsFarmer.h
+    Source/VideoGames/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-StowOnSideFarmer.cpp
+    Source/VideoGames/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-StowOnSideFarmer.h
+    Source/VideoGames/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-WattFarmer.cpp
+    Source/VideoGames/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-WattFarmer.h
+    Source/VideoGames/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-WattTraderFarmer.cpp
+    Source/VideoGames/PokemonSwSh/Programs/DateSpamFarmers/PokemonSwSh_DateSpam-WattTraderFarmer.h
+    Source/VideoGames/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperEU.cpp
+    Source/VideoGames/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperEU.h
+    Source/VideoGames/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperJPN-7.8k.cpp
+    Source/VideoGames/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperJPN-7.8k.h
+    Source/VideoGames/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperJPN.cpp
+    Source/VideoGames/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperJPN.h
+    Source/VideoGames/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperStats.h
+    Source/VideoGames/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperUS.cpp
+    Source/VideoGames/PokemonSwSh/Programs/DenHunting/PokemonSwSh_DaySkipperUS.h
+    Source/VideoGames/PokemonSwSh/Programs/DenHunting/PokemonSwSh_EventBeamFinder.cpp
+    Source/VideoGames/PokemonSwSh/Programs/DenHunting/PokemonSwSh_EventBeamFinder.h
+    Source/VideoGames/PokemonSwSh/Programs/DenHunting/PokemonSwSh_PurpleBeamFinder.cpp
+    Source/VideoGames/PokemonSwSh/Programs/DenHunting/PokemonSwSh_PurpleBeamFinder.h
+    Source/VideoGames/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggAutonomous.cpp
+    Source/VideoGames/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggAutonomous.h
+    Source/VideoGames/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggCombinedShared.h
+    Source/VideoGames/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggFetcher2.cpp
+    Source/VideoGames/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggFetcher2.h
+    Source/VideoGames/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggFetcherMultiple.cpp
+    Source/VideoGames/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggFetcherMultiple.h
+    Source/VideoGames/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggHatcher.cpp
+    Source/VideoGames/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggHatcher.h
+    Source/VideoGames/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_EggHelpers.h
+    Source/VideoGames/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_GodEggDuplication.cpp
+    Source/VideoGames/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_GodEggDuplication.h
+    Source/VideoGames/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_GodEggItemDupe.cpp
+    Source/VideoGames/PokemonSwSh/Programs/EggPrograms/PokemonSwSh_GodEggItemDupe.h
+    Source/VideoGames/PokemonSwSh/Programs/General/PokemonSwSh_AutonomousBallThrower.cpp
+    Source/VideoGames/PokemonSwSh/Programs/General/PokemonSwSh_AutonomousBallThrower.h
+    Source/VideoGames/PokemonSwSh/Programs/General/PokemonSwSh_BoxReorderNationalDex.cpp
+    Source/VideoGames/PokemonSwSh/Programs/General/PokemonSwSh_BoxReorderNationalDex.h
+    Source/VideoGames/PokemonSwSh/Programs/General/PokemonSwSh_ClothingBuyer.cpp
+    Source/VideoGames/PokemonSwSh/Programs/General/PokemonSwSh_ClothingBuyer.h
+    Source/VideoGames/PokemonSwSh/Programs/General/PokemonSwSh_DexRecFinder.cpp
+    Source/VideoGames/PokemonSwSh/Programs/General/PokemonSwSh_DexRecFinder.h
+    Source/VideoGames/PokemonSwSh/Programs/General/PokemonSwSh_MassRelease.cpp
+    Source/VideoGames/PokemonSwSh/Programs/General/PokemonSwSh_MassRelease.h
+    Source/VideoGames/PokemonSwSh/Programs/General/PokemonSwSh_SurpriseTrade.cpp
+    Source/VideoGames/PokemonSwSh/Programs/General/PokemonSwSh_SurpriseTrade.h
+    Source/VideoGames/PokemonSwSh/Programs/General/PokemonSwSh_TradeBot.cpp
+    Source/VideoGames/PokemonSwSh/Programs/General/PokemonSwSh_TradeBot.h
+    Source/VideoGames/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHost-MultiGame.cpp
+    Source/VideoGames/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHost-MultiGame.h
+    Source/VideoGames/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHost-Rolling.cpp
+    Source/VideoGames/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHost-Rolling.h
+    Source/VideoGames/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHost.cpp
+    Source/VideoGames/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHost.h
+    Source/VideoGames/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHostStats.cpp
+    Source/VideoGames/PokemonSwSh/Programs/Hosting/PokemonSwSh_AutoHostStats.h
+    Source/VideoGames/PokemonSwSh/Programs/Hosting/PokemonSwSh_DenRoller.cpp
+    Source/VideoGames/PokemonSwSh/Programs/Hosting/PokemonSwSh_DenRoller.h
+    Source/VideoGames/PokemonSwSh/Programs/Hosting/PokemonSwSh_DenTools.cpp
+    Source/VideoGames/PokemonSwSh/Programs/Hosting/PokemonSwSh_DenTools.h
+    Source/VideoGames/PokemonSwSh/Programs/Hosting/PokemonSwSh_LobbyWait.h
+    Source/VideoGames/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset-Calyrex.cpp
+    Source/VideoGames/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset-Calyrex.h
+    Source/VideoGames/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset-Moltres.cpp
+    Source/VideoGames/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset-Moltres.h
+    Source/VideoGames/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset-Regi.cpp
+    Source/VideoGames/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset-Regi.h
+    Source/VideoGames/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset.cpp
+    Source/VideoGames/PokemonSwSh/Programs/NonShinyHunting/PokemonSwSh_StatsReset.h
+    Source/VideoGames/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_OverworldMovement.cpp
+    Source/VideoGames/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_OverworldMovement.h
+    Source/VideoGames/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_OverworldTargetTracker.cpp
+    Source/VideoGames/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_OverworldTargetTracker.h
+    Source/VideoGames/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_OverworldTrajectory.cpp
+    Source/VideoGames/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_OverworldTrajectory.h
+    Source/VideoGames/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_OverworldTrigger.cpp
+    Source/VideoGames/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_OverworldTrigger.h
+    Source/VideoGames/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_ShinyHuntAutonomous-Overworld.cpp
+    Source/VideoGames/PokemonSwSh/Programs/OverworldBot/PokemonSwSh_ShinyHuntAutonomous-Overworld.h
+    Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_BasicCatcher.cpp
+    Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_BasicCatcher.h
+    Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_BoxHelpers.cpp
+    Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_BoxHelpers.h
+    Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_EncounterDetection.cpp
+    Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_EncounterDetection.h
+    Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_EncounterHandler.cpp
+    Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_EncounterHandler.h
+    Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_GameEntry.cpp
+    Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_GameEntry.h
+    Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_Internet.cpp
+    Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_Internet.h
+    Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_MenuNavigation.cpp
+    Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_MenuNavigation.h
+    Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_RaidItemFarmerOKHO.cpp
+    Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_RaidItemFarmerOKHO.h
+    Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_ReleaseHelpers.h
+    Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_SynchronizedSpinning.cpp
+    Source/VideoGames/PokemonSwSh/Programs/PokemonSwSh_SynchronizedSpinning.h
+    Source/VideoGames/PokemonSwSh/Programs/QoLMacros/PokemonSwSh_FastCodeEntry.cpp
+    Source/VideoGames/PokemonSwSh/Programs/QoLMacros/PokemonSwSh_FastCodeEntry.h
+    Source/VideoGames/PokemonSwSh/Programs/QoLMacros/PokemonSwSh_FriendSearchDisconnect.cpp
+    Source/VideoGames/PokemonSwSh/Programs/QoLMacros/PokemonSwSh_FriendSearchDisconnect.h
+    Source/VideoGames/PokemonSwSh/Programs/RNG/PokemonSwSh_BasicRNG.cpp
+    Source/VideoGames/PokemonSwSh/Programs/RNG/PokemonSwSh_BasicRNG.h
+    Source/VideoGames/PokemonSwSh/Programs/RNG/PokemonSwSh_CramomaticRNG.cpp
+    Source/VideoGames/PokemonSwSh/Programs/RNG/PokemonSwSh_CramomaticRNG.h
+    Source/VideoGames/PokemonSwSh/Programs/RNG/PokemonSwSh_DailyHighlightRNG.cpp
+    Source/VideoGames/PokemonSwSh/Programs/RNG/PokemonSwSh_DailyHighlightRNG.h
+    Source/VideoGames/PokemonSwSh/Programs/RNG/PokemonSwSh_SeedFinder.cpp
+    Source/VideoGames/PokemonSwSh/Programs/RNG/PokemonSwSh_SeedFinder.h
+    Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-BerryTree.cpp
+    Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-BerryTree.h
+    Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Fishing.cpp
+    Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Fishing.h
+    Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-IoATrade.cpp
+    Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-IoATrade.h
+    Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Regi.cpp
+    Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Regi.h
+    Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Regigigas2.cpp
+    Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Regigigas2.h
+    Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-StrongSpawn.cpp
+    Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-StrongSpawn.h
+    Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-SwordsOfJustice.cpp
+    Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-SwordsOfJustice.h
+    Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Whistling.cpp
+    Source/VideoGames/PokemonSwSh/Programs/ShinyHuntAutonomous/PokemonSwSh_ShinyHuntAutonomous-Whistling.h
+    Source/VideoGames/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_CurryHunter.cpp
+    Source/VideoGames/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_CurryHunter.h
+    Source/VideoGames/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_MultiGameFossil.cpp
+    Source/VideoGames/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_MultiGameFossil.h
+    Source/VideoGames/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHunt-Regi.cpp
+    Source/VideoGames/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHunt-Regi.h
+    Source/VideoGames/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntTools.cpp
+    Source/VideoGames/PokemonSwSh/Programs/ShinyHuntUnattended/PokemonSwSh_ShinyHuntTools.h
+    Source/VideoGames/PokemonSwSh/Programs/TestPrograms/PokemonSwSh_ShinyEncounterTester.cpp
+    Source/VideoGames/PokemonSwSh/Programs/TestPrograms/PokemonSwSh_ShinyEncounterTester.h
+    Source/VideoGames/PokemonSwSh/Resources/PokemonSwSh_DailyHighlightDatabase.cpp
+    Source/VideoGames/PokemonSwSh/Resources/PokemonSwSh_DailyHighlightDatabase.h
+    Source/VideoGames/PokemonSwSh/Resources/PokemonSwSh_MaxLairDatabase.cpp
+    Source/VideoGames/PokemonSwSh/Resources/PokemonSwSh_MaxLairDatabase.h
+    Source/VideoGames/PokemonSwSh/Resources/PokemonSwSh_NameDatabase.cpp
+    Source/VideoGames/PokemonSwSh/Resources/PokemonSwSh_NameDatabase.h
+    Source/VideoGames/PokemonSwSh/Resources/PokemonSwSh_PokeballSprites.cpp
+    Source/VideoGames/PokemonSwSh/Resources/PokemonSwSh_PokeballSprites.h
+    Source/VideoGames/PokemonSwSh/Resources/PokemonSwSh_PokemonSprites.cpp
+    Source/VideoGames/PokemonSwSh/Resources/PokemonSwSh_PokemonSprites.h
+    Source/VideoGames/PokemonSwSh/Resources/PokemonSwSh_TypeMatchup.cpp
+    Source/VideoGames/PokemonSwSh/Resources/PokemonSwSh_TypeMatchup.h
+    Source/VideoGames/PokemonSwSh/Resources/PokemonSwSh_TypeSprites.cpp
+    Source/VideoGames/PokemonSwSh/Resources/PokemonSwSh_TypeSprites.h
+    Source/VideoGames/PokemonSwSh/ShinyHuntTracker.cpp
+    Source/VideoGames/PokemonSwSh/ShinyHuntTracker.h
+    Source/StaticRegistration.h
+    Source/StaticRegistrationQt.cpp
+    Source/Tests/CommandLineTests.cpp
+    Source/Tests/CommandLineTests.h
+    Source/Tests/GuardPageImage.h
+    Source/Tests/ImageUnitTest.cpp
+    Source/Tests/ImageUnitTest.h
+    Source/Tests/TestUtils.cpp
+    Source/Tests/TestUtils.h
+    Source/VideoGames/ZeldaTotK/Programs/ZeldaTotK_BowItemDuper.cpp
+    Source/VideoGames/ZeldaTotK/Programs/ZeldaTotK_BowItemDuper.h
+    Source/VideoGames/ZeldaTotK/Programs/ZeldaTotK_MineruItemDuper.cpp
+    Source/VideoGames/ZeldaTotK/Programs/ZeldaTotK_MineruItemDuper.h
+    Source/VideoGames/ZeldaTotK/Programs/ZeldaTotK_ParaglideItemDuper.cpp
+    Source/VideoGames/ZeldaTotK/Programs/ZeldaTotK_ParaglideItemDuper.h
+    Source/VideoGames/ZeldaTotK/Programs/ZeldaTotK_SurfItemDuper.cpp
+    Source/VideoGames/ZeldaTotK/Programs/ZeldaTotK_SurfItemDuper.h
+    Source/VideoGames/ZeldaTotK/Programs/ZeldaTotK_WeaponDuper.cpp
+    Source/VideoGames/ZeldaTotK/Programs/ZeldaTotK_WeaponDuper.h
+    Source/VideoGames/ZeldaTotK/ZeldaTotK_Panels.cpp
+    Source/VideoGames/ZeldaTotK/ZeldaTotK_Panels.h
+    Source/VideoGames/ZeldaTotK/ZeldaTotK_Settings.cpp
+    Source/VideoGames/ZeldaTotK/ZeldaTotK_Settings.h
+)